diff --git a/.claude/hooks/md-no-hardwrap.py b/.claude/hooks/md-no-hardwrap.py
new file mode 100755
index 0000000000..ad8e998191
--- /dev/null
+++ b/.claude/hooks/md-no-hardwrap.py
@@ -0,0 +1,802 @@
+#!/usr/bin/env python3
+"""PreToolUse hook: keep hardwrapped prose out of markdown and out of GitHub.
+
+A markdown renderer collapses a soft line break into a space, so a paragraph
+wrapped at ~80 columns renders identically to the same paragraph on one line.
+The wrap is not free, though: it breaks narrow viewports, it mangles list and
+table rendering, and it turns a one-word edit into a diff that reflows the
+whole block. Prose therefore stays on a single line per paragraph, and the
+renderer decides where it wraps.
+
+The rule is easy to state and easy to forget, because an ~80-column wrap is
+correct in the places a coding agent spends most of its time (Go comments,
+commit message bodies), and the reflex leaks from there into markdown files
+and GitHub bodies. This hook is the mechanical check that the reflex slips
+past. It guards two surfaces:
+
+    Write / Edit / MultiEdit   markdown content headed for a file
+    Bash                       a `gh` command publishing a body to GitHub
+
+Two design rules keep it from becoming a nuisance, which matters more than
+catching every last wrap -- a guard that blocks legitimate work gets switched
+off, and then it guards nothing:
+
+  * Only NEW wraps are refused. The hook compares the file as it stands
+    against the file as it would land, and reports only what the edit adds.
+    Editing one word of a legacy document that is wrapped throughout, or
+    rewriting a vendored chart README verbatim, therefore stays possible.
+
+  * Anything ambiguous is allowed. A body assembled at runtime by the shell,
+    an unsplittable command line, a path that is not a regular file, a
+    document the hook cannot read -- all pass. The hook only ever blocks what
+    it is certain about.
+
+Line breaks are rejected only inside prose: a paragraph, a list item, or a
+blockquote spanning more than one line. Everywhere else a break carries
+meaning and is left alone -- code blocks (fenced and indented), tables,
+headings, front matter, HTML, link reference definitions, footnotes, badge
+stacks, and explicit hard breaks (two trailing spaces, or a trailing
+backslash), which render as <br> and cannot be reflowed without changing the
+output.
+
+Agent hook protocol: a JSON payload on stdin, exit 0 to allow the tool call,
+exit 2 to block it with an explanation on stderr.
+"""
+
+from __future__ import annotations
+
+import difflib
+import json
+import os
+import re
+import shlex
+import stat
+import sys
+from typing import NamedTuple
+
+MARKDOWN_SUFFIXES = (".md", ".markdown", ".mdx")
+
+# Paths whose prose the repo does not own. Vendored upstream charts are
+# regenerated verbatim by `make update` and AGENTS.md forbids editing them;
+# published changelogs are historical records; *.md.gotmpl is a Go template,
+# not a document. Reflowing any of them is the wrong instruction to give.
+OUT_OF_SCOPE = (
+    re.compile(r"packages/[^/]+/[^/]+/charts/"),
+    re.compile(r"/?docs/changelogs/"),
+    re.compile(r"/vendor/"),
+)
+
+# Refuse to read a body file larger than this. A body is prose; anything of
+# this size is not, and a hook must not stall the agent chewing through it.
+MAX_BODY_FILE_BYTES = 1 << 20  # 1 MiB
+
+# Above this, diffing before against after costs more than the check is worth.
+# The hook then cannot tell an added wrap from an inherited one, and allows.
+MAX_DIFF_CHARS = 400_000
+
+# `gh` subcommands that publish a body. `gh pr view`, `gh pr list` and friends
+# are absent by design: they read, they do not publish.
+GH_PUBLISHING_SUBCOMMANDS = {
+    ("pr", "create"),
+    ("pr", "edit"),
+    ("pr", "comment"),
+    ("pr", "review"),
+    ("issue", "create"),
+    ("issue", "edit"),
+    ("issue", "comment"),
+    ("release", "create"),
+    ("release", "edit"),
+    ("api",),
+}
+GH_NOUNS = {"pr", "issue", "release"}
+GH_ACTIONS = {"create", "edit", "comment", "review"}
+
+# Flag meanings are subcommand-dependent: -F is --body-file for `gh pr`, but
+# --raw-field for `gh api`. Getting this backwards silently drops the body.
+BODY_FLAGS = ("--body", "-b", "--notes", "-n")
+BODY_FILE_FLAGS = ("--body-file", "-F", "--notes-file")
+API_FIELD_FLAGS = ("-f", "--field", "-F", "--raw-field")
+
+
+class Violation(NamedTuple):
+    start_line: int  # 1-based, first line of the offending block
+    end_line: int    # 1-based, last line of the offending block
+    text: str        # the block, joined with " | " for the message
+
+
+_RE_HEADING = re.compile(r"^#{1,6}\s")
+_RE_LIST_MARKER = re.compile(r"^\s*([-*+]|\d+[.)])\s")
+_RE_BLOCKQUOTE = re.compile(r"^\s*>")
+_RE_TABLE_ROW = re.compile(r"^\s*\|")
+# A table delimiter row is dashes, colons, pipes and spaces, with at least one
+# pipe. The pipe is what tells it apart from a `---` horizontal rule or setext
+# underline, and it is what makes a pipe-less GFM table (`a | b`) detectable.
+_RE_TABLE_DELIMITER = re.compile(r"^\s*:?-{1,}:?(\s*\|\s*:?-{1,}:?)+\s*$")
+_RE_SETEXT_UNDERLINE = re.compile(r"^\s*(=+|-+)\s*$")
+_RE_ADMONITION_OPENER = re.compile(r"^\s*(\?\?\?|!!!)")
+# Any line opening with a tag is HTML, whether or not it also carries content:
+# `<summary>Test output</summary>` and `<pre>all green</pre>` are two lines of
+# a <details> block, not a wrapped paragraph, and joining them would be wrong.
+_RE_HTML_BLOCK = re.compile(r"^\s*</?[a-zA-Z!]")
+_RE_HTML_COMMENT_OPEN = re.compile(r"^\s*<!--")
+_RE_HTML_COMMENT_CLOSE = re.compile(r"-->\s*$")
+_RE_FENCE = re.compile(r"^\s*(```|~~~)")
+_RE_HR = re.compile(r"^\s*([-*_])(\s*\1){2,}\s*$")
+_RE_FRONT_MATTER = re.compile(r"^\s*(---|\+\+\+)\s*$")
+# `[label]: https://…` and `[^note]: text` -- one definition per line is the
+# only way to write these, so a run of them is not a wrapped paragraph.
+_RE_LINK_REF_DEF = re.compile(r"^\s*\[[^\]]+\]:\s")
+# `: definition` under a term.
+_RE_DEFINITION = re.compile(r"^\s*:\s")
+# Indented code: four spaces or a tab, outside a list.
+_RE_INDENTED_CODE = re.compile(r"^(    |\t)")
+# A README shield stack is one badge per line by convention; collapsing it
+# would be wrong. A paragraph mixing badges with prose is still wrapped prose.
+_RE_BADGE_ROW = re.compile(r"^\s*\[!\[")
+_RE_IMAGE_ROW = re.compile(r"^\s*!\[")
+# Heredoc opener: `<<EOF`, `<<-EOF`, `<<'EOF'`, `<<"EOF"`.
+_RE_HEREDOC = re.compile(r"<<-?\s*(['\"]?)([A-Za-z_][A-Za-z0-9_]*)\1")
+
+
+def is_badge_or_image_row(line: str) -> bool:
+    return bool(_RE_BADGE_ROW.match(line) or _RE_IMAGE_ROW.match(line))
+
+
+def ends_with_hard_break(line: str) -> bool:
+    """True iff the line ends in an explicit <br>: two spaces, or a backslash.
+
+    Such a break renders as a line break. Reflowing it onto one line would
+    change the output, so it is a deliberate break and not a wrap.
+    """
+    return line.endswith("  ") or line.rstrip(" ").endswith("\\")
+
+
+def is_structure(line: str) -> bool:
+    """True iff the line is markdown structure rather than prose."""
+    return any(
+        rx.match(line)
+        for rx in (
+            _RE_HEADING,
+            _RE_BLOCKQUOTE,
+            _RE_TABLE_ROW,
+            _RE_TABLE_DELIMITER,
+            _RE_SETEXT_UNDERLINE,
+            _RE_ADMONITION_OPENER,
+            _RE_HTML_BLOCK,
+            _RE_HR,
+            _RE_LINK_REF_DEF,
+            _RE_DEFINITION,
+        )
+    )
+
+
+def wrapped_groups(block: list[tuple[int, str]]) -> list[list[tuple[int, str]]]:
+    """Split a block into logical lines, and return those spanning >1 physical line.
+
+    An explicit hard break ends a logical line. Everything up to the next hard
+    break (or the end of the block) is one logical line, and if it occupies
+    more than one physical line, the author wrapped it.
+    """
+    groups: list[list[tuple[int, str]]] = []
+    current: list[tuple[int, str]] = []
+
+    for numbered in block:
+        current.append(numbered)
+        if ends_with_hard_break(numbered[1]):
+            groups.append(current)
+            current = []
+    if current:
+        groups.append(current)
+
+    return [g for g in groups if len(g) > 1]
+
+
+def find_violations(content: str) -> list[Violation]:
+    """Return every prose block in content that spans more than one line."""
+    violations: list[Violation] = []
+    lines = content.split("\n")
+
+    def flush(block: list[tuple[int, str]], strip_quote: bool = False) -> None:
+        if len(block) < 2:
+            return
+        # A stack of badges or images is one per line by convention.
+        if all(is_badge_or_image_row(text) for _, text in block):
+            return
+        for group in wrapped_groups(block):
+            violations.append(
+                Violation(
+                    start_line=group[0][0],
+                    end_line=group[-1][0],
+                    text=" | ".join(
+                        (t.lstrip("> ").strip() if strip_quote else t.strip())
+                        for _, t in group
+                    ),
+                )
+            )
+
+    in_fence = False
+    fence_marker = ""
+    in_html_comment = False
+    # A leading `---` opens front matter only if a matching delimiter closes it.
+    # Otherwise it is a horizontal rule, and treating it as an unterminated
+    # front-matter block would swallow the whole document unchecked.
+    front_matter_marker = (
+        lines[0].strip() if lines and _RE_FRONT_MATTER.match(lines[0]) else ""
+    )
+    in_front_matter = bool(front_matter_marker) and any(
+        line.strip() == front_matter_marker for line in lines[1:]
+    )
+    in_table = False
+
+    block: list[tuple[int, str]] = []
+    block_kind: str | None = None  # "para" | "list" | "quote"
+
+    for idx, raw in enumerate(lines, start=1):
+        if in_front_matter:
+            if idx > 1 and raw.strip() == front_matter_marker:
+                in_front_matter = False
+            continue
+
+        if in_html_comment:
+            if _RE_HTML_COMMENT_CLOSE.search(raw):
+                in_html_comment = False
+            continue
+        if _RE_HTML_COMMENT_OPEN.match(raw):
+            flush(block, block_kind == "quote")
+            block, block_kind = [], None
+            if not _RE_HTML_COMMENT_CLOSE.search(raw):
+                in_html_comment = True
+            continue
+
+        fence = _RE_FENCE.match(raw)
+        if fence:
+            flush(block, block_kind == "quote")
+            block, block_kind = [], None
+            if not in_fence:
+                in_fence, fence_marker = True, fence.group(1)
+            elif fence_marker in raw:
+                in_fence, fence_marker = False, ""
+            continue
+        if in_fence:
+            continue
+
+        if not raw.strip():
+            flush(block, block_kind == "quote")
+            block, block_kind, in_table = [], None, False
+            continue
+
+        # A delimiter row proves the line above it was a table header, not the
+        # first line of a paragraph. This is what makes a pipe-less GFM table
+        # (`a | b` over `--- | ---`) readable as a table.
+        if _RE_TABLE_DELIMITER.match(raw):
+            if block_kind == "para" and block:
+                block.pop()
+            flush(block, False)
+            block, block_kind, in_table = [], None, True
+            continue
+        if in_table:
+            if "|" in raw:
+                continue
+            in_table = False
+
+        if _RE_BLOCKQUOTE.match(raw):
+            if block_kind != "quote":
+                flush(block, block_kind == "quote")
+                block, block_kind = [], "quote"
+            # `>` on its own separates paragraphs inside the quote.
+            if not raw.lstrip("> ").strip():
+                flush(block, True)
+                block = []
+            else:
+                block.append((idx, raw))
+            continue
+
+        if _RE_LIST_MARKER.match(raw):
+            flush(block, block_kind == "quote")
+            block, block_kind = [(idx, raw)], "list"
+            continue
+
+        if is_structure(raw):
+            flush(block, block_kind == "quote")
+            block, block_kind = [], None
+            continue
+
+        # An indented line directly under a list item is that item's lazy
+        # continuation -- the wrapped-bullet case. Outside a list, and with no
+        # paragraph open, it is an indented code block.
+        if _RE_INDENTED_CODE.match(raw) and block_kind != "list" and not block:
+            continue
+
+        if block_kind == "list":
+            block.append((idx, raw))  # lazy continuation of the item
+            continue
+
+        if block_kind != "para":
+            flush(block, block_kind == "quote")
+            block, block_kind = [], "para"
+        block.append((idx, raw))
+
+    flush(block, block_kind == "quote")
+    return violations
+
+
+def out_of_scope(path: str) -> bool:
+    """True iff the repo does not own this file's prose."""
+    normalised = path.replace(os.sep, "/")
+    if normalised.endswith(".gotmpl"):
+        return True
+    return any(rx.search(normalised) for rx in OUT_OF_SCOPE)
+
+
+def is_markdown(path: str) -> bool:
+    return path.lower().endswith(MARKDOWN_SUFFIXES)
+
+
+def read_text_file(path: str) -> str | None:
+    """Read a regular file, or None if it is missing, huge, or not a file.
+
+    A fifo or a character device would block forever, and the agent with it.
+    """
+    try:
+        expanded = os.path.expanduser(path)
+        info = os.stat(expanded)
+        if not stat.S_ISREG(info.st_mode) or info.st_size > MAX_BODY_FILE_BYTES:
+            return None
+        with open(expanded, encoding="utf-8") as fh:
+            return fh.read()
+    except (OSError, UnicodeDecodeError):
+        return None
+
+
+def added_violations(before: str | None, after: str) -> list[Violation]:
+    """Return the violations whose line breaks THIS edit introduced.
+
+    Legacy documents are wrapped throughout, and demanding that an agent reflow
+    a file it only meant to touch one word of is how a hook gets switched off.
+    But "is this violation new" survives neither of the obvious tests: comparing
+    the violations' text refuses a typo fix inside a paragraph that was already
+    wrapped, and counting them lets a file be rewritten as entirely fresh
+    hardwrapped prose so long as the total does not rise.
+
+    The question that does hold up is about the break, not the block: a soft
+    break is this edit's doing only when BOTH lines it joins are lines the edit
+    wrote. Touching one line of a pair that was already wrapped leaves the break
+    where it was; writing both lines is what creates it.
+    """
+    found = find_violations(after)
+    if before is None or not found:
+        return found
+
+    before_lines = before.split("\n")
+    after_lines = after.split("\n")
+
+    # Lines of `after` that came through the edit untouched, 1-based.
+    untouched: set[int] = set()
+    matcher = difflib.SequenceMatcher(None, before_lines, after_lines, autojunk=False)
+    for tag, _, _, start_line, end_line in matcher.get_opcodes():
+        if tag == "equal":
+            untouched.update(range(start_line + 1, end_line + 1))
+
+    def edit_wrote_this_break(violation: Violation) -> bool:
+        return any(
+            number not in untouched and number + 1 not in untouched
+            for number in range(violation.start_line, violation.end_line)
+        )
+
+    return [v for v in found if edit_wrote_this_break(v)]
+
+
+def apply_edits(original: str, tool_input: dict) -> str | None:
+    """Apply an Edit/MultiEdit payload to the file's current text."""
+    edits: list[dict] = []
+    if isinstance(tool_input.get("edits"), list):
+        edits = [e for e in tool_input["edits"] if isinstance(e, dict)]
+    elif isinstance(tool_input.get("new_string"), str):
+        edits = [tool_input]
+
+    result = original
+    for edit in edits:
+        old = edit.get("old_string")
+        new = edit.get("new_string")
+        if not isinstance(old, str) or not isinstance(new, str) or not old:
+            return None  # an empty old_string would prepend, not replace
+        if old not in result:
+            return None  # cannot reproduce the edit; do not guess
+        if edit.get("replace_all"):
+            result = result.replace(old, new)
+        else:
+            result = result.replace(old, new, 1)
+    return result
+
+
+def gh_subcommand(args: list[str]) -> tuple[str, ...] | None:
+    """Return the (noun, action) a `gh` invocation names, or None.
+
+    Position alone cannot find the subcommand: a global flag may precede it,
+    and `gh -R owner/repo pr comment` would be read as the subcommand
+    `owner/repo`, letting the body through. Match on the token's value.
+    """
+    noun: str | None = None
+    for token in args:
+        if noun is None:
+            if token == "api":
+                return ("api",)
+            if token in GH_NOUNS:
+                noun = token
+        elif token in GH_ACTIONS:
+            return (noun, token)
+    return None
+
+
+HEREDOC_MARKER = "__COZY_HEREDOC_{}__"
+_RE_HEREDOC_MARKER = re.compile(r"__COZY_HEREDOC_(\d+)__")
+
+
+def split_off_heredocs(command: str) -> tuple[str, list[str]]:
+    """Split a command line into (command with heredocs marked, their bodies).
+
+    A heredoc body is data, and shlex would tokenise it into nonsense. Lift the
+    bodies out and leave a marker where each opener stood, so that the body can
+    later be traced back to the command that opened it -- a heredoc feeding
+    `kubectl apply -f -` is not a GitHub body just because a `gh` call shares
+    the line.
+
+    Every line is scanned for an opener, not only the first: a long `gh` call is
+    routinely spread over backslash-continued lines, the heredoc opening on the
+    last of them.
+    """
+    kept: list[str] = []
+    bodies: list[str] = []
+    body: list[str] = []
+    pending: list[str] = []
+
+    for line in command.split("\n"):
+        if pending:
+            if line.strip() == pending[0]:
+                bodies.append("\n".join(body))
+                body, pending = [], pending[1:]
+            else:
+                body.append(line)
+            continue
+
+        openers = list(_RE_HEREDOC.finditer(line))
+        if openers:
+            marked = line
+            for offset, opener in enumerate(openers):
+                index = len(bodies) + len(pending) + offset
+                marked = marked.replace(
+                    opener.group(0), HEREDOC_MARKER.format(index), 1
+                )
+            kept.append(marked)
+            pending.extend(m.group(2) for m in openers)
+        else:
+            kept.append(line)
+
+    if body:  # unterminated heredoc: take what we have
+        bodies.append("\n".join(body))
+
+    return "\n".join(kept), bodies
+
+
+def stdin_redirect(args: list[str]) -> str | None:
+    """Return the file a `< path` redirect feeds this segment's stdin from."""
+    for index, arg in enumerate(args):
+        if arg == "<" and index + 1 < len(args):
+            return args[index + 1]
+        if arg.startswith("<") and len(arg) > 1 and not arg.startswith("<<"):
+            return arg[1:]
+    return None
+
+
+def owned_heredocs(args: list[str], bodies: list[str]) -> list[str]:
+    """Return the heredoc bodies opened by this segment, in order."""
+    owned: list[str] = []
+    for arg in args:
+        for match in _RE_HEREDOC_MARKER.finditer(arg):
+            index = int(match.group(1))
+            if index < len(bodies):
+                owned.append(bodies[index])
+    return owned
+
+
+def newlines_to_separators(command: str) -> str:
+    """Turn command-separating newlines into `;`, leaving quoted ones alone.
+
+    shlex treats a newline as plain whitespace, so a script whose second line
+    is the `gh` call lexes into one segment beginning with the FIRST line's
+    command -- and the `gh` invocation is never recognised as one. A newline
+    inside a quoted string belongs to the body and must survive; a
+    backslash-continued newline joins one command, so it is not a separator.
+    """
+    out: list[str] = []
+    quote: str | None = None
+    index = 0
+
+    while index < len(command):
+        char = command[index]
+
+        if quote:
+            if char == "\\" and quote == '"' and index + 1 < len(command):
+                out.append(char)
+                out.append(command[index + 1])
+                index += 2
+                continue
+            if char == quote:
+                quote = None
+            out.append(char)
+            index += 1
+            continue
+
+        if char in ("'", '"'):
+            quote = char
+            out.append(char)
+            index += 1
+            continue
+
+        if char == "\\" and index + 1 < len(command) and command[index + 1] == "\n":
+            out.append(" ")  # line continuation: one command, not two
+            index += 2
+            continue
+
+        if char == "\n":
+            out.append(" ; ")
+            index += 1
+            continue
+
+        out.append(char)
+        index += 1
+
+    return "".join(out)
+
+
+def shell_assembled(value: str) -> bool:
+    """True iff the shell, not the agent, decides what this argument says.
+
+    `--body "$(cat <<EOF …)"` is the standard way to pass a multi-line body in
+    a single call. What the hook sees is shell syntax, and reading it as
+    markdown would refuse a body that has nothing to reflow -- so leave the
+    argument alone and judge the heredoc it draws from instead.
+    """
+    return bool(re.search(r"\$\(|\$\{|`", value))
+
+
+def json_bodies(text: str) -> list[str]:
+    """Return the prose fields of a JSON document (`gh api --input` payload).
+
+    A JSON heredoc is not markdown: its braces and quoted keys are not a
+    wrapped paragraph. Only the human-facing values inside it are prose.
+    """
+    try:
+        data = json.loads(text)
+    except (json.JSONDecodeError, ValueError):
+        return []
+
+    found: list[str] = []
+
+    def walk(node: object) -> None:
+        if isinstance(node, dict):
+            for key, value in node.items():
+                if key in ("body", "text") and isinstance(value, str):
+                    found.append(value)
+                else:
+                    walk(value)
+        elif isinstance(node, list):
+            for item in node:
+                walk(item)
+
+    walk(data)
+    return found
+
+
+def segment_bodies(args: list[str], is_api: bool) -> tuple[list[str], bool]:
+    """Return (bodies, wants_stdin) for one `gh` segment's arguments."""
+    bodies: list[str] = []
+    wants_stdin = False
+
+    idx = 0
+    while idx < len(args):
+        arg = args[idx]
+        nxt = args[idx + 1] if idx + 1 < len(args) else None
+
+        if is_api:
+            # For `gh api`, -F is --raw-field, not --body-file.
+            if arg in API_FIELD_FLAGS and nxt is not None:
+                if nxt.startswith("body=") or nxt.startswith("text="):
+                    value = nxt.split("=", 1)[1]
+                    if value.startswith("@"):
+                        content = read_text_file(value[1:])
+                        if content is not None:
+                            bodies.append(content)
+                    else:
+                        bodies.append(value)
+                idx += 2
+                continue
+            if arg == "--input" and nxt is not None:
+                if nxt == "-":
+                    wants_stdin = True
+                else:
+                    content = read_text_file(nxt)
+                    if content is not None:
+                        bodies.extend(json_bodies(content))
+                idx += 2
+                continue
+            idx += 1
+            continue
+
+        if arg in BODY_FLAGS and nxt is not None:
+            if not shell_assembled(nxt):
+                bodies.append(nxt)
+            idx += 2
+            continue
+        if arg.startswith(("--body=", "--notes=")):
+            value = arg.split("=", 1)[1]
+            if not shell_assembled(value):
+                bodies.append(value)
+            idx += 1
+            continue
+        if arg in BODY_FILE_FLAGS and nxt is not None:
+            if nxt == "-":
+                wants_stdin = True
+            elif not out_of_scope(nxt):
+                content = read_text_file(nxt)
+                if content is not None:
+                    bodies.append(content)
+            idx += 2
+            continue
+        if arg.startswith(("--body-file=", "--notes-file=")):
+            value = arg.split("=", 1)[1]
+            if value == "-":
+                wants_stdin = True
+            elif not out_of_scope(value):
+                content = read_text_file(value)
+                if content is not None:
+                    bodies.append(content)
+            idx += 1
+            continue
+        idx += 1
+
+    return bodies, wants_stdin
+
+
+def gh_bodies(command: str) -> list[str]:
+    """Return every body a `gh` command line would publish to GitHub."""
+    if "gh" not in command:
+        return []
+
+    stripped, heredocs = split_off_heredocs(command)
+    stripped = newlines_to_separators(stripped)
+
+    # punctuation_chars makes the lexer return `;`, `&&`, `|`, `(` and friends
+    # as tokens of their own. Without it `git push; gh pr create …` lexes as
+    # `push;` plus a `gh` that never starts a segment, and the body it
+    # publishes is never seen.
+    try:
+        lexer = shlex.shlex(stripped, posix=True, punctuation_chars=True)
+        lexer.whitespace_split = True
+        tokens = list(lexer)
+    except ValueError:  # unbalanced quotes: not ours to judge
+        return []
+
+    # A command line may chain several commands; only `gh` segments matter.
+    separators = (";", "&", "&&", "||", "|", "(", ")", "{", "}", "\n")
+    segments: list[list[str]] = [[]]
+    for token in tokens:
+        if token in separators:
+            segments.append([])
+        else:
+            segments[-1].append(token)
+
+    bodies: list[str] = []
+    for segment in segments:
+        # An environment prefix (`GH_TOKEN=… gh …`) would otherwise hide the
+        # `gh` behind a token that is not a command name.
+        while segment and re.match(r"^[A-Za-z_][A-Za-z0-9_]*=", segment[0]):
+            segment = segment[1:]
+        if not segment or os.path.basename(segment[0]) != "gh":
+            continue
+
+        subcommand = gh_subcommand(segment[1:])
+        if subcommand not in GH_PUBLISHING_SUBCOMMANDS:
+            continue
+
+        is_api = subcommand == ("api",)
+        found, wants_stdin = segment_bodies(segment[1:], is_api)
+        bodies.extend(found)
+
+        # A heredoc THIS segment opened is the body it publishes -- as JSON for
+        # `gh api`, as markdown otherwise. A heredoc opened by another command
+        # on the same line (a commit message, a YAML manifest) belongs to that
+        # command, and blocking on it would be a false positive of exactly the
+        # kind that gets a hook switched off.
+        owned = owned_heredocs(segment[1:], heredocs)
+        for heredoc in owned:
+            bodies.extend(json_bodies(heredoc) if is_api else [heredoc])
+
+        # `--body-file -` / `--input -` take the body from stdin; a `< file`
+        # redirect says which file that is. Without following it the body
+        # publishes unread.
+        if wants_stdin and not owned:
+            source = stdin_redirect(segment[1:])
+            if source and not out_of_scope(source):
+                content = read_text_file(source)
+                if content is not None:
+                    bodies.extend(json_bodies(content) if is_api else [content])
+
+    return bodies
+
+
+def truncate(text: str, limit: int = 160) -> str:
+    return text if len(text) <= limit else text[: limit - 1] + "…"
+
+
+def report(subject: str, violations: list[Violation]) -> None:
+    lines = [
+        "BLOCKED: hardwrapped prose.",
+        "AGENTS.md rule: one continuous line per paragraph — the renderer wraps to viewer width.",
+        "Reflow each block below onto a single line, then retry.",
+        "",
+        f"Subject: {subject}",
+    ]
+    for v in violations[:5]:
+        lines.append(f"  - lines {v.start_line}-{v.end_line}: {truncate(v.text)}")
+    if len(violations) > 5:
+        lines.append(f"  - … and {len(violations) - 5} more")
+    print("\n".join(lines), file=sys.stderr)
+
+
+def main() -> int:
+    try:
+        payload = json.load(sys.stdin)
+    except (json.JSONDecodeError, UnicodeDecodeError):
+        return 0
+    if not isinstance(payload, dict):
+        return 0
+
+    tool_name = payload.get("tool_name", "")
+    tool_input = payload.get("tool_input")
+    if not isinstance(tool_input, dict):
+        return 0
+
+    violations: list[Violation] = []
+
+    if tool_name in ("Write", "Edit", "MultiEdit"):
+        path = tool_input.get("file_path")
+        if not isinstance(path, str) or not is_markdown(path) or out_of_scope(path):
+            return 0
+
+        subject = path
+        before = read_text_file(path)
+
+        if tool_name == "Write":
+            after = tool_input.get("content")
+            if not isinstance(after, str):
+                return 0
+        else:
+            if before is None:
+                return 0  # cannot see the file, cannot judge the hunk
+            after = apply_edits(before, tool_input)
+            if after is None:
+                return 0
+
+        violations = added_violations(before, after)
+
+    elif tool_name == "Bash":
+        command = tool_input.get("command")
+        if not isinstance(command, str):
+            return 0
+        subject = "gh command body"
+        for body in gh_bodies(command):
+            violations.extend(find_violations(body))
+
+    else:
+        return 0
+
+    if not violations:
+        return 0
+
+    report(str(subject), violations)
+    return 2
+
+
+if __name__ == "__main__":
+    sys.exit(main())
diff --git a/.claude/settings.json b/.claude/settings.json
new file mode 100644
index 0000000000..395314de68
--- /dev/null
+++ b/.claude/settings.json
@@ -0,0 +1,16 @@
+{
+  "hooks": {
+    "PreToolUse": [
+      {
+        "matcher": "Write|Edit|MultiEdit|Bash",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "$CLAUDE_PROJECT_DIR/.claude/hooks/md-no-hardwrap.py",
+            "timeout": 10
+          }
+        ]
+      }
+    ]
+  }
+}
diff --git a/.clomonitor.yml b/.clomonitor.yml
new file mode 100644
index 0000000000..26444486e7
--- /dev/null
+++ b/.clomonitor.yml
@@ -0,0 +1,8 @@
+# CLOMonitor metadata file, read when CLOMonitor lints this repository:
+# https://clomonitor.io/projects/cncf/cozystack
+# Format: https://github.com/cncf/clomonitor/blob/main/docs/metadata/.clomonitor.yml
+
+# License scanning results: the CNCF FOSSA project for this repository, kept
+# current by the FOSSA GitHub integration on the cozystack organization (#4758).
+licenseScanning:
+  url: https://app.fossa.com/projects/git%2Bgithub.com%2Fcozystack%2Fcozystack
diff --git a/.gemini/styleguide.md b/.gemini/styleguide.md
index 7185a6257e..4b920837e3 100644
--- a/.gemini/styleguide.md
+++ b/.gemini/styleguide.md
@@ -107,4 +107,4 @@ When reviewing `values.schema.json`:
 - Missing comments on generated code.
 - `go.sum` changes accompanying `go.mod` changes — expected and correct.
 - Fork relationships for vendored tooling images — intentional (e.g., `cozystack/kilo` fork is expected).
-- Absence of unit tests for vendored chart overrides — covered by E2E tests in `hack/e2e-apps/`.
+- Absence of unit tests for vendored chart overrides — covered by E2E tests in `hack/e2e-chainsaw/`.
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000000..b114c596bb
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,4 @@
+# Unified diff context has a marker before Go tabs and blank lines.
+packages/system/capi-providers-infraprovider/images/cluster-api-provider-kubevirt/patches/*.diff -whitespace
+packages/system/cilium/images/cilium-operator/patches/*.diff -whitespace
+packages/system/seaweedfs/images/seaweedfs/patches/*.diff -whitespace
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 2482712d0e..1a31f3689a 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1 +1,86 @@
-* @kvaps @lllamnyp @lexfrei @androndo @IvanHunters @sircthulhu @myasnikovdaniil
+# Path-to-owner mapping for this repository. MAINTAINERS.md names the people and
+# points here for the areas; CONTRIBUTOR_LADDER.md defines the roles. Security
+# reports do NOT come through this file — see SECURITY.md.
+#
+# Two mechanics shape the file, and both fail silently.
+#
+# Matching REPLACES, it does not merge. Only the LAST matching pattern applies,
+# and it discards every broader one including the * catch-all, so exactly one
+# line decides the owners of any given path. There is no syntax for "these
+# people may review anything" — repeating the handles on every line is that
+# statement. A rule that omits someone strips their ownership of those paths.
+#
+# A handle without write access to this repository is ignored and no error is
+# reported, which leaves the paths it scopes gating on nobody. Check write access
+# before adding a handle.
+#
+# Rules run broad to specific. An area with no rule of its own is owned by the
+# tier rule above it — add a person to an existing rule rather than carving a new
+# path for them.
+
+*                                    @kvaps @lllamnyp @lexfrei @myasnikovdaniil @IvanHunters
+
+/api/                                @kvaps @lllamnyp @lexfrei @myasnikovdaniil @IvanHunters @sircthulhu
+/cmd/                                @kvaps @lllamnyp @lexfrei @myasnikovdaniil @IvanHunters @sircthulhu
+/internal/                           @kvaps @lllamnyp @lexfrei @myasnikovdaniil @IvanHunters @sircthulhu
+/pkg/                                @kvaps @lllamnyp @lexfrei @myasnikovdaniil @IvanHunters @sircthulhu
+
+/packages/core/                      @kvaps @lllamnyp @lexfrei @myasnikovdaniil @IvanHunters @sircthulhu @kingdonb
+/packages/system/                    @kvaps @lllamnyp @lexfrei @myasnikovdaniil @IvanHunters @sircthulhu @mattia-eleuteri
+/packages/extra/                     @kvaps @lllamnyp @lexfrei @myasnikovdaniil @IvanHunters @sircthulhu @mattia-eleuteri
+/packages/apps/                      @kvaps @lllamnyp @lexfrei @myasnikovdaniil @IvanHunters @matthieu-robin @scooby87
+
+/packages/apps/vm-*/                 @kvaps @lllamnyp @lexfrei @myasnikovdaniil @IvanHunters @scooby87 @mattia-eleuteri
+/packages/system/kubevirt*/          @kvaps @lllamnyp @lexfrei @myasnikovdaniil @IvanHunters @scooby87 @mattia-eleuteri
+/packages/system/vm-*/               @kvaps @lllamnyp @lexfrei @myasnikovdaniil @IvanHunters @scooby87 @mattia-eleuteri
+/packages/system/gpu-operator/       @kvaps @lllamnyp @lexfrei @myasnikovdaniil @IvanHunters @scooby87 @mattia-eleuteri
+/packages/system/hami/               @kvaps @lllamnyp @lexfrei @myasnikovdaniil @IvanHunters @scooby87 @mattia-eleuteri
+/dashboards/gpu/                     @kvaps @lllamnyp @lexfrei @myasnikovdaniil @IvanHunters @scooby87 @mattia-eleuteri
+/dashboards/kubevirt/                @kvaps @lllamnyp @lexfrei @myasnikovdaniil @IvanHunters @scooby87 @mattia-eleuteri
+
+/api/backups/                        @kvaps @lllamnyp @lexfrei @myasnikovdaniil @IvanHunters @androndo @mattia-eleuteri
+/cmd/backup*-controller/             @kvaps @lllamnyp @lexfrei @myasnikovdaniil @IvanHunters @androndo @mattia-eleuteri
+/internal/backupcontroller/          @kvaps @lllamnyp @lexfrei @myasnikovdaniil @IvanHunters @androndo @mattia-eleuteri
+/examples/backups/                   @kvaps @lllamnyp @lexfrei @myasnikovdaniil @IvanHunters @androndo @mattia-eleuteri
+/packages/system/backup*-controller/ @kvaps @lllamnyp @lexfrei @myasnikovdaniil @IvanHunters @androndo @mattia-eleuteri
+/packages/system/velero/             @kvaps @lllamnyp @lexfrei @myasnikovdaniil @IvanHunters @androndo @mattia-eleuteri
+/packages/system/vsnap-crd/          @kvaps @lllamnyp @lexfrei @myasnikovdaniil @IvanHunters @androndo @mattia-eleuteri
+
+/packages/system/keycloak*/          @kvaps @lllamnyp @lexfrei @myasnikovdaniil @IvanHunters @sircthulhu
+
+/packages/system/capi-providers-infraprovider-proxmox/ @kvaps @lllamnyp @lexfrei @myasnikovdaniil @IvanHunters @sircthulhu @mattia-eleuteri @themoriarti
+/packages/system/proxmox-*/          @kvaps @lllamnyp @lexfrei @myasnikovdaniil @IvanHunters @sircthulhu @mattia-eleuteri @themoriarti
+
+/cmd/flux-*/                         @kvaps @lllamnyp @lexfrei @myasnikovdaniil @IvanHunters @kingdonb
+/internal/flux*/                     @kvaps @lllamnyp @lexfrei @myasnikovdaniil @IvanHunters @kingdonb
+/packages/core/flux-aio/             @kvaps @lllamnyp @lexfrei @myasnikovdaniil @IvanHunters @kingdonb
+/packages/system/flux-*/             @kvaps @lllamnyp @lexfrei @myasnikovdaniil @IvanHunters @kingdonb
+/dashboards/flux/                    @kvaps @lllamnyp @lexfrei @myasnikovdaniil @IvanHunters @kingdonb
+
+/.github/                            @kvaps @lllamnyp @lexfrei @myasnikovdaniil @IvanHunters
+/hack/                               @kvaps @lllamnyp @lexfrei @myasnikovdaniil @IvanHunters
+/test/                               @kvaps @lllamnyp @lexfrei @myasnikovdaniil @IvanHunters
+/tools/                              @kvaps @lllamnyp @lexfrei @myasnikovdaniil @IvanHunters
+/Makefile                            @kvaps @lllamnyp @lexfrei @myasnikovdaniil @IvanHunters
+/.pre-commit-config.yaml             @kvaps @lllamnyp @lexfrei @myasnikovdaniil @IvanHunters
+
+/docs/                               @kvaps @lllamnyp @lexfrei @myasnikovdaniil @IvanHunters @tym83
+/ADOPTERS.md                         @kvaps @lllamnyp @lexfrei @myasnikovdaniil @IvanHunters @tym83
+/CODE_OF_CONDUCT.md                  @kvaps @lllamnyp @lexfrei @myasnikovdaniil @IvanHunters @tym83
+/CONTRIBUTING.md                     @kvaps @lllamnyp @lexfrei @myasnikovdaniil @IvanHunters @tym83
+/CONTRIBUTOR_LADDER.md               @kvaps @lllamnyp @lexfrei @myasnikovdaniil @IvanHunters @tym83
+/GENERAL_TECHNICAL_REVIEW.md         @kvaps @lllamnyp @lexfrei @myasnikovdaniil @IvanHunters @tym83
+/GOVERNANCE.md                       @kvaps @lllamnyp @lexfrei @myasnikovdaniil @IvanHunters @tym83
+/LICENSE                             @kvaps @lllamnyp @lexfrei @myasnikovdaniil @IvanHunters @tym83
+/MAINTAINERS.md                      @kvaps @lllamnyp @lexfrei @myasnikovdaniil @IvanHunters @tym83
+/README.md                           @kvaps @lllamnyp @lexfrei @myasnikovdaniil @IvanHunters @tym83
+/ROADMAP.md                          @kvaps @lllamnyp @lexfrei @myasnikovdaniil @IvanHunters @tym83
+/SECURITY.md                         @kvaps @lllamnyp @lexfrei @myasnikovdaniil @IvanHunters @tym83
+
+# `make generate` produces the paths below from each app's values.yaml, which is
+# already reviewed under the rules above, and the pre-commit run-make-generate /
+# run-make-generate-root CI hooks regenerate and fail on any diff. A pattern
+# listed with no owner is what waives the rules above for just these paths.
+/api/apps/v1alpha1/*/types.go
+/api/apps/v1alpha1/*/zz_generated.deepcopy.go
+/packages/system/*/cozyrds/
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index fefdab821f..fcd2b50db6 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,7 +1,7 @@
 ---
 name: Bug report
 about: Create a report to help us improve
-labels: 'kind/bug'
+labels: 'kind/bug, triage/needs-triage'
 assignees: ''
 
 ---
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 0000000000..737c5e3f25
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,14 @@
+blank_issues_enabled: false
+contact_links:
+  - name: 💬 Question, help, or an early idea
+    url: https://github.com/cozystack/cozystack/discussions
+    about: Usage questions, troubleshooting, or a "should we…" idea that isn't a concrete request yet — start a Discussion. The community and maintainers answer here.
+  - name: 📐 Design proposal / RFC (architectural or cross-cutting)
+    url: https://github.com/cozystack/community/tree/main/design-proposals
+    about: Changes that affect multiple components or APIs, or that need a decision before any code is written (a new subsystem, an API change with tradeoffs). Open a design-proposal PR in the community repo.
+  - name: 🏛️ Governance, process, or community
+    url: https://github.com/cozystack/community/issues/new
+    about: Maintainership, decision-making, meetings, working groups, community resources — these live in the community repo.
+  - name: 💬 Chat (Telegram / CNCF Slack)
+    url: https://t.me/cozystack
+    about: Real-time discussion with the Cozystack community.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000000..c4028198ad
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,42 @@
+---
+name: Feature request
+about: Propose a concrete, scoped improvement to Cozystack
+labels: 'kind/feature, triage/needs-triage'
+assignees: ''
+
+---
+<!--
+Before you file, make sure this is the right place:
+
+  • A usage question or a half-formed idea?
+    → Start a GitHub Discussion instead: https://github.com/cozystack/cozystack/discussions
+
+  • A cross-cutting or architectural change — one that affects multiple components
+    or APIs, or that needs a decision agreed before any code is written?
+    → Open a design proposal in the community repo:
+      https://github.com/cozystack/community/tree/main/design-proposals
+
+This template is for a CONCRETE, SCOPED feature that a maintainer could pick up
+and implement without first settling an open design question.
+-->
+
+**Problem / motivation**
+
+What are you trying to do, and what is missing or painful today?
+
+**Proposed solution**
+
+What should Cozystack do? Be as concrete as you can — the API field, flag, value, or behavior you expect.
+
+**Scope check**
+
+- [ ] This affects a single component / package (if it spans many, consider a [design proposal](https://github.com/cozystack/community/tree/main/design-proposals))
+- [ ] I can describe the expected behavior concretely (if not, consider a [Discussion](https://github.com/cozystack/cozystack/discussions) first)
+
+**Alternatives considered**
+
+Other approaches you weighed, and why this one.
+
+**Additional context**
+
+Links, related issues, screenshots, prior art.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 044dd6a083..1e368718e1 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -8,7 +8,7 @@
   - Breaking changes: append `!` after type/scope (`feat(api)!: ...`) or add a `BREAKING CHANGE:` footer
 - If it's a work in progress, consider creating this PR as a draft.
 - Don't hesistate to ask for opinion and review in the community chats, even if it's still a draft.
-- Add the label `backport` if it's a bugfix that needs to be backported to a previous version.
+- Add the label `kind/backport` if it's a bugfix that needs to be backported to a previous version.
 -->
 
 ## What this PR does
@@ -19,6 +19,34 @@
 <!-- REQUIRED for UI changes: attach screenshots or screen recordings demonstrating
 the visual impact of your changes. PRs with UI changes without screenshots will not be merged. -->
 
+### Downstream repositories
+
+<!--
+Cozystack is upstream for repositories that are NOT kept in sync with it automatically, and nothing in CI compares the two sides, so a change here can break them silently.
+
+Which change forces what, and which file to touch, is the trigger map in docs/agents/contributing.md under "Downstream Repositories". Walk it before you tick anything.
+
+IF YOU ARE AN AI AGENT OR AN LLM, THIS IS PART OF THE TASK, NOT A FORM TO FILL IN:
+
+1. Walk the trigger map against the actual diff of this PR, file by file. Do not decide from the PR title or from your memory of what you changed.
+2. For every repository you tick, open the follow-up PR there and link it on the same line. A ticked box with no link claims work that does not exist, which is worse than an empty box. Search that repository for an open PR or issue covering it first, and link that instead of filing a duplicate.
+3. When the follow-up is out of scope, or needs a decision that is not yours to make, open an issue in that repository instead, link that, and say so in the PR body. Do not push a speculative PR into another repository just to fill a line here.
+4. Do not tick "No downstream repository is affected" to make the checklist go away. If you are unsure, leave every box empty and say so in the PR body, so a human decides.
+-->
+
+- [ ] No downstream repository is affected by this change
+- [ ] [cozystack/website](https://github.com/cozystack/website) - follow-up:
+- [ ] [cozystack/terraform-provider-cozystack](https://github.com/cozystack/terraform-provider-cozystack) - follow-up:
+- [ ] [cozystack/ansible-cozystack](https://github.com/cozystack/ansible-cozystack) - follow-up:
+- [ ] [cozystack/ccp](https://github.com/cozystack/ccp) - follow-up:
+- [ ] [cozystack/talm](https://github.com/cozystack/talm) - follow-up:
+- [ ] [cozystack/cozyhr](https://github.com/cozystack/cozyhr) - follow-up:
+- [ ] [cozystack/cozy-proxy](https://github.com/cozystack/cozy-proxy) - follow-up:
+- [ ] [cozystack/cozystack-telemetry-server](https://github.com/cozystack/cozystack-telemetry-server) - follow-up:
+- [ ] [cozystack/external-apps-example](https://github.com/cozystack/external-apps-example) - follow-up:
+- [ ] [cozystack/examples](https://github.com/cozystack/examples) - follow-up:
+- [ ] [cozystack/community](https://github.com/cozystack/community) - follow-up:
+
 ### Release note
 
 <!--  Write a release note:
@@ -29,4 +57,4 @@ the visual impact of your changes. PRs with UI changes without screenshots will
 
 ```release-note
 
-```
\ No newline at end of file
+```
diff --git a/.github/actionlint.yaml b/.github/actionlint.yaml
new file mode 100644
index 0000000000..3c787d665b
--- /dev/null
+++ b/.github/actionlint.yaml
@@ -0,0 +1,10 @@
+# Custom self-hosted runner labels (Oracle Cloud ephemeral ARC scale sets) so
+# actionlint doesn't flag them as unknown. Keep in sync with the labels used in
+# .github/workflows/*.yaml.
+self-hosted-runner:
+  labels:
+    - oracle-vm-4cpu-16gb-x86-64
+    - oracle-vm-24cpu-96gb-x86-64
+    - oracle-vm-32cpu-128gb-x86-64
+    - oracle-vm-4cpu-16gb-arm64
+    - oracle-vm-24cpu-96gb-arm64
diff --git a/.github/labels.yml b/.github/labels.yml
index a5a43fba5a..c71518c437 100644
--- a/.github/labels.yml
+++ b/.github/labels.yml
@@ -78,6 +78,18 @@
   color: 'e11d21'
   description: Indicates the change introduces a breaking API or behaviour change
 
+# kind/backport-previous has no upstream Kubernetes equivalent (k8s has no
+# two-release-line model); it stays under kind/ per the file convention.
+- name: kind/backport
+  color: 'fbca04'
+  description: Categorizes issue or PR as requiring a backport to the current release line
+  aliases: ['backport']
+
+- name: kind/backport-previous
+  color: 'fbd876'
+  description: Categorizes issue or PR as requiring a backport to the previous release line
+  aliases: ['backport-previous']
+
 # ──────────────────────────────────────────────
 # priority/ — urgency
 # ──────────────────────────────────────────────
@@ -114,6 +126,10 @@
   color: 'fbca04'
   description: Indicates an issue needs more information in order to work on it
 
+- name: triage/needs-proposal
+  color: 'fbca04'
+  description: Indicates an issue needs a design proposal in cozystack/community before work starts here
+
 - name: triage/not-reproducible
   color: 'fbca04'
   description: Indicates an issue can not be reproduced as described
@@ -170,6 +186,14 @@
   color: 'bfd4f2'
   description: Issues or PRs related to CI workflows, GitHub Actions, automation
 
+- name: area/dependencies
+  color: 'bfd4f2'
+  description: Dependency bumps (Renovate, go.mod); scope `deps`
+
+- name: area/dx
+  color: 'bfd4f2'
+  description: Issues or PRs related to developer tooling (hack/ scripts, package Makefiles, cozypkg)
+
 - name: area/dashboard
   color: 'bfd4f2'
   description: Issues or PRs related to the dashboard / UI
@@ -192,7 +216,11 @@
 
 - name: area/networking
   color: 'bfd4f2'
-  description: Issues or PRs related to networking (ingress, gateway, vpn, metallb, cilium, kube-ovn)
+  description: Issues or PRs related to networking (ingress, gateway, vpn, metallb, kube-ovn)
+
+- name: area/cilium
+  color: 'bfd4f2'
+  description: Issues or PRs related to Cilium (agent, operator, Gateway API, network policy, LB-IPAM)
 
 - name: area/platform
   color: 'bfd4f2'
@@ -214,6 +242,22 @@
   color: 'bfd4f2'
   description: Issues or PRs related to virtualization (kubevirt, cdi, vmi, vm-import)
 
+- name: area/kamaji
+  color: 'bfd4f2'
+  description: Issues or PRs related to Kamaji (hosted control planes for tenant Kubernetes)
+
+- name: area/keycloak
+  color: 'bfd4f2'
+  description: Issues or PRs related to Keycloak (SSO / identity)
+
+- name: area/openbao
+  color: 'bfd4f2'
+  description: Issues or PRs related to OpenBAO (secrets management, seals, auto-unseal)
+
+- name: area/tenant
+  color: 'bfd4f2'
+  description: Issues or PRs related to the tenant chart and multi-tenancy
+
 - name: area/uncategorized
   color: 'fbca04'
   description: PR auto-labeler could not map title scope to a known area/*; please review
@@ -262,14 +306,6 @@
   color: 'aaaaaa'
   description: Requires resolving an issue in an upstream project
 
-- name: backport
-  color: 'fbca04'
-  description: Should change be backported on previous release
-
-- name: backport-previous
-  color: 'fbd876'
-  description: Backport target — previous release line
-
 - name: release
   color: 'aaaaaa'
   description: Releasing a new Cozystack version
diff --git a/.github/renovate.json b/.github/renovate.json
new file mode 100644
index 0000000000..5d19171aa4
--- /dev/null
+++ b/.github/renovate.json
@@ -0,0 +1,116 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:recommended",
+    ":semanticCommits"
+  ],
+  "enabledManagers": ["gomod", "dockerfile", "github-actions", "custom.regex"],
+  "postUpdateOptions": ["gomodTidy", "gomodUpdateImportPaths"],
+  "labels": ["automated", "do-not-merge/hold"],
+  "semanticCommitType": "chore",
+  "semanticCommitScope": "deps",
+  "automerge": false,
+  "platformAutomerge": false,
+  "prConcurrentLimit": 5,
+  "osvVulnerabilityAlerts": true,
+  "vulnerabilityAlerts": {
+    "enabled": true,
+    "labels": ["automated", "security"]
+  },
+  "customManagers": [
+    {
+      "customType": "regex",
+      "description": "Track the etcd image pinned in the extra/etcd EtcdCluster podTemplate. etcd-operator v0.4.5 bakes etcd 3.5.12 into its binary, and the chart overrides it with a hardcoded image string that the gomod/dockerfile managers cannot see. Without this manager the security-relevant pin (etcd 3.5.x releases are overwhelmingly security fixes) would silently age.",
+      "managerFilePatterns": ["/^packages/extra/etcd/templates/etcd-cluster\\.yaml$/"],
+      "matchStrings": ["image:\\s+(?<depName>quay\\.io/coreos/etcd):(?<currentValue>v[0-9]+\\.[0-9]+\\.[0-9]+)"],
+      "datasourceTemplate": "docker"
+    },
+    {
+      "customType": "regex",
+      "description": "Track and keep fresh the clastix/kubectl image digest-pinned in the post-delete cleanup hooks. The ref is assembled at render time by the cozy-lib.image helper (routed through cozy-lib.images-registry so mirrored / air-gapped installs resolve it), so it is neither a Dockerfile nor a go.mod dependency and the built-in managers cannot see it. The helm-values manager is disabled repo-wide (see enabledManagers above), so without this regex manager the digest — a supply-chain pin — would silently age.",
+      "managerFilePatterns": ["/^packages/.+/templates/hooks/.+\\.yaml$/"],
+      "matchStrings": ["clastix/kubectl:(?<currentValue>v[0-9]+\\.[0-9]+(?:\\.[0-9]+)?)@(?<currentDigest>sha256:[a-f0-9]+)"],
+      "datasourceTemplate": "docker",
+      "depNameTemplate": "docker.io/clastix/kubectl"
+    }
+  ],
+  "packageRules": [
+    {
+      "description": "Force chore(deps) for all Go module bumps. config:recommended pulls in :semanticPrefixFixDepsChoreOthers, whose packageRule re-sets semanticCommitType=fix for direct deps (depType require), overriding the top-level chore. packageRules override top-level config, so a user rule evaluated last is required to win it back; without this, direct-dep PRs land as fix(deps) and get auto-labeled kind/bug.",
+      "matchManagers": ["gomod"],
+      "semanticCommitType": "chore",
+      "semanticCommitScope": "deps"
+    },
+    {
+      "description": "Bump indirect Go modules too. Transitive deps such as golang.org/x/crypto, golang.org/x/net and golang.org/x/sys carry OSV advisories that drive the OpenSSF Scorecard Vulnerabilities check to 0, but Renovate skips indirect gomod deps by default so they never get a PR. Grouped into one rolling PR to keep volume sane; security fixes are still split out by vulnerabilityAlerts above. Placed before the kubernetes rule on purpose: an indirect k8s.io/** dep matches both, and Renovate applies last-match-wins, so the later kubernetes rule keeps it in the kubernetes lockstep group.",
+      "matchManagers": ["gomod"],
+      "matchDepTypes": ["indirect"],
+      "enabled": true,
+      "groupName": "indirect go modules"
+    },
+    {
+      "description": "Keep controller-runtime and the Kubernetes libraries in lockstep. A split bump breaks compilation because a given controller-runtime release expects a matching client-go / apimachinery line.",
+      "groupName": "kubernetes",
+      "matchManagers": ["gomod"],
+      "matchPackageNames": ["sigs.k8s.io/controller-runtime", "k8s.io/**"]
+    },
+    {
+      "description": "Never bump the Go toolchain directive. go.mod is generated and the toolchain is pinned deliberately; raising it needs a matching setup-go and a codegen run, which is out of scope for an automated dependency bump.",
+      "matchManagers": ["gomod"],
+      "matchDepTypes": ["golang"],
+      "enabled": false
+    },
+    {
+      "description": "Pin Dockerfile base images and GitHub Actions to immutable digests so OpenSSF Scorecard Pinned-Dependencies passes and supply-chain refs stay reproducible. The tag is kept in front of the digest so it stays human-readable and trackable.",
+      "matchManagers": ["dockerfile", "github-actions"],
+      "pinDigests": true
+    },
+    {
+      "description": "Batch the initial pin and all digest-only refreshes (same tag, rebuilt upstream) into a single weekly PR. Without this, frequently-rebuilt bases (alpine, debian, golang, distroless) would trickle in one rebuild-triggering PR each, loading the shared CI runner. Real tag bumps (major/minor/patch) are intentionally left out of this group so they get individual review.",
+      "matchManagers": ["dockerfile", "github-actions"],
+      "matchUpdateTypes": ["digest", "pinDigest"],
+      "groupName": "container image & action digests",
+      "schedule": ["before 6am on monday"]
+    },
+    {
+      "description": "The Harbor rebuilds reproduce one upstream release, so their build bases follow upstream's Makefile at that tag (GOBUILDIMAGE, NODEBUILDIMAGE) rather than the newest image. A golang tag bump builds Harbor with a toolchain upstream never shipped it with, and a node major breaks the Angular portal build. Tag bumps are disabled here; digest refreshes of the same tag still arrive through the digest group above. Move the tags by hand with HARBOR_VERSION.",
+      "matchManagers": ["dockerfile"],
+      "matchFileNames": ["packages/system/harbor/images/**"],
+      "matchUpdateTypes": ["major", "minor", "patch"],
+      "enabled": false
+    },
+    {
+      "description": "The cilium-operator rebuild compiles one upstream release with the Go toolchain upstream's builder image pins at that tag, and `make update` in packages/system/cilium re-pins the builder line from there. A Renovate bump, by tag or by digest, builds with a toolchain upstream never shipped the release with, and the next `make update` silently reverts it. The operator-generic base stage and its VERSION and UPSTREAM_DIGEST args are pinned by the same recipe, and VERSION also selects the source archive SOURCE_SHA256 checks. Updates are disabled here; all of them move with the Cilium version.",
+      "matchManagers": ["dockerfile"],
+      "matchFileNames": ["packages/system/cilium/images/cilium-operator/**"],
+      "enabled": false
+    },
+    {
+      "description": "Split golang patch from minor updates for the e2e sandbox builder, so the rule below can drop the minor bump without taking the patch bump with it. By default both land in one non-major bucket and only the newest release is proposed.",
+      "matchManagers": ["dockerfile"],
+      "matchFileNames": ["packages/core/testing/images/e2e-sandbox/**"],
+      "matchPackageNames": ["golang"],
+      "separateMinorPatch": true
+    },
+    {
+      "description": "The e2e sandbox builds a patched chainsaw release with the Go minor upstream shipped that release with. A golang minor or major bump builds it with a toolchain upstream never shipped it with. Patch and digest updates of the same minor still arrive; move the minor by hand together with CHAINSAW_VERSION.",
+      "matchManagers": ["dockerfile"],
+      "matchFileNames": ["packages/core/testing/images/e2e-sandbox/**"],
+      "matchPackageNames": ["golang"],
+      "matchUpdateTypes": ["major", "minor"],
+      "enabled": false
+    },
+    {
+      "description": "The seaweedfs rebuild compiles one upstream release with the Go toolchain upstream's docker/Dockerfile.go_build uses at that tag, lays it over the upstream image of that tag, and `make update` in packages/system/seaweedfs re-pins the builder, the base image digest and the source checksum from there. A Renovate bump of any of them builds a combination upstream never shipped, and the next `make update` silently reverts it. Updates are disabled here; all of them move with the SeaweedFS version.",
+      "matchManagers": ["dockerfile"],
+      "matchFileNames": ["packages/system/seaweedfs/images/seaweedfs/**"],
+      "enabled": false
+    },
+    {
+      "description": "kubevirt.io/csi-driver is pinned to an untagged pseudo-version commit and publishes no release tags, so Renovate's go datasource returns no-result and the lookup failure lingers on the Dependency Dashboard. Disable it; this module is advanced deliberately alongside the kubevirt-csi-driver image build.",
+      "matchManagers": ["gomod"],
+      "matchPackageNames": ["kubevirt.io/csi-driver"],
+      "enabled": false
+    }
+  ]
+}
diff --git a/.github/workflows/api-review-gate.yaml b/.github/workflows/api-review-gate.yaml
new file mode 100644
index 0000000000..b4b55686f6
--- /dev/null
+++ b/.github/workflows/api-review-gate.yaml
@@ -0,0 +1,163 @@
+name: API Review Gate
+
+# Requires a review from a designated API owner (see API_OWNERS below) when a
+# pull request makes a "sizeable" change to the Cozystack API surface: a new
+# API group, a new resource, or a breaking change to an existing resource's
+# schema. Detection is deterministic (cmd/api-gate); no LLM or network calls.
+#
+# The job runs on every PR (no path filter) so it can always report a status
+# and therefore be marked as a required check in branch protection without
+# leaving PRs that touch no API stuck in "pending". When nothing sizeable
+# changed it passes immediately.
+
+on:
+  pull_request:
+    types: [opened, synchronize, reopened]
+  # Re-evaluate when a review is submitted or dismissed so an approval by an
+  # API owner flips the check from failing to passing without a new push.
+  pull_request_review:
+    types: [submitted, dismissed]
+
+concurrency:
+  group: api-review-gate-${{ github.event.pull_request.number }}
+  cancel-in-progress: true
+
+permissions:
+  contents: read
+  pull-requests: read
+
+jobs:
+  api-review-gate:
+    name: Require API owner review for sizeable API changes
+    runs-on: ubuntu-22.04
+    env:
+      # Space-separated GitHub logins allowed to satisfy the gate. Edit here to
+      # change who can approve sizeable API changes.
+      API_OWNERS: "lllamnyp kvaps"
+      BASE_REF: ${{ github.event.pull_request.base.ref }}
+      HEAD_SHA: ${{ github.event.pull_request.head.sha }}
+      PR_NUMBER: ${{ github.event.pull_request.number }}
+      # The pipe falls back to direct on any proxy error (hack/common-envs.mk).
+      GOPROXY: "https://proxy.golang.org|direct"
+    steps:
+      - name: Checkout head
+        uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
+          fetch-depth: 0
+          # Do not leave a usable token in the repo's git config: the PR-authored
+          # build and api-gate steps below must not have access to it. The token
+          # is scoped to the approval step alone, which is the only step that
+          # calls the GitHub API.
+          persist-credentials: false
+
+      - name: Set up Go
+        uses: actions/setup-go@40f1582b2485089dde7abd97c1529aa768e1baff # v5
+        with:
+          go-version-file: go.mod
+          cache: true
+
+      - name: Materialize base checkout at the merge base
+        run: |
+          set -euo pipefail
+          # Diff against the PR's actual merge base, not the base branch tip:
+          # otherwise unrelated commits landing on the base branch while the PR
+          # is open would invent or hide API findings.
+          git fetch --no-tags origin "${BASE_REF}"
+          merge_base="$(git merge-base "${HEAD_SHA}" "origin/${BASE_REF}")"
+          echo "Merge base: ${merge_base}"
+          git worktree add --detach "${RUNNER_TEMP}/base" "${merge_base}"
+
+      - name: Build api-gate
+        run: |
+          set -euo pipefail
+          # Build the detector from a trusted checkout so a PR cannot neuter the
+          # gate by editing its own detector code — the tool analyzes the head as
+          # *data*, not as code. This selection stays inline in the workflow (an
+          # API-owner-protected file that is always present) rather than in a
+          # helper script: a helper would be read from the untrusted PR head,
+          # which both breaks PRs whose head predates the helper and lets a PR
+          # steer the selection.
+          #
+          # Precedence: prefer the merge-base checkout; when the merge base
+          # predates the commit that introduced the gate (cmd/api-gate absent
+          # there and in the equally old head) fall back to the base branch tip,
+          # which is equally trusted (protected branch, not PR-authored) and
+          # current — this unblocks PRs whose merge base is older than the gate
+          # without forcing a rebase. Bootstrap from head only while the tool
+          # exists nowhere on the base branch yet; in that window CODEOWNERS on
+          # cmd/api-gate, internal/apigate, and this workflow keeps tampering
+          # behind an API-owner review.
+          if [ -d "${RUNNER_TEMP}/base/cmd/api-gate" ]; then
+            build_dir="${RUNNER_TEMP}/base"
+            echo "Building api-gate from the trusted merge-base checkout."
+          elif git cat-file -e "origin/${BASE_REF}:cmd/api-gate" 2>/dev/null; then
+            git worktree add --detach "${RUNNER_TEMP}/base-tip" "origin/${BASE_REF}"
+            build_dir="${RUNNER_TEMP}/base-tip"
+            echo "Building api-gate from the ${BASE_REF} tip; the merge base predates the gate."
+          else
+            build_dir="${GITHUB_WORKSPACE}"
+            echo "::warning::api-gate not present on the base branch yet; building from head (bootstrap). CODEOWNERS enforces API-owner review on the gate's own files."
+          fi
+          ( cd "${build_dir}" && go build -o "${RUNNER_TEMP}/api-gate" ./cmd/api-gate )
+
+      - name: Detect sizeable API changes
+        id: detect
+        run: |
+          set -uo pipefail
+          set +e
+          "${RUNNER_TEMP}/api-gate" \
+            --base "${RUNNER_TEMP}/base" \
+            --head "${GITHUB_WORKSPACE}" \
+            --format markdown > "${RUNNER_TEMP}/report.md"
+          code=$?
+          set -e
+          echo "code=${code}" >> "$GITHUB_OUTPUT"
+          cat "${RUNNER_TEMP}/report.md"
+          case "${code}" in
+            0) echo "sizeable=false" >> "$GITHUB_OUTPUT" ;;
+            2) echo "sizeable=true"  >> "$GITHUB_OUTPUT" ;;
+            *) echo "::error::api-gate failed with exit code ${code}"; exit "${code}" ;;
+          esac
+
+      - name: Check for an API owner approval
+        if: steps.detect.outputs.sizeable == 'true'
+        env:
+          GH_TOKEN: ${{ github.token }}
+        run: |
+          set -euo pipefail
+          {
+            echo "## API Review Gate"
+            echo
+            cat "${RUNNER_TEMP}/report.md"
+          } >> "$GITHUB_STEP_SUMMARY"
+
+          # An APPROVED review by any API owner satisfies the gate, but only
+          # each reviewer's *latest* review *on the current head commit* counts:
+          # this drops approvals that a later commit invalidated, and approvals
+          # an owner subsequently superseded with CHANGES_REQUESTED. GitHub
+          # forbids self-approval, so a sizeable PR authored by an owner still
+          # needs the other owner.
+          approvals="$(
+            gh api "repos/${GITHUB_REPOSITORY}/pulls/${PR_NUMBER}/reviews" --paginate |
+            jq -rs --arg head "${HEAD_SHA}" '
+              add
+              | map(select(.commit_id == $head))
+              | sort_by(.submitted_at // "")
+              | group_by(.user.login)
+              | map(last)
+              | .[]
+              | select(.state == "APPROVED")
+              | .user.login
+            '
+          )"
+
+          for owner in ${API_OWNERS}; do
+            if grep -qxi "${owner}" <<<"${approvals}"; then
+              echo "Sizeable API change approved by @${owner}."
+              exit 0
+            fi
+          done
+
+          echo "::error::This PR makes a sizeable API change (new group, new resource, or breaking change) and needs an approving review from one of: ${API_OWNERS}. See the job summary for details."
+          exit 1
diff --git a/.github/workflows/auto-release.yaml b/.github/workflows/auto-release.yaml
deleted file mode 100644
index 44ca8ca64a..0000000000
--- a/.github/workflows/auto-release.yaml
+++ /dev/null
@@ -1,196 +0,0 @@
-name: Auto Patch Release
-
-on:
-  schedule:
-    # Run daily at 2:00 AM CET (1:00 UTC in winter, 0:00 UTC in summer)
-    # Using 1:00 UTC to approximate 2:00 AM CET
-    - cron: '0 1 * * *'
-  workflow_dispatch: # Allow manual trigger
-
-concurrency:
-  group: auto-release-${{ github.workflow }}
-  cancel-in-progress: false
-
-jobs:
-  auto-release:
-    name: Auto Patch Release
-    runs-on: [self-hosted]
-    permissions:
-      contents: write
-      pull-requests: read
-
-    steps:
-      - name: Generate GitHub App token
-        id: app-token
-        uses: actions/create-github-app-token@v1
-        with:
-          app-id: ${{ secrets.COZYSTACK_CI_APP_ID }}
-          private-key: ${{ secrets.COZYSTACK_CI_PRIVATE_KEY }}
-          owner: cozystack
-
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-          fetch-tags: true
-
-      - name: Configure git
-        env:
-          APP_TOKEN: ${{ steps.app-token.outputs.token }}
-        run: |
-          git config user.name  "cozystack-ci[bot]"
-          git config user.email "274107086+cozystack-ci[bot]@users.noreply.github.com"
-          git remote set-url origin https://x-access-token:${APP_TOKEN}@github.com/${GITHUB_REPOSITORY}
-          git config --unset-all http.https://github.com/.extraheader || true
-
-      - name: Process release branches
-        uses: actions/github-script@v7
-        env:
-          APP_TOKEN: ${{ steps.app-token.outputs.token }}
-        with:
-          github-token: ${{ steps.app-token.outputs.token }}
-          script: |
-            const { execSync } = require('child_process');
-
-            // Configure git to use GitHub App token for authentication
-            execSync('git config user.name "cozystack-ci[bot]"', { encoding: 'utf8' });
-            execSync('git config user.email "274107086+cozystack-ci[bot]@users.noreply.github.com"', { encoding: 'utf8' });
-            execSync(`git remote set-url origin https://x-access-token:${process.env.APP_TOKEN}@github.com/${process.env.GITHUB_REPOSITORY}`, { encoding: 'utf8' });
-            // Remove GITHUB_TOKEN extraheader to ensure App token is used (needed to trigger other workflows)
-            execSync('git config --unset-all http.https://github.com/.extraheader || true', { encoding: 'utf8' });
-
-            // Get all release-X.Y branches
-            const branches = execSync('git branch -r | grep -E "origin/release-[0-9]+\\.[0-9]+$" | sed "s|origin/||" | tr -d " "', { encoding: 'utf8' })
-              .split('\n')
-              .filter(b => b.trim())
-              .filter(b => /^release-\d+\.\d+$/.test(b));
-            
-            console.log(`Found ${branches.length} release branches: ${branches.join(', ')}`);
-            
-            // Get all published releases (not draft)
-            const allReleases = await github.rest.repos.listReleases({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              per_page: 100
-            });
-            
-            // Filter to only published releases (not draft) with tags matching vX.Y.Z (no suffixes)
-            const publishedReleases = allReleases.data
-              .filter(r => !r.draft)
-              .filter(r => /^v\d+\.\d+\.\d+$/.test(r.tag_name));
-            
-            console.log(`Found ${publishedReleases.length} published releases without suffixes`);
-            
-            for (const branch of branches) {
-              console.log(`\n=== Processing branch: ${branch} ===`);
-              
-              // Extract X.Y from branch name (release-X.Y)
-              const match = branch.match(/^release-(\d+\.\d+)$/);
-              if (!match) {
-                console.log(`  ⚠️  Branch ${branch} doesn't match pattern, skipping`);
-                continue;
-              }
-              
-              const [major, minor] = match[1].split('.');
-              const versionPrefix = `v${major}.${minor}.`;
-              
-              console.log(`  Looking for releases with prefix: ${versionPrefix}`);
-              
-              // Find the latest published release for this branch (vX.Y.Z without suffixes)
-              const branchReleases = publishedReleases
-                .filter(r => r.tag_name.startsWith(versionPrefix))
-                .filter(r => /^v\d+\.\d+\.\d+$/.test(r.tag_name)); // Ensure no suffixes
-              
-              if (branchReleases.length === 0) {
-                console.log(`  ⚠️  No published releases found for ${branch}, skipping`);
-                continue;
-              }
-              
-              // Sort by version (descending) to get the latest
-              branchReleases.sort((a, b) => {
-                const aVersion = a.tag_name.match(/^v(\d+)\.(\d+)\.(\d+)$/);
-                const bVersion = b.tag_name.match(/^v(\d+)\.(\d+)\.(\d+)$/);
-                if (!aVersion || !bVersion) return 0;
-                
-                const aNum = parseInt(aVersion[1]) * 10000 + parseInt(aVersion[2]) * 100 + parseInt(aVersion[3]);
-                const bNum = parseInt(bVersion[1]) * 10000 + parseInt(bVersion[2]) * 100 + parseInt(bVersion[3]);
-                return bNum - aNum;
-              });
-              
-              const latestRelease = branchReleases[0];
-              console.log(`  ✅ Latest published release: ${latestRelease.tag_name}`);
-              
-              // Get the commit SHA for this release tag
-              let releaseCommitSha;
-              try {
-                releaseCommitSha = execSync(`git rev-list -n 1 ${latestRelease.tag_name}`, { encoding: 'utf8' }).trim();
-                console.log(`  Release commit SHA: ${releaseCommitSha}`);
-              } catch (error) {
-                console.log(`  ⚠️  Could not find commit for tag ${latestRelease.tag_name}, skipping`);
-                continue;
-              }
-              
-              // Checkout the branch
-              execSync(`git fetch origin ${branch}:${branch}`, { encoding: 'utf8' });
-              execSync(`git checkout ${branch}`, { encoding: 'utf8' });
-              
-              // Get the latest commit on the branch
-              const latestBranchCommit = execSync('git rev-parse HEAD', { encoding: 'utf8' }).trim();
-              console.log(`  Latest branch commit: ${latestBranchCommit}`);
-              
-              // Check if there are new commits after the release
-              const commitsAfterRelease = execSync(
-                `git rev-list ${releaseCommitSha}..HEAD --oneline`,
-                { encoding: 'utf8' }
-              ).trim();
-              
-              if (!commitsAfterRelease) {
-                console.log(`  ℹ️  No new commits after ${latestRelease.tag_name}, skipping`);
-                continue;
-              }
-              
-              console.log(`  ✅ Found new commits after release:`);
-              console.log(commitsAfterRelease);
-              
-              // Calculate next version (Z+1)
-              const versionMatch = latestRelease.tag_name.match(/^v(\d+)\.(\d+)\.(\d+)$/);
-              if (!versionMatch) {
-                console.log(`  ❌ Could not parse version from ${latestRelease.tag_name}, skipping`);
-                continue;
-              }
-              
-              const nextPatch = parseInt(versionMatch[3]) + 1;
-              const nextTag = `v${versionMatch[1]}.${versionMatch[2]}.${nextPatch}`;
-              
-              console.log(`  🏷️  Creating new tag: ${nextTag} on commit ${latestBranchCommit}`);
-              
-              // Create and push the tag with base_ref for workflow triggering
-              try {
-                // Delete local tag if exists to force update
-                try {
-                  execSync(`git tag -d ${nextTag}`, { encoding: 'utf8' });
-                } catch (e) {
-                  // Tag doesn't exist locally, that's fine
-                }
-
-                // Delete remote tag if exists
-                try {
-                  execSync(`git push origin :refs/tags/${nextTag}`, { encoding: 'utf8' });
-                } catch (e) {
-                  // Tag doesn't exist remotely, that's fine
-                }
-
-                // Create tag locally
-                execSync(`git tag ${nextTag} ${latestBranchCommit}`, { encoding: 'utf8' });
-
-                // Push tag with HEAD reference to preserve base_ref
-                execSync(`git push origin HEAD:refs/tags/${nextTag}`, { encoding: 'utf8' });
-                console.log(`  ✅ Successfully created and pushed tag ${nextTag}`);
-              } catch (error) {
-                console.log(`  ❌ Error creating/pushing tag ${nextTag}: ${error.message}`);
-                core.setFailed(`Failed to create tag ${nextTag} for branch ${branch}`);
-              }
-            }
-            
-            console.log(`\n✅ Finished processing all release branches`);
-
diff --git a/.github/workflows/backport.yaml b/.github/workflows/backport.yaml
index 7b89d8cbd6..a2b9b75a98 100644
--- a/.github/workflows/backport.yaml
+++ b/.github/workflows/backport.yaml
@@ -4,26 +4,133 @@ on:
   pull_request_target:
     types: [closed, labeled]   # fires when PR is closed (merged) or labeled
 
+# Two mechanisms here, answering two different failures.
+#
+# A run joins its concurrency group before any job-level `if` is evaluated, so
+# `prepare`'s guard below cannot stop a label event from disturbing the run
+# already backporting this PR; it only decides what the label run does after the
+# damage. Labels set with the default GITHUB_TOKEN start no run, but labels set
+# by third-party GitHub Apps do, and they arrive in bursts. Under a plain
+# `cancel-in-progress: true` each one cancelled the backport the merge had just
+# started, and nothing reports that beyond a cancelled run sitting next to a
+# green one.
+#
+# The delivery survived anyway, because the old guard admitted a run on the PR's
+# cumulative labels: the last label of a burst requalified and redid the work.
+# `prepare`'s narrowing below removes that accidental safety net, so the two
+# changes land together — narrowing alone would turn a noisy delivery into an
+# absent one.
+#
+# So the group key moves a label event that is NOT a backport request aside, and
+# `cancel-in-progress` stops one that IS from cancelling rather than queuing.
+# Both are load-bearing. `backport` and `backport-previous` are separate requests
+# that both have to complete, so they share the main group and must not cancel
+# each other; every other label does no work here and only has to stay out of
+# the way.
+#
+# That is also why this file does not simply copy pull-requests.yaml, which
+# splits the key and leaves cancellation unconditional: a discarded label run
+# there publishes nothing, so isolating it is the whole fix.
+#
+# Queuing protects a pending run from the run ahead of it and never from the one
+# behind: the group holds a single pending run, and a newer one evicts it. With
+# the split in place that costs nothing, and for the same reason the fan-out
+# below is harmless — the only events left in this group are backport requests,
+# the evictor is by definition the newer of the two, and `prepare`'s `Check which
+# labels are present` step reads the cumulative label set. So the survivor covers
+# a superset of what the evicted run would have delivered, for any sequence that
+# only adds labels. Removing one in between is the exception and needs no cover:
+# the evictor then carries less because the request was withdrawn.
+#
+# That is exactly what the split buys. Without it the evictor could be any label
+# at all, and a run that does not qualify delivers nothing in place of the
+# request it displaced.
+#
+# `queue: max` raises the single pending slot to a hundred and is the obvious
+# thing to reach for instead of the split. Taking it means giving up the
+# conditional cancel, because `queue: max` and `cancel-in-progress: true` are a
+# validation error together and this key still evaluates to true on a merge.
+# The trade is available and was not taken: eviction is what keeps a burst to one
+# surviving run rather than a hundred queued ones, and the feature only shipped
+# 2026-05-07, on a path that delivers fixes to release lines.
 concurrency:
-  group: backport-${{ github.workflow }}-${{ github.event.pull_request.number }}
-  cancel-in-progress: true
+  group: backport-${{ github.workflow }}-${{ github.event.pull_request.number }}${{ (github.event.action == 'labeled' && github.event.label.name != 'backport' && github.event.label.name != 'backport-previous' && github.event.label.name != 'kind/backport' && github.event.label.name != 'kind/backport-previous') && '-label' || '' }}
+  # Stated positively, matching the group key above. `!= 'labeled'` is equivalent
+  # only while `types:` holds exactly these two, and that form fails open: adding
+  # `unlabeled` or `reopened` there would hand those events cancellation in the
+  # main group, which is the behaviour this file exists to remove.
+  #
+  # The positive form removes the cancelling, not the occupying. A third type
+  # still lands in the main group, still takes its single pending slot, and its
+  # `prepare` still skips — so it can evict a genuine backport request and
+  # deliver nothing in its place. `types:` is load-bearing for that reason and is
+  # pinned in hack/release-freeze-contract.bats; widening it needs the group key
+  # widened with it.
+  cancel-in-progress: ${{ github.event.action == 'closed' }}
 
+# Top-level token defaults to read-only. A job-level block replaces this one
+# rather than adding to it, so each job restates every scope it needs.
 permissions:
-  contents: write
-  pull-requests: write
+  contents: read
 
 jobs:
   # Determine which backports are needed
   prepare:
+    # This guard admits each action on the labels it is entitled to. `closed`
+    # carries no label of its own, so it reads the set the PR ended up with.
+    # `labeled` reads only the label just added: matching the cumulative set
+    # here means every later unrelated label on a merged PR that still carries
+    # `backport` re-enters this job to redo a backport already delivered.
+    #
+    # Scope, so this is not read as covering the whole job: the `Check which
+    # labels are present` step below still reads the cumulative set, so a
+    # `backport-previous` event on a PR also carrying `backport` fans out to
+    # both matrix legs. That is deliberate, and each state a re-entered leg can
+    # find is already accounted for: delivered is skipped by the merged-backport
+    # guard, still open is skipped by backport-action on the 422, and closed
+    # unmerged gets a fresh backport PR, which is the retry that guard
+    # deliberately preserves rather than an accident. What the narrowing here
+    # decides is whether the job RUNS, not which targets it picks.
     if: |
       github.event.pull_request.merged == true &&
       github.event.pull_request.base.ref == 'main' &&
       (
-        contains(github.event.pull_request.labels.*.name, 'backport') ||
-        contains(github.event.pull_request.labels.*.name, 'backport-previous') ||
-        (github.event.action == 'labeled' && (github.event.label.name == 'backport' || github.event.label.name == 'backport-previous'))
+        (github.event.action == 'closed' && (contains(github.event.pull_request.labels.*.name, 'backport') || contains(github.event.pull_request.labels.*.name, 'backport-previous') || contains(github.event.pull_request.labels.*.name, 'kind/backport') || contains(github.event.pull_request.labels.*.name, 'kind/backport-previous'))) ||
+        (github.event.action == 'labeled' && (github.event.label.name == 'backport' || github.event.label.name == 'backport-previous' || github.event.label.name == 'kind/backport' || github.event.label.name == 'kind/backport-previous'))
       )
-    runs-on: [self-hosted]
+    # GitHub API calls only — no docker, no repo toolchain: GitHub-hosted.
+    runs-on: ubuntu-latest
+    # Queuing gives a stuck run a way to hurt the next one that a cancelling key
+    # did not: the label event that used to kill it now waits behind it rather
+    # than clearing it.
+    #
+    # This ceiling bounds a stuck JOB, which is the case it can reach. A run can
+    # also wedge at the RUN level with every job already finished, and no
+    # job-level key expires that one; it holds the group until GitHub retires the
+    # run. Rare but real: run 31232645133 has been `in_progress` since
+    # 2026-08-08 with `prepare` and `backport` both skipped. Nothing here
+    # reaches that state, so docs/release.md tells an operator to look for a run
+    # still in flight and clear it before re-applying the label.
+    #
+    # What it bounds is EXECUTION, not the wait for a runner. GitHub's limits
+    # page says "job execution time" for the 6-hour job cap while spelling out
+    # that the 35-day run cap "includes execution duration, and time spent on
+    # waiting and approval" — the contrast is deliberate — and
+    # orgs/community#50926 shows a job sitting six hours on "Waiting for a runner
+    # to pick up this job" under `timeout-minutes: 5`. So queue time is a third
+    # unbounded case alongside the run-level wedge, not something this covers.
+    #
+    # 30 is therefore generous rather than calculated. Execution on run
+    # 29844315422 was 6s for `prepare` and 2s and 16s for the two matrix legs,
+    # against 9m24s, 5m28s and 5m45s of queue for the same three jobs. Every
+    # execution measured on this workflow has been seconds, and no maximum is
+    # quoted on purpose: an absolute maximum over a growing set is stale as soon
+    # as a slower run lands. The value leaves room for a cherry-pick far larger
+    # than anything seen while replacing the 6-hour default, and nothing here is
+    # sized against the queue because nothing here can be.
+    timeout-minutes: 30
+    permissions:
+      contents: read
     outputs:
       backport_current: ${{ steps.labels.outputs.backport }}
       backport_previous: ${{ steps.labels.outputs.backport_previous }}
@@ -32,13 +139,20 @@ jobs:
     steps:
       - name: Check which labels are present
         id: labels
-        uses: actions/github-script@v7
+        uses: actions/github-script@f28e40c7f34bde8b3046d885e986cb6290c5673b # v7
         with:
           script: |
             const pr = context.payload.pull_request;
             const labels = pr.labels.map(l => l.name);
-            const isBackport = labels.includes('backport');
-            const isBackportPrevious = labels.includes('backport-previous');
+            // TRANSITIONAL: both spellings are accepted so the rename can land
+            // in any order relative to the org-level dosubot, which still
+            // applies the legacy names and is today the dominant applier on
+            // real backports. Once dosubot's PR labelling is switched off and
+            // the in-repo labeler is the only applier, the legacy arms here,
+            // in the `if:` gate above and in the concurrency group can all be
+            // deleted in one pass.
+            const isBackport = labels.includes('kind/backport') || labels.includes('backport');
+            const isBackportPrevious = labels.includes('kind/backport-previous') || labels.includes('backport-previous');
             
             core.setOutput('backport', isBackport ? 'true' : 'false');
             core.setOutput('backport_previous', isBackportPrevious ? 'true' : 'false');
@@ -47,44 +161,56 @@ jobs:
       
       - name: Determine target branches
         id: branches
-        uses: actions/github-script@v7
+        uses: actions/github-script@f28e40c7f34bde8b3046d885e986cb6290c5673b # v7
         with:
           script: |
-            // Get latest release
-            let latestRelease;
-            try {
-              latestRelease = await github.rest.repos.getLatestRelease({
-                owner: context.repo.owner,
-                repo: context.repo.repo
-              });
-            } catch (e) {
-              core.setFailed('No existing releases found; cannot determine backport target.');
+            // Enumerate the real release-X.Y branches rather than deriving them
+            // from the latest published release.
+            //
+            // Since cutting an rc freezes the line (cut-prerelease.yaml),
+            // release-X.Y is created when the first vX.Y.0-rc.N is cut — before
+            // vX.Y.0 is ever published. getLatestRelease returns the newest
+            // published STABLE, so throughout the freeze window it still named
+            // the previous line: a `backport` on a fix for the release being
+            // stabilised would have landed on release-X.(Y-1) and missed the
+            // release it was written for. That window is exactly when backports
+            // matter most, since the frozen branch is the only way in.
+            //
+            // Enumerating branches also drops the contiguous-minor assumption:
+            // `previous` used to be computed as min-1, which named a
+            // non-existent branch whenever a minor was skipped.
+            const branches = await github.paginate(github.rest.repos.listBranches, {
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              per_page: 100
+            });
+
+            const lines = branches
+              .map(b => /^release-(\d+)\.(\d+)$/.exec(b.name))
+              .filter(Boolean)
+              .map(m => ({ name: m[0], maj: Number(m[1]), min: Number(m[2]) }))
+              .sort((a, b) => (b.maj - a.maj) || (b.min - a.min));
+
+            if (lines.length === 0) {
+              core.setFailed('No release-X.Y branches found; cannot determine backport target.');
               return;
             }
-            
-            const [maj, min] = latestRelease.data.tag_name.replace(/^v/, '').split('.');
-            const currentBranch = `release-${maj}.${min}`;
-            const prevMin = parseInt(min) - 1;
-            const previousBranch = prevMin >= 0 ? `release-${maj}.${prevMin}` : '';
-            
+
+            const currentBranch  = lines[0].name;
+            const previousBranch = lines.length > 1 ? lines[1].name : '';
+
             core.setOutput('current_branch', currentBranch);
             core.setOutput('previous_branch', previousBranch);
-            
+
+            console.log(`Release lines found: ${lines.map(l => l.name).join(', ')}`);
             console.log(`Current branch: ${currentBranch}, Previous branch: ${previousBranch || 'N/A'}`);
-            
-            // Verify previous branch exists if we need it
-            if (previousBranch && '${{ steps.labels.outputs.backport_previous }}' === 'true') {
-              try {
-                await github.rest.repos.getBranch({
-                  owner: context.repo.owner,
-                  repo: context.repo.repo,
-                  branch: previousBranch
-                });
-                console.log(`Previous branch ${previousBranch} exists`);
-              } catch (e) {
-                core.setFailed(`Previous branch ${previousBranch} does not exist.`);
-                return;
-              }
+
+            // Both targets come from the enumeration above, so they exist by
+            // construction — no getBranch probe needed. What CAN still fail is
+            // asking for a previous line when only one exists.
+            if (!previousBranch && '${{ steps.labels.outputs.backport_previous }}' === 'true') {
+              core.setFailed('backport-previous requested, but only one release line exists.');
+              return;
             }
 
   backport:
@@ -93,7 +219,15 @@ jobs:
       github.event.pull_request.merged == true &&
       github.event.pull_request.base.ref == 'main' &&
       (needs.prepare.outputs.backport_current == 'true' || needs.prepare.outputs.backport_previous == 'true')
-    runs-on: [self-hosted]
+    # git cherry-picks via backport-action — no docker, no repo toolchain: GitHub-hosted.
+    runs-on: ubuntu-latest
+    # See `prepare` above: a queued request waits on this one, so it needs a
+    # ceiling rather than the 6-hour default. Bounds this job's execution only;
+    # the wait for a runner is outside it either way.
+    timeout-minutes: 30
+    permissions:
+      contents: write
+      pull-requests: write
     strategy:
       matrix:
         backport_type: [current, previous]
@@ -113,19 +247,59 @@ jobs:
             echo "Target branch: ${{ needs.prepare.outputs.previous_branch }}"
           fi
       
-      # 2. Checkout (required by backport‑action)
-      - name: Checkout repository
+      # 2. Skip if this target already has a merged backport.
+      #
+      # The action's backport branch name is deterministic,
+      # backport-<pull_number>-to-<target_branch>. A merged PR with that head
+      # means an earlier run already delivered this change to the target — a
+      # second label event (e.g. backport-previous added after backport
+      # already merged) would re-enter this job and cherry-pick commits the
+      # target branch already has. Git reports that as an empty pick (exit 1)
+      # rather than a conflict, which draft_commit_conflicts below misreads
+      # as a real conflict and reports as a failed backport on the original
+      # PR. Skipping here avoids the false report; it does not touch the
+      # empty-pick behavior itself, which lives in the action.
+      - name: Check for existing merged backport
+        id: guard
         if: steps.target.outcome == 'success'
-        uses: actions/checkout@v4
+        uses: actions/github-script@f28e40c7f34bde8b3046d885e986cb6290c5673b # v7
+        with:
+          script: |
+            const targetBranch = '${{ steps.target.outputs.branch }}';
+            const head = `backport-${context.payload.pull_request.number}-to-${targetBranch}`;
+            const { data: prs } = await github.rest.pulls.list({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              state: 'closed',
+              head: `${context.repo.owner}:${head}`,
+            });
+            const alreadyMerged = prs.some(p => p.merged_at !== null);
+            core.setOutput('already_merged', alreadyMerged ? 'true' : 'false');
+            if (alreadyMerged) {
+              console.log(`Skipping backport to ${targetBranch}: ${head} already merged.`);
+            }
 
-      # 3. Create the back‑port pull request
+      # 3. Checkout (required by backport‑action)
+      - name: Checkout repository
+        if: steps.target.outcome == 'success' && steps.guard.outputs.already_merged != 'true'
+        uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4
+
+      # 4. Create the back‑port pull request
       - name: Create back‑port PR
         id: backport
-        if: steps.target.outcome == 'success'
-        uses: korthout/backport-action@v3.2.1
+        if: steps.target.outcome == 'success' && steps.guard.outputs.already_merged != 'true'
+        uses: korthout/backport-action@0193454f0c5947491d348f33a275c119f30eb736 # v3.2.1
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           label_pattern: '' # don't read labels for targets
           target_branches: ${{ steps.target.outputs.branch }}
           merge_commits: skip
-          conflict_resolution: draft_commit_conflicts
+          # conflict_resolution lives inside the experimental JSON input, not as a
+          # top-level key. Passed top-level it is silently ignored and the action
+          # falls back to the experimental default ("fail"), which on a conflict
+          # creates no PR and only comments. Nesting it here makes a conflicting
+          # backport open a draft PR with the conflict committed for manual fixup.
+          experimental: |
+            {
+              "conflict_resolution": "draft_commit_conflicts"
+            }
diff --git a/.github/workflows/build-arm64-nightly.yaml b/.github/workflows/build-arm64-nightly.yaml
new file mode 100644
index 0000000000..781e192d59
--- /dev/null
+++ b/.github/workflows/build-arm64-nightly.yaml
@@ -0,0 +1,111 @@
+name: Build arm64 (nightly)
+
+# Builds main's images for arm64 once a day, the same way the pre-release leg
+# in tags.yaml does, so an arm64 break surfaces here rather than on the next
+# rc, which fails with its arm64 build. The images are pushed under
+# nightly-arm64 only because buildx needs somewhere to put them; nothing
+# consumes them. This run also owns the arm64 build cache the rc leg reads.
+#
+# It first prints which refs main pins that are not amd64+arm64 indexes. The
+# rc gate fails on every one of them that the stitch does not turn into an
+# index, so the list is the work left before the next rc can ship.
+
+on:
+  schedule:
+    - cron: '0 3 * * *'   # daily 03:00 UTC
+  workflow_dispatch:
+
+concurrency:
+  group: build-arm64-nightly
+  cancel-in-progress: true
+
+permissions:
+  contents: read
+
+jobs:
+  build-arm64:
+    name: Build main arm64 images
+    runs-on: oracle-vm-24cpu-96gb-arm64
+    # Starts from the rc leg's budget; re-measure after the first runs.
+    timeout-minutes: 120
+    permissions:
+      contents: read
+
+    steps:
+      # A dispatch from another ref would overwrite main's arm64 cache.
+      - name: Refuse a build for a ref other than main
+        env:
+          REF: ${{ github.ref }}
+        run: |
+          if [ "$REF" != refs/heads/main ]; then
+            echo "::error::Refusing to build '$REF'; only main is built here."
+            exit 1
+          fi
+
+      - name: Checkout code
+        uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4
+        with:
+          fetch-depth: 0
+          fetch-tags: true
+          persist-credentials: false
+
+      - name: Set up build toolchain
+        run: |
+          command -v skopeo >/dev/null \
+            || { sudo apt-get update -qq && sudo apt-get install -y -qq skopeo; }
+          command -V docker jq yq skopeo
+          yq --version | grep -q mikefarah
+
+      # Before the build, which stamps the tree with this run's digests.
+      - name: Report refs that are not multi-arch
+        run: hack/verify-multiarch.sh --report packages
+
+      - name: Set up Docker config
+        run: |
+          if [ -d ~/.docker ]; then
+            cp -r ~/.docker "${{ runner.temp }}/.docker"
+          fi
+
+      - name: Login to OCIR
+        uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3
+        with:
+          username: ${{ secrets.OCIR_USER }}
+          password: ${{ secrets.OCIR_TOKEN }}
+          registry: iad.ocir.io
+        env:
+          DOCKER_CONFIG: ${{ runner.temp }}/.docker
+
+      # docker.io pulls go through the mirror in hack/buildkitd.toml, as the
+      # PR builds' do: anonymous Docker Hub pulls from these runners are rate
+      # limited.
+      - name: Set up Buildx (docker-container driver, docker.io mirror)
+        id: buildx
+        uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3
+        with:
+          driver: docker-container
+          buildkitd-config: hack/buildkitd.toml
+        env:
+          DOCKER_CONFIG: ${{ runner.temp }}/.docker
+
+      - name: Build arm64 images
+        run: |
+          set -euo pipefail
+          # Checked first, for the reason given in tags.yaml's build-arm64.
+          units="$(MATRIX_ARCH=arm64 hack/build-matrix.sh | jq -r '.[]')"
+          [ -n "$units" ]
+          for unit in $units; do
+            make -C "$unit" image
+          done
+          make -C packages/core/installer image-operator
+        env:
+          DOCKER_CONFIG: ${{ runner.temp }}/.docker
+          BUILDER: ${{ steps.buildx.outputs.name }}
+          PLATFORM: linux/arm64
+          REGISTRY: iad.ocir.io/idyksih5sir9/cozystack
+          # The only writer of the arm64 cache, as build-main.yaml is of the
+          # amd64 one, so no two builds race on the cache manifest.
+          CACHE_TAG: buildcache-arm64
+          WRITE_CACHE: '1'
+          IMAGE_TAG: nightly-arm64
+          PUBLISH_VERSIONED: '0'
+          PUBLISH_FLOATING: '0'
diff --git a/.github/workflows/build-main.yaml b/.github/workflows/build-main.yaml
new file mode 100644
index 0000000000..7de6c53f59
--- /dev/null
+++ b/.github/workflows/build-main.yaml
@@ -0,0 +1,155 @@
+name: Build cache (main)
+
+# Warms the shared mode=max build cache so PR builds start hot.
+#
+# PR builds (pull-requests.yaml) read the cache but never write it
+# (WRITE_CACHE unset -> 0). Only this serialized main build writes
+# CACHE_REGISTRY/<img>:buildcache, so concurrent PR builds never race on the
+# cache manifest -- the 409 collisions PR #2711 fixed for image tags would
+# otherwise reappear on the cache ref. Cache is mode=max so all multistage
+# `builder` stages are cached, not just the final stage as with inline.
+#
+# This job builds on a docker-container buildx builder, NOT the host's default
+# embedded `docker` driver: `--cache-to type=registry,mode=max` is unsupported
+# on the docker driver unless the daemon runs the containerd image store, so on
+# a classic store the warmer would otherwise fail to export any cache. The
+# container driver also gives this build its own buildkit (separate bbolt), so
+# the warmer never contends with PR builds on the shared embedded buildkit.
+
+env:
+  # Same per-CI registry as pull-requests.yaml; the cache is co-located here.
+  REGISTRY: iad.ocir.io/idyksih5sir9/cozystack
+
+on:
+  push:
+    branches: [main]
+    paths-ignore:
+      - 'docs/**'
+
+# Only the newest main commit's cache matters; cancel older in-flight warmers.
+concurrency:
+  group: build-main-cache
+  cancel-in-progress: true
+
+# Top-level token defaults to read-only; the warm-cache job below narrows to the
+# packages:write scope it actually needs to push the build cache.
+permissions:
+  contents: read
+
+jobs:
+  warm-cache:
+    name: Warm build cache
+    # Runs on the ephemeral pool, not the dedicated self-hosted runner, so the
+    # build path no longer depends on that host (#2937 decommission). Serial
+    # `make build` is CPU-bound, so use the large shape; the warmer is a
+    # background main-push job, latency is not critical.
+    runs-on: oracle-vm-24cpu-96gb-x86-64
+    timeout-minutes: 120
+    env:
+      # The pipe falls back to direct on any proxy error (hack/common-envs.mk).
+      GOPROXY: "https://proxy.golang.org|direct"
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4
+        with:
+          fetch-depth: 0
+          fetch-tags: true
+          # This privileged workflow has packages:write and an OCIR push token;
+          # it never pushes git, so don't leave the checkout's GITHUB_TOKEN in
+          # .git/config where a later build step could read it.
+          persist-credentials: false
+
+      # Writes the Go module cache pull-requests.yaml's unit test job restores:
+      # an entry saved on main is readable from every PR, while one a PR run
+      # saves is visible to that PR alone. It is saved before the image build so
+      # a cancelled or failed build still leaves it, and none of these steps may
+      # stop the build, which does not use it. Only an exact key is restored: a
+      # partial match saved under the new key would carry every superseded
+      # module version forward forever.
+      - name: Locate Go module cache
+        id: gomodcache
+        continue-on-error: true
+        run: echo "dir=$(go env GOMODCACHE)" >> "$GITHUB_OUTPUT"
+      - name: Restore Go module cache
+        id: gomod-restore
+        continue-on-error: true
+        uses: actions/cache/restore@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
+        with:
+          path: ${{ steps.gomodcache.outputs.dir }}
+          key: go-mod-${{ runner.os }}-${{ hashFiles('**/go.sum') }}
+      - name: Download Go modules
+        id: gomod-download
+        if: steps.gomod-restore.outputs.cache-hit != 'true'
+        continue-on-error: true
+        run: |
+          for mod in $(git ls-files go.mod '*/go.mod' | xargs -n1 dirname); do
+            (cd "$mod" && "$GITHUB_WORKSPACE/hack/go-mod-download.sh")
+          done
+      - name: Save Go module cache
+        if: steps.gomod-download.outcome == 'success'
+        continue-on-error: true
+        uses: actions/cache/save@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
+        with:
+          path: ${{ steps.gomodcache.outputs.dir }}
+          key: go-mod-${{ runner.os }}-${{ hashFiles('**/go.sum') }}
+
+      # Ephemeral runners lack the flux CLI the installer's image-packages step
+      # shells out to.
+      - name: Set up flux
+        uses: fluxcd/flux2/action@04acaec6161ac4fb1a82ffafa88901c03271d34f # v2.8.6
+        with:
+          version: "2.8.6"
+
+      - name: Set up Docker config
+        run: |
+          if [ -d ~/.docker ]; then
+            cp -r ~/.docker "${{ runner.temp }}/.docker"
+          fi
+
+      - name: Login to OCIR
+        uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3
+        with:
+          username: ${{ secrets.OCIR_USER }}
+          password: ${{ secrets.OCIR_TOKEN }}
+          registry: iad.ocir.io
+        env:
+          DOCKER_CONFIG: ${{ runner.temp }}/.docker
+
+      # docker-container driver: required for `--cache-to type=registry,mode=max`
+      # (unsupported on the host's default docker driver) and gives this build an
+      # isolated buildkit so it never contends with PR builds on the shared one.
+      - name: Set up Buildx (docker-container driver)
+        id: buildx
+        uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3
+        with:
+          driver: docker-container
+        env:
+          # buildx stores builder instances under $DOCKER_CONFIG/buildx/instances/.
+          # Create the builder in the SAME config the build step reads
+          # (runner.temp/.docker, seeded above and holding the OCIR auth); without
+          # this the builder lands in the default ~/.docker and the build step fails
+          # with `no builder "<name>" found`.
+          DOCKER_CONFIG: ${{ runner.temp }}/.docker
+
+      - name: Build all images and write mode=max cache
+        run: make build
+        env:
+          DOCKER_CONFIG: ${{ runner.temp }}/.docker
+          # Build on the docker-container builder created above (BUILDX_ARGS adds
+          # --builder=$(BUILDER)); buildx forwards the OCIR auth from DOCKER_CONFIG
+          # to the container builder for cache reads/writes and image pushes.
+          BUILDER: ${{ steps.buildx.outputs.name }}
+          # common-envs.mk defaults to amd64+arm64. Nothing here sets up QEMU,
+          # and on this x86-64 runner the arm64 half would be emulated anyway;
+          # CI builds amd64 until arm64 has a native leg of its own.
+          PLATFORM: linux/amd64
+          # WRITE_CACHE=1 turns on --cache-to (mode=max) for every image.
+          WRITE_CACHE: '1'
+          # Publish a floating :main handle; do not move :latest (releases do).
+          IMAGE_TAG: main
+          PUBLISH_VERSIONED: '0'
+          PUBLISH_FLOATING: '0'
diff --git a/.github/workflows/build-release.yaml b/.github/workflows/build-release.yaml
new file mode 100644
index 0000000000..27ad5db73f
--- /dev/null
+++ b/.github/workflows/build-release.yaml
@@ -0,0 +1,160 @@
+name: Build release line
+
+# Publishes the per-line equivalent of what build-main.yaml publishes for main:
+# every image tagged with the line's branch name, and the whole packages tree as
+# the `cozystack-packages:<branch>` OCI artifact with each image reference
+# digest-pinned to the images this run just pushed (`make build` ->
+# packages/core/installer image-packages does the `flux push artifact`).
+#
+# Why it exists: pull-requests.yaml overlays image refs for every package a PR
+# did NOT rebuild, so that e2e and the installer do not test last-release images
+# for everything outside the PR's build matrix. That overlay had only
+# `cozystack-packages:main` to read, which meant a release-line PR was handed
+# MAIN's binaries to run against its own line's charts — a cross-generation mix
+# that failed deterministically (see #3437: main's cozystack-controller served an
+# aggregated OpenAPI release-1.6's charts could not validate against). With this
+# artifact published per line, the overlay reads the PR's own base branch and the
+# generations match.
+#
+# Cost: one full `make build` per push to a maintained line, i.e. per merged
+# backport. That is the price of release-line PRs testing their line's tip rather
+# than its last release.
+
+env:
+  # Same per-CI registry as pull-requests.yaml and build-main.yaml.
+  REGISTRY: iad.ocir.io/idyksih5sir9/cozystack
+
+on:
+  push:
+    # Maintained LINE branches only: `release-<major>.<minor>`. The `+` quantifies
+    # the preceding character class, and `.` is literal, so this matches
+    # release-1.6 but NOT the per-release staging branches promote-rc.yaml creates
+    # (release-1.6.1) nor rc staging branches (release-1.6.0-rc.4) — building
+    # those would be pure waste, since their images are built by tags.yaml.
+    branches: ['release-[0-9]+.[0-9]+']
+    paths-ignore:
+      - 'docs/**'
+
+  # Run against a line on request. The push trigger above cannot cover the moment
+  # a line is BORN: cut-prerelease.yaml creates release-X.Y at a commit that is
+  # already on main, so that push carries no new commits, and GitHub does not run
+  # a workflow whose `paths`/`paths-ignore` filter finds no changed files. Without
+  # a dispatch the line would have no `cozystack-packages:<line>` artifact until
+  # its first cherry-pick merged, and until then pull-requests.yaml's overlay
+  # would find nothing to pull and leave every package on its committed ref — at
+  # freeze time, the PREVIOUS release's, which is the cross-generation mix #3437
+  # fixed. The freeze step dispatches this workflow for the branch it just made.
+  #
+  # Also the recovery path when a line build fails or is cancelled: re-run it
+  # without having to push an empty commit to the line.
+  workflow_dispatch:
+
+# Per line: a newer push to the same line supersedes an in-flight build, but
+# different lines build independently.
+concurrency:
+  group: build-release-${{ github.ref_name }}
+  cancel-in-progress: true
+
+permissions:
+  contents: read
+
+jobs:
+  build-line:
+    name: Build ${{ github.ref_name }} images and packages artifact
+    runs-on: oracle-vm-24cpu-96gb-x86-64
+    timeout-minutes: 120
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+      # workflow_dispatch takes ANY ref, and the "Run workflow" ref selector
+      # preselects the default branch — which is exactly where the recovery
+      # advice above, and cut-prerelease.yaml's warning, send an operator. Since
+      # IMAGE_TAG below is github.ref_name, a dispatch from 'main' spends two
+      # hours republishing cozystack-packages:main and every main image tag while
+      # build-main.yaml may be writing the same ones: the 409 tag-collision class
+      # #2711 fixed. Nothing is mislabeled (the content really is that ref), but
+      # a runner and a cache generation are gone.
+      #
+      # The push trigger is already filtered to release-X.Y; this closes the
+      # dispatch path to the same set, and keeps holding if that filter is ever
+      # widened. Anchored at both ends on purpose: unanchored, the per-release
+      # staging branches (release-1.6.1, release-1.6.0-rc.4) would qualify, and
+      # those are built by tags.yaml. Fails rather than skips — a skipped job
+      # reads in the run list like one that produced the artifact.
+      - name: Refuse a build for a non-line ref
+        env:
+          REF_NAME: ${{ github.ref_name }}
+          REF_TYPE: ${{ github.ref_type }}
+        run: |
+          if [ "$REF_TYPE" != "branch" ] \
+            || ! printf '%s' "$REF_NAME" | grep -qE '^release-[0-9]+\.[0-9]+$'; then
+            echo "::error::Refusing to build '$REF_NAME' ($REF_TYPE). This workflow publishes cozystack-packages:<ref> and every image tagged <ref>, so it may only run for a maintained release line (release-X.Y)."
+            echo "::error::Pick the release-X.Y branch in the 'Run workflow' ref selector. To build main, use build-main.yaml."
+            exit 1
+          fi
+          echo "Building line '$REF_NAME'."
+
+      - name: Checkout code
+        uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4
+        with:
+          fetch-depth: 0
+          fetch-tags: true
+          # This workflow holds packages:write and an OCIR push token; it never
+          # pushes git, so don't leave the checkout's GITHUB_TOKEN in .git/config
+          # where a later build step could read it.
+          persist-credentials: false
+
+      # Ephemeral runners lack the flux CLI the installer's image-packages step
+      # shells out to.
+      - name: Set up flux
+        uses: fluxcd/flux2/action@04acaec6161ac4fb1a82ffafa88901c03271d34f # v2.8.6
+        with:
+          version: "2.8.6"
+
+      - name: Set up Docker config
+        run: |
+          if [ -d ~/.docker ]; then
+            cp -r ~/.docker "${{ runner.temp }}/.docker"
+          fi
+
+      - name: Login to OCIR
+        uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3
+        with:
+          username: ${{ secrets.OCIR_USER }}
+          password: ${{ secrets.OCIR_TOKEN }}
+          registry: iad.ocir.io
+        env:
+          DOCKER_CONFIG: ${{ runner.temp }}/.docker
+
+      # Same isolated buildkit as build-main.yaml, so a line build never contends
+      # with PR builds on the shared embedded builder.
+      - name: Set up Buildx (docker-container driver)
+        id: buildx
+        uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3
+        with:
+          driver: docker-container
+        env:
+          DOCKER_CONFIG: ${{ runner.temp }}/.docker
+
+      - name: Build line images and publish the packages artifact
+        run: make build
+        env:
+          DOCKER_CONFIG: ${{ runner.temp }}/.docker
+          BUILDER: ${{ steps.buildx.outputs.name }}
+          # amd64 only, as in build-main.yaml.
+          PLATFORM: linux/amd64
+          # READ the shared mode=max cache, never write it. CACHE_REGISTRY/<img>:
+          # buildcache is a single ref per image and build-main.yaml is
+          # deliberately its only writer, serialized, precisely so concurrent
+          # builds cannot race on the cache manifest (the 409 collision class
+          # #2711 fixed for image tags). A line build can overlap a main build, so
+          # writing here would reintroduce exactly that race.
+          WRITE_CACHE: '0'
+          # Floating per-line handle: images and the packages artifact both land
+          # under the branch name (e.g. :release-1.6). Versioned and :latest tags
+          # belong to releases (tags.yaml / finalize), never to this workflow.
+          IMAGE_TAG: ${{ github.ref_name }}
+          PUBLISH_VERSIONED: '0'
+          PUBLISH_FLOATING: '0'
diff --git a/.github/workflows/changelog-generate.yaml b/.github/workflows/changelog-generate.yaml
new file mode 100644
index 0000000000..b31813a59a
--- /dev/null
+++ b/.github/workflows/changelog-generate.yaml
@@ -0,0 +1,273 @@
+name: Generate changelog (reusable)
+
+# Reusable core of release-changelog generation. Given a release-candidate tag it
+# produces docs/changelogs/vX.Y.Z.md for the STABLE version that rc becomes and
+# uploads it as the artifact `changelog-vX.Y.Z`. It writes to no branch and opens
+# no PR — the caller owns every mutation. Two callers exist, and the difference
+# between them is only WHEN the button is pressed:
+#
+#   * promote-rc.yaml  — calls this at PROMOTE time, in parallel with asset
+#     staging; its open-pr job downloads the artifact and commits it onto the
+#     release-X.Y.Z staging branch so it rides the promote PR. This is the
+#     MANDATORY pickup: a release publishes with whatever changelog exists here.
+#   * changelog-rc.yaml — calls this at RC time, when a maintainer presses the
+#     "generate the changelog now" button; its commit job lands the artifact on
+#     the release-X.Y.Z-rc.N staging branch. This is OPTIONAL — pressing the
+#     button early just means promote-rc COPIES the rc-time result instead of
+#     regenerating it (see the rc-staging-branch pickup below).
+#
+# ── Ref semantics under workflow_call (documented decision) ──────────────────
+# The primary checkout is the rc TAG (detached), a commit that predates this
+# workflow and does not carry hack/validate-changelog.sh or today's
+# docs/agents/changelog.md. The tooling is therefore overlaid from a SECOND,
+# sparse checkout of `github.ref_name`. Under workflow_call `github.ref_name` is
+# the CALLER's dispatch ref (main, or release-X.Y), NOT this file's own ref — and
+# for a local `uses: ./…` reference the two coincide anyway, because the reusable
+# workflow body is resolved from the caller's commit. So "current tooling against
+# an old rc tag" holds exactly as it did before the extraction: the tooling is
+# always the tip of whatever branch the maintainer dispatched from. The dispatch
+# ref wins; the rc tag never contributes tooling, only release content.
+#
+# ── Secrets (documented decision) ────────────────────────────────────────────
+# Declared EXPLICITLY rather than relying on `secrets: inherit`, so this file's
+# interface names exactly what it needs and a caller that forgets one fails
+# loudly at parse time instead of at the AI step. The app id/key pair mints two
+# separate tokens: a read-only one for the AI step (it can never push or open a
+# PR even with --allow-all-tools) and — via the caller — the write token that
+# actually commits. COPILOT_GITHUB_TOKEN drives the AI model.
+
+on:
+  workflow_call:
+    inputs:
+      rc_tag:
+        description: "Release-candidate tag to generate the changelog for, e.g. v1.6.0-rc.2"
+        required: true
+        type: string
+    secrets:
+      COZYSTACK_CI_APP_ID:
+        description: "App id for the CozyStack CI GitHub App (mints the read-only token)."
+        required: true
+      COZYSTACK_CI_PRIVATE_KEY:
+        description: "Private key for the CozyStack CI GitHub App."
+        required: true
+      COPILOT_GITHUB_TOKEN:
+        description: "Token the Copilot CLI authenticates the AI model with."
+        required: true
+    outputs:
+      present:
+        description: "true when a usable changelog was produced (generated, copied from the rc staging branch, or already in the rc tag tree)."
+        value: ${{ jobs.changelog.outputs.present }}
+
+# Read-only by default. The job below never writes to the repository — every
+# mutation (the commit, the PR) is the caller's, performed with a separate token.
+permissions:
+  contents: read
+
+jobs:
+  changelog:
+    name: Generate changelog
+    runs-on: ubuntu-latest
+    timeout-minutes: 45
+    permissions:
+      contents: read
+    outputs:
+      present: ${{ steps.changelog_status.outputs.present }}
+    steps:
+      # Read-only token for the AI step. Minting a separate scoped token means
+      # generation cannot push branches, open PRs, or mutate any repository even
+      # with --allow-all-tools, regardless of whether the agent follows the
+      # prompt's instructions. The caller owns every write.
+      - name: Generate read-only GitHub App token
+        id: app-token-read
+        uses: actions/create-github-app-token@d72941d797fd3113feb6b93fd0dec494b13a2547 # v1
+        with:
+          app-id: ${{ secrets.COZYSTACK_CI_APP_ID }}
+          private-key: ${{ secrets.COZYSTACK_CI_PRIVATE_KEY }}
+          owner: cozystack
+          permission-contents: read
+          permission-pull-requests: read
+          permission-metadata: read
+
+      - name: Parse rc tag
+        id: parse
+        env:
+          RC_TAG: ${{ inputs.rc_tag }}
+        run: |
+          set -euo pipefail
+          # Reject whitespace outright rather than stripping it. This mirrors
+          # hack/parse-rc-tag.sh (which changelog-rc uses), inlined here because
+          # this parse must run BEFORE any checkout — the script lives in the tree
+          # that is only overlaid afterwards, and the rc-tag checkout below needs
+          # the parsed tag first. Stripping (the old `tr -d '[:space:]'`) would
+          # silently rewrite a typo'd 'v1. 6.0-rc.2' into a different valid tag.
+          if [[ "${RC_TAG}" =~ [[:space:]] ]]; then
+            echo "::error::rc_tag '${RC_TAG}' must not contain whitespace"
+            exit 1
+          fi
+          if [[ ! "${RC_TAG}" =~ ^v([0-9]+)\.([0-9]+)\.([0-9]+)-rc\.([0-9]+)$ ]]; then
+            echo "::error::rc_tag '${RC_TAG}' must match 'vX.Y.Z-rc.N'"
+            exit 1
+          fi
+          VERSION="${BASH_REMATCH[1]}.${BASH_REMATCH[2]}.${BASH_REMATCH[3]}"
+          # Re-emit the tag and the rc staging branch from the matched groups
+          # rather than passing inputs.rc_tag through: the checkout `ref` and the
+          # branch fetch below then consume values this step reconstructed from a
+          # strict pattern, never raw dispatch input, so a crafted rc_tag cannot
+          # reach actions/checkout or a git command.
+          {
+            echo "stable_version=${VERSION}"
+            echo "rc_tag=v${VERSION}-rc.${BASH_REMATCH[4]}"
+            echo "rc_branch=release-${VERSION}-rc.${BASH_REMATCH[4]}"
+          } >> "$GITHUB_OUTPUT"
+
+      # Detached at the rc TAG, not the rc staging branch. Two reasons:
+      #
+      # 1. docs/agents/changelog.md §2 is a hard gate — it permits exactly three
+      #    working-tree states (on `main`, detached at the release tag, or
+      #    detached at the release-candidate tag being promoted) and instructs the
+      #    agent to STOP otherwise. A staging-branch checkout is none of them.
+      # 2. The staging branch carries digest-vendoring commits that are not
+      #    release content. Detaching at the tag makes "use the rc tag as the
+      #    upper bound" a property of the checkout rather than an instruction the
+      #    prompt has to talk the agent into honouring.
+      - name: Checkout rc tag
+        uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4
+        with:
+          ref: ${{ steps.parse.outputs.rc_tag }}
+          fetch-depth: 0
+          fetch-tags: true
+          token: ${{ steps.app-token-read.outputs.token }}
+          persist-credentials: false
+
+      # A second checkout of the DISPATCH ref, used only as a source of release
+      # tooling. The primary checkout above is an older commit (the rc tag) and
+      # does not carry hack/validate-changelog.sh, hack/changelog-preserve.sh, or
+      # the current docs/agents/changelog.md — and a script fetched by a script
+      # that is itself missing solves nothing, so this is done declaratively by
+      # actions/checkout rather than by shelling out to the repo's own tooling.
+      # Gitignored, so the caller's `git add -A` never stages it.
+      - name: Checkout release tooling from the dispatch ref
+        uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4
+        with:
+          ref: ${{ github.ref_name }}
+          path: .release-tooling
+          sparse-checkout: |
+            hack
+            docs/agents
+          persist-credentials: false
+
+      # The agent reads docs/agents/changelog.md from the WORKING TREE, which is
+      # the rc tag — a commit that predates this workflow. Every rc cut before
+      # this change carries the old section 2, which lists only two valid
+      # configurations and instructs the agent to STOP on anything else. A
+      # detached rc-tag checkout is exactly that, so a COMPLIANT agent would
+      # silently decline to generate on every promotion of an existing rc.
+      # Overlay the current instructions so the agent reads today's contract.
+      - name: Refresh agent instructions
+        run: |
+          cp .release-tooling/docs/agents/changelog.md docs/agents/changelog.md
+          echo "Refreshed docs/agents/changelog.md from ${GITHUB_REF_NAME}."
+
+      # Skip-priority + validate-then-fall-through: use a pre-existing changelog
+      # only if it is USABLE, so an invalid higher-priority source can never
+      # suppress a valid lower-priority one. The rc TAG tree wins over the rc
+      # STAGING branch (release-X.Y.Z-rc.N, where changelog-rc.yaml banks the
+      # rc-time button's output), which wins over AI generation. The whole
+      # decision — including each loud ::warning:: for a discarded file — lives in
+      # hack/select-changelog-source.sh so it can be behaviour-tested directly
+      # (see hack/release-changelog-behaviour.bats); it runs here, after the
+      # .release-tooling overlay, so the script and its helpers are present.
+      - name: Check if changelog already exists
+        id: check_changelog
+        env:
+          STABLE_VERSION: ${{ steps.parse.outputs.stable_version }}
+          RC_BRANCH: ${{ steps.parse.outputs.rc_branch }}
+          READ_TOKEN: ${{ steps.app-token-read.outputs.token }}
+        run: |
+          set -euo pipefail
+          # The rc-tag checkout persisted no credentials, so re-point origin at
+          # the read token (contents:read is enough to fetch) before the script's
+          # branch fetch.
+          git remote set-url origin "https://x-access-token:${READ_TOKEN}@github.com/${GITHUB_REPOSITORY}"
+          # Capture the script's output (::warning:: annotations + a final
+          # source= line), re-emit it so the annotations reach the live log, then
+          # read the decision from the last source= line.
+          out="$(.release-tooling/hack/select-changelog-source.sh "${STABLE_VERSION}" "${RC_BRANCH}")"
+          printf '%s\n' "$out"
+          source="$(printf '%s\n' "$out" | sed -n 's/^source=//p' | tail -n1)"
+          if [ -n "$source" ] && [ "$source" != none ]; then
+            {
+              echo "exists=true"
+              echo "source=${source}"
+            } >> "$GITHUB_OUTPUT"
+            echo "✅ Using a pre-existing changelog (source=${source}) — skipping generation."
+          else
+            echo "exists=false" >> "$GITHUB_OUTPUT"
+            echo "No usable pre-existing changelog; generating."
+          fi
+
+      - name: Setup Node.js
+        if: steps.check_changelog.outputs.exists == 'false'
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
+        with:
+          node-version: 22
+
+      - name: Install GitHub Copilot CLI
+        if: steps.check_changelog.outputs.exists == 'false'
+        run: npm i -g @github/copilot
+
+      # Non-blocking by decision: a flaky AI step must not wedge a promotion that
+      # is otherwise ready. The caller degrades gracefully — promote-rc opens the
+      # PR WITHOUT a changelog (its body says so), changelog-rc fails loudly so
+      # the maintainer retries or hand-commits.
+      #
+      # Upper bound is the rc TAG, not HEAD and not the staging branch: the branch
+      # carries digest-vendoring commits that are not release content, and the
+      # stable tag does not exist yet (finalize cuts it post-merge).
+      - name: Generate changelog using AI
+        if: steps.check_changelog.outputs.exists == 'false'
+        continue-on-error: true
+        timeout-minutes: 30
+        env:
+          COPILOT_GITHUB_TOKEN: ${{ secrets.COPILOT_GITHUB_TOKEN }}
+          GH_TOKEN: ${{ steps.app-token-read.outputs.token }}
+          STABLE_VERSION: ${{ steps.parse.outputs.stable_version }}
+          RC_TAG: ${{ steps.parse.outputs.rc_tag }}
+        run: |
+          copilot \
+            --prompt "Generate the release changelog for the upcoming stable release v${STABLE_VERSION}, which is being promoted from the release candidate ${RC_TAG}. The repository is checked out in detached HEAD at the ${RC_TAG} tag — the 'promotion' configuration in section 2 of docs/agents/changelog.md. IMPORTANT: the v${STABLE_VERSION} tag does NOT exist yet; it is created only after the promotion PR merges. Use ${RC_TAG} as the upper bound in every git command (for example 'git log v<previous>..${RC_TAG}'), never HEAD. Write the file as docs/changelogs/v${STABLE_VERSION}.md and use v${STABLE_VERSION} — not ${RC_TAG} — in the header, in the 'Full Changelog' link, and in the leading release-link comment (the HTML comment at the very top of the file). Follow the instructions in @docs/agents/changelog.md exactly, including the 'Scope and boundaries' section at the top. Your deliverable is the single file docs/changelogs/v${STABLE_VERSION}.md — write it and exit; this workflow handles committing and opening the PR." \
+            --allow-all-tools --allow-all-paths < /dev/null
+
+      # Structural validation, not just "non-empty". The AI step is allowed to
+      # fail, and a run that dies partway (timeout, quota exhaustion mid-stream)
+      # can leave a fragment behind. A bare `-s` test would call that present,
+      # commit it, advertise it as valid, and finalize would publish it verbatim
+      # as the release notes.
+      #
+      # The predicates live in hack/validate-changelog.sh so they can be tested
+      # directly against real shipped changelogs. A rejected changelog is treated
+      # exactly like "not generated": warn and set present=false, never fail the
+      # job — generation is non-blocking.
+      - name: Verify changelog
+        id: changelog_status
+        env:
+          STABLE_VERSION: ${{ steps.parse.outputs.stable_version }}
+        run: |
+          if REASON="$(.release-tooling/hack/validate-changelog.sh "docs/changelogs/v${STABLE_VERSION}.md" "${STABLE_VERSION}" 2>&1)"; then
+            echo "present=true" >> "$GITHUB_OUTPUT"
+            echo "✅ ${REASON}"
+          else
+            echo "present=false" >> "$GITHUB_OUTPUT"
+            echo "::warning::Changelog not usable (${REASON}). The caller will degrade to its no-changelog path — commit docs/changelogs/v${STABLE_VERSION}.md before the release publishes, or it will have empty notes."
+          fi
+
+      # Hand the file to the caller, which owns every write. Same artifact name
+      # promote-rc's open-pr and changelog-rc's commit job download.
+      - name: Upload changelog artifact
+        if: steps.changelog_status.outputs.present == 'true'
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
+        with:
+          name: changelog-v${{ steps.parse.outputs.stable_version }}
+          path: docs/changelogs/v${{ steps.parse.outputs.stable_version }}.md
+          retention-days: 7
+          if-no-files-found: error
diff --git a/.github/workflows/changelog-rc.yaml b/.github/workflows/changelog-rc.yaml
new file mode 100644
index 0000000000..d7fc28a925
--- /dev/null
+++ b/.github/workflows/changelog-rc.yaml
@@ -0,0 +1,237 @@
+name: Generate RC Changelog
+
+# Generate the release changelog at RC time and commit it to the rc staging
+# branch, so the promote flow can COPY it later instead of regenerating.
+#
+# ── Role in the release model ────────────────────────────────────────────────
+# The changelog is normally produced by promote-rc.yaml at PROMOTE time. That is
+# late: generation is AI-driven and slow, it runs while a maintainer is waiting
+# to ship, and a flaky run there opens the promote PR with no changelog. This
+# workflow lets a maintainer press a button the moment an rc goes green — while
+# there is time to review the notes, fix attribution, or hand-edit — and banks
+# the result on the rc staging branch (release-X.Y.Z-rc.N) as
+# docs/changelogs/vX.Y.Z.md (the STABLE name, since that is what will publish).
+#
+# It is OPTIONAL. Skip it and promote-rc generates the changelog itself, exactly
+# as before. Press it and promote-rc's changelog job finds the file on the rc
+# staging branch, copies it, and skips the AI pass — the "copy the rc changelog"
+# pickup. Either way the promote PR carries docs/changelogs/vX.Y.Z.md and
+# finalize publishes it verbatim as the release body.
+#
+# Generation itself is the reusable changelog-generate.yaml, shared with
+# promote-rc so the two paths cannot drift (same detached rc-tag checkout, same
+# read-only token for the AI step, same validator gate, same artifact). This
+# workflow only adds the strict-regex front door, an UP-FRONT check that the rc
+# staging branch exists (so a missing branch fails in seconds, not after a
+# 30-minute AI run), and the idempotent commit to that branch. It writes to no
+# other branch and opens no PR.
+
+on:
+  workflow_dispatch:
+    inputs:
+      rc_tag:
+        description: "Release-candidate tag to generate the changelog for, e.g. v1.6.0-rc.1"
+        required: true
+        type: string
+
+concurrency:
+  # Per rc tag: two dispatches for the same rc racing to commit the same file to
+  # the same staging branch would collide on the push. Different rc tags are
+  # independent and need not serialize. Keying on the RAW input is safe because
+  # the parse job rejects any whitespace outright (hack/parse-rc-tag.sh): a
+  # non-canonical spelling gets its own lane but fails parse before it can push,
+  # so only the one canonical spelling of a tag ever reaches the commit step.
+  group: changelog-rc-${{ inputs.rc_tag }}
+  cancel-in-progress: false
+
+permissions:
+  contents: read
+
+jobs:
+  # Strict front door + fail-fast gate. Validate the dispatch input, derive the
+  # release identifiers, AND confirm the rc staging branch exists — all before
+  # the (slow, AI-driven) generate job is allowed to start. `generate` needs this
+  # job, so a bad tag or a missing branch is reported in seconds rather than
+  # after a 30-minute generation whose output has nowhere to land.
+  parse:
+    name: Parse, validate, and verify the rc staging branch
+    runs-on: ubuntu-latest
+    timeout-minutes: 5
+    permissions:
+      contents: read
+    outputs:
+      rc_tag: ${{ steps.parse.outputs.rc_tag }}
+      stable_version: ${{ steps.parse.outputs.stable_version }}
+      rc_branch: ${{ steps.parse.outputs.rc_branch }}
+    steps:
+      # parse-rc-tag.sh lives in the tree, so overlay the dispatch ref's hack/
+      # before calling it. Gitignored; nothing in this job commits.
+      - name: Checkout release tooling from the dispatch ref
+        uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4
+        with:
+          ref: ${{ github.ref_name }}
+          path: .release-tooling
+          sparse-checkout: hack
+          persist-credentials: false
+
+      # Strict parse: reject whitespace outright and match ^vX.Y.Z-rc.N$. The
+      # logic is the shared, behaviour-tested hack/parse-rc-tag.sh (the reusable
+      # core inlines the same rules, because its parse must run before any
+      # checkout). Emits rc_tag / stable_version / rc_branch, all reconstructed
+      # from the pattern — never raw dispatch input.
+      - name: Parse and validate rc tag
+        id: parse
+        env:
+          RC_TAG: ${{ inputs.rc_tag }}
+        run: |
+          .release-tooling/hack/parse-rc-tag.sh "${RC_TAG}" >> "$GITHUB_OUTPUT"
+
+      # Fail fast, UP FRONT, before generation: the rc staging branch MUST
+      # already exist. tags.yaml creates release-X.Y.Z-rc.N as part of the rc
+      # build; its absence means the rc was never built, so there is nothing to
+      # attach a changelog to. Anonymous ls-remote suffices for this public repo;
+      # distinguish "absent" (exit 2) from a transport error (any other non-zero)
+      # so a network blip cannot masquerade as "missing".
+      - name: Verify rc staging branch exists
+        env:
+          RC_BRANCH: ${{ steps.parse.outputs.rc_branch }}
+          RC_TAG: ${{ steps.parse.outputs.rc_tag }}
+          REPO_URL: ${{ github.server_url }}/${{ github.repository }}
+        run: |
+          set +e
+          git ls-remote --exit-code --heads "${REPO_URL}" "refs/heads/${RC_BRANCH}" >/dev/null 2>&1
+          rc=$?
+          set -e
+          if [ "${rc}" -eq 2 ]; then
+            echo "::error::rc staging branch '${RC_BRANCH}' does not exist. Cut ${RC_TAG} first (the Cut Pre-release Tag workflow); tags.yaml creates the staging branch as part of the rc build."
+            exit 1
+          elif [ "${rc}" -ne 0 ]; then
+            echo "::error::Could not query origin for '${RC_BRANCH}' (git ls-remote exit ${rc}) — refusing to proceed."
+            exit 1
+          fi
+          echo "rc staging branch '${RC_BRANCH}' exists — proceeding to generation."
+
+  # Generate via the shared reusable workflow. Passing the reconstructed rc_tag
+  # (not raw input) keeps untrusted data out of the called workflow; it re-parses
+  # defensively regardless. Secrets are passed explicitly, matching the reusable
+  # workflow's declared interface.
+  generate:
+    name: Generate changelog
+    needs: parse
+    # Explicit, matching promote-rc.yaml's identical call: a caller's grant is the
+    # ceiling for every job in the called workflow, and the docs describe an
+    # omitted block as "the default permissions for the GITHUB_TOKEN" rather than
+    # this workflow's own top-level block. Spelling it out removes the ambiguity.
+    permissions:
+      contents: read
+    uses: ./.github/workflows/changelog-generate.yaml
+    with:
+      rc_tag: ${{ needs.parse.outputs.rc_tag }}
+    secrets:
+      COZYSTACK_CI_APP_ID: ${{ secrets.COZYSTACK_CI_APP_ID }}
+      COZYSTACK_CI_PRIVATE_KEY: ${{ secrets.COZYSTACK_CI_PRIVATE_KEY }}
+      COPILOT_GITHUB_TOKEN: ${{ secrets.COPILOT_GITHUB_TOKEN }}
+
+  # Commit the produced changelog onto the rc staging branch. Unlike promote-rc's
+  # open-pr — which degrades silently to a ⚠️ PR body when generation fails,
+  # because a promotion must never be wedged — this is an explicit maintainer
+  # action, so an empty result fails LOUDLY (first step) instead of finishing
+  # green with nothing committed.
+  commit:
+    name: Commit changelog to rc staging branch
+    needs: [parse, generate]
+    if: ${{ !cancelled() && needs.generate.result == 'success' }}
+    runs-on: ubuntu-latest
+    timeout-minutes: 15
+    permissions:
+      contents: write # push the changelog commit onto the rc staging branch (via the scoped app token)
+    steps:
+      # Hard-fail when generation produced nothing usable. The reusable workflow
+      # keeps the AI step non-blocking (so promote-rc can degrade), which means
+      # `generate` succeeds even when it yielded no changelog — the maintainer who
+      # pressed this button must be told, not left with a green run and no file.
+      - name: Require a usable changelog from generation
+        env:
+          PRESENT: ${{ needs.generate.outputs.present }}
+          RC_TAG: ${{ needs.parse.outputs.rc_tag }}
+          STABLE_VERSION: ${{ needs.parse.outputs.stable_version }}
+          RC_BRANCH: ${{ needs.parse.outputs.rc_branch }}
+        run: |
+          if [ "${PRESENT}" != "true" ]; then
+            echo "::error::Changelog generation produced no usable output for ${RC_TAG}. Nothing to commit. Re-run once the cause is fixed, or hand-commit docs/changelogs/v${STABLE_VERSION}.md to ${RC_BRANCH}."
+            exit 1
+          fi
+          echo "Generation produced a usable changelog; committing to ${RC_BRANCH}."
+
+      - name: Generate GitHub App token
+        id: app-token
+        uses: actions/create-github-app-token@d72941d797fd3113feb6b93fd0dec494b13a2547 # v1
+        with:
+          app-id: ${{ secrets.COZYSTACK_CI_APP_ID }}
+          private-key: ${{ secrets.COZYSTACK_CI_PRIVATE_KEY }}
+          owner: cozystack
+          # Scope the token to this repo only — it never touches other repos.
+          repositories: ${{ github.event.repository.name }}
+
+      # The rc staging branch's existence was already verified UP FRONT in the
+      # parse job (before generation), so it is not re-checked here — a checkout
+      # failure for a branch deleted in the meantime is a rare, self-evident race.
+      - name: Checkout rc staging branch
+        uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4
+        with:
+          ref: ${{ needs.parse.outputs.rc_branch }}
+          fetch-depth: 0
+          token: ${{ steps.app-token.outputs.token }}
+          persist-credentials: false
+
+      # The rc staging branch predates this change and does not carry
+      # hack/validate-changelog.sh. Overlay the current tooling from the dispatch
+      # ref, exactly as promote-rc and changelog-generate do. Gitignored.
+      - name: Checkout release tooling from the dispatch ref
+        uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4
+        with:
+          ref: ${{ github.ref_name }}
+          path: .release-tooling
+          sparse-checkout: |
+            hack
+            docs/agents
+          persist-credentials: false
+
+      - name: Download changelog artifact
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
+        with:
+          name: changelog-v${{ needs.parse.outputs.stable_version }}
+          path: docs/changelogs
+
+      # Validate before it ever touches the branch — a truncated hand-path file
+      # must not be committed and later published verbatim as the release body.
+      # Same script the reusable workflow's Verify step and open-pr use.
+      - name: Verify changelog on disk
+        env:
+          STABLE_VERSION: ${{ needs.parse.outputs.stable_version }}
+        run: |
+          .release-tooling/hack/validate-changelog.sh "docs/changelogs/v${STABLE_VERSION}.md" "${STABLE_VERSION}"
+
+      # Compare-before-push idempotency: if release-X.Y.Z-rc.N already carries an
+      # identical docs/changelogs/vX.Y.Z.md, `git diff --cached --quiet` sees no
+      # change and this is a green no-op — re-pressing the button never produces a
+      # duplicate commit. Only a genuine change is committed and pushed. Same
+      # pattern as open-pr's "Commit changelog to staging branch" step.
+      - name: Commit changelog to rc staging branch
+        env:
+          APP_TOKEN: ${{ steps.app-token.outputs.token }}
+          STABLE_VERSION: ${{ needs.parse.outputs.stable_version }}
+          RC_BRANCH: ${{ needs.parse.outputs.rc_branch }}
+        run: |
+          set -euo pipefail
+          git config user.name  "cozystack-ci[bot]"
+          git config user.email "274107086+cozystack-ci[bot]@users.noreply.github.com"
+          git remote set-url origin "https://x-access-token:${APP_TOKEN}@github.com/${GITHUB_REPOSITORY}"
+          git add "docs/changelogs/v${STABLE_VERSION}.md"
+          if git diff --cached --quiet; then
+            echo "✅ docs/changelogs/v${STABLE_VERSION}.md already on ${RC_BRANCH} and identical; nothing to do."
+            exit 0
+          fi
+          git commit -s -m "docs: add changelog for v${STABLE_VERSION}"
+          git push origin "HEAD:refs/heads/${RC_BRANCH}"
+          echo "✅ Committed docs/changelogs/v${STABLE_VERSION}.md to ${RC_BRANCH}."
diff --git a/.github/workflows/codegen-drift.yml b/.github/workflows/codegen-drift.yml
index a26caf5e66..773a758f7d 100644
--- a/.github/workflows/codegen-drift.yml
+++ b/.github/workflows/codegen-drift.yml
@@ -23,16 +23,26 @@ concurrency:
   group: codegen-drift-${{ github.workflow }}-${{ github.event.pull_request.number }}
   cancel-in-progress: true
 
+# Top-level token defaults to read-only. A job-level block replaces this one
+# rather than adding to it, so each job restates every scope it needs.
+permissions:
+  contents: read
+
 jobs:
   codegen-drift:
     name: Verify generated code is up to date
     runs-on: ubuntu-22.04
+    env:
+      # The pipe falls back to direct on any proxy error (hack/common-envs.mk).
+      GOPROXY: "https://proxy.golang.org|direct"
+    permissions:
+      contents: read
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4
 
       - name: Set up Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@40f1582b2485089dde7abd97c1529aa768e1baff # v5
         with:
           go-version-file: go.mod
           cache: true
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
new file mode 100644
index 0000000000..85b05a66e9
--- /dev/null
+++ b/.github/workflows/codeql.yml
@@ -0,0 +1,98 @@
+name: CodeQL
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+  schedule:
+    # Weekly on Monday 03:27 UTC — off-peak and offset from the other
+    # scheduled jobs (scorecard 06:00 Mon, labels 04:17 Mon, stale 04:37
+    # daily).
+    - cron: '27 3 * * 1'
+
+# Default to read-only; the analyze job opts into security-events: write.
+permissions:
+  contents: read
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  analyze:
+    name: Analyze (${{ matrix.language }})
+    runs-on: ubuntu-latest
+    timeout-minutes: 120
+    env:
+      # The pipe falls back to direct on any proxy error (hack/common-envs.mk).
+      GOPROXY: "https://proxy.golang.org|direct"
+    permissions:
+      # Upload CodeQL results to the code-scanning dashboard. On pull_request
+      # this is also what lets CodeQL post new-alert annotations on the diff.
+      security-events: write
+      # Check out the repository.
+      contents: read
+      # Read workflow run metadata (required by codeql-action on private
+      # repos; harmless on a public repo).
+      actions: read
+
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          # Go uses build-mode: manual. The alternative, autobuild, runs `make`
+          # from the repo root, whose included hack/common-envs.mk does a
+          # `$(shell git fetch upstream --tags)` at parse time — a network call
+          # to a non-origin remote that has no bearing on the analysis and is a
+          # flake vector. Instead the "Build Go modules" step below compiles
+          # each first-party module explicitly. This keeps the same coverage
+          # autobuild aimed for — the root module, api/apps/v1alpha1, and the
+          # three nested image modules — while the _repos/* upstream clones are
+          # gitignored and absent on a clean checkout, so they are excluded for
+          # free. setup-go pins the toolchain to the root go.mod version.
+          - language: go
+            build-mode: manual
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+        with:
+          persist-credentials: false
+
+      - name: Set up Go
+        uses: actions/setup-go@40f1582b2485089dde7abd97c1529aa768e1baff # v5
+        with:
+          go-version-file: go.mod
+          cache: false
+
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4.36.2
+        with:
+          languages: ${{ matrix.language }}
+          build-mode: ${{ matrix.build-mode }}
+
+      # CodeQL traces these compiler invocations to build its database. Each
+      # first-party module is a separate go.mod, so `go build ./...` from the
+      # root never reaches the nested ones — build each explicitly. No `make`,
+      # so no upstream fetch.
+      - name: Build Go modules
+        if: matrix.build-mode == 'manual'
+        shell: bash
+        run: |
+          set -euxo pipefail
+          for mod in \
+            . \
+            api/apps/v1alpha1 \
+            packages/apps/kubernetes/images/kubevirt-csi-driver \
+            packages/system/dashboard/images/token-proxy \
+            packages/system/kubeovn-webhook/images/kubeovn-webhook; do
+            echo "::group::go build ${mod}"
+            ( cd "${mod}" && go build ./... )
+            echo "::endgroup::"
+          done
+
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4.36.2
+        with:
+          category: "/language:${{ matrix.language }}"
diff --git a/.github/workflows/cut-prerelease.yaml b/.github/workflows/cut-prerelease.yaml
new file mode 100644
index 0000000000..c3c31450f9
--- /dev/null
+++ b/.github/workflows/cut-prerelease.yaml
@@ -0,0 +1,357 @@
+name: Cut Pre-release Tag
+
+# Cut a pre-release tag (vX.Y.Z-alpha.N / -beta.N / -rc.N) as the CozyStack CI
+# app, so that no human ever pushes a v* tag by hand.
+#
+# This is the single entry point for creating a pre-release. Stable vX.Y.Z tags
+# are never cut here (or by hand) — they are created write-once by
+# pull-requests-release.yaml finalize at a promote PR's merge commit. See
+# docs/release.md and #2677.
+#
+# Dispatch from the branch the tag belongs to: `main` for a new minor's
+# pre-release (vX.Y.0-rc.N), or `release-X.Y` for a patch line (vX.Y.Z-rc.N).
+# The workflow tags that branch's HEAD.
+#
+# Cutting the first vX.Y.0-rc.N ALSO freezes the line: it creates `release-X.Y`
+# at the tagged commit, and every later cut for that line must come from the
+# branch (a dispatch from `main` is refused). That is what stops features
+# merged after the rc from silently shipping in the release — before this, rc.2
+# was cut from main's tip and picked up everything that had landed meanwhile.
+# `main` stays open for the next minor; fixes reach the release by cherry-pick.
+#
+# Why a workflow instead of a manual `git push`:
+#   1. The tag is pushed with the CI app token. A tag pushed with the default
+#      GITHUB_TOKEN would NOT trigger tags.yaml (GitHub suppresses workflow
+#      recursion from GITHUB_TOKEN); the app token is a distinct identity, so
+#      tags.yaml fires exactly as it does for a maintainer's manual push.
+#   2. It pushes `HEAD:refs/tags/<tag>` from the checked-out branch tip, so the
+#      push event's base_ref is populated — tags.yaml's "Get base branch" step
+#      needs it to detect main vs release-X.Y.
+#   3. It makes CI the sole creator of pre-release tags. Repo rulesets can
+#      already restrict *stable* tag creation to CI (a "Restrict creations"
+#      ruleset targeting v* while excluding v*-*), but pre-releases were
+#      hand-pushed, so they could not be CI-locked. With this workflow as their
+#      only entry point, admins can extend "Restrict creations" (CI app the sole
+#      bypass) to *all* of v* — pre-release and stable alike.
+
+on:
+  workflow_dispatch:
+    inputs:
+      tag:
+        description: "Pre-release tag to cut, e.g. v1.6.0-rc.1 (must be -alpha.N / -beta.N / -rc.N)"
+        required: true
+        type: string
+
+concurrency:
+  # One global lane: two dispatches racing to push overlapping tags would
+  # confuse the write-once guard. Pre-release cuts are rare, so serialize.
+  group: cut-prerelease
+  cancel-in-progress: false
+
+# The tag write happens via the app token, not GITHUB_TOKEN, so the job needs
+# only read scope on the default token.
+permissions:
+  contents: read
+
+jobs:
+  cut:
+    name: Cut ${{ inputs.tag }}
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+
+    steps:
+      # Pure-input validation first — no token minted, no checkout, so a bad tag
+      # or wrong dispatch branch fails in seconds.
+
+      # Validate the dispatch input against a strict pre-release pattern. A
+      # stable vX.Y.Z is rejected on purpose: stable tags are cut only by the
+      # promote flow, at a PR merge commit.
+      - name: Parse and validate tag
+        id: parse
+        env:
+          TAG: ${{ inputs.tag }}
+        uses: actions/github-script@f28e40c7f34bde8b3046d885e986cb6290c5673b # v7
+        with:
+          script: |
+            const tag = process.env.TAG.trim();
+            const m = tag.match(/^v(\d+)\.(\d+)\.(\d+)-(alpha|beta|rc)\.(\d+)$/);
+            if (!m) {
+              core.setFailed(
+                `tag '${tag}' must match 'vX.Y.Z-(alpha|beta|rc).N'. ` +
+                `Stable vX.Y.Z tags are cut by the promote flow, not here.`
+              );
+              return;
+            }
+            core.setOutput('tag', tag);
+            core.setOutput('line', `${m[1]}.${m[2]}`);   // 1.6
+            core.setOutput('patch', m[3]);                // 0
+            core.setOutput('kind', m[4]);                 // rc
+
+      # Refuse to cut from anything but main or the *matching* release-X.Y line.
+      # The pushed tag's base_ref (= the dispatch branch) must be one tags.yaml
+      # accepts, and the branch must actually contain the version being cut.
+      - name: Validate dispatch branch
+        env:
+          REF_NAME: ${{ github.ref_name }}
+          REF_TYPE: ${{ github.ref_type }}
+          LINE: ${{ steps.parse.outputs.line }}
+          PATCH: ${{ steps.parse.outputs.patch }}
+        run: |
+          if [ "$REF_TYPE" != "branch" ]; then
+            echo "::error::Dispatch this workflow from a branch (main or release-X.Y), not a tag or SHA."
+            exit 1
+          fi
+          case "$REF_NAME" in
+            main)
+              # From main only a *new minor's* pre-release (vX.Y.0-*) is valid.
+              # A patch-line pre-release (Z>0) built from main content would land
+              # on a wrong-tree release-X.Y.Z-rc.N staging branch — it must be cut
+              # from its own release-X.Y line instead.
+              if [ "$PATCH" != "0" ]; then
+                echo "::error::From 'main' only vX.Y.0-* pre-releases may be cut (got patch .$PATCH). Cut v$LINE.$PATCH-* from 'release-$LINE'."
+                exit 1
+              fi
+              ;;
+            release-*)
+              if [ "release-$LINE" != "$REF_NAME" ]; then
+                echo "::error::Tag line $LINE does not match dispatch branch '$REF_NAME'. Cut v$LINE.* from 'main' or 'release-$LINE'."
+                exit 1
+              fi
+              ;;
+            *)
+              echo "::error::Dispatch from 'main' or 'release-X.Y' only. Got '$REF_NAME'."
+              exit 1
+              ;;
+          esac
+
+      - name: Generate GitHub App token
+        id: app-token
+        uses: actions/create-github-app-token@d72941d797fd3113feb6b93fd0dec494b13a2547 # v1
+        with:
+          app-id: ${{ secrets.COZYSTACK_CI_APP_ID }}
+          private-key: ${{ secrets.COZYSTACK_CI_PRIVATE_KEY }}
+          owner: cozystack
+          # Scope the token to this repo only — it never touches other repos.
+          repositories: ${{ github.event.repository.name }}
+
+      # Cutting a release is privileged. workflow_dispatch already requires write
+      # access to trigger, so this is defense-in-depth: it makes the requirement
+      # explicit and auditable, and fails closed if that platform default ever
+      # changes or the job is reached by another path. Reads permission via the
+      # app token (fails the step if the API errors — fail closed).
+      - name: Require write access
+        uses: actions/github-script@f28e40c7f34bde8b3046d885e986cb6290c5673b # v7
+        with:
+          github-token: ${{ steps.app-token.outputs.token }}
+          script: |
+            const { data } = await github.rest.repos.getCollaboratorPermissionLevel({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              username: context.actor,
+            });
+            // getCollaboratorPermissionLevel's `permission` field returns only
+            // the legacy roles admin/write/read/none (maintain collapses to
+            // write, triage to read), so admin+write is the whole "can push" set.
+            const allowed = ['admin', 'write'];
+            if (!allowed.includes(data.permission)) {
+              core.setFailed(
+                `@${context.actor} has '${data.permission}' access — cutting a pre-release tag ` +
+                `requires write access to ${context.repo.owner}/${context.repo.repo}.`
+              );
+              return;
+            }
+            core.info(`@${context.actor}: '${data.permission}' access — authorized.`);
+
+      # Minimal checkout — just enough to configure origin with the app-token
+      # credential (persist-credentials, default on) so the bare push below is
+      # app-authenticated, and to resolve HEAD. One ref, shallow, no tags.
+      - name: Check out the dispatched branch
+        uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4
+        with:
+          fetch-depth: 1
+          token: ${{ steps.app-token.outputs.token }}
+
+      # Enforce the freeze. Once release-X.Y exists, that line's content is
+      # closed and lives only on the branch. A vX.Y.* pre-release dispatched
+      # from 'main' after the freeze would tag main's tip, picking up every
+      # feature merged since — exactly what the release branch exists to
+      # prevent. Applies to alpha/beta too: after the freeze the whole line
+      # comes off the branch, whatever the pre-release kind.
+      #
+      # Runs BEFORE the tag push so a mistaken dispatch fails without burning
+      # the write-once tag name.
+      - name: Refuse to cut a frozen line from main
+        if: github.ref_name == 'main'
+        env:
+          LINE: ${{ steps.parse.outputs.line }}
+        run: |
+          # Distinguish "absent" (--exit-code exits 2) from a transport/auth
+          # failure, mirroring the write-once query below: an infra blip must
+          # not read as "not frozen, go ahead".
+          set +e
+          git ls-remote --exit-code --heads origin "refs/heads/release-$LINE" >/dev/null 2>&1
+          rc=$?
+          set -e
+          if [ "$rc" -eq 0 ]; then
+            echo "::error::release-$LINE already exists — the $LINE line is frozen. Cut v$LINE.* from 'release-$LINE' (cherry-pick fixes there first); 'main' is open for the next minor."
+            exit 1
+          elif [ "$rc" -ne 2 ]; then
+            echo "::error::Could not query origin for release-$LINE (git ls-remote exit $rc) — refusing to proceed."
+            exit 1
+          fi
+
+      - name: Cut and push the pre-release tag
+        env:
+          TAG: ${{ steps.parse.outputs.tag }}
+          REF_NAME: ${{ github.ref_name }}
+        run: |
+          # Write-once: the tag must not already exist on origin. Distinguish
+          # "absent" (git ls-remote --exit-code exits 2) from a transport/auth
+          # failure (any other non-zero) so an infra blip cannot masquerade as
+          # "free to create".
+          set +e
+          git ls-remote --exit-code --tags origin "refs/tags/$TAG" >/dev/null 2>&1
+          rc=$?
+          set -e
+          if [ "$rc" -eq 0 ]; then
+            echo "::error::Tag $TAG already exists on origin — pre-release tags are write-once."
+            exit 1
+          elif [ "$rc" -ne 2 ]; then
+            echo "::error::Could not query origin for $TAG (git ls-remote exit $rc) — refusing to proceed."
+            exit 1
+          fi
+
+          # Stale-tip guard: workflow_dispatch checks out the dispatch-time commit,
+          # not the branch tip at push time (the gap includes any wait in the
+          # cut-prerelease concurrency queue). If the branch advanced meanwhile,
+          # pushing HEAD would tag a stale commit and yield an empty base_ref —
+          # tags.yaml would then fail, having already burned this write-once name.
+          # Refuse and ask for a re-run instead.
+          local_head="$(git rev-parse HEAD)"
+          # Resolve the remote tip without a pipe masking ls-remote's exit code
+          # (mirrors the write-once query above): a transport/auth failure must
+          # not read as "branch not found".
+          set +e
+          remote_ls="$(git ls-remote origin "refs/heads/$REF_NAME")"
+          rc=$?
+          set -e
+          if [ "$rc" -ne 0 ]; then
+            echo "::error::Could not query origin for the tip of '$REF_NAME' (git ls-remote exit $rc) — refusing to proceed."
+            exit 1
+          fi
+          remote_head="$(printf '%s' "$remote_ls" | cut -f1)"
+          if [ -z "$remote_head" ]; then
+            echo "::error::Could not resolve the tip of '$REF_NAME' on origin (no such branch?)."
+            exit 1
+          fi
+          if [ "$local_head" != "$remote_head" ]; then
+            echo "::error::'$REF_NAME' advanced since dispatch ($local_head -> $remote_head). Re-run the workflow to tag the current tip."
+            exit 1
+          fi
+
+          # Push HEAD straight to a tag ref: no local tag object, non-forced. The
+          # branch-tip anchoring makes GitHub populate the push event's base_ref
+          # (tags.yaml's Get-base-branch step requires it); non-forced makes the
+          # tag write-once at the git layer. tags.yaml takes it from here: every
+          # pre-release is built, drafted, and given a staging branch; rc tags
+          # then run mandatory full E2E. Alpha/beta tags use e2e-tag.yaml's
+          # manual dispatch when validation is wanted.
+          git push origin "HEAD:refs/tags/$TAG"
+          echo "Pushed $TAG at $local_head from '$REF_NAME'."
+          echo "tags.yaml will now build and draft the pre-release and create its staging branch; rc tags also run mandatory full E2E."
+
+      # Freeze the line. An rc is the feature-freeze signal, so the first
+      # vX.Y.0-rc.N branches release-X.Y at the tagged commit. From here the
+      # release's content is closed: fixes reach it only by cherry-pick or
+      # backport onto the branch, while 'main' moves on to the next minor.
+      # promote-rc.yaml then targets its promote PR at release-X.Y (it already
+      # prefers that branch when it exists), so the stable release is cut from
+      # the frozen tree rather than from whatever main has accumulated.
+      #
+      # Gated to -rc: alpha/beta are pre-freeze validation builds cut from an
+      # open main, and freezing on them would force every later change onto
+      # cherry-picks far too early.
+      #
+      # Gated to patch 0: a patch-line rc (vX.Y.Z-rc.N, Z>0) is cut from
+      # release-X.Y, which by definition already exists.
+      #
+      # Create-only, never force-moved — a later rc.N finds the branch and
+      # no-ops. Moving it would silently re-open the freeze and drag in
+      # whatever the new tip contains, defeating the whole mechanism.
+      - name: Freeze the line (create release-X.Y)
+        id: freeze
+        if: steps.parse.outputs.kind == 'rc' && steps.parse.outputs.patch == '0'
+        env:
+          LINE: ${{ steps.parse.outputs.line }}
+          TAG: ${{ steps.parse.outputs.tag }}
+        run: |
+          BRANCH="release-$LINE"
+          # Same absent-vs-broken distinction the three guards above make: a
+          # transport/auth failure must not read as "branch not found" and send
+          # us into the create path.
+          set +e
+          existing_ls="$(git ls-remote --heads origin "refs/heads/$BRANCH")"
+          rc=$?
+          set -e
+          if [ "$rc" -ne 0 ]; then
+            echo "::error::Could not query origin for '$BRANCH' (git ls-remote exit $rc) — refusing to proceed."
+            exit 1
+          fi
+          EXISTING="$(printf '%s' "$existing_ls" | cut -f1)"
+          if [ -n "$EXISTING" ]; then
+            echo "✅ $BRANCH already exists at $EXISTING; leaving it untouched."
+            echo "created=false" >> "$GITHUB_OUTPUT"
+            exit 0
+          fi
+          # HEAD is the commit just tagged: the stale-tip guard above proved it
+          # still equals the remote branch tip, so branch and tag agree.
+          #
+          # This push and the tag push above are independent operations. If the
+          # tag landed and this fails (transient blip, runner eviction), the
+          # line is tagged but not frozen, and the write-once tag guard refuses
+          # a same-tag re-dispatch — so recovery is manual. Fail loudly with the
+          # exact command instead of leaving the operator to reconstruct it.
+          # Nothing is silently wrong in the meantime: no wrong ref is pushed,
+          # and finalize still creates the branch later.
+          if ! git push origin "HEAD:refs/heads/$BRANCH"; then
+            echo "::error::Failed to create $BRANCH, but $TAG is already pushed."
+            echo "::error::Re-dispatching $TAG will be refused by the write-once tag guard."
+            echo "::error::Recover manually: git push origin $(git rev-parse HEAD):refs/heads/$BRANCH"
+            exit 1
+          fi
+          echo "created=true" >> "$GITHUB_OUTPUT"
+          echo "🔒 Froze the $LINE line: created $BRANCH at $(git rev-parse HEAD) ($TAG)."
+          echo "   'main' is now open for the next minor."
+          echo "   Fixes for $LINE must be cherry-picked onto $BRANCH."
+
+      # Give the new line its packages artifact straight away.
+      #
+      # build-release.yaml publishes `cozystack-packages:<line>` on push to a
+      # line branch, but it cannot fire for the push that CREATES the line: the
+      # branch points at a commit already on main, so the push carries no new
+      # commits, and GitHub does not run a workflow whose paths-ignore filter
+      # finds no changed files. Left alone, the line has no artifact until its
+      # first cherry-pick merges. In that window pull-requests.yaml's overlay
+      # finds nothing to pull and leaves each package on its committed ref —
+      # which at freeze time is the PREVIOUS release's, the cross-generation mix
+      # #3437 fixed. The old flow never had this window: it branched at the
+      # promote merge commit, which carried real commits and its own refs.
+      #
+      # Non-fatal by design. Without the artifact the overlay no-ops and early
+      # cherry-pick PRs test their committed refs — where they were before
+      # #3471, a degradation and not a broken release. The tag is pushed and the
+      # line is frozen by this point, so failing here would misreport both; warn
+      # with the manual command instead, as the freeze step does.
+      - name: Build the frozen line's packages artifact
+        if: steps.freeze.outputs.created == 'true'
+        env:
+          GH_TOKEN: ${{ steps.app-token.outputs.token }}
+          BRANCH: release-${{ steps.parse.outputs.line }}
+        run: |
+          if gh workflow run build-release.yaml --ref "$BRANCH"; then
+            echo "Dispatched build-release.yaml for $BRANCH; it publishes cozystack-packages:$BRANCH."
+          else
+            echo "::warning::Could not dispatch build-release.yaml for $BRANCH (the CI app may lack 'actions: write')."
+            echo "::warning::Until it runs, cozystack-packages:$BRANCH does not exist, and PRs onto $BRANCH test the image refs committed in the tree rather than the line's own build."
+            echo "::warning::Start it by hand: gh workflow run build-release.yaml --ref $BRANCH"
+          fi
diff --git a/.github/workflows/e2e-fork.yaml b/.github/workflows/e2e-fork.yaml
new file mode 100644
index 0000000000..df6ed12681
--- /dev/null
+++ b/.github/workflows/e2e-fork.yaml
@@ -0,0 +1,837 @@
+name: E2E (fork)
+
+# Privileged half of the fork-PR e2e split (#3257).
+#
+# A fork PR's `pull_request` run (pull-requests.yaml) carries no registry
+# credentials, so it builds every image to an OCI archive and uploads it as an
+# artifact instead of pushing (OCI_EXPORT_DIR). This workflow runs from the
+# DEFAULT branch after that run completes — so it DOES have secrets — and:
+#   1. pushes the pre-built image archives to OCIR BY DIGEST and flux-pushes the
+#      digest-pinned packages tree (job `publish`); and
+#   2. runs the e2e suite against them and reports the required "E2E Tests"
+#      commit status back on the PR head SHA (jobs `e2e` + `report`).
+#
+# Security boundary: the untrusted fork code produced only opaque artifacts. The
+# OCIR push token is live ONLY in `publish`, and only after its last step that
+# runs anything but a fixed binary (git/skopeo/flux) over data. `publish` does
+# evaluate Makefiles once, with `make -n`, to derive the image allowlist — from
+# the BASE tree and before the login, never from the fork's Makefiles and never
+# with the credential loaded. No fork-authored script runs in that job at all. The
+# fork's images and test scripts run only in `e2e`, which has NO push token and
+# runs in an ephemeral sandbox. This is why the split exists instead of a
+# pull_request_target run that would hand fork code the credentials directly.
+#
+# Same-repo PRs are handled entirely by pull-requests.yaml; this workflow no-ops
+# for them (see the `resolve` job guard).
+
+on:
+  workflow_run:
+    workflows: ["Pull Request"]
+    types: [completed]
+
+# Cancel a stale privileged run when the fork pushes again (a newer Pull Request
+# run for the same fork branch supersedes it). Keyed by fork repo + branch since
+# the PR number is not known at workflow level.
+#
+# A triggering run that concluded `cancelled` or `skipped` gets a group of its
+# OWN, keyed by that run's id. Such a run built nothing — labelling an open fork
+# PR produces one, because `plan` in pull-requests.yaml discards every label a
+# fork run could not publish for and every job skips — and `resolve` recognises
+# it and posts no status at all. In the shared group it would still cancel the live
+# privileged run that DOES own the status for that head SHA, and the pair
+# "cancel the owner, then post nothing" leaves the SHA at "Expected" with
+# nothing left to flip it: the run that replaced the owner is the very one that
+# decided to stay silent, so only a new push recovers it. Keyed by run id, a
+# discarded run can cancel only itself.
+concurrency:
+  group: e2e-fork-${{ github.event.workflow_run.head_repository.full_name }}-${{ github.event.workflow_run.head_branch }}${{ (github.event.workflow_run.conclusion == 'cancelled' || github.event.workflow_run.conclusion == 'skipped') && format('-discarded-{0}', github.event.workflow_run.id) || '' }}
+  cancel-in-progress: true
+
+env:
+  REGISTRY: iad.ocir.io/idyksih5sir9/cozystack
+
+permissions:
+  contents: read
+
+jobs:
+  # Decide whether this is a fork PR that needs e2e, resolve its PR number and
+  # head SHA, and post the pending "E2E Tests" commit status so the PR is not
+  # mergeable until `report` concludes it. Every decision is derived from data the fork
+  # cannot forge — the workflow_run conclusion, the base-repo PR list, and the
+  # base-repo PR file list — NOT from the presence/absence of an artifact the
+  # fork's own build controls. Fail-closed if the fork build failed or the
+  # pr-patch artifact is missing; green-and-stop only for a PR whose file list is
+  # entirely under docs/ (verified against the base-repo API).
+  resolve:
+    name: Resolve fork PR
+    # Only fork PRs: head_repository differs from the base repository. Same-repo
+    # PRs get "E2E Tests" from pull-requests.yaml's e2e-report job instead.
+    if: >-
+      ${{ github.event.workflow_run.event == 'pull_request'
+      && github.event.workflow_run.head_repository.full_name != github.event.workflow_run.repository.full_name }}
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      actions: read
+      pull-requests: read
+      statuses: write
+    outputs:
+      should_run:   ${{ steps.r.outputs.should_run }}
+      pr_number:    ${{ steps.r.outputs.pr_number }}
+      head_sha:     ${{ steps.r.outputs.head_sha }}
+      run_id:       ${{ steps.r.outputs.run_id }}
+      # TIA inputs derived from TRUSTED base-repo data (the PR file list and
+      # labels), NOT the fork-controlled merge-ref diff. That covers the INPUTS
+      # only — the selector and the suites themselves run from the fork tree in
+      # the `e2e` job; see that job's header for what actually holds.
+      changed_b64:  ${{ steps.r.outputs.changed_b64 }}
+      full_e2e:     ${{ steps.r.outputs.full_e2e }}
+    steps:
+      # Decide the verdict and post the "E2E Tests" commit status directly, with
+      # this job's default (workflow_run) token — it already has the actions:read
+      # / pull-requests:read scopes the lookups need, plus statuses:write from the
+      # job permissions. A commit status (not a check-run) is the merge gate; see
+      # pull-requests.yaml's e2e-report and docs/agents/e2e-testing.md §10.
+      - name: Resolve fork PR and post "E2E Tests" status
+        id: r
+        uses: actions/github-script@f28e40c7f34bde8b3046d885e986cb6290c5673b # v7
+        env:
+          HEAD_SHA:   ${{ github.event.workflow_run.head_sha }}
+          RUN_ID:     ${{ github.event.workflow_run.id }}
+          CONCLUSION: ${{ github.event.workflow_run.conclusion }}
+        with:
+          script: |
+            const { HEAD_SHA, RUN_ID, CONCLUSION } = process.env;
+            const { owner, repo } = context.repo;
+            // Validate the SHA before it flows into a status target / image tag.
+            if (!/^[0-9a-f]{40}$/.test(HEAD_SHA)) {
+              core.setFailed(`unexpected head_sha '${HEAD_SHA}'`);
+              return;
+            }
+            core.setOutput('head_sha', HEAD_SHA);
+            core.setOutput('run_id', String(RUN_ID));
+
+            const target_url = `${context.serverUrl}/${owner}/${repo}/actions/runs/${context.runId}`;
+            const setStatus = (state, description) => github.rest.repos.createCommitStatus({
+              owner, repo, sha: HEAD_SHA, state, context: 'E2E Tests', description, target_url,
+            });
+            // Post a TERMINAL status (docs-only success / fail-closed failure) and
+            // stop — no privileged run needed. `report` never runs for these
+            // (guarded on should_run).
+            const decide = async (state, description) => {
+              await setStatus(state, description);
+              core.setOutput('should_run', 'false');
+            };
+
+            // A CANCELLED or wholly-SKIPPED triggering run is not a verdict.
+            // cancel-in-progress kills the live run when the fork pushes again
+            // (and, before the label-group split in pull-requests.yaml, when
+            // anyone labelled the PR); the run that replaces it reports on its
+            // own SHA. Posting `failure` from here would stamp a false red on a
+            // SHA whose e2e never ran, and nothing would flip it back — the
+            // replacement run for the SAME SHA takes the discarded-label path
+            // below and posts nothing. Checked on the conclusion rather than on
+            // the job list because a cancelled run can report no jobs at all,
+            // which would make the `Plan build` lookup below miss. Fail-closed
+            // either way: an unposted required status stays "Expected", so
+            // declining to post can only preserve a verdict a real run reached.
+            if (CONCLUSION === 'cancelled' || CONCLUSION === 'skipped') {
+              console.log(`Triggering run ${RUN_ID} concluded '${CONCLUSION}' — leaving "E2E Tests" untouched.`);
+              core.setOutput('should_run', 'false');
+              return;
+            }
+
+            // Discarded label event: pull-requests.yaml triggers on `labeled` but
+            // its `plan` guard discards every label a fork run could not publish
+            // for, so such a run skips every job and builds nothing. That guard
+            // admits full-e2e, and admits `release` for SAME-REPO PRs only —
+            // deliberately, for this check. A `release`-labelled run reaches
+            // `plan` but has `build`/`finalize` gated off by its own label, so it
+            // succeeds having produced no pr-patch, and this lane would take it
+            // for a real run and fail closed below on the missing artifact. The
+            // same shape still reaches here from a PUSH to a fork PR somebody
+            // mislabelled `release`; that predates promotion using the label and
+            // is not fixed here. Post NOTHING and stop —
+            // deciding here would overwrite an already-green status with red (via
+            // the CONCLUSION check or the missing-pr-patch check below) every time
+            // anyone labels an open fork PR. Fail-closed: statuses are per-SHA and
+            // an unposted required status stays "Expected", which blocks the merge,
+            // so declining to post can only ever preserve a verdict a real run
+            // reached — never invent one. A fork editing the workflow to force this
+            // path just leaves its head SHA with no status, i.e. not mergeable.
+            const jobs = await github.paginate(
+              github.rest.actions.listJobsForWorkflowRun,
+              { owner, repo, run_id: RUN_ID, per_page: 100 },
+            );
+            const plan = jobs.find(j => j.name === 'Plan build');
+            if (plan && plan.conclusion === 'skipped') {
+              console.log(`Triggering run ${RUN_ID} skipped 'Plan build' (discarded label event) — leaving "E2E Tests" untouched.`);
+              core.setOutput('should_run', 'false');
+              return;
+            }
+
+            // Past the two silent returns, this run owns the status for this
+            // SHA, so claim it before doing anything that can throw. Every
+            // lookup below is a network call, and github-script turns a 5xx
+            // into a failed job: `report` is then skipped for want of
+            // should_run, nothing writes the context, and a head SHA that was
+            // already green stays green with no suite behind it. Opening here
+            // makes that path leave `pending` instead, which blocks. Later
+            // branches overwrite it through `decide()` as before.
+            //
+            // The jobs lookup above cannot move below this line: the
+            // discarded-label decision depends on it, and posting before that
+            // decision is what would let a run stamp a status it does not own.
+            // A failure there therefore still leaves the SHA untouched, which
+            // is the deliberate half of the trade rather than an oversight.
+            await setStatus('pending', 'Running e2e in the privileged fork workflow…');
+
+            // Fork build did not succeed → fail the required status (fail-closed).
+            if (CONCLUSION !== 'success') {
+              await decide('failure', `Pull Request workflow concluded '${CONCLUSION}'; e2e not run`);
+              return;
+            }
+
+            // Resolve the PR number for this commit. Neither obvious lookup
+            // works for a fork: `workflow_run.pull_requests` is empty for a
+            // cross-repository run, and the association endpoint this used to
+            // call, `listPullRequestsAssociatedWithCommit`, returns nothing
+            // either — a fork PR head reaches the base repo only as
+            // `refs/pull/<n>/head`, and that association index does not walk
+            // `refs/pull/*`. It resolves same-repo heads fine, which is exactly
+            // why the hole stayed invisible: every fork PR fail-closed right
+            // here on `found 0` and no fork run ever reached publish or e2e,
+            // while same-repo PRs get "E2E Tests" from pull-requests.yaml and
+            // never enter this workflow at all.
+            //
+            // So enumerate the base repo's OPEN pull requests and match on the
+            // head SHA. Same trust properties as the call it replaces — plain
+            // base-repo API data, nothing the fork can forge — and asking for
+            // `state: 'open'` at the source keeps the old rule that a closed or
+            // merged PR never counts, so a fork cannot point a stale commit at
+            // a green.
+            // Paginated, like every other lookup in this script. Here it is
+            // load-bearing twice over: the PR being looked for is frequently
+            // not on the first page at all, and the check below counts matches,
+            // so a single page would also miss the second PR in exactly the
+            // case that count exists to catch.
+            const openPrs = await github.paginate(
+              github.rest.pulls.list,
+              { owner, repo, state: 'open', per_page: 100 },
+            );
+            // Exactly one PR AT this head, not the first match. A single
+            // branch may have several open PRs against different base branches,
+            // and every decision below is taken from whichever PR this picks:
+            // the merge-ref checkout, the docs-only verdict, the TIA file list,
+            // while the status is written to the head SHA all of them share.
+            // Taking the first would let a verdict computed for one PR satisfy
+            // another, including a docs-only green for a PR whose own base sees
+            // code. The HEAD^2 == head_sha assert downstream cannot catch that:
+            // it holds for every PR sitting on the commit.
+            //
+            // Matching head.sha, rather than any notion of reachability, is
+            // what keeps the guard as narrow as its reason. Stack one branch on
+            // another and open both PRs, and the lower PR's head is merely
+            // CONTAINED in the upper branch; counting that as two would fail
+            // the lower PR closed on a state its author cannot clear by
+            // pushing. That is the same unfixable red this workflow refuses to
+            // inflict elsewhere. Two PRs genuinely at the same head still fail
+            // closed, which is the case the guard exists for.
+            const open = openPrs.filter(p => p.head && p.head.sha === HEAD_SHA);
+            if (open.length !== 1) {
+              await decide('failure', `expected exactly one open PR for ${HEAD_SHA}, found ${open.length}`);
+              return;
+            }
+            const pr = open[0];
+            // Validate it is a bare integer before it flows into a checkout ref.
+            const prNumber = String(pr.number);
+            if (!/^[0-9]+$/.test(prNumber)) {
+              await decide('failure', `unexpected PR number '${prNumber}' for ${HEAD_SHA}`);
+              return;
+            }
+            core.setOutput('pr_number', prNumber);
+
+            // Docs-only decision from TRUSTED data: the base-repo PR file list,
+            // NOT the presence of a fork-build artifact. A fork controls whether
+            // pull-requests.yaml emits pr-patch (its plan step runs from the fork
+            // merge commit), so inferring docs-only from a missing artifact would
+            // let a fork skip e2e and conclude green with nothing tested (#3257).
+            const files = await github.paginate(github.rest.pulls.listFiles, {
+              owner, repo, pull_number: Number(prNumber), per_page: 100,
+            });
+            // listFiles is capped at 3000 files. A truncated list could omit the
+            // only non-docs path and green the gate, so fail closed at the cap
+            // rather than rule docs-only on a list we know may be incomplete.
+            if (files.length >= 3000) {
+              await decide('failure', 'PR file list hit the 3000-file API cap — cannot verify docs-only');
+              return;
+            }
+            // A rename reports the NEW path in `filename` and the old one in
+            // `previous_filename`. Checking only `filename` would read a
+            // packages/… -> docs/… rename as docs-only, when it in fact removes
+            // a code path. BOTH sides must be under docs/ to count as docs-only.
+            const isDocs = p => typeof p === 'string' && p.startsWith('docs/');
+            const hasNonDocs = files.some(f =>
+              !isDocs(f.filename) || (f.previous_filename && !isDocs(f.previous_filename)));
+            if (!hasNonDocs) {
+              await decide('success', 'docs-only PR (verified via PR file list) — e2e not required');
+              return;
+            }
+
+            // Non-docs change → e2e is REQUIRED. The fork build must have produced
+            // the pr-patch artifact; a missing one means the build did not
+            // complete, so fail closed (never conclude green without running e2e).
+            const arts = await github.paginate(
+              github.rest.actions.listWorkflowRunArtifacts,
+              { owner, repo, run_id: RUN_ID, per_page: 100 },
+            );
+            if (!arts.some(a => a.name === 'pr-patch')) {
+              await decide('failure', 'expected pr-patch artifact is missing — the fork build did not complete');
+              return;
+            }
+
+            // Test-Impact Analysis inputs, from the SAME trusted sources as the
+            // docs-only decision above: the base-repo PR file list drives suite
+            // selection (base64 so newlines survive the job output), and the
+            // base-repo PR labels drive the full-e2e override. Deriving these
+            // from `git diff` on the fork-controlled merge ref would hand a
+            // fork a second way to make TIA select nothing, on top of the one
+            // it already has — the selector runs from the fork tree, so this
+            // hardens the input and not the decision. select-e2e.sh now
+            // classifies every path it is given: shared build inputs and the
+            // e2e harness escalate to the full suite, paths that cannot affect
+            // what e2e exercises are named inert and select nothing, and a path
+            // matching neither escalates rather than returning empty. So an
+            // empty selection reaching this lane means some rule decided the
+            // change cannot affect a suite, not that the selector never
+            // recognised the path, which is what used to make it a fail-open
+            // (#3392).
+            // Both sides of a rename go to TIA too: the old path is a removal
+            // the selector must see (a moved packages/<app>/… still affects
+            // that app's suite). Extra paths can only widen the selection.
+            // Trailing newline: belt to the selector's braces. It used to be
+            // load-bearing, because `while IFS= read -r file` drops an
+            // unterminated last line and that silently emptied the selection
+            // for a one-file PR. select-e2e.sh now guards its own loop with
+            // `|| [ -n "$file" ]`, so the terminator no longer decides
+            // anything. It stays because emitting a text file that ends in a
+            // newline is the contract every other reader will assume, and
+            // because the guard and this line are in different files that can
+            // be changed by different people.
+            const changed = files
+              .flatMap(f => f.previous_filename ? [f.filename, f.previous_filename] : [f.filename])
+              .join('\n') + '\n';
+            core.setOutput('changed_b64', Buffer.from(changed, 'utf8').toString('base64'));
+            const fullE2e = (pr.labels || []).some(l => l.name === 'full-e2e');
+            core.setOutput('full_e2e', fullE2e ? 'true' : 'false');
+
+            // Real run: the pending status was posted above, as soon as this
+            // run was known to own the SHA. `report` flips it to the terminal
+            // state after publish + e2e.
+            core.setOutput('should_run', 'true');
+
+  # Push the fork-built image archives to OCIR by digest and flux-push the
+  # digest-pinned packages tree. No fork-authored script runs here at all, and
+  # while the OCIR token is live only fixed binaries touch the fork's content:
+  # the one step that evaluates Makefiles (`make -n` over the BASE tree, for the
+  # image allowlist) is ordered ahead of the login. Keep that order.
+  publish:
+    name: Push fork images + packages artifact
+    needs: [resolve]
+    if: ${{ needs.resolve.outputs.should_run == 'true' }}
+    runs-on: oracle-vm-4cpu-16gb-x86-64
+    timeout-minutes: 40
+    # No `packages: write`: this job authenticates to OCIR via OCIR_USER/
+    # OCIR_TOKEN (not the GHCR GITHUB_TOKEN), so it needs no GHCR push scope.
+    permissions:
+      contents: read
+      actions: read
+    outputs:
+      packages_digest: ${{ steps.push.outputs.packages_digest }}
+    steps:
+      - name: Set up flux
+        uses: fluxcd/flux2/action@04acaec6161ac4fb1a82ffafa88901c03271d34f # v2.8.6
+        with:
+          version: "2.8.6"
+      - name: Set up toolchain (skopeo)
+        run: |
+          command -v skopeo >/dev/null || { sudo apt-get update -qq && sudo apt-get install -y -qq skopeo; }
+      # The base repo's own merge ref — safe to fetch, not fork-controlled code
+      # execution. pr.patch is applied as DATA below; nothing from the tree runs.
+      - name: Checkout PR merge ref
+        uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4
+        with:
+          ref: refs/pull/${{ needs.resolve.outputs.pr_number }}/merge
+          fetch-depth: 0
+          persist-credentials: false
+          # checkout v4.4.0 and later refuse a fork's code under workflow_run
+          # without this opt-in. The boundary is the one the header describes:
+          # no fork-authored script runs in `publish`, and `e2e` holds no push
+          # token.
+          allow-unsafe-pr-checkout: true
+      # Guard against a TOCTOU race: the status is stamped on the SHA `resolve`
+      # saw, but refs/pull/N/merge tracks the live PR head. If the fork pushed
+      # again between resolve and here, HEAD^2 (the merge ref's PR-head parent)
+      # no longer matches — abort rather than push/test unresolved code.
+      - name: Assert checkout matches resolved head SHA
+        env:
+          EXPECTED_SHA: ${{ needs.resolve.outputs.head_sha }}
+        run: |
+          got="$(git rev-parse HEAD^2)"
+          [ "$got" = "$EXPECTED_SHA" ] || { echo "::error::merge ref moved: HEAD^2=$got != resolved $EXPECTED_SHA"; exit 1; }
+      - name: Download pr.patch
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
+        with:
+          name: pr-patch
+          path: _out/assets
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          run-id: ${{ needs.resolve.outputs.run_id }}
+      - name: Apply pr.patch (reconstruct digest-pinned tree)
+        run: git apply --3way _out/assets/pr.patch
+      - name: Download OCI image archives
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
+        with:
+          pattern: pr-oci-*
+          merge-multiple: true
+          path: _out/oci
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          run-id: ${{ needs.resolve.outputs.run_id }}
+      # Trusted allowlist of image repo names. Every OCI archive a fork PR pushes
+      # under ${REGISTRY}/ must be one the BASE tree can itself export — derived
+      # from the base parent (HEAD^1), never the fork's Makefiles, so a fork
+      # cannot mint an arbitrary repo path under the CI registry by renaming an
+      # image (#3262 non-blocking hardening). `make -n` only expands recipes (no
+      # build); COZYSTACK_VERSION is set so the version probe in common-envs.mk
+      # stays dormant. The charset guard in the push loop stays as defence in
+      # depth; this narrows it to the exact expected set.
+      #
+      # Ordered BEFORE the login on purpose. `make -n` expands no recipe, but it
+      # does evaluate the base tree's Makefiles, and that is the only step in
+      # this job that runs anything other than a fixed binary over data. Keeping
+      # it above the login means it never sees the push credential, which is
+      # what lets the job comment claim no build machinery runs while the token
+      # is live. It needs nothing the login provides.
+      - name: Derive trusted image allowlist (base tree)
+        run: |
+          set -eu
+          base="$(git rev-parse HEAD^1)"
+          # Fresh path per invocation so a leftover from an earlier step in this
+          # job can't fail `git worktree add`. (The runner itself is an
+          # ephemeral Oracle ARC VM, one per job — see .github/actionlint.yaml
+          # and #2937 — so there is no cross-run leftover to defend against.)
+          bt="$(mktemp -d)/basetree"
+          git worktree add --quiet --detach "$bt" "$base"
+          git -C "$bt" ls-files 'packages/*/*/Makefile' | while IFS= read -r mk; do
+            grep -qE '^image:' "$bt/$mk" || continue
+            make -n -C "$bt/$(dirname "$mk")" image \
+              OCI_EXPORT_DIR=/oci REGISTRY=r COZYSTACK_VERSION=0 2>/dev/null || true
+          done \
+            | grep -oE '(dest=/oci/|oci-archive:/oci/)[a-z0-9._-]+\.oci\.tar' \
+            | sed -E 's#.*/##; s#\.oci\.tar$##' | sort -u > _allow.txt
+          git worktree remove --force "$bt"
+          n="$(wc -l < _allow.txt)"
+          [ "$n" -ge 1 ] || { echo "::error::image allowlist derivation produced no names"; exit 1; }
+          echo "Allowed image repos ($n):"; sed 's/^/  /' _allow.txt
+      - name: Login to OCIR
+        env:
+          OCIR_USER:  ${{ secrets.OCIR_USER }}
+          OCIR_TOKEN: ${{ secrets.OCIR_TOKEN }}
+          # Keep the push credential out of the runner's DEFAULT auth stores
+          # (~/.docker/config.json, $XDG_RUNTIME_DIR/containers/auth.json) and
+          # in a run-scoped path instead, matching every other OCIR login in
+          # this repo (pull-requests.yaml's build / build-talos / finalize).
+          # `Set up Docker config` in those jobs copies ~/.docker verbatim into
+          # the build context, so a token left in the default store is a token
+          # handed to whatever runs next.
+          DOCKER_CONFIG: ${{ runner.temp }}/.docker
+          REGISTRY_AUTH_FILE: ${{ runner.temp }}/.docker/config.json
+        run: |
+          # skopeo (image copies) and flux (artifact push, via the docker
+          # keychain) each need OCIR auth. Token via stdin, never argv.
+          mkdir -p "$DOCKER_CONFIG"
+          echo "$OCIR_TOKEN" | skopeo login "${REGISTRY%%/*}" -u "$OCIR_USER" --password-stdin --authfile "$REGISTRY_AUTH_FILE"
+          echo "$OCIR_TOKEN" | docker login "${REGISTRY%%/*}" -u "$OCIR_USER" --password-stdin
+      - name: Push images by digest + packages artifact
+        id: push
+        env:
+          # Tag is cosmetic — consumers resolve by @sha256 digest (baked into
+          # pr.patch) — but keep the pr-<N>-<sha> scheme for discoverability and
+          # retention. Both values are validated in `resolve`.
+          IMAGE_TAG: pr-${{ needs.resolve.outputs.pr_number }}-${{ needs.resolve.outputs.head_sha }}
+          HEAD_SHA:  ${{ needs.resolve.outputs.head_sha }}
+          # Read the auth the login step wrote, not the runner default store.
+          # skopeo honours REGISTRY_AUTH_FILE; flux resolves through the docker
+          # keychain, which honours DOCKER_CONFIG.
+          DOCKER_CONFIG: ${{ runner.temp }}/.docker
+          REGISTRY_AUTH_FILE: ${{ runner.temp }}/.docker/config.json
+        run: |
+          set -eu
+          shopt -s nullglob
+          # A non-docs fork PR must have exported at least one image; an empty
+          # download means the build silently produced nothing — fail rather than
+          # push an empty closure and let e2e install a stale/mismatched tree.
+          # Glob into an array (nullglob → empty on no match); `ls *.tar | wc -l`
+          # would list the cwd when the glob expands to nothing and pass the guard.
+          archives=(_out/oci/*.oci.tar)
+          [ "${#archives[@]}" -ge 1 ] || { echo "::error::no OCI image archives to push"; exit 1; }
+          for f in "${archives[@]}"; do
+            name="$(basename "$f" .oci.tar)"
+            # The archive basename becomes a registry repo path — the fork picked
+            # the filename, so validate it against a strict charset before it
+            # flows into a docker:// ref (defence against a crafted artifact name).
+            case "$name" in
+              *[!a-z0-9._-]*|""|-*) echo "::error::unexpected image archive name: $name"; exit 1;;
+            esac
+            # …and against the trusted base-tree allowlist, so a charset-clean but
+            # unexpected name cannot create a junk repo under the CI registry.
+            grep -qxF "$name" _allow.txt || { echo "::error::image '$name' is not in the base-tree allowlist"; exit 1; }
+            echo "Pushing $name → ${REGISTRY}/${name}:${IMAGE_TAG}"
+            # --all so a multi-platform build copies the whole manifest list and
+            # its index digest is preserved (else containerimage.digest — the
+            # index digest baked into pr.patch — would not resolve). --preserve-
+            # digests keeps every manifest digest bit-for-bit so the
+            # ${REGISTRY}/${name}@sha256:… refs in pr.patch resolve.
+            skopeo copy --all --preserve-digests "oci-archive:$f" "docker://${REGISTRY}/${name}:${IMAGE_TAG}"
+          done
+          # Push the fully-patched packages tree — the OCI artifact the in-cluster
+          # operator pulls. This uploads data; it runs no code from the tree.
+          flux push artifact "oci://${REGISTRY}/cozystack-packages:${IMAGE_TAG}" \
+            --path=packages \
+            --source=https://github.com/cozystack/cozystack \
+            --revision="fork-pr:${HEAD_SHA}" 2>&1 | tee _push.log
+          digest="$(awk -F@ '/artifact successfully pushed/ {print $2}' _push.log)"
+          [ -n "$digest" ] || { echo "::error::failed to capture packages artifact digest"; exit 1; }
+          echo "packages_digest=${digest}" >> "$GITHUB_OUTPUT"
+          echo "Pushed packages artifact @${digest}"
+      # Drop the credential as soon as the pushes are done, so it is not live
+      # for the remainder of the job (or for anything that inherits the runner
+      # if the pool ever stops being one-VM-per-job). always() so a failed push
+      # does not leave it behind.
+      - name: Log out of OCIR
+        if: always()
+        env:
+          DOCKER_CONFIG: ${{ runner.temp }}/.docker
+          REGISTRY_AUTH_FILE: ${{ runner.temp }}/.docker/config.json
+        run: |
+          skopeo logout --authfile "$REGISTRY_AUTH_FILE" "${REGISTRY%%/*}" || true
+          docker logout "${REGISTRY%%/*}" || true
+          rm -rf "$DOCKER_CONFIG"
+
+  # Run the e2e suite against the pushed closure. NO OCIR push token here — the
+  # sandbox pulls images anonymously; the fork's images/scripts run only in this
+  # ephemeral job. Mirrors pull-requests.yaml's in-tree e2e, including Chainsaw
+  # Test-Impact Analysis, whose INPUTS come from resolve's trusted base-repo
+  # file list rather than a merge-ref diff the fork could shape.
+  #
+  # What that does NOT buy: this job runs from the fork's own tree, so the
+  # selector (hack/select-e2e.sh), the suites under hack/e2e-chainsaw/, the
+  # install bats and packages/core/testing's recipes are all fork-authored. A
+  # fork that wants its own suite to pass can simply edit them, and no amount
+  # of input hardening changes that. This job is a correctness gate that stops
+  # an honest contributor shipping a regression, not a boundary against a
+  # hostile one — the boundary is the maintainer approval required before any
+  # fork run executes at all (see §10 of docs/agents/e2e-testing.md), plus the
+  # fact that nothing here holds a credential worth stealing.
+  e2e:
+    name: E2E (fork run)
+    needs: [resolve, publish]
+    if: ${{ needs.resolve.outputs.should_run == 'true' }}
+    # Talos nodes as containers, the same substrate pull-requests.yaml uses; the
+    # per-node 8 CPU / 24 GiB in hack/e2e-compose.yaml is why the class is this
+    # one. See the `e2e` job there for the full sizing note.
+    runs-on: oracle-vm-32cpu-128gb-x86-64
+    # Covers a green full suite. It does not cover a tenant-Kubernetes suite
+    # running into its node-join deadline, so a red there can end as a
+    # cancelled job. Held to one figure across every lane that runs the suite.
+    timeout-minutes: 215
+    permissions:
+      contents: read
+      packages: read
+      actions: read
+    # Set the sandbox name as a job-level env var rather than writing it to
+    # $GITHUB_ENV from a step (which the zizmor github-env audit flags). run_id
+    # rather than the ref because in workflow_run context GITHUB_REF is always
+    # the default branch, so it would name every fork run's sandbox identically
+    # and make the logs (and any manual `docker` poke at a live sandbox)
+    # ambiguous across runs.
+    env:
+      SANDBOX_NAME: cozy-e2e-sandbox-fork-${{ github.run_id }}
+    steps:
+      - name: Checkout PR merge ref
+        uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4
+        with:
+          ref: refs/pull/${{ needs.resolve.outputs.pr_number }}/merge
+          fetch-depth: 0
+          persist-credentials: false
+          allow-unsafe-pr-checkout: true
+      # Same TOCTOU guard as `publish`: refuse to test a merge ref that moved off
+      # the SHA the status is stamped on (see the publish job for the rationale).
+      - name: Assert checkout matches resolved head SHA
+        env:
+          EXPECTED_SHA: ${{ needs.resolve.outputs.head_sha }}
+        run: |
+          got="$(git rev-parse HEAD^2)"
+          [ "$got" = "$EXPECTED_SHA" ] || { echo "::error::merge ref moved: HEAD^2=$got != resolved $EXPECTED_SHA"; exit 1; }
+      - name: Set up toolchain (yq)
+        env:
+          YQ_VERSION: "4.53.3"
+          YQ_SHA256: "fa52a4e758c63d38299163fbdd1edfb4c4963247918bf9c1c5d31d84789eded4"
+        run: |
+          if ! yq --version 2>/dev/null | grep -q "mikefarah.* version v${YQ_VERSION}\$"; then
+            yq_bin="$(mktemp)"
+            curl -fsSL -o "$yq_bin" \
+              "https://github.com/mikefarah/yq/releases/download/v${YQ_VERSION}/yq_linux_amd64"
+            printf '%s  %s\n' "$YQ_SHA256" "$yq_bin" | sha256sum -c -
+            sudo install -m 0755 "$yq_bin" /usr/local/bin/yq
+            rm -f "$yq_bin"
+          fi
+      - name: Download pr.patch
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
+        with:
+          name: pr-patch
+          path: _out/assets
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          run-id: ${{ needs.resolve.outputs.run_id }}
+      - name: Apply pr.patch
+        run: git apply --3way _out/assets/pr.patch
+      # Point the installer at the packages artifact `publish` pushed (the
+      # artifact carries no self-digest, so pin it on the values we install).
+      - name: Pin installer to pushed packages artifact
+        env:
+          PACKAGES_DIGEST: ${{ needs.publish.outputs.packages_digest }}
+        run: |
+          yq -i ".cozystackOperator.platformSourceUrl = \"oci://${REGISTRY}/cozystack-packages\"" packages/core/installer/values.yaml
+          yq -i ".cozystackOperator.platformSourceRef = \"digest=${PACKAGES_DIGEST}\"" packages/core/installer/values.yaml
+      # Mandatory, and up front: the nodes take their kernel from this host and
+      # Talos cannot load modules in container mode, so a module missing here is
+      # missing for the whole run and surfaces later as a CNI or storage failure.
+      # See the same step in pull-requests.yaml for the full rationale.
+      - name: Prepare container-lane host
+        run: |
+          set -eu
+          for m in openvswitch zfs; do
+            if grep -q "^${m} " /proc/modules; then
+              echo "${m}: already loaded"
+              continue
+            fi
+            if [ "${m}" = zfs ]; then
+              sudo apt-get update -qq
+              sudo DEBIAN_FRONTEND=noninteractive apt-get install -y -qq zfsutils-linux
+            fi
+            sudo modprobe "${m}" || echo "${m}: modprobe failed"
+          done
+          missing=''
+          for m in openvswitch zfs; do
+            grep -q "^${m} " /proc/modules || missing="${missing} ${m}"
+          done
+          if [ -n "${missing}" ]; then
+            echo "::error title=container-lane host::kernel module(s) could not be loaded:${missing}"
+            echo "This is a host problem, not a product failure: openvswitch backs the" >&2
+            echo "kube-ovn dataplane and zfs backs every LINSTOR pool, and container-mode" >&2
+            echo "Talos cannot load either one itself." >&2
+            exit 1
+          fi
+          grep -E '^(openvswitch|zfs) ' /proc/modules
+      - name: Prepare environment
+        run: |
+          attempt=0
+          until make SANDBOX_NAME=$SANDBOX_NAME prepare-env-container; do
+            attempt=$((attempt + 1))
+            if [ $attempt -ge 3 ]; then echo "Attempt $attempt failed, exiting..."; exit 1; fi
+            echo "Attempt $attempt failed, retrying..."
+            make -C packages/core/testing SANDBOX_NAME=$SANDBOX_NAME delete-cluster-container || true
+          done
+      # Test-Impact Analysis: select only the Chainsaw suites the PR diff
+      # affects. The changed-file list is resolve's TRUSTED base-repo listFiles
+      # (base64 through the job output), NOT a git diff on the fork-controlled
+      # merge ref. The script below is the fork's own, so this hardens what the
+      # selector reads and not what it decides — see the job header.
+      # select-e2e.sh classifies every changed path explicitly: shared build
+      # inputs and the e2e harness escalate to the full suite, several rules
+      # select nothing (docs and dashboards, a disabled Chainsaw suite, a
+      # backups example with no suite, the inert repo-meta pattern), and
+      # anything matching none of them escalates rather than returning empty.
+      # So an empty selection here means some rule decided the change cannot
+      # affect a suite, not "TIA had no idea" (#3392). The exception to that,
+      # worth knowing before trusting it: a workflow added under
+      # .github/workflows/ reads as inert until it is added to the escalation
+      # list by name, because .github/ is inert as a directory and the e2e
+      # workflows are exempted from it individually.
+      # Skipped (→ full suite below) on the full-e2e label.
+      - name: Select E2E tests
+        id: select
+        if: ${{ needs.resolve.outputs.full_e2e != 'true' }}
+        env:
+          CHANGED_B64: ${{ needs.resolve.outputs.changed_b64 }}
+        run: |
+          printf '%s' "$CHANGED_B64" | base64 -d > /tmp/changed.txt
+          echo "Changed files:"; sed 's/^/  /' /tmp/changed.txt
+          apps="$(./hack/select-e2e.sh /tmp/changed.txt)"
+          echo "Selected apps: ${apps:-<none>}"
+          echo "apps=${apps}" >> "$GITHUB_OUTPUT"
+          if [ -z "${apps}" ]; then
+            echo "skip=true" >> "$GITHUB_OUTPUT"
+          else
+            echo "skip=false" >> "$GITHUB_OUTPUT"
+          fi
+          # The complement of what the selected suites need, for a reduced
+          # install. An empty selection installs everything as before.
+          disabled=""
+          if [ -n "${apps}" ]; then
+            disabled="$(./hack/select-install.sh --disabled "${apps}")"
+          fi
+          echo "Disabled packages: ${disabled:-<none>}"
+          echo "disabled=${disabled}" >> "$GITHUB_OUTPUT"
+      - name: Install Cozystack into sandbox
+        env:
+          COZY_APISERVER_ENDPOINT: https://192.168.123.11:6443
+          COZY_LINSTOR_DRBD_ENABLED: "false"
+          COZY_E2E_STORAGE_CLASS: local
+          COZY_DISABLED_PACKAGES: ${{ steps.select.outputs.disabled }}
+        run: |
+          if ! make -C packages/core/testing SANDBOX_NAME=$SANDBOX_NAME install-cozystack; then
+            echo "❌ Install failed (no retry — diagnostics below)"
+            echo "::group::HelmRelease status"
+            docker exec "$SANDBOX_NAME" sh -c 'kubectl get hr -A -o wide 2>&1 | tail -100' || true
+            echo "::endgroup::"
+            echo "::group::not-Ready HelmReleases"
+            docker exec "$SANDBOX_NAME" sh -c 'kubectl get hr -A --no-headers 2>/dev/null | awk "\$4 != \"True\" {print \$1\" \"\$2}"' \
+              | while read -r ns name; do
+                  echo "--- $ns/$name ---"
+                  docker exec "$SANDBOX_NAME" sh -c "kubectl describe hr '$name' -n '$ns' 2>&1 | tail -50" || true
+                done
+            echo "::endgroup::"
+            exit 1
+          fi
+      - name: Run OpenAPI tests
+        run: |
+          make -C packages/core/testing SANDBOX_NAME=$SANDBOX_NAME test-openapi
+      # Each suite runs once, one `chainsaw test` per suite directory, with no
+      # retry loop (e2e-testing.md §1) — Chainsaw polls each assertion to its own
+      # timeout. Full suite only when the full-e2e label skipped selection: if
+      # `select` ran and came back empty it set skip=true and this step never
+      # starts.
+      - name: Run E2E tests
+        id: e2e_tests
+        if: ${{ steps.select.outputs.skip != 'true' }}
+        env:
+          # Must match the install step above: installing on `local` while
+          # templating the Chainsaw fixtures with `replicated` fails deep inside
+          # a suite instead of at the mismatch.
+          COZY_E2E_STORAGE_CLASS: local
+          SELECTED_APPS: ${{ steps.select.outputs.apps }}
+          FULL_E2E: ${{ needs.resolve.outputs.full_e2e }}
+        run: |
+          if [ "$FULL_E2E" = "true" ]; then
+            suites=""        # empty => test-chainsaw runs the whole suite
+            echo "Running full chainsaw suite"
+          else
+            suites="$SELECTED_APPS"
+            echo "Running selected chainsaw suites: $suites"
+          fi
+          if ! make -C packages/core/testing SANDBOX_NAME=$SANDBOX_NAME test-chainsaw CHAINSAW_SUITES="$suites"; then
+            echo "❌ Chainsaw E2E failed (see the assertion diffs or LEAKED-PODS lines above and diagnostics below)"
+            echo "::group::Diagnostics: HelmRelease status"
+            docker exec "$SANDBOX_NAME" sh -c 'kubectl get hr -A -o wide 2>&1 | tail -50' || true
+            echo "::endgroup::"
+            echo "::group::Diagnostics: recent events"
+            docker exec "$SANDBOX_NAME" sh -c 'kubectl get events -A --sort-by=.lastTimestamp 2>&1 | tail -30' || true
+            echo "::endgroup::"
+            echo "::group::Diagnostics: COSI bucket state"
+            docker exec "$SANDBOX_NAME" sh -c '
+              kubectl get bucketclaims.objectstorage.k8s.io -A -o custom-columns="NAMESPACE:.metadata.namespace,NAME:.metadata.name,READY:.status.bucketReady,BUCKET:.status.bucketName" 2>&1
+              kubectl get buckets.objectstorage.k8s.io -o custom-columns="NAME:.metadata.name,READY:.status.bucketReady,ID:.status.bucketID,CLAIMNS:.spec.bucketClaim.namespace" 2>&1
+              kubectl get bucketaccesses.objectstorage.k8s.io -A -o custom-columns="NAMESPACE:.metadata.namespace,NAME:.metadata.name,GRANTED:.status.accessGranted,CLAIM:.spec.bucketClaimName" 2>&1
+            ' || true
+            echo "::endgroup::"
+            exit 1
+          fi
+          echo "✅ All selected E2E tests passed"
+      - name: Collect chainsaw report
+        if: always()
+        run: |
+          mkdir -p _out
+          docker cp "$SANDBOX_NAME":/workspace/hack/e2e-chainsaw/chainsaw-report.xml \
+            _out/chainsaw-report.xml || true
+      - name: Upload chainsaw report
+        if: always()
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
+        with:
+          name: chainsaw-report
+          path: _out/chainsaw-report.xml
+          if-no-files-found: ignore
+      - name: Collect report
+        if: always()
+        run: |
+          make -C packages/core/testing SANDBOX_NAME=$SANDBOX_NAME collect-report || true
+      - name: Upload cozyreport.tgz
+        if: always()
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
+        with:
+          name: cozyreport
+          path: _out/cozyreport.tgz
+          if-no-files-found: warn
+      # Both halves, and in this order: the compose project owns the nodes and
+      # the zpools outlive it.
+      - name: Tear down sandbox
+        if: always()
+        run: |
+          # Annotated, not fatal: same reasoning as the in-tree lane. The runner
+          # is discarded after the job, so a dirty host has no next tenant, and
+          # failing here would post the required "E2E Tests" status as a failure
+          # indistinguishable from a real one.
+          cleanup_rc=0
+          make -C packages/core/testing SANDBOX_NAME=$SANDBOX_NAME delete-cluster-container || cleanup_rc=$?
+          make -C packages/core/testing SANDBOX_NAME=$SANDBOX_NAME delete || true
+          if [ "$cleanup_rc" -ne 0 ]; then
+            echo "::error title=sandbox teardown::teardown exited $cleanup_rc; the host may hold a stale compose project or zpool"
+          fi
+
+  # Flip the pending "E2E Tests" commit status posted by `resolve` to its
+  # terminal state. Runs on failure too, so a failed publish or e2e turns the
+  # status red rather than leaving it stuck pending; success only when the e2e
+  # job passed.
+  #
+  # `!cancelled()` rather than `always()`, matching e2e-report on the same-repo
+  # lane. A cancelled privileged run no longer owns the status for its head SHA
+  # — something superseded it, and that something is now responsible — so
+  # stamping `failure` from here paints a red on a suite that never finished,
+  # on a SHA whose real verdict is still hours away. Staying silent is
+  # fail-closed: the `pending` this run already posted survives until the
+  # superseding run concludes.
+  report:
+    name: Report fork E2E status
+    needs: [resolve, publish, e2e]
+    if: ${{ !cancelled() && needs.resolve.outputs.should_run == 'true' }}
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      statuses: write
+    steps:
+      - name: Report "E2E Tests" commit status
+        uses: actions/github-script@f28e40c7f34bde8b3046d885e986cb6290c5673b # v7
+        env:
+          PUBLISH_RESULT: ${{ needs.publish.result }}
+          E2E_RESULT:     ${{ needs.e2e.result }}
+          HEAD_SHA:       ${{ needs.resolve.outputs.head_sha }}
+          RUN_URL:        ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
+        with:
+          script: |
+            const { PUBLISH_RESULT, E2E_RESULT, HEAD_SHA, RUN_URL } = process.env;
+            const { owner, repo } = context.repo;
+            let state, description;
+            if (E2E_RESULT === 'success') {
+              state = 'success';
+              description = 'fork e2e passed (privileged run)';
+            } else if (PUBLISH_RESULT !== 'success') {
+              state = 'failure';
+              description = `image/artifact publish did not succeed (result: ${PUBLISH_RESULT})`;
+            } else {
+              state = 'failure';
+              description = `fork e2e did not pass (result: ${E2E_RESULT})`;
+            }
+            await github.rest.repos.createCommitStatus({
+              owner, repo, sha: HEAD_SHA, state, context: 'E2E Tests',
+              description, target_url: RUN_URL,
+            });
+            core.info(`E2E Tests → ${state}: ${description}`);
diff --git a/.github/workflows/e2e-isp-hosted.yaml b/.github/workflows/e2e-isp-hosted.yaml
new file mode 100644
index 0000000000..9d17e45083
--- /dev/null
+++ b/.github/workflows/e2e-isp-hosted.yaml
@@ -0,0 +1,187 @@
+name: E2E isp-hosted
+
+# Installs the isp-hosted platform variant, through the hosted installer
+# variant, on a kind cluster, and checks that every HelmRelease goes Ready. No
+# other lane installs either variant: the PR, nightly and tag lanes all run
+# isp-full on Talos, where Cozystack itself provides the CNI and the storage.
+# kind is the managed-cluster shape isp-hosted is for: its CNI, kube-proxy and
+# default StorageClass come from the cluster, and there is no Cilium, no
+# LINSTOR and no `replicated` class. That absence is the thing under test.
+#
+# It installs the latest nightly rather than building anything: the GHCR
+# nightly closure is complete and public. A pull request trigger is
+# deliberately absent, because a run here would install the nightly images,
+# not the pull request's, and report on code the pull request did not change.
+
+on:
+  schedule:
+    - cron: '0 5 * * *'   # 05:00 UTC, after nightly.yaml's 02:00 mirror has published
+  workflow_dispatch: {}
+
+env:
+  PACKAGES_REPO: ghcr.io/cozystack/cozystack/cozystack-packages
+  # Release notes of kind v0.32.0 are the source of both pins: the binary's
+  # published kind-linux-amd64.sha256sum, and the node image digest listed for
+  # it. v1.33.12 matches the Kubernetes version hack/e2e-container-up.sh gives
+  # the Talos lanes, so the variant is the only thing that differs.
+  KIND_VERSION: v0.32.0
+  KIND_SHA256: 50030de23cf40a18505f20426f6a8506bedf13c6e509244bd1fa9463721b0f54
+  KIND_NODE_IMAGE: kindest/node:v1.33.12@sha256:3f5c8443c620245e4d355cfe09e96a91ead32ceaa569d3f1ca9edf0cb2fe2ff4
+  KIND_CLUSTER: cozy-hosted
+
+concurrency:
+  group: e2e-isp-hosted
+  cancel-in-progress: false
+
+permissions:
+  contents: read
+
+jobs:
+  e2e:
+    name: E2E (isp-hosted on kind)
+    # The whole platform lands on one kind node with nothing pre-pulled. The
+    # smaller 4-vCPU class was not tried; sizing down is left to a measured run.
+    runs-on: oracle-vm-24cpu-96gb-x86-64
+    # Above the failing path's sum, so the job ceiling never cuts off the
+    # report: three prepare attempts at kind's 5m wait, the install's 30m
+    # readiness gate plus its setup, and the 30m collect step.
+    timeout-minutes: 120
+    permissions:
+      contents: read
+      packages: read
+    steps:
+      - name: Set up flux
+        uses: fluxcd/flux2/action@04acaec6161ac4fb1a82ffafa88901c03271d34f # v2.8.6
+        with:
+          version: "2.8.6"
+      - name: Set up toolchain (oras)
+        run: |
+          command -v oras >/dev/null || { curl -fsSL https://github.com/oras-project/oras/releases/download/v1.2.0/oras_1.2.0_linux_amd64.tar.gz | sudo tar -xz -C /usr/local/bin oras; }
+
+      - name: Login to GHCR
+        env:
+          GHCR_USER: ${{ github.actor }}
+          GHCR_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          echo "$GHCR_TOKEN" | docker login ghcr.io -u "$GHCR_USER" --password-stdin
+          echo "$GHCR_TOKEN" | oras login ghcr.io -u "$GHCR_USER" --password-stdin
+
+      # One manifest fetch gives both the digest and the revision, so a nightly
+      # published between two reads cannot pair one commit's name with another
+      # tree in the log.
+      - name: Resolve the latest nightly
+        id: resolve
+        run: |
+          set -eu
+          manifest="${RUNNER_TEMP}/cozystack-packages-nightly.json"
+          oras manifest fetch "${PACKAGES_REPO}:nightly" > "$manifest"
+          digest="sha256:$(sha256sum "$manifest" | cut -d' ' -f1)"
+          rev="$(yq -r '.annotations["org.opencontainers.image.revision"] // ""' -p json "$manifest")"
+          echo "digest=$digest" >> "$GITHUB_OUTPUT"
+          echo "Installing nightly ${rev:-<no revision annotation>}, packages ${digest}"
+
+      - name: Checkout code
+        uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4
+        with:
+          fetch-depth: 1
+          persist-credentials: false
+
+      # The product under test is the nightly's packages tree, overlaid as
+      # nightly.yaml does. The harness (hack/ and the testing Makefile's
+      # recipes) stays at the commit that triggered the run, so a change to the
+      # lane can be tried on a branch before any nightly carries it; on the
+      # schedule that commit is main a few hours past the nightly's.
+      - name: Stage the nightly install tree
+        env:
+          DIGEST: ${{ steps.resolve.outputs.digest }}
+        run: |
+          set -eu
+          rm -rf _rw && mkdir -p _rw
+          flux pull artifact "oci://${PACKAGES_REPO}@${DIGEST}" --output _rw
+          cp -r _rw/. packages/
+          rm -rf _rw
+          git checkout HEAD -- packages/core/testing/Makefile
+          yq -i ".cozystackOperator.platformSourceUrl = \"oci://${PACKAGES_REPO}\"" packages/core/installer/values.yaml
+          yq -i ".cozystackOperator.platformSourceRef = \"digest=${DIGEST}\"" packages/core/installer/values.yaml
+
+      - name: Install kind
+        run: |
+          set -eu
+          curl -fsSLo "${RUNNER_TEMP}/kind" "https://github.com/kubernetes-sigs/kind/releases/download/${KIND_VERSION}/kind-linux-amd64"
+          echo "${KIND_SHA256}  ${RUNNER_TEMP}/kind" | sha256sum --check
+          sudo install -m 0755 "${RUNNER_TEMP}/kind" /usr/local/bin/kind
+
+      - name: Set sandbox ID
+        run: echo "SANDBOX_NAME=cozy-e2e-sandbox-$(echo "${GITHUB_REPOSITORY}:${GITHUB_WORKFLOW}:${GITHUB_REF}" | sha256sum | cut -c1-10)" >> "$GITHUB_ENV"
+
+      # Pure infrastructure, so it may be retried; the cluster and the sandbox are
+      # both removed between attempts so no attempt adopts a half-built one.
+      # `kubeconfig` at the checkout root is what `apply` copies to
+      # /workspace/kubeconfig, the sandbox's KUBECONFIG; --internal addresses
+      # the control plane by container name, which the sandbox resolves once
+      # it is on the kind network.
+      - name: Prepare environment
+        run: |
+          # Many controllers on one node exhaust the stock inotify limits, which
+          # kind documents as a cause of pods failing with "too many open files".
+          sudo sysctl -w fs.inotify.max_user_instances=8192 fs.inotify.max_user_watches=524288
+          attempt=0
+          until kind create cluster --name "$KIND_CLUSTER" --image "$KIND_NODE_IMAGE" --config hack/e2e-isp-hosted-kind.yaml --wait 5m \
+            && kind get kubeconfig --internal --name "$KIND_CLUSTER" > ./kubeconfig \
+            && make -C packages/core/testing SANDBOX_NAME="$SANDBOX_NAME" apply \
+            && docker network connect kind "$SANDBOX_NAME"; do
+            attempt=$((attempt + 1))
+            make -C packages/core/testing SANDBOX_NAME="$SANDBOX_NAME" delete || true
+            kind delete cluster --name "$KIND_CLUSTER" || true
+            if [ $attempt -ge 3 ]; then echo "Attempt $attempt failed, exiting..."; exit 1; fi
+            echo "Attempt $attempt failed, retrying..."
+          done
+
+      - name: Install Cozystack into sandbox
+        run: |
+          if ! make -C packages/core/testing SANDBOX_NAME="$SANDBOX_NAME" install-cozystack-hosted; then
+            echo "❌ Install failed (no retry — diagnostics below)"
+            echo "::group::HelmRelease status"
+            docker exec "$SANDBOX_NAME" sh -c 'kubectl get hr -A -o wide 2>&1 | tail -100' || true
+            echo "::endgroup::"
+            echo "::group::not-Ready HelmReleases"
+            docker exec "$SANDBOX_NAME" sh -c 'kubectl get hr -A --no-headers 2>/dev/null | awk "\$4 != \"True\" {print \$1\" \"\$2}"' \
+              | while read -r ns name; do
+                  echo "--- $ns/$name ---"
+                  docker exec "$SANDBOX_NAME" sh -c "kubectl describe hr '$name' -n '$ns' 2>&1 | tail -50" || true
+                done
+            echo "::endgroup::"
+            echo "::group::Pods not Running"
+            docker exec "$SANDBOX_NAME" sh -c 'kubectl get pods -A --field-selector=status.phase!=Running,status.phase!=Succeeded -o wide 2>&1 | tail -60' || true
+            echo "::endgroup::"
+            exit 1
+          fi
+
+      # Same bound and the same tolerance as the collect step in nightly.yaml,
+      # for the reasons written there.
+      - name: Collect report
+        id: collect_report
+        if: always()
+        timeout-minutes: 30
+        continue-on-error: true
+        run: |
+          make -C packages/core/testing SANDBOX_NAME="$SANDBOX_NAME" collect-report || true
+
+      - name: Report collection overran its ceiling
+        if: always() && steps.collect_report.outcome == 'failure'
+        run: |
+          echo "::warning title=cozyreport::Collect report ended non-zero -- its timeout-minutes fired, or the step failed before the collector ran; cozyreport.tgz is missing or partial for this run"
+
+      - name: Upload cozyreport.tgz
+        if: always()
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
+        with:
+          name: cozyreport-isp-hosted
+          path: _out/cozyreport.tgz
+          if-no-files-found: warn
+
+      - name: Tear down
+        if: always()
+        run: |
+          make -C packages/core/testing SANDBOX_NAME="$SANDBOX_NAME" delete || true
+          kind delete cluster --name "$KIND_CLUSTER" || true
diff --git a/.github/workflows/e2e-proxmox.yaml b/.github/workflows/e2e-proxmox.yaml
new file mode 100644
index 0000000000..621c6d0fe3
--- /dev/null
+++ b/.github/workflows/e2e-proxmox.yaml
@@ -0,0 +1,160 @@
+name: E2E (proxmox)
+
+# The Proxmox substrate's own lane, separate from every other e2e workflow for
+# one reason that cannot be engineered away: it needs a Proxmox hypervisor, and
+# the oracle-vm-* runners the other lanes use will never have one.
+#
+# Deliberately NOT triggered by pull_request. A self-hosted runner executes
+# whatever the workflow checks out, and this one holds credentials to a
+# hypervisor and a live cluster; letting an arbitrary fork PR start it would
+# hand both to its author. Manual dispatch and a schedule are the whole trigger
+# surface, and both come from someone who already has write access.
+on:
+  workflow_dispatch:
+    inputs:
+      keep_tenant:
+        description: "Leave the tenant in place after the run, for debugging"
+        type: boolean
+        default: false
+  schedule:
+    # Nightly, offset from the upstream lanes so a shared hypervisor is not
+    # asked to do two things at once.
+    - cron: "40 2 * * *"
+
+permissions:
+  contents: read
+
+concurrency:
+  # One hypervisor, one tenant namespace, fixed VM ids — two runs would fight
+  # over all three. Never cancel in progress: a killed run leaks VMs.
+  group: e2e-proxmox
+  cancel-in-progress: false
+
+jobs:
+  e2e:
+    name: Proxmox substrate
+    # The job needs a self-hosted runner carrying the `proxmox` label. On a
+    # repository without one a scheduled run would sit in the queue until GitHub
+    # cancels it, so the schedule fires only where the stand is declared;
+    # manual dispatch always runs.
+    if: github.event_name == 'workflow_dispatch' || vars.PROXMOX_NIGHTLY == 'true'
+    runs-on: [self-hosted, proxmox]
+    timeout-minutes: 90
+    env:
+      COZY_PROXMOX_NS: tenant-e2eproxmox
+      COZY_PROXMOX_CLUSTER: k8s-e2e
+      # No fallbacks: an unset variable fails the first step below instead of
+      # sending a key to a guessed address or probing a storage the stand lacks.
+      COZY_PROXMOX_STORAGE: ${{ vars.PROXMOX_STORAGE }}
+      COZY_PVE_SSH: ${{ vars.PROXMOX_SSH }}
+      COZY_PVE_SSH_KEY: ${{ github.workspace }}/.ssh-pve
+      COZY_KEEP_TENANT: ${{ inputs.keep_tenant == true }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
+        with:
+          persist-credentials: false
+
+      - name: Require the stand's variables
+        env:
+          PVE_URL: ${{ vars.PROXMOX_URL }}
+          PVE_REGION: ${{ vars.PROXMOX_REGION }}
+        run: |
+          set -eu
+          for v in COZY_PROXMOX_STORAGE COZY_PVE_SSH PVE_URL PVE_REGION; do
+            eval "val=\${$v:-}"
+            [ -n "$val" ] || { echo "$v is unset: set the PROXMOX_* repository variables for this stand" >&2; exit 1; }
+          done
+
+      - name: Stage credentials
+        id: stage
+        env:
+          KUBECONFIG_B64: ${{ secrets.COZY_KUBECONFIG }}
+          PVE_SSH_KEY: ${{ secrets.PROXMOX_SSH_KEY }}
+          PVE_TOKEN_ID: ${{ secrets.PROXMOX_TOKEN_ID }}
+          PVE_TOKEN_SECRET: ${{ secrets.PROXMOX_TOKEN_SECRET }}
+          PVE_URL: ${{ vars.PROXMOX_URL }}
+          PVE_REGION: ${{ vars.PROXMOX_REGION }}
+        run: |
+          set -eu
+          umask 077
+          printf '%s' "$KUBECONFIG_B64" | base64 -d > "$GITHUB_WORKSPACE/.kubeconfig"
+          # Unless the current context resolves to a server, client-go either
+          # fails or falls back to its defaults, in-cluster credentials among
+          # them, and the calls below would reach a cluster other than the
+          # stand's. Tear down repeats this check.
+          server=$(kubectl --kubeconfig "$GITHUB_WORKSPACE/.kubeconfig" config view --minify \
+            -o jsonpath='{.clusters[0].cluster.server}' 2>"$RUNNER_TEMP/kubeconfig-check.err" || true)
+          if [ -z "$server" ]; then
+            echo "COZY_KUBECONFIG does not resolve to a server" >&2
+            # Empty when the context resolves to a cluster with no server.
+            cat "$RUNNER_TEMP/kubeconfig-check.err" >&2
+            exit 1
+          fi
+          printf '%s' "$PVE_SSH_KEY" > "$COZY_PVE_SSH_KEY"
+
+          # The credentials the management-side CSI controller and CCM read. A
+          # Secret rather than values so no token is ever written into a
+          # rendered HelmRelease.
+          kubectl --kubeconfig "$GITHUB_WORKSPACE/.kubeconfig" create namespace "$COZY_PROXMOX_NS" \
+            --dry-run=client -o yaml | kubectl --kubeconfig "$GITHUB_WORKSPACE/.kubeconfig" apply -f -
+          kubectl --kubeconfig "$GITHUB_WORKSPACE/.kubeconfig" -n "$COZY_PROXMOX_NS" \
+            create secret generic proxmox-credentials \
+            --from-literal=url="$PVE_URL" \
+            --from-literal=token_id="$PVE_TOKEN_ID" \
+            --from-literal=token_secret="$PVE_TOKEN_SECRET" \
+            --from-literal=region="$PVE_REGION" \
+            --dry-run=client -o yaml | kubectl --kubeconfig "$GITHUB_WORKSPACE/.kubeconfig" apply -f -
+
+      - name: Enable the suite
+        # It ships disabled so the normal lanes cannot select it; this is the
+        # one place that is allowed to turn it on.
+        run: mv hack/e2e-chainsaw/kubernetes-proxmox/chainsaw-test.yaml.disabled
+               hack/e2e-chainsaw/kubernetes-proxmox/chainsaw-test.yaml
+
+      - name: Run the Proxmox suite
+        env:
+          KUBECONFIG: ${{ github.workspace }}/.kubeconfig
+        run: |
+          chainsaw test \
+            --config hack/e2e-chainsaw/.chainsaw.yaml \
+            --test-dir hack/e2e-chainsaw/kubernetes-proxmox
+
+      - name: Tear down
+        # always(), because the whole point of the teardown is the failing run:
+        # a leaked tenant leaves VMs on the hypervisor and the next run inherits
+        # them.
+        if: always() && !inputs.keep_tenant
+        env:
+          STAGE_OUTCOME: ${{ steps.stage.outcome }}
+        run: |
+          set -eu
+          kc="$GITHUB_WORKSPACE/.kubeconfig"
+          # The suite runs only after Stage succeeds, so without that this run
+          # created no tenant.
+          if [ "$STAGE_OUTCOME" != success ]; then
+            echo "::notice::Tear down skipped: Stage credentials ended $STAGE_OUTCOME, so this run created no tenant"
+            exit 0
+          fi
+          # The check Stage makes. Every call names the file, so none falls back
+          # to this self-hosted runner's own kubeconfig. Failing it here means
+          # the file broke after Stage, and the tenant may still be live.
+          server=$(kubectl --kubeconfig "$kc" config view --minify \
+            -o jsonpath='{.clusters[0].cluster.server}' 2>"$RUNNER_TEMP/kubeconfig-check.err" || true)
+          if [ -z "$server" ]; then
+            echo "::error::Tear down did not run: $kc no longer resolves to a server, so tenant e2eproxmox and its VMs may still be live"
+            cat "$RUNNER_TEMP/kubeconfig-check.err"
+            exit 1
+          fi
+          # A failed delete must not stop the ones after it: stopping there leaves
+          # behind exactly the VMs this step exists to remove. The step still
+          # fails at the end.
+          rc=0
+          kubectl --kubeconfig "$kc" delete kubernetesnodes.apps.cozystack.io -n "$COZY_PROXMOX_NS" --all --ignore-not-found || rc=1
+          kubectl --kubeconfig "$kc" delete kubernetes.apps.cozystack.io -n "$COZY_PROXMOX_NS" --all --ignore-not-found || rc=1
+          kubectl --kubeconfig "$kc" delete tenant.apps.cozystack.io e2eproxmox -n tenant-root --ignore-not-found || rc=1
+          exit "$rc"
+
+      - name: Remove staged credentials
+        if: always()
+        run: rm -f "$GITHUB_WORKSPACE/.kubeconfig" "$COZY_PVE_SSH_KEY"
diff --git a/.github/workflows/e2e-tag.yaml b/.github/workflows/e2e-tag.yaml
new file mode 100644
index 0000000000..f390077d04
--- /dev/null
+++ b/.github/workflows/e2e-tag.yaml
@@ -0,0 +1,456 @@
+name: E2E Release Tag
+
+# Validate the installable release closure for an existing version tag.
+#
+# Every RC must pass this lane after tags.yaml has published the prerelease and
+# pushed its release-X.Y.Z-rc.N digest-pinned staging branch — tags.yaml's
+# rc-e2e job calls this workflow as that mandatory post-cut check. The
+# workflow_dispatch trigger is the manual validation button for published
+# alpha, beta, RC, and stable releases.
+#
+# This lane validates published tags only; draft and promote-time validation are
+# explicitly out of scope because release checks run at RC publication time.
+# Prerelease tags use the matching digest-pinned staging branch, while stable
+# tags use their pinned merge tree directly. The nodes run as Talos containers
+# booted from the upstream image, so the release's nocloud disk is required to
+# exist but is not what the suite runs on. It is still required because users
+# install from it, and promote-rc.yaml checks it for an rc only.
+
+on:
+  workflow_call:
+    inputs:
+      tag:
+        description: "Release tag to validate, e.g. v1.7.0-rc.1"
+        required: true
+        type: string
+  workflow_dispatch:
+    inputs:
+      tag:
+        description: "Release tag to validate, e.g. v1.7.0-rc.1"
+        required: true
+        type: string
+      debug:
+        description: "Open a maintainer SSH breakpoint if E2E fails"
+        required: false
+        default: false
+        type: boolean
+
+concurrency:
+  group: e2e-tag-${{ inputs.tag }}
+  cancel-in-progress: false
+
+# Listing published releases, reading Git refs and checking out the pinned tree
+# require only repository contents read access.
+# Draft releases are not part of this lane's contract. The public GHCR images
+# referenced by that tree need no package token.
+#
+# CALLERS MUST GRANT `contents: read` AND `checks: write`. A caller's permissions
+# are the ceiling for every job here, and GitHub validates that ceiling when it
+# creates the run, before any `if:` is evaluated — so the `checks: write` the e2e
+# job below declares for its dispatch-only breakpoint has to be granted even by a
+# caller whose invocation can never reach that step. Granting less does not
+# degrade the breakpoint; it fails the caller's entire workflow run at startup.
+permissions:
+  contents: read
+
+jobs:
+  resolve:
+    name: Resolve release assets and tree
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+    outputs:
+      tree_ref: ${{ steps.resolve.outputs.tree_ref }}
+    steps:
+      - name: Validate tag and resolve release
+        id: resolve
+        uses: actions/github-script@f28e40c7f34bde8b3046d885e986cb6290c5673b # v7
+        env:
+          TAG: ${{ inputs.tag }}
+        with:
+          script: |
+            const tag = process.env.TAG;
+            const pattern = /^v[0-9]+\.[0-9]+\.[0-9]+(-(alpha|beta|rc)\.[0-9]+)?$/;
+            if (!pattern.test(tag)) {
+              core.setFailed(`Tag '${tag}' must match vX.Y.Z, vX.Y.Z-alpha.N, vX.Y.Z-beta.N, or vX.Y.Z-rc.N`);
+              return;
+            }
+
+            const isPrerelease = /-(alpha|beta|rc)\.[0-9]+$/.test(tag);
+            const releases = await github.paginate(github.rest.repos.listReleases, {
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              per_page: 100
+            });
+            const release = releases.find(candidate => candidate.tag_name === tag);
+            if (!release) {
+              core.setFailed(`GitHub release '${tag}' not found`);
+              return;
+            }
+
+            if (release.draft) {
+              core.setFailed(`Release for tag '${tag}' is still a draft — this lane validates published tags only; RC validation runs after tags.yaml publishes the prerelease`);
+              return;
+            } else if (isPrerelease && !release.prerelease) {
+              core.setFailed(`Release '${tag}' must be published as a prerelease`);
+              return;
+            } else if (!isPrerelease && release.prerelease) {
+              core.setFailed(`Release '${tag}' must be published as a stable release`);
+              return;
+            }
+
+            const disk = release.assets.find(asset => asset.name === 'nocloud-amd64.raw.xz');
+            if (!disk) {
+              core.setFailed(`Required asset 'nocloud-amd64.raw.xz' is missing from release '${tag}'`);
+              return;
+            }
+
+            const treeRef = isPrerelease ? `release-${tag.slice(1)}` : tag;
+            const gitRef = isPrerelease ? `heads/${treeRef}` : `tags/${treeRef}`;
+            try {
+              await github.rest.git.getRef({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                ref: gitRef
+              });
+            } catch (error) {
+              if (error.status === 404 && isPrerelease) {
+                core.setFailed(`Expected staging branch '${treeRef}' for prerelease tag '${tag}' was not found`);
+                return;
+              }
+              if (error.status === 404) {
+                core.setFailed(`Expected stable tag ref '${tag}' was not found`);
+                return;
+              }
+              throw error;
+            }
+
+            core.setOutput('tree_ref', treeRef);
+            core.info(`Resolved ${tag}: tree '${treeRef}', disk asset ${disk.id}`);
+
+  e2e:
+    name: E2E ${{ inputs.tag }} (full suite)
+    needs: resolve
+    # The sandbox runs three 8-vCPU / 24-GiB Talos containers. This runner
+    # leaves enough host headroom for networking, containerd, and the runner
+    # agent while the full platform installs across all three nodes.
+    runs-on: oracle-vm-32cpu-128gb-x86-64
+    # Covers a green full suite. It does not cover a tenant-Kubernetes suite
+    # running into its node-join deadline, so a red there can end as a
+    # cancelled job. Held to one figure across every lane that runs the suite.
+    timeout-minutes: 215
+    permissions:
+      contents: read
+      checks: write # Breakpoint action updates its dedicated "Breakpoint Open" Check Run.
+    steps:
+      # The resolved ref is the digest-pinned staging branch for a prerelease,
+      # or the stable tag's pinned merge tree.
+      - name: Checkout resolved release tree
+        uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4
+        with:
+          ref: ${{ needs.resolve.outputs.tree_ref }}
+          fetch-depth: 1
+          persist-credentials: false
+
+      - name: Set sandbox ID
+        env:
+          TAG: ${{ inputs.tag }}
+        run: echo "SANDBOX_NAME=cozy-e2e-sandbox-$(echo "${GITHUB_REPOSITORY}:${GITHUB_WORKFLOW}:${TAG}" | sha256sum | cut -c1-10)" >> "$GITHUB_ENV"
+
+      # tags.yaml calls the e2e-tag.yaml from the tag's own commit, so this can
+      # only fire on a dispatch from a newer ref against an older tag.
+      - name: Require a container-lane tree
+        env:
+          TAG: ${{ inputs.tag }}
+        run: |
+          if [ ! -f hack/e2e-compose.yaml ]; then
+            echo "::error title=e2e-tag::${TAG} predates the container lane; dispatch e2e-tag.yaml with --ref ${TAG} to run it on the lane it shipped with"
+            exit 1
+          fi
+
+      - name: Prepare workspace
+        run: |
+          rm -rf "/tmp/$SANDBOX_NAME"
+          cp -r "${{ github.workspace }}" "/tmp/$SANDBOX_NAME"
+
+      # Talos cannot load kernel modules in container mode, so the nodes get
+      # exactly what this host has loaded. Why each module, and why failing
+      # here is better than an hour later: the same step in pull-requests.yaml.
+      - name: Prepare container-lane host
+        run: |
+          set -eu
+          for m in openvswitch zfs; do
+            grep -q "^${m} " /proc/modules && continue
+            if [ "${m}" = zfs ]; then
+              sudo apt-get update -qq
+              sudo DEBIAN_FRONTEND=noninteractive apt-get install -y -qq zfsutils-linux
+            fi
+            sudo modprobe "${m}" || echo "${m}: modprobe failed"
+          done
+          missing=''
+          for m in openvswitch zfs; do
+            grep -q "^${m} " /proc/modules || missing="${missing} ${m}"
+          done
+          if [ -n "${missing}" ]; then
+            echo "::error title=container-lane host::kernel module(s) could not be loaded:${missing}"
+            exit 1
+          fi
+
+      # This is the only retried stage: Talos container startup and sandbox
+      # networking are pure runner infrastructure, not product logic.
+      - name: Prepare environment
+        run: |
+          cd "/tmp/$SANDBOX_NAME"
+          attempt=0
+          until make SANDBOX_NAME="$SANDBOX_NAME" prepare-env-container; do
+            attempt=$((attempt + 1))
+            if [ $attempt -ge 3 ]; then
+              echo "Attempt $attempt failed, exiting..."
+              exit 1
+            fi
+            echo "Attempt $attempt failed, retrying..."
+            make -C packages/core/testing SANDBOX_NAME="$SANDBOX_NAME" delete-cluster-container || true
+          done
+          echo "Prepare environment completed after $((attempt + 1)) attempts"
+
+      - name: Install Cozystack into sandbox
+        env:
+          # No ARP VIP in container mode: .11 is a plain control-plane node.
+          COZY_APISERVER_ENDPOINT: https://192.168.123.11:6443
+          # The nodes share the runner kernel and cannot load DRBD.
+          COZY_LINSTOR_DRBD_ENABLED: "false"
+          COZY_E2E_STORAGE_CLASS: local
+        run: |
+          cd "/tmp/$SANDBOX_NAME"
+          if ! make -C packages/core/testing SANDBOX_NAME=$SANDBOX_NAME install-cozystack; then
+            echo "❌ Install failed (no retry — see diagnostics below)"
+            echo "::group::Diagnostics: HelmRelease status"
+            docker exec "$SANDBOX_NAME" sh -c 'kubectl get hr -A -o wide 2>&1 | tail -100' || true
+            echo "::endgroup::"
+            echo "::group::Diagnostics: not-Ready HelmReleases (describe)"
+            docker exec "$SANDBOX_NAME" sh -c 'kubectl get hr -A --no-headers 2>/dev/null | awk "\$4 != \"True\" {print \$1\" \"\$2}"' \
+              | while read -r ns name; do
+                  echo "--- $ns/$name ---"
+                  docker exec "$SANDBOX_NAME" sh -c "kubectl describe hr '$name' -n '$ns' 2>&1 | tail -50" || true
+                done
+            echo "::endgroup::"
+            echo "::group::Diagnostics: recent events"
+            docker exec "$SANDBOX_NAME" sh -c 'kubectl get events -A --sort-by=.lastTimestamp 2>&1 | tail -50' || true
+            echo "::endgroup::"
+            exit 1
+          fi
+
+      - name: Run OpenAPI tests
+        run: |
+          cd "/tmp/$SANDBOX_NAME"
+          make -C packages/core/testing SANDBOX_NAME=$SANDBOX_NAME test-openapi
+
+      # A tag has no PR diff to scope with Test Impact Analysis. Empty
+      # CHAINSAW_SUITES is the testing Makefile's full-suite mode.
+      - name: Run E2E tests (full suite)
+        id: e2e_tests
+        env:
+          COZY_E2E_STORAGE_CLASS: local
+        run: |
+          cd "/tmp/$SANDBOX_NAME"
+          if ! make -C packages/core/testing SANDBOX_NAME=$SANDBOX_NAME test-chainsaw CHAINSAW_SUITES=""; then
+            echo "❌ Chainsaw E2E failed (see the assertion diffs or LEAKED-PODS lines above and diagnostics below)"
+            echo "::group::Diagnostics: HelmRelease status"
+            docker exec "$SANDBOX_NAME" sh -c 'kubectl get hr -A -o wide 2>&1 | tail -50' || true
+            echo "::endgroup::"
+            echo "::group::Diagnostics: recent events"
+            docker exec "$SANDBOX_NAME" sh -c 'kubectl get events -A --sort-by=.lastTimestamp 2>&1 | tail -30' || true
+            echo "::endgroup::"
+            # COSI CRDs have no printer columns, so capture readiness fields at
+            # failure time before tests and report collection can move state.
+            echo "::group::Diagnostics: COSI bucket state"
+            docker exec "$SANDBOX_NAME" sh -c '
+              kubectl get bucketclaims.objectstorage.k8s.io -A -o custom-columns="NAMESPACE:.metadata.namespace,NAME:.metadata.name,READY:.status.bucketReady,BUCKET:.status.bucketName" 2>&1
+              kubectl get buckets.objectstorage.k8s.io -o custom-columns="NAME:.metadata.name,READY:.status.bucketReady,ID:.status.bucketID,CLAIMNS:.spec.bucketClaim.namespace" 2>&1
+              kubectl get bucketaccesses.objectstorage.k8s.io -A -o custom-columns="NAMESPACE:.metadata.namespace,NAME:.metadata.name,GRANTED:.status.accessGranted,CLAIM:.spec.bucketClaimName" 2>&1
+            ' || true
+            echo "::endgroup::"
+            exit 1
+          fi
+          echo "✅ All E2E tests passed"
+
+      - name: Collect chainsaw report
+        if: always()
+        run: |
+          cd "/tmp/$SANDBOX_NAME"
+          mkdir -p _out
+          docker cp "$SANDBOX_NAME":/workspace/hack/e2e-chainsaw/chainsaw-report.xml \
+            _out/chainsaw-report.xml || true
+
+      - name: Upload chainsaw report
+        if: always()
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
+        with:
+          name: chainsaw-report-${{ inputs.tag }}
+          path: /tmp/${{ env.SANDBOX_NAME }}/_out/chainsaw-report.xml
+          if-no-files-found: ignore
+
+      # collect-report packages cozyreport plus per-failed-test crust-gather
+      # snapshots captured before Chainsaw cleanup.
+      #
+      # A ceiling of its own, not the job's 215 minutes. `Upload cozyreport.tgz`
+      # is the next step and the collector writes its tarball at the very end of
+      # its run, so a read that never returns spends what is left of the job
+      # budget, the job is cancelled, and the upload never runs -- the artifact
+      # is lost rather than truncated. 30 minutes is measured against the step:
+      # it takes 3-42s across sampled runs, failed e2e jobs included.
+      # `continue-on-error` because the ceiling must not change what the job
+      # reports: `|| true` says collecting diagnostics is never fatal, and a step
+      # killed at its ceiling never reaches it.
+      - name: Collect report
+        id: collect_report
+        if: always()
+        timeout-minutes: 30
+        continue-on-error: true
+        run: |
+          cd "/tmp/$SANDBOX_NAME"
+          make -C packages/core/testing SANDBOX_NAME=$SANDBOX_NAME collect-report || true
+
+      # `continue-on-error` keeps the overrun out of the job's result, which also
+      # keeps it out of everyone's view: a step that ended at its ceiling renders
+      # green and the only trace is in the raw log. This branch's own standard is
+      # that a bound which fires is recorded, and that has to hold for the outer
+      # bound too.
+      #
+      # The wording says what `outcome` establishes and no more. A step can end
+      # non-zero without any ceiling firing -- in e2e-tag.yaml the body opens with
+      # a `cd` into a sandbox tree an earlier step may never have created, and the
+      # default shell is `bash -e` -- so naming the timeout as the cause would be
+      # the same false-mechanism claim the collector refuses to make for a 137.
+      - name: Report collection overran its ceiling
+        if: always() && steps.collect_report.outcome == 'failure'
+        run: |
+          echo "::warning title=cozyreport::Collect report ended non-zero -- its timeout-minutes fired, or the step failed before the collector ran; cozyreport.tgz is missing or partial for this run"
+
+      - name: Upload cozyreport.tgz
+        if: always()
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
+        with:
+          name: cozyreport-${{ inputs.tag }}
+          path: /tmp/${{ env.SANDBOX_NAME }}/_out/cozyreport.tgz
+
+      - name: Collect images list
+        if: always()
+        run: |
+          cd "/tmp/$SANDBOX_NAME"
+          make -C packages/core/testing SANDBOX_NAME=$SANDBOX_NAME collect-images || true
+
+      # Every image the nodes pulled, read from their image stores rather than
+      # from the pods still running, since the tests delete what they create.
+      # That covers chart defaults and operator-launched images the static gate
+      # in tags.yaml never sees, because the tree does not pin them by digest.
+      # A pre-release fails on a single-arch image, on a ref that cannot be
+      # read or is still rate-limited after the retries, or on a list the
+      # collection could not produce; a stable tag only warns, since it ships
+      # its rc's images unchanged. Before teardown, which runs whatever this
+      # step does.
+      - name: Audit pulled images are multi-arch
+        if: always()
+        env:
+          TAG: ${{ inputs.tag }}
+        run: |
+          set -o pipefail
+          cd "/tmp/$SANDBOX_NAME"
+          # A tag cut before the audit existed has neither the script nor the
+          # image list, and its e2e must still be re-runnable from main.
+          if [ ! -f hack/verify-multiarch.sh ]; then
+            echo "::warning title=multi-arch audit::the tree under test predates the multi-arch audit; skipped"
+            exit 0
+          fi
+          mkdir -p _out
+          { command -v skopeo && command -v jq; } >/dev/null \
+            || { sudo apt-get update -qq && sudo apt-get install -y -qq skopeo jq; }
+          status=0
+          hack/verify-multiarch.sh --refs-file _out/image-refs.txt 2>&1 | tee _out/multiarch-audit.txt \
+            || status=${PIPESTATUS[0]}
+          if [ "$status" -ne 0 ]; then
+            case "$TAG" in
+              *-*) exit 1 ;;
+            esac
+            # 1: the audit ran and flagged refs (single-arch, unreadable or
+            # rate-limited); anything else: it did not run.
+            if [ "$status" -eq 1 ]; then
+              echo "::warning title=multi-arch audit::some images pulled by e2e are not amd64+arm64 indexes or could not be checked; see multiarch-audit.txt"
+            else
+              echo "::warning title=multi-arch audit::the multi-arch audit did not run; see multiarch-audit.txt"
+            fi
+          fi
+
+      - name: Upload image list
+        if: always()
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
+        with:
+          name: image-list-${{ inputs.tag }}
+          path: |
+            /tmp/${{ env.SANDBOX_NAME }}/_out/images.txt
+            /tmp/${{ env.SANDBOX_NAME }}/_out/image-refs.txt
+            /tmp/${{ env.SANDBOX_NAME }}/_out/multiarch-audit.txt
+
+      # ▸ Open an SSH breakpoint to the failing sandbox so maintainers can attach,
+      #   inspect Talos/Cozystack state and resume with `breakpoint resume`.
+      #
+      #   Gated by the workflow_dispatch `debug` boolean and the configured
+      #   BREAKPOINT_ENDPOINT repository variable. workflow_call runs never get
+      #   a breakpoint. authorized-users is kept as a second defense layer at
+      #   the breakpoint level.
+      #
+      #   Uses cozystack/breakpoint-action (fork of namespacelabs/breakpoint-action)
+      #   pinned by SHA. The fork adds: pause-idle mode (initial grace period for
+      #   the first SSH connection, idle-aware exit afterwards), endpoint output
+      #   and ::notice:: annotation, and a dedicated Check Run "Breakpoint Open"
+      #   that carries the SSH endpoint in output.summary while the breakpoint is
+      #   paused (conclusion=failure → standard ✗ in checks; updated to
+      #   conclusion=success when the breakpoint exits).
+      - name: Breakpoint on E2E failure
+        if: |
+          failure() &&
+          github.event_name == 'workflow_dispatch' &&
+          inputs.debug == true &&
+          vars.BREAKPOINT_ENDPOINT != ''
+        # cozystack/breakpoint-action v2-cozy.1
+        # mode: pause-idle defaults: grace-period=20m, idle-timeout=10m
+        uses: cozystack/breakpoint-action@a6f3a6f87be398ad63b6577351e3398e53f578e4
+        with:
+          mode: pause-idle
+          endpoint: ${{ vars.BREAKPOINT_ENDPOINT }}
+          authorized-users: androndo, Arsolitt, IvanHunters, kvaps, lexfrei, lllamnyp, mattia-eleuteri, matthieu-robin, myasnikovdaniil, sircthulhu, tym83
+          check-run-name: "Breakpoint Open"
+          github-token: ${{ github.token }}
+          check-run-summary-template: |
+            ## 🔴 SSH breakpoint open — paused for debug
+
+            ```
+            {endpoint}
+            ```
+
+            Enter the e2e sandbox after SSH:
+            ```
+            docker exec -ti $(docker ps --filter name=cozy-e2e-sandbox -q | head -1) bash
+            export KUBECONFIG=/workspace/kubeconfig
+            ```
+
+            Resume from inside: `breakpoint resume`. Otherwise the breakpoint
+            exits 10 minutes after the last SSH session disconnects.
+
+      # The compose project owns the nodes and the zpools outlive it, so both
+      # halves go, in this order.
+      - name: Tear down sandbox
+        if: always()
+        run: |
+          make -C packages/core/testing SANDBOX_NAME="$SANDBOX_NAME" delete-cluster-container || true
+          make -C packages/core/testing SANDBOX_NAME="$SANDBOX_NAME" delete || true
+
+      - name: Remove workspace
+        if: always()
+        run: rm -rf "/tmp/${SANDBOX_NAME:?}"
+
+      - name: Summarize outcome
+        if: always()
+        env:
+          OUTCOME: ${{ job.status }}
+          TAG: ${{ inputs.tag }}
+        run: printf '| E2E tag `%s` | %s |\n' "$TAG" "$OUTCOME" >> "$GITHUB_STEP_SUMMARY"
diff --git a/.github/workflows/issue-triage.yaml b/.github/workflows/issue-triage.yaml
new file mode 100644
index 0000000000..95306f0067
--- /dev/null
+++ b/.github/workflows/issue-triage.yaml
@@ -0,0 +1,325 @@
+name: Issue triage
+
+# Every open issue should carry a triage/* label marking its lifecycle stage.
+# The issue templates apply `triage/needs-triage` from their front matter, but
+# that only covers issues created through the web form: issues created via
+# the API or `gh issue create` bypass templates and arrive unlabeled. The
+# `issues` events below label those on arrival; the daily sweep is the
+# backstop for removed labels and for the pre-existing backlog.
+on:
+  issues:
+    types: [opened, reopened]
+  schedule:
+    - cron: '53 5 * * *'  # daily at 05:53 UTC, after stale (04:37)
+  workflow_dispatch:
+    inputs:
+      dry_run:
+        description: 'Log what would be labeled without applying'
+        type: boolean
+        # On by default, so the one entry point a human can reach writes
+        # nothing until somebody unchecks it. The scheduled sweep reads no
+        # inputs and is unaffected: it writes.
+        default: true
+
+# Top-level token defaults to read-only. A job-level block replaces this one
+# rather than adding to it, so the job below holds `issues: write` and
+# nothing else.
+permissions:
+  contents: read
+
+# One queue for every run of this workflow, on purpose. GitHub keeps a
+# single pending run per group, so issues filed while a sweep is running
+# lose all but the last of their own runs and wait for the next sweep,
+# which is what the sweep is there for. Splitting the group per issue would
+# save that wait at the price of a real bug: a sweep works from a listing
+# taken when it started, so it and a concurrent per-issue run can read the
+# same issue differently and leave it holding two contradictory triage
+# labels, which nothing later removes.
+#
+# The queue closes that door against a second run of this workflow, not
+# against a maintainer labeling an issue by hand while a sweep is running:
+# the sweep classifies from the listing it took when it started, so a label
+# applied during its paced writes is invisible to it and the issue ends up
+# carrying a second triage label that the already-triaged skip then keeps
+# every later sweep from revisiting. Losing that race costs the spurious
+# `triage/needs-triage`, which a maintainer deletes and no later sweep
+# re-adds, because the label it raced against is still on the issue. That
+# was judged cheaper than re-reading every issue immediately before every
+# write: that would double the request budget the write cap below is derived
+# against. Deleting is the repair for this one case and not a general undo:
+# an issue left carrying no triage label at all is relabeled by the next
+# sweep, which is what AGENTS.md's labeling bullet warns about.
+concurrency:
+  group: issue-triage
+  cancel-in-progress: false
+
+jobs:
+  triage:
+    runs-on: ubuntu-latest
+    # A run that reaches the write cap paces roughly seven minutes of work, so
+    # anything near this ceiling is a call that hung rather than a long sweep.
+    # Without it the default is six hours, and the queue above means one hung
+    # run holds every issue filed behind it for all six.
+    timeout-minutes: 20
+    permissions:
+      issues: write
+    steps:
+      - name: Apply triage labels
+        uses: actions/github-script@f28e40c7f34bde8b3046d885e986cb6290c5673b # v7
+        with:
+          script: |
+            // Labels applied with the workflow's GITHUB_TOKEN do not trigger
+            // other workflows (GitHub's recursion prevention), so this job
+            // cannot re-enter itself or wake any `labeled`-subscribed workflow.
+            //
+            // Adding a label bumps the issue's `updated_at`, which stale.yaml
+            // reads as fresh activity: the stale bot un-marks `lifecycle/stale`
+            // and restarts its 60-day clock on the next run. For issues labeled
+            // on arrival that is moot; for the sweep over the historical
+            // backlog it is a deliberate one-time reset. Triage first, then
+            // let staleness take its course.
+            //
+            // `triage/accepted` is also on stale.yaml's exempt-issue-labels,
+            // so applying it is more than a clock reset: the issue stops
+            // being auto-closable at all. For every label in
+            // ACCEPTED_SIGNAL_LABELS that changes nothing, because each one
+            // is on the same exempt list already. An assignee is the single
+            // signal that is not a label and not already exempt, so an issue
+            // whose only accepted-signal is an assignee gains something it
+            // did not have. That is new, and it is the
+            // intended reading rather than a side effect: somebody took
+            // ownership, which makes the issue a known long-tail task and
+            // not an abandoned one — the same argument stale.yaml's own
+            // comment makes for exempting `triage/accepted`. Part of the
+            // backlog this reaches is marked stale today, some of it inside
+            // the 14-day close window, and the sweep spares it.
+            const NEEDS_TRIAGE = 'triage/needs-triage';
+            const ACCEPTED = 'triage/accepted';
+
+            // Label-shaped accepted-signals, admitted on two conditions.
+            // Necessary: the label is on stale.yaml's exempt-issue-labels,
+            // because `triage/accepted` is itself exempt and awarding it for
+            // a label that is not would hand the issue a permanent reprieve
+            // as a side effect — which is why `priority/backlog`, the tier
+            // stale.yaml leaves reapable, is not a signal. Not sufficient:
+            // a `lifecycle/*` label states what the stale bot may do and
+            // nothing about whether anyone reviewed the issue, so exempt
+            // `lifecycle/frozen` is still not a signal here. Freezing an
+            // untriaged issue to keep the bot off it is exactly the case
+            // where that inference would be false.
+            const ACCEPTED_SIGNAL_LABELS = [
+              'priority/critical-urgent',
+              'priority/important-soon',
+              'priority/important-longterm',
+              'epic',
+            ];
+
+            // The sweep is the only place this workflow writes in bulk, and
+            // GitHub's secondary rate limits allow 80 content-generating
+            // requests a minute and 500 an hour. This client has no
+            // throttling plugin and no retries, and a throttled write
+            // answers 403, which is exempt from retry anyway: an unpaced
+            // sweep does not slow down when it is throttled, it fails the
+            // job and leaves the backlog half labeled. Pace the writes
+            // under the per-minute ceiling, and stop short of the hourly
+            // one instead of walking into it. Whatever a run leaves behind
+            // stays unlabeled, so the next one picks it up.
+            //
+            // Those are the secondary limits. GITHUB_TOKEN also carries a
+            // primary one of 1000 requests an hour for the whole repository,
+            // shared with every other workflow, and a run that reaches the
+            // cap spends a large part of it. That is affordable at 05:53 and
+            // only while the backlog drains, but it is the ceiling to lower
+            // the cap against if this ever moves to a busier slot.
+            const WRITE_INTERVAL_MS = 1000;
+            const MAX_WRITES_PER_RUN = 400;
+            const sleep = (ms) =>
+              new Promise((resolve) => setTimeout(resolve, ms));
+
+            // Returns the label to add, or null when the item needs nothing.
+            // The signals stand for a maintainer decision already recorded on
+            // the issue, a weaker claim than the one `triage/accepted` makes
+            // in .github/labels.yml: `priority/important-longterm` says
+            // outright the work may not be staffed. Of the two labels this
+            // workflow writes it is still the closer one — `needs-triage` on
+            // an issue somebody prioritised or took asks for a triage that
+            // already happened — and a maintainer who disagrees replaces it.
+            const classify = (issue) => {
+              if (issue.pull_request) return null; // listForRepo returns PRs too
+              const labels = (issue.labels || []).map((l) =>
+                typeof l === 'string' ? l : l.name
+              );
+              if (labels.some((n) => n.startsWith('triage/'))) return null;
+              const looked = // somebody has already looked at this one
+                (issue.assignees || []).length > 0 ||
+                labels.some((n) => ACCEPTED_SIGNAL_LABELS.includes(n));
+              return looked ? ACCEPTED : NEEDS_TRIAGE;
+            };
+
+            const apply = async (issue, label, dryRun) => {
+              if (dryRun) {
+                core.info(`[dry-run] #${issue.number}: would add ${label}`);
+                return;
+              }
+              await github.rest.issues.addLabels({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                issue_number: issue.number,
+                labels: [label],
+              });
+              core.info(`#${issue.number}: added ${label}`);
+            };
+
+            if (context.eventName === 'issues') {
+              const issue = context.payload.issue;
+              const label = classify(issue);
+              if (label) {
+                await apply(issue, label, false);
+              } else {
+                core.info(`#${issue.number}: already triaged, nothing to do`);
+              }
+              return;
+            }
+
+            // schedule / workflow_dispatch: sweep every open issue.
+            // workflow_dispatch inputs arrive as strings in the webhook
+            // payload even when declared `type: boolean`.
+            //
+            // Keyed on the event rather than on the input alone, so both
+            // unknown cases fail safe: `schedule` is the one event that
+            // writes without being asked, so any trigger added here later
+            // starts out dry rather than writing on its first run, and a
+            // dispatch sending anything but the literal `false` gets a dry
+            // run. The declared default above is what a human sees in the
+            // form; this does not depend on it reaching the payload.
+            const dryRun =
+              context.eventName !== 'schedule' &&
+              String(context.payload.inputs?.dry_run ?? 'true') !== 'false';
+
+            const issues = await github.paginate(github.rest.issues.listForRepo, {
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              state: 'open',
+              per_page: 100,
+            });
+
+            const acceptedIssues = [];
+            const needsTriageIssues = [];
+            let skipped = 0;
+            let deferred = 0;
+            let failed = 0;
+            let refused = 0;
+            let writes = 0;
+            // Listing index a refusal stopped the run on. The remainder it
+            // yields is counted in listing entries, not in issues left
+            // needing a label — most of any remainder is pull requests and
+            // already-triaged issues the loop would have skipped. It is
+            // reported so that a run which stopped early cannot read as one
+            // that reached the end of the listing; `deferred` is the write
+            // cap's own remainder and does not cover this.
+            let stoppedAt = -1;
+            for (const [index, issue] of issues.entries()) {
+              const label = classify(issue);
+              if (!label) {
+                skipped += 1;
+                continue;
+              }
+              // The cap counts in dry-run too, so a dry run predicts what a
+              // real one would do rather than a longer list nobody gets.
+              if (writes >= MAX_WRITES_PER_RUN) {
+                deferred += 1;
+                continue;
+              }
+              if (writes > 0 && !dryRun) {
+                await sleep(WRITE_INTERVAL_MS);
+              }
+              writes += 1;
+              try {
+                await apply(issue, label, dryRun);
+              } catch (err) {
+                // 403 is what a secondary rate limit and a token without
+                // `issues: write` both answer; 429 is the other throttle
+                // shape. Those two are the only statuses that stop the run.
+                // Every other status carries on, and that is the whole of
+                // the else: the 404 or 410 of an issue transferred or
+                // deleted mid-sweep, but a 422 or a 5xx just the same,
+                // because a failure about one issue says nothing about the
+                // next one and the next sweep retries it. A refusal is the
+                // opposite kind: it applies to every write left in the run,
+                // and repeating a rejected request up to the cap is what
+                // gets an integration banned, so stop at the first one. The
+                // remainder stays unlabeled and the next run takes it,
+                // exactly like the write cap's own deferral.
+                if (err.status === 403 || err.status === 429) {
+                  refused += 1;
+                  stoppedAt = index;
+                  core.warning(
+                    `#${issue.number}: ${label} refused ` +
+                      `(${err.status}); stopping the sweep`
+                  );
+                  break;
+                }
+                // One issue that cannot be labeled, because it was moved or
+                // deleted mid-sweep, must not cost the run the rest of the
+                // backlog and the summary with it. It stays unlabeled, so
+                // the next run picks it up like any other. Counted below the
+                // refusal branch rather than above it, so that one refusal
+                // reports as one problem instead of also inflating the
+                // failed count it is already reported by.
+                failed += 1;
+                core.warning(`#${issue.number}: ${label} failed: ${err.message}`);
+                continue;
+              }
+              if (label === ACCEPTED) {
+                acceptedIssues.push(issue.number);
+              } else {
+                needsTriageIssues.push(issue.number);
+              }
+            }
+
+            // A sweep over the backlog logs one line per issue, which is a
+            // page nobody reads to find out what a run did. Every row is
+            // printed whether or not it is zero: a table that hides its empty
+            // rows makes "no writes failed" and "the count was never taken"
+            // look alike.
+            const unexamined =
+              stoppedAt < 0 ? 0 : issues.length - 1 - stoppedAt;
+            const numbers = (ns) =>
+              ns.length ? ns.map((n) => `#${n}`).join(', ') : 'none';
+            const report = [
+              `## Issue triage${dryRun ? ' — dry run, nothing written' : ''}`,
+              '',
+              '| outcome | issues |',
+              '| --- | --- |',
+              `| \`${ACCEPTED}\` | ${acceptedIssues.length} |`,
+              `| \`${NEEDS_TRIAGE}\` | ${needsTriageIssues.length} |`,
+              `| already triaged, or a pull request | ${skipped} |`,
+              `| deferred, this run hit its write cap of ${MAX_WRITES_PER_RUN} | ${deferred} |`,
+              `| write failed, left for the next run | ${failed} |`,
+              `| write refused, which stopped the sweep | ${refused} |`,
+              `| listing entries never reached, the sweep stopped at a refusal | ${unexamined} |`,
+              '',
+              `\`${ACCEPTED}\`: ${numbers(acceptedIssues)}`,
+              '',
+              `\`${NEEDS_TRIAGE}\`: ${numbers(needsTriageIssues)}`,
+              '',
+            ].join('\n');
+            core.info(report);
+            // `write()` is async: unawaited, the step can end green with an
+            // empty summary panel. `addRaw` appends no newline of its own.
+            await core.summary.addRaw(report).write();
+            // An issue that vanished mid-sweep is benign however many times
+            // it happens, and the next run simply does not see it. A refusal
+            // is not benign even once: it means the token lost `issues:
+            // write`, or the pacing above stopped being enough and the sweep
+            // is into the secondary rate limit. Discriminating on the status
+            // rather than on a count keeps the alarm live once the backlog is
+            // drained and a run writes to a handful of issues at most, which
+            // is the regime this workflow spends almost all of its life in.
+            if (refused > 0) {
+              core.setFailed(
+                `A label write was refused after ${writes} attempted, so ` +
+                  `the sweep stopped early; check the job's issues: write ` +
+                  `permission and the log for rate-limit responses`
+              );
+            }
diff --git a/.github/workflows/labels.yaml b/.github/workflows/labels.yaml
index 69c1832936..5d025484eb 100644
--- a/.github/workflows/labels.yaml
+++ b/.github/workflows/labels.yaml
@@ -24,8 +24,10 @@ concurrency:
 jobs:
   validate:
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4
 
       - name: Validate labels.yml schema
         run: |
@@ -74,11 +76,12 @@ jobs:
     if: github.event_name != 'pull_request'
     runs-on: ubuntu-latest
     permissions:
+      contents: read
       issues: write
       pull-requests: write
     steps:
-      - uses: actions/checkout@v4
-      - uses: EndBug/label-sync@v2
+      - uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4
+      - uses: EndBug/label-sync@52074158190acb45f3077f9099fea818aa43f97a # v2
         with:
           config-file: .github/labels.yml
           delete-other-labels: false
diff --git a/.github/workflows/nightly.yaml b/.github/workflows/nightly.yaml
new file mode 100644
index 0000000000..495ccec38a
--- /dev/null
+++ b/.github/workflows/nightly.yaml
@@ -0,0 +1,433 @@
+name: Nightly
+
+# Publish an installable nightly of `main` WITHOUT rebuilding it, then run the
+# full e2e suite against the published bits.
+#
+# A nightly is a renamed copy of what `build-main` already built: every
+# component image is content-addressed, so `nightly-mirror.sh` copies each one
+# from the CI build registry (OCIR) to the public release registry (GHCR) BY
+# DIGEST — bit-for-bit, no rebuild. The cozystack-packages artifact and the
+# cozy-installer chart are re-published on GHCR so the whole install closure is
+# self-contained there. The only thing genuinely built is the Talos nocloud disk
+# (assembled from upstream profiles, independent of the registry), published as a
+# GHCR OCI artifact so a nightly is installable on real hardware. The nightly
+# e2e does not boot it.
+#
+# No GitHub release and no api/apps/v1alpha1 Go-module tag are created — a
+# nightly is an installable artifact set on GHCR, nothing more. retention.yaml
+# prunes the GHCR nightly tags.
+#
+# Install a nightly:
+#   helm upgrade --install cozystack \
+#     oci://ghcr.io/cozystack/cozystack/cozy-installer --version nightly
+#   (the floating `nightly` tag tracks the latest; each build is also published
+#    under an immutable 0.0.0-nightly.<date>.<run-id>.<attempt> tag for pinning)
+
+on:
+  schedule:
+    - cron: '0 2 * * *'   # daily 02:00 UTC, after build-main has settled
+  workflow_dispatch: {}
+
+env:
+  SRC_REGISTRY: iad.ocir.io/idyksih5sir9/cozystack
+  DST_REGISTRY: ghcr.io/cozystack/cozystack
+
+concurrency:
+  group: nightly
+  cancel-in-progress: false
+
+jobs:
+  # ── Mirror the latest main build OCIR -> GHCR by digest, re-publish the
+  #    packages artifact + installer chart on GHCR. No rebuild.
+  mirror:
+    name: Mirror images to GHCR
+    if: vars.NIGHTLY_ENABLED == 'true' || github.event_name == 'workflow_dispatch'
+    runs-on: oracle-vm-4cpu-16gb-x86-64
+    timeout-minutes: 60
+    permissions:
+      contents: read
+      packages: write
+    outputs:
+      version:         ${{ steps.resolve.outputs.version }}
+      sha:             ${{ steps.resolve.outputs.sha }}
+      packages_ref:    ${{ steps.resolve.outputs.packages_ref }}
+      packages_digest: ${{ steps.publish.outputs.packages_digest }}
+    steps:
+      - name: Set up flux
+        uses: fluxcd/flux2/action@04acaec6161ac4fb1a82ffafa88901c03271d34f # v2.8.6
+        with:
+          version: "2.8.6"
+      - name: Set up toolchain (skopeo, yq, helm)
+        env:
+          YQ_VERSION: "4.53.3"
+          YQ_SHA256: "fa52a4e758c63d38299163fbdd1edfb4c4963247918bf9c1c5d31d84789eded4"
+        run: |
+          command -v skopeo >/dev/null || { sudo apt-get update -qq && sudo apt-get install -y -qq skopeo; }
+          if ! yq --version 2>/dev/null | grep -q "mikefarah.* version v${YQ_VERSION}\$"; then
+            yq_bin="$(mktemp)"
+            curl -fsSL -o "$yq_bin" \
+              "https://github.com/mikefarah/yq/releases/download/v${YQ_VERSION}/yq_linux_amd64"
+            printf '%s  %s\n' "$YQ_SHA256" "$yq_bin" | sha256sum -c -
+            sudo install -m 0755 "$yq_bin" /usr/local/bin/yq
+            rm -f "$yq_bin"
+          fi
+          command -v helm   >/dev/null || curl -fsSL https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 | bash
+
+      - name: Login to registries
+        env:
+          OCIR_USER:  ${{ secrets.OCIR_USER }}
+          OCIR_TOKEN: ${{ secrets.OCIR_TOKEN }}
+          GHCR_USER:  ${{ github.actor }}
+          GHCR_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          # skopeo (mirror copies), flux + helm (artifact/chart push) all read
+          # their own auth; log each into both registries it touches. Token via
+          # stdin, never argv (a -p token leaks into the process list / logs).
+          echo "$OCIR_TOKEN" | skopeo login "${SRC_REGISTRY%%/*}" -u "$OCIR_USER" --password-stdin
+          echo "$GHCR_TOKEN" | skopeo login "${DST_REGISTRY%%/*}" -u "$GHCR_USER" --password-stdin
+          echo "$OCIR_TOKEN" | docker login "${SRC_REGISTRY%%/*}" -u "$OCIR_USER" --password-stdin
+          echo "$GHCR_TOKEN" | docker login "${DST_REGISTRY%%/*}" -u "$GHCR_USER" --password-stdin
+          echo "$GHCR_TOKEN" | helm registry login "${DST_REGISTRY%%/*}" -u "$GHCR_USER" --password-stdin
+
+      # The source of truth is the cozystack-packages:main artifact build-main
+      # pushed. Resolve the exact commit it was built from (its revision
+      # annotation) so the disk and the install tree are checked out from the
+      # SAME commit the images were built at — never main's drifting HEAD.
+      - name: Resolve source commit and version
+        id: resolve
+        run: |
+          set -eu
+          # Fetch the :main manifest ONCE and derive BOTH its digest and the
+          # revision annotation from those exact bytes, then pull the baked tree
+          # from that SAME digest below, so a concurrent build-main push of :main
+          # cannot make us check out commit A while mirroring tree B.
+          #
+          # --raw is mandatory here: cozystack-packages is a Flux OCI artifact
+          # (config mediaType application/vnd.cncf.flux.config.v1+json), not a
+          # container image, so a plain `skopeo inspect` attempts an
+          # image-specific operation and fatals on it. `manifest-digest` hashes
+          # the manifest bytes, which is exactly what the registry addresses it
+          # by — no image-specific parsing involved.
+          manifest="${RUNNER_TEMP}/cozystack-packages-main.json"
+          skopeo inspect --raw "docker://${SRC_REGISTRY}/cozystack-packages:main" > "$manifest"
+          packages_ref="$(skopeo manifest-digest "$manifest")"
+          rev="$(yq -r '.annotations["org.opencontainers.image.revision"] // ""' -p json "$manifest" 2>/dev/null || true)"
+          rm -f "$manifest"
+          # revision is "<git-describe>:<sha>"; take the sha.
+          sha="${rev##*:}"
+          # The sha flows into `actions/checkout` ref: — validate it is a bare
+          # commit hash before trusting it, so a malformed/forged annotation
+          # cannot inject a ref.
+          echo "$sha" | grep -qE '^[0-9a-f]{40}$' \
+            || { echo "::error::source revision '$sha' is not a 40-hex commit sha"; exit 1; }
+          # Make every build's tag immutable: the UTC date keeps it human-
+          # readable, and run id + attempt make a same-day re-dispatch or re-run
+          # publish a distinct tag instead of overwriting the day's nightly.
+          version="0.0.0-nightly.$(date -u +%Y%m%d).${GITHUB_RUN_ID}.${GITHUB_RUN_ATTEMPT}"
+          echo "sha=$sha"                   >> "$GITHUB_OUTPUT"
+          echo "version=$version"           >> "$GITHUB_OUTPUT"
+          echo "packages_ref=$packages_ref" >> "$GITHUB_OUTPUT"
+          echo "Resolved main build: sha=$sha version=$version packages_ref=$packages_ref"
+
+      - name: Checkout source commit
+        uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4
+        with:
+          ref: ${{ steps.resolve.outputs.sha }}
+          fetch-depth: 1
+          # Nothing after checkout needs the git token — the mirror steps
+          # authenticate to the registries directly — so don't leave it in
+          # .git/config.
+          persist-credentials: false
+
+      # Pull the digest-vendored tree build-main baked (but never committed).
+      # Pinned to the digest resolved above, not the mutable :main tag.
+      - name: Pull baked package tree
+        run: |
+          set -eu
+          # `flux pull artifact` rejects an --output path that does not already
+          # exist ("invalid output path"), so create it first.
+          rm -rf _baked && mkdir -p _baked
+          flux pull artifact "oci://${SRC_REGISTRY}/cozystack-packages@${{ steps.resolve.outputs.packages_ref }}" --output _baked
+
+      # Copy every cozystack-owned component image OCIR -> GHCR by digest and
+      # rewrite the baked tree's image hosts to GHCR (digests untouched).
+      - name: Mirror images and rewrite tree
+        run: ./hack/nightly-mirror.sh "${{ steps.resolve.outputs.version }}" _baked
+
+      # Re-publish the rewritten tree as the GHCR packages artifact, capture its
+      # digest, point the installer chart at it, package + push the chart.
+      - name: Publish packages artifact and installer chart to GHCR
+        id: publish
+        env:
+          VERSION: ${{ steps.resolve.outputs.version }}
+          SHA:     ${{ steps.resolve.outputs.sha }}
+        run: |
+          set -eu
+          flux push artifact "oci://${DST_REGISTRY}/cozystack-packages:${VERSION}" \
+            --path=_baked \
+            --source=https://github.com/cozystack/cozystack \
+            --revision="${VERSION}:${SHA}" 2>&1 | tee _push.log
+          DIGEST="$(awk -F@ '/artifact successfully pushed/ {print $2}' _push.log)"
+          [ -n "$DIGEST" ] || { echo "::error::failed to capture packages artifact digest"; exit 1; }
+          # Floating tag for the latest nightly packages artifact.
+          skopeo copy --multi-arch all \
+            "docker://${DST_REGISTRY}/cozystack-packages:${VERSION}" \
+            "docker://${DST_REGISTRY}/cozystack-packages:nightly"
+          # Point the installer chart at the GHCR artifact (the artifact cannot
+          # carry its own digest, so set it on the chart we package now).
+          yq -i ".cozystackOperator.platformSourceUrl = \"oci://${DST_REGISTRY}/cozystack-packages\"" _baked/core/installer/values.yaml
+          yq -i ".cozystackOperator.platformSourceRef = \"digest=${DIGEST}\"" _baked/core/installer/values.yaml
+          PKG="$(helm package _baked/core/installer --version "${VERSION}" --app-version "${VERSION}" | awk '{print $NF}')"
+          helm push "$PKG" "oci://${DST_REGISTRY}"
+          skopeo copy --multi-arch all \
+            "docker://${DST_REGISTRY}/cozy-installer:${VERSION}" \
+            "docker://${DST_REGISTRY}/cozy-installer:nightly"
+          echo "packages_digest=${DIGEST}" >> "$GITHUB_OUTPUT"
+          echo "Published cozystack-packages@${DIGEST} and cozy-installer:${VERSION} to GHCR."
+
+  # ── Assemble the Talos nocloud disk from the upstream imager (no cozystack
+  #    image dependency) and publish it as a GHCR OCI artifact.
+  build-disk:
+    name: Build & publish nocloud disk
+    needs: [mirror]
+    runs-on: oracle-vm-4cpu-16gb-x86-64
+    timeout-minutes: 40
+    permissions:
+      contents: read
+      packages: write
+    steps:
+      - name: Checkout source commit
+        uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4
+        with:
+          ref: ${{ needs.mirror.outputs.sha }}
+          fetch-depth: 1
+          persist-credentials: false
+      - name: Set up oras
+        run: |
+          command -v oras >/dev/null || { curl -fsSL https://github.com/oras-project/oras/releases/download/v1.2.0/oras_1.2.0_linux_amd64.tar.gz | sudo tar -xz -C /usr/local/bin oras; }
+      - name: Login to GHCR
+        env:
+          GHCR_USER:  ${{ github.actor }}
+          GHCR_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: echo "$GHCR_TOKEN" | oras login "${DST_REGISTRY%%/*}" -u "$GHCR_USER" --password-stdin
+      # Pure asset assembly: the nocloud profile references only upstream
+      # ghcr.io/siderolabs/* images, so this needs no cozystack registry and no
+      # rebuild of any cozystack image.
+      - name: Build nocloud disk
+        run: make -C packages/core/talos talos-nocloud
+        env:
+          # The e2e sandbox boots amd64 only.
+          PLATFORM: linux/amd64
+      - name: Publish disk to GHCR
+        env:
+          VERSION: ${{ needs.mirror.outputs.version }}
+        run: |
+          set -eu
+          cd _out/assets
+          # image.source links the package to this repo. Without it the first-
+          # ever push creates an unlinked package, and the follow-up `oras tag`
+          # can 403 permission_denied: write_package until it is linked by hand.
+          oras push "${DST_REGISTRY}/cozystack-nocloud:${VERSION}" \
+            --artifact-type application/vnd.cozystack.talos.nocloud \
+            --annotation "org.opencontainers.image.source=https://github.com/cozystack/cozystack" \
+            nocloud-amd64.raw.xz:application/vnd.cozystack.talos.disk.v1+xz
+          oras tag "${DST_REGISTRY}/cozystack-nocloud:${VERSION}" nightly
+          echo "Published cozystack-nocloud:${VERSION} (+ :nightly) to GHCR."
+
+  # ── Full e2e against the published GHCR closure (chart + images), on the
+  #    same Talos-container substrate as the PR lanes. The nodes boot the
+  #    upstream Talos image, so the nocloud disk built above is published but
+  #    not exercised here, and e2e does not wait for it.
+  e2e:
+    name: E2E (full suite)
+    needs: [mirror]
+    # Same sandbox as the other e2e lanes: three nodes at 8 vCPU / 24 GiB each
+    # (hack/e2e-compose.yaml) commit 24 vCPU for the whole run, so the runner
+    # class has to be strictly larger, leaving the host its own cycles for
+    # containerd and the runner agent. Enforced by
+    # hack/sandbox-runner-headroom.bats.
+    runs-on: oracle-vm-32cpu-128gb-x86-64
+    # Covers a green full suite. It does not cover a tenant-Kubernetes suite
+    # running into its node-join deadline, so a red there can end as a
+    # cancelled job. Held to one figure across every lane that runs the suite.
+    timeout-minutes: 215
+    permissions:
+      contents: read
+      packages: read
+    steps:
+      - name: Checkout source commit
+        uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4
+        with:
+          ref: ${{ needs.mirror.outputs.sha }}
+          fetch-depth: 1
+          persist-credentials: false
+      - name: Set up flux
+        uses: fluxcd/flux2/action@04acaec6161ac4fb1a82ffafa88901c03271d34f # v2.8.6
+        with:
+          version: "2.8.6"
+      - name: Login to GHCR
+        env:
+          GHCR_USER:  ${{ github.actor }}
+          GHCR_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          echo "$GHCR_TOKEN" | docker login "${DST_REGISTRY%%/*}" -u "$GHCR_USER" --password-stdin
+
+      # Overlay the GHCR-rewritten tree (operator image, .e2e.image and every
+      # component now point at GHCR), then pin the installer chart to the GHCR
+      # packages artifact — exactly the bits a user would install.
+      - name: Stage GHCR install tree
+        env:
+          VERSION:         ${{ needs.mirror.outputs.version }}
+          PACKAGES_DIGEST: ${{ needs.mirror.outputs.packages_digest }}
+        run: |
+          set -eu
+          # `flux pull artifact` rejects an --output path that does not already
+          # exist ("invalid output path"), so create it first.
+          rm -rf _rw && mkdir -p _rw
+          flux pull artifact "oci://${DST_REGISTRY}/cozystack-packages:${VERSION}" --output _rw
+          cp -r _rw/. packages/
+          yq -i ".cozystackOperator.platformSourceUrl = \"oci://${DST_REGISTRY}/cozystack-packages\"" packages/core/installer/values.yaml
+          yq -i ".cozystackOperator.platformSourceRef = \"digest=${PACKAGES_DIGEST}\"" packages/core/installer/values.yaml
+
+      - name: Set sandbox ID
+        run: echo "SANDBOX_NAME=cozy-e2e-sandbox-$(echo "${GITHUB_REPOSITORY}:${GITHUB_WORKFLOW}:${GITHUB_REF}" | sha256sum | cut -c1-10)" >> "$GITHUB_ENV"
+
+      # Talos cannot load kernel modules in container mode, so the nodes get
+      # exactly what this host has loaded. Why each module, and why failing
+      # here is better than an hour later: the same step in pull-requests.yaml.
+      - name: Prepare container-lane host
+        run: |
+          set -eu
+          for m in openvswitch zfs; do
+            grep -q "^${m} " /proc/modules && continue
+            if [ "${m}" = zfs ]; then
+              sudo apt-get update -qq
+              sudo DEBIAN_FRONTEND=noninteractive apt-get install -y -qq zfsutils-linux
+            fi
+            sudo modprobe "${m}" || echo "${m}: modprobe failed"
+          done
+          missing=''
+          for m in openvswitch zfs; do
+            grep -q "^${m} " /proc/modules || missing="${missing} ${m}"
+          done
+          if [ -n "${missing}" ]; then
+            echo "::error title=container-lane host::kernel module(s) could not be loaded:${missing}"
+            exit 1
+          fi
+
+      - name: Prepare environment
+        run: |
+          attempt=0
+          until make SANDBOX_NAME="$SANDBOX_NAME" prepare-env-container; do
+            attempt=$((attempt + 1))
+            if [ $attempt -ge 3 ]; then echo "Attempt $attempt failed, exiting..."; exit 1; fi
+            echo "Attempt $attempt failed, retrying..."
+            make -C packages/core/testing SANDBOX_NAME="$SANDBOX_NAME" delete-cluster-container || true
+          done
+
+      - name: Install Cozystack into sandbox
+        env:
+          # No ARP VIP in container mode: .11 is a plain control-plane node.
+          COZY_APISERVER_ENDPOINT: https://192.168.123.11:6443
+          # The nodes share the runner kernel and cannot load DRBD.
+          COZY_LINSTOR_DRBD_ENABLED: "false"
+          COZY_E2E_STORAGE_CLASS: local
+        run: |
+          if ! make -C packages/core/testing SANDBOX_NAME=$SANDBOX_NAME install-cozystack; then
+            echo "❌ Install failed (no retry — diagnostics below)"
+            echo "::group::HelmRelease status"
+            docker exec "$SANDBOX_NAME" sh -c 'kubectl get hr -A -o wide 2>&1 | tail -100' || true
+            echo "::endgroup::"
+            echo "::group::not-Ready HelmReleases"
+            docker exec "$SANDBOX_NAME" sh -c 'kubectl get hr -A --no-headers 2>/dev/null | awk "\$4 != \"True\" {print \$1\" \"\$2}"' \
+              | while read -r ns name; do
+                  echo "--- $ns/$name ---"
+                  docker exec "$SANDBOX_NAME" sh -c "kubectl describe hr '$name' -n '$ns' 2>&1 | tail -50" || true
+                done
+            echo "::endgroup::"
+            exit 1
+          fi
+
+      - name: Run OpenAPI tests
+        run: |
+          make -C packages/core/testing SANDBOX_NAME=$SANDBOX_NAME test-openapi
+
+      # Always the FULL app suite — a nightly has no diff to scope against, so
+      # Test Impact Analysis does not apply (empty CHAINSAW_SUITES = whole suite).
+      - name: Run E2E tests (full suite)
+        env:
+          COZY_E2E_STORAGE_CLASS: local
+        run: |
+          if ! make -C packages/core/testing SANDBOX_NAME=$SANDBOX_NAME test-chainsaw CHAINSAW_SUITES=""; then
+            echo "❌ Chainsaw E2E failed (see the assertion diffs or LEAKED-PODS lines above and diagnostics below)"
+            echo "::group::Diagnostics: HelmRelease status"
+            docker exec "$SANDBOX_NAME" sh -c 'kubectl get hr -A -o wide 2>&1 | tail -50' || true
+            echo "::endgroup::"
+            echo "::group::Diagnostics: recent events"
+            docker exec "$SANDBOX_NAME" sh -c 'kubectl get events -A --sort-by=.lastTimestamp 2>&1 | tail -30' || true
+            echo "::endgroup::"
+            exit 1
+          fi
+          echo "✅ All E2E tests passed"
+
+      - name: Collect chainsaw report
+        if: always()
+        run: |
+          mkdir -p _out
+          docker cp "$SANDBOX_NAME":/workspace/hack/e2e-chainsaw/chainsaw-report.xml \
+            _out/chainsaw-report.xml || true
+
+      - name: Upload chainsaw report
+        if: always()
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
+        with:
+          name: chainsaw-report
+          path: _out/chainsaw-report.xml
+          if-no-files-found: ignore
+
+      # A ceiling of its own, not the job's 215 minutes. `Upload cozyreport.tgz`
+      # is the next step and the collector writes its tarball at the very end of
+      # its run, so a read that never returns spends what is left of the job
+      # budget, the job is cancelled, and the upload never runs -- the artifact
+      # is lost rather than truncated. 30 minutes is measured against the step:
+      # it takes 3-42s across sampled runs, failed e2e jobs included.
+      # `continue-on-error` because the ceiling must not change what the job
+      # reports: `|| true` says collecting diagnostics is never fatal, and a step
+      # killed at its ceiling never reaches it.
+      - name: Collect report
+        id: collect_report
+        if: always()
+        timeout-minutes: 30
+        continue-on-error: true
+        run: |
+          make -C packages/core/testing SANDBOX_NAME=$SANDBOX_NAME collect-report || true
+
+      # `continue-on-error` keeps the overrun out of the job's result, which also
+      # keeps it out of everyone's view: a step that ended at its ceiling renders
+      # green and the only trace is in the raw log. This branch's own standard is
+      # that a bound which fires is recorded, and that has to hold for the outer
+      # bound too.
+      #
+      # The wording says what `outcome` establishes and no more: a step can end
+      # non-zero without any ceiling firing, so naming the timeout as the cause
+      # would be the false-mechanism claim the collector refuses to make for a 137.
+      - name: Report collection overran its ceiling
+        if: always() && steps.collect_report.outcome == 'failure'
+        run: |
+          echo "::warning title=cozyreport::Collect report ended non-zero -- its timeout-minutes fired, or the step failed before the collector ran; cozyreport.tgz is missing or partial for this run"
+
+      - name: Upload cozyreport.tgz
+        if: always()
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
+        with:
+          name: cozyreport
+          path: _out/cozyreport.tgz
+          if-no-files-found: warn
+
+      # The compose project owns the nodes and the zpools outlive it, so both
+      # halves go, in this order.
+      - name: Tear down sandbox
+        if: always()
+        run: |
+          make -C packages/core/testing SANDBOX_NAME="$SANDBOX_NAME" delete-cluster-container || true
+          make -C packages/core/testing SANDBOX_NAME="$SANDBOX_NAME" delete || true
diff --git a/.github/workflows/pr-labeler.yaml b/.github/workflows/pr-labeler.yaml
index 63696fddfd..a241b81699 100644
--- a/.github/workflows/pr-labeler.yaml
+++ b/.github/workflows/pr-labeler.yaml
@@ -2,18 +2,25 @@ name: PR Auto-Label
 
 on:
   pull_request_target:
-    types: [opened, edited, reopened, synchronize]
+    # Note: 'edited' is intentionally omitted. It fires on every PR body edit,
+    # which causes long-lived bot PRs (e.g. Renovate) to re-run this job dozens
+    # of times on an unchanged commit. Labels are re-applied on the next push
+    # (synchronize) or reopen instead.
+    types: [opened, reopened, synchronize]
 
+# Top-level token defaults to read-only. A job-level block replaces this one
+# rather than adding to it, so each job restates every scope it needs.
 permissions:
   contents: read
-  pull-requests: write
 
 jobs:
   label:
     runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
     steps:
       - name: Apply labels from PR title
-        uses: actions/github-script@v7
+        uses: actions/github-script@f28e40c7f34bde8b3046d885e986cb6290c5673b # v7
         with:
           script: |
             // Conventional Commits types accepted by Cozystack (per docs/agents/contributing.md):
@@ -34,6 +41,7 @@ jobs:
               // area/api
               'api':                 'area/api',
               'cozystack-api':       'area/api',
+              'registry':            'area/api',
 
               // area/ai
               'agents':              'area/ai',
@@ -44,9 +52,24 @@ jobs:
 
               // area/ci
               'ci':                  'area/ci',
+              'workflows':           'area/ci',
+              'labeler':             'area/ci',
+
+              // area/dependencies — Renovate uses scope `deps` (see .github/renovate.json)
+              'deps':                'area/dependencies',
+              'dependencies':        'area/dependencies',
+              'renovate':            'area/dependencies',
+
+              // area/dx — developer tooling: hack/, package Makefiles, cozypkg
+              'dx':                  'area/dx',
+              'hack':                'area/dx',
+              'cozypkg':             'area/dx',
 
               // area/dashboard
               'dashboard':           'area/dashboard',
+              'cozystack-ui':        'area/dashboard',
+              'console':             'area/dashboard',
+              'dashboard-controller': 'area/dashboard',
 
               // area/database
               'postgres':            'area/database',
@@ -54,38 +77,74 @@ jobs:
               'mariadb':             'area/database',
               'mariadb-operator':    'area/database',
               'redis':               'area/database',
+              'valkey':              'area/database',
               'etcd':                'area/database',
               'kafka':               'area/database',
               'clickhouse':          'area/database',
+              'mongodb':             'area/database',
+              'rabbitmq':            'area/database',
+              'nats':                'area/database',
+              'qdrant':              'area/database',
+              'foundationdb':        'area/database',
+              'database':            'area/database',
+              'etcd-operator':       'area/database',
+              'opensearch':          'area/database',
+              'opensearch-operator': 'area/database',
 
               // area/extra
               'extra':               'area/extra',
 
+              // area/kamaji
+              'kamaji':              'area/kamaji',
+
+              // area/keycloak
+              'keycloak':            'area/keycloak',
+              'keycloak-configure':  'area/keycloak',
+
               // area/kubernetes
               'kubernetes':          'area/kubernetes',
               'apps/kubernetes':     'area/kubernetes',
+              'kubernetes-nodes':    'area/kubernetes',
 
               // area/monitoring
               'monitoring':          'area/monitoring',
+              'metrics-server':      'area/monitoring',
               'vlogs':               'area/monitoring',
               'vmstack':             'area/monitoring',
               'grafana':             'area/monitoring',
               'workloadmonitor':     'area/monitoring',
+              'monitoring-agents':   'area/monitoring',
 
               // area/networking
               'ingress':             'area/networking',
               'ingress-nginx':       'area/networking',
               'gateway':             'area/networking',
               'vpn':                 'area/networking',
+              'vpc':                 'area/networking',
               'metallb':             'area/networking',
-              'cilium':              'area/networking',
               'kube-ovn':            'area/networking',
+              'kubeovn-webhook':     'area/networking',
               'tcp-balancer':        'area/networking',
               'securitygroups':      'area/networking',
               'cozy-proxy':          'area/networking',
+              'networking':          'area/networking',
+              'kubeovn':             'area/networking',
+              'multus':              'area/networking',
+              'kilo':                'area/networking',
+              'hetzner-robotlb':     'area/networking',
+              'ouroboros':           'area/networking',
+
+              // area/cilium
+              'cilium':              'area/cilium',
+
+              // area/openbao
+              'openbao':             'area/openbao',
+              'openbao-central':     'area/openbao',
 
               // area/platform
               'platform':            'area/platform',
+              'cert-manager':        'area/platform',
+              'external-secrets':    'area/platform',
               'bundle':              'area/platform',
               'flux':                'area/platform',
               'fluxcd':              'area/platform',
@@ -95,32 +154,64 @@ jobs:
               'cozyctl':             'area/platform',
               'cozystack-engine':    'area/platform',
               'cozy-lib':            'area/platform',
+              'operator':            'area/platform',
+              'cozystack-operator':  'area/platform',
+              'controller':          'area/platform',
+              'cozystack-controller': 'area/platform',
+              'cozystack-basics':    'area/platform',
+              'flux-shard-operator': 'area/platform',
+              'lineage':             'area/platform',
+              'migrations':          'area/platform',
+              'scheduler':           'area/platform',
+              'cozystack-scheduler': 'area/platform',
+              'reloader':            'area/platform',
+              'bootbox':             'area/platform',
 
               // area/release
               'backport':            'area/release',
               'release':             'area/release',
+              'changelog':           'area/release',
+              'changelogs':          'area/release',
 
               // area/storage
               'seaweedfs':           'area/storage',
               'seaweedfs-cosi-driver': 'area/storage',
+              'objectstorage-controller': 'area/storage',
               'bucket':              'area/storage',
               'linstor':             'area/storage',
               'velero':              'area/storage',
               'harbor':              'area/storage',
               'backups':             'area/storage',
+              'csi':                 'area/storage',
+              'storage':             'area/storage',
+              'piraeus-operator':    'area/storage',
+              'backupstrategy-controller': 'area/storage',
+              'local-storage':       'area/storage',
+
+              // area/tenant
+              'tenant':              'area/tenant',
 
               // area/testing
               'tests':               'area/testing',
               'e2e':                 'area/testing',
+              'testing':             'area/testing',
 
               // area/virtualization
               'kubevirt':            'area/virtualization',
               'cdi':                 'area/virtualization',
               'vmi':                 'area/virtualization',
               'vm-import':           'area/virtualization',
+              'migration':           'area/virtualization',
+              'vm-instance':         'area/virtualization',
+              'vm-disk':             'area/virtualization',
               'virtual-machine':     'area/virtualization',
               'hami':                'area/virtualization',
               'gpu-operator':        'area/virtualization',
+              'virtualization':      'area/virtualization',
+              'vm':                  'area/virtualization',
+              'kubevirt-operator':   'area/virtualization',
+              'kubevirt-cdi':        'area/virtualization',
+              'kubevirt-instancetypes': 'area/virtualization',
             };
 
             const pr = context.payload.pull_request;
@@ -129,10 +220,10 @@ jobs:
             const existing = new Set((pr.labels || []).map(l => l.name));
             const toAdd = new Set();
 
-            // 1. Strip "[Backport release-1.x]" prefix if present.
-            const backportMatch = title.match(/^\[Backport ([^\]]+)\]\s+(.+)$/);
-            const cleanTitle = backportMatch ? backportMatch[2] : title;
-            if (backportMatch) {
+            // 1. Strip every leading "[Backport release-1.x]" prefix: a backport of
+            // a backport carries two, and a leftover one would be parsed as the scope.
+            const cleanTitle = title.replace(/^(?:\[Backport [^\]]+\]\s+)+/, '');
+            if (cleanTitle !== title) {
               toAdd.add('area/release');
             }
 
@@ -158,7 +249,9 @@ jobs:
 
             // 5. Apply kind/* from type.
             if (type) {
-              if (typeToKind[type]) {
+              // Object.hasOwn: a title typed or scoped `constructor` would otherwise
+              // resolve to an Object.prototype member instead of to nothing.
+              if (Object.hasOwn(typeToKind, type)) {
                 toAdd.add(typeToKind[type]);
               } else {
                 core.warning(`type "${type}" has no kind/* mapping — typo or new type? See .github/workflows/pr-labeler.yaml typeToKind`);
@@ -171,7 +264,7 @@ jobs:
               .map(s => s.trim())
               .filter(Boolean);
             for (const s of scopes) {
-              if (scopeToArea[s]) {
+              if (Object.hasOwn(scopeToArea, s)) {
                 toAdd.add(scopeToArea[s]);
               } else {
                 core.warning(`scope "${s}" has no area/* mapping — consider extending scopeToArea in .github/workflows/pr-labeler.yaml if it recurs`);
diff --git a/.github/workflows/pr-size.yaml b/.github/workflows/pr-size.yaml
index 99b27e0317..78b8601fcc 100644
--- a/.github/workflows/pr-size.yaml
+++ b/.github/workflows/pr-size.yaml
@@ -4,9 +4,10 @@ on:
   pull_request_target:
     types: [opened, synchronize, reopened]
 
+# Top-level token defaults to read-only. A job-level block replaces this one
+# rather than adding to it, so each job restates every scope it needs.
 permissions:
   contents: read
-  pull-requests: write
 
 concurrency:
   group: pr-size-${{ github.event.pull_request.number }}
@@ -15,8 +16,10 @@ concurrency:
 jobs:
   size:
     runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
     steps:
-      - uses: actions/github-script@v7
+      - uses: actions/github-script@f28e40c7f34bde8b3046d885e986cb6290c5673b # v7
         with:
           script: |
             const pr = context.payload.pull_request;
diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
index 10ef95777f..dbec873fb6 100644
--- a/.github/workflows/pre-commit.yml
+++ b/.github/workflows/pre-commit.yml
@@ -8,18 +8,28 @@ concurrency:
   group: pre-commit-${{ github.workflow }}-${{ github.event.pull_request.number }}
   cancel-in-progress: true
 
+# Top-level token defaults to read-only. A job-level block replaces this one
+# rather than adding to it, so each job restates every scope it needs.
+permissions:
+  contents: read
+
 jobs:
   pre-commit:
     runs-on: ubuntu-22.04
+    env:
+      # The pipe falls back to direct on any proxy error (hack/common-envs.mk).
+      GOPROXY: "https://proxy.golang.org|direct"
+    permissions:
+      contents: read
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@a37ce9120846195fa4ece8f58b268e6043cb2f26 # v3
         with:
           fetch-depth: 0
           fetch-tags: true
 
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@7f4fc3e22c37d6ff65e88745f38bd3157c663f7c # v4
         with:
           python-version: '3.11'
 
@@ -27,7 +37,7 @@ jobs:
         run: pip install pre-commit
 
       - name: Set up Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@40f1582b2485089dde7abd97c1529aa768e1baff # v5
         with:
           go-version-file: go.mod
           cache: true
@@ -47,9 +57,12 @@ jobs:
 
       - name: Install generate
         run: |
-          curl -sSL https://github.com/cozystack/cozyvalues-gen/releases/download/v1.6.0/cozyvalues-gen-linux-amd64.tar.gz | tar -xzvf- -C /usr/local/bin/ cozyvalues-gen
+          curl -sSL https://github.com/cozystack/cozyvalues-gen/releases/download/v1.7.0/cozyvalues-gen-linux-amd64.tar.gz | tar -xzvf- -C /usr/local/bin/ cozyvalues-gen
 
       - name: Run pre-commit hooks
+        # The complete Bats pass is a manual local hook and is therefore outside
+        # this changed-file lint run. pull-requests.yaml's checks job runs the
+        # full unit path for code and the Bats contracts for docs-only changes.
         run: |
           git fetch origin main || git fetch origin master
           base_commit=$(git rev-parse --verify origin/main || git rev-parse --verify origin/master || echo "")
@@ -65,3 +78,64 @@ jobs:
           else
             echo "No YAML or Markdown files to lint"
           fi
+
+  # Commit-message lint for the attribution rules in docs/agents/contributing.md
+  # that a reviewer would otherwise have to read `git log` to catch. It lives
+  # here rather than in the unit-test job of pull-requests.yaml, which is gated
+  # on the diff touching code and so skips a docs-only PR entirely; a trailer is
+  # wrong or right regardless of which files the commit changed.
+  commit-trailers:
+    name: Commit trailers
+    runs-on: ubuntu-22.04
+    permissions:
+      contents: read
+    # A backport PR is the one shape whose author cannot fix a finding: the
+    # backport action cherry-picks merged commits verbatim, so their messages
+    # are history, and roughly a quarter of the commits on main predate the
+    # rule. Matched on the branch name the action generates,
+    # backport-<pr>-to-<branch>, rather than on the prefix alone; the label that
+    # asks for a backport sits on the original PR, not on the generated one, so
+    # a branch name is the only signal a pull_request event carries. That makes
+    # the exemption a convention rather than something enforced: anyone can name
+    # a branch this way. Every other PR, fork included, is checked.
+    if: ${{ !(startsWith(github.head_ref, 'backport-') && contains(github.head_ref, '-to-')) }}
+    steps:
+      - name: Checkout head
+        uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
+          fetch-depth: 0
+          persist-credentials: false
+
+      - name: Check commit trailers
+        env:
+          BASE_REF: ${{ github.event.pull_request.base.ref }}
+          HEAD_SHA: ${{ github.event.pull_request.head.sha }}
+        run: |
+          set -euo pipefail
+          # The merge base, not the base branch tip: commits landing on the base
+          # branch while the PR is open are not this PR's to answer for. It is
+          # recomputed every run, so a rebased or force-pushed branch is read as
+          # it now is rather than as some earlier walk back from HEAD.
+          # origin/$BASE_REF is already here: fetch-depth 0 makes the checkout
+          # fetch +refs/heads/*:refs/remotes/origin/*.
+          base="$(git merge-base "$HEAD_SHA" "origin/$BASE_REF")"
+
+          # The checker is read from the base branch, never from the checked-out
+          # PR tree. A pull_request event takes the workflow definition from the
+          # merge of base and head, so the moment this job exists on the base
+          # branch it runs on every open PR — including the ones whose head
+          # predates the script, where reading it from the head would be exit
+          # 127 and a red check saying nothing about trailers. It also puts the
+          # checker out of reach of the PR being measured — the job around it
+          # is not, since the workflow definition comes from that same merge.
+          # Before the script exists on the base branch there is nothing to read
+          # there, so that one window runs the copy under review.
+          checker="$RUNNER_TEMP/check-commit-trailers.sh"
+          if git cat-file -e "origin/$BASE_REF:hack/check-commit-trailers.sh" 2>/dev/null; then
+            git show "origin/$BASE_REF:hack/check-commit-trailers.sh" > "$checker"
+          else
+            echo "::notice::checker absent from $BASE_REF; running the copy from this pull request"
+            cp hack/check-commit-trailers.sh "$checker"
+          fi
+          bash "$checker" "$base..$HEAD_SHA"
diff --git a/.github/workflows/promote-rc.yaml b/.github/workflows/promote-rc.yaml
new file mode 100644
index 0000000000..cac6921396
--- /dev/null
+++ b/.github/workflows/promote-rc.yaml
@@ -0,0 +1,1030 @@
+name: Promote RC
+
+# Bless a release-candidate as stable WITHOUT rebuilding it.
+#
+# A stable release promotes the release-candidate's executable bytes: every
+# container digest shipped as vX.Y.Z is bit-for-bit what passed rc e2e. The
+# declarative packages artifact is re-serialized after its rc tag strings are
+# rewritten to stable, then verified before any stable name is created.
+#
+# Promotion CREATES NO STABLE NAME before merge. This is weaker than the "no
+# registry mutation at dispatch" this workflow used to promise, and the
+# difference is deliberate rather than a slip: the dispatch does now write to
+# the registry, publishing one `promotion-*` packages candidate, and that tag is
+# real and publicly listable. What it is not is a name anything resolves — no
+# vX.Y.Z, no :latest, no stable installer chart. Say it that way round; the
+# older phrasing only reads as true if you already know which writes are meant.
+#
+# So the dispatch re-serializes the tag-rewritten packages tree under that
+# temporary tag, pins its digest in the release-X.Y.Z staging branch, drafts the
+# stable release with restamped assets, and opens the release-X.Y.Z PR. The rc's
+# mandatory full e2e is verified before staging; the promote PR does not repeat
+# it by default. Finalize verifies the pinned candidate against the merged tree
+# before performing any stable-named registry or git side effect. An abandoned
+# promotion therefore leaves only an overwritable draft + branch and a
+# temporary artifact, which retention protects until it is retagged stable and
+# can prune once nothing references it.
+#
+# Triggered manually once an rc has gone green. The stable git tag is never
+# pushed by a human and never force-moved — it is created only at PR merge,
+# against a commit that did not exist before this PR opened.
+
+on:
+  workflow_dispatch:
+    inputs:
+      rc_tag:
+        description: "Release-candidate tag to promote, e.g. v1.4.0-rc.2"
+        required: true
+        type: string
+      skip_e2e_gate:
+        description: "BYPASS the required green rc E2E check (emergency use only)"
+        required: false
+        default: false
+        type: boolean
+
+concurrency:
+  # Serialize ALL promotions. Keying on the rc tag would parallelize the
+  # dangerous case: promote(rc.1) and promote(rc.2) of the SAME version racing
+  # to force-push the release-X.Y.Z branch and (re)stage the same stable draft.
+  # Promotions are rare, so one global lane costs nothing and is race-free.
+  # (The image retag itself now runs in pull-requests-release.yaml finalize,
+  # post-merge, where the single release-X.Y.Z PR guarantees a single run.)
+  group: promote-rc
+  cancel-in-progress: false
+
+# Read-only by default; each job widens only what it needs (see per-job blocks).
+permissions:
+  contents: read
+
+jobs:
+  # Cheap front door: validate the dispatch input ONCE and derive every release
+  # identifier, before any heavy job starts. Both `promote` and `changelog`
+  # depend on this, so they still run in parallel with each other (this job takes
+  # seconds) while consuming ONE validated tag — no divergent second parse.
+  # Whitespace is rejected outright (not trimmed), matching hack/parse-rc-tag.sh
+  # and the reusable core: a non-canonical spelling is an immediate dispatch
+  # failure, so promote and the changelog job can never disagree about whether the
+  # tag is valid — the divergence that previously left a promote PR with no
+  # changelog.
+  parse:
+    name: Parse and validate rc tag
+    runs-on: ubuntu-latest
+    timeout-minutes: 5
+    permissions:
+      actions: read # list tags.yaml / e2e-tag.yaml runs and their jobs for the rc E2E gate
+      contents: read
+    outputs:
+      rc_tag: ${{ steps.parse.outputs.rc_tag }}
+      rc_version: ${{ steps.parse.outputs.rc_version }}
+      stable_tag: ${{ steps.parse.outputs.stable_tag }}
+      stable_version: ${{ steps.parse.outputs.stable_version }}
+      stable_branch: ${{ steps.parse.outputs.stable_branch }}
+      rc_branch: ${{ steps.parse.outputs.rc_branch }}
+      line: ${{ steps.parse.outputs.line }}
+      e2e_verification: ${{ steps.e2e-gate.outputs.verification || steps.e2e-bypass.outputs.verification }}
+    steps:
+      # Validate the dispatch input against a strict rc pattern before it ever
+      # reaches a shell or an API call. Derives the stable version, the rc
+      # staging branch, and the maintenance line.
+      - name: Parse and validate rc tag
+        id: parse
+        env:
+          RC_TAG: ${{ inputs.rc_tag }}
+        uses: actions/github-script@f28e40c7f34bde8b3046d885e986cb6290c5673b # v7
+        with:
+          script: |
+            const rc = process.env.RC_TAG;
+            // Reject whitespace outright rather than trimming it. Trimming would
+            // accept ' v1.4.0-rc.2 ' here while the parallel changelog job — which
+            // rejects whitespace — refuses the same input, so promote would push
+            // the stable branch and open-pr would open a PR with no changelog. One
+            // policy everywhere: non-canonical spelling = dispatch failure.
+            if (/\s/.test(rc)) {
+              core.setFailed(`rc_tag '${rc}' must not contain whitespace`);
+              return;
+            }
+            const m = rc.match(/^v(\d+)\.(\d+)\.(\d+)-rc\.(\d+)$/);
+            if (!m) {
+              core.setFailed(`rc_tag '${rc}' must match 'vX.Y.Z-rc.N'`);
+              return;
+            }
+            const [maj, min, patch] = [m[1], m[2], m[3]];
+            const version = `${maj}.${min}.${patch}`;
+            core.setOutput('rc_tag', rc);
+            core.setOutput('rc_version', `${version}-rc.${m[4]}`);   // 1.4.0-rc.2
+            core.setOutput('stable_tag', `v${version}`);             // v1.4.0
+            core.setOutput('stable_version', version);               // 1.4.0
+            core.setOutput('rc_branch', `release-${version}-rc.${m[4]}`);
+            core.setOutput('stable_branch', `release-${version}`);
+            core.setOutput('line', `${maj}.${min}`);
+
+      # Keep the check in this front-door job: both staging paths already need
+      # parse, so a red/missing rc E2E stops promote and changelog before either
+      # can write anything. GitHub's jobs API names a called-workflow job as
+      # "<caller job name> / <called workflow job name>"; direct dispatch jobs
+      # expose only the called job name. The suffix matcher deliberately accepts
+      # both forms.
+      #
+      # e2e-tag.yaml has no run-name and its workflow name is constant, so a
+      # dispatch run's title cannot identify inputs.tag. The expanded E2E job
+      # name is the strongest API-visible correlator because it embeds the exact
+      # validated tag. Its failure modes are Actions retention/deletion removing
+      # the run/job metadata, or a future rename of that job without updating
+      # this matcher; either case fails closed and can be recovered by running
+      # the E2E Release Tag button again.
+      - name: Verify green RC E2E
+        id: e2e-gate
+        if: ${{ !inputs.skip_e2e_gate }}
+        uses: actions/github-script@f28e40c7f34bde8b3046d885e986cb6290c5673b # v7
+        env:
+          RC_TAG: ${{ steps.parse.outputs.rc_tag }}
+        with:
+          github-token: ${{ github.token }}
+          script: |
+            const rcTag = process.env.RC_TAG;
+            const expectedJob = `E2E ${rcTag} (full suite)`;
+            const matchesE2EJob = (name) =>
+              name === expectedJob || name.endsWith(` / ${expectedJob}`);
+            const jobsForRun = (runId) => github.paginate(
+              github.rest.actions.listJobsForWorkflowRun,
+              {
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                run_id: runId,
+                filter: 'latest',
+                per_page: 100
+              }
+            );
+
+            // Evidence A: only the latest tags.yaml push run for this tag counts.
+            const tagRunsResponse = await github.rest.actions.listWorkflowRuns({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              workflow_id: 'tags.yaml',
+              branch: rcTag,
+              event: 'push',
+              per_page: 100
+            });
+            const latestTagRun = tagRunsResponse.data.workflow_runs.find(
+              (run) => run.head_branch === rcTag
+            );
+            let tagEvidence = `no tags.yaml push run found with head_branch '${rcTag}'`;
+            if (latestTagRun) {
+              const jobs = await jobsForRun(latestTagRun.id);
+              const matches = jobs.filter((job) => matchesE2EJob(job.name));
+              tagEvidence = `latest tags.yaml run ${latestTagRun.html_url} (${latestTagRun.status}/${latestTagRun.conclusion || 'no conclusion'}), matching jobs: ${
+                matches.length
+                  ? matches.map((job) => `'${job.name}'=${job.conclusion || job.status}`).join(', ')
+                  : 'none'
+              }`;
+              core.info(`Evidence A: ${tagEvidence}`);
+              if (matches.some((job) => job.conclusion === 'success')) {
+                core.setOutput('verification', 'verified');
+                core.notice(`✅ Verified green rc E2E for ${rcTag} via the latest tags.yaml run.`);
+                await core.summary
+                  .addRaw(`✅ RC full E2E verified for \`${rcTag}\` via the latest \`tags.yaml\` run.`)
+                  .write();
+                return;
+              }
+            } else {
+              core.info(`Evidence A: ${tagEvidence}`);
+            }
+
+            // Evidence B: dispatch run titles are all "E2E Release Tag", so walk
+            // retained successful dispatch runs and correlate by the expanded
+            // tag-bearing job name instead.
+            const dispatchRuns = await github.paginate(
+              github.rest.actions.listWorkflowRuns,
+              {
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                workflow_id: 'e2e-tag.yaml',
+                event: 'workflow_dispatch',
+                status: 'success',
+                per_page: 100
+              }
+            );
+            let dispatchMatch;
+            for (const run of dispatchRuns) {
+              const jobs = await jobsForRun(run.id);
+              const job = jobs.find(
+                (candidate) =>
+                  matchesE2EJob(candidate.name) &&
+                  candidate.conclusion === 'success'
+              );
+              if (job) {
+                dispatchMatch = {run, job};
+                break;
+              }
+            }
+
+            if (dispatchMatch) {
+              core.info(
+                `Evidence B: ${dispatchMatch.run.html_url}, job '${dispatchMatch.job.name}'=${dispatchMatch.job.conclusion}`
+              );
+              core.setOutput('verification', 'verified');
+              core.notice(`✅ Verified green rc E2E for ${rcTag} via an e2e-tag.yaml workflow_dispatch run.`);
+              await core.summary
+                .addRaw(`✅ RC full E2E verified for \`${rcTag}\` via a manual \`e2e-tag.yaml\` run.`)
+                .write();
+              return;
+            }
+
+            const dispatchEvidence = `${dispatchRuns.length} retained successful e2e-tag.yaml workflow_dispatch run(s), none with a successful '${expectedJob}' job`;
+            core.info(`Evidence B: ${dispatchEvidence}`);
+            core.setFailed(
+              `RC '${rcTag}' has no green full E2E evidence. Checked evidence A: ${tagEvidence}. Checked evidence B: ${dispatchEvidence}. Run the "E2E Release Tag" Actions button for '${rcTag}', or re-dispatch Promote RC with skip_e2e_gate=true only if you intentionally accept the emergency bypass.`
+            );
+
+      - name: Bypass RC E2E gate (emergency override)
+        id: e2e-bypass
+        if: ${{ inputs.skip_e2e_gate }}
+        env:
+          RC_TAG: ${{ steps.parse.outputs.rc_tag }}
+        run: |
+          echo "verification=bypassed" >> "$GITHUB_OUTPUT"
+          echo "::warning title=RC E2E GATE BYPASSED::Promoting ${RC_TAG} without verified green full E2E evidence."
+          printf '## ⚠️ RC E2E gate bypassed\n\n`%s` is being promoted without verified green full E2E evidence.\n' "$RC_TAG" >> "$GITHUB_STEP_SUMMARY"
+
+  promote:
+    name: Promote ${{ needs.parse.outputs.rc_tag }}
+    needs: parse
+    runs-on: [oracle-vm-4cpu-16gb-x86-64]
+    timeout-minutes: 45
+    env:
+      # The pipe falls back to direct on any proxy error (hack/common-envs.mk).
+      GOPROXY: "https://proxy.golang.org|direct"
+    permissions:
+      contents: write # push the release-X.Y.Z staging branch, stage the draft release
+      packages: write # publish the temporary stable-candidate packages artifact
+      pull-requests: write # reserved for parity; the PR is opened in open-pr
+
+    # open-pr reads these from `promote`, which passes the parse job's validated
+    # outputs straight through.
+    outputs:
+      rc_tag: ${{ needs.parse.outputs.rc_tag }}
+      stable_tag: ${{ needs.parse.outputs.stable_tag }}
+      stable_version: ${{ needs.parse.outputs.stable_version }}
+      stable_branch: ${{ needs.parse.outputs.stable_branch }}
+      line: ${{ needs.parse.outputs.line }}
+      e2e_verification: ${{ needs.parse.outputs.e2e_verification }}
+      base_branch: ${{ steps.validate.outputs.base_branch }}
+
+    steps:
+      - name: Generate GitHub App token
+        id: app-token
+        uses: actions/create-github-app-token@d72941d797fd3113feb6b93fd0dec494b13a2547 # v1
+        with:
+          app-id: ${{ secrets.COZYSTACK_CI_APP_ID }}
+          private-key: ${{ secrets.COZYSTACK_CI_PRIVATE_KEY }}
+          owner: cozystack
+          # Scope the token to this repo only — it never touches other repos.
+          repositories: ${{ github.event.repository.name }}
+
+      # Gate: the rc must exist as a (draft) release and the stable tag must NOT
+      # exist yet. Refuse to promote twice or to an already-shipped version.
+      - name: Validate rc is promotable
+        uses: actions/github-script@f28e40c7f34bde8b3046d885e986cb6290c5673b # v7
+        with:
+          github-token: ${{ steps.app-token.outputs.token }}
+          script: |
+            const rcTag     = '${{ needs.parse.outputs.rc_tag }}';
+            const stableTag = '${{ needs.parse.outputs.stable_tag }}';
+            const releases  = await github.paginate(github.rest.repos.listReleases, {
+              owner: context.repo.owner, repo: context.repo.repo, per_page: 100
+            });
+            const rcRel = releases.find(r => r.tag_name === rcTag);
+            if (!rcRel) {
+              core.setFailed(`No release found for rc '${rcTag}' — has it been built?`);
+              return;
+            }
+            // Reject only a *published* stable release. A leftover *draft* is
+            // tolerated: promotion creates no consumer-visible stable registry
+            // name at dispatch time (retag/chart/:latest all run in finalize,
+            // post-merge), so an abandoned promotion leaves an overwritable
+            // draft + staging branch and a temporary retention-managed packages
+            // candidate. Failing on the draft would wedge re-promotion of a newer
+            // rc to the same version; instead the draft is refreshed below.
+            const publishedStable = releases.find(r => r.tag_name === stableTag && !r.draft);
+            if (publishedStable) {
+              core.setFailed(`Stable release '${stableTag}' is already published — refusing to re-promote.`);
+              return;
+            }
+            // The stable git tag must not pre-exist either: finalize creates it
+            // write-once at the PR merge commit, so a stray tag (from a manual
+            // push) would only fail that step after merge. Catch it here.
+            try {
+              await github.rest.git.getRef({
+                owner: context.repo.owner, repo: context.repo.repo,
+                ref: `tags/${stableTag}`
+              });
+              core.setFailed(`Stable tag '${stableTag}' already exists — refusing to re-promote.`);
+              return;
+            } catch (e) {
+              if (e.status !== 404) throw e;
+            }
+            // A maintenance branch created before the candidate pipeline landed
+            // would execute its old pull_request workflows after merge. Refuse
+            // before the first registry write unless the actual target base has
+            // both trusted verification gates and their helpers. Backport this
+            // change to an existing release-X.Y line before promoting its next
+            // patch; the rc-derived head does not need to carry the tooling.
+            //
+            // Every file the base-checked-out verifier reaches for belongs in
+            // the list below, its own sourced libraries included: those are
+            // resolved relative to the verifier at run time, so a base carrying
+            // the script without them fails at the PR gate and at finalize —
+            // after the candidate, the staging branch and the draft exist.
+            const line = '${{ needs.parse.outputs.line }}';
+            let baseBranch = 'main';
+            try {
+              await github.rest.git.getRef({
+                owner: context.repo.owner, repo: context.repo.repo,
+                ref: `heads/release-${line}`
+              });
+              baseBranch = `release-${line}`;
+            } catch (e) {
+              if (e.status !== 404) throw e;
+            }
+            const requiredBaseFiles = [
+              ['.github/workflows/pull-requests.yaml', 'verify-release-candidate:'],
+              ['.github/workflows/pull-requests-release.yaml', 'Verify stable packages candidate'],
+              ['hack/verify-promoted-packages.sh', 'EXPECTED_PACKAGES_REPOSITORY'],
+              ['hack/lib/image-refs.sh', 'collect_image_refs()'],
+              ['hack/lib/promoted-packages.sh', 'PACKAGES_DIGEST_REF_PATTERN'],
+            ];
+            for (const [path, marker] of requiredBaseFiles) {
+              let file;
+              try {
+                file = await github.rest.repos.getContent({
+                  owner: context.repo.owner, repo: context.repo.repo,
+                  path, ref: baseBranch
+                });
+              } catch (e) {
+                if (e.status === 404) {
+                  core.setFailed(`Target base '${baseBranch}' lacks '${path}'. Backport the candidate-aware promotion pipeline before dispatch.`);
+                  return;
+                }
+                throw e;
+              }
+              if (Array.isArray(file.data) || !file.data.content) {
+                core.setFailed(`Target base '${baseBranch}' did not return '${path}' as a file.`);
+                return;
+              }
+              const content = Buffer.from(file.data.content, 'base64').toString('utf8');
+              if (!content.includes(marker)) {
+                core.setFailed(`Target base '${baseBranch}' has an old '${path}'. Backport the candidate-aware promotion pipeline before dispatch.`);
+                return;
+              }
+            }
+            core.setOutput('base_branch', baseBranch);
+            core.info(`✅ Target base '${baseBranch}' carries the candidate-aware promotion pipeline.`);
+            // Surface the rc's disk asset id for the copy step.
+            const disk = (rcRel.assets || []).find(a => a.name === 'nocloud-amd64.raw.xz');
+            if (!disk) {
+              core.setFailed(`rc release '${rcTag}' has no nocloud-amd64.raw.xz asset.`);
+              return;
+            }
+            core.setOutput('disk_id', String(disk.id));
+        id: validate
+
+      # The rc's digest-vendored tree (the staging branch the rc build pushed).
+      - name: Checkout rc staging branch
+        uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4
+        with:
+          ref: ${{ needs.parse.outputs.rc_branch }}
+          fetch-depth: 0
+          fetch-tags: true
+          token: ${{ steps.app-token.outputs.token }}
+          # The Prepare stable branch step re-injects the token via
+          # `git remote set-url`, so there's no need to persist it in .git/config.
+          persist-credentials: false
+
+      # Promotion publishes one non-consumer-visible packages candidate. Stable
+      # image/chart tags are still deferred to post-merge finalize.
+      #
+      # Both tools are version-pinned. These steps arm the only registry write
+      # the dispatch performs, so what performs it has to be a fixed input:
+      # `latest/download` resolves to whatever mikefarah shipped this morning,
+      # and a yq that changed how it emits or compares a value would rewrite
+      # installer values differently between two promotions of the same rc. The
+      # version tracks packages/core/testing/images/e2e-sandbox/Dockerfile.
+      #
+      # yq is additionally pinned BY CONTENT, which nothing else in this repo
+      # does. It earns the exception by being the one downloaded binary with
+      # write authority over what a release contains: it is what stamps the
+      # candidate digest into installer values. skopeo, helm and oras only move
+      # bytes that are already digest-addressed, so a substituted one is caught
+      # downstream; a substituted yq writes the wrong pin and everything after
+      # it verifies that pin faithfully. A committed SHA-256 is trust-on-first-
+      # use — it fixes the bytes to what a human checked when the version was
+      # chosen (against this release's own published checksums list) and makes
+      # any later substitution loud. Bump the version and this together.
+      #
+      # flux comes from the upstream setup action, pinned by commit and given
+      # an explicit version. It checks the release tarball against that
+      # release's checksums file and runs no script fetched at run time, the
+      # way fluxcd.io/install.sh did as root.
+      - name: Set up flux
+        uses: fluxcd/flux2/action@04acaec6161ac4fb1a82ffafa88901c03271d34f # v2.8.6
+        with:
+          version: "2.8.6"
+      - name: Set up toolchain (yq)
+        env:
+          YQ_VERSION: "4.53.3"
+          YQ_SHA256: "fa52a4e758c63d38299163fbdd1edfb4c4963247918bf9c1c5d31d84789eded4"
+        run: |
+          if ! yq --version 2>/dev/null | grep -q "mikefarah.* version v${YQ_VERSION}\$"; then
+            yq_bin="$(mktemp)"
+            curl -fsSL -o "$yq_bin" \
+              "https://github.com/mikefarah/yq/releases/download/v${YQ_VERSION}/yq_linux_amd64"
+            printf '%s  %s\n' "$YQ_SHA256" "$yq_bin" | sha256sum -c -
+            sudo install -m 0755 "$yq_bin" /usr/local/bin/yq
+            rm -f "$yq_bin"
+          fi
+
+      - name: Login to registry (GHCR)
+        uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3
+        with:
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+          registry: ghcr.io
+        env:
+          DOCKER_CONFIG: ${{ runner.temp }}/.docker
+
+      # A second checkout of the DISPATCH ref, used only as a source of release
+      # tooling. The primary checkout above is an older commit (the rc tag, or a
+      # branch derived from it) and does not carry hack/validate-changelog.sh or
+      # the current docs/agents/changelog.md — and a script fetched by a script
+      # that is itself missing solves nothing, so this is done declaratively by
+      # actions/checkout rather than by shelling out to the repo's own tooling.
+      # Gitignored, so promote's `git add -A` never stages it.
+      - name: Checkout release tooling from the dispatch ref
+        uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4
+        with:
+          ref: ${{ github.ref_name }}
+          path: .release-tooling
+          sparse-checkout: |
+            hack
+            docs/agents
+          persist-credentials: false
+
+      # Build the stable digest-vendored tree off the rc tree: the digests are
+      # unchanged (they pin the rc's images, which finalize retags to stable);
+      # only the cosmetic -rc.N substring in the image tag is rewritten to the
+      # stable version (decision A — the @sha256 wins regardless, this is for
+      # human readability).
+      - name: Prepare stable branch
+        env:
+          APP_TOKEN: ${{ steps.app-token.outputs.token }}
+          DOCKER_CONFIG: ${{ runner.temp }}/.docker
+          RC_VERSION: ${{ needs.parse.outputs.rc_version }}
+          STABLE_VERSION: ${{ needs.parse.outputs.stable_version }}
+          STABLE_BRANCH: ${{ needs.parse.outputs.stable_branch }}
+          RC_TAG: ${{ needs.parse.outputs.rc_tag }}
+          PROMOTION_ID: ${{ github.run_id }}-${{ github.run_attempt }}
+        run: |
+          git config user.name  "cozystack-ci[bot]"
+          git config user.email "274107086+cozystack-ci[bot]@users.noreply.github.com"
+          git remote set-url origin https://x-access-token:${APP_TOKEN}@github.com/${GITHUB_REPOSITORY}
+          # Rewrite the rc version substring -> stable in vendored image tags.
+          # The logic lives in a script, not inline here, so that
+          # hack/promote-rewrite-tags_test.bats can round-trip it against the
+          # real tree: this step's previous inline glob covered the depth-2
+          # values.yaml plus packages/apps/kubernetes/images/*.tag alone and
+          # silently left nine other .tag files and one stamped template on the
+          # rc version, which was only observable by cutting a release.
+          # The script fails if any rc reference survives it.
+          .release-tooling/hack/promote-rewrite-tags.sh "$RC_VERSION" "$STABLE_VERSION"
+          # Preserve a changelog already committed on the stable staging branch
+          # across the rebuild. -B below resets the branch to the rc tree, which
+          # would otherwise silently discard it — and the two ways it gets there
+          # are exactly the ones worth protecting: a maintainer hand-writing it
+          # (the documented escape hatch when generation fails) and an earlier
+          # dispatch's reviewed output. Losing either to a retry would replace
+          # human-edited release notes with a fresh AI run, or with nothing.
+          CL="docs/changelogs/v${STABLE_VERSION}.md"
+          PRESERVED="$(mktemp)"
+          if .release-tooling/hack/changelog-preserve.sh "${STABLE_BRANCH}" "${STABLE_VERSION}" "${PRESERVED}"; then
+            echo "::notice::Preserving existing ${CL} from ${STABLE_BRANCH} across the rebuild."
+          else
+            rm -f "${PRESERVED}"
+            PRESERVED=""
+          fi
+          # -B resets the local branch so a re-dispatch starts clean.
+          git checkout -B "${STABLE_BRANCH}"
+          if [ -n "$PRESERVED" ]; then
+            mkdir -p docs/changelogs
+            cp "$PRESERVED" "$CL"
+            rm -f "$PRESERVED"
+          fi
+          # Commit the exact rewritten tree before serializing it. The OCI
+          # revision can now point at a real, reviewable commit whose packages
+          # content matches the artifact (including the old embedded self-ref).
+          git add -A
+          git commit -s -m "Prepare release v${STABLE_VERSION} (promoted from ${RC_TAG})" \
+            || echo "No tag-string changes to commit (digests already stable)"
+          SOURCE_SHA="$(git rev-parse HEAD)"
+          # The git rewrite alone is not what the operator installs: it pulls the
+          # packages OCI artifact pinned by platformSourceRef. Publish this
+          # rewritten tree under a unique run-specific temporary tag, then add a
+          # second commit carrying its immutable digest. Container digests do not
+          # move; only the declarative bundle changes. A second artifact push is
+          # impossible because writing its own digest would change it forever.
+          .release-tooling/hack/promote-packages-artifact.sh \
+            "$STABLE_VERSION" "$RC_TAG" "$SOURCE_SHA"
+          git add packages/core/installer/values.yaml
+          git commit -s -m "Pin promoted packages artifact for v${STABLE_VERSION}"
+          # Compare-before-force, matching tags.yaml's Create release branch step.
+          # The commits above produce fresh, timestamp-dependent SHAs each run,
+          # so a re-dispatch (retry after a later step failed, or promoting a
+          # newer rc to the same version) creates a SIBLING commit. A plain push
+          # would then be rejected non-fast-forward and wedge re-promotion until
+          # the branch is deleted by hand — contradicting the validate step's
+          # leftover-draft tolerance and this workflow's "overwritable branch,
+          # nothing to wedge" header. This is a mutable staging branch: skip when
+          # unchanged, force + log when it genuinely moves.
+          LOCAL="$(git rev-parse HEAD)"
+          REMOTE="$(git ls-remote --heads origin "${STABLE_BRANCH}" | awk '{print $1}')"
+          if [ -z "$REMOTE" ]; then
+            git push origin "HEAD:refs/heads/${STABLE_BRANCH}"
+            echo "✅ Created staging branch ${STABLE_BRANCH} at ${LOCAL}."
+          elif [ "$REMOTE" = "$LOCAL" ]; then
+            echo "✅ ${STABLE_BRANCH} already at ${LOCAL}; nothing to do."
+          else
+            echo "::notice::Force-updating staging branch ${STABLE_BRANCH}: ${REMOTE} -> ${LOCAL}."
+            git push -f origin "HEAD:refs/heads/${STABLE_BRANCH}"
+          fi
+
+      # Assemble the stable draft's assets. Start from the rc draft's assets
+      # (the heavy Talos ISO/disk/kernel/initramfs are identical bits — the rc
+      # e2e booted them), then OVERWRITE only the version-stamped, cheap-to-render
+      # ones with stable-stamped builds (restamp, decision D): operator manifests
+      # carry platformVersion=vX.Y.Z, cozypkg / check-readiness report the stable
+      # version, CRDs + openapi are regenerated. No image build.
+      - name: Stage rc assets
+        env:
+          GH_TOKEN: ${{ steps.app-token.outputs.token }}
+          RC_TAG: ${{ needs.parse.outputs.rc_tag }}
+        run: |
+          mkdir -p _out/assets
+          gh release download "${RC_TAG}" --dir _out/assets --clobber
+
+      - name: Restamp version-stamped assets
+        env:
+          STABLE_VERSION: ${{ needs.parse.outputs.stable_version }}
+        run: |
+          make manifests assets-cozypkg openapi-json COZYSTACK_VERSION="${STABLE_VERSION}"
+
+      - name: Create draft stable release and upload assets
+        env:
+          GH_TOKEN: ${{ steps.app-token.outputs.token }}
+          STABLE_TAG: ${{ needs.parse.outputs.stable_tag }}
+          STABLE_VERSION: ${{ needs.parse.outputs.stable_version }}
+          RC_TAG: ${{ needs.parse.outputs.rc_tag }}
+        run: |
+          # Draft now; pull-requests-release.yaml publishes it on PR merge.
+          gh release view "${STABLE_TAG}" >/dev/null 2>&1 \
+            || gh release create "${STABLE_TAG}" --draft --title "${STABLE_TAG}" --notes "Promoted from ${RC_TAG}."
+          # upload_assets depends on `manifests`, which re-renders the operator
+          # manifests — pass COZYSTACK_VERSION so that re-render re-stamps the
+          # stable version instead of blanking the platformVersion set by the
+          # Restamp step above.
+          make upload_assets VERSION="${STABLE_TAG}" COZYSTACK_VERSION="${STABLE_VERSION}"
+
+  # ── Changelog: generated by the reusable changelog-generate.yaml, at promote
+  #    time, so it rides the promote PR and is on the base branch the moment the
+  #    release publishes.
+  #
+  #    Previously this lived in tags.yaml::generate-changelog, gated on the stable
+  #    tag push. Under the promote flow that tag is created by
+  #    pull-requests-release.yaml finalize — i.e. AFTER the release is published —
+  #    so the changelog PR could only ever be opened once the release was already
+  #    public. Moving generation here is the only fix; re-gating the tag-triggered
+  #    job cannot help.
+  #
+  #    The generation logic is factored into .github/workflows/changelog-generate.yaml
+  #    (workflow_call) and shared with changelog-rc.yaml, the rc-time button. The
+  #    OBSERVABLE behavior here is unchanged: same detached rc-tag checkout, same
+  #    read-only token for the AI step, same validator gate, same artifact name
+  #    (changelog-vX.Y.Z) that `open-pr` downloads, same non-blocking failure
+  #    tolerance. It gains one thing — the reusable workflow's skip check also
+  #    looks at the rc STAGING branch (release-X.Y.Z-rc.N): if changelog-rc.yaml
+  #    already generated the changelog at rc time, this COPIES it instead of
+  #    running the AI pass again.
+  #
+  #    Runs in PARALLEL with `promote`: generation is AI-driven and slow, while
+  #    `promote` spends most of its wall clock downloading and re-uploading the
+  #    heavy Talos assets. Both depend only on the cheap `parse` job (seconds), so
+  #    they still start together and `open-pr` joins them. It is handed the tag
+  #    `parse` already validated (needs.parse.outputs.rc_tag) rather than the raw
+  #    dispatch input, so promote and this job cannot diverge on whether the tag
+  #    is valid — a whitespace-bearing input fails `parse`, taking the whole
+  #    promotion down, instead of promote succeeding while this job rejects it and
+  #    the PR opens with no changelog. `secrets` are passed explicitly, matching
+  #    the reusable workflow's declared interface.
+  changelog:
+    name: Generate changelog
+    needs: parse
+    permissions:
+      contents: read
+    uses: ./.github/workflows/changelog-generate.yaml
+    with:
+      rc_tag: ${{ needs.parse.outputs.rc_tag }}
+    secrets:
+      COZYSTACK_CI_APP_ID: ${{ secrets.COZYSTACK_CI_APP_ID }}
+      COZYSTACK_CI_PRIVATE_KEY: ${{ secrets.COZYSTACK_CI_PRIVATE_KEY }}
+      COPILOT_GITHUB_TOKEN: ${{ secrets.COPILOT_GITHUB_TOKEN }}
+
+  # ── Website docs: open the cozystack/website "update managed apps reference" PR
+  #    at PROMOTE time, not tag time. tags.yaml::update-website-docs still fires on
+  #    the stable tag push as a backstop (see the comment there), but that is too
+  #    late for a reviewer AND it fetched README content from the stable tag, which
+  #    does not exist until finalize pushes it. This job fetches from the
+  #    release-X.Y.Z STAGING BRANCH `promote` just pushed — via the website
+  #    Makefile's FETCH_REF variable — so the docs are ready to review alongside the
+  #    promote PR while the stable tag is still unborn.
+  #
+  #    needs [parse, promote]: the staging branch must exist before FETCH_REF can
+  #    resolve, and `promote` is what pushes it.
+  #
+  #    CRITICAL MERGE-TIMING CONTRACT: the website PR this opens must NOT be merged
+  #    before pull-requests-release.yaml finalize publishes the release. Merging it
+  #    early flips the site's latest-version pointer to a version whose versioned
+  #    docs and openapi are not on GitHub yet, so every version-pin and API link for
+  #    the new version 404s until the release lands. The PR body states this in bold
+  #    and the promote PR body carries a matching reminder line (assembled in
+  #    open-pr from this job's result).
+  #
+  #    Non-blocking for promotion: any failure here — including the FETCH_REF-support
+  #    guard below — surfaces as a ⚠️ line in the promote PR body (open-pr reads
+  #    needs.website-docs.result) and never blocks the promotion. The tag-time
+  #    backstop backfills the same branch.
+  website-docs:
+    name: Update website docs
+    runs-on: ubuntu-latest
+    needs: [parse, promote]
+    timeout-minutes: 20
+    permissions:
+      contents: read # all writes go to cozystack/website through the app token, never this repo's GITHUB_TOKEN
+    steps:
+      - name: Generate GitHub App token
+        id: app-token
+        uses: actions/create-github-app-token@d72941d797fd3113feb6b93fd0dec494b13a2547 # v1
+        with:
+          app-id: ${{ secrets.COZYSTACK_CI_APP_ID }}
+          private-key: ${{ secrets.COZYSTACK_CI_PRIVATE_KEY }}
+          # No `repositories:` scope: this token must reach cozystack/website, not
+          # just this repo (matches tags.yaml::update-website-docs).
+          owner: cozystack
+
+      - name: Checkout website repo
+        uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4
+        with:
+          repository: cozystack/website
+          ref: main
+          token: ${{ steps.app-token.outputs.token }}
+          # Do not persist the token as http.extraheader. The Commit and push step
+          # re-injects the app token via `git remote set-url`, so the app token (not
+          # a persisted credential) authenticates the push — the same handling
+          # promote-rc's other checkouts use, and precisely the extraheader trap
+          # pull-requests-release.yaml's finalize was bitten by.
+          persist-credentials: false
+
+      # GUARD — refuse to run the promote-time path against a website checkout that
+      # does not understand FETCH_REF yet (before website PR feat/prerelease-fetch-ref
+      # merges). Without FETCH_REF, `make update-all RELEASE_TAG=$TAG FETCH_REF=$REF`
+      # silently ignores the unknown command-line variable and falls back to
+      # BRANCH=RELEASE_TAG=$TAG — a stable tag finalize has NOT created yet. The
+      # pre-FETCH_REF update_apps.sh then fetches READMEs from that nonexistent ref,
+      # warns-and-continues, and commits STUB docs — reopening the exact old-bad
+      # behaviour this move exists to kill. Fail loudly instead; the tag-time
+      # backstop still backfills once the tag (and, by then, FETCH_REF) exist.
+      - name: Require FETCH_REF support in the website checkout
+        run: |
+          if ! grep -q '^FETCH_REF' Makefile; then
+            echo "::warning title=website docs skipped::cozystack/website main has no FETCH_REF support yet (PR feat/prerelease-fetch-ref not merged). Refusing to generate docs from the not-yet-created stable tag; tags.yaml::update-website-docs will backfill at tag time."
+            exit 1
+          fi
+
+      # v0 for a 0.x line, else vX.Y — mirrors the website Makefile routing and
+      # tags.yaml's promote decision. Only a new minor/major (directory absent)
+      # promotes next/ → vX.Y/; a patch updates the existing directory in place.
+      - name: Determine if this release promotes next/
+        id: promote
+        env:
+          VERSION: ${{ needs.parse.outputs.stable_version }}
+        run: |
+          MAJOR="${VERSION%%.*}"
+          MINOR="$(echo "$VERSION" | cut -d. -f2)"
+          if [ "$MAJOR" = "0" ]; then
+            DOC_VERSION="v0"
+          else
+            DOC_VERSION="v${MAJOR}.${MINOR}"
+          fi
+          if [ -d "content/en/docs/${DOC_VERSION}" ]; then
+            echo "promote=false" >> "$GITHUB_OUTPUT"
+            echo "content/en/docs/${DOC_VERSION}/ already exists — patch release, updating in place, skipping release-next."
+          else
+            echo "promote=true" >> "$GITHUB_OUTPUT"
+            echo "New minor/major release ${DOC_VERSION} — will promote next/ → ${DOC_VERSION}/."
+          fi
+
+      # Refresh the trunk pins from the staging ref BEFORE release-next snapshots
+      # next/ into vX.Y/, so the new version directory inherits fresh Talos /
+      # cozystack pins from release-X.Y.Z instead of a stale next.yaml (the v1.6
+      # talos-pin incident class). Promote path only — a patch leaves the trunk
+      # untouched.
+      - name: Refresh trunk version pins from the staging ref
+        if: steps.promote.outputs.promote == 'true'
+        env:
+          SRC_REF: ${{ needs.parse.outputs.stable_branch }}
+          TAG: ${{ needs.parse.outputs.stable_tag }}
+        run: ./hack/update_versions.sh --dest data/versions/next.yaml --branch "$SRC_REF" --cozystack-tag "$TAG"
+
+      - name: Promote next/ to released version
+        if: steps.promote.outputs.promote == 'true'
+        env:
+          TAG: ${{ needs.parse.outputs.stable_tag }}
+        run: make release-next RELEASE_TAG="$TAG"
+
+      # FETCH_REF pins the content fetch to the staging branch (which exists); TAG
+      # still routes the output directory (vX.Y vs next) and stamps versions. The
+      # stable tag is deliberately NOT the fetch ref — it does not exist until
+      # finalize.
+      - name: Update docs from the staging branch
+        env:
+          TAG: ${{ needs.parse.outputs.stable_tag }}
+          SRC_REF: ${{ needs.parse.outputs.stable_branch }}
+        run: make update-all RELEASE_TAG="$TAG" FETCH_REF="$SRC_REF"
+
+      - name: Commit and push
+        id: commit
+        env:
+          APP_TOKEN: ${{ steps.app-token.outputs.token }}
+          VERSION: ${{ needs.parse.outputs.stable_version }}
+        run: |
+          git config user.name  "cozystack-ci[bot]"
+          git config user.email "274107086+cozystack-ci[bot]@users.noreply.github.com"
+          git remote set-url origin "https://x-access-token:${APP_TOKEN}@github.com/cozystack/website"
+          git add content hugo.yaml data/versions
+          if git diff --cached --quiet; then
+            echo "No changes to commit"
+            echo "changed=false" >> "$GITHUB_OUTPUT"
+            exit 0
+          fi
+          BRANCH="update-docs-v${VERSION}"
+          # Same mutable-branch idiom as tags.yaml: rebuild the branch from the
+          # current tree and force-push. No-op above when nothing changed.
+          git branch -D "$BRANCH" 2>/dev/null || true
+          git checkout -b "$BRANCH"
+          git commit --signoff -m "[docs] Update managed apps reference for v${VERSION}"
+          git push --force --set-upstream origin "$BRANCH"
+          echo "changed=true" >> "$GITHUB_OUTPUT"
+
+      - name: Open or refresh the website PR
+        if: steps.commit.outputs.changed == 'true'
+        env:
+          GH_TOKEN: ${{ steps.app-token.outputs.token }}
+          VERSION: ${{ needs.parse.outputs.stable_version }}
+          TAG: ${{ needs.parse.outputs.stable_tag }}
+        run: |
+          BRANCH="update-docs-v${VERSION}"
+          TITLE="[docs] Update managed apps reference for ${TAG}"
+          # Body assembled with printf so paragraphs carry no YAML-block leading
+          # indentation (which would render as code blocks). The DO NOT MERGE
+          # paragraph is load-bearing: merging early breaks the live site.
+          BODY="$(printf '%s\n\n%s\n\n%s' \
+            "Automated docs update for release \`${TAG}\`, generated at PROMOTE time from the \`release-${VERSION}\` staging branch (fetched via FETCH_REF; the stable tag \`${TAG}\` does not exist yet)." \
+            "⛔ **DO NOT MERGE until \`${TAG}\` is published.** This PR is opened before the release exists. Merging it before pull-requests-release.yaml finalize publishes \`${TAG}\` flips the site's latest-version pointer to a version whose versioned docs and openapi.json are not on GitHub yet — every version-pin and API link for the new version 404s until the release lands. Park this PR until the GitHub release for \`${TAG}\` is live, then merge." \
+            "Opened early on purpose so the docs can be reviewed alongside the promote PR. tags.yaml::update-website-docs re-runs at tag time as a backstop and no-ops (\"No changes to commit\") when this already did the work.")"
+          PR_STATE="$(gh pr view "$BRANCH" --repo cozystack/website --json state --jq .state 2>/dev/null || echo "")"
+          if [ "$PR_STATE" = "OPEN" ]; then
+            gh pr edit "$BRANCH" --repo cozystack/website --title "$TITLE" --body "$BODY"
+            echo "Refreshed the open website PR for ${BRANCH}."
+          else
+            gh pr create --repo cozystack/website \
+              --title "$TITLE" --body "$BODY" \
+              --head "$BRANCH" --base main
+          fi
+
+  # Join point: commits the changelog onto the staging branch `promote` pushed,
+  # then opens the release PR. Split out of `promote` so changelog generation can
+  # run concurrently with the asset staging rather than after it.
+  open-pr:
+    name: Open promote PR
+    runs-on: ubuntu-latest
+    needs: [promote, changelog, website-docs]
+    # `needs` alone would SKIP this job whenever `changelog` fails, which would
+    # leave the staging branch pushed and the draft release staged but no promote
+    # PR at all — the exact wedge the non-blocking design exists to prevent.
+    # Only the AI *step* carries continue-on-error; everything else in that job
+    # (token, checkout, node setup, `npm i -g @github/copilot`, artifact upload,
+    # the job timeout) is still fatal, and an npm or Copilot outage is precisely
+    # the scenario this must survive. Gate on `promote` alone and let the
+    # `needs.changelog.outputs.present` guards below degrade to the documented
+    # "PR opens with the ⚠️ body" path. `website-docs` is in `needs` for the same
+    # reason and read the same way — a failed website-docs (or the FETCH_REF guard
+    # tripping) must degrade to a ⚠️ line in the promote PR body, never block it —
+    # so this `if:` deliberately gates on `promote` only, not on website-docs.
+    if: ${{ !cancelled() && needs.promote.result == 'success' }}
+    timeout-minutes: 15
+    permissions:
+      contents: write # commit the changelog onto the staging branch
+      pull-requests: write # open (or refresh) the promote PR
+    steps:
+      - name: Generate GitHub App token
+        id: app-token
+        uses: actions/create-github-app-token@d72941d797fd3113feb6b93fd0dec494b13a2547 # v1
+        with:
+          app-id: ${{ secrets.COZYSTACK_CI_APP_ID }}
+          private-key: ${{ secrets.COZYSTACK_CI_PRIVATE_KEY }}
+          owner: cozystack
+          repositories: ${{ github.event.repository.name }}
+
+      # Credentials are persisted here (unlike the other checkouts in this
+      # workflow): the Open PR step runs `git ls-remote` to pick the base branch
+      # whether or not the changelog step ran, so it cannot rely on the
+      # `git remote set-url` that only the conditional commit step performs.
+      - name: Checkout stable staging branch
+        uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4
+        with:
+          ref: ${{ needs.promote.outputs.stable_branch }}
+          fetch-depth: 0
+          token: ${{ steps.app-token.outputs.token }}
+
+      # A changelog already on the staging branch was put there deliberately —
+      # hand-written by a maintainer, or carried over from an earlier dispatch by
+      # `promote`'s preserve step — and must win over a fresh AI run. Without this
+      # check the artifact download below would silently overwrite human edits.
+      # A second checkout of the DISPATCH ref, used only as a source of release
+      # tooling. The primary checkout above is an older commit (the rc tag, or a
+      # branch derived from it) and does not carry hack/validate-changelog.sh or
+      # the current docs/agents/changelog.md — and a script fetched by a script
+      # that is itself missing solves nothing, so this is done declaratively by
+      # actions/checkout rather than by shelling out to the repo's own tooling.
+      # Gitignored, so promote's `git add -A` never stages it.
+      - name: Checkout release tooling from the dispatch ref
+        uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4
+        with:
+          ref: ${{ github.ref_name }}
+          path: .release-tooling
+          sparse-checkout: |
+            hack
+            docs/agents
+          persist-credentials: false
+
+      # Validated with the same script the changelog job uses, not a bare `-s`.
+      # A pre-existing file reaches here by two routes that skip generation
+      # entirely — hand-written into the rc tree, or preserved by `promote` across
+      # the force-push — so nothing else has checked it. Treating "non-empty" as
+      # "good" would let a truncated hand-commit be advertised with ✅ and
+      # published verbatim as the release body.
+      - name: Check for an existing changelog on the branch
+        id: existing
+        env:
+          STABLE_VERSION: ${{ needs.promote.outputs.stable_version }}
+        run: |
+          CL="docs/changelogs/v${STABLE_VERSION}.md"
+          if [ ! -s "$CL" ]; then
+            echo "present=false" >> "$GITHUB_OUTPUT"
+          elif REASON="$(.release-tooling/hack/validate-changelog.sh "$CL" "${STABLE_VERSION}" 2>&1)"; then
+            echo "present=true" >> "$GITHUB_OUTPUT"
+            echo "✅ Changelog already on the staging branch and valid — keeping it, not overwriting with generated output. ${REASON}"
+          else
+            echo "present=false" >> "$GITHUB_OUTPUT"
+            echo "::warning::A changelog is on the staging branch but is not usable (${REASON}). Falling back to this run's generated output if there is one."
+          fi
+
+      # continue-on-error: a transient artifact-transfer failure must not abort
+      # the job before the PR is opened. Without it the download step is fatal,
+      # and the promotion ends with a pushed staging branch, a drafted release and
+      # no promote PR — the same wedge the job-level `if:` exists to prevent, one
+      # step further down.
+      - name: Download changelog artifact
+        id: download
+        if: needs.changelog.outputs.present == 'true' && steps.existing.outputs.present == 'false'
+        continue-on-error: true
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
+        with:
+          name: changelog-v${{ needs.promote.outputs.stable_version }}
+          path: docs/changelogs
+
+      # Re-establish ground truth from the filesystem rather than trusting the
+      # upstream job's output: the artifact may have failed to transfer, and what
+      # actually matters from here on is whether a usable file is on disk.
+      - name: Confirm changelog on disk
+        id: usable
+        env:
+          STABLE_VERSION: ${{ needs.promote.outputs.stable_version }}
+        run: |
+          CL="docs/changelogs/v${STABLE_VERSION}.md"
+          if [ -s "$CL" ] && REASON="$(.release-tooling/hack/validate-changelog.sh "$CL" "${STABLE_VERSION}" 2>&1)"; then
+            echo "present=true" >> "$GITHUB_OUTPUT"
+            echo "✅ ${REASON}"
+          else
+            echo "present=false" >> "$GITHUB_OUTPUT"
+            echo "::warning::No usable changelog available for v${STABLE_VERSION} — the promote PR will open without one."
+          fi
+
+      # Only when the file came from the artifact. A changelog already on the
+      # branch was committed by `promote` (preserve path) and needs no second commit.
+      - name: Commit changelog to staging branch
+        if: steps.usable.outputs.present == 'true' && steps.existing.outputs.present == 'false'
+        env:
+          APP_TOKEN: ${{ steps.app-token.outputs.token }}
+          STABLE_VERSION: ${{ needs.promote.outputs.stable_version }}
+          STABLE_BRANCH: ${{ needs.promote.outputs.stable_branch }}
+        run: |
+          set -euo pipefail
+          git config user.name  "cozystack-ci[bot]"
+          git config user.email "274107086+cozystack-ci[bot]@users.noreply.github.com"
+          git remote set-url origin "https://x-access-token:${APP_TOKEN}@github.com/${GITHUB_REPOSITORY}"
+          git add "docs/changelogs/v${STABLE_VERSION}.md"
+          if git diff --cached --quiet; then
+            echo "✅ Changelog already committed on ${STABLE_BRANCH}; nothing to do."
+            exit 0
+          fi
+          git commit -s -m "docs: add changelog for v${STABLE_VERSION}"
+          git push origin "HEAD:refs/heads/${STABLE_BRANCH}"
+          echo "✅ Committed changelog to ${STABLE_BRANCH}."
+
+      - name: Open promote (release) PR
+        env:
+          GH_TOKEN: ${{ steps.app-token.outputs.token }}
+          STABLE_BRANCH: ${{ needs.promote.outputs.stable_branch }}
+          STABLE_TAG: ${{ needs.promote.outputs.stable_tag }}
+          STABLE_VERSION: ${{ needs.promote.outputs.stable_version }}
+          # From promote's validated parse, not raw dispatch input — the rc tag is
+          # pattern-checked exactly once and every consumer reads that result.
+          RC_TAG: ${{ needs.promote.outputs.rc_tag }}
+          # True when the PR carries a changelog by EITHER route: preserved on the
+          # branch, or generated this run. The PR body must reflect what merged,
+          # not just what the AI produced.
+          CHANGELOG_PRESENT: ${{ (steps.existing.outputs.present == 'true' || steps.usable.outputs.present == 'true') && 'true' || 'false' }}
+          E2E_VERIFICATION: ${{ needs.promote.outputs.e2e_verification }}
+          BASE_BRANCH: ${{ needs.promote.outputs.base_branch }}
+          # website-docs is non-blocking; its result drives a ✅/⚠️ line only.
+          WEBSITE_DOCS_RESULT: ${{ needs.website-docs.result }}
+        run: |
+          # `promote` resolved and validated this target before publishing the
+          # packages candidate. Reuse it so the PR cannot drift to an older base.
+          BASE="$BASE_BRANCH"
+          # State the changelog outcome in the PR body: generation is non-blocking,
+          # so a missing changelog must be visible where the reviewer is looking.
+          # finalize reads this file to populate the published release body — if it
+          # is absent at merge, the release ships with empty notes.
+          if [ "${CHANGELOG_PRESENT}" = "true" ]; then
+            CHANGELOG_NOTE="✅ Includes \`docs/changelogs/v${STABLE_VERSION}.md\`, which finalize uses verbatim as the published release body."
+          else
+            CHANGELOG_NOTE="⚠️ **No changelog in this PR** — automatic generation failed. Commit \`docs/changelogs/v${STABLE_VERSION}.md\` to this branch before merging, or \`${STABLE_TAG}\` publishes with an empty release body."
+          fi
+          if [ "${E2E_VERIFICATION}" = "verified" ]; then
+            E2E_NOTE="✅ RC full e2e was verified for \`${RC_TAG}\` before promotion."
+          else
+            E2E_NOTE="⚠️ **RC e2e gate bypassed** — this promotion did not verify green full e2e evidence for \`${RC_TAG}\`."
+          fi
+          # website-docs is non-blocking: state its outcome where the reviewer is
+          # looking, and — on success — repeat the DO-NOT-MERGE-early contract so
+          # nobody merges the website PR before this release is finalized.
+          if [ "${WEBSITE_DOCS_RESULT}" = "success" ]; then
+            WEBSITE_NOTE="✅ Website docs PR opened/refreshed on \`cozystack/website\` (branch \`update-docs-v${STABLE_VERSION}\`), generated from the \`${STABLE_BRANCH}\` staging branch. **Do NOT merge that PR until \`${STABLE_TAG}\` is published** — merging it early flips the site's latest-version pointer to an unpublished version and 404s its docs/API links (see the PR body)."
+          else
+            WEBSITE_NOTE="⚠️ **Website docs not updated** — the website-docs job did not succeed (result: \`${WEBSITE_DOCS_RESULT}\`; e.g. \`cozystack/website\` main not yet on FETCH_REF). Promotion is unaffected; tags.yaml::update-website-docs will backfill the docs PR at tag time. Check the promote run's website-docs job."
+          fi
+          BODY="Promotes \`${RC_TAG}\` to stable \`${STABLE_TAG}\` without rebuilding containers. Their digests remain bit-for-bit what passed rc e2e; the tag-rewritten packages tree is re-serialized as a temporary OCI candidate and pinned here by digest. On merge, pull-requests-release.yaml verifies that candidate against this tree before creating the write-once \`${STABLE_TAG}\` tag, retagging the candidate and container digests to \`${STABLE_TAG}\` (+\`:latest\` when this is the newest stable), publishing the stable cozy-installer chart, and publishing the release. Do NOT squash-merge (decision B): the stable tag must attach to a real merge commit.
+
+          ${E2E_NOTE}
+
+          ℹ️ E2E already ran against the immutable rc, so this promote PR does not run E2E by default. A maintainer may add the \`full-e2e\` label to run the full suite again.
+
+          ${CHANGELOG_NOTE}
+
+          ${WEBSITE_NOTE}"
+          # `gh pr view <branch>` resolves CLOSED PRs too. After a promote PR was
+          # closed unmerged and the rc re-dispatched, editing that dead PR would
+          # "succeed" and no new PR would ever be opened — the promotion reports
+          # success and produces nothing. Branch on the state explicitly.
+          PR_STATE="$(gh pr view "${STABLE_BRANCH}" --json state --jq .state 2>/dev/null || echo "")"
+          if [ "${PR_STATE}" = "OPEN" ]; then
+            # Refresh only while the body is still the one this workflow wrote.
+            # docs/release.md tells reviewers to paste upstream breaking-change
+            # notes into this body before merge; a re-dispatch that overwrites it
+            # would destroy that with no trace and no way to recover it.
+            CURRENT="$(gh pr view "${STABLE_BRANCH}" --json body --jq .body 2>/dev/null || echo "")"
+            if [ "${CURRENT}" = "${BODY}" ]; then
+              echo "PR already open for ${STABLE_BRANCH} with an identical body; nothing to do."
+            elif printf '%s' "${CURRENT}" | grep -qF 'Promotes `'; then
+              echo "::notice::Refreshing the body of the open PR for ${STABLE_BRANCH}."
+              gh pr edit "${STABLE_BRANCH}" --body "$BODY"
+            else
+              echo "::warning::The open PR for ${STABLE_BRANCH} has a hand-edited body — leaving it untouched. Changelog status this run: ${CHANGELOG_PRESENT}."
+            fi
+          else
+            # Release-labelled promote PRs deliberately omit full-e2e: the rc
+            # gate above already checked the immutable candidate. Adding the
+            # label later is the explicit maintainer opt-in for a repeat run.
+            gh pr create --base "$BASE" --head "${STABLE_BRANCH}" \
+              --title "chore(release): promote ${RC_TAG} -> ${STABLE_TAG}" \
+              --body "$BODY" --label release
+          fi
diff --git a/.github/workflows/pull-requests-release.yaml b/.github/workflows/pull-requests-release.yaml
index 8bf52a3f57..311102d7b8 100644
--- a/.github/workflows/pull-requests-release.yaml
+++ b/.github/workflows/pull-requests-release.yaml
@@ -3,29 +3,59 @@ name: "Releasing PR"
 on:
   pull_request:
     types: [closed]
-    paths-ignore:
-      - 'docs/**/*'
+    # No paths filter. A `paths-ignore: docs/**/*` used to live here as an
+    # optimization, but the promote PR now carries docs/changelogs/vX.Y.Z.md —
+    # and `Prepare stable branch` explicitly tolerates producing no tag-string
+    # changes ("digests already stable"). That combination can yield a docs-only
+    # promote PR, which the filter would drop: no finalize run, so no tag, no
+    # release, and no error anywhere. Filtering is left entirely to the `if:`
+    # gate below (merged + `release` label + release-bot author), which is what
+    # actually decides whether this workflow should do anything. The cost is a
+    # skipped job on unrelated closed PRs.
 
 # Cancel in‑flight runs for the same PR when a new push arrives.
 concurrency:
   group: pr-${{ github.workflow }}-${{ github.event.pull_request.number }}
   cancel-in-progress: true
 
+# Top-level token defaults to read-only. A job-level block replaces this one
+# rather than adding to it, so each job restates every scope it needs.
+permissions:
+  contents: read
+
 jobs:
   finalize:
     name: Finalize Release
-    runs-on: [self-hosted]
+    # Runs skopeo + helm against GHCR (the promotion's registry side effects),
+    # so it needs an ephemeral VM runner with those tools, not the self-hosted
+    # pool.
+    runs-on: [oracle-vm-4cpu-16gb-x86-64]
     permissions:
       contents: write
+      packages: write
 
+    # Finalize now both cuts the write-once tags AND performs the promotion's
+    # registry side effects (retag rc->stable, move :latest, publish the stable
+    # chart), so restrict who can trigger it: the PR must be merged, carry the
+    # `release` label, AND be authored by the release bot (promote-rc.yaml opens
+    # it as cozystack-ci[bot]). Merge rights already gate this; asserting the
+    # author additionally closes the "name a branch release-X.Y.Z, get the label
+    # applied, merge it" hole.
     if: |
       github.event.pull_request.merged == true &&
-      contains(github.event.pull_request.labels.*.name, 'release')
+      contains(github.event.pull_request.labels.*.name, 'release') &&
+      github.event.pull_request.user.login == 'cozystack-ci[bot]'
+
+    env:
+      # The registry promotion writes to: component images and the cozy-installer
+      # chart. GHCR — the release registry tags.yaml builds rc images into — NOT
+      # the OCIR CI registry. Must match hack/promote-retag.sh's default.
+      REGISTRY: ghcr.io/cozystack/cozystack
 
     steps:
       - name: Generate GitHub App token
         id: app-token
-        uses: actions/create-github-app-token@v1
+        uses: actions/create-github-app-token@d72941d797fd3113feb6b93fd0dec494b13a2547 # v1
         with:
           app-id: ${{ secrets.COZYSTACK_CI_APP_ID }}
           private-key: ${{ secrets.COZYSTACK_CI_PRIVATE_KEY }}
@@ -34,7 +64,7 @@ jobs:
       # Extract tag from branch name  (branch = release-X.Y.Z*)
       - name: Extract tag from branch name
         id: get_tag
-        uses: actions/github-script@v7
+        uses: actions/github-script@f28e40c7f34bde8b3046d885e986cb6290c5673b # v7
         with:
           script: |
             const branch = context.payload.pull_request.head.ref;
@@ -49,23 +79,164 @@ jobs:
 
       # Checkout repo & create / push annotated tag
       - name: Checkout repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4
         with:
           fetch-depth: 0
+          # Do NOT persist GITHUB_TOKEN as http.extraheader. Every tag/branch push
+          # below re-injects the app token via `git remote set-url`, but a persisted
+          # extraheader silently wins over the URL credential — so those pushes
+          # would authenticate as GITHUB_TOKEN, and a GITHUB_TOKEN push creates no
+          # workflow run (GitHub anti-recursion). That is exactly why v1.6.0's
+          # stable tag triggered no tags.yaml run (the generate-changelog and
+          # update-website-docs backstops never fired). With this false, the set-url
+          # app token authenticates, matching how promote-rc.yaml already pushes.
+          persist-credentials: false
+
+      # Use the trusted pre-merge base version of the verifier, while its root
+      # argument remains the merged packages tree checked out above. This keeps
+      # the final guard independent of the release PR's executable contents.
+      - name: Checkout release tooling from base
+        uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4
+        with:
+          ref: ${{ github.event.pull_request.base.sha }}
+          path: .release-tooling
+          sparse-checkout: hack
+          persist-credentials: false
+
+      # Resolve and verify the candidate before creating any write-once stable
+      # git or registry name. The candidate was serialized at promote time from
+      # the tag-rewritten tree; this guard pulls it by the committed digest and
+      # proves it still matches the merge commit (apart from its impossible
+      # self-reference) and still pins the rc-tested container digests.
+      #
+      # flux and yq are version-pinned: they are what this job verifies the
+      # candidate with and what stamps the stable chart, so `latest/download`
+      # would make an irreversible step depend on whatever mikefarah shipped
+      # this morning. The version tracks
+      # packages/core/testing/images/e2e-sandbox/Dockerfile. yq is additionally
+      # pinned by content — it stamps the chart's platformVersion, and this step
+      # is the last one before write-once names exist. flux comes from the
+      # commit-pinned upstream setup action, which checksums the release
+      # tarball. promote-rc.yaml's copy carries the full reasoning.
+      - name: Set up flux
+        if: ${{ !contains(steps.get_tag.outputs.tag, '-') }}
+        uses: fluxcd/flux2/action@04acaec6161ac4fb1a82ffafa88901c03271d34f # v2.8.6
+        with:
+          version: "2.8.6"
+      - name: Set up promotion toolchain (skopeo, yq, helm)
+        if: ${{ !contains(steps.get_tag.outputs.tag, '-') }}
+        env:
+          YQ_VERSION: "4.53.3"
+          YQ_SHA256: "fa52a4e758c63d38299163fbdd1edfb4c4963247918bf9c1c5d31d84789eded4"
+        run: |
+          if ! yq --version 2>/dev/null | grep -q "mikefarah.* version v${YQ_VERSION}\$"; then
+            yq_bin="$(mktemp)"
+            curl -fsSL -o "$yq_bin" \
+              "https://github.com/mikefarah/yq/releases/download/v${YQ_VERSION}/yq_linux_amd64"
+            printf '%s  %s\n' "$YQ_SHA256" "$yq_bin" | sha256sum -c -
+            sudo install -m 0755 "$yq_bin" /usr/local/bin/yq
+            rm -f "$yq_bin"
+          fi
+          command -v skopeo >/dev/null \
+            || { sudo apt-get update -qq && sudo apt-get install -y -qq skopeo; }
+          command -v helm >/dev/null \
+            || curl -fsSL https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 | bash
+          # Not installed here, only required: `flux pull artifact` reads its
+          # registry credentials from ~/.docker/config.json, which is why the
+          # login step below runs `docker login` as well as skopeo's and helm's.
+          # This job's runner class is not one of the docker-using build ones, so
+          # say what is missing here rather than letting the login step fail with
+          # a bare "command not found" in the middle of the release path.
+          command -v docker >/dev/null \
+            || { echo "::error::docker is required on this runner: flux reads registry credentials from ~/.docker/config.json"; exit 1; }
+
+      - name: Login to registry (GHCR)
+        if: ${{ !contains(steps.get_tag.outputs.tag, '-') }}
+        env:
+          GHCR_USER: ${{ github.actor }}
+          GHCR_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          echo "$GHCR_TOKEN" | docker login "${REGISTRY%%/*}" -u "$GHCR_USER" --password-stdin
+          echo "$GHCR_TOKEN" | skopeo login "${REGISTRY%%/*}" -u "$GHCR_USER" --password-stdin
+          echo "$GHCR_TOKEN" | helm registry login "${REGISTRY%%/*}" -u "$GHCR_USER" --password-stdin
 
-      - name: Create tag on merge commit
+      - name: Verify stable packages candidate
+        if: ${{ !contains(steps.get_tag.outputs.tag, '-') }}
+        env:
+          TAG: ${{ steps.get_tag.outputs.tag }}
+        run: .release-tooling/hack/verify-promoted-packages.sh "${TAG#v}"
+
+      # Create the release tag at the merge commit — write-once.
+      #
+      # The tag is attached to the PR merge commit, which did not exist before
+      # this release PR opened, so there is never a prior SHA to overwrite: a
+      # force is impossible by construction. The guard makes that explicit and
+      # makes re-runs idempotent. A pre-existing tag at a different commit means
+      # something pushed the tag out-of-band — fail loudly rather than move it.
+      - name: Create tag on merge commit (write-once)
         env:
           APP_TOKEN: ${{ steps.app-token.outputs.token }}
+          TAG: ${{ steps.get_tag.outputs.tag }}
+          SHA: ${{ github.sha }}
         run: |
           git config user.name  "cozystack-ci[bot]"
           git config user.email "274107086+cozystack-ci[bot]@users.noreply.github.com"
           git remote set-url origin https://x-access-token:${APP_TOKEN}@github.com/${GITHUB_REPOSITORY}
-          git tag -f ${{ steps.get_tag.outputs.tag }} ${{ github.sha }}
-          git push -f origin ${{ steps.get_tag.outputs.tag }}
+          EXISTING="$(git ls-remote --tags origin "refs/tags/${TAG}" | awk '{print $1}')"
+          if [ -z "$EXISTING" ]; then
+            git tag "${TAG}" "${SHA}"
+            git push origin "refs/tags/${TAG}"
+            echo "✅ Created ${TAG} at ${SHA}."
+          elif [ "$EXISTING" = "${SHA}" ]; then
+            echo "✅ ${TAG} already at ${SHA}; nothing to do."
+          else
+            echo "::error::${TAG} already exists at ${EXISTING}; refusing to force-move it to ${SHA} (tags are write-once)."
+            exit 1
+          fi
+
+      # Tag the api/apps/v1alpha1 submodule for pkg.go.dev — stable releases only.
+      #
+      # Moved here from tags.yaml: under the promote flow the stable draft already
+      # exists when the stable tag is pushed, so tags.yaml's prepare-release body
+      # (which used to cut this) is skipped and the Go-module tag was never
+      # created for a promoted stable. Finalize is where the stable tag is born,
+      # so it is where the matching submodule tag must be cut, at the same commit.
+      # Write-once: api/apps/v1alpha1/* tags feed the Go module proxy and
+      # pkg.go.dev, where a moved tag poisons caches irreversibly — create when
+      # absent, no-op if it already points here, fail loudly if it points
+      # elsewhere. Skipped for a prerelease tag (an rc/beta/alpha Go-module tag
+      # would permanently pollute the proxy — #2677 goal 3); rc promotions never
+      # open a release PR so never reach finalize, but the guard is kept explicit.
+      - name: Tag API submodule (write-once)
+        if: ${{ !contains(steps.get_tag.outputs.tag, '-') }}
+        env:
+          APP_TOKEN: ${{ steps.app-token.outputs.token }}
+          VTAG: ${{ steps.get_tag.outputs.tag }}
+          SHA: ${{ github.sha }}
+        run: |
+          SUBTAG="api/apps/v1alpha1/${VTAG}"
+          git config user.name  "cozystack-ci[bot]"
+          git config user.email "274107086+cozystack-ci[bot]@users.noreply.github.com"
+          git remote set-url origin https://x-access-token:${APP_TOKEN}@github.com/${GITHUB_REPOSITORY}
+          # The submodule tag points at the same commit as the stable tag created
+          # above — github.sha, the merge commit. Resolve from SHA directly (not
+          # from the vX.Y.Z tag) so an idempotent re-run, where the stable tag
+          # already existed and no local tag was created, still finds the target.
+          EXISTING="$(git ls-remote --tags origin "refs/tags/${SUBTAG}" | awk '{print $1}')"
+          if [ -z "$EXISTING" ]; then
+            git tag "${SUBTAG}" "${SHA}"
+            git push origin "refs/tags/${SUBTAG}"
+            echo "✅ Created ${SUBTAG} at ${SHA}."
+          elif [ "$EXISTING" = "${SHA}" ]; then
+            echo "✅ ${SUBTAG} already at ${SHA}; nothing to do."
+          else
+            echo "::error::${SUBTAG} already exists at ${EXISTING}; refusing to force-move it to ${SHA} (tags are write-once)."
+            exit 1
+          fi
 
       # Ensure maintenance branch release-X.Y
       - name: Ensure maintenance branch release-X.Y
-        uses: actions/github-script@v7
+        uses: actions/github-script@f28e40c7f34bde8b3046d885e986cb6290c5673b # v7
         with:
           github-token: ${{ steps.app-token.outputs.token }}
           script: |
@@ -94,14 +265,30 @@ jobs:
                 branch
               });
            
-              await github.rest.git.updateRef({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                ref: `heads/${branch}`,
-                sha: commitSha,
-                force: true
-              });
-              console.log(`🔁 Force-updated '${branch}' to ${commitSha}`);
+              // Fast-forward only — the maintenance branch is never rewound.
+              // force:false makes GitHub reject (422) a non-fast-forward update;
+              // we warn and leave the branch for a maintainer to resolve rather
+              // than clobber history.
+              try {
+                await github.rest.git.updateRef({
+                  owner: context.repo.owner,
+                  repo: context.repo.repo,
+                  ref: `heads/${branch}`,
+                  sha: commitSha,
+                  force: false
+                });
+                console.log(`✅ Fast-forwarded '${branch}' to ${commitSha}`);
+              } catch (ffErr) {
+                // Only a non-fast-forward rejection (422) is the expected,
+                // recoverable case. Auth/API/malformed-ref errors must not be
+                // swallowed — they'd silently leave the maintenance branch stale.
+                if (ffErr.status === 422) {
+                  console.log(`::warning::Could not fast-forward '${branch}' to ${commitSha} (not a descendant); leaving as-is — resolve manually. (${ffErr.message})`);
+                } else {
+                  core.setFailed(`Unexpected error updating '${branch}': ${ffErr.message}`);
+                  throw ffErr;
+                }
+              }
             } catch (err) {
               if (err.status === 404) {
                 await github.rest.git.createRef({
@@ -120,7 +307,8 @@ jobs:
 
       # Publish draft release and ensure correct latest flag
       - name: Publish draft release
-        uses: actions/github-script@v7
+        id: publish
+        uses: actions/github-script@f28e40c7f34bde8b3046d885e986cb6290c5673b # v7
         with:
           github-token: ${{ steps.app-token.outputs.token }}
           script: |
@@ -159,9 +347,30 @@ jobs:
               per_page: 100
             });
 
-            // Find draft release to publish
-            const draft = releases.data.find(r => r.tag_name === tag && r.draft);
-            if (!draft) throw new Error(`Draft release for ${tag} not found`);
+            // Find draft release to publish.
+            //
+            // Normally the draft was created by tags.yaml with tag_name === tag.
+            // But if the git tag was deleted and re-created between draft creation
+            // and merge (e.g. the release branch was force-updated), GitHub orphans
+            // the draft: tag_name becomes "untagged-<hash>" while `name` is kept.
+            // Fall back to matching by `name` and repair the draft's tag_name
+            // before publishing — otherwise the published release would not point
+            // at the real git tag.
+            let draft = releases.data.find(r => r.draft && r.tag_name === tag);
+            if (!draft) {
+              const orphan = releases.data.find(r =>
+                r.draft && r.name === tag && /^untagged-/.test(r.tag_name)
+              );
+              if (!orphan) throw new Error(`Draft release for ${tag} not found`);
+              console.log(`🔧 Repairing orphaned draft ${orphan.id}: tag_name '${orphan.tag_name}' -> '${tag}'`);
+              const repaired = await github.rest.repos.updateRelease({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                release_id: orphan.id,
+                tag_name: tag
+              });
+              draft = repaired.data;
+            }
 
             // Find max semver among published releases (excluding current draft)
             const publishedReleases = releases.data
@@ -181,6 +390,11 @@ jobs:
             const isOutdated = maxRelease && compareSemver(currentSemver, maxRelease.semver) < 0;
             const makeLatest = (isRc || isOutdated) ? 'false' : 'true';
 
+            // The image retag step below reuses this exact decision to gate
+            // whether :latest moves — the release's `latest` and the images'
+            // :latest must agree (a patch on an old line moves neither).
+            core.setOutput('make_latest', makeLatest);
+
             if (isRc) {
               console.log(`🏷️  ${tag} is a prerelease, make_latest: false`);
             } else if (isOutdated) {
@@ -189,6 +403,42 @@ jobs:
               console.log(`🏷️  ${tag} is the highest version, make_latest: true`);
             }
 
+            // Release body comes from the changelog that merged with THIS PR
+            // (promote-rc.yaml commits it onto the release-X.Y.Z branch), read
+            // from the merge commit already checked out here.
+            //
+            // Deliberately not left to update-releasenotes.yaml: that workflow
+            // triggers on pushes to main touching docs/changelogs/v*.md, and it
+            // only watches main. Since the rc freeze every promote PR targets
+            // release-X.Y, so no such push exists at promote time and it would
+            // sync no release at all — that used to be the patch-release corner
+            // case and is now every release. Back when the promote PR did merge
+            // into main it was worse than useless: it raced this job on that very
+            // push, and if it won it found no published release yet, skipped, and
+            // never fired again, leaving the release body permanently empty.
+            // Reading the file here is both race-free and branch-agnostic;
+            // update-releasenotes.yaml remains for later maintainer edits and
+            // manual re-syncs.
+            const fs = require('fs');
+            const changelogPath = `docs/changelogs/${tag}.md`;
+            let body;
+            if (fs.existsSync(changelogPath)) {
+              const raw = fs.readFileSync(changelogPath, 'utf8');
+              // Last line of defence before the body becomes public and
+              // immutable-by-convention. promote-rc.yaml validates the changelog
+              // structurally, but it can also arrive by hand-commit, and an
+              // empty or whitespace-only file here would blank the release notes
+              // more thoroughly than publishing the draft's body would.
+              if (raw.trim().length === 0) {
+                console.log(`::warning::${changelogPath} is empty or whitespace-only — refusing to use it as the release body for ${tag}. Publishing with the draft's existing body instead.`);
+              } else {
+                body = raw;
+                console.log(`📝 Release body from ${changelogPath} (${body.length} bytes)`);
+              }
+            } else {
+              console.log(`::warning::${changelogPath} not found in the merge commit — publishing ${tag} with the draft's existing body. Add the changelog and re-run 'Update Release Notes' to backfill it.`);
+            }
+
             // Publish the release
             await github.rest.repos.updateRelease({
               owner: context.repo.owner,
@@ -196,7 +446,8 @@ jobs:
               release_id: draft.id,
               draft: false,
               prerelease: isRc,
-              make_latest: makeLatest
+              make_latest: makeLatest,
+              ...(body ? { body } : {})
             });
             console.log(`🚀 Published release ${tag}`);
 
@@ -211,3 +462,63 @@ jobs:
               });
               console.log(`✅ Restored ${maxRelease.tag} as latest release`);
             }
+
+      # ── Transactional promotion: consumer-visible registry side effects run
+      #    HERE, after the candidate guard passed and the promote PR merged.
+      #    promote-rc.yaml published only a temporary `promotion-*` packages
+      #    candidate, so an abandoned promotion leaves no stable-named bytes.
+      #
+      #    The checked-out merge commit is the promoted stable tree: the rc's
+      #    digests with the tag string rewritten to stable and the verified
+      #    candidate pinned. skopeo retags those digests to the stable image tag;
+      #    helm packages+pushes the stable chart.
+
+      # Retag every rc image/digest plus the verified packages candidate to the
+      # stable tag. No container rebuild — bit-for-bit
+      # the e2e-tested rc. :latest moves only when this stable is the newest
+      # published version, gated by the SAME make_latest decision the release got.
+      - name: Retag rc images to stable
+        if: ${{ !contains(steps.get_tag.outputs.tag, '-') }}
+        env:
+          STABLE_TAG:  ${{ steps.get_tag.outputs.tag }}
+          MOVE_LATEST: ${{ steps.publish.outputs.make_latest == 'true' && '1' || '0' }}
+        run: ./hack/promote-retag.sh "${STABLE_TAG}"
+
+      # Publish the stable cozy-installer OCI chart — the documented install path
+      # (`helm upgrade --install cozystack oci://…/cozy-installer --version X.Y.Z`).
+      # The retag above covers component images + the cozystack-packages artifact,
+      # but the chart is a separate OCI artifact referenced in no values.yaml, so
+      # the stable install 404s (manifest unknown) unless it is published here.
+      # No container rebuild: the chart is packaged from the merged stable tree,
+      # which pins the retagged images + artifact by digest; only the chart's
+      # version and its platformVersion default are stamped.
+      - name: Publish stable cozy-installer chart
+        if: ${{ !contains(steps.get_tag.outputs.tag, '-') }}
+        env:
+          TAG:         ${{ steps.get_tag.outputs.tag }}
+          MAKE_LATEST: ${{ steps.publish.outputs.make_latest }}
+        run: |
+          set -eu
+          STABLE_VERSION="${TAG#v}"
+          # Bake the correct platform version into the chart's DEFAULT values so
+          # the primary `helm --install --version X.Y.Z` path reports the stable
+          # version in telemetry — the operator image itself still carries the rc
+          # version baked at build time, and this env override is what corrects
+          # it. Done on the working tree only (never committed): committing it
+          # would leak platformVersion=vX.Y.Z onto main/the release line when the
+          # promote PR merges, mis-stamping the next rc built from that branch.
+          export STABLE_VERSION
+          yq -i '.cozystackOperator.platformVersion = "v" + strenv(STABLE_VERSION)' \
+            packages/core/installer/values.yaml
+          PKG="$(helm package packages/core/installer \
+            --version "${STABLE_VERSION}" --app-version "${STABLE_VERSION}" | awk '{print $NF}')"
+          helm push "$PKG" "oci://${REGISTRY}"
+          rm -f "$PKG"
+          # cozy-installer:latest tracks the newest stable, matching the image
+          # :latest and the release's `latest` flag — never moved by a patch on
+          # an older line.
+          if [ "${MAKE_LATEST}" = "true" ]; then
+            skopeo copy --multi-arch all \
+              "docker://${REGISTRY}/cozy-installer:${STABLE_VERSION}" \
+              "docker://${REGISTRY}/cozy-installer:latest"
+          fi
diff --git a/.github/workflows/pull-requests.yaml b/.github/workflows/pull-requests.yaml
index 25daa04dcc..b8b06fedfb 100644
--- a/.github/workflows/pull-requests.yaml
+++ b/.github/workflows/pull-requests.yaml
@@ -5,120 +5,872 @@ env:
   REGISTRY: iad.ocir.io/idyksih5sir9/cozystack
 on:
   pull_request:
-    types: [opened, synchronize, reopened]
+    # `labeled` makes the promote PR's release-candidate verification and manual
+    # full-e2e opt-in actionable after the bot opens it. The plan/resolve guards
+    # below discard every other label event before it can launch work.
+    types: [opened, synchronize, reopened, labeled]
 
 # Cancel in‑flight runs for the same PR when a new push arrives.
+#
+# A `labeled` event that `plan` discards gets its OWN group, so labelling an
+# open PR cannot cancel a live opened/synchronize run. Any label other than
+# full-e2e/release makes `plan` skip, and `e2e-report` skips with it, so without the
+# split the pair "cancel the real run, then skip" left the head SHA with no
+# "E2E Tests" status at all — and an unposted required status stays "Expected",
+# blocking the merge until someone pushes again or re-runs the cancelled run.
+# Observed on live CI: run 30614258694 (cancelled) followed by 30614280603
+# (skipped) on the same SHA, 24s apart, from a maintainer adding kind/* labels
+# just after a push. (`pr-labeler` cannot cause this — it labels with the
+# default GITHUB_TOKEN, which by design triggers no further workflow runs.)
+#
+# The condition is the exact complement of `plan`'s guard, so only a run that
+# will publish NOTHING is moved aside. A `labeled` run carrying full-e2e or
+# release does publish, so it stays in the main group and supersedes the head
+# run the way a push does. That keeps exactly one publisher of the `E2E Tests`
+# context alive per head SHA, which the status depends on: two live publishers are latest-wins
+# per context, and the full suite is the superset, so a full-e2e run that fails
+# early — a build flake, a suite failing at minute twenty — would finish before
+# the narrower head run it was meant to widen, and that run's later green would
+# erase the failure. Cancelling also means opting into the full suite costs one
+# suite rather than two, and a second label landing afterwards cannot cancel the
+# full-e2e run, because it is no longer in the same group as it.
+#
+# `release` publishes on the SAME-REPO lane only, hence the fork term. A promote
+# PR is opened same-repo by the release bot, so the label on a fork PR is always
+# a mislabel — and on that lane it would be a destructive one. e2e-fork.yaml's
+# `resolve` decides "this run built nothing, so it is not a verdict" by asking
+# whether `Plan build` skipped; a fork run that gets past `plan` then fails
+# closed on the pr-patch artifact its own `release` label gated off, posting red
+# on a suite that was never going to run, with no `unlabeled` trigger to undo
+# it. Excluding forks keeps the label as inert on that lane as it was before
+# promotion started using it. The term appears in both this key and `plan`'s
+# guard because the two must stay exact complements: NOT(A OR B OR (C AND NOT
+# F)) is (NOT A) AND (NOT B) AND (NOT C OR F), and for a same-repo PR F is false
+# and both sides reduce to exactly what they were.
 concurrency:
-  group: pr-${{ github.workflow }}-${{ github.event.pull_request.number }}
+  group: pr-${{ github.workflow }}-${{ github.event.pull_request.number }}${{ (github.event.action == 'labeled' && github.event.label.name != 'full-e2e' && (github.event.label.name != 'release' || github.event.pull_request.head.repo.fork)) && '-label' || '' }}
   cancel-in-progress: true
 
+# Top-level token defaults to read-only. A job-level block replaces this one
+# rather than adding to it, so each job restates every scope it needs.
+permissions:
+  contents: read
+
 jobs:
-  detect-changes:
-    name: Detect changes
+  # Compute the docs-only gate and the per-package build matrix from the PR
+  # diff. hack/build-matrix.sh parses the root Makefile `build:` target (the
+  # single source of truth) and emits only the units whose package dir changed,
+  # escalating to the full set on a shared-dependency change. talos + installer
+  # are handled by dedicated jobs (see build-matrix.sh for why).
+  plan:
+    name: Plan build
     runs-on: ubuntu-latest
+    # Exact complement of the concurrency key above; see the reasoning there,
+    # including why `release` is admitted for same-repo PRs only.
+    if: github.event.action != 'labeled' || github.event.label.name == 'full-e2e' || (github.event.label.name == 'release' && !github.event.pull_request.head.repo.fork)
+    permissions:
+      contents: read
+      # For the opening `E2E Tests` status below; e2e-report writes the terminal
+      # one with the same scope.
+      statuses: write
     outputs:
-      code: ${{ steps.filter.outputs.code }}
+      code: ${{ steps.p.outputs.code }}
+      matrix: ${{ steps.p.outputs.matrix }}
+      any: ${{ steps.p.outputs.any }}
+      touched: ${{ steps.p.outputs.touched }}
+      talos: ${{ steps.p.outputs.talos }}
+    steps:
+      # Claim the required context for THIS run before anything can be merged on
+      # the strength of the last one. Commit statuses are latest-wins per (sha,
+      # context) and nothing expires them, so a head SHA that already went green
+      # keeps reading green while a newly started run works — re-run all jobs, a
+      # full-e2e label, a reopen — and the PR stays mergeable through a suite
+      # that may be about to fail. While the gate was a job, GitHub created a
+      # fresh non-success check run each time and that window did not exist.
+      # Overwriting with `pending` here restores it: the run that owns the
+      # status says so at the start and concludes it in e2e-report.
+      #
+      # Same-repo only. A fork's `pull_request` token is read-only, so this call
+      # would 403 and fail `plan` on every fork PR, and that read-only token is
+      # exactly what makes the whole commit-status design safe (§10). Fork PRs
+      # get their pending from e2e-fork.yaml's `resolve` instead, which is
+      # privileged.
+      #
+      # Note what that costs a fork. `resolve` cannot start until this entire
+      # run has finished, so the window this step shuts in seconds stays open
+      # for the length of the build on the fork lane. Structural rather than an
+      # oversight, since a read-only token cannot post a status at any point in
+      # the run, and bounded by the build. §10 records it.
+      - name: Open the "E2E Tests" status for this run
+        if: ${{ !github.event.pull_request.head.repo.fork }}
+        # A transient status-API failure here must not take the run with it.
+        # This step is the first in `plan`, and `plan` is what `checks`,
+        # `build`, `build-talos`, `finalize` and `e2e` all hang off, so a
+        # failure costs a full rebuild for nothing. Skipping the opener only
+        # degrades to the behaviour that preceded it — the terminal status
+        # still gets posted by `e2e-report`, and a run that dies before that
+        # leaves the merge blocked either way.
+        continue-on-error: true
+        uses: actions/github-script@f28e40c7f34bde8b3046d885e986cb6290c5673b # v7
+        env:
+          HEAD_SHA: ${{ github.event.pull_request.head.sha }}
+          RUN_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
+        with:
+          script: |
+            const { HEAD_SHA, RUN_URL } = process.env;
+            await github.rest.repos.createCommitStatus({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              sha: HEAD_SHA,
+              state: 'pending',
+              context: 'E2E Tests',
+              description: 'e2e in progress — this run has not reported yet',
+              target_url: RUN_URL,
+            });
+      - uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4
+        with:
+          fetch-depth: 0
+      # e2e-fork.yaml pushes a fork's images only under names the base tree
+      # already exports, so an image the PR adds is refused there after the
+      # whole build. Refuse it here instead, before anything builds. The push
+      # check stays the boundary; a fork can edit this step away.
+      - name: Refuse images the base branch does not build (fork PR)
+        if: ${{ github.event.pull_request.head.repo.fork }}
+        run: |
+          bt="$(mktemp -d)/basetree"
+          git worktree add --quiet --detach "$bt" HEAD^1
+          hack/fork-new-images.sh "$bt" .
+      - name: Compute changed files and build matrix
+        id: p
+        env:
+          BASE_REF: ${{ github.base_ref }}
+        run: |
+          git diff --name-only "origin/${BASE_REF}...HEAD" > /tmp/changed.txt
+          # The docs-only decision reads a RENAME-BLIND list. `git diff
+          # --name-only` applies rename detection and reports a rename as its
+          # new path alone, so moving a code file into docs/ reads as a
+          # docs-only change: nothing builds, no e2e runs, and the removal of
+          # that code path ships untested. It also deadlocks the fork lane,
+          # which answers the same question from `pulls.listFiles` and does see
+          # the old path through `previous_filename`. That lane concludes e2e is
+          # required, then fails closed on a pr-patch artifact this lane never
+          # produced — an unfixable red on a legitimate contribution, with no
+          # label override and no push that clears it. Both lanes have to answer
+          # "is this docs-only" the same way, and the only answer that is also
+          # correct keeps both sides of a rename.
+          #
+          # The build matrix still reads the rename-detected list, which is not
+          # a claim that doing so is right. Moving a file between packages
+          # leaves the source package changed and unselected, so the matrix
+          # under-builds on a cross-package rename. That behaviour predates this
+          # line and is not what the docs-only decision is for, so it is left
+          # alone here rather than widened by a side effect.
+          git diff --name-only --no-renames "origin/${BASE_REF}...HEAD" > /tmp/changed_norenames.txt
+          echo "Changed files:"; sed 's/^/  /' /tmp/changed_norenames.txt
+          if grep -qvE '^docs/' /tmp/changed_norenames.txt; then
+            echo "code=true" >> "$GITHUB_OUTPUT"
+          else
+            echo "code=false" >> "$GITHUB_OUTPUT"
+          fi
+          matrix="$(hack/build-matrix.sh /tmp/changed.txt)"
+          echo "Build matrix: $matrix"
+          echo "matrix=$matrix" >> "$GITHUB_OUTPUT"
+          talos="$(hack/build-talos-needed.sh /tmp/changed_norenames.txt)"
+          echo "Talos build needed: $talos"
+          echo "talos=$talos" >> "$GITHUB_OUTPUT"
+          # Package dirs the PR edited (packages/<area>/<name>). Their committed
+          # refs are the PR's intent and must survive the current-main overlay —
+          # otherwise an upstream image bump in a non-build-unit package would be
+          # silently reverted in e2e/the installer artifact (see
+          # hack/overlay-main-images.sh). Whitespace-separated, no trailing slash.
+          touched="$(sed -nE 's#^(packages/[^/]+/[^/]+)/.*#\1#p' /tmp/changed.txt | sort -u | tr '\n' ' ')"
+          echo "Touched packages: $touched"
+          echo "touched=$touched" >> "$GITHUB_OUTPUT"
+          if [ "$matrix" = "[]" ]; then
+            echo "any=false" >> "$GITHUB_OUTPUT"
+          else
+            echo "any=true" >> "$GITHUB_OUTPUT"
+          fi
+
+  # Promotion publishes the rewritten packages artifact before opening its PR.
+  # Verify GitHub's prospective merge tree here, so a `packages/` edit pushed to
+  # this PR fails the required E2E Tests status before it can merge.
+  #
+  # Checking the MERGE tree rather than the head is what makes base drift
+  # visible when this job runs — but nothing re-runs it when the base moves:
+  # GitHub does not fire `pull_request` on the base branch advancing, it only
+  # recomputes refs/pull/N/merge. So a `packages/` change landing on the base
+  # after this went green is never re-verified here, and the PR stays mergeable
+  # on the stale result. Finalize repeats the check against the real merge
+  # commit before creating the write-once stable tag, which is where that case
+  # is actually caught — loudly, and before any stable name exists.
+  verify-release-candidate:
+    name: Verify release packages candidate
+    runs-on: ubuntu-latest
+    # Matching `checks` and `finalize`. Without a ceiling the job inherits the
+    # 6-hour default, and a stalled `flux pull artifact` would hold the required
+    # `E2E Tests` status pending for all of it, since e2e-report needs this job.
+    timeout-minutes: 30
+    if: |
+      contains(github.event.pull_request.labels.*.name, 'release')
+      && github.event.pull_request.user.login == 'cozystack-ci[bot]'
+      && (github.event.action != 'labeled' || github.event.label.name == 'full-e2e' || github.event.label.name == 'release')
+    permissions:
+      contents: read
+      packages: read
     steps:
-      - uses: dorny/paths-filter@v3
-        id: filter
+      # The default pull_request checkout is GitHub's prospective merge commit,
+      # not just the head branch. That makes base-branch package drift visible.
+      - name: Checkout prospective merge
+        uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4
         with:
-          filters: |
-            code:
-              - '!docs/**'
+          fetch-depth: 0
 
-  build:
-    name: Build
-    runs-on: [self-hosted]
+      # Execute the verifier from the trusted base SHA. An older rc-derived head
+      # may not contain it, and a PR must not be able to weaken its own guard.
+      - name: Checkout release tooling from base
+        uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4
+        with:
+          ref: ${{ github.event.pull_request.base.sha }}
+          path: .release-tooling
+          sparse-checkout: hack
+          persist-credentials: false
+
+      # Both tools are version-pinned. This job decides whether a stable release
+      # may be created, so what it runs has to be a fixed input: `latest/download`
+      # resolves to whatever mikefarah shipped this morning, and a yq that changed
+      # how it emits or compares a value turns a release gate into a moving one.
+      # The version tracks packages/core/testing/images/e2e-sandbox/Dockerfile.
+      # yq is additionally pinned by content; flux comes from the commit-pinned
+      # upstream setup action, which checksums the release tarball.
+      # promote-rc.yaml's copy of this step carries the full reasoning for both.
+      - name: Set up flux
+        uses: fluxcd/flux2/action@04acaec6161ac4fb1a82ffafa88901c03271d34f # v2.8.6
+        with:
+          version: "2.8.6"
+      - name: Set up promotion toolchain (yq)
+        env:
+          YQ_VERSION: "4.53.3"
+          YQ_SHA256: "fa52a4e758c63d38299163fbdd1edfb4c4963247918bf9c1c5d31d84789eded4"
+        run: |
+          if ! yq --version 2>/dev/null | grep -q "mikefarah.* version v${YQ_VERSION}\$"; then
+            yq_bin="$(mktemp)"
+            curl -fsSL -o "$yq_bin" \
+              "https://github.com/mikefarah/yq/releases/download/v${YQ_VERSION}/yq_linux_amd64"
+            printf '%s  %s\n' "$YQ_SHA256" "$yq_bin" | sha256sum -c -
+            sudo install -m 0755 "$yq_bin" /usr/local/bin/yq
+            rm -f "$yq_bin"
+          fi
+
+      - name: Login to registry (GHCR)
+        uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3
+        with:
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+          registry: ghcr.io
+        env:
+          DOCKER_CONFIG: ${{ runner.temp }}/.docker
+
+      - name: Verify stable packages candidate
+        env:
+          DOCKER_CONFIG: ${{ runner.temp }}/.docker
+          HEAD_BRANCH: ${{ github.head_ref }}
+        run: |
+          STABLE_VERSION="${HEAD_BRANCH#release-}"
+          .release-tooling/hack/verify-promoted-packages.sh "$STABLE_VERSION"
+
+  # Helm-unittest + Go controller tests. Decoupled from the image build and from
+  # e2e so they give fast, independent signal; they gate the PR as their own
+  # required check rather than blocking e2e from starting.
+  checks:
+    name: Unit & controller tests
+    runs-on: oracle-vm-4cpu-16gb-x86-64
     timeout-minutes: 30
+    env:
+      # The pipe falls back to direct on any proxy error (hack/common-envs.mk).
+      GOPROXY: "https://proxy.golang.org|direct"
     permissions:
       contents: read
-      packages: write
+    needs: ["plan"]
+    # Unit contracts read both code and documentation. Run this job for every
+    # non-release PR: code changes take the complete unit path, while docs-only
+    # changes run the Bats lane that owns those cross-tree contracts. Builds and
+    # E2E remain gated on `code` below.
+    if: |
+      !contains(github.event.pull_request.labels.*.name, 'release')
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4
+        with:
+          fetch-depth: 0
+      # The module cache is restored from the key build-main.yaml writes on
+      # main, which every PR run can read, so a PR's first run starts warm. The
+      # download fetches whatever the cache lacks, the whole set on a miss. The
+      # Go steps are for code changes only: a docs-only run is the Bats lane alone.
+      - name: Locate Go module cache
+        if: needs.plan.outputs.code == 'true'
+        id: gomodcache
+        run: echo "dir=$(go env GOMODCACHE)" >> "$GITHUB_OUTPUT"
+      - name: Cache Go modules
+        if: needs.plan.outputs.code == 'true'
+        uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
+        with:
+          path: ${{ steps.gomodcache.outputs.dir }}
+          key: go-mod-${{ runner.os }}-${{ hashFiles('**/go.sum') }}
+          restore-keys: go-mod-${{ runner.os }}-
+      - name: Download Go modules
+        if: needs.plan.outputs.code == 'true'
+        run: |
+          for mod in $(git ls-files go.mod '*/go.mod' | xargs -n1 dirname); do
+            (cd "$mod" && "$GITHUB_WORKSPACE/hack/go-mod-download.sh")
+          done
+      # Ephemeral runners don't carry the helm-unittest plugin the persistent
+      # self-hosted runner accreted. The plugin embeds its own Helm, so its
+      # version is pinned: a plugin release must not change test results. Bats is
+      # installed on every run, docs-only ones included.
+      - name: Set up test toolchain
+        env:
+          CODE_CHANGED: ${{ needs.plan.outputs.code }}
+          HELM_UNITTEST_VERSION: "1.1.2"
+          BATS_VERSION: "1.14.0"
+          BATS_COMMIT: eb7f42f8d608ac693d7a4b67474f6714ea68cfc5
+        run: |
+          set -euo pipefail
+          if [ "$CODE_CHANGED" = true ]; then
+            installed="$(helm plugin list 2>/dev/null | awk '$1 == "unittest" { print $2 }' || true)"
+            if [ "$installed" != "$HELM_UNITTEST_VERSION" ]; then
+              [ -z "$installed" ] || helm plugin uninstall unittest
+              helm plugin install https://github.com/helm-unittest/helm-unittest --version "v${HELM_UNITTEST_VERSION}"
+            fi
+          fi
+          # Source archive bytes can change; verify the tag's commit before install.
+          if ! bats --version 2>/dev/null | grep -qx "Bats $BATS_VERSION"; then
+            bats_parent=$(mktemp -d "$RUNNER_TEMP/bats-core.XXXXXX")
+            bats_source="$bats_parent/source"
+            git clone --quiet --depth=1 --branch "v$BATS_VERSION" \
+              https://github.com/bats-core/bats-core.git "$bats_source"
+            test "$(git -C "$bats_source" rev-parse HEAD)" = "$BATS_COMMIT"
+            sudo "$bats_source/install.sh" /usr/local
+          fi
+          bats --version | grep -qx "Bats $BATS_VERSION"
+      # setup-envtest and the kube-apiserver and etcd it fetches, so a pull
+      # request downloads them only when the versions pinned in the Makefile
+      # change, and an outage at their sources cannot fail unrelated changes.
+      # The envtest target runs the controller suites a fake client cannot
+      # stand in for.
+      - name: Cache envtest binaries
+        if: needs.plan.outputs.code == 'true'
+        uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
+        with:
+          path: _out/envtest
+          key: envtest-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('Makefile') }}
+      # -k is required, not cosmetic: unit-tests and test-controllers are two
+      # independent goals on the same command line, and without -k make stops
+      # handing out new work the moment any unit-tests prerequisite fails —
+      # test-controllers then never starts and reports nothing, so a red BATS
+      # file hides the entire Go controller suite. -k lets already-schedulable
+      # goals keep running; the job still fails overall on any red target.
+      - name: Run unit and controller tests
+        if: needs.plan.outputs.code == 'true'
+        run: make unit-tests test-controllers test-controllers-envtest -j4 -k --output-sync=target
+      - name: Run Bats unit tests for docs-only changes
+        if: needs.plan.outputs.code == 'false'
+        run: make bats-unit-tests
+      - name: Upload unit test report
+        if: always()
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
+        with:
+          name: bats-unit-report
+          path: _out/test-reports/
+          if-no-files-found: ignore
 
-    needs: ["detect-changes"]
-    # Never run when the PR carries the "release" label or only docs changed.
+  # One image (package) per job, fanned out across the ephemeral pool. Each job
+  # gets its own buildx (docker-container driver) so the shared-buildkit
+  # contention that wedged the old single Build job (#2937) is severed by
+  # construction. Each job patches only its own package's values.yaml/.tag files
+  # and uploads that diff as a patch fragment; `finalize` reassembles them.
+  build:
+    name: Build ${{ matrix.pkg }}
+    needs: ["plan"]
     if: |
-      needs.detect-changes.outputs.code == 'true'
+      needs.plan.outputs.code == 'true'
+      && needs.plan.outputs.any == 'true'
       && !contains(github.event.pull_request.labels.*.name, 'release')
-
+    runs-on: oracle-vm-4cpu-16gb-x86-64
+    timeout-minutes: 30
+    permissions:
+      contents: read
+    strategy:
+      fail-fast: false
+      matrix:
+        pkg: ${{ fromJSON(needs.plan.outputs.matrix) }}
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4
         with:
           fetch-depth: 0
           fetch-tags: true
-
-      - name: Run unit tests
-        run: make unit-tests
-
-      - name: Run controller Go tests
-        run: make test-controllers
-
+      # installer is built in finalize, but some package image targets shell out
+      # to flux.
+      - name: Set up flux
+        uses: fluxcd/flux2/action@04acaec6161ac4fb1a82ffafa88901c03271d34f # v2.8.6
+        with:
+          version: "2.8.6"
       - name: Set up Docker config
         run: |
           if [ -d ~/.docker ]; then
             cp -r ~/.docker "${{ runner.temp }}/.docker"
           fi
-
       - name: Login to GitHub Container Registry
         if: ${{ !github.event.pull_request.head.repo.fork }}
-        uses: docker/login-action@v3
+        uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3
         with:
-          username: ${{ secrets.OCIR_USER}}
+          username: ${{ secrets.OCIR_USER }}
           password: ${{ secrets.OCIR_TOKEN }}
           registry: iad.ocir.io
         env:
           DOCKER_CONFIG: ${{ runner.temp }}/.docker
-
-      - name: Build
-        run: make build
+      # docker-container driver: isolated buildkit per job (no shared-buildkit
+      # contention) and a prerequisite for the mode=max cache reads (#2938).
+      # Its buildkitd also routes docker.io base-image pulls through
+      # mirror.gcr.io (hack/buildkitd.toml): the Build step authenticates only
+      # to the push registry (OCIR), so base images (golang/ubuntu/nginx/...)
+      # would otherwise be pulled from Docker Hub anonymously and intermittently
+      # trip its anonymous-pull rate limit; the mirror sidesteps that and falls
+      # back to Docker Hub on a miss/outage. Create the builder under the SAME
+      # DOCKER_CONFIG the Build step reads (runner.temp/.docker, holding the
+      # OCIR auth) so buildx forwards push/cache auth to the container builder.
+      - name: Set up Buildx (docker-container driver, docker.io mirror)
+        id: buildx
+        uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0
+        with:
+          driver: docker-container
+          buildkitd-config: hack/buildkitd.toml
+        env:
+          DOCKER_CONFIG: ${{ runner.temp }}/.docker
+      - name: Build ${{ matrix.pkg }}
+        run: |
+          mkdir -p _out/oci
+          make -C "$PKG" image
         env:
+          PKG: ${{ matrix.pkg }}
           DOCKER_CONFIG: ${{ runner.temp }}/.docker
+          # Build on the docker-container builder created above so base-image
+          # pulls go through the docker.io mirror (BUILDX_ARGS adds
+          # --builder=$(BUILDER)).
+          BUILDER: ${{ steps.buildx.outputs.name }}
+          # common-envs.mk defaults to amd64+arm64. Nothing here sets up QEMU,
+          # and on this x86-64 runner the arm64 half would be emulated anyway;
+          # CI builds amd64 until arm64 has a native leg of its own.
+          PLATFORM: linux/amd64
           # Unique per (PR, commit) so concurrent PR builds never push the same
-          # tag. PUBLISH_VERSIONED/PUBLISH_FLOATING stay off — PR images are
-          # consumed by digest, and :latest belongs to release builds.
+          # tag. PR images are consumed by digest; :latest belongs to releases.
           IMAGE_TAG: pr-${{ github.event.pull_request.number }}-${{ github.event.pull_request.head.sha }}
           PUBLISH_VERSIONED: '0'
           PUBLISH_FLOATING: '0'
+          # Fork PRs get no registry credentials, so instead of pushing, build
+          # each image to <workspace>/_out/oci/<name>.oci.tar and upload it below;
+          # the privileged e2e-fork.yaml workflow_run pushes them by digest. Empty
+          # on same-repo PRs → normal push path. Setting it also forces PUSH/LOAD
+          # off in common-envs.mk (#3257). Must be ABSOLUTE (workspace-rooted):
+          # the build runs `make -C <pkg>`, so buildx resolves a relative dest
+          # against the package dir — the archive would land in <pkg>/_out/oci and
+          # miss the repo-root _out/oci the upload reads.
+          OCI_EXPORT_DIR: ${{ github.event.pull_request.head.repo.fork && format('{0}/_out/oci', github.workspace) || '' }}
+      - name: Capture digest patch fragment
+        id: frag
+        env:
+          PKG: ${{ matrix.pkg }}
+        run: |
+          safe="$(echo "$PKG" | tr '/' '-')"
+          mkdir -p _out/fragments
+          # --binary so vendored binary provider bundles (components*.gz),
+          # which some package image targets regenerate, survive reassembly
+          # in finalize (a plain "Binary files differ" stub is unappliable).
+          git diff --binary HEAD > "_out/fragments/${safe}.patch"
+          echo "safe=${safe}" >> "$GITHUB_OUTPUT"
+          echo "Fragment for ${PKG}:"; git --no-pager diff --stat HEAD
+      - name: Upload patch fragment
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
+        with:
+          name: pr-patch-fragment-${{ steps.frag.outputs.safe }}
+          path: _out/fragments/${{ steps.frag.outputs.safe }}.patch
+          if-no-files-found: error
+      # Fork PR only: the images were exported to OCI archives instead of pushed
+      # (OCI_EXPORT_DIR above). Upload them for e2e-fork.yaml to push by digest.
+      - name: Upload OCI image archives (fork PR)
+        if: ${{ github.event.pull_request.head.repo.fork }}
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
+        with:
+          name: pr-oci-${{ steps.frag.outputs.safe }}
+          path: _out/oci/*.oci.tar
+          if-no-files-found: error
 
-      - name: Build Talos image
-        run: make -C packages/core/talos talos-nocloud
-
-      - name: Save git diff as patch
-        if: "!contains(github.event.pull_request.labels.*.name, 'release')"
-        run: git diff HEAD > _out/assets/pr.patch
+  # Talos is its own leg: the installer tarball is heavy and the Talos image is
+  # built from it, so both live in one job. No nocloud disk is built here any
+  # more, and e2e no longer downloads one -- the container lane boots the
+  # upstream Talos container image. `images/talos/profiles/nocloud.yaml` is
+  # therefore compiled by nightly.yaml and by the tag build's `make assets`.
+  #
+  # For same-repo PRs, the plan job classifies the rename-blind changed-path
+  # list with build-talos-needed.sh. That list includes direct Talos sources and
+  # the shared Makefile/Buildx/workflow inputs that determine this job's output;
+  # line-based classification avoids depending on the formatting of `touched`.
+  # A successful run stamps packages/extra/bootbox/images/matchbox.tag, and
+  # finalize preserves that generated ref when it overlays base-branch images.
+  #
+  # Fork PRs keep the previous unconditional behavior as a conservative scope
+  # boundary. Their build/export and privileged publication path spans a second
+  # workflow and is not optimized here. The installer job also exports an OCI
+  # archive, so archive availability is not a reason to require Talos itself.
+  build-talos:
+    name: Build Talos
+    needs: ["plan"]
+    if: |
+      needs.plan.outputs.code == 'true'
+      && !contains(github.event.pull_request.labels.*.name, 'release')
+      && (
+        github.event.pull_request.head.repo.fork
+        || needs.plan.outputs.talos == 'true'
+      )
+    runs-on: oracle-vm-4cpu-16gb-x86-64
+    timeout-minutes: 40
+    permissions:
+      contents: read
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4
+        with:
+          fetch-depth: 0
+          fetch-tags: true
+      - name: Set up Docker config
+        run: |
+          if [ -d ~/.docker ]; then
+            cp -r ~/.docker "${{ runner.temp }}/.docker"
+          fi
+      - name: Login to GitHub Container Registry
+        if: ${{ !github.event.pull_request.head.repo.fork }}
+        uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3
+        with:
+          username: ${{ secrets.OCIR_USER }}
+          password: ${{ secrets.OCIR_TOKEN }}
+          registry: iad.ocir.io
+        env:
+          DOCKER_CONFIG: ${{ runner.temp }}/.docker
+      # buildkitd-config routes docker.io base-image pulls through mirror.gcr.io
+      # (hack/buildkitd.toml) so the talos image build dodges Docker Hub's
+      # anonymous-pull rate limit; see the build job for the full rationale.
+      - name: Set up Buildx (docker-container driver, docker.io mirror)
+        id: buildx
+        uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0
+        with:
+          driver: docker-container
+          buildkitd-config: hack/buildkitd.toml
+        env:
+          DOCKER_CONFIG: ${{ runner.temp }}/.docker
+      - name: Build Talos image (matchbox + installer tarball)
+        run: |
+          mkdir -p _out/oci
+          make -C packages/core/talos image
+        env:
+          DOCKER_CONFIG: ${{ runner.temp }}/.docker
+          BUILDER: ${{ steps.buildx.outputs.name }}
+          # amd64 only, as in the build job. The arm64 installer needs no QEMU,
+          # but nothing a PR runs boots it. matchbox still gets the arm64 kernel
+          # and initramfs.
+          PLATFORM: linux/amd64
+          IMAGE_TAG: pr-${{ github.event.pull_request.number }}-${{ github.event.pull_request.head.sha }}
+          PUBLISH_VERSIONED: '0'
+          PUBLISH_FLOATING: '0'
+          # Fork PR: export to OCI archive instead of pushing (see build job).
+          OCI_EXPORT_DIR: ${{ github.event.pull_request.head.repo.fork && format('{0}/_out/oci', github.workspace) || '' }}
+      - name: Capture Talos patch fragment
+        run: |
+          mkdir -p _out/fragments
+          git diff --binary HEAD > _out/fragments/talos.patch
+          echo "Talos fragment:"; git --no-pager diff --stat HEAD
+      - name: Upload Talos patch fragment
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
+        with:
+          name: pr-patch-fragment-talos
+          path: _out/fragments/talos.patch
+          if-no-files-found: error
+      # Fork PR only: upload the Talos image OCI archive for e2e-fork.yaml.
+      - name: Upload Talos OCI image archive (fork PR)
+        if: ${{ github.event.pull_request.head.repo.fork }}
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
+        with:
+          name: pr-oci-talos
+          path: _out/oci/*.oci.tar
+          if-no-files-found: error
 
+  # Reassemble the unified pr.patch from every fragment, then build the installer
+  # LAST: `make -C packages/core/installer image` runs `flux push artifact
+  # --path=packages`, which bundles the WHOLE digest-patched tree into the OCI
+  # artifact the operator pulls — so every other package's digest edit must
+  # already be applied here. e2e consumes the resulting pr.patch unchanged.
+  finalize:
+    name: Finalize (merge patches + installer)
+    # Depends on `checks` too: gating finalize on unit/controller tests cascades
+    # to e2e (which needs finalize), so a red unit test skips the expensive
+    # install+e2e path instead of wasting ~1h on it. Restores the gating the old
+    # in-build-job tests gave, without re-coupling the cheap parallel builds.
+    needs: ["plan", "checks", "build", "build-talos"]
+    if: |
+      !cancelled()
+      && needs.plan.outputs.code == 'true'
+      && !contains(github.event.pull_request.labels.*.name, 'release')
+      && needs.checks.result == 'success'
+      && (needs.build.result == 'success' || needs.build.result == 'skipped')
+      && (needs.build-talos.result == 'success' || needs.build-talos.result == 'skipped')
+    runs-on: oracle-vm-4cpu-16gb-x86-64
+    timeout-minutes: 30
+    permissions:
+      contents: read
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4
+        with:
+          fetch-depth: 0
+          fetch-tags: true
+      - name: Set up flux
+        uses: fluxcd/flux2/action@04acaec6161ac4fb1a82ffafa88901c03271d34f # v2.8.6
+        with:
+          version: "2.8.6"
+      - name: Download patch fragments
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
+        with:
+          pattern: pr-patch-fragment-*
+          merge-multiple: true
+          path: _out/fragments
+      - name: Apply digest fragments
+        run: |
+          applied=0
+          # Each fragment patches only its own package's files; --3way lets two
+          # fragments that touch adjacent lines of a shared file (e.g. a package
+          # Makefile that writes a sibling package's values.yaml) merge cleanly
+          # instead of the second apply aborting the whole finalize.
+          for f in _out/fragments/*.patch; do
+            [ -s "$f" ] || continue
+            echo "Applying $f"
+            git apply --3way "$f"
+            applied=$((applied + 1))
+          done
+          echo "Applied $applied fragment(s)"
+          git --no-pager diff --stat HEAD
+      - name: Set up Docker config
+        run: |
+          if [ -d ~/.docker ]; then
+            cp -r ~/.docker "${{ runner.temp }}/.docker"
+          fi
+      - name: Login to GitHub Container Registry
+        if: ${{ !github.event.pull_request.head.repo.fork }}
+        uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3
+        with:
+          username: ${{ secrets.OCIR_USER }}
+          password: ${{ secrets.OCIR_TOKEN }}
+          registry: iad.ocir.io
+        env:
+          DOCKER_CONFIG: ${{ runner.temp }}/.docker
+      # Overlay current-main image refs onto every package this PR did NOT
+      # rebuild. Without it, unbuilt packages fall back to the last-release refs
+      # committed in the tree (e.g. v1.5.0) even when main is hundreds of commits
+      # ahead — so e2e and the installer's packages artifact would ship stale
+      # images for everything outside this PR's build matrix. Source of truth is
+      # the cozystack-packages:main OCI artifact build-main.yaml already
+      # publishes (the whole current-main packages tree, refs digest-pinned to
+      # main's images). Runs after login (creds available) and before the
+      # installer build below so the flux-pushed packages tree — and the
+      # pr.patch e2e applies — already reflect the overlay. A missing artifact
+      # (build-main not yet green) is a no-op: packages keep their committed
+      # refs (prior behaviour). See hack/overlay-main-images.sh.
+      #
+      # Read the artifact for the PR's OWN base branch, not always main. Overlaying
+      # main's images onto a release-line PR mixes generations: main's binaries
+      # against that line's charts. #3437 (a one-line change on release-1.6) failed
+      # install deterministically that way, because main's cozystack-controller
+      # served an aggregated OpenAPI release-1.6's charts could not validate
+      # against (`unknown model in reference: …v1alpha1.OptionSpec`) — a broken
+      # lane reading as a broken PR. build-release.yaml publishes
+      # cozystack-packages:<line> for every maintained release-<major>.<minor>
+      # branch, so each base branch has its own artifact to read.
+      #
+      # A base that is neither main nor a line (a stacked PR's feature branch) has
+      # no artifact, and a `/` in it is not even a valid OCI tag. It reads the
+      # artifact of whichever of main and the lines it has the fewest commits on
+      # top of. A tie goes to main. A line with no commit of its own yet is, in
+      # the graph, main at the cut commit, so a stack on it ties and reads the
+      # artifact built from main's tip. That artifact carries newer images than
+      # the line once main moves past the cut. The stack keeps reading it until
+      # it contains a commit of the line's own. Breaking the tie towards the
+      # line instead would misroute the far more common branch forked from main
+      # before the cut, which ties the same way.
+      #
+      # A missing artifact stays a no-op (packages keep their committed refs), which
+      # also covers a line whose first build-release run has not landed yet.
+      - name: Pull base-branch packages tree
+        run: |
+          ARTIFACT_REF="$BASE_REF"
+          if [ "$BASE_REF" != "main" ] \
+            && ! printf '%s' "$BASE_REF" | grep -qE '^release-[0-9]+\.[0-9]+$'; then
+            ARTIFACT_REF=main
+            # A re-run can outlive its base: the payload keeps a branch deleted since.
+            if git rev-parse --verify --quiet "origin/${BASE_REF}" >/dev/null; then
+              best="$(git rev-list --count "origin/main..origin/${BASE_REF}")"
+              for line in $(git for-each-ref --format='%(refname:lstrip=3)' 'refs/remotes/origin/release-*' \
+                              | grep -E '^release-[0-9]+\.[0-9]+$'); do
+                n="$(git rev-list --count "origin/${line}..origin/${BASE_REF}")"
+                if [ "$n" -lt "$best" ]; then best="$n"; ARTIFACT_REF="$line"; fi
+              done
+            fi
+            echo "::notice::Base ${BASE_REF} publishes no packages artifact; overlaying cozystack-packages:${ARTIFACT_REF}."
+          fi
+          rm -rf _out/mainpkgs
+          mkdir -p _out/mainpkgs
+          if ! flux pull artifact "oci://${REGISTRY}/cozystack-packages:${ARTIFACT_REF}" \
+                 --output _out/mainpkgs; then
+            rm -rf _out/mainpkgs
+            # Degrading to committed refs is safe, but SAY so: on a release line a
+            # missing artifact means build-release.yaml has not published this line
+            # yet (first build pending, or its branch filter does not match this
+            # branch), and the PR is then testing the line's last release instead of
+            # its tip. Silent would look identical to a working overlay.
+            if [ "${ARTIFACT_REF}" = "main" ]; then
+              echo "cozystack-packages:${ARTIFACT_REF} pull failed — keeping committed refs"
+            else
+              echo "::warning title=No packages artifact for ${ARTIFACT_REF}::Keeping committed refs, so unbuilt packages use this line's last release rather than its tip. Check that build-release.yaml has run for ${ARTIFACT_REF}."
+            fi
+          fi
+        env:
+          DOCKER_CONFIG: ${{ runner.temp }}/.docker
+          # Env-passed, not interpolated into the script: base_ref is repo-controlled
+          # here (a branch name in this repo), but the workflow-injection hygiene
+          # applies uniformly.
+          BASE_REF: ${{ github.base_ref }}
+      - name: Overlay base-branch refs for unbuilt packages
+        # Best-effort: this only improves WHICH images e2e and the installer use,
+        # so an unexpected failure must degrade to the committed refs (prior
+        # behaviour), never block the PR. overlay-main-images.sh already handles
+        # the expected paths (missing artifact, drift, absent unit) internally —
+        # including the empty directory the step above leaves when a line has no
+        # artifact yet.
+        run: |
+          rebuilt="$BUILD_MATRIX"
+          if [ "$TALOS_RESULT" = "success" ]; then
+            case "$rebuilt" in
+              '[]') rebuilt='["packages/extra/bootbox"]' ;;
+              *) rebuilt="${rebuilt%]},\"packages/extra/bootbox\"]" ;;
+            esac
+          fi
+          hack/overlay-main-images.sh _out/mainpkgs "$rebuilt" "$PR_TOUCHED" \
+            || echo "::warning::overlay-main-images failed; unbuilt packages keep committed refs"
+        env:
+          # The set of packages THIS PR rebuilt; their pr-<N>-<sha> refs are
+          # authoritative, so overlay-main-images.sh skips them. Computed by the
+          # plan job from the Makefile (a JSON array of package dirs), not from
+          # untrusted PR input — passed via env per workflow-injection hygiene.
+          BUILD_MATRIX: ${{ needs.plan.outputs.matrix }}
+          # build-talos writes matchbox.tag under extra/bootbox rather than its
+          # own package. Preserve that generated ref only when the job actually
+          # succeeded; when it was skipped, the base-branch ref should overlay.
+          TALOS_RESULT: ${{ needs.build-talos.result }}
+          # Packages THIS PR edited (changed-file dirs from the plan job's git
+          # diff). Their committed refs are the PR's intent — an upstream image
+          # bump in a non-build-unit package would otherwise be silently reverted
+          # by the overlay — so overlay-main-images.sh preserves them. Also
+          # env-passed, derived from the diff, not from untrusted PR input.
+          PR_TOUCHED: ${{ needs.plan.outputs.touched }}
+      # buildkitd-config routes docker.io base-image pulls through mirror.gcr.io
+      # (hack/buildkitd.toml) so the installer build dodges Docker Hub's
+      # anonymous-pull rate limit; see the build job for the full rationale.
+      - name: Set up Buildx (docker-container driver, docker.io mirror)
+        id: buildx
+        uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0
+        with:
+          driver: docker-container
+          buildkitd-config: hack/buildkitd.toml
+        env:
+          DOCKER_CONFIG: ${{ runner.temp }}/.docker
+      # Same-repo PR: build the operator image AND flux-push the now-fully-patched
+      # packages tree, then patch the installer's platformSourceRef to that
+      # artifact. Fork PR: no registry creds — build ONLY the operator image to an
+      # OCI archive (image-packages/chart, which push, are skipped) and upload it;
+      # e2e-fork.yaml pushes the operator + flux-pushes the packages tree and
+      # bakes platformSourceRef there. The overlay above already ran, so the
+      # pr.patch assembled below carries the fully digest-pinned tree either way.
+      - name: Build installer (operator + packages artifact)
+        run: |
+          mkdir -p _out/oci
+          if [ "$IS_FORK" = "true" ]; then
+            make -C packages/core/installer pre-checks image-operator
+          else
+            make -C packages/core/installer image
+          fi
+        env:
+          DOCKER_CONFIG: ${{ runner.temp }}/.docker
+          BUILDER: ${{ steps.buildx.outputs.name }}
+          # amd64 only, as in the build job.
+          PLATFORM: linux/amd64
+          IMAGE_TAG: pr-${{ github.event.pull_request.number }}-${{ github.event.pull_request.head.sha }}
+          PUBLISH_VERSIONED: '0'
+          PUBLISH_FLOATING: '0'
+          IS_FORK: ${{ github.event.pull_request.head.repo.fork }}
+          OCI_EXPORT_DIR: ${{ github.event.pull_request.head.repo.fork && format('{0}/_out/oci', github.workspace) || '' }}
+      # Fork PR only: upload the operator image OCI archive for e2e-fork.yaml.
+      - name: Upload installer OCI image archive (fork PR)
+        if: ${{ github.event.pull_request.head.repo.fork }}
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
+        with:
+          name: pr-oci-installer
+          path: _out/oci/*.oci.tar
+          if-no-files-found: error
+      - name: Assemble pr.patch
+        run: |
+          mkdir -p _out/assets
+          # --binary so regenerated provider bundles (components*.gz) stay in
+          # the patch e2e applies; mirrors main's pr.patch binary fix (#e566992).
+          git diff --binary HEAD > _out/assets/pr.patch
+          echo "Final pr.patch:"; git --no-pager diff --stat HEAD
       - name: Upload git diff patch
-        if: "!contains(github.event.pull_request.labels.*.name, 'release')"
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
         with:
           name: pr-patch
           path: _out/assets/pr.patch
-     
-      - name: Upload Talos image
-        uses: actions/upload-artifact@v4
-        with:
-          name: talos-image
-          path: _out/assets/nocloud-amd64.raw.xz
+          if-no-files-found: error
 
   resolve_assets:
     name: "Resolve assets"
     runs-on: ubuntu-latest
-    if: contains(github.event.pull_request.labels.*.name, 'release')
-    outputs:
-      disk_id:      ${{ steps.fetch_assets.outputs.disk_id }}
-
+    # In lockstep with `plan`, fork term included: this job is on `e2e`'s
+    # release arm, so a label event `plan` runs for and this job skips for
+    # leaves `e2e` with both arms false while `e2e-report` still runs. On a
+    # promote PR already carrying full-e2e that reaches the final `else` — the
+    # "e2e not repeated" branch is bypassed by full-e2e — and posts `E2E Tests`
+    # = failure over a green one, unclearable without a push because
+    # `unlabeled` is not a trigger. The fork term keeps a `release` label on a
+    # fork PR as inert as it was before promotion used the label: without it
+    # this job runs there and fails resolving a draft release for a branch that
+    # is not `release-X.Y.Z`. It short-circuits on `action != 'labeled'`, so the
+    # pre-existing behaviour on a push to such a PR is unchanged.
+    if: |
+      contains(github.event.pull_request.labels.*.name, 'release')
+      && (github.event.action != 'labeled' || github.event.label.name == 'full-e2e' || (github.event.label.name == 'release' && !github.event.pull_request.head.repo.fork))
+    permissions:
+      contents: read
     steps:
       - name: Generate GitHub App token
         id: app-token
-        uses: actions/create-github-app-token@v1
+        uses: actions/create-github-app-token@d72941d797fd3113feb6b93fd0dec494b13a2547 # v1
         with:
           app-id: ${{ secrets.COZYSTACK_CI_APP_ID }}
           private-key: ${{ secrets.COZYSTACK_CI_PRIVATE_KEY }}
           owner: cozystack
+          repositories: ${{ github.event.repository.name }}
+          permission-contents: read
 
       - name: Checkout code
         if: contains(github.event.pull_request.labels.*.name, 'release')
-        uses: actions/checkout@v4
+        uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4
         with:
           fetch-depth: 0
           fetch-tags: true
@@ -126,7 +878,7 @@ jobs:
       - name: Extract tag from PR branch (release PR)
         if: contains(github.event.pull_request.labels.*.name, 'release')
         id: get_tag
-        uses: actions/github-script@v7
+        uses: actions/github-script@f28e40c7f34bde8b3046d885e986cb6290c5673b # v7
         with:
           script: |
             const branch = context.payload.pull_request.head.ref;
@@ -137,10 +889,15 @@ jobs:
             }
             core.setOutput('tag', `v${m[1]}`);
 
-      - name: Find draft release & asset IDs (release PR)
+      # The draft release has to exist for a promote PR's e2e arm to mean
+      # anything, and this job is what proves it. It used to also resolve the
+      # nocloud disk asset and export its id; the container lane boots no disk,
+      # so nothing in this workflow reads that id any more and resolving it only
+      # added a way to fail a release PR over an asset it does not use. The
+      # asset's presence is still checked in e2e-tag.yaml and promote-rc.yaml.
+      - name: Verify draft release exists (release PR)
         if: contains(github.event.pull_request.labels.*.name, 'release')
-        id: fetch_assets
-        uses: actions/github-script@v7
+        uses: actions/github-script@f28e40c7f34bde8b3046d885e986cb6290c5673b # v7
         with:
           github-token: ${{ steps.app-token.outputs.token }}
           script: |
@@ -155,52 +912,90 @@ jobs:
               core.setFailed(`Draft release '${tag}' not found`);
               return;
             }
-            const find = (n) => draft.assets.find(a => a.name === n)?.id;
-            const diskId     = find('nocloud-amd64.raw.xz');
-            if (!diskId) {
-              core.setFailed('Required assets missing in draft release');
-              return;
-            }
-            core.setOutput('disk_id',     diskId);
 
 
+  # In-tree e2e for SAME-REPO PRs, on Talos nodes running as CONTAINERS, like
+  # every other e2e lane. What containers cannot carry has no lane at all:
+  # DRBD, and with it the `replicated` StorageClass, its Immediate binding mode
+  # and the tenant StorageClass propagation that only applies to
+  # remotely-accessible classes.
+  #
+  # Deliberately NOT named "E2E Tests": the
+  # required "E2E Tests" context is a commit status posted by the `e2e-report`
+  # job (non-fork) or by e2e-fork.yaml (fork). A required *job* that skips
+  # counts as PASSED by branch protection, which is exactly how fork PRs used
+  # to merge with e2e never run (#3257); routing the required context through
+  # a status removes that skip-to-green path. Fork PRs skip this job
+  # (they have no pushed images to pull) and run e2e in the privileged
+  # workflow_run instead.
   e2e:
-    name: "E2E Tests"
-    runs-on: ${{ contains(github.event.pull_request.labels.*.name, 'debug') && 'self-hosted' || 'oracle-vm-24cpu-96gb-x86-64' }}
-    #runs-on: [oracle-vm-32cpu-128gb-x86-64]
-    timeout-minutes: 180
+    name: "E2E (in-tree)"
+    # hack/e2e-compose.yaml gives each of the three nodes `cpus: 8` and
+    # `mem_limit: 24576m`, matching what the QEMU guests were given, so the nodes
+    # still demand 24 vCPU and 72 GiB between them. The same headroom argument
+    # therefore still decides the class: on a 24-vCPU runner that is a 1:1 commit
+    # with nothing left for containerd, the kernel, the host iptables MASQUERADE
+    # every image pull traverses and the runner agent, and during "Install
+    # Cozystack" the nodes contend with those and lose cycles. Readiness and
+    # liveness probes then miss their deadlines, a HelmRelease flips InProgress ->
+    # Failed and its dependents cascade to DependencyNotReady -- on a different
+    # component each run, the signature of resource thrash rather than a product
+    # bug. The 32-vCPU / 128 GiB class leaves 8 vCPU (25%) and 56 GiB of headroom
+    # and removes that oversubscription.
+    #
+    # One thing this class does NOT fix, and it is worth knowing before reading a
+    # red run: a container node reports the HOST's CPU and memory as its capacity,
+    # and hack/e2e-container-up.sh counterbalances that with kubelet
+    # systemReserved so the scheduler sees 8 CPU / 24 GiB. That corrects the
+    # scheduler and not what a pod reads from /proc, so a workload that sizes
+    # itself from /proc/cpuinfo or /proc/meminfo is configured for the whole host.
+    runs-on: oracle-vm-32cpu-128gb-x86-64
+    # Covers a green full suite. It does not cover a tenant-Kubernetes suite
+    # running into its node-join deadline, so a red there can end as a
+    # cancelled job. Held to one figure across every lane that runs the suite.
+    timeout-minutes: 215
     permissions:
       contents: read
       packages: read
       checks: write
-    needs: ["build", "resolve_assets"]
-    if: ${{ always() && (needs.build.result == 'success' || needs.resolve_assets.result == 'success') }}
+    needs: ["finalize", "resolve_assets", "verify-release-candidate"]
+    # Regular PRs still enter through finalize. A release-labelled promote PR
+    # enters through resolve_assets only when a maintainer explicitly adds
+    # full-e2e; without that label the immutable rc's already-green suite is not
+    # repeated. The labeled trigger above makes that post-open opt-in start a run.
+    #
+    # Fork PRs never enter here: their build exports OCI archives instead of
+    # pushing images, so there is no closure for this job to test. e2e-fork.yaml
+    # runs the suite for them from the privileged workflow_run and concludes the
+    # required "E2E Tests" status; for same-repo PRs e2e-report concludes it.
+    if: |
+      !cancelled()
+      && !github.event.pull_request.head.repo.fork
+      && (
+        needs.finalize.result == 'success'
+        || (
+          needs.resolve_assets.result == 'success'
+          && needs.verify-release-candidate.result == 'success'
+          && contains(github.event.pull_request.labels.*.name, 'release')
+          && contains(github.event.pull_request.labels.*.name, 'full-e2e')
+        )
+      )
 
     steps:
-      - name: Generate GitHub App token
-        if: contains(github.event.pull_request.labels.*.name, 'release')
-        id: app-token
-        uses: actions/create-github-app-token@v1
-        with:
-          app-id: ${{ secrets.COZYSTACK_CI_APP_ID }}
-          private-key: ${{ secrets.COZYSTACK_CI_PRIVATE_KEY }}
-          owner: cozystack
-
       # ▸ Checkout and prepare the codebase
+      # fetch-depth: 0 is required by the "Select E2E tests" step so that
+      # `git diff origin/${BASE_REF}...HEAD` can resolve the base ref.
       - name: Checkout code
-        uses: actions/checkout@v4
-
-      # ▸ Regular PR path – download artefacts produced by the *build* job
-      - name: "Download Talos image (regular PR)"
-        if: "!contains(github.event.pull_request.labels.*.name, 'release')"
-        uses: actions/download-artifact@v4
+        uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4
         with:
-          name: talos-image
-          path: _out/assets
+          fetch-depth: 0
 
+      # ▸ Regular PR path – pr.patch from finalize. No Talos disk: the nodes boot
+      #   from ghcr.io/siderolabs/talos directly (hack/e2e-compose.yaml), so this
+      #   lane consumes no nocloud asset and waits on no Talos build.
       - name: Download PR patch
         if: "!contains(github.event.pull_request.labels.*.name, 'release')"
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
         with:
           name: pr-patch
           path: _out/assets
@@ -210,125 +1005,302 @@ jobs:
         run: |
           git apply _out/assets/pr.patch
 
-      # ▸ Release PR path – fetch artefacts from the corresponding draft release
-      - name: Download assets from draft release (release PR)
-        if: contains(github.event.pull_request.labels.*.name, 'release')
-        run: |
-          mkdir -p _out/assets
-          curl -sSL -H "Authorization: token ${APP_TOKEN}" -H "Accept: application/octet-stream" \
-            -o _out/assets/nocloud-amd64.raw.xz \
-            "https://api.github.com/repos/${GITHUB_REPOSITORY}/releases/assets/${{ needs.resolve_assets.outputs.disk_id }}"
-        env:
-          APP_TOKEN: ${{ steps.app-token.outputs.token }}
-
       - name: Set sandbox ID
         run: echo "SANDBOX_NAME=cozy-e2e-sandbox-$(echo "${GITHUB_REPOSITORY}:${GITHUB_WORKFLOW}:${GITHUB_REF}" | sha256sum | cut -c1-10)" >> $GITHUB_ENV
 
-      # ▸ Prepare environment
-      - name: Prepare workspace
+      # ▸ Host kernel modules. MANDATORY and up front, because nothing later can
+      #   supply them: the nodes take their kernel from this host, and Talos
+      #   cannot load modules in container mode -- `machine.kernel.modules` is a
+      #   silent no-op there, `kernel_module_spec.go` returns early on
+      #   ModeContainer with no error and no event.
+      #
+      #   A module missing here is missing for every node for the whole run, and
+      #   it surfaces in disguise: no `openvswitch` and kube-ovn comes up with no
+      #   dataplane, no `zfs` and every LINSTOR pool creation fails. Both read as
+      #   a CNI or a storage regression an hour later. So this loads both and
+      #   then asserts both, and a failure here names the host rather than the
+      #   product.
+      - name: Prepare container-lane host
         run: |
-          rm -rf /tmp/$SANDBOX_NAME
-          cp -r ${{ github.workspace }} /tmp/$SANDBOX_NAME
+          set -eu
+          echo "::group::Loading kernel modules required by the container lane"
+          for m in openvswitch zfs; do
+            if grep -q "^${m} " /proc/modules; then
+              echo "${m}: already loaded"
+              continue
+            fi
+            if [ "${m}" = zfs ]; then
+              sudo apt-get update -qq
+              sudo DEBIAN_FRONTEND=noninteractive apt-get install -y -qq zfsutils-linux
+            fi
+            echo "${m}: loading"
+            sudo modprobe "${m}" || echo "${m}: modprobe failed"
+          done
+          echo "::endgroup::"
+          missing=''
+          for m in openvswitch zfs; do
+            grep -q "^${m} " /proc/modules || missing="${missing} ${m}"
+          done
+          if [ -n "${missing}" ]; then
+            echo "::error title=container-lane host::kernel module(s) could not be loaded:${missing}"
+            echo "This is a host problem, not a product failure. The e2e nodes run as" >&2
+            echo "containers on this runner's kernel and Talos cannot load modules in" >&2
+            echo "container mode, so what is not here now is unavailable for the whole" >&2
+            echo "run: openvswitch backs the kube-ovn dataplane, zfs backs every" >&2
+            echo "LINSTOR pool. Failing here rather than an hour later is the point." >&2
+            exit 1
+          fi
+          grep -E '^(openvswitch|zfs) ' /proc/modules
 
+      # ▸ Prepare environment. Two make targets rather than one: the nodes are
+      #   siblings on the runner's docker daemon (the /dev and /run/udev binds in
+      #   hack/e2e-compose.yaml must resolve against the real host devtmpfs, which
+      #   is what lets this lane carry LINSTOR at all), so the host-side half
+      #   needs a docker socket the sandbox does not have.
       - name: Prepare environment
         run: |
-          cd /tmp/$SANDBOX_NAME
           attempt=0
-          until make SANDBOX_NAME=$SANDBOX_NAME prepare-env; do
+          until make SANDBOX_NAME=$SANDBOX_NAME prepare-env-container; do
             attempt=$((attempt + 1))
             if [ $attempt -ge 3 ]; then
-              echo "❌ Attempt $attempt failed, exiting..."
+              echo "Attempt $attempt failed, exiting..."
               exit 1
             fi
-            echo "❌ Attempt $attempt failed, retrying..."
+            echo "Attempt $attempt failed, retrying..."
+            make -C packages/core/testing SANDBOX_NAME=$SANDBOX_NAME delete-cluster-container || true
           done
-          echo "✅ The task completed successfully after $attempt attempts"
+          echo "Prepare environment completed after $((attempt + 1)) attempts"
+
+      # Test Impact Analysis (TIA): walk the PackageSource graph for the PR
+      # diff and select only the Chainsaw suites affected. Runs by default; opt
+      # out via the `full-e2e` label to run the full suite.
+      #
+      # `skip=true` means every changed path was matched by one of select-e2e.sh's
+      # rules that select nothing — docs and dashboards, a disabled Chainsaw
+      # suite, a backups example with no suite, or the inert repo-meta pattern
+      # — so skipping Chainsaw and reporting green is the correct verdict. A
+      # path none of the rules recognise escalates to the full suite instead of
+      # returning empty, so `skip=true` can no longer mean "TIA had no idea"
+      # (#3392). What it still cannot rule out is a workflow nobody classified:
+      # .github/ is inert as a directory and the e2e workflows are exempted
+      # from it by name, so a workflow added under .github/workflows/ reads as
+      # inert until someone puts it on that list, and the fall-through never
+      # sees it.
+      - name: Select E2E tests
+        id: select
+        if: ${{ !contains(github.event.pull_request.labels.*.name, 'full-e2e') }}
+        env:
+          BASE_REF: ${{ github.base_ref }}
+        run: |
+          git diff --name-only "origin/${BASE_REF}...HEAD" > /tmp/changed.txt
+          apps=$(./hack/select-e2e.sh /tmp/changed.txt)
+          echo "Selected apps: ${apps:-<none>}"
+          echo "apps=${apps}" >> $GITHUB_OUTPUT
+          if [ -z "${apps}" ]; then
+            echo "skip=true" >> $GITHUB_OUTPUT
+          else
+            echo "skip=false" >> $GITHUB_OUTPUT
+          fi
+          # The complement of what the selected suites need, for a reduced
+          # install. An empty selection installs everything as before.
+          disabled=""
+          if [ -n "${apps}" ]; then
+            disabled="$(./hack/select-install.sh --disabled "${apps}")"
+          fi
+          echo "Disabled packages: ${disabled:-<none>}"
+          echo "disabled=${disabled}" >> $GITHUB_OUTPUT
 
       # ▸ Install Cozystack
       - name: Install Cozystack into sandbox
+        env:
+          # This lane has no ARP VIP: .11 is a plain control-plane node standing
+          # in for the QEMU lane's 192.168.123.10.
+          COZY_APISERVER_ENDPOINT: https://192.168.123.11:6443
+          # Talos containers share the runner kernel and cannot load DRBD, so the
+          # harness suppresses DRBD-dependent chart content, registers the host's
+          # pre-created zpools and keeps LINSTOR's local ZFS path.
+          COZY_LINSTOR_DRBD_ENABLED: "false"
+          # Root monitoring is the one root-tenant workload whose chart selects
+          # `replicated` explicitly instead of inheriting the default class. The
+          # install leaves it off but still seeds its local-storage override, so
+          # a run that turns it on does not create a replicated PVC.
+          COZY_E2E_STORAGE_CLASS: local
+          # Empty on the full-e2e label and on an empty selection, which keeps
+          # the full install.
+          COZY_DISABLED_PACKAGES: ${{ steps.select.outputs.disabled }}
         run: |
-          cd /tmp/$SANDBOX_NAME
-          attempt=0
-          until make -C packages/core/testing SANDBOX_NAME=$SANDBOX_NAME install-cozystack; do
-            attempt=$((attempt + 1))
-            if [ $attempt -ge 3 ]; then
-              echo "❌ Attempt $attempt failed, exiting..."
-              exit 1
-            fi
-            echo "❌ Attempt $attempt failed, retrying..."
-          done
-          echo "✅ The task completed successfully after $attempt attempts"
+          if ! make -C packages/core/testing SANDBOX_NAME=$SANDBOX_NAME install-cozystack; then
+            echo "❌ Install failed (no retry — see diagnostics below)"
+            echo "::group::Diagnostics: HelmRelease status"
+            docker exec "$SANDBOX_NAME" sh -c 'kubectl get hr -A -o wide 2>&1 | tail -100' || true
+            echo "::endgroup::"
+            echo "::group::Diagnostics: not-Ready HelmReleases (describe)"
+            docker exec "$SANDBOX_NAME" sh -c 'kubectl get hr -A --no-headers 2>/dev/null | awk "\$4 != \"True\" {print \$1\" \"\$2}"' \
+              | while read -r ns name; do
+                  echo "--- $ns/$name ---"
+                  docker exec "$SANDBOX_NAME" sh -c "kubectl describe hr '$name' -n '$ns' 2>&1 | tail -50" || true
+                done
+            echo "::endgroup::"
+            echo "::group::Diagnostics: recent events"
+            docker exec "$SANDBOX_NAME" sh -c 'kubectl get events -A --sort-by=.lastTimestamp 2>&1 | tail -50' || true
+            echo "::endgroup::"
+            exit 1
+          fi
 
       - name: Run OpenAPI tests
         run: |
-          cd /tmp/$SANDBOX_NAME
           make -C packages/core/testing SANDBOX_NAME=$SANDBOX_NAME test-openapi
 
-      # ▸ Run E2E tests
+      # ▸ Run E2E tests (Chainsaw, scoped by Test Impact Analysis)
+      #
+      #   The "Select E2E tests" step above picks the suites impacted by the PR
+      #   diff. With the `full-e2e` label that step is skipped, so FULL_E2E is
+      #   the only way to reach this step with no selection and we run the whole
+      #   suite; an all-inert selection skips this step entirely (the
+      #   skip != 'true' guard).
+      #
+      #   Chainsaw discovers each named suite under hack/e2e-chainsaw/ and polls
+      #   every assertion to its own timeout, so the old per-app 3-retry loop is
+      #   gone — a failure is reported as a structured assertion diff, with
+      #   cluster-state diagnostics dumped below on a non-zero exit.
       - name: Run E2E tests
         id: e2e_tests
+        if: ${{ steps.select.outputs.skip != 'true' }}
+        env:
+          # No DRBD-backed class exists here. Chainsaw templates the storage
+          # fixtures with `local`, and the Kubernetes helper omits only the
+          # remote-propagation and RWX assertions while running the same suites.
+          COZY_E2E_STORAGE_CLASS: local
+          SELECTED_APPS: ${{ steps.select.outputs.apps }}
+          FULL_E2E: ${{ contains(github.event.pull_request.labels.*.name, 'full-e2e') }}
         run: |
-          cd /tmp/$SANDBOX_NAME
-          failed_tests=""
-          for app in $(ls hack/e2e-apps/*.bats | xargs -n1 basename | cut -d. -f1); do
-            echo "::group::Testing $app"
-            attempt=0
-            success=false
-            until [ $attempt -ge 3 ]; do
-              if make -C packages/core/testing SANDBOX_NAME=$SANDBOX_NAME test-apps-$app; then
-                success=true
-                break
-              fi
-              attempt=$((attempt + 1))
-              echo "❌ Attempt $attempt failed, retrying..."
-            done
-            if [ "$success" = true ]; then
-              echo "✅ Test $app completed successfully"
-            else
-              echo "❌ Test $app failed after $attempt attempts"
-              failed_tests="$failed_tests $app"
-            fi
+          # Only the full-e2e label can get here with an empty selection: when
+          # `select` runs, an empty result sets skip=true and this step never
+          # starts. Testing FULL_E2E alone keeps that invariant visible.
+          if [ "$FULL_E2E" = "true" ]; then
+            suites=""        # empty => test-chainsaw runs the whole suite
+            echo "Running full chainsaw suite"
+          else
+            suites="$SELECTED_APPS"
+            echo "Running selected chainsaw suites: $suites"
+          fi
+          if ! make -C packages/core/testing SANDBOX_NAME=$SANDBOX_NAME test-chainsaw CHAINSAW_SUITES="$suites"; then
+            echo "❌ Chainsaw E2E failed (see the assertion diffs or LEAKED-PODS lines above and diagnostics below)"
+            echo "::group::Diagnostics: HelmRelease status"
+            docker exec "$SANDBOX_NAME" sh -c 'kubectl get hr -A -o wide 2>&1 | tail -50' || true
+            echo "::endgroup::"
+            echo "::group::Diagnostics: recent events"
+            docker exec "$SANDBOX_NAME" sh -c 'kubectl get events -A --sort-by=.lastTimestamp 2>&1 | tail -30' || true
+            echo "::endgroup::"
+            # COSI state at the moment of failure — the CRDs ship no printer
+            # columns, so pull the readiness fields explicitly (cozyreport
+            # captures the same at end-of-job, but bucket states move between
+            # a test failing and the report being taken).
+            echo "::group::Diagnostics: COSI bucket state"
+            docker exec "$SANDBOX_NAME" sh -c '
+              kubectl get bucketclaims.objectstorage.k8s.io -A -o custom-columns="NAMESPACE:.metadata.namespace,NAME:.metadata.name,READY:.status.bucketReady,BUCKET:.status.bucketName" 2>&1
+              kubectl get buckets.objectstorage.k8s.io -o custom-columns="NAME:.metadata.name,READY:.status.bucketReady,ID:.status.bucketID,CLAIMNS:.spec.bucketClaim.namespace" 2>&1
+              kubectl get bucketaccesses.objectstorage.k8s.io -A -o custom-columns="NAMESPACE:.metadata.namespace,NAME:.metadata.name,GRANTED:.status.accessGranted,CLAIM:.spec.bucketClaimName" 2>&1
+            ' || true
             echo "::endgroup::"
-          done
-          if [ -n "$failed_tests" ]; then
-            echo "❌ Failed tests:$failed_tests"
             exit 1
           fi
-          echo "✅ All E2E tests passed"
+          echo "✅ All selected E2E tests passed"
+
+      - name: Collect chainsaw report
+        if: always()
+        run: |
+          mkdir -p _out
+          docker cp "$SANDBOX_NAME":/workspace/hack/e2e-chainsaw/chainsaw-report.xml \
+            _out/chainsaw-report.xml || true
+
+      - name: Upload chainsaw report
+        if: always()
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
+        with:
+          name: chainsaw-report
+          path: _out/chainsaw-report.xml
+          if-no-files-found: ignore
 
       # ▸ Collect debug information (always runs)
+      #
+      #   A ceiling of its own, not the job's 215 minutes. `Upload
+      #   cozyreport.tgz` is the next step and the collector writes its tarball
+      #   at the very end of its run, so a read that never returns spends what
+      #   is left of the job budget, the job is cancelled, and the upload never
+      #   runs -- the artifact is lost rather than truncated, on exactly the run
+      #   where it is the only evidence left. `|| true` guards against a
+      #   non-zero exit, not against a read that does not return.
+      #
+      #   30 minutes is measured against the step: it takes 3-42s across sampled
+      #   runs, on failed e2e jobs as well as green ones. It RESERVES nothing --
+      #   `timeout-minutes` caps a step, it does not carve budget out of the job,
+      #   so a suite that has already burned 210 of the 215 leaves this step five
+      #   minutes and the upload is cancelled with everything else. What the cap
+      #   buys is that a hung read cannot be the reason.
+      #   `continue-on-error` because the ceiling must not change what the job
+      #   REPORTS. `|| true` on the make call is this step's standing statement
+      #   that collecting diagnostics is never fatal, and a step killed at its
+      #   ceiling never reaches that `|| true` -- the runner ends the process. So
+      #   without this, a passing E2E run whose collection ran long is published
+      #   as a failed one, and every later `failure()` in this job starts meaning
+      #   "the tests failed OR the report was slow".
       - name: Collect report
+        id: collect_report
         if: always()
+        timeout-minutes: 30
+        continue-on-error: true
         run: |
-          cd /tmp/$SANDBOX_NAME
           make -C packages/core/testing SANDBOX_NAME=$SANDBOX_NAME collect-report || true
 
+      # `continue-on-error` keeps the overrun out of the job's result, which also
+      # keeps it out of everyone's view: a step that ended at its ceiling renders
+      # green and the only trace is in the raw log. This branch's own standard is
+      # that a bound which fires is recorded, and that has to hold for the outer
+      # bound too.
+      #
+      # The wording says what `outcome` establishes and no more: a step can end
+      # non-zero without any ceiling firing, so naming the timeout as the cause
+      # would be the false-mechanism claim the collector refuses to make for a 137.
+      - name: Report collection overran its ceiling
+        if: always() && steps.collect_report.outcome == 'failure'
+        run: |
+          echo "::warning title=cozyreport::Collect report ended non-zero -- its timeout-minutes fired, or the step failed before the collector ran; cozyreport.tgz is missing or partial for this run"
+
       - name: Upload cozyreport.tgz
         if: always()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
         with:
           name: cozyreport
-          path: /tmp/${{ env.SANDBOX_NAME }}/_out/cozyreport.tgz
+          path: _out/cozyreport.tgz
 
       - name: Collect images list
         if: always()
         run: |
-          cd /tmp/$SANDBOX_NAME
           make -C packages/core/testing SANDBOX_NAME=$SANDBOX_NAME collect-images || true
 
       - name: Upload image list
         if: always()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
         with:
           name: image-list
-          path: /tmp/${{ env.SANDBOX_NAME }}/_out/images.txt
+          path: _out/images.txt
 
       # ▸ Open an SSH breakpoint to the failing sandbox so maintainers can attach,
       #   inspect Talos/Cozystack state and resume with `breakpoint resume`.
       #
-      #   Gated by the `debug` or `release` label (release PRs are bot-created,
-      #   so their presence implies maintainer authorship). authorized-users is
-      #   kept as a second defense layer at the breakpoint level.
+      #   Opens when the E2E job fails AND the PR carries the `debug` label or
+      #   the `release` label (release PRs are bot-created, so the label
+      #   implies maintainer authorship). authorized-users is kept as a second
+      #   defense layer controlling who may actually SSH in.
+      #
+      #   `failure()` is the whole condition now. It used to be joined by a
+      #   soft-red output, because a node-join red the lane decided not to block
+      #   on arrived here as a SUCCESSFUL job and would have been skipped. That
+      #   carve-out is gone with the QEMU substrate: the node-join deadline
+      #   fails its suite like any other deadline, so a sandbox worth attaching
+      #   to always belongs to a failed job. Label-gating is what keeps this
+      #   affordable, and it is unchanged.
       #
       #   Uses cozystack/breakpoint-action (fork of namespacelabs/breakpoint-action)
       #   pinned by SHA. The fork adds: pause-idle mode (initial grace period for
@@ -347,6 +1319,10 @@ jobs:
           vars.BREAKPOINT_ENDPOINT != '' &&
           (contains(github.event.pull_request.labels.*.name, 'debug')
             || contains(github.event.pull_request.labels.*.name, 'release'))
+        # A step that fails here would fail the job on its own account. Same
+        # reason `Collect report` above carries it: what the job REPORTS must not
+        # depend on what a helper did.
+        continue-on-error: true
         # cozystack/breakpoint-action v2-cozy.1
         # mode: pause-idle defaults: grace-period=20m, idle-timeout=10m
         uses: cozystack/breakpoint-action@a6f3a6f87be398ad63b6577351e3398e53f578e4
@@ -373,10 +1349,140 @@ jobs:
             exits 10 minutes after the last SSH session disconnects.
 
       # ▸ Tear down environment (always runs)
+      #
+      #   Both halves, and in this order: the compose project owns the nodes and
+      #   the zpools outlive it. A leftover pool makes the next run on a reused
+      #   host adopt storage that already carries a dead cluster's volumes.
       - name: Tear down sandbox
         if: always()
-        run: make -C packages/core/testing SANDBOX_NAME=$SANDBOX_NAME delete || true
+        run: |
+          # Loud, but never the job's verdict. A failed teardown means a dirty
+          # host, and this runner is discarded after the job, so there is no next
+          # run to protect -- while failing the job here posts the required
+          # "E2E Tests" status as a failure that no reader can tell apart from a
+          # real one. The annotation is what a reused host (a developer machine)
+          # needs; `delete-cluster-container` returning non-zero is not evidence
+          # about the product.
+          cleanup_rc=0
+          make -C packages/core/testing SANDBOX_NAME=$SANDBOX_NAME delete-cluster-container || cleanup_rc=$?
+          make -C packages/core/testing SANDBOX_NAME=$SANDBOX_NAME delete || true
+          if [ "$cleanup_rc" -ne 0 ]; then
+            echo "::error title=sandbox teardown::teardown exited $cleanup_rc; the host may hold a stale compose project or zpool"
+          fi
 
-      - name: Remove workspace
-        if: always()
-        run: rm -rf /tmp/$SANDBOX_NAME
+  # Report the required "E2E Tests" gate as a commit status rather than relying
+  # on a job named "E2E Tests". A required *job* that is skipped counts
+  # as PASSED by branch protection — desired for docs-only PRs, but the exact
+  # hole that let fork PRs merge with e2e never run (#3257). This job always runs
+  # on same-repo PRs and concludes "E2E Tests" deterministically:
+  #   • plan failed              → failure
+  #   • docs-only PR (code!=true)→ success (e2e not required)
+  #   • in-tree e2e succeeded     → success
+  #   • otherwise (skipped/failed/cancelled with code changes) → failure
+  # Fork PRs skip this job; e2e-fork.yaml concludes "E2E Tests" for them, so a
+  # fork PR stays "Expected"/not-mergeable until the privileged run reports.
+  #
+  # The required "E2E Tests" merge gate is published as a COMMIT STATUS with the
+  # default GITHUB_TOKEN (+ statuses:write) — NOT as a job, and NOT as a
+  # check-run.
+  #   - Not a job: a *skipped* required job counts as passed by branch
+  #     protection, which is how fork PRs used to merge with e2e never run
+  #     (#3257). A status is "success" only when this job posts it; a
+  #     never-posted required status stays "Expected" and blocks the merge.
+  #   - Not a check-run: a check-run made with the default token floats into an
+  #     arbitrary GitHub Actions check-suite (it rendered under "PR size label"),
+  #     and an app-token check-run needs the app granted checks:write. A commit
+  #     status has neither problem — branch protection matches it by context name
+  #     and it carries no check-suite grouping. Safe with the default token: a
+  #     fork's pull_request token is read-only and cannot post a status, so only
+  #     same-repo runs (this job, guarded !fork) and the privileged workflow_run
+  #     in e2e-fork.yaml can set it.
+  # REQUIRES main branch protection to require the "E2E Tests" status context —
+  # see docs/agents/e2e-testing.md §10.
+  #
+  # The `labeled` guard must stay in lockstep with `plan`'s: this job runs if and
+  # only if `plan` runs. `labeled` events other than full-e2e/release are
+  # discarded there, so without the same guard this job would run with plan *skipped*, read
+  # PLAN_RESULT != 'success', and post "E2E Tests" = failure — clobbering an
+  # already-green required status every time anyone labels an open PR.
+  e2e-report:
+    name: "Report E2E status"
+    needs: ["plan", "e2e", "verify-release-candidate"]
+    # !cancelled() rather than always(). A cancelled run no longer owns the
+    # status for its head SHA, because something superseded it and that
+    # something is now responsible. Posting from here would stamp a red on a
+    # suite that never finished, and the run that replaced it may be one that
+    # deliberately posts nothing, leaving nothing to flip it back. A cancelled
+    # run must report nothing.
+    #
+    # Cancellation still reaches this job from a push, from a `full-e2e` label
+    # run superseding the head run, and from a manual cancel. It no longer
+    # reaches it from a label the workflow discards: those run in their own
+    # concurrency group (see the key at the top of this file) precisely so they
+    # cannot cancel a live run.
+    if: ${{ !cancelled() && !github.event.pull_request.head.repo.fork && (github.event.action != 'labeled' || github.event.label.name == 'full-e2e' || github.event.label.name == 'release') }}
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      statuses: write
+    steps:
+      - name: Report "E2E Tests" commit status
+        uses: actions/github-script@f28e40c7f34bde8b3046d885e986cb6290c5673b # v7
+        env:
+          PLAN_RESULT: ${{ needs.plan.result }}
+          CODE: ${{ needs.plan.outputs.code }}
+          E2E_RESULT: ${{ needs.e2e.result }}
+          CANDIDATE_RESULT: ${{ needs.verify-release-candidate.result }}
+          IS_RELEASE: ${{ contains(github.event.pull_request.labels.*.name, 'release') }}
+          IS_FULL_E2E: ${{ contains(github.event.pull_request.labels.*.name, 'full-e2e') }}
+          HEAD_SHA: ${{ github.event.pull_request.head.sha }}
+          RUN_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
+        with:
+          script: |
+            const { PLAN_RESULT, CODE, E2E_RESULT, CANDIDATE_RESULT, IS_RELEASE, IS_FULL_E2E, HEAD_SHA, RUN_URL } = process.env;
+            let state, description;
+            if (PLAN_RESULT !== 'success') {
+              state = 'failure';
+              description = `plan job did not succeed (result: ${PLAN_RESULT})`;
+            } else if (IS_RELEASE === 'true' && CANDIDATE_RESULT !== 'success') {
+              state = 'failure';
+              description = `release packages candidate did not verify (result: ${CANDIDATE_RESULT})`;
+            } else if (CODE !== 'true') {
+              state = 'success';
+              description = 'docs-only PR — e2e not required';
+            } else if (IS_RELEASE === 'true' && IS_FULL_E2E !== 'true') {
+              // Release promotion PRs deliberately do not repeat e2e: the rc was
+              // already verified against the immutable candidate whose digests
+              // this tree pins, which is the whole point of the rc gate. The `e2e`
+              // job skips for exactly this case, and while the gate was a job that
+              // skip satisfied branch protection. Now that the gate is a status,
+              // the skip has to be reported explicitly or every promotion needs a
+              // full suite re-run or an admin override.
+              state = 'success';
+              description = 'release promotion — verified at rc, e2e not repeated (add full-e2e to force a run)';
+            } else if (E2E_RESULT === 'success') {
+              state = 'success';
+              description = 'in-tree e2e passed';
+            } else {
+              state = 'failure';
+              description = `in-tree e2e did not pass (result: ${E2E_RESULT})`;
+            }
+            try {
+              await github.rest.repos.createCommitStatus({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                sha: HEAD_SHA,
+                state,
+                context: 'E2E Tests',
+                description,
+                target_url: RUN_URL,
+              });
+            } catch (err) {
+              // The 'E2E Tests' status is the required merge gate. If we cannot
+              // publish it, fail loudly and fail-closed: setFailed keeps the job
+              // red and the required status unreported ("Expected"), so the PR
+              // stays non-mergeable.
+              core.setFailed(`Failed to report E2E Tests status: ${err}`);
+              return;
+            }
+            core.info(`E2E Tests → ${state}: ${description}`);
diff --git a/.github/workflows/retention.yaml b/.github/workflows/retention.yaml
new file mode 100644
index 0000000000..23aba46bb8
--- /dev/null
+++ b/.github/workflows/retention.yaml
@@ -0,0 +1,328 @@
+name: Artifact Retention
+
+# Prune old nightly artifacts from GHCR: keep the newest KEEP dated versions of
+# each cozystack package the current nightly publishes, delete older ones.
+# Nightlies are GHCR OCI tags (0.0.0-nightly.<date>.<run-id>.<attempt> on every
+# component image plus cozystack-packages, cozy-installer and cozystack-nocloud)
+# — not git tags or releases — so this prunes container-package versions via
+# the GitHub Packages API.
+#
+# Strictly scoped: only versions whose tags are ALL of the form
+# 0.0.0-nightly.<YYYYMMDD>.<run-id>.<attempt> are eligible. A version that also
+# carries the floating `nightly` tag (the newest) or any release tag (vX.Y.Z,
+# latest, rc, main) is never touched, so stable/rc/main artifacts can never be
+# pruned.
+#
+# Promotion also creates one temporary cozystack-packages tag of the form
+# promotion-vX.Y.Z-from-vX.Y.Z-rc.N-run-ID-ATTEMPT. Every dispatch gets a unique
+# tag, so a retry never moves one and leaves an untagged manifest behind. A
+# successful promotion adds a stable tag to the same manifest, which makes it
+# ineligible below. A candidate stays protected while an open bot-authored
+# release PR, or the tip of main or a release-X.Y branch, pins its digest;
+# otherwise it becomes eligible after PROMOTION_TTL_DAYS only when ALL its tags
+# are still temporary.
+#
+# Dry-run by default; flip the input or the RETENTION_APPLY repo variable to
+# actually delete. Deletion is irreversible.
+#
+# NOTE (admin): the cozystack-ci app installation token cannot delete here: it
+# lists package versions, yet DELETE of a listed version answered "404 Package
+# not found". This repository's GITHUB_TOKEN, with the job's packages: write
+# and no change to package settings, deleted the same version from a package
+# linked to this repository, so deletes use it. A package linked to another
+# repository is skipped with a warning.
+
+on:
+  schedule:
+    - cron: '30 4 * * *'   # daily 04:30 UTC, after the nightly has published
+  workflow_dispatch:
+    inputs:
+      apply:
+        description: "Actually delete (false = dry-run, the default)"
+        required: false
+        default: false
+        type: boolean
+
+permissions:
+  contents: read
+
+env:
+  ORG: cozystack
+  KEEP: '14'
+  PROMOTION_TTL_DAYS: '30'
+
+concurrency:
+  group: artifact-retention
+  cancel-in-progress: false
+
+jobs:
+  prune:
+    name: Prune old GHCR temporary artifacts
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+      pull-requests: read
+    steps:
+      - name: Checkout
+        uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4
+        with:
+          persist-credentials: false
+
+      - name: Set up flux
+        uses: fluxcd/flux2/action@04acaec6161ac4fb1a82ffafa88901c03271d34f # v2.8.6
+        with:
+          version: "2.8.6"
+
+      - name: Generate GitHub App token
+        id: app-token
+        uses: actions/create-github-app-token@d72941d797fd3113feb6b93fd0dec494b13a2547 # v1
+        with:
+          app-id: ${{ secrets.COZYSTACK_CI_APP_ID }}
+          private-key: ${{ secrets.COZYSTACK_CI_PRIVATE_KEY }}
+          owner: cozystack
+
+      - name: Prune
+        env:
+          GH_TOKEN: ${{ steps.app-token.outputs.token }}
+          # workflow_dispatch input wins; otherwise the repo variable; else dry-run.
+          APPLY: ${{ github.event.inputs.apply || vars.RETENTION_APPLY || 'false' }}
+          # See the admin NOTE above for why deletes do not use the app token.
+          DELETE_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          set -euo pipefail
+          if [ "$APPLY" = "true" ]; then echo "MODE: APPLY (deleting)"; else echo "MODE: dry-run"; fi
+
+          # Protect every immutable packages digest a live promotion still
+          # depends on. Age alone does not imply abandonment: an approved
+          # release PR can legitimately stay open longer than the TTL.
+          #
+          # A candidate becomes permanently safe only when finalize's retag adds
+          # the stable tag to its manifest, because that is what makes the
+          # all(promotion-*) predicate at the bottom stop matching it. Finalize
+          # runs post-merge, so an open-PR-only protection has a hole exactly
+          # where a half-finished release sits: finalize creates the write-once
+          # stable git tag, then dies before the retag, and the digest is now
+          # pinned by a merge commit and a tag nobody can move, referenced by no
+          # open PR, on a manifest carrying only its temporary tag. Deleting it
+          # leaves a release that can be finished only by hand.
+          #
+          # Two sources, therefore, read differently on purpose. A failure in
+          # either blocks the promotion sweep at the bottom and nothing else —
+          # the nightly sweep in between shares no state with it and must not
+          # be held hostage to a bad pin on a release branch.
+          promotion_retention_blocked=0
+          protected_promotion_digests=""
+          protect_digest() {
+            protected_promotion_digests="${protected_promotion_digests:+${protected_promotion_digests} }$1"
+          }
+
+          # Source 1 — open, trusted, same-repository promote PRs opened by the
+          # release bot. Their head is SUPPOSED to carry exactly one candidate
+          # pin, so anything else is an anomaly: block rather than skip.
+          #
+          # The listing that feeds the loop defers the same way instead of
+          # aborting the step. Under `set -euo pipefail` an unhandled failure
+          # here exits before the nightly sweep below has run, which is the
+          # coupling the deferred guard exists to remove — and the handler must
+          # empty the list rather than leave a partially paginated one, because
+          # a shorter list is a smaller protected set. Blocked plus empty is the
+          # fail-closed reading: nothing can be called abandoned while the
+          # protected set is unknown.
+          release_pr_shas="$(gh api --paginate "/repos/${GITHUB_REPOSITORY}/pulls?state=open&per_page=100" \
+            | jq -s -r --arg repo "$GITHUB_REPOSITORY" 'add[]
+              | select(.user.login == "cozystack-ci[bot]")
+              | select(.head.repo.full_name == $repo)
+              | select(.head.ref | test("^release-[0-9]+\\.[0-9]+\\.[0-9]+$"))
+              | select(any(.labels[]?; .name == "release"))
+              | .head.sha')" || {
+            echo "::error::Could not list open pull requests; refusing retention of promotion candidates."
+            promotion_retention_blocked=1
+            release_pr_shas=""
+          }
+          for sha in $release_pr_shas; do
+            values="$(gh api \
+              -H 'Accept: application/vnd.github.raw+json' \
+              "/repos/${GITHUB_REPOSITORY}/contents/packages/core/installer/values.yaml?ref=${sha}")" || {
+              echo "::error::Open release PR at ${sha} has unreadable installer values; refusing retention of promotion candidates."
+              promotion_retention_blocked=1
+              continue
+            }
+            candidate_ref="$(printf '%s\n' "$values" | awk '
+              /^[[:space:]]*platformSourceRef:[[:space:]]*/ {
+                sub(/^[[:space:]]*platformSourceRef:[[:space:]]*/, "")
+                gsub(/^[\047"]|[\047"][[:space:]]*$/, "")
+                print
+              }')"
+            ref_lines="$(printf '%s\n' "$candidate_ref" | wc -l | tr -d ' ')"
+            if ! printf '%s\n' "$candidate_ref" | grep -Eq '^digest=sha256:[0-9a-f]{64}$' \
+              || [ "$ref_lines" -ne 1 ]; then
+              echo "::error::Open release PR at ${sha} has no single immutable platformSourceRef; refusing retention of promotion candidates."
+              promotion_retention_blocked=1
+              continue
+            fi
+            protect_digest "${candidate_ref#digest=}"
+          done
+
+          # Source 2 — the tips of the branches a promote PR can merge into.
+          # This is what covers the window between merge and retag. Read
+          # permissively, the opposite of source 1: protect every digest pin
+          # found and treat a branch without one as contributing nothing. A
+          # maintenance line cut before this pipeline existed cannot pin a
+          # promotion candidate, because none existed when it was cut, so its
+          # missing or tag-form pin is not an anomaly and must not wedge the
+          # sweep forever. Reading permissively can only ever protect more.
+          #
+          # Permissive is about what a branch CONTAINS, not about whether the
+          # branches were listed at all: a failed listing enumerates no branches
+          # and so silently protects nothing, which is the one way this source
+          # can narrow the protected set. It therefore blocks and empties, like
+          # source 1, and for the same reason does it here rather than by
+          # letting `set -e` take the nightly sweep with it.
+          base_branches="$(gh api --paginate "/repos/${GITHUB_REPOSITORY}/branches?per_page=100" \
+            | jq -s -r 'add[] | .name
+              | select(. == "main" or test("^release-[0-9]+\\.[0-9]+$"))')" || {
+            echo "::error::Could not list base branches; refusing retention of promotion candidates."
+            promotion_retention_blocked=1
+            base_branches=""
+          }
+          for branch in $base_branches; do
+            values="$(gh api \
+              -H 'Accept: application/vnd.github.raw+json' \
+              "/repos/${GITHUB_REPOSITORY}/contents/packages/core/installer/values.yaml?ref=${branch}" 2>/dev/null)" || {
+              echo "  ${branch}: no readable installer values; nothing to protect"
+              continue
+            }
+            branch_digests="$(printf '%s\n' "$values" \
+              | grep -oE 'digest=sha256:[0-9a-f]{64}' | sed 's/^digest=//' | sort -u || true)"
+            for digest in $branch_digests; do
+              protect_digest "$digest"
+            done
+          done
+
+          protected_count="$(printf '%s\n' "$protected_promotion_digests" | awk '{print NF}')"
+          echo "Protecting ${protected_count} promotion candidate digest(s) named by an open release PR or a base-branch tip."
+
+          # The cozystack/* packages to sweep. GitHub refuses to list org
+          # container packages to an app installation token (400 Invalid
+          # argument), so the names come from the published nightly tree; see
+          # hack/retention-packages.sh for why that tree and what it covers.
+          #
+          # An empty list is never "nothing to do": the nightly publishes into
+          # these packages every day, so empty means the names could not be
+          # resolved. That skips the nightly sweep and fails the run, but not
+          # before the promotion sweep below: it reads one fixed package, and
+          # what keeps a candidate safe is the protected set, which no part of
+          # this list feeds.
+          #
+          # A package whose versions cannot be read, or a version that cannot
+          # be deleted, is likewise reported and skipped so the rest is still
+          # swept, then fails the run at the end. The loop is fed by a
+          # here-string rather than a pipe so the flag survives it.
+          sweep_failed=0
+          unlinked=""
+          linked_count=0
+          gh_err="$(mktemp)"
+          tree="$(mktemp -d)"
+          pkgs="$(flux pull artifact "oci://ghcr.io/${ORG}/cozystack/cozystack-packages:nightly" --output "$tree" >/dev/null \
+            && ./hack/retention-packages.sh "$tree")" || {
+            echo "::error::Could not resolve the ${ORG} container packages to sweep."
+            pkgs=""
+          }
+          if [ -z "$pkgs" ]; then
+            echo "::error::No package names resolved; skipping the nightly sweep."
+            sweep_failed=1
+          else
+            echo "Sweeping $(printf '%s\n' "$pkgs" | wc -l | tr -d ' ') package(s):"
+            printf '%s\n' "$pkgs" | sed 's/^/  /'
+          fi
+          while IFS= read -r pkg; do
+            [ -n "$pkg" ] || continue
+            enc="$(jq -rn --arg p "$pkg" '$p|@uri')"
+
+            # DELETE_TOKEN was shown to delete from a package linked to this
+            # repository; one linked elsewhere is not attempted, only named in
+            # a warning, so it cannot fail every apply run.
+            linked="$(gh api "/orgs/${ORG}/packages/container/${enc}" --jq '.repository.full_name // ""' 2>"$gh_err")" || {
+              echo "::error::Could not read ${pkg}; not swept: $(cat "$gh_err")"
+              sweep_failed=1
+              continue
+            }
+            if [ "$linked" != "$GITHUB_REPOSITORY" ]; then
+              unlinked="${unlinked:+${unlinked} }${pkg}"
+              continue
+            fi
+            linked_count=$((linked_count + 1))
+
+            # Version ids whose tags are non-empty AND every tag is a dated
+            # nightly (so the floating `nightly` tag and any release tag exclude
+            # the version). API returns versions newest-first, so the dated
+            # nightlies are already in newest->oldest order.
+            # `gh api --paginate --jq` runs the filter per page and emits one
+            # array per page, so length/slicing break once a package spans
+            # multiple pages. Slurp the raw pages and merge with `jq -s add`
+            # first, then count and slice the combined array.
+            ids="$(gh api --paginate "/orgs/${ORG}/packages/container/${enc}/versions" 2>"$gh_err" \
+              | jq -s '[add[]
+                | select((.metadata.container.tags | length) > 0)
+                | select(.metadata.container.tags | all(test("^0\\.0\\.0-nightly\\.[0-9]{8}(\\.[0-9]+)*$")))
+                | .id]')" || {
+              echo "::error::Could not read ${pkg} versions; not swept: $(cat "$gh_err")"
+              sweep_failed=1
+              continue
+            }
+
+            total="$(printf '%s' "$ids" | jq 'length')"
+            [ "$total" -gt "$KEEP" ] || { echo "── ${pkg}: ${total} nightlies (<= ${KEEP}); nothing to prune"; continue; }
+            drop_ids="$(printf '%s' "$ids" | jq -r ".[${KEEP}:][]")"
+            echo "── ${pkg}: ${total} nightlies, keep ${KEEP}, drop $((total - KEEP))"
+
+            printf '%s\n' "$drop_ids" | xargs ./hack/retention-delete.sh "$pkg" version || sweep_failed=1
+          done <<< "$pkgs"
+          [ -z "$unlinked" ] || echo "::warning::not linked to ${GITHUB_REPOSITORY}, skipped: ${unlinked}"
+          # One unlinked package is expected; all of them means nothing was swept.
+          if [ -n "$pkgs" ] && [ "$linked_count" -eq 0 ]; then
+            echo "::error::None of the resolved packages is linked to ${GITHUB_REPOSITORY}; the nightly sweep pruned nothing."
+            sweep_failed=1
+          fi
+
+          # Anything unresolved above means the protected set is incomplete, so
+          # no candidate can be called abandoned. Skip this sweep entirely and
+          # fail the job. Deliberately here and not at the point of failure: the
+          # nightly sweep above is unrelated work that had no reason to be
+          # cancelled by a bad pin on a release branch, and it has already run.
+          if [ "$promotion_retention_blocked" -eq 1 ]; then
+            echo "::error::promotion candidate protection could not be resolved; skipping the promotion sweep."
+            exit 1
+          fi
+
+          # A promoted manifest acquires vX.Y.Z (and possibly latest) in addition
+          # to its temporary tag, so the all(tags match promotion-*) predicate is
+          # the safety boundary: published bytes are never eligible. Digests
+          # named by an open promote PR or by a base-branch tip are excluded
+          # separately, which is what covers a candidate between merge and
+          # retag. Only cozystack-packages receives these candidate tags.
+          pkg='cozystack/cozystack-packages'
+          enc="$(jq -rn --arg p "$pkg" '$p|@uri')"
+          cutoff="$(date -u -d "${PROMOTION_TTL_DAYS} days ago" '+%Y-%m-%dT%H:%M:%SZ')"
+          promotion_ids="$(gh api --paginate "/orgs/${ORG}/packages/container/${enc}/versions" 2>"$gh_err" \
+            | jq -s --arg cutoff "$cutoff" --arg protected "$protected_promotion_digests" '[add[]
+              | .name as $digest
+              | select((.metadata.container.tags | length) > 0)
+              | select(.metadata.container.tags | all(test("^promotion-v[0-9]+\\.[0-9]+\\.[0-9]+-from-v[0-9]+\\.[0-9]+\\.[0-9]+-rc\\.[0-9]+-run-[0-9]+-[0-9]+$")))
+              | select(.updated_at < $cutoff)
+              | select(($protected | split(" ") | index($digest)) == null)
+              | .id]')" || {
+            echo "::error::Could not read ${pkg} versions; promotion candidates not swept: $(cat "$gh_err")"
+            sweep_failed=1
+            promotion_ids='[]'
+          }
+          promotion_total="$(printf '%s' "$promotion_ids" | jq 'length')"
+          echo "── ${pkg}: ${promotion_total} abandoned promotion candidate(s) older than ${PROMOTION_TTL_DAYS} days"
+          printf '%s' "$promotion_ids" | jq -r '.[]' \
+            | xargs ./hack/retention-delete.sh "$pkg" "promotion candidate version" || sweep_failed=1
+          if [ "$sweep_failed" -eq 1 ]; then
+            echo "::error::some versions could not be read or deleted; see the errors above."
+            exit 1
+          fi
+          echo "Done."
diff --git a/.github/workflows/retest.yaml b/.github/workflows/retest.yaml
deleted file mode 100644
index 46ce8036a6..0000000000
--- a/.github/workflows/retest.yaml
+++ /dev/null
@@ -1,78 +0,0 @@
-name: Retest
-
-on:
-  issue_comment:
-    types: [created]
-
-jobs:
-  retest:
-    name: Retest PR
-    runs-on: ubuntu-latest
-    if: |
-      github.event.issue.pull_request &&
-      contains(github.event.comment.body, '/retest')
-    permissions:
-      actions: write
-      pull-requests: read
-
-    steps:
-      - name: Rerun from Prepare environment
-        uses: actions/github-script@v7
-        with:
-          script: |
-            const prNumber = context.issue.number;
-
-            // Get the PR to find the head SHA
-            const pr = await github.rest.pulls.get({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              pull_number: prNumber
-            });
-
-            // Find the latest workflow run for this PR
-            const runs = await github.rest.actions.listWorkflowRuns({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              workflow_id: 'pull-requests.yaml',
-              head_sha: pr.data.head.sha
-            });
-
-            if (runs.data.workflow_runs.length === 0) {
-              core.setFailed('No workflow runs found for this PR');
-              return;
-            }
-
-            const latestRun = runs.data.workflow_runs[0];
-            console.log(`Found workflow run: ${latestRun.id} (${latestRun.status})`);
-
-            // Check if workflow is waiting for approval (fork PRs)
-            if (latestRun.conclusion === 'action_required') {
-              core.setFailed('Workflow is waiting for approval. A maintainer must approve the workflow first.');
-              return;
-            }
-
-            // Get jobs for this run
-            const jobs = await github.rest.actions.listJobsForWorkflowRun({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              run_id: latestRun.id
-            });
-
-            // Find "Prepare environment" job
-            const prepareJob = jobs.data.jobs.find(j => j.name === 'Prepare environment');
-
-            if (!prepareJob) {
-              core.setFailed('Could not find "Prepare environment" job');
-              return;
-            }
-
-            console.log(`Found job: ${prepareJob.name} (id: ${prepareJob.id}, status: ${prepareJob.status})`);
-
-            // Rerun the job
-            await github.rest.actions.reRunJobForWorkflowRun({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              job_id: prepareJob.id
-            });
-
-            console.log(`✅ Triggered rerun of job "${prepareJob.name}" (${prepareJob.id})`);
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 24064beea8..c25295dcda 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -5,8 +5,6 @@ on:
   schedule:
     # Run weekly on Mondays at 06:00 UTC.
     - cron: '0 6 * * 1'
-  push:
-    branches: [main]
   workflow_dispatch:
 
 # Declare default permissions as read-only.
@@ -17,8 +15,6 @@ jobs:
     name: Scorecard analysis
     runs-on: ubuntu-latest
     permissions:
-      # Needed to upload the results to the GitHub code-scanning dashboard.
-      security-events: write
       # Needed to publish results to the public scorecard.dev API
       # (OIDC token allows publish without storing long-lived credentials).
       id-token: write
@@ -29,7 +25,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           persist-credentials: false
 
@@ -38,18 +34,24 @@ jobs:
         with:
           results_file: results.sarif
           results_format: sarif
+          # The default GITHUB_TOKEN cannot read branch-protection settings, so
+          # the Branch-Protection check is scored on partial data. Provide a PAT
+          # with admin:read on the repo as the SCORECARD_TOKEN secret to let it
+          # see the full ruleset; falls back to the default token when unset, so
+          # this is a no-op until the secret is added.
+          repo_token: ${{ secrets.SCORECARD_TOKEN || github.token }}
           # Publish the results to the OpenSSF Scorecard public API so the
           # project appears at https://scorecard.dev/viewer/?uri=github.com/cozystack/cozystack
           publish_results: true
 
+      # SARIF is kept as a downloadable artifact only. It is intentionally NOT
+      # uploaded to GitHub code-scanning: Scorecard posts one alert per check,
+      # which floods the Security > Code scanning dashboard and buries CodeQL's
+      # first-party findings. The public scorecard.dev badge (publish_results
+      # above) is the canonical view of these results.
       - name: Upload SARIF as artifact
         uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
           name: scorecard-sarif
           path: results.sarif
           retention-days: 5
-
-      - name: Upload SARIF to code-scanning
-        uses: github/codeql-action/upload-sarif@03e4368ac7daa2bd82b3e85262f3bf87ee112f57 # v3
-        with:
-          sarif_file: results.sarif
diff --git a/.github/workflows/stale.yaml b/.github/workflows/stale.yaml
index 17df206bfd..96e495abc6 100644
--- a/.github/workflows/stale.yaml
+++ b/.github/workflows/stale.yaml
@@ -5,10 +5,10 @@ on:
     - cron: '37 4 * * *'  # daily at 04:37 UTC
   workflow_dispatch:
 
+# Top-level token defaults to read-only. A job-level block replaces this one
+# rather than adding to it, so each job restates every scope it needs.
 permissions:
   contents: read
-  issues: write
-  pull-requests: write
 
 concurrency:
   group: stale
@@ -17,8 +17,11 @@ concurrency:
 jobs:
   stale:
     runs-on: ubuntu-latest
+    permissions:
+      issues: write
+      pull-requests: write
     steps:
-      - uses: actions/stale@v10
+      - uses: actions/stale@1e223db275d687790206a7acac4d1a11bd6fe629 # v10
         with:
           stale-issue-label: lifecycle/stale
           stale-pr-label: lifecycle/stale
@@ -37,7 +40,7 @@ jobs:
             triage/accepted,kind/regression
           exempt-pr-labels: >-
             lifecycle/frozen,do-not-merge/hold,
-            backport,backport-previous
+            kind/backport,kind/backport-previous
           days-before-stale: 60
           days-before-close: 14
           operations-per-run: 100
diff --git a/.github/workflows/tags.yaml b/.github/workflows/tags.yaml
index 4faf63c136..bda2ad141d 100644
--- a/.github/workflows/tags.yaml
+++ b/.github/workflows/tags.yaml
@@ -12,52 +12,194 @@ concurrency:
   group: tags-${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
+# Top-level token defaults to read-only. A job-level block replaces this one
+# rather than adding to it, so each job restates every scope it needs.
+permissions:
+  contents: read
+
 jobs:
-  prepare-release:
-    name: Prepare Release
-    runs-on: [self-hosted]
-    outputs:
-      skip: ${{ steps.check_release.outputs.skip }}
+  # The pre-release's images built natively for arm64 and pushed as
+  # <tag>-arm64, beside build-amd64, for prepare-release to stitch the two. A
+  # stable tag is never built (promotion copies the rc's indexes), so it skips
+  # this job. The packages artifact and the installer chart carry no
+  # architecture, so this job builds neither; build-amd64 pushes them pinned
+  # on amd64 digests and prepare-release republishes them repinned. The talos
+  # installer and matchbox are built for both arches in build-amd64, and the
+  # e2e sandbox is amd64 only, so none of them has an arm64 half here.
+  build-arm64:
+    name: Build arm64 images
+    if: contains(github.ref_name, '-')
+    runs-on: oracle-vm-24cpu-96gb-arm64
+    # Starts from build-amd64's budget; re-measure after the first runs.
+    timeout-minutes: 120
     permissions:
-      contents: write
+      contents: read
       packages: write
-      pull-requests: write
-      actions: write
 
     steps:
-      - name: Generate GitHub App token
-        id: app-token
-        uses: actions/create-github-app-token@v1
+      # The same no-op build-amd64 makes on a re-run of an rc whose release
+      # already exists, so the re-run does not rebuild arm64 for nothing. This
+      # token cannot see a draft, but an rc's release is published by the time
+      # it has been prepared; a draft left by a run that failed before that is
+      # rebuilt, which is the safe direction.
+      - name: Check if release already exists
+        id: check_release
+        uses: actions/github-script@f28e40c7f34bde8b3046d885e986cb6290c5673b # v7
         with:
-          app-id: ${{ secrets.COZYSTACK_CI_APP_ID }}
-          private-key: ${{ secrets.COZYSTACK_CI_PRIVATE_KEY }}
-          owner: cozystack
+          script: |
+            const tag = context.ref.replace('refs/tags/', '');
+            const releases = await github.paginate(github.rest.repos.listReleases, {
+              owner: context.repo.owner,
+              repo:  context.repo.repo,
+              per_page: 100
+            });
+            const exists = releases.some(r => r.tag_name === tag);
+            core.setOutput('release_exists', exists);
+            console.log(exists ? `Release ${tag} already exists, nothing to build` : `No release ${tag} yet`);
 
-      # Check if a non-draft release with this tag already exists
+      - name: Checkout code
+        if: steps.check_release.outputs.release_exists == 'false'
+        uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4
+        with:
+          fetch-depth: 0
+          fetch-tags: true
+          persist-credentials: false
+
+      - name: Set up build toolchain
+        if: steps.check_release.outputs.release_exists == 'false'
+        run: |
+          command -V docker jq yq
+          yq --version | grep -q mikefarah
+
+      - name: Login to GHCR
+        if: steps.check_release.outputs.release_exists == 'false'
+        uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3
+        with:
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+          registry: ghcr.io
+        env:
+          DOCKER_CONFIG: ${{ runner.temp }}/.docker
+
+      - name: Login to OCIR (build cache)
+        if: steps.check_release.outputs.release_exists == 'false'
+        uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3
+        with:
+          username: ${{ secrets.OCIR_USER }}
+          password: ${{ secrets.OCIR_TOKEN }}
+          registry: iad.ocir.io
+        env:
+          DOCKER_CONFIG: ${{ runner.temp }}/.docker
+
+      # docker.io pulls go through the mirror in hack/buildkitd.toml, as the
+      # PR builds' do: anonymous Docker Hub pulls from these runners are rate
+      # limited.
+      - name: Set up Buildx (docker-container driver, docker.io mirror)
+        if: steps.check_release.outputs.release_exists == 'false'
+        id: buildx
+        uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3
+        with:
+          driver: docker-container
+          buildkitd-config: hack/buildkitd.toml
+        env:
+          DOCKER_CONFIG: ${{ runner.temp }}/.docker
+
+      - name: Build arm64 images
+        if: steps.check_release.outputs.release_exists == 'false'
+        run: |
+          set -euo pipefail
+          # Assigned and checked before the loop: a build-matrix.sh failure
+          # inside `for unit in $(...)` would run no iteration and leave a
+          # green job that built nothing.
+          units="$(MATRIX_ARCH=arm64 hack/build-matrix.sh | jq -r '.[]')"
+          [ -n "$units" ]
+          for unit in $units; do
+            make -C "$unit" image
+          done
+          make -C packages/core/installer image-operator
+        env:
+          DOCKER_CONFIG: ${{ runner.temp }}/.docker
+          BUILDER: ${{ steps.buildx.outputs.name }}
+          PLATFORM: linux/arm64
+          CACHE_REGISTRY: iad.ocir.io/idyksih5sir9/cozystack
+          # Read the arm64 cache build-arm64-nightly.yaml keeps warm; a release
+          # build never writes one.
+          CACHE_TAG: buildcache-arm64
+          WRITE_CACHE: '0'
+          IMAGE_TAG: ${{ github.ref_name }}-arm64
+          PUBLISH_VERSIONED: '0'
+          PUBLISH_FLOATING: '0'
+
+  # The amd64 half of a pre-release build, run beside build-arm64 rather than
+  # after it: the images, the stamped tree and the release assets. Its make
+  # build also pushes the packages artifact and the installer chart pinned on
+  # amd64 digests. The stitch, the gate, the republish of both and the release
+  # itself happen in prepare-release once both halves are built, so the tree,
+  # the log of pushed tags and the assets travel there as artifacts.
+  # It runs for every tag, since the release-exists no-op and the rejection of
+  # a hand-pushed stable tag live here.
+  build-amd64:
+    name: Build amd64 images and assets
+    # Ephemeral pool, not the dedicated self-hosted runner (#2937 decommission).
+    # Serial `make build` + `make assets` is CPU-bound, so use the large shape —
+    # same as the main cache warmer (build-main.yaml).
+    runs-on: oracle-vm-24cpu-96gb-x86-64
+    # The budget prepare-release had while it also built; the stitch and the
+    # uploads it no longer runs moved to prepare-release with their own.
+    timeout-minutes: 120
+    env:
+      # The pipe falls back to direct on any proxy error (hack/common-envs.mk).
+      GOPROXY: "https://proxy.golang.org|direct"
+    outputs:
+      # A release (draft or published) already exists for this tag, so the
+      # build/draft/branch/PR steps are no-ops. Downstream jobs that still need
+      # to run on an existing release (changelog, website docs) must NOT gate on
+      # this — it means "skip the rebuild", not "skip everything".
+      release_exists: ${{ steps.check_release.outputs.release_exists }}
+      tag: ${{ steps.tag.outputs.tag }}
+      is_rc: ${{ steps.tag.outputs.is_rc }}
+    permissions:
+      # contents: write only so the release listing includes drafts.
+      contents: write
+      packages: write
+
+    steps:
+      # Skip the build when a release (draft OR published) already exists for
+      # this tag:
+      #   - re-runs of the same rc/nightly tag become idempotent no-ops;
+      #   - a stable tag prepared by the promote flow must NOT be rebuilt here.
+      #     promote-rc.yaml creates the draft vX.Y.Z from the already-built,
+      #     already-tested rc artifacts; promotion ships those exact bits, never
+      #     a fresh build. When finalize pushes the stable tag, this guard sees
+      #     the draft and skips straight to changelog/website.
       - name: Check if release already exists
         id: check_release
-        uses: actions/github-script@v7
+        uses: actions/github-script@f28e40c7f34bde8b3046d885e986cb6290c5673b # v7
         with:
           script: |
             const tag = context.ref.replace('refs/tags/', '');
-            const releases = await github.rest.repos.listReleases({
+            // Paginate: a promote-created stable draft (or an accreting backlog
+            // of rc releases) can sit past the default first 30, and a missed
+            // draft here would wrongly rebuild instead of no-op.
+            const releases = await github.paginate(github.rest.repos.listReleases, {
               owner: context.repo.owner,
-              repo:  context.repo.repo
+              repo:  context.repo.repo,
+              per_page: 100
             });
-            const exists = releases.data.some(r => r.tag_name === tag && !r.draft);
-            core.setOutput('skip', exists);
-            console.log(exists ? `Release ${tag} already published` : `No published release ${tag}`);
+            const exists = releases.some(r => r.tag_name === tag);
+            core.setOutput('release_exists', exists);
+            console.log(exists ? `Release ${tag} already exists (draft or published)` : `No release ${tag} yet`);
 
       # If a published release already exists, skip the rest of the workflow
       - name: Skip if release already exists
-        if: steps.check_release.outputs.skip == 'true'
+        if: steps.check_release.outputs.release_exists == 'true'
         run: echo "Release already exists, skipping workflow."
 
       # Parse tag meta-data (rc?, maintenance line, etc.)
       - name: Parse tag
-        if: steps.check_release.outputs.skip == 'false'
+        if: steps.check_release.outputs.release_exists == 'false'
         id: tag
-        uses: actions/github-script@v7
+        uses: actions/github-script@f28e40c7f34bde8b3046d885e986cb6290c5673b # v7
         with:
           script: |
             const ref = context.ref.replace('refs/tags/', '');           // e.g. v0.31.5-rc.1
@@ -72,18 +214,32 @@ jobs:
             core.setOutput('tag',     ref);                              // v0.31.5-rc.1
             core.setOutput('version', version);                          // 0.31.5-rc.1
             core.setOutput('is_rc',   isRc);                             // true
+            core.setOutput('is_stable', !isRc);                          // true only for a plain vX.Y.Z
             core.setOutput('line',    `${maj}.${min}`);                  // 0.31
 
+      # A stable vX.Y.Z tag must never build here. Stable tags are cut by
+      # finalize (pull-requests-release.yaml) at a promote PR's merge commit, by
+      # which point a draft release already exists (release_exists=true) and the
+      # build/draft/branch steps below are skipped. So a stable tag with NO
+      # pre-existing draft is a hand-push down the legacy full-rebuild path:
+      # fail fast rather than rebuild with release semantics, move :latest, and
+      # open a rogue release PR — silently violating the promotion invariant.
+      - name: Reject hand-pushed stable tags
+        if: steps.check_release.outputs.release_exists == 'false' && steps.tag.outputs.is_stable == 'true'
+        run: |
+          echo "::error::Stable tag ${GITHUB_REF#refs/tags/} has no pre-existing draft release. Stable tags are finalized by the promote flow at the merge commit — cut a pre-release (vX.Y.Z-rc.N) with the 'Cut Pre-release Tag' workflow and promote it; do not push vX.Y.Z by hand."
+          exit 1
+
       # Detect base branch (main or release-X.Y) the tag was pushed from
       - name: Get base branch
-        if: steps.check_release.outputs.skip == 'false'
+        if: steps.check_release.outputs.release_exists == 'false'
         id: get_base
-        uses: actions/github-script@v7
+        uses: actions/github-script@f28e40c7f34bde8b3046d885e986cb6290c5673b # v7
         with:
           script: |
             const baseRef = context.payload.base_ref;
             if (!baseRef) {
-              core.setFailed(`❌ base_ref is empty. Push the tag via 'git push origin HEAD:refs/tags/<tag>'.`);
+              core.setFailed(`❌ base_ref is empty — the tag was not pushed at a branch tip. Cut pre-release tags with the 'Cut Pre-release Tag' workflow (workflow_dispatch), which pushes the tag correctly.`);
               return;
             }
             const branch = baseRef.replace('refs/heads/', '');
@@ -94,17 +250,25 @@ jobs:
             }
             core.setOutput('branch', branch);
 
-      # Checkout & login once
       - name: Checkout code
-        if: steps.check_release.outputs.skip == 'false'
-        uses: actions/checkout@v4
+        if: steps.check_release.outputs.release_exists == 'false'
+        uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4
         with:
           fetch-depth: 0
           fetch-tags:  true
+          persist-credentials: false
+
+      # Ephemeral runners lack the flux CLI the installer's image-packages step
+      # shells out to.
+      - name: Set up flux
+        if: steps.check_release.outputs.release_exists == 'false'
+        uses: fluxcd/flux2/action@04acaec6161ac4fb1a82ffafa88901c03271d34f # v2.8.6
+        with:
+          version: "2.8.6"
 
       - name: Login to GHCR
-        if: steps.check_release.outputs.skip == 'false'
-        uses: docker/login-action@v3
+        if: steps.check_release.outputs.release_exists == 'false'
+        uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3
         with:
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
@@ -112,21 +276,211 @@ jobs:
         env:
           DOCKER_CONFIG: ${{ runner.temp }}/.docker
 
+      # Read-only access to the shared mode=max build cache that build-main.yaml
+      # writes to OCIR. Release builds push images to GHCR but warm-start from
+      # that cache — without it every tag build on an ephemeral runner is 100%
+      # cold (the persistent runner used to warm-start from local buildkit state).
+      - name: Login to OCIR (build cache)
+        if: steps.check_release.outputs.release_exists == 'false'
+        uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3
+        with:
+          username: ${{ secrets.OCIR_USER }}
+          password: ${{ secrets.OCIR_TOKEN }}
+          registry: iad.ocir.io
+        env:
+          DOCKER_CONFIG: ${{ runner.temp }}/.docker
+
+      # Only for the matchbox rebuild below: the default docker driver cannot
+      # build an index, and `use: false` keeps make build on that driver.
+      - name: Set up Buildx for matchbox (docker-container driver)
+        if: steps.check_release.outputs.release_exists == 'false'
+        id: matchbox_buildx
+        uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3
+        with:
+          driver: docker-container
+          buildkitd-config: hack/buildkitd.toml
+          use: false
+        env:
+          DOCKER_CONFIG: ${{ runner.temp }}/.docker
+
       # Build project artifacts
       - name: Build
-        if: steps.check_release.outputs.skip == 'false'
-        run: make build
+        if: steps.check_release.outputs.release_exists == 'false'
+        run: |
+          mkdir -p "${PUSHED_TAGS_LOG%/*}"
+          make build
+          # The arm64 assets published below install this image, and building
+          # its arm64 half needs no QEMU, so it is pushed again as both arches.
+          make -C packages/core/talos image-talos PLATFORM=linux/amd64,linux/arm64
+          # The arm64 leg skips the talos package, so matchbox gets no arm64
+          # half to stitch. Its Dockerfile only copies files, so both arches
+          # build here without QEMU and the stamped ref pins the index.
+          make -C packages/core/talos image-matchbox PLATFORM=linux/amd64,linux/arm64 BUILDER="$MATCHBOX_BUILDER"
         env:
+          MATCHBOX_BUILDER: ${{ steps.matchbox_buildx.outputs.name }}
           DOCKER_CONFIG: ${{ runner.temp }}/.docker
-          # Release semantics: push the release tag as :IMAGE_TAG (vX.Y.Z),
-          # the component versions as :<component-ver>, and move :latest.
+          # Cache manifests are registry-portable (oci-mediatypes=true) — read
+          # them from OCIR while pushing images to GHCR. A missing :buildcache
+          # ref 404s harmlessly into a cold build.
+          CACHE_REGISTRY: iad.ocir.io/idyksih5sir9/cozystack
+          # amd64 here; build-arm64 builds arm64 natively. This job also
+          # builds on the default docker driver, which handles a
+          # multi-platform image only on the containerd image store.
+          PLATFORM: linux/amd64
+          # Push the release tag as :IMAGE_TAG (vX.Y.Z-rc.N) and the component
+          # versions as :<component-ver>. Deliberately NO PUBLISH_FLOATING: this
+          # job only ever runs for a prerelease (a stable tag is rejected or
+          # skips), so moving :latest here would point it at the newest rc — and
+          # an rc on an old line would drag it backwards. :latest belongs to
+          # promotion, which moves it only for the newest stable (finalize).
           IMAGE_TAG: ${{ github.ref_name }}
           PUBLISH_VERSIONED: '1'
-          PUBLISH_FLOATING: '1'
+          # Every tag the build pushes, for the stitch to move onto the
+          # multi-arch indexes.
+          PUSHED_TAGS_LOG: ${{ runner.temp }}/release-tree/pushed-tags
+
+      # Built here rather than in prepare-release: the Talos assets reuse the
+      # kernel, initramfs and installer make build already produced for the
+      # images, and they build while the arm64 half is still running.
+      - name: Build assets
+        if: steps.check_release.outputs.release_exists == 'false'
+        run: make assets
+
+      # --cached after adding everything, so a file the build created travels
+      # too, not only the ones it changed.
+      - name: Capture the stamped tree
+        if: steps.check_release.outputs.release_exists == 'false'
+        run: |
+          git add --all
+          git diff --cached --binary HEAD >"${{ runner.temp }}/release-tree/stamped-tree.patch"
+
+      - name: Upload the stamped tree and the pushed tags
+        if: steps.check_release.outputs.release_exists == 'false'
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
+        with:
+          name: release-tree
+          path: ${{ runner.temp }}/release-tree/
+          if-no-files-found: error
+          # The same window as release-assets: a re-run of prepare-release
+          # needs both.
+          retention-days: 7
+
+      # The installer tarballs, one per arch, are what the build pushed as the
+      # talos image and are not release assets.
+      - name: Upload the assets
+        if: steps.check_release.outputs.release_exists == 'false'
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
+        with:
+          name: release-assets
+          path: |
+            _out/assets/
+            !_out/assets/installer-*.tar
+          if-no-files-found: error
+          # Long enough to re-run failed jobs; the assets are several GB.
+          retention-days: 7
+
+  prepare-release:
+    name: Prepare Release
+    needs: [build-amd64, build-arm64]
+    # build-arm64 is skipped only for a stable tag, which never builds. On a
+    # pre-release, either half failing or being cancelled leaves this job
+    # skipped and the run red: an rc ships multi-arch or not at all.
+    if: ${{ !cancelled() && needs.build-amd64.result == 'success' && (needs.build-arm64.result == 'success' || needs.build-arm64.result == 'skipped') }}
+    runs-on: oracle-vm-24cpu-96gb-x86-64
+    # The stitch reads and writes every first-party image once, then the
+    # packages artifact, the chart and the assets are pushed; start there and
+    # re-measure after the first runs.
+    timeout-minutes: 60
+    outputs:
+      release_exists: ${{ needs.build-amd64.outputs.release_exists }}
+    permissions:
+      contents: write
+      packages: write
+      pull-requests: write
+      actions: write
+
+    steps:
+      - name: Generate GitHub App token
+        if: needs.build-amd64.outputs.release_exists == 'false'
+        id: app-token
+        uses: actions/create-github-app-token@d72941d797fd3113feb6b93fd0dec494b13a2547 # v1
+        with:
+          app-id: ${{ secrets.COZYSTACK_CI_APP_ID }}
+          private-key: ${{ secrets.COZYSTACK_CI_PRIVATE_KEY }}
+          owner: cozystack
+
+      - name: Checkout code
+        if: needs.build-amd64.outputs.release_exists == 'false'
+        uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4
+        with:
+          fetch-depth: 0
+          fetch-tags:  true
+
+      # The stitch and the multi-arch gate read the registry with skopeo and
+      # the tree with mikefarah yq; the republish needs flux and helm.
+      - name: Set up flux
+        if: needs.build-amd64.outputs.release_exists == 'false'
+        uses: fluxcd/flux2/action@04acaec6161ac4fb1a82ffafa88901c03271d34f # v2.8.6
+        with:
+          version: "2.8.6"
+      - name: Set up build toolchain
+        if: needs.build-amd64.outputs.release_exists == 'false'
+        run: |
+          command -v skopeo >/dev/null \
+            || { sudo apt-get update -qq && sudo apt-get install -y -qq skopeo; }
+          command -V skopeo jq yq helm
+          yq --version | grep -q mikefarah
+
+      - name: Login to GHCR
+        if: needs.build-amd64.outputs.release_exists == 'false'
+        uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3
+        with:
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+          registry: ghcr.io
+        env:
+          DOCKER_CONFIG: ${{ runner.temp }}/.docker
+
+      - name: Download the amd64 build
+        if: needs.build-amd64.outputs.release_exists == 'false'
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
+        with:
+          name: release-tree
+          path: ${{ runner.temp }}/release-tree
+
+      - name: Download the assets
+        if: needs.build-amd64.outputs.release_exists == 'false'
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
+        with:
+          name: release-assets
+          path: _out/assets
+
+      - name: Apply the stamped tree
+        if: needs.build-amd64.outputs.release_exists == 'false'
+        run: git apply --binary "${{ runner.temp }}/release-tree/stamped-tree.patch"
+
+      # Join each image with its arm64 twin, moving every tag the amd64 build
+      # pushed for it, and gate on the result, then republish the packages
+      # artifact and the installer chart from the repinned tree: the amd64
+      # build pushed both pinned on amd64-only digests, and the chart's values
+      # pin the operator image and the artifact digest.
+      - name: Stitch multi-arch indexes and republish
+        if: needs.build-amd64.outputs.release_exists == 'false'
+        run: |
+          set -eu
+          hack/stitch-multiarch.sh packages "$REGISTRY" "$IMAGE_TAG"
+          hack/verify-multiarch.sh packages
+          make -C packages/core/installer image-packages chart
+        env:
+          DOCKER_CONFIG: ${{ runner.temp }}/.docker
+          REGISTRY_AUTH_FILE: ${{ runner.temp }}/.docker/config.json
+          REGISTRY: ghcr.io/cozystack/cozystack
+          IMAGE_TAG: ${{ github.ref_name }}
+          PUSHED_TAGS_LOG: ${{ runner.temp }}/release-tree/pushed-tags
 
       # Commit built artifacts
       - name: Commit release artifacts
-        if: steps.check_release.outputs.skip == 'false'
+        if: needs.build-amd64.outputs.release_exists == 'false'
         env:
           APP_TOKEN: ${{ steps.app-token.outputs.token }}
         run: |
@@ -137,36 +491,31 @@ jobs:
           git add .
           git commit -m "Prepare release ${GITHUB_REF#refs/tags/}" -s || echo "No changes to commit"
 
-      # Tag the api/apps/v1alpha1 submodule for pkg.go.dev
-      - name: Tag API submodule
-        if: steps.check_release.outputs.skip == 'false'
-        env:
-          APP_TOKEN: ${{ steps.app-token.outputs.token }}
-        run: |
-          VTAG="${{ steps.tag.outputs.tag }}"
-          SUBTAG="api/apps/v1alpha1/${VTAG}"
-          git config user.name  "cozystack-ci[bot]"
-          git config user.email "274107086+cozystack-ci[bot]@users.noreply.github.com"
-          git remote set-url origin https://x-access-token:${APP_TOKEN}@github.com/${GITHUB_REPOSITORY}
-          TARGET="$(git rev-parse "${VTAG}^{}")"
-          git tag -f "${SUBTAG}" "$TARGET"
-          git push -f origin "refs/tags/${SUBTAG}"
+      # NB: the api/apps/v1alpha1/vX.Y.Z Go-module tag is NOT cut here. Under the
+      # promote flow this job only ever runs for an rc (a stable tag always finds
+      # its draft and skips, and a stable tag WITHOUT a draft is rejected above),
+      # and an rc must never get an immutable Go-module tag. The stable submodule
+      # tag is cut by pull-requests-release.yaml finalize, at the stable tag's
+      # merge commit (#2677 goal 3).
 
       # Create or reuse draft release
       - name: Create / reuse draft release
-        if: steps.check_release.outputs.skip == 'false'
+        if: needs.build-amd64.outputs.release_exists == 'false'
         id: release
-        uses: actions/github-script@v7
+        uses: actions/github-script@f28e40c7f34bde8b3046d885e986cb6290c5673b # v7
         with:
           script: |
-            const tag      = '${{ steps.tag.outputs.tag }}';
-            const isRc     = ${{ steps.tag.outputs.is_rc }};
-            const releases = await github.rest.repos.listReleases({
+            const tag      = '${{ needs.build-amd64.outputs.tag }}';
+            const isRc     = ${{ needs.build-amd64.outputs.is_rc }};
+            // Paginate: the default page is 30, and promote-created stable drafts
+            // plus accreting rc releases can push an in-flight draft off it.
+            const releases = await github.paginate(github.rest.repos.listReleases, {
               owner: context.repo.owner,
-              repo:  context.repo.repo
+              repo:  context.repo.repo,
+              per_page: 100
             });
 
-            let rel = releases.data.find(r => r.tag_name === tag);
+            let rel = releases.find(r => r.tag_name === tag);
             if (!rel) {
               rel = await github.rest.repos.createRelease({
                 owner: context.repo.owner,
@@ -183,18 +532,48 @@ jobs:
 
             core.setOutput('upload_url', rel.upload_url);
 
-      # Build + upload assets (optional)
-      - name: Build & upload assets
-        if: steps.check_release.outputs.skip == 'false'
-        run: |
-          make assets
-          make upload_assets VERSION=${{ steps.tag.outputs.tag }}
+      # The assets were built by build-amd64; the operator manifests are
+      # rendered here, from the tree pinned on the index digests.
+      - name: Upload assets
+        if: needs.build-amd64.outputs.release_exists == 'false'
+        run: make upload_assets VERSION=${{ needs.build-amd64.outputs.tag }}
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      # Create release-X.Y.Z branch and push (force-update)
+      # Publish the rc release once its assets are uploaded. The draft above is
+      # created draft; a stable draft stays draft for finalize to publish, but an
+      # rc has no later publish step — and the whole point of an rc is to be
+      # publicly visible so the community can download nocloud-amd64.raw.xz and
+      # validate it. rc tags are write-once, so there is nothing to protect with
+      # draft status. prerelease:true keeps it off the "Latest release" pointer.
+      - name: Publish rc release
+        if: needs.build-amd64.outputs.release_exists == 'false' && needs.build-amd64.outputs.is_rc == 'true'
+        uses: actions/github-script@f28e40c7f34bde8b3046d885e986cb6290c5673b # v7
+        with:
+          github-token: ${{ steps.app-token.outputs.token }}
+          script: |
+            const tag = '${{ needs.build-amd64.outputs.tag }}';
+            const releases = await github.paginate(github.rest.repos.listReleases, {
+              owner: context.repo.owner, repo: context.repo.repo, per_page: 100
+            });
+            const rel = releases.find(r => r.tag_name === tag);
+            if (!rel) { core.setFailed(`rc release ${tag} not found to publish`); return; }
+            if (!rel.draft) { console.log(`${tag} already published`); return; }
+            await github.rest.repos.updateRelease({
+              owner: context.repo.owner, repo: context.repo.repo,
+              release_id: rel.id, draft: false, prerelease: true, make_latest: 'false'
+            });
+            console.log(`Published rc release ${tag} (prerelease)`);
+
+      # Create the release-X.Y.Z staging branch (holds the digest-bake commit for
+      # this version's release PR).
+      #
+      # Compare-before-force: this is a mutable staging branch, not an immutable
+      # artifact — a re-run produces a fresh, non-reproducible bake commit. Skip
+      # the push when nothing changed; force-update (and log it) only when the
+      # branch genuinely moves. Unlike the tags above, force here is legitimate.
       - name: Create release branch
-        if: steps.check_release.outputs.skip == 'false'
+        if: needs.build-amd64.outputs.release_exists == 'false'
         env:
           APP_TOKEN: ${{ steps.app-token.outputs.token }}
         run: |
@@ -202,61 +581,101 @@ jobs:
           git config user.email "274107086+cozystack-ci[bot]@users.noreply.github.com"
           git remote set-url origin https://x-access-token:${APP_TOKEN}@github.com/${GITHUB_REPOSITORY}
           BRANCH="release-${GITHUB_REF#refs/tags/v}"
-          git branch -f "$BRANCH"
-          git push -f origin "$BRANCH"
+          LOCAL="$(git rev-parse HEAD)"
+          REMOTE="$(git ls-remote --heads origin "$BRANCH" | awk '{print $1}')"
+          if [ -z "$REMOTE" ]; then
+            git push origin "HEAD:refs/heads/${BRANCH}"
+            echo "✅ Created staging branch ${BRANCH} at ${LOCAL}."
+          elif [ "$REMOTE" = "$LOCAL" ]; then
+            echo "✅ ${BRANCH} already at ${LOCAL}; nothing to do."
+          else
+            echo "::notice::Force-updating staging branch ${BRANCH}: ${REMOTE} -> ${LOCAL}."
+            git push -f origin "HEAD:refs/heads/${BRANCH}"
+          fi
 
-      # Create pull request into original base branch (if absent)
-      - name: Create pull request if not exists
-        if: steps.check_release.outputs.skip == 'false'
-        uses: actions/github-script@v7
-        with:
-          github-token: ${{ steps.app-token.outputs.token }}
-          script: |
-            const version = context.ref.replace('refs/tags/v', '');
-            const base    = '${{ steps.get_base.outputs.branch }}';
-            const head    = `release-${version}`;
+      # NB: no release PR is opened here. rc tags never get one, and the stable
+      # promote PR is opened by promote-rc.yaml. The old "Create pull request if
+      # not exists" step was gated on `is_stable && release_exists==false` —
+      # unreachable now that a hand-pushed stable tag is rejected above.
 
-            const prs = await github.rest.pulls.list({
-              owner: context.repo.owner,
-              repo:  context.repo.repo,
-              head:  `${context.repo.owner}:${head}`,
-              base
-            });
-            if (prs.data.length === 0) {
-              const pr = await github.rest.pulls.create({
-                owner: context.repo.owner,
-                repo:  context.repo.repo,
-                head,
-                base,
-                title: `chore(release): cut v${version}`,
-                body:  `This PR prepares the release \`v${version}\`.`,
-                draft: false
-              });
-              await github.rest.issues.addLabels({
-                owner: context.repo.owner,
-                repo:  context.repo.repo,
-                issue_number: pr.data.number,
-                labels: ['release']
-              });
-              console.log(`Created PR #${pr.data.number}`);
-            } else {
-              console.log(`PR already exists from ${head} to ${base}`);
-            }
+  # Mandatory only for vX.Y.Z-rc.N tags. Alpha/beta tags deliberately skip this
+  # job and use e2e-tag.yaml's manual dispatch when validation is wanted.
+  #
+  # Deliberately not gated on release_exists: validating an already-published rc
+  # again is an idempotent re-tag-run check, while prepare-release still provides
+  # the ordering guarantee for a fresh rc. Its "Publish rc release" and "Create
+  # release branch" steps finish before this reusable workflow can start.
+  rc-e2e:
+    name: E2E Release Candidate
+    needs: prepare-release
+    # !cancelled(): every job below build-arm64 carries a status function,
+    # since a stable tag skips build-arm64. This one only runs for an rc,
+    # where build-arm64 always runs, so here it just follows that rule.
+    if: ${{ !cancelled() && needs.prepare-release.result == 'success' && contains(github.ref_name, '-rc.') }}
+    # A caller's permissions are the ceiling for every job in the called
+    # workflow, and GitHub validates that ceiling STATICALLY, when it creates the
+    # run — before this job's `if:` is evaluated, let alone before a step runs.
+    # e2e-tag.yaml's e2e job declares `checks: write` for its
+    # workflow_dispatch-only breakpoint, so even though workflow_call can never
+    # take that branch, omitting the grant here fails the whole tags.yaml run with
+    # "requesting 'checks: write', but is only allowed 'checks: none'". Not just
+    # rc cuts: the `if:` cannot gate a startup failure, so EVERY tag push — rc and
+    # stable, including the one finalize pushes to publish a release — would build
+    # nothing at all. hack/promote-gate-contract.bats pins the pair, because no CI
+    # lane exercises this file (it runs only on tag pushes).
+    permissions:
+      contents: read
+      checks: write
+    uses: ./.github/workflows/e2e-tag.yaml
+    with:
+      tag: ${{ github.ref_name }}
 
+  # BACKSTOP, and since the rc freeze also the normal route a published changelog
+  # takes to main. It is authored by promote-rc.yaml, which commits it onto the
+  # release-X.Y.Z branch so it rides the promote PR and is on the base branch the
+  # moment finalize publishes the release. That is the whole point of
+  # generating it there: at the time THIS job runs the stable tag has already been
+  # pushed by finalize, which means the release is already public — too late for a
+  # changelog PR to be of any use to a reader.
+  #
+  # What the freeze changed: promote-rc.yaml bases its promote PR on release-X.Y
+  # whenever that branch exists, and cutting vX.Y.0-rc.1 now creates it. So EVERY
+  # release, minor and patch alike, merges its changelog onto the maintenance line
+  # and none of them reach main on the way. Porting the reviewed file here is the
+  # normal path — it used to be the corner case, back when only a patch release
+  # targeted a line.
+  #
+  # The two paths that remain:
+  #   1. the file is at the tag but not on main (the usual state): port it
+  #      verbatim, no AI;
+  #   2. changelog generation failed during promotion (it is non-blocking there)
+  #      and the promote PR merged without one: nothing at the tag either, so the
+  #      AI runs.
+  # Either way this opens the changelog PR against main after the fact. The
+  # self-skip on `exists` survives, but it now means the file reached main some
+  # other way — a hand-commit, or an earlier run of this job.
   generate-changelog:
-    name: Generate Changelog
-    runs-on: [self-hosted]
+    name: Generate Changelog (backstop)
+    # git + node + copilot CLI only — no docker, no repo toolchain: GitHub-hosted.
+    runs-on: ubuntu-latest
     needs: [prepare-release]
     permissions:
       contents: write
       pull-requests: write
-    if: needs.prepare-release.result == 'success'
-    # Non-blocking: failure here must not prevent update-website-docs from running.
+    # Stable tags only. A prerelease tag has a '-' in ref_name (vX.Y.Z-rc.N);
+    # firing on every rc would open a changelog-vX.Y.Z-rc.N PR that never merges
+    # (no docs/changelogs/v*-rc*.md is a real file). Cumulative rc notes are
+    # finalized at the stable release, so the changelog is generated then.
+    # !cancelled(): this job runs on stable tags only, which skip build-arm64,
+    # and a skipped ancestor makes the implicit success() false.
+    if: ${{ !cancelled() && needs.prepare-release.result == 'success' && !contains(github.ref_name, '-') }}
+    # Non-blocking: this is a best-effort backfill of an already-published
+    # release, never a gate on one.
     continue-on-error: true
     steps:
       - name: Generate GitHub App token
         id: app-token
-        uses: actions/create-github-app-token@v1
+        uses: actions/create-github-app-token@d72941d797fd3113feb6b93fd0dec494b13a2547 # v1
         with:
           app-id: ${{ secrets.COZYSTACK_CI_APP_ID }}
           private-key: ${{ secrets.COZYSTACK_CI_PRIVATE_KEY }}
@@ -268,7 +687,7 @@ jobs:
       # regardless of whether the agent follows the prompt's instructions.
       - name: Generate read-only GitHub App token
         id: app-token-read
-        uses: actions/create-github-app-token@v1
+        uses: actions/create-github-app-token@d72941d797fd3113feb6b93fd0dec494b13a2547 # v1
         with:
           app-id: ${{ secrets.COZYSTACK_CI_APP_ID }}
           private-key: ${{ secrets.COZYSTACK_CI_PRIVATE_KEY }}
@@ -279,7 +698,7 @@ jobs:
 
       - name: Parse tag
         id: tag
-        uses: actions/github-script@v7
+        uses: actions/github-script@f28e40c7f34bde8b3046d885e986cb6290c5673b # v7
         with:
           script: |
             const ref = context.ref.replace('refs/tags/', '');
@@ -300,18 +719,29 @@ jobs:
       # contents. The Create changelog branch step below resets the file
       # onto a fresh branch from origin/main for the PR.
       - name: Checkout release tag
-        uses: actions/checkout@v4
+        uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4
         with:
           ref: ${{ steps.tag.outputs.tag }}
           fetch-depth: 0
           fetch-tags: true
           token: ${{ steps.app-token.outputs.token }}
 
-      # Check whether the changelog already exists on origin/main.
-      # The previous step checked out the tag commit, which never has the
-      # changelog (the changelog PR merges to main AFTER the tag is cut).
-      # Looking at origin/main is what the gate is supposed to do — skip
-      # generation on workflow reruns when the changelog has already merged.
+      # Two independent questions, and the answers select between three paths.
+      #
+      # `exists` — is the changelog already on origin/main? Then this whole job
+      # is a no-op. Since the freeze that is the EXCEPTION: the promote PR merges
+      # into release-X.Y, so the file it carried never touched main, and this is
+      # true only if something else put it there.
+      #
+      # `at_tag` — is it present in THIS checkout (the tag commit)? Under the
+      # promote flow it normally is, because the promote PR carried it onto
+      # release-X.Y and the stable tag sits on that merge commit. Since the freeze
+      # that PR always targets the line, so this is the usual state on arrival:
+      # `exists` false, `at_tag` true, a reviewed and already-published changelog
+      # sitting right here — port it rather than regenerate.
+      #
+      # Only when both are false is there genuinely no changelog to publish, and
+      # only then does the AI run.
       - name: Check if changelog already exists
         id: check_changelog
         env:
@@ -326,19 +756,36 @@ jobs:
             echo "exists=false" >> $GITHUB_OUTPUT
             echo "Changelog file $CHANGELOG_FILE does not exist on origin/main"
           fi
+          # Is the changelog present at the TAG (this checkout)? Under the promote
+          # flow it normally is: promote-rc.yaml commits it onto release-X.Y.Z and
+          # it reaches the tag via the merge commit. That PR targets the maintenance
+          # line for every release since the freeze, so the file lands on
+          # release-X.Y and never reaches main — `exists` above is false even though
+          # a reviewed, already-PUBLISHED changelog exists right here.
+          #
+          # Regenerating in that case would spend a second AI run and, once the
+          # backstop PR merged, update-releasenotes.yaml would overwrite the
+          # published release body with text nobody approved. Port the reviewed
+          # file verbatim instead; the AI is only for the genuinely-absent case.
+          if [ -s "$CHANGELOG_FILE" ]; then
+            echo "at_tag=true" >> $GITHUB_OUTPUT
+            echo "Changelog present at the tag — will port it to main verbatim, no regeneration."
+          else
+            echo "at_tag=false" >> $GITHUB_OUTPUT
+          fi
 
       - name: Setup Node.js
-        if: steps.check_changelog.outputs.exists == 'false'
-        uses: actions/setup-node@v4
+        if: steps.check_changelog.outputs.exists == 'false' && steps.check_changelog.outputs.at_tag == 'false'
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
         with:
           node-version: 22
 
       - name: Install GitHub Copilot CLI
-        if: steps.check_changelog.outputs.exists == 'false'
+        if: steps.check_changelog.outputs.exists == 'false' && steps.check_changelog.outputs.at_tag == 'false'
         run: npm i -g @github/copilot
 
       - name: Generate changelog using AI
-        if: steps.check_changelog.outputs.exists == 'false'
+        if: steps.check_changelog.outputs.exists == 'false' && steps.check_changelog.outputs.at_tag == 'false'
         timeout-minutes: 30
         env:
           COPILOT_GITHUB_TOKEN: ${{ secrets.COPILOT_GITHUB_TOKEN }}
@@ -360,12 +807,19 @@ jobs:
           CHANGELOG_FILE="docs/changelogs/v${VERSION}.md"
           CHANGELOG_BRANCH="changelog-v${VERSION}"
 
+          # Two ways the file can be here: ported verbatim from the tag commit
+          # (at_tag=true — the reviewed, already-published changelog reaching main
+          # for the first time), or freshly generated above. Either is valid.
           if [ ! -f "$CHANGELOG_FILE" ]; then
-            echo "::error::Changelog file $CHANGELOG_FILE was not produced by the Generate changelog using AI step"
+            echo "::error::Changelog file $CHANGELOG_FILE is absent — it was neither present at the tag nor produced by the Generate changelog using AI step"
             exit 1
           fi
-          if [ ! -s "$CHANGELOG_FILE" ]; then
-            echo "::error::Changelog file $CHANGELOG_FILE is empty"
+          # Same validator promote-rc uses: a ported file came from the tag and a
+          # generated one from a step allowed to fail, so neither has been checked
+          # here. update-releasenotes.yaml will push whatever this PR merges into
+          # the published release body, so a fragment must not get that far.
+          if ! REASON="$(hack/validate-changelog.sh "$CHANGELOG_FILE" "${VERSION}" 2>&1)"; then
+            echo "::error::Changelog file $CHANGELOG_FILE is not usable: ${REASON}"
             exit 1
           fi
 
@@ -395,7 +849,7 @@ jobs:
 
       - name: Create PR for changelog
         if: steps.check_changelog.outputs.exists == 'false'
-        uses: actions/github-script@v7
+        uses: actions/github-script@f28e40c7f34bde8b3046d885e986cb6290c5673b # v7
         with:
           github-token: ${{ steps.app-token.outputs.token }}
           script: |
@@ -448,19 +902,38 @@ jobs:
               console.log(`Created PR #${pr.data.number} for changelog`);
             }
 
+
+  # BACKSTOP ONLY. The cozystack/website "update managed apps reference" PR is now
+  # normally opened earlier, at PROMOTE time, by promote-rc.yaml::website-docs —
+  # which fetches README content from the release-X.Y.Z staging branch (via the
+  # website Makefile's FETCH_REF) so the docs are reviewable alongside the promote
+  # PR while the stable tag is still unborn. This tag-time job stays as the
+  # backstop for the degraded paths (promote's website-docs failed or ran against
+  # a pre-FETCH_REF website): it fires on the stable tag push, force-pushes the
+  # SAME update-docs-vX.Y.Z branch, and no-ops into "No changes to commit" when
+  # promote already did the work. Behaviour is deliberately unchanged — at tag time
+  # the stable tag exists, so its BRANCH=RELEASE_TAG fetch resolves.
   update-website-docs:
     name: Update Website Docs
-    runs-on: [self-hosted]
+    # bash + git + yq + gh against the website repo — no docker: GitHub-hosted.
+    runs-on: ubuntu-latest
     needs: [generate-changelog, prepare-release]
     # generate-changelog is non-blocking — run as long as prepare-release succeeded.
-    # `always()` is needed so this job runs even if generate-changelog failed/skipped.
-    if: always() && needs.prepare-release.result == 'success' && needs.prepare-release.outputs.skip != 'true'
+    # `!cancelled()` lets this job run if generate-changelog failed/skipped,
+    # while still stopping it when the workflow is cancelled.
+    # Not gated on release_exists: a promoted stable tag already has a draft
+    # release (so prepare-release skips the rebuild), but its website docs still
+    # need publishing. Gating on release_exists here skipped docs for every
+    # promoted stable.
+    # Stable tags only — a prerelease (ref_name contains '-') would otherwise open
+    # an "update managed apps for vX.Y.Z-rc.N" website PR on every rc.
+    if: ${{ !cancelled() && needs.prepare-release.result == 'success' && !contains(github.ref_name, '-') }}
     permissions:
       contents: read
     steps:
       - name: Generate GitHub App token
         id: app-token
-        uses: actions/create-github-app-token@v1
+        uses: actions/create-github-app-token@d72941d797fd3113feb6b93fd0dec494b13a2547 # v1
         with:
           app-id: ${{ secrets.COZYSTACK_CI_APP_ID }}
           private-key: ${{ secrets.COZYSTACK_CI_PRIVATE_KEY }}
@@ -468,7 +941,7 @@ jobs:
 
       - name: Parse tag
         id: tag
-        uses: actions/github-script@v7
+        uses: actions/github-script@f28e40c7f34bde8b3046d885e986cb6290c5673b # v7
         with:
           script: |
             const ref = context.ref.replace('refs/tags/', '');
@@ -482,7 +955,7 @@ jobs:
             core.setOutput('version', version);  // 0.22.0
 
       - name: Checkout website repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4
         with:
           repository: cozystack/website
           token: ${{ steps.app-token.outputs.token }}
diff --git a/.github/workflows/ui-test.yaml b/.github/workflows/ui-test.yaml
new file mode 100644
index 0000000000..84e39bd76f
--- /dev/null
+++ b/.github/workflows/ui-test.yaml
@@ -0,0 +1,61 @@
+name: UI Test
+
+# Typecheck, lint and unit tests for the in-tree console SPA
+# (packages/system/dashboard/images/console, vendored from cozystack-ui).
+# The container image itself is built by `make build` in the main build job.
+
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - 'packages/system/dashboard/images/console/**'
+  pull_request:
+    paths:
+      - 'packages/system/dashboard/images/console/**'
+
+defaults:
+  run:
+    working-directory: packages/system/dashboard/images/console
+
+# Read-only token; this workflow only checks out code and runs typecheck/lint/tests.
+permissions:
+  contents: read
+
+jobs:
+  test:
+    name: Typecheck and test
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4
+        with:
+          # No git pushes from this workflow; don't leave the token in .git/config
+          # where a later `pnpm install` step could read it.
+          persist-credentials: false
+
+      - name: Set up pnpm
+        uses: pnpm/action-setup@b906affcce14559ad1aafd4ab0e942779e9f58b1 # v4
+        with:
+          # The monorepo root has no package.json; read the pnpm version from
+          # the console workspace manifest (packageManager field).
+          package_json_file: packages/system/dashboard/images/console/package.json
+
+      - name: Set up Node.js
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
+        with:
+          node-version: 22
+          cache: pnpm
+          cache-dependency-path: packages/system/dashboard/images/console/pnpm-lock.yaml
+
+      - name: Install dependencies
+        run: pnpm install --frozen-lockfile
+
+      - name: Typecheck
+        run: pnpm typecheck
+
+      - name: Lint
+        run: pnpm lint
+
+      - name: Test
+        run: pnpm test
diff --git a/.github/workflows/update-releasenotes.yaml b/.github/workflows/update-releasenotes.yaml
index b475511fbf..d52cd8dbf0 100644
--- a/.github/workflows/update-releasenotes.yaml
+++ b/.github/workflows/update-releasenotes.yaml
@@ -4,26 +4,43 @@ on:
   push:
     branches:
       - main
+    # Only run when a release changelog changes. The release body is synced from
+    # docs/changelogs/v*.md, which lands on main either when the changelog PR
+    # (tags.yaml generate-changelog) merges or when a maintainer edits an
+    # existing changelog. The v* glob deliberately skips template.md /
+    # patch-template.md in the same directory. Every other main push left this
+    # job scanning the latest 30 releases for nothing.
+    paths:
+      - 'docs/changelogs/v*.md'
+  # Manual re-sync hatch: re-run the changelog -> release-body sync without
+  # touching a changelog file (e.g. if a release body drifted out of sync).
+  workflow_dispatch:
 
 concurrency:
   group: update-releasenotes-${{ github.workflow }}
   cancel-in-progress: false
 
+# Top-level token defaults to read-only. A job-level block replaces this one
+# rather than adding to it, so each job restates every scope it needs.
+permissions:
+  contents: read
+
 jobs:
   update-releasenotes:
     name: Update Release Notes
-    runs-on: [self-hosted]
+    # GitHub API calls only — no docker, no repo toolchain: GitHub-hosted.
+    runs-on: ubuntu-latest
     permissions:
       contents: write
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4
         with:
           fetch-depth: 0
 
       - name: Update release notes from changelogs
-        uses: actions/github-script@v7
+        uses: actions/github-script@f28e40c7f34bde8b3046d885e986cb6290c5673b # v7
         with:
           script: |
             const fs = require('fs');
diff --git a/.github/workflows/zizmor.yml b/.github/workflows/zizmor.yml
new file mode 100644
index 0000000000..57265c1a8a
--- /dev/null
+++ b/.github/workflows/zizmor.yml
@@ -0,0 +1,49 @@
+name: zizmor
+
+# Tree-wide GitHub Actions security gate. Fails the PR when a workflow
+# reintroduces an unpinned action or a missing/overly-broad permissions block
+# (Scorecard's Pinned-Dependencies and Token-Permissions checks). The audit
+# scope is pinned in .github/zizmor.yml; the same tool also runs on the PR diff
+# via the pre-commit hook.
+#
+# Runs offline: the two gating audits are purely syntactic, so no GitHub token is
+# needed and no data leaves the runner. Findings are surfaced in the job log and
+# fail the step; the SARIF is intentionally NOT uploaded to code scanning, matching
+# scorecard.yml — the public signal is the failing check, not a Security-tab alert.
+
+on:
+  pull_request:
+    paths:
+      - '.github/workflows/**'
+      - '.github/zizmor.yml'
+  push:
+    branches: [main]
+    paths:
+      - '.github/workflows/**'
+      - '.github/zizmor.yml'
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+concurrency:
+  group: zizmor-${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  zizmor:
+    name: Audit workflows
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4
+        with:
+          persist-credentials: false
+
+      - name: Install zizmor
+        run: pipx install zizmor==1.26.1
+
+      - name: Audit workflows
+        run: zizmor --offline .github/workflows/
diff --git a/.github/zizmor.yml b/.github/zizmor.yml
new file mode 100644
index 0000000000..68bde1d1c1
--- /dev/null
+++ b/.github/zizmor.yml
@@ -0,0 +1,37 @@
+# zizmor configuration — https://docs.zizmor.sh/configuration/
+#
+# zizmor audits GitHub Actions workflows for supply-chain and permission issues.
+# It runs in two places: the pre-commit hook (.pre-commit-config.yaml) for local
+# and PR-diff feedback, and the dedicated gate workflow (.github/workflows/zizmor.yml)
+# for a full-tree scan on every PR.
+#
+# Scope of the gate (deliberately narrow for now): only the two audits that map
+# directly to the OpenSSF Scorecard checks this repo keeps regressing on —
+#   * unpinned-uses      -> Scorecard "Pinned-Dependencies"
+#   * excessive-permissions -> Scorecard "Token-Permissions"
+# Both are clean tree-wide as of this config, so the gate is green and blocks any
+# new workflow that reintroduces an unpinned action or a missing permissions block
+# (the exact regression the in-tree console move introduced via ui-test.yaml).
+#
+# The remaining audits below carry pre-existing findings (58 at time of writing).
+# They are genuinely valuable — template-injection and dangerous-triggers most of
+# all — but fixing them is a separate cleanup, not this hardening PR. They are
+# disabled here (not ignored per-line, to avoid brittle line-number churn) with a
+# TODO to burn the debt down and re-enable them one audit at a time.
+#
+# TODO(scorecard-hardening): burn down and re-enable, highest value first:
+#   template-injection, dangerous-triggers, cache-poisoning, github-app,
+#   adhoc-packages, artipacked.
+rules:
+  template-injection:
+    disable: true
+  dangerous-triggers:
+    disable: true
+  cache-poisoning:
+    disable: true
+  github-app:
+    disable: true
+  adhoc-packages:
+    disable: true
+  artipacked:
+    disable: true
diff --git a/.gitignore b/.gitignore
index eebf40be70..db787248de 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,27 @@ _repos
 .idea
 .vscode
 
+# Go binaries built straight into the repository root.
+#
+# `go build ./cmd/<name>` (without -o) drops the executable in the working
+# directory under the package name, so every package under cmd/ has a
+# root-level binary waiting to happen — each ~80 MB, and nothing else here
+# matched them, leaving `git add .` one keystroke from committing one.
+/api-gate
+/backport-audit
+/backup-controller
+/backupstrategy-controller
+/check-readiness
+/cozypkg
+/cozystack-api
+/cozystack-controller
+/cozystack-operator
+/flux-plunger
+/flux-shard-operator
+/kubeovn-plunger
+/lineage-controller-webhook
+/securitygroup-controller
+
 # User-specific stuff
 .idea/**/workspace.xml
 .idea/**/tasks.xml
@@ -83,7 +104,17 @@ tmp/
 
 # build revision marker (generated by make image-packages)
 packages/core/platform/.build-revision
-.claude/
+
+# Agent tooling. The md-no-hardwrap hook and its registration are shared with
+# every contributor, so they are tracked by name; personal agent state (local
+# settings overrides, worktrees, session data) stays out of git. Put personal
+# overrides in .claude/settings.local.json -- .claude/settings.json is tracked
+# and git will overwrite it on pull.
+.claude/*
+!.claude/hooks/
+.claude/hooks/*
+!.claude/hooks/md-no-hardwrap.py
+!.claude/settings.json
 
 # Credentials and runtime state minted by the backup/restore demo scripts
 # under examples/backups/*/. Files are written by 00-helpers.sh +
@@ -93,3 +124,31 @@ packages/core/platform/.build-revision
 examples/backups/*/.bucket-info.env
 examples/backups/*/.sentinel.env
 examples/backups/*/.backup-name.env
+examples/backups/*/.source-dump.txt
+packages/core/platform/images/migrations/etcd-operator-crds/
+
+# CI scratch: promote-rc.yaml checks the dispatch ref here so release tooling
+# (validator, agent instructions) is current even when the checked-out rc tag
+# predates it. Never committed.
+.release-tooling
+
+# Machine credentials and boot artifacts hack/e2e-prepare-cluster.bats writes
+# to the repository root when the e2e sandbox is brought up outside CI: the
+# Talos secrets bundle and rendered machine configs, the kubeconfigs, the boot
+# image and the per-VM directories. secrets.yaml holds the cluster's private
+# keys, and before this block nothing here matched any of them -- leaving
+# `git add -A` in a tree that once ran the bringup one keystroke from
+# committing a credentials bundle.
+/secrets.yaml
+/talosconfig
+/kubeconfig
+/tenantkubeconfig*
+/controlplane.yaml
+/worker.yaml
+/patch.yaml
+/patch-controlplane.yaml
+/nocloud-amd64.raw
+/nocloud-amd64.raw.xz
+/srv1/
+/srv2/
+/srv3/
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 6492b92d3d..fa3ec818ff 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -4,7 +4,7 @@ repos:
     - id: run-make-generate-root
       name: Run 'make generate' at repo root
       entry: |
-        flock -x .git/pre-commit.lock sh -c '
+        sh -c 'exec flock -x "$(git rev-parse --git-common-dir)/pre-commit.lock" "$@"' -- sh -c '
           echo "Running make generate at repo root"
           make generate || exit $?
           git diff --color=always | cat
@@ -13,16 +13,30 @@ repos:
       files: ^(api/|pkg/apis/|pkg/generated/|internal/crdinstall/manifests/|packages/system/cozystack-controller/definitions/|packages/system/application-definition-crd/definition/|packages/system/backup-controller/definitions/|packages/system/backupstrategy-controller/definitions/|hack/update-codegen\.sh$|hack/boilerplate\.go\.txt$|Makefile$)
       pass_filenames: false
     - id: run-make-generate
-      name: Run 'make generate' in all app directories
+      name: Run 'make generate' in all package directories
       entry: |
-        flock -x .git/pre-commit.lock sh -c '
-          for dir in ./packages/apps/*/ ./packages/extra/*/; do
-            if [ -d "$dir" ]; then
-              echo "Running make generate in $dir"
-              make generate -C "$dir" || exit $?
-            fi
-          done
+        sh -c 'exec flock -x "$(git rev-parse --git-common-dir)/pre-commit.lock" "$@"' -- sh -c '
+          hack/pre-commit-generate-packages.sh || exit $?
           git diff --color=always | cat
         '
       language: system
       files: ^.*$
+    # The complete hack/*.bats and POSIX-compatibility pass is intentionally a
+    # manual local hook because it requires bats-core and has substantial wall
+    # time even with GNU parallel. Run it before pushing with:
+    # pre-commit run bats-unit-tests --hook-stage manual --all-files
+    # Pull-request CI remains the unconditional gate.
+    - id: bats-unit-tests
+      name: Run hack/*.bats unit tests
+      entry: make bats-unit-tests bats-posix-compat-tests
+      language: system
+      stages: [manual]
+      pass_filenames: false
+# Lints changed GitHub Actions workflows for unpinned actions and excessive token
+# permissions (audit scope is set in .github/zizmor.yml). Runs offline so it needs
+# no GitHub token locally. The same gate runs tree-wide in .github/workflows/zizmor.yml.
+- repo: https://github.com/zizmorcore/zizmor-pre-commit
+  rev: v1.26.1
+  hooks:
+    - id: zizmor
+      args: [--offline]
diff --git a/AGENTS.md b/AGENTS.md
index 1e9c4d1570..ca0a515478 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -1,7 +1,6 @@
 # AI Agents Overview
 
-This file provides structured guidance for AI coding assistants and agents
-working with the **Cozystack** project.
+This file provides structured guidance for AI coding assistants and agents working with the **Cozystack** project.
 
 ## Activation
 
@@ -19,9 +18,21 @@ working with the **Cozystack** project.
   - Read: [`releasing.md`](./docs/agents/releasing.md)
   - Action: Read the file and follow the referenced release process in `docs/release.md`
 
-- **Project structure, conventions, code layout** (e.g., "where should I put X", "what's the convention for Y", "how is the project organized")
+- **Image references, tags and digests** (e.g., "why is this image tagged rc", "add an image to a package", "change how an image is stamped", "promotion/nightly missed an image", "where do image refs live")
+  - Read: [`image-refs.md`](./docs/agents/image-refs.md)
+  - Action: Read the entire file. Image refs live in three storage shapes and carry three classes of tag; a tool that knows only one shape skips images silently rather than failing. `hack/lib/image-refs.sh` is the enumeration shared by the promote, retag, mirror, candidate-verify, multi-arch stitch and verify, and retention tooling — extend it there rather than teaching an individual script a new path. The one exception is `hack/overlay-main-images.sh`, which reads refs but walks the tree itself, so a newly declared file does not reach it; `hack/promote-packages-artifact.sh` sources nothing because it publishes the whole tree and consumes no refs at all — the doc carries both cases
+
+- **Retiring an application** (e.g., "remove the X app", "deprecate X", "drop X from the catalog", "what happens to instances people already created")
+  - Read: [`deprecating-applications.md`](./docs/deprecating-applications.md)
+  - Action: Read the entire file before touching the tree. Deleting a chart is not a deletion: pruning its PackageSource garbage-collects the ArtifactGenerator and both ExternalArtifacts, which are the `chartRef` targets of the rd release and of every tenant release, so surviving instances sit `Ready=False` for good and `HelmReleaseNotReady` fires on every cluster carrying the bundle. An application with a successor migrates onto it; one without is frozen, per cluster, on the artifact that cluster already renders from, with the digest read off the live OCIRepository at hook time rather than written into the migration. The tenant RBAC grant comes out of the chart and is re-applied by the migration on the clusters that froze
+
+- **Go code, Helm charts, build and test commands, project structure** (e.g., "add a field to this CRD", "fix this controller", "add a value to the postgres chart", "regenerate the values schema", "how do I build/test this", "where should I put X", "what's the convention for Y", "how is the project organized")
   - Read: [`overview.md`](./docs/agents/overview.md)
-  - Action: Read relevant sections to understand project structure and conventions
+  - Action: Read the section that matches — `Go Code` (controller-runtime patterns, kubebuilder markers), `Helm Charts` (umbrella pattern, vendored upstream charts), `Values schema generation`, `Build and Development Commands`, `Testing`, `Package Structure`
+
+- **E2E tests and E2E CI** (e.g., "write/fix an e2e test", "stabilize a flaky test", "add a bats test", "change the e2e workflow", "why did e2e fail")
+  - Read: [`e2e-testing.md`](./docs/agents/e2e-testing.md)
+  - Action: Read the entire file and follow the conventions exactly — no new retries on deterministic steps, event-driven backstops before every `kubectl wait`, no test-level `EXIT`/`RETURN` traps (a self-contained one inside a Chainsaw `script` step or an explicit subshell is fine — see the doc), no assertion beginning with `!` (errexit exempts an inverted status, so it cannot fail — write `if cmd; then echo "FAIL: …"; false; fi`), fail-fast on HelmRelease readiness
 
 - **General questions about contributing**
   - Read: [`contributing.md`](./docs/agents/contributing.md)
@@ -30,17 +41,15 @@ working with the **Cozystack** project.
 - **Issue and PR labeling, triage** (e.g., "label this issue", "what label should I use", "triage this", "categorize")
   - Read: [`.github/labels.yml`](./.github/labels.yml)
   - Action: Use labels defined there. Conventions follow the Kubernetes scheme — `kind/*` (type), `area/*` (subsystem), `priority/*` (urgency), `triage/*` (review state), `lifecycle/*` (auto-close), `do-not-merge/*` (PR blockers), `security/*` (severity)
+  - For `triage/*`: `.github/workflows/issue-triage.yaml` labels an issue on arrival and sweeps daily for any open issue carrying none, so change a triage decision by replacing the label rather than removing it — remove the only `triage/*` label an issue has and the next sweep puts one back
+  - A feature request that needs design first gets `triage/needs-proposal`, is re-filed in [cozystack/community](https://github.com/cozystack/community) as an issue or a design-proposal PR, and is closed here with a link to it (re-file rather than transfer, so the label stays on the closed issue as the record); work in this repository starts only once that proposal is accepted, from a new issue that references it
   - For `area/*`: accuracy outweighs reuse. If no existing `area/*` truly fits the change, propose a new one via PR (extend `.github/labels.yml` and the scope mapping in `.github/workflows/pr-labeler.yaml`) — do not shoehorn the change into a wrong area. `area/uncategorized` is the auto-labeler fallback; treat it as a signal to pick a fit, create a new area, or correct the PR title
   - PR titles: a Conventional Commits header (`type(scope): description`, types from [`contributing.md`](./docs/agents/contributing.md)) auto-applies `kind/*` and `area/*` via `.github/workflows/pr-labeler.yaml`. Append `!` (or add a `BREAKING CHANGE:` footer) to apply `kind/breaking-change`
 
 **Important rules:**
-- ✅ **ONLY read the file if the task matches the documented process scope** - do not read files for tasks that don't match their purpose
-- ✅ **ALWAYS read the file FIRST** before starting the task (when applicable)
-- ✅ **Follow instructions EXACTLY** as written in the documentation
-- ✅ **Do NOT skip mandatory steps** (especially in changelog.md)
-- ✅ **Do NOT assume** you know the process - always check the documentation when the task matches
-- ❌ **Do NOT read files** for tasks that are outside their documented scope
-- 📖 **Note**: [`overview.md`](./docs/agents/overview.md) can be useful as a reference to understand project structure and conventions, even when not explicitly required by the task
+- **Match scope, then read first.** Load a process file only when the task genuinely falls in its scope, and load it before starting work — not midway through. Tasks outside a file's scope should not pull it into context.
+- **Follow it exactly.** Do not assume you already know the process, and do not skip steps (`changelog.md` especially). Where the documentation and your instinct disagree, the documentation wins.
+- **[`overview.md`](./docs/agents/overview.md) is the standing reference** for structure and conventions, useful even when no route above points at it.
 
 ## Project Overview
 
@@ -59,10 +68,28 @@ working with the **Cozystack** project.
 ### Conventions
 - **Helm Charts**: Umbrella pattern, vendored upstream charts in `charts/`
 - **Go Code**: Controller-runtime patterns, kubebuilder style
-- **Git Commits**: Conventional Commits (`type(scope): description`) with `--signoff`
+- **Git Commits**: Conventional Commits (`type(scope): description`) with `--signoff`; an agent-assisted commit adds one `Assisted-by: LLM` trailer
+- **Comments and commit bodies**: WHY, not a narration of WHAT; see [Review Blockers](./docs/agents/contributing.md#review-blockers-messages-trailers-comments) in contributing.md
+- **Prose**: One continuous line per paragraph — see [Prose Formatting](#prose-formatting)
 
 ### What NOT to Do
 - ❌ Edit `/vendor/`, `zz_generated.*.go`, upstream charts directly
 - ❌ Modify `go.mod`/`go.sum` manually (use `go get`)
 - ❌ Force push to main/master
 - ❌ Commit built artifacts from `_out`
+- ❌ Credit an AI model or its vendor by name in a commit trailer or in an authorship line in a PR description or comment, or put a `Claude-Session:` trailer or a session URL into any of them
+- ❌ Hardwrap a prose paragraph in markdown, a PR body, or an issue comment
+
+## Prose Formatting
+
+Markdown files and everything an agent publishes to GitHub — PR bodies, issue bodies, review comments, release notes — use **one continuous line per paragraph**. Renderers collapse a soft line break into a space, so a paragraph hardwrapped at ~80 columns renders exactly like the same paragraph on one line, while breaking narrow viewports, mangling nested list and table rendering, and turning a one-word edit into a diff that reflows the entire block. The renderer decides where the line ends; the author does not.
+
+Line breaks stay wherever they carry meaning: code fences, one item per list line, tables, headings, blockquotes, front matter, and README badge stacks. The rule governs prose paragraphs and nothing else. Commit messages are the deliberate exception — `git log` and the tooling around it still expect a body wrapped at ~72 columns.
+
+This is the rule LLM agents break most often, because an ~80-column wrap is correct in the places they spend most of their time (Go comments, commit bodies) and the reflex leaks from there into documentation and GitHub. Treat it as a mechanical check at the moment of writing, not as a style preference to weigh: before saving a markdown file or passing `--body` to `gh`, look at each paragraph and confirm it is a single line.
+
+The rule applies to prose this repository owns, and to new or changed paragraphs. Much of the existing tree predates it and is wrapped throughout; that is not a defect to go and fix. Vendored upstream chart docs (`packages/*/*/charts/**`) must stay verbatim — `make update` regenerates them — and published changelogs are historical records. Neither is in scope.
+
+`.claude/hooks/md-no-hardwrap.py` enforces the rule for agents that support PreToolUse hooks (registered for Claude Code in `.claude/settings.json`). It refuses a `Write`/`Edit`/`MultiEdit` that would *add* a hardwrapped paragraph, list item or blockquote to a markdown file, and a `gh` command that would publish one to GitHub. A break counts as added only when the edit wrote both lines it joins, so fixing a typo inside a paragraph that was already wrapped goes through, while rewriting the same file as fresh hardwrapped prose does not. Anything it cannot read with certainty it allows — a guard that blocks legitimate work gets switched off, and then it guards nothing — which includes a body the shell assembles at runtime, and a `--body-file` written by the very command being checked, since the file does not exist yet when the hook runs. `hack/md-no-hardwrap.bats` covers it under `make unit-tests` and requires `python3`. Agents on other harnesses are held to the same rule without the hook.
+
+`.claude/settings.json` is tracked, so keep personal Claude Code overrides in `.claude/settings.local.json`, which is not. A personal `.claude/settings.json` predating this will be overwritten on pull without warning, because git had been ignoring it.
diff --git a/CLAUDE.md b/CLAUDE.md
new file mode 100644
index 0000000000..bc867d3aed
--- /dev/null
+++ b/CLAUDE.md
@@ -0,0 +1,5 @@
+# CLAUDE.md
+
+The single source of truth for all agents in this repo is `AGENTS.md` (the open standard that Codex, Cursor, and other tools read too). Claude Code has no native `AGENTS.md` support, so this file imports it. Put personal, untracked overrides in `CLAUDE.local.md`.
+
+@AGENTS.md
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index d0eb9b941c..5a2d021924 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -36,6 +36,20 @@ We welcome many types of contributions including:
 The best way to reach us with a question when contributing is to drop a line in
 our [Telegram channel](https://t.me/cozystack), or start a new GitHub discussion.
 
+## Where do I file?
+
+Cozystack work is split across two repositories. Use this table to land in the right place:
+
+| You have… | Where it goes |
+|---|---|
+| A **bug** | [New issue → Bug report](https://github.com/cozystack/cozystack/issues/new/choose) in this repo (`kind/bug`) |
+| A **concrete, scoped feature** | [New issue → Feature request](https://github.com/cozystack/cozystack/issues/new/choose) in this repo (`kind/feature`) |
+| A **usage question** or an early idea | [GitHub Discussions](https://github.com/cozystack/cozystack/discussions) |
+| A **cross-cutting / architectural change** — affects multiple components or APIs, or needs a decision before code | A [design proposal](https://github.com/cozystack/community/tree/main/design-proposals) in the [**community**](https://github.com/cozystack/community) repo |
+| **Governance, process, or community** matters | The [community](https://github.com/cozystack/community) repo |
+
+Rule of thumb: **bugs and concrete features live here; "what or whether we should build it" lives in [community](https://github.com/cozystack/community)** as a design proposal or discussion. A large feature often starts as a Discussion, graduates to a design-proposal PR, then spawns implementation issues here.
+
 ## Raising Issues
 
 When raising issues, please specify the following:
diff --git a/CONTRIBUTOR_LADDER.md b/CONTRIBUTOR_LADDER.md
index 811e66ae1f..b361ad46f5 100644
--- a/CONTRIBUTOR_LADDER.md
+++ b/CONTRIBUTOR_LADDER.md
@@ -91,7 +91,7 @@ Reviewers have all the rights and responsibilities of a Contributor, plus:
 
 
 The process of becoming a Reviewer is:
-1. The contributor is nominated by opening a PR against the appropriate repository, which adds their GitHub username to the OWNERS file for one or more directories.
+1. The contributor is nominated by opening a PR against the appropriate repository, which adds their GitHub username to `.github/CODEOWNERS` for one or more paths, and to the Reviewers section of `MAINTAINERS.md`.
 2. At least two members of the team that owns that repository or main directory, who are already Approvers, approve the PR.
 
 
diff --git a/GENERAL_TECHNICAL_REVIEW.md b/GENERAL_TECHNICAL_REVIEW.md
new file mode 100644
index 0000000000..9e7818b55a
--- /dev/null
+++ b/GENERAL_TECHNICAL_REVIEW.md
@@ -0,0 +1,163 @@
+# General Technical Review - Cozystack / Incubation
+
+- **Project:** Cozystack
+- **Project Version:** v1.6.3 (latest stable at the time of submission, released 2026-09-04). The authoritative list of releases is the [GitHub Releases page](https://github.com/cozystack/cozystack/releases); which release lines receive security fixes is defined in [SECURITY.md](https://github.com/cozystack/cozystack/blob/main/SECURITY.md).
+- **Website:** https://cozystack.io
+- **Date Updated:** 2026-09-17
+- **Template Version:** v1.0
+- **Description:** Cozystack is a free, Apache-2.0 open-source platform and framework for building clouds. It turns a set of bare-metal servers into a system with a native Kubernetes REST API for spawning Kubernetes clusters, Databases-as-a-Service, virtual machines, load balancers, HTTP-caching and other services. It is a CNCF Sandbox project and a Certified Kubernetes distribution.
+
+> **Status: DRAFT — the remaining items are open due-diligence work, not unwritten answers.** Every answer that repository or documentation evidence can settle has been written and verified against the tree. Most items still marked `[maintainers: …]` fall into three kinds that cannot be closed by editing this document alone: **measurements** — load/scale test results and tested maximums (nodes, tenants, VMs, PVs) with methodology, measured baseline resource overhead of the platform components, and the upgrade→downgrade→upgrade CI matrix and its results; **maintainer confirmations of runtime behavior** — whether platform upgrades trigger Talos node reboots, whether any core-component change requires a control-plane restart, CRD cleanup on full uninstall, and any explicit circuit-breaker usage; and **organization actions** — closing the SCA write-back loop and publishing the CVE-scanning pipeline's policy documents and scanning scripts from the private `cozystack/security-scanner` repository so the method is auditable independently of the numbers. The security-response-team rotation and diversity statement have since been surfaced into the public [`SECURITY.md`](https://github.com/cozystack/cozystack/blob/main/SECURITY.md), and the aggregate security reporting is published at [`docs/security/reports/`](https://github.com/cozystack/cozystack/tree/main/docs/security/reports). A few remaining `[maintainers: confirm]` markers — notably the third-party attribution-notice details in the Compliance section — are editorial and are to be resolved in place.
+>
+> Notes for reviewers: answers cover **Day 0** and **Day 1** (required for Incubation, cumulative) plus **Day 2** where it already applies. Doc links are pinned to the versioned `/docs/v1.6/` tree; repo links are on `main` and should be pinned to the submitted tag before final submission. Version numbers are deliberately not restated in prose where a canonical source exists — the [Releases page](https://github.com/cozystack/cozystack/releases) and [SECURITY.md](https://github.com/cozystack/cozystack/blob/main/SECURITY.md) are cited instead, so the document does not drift with each release.
+
+---
+
+## Day 0 - Planning Phase
+
+### Scope
+
+* **Roadmap / scope / maintainer ladder.** Scope for mid-to-long-term features is managed in the open on the public [GitHub Project board](https://github.com/orgs/cozystack/projects/1), GitHub Issues/Discussions, the CNCF Slack `#cozystack` channel, Telegram, and the regular Cozystack community meetings. Roles and decision-making are defined in [GOVERNANCE.md](https://github.com/cozystack/cozystack/blob/main/GOVERNANCE.md): three roles — **Users, Contributors, Maintainers** — decide by consensus, falling back to a simple-majority vote (one vote per Maintainer). The promotion path is defined in [CONTRIBUTOR_LADDER.md](https://github.com/cozystack/cozystack/blob/main/CONTRIBUTOR_LADDER.md): **Community Participant → Contributor → Reviewer → Maintainer**, with concrete criteria (Reviewer: ≥15 PRs/yr, ≥20 reviews, ≥6 months, two sponsors from different employers; Maintainer: ≥6 months as Reviewer, ≥10 h/month). Promotions are done by pull request against the roster files in the repository root and `.github/`: [`.github/CODEOWNERS`](https://github.com/cozystack/cozystack/blob/main/.github/CODEOWNERS) records the area-scoped Reviewer role and gates merges on the matching paths, and [`MAINTAINERS.md`](https://github.com/cozystack/cozystack/blob/main/MAINTAINERS.md) carries three sections — Active Maintainers, Reviewers and Emeritus Maintainers — naming people, while `CODEOWNERS` is the authoritative path-to-Reviewer mapping. The two sets are deliberately different: a Reviewer owns a code area, a Maintainer is responsible for the whole project.
+* **Target personas.** (1) Platform/infrastructure engineers and SRE/DevOps teams building private or public clouds; (2) service providers / hosting companies / data centers offering IaaS, DBaaS and Managed-Kubernetes; (3) enterprises consolidating workloads on bare metal and seeking a self-hosted public-cloud alternative or a VMware replacement.
+* **Primary use case.** Turn bare-metal servers into a multi-tenant cloud exposing a Kubernetes-native REST API for self-service provisioning of tenant Kubernetes clusters, VMs, managed databases, load balancers and caching.
+* **Additional use cases.** Private/hybrid cloud; managed-services platform for providers; dev/test environments; AI-ready GPU infrastructure; on-prem VMware/vSphere replacement.
+* **Deployment model & constraints.** Cozystack is primarily deployed as a **full Talos-based distribution that owns the nodes** (the recommended path), but it is **not Talos-only**: it can also be installed on **generic Linux** (Ubuntu/Debian/RHEL/Rocky/openSUSE) via the Ansible collection, which bootstraps k3s, or onto an **existing / bring-your-own Kubernetes** cluster (the generic-Kubernetes install); provider-specific guides exist for Hetzner (dedicated servers on Robot), Oracle Cloud (OCI) and Servers.com. Regardless of substrate it **recommends a minimum of 3 servers**, targets **x86_64** (no Windows nodes), and single-node/2-node production is discouraged.
+* **Organizations that benefit.** Hosting/cloud providers, data centers, telcos, financial services, and any platform-engineering organization needing sovereign, self-hosted cloud infrastructure.
+* **End-user research.** Public adopters are listed in [ADOPTERS.md](https://github.com/cozystack/cozystack/blob/main/ADOPTERS.md). A published case study of production use is [Protofire — operating Kubernetes with Cozystack](https://cozystack.io/blog/2025/09/protofire-experience-operating-kubernetes-with-cozystack/); see also the [case-study index](https://cozystack.io/article_types/case/) and the [CNCF Sandbox announcement](https://www.cncf.io/blog/2025/04/28/open-source-paas-cozystack-becomes-a-cncf-sandbox-project/). No formal end-user survey has been published.
+
+### Usability
+
+* **How personas interact.** Administrators install and operate the **management cluster**; tenants/users interact declaratively via the Kubernetes API (`kubectl apply` of Cozystack application resources such as `Kubernetes`, `VMInstance`, `Postgres`, `Bucket`, `Tenant`, …), via the web dashboard, or via any Kubernetes-compatible tooling/CI, because every object is a native Kubernetes resource.
+* **UX/UI.** Primary interface is the **Kubernetes API** surfaced through Cozystack's aggregated API layer (see API Design), so standard Kubernetes UX applies (kubectl, GitOps, client libraries). A **web dashboard** provides self-service creation/monitoring of applications and tenants, and shipped **Grafana** dashboards provide observability.
+* **Integration in production.** Applications are Kubernetes CRs backed by Helm releases reconciled by **Flux CD**, so Cozystack integrates natively with GitOps pipelines, CI/CD and any operator ecosystem. Tenant Kubernetes clusters are standard **Certified Kubernetes** clusters usable with the entire CNCF landscape. Federated auth via **Keycloak** (OIDC/SAML) — see [OIDC docs](https://cozystack.io/docs/v1.6/operations/oidc/).
+
+### Design
+
+* **Design principles / best practices.** Everything-is-a-Kubernetes-resource (infra, services and apps modeled uniformly as CRs and reconciled by controllers via GitOps); immutable infrastructure on the recommended path (**Talos Linux**, no SSH/no shell on nodes — the generic-Linux and bring-your-own-Kubernetes installs run on a conventional OS instead); composition of established CNCF/upstream building blocks rather than re-implementation; secure-by-default multi-tenancy (namespace/`Tenant` isolation, network policies, isolated tenant API servers); declarative, versioned Helm-based packaging.
+* **Architecture requirements & environments.** A **management cluster** (the platform) provisions **tenant clusters** (Kubernetes-in-Kubernetes: **Kamaji** runs tenant control planes as pods, **Cluster API** with Kamaji + KubeVirt providers manages lifecycle, worker nodes/VMs on **KubeVirt**). Hardware tiers ([hardware-requirements](https://cozystack.io/docs/v1.6/install/hardware-requirements/)): **Minimal/PoC** 3 nodes × 8 cores / 24 GB / 50 GB + 256 GB SSD / 1 Gbps (1–2 tenants, ≤3 clusters); **Small production** 3 nodes × 16–32 cores / 64 GB / 100 GB + 1–2 TB (5–10 tenants); **Large production** 6+ nodes × 32–64 cores / 128–256 GB / 200 GB + 4–10 TB NVMe / 10 Gbps (20+ tenants). Low latency between nodes is required; VM-based nodes need nested virtualization and CPU model `host`.
+* **In-cluster service dependencies.** Full platform stack ([platform-stack](https://cozystack.io/docs/v1.6/guides/platform-stack/)): the node OS (Talos Linux on the recommended path; generic Linux with k3s, or an existing Kubernetes cluster, on the other paths), Kubernetes; **networking** Cilium (eBPF CNI + NetworkPolicy), Kube-OVN (VPC isolation, floating IPs, tenant segmentation), MetalLB, ingress-nginx, Multus CNI, CoreDNS, ExternalDNS, Kilo (WireGuard mesh); **virtualization** KubeVirt + CDI; **storage** LINSTOR/DRBD via Piraeus, SeaweedFS (object/Bucket), Velero (backup/restore), CSI Driver NFS; **GitOps/automation** Flux, Aenix etcd Operator (dedicated etcd for tenant control planes), cert-manager, External Secrets Operator; **observability** VictoriaMetrics + VictoriaLogs, Grafana, Alerta, VMAgent, Fluent Bit, kube-state-metrics, node-exporter; **autoscaling** Vertical Pod Autoscaler, Cluster Autoscaler; **databases** PostgreSQL, MariaDB, MongoDB (Percona), ClickHouse, OpenSearch, Qdrant, FoundationDB, Redis; **messaging** Kafka (Strimzi), NATS, RabbitMQ; **identity/registry** Keycloak, Harbor, OpenBao.
+* **Identity & Access Management.** Kubernetes-native **RBAC** end-to-end; multi-tenancy via the `Tenant` resource with per-tenant namespaces, scoped RoleBindings, NetworkPolicies and quotas; each tenant Kubernetes cluster has a fully isolated API server (separate **Kamaji** control plane + dedicated etcd). Federated SSO via **Keycloak** (OIDC/SAML). Secrets integration via **External Secrets Operator** and **OpenBao** (PKI/dynamic secrets).
+* **Sovereignty.** Fully self-hosted on the operator's own hardware; no dependency on any public cloud or external SaaS control plane — all data and control planes remain on-premises. This is a core design goal.
+* **Compliance.** Apache-2.0; ships a Security Self-Assessment (see Security) and OpenSSF Best Practices + Scorecard. Cozystack provides isolation/RBAC/audit/network-policy/PKI primitives adopters use to build compliant platforms rather than claiming formal certifications itself. Per the [self-assessment](https://github.com/cozystack/cozystack/blob/main/docs/security/self-assessment.md), the project makes **no formal compliance attestation** against any framework (PCI-DSS, ISO 27001, SOC 2, GDPR). It does publish requirement-by-requirement compliance **mapping** pages — [PCI-DSS](https://cozystack.io/compliance/pci-dss/), [GDPR](https://cozystack.io/compliance/gdpr/), [CIS Benchmark](https://cozystack.io/compliance/cis-benchmark/) and [DORA](https://cozystack.io/compliance/dora/) — which map platform capabilities to each framework's controls; these are guidance for adopters building compliant platforms, explicitly **not** attestations or certifications of Cozystack itself.
+* **High Availability.** Management control plane HA (≥3 nodes, dedicated etcd); tenant control planes (Kamaji) run as replicated pods and reschedule on failure; storage synchronously replicated (DRBD, 2–3 replicas); MetalLB failover for LB IPs; ingress replicated.
+* **Resource requirements (CPU/Network/Memory).** See hardware tiers above — from 3 × (8 cores / 24 GB) minimal to 6+ × (32–64 cores / 128–256 GB) at scale; 1 Gbps minimum, 10 Gbps recommended for production.
+* **Storage requirements.** **Persistent** replicated block storage (LINSTOR/DRBD via Piraeus) for stateful workloads (DB and VM disks) and **object storage** (SeaweedFS, S3-compatible) for the Bucket service/backups; **Velero** for backup/restore; **CSI Driver NFS** for NFS-backed volumes. Nodes need a dedicated raw secondary disk for LINSTOR (single-disk is possible but discouraged).
+* **API Design:**
+  * **Topology & conventions.** Cozystack exposes applications through a **Kubernetes API-aggregation layer**: a dynamically-generated aggregated API server surfaces each Cozystack "application" as a first-class, namespaced Kubernetes resource under Cozystack API groups (`apps.cozystack.io`), each backed by an **ApplicationDefinition** and a Helm chart/HelmRelease reconciled by Flux. Conventions follow Kubernetes API machinery (group/version/kind, spec/status). Reference: [REST API](https://cozystack.io/docs/v1.6/cozystack-api/rest/), [Go Types](https://cozystack.io/docs/v1.6/cozystack-api/go-types/), [ApplicationDefinition](https://cozystack.io/docs/v1.6/cozystack-api/application-definitions/); background: blog "How we built a dynamic Kubernetes API server for the API aggregation layer in Cozystack".
+  * **Defaults.** Secure/production-oriented defaults: RBAC on, per-tenant isolation, network policies, replicated storage, sane per-app sizing overridable via the resource spec.
+  * **Additional configuration.** Cluster-wide settings via the `cozystack` ConfigMap (bundle/variant, pod/service CIDRs, root host, API endpoint, storage) plus a MetalLB address pool; per-app tuning via the resource spec.
+  * **New/changed API types & cloud-provider calls.** Introduces its own CRDs/aggregated types (`apps.cozystack.io`, `Tenant`, per-service kinds). Makes **no external cloud-provider API calls** — everything is on-prem.
+  * **Compatibility with the Kubernetes API server.** Integrates via standard Kubernetes API-aggregation (APIService); does not fork/modify core kube-apiserver; tenant clusters run upstream **Certified Kubernetes**.
+  * **Versioning & breaking changes.** API groups are versioned per Kubernetes conventions; the Cozystack application API group (`apps.cozystack.io`) is currently `v1alpha1`. **No formal API stability / deprecation policy is published yet** — publishing one (alpha/beta/stable lanes and a deprecation window) is outstanding. Breaking changes are communicated through release notes and changelogs.
+* **Release process.** Semantic Versioning; releases on GitHub (stable `vX.Y.0`, patch `vX.Y.Z`). Artifacts are container images and Helm charts distributed via OCI (`ghcr.io/cozystack/cozystack`). Component versions are pinned per Cozystack release so an upgrade is a single coordinated bump. Only Stable/Patch releases are recommended in production (avoid alpha/beta/rc).
+
+### Installation
+
+* **How it is installed/initialized.** (1) Stand up the management Kubernetes cluster via one of the supported paths ([install overview](https://cozystack.io/docs/v1.6/install/)): **Talos** (recommended) — provision bare-metal/VM nodes with Talos and bootstrap Kubernetes ([Talos install](https://cozystack.io/docs/v1.6/install/talos/)); **generic Linux** — the [Ansible collection](https://cozystack.io/docs/v1.6/install/ansible/) prepares Ubuntu/Debian/RHEL/Rocky/openSUSE and bootstraps k3s; **bring-your-own Kubernetes** — install onto an [existing cluster](https://cozystack.io/docs/v1.6/install/kubernetes/generic/); plus provider guides (Hetzner dedicated/Robot, OCI, Servers.com) and an air-gapped variant. (2) Install Cozystack on that cluster in one of two modes ([install](https://cozystack.io/docs/v1.6/install/cozystack/)): **As a Platform** (pick a variant such as `isp-full`; Cozystack installs and configures all components) or **BYOP** (install the operator with the `default` variant that provides the package registry `PackageSources`, then use the `cozypkg` CLI). The operator is delivered as an OCI Helm chart: `helm ... oci://ghcr.io/cozystack/cozystack/cozy-installer`. (3) Configure via the `cozystack` ConfigMap (variant, pod/service CIDRs, root host, API endpoint, storage) and create a MetalLB IP pool.
+* **How an adopter tests/validates.** Verify nodes Ready (`kubectl get node`), all platform HelmReleases reconciled (`kubectl get hr -A` — none failing), core pods Running, the aggregated API responds and the dashboard is reachable; then smoke-test by provisioning a sample tenant/app (e.g. a small `Kubernetes` cluster or `Postgres`) to `Ready`. Tenant clusters can be validated with upstream conformance (Sonobuoy) since Cozystack is Certified Kubernetes.
+
+### Security
+
+* **Security self-assessment.** Cozystack has completed a **Security Self-Assessment** submitted with the Incubation application ([cncf/toc#1916](https://github.com/cncf/toc/issues/1916)), reviewed with TAG Security. The assessment is maintained in-tree at [`docs/security/self-assessment.md`](https://github.com/cozystack/cozystack/blob/main/docs/security/self-assessment.md), alongside a [threat model](https://github.com/cozystack/cozystack/blob/main/docs/security/threat-model.md) and an [incident-response process](https://github.com/cozystack/cozystack/blob/main/docs/security/incident-response.md). Where this questionnaire and the self-assessment overlap, the self-assessment is the more detailed source and the two are kept consistent.
+* **Cloud Native Security Tenets.**
+  * *How satisfied:* secure-by-default (RBAC, per-tenant NetworkPolicies, isolated tenant API servers, immutable Talos nodes with no SSH/shell, minimal host attack surface); defense-in-depth via network segmentation (Cilium/Kube-OVN); automated TLS via **cert-manager**; secret management via **External Secrets Operator**/**OpenBao**; least-privilege service accounts for controllers; supply-chain hygiene via **CodeQL**, **OpenSSF Scorecard** and organization-wide **Trivy** CVE scanning of dependencies and container images.
+  * *Loosening defaults:* isolation between unrelated tenants is enforced by Cilium egress **by design**, and there is no supported mechanism to disable tenant isolation wholesale or to create flat/shared inter-tenant networking. What is documented is **opt-in relaxation to specific restricted services**: per the [tenants guide](https://cozystack.io/docs/v1.6/guides/tenants/), labels such as `policy.cozystack.io/allow-to-apiserver: "true"` and `policy.cozystack.io/allow-to-etcd: "true"` let tenant pods reach otherwise-restricted endpoints, and broader RBAC can be granted for single-tenant/lab use. (The earlier `isolated` tenant field was removed in favor of these opt-in policy labels.)
+* **Security Hygiene.**
+  * Practices: GitHub review with required approvals; CI on every PR. The branch protection on `main` currently requires two status checks, `pre-commit` and `E2E Tests`. **CodeQL** static analysis runs on every PR, on push to `main` and weekly; new error-severity alerts are expected to be resolved or explicitly dismissed before merge, but CodeQL is **not yet a required check** — promoting it to one is an open item, and [SECURITY.md](https://github.com/cozystack/cozystack/blob/main/SECURITY.md) states it as an intention rather than a fact. **zizmor** audits the GitHub Actions workflows themselves and fails on findings such as unpinned actions or over-broad `permissions`; it runs two ways, as a hook inside the required `pre-commit` check (so it genuinely gates merges) and as a standalone workflow triggered only by changes under `.github/workflows/` or to `.github/zizmor.yml`, which is not itself a required check. **OpenSSF Scorecard** runs weekly and publishes to scorecard.dev; the OpenSSF Best Practices badge is maintained. Organization-wide **Trivy** scanning covers dependencies and container images on a 6-hour cycle for CRITICAL findings and weekly for the rest, with per-CVE triage tracked as issues (see Day 2 → Dependencies). **Renovate** automates dependency updates within the scope described in Day 2 → Dependencies. Component versions are pinned per release.
+  * Unmaintained-feature risk: components are curated and version-pinned per release; the Helm-packaged, swappable building-block design makes replacing a risky/unmaintainable component tractable. [GOVERNANCE.md](https://github.com/cozystack/cozystack/blob/main/GOVERNANCE.md) documents how bundled third-party components are sourced and held (vendored by digest under the upstream owner's namespace, not re-released by the project). A **formal governance workflow for deciding to retire or replace** a risky/unmaintained bundled component is **not yet documented**.
+* **Cloud Native Threat Modeling.**
+  * *Least privilege:* controllers run with scoped RBAC; elevated privileges are limited to and documented for infrastructure components that genuinely need them (KubeVirt/CDI for virtualization, Piraeus/LINSTOR for block devices, Cilium/Kube-OVN for CNI). The published threat model is [`docs/security/threat-model.md`](https://github.com/cozystack/cozystack/blob/main/docs/security/threat-model.md).
+  * *Certificate rotation:* automated via **cert-manager** (issuance/renewal/rotation) for platform TLS; Talos/Kubernetes-managed PKI for cluster components; tenant control-plane certs managed by **Kamaji**.
+  * *Secure software supply chain:* **in place today** — CodeQL SAST (PRs, push to `main`, weekly), zizmor workflow auditing (gating on PRs), OpenSSF Scorecard (weekly), continuous dependency and container-image CVE scanning with **Trivy** across the whole organization (see Day 2 → Dependencies → SCA), Renovate-managed dependency updates, component versions pinned per release, and private vulnerability reporting with defined CVSS response targets.
+  * *Supply-chain gaps:* **artifact signing does not exist** — there is no cosign or sigstore anywhere in the build tooling, and no issue tracks adding it. **Build provenance is explicitly disabled**: [`hack/common-envs.mk`](https://github.com/cozystack/cozystack/blob/main/hack/common-envs.mk) sets `--provenance=false` in `BUILDX_ARGS`, so the attestation that buildx would emit by default is switched off, and no SLSA provenance is published. **SBOM generation is implemented but off by default**: the same file plumbs `SBOM=1` through to `--sbom=true`, attaching a CycloneDX SBOM as a buildx attestation, and defaults it to `0` pending verification of registry referrers/attestation support; the remaining work is tracked in [cozystack#2937](https://github.com/cozystack/cozystack/issues/2937) under the CI/build/release tracking issue [cozystack#3278](https://github.com/cozystack/cozystack/issues/3278). Turning SBOMs on by default and re-enabling provenance are therefore configuration-and-verification work rather than greenfield work; signing is not.
+
+---
+
+## Day 1 - Installation and Deployment Phase
+
+### Project Installation and Configuration
+
+* As in Day 0 → Installation: a management cluster (Talos on the recommended path; generic Linux/k3s or an existing Kubernetes cluster on the other paths), then Cozystack via **Platform** or **BYOP** mode (OCI Helm installer + `cozystack` ConfigMap + MetalLB pool). All subsequent configuration is declarative (Kubernetes resources / Flux-managed HelmReleases); Day-2 changes are made by editing resources, not imperative steps.
+
+### Project Enablement and Rollback
+
+* **Enable/disable in a live cluster.** On the Talos and generic-Linux paths Cozystack is the distribution that owns the cluster, so "enablement" = installing the operator bundle on the management cluster; on the bring-your-own-Kubernetes path it is installed onto an existing cluster instead. Individual bundles/components and each tenant application are enabled/removed independently (create/delete the corresponding resource); removing a tenant application affects only that tenant, with no downtime to unrelated workloads. `[maintainers: confirm whether any core component change requires control-plane restart]`
+* **How enablement changes default cluster behavior.** Installing Cozystack sets the CNI (Cilium/Kube-OVN), default StorageClass (LINSTOR), ingress, cert-manager, and the aggregated API as cluster defaults for subsequently created workloads. Cozystack expects to own the cluster, so a clean install does not disturb pre-existing unrelated workloads.
+* **Testing enablement/disablement.** CI installs Cozystack end-to-end in ephemeral environments and provisions/destroys sample tenants and applications to validate create→ready→delete flows. Workflows: [`pull-requests.yaml`](https://github.com/cozystack/cozystack/blob/main/.github/workflows/pull-requests.yaml) (per-PR checks), [`e2e-tag.yaml`](https://github.com/cozystack/cozystack/blob/main/.github/workflows/e2e-tag.yaml) (tag/release e2e), [`nightly.yaml`](https://github.com/cozystack/cozystack/blob/main/.github/workflows/nightly.yaml) (scheduled full run) and [`ui-test.yaml`](https://github.com/cozystack/cozystack/blob/main/.github/workflows/ui-test.yaml) (dashboard). Test conventions are documented in [`docs/agents/e2e-testing.md`](https://github.com/cozystack/cozystack/blob/main/docs/agents/e2e-testing.md). **Current health of these workflows:** the gating checks are the per-PR ones — `pre-commit` and `E2E Tests` are the two required status checks on `main`, and a change cannot merge without them passing. The scheduled runs are another matter. `nightly.yaml` has been **unreliable on the scheduled full run** for a month: the first scheduled run after the fix in [cozystack#3332](https://github.com/cozystack/cozystack/pull/3332) still failed, then it passed for three days, went red for five, passed for three more ending 2026-08-01, and has failed nearly every scheduled run since, with only isolated passes on 2026-08-17 and 2026-09-03. As of 2026-09-17, 1 of the last 24 scheduled runs passed (on 2026-09-03), and every scheduled run after it has failed. The current failure has **not been triaged to an issue** — several e2e failures from the same window are open and may share a cause, and the older nightly item in [cozystack#3278](https://github.com/cozystack/cozystack/issues/3278) describes the earlier never-completing failure rather than this one — so the honest statement is that the scheduled full-matrix run is unreliable and its current failure is not yet attributed. The tag-triggered `e2e-tag.yaml` also failed around the v1.6.1 release. Enablement and disablement coverage therefore rests on the per-PR e2e job today, and restoring the scheduled full-matrix run is outstanding work.
+* **Resource cleanup incl. CRDs.** Deleting an application resource triggers Flux/Helm to remove its HelmRelease and owned objects; finalizers ensure dependent resources (PVCs, VM disks, LB IPs) are released. `[maintainers: confirm CRD-cleanup behavior on full uninstall and any manual steps]`
+
+### Rollout, Upgrade and Rollback Planning
+
+* **Compatibility with Kubernetes & frequency.** Cozystack ships a curated, tested Kubernetes version per release; tenant clusters are Certified Kubernetes following upstream skew/support. Platform upgrades are delivered as new Cozystack releases. The authoritative list of what has shipped is the [GitHub Releases page](https://github.com/cozystack/cozystack/releases); which release lines are still receiving security fixes is defined as a rolling rule in [SECURITY.md](https://github.com/cozystack/cozystack/blob/main/SECURITY.md): the latest stable minor and the two preceding minors are supported, older `1.x` minors receive critical and upgrade-blocking fixes at maintainer discretion, `v0.41.x` is end of life and anything earlier is unsupported. Specific version numbers are deliberately not restated here, because they drift with every release. Note that being in a supported line does not entail receiving every fix: the project has no documented rule for which supported lines a given fix is backported to, and that is recorded in `SECURITY.md` rather than presented as a policy.
+* **Upgrade procedure** ([upgrade docs](https://cozystack.io/docs/v1.6/operations/cluster/upgrade/)): run the troubleshooting/health checklist; annotate the `cozy-system` namespace and `cozystack-version` ConfigMap with `helm.sh/resource-policy=keep`; `helm upgrade cozystack oci://ghcr.io/cozystack/cozystack/cozy-installer --version X.Y.Z` (**do not** use `--reuse-values` — the chart pins OCI repo/package versions); verify pods and `kubectl get hr -A`.
+* **Rollback.** GitOps/Helm-managed with versioned releases; roll back by targeting the previous release (previous HelmRelease revisions) via the same mechanism. Stateful data (databases, VM disks) persists on replicated storage across control-plane rollbacks. **No dedicated rollback runbook is published**, and version-skip constraints for downgrades are not documented; the [upgrade docs](https://cozystack.io/docs/v1.6/operations/cluster/upgrade/) currently cover the forward path only.
+* **How a rollout/rollback can fail & impact.** Risks: incompatible CRD schema change, storage/CNI component upgrades requiring node reboots (on the Talos path), or a database-operator major bump. Impact is scoped to the component; running tenant workloads generally continue, though storage/CNI upgrades can transiently affect networking or volume attachment during node rolls. `[maintainers: confirm whether upgrades trigger Talos node reboots]`
+* **Metrics that should inform a rollback.** Control-plane/API availability & latency, Flux reconciliation failures (`kubectl get hr -A | grep -v True`), DRBD/LINSTOR replication health (`linstor resource list --faulty`), CNI/pod-networking errors, tenant application readiness.
+* **Upgrade/rollback testing (upgrade→downgrade→upgrade).** `[maintainers: describe the CI matrix testing N-1→N upgrades and the downgrade path; link results]`
+* **Deprecations/removals communication.** Release notes/CHANGELOG ([`docs/changelogs/`](https://github.com/cozystack/cozystack/tree/main/docs/changelogs)), GitHub release announcements, docs and community channels. A dedicated, documented deprecation policy/window is **not yet published** — it is folded into the planned API Stability Policy (see Day 0 → API Design → Versioning).
+* **Alpha/beta capabilities in a rollout.** Only Stable/Patch releases are recommended for production; experimental bundles/apps are opt-in. **There is no formal per-application maturity field** (e.g. alpha/beta/stable) in [ApplicationDefinition](https://cozystack.io/docs/v1.6/cozystack-api/application-definitions/) today; maturity is expressed informally in docs and release notes. Adding maturity/compatibility metadata is a roadmap (Marketplace) item.
+
+---
+
+## Day 2 - Day-to-Day Operations Phase
+
+### Scalability/Reliability
+
+* **Increasing size/count of API objects.** Scale horizontally by adding nodes (Talos or generic-Linux, per the install path) and by creating more tenants/applications (each an independent set of Flux-reconciled Kubernetes objects); storage scales by adding disks/nodes to the LINSTOR pool; **Cluster Autoscaler** and **Vertical Pod Autoscaler** assist node/pod right-sizing.
+* **SLOs/SLIs.** The project does **not publish prescriptive reference SLOs**; availability and latency targets are **adopter-defined**, because they depend on the operator's hardware tier, storage topology and tenant density. Cozystack exposes the **SLIs** needed to define and measure them: management-API availability and latency, Flux reconciliation success/failure per HelmRelease, tenant control-plane (Kamaji) pod readiness, DRBD/LINSTOR replication health, storage I/O, CNI/pod-networking errors, and ingress/LB health — all surfaced through VictoriaMetrics/Grafana (see Observability).
+* **Operations increasing in time under existing SLIs.** Provisioning large tenant clusters, VM live-migration, and DRBD full-resync after node replacement scale with size/data volume. `[maintainers: confirm]`
+* **Resource-usage increase from enabling the project.** Platform components (Cilium, Kube-OVN, KubeVirt/CDI, LINSTOR, VictoriaMetrics/VictoriaLogs, Flux, DBaaS operators) consume a baseline on the management cluster; VM/DB workloads dominate at scale. The hardware tiers above bound expected footprints. `[maintainers: provide measured baseline overhead of platform components]`
+* **Conditions causing node-resource exhaustion.** Many VMs/pods per node (PIDs, sockets, hugepages), inodes on storage nodes, DRBD/LINSTOR memory under heavy replication, conntrack under high connection counts. Quotas/limits, VPA and MetalLB/ingress sizing mitigate. `[maintainers: confirm]`
+* **Load testing performed & results.** `[maintainers: summarize scale/load tests — nodes, tenants, VMs, DB throughput — and link results; known gap to fill for Incubation DD]`
+* **Recommended limits & how obtained.** Indicative per-tier limits are published in the hardware requirements (e.g. large-production ≈ 20+ tenants, dozens of clusters, hundreds of VMs/DBs on 6+ nodes). `[maintainers: provide tested maximums (nodes, tenants, VMs, PVs) and methodology]`
+* **Resilience patterns.** Controller reconcile loops with retries/back-off (Kubernetes/Flux), synchronous storage replication (DRBD), leader election, health probes and automatic rescheduling, MetalLB failover, cert-manager auto-renewal. `[maintainers: note any explicit circuit-breaker usage, e.g. at ingress]`
+
+### Observability Requirements
+
+* **Signals produced** ([monitoring docs](https://cozystack.io/docs/v1.6/operations/services/monitoring/)): metrics via **VictoriaMetrics (VMCluster)** collected by **VMAgent** (Prometheus-compatible); logs via **VictoriaLogs (VLogs)** collected by **Fluent Bit** (DaemonSet); dashboards via **Grafana**; alerting via **Alerta**; plus **kube-state-metrics** and **node-exporter**. Kubernetes events and component logs in standard formats.
+* **Audit logging.** Kubernetes API audit logging can be enabled on management and tenant control planes through the standard kube-apiserver audit policy. **No default audit policy is shipped** by Cozystack — no audit-policy manifest exists in any package — so audit logging is opt-in and the policy is authored by the adopter. Enabling it by default, with a documented reference policy, is an open improvement rather than an existing feature.
+* **Dashboards.** Pre-built Grafana dashboards for cluster overview, node metrics, storage, KubeVirt/VMs and per-application health, plus user-created dashboards (Grafana Operator manages dashboards as CRDs).
+* **Cost/FinOps surfacing.** Per-tenant/per-application resource usage is observable via metrics and Kubernetes resource accounting (a chargeback/showback basis). **No billing/FinOps integration is implemented today**; a Tenant FinOps API (OpenCost-compatible) is a roadmap item. Adopters integrate the exposed usage metrics with their own provider billing/portal.
+* **Health parameters.** Control-plane/API availability, Flux reconciliation status, Talos/node health, DRBD replication state, pod/VM readiness, ingress/LB health.
+* **Determining the project is in use.** Presence of Cozystack CRDs/aggregated APIs (`apps.cozystack.io`) and reconciled platform HelmReleases; existence of `Tenant`/application resources.
+* **Knowing it works for your instance.** Dashboards green; all HelmReleases `Ready`; sample tenant/app provisions successfully; storage replication healthy.
+* **Per-tenant monitoring.** Tenant workloads connect custom exporters via `VMServiceScrape`/`VMPodScrape`.
+
+### Dependencies
+
+* **Running services depended on.** As listed in Day 0 → in-cluster service dependencies (full platform stack).
+* **Dependency lifecycle policy.** Component versions are pinned and shipped per Cozystack release; upgrades are curated and tested together and bumped as a single coordinated release. **Renovate** ([`.github/renovate.json`](https://github.com/cozystack/cozystack/blob/main/.github/renovate.json)) automates part of this, and it is worth being exact about which part, because the automated share is smaller than the phrase "Renovate-managed" usually implies. Its `enabledManagers` are `gomod`, `dockerfile`, `github-actions` and `custom.regex`; the `helm-values` manager is **disabled repo-wide**, because many image references in the vendored charts are assembled at render time by the `cozy-lib.image` template helper rather than written literally in `values.yaml`, so a values-file manager cannot see them. Two bespoke regex managers cover specific pins that would otherwise age silently. Consequently: Go modules, Dockerfile base images, GitHub Actions and those regex-pinned refs get automated PRs, while **the curated component images that make up the shipped platform are bumped by maintainers as part of preparing a release**, not by a bot. That is a deliberate consequence of shipping a tested, coordinated version set, but it does mean the dependency class that dominates the product is on human cadence.
+* **Source Composition Analysis (SCA).** Four layers. (1) **Static analysis of first-party code** — **CodeQL** on every PR, on push to `main` and weekly, reporting only alerts new relative to `main`; expected to be resolved or dismissed before merge, though not yet a required check. (2) **Static analysis of the CI supply chain itself** — **zizmor** audits the GitHub Actions workflow definitions for unpinned actions, over-broad `permissions` and similar findings; it gates merges through the required `pre-commit` check, with an additional workflow covering tree-wide runs when the workflow definitions themselves change. (3) **Supply-chain posture** — **OpenSSF Scorecard** weekly, published on scorecard.dev, plus the OpenSSF Best Practices badge. (4) **Dependency and container-image CVE scanning** — an organization-wide pipeline built on **[Trivy](https://trivy.dev/)** running against every non-fork, non-archived repository in the `cozystack` organization.
+* **How the CVE-scanning pipeline works.** Discovery walks each repository for Go modules (`go.mod`, direct dependencies), base images from Dockerfile `FROM` directives, and container images referenced in `values.yaml` under `packages/apps/*`, `packages/system/*` and `packages/core/*`. Trivy then scans both the repository filesystem — which is where transitive Go dependencies and lock files are actually covered, since discovery itself reads only direct requirements — and every resolved container image, against NVD, vendor advisories and the GitHub Advisory Database. **A known limitation:** image references assembled at render time by the `cozy-lib.image` helper are not literal strings in `values.yaml` and are therefore invisible to values-file discovery, the same blind spot that led to disabling Renovate's `helm-values` manager. Those images are covered only insofar as they appear elsewhere; closing the gap requires resolving refs through the rendered chart rather than the values file. CRITICAL findings are scanned and reported every 6 hours; HIGH/MEDIUM/LOW are collected into a weekly report. Four filters run **before** an issue is created: findings with no upstream fix older than 365 days; dev and build-only dependencies (`golang:`/`node:`/`python:` images, `core/testing`, `hack/`, `e2e/`); CVEs already carrying a maintainer triage decision; and findings with no severity assigned in any database. As a result, every new **actionable** CVE becomes a tracked issue with severity labels, affected components, fix version and a triage checklist, while roughly 20–30% of raw output is suppressed as noise. Triage decisions are persisted, so a settled finding is not re-reported.
+* **Public verifiability of the pipeline — an open problem.** The pipeline, its reports and its triage state live in `cozystack/security-scanner`, which returns 404 to anyone outside the organization, so **none of the above is currently checkable by a reviewer without privileged access.** The line that needs drawing is not per-repository but per-artifact, and it falls in a specific place: **severity-level aggregate counts are publishable; naming an individual finding that is not yet fixed is not**, because a CVE ID plus an affected package plus this project's public, version-pinned component list is enough to locate unpatched exposure in a running deployment. Against that test, the pipeline policy (`SECURITY_PIPELINE_POLICY.md`), the severity and SLA matrix (`SECURITY_TRIAGE_MATRIX.md`), the finding status model (`SECURITY_FINDING_STATUS_MODEL.md`) and the scanning scripts hold no finding data and are publishable as they stand — and they are the part that actually evidences the control. Monthly reports for every month the pipeline has run are now published in-tree at [`docs/security/reports/`](https://github.com/cozystack/cozystack/tree/main/docs/security/reports), with identifiers withheld unless the fix is merged and released and a generator guard that refuses to emit a file containing an unreleased one. They are accompanied by a [backlog reconciliation](https://github.com/cozystack/cozystack/blob/main/docs/security/reports/reconciliation-2026-08.md) auditing every tracked finding against what the project actually shipped. That audit revised the disclosure rule in two directions that make it more open: findings with no upstream fix will be named with mitigation guidance, since there is nothing to wait for and an adopter needs to know when a mitigation is the only available control; and remediation is no longer attributed to individual months, because a count of still-open findings crossed with one month's publicly enumerable component bumps narrows the search for unpatched exposure more than a bare count does. What remains is publishing the pipeline's own policy documents and scanning scripts, which hold no finding data. `[maintainers: publish SECURITY_PIPELINE_POLICY.md, SECURITY_TRIAGE_MATRIX.md, SECURITY_FINDING_STATUS_MODEL.md and the scanning scripts, so the method is auditable independently of the numbers]`
+* **Acting on SCA & timescale.** Two tracks with distinct **targets**. **Reported vulnerabilities** (Cozystack-specific code, packaging, defaults, integration logic) follow [SECURITY.md](https://github.com/cozystack/cozystack/blob/main/SECURITY.md): acknowledgement ≤3 business days, initial triage ≤7 business days, remediation targets Critical ≈14 days, High ≈30 days, Medium ≈90 days, Low next release, under a coordinated-disclosure window of up to 90 days. **Scanner findings in bundled upstream components** are a separate track with a tighter triage clock: Critical triaged within 1 business day against a 7-day fix target, High within 3 business days / 30 days, Medium within 10 business days / 90 days, Low within 30 days best-effort. Triage follows an explicit decision tree (is the CVE in a shipped artifact rather than dev/test tooling; is the vulnerable path reachable in Cozystack's usage; has the distribution already backported the fix; is an upstream fix available) and resolves to one of `confirmed`, `false-positive`, `accepted-risk`, `in-progress` or `fixed`. Confirmed findings ship as a pinned-component version bump in the next Cozystack release, or as a patch release on a supported line when severity warrants it. **Attainment is uneven, and an audit of the pipeline's own output found its state misleading in both directions.** Detection keeps up. **Triage now has an owner, and continuous attainment is what is left to demonstrate.** The backlog was decided in a single bulk pass rather than continuously, because the rotating role that owns the triage clock, though defined, was unassigned; that role has now been assigned to @tym83, who runs a weekly triage pass, so sustained continuous attainment of the triage SLAs is the remaining target rather than the vacancy itself. **Remediation, however, is happening and the tracker cannot see it**, because nothing writes back from the main repository and so no finding has ever been marked fixed. Reconciling every tracked finding against merged changes, release tags and the pipeline's own weekly scan reports establishes two things. First, a clear majority of confirmed findings relate to a component whose in-tree version now carries the fix, concentrated in a single remediation wave in June 2026 rather than a steady stream. Second, four component bumps are available upstream and not yet taken. The same audit found that **57% of the backlog was never applicable or cannot be assessed** — the largest block being findings against packages that contain no executable vulnerable code, chiefly kernel headers, since a container never provides a running kernel. Reachable exposure in a stock installation is estimated at 2–5% of the tracker. Seven defects were found in the pipeline itself, including deduplication by CVE identifier alone and a broken image-attribution step that left 16% of findings unattributable. Figures, method and defect list: [backlog reconciliation](https://github.com/cozystack/cozystack/blob/main/docs/security/reports/reconciliation-2026-08.md). `[maintainers: close the write-back loop and take the four bumps that are available upstream and not yet pulled in]`
+
+### Troubleshooting
+
+* **Recovery when a key component fails** ([troubleshooting](https://cozystack.io/docs/v1.6/operations/troubleshooting/)): Kubernetes/etcd HA (and Talos self-healing on the Talos path) recover control-plane node loss; **Kamaji** reschedules tenant control planes; **DRBD/LINSTOR** promotes a healthy replica; **Flux** re-reconciles drifted/removed platform objects; databases recover via their operators; **Velero** provides backup/restore. Diagnostics: `kubectl get node`; `kubectl get hr -A | grep -v True`; `kubectl get pod -A | grep -v 'Running\|Completed'`; `linstor node/storage-pool/resource list [--faulty]`; operator logs `kubectl logs -n cozy-system deploy/cozystack-operator`; dedicated guides for [etcd](https://cozystack.io/docs/v1.6/operations/troubleshooting/etcd/), [Flux CD](https://cozystack.io/docs/v1.6/operations/troubleshooting/flux-cd/) and [Kube-OVN](https://cozystack.io/docs/v1.6/operations/troubleshooting/kube-ovn/).
+* **Known failure modes.** Documented areas include broken HelmReleases, LINSTOR/DRBD faulty resources, Kube-OVN OVN-database recovery, and etcd quorum issues, each with a dedicated guide under the [troubleshooting section](https://cozystack.io/docs/v1.6/operations/troubleshooting/) ([etcd](https://cozystack.io/docs/v1.6/operations/troubleshooting/etcd/), [Flux CD](https://cozystack.io/docs/v1.6/operations/troubleshooting/flux-cd/), [Kube-OVN](https://cozystack.io/docs/v1.6/operations/troubleshooting/kube-ovn/), [LINSTOR controller](https://cozystack.io/docs/v1.6/operations/troubleshooting/linstor-controller/) / [database](https://cozystack.io/docs/v1.6/operations/troubleshooting/linstor-database/), [monitoring](https://cozystack.io/docs/v1.6/operations/troubleshooting/monitoring-troubleshooting/)). These are per-topic pages; a **single consolidated "known failure modes + mitigations" index is not yet published.**
+
+### Compliance
+
+* **Third-party attribution & license notices.** The project is Apache-2.0 with a top-level [`LICENSE`](https://github.com/cozystack/cozystack/blob/main/LICENSE), and bundles third-party components under their own licenses, whose license files travel with the vendored component. **There is no top-level `NOTICE` file.** For a distribution that ships on the order of fifty upstream components, that is a real compliance gap rather than an oversight to paper over: adding a `NOTICE` that aggregates attribution for the bundled components, and a documented process for keeping it in step with the component set, is outstanding work.
+* **Alignment with CNCF attribution recommendations.**
+  * *Notices for third-party code in source files:* retained in-file / in `LICENSE`/`NOTICE`. `[maintainers: confirm]`
+  * *Notices for unmodified third-party components in the repo:* retained alongside the pinned component. `[maintainers: confirm]`
+  * *Notices in distributed build artifacts (images/binaries):* SBOM generation is implemented but **off by default** — `SBOM=1` in [`hack/common-envs.mk`](https://github.com/cozystack/cozystack/blob/main/hack/common-envs.mk) attaches a CycloneDX SBOM as a buildx attestation, disabled pending registry-referrer verification (tracked in [cozystack#2937](https://github.com/cozystack/cozystack/issues/2937)); release images are not yet signed and build provenance is disabled (see Day 0 → Security → Supply-chain gaps). Bundled-component license terms are catalogued in the [licenses documentation](https://cozystack.io/docs/v1.6/operations/configuration/licenses/).
+
+### Security
+
+* **Access control execution.** Kubernetes RBAC end-to-end; per-tenant namespaces, RoleBindings, quotas and NetworkPolicies; isolated tenant API servers (Kamaji + dedicated etcd); Keycloak OIDC/SAML for federated auth; secrets via External Secrets Operator / OpenBao.
+* **Security reporting team & rotation.** Reporting via **GitHub Private Vulnerability Reporting** ([advisories/new](https://github.com/cozystack/cozystack/security/advisories/new)) or a private maintainer contact; any maintainer can receive and route a report. Current security response team: **@kvaps, @lexfrei, @tym83, @matthieu-robin, @mattia-eleuteri** — spanning more than one organization (Ænix, HIDORA) and more than one country, rather than a single employer. A rotating **Security Champion** role (a fixed term with a handoff overlap) owns the CVE-triage clock; the role is **currently held by @tym83**, who runs a weekly triage pass over scanner findings, while technical reachability of a given CVE in bundled components is assessed together with the security team. This rotation cadence and the team's diversity statement are published in the project's [`SECURITY.md`](https://github.com/cozystack/cozystack/blob/main/SECURITY.md).
+
+---
+
+### Appendix — sources
+- cozystack.io docs v1.6: [platform-stack](https://cozystack.io/docs/v1.6/guides/platform-stack/), [hardware-requirements](https://cozystack.io/docs/v1.6/install/hardware-requirements/), [install](https://cozystack.io/docs/v1.6/install/cozystack/), [upgrade](https://cozystack.io/docs/v1.6/operations/cluster/upgrade/), [monitoring](https://cozystack.io/docs/v1.6/operations/services/monitoring/), [troubleshooting](https://cozystack.io/docs/v1.6/operations/troubleshooting/), [OIDC](https://cozystack.io/docs/v1.6/operations/oidc/), [REST API](https://cozystack.io/docs/v1.6/cozystack-api/rest/).
+- Repo (main): [GOVERNANCE.md](https://github.com/cozystack/cozystack/blob/main/GOVERNANCE.md), [CONTRIBUTOR_LADDER.md](https://github.com/cozystack/cozystack/blob/main/CONTRIBUTOR_LADDER.md), [MAINTAINERS.md](https://github.com/cozystack/cozystack/blob/main/MAINTAINERS.md), [.github/CODEOWNERS](https://github.com/cozystack/cozystack/blob/main/.github/CODEOWNERS), [SECURITY.md](https://github.com/cozystack/cozystack/blob/main/SECURITY.md), [ADOPTERS.md](https://github.com/cozystack/cozystack/blob/main/ADOPTERS.md).
+- Releases: [GitHub Releases](https://github.com/cozystack/cozystack/releases).
+- CI / security workflows: [pull-requests.yaml](https://github.com/cozystack/cozystack/blob/main/.github/workflows/pull-requests.yaml), [e2e-tag.yaml](https://github.com/cozystack/cozystack/blob/main/.github/workflows/e2e-tag.yaml), [nightly.yaml](https://github.com/cozystack/cozystack/blob/main/.github/workflows/nightly.yaml), [ui-test.yaml](https://github.com/cozystack/cozystack/blob/main/.github/workflows/ui-test.yaml), [codeql.yml](https://github.com/cozystack/cozystack/blob/main/.github/workflows/codeql.yml), [scorecard.yml](https://github.com/cozystack/cozystack/blob/main/.github/workflows/scorecard.yml), [renovate.json](https://github.com/cozystack/cozystack/blob/main/.github/renovate.json).
+- Roadmap: [GitHub Project board](https://github.com/orgs/cozystack/projects/1); supply-chain items [cozystack#2937](https://github.com/cozystack/cozystack/issues/2937), [cozystack#3278](https://github.com/cozystack/cozystack/issues/3278).
+- SCA tooling: [Trivy](https://trivy.dev/) (organization-wide CVE scanning pipeline; the repository hosting it is private, see Day 2 → Dependencies).
+- SSA / Incubation: [cncf/toc#1916](https://github.com/cncf/toc/issues/1916).
+- GTR template: cncf/toc `toc_subprojects/project-reviews-subproject/general-technical-questions.md` v1.0.
diff --git a/GOVERNANCE.md b/GOVERNANCE.md
index 3fa8131732..db34199911 100644
--- a/GOVERNANCE.md
+++ b/GOVERNANCE.md
@@ -8,25 +8,51 @@ This document defines the governance structure of the Cozystack community, outli
 to building an open, inclusive, productive, and self-governing open source
 community focused on building a high-quality open source PaaS and framework for building clouds.
 
-## Code Repositories
+## Sub-projects
 
-The following code repositories are governed by the Cozystack community and
-maintained under the `cozystack` namespace:
+Cozystack is developed across several repositories in the `cozystack` GitHub organisation. They do not all carry the same weight, and the distinction that matters is whether a repository's output reaches the artifact an adopter installs.
 
-* **[Cozystack](https://github.com/cozystack/cozystack):** Main Cozystack codebase
-* **[website](https://github.com/cozystack/website):** Cozystack website and documentation sources
-* **[Talm](https://github.com/cozystack/talm):** Tool for managing Talos Linux the GitOps way
-* **[cozy-proxy](https://github.com/cozystack/cozy-proxy):** A simple kube-proxy addon for 1:1 NAT services in Kubernetes with NFT backend
-* **[cozystack-telemetry-server](https://github.com/cozystack/cozystack-telemetry-server):** Cozystack telemetry
-* **[talos-bootstrap](https://github.com/cozystack/talos-bootstrap):** An interactive Talos Linux installer
-* **[talos-meta-tool](https://github.com/cozystack/talos-meta-tool):** Tool for writing network metadata into META partition
+**Packaged sub-projects** are built or vendored into the Cozystack distribution: install Cozystack and you run their code. They are governed by this project, released under Apache-2.0, and are in scope for the same licence, security, release and maintainership expectations as the main repository.
+
+| Sub-project | What it contributes to the distribution | Status | Owners |
+|---|---|---|---|
+| [etcd-operator](https://github.com/cozystack/etcd-operator) | Operator image, CRDs and the `etcd-migrate` tool, for etcd clusters backing tenant control planes | Stable | @lllamnyp, @androndo, @sircthulhu |
+| [cozy-proxy](https://github.com/cozystack/cozy-proxy) | kube-proxy addon for 1:1 NAT services, with an NFT backend; chart vendored into the platform | Stable | @kvaps, @mattia-eleuteri |
+| [keycloak-kms-proxy](https://github.com/cozystack/keycloak-kms-proxy) | PostgreSQL wire-protocol proxy that encrypts Keycloak PII columns, keeping the key in a KMS outside the database | Stable | @sircthulhu, @kvaps |
+| [local-ccm](https://github.com/cozystack/local-ccm) | Cloud-controller manager for bare-metal clusters; chart and image | Stable | @kvaps, @IvanHunters |
+| [cozystack-scheduler](https://github.com/cozystack/cozystack-scheduler) | kube-scheduler extension with SchedulingClass-aware placement; also a compiled dependency of the main repository | Stable | @lllamnyp |
+| [ingress-nginx-with-protobuf-exporter](https://github.com/cozystack/ingress-nginx-with-protobuf-exporter) | Ingress-NGINX controller build carrying the protobuf metrics exporter | Stable | @kvaps |
+
+The Cozystack maintainers are maintainers of every sub-project by default (see [MAINTAINERS.md](./MAINTAINERS.md)). The owners named above are the people whose review is requested on changes in each repository; the same lists are recorded in each repository's `CODEOWNERS`.
+
+**Independent tooling** is governed by this project but is not part of the distribution — an adopter installs Cozystack without it, and chooses these separately: [talm](https://github.com/cozystack/talm) (managing Talos Linux the GitOps way), [cozyhr](https://github.com/cozystack/cozyhr) (a Helm and Flux CD wrapper for local development), [cozyvalues-gen](https://github.com/cozystack/cozyvalues-gen) (schema and README generation for Helm charts), [terraform-provider-cozystack](https://github.com/cozystack/terraform-provider-cozystack), [ansible-cozystack](https://github.com/cozystack/ansible-cozystack), [boot-to-talos](https://github.com/cozystack/boot-to-talos), [talos-bootstrap](https://github.com/cozystack/talos-bootstrap), [talos-meta-tool](https://github.com/cozystack/talos-meta-tool) and [blockstor](https://github.com/cozystack/blockstor) (a software-defined storage system, developed independently of the platform).
+
+**Project infrastructure** carries no shipped code: [website](https://github.com/cozystack/website), [community](https://github.com/cozystack/community) (design proposals and meeting notes), [external-apps-example](https://github.com/cozystack/external-apps-example) (the reference third-party application catalogues are built from), [ccp](https://github.com/cozystack/ccp), [.github](https://github.com/cozystack/.github) and [.project](https://github.com/cozystack/.project) (CNCF project metadata).
+
+**Forks of upstream projects** are held for contributing changes back, or were held for that purpose and have since been archived. None is built into the distribution, which takes those components from their upstreams directly.
+
+Two things about this organisation are worth stating plainly rather than leaving to be discovered.
+
+**Four repositories are private**, and none of them contributes to the distribution: `security-scanner` (automated CVE monitoring, private because it holds pre-disclosure vulnerability state), `infrastructure` (the organisation's own CI infrastructure-as-code, private because it holds cloud credentials and account topology), one GitHub-created security-advisory workspace, and `talos-preboot-iso`, an archived prototype. Nothing an adopter installs is built from a repository they cannot read.
+
+**Telemetry is received by a component adopters do not install.** [cozystack-telemetry-server](https://github.com/cozystack/cozystack-telemetry-server) runs as project infrastructure, but clusters report to it by default, so it is named here rather than omitted as out-of-scope. What is collected, why, and how to turn it off is documented on the [Telemetry](https://cozystack.io/docs/v1.6/operations/configuration/telemetry/) page.
+
+## Third-party Dependencies
+
+Cozystack packages and ships software it does not govern. Such components remain
+under their upstream owner's namespace, are vendored by digest, and are neither
+released by this project nor mirrored under `ghcr.io/cozystack`.
+
+They are enumerated, with their licences, on the
+[Licenses](https://cozystack.io/docs/v1.6/operations/configuration/licenses/)
+page. That page lists upstreams only: what this project maintains is Apache-2.0
+and is not listed there individually.
 
 ## Community Roles
 
 * **Users:** Members that engage with the Cozystack community via any medium, including Slack, Telegram, GitHub, and mailing lists.
 * **Contributors:** Members contributing to the projects by contributing and reviewing code, writing documentation,
   responding to issues, participating in proposal discussions, and so on.
-* **Directors:** Non-technical project leaders.
 * **Maintainers**: Technical project leaders.
 
 ## Contributors
@@ -42,15 +68,6 @@ Cozystack GitHub organisation must follow the
 [contributing guidelines](https://github.com/cozystack/cozystack/blob/main/CONTRIBUTING.md).
 Whether these contributions are merged into the project is the prerogative of the maintainers.
 
-## Directors
-
-Directors are responsible for non-technical leadership functions within the project.
-This includes representing Cozystack and its maintainers to the community, to the press, 
-and to the outside world; interfacing with CNCF and other governance entities;
-and participating in project decision-making processes when appropriate.
-
-Directors are elected by a majority vote of the maintainers.
-
 ## Maintainers
 
 Maintainers have the right to merge code into the project.
@@ -67,11 +84,22 @@ Cozystack maintainers are expected to:
   and CNCF Slack workspaces, Telegram groups, and help out when possible.
 * Rapidly respond to any time-sensitive security release processes.
 * Attend Cozystack community meetings.
+* Be familiar with the Linux Foundation guidance on [OFAC sanctions and open source](https://bestpractices.linuxfoundation.org/regulatory/ofac/) and raise any related questions privately with the other maintainers.
 
 If a maintainer is no longer interested in or cannot perform the duties
 listed above, they should move themselves to emeritus status.
 If necessary, this can also occur through the decision-making process outlined below.
 
+### Welcoming new contributors
+
+A first contribution is often the moment someone decides whether to stay. When a new contributor opens an issue or a pull request:
+
+* Aim to respond within two working days, even if only to say who will review it and when.
+* Point to the contributing guide and help with the mechanics. If the DCO check fails, explain how to fix it: `git commit --amend --signoff` for the last commit, or `git rebase --signoff main` for several.
+* Before approving a CI run for an external contributor, read the diff and make sure it does not touch workflows, secrets or release tooling in a way that could run untrusted code with project credentials. This applies to every approval, not only the first one.
+* Review against the same standards as any other change, and explain the reason behind each requested change. If the change is not going to be accepted, say so early and say why, rather than leaving it open.
+* Suggest a good next step: a `good first issue`, a related bug, or a documentation gap.
+
 ### Becoming a Maintainer
 
 Anyone can become a Cozystack maintainer. Maintainers should be extremely
@@ -86,6 +114,6 @@ After several months of working together, maintainers will decide whether to gra
 
 ## Project Decision-making Process
 
-Ideally, all project decisions are resolved by consensus of maintainers and directors.
+Ideally, all project decisions are resolved by consensus of the maintainers.
 If this is not possible, a vote will be called.
-The voting process is a simple majority in which each maintainer and director receives one vote.
+The voting process is a simple majority in which each maintainer receives one vote.
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
index 9cf2d2dcb1..4b9481d91b 100644
--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@@ -5,13 +5,33 @@
 | Maintainer | GitHub Username | Company |          Responsibility           |
 | ---------- | --------------- | ------- | --------------------------------- |
 | Andrei Kvapil | [@kvaps](https://github.com/kvaps) | Ænix | Core Maintainer |
-| George Gaál | [@gecube](https://github.com/gecube) | Independent | DevOps Practices in Platform, Developers Advocate |
 | Kingdon Barrett | [@kingdonb](https://github.com/kingdonb) | Urmanac | FluxCD and flux-operator |
 | Timofei Larkin | [@lllamnyp](https://github.com/lllamnyp) | Ænix | Core Maintainer |
 | Timur Tukaev | [@tym83](https://github.com/tym83) | Ænix | Cozystack Website, Marketing, Community Management |
-| Nikita Bykov | [@nbykov0](https://github.com/nbykov0) | Independent | Maintainer of ARM and stuff |
 | Matthieu Robin | [@matthieu-robin](https://github.com/matthieu-robin) | Hidora | Managed Applications, Platform Quality & Benchmarking |
 | Mattia Eleuteri | [@mattia-eleuteri](https://github.com/mattia-eleuteri) | Hidora | CSI, Storage, Networking & Security |
+| Aleksei Sviridkin | [@lexfrei](https://github.com/lexfrei) | Ænix | Release engineering, CI, Talos tooling, security pipeline |
+| Daniil Miasnikov | [@myasnikovdaniil](https://github.com/myasnikovdaniil) | Ænix | Platform, API, CI/CD, project infrastructure |
+| Ivan Okhotnikov | [@IvanHunters](https://github.com/IvanHunters) | Ænix | Monitoring, Dashboard, cozystack-api |
+
+## Reviewers
+
+Reviewers own a specific area of the codebase rather than the project as a
+whole: they review and approve changes to that area, and carry write access for
+it, without the project-wide responsibilities of a maintainer. The role, and the
+process for entering it, is defined in
+[CONTRIBUTOR_LADDER.md](https://github.com/cozystack/cozystack/blob/main/CONTRIBUTOR_LADDER.md).
+
+The authoritative mapping from an area to the people who own it is
+[`.github/CODEOWNERS`](https://github.com/cozystack/cozystack/blob/main/.github/CODEOWNERS);
+this table names the people and is kept in step with it.
+
+| Reviewer | GitHub Username | Company | Area |
+| -------- | --------------- | ------- | ---- |
+| Kirill Ilin | [@sircthulhu](https://github.com/sircthulhu) | Ænix | Controllers, Keycloak, system operators |
+| Andrey Kolkov | [@androndo](https://github.com/androndo) | Ænix | Backups |
+| Aleksei Artamonov | [@scooby87](https://github.com/scooby87) | Ænix | Virtualization (KubeVirt, vm-instance, vm-disk) |
+| Marian Koreniuk | [@themoriarti](https://github.com/themoriarti) | CageForge | Proxmox integration (Cluster API infrastructure provider, CCM, CSI) |
 
 ## Emeritus Maintainers
 
@@ -20,4 +40,6 @@ We thank the following former maintainers for their contributions to Cozystack.
 | Maintainer | GitHub Username |
 | ---------- | --------------- |
 | Artem Bortnikov | [@aobort](https://github.com/aobort) |
+| George Gaál | [@gecube](https://github.com/gecube) |
 | Kirill Klinchenkov | [@klinch0](https://github.com/klinch0) |
+| Nikita Bykov | [@nbykov0](https://github.com/nbykov0) |
diff --git a/Makefile b/Makefile
index fa8462f0fe..6da0e1037f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-.PHONY: manifests assets unit-tests helm-unit-tests bats-unit-tests rd-presets-check test-controllers preflight
+.PHONY: manifests assets prepare-env prepare-env-container unit-tests helm-unit-tests bats-unit-tests bats-unit-files-check bats-posix-compat-tests print-bats-unit-files print-bats-posix-compat-files print-bats-jobs rd-presets-check migrations-target-check test test-controllers test-controllers-envtest test-backport-audit preflight
 
 include hack/common-envs.mk
 
@@ -10,28 +10,43 @@ build-deps:
 	@awk --version | grep -q GNU || (echo "GNU awk is required" && exit 1)
 
 build: build-deps
-	make -C packages/apps/http-cache image
 	make -C packages/apps/mariadb image
 	make -C packages/apps/clickhouse image
 	make -C packages/apps/kubernetes image
-	make -C packages/system/monitoring image
+	make -C packages/apps/vpn image
 	make -C packages/system/cozystack-api image
 	make -C packages/system/cozystack-controller image
 	make -C packages/system/backup-controller image
 	make -C packages/system/backupstrategy-controller image
 	make -C packages/system/lineage-controller-webhook image
+	make -C packages/system/migration-controller image
+	make -C packages/system/flux-shard-operator image
+	make -C packages/system/flux-plunger image
 	make -C packages/system/cilium image
 	make -C packages/system/linstor image
 	make -C packages/system/linstor-gui image
+	make -C packages/system/kubeovn image
 	make -C packages/system/kubeovn-webhook image
 	make -C packages/system/kubeovn-plunger image
+	make -C packages/system/kilo image
 	make -C packages/system/dashboard image
 	make -C packages/system/metallb image
+	make -C packages/system/talos-log-collector image
 	make -C packages/system/kamaji image
+	make -C packages/system/capi-providers-cpprovider image
+	make -C packages/system/capi-providers-infraprovider image
 	make -C packages/system/multus image
 	make -C packages/system/bucket image
+	make -C packages/system/seaweedfs image
 	make -C packages/system/objectstorage-controller image
+	make -C packages/system/securitygroup-controller image
 	make -C packages/system/grafana-operator image
+	make -C packages/system/monitoring image
+	make -C packages/system/redis-operator image
+	make -C packages/system/harbor image
+	make -C packages/system/velero image
+	make -C packages/system/opensearch-operator image
+	make -C packages/system/keycloak-operator image
 	make -C packages/core/testing image
 	make -C packages/core/talos image
 	make -C packages/core/platform image
@@ -46,9 +61,13 @@ manifests:
 	# identity labels (see packages/core/installer/templates/cozy-system-namespace.yaml).
 	# helm install/upgrade users keep the default (false) and use --create-namespace
 	# + the pre-install labeler hook.
+	# platformVersion is rendered into the COZYSTACK_VERSION env on the operator so
+	# the install artifacts carry the version as deploy-time data (not baked into
+	# the image). Promotion re-renders these with the stable version, no rebuild.
 	# Talos variant (default)
 	helm template installer packages/core/installer -n cozy-system \
 		--set bareNamespace=true \
+		--set cozystackOperator.platformVersion=$(if $(COZYSTACK_VERSION),v$(COZYSTACK_VERSION),) \
 		--show-only templates/cozy-system-namespace.yaml \
 		--show-only templates/cozystack-operator.yaml \
 		> _out/assets/cozystack-operator-talos.yaml
@@ -56,6 +75,7 @@ manifests:
 	helm template installer packages/core/installer -n cozy-system \
 		--set bareNamespace=true \
 		--set cozystackOperator.variant=generic \
+		--set cozystackOperator.platformVersion=$(if $(COZYSTACK_VERSION),v$(COZYSTACK_VERSION),) \
 		--set cozystack.apiServerHost=REPLACE_ME \
 		--show-only templates/cozy-system-namespace.yaml \
 		--show-only templates/cozystack-operator.yaml \
@@ -64,6 +84,7 @@ manifests:
 	helm template installer packages/core/installer -n cozy-system \
 		--set bareNamespace=true \
 		--set cozystackOperator.variant=hosted \
+		--set cozystackOperator.platformVersion=$(if $(COZYSTACK_VERSION),v$(COZYSTACK_VERSION),) \
 		--show-only templates/cozy-system-namespace.yaml \
 		--show-only templates/cozystack-operator.yaml \
 		> _out/assets/cozystack-operator-hosted.yaml
@@ -71,11 +92,15 @@ manifests:
 cozypkg:
 	go build -ldflags "-X github.com/cozystack/cozystack/cmd/cozypkg/cmd.Version=v$(COZYSTACK_VERSION)" -o _out/bin/cozypkg ./cmd/cozypkg
 
+# Operator diagnostic: reports non-ready cozystack / Flux / Kubernetes resources.
+check-readiness:
+	go build -ldflags "-X main.Version=v$(COZYSTACK_VERSION)" -o _out/bin/check-readiness ./cmd/check-readiness
+
 assets: assets-talos assets-cozypkg openapi-json
 
 openapi-json:
 	mkdir -p _out/assets
-	VERSION=$(shell git describe --tags --always 2>/dev/null || echo dev) go run ./tools/openapi-gen/ 2>/dev/null > _out/assets/openapi.json
+	VERSION=$(if $(COZYSTACK_VERSION),v$(COZYSTACK_VERSION),$(shell git describe --tags --always 2>/dev/null || echo dev)) go run ./tools/openapi-gen/ 2>/dev/null > _out/assets/openapi.json
 
 assets-talos:
 	make -C packages/core/talos assets
@@ -92,9 +117,9 @@ assets-cozypkg-%:
 
 test:
 	make -C packages/core/testing apply
-	make -C packages/core/testing test
+	make -C packages/core/testing e2e
 
-unit-tests: helm-unit-tests bats-unit-tests go-unit-tests rd-presets-check
+unit-tests: helm-unit-tests bats-unit-tests bats-posix-compat-tests go-unit-tests go-module-tests rd-presets-check test-check-readiness test-backport-audit migrations-target-check
 
 helm-unit-tests:
 	hack/helm-unit-tests.sh
@@ -106,6 +131,13 @@ helm-unit-tests:
 rd-presets-check:
 	hack/check-rd-presets.sh
 
+# Catch the off-by-one where migrations/<N> is added but
+# migrations.targetVersion in packages/core/platform/values.yaml is not
+# bumped to >= N+1. run-migrations.sh loops `seq $$CURRENT $$((TARGET-1))`,
+# so the new migration is silently skipped on every cluster upgrade.
+migrations-target-check:
+	hack/check-migrations-target.sh
+
 # Scoped go test over the cozystack-api surface that this repo owns. Kept
 # narrow intentionally - running `go test ./...` pulls in generated code
 # round-trip suites whose behavior depends on tool versions outside this
@@ -114,18 +146,61 @@ rd-presets-check:
 go-unit-tests:
 	go test ./pkg/registry/... ./pkg/config/... ./pkg/cmd/server/...
 
+# The nested Go modules (image sources and the published API types) are
+# outside ./... of the root module, so no other target reaches their tests.
+# git ls-files, not find: gitignored checkouts such as .claude/worktrees
+# hold whole copies of this repository.
+go-module-tests:
+	@for mod in $$(git ls-files '*/go.mod' | xargs -n1 dirname); do \
+		echo "--- go test $$mod ---"; \
+		(cd "$$mod" && go test -count=1 ./...) || exit 1; \
+	done
+
 # Go tests for the controllers and supporting packages under ./internal.
 # Excludes ./pkg/... and ./cmd/... — those are run separately by
 # go-unit-tests above (pkg subset) and skipped (cmd) until their tests
-# stabilise. Run as its own step in CI alongside helm/bats unit tests;
-# locally invoke directly (`make test-controllers`) or chain
-# (`make unit-tests test-controllers`).
+# stabilise. CI schedules this target in the same four-slot make invocation as
+# unit-tests; locally invoke it directly or chain the two targets.
 test-controllers:
 	go test ./internal/... -count=1
 
-# Discover every hack/*.bats file that is NOT an e2e test and run it
-# through cozytest.sh. Drop a new *.bats file in hack/ and it is picked
-# up automatically on the next `make unit-tests` run.
+# Controller suites that need a real apiserver (build tag `envtest`): server-side
+# apply ownership, apply preconditions and finalizer handling, which a fake client
+# does not implement. setup-envtest fetches the kube-apiserver and etcd release
+# pinned by ENVTEST_K8S_VERSION into _out/envtest; the HelmRelease CRD comes from
+# the in-tree Flux manifests (envtest skips their non-CRD objects). CI runs it
+# next to test-controllers. Only the packages listed below are compiled, so a
+# package that gains an envtest suite has to be added here.
+#
+# setup-envtest itself is built into _out/envtest too, and binaries already there
+# are used without asking the release index, so a warm _out/envtest (CI caches
+# it) needs no network at all.
+ENVTEST_K8S_VERSION ?= 1.35.0
+SETUP_ENVTEST_VERSION ?= v0.0.0-20260305142021-f9589b9f2b9d
+ENVTEST_DIR = $(CURDIR)/_out/envtest
+SETUP_ENVTEST = $(ENVTEST_DIR)/bin/setup-envtest-$(SETUP_ENVTEST_VERSION)
+$(SETUP_ENVTEST):
+	GOBIN=$(ENVTEST_DIR)/bin go install sigs.k8s.io/controller-runtime/tools/setup-envtest@$(SETUP_ENVTEST_VERSION)
+	mv $(ENVTEST_DIR)/bin/setup-envtest $@
+test-controllers-envtest: $(SETUP_ENVTEST)
+	KUBEBUILDER_ASSETS="$$($(SETUP_ENVTEST) use $(ENVTEST_K8S_VERSION) --installed-only --bin-dir $(ENVTEST_DIR) --print path 2>/dev/null || $(SETUP_ENVTEST) use $(ENVTEST_K8S_VERSION) --bin-dir $(ENVTEST_DIR) --print path)" \
+		HELMRELEASE_CRD_DIR=$(CURDIR)/internal/fluxinstall/manifests \
+		go test -tags envtest -run '^TestEnvtest' ./internal/controller/fluxplunger/... -count=1
+
+# Black-box golden test for cmd/check-readiness. Builds the binary and runs it
+# against a mock kubectl (fixtures under test/check-readiness/testdata),
+# diffing stdout/stderr/exit against golden files. Regenerate goldens with:
+#   go test ./test/check-readiness/ -update
+test-check-readiness:
+	go test ./test/check-readiness/ -count=1
+
+# ./cmd/... is excluded from go-unit-tests, so the audit needs its own target.
+test-backport-audit:
+	go test ./cmd/backport-audit/ -count=1
+
+# Unit discovery is one level deep. Live-cluster files need an invocation in
+# packages/core/testing; hack/bats-runner-coverage.bats checks that boundary.
+# Bats supplies TAP and JUnit output; the live-cluster runner keeps its tracing.
 #
 # Caveat: $(wildcard ...) returns space-separated names, so a filename
 # containing a literal space would split into multiple tokens here. All
@@ -134,15 +209,94 @@ test-controllers:
 # (e.g. to use `find ... -print0 | xargs -0`).
 BATS_UNIT_FILES := $(filter-out hack/e2e-%.bats,$(wildcard hack/*.bats))
 
-bats-unit-tests:
+# The same list, one file per line, for hack/bats-strict-setup.bats. Every unit
+# file has to load hack/test_helper.bash to get `set -u` back, and that audit is
+# only worth anything if the set it walks is the set that actually runs -- so it
+# asks here rather than keeping a second copy of the filter above.
+print-bats-unit-files:
+	@printf '%s\n' $(BATS_UNIT_FILES)
+
+# `bats -j` needs GNU parallel and exits non-zero rather than degrading when it
+# is missing. moreutils also ships a command named parallel, so identify the GNU
+# implementation from its version output before enabling concurrency. Resolve
+# the probe once per make process; `?=` would keep the `$(shell ...)` recursive
+# and rerun it at every expansion.
+ifndef BATS_JOBS
+BATS_JOBS := $(shell parallel --version 2>/dev/null | grep -q '^GNU parallel ' && nproc 2>/dev/null || echo 1)
+endif
+
+print-bats-jobs:
+	@printf '%s\n' "$(BATS_JOBS)"
+
+# JUnit XML is preserved as a CI artifact for inspection. _out is gitignored.
+BATS_REPORT_DIR ?= _out/test-reports
+
+bats-unit-files-check:
 	@if [ -z "$(BATS_UNIT_FILES)" ]; then \
 		echo "ERROR: no hack/*.bats unit test files found"; \
 		exit 1; \
 	fi
-	@for f in $(BATS_UNIT_FILES); do \
-		echo "--- running $$f ---"; \
-		hack/cozytest.sh "$$f" || exit 1; \
-	done
+bats-unit-tests: bats-unit-files-check
+	@command -v bats >/dev/null 2>&1 || { \
+		echo "ERROR: bats not found. Install bats-core >= 1.5 — https://bats-core.readthedocs.io"; \
+		exit 1; \
+	}
+	@mkdir -p "$(BATS_REPORT_DIR)"
+	bats -j $(BATS_JOBS) --report-formatter junit -o "$(BATS_REPORT_DIR)" $(BATS_UNIT_FILES)
+
+# Real Bats is authoritative. Unit files that source production code whose
+# contract is POSIX sh retain a compatibility pass through cozytest.sh's
+# /bin/sh translator. Discover literal .sh dependencies wherever they live,
+# including hack/lib and package migration helpers, so a new non-Chainsaw
+# helper test cannot run only under Bash. The explicit entries retain reviewed
+# shell-facing tests, including files whose production path is held in a
+# variable and therefore cannot be identified from the source line alone.
+BATS_SOURCED_SH_FILES := $(shell grep -El '^[[:space:]]*(\.|source)[[:space:]]+.*\.sh' $(BATS_UNIT_FILES))
+BATS_POSIX_COMPAT_FILES := $(sort \
+	$(BATS_SOURCED_SH_FILES) \
+	hack/capture-dataplane.bats \
+	hack/capture-previous-logs.bats \
+	hack/cilium-leak-healer_test.bats \
+	hack/container-lane-capacity_test.bats \
+	hack/cozyreport-talos.bats \
+	hack/cozyreport.bats \
+	hack/cozystack-version-stamp.bats \
+	hack/nightly-mirror_test.bats \
+	hack/pod-label-census_test.bats \
+	hack/promote-rewrite-tags_test.bats \
+	hack/runner-identity.bats \
+	hack/seaweedfs-naming-audit.bats \
+)
+
+# CI's /bin/sh is dash. Keep the interpreter overridable so contributors can
+# run the same compatibility lane explicitly on hosts whose /bin/sh differs.
+BATS_POSIX_SHELL ?= /bin/sh
+COZYTEST_TRACE ?= 0
+
+print-bats-posix-compat-files:
+	@printf '%s\n' $(BATS_POSIX_COMPAT_FILES)
+
+bats-posix-compat-tests:
+	@status=0; \
+	for f in $(BATS_POSIX_COMPAT_FILES); do \
+		echo "--- running POSIX compatibility: $$f ---"; \
+		COZYTEST_TRACE=$(COZYTEST_TRACE) "$(BATS_POSIX_SHELL)" hack/cozytest.sh "$$f" || status=1; \
+	done; \
+	exit $$status
+
+# No cluster for the unit and controller lanes. A test that misses a stub, or
+# whose stub a `timeout` or `bash -c` steps past, otherwise reaches whatever
+# cluster the caller's kubeconfig points at. An empty KUBERNETES_SERVICE_HOST
+# is needed beside KUBECONFIG: given an empty kubeconfig, client-go falls back
+# to in-cluster credentials wherever that variable and a service-account token
+# are present.
+# Every prerequisite of unit-tests is listed so it is guarded when run on its
+# own too; hack/unit-lane-no-cluster.bats fails when one is missing.
+NO_CLUSTER_TARGETS := unit-tests test-controllers helm-unit-tests bats-unit-tests \
+	bats-posix-compat-tests go-unit-tests go-module-tests rd-presets-check \
+	test-check-readiness test-backport-audit migrations-target-check
+$(NO_CLUSTER_TARGETS): export KUBECONFIG := /dev/null
+$(NO_CLUSTER_TARGETS): export KUBERNETES_SERVICE_HOST :=
 
 # Operator-facing host preflight check. Warns about a standalone
 # containerd.service or docker.service running alongside the embedded
@@ -154,6 +308,12 @@ prepare-env:
 	make -C packages/core/testing apply
 	make -C packages/core/testing prepare-cluster
 
+# Container-lane sibling of prepare-env. Same sandbox, Talos nodes as containers
+# instead of QEMU guests, so no nocloud asset is copied in.
+prepare-env-container:
+	make -C packages/core/testing apply
+	make -C packages/core/testing prepare-cluster-container
+
 generate:
 	hack/update-codegen.sh
 
diff --git a/README.md b/README.md
index 5bc8d7be08..e9d46b13eb 100644
--- a/README.md
+++ b/README.md
@@ -1,54 +1,51 @@
-![Cozystack](img/cozystack-logo-black.svg#gh-light-mode-only)
-![Cozystack](img/cozystack-logo-white.svg#gh-dark-mode-only)
+<img src="img/cozystack-logo-black.svg#gh-light-mode-only" alt="Cozystack" width="340">
+<img src="img/cozystack-logo-white.svg#gh-dark-mode-only" alt="Cozystack" width="340">
 
-[![Open Source](https://img.shields.io/badge/Open-Source-brightgreen)](https://opensource.org/)
-[![Apache-2.0 License](https://img.shields.io/github/license/cozystack/cozystack)](https://opensource.org/licenses/)
-[![Support](https://img.shields.io/badge/$-support-12a0df.svg?style=flat)](https://cozystack.io/support/)
-[![Active](http://img.shields.io/badge/Status-Active-green.svg)](https://github.com/cozystack/cozystack)
 [![GitHub Release](https://img.shields.io/github/release/cozystack/cozystack.svg?style=flat)](https://github.com/cozystack/cozystack/releases/latest)
-[![GitHub Commit](https://img.shields.io/github/commit-activity/y/cozystack/cozystack)](https://github.com/cozystack/cozystack/graphs/contributors)
+[![Apache-2.0 License](https://img.shields.io/github/license/cozystack/cozystack)](https://github.com/cozystack/cozystack/blob/main/LICENSE)
+[![Commit activity](https://img.shields.io/github/commit-activity/y/cozystack/cozystack)](https://github.com/cozystack/cozystack/graphs/commit-activity)
 [![OpenSSF Best Practices](https://www.bestpractices.dev/projects/10177/badge)](https://www.bestpractices.dev/projects/10177)
+[![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/cozystack/cozystack/badge)](https://securityscorecards.dev/viewer/?uri=github.com/cozystack/cozystack)
+[![CLOMonitor](https://img.shields.io/endpoint?url=https://clomonitor.io/api/projects/cncf/cozystack/badge)](https://clomonitor.io/projects/cncf/cozystack)
+[![Support](https://img.shields.io/badge/$-support-12a0df.svg?style=flat)](https://cozystack.io/support/)
 
 # Cozystack
 
-**Cozystack** is a free platform and framework for building clouds.
+**Cozystack** is a free and open-source platform and framework for building clouds.
 
-Cozystack is a [CNCF Sandbox Level Project](https://www.cncf.io/sandbox-projects/) that was originally built and sponsored by [Ænix](https://aenix.io/).
+Cozystack is a [CNCF Sandbox project](https://www.cncf.io/sandbox-projects/) that was originally built and sponsored by [Ænix](https://aenix.io/).
 
 With Cozystack, you can transform a bunch of servers into an intelligent system with a simple REST API for spawning Kubernetes clusters,
 Database-as-a-Service, virtual machines, load balancers, HTTP caching services, and other services with ease.
 
-Use Cozystack to build your own cloud or provide a cost-effective development environment.  
+Use Cozystack to build your own cloud or provide a cost-effective development environment.
 
 ![Cozystack user interface](https://cozystack.io/img/screenshot-dark.png)
 
 ## Use-Cases
 
-* [**Using Cozystack to build a public cloud**](https://cozystack.io/docs/guides/use-cases/public-cloud/)  
+* [**Using Cozystack to build a public cloud**](https://cozystack.io/docs/v1.6/guides/use-cases/public-cloud/)  
 You can use Cozystack as a backend for a public cloud
 
-* [**Using Cozystack to build a private cloud**](https://cozystack.io/docs/guides/use-cases/private-cloud/)  
+* [**Using Cozystack to build a private cloud**](https://cozystack.io/docs/v1.6/guides/use-cases/private-cloud/)  
 You can use Cozystack as a platform to build a private cloud powered by Infrastructure-as-Code approach
 
-* [**Using Cozystack as a Kubernetes distribution**](https://cozystack.io/docs/guides/use-cases/kubernetes-distribution/)  
-You can use Cozystack as a Kubernetes distribution for Bare Metal
-
+* [**Using Cozystack to build your own platform**](https://cozystack.io/docs/v1.6/guides/use-cases/kubernetes-distribution/)  
+You can install only the Cozystack components you need on an existing Kubernetes cluster
 
 ## Documentation
 
 The documentation is located on the [cozystack.io](https://cozystack.io) website.
 
-Read the [Getting Started](https://cozystack.io/docs/getting-started/) section for a quick start.
+Read the [Getting Started](https://cozystack.io/docs/v1.6/getting-started/) section for a quick start.
 
-If you encounter any difficulties, start with the [troubleshooting guide](https://cozystack.io/docs/operations/troubleshooting/) and work your way through the process that we've outlined.
+If you encounter any difficulties, start with the [troubleshooting guide](https://cozystack.io/docs/v1.6/operations/troubleshooting/) and work your way through the process that we've outlined.
 
 ## Versioning
 
-Versioning adheres to the [Semantic Versioning](http://semver.org/) principles.  
+Versioning adheres to the [Semantic Versioning](https://semver.org/) principles.  
 A full list of the available releases is available in the GitHub repository's [Release](https://github.com/cozystack/cozystack/releases) section.
 
-- [Roadmap](https://cozystack.io/docs/roadmap/)
-
 ## Contributions
 
 Contributions are highly appreciated and very welcomed!
@@ -56,16 +53,28 @@ Contributions are highly appreciated and very welcomed!
 In case of bugs, please check if the issue has already been opened by checking the [GitHub Issues](https://github.com/cozystack/cozystack/issues) section.
 If it isn't, you can open a new one. A detailed report will help us replicate it, assess it, and work on a fix.
 
-You can express your intention to on the fix on your own.
+You are welcome to take on the fix yourself.
 Commits are used to generate the changelog, and their author will be referenced in it.
 
-If you have **Feature Requests** please use the [Discussion's Feature Request section](https://github.com/cozystack/cozystack/discussions/categories/feature-requests).
+If you have a **concrete feature request**, [open an issue](https://github.com/cozystack/cozystack/issues/new/choose). For a **cross-cutting or architectural change**, open a [design proposal](https://github.com/cozystack/community/tree/main/design-proposals) in the [community](https://github.com/cozystack/community) repo. For **questions or early ideas**, use [GitHub Discussions](https://github.com/cozystack/cozystack/discussions). See [CONTRIBUTING.md](CONTRIBUTING.md#where-do-i-file) for the full routing.
 
 ## Community
 
-You are welcome to join our [Telegram group](https://t.me/cozystack) and come to our weekly community meetings.
+You are welcome to join us in **#cozystack**, on either [CNCF Slack](https://cloud-native.slack.com/archives/C08BQJD95J7) ([get an invite](https://cncf-slack.netlify.app/)) or [Kubernetes Slack](https://kubernetes.slack.com/archives/C06L3CPRVN1) ([get an invite](https://slack.kubernetes.io/)), in our [Telegram group](https://t.me/cozystack), and at our community meetings.
 Add them to your [Google Calendar](https://calendar.google.com/calendar?cid=ZTQzZDIxZTVjOWI0NWE5NWYyOGM1ZDY0OWMyY2IxZTFmNDMzZTJlNjUzYjU2ZGJiZGE3NGNhMzA2ZjBkMGY2OEBncm91cC5jYWxlbmRhci5nb29nbGUuY29t) or [iCal](https://calendar.google.com/calendar/ical/e43d21e5c9b45a95f28c5d649c2cb1e1f433e2e653b56dbbda74ca306f0d0f68%40group.calendar.google.com/public/basic.ics) for convenience.
 
+## Project documents
+
+| Document | What it covers |
+|---|---|
+| [Governance](GOVERNANCE.md) | How decisions are made and who makes them |
+| [Contributor Ladder](CONTRIBUTOR_LADDER.md) | How to grow from contributor to maintainer |
+| [Maintainers](MAINTAINERS.md) | Who maintains the project |
+| [Code of Conduct](CODE_OF_CONDUCT.md) | What we expect of each other |
+| [Security Policy](SECURITY.md) | Reporting a vulnerability, and which releases get fixes |
+| [Adopters](ADOPTERS.md) | Who runs Cozystack in production |
+| [Roadmap](ROADMAP.md) | Where the project is going |
+
 ## License
 
 Cozystack is licensed under Apache 2.0.  
diff --git a/ROADMAP.md b/ROADMAP.md
new file mode 100644
index 0000000000..33b1a1bc8e
--- /dev/null
+++ b/ROADMAP.md
@@ -0,0 +1,1008 @@
+# Cozystack Roadmap
+
+**Status:** Living document — updated quarterly by the maintainers. **Horizon:** May 2026 – May 2028 (two-year forward window). **Last updated:** 2026-08-25.
+
+This document describes where Cozystack is heading. It is the authoritative public roadmap. The granular issue-level view lives in [Project V2 #1 (Cozystack Roadmap)](https://github.com/orgs/cozystack/projects/1); this file explains the *why* and the *how they fit together*.
+
+**How to read the horizons.** Deliverables dated **2026 Q3 through 2027 Q1** are *commitments*: they have named owners, tracked issues, and capacity behind them. Everything dated **2027 Q2 and later** is *direction*: the problems we intend to solve and the order we intend to solve them in, restated every quarter as capacity and adoption become clearer. Direction items are deliberately not promises — a public roadmap that misses its own dates costs more credibility at a Graduation review than one that says plainly which parts are planned and which are intended.
+
+---
+
+## Executive Summary
+
+By **May 2028**, Cozystack should be a credible candidate for the open standard platform layer for building clouds — recognized inside the CNCF ecosystem, adopted in production by organizations across multiple geographies and verticals, and governed openly by a community wider than any single company. Linux illustrates what "open standard for a category" looks like over decades; the two-year window covered here is the *starting condition* for that long arc, not the destination.
+
+Concretely, success by the end of the horizon means all of the following are true at once:
+
+- **CNCF maturity.** Project is **Incubating** (application submitted 2026 Q3) with a Graduated application drafted (2028 Q1). Third-party security audit complete and findings remediated.
+- **Open specifications.** **Eight Cozystack-authored specifications** — CP-API (Package), CT-API (Tenant), Host OS Contract, GitOps Engine Interface, Fleet API, Cloud Native AI Inference Gateway, Block Replication CSI Extension, Tenant FinOps API — are in or through the relevant standards body process. At least one is ratified, and at least four have a second independent implementation.
+- **Security posture.** OpenSSF Best Practices **Gold**, OSPS Baseline **L3**, OpenSSF Scorecard **≥ 9.0**, **SLSA Build L3**, CSAF VEX disclosure pipeline, EU CRA-compliant reporting, all-green CLOMonitor checks.
+- **Storage independence.** **blockstor** as the production-default replicated block storage in Cozystack 3.0, with LINSTOR maintained as a legacy opt-in, governed inside Cozystack rather than as a separate foundation project.
+- **AI/ML platform.** **Inference Gateway GA**, GPU FinOps tenant view, managed model registry, multi-tenant GPU sharing (MIG/vGPU/time-slicing), agentic and multi-modal workload support — all production-grade and documented as reference for NVIDIA NCP-aligned deployments.
+- **Multi-cluster.** **Fleet API v1.0 GA**. Federation across ≥ 100 clusters in publicly attested production deployments.
+- **Marketplace.** **≥ 100 certified applications** across sub-categories (AI/ML, Databases, Messaging, Observability, Security, Networking, DevTools). Third-party publisher program operating. Signed packages, SBOM-attested artifacts, vulnerability gates.
+- **Conformance Program.** **Certified Cozystack Provider / App / Storage Backend / Host OS** all operating, with multiple certified entities per category.
+- **Governance and community.** ≥ 10 active SIGs · ≥ 10 maintainers from ≥ 5 different organizations · ≥ 30 public production adopters · public vendor-neutrality dashboard live and maintained.
+- **Adoption channels.** "Tested on Cozystack" hardware program with ≥ 20 certified configurations across ≥ 3 vendors · co-published host OS profiles with ≥ 4 Linux distributions · managed Cozystack offerings from European service providers · ≥ 12 conference talks per calendar year · **Cozystack Admin Certification (CCA) GA** with measurable labor-market presence.
+- **Documentation and materials.** Versioned docs per supported release line · auto-generated API reference per release · 11 published reference architectures · technical whitepaper · security whitepaper · TCO calculator · vendor lock-in analysis · ≥ 5 published case studies · migration playbooks from VMware / OpenStack / Proxmox / KVM · Cozystack Academy with four courses live.
+- **Compliance enablers for downstream.** PCI DSS v4.0.1 reference architecture · SOC 2 Type II evidence pack · ISO/IEC 5230 (OpenChain) self-certified · EU CRA shared-responsibility matrix · CIS Kubernetes Benchmark profile · Threat Model published.
+
+None of these outcomes is achievable by code alone. Each requires sustained, coordinated work across **twelve strategic tracks** (§5), the **Standardization Strategy** (§8), and the **Conformance Program** (§6). The remainder of this document is the breakdown of how each commitment above is delivered.
+
+The single fastest way to derail this plan is to remain a single-vendor project. Maintainer diversity (§5 Track 11) is the highest-priority risk mitigation in the entire roadmap.
+
+---
+
+## 1. Vision
+
+Cozystack aims to become the open standard platform layer for building clouds — the same way Linux became the open standard for operating systems. Concretely, that means a platform that:
+
+- Stays **vendor-neutral** and is governed openly under the CNCF.
+- Defines a **stable Core API** with explicit backwards-compatibility guarantees.
+- Ships a **Conformance Program** so that multiple distributions can exist while remaining interoperable.
+- Treats **enterprise reliability, security, and compliance** as first-class concerns, not bolt-ons.
+- Is a **first-class AI/ML platform** without giving up its general-purpose PaaS roots.
+
+The two-year goal is to graduate from CNCF Sandbox to Incubating in 2026 and prepare the conditions for a Graduated application by the end of the horizon.
+
+## 2. Strategic Layers
+
+Cozystack is shaped as a layered offering:
+
+- **Cozystack Core** — stable APIs, operator, package model, tenant model, auth, backup framework, observability primitives.
+- **Cozystack Conformance** — public test suites for platforms, applications, storage backends, host OS profiles, and providers.
+- **Cozystack Marketplace** — certified applications with version channels, signed artifacts, SBOM, and compatibility metadata.
+- **Cozystack Enterprise Profile** — LTS release lines, upgrade policy, auditability, public scale envelope, compliance-ready architecture.
+- **Cozystack AI Platform** — GPU lifecycle, datasets, model serving, model registry, vector databases, tenant isolation, FinOps for tokens/GPU-time.
+- **Cozystack Fleet** — multi-cluster, multi-region, unified policy and identity, federated networking and lifecycle.
+
+## 3. Current State (August 2026)
+
+### 3.1 What is shipped
+
+- `v1.0` — package-based architecture, `Package` / `PackageSource`, `cozystack-operator`, backup framework, VM backup, RWX for AI/ML workloads, non-Talos installs.
+- `v1.2` — OpenSearch, VPC peering, `SchedulingClass`, clustered VictoriaLogs, production stabilization.
+- `v1.3` — storage-aware scheduling via LINSTOR extender, LINSTOR GUI, VM default images, app-level observability, S3 metering, cross-namespace VM restore.
+- `v1.4` — backup strategies, Flux 2.8, new `cozystack-ui`, cozy-tls, Redis TLS, app scheduling, CI/e2e hardening.
+- `v1.5` — shipped (maintained line).
+- `v1.6` — shipped 2026-07-22; `v1.6.2` is the current patch release (latest stable line).
+
+### 3.2 Roadmap items already completed
+
+The following items from [Project V2 #1](https://github.com/orgs/cozystack/projects/1) have been delivered:
+
+- Public access for end users (#1257)
+- OIDC integration (#1258)
+- Tenant isolation improvements (#1250)
+- GPU support in VMs and tenant Kubernetes (#1244)
+- Topology and affinity settings (#1242)
+- NUMA support for VMs (#1245)
+- Air-gap installation support (#1243) — the base install path only. Three gaps are still open and are tracked for 2026 Q4 under Track 10: registry mirroring, preservation of image signatures when images are re-baked into a private registry, and air-gapped tenant Talos clusters, which have never been verified.
+- New Cozystack UI foundation (#1252)
+- Plugin system (#1259)
+- Audit log (#1263)
+- Backup and recovery system (#1248)
+- Decomposition and extensibility (#1249)
+- API stabilization and `v1.0.0` release (#1251)
+- Installation on multiple Linux distributions (#1260)
+- API Gateway support (#1265)
+- ComputePlane tenant module for untrusted-code workloads (#3280, merged 2026-07-29) — the module itself; E2E coverage (#3369) and the release-name guards (#3371) are still open and are tracked for 2026 Q4.
+
+### 3.3 In flight or rescheduled
+
+This list mirrors the open items on [Project V2 #1](https://github.com/orgs/cozystack/projects/1). The board is the issue-level source of truth; if the two disagree, the board is right and this section is stale.
+
+- Internal Development Platform bundle (#1247) — moved to 2027 Q1.
+- Selecting managed application versions (#1246) — rescheduled to Q3 2026.
+- Grafana dashboard with SLA for each service (#1262) — rescheduled to Q3 2026.
+- Distroless images (#1261) — Q4 2026.
+- Automated platform updates (#1266) — Q4 2026.
+- Backups for managed apps (#1713) — Q4 2026; per-application backup strategies are being landed app by app.
+- Replace Helm `lookup` with OpenBao + ESO + operator architecture (#1942) — Q4 2026.
+- Adopt the kstatus readiness model platform-wide (#2642) — Q4 2026.
+- Unified TLS certificate and external-exposure model (#2811) — Q4 2026; the contract behind per-application TLS.
+- Diff-driven and scenario-based E2E testing (#2847) — Q3 2026; see Track 2, this is the gating item for the release train.
+- Cilium: version pins, Gateway API, network policy, IPAM and load-balancer issues (#3913) — Q3–Q4 2026.
+- Routed site-to-site IPsec gateway app (#3426) — Q3 2026; the implementation is essentially complete and waiting on review.
+- cozyplane — eBPF CNI and the `cozyplane-kpr` networking variant that drops Cilium (#3149) — Q4 2026, `experimental`.
+- Dynamic API group registration via `ApplicationGroupDefinition` (#3448) — 2027 Q1; downstream of the core / apps separation decision below.
+- Per-tenant egress IP via kube-ovn SNAT (#3755) — Q4 2026.
+- E2E coverage for the ComputePlane module (#3369) — Q4 2026.
+
+### 3.4 Tracks in flight not yet captured in Project V2
+
+- **blockstor** — Go-native Kubernetes block-storage control plane (LINSTOR REST-compatible). Active development in [cozystack/blockstor](https://github.com/cozystack/blockstor).
+- **kilo-clustermesh-operator** — WireGuard-based multi-cluster mesh control plane.
+- **cozystack-ui** — pure SPA Console/Marketplace UI talking directly to the Kubernetes API with `ApplicationDefinition`-based dynamic discovery.
+- **ccp** — Cozystack Claude Plugins marketplace for AI-assisted platform operations.
+- **standalone-trustd** — Talos `trustd` extracted as a standalone certificate-signing service.
+- **cozystack-scheduler** — custom scheduler hooks for workload-aware scheduling (GPU, NUMA, locality).
+- **cnai-landscape** — CNAI landscape submission preparation.
+
+The two-year plan brings these tracks into the public roadmap. Vulnerability triage additionally runs through an automated CVE pipeline. Its outputs are public — advisories, CSAF VEX documents and SBOMs are all published — while the scanning tooling itself stays in a maintainer-only repository, because a public scanner queue tells an attacker which unpatched findings are still open. The process it implements is documented in `SECURITY.md`.
+
+### 3.5 On the board without a public issue yet
+
+These six items carry capacity in the near-term plan and sit on [Project V2 #1](https://github.com/orgs/cozystack/projects/1) as drafts. They are listed here because the tracks below commit to them, and a commitment with nothing behind it is a wish. Each becomes a public issue when work starts on it.
+
+- **Core / apps separation model** — 2026 Q4 decision, 2027 Q1 implementation. Three competing designs exist (monorepo with versioning versus multi-repo) and none has been chosen. This is the one open architectural question that gates the three items below it, so it is sequenced first deliberately.
+- **Unit and integration test coverage** — 2026 Q4. Distinct from the E2E work in #2847: this covers the operator and controller Go code directly.
+- **Air-gapped installation, remaining gaps** — 2026 Q4. See the note on #1243 above.
+- **Per-cluster etcd for tenant Kubernetes** — 2027 Q1. The open question is migration for existing clusters: an honest migration versus a legacy flag that leaves current tenants on the shared instance.
+- **Community application marketplace** — 2027 Q1. Design proposals exist in `cozystack/community` and are open, not merged.
+- **Retire the `extra` apps category** — 2027 Q1, folding it into `apps`. Downstream of the separation model. Note that the ComputePlane module ships *as* an `extra` module, so this fold has to resolve where it lands.
+- **Public IPs as a first-class resource** — 2026 Q4 design, 2027 Q1 implementation. Proposal open in `cozystack/community` with changes requested. See Track 1.
+- **blockstor as an opt-in storage backend** — 2026 Q4 through 2027 Q1. See Track 4.
+- **Community PR review process and duty rotation** — 2026 Q3. See Track 11.
+
+## 4. Two-Year Plan at a Glance
+
+| Half | Horizon | Primary Goal | Headline Outcomes |
+|---|---|---|---|
+| H2 2026 (Jun–Dec) | commitment | Incubation push + enterprise foundations | CNCF Incubation, OSPS Baseline L2, OpenSSF Passing badge, public release-train policy, core / apps separation model decided, host-OS contract documented, Argo CD experimental, GitLab integration alpha, refreshed website + brand kit + technical whitepaper v1, first five reference architectures published. |
+| H1 2027 (Jan–Jun) | commitment through Q1, direction after | AI platform v1 + multi-cluster GA | Cozystack 2.0, Marketplace alpha, blockstor alpha, Fleet beta, AI Platform MVP, SOC 2 Type I readiness, OSPS Baseline L3, OpenSSF Silver, Argo CD beta, GitLab CI integration, Academy fundamentals + administrator courses, first five published case studies. |
+| H2 2027 (Jul–Dec) | direction | Enterprise scale + Marketplace mature | Public scale envelope, blockstor beta, AI Platform GA, certified-apps program, SLSA Build L3, SOC 2 Type II evidence collection, OpenSSF Gold, Argo CD GA, GitLab integration GA, CCA certification beta, threat model and third-party audit published. |
+| H1 2028 (Jan–May) | direction | Graduated-tier prep + standard play | Cozystack Conformance Program, certified providers/apps/storage/OS, third-party security audit completed, EU CRA compliance posture, Graduated application drafted, full Academy + CCA GA, distribution program landing live. |
+
+## 5. Tracks
+
+The roadmap is organized into twelve tracks. Each track lists deliverables by quarter and an indicative owning SIG (see §7 for SIG formation timeline).
+
+### Track 1 — Platform Core (SIG-Platform)
+
+**Goal.** Stable APIs, predictable upgrades, formal backwards-compatibility contract.
+
+| Quarter | Deliverables |
+|---|---|
+| 2026 Q3 | Close in-flight items #1246 and #1262. Cut `v1.6.0` (shipped 2026-07-22; `v1.6.2` current). Publish `API Stability Policy` (alpha/beta/stable lanes, deprecation window). **Service exposure API** — settle the `ExposureClass` / `ServiceExposure` contract (#3164) that per-application external access and TLS both depend on. Scope the **GitOps Engine Abstraction** CzEP — decouple package delivery from the underlying engine so Flux remains the default while a second engine becomes feasible. |
+| 2026 Q4 | Distroless images (#1261). Automated platform updates (#1266). Unified TLS and external-exposure model (#2811) landed across managed applications. Platform-wide kstatus readiness model (#2642). Helm `lookup` replaced by OpenBao + ESO (#1942). Per-tenant resource quotas (#752). **Public IPs as a first-class resource** — settle the `PublicIP` / `PublicIPClaim` / `PublicIPClass` model so that public addresses are allocatable platform resources rather than node addresses pasted into `Service.spec.externalIPs`; the migration off the current meaning of `externalIPs` is the hard part, and static IPs for VMs, a first-class BGP LoadBalancer path and the vpn app all wait behind it. **Per-tenant egress IP** (#3755) — tenant outbound traffic leaves on a dedicated tenant-owned address instead of the shared node IP, which is what abuse attribution, third-party allowlisting and per-IP billing all depend on; the kube-ovn NAT gateway machinery is already enabled on the host and no chart wires it. Database horizontal autoscaling (#3394). Public **Release Trains** policy: `stable`, `fast`, `LTS`. Public support matrix for Kubernetes / host OS / Cilium / KubeVirt / storage backends / **GitOps engines**. **Core / apps separation model decided** — pick one of the three competing designs (monorepo with versioning versus multi-repo) and publish the rationale; the marketplace, the `apps.cozystack.io` API split and the retirement of the `extra` category are all downstream of this and are sequenced after it. **cozyplane** — eBPF CNI plus the `cozyplane-kpr` networking variant that drops Cilium (#3149), shipped `experimental` and opt-in; Cilium remains the default. **Argo CD experimental support** as an alternative GitOps engine — package model adapts `Package` / `PackageSource` to `Application` / `ApplicationSet` semantics; documented as `experimental` and opt-in at install time. |
+| 2027 Q1 | Internal Development Platform bundle (#1247). Core / apps separation implemented against the Q4 decision. Dynamic API group registration via `ApplicationGroupDefinition` (#3448), splitting managed applications onto `apps.cozystack.io`. `PublicIPClass` and the address allocator implemented, with `publishing.externalIPs` and the vpn app migrated onto it. **Per-cluster etcd for tenant Kubernetes** — with a documented migration path for existing tenant clusters, not a flag day. **Cozystack 2.0** — backwards-compatibility contract published; major API revision based on production feedback; HA control-plane improvements (stretched control plane, multi-AZ, etcd backup automation). **Argo CD support reaches alpha** — supported install path for greenfield clusters; not yet a migration target for existing Flux-based deployments. |
+| 2027 Q2 | `Platform Health API` covering operator, packages, GitOps engine (Flux or Argo CD), storage, networking, backups, ingress, auth. Explicit lifecycle states for apps, backups, restores, VMs, tenant clusters. **Argo CD support reaches beta** — feature parity with Flux for tenant app delivery, including `ApplicationSet` patterns for multi-tenant fan-out. |
+| 2027 Q3 | Performance optimizations based on H1 2027 benchmarks. Per-tenant resource isolation hardening (full cgroup v2 adoption, memory.high pressure). **Argo CD support reaches GA** as a fully-supported alternative engine; Flux→Argo CD migration tooling enters alpha. |
+| 2027 Q4 | Documented Flux↔Argo CD migration paths for existing deployments. Both engines remain first-class. |
+| 2028 Q1 | **Cozystack 3.0** — second major API revision. Deprecation of legacy `v1` surfaces on a documented timeline. |
+
+### Track 2 — Testing & Conformance (SIG-Testing)
+
+**Goal.** Testing as a first-class deliverable. A public **Cozystack Conformance Suite** that third parties can certify against.
+
+| Quarter | Deliverables |
+|---|---|
+| 2026 Q3 | **Get the E2E pipeline green — the gating item for everything else in this quarter.** While it is red, releases, the merge queue and every large in-flight PR are blocked behind it. Diff-driven and scenario-based E2E (#2847): parallel post-install, event-driven backstops, pre-pull caching, lightweight kind/Talos-in-Docker clusters for diff-scoped runs (#3238). Close the diagnostics gap (#3368) — a third of red runs are currently undiagnosable. Document the test architecture. |
+| 2026 Q4 | **Unit and integration coverage for the operator and controller code**, enforced in CI. E2E coverage for the ComputePlane module (#3369) — the layer underneath the E2E work, and today the thinnest. **Reproducible performance benchmark** — a published, re-runnable artifact plus the write-up, so that platform performance claims are verifiable by third parties rather than asserted. **Cozystack Conformance Suite v0.1** — public, runnable test suite covering install, tenant lifecycle, app lifecycle, backup/restore, networking, storage. Chaos-Mesh integration in e2e (node failure, network partition, DRBD split-brain scenarios). |
+| 2027 Q1 | AI-augmented test generation: an LLM-based assistant proposes test cases for new behaviors on each PR; humans review and commit. Performance regression CI — benchmark suite gates merge. |
+| 2027 Q2 | Long-running soak environment — a permanent cluster that runs reliability tests for weeks. Upgrade matrix — every RC passes the full N-2 → N upgrade matrix. |
+| 2027 Q3 | **Public scale tests** — automated runs against 100/500/1000 nodes; published scale reports. |
+| 2027 Q4 | **Cozystack Conformance Suite v1.0** — stable test contract for the Conformance Program. |
+| 2028 Q1–Q2 | Third-party distributions can earn a "Cozystack Certified" badge by passing the suite. |
+
+### Track 3 — Security, Certifications & Compliance (SIG-Security)
+
+**Goal.** Bring the project to a security posture that supports CNCF Incubation, then Graduated, and supports downstream commercial users in audited environments. **This is the largest single track in the roadmap.**
+
+Cozystack's security work is structured around ten external frameworks plus one internal program. Each is treated as a sub-project with concrete tasks.
+
+#### Track 3.1 — OpenSSF Best Practices Badge (Metal series)
+
+The legacy and still-required "Passing / Silver / Gold" badge program. CNCF Graduation requires only the Passing badge; Silver and Gold are suggested, not required, and are self-chosen targets here.
+
+| Quarter | Target | Concrete tasks |
+|---|---|---|
+| 2026 Q3 | **Passing** (67 criteria) | Enroll project on [bestpractices.dev](https://www.bestpractices.dev/). Address all `MUST` items: public version-controlled source ✓, distinct contributing/security/code-of-conduct docs ✓ (already present), public bug tracker ✓, OSS license (Apache-2.0) ✓, build reproducibility documentation, automated test suite documented, public release notes per version, secure communication for vulnerability reports (private maintainer mailbox), warn on common cryptographic mistakes, vulnerability response policy with SLA, no public exposure of sensitive data in commits/issues. |
+| 2027 Q2 | **Silver** (55 additional criteria) | DCO or CLA documented and enforced, two-person review for substantive changes (already required), branch protection on all release branches, automated `golangci-lint` + `gosec` on every PR (extend coverage), documented coding standards, documented release-signing process, signed Git tags for releases, security policy with vulnerability disclosure timeline, README references security policy, contribution metadata documented (size, scope, review). |
+| 2027 Q4 | **Gold** (23 additional criteria) | Documented secure-design / threat model, fuzzing for critical components (blockstor, custom-scheduler, controllers), public SAST findings management, dynamic analysis (`go vet -race`, kube-conformance), CI-driven dependency-license check (FOSSA/ScanCode), reproducible builds for container images, branch protection includes required signed commits where supported. |
+
+#### Track 3.2 — OSPS Baseline (Open Source Project Security Baseline)
+
+The maturity-model framework — launched Feb 2025, current version dated 2026-02 — that is replacing "Gold-only" thinking. Has three levels organized by project maturity. Cozystack already qualifies for L3 by user-base; the work is bringing controls up to spec.
+
+The eight control families (each ID `OSPS-XX-YY`):
+
+- **AC** — Access Control
+- **BR** — Build & Release
+- **DO** — Documentation
+- **GV** — Governance
+- **LE** — Legal
+- **QA** — Quality
+- **SA** — Security Assessment
+- **VM** — Vulnerability Management
+
+| Quarter | Target level | Concrete tasks |
+|---|---|---|
+| 2026 Q3 | **L1 — Basic Hygiene** | All L1 controls. The project has most already; gap closure focus: documented release verification instructions (`OSPS-DO-03.*`), documented support scope (`OSPS-DO-04.01`), documented secret-management policy for CI (`OSPS-BR-07.02`). Self-assessment published in repo. |
+| 2026 Q4 | **L2 — Standardized** | Two-person review required for primary branch (`OSPS-QA-07.01` — extend to enforcement), test execution documentation (`OSPS-QA-06.02`), tests required for major changes (`OSPS-QA-06.03`), threat-model artifacts (`OSPS-SA-03.02`), VEX documents for component-level vulnerabilities (`OSPS-VM-04.02`). |
+| 2027 Q2 | **L3 — High Assurance** | Minimum-privilege CI/CD job assignments (`OSPS-AC-04.02`), formal review before granting escalated permissions (`OSPS-GV-04.01`), trusted-collaborator input sanitization in pipelines (`OSPS-BR-01.04`), unique-identifier release-asset association (`OSPS-BR-02.02`), publish verification instructions for release integrity AND authorship (`OSPS-DO-03.01` + `03.02`), document EOL timelines per release line (`OSPS-DO-05.01`), SBOM with compiled assets (`OSPS-QA-02.02`), equal-or-stricter security on multi-repo releases (`OSPS-QA-04.02`), dependency remediation thresholds + automated blocking (`OSPS-VM-05.01–03`), code-weakness remediation thresholds + automated blocking (`OSPS-VM-06.01–02`). |
+
+The repository ships an `OSPS-BASELINE.md` self-assessment that maps every control to evidence and is regenerated on each release.
+
+#### Track 3.3 — OpenSSF Scorecard
+
+Automated weekly checks producing a numeric score. CNCF sets no numeric Scorecard threshold for either tier; the levels below are self-chosen targets (around ≥ 7.0 by Incubation, ≥ 8.0 toward Graduated).
+
+| Quarter | Target | Concrete tasks |
+|---|---|---|
+| 2026 Q3 | **≥ 6.0** | Enable Scorecard GitHub Action across all org repositories. Publish badge in README. Address quick wins: pinned dependencies in CI, branch-protection metadata, signed releases, no binary artifacts in source tree. |
+| 2026 Q4 | **≥ 7.0** | Token-permissions least-privilege in every workflow, dependency-update-tool (Dependabot/Renovate enforced), code-review for every merge, signed commits where practical. |
+| 2027 Q2 | **≥ 8.0** | SAST integration, fuzzing presence, CII Best Practices score reflection. |
+| 2027 Q4 | **≥ 9.0** | All applicable checks pass; only systemic exceptions remain documented. |
+
+#### Track 3.4 — SLSA — Supply-chain Levels for Software Artifacts
+
+Build-side integrity, tracked against the current SLSA v1.2 specification (Build track). SLSA is not a stated CNCF graduation requirement; Build L3 is a self-chosen aspirational target.
+
+| Quarter | Target | Concrete tasks |
+|---|---|---|
+| 2026 Q3 | **Build L1** | Provenance generation for every release artifact (container images, Helm charts, binaries). Publish as `.intoto.jsonl` next to releases. |
+| 2026 Q4 | **Build L2** | Hosted-build platform (GitHub Actions OIDC + slsa-github-generator). Authenticated provenance with signed `_provenance` files. |
+| 2027 Q3 | **Build L3** | Hardened build platform: isolated build steps, non-falsifiable provenance, no human override of build pipeline; reusable workflows audited; secrets handled via OIDC short-lived tokens only. |
+
+#### Track 3.5 — CNCF CLOMonitor
+
+CNCF-wide automated check dashboard. Must be all-green for Incubation review.
+
+| Quarter | Deliverables |
+|---|---|
+| 2026 Q3 | Verify all CLOMonitor checks. Address gaps: project metadata, governance, security policy, adopters file completeness, contributor ladder, license, code of conduct, OpenSSF badge, artifact signing, SBOM. |
+
+#### Track 3.6 — CNCF Security Self-Assessment + Third-Party Audit
+
+| Quarter | Deliverables |
+|---|---|
+| 2026 Q3 | Complete the **CNCF TAG Security self-assessment** ([template](https://github.com/cncf/tag-security/blob/main/community/assessments/guide/self-assessment.md)). Publish as `SECURITY-SELF-ASSESSMENT.md` in repo. Include attack-surface diagram, trust boundaries, threat model, and known weaknesses with mitigation status. |
+| 2027 Q3 | Engage a **third-party audit** (e.g. Ada Logics with OSTIF funding, or NCC Group). Scope: core controllers, blockstor, custom scheduler, multi-tenancy boundaries, supply chain. Required for Graduated tier. |
+| 2027 Q4 | Publish audit results and remediation status. Triage findings into milestones. |
+
+#### Track 3.7 — EU Cyber Resilience Act (CRA)
+
+The CRA's reporting obligations apply from **11 September 2026**; full obligations from **11 December 2027**. Cozystack itself, as an OSS project, falls under the *open-source software steward* regime of CRA Article 24 ("Obligations of open-source software stewards"), not the *manufacturer* obligations. But downstream commercial vendors who package Cozystack are manufacturers. We document the project so that downstream compliance is tractable.
+
+| Quarter | Deliverables |
+|---|---|
+| 2026 Q3 | Publish a **`CRA-COMPLIANCE.md`** describing: (a) the project's status as an open-source software steward under Article 24, (b) the CVE coordinated-disclosure process aligning with CRA timelines (24h initial / 72h info / 14d final after fix or workaround for actively exploited issues), (c) SBOM availability per release. |
+| 2026 Q3 | Adopt **CSAF VEX** for vulnerability advisories. Publish each advisory as a CSAF JSON file alongside the GHSA. |
+| 2026 Q4 | SBOM in **SPDX** and **CycloneDX** formats published with every release; signed with cosign. |
+| 2027 Q1 | Document the **shared-responsibility matrix** between Cozystack maintainers and downstream commercial vendors for incident response. |
+| 2027 Q4 | Verify the disclosure pipeline against CRA timeline obligations with a tabletop exercise. |
+
+#### Track 3.8 — SOC 2 (Process Readiness, not Certification)
+
+An OSS project does not get SOC 2 itself — services do. We deliver a **process evidence pack** that any commercial Cozystack distributor can use in their own SOC 2 audit.
+
+| Quarter | Deliverables |
+|---|---|
+| 2027 Q1 | **SOC 2 Type I evidence pack** — `SOC2-EVIDENCE/` directory with: change-management policy, access-control policy for the GitHub org, incident-response runbook, vendor/dependency-management policy, backup/DR documentation, monitoring/audit-log policy. |
+| 2027 Q3 | **Type II evidence-collection automation** — GitHub Actions snapshot monthly evidence (permission grants, branch-protection state, release-signing logs, CVE triage decisions) to `SOC2-EVIDENCE/`. |
+| 2027 Q4 | Tabletop exercise with downstream Cozystack distributors to validate the evidence pack supports their audits. |
+
+#### Track 3.9 — PCI DSS v4.0.1 (Reference Architecture)
+
+A `PCI-DSS.md` reference architecture for deploying Cozystack as a CDE (Cardholder Data Environment).
+
+| Quarter | Deliverables |
+|---|---|
+| 2027 Q2 | Publish `reference-architectures/pci-dss-v4/` containing: network segmentation (Cilium NetworkPolicy + Kubernetes NetworkPolicy), MFA enforcement (OIDC config), audit-log architecture (Cozystack audit log + Loki + immutable retention), vulnerability-management workflow, secure-defaults documentation, key-management (External Secrets Operator + HashiCorp Vault / OpenBao), responsibility matrix. |
+| 2027 Q3 | Validate the reference architecture with a friendly PCI QSA review. |
+
+#### Track 3.10 — ISO/IEC 5230 (OpenChain) — License Compliance
+
+| Quarter | Deliverables |
+|---|---|
+| 2026 Q4 | **OpenChain self-certification** — `LICENSE-COMPLIANCE.md` documenting the project's SPDX-correct license metadata, third-party license inventory (auto-generated from `go.mod` and Helm chart dependencies), and license-clearing workflow for new dependencies. |
+| 2027 Q1 | Automated license-policy gate in CI (`fossa`/`scancode`). |
+
+#### Track 3.11 — Internal Security Programs
+
+**Vulnerability response.** Formalize the **Cozystack Security Response Team** with rotating on-call.
+
+- 2026 Q3: Publish private security mailbox (`security@cozystack.io`). Document SRT membership and rotation in `SECURITY.md`.
+- 2026 Q3: Publish **Vulnerability SLA**: triage in 3 business days, severity classification in 7, fix targets — critical 7d, high 30d, medium 90d, low 180d.
+- 2026 Q4: Embargo-policy document. Coordinated disclosure timeline default 90 days (subject to active exploitation override).
+- 2026 Q4: GitHub Security Advisories (GHSA) workflow documented and enforced. Each advisory mirrored to CVE and CSAF VEX.
+- 2027 Q1: Bug-bounty program scoped (low budget initially; community-funded via OSTIF / GitHub Sponsors).
+
+**Hardening defaults.**
+
+- 2026 Q4: All shipped images **distroless** or **scratch-based** where practical (#1261).
+- 2026 Q4: All shipped images run **non-root** and **read-only root FS**.
+- 2027 Q1: All shipped pods ship with **seccomp profiles** (RuntimeDefault minimum, custom restricted where feasible) and **AppArmor** policies.
+- 2027 Q2: All shipped controllers use **least-privilege ServiceAccounts** with explicit audit.
+- 2027 Q2: Cluster-wide default **NetworkPolicies** for the platform layer.
+- 2027 Q3: **mTLS** enforced between Cozystack components (Linkerd or Cilium service mesh, mode TBD).
+
+**Supply chain.**
+
+- 2026 Q3: All releases signed with **cosign** keyless OIDC.
+- 2026 Q4: All releases ship **SBOM** in SPDX and CycloneDX.
+- 2027 Q1: **Sigstore Rekor transparency log** entries for every release.
+- 2027 Q2: **Helm chart signing** for all charts shipped from cozystack org.
+- 2027 Q3: **Fuzzing** for security-sensitive components: REST parsers, CRD validators, controller reconcilers (oss-fuzz integration).
+
+#### Track 3.12 — Certifications Roll-up
+
+| Cert / Badge | 2026 Q3 | 2026 Q4 | 2027 Q1 | 2027 Q2 | 2027 Q3 | 2027 Q4 | 2028 Q1+ |
+|---|---|---|---|---|---|---|---|
+| OpenSSF Best Practices | Passing | — | — | Silver | — | Gold | — |
+| OSPS Baseline | L1 | L2 | — | L3 | maintain | maintain | maintain |
+| OpenSSF Scorecard | ≥ 6.0 | ≥ 7.0 | — | ≥ 8.0 | — | ≥ 9.0 | maintain |
+| SLSA Build | L1 | L2 | — | — | L3 | maintain | maintain |
+| CLOMonitor | all-green | maintain | maintain | maintain | maintain | maintain | maintain |
+| CNCF Self-Assessment | published | — | — | refresh | refresh | refresh | refresh |
+| CNCF Third-Party Audit | — | — | — | — | engage | publish | remediate |
+| EU CRA posture | docs+CSAF | SBOM live | shared-resp matrix | — | — | tabletop | maintain |
+| SOC 2 evidence | — | — | Type I pack | — | Type II auto | tabletop | maintain |
+| PCI DSS ref-arch | — | — | — | published | QSA review | — | — |
+| ISO 5230 (OpenChain) | — | self-cert | CI gate | — | — | — | — |
+
+### Track 4 — Storage Independence: blockstor (SIG-Storage)
+
+**Goal.** A Kubernetes-native, Go-native, community-governed block storage control plane, and long-term Cozystack's default replicated block storage.
+
+blockstor and cozyplane are governed **inside the existing Cozystack governance**, not as separate foundation projects: the contributor ladder, CLA, security process and release policy that apply to Cozystack apply to them unchanged. A separate CNCF submission for either component is explicitly out of scope for this horizon — it would add governance overhead without adding governance.
+
+Positioning: **not** "anti-LINSTOR". LINSTOR solved a real problem; the ecosystem needs a Go-native, Kubernetes-native, community-governed alternative. blockstor is built with LINSTOR REST API compatibility so existing clients (`linstor-csi`, `piraeus-operator`, `ha-controller`, `golinstor`) continue to work.
+
+| Quarter | Deliverables |
+|---|---|
+| 2026 Q3 | Feature-parity audit against LINSTOR. Conformance tests against `linstor-csi` and friends. Vanilla Kubernetes demo. |
+| 2026 Q4 | Pilot deployments on 3 production clusters in shadow mode (alongside LINSTOR, not replacing it). `cozystack-migrate-storage` tooling, **including the reverse path** — a backend nobody can migrate off is a backend nobody will adopt. Broaden the contributor base beyond a single maintainer before blockstor becomes load-bearing. |
+| 2027 Q1 | blockstor **alpha** in Cozystack 2.0 as an opt-in storage backend. LINSTOR remains the default; it is marked deprecated only once blockstor has production mileage and a working reverse migration. New blockstor capabilities: VDUSE backend, shared-LUN production mode, BYOK key rotation, snapshot shipping to S3-compatible storage. |
+| 2027 Q2 | Engagement with LINBIT: contribute back relevant fixes; align long-term coexistence story. **Required for CNCF vendor-neutrality posture.** |
+| 2027 Q3 | blockstor **beta** in Cozystack 2.1: dual-stack mode default, blockstor used for new installs unless opted out. Migration tooling tested at scale. Production-scale tests: ≥ 1000 PVs with DRBD replication, ≥ 100 TB shared storage. |
+| 2027 Q4 | Performance benchmarks vs LINSTOR published. DR documentation. Storage Conformance Suite v1. |
+| 2028 Q1–Q2 | blockstor **GA** in Cozystack 3.0. LINSTOR support enters legacy mode (security backports only). |
+
+### Track 5 — Host OS Strategy (SIG-OS)
+
+**Goal.** Reduce single-source dependency on Talos Linux without forking it into a standalone distribution prematurely. A full Linux distribution fork is a multi-year, multi-engineer investment that risks turning Cozystack into a distro vendor at the expense of being a platform standard.
+
+The correct sequence:
+
+1. Document the **`Host OS Contract`** — what Cozystack expects from any host OS (kernel modules, container runtime, kubelet, sysctl, networking, storage drivers, GPU drivers, secure-boot story, AppArmor/SELinux posture).
+2. Build a **Host Conformance Suite** so host profiles can be certified.
+3. Bring multiple host profiles (Talos, Ubuntu, Debian, kubeadm, k3s, RKE2) to production-quality.
+4. Talos stays a **first-class** profile; Sidero stays a partner.
+5. Fork Talos only if upstream blocks critical storage / GPU / kernel / security changes — and even then, fork *minimally*, upstream-first.
+
+| Quarter | Deliverables |
+|---|---|
+| 2026 Q3 | Publish `HOST-OS-CONTRACT.md`. OS Support Matrix (Tier-1 Talos production-supported; Tier-2 Ubuntu 24.04 / Debian 12 / Flatcar community-supported; Tier-3 RHEL 9 / Rocky 9 experimental). |
+| 2026 Q4 | Extract Talos-dependent services as standalone (continuing what `standalone-trustd` established). Targets: `standalone-machined-bootstrap`, `standalone-cluster-config`. |
+| 2027 Q1 | Partnership statement with Sidero on long-term collaboration (vendor-neutrality posture). |
+| 2027 Q2 | If partnership posture is not achievable, scope a minimal **cozyOS** image (Talos-derived, kept upstream-first, customized only via Talos extensions). |
+| 2027 Q4 | Public case studies for multi-OS production deployments. |
+| 2028 Q1+ | Decide whether cozyOS becomes a standalone effort. Only if all higher-priority tracks are stable. |
+
+### Track 6 — AI/ML Platform (SIG-AI)
+
+**Goal.** Cozystack as the open standard for running AI/ML workloads on private cloud and on-prem GPU clusters.
+
+| Quarter | Deliverables |
+|---|---|
+| 2026 Q3 | Submit Cozystack to the **CNAI Landscape** (Cloud Native AI). Release **cozyllm** under an open-source licence. Document the existing GPU-as-a-service path end to end — the capability is already in the platform and the gap is documentation, not code. |
+| 2026 Q4 | AI workload presets: `inference-bundle` (vLLM / SGLang / TensorRT-LLM), `rag-bundle`. Managed vector databases as first-class apps: Qdrant, pgvector. GPU sharing improvements (MIG, vGPU, time-slicing) in multi-tenant with per-tenant quotas. |
+| 2027 Q1 | **AI Platform MVP**: GPU inventory + GPU quotas, NVIDIA GPU Operator integration, topology-aware GPU scheduling, GPU billing metrics, model serving packages, model registry, S3/RWX dataset workflows. |
+| 2027 Q2 | **Inference Gateway** — OpenAI-compatible endpoint routing to Dynamo / vLLM / TRT-LLM under the hood, with token-level billing, rate limiting, model registry integration. Tenant-side GPU FinOps dashboard (token-time, GPU-time, KV-cache hits, prefill/decode split). |
+| 2027 Q3 | Agentic workload orchestration managed apps (Letta, AutoGen-class). Temporal as a managed app. Approved-model registry with signed-model provenance. |
+| 2027 Q4 | **AI Platform GA**: inference gateway, autoscaling, model lifecycle, private model registry, GPU pools, cost allocation, dataset versioning, secure model import, audit trails. Multi-modal support (video/audio generation workloads with scheduling profiles). |
+| 2028 Q1+ | Reference platform for NCP-aligned GPU cloud providers. |
+
+### Track 7 — AI Inside Cozystack (SIG-AI, AI-Ops sub-group)
+
+**Goal.** AI assists in operating the platform itself — read-only and human-approved first; gradually expand to safe auto-remediation.
+
+| Quarter | Deliverables |
+|---|---|
+| 2026 Q3 | Expand the `ccp` (Cozystack Claude Plugins) marketplace to 20+ plugins: `cozy-debug`, `cozy-cve-triage`, `cozy-perf-investigate`, `cozy-cost-optimize`, `cozy-capacity-plan`. |
+| 2026 Q4 | **Assistant inside the Cozystack dashboard**, able to run fully **self-hosted** against a local model — regulated environments frequently prohibit sending cluster state to an external provider, so an assistant that only works against a hosted API is unusable exactly where the platform is most valuable. `cozyhr` enhancement: LLM-powered Helm-value generation from natural language. |
+| 2027 Q1 | **`cozydoctor`** — built-in diagnostics service. Inputs: events, logs, metrics, HelmRelease states, WorkloadMonitor, cozyreport. Output: probable root cause + suggested next step. Read-only mode by default. |
+| 2027 Q2 | AI-powered alert routing and root-cause analysis: correlates Prometheus + Loki + Tempo into structured findings. Upgrade impact analyzer for risky packages, immutable fields, breaking changes. |
+| 2027 Q3 | Self-healing automation for documented patterns (DRBD split-brain, etcd disk pressure, image-pull backoff) — human-approval gate on every write action; audit log on every action. |
+| 2027 Q4 | Capacity planner: forecasts 3–6 months ahead, generates IaC PRs for capacity changes. |
+
+Guardrail: any write-action by AI assistance requires **explicit user approval** and is **audit-logged**.
+
+### Track 8 — Marketplace & Application Ecosystem (SIG-Apps)
+
+**Goal.** A controlled supply-chain layer, not a YAML storefront.
+
+| Quarter | Deliverables |
+|---|---|
+| 2026 Q3 | `ApplicationDefinition` schema v1: metadata, dependencies, compatibility matrix, version channels. Private OCI registry credentials support. UI catalog in `cozystack-ui`. |
+| 2026 Q4 | App certification test framework (basic conformance). Signed application packages (cosign). Publisher onboarding documentation. |
+| 2027 Q1 | **Marketplace alpha**, gated on the core / apps separation decision landing in 2026 Q4 — the packaging contract and the publisher path are the deliverable here, not the storefront: how a third party packages an application, how it is supported and updated, on what terms, and why it is safe to install. Retire the `extra` apps category by folding it into `apps`. **External Apps Program** — third-party orgs may publish via formalized submission and vetting. Target: 30 apps in marketplace. |
+| 2027 Q2 | Paid-app support for commercial publishers. Marketplace federation for private/enterprise instances. |
+| 2027 Q3 | Vulnerability scanning gates and SBOM publication for every marketplace app. App lifecycle hooks and upgrade policies. **Marketplace beta**. |
+| 2027 Q4 | Target: 100 apps. Sub-categories (AI/ML, Databases, Messaging, Observability, Security, Networking, DevTools). **Marketplace GA**. |
+| 2028 Q1–Q2 | Marketplace analytics (success rates, popular apps). **Certified Apps program** GA. |
+
+### Track 9 — Multi-Cluster & Federation (SIG-Network)
+
+**Goal.** Cozystack federation as a first-class concept — operating 10+ clusters as one platform.
+
+| Quarter | Deliverables |
+|---|---|
+| 2026 Q3 | `kilo-clustermesh-operator` GA. Documented use cases. Routed site-to-site IPsec gateway app (#3426) — connect a tenant network to external sites over a routed tunnel. |
+| 2026 Q4 | Multi-cluster `ApplicationDefinitions` — deploy an app to N clusters from one control point. |
+| 2027 Q1 | **Fleet API alpha**. Tenant-to-tenant allowlisted peering. Per-tenant podCIDR / serviceCIDR planning. Identity federation. |
+| 2027 Q2 | **Fleet beta**: cross-cluster mesh, global DNS, centralized policy, multi-cluster observability. Cross-cluster failover automation for stateless workloads. |
+| 2027 Q3 | Geo-distributed managed services: PostgreSQL multi-region active-passive; MongoDB sharded cross-cluster. Public reference architectures (multi-region). |
+| 2027 Q4 | **Fleet GA**. |
+| 2028 Q1+ | 100-cluster federation production case studies. |
+
+### Track 10 — Developer Experience & Reference Architectures (SIG-DX)
+
+**Goal.** Golden paths. Cozystack works "out of the box" for each named vertical.
+
+| Quarter | Deliverables |
+|---|---|
+| 2026 Q3 | Reference architectures published as `reference-architectures/`: GPU cloud provider, hosting provider, telco (5G CNF), fintech (PCI-aligned), research/HPC. **GitLab integration alpha** — GitLab as a first-class repository source for `Package` / `PackageSource` and tenant Helm releases (private repos, deploy tokens, group-level credentials). |
+| 2026 Q4 | **`cozystack` CLI 2.0** — single entry point replacing `make` + `kubectl` + `helm` patchwork, built on a shared Go library. **MCP server** over that same library, so platform operations are available to AI assistants without a second implementation. **GitLab OAuth handshake** at tenant level for self-service onboarding alongside the existing OIDC flow. **Air-gapped installation completed** — registry mirroring, image signatures preserved when images are re-baked into a private registry, and air-gapped tenant Talos clusters verified end to end. The base path shipped under #1243; these are the gaps that keep it from being usable in a regulated environment. |
+| 2027 Q1 | Backstage plugin for Cozystack. Crossplane Provider for Cozystack. **GitLab CI integration**: a managed-app **GitLab Runner** that tenants can deploy into their namespace for build pipelines, with per-tenant runner registration tokens and quota integration. |
+| 2027 Q2 | OpenTofu/Terraform provider. DORA metrics dashboard for tenants. **GitLab Container Registry and GitLab Helm Registry** supported as first-class sources for Marketplace `ApplicationDefinitions`, alongside OCI registries. |
+| 2027 Q3 | Sustainability/carbon metrics (Kepler integration). **Cozystack GitLab plugin** — GitLab CI components for `cozystack-deploy` and `cozystack-promote`, plus a GitLab-native view of tenant deployments. Symmetric work for GitHub Actions. |
+| 2027 Q4 | Migration playbooks: from OpenStack, from VMware, from legacy KVM. GitLab integration reaches GA. |
+
+### Track 11 — Ecosystem Standardization & Community (SIG-Governance)
+
+**Goal.** Turn Cozystack from "one organization makes the platform" into "ecosystem makes the standard". This is the strategic transformation without which the "Linux of platforms" goal cannot land.
+
+| Quarter | Deliverables |
+|---|---|
+| 2026 Q3 | Form SIGs (wave 1): SIG-Platform, SIG-Security, SIG-Docs — the three the Incubation review actually leans on. Biweekly meetings on a public calendar. |
+| 2026 Q4 | Form SIGs (wave 2): SIG-Testing, SIG-Storage, SIG-Network. |
+| 2027 Q1 | Form SIGs (wave 3): SIG-AI, SIG-Apps, SIG-DX, SIG-OS, SIG-Governance. A SIG is created when there is a maintainer to chair it and recurring work to own — creating eleven at once would produce eleven empty calendars. |
+| 2026 Q3 | Onboard 2+ maintainers from organizations other than the founding company. (CNCF Incubation expectation.) |
+| 2026 Q3 | **Community review process**: published rules for handling community pull requests, a weekly duty rotation so product understanding does not concentrate in one maintainer, an `in progress` label to prevent collisions, and a stated per-maintainer review norm. This is the mechanism behind the maintainer-diversity goal above, not a separate initiative — external contributors who wait months for a first response do not become maintainers. |
+| 2026 Q3 | **Adopter list ≥ 10** production adopters published in `ADOPTERS.md`. |
+| 2026 Q3 | **Submit CNCF Incubation application**. |
+| 2026 Q3 | Adopt a **Cozystack Enhancement Proposal (CzEP)** process modeled on KEP — status states, sponsorship, voting. The `cozystack/community/design-proposals/` directory becomes the canonical location. |
+| 2026 Q4 | Cozystack Annual Report 2026 published. Public quarterly roadmap reviews. |
+| 2027 Q1 | First **Cozystack Conference** (in-person or virtual). |
+| 2027 Q2 | **Cozystack Academy** — formal training modules, free tier on the website. |
+| 2027 Q3 | **Cozystack Admin Certification (CCA)** beta — testing & certification track. |
+| 2027 Q4 | **Cozystack Distribution Program** — third parties may build certified distributions (similar to Kubernetes Certified Distributions). |
+| 2028 Q1 | Begin work on **CNCF Graduation application**. |
+| 2028 Q2 | First public **vendor-neutrality dashboard** — commits-by-org, maintainers-by-org, releases-by-org transparency. |
+
+### Track 12 — Documentation, Website & Community Materials (SIG-Docs)
+
+**Goal.** A documentation, website, and content portfolio that matches the ambitions of the platform. Adopters, downstream commercial vendors, TOC reviewers, and conference attendees must each find what they need in less than two minutes.
+
+This track consolidates work across the [cozystack/website](https://github.com/cozystack/website) repository, in-tree documentation, reference architectures, compliance documents, marketing assets, training content, and event materials.
+
+#### 12.1 Website (cozystack.io)
+
+| Quarter | Deliverables |
+|---|---|
+| 2026 Q3 | Refresh top-level **information architecture**: clear paths for *adopters*, *contributors*, *commercial vendors*, *researchers*. Public `/roadmap` page that renders this `ROADMAP.md` plus a live view of Project V2 status. Project status badges (CNCF lifecycle, OpenSSF, OSPS Baseline, Scorecard, SLSA, CLOMonitor) in README and on site landing page. Lighthouse / Core Web Vitals audit, target ≥ 90 across categories. WCAG 2.2 AA accessibility audit. |
+| 2026 Q4 | **Adopters page** rendered from `ADOPTERS.md` with logo permissions tracked. **Resource library** section: whitepapers, reference architectures, case studies, comparison docs. Public **events / talks** calendar. **Search** powered by Algolia DocSearch (free for OSS) or self-hosted Meilisearch. Multi-language scaffolding (EN canonical; RU + DE + ZH-CN as community-driven translations). |
+| 2027 Q1 | **Marketplace storefront preview** — public-facing read-only view of the Marketplace catalog with filters, ratings, SBOM/signature badges. **Compliance & Security** dedicated section linking OSPS Baseline self-assessment, CNCF self-assessment, third-party audit results, EU CRA posture, SBOM downloads. |
+| 2027 Q2 | **Newsletter** with quarterly project updates. SEO programme — target Tier-1 keyword set (private cloud, Kubernetes-native PaaS, GitOps platform, AI infrastructure). Press / media kit at `/press`. |
+| 2027 Q3 | **Cozystack Academy** site (`learn.cozystack.io` or `/academy`) — free training tier launches here (paired with Track 11). |
+| 2027 Q4 | **Annual Report 2027** as a website-native experience, not just a PDF. Architecture-rebuild assessment — if Docsy is showing limits, prepare a migration plan. |
+| 2028 Q1+ | **Distribution Program** landing page with verified distribution list (paired with Track 2 Conformance). |
+
+#### 12.2 Technical Documentation
+
+| Quarter | Deliverables |
+|---|---|
+| 2026 Q3 | **Documentation Information Architecture v2** — reorganize around user journeys: *Get Started*, *Operate*, *Develop*, *Administer*, *Reference*, *Tutorials*, *Migrate*. **Versioned docs** per supported release line (the latest stable line and the previous one; future: stable / LTS / fast). |
+| 2026 Q3 | **Install & upgrade docs** brought to production quality for every supported host OS profile (Talos Tier-1; Ubuntu / Debian / Flatcar Tier-2). |
+| 2026 Q4 | **Auto-generated API reference** from CRDs and `cozystack-api` OpenAPI spec, published per release. Tested code samples — every code block in docs runs in CI against a live cluster, broken samples block release. |
+| 2026 Q4 | **Operator's Handbook** — production-grade runbook collection for common operations: cluster upgrades, tenant onboarding, backup restore, DR exercises, storage migration, network troubleshooting. |
+| 2027 Q1 | **Tutorials track** — minimum 15 narrated tutorials covering: first install, first tenant, deploying Postgres, deploying a VM, GPU workload, multi-cluster setup, OIDC integration, backup & restore drill, upgrading. Each tutorial is owned by an SME and reviewed quarterly. |
+| 2027 Q1 | **API Stability Policy** doc (referenced from Track 1) lands in `/docs/contributors/api-stability-policy`. |
+| 2027 Q2 | **Developer Guide** for Cozystack contributors: package authoring (`Package` / `PackageSource`), `ApplicationDefinition` authoring for Marketplace, controller-runtime patterns, testing patterns, release engineering. |
+| 2027 Q2 | **Troubleshooting Atlas** — visual decision tree mapping symptoms → likely causes → diagnostic commands → resolutions. Integrates with `cozydoctor` AI assistant (Track 7). |
+| 2027 Q3 | **Migration playbooks** in `/docs/migrate/`: from OpenStack, from VMware vSphere, from legacy KVM/libvirt, from Proxmox, from bare Kubernetes installations. Each playbook is end-to-end runnable and gated by integration tests. |
+| 2027 Q4 | **Docs translation pipeline** — community translation workflow with translation memory, glossary, and freshness tracking. Languages: RU, DE, ZH-CN (initial). |
+| 2028 Q1+ | Docs versioning consolidation: stable, LTS, and current; deprecated docs archived but discoverable. |
+
+#### 12.3 Reference Architectures (RAs)
+
+Reference architectures live in `reference-architectures/` and are published both in-repo and on the website. They are paired with each vertical defined in Track 10.
+
+| Quarter | Deliverables |
+|---|---|
+| 2026 Q3 | RA: **GPU Cloud Provider** (NCP-aligned). RA: **Hosting Provider** (multi-tenant with billing). RA: **Telco / 5G CNF**. RA: **Fintech / PCI-aligned**. RA: **Research & HPC**. Each RA includes architecture diagram, deployment YAMLs, scale envelope, security posture, total-cost-of-ownership notes. |
+| 2026 Q4 | RA: **Edge** (small clusters, intermittent connectivity, lightweight host OS). RA: **Government / Sovereign Cloud** (air-gap, audit, encryption-at-rest mandatory). |
+| 2027 Q1 | RA: **AI Inference Service Provider** (GPU pools, Inference Gateway, FinOps tenant view). RA: **Multi-Region Active-Passive**. |
+| 2027 Q2 | RA: **PCI DSS v4.0.1 CDE Deployment** (paired with Track 3.9). |
+| 2027 Q3 | RA: **Carbon-Optimized Workload Placement** (paired with Sustainability metrics in Track 10). |
+| 2027 Q4 | RA gallery refresh — case-study links and adopter testimonials per RA. |
+
+#### 12.4 Compliance & Process Documents
+
+Documents that ship in-repo and are kept current as Track 3 progresses.
+
+| Quarter | Deliverables |
+|---|---|
+| 2026 Q3 | `ROADMAP.md` (this document). `OSPS-BASELINE.md` self-assessment. `SECURITY-SELF-ASSESSMENT.md`. `CRA-COMPLIANCE.md`. `HOST-OS-CONTRACT.md` (paired with Track 5). Update `SECURITY.md` with private mailbox and Vulnerability SLA. |
+| 2026 Q4 | `LICENSE-COMPLIANCE.md` for OpenChain. `SBOM/` directory with SPDX + CycloneDX per release. **Cozystack Annual Report 2026** as PDF and web-native page. **Documented Release Engineering Handbook** for maintainers. |
+| 2027 Q1 | `SOC2-EVIDENCE/` evidence pack (paired with Track 3.8). **Shared Responsibility Matrix** for CRA compliance between maintainers and downstream commercial vendors. |
+| 2027 Q2 | `PCI-DSS.md` reference architecture doc with QSA-readability check. **Cozystack Enhancement Proposal (CzEP)** process documented in `community/design-proposals/process.md`. |
+| 2027 Q3 | **Threat Model** document published (`THREAT-MODEL.md`) — required for OpenSSF Gold and OSPS L3. |
+| 2027 Q4 | Third-party security audit findings published in `audits/` with remediation status. **Annual Report 2027**. |
+| 2028 Q1 | CNCF Graduation application drafted (paired with Track 11). |
+
+#### 12.5 Marketing & Sales-Enablement Materials
+
+Materials oriented to adopters, downstream commercial vendors, and TOC reviewers. Vendor-neutral language throughout.
+
+| Quarter | Deliverables |
+|---|---|
+| 2026 Q3 | **Technical whitepaper v1** — "Cozystack Platform Architecture" (~30 pages). **Comparison briefs**: vs OpenStack, vs VMware vCloud Director, vs OpenShift, vs Rancher, vs vanilla Kubernetes — each ~6 pages, factual and balanced. |
+| 2026 Q4 | **Security whitepaper** — "Securing Cozystack Deployments" covering hardening, supply chain, secrets, audit, tenant isolation. **TCO calculator** (interactive web page) with documented assumptions. **Vendor lock-in analysis** briefing. |
+| 2027 Q1 | **First case studies** — minimum five published case studies covering distinct verticals. Each ≥ 2,000 words, with adopter approval. **Pitch deck** template that adopters can reuse internally. |
+| 2027 Q2 | **AI Platform whitepaper** — "Cozystack as an AI/ML Platform" tied to Track 6 GA. **Multi-Cluster whitepaper** — tied to Track 9 Fleet beta. |
+| 2027 Q3 | **Cozystack Solution Guides** per vertical — GPU cloud, hosting, telco, fintech, research; each a polished web/PDF asset. |
+| 2027 Q4 | **Migration whitepapers** — "Migrating from VMware to Cozystack", "Migrating from OpenStack to Cozystack". Includes runtime/cost/risk comparisons. |
+| 2028 Q1+ | **Annual marketing review** — refresh whitepapers, retire stale comparisons, add Graduated-tier-relevant content. |
+
+#### 12.6 Cozystack Academy & Certification Content (with SIG-Governance)
+
+| Quarter | Deliverables |
+|---|---|
+| 2027 Q1 | **Academy curriculum design**: course tracks (Fundamentals, Administrator, Developer, Architect). Define learning objectives per track. |
+| 2027 Q2 | **Fundamentals course** GA — free tier. Video + text + interactive labs (using something like Killercoda or self-hosted equivalents). |
+| 2027 Q3 | **Administrator course** GA. **Cozystack Admin Certification (CCA) beta** — exam blueprint, sample questions, proctoring vendor selection. |
+| 2027 Q4 | **Developer course** GA. CCA exam delivery infrastructure live. |
+| 2028 Q1 | **Architect course** GA. CCA certification GA. Discussion on a Foundation-recognized credential program (parallel to CKA/CKAD/CKS). |
+
+#### 12.7 Press, Brand & Visual Identity
+
+| Quarter | Deliverables |
+|---|---|
+| 2026 Q3 | **Brand kit** published at `/press` — logo variants (light/dark/mono), color palette, typography, usage guidelines, downloadable in SVG/PNG/PDF. Approved-use cases for downstream distributions documented. **Trademark policy** clarified in line with CNCF norms. |
+| 2026 Q4 | **Press kit** — boilerplate, leadership bios, fact sheet, contact channels. Press release templates for releases and milestones. |
+| 2027 Q1 | **Conference materials pack** — booth backdrop, slide decks, one-pagers, demo flow scripts, swag-design guidelines (community-funded swag). |
+| 2027 Q2 | **Video assets**: 2-minute project explainer, 5-minute architecture deep-dive, vertical demo videos (one per RA). |
+| 2027 Q3 | **Style guide v2** — synchronized brand evolution as the project enters Marketplace GA and AI Platform GA phases. |
+| 2027 Q4 | **Annual Report 2027** visuals — infographic-quality summary of project metrics, contributor growth, adopter logos. |
+
+## 6. Cozystack Conformance Program
+
+The capstone deliverable of the two-year plan. Run by SIG-Testing and SIG-Governance jointly.
+
+Four certifications:
+
+- **Certified Cozystack Provider** — a deployment passes the Conformance Suite end-to-end on the provider's environment.
+- **Certified Cozystack App** — a marketplace application meets app conformance (schema, signed artifacts, SBOM, lifecycle hooks, supported upgrade paths).
+- **Certified Storage Backend** — a CSI-compatible storage backend passes the Storage Conformance Suite.
+- **Certified Host OS** — a host OS profile passes the Host Conformance Suite.
+
+Initial public versions land in 2028 Q1–Q2.
+
+## 7. SIG Formation Timeline
+
+SIGs are formed in three waves:
+
+- **Wave 1 (2026 Q3):** SIG-Platform, SIG-Security, SIG-Docs. We consider these necessary to have in place before the Incubation review.
+- **Wave 2 (2026 Q4):** SIG-Testing, SIG-Storage, SIG-Network.
+- **Wave 3 (2027 Q1):** SIG-AI, SIG-Apps, SIG-DX, SIG-OS, SIG-Governance.
+
+A SIG is formed when two conditions hold: a maintainer is willing to chair it, and there is recurring work for it to own. Standing up all eleven on one date would produce eleven empty calendars and a worse signal to a reviewer than three that meet.
+
+Each SIG owns an area of the roadmap, holds a public weekly or biweekly meeting, maintains a charter in `community/sigs/<sig-name>/charter.md`, and reports to the maintainer group quarterly.
+
+## 8. Standardization Strategy
+
+Cozystack's long-term ambition — to become the open standard platform layer for building clouds — cannot be achieved by writing better software alone. Categories are defined by **specifications, not implementations**. Linux became Linux because of POSIX, LSB, FHS, and stable kernel ABIs that allowed distributions to multiply. Kubernetes became Kubernetes because of OCI, CRI, CSI, CNI, the Operator pattern, and a Conformance Program that distinguished compliant distributions from incompatible ones. Docker actually contributed its reference implementations to the community — containerd to the CNCF and runc to the OCI — yet Docker Engine still lost the Kubernetes runtime slot, because it never implemented the CRI interface and dockershim was eventually removed. The lesson is consistent: own the specification, let the ecosystem own the implementations.
+
+This section enumerates the specifications Cozystack should define and own, the specifications Cozystack should adopt and champion, the bodies it should engage with, the distinguishing artifacts that should become the "Cozystack way," and the adoption playbook required for any of this to matter.
+
+The work in this section is **cross-cutting** — it touches every track in §5. SIG-Governance is the primary owner, with each named SIG taking co-ownership of the spec relevant to its area.
+
+### 8.1 Specifications Cozystack Should Define and Own
+
+These are interfaces where no widely adopted standard exists today and where Cozystack is well positioned to draft, publish, and shepherd one through a standards body. Each spec is intended to follow this lifecycle: **CzEP draft → published spec in `cozystack/community/specs/` → submitted to a standards body → adopted by at least two independent implementations → ratified**.
+
+#### 8.1.1 Cozystack Package API (`CP-API`)
+
+**What.** A formal, vendor-neutral specification for cloud-native managed applications, formalizing the `Package`, `PackageSource`, and `ApplicationDefinition` constructs that already exist in Cozystack core. Covers schema, lifecycle hooks, compatibility metadata, SBOM references, signature requirements, version channels, dependency declarations, and upgrade semantics.
+
+**Why a standard is needed.** Helm Charts solve the templating problem but not the lifecycle problem; Operators solve the lifecycle problem but not the catalog problem. The Marketplace category is fragmented across ApplicationDefinitions, OperatorHub, Helm Hub, and proprietary catalogs. A unified, signed, conformance-testable application manifest is a missing layer.
+
+**Reference implementation.** Cozystack core (`cozystack-operator`, `cozystack-controller`, `cozyhr`).
+
+**Target venue.** CNCF TAG Workloads Foundation as a draft spec; long-term, a CNCF-hosted sub-project (sibling to OCI / SLSA).
+
+**Timeline.**
+
+| Quarter | Milestone |
+|---|---|
+| 2026 Q4 | First public CzEP draft of CP-API v0.1. |
+| 2027 Q1 | Submit to CNCF TAG Workloads Foundation for community review. |
+| 2027 Q2 | Conformance test suite for CP-API published. |
+| 2027 Q4 | Second independent implementation lands (target: a Marketplace partner). |
+| 2028 Q2 | CP-API v1.0 ratified. |
+
+#### 8.1.2 Cloud Tenant API (`CT-API`)
+
+**What.** A specification for what it means to be an isolated tenant on a Kubernetes-based platform. Defines the composition of namespace, NetworkPolicy, RBAC, ResourceQuota, scheduling boundaries, audit context, and identity binding required to constitute a "tenant" with explicit isolation guarantees.
+
+**Why a standard is needed.** Every multi-tenant platform — vCluster, Kamaji, Capsule, HNC, Rancher Projects, OpenShift Projects — defines tenancy slightly differently. There is no portable answer to "is workload X isolated from workload Y in tenant Z." Cross-platform tenancy assurances matter for compliance auditors, for regulated industries, and for service providers who need to express tenant boundaries in contracts.
+
+**Reference implementation.** Cozystack `tenant` core package plus Cilium-based network isolation.
+
+**Target venue.** Kubernetes SIG Auth (multi-tenancy) and CNCF TAG Workloads Foundation co-sponsorship.
+
+**Timeline.**
+
+| Quarter | Milestone |
+|---|---|
+| 2027 Q1 | First public CzEP draft of CT-API v0.1. |
+| 2027 Q2 | Engagement with Kubernetes SIG Auth (multi-tenancy) upstream. |
+| 2027 Q3 | Conformance assertions integrated into the Cozystack Conformance Suite. |
+| 2028 Q1 | Second independent implementation lands. |
+
+#### 8.1.3 Host OS Contract (`HOC`)
+
+**What.** A specification of what a platform requires from its host operating system: kernel modules, container runtime, kubelet configuration, sysctl set, secure-boot expectations, AppArmor/SELinux/seccomp posture, networking stack (eBPF features, kernel version floor), storage drivers (DRBD, ZFS, LVM), GPU drivers and CDI compliance, observability surface (`/proc`, `/sys` access), and bootstrapping interface.
+
+**Why a standard is needed.** Today every Kubernetes platform implicitly ties to one or two host OS distributions. A formal contract enables **multi-OS support** as a first-class property, not a porting project. It also allows host OS distributions (Talos, Flatcar, Bottlerocket, Ubuntu Server, openSUSE MicroOS) to validate themselves against the contract.
+
+**Reference implementation.** Cozystack host OS profiles (Talos Tier-1; Ubuntu/Debian/Flatcar Tier-2).
+
+**Target venue.** CNCF TAG Infrastructure; engagement with Sidero (Talos), Flatcar (Kinvolk / Microsoft), Amazon (Bottlerocket), and Canonical (Ubuntu) for co-authorship.
+
+**Timeline.**
+
+| Quarter | Milestone |
+|---|---|
+| 2026 Q3 | `HOST-OS-CONTRACT.md` v0.1 published in-repo (paired with Track 5). |
+| 2026 Q4 | Host Conformance Suite v0.1. |
+| 2027 Q1 | Co-author engagement with at least two host OS vendor projects. |
+| 2027 Q3 | Submit as a draft CNCF specification. |
+| 2028 Q1 | First non-Cozystack platform adopts HOC. |
+
+#### 8.1.4 GitOps Engine Interface (`GEI`)
+
+**What.** An abstraction layer above specific GitOps engines (Flux, Argo CD), modeled on how CRI abstracted Kubernetes from container runtimes. Defines the contract a platform expects from its GitOps engine: package reconciliation, drift detection, source authentication, signed-manifest verification, dependency ordering, status reporting, and upgrade semantics.
+
+**Why a standard is needed.** Enterprises standardize on one GitOps engine and rarely switch. A platform locked to one engine forces a binary adoption decision. GEI allows platforms (Cozystack, OpenShift GitOps, Rancher Fleet, kubectl-only deployments) to express the same intent across engines, and lets engines evolve independently.
+
+**Reference implementation.** Cozystack's planned GitOps Engine Abstraction CzEP (Track 1, 2026 Q3).
+
+**Target venue.** OpenGitOps Working Group (CNCF App Delivery), with co-authorship from Flux and Argo maintainers.
+
+**Timeline.**
+
+| Quarter | Milestone |
+|---|---|
+| 2026 Q3 | CzEP draft of GEI v0.1 (paired with Track 1). |
+| 2026 Q4 | Engagement with Flux and Argo maintainer groups. |
+| 2027 Q2 | GEI v0.1 supports both Flux and Argo CD as Cozystack engines. |
+| 2027 Q4 | Submit to OpenGitOps WG as a community spec. |
+
+#### 8.1.5 Fleet API (Multi-Cluster Federation)
+
+**What.** A federation API that abstracts multi-cluster lifecycle, identity, networking, policy, and observability into a single declarative surface. Tenant boundaries traverse clusters; applications declare cluster placement constraints; policies federate; observability federates.
+
+**Why a standard is needed.** Multi-cluster solutions today (Karmada, Open Cluster Management, Liqo, KubeFed legacy, Rancher Fleet, ArgoCD ApplicationSets) overlap in scope but do not interoperate. A federation landscape with no shared interface forces enterprises to commit to one vendor's multi-cluster vision.
+
+**Reference implementation.** Cozystack `Fleet API` planned for Track 9 (2027 Q1 alpha → 2027 Q4 GA).
+
+**Target venue.** Kubernetes SIG Multicluster co-sponsored with CNCF TAG Workloads Foundation.
+
+**Timeline.**
+
+| Quarter | Milestone |
+|---|---|
+| 2027 Q1 | Fleet API v0.1 alpha published; CzEP draft. |
+| 2027 Q2 | Engagement with Karmada, OCM, and Liqo maintainer groups for harmonization. |
+| 2027 Q3 | Submit to Kubernetes SIG Multicluster. |
+| 2028 Q1 | Fleet API v1.0 — Cozystack GA implementation plus one other independent implementation. |
+
+#### 8.1.6 Cloud-Native AI Inference Gateway (`CN-AI-Inference`)
+
+**What.** A specification for an AI inference gateway abstracting model serving engines (vLLM, SGLang, TensorRT-LLM, Dynamo, Triton) behind a unified API surface. Includes OpenAI-compatible endpoints, token-level metering, multi-model routing, model-registry binding, and FinOps metric emission.
+
+**Why a standard is needed.** Every AI inference service today re-implements the same gateway: rate limiting, token counting, model selection, routing to the appropriate engine. There is no portable contract for what "an inference endpoint" means at platform level.
+
+**Reference implementation.** Cozystack Inference Gateway (Track 6, planned 2027 Q2).
+
+**Target venue.** CNCF CNAI Working Group, MLCommons engagement.
+
+**Timeline.**
+
+| Quarter | Milestone |
+|---|---|
+| 2026 Q4 | Engagement with CNAI WG; submit Cozystack to CNAI Landscape (Track 6 2026 Q3). |
+| 2027 Q2 | CN-AI-Inference v0.1 alpha spec published. |
+| 2027 Q3 | Working group draft submitted to CNCF CNAI WG. |
+| 2027 Q4 | Reference implementation GA in Cozystack. |
+| 2028 Q2 | Second independent implementation lands. |
+
+#### 8.1.7 Block Replication CSI Extension (`BR-CSI`)
+
+**What.** An extension to the CSI specification covering replicated block storage semantics: replication topology, peer discovery, failover, quorum, split-brain resolution, snapshot replication, and disaster recovery coordination. blockstor's LINSTOR-compatible REST API is a starting point; a portable CSI extension is the destination.
+
+**Why a standard is needed.** Replicated block storage today is vendor-specific (LINSTOR/DRBD, Portworx, OpenEBS Mayastor, Ceph RBD with mirroring). Migration between storage vendors requires re-architecting the application's storage assumptions. A CSI extension lets platforms express replication requirements portably.
+
+**Reference implementation.** Cozystack `blockstor` (paired with Track 4).
+
+**Target venue.** Kubernetes SIG Storage, CSI specification sub-project.
+
+**Timeline.**
+
+| Quarter | Milestone |
+|---|---|
+| 2027 Q2 | First public BR-CSI v0.1 draft. |
+| 2027 Q3 | Engagement with Ceph CSI, Portworx, OpenEBS, LINBIT maintainer groups. |
+| 2027 Q4 | Submit to SIG Storage as a CSI extension proposal. |
+| 2028 Q2 | First non-blockstor implementation lands. |
+
+#### 8.1.8 Tenant FinOps API
+
+**What.** A specification for per-tenant resource accounting and chargeback, including CPU-seconds, memory-byte-seconds, storage-IOPS-seconds, network-bytes, GPU-time, AI token-time, KV-cache hits, image-pull bytes, and other dimensions relevant for multi-tenant platforms. Schema is emit-friendly (OpenTelemetry-compatible) and consumption-friendly (OpenCost-compatible).
+
+**Why a standard is needed.** FinOps in multi-tenant Kubernetes is fragmented: OpenCost handles workload-level cost, Kubecost overlays UI, but per-tenant attribution at the AI-inference and GPU-time level is unspecified. Service providers each invent a metering schema.
+
+**Reference implementation.** Cozystack S3 metering (1.3) plus planned Tenant FinOps view (Track 6 2027 Q2).
+
+**Target venue.** FinOps Foundation Open Source Working Group, OpenCost sub-project.
+
+**Timeline.**
+
+| Quarter | Milestone |
+|---|---|
+| 2027 Q2 | First public Tenant FinOps API v0.1 draft. |
+| 2027 Q3 | Engagement with OpenCost, Kubecost, and FinOps Foundation. |
+| 2027 Q4 | Submit as a working draft to FinOps Foundation OSS WG. |
+| 2028 Q1 | Reference implementation in Cozystack GA. |
+
+### 8.2 Specifications Cozystack Adopts and Champions
+
+These are existing standards where Cozystack's role is to be a visible, high-fidelity adopter and a vocal advocate. Adoption signals that the standards are production-ready; advocacy ensures the standards continue to evolve in a direction Cozystack benefits from.
+
+| Standard | Domain | Status in Cozystack | Engagement Action |
+|---|---|---|---|
+| **OCI (Image, Distribution, Runtime, Artifacts)** | Container packaging | Adopted via container ecosystem | Use OCI Artifacts for `ApplicationDefinition` packaging. |
+| **CSI** (Container Storage Interface) | Storage | Adopted; extended via BR-CSI (§8.1.7) | Active SIG Storage participation. |
+| **CNI** (Container Network Interface) | Networking | Adopted via Cilium | Cilium maintainer engagement. |
+| **CDI** (Container Device Interface) | Device sharing | Adopted via Talos 1.13 default | Use for first-class GPU device sharing. |
+| **Kubernetes Gateway API** | Ingress next-gen | `gateway-api-crds` in `packages/system`; needs roll-out | Move tenant ingress to Gateway API as default by 2027 Q2. |
+| **MCS-API** (Multi-Cluster Services) | Cross-cluster services | Beta in Cilium since ~1.17–1.18 | Adopt once the platform's Cilium baseline reaches a release with stable MCS-API support. |
+| **OpenAPI 3.1** | API specs | Adopted for `cozystack-api` | Auto-publish per release (paired with Track 12.2). |
+| **OpenTelemetry** | Observability | Partially adopted (metrics) | Extend to traces and logs by 2027 Q1. |
+| **CloudEvents** | Event-driven workflows | Not adopted | Adopt for Marketplace lifecycle hooks by 2027 Q1. |
+| **PROXY protocol v2** | Reverse-proxy passthrough | Adopted via `ouroboros` | Maintain. |
+| **SLSA** (Build Levels) | Supply-chain integrity | Roadmap Track 3.4 | Target Build L3 by 2027 Q3. |
+| **OSPS Baseline** | Security maturity | Roadmap Track 3.2 | Target L3 by 2027 Q2. |
+| **CSAF VEX** | Vulnerability disclosure | Roadmap Track 3.7 | Adopt by 2026 Q3. |
+| **SPDX + CycloneDX** | SBOM formats | Roadmap Track 3.11 | Publish both per release. |
+| **Sigstore (cosign, Rekor, Fulcio)** | Signing & transparency | Adopted for releases | Extend to all `ApplicationDefinitions`. |
+| **OpenSSF Best Practices Badge** | Security hygiene | Roadmap Track 3.1 | Target Gold by 2027 Q4. |
+| **OpenSSF Scorecard** | Automated security | Roadmap Track 3.3 | Target ≥ 9.0 by 2027 Q4. |
+| **OpenChain ISO/IEC 5230** | License compliance | Roadmap Track 3.10 | Self-certify 2026 Q4. |
+| **DCO** (Developers Certificate of Origin) | Contribution licensing | Adopted | Maintain. |
+| **OpenAI API compatibility** | AI inference endpoints | Roadmap Track 6 | Inference Gateway target compatibility level Q2 2027. |
+| **MLCommons Inference benchmarks** | AI workload measurement | Not adopted | Publish Cozystack benchmark profiles by 2027 Q4. |
+| **CIS Kubernetes Benchmark** | Hardening | Partial via Talos defaults | Publish Cozystack-specific CIS profile by 2027 Q1. |
+| **CRA reporting timelines** | Vulnerability response | Roadmap Track 3.7 | Operate by 2026 Q3. |
+
+### 8.3 Industry Bodies, Working Groups, and Engagement Plan
+
+Standards engagement is people work. Each body listed below needs a designated Cozystack representative who attends meetings, contributes proposals, and reports back to the maintainer group.
+
+#### Tier 1 — Engage immediately (H2 2026)
+
+| Body / Group | Why | Cozystack role |
+|---|---|---|
+| **CNCF TAG Workloads Foundation** | Successor to TAG App Delivery; owns app-delivery / GitOps patterns; CP-API, GEI, CT-API venues. | Submit proposals; nominate a Cozystack representative. |
+| **CNCF TAG Security and Compliance** | Owns self-assessments, third-party audit framework. | Run self-assessment; engage on threat-model reviews. |
+| **CNCF TAG Infrastructure** (storage) | Owns storage / CSI sub-project evolution. | Engage on BR-CSI (§8.1.7) and blockstor sub-project. |
+| **CNCF TAG Infrastructure** (networking) | Owns CNI, Gateway API, multi-cluster networking. | Engage via Cilium and kilo-clustermesh-operator. |
+| **CNCF CNAI Working Group** | Owns Cloud Native AI landscape and standards. | CN-AI-Inference (§8.1.6); submit to CNAI landscape (Track 6 Q3 2026). |
+| **Kubernetes SIG Multicluster** | Owns multi-cluster harmonization. | Fleet API (§8.1.5); harmonization with Karmada/OCM/Liqo. |
+| **OpenSSF** | Owns Best Practices, Scorecard, OSPS Baseline. | Cozystack as OpenSSF-member project; quarterly status reports. |
+| **OpenChain Project** | Owns ISO/IEC 5230 license compliance. | Self-certify (Track 3.10 2026 Q4). |
+| **Kubernetes SIG Auth** | Owns AuthN/AuthZ and multi-tenancy discussions (wg-multitenancy was archived in 2023). | CT-API (§8.1.2) engagement. |
+
+#### Tier 2 — Engage from H1 2027
+
+| Body / Group | Why | Cozystack role |
+|---|---|---|
+| **Kubernetes SIG Storage** | Owns CSI specification evolution. | BR-CSI extension proposal. |
+| **Kubernetes SIG Release** | Owns Kubernetes release / deprecation cadence. | Track upstream deprecations affecting Cozystack support matrix. |
+| **OpenGitOps Working Group** | Owns GitOps principles and patterns. | GEI (§8.1.4); engage with Flux and Argo maintainers. |
+| **FinOps Foundation OSS WG** | Owns OpenCost; vendor-neutral FinOps. | Tenant FinOps API (§8.1.8). |
+| **MLCommons** | Owns AI/ML benchmarks. | Inference benchmark publication. |
+| **OASIS CSAF Technical Committee** | Owns CSAF / VEX format. | Adopt and contribute back. |
+| **Sigstore Community / Cosign WG** | Owns signing primitives. | Cozystack as visible adopter; SLSA Build L3 work. |
+| **CNCF TAG Operational Resilience** | Owns efficiency / green posture (energy, cost, sustainability). | Carbon metrics (Track 10 2027 Q3); Kepler integration. |
+
+#### Tier 3 — Engage from H2 2027
+
+| Body / Group | Why | Cozystack role |
+|---|---|---|
+| **IETF** | Owns network protocols (if BR-CSI or Fleet API touch network protocols). | Conditional on standards needing protocol drafts. |
+| **NIST** (U.S.) | Cloud security frameworks (SP 800-53, 800-190). | Cozystack-specific guidance documents. |
+| **ENISA / BSI (EU and Germany)** | EU CRA, sovereign cloud, C5. | Engagement around EU CRA compliance posture (Track 3.7). |
+| **DMTF** | Data center management standards (Redfish, etc.). | Conditional on hardware integration depth. |
+
+### 8.4 Distinguishing Artifacts — The "Cozystack Way"
+
+A category is also defined by a few visible artifacts that become synonymous with the category. Linux has `/etc`, `ELF`, `Makefile`, `grep | awk | sed`. Kubernetes has `kubectl apply -f`, `Pod`, `Service`, `Operator`. Docker had `Dockerfile`. Cozystack needs three to five such recognizable artifacts.
+
+Candidate artifacts:
+
+| Artifact | What it stands for | Why it differentiates |
+|---|---|---|
+| **`ApplicationDefinition`** | The Cozystack equivalent of "what a managed cloud-native app is." | If CP-API succeeds, "ApplicationDefinition" enters industry vocabulary as the signed, conformance-tested app manifest. |
+| **`Package` / `PackageSource`** | The Cozystack package model, decoupled from Helm rendering. | Eliminates the `helm template lookup` race-condition class. Recognizable as "the Cozystack package model." |
+| **`Tenant`** as a first-class CRD | The Cozystack tenancy model with explicit isolation guarantees. | If CT-API succeeds, "tenant" gains a portable meaning. |
+| **`cozystack` CLI** | The primary user surface — single entry point. | Replaces `kubectl + helm + make` patchwork; recognizable Cozystack-ism. |
+| **`cozydoctor`** | Built-in AI-assisted diagnostics. | Distinctive UX; pairs Cozystack with AI-assisted operations narrative. |
+| **Cozystack Certified badges** | Visible certification marks: Certified Provider / App / Storage / OS. | Forces ecosystem to express "Cozystack-compatible" as a verifiable claim. |
+| **Cozystack Federation** | Single control plane across many clusters, via Fleet API. | If Fleet API succeeds, "federation" gains a portable meaning. |
+
+Each artifact should be referenced consistently across:
+
+- The website (`cozystack.io`).
+- The documentation site.
+- All conference talks.
+- All whitepapers, briefs, and case studies.
+- The brand kit (Track 12.7) — visual treatment of `cozystack` typography and badge marks.
+
+### 8.5 Adoption Playbook
+
+Specifications without adopters are paper. Without an adoption playbook, the work in §8.1–8.4 produces well-written documents that no one implements. This playbook covers the marketing, partner, and ecosystem work required for the specifications to be picked up.
+
+#### 8.5.1 Conference and event circuit
+
+| Event | Cadence | Target Cozystack presence |
+|---|---|---|
+| KubeCon + CloudNativeCon North America | Annual (Nov) | Minimum 2 accepted talks; sponsor booth from 2027. |
+| KubeCon + CloudNativeCon Europe | Annual (Mar) | Minimum 2 accepted talks. |
+| CloudFest (Europe) | Annual (Mar) | Hosting/service-provider audience; minimum 1 talk. |
+| CloudFest Americas | Annual (Nov) | Service-provider audience; minimum 1 talk. |
+| Open Source Summit Europe / NA | Annual | Standards-track engagement. |
+| FOSDEM | Annual (Feb) | Maintainer-track talks. |
+| SREcon | Annual | Operations-narrative engagement. |
+| KubeVirt Summit | Annual | VM workload narrative. |
+| AI Infra Summit / NeurIPS systems track | Annual | AI Platform narrative; AI inference benchmarks. |
+| Cozystack Conference | Annual (first event 2027 Q1, Track 11) | Project's own flagship event. |
+
+Target: **a minimum of 12 accepted talks per calendar year** across the above events, across diverse contributor organizations.
+
+#### 8.5.2 Hardware vendor program
+
+A "Tested on Cozystack" certification program for hardware platforms. Modeled on the Linux Foundation's "Tested with Linux" certifications and the Red Hat Certified Hardware program.
+
+| Quarter | Deliverables |
+|---|---|
+| 2027 Q1 | Hardware Compatibility Lab established (initially a Cozystack-hosted lab; eventually federated). Test profiles for bare-metal servers, network switches, GPUs. |
+| 2027 Q2 | Initial vendor engagements: Dell PowerEdge, HPE ProLiant, Supermicro, Lenovo ThinkSystem, GIGABYTE. NVIDIA NCP Reference Platform validation pipeline. |
+| 2027 Q3 | Public Hardware Compatibility List (HCL). |
+| 2027 Q4 | At least 20 certified hardware configurations across 3+ vendors. |
+| 2028 Q1+ | Storage vendor certifications (VAST, WEKA, DDN, Pure) and network vendor certifications (Arista, Cisco Nexus, Broadcom, Mellanox/NVIDIA Networking). |
+
+#### 8.5.3 Host OS distribution program
+
+Co-publish Host OS profiles with major Linux distributions, validating against the Host OS Contract (§8.1.3).
+
+| Quarter | Deliverables |
+|---|---|
+| 2026 Q4 | Talos profile co-signed with Sidero. Initial engagement with Flatcar (Kinvolk / Microsoft), Ubuntu (Canonical), openSUSE MicroOS, Bottlerocket (Amazon). |
+| 2027 Q2 | Ubuntu 26.04 LTS profile co-published with Canonical. |
+| 2027 Q3 | Flatcar profile co-published. openSUSE MicroOS profile. |
+| 2027 Q4 | Bottlerocket profile (if engagement with Amazon succeeds). |
+
+#### 8.5.4 Hyperscaler and provider engagement
+
+Long-term, "Linux of platforms" requires managed Cozystack instances from multiple service providers — analogous to managed Kubernetes from every cloud.
+
+| Quarter | Deliverables |
+|---|---|
+| 2027 Q3 | Engagement with European service providers (Hetzner, OVH, Scaleway, IONOS) for managed Cozystack offerings. |
+| 2027 Q4 | Hyperscaler engagement: AWS Marketplace listing; GCP Marketplace listing; Azure Marketplace listing. |
+| 2028 Q1+ | First managed Cozystack from a hyperscaler (target: a sovereign-cloud focused European provider). |
+
+#### 8.5.5 Certification and labor market
+
+Certified Kubernetes Administrator (CKA) created the K8s skill labor market. Cozystack Admin Certification (CCA) does the same for Cozystack.
+
+| Quarter | Deliverables |
+|---|---|
+| 2027 Q3 | CCA beta (paired with Track 11 and Track 12.6). |
+| 2027 Q4 | CCA GA. Recruiter outreach: include "Cozystack" in keyword sets used by major IT recruiters. |
+| 2028 Q1+ | Cozystack Certified Developer (CCD) and Cozystack Certified Architect (CCAr) exam tracks. |
+| 2028 Q2 | Job-board partnerships: LinkedIn / Indeed / Stack Overflow Talent recognized skill tags. |
+
+#### 8.5.6 Academic and research engagement
+
+| Quarter | Deliverables |
+|---|---|
+| 2027 Q1 | Academic partnership: at least one university course incorporates Cozystack. |
+| 2027 Q3 | First peer-reviewed paper using Cozystack as research substrate (private cloud, sovereign cloud, or AI infrastructure research). |
+| 2028 Q1+ | Cozystack Research Grants — small grants (community-funded) for academic projects on Cozystack. |
+
+#### 8.5.7 Regulatory and government engagement
+
+| Quarter | Deliverables |
+|---|---|
+| 2027 Q2 | EU CRA dialogue engagement via OpenSSF policy WG. |
+| 2027 Q3 | GAIA-X / IPCEI-CIS alignment statement — Cozystack as candidate sovereign-cloud platform. |
+| 2027 Q4 | US FedRAMP pre-readiness assessment for downstream commercial offerings. |
+| 2028 Q1+ | Engage with national clouds: Spain ENS, Germany BSI C5, France SecNumCloud, Italy AGID, India MeitY empanelment criteria. |
+
+#### 8.5.8 Vendor-neutrality transparency
+
+Standards adoption is undermined by perceived single-vendor concentration. The vendor-neutrality dashboard (Track 11 2028 Q2) must launch as a **public** artifact, not an internal metric.
+
+| Metric | Source | Cadence |
+|---|---|---|
+| Commits by organization | GitHub API | Monthly |
+| Maintainers by organization | `MAINTAINERS.md` | Per change |
+| Releases by organization (release lead) | Release tagging | Per release |
+| Working group chairs by organization | SIG charters | Per change |
+| Conference talks by organization | Talk tracker | Quarterly |
+| External adopters in production | `ADOPTERS.md` | Per change |
+
+### 8.6 Annual Standardization Review
+
+Each Q1, the maintainer group conducts a public **Standardization Review**:
+
+- For each spec in §8.1: status (draft / submitted / under review / adopted / second-implementation), blockers, owner SIG.
+- For each Tier 1/2/3 body in §8.3: engagement state, designated representative, last activity, action items.
+- For each distinguishing artifact in §8.4: visibility check (does it appear in talks, docs, brand assets?).
+- For the adoption playbook in §8.5: progress on hardware program, OS program, hyperscaler engagement, certification numbers, academic and regulatory traction.
+
+Output: a public **Standardization Review YYYY** document published alongside the Annual Report (Track 12.4). The first review lands in **2027 Q1**.
+
+### 8.7 Summary: What Determines Whether Cozystack Becomes a Standard
+
+The single hardest question in this document. The honest answer is that no list of activities guarantees standardhood. What the evidence from Linux, Kubernetes, and the OCI/CRI transition does suggest:
+
+1. **Specifications are owned by neutral bodies, not by the project.** Cozystack must be willing to relinquish the specs in §8.1 to CNCF or another standards body, even at the cost of slower iteration.
+2. **Multiple independent implementations are required.** A spec with one implementation is documentation; a spec with two is a standard. The roadmap targets a second implementation for each major spec by 2028.
+3. **Conformance distinguishes "compatible" from "claimed-compatible."** The Conformance Program (§6) is the enforcement mechanism.
+4. **The labor market is the deepest moat.** A pool of CCA-certified engineers, university courses using Cozystack, and recruiters listing "Cozystack" skills create demand pressure on enterprises.
+5. **Vendor neutrality is non-negotiable.** Apparent single-vendor concentration kills standardhood faster than technical flaws. The transparency artifacts in §8.5.8 must be public, frequent, and maintained.
+
+The two-year roadmap is a starting condition, not the destination. By the end of the horizon (May 2028), Cozystack should be **plausible** as a category standard. Actual category-standard status will be earned, if at all, over the following five to ten years, through sustained execution of the principles above.
+
+## 9. Risks and Anti-Goals
+
+Acknowledging what could derail the plan or push the project away from its goal:
+
+- **Storage rewrite scope creep.** blockstor must hit a clear feature parity bar before broadening scope. A 12–18-month rewrite that grows new features faster than it ships is a known failure mode.
+- **Host OS distro adventure.** Forking Talos into a full Linux distribution is enormous work and risks turning Cozystack into a distro vendor instead of a platform standard. The conservative path in §5 (Track 5) is deliberate.
+- **The core / apps separation stays undecided.** Three competing designs exist and none has been chosen. The marketplace, the `apps.cozystack.io` API split and the retirement of the `extra` category all sit downstream of it, so leaving it open does not defer one item, it defers a quarter of Track 8 and part of Track 1 — and any work started before the decision risks being redone against a different shape. This is why the decision is scheduled ahead of the work that depends on it rather than alongside it.
+- **Marketplace without certification pipeline.** Opening external app submissions before SBOM, signing, and conformance gates exist creates supply-chain risk for adopters.
+- **AI layer without GPU accounting and data governance** will be perceived as a demo, not a platform.
+- **Multi-cluster without stable identity, networking, and policy** becomes a collection of integrations rather than a federation product.
+- **SOC 2 / PCI scope drift.** These standards apply to *deployments*, not to an OSS project. We deliver evidence packs and reference architectures, not a stamp on the project itself.
+- **blockstor is governed inside Cozystack** rather than as a separate project. The risk this carries is that adopters read it as a Cozystack-internal component rather than a storage choice available to the wider ecosystem; the mitigation is LINSTOR API compatibility, a public conformance suite, and contributors from outside the founding company — not a second governance structure.
+- **Vendor-neutrality concentration.** The single largest CNCF Graduation risk is contributor concentration in one organization. Track 11 directly addresses this; the maintainer-diversity work must succeed.
+
+## 10. How This Roadmap Is Maintained
+
+- Each track has an owning SIG (see §7).
+- Each quarter, the maintainers conduct a public roadmap review and update this document. The current Project V2 board remains the granular issue-level source of truth for in-quarter work; this document gives the multi-quarter view.
+- The initial roadmap (this document) was ratified via maintainer review when it was first merged; thereafter, material changes to the roadmap are proposed via a CzEP (Cozystack Enhancement Proposal) in [cozystack/community/design-proposals](https://github.com/cozystack/community/tree/main/design-proposals).
+- The document is versioned in `git` history; major revisions are tagged.
+
+## 11. References
+
+- [Cozystack Project V2 Roadmap board](https://github.com/orgs/cozystack/projects/1)
+- [Cozystack Governance](./GOVERNANCE.md)
+- [Cozystack Maintainers](./MAINTAINERS.md)
+- [Cozystack Security Policy](./SECURITY.md)
+- [Cozystack Contributor Ladder](./CONTRIBUTOR_LADDER.md)
+- [CNCF Project Lifecycle](https://contribute.cncf.io/projects/lifecycle/)
+- [OSPS Baseline](https://baseline.openssf.org/)
+- [OpenSSF Best Practices Badge](https://www.bestpractices.dev/)
+- [OpenSSF Scorecard](https://github.com/ossf/scorecard)
+- [SLSA Framework](https://slsa.dev/)
+- [CNCF TAG Security Self-Assessment Guide](https://tag-security.cncf.io/community/assessments/guide/self-assessment/)
+- [EU Cyber Resilience Act](https://digital-strategy.ec.europa.eu/en/policies/cyber-resilience-act)
+- [PCI DSS v4.0.1](https://www.pcisecuritystandards.org/document_library/)
+- [ISO/IEC 5230 (OpenChain)](https://www.openchainproject.org/)
+- [CSAF VEX](https://docs.oasis-open.org/csaf/csaf/v2.0/csaf-v2.0.html)
+- [Argo CD](https://argo-cd.readthedocs.io/)
+- [Flux CD](https://fluxcd.io/)
+- [GitLab Runner](https://docs.gitlab.com/runner/)
+- [GitLab Container Registry](https://docs.gitlab.com/ee/user/packages/container_registry/)
diff --git a/SECURITY.md b/SECURITY.md
index b64e533be9..8db8eb7423 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -8,28 +8,34 @@ Cozystack integrates and ships many upstream cloud native components. If you bel
 
 ## Supported Versions
 
-As of March 17, 2026, the Cozystack project maintains multiple release lines. Security fixes are prioritized for the latest stable release line and, when needed, backported to other supported lines.
+The Cozystack project maintains three release lines at a time: **the latest stable minor and the two minors preceding it.** That is a rolling rule rather than a list of version numbers, so it does not go stale between releases — read it against the GitHub Releases page to see which concrete lines it currently names:
+
+<https://github.com/cozystack/cozystack/releases>
+
+Note that the rule is keyed to release lines, not to the existence of a `release-X.Y` branch. Release branches are never deleted, so every line back to the earliest still has one, and branch existence says nothing about whether a line is maintained.
 
 | Version line | Status | Notes |
 | --- | --- | --- |
-| `v1.1.x` | Supported | Current stable release line. |
-| `v1.0.x` | Supported | Previous stable release line; receives security and important maintenance fixes. |
-| `v0.41.x` | Limited support | Legacy pre-v1 line during the v0 to v1 transition; critical security and upgrade-blocking fixes may be backported at maintainer discretion. |
-| `< v0.41` | Not supported | Please upgrade to a supported release line before requesting a security fix. |
+| Latest stable minor | Supported | Current stable release line. Security fixes land here first, and patch releases are cut from it. |
+| The two minors preceding the latest | Supported | Receive security and important maintenance fixes, backported from the current line. |
+| Older `1.x` minors | Limited support | Critical and upgrade-blocking fixes may be backported at maintainer discretion. Adopters are encouraged to move to a supported line. |
+| `v0.41.x` | End of life | The final pre-v1 line. It received patch releases through March 2026 during the v0 to v1 transition and no longer does; no further fixes are planned. |
+| Everything before `v0.41` | Not supported | Long superseded. Upgrade to a `1.x` line. |
 | `alpha`, `beta`, `rc` releases | Not supported | Pre-release builds are for testing and evaluation only. |
 
-Supported versions may change over time as new release lines are cut. The authoritative source for current releases is the GitHub Releases page:
+Being in a supported row does not mean a line receives every fix. **The project does not have a documented rule for choosing which supported lines a given fix is backported to** — that decision is taken per fix by the maintainers, weighing severity against the risk and effort of the backport. This is stated rather than dressed up as a policy because no such policy exists; adopters who need a specific fix on a specific line should ask.
 
-<https://github.com/cozystack/cozystack/releases>
+Reporting a vulnerability against a line with limited support or at end of life is still welcome. We will confirm whether the issue also affects a supported line and fix it there; whether the fix is additionally backported to the older line is a per-fix maintainer decision on the same basis.
 
 ## Reporting a Vulnerability
 
 Please do **not** report security vulnerabilities through public GitHub issues, discussions, pull requests, Telegram, Slack, or other public community channels.
 
-At the moment, this repository does not publish a dedicated private security mailbox in-tree. If you need to report a vulnerability:
+Please report vulnerabilities privately through one of the following channels, in order of preference:
 
-1. Contact one of the project maintainers listed in `CODEOWNERS` using an existing private channel you already have.
-2. If you do not already have a private maintainer contact, use a public community channel only to request a private contact path, without disclosing any vulnerability details.
+1. **GitHub Private Vulnerability Reporting** — the preferred channel. Open the repository's **Security** tab, then **Advisories** → **Report a vulnerability** (<https://github.com/cozystack/cozystack/security/advisories/new>). This creates a confidential advisory visible only to you and the maintainers, and is the CNCF-recommended path for coordinated disclosure.
+2. **Contact a maintainer** listed in [`MAINTAINERS.md`](MAINTAINERS.md) through an existing private channel you already have. Reports are triaged by the maintainers responsible for security response — [@kvaps](https://github.com/kvaps), [@lexfrei](https://github.com/lexfrei), [@tym83](https://github.com/tym83), [@matthieu-robin](https://github.com/matthieu-robin) and [@mattia-eleuteri](https://github.com/mattia-eleuteri) — but any maintainer can receive a report and route it.
+3. If you have neither, use a public community channel only to request a private contact path, without disclosing any vulnerability details.
 
 Please do not include exploit details, credentials, tokens, private keys, customer data, or other sensitive material in any public message.
 
@@ -54,6 +60,21 @@ The maintainers will aim to:
 
 Resolution timelines depend on severity, complexity, release branch applicability, and whether coordination with upstream projects is required.
 
+### Disclosure timeline
+
+The project follows a coordinated-disclosure window of **up to 90 days** from acknowledgement. If a fix or mitigation is not available within that window, the maintainers may publish the advisory (via GitHub Security Advisories) with the available details and any known workarounds, so that users are not left uninformed indefinitely. The window may be extended only by mutual agreement with the reporter, typically for issues that require coordination with upstream projects.
+
+Target remediation timelines are guided by CVSS v3.1 severity:
+
+| Severity (CVSS v3.1) | Target time to fix or mitigation |
+| --- | --- |
+| Critical (9.0–10.0) | ~14 days |
+| High (7.0–8.9) | ~30 days |
+| Medium (4.0–6.9) | ~90 days |
+| Low (0.1–3.9) | next scheduled release |
+
+These are targets, not guarantees; complex or upstream-coordinated issues may take longer.
+
 ## Disclosure Process
 
 The Cozystack project follows a coordinated disclosure model.
@@ -74,16 +95,39 @@ Public disclosure will typically happen through one or more of the following:
 Security is part of the normal Cozystack development and release process. Current project practices include:
 
 - maintainer-owned review through pull requests and `CODEOWNERS`
-- automated pull request checks, including pre-commit validation, unit tests, builds, and end-to-end testing
+- automated pull request checks, including pre-commit validation, unit tests, builds, end-to-end testing, and static application security testing (CodeQL)
 - release automation with patch releases, release branches, and backport workflows
 - ongoing maintenance of packaged dependencies and platform integrations across supported release lines
 
 Because Cozystack is an integration-heavy platform, some vulnerabilities may require coordination across multiple repositories or with upstream maintainers before a public fix can be released.
 
+### Security response team and rotation
+
+Vulnerability reports are triaged by the maintainers responsible for security response — [@kvaps](https://github.com/kvaps), [@lexfrei](https://github.com/lexfrei), [@tym83](https://github.com/tym83), [@matthieu-robin](https://github.com/matthieu-robin) and [@mattia-eleuteri](https://github.com/mattia-eleuteri) — and any maintainer can receive a report and route it. The team spans more than one organization (Ænix, HIDORA) and more than one country, rather than sitting with a single employer.
+
+A rotating **Security Champion** owns the day-to-day security process on top of normal maintainer duties: the CVE-triage clock (ensuring CRITICAL findings are triaged within SLA), the weekly review of new scan issues, pipeline health, escalation of overdue items, review of the monthly public report before publication, and first response to incoming private vulnerability reports. The role **rotates every 6 months** among the maintainers (or by volunteering), with a **one-week handoff overlap** between champions. The current Security Champion is **[@tym83](https://github.com/tym83)**.
+
+A quarterly security review (30–60 minutes) covers pipeline status, open Critical/High issues, accepted-risk decisions due for re-evaluation, the triage backlog, and process improvements; its outcomes feed the aggregate reporting under [`docs/security/reports/`](docs/security/reports/).
+
+### Automated security analysis
+
+Four automated controls run continuously against this repository and the artifacts built from it:
+
+- **CodeQL** (static analysis). Runs on every pull request to `main`, on push to `main`, and on a weekly schedule. The Go database is built with CodeQL's `manual` build mode — each first-party module is compiled explicitly, so the analysis does not depend on the project `Makefile` (which fetches upstream tags) and stays reproducible. On a pull request CodeQL reports only alerts that are *new relative to `main`* and annotates them on the changed lines. New findings are expected to be resolved before merge — either by fixing the code, or, for a false positive or accepted risk, by dismissing the alert in the **Security → Code scanning** tab with a recorded reason (`False positive`, `Won't fix`, or `Used in tests`).
+- **OpenSSF Scorecard** (supply-chain posture). Runs weekly and on branch-protection changes, and publishes results to the public Scorecard API at <https://scorecard.dev/viewer/?uri=github.com/cozystack/cozystack>. Scorecard results are intentionally **not** uploaded to GitHub code scanning: it posts one alert per check, which would bury CodeQL's first-party findings. The scorecard.dev badge is the canonical view.
+
+- **zizmor** (GitHub Actions static analysis). Audits the workflow definitions themselves for findings such as unpinned action references or over-broad `permissions`. It runs in two places: as a hook inside the `pre-commit` check, which **is** a required status check and therefore blocks merge, and as a standalone workflow triggered only by changes under `.github/workflows/` or to `.github/zizmor.yml`, which is not itself a required check. As with Scorecard, the SARIF is intentionally not uploaded to code scanning — the signal is the failing check.
+- **Trivy** (dependency and container-image CVE scanning). An organization-wide pipeline scans every non-fork, non-archived repository in the `cozystack` organization: Go modules, Dockerfile base images and the container images referenced by the packaged charts, against NVD, vendor advisories and the GitHub Advisory Database. CRITICAL findings are scanned every 6 hours; HIGH, MEDIUM and LOW are collected into a weekly report. Findings are filtered for noise (dev and build-only dependencies, unfixed-upstream findings older than a year, already-triaged CVEs) and every remaining new finding becomes a tracked issue with a severity label and a triage checklist. Triage targets are tighter than the reported-vulnerability targets above: CRITICAL within 1 business day against a 7-day fix target, HIGH within 3 business days / 30 days, MEDIUM within 10 business days / 90 days, LOW within 30 days best-effort. Confirmed findings ship as a pinned-component bump in the next release, or as a patch release on a maintained line when severity warrants it. **These are targets and the project is not currently meeting them** — there is a backlog on both the triage and the remediation side, and the rotating role that owns those clocks is currently held by [@tym83](https://github.com/tym83). Per-finding detail and triage state are kept private until fixed, because they describe unfixed exposure in released artifacts. Aggregate reporting **is** public: monthly reports and a full backlog reconciliation are published under [`docs/security/reports/`](docs/security/reports/). Publishing the pipeline's own policy documents and scanning scripts, which hold no finding data, is outstanding.
+
+Dependency updates are additionally automated by **Renovate** ([`.github/renovate.json`](.github/renovate.json)), which raises pull requests for Go modules, Dockerfile base images, GitHub Actions and a small number of regex-pinned references. The `helm-values` manager is disabled repo-wide, so the curated component images that make up the shipped platform are bumped by maintainers when preparing a release rather than by a bot.
+
+CodeQL is intended to run as a required pull-request check, so that a newly introduced alert at error severity blocks merge until it is fixed or dismissed. It is **not** currently among the required status checks on `main` — those are `pre-commit` and `E2E Tests` — so today a new error-severity alert is expected to be resolved before merge by review convention rather than enforced by branch protection.
+
 ## Security Fixes and Announcements
 
 Security fixes are published in normal release artifacts whenever possible. Users should monitor:
 
+- monthly security reports and the backlog reconciliation: [`docs/security/reports/`](docs/security/reports/)
 - GitHub Releases: <https://github.com/cozystack/cozystack/releases>
 - project changelogs in this repository
 - the Cozystack website and documentation: <https://cozystack.io>
@@ -92,7 +136,7 @@ Security fixes are published in normal release artifacts whenever possible. User
 
 The following are generally out of scope for private security reporting unless there is a clear Cozystack-specific impact:
 
-- vulnerabilities in unsupported or end-of-life Cozystack versions
+- vulnerabilities that reproduce only on an end-of-life or unsupported version and not on any maintained line — such reports are still accepted and triaged, but the fix will normally be delivered on a maintained line rather than backported
 - issues that require access already equivalent to cluster-admin, node root, or direct infrastructure administrator privileges, unless they bypass an expected Cozystack security boundary
 - vulnerabilities that exist only in an upstream dependency and are not introduced or materially worsened by Cozystack packaging, configuration, or defaults
 - requests for security best-practice advice without a concrete vulnerability
diff --git a/api/.gitattributes b/api/.gitattributes
index 39e882c99b..0ba56bd448 100644
--- a/api/.gitattributes
+++ b/api/.gitattributes
@@ -1 +1,2 @@
-zz_generated_deepcopy.go linguist-generated
+zz_generated.deepcopy.go linguist-generated
+apps/v1alpha1/*/types.go linguist-generated
diff --git a/api/api-rules/cozystack_api_violation_exceptions.list b/api/api-rules/cozystack_api_violation_exceptions.list
index 8442e3ed01..310af75e08 100644
--- a/api/api-rules/cozystack_api_violation_exceptions.list
+++ b/api/api-rules/cozystack_api_violation_exceptions.list
@@ -1,5 +1,21 @@
 API rule violation: list_type_missing,github.com/cozystack/cozystack/pkg/apis/apps/v1alpha1,ApplicationStatus,Conditions
+API rule violation: list_type_missing,github.com/cozystack/cozystack/pkg/apis/core/v1alpha1,OptionSpec,Items
+API rule violation: list_type_missing,github.com/cozystack/cozystack/pkg/apis/core/v1alpha1,TapPackage,Tags
+API rule violation: list_type_missing,github.com/cozystack/cozystack/pkg/apis/core/v1alpha1,TapSpec,Packages
 API rule violation: list_type_missing,github.com/cozystack/cozystack/pkg/apis/core/v1alpha1,TenantModuleStatus,Conditions
+API rule violation: list_type_missing,github.com/cozystack/cozystack/pkg/apis/sdn/v1alpha1,EgressRule,ToApp
+API rule violation: list_type_missing,github.com/cozystack/cozystack/pkg/apis/sdn/v1alpha1,EgressRule,ToCIDR
+API rule violation: list_type_missing,github.com/cozystack/cozystack/pkg/apis/sdn/v1alpha1,EgressRule,ToFQDNs
+API rule violation: list_type_missing,github.com/cozystack/cozystack/pkg/apis/sdn/v1alpha1,EgressRule,ToPorts
+API rule violation: list_type_missing,github.com/cozystack/cozystack/pkg/apis/sdn/v1alpha1,EgressRule,ToSG
+API rule violation: list_type_missing,github.com/cozystack/cozystack/pkg/apis/sdn/v1alpha1,IngressRule,FromApp
+API rule violation: list_type_missing,github.com/cozystack/cozystack/pkg/apis/sdn/v1alpha1,IngressRule,FromCIDR
+API rule violation: list_type_missing,github.com/cozystack/cozystack/pkg/apis/sdn/v1alpha1,IngressRule,FromSG
+API rule violation: list_type_missing,github.com/cozystack/cozystack/pkg/apis/sdn/v1alpha1,IngressRule,ToPorts
+API rule violation: list_type_missing,github.com/cozystack/cozystack/pkg/apis/sdn/v1alpha1,PortRule,Ports
+API rule violation: list_type_missing,github.com/cozystack/cozystack/pkg/apis/sdn/v1alpha1,SecurityGroupSpec,Attachments
+API rule violation: list_type_missing,github.com/cozystack/cozystack/pkg/apis/sdn/v1alpha1,SecurityGroupSpec,Egress
+API rule violation: list_type_missing,github.com/cozystack/cozystack/pkg/apis/sdn/v1alpha1,SecurityGroupSpec,Ingress
 API rule violation: names_match,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1,JSONSchemaProps,Ref
 API rule violation: names_match,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1,JSONSchemaProps,Schema
 API rule violation: names_match,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1,JSONSchemaProps,XEmbeddedResource
@@ -15,6 +31,12 @@ API rule violation: names_match,k8s.io/apiextensions-apiserver/pkg/apis/apiexten
 API rule violation: names_match,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1,JSONSchemaPropsOrBool,Schema
 API rule violation: names_match,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1,JSONSchemaPropsOrStringArray,Property
 API rule violation: names_match,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1,JSONSchemaPropsOrStringArray,Schema
+API rule violation: names_match,k8s.io/apimachinery/pkg/api/resource,Quantity,Format
+API rule violation: names_match,k8s.io/apimachinery/pkg/api/resource,Quantity,d
+API rule violation: names_match,k8s.io/apimachinery/pkg/api/resource,Quantity,i
+API rule violation: names_match,k8s.io/apimachinery/pkg/api/resource,Quantity,s
+API rule violation: names_match,k8s.io/apimachinery/pkg/api/resource,int64Amount,scale
+API rule violation: names_match,k8s.io/apimachinery/pkg/api/resource,int64Amount,value
 API rule violation: names_match,k8s.io/apimachinery/pkg/apis/meta/v1,APIResourceList,APIResources
 API rule violation: names_match,k8s.io/apimachinery/pkg/apis/meta/v1,Duration,Duration
 API rule violation: names_match,k8s.io/apimachinery/pkg/apis/meta/v1,InternalEvent,Object
diff --git a/api/apps/v1alpha1/bucket/types.go b/api/apps/v1alpha1/bucket/types.go
index 96082a67be..6632ca5300 100644
--- a/api/apps/v1alpha1/bucket/types.go
+++ b/api/apps/v1alpha1/bucket/types.go
@@ -22,6 +22,9 @@ type ConfigSpec struct {
 	// Selects a specific BucketClass by storage pool name.
 	// +kubebuilder:default:=""
 	StoragePool string `json:"storagePool,omitempty"`
+	// Deploys the web UI (s3manager) with its Service and its Ingress or HTTPRoute at `<bucket>.<tenant host>`. Set to `false` to run the bucket without them.
+	// +kubebuilder:default:=true
+	Ui bool `json:"ui"`
 	// Users configuration map.
 	// +kubebuilder:default:={}
 	Users map[string]User `json:"users,omitempty"`
diff --git a/api/apps/v1alpha1/clickhouse/types.go b/api/apps/v1alpha1/clickhouse/types.go
index 535be7ed2d..fd43ee42dd 100644
--- a/api/apps/v1alpha1/clickhouse/types.go
+++ b/api/apps/v1alpha1/clickhouse/types.go
@@ -36,6 +36,9 @@ type ConfigSpec struct {
 	// +kubebuilder:default:=""
 	// +kubebuilder:validation:XValidation:rule="self == oldSelf",message="storageClass is immutable"
 	StorageClass string `json:"storageClass"`
+	// ClickHouse major.minor version to deploy. Applies to both the ClickHouse server and ClickHouse Keeper images. Downgrading to an older major is unsafe (ClickHouse cannot read data written by a newer server and Keeper snapshots are not backward compatible) — only increase this value.
+	// +kubebuilder:default:="v24.9"
+	Version Version `json:"version"`
 	// Size of Persistent Volume for logs.
 	// +kubebuilder:default:="2Gi"
 	LogStorageSize resource.Quantity `json:"logStorageSize"`
@@ -63,6 +66,9 @@ type Backup struct {
 	// DEPRECATED. S3 endpoint URL for the legacy chart-emitted sidecar.
 	// +kubebuilder:default:=""
 	Endpoint string `json:"endpoint,omitempty"`
+	// CA bundle the sidecar trusts when the S3 endpoint's certificate is signed by a private CA (e.g. Cozystack's in-cluster SeaweedFS). Applies to both the per-tenant and the `useSystemBucket` flow, and to the `clickhouse-backup` sidecar only — the legacy `schedule` CronJob writes to S3 through restic and does not consume it, so a private-CA endpoint combined with `schedule` still fails TLS. Use the BackupClass flow for such an endpoint.
+	// +kubebuilder:default:={}
+	EndpointCA EndpointCA `json:"endpointCA,omitempty"`
 	// Legacy. Password for Restic backup encryption used by the legacy CronJob. Unused by the Altinity strategy.
 	// +kubebuilder:default:="<password>"
 	ResticPassword string `json:"resticPassword,omitempty"`
@@ -107,6 +113,15 @@ type ClickHouseKeeper struct {
 	Size resource.Quantity `json:"size,omitempty"`
 }
 
+type EndpointCA struct {
+	// Key inside the Secret holding the PEM CA bundle. Defaults to `ca.crt`.
+	// +kubebuilder:default:="ca.crt"
+	Key string `json:"key,omitempty"`
+	// Name of the Secret in the application namespace. Empty (default) mounts nothing and leaves the sidecar on the system trust store only.
+	// +kubebuilder:default:=""
+	Name string `json:"name,omitempty"`
+}
+
 type Resources struct {
 	// CPU available to each replica.
 	Cpu resource.Quantity `json:"cpu,omitempty"`
@@ -144,3 +159,6 @@ type User struct {
 
 // +kubebuilder:validation:Enum="t1.nano";"t1.micro";"t1.small";"t1.medium";"t1.large";"t1.xlarge";"t1.2xlarge";"t1.4xlarge";"c1.nano";"c1.micro";"c1.small";"c1.medium";"c1.large";"c1.xlarge";"c1.2xlarge";"c1.4xlarge";"s1.nano";"s1.micro";"s1.small";"s1.medium";"s1.large";"s1.xlarge";"s1.2xlarge";"s1.4xlarge";"u1.nano";"u1.micro";"u1.small";"u1.medium";"u1.large";"u1.xlarge";"u1.2xlarge";"u1.4xlarge";"m1.nano";"m1.micro";"m1.small";"m1.medium";"m1.large";"m1.xlarge";"m1.2xlarge";"m1.4xlarge";"nano";"micro";"small";"medium";"large";"xlarge";"2xlarge"
 type ResourcesPreset string
+
+// +kubebuilder:validation:Enum="v25.8";"v25.3";"v24.9"
+type Version string
diff --git a/api/apps/v1alpha1/clickhouse/zz_generated.deepcopy.go b/api/apps/v1alpha1/clickhouse/zz_generated.deepcopy.go
index 8b046eb28c..0ff62ed3ce 100644
--- a/api/apps/v1alpha1/clickhouse/zz_generated.deepcopy.go
+++ b/api/apps/v1alpha1/clickhouse/zz_generated.deepcopy.go
@@ -27,6 +27,7 @@ import (
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *Backup) DeepCopyInto(out *Backup) {
 	*out = *in
+	out.EndpointCA = in.EndpointCA
 	out.S3CredentialsSecret = in.S3CredentialsSecret
 }
 
@@ -109,6 +110,21 @@ func (in *ConfigSpec) DeepCopy() *ConfigSpec {
 	return out
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *EndpointCA) DeepCopyInto(out *EndpointCA) {
+	*out = *in
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new EndpointCA.
+func (in *EndpointCA) DeepCopy() *EndpointCA {
+	if in == nil {
+		return nil
+	}
+	out := new(EndpointCA)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *Resources) DeepCopyInto(out *Resources) {
 	*out = *in
diff --git a/api/apps/v1alpha1/go.mod b/api/apps/v1alpha1/go.mod
index 231ebbac0b..8d0f5881d8 100644
--- a/api/apps/v1alpha1/go.mod
+++ b/api/apps/v1alpha1/go.mod
@@ -1,19 +1,21 @@
 module github.com/cozystack/cozystack/api/apps/v1alpha1
 
-go 1.26.2
+go 1.26.4
 
 require k8s.io/apimachinery v0.36.0
 
 require (
-	github.com/fxamacker/cbor/v2 v2.9.0 // indirect
-	github.com/go-logr/logr v1.4.3 // indirect
+	github.com/fxamacker/cbor/v2 v2.9.4 // indirect
+	github.com/go-logr/logr v1.4.4 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
+	github.com/spf13/pflag v1.0.10 // indirect
+	github.com/stretchr/testify v1.12.1 // indirect
 	github.com/x448/float16 v0.8.4 // indirect
-	go.yaml.in/yaml/v2 v2.4.3 // indirect
-	golang.org/x/net v0.53.0 // indirect
-	golang.org/x/text v0.36.0 // indirect
+	go.yaml.in/yaml/v2 v2.4.4 // indirect
+	golang.org/x/net v0.59.0 // indirect
+	golang.org/x/text v0.42.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	k8s.io/klog/v2 v2.140.0 // indirect
 	k8s.io/kube-openapi v0.0.0-20260317180543-43fb72c5454a // indirect
diff --git a/api/apps/v1alpha1/go.sum b/api/apps/v1alpha1/go.sum
index 48970ca033..da46ba512a 100644
--- a/api/apps/v1alpha1/go.sum
+++ b/api/apps/v1alpha1/go.sum
@@ -2,10 +2,10 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/fxamacker/cbor/v2 v2.9.0 h1:NpKPmjDBgUfBms6tr6JZkTHtfFGcMKsw3eGcmD/sapM=
-github.com/fxamacker/cbor/v2 v2.9.0/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ=
-github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=
-github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
+github.com/fxamacker/cbor/v2 v2.9.4 h1:xwjVlxEMR3S605oUlgBjKLTTeGFciYPGYCtF/35LKGo=
+github.com/fxamacker/cbor/v2 v2.9.4/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ=
+github.com/go-logr/logr v1.4.4 h1:tG4xh9yMsRCAiodLVTxyrkzSZ9+o0L1Kg/+cPVcbP/8=
+github.com/go-logr/logr v1.4.4/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
 github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
 github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
@@ -20,26 +20,24 @@ github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee/go.mod h1:yWu
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/spf13/pflag v1.0.9 h1:9exaQaMOCwffKiiiYk6/BndUBv+iRViNW+4lEMi0PvY=
-github.com/spf13/pflag v1.0.9/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+github.com/spf13/pflag v1.0.10 h1:4EBh2KAYBwaONj6b2Ye1GiHfwjqyROoF4RwYO+vPwFk=
+github.com/spf13/pflag v1.0.10/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
-github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
+github.com/stretchr/testify v1.12.1 h1:EuwCh5fleGS7H32xRwO3wRGT7DxrDhLAT6FF8MpWDWE=
+github.com/stretchr/testify v1.12.1/go.mod h1:MDEgiDPPsNp5cuIrHPPCyornHKgEVbtFUmoNlxoYthg=
 github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
 github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
-go.yaml.in/yaml/v2 v2.4.3 h1:6gvOSjQoTB3vt1l+CU+tSyi/HOjfOjRLJ4YwYZGwRO0=
-go.yaml.in/yaml/v2 v2.4.3/go.mod h1:zSxWcmIDjOzPXpjlTTbAsKokqkDNAVtZO0WOMiT90s8=
-golang.org/x/net v0.53.0 h1:d+qAbo5L0orcWAr0a9JweQpjXF19LMXJE8Ey7hwOdUA=
-golang.org/x/net v0.53.0/go.mod h1:JvMuJH7rrdiCfbeHoo3fCQU24Lf5JJwT9W3sJFulfgs=
-golang.org/x/text v0.36.0 h1:JfKh3XmcRPqZPKevfXVpI1wXPTqbkE5f7JA92a55Yxg=
-golang.org/x/text v0.36.0/go.mod h1:NIdBknypM8iqVmPiuco0Dh6P5Jcdk8lJL0CUebqK164=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+go.yaml.in/yaml/v2 v2.4.4 h1:tuyd0P+2Ont/d6e2rl3be67goVK4R6deVxCUX5vyPaQ=
+go.yaml.in/yaml/v2 v2.4.4/go.mod h1:gMZqIpDtDqOfM0uNfy0SkpRhvUryYH0Z6wdMYcacYXQ=
+go.yaml.in/yaml/v3 v3.0.5 h1:N6y/pJk8buWs9NY5ERU2HSMfm+IuD/OtfdAnq6kESPw=
+go.yaml.in/yaml/v3 v3.0.5/go.mod h1:HVTZu1O7/Vkt2N+BFy8Zza+lnLsABggaTM2ZpNIGuKg=
+golang.org/x/net v0.59.0 h1:5zfYln+w5XCxwrnMMJPufRgNoXEaGxl0wo5GqPXyues=
+golang.org/x/net v0.59.0/go.mod h1:2DA/G1UfVbCpQPeWTmMPGY7Cs2PkBkwu743bVX5PIVg=
+golang.org/x/text v0.42.0 h1:JbOZXgfeCPU9gacVtYliJqOhD+zhrEqK4LfdpmlUZqI=
+golang.org/x/text v0.42.0/go.mod h1:ojzP1Z+2QtioaF8DTtO8K5q7JWVVYwZKenzujK0Zd0E=
 gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
 gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
-gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
-gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 k8s.io/apimachinery v0.36.0 h1:jZyPzhd5Z+3h9vJLt0z9XdzW9VzNzWAUw+P1xZ9PXtQ=
 k8s.io/apimachinery v0.36.0/go.mod h1:FklypaRJt6n5wUIwWXIP6GJlIpUizTgfo1T/As+Tyxc=
 k8s.io/klog/v2 v2.140.0 h1:Tf+J3AH7xnUzZyVVXhTgGhEKnFqye14aadWv7bzXdzc=
diff --git a/api/apps/v1alpha1/harbor/types.go b/api/apps/v1alpha1/harbor/types.go
index 99b89dbc13..d5638214ea 100644
--- a/api/apps/v1alpha1/harbor/types.go
+++ b/api/apps/v1alpha1/harbor/types.go
@@ -20,6 +20,9 @@ type ConfigSpec struct {
 	// Hostname for external access to Harbor (defaults to 'harbor' subdomain for the tenant host).
 	// +kubebuilder:default:=""
 	Host string `json:"host,omitempty"`
+	// IP addresses or CIDR ranges allowed to reach the Harbor web portal and API. `/v2/` and `/service/token`, which `docker login`, image pulls and pushes use, are not restricted by this list. For the portal and API it replaces the tenant ingress `whitelist` rather than narrowing it, and it is matched against the client address the ingress controller sees, which is a proxy or a forwarded header rather than the real client when something in front of the controller rewrites it. Empty allows every address. Requires Ingress publishing; rejected when the tenant publishes through Gateway API.
+	// +kubebuilder:default:={}
+	ManagementWhitelist []string `json:"managementWhitelist,omitempty"`
 	// StorageClass used to store the data.
 	// +kubebuilder:default:=""
 	// +kubebuilder:validation:XValidation:rule="self == oldSelf",message="storageClass is immutable"
diff --git a/api/apps/v1alpha1/harbor/zz_generated.deepcopy.go b/api/apps/v1alpha1/harbor/zz_generated.deepcopy.go
index 3e7338ad93..8ff615ac2e 100644
--- a/api/apps/v1alpha1/harbor/zz_generated.deepcopy.go
+++ b/api/apps/v1alpha1/harbor/zz_generated.deepcopy.go
@@ -53,6 +53,11 @@ func (in *Config) DeepCopyObject() runtime.Object {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *ConfigSpec) DeepCopyInto(out *ConfigSpec) {
 	*out = *in
+	if in.ManagementWhitelist != nil {
+		in, out := &in.ManagementWhitelist, &out.ManagementWhitelist
+		*out = make([]string, len(*in))
+		copy(*out, *in)
+	}
 	in.Core.DeepCopyInto(&out.Core)
 	in.Registry.DeepCopyInto(&out.Registry)
 	in.Jobservice.DeepCopyInto(&out.Jobservice)
diff --git a/api/apps/v1alpha1/httpcache/types.go b/api/apps/v1alpha1/httpcache/types.go
deleted file mode 100644
index 09f6f44c56..0000000000
--- a/api/apps/v1alpha1/httpcache/types.go
+++ /dev/null
@@ -1,73 +0,0 @@
-// Code generated by values-gen. DO NOT EDIT.
-// +kubebuilder:object:generate=true
-// +groupName=apps.cozystack.io
-// +versionName=v1alpha1
-package httpcache
-
-import (
-	resource "k8s.io/apimachinery/pkg/api/resource"
-	"k8s.io/apimachinery/pkg/apis/meta/v1"
-)
-
-// +kubebuilder:object:root=true
-type Config struct {
-	v1.TypeMeta   `json:",inline"`
-	v1.ObjectMeta `json:"metadata,omitempty"`
-	Spec          ConfigSpec `json:"spec,omitempty"`
-}
-
-type ConfigSpec struct {
-	// Persistent Volume Claim size available for application data.
-	// +kubebuilder:default:="10Gi"
-	Size resource.Quantity `json:"size"`
-	// StorageClass used to store the data.
-	// +kubebuilder:default:=""
-	// +kubebuilder:validation:XValidation:rule="self == oldSelf",message="storageClass is immutable"
-	StorageClass string `json:"storageClass"`
-	// Enable external access from outside the cluster.
-	// +kubebuilder:default:=false
-	External bool `json:"external"`
-	// Endpoints configuration, as a list of <ip:port>.
-	// +kubebuilder:default:={}
-	Endpoints []string `json:"endpoints,omitempty"`
-	// HAProxy configuration.
-	// +kubebuilder:default:={}
-	Haproxy HAProxy `json:"haproxy"`
-	// Nginx configuration.
-	// +kubebuilder:default:={}
-	Nginx Nginx `json:"nginx"`
-}
-
-type HAProxy struct {
-	// Number of HAProxy replicas.
-	// +kubebuilder:default:=2
-	Replicas int `json:"replicas"`
-	// Explicit CPU and memory configuration. When omitted, the preset defined in `resourcesPreset` is applied.
-	// +kubebuilder:default:={}
-	Resources Resources `json:"resources,omitempty"`
-	// Default sizing preset used when `resources` is omitted.
-	// +kubebuilder:default:="t1.nano"
-	ResourcesPreset ResourcesPreset `json:"resourcesPreset"`
-}
-
-type Nginx struct {
-	// Number of Nginx replicas.
-	// +kubebuilder:default:=2
-	Replicas int `json:"replicas"`
-	// Explicit CPU and memory configuration. When omitted, the preset defined in `resourcesPreset` is applied.
-	// +kubebuilder:default:={}
-	Resources Resources `json:"resources,omitempty"`
-	// Default sizing preset used when `resources` is omitted.
-	// +kubebuilder:default:="t1.nano"
-	ResourcesPreset ResourcesPreset `json:"resourcesPreset"`
-}
-
-type Resources struct {
-	// CPU available to each replica.
-	Cpu resource.Quantity `json:"cpu,omitempty"`
-	// Memory (RAM) available to each replica.
-	Memory resource.Quantity `json:"memory,omitempty"`
-}
-
-// +kubebuilder:validation:Enum="t1.nano";"t1.micro";"t1.small";"t1.medium";"t1.large";"t1.xlarge";"t1.2xlarge";"t1.4xlarge";"c1.nano";"c1.micro";"c1.small";"c1.medium";"c1.large";"c1.xlarge";"c1.2xlarge";"c1.4xlarge";"s1.nano";"s1.micro";"s1.small";"s1.medium";"s1.large";"s1.xlarge";"s1.2xlarge";"s1.4xlarge";"u1.nano";"u1.micro";"u1.small";"u1.medium";"u1.large";"u1.xlarge";"u1.2xlarge";"u1.4xlarge";"m1.nano";"m1.micro";"m1.small";"m1.medium";"m1.large";"m1.xlarge";"m1.2xlarge";"m1.4xlarge";"nano";"micro";"small";"medium";"large";"xlarge";"2xlarge"
-type ResourcesPreset string
diff --git a/api/apps/v1alpha1/httpcache/zz_generated.deepcopy.go b/api/apps/v1alpha1/httpcache/zz_generated.deepcopy.go
deleted file mode 100644
index 47da2baa5a..0000000000
--- a/api/apps/v1alpha1/httpcache/zz_generated.deepcopy.go
+++ /dev/null
@@ -1,123 +0,0 @@
-//go:build !ignore_autogenerated
-
-/*
-Copyright 2025 The Cozystack Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-// Code generated by controller-gen. DO NOT EDIT.
-
-package httpcache
-
-import (
-	runtime "k8s.io/apimachinery/pkg/runtime"
-)
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *Config) DeepCopyInto(out *Config) {
-	*out = *in
-	out.TypeMeta = in.TypeMeta
-	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
-	in.Spec.DeepCopyInto(&out.Spec)
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Config.
-func (in *Config) DeepCopy() *Config {
-	if in == nil {
-		return nil
-	}
-	out := new(Config)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *Config) DeepCopyObject() runtime.Object {
-	if c := in.DeepCopy(); c != nil {
-		return c
-	}
-	return nil
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ConfigSpec) DeepCopyInto(out *ConfigSpec) {
-	*out = *in
-	out.Size = in.Size.DeepCopy()
-	if in.Endpoints != nil {
-		in, out := &in.Endpoints, &out.Endpoints
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	}
-	in.Haproxy.DeepCopyInto(&out.Haproxy)
-	in.Nginx.DeepCopyInto(&out.Nginx)
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ConfigSpec.
-func (in *ConfigSpec) DeepCopy() *ConfigSpec {
-	if in == nil {
-		return nil
-	}
-	out := new(ConfigSpec)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *HAProxy) DeepCopyInto(out *HAProxy) {
-	*out = *in
-	in.Resources.DeepCopyInto(&out.Resources)
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new HAProxy.
-func (in *HAProxy) DeepCopy() *HAProxy {
-	if in == nil {
-		return nil
-	}
-	out := new(HAProxy)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *Nginx) DeepCopyInto(out *Nginx) {
-	*out = *in
-	in.Resources.DeepCopyInto(&out.Resources)
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Nginx.
-func (in *Nginx) DeepCopy() *Nginx {
-	if in == nil {
-		return nil
-	}
-	out := new(Nginx)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *Resources) DeepCopyInto(out *Resources) {
-	*out = *in
-	out.Cpu = in.Cpu.DeepCopy()
-	out.Memory = in.Memory.DeepCopy()
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Resources.
-func (in *Resources) DeepCopy() *Resources {
-	if in == nil {
-		return nil
-	}
-	out := new(Resources)
-	in.DeepCopyInto(out)
-	return out
-}
diff --git a/api/apps/v1alpha1/kafka/types.go b/api/apps/v1alpha1/kafka/types.go
index 720d471e9d..a69cece1be 100644
--- a/api/apps/v1alpha1/kafka/types.go
+++ b/api/apps/v1alpha1/kafka/types.go
@@ -24,18 +24,21 @@ type ConfigSpec struct {
 	// TLS configuration. Strimzi manages the cluster PKI automatically (no cert-manager is involved for this chart): the operator auto-creates `<release>-cluster-ca-cert` and `<release>-clients-ca-cert` secrets, both exposed for client trust setup. The internal TLS listener on 9093 is always on; this toggle only controls the external listener on 9094.
 	// +kubebuilder:default:={}
 	Tls TLS `json:"tls"`
+	// Kafka version to deploy. Upgrade-only: once a cluster's KRaft metadata is at a given version, Strimzi refuses an in-place downgrade, so lowering this on a running cluster (e.g. v3.9 back to v3.8) leaves the Kafka CR stuck in a reconcile error. Pick the target version at creation and only ever raise it.
+	// +kubebuilder:default:="v3.9"
+	Version Version `json:"version"`
 	// Topics configuration.
 	// +kubebuilder:default:={}
 	Topics []Topic `json:"topics,omitempty"`
 	// Kafka configuration.
 	// +kubebuilder:default:={}
 	Kafka Kafka `json:"kafka"`
-	// ZooKeeper configuration.
-	// +kubebuilder:default:={}
-	Zookeeper ZooKeeper `json:"zookeeper"`
 }
 
 type Kafka struct {
+	// Persistent Volume size for KRaft controller metadata (used during ZK-to-KRaft migration).
+	// +kubebuilder:default:="5Gi"
+	ControllerStorageSize resource.Quantity `json:"controllerStorageSize,omitempty"`
 	// Number of Kafka replicas.
 	// +kubebuilder:default:=3
 	Replicas int `json:"replicas"`
@@ -68,7 +71,7 @@ type TLS struct {
 
 type Topic struct {
 	// Topic configuration.
-	Config k8sRuntime.RawExtension `json:"config"`
+	Config *k8sRuntime.RawExtension `json:"config,omitempty"`
 	// Topic name.
 	Name string `json:"name"`
 	// Number of partitions.
@@ -77,24 +80,8 @@ type Topic struct {
 	Replicas int `json:"replicas"`
 }
 
-type ZooKeeper struct {
-	// Number of ZooKeeper replicas.
-	// +kubebuilder:default:=3
-	Replicas int `json:"replicas"`
-	// Explicit CPU and memory configuration. When omitted, the preset defined in `resourcesPreset` is applied.
-	// +kubebuilder:default:={}
-	Resources Resources `json:"resources,omitempty"`
-	// Default sizing preset used when `resources` is omitted.
-	// +kubebuilder:default:="c1.small"
-	ResourcesPreset ResourcesPreset `json:"resourcesPreset"`
-	// Persistent Volume size for ZooKeeper.
-	// +kubebuilder:default:="5Gi"
-	Size resource.Quantity `json:"size"`
-	// StorageClass used to store the ZooKeeper data.
-	// +kubebuilder:default:=""
-	// +kubebuilder:validation:XValidation:rule="self == oldSelf",message="storageClass is immutable"
-	StorageClass string `json:"storageClass"`
-}
-
 // +kubebuilder:validation:Enum="t1.nano";"t1.micro";"t1.small";"t1.medium";"t1.large";"t1.xlarge";"t1.2xlarge";"t1.4xlarge";"c1.nano";"c1.micro";"c1.small";"c1.medium";"c1.large";"c1.xlarge";"c1.2xlarge";"c1.4xlarge";"s1.nano";"s1.micro";"s1.small";"s1.medium";"s1.large";"s1.xlarge";"s1.2xlarge";"s1.4xlarge";"u1.nano";"u1.micro";"u1.small";"u1.medium";"u1.large";"u1.xlarge";"u1.2xlarge";"u1.4xlarge";"m1.nano";"m1.micro";"m1.small";"m1.medium";"m1.large";"m1.xlarge";"m1.2xlarge";"m1.4xlarge";"nano";"micro";"small";"medium";"large";"xlarge";"2xlarge"
 type ResourcesPreset string
+
+// +kubebuilder:validation:Enum="v3.9";"v3.8"
+type Version string
diff --git a/api/apps/v1alpha1/kafka/zz_generated.deepcopy.go b/api/apps/v1alpha1/kafka/zz_generated.deepcopy.go
index 71df65dc35..b5c124aea0 100644
--- a/api/apps/v1alpha1/kafka/zz_generated.deepcopy.go
+++ b/api/apps/v1alpha1/kafka/zz_generated.deepcopy.go
@@ -62,7 +62,6 @@ func (in *ConfigSpec) DeepCopyInto(out *ConfigSpec) {
 		}
 	}
 	in.Kafka.DeepCopyInto(&out.Kafka)
-	in.Zookeeper.DeepCopyInto(&out.Zookeeper)
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ConfigSpec.
@@ -78,6 +77,7 @@ func (in *ConfigSpec) DeepCopy() *ConfigSpec {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *Kafka) DeepCopyInto(out *Kafka) {
 	*out = *in
+	out.ControllerStorageSize = in.ControllerStorageSize.DeepCopy()
 	in.Resources.DeepCopyInto(&out.Resources)
 	out.Size = in.Size.DeepCopy()
 }
@@ -132,7 +132,11 @@ func (in *TLS) DeepCopy() *TLS {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *Topic) DeepCopyInto(out *Topic) {
 	*out = *in
-	in.Config.DeepCopyInto(&out.Config)
+	if in.Config != nil {
+		in, out := &in.Config, &out.Config
+		*out = new(runtime.RawExtension)
+		(*in).DeepCopyInto(*out)
+	}
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Topic.
@@ -144,20 +148,3 @@ func (in *Topic) DeepCopy() *Topic {
 	in.DeepCopyInto(out)
 	return out
 }
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ZooKeeper) DeepCopyInto(out *ZooKeeper) {
-	*out = *in
-	in.Resources.DeepCopyInto(&out.Resources)
-	out.Size = in.Size.DeepCopy()
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ZooKeeper.
-func (in *ZooKeeper) DeepCopy() *ZooKeeper {
-	if in == nil {
-		return nil
-	}
-	out := new(ZooKeeper)
-	in.DeepCopyInto(out)
-	return out
-}
diff --git a/api/apps/v1alpha1/kubernetes/types.go b/api/apps/v1alpha1/kubernetes/types.go
index 57153057db..01eef17142 100644
--- a/api/apps/v1alpha1/kubernetes/types.go
+++ b/api/apps/v1alpha1/kubernetes/types.go
@@ -18,19 +18,23 @@ type Config struct {
 }
 
 type ConfigSpec struct {
-	// StorageClass used to store the data.
+	// Default StorageClass inside the tenant cluster. Remote-accessible LINSTOR classes are auto-propagated to the tenant under the same name.
 	// +kubebuilder:default:="replicated"
 	// +kubebuilder:validation:XValidation:rule="self == oldSelf",message="storageClass is immutable"
 	StorageClass string `json:"storageClass"`
-	// Worker nodes configuration map.
-	// +kubebuilder:default:={"md0":{"diskSize":"20Gi","gpus":{},"instanceType":"u1.medium","kubelet":{},"maxReplicas":10,"minReplicas":0,"resources":{},"roles":{"ingress-nginx"},"storageClass":""}}
-	NodeGroups map[string]NodeGroup `json:"nodeGroups,omitempty"`
 	// Kubernetes major.minor version to deploy
 	// +kubebuilder:default:="v1.35"
 	Version Version `json:"version"`
 	// External hostname for Kubernetes cluster. Defaults to `<cluster-name>.<tenant-host>` if empty.
 	// +kubebuilder:default:=""
 	Host string `json:"host"`
+	// Which infrastructure provider backs this cluster's worker VMs. `kubevirt` runs them inside this cluster; `proxmox` runs them on an external Proxmox VE cluster through capmox. The control plane is Kamaji either way — this selects the infrastructure half only. Must match the `substrate` of every KubernetesNodes pool attached to this cluster: the pools reference this cluster's infrastructure object by kind, and a mismatch leaves their Machines unreconciled. Switching an existing cluster is not supported; create a new one.
+	// +kubebuilder:default:="kubevirt"
+	// +kubebuilder:validation:XValidation:rule="self == oldSelf",message="substrate is immutable"
+	Substrate string `json:"substrate"`
+	// Proxmox substrate settings.
+	// +kubebuilder:default:={}
+	Proxmox Proxmox `json:"proxmox"`
 	// Cluster addons configuration.
 	// +kubebuilder:default:={}
 	Addons Addons `json:"addons"`
@@ -40,9 +44,27 @@ type ConfigSpec struct {
 	// Optional image overrides for air-gapped or rate-limited registries.
 	// +kubebuilder:default:={}
 	Images Images `json:"images"`
+	// Talos worker image configuration.
+	// +kubebuilder:default:={}
+	Talos Talos `json:"talos"`
+	// OIDC authentication and per-user RBAC for the tenant kube-apiserver. See docs/oidc-tenant.md for the operator guide.
+	// +kubebuilder:default:={}
+	Oidc OIDC `json:"oidc"`
 }
 
 type APIServer struct {
+	// Admission plugins the tenant kube-apiserver enables, passed through to KamajiControlPlane `spec.admissionControllers`, which the control plane renders as `--enable-admission-plugins`. A non-empty list replaces the control plane's default set instead of adding to it. The kube-apiserver enables these plugins in addition to its own default ones, so leaving a plugin out does not turn it off; to turn one off, name it in `--disable-admission-plugins` in `controlPlane.apiServer.extraArgs` and keep it out of this list, since the apiserver refuses to start with a plugin in both, and the control plane's default set names several. Empty by default, which keeps that default set, taken from the TenantControlPlane CRD: CertificateApproval, CertificateSigning, CertificateSubjectRestriction, DefaultIngressClass, DefaultStorageClass, DefaultTolerationSeconds, LimitRanger, MutatingAdmissionWebhook, NamespaceLifecycle, PersistentVolumeClaimResize, Priority, ResourceQuota, RuntimeClass, ServiceAccount, StorageObjectInUseProtection, TaintNodesByCondition, ValidatingAdmissionWebhook. `NodeRestriction` is not in it.
+	// +kubebuilder:default:={}
+	AdmissionControllers []AdmissionController `json:"admissionControllers,omitempty"`
+	// Extra command-line flags appended to the tenant kube-apiserver, passed through to KamajiControlPlane `spec.apiServer.extraArgs`. For OIDC use `spec.oidc.mode` — this passthrough is the escape hatch for unrelated apiserver flags. The tenant control plane sets each of the following flags itself and drops an entry naming one before the apiserver sees it. The chart moves an `--enable-admission-plugins=` entry into `controlPlane.apiServer.admissionControllers` and a `--kubelet-preferred-address-types=` entry into `controlPlane.kubelet.preferredAddressTypes` while that field is empty, and refuses any other entry naming one of them: `--advertise-address`, `--client-ca-file`, `--enable-admission-plugins`, `--service-cluster-ip-range`, `--kubelet-client-certificate`, `--kubelet-client-key`, `--kubelet-preferred-address-types`, `--proxy-client-cert-file`, `--proxy-client-key-file`, `--requestheader-allowed-names`, `--requestheader-client-ca-file`, `--secure-port`, `--service-account-key-file`, `--service-account-signing-key-file`, `--tls-cert-file`, `--tls-private-key-file`, `--etcd-servers`, `--etcd-cafile`, `--etcd-certfile`, `--etcd-keyfile`, `--etcd-prefix`, `--etcd-compaction-interval`, `--egress-selector-config-file`. When `spec.oidc.mode` is not `None` the chart also renders OIDC flags here, reads what you have written on them, and refuses some combinations outright; `docs/oidc-tenant.md` carries which flags, which combinations, and why. Do NOT add legacy `--oidc-*` flags here when `spec.oidc.mode` is not `None`; the chart injects `--authentication-config` and the apiserver refuses to boot with both. Empty by default (no change to current behavior).
+	// +kubebuilder:default:={}
+	ExtraArgs []string `json:"extraArgs,omitempty"`
+	// Extra volume mounts added to the tenant kube-apiserver container, passed through to KamajiControlPlane `spec.apiServer.extraVolumeMounts`. Each `name` must reference a volume declared in `extraVolumes`; the chart-managed talos secret volumes cannot be mounted. Each item is a core/v1 VolumeMount. Empty by default.
+	// +kubebuilder:default:={}
+	ExtraVolumeMounts []k8sRuntime.RawExtension `json:"extraVolumeMounts,omitempty"`
+	// Extra volumes added to the control-plane Deployment, passed through to KamajiControlPlane `spec.deployment.extraVolumes`. Use to mount a ConfigMap or Secret holding an AuthenticationConfiguration file referenced by `extraArgs`. Each item is a core/v1 Volume, but because the control-plane pod runs on the management cluster only `configMap` and `secret` sources are allowed (host-reaching sources like `hostPath`/`csi` and token-projection via `projected` are rejected); each volume must have a unique, non-empty name and exactly one source. The names `talos-ca` and `talos-tls-cert` are reserved by the chart. Empty by default.
+	// +kubebuilder:default:={}
+	ExtraVolumes []k8sRuntime.RawExtension `json:"extraVolumes,omitempty"`
 	// CPU and memory resources for API Server.
 	// +kubebuilder:default:={}
 	Resources Resources `json:"resources"`
@@ -55,15 +77,12 @@ type Addons struct {
 	// Cert-manager addon.
 	// +kubebuilder:default:={}
 	CertManager CertManagerAddon `json:"certManager"`
-	// Cilium CNI plugin.
+	// Cilium CNI plugin. Always installed as the tenant cluster's CNI; this section only overrides its Helm values.
 	// +kubebuilder:default:={}
 	Cilium CiliumAddon `json:"cilium"`
-	// CoreDNS addon.
+	// CoreDNS addon. Always installed as the tenant cluster's DNS; this section only overrides its Helm values.
 	// +kubebuilder:default:={}
 	Coredns CoreDNSAddon `json:"coredns"`
-	// FluxCD GitOps operator.
-	// +kubebuilder:default:={}
-	Fluxcd FluxCDAddon `json:"fluxcd"`
 	// Gateway API addon.
 	// +kubebuilder:default:={}
 	GatewayAPI GatewayAPIAddon `json:"gatewayAPI"`
@@ -85,7 +104,7 @@ type Addons struct {
 	// Velero backup/restore addon.
 	// +kubebuilder:default:={}
 	Velero VeleroAddon `json:"velero"`
-	// Vertical Pod Autoscaler.
+	// Vertical Pod Autoscaler. Installed and removed together with addons.monitoringAgents.enabled; this section only overrides its Helm values.
 	// +kubebuilder:default:={}
 	VerticalPodAutoscaler VerticalPodAutoscalerAddon `json:"verticalPodAutoscaler"`
 }
@@ -115,6 +134,9 @@ type ControlPlane struct {
 	// Konnectivity configuration.
 	// +kubebuilder:default:={}
 	Konnectivity Konnectivity `json:"konnectivity"`
+	// Kubelet connection settings.
+	// +kubebuilder:default:={}
+	Kubelet Kubelet `json:"kubelet,omitempty"`
 	// Number of control-plane replicas.
 	// +kubebuilder:default:=2
 	Replicas int `json:"replicas"`
@@ -138,20 +160,6 @@ type CoreDNSAddon struct {
 	ValuesOverride k8sRuntime.RawExtension `json:"valuesOverride"`
 }
 
-type FluxCDAddon struct {
-	// Enable FluxCD.
-	// +kubebuilder:default:=false
-	Enabled bool `json:"enabled"`
-	// Custom Helm values overrides.
-	// +kubebuilder:default:={}
-	ValuesOverride k8sRuntime.RawExtension `json:"valuesOverride"`
-}
-
-type GPU struct {
-	// Name of GPU, such as "nvidia.com/AD102GL_L40S".
-	Name string `json:"name"`
-}
-
 type GPUOperatorAddon struct {
 	// Enable GPU Operator.
 	// +kubebuilder:default:=false
@@ -177,6 +185,12 @@ type HAMiAddon struct {
 }
 
 type Images struct {
+	// Image used by the bootstrap-token tenant Job (kubectl). Empty falls back to images/kubectl.tag.
+	// +kubebuilder:default:=""
+	Kubectl string `json:"kubectl,omitempty"`
+	// Image used by the talos-csr-signer sidecar in the Kamaji control plane. Empty falls back to images/talos-csr-signer.tag.
+	// +kubebuilder:default:=""
+	TalosCsrSigner string `json:"talosCsrSigner,omitempty"`
 	// Image used by the wait-for-kubeconfig init container. Empty falls back to images/busybox.tag.
 	// +kubebuilder:default:=""
 	WaitForKubeconfig string `json:"waitForKubeconfig,omitempty"`
@@ -213,20 +227,9 @@ type KonnectivityServer struct {
 }
 
 type Kubelet struct {
-	// Hard eviction threshold for memory (absolute like 200Mi or percentage like 7%).
-	// +kubebuilder:default:="7%"
-	EvictionHardMemory string `json:"evictionHardMemory,omitempty"`
-	// Soft eviction threshold for memory (absolute like 1Gi or percentage like 10%).
-	// +kubebuilder:default:="10%"
-	EvictionSoftMemory string `json:"evictionSoftMemory,omitempty"`
-	// CPU reserved for kubelet and container runtime. Auto-computed from instanceType if empty.
-	KubeReservedCpu string `json:"kubeReservedCpu,omitempty"`
-	// Memory reserved for kubelet and container runtime. Auto-computed from instanceType if empty.
-	KubeReservedMemory string `json:"kubeReservedMemory,omitempty"`
-	// CPU reserved for host OS. Auto-computed from instanceType if empty.
-	SystemReservedCpu string `json:"systemReservedCpu,omitempty"`
-	// Memory reserved for host OS. Auto-computed from instanceType if empty.
-	SystemReservedMemory string `json:"systemReservedMemory,omitempty"`
+	// Node address types the tenant kube-apiserver tries, in order, when it connects to a kubelet, passed through to KamajiControlPlane `spec.kubelet.preferredAddressTypes`, which the control plane renders as `--kubelet-preferred-address-types`. The KamajiControlPlane CRD rejects a repeated name. Empty by default, which renders `InternalIP`, `ExternalIP`, or the list of a `--kubelet-preferred-address-types=` entry in `controlPlane.apiServer.extraArgs` when there is one.
+	// +kubebuilder:default:={}
+	PreferredAddressTypes []NodeAddressType `json:"preferredAddressTypes,omitempty"`
 }
 
 type MonitoringAgentsAddon struct {
@@ -238,29 +241,38 @@ type MonitoringAgentsAddon struct {
 	ValuesOverride k8sRuntime.RawExtension `json:"valuesOverride"`
 }
 
-type NodeGroup struct {
-	// Persistent disk size for kubelet and containerd data.
-	// +kubebuilder:default:="20Gi"
-	DiskSize resource.Quantity `json:"diskSize"`
-	// List of GPUs to attach (NVIDIA driver requires at least 4 GiB RAM).
-	Gpus []GPU `json:"gpus,omitempty"`
-	// Virtual machine instance type.
-	// +kubebuilder:default:="u1.medium"
-	InstanceType string `json:"instanceType"`
-	// Kubelet resource reservations for this node group.
-	Kubelet Kubelet `json:"kubelet,omitempty"`
-	// Maximum number of replicas.
-	// +kubebuilder:default:=10
-	MaxReplicas int `json:"maxReplicas"`
-	// Minimum number of replicas.
-	// +kubebuilder:default:=0
-	MinReplicas int `json:"minReplicas"`
-	// CPU and memory resources for each worker node.
-	Resources Resources `json:"resources"`
-	// List of node roles.
-	Roles []string `json:"roles,omitempty"`
-	// StorageClass for worker node persistent disks. When empty, uses the management cluster default StorageClass (the one annotated storageclass.kubernetes.io/is-default-class: true). NOTE: deliberately not marked immutable — the field is optional and undefaulted, so a strict `self == oldSelf` rule would block any future attempt to set it on an existing node group.
-	StorageClass string `json:"storageClass,omitempty"`
+type OIDC struct {
+	// Tenant-supplied AuthenticationConfiguration; consumed only when `mode: CustomConfig`.
+	// +kubebuilder:default:={}
+	CustomConfig OIDCCustomConfig `json:"customConfig,omitempty"`
+	// Identity mode. `None`: no OIDC, only the static admin kubeconfig works. `System`: trust the platform Keycloak realm (`cozy` by default) via a per-cluster public client with audience binding; zero-config default. `CustomConfig`: trust a tenant-supplied issuer directly (BYO); `cozy` is not in the path.
+	// +kubebuilder:default:="None"
+	Mode OIDCMode `json:"mode"`
+	// Users granted access to the tenant cluster; each entry produces one ClusterRoleBinding inside the tenant cluster. Works for both `System` and `CustomConfig` modes.
+	// +kubebuilder:default:={}
+	Users []OIDCUser `json:"users,omitempty"`
+}
+
+type OIDCCustomConfig struct {
+	// Inline AuthenticationConfiguration YAML (`apiserver.config.k8s.io/v1beta1`). The chart writes the value verbatim into a Secret mounted at `/etc/kubernetes/authentication-config/config.yaml` on the kube-apiserver. Mutually exclusive with `secretRef.name`.
+	// +kubebuilder:default:=""
+	Config string `json:"config,omitempty"`
+	// Reference to an existing Secret in the tenant namespace carrying the `AuthenticationConfiguration`.
+	// +kubebuilder:default:={}
+	SecretRef OIDCSecretRef `json:"secretRef,omitempty"`
+}
+
+type OIDCSecretRef struct {
+	// Name of an existing Secret in the tenant (release) namespace whose `config.yaml` key holds an `apiserver.config.k8s.io/v1beta1` `AuthenticationConfiguration`. Mutually exclusive with `customConfig.config`.
+	// +kubebuilder:default:=""
+	Name string `json:"name,omitempty"`
+}
+
+type OIDCUser struct {
+	// Email address matched against the `email` claim from the issuer. Used verbatim as the `User:` subject in the ClusterRoleBinding inside the tenant cluster. The `email` claim is a built-in OIDC scope requested explicitly by the chart-generated `kubectl oidc-login` kubeconfig; every conformant OIDC provider (cozy realm included) emits it.
+	Email string `json:"email"`
+	// Role to bind: `admin` maps to `ClusterRole/cluster-admin`, `view` maps to `ClusterRole/view`.
+	Role OIDCRole `json:"role"`
 }
 
 type OuroborosAddon struct {
@@ -272,6 +284,70 @@ type OuroborosAddon struct {
 	ValuesOverride k8sRuntime.RawExtension `json:"valuesOverride"`
 }
 
+type Proxmox struct {
+	// Proxmox nodes capmox may place VMs on. Empty means every node in the Proxmox cluster.
+	// +kubebuilder:default:={}
+	AllowedNodes []string `json:"allowedNodes,omitempty"`
+	// Proxmox cloud-controller-manager settings.
+	// +kubebuilder:default:={}
+	Ccm ProxmoxCCM `json:"ccm,omitempty"`
+	// Proxmox CSI driver settings.
+	// +kubebuilder:default:={}
+	Csi ProxmoxCSI `json:"csi,omitempty"`
+	// Nameservers written into each worker's network config. Required by the ProxmoxCluster schema.
+	// +kubebuilder:default:={}
+	DnsServers []string `json:"dnsServers,omitempty"`
+	// Skip verification of the Proxmox API server certificate in the CCM and the CSI controller, both of which run in the management cluster. Default false: the certificate is verified unless an operator turns that off. A stock Proxmox VE install serves a self-signed one, so set true for it, or install a certificate the management cluster trusts.
+	// +kubebuilder:default:=false
+	Insecure bool `json:"insecure,omitempty"`
+	// Address pool for workers. capmox assigns static addresses and has no DHCP mode, so this is required rather than optional.
+	// +kubebuilder:default:={}
+	Ipv4Config ProxmoxIPv4 `json:"ipv4Config"`
+}
+
+type ProxmoxCCM struct {
+	// Secret in THIS namespace holding the controller's Proxmox API credentials under the keys `url`, `token_id`, `token_secret` and `region`. May name the same Secret as `csi.credentialsSecretName`; it is a separate knob so the two can hold separate tokens, since this one only reads VM inventory while the driver attaches and detaches disks.
+	// +kubebuilder:default:=""
+	CredentialsSecretName string `json:"credentialsSecretName"`
+}
+
+type ProxmoxCSI struct {
+	// Secret in THIS namespace holding the driver's Proxmox API credentials under the keys `url`, `token_id`, `token_secret` and `region`. The parent chart composes them into the controller's config file here, in the management cluster; nothing reaches the tenant, and no token is written into a rendered manifest. Distinct from the capmox credentials on purpose: the driver attaches and detaches disks, which is a different blast radius from creating VMs.
+	// +kubebuilder:default:=""
+	CredentialsSecretName string `json:"credentialsSecretName"`
+	// Install the driver. Without it a Proxmox-backed tenant has no way to provision PersistentVolumes at all.
+	// +kubebuilder:default:=true
+	Enabled bool `json:"enabled"`
+	// StorageClasses to create in the tenant.
+	// +kubebuilder:default:={}
+	StorageClasses []ProxmoxStorageClass `json:"storageClasses,omitempty"`
+}
+
+type ProxmoxIPv4 struct {
+	// Ranges or CIDRs, e.g. `["10.0.0.120-10.0.0.170"]`. capmox turns these into an InClusterIPPool, so they must not overlap any DHCP range on the same L2 or two workers will answer to one address.
+	// +kubebuilder:default:={}
+	Addresses []string `json:"addresses,omitempty"`
+	// Default gateway for the workers.
+	// +kubebuilder:default:=""
+	Gateway string `json:"gateway"`
+	// Netmask prefix length.
+	// +kubebuilder:default:=24
+	Prefix int `json:"prefix"`
+}
+
+type ProxmoxStorageClass struct {
+	// Filesystem the driver formats volumes with: ext4 or xfs.
+	Fstype string `json:"fstype,omitempty"`
+	// StorageClass name inside the tenant cluster.
+	Name string `json:"name"`
+	// Delete or Retain.
+	ReclaimPolicy string `json:"reclaimPolicy,omitempty"`
+	// Mark volumes as SSD-backed, which changes the discard/cache defaults Proxmox applies.
+	Ssd bool `json:"ssd,omitempty"`
+	// Proxmox storage id the volumes are created on (as it appears in `pvesm status`).
+	Storage string `json:"storage"`
+}
+
 type Resources struct {
 	// CPU available.
 	Cpu resource.Quantity `json:"cpu,omitempty"`
@@ -288,6 +364,24 @@ type Scheduler struct {
 	ResourcesPreset ResourcesPreset `json:"resourcesPreset"`
 }
 
+type Talos struct {
+	// Base URL of the Talos Image Factory that serves the worker OS disk image (the `openstack-amd64.raw.xz` raw artifact streamed in by CDI over HTTP). Defaults to the public factory. Point at a self-hosted Image Factory, a caching mirror, or an internal HTTP file server for air-gapped, rate-limited, or flaky-egress environments. No trailing slash.
+	// +kubebuilder:default:="https://factory.talos.dev"
+	ImageFactoryURL string `json:"imageFactoryURL"`
+	// OCI repository prefix for the Talos installer image used by the in-guest `talos-reconcile` upgrade Job. Resolved as `<installerRepository>/<schematicID>:<version>`. Defaults to the public factory's installer path. Override for air-gapped or mirrored registries. No trailing slash.
+	// +kubebuilder:default:="factory.talos.dev/installer"
+	InstallerRepository string `json:"installerRepository"`
+	// Talos `machine.registries.mirrors` passthrough for worker nodes: a map of upstream registry host to `{ endpoints: [ ... ] }`. Empty by default, so workers pull container images (the Talos `kubelet` image included) directly from the upstream registry. Point a host such as `ghcr.io` at an in-cluster pull-through mirror for air-gapped, rate-limited, or flaky-egress environments so a worker's boot does not depend on live public egress. Talos still falls back to the upstream registry unless a host also sets `skipFallback: true`, so a mirror alone does not enforce air-gap.
+	// +kubebuilder:default:={}
+	RegistryMirrors k8sRuntime.RawExtension `json:"registryMirrors"`
+	// Talos image-factory schematic ID. Defaults to the cozystack-tested vanilla schematic. Operators using custom schematics (system extensions, kernel args) override here.
+	// +kubebuilder:default:="ce4c980550dd2ab1b17bbf2b08801c7eb59418eafe8f279833297925d67c7515"
+	SchematicID string `json:"schematicID"`
+	// Talos release used for worker OS image and installer. Must satisfy the chart's Talos<->Kubernetes support matrix against the chosen `version`.
+	// +kubebuilder:default:="v1.13.6"
+	Version string `json:"version"`
+}
+
 type VeleroAddon struct {
 	// Enable Velero.
 	// +kubebuilder:default:=false
@@ -303,11 +397,23 @@ type VerticalPodAutoscalerAddon struct {
 	ValuesOverride k8sRuntime.RawExtension `json:"valuesOverride"`
 }
 
+// +kubebuilder:validation:Enum="AlwaysAdmit";"AlwaysDeny";"AlwaysPullImages";"CertificateApproval";"CertificateSigning";"CertificateSubjectRestriction";"DefaultIngressClass";"DefaultStorageClass";"DefaultTolerationSeconds";"DenyEscalatingExec";"DenyExecOnPrivileged";"DenyServiceExternalIPs";"EventRateLimit";"ExtendedResourceToleration";"ImagePolicyWebhook";"LimitPodHardAntiAffinityTopology";"LimitRanger";"MutatingAdmissionWebhook";"NamespaceAutoProvision";"NamespaceExists";"NamespaceLifecycle";"NodeRestriction";"OwnerReferencesPermissionEnforcement";"PersistentVolumeClaimResize";"PersistentVolumeLabel";"PodNodeSelector";"PodSecurity";"PodSecurityPolicy";"PodTolerationRestriction";"Priority";"ResourceQuota";"RuntimeClass";"SecurityContextDeny";"ServiceAccount";"StorageObjectInUseProtection";"TaintNodesByCondition";"ValidatingAdmissionWebhook"
+type AdmissionController string
+
 // +kubebuilder:validation:Enum="Proxied";"LoadBalancer"
 type IngressNginxExposeMethod string
 
+// +kubebuilder:validation:Enum="Hostname";"InternalIP";"ExternalIP";"InternalDNS";"ExternalDNS"
+type NodeAddressType string
+
+// +kubebuilder:validation:Enum="None";"System";"CustomConfig"
+type OIDCMode string
+
+// +kubebuilder:validation:Enum="admin";"view"
+type OIDCRole string
+
 // +kubebuilder:validation:Enum="t1.nano";"t1.micro";"t1.small";"t1.medium";"t1.large";"t1.xlarge";"t1.2xlarge";"t1.4xlarge";"c1.nano";"c1.micro";"c1.small";"c1.medium";"c1.large";"c1.xlarge";"c1.2xlarge";"c1.4xlarge";"s1.nano";"s1.micro";"s1.small";"s1.medium";"s1.large";"s1.xlarge";"s1.2xlarge";"s1.4xlarge";"u1.nano";"u1.micro";"u1.small";"u1.medium";"u1.large";"u1.xlarge";"u1.2xlarge";"u1.4xlarge";"m1.nano";"m1.micro";"m1.small";"m1.medium";"m1.large";"m1.xlarge";"m1.2xlarge";"m1.4xlarge";"nano";"micro";"small";"medium";"large";"xlarge";"2xlarge"
 type ResourcesPreset string
 
-// +kubebuilder:validation:Enum="v1.35";"v1.34";"v1.33";"v1.32";"v1.31";"v1.30"
+// +kubebuilder:validation:Enum="v1.35";"v1.34";"v1.33";"v1.32";"v1.31"
 type Version string
diff --git a/api/apps/v1alpha1/kubernetes/zz_generated.deepcopy.go b/api/apps/v1alpha1/kubernetes/zz_generated.deepcopy.go
index 8dc8271b39..c35738a567 100644
--- a/api/apps/v1alpha1/kubernetes/zz_generated.deepcopy.go
+++ b/api/apps/v1alpha1/kubernetes/zz_generated.deepcopy.go
@@ -27,6 +27,30 @@ import (
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *APIServer) DeepCopyInto(out *APIServer) {
 	*out = *in
+	if in.AdmissionControllers != nil {
+		in, out := &in.AdmissionControllers, &out.AdmissionControllers
+		*out = make([]AdmissionController, len(*in))
+		copy(*out, *in)
+	}
+	if in.ExtraArgs != nil {
+		in, out := &in.ExtraArgs, &out.ExtraArgs
+		*out = make([]string, len(*in))
+		copy(*out, *in)
+	}
+	if in.ExtraVolumeMounts != nil {
+		in, out := &in.ExtraVolumeMounts, &out.ExtraVolumeMounts
+		*out = make([]runtime.RawExtension, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+	if in.ExtraVolumes != nil {
+		in, out := &in.ExtraVolumes, &out.ExtraVolumes
+		*out = make([]runtime.RawExtension, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
 	in.Resources.DeepCopyInto(&out.Resources)
 }
 
@@ -46,7 +70,6 @@ func (in *Addons) DeepCopyInto(out *Addons) {
 	in.CertManager.DeepCopyInto(&out.CertManager)
 	in.Cilium.DeepCopyInto(&out.Cilium)
 	in.Coredns.DeepCopyInto(&out.Coredns)
-	in.Fluxcd.DeepCopyInto(&out.Fluxcd)
 	out.GatewayAPI = in.GatewayAPI
 	in.GpuOperator.DeepCopyInto(&out.GpuOperator)
 	in.Hami.DeepCopyInto(&out.Hami)
@@ -128,16 +151,12 @@ func (in *Config) DeepCopyObject() runtime.Object {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *ConfigSpec) DeepCopyInto(out *ConfigSpec) {
 	*out = *in
-	if in.NodeGroups != nil {
-		in, out := &in.NodeGroups, &out.NodeGroups
-		*out = make(map[string]NodeGroup, len(*in))
-		for key, val := range *in {
-			(*out)[key] = *val.DeepCopy()
-		}
-	}
+	in.Proxmox.DeepCopyInto(&out.Proxmox)
 	in.Addons.DeepCopyInto(&out.Addons)
 	in.ControlPlane.DeepCopyInto(&out.ControlPlane)
 	out.Images = in.Images
+	in.Talos.DeepCopyInto(&out.Talos)
+	in.Oidc.DeepCopyInto(&out.Oidc)
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ConfigSpec.
@@ -156,6 +175,7 @@ func (in *ControlPlane) DeepCopyInto(out *ControlPlane) {
 	in.ApiServer.DeepCopyInto(&out.ApiServer)
 	in.ControllerManager.DeepCopyInto(&out.ControllerManager)
 	in.Konnectivity.DeepCopyInto(&out.Konnectivity)
+	in.Kubelet.DeepCopyInto(&out.Kubelet)
 	in.Scheduler.DeepCopyInto(&out.Scheduler)
 }
 
@@ -201,37 +221,6 @@ func (in *CoreDNSAddon) DeepCopy() *CoreDNSAddon {
 	return out
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *FluxCDAddon) DeepCopyInto(out *FluxCDAddon) {
-	*out = *in
-	in.ValuesOverride.DeepCopyInto(&out.ValuesOverride)
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new FluxCDAddon.
-func (in *FluxCDAddon) DeepCopy() *FluxCDAddon {
-	if in == nil {
-		return nil
-	}
-	out := new(FluxCDAddon)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *GPU) DeepCopyInto(out *GPU) {
-	*out = *in
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new GPU.
-func (in *GPU) DeepCopy() *GPU {
-	if in == nil {
-		return nil
-	}
-	out := new(GPU)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *GPUOperatorAddon) DeepCopyInto(out *GPUOperatorAddon) {
 	*out = *in
@@ -350,6 +339,11 @@ func (in *KonnectivityServer) DeepCopy() *KonnectivityServer {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *Kubelet) DeepCopyInto(out *Kubelet) {
 	*out = *in
+	if in.PreferredAddressTypes != nil {
+		in, out := &in.PreferredAddressTypes, &out.PreferredAddressTypes
+		*out = make([]NodeAddressType, len(*in))
+		copy(*out, *in)
+	}
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Kubelet.
@@ -379,29 +373,68 @@ func (in *MonitoringAgentsAddon) DeepCopy() *MonitoringAgentsAddon {
 }
 
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *NodeGroup) DeepCopyInto(out *NodeGroup) {
+func (in *OIDC) DeepCopyInto(out *OIDC) {
 	*out = *in
-	out.DiskSize = in.DiskSize.DeepCopy()
-	if in.Gpus != nil {
-		in, out := &in.Gpus, &out.Gpus
-		*out = make([]GPU, len(*in))
+	out.CustomConfig = in.CustomConfig
+	if in.Users != nil {
+		in, out := &in.Users, &out.Users
+		*out = make([]OIDCUser, len(*in))
 		copy(*out, *in)
 	}
-	out.Kubelet = in.Kubelet
-	in.Resources.DeepCopyInto(&out.Resources)
-	if in.Roles != nil {
-		in, out := &in.Roles, &out.Roles
-		*out = make([]string, len(*in))
-		copy(*out, *in)
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new OIDC.
+func (in *OIDC) DeepCopy() *OIDC {
+	if in == nil {
+		return nil
 	}
+	out := new(OIDC)
+	in.DeepCopyInto(out)
+	return out
 }
 
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new NodeGroup.
-func (in *NodeGroup) DeepCopy() *NodeGroup {
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *OIDCCustomConfig) DeepCopyInto(out *OIDCCustomConfig) {
+	*out = *in
+	out.SecretRef = in.SecretRef
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new OIDCCustomConfig.
+func (in *OIDCCustomConfig) DeepCopy() *OIDCCustomConfig {
 	if in == nil {
 		return nil
 	}
-	out := new(NodeGroup)
+	out := new(OIDCCustomConfig)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *OIDCSecretRef) DeepCopyInto(out *OIDCSecretRef) {
+	*out = *in
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new OIDCSecretRef.
+func (in *OIDCSecretRef) DeepCopy() *OIDCSecretRef {
+	if in == nil {
+		return nil
+	}
+	out := new(OIDCSecretRef)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *OIDCUser) DeepCopyInto(out *OIDCUser) {
+	*out = *in
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new OIDCUser.
+func (in *OIDCUser) DeepCopy() *OIDCUser {
+	if in == nil {
+		return nil
+	}
+	out := new(OIDCUser)
 	in.DeepCopyInto(out)
 	return out
 }
@@ -422,6 +455,104 @@ func (in *OuroborosAddon) DeepCopy() *OuroborosAddon {
 	return out
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *Proxmox) DeepCopyInto(out *Proxmox) {
+	*out = *in
+	if in.AllowedNodes != nil {
+		in, out := &in.AllowedNodes, &out.AllowedNodes
+		*out = make([]string, len(*in))
+		copy(*out, *in)
+	}
+	out.Ccm = in.Ccm
+	in.Csi.DeepCopyInto(&out.Csi)
+	if in.DnsServers != nil {
+		in, out := &in.DnsServers, &out.DnsServers
+		*out = make([]string, len(*in))
+		copy(*out, *in)
+	}
+	in.Ipv4Config.DeepCopyInto(&out.Ipv4Config)
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Proxmox.
+func (in *Proxmox) DeepCopy() *Proxmox {
+	if in == nil {
+		return nil
+	}
+	out := new(Proxmox)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *ProxmoxCCM) DeepCopyInto(out *ProxmoxCCM) {
+	*out = *in
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ProxmoxCCM.
+func (in *ProxmoxCCM) DeepCopy() *ProxmoxCCM {
+	if in == nil {
+		return nil
+	}
+	out := new(ProxmoxCCM)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *ProxmoxCSI) DeepCopyInto(out *ProxmoxCSI) {
+	*out = *in
+	if in.StorageClasses != nil {
+		in, out := &in.StorageClasses, &out.StorageClasses
+		*out = make([]ProxmoxStorageClass, len(*in))
+		copy(*out, *in)
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ProxmoxCSI.
+func (in *ProxmoxCSI) DeepCopy() *ProxmoxCSI {
+	if in == nil {
+		return nil
+	}
+	out := new(ProxmoxCSI)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *ProxmoxIPv4) DeepCopyInto(out *ProxmoxIPv4) {
+	*out = *in
+	if in.Addresses != nil {
+		in, out := &in.Addresses, &out.Addresses
+		*out = make([]string, len(*in))
+		copy(*out, *in)
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ProxmoxIPv4.
+func (in *ProxmoxIPv4) DeepCopy() *ProxmoxIPv4 {
+	if in == nil {
+		return nil
+	}
+	out := new(ProxmoxIPv4)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *ProxmoxStorageClass) DeepCopyInto(out *ProxmoxStorageClass) {
+	*out = *in
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ProxmoxStorageClass.
+func (in *ProxmoxStorageClass) DeepCopy() *ProxmoxStorageClass {
+	if in == nil {
+		return nil
+	}
+	out := new(ProxmoxStorageClass)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *Resources) DeepCopyInto(out *Resources) {
 	*out = *in
@@ -455,6 +586,22 @@ func (in *Scheduler) DeepCopy() *Scheduler {
 	return out
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *Talos) DeepCopyInto(out *Talos) {
+	*out = *in
+	in.RegistryMirrors.DeepCopyInto(&out.RegistryMirrors)
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Talos.
+func (in *Talos) DeepCopy() *Talos {
+	if in == nil {
+		return nil
+	}
+	out := new(Talos)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *VeleroAddon) DeepCopyInto(out *VeleroAddon) {
 	*out = *in
diff --git a/api/apps/v1alpha1/kubernetesnodes/types.go b/api/apps/v1alpha1/kubernetesnodes/types.go
new file mode 100644
index 0000000000..b62cc5ea87
--- /dev/null
+++ b/api/apps/v1alpha1/kubernetesnodes/types.go
@@ -0,0 +1,216 @@
+// Code generated by values-gen. DO NOT EDIT.
+// +kubebuilder:object:generate=true
+// +groupName=apps.cozystack.io
+// +versionName=v1alpha1
+package kubernetesnodes
+
+import (
+	resource "k8s.io/apimachinery/pkg/api/resource"
+	"k8s.io/apimachinery/pkg/apis/meta/v1"
+	k8sRuntime "k8s.io/apimachinery/pkg/runtime"
+)
+
+// +kubebuilder:object:root=true
+type Config struct {
+	v1.TypeMeta   `json:",inline"`
+	v1.ObjectMeta `json:"metadata,omitempty"`
+	Spec          ConfigSpec `json:"spec,omitempty"`
+}
+
+type ConfigSpec struct {
+	// Name of the parent Kubernetes cluster (the `Kubernetes` CR) in the same namespace this node pool attaches to. Required. The pool's CAPI objects are wired to the parent cluster `kubernetes-<cluster>`; the KubernetesNodes CR must be named `<cluster>-<pool>`. The pool name (the part after `<cluster>-`) must not collide with a nodeGroup still managed by the parent kubernetes chart (e.g. the default `md0`), or the render fails on ownership conflict.
+	// +kubebuilder:default:=""
+	// +kubebuilder:validation:XValidation:rule="self == oldSelf",message="cluster is immutable"
+	Cluster string `json:"cluster"`
+	// StorageClass for the worker node system disk. When empty, the cluster default applies. Worker VMs live-migrate, so their disks need ReadWriteMany — the RWX access mode is supplied by the chosen StorageClass's CDI StorageProfile — and linstor-csi rejects RWX volumes that are not on a DRBD-backed StorageClass, so prefer a replicated/DRBD class. On an `osImage.builtin` pool this field also decides whether the pool renders at all: CDI takes the storage-layer clone path only when the worker disk and the golden share a StorageClass, and falls back to a host-assisted copy over the pod network across classes, so the chart refuses a pool whose class differs from its golden's. Leaving it empty resolves to the cluster's default StorageClass, and the same comparison is made against that. On a `builtin` pool the resolved class is then written onto the worker disk rather than left for the cluster to fill in at bind time, so a pool that has already cloned keeps binding on the class its disks are on even after an admin moves the default annotation; on the HTTP path an empty class is still left to the cluster.
+	// +kubebuilder:default:="replicated"
+	// +kubebuilder:validation:XValidation:rule="self == oldSelf",message="storageClass is immutable"
+	StorageClass string `json:"storageClass"`
+	// Minimum number of replicas in this pool. Used as the cluster-autoscaler floor.
+	// +kubebuilder:default:=0
+	MinReplicas int `json:"minReplicas"`
+	// Maximum number of replicas in this pool. Used as the cluster-autoscaler ceiling.
+	// +kubebuilder:default:=10
+	MaxReplicas int `json:"maxReplicas"`
+	// Virtual machine instance type.
+	// +kubebuilder:default:="u1.medium"
+	InstanceType string `json:"instanceType"`
+	// System disk size for the worker VM. Carries the Talos OS image, kubelet state, containerd image cache, and any local-path PVCs. How the OS image reaches the disk follows this pool's `osImage`: the default and `osImage.factory` stream the Image Factory raw artifact in over HTTP, while `osImage.builtin` makes the disk a storage-layer CDI clone of a shared golden image, with no HTTP fetch. A `builtin` pool must keep diskSize at or above the golden's storage size (6Gi in the shipped worker image catalog), because a CDI clone target cannot be smaller than its source -- the chart rejects a smaller value at render time rather than letting the clone stall. Sizing a `builtin` pool also has to allow for transient headroom the finished disk does not show: CDI populates a larger target by cloning the golden at the source size and then growing it, so a worker being provisioned occupies a temporary clone PVC at the golden's size on top of this diskSize, and both are multiplied by the replica count of a replicated StorageClass. The golden itself is a separate one-time cost for the whole cluster, not a per-worker one. So the peak is the golden, plus `diskSize + golden storage` for each worker cloning at that moment. A pool whose storage backend cannot spare that peak does not fail: the clone waits for space, the VM never boots, and the reason is visible only in the storage layer's own events.
+	// +kubebuilder:default:="20Gi"
+	DiskSize resource.Quantity `json:"diskSize"`
+	// List of node roles. Each role `r` labels nodes with `node-role.kubernetes.io/<r>`. Use `[ingress-nginx]` for a pool that hosts the tenant ingress-nginx controller.
+	// +kubebuilder:default:={}
+	Roles []string `json:"roles,omitempty"`
+	// Explicit CPU and memory for each worker node, as an alternative to `instanceType` sizing. Optional: when omitted, the node is sized by `instanceType`. When both `cpu` and `memory` are set, they take precedence and `instanceType` is ignored (the instancetype is omitted from the VM, since KubeVirt cannot override an instancetype's CPU/memory). Set both `cpu` and `memory` together or neither; setting only one is rejected at render time.
+	// +kubebuilder:default:={}
+	Resources Resources `json:"resources,omitempty"`
+	// CPU limit for the worker VM's virt-launcher `compute` container, which is the ceiling the guest vCPU threads, the QEMU emulator thread and the IO threads share. Distinct from `resources.cpu`, which sizes the guest itself. Cannot be combined with `instanceType` sizing: KubeVirt refuses a VM that references an instancetype and also sets `domain.resources.limits.cpu`, so the chart rejects that combination at render time. Sizing the pool by `resources` (both `cpu` and `memory`) is what drops the instancetype from the VM, which is where the limit is usable. When unset, KubeVirt derives the limit from the guest vCPU count in any namespace carrying a ResourceQuota that limits CPU, so a worker sized at N vCPUs runs under a ceiling of N with the emulation overhead taken out of the same N. Setting a value declares the limit on the VM directly, which is both what lands it on the container and what stops KubeVirt deriving one. It moves the CPU request with it: KubeVirt copies a declared CPU limit into the CPU request when the VM declares no request of its own, so a pool that sets only this field asks the scheduler for its whole ceiling instead of the fraction of the vCPU count it asked for before, and a ceiling the nodes cannot spare leaves the workers Pending on `Insufficient cpu`. Pair it with `podCpuRequest` to move the ceiling without moving the request. Zero means no ceiling at all rather than the tightest one, since the kubelet turns a zero CPU limit into no CFS quota while the declared key still stops KubeVirt deriving one — but it is only accepted together with `podCpuRequest: 0`, because KubeVirt keeps deriving a request from the vCPU count when the VM declares none and a request above a declared limit of zero is rejected when the worker's Pod is created. A negative value is refused at render time. Changing it rolls the pool, because the worker VM template is named by a hash of its content. Keep in sync with the parent kubernetes chart.
+	PodCpuLimit resource.Quantity `json:"podCpuLimit,omitempty"`
+	// CPU request for the worker VM's virt-launcher `compute` container, which is what the scheduler reserves for a worker on its host and what weights it against neighbours on a contended one. Distinct from `resources.cpu`, which sizes the guest itself. It exists to be paired with `podCpuLimit`: KubeVirt copies a declared CPU limit into the request when the VM declares no request, so raising the ceiling alone raises what every worker in the pool asks the scheduler for, and this field is what holds the request still while the ceiling moves. Cannot be combined with `instanceType` sizing, for the same reason as `podCpuLimit`: KubeVirt refuses a VM that references an instancetype and also sets `domain.resources.requests.cpu`, so the chart rejects that combination at render time, as it does a value above `podCpuLimit`. Usable without a limit, where it only changes the scheduler's weighting: KubeVirt still derives the ceiling from the guest vCPU count in any namespace carrying a ResourceQuota that limits CPU, so keep the request at or below that count. A request above that derived ceiling is refused only when the worker's Pod is created, and deliberately not at render time: the ceiling exists only where such a ResourceQuota does, so refusing here would take away a configuration that works in a namespace without one. Zero is accepted on its own and reserves nothing, but zero beside a `podCpuLimit` is refused, because KubeVirt cannot tell an explicit zero request from an absent one and replaces both with the limit — which is the outcome this field exists to avoid, arrived at silently. A negative value is refused as well. When unset, KubeVirt computes the request from the guest vCPU count and the cluster CPU allocation ratio. Changing it rolls the pool, because the worker VM template is named by a hash of its content. Keep in sync with the parent kubernetes chart.
+	PodCpuRequest resource.Quantity `json:"podCpuRequest,omitempty"`
+	// List of GPUs to attach (NVIDIA driver requires at least 4 GiB RAM).
+	// +kubebuilder:default:={}
+	Gpus []GPU `json:"gpus,omitempty"`
+	// Kernel modules loaded on every worker in this pool, emitted as Talos `machine.kernel.modules`. A Talos system extension installs a module but does not load it, so an extension-provided driver needs its modules declared here. Leave unset to let the chart decide: a pool holding at least one `nvidia.com/*` GPU gets `nvidia` (with `NVreg_NvLinkDisable=1`, which the gpu-operator driver container applies on non-Talos workers; on Talos that container has to be turned off or it clashes with the system extension, and nothing then mounts the ConfigMap carrying the parameter), `nvidia_uvm`, `nvidia_drm`, `nvidia_modeset` (that order — Talos loads the list in sequence and the last three depend on the first), and any other pool gets nothing. Set a non-empty list to replace the chart's choice entirely, or `[]` to opt out and emit no modules even on a GPU pool. The field carries no default, and unset is not the same value as `[]`: a generated parameter table that shows `[]` in its Default column is printing what it prints for any array with no default, not the effective value — leaving the field out selects the automatic set, writing `[]` disables it. The module still has to be in the image, and which extensions the image carries is the pool's schematic: a GPU pool points `osImage.factory.schematicID` (or `osImage.builtin.schematicID`) at a schematic with the NVIDIA extensions, and on Blackwell (GB202) that must be the open-kernel-modules extension. The automatic set keys on the `nvidia.com/` resource prefix alone and nothing cross-checks it against that schematic; on Talos v1.13 a declared module the image does not ship leaves its controller retrying rather than failing the boot, so the symptom is a missing driver, not a dead node. This value is part of the worker machine config, whose content hash names the `TalosConfigTemplate`, so changing it rolls every existing worker in the pool rather than only affecting nodes created later. The automatic set is itself such a change, on the upgrade that introduces this field, for every existing pool that holds an `nvidia.com/*` GPU and leaves the field unset: that pool rolls.
+	KernelModules []KernelModule `json:"kernelModules,omitempty"`
+	// Kubelet resource reservations for this pool.
+	// +kubebuilder:default:={}
+	Kubelet Kubelet `json:"kubelet,omitempty"`
+	// Stream each worker VM's guest serial console into a `guest-console-log` container beside virt-launcher, readable with `kubectl logs`. The only view of a worker that stalls during boot before Talos apid answers, when neither a Node nor a certificate request exists to diagnose from. Two costs the field name does not show. Changing the value rolls the pool, because it is part of the worker VM template whose name is a hash of its content -- including the stuck VM whose console was wanted, so it buys visibility into the next boot rather than the current one. And it overrides the platform's cluster-wide `disableSerialConsoleLog`, set because that container has been seen holding virt-launcher in `PodInitializing` (kubevirt/kubevirt#15989), which would take the pool down rather than explain it -- so check that virt-launcher Pods reach Running after enabling it.
+	// +kubebuilder:default:=false
+	LogSerialConsole bool `json:"logSerialConsole"`
+	// Maximum number of unhealthy nodes tolerated in this pool before remediation is paused. The MachineHealthCheck admission webhook accepts either a bare integer ("0", "1", ...) or a percentage ("0%", "50%"); bare numeric strings are rejected, so the safer default is a percentage. Drop to "0%" once the pool is stable. Watch how a percentage behaves in a small group: the MachineHealthCheck controller scales it against the number of machines the check covers and rounds down, then remediates only while the unhealthy count is at or below that result. At "50%" a group of one therefore never remediates, because half of one rounds down to zero, and a group of two remediates one unhealthy machine but not two.
+	// +kubebuilder:default:="50%"
+	MaxUnhealthy string `json:"maxUnhealthy"`
+	// Maximum time a Machine is allowed to spend reaching the Ready condition before it is remediated. Raise for slow first boots (Talos image fetch from factory.talos.dev or a busy storage class on the kubevirt-csi PVC populator). The MachineHealthCheck measures it from the later of the Machine's creation and its InfrastructureReady transition, so the clock restarts when the infrastructure reports ready: a worker gets this long for the disk image import and the VM to come up, and then this long again for the guest to boot and its kubelet to register with the tenant apiserver. Either leg stretches on a host under load, and a Machine remediated here is deleted before it ever joins, so its replacement starts the same sequence from the beginning.
+	// +kubebuilder:default:="20m"
+	NodeStartupTimeout string `json:"nodeStartupTimeout"`
+	// How long a worker Node may report `Ready=Unknown` before the MachineHealthCheck remediates the Machine, which for a KubeVirt worker means deleting the VM. `Ready=Unknown` is what the node lifecycle controller writes once it stops hearing from a kubelet, on a grace period of its own, so the wall clock from a guest going quiet to a deleted worker is this value plus that grace period. A guest starved of CPU stops answering long before it is dead, so a value of a few tens of seconds deletes workers that would have come back on their own. Validated at render time like maxNodeProvisionTime: the CAPI webhook does not check these timeouts, and a zero or negative value would remediate the moment the condition flips. Keep in sync with the parent kubernetes chart.
+	// +kubebuilder:default:="5m"
+	ReadyUnknownTimeout string `json:"readyUnknownTimeout"`
+	// How long a worker Node may report `Ready=False` before the MachineHealthCheck remediates the Machine. A Node that has registered but has no working CNI yet reports `Ready=False`, so this value is the whole budget a first boot gets for the CNI rollout to reach that node, and a worker deleted mid-rollout takes the rollout with it while its replacement starts over. Raising it delays replacing a worker that is genuinely dead, but not rescheduling its workload: Pods leave an unreachable Node on the node lifecycle controller's taint-based eviction and the toleration that carries, not on this timer. Validated at render time like maxNodeProvisionTime: the CAPI webhook does not check these timeouts, and a zero or negative value would remediate the moment the condition flips. Keep in sync with the parent kubernetes chart.
+	// +kubebuilder:default:="10m"
+	ReadyFalseTimeout string `json:"readyFalseTimeout"`
+	// How long the cluster-autoscaler waits for a newly created worker to register as a Node before it treats that machine as long-unregistered. Rendered onto this pool's MachineDeployment as the `cluster.x-k8s.io/autoscaling-options-maxnodeprovisiontime` annotation, which overrides the autoscaler's built-in default for this pool only. Two things change when the timer fires, and both make a slow join worse rather than better: the machine stops counting towards the pool's upcoming capacity, so the autoscaler asks for a replacement for capacity that is already on its way, and the machine becomes eligible for removal. Size it above the slowest join a healthy worker can take, counting the Talos image import, the guest boot and the CNI rollout. Accepted as a whole number of seconds, minutes or hours ("30m", "1h30m"), which is narrower than Go's duration syntax on purpose: the autoscaler ignores a value it cannot parse and falls back to its own default without failing, and the narrower shape cannot express a value that overflows the parser or a fraction it rounds to zero. The canonical form a duration serializes back to ("20m0s", "1h0m0s") is accepted. Keep in sync with the parent kubernetes chart.
+	// +kubebuilder:default:="30m"
+	MaxNodeProvisionTime string `json:"maxNodeProvisionTime"`
+	// Kubernetes major.minor version the pool joins. Must not be ahead of the parent cluster's minor (workers may not lead the apiserver); it may lag behind during a rolling upgrade -- bump the parent Kubernetes CR first, then each pool -- and must satisfy the Talos<->Kubernetes support matrix against `talos.version`.
+	// +kubebuilder:default:="v1.35"
+	Version Version `json:"version"`
+	// Worker OS image source for this pool. Default (omitted): import over HTTP from the `talos.*` Image Factory. Set `osImage.builtin` to clone a golden from the opt-in worker image catalog instead. Editing this on an existing pool re-images that pool.
+	// +kubebuilder:default:={}
+	OsImage WorkerImage `json:"osImage,omitempty"`
+	// Talos worker image configuration. Keep in sync with the parent cluster's `talos`.
+	// +kubebuilder:default:={}
+	Talos Talos `json:"talos"`
+	// Which infrastructure provider backs this pool's worker VMs. `kubevirt` runs them inside this cluster on KubeVirt, sized by `instanceType` and booted from a Talos disk image CDI streams from the image factory. `proxmox` runs them on an external Proxmox VE cluster through capmox, sized by `resources`, and cloned from a Talos VM template that already exists on the hypervisor. The two substrates take different Talos platform images and different sizing inputs, so switching an existing pool is refused: the chart reads the live MachineDeployment's template kind and fails the render rather than rolling every worker to the other hypervisor and deleting the template the draining MachineSet still references. Create a new pool on the other substrate and scale this one down.
+	// +kubebuilder:default:="kubevirt"
+	// +kubebuilder:validation:XValidation:rule="self == oldSelf",message="substrate is immutable"
+	Substrate string `json:"substrate"`
+	// Proxmox substrate settings.
+	// +kubebuilder:default:={}
+	Proxmox Proxmox `json:"proxmox"`
+	// Optional image overrides for air-gapped or rate-limited registries.
+	// +kubebuilder:default:={}
+	Images Images `json:"images"`
+}
+
+type GPU struct {
+	// Name of GPU, such as "nvidia.com/AD102GL_L40S".
+	Name string `json:"name"`
+}
+
+type Images struct {
+	// Image used by the talos-reconcile and pre-delete unpin Jobs (kubectl). Empty falls back to images/kubectl.tag.
+	// +kubebuilder:default:=""
+	Kubectl string `json:"kubectl,omitempty"`
+}
+
+type KernelModule struct {
+	// Module name as `modprobe` takes it, e.g. `nvidia_uvm`.
+	Name string `json:"name"`
+	// Module parameters, each as a bare `key=value` string.
+	Parameters []string `json:"parameters,omitempty"`
+}
+
+type Kubelet struct {
+	// Hard eviction threshold for memory (absolute like 200Mi or percentage like 7%).
+	// +kubebuilder:default:="7%"
+	EvictionHardMemory string `json:"evictionHardMemory,omitempty"`
+	// Soft eviction threshold for memory (absolute like 1Gi or percentage like 10%).
+	// +kubebuilder:default:="10%"
+	EvictionSoftMemory string `json:"evictionSoftMemory,omitempty"`
+	// CPU reserved for kubelet and container runtime. Auto-computed from instanceType if empty.
+	KubeReservedCpu string `json:"kubeReservedCpu,omitempty"`
+	// Memory reserved for kubelet and container runtime. Auto-computed from instanceType if empty.
+	KubeReservedMemory string `json:"kubeReservedMemory,omitempty"`
+	// CPU reserved for host OS. Auto-computed from instanceType if empty.
+	SystemReservedCpu string `json:"systemReservedCpu,omitempty"`
+	// Memory reserved for host OS. Auto-computed from instanceType if empty.
+	SystemReservedMemory string `json:"systemReservedMemory,omitempty"`
+}
+
+type Proxmox struct {
+	// Nameservers written into the worker machineconfig. On kubevirt the workers use the management cluster's CoreDNS, which they reach over the pod network; an off-cluster Proxmox worker cannot, so it needs reachable resolvers of its own. Required when `substrate` is `proxmox`. Keep in sync with the parent kubernetes chart's `proxmox.dnsServers`.
+	// +kubebuilder:default:={}
+	DnsServers []string `json:"dnsServers,omitempty"`
+	// Full clone rather than linked. Default is a linked clone: it costs kilobytes at creation instead of the whole disk, because a ZFS-backed linked clone writes only its own increment (measured: 8K against 10.2G for the same worker full-cloned onto a `sparse 0` pool). The cost is that the clone holds the template's base snapshot, so the template cannot be rotated while any linked clone still references it — which is what the consolidation CronJob resolves 24h after creation. Set true for a pool that must be independent of the template from the first second.
+	// +kubebuilder:default:=false
+	Full bool `json:"full,omitempty"`
+	// NIC configuration.
+	// +kubebuilder:default:={}
+	Network ProxmoxNetwork `json:"network"`
+	// Proxmox resource pool the worker VMs are added to. Set the same pool on every node pool of a tenant cluster and grant the tenant's tokens their privileges on `/pool/<name>`: that is the one ACL path that follows every VM capmox creates, replacements included. The pool must exist on the hypervisor; capmox does not create it. Empty adds the workers to no pool.
+	// +kubebuilder:default:=""
+	Pool string `json:"pool,omitempty"`
+	// Proxmox storage for the cloned disk; needs `full: true`. A target storage is a full-clone parameter — a linked clone always lives on the template's storage, and Proxmox refuses the pair — so the render refuses it too. Empty keeps the template's storage.
+	// +kubebuilder:default:=""
+	Storage string `json:"storage,omitempty"`
+	// Tags identifying the Talos VM template to clone. capmox matches a template when its tag set is EQUAL to this list, not when it contains it, so every tag on the template must be listed here — a missing one yields `found 0 VM templates with tags ...` while the tags are plainly present. The template has to carry this pool's `talos.schematicID` at `talos.version` in the nocloud flavour, with the Proxmox guest agent enabled for the `qemu-guest-agent` extension of the default schematic; `hack/proxmox-talos-template.sh` builds it from these values and prints the tags to list here. Do not build it from the platform release's `nocloud-amd64.raw.xz`: that is the bare-metal node image, whose `zfs` extension keeps a VM from finishing its boot sequence and reboots it at the Talos boot timeout. Required when `substrate` is `proxmox`.
+	// +kubebuilder:default:={}
+	TemplateTags []string `json:"templateTags,omitempty"`
+}
+
+type ProxmoxNetwork struct {
+	// Proxmox bridge the VM NIC attaches to (e.g. `vmbr0`). Required when `substrate` is `proxmox`.
+	// +kubebuilder:default:=""
+	Bridge string `json:"bridge"`
+	// NIC MTU. Omitted when unset.
+	Mtu int `json:"mtu,omitempty"`
+	// L2 VLAN tag. Omitted when unset.
+	Vlan int `json:"vlan,omitempty"`
+}
+
+type Resources struct {
+	// Number of vCPU cores for each worker VM, as a whole number such as `2`. On the `kubevirt` substrate the value becomes the VM's integer `domain.cpu.cores`, so millicore, fractional and negative quantities, and counts above 4294967295, are rejected at render time; an unquoted `0` is treated as unset. On the `proxmox` substrate a millicore or fractional quantity is rounded up to whole cores.
+	Cpu resource.Quantity `json:"cpu,omitempty"`
+	// Memory (RAM) available.
+	Memory resource.Quantity `json:"memory,omitempty"`
+}
+
+type Talos struct {
+	// Complete PEM certificate block(s) CDI must trust when importing this pool's worker OS disk image over HTTPS — the no-osImage default and `osImage.factory` path. Empty by default, so the importer uses only its system trust store, which is what the public factory needs. Set this when the factory in use (`imageFactoryURL` or `osImage.factory.imageFactoryURL`) is a self-hosted factory or mirror served by an internal CA, which the importer otherwise rejects with `x509: certificate signed by unknown authority`. The chart renders it into a ConfigMap in the release namespace — CDI requires certConfigMap to sit alongside the DataVolume — and references that from the worker DataVolume's `source.http.certConfigMap`; CDI appends it to the system pool rather than replacing it, so a publicly-trusted endpoint verifies either way. A pool on `osImage.builtin` clones a golden image and builds no HTTP source, so this field has no effect there.
+	// +kubebuilder:default:=""
+	ImageFactoryCA string `json:"imageFactoryCA,omitempty"`
+	// Default base URL of the Talos Image Factory that serves the worker OS disk image (the `openstack-amd64.raw.xz` raw artifact streamed in by CDI over HTTP). Applies only when this pool imports over HTTP — the default and `osImage.factory`, which overrides it via `osImage.factory.imageFactoryURL`. A pool on `osImage.builtin` clones a golden image from the worker image catalog and does not use this field at all. Defaults to the public factory. Point at a self-hosted Image Factory, a caching mirror, or an internal HTTP file server for air-gapped, rate-limited, or flaky-egress environments. No trailing slash. It is interpolated into the worker DataVolume source URL, so on those HTTP paths it must be a plain `http(s)` URL and the render refuses anything else; a pool on `osImage.builtin` builds no such URL and is not held to it, so blanking this field there is legal.
+	// +kubebuilder:default:="https://factory.talos.dev"
+	ImageFactoryURL string `json:"imageFactoryURL"`
+	// OCI repository prefix for the Talos installer image used by the in-guest `talos-reconcile` upgrade Job. Resolved as `<installerRepository>/<schematicID>:<version>` against whatever this pool's `osImage` pins, falling back to `talos.schematicID` and `talos.version` — so the installer matches the OS the pool actually booted. The prefix itself has no `osImage.*` override, so an air-gapped pool needs it pointed at a reachable registry as well. Defaults to the public factory's installer path. Override for air-gapped or mirrored registries. No trailing slash.
+	// +kubebuilder:default:="factory.talos.dev/installer"
+	InstallerRepository string `json:"installerRepository"`
+	// Talos `machine.registries.mirrors` passthrough for worker nodes: a map of upstream registry host to `{ endpoints: [ ... ] }`. Empty by default, so workers pull container images (the Talos `kubelet` image included) directly from the upstream registry. Point a host such as `ghcr.io` at an in-cluster pull-through mirror for air-gapped, rate-limited, or flaky-egress environments so a worker's boot does not depend on live public egress. Talos still falls back to the upstream registry unless a host also sets `skipFallback: true`, so a mirror alone does not enforce air-gap. This value is part of the worker machine config, whose content hash names the TalosConfigTemplate, so changing it rolls every existing worker in the pool rather than only affecting nodes created later.
+	// +kubebuilder:default:={}
+	RegistryMirrors k8sRuntime.RawExtension `json:"registryMirrors"`
+	// Talos image-factory schematic ID. Defaults to the cozystack-tested vanilla schematic. Operators using custom schematics (system extensions, kernel args) override here. The pool can pin its own via `osImage.builtin.schematicID` or `osImage.factory.schematicID`; when `osImage` omits it, this value applies. Whichever of the two applies is interpolated into an image URL and a DataVolume name, so it must be a plain lowercase alphanumeric identifier -- the render refuses anything else. A custom schematic on `osImage.builtin` also needs its own catalog entry, since the golden is named from the schematic ID.
+	// +kubebuilder:default:="ce4c980550dd2ab1b17bbf2b08801c7eb59418eafe8f279833297925d67c7515"
+	SchematicID string `json:"schematicID"`
+	// Default Talos release for this pool's worker OS image and in-guest installer. The pool can pin its own release via `osImage.builtin.version` or `osImage.factory.version`; when `osImage` omits it, this value applies. Both ways in are checked against the chart's Talos<->Kubernetes support matrix, against whichever release the pool actually resolves to, so an override cannot slip past a check `talos.version` would have failed. The matrix rejects a pairing it lists as unsupported; it lists the Talos minors this chart ships and passes any other minor unchecked, so pointing either field at a Talos release the chart does not know about is the operator's call, not a checked one. Whichever release applies is interpolated into an image URL and a DataVolume name, so it must be a full `vMAJOR.MINOR.PATCH` release, optionally with a pre-release suffix -- the render refuses anything else, a minor-only `v1.13` included. The values schema types this as a bare string, so a malformed one is accepted by the CR and fails the pool's HelmRelease instead.
+	// +kubebuilder:default:="v1.13.6"
+	Version string `json:"version"`
+}
+
+type WorkerImage struct {
+	// Clone a golden image from the worker image catalog. Requires a StorageClass whose volumes are reachable from any node, in practice a replicated/DRBD class: the clone is a storage-layer copy, and on a node-pinned class its two ends land on unrelated nodes -- the golden binds where CDI imported it, a worker disk where its VM is scheduled.
+	Builtin *WorkerImageBuiltin `json:"builtin,omitempty"`
+	// Import from an Image Factory / mirror (default).
+	Factory *WorkerImageFactory `json:"factory,omitempty"`
+}
+
+type WorkerImageBuiltin struct {
+	// Talos schematic ID of the golden to clone. Defaults to `talos.schematicID`.
+	SchematicID string `json:"schematicID,omitempty"`
+	// Talos version of the golden to clone. Defaults to `talos.version`.
+	Version string `json:"version,omitempty"`
+}
+
+type WorkerImageFactory struct {
+	// Base URL of the Image Factory serving the boot raw image. Defaults to `talos.imageFactoryURL`. No trailing slash. NOTE: this redirects only the worker boot-disk import; the in-guest upgrade installer image is always sourced from `talos.installerRepository`, so an air-gapped pool must also have `talos.installerRepository` pointed at a reachable registry.
+	ImageFactoryURL string `json:"imageFactoryURL,omitempty"`
+	// Talos schematic ID. Defaults to `talos.schematicID`.
+	SchematicID string `json:"schematicID,omitempty"`
+	// Talos version. Defaults to `talos.version`.
+	Version string `json:"version,omitempty"`
+}
+
+// +kubebuilder:validation:Enum="v1.35";"v1.34";"v1.33";"v1.32";"v1.31"
+type Version string
diff --git a/api/apps/v1alpha1/kubernetesnodes/zz_generated.deepcopy.go b/api/apps/v1alpha1/kubernetesnodes/zz_generated.deepcopy.go
new file mode 100644
index 0000000000..7f7ac667fe
--- /dev/null
+++ b/api/apps/v1alpha1/kubernetesnodes/zz_generated.deepcopy.go
@@ -0,0 +1,286 @@
+//go:build !ignore_autogenerated
+
+/*
+Copyright 2025 The Cozystack Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// Code generated by controller-gen. DO NOT EDIT.
+
+package kubernetesnodes
+
+import (
+	"k8s.io/apimachinery/pkg/runtime"
+)
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *Config) DeepCopyInto(out *Config) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
+	in.Spec.DeepCopyInto(&out.Spec)
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Config.
+func (in *Config) DeepCopy() *Config {
+	if in == nil {
+		return nil
+	}
+	out := new(Config)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *Config) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *ConfigSpec) DeepCopyInto(out *ConfigSpec) {
+	*out = *in
+	out.DiskSize = in.DiskSize.DeepCopy()
+	if in.Roles != nil {
+		in, out := &in.Roles, &out.Roles
+		*out = make([]string, len(*in))
+		copy(*out, *in)
+	}
+	in.Resources.DeepCopyInto(&out.Resources)
+	out.PodCpuLimit = in.PodCpuLimit.DeepCopy()
+	out.PodCpuRequest = in.PodCpuRequest.DeepCopy()
+	if in.Gpus != nil {
+		in, out := &in.Gpus, &out.Gpus
+		*out = make([]GPU, len(*in))
+		copy(*out, *in)
+	}
+	if in.KernelModules != nil {
+		in, out := &in.KernelModules, &out.KernelModules
+		*out = make([]KernelModule, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+	out.Kubelet = in.Kubelet
+	in.OsImage.DeepCopyInto(&out.OsImage)
+	in.Talos.DeepCopyInto(&out.Talos)
+	in.Proxmox.DeepCopyInto(&out.Proxmox)
+	out.Images = in.Images
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ConfigSpec.
+func (in *ConfigSpec) DeepCopy() *ConfigSpec {
+	if in == nil {
+		return nil
+	}
+	out := new(ConfigSpec)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *GPU) DeepCopyInto(out *GPU) {
+	*out = *in
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new GPU.
+func (in *GPU) DeepCopy() *GPU {
+	if in == nil {
+		return nil
+	}
+	out := new(GPU)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *Images) DeepCopyInto(out *Images) {
+	*out = *in
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Images.
+func (in *Images) DeepCopy() *Images {
+	if in == nil {
+		return nil
+	}
+	out := new(Images)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *KernelModule) DeepCopyInto(out *KernelModule) {
+	*out = *in
+	if in.Parameters != nil {
+		in, out := &in.Parameters, &out.Parameters
+		*out = make([]string, len(*in))
+		copy(*out, *in)
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new KernelModule.
+func (in *KernelModule) DeepCopy() *KernelModule {
+	if in == nil {
+		return nil
+	}
+	out := new(KernelModule)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *Kubelet) DeepCopyInto(out *Kubelet) {
+	*out = *in
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Kubelet.
+func (in *Kubelet) DeepCopy() *Kubelet {
+	if in == nil {
+		return nil
+	}
+	out := new(Kubelet)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *Proxmox) DeepCopyInto(out *Proxmox) {
+	*out = *in
+	if in.DnsServers != nil {
+		in, out := &in.DnsServers, &out.DnsServers
+		*out = make([]string, len(*in))
+		copy(*out, *in)
+	}
+	out.Network = in.Network
+	if in.TemplateTags != nil {
+		in, out := &in.TemplateTags, &out.TemplateTags
+		*out = make([]string, len(*in))
+		copy(*out, *in)
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Proxmox.
+func (in *Proxmox) DeepCopy() *Proxmox {
+	if in == nil {
+		return nil
+	}
+	out := new(Proxmox)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *ProxmoxNetwork) DeepCopyInto(out *ProxmoxNetwork) {
+	*out = *in
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ProxmoxNetwork.
+func (in *ProxmoxNetwork) DeepCopy() *ProxmoxNetwork {
+	if in == nil {
+		return nil
+	}
+	out := new(ProxmoxNetwork)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *Resources) DeepCopyInto(out *Resources) {
+	*out = *in
+	out.Cpu = in.Cpu.DeepCopy()
+	out.Memory = in.Memory.DeepCopy()
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Resources.
+func (in *Resources) DeepCopy() *Resources {
+	if in == nil {
+		return nil
+	}
+	out := new(Resources)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *Talos) DeepCopyInto(out *Talos) {
+	*out = *in
+	in.RegistryMirrors.DeepCopyInto(&out.RegistryMirrors)
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Talos.
+func (in *Talos) DeepCopy() *Talos {
+	if in == nil {
+		return nil
+	}
+	out := new(Talos)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *WorkerImage) DeepCopyInto(out *WorkerImage) {
+	*out = *in
+	if in.Builtin != nil {
+		in, out := &in.Builtin, &out.Builtin
+		*out = new(WorkerImageBuiltin)
+		**out = **in
+	}
+	if in.Factory != nil {
+		in, out := &in.Factory, &out.Factory
+		*out = new(WorkerImageFactory)
+		**out = **in
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new WorkerImage.
+func (in *WorkerImage) DeepCopy() *WorkerImage {
+	if in == nil {
+		return nil
+	}
+	out := new(WorkerImage)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *WorkerImageBuiltin) DeepCopyInto(out *WorkerImageBuiltin) {
+	*out = *in
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new WorkerImageBuiltin.
+func (in *WorkerImageBuiltin) DeepCopy() *WorkerImageBuiltin {
+	if in == nil {
+		return nil
+	}
+	out := new(WorkerImageBuiltin)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *WorkerImageFactory) DeepCopyInto(out *WorkerImageFactory) {
+	*out = *in
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new WorkerImageFactory.
+func (in *WorkerImageFactory) DeepCopy() *WorkerImageFactory {
+	if in == nil {
+		return nil
+	}
+	out := new(WorkerImageFactory)
+	in.DeepCopyInto(out)
+	return out
+}
diff --git a/api/apps/v1alpha1/mariadb/types.go b/api/apps/v1alpha1/mariadb/types.go
index 4b26018bcc..646cd20bcf 100644
--- a/api/apps/v1alpha1/mariadb/types.go
+++ b/api/apps/v1alpha1/mariadb/types.go
@@ -36,10 +36,13 @@ type ConfigSpec struct {
 	// Enable external access from outside the cluster.
 	// +kubebuilder:default:=false
 	External bool `json:"external"`
+	// TLS configuration. Selects who issues the certificates and whether plaintext is refused; TLS itself is always served.
+	// +kubebuilder:default:={}
+	Tls TLS `json:"tls,omitempty"`
 	// MariaDB major.minor version to deploy
 	// +kubebuilder:default:="v11.8"
 	Version Version `json:"version"`
-	// Users configuration map.
+	// Users configuration map. Passwords (including the `root` account) are always auto-generated and stored in the `<release>-credentials` Secret; they cannot be set from values — read a user's password from that Secret. A `password` left over in values from before the field was removed is ignored by the render and draws an admission warning, but it is not inert on an upgraded release: the chart preserves whatever password is already in the Secret, which on the first upgrade is the value that was set before removal, so that value stays the live credential until it is rotated (dedicated rotation is tracked in cozystack/community#72). The live password lives only in the Secret.
 	// +kubebuilder:default:={}
 	Users map[string]User `json:"users,omitempty"`
 	// Databases configuration map.
@@ -96,15 +99,24 @@ type Resources struct {
 	Memory resource.Quantity `json:"memory,omitempty"`
 }
 
+type TLS struct {
+	// Who issues the server certificate: `operator` uses the CA mariadb-operator manages itself, `cert-manager` gives the instance its own CA and is what covers the external hostname. Named for the issuer because TLS is served under both, unlike the similarly-spelled `tls.enabled` in some other charts, which does switch TLS on and off.
+	// +kubebuilder:default:="operator"
+	Issuer TLSIssuer `json:"issuer,omitempty"`
+	// Refuse plaintext connections (sets MariaDB require_secure_transport=ON). Applies under either issuer. Opt-in: turn it on once every client connects over TLS, since it disconnects those that do not.
+	Required *bool `json:"required,omitempty"`
+}
+
 type User struct {
 	// Maximum number of connections.
 	MaxUserConnections int `json:"maxUserConnections"`
-	// Password for the user.
-	Password string `json:"password"`
 }
 
 // +kubebuilder:validation:Enum="t1.nano";"t1.micro";"t1.small";"t1.medium";"t1.large";"t1.xlarge";"t1.2xlarge";"t1.4xlarge";"c1.nano";"c1.micro";"c1.small";"c1.medium";"c1.large";"c1.xlarge";"c1.2xlarge";"c1.4xlarge";"s1.nano";"s1.micro";"s1.small";"s1.medium";"s1.large";"s1.xlarge";"s1.2xlarge";"s1.4xlarge";"u1.nano";"u1.micro";"u1.small";"u1.medium";"u1.large";"u1.xlarge";"u1.2xlarge";"u1.4xlarge";"m1.nano";"m1.micro";"m1.small";"m1.medium";"m1.large";"m1.xlarge";"m1.2xlarge";"m1.4xlarge";"nano";"micro";"small";"medium";"large";"xlarge";"2xlarge"
 type ResourcesPreset string
 
+// +kubebuilder:validation:Enum="operator";"cert-manager"
+type TLSIssuer string
+
 // +kubebuilder:validation:Enum="v11.8";"v11.4";"v10.11";"v10.6"
 type Version string
diff --git a/api/apps/v1alpha1/mariadb/zz_generated.deepcopy.go b/api/apps/v1alpha1/mariadb/zz_generated.deepcopy.go
index 4cc5a94f6b..21026477b3 100644
--- a/api/apps/v1alpha1/mariadb/zz_generated.deepcopy.go
+++ b/api/apps/v1alpha1/mariadb/zz_generated.deepcopy.go
@@ -70,6 +70,7 @@ func (in *ConfigSpec) DeepCopyInto(out *ConfigSpec) {
 	*out = *in
 	in.Resources.DeepCopyInto(&out.Resources)
 	out.Size = in.Size.DeepCopy()
+	in.Tls.DeepCopyInto(&out.Tls)
 	if in.Users != nil {
 		in, out := &in.Users, &out.Users
 		*out = make(map[string]User, len(*in))
@@ -155,6 +156,26 @@ func (in *Resources) DeepCopy() *Resources {
 	return out
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *TLS) DeepCopyInto(out *TLS) {
+	*out = *in
+	if in.Required != nil {
+		in, out := &in.Required, &out.Required
+		*out = new(bool)
+		**out = **in
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new TLS.
+func (in *TLS) DeepCopy() *TLS {
+	if in == nil {
+		return nil
+	}
+	out := new(TLS)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *User) DeepCopyInto(out *User) {
 	*out = *in
diff --git a/api/apps/v1alpha1/mongodb/types.go b/api/apps/v1alpha1/mongodb/types.go
index 5a342a98a5..44764350cc 100644
--- a/api/apps/v1alpha1/mongodb/types.go
+++ b/api/apps/v1alpha1/mongodb/types.go
@@ -60,27 +60,33 @@ type ConfigSpec struct {
 }
 
 type Backup struct {
-	// Destination path for backups (e.g. s3://bucket/path/).
+	// Destination path for backups (e.g. s3://bucket/path/). Ignored when useSystemBucket is true (the driver injects the platform bucket).
 	// +kubebuilder:default:="s3://bucket/path/to/folder/"
 	DestinationPath string `json:"destinationPath,omitempty"`
 	// Enable regular backups.
 	// +kubebuilder:default:=false
 	Enabled bool `json:"enabled"`
-	// S3 endpoint URL for uploads.
+	// S3 endpoint URL for uploads. Ignored when useSystemBucket is true (the strategy supplies the platform endpoint).
 	// +kubebuilder:default:="http://minio-gateway-service:9000"
 	EndpointURL string `json:"endpointURL,omitempty"`
-	// Retention policy (e.g. "30d").
+	// Skip TLS verification for the S3 endpoint (self-signed, e.g. in-cluster seaweedfs). Ignored when useSystemBucket is true (the platform backupStorage knob applies instead).
+	// +kubebuilder:default:=false
+	InsecureSkipTLSVerify bool `json:"insecureSkipTLSVerify,omitempty"`
+	// Retention policy (e.g. "30d"). Ignored when useSystemBucket is true (no engine-side retention on that flow).
 	// +kubebuilder:default:="30d"
 	RetentionPolicy string `json:"retentionPolicy,omitempty"`
-	// Access key for S3 authentication.
+	// Access key for S3 authentication. Ignored when useSystemBucket is true (credentials come from the projected cozy-backups-creds).
 	// +kubebuilder:default:=""
 	S3AccessKey string `json:"s3AccessKey,omitempty"`
-	// Secret key for S3 authentication.
+	// Secret key for S3 authentication. Ignored when useSystemBucket is true (credentials come from the projected cozy-backups-creds).
 	// +kubebuilder:default:=""
 	S3SecretKey string `json:"s3SecretKey,omitempty"`
-	// Cron schedule for automated backups.
+	// Cron schedule for automated backups. Ignored when useSystemBucket is true (scheduling moves to the BackupClass Plan).
 	// +kubebuilder:default:="0 2 * * *"
 	Schedule string `json:"schedule,omitempty"`
+	// Opt-in: back up to the platform system bucket without supplying S3 credentials. The cozy-default MongoDB BackupClass injects the storage at BackupJob time; tenants do not set s3AccessKey/s3SecretKey/destinationPath/endpointURL, and backups scope to `<namespace>/<application>`. Scheduling moves to a BackupClass Plan; `schedule`, `retentionPolicy` and PITR are ignored while this is on, and this flow has no retention yet (see docs/operations/backup-classes.md). Requires `backup.enabled: true` (the pbm agents run on that flag); the chart refuses the combination with `enabled: false` at render time; the schema carries the same rule as a marker for the UI and for the day the apiserver enforces CEL on application schemas (cozystack/cozystack#2657), which it does not yet. A release that has not yet rendered this flag (its cluster still carries the chart's scheduled tasks and PITR) holds a BackupJob until it does, so the tenant's own storage is never injected over.
+	// +kubebuilder:default:=false
+	UseSystemBucket bool `json:"useSystemBucket,omitempty"`
 }
 
 type Bootstrap struct {
diff --git a/api/apps/v1alpha1/openbao/types.go b/api/apps/v1alpha1/openbao/types.go
index b98ad5fbe7..2bc68693e9 100644
--- a/api/apps/v1alpha1/openbao/types.go
+++ b/api/apps/v1alpha1/openbao/types.go
@@ -39,6 +39,9 @@ type ConfigSpec struct {
 	// Enable the OpenBAO web UI.
 	// +kubebuilder:default:=true
 	Ui bool `json:"ui"`
+	// Seal configuration. The default is Shamir key shares. Set `type: static` for auto-unseal.
+	// +kubebuilder:default:={}
+	Seal Seal `json:"seal"`
 }
 
 type Resources struct {
@@ -48,5 +51,35 @@ type Resources struct {
 	Memory resource.Quantity `json:"memory,omitempty"`
 }
 
+type Seal struct {
+	// Acknowledge a seal migration. The chart refuses to change `type` on an existing instance unless this is `true`. Set it only while running `bao operator unseal -migrate`, then remove it.
+	// +kubebuilder:default:=false
+	AllowMigration bool `json:"allowMigration,omitempty"`
+	// Permanent identifier of the current key. OpenBAO stores it with the data the key wraps and picks the key by it, so change it whenever the key material changes. Lowercase alphanumerics, `-`, `.` and `_`, starting and ending with an alphanumeric, because the upstream chart evaluates the server config as a template and rewrites upper case placeholders such as `HOSTNAME` in it. Required when `type` is `static`.
+	// +kubebuilder:default:=""
+	// +kubebuilder:validation:Pattern="^([a-z0-9]([-a-z0-9._]*[a-z0-9])?)?$"
+	KeyId string `json:"keyId"`
+	// Identifier of the previous key, with the same character constraints as `keyId`. Required when `previousSecretName` is set.
+	// +kubebuilder:default:=""
+	// +kubebuilder:validation:Pattern="^([a-z0-9]([-a-z0-9._]*[a-z0-9])?)?$"
+	PreviousKeyId string `json:"previousKeyId,omitempty"`
+	// Secret holding the previous key during an n-1 key rotation, with the same name constraints as `secretName`. Keep it until the pods have been replaced and the active node has logged `upgrading stored keys`, see the README.
+	// +kubebuilder:default:=""
+	// +kubebuilder:validation:MaxLength=52
+	// +kubebuilder:validation:Pattern="^([a-z0-9]([-a-z0-9]*[a-z0-9])?)?$"
+	PreviousSecretName string `json:"previousSecretName,omitempty"`
+	// Existing Secret in the tenant namespace whose key `key` holds the base64 text of 32 random bytes (for example `openssl rand -base64 32`). A cluster administrator creates it, because tenant roles cannot create Secrets. Lowercase alphanumerics and hyphens, at most 52 characters, because the pod volume is named `userconfig-<name>` and a volume name is a DNS label. Required when `type` is `static`.
+	// +kubebuilder:default:=""
+	// +kubebuilder:validation:MaxLength=52
+	// +kubebuilder:validation:Pattern="^([a-z0-9]([-a-z0-9]*[a-z0-9])?)?$"
+	SecretName string `json:"secretName"`
+	// Seal type. `shamir` keeps the current behaviour, `static` enables auto-unseal from `secretName`.
+	// +kubebuilder:default:="shamir"
+	Type SealType `json:"type"`
+}
+
 // +kubebuilder:validation:Enum="t1.nano";"t1.micro";"t1.small";"t1.medium";"t1.large";"t1.xlarge";"t1.2xlarge";"t1.4xlarge";"c1.nano";"c1.micro";"c1.small";"c1.medium";"c1.large";"c1.xlarge";"c1.2xlarge";"c1.4xlarge";"s1.nano";"s1.micro";"s1.small";"s1.medium";"s1.large";"s1.xlarge";"s1.2xlarge";"s1.4xlarge";"u1.nano";"u1.micro";"u1.small";"u1.medium";"u1.large";"u1.xlarge";"u1.2xlarge";"u1.4xlarge";"m1.nano";"m1.micro";"m1.small";"m1.medium";"m1.large";"m1.xlarge";"m1.2xlarge";"m1.4xlarge";"nano";"micro";"small";"medium";"large";"xlarge";"2xlarge"
 type ResourcesPreset string
+
+// +kubebuilder:validation:Enum="shamir";"static"
+type SealType string
diff --git a/api/apps/v1alpha1/openbao/zz_generated.deepcopy.go b/api/apps/v1alpha1/openbao/zz_generated.deepcopy.go
index baa1258b1e..f14bc7eecc 100644
--- a/api/apps/v1alpha1/openbao/zz_generated.deepcopy.go
+++ b/api/apps/v1alpha1/openbao/zz_generated.deepcopy.go
@@ -55,6 +55,7 @@ func (in *ConfigSpec) DeepCopyInto(out *ConfigSpec) {
 	*out = *in
 	in.Resources.DeepCopyInto(&out.Resources)
 	out.Size = in.Size.DeepCopy()
+	out.Seal = in.Seal
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ConfigSpec.
@@ -83,3 +84,18 @@ func (in *Resources) DeepCopy() *Resources {
 	in.DeepCopyInto(out)
 	return out
 }
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *Seal) DeepCopyInto(out *Seal) {
+	*out = *in
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Seal.
+func (in *Seal) DeepCopy() *Seal {
+	if in == nil {
+		return nil
+	}
+	out := new(Seal)
+	in.DeepCopyInto(out)
+	return out
+}
diff --git a/api/apps/v1alpha1/opensearch/types.go b/api/apps/v1alpha1/opensearch/types.go
index e3f7a9c9be..9f88f3e011 100644
--- a/api/apps/v1alpha1/opensearch/types.go
+++ b/api/apps/v1alpha1/opensearch/types.go
@@ -42,6 +42,9 @@ type ConfigSpec struct {
 	// OpenSearch major version to deploy.
 	// +kubebuilder:default:="v2"
 	Version Version `json:"version"`
+	// HTTP-layer TLS configuration. Selects who issues the HTTP server certificate; TLS itself is always served.
+	// +kubebuilder:default:={}
+	Tls TLS `json:"tls"`
 	// Container images used by the operator.
 	// +kubebuilder:default:={}
 	Images Images `json:"images"`
@@ -57,7 +60,7 @@ type ConfigSpec struct {
 }
 
 type Dashboards struct {
-	// Enable OpenSearch Dashboards deployment.
+	// Enable OpenSearch Dashboards deployment. The application name is then limited to 41 characters, and to 32 when external access is also on, because the Dashboards Service the operator creates would otherwise exceed the 63-character DNS label limit, and the operator stops upgrading and restarting the release for as long as that Service is refused.
 	// +kubebuilder:default:=false
 	Enabled bool `json:"enabled"`
 	// Number of Dashboards replicas.
@@ -99,6 +102,11 @@ type Resources struct {
 	Memory resource.Quantity `json:"memory,omitempty"`
 }
 
+type TLS struct {
+	// Who issues the HTTP server certificate: `operator` uses the CA the opster operator manages itself, `cert-manager` gives the release its own CA, covers the external hostname and publishes a trust anchor the tenant can verify against. Unset follows external: `cert-manager` when it is true, `operator` when it is false. Named for the issuer because TLS is served under both, unlike the similarly-spelled `tls.enabled` in some other charts, which does switch TLS on and off.
+	Issuer TLSIssuer `json:"issuer,omitempty"`
+}
+
 type User struct {
 	// Password for the user (auto-generated if omitted).
 	Password string `json:"password,omitempty"`
@@ -109,6 +117,9 @@ type User struct {
 // +kubebuilder:validation:Enum="t1.nano";"t1.micro";"t1.small";"t1.medium";"t1.large";"t1.xlarge";"t1.2xlarge";"t1.4xlarge";"c1.nano";"c1.micro";"c1.small";"c1.medium";"c1.large";"c1.xlarge";"c1.2xlarge";"c1.4xlarge";"s1.nano";"s1.micro";"s1.small";"s1.medium";"s1.large";"s1.xlarge";"s1.2xlarge";"s1.4xlarge";"u1.nano";"u1.micro";"u1.small";"u1.medium";"u1.large";"u1.xlarge";"u1.2xlarge";"u1.4xlarge";"m1.nano";"m1.micro";"m1.small";"m1.medium";"m1.large";"m1.xlarge";"m1.2xlarge";"m1.4xlarge";"nano";"micro";"small";"medium";"large";"xlarge";"2xlarge"
 type ResourcesPreset string
 
+// +kubebuilder:validation:Enum="operator";"cert-manager"
+type TLSIssuer string
+
 // +kubebuilder:validation:Enum="soft";"hard"
 type TopologySpreadPolicy string
 
diff --git a/api/apps/v1alpha1/opensearch/zz_generated.deepcopy.go b/api/apps/v1alpha1/opensearch/zz_generated.deepcopy.go
index f7f2daefb2..c6b2f41820 100644
--- a/api/apps/v1alpha1/opensearch/zz_generated.deepcopy.go
+++ b/api/apps/v1alpha1/opensearch/zz_generated.deepcopy.go
@@ -55,6 +55,7 @@ func (in *ConfigSpec) DeepCopyInto(out *ConfigSpec) {
 	*out = *in
 	in.Resources.DeepCopyInto(&out.Resources)
 	out.Size = in.Size.DeepCopy()
+	out.Tls = in.Tls
 	out.Images = in.Images
 	out.NodeRoles = in.NodeRoles
 	if in.Users != nil {
@@ -140,6 +141,21 @@ func (in *Resources) DeepCopy() *Resources {
 	return out
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *TLS) DeepCopyInto(out *TLS) {
+	*out = *in
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new TLS.
+func (in *TLS) DeepCopy() *TLS {
+	if in == nil {
+		return nil
+	}
+	out := new(TLS)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *User) DeepCopyInto(out *User) {
 	*out = *in
diff --git a/api/apps/v1alpha1/postgresql/types.go b/api/apps/v1alpha1/postgresql/types.go
index 8c679c9355..f0415f3987 100644
--- a/api/apps/v1alpha1/postgresql/types.go
+++ b/api/apps/v1alpha1/postgresql/types.go
@@ -18,7 +18,7 @@ type Config struct {
 }
 
 type ConfigSpec struct {
-	// Number of Postgres replicas.
+	// Number of Postgres replicas. Under active autoscaling this is the resting/seed count, not the live count — KEDA drives the live count via `/scale`. Disabling autoscaling does NOT automatically bring the live count back to `replicas`: the client-side merge writes `instances` only when the rendered value changes, so a cluster KEDA grew past `replicas` stays there with no autoscaler left to reduce it — lower `replicas` to the count you want and it rebases down (shedding the surplus replicas + PVCs). Lowering it below the live count, or disabling/dry-running while it sits below the live count, sheds in one step past the scaleDown pacing; stage it to the live count first (suspend the HelmRelease and `kubectl scale` if needed) to avoid a transient. Must stay greater than `quorum.maxSyncReplicas`.
 	// +kubebuilder:default:=2
 	Replicas int `json:"replicas"`
 	// Explicit CPU and memory configuration for each PostgreSQL replica. When omitted, the preset defined in `resourcesPreset` is applied.
@@ -40,6 +40,9 @@ type ConfigSpec struct {
 	// PostgreSQL major version to deploy
 	// +kubebuilder:default:="v18"
 	Version Version `json:"version"`
+	// PostgreSQL image flavor, fixed when the cluster is created. `postgresql` uses the CloudNativePG PostgreSQL image. `postgis` uses the CloudNativePG PostGIS image, which adds postgis, postgis_raster, postgis_topology, postgis_sfcgal, postgis_tiger_geocoder and address_standardizer; enable them per database in `databases.<name>.extensions`. Changing the flavor of an existing cluster is refused, and a backup restores only into a cluster of the flavor it was taken from: to change flavor, create a new cluster and move the data with a logical dump (pg_dump / pg_restore).
+	// +kubebuilder:default:="postgresql"
+	Flavor Flavor `json:"flavor"`
 	// TLS configuration for server connections.
 	// +kubebuilder:default:={}
 	Tls TLS `json:"tls"`
@@ -49,7 +52,10 @@ type ConfigSpec struct {
 	// Quorum configuration for synchronous replication.
 	// +kubebuilder:default:={}
 	Quorum Quorum `json:"quorum"`
-	// Users configuration map.
+	// Read-replica autoscaling configuration.
+	// +kubebuilder:default:={}
+	Autoscaling Autoscaling `json:"autoscaling"`
+	// Users configuration map. Passwords are always auto-generated and stored in the `<release>-credentials` Secret; they cannot be set from values — read a user's password from that Secret. A `password` left over in values from before the field was removed is ignored by the render and draws an admission warning, but it is not inert on an upgraded release: the chart preserves whatever password is already in the Secret, which on the first upgrade is the value that was set before removal, so that value stays the live credential until it is rotated (dedicated rotation is tracked in cozystack/community#72). The live password lives only in the Secret.
 	// +kubebuilder:default:={}
 	Users map[string]User `json:"users,omitempty"`
 	// Databases configuration map.
@@ -63,6 +69,36 @@ type ConfigSpec struct {
 	Bootstrap Bootstrap `json:"bootstrap"`
 }
 
+type Autoscaling struct {
+	// Recommendation mode: keep the static count and render the ScaledObject with both scaling directions paused, so KEDA keeps the HPA and keeps serving its trigger metric but actuates neither way. Note both scaling policies are disabled, so the HPA's desiredReplicas is frozen to the current count - read the recommendation from the matching read-load dashboard panel for your metric (connections or CPU): desired = 1 + ceil(read load / target), clamped to [effectiveMin..maxReplicas] where effectiveMin = max(minReplicas, maxSyncReplicas+1, 2), not from the desired-replicas line. Like disabling, flipping a LIVE autoscaled cluster into dryRun re-renders `instances: replicas` (the raw static value, which can be below the autoscaling floor); if `replicas` is below the live count, stage it to the live count first (see the enablement note) or the cluster sheds down to `replicas`. No shed occurs when the rendered value is unchanged (replicas already equals the active seed) — client-side merge is then a no-op and the live count is preserved. Permanent, unlike `transition`.
+	// +kubebuilder:default:=false
+	DryRun bool `json:"dryRun"`
+	// Enable horizontal autoscaling of read replicas. Requires the platform `keda` package to be enabled by an administrator first; the chart fails to render (rather than break the release) if KEDA is not installed. Prerequisite: the queried vmselect must hold BOTH the CNPG metrics (cnpg_backends_total / container CPU) AND kube_pod_labels (kube-state-metrics). This holds for a tenant on the shared root monitoring stack (`monitoring: false`, both land in tenant-root). A tenant running its OWN Monitoring app (`monitoring: true`) has the CNPG metrics but not kube_pod_labels (KSM is root-only), so it must set `serverAddress` to a vmselect carrying both series or autoscaling never actuates.
+	// +kubebuilder:default:=false
+	Enabled bool `json:"enabled"`
+	// Maximum total instances. Must be >= minReplicas and >= the synchronous-quorum floor (maxSyncReplicas+1); the chart fails to render (rather than silently run an unbounded instance count) if the effective floor exceeds it - raise maxReplicas. HAZARD: lowering maxReplicas below the live count makes the HPA cut straight to the new maximum in one step (the current>max branch bypasses the scale-down pacing), shedding the surplus replicas + PVCs at once; to lower it deliberately, suspend the HelmRelease and pin the live count with `kubectl scale` first.
+	// +kubebuilder:default:=6
+	MaxReplicas int `json:"maxReplicas"`
+	// Freeze scaling while replication lag exceeds this (seconds) and the primary is writing. 0 disables the brake. Default 0: the freeze branch has only been validated on a live cluster in its non-braking (pass-through) form, so the lag brake is opt-in until the braking path is exercised under load; set a positive value (e.g. 30) to enable it.
+	// +kubebuilder:default:=0
+	MaxReplicationLagSeconds int `json:"maxReplicationLagSeconds"`
+	// Read-load signal to scale on.
+	// +kubebuilder:default:="ReadConnections"
+	Metric ReadMetric `json:"metric"`
+	// Minimum total instances; raised to the synchronous-quorum floor (`maxSyncReplicas + 1`) and to 2 when either is higher.
+	// +kubebuilder:default:=2
+	MinReplicas int `json:"minReplicas"`
+	// Override the Prometheus/vmselect URL the ScaledObject queries. Empty (default) derives `http://vmselect-shortterm.<monitoring-ns>.svc:8481/select/0/prometheus`. Set it when the derived vmselect does not hold both the CNPG metrics and kube_pod_labels (e.g. `monitoring: true` tenants, or a non-default `metricsStorages` name). SSRF constraint: the host must be an in-cluster Service DNS name (`<svc>.<ns>.svc[.<clusterDomain>]`) whose namespace is within the tenant's own subtree (its namespace, its parents, or `tenant-root`) — the cluster-privileged KEDA operator fetches this URL every poll, so it is refused a metadata endpoint, an external host, or a sibling/system namespace. Residual surface (accepted trade-off): `tenant-root` is always allowed because the derived default points there, so a tenant can still aim the operator at any Service in `tenant-root` on any port/path (a blind in-cluster reachability probe — the operator reads no response body back to the tenant); the egress NetworkPolicy does not narrow that.
+	// +kubebuilder:default:=""
+	ServerAddress string `json:"serverAddress"`
+	// Target read load per read-serving replica (unit depends on `metric`: active connections, or CPU millicores). Dimensionless integer - a resource.Quantity here would accept `150m`, which PromQL reads as 150 minutes and KEDA cannot use as a threshold.
+	// +kubebuilder:default:=150
+	Target int `json:"target"`
+	// Migration phase 1: render `.spec.instances` from `replicas` (which the operator stages to the current live count) AND pause the ScaledObject in both directions, so KEDA stands up with its HPA present but not actuating. Flip to false (phase 2) to hand the runtime count to KEDA. Because the both-direction pause keeps the HPA (not the HPA-deleting full pause), KEDA is genuinely warm at phase 2 — no HPA recreate — and because the active seed is max(replicas, effectiveMin), phase 2 re-renders the same instance count phase 1 did (when `replicas` is staged at/above the floor), so the flip is a merge no-op with no dip. The HPA's scaleUp stabilization window still smooths the first actuation.
+	// +kubebuilder:default:=false
+	Transition bool `json:"transition"`
+}
+
 type Backup struct {
 	// DEPRECATED. Per-tenant S3 configuration is superseded by the platform-managed `cozy-default` BackupClass and the `cozy-backups` system bucket. Leave empty for new installations; the BackupClass driver picks up the system-managed coordinates. Kept for in-place upgrade compatibility.
 	// +kubebuilder:default:="s3://bucket/path/to/folder/"
@@ -70,7 +106,7 @@ type Backup struct {
 	// Enable regular backups.
 	// +kubebuilder:default:=false
 	Enabled bool `json:"enabled"`
-	// DEPRECATED. Pre-existing Secret with the CA bundle Barman should trust when reaching a self-signed S3 endpoint. Used for both backup and bootstrap recovery in the legacy chart-managed flow.
+	// DEPRECATED. Pre-existing Secret with the CA bundle the barman-cloud plugin should trust when reaching a self-signed S3 endpoint. Used for both backup and bootstrap recovery in the legacy chart-managed flow.
 	// +kubebuilder:default:={}
 	EndpointCA EndpointCA `json:"endpointCA,omitempty"`
 	// DEPRECATED. See `destinationPath`.
@@ -88,25 +124,31 @@ type Backup struct {
 	// DEPRECATED. See `s3AccessKey`.
 	// +kubebuilder:default:=""
 	S3SecretKey string `json:"s3SecretKey,omitempty"`
-	// Legacy. Cron schedule (CNPG 6-field format) for the chart-emitted ScheduledBackup. Empty means no chart-managed schedule, which is the recommended setup when a `BackupClass` from `backups.cozystack.io` already drives backup orchestration. In the legacy chart-managed flow `spec.backup.barmanObjectStore` is rendered when `backup.enabled=true` AND `useSystemBucket=false` AND `destinationPath` is non-empty AND inline-or-external creds are supplied; in the platform `useSystemBucket=true` flow the chart skips emitting `barmanObjectStore` and the CNPG driver SSA-patches it onto the live Cluster at first BackupJob time.
+	// Legacy. Cron schedule (CNPG 6-field format) for the chart-emitted ScheduledBackup. Empty means no chart-managed schedule, which is the recommended setup when a `BackupClass` from `backups.cozystack.io` already drives backup orchestration. In the legacy chart-managed flow `spec.plugins` plus the barman-cloud ObjectStore is rendered when `backup.enabled=true` AND `useSystemBucket=false` AND `destinationPath` is non-empty AND inline-or-external creds are supplied; in the platform `useSystemBucket=true` flow the chart skips emitting `spec.plugins` and the CNPG driver SSA-applies the ObjectStore and patches `spec.plugins` onto the live Cluster at first BackupJob time.
 	// +kubebuilder:default:=""
 	Schedule string `json:"schedule,omitempty"`
-	// Opt-in: when true, the chart-emitted `<release>-s3-creds` Secret is skipped AND `spec.backup.barmanObjectStore` is left UNSET in the chart-rendered Cluster — the cozy-default BackupClass driver SSA-patches the live Cluster with destinationPath/endpointURL/credentials when the first BackupJob runs. Consequence: `archive_command` is NOT active until that first BackupJob fires; WAL accumulates on the PVC in the meantime, so fire an ad-hoc BackupJob immediately after enabling the flag on existing releases. Use together with the platform `cozy-default` BackupClass — tenants do not need to fill `s3AccessKey`/`s3SecretKey` or `destinationPath`/`endpointURL`. The destination path automatically scopes to `s3://cozy-backups/<namespace>/<release>/`.
+	// Opt-in: when true, the chart-emitted `<release>-s3-creds` Secret is skipped AND `spec.plugins` (plus the barman-cloud ObjectStore) is left UNSET in the chart-rendered Cluster — the cozy-default BackupClass driver SSA-applies an ObjectStore (carrying destinationPath/endpointURL/credentials) and patches `spec.plugins` on the live Cluster when the first BackupJob runs. Consequence: plugin WAL archiving is NOT active until that first BackupJob fires; WAL accumulates on the PVC in the meantime, so fire an ad-hoc BackupJob immediately after enabling the flag on existing releases. Use together with the platform `cozy-default` BackupClass — tenants do not need to fill `s3AccessKey`/`s3SecretKey` or `destinationPath`/`endpointURL`. The destination path automatically scopes to `s3://cozy-backups/<namespace>/<release>/`.
 	// +kubebuilder:default:=false
 	UseSystemBucket bool `json:"useSystemBucket,omitempty"`
 }
 
 type Bootstrap struct {
+	// Barman ID of the base backup to recover from, passed as `recoveryTarget.backupID`. Empty lets the barman-cloud plugin pick one: the newest backup when `recoveryTime` is empty, otherwise the newest one ending at or before it, on any timeline. The CNPG backup driver sets this on restore.
+	// +kubebuilder:default:=""
+	BackupID string `json:"backupID,omitempty"`
 	// Whether to restore from a backup.
 	// +kubebuilder:default:=false
 	Enabled bool `json:"enabled"`
+	// WAL-archive server name (S3 path prefix) the RESTORED cluster writes to. Must differ from `serverName` (the recovery source) so a restored cluster archives to a fresh, empty prefix and barman-cloud-check-wal-archive passes while it recovers from the source's prefix. The CNPG backup driver sets this on restore; empty means the cluster archives under its own name.
+	// +kubebuilder:default:=""
+	NewServerName string `json:"newServerName,omitempty"`
 	// Previous cluster name before deletion.
 	// +kubebuilder:default:=""
 	OldName string `json:"oldName"`
 	// Timestamp (RFC3339) for point-in-time recovery; empty means latest.
 	// +kubebuilder:default:=""
 	RecoveryTime string `json:"recoveryTime,omitempty"`
-	// Barman server name (S3 path prefix) used by the original cluster when writing backups. Set this only when the original cluster had an explicit barmanObjectStore.serverName that differed from its Kubernetes resource name.
+	// Server name (S3 path prefix) used by the original cluster when writing backups; passed to the barman-cloud plugin via `externalClusters[].plugin.parameters.serverName`. Defaults to `bootstrap.oldName`. Set this only when the original cluster wrote backups under an explicit server name that differed from its Kubernetes resource name.
 	// +kubebuilder:default:=""
 	ServerName string `json:"serverName,omitempty"`
 }
@@ -129,7 +171,7 @@ type EndpointCA struct {
 	// Key within the Secret containing the CA bundle. Defaults to `ca.crt`.
 	// +kubebuilder:default:=""
 	Key string `json:"key,omitempty"`
-	// Name of the Secret in the application namespace. Empty means no endpointCA is emitted (Barman uses the system trust store).
+	// Name of the Secret in the application namespace. Empty means no endpointCA is emitted (the plugin uses the system trust store).
 	// +kubebuilder:default:=""
 	Name string `json:"name,omitempty"`
 }
@@ -138,10 +180,12 @@ type PostgreSQL struct {
 	// PostgreSQL server parameters. Values may be strings or integers; integers are coerced to strings by the template (e.g. both `max_connections: 100` and `max_connections: "100"` are accepted). BLOCKED (enable arbitrary code execution): archive_command, restore_command, ssl_passphrase_command, archive_cleanup_command, recovery_end_command, dynamic_library_path, local_preload_libraries, session_preload_libraries, shared_preload_libraries. Do NOT override CloudNativePG-managed parameters: archive_mode, primary_conninfo, wal_level, max_replication_slots.
 	// +kubebuilder:default:={"max_connections":"100"}
 	Parameters map[string]intstr.IntOrString `json:"parameters,omitempty"`
+	// Libraries loaded at server start, restricted to an allowlist of modules already shipped in the PostgreSQL image. CloudNativePG also preloads `pg_stat_statements`, `auto_explain` and `pgaudit` by itself whenever `parameters` sets a key under their prefix (e.g. `pg_stat_statements.track`), so removing one of them from this list does not unload it while such a key is set; `pg_prewarm` is preloaded only through this list. Changing the list restarts PostgreSQL on every instance, the primary included, so writes pause briefly.
+	SharedPreloadLibraries []PreloadLibrary `json:"sharedPreloadLibraries,omitempty"`
 }
 
 type Quorum struct {
-	// Maximum number of synchronous replicas allowed (must be less than total replicas).
+	// Maximum number of synchronous replicas allowed (must be less than total replicas). Under autoscaling it also sets the scale-down floor (the effective minimum is `max(minReplicas, maxSyncReplicas+1, 2)`); the chart fails to render if that floor exceeds `autoscaling.maxReplicas`.
 	// +kubebuilder:default:=0
 	MaxSyncReplicas int `json:"maxSyncReplicas"`
 	// Minimum number of synchronous replicas required for commit.
@@ -169,17 +213,30 @@ type S3CredentialsSecret struct {
 }
 
 type TLS struct {
-	// Tri-state switch controlling whether the chart injects the external hostname into the operator-managed CNPG cert via spec.certificates.serverAltDNSNames. When omitted, the chart injects the SAN if `external: true` and skips it otherwise. Set explicitly to `true` to inject regardless of `external` (no-op when `external: false` since there is no external hostname to add). Set to `false` to skip injection. Note that CNPG keeps its built-in TLS on the wire regardless of this flag — this toggle only controls the chart-side SAN injection; to disable PostgreSQL TLS entirely set `postgresql.parameters.ssl = "off"` at the CNPG layer.
+	// Tri-state switch controlling whether the chart injects the external hostnames into the operator-managed CNPG cert via spec.certificates.serverAltDNSNames. When omitted, the chart injects them if `external: true` and skips them otherwise. Set explicitly to `true` to inject regardless of `external` (no-op when `external: false` since there is no external hostname to add). Set to `false` to skip injection. Note that CNPG keeps its built-in TLS on the wire regardless of this flag — this toggle only controls the chart-side SAN injection; to disable PostgreSQL TLS entirely set `postgresql.parameters.ssl = "off"` at the CNPG layer.
 	Enabled *bool `json:"enabled,omitempty"`
+	// Tri-state switch controlling whether the server refuses sessions that are not encrypted. When omitted, it is on if `external: true` and off otherwise. When on, the chart renders `spec.postgresql.pg_hba` with `hostssl all all all scram-sha-256` (`md5` on PostgreSQL 13, matching CloudNativePG's default rule) followed by `host all all all reject`, so a client that connects with `sslmode=disable` is refused instead of getting a plaintext session; in-cluster clients are held to the same rule, since the pod network cannot be told apart from an external client. Set to `false` to keep accepting plaintext sessions on an external instance, or to `true` to require TLS on an in-cluster one. Rendering fails if `postgresql.parameters.ssl` is off while this is in effect.
+	Required *bool `json:"required,omitempty"`
 }
 
 type User struct {
-	// Password for the user.
-	Password string `json:"password,omitempty"`
+	// Whether the user can bypass row-level security policies (BYPASSRLS). A role can only create other roles carrying BYPASSRLS if it holds the attribute itself, so this is required alongside `createRole` to provision a privileged service role.
+	BypassRls bool `json:"bypassRls,omitempty"`
+	// Whether the user can create and manage roles (CREATEROLE). Requires PostgreSQL 16 or newer. Setting it back to `false` withdraws the attribute only: the roles the user created, and its ADMIN and SET memberships in them, stay. Once any user has held it, the chart no longer adopts an existing role it did not create, so a user or database declared later under the name of such a role fails the init job until a platform administrator drops that role.
+	CreateRole bool `json:"createRole,omitempty"`
 	// Whether the user has replication privileges.
 	Replication bool `json:"replication,omitempty"`
 }
 
+// +kubebuilder:validation:Enum="postgresql";"postgis"
+type Flavor string
+
+// +kubebuilder:validation:Enum="pg_stat_statements";"auto_explain";"pgaudit";"pg_prewarm"
+type PreloadLibrary string
+
+// +kubebuilder:validation:Enum="ReadConnections";"ReadCPUUtilization"
+type ReadMetric string
+
 // +kubebuilder:validation:Enum="t1.nano";"t1.micro";"t1.small";"t1.medium";"t1.large";"t1.xlarge";"t1.2xlarge";"t1.4xlarge";"c1.nano";"c1.micro";"c1.small";"c1.medium";"c1.large";"c1.xlarge";"c1.2xlarge";"c1.4xlarge";"s1.nano";"s1.micro";"s1.small";"s1.medium";"s1.large";"s1.xlarge";"s1.2xlarge";"s1.4xlarge";"u1.nano";"u1.micro";"u1.small";"u1.medium";"u1.large";"u1.xlarge";"u1.2xlarge";"u1.4xlarge";"m1.nano";"m1.micro";"m1.small";"m1.medium";"m1.large";"m1.xlarge";"m1.2xlarge";"m1.4xlarge";"nano";"micro";"small";"medium";"large";"xlarge";"2xlarge"
 type ResourcesPreset string
 
diff --git a/api/apps/v1alpha1/postgresql/zz_generated.deepcopy.go b/api/apps/v1alpha1/postgresql/zz_generated.deepcopy.go
index a930e9fb41..bfbb119086 100644
--- a/api/apps/v1alpha1/postgresql/zz_generated.deepcopy.go
+++ b/api/apps/v1alpha1/postgresql/zz_generated.deepcopy.go
@@ -25,6 +25,21 @@ import (
 	"k8s.io/apimachinery/pkg/util/intstr"
 )
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *Autoscaling) DeepCopyInto(out *Autoscaling) {
+	*out = *in
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Autoscaling.
+func (in *Autoscaling) DeepCopy() *Autoscaling {
+	if in == nil {
+		return nil
+	}
+	out := new(Autoscaling)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *Backup) DeepCopyInto(out *Backup) {
 	*out = *in
@@ -91,6 +106,7 @@ func (in *ConfigSpec) DeepCopyInto(out *ConfigSpec) {
 	in.Tls.DeepCopyInto(&out.Tls)
 	in.Postgresql.DeepCopyInto(&out.Postgresql)
 	out.Quorum = in.Quorum
+	out.Autoscaling = in.Autoscaling
 	if in.Users != nil {
 		in, out := &in.Users, &out.Users
 		*out = make(map[string]User, len(*in))
@@ -190,6 +206,11 @@ func (in *PostgreSQL) DeepCopyInto(out *PostgreSQL) {
 			(*out)[key] = val
 		}
 	}
+	if in.SharedPreloadLibraries != nil {
+		in, out := &in.SharedPreloadLibraries, &out.SharedPreloadLibraries
+		*out = make([]PreloadLibrary, len(*in))
+		copy(*out, *in)
+	}
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PostgreSQL.
@@ -257,6 +278,11 @@ func (in *TLS) DeepCopyInto(out *TLS) {
 		*out = new(bool)
 		**out = **in
 	}
+	if in.Required != nil {
+		in, out := &in.Required, &out.Required
+		*out = new(bool)
+		**out = **in
+	}
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new TLS.
diff --git a/api/apps/v1alpha1/rabbitmq/types.go b/api/apps/v1alpha1/rabbitmq/types.go
index 89b832ab4b..ca9c965b5a 100644
--- a/api/apps/v1alpha1/rabbitmq/types.go
+++ b/api/apps/v1alpha1/rabbitmq/types.go
@@ -20,11 +20,11 @@ type ConfigSpec struct {
 	// Number of RabbitMQ replicas.
 	// +kubebuilder:default:=3
 	Replicas int `json:"replicas"`
-	// Explicit CPU and memory configuration for each RabbitMQ replica. When omitted, the preset defined in `resourcesPreset` is applied.
+	// Explicit CPU and memory configuration for each RabbitMQ replica. Every resource left unset here is taken from `resourcesPreset`.
 	// +kubebuilder:default:={}
 	Resources Resources `json:"resources,omitempty"`
-	// Default sizing preset used when `resources` is omitted.
-	// +kubebuilder:default:="t1.nano"
+	// Default sizing preset. It supplies every resource `resources` does not set, not only a `resources` left empty entirely.
+	// +kubebuilder:default:="s1.nano"
 	ResourcesPreset ResourcesPreset `json:"resourcesPreset"`
 	// Persistent Volume Claim size available for application data.
 	// +kubebuilder:default:="10Gi"
@@ -36,6 +36,9 @@ type ConfigSpec struct {
 	// Enable external access from outside the cluster.
 	// +kubebuilder:default:=false
 	External bool `json:"external"`
+	// TLS configuration. TLS is off unless `tls.enabled` is set to true.
+	// +kubebuilder:default:={}
+	Tls TLS `json:"tls,omitempty"`
 	// RabbitMQ major.minor version to deploy
 	// +kubebuilder:default:="v4.2"
 	Version Version `json:"version"`
@@ -61,6 +64,13 @@ type Roles struct {
 	Readonly []string `json:"readonly,omitempty"`
 }
 
+type TLS struct {
+	// Close the plaintext AMQP (5672) and management (15672) listeners. This is a broker-level switch: it drops in-cluster clients as well as external ones, and it cannot be combined with `users` or `vhosts`. Erlang distribution (25672) and epmd (4369) stay plaintext regardless. Defaults to false.
+	DisableNonTLSListeners bool `json:"disableNonTLSListeners,omitempty"`
+	// Enable TLS for AMQPS (5671) and Management HTTPS (15671). Applies whether or not `external` is set. Plaintext AMQP (5672) and management (15672) keep serving unless `disableNonTLSListeners` is set as well. Moves the `port` key of the `<release>-default-user` Secret from 5672 to 5671, and the metrics port from 15692 to 15691. Defaults to false.
+	Enabled bool `json:"enabled,omitempty"`
+}
+
 type User struct {
 	// Password for the user.
 	Password string `json:"password,omitempty"`
diff --git a/api/apps/v1alpha1/rabbitmq/zz_generated.deepcopy.go b/api/apps/v1alpha1/rabbitmq/zz_generated.deepcopy.go
index a1d55f8983..83503ed5c7 100644
--- a/api/apps/v1alpha1/rabbitmq/zz_generated.deepcopy.go
+++ b/api/apps/v1alpha1/rabbitmq/zz_generated.deepcopy.go
@@ -55,6 +55,7 @@ func (in *ConfigSpec) DeepCopyInto(out *ConfigSpec) {
 	*out = *in
 	in.Resources.DeepCopyInto(&out.Resources)
 	out.Size = in.Size.DeepCopy()
+	out.Tls = in.Tls
 	if in.Users != nil {
 		in, out := &in.Users, &out.Users
 		*out = make(map[string]User, len(*in))
@@ -123,6 +124,21 @@ func (in *Roles) DeepCopy() *Roles {
 	return out
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *TLS) DeepCopyInto(out *TLS) {
+	*out = *in
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new TLS.
+func (in *TLS) DeepCopy() *TLS {
+	if in == nil {
+		return nil
+	}
+	out := new(TLS)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *User) DeepCopyInto(out *User) {
 	*out = *in
diff --git a/api/apps/v1alpha1/redis/types.go b/api/apps/v1alpha1/redis/types.go
index 53d5371765..509c1e6ce5 100644
--- a/api/apps/v1alpha1/redis/types.go
+++ b/api/apps/v1alpha1/redis/types.go
@@ -33,15 +33,27 @@ type ConfigSpec struct {
 	// +kubebuilder:default:=""
 	// +kubebuilder:validation:XValidation:rule="self == oldSelf",message="storageClass is immutable"
 	StorageClass string `json:"storageClass"`
-	// Enable external access from outside the cluster.
+	// Enable external access from outside the cluster. Can be enabled only when the instance is created, together with `tls.enabled: true`; turning it on for an existing instance, or changing `tls.enabled` while it is on, is refused at admission.
 	// +kubebuilder:default:=false
 	External bool `json:"external"`
-	// Redis major version to deploy
+	// Redis major version to deploy. The Redis and Sentinel pods run the same image.
 	// +kubebuilder:default:="v8"
 	Version Version `json:"version"`
+	// TLS configuration. TLS is opt-in and is not inferred from `external`.
+	// +kubebuilder:default:={}
+	Tls TLS `json:"tls,omitempty"`
 	// Enable password generation.
 	// +kubebuilder:default:=true
 	AuthEnabled bool `json:"authEnabled"`
+	// Redis `min-replicas-to-write`: the master refuses writes unless at least this many replicas are connected and within `minReplicasMaxLag`. Unset by default, which leaves the Redis default (disabled). With `replicas: 2` and a value of 1 the master rejects writes while its only replica is down, trading availability for a bound on the writes lost if an isolated master is failed over. Replication stays asynchronous, so this bounds the loss, it does not remove it. Must be 0 or more and below `replicas` (a master with `replicas` pods has `replicas - 1` replicas), otherwise every write is refused; the chart refuses such a value.
+	// +kubebuilder:validation:Minimum=0
+	MinReplicasToWrite *int `json:"minReplicasToWrite,omitempty"`
+	// Redis `min-replicas-max-lag`, in seconds: a replica whose last acknowledgement is older than this does not count towards `minReplicasToWrite`. Unset by default, which leaves the Redis default (10). Has no effect unless `minReplicasToWrite` is set. Must be at least 1 when `minReplicasToWrite` is set: Redis treats 0 as disabling the check, so the chart refuses it.
+	// +kubebuilder:validation:Minimum=0
+	MinReplicasMaxLag *int `json:"minReplicasMaxLag,omitempty"`
+	// Sentinel configuration. When `sentinel.resources` is empty and `sentinel.resourcesPreset` is unset, the three Sentinel pods are sized like the Redis pods (`resources` and `resourcesPreset`). An empty `sentinel.resources` map counts as unset, as an empty top-level `resources` does.
+	// +kubebuilder:default:={}
+	Sentinel Sentinel `json:"sentinel,omitempty"`
 }
 
 type Resources struct {
@@ -51,6 +63,23 @@ type Resources struct {
 	Memory resource.Quantity `json:"memory,omitempty"`
 }
 
+type Sentinel struct {
+	// Explicit CPU and memory configuration for each Sentinel pod. Keys left out are filled from the preset in `sentinel.resourcesPreset`.
+	Resources Resources `json:"resources,omitempty"`
+	// Sizing preset for the Sentinel pods. Defaults to `resourcesPreset`.
+	ResourcesPreset ResourcesPreset `json:"resourcesPreset,omitempty"`
+}
+
+type TLS struct {
+	// Maps to the Redis `tls-auth-clients` directive. Defaults to `no` — the server certificate is presented but client certificates are not validated. `yes` requires a client certificate signed by this release's CA, which the platform does not issue. Changing it restarts the Redis and Sentinel pods, because the directive is read from the config file once at startup.
+	AuthClients AuthClients `json:"authClients,omitempty"`
+	// Enable TLS for Redis and Sentinel connections. Disabled unless set. Enabling it moves Redis and Sentinel to a TLS-only listener, so existing plaintext clients must be migrated at the same time. Encryption is provided by the redis-operator fork that mounts the certificate Secret into both Redis and Sentinel pods at `/tls`.
+	Enabled *bool `json:"enabled,omitempty"`
+}
+
+// +kubebuilder:validation:Enum="no";"optional";"yes"
+type AuthClients string
+
 // +kubebuilder:validation:Enum="t1.nano";"t1.micro";"t1.small";"t1.medium";"t1.large";"t1.xlarge";"t1.2xlarge";"t1.4xlarge";"c1.nano";"c1.micro";"c1.small";"c1.medium";"c1.large";"c1.xlarge";"c1.2xlarge";"c1.4xlarge";"s1.nano";"s1.micro";"s1.small";"s1.medium";"s1.large";"s1.xlarge";"s1.2xlarge";"s1.4xlarge";"u1.nano";"u1.micro";"u1.small";"u1.medium";"u1.large";"u1.xlarge";"u1.2xlarge";"u1.4xlarge";"m1.nano";"m1.micro";"m1.small";"m1.medium";"m1.large";"m1.xlarge";"m1.2xlarge";"m1.4xlarge";"nano";"micro";"small";"medium";"large";"xlarge";"2xlarge"
 type ResourcesPreset string
 
diff --git a/api/apps/v1alpha1/redis/zz_generated.deepcopy.go b/api/apps/v1alpha1/redis/zz_generated.deepcopy.go
index 6390200cb0..489c28e852 100644
--- a/api/apps/v1alpha1/redis/zz_generated.deepcopy.go
+++ b/api/apps/v1alpha1/redis/zz_generated.deepcopy.go
@@ -55,6 +55,18 @@ func (in *ConfigSpec) DeepCopyInto(out *ConfigSpec) {
 	*out = *in
 	in.Resources.DeepCopyInto(&out.Resources)
 	out.Size = in.Size.DeepCopy()
+	in.Tls.DeepCopyInto(&out.Tls)
+	if in.MinReplicasToWrite != nil {
+		in, out := &in.MinReplicasToWrite, &out.MinReplicasToWrite
+		*out = new(int)
+		**out = **in
+	}
+	if in.MinReplicasMaxLag != nil {
+		in, out := &in.MinReplicasMaxLag, &out.MinReplicasMaxLag
+		*out = new(int)
+		**out = **in
+	}
+	in.Sentinel.DeepCopyInto(&out.Sentinel)
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ConfigSpec.
@@ -83,3 +95,39 @@ func (in *Resources) DeepCopy() *Resources {
 	in.DeepCopyInto(out)
 	return out
 }
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *Sentinel) DeepCopyInto(out *Sentinel) {
+	*out = *in
+	in.Resources.DeepCopyInto(&out.Resources)
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Sentinel.
+func (in *Sentinel) DeepCopy() *Sentinel {
+	if in == nil {
+		return nil
+	}
+	out := new(Sentinel)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *TLS) DeepCopyInto(out *TLS) {
+	*out = *in
+	if in.Enabled != nil {
+		in, out := &in.Enabled, &out.Enabled
+		*out = new(bool)
+		**out = **in
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new TLS.
+func (in *TLS) DeepCopy() *TLS {
+	if in == nil {
+		return nil
+	}
+	out := new(TLS)
+	in.DeepCopyInto(out)
+	return out
+}
diff --git a/api/apps/v1alpha1/tcpbalancer/types.go b/api/apps/v1alpha1/tcpbalancer/types.go
index 19f5f73060..97c56f4667 100644
--- a/api/apps/v1alpha1/tcpbalancer/types.go
+++ b/api/apps/v1alpha1/tcpbalancer/types.go
@@ -32,7 +32,7 @@ type ConfigSpec struct {
 	// HTTP and HTTPS configuration.
 	// +kubebuilder:default:={}
 	HttpAndHttps HttpAndHttps `json:"httpAndHttps"`
-	// Secure HTTP by whitelisting client networks (default: false).
+	// Secure HTTP and HTTPS by whitelisting client networks. Requires a non-empty `whitelist` (default: false).
 	// +kubebuilder:default:=false
 	WhitelistHTTP bool `json:"whitelistHTTP"`
 	// List of allowed client networks.
diff --git a/api/apps/v1alpha1/tenant/types.go b/api/apps/v1alpha1/tenant/types.go
index 0555ef3d61..fdb75f2e1f 100644
--- a/api/apps/v1alpha1/tenant/types.go
+++ b/api/apps/v1alpha1/tenant/types.go
@@ -26,14 +26,23 @@ type ConfigSpec struct {
 	// Deploy own Monitoring Stack.
 	// +kubebuilder:default:=false
 	Monitoring bool `json:"monitoring"`
+	// Send this tenant's traces to the shared VictoriaTraces store in tenant-root instead of a per-tenant backend; its Grafana reads them through a vmauth there that pins the tenant's own account, so tenants sharing the store cannot read each other's traces. It needs the tenant's own Monitoring (`monitoring: true`) and tenant-root hosting the store (`tracingCentralHost: true` on its Monitoring, with a `cluster`-mode tracingStorages entry named `generic`); without that the tenant's monitoring render fails rather than dropping spans. tenant-root, and whoever it admits to its Grafana, are inside the store's trust boundary. Applications should export over OTLP/HTTP, in requests below 3 MiB: spans above the platform's per-tenant write rate are retried over HTTP but dropped over gRPC, and a larger request is refused and not retried.
+	// +kubebuilder:default:=false
+	TracingCentral bool `json:"tracingCentral"`
 	// Deploy own Ingress Controller.
 	// +kubebuilder:default:=false
 	Ingress bool `json:"ingress"`
-	// Deploy own Gateway API Gateway (backed by Cilium Gateway API controller). When unset (the default), the chart auto-enables the Gateway for tenants whose apex is derived from the parent (i.e. `host` is empty), and leaves it off for tenants with a custom non-derived apex. Set to `true` or `false` explicitly to override that auto-behaviour. Note: leave the key absent (do not write `gateway: null`) — the chart distinguishes "unset" via missing-key, not via null value, to satisfy the JSON schema generated from this comment.
+	// Deploy own Gateway API Gateway (backed by Cilium Gateway API controller). When unset (the default) or set to `false`, the tenant does not own a Gateway and instead publishes through the nearest ancestor tenant that owns one, regardless of whether `host` is empty or custom (`false` currently behaves the same as unset and does not opt out of that inheritance). Set to `true` to give the tenant its own Gateway with its own LoadBalancer IP and Certificate. A tenant with a custom (non-derived) `host` that needs its apex publicly reachable must set `true` explicitly, because an ancestor's TLS certificate does not cover a custom apex. Note: leave the key absent (do not write `gateway: null`): the chart distinguishes "unset" via missing-key, not via null value, to satisfy the JSON schema generated from this comment.
 	Gateway bool `json:"gateway,omitempty"`
+	// GatewayClass for this tenant's own Gateway. Empty uses the platform default (`gateway.className`). Only the classes the operator lists in the platform's `gateway.tenantSelectableClasses`, plus that default, may be named here — anything else fails this tenant's own gateway release and reaches no other tenant. Read only when this tenant owns a Gateway; an inheriting tenant uses its ancestor's. Whether a class terminates TLS itself or at its provider's edge is declared once per class on the platform, not here.
+	// +kubebuilder:default:=""
+	GatewayClass string `json:"gatewayClass,omitempty"`
 	// Deploy own SeaweedFS.
 	// +kubebuilder:default:=false
 	Seaweedfs bool `json:"seaweedfs"`
+	// Deploy own ComputePlane — a single-tenant, Cozystack-managed cluster for untrusted-code applications. The tenant receives no admin kubeconfig for it. Automatic routing of catalog applications onto it (placement: ComputePlane) is a planned follow-up and is not available yet; until it lands, external catalogs target the cluster via its computeplane-cluster-admin-kubeconfig Secret. See design-proposals/compute-plane in cozystack/community.
+	// +kubebuilder:default:=false
+	Computeplane bool `json:"computeplane"`
 	// The name of a SchedulingClass CR to apply scheduling constraints for this tenant's workloads.
 	// +kubebuilder:default:=""
 	SchedulingClass string `json:"schedulingClass,omitempty"`
diff --git a/api/apps/v1alpha1/valkey/types.go b/api/apps/v1alpha1/valkey/types.go
new file mode 100644
index 0000000000..197bfab5a0
--- /dev/null
+++ b/api/apps/v1alpha1/valkey/types.go
@@ -0,0 +1,58 @@
+// Code generated by values-gen. DO NOT EDIT.
+// +kubebuilder:object:generate=true
+// +groupName=apps.cozystack.io
+// +versionName=v1alpha1
+package valkey
+
+import (
+	resource "k8s.io/apimachinery/pkg/api/resource"
+	"k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+// +kubebuilder:object:root=true
+type Config struct {
+	v1.TypeMeta   `json:",inline"`
+	v1.ObjectMeta `json:"metadata,omitempty"`
+	Spec          ConfigSpec `json:"spec,omitempty"`
+}
+
+type ConfigSpec struct {
+	// Number of Valkey replicas.
+	// +kubebuilder:default:=2
+	Replicas int `json:"replicas"`
+	// Explicit CPU and memory configuration for each Valkey replica. When omitted, the preset defined in `resourcesPreset` is applied.
+	// +kubebuilder:default:={}
+	Resources Resources `json:"resources,omitempty"`
+	// Default sizing preset used when `resources` is omitted.
+	// +kubebuilder:default:="t1.nano"
+	ResourcesPreset ResourcesPreset `json:"resourcesPreset"`
+	// Persistent Volume Claim size available for application data.
+	// +kubebuilder:default:="1Gi"
+	Size resource.Quantity `json:"size"`
+	// StorageClass used to store the data.
+	// +kubebuilder:default:=""
+	// +kubebuilder:validation:XValidation:rule="self == oldSelf",message="storageClass is immutable"
+	StorageClass string `json:"storageClass"`
+	// Enable external access from outside the cluster.
+	// +kubebuilder:default:=false
+	External bool `json:"external"`
+	// Valkey major version to deploy
+	// +kubebuilder:default:="v8"
+	Version Version `json:"version"`
+	// Enable password generation.
+	// +kubebuilder:default:=true
+	AuthEnabled bool `json:"authEnabled"`
+}
+
+type Resources struct {
+	// CPU available to each replica.
+	Cpu resource.Quantity `json:"cpu,omitempty"`
+	// Memory (RAM) available to each replica.
+	Memory resource.Quantity `json:"memory,omitempty"`
+}
+
+// +kubebuilder:validation:Enum="t1.nano";"t1.micro";"t1.small";"t1.medium";"t1.large";"t1.xlarge";"t1.2xlarge";"t1.4xlarge";"c1.nano";"c1.micro";"c1.small";"c1.medium";"c1.large";"c1.xlarge";"c1.2xlarge";"c1.4xlarge";"s1.nano";"s1.micro";"s1.small";"s1.medium";"s1.large";"s1.xlarge";"s1.2xlarge";"s1.4xlarge";"u1.nano";"u1.micro";"u1.small";"u1.medium";"u1.large";"u1.xlarge";"u1.2xlarge";"u1.4xlarge";"m1.nano";"m1.micro";"m1.small";"m1.medium";"m1.large";"m1.xlarge";"m1.2xlarge";"m1.4xlarge";"nano";"micro";"small";"medium";"large";"xlarge";"2xlarge"
+type ResourcesPreset string
+
+// +kubebuilder:validation:Enum="v8";"v7"
+type Version string
diff --git a/api/apps/v1alpha1/valkey/zz_generated.deepcopy.go b/api/apps/v1alpha1/valkey/zz_generated.deepcopy.go
new file mode 100644
index 0000000000..2e9201251e
--- /dev/null
+++ b/api/apps/v1alpha1/valkey/zz_generated.deepcopy.go
@@ -0,0 +1,85 @@
+//go:build !ignore_autogenerated
+
+/*
+Copyright 2025 The Cozystack Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// Code generated by controller-gen. DO NOT EDIT.
+
+package valkey
+
+import (
+	runtime "k8s.io/apimachinery/pkg/runtime"
+)
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *Config) DeepCopyInto(out *Config) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
+	in.Spec.DeepCopyInto(&out.Spec)
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Config.
+func (in *Config) DeepCopy() *Config {
+	if in == nil {
+		return nil
+	}
+	out := new(Config)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *Config) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *ConfigSpec) DeepCopyInto(out *ConfigSpec) {
+	*out = *in
+	in.Resources.DeepCopyInto(&out.Resources)
+	out.Size = in.Size.DeepCopy()
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ConfigSpec.
+func (in *ConfigSpec) DeepCopy() *ConfigSpec {
+	if in == nil {
+		return nil
+	}
+	out := new(ConfigSpec)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *Resources) DeepCopyInto(out *Resources) {
+	*out = *in
+	out.Cpu = in.Cpu.DeepCopy()
+	out.Memory = in.Memory.DeepCopy()
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Resources.
+func (in *Resources) DeepCopy() *Resources {
+	if in == nil {
+		return nil
+	}
+	out := new(Resources)
+	in.DeepCopyInto(out)
+	return out
+}
diff --git a/api/apps/v1alpha1/vmdisk/types.go b/api/apps/v1alpha1/vmdisk/types.go
index a4630827e8..6c1630e7b7 100644
--- a/api/apps/v1alpha1/vmdisk/types.go
+++ b/api/apps/v1alpha1/vmdisk/types.go
@@ -19,6 +19,7 @@ type Config struct {
 type ConfigSpec struct {
 	// The source image location used to create a disk.
 	// +kubebuilder:default:={}
+	// +kubebuilder:validation:XValidation:rule="self == oldSelf",message="source is immutable"
 	Source Source `json:"source"`
 	// Defines if disk should be considered optical.
 	// +kubebuilder:default:=false
@@ -30,6 +31,9 @@ type ConfigSpec struct {
 	// +kubebuilder:default:="replicated"
 	// +kubebuilder:validation:XValidation:rule="self == oldSelf",message="storageClass is immutable"
 	StorageClass string `json:"storageClass"`
+	// Provision the volume at disk creation instead of waiting for a consumer.
+	// +kubebuilder:default:=true
+	BindImmediately bool `json:"bindImmediately"`
 }
 
 type Source struct {
diff --git a/api/apps/v1alpha1/vminstance/types.go b/api/apps/v1alpha1/vminstance/types.go
index 9c48724a3d..95c800aae7 100644
--- a/api/apps/v1alpha1/vminstance/types.go
+++ b/api/apps/v1alpha1/vminstance/types.go
@@ -32,7 +32,7 @@ type ConfigSpec struct {
 	// Requested running state of the VirtualMachineInstance
 	// +kubebuilder:default:="Always"
 	RunStrategy RunStrategy `json:"runStrategy"`
-	// Virtual Machine instance type.
+	// Virtual Machine instance type. Ignored when `resources` sizes the VM, which needs whole-number cpu and sockets plus memory; the whole type is dropped then, so any dedicated CPU placement, hugepages, NUMA or realtime settings it carries go with it. While this field is set, a `resources` block that sizes only part of the VM is rejected outright instead of ignored, so complete it or clear it.
 	// +kubebuilder:default:="u1.medium"
 	InstanceType string `json:"instanceType"`
 	// Virtual Machine preferences profile.
@@ -53,7 +53,10 @@ type ConfigSpec struct {
 	// Model specifies the CPU model inside the VMI. List of available models https://github.com/libvirt/libvirt/tree/master/src/cpu_map
 	// +kubebuilder:default:=""
 	CpuModel string `json:"cpuModel"`
-	// Resource configuration for the virtual machine.
+	// Firmware and boot configuration (UEFI/BIOS selection, Secure Boot, persistent EFI NVRAM).
+	// +kubebuilder:default:={}
+	Firmware Firmware `json:"firmware,omitempty"`
+	// Resource configuration for the virtual machine. Set whole-number cpu and sockets together with memory to size the VM directly, which overrides `instanceType`. Alongside an `instanceType`, a block that sizes only part of the VM is rejected; a whole-number cpu or sockets on its own sizes nothing and is ignored.
 	// +kubebuilder:default:={}
 	Resources Resources `json:"resources,omitempty"`
 	// List of SSH public keys for authentication.
@@ -62,6 +65,9 @@ type ConfigSpec struct {
 	// Cloud-init user data.
 	// +kubebuilder:default:=""
 	CloudInit string `json:"cloudInit"`
+	// Supply cloud-init network-data that requests DHCP on every `en*` and `eth*` interface and keeps the DNS search domains DHCP offers. Needed for a netplan guest (Ubuntu, Debian) to address a secondary network such as a VPC subnet. Leave it off for a guest rendered by anything other than netplan, which would lose DHCP on every interface, and for a guest that configures an interface statically through netplan, which this configuration would shadow. Turning it on for a VM that has neither `cloudInit` nor `sshKeys` adds a cloud-init disk, and the guest's next boot is then treated as a first boot.
+	// +kubebuilder:default:=false
+	NetplanDhcp bool `json:"netplanDhcp"`
 	// Seed string to generate SMBIOS UUID for the VM.
 	// +kubebuilder:default:=""
 	CloudInitSeed string `json:"cloudInitSeed"`
@@ -74,6 +80,15 @@ type Disk struct {
 	Name string `json:"name"`
 }
 
+type Firmware struct {
+	// Bootloader to boot the VM with: "uefi" (OVMF) or "bios" (SeaBIOS). Empty inherits the instanceProfile default.
+	Bootloader string `json:"bootloader,omitempty"`
+	// Persist EFI NVRAM (e.g. enrolled Secure Boot keys, such as an updated Microsoft UEFI CA) across reboots. Only applies when bootloader is "uefi".
+	EfiPersistent bool `json:"efiPersistent,omitempty"`
+	// Enable UEFI Secure Boot. Only applies when bootloader is "uefi".
+	SecureBoot bool `json:"secureBoot,omitempty"`
+}
+
 type GPU struct {
 	// The name of the GPU resource to attach.
 	Name string `json:"name"`
@@ -85,11 +100,11 @@ type Network struct {
 }
 
 type Resources struct {
-	// Number of CPU cores allocated.
+	// Number of CPU cores allocated, as a positive whole number such as `2`. Millicore or other unit-suffixed, fractional, zero, negative, above 4294967295 and quoted leading-zero values are rejected at render time, because the value becomes the VM's unsigned integer `domain.cpu.cores`.
 	Cpu resource.Quantity `json:"cpu,omitempty"`
-	// Amount of memory allocated.
+	// Amount of memory allocated, as a quantity of at least `1M` such as `8Gi`. Less than 1M is rejected at render time, because KubeVirt refuses a non-zero amount below 1M and a zero or negative amount sizes nothing.
 	Memory resource.Quantity `json:"memory,omitempty"`
-	// Number of CPU sockets (vCPU topology).
+	// Number of CPU sockets (vCPU topology), as a positive whole number such as `1`. Millicore or other unit-suffixed, fractional, zero, negative, above 4294967295 and quoted leading-zero values are rejected at render time, because the value becomes the VM's unsigned integer `domain.cpu.sockets`.
 	Sockets resource.Quantity `json:"sockets,omitempty"`
 }
 
diff --git a/api/apps/v1alpha1/vminstance/zz_generated.deepcopy.go b/api/apps/v1alpha1/vminstance/zz_generated.deepcopy.go
index 86d5ddfc46..0602810426 100644
--- a/api/apps/v1alpha1/vminstance/zz_generated.deepcopy.go
+++ b/api/apps/v1alpha1/vminstance/zz_generated.deepcopy.go
@@ -78,6 +78,7 @@ func (in *ConfigSpec) DeepCopyInto(out *ConfigSpec) {
 		*out = make([]GPU, len(*in))
 		copy(*out, *in)
 	}
+	out.Firmware = in.Firmware
 	in.Resources.DeepCopyInto(&out.Resources)
 	if in.SshKeys != nil {
 		in, out := &in.SshKeys, &out.SshKeys
@@ -111,6 +112,21 @@ func (in *Disk) DeepCopy() *Disk {
 	return out
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *Firmware) DeepCopyInto(out *Firmware) {
+	*out = *in
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Firmware.
+func (in *Firmware) DeepCopy() *Firmware {
+	if in == nil {
+		return nil
+	}
+	out := new(Firmware)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *GPU) DeepCopyInto(out *GPU) {
 	*out = *in
diff --git a/api/apps/v1alpha1/vpc/types.go b/api/apps/v1alpha1/vpc/types.go
index fed72f58af..d794606819 100644
--- a/api/apps/v1alpha1/vpc/types.go
+++ b/api/apps/v1alpha1/vpc/types.go
@@ -42,6 +42,8 @@ type Route struct {
 }
 
 type Subnet struct {
+	// Additional source CIDRs admitted into this private subnet, such as remote networks routed in through a gateway VM
+	AllowSubnets []string `json:"allowSubnets,omitempty"`
 	// IP address range
 	Cidr string `json:"cidr,omitempty"`
 	// Subnet name
diff --git a/api/apps/v1alpha1/vpc/zz_generated.deepcopy.go b/api/apps/v1alpha1/vpc/zz_generated.deepcopy.go
index 3cda29c4cf..6513cc19e4 100644
--- a/api/apps/v1alpha1/vpc/zz_generated.deepcopy.go
+++ b/api/apps/v1alpha1/vpc/zz_generated.deepcopy.go
@@ -56,7 +56,9 @@ func (in *ConfigSpec) DeepCopyInto(out *ConfigSpec) {
 	if in.Subnets != nil {
 		in, out := &in.Subnets, &out.Subnets
 		*out = make([]Subnet, len(*in))
-		copy(*out, *in)
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
 	}
 	if in.Peers != nil {
 		in, out := &in.Peers, &out.Peers
@@ -113,6 +115,11 @@ func (in *Route) DeepCopy() *Route {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *Subnet) DeepCopyInto(out *Subnet) {
 	*out = *in
+	if in.AllowSubnets != nil {
+		in, out := &in.AllowSubnets, &out.AllowSubnets
+		*out = make([]string, len(*in))
+		copy(*out, *in)
+	}
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Subnet.
diff --git a/api/backups/strategy/v1alpha1/cnpg_types.go b/api/backups/strategy/v1alpha1/cnpg_types.go
index 69aaa81b82..8720ee071f 100644
--- a/api/backups/strategy/v1alpha1/cnpg_types.go
+++ b/api/backups/strategy/v1alpha1/cnpg_types.go
@@ -31,10 +31,12 @@ const (
 
 // CNPG defines a backup strategy that delegates execution to the
 // CloudNativePG operator (postgresql.cnpg.io). The strategy carries a
-// templated barmanObjectStore configuration that the driver injects into
-// the live cnpg.io Cluster of the application; backup runs are produced as
-// postgresql.cnpg.io/Backup objects and surfaced as Cozystack Backup
-// artifacts.
+// templated barman configuration that the driver applies to the live
+// application Cluster through the barman-cloud plugin: it renders an
+// ObjectStore CR (barmancloud.cnpg.io) and wires the Cluster's spec.plugins
+// to it (native spec.backup.barmanObjectStore is deprecated in CNPG 1.27 and
+// removed in 1.29). Backup runs are produced as postgresql.cnpg.io/Backup
+// objects with spec.method=plugin and surfaced as Cozystack Backup artifacts.
 type CNPG struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
@@ -69,14 +71,19 @@ type CNPGSpec struct {
 
 // CNPGTemplate describes the templated CNPG-specific configuration.
 type CNPGTemplate struct {
-	// BarmanObjectStore is the templated CloudNativePG barmanObjectStore
-	// configuration. Field semantics mirror
-	// postgresql.cnpg.io/v1.BarmanObjectStoreConfiguration.
+	// BarmanObjectStore is the templated barman configuration. Field semantics
+	// mirror postgresql.cnpg.io/v1.BarmanObjectStoreConfiguration; the driver
+	// projects it into a barmancloud.cnpg.io ObjectStore.spec.configuration
+	// (plus spec.retentionPolicy) and references it from the Cluster via the
+	// barman-cloud plugin. The field name is retained for API stability.
 	BarmanObjectStore BarmanObjectStoreTemplate `json:"barmanObjectStore"`
 
 	// ServerName overrides the Barman server name used as the storage path
-	// prefix. When empty, the driver defaults it to the application name.
-	// Templating is supported.
+	// prefix. When empty, the driver defaults it to the Cluster name suffixed
+	// with the application UID, so a recreated application never archives
+	// into its predecessor's prefix. A Cluster that already has the
+	// barman-cloud plugin attached keeps its serverName. Templating is
+	// supported.
 	// +optional
 	ServerName string `json:"serverName,omitempty"`
 }
diff --git a/api/backups/strategy/v1alpha1/etcd_types.go b/api/backups/strategy/v1alpha1/etcd_types.go
index 79a1662a72..060d7ad2d8 100644
--- a/api/backups/strategy/v1alpha1/etcd_types.go
+++ b/api/backups/strategy/v1alpha1/etcd_types.go
@@ -29,16 +29,16 @@ const (
 // +kubebuilder:resource:scope=Cluster
 
 // Etcd defines a backup strategy that delegates execution to the
-// etcd-operator (etcd.aenix.io). The strategy carries a templated backup
-// destination configuration; the driver materialises one
-// etcd.aenix.io/v1alpha1 EtcdBackup per Cozystack BackupJob and surfaces
+// etcd-operator (etcd-operator.cozystack.io). The strategy carries a templated
+// backup destination configuration; the driver materialises one
+// etcd-operator.cozystack.io/v1alpha2 EtcdSnapshot per Cozystack BackupJob and surfaces
 // it as a Cozystack Backup artefact.
 //
 // Restore is in-place only: the driver suspends the source Etcd
 // HelmRelease, snapshots the live EtcdCluster spec, deletes it, and
 // re-creates the EtcdCluster with spec.bootstrap.restore.source
 // pointing at the Backup's S3 coordinates, then resumes the HR after
-// the cluster reaches Ready.
+// the cluster becomes Available.
 //
 // To-copy restore is NOT supported: RestoreJob.spec.targetApplicationRef
 // is a TypedLocalObjectReference (no namespace field), so there is no
@@ -68,7 +68,7 @@ type EtcdList struct {
 
 // EtcdSpec specifies the desired etcd-operator-driven backup strategy.
 type EtcdSpec struct {
-	// Template carries the templated EtcdBackup destination configuration
+	// Template carries the templated EtcdSnapshot destination configuration
 	// applied per BackupJob (and re-rendered against the same
 	// .Application / .Parameters at restore time). String fields support
 	// Helm-style Go templating with two top-level values:
@@ -80,19 +80,19 @@ type EtcdSpec struct {
 	Template EtcdTemplate `json:"template"`
 }
 
-// EtcdTemplate describes the templated EtcdBackup-shaped configuration the
+// EtcdTemplate describes the templated EtcdSnapshot-shaped configuration the
 // driver renders per BackupJob (and on the restore path stamps onto
 // EtcdCluster.spec.bootstrap.restore.source).
 type EtcdTemplate struct {
 	// Destination defines where the etcd snapshot will be stored. Field
-	// semantics mirror etcd.aenix.io/v1alpha1 EtcdBackup.spec.destination.
+	// semantics mirror etcd-operator.cozystack.io/v1alpha2 EtcdSnapshot.spec.destination.
 	Destination EtcdDestinationTemplate `json:"destination"`
 }
 
-// EtcdDestinationTemplate mirrors etcd.aenix.io/v1alpha1
-// EtcdBackup.spec.destination, RESTRICTED to S3.
+// EtcdDestinationTemplate mirrors etcd-operator.cozystack.io/v1alpha2
+// EtcdSnapshot.spec.destination, RESTRICTED to S3.
 //
-// The upstream etcd-operator EtcdBackup.spec.destination accepts either
+// The upstream etcd-operator EtcdSnapshot.spec.destination accepts either
 // S3 or PVC, but the operator's filename convention is asymmetric
 // between backup and restore on the PVC path:
 //
@@ -107,8 +107,8 @@ type EtcdTemplate struct {
 // Until the upstream gains symmetric semantics (or surfaces the final
 // file path via the equivalent of BackupSnapshot.URI for PVC), this
 // driver intentionally narrows the API contract to S3 only. The S3
-// path is fully exercised end-to-end on dev7 and covered by unit +
-// e2e tests.
+// path is fully exercised end-to-end on a test cluster and covered by
+// unit + e2e tests.
 // +kubebuilder:validation:XValidation:rule="has(self.s3)",message="s3 destination is required (PVC is intentionally not supported by this strategy until upstream restore-agent reads the same path the backup-agent writes; see the strategy comments)"
 type EtcdDestinationTemplate struct {
 	// S3 configures an S3-compatible storage target. Templating is
@@ -118,7 +118,7 @@ type EtcdDestinationTemplate struct {
 }
 
 // EtcdS3Template is a typed, kubebuilder-validated mirror of
-// etcd.aenix.io/v1alpha1 EtcdBackup.spec.destination.s3. Restores reuse
+// etcd-operator.cozystack.io/v1alpha2 EtcdSnapshot.spec.destination.s3. Restores reuse
 // the same shape: the driver re-renders the strategy and stamps the
 // resulting block onto EtcdCluster.spec.bootstrap.restore.source.s3 of the
 // target Etcd application.
diff --git a/api/backups/strategy/v1alpha1/kafka_types.go b/api/backups/strategy/v1alpha1/kafka_types.go
new file mode 100644
index 0000000000..289366f35a
--- /dev/null
+++ b/api/backups/strategy/v1alpha1/kafka_types.go
@@ -0,0 +1,97 @@
+// SPDX-License-Identifier: Apache-2.0
+// Package v1alpha1 defines strategy.backups.cozystack.io API types.
+//
+// Group: strategy.backups.cozystack.io
+// Version: v1alpha1
+package v1alpha1
+
+import (
+	corev1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+)
+
+func init() {
+	SchemeBuilder.Register(func(s *runtime.Scheme) error {
+		s.AddKnownTypes(GroupVersion,
+			&Kafka{},
+			&KafkaList{},
+		)
+		return nil
+	})
+}
+
+const (
+	KafkaStrategyKind = "Kafka"
+)
+
+// +kubebuilder:object:root=true
+// +kubebuilder:subresource:status
+// +kubebuilder:resource:scope=Cluster
+
+// Kafka defines a backup strategy for the topic METADATA of a Cozystack-managed
+// Kafka application: topic definitions and their configs (partitions,
+// replication factor, per-topic config keys), read and re-applied through the
+// Kafka Admin API. It is not a message-data backup and carries no consumer
+// offsets, ACLs, quotas or KafkaUsers — those are out of scope for this
+// strategy (message data belongs to a volume-snapshot strategy). Like the Job
+// strategy, the driver renders spec.template into a one-shot batch/v1.Job for
+// both backup and restore.
+type Kafka struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	Spec   KafkaSpec   `json:"spec,omitempty"`
+	Status KafkaStatus `json:"status,omitempty"`
+}
+
+// +kubebuilder:object:root=true
+
+// KafkaList contains a list of Kafka backup strategies.
+type KafkaList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+	Items           []Kafka `json:"items"`
+}
+
+// KafkaSpec specifies the desired behavior of a Kafka metadata backup strategy.
+type KafkaSpec struct {
+	// Template holds a PodTemplateSpec run to completion to back up (or restore)
+	// the application's topic metadata. Helm-like Go templates are supported in
+	// every string field and are rendered against:
+	//   - `.Application` — the live application object.
+	//   - `.Release.Name` and `.Release.Namespace` — the application's name and
+	//     namespace (the TARGET on restore).
+	//   - `.Mode` — `"backup"`, `"restore"`, or `"cleanup"` (delete the object
+	//     of a removed Backup), identifying the run.
+	//   - `.BackupName` — the per-run identity: the BackupJob name on backup,
+	//     the source Backup name on restore. Use it to scope the object key so
+	//     distinct backups of one application do not overwrite each other.
+	//   - `.Parameters` — the resolved BackupClass strategy parameters.
+	//   - `.Backup` — only on restore: `.Backup.Name`, `.Backup.Namespace` and
+	//     `.Backup.ApplicationRef` describing the source backup.
+	//
+	// Stored schemaless deliberately: the full PodTemplateSpec OpenAPI schema is
+	// ~590 KB, and inlining it here (after Altinity/Job/FoundationDB) would push
+	// the chart's Helm state Secret over the 1 MiB cap. See job_types.go for the
+	// same field carried with its schema, and strategy-kafka-default.yaml for
+	// the rendered pod.
+	//
+	// +kubebuilder:validation:Schemaless
+	// +kubebuilder:pruning:PreserveUnknownFields
+	Template corev1.PodTemplateSpec `json:"template"`
+
+	// ArtifactURITemplate is rendered against the same context, injected into the
+	// Job as ARTIFACT_URI (the single source of truth for the object location),
+	// and recorded on the produced Backup's status.artifact.uri so restore and
+	// cleanup act on the exact object the backup wrote. The driver requires it:
+	// reconcileKafka fails the BackupJob when it is empty, since nothing would
+	// record where the export is stored. The shipped cozy-default-kafka strategy
+	// always sets it; a custom Kafka strategy that stores backups must too.
+	// +optional
+	ArtifactURITemplate string `json:"artifactURITemplate,omitempty"`
+}
+
+type KafkaStatus struct {
+	Conditions []metav1.Condition `json:"conditions,omitempty"`
+}
diff --git a/api/backups/strategy/v1alpha1/mongodb_types.go b/api/backups/strategy/v1alpha1/mongodb_types.go
new file mode 100644
index 0000000000..abefdabe74
--- /dev/null
+++ b/api/backups/strategy/v1alpha1/mongodb_types.go
@@ -0,0 +1,157 @@
+// SPDX-License-Identifier: Apache-2.0
+// Package v1alpha1 defines strategy.backups.cozystack.io API types.
+//
+// Group: strategy.backups.cozystack.io
+// Version: v1alpha1
+package v1alpha1
+
+import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+)
+
+func init() {
+	SchemeBuilder.Register(func(s *runtime.Scheme) error {
+		s.AddKnownTypes(GroupVersion,
+			&MongoDB{},
+			&MongoDBList{},
+		)
+		return nil
+	})
+}
+
+const (
+	MongoDBStrategyKind = "MongoDB"
+)
+
+// +kubebuilder:object:root=true
+// +kubebuilder:subresource:status
+// +kubebuilder:resource:scope=Cluster
+
+// MongoDB defines a backup strategy that delegates execution to the Percona
+// Server for MongoDB operator (psmdb.percona.com). The strategy carries a
+// templated logical-backup configuration; the driver materialises
+// PerconaServerMongoDBBackup objects per BackupJob and surfaces them as
+// Cozystack Backup artifacts. Restores create a PerconaServerMongoDBRestore
+// CR with clusterName pointing at the target cluster and a backupSource
+// carrying the S3 destination read back from the source backup, so the same
+// artifact restores in-place or into a differently-named instance.
+//
+// The strategy always names the storage (spec.template.storageName) psmdb
+// resolves against the source cluster's spec.backup.storages. On the legacy
+// flow the S3/credentials for that storage live on the PerconaServerMongoDB CR
+// (the mongodb chart declares them when backup.enabled=true and
+// useSystemBucket=false). On the useSystemBucket flow the chart cannot know the
+// platform bucket at render time, so the strategy also carries the storage's S3
+// coordinates (spec.template.s3) and the driver SSA-injects them onto the
+// cluster at BackupJob time.
+type MongoDB struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	Spec   MongoDBSpec   `json:"spec,omitempty"`
+	Status MongoDBStatus `json:"status,omitempty"`
+}
+
+// +kubebuilder:object:root=true
+
+// MongoDBList contains a list of MongoDB backup strategies.
+type MongoDBList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+	Items           []MongoDB `json:"items"`
+}
+
+// MongoDBSpec specifies the desired psmdb-operator-driven backup strategy.
+type MongoDBSpec struct {
+	// Template carries the templated PerconaServerMongoDBBackup configuration.
+	// String fields support Helm-style Go templating with two top-level
+	// values:
+	//   .Application - the application object (apps.cozystack.io/MongoDB)
+	//   .Parameters  - the parameters from the matched BackupClassStrategy.
+	//                  These values MUST NOT carry credentials — the psmdb
+	//                  storage (bucket/endpoint/credentialsSecret) lives on the
+	//                  PerconaServerMongoDB CR, referenced here only by name.
+	Template MongoDBTemplate `json:"template"`
+}
+
+// MongoDBTemplate describes the templated PerconaServerMongoDBBackup shape the
+// driver renders per BackupJob.
+type MongoDBTemplate struct {
+	// StorageName names a storage entry in the source cluster's
+	// spec.backup.storages. On the legacy flow the mongodb chart declares
+	// "s3-storage" when backup.enabled=true and useSystemBucket=false; on the
+	// useSystemBucket flow the driver injects an entry under this same name from
+	// the S3 coordinates below. Leave empty to use "s3-storage". Templating is
+	// supported.
+	// +optional
+	StorageName string `json:"storageName,omitempty"`
+
+	// Type selects the backup type. Only "logical" is supported (logical
+	// dumps are portable across clusters, which is what makes
+	// restore-to-differently-named instances work). Defaults to "logical"
+	// when empty.
+	// +kubebuilder:validation:Enum=logical
+	// +optional
+	Type string `json:"type,omitempty"`
+
+	// CompressionType is the pbm compression algorithm (e.g. "gzip", "zstd",
+	// "s2", "snappy", "lz4", "pgzip", "none"). Defaults to the operator-side
+	// default when empty. Templating is supported.
+	// +optional
+	CompressionType string `json:"compressionType,omitempty"`
+
+	// CompressionLevel tunes the compression algorithm (algorithm-specific).
+	// Left unset the operator picks its default.
+	// +optional
+	CompressionLevel *int `json:"compressionLevel,omitempty"`
+
+	// S3 carries the system-bucket storage coordinates the driver SSA-patches
+	// onto the source PerconaServerMongoDB's spec.backup.storages[StorageName]
+	// on the useSystemBucket flow. PBM takes these as static CR fields (not
+	// secret refs), and the platform bucket name / endpoint are only known at
+	// BackupJob time, so the cozy-default strategy carries them (endpointUrl
+	// already scheme'd by the endpoint helper) and the driver injects them. Nil
+	// means the legacy flow: rely on the storage the app chart rendered
+	// statically, and patch nothing.
+	// +optional
+	S3 *MongoDBStorageS3 `json:"s3,omitempty"`
+}
+
+// MongoDBStorageS3 mirrors the psmdb spec.backup.storages[<name>].s3 block the
+// driver injects. String fields support templating (e.g. Prefix uses
+// {{ .Application.metadata.namespace }}/{{ .Application.metadata.name }}).
+type MongoDBStorageS3 struct {
+	// Bucket is the S3 bucket name (the COSI-assigned system bucket).
+	// +optional
+	Bucket string `json:"bucket,omitempty"`
+	// EndpointURL is the full S3 endpoint URL including scheme.
+	// +optional
+	EndpointURL string `json:"endpointUrl,omitempty"`
+	// Region is the S3 region.
+	// +optional
+	Region string `json:"region,omitempty"`
+	// Prefix scopes this release's backups under the bucket.
+	// +optional
+	Prefix string `json:"prefix,omitempty"`
+	// CredentialsSecret names the Secret carrying AWS_ACCESS_KEY_ID /
+	// AWS_SECRET_ACCESS_KEY. Defaults to cozy-backups-creds when empty.
+	// +optional
+	CredentialsSecret string `json:"credentialsSecret,omitempty"`
+	// ForcePathStyle selects path-style S3 addressing.
+	// +optional
+	ForcePathStyle *bool `json:"forcePathStyle,omitempty"`
+	// InsecureSkipTLSVerify disables S3 endpoint certificate verification.
+	// +optional
+	InsecureSkipTLSVerify bool `json:"insecureSkipTLSVerify,omitempty"`
+}
+
+// MongoDBStatus reports observed state for the strategy CR. Driver controllers
+// surface diagnostic conditions here (e.g. validation issues).
+type MongoDBStatus struct {
+	// Conditions holds the latest available observations.
+	// +optional
+	// +listType=map
+	// +listMapKey=type
+	Conditions []metav1.Condition `json:"conditions,omitempty"`
+}
diff --git a/api/backups/strategy/v1alpha1/rabbitmq_types.go b/api/backups/strategy/v1alpha1/rabbitmq_types.go
new file mode 100644
index 0000000000..b4f8c8e215
--- /dev/null
+++ b/api/backups/strategy/v1alpha1/rabbitmq_types.go
@@ -0,0 +1,117 @@
+// SPDX-License-Identifier: Apache-2.0
+// Package v1alpha1 defines strategy.backups.cozystack.io API types.
+//
+// Group: strategy.backups.cozystack.io
+// Version: v1alpha1
+package v1alpha1
+
+import (
+	corev1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+)
+
+func init() {
+	SchemeBuilder.Register(func(s *runtime.Scheme) error {
+		s.AddKnownTypes(GroupVersion,
+			&Rabbitmq{},
+			&RabbitmqList{},
+		)
+		return nil
+	})
+}
+
+const (
+	RabbitmqStrategyKind = "Rabbitmq"
+)
+
+// +kubebuilder:object:root=true
+// +kubebuilder:subresource:status
+// +kubebuilder:resource:scope=Cluster
+
+// Rabbitmq defines a backup strategy that exports and imports RabbitMQ broker
+// DEFINITIONS (vhosts, users, permissions, queues, exchanges, bindings,
+// policies, parameters) via the management HTTP API, run as a one-shot
+// batch/v1.Job per BackupJob / RestoreJob. Message payloads are out of scope -
+// RabbitMQ has no consistent online export of them, so a full-data backup is a
+// Velero volume snapshot, not this strategy. The driver gates on the target
+// RabbitmqCluster being ready, wraps the templated PodTemplateSpec in a Job,
+// and records the stored object on the Cozystack Backup artifact.
+//
+// Restore is a MERGE, not a reset: it POSTs the definitions to /api/definitions,
+// which creates or updates what is in the export and never deletes anything, so
+// objects created after the backup survive the restore and the broker is not
+// returned to its exact backup-time state. A to-copy restore also imports the
+// source's users (with password hashes) into the target.
+type Rabbitmq struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	Spec   RabbitmqSpec   `json:"spec,omitempty"`
+	Status RabbitmqStatus `json:"status,omitempty"`
+}
+
+// +kubebuilder:object:root=true
+
+// RabbitmqList contains a list of Rabbitmq backup strategies.
+type RabbitmqList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+	Items           []Rabbitmq `json:"items"`
+}
+
+// RabbitmqSpec specifies the desired Rabbitmq-driven backup strategy.
+type RabbitmqSpec struct {
+	// Template is the PodTemplateSpec the driver wraps in a batch/v1.Job for
+	// both backup and restore runs. Helm-style Go templates are supported in
+	// every string field. The available context is:
+	//   .Application - the application object (apps.cozystack.io/RabbitMQ)
+	//   .Release.Name, .Release.Namespace - shorthand for the application
+	//                                       name/namespace
+	//   .Mode        - "backup" or "restore"
+	//   .BackupName  - the per-run identity used to scope the object key so
+	//                  distinct backups of one application do not overwrite
+	//                  each other: the BackupJob name on backup, the source
+	//                  Backup name on restore.
+	//   .ArtifactURI - the stored object's location and single source of truth:
+	//                  the rendered ArtifactURITemplate on backup, and the value
+	//                  recorded on the source Backup's status.artifact.uri on
+	//                  restore (so restore reads the exact object backup wrote).
+	//   .Parameters  - map[string]string from the matched BackupClassStrategy
+	//   .Backup      - the source Backup metadata (only set on restore);
+	//                  exposes .Name, .Namespace, and
+	//                  .ApplicationRef.{APIGroup,Kind,Name} so a to-copy
+	//                  restore can address the source release's object key.
+	//
+	// The template is stored schemaless (its content is preserved but not
+	// validated by the apiserver): the driver renders and validates the pod
+	// spec, and generating the full PodTemplateSpec OpenAPI schema here would
+	// add ~590 KB to this CRD. The backupstrategy-controller chart inlines
+	// every definitions/*.yaml into one Helm release, whose state Secret is
+	// capped at 1 MiB - a fourth full PodTemplateSpec schema (after Altinity,
+	// Job and FoundationDB) pushes that Secret over the cap and fails install.
+	//
+	// +kubebuilder:validation:Schemaless
+	// +kubebuilder:pruning:PreserveUnknownFields
+	Template corev1.PodTemplateSpec `json:"template"`
+
+	// ArtifactURITemplate is the object location the backup writes to, rendered
+	// against the run context and recorded on the produced Backup's
+	// status.artifact.uri. It is the single source of truth for where the
+	// export lives: the backup Job writes exactly this object, and restore reads
+	// the recorded value back rather than reconstructing a key. It is REQUIRED
+	// for backups - a BackupJob whose resolved strategy leaves it empty fails,
+	// because nothing would record where the export was stored. Ignored on
+	// restore (the recorded value is used instead).
+	// +optional
+	ArtifactURITemplate string `json:"artifactURITemplate,omitempty"`
+}
+
+// RabbitmqStatus reports observed state for the strategy CR.
+type RabbitmqStatus struct {
+	// Conditions holds the latest available observations.
+	// +optional
+	// +listType=map
+	// +listMapKey=type
+	Conditions []metav1.Condition `json:"conditions,omitempty"`
+}
diff --git a/api/backups/strategy/v1alpha1/redis_types.go b/api/backups/strategy/v1alpha1/redis_types.go
new file mode 100644
index 0000000000..391963bead
--- /dev/null
+++ b/api/backups/strategy/v1alpha1/redis_types.go
@@ -0,0 +1,95 @@
+// SPDX-License-Identifier: Apache-2.0
+// Package v1alpha1 defines strategy.backups.cozystack.io API types.
+//
+// Group: strategy.backups.cozystack.io
+// Version: v1alpha1
+package v1alpha1
+
+import (
+	corev1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+)
+
+func init() {
+	SchemeBuilder.Register(func(s *runtime.Scheme) error {
+		s.AddKnownTypes(GroupVersion,
+			&Redis{},
+			&RedisList{},
+		)
+		return nil
+	})
+}
+
+const (
+	RedisStrategyKind = "Redis"
+)
+
+// +kubebuilder:object:root=true
+// +kubebuilder:subresource:status
+// +kubebuilder:resource:scope=Cluster
+
+// Redis defines a backup strategy for a spotahome RedisFailover app, Redis or
+// Valkey. The spotahome operator ships no backup CRD, so the strategy runs a
+// one-shot Job that dumps an RDB snapshot to object storage (and replays it on
+// restore) - the same PodTemplateSpec model as the Job/Altinity strategies
+// rather than an operator-CR delegation.
+type Redis struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	Spec   RedisSpec   `json:"spec,omitempty"`
+	Status RedisStatus `json:"status,omitempty"`
+}
+
+// +kubebuilder:object:root=true
+
+// RedisList contains a list of Redis backup strategies.
+type RedisList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+	Items           []Redis `json:"items"`
+}
+
+// RedisSpec specifies the desired behavior of a Redis backup strategy.
+type RedisSpec struct {
+	// Template holds a PodTemplateSpec with the right shape to run a single
+	// pod to completion and dump (or restore) a Redis RDB snapshot to object
+	// storage. Helm-like Go templates are supported in every string field and
+	// are rendered against the following context:
+	//   - `.Application` — the live application object (e.g.
+	//     `.Application.spec.replicas`).
+	//   - `.Release.Name` and `.Release.Namespace` — the application's name
+	//     and namespace.
+	//   - `.Release.Prefix` — the prefix the application's chart puts before
+	//     the name of every resource it creates: `redis-` for a Redis
+	//     application, `valkey-` for a Valkey one. Both run on the same
+	//     RedisFailover operator, so one strategy serves either kind.
+	//   - `.Mode` — `"backup"`, `"restore"`, or `"cleanup"` (delete the object
+	//     of a removed Backup), identifying the run.
+	//   - `.ObjectKey` — the object-storage key for this run: unique per backup,
+	//     and on restore/cleanup the exact key recorded on the Backup, so a Plan
+	//     keeps one object per run and a restore reads back the one it names
+	//     rather than whatever last overwrote a shared path.
+	//   - `.Parameters` — the resolved BackupClass strategy parameters.
+	//   - `.Backup` — only on restore runs: `.Backup.Name`, `.Backup.Namespace`
+	//     and `.Backup.ApplicationRef` describing the source backup, so a
+	//     to-copy restore reads the SOURCE release's object-storage prefix.
+	//
+	// Stored schemaless (content preserved, not validated by the apiserver): the
+	// driver renders and validates the pod spec, and generating the full
+	// PodTemplateSpec OpenAPI schema here would add ~590 KB to this CRD. The
+	// backupstrategy-controller chart inlines every definitions/*.yaml into one
+	// Helm release whose state Secret is capped at 1 MiB, so a full
+	// PodTemplateSpec schema here (a fifth after Altinity, Job, FoundationDB and
+	// Redis's own siblings) pushes that Secret over the cap and fails install.
+	// Same reason as rabbitmq_types.go.
+	//
+	// +kubebuilder:validation:Schemaless
+	// +kubebuilder:pruning:PreserveUnknownFields
+	Template corev1.PodTemplateSpec `json:"template"`
+}
+
+type RedisStatus struct {
+	Conditions []metav1.Condition `json:"conditions,omitempty"`
+}
diff --git a/api/backups/strategy/v1alpha1/zz_generated.deepcopy.go b/api/backups/strategy/v1alpha1/zz_generated.deepcopy.go
index b770958036..3ad54f0fe7 100644
--- a/api/backups/strategy/v1alpha1/zz_generated.deepcopy.go
+++ b/api/backups/strategy/v1alpha1/zz_generated.deepcopy.go
@@ -742,6 +742,103 @@ func (in *JobStatus) DeepCopy() *JobStatus {
 	return out
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *Kafka) DeepCopyInto(out *Kafka) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
+	in.Spec.DeepCopyInto(&out.Spec)
+	in.Status.DeepCopyInto(&out.Status)
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Kafka.
+func (in *Kafka) DeepCopy() *Kafka {
+	if in == nil {
+		return nil
+	}
+	out := new(Kafka)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *Kafka) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *KafkaList) DeepCopyInto(out *KafkaList) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ListMeta.DeepCopyInto(&out.ListMeta)
+	if in.Items != nil {
+		in, out := &in.Items, &out.Items
+		*out = make([]Kafka, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new KafkaList.
+func (in *KafkaList) DeepCopy() *KafkaList {
+	if in == nil {
+		return nil
+	}
+	out := new(KafkaList)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *KafkaList) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *KafkaSpec) DeepCopyInto(out *KafkaSpec) {
+	*out = *in
+	in.Template.DeepCopyInto(&out.Template)
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new KafkaSpec.
+func (in *KafkaSpec) DeepCopy() *KafkaSpec {
+	if in == nil {
+		return nil
+	}
+	out := new(KafkaSpec)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *KafkaStatus) DeepCopyInto(out *KafkaStatus) {
+	*out = *in
+	if in.Conditions != nil {
+		in, out := &in.Conditions, &out.Conditions
+		*out = make([]v1.Condition, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new KafkaStatus.
+func (in *KafkaStatus) DeepCopy() *KafkaStatus {
+	if in == nil {
+		return nil
+	}
+	out := new(KafkaStatus)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *MariaDB) DeepCopyInto(out *MariaDB) {
 	*out = *in
@@ -957,6 +1054,342 @@ func (in *MariaDBTemplate) DeepCopy() *MariaDBTemplate {
 	return out
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *MongoDB) DeepCopyInto(out *MongoDB) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
+	in.Spec.DeepCopyInto(&out.Spec)
+	in.Status.DeepCopyInto(&out.Status)
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new MongoDB.
+func (in *MongoDB) DeepCopy() *MongoDB {
+	if in == nil {
+		return nil
+	}
+	out := new(MongoDB)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *MongoDB) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *MongoDBList) DeepCopyInto(out *MongoDBList) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ListMeta.DeepCopyInto(&out.ListMeta)
+	if in.Items != nil {
+		in, out := &in.Items, &out.Items
+		*out = make([]MongoDB, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new MongoDBList.
+func (in *MongoDBList) DeepCopy() *MongoDBList {
+	if in == nil {
+		return nil
+	}
+	out := new(MongoDBList)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *MongoDBList) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *MongoDBSpec) DeepCopyInto(out *MongoDBSpec) {
+	*out = *in
+	in.Template.DeepCopyInto(&out.Template)
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new MongoDBSpec.
+func (in *MongoDBSpec) DeepCopy() *MongoDBSpec {
+	if in == nil {
+		return nil
+	}
+	out := new(MongoDBSpec)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *MongoDBStatus) DeepCopyInto(out *MongoDBStatus) {
+	*out = *in
+	if in.Conditions != nil {
+		in, out := &in.Conditions, &out.Conditions
+		*out = make([]v1.Condition, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new MongoDBStatus.
+func (in *MongoDBStatus) DeepCopy() *MongoDBStatus {
+	if in == nil {
+		return nil
+	}
+	out := new(MongoDBStatus)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *MongoDBStorageS3) DeepCopyInto(out *MongoDBStorageS3) {
+	*out = *in
+	if in.ForcePathStyle != nil {
+		in, out := &in.ForcePathStyle, &out.ForcePathStyle
+		*out = new(bool)
+		**out = **in
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new MongoDBStorageS3.
+func (in *MongoDBStorageS3) DeepCopy() *MongoDBStorageS3 {
+	if in == nil {
+		return nil
+	}
+	out := new(MongoDBStorageS3)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *MongoDBTemplate) DeepCopyInto(out *MongoDBTemplate) {
+	*out = *in
+	if in.CompressionLevel != nil {
+		in, out := &in.CompressionLevel, &out.CompressionLevel
+		*out = new(int)
+		**out = **in
+	}
+	if in.S3 != nil {
+		in, out := &in.S3, &out.S3
+		*out = new(MongoDBStorageS3)
+		(*in).DeepCopyInto(*out)
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new MongoDBTemplate.
+func (in *MongoDBTemplate) DeepCopy() *MongoDBTemplate {
+	if in == nil {
+		return nil
+	}
+	out := new(MongoDBTemplate)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *Rabbitmq) DeepCopyInto(out *Rabbitmq) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
+	in.Spec.DeepCopyInto(&out.Spec)
+	in.Status.DeepCopyInto(&out.Status)
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Rabbitmq.
+func (in *Rabbitmq) DeepCopy() *Rabbitmq {
+	if in == nil {
+		return nil
+	}
+	out := new(Rabbitmq)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *Rabbitmq) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *RabbitmqList) DeepCopyInto(out *RabbitmqList) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ListMeta.DeepCopyInto(&out.ListMeta)
+	if in.Items != nil {
+		in, out := &in.Items, &out.Items
+		*out = make([]Rabbitmq, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new RabbitmqList.
+func (in *RabbitmqList) DeepCopy() *RabbitmqList {
+	if in == nil {
+		return nil
+	}
+	out := new(RabbitmqList)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *RabbitmqList) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *RabbitmqSpec) DeepCopyInto(out *RabbitmqSpec) {
+	*out = *in
+	in.Template.DeepCopyInto(&out.Template)
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new RabbitmqSpec.
+func (in *RabbitmqSpec) DeepCopy() *RabbitmqSpec {
+	if in == nil {
+		return nil
+	}
+	out := new(RabbitmqSpec)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *RabbitmqStatus) DeepCopyInto(out *RabbitmqStatus) {
+	*out = *in
+	if in.Conditions != nil {
+		in, out := &in.Conditions, &out.Conditions
+		*out = make([]v1.Condition, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new RabbitmqStatus.
+func (in *RabbitmqStatus) DeepCopy() *RabbitmqStatus {
+	if in == nil {
+		return nil
+	}
+	out := new(RabbitmqStatus)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *Redis) DeepCopyInto(out *Redis) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
+	in.Spec.DeepCopyInto(&out.Spec)
+	in.Status.DeepCopyInto(&out.Status)
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Redis.
+func (in *Redis) DeepCopy() *Redis {
+	if in == nil {
+		return nil
+	}
+	out := new(Redis)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *Redis) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *RedisList) DeepCopyInto(out *RedisList) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ListMeta.DeepCopyInto(&out.ListMeta)
+	if in.Items != nil {
+		in, out := &in.Items, &out.Items
+		*out = make([]Redis, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new RedisList.
+func (in *RedisList) DeepCopy() *RedisList {
+	if in == nil {
+		return nil
+	}
+	out := new(RedisList)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *RedisList) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *RedisSpec) DeepCopyInto(out *RedisSpec) {
+	*out = *in
+	in.Template.DeepCopyInto(&out.Template)
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new RedisSpec.
+func (in *RedisSpec) DeepCopy() *RedisSpec {
+	if in == nil {
+		return nil
+	}
+	out := new(RedisSpec)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *RedisStatus) DeepCopyInto(out *RedisStatus) {
+	*out = *in
+	if in.Conditions != nil {
+		in, out := &in.Conditions, &out.Conditions
+		*out = make([]v1.Condition, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new RedisStatus.
+func (in *RedisStatus) DeepCopy() *RedisStatus {
+	if in == nil {
+		return nil
+	}
+	out := new(RedisStatus)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *S3CredentialsTemplate) DeepCopyInto(out *S3CredentialsTemplate) {
 	*out = *in
diff --git a/api/backups/v1alpha1/backup_types.go b/api/backups/v1alpha1/backup_types.go
index e46212f6b3..fd76ac47e6 100644
--- a/api/backups/v1alpha1/backup_types.go
+++ b/api/backups/v1alpha1/backup_types.go
@@ -112,6 +112,7 @@ type BackupStatus struct {
 // +kubebuilder:selectablefield:JSONPath=`.spec.applicationRef.apiGroup`
 // +kubebuilder:selectablefield:JSONPath=`.spec.applicationRef.kind`
 // +kubebuilder:selectablefield:JSONPath=`.spec.applicationRef.name`
+// +kubebuilder:metadata:annotations={"options.cozystack.io/source.applicationRef.kind=appkind"}
 
 // Backup represents a single backup artifact for a given application.
 type Backup struct {
diff --git a/api/backups/v1alpha1/backupjob_types.go b/api/backups/v1alpha1/backupjob_types.go
index 111b5f1d94..5494e0b71d 100644
--- a/api/backups/v1alpha1/backupjob_types.go
+++ b/api/backups/v1alpha1/backupjob_types.go
@@ -100,6 +100,7 @@ type BackupJobStatus struct {
 // +kubebuilder:selectablefield:JSONPath=`.spec.applicationRef.apiGroup`
 // +kubebuilder:selectablefield:JSONPath=`.spec.applicationRef.kind`
 // +kubebuilder:selectablefield:JSONPath=`.spec.applicationRef.name`
+// +kubebuilder:metadata:annotations={"options.cozystack.io/source.applicationRef.kind=appkind","options.cozystack.io/source.planRef.name=plan","options.cozystack.io/source.backupClassName=backupclass"}
 
 // BackupJob represents a single execution of a backup.
 // It is typically created by a Plan controller when a schedule fires.
diff --git a/api/backups/v1alpha1/plan_types.go b/api/backups/v1alpha1/plan_types.go
index df807eb57d..253a76c4e0 100644
--- a/api/backups/v1alpha1/plan_types.go
+++ b/api/backups/v1alpha1/plan_types.go
@@ -40,6 +40,7 @@ const (
 // +kubebuilder:selectablefield:JSONPath=`.spec.applicationRef.apiGroup`
 // +kubebuilder:selectablefield:JSONPath=`.spec.applicationRef.kind`
 // +kubebuilder:selectablefield:JSONPath=`.spec.applicationRef.name`
+// +kubebuilder:metadata:annotations={"options.cozystack.io/source.applicationRef.kind=appkind","options.cozystack.io/source.backupClassName=backupclass"}
 
 // Plan describes the schedule, method and storage location for the
 // backup of a given target application.
diff --git a/api/backups/v1alpha1/restorejob_types.go b/api/backups/v1alpha1/restorejob_types.go
index 9817e8c1bb..e64b6f8c92 100644
--- a/api/backups/v1alpha1/restorejob_types.go
+++ b/api/backups/v1alpha1/restorejob_types.go
@@ -79,6 +79,7 @@ type RestoreJobStatus struct {
 // +kubebuilder:object:root=true
 // +kubebuilder:subresource:status
 // +kubebuilder:printcolumn:name="Phase",type="string",JSONPath=".status.phase",priority=0
+// +kubebuilder:metadata:annotations={"options.cozystack.io/source.backupRef.name=backup","options.cozystack.io/source.targetApplicationRef.kind=appkind"}
 
 // RestoreJob represents a single execution of a restore from a Backup.
 type RestoreJob struct {
diff --git a/api/gateway/v1alpha1/tenantgateway_types.go b/api/gateway/v1alpha1/tenantgateway_types.go
index adb493c501..ff6d48eb83 100644
--- a/api/gateway/v1alpha1/tenantgateway_types.go
+++ b/api/gateway/v1alpha1/tenantgateway_types.go
@@ -21,8 +21,15 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
+// A comment block separated from its declaration by a blank line is
+// detached on purpose. controller-gen turns an attached comment into
+// the CRD description, which kubectl explain prints to whoever is
+// filling the spec in, so rationale meant for whoever next edits the
+// validation markers goes in a detached block: it stays beside the
+// code without shipping to every cluster.
+
 // CertMode selects how the per-tenant Gateway sources TLS certificates.
-// +kubebuilder:validation:Enum=http01;dns01
+// +kubebuilder:validation:Enum=http01;dns01;existingSecret;edge
 type CertMode string
 
 const (
@@ -35,6 +42,25 @@ const (
 	// (apex + *.apex) via DNS-01 ACME. Operator must configure a DNS
 	// provider in Spec.DNS01.
 	CertModeDNS01 CertMode = "dns01"
+
+	// CertModeExistingSecret references a pre-existing wildcard TLS
+	// Secret instead of issuing anything. No Issuer and no Certificate
+	// are minted; the wildcard/apex listeners reference the operator-
+	// supplied Secret named in Spec.WildcardSecretRef directly. Used
+	// when the operator already holds a wildcard cert (purchased, or
+	// issued by a corporate CA). The Secret must live in the
+	// TenantGateway's own namespace.
+	CertModeExistingSecret CertMode = "existingSecret"
+
+	// CertModeEdge is for a GatewayClass whose provider terminates TLS
+	// upstream of the Gateway (a Cloudflare Tunnel ends TLS at the
+	// Cloudflare edge and reaches the Gateway over the tunnel). The
+	// Gateway carries the apex, its wildcard and every inheriting child
+	// apex as plain HTTP listeners; no Issuer, no Certificate and no
+	// http->https redirect route are minted, and
+	// Spec.TLSPassthroughServices is not rendered because a TLS
+	// listener cannot be served by an HTTP-only edge.
+	CertModeEdge CertMode = "edge"
 )
 
 // IssuerName selects the Let's Encrypt environment the per-tenant
@@ -133,15 +159,116 @@ type RFC2136DNS01 struct {
 	TSIGSecretSecretRef corev1.SecretKeySelector `json:"tsigSecretSecretRef"`
 }
 
+// TLSPassthroughListener declares one layer-4 TLS-passthrough listener
+// on the tenant Gateway. Unlike the layer-7 terminate listeners the
+// controller renders for published HTTP apps, a passthrough listener
+// does not terminate TLS: the ClientHello SNI selects the backend and
+// the raw TLS stream is forwarded to the TLSRoute-named service, so a
+// native database protocol that speaks its own TLS reaches clients
+// without the Gateway ever holding the private key. Each listener owns
+// a distinct native port and a per-engine SNI hostname.
+type TLSPassthroughListener struct {
+	// Name identifies the listener within the tenant Gateway. It
+	// becomes the rendered Gateway listener name "tls-<name>" and the
+	// sectionName a TLSRoute attaches to. Must be a DNS-1123 label
+	// (lowercase alphanumerics and '-', starting and ending with an
+	// alphanumeric) and unique across the list.
+	// +kubebuilder:validation:MinLength=1
+	// +kubebuilder:validation:MaxLength=63
+	// +kubebuilder:validation:Pattern=`^[a-z0-9]([-a-z0-9]*[a-z0-9])?$`
+	// +required
+	Name string `json:"name"`
+
+	// Port is the TCP port this passthrough listener is published on,
+	// on the tenant Gateway's shared address. Set it to the engine's
+	// native port (e.g. 5432 for PostgreSQL). Must be 1..65535, unique
+	// across the list, and neither 80 nor 443 — the Gateway's own http
+	// (80) and TLS-terminate (443) listeners already own those ports.
+	// It is not an access boundary: an implementation may serve every
+	// port of the Gateway from one proxy listener matched by SNI alone,
+	// and Cilium does so until the Gateway carries a configuration that
+	// splits it per port, so the hostname is what gates reach.
+	// +kubebuilder:validation:Minimum=1
+	// +kubebuilder:validation:Maximum=65535
+	// +required
+	Port int32 `json:"port"`
+
+	// The pattern is Gateway API's own Hostname pattern, so a value this
+	// field accepts is one the rendered listener accepts. Without it a
+	// typo passes the apex suffix test, reaches etcd, and the render
+	// aborts on it.
+
+	// Hostname is the SNI the listener matches on the incoming
+	// ClientHello. It routes the raw TLS stream by SNI, so give each
+	// engine its own per-engine subdomain (e.g.
+	// "postgres.foo.example.com") or a left-most-label wildcard (e.g.
+	// "*.db.foo.example.com"). Must be an exact RFC 1123 hostname or a
+	// wildcard hostname, and must fall within the tenant apex — equal to
+	// Apex or a subdomain of it — since every listener on the tenant
+	// Gateway is constrained to the apex.
+	//
+	// +kubebuilder:validation:MinLength=1
+	// +kubebuilder:validation:MaxLength=253
+	// +kubebuilder:validation:Pattern=`^(\*\.)?[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$`
+	// +required
+	Hostname string `json:"hostname"`
+}
+
+// The rules below are enforced at admission because renderGateway is
+// the first thing that renders: a spec the apiserver accepts and the
+// renderer refuses aborts the Issuer, the certificates and every route
+// status behind it. The controller keeps its own copy of them, because
+// it and the CRD roll out separately and it cannot assume the object it
+// reads was validated by the version it ships with.
+//
+// Which rules are left to the controller, and why each one is, is in
+// packages/extra/gateway/README.md. One trap belongs here: hostname
+// overlap needs wildcard-aware matching across two lists, and its
+// estimated CEL cost pushed the CRD past the apiserver's install-time
+// budget while every per-request test stayed green.
+//
+// The budget rests on three bounds, and they do not weigh the same,
+// measured by removing each in turn and re-running the estimator:
+// without MaxLength on apex the hostname-containment rule runs 3.9x
+// over budget, without MaxItems on tlsPassthroughServices the
+// name-collision rule runs 6.5x over, and without MaxItems on
+// tlsPassthroughListeners the distinct-port rule alone runs over 100x
+// over and takes the whole-schema cost total with it. So the list
+// counts are the bounds to defend, not the string length.
+// TestCRDPassesInstallTimeValidation is what catches that.
+
 // TenantGatewaySpec describes the desired state of a per-tenant Gateway.
+//
+// The rules on tlsPassthroughListeners are enforced both at admission
+// and in the controller; a few have no admission form and surface as
+// Ready=False instead. The reasoning is in
+// packages/extra/gateway/README.md.
+// +kubebuilder:validation:XValidation:rule="!has(self.tlsPassthroughListeners) || self.tlsPassthroughListeners.all(l, l.port != 80 && l.port != 443)",message="tlsPassthroughListeners: ports 80 and 443 are reserved for the Gateway's own http and TLS-terminate listeners; use the engine's native port"
+// +kubebuilder:validation:XValidation:rule="!has(self.tlsPassthroughListeners) || self.tlsPassthroughListeners.all(l, self.tlsPassthroughListeners.filter(o, o.port == l.port).size() == 1)",message="tlsPassthroughListeners: each listener must occupy a distinct port"
+// +kubebuilder:validation:XValidation:rule="!has(self.tlsPassthroughListeners) || self.tlsPassthroughListeners.all(l, l.hostname == self.apex || l.hostname.endsWith('.' + self.apex))",message="tlsPassthroughListeners: hostname must equal the tenant apex or be a subdomain of it"
+// +kubebuilder:validation:XValidation:rule="!has(self.tlsPassthroughListeners) || !has(self.tlsPassthroughServices) || self.tlsPassthroughListeners.all(l, !(l.name in self.tlsPassthroughServices))",message="tlsPassthroughListeners: name collides with a tlsPassthroughServices entry; both render a tls-<name> Gateway listener"
+// +kubebuilder:validation:XValidation:rule="!has(self.tlsPassthroughListeners) || size(self.tlsPassthroughListeners) == 0 || !has(self.certMode) || self.certMode != 'edge'",message="tlsPassthroughListeners: unsupported with certMode edge, which terminates TLS upstream and renders no TLS listener to sit beside"
 type TenantGatewaySpec struct {
+	// MaxLength is the DNS ceiling, so it rejects nothing resolvable,
+	// and it is not cosmetic: it is one of the three bounds the
+	// install-time CEL cost budget rests on, and not the heavy one —
+	// the measured weights are in the comment above the type. Why the
+	// field carries no format pattern is in
+	// packages/extra/gateway/README.md.
+
 	// Apex is the tenant's apex hostname. The Gateway listeners are
-	// constrained to this apex and its subdomains.
+	// constrained to this apex and its subdomains, and the
+	// controller-owned http-to-https redirect route declares this apex
+	// and its wildcard as its hostnames, so an empty value renders a
+	// route the apiserver rejects on its hostname schema.
+	// +kubebuilder:validation:MinLength=1
+	// +kubebuilder:validation:MaxLength=253
 	// +required
 	Apex string `json:"apex"`
 
-	// CertMode selects between HTTP-01 per-listener Certificates and
-	// a wildcard cert via DNS-01.
+	// CertMode selects between HTTP-01 per-listener Certificates, a
+	// wildcard cert via DNS-01, an operator-supplied wildcard Secret,
+	// and edge (no certificates: TLS ends at the class provider's edge).
 	// +kubebuilder:default=http01
 	CertMode CertMode `json:"certMode,omitempty"`
 
@@ -158,19 +285,108 @@ type TenantGatewaySpec struct {
 	// +optional
 	DNS01 *DNS01Config `json:"dns01,omitempty"`
 
+	// WildcardSecretRef names a pre-existing TLS Secret in the
+	// TenantGateway's own namespace used for the wildcard and apex
+	// listeners when CertMode=existingSecret. Required in that mode;
+	// ignored otherwise. The Secret must be of type kubernetes.io/tls
+	// and cover the tenant apex (and *.apex). Cross-namespace refs are
+	// intentionally unsupported to avoid requiring a ReferenceGrant.
+	// +optional
+	WildcardSecretRef *corev1.LocalObjectReference `json:"wildcardSecretRef,omitempty"`
+
 	// AttachedNamespaces lists namespace names that are allowed to
 	// attach HTTPRoute or TLSRoute to this tenant's Gateway. The
-	// publishing tenant namespace is implicit. Selector is by built-in
-	// kubernetes.io/metadata.name (kube-apiserver-written, unspoofable).
+	// publishing tenant namespace is implicit. The controller grants
+	// access by stamping the namespace.cozystack.io/gateway label on
+	// each listed namespace. Writing it requires patch on Namespace,
+	// which tenants do not hold. The label reaches the HTTPS-terminate
+	// listeners and the port-443 passthrough listeners; the port-80
+	// listener and the native-port listeners from
+	// tlsPassthroughListeners select on kubernetes.io/metadata.name
+	// instead, so listing a namespace here does not let it attach to a
+	// database port.
 	// +optional
 	AttachedNamespaces []string `json:"attachedNamespaces,omitempty"`
 
+	// The bounds are what the CEL cost estimator needs, as on Apex: the
+	// name-collision rule scans this list, and an unbounded list of
+	// unbounded strings puts the estimate over the per-CRD budget. The
+	// count is the Gateway API listener cap less the mandatory port-80
+	// listener and less one published hostname, so a tenant filling the
+	// list can still publish an app;
+	// TestPassthroughServiceCapFitsGatewayAPI derives that sum from the
+	// schema, so moving the number fails there rather than in a
+	// cluster. Why a repeated entry is left to the controller instead
+	// of a listType=set marker is in packages/extra/gateway/README.md.
+	//
+	// The item length is the 253 characters Gateway API allows a
+	// SectionName less the four of the tls- prefix, which is as far as
+	// the schema reaches on its own: the hostname also depends on the
+	// apex, so the composed value is checked by the controller and
+	// reported on status. The item pattern is a DNS-1123 subdomain
+	// rather than a single label because SectionName takes
+	// dot-separated labels: "s3.storage" renders tls-s3.storage and a
+	// hostname that works, while the label form would refuse it and
+	// catch nothing the subdomain form misses.
+
 	// TLSPassthroughServices names services exposed via TLS-passthrough
 	// (mode: Passthrough listeners). Each service gets a dedicated
 	// listener; HTTPRoutes attach to TLS-terminate listeners instead.
+	// Not rendered when CertMode=edge.
+	//
+	// An entry becomes both the listener name tls-<svc> and the listener
+	// hostname <svc>.<apex>, and Gateway API bounds each at 253
+	// characters. An entry that overflows either one renders a listener
+	// the apiserver refuses, and that refusal takes the whole Gateway
+	// with it rather than the one listener.
+	// +kubebuilder:validation:MaxItems=62
+	// +kubebuilder:validation:items:MaxLength=249
+	// +kubebuilder:validation:items:Pattern=`^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$`
 	// +optional
 	TLSPassthroughServices []string `json:"tlsPassthroughServices,omitempty"`
 
+	// The cap bounds what THIS field contributes to the Gateway's 64
+	// listener slots; it does not by itself guarantee the total fits.
+	// The rendered count is the port-80 listener plus one per published
+	// hostname, one per tlsPassthroughServices entry, and one per entry
+	// here — so a tenant can exceed 64 with far fewer than 62 of these.
+	// The controller checks the assembled total and fails with a named
+	// budget; this cap only keeps a single field from consuming the
+	// whole allowance. It also bounds the cost estimate for the CEL
+	// rules above.
+	//
+	// The number itself is 64 less the port-80 listener and less one
+	// published hostname, so a tenant filling this field to the brim can
+	// still publish one app. TestPassthroughListenerCapFitsGatewayAPI
+	// renders that sum reading maxItems from the schema rather than from
+	// a literal, so moving this number fails there and not in a cluster.
+
+	// TLSPassthroughListeners declares layer-4 TLS-passthrough
+	// listeners on the tenant Gateway. The controller renders one
+	// "tls-<name>" listener per entry — on the entry's native Port,
+	// mode Passthrough, matching the entry's per-engine SNI Hostname —
+	// alongside the layer-7 terminate listeners. This lets a database
+	// engine present its own certificate directly to clients while
+	// sharing the tenant Gateway's address. It is independent of
+	// TLSPassthroughServices, the passthrough-on-443 form; the
+	// two do not replace each other.
+	//
+	// The listener is all this field creates. Nothing is routed until a
+	// TLSRoute attaches to it by sectionName "tls-<name>" and names a
+	// backend Service, and the backend must present its own certificate
+	// for the listener's Hostname — a passthrough listener never
+	// terminates TLS, so the Gateway neither holds nor issues that
+	// certificate. Until such a route attaches and its backend
+	// resolves, the entry publishes the port and answers nothing on it.
+	// Under certMode http01 its hostname is reserved from the moment it
+	// is declared: no HTTPS-terminate listener or certificate is
+	// rendered for it on 443, route or no route.
+	// +optional
+	// +listType=map
+	// +listMapKey=name
+	// +kubebuilder:validation:MaxItems=62
+	TLSPassthroughListeners []TLSPassthroughListener `json:"tlsPassthroughListeners,omitempty"`
+
 	// GatewayClassName names the GatewayClass to attach the rendered
 	// Gateway to. Default cilium.
 	// +kubebuilder:default=cilium
diff --git a/api/gateway/v1alpha1/zz_generated.deepcopy.go b/api/gateway/v1alpha1/zz_generated.deepcopy.go
index 7288512037..eca3326078 100644
--- a/api/gateway/v1alpha1/zz_generated.deepcopy.go
+++ b/api/gateway/v1alpha1/zz_generated.deepcopy.go
@@ -129,6 +129,21 @@ func (in *Route53DNS01) DeepCopy() *Route53DNS01 {
 	return out
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *TLSPassthroughListener) DeepCopyInto(out *TLSPassthroughListener) {
+	*out = *in
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new TLSPassthroughListener.
+func (in *TLSPassthroughListener) DeepCopy() *TLSPassthroughListener {
+	if in == nil {
+		return nil
+	}
+	out := new(TLSPassthroughListener)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *TenantGateway) DeepCopyInto(out *TenantGateway) {
 	*out = *in
@@ -211,6 +226,11 @@ func (in *TenantGatewaySpec) DeepCopyInto(out *TenantGatewaySpec) {
 		*out = new(DNS01Config)
 		(*in).DeepCopyInto(*out)
 	}
+	if in.WildcardSecretRef != nil {
+		in, out := &in.WildcardSecretRef, &out.WildcardSecretRef
+		*out = new(v1.LocalObjectReference)
+		**out = **in
+	}
 	if in.AttachedNamespaces != nil {
 		in, out := &in.AttachedNamespaces, &out.AttachedNamespaces
 		*out = make([]string, len(*in))
@@ -221,6 +241,11 @@ func (in *TenantGatewaySpec) DeepCopyInto(out *TenantGatewaySpec) {
 		*out = make([]string, len(*in))
 		copy(*out, *in)
 	}
+	if in.TLSPassthroughListeners != nil {
+		in, out := &in.TLSPassthroughListeners, &out.TLSPassthroughListeners
+		*out = make([]TLSPassthroughListener, len(*in))
+		copy(*out, *in)
+	}
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new TenantGatewaySpec.
diff --git a/api/internalapi/v1alpha1/groupversion_info.go b/api/internalapi/v1alpha1/groupversion_info.go
new file mode 100644
index 0000000000..35e999aeca
--- /dev/null
+++ b/api/internalapi/v1alpha1/groupversion_info.go
@@ -0,0 +1,39 @@
+/*
+Copyright 2026 The Cozystack Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// Package v1alpha1 contains API Schema definitions for the
+// internal.cozystack.io v1alpha1 API group. No tenant RBAC role grants any
+// verb on this group, so objects in it are platform-internal sentinels that
+// tenants cannot forge.
+// +kubebuilder:object:generate=true
+// +groupName=internal.cozystack.io
+package v1alpha1
+
+import (
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"sigs.k8s.io/controller-runtime/pkg/scheme"
+)
+
+var (
+	// GroupVersion is group version used to register these objects.
+	GroupVersion = schema.GroupVersion{Group: "internal.cozystack.io", Version: "v1alpha1"}
+
+	// SchemeBuilder is used to add go types to the GroupVersionKind scheme.
+	SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}
+
+	// AddToScheme adds the types in this group-version to the given scheme.
+	AddToScheme = SchemeBuilder.AddToScheme
+)
diff --git a/api/internalapi/v1alpha1/tenantprojection_types.go b/api/internalapi/v1alpha1/tenantprojection_types.go
new file mode 100644
index 0000000000..95cb522f57
--- /dev/null
+++ b/api/internalapi/v1alpha1/tenantprojection_types.go
@@ -0,0 +1,115 @@
+/*
+Copyright 2026 The Cozystack Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package v1alpha1
+
+import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+// ProjectionType selects what a TenantProjection entry publishes from its
+// source Secret into a tenant-visible, key-free Secret.
+// +kubebuilder:validation:Enum=CACert
+type ProjectionType string
+
+const (
+	// ProjectionTypeCACert publishes a key-free copy of a CA certificate
+	// (only ca.crt) so the tenant can trust the application's TLS
+	// endpoints. It is the only supported projection type.
+	ProjectionTypeCACert ProjectionType = "CACert"
+)
+
+// TenantProjectionEntry declares one artifact to project from a source
+// Secret into a tenant-visible, key-free Secret.
+type TenantProjectionEntry struct {
+	// Type selects what to project. CACert is the only supported type.
+	// +required
+	Type ProjectionType `json:"type"`
+
+	// SourceSecretName names the Secret in the TenantProjection's own
+	// namespace holding the material to project. Only the extracted,
+	// key-free certificate is ever published, so naming a Secret that
+	// also carries private key material does not widen tenant visibility.
+	// +required
+	// +kubebuilder:validation:MinLength=1
+	SourceSecretName string `json:"sourceSecretName"`
+
+	// SourceKey is the key inside the source Secret holding the CA
+	// certificate in PEM form. The certificate is always republished
+	// under "ca.crt", whatever it is called at the source.
+	// +kubebuilder:default=ca.crt
+	// +optional
+	SourceKey string `json:"sourceKey,omitempty"`
+}
+
+// TenantProjectionSpec declares the projections to publish for a tenant.
+type TenantProjectionSpec struct {
+	// Projections is the list of artifacts to publish from source Secrets
+	// in this namespace.
+	// +required
+	// +kubebuilder:validation:MinItems=1
+	Projections []TenantProjectionEntry `json:"projections"`
+}
+
+// TenantProjectionStatus reports the observed state of the projections.
+type TenantProjectionStatus struct {
+	// ObservedGeneration mirrors the .metadata.generation reflected in the
+	// latest reconciled state.
+	// +optional
+	ObservedGeneration int64 `json:"observedGeneration,omitempty"`
+
+	// Conditions describes the current state of the TenantProjection.
+	// Standard condition types: Ready. Ready is False with reason
+	// SourceNotFound while a referenced source Secret does not exist.
+	// +optional
+	// +patchMergeKey=type
+	// +patchStrategy=merge
+	// +listType=map
+	// +listMapKey=type
+	Conditions []metav1.Condition `json:"conditions,omitempty" patchStrategy:"merge" patchMergeKey:"type"`
+}
+
+// +kubebuilder:object:root=true
+// +kubebuilder:subresource:status
+// +kubebuilder:resource:scope=Namespaced,shortName=tproj
+// +kubebuilder:printcolumn:name="Ready",type="string",JSONPath=`.status.conditions[?(@.type=="Ready")].status`
+// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp"
+
+// TenantProjection is the Schema for the tenantprojections API.
+// It is a namespaced, platform-internal sentinel a chart renders to declare
+// which of an application's Secrets should be published to the tenant as a
+// key-free copy. The cozystack-controller reconciles the projected Secret
+// from this object and owns it via an OwnerReference back to this sentinel.
+type TenantProjection struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	Spec   TenantProjectionSpec   `json:"spec,omitempty"`
+	Status TenantProjectionStatus `json:"status,omitempty"`
+}
+
+// +kubebuilder:object:root=true
+
+// TenantProjectionList contains a list of TenantProjection.
+type TenantProjectionList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+	Items           []TenantProjection `json:"items"`
+}
+
+func init() {
+	SchemeBuilder.Register(&TenantProjection{}, &TenantProjectionList{})
+}
diff --git a/api/internalapi/v1alpha1/zz_generated.deepcopy.go b/api/internalapi/v1alpha1/zz_generated.deepcopy.go
new file mode 100644
index 0000000000..91af454b69
--- /dev/null
+++ b/api/internalapi/v1alpha1/zz_generated.deepcopy.go
@@ -0,0 +1,142 @@
+//go:build !ignore_autogenerated
+
+/*
+Copyright 2025 The Cozystack Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// Code generated by controller-gen. DO NOT EDIT.
+
+package v1alpha1
+
+import (
+	"k8s.io/apimachinery/pkg/apis/meta/v1"
+	runtime "k8s.io/apimachinery/pkg/runtime"
+)
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *TenantProjection) DeepCopyInto(out *TenantProjection) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
+	in.Spec.DeepCopyInto(&out.Spec)
+	in.Status.DeepCopyInto(&out.Status)
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new TenantProjection.
+func (in *TenantProjection) DeepCopy() *TenantProjection {
+	if in == nil {
+		return nil
+	}
+	out := new(TenantProjection)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *TenantProjection) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *TenantProjectionEntry) DeepCopyInto(out *TenantProjectionEntry) {
+	*out = *in
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new TenantProjectionEntry.
+func (in *TenantProjectionEntry) DeepCopy() *TenantProjectionEntry {
+	if in == nil {
+		return nil
+	}
+	out := new(TenantProjectionEntry)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *TenantProjectionList) DeepCopyInto(out *TenantProjectionList) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ListMeta.DeepCopyInto(&out.ListMeta)
+	if in.Items != nil {
+		in, out := &in.Items, &out.Items
+		*out = make([]TenantProjection, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new TenantProjectionList.
+func (in *TenantProjectionList) DeepCopy() *TenantProjectionList {
+	if in == nil {
+		return nil
+	}
+	out := new(TenantProjectionList)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *TenantProjectionList) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *TenantProjectionSpec) DeepCopyInto(out *TenantProjectionSpec) {
+	*out = *in
+	if in.Projections != nil {
+		in, out := &in.Projections, &out.Projections
+		*out = make([]TenantProjectionEntry, len(*in))
+		copy(*out, *in)
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new TenantProjectionSpec.
+func (in *TenantProjectionSpec) DeepCopy() *TenantProjectionSpec {
+	if in == nil {
+		return nil
+	}
+	out := new(TenantProjectionSpec)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *TenantProjectionStatus) DeepCopyInto(out *TenantProjectionStatus) {
+	*out = *in
+	if in.Conditions != nil {
+		in, out := &in.Conditions, &out.Conditions
+		*out = make([]v1.Condition, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new TenantProjectionStatus.
+func (in *TenantProjectionStatus) DeepCopy() *TenantProjectionStatus {
+	if in == nil {
+		return nil
+	}
+	out := new(TenantProjectionStatus)
+	in.DeepCopyInto(out)
+	return out
+}
diff --git a/api/migration/v1alpha1/groupversion_info.go b/api/migration/v1alpha1/groupversion_info.go
new file mode 100644
index 0000000000..b0dbf9a545
--- /dev/null
+++ b/api/migration/v1alpha1/groupversion_info.go
@@ -0,0 +1,42 @@
+/*
+Copyright 2026.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// Package v1alpha1 contains API Schema definitions for the  v1alpha1 API group.
+// +kubebuilder:object:generate=true
+// +groupName=forklift.cozystack.io
+package v1alpha1
+
+import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+)
+
+const (
+	thisGroup   = "forklift.cozystack.io"
+	thisVersion = "v1alpha1"
+)
+
+var (
+	GroupVersion  = schema.GroupVersion{Group: thisGroup, Version: thisVersion}
+	SchemeBuilder = runtime.NewSchemeBuilder(addGroupVersion)
+	AddToScheme   = SchemeBuilder.AddToScheme
+)
+
+func addGroupVersion(scheme *runtime.Scheme) error {
+	metav1.AddToGroupVersion(scheme, GroupVersion)
+	return nil
+}
diff --git a/api/migration/v1alpha1/vmimportsource_types.go b/api/migration/v1alpha1/vmimportsource_types.go
new file mode 100644
index 0000000000..98c4c51e21
--- /dev/null
+++ b/api/migration/v1alpha1/vmimportsource_types.go
@@ -0,0 +1,224 @@
+// SPDX-License-Identifier: Apache-2.0
+// Package v1alpha1 defines forklift.cozystack.io API types.
+//
+// Group: forklift.cozystack.io
+// Version: v1alpha1
+package v1alpha1
+
+import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+)
+
+func init() {
+	SchemeBuilder.Register(func(s *runtime.Scheme) error {
+		s.AddKnownTypes(GroupVersion,
+			&VMImportSource{},
+			&VMImportSourceList{},
+		)
+		return nil
+	})
+}
+
+const (
+	// ManagedByLabel marks the objects the migration controller owns, so a
+	// projected Secret can never overwrite one the controller did not create.
+	ManagedByLabel = "apps.cozystack.io/managed-by"
+	// ManagedByValue is the value ManagedByLabel carries on our objects.
+	ManagedByValue = "cozystack-migration"
+
+	// SourceReadyCondition reports whether the provider endpoint answered and
+	// everything the platform must supply for this provider type is in place.
+	SourceReadyCondition = "Ready"
+)
+
+// Condition reasons carried on a VMImportSource.
+const (
+	// ReasonConnected means the provider endpoint answered an authenticated call.
+	ReasonConnected = "Connected"
+	// ReasonConnectionFailed means the endpoint was unreachable or rejected the credentials.
+	ReasonConnectionFailed = "ConnectionFailed"
+	// ReasonCredentialsMissing means the credentials Secret could not be projected.
+	ReasonCredentialsMissing = "CredentialsMissing"
+	// ReasonVDDKNotConfigured means a vSphere source was created on a cluster
+	// whose administrator has not supplied a VDDK image. The VMware path is
+	// unavailable rather than broken: see the platform's migration settings.
+	ReasonVDDKNotConfigured = "VDDKNotConfigured"
+	// ReasonForkliftNotInstalled means the migration engine's CRDs are absent.
+	// The controller ships independently of Forklift, so this is a normal state
+	// on a cluster that has enabled one package and not the other.
+	ReasonForkliftNotInstalled = "ForkliftNotInstalled"
+)
+
+// InventoryTruncatedAnnotation marks a published VM list that was cut short
+// because the source holds more machines than one object should carry. A picker
+// missing an entry then has a visible reason rather than looking broken.
+const InventoryTruncatedAnnotation = thisGroup + "/inventory-truncated"
+
+// The contract between the controller that publishes a source's machine list
+// and the aggregated API that serves it to the console's picker. It lives here
+// because both sides must agree on it and neither owns the other.
+const (
+	// inventoryConfigMapPrefix makes the object's name derivable from the
+	// source alone, so a reader addresses it without a lookup.
+	inventoryConfigMapPrefix = "vmimport-inventory-"
+
+	// InventoryVMsKey holds the JSON array of PublishedVM.
+	InventoryVMsKey = "vms"
+)
+
+// InventoryConfigMapName is where a source's published machine list lives.
+func InventoryConfigMapName(source string) string {
+	return inventoryConfigMapPrefix + source
+}
+
+// PublishedVM is one entry of that list: deliberately the smallest thing a
+// picker needs, a value to write and a name to show.
+type PublishedVM struct {
+	// ID is the managed-object reference, which is what a task records.
+	ID string `json:"id"`
+	// Name is the machine's name as the source knows it.
+	Name string `json:"name"`
+	// Path distinguishes two machines sharing a name in different folders.
+	Path string `json:"path,omitempty"`
+}
+
+// ProviderType names a source virtualization platform.
+// +kubebuilder:validation:Enum=vsphere
+type ProviderType string
+
+const (
+	// ProviderVSphere is VMware vSphere, reached through its vCenter SDK endpoint.
+	ProviderVSphere ProviderType = "vsphere"
+)
+
+// ProviderCredentials holds the account the platform uses to read the source
+// inventory and the disk data. The controller materializes these into a Secret;
+// a tenant never creates a Kubernetes Secret itself.
+type ProviderCredentials struct {
+	// Username is the account used to authenticate against the provider
+	// (e.g. `migration@vsphere.local`).
+	// +kubebuilder:validation:MinLength=1
+	Username string `json:"username"`
+
+	// Password is the account's password.
+	// +kubebuilder:validation:MinLength=1
+	Password string `json:"password"`
+
+	// CACert is the PEM-encoded certificate authority that signed the
+	// endpoint's TLS certificate. Required unless insecureSkipVerify is set:
+	// the migration engine refuses a vSphere connection that can neither
+	// verify the endpoint nor was told not to.
+	//
+	// This is a CA certificate, not a fingerprint. A SHA-1 thumbprint is what
+	// the engine wants for a direct ESXi host connection, which v1 does not
+	// expose, and supplying one here does not satisfy the check.
+	// +optional
+	CACert string `json:"caCert,omitempty"`
+
+	// InsecureSkipVerify disables verification of the endpoint's TLS
+	// certificate. Convenient in a lab and a bad idea anywhere else: the
+	// credentials above travel over that connection. Prefer caCert.
+	// +optional
+	InsecureSkipVerify bool `json:"insecureSkipVerify,omitempty"`
+}
+
+// VMImportSourceSpec describes a connection to a source virtualization platform.
+type VMImportSourceSpec struct {
+	// Type is the source platform this connection speaks to.
+	// +kubebuilder:validation:XValidation:rule="self == oldSelf",message="type is immutable"
+	Type ProviderType `json:"type"`
+
+	// URL is the provider's API endpoint (e.g. `https://vcenter.example.com/sdk`).
+	// +kubebuilder:validation:MinLength=1
+	URL string `json:"url"`
+
+	// Credentials is the account used to reach the provider.
+	// +kubebuilder:validation:XValidation:rule="has(self.caCert) || (has(self.insecureSkipVerify) && self.insecureSkipVerify)",message="either caCert must be set or insecureSkipVerify must be true: the migration engine will not open a vSphere connection it can neither verify nor was told to trust"
+	Credentials ProviderCredentials `json:"credentials"`
+
+	// Hosts redirects the disk transfer for individual ESXi hosts.
+	//
+	// Disk data does not travel through vCenter. VDDK opens its connection
+	// straight to the ESXi host holding the VM, at whatever address vCenter
+	// advertises for it — and that address is frequently one the cluster
+	// cannot reach: a management network the workers are not on, or, worse,
+	// one that collides with the cluster's own Service CIDR, where the packet
+	// is swallowed by service routing and never leaves. The transfer then
+	// fails late, after validation has passed, with an NBD error naming
+	// neither the address nor the reason.
+	//
+	// An entry here names the host and the address to use instead. Each
+	// carries its own credentials because the ESXi host authenticates the
+	// connection itself rather than honouring the vCenter session, and the
+	// engine connection-tests them before the transfer starts.
+	//
+	// +optional
+	// +listType=map
+	// +listMapKey=id
+	Hosts []HostOverride `json:"hosts,omitempty"`
+}
+
+// HostOverride redirects the disk transfer for one ESXi host.
+type HostOverride struct {
+	// ID is the host's managed-object reference in the source inventory
+	// (e.g. `host-10`). It is what the VM's inventory record names as its
+	// host, not the hostname.
+	// +kubebuilder:validation:MinLength=1
+	ID string `json:"id"`
+
+	// Address is the address the cluster should use to reach this host for the
+	// disk transfer, replacing the one vCenter advertises.
+	// +kubebuilder:validation:MinLength=1
+	Address string `json:"address"`
+
+	// Credentials is the account on the ESXi host itself. The host
+	// authenticates the transfer connection directly, so the provider's
+	// vCenter account does not carry over.
+	// +kubebuilder:validation:XValidation:rule="has(self.caCert) || (has(self.insecureSkipVerify) && self.insecureSkipVerify)",message="either caCert must be set or insecureSkipVerify must be true: the migration engine will not open a connection to the host it can neither verify nor was told to trust"
+	Credentials ProviderCredentials `json:"credentials"`
+}
+
+// VMImportSourceStatus reports whether the connection is usable.
+type VMImportSourceStatus struct {
+	// ObservedGeneration is the .metadata.generation the conditions were computed from.
+	// +optional
+	ObservedGeneration int64 `json:"observedGeneration,omitempty"`
+
+	// Conditions represents the latest available observations of the connection's state.
+	// The Ready condition is the connection's readiness: it is true only once the
+	// endpoint has answered and every platform prerequisite for this provider
+	// type is satisfied.
+	// +optional
+	Conditions []metav1.Condition `json:"conditions,omitempty"`
+}
+
+// +kubebuilder:object:root=true
+// +kubebuilder:subresource:status
+// +kubebuilder:resource:shortName=vmis;vmimportsrc
+// +kubebuilder:printcolumn:name="Type",type="string",JSONPath=".spec.type",priority=0
+// +kubebuilder:printcolumn:name="URL",type="string",JSONPath=".spec.url",priority=0
+// +kubebuilder:printcolumn:name="Ready",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status",priority=0
+// +kubebuilder:printcolumn:name="Reason",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].reason",priority=1
+// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp",priority=0
+// +kubebuilder:selectablefield:JSONPath=`.spec.type`
+
+// VMImportSource registers a reusable connection to a source virtualization
+// platform. It is long-lived: VMImportTasks reference it, and deleting it
+// deregisters the connection without touching anything already imported.
+type VMImportSource struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	Spec   VMImportSourceSpec   `json:"spec,omitempty"`
+	Status VMImportSourceStatus `json:"status,omitempty"`
+}
+
+// +kubebuilder:object:root=true
+
+// VMImportSourceList contains a list of VMImportSources.
+type VMImportSourceList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+	Items           []VMImportSource `json:"items"`
+}
diff --git a/api/migration/v1alpha1/vmimporttask_types.go b/api/migration/v1alpha1/vmimporttask_types.go
new file mode 100644
index 0000000000..2b9935b382
--- /dev/null
+++ b/api/migration/v1alpha1/vmimporttask_types.go
@@ -0,0 +1,276 @@
+// SPDX-License-Identifier: Apache-2.0
+// Package v1alpha1 defines forklift.cozystack.io API types.
+//
+// Group: forklift.cozystack.io
+// Version: v1alpha1
+package v1alpha1
+
+import (
+	corev1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+)
+
+func init() {
+	SchemeBuilder.Register(func(s *runtime.Scheme) error {
+		s.AddKnownTypes(GroupVersion,
+			&VMImportTask{},
+			&VMImportTaskList{},
+		)
+		return nil
+	})
+}
+
+const (
+	// OwningTaskNameLabel and OwningTaskNamespaceLabel mark the Forklift objects
+	// a task owns, so the controller can find its own scaffolding without
+	// trusting a label an unrelated object might carry.
+	OwningTaskNameLabel      = thisGroup + "/owned-by.VMImportTaskName"
+	OwningTaskNamespaceLabel = thisGroup + "/owned-by.VMImportTaskNamespace"
+
+	// OutputTaskUIDLabel and OutputVMIDLabel mark what a task produced: the
+	// VMDisks, the VMInstances and the claims behind them. They are how the
+	// controller tells its own earlier output from a tenant object that happens
+	// to carry the same name, which every resume has to decide and cannot
+	// otherwise know. Mistaking a tenant's disk for its own silently attaches
+	// stale data while the fresh transfer is collected with the scaffolding VM;
+	// mistaking its own output for a collision terminally fails an import that
+	// in fact succeeded.
+	//
+	// Deliberately labels, not owner references: the outputs of a task outlive
+	// the task, so nothing here may create a garbage-collection edge back to it.
+	// The UID rather than the name, because names are reused.
+	OutputTaskUIDLabel = thisGroup + "/output-of.TaskUID"
+	OutputVMIDLabel    = thisGroup + "/output-of.VMID"
+
+	// TaskFinalizer holds a deleted task open long enough to remove the
+	// transfer volumes the engine created for it.
+	//
+	// Everything else a task owns goes with it through owner references, but
+	// the engine's own DataVolumes carry none: it manages them by label, and
+	// when the Plan they name is deleted there is nothing left to collect them.
+	// A failed import that is then deleted therefore leaves a DataVolume
+	// retrying the transfer against the source forever — observed live, still
+	// running 37 minutes and 8 restarts after its task was gone.
+	//
+	// This finalizer does not contradict the outputs-outlive-the-task property:
+	// it removes scaffolding, and never touches a VMDisk, VMInstance or the
+	// claims behind them.
+	TaskFinalizer = thisGroup + "/cleanup-transfer-volumes"
+
+	// TaskValidatedCondition reports whether the task's inputs resolved: the
+	// source is ready, every named VM exists in the inventory, and the storage
+	// class can actually complete an import.
+	TaskValidatedCondition = "Validated"
+)
+
+// Condition reasons carried on a VMImportTask.
+const (
+	// ReasonSourceNotReady means the referenced VMImportSource is absent or unusable.
+	ReasonSourceNotReady = "SourceNotReady"
+	// ReasonVMNotFound means a named VM is absent from the source inventory.
+	ReasonVMNotFound = "VMNotFound"
+	// ReasonStorageClassNotImmediate means the resolved StorageClass binds
+	// WaitForFirstConsumer, which deadlocks an import: nothing consumes the
+	// claim while it is being populated.
+	ReasonStorageClassNotImmediate = "StorageClassNotImmediate"
+	// ReasonOutputExists means an output object of the requested name is
+	// already present. The controller never overwrites tenant objects.
+	ReasonOutputExists = "OutputExists"
+	// ReasonTransferFailed means Forklift reported the migration as failed.
+	ReasonTransferFailed = "TransferFailed"
+	// ReasonPlanRejected means Forklift refused the Plan before any transfer
+	// began — a reference it could not resolve, or a provider it could not use.
+	// The message carries Forklift's own words.
+	ReasonPlanRejected = "PlanRejected"
+	// ReasonCompleted means every VM of the task was imported.
+	ReasonCompleted = "Completed"
+)
+
+// VMImportTaskPhase represents the lifecycle phase of a VMImportTask.
+// +kubebuilder:validation:Enum="";Pending;Validating;Transferring;Creating;Succeeded;Failed
+type VMImportTaskPhase string
+
+const (
+	VMImportTaskPhaseEmpty VMImportTaskPhase = ""
+	// VMImportTaskPhasePending means the task has not started: usually its
+	// source is not ready yet.
+	VMImportTaskPhasePending VMImportTaskPhase = "Pending"
+	// VMImportTaskPhaseValidating means inputs are being resolved against the
+	// source inventory. Nothing has been created yet.
+	VMImportTaskPhaseValidating VMImportTaskPhase = "Validating"
+	// VMImportTaskPhaseTransferring means disk data is moving.
+	VMImportTaskPhaseTransferring VMImportTaskPhase = "Transferring"
+	// VMImportTaskPhaseCreating means transfers finished and the Cozystack
+	// objects are being created over the transferred volumes.
+	VMImportTaskPhaseCreating VMImportTaskPhase = "Creating"
+	// VMImportTaskPhaseSucceeded means every VM was imported.
+	VMImportTaskPhaseSucceeded VMImportTaskPhase = "Succeeded"
+	// VMImportTaskPhaseFailed means the task stopped with at least one VM unimported.
+	VMImportTaskPhaseFailed VMImportTaskPhase = "Failed"
+)
+
+// IsTerminal reports whether a phase is an end state that will not change again.
+func (p VMImportTaskPhase) IsTerminal() bool {
+	return p == VMImportTaskPhaseSucceeded || p == VMImportTaskPhaseFailed
+}
+
+// VMImportRequest names one source VM to import and what to call the result.
+type VMImportRequest struct {
+	// ID is the VM's managed-object reference in the source inventory
+	// (e.g. `vm-1234` on vSphere). It appears in the vSphere client's URL, and
+	// `govc ls -i` prints it.
+	// +kubebuilder:validation:MinLength=1
+	ID string `json:"id"`
+
+	// Name is the name of the VMInstance to create. Its disks are named after
+	// it. Must be a valid Kubernetes object name; defaults to the source VM's
+	// name normalized to one when omitted.
+	//
+	// Capped at 46 rather than the usual 63 because the name is not used alone:
+	// each disk becomes `vm-disk-<name>-disk-<i>`, and that whole string is
+	// stamped as the DataVolume's `app.kubernetes.io/instance` label value,
+	// which Kubernetes limits to 63 characters. The fixed parts cost 14
+	// (`vm-disk-` plus `-disk-`), leaving 49 to share between the name and the
+	// disk index; 46 keeps a VM with up to a thousand disks inside the limit.
+	// Overflowing it does not fail cleanly — the DataVolume is simply rejected
+	// after the transfer has already run.
+	// +optional
+	// +kubebuilder:validation:Pattern=`^[a-z0-9]([-a-z0-9]*[a-z0-9])?$`
+	// +kubebuilder:validation:MaxLength=46
+	Name string `json:"name,omitempty"`
+
+	// InstanceType is the Cozystack instance type for the created VMInstance.
+	// When omitted the controller sets explicit resources matching the source
+	// VM's CPU and memory, so an import never silently resizes a guest.
+	// +optional
+	InstanceType string `json:"instanceType,omitempty"`
+
+	// InstanceProfile is the Cozystack instance profile (guest preference set)
+	// for the created VMInstance.
+	// +optional
+	InstanceProfile string `json:"instanceProfile,omitempty"`
+}
+
+// VMImportTaskSpec describes a one-shot import of one or more VMs.
+type VMImportTaskSpec struct {
+	// SourceRef names the VMImportSource to import from. It must live in this
+	// task's own namespace.
+	// +kubebuilder:validation:XValidation:rule="self == oldSelf",message="sourceRef is immutable"
+	SourceRef corev1.LocalObjectReference `json:"sourceRef"`
+
+	// VMs lists the source VMs to import. Each produces one VMInstance over
+	// one VMDisk per source disk.
+	// +kubebuilder:validation:MinItems=1
+	// +kubebuilder:validation:XValidation:rule="self == oldSelf",message="vms is immutable"
+	VMs []VMImportRequest `json:"vms"`
+
+	// StorageClass is the StorageClass every disk of this task is imported
+	// onto. It must bind Immediate: a WaitForFirstConsumer class deadlocks the
+	// import, because nothing consumes the claim while it is populated. Empty
+	// uses the cluster default, which is validated the same way.
+	// +optional
+	// +kubebuilder:validation:XValidation:rule="self == oldSelf",message="storageClass is immutable"
+	StorageClass string `json:"storageClass,omitempty"`
+}
+
+// VMImportStatus reports the progress of one VM within a task.
+type VMImportStatus struct {
+	// ID is the source VM's managed-object reference, matching the request.
+	ID string `json:"id"`
+
+	// Name is the name of the VMInstance being created for this VM.
+	// +optional
+	Name string `json:"name,omitempty"`
+
+	// Phase is this VM's own lifecycle phase; a task's phase aggregates these.
+	// +optional
+	Phase VMImportTaskPhase `json:"phase,omitempty"`
+
+	// Progress is the percentage of disk data transferred, 0-100.
+	// +optional
+	// +kubebuilder:validation:Minimum=0
+	// +kubebuilder:validation:Maximum=100
+	Progress int32 `json:"progress,omitempty"`
+
+	// VMInstance is the name of the created VMInstance, once it exists.
+	// +optional
+	VMInstance string `json:"vmInstance,omitempty"`
+
+	// Disks lists the names of the created VMDisks, in the source VM's disk order.
+	// +optional
+	Disks []string `json:"disks,omitempty"`
+
+	// Reason is a machine-readable cause for this VM's phase, from the same set
+	// the task's conditions use. Message says the same thing to a person; a
+	// caller deciding whether a failure is worth retrying should read this.
+	// +optional
+	Reason string `json:"reason,omitempty"`
+
+	// Message explains this VM's current phase when it needs explaining.
+	// +optional
+	Message string `json:"message,omitempty"`
+}
+
+// VMImportTaskStatus represents the observed state of a VMImportTask.
+type VMImportTaskStatus struct {
+	// Phase is a high-level summary of the task's state.
+	// +optional
+	Phase VMImportTaskPhase `json:"phase,omitempty"`
+
+	// VMs reports per-VM progress, one entry per spec.vms entry.
+	// +optional
+	VMs []VMImportStatus `json:"vms,omitempty"`
+
+	// StartedAt is the time the task began validating.
+	// +optional
+	StartedAt *metav1.Time `json:"startedAt,omitempty"`
+
+	// CompletedAt is the time the task reached a terminal phase.
+	// +optional
+	CompletedAt *metav1.Time `json:"completedAt,omitempty"`
+
+	// Message is a human-readable message about the current phase.
+	// +optional
+	Message string `json:"message,omitempty"`
+
+	// ObservedGeneration is the .metadata.generation the status was computed from.
+	// +optional
+	ObservedGeneration int64 `json:"observedGeneration,omitempty"`
+
+	// Conditions represents the latest available observations of the task's state.
+	// +optional
+	Conditions []metav1.Condition `json:"conditions,omitempty"`
+}
+
+// +kubebuilder:object:root=true
+// +kubebuilder:subresource:status
+// +kubebuilder:resource:shortName=vmit;vmimporttask
+// +kubebuilder:printcolumn:name="Source",type="string",JSONPath=".spec.sourceRef.name",priority=0
+// +kubebuilder:printcolumn:name="Phase",type="string",JSONPath=".status.phase",priority=0
+// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp",priority=0
+// +kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.message",priority=1
+// +kubebuilder:selectablefield:JSONPath=`.spec.sourceRef.name`
+// +kubebuilder:selectablefield:JSONPath=`.status.phase`
+// +kubebuilder:metadata:annotations={"options.cozystack.io/source.sourceRef.name=vmimportsource","options.cozystack.io/source.storageClass=storageclass","options.cozystack.io/source.vms.instanceType=instancetype","options.cozystack.io/source.vms.instanceProfile=instanceprofile","options.cozystack.io/source.vms.id=vmimportvm.{sourceRef.name}"}
+// +kubebuilder:validation:XValidation:rule="self.metadata.name.size() <= 63",message="metadata.name must be at most 63 characters: the task's name is carried as a label value on the Forklift objects it owns, and Kubernetes limits label values to 63"
+
+// VMImportTask runs a one-shot import of VMs from a registered source. It
+// produces VMDisks and VMInstances that outlive it: deleting the task removes
+// the migration machinery and leaves everything already imported in place.
+type VMImportTask struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	Spec   VMImportTaskSpec   `json:"spec,omitempty"`
+	Status VMImportTaskStatus `json:"status,omitempty"`
+}
+
+// +kubebuilder:object:root=true
+
+// VMImportTaskList contains a list of VMImportTasks.
+type VMImportTaskList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+	Items           []VMImportTask `json:"items"`
+}
diff --git a/api/migration/v1alpha1/zz_generated.deepcopy.go b/api/migration/v1alpha1/zz_generated.deepcopy.go
new file mode 100644
index 0000000000..cae0d205ab
--- /dev/null
+++ b/api/migration/v1alpha1/zz_generated.deepcopy.go
@@ -0,0 +1,326 @@
+//go:build !ignore_autogenerated
+
+/*
+Copyright 2025 The Cozystack Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// Code generated by controller-gen. DO NOT EDIT.
+
+package v1alpha1
+
+import (
+	"k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+)
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *HostOverride) DeepCopyInto(out *HostOverride) {
+	*out = *in
+	out.Credentials = in.Credentials
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new HostOverride.
+func (in *HostOverride) DeepCopy() *HostOverride {
+	if in == nil {
+		return nil
+	}
+	out := new(HostOverride)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *ProviderCredentials) DeepCopyInto(out *ProviderCredentials) {
+	*out = *in
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ProviderCredentials.
+func (in *ProviderCredentials) DeepCopy() *ProviderCredentials {
+	if in == nil {
+		return nil
+	}
+	out := new(ProviderCredentials)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *PublishedVM) DeepCopyInto(out *PublishedVM) {
+	*out = *in
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PublishedVM.
+func (in *PublishedVM) DeepCopy() *PublishedVM {
+	if in == nil {
+		return nil
+	}
+	out := new(PublishedVM)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *VMImportRequest) DeepCopyInto(out *VMImportRequest) {
+	*out = *in
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new VMImportRequest.
+func (in *VMImportRequest) DeepCopy() *VMImportRequest {
+	if in == nil {
+		return nil
+	}
+	out := new(VMImportRequest)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *VMImportSource) DeepCopyInto(out *VMImportSource) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
+	in.Spec.DeepCopyInto(&out.Spec)
+	in.Status.DeepCopyInto(&out.Status)
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new VMImportSource.
+func (in *VMImportSource) DeepCopy() *VMImportSource {
+	if in == nil {
+		return nil
+	}
+	out := new(VMImportSource)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *VMImportSource) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *VMImportSourceList) DeepCopyInto(out *VMImportSourceList) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ListMeta.DeepCopyInto(&out.ListMeta)
+	if in.Items != nil {
+		in, out := &in.Items, &out.Items
+		*out = make([]VMImportSource, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new VMImportSourceList.
+func (in *VMImportSourceList) DeepCopy() *VMImportSourceList {
+	if in == nil {
+		return nil
+	}
+	out := new(VMImportSourceList)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *VMImportSourceList) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *VMImportSourceSpec) DeepCopyInto(out *VMImportSourceSpec) {
+	*out = *in
+	out.Credentials = in.Credentials
+	if in.Hosts != nil {
+		in, out := &in.Hosts, &out.Hosts
+		*out = make([]HostOverride, len(*in))
+		copy(*out, *in)
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new VMImportSourceSpec.
+func (in *VMImportSourceSpec) DeepCopy() *VMImportSourceSpec {
+	if in == nil {
+		return nil
+	}
+	out := new(VMImportSourceSpec)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *VMImportSourceStatus) DeepCopyInto(out *VMImportSourceStatus) {
+	*out = *in
+	if in.Conditions != nil {
+		in, out := &in.Conditions, &out.Conditions
+		*out = make([]v1.Condition, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new VMImportSourceStatus.
+func (in *VMImportSourceStatus) DeepCopy() *VMImportSourceStatus {
+	if in == nil {
+		return nil
+	}
+	out := new(VMImportSourceStatus)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *VMImportStatus) DeepCopyInto(out *VMImportStatus) {
+	*out = *in
+	if in.Disks != nil {
+		in, out := &in.Disks, &out.Disks
+		*out = make([]string, len(*in))
+		copy(*out, *in)
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new VMImportStatus.
+func (in *VMImportStatus) DeepCopy() *VMImportStatus {
+	if in == nil {
+		return nil
+	}
+	out := new(VMImportStatus)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *VMImportTask) DeepCopyInto(out *VMImportTask) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
+	in.Spec.DeepCopyInto(&out.Spec)
+	in.Status.DeepCopyInto(&out.Status)
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new VMImportTask.
+func (in *VMImportTask) DeepCopy() *VMImportTask {
+	if in == nil {
+		return nil
+	}
+	out := new(VMImportTask)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *VMImportTask) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *VMImportTaskList) DeepCopyInto(out *VMImportTaskList) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ListMeta.DeepCopyInto(&out.ListMeta)
+	if in.Items != nil {
+		in, out := &in.Items, &out.Items
+		*out = make([]VMImportTask, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new VMImportTaskList.
+func (in *VMImportTaskList) DeepCopy() *VMImportTaskList {
+	if in == nil {
+		return nil
+	}
+	out := new(VMImportTaskList)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *VMImportTaskList) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *VMImportTaskSpec) DeepCopyInto(out *VMImportTaskSpec) {
+	*out = *in
+	out.SourceRef = in.SourceRef
+	if in.VMs != nil {
+		in, out := &in.VMs, &out.VMs
+		*out = make([]VMImportRequest, len(*in))
+		copy(*out, *in)
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new VMImportTaskSpec.
+func (in *VMImportTaskSpec) DeepCopy() *VMImportTaskSpec {
+	if in == nil {
+		return nil
+	}
+	out := new(VMImportTaskSpec)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *VMImportTaskStatus) DeepCopyInto(out *VMImportTaskStatus) {
+	*out = *in
+	if in.VMs != nil {
+		in, out := &in.VMs, &out.VMs
+		*out = make([]VMImportStatus, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+	if in.StartedAt != nil {
+		in, out := &in.StartedAt, &out.StartedAt
+		*out = (*in).DeepCopy()
+	}
+	if in.CompletedAt != nil {
+		in, out := &in.CompletedAt, &out.CompletedAt
+		*out = (*in).DeepCopy()
+	}
+	if in.Conditions != nil {
+		in, out := &in.Conditions, &out.Conditions
+		*out = make([]v1.Condition, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new VMImportTaskStatus.
+func (in *VMImportTaskStatus) DeepCopy() *VMImportTaskStatus {
+	if in == nil {
+		return nil
+	}
+	out := new(VMImportTaskStatus)
+	in.DeepCopyInto(out)
+	return out
+}
diff --git a/api/v1alpha1/applicationdefinitions_types.go b/api/v1alpha1/applicationdefinitions_types.go
index 4a4cd22687..0a6166254b 100644
--- a/api/v1alpha1/applicationdefinitions_types.go
+++ b/api/v1alpha1/applicationdefinitions_types.go
@@ -18,6 +18,7 @@ package v1alpha1
 
 import (
 	helmv2 "github.com/fluxcd/helm-controller/api/v2"
+	"github.com/fluxcd/pkg/apis/kustomize"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
@@ -78,8 +79,53 @@ type ApplicationDefinitionRelease struct {
 	ChartRef *helmv2.CrossNamespaceSourceReference `json:"chartRef"`
 	// Labels for the release
 	Labels map[string]string `json:"labels,omitempty"`
-	// Prefix for the release name
+	// Prefix for the release name. Release names are "<prefix><app name>" and the
+	// tenant CA trust anchor is projected to "<release>.tenant-ca", where the dot
+	// is a separator no release name may contain — so the prefix must be dot-free.
+	// It is restricted to lowercase DNS-1123 characters, which excludes the dot by
+	// construction.
+	// +kubebuilder:validation:Pattern=`^[a-z0-9-]*$`
 	Prefix string `json:"prefix"`
+
+	// WaitStrategy maps to HelmReleaseSpec.WaitStrategy.Name — a deliberate
+	// scalar simplification of the upstream {name} object, since there is only
+	// one value to set. One of poller|legacy. When healthCheckExprs is set and
+	// this is empty, the generated HelmRelease defaults to poller, because
+	// healthCheckExprs are only evaluated under the poller wait strategy.
+	// +optional
+	// +kubebuilder:validation:Enum=poller;legacy
+	WaitStrategy string `json:"waitStrategy,omitempty"`
+
+	// HealthCheckExprs maps to HelmReleaseSpec.HealthCheckExprs — CEL health
+	// expressions for the custom resource(s) this application renders, so the
+	// HelmRelease reports Ready only when the CR is actually healthy instead of
+	// as soon as helm applies it. OpenAPI validates only the struct shape, so
+	// mistakes surface in helm-controller, and they do not all fail the same
+	// way:
+	//   - An expression that does not parse, an empty current expression, or
+	//     two entries for the same group and kind stall the HelmRelease with
+	//     reason InvalidCELExpression before any Helm action runs.
+	//   - An expression that errors on the object, such as a read of a
+	//     misspelled field or a non-boolean result, does not end the wait: the
+	//     CR reads as Unknown on every poll, and the Helm action waits out its
+	//     timeout with the CEL error in the message. Reading a status field
+	//     errors this way, even inside has(), until the CR's controller writes
+	//     a status; the wait goes on and can still succeed once it does.
+	//   - A current expression that evaluates cleanly but never becomes true,
+	//     such as a comparison against the wrong value, leaves the CR
+	//     InProgress, and the Helm action waits out its timeout with no CEL
+	//     error to point at the expression.
+	//   - A group or kind that does not match the CR the chart renders leaves
+	//     the expressions unused, and that CR is judged by the built-in
+	//     kstatus rules instead.
+	// A CR whose CRD is not installed fails the Helm action before any wait,
+	// whatever these expressions say.
+	// Upstream evaluates these only when the Helm action itself has wait
+	// enabled, so the release.cozystack.io/helm-install-disable-wait annotation
+	// makes them a silent no-op whatever waitStrategy says: the HelmRelease
+	// reports Ready as soon as helm applies the CR, with no error or warning.
+	// +optional
+	HealthCheckExprs []kustomize.CustomHealthCheck `json:"healthCheckExprs,omitempty"`
 }
 
 // ApplicationDefinitionResourceSelector extends metav1.LabelSelector with resourceNames support.
diff --git a/api/v1alpha1/packagesource_types.go b/api/v1alpha1/packagesource_types.go
index 75bf217bba..48be0d02ec 100644
--- a/api/v1alpha1/packagesource_types.go
+++ b/api/v1alpha1/packagesource_types.go
@@ -17,6 +17,7 @@ limitations under the License.
 package v1alpha1
 
 import (
+	"github.com/fluxcd/pkg/apis/kustomize"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
@@ -142,6 +143,41 @@ type ComponentInstall struct {
 	// +optional
 	// +kubebuilder:validation:Enum=Skip;Create;CreateReplace
 	UpgradeCRDs string `json:"upgradeCRDs,omitempty"`
+
+	// WaitStrategy maps to HelmReleaseSpec.WaitStrategy.Name — a deliberate
+	// scalar simplification of the upstream {name} object. One of poller|legacy.
+	// When healthCheckExprs is set and this is empty, the generated HelmRelease
+	// defaults to poller, because healthCheckExprs are only evaluated under the
+	// poller wait strategy.
+	// +optional
+	// +kubebuilder:validation:Enum=poller;legacy
+	WaitStrategy string `json:"waitStrategy,omitempty"`
+
+	// HealthCheckExprs maps to HelmReleaseSpec.HealthCheckExprs — CEL health
+	// expressions for the custom resource(s) this component renders, so the
+	// HelmRelease reports Ready only when the CR is actually healthy. OpenAPI
+	// validates only the struct shape, so mistakes surface in helm-controller,
+	// and they do not all fail the same way:
+	//   - An expression that does not parse, an empty current expression, or
+	//     two entries for the same group and kind stall the HelmRelease with
+	//     reason InvalidCELExpression before any Helm action runs.
+	//   - An expression that errors on the object, such as a read of a
+	//     misspelled field or a non-boolean result, does not end the wait: the
+	//     CR reads as Unknown on every poll, and the Helm action waits out its
+	//     timeout with the CEL error in the message. Reading a status field
+	//     errors this way, even inside has(), until the CR's controller writes
+	//     a status; the wait goes on and can still succeed once it does.
+	//   - A current expression that evaluates cleanly but never becomes true,
+	//     such as a comparison against the wrong value, leaves the CR
+	//     InProgress, and the Helm action waits out its timeout with no CEL
+	//     error to point at the expression.
+	//   - A group or kind that does not match the CR the chart renders leaves
+	//     the expressions unused, and that CR is judged by the built-in
+	//     kstatus rules instead.
+	// A CR whose CRD is not installed fails the Helm action before any wait,
+	// whatever these expressions say.
+	// +optional
+	HealthCheckExprs []kustomize.CustomHealthCheck `json:"healthCheckExprs,omitempty"`
 }
 
 // Component defines a single Helm release component within a package source
diff --git a/api/v1alpha1/workloadmonitor_types.go b/api/v1alpha1/workloadmonitor_types.go
index e7639edb40..0a4aa04cc8 100644
--- a/api/v1alpha1/workloadmonitor_types.go
+++ b/api/v1alpha1/workloadmonitor_types.go
@@ -8,6 +8,7 @@ import (
 type WorkloadMonitorSpec struct {
 	// Selector is a label selector to find workloads to monitor
 	// +required
+	// +kubebuilder:validation:MinProperties=1
 	Selector map[string]string `json:"selector"`
 
 	// Kind specifies the kind of the workload
@@ -34,6 +35,10 @@ type WorkloadMonitorSpec struct {
 	Replicas *int32 `json:"replicas,omitempty"`
 }
 
+// WorkloadMonitorReasonDataVolumeNotReady is the status Reason of a monitor
+// that is not operational because a DataVolume it selects is not ready.
+const WorkloadMonitorReasonDataVolumeNotReady = "DataVolumeNotReady"
+
 // WorkloadMonitorStatus defines the observed state of WorkloadMonitor
 type WorkloadMonitorStatus struct {
 	// Operational indicates if the workload meets all operational requirements
@@ -47,6 +52,16 @@ type WorkloadMonitorStatus struct {
 	// ObservedReplicas is the total number of pods observed
 	// +optional
 	ObservedReplicas int32 `json:"observedReplicas"`
+
+	// Message names what keeps the workload from being operational, when the
+	// controller can tell.
+	// +optional
+	Message string `json:"message,omitempty"`
+
+	// Reason is a machine-readable cause for Message, such as
+	// DataVolumeNotReady.
+	// +optional
+	Reason string `json:"reason,omitempty"`
 }
 
 // +kubebuilder:object:root=true
diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
index c1adf95ca3..ccf3a09e61 100644
--- a/api/v1alpha1/zz_generated.deepcopy.go
+++ b/api/v1alpha1/zz_generated.deepcopy.go
@@ -22,6 +22,7 @@ package v1alpha1
 
 import (
 	"github.com/fluxcd/helm-controller/api/v2"
+	"github.com/fluxcd/pkg/apis/kustomize"
 	"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -152,6 +153,11 @@ func (in *ApplicationDefinitionRelease) DeepCopyInto(out *ApplicationDefinitionR
 			(*out)[key] = val
 		}
 	}
+	if in.HealthCheckExprs != nil {
+		in, out := &in.HealthCheckExprs, &out.HealthCheckExprs
+		*out = make([]kustomize.CustomHealthCheck, len(*in))
+		copy(*out, *in)
+	}
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ApplicationDefinitionRelease.
@@ -285,6 +291,11 @@ func (in *ComponentInstall) DeepCopyInto(out *ComponentInstall) {
 		*out = make([]string, len(*in))
 		copy(*out, *in)
 	}
+	if in.HealthCheckExprs != nil {
+		in, out := &in.HealthCheckExprs, &out.HealthCheckExprs
+		*out = make([]kustomize.CustomHealthCheck, len(*in))
+		copy(*out, *in)
+	}
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ComponentInstall.
diff --git a/cmd/api-gate/main.go b/cmd/api-gate/main.go
new file mode 100644
index 0000000000..f550c8f9b0
--- /dev/null
+++ b/cmd/api-gate/main.go
@@ -0,0 +1,75 @@
+/*
+Copyright 2026 The Cozystack Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// Command api-gate compares the Cozystack API surface between two checkouts of
+// the repository and reports whether the change is "sizeable" — a new API
+// group, a new resource, or a breaking change to an existing resource. CI uses
+// a sizeable verdict to require a review from a designated API owner.
+//
+// Usage:
+//
+//	api-gate --base <dir> --head <dir>
+//
+// Both flags point at a full repository checkout (the merge base and the PR
+// head). Exit code 0 means "not sizeable"; exit code 2 means "sizeable"
+// (findings are printed to stdout as a Markdown report); any other non-zero
+// exit is an operational error.
+package main
+
+import (
+	"flag"
+	"fmt"
+	"os"
+
+	"github.com/cozystack/cozystack/internal/apigate"
+)
+
+// exitSizeable is a distinct, non-error exit code so the calling workflow can
+// tell "sizeable change, needs owner review" apart from a tool malfunction.
+const exitSizeable = 2
+
+func main() {
+	baseDir := flag.String("base", "", "path to the base (merge-base) repository checkout")
+	headDir := flag.String("head", "", "path to the head (PR) repository checkout")
+	format := flag.String("format", "markdown", "report format: markdown or text")
+	flag.Parse()
+
+	if *baseDir == "" || *headDir == "" {
+		fmt.Fprintln(os.Stderr, "api-gate: both --base and --head are required")
+		flag.Usage()
+		os.Exit(1)
+	}
+
+	base, err := apigate.LoadSnapshot(*baseDir)
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "api-gate: loading base snapshot: %v\n", err)
+		os.Exit(1)
+	}
+	head, err := apigate.LoadSnapshot(*headDir)
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "api-gate: loading head snapshot: %v\n", err)
+		os.Exit(1)
+	}
+
+	findings := apigate.Classify(base, head)
+	if len(findings) == 0 {
+		fmt.Println("No sizeable API changes detected.")
+		return
+	}
+
+	fmt.Print(apigate.Report(findings, *format))
+	os.Exit(exitSizeable)
+}
diff --git a/cmd/backport-audit/README.md b/cmd/backport-audit/README.md
new file mode 100644
index 0000000000..da446caba4
--- /dev/null
+++ b/cmd/backport-audit/README.md
@@ -0,0 +1,226 @@
+# backport-audit
+
+Answers one question, before a release or an rc is cut: did everything labelled for backport actually land on the release branch? It prints the URLs of the ones that did not, and exits non-zero, so it can gate the cut.
+
+The manual alternative is `gh pr list --search "is:merged label:kind/backport"`, which lists every PR ever labelled and says nothing about whether the change reached the branch. Answering that by hand means reading the branch history per PR, which is where backports quietly go missing.
+
+```console
+$ go run ./cmd/backport-audit release-1.5
+
+=== release-1.5 === 43 candidate PRs: MISSING=2 pending=3 dropped=5 backported=33
+
+  MISSING -- labelled for this line, no trace of it here (2):
+    https://github.com/cozystack/cozystack/pull/3449
+      #3449 ci(release): move release validation to rc time — e2e lane, changelog button, promote gate, docs at promote
+      label=kind/backport-previous author=myasnikovdaniil merged=2026-07-29 -- no backport PR, nothing on branch
+```
+
+The URL is always the **original PR on main** — the thing you decide about. The evidence line names the backport PR when one exists. A labelled PR already on the branch is counted in the header and never listed, so silence under the outstanding headings means done. Two more sections, described in [Backports the labels do not account for](#backports-the-labels-do-not-account-for), start from the backport PRs on the branch instead of from labels: `DUPLICATE`, which is outstanding, and `UNLABELLED`, which is informational.
+
+## Usage
+
+```bash
+go run ./cmd/backport-audit                      # the two newest release lines
+go run ./cmd/backport-audit release-1.5          # one line
+go run ./cmd/backport-audit release-1.6 release-1.5 --json
+```
+
+Requires `git` and an authenticated `gh` on PATH. The audit does not modify GitHub or working-tree files. Unless `--no-fetch` is set, it updates local Git refs and objects while fetching.
+
+| Flag | Meaning |
+|------|---------|
+| `--remote NAME` | Git remote holding the release branches (default `origin`) |
+| `--limit N` | Max merged PRs scanned per label spelling (default 1000, which is also the ceiling — see [Exit code](#exit-code)) |
+| `--no-fetch` | Skip `git fetch`; both main and release refs must be current so shared history stays out of backport evidence |
+| `--json` | Machine-readable output |
+| `--no-color` | Disable color (auto-disabled on a non-TTY and under `--json`) |
+
+Arguments and flags may be given in any order.
+
+## Exit code
+
+`0` when nothing is outstanding, `1` when something is, `2` when the audit could not be completed. Outstanding means a `MISSING`, `partial`, `unverified`, `pending` or `dropped` verdict, or any `DUPLICATE` entry; `UNLABELLED` entries never move the exit code. That is the point of the tool, so it holds in `--json` mode too:
+
+```bash
+go build ./cmd/backport-audit
+./backport-audit release-1.5
+case $? in
+  0) echo "clean" ;;
+  1) echo "do not cut yet" ;;
+  *) echo "the audit itself failed; no answer yet" ;;
+esac
+```
+
+Use the built binary (`go build` as above, or `go install ./cmd/backport-audit`) wherever the exit code matters. `go run` does not preserve it: any non-zero exit of the program comes back as `go run`'s own `1`, after an `exit status N` line on stderr, so under `go run` an audit that could not be completed looks exactly like one that found outstanding work. `go run` is fine for reading the report.
+
+Exit `2` covers the cases where an answer cannot be trusted rather than merely being bad news, and a saturated listing is one of them: `gh` truncates at `--limit` in silence, and a truncated list does not make the audit partial, it makes it wrong — the PRs past the cut are reported nowhere and the exit code says clean. Each of the three listings is checked against its cap and fails instead, naming the cap to raise. The label listings go through GitHub search, which never returns more than 1000 results however far it is paginated, so they are checked against the lower of `--limit` and 1000: a `--limit` above 1000 cannot make a listing cut at 1000 pass for complete. A git read that a verdict depends on is the other case: when one fails, a merge commit missing from the local repository for instance, the audit stops with `2` instead of judging the PR without it.
+
+## Statuses
+
+| Status | Meaning | Action |
+|--------|---------|--------|
+| `in-branch` | The PR merged before the branch was cut, so its change is already there | none, no backport was ever needed |
+| `backported` | Every commit of the PR is on the branch, or, for a PR of a single commit, a backport PR merged | none |
+| `confirmed` | Would be `partial` or `unverified`, but a maintainer attested the backport complete on the merged backport PR; the report names who and links the comment | none |
+| `partial` | Some of the PR's commits are on the branch and some are not, listed with SHA and subject — a merged bot conflict draft, which stops at the first commit that did not apply, or a backport squashed by hand | backport the missing commits, or [attest the backport complete](#attesting-a-backport-complete) |
+| `unverified` | A backport PR merged, but none of the PR's several commits is on the branch under its own SHA, `-x` reference or subject — typically a backport squashed or reworded by hand | check it, then attest it complete or backport what is missing |
+| `pending` | A backport PR exists and is still open, including the drafts the bot opens with the conflict committed | merge it, or finish the draft |
+| `dropped` | A backport PR was closed unmerged, reported with whatever reason someone left on it | none if the reason still holds |
+| `MISSING` | No backport PR ever existed and nothing on the branch matches | cherry-pick it by hand, or drop it deliberately |
+
+`dropped` is usually healthy — a maintainer deciding a fix does not apply to that line, e.g. because the feature it repairs never shipped there. The recorded reason is printed so the next release does not re-open the same investigation. A `dropped` entry reading `no reason recorded` is the one that needs a human.
+
+## Backports the labels do not account for
+
+The verdicts start from labels, so on their own they cannot see a backport of a PR nobody labelled. Two further sections start from the other side: every PR on the release branch, and the originals it names by the bot's head branch or in a `Backport of` phrase (see [How landing is established](#how-landing-is-established)). The header carries their counts after a `|`, e.g. `backported=42 | DUPLICATE=3 unlabelled=13`.
+
+`UNLABELLED` lists each original that backport PRs on the branch claim although it is not a candidate for the branch, with every backport PR claiming it and that PR's state. Each entry also says what those PRs amount to: `backport PR merged` once one of them merged, `claimed here, not merged` while the only live one is still open, and `claimed here, closed unmerged` when every one was closed. A merged claim is only a merged PR, since an unlabelled original is not checked commit by commit; it reads `backport PR merged, confirmed by @login` when the PR carries the [attestation marker](#attesting-a-backport-complete). Most are hand backports of PRs that never carried a label, merged on purpose. An original that does carry a backport request, one that resolved to a different line at merge time, is listed with its labels. The section is informational and never moves the exit code: the gate answers whether everything labelled landed, and an unlabelled backport can only add to a branch, never leave a labelled change off it.
+
+`DUPLICATE` lists each original claimed by more than one live backport PR, labelled or not:
+
+| Kind | Meaning | Action |
+|------|---------|--------|
+| `open-twice` | Two or more backport PRs are open for it — typically the bot's conflict draft next to a hand backport, or a fork PR next to its reopening from a branch in this repository | merge one, close the rest |
+| `open-after-merge` | A backport already merged and another one is still open | close the leftover, or merge it if it is the second half of a split backport |
+
+Both kinds make the audit exit `1`. Neither reaches a verdict, which judges the commits on the branch and names at most one open backport PR, and in both a human has to decide what happens to the open PR before the cut. A closed PR next to an open one is the normal shape of a redone backport and is not flagged, and neither are two merged ones, which are history the branch already carries.
+
+```console
+  DUPLICATE -- one original, more than one live backport PR (3):
+    https://github.com/cozystack/cozystack/pull/3936
+      #3936 fix(rabbitmq): right-size the default resources preset to s1.nano
+      label=kind/backport -- a backport PR still open after another one merged
+      backport #4372 OPEN (draft) https://github.com/cozystack/cozystack/pull/4372
+      backport #4393 MERGED https://github.com/cozystack/cozystack/pull/4393
+
+  UNLABELLED -- backport PRs here for originals not labelled for this line (13, informational):
+    https://github.com/cozystack/cozystack/pull/4280
+      #4280 fix(kafka): keep the pre-delete hook's credentials as long as its Job
+      backport PR merged
+      backport #4421 CLOSED https://github.com/cozystack/cozystack/pull/4421
+      backport #4456 MERGED https://github.com/cozystack/cozystack/pull/4456
+```
+
+The titles of unlabelled originals are not in any listing the audit already makes, so they come from one GraphQL request covering the whole run. If it fails, the report goes out without them and says so on stderr; the URLs are derived locally and the verdicts and exit code do not depend on it.
+
+## How a PR is matched to a release line
+
+A `kind/backport` label does not name a branch. The audit selects merged PRs that currently carry a backport label, then assigns each to the release line selected at its merge time: `kind/backport` means the current line, and `kind/backport-previous` means the previous line. A label added after merge still makes the PR a candidate. [`backport.yaml`](../../.github/workflows/backport.yaml) also runs when a label is added and selects its target at that time, so a late label can make the audit and the bot disagree; see [Limits](#limits).
+
+What "the current line" means changed once, so the audit carries both rules and picks by the PR's merge date:
+
+| PR merged | rule `backport.yaml` was running | a line exists from |
+|-----------|----------------------------------|--------------------|
+| before 2026-08-03 | `getLatestRelease` | its first non-prerelease release publishing |
+| on or after 2026-08-03 | the two newest existing `release-X.Y` branches | its `release-X.Y` branch being pushed |
+
+The cutover is a single moment because both halves landed in one push: 53a7fc4dc made cutting an rc freeze the line into `release-X.Y`, and 6ff5b98d5 pointed the bot at the branch list. Before that a release branch was created at promote time, so the newest branch and the newest published stable named the same line and the two rules could not disagree. After it they disagree for the length of every freeze window — `release-X.Y` is created when the first `vX.Y.0-rc.N` is cut, potentially weeks before `vX.Y.0` publishes, and everything labelled in between belongs to the line being stabilised. That window is exactly when a backport has to reach the branch, because the frozen branch is the only way into the release.
+
+The audit estimates branch opening from the earliest `vX.Y.0-rc.N` tagged commit dated on or after the cutover. It ignores earlier tags individually; a line with no remaining tag falls back to its first stable release date. [`cut-prerelease.yaml`](../../.github/workflows/cut-prerelease.yaml) creates the branch at the tagged commit, but the commit timestamp is not the branch-push timestamp. PRs merged in that interval can be assigned to the new line before the bot could target it. The rc release's `publishedAt` is later still, after the build finishes.
+
+Lines are then ranked by version and never by when they opened, matching the numeric descending sort the workflow applies to its branch list. The two orders come apart as soon as a freeze overlaps the previous line's stabilisation, and version order is also what keeps `release-1.10` above `release-1.9`.
+
+The labels themselves were namespaced under `kind/` in 7b71053a0, which renamed them in place via label-sync aliases, so every historical PR reads back under the new name. The bare `backport` and `backport-previous` are still queried alongside them, because the org-level dosubot goes on applying the old spelling to new PRs — the same transitional allowance [`backport.yaml`](../../.github/workflows/backport.yaml) makes, and it retires at the same time. A PR found under either spelling is reported under the `kind/` one.
+
+## How landing is established
+
+Evidence is weighed per commit, because a commit is what a backport can lose:
+
+1. **Reachability.** The PR's merge commit is reachable from the release branch, i.e. it merged before the branch was cut (or `main` was later merged in). Nothing was ever needed: `in-branch`.
+2. **A linked backport PR.** Found by the bot's head branch `backport-<N>-to-release-X.Y`, or by a `Backport of #N` reference in the body, which is what a hand-written backport carries. It never outranks the commits (item 3): a merged backport PR with one of the PR's commits missing is `partial`, because the bot's conflict drafts stop at the first commit that does not apply and drop the rest, so a merged draft looks finished at PR level. `MERGED` settles it alone only for a PR of a single commit — including on a `--no-fetch` run whose local refs predate the backport's merge. For a PR of several commits, none of them found and a merged backport PR is `unverified`. `OPEN` is `pending`; `CLOSED` is `dropped`.
+
+   A backport carrying several changes links to every original its `Backport of` phrase names: a list (`Backport of #3938 and #4280`, `Backport of #1, #2, and #3`), and the `Backport of #4253 to release-1.6, together with #3460` form used for a dependency pulled along. Only that phrase is read, so the issue a backport fixes or a CI run it cites further on is never taken for an original. A list counts in full only when it visibly ends — at the end of the line or the sentence, or where the `to release-X.Y` clause starts. One that runs on into anything else (`Backport of #10, #20 is not included`) may be saying something about its later items, so only its first reference counts. A reference qualified with this repository (`cozystack/cozystack#N`, any case) counts like a bare `#N`, and one qualified with any other repository is skipped, because reading `other/repo#20` as local #20 would let an unrelated backport vouch for whichever local PR carries that number.
+3. **The branch's own history, commit by commit.** Every commit the PR contributed has to be on the branch; merge commits and commits that change nothing are skipped, since the backport bot drops both. A commit counts when it is reachable, when an `-x` cherry-pick reference names it, or when a commit with its subject is there. Subject and `-x` evidence comes only from commits on the release branch that are not reachable from `<remote>/main`; shared history still counts for direct reachability. Subjects are matched one to one: two commits with the same subject, `fix tests` say, need two branch commits of that name, and a branch commit whose `-x` reference names any other commit than the PR's merge commit is evidence only through that reference. Nothing weaker is taken: not an `-x` reference to the PR's merge commit, which survives a cherry-pick later amended to drop a commit, and not matching lines, which an unrelated line of the same text satisfies. A wrong `backported` is the one answer a release gate must not give, while a false alarm costs a look and can be settled by an attestation. All commits is `backported`, some is `partial`. This is also what catches a hand backport nobody linked.
+
+### Attesting a backport complete
+
+Some complete backports cannot be shown commit by commit, most often a fork contributor's backport squashed into one commit that carries only the first commit's subject. A maintainer who has checked such a backport can say so on the merged backport PR, with a comment that consists of this single line and nothing else:
+
+```text
+backport-audit: complete
+```
+
+That turns the candidate's `partial` or `unverified` into `confirmed`, which does not fail the gate; the report names the author, links the comment, and keeps listing the commits nothing on the branch names.
+
+The marker is an explicit attestation by whoever wrote it, never something the audit infers. It counts only when it is the whole comment: exactly `backport-audit: complete`, in that case, starting at the beginning of its line, with nothing but blank lines before it and nothing but whitespace after it. Any other text makes the comment something other than an attestation, so a sentence such as "do not post backport-audit: complete yet", a quote or a code block never counts, and neither does the marker with an explanation next to it; post the explanation as a separate comment. It counts only on a backport PR that merged, since an open or closed one put nothing on the branch to vouch for. And it counts only from someone with a hand in the repository: the comment's GitHub author association has to be `OWNER`, `MEMBER` or `COLLABORATOR`, and comments from automation are ignored whatever their association — logins ending in `[bot]`, and the review and dependency bots gh reports without that suffix, such as `coderabbitai`, `dependabot`, `renovate` and `copilot`. A review bot quoting the marker, or a contributor vouching for their own backport, confirms nothing.
+
+## Machine-readable output
+
+```bash
+# URLs of what never landed, ready to paste into a tracking issue
+go run ./cmd/backport-audit --json release-1.5 | jq -r '.[].candidates[] | select(.status=="MISSING") | .url'
+
+# every open backport PR the audit links, labelled or not, to merge or close, across lines
+go run ./cmd/backport-audit --json release-1.6 release-1.5 \
+  | jq -r '[.[] | (.candidates[], .unlabelled[]) | .backport_prs[] | select(.state=="OPEN") | .url] | unique[]'
+
+# dropped items with the reason someone recorded
+go run ./cmd/backport-audit --json release-1.4 \
+  | jq -r '.[].candidates[] | select(.status=="dropped") | "#\(.number)\t\(.reason)"'
+
+# commits a partial backport still lacks, one per line
+go run ./cmd/backport-audit --json release-1.6 \
+  | jq -r '.[].candidates[] | select(.status=="partial") | "#\(.number)\t\(.missing_commits[] | "\(.oid[0:9]) \(.subject)")"'
+
+# open backport PRs competing for one original, to settle before the cut
+go run ./cmd/backport-audit --json release-1.6 \
+  | jq -r '.[].duplicates[] | "#\(.number) \(.kind): \([.backport_prs[] | select(.state=="OPEN") | .url] | join(" "))"'
+```
+
+Output is an object keyed by branch, each holding three arrays: `candidates`, `unlabelled` and `duplicates`, each always present and possibly empty. `partial`, `unverified` and `confirmed` candidates carry `missing_commits`, each an `oid` and a `subject`, and a `confirmed` one also carries `confirmation`: `by`, `url` and `backport_pr`. An `unlabelled` record carries the same `confirmation` when its merged backport PR has the marker. A `candidates` record:
+
+```json
+{
+  "number": 3963,
+  "title": "fix(clickhouse): scheme the backup S3_ENDPOINT on the system-bucket flow",
+  "url": "https://github.com/cozystack/cozystack/pull/3963",
+  "author": "androndo",
+  "mergedAt": "2026-08-28T11:05:15Z",
+  "label": "kind/backport",
+  "backport_prs": [{"number": 3987, "state": "OPEN", "url": "..."}],
+  "status": "pending",
+  "evidence": "backport PR #3987 open"
+}
+```
+
+An `unlabelled` record, where `labels` lists the backport requests the original carries for other lines and is empty when it carries none:
+
+```json
+{
+  "number": 4280,
+  "title": "fix(kafka): keep the pre-delete hook's credentials as long as its Job",
+  "url": "https://github.com/cozystack/cozystack/pull/4280",
+  "labels": [],
+  "backport_prs": [
+    {"number": 4421, "state": "CLOSED", "url": "..."},
+    {"number": 4456, "state": "MERGED", "url": "..."}
+  ]
+}
+```
+
+A `duplicates` record, where `label` is the request the original was audited under on this line and is empty when it is not a candidate here:
+
+```json
+{
+  "number": 4254,
+  "title": "feat(kubevirt): expose migration configuration through platform values",
+  "url": "https://github.com/cozystack/cozystack/pull/4254",
+  "label": "kind/backport",
+  "kind": "open-twice",
+  "backport_prs": [
+    {"number": 4322, "state": "OPEN", "url": "...", "draft": true},
+    {"number": 4339, "state": "OPEN", "url": "..."},
+    {"number": 4402, "state": "OPEN", "url": "..."}
+  ]
+}
+```
+
+## Limits
+
+A `MISSING`, `partial` or `unverified` verdict is a prompt to check, not proof of absence. A hand backport squashed or reworded without `-x` reads as `partial` or `unverified` until someone attests it complete, and as `MISSING` when nothing links it to its original; confirm at diff level before redoing the work. And the audit reports *that* something is missing, never *why* — a run of `MISSING` entries clustered in time usually means the bot itself was failing during that window, which is worth checking before cherry-picking them one by one.
+
+The audit reads labels as they stand when it runs. A label added afterwards is seen only by the next run, and until then its PR is either absent or, if someone already backported it, listed as `UNLABELLED` rather than audited, so run it right before the cut rather than once at the start of the day.
+
+A label is always read against the release lines as they stood when the PR merged, however much later the label was added, because nothing the audit lists records when that happened. A PR merged on 2026-07-01 and labelled `kind/backport` a month later, after `v1.6.0` published, is audited as a `release-1.5` candidate. [`backport.yaml`](../../.github/workflows/backport.yaml) runs again when the label is added and resolves its targets at that moment, so it opens the backport against `release-1.6`. When the line has moved on between the merge and the label, the two therefore disagree: the audit expects the change on the merge-time line and reports it `MISSING` there unless it arrived some other way, and lists the bot's backport under `UNLABELLED` on the newer one. `TestCandidateLabel` pins the audit's side of this.
+
+A backport PR that names its original neither by the bot's head branch nor in a `Backport of` phrase links to nothing, so it is invisible to both cross-checks: it is not listed as `UNLABELLED` and does not count towards a `DUPLICATE`. For a labelled original the branch history can still prove the change landed, through an identical commit subject or an `-x` cherry-pick reference. For an unlabelled one those are not read at all, so a backport of an unlabelled PR that only a cherry-pick trailer points to, or nothing does, appears nowhere in the report.
diff --git a/cmd/backport-audit/main.go b/cmd/backport-audit/main.go
new file mode 100644
index 0000000000..cee7aa791a
--- /dev/null
+++ b/cmd/backport-audit/main.go
@@ -0,0 +1,1569 @@
+/*
+Copyright 2026 The Cozystack Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// Command backport-audit reports outstanding labelled changes before a release
+// cut. It reads GitHub and local Git history, fetching refs unless --no-fetch is
+// set. The README describes candidate selection, delivery evidence and limits.
+package main
+
+import (
+	"encoding/json"
+	"errors"
+	"fmt"
+	"os"
+	"os/exec"
+	"regexp"
+	"slices"
+	"sort"
+	"strconv"
+	"strings"
+	"time"
+)
+
+const usageText = `Audit whether every backport-labelled PR actually landed on a release branch.
+
+Exits 0 when nothing is outstanding and 1 when something is, so it can gate a release.
+Backports of PRs that carry no label for the line are listed without affecting the
+exit code; an original with more than one live backport PR counts as outstanding.
+
+Usage:
+  backport-audit [OPTIONS] [release-X.Y ...]
+
+Arguments:
+  release-X.Y ...       Release lines to audit (default: the two newest)
+
+Options:
+      --remote NAME     Git remote holding the release branches (default: origin)
+      --limit N         Max merged PRs to scan per label (default and ceiling: 1000)
+      --no-fetch        Trust the local refs as-is, skipping git fetch
+      --json            Machine-readable output
+      --no-color        Disable color output (auto-disabled on non-TTY)
+  -h, --help            Show this help
+`
+
+// A reference to a PR, optionally qualified by its repository, and a list of
+// them as prose writes one: "#1 and #2", "#1, #2 and #3", "#1, #2, and #3".
+const (
+	prRef     = `(?:[\w.-]+/[\w.-]+)?#\d+`
+	prRefList = prRef + `(?:(?:\s*,\s*(?:and\s+)?|\s+and\s+)` + prRef + `)*`
+)
+
+// A release line named in prose, bare or in backticks, as a whole word:
+// release-1.6-fixes, release-1.6.1 and release-1.6.fixes start with a line name
+// without being one, so punctuation ends the name only when a space or the end
+// of the text follows it.
+const releaseLineName = `(?:\x60release-\d+\.\d+\x60|release-\d+\.\d+)(?:$|\s|\)|[.,;:](?:\s|$))`
+
+// upstreamRepo is the repository an unqualified reference is read against when
+// a PR's URL does not say which repository it belongs to.
+const upstreamRepo = "cozystack/cozystack"
+
+var (
+	releaseLineRE  = regexp.MustCompile(`^release-(\d+)\.(\d+)$`)
+	backportHeadRE = regexp.MustCompile(`^backport-(\d+)-to-(release-\d+\.\d+)$`)
+	// A hand backport that carries more than one change names all of them in
+	// its "Backport of" phrase, either as a list or as the "to release-X.Y,
+	// together with #N" this repository writes for a dependency pulled along.
+	backportOfRE = regexp.MustCompile(`[Bb]ackport of\s+(` + prRefList + `)` +
+		`(?:\s+to\s+\x60?release-\d+\.\d+\x60?,?\s+together with\s+(` + prRefList + `))?`)
+	// What a list of references may be followed by for every item in it to be
+	// an original: the end of the line, the end of a sentence, or the "to
+	// release-X.Y" that names the target. Anything else may be the list going
+	// on to say something about its later items -- "#10, #20 is not included",
+	// "#10, #20 to follow in a separate PR" -- so an unterminated list keeps
+	// only its first item, the one the phrase names directly.
+	prRefListEndRE = regexp.MustCompile(`^(?:[ \t]*(?:\r?\n|$)|\.(?:\s|$)|\s+to\s+` + releaseLineName + `)`)
+	prRefRE        = regexp.MustCompile(`(?:([\w.-]+/[\w.-]+))?#(\d+)`)
+	cherryPickRE   = regexp.MustCompile(`cherry picked from commit ([0-9a-f]{7,40})`)
+	releaseTagRE   = regexp.MustCompile(`^v(\d+)\.(\d+)\.(\d+)$`)
+	// The tag whose cut creates release-X.Y. cut-prerelease.yaml gates the
+	// freeze on kind == rc and patch == 0, so alpha, beta and patch-line rcs
+	// deliberately do not match.
+	freezeTagRE = regexp.MustCompile(`^v(\d+)\.(\d+)\.0-rc\.\d+$`)
+)
+
+// Caps on the three listings the audit makes. gh truncates at --limit in
+// silence, so each one is checked against its cap by truncated() and the
+// numbers are set well clear of the current populations rather than close to
+// them: at the time of writing, 290 labelled PRs, 217 releases, and at most 54
+// PRs on any one release branch. Raising a cap costs nothing when it is not
+// reached -- gh stops as soon as the result set is exhausted -- so the reason
+// they are bounded at all is to keep a runaway query from paginating forever.
+const (
+	releaseListCap = 1000
+	branchPRCap    = 1000
+)
+
+// searchResultCap is the most results GitHub search returns for one query,
+// however far it is paginated. gh pr list answers a --label filter through
+// search, so the candidate listing stops here whatever --limit asks for, and
+// gh's --json output does not warn that it did. The other two listings do not
+// go through search and are bounded by their own caps alone.
+const searchResultCap = 1000
+
+// candidateCeiling is the listing length at which a label query with --limit
+// limit has to be taken as truncated, and what to do about it.
+func candidateCeiling(limit int) (int, string) {
+	if limit < searchResultCap {
+		return limit, "re-run with a higher --limit"
+	}
+	return searchResultCap, "GitHub search returns at most 1000 results per query; split the label query in cmd/backport-audit, e.g. by merge date"
+}
+
+// freezeContractLandedAt is when cutting an rc started creating release-X.Y,
+// and with it when backport.yaml stopped resolving its targets from the last
+// published stable.
+//
+// One moment, not two: 53a7fc4dc ("cutting an rc freezes the line into
+// release-X.Y") and 6ff5b98d5 ("target the newest existing release line")
+// landed on main in the same push, which is what makes a single cutover
+// faithful. Before it a release-X.Y branch was created at promote time, so the
+// newest branch and the newest published stable named the same line and the
+// two rules could not disagree. After it they disagree for the length of every
+// freeze window, which is precisely when a backport has to reach the branch.
+var freezeContractLandedAt = time.Date(2026, 8, 3, 16, 31, 59, 0, time.UTC)
+
+// The two backport requests .github/workflows/backport.yaml acts on, named by
+// the label that carries them. These names are what the audit reports.
+const (
+	labelCurrent  = "kind/backport"
+	labelPrevious = "kind/backport-previous"
+)
+
+// backportLabels maps each request to every label spelling that expresses it.
+//
+// TRANSITIONAL, matching the same allowance in backport.yaml: the labels were
+// namespaced under kind/ in 7b71053a0, carrying the bare names as label-sync
+// aliases so the rename applied in place. Historical PRs therefore read back as
+// `kind/backport` today, but the org-level dosubot still applies the bare names
+// on new PRs, so a candidate can carry either. Both are queried and folded onto
+// the canonical name above. When dosubot's PR labelling is switched off, the
+// legacy spellings here and the ones in backport.yaml can be dropped together.
+var backportLabels = []struct {
+	canonical string
+	spellings []string
+}{
+	{labelCurrent, []string{labelCurrent, "backport"}},
+	{labelPrevious, []string{labelPrevious, "backport-previous"}},
+}
+
+// Statuses, most to least in need of attention. outstanding is the prefix of
+// this order that makes the audit exit non-zero.
+const (
+	statusMissing    = "MISSING"
+	statusPartial    = "partial"
+	statusUnverified = "unverified"
+	statusPending    = "pending"
+	statusDropped    = "dropped"
+	statusConfirmed  = "confirmed"
+	statusBackported = "backported"
+	statusInBranch   = "in-branch"
+)
+
+var (
+	statusOrder = []string{statusMissing, statusPartial, statusUnverified, statusPending, statusDropped,
+		statusConfirmed, statusBackported, statusInBranch}
+	outstanding = []string{statusMissing, statusPartial, statusUnverified, statusPending, statusDropped}
+	headings    = map[string]string{
+		statusMissing:    "MISSING -- labelled for this line, no trace of it here",
+		statusPartial:    "PARTIAL -- some of the PR's commits are here, not all of them",
+		statusUnverified: "UNVERIFIED -- backport PR merged, none of the PR's commits found here",
+		statusPending:    "PENDING -- backport PR open, not merged",
+		statusDropped:    "DROPPED -- backport PR closed without merging",
+	}
+)
+
+// The two ways one original can be claimed by more than one live backport PR on
+// a branch. Both are outstanding.
+const (
+	dupOpenTwice      = "open-twice"
+	dupOpenAfterMerge = "open-after-merge"
+)
+
+var dupDescriptions = map[string]string{
+	dupOpenTwice:      "more than one backport PR open",
+	dupOpenAfterMerge: "a backport PR still open after another one merged",
+}
+
+type config struct {
+	remote   string
+	limit    int
+	fetch    bool
+	asJSON   bool
+	useColor bool
+	branches []string
+
+	red, green, yellow, cyan, dim, bold, reset string
+}
+
+// line is a release line, i.e. a major.minor pair with a release-X.Y branch.
+type line struct{ major, minor int }
+
+func (l line) branch() string { return fmt.Sprintf("release-%d.%d", l.major, l.minor) }
+func (l line) less(o line) bool {
+	if l.major != o.major {
+		return l.major < o.major
+	}
+	return l.minor < o.minor
+}
+
+// mainPR is a merged-to-main PR carrying at least one backport label.
+type mainPR struct {
+	Number      int       `json:"number"`
+	Title       string    `json:"title"`
+	URL         string    `json:"url"`
+	MergedAt    time.Time `json:"mergedAt"`
+	MergeCommit struct {
+		Oid string `json:"oid"`
+	} `json:"mergeCommit"`
+	Author struct {
+		Login string `json:"login"`
+	} `json:"author"`
+	Labels []struct {
+		Name string `json:"name"`
+	} `json:"labels"`
+
+	labels map[string]bool
+}
+
+// backportPR is a PR opened against a release branch.
+type backportPR struct {
+	Number      int         `json:"number"`
+	Title       string      `json:"title"`
+	URL         string      `json:"url"`
+	State       string      `json:"state"`
+	HeadRefName string      `json:"headRefName"`
+	Body        string      `json:"body"`
+	IsDraft     bool        `json:"isDraft"`
+	Comments    []prComment `json:"comments"`
+}
+
+// prComment is one comment on a backport PR.
+type prComment struct {
+	Author struct {
+		Login string `json:"login"`
+	} `json:"author"`
+	AuthorAssociation string `json:"authorAssociation"`
+	Body              string `json:"body"`
+	URL               string `json:"url"`
+}
+
+// linkedPR is the trimmed view of a backport PR carried in the output.
+type linkedPR struct {
+	Number int    `json:"number"`
+	State  string `json:"state"`
+	URL    string `json:"url"`
+	Draft  bool   `json:"draft,omitempty"`
+}
+
+func trimPR(b backportPR) linkedPR {
+	return linkedPR{Number: b.Number, State: b.State, URL: b.URL, Draft: b.IsDraft}
+}
+
+// verdict is one audited candidate. The JSON field names are the tool's
+// contract with jq one-liners, so they are spelled explicitly.
+type verdict struct {
+	Number      int        `json:"number"`
+	Title       string     `json:"title"`
+	URL         string     `json:"url"`
+	Author      string     `json:"author"`
+	MergedAt    string     `json:"mergedAt"`
+	Label       string     `json:"label"`
+	BackportPRs []linkedPR `json:"backport_prs"`
+	Status      string     `json:"status"`
+	Evidence    string     `json:"evidence"`
+	Reason      string     `json:"reason,omitempty"`
+	// MissingCommits are the PR's commits a partial or unverified backport
+	// shows no trace of.
+	MissingCommits []prCommit    `json:"missing_commits,omitempty"`
+	Confirmation   *confirmation `json:"confirmation,omitempty"`
+}
+
+// prCommit is one commit a PR contributed to main.
+type prCommit struct {
+	Oid     string `json:"oid"`
+	Subject string `json:"subject"`
+}
+
+// unlabelledBackport is an original that backport PRs on the branch claim
+// although it is not a candidate for the branch. Labels holds the backport
+// requests it does carry, which then resolved to some other line.
+type unlabelledBackport struct {
+	Number       int           `json:"number"`
+	Title        string        `json:"title"`
+	URL          string        `json:"url"`
+	Labels       []string      `json:"labels"`
+	BackportPRs  []linkedPR    `json:"backport_prs"`
+	Confirmation *confirmation `json:"confirmation,omitempty"`
+}
+
+// duplicateBackport is an original claimed by more than one live backport PR
+// on the branch. Label is the request it was audited under here, empty when it
+// is not a candidate for the branch.
+type duplicateBackport struct {
+	Number      int        `json:"number"`
+	Title       string     `json:"title"`
+	URL         string     `json:"url"`
+	Label       string     `json:"label"`
+	Kind        string     `json:"kind"`
+	BackportPRs []linkedPR `json:"backport_prs"`
+}
+
+// branchReport is everything the audit found on one release branch.
+type branchReport struct {
+	Candidates []verdict            `json:"candidates"`
+	Unlabelled []unlabelledBackport `json:"unlabelled"`
+	Duplicates []duplicateBackport  `json:"duplicates"`
+}
+
+// clean reports whether the branch passes the gate. Unlabelled backports do not
+// enter into it: they report claims outside the labelled candidate set.
+func (r *branchReport) clean() bool {
+	for _, v := range r.Candidates {
+		if slices.Contains(outstanding, v.Status) {
+			return false
+		}
+	}
+	return len(r.Duplicates) == 0
+}
+
+func main() { os.Exit(run()) }
+
+func run() int {
+	cfg, code, done := parseArgs(os.Args[1:])
+	if done {
+		return code
+	}
+
+	if cfg.fetch {
+		fmt.Fprintln(os.Stderr, "fetching refs...")
+		if _, err := capture("git", "fetch", "--quiet", "--tags", cfg.remote); err != nil {
+			fmt.Fprintf(os.Stderr, "git fetch failed: %v\n", err)
+			return 2
+		}
+	}
+
+	if len(cfg.branches) == 0 {
+		lines, err := releaseLines(cfg.remote)
+		if err != nil {
+			fmt.Fprintf(os.Stderr, "%v\n", err)
+			return 2
+		}
+		if len(lines) == 0 {
+			fmt.Fprintf(os.Stderr, "no release-X.Y branches found on %s\n", cfg.remote)
+			return 2
+		}
+		// Newest first, at most two.
+		for i := len(lines) - 1; i >= 0 && len(cfg.branches) < 2; i-- {
+			cfg.branches = append(cfg.branches, lines[i].branch())
+		}
+		fmt.Fprintf(os.Stderr, "auditing %s\n", strings.Join(cfg.branches, ", "))
+	}
+
+	for _, b := range cfg.branches {
+		if !releaseLineRE.MatchString(b) {
+			fmt.Fprintf(os.Stderr, "not a release line: %s (expected release-<major>.<minor>)\n", b)
+			return 2
+		}
+		if !gitOK("rev-parse", "--verify", "--quiet", cfg.remote+"/"+b) {
+			fmt.Fprintf(os.Stderr, "no such branch: %s/%s\n", cfg.remote, b)
+			return 2
+		}
+	}
+
+	opened, err := lineOpenDates()
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "%v\n", err)
+		return 2
+	}
+	cands, err := candidates(cfg.limit)
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "%v\n", err)
+		return 2
+	}
+	fmt.Fprintf(os.Stderr, "%d merged PRs carry a backport label\n", len(cands))
+
+	out := map[string]*branchReport{}
+	clean := true
+	for _, branch := range cfg.branches {
+		rep, err := cfg.audit(branch, cands, opened)
+		if err != nil {
+			fmt.Fprintf(os.Stderr, "%v\n", err)
+			return 2
+		}
+		out[branch] = rep
+		// The exit code is the whole point of running this in a gate, so it is
+		// computed from the results, not as a side effect of printing them.
+		if !rep.clean() {
+			clean = false
+		}
+	}
+
+	// A title is decoration, so a failed lookup costs the titles and nothing
+	// else: the verdicts and the exit code are already settled above.
+	if err := fillTitles(out); err != nil {
+		fmt.Fprintf(os.Stderr, "could not look up titles of unlabelled originals: %v\n", err)
+	}
+
+	if cfg.asJSON {
+		blob, err := json.MarshalIndent(out, "", "  ")
+		if err != nil {
+			fmt.Fprintf(os.Stderr, "%v\n", err)
+			return 2
+		}
+		fmt.Println(string(blob))
+	} else {
+		for _, branch := range cfg.branches {
+			cfg.report(branch, out[branch])
+		}
+		fmt.Println()
+	}
+
+	if clean {
+		return 0
+	}
+	return 1
+}
+
+func parseArgs(args []string) (*config, int, bool) {
+	cfg := &config{remote: "origin", limit: 1000, fetch: true, useColor: true}
+	for i := 0; i < len(args); i++ {
+		a := args[i]
+		next := func() (string, bool) {
+			if i+1 >= len(args) {
+				fmt.Fprintf(os.Stderr, "%s requires a value\n", a)
+				return "", false
+			}
+			i++
+			return args[i], true
+		}
+		switch a {
+		case "-h", "--help":
+			fmt.Print(usageText)
+			return nil, 0, true
+		case "--remote":
+			v, ok := next()
+			if !ok {
+				return nil, 2, true
+			}
+			cfg.remote = v
+		case "--limit":
+			v, ok := next()
+			if !ok {
+				return nil, 2, true
+			}
+			n, err := strconv.Atoi(v)
+			if err != nil || n <= 0 {
+				fmt.Fprintf(os.Stderr, "invalid --limit value: %s\n", v)
+				return nil, 2, true
+			}
+			cfg.limit = n
+		case "--no-fetch":
+			cfg.fetch = false
+		case "--json":
+			cfg.asJSON = true
+		case "--no-color":
+			cfg.useColor = false
+		default:
+			if strings.HasPrefix(a, "-") {
+				fmt.Fprintf(os.Stderr, "Unknown argument: %s\n", a)
+				fmt.Fprint(os.Stderr, usageText)
+				return nil, 2, true
+			}
+			cfg.branches = append(cfg.branches, a)
+		}
+	}
+
+	// Color is for a human reading a terminal; --json and pipes get none.
+	if cfg.asJSON {
+		cfg.useColor = false
+	}
+	if fi, err := os.Stdout.Stat(); err != nil || fi.Mode()&os.ModeCharDevice == 0 {
+		cfg.useColor = false
+	}
+	cfg.setColors()
+	return cfg, 0, false
+}
+
+func (cfg *config) setColors() {
+	if cfg.useColor {
+		cfg.red = "\033[0;31m"
+		cfg.green = "\033[0;32m"
+		cfg.yellow = "\033[1;33m"
+		cfg.cyan = "\033[0;36m"
+		cfg.dim = "\033[2m"
+		cfg.bold = "\033[1m"
+		cfg.reset = "\033[0m"
+	}
+}
+
+// colorFor is the accent a status is reported in.
+func (cfg *config) colorFor(status string) string {
+	switch status {
+	case statusMissing, statusPartial, statusUnverified:
+		return cfg.red
+	case statusPending:
+		return cfg.yellow
+	case statusDropped:
+		return cfg.cyan
+	case statusConfirmed, statusBackported, statusInBranch:
+		return cfg.green
+	}
+	return ""
+}
+
+func capture(name string, args ...string) (string, error) {
+	out, err := exec.Command(name, args...).Output()
+	if err != nil {
+		if ee, ok := err.(*exec.ExitError); ok && len(ee.Stderr) > 0 {
+			return "", fmt.Errorf("%s %s: %w: %s", name, strings.Join(args, " "), err, strings.TrimSpace(string(ee.Stderr)))
+		}
+		return "", fmt.Errorf("%s %s: %w", name, strings.Join(args, " "), err)
+	}
+	return string(out), nil
+}
+
+// git runs a git command whose failure means the audit cannot be trusted.
+func git(args ...string) (string, error) { return capture("git", args...) }
+
+func gitOK(args ...string) bool {
+	return exec.Command("git", args...).Run() == nil
+}
+
+// truncated turns a saturated `gh ... --limit N` query into an error instead of
+// a quietly shorter answer.
+//
+// Every list this tool makes is a completeness claim -- these are all the
+// candidates, this is every backport PR on the branch -- and gh stops at
+// --limit without saying so. A saturated query therefore does not make the
+// audit partial, it makes its verdicts wrong: the PRs past the cut are
+// reported nowhere, and the exit code says clean. That is the same failure
+// class the tool exists to catch, so it fails loudly instead.
+func truncated(got, limit int, what, remedy string) error {
+	if got < limit {
+		return nil
+	}
+	return fmt.Errorf("%s hit its cap of %d results, so the list is truncated and the audit would be unsound: %s", what, limit, remedy)
+}
+
+func ghJSON(target any, args ...string) error {
+	out, err := capture("gh", args...)
+	if err != nil {
+		return err
+	}
+	return json.Unmarshal([]byte(out), target)
+}
+
+// releaseLines returns the two-component release branches on the remote,
+// oldest first. release-1.6.0-rc.1 and the like are staging branches, not
+// maintenance lines, so they are excluded.
+func releaseLines(remote string) ([]line, error) {
+	out, err := git("branch", "-r", "--list", remote+"/release-*")
+	if err != nil {
+		return nil, err
+	}
+	seen := map[line]bool{}
+	for raw := range strings.SplitSeq(out, "\n") {
+		name := strings.TrimPrefix(strings.TrimSpace(raw), remote+"/")
+		if m := releaseLineRE.FindStringSubmatch(name); m != nil {
+			major, _ := strconv.Atoi(m[1])
+			minor, _ := strconv.Atoi(m[2])
+			seen[line{major, minor}] = true
+		}
+	}
+	lines := make([]line, 0, len(seen))
+	for l := range seen {
+		lines = append(lines, l)
+	}
+	sort.Slice(lines, func(i, j int) bool { return lines[i].less(lines[j]) })
+	return lines, nil
+}
+
+type lineOpen struct {
+	line line
+	when time.Time
+}
+
+// Stable publication dates cover lines opened before the freeze contract;
+// tagged-commit dates estimate openings since then. Both eras are needed when
+// resolving a historical backport label against the lines available at merge.
+func lineOpenDates() ([]lineOpen, error) {
+	var releases []struct {
+		TagName      string    `json:"tagName"`
+		PublishedAt  time.Time `json:"publishedAt"`
+		IsPrerelease bool      `json:"isPrerelease"`
+		IsDraft      bool      `json:"isDraft"`
+	}
+	if err := ghJSON(&releases, "release", "list", "--limit", strconv.Itoa(releaseListCap),
+		"--json", "tagName,publishedAt,isPrerelease,isDraft"); err != nil {
+		return nil, err
+	}
+	if err := truncated(len(releases), releaseListCap, "the release listing",
+		"raise releaseListCap in cmd/backport-audit"); err != nil {
+		return nil, err
+	}
+
+	earliest := map[line]time.Time{}
+	for _, rel := range releases {
+		if rel.IsPrerelease || rel.IsDraft {
+			continue
+		}
+		m := releaseTagRE.FindStringSubmatch(rel.TagName)
+		if m == nil {
+			continue
+		}
+		major, _ := strconv.Atoi(m[1])
+		minor, _ := strconv.Atoi(m[2])
+		l := line{major, minor}
+		if prev, ok := earliest[l]; !ok || rel.PublishedAt.Before(prev) {
+			earliest[l] = rel.PublishedAt
+		}
+	}
+
+	frozen, err := freezeDates()
+	if err != nil {
+		return nil, err
+	}
+	for l, when := range frozen {
+		earliest[l] = when
+	}
+
+	opened := make([]lineOpen, 0, len(earliest))
+	for l, when := range earliest {
+		opened = append(opened, lineOpen{l, when})
+	}
+	sort.Slice(opened, func(i, j int) bool { return opened[i].when.Before(opened[j].when) })
+	return opened, nil
+}
+
+// freezeDates estimates line opening from the earliest vX.Y.0-rc.N tagged
+// commit at or after the freeze-contract cutover. Earlier tags are ignored;
+// lines with no remaining tag use the published-stable date in lineOpenDates.
+// The tagged commit can predate the branch push; see the README's limits.
+func freezeDates() (map[line]time.Time, error) {
+	out, err := git("for-each-ref", "--format=%(refname:strip=2) %(committerdate:iso-strict)", "refs/tags/v*")
+	if err != nil {
+		return nil, err
+	}
+	return parseFreezeDates(out)
+}
+
+// parseFreezeDates is the half of freezeDates that does not need a repository:
+// `<tag> <iso-8601 date>` per line, in, freeze moments out.
+func parseFreezeDates(out string) (map[line]time.Time, error) {
+	frozen := map[line]time.Time{}
+	for raw := range strings.SplitSeq(out, "\n") {
+		name, date, ok := strings.Cut(strings.TrimSpace(raw), " ")
+		if !ok {
+			continue
+		}
+		m := freezeTagRE.FindStringSubmatch(name)
+		if m == nil {
+			continue
+		}
+		when, err := time.Parse(time.RFC3339, date)
+		if err != nil {
+			return nil, fmt.Errorf("tag %s: unparseable date %q: %w", name, date, err)
+		}
+		if when.Before(freezeContractLandedAt) {
+			continue
+		}
+		major, _ := strconv.Atoi(m[1])
+		minor, _ := strconv.Atoi(m[2])
+		l := line{major, minor}
+		if prev, ok := frozen[l]; !ok || when.Before(prev) {
+			frozen[l] = when
+		}
+	}
+	return frozen, nil
+}
+
+// targetsAt reports the current and previous release lines as of when, which is
+// what the `kind/backport` and `kind/backport-previous` labels meant at that
+// moment.
+//
+// The lines that exist at that point are ranked by version, not by when they
+// opened, matching the numeric descending sort backport.yaml applies to its
+// branch list. The two orders normally coincide, and stop coinciding as soon
+// as a freeze overlaps the previous line's stabilisation: cut vX.(Y+1).0-rc.1
+// while vX.Y.0 is still unpublished and the newer line opens first in time
+// while still being the newer line. Ranking by version is also what keeps
+// release-1.10 above release-1.9.
+func targetsAt(opened []lineOpen, when time.Time) (current, previous *line) {
+	var live []line
+	for _, o := range opened {
+		if !o.when.After(when) {
+			live = append(live, o.line)
+		}
+	}
+	sort.Slice(live, func(i, j int) bool { return live[j].less(live[i]) })
+	if n := len(live); n > 0 {
+		current = &live[0]
+		if n > 1 {
+			previous = &live[1]
+		}
+	}
+	return current, previous
+}
+
+// candidates returns the merged-to-main PRs carrying a backport label, keyed by
+// PR number so a PR matched under two spellings of the same request, or under
+// both requests, is one entry carrying both canonical names.
+func candidates(limit int) (map[int]*mainPR, error) {
+	found := map[int]*mainPR{}
+	for _, req := range backportLabels {
+		for _, spelling := range req.spellings {
+			var prs []mainPR
+			if err := ghJSON(&prs, "pr", "list", "--base", "main", "--state", "merged",
+				"--label", spelling, "--limit", strconv.Itoa(limit),
+				"--json", "number,title,url,mergedAt,mergeCommit,labels,author"); err != nil {
+				return nil, err
+			}
+			ceiling, remedy := candidateCeiling(limit)
+			if err := truncated(len(prs), ceiling, "the merged-PR query for label "+spelling, remedy); err != nil {
+				return nil, err
+			}
+			for i := range prs {
+				pr := prs[i]
+				existing, ok := found[pr.Number]
+				if !ok {
+					pr.labels = map[string]bool{}
+					found[pr.Number] = &pr
+					existing = &pr
+				}
+				existing.labels[req.canonical] = true
+			}
+		}
+	}
+	return found, nil
+}
+
+type branchHistory struct {
+	branch  string
+	ref     string
+	commits map[string]bool
+	// Only commits outside main supply subject and -x evidence. Shared
+	// ancestors can have the same subject without carrying the backport.
+	subjects map[string][]string
+	refs     map[string][]string
+}
+
+func newBranchHistory(remote, branch string) (*branchHistory, error) {
+	h := &branchHistory{
+		branch:   branch,
+		ref:      remote + "/" + branch,
+		commits:  map[string]bool{},
+		subjects: map[string][]string{},
+		refs:     map[string][]string{},
+	}
+	out, err := git("rev-list", h.ref)
+	if err != nil {
+		return nil, err
+	}
+	for oid := range strings.FieldsSeq(out) {
+		h.commits[oid] = true
+	}
+	out, err = git("log", "--format=%x00%H%x01%s%x01%b", h.ref, "--not", remote+"/main")
+	if err != nil {
+		return nil, err
+	}
+	for entry := range strings.SplitSeq(out, "\x00") {
+		if strings.TrimSpace(entry) == "" {
+			continue
+		}
+		parts := strings.SplitN(entry, "\x01", 3)
+		for len(parts) < 3 {
+			parts = append(parts, "")
+		}
+		oid, subject := strings.TrimSpace(parts[0]), strings.TrimSpace(parts[1])
+		h.subjects[subject] = append(h.subjects[subject], oid)
+		for _, m := range cherryPickRE.FindAllStringSubmatch(parts[2], -1) {
+			h.refs[oid] = append(h.refs[oid], m[1])
+		}
+	}
+	return h, nil
+}
+
+func (h *branchHistory) hasSubject(subject string) bool {
+	return len(h.subjects[strings.TrimSpace(subject)]) > 0
+}
+
+func (h *branchHistory) contains(commit string) bool {
+	return commit != "" && h.commits[commit]
+}
+
+// sameCommit reports whether two object names can be the same commit: an -x
+// reference may abbreviate, so either may be a prefix of the other.
+func sameCommit(a, b string) bool {
+	return a != "" && b != "" && (strings.HasPrefix(a, b) || strings.HasPrefix(b, a))
+}
+
+// missingFrom returns the commits of the PR merged as mergeCommit that the
+// branch does not carry. A commit is carried when it is on the branch itself,
+// when a branch commit's -x reference names it, or when a branch commit with
+// its subject is left over for it.
+//
+// Subjects are spent one to one: two commits both called "fix tests" need two
+// branch commits of that name, not the one they share. One of the PR's own
+// commits on the branch is spent on itself, and a branch commit whose -x
+// reference names anything but the PR's merge commit -- one of the PR's
+// commits included -- is evidence only through that reference: it has said
+// what it is a copy of.
+func (h *branchHistory) missingFrom(commits []prCommit, mergeCommit string) []prCommit {
+	spent := map[string]bool{}
+	carried := make([]bool, len(commits))
+	for i, c := range commits {
+		if h.contains(c.Oid) {
+			carried[i], spent[c.Oid] = true, true
+		}
+		for _, refs := range h.refs {
+			for _, r := range refs {
+				if sameCommit(c.Oid, r) {
+					carried[i] = true
+				}
+			}
+		}
+	}
+	var missing []prCommit
+	for i, c := range commits {
+		for _, b := range h.subjects[strings.TrimSpace(c.Subject)] {
+			if carried[i] {
+				break
+			}
+			if !spent[b] && h.namesOnly(b, mergeCommit) {
+				carried[i], spent[b] = true, true
+			}
+		}
+		if !carried[i] {
+			missing = append(missing, c)
+		}
+	}
+	return missing
+}
+
+// namesOnly reports whether every -x reference branch commit b carries, if it
+// carries any, names commit.
+func (h *branchHistory) namesOnly(b, commit string) bool {
+	for _, r := range h.refs[b] {
+		if !sameCommit(r, commit) {
+			return false
+		}
+	}
+	return true
+}
+
+// backportPRsFor indexes every PR on branch by the main PRs it claims to
+// backport; see claimedOrigins.
+func backportPRsFor(branch string) (map[int][]backportPR, error) {
+	var prs []backportPR
+	if err := ghJSON(&prs, "pr", "list", "--base", branch, "--state", "all", "--limit", strconv.Itoa(branchPRCap),
+		"--json", "number,title,url,state,headRefName,body,isDraft,comments"); err != nil {
+		return nil, err
+	}
+	if err := truncated(len(prs), branchPRCap, "the PR listing for "+branch,
+		"raise branchPRCap in cmd/backport-audit"); err != nil {
+		return nil, err
+	}
+	return indexByOrigin(prs, branch), nil
+}
+
+func indexByOrigin(prs []backportPR, branch string) map[int][]backportPR {
+	index := map[int][]backportPR{}
+	for _, pr := range prs {
+		for _, n := range claimedOrigins(pr, branch) {
+			index[n] = append(index[n], pr)
+		}
+	}
+	return index
+}
+
+// claimedOrigins reads the main PRs a PR on branch says it backports: the one
+// in the bot's head branch name, and every one in the body's "Backport of"
+// phrases, which is what a hand-written backport carries. Hand backports often
+// reuse the bot's head naming, so the two usually agree and are counted once.
+func claimedOrigins(pr backportPR, branch string) []int {
+	var origins []int
+	if m := backportHeadRE.FindStringSubmatch(pr.HeadRefName); m != nil && m[2] == branch {
+		n, _ := strconv.Atoi(m[1])
+		origins = append(origins, n)
+	}
+	for _, n := range bodyOrigins(pr.Body, repoOf(pr.URL)) {
+		if !slices.Contains(origins, n) {
+			origins = append(origins, n)
+		}
+	}
+	return origins
+}
+
+// bodyOrigins returns the PR numbers named in a body's "Backport of" phrases, in
+// order of appearance and without repeats.
+//
+// A reference qualified with any repository but repo is skipped rather than
+// read as a local number: "other/repo#20" linked as #20 would let an unrelated
+// backport vouch for whatever local PR happens to carry that number, and a
+// merged one would turn its MISSING verdict into backported.
+func bodyOrigins(body, repo string) []int {
+	var origins []int
+	for _, m := range backportOfRE.FindAllStringSubmatchIndex(body, -1) {
+		for g := 1; 2*g+1 < len(m); g++ {
+			start, end := m[2*g], m[2*g+1]
+			if start < 0 {
+				continue
+			}
+			refs := prRefRE.FindAllStringSubmatch(body[start:end], -1)
+			if !prRefListEndRE.MatchString(body[end:]) {
+				refs = refs[:1]
+			}
+			for _, ref := range refs {
+				if ref[1] != "" && !strings.EqualFold(ref[1], repo) {
+					continue
+				}
+				n, _ := strconv.Atoi(ref[2])
+				if !slices.Contains(origins, n) {
+					origins = append(origins, n)
+				}
+			}
+		}
+	}
+	return origins
+}
+
+// repoOf is the owner/name of the repository a PR URL, as gh prints it, points
+// into.
+func repoOf(prURL string) string {
+	i := strings.LastIndex(prURL, "/pull/")
+	if i < 0 {
+		return upstreamRepo
+	}
+	parts := strings.Split(prURL[:i], "/")
+	if len(parts) < 2 {
+		return upstreamRepo
+	}
+	return parts[len(parts)-2] + "/" + parts[len(parts)-1]
+}
+
+// botAuthor reports whether a comment was written by automation rather than by
+// a person: the backport bot, a review bot, a dependency bot. gh reports some
+// of them without the "[bot]" suffix a GitHub App login otherwise carries, so
+// those are named.
+func botAuthor(login string) bool {
+	l := strings.ToLower(login)
+	if strings.HasSuffix(l, "[bot]") {
+		return true
+	}
+	switch l {
+	case "github-actions", "coderabbitai", "dependabot", "renovate", "copilot",
+		"copilot-pull-request-reviewer", "dosubot", "gemini-code-assist":
+		return true
+	}
+	return false
+}
+
+// lastHumanComment is the last comment on a PR not written by the backport bot.
+func lastHumanComment(pr backportPR) string {
+	for i := len(pr.Comments) - 1; i >= 0; i-- {
+		login := pr.Comments[i].Author.Login
+		if botAuthor(login) {
+			continue
+		}
+		text := strings.Join(strings.Fields(pr.Comments[i].Body), " ")
+		if text == "" {
+			continue
+		}
+		if len(text) > 200 {
+			text = text[:200]
+		}
+		return login + ": " + text
+	}
+	return "no reason recorded"
+}
+
+// confirmMarker is what a maintainer posts, as the whole of a comment on a
+// merged backport PR, to attest that it carries the whole original although
+// the audit cannot show that commit by commit, as with a backport squashed into
+// one commit. The audit never infers it.
+const confirmMarker = "backport-audit: complete"
+
+// confirmation is that attestation: who wrote it, where, on which backport PR.
+type confirmation struct {
+	By         string `json:"by"`
+	URL        string `json:"url"`
+	BackportPR int    `json:"backport_pr"`
+}
+
+// confirmedBy returns the first attestation among prs, or nil. Only a backport
+// PR that merged counts, since an open or closed one put nothing on the branch
+// to vouch for, and only a comment by someone with a hand in the repository:
+// its owner, a member of its organisation or a collaborator. A review bot
+// quoting the marker, or a drive-by contributor, confirms nothing.
+func confirmedBy(prs []backportPR) *confirmation {
+	for _, b := range prs {
+		if b.State != "MERGED" {
+			continue
+		}
+		for _, c := range b.Comments {
+			if !botAuthor(c.Author.Login) && maintains(c.AuthorAssociation) && markerComment(c.Body) {
+				return &confirmation{By: c.Author.Login, URL: c.URL, BackportPR: b.Number}
+			}
+		}
+	}
+	return nil
+}
+
+// markerComment reports whether body is the marker and nothing else: only blank
+// lines before it, only whitespace after it, and nothing before it on its own
+// line. A comment that holds anything more -- a sentence mentioning it ("do not
+// post backport-audit: complete yet"), a quote, a code block -- is talk about
+// attesting, not an attestation, and no reading of markdown is needed to tell
+// the two apart. Leading spaces or a tab on the marker's line are rejected
+// rather than trimmed, since enough of them turn the line into code.
+func markerComment(body string) bool {
+	before, found := strings.CutSuffix(strings.TrimRight(body, " \t\r\n"), confirmMarker)
+	return found && strings.Trim(before, "\r\n") == ""
+}
+
+// maintains reports whether a comment's GitHub author association is one that
+// may vouch for a backport.
+func maintains(association string) bool {
+	switch association {
+	case "OWNER", "MEMBER", "COLLABORATOR":
+		return true
+	}
+	return false
+}
+
+// commitSource lists the commits a PR contributed: gitSource in the audit,
+// fixtures in tests.
+type commitSource interface {
+	// commits lists, oldest first, the commits a PR contributed that a
+	// backport has to carry. A read that fails is an error, never an empty
+	// list, since a verdict built on it would be a guess.
+	commits(mergeCommit string) ([]prCommit, error)
+}
+
+// gitSource reads commits through run, which is git in the audit.
+type gitSource struct {
+	run func(args ...string) (string, error)
+}
+
+// commits reads the PR's side of its merge. main takes PRs as merge commits, so
+// that is ^1..^2; a squashed or rebased merge has a single parent, and then the
+// commit itself is the change.
+//
+// Merge commits and commits that change nothing are left out: the backport bot
+// drops both (merge_commits: skip, and an empty cherry-pick has nothing to
+// apply), so a backport without them is complete, and a "re-trigger CI" commit
+// must not make one look partial.
+func (g gitSource) commits(mergeCommit string) ([]prCommit, error) {
+	if mergeCommit == "" {
+		return nil, errors.New("no merge commit recorded")
+	}
+	parents, err := g.run("rev-list", "--parents", "-n", "1", mergeCommit)
+	if err != nil {
+		return nil, err
+	}
+	var rng string
+	switch f := strings.Fields(parents); len(f) {
+	case 2:
+		rng = mergeCommit + "^.." + mergeCommit
+	case 3:
+		rng = mergeCommit + "^1.." + mergeCommit + "^2"
+	default:
+		return nil, fmt.Errorf("merge commit %s has %d parents", mergeCommit, len(f)-1)
+	}
+	out, err := g.run("log", "--reverse", "--no-merges", "--name-only", "--format=%x00%H%x01%s", rng)
+	if err != nil {
+		return nil, err
+	}
+	return parsePRCommits(out), nil
+}
+
+// parsePRCommits is the half of gitSource.commits that does not need a
+// repository: `git log --name-only` output in, the commits that touched a file
+// out.
+func parsePRCommits(out string) []prCommit {
+	var commits []prCommit
+	for entry := range strings.SplitSeq(out, "\x00") {
+		head, files, _ := strings.Cut(entry, "\n")
+		oid, subject, ok := strings.Cut(head, "\x01")
+		if !ok || strings.TrimSpace(files) == "" {
+			continue
+		}
+		commits = append(commits, prCommit{Oid: oid, Subject: subject})
+	}
+	return commits
+}
+
+// candidateLabel is the backport request under which pr is a candidate for the
+// line want, or "" when it is not one.
+//
+// The request is read against the lines as they stood when the PR merged, even
+// for a label added later: nothing the audit lists records when a label was
+// added. backport.yaml, which runs again when a label is added, resolves its
+// targets at that moment instead, so the two disagree for a label added after
+// the line moved on.
+func candidateLabel(pr *mainPR, opened []lineOpen, want line) string {
+	current, previous := targetsAt(opened, pr.MergedAt)
+	switch {
+	case pr.labels[labelCurrent] && current != nil && *current == want:
+		return labelCurrent
+	case pr.labels[labelPrevious] && previous != nil && *previous == want:
+		return labelPrevious
+	}
+	return ""
+}
+
+func (cfg *config) audit(branch string, cands map[int]*mainPR, opened []lineOpen) (*branchReport, error) {
+	hist, err := newBranchHistory(cfg.remote, branch)
+	if err != nil {
+		return nil, err
+	}
+	backports, err := backportPRsFor(branch)
+	if err != nil {
+		return nil, err
+	}
+
+	m := releaseLineRE.FindStringSubmatch(branch)
+	major, _ := strconv.Atoi(m[1])
+	minor, _ := strconv.Atoi(m[2])
+	want := line{major, minor}
+
+	numbers := make([]int, 0, len(cands))
+	for n := range cands {
+		numbers = append(numbers, n)
+	}
+	sort.Ints(numbers)
+
+	results := []verdict{}
+	audited := map[int]string{}
+	for _, n := range numbers {
+		pr := cands[n]
+		label := candidateLabel(pr, opened, want)
+		if label == "" {
+			continue
+		}
+		audited[n] = label
+		v, err := classify(pr, label, hist, backports[pr.Number], gitSource{run: git})
+		if err != nil {
+			return nil, err
+		}
+		results = append(results, v)
+	}
+	unlabelled, duplicates := crossCheck(backports, audited, cands)
+	return &branchReport{Candidates: results, Unlabelled: unlabelled, Duplicates: duplicates}, nil
+}
+
+// crossCheck reads the backport PRs on a branch from the side of the originals
+// they claim, which is the only side an unlabelled backport can be seen from.
+// audited maps each candidate for the branch to the request it was audited
+// under; cands supplies the title and labels of any original that carries a
+// backport label at all.
+func crossCheck(index map[int][]backportPR, audited map[int]string, cands map[int]*mainPR) ([]unlabelledBackport, []duplicateBackport) {
+	numbers := make([]int, 0, len(index))
+	for n := range index {
+		numbers = append(numbers, n)
+	}
+	sort.Ints(numbers)
+
+	unlabelled := []unlabelledBackport{}
+	duplicates := []duplicateBackport{}
+	for _, n := range numbers {
+		claims := index[n]
+		linked := make([]linkedPR, 0, len(claims))
+		for _, b := range claims {
+			linked = append(linked, trimPR(b))
+		}
+		sort.Slice(linked, func(i, j int) bool { return linked[i].Number < linked[j].Number })
+
+		// The URL is derived rather than looked up, so it is there even when the
+		// title lookup fails; GitHub redirects /pull/N to the issue when N is one.
+		title, url, labels := "", originURL(claims[0].URL, n), []string{}
+		if pr, ok := cands[n]; ok {
+			title, url = pr.Title, pr.URL
+			for _, req := range backportLabels {
+				if pr.labels[req.canonical] {
+					labels = append(labels, req.canonical)
+				}
+			}
+		}
+
+		label, isCandidate := audited[n]
+		if !isCandidate {
+			unlabelled = append(unlabelled, unlabelledBackport{
+				Number: n, Title: title, URL: url, Labels: labels, BackportPRs: linked, Confirmation: confirmedBy(claims),
+			})
+		}
+		if kind := duplicateKind(claims); kind != "" {
+			duplicates = append(duplicates, duplicateBackport{
+				Number: n, Title: title, URL: url, Label: label, Kind: kind, BackportPRs: linked,
+			})
+		}
+	}
+	return unlabelled, duplicates
+}
+
+// duplicateKind classifies the backport PRs claiming one original, returning
+// "" unless more than one of them is live. A closed PR next to an open one is
+// the normal shape of a conflicting bot backport redone by hand, and two merged
+// ones are history the branch already carries, so neither is flagged.
+func duplicateKind(claims []backportPR) string {
+	open, merged := 0, 0
+	for _, b := range claims {
+		switch b.State {
+		case "OPEN":
+			open++
+		case "MERGED":
+			merged++
+		}
+	}
+	switch {
+	case open > 0 && merged > 0:
+		return dupOpenAfterMerge
+	case open > 1:
+		return dupOpenTwice
+	}
+	return ""
+}
+
+// originURL is the URL of PR n in the repository that sibling, the URL of
+// another PR, belongs to.
+func originURL(sibling string, n int) string {
+	i := strings.LastIndex(sibling, "/pull/")
+	if i < 0 {
+		return ""
+	}
+	return sibling[:i] + "/pull/" + strconv.Itoa(n)
+}
+
+// fillTitles sets the title of every unlabelled or duplicate original that no
+// listing carried, with one request covering every branch.
+func fillTitles(out map[string]*branchReport) error {
+	var missing []int
+	for _, rep := range out {
+		for _, u := range rep.Unlabelled {
+			if u.Title == "" && !slices.Contains(missing, u.Number) {
+				missing = append(missing, u.Number)
+			}
+		}
+		for _, d := range rep.Duplicates {
+			if d.Title == "" && !slices.Contains(missing, d.Number) {
+				missing = append(missing, d.Number)
+			}
+		}
+	}
+	if len(missing) == 0 {
+		return nil
+	}
+	sort.Ints(missing)
+	titles, err := titlesOf(missing)
+	for _, rep := range out {
+		for i := range rep.Unlabelled {
+			if t, ok := titles[rep.Unlabelled[i].Number]; ok && rep.Unlabelled[i].Title == "" {
+				rep.Unlabelled[i].Title = t
+			}
+		}
+		for i := range rep.Duplicates {
+			if t, ok := titles[rep.Duplicates[i].Number]; ok && rep.Duplicates[i].Title == "" {
+				rep.Duplicates[i].Title = t
+			}
+		}
+	}
+	return err
+}
+
+// titlesOf fetches the titles of the given issue or PR numbers in a single
+// GraphQL request, one alias per number, rather than one gh call each.
+//
+// gh exits non-zero when any one number fails to resolve -- a reference to a
+// deleted PR, say -- but still prints the partial response, so stdout is read
+// whatever the exit status and every title that did resolve is kept.
+func titlesOf(numbers []int) (map[int]string, error) {
+	var q strings.Builder
+	q.WriteString("query($owner:String!,$name:String!){repository(owner:$owner,name:$name){")
+	for _, n := range numbers {
+		fmt.Fprintf(&q, "n%d:issueOrPullRequest(number:%d){...on PullRequest{title} ...on Issue{title}}", n, n)
+	}
+	q.WriteString("}}")
+
+	stdout, runErr := exec.Command("gh", "api", "graphql",
+		"-F", "owner={owner}", "-F", "name={repo}", "-f", "query="+q.String()).Output()
+	if ee, ok := runErr.(*exec.ExitError); ok && len(ee.Stderr) > 0 {
+		runErr = fmt.Errorf("gh api graphql: %w: %s", runErr, strings.TrimSpace(string(ee.Stderr)))
+	}
+	var resp struct {
+		Data struct {
+			Repository map[string]*struct {
+				Title string `json:"title"`
+			} `json:"repository"`
+		} `json:"data"`
+	}
+	if err := json.Unmarshal(stdout, &resp); err != nil {
+		if runErr != nil {
+			return nil, runErr
+		}
+		return nil, err
+	}
+	titles := map[int]string{}
+	for alias, node := range resp.Data.Repository {
+		if n, err := strconv.Atoi(strings.TrimPrefix(alias, "n")); err == nil && node != nil {
+			titles[n] = node.Title
+		}
+	}
+	if runErr != nil && len(titles) < len(numbers) {
+		return titles, fmt.Errorf("%d of %d did not resolve: %w", len(numbers)-len(titles), len(numbers), runErr)
+	}
+	return titles, nil
+}
+
+// A merged conflict draft can carry only a prefix of the original commits,
+// so a merged backport alone settles only a single-commit original. Partial
+// delivery still needs the missing commits or a maintainer's attestation.
+func classify(pr *mainPR, label string, hist *branchHistory, linked []backportPR, src commitSource) (verdict, error) {
+	v := verdict{
+		Number:      pr.Number,
+		Title:       pr.Title,
+		URL:         pr.URL,
+		Author:      pr.Author.Login,
+		MergedAt:    pr.MergedAt.Format(time.RFC3339),
+		Label:       label,
+		BackportPRs: []linkedPR{},
+	}
+	for _, b := range linked {
+		v.BackportPRs = append(v.BackportPRs, trimPR(b))
+	}
+
+	mergeCommit := pr.MergeCommit.Oid
+	if hist.contains(mergeCommit) {
+		v.Status, v.Evidence = statusInBranch, "merged before branch cut"
+		return v, nil
+	}
+
+	var merged, open *backportPR
+	for i := range linked {
+		switch b := &linked[i]; {
+		case b.State == "MERGED" && merged == nil:
+			merged = b
+		case b.State == "OPEN" && open == nil:
+			open = b
+		}
+	}
+	openNote := ""
+	if open != nil {
+		openNote = fmt.Sprintf("backport PR #%d open", open.Number)
+		if open.IsDraft {
+			openNote += " (draft/conflict)"
+		}
+	}
+	prMerged := ""
+	switch {
+	case merged != nil:
+		prMerged = fmt.Sprintf("backport PR #%d merged", merged.Number)
+	case hist.hasSubject(fmt.Sprintf("[Backport %s] %s", hist.branch, pr.Title)):
+		prMerged = "bot merge commit on branch"
+	}
+
+	commits, err := src.commits(mergeCommit)
+	if err != nil {
+		return verdict{}, fmt.Errorf("reading the commits of #%d: %w", pr.Number, err)
+	}
+	missing := hist.missingFrom(commits, mergeCommit)
+	evidence := fmt.Sprintf("%d of %s on branch", len(commits)-len(missing), commitCount(len(commits)))
+	if prMerged != "" {
+		evidence = prMerged + ", " + evidence
+	}
+
+	switch {
+	case len(commits) > 0 && len(missing) == 0:
+		v.Status, v.Evidence = statusBackported, evidence
+		return v, nil
+	case len(commits) <= 1 && prMerged != "":
+		v.Status, v.Evidence = statusBackported, prMerged
+		if len(commits) == 1 {
+			v.Evidence = evidence
+		}
+		return v, nil
+	case len(missing) < len(commits): // some carried, not all
+		v.Status, v.Evidence, v.MissingCommits = statusPartial, evidence, missing
+	case prMerged != "":
+		v.Status, v.Evidence, v.MissingCommits = statusUnverified, evidence, missing
+	case open != nil:
+		v.Status, v.Evidence = statusPending, openNote
+		return v, nil
+	default:
+		for _, b := range linked {
+			if b.State == "CLOSED" {
+				// A closed backport is usually a deliberate "not needed on this
+				// line". Carry the reason someone left, so the next release does
+				// not re-open the same investigation from scratch.
+				v.Status = statusDropped
+				v.Evidence = fmt.Sprintf("backport PR #%d closed unmerged", b.Number)
+				v.Reason = lastHumanComment(b)
+				return v, nil
+			}
+		}
+		v.Status, v.Evidence = statusMissing, "no backport PR, nothing on branch"
+		return v, nil
+	}
+
+	// Partial or unverified from here on.
+	if openNote != "" {
+		v.Evidence += "; " + openNote
+	}
+	if c := confirmedBy(linked); c != nil {
+		v.Status, v.Confirmation = statusConfirmed, c
+		v.Evidence = fmt.Sprintf("confirmed by @%s on backport PR #%d; %s", c.By, c.BackportPR, v.Evidence)
+	}
+	return v, nil
+}
+
+func commitCount(n int) string {
+	if n == 1 {
+		return "1 commit"
+	}
+	return fmt.Sprintf("%d commits", n)
+}
+
+func (cfg *config) report(branch string, rep *branchReport) {
+	results := rep.Candidates
+	byStatus := map[string][]verdict{}
+	for _, r := range results {
+		byStatus[r.Status] = append(byStatus[r.Status], r)
+	}
+
+	var counts []string
+	for _, s := range statusOrder {
+		if n := len(byStatus[s]); n > 0 {
+			counts = append(counts, fmt.Sprintf("%s%s=%d%s", cfg.colorFor(s), s, n, cfg.reset))
+		}
+	}
+	summary := strings.Join(counts, " ")
+	if summary == "" {
+		summary = "no candidates"
+	}
+	var others []string
+	if n := len(rep.Duplicates); n > 0 {
+		others = append(others, fmt.Sprintf("%sDUPLICATE=%d%s", cfg.red, n, cfg.reset))
+	}
+	if n := len(rep.Unlabelled); n > 0 {
+		others = append(others, fmt.Sprintf("unlabelled=%d", n))
+	}
+	if len(others) > 0 {
+		summary += " | " + strings.Join(others, " ")
+	}
+	fmt.Printf("\n%s=== %s ===%s %d candidate PRs: %s\n",
+		cfg.bold, branch, cfg.reset, len(results), summary)
+
+	for _, status := range outstanding {
+		rows := byStatus[status]
+		if len(rows) == 0 {
+			continue
+		}
+		accent := cfg.colorFor(status)
+		fmt.Printf("\n  %s%s%s (%d):\n", accent, headings[status], cfg.reset, len(rows))
+		for _, r := range rows {
+			cfg.printVerdict(accent, r)
+		}
+	}
+
+	if len(rep.Duplicates) > 0 {
+		fmt.Printf("\n  %sDUPLICATE -- one original, more than one live backport PR%s (%d):\n",
+			cfg.red, cfg.reset, len(rep.Duplicates))
+		for _, d := range rep.Duplicates {
+			label := d.Label
+			if label == "" {
+				label = "none for this line"
+			}
+			cfg.printOrigin(cfg.red, d.URL, d.Number, d.Title)
+			fmt.Printf("      %slabel=%s -- %s%s\n", cfg.dim, label, dupDescriptions[d.Kind], cfg.reset)
+			cfg.printBackportPRs(d.BackportPRs)
+		}
+	}
+
+	if rep.clean() {
+		fmt.Printf("  %snothing outstanding: every candidate is on this branch%s\n", cfg.green, cfg.reset)
+	}
+
+	if rows := byStatus[statusConfirmed]; len(rows) > 0 {
+		fmt.Printf("\n  %sCONFIRMED -- attested complete by a person where the commits fall short%s (%d, informational):\n",
+			cfg.green, cfg.reset, len(rows))
+		for _, r := range rows {
+			cfg.printVerdict(cfg.green, r)
+			fmt.Printf("      %sconfirmation: %s%s\n", cfg.dim, r.Confirmation.URL, cfg.reset)
+		}
+	}
+
+	if len(rep.Unlabelled) > 0 {
+		fmt.Printf("\n  %sUNLABELLED -- backport PRs here for originals not labelled for this line%s (%d, informational):\n",
+			cfg.bold, cfg.reset, len(rep.Unlabelled))
+		for _, u := range rep.Unlabelled {
+			cfg.printOrigin("", u.URL, u.Number, u.Title)
+			fmt.Printf("      %s%s%s\n", cfg.dim, claimState(u.BackportPRs, u.Confirmation), cfg.reset)
+			if len(u.Labels) > 0 {
+				fmt.Printf("      %slabels=%s, which did not target this line at merge%s\n",
+					cfg.dim, strings.Join(u.Labels, ","), cfg.reset)
+			}
+			cfg.printBackportPRs(u.BackportPRs)
+		}
+	}
+}
+
+// claimState says what the backport PRs claiming an original have done on the
+// branch, so an open claim does not read as a delivered one. A merged one is
+// only a merged PR: an unlabelled original is never checked commit by commit,
+// so nothing here says it arrived whole unless a person attested it.
+func claimState(prs []linkedPR, conf *confirmation) string {
+	state := "claimed here, closed unmerged"
+	for _, b := range prs {
+		switch b.State {
+		case "MERGED":
+			if conf != nil {
+				return "backport PR merged, confirmed by @" + conf.By
+			}
+			return "backport PR merged"
+		case "OPEN":
+			state = "claimed here, not merged"
+		}
+	}
+	return state
+}
+
+func (cfg *config) printVerdict(accent string, r verdict) {
+	fmt.Printf("    %s%s%s\n", accent, r.URL, cfg.reset)
+	fmt.Printf("      %s#%d%s %s\n", cfg.bold, r.Number, cfg.reset, r.Title)
+	fmt.Printf("      %slabel=%s author=%s merged=%s -- %s%s\n",
+		cfg.dim, r.Label, r.Author, r.MergedAt[:10], r.Evidence, cfg.reset)
+	if r.Reason != "" {
+		fmt.Printf("      %sreason: %s%s\n", cfg.dim, r.Reason, cfg.reset)
+	}
+	for _, c := range r.MissingCommits {
+		fmt.Printf("      %smissing: %.9s %s%s\n", cfg.dim, c.Oid, c.Subject, cfg.reset)
+	}
+}
+
+func (cfg *config) printOrigin(accent, url string, number int, title string) {
+	fmt.Printf("    %s%s%s\n", accent, url, cfg.reset)
+	fmt.Printf("      %s#%d%s %s\n", cfg.bold, number, cfg.reset, title)
+}
+
+func (cfg *config) printBackportPRs(prs []linkedPR) {
+	for _, b := range prs {
+		draft := ""
+		if b.Draft {
+			draft = " (draft)"
+		}
+		fmt.Printf("      %sbackport #%d %s%s %s%s\n", cfg.dim, b.Number, b.State, draft, b.URL, cfg.reset)
+	}
+}
diff --git a/cmd/backport-audit/main_test.go b/cmd/backport-audit/main_test.go
new file mode 100644
index 0000000000..7d40094370
--- /dev/null
+++ b/cmd/backport-audit/main_test.go
@@ -0,0 +1,1496 @@
+/*
+Copyright 2026 The Cozystack Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package main
+
+import (
+	"errors"
+	"fmt"
+	"os"
+	"os/exec"
+	"slices"
+	"strings"
+	"testing"
+	"time"
+)
+
+func ts(t *testing.T, s string) time.Time {
+	t.Helper()
+	when, err := time.Parse(time.RFC3339, s)
+	if err != nil {
+		t.Fatalf("bad timestamp %q: %v", s, err)
+	}
+	return when
+}
+
+func name(l *line) string {
+	if l == nil {
+		return "<none>"
+	}
+	return l.branch()
+}
+
+// The real dates, so a change to freezeContractLandedAt or to the era rules
+// shows up here rather than on a release cut.
+func liveTimeline(t *testing.T) []lineOpen {
+	t.Helper()
+	return []lineOpen{
+		{line{1, 4}, ts(t, "2026-05-19T13:10:45Z")}, // v1.4.0 published; branch cut earlier, pre-contract
+		{line{1, 5}, ts(t, "2026-06-22T15:45:38Z")}, // v1.5.0 published
+		{line{1, 6}, ts(t, "2026-07-22T15:21:48Z")}, // v1.6.0 published
+	}
+}
+
+func TestTargetsAt(t *testing.T) {
+	live := liveTimeline(t)
+
+	// A freeze after the cutover opens the line at the rc, not at a stable
+	// it does not have yet.
+	frozen17 := append(append([]lineOpen{}, live...), lineOpen{line{1, 7}, ts(t, "2026-09-10T09:00:00Z")})
+
+	cases := []struct {
+		name              string
+		opened            []lineOpen
+		merged            string
+		current, previous string
+	}{
+		{
+			name:   "before the cutover, the published-stable rule is in force",
+			opened: live, merged: "2026-07-01T00:00:00Z",
+			current: "release-1.5", previous: "release-1.4",
+		},
+		{
+			name:   "after v1.6.0 publishes, still under the old rule",
+			opened: live, merged: "2026-07-30T00:00:00Z",
+			current: "release-1.6", previous: "release-1.5",
+		},
+		{
+			name:   "after the cutover with no freeze since, the branch set is unchanged",
+			opened: live, merged: "2026-09-01T00:00:00Z",
+			current: "release-1.6", previous: "release-1.5",
+		},
+		{
+			name:   "the instant before a 1.7 freeze still targets 1.6",
+			opened: frozen17, merged: "2026-09-10T08:59:59Z",
+			current: "release-1.6", previous: "release-1.5",
+		},
+		{
+			name:   "once release-1.7 exists it is the target, before v1.7.0 ever publishes",
+			opened: frozen17, merged: "2026-09-10T09:00:01Z",
+			current: "release-1.7", previous: "release-1.6",
+		},
+		{
+			name:   "only one line exists: no previous",
+			opened: live[:1], merged: "2026-06-01T00:00:00Z",
+			current: "release-1.4", previous: "<none>",
+		},
+		{
+			name:   "merged before any line opened: no target at all",
+			opened: live, merged: "2026-01-01T00:00:00Z",
+			current: "<none>", previous: "<none>",
+		},
+	}
+
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			current, previous := targetsAt(tc.opened, ts(t, tc.merged))
+			if got := name(current); got != tc.current {
+				t.Errorf("current = %s, want %s", got, tc.current)
+			}
+			if got := name(previous); got != tc.previous {
+				t.Errorf("previous = %s, want %s", got, tc.previous)
+			}
+		})
+	}
+}
+
+// A label is read against the lines at merge time however late it was added:
+// the audit has no label timestamp. A PR merged on 2026-07-01 and labelled
+// after v1.6.0 published is still a release-1.5 candidate, even though
+// backport.yaml, running at label time, would have targeted release-1.6.
+func TestCandidateLabel(t *testing.T) {
+	live := liveTimeline(t)
+	pr := func(merged string, labels ...string) *mainPR {
+		p := &mainPR{MergedAt: ts(t, merged), labels: map[string]bool{}}
+		for _, l := range labels {
+			p.labels[l] = true
+		}
+		return p
+	}
+	cases := []struct {
+		name string
+		pr   *mainPR
+		want map[line]string
+	}{
+		{
+			name: "merged in the 1.5 era: kind/backport means release-1.5 for good",
+			pr:   pr("2026-07-01T00:00:00Z", labelCurrent),
+			want: map[line]string{{1, 4}: "", {1, 5}: labelCurrent, {1, 6}: ""},
+		},
+		{
+			name: "merged in the 1.5 era: kind/backport-previous means release-1.4 for good",
+			pr:   pr("2026-07-01T00:00:00Z", labelPrevious),
+			want: map[line]string{{1, 4}: labelPrevious, {1, 5}: "", {1, 6}: ""},
+		},
+		{
+			name: "merged in the 1.6 era, both requests",
+			pr:   pr("2026-09-01T00:00:00Z", labelCurrent, labelPrevious),
+			want: map[line]string{{1, 4}: "", {1, 5}: labelPrevious, {1, 6}: labelCurrent},
+		},
+		{
+			name: "no backport label: a candidate nowhere",
+			pr:   pr("2026-09-01T00:00:00Z"),
+			want: map[line]string{{1, 4}: "", {1, 5}: "", {1, 6}: ""},
+		},
+	}
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			for want, label := range tc.want {
+				if got := candidateLabel(tc.pr, live, want); got != label {
+					t.Errorf("%s: candidateLabel = %q, want %q", want.branch(), got, label)
+				}
+			}
+		})
+	}
+}
+
+// backport.yaml sorts its branch list numerically descending, so the rank is by
+// version and never by when a line opened. The two disagree as soon as a freeze
+// overlaps the previous line's stabilisation, and 1.10-versus-1.9 is where a
+// lexicographic sort would disagree with both.
+func TestTargetsAtRanksByVersionNotByOpenTime(t *testing.T) {
+	// v1.7.0-rc.1 is cut while v1.6.0 is still unpublished, so the newer line
+	// opens first in time.
+	opened := []lineOpen{
+		{line{1, 7}, ts(t, "2026-09-10T09:00:00Z")},
+		{line{1, 6}, ts(t, "2026-09-20T09:00:00Z")},
+	}
+	current, previous := targetsAt(opened, ts(t, "2026-09-21T00:00:00Z"))
+	if got := name(current); got != "release-1.7" {
+		t.Errorf("current = %s, want release-1.7", got)
+	}
+	if got := name(previous); got != "release-1.6" {
+		t.Errorf("previous = %s, want release-1.6", got)
+	}
+
+	opened = []lineOpen{
+		{line{1, 9}, ts(t, "2026-09-10T09:00:00Z")},
+		{line{1, 10}, ts(t, "2026-10-10T09:00:00Z")},
+	}
+	current, previous = targetsAt(opened, ts(t, "2026-10-11T00:00:00Z"))
+	if got := name(current); got != "release-1.10" {
+		t.Errorf("current = %s, want release-1.10", got)
+	}
+	if got := name(previous); got != "release-1.9" {
+		t.Errorf("previous = %s, want release-1.9", got)
+	}
+}
+
+func TestParseFreezeDates(t *testing.T) {
+	// Tag names and dates as `git for-each-ref` prints them.
+	const out = `v1.4.0 2026-05-19T18:10:45+05:00
+v1.4.0-rc.1 2026-05-13T19:10:58+05:00
+v1.4.0-rc.2 2026-05-14T10:15:38+05:00
+v1.6.0-rc.1 2026-07-07T17:46:06+05:00
+v1.6.1-rc.1 2026-08-04T18:52:49+05:00
+v1.7.0-rc.2 2026-09-12T12:00:00+05:00
+v1.7.0-rc.1 2026-09-10T14:00:00+05:00
+v1.8.0-beta.1 2026-10-01T12:00:00+05:00
+v1.8.0-alpha.1 2026-10-02T12:00:00+05:00
+`
+	frozen, err := parseFreezeDates(out)
+	if err != nil {
+		t.Fatalf("parseFreezeDates: %v", err)
+	}
+
+	// 1.4 and 1.6 are pre-cutover: their branches were not created by a freeze,
+	// so the rc tag says nothing about when they appeared.
+	for _, l := range []line{{1, 4}, {1, 6}} {
+		if when, ok := frozen[l]; ok {
+			t.Errorf("%s: pre-cutover rc must not set a freeze date, got %s", l.branch(), when)
+		}
+	}
+	// A patch-line rc is cut from a branch that already exists, and alpha/beta
+	// do not freeze at all.
+	for _, l := range []line{{1, 8}} {
+		if _, ok := frozen[l]; ok {
+			t.Errorf("%s: alpha/beta must not freeze a line", l.branch())
+		}
+	}
+	// 1.7 freezes at rc.1, not at whichever rc the listing happens to print first.
+	want := ts(t, "2026-09-10T14:00:00+05:00")
+	got, ok := frozen[line{1, 7}]
+	if !ok {
+		t.Fatalf("release-1.7: expected a freeze date")
+	}
+	if !got.Equal(want) {
+		t.Errorf("release-1.7 froze at %s, want %s", got, want)
+	}
+	if len(frozen) != 1 {
+		t.Errorf("expected exactly one frozen line, got %d: %v", len(frozen), frozen)
+	}
+}
+
+// The label listing goes through GitHub search, which stops at 1000 results
+// whatever --limit says, so a limit above that must not let a listing cut at
+// 1000 pass for a complete one.
+func TestCandidateCeiling(t *testing.T) {
+	cases := []struct {
+		limit, got int
+		truncated  bool
+	}{
+		{limit: 400, got: 399, truncated: false},
+		{limit: 400, got: 400, truncated: true},
+		{limit: 1000, got: 999, truncated: false},
+		{limit: 1000, got: 1000, truncated: true},
+		{limit: 2000, got: 999, truncated: false},
+		{limit: 2000, got: 1000, truncated: true},
+	}
+	for _, tc := range cases {
+		ceiling, remedy := candidateCeiling(tc.limit)
+		err := truncated(tc.got, ceiling, "the listing", remedy)
+		if (err != nil) != tc.truncated {
+			t.Errorf("--limit %d, %d results: truncated = %v, want %v", tc.limit, tc.got, err != nil, tc.truncated)
+		}
+	}
+}
+
+// Bodies are the ones real backport PRs carry, trimmed, so a change to the
+// grammar is judged against how people actually write them.
+func TestBodyOrigins(t *testing.T) {
+	cases := []struct {
+		name string
+		body string
+		want []int
+	}{
+		{
+			name: "the plain form",
+			body: "Backport of #3742 to `release-1.6`.\n\nCherry-picked clean with `-x`.",
+			want: []int{3742},
+		},
+		{
+			name: "two originals in one phrase, and an issue further on that is not one",
+			body: "Backport of #3938 and #4280 to `release-1.6`, together, because #3938 alone breaks every Kafka deletion (#4276) and #4280 is what fixes that.",
+			want: []int{3938, 4280},
+		},
+		{
+			name: "a list without the serial comma",
+			body: "Backport of #1, #2 and #3 to `release-1.6`.",
+			want: []int{1, 2, 3},
+		},
+		{
+			name: "a list with the serial comma",
+			body: "Backport of #1, #2, and #3.",
+			want: []int{1, 2, 3},
+		},
+		{
+			name: "a list ending the line",
+			body: "Backport of #1, #2 and #3\n\nAll cherry-picked with `-x`.",
+			want: []int{1, 2, 3},
+		},
+		{
+			name: "a list ending the body",
+			body: "Backport of #1 and #2",
+			want: []int{1, 2},
+		},
+		{
+			name: "a list running on into a clause about its items keeps only the first",
+			body: "Backport of #10, #20 is not included.",
+			want: []int{10},
+		},
+		{
+			name: "a list running into a parenthesis keeps only the first",
+			body: "Backport of #10 and #20 (the second only in part).",
+			want: []int{10},
+		},
+		{
+			name: "a to that does not name a release line does not close a list",
+			body: "Backport of #10, #20 to follow in a separate PR.",
+			want: []int{10},
+		},
+		{
+			name: "an unquoted release line closes a list, whichever line it names",
+			body: "Backport of #1 and #2 to release-1.5, both clean.",
+			want: []int{1, 2},
+		},
+		{
+			name: "an unquoted release line before a full stop closes a list",
+			body: "Backport of #1 and #2 to release-1.5.",
+			want: []int{1, 2},
+		},
+		{
+			name: "an unquoted release line ending the body closes a list",
+			body: "Backport of #1 and #2 to release-1.5",
+			want: []int{1, 2},
+		},
+		{
+			name: "a branch that only starts with a release line does not close a list",
+			body: "Backport of #10, #20 to release-1.6-fixes will follow later.",
+			want: []int{10},
+		},
+		{
+			name: "a patch version is not a release line",
+			body: "Backport of #10, #20 to release-1.6.1 later.",
+			want: []int{10},
+		},
+		{
+			name: "a dotted suffix is not a release line",
+			body: "Backport of #10, #20 to release-1.6.fixes will follow later.",
+			want: []int{10},
+		},
+		{
+			name: "a full stop and a space after the release line close a list",
+			body: "Backport of #10, #20 to release-1.6. Next, the tests.",
+			want: []int{10, 20},
+		},
+		{
+			name: "a quoted release line running on into a word does not close a list",
+			body: "Backport of #10, #20 to `release-1.6`-ish branches.",
+			want: []int{10},
+		},
+		{
+			name: "an ampersand is not a separator",
+			body: "Backport of #1 & #2.",
+			want: []int{1},
+		},
+		{
+			name: "repository-qualified references, alone and in a list",
+			body: "Backport of cozystack/cozystack#3471 and #3472 to `release-1.6` (clean cherry-pick).",
+			want: []int{3471, 3472},
+		},
+		{
+			name: "this repository's qualifier matches case-insensitively",
+			body: "Backport of CozyStack/Cozystack#7.",
+			want: []int{7},
+		},
+		{
+			name: "another repository's reference in a list is skipped",
+			body: "Backport of #10 and other/repo#20.",
+			want: []int{10},
+		},
+		{
+			name: "another repository's reference alone is skipped",
+			body: "Backport of cozystack/website#20 to `release-1.6`.",
+			want: nil,
+		},
+		{
+			name: "another repository's reference first does not hide the rest of a closed list",
+			body: "Backport of other/repo#20 and #10.",
+			want: []int{10},
+		},
+		{
+			name: "a dependency pulled along with together-with, as #4328 writes it",
+			body: "Backport of #4253 to `release-1.6`, together with #3460 which it depends on. On 1.6 kube-ovn #99 differs.",
+			want: []int{4253, 3460},
+		},
+		{
+			name: "the same as #4377 writes it",
+			body: "Backport of #4333 to `release-1.6`, together with #4231 which it depends on. 1.6 has no in-tree chart.",
+			want: []int{4333, 4231},
+		},
+		{
+			name: "the same as #4421 writes it",
+			body: "## What this PR does\n\nManual backport of #3938 to `release-1.6`, together with #4280.\n\n#3938 cannot go to 1.6 on its own.",
+			want: []int{3938, 4280},
+		},
+		{
+			name: "together-with and an unquoted branch",
+			body: "Manual backport of #3938 to release-1.6, together with #4280.",
+			want: []int{3938, 4280},
+		},
+		{
+			name: "a closed together-with list keeps every item",
+			body: "Backport of #10 to `release-1.6`, together with #20 and #30.",
+			want: []int{10, 20, 30},
+		},
+		{
+			name: "a together-with list running on into a clause keeps only its first",
+			body: "Backport of #10 to release-1.6, together with #20, #30 is tracked separately.",
+			want: []int{10, 20},
+		},
+		{
+			name: "a together-with list running into a to that is not a release line keeps only its first",
+			body: "Backport of #10 to `release-1.6`, together with #20, #30 to follow later.",
+			want: []int{10, 20},
+		},
+		{
+			name: "a together-with list running into a branch that only starts with a release line keeps only its first",
+			body: "Backport of #10 to `release-1.6`, together with #20, #30 to release-1.6-fixes later.",
+			want: []int{10, 20},
+		},
+		{
+			name: "a together-with list running into a patch version keeps only its first",
+			body: "Backport of #10 to `release-1.6`, together with #20, #30 to release-1.6.1 later.",
+			want: []int{10, 20},
+		},
+		{
+			name: "a together-with list running into a dotted suffix keeps only its first",
+			body: "Backport of #10 to `release-1.6`, together with #20, #30 to release-1.6.fixes later.",
+			want: []int{10, 20},
+		},
+		{
+			name: "a together-with list closed by a release line, a full stop and a space keeps every item",
+			body: "Backport of #10 to `release-1.6`, together with #20, #30 to release-1.6. Next, the tests.",
+			want: []int{10, 20, 30},
+		},
+		{
+			name: "a together-with list running into a quoted release line and a word keeps only its first",
+			body: "Backport of #10 to `release-1.6`, together with #20, #30 to `release-1.6`-ish branches.",
+			want: []int{10, 20},
+		},
+		{
+			name: "a together-with list closed by a quoted release line keeps every item",
+			body: "Backport of #10 to `release-1.6`, together with #20 and #30 to `release-1.5` as well.",
+			want: []int{10, 20, 30},
+		},
+		{
+			name: "together-with in a later sentence is not part of the phrase",
+			body: "Backport of #7 to `release-1.6`. Together with #8 it fixes the flake.",
+			want: []int{7},
+		},
+		{
+			name: "a hyphenated prefix still anchors",
+			body: "Hand-backport of #3034 to `release-1.5`. Fixes #12 and #13.",
+			want: []int{3034},
+		},
+		{
+			name: "a list that turns into prose stops at the prose",
+			body: "Backport of #1, which fixes #2, and #3.",
+			want: []int{1},
+		},
+		{
+			name: "and followed by prose stops at the prose",
+			body: "Backport of #1 and the follow-up to #2.",
+			want: []int{1},
+		},
+		{
+			name: "every phrase in the body counts, each number once",
+			body: "Backport of #10 to `release-1.6`.\n\nThe second commit is a backport of #11 and #10.",
+			want: []int{10, 11},
+		},
+		{
+			name: "an article between the phrase and the number is not a reference",
+			body: "Hand-redone backport of the **kube-ovn-webhook half** of #3997.",
+			want: nil,
+		},
+		{
+			name: "no phrase at all",
+			body: "Fixes #4276 on this branch.",
+			want: nil,
+		},
+	}
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			if got := bodyOrigins(tc.body, "cozystack/cozystack"); !slices.Equal(got, tc.want) {
+				t.Errorf("bodyOrigins = %v, want %v", got, tc.want)
+			}
+		})
+	}
+}
+
+func TestClaimedOrigins(t *testing.T) {
+	cases := []struct {
+		name string
+		pr   backportPR
+		want []int
+	}{
+		{
+			name: "a hand backport reusing the bot's head naming is counted once",
+			pr:   backportPR{HeadRefName: "backport-3938-to-release-1.6", Body: "Backport of #3938 and #4280 to `release-1.6`."},
+			want: []int{3938, 4280},
+		},
+		{
+			name: "a head naming another branch says nothing about this one",
+			pr:   backportPR{HeadRefName: "backport-3455-to-release-1.5"},
+			want: nil,
+		},
+		{
+			name: "a head off the bot's pattern leaves only the body",
+			pr:   backportPR{HeadRefName: "backport-3938-release-1.6", Body: "Manual backport of #3938 to `release-1.6`, together with #4280."},
+			want: []int{3938, 4280},
+		},
+		{
+			name: "qualifiers are read against the repository the PR is in",
+			pr: backportPR{URL: "https://github.com/example/fork/pull/5",
+				Body: "Backport of example/fork#3 and cozystack/cozystack#4."},
+			want: []int{3},
+		},
+	}
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			if got := claimedOrigins(tc.pr, "release-1.6"); !slices.Equal(got, tc.want) {
+				t.Errorf("claimedOrigins = %v, want %v", got, tc.want)
+			}
+		})
+	}
+}
+
+func TestRepoOf(t *testing.T) {
+	cases := map[string]string{
+		"https://github.com/cozystack/cozystack/pull/4431": "cozystack/cozystack",
+		"https://github.com/example/fork/pull/5":           "example/fork",
+		"":                                                 upstreamRepo,
+	}
+	for url, want := range cases {
+		if got := repoOf(url); got != want {
+			t.Errorf("repoOf(%q) = %q, want %q", url, got, want)
+		}
+	}
+}
+
+func bp(n int, state, head, body string) backportPR {
+	return backportPR{
+		Number:      n,
+		State:       state,
+		URL:         originURL("https://github.com/cozystack/cozystack/pull/1", n),
+		HeadRefName: head,
+		Body:        body,
+	}
+}
+
+func numbersOf[T any](records []T, number func(T) int) []int {
+	out := []int{}
+	for _, r := range records {
+		out = append(out, number(r))
+	}
+	return out
+}
+
+// Modelled on release-1.6: hand backports of main PRs that carry no backport
+// label, one of them bundling two originals, next to a closed fork PR that had
+// claimed the same pair, and a labelled candidate whose backport merged.
+func release16(state4421, state4456 string) []backportPR {
+	return []backportPR{
+		bp(4431, "MERGED", "backport-3455-to-release-1.6", "Backport of #3455 to `release-1.6`."),
+		bp(4437, "MERGED", "backport-4020-to-release-1.6", "Backport of #4020 to `release-1.6`, without its product changes."),
+		bp(4456, state4456, "backport-3938-to-release-1.6",
+			"Backport of #3938 and #4280 to `release-1.6`, together, because #3938 alone breaks every Kafka deletion (#4276)."),
+		bp(4421, state4421, "backport-3938-release-1.6",
+			"## What this PR does\n\nManual backport of #3938 to `release-1.6`, together with #4280."),
+		bp(4474, "MERGED", "backport-4291-to-release-1.6", "Backport of #4291 to `release-1.6`."),
+	}
+}
+
+func TestCrossCheck(t *testing.T) {
+	labelled := &mainPR{Number: 4291, Title: "fix(cluster-api): live migration before host eviction",
+		URL: "https://github.com/cozystack/cozystack/pull/4291", labels: map[string]bool{labelCurrent: true}}
+	// Labelled, but for another line: it is not audited here, so a backport of
+	// it on this branch is exactly as unaccounted for as an unlabelled one.
+	elsewhere := &mainPR{Number: 3455, Title: "fix(e2e): disable guest fsync on ephemeral CI VM disks",
+		URL: "https://github.com/cozystack/cozystack/pull/3455", labels: map[string]bool{labelPrevious: true}}
+	cands := map[int]*mainPR{4291: labelled, 3455: elsewhere}
+	audited := map[int]string{4291: labelCurrent}
+
+	t.Run("merged unlabelled backports are listed, the candidate is not", func(t *testing.T) {
+		index := indexByOrigin(release16("CLOSED", "MERGED"), "release-1.6")
+		unlabelled, duplicates := crossCheck(index, audited, cands)
+
+		got := numbersOf(unlabelled, func(u unlabelledBackport) int { return u.Number })
+		if want := []int{3455, 3938, 4020, 4280}; !slices.Equal(got, want) {
+			t.Fatalf("unlabelled originals = %v, want %v", got, want)
+		}
+		if len(duplicates) != 0 {
+			t.Errorf("a closed PR next to a merged one is not a duplicate, got %+v", duplicates)
+		}
+
+		byNumber := map[int]unlabelledBackport{}
+		for _, u := range unlabelled {
+			byNumber[u.Number] = u
+		}
+		if u := byNumber[4280]; u.URL != "https://github.com/cozystack/cozystack/pull/4280" || u.Title != "" || len(u.Labels) != 0 {
+			t.Errorf("#4280: want a derived URL, no title yet and no labels, got %+v", u)
+		}
+		if u := byNumber[3455]; u.Title != elsewhere.Title || !slices.Equal(u.Labels, []string{labelPrevious}) {
+			t.Errorf("#3455: want the candidate's title and its label, got %+v", u)
+		}
+		if got := numbersOf(byNumber[3938].BackportPRs, func(l linkedPR) int { return l.Number }); !slices.Equal(got, []int{4421, 4456}) {
+			t.Errorf("#3938: backport PRs = %v, want both claims sorted", got)
+		}
+	})
+
+	t.Run("two open claims on the same pair are both duplicates", func(t *testing.T) {
+		index := indexByOrigin(release16("OPEN", "OPEN"), "release-1.6")
+		_, duplicates := crossCheck(index, audited, cands)
+		got := numbersOf(duplicates, func(d duplicateBackport) int { return d.Number })
+		if want := []int{3938, 4280}; !slices.Equal(got, want) {
+			t.Fatalf("duplicate originals = %v, want %v", got, want)
+		}
+		for _, d := range duplicates {
+			if d.Kind != dupOpenTwice || d.Label != "" {
+				t.Errorf("#%d: want kind %s and no label, got %+v", d.Number, dupOpenTwice, d)
+			}
+		}
+	})
+
+	t.Run("an open claim after a merged one is a leftover", func(t *testing.T) {
+		index := indexByOrigin(release16("OPEN", "MERGED"), "release-1.6")
+		_, duplicates := crossCheck(index, audited, cands)
+		got := numbersOf(duplicates, func(d duplicateBackport) int { return d.Number })
+		if want := []int{3938, 4280}; !slices.Equal(got, want) {
+			t.Fatalf("duplicate originals = %v, want %v", got, want)
+		}
+		for _, d := range duplicates {
+			if d.Kind != dupOpenAfterMerge {
+				t.Errorf("#%d: want kind %s, got %s", d.Number, dupOpenAfterMerge, d.Kind)
+			}
+		}
+	})
+
+	t.Run("a labelled candidate claimed twice is a duplicate carrying its label", func(t *testing.T) {
+		prs := append(release16("CLOSED", "MERGED"),
+			bp(4480, "OPEN", "fix-migration-again", "Backport of #4291 to `release-1.6`."))
+		unlabelled, duplicates := crossCheck(indexByOrigin(prs, "release-1.6"), audited, cands)
+		if len(duplicates) != 1 || duplicates[0].Number != 4291 || duplicates[0].Label != labelCurrent ||
+			duplicates[0].Kind != dupOpenAfterMerge || duplicates[0].Title != labelled.Title {
+			t.Fatalf("want one open-after-merge duplicate for #4291 under %s, got %+v", labelCurrent, duplicates)
+		}
+		for _, u := range unlabelled {
+			if u.Number == 4291 {
+				t.Errorf("an audited candidate must not also be listed as unlabelled")
+			}
+		}
+	})
+}
+
+func TestDuplicateKind(t *testing.T) {
+	cases := []struct {
+		states []string
+		want   string
+	}{
+		{[]string{"OPEN"}, ""},
+		{[]string{"MERGED"}, ""},
+		{[]string{"CLOSED", "OPEN"}, ""},
+		{[]string{"MERGED", "MERGED"}, ""},
+		{[]string{"CLOSED", "CLOSED", "MERGED"}, ""},
+		{[]string{"OPEN", "OPEN"}, dupOpenTwice},
+		{[]string{"OPEN", "CLOSED", "OPEN"}, dupOpenTwice},
+		{[]string{"MERGED", "OPEN"}, dupOpenAfterMerge},
+		{[]string{"OPEN", "MERGED", "OPEN"}, dupOpenAfterMerge},
+	}
+	for _, tc := range cases {
+		var claims []backportPR
+		for i, s := range tc.states {
+			claims = append(claims, backportPR{Number: i + 1, State: s})
+		}
+		if got := duplicateKind(claims); got != tc.want {
+			t.Errorf("duplicateKind(%v) = %q, want %q", tc.states, got, tc.want)
+		}
+	}
+}
+
+// The gate answers whether everything labelled landed. Unlabelled backports
+// can only add to a branch, so they never fail it; a duplicate needs a human
+// before the cut, so it always does.
+func TestBranchReportClean(t *testing.T) {
+	landed := []verdict{{Number: 1, Status: statusBackported}, {Number: 2, Status: statusInBranch}}
+	unlabelled := []unlabelledBackport{{Number: 3455, BackportPRs: []linkedPR{{Number: 4431, State: "OPEN"}}}}
+	duplicate := []duplicateBackport{{Number: 3938, Kind: dupOpenTwice}}
+
+	cases := []struct {
+		name string
+		rep  branchReport
+		want bool
+	}{
+		{"nothing at all", branchReport{}, true},
+		{"everything landed", branchReport{Candidates: landed}, true},
+		{"only unlabelled backports, even an open one", branchReport{Candidates: landed, Unlabelled: unlabelled}, true},
+		{"a duplicate", branchReport{Candidates: landed, Duplicates: duplicate}, false},
+		{"a missing candidate", branchReport{Candidates: append(landed, verdict{Number: 3, Status: statusMissing})}, false},
+		{"a pending candidate", branchReport{Candidates: append(landed, verdict{Number: 3, Status: statusPending})}, false},
+		{"a dropped candidate", branchReport{Candidates: append(landed, verdict{Number: 3, Status: statusDropped})}, false},
+	}
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			if got := tc.rep.clean(); got != tc.want {
+				t.Errorf("clean() = %v, want %v", got, tc.want)
+			}
+		})
+	}
+}
+
+func TestOriginURL(t *testing.T) {
+	if got := originURL("https://github.com/cozystack/cozystack/pull/4431", 3455); got != "https://github.com/cozystack/cozystack/pull/3455" {
+		t.Errorf("originURL = %q", got)
+	}
+	if got := originURL("not a PR URL", 3455); got != "" {
+		t.Errorf("originURL of a non-PR URL = %q, want empty", got)
+	}
+}
+
+// A real listing, of the PR merged in f1f383626: its third commit is an empty
+// "re-trigger CI" commit, which the backport bot drops.
+const prLogWithEmptyCommit = "\x00fea40d6314424a4105d31c7ee77f818062f5bc1a\x01fix(ci): only overlay current-main images on main-based PRs\n\n" +
+	".github/workflows/pull-requests.yaml\nhack/overlay-main-images_test.bats\n" +
+	"\x002330d6f3ca42306da92190b5e9dddf0bc1054fcd\x01fix(ci): overlay images from the PR base branch, and publish per-line artifacts\n\n" +
+	".github/workflows/build-release.yaml\n.github/workflows/pull-requests.yaml\nhack/overlay-main-images_test.bats\n" +
+	"\x00007d0b1a22ec1aadca95960645d8232a5b202fcb\x01chore(ci): re-trigger CI after a label event produced a no-op run\n"
+
+func TestParsePRCommits(t *testing.T) {
+	got := parsePRCommits(prLogWithEmptyCommit)
+	want := []prCommit{
+		{"fea40d6314424a4105d31c7ee77f818062f5bc1a", "fix(ci): only overlay current-main images on main-based PRs"},
+		{"2330d6f3ca42306da92190b5e9dddf0bc1054fcd", "fix(ci): overlay images from the PR base branch, and publish per-line artifacts"},
+	}
+	if !slices.Equal(got, want) {
+		t.Errorf("parsePRCommits = %+v, want %+v", got, want)
+	}
+}
+
+// fakeSource serves a PR's commits from a fixture, or fails the read.
+type fakeSource struct {
+	commitsOf func(string) []prCommit
+	err       error
+}
+
+func (f fakeSource) commits(mergeCommit string) ([]prCommit, error) {
+	if f.err != nil {
+		return nil, f.err
+	}
+	return f.commitsOf(mergeCommit), nil
+}
+
+// branchCommit is one commit on a release branch in a test's history.
+type branchCommit struct {
+	oid, subject string
+	picks        []string
+}
+
+// branchOf is release-1.6 holding exactly these commits.
+func branchOf(cs ...branchCommit) *branchHistory {
+	h := &branchHistory{branch: "release-1.6", ref: "origin/release-1.6",
+		commits: map[string]bool{}, subjects: map[string][]string{}, refs: map[string][]string{}}
+	for _, c := range cs {
+		h.commits[c.oid] = true
+		h.subjects[c.subject] = append(h.subjects[c.subject], c.oid)
+		if len(c.picks) > 0 {
+			h.refs[c.oid] = c.picks
+		}
+	}
+	return h
+}
+
+// history is a release branch with one commit per given subject, one per -x
+// reference, and the given commits themselves.
+func history(subjects, picked, reachable []string) *branchHistory {
+	var cs []branchCommit
+	for i, s := range subjects {
+		cs = append(cs, branchCommit{oid: fmt.Sprintf("s%039d", i), subject: s})
+	}
+	for i, p := range picked {
+		cs = append(cs, branchCommit{oid: fmt.Sprintf("p%039d", i), subject: "cherry-pick " + p, picks: []string{p}})
+	}
+	for _, r := range reachable {
+		cs = append(cs, branchCommit{oid: r, subject: "reachable " + r})
+	}
+	return branchOf(cs...)
+}
+
+func comment(login, association, body, url string) prComment {
+	c := prComment{AuthorAssociation: association, Body: body, URL: url}
+	c.Author.Login = login
+	return c
+}
+
+const (
+	firstHalf  = "1111111111111111111111111111111111111111"
+	secondHalf = "2222222222222222222222222222222222222222"
+	emptyOne   = "3333333333333333333333333333333333333333"
+	squashOne  = "4444444444444444444444444444444444444444"
+	mergeOf    = "9999999999999999999999999999999999999999"
+)
+
+// A two-commit PR, #4399, plus an empty commit that must never count.
+func twoHalves(string) []prCommit {
+	return parsePRCommits("\x00" + firstHalf + "\x01fix(x): first half\n\nx.go\n" +
+		"\x00" + secondHalf + "\x01fix(x): second half\n\ny.go\n" +
+		"\x00" + emptyOne + "\x01chore(ci): re-trigger CI\n")
+}
+
+func pr4399() *mainPR {
+	pr := &mainPR{Number: 4399, Title: "fix(x): two halves"}
+	pr.MergeCommit.Oid = mergeOf
+	return pr
+}
+
+// The bot's conflict drafts stop at the first commit that does not apply and
+// drop the rest, so one merged draft reads as a finished backport to anything
+// that looks at the PR, or at any single commit, rather than at every commit.
+func TestClassifyJudgesEveryCommit(t *testing.T) {
+	oneCommit := func(string) []prCommit {
+		return []prCommit{{squashOne, "fix(y): the whole change (#4398)"}}
+	}
+	onlyEmpty := func(string) []prCommit {
+		return parsePRCommits("\x00" + emptyOne + "\x01chore(ci): re-trigger CI\n")
+	}
+	bpMerged := backportPR{Number: 4400, State: "MERGED"}
+	bpOpen := backportPR{Number: 4401, State: "OPEN", IsDraft: true}
+	botSubject := "[Backport release-1.6] fix(x): two halves"
+
+	cases := []struct {
+		name      string
+		hist      *branchHistory
+		linked    []backportPR
+		commitsOf func(string) []prCommit
+		status    string
+		evidence  string
+		missing   []string
+	}{
+		{
+			name:      "only the first commit carried, by -x reference: partial",
+			hist:      history(nil, []string{firstHalf}, nil),
+			commitsOf: twoHalves,
+			status:    statusPartial, evidence: "1 of 2 commits on branch", missing: []string{secondHalf},
+		},
+		{
+			name:      "both carried, one by -x reference and one by subject; the empty commit is not needed",
+			hist:      history([]string{"fix(x): second half"}, []string{firstHalf}, nil),
+			commitsOf: twoHalves,
+			status:    statusBackported, evidence: "2 of 2 commits on branch",
+		},
+		{
+			name:      "reworded on the branch, so only an abbreviated -x reference proves it, and the other is reachable",
+			hist:      history(nil, []string{firstHalf[:7]}, []string{secondHalf}),
+			commitsOf: twoHalves,
+			status:    statusBackported, evidence: "2 of 2 commits on branch",
+		},
+		{
+			name:      "a merged backport PR does not make a partial backport whole",
+			hist:      history(nil, []string{firstHalf}, nil),
+			linked:    []backportPR{bpMerged},
+			commitsOf: twoHalves,
+			status:    statusPartial, evidence: "backport PR #4400 merged, 1 of 2 commits on branch", missing: []string{secondHalf},
+		},
+		{
+			name:      "partial with the rest still open is partial, and says so",
+			hist:      history(nil, []string{firstHalf}, nil),
+			linked:    []backportPR{bpOpen},
+			commitsOf: twoHalves,
+			status:    statusPartial, evidence: "1 of 2 commits on branch; backport PR #4401 open (draft/conflict)", missing: []string{secondHalf},
+		},
+		{
+			name:      "a merged backport PR with none of several commits found proves only that something merged: unverified",
+			hist:      history(nil, nil, nil),
+			linked:    []backportPR{bpMerged},
+			commitsOf: twoHalves,
+			status:    statusUnverified, evidence: "backport PR #4400 merged, 0 of 2 commits on branch", missing: []string{firstHalf, secondHalf},
+		},
+		{
+			name:      "the bot's merge subject alone is no better for several commits",
+			hist:      history([]string{botSubject}, nil, nil),
+			commitsOf: twoHalves,
+			status:    statusUnverified, evidence: "bot merge commit on branch, 0 of 2 commits on branch", missing: []string{firstHalf, secondHalf},
+		},
+		{
+			name:      "an -x reference to the merge commit credits no commit by itself",
+			hist:      history(nil, []string{mergeOf[:12]}, nil),
+			linked:    []backportPR{bpMerged},
+			commitsOf: twoHalves,
+			status:    statusUnverified, evidence: "backport PR #4400 merged, 0 of 2 commits on branch", missing: []string{firstHalf, secondHalf},
+		},
+		{
+			name:      "nor does it lift a partial one",
+			hist:      history(nil, []string{mergeOf[:12], firstHalf}, nil),
+			commitsOf: twoHalves,
+			status:    statusPartial, evidence: "1 of 2 commits on branch", missing: []string{secondHalf},
+		},
+		{
+			name:      "no commit found and only an open backport PR: pending",
+			hist:      history(nil, nil, nil),
+			linked:    []backportPR{bpOpen},
+			commitsOf: twoHalves,
+			status:    statusPending, evidence: "backport PR #4401 open (draft/conflict)",
+		},
+		{
+			name:      "a squashed PR's one commit carried: backported",
+			hist:      history([]string{"fix(y): the whole change (#4398)"}, nil, nil),
+			commitsOf: oneCommit,
+			status:    statusBackported, evidence: "1 of 1 commit on branch",
+		},
+		{
+			name:      "a squashed PR's commit not found but its backport PR merged: backported",
+			hist:      history(nil, nil, nil),
+			linked:    []backportPR{bpMerged},
+			commitsOf: oneCommit,
+			status:    statusBackported, evidence: "backport PR #4400 merged, 0 of 1 commit on branch",
+		},
+		{
+			name:      "and the bot's merge subject settles it the same way",
+			hist:      history([]string{botSubject}, nil, nil),
+			commitsOf: oneCommit,
+			status:    statusBackported, evidence: "bot merge commit on branch, 0 of 1 commit on branch",
+		},
+		{
+			name:      "nothing a backport has to carry: the merged backport PR decides",
+			hist:      history(nil, nil, nil),
+			linked:    []backportPR{bpMerged},
+			commitsOf: onlyEmpty,
+			status:    statusBackported, evidence: "backport PR #4400 merged",
+		},
+		{
+			name:      "nothing anywhere: MISSING",
+			hist:      history(nil, nil, nil),
+			commitsOf: twoHalves,
+			status:    statusMissing, evidence: "no backport PR, nothing on branch",
+		},
+		{
+			name: "merged before the cut: in-branch, without reading its commits",
+			hist: history(nil, nil, []string{mergeOf}),
+			commitsOf: func(string) []prCommit {
+				t.Fatalf("commits read for a PR whose merge commit is on the branch")
+				return nil
+			},
+			status: statusInBranch, evidence: "merged before branch cut",
+		},
+	}
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			v, err := classify(pr4399(), labelCurrent, tc.hist, tc.linked, fakeSource{commitsOf: tc.commitsOf})
+			if err != nil {
+				t.Fatalf("classify: %v", err)
+			}
+			if v.Status != tc.status || v.Evidence != tc.evidence {
+				t.Errorf("got %s %q, want %s %q", v.Status, v.Evidence, tc.status, tc.evidence)
+			}
+			var missing []string
+			for _, c := range v.MissingCommits {
+				missing = append(missing, c.Oid)
+			}
+			if !slices.Equal(missing, tc.missing) {
+				t.Errorf("missing commits = %v, want %v", missing, tc.missing)
+			}
+			// Partial and unverified are outstanding, like MISSING, so they fail
+			// the gate.
+			rep := branchReport{Candidates: []verdict{v}}
+			if want := v.Status == statusBackported || v.Status == statusInBranch; rep.clean() != want {
+				t.Errorf("clean() = %v for a %s verdict, want %v", rep.clean(), v.Status, want)
+			}
+		})
+	}
+}
+
+// Only a person's explicit word, on the backport PR that merged, lifts partial
+// or unverified; nothing is inferred, and nothing else will do.
+func TestClassifyConfirmation(t *testing.T) {
+	const marker = "backport-audit: complete"
+	const url = "https://github.com/cozystack/cozystack/pull/4400#issuecomment-1"
+	onPR := func(state string, comments ...prComment) backportPR {
+		return backportPR{Number: 4400, State: state, Comments: comments}
+	}
+	cases := []struct {
+		name   string
+		hist   *branchHistory
+		linked []backportPR
+		status string
+		by     string
+	}{
+		{
+			name:   "partial, attested by a person on the merged backport PR: confirmed",
+			hist:   history(nil, []string{firstHalf}, nil),
+			linked: []backportPR{onPR("MERGED", comment("coderabbit-reviewer", "NONE", "looks fine", ""), comment("alice", "MEMBER", marker, url))},
+			status: statusConfirmed, by: "alice",
+		},
+		{
+			name:   "unverified, attested: confirmed",
+			hist:   history(nil, nil, nil),
+			linked: []backportPR{onPR("MERGED", comment("alice", "MEMBER", marker, url))},
+			status: statusConfirmed, by: "alice",
+		},
+		{
+			name:   "the marker from the backport bot is ignored",
+			hist:   history(nil, []string{firstHalf}, nil),
+			linked: []backportPR{onPR("MERGED", comment("github-actions", "MEMBER", marker, url))},
+			status: statusPartial,
+		},
+		{
+			name:   "also under the bot's [bot] login",
+			hist:   history(nil, nil, nil),
+			linked: []backportPR{onPR("MERGED", comment("github-actions[bot]", "MEMBER", marker, url))},
+			status: statusUnverified,
+		},
+		{
+			name:   "an owner's attestation confirms",
+			hist:   history(nil, []string{firstHalf}, nil),
+			linked: []backportPR{onPR("MERGED", comment("alice", "OWNER", marker, url))},
+			status: statusConfirmed, by: "alice",
+		},
+		{
+			name:   "a collaborator's attestation confirms",
+			hist:   history(nil, []string{firstHalf}, nil),
+			linked: []backportPR{onPR("MERGED", comment("alice", "COLLABORATOR", marker, url))},
+			status: statusConfirmed, by: "alice",
+		},
+		{
+			name:   "a contributor's marker is ignored",
+			hist:   history(nil, []string{firstHalf}, nil),
+			linked: []backportPR{onPR("MERGED", comment("alice", "CONTRIBUTOR", marker, url))},
+			status: statusPartial,
+		},
+		{
+			name:   "a first-time contributor's marker is ignored",
+			hist:   history(nil, []string{firstHalf}, nil),
+			linked: []backportPR{onPR("MERGED", comment("alice", "FIRST_TIME_CONTRIBUTOR", marker, url))},
+			status: statusPartial,
+		},
+		{
+			name:   "a marker from someone with no association is ignored",
+			hist:   history(nil, nil, nil),
+			linked: []backportPR{onPR("MERGED", comment("alice", "NONE", marker, url))},
+			status: statusUnverified,
+		},
+		{
+			name:   "a review bot is ignored even as a member with a well-formed marker",
+			hist:   history(nil, []string{firstHalf}, nil),
+			linked: []backportPR{onPR("MERGED", comment("coderabbitai", "MEMBER", marker, url))},
+			status: statusPartial,
+		},
+		{
+			name:   "the marker with an explanation above it attests nothing",
+			hist:   history(nil, []string{firstHalf}, nil),
+			linked: []backportPR{onPR("MERGED", comment("alice", "MEMBER", "Squashed by the contributor; both commits are in.\n\n"+marker, url))},
+			status: statusPartial,
+		},
+		{
+			name:   "a member who only mentions the marker in a sentence attests nothing",
+			hist:   history(nil, []string{firstHalf}, nil),
+			linked: []backportPR{onPR("MERGED", comment("alice", "MEMBER", "Do not post backport-audit: complete yet; the second commit is missing.", url))},
+			status: statusPartial,
+		},
+		{
+			name: "a maintainer's attestation counts even after a contributor's",
+			hist: history(nil, []string{firstHalf}, nil),
+			linked: []backportPR{onPR("MERGED",
+				comment("bob", "CONTRIBUTOR", marker, "https://example.invalid/bob"), comment("alice", "MEMBER", marker, url))},
+			status: statusConfirmed, by: "alice",
+		},
+		{
+			name:   "the marker on an open backport PR is ignored",
+			hist:   history(nil, []string{firstHalf}, nil),
+			linked: []backportPR{onPR("OPEN", comment("alice", "MEMBER", marker, url))},
+			status: statusPartial,
+		},
+		{
+			name:   "the marker on a backport PR closed unmerged is ignored, even next to a merged one",
+			hist:   history(nil, []string{firstHalf}, nil),
+			linked: []backportPR{onPR("MERGED"), {Number: 4402, State: "CLOSED", Comments: []prComment{comment("alice", "MEMBER", marker, url)}}},
+			status: statusPartial,
+		},
+		{
+			name:   "anything short of the literal marker is not an attestation",
+			hist:   history(nil, []string{firstHalf}, nil),
+			linked: []backportPR{onPR("MERGED", comment("alice", "MEMBER", "backport-audit complete, I think", url))},
+			status: statusPartial,
+		},
+		{
+			name:   "complete commit evidence needs no attestation",
+			hist:   history([]string{"fix(x): second half"}, []string{firstHalf}, nil),
+			linked: []backportPR{onPR("MERGED", comment("alice", "MEMBER", marker, url))},
+			status: statusBackported,
+		},
+	}
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			v, err := classify(pr4399(), labelCurrent, tc.hist, tc.linked, fakeSource{commitsOf: twoHalves})
+			if err != nil {
+				t.Fatalf("classify: %v", err)
+			}
+			if v.Status != tc.status {
+				t.Fatalf("status = %s (%s), want %s", v.Status, v.Evidence, tc.status)
+			}
+			if tc.by == "" {
+				if v.Confirmation != nil {
+					t.Errorf("unexpected confirmation %+v", v.Confirmation)
+				}
+				return
+			}
+			want := confirmation{By: tc.by, URL: url, BackportPR: 4400}
+			if v.Confirmation == nil || *v.Confirmation != want {
+				t.Errorf("confirmation = %+v, want %+v", v.Confirmation, want)
+			}
+			if !strings.HasPrefix(v.Evidence, "confirmed by @"+tc.by+" on backport PR #4400; ") {
+				t.Errorf("evidence %q does not name who confirmed it", v.Evidence)
+			}
+			if rep := (branchReport{Candidates: []verdict{v}}); !rep.clean() {
+				t.Errorf("a confirmed candidate must not fail the gate")
+			}
+			if len(v.MissingCommits) == 0 {
+				t.Errorf("a confirmed candidate keeps the commits nothing on the branch names")
+			}
+		})
+	}
+}
+
+// A read of the PR's commits that fails must end the audit, not feed a verdict:
+// with a merged backport PR linked, falling back to it would say backported on
+// the strength of nothing.
+func TestClassifyFailedReadIsAnError(t *testing.T) {
+	linked := []backportPR{{Number: 4400, State: "MERGED"}}
+	_, err := classify(pr4399(), labelCurrent, history(nil, nil, nil), linked,
+		fakeSource{err: errors.New("fatal: bad object 9999999")})
+	if err == nil || !strings.Contains(err.Error(), "bad object") || !strings.Contains(err.Error(), "#4399") {
+		t.Fatalf("err = %v, want the failed read of #4399", err)
+	}
+}
+
+func TestGitSourceCommits(t *testing.T) {
+	const m = mergeOf
+	boom := errors.New("fatal: bad object")
+	cases := []struct {
+		name      string
+		merge     string
+		parents   string
+		parentErr error
+		logErr    error
+		wantRange string
+		wantN     int
+		wantErr   bool
+	}{
+		{name: "a merge commit: its second parent's side", merge: m, parents: m + " a b\n", wantRange: m + "^1.." + m + "^2", wantN: 2},
+		{name: "a squashed PR: the commit itself", merge: m, parents: m + " a\n", wantRange: m + "^.." + m, wantN: 2},
+		{name: "the merge commit is not in the repository", merge: m, parentErr: boom, wantErr: true},
+		{name: "the log fails", merge: m, parents: m + " a b\n", logErr: boom, wantRange: m + "^1.." + m + "^2", wantErr: true},
+		{name: "an octopus merge is not a PR merge", merge: m, parents: m + " a b c\n", wantErr: true},
+		{name: "no merge commit recorded", merge: "", wantErr: true},
+	}
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			gotRange := ""
+			src := gitSource{run: func(args ...string) (string, error) {
+				switch args[0] {
+				case "rev-list":
+					return tc.parents, tc.parentErr
+				case "log":
+					gotRange = args[len(args)-1]
+					return prLogWithEmptyCommit, tc.logErr
+				}
+				return "", fmt.Errorf("unexpected git %v", args)
+			}}
+			commits, err := src.commits(tc.merge)
+			if (err != nil) != tc.wantErr {
+				t.Fatalf("err = %v, want error %v", err, tc.wantErr)
+			}
+			if gotRange != tc.wantRange {
+				t.Errorf("log range = %q, want %q", gotRange, tc.wantRange)
+			}
+			if err != nil && commits != nil {
+				t.Errorf("a failed read must not return commits, got %v", commits)
+			}
+			if !tc.wantErr && len(commits) != tc.wantN {
+				t.Errorf("got %d commits, want %d", len(commits), tc.wantN)
+			}
+		})
+	}
+}
+
+// An unlabelled original is never checked commit by commit, so the only thing
+// that can make its merged backport read as confirmed is the same attestation.
+func TestCrossCheckCarriesConfirmation(t *testing.T) {
+	attested := bp(4456, "MERGED", "backport-3938-to-release-1.6", "Backport of #3938 to `release-1.6`.")
+	attested.Comments = []prComment{comment("alice", "MEMBER", "backport-audit: complete", "https://example.invalid/c/1")}
+	plain := bp(4431, "MERGED", "backport-3455-to-release-1.6", "Backport of #3455 to `release-1.6`.")
+	unlabelled, _ := crossCheck(indexByOrigin([]backportPR{attested, plain}, "release-1.6"), nil, nil)
+	got := map[int]*confirmation{}
+	for _, u := range unlabelled {
+		got[u.Number] = u.Confirmation
+	}
+	if c := got[3938]; c == nil || c.By != "alice" || c.BackportPR != 4456 {
+		t.Errorf("#3938: confirmation = %+v, want alice on #4456", c)
+	}
+	if c := got[3455]; c != nil {
+		t.Errorf("#3455: confirmation = %+v, want none", c)
+	}
+}
+
+func TestSameCommit(t *testing.T) {
+	full := "0123456789abcdef0123456789abcdef01234567"
+	cases := []struct {
+		name string
+		a, b string
+		want bool
+	}{
+		{"identical", full, full, true},
+		{"the reference abbreviates", full, full[:7], true},
+		{"the other side abbreviates", full[:7], full, true},
+		{"different commits", full, "fff1234000000000000000000000000000000000", false},
+		{"an empty name is nobody's commit", full, "", false},
+		{"nor is it on the other side", "", full, false},
+	}
+	for _, tc := range cases {
+		if got := sameCommit(tc.a, tc.b); got != tc.want {
+			t.Errorf("%s: sameCommit(%q, %q) = %v, want %v", tc.name, tc.a, tc.b, got, tc.want)
+		}
+	}
+}
+
+func TestBranchHistoryEvidence(t *testing.T) {
+	for _, evidence := range []string{"subject", "cherry-pick reference"} {
+		t.Run(evidence, func(t *testing.T) {
+			t.Chdir(t.TempDir())
+			// Git hooks can export paths into the caller's repository.
+			for _, key := range []string{"GIT_DIR", "GIT_WORK_TREE", "GIT_INDEX_FILE", "GIT_COMMON_DIR", "GIT_OBJECT_DIRECTORY", "GIT_ALTERNATE_OBJECT_DIRECTORIES"} {
+				t.Setenv(key, "")
+				if err := os.Unsetenv(key); err != nil {
+					t.Fatal(err)
+				}
+			}
+			t.Setenv("GIT_CONFIG_GLOBAL", os.DevNull)
+			t.Setenv("GIT_CONFIG_NOSYSTEM", "1")
+			run := func(args ...string) string {
+				t.Helper()
+				args = append([]string{"-c", "user.name=Audit Test", "-c", "user.email=audit@example.invalid", "-c", "commit.gpgsign=false"}, args...)
+				out, err := exec.Command("git", args...).CombinedOutput()
+				if err != nil {
+					t.Fatalf("git %v: %v\n%s", args, err, out)
+				}
+				return strings.TrimSpace(string(out))
+			}
+			commit := func(file, message string) string {
+				t.Helper()
+				if err := os.WriteFile(file, []byte(file+"\n"), 0600); err != nil {
+					t.Fatal(err)
+				}
+				run("add", file)
+				run("commit", "-m", message)
+				return run("rev-parse", "HEAD")
+			}
+			run("init", "-b", "main")
+			commit("seed", "chore: seed")
+			run("switch", "-c", "feature")
+			first := commit("first", "feat(x): first half")
+			second := commit("second", "fix tests")
+			run("switch", "main")
+			message := "fix tests"
+			if evidence == "cherry-pick reference" {
+				message = "chore: unrelated change\n\n(cherry picked from commit " + second + ")"
+			}
+			shared := commit("shared", message)
+			run("branch", "release-1.6")
+			run("merge", "--no-ff", "feature", "-m", "feat(x): two halves")
+			merge := run("rev-parse", "HEAD")
+			run("update-ref", "refs/remotes/origin/main", merge)
+			run("switch", "release-1.6")
+			run("cherry-pick", "-x", first)
+			run("commit", "--amend", "-m", "fix(x): adapted first half\n\n(cherry picked from commit "+first+")")
+			run("update-ref", "refs/remotes/origin/release-1.6", "HEAD")
+
+			pr := &mainPR{Number: 4399, Title: "feat(x): two halves"}
+			pr.MergeCommit.Oid = merge
+			h, err := newBranchHistory("origin", "release-1.6")
+			if err != nil {
+				t.Fatal(err)
+			}
+			commits := []prCommit{{first, "feat(x): first half"}, {second, "fix tests"}}
+			if got := h.missingFrom(commits, merge); !slices.Equal(got, commits[1:]) {
+				t.Errorf("missingFrom = %v, want only the second commit", got)
+			}
+			v, err := classify(pr, labelCurrent, h, nil, gitSource{run: git})
+			if err != nil {
+				t.Fatal(err)
+			}
+			if v.Status != statusPartial || (&branchReport{Candidates: []verdict{v}}).clean() {
+				t.Errorf("incomplete backport = %s (%s), want partial and a failing gate", v.Status, v.Evidence)
+			}
+			sharedPR := &mainPR{}
+			sharedPR.MergeCommit.Oid = shared
+			v, err = classify(sharedPR, labelCurrent, h, nil, gitSource{run: git})
+			if err != nil || v.Status != statusInBranch {
+				t.Errorf("shared history = %s, %v; want in-branch", v.Status, err)
+			}
+
+			// A branch-only copy without -x must still supply subject evidence.
+			run("cherry-pick", second)
+			run("update-ref", "refs/remotes/origin/release-1.6", "HEAD")
+			h, err = newBranchHistory("origin", "release-1.6")
+			if err != nil {
+				t.Fatal(err)
+			}
+			v, err = classify(pr, labelCurrent, h, nil, gitSource{run: git})
+			if err != nil || v.Status != statusBackported || !(&branchReport{Candidates: []verdict{v}}).clean() {
+				t.Errorf("complete backport = %s, %v; want backported and a passing gate", v.Status, err)
+			}
+			run("update-ref", "-d", "refs/remotes/origin/main")
+			if _, err := newBranchHistory("origin", "release-1.6"); err == nil {
+				t.Error("missing main ref must fail the audit")
+			}
+		})
+	}
+}
+
+// One branch commit cannot supply subject evidence for two original commits.
+func TestMissingFrom(t *testing.T) {
+	const (
+		a     = "aaaa000000000000000000000000000000000000"
+		b     = "bbbb000000000000000000000000000000000000"
+		merge = "eeee000000000000000000000000000000000000"
+		other = "ffff000000000000000000000000000000000000"
+	)
+	pr := []prCommit{{a, "fix tests"}, {b, "fix tests"}}
+	cases := []struct {
+		name    string
+		hist    *branchHistory
+		missing []string
+	}{
+		{
+			name:    "one copy of a shared subject carries one commit, not both",
+			hist:    branchOf(branchCommit{oid: "c1", subject: "fix tests"}),
+			missing: []string{b},
+		},
+		{
+			name:    "two copies carry both",
+			hist:    branchOf(branchCommit{oid: "c1", subject: "fix tests"}, branchCommit{oid: "c2", subject: "fix tests"}),
+			missing: nil,
+		},
+		{
+			name:    "a copy that names the first commit with -x is spent on it, not on the second",
+			hist:    branchOf(branchCommit{oid: "c1", subject: "fix tests", picks: []string{a[:9]}}),
+			missing: []string{b},
+		},
+		{
+			name:    "the first commit on the branch itself is spent on it, not on the second",
+			hist:    branchOf(branchCommit{oid: a, subject: "fix tests"}),
+			missing: []string{b},
+		},
+		{
+			name:    "a copy whose -x names the PR's merge commit can still carry one commit by subject",
+			hist:    branchOf(branchCommit{oid: "c1", subject: "fix tests", picks: []string{merge[:9]}}),
+			missing: []string{b},
+		},
+		{
+			name:    "a copy whose -x names some other commit carries nothing here by its subject",
+			hist:    branchOf(branchCommit{oid: "c1", subject: "fix tests", picks: []string{other}}),
+			missing: []string{a, b},
+		},
+		{
+			name:    "an -x reference carries its commit whatever the subject",
+			hist:    branchOf(branchCommit{oid: "c1", subject: "reworded", picks: []string{a}}, branchCommit{oid: "c2", subject: "fix tests"}),
+			missing: nil,
+		},
+	}
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			var got []string
+			for _, c := range tc.hist.missingFrom(pr, merge) {
+				got = append(got, c.Oid)
+			}
+			if !slices.Equal(got, tc.missing) {
+				t.Errorf("missing = %v, want %v", got, tc.missing)
+			}
+		})
+	}
+}
+
+// A shared subject with only one copy on the branch leaves the candidate
+// partial, so the gate stays shut.
+func TestClassifySharedSubject(t *testing.T) {
+	pr := pr4399()
+	commits := func(string) []prCommit {
+		return []prCommit{{firstHalf, "fix tests"}, {secondHalf, "fix tests"}}
+	}
+	v, err := classify(pr, labelCurrent, history([]string{"fix tests"}, nil, nil), nil, fakeSource{commitsOf: commits})
+	if err != nil {
+		t.Fatal(err)
+	}
+	if v.Status != statusPartial || v.Evidence != "1 of 2 commits on branch" {
+		t.Errorf("got %s %q, want partial 1 of 2", v.Status, v.Evidence)
+	}
+	if (&branchReport{Candidates: []verdict{v}}).clean() {
+		t.Errorf("a partial candidate must fail the gate")
+	}
+}
+
+// Quoted markers, code blocks and surrounding prose do not attest completeness.
+func TestMarkerComment(t *testing.T) {
+	cases := []struct {
+		name string
+		body string
+		want bool
+	}{
+		{"the bare marker", "backport-audit: complete", true},
+		{"with blank lines before it and whitespace after it", "\n\nbackport-audit: complete \t\n\n", true},
+		{"with CRLF around it", "\r\nbackport-audit: complete\r\n", true},
+		{"a sentence that says not to", "Do not post backport-audit: complete yet; the second commit is missing.", false},
+		{"mid-sentence", "I think backport-audit: complete applies here.", false},
+		{"with words after it", "backport-audit: complete, except the docs", false},
+		{"in another case", "Backport-Audit: Complete", false},
+		{"quoted", "> backport-audit: complete", false},
+		{"quoted, then a reply", "> backport-audit: complete\n\nAgreed?", false},
+		{"inside a backtick fence", "```\nbackport-audit: complete\n```", false},
+		{"inside a tilde fence", "~~~\nbackport-audit: complete\n~~~", false},
+		{"inside nested tilde fences", "~~~~\n~~~\nbackport-audit: complete\n~~~\n~~~~", false},
+		{"as an indented code block", "Post this once checked:\n\n    backport-audit: complete", false},
+		{"indented by a space and a tab after a blank line", "\n\n \tbackport-audit: complete", false},
+		{"indented by a tab", "\tbackport-audit: complete", false},
+		{"indented by two spaces", "  backport-audit: complete", false},
+		{"after a line of spaces", "   \nbackport-audit: complete", false},
+		{"with text glued in front", "xbackport-audit: complete", false},
+		{"with an explanation above it", "Checked every commit by hand.\n\nbackport-audit: complete", false},
+		{"with a note below it", "backport-audit: complete\n\nthanks!", false},
+		{"twice", "backport-audit: complete\nbackport-audit: complete", false},
+		{"empty", "", false},
+	}
+	for _, tc := range cases {
+		if got := markerComment(tc.body); got != tc.want {
+			t.Errorf("%s: markerComment(%q) = %v, want %v", tc.name, tc.body, got, tc.want)
+		}
+	}
+}
+
+func TestBotAuthor(t *testing.T) {
+	for login, want := range map[string]bool{
+		"github-actions":      true,
+		"github-actions[bot]": true,
+		"coderabbitai":        true,
+		"CodeRabbitAI":        true,
+		"coderabbitai[bot]":   true,
+		"dependabot":          true,
+		"renovate":            true,
+		"copilot":             true,
+		"some-new-app[bot]":   true,
+		"myasnikovdaniil":     false,
+		"alice":               false,
+		"renovate-fan":        false,
+		"bot-enthusiast":      false,
+	} {
+		if got := botAuthor(login); got != want {
+			t.Errorf("botAuthor(%q) = %v, want %v", login, got, want)
+		}
+	}
+}
+
+func TestClaimState(t *testing.T) {
+	alice := &confirmation{By: "alice"}
+	cases := []struct {
+		states []string
+		conf   *confirmation
+		want   string
+	}{
+		{[]string{"MERGED"}, nil, "backport PR merged"},
+		{[]string{"CLOSED", "MERGED"}, nil, "backport PR merged"},
+		{[]string{"OPEN", "MERGED"}, nil, "backport PR merged"},
+		{[]string{"MERGED"}, alice, "backport PR merged, confirmed by @alice"},
+		{[]string{"OPEN"}, nil, "claimed here, not merged"},
+		{[]string{"CLOSED", "OPEN"}, nil, "claimed here, not merged"},
+		{[]string{"CLOSED"}, nil, "claimed here, closed unmerged"},
+	}
+	for _, tc := range cases {
+		var prs []linkedPR
+		for i, s := range tc.states {
+			prs = append(prs, linkedPR{Number: i + 1, State: s})
+		}
+		if got := claimState(prs, tc.conf); got != tc.want {
+			t.Errorf("claimState(%v, %v) = %q, want %q", tc.states, tc.conf, got, tc.want)
+		}
+	}
+}
diff --git a/cmd/backupstrategy-controller/main.go b/cmd/backupstrategy-controller/main.go
index d5995af04d..625d79820c 100644
--- a/cmd/backupstrategy-controller/main.go
+++ b/cmd/backupstrategy-controller/main.go
@@ -27,6 +27,7 @@ import (
 
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/types"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
 	ctrl "sigs.k8s.io/controller-runtime"
@@ -46,9 +47,13 @@ import (
 	"github.com/cozystack/cozystack/internal/backupcontroller/etcdtypes"
 	"github.com/cozystack/cozystack/internal/backupcontroller/foundationdbapp"
 	"github.com/cozystack/cozystack/internal/backupcontroller/foundationdbtypes"
+	"github.com/cozystack/cozystack/internal/backupcontroller/kafkatypes"
 	"github.com/cozystack/cozystack/internal/backupcontroller/mariadbapp"
 	"github.com/cozystack/cozystack/internal/backupcontroller/mariadbtypes"
+	"github.com/cozystack/cozystack/internal/backupcontroller/mongodbapp"
 	"github.com/cozystack/cozystack/internal/backupcontroller/postgresapp"
+	"github.com/cozystack/cozystack/internal/backupcontroller/psmdbtypes"
+	"github.com/cozystack/cozystack/internal/backupcontroller/rabbitmqtypes"
 	velerov1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
 	// +kubebuilder:scaffold:imports
 )
@@ -68,10 +73,14 @@ func init() {
 	utilruntime.Must(postgresapp.AddToScheme(scheme))
 	utilruntime.Must(mariadbtypes.AddToScheme(scheme))
 	utilruntime.Must(mariadbapp.AddToScheme(scheme))
+	utilruntime.Must(psmdbtypes.AddToScheme(scheme))
+	utilruntime.Must(mongodbapp.AddToScheme(scheme))
 	utilruntime.Must(foundationdbtypes.AddToScheme(scheme))
 	utilruntime.Must(foundationdbapp.AddToScheme(scheme))
 	utilruntime.Must(etcdtypes.AddToScheme(scheme))
 	utilruntime.Must(etcdapp.AddToScheme(scheme))
+	utilruntime.Must(rabbitmqtypes.AddToScheme(scheme))
+	utilruntime.Must(kafkatypes.AddToScheme(scheme))
 	// +kubebuilder:scaffold:scheme
 }
 
@@ -203,6 +212,44 @@ func main() {
 		}
 	}
 
+	if err := mgr.Add(&backupcontroller.LegacyPasswordScrubber{Client: mgr.GetClient()}); err != nil {
+		setupLog.Error(err, "unable to add LegacyPasswordScrubber runnable")
+		os.Exit(1)
+	}
+
+	// The default Strategy CRs and the Velero BSL are Helm-templated behind
+	// a lookup of the BucketClaim the same chart creates, so a fresh install
+	// renders them empty — permanently, because helm-controller does not
+	// re-render an unchanged, successful release. The gate detects that and
+	// forces the one real Helm upgrade that materialises them. Disabled when
+	// the HelmRelease coordinates are not plumbed (e.g. a chart-less local run).
+	if hrName := os.Getenv("BACKUP_DEFAULT_OBJECTS_HELMRELEASE_NAME"); hrName != "" {
+		gate := &backupcontroller.DefaultObjectsGate{
+			Client:          mgr.GetClient(),
+			Config:          credentialsConfig,
+			BackupClassName: os.Getenv("BACKUP_DEFAULT_OBJECTS_BACKUPCLASS"),
+			HelmRelease: types.NamespacedName{
+				Namespace: os.Getenv("BACKUP_DEFAULT_OBJECTS_HELMRELEASE_NAMESPACE"),
+				Name:      hrName,
+			},
+			VeleroNamespace: os.Getenv("BACKUP_DEFAULT_OBJECTS_VELERO_NAMESPACE"),
+			// The platform bucket's <bucket>-system release renders the
+			// credentials Secret the projector reads, behind the same kind
+			// of install-time lookup — and while that Secret is missing
+			// nothing downstream can resolve. Empty when the bucket is not
+			// provisioned by Cozystack (external S3), where the Secret is
+			// admin-managed and no release renders it.
+			CredentialsHelmRelease: types.NamespacedName{
+				Namespace: os.Getenv("BACKUP_CREDENTIALS_HELMRELEASE_NAMESPACE"),
+				Name:      os.Getenv("BACKUP_CREDENTIALS_HELMRELEASE_NAME"),
+			},
+		}
+		if err := gate.SetupWithManager(mgr); err != nil {
+			setupLog.Error(err, "unable to add DefaultObjectsGate runnable")
+			os.Exit(1)
+		}
+	}
+
 	if err = (&backupcontroller.BackupJobReconciler{
 		Client:            mgr.GetClient(),
 		Scheme:            mgr.GetScheme(),
@@ -224,9 +271,10 @@ func main() {
 	}
 
 	if err = (&backupcontroller.BackupReconciler{
-		Client:   mgr.GetClient(),
-		Scheme:   mgr.GetScheme(),
-		Recorder: mgr.GetEventRecorderFor("backup-controller"),
+		Client:            mgr.GetClient(),
+		Scheme:            mgr.GetScheme(),
+		Recorder:          mgr.GetEventRecorderFor("backup-controller"),
+		CredentialsConfig: credentialsConfig,
 	}).SetupWithManager(mgr); err != nil {
 		setupLog.Error(err, "unable to create controller", "controller", "Backup")
 		os.Exit(1)
diff --git a/cmd/check-readiness/main.go b/cmd/check-readiness/main.go
new file mode 100644
index 0000000000..50fb8aaf8e
--- /dev/null
+++ b/cmd/check-readiness/main.go
@@ -0,0 +1,592 @@
+/*
+Copyright 2025 The Cozystack Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// Command check-readiness checks readiness of cozystack / Flux / Kubernetes
+// resources. It shells out to kubectl (resolved from PATH) and reports only
+// non-ready resources, parsed from status conditions rather than column
+// heuristics.
+package main
+
+import (
+	"fmt"
+	"os"
+	"os/exec"
+	"strconv"
+	"strings"
+	"sync"
+	"time"
+)
+
+// Version is set at build time via -ldflags "-X main.Version=...".
+var Version = "dev"
+
+// usageText is shown by -h/--help. Kept byte-for-byte identical to the golden
+// files in test/check-readiness/testdata/golden.
+const usageText = `Check readiness of cozystack / Flux / Kubernetes resources.
+Shows only non-ready resources, parsed from status conditions (not column heuristics).
+
+Fetches sequentially by default — intended to run during cozystack upgrades where
+the apiserver is already under heavy reconciler load, so we avoid bursts of N
+concurrent LIST requests. Use --parallel for one-shot interactive runs against a
+healthy cluster (3-4x faster wall-clock).
+
+Usage:
+  check-readiness [OPTIONS]
+
+Options:
+  -w, --watch [INTERVAL]    Watch mode; refresh every INTERVAL seconds (default: 10)
+      --wait                Block until everything is ready (exit 0) or timeout (exit 1)
+      --timeout DURATION    Timeout for --wait, e.g. 30m, 1h, 600s (default: 30m)
+      --parallel            Fire all fetches concurrently (faster, more apiserver load)
+      --core                Check only essential cozystack/Flux kinds (5 instead of 14)
+  -v, --verbose             Show condition reason/message for not-ready rows
+  -n, --namespace NS        Scope to a single namespace (cluster-scoped kinds ignore this)
+  -l, --selector SELECTOR   kubectl label selector to apply to every query
+      --no-color            Disable color output (auto-disabled on non-TTY)
+  -h, --help                Show this help
+
+`
+
+// entry is a resource catalog item.
+type entry struct {
+	kind            string
+	scope           string // "namespaced" | "cluster"
+	condType        string // condition .type, or "_phase" for PVCs
+	supportsSuspend bool
+}
+
+var coreKinds = []entry{
+	{"packages.cozystack.io", "cluster", "Ready", false},
+	{"artifactgenerators.source.extensions.fluxcd.io", "namespaced", "Ready", true},
+	{"externalartifacts.source.toolkit.fluxcd.io", "namespaced", "Ready", false},
+	{"helmreleases.helm.toolkit.fluxcd.io", "namespaced", "Ready", true},
+	{"kustomizations.kustomize.toolkit.fluxcd.io", "namespaced", "Ready", true},
+}
+
+var fluxExtraKinds = []entry{
+	{"gitrepositories.source.toolkit.fluxcd.io", "namespaced", "Ready", true},
+	{"ocirepositories.source.toolkit.fluxcd.io", "namespaced", "Ready", true},
+	{"helmrepositories.source.toolkit.fluxcd.io", "namespaced", "Ready", true},
+	{"helmcharts.source.toolkit.fluxcd.io", "namespaced", "Ready", true},
+	{"buckets.source.toolkit.fluxcd.io", "namespaced", "Ready", true},
+}
+
+var clusterKinds = []entry{
+	{"nodes", "cluster", "Ready", false},
+	{"apiservices.apiregistration.k8s.io", "cluster", "Available", false},
+	{"customresourcedefinitions.apiextensions.k8s.io", "cluster", "Established", false},
+}
+
+var pvcKind = entry{"persistentvolumeclaims", "namespaced", "_phase", false}
+
+type config struct {
+	kubectl []string
+
+	watch     bool
+	interval  int
+	waitMode  bool
+	timeoutS  int
+	verbose   bool
+	namespace string
+	selector  string
+	useColor  bool
+	parallel  bool
+	coreOnly  bool
+
+	// colors
+	red, green, yellow, cyan, dim, bold, reset string
+
+	// cached api-resources
+	apiCache  string
+	apiCached bool
+
+	foundIssues bool
+}
+
+func main() {
+	os.Exit(run(os.Args[1:]))
+}
+
+func run(args []string) int {
+	cfg := &config{
+		kubectl:  []string{"kubectl"},
+		interval: 10,
+		timeoutS: 0,
+		useColor: true,
+	}
+	if kc := os.Getenv("KUBECONFIG"); kc != "" {
+		cfg.kubectl = append(cfg.kubectl, "--kubeconfig="+kc)
+	}
+
+	timeoutRaw := "30m"
+
+	i := 0
+	for i < len(args) {
+		a := args[i]
+		switch a {
+		case "-w", "--watch":
+			cfg.watch = true
+			if i+1 < len(args) && isAllDigits(args[i+1]) {
+				cfg.interval, _ = strconv.Atoi(args[i+1])
+				i++
+			}
+			i++
+		case "--wait":
+			cfg.waitMode = true
+			i++
+		case "--timeout":
+			if i+1 >= len(args) {
+				fmt.Fprintln(os.Stderr, "--timeout requires a value")
+				return 2
+			}
+			timeoutRaw = args[i+1]
+			i += 2
+		case "-v", "--verbose":
+			cfg.verbose = true
+			i++
+		case "-n", "--namespace":
+			if i+1 >= len(args) {
+				fmt.Fprintln(os.Stderr, "--namespace requires a value")
+				return 2
+			}
+			cfg.namespace = args[i+1]
+			i += 2
+		case "-l", "--selector":
+			if i+1 >= len(args) {
+				fmt.Fprintln(os.Stderr, "--selector requires a value")
+				return 2
+			}
+			cfg.selector = args[i+1]
+			i += 2
+		case "--no-color":
+			cfg.useColor = false
+			i++
+		case "--parallel":
+			cfg.parallel = true
+			i++
+		case "--core":
+			cfg.coreOnly = true
+			i++
+		case "-h", "--help":
+			fmt.Fprint(os.Stdout, usageText)
+			return 0
+		case "--version":
+			fmt.Fprintln(os.Stdout, Version)
+			return 0
+		default:
+			fmt.Fprintf(os.Stderr, "Unknown argument: %s\n", a)
+			fmt.Fprint(os.Stderr, usageText)
+			return 2
+		}
+	}
+
+	// Auto-disable color on non-TTY.
+	if fi, err := os.Stdout.Stat(); err == nil {
+		if fi.Mode()&os.ModeCharDevice == 0 {
+			cfg.useColor = false
+		}
+	} else {
+		cfg.useColor = false
+	}
+
+	cfg.setColors()
+
+	// parse_timeout runs unconditionally on every invocation.
+	sec, ok := parseTimeout(timeoutRaw)
+	if !ok {
+		fmt.Fprintf(os.Stderr, "Invalid --timeout value: %s (expected e.g. 30m, 1h, 600s)\n", timeoutRaw)
+		return 2
+	}
+	cfg.timeoutS = sec
+
+	if cfg.waitMode {
+		return cfg.runWait()
+	}
+	if cfg.watch {
+		cfg.runWatch()
+		return 0
+	}
+	out := cfg.runOnce()
+	fmt.Print(out)
+	if cfg.foundIssues {
+		return 1
+	}
+	return 0
+}
+
+func (cfg *config) setColors() {
+	if cfg.useColor {
+		cfg.red = "\033[0;31m"
+		cfg.green = "\033[0;32m"
+		cfg.yellow = "\033[1;33m"
+		cfg.cyan = "\033[0;36m"
+		cfg.dim = "\033[2m"
+		cfg.bold = "\033[1m"
+		cfg.reset = "\033[0m"
+	}
+}
+
+func isAllDigits(s string) bool {
+	if s == "" {
+		return false
+	}
+	for _, r := range s {
+		if r < '0' || r > '9' {
+			return false
+		}
+	}
+	return true
+}
+
+// parseTimeout accepts ^[0-9]+[smh]?$ (bare number = seconds).
+func parseTimeout(raw string) (int, bool) {
+	if raw == "" {
+		return 0, false
+	}
+	unit := byte('s')
+	digits := raw
+	last := raw[len(raw)-1]
+	if last == 's' || last == 'm' || last == 'h' {
+		unit = last
+		digits = raw[:len(raw)-1]
+	}
+	if !isAllDigits(digits) {
+		return 0, false
+	}
+	n, err := strconv.Atoi(digits)
+	if err != nil {
+		return 0, false
+	}
+	switch unit {
+	case 's':
+		return n, true
+	case 'm':
+		return n * 60, true
+	case 'h':
+		return n * 3600, true
+	}
+	return 0, false
+}
+
+func (cfg *config) runWait() int {
+	start := time.Now()
+	for {
+		output := cfg.runOnce()
+		elapsed := int(time.Since(start).Seconds())
+		if strings.Contains(output, "All resources are ready.") {
+			fmt.Print(output)
+			fmt.Printf("%sReady after %ds.%s\n", cfg.green, elapsed, cfg.reset)
+			return 0
+		}
+		if elapsed >= cfg.timeoutS {
+			fmt.Print(output)
+			fmt.Fprintf(os.Stderr, "%s%sTimeout after %ds — resources still not ready.%s\n", cfg.red, cfg.bold, cfg.timeoutS, cfg.reset)
+			return 1
+		}
+		time.Sleep(time.Duration(cfg.interval) * time.Second)
+	}
+}
+
+func (cfg *config) runWatch() {
+	for {
+		output := cfg.runOnce()
+		// Smooth clear is cosmetic and untested; just reprint.
+		fmt.Printf("%sLast updated: %s  (refreshing every %ds, Ctrl+C to stop)%s\n", cfg.bold, time.Now().Format(time.UnixDate), cfg.interval, cfg.reset)
+		fmt.Println()
+		fmt.Print(output)
+		time.Sleep(time.Duration(cfg.interval) * time.Second)
+	}
+}
+
+// buildScopeArgs mirrors build_kubectl_scope_args.
+func (cfg *config) buildScopeArgs(scope string) []string {
+	var out []string
+	if scope == "namespaced" {
+		if cfg.namespace != "" {
+			out = append(out, "-n", cfg.namespace)
+		} else {
+			out = append(out, "-A")
+		}
+	}
+	if cfg.selector != "" {
+		out = append(out, "-l", cfg.selector)
+	}
+	return out
+}
+
+func (cfg *config) ensureAPIResources() {
+	if cfg.apiCached {
+		return
+	}
+	args := append(append([]string{}, cfg.kubectl[1:]...), "api-resources", "--no-headers")
+	cmd := exec.Command(cfg.kubectl[0], args...)
+	out, err := cmd.Output()
+	if err != nil {
+		cfg.apiCache = ""
+	} else {
+		cfg.apiCache = string(out)
+	}
+	cfg.apiCached = true
+}
+
+// kindExists checks the cached api-resources output.
+func (cfg *config) kindExists(kind string) bool {
+	cfg.ensureAPIResources()
+	if cfg.apiCache == "" {
+		return true
+	}
+	name := kind
+	group := ""
+	if before, after, ok := strings.Cut(kind, "."); ok {
+		name = before
+		group = after
+	}
+	for line := range strings.SplitSeq(cfg.apiCache, "\n") {
+		fields := strings.Fields(line)
+		if len(fields) < 3 {
+			continue
+		}
+		if fields[0] != name {
+			continue
+		}
+		apiv := fields[len(fields)-3]
+		grp := ""
+		if parts := strings.SplitN(apiv, "/", 2); len(parts) == 2 {
+			grp = parts[0]
+		}
+		if group == "" || group == grp {
+			return true
+		}
+	}
+	return false
+}
+
+// fetchRows runs kubectl get and returns raw jsonpath output.
+func (cfg *config) fetchRows(e entry) string {
+	scopeArgs := cfg.buildScopeArgs(e.scope)
+
+	var jsonpath string
+	if e.condType == "_phase" {
+		jsonpath = `{range .items[*]}{.metadata.namespace}{"\x1f"}{.metadata.name}{"\x1f"}{.status.phase}{"\x1f"}{""}{"\x1f"}{""}{"\x1f"}{"false"}{"\n"}{end}`
+	} else {
+		suspendField := `{"false"}`
+		if e.supportsSuspend {
+			suspendField = `{.spec.suspend}`
+		}
+		var b strings.Builder
+		b.WriteString(`{range .items[*]}`)
+		b.WriteString(`{.metadata.namespace}{"\x1f"}`)
+		b.WriteString(`{.metadata.name}{"\x1f"}`)
+		b.WriteString(`{.status.conditions[?(@.type=="` + e.condType + `")].status}{"\x1f"}`)
+		b.WriteString(`{.status.conditions[?(@.type=="` + e.condType + `")].reason}{"\x1f"}`)
+		b.WriteString(`{.status.conditions[?(@.type=="` + e.condType + `")].message}{"\x1f"}`)
+		b.WriteString(suspendField + `{"\n"}`)
+		b.WriteString(`{end}`)
+		jsonpath = b.String()
+	}
+
+	args := append([]string{}, cfg.kubectl[1:]...)
+	args = append(args, "get", e.kind)
+	args = append(args, scopeArgs...)
+	args = append(args, "-o", "jsonpath="+jsonpath)
+
+	cmd := exec.Command(cfg.kubectl[0], args...)
+	out, _ := cmd.Output() // ignore errors, like `|| true`
+	return string(out)
+}
+
+// formatExtra mirrors format_extra.
+func formatExtra(reason, message string) string {
+	extra := ""
+	if reason != "" && reason != "<none>" {
+		extra = reason
+	}
+	if message != "" && message != "<none>" {
+		trimmed := message
+		if idx := strings.IndexByte(trimmed, '\n'); idx >= 0 {
+			trimmed = trimmed[:idx]
+		}
+		trimmed = cutChars(trimmed, 120)
+		if extra != "" {
+			extra = extra + ": " + trimmed
+		} else {
+			extra = trimmed
+		}
+	}
+	return extra
+}
+
+// cutChars mimics `cut -c1-N` (byte-based for single-byte; cut counts bytes in
+// the C locale). Use runes to be safe with the test data which is ASCII.
+func cutChars(s string, n int) string {
+	if len(s) <= n {
+		return s
+	}
+	return s[:n]
+}
+
+// processRows mirrors process_rows; appends rendered output to b.
+func (cfg *config) processRows(e entry, rows string, b *strings.Builder) {
+	if rows == "" {
+		return
+	}
+	headerPrinted := false
+	notReady := 0
+	total := 0
+
+	for line := range strings.SplitSeq(rows, "\n") {
+		if line == "" {
+			continue
+		}
+		fields := strings.Split(line, "\x1f")
+		// ns name status reason message suspended
+		var ns, name, status, reason, message, suspended string
+		if len(fields) > 0 {
+			ns = fields[0]
+		}
+		if len(fields) > 1 {
+			name = fields[1]
+		}
+		if len(fields) > 2 {
+			status = fields[2]
+		}
+		if len(fields) > 3 {
+			reason = fields[3]
+		}
+		if len(fields) > 4 {
+			message = fields[4]
+		}
+		if len(fields) > 5 {
+			suspended = fields[5]
+		}
+
+		if name == "" {
+			continue
+		}
+		total++
+
+		label := ""
+		color := ""
+		if suspended == "true" {
+			label = "SUSPENDED"
+			color = cfg.cyan
+		} else if e.condType == "_phase" {
+			if status != "Bound" {
+				label = status
+				color = cfg.red
+			}
+		} else {
+			if status != "True" {
+				if status == "" {
+					label = "Unknown"
+				} else {
+					label = status
+				}
+				color = cfg.red
+			}
+		}
+
+		if label == "" {
+			continue
+		}
+
+		if !headerPrinted {
+			fmt.Fprintf(b, "%s%s=== %s (not ready) ===%s\n", cfg.bold, cfg.yellow, e.kind, cfg.reset)
+			headerPrinted = true
+		}
+		notReady++
+
+		var prefix string
+		if ns != "" {
+			prefix = fmt.Sprintf("%-30s %-50s %s", ns, name, label)
+		} else {
+			prefix = fmt.Sprintf("%-50s %s", name, label)
+		}
+		fmt.Fprintf(b, "%s%s%s\n", color, prefix, cfg.reset)
+
+		if cfg.verbose {
+			extra := formatExtra(reason, message)
+			if extra != "" {
+				fmt.Fprintf(b, "  %s%s%s\n", cfg.dim, extra, cfg.reset)
+			}
+		}
+
+		if label != "SUSPENDED" {
+			cfg.foundIssues = true
+		}
+	}
+
+	if headerPrinted && cfg.verbose {
+		fmt.Fprintf(b, "%s  -> %d/%d not ready%s\n", cfg.dim, notReady, total, cfg.reset)
+	}
+}
+
+func (cfg *config) runOnce() string {
+	cfg.foundIssues = false
+	cfg.ensureAPIResources()
+
+	entries := append([]entry{}, coreKinds...)
+	if !cfg.coreOnly {
+		entries = append(entries, fluxExtraKinds...)
+		entries = append(entries, clusterKinds...)
+		entries = append(entries, pvcKind)
+	}
+
+	rowsByIdx := make([]string, len(entries))
+
+	// Phase 1: fetch.
+	if cfg.parallel {
+		var wg sync.WaitGroup
+		for idx := range entries {
+			e := entries[idx]
+			if !cfg.kindExists(e.kind) {
+				continue
+			}
+			wg.Add(1)
+			go func(idx int, e entry) {
+				defer wg.Done()
+				rowsByIdx[idx] = cfg.fetchRows(e)
+			}(idx, e)
+		}
+		wg.Wait()
+	} else {
+		for idx := range entries {
+			e := entries[idx]
+			if !cfg.kindExists(e.kind) {
+				continue
+			}
+			rowsByIdx[idx] = cfg.fetchRows(e)
+		}
+	}
+
+	var b strings.Builder
+
+	// Phase 2: process in catalog order.
+	for idx := range entries {
+		e := entries[idx]
+		if !cfg.kindExists(e.kind) {
+			fmt.Fprintf(&b, "%s--- %s: CRD not installed, skipping%s\n", cfg.dim, e.kind, cfg.reset)
+			continue
+		}
+		cfg.processRows(e, rowsByIdx[idx], &b)
+	}
+
+	if !cfg.foundIssues {
+		fmt.Fprintf(&b, "%s%sAll resources are ready.%s\n", cfg.green, cfg.bold, cfg.reset)
+	}
+
+	return b.String()
+}
diff --git a/cmd/cozypkg/cmd/add.go b/cmd/cozypkg/cmd/add.go
index 2357fc45f8..0501fff639 100644
--- a/cmd/cozypkg/cmd/add.go
+++ b/cmd/cozypkg/cmd/add.go
@@ -25,24 +25,28 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/spf13/cobra"
 	cozyv1alpha1 "github.com/cozystack/cozystack/api/v1alpha1"
+	"github.com/cozystack/cozystack/internal/marketplace/collision"
+	"github.com/cozystack/cozystack/internal/marketplace/tapconst"
+	"github.com/spf13/cobra"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/serializer/yaml"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
+	_ "k8s.io/client-go/plugin/pkg/client/auth"
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
-	_ "k8s.io/client-go/plugin/pkg/client/auth"
 )
 
 var addCmdFlags struct {
-	files      []string
-	kubeconfig string
+	files           []string
+	kubeconfig      string
+	allowPrivileged bool
 }
 
 var addCmd = &cobra.Command{
@@ -59,7 +63,7 @@ Multiple -f flags can be specified, and they can point to files or directories.`
 		// Collect package names from arguments and files
 		packageNames := make(map[string]bool)
 		packagesFromFiles := make(map[string]string) // packageName -> filePath
-		
+
 		for _, arg := range args {
 			packageNames[arg] = true
 		}
@@ -119,7 +123,7 @@ Multiple -f flags can be specified, and they can point to files or directories.`
 				}
 				// If failed, fall back to interactive installation
 			}
-			
+
 			// Interactive installation from PackageSource
 			if err := installPackage(ctx, k8sClient, packageName); err != nil {
 				return err
@@ -177,9 +181,9 @@ func readPackagesFromYAMLFile(filePath string) ([]string, error) {
 	var packages []string
 
 	// Split YAML documents (in case of multiple resources)
-	documents := strings.Split(string(data), "---")
-	
-	for _, doc := range documents {
+	documents := strings.SplitSeq(string(data), "---")
+
+	for doc := range documents {
 		doc = strings.TrimSpace(doc)
 		if doc == "" {
 			continue
@@ -216,8 +220,8 @@ func readPackagesFromYAMLFile(filePath string) ([]string, error) {
 			items, found, err := unstructured.NestedSlice(obj.Object, "items")
 			if err == nil && found {
 				for _, item := range items {
-					if itemMap, ok := item.(map[string]interface{}); ok {
-						if metadata, ok := itemMap["metadata"].(map[string]interface{}); ok {
+					if itemMap, ok := item.(map[string]any); ok {
+						if metadata, ok := itemMap["metadata"].(map[string]any); ok {
 							if name, ok := metadata["name"].(string); ok && name != "" {
 								packages = append(packages, name)
 							}
@@ -240,7 +244,7 @@ func buildDependencyTree(ctx context.Context, k8sClient client.Client, rootName
 	tree := make(map[string][]string)
 	dependencyRequesters := make(map[string]string) // dep -> requester
 	visited := make(map[string]bool)
-	
+
 	// Ensure root is in tree even if it has no dependencies
 	tree[rootName] = []string{}
 
@@ -353,9 +357,9 @@ func createPackageFromFile(ctx context.Context, k8sClient client.Client, filePat
 	}
 
 	// Split YAML documents
-	documents := strings.Split(string(data), "---")
-	
-	for _, doc := range documents {
+	documents := strings.SplitSeq(string(data), "---")
+
+	for doc := range documents {
 		doc = strings.TrimSpace(doc)
 		if doc == "" {
 			continue
@@ -434,9 +438,17 @@ func installPackage(ctx context.Context, k8sClient client.Client, packageSourceN
 	fmt.Fprintf(os.Stderr, "Installing %s and its dependencies...\n\n", packageSourceName)
 	packageVariants := make(map[string]string) // packageName -> variant
 
+	// reopen holds the names whose installed Package is THIS source's managed
+	// auto-registration, which `add` re-opens for a variant choice and then hands
+	// over to the user (below). Every other installed Package is left as is.
+	reopen := make(map[string]bool)
 	for _, pkgName := range installOrder {
-		// Check if already installed
-		if installed, exists := installedMap[pkgName]; exists {
+		installed, isInstalled := installedMap[pkgName]
+		ps, psExists := packageSourceMap[pkgName]
+		// A user's own Package, or a foreign leftover, is left untouched; only the
+		// managed auto-registration of THIS source (owned + empty variant, the same
+		// predicate the operator uses) is re-opened for a variant choice.
+		if isInstalled && !collision.ManagedRegistration(installed, tapSourceName(ps), installed.Spec.Variant) {
 			variant := installed.Spec.Variant
 			if variant == "" {
 				variant = "default"
@@ -446,9 +458,7 @@ func installPackage(ctx context.Context, k8sClient client.Client, packageSourceN
 			continue
 		}
 
-		// Get PackageSource for this dependency
-		ps, exists := packageSourceMap[pkgName]
-		if !exists {
+		if !psExists {
 			requester := dependencyRequesters[pkgName]
 			if requester != "" {
 				return fmt.Errorf("PackageSource %s not found (required by %s)", pkgName, requester)
@@ -462,17 +472,47 @@ func installPackage(ctx context.Context, k8sClient client.Client, packageSourceN
 			return fmt.Errorf("failed to select variant for %s: %w", pkgName, err)
 		}
 
+		// A privileged component runs with elevated access; require an explicit
+		// confirmation (or --allow-privileged) before installing it.
+		if privileged := collision.PrivilegedInstallComponents(ps, variant); len(privileged) > 0 && !addCmdFlags.allowPrivileged {
+			ok, err := confirmPrivileged(pkgName, variant, privileged)
+			if err != nil {
+				return err
+			}
+			if !ok {
+				return fmt.Errorf("aborted: %s variant %s has privileged component(s) %v; re-run with --allow-privileged to install", pkgName, variant, privileged)
+			}
+		}
+
 		packageVariants[pkgName] = variant
+		if isInstalled {
+			reopen[pkgName] = true
+		}
 	}
 
 	// Now create all Package resources
 	for _, pkgName := range installOrder {
-		// Skip if already installed
-		if _, exists := installedMap[pkgName]; exists {
+		variant := packageVariants[pkgName]
+
+		if reopen[pkgName] {
+			// Running `add` is an explicit ownership handover: convert the managed
+			// auto-registration into a plain user Package pinned to the chosen
+			// variant (shedding the tap markers and the PackageSource ownerRef), so
+			// the materializer no longer manages or de-registers it. Otherwise a
+			// later revision that turns the DEFAULT variant privileged would undo
+			// the user's deliberate choice, including a confirmed privileged one.
+			installed := installedMap[pkgName]
+			if err := handoverManagedRegistration(ctx, k8sClient, installed, variant); err != nil {
+				return fmt.Errorf("failed to set variant %s on Package %s: %w", variant, pkgName, err)
+			}
+			fmt.Fprintf(os.Stderr, "✓ %s (variant set to %s)\n", pkgName, variant)
+			continue
+		}
+		// A non-reopened already-installed Package (a user's own, or a foreign
+		// leftover) was reported in phase 1 and needs nothing here.
+		if _, isInstalled := installedMap[pkgName]; isInstalled {
 			continue
 		}
-
-		variant := packageVariants[pkgName]
 
 		// Create Package
 		pkg := &cozyv1alpha1.Package{
@@ -484,9 +524,19 @@ func installPackage(ctx context.Context, k8sClient client.Client, packageSourceN
 			},
 		}
 
-		if err := k8sClient.Create(ctx, pkg); err != nil {
+		created, err := createPackageIdempotent(ctx, k8sClient, pkg)
+		if err != nil {
 			return fmt.Errorf("failed to create Package %s: %w", pkgName, err)
 		}
+		if !created {
+			// The materializer auto-created the registration Package between the
+			// List above and this Create, so this run did not take ownership of it
+			// (its markers are not shed). Re-run so the reopen path pins it -- for a
+			// non-default variant to apply the choice, and for the default variant so
+			// a later privileged flip does not de-register this deliberate install.
+			_, _ = fmt.Fprintf(os.Stderr, "Package %s was just auto-registered; re-run 'cozypkg add %s' to install variant %q as your own\n", pkgName, pkgName, variant)
+			continue
+		}
 
 		fmt.Fprintf(os.Stderr, "✓ Added Package %s\n", pkgName)
 	}
@@ -494,6 +544,58 @@ func installPackage(ctx context.Context, k8sClient client.Client, packageSourceN
 	return nil
 }
 
+// tapSourceName returns the PackageSource's tap source (its OCIRepository name),
+// or "" when it is not a tapped source; it is the name collision.ManagedRegistration
+// matches a registration Package's tap-source annotation against.
+func tapSourceName(ps *cozyv1alpha1.PackageSource) string {
+	if ps != nil && ps.Spec.SourceRef != nil {
+		return ps.Spec.SourceRef.Name
+	}
+	return ""
+}
+
+// handoverManagedRegistration converts a tap-managed auto-registration Package
+// into a plain user Package pinned to variant and persists it. Running `cozypkg
+// add` is the operator's explicit ownership handover: pinRegistrationToUser sheds
+// the tap markers and the PackageSource ownerRef so the materializer no longer
+// manages or de-registers the Package, and so a later revision that turns the
+// variant privileged cannot silently reinstall over the user's deliberate choice.
+func handoverManagedRegistration(ctx context.Context, k8sClient client.Client, installed *cozyv1alpha1.Package, variant string) error {
+	pinRegistrationToUser(installed, variant)
+	return k8sClient.Update(ctx, installed)
+}
+
+// pinRegistrationToUser turns a tap auto-registration Package into a plain
+// user-owned Package pinned to variant: it sets the variant and sheds the tap
+// markers (label, source annotation) and the PackageSource ownerReference, so the
+// tap materializer no longer manages or de-registers it and untap treats it as
+// the user's.
+func pinRegistrationToUser(pkg *cozyv1alpha1.Package, variant string) {
+	pkg.Spec.Variant = variant
+	delete(pkg.Labels, tapconst.Label)
+	delete(pkg.Annotations, tapconst.SourceAnnotation)
+	kept := pkg.OwnerReferences[:0]
+	for _, ref := range pkg.OwnerReferences {
+		if ref.Kind != "PackageSource" {
+			kept = append(kept, ref)
+		}
+	}
+	pkg.OwnerReferences = kept
+}
+
+// createPackageIdempotent creates pkg and reports whether it created a new
+// object. A tapped repository registers its apps on connect, so the Package may
+// already exist; that is treated as done (created=false) rather than an error.
+func createPackageIdempotent(ctx context.Context, k8sClient client.Client, pkg *cozyv1alpha1.Package) (bool, error) {
+	if err := k8sClient.Create(ctx, pkg); err != nil {
+		if apierrors.IsAlreadyExists(err) {
+			return false, nil
+		}
+		return false, err
+	}
+	return true, nil
+}
+
 // selectVariantInteractive prompts user to select a variant
 func selectVariantInteractive(ps *cozyv1alpha1.PackageSource) (string, error) {
 	if len(ps.Spec.Variants) == 0 {
@@ -541,9 +643,27 @@ func selectVariantInteractive(ps *cozyv1alpha1.PackageSource) (string, error) {
 	}
 }
 
+// confirmPrivileged prompts the operator to confirm installing privileged
+// components. It defaults to No.
+func confirmPrivileged(pkgName, variant string, components []string) (bool, error) {
+	fmt.Fprintf(os.Stderr, "\n⚠ %s variant %s installs privileged component(s): %s\n", pkgName, variant, strings.Join(components, ", "))
+	fmt.Fprint(os.Stderr, "These run with elevated cluster access. Install anyway? [y/N]: ")
+	reader := bufio.NewReader(os.Stdin)
+	input, err := reader.ReadString('\n')
+	if err != nil {
+		return false, fmt.Errorf("failed to read confirmation: %w", err)
+	}
+	switch strings.ToLower(strings.TrimSpace(input)) {
+	case "y", "yes":
+		return true, nil
+	default:
+		return false, nil
+	}
+}
+
 func init() {
 	rootCmd.AddCommand(addCmd)
+	addCmd.Flags().BoolVar(&addCmdFlags.allowPrivileged, "allow-privileged", false, "Install privileged components without an interactive confirmation")
 	addCmd.Flags().StringArrayVarP(&addCmdFlags.files, "file", "f", []string{}, "Read packages from file or directory (can be specified multiple times)")
 	addCmd.Flags().StringVar(&addCmdFlags.kubeconfig, "kubeconfig", "", "Path to kubeconfig file (defaults to ~/.kube/config or KUBECONFIG env var)")
 }
-
diff --git a/cmd/cozypkg/cmd/add_test.go b/cmd/cozypkg/cmd/add_test.go
new file mode 100644
index 0000000000..c364eaf75f
--- /dev/null
+++ b/cmd/cozypkg/cmd/add_test.go
@@ -0,0 +1,128 @@
+/*
+Copyright 2025 The Cozystack Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package cmd
+
+import (
+	"context"
+	"testing"
+
+	cozyv1alpha1 "github.com/cozystack/cozystack/api/v1alpha1"
+	"github.com/cozystack/cozystack/internal/marketplace/collision"
+	"github.com/cozystack/cozystack/internal/marketplace/tapconst"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
+	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/client/fake"
+)
+
+func TestPrivilegedComponents(t *testing.T) {
+	ps := &cozyv1alpha1.PackageSource{
+		Spec: cozyv1alpha1.PackageSourceSpec{
+			Variants: []cozyv1alpha1.Variant{
+				{
+					Name: "default",
+					Components: []cozyv1alpha1.Component{
+						{Name: "app", Path: "apps/app"},
+						{Name: "risky", Path: "apps/risky", Install: &cozyv1alpha1.ComponentInstall{Privileged: true}},
+					},
+				},
+				{
+					Name:       "safe",
+					Components: []cozyv1alpha1.Component{{Name: "app", Path: "apps/app"}},
+				},
+			},
+		},
+	}
+
+	if got := collision.PrivilegedInstallComponents(ps, "default"); len(got) != 1 || got[0] != "risky" {
+		t.Errorf("default variant privileged = %v, want [risky]", got)
+	}
+	if got := collision.PrivilegedInstallComponents(ps, "safe"); len(got) != 0 {
+		t.Errorf("safe variant should have no privileged components, got %v", got)
+	}
+	if got := collision.PrivilegedInstallComponents(ps, "nonexistent"); len(got) != 0 {
+		t.Errorf("unknown variant should return none, got %v", got)
+	}
+}
+
+func TestPinRegistrationToUser(t *testing.T) {
+	pkg := &cozyv1alpha1.Package{
+		ObjectMeta: metav1.ObjectMeta{
+			Labels:      map[string]string{tapconst.Label: "true", "keep": "me"},
+			Annotations: map[string]string{tapconst.SourceAnnotation: "tap-a", "keep": "me"},
+			OwnerReferences: []metav1.OwnerReference{
+				{Kind: "PackageSource", Name: "acme.app"},
+				{Kind: "SomethingElse", Name: "other"},
+			},
+		},
+	}
+	pinRegistrationToUser(pkg, "full")
+	if pkg.Spec.Variant != "full" {
+		t.Errorf("variant not pinned, got %q", pkg.Spec.Variant)
+	}
+	if pkg.GetLabels()[tapconst.Label] == "true" {
+		t.Error("a pinned Package must no longer carry the tap label")
+	}
+	if _, ok := pkg.Labels[tapconst.Label]; ok {
+		t.Error("tap label must be shed")
+	}
+	if _, ok := pkg.Annotations[tapconst.SourceAnnotation]; ok {
+		t.Error("source annotation must be shed")
+	}
+	if pkg.Labels["keep"] != "me" || pkg.Annotations["keep"] != "me" {
+		t.Error("unrelated labels/annotations must be preserved")
+	}
+	if len(pkg.OwnerReferences) != 1 || pkg.OwnerReferences[0].Kind != "SomethingElse" {
+		t.Errorf("only the PackageSource ownerRef must be dropped, got %+v", pkg.OwnerReferences)
+	}
+}
+
+func TestHandoverManagedRegistration(t *testing.T) {
+	s := runtime.NewScheme()
+	utilruntime.Must(clientgoscheme.AddToScheme(s))
+	utilruntime.Must(cozyv1alpha1.AddToScheme(s))
+	pkg := &cozyv1alpha1.Package{ObjectMeta: metav1.ObjectMeta{
+		Name:            "acme.app",
+		Labels:          map[string]string{tapconst.Label: "true"},
+		Annotations:     map[string]string{tapconst.SourceAnnotation: "tap-acme-app"},
+		OwnerReferences: []metav1.OwnerReference{{APIVersion: "cozystack.io/v1alpha1", Kind: "PackageSource", Name: "acme.app"}},
+	}}
+	cl := fake.NewClientBuilder().WithScheme(s).WithObjects(pkg).Build()
+	if err := handoverManagedRegistration(context.Background(), cl, pkg, "full"); err != nil {
+		t.Fatalf("handover: %v", err)
+	}
+	var got cozyv1alpha1.Package
+	if err := cl.Get(context.Background(), client.ObjectKey{Name: "acme.app"}, &got); err != nil {
+		t.Fatal(err)
+	}
+	if got.Spec.Variant != "full" {
+		t.Errorf("variant not pinned, got %q", got.Spec.Variant)
+	}
+	if got.Labels[tapconst.Label] == "true" {
+		t.Error("tap label must be shed on handover")
+	}
+	if _, ok := got.Annotations[tapconst.SourceAnnotation]; ok {
+		t.Error("source annotation must be shed on handover")
+	}
+	for _, ref := range got.OwnerReferences {
+		if ref.Kind == "PackageSource" {
+			t.Error("PackageSource ownerRef must be shed on handover")
+		}
+	}
+}
diff --git a/cmd/cozypkg/cmd/dependencies.go b/cmd/cozypkg/cmd/dependencies.go
index 7db71d4a32..3e6f5a6c07 100644
--- a/cmd/cozypkg/cmd/dependencies.go
+++ b/cmd/cozypkg/cmd/dependencies.go
@@ -20,6 +20,7 @@ import (
 	"context"
 	"fmt"
 	"os"
+	"slices"
 	"strings"
 
 	cozyv1alpha1 "github.com/cozystack/cozystack/api/v1alpha1"
@@ -205,13 +206,7 @@ func buildGraphFromCluster(ctx context.Context, kubeconfig string, packagesOnly
 
 		// Filter by selected packages if specified
 		if len(selectedPackages) > 0 {
-			found := false
-			for _, selected := range selectedPackages {
-				if psName == selected {
-					found = true
-					break
-				}
-			}
+			found := slices.Contains(selectedPackages, psName)
 			if !found {
 				continue
 			}
@@ -393,7 +388,7 @@ func buildGraphFromCluster(ctx context.Context, kubeconfig string, packagesOnly
 						graph[componentName] = append(graph[componentName], psName)
 						existingEdges[edgeKey] = true
 					}
-					
+
 					// If component is not in all variants, store variant info for component->package edge
 					componentAllVariants := componentVariants[componentName]
 					if len(componentAllVariants) < len(allVariantNames) {
diff --git a/cmd/cozypkg/cmd/index.go b/cmd/cozypkg/cmd/index.go
new file mode 100644
index 0000000000..c9fe82714c
--- /dev/null
+++ b/cmd/cozypkg/cmd/index.go
@@ -0,0 +1,233 @@
+/*
+Copyright 2025 The Cozystack Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package cmd
+
+import (
+	"fmt"
+	"io"
+	"io/fs"
+	"os"
+	"path/filepath"
+	"sort"
+	"strings"
+	"text/tabwriter"
+
+	"github.com/spf13/cobra"
+	"sigs.k8s.io/yaml"
+)
+
+// IndexEntry is one metadata-only record in the community package index. The
+// index stores no artifacts, only where to find them and who owns them.
+type IndexEntry struct {
+	// Name is the short name a user can `cozypkg tap <name>` / `search` by.
+	Name string `json:"name"`
+	// OCIRef is the artifact location, e.g. oci://ghcr.io/org/repo.
+	OCIRef string `json:"ociRef"`
+	// Version is the OCI tag of the listed release; a version bump updates it.
+	Version     string   `json:"version,omitempty"`
+	Description string   `json:"description,omitempty"`
+	Homepage    string   `json:"homepage,omitempty"`
+	Maintainer  string   `json:"maintainer,omitempty"`
+	Tags        []string `json:"tags,omitempty"`
+	// Signing records the expected cosign identity for the two-lane index gate:
+	// an owner version-bump must stay signed by this identity.
+	Signing *IndexSigning `json:"signing,omitempty"`
+}
+
+// IndexSigning is the expected cosign OIDC signing identity for an entry.
+type IndexSigning struct {
+	Identity string `json:"identity,omitempty"`
+	Issuer   string `json:"issuer,omitempty"`
+}
+
+// loadIndex reads every *.yaml/*.yml entry under dir into IndexEntry values.
+// A file that fails strict decoding, or an entry missing name/ociRef, is a hard
+// error so the CI gate (and search) surface a malformed index rather than
+// silently dropping entries.
+func loadIndex(dir string) ([]IndexEntry, error) {
+	if !isDir(dir) {
+		return nil, fmt.Errorf("index path %q is not a directory", dir)
+	}
+	var entries []IndexEntry
+	err := filepath.WalkDir(dir, func(path string, d fs.DirEntry, err error) error {
+		if err != nil {
+			return err
+		}
+		if d.IsDir() {
+			if d.Name() == ".git" {
+				return filepath.SkipDir
+			}
+			return nil
+		}
+		if !strings.HasSuffix(path, ".yaml") && !strings.HasSuffix(path, ".yml") {
+			return nil
+		}
+		data, e := os.ReadFile(path)
+		if e != nil {
+			return e
+		}
+		rel, _ := filepath.Rel(dir, path)
+		var entry IndexEntry
+		if err := yaml.UnmarshalStrict(data, &entry); err != nil {
+			return fmt.Errorf("%s: %w", rel, err)
+		}
+		if entry.Name == "" || entry.OCIRef == "" {
+			return fmt.Errorf("%s: index entry must set both name and ociRef", rel)
+		}
+		entries = append(entries, entry)
+		return nil
+	})
+	if err != nil {
+		return nil, err
+	}
+	sort.Slice(entries, func(i, j int) bool { return entries[i].Name < entries[j].Name })
+	return entries, nil
+}
+
+// filterEntries returns entries whose name, description, or tags contain term
+// (case-insensitive). An empty term matches everything.
+func filterEntries(entries []IndexEntry, term string) []IndexEntry {
+	term = strings.ToLower(strings.TrimSpace(term))
+	if term == "" {
+		return entries
+	}
+	var out []IndexEntry
+	for _, e := range entries {
+		hay := strings.ToLower(e.Name + " " + e.Description + " " + strings.Join(e.Tags, " "))
+		if strings.Contains(hay, term) {
+			out = append(out, e)
+		}
+	}
+	return out
+}
+
+// findEntry returns the entry with the exact given name, or false.
+func findEntry(entries []IndexEntry, name string) (IndexEntry, bool) {
+	for _, e := range entries {
+		if e.Name == name {
+			return e, true
+		}
+	}
+	return IndexEntry{}, false
+}
+
+// resolveIndexDir turns an index location (a local directory or an oci://
+// reference) into a local directory, returning a cleanup function.
+func resolveIndexDir(indexRef string) (string, func(), error) {
+	if indexRef == "" {
+		return "", func() {}, fmt.Errorf("no index configured; pass --index <path|oci-ref> or set COZYPKG_INDEX")
+	}
+	if isOCIRef(indexRef) {
+		return pullOCIArtifact(indexRef)
+	}
+	if !isDir(indexRef) {
+		return "", func() {}, fmt.Errorf("index path %q is not a directory", indexRef)
+	}
+	return indexRef, func() {}, nil
+}
+
+// defaultIndexRef returns the configured index location from the flag or the
+// COZYPKG_INDEX environment variable.
+func defaultIndexRef(flagVal string) string {
+	if flagVal != "" {
+		return flagVal
+	}
+	return os.Getenv("COZYPKG_INDEX")
+}
+
+func printEntries(entries []IndexEntry, w io.Writer) error {
+	tw := tabwriter.NewWriter(w, 0, 0, 2, ' ', 0)
+	if _, err := fmt.Fprintln(tw, "NAME\tOCI REF\tDESCRIPTION"); err != nil {
+		return err
+	}
+	for _, e := range entries {
+		if _, err := fmt.Fprintf(tw, "%s\t%s\t%s\n", e.Name, e.OCIRef, e.Description); err != nil {
+			return err
+		}
+	}
+	return tw.Flush()
+}
+
+var searchCmdFlags struct {
+	index string
+}
+
+var searchCmd = &cobra.Command{
+	Use:   "search [term]",
+	Short: "Search the community package index",
+	Long: `Search queries the community package index (a directory of metadata-only
+entries, local or pulled from an oci:// reference) and lists matching packages
+without tapping them. Configure the index with --index or COZYPKG_INDEX.`,
+	Args: cobra.MaximumNArgs(1),
+	RunE: func(cmd *cobra.Command, args []string) error {
+		term := ""
+		if len(args) == 1 {
+			term = args[0]
+		}
+		indexRef := defaultIndexRef(searchCmdFlags.index)
+		dir, cleanup, err := resolveIndexDir(indexRef)
+		if err != nil {
+			return err
+		}
+		defer cleanup()
+
+		entries, err := loadIndex(dir)
+		if err != nil {
+			return err
+		}
+		matches := filterEntries(entries, term)
+		if len(matches) == 0 {
+			_, err := fmt.Fprintf(cmd.OutOrStdout(), "No packages match %q\n", term)
+			return err
+		}
+		return printEntries(matches, cmd.OutOrStdout())
+	},
+}
+
+// resolveTapTarget resolves a tap argument to an oci:// reference. An oci://
+// argument is returned unchanged; any other value is treated as a short name
+// looked up in the index.
+func resolveTapTarget(arg, indexRef string) (string, error) {
+	if isOCIRef(arg) {
+		return arg, nil
+	}
+	dir, cleanup, err := resolveIndexDir(indexRef)
+	if err != nil {
+		return "", fmt.Errorf("%q is not an oci:// reference and it could not be resolved via the index: %w", arg, err)
+	}
+	defer cleanup()
+	entries, err := loadIndex(dir)
+	if err != nil {
+		return "", err
+	}
+	entry, ok := findEntry(entries, arg)
+	if !ok {
+		return "", fmt.Errorf("no index entry named %q", arg)
+	}
+	// Pin to the entry's recorded version: the CI gate validated and
+	// cosign-verified <ociRef>:<version>, so tapping must consume that exact
+	// tag rather than defaulting to latest.
+	if entry.Version != "" {
+		return entry.OCIRef + ":" + entry.Version, nil
+	}
+	return entry.OCIRef, nil
+}
+
+func init() {
+	rootCmd.AddCommand(searchCmd)
+	searchCmd.Flags().StringVar(&searchCmdFlags.index, "index", "", "Index location: a local directory or an oci:// reference (defaults to COZYPKG_INDEX)")
+}
diff --git a/cmd/cozypkg/cmd/index_test.go b/cmd/cozypkg/cmd/index_test.go
new file mode 100644
index 0000000000..e43ff13d54
--- /dev/null
+++ b/cmd/cozypkg/cmd/index_test.go
@@ -0,0 +1,138 @@
+/*
+Copyright 2025 The Cozystack Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package cmd
+
+import (
+	"testing"
+)
+
+func sampleIndex(t *testing.T) string {
+	t.Helper()
+	dir := t.TempDir()
+	writeFile(t, dir, "foo-bar.yaml", `name: foo.bar
+ociRef: oci://ghcr.io/foo/bar
+version: v1.2.3
+description: A SQL database operator
+maintainer: Foo <foo@example.com>
+homepage: https://example.com/foo
+tags:
+  - database
+  - sql
+signing:
+  identity: https://github.com/foo/bar/.github/workflows/release.yaml@refs/heads/main
+  issuer: https://token.actions.githubusercontent.com
+`)
+	writeFile(t, dir, "baz-qux.yaml", `name: baz.qux
+ociRef: oci://ghcr.io/baz/qux
+description: A message queue
+tags: [messaging]
+`)
+	writeFile(t, dir, "README.md", "# index\nnot an entry\n")
+	return dir
+}
+
+func TestLoadIndex(t *testing.T) {
+	entries, err := loadIndex(sampleIndex(t))
+	if err != nil {
+		t.Fatalf("loadIndex: %v", err)
+	}
+	if len(entries) != 2 {
+		t.Fatalf("expected 2 entries, got %d: %+v", len(entries), entries)
+	}
+	// Sorted by name: baz.qux before foo.bar.
+	if entries[0].Name != "baz.qux" || entries[1].Name != "foo.bar" {
+		t.Fatalf("entries not sorted by name: %v", []string{entries[0].Name, entries[1].Name})
+	}
+	if entries[1].Signing == nil || entries[1].Signing.Issuer == "" {
+		t.Errorf("expected signing identity on foo.bar")
+	}
+	if entries[1].Version != "v1.2.3" {
+		t.Errorf("expected version v1.2.3 on foo.bar, got %q", entries[1].Version)
+	}
+}
+
+func TestLoadIndexRejectsMalformed(t *testing.T) {
+	dir := t.TempDir()
+	writeFile(t, dir, "bad.yaml", "name: x\nociRef: oci://r/x\nbogusUnknown: true\n")
+	if _, err := loadIndex(dir); err == nil {
+		t.Fatal("expected strict-decode error for unknown field")
+	}
+
+	dir2 := t.TempDir()
+	writeFile(t, dir2, "missing.yaml", "description: no name or ref\n")
+	if _, err := loadIndex(dir2); err == nil {
+		t.Fatal("expected error for entry missing name/ociRef")
+	}
+}
+
+func TestFilterEntries(t *testing.T) {
+	entries, _ := loadIndex(sampleIndex(t))
+	if got := filterEntries(entries, ""); len(got) != 2 {
+		t.Errorf("empty term should match all, got %d", len(got))
+	}
+	if got := filterEntries(entries, "sql"); len(got) != 1 || got[0].Name != "foo.bar" {
+		t.Errorf("term 'sql' should match foo.bar only, got %+v", got)
+	}
+	if got := filterEntries(entries, "MESSAGING"); len(got) != 1 || got[0].Name != "baz.qux" {
+		t.Errorf("case-insensitive tag match failed, got %+v", got)
+	}
+	if got := filterEntries(entries, "nonexistent"); len(got) != 0 {
+		t.Errorf("no match expected, got %+v", got)
+	}
+}
+
+func TestResolveTapTarget(t *testing.T) {
+	// oci:// passes through untouched, no index needed.
+	if got, err := resolveTapTarget("oci://ghcr.io/a/b:v1", ""); err != nil || got != "oci://ghcr.io/a/b:v1" {
+		t.Fatalf("oci passthrough failed: got %q err %v", got, err)
+	}
+
+	dir := sampleIndex(t)
+	got, err := resolveTapTarget("foo.bar", dir)
+	if err != nil {
+		t.Fatalf("resolveTapTarget: %v", err)
+	}
+	// Must pin to the entry's recorded version, not default to latest.
+	if got != "oci://ghcr.io/foo/bar:v1.2.3" {
+		t.Fatalf("resolved ref = %q, want the version-pinned ref", got)
+	}
+
+	// An entry without a version resolves to the bare ref (tap defaults to latest).
+	if got, err := resolveTapTarget("baz.qux", dir); err != nil || got != "oci://ghcr.io/baz/qux" {
+		t.Fatalf("versionless resolve = %q err %v", got, err)
+	}
+
+	if _, err := resolveTapTarget("does.not.exist", dir); err == nil {
+		t.Fatal("expected error for unknown short name")
+	}
+	if _, err := resolveTapTarget("foo.bar", ""); err == nil {
+		t.Fatal("expected error when short name given but no index configured")
+	}
+}
+
+func TestDefaultIndexRef(t *testing.T) {
+	if got := defaultIndexRef("/explicit"); got != "/explicit" {
+		t.Errorf("flag should win, got %q", got)
+	}
+	t.Setenv("COZYPKG_INDEX", "/from/env")
+	if got := defaultIndexRef(""); got != "/from/env" {
+		t.Errorf("env fallback failed, got %q", got)
+	}
+	if got := defaultIndexRef("/explicit"); got != "/explicit" {
+		t.Errorf("flag should still win over env, got %q", got)
+	}
+}
diff --git a/cmd/cozypkg/cmd/init.go b/cmd/cozypkg/cmd/init.go
new file mode 100644
index 0000000000..5970a864be
--- /dev/null
+++ b/cmd/cozypkg/cmd/init.go
@@ -0,0 +1,247 @@
+/*
+Copyright 2025 The Cozystack Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package cmd
+
+import (
+	"fmt"
+	"os"
+	"path/filepath"
+	"regexp"
+	"strings"
+
+	"github.com/cozystack/cozystack/internal/marketplace/naming"
+	"github.com/spf13/cobra"
+)
+
+var initCmdFlags struct {
+	name string
+	app  string
+}
+
+// dns1123Label matches a single RFC-1123 label, the character set both the app
+// name and the PackageSource name suffix must live within.
+var dns1123Label = regexp.MustCompile(`^[a-z0-9]([-a-z0-9]*[a-z0-9])?$`)
+
+// scaffoldFile is one generated file in the repository skeleton.
+type scaffoldFile struct {
+	Path    string
+	Content string
+}
+
+// scaffoldFiles returns the file set for a new External-Apps repository built
+// around the PackageSource model. psName is the cluster-scoped PackageSource
+// name (e.g. "example.hello"); app is the RFC-1123 app/component name.
+//
+// The layout mirrors what ValidateRepo expects: a PackageSource under
+// packages/core/platform/sources/, an app chart at packages/apps/<app>, and a
+// paired -rd chart at packages/system/<app>-rd whose cozyrds/ asset carries an
+// ApplicationDefinition referencing the app component's assembled artifact.
+func scaffoldFiles(psName, app string) []scaffoldFile {
+	// The paired ApplicationDefinition references the component's assembled
+	// artifact by its concrete name. A tapped repository keeps its declared
+	// name, so the reconciler emits exactly this artifact name and the chartRef
+	// resolves without any tap-time templating.
+	artifactName := naming.ArtifactName(psName, "default", app)
+	return []scaffoldFile{
+		{
+			Path: filepath.Join("packages", "core", "platform", "sources", app+".yaml"),
+			Content: fmt.Sprintf(`apiVersion: cozystack.io/v1alpha1
+kind: PackageSource
+metadata:
+  name: %s
+spec:
+  sourceRef:
+    kind: OCIRepository
+    name: %s-packages
+    namespace: cozy-system
+    path: /
+  variants:
+    - name: default
+      components:
+        - name: %s
+          path: apps/%s
+        - name: %s-rd
+          path: system/%s-rd
+          install:
+            namespace: cozy-system
+`, psName, app, app, app, app, app),
+		},
+		{
+			Path:    filepath.Join("packages", "apps", app, "Chart.yaml"),
+			Content: fmt.Sprintf("apiVersion: v2\nname: %s\ndescription: %s application chart\nversion: 0.1.0\n", app, app),
+		},
+		{
+			Path:    filepath.Join("packages", "apps", app, "values.yaml"),
+			Content: "# Default values for the " + app + " chart.\n",
+		},
+		{
+			Path: filepath.Join("packages", "apps", app, "templates", "configmap.yaml"),
+			Content: `apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ .Release.Name }}
+data:
+  placeholder: "replace this template with your application's resources"
+`,
+		},
+		{
+			Path:    filepath.Join("packages", "system", app+"-rd", "Chart.yaml"),
+			Content: fmt.Sprintf("apiVersion: v2\nname: %s-rd\ndescription: ApplicationDefinition registration for %s\nversion: 0.1.0\n", app, app),
+		},
+		{
+			Path: filepath.Join("packages", "system", app+"-rd", "templates", "cozyrd.yaml"),
+			Content: `{{- range $path, $_ := .Files.Glob "cozyrds/*" }}
+---
+{{ $.Files.Get $path }}
+{{- end }}
+`,
+		},
+		{
+			Path: filepath.Join("packages", "system", app+"-rd", "cozyrds", app+".yaml"),
+			Content: fmt.Sprintf(`apiVersion: cozystack.io/v1alpha1
+kind: ApplicationDefinition
+metadata:
+  name: %s
+spec:
+  application:
+    kind: %s
+    openAPISchema: ""
+    plural: %ss
+    singular: %s
+  release:
+    prefix: %s-
+    chartRef:
+      kind: ExternalArtifact
+      name: %s
+      namespace: cozy-system
+  dashboard:
+    singular: %s
+    plural: %ss
+    category: Other
+`, app, capitalize(app), app, app, app, artifactName, capitalize(app), app),
+		},
+		{
+			Path: "README.md",
+			Content: fmt.Sprintf(`# %s
+
+An External-Apps repository for [Cozystack](https://cozystack.io), built around
+the `+"`PackageSource`"+` model.
+
+## Layout
+
+`+"```text"+`
+packages/
+  core/platform/sources/%s.yaml   # PackageSource: variants, components, dependsOn
+  apps/%s/                        # application Helm chart
+  system/%s-rd/                   # ApplicationDefinition registration (cozyrds/)
+`+"```"+`
+
+## Publish
+
+`+"```bash"+`
+cozypkg validate .
+cozypkg push oci://<registry>/%s:<tag>
+`+"```"+`
+
+## Connect (one command, on a Cozystack cluster)
+
+`+"```bash"+`
+cozypkg tap oci://<registry>/%s:<tag>
+`+"```"+`
+`, psName, app, app, app, app, app),
+		},
+	}
+}
+
+// writeScaffold writes each scaffold file under dir, refusing to overwrite any
+// existing file (so init never clobbers a repository).
+func writeScaffold(dir string, files []scaffoldFile) error {
+	for _, f := range files {
+		full := filepath.Join(dir, f.Path)
+		if _, err := os.Stat(full); err == nil {
+			return fmt.Errorf("refusing to overwrite existing file %s", full)
+		}
+		if err := os.MkdirAll(filepath.Dir(full), 0o755); err != nil {
+			return err
+		}
+		if err := os.WriteFile(full, []byte(f.Content), 0o644); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+// capitalize builds an upper CamelCase identifier from an RFC-1123 label so a
+// hyphenated --app (e.g. "foo-bar") yields a valid Kubernetes kind ("FooBar"),
+// not the apiserver-rejected "Foo-bar".
+func capitalize(s string) string {
+	var b strings.Builder
+	for seg := range strings.SplitSeq(s, "-") {
+		if seg == "" {
+			continue
+		}
+		b.WriteString(strings.ToUpper(seg[:1]))
+		b.WriteString(seg[1:])
+	}
+	return b.String()
+}
+
+var initCmd = &cobra.Command{
+	Use:   "init [directory]",
+	Short: "Scaffold a new External-Apps repository",
+	Long: `Scaffold a new External-Apps repository built around the PackageSource
+model: a PackageSource with one variant and a paired app / -rd component, ready
+to validate and push. The generated tree passes 'cozypkg validate' as-is.`,
+	Args: cobra.MaximumNArgs(1),
+	RunE: func(cmd *cobra.Command, args []string) error {
+		dir := "."
+		if len(args) == 1 {
+			dir = args[0]
+		}
+		app := initCmdFlags.app
+		if !dns1123Label.MatchString(app) {
+			return fmt.Errorf("--app %q must be a valid RFC-1123 label (lowercase alphanumeric and -)", app)
+		}
+		psName := initCmdFlags.name
+		if psName == "" {
+			psName = "example." + app
+		}
+		// Reserved namespaces: "cozystack." is the platform's own and "community."
+		// is the older renamed-source namespace. The on-cluster collision check is
+		// the real boundary; this is a usability hint so the author learns now
+		// rather than at tap time. The index gate rejects these in `validate` too,
+		// off the same list, so adding a prefix cannot close one door and leave
+		// the other open.
+		for _, p := range reservedNamePrefixes {
+			if strings.HasPrefix(psName, p) {
+				return fmt.Errorf("--name %q uses reserved prefix %q; pick a neutral name like <org>.%s", psName, p, app)
+			}
+		}
+		files := scaffoldFiles(psName, app)
+		if err := writeScaffold(dir, files); err != nil {
+			return err
+		}
+		_, err := fmt.Fprintf(cmd.OutOrStdout(), "Scaffolded %d files under %s\nNext: cozypkg validate %s\n", len(files), dir, dir)
+		return err
+	},
+}
+
+func init() {
+	rootCmd.AddCommand(initCmd)
+	initCmd.Flags().StringVar(&initCmdFlags.app, "app", "myapp", "Name of the sample app/component (RFC-1123 label)")
+	initCmd.Flags().StringVar(&initCmdFlags.name, "name", "", "PackageSource name (defaults to example.<app>)")
+}
diff --git a/cmd/cozypkg/cmd/init_push_test.go b/cmd/cozypkg/cmd/init_push_test.go
new file mode 100644
index 0000000000..19678d9830
--- /dev/null
+++ b/cmd/cozypkg/cmd/init_push_test.go
@@ -0,0 +1,199 @@
+/*
+Copyright 2025 The Cozystack Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package cmd
+
+import (
+	"os/exec"
+	"path/filepath"
+	"strings"
+	"testing"
+)
+
+// TestInitScaffoldValidatesClean is the dogfood property: whatever `cozypkg
+// init` generates must pass `cozypkg validate` with zero findings. If the
+// scaffold and the validator ever disagree on the repository format, this
+// fails.
+func TestInitScaffoldValidatesClean(t *testing.T) {
+	dir := t.TempDir()
+	if err := writeScaffold(dir, scaffoldFiles("example.hello", "hello")); err != nil {
+		t.Fatalf("writeScaffold: %v", err)
+	}
+	rep, err := ValidateRepo(ValidateOptions{RepoRoot: dir})
+	if err != nil {
+		t.Fatalf("ValidateRepo: %v", err)
+	}
+	if len(rep.Findings) != 0 {
+		t.Fatalf("scaffold must validate with zero findings, got: %+v", rep.Findings)
+	}
+}
+
+func TestWriteScaffoldRefusesOverwrite(t *testing.T) {
+	dir := t.TempDir()
+	files := scaffoldFiles("example.hello", "hello")
+	if err := writeScaffold(dir, files); err != nil {
+		t.Fatalf("first writeScaffold: %v", err)
+	}
+	if err := writeScaffold(dir, files); err == nil {
+		t.Fatal("expected second writeScaffold to refuse overwriting existing files")
+	}
+}
+
+func TestCapitalizeYieldsValidKind(t *testing.T) {
+	cases := map[string]string{
+		"myapp":       "Myapp",
+		"foo-bar":     "FooBar",
+		"a-b-c":       "ABC",
+		"minecraft":   "Minecraft",
+		"redis-cache": "RedisCache",
+	}
+	for in, want := range cases {
+		if got := capitalize(in); got != want {
+			t.Errorf("capitalize(%q) = %q, want %q", in, got, want)
+		}
+		// A Kubernetes kind must not contain hyphens.
+		if strings.Contains(capitalize(in), "-") {
+			t.Errorf("capitalize(%q) = %q contains a hyphen (invalid kind)", in, capitalize(in))
+		}
+	}
+}
+
+func TestInitRejectsReservedName(t *testing.T) {
+	// Driven off reservedNamePrefixes rather than a literal list, so a prefix
+	// added for `validate` cannot leave `init` quietly letting it through.
+	var names []string
+	for _, p := range reservedNamePrefixes {
+		names = append(names, p+"foo", p+"acme.demo")
+	}
+	for _, name := range names {
+		initCmdFlags.app = "demo"
+		initCmdFlags.name = name
+		err := initCmd.RunE(initCmd, []string{t.TempDir()})
+		if err == nil || !strings.Contains(err.Error(), "reserved prefix") {
+			t.Errorf("init --name %q should be rejected for reserved prefix, got %v", name, err)
+		}
+	}
+	initCmdFlags.name = ""
+}
+
+func TestDNS1123LabelGuard(t *testing.T) {
+	good := []string{"myapp", "foo-bar", "a", "app123"}
+	bad := []string{"MyApp", "foo_bar", "-foo", "foo-", "foo.bar", ""}
+	for _, s := range good {
+		if !dns1123Label.MatchString(s) {
+			t.Errorf("expected %q to be a valid label", s)
+		}
+	}
+	for _, s := range bad {
+		if dns1123Label.MatchString(s) {
+			t.Errorf("expected %q to be rejected", s)
+		}
+	}
+}
+
+func TestBuildFluxPushArgs(t *testing.T) {
+	got := buildFluxPushArgs("oci://reg/example:v1", "/repo/packages", "https://example.git", "v1:abc", false)
+	want := []string{
+		"push", "artifact", "oci://reg/example:v1",
+		"--path=/repo/packages",
+		"--source=https://example.git",
+		"--revision=v1:abc",
+	}
+	if strings.Join(got, " ") != strings.Join(want, " ") {
+		t.Fatalf("args = %v, want %v", got, want)
+	}
+	if withRepro := buildFluxPushArgs("oci://r/e:v1", "/p", "s", "r", true); withRepro[len(withRepro)-1] != "--reproducible" {
+		t.Fatalf("expected --reproducible as last arg, got %v", withRepro)
+	}
+}
+
+// gitInit sets up a throwaway git repo with a remote and one commit. Signing is
+// disabled locally (config, not the forbidden --no-gpg-sign flag) because this
+// is a disposable test fixture, never a project commit.
+func gitInit(t *testing.T, dir string) {
+	t.Helper()
+	run := func(args ...string) {
+		cmd := exec.Command("git", append([]string{"-C", dir}, args...)...)
+		if out, err := cmd.CombinedOutput(); err != nil {
+			t.Fatalf("git %s: %v\n%s", strings.Join(args, " "), err, out)
+		}
+	}
+	run("init")
+	run("remote", "add", "origin", "https://example.com/repo.git")
+	run("config", "user.email", "test@example.com")
+	run("config", "user.name", "test")
+	run("config", "commit.gpgsign", "false")
+	writeFile(t, dir, "file.txt", "x")
+	run("add", ".")
+	run("commit", "--message", "initial")
+}
+
+func TestDeriveSourceAndRevision(t *testing.T) {
+	dir := t.TempDir()
+	if got := deriveSource(dir); got != "" {
+		t.Fatalf("expected empty source for non-git dir, got %q", got)
+	}
+	if got := deriveRevision(dir); got != "" {
+		t.Fatalf("expected empty revision for non-git dir, got %q", got)
+	}
+
+	gitInit(t, dir)
+	if got := deriveSource(dir); got != "https://example.com/repo.git" {
+		t.Fatalf("deriveSource = %q", got)
+	}
+	rev := deriveRevision(dir)
+	if rev == "" {
+		t.Fatal("deriveRevision returned empty for a git repo with a commit")
+	}
+	// A 40-hex sha must be present either standalone or after "<describe>:".
+	sha := rev
+	if i := strings.LastIndex(rev, ":"); i >= 0 {
+		sha = rev[i+1:]
+	}
+	if len(sha) != 40 {
+		t.Fatalf("expected a 40-char sha in revision %q, got %q", rev, sha)
+	}
+}
+
+func TestScaffoldAppDefArtifactNameLink(t *testing.T) {
+	// A tapped repository keeps its declared name, so the scaffold references the
+	// component's assembled artifact by its concrete name (no tap-time
+	// templating). For example.hello/default/hello that name is
+	// example-hello-default-hello.
+	files := scaffoldFiles("example.hello", "hello")
+	var rdContent, cozyrdTemplate string
+	for _, f := range files {
+		if strings.Contains(f.Path, filepath.Join("cozyrds", "hello.yaml")) {
+			rdContent = f.Content
+		}
+		if strings.HasSuffix(f.Path, filepath.Join("templates", "cozyrd.yaml")) {
+			cozyrdTemplate = f.Content
+		}
+	}
+	if rdContent == "" {
+		t.Fatal("scaffold has no cozyrds/hello.yaml")
+	}
+	if !strings.Contains(rdContent, "name: example-hello-default-hello") {
+		t.Fatalf("cozyrds chartRef must reference the concrete artifact name, content:\n%s", rdContent)
+	}
+	if strings.Contains(rdContent, "{{") {
+		t.Fatalf("cozyrds chartRef must not be templated any more, content:\n%s", rdContent)
+	}
+	// The -rd chart renders the asset directly; no tpl indirection is needed.
+	if !strings.Contains(cozyrdTemplate, "$.Files.Get $path") || strings.Contains(cozyrdTemplate, "tpl ") {
+		t.Fatalf("cozyrd.yaml must render the cozyrds asset with a plain Files.Get, content:\n%s", cozyrdTemplate)
+	}
+}
diff --git a/cmd/cozypkg/cmd/push.go b/cmd/cozypkg/cmd/push.go
new file mode 100644
index 0000000000..3f8e65cac9
--- /dev/null
+++ b/cmd/cozypkg/cmd/push.go
@@ -0,0 +1,152 @@
+/*
+Copyright 2025 The Cozystack Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package cmd
+
+import (
+	"fmt"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"strings"
+
+	"github.com/spf13/cobra"
+)
+
+var pushCmdFlags struct {
+	path         string
+	source       string
+	revision     string
+	reproducible bool
+	skipValidate bool
+	helmLint     bool
+}
+
+// buildFluxPushArgs assembles the argument vector for `flux push artifact`. It
+// is factored out so the exact command shape can be unit-tested without a
+// registry. The shape mirrors the platform's own push
+// (packages/core/installer/Makefile): the packages/ directory is the artifact
+// root, with a source URL and a revision for provenance.
+func buildFluxPushArgs(ref, packagesDir, source, revision string, reproducible bool) []string {
+	args := []string{
+		"push", "artifact", ref,
+		"--path=" + packagesDir,
+		"--source=" + source,
+		"--revision=" + revision,
+	}
+	if reproducible {
+		args = append(args, "--reproducible")
+	}
+	return args
+}
+
+// gitOutput runs a git command in dir and returns trimmed stdout, or "" on any error.
+func gitOutput(dir string, args ...string) string {
+	cmd := exec.Command("git", append([]string{"-C", dir}, args...)...)
+	out, err := cmd.Output()
+	if err != nil {
+		return ""
+	}
+	return strings.TrimSpace(string(out))
+}
+
+// deriveSource returns the git remote URL for provenance, or "" if unavailable.
+func deriveSource(dir string) string {
+	return gitOutput(dir, "remote", "get-url", "origin")
+}
+
+// deriveRevision returns "<describe>:<sha>", or just "<sha>", or "" if not a git tree.
+func deriveRevision(dir string) string {
+	sha := gitOutput(dir, "rev-parse", "HEAD")
+	if sha == "" {
+		return ""
+	}
+	if desc := gitOutput(dir, "describe", "--tags", "--always"); desc != "" && desc != sha {
+		return desc + ":" + sha
+	}
+	return sha
+}
+
+var pushCmd = &cobra.Command{
+	Use:   "push <oci-ref>",
+	Short: "Validate and push an External-Apps repository as an OCI artifact",
+	Long: `Push bundles the repository's packages/ tree into a single versioned OCI
+artifact using the flux CLI, the same artifact shape the platform and a
+'cozypkg tap' consume. The repository is validated first (unless
+--skip-validate); a validation error aborts the push before anything is
+published. Source URL and revision are derived from git when not given.`,
+	Args: cobra.ExactArgs(1),
+	RunE: func(cmd *cobra.Command, args []string) error {
+		ref := args[0]
+		if !isOCIRef(ref) {
+			return fmt.Errorf("target %q must be an oci:// reference", ref)
+		}
+
+		root := pushCmdFlags.path
+		packagesDir := filepath.Join(root, "packages")
+		if !isDir(packagesDir) {
+			return fmt.Errorf("no packages/ directory found under %s", root)
+		}
+
+		if !pushCmdFlags.skipValidate {
+			rep, err := ValidateRepo(ValidateOptions{RepoRoot: root, RunHelmLint: pushCmdFlags.helmLint})
+			if err != nil {
+				return err
+			}
+			printReport(rep, cmd.OutOrStdout())
+			if rep.HasErrors() {
+				errs, _, _ := rep.Counts()
+				return fmt.Errorf("refusing to push: validation failed with %d error(s) (use --skip-validate to override)", errs)
+			}
+		}
+
+		source := pushCmdFlags.source
+		if source == "" {
+			source = deriveSource(root)
+		}
+		if source == "" {
+			return fmt.Errorf("could not determine --source (not a git checkout with an 'origin' remote); pass --source explicitly")
+		}
+		revision := pushCmdFlags.revision
+		if revision == "" {
+			revision = deriveRevision(root)
+		}
+		if revision == "" {
+			return fmt.Errorf("could not determine --revision (not a git checkout); pass --revision explicitly")
+		}
+
+		fluxArgs := buildFluxPushArgs(ref, packagesDir, source, revision, pushCmdFlags.reproducible)
+		fmt.Fprintf(cmd.OutOrStdout(), "Pushing %s (source=%s revision=%s)\n", ref, source, revision)
+		flux := exec.Command("flux", fluxArgs...)
+		flux.Stdout = cmd.OutOrStdout()
+		flux.Stderr = cmd.ErrOrStderr()
+		flux.Stdin = os.Stdin
+		if err := flux.Run(); err != nil {
+			return fmt.Errorf("flux push artifact failed: %w", err)
+		}
+		return nil
+	},
+}
+
+func init() {
+	rootCmd.AddCommand(pushCmd)
+	pushCmd.Flags().StringVar(&pushCmdFlags.path, "path", ".", "Path to the repository root (must contain packages/)")
+	pushCmd.Flags().StringVar(&pushCmdFlags.source, "source", "", "Source URL recorded in the artifact (defaults to git origin remote)")
+	pushCmd.Flags().StringVar(&pushCmdFlags.revision, "revision", "", "Revision recorded in the artifact (defaults to git describe:sha)")
+	pushCmd.Flags().BoolVar(&pushCmdFlags.reproducible, "reproducible", false, "Pass --reproducible to flux for deterministic artifact metadata")
+	pushCmd.Flags().BoolVar(&pushCmdFlags.skipValidate, "skip-validate", false, "Skip pre-push validation (not recommended)")
+	pushCmd.Flags().BoolVar(&pushCmdFlags.helmLint, "helm-lint", false, "Also run 'helm lint' during pre-push validation")
+}
diff --git a/cmd/cozypkg/cmd/tap.go b/cmd/cozypkg/cmd/tap.go
new file mode 100644
index 0000000000..107ab3ad84
--- /dev/null
+++ b/cmd/cozypkg/cmd/tap.go
@@ -0,0 +1,512 @@
+/*
+Copyright 2025 The Cozystack Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package cmd
+
+import (
+	"context"
+	"fmt"
+	"io"
+	"regexp"
+	"strings"
+	"time"
+
+	cozyv1alpha1 "github.com/cozystack/cozystack/api/v1alpha1"
+	"github.com/cozystack/cozystack/internal/marketplace/collision"
+	"github.com/cozystack/cozystack/internal/marketplace/tapconst"
+	fluxmeta "github.com/fluxcd/pkg/apis/meta"
+	sourcev1 "github.com/fluxcd/source-controller/api/v1"
+	"github.com/spf13/cobra"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
+	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
+	"k8s.io/client-go/rest"
+	"k8s.io/client-go/tools/clientcmd"
+	ctrl "sigs.k8s.io/controller-runtime"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+
+	_ "k8s.io/client-go/plugin/pkg/client/auth"
+)
+
+const (
+	// cozySystemNamespace is where tap creates the Flux source, alongside the
+	// platform and External-Apps sources.
+	cozySystemNamespace = "cozy-system"
+)
+
+var tapCmdFlags struct {
+	secret       string
+	tag          string
+	kubeconfig   string
+	index        string
+	skipValidate bool
+}
+
+// ociRef is the parsed form of an oci:// reference.
+type ociRef struct {
+	// URL is the reference without any tag/digest, e.g. oci://ghcr.io/org/repo.
+	URL string
+	Org string
+	// Repo is the last path segment.
+	Repo string
+	Tag  string
+}
+
+var sanitizeName = regexp.MustCompile(`[^a-z0-9-]+`)
+
+// parseOCIRef splits an oci:// reference into its URL (without tag), org, repo,
+// and tag. A missing tag defaults to "latest".
+func parseOCIRef(ref string) (ociRef, error) {
+	if !strings.HasPrefix(ref, "oci://") {
+		return ociRef{}, fmt.Errorf("reference %q must start with oci://", ref)
+	}
+	body := strings.TrimPrefix(ref, "oci://")
+
+	tag := ""
+	// Digest pins are not tag-addressable; tap is tag-based for now.
+	if strings.Contains(body, "@") {
+		return ociRef{}, fmt.Errorf("digest references are not supported by tap yet; use a tag (oci://host/org/repo:tag)")
+	}
+	if colon := strings.LastIndex(body, ":"); colon >= 0 && !strings.Contains(body[colon:], "/") {
+		tag = body[colon+1:]
+		body = body[:colon]
+	}
+
+	segs := strings.Split(strings.Trim(body, "/"), "/")
+	if len(segs) < 2 {
+		return ociRef{}, fmt.Errorf("reference %q must include at least a host and a repository path", ref)
+	}
+	repo := segs[len(segs)-1]
+	org := ""
+	if len(segs) >= 3 {
+		org = segs[len(segs)-2]
+	}
+	if tag == "" {
+		tag = "latest"
+	}
+	return ociRef{URL: "oci://" + body, Org: org, Repo: repo, Tag: tag}, nil
+}
+
+// fluxSourceName is the RFC-1123 name of the OCIRepository tap creates. It
+// names the Flux source object in cozy-system, not the app-facing PackageSource:
+// a tapped repository keeps its own declared PackageSource name(s). The neutral
+// "tap-" prefix distinguishes it from platform sources without namespacing the
+// packages under "community.".
+func fluxSourceName(r ociRef) string {
+	base := r.Repo
+	if r.Org != "" {
+		base = r.Org + "-" + r.Repo
+	}
+	return "tap-" + sanitizeName.ReplaceAllString(strings.ToLower(base), "-")
+}
+
+// buildTapOCIRepository mirrors the operator's generateOCIRepository: an
+// OCIRepository in cozy-system, 5m interval, optional tag reference, optional
+// pull-credential secretRef (the private-tap credential, symmetric with #2472).
+func buildTapOCIRepository(name string, r ociRef, secret string) *sourcev1.OCIRepository {
+	obj := &sourcev1.OCIRepository{
+		TypeMeta: metav1.TypeMeta{
+			APIVersion: sourcev1.GroupVersion.String(),
+			Kind:       sourcev1.OCIRepositoryKind,
+		},
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      name,
+			Namespace: cozySystemNamespace,
+			// Mark the source as a tap and record its own object name, so the
+			// dashboard's orphan-disconnect (deleteOrphanTapSource) and the
+			// operator's materializer recognise a CLI-created source too.
+			Labels:      map[string]string{tapconst.Label: "true"},
+			Annotations: map[string]string{tapconst.NameAnnotation: name},
+		},
+		Spec: sourcev1.OCIRepositorySpec{
+			URL:      r.URL,
+			Interval: metav1.Duration{Duration: 5 * time.Minute},
+			Reference: &sourcev1.OCIRepositoryRef{
+				Tag: r.Tag,
+			},
+		},
+	}
+	if secret != "" {
+		obj.Spec.SecretRef = &fluxmeta.LocalObjectReference{Name: secret}
+	}
+	return obj
+}
+
+// rewritePackageSourceForTap prepares a PackageSource read from the artifact for
+// apply: it keeps the repository's own declared name (no community rename),
+// clears server-set metadata, stamps the tap marker (label + source annotation)
+// so the source is identifiable without a name prefix, and repoints its
+// sourceRef at the OCIRepository tap created. Variants/components are preserved.
+func rewritePackageSourceForTap(ps *cozyv1alpha1.PackageSource, sourceName, sourcePath string) {
+	ps.SetResourceVersion("")
+	ps.SetUID("")
+
+	labels := ps.GetLabels()
+	if labels == nil {
+		labels = map[string]string{}
+	}
+	labels[tapconst.Label] = "true"
+	ps.SetLabels(labels)
+
+	anns := ps.GetAnnotations()
+	if anns == nil {
+		anns = map[string]string{}
+	}
+	anns[tapconst.SourceAnnotation] = sourceName
+	ps.SetAnnotations(anns)
+
+	if sourcePath == "" {
+		sourcePath = "/"
+	}
+	ps.Spec.SourceRef = &cozyv1alpha1.PackageSourceRef{
+		Kind:      sourcev1.OCIRepositoryKind,
+		Name:      sourceName,
+		Namespace: cozySystemNamespace,
+		Path:      sourcePath,
+	}
+}
+
+// clearMaterializedRevision removes the operator's materialized-revision
+// annotation from the tap's OCIRepository, so the next reconcile does not
+// short-circuit on the unchanged artifact revision and re-materializes (which
+// re-creates a registration removed out-of-band). A no-op when the source or the
+// annotation is absent.
+func clearMaterializedRevision(ctx context.Context, k8sClient client.Client, srcName string) error {
+	reg := &sourcev1.OCIRepository{}
+	if err := k8sClient.Get(ctx, client.ObjectKey{Name: srcName, Namespace: cozySystemNamespace}, reg); err != nil {
+		return client.IgnoreNotFound(err)
+	}
+	if _, ok := reg.Annotations[tapconst.MaterializedRevisionAnnotation]; !ok {
+		return nil
+	}
+	base := reg.DeepCopy()
+	delete(reg.Annotations, tapconst.MaterializedRevisionAnnotation)
+	return k8sClient.Patch(ctx, reg, client.MergeFrom(base))
+}
+
+func tapScheme() *runtime.Scheme {
+	scheme := runtime.NewScheme()
+	utilruntime.Must(clientgoscheme.AddToScheme(scheme))
+	utilruntime.Must(cozyv1alpha1.AddToScheme(scheme))
+	utilruntime.Must(sourcev1.AddToScheme(scheme))
+	return scheme
+}
+
+func newClusterClient(kubeconfig string) (client.Client, error) {
+	var config *rest.Config
+	var err error
+	if kubeconfig != "" {
+		config, err = clientcmd.BuildConfigFromFlags("", kubeconfig)
+	} else {
+		config, err = ctrl.GetConfig()
+	}
+	if err != nil {
+		return nil, fmt.Errorf("failed to load kubeconfig: %w", err)
+	}
+	return client.New(config, client.Options{Scheme: tapScheme()})
+}
+
+var tapCmd = &cobra.Command{
+	Use:   "tap <oci-ref>",
+	Short: "Register an external External-Apps repository as a PackageSource",
+	Long: `Tap registers an external repository published as an OCI artifact: it
+creates a Flux OCIRepository pointing at the artifact and the PackageSource(s)
+the artifact carries, under the names the repository declares. A name that
+clashes with a core component (or another tap) is rejected, so an external
+package can never silently shadow an official one. The repository's applications
+register in the catalog automatically, unless the repository declares no default
+variant (then nothing is registered). A privileged install component of a
+registered app is not installed until the operator confirms it with 'cozypkg add
+--allow-privileged'. Tapping is idempotent. Creating cluster-scoped resources
+requires cluster-admin.
+
+With --secret the OCIRepository is given a pull-credential secretRef (the
+admin pre-creates the Secret in cozy-system), so a private repository taps in
+one command.
+
+Trust: tap validates the artifact's structure but does NOT verify its cosign
+signature. Signature verification is the community index's job at publication
+time ('cozypkg validate --require-signature' in the index CI gate, pinned to
+the entry's recorded identity), and can additionally be enforced at pull time
+via Flux OCIRepository verification. Tapping a third-party repository runs its
+charts in your management cluster: tap only sources you trust.`,
+	Args: cobra.ExactArgs(1),
+	RunE: func(cmd *cobra.Command, args []string) error {
+		ctx := context.Background()
+		target, err := resolveTapTarget(args[0], defaultIndexRef(tapCmdFlags.index))
+		if err != nil {
+			return err
+		}
+		ref, err := parseOCIRef(target)
+		if err != nil {
+			return err
+		}
+		if tapCmdFlags.tag != "" {
+			ref.Tag = tapCmdFlags.tag
+		}
+
+		// Pull first: an unreachable/invalid ref must fail before any cluster
+		// resource is created (no half-created source).
+		fullRef := ref.URL + ":" + ref.Tag
+		dir, cleanup, err := pullOCIArtifact(fullRef)
+		if err != nil {
+			return err
+		}
+		defer cleanup()
+
+		if !tapCmdFlags.skipValidate {
+			rep, err := ValidateRepo(ValidateOptions{RepoRoot: dir})
+			if err != nil {
+				return err
+			}
+			if rep.HasErrors() {
+				printReport(rep, cmd.OutOrStdout())
+				errs, _, _ := rep.Counts()
+				return fmt.Errorf("refusing to tap: artifact failed validation with %d error(s) (use --skip-validate to override)", errs)
+			}
+		}
+
+		report := &Report{}
+		sources, _ := loadManifests(dir, report)
+		if len(sources) == 0 {
+			return fmt.Errorf("artifact at %s carries no PackageSource manifest", fullRef)
+		}
+
+		srcName := fluxSourceName(ref)
+		ociRepo := buildTapOCIRepository(srcName, ref, tapCmdFlags.secret)
+
+		toApply := make([]client.Object, 0, len(sources)+1)
+		toApply = append(toApply, ociRepo)
+		names := make([]string, 0, len(sources))
+		for i := range sources {
+			ps := sources[i].PS.DeepCopy()
+			origPath := ""
+			if ps.Spec.SourceRef != nil {
+				origPath = ps.Spec.SourceRef.Path
+			}
+			rewritePackageSourceForTap(ps, srcName, origPath)
+			toApply = append(toApply, ps)
+			names = append(names, ps.GetName())
+		}
+
+		k8sClient, err := newClusterClient(tapCmdFlags.kubeconfig)
+		if err != nil {
+			return err
+		}
+
+		// Refuse to silently retarget an existing tap: two repositories that
+		// share an org/repo path on different hosts derive the same source name,
+		// and a force-apply would repoint the first at the second.
+		existing := &sourcev1.OCIRepository{}
+		if err := k8sClient.Get(ctx, client.ObjectKey{Name: srcName, Namespace: cozySystemNamespace}, existing); err == nil {
+			if existing.Spec.URL != "" && existing.Spec.URL != ref.URL {
+				return fmt.Errorf("a different repository (%s) is already tapped as %q; run 'cozypkg untap %s' before tapping %s", existing.Spec.URL, srcName, names[0], ref.URL)
+			}
+		}
+
+		// A tapped repository keeps its own declared name. Refuse the whole tap
+		// if any declared name clashes with an existing core component or a
+		// different tap, rather than silently overwriting it on apply.
+		for _, n := range names {
+			if err := collision.PackageSourceName(ctx, k8sClient, n, srcName); err != nil {
+				return err
+			}
+		}
+
+		// Only roll back objects this invocation actually created; a re-tap is
+		// idempotent and must not delete resources that pre-existed it.
+		created := make([]client.Object, 0, len(toApply))
+		patchOptions := []client.PatchOption{client.FieldOwner("cozypkg"), client.ForceOwnership}
+		for _, obj := range toApply {
+			preExisted := objectExists(ctx, k8sClient, obj)
+			if err := k8sClient.Patch(ctx, obj, client.Apply, patchOptions...); err != nil {
+				for _, done := range created {
+					_ = k8sClient.Delete(ctx, done)
+				}
+				return fmt.Errorf("failed to apply %T %s: %w", obj, obj.GetName(), err)
+			}
+			if !preExisted {
+				created = append(created, obj)
+			}
+		}
+
+		// Force a fresh materialization on this tap: clear the materialized-revision
+		// annotation so the operator does not short-circuit on the unchanged
+		// artifact revision. This makes a re-tap the supported recovery for a
+		// registration Package (or PackageSource) removed out-of-band since the last
+		// materialization -- e.g. garbage-collected when its PackageSource was
+		// deleted. Note this re-registers ANY currently-absent app the artifact
+		// declares, so a re-tap also undoes a `cozypkg del` of a tap-registered app;
+		// the two are indistinguishable (both leave the registration absent), and
+		// there is no per-app opt-out. A first tap has no such annotation, so this is
+		// a no-op then.
+		if err := clearMaterializedRevision(ctx, k8sClient, srcName); err != nil {
+			_, _ = fmt.Fprintf(cmd.ErrOrStderr(), "warning: could not reset materialization state on OCIRepository/%s: %v\n", srcName, err)
+		}
+
+		fmt.Fprintf(cmd.OutOrStdout(), "Tapped %s\n  OCIRepository/%s (%s:%s)\n", fullRef, srcName, ref.URL, ref.Tag)
+		for _, n := range names {
+			fmt.Fprintf(cmd.OutOrStdout(), "  PackageSource/%s\n", n)
+		}
+		_, _ = fmt.Fprintf(cmd.OutOrStdout(), "The repository's applications register in the dashboard catalog automatically. A privileged install component is not installed until you confirm it with 'cozypkg add --allow-privileged'. Check the source's events if an app does not appear.\n")
+		return nil
+	},
+}
+
+var untapCmd = &cobra.Command{
+	Use:   "untap <packagesource-name>",
+	Short: "Remove a tapped repository",
+	Long: `Untap removes a tapped PackageSource, its Flux source, and the
+tap-managed registration Package that de-registers the repository's apps from
+the catalog. Running application instances are left in place but become
+unmanaged until the repository is tapped again. Only tapped sources (marked
+with the marketplace-tap label) can be untapped; official sources are refused.`,
+	Args: cobra.ExactArgs(1),
+	RunE: func(cmd *cobra.Command, args []string) error {
+		k8sClient, err := newClusterClient(tapCmdFlags.kubeconfig)
+		if err != nil {
+			return err
+		}
+		return runUntap(context.Background(), k8sClient, args[0], untapConfirmFlag, cmd.OutOrStdout(), cmd.ErrOrStderr())
+	},
+}
+
+// runUntap removes a tapped PackageSource, its tap-managed registration Package,
+// and its Flux source. It is the testable body of untapCmd; see that command's
+// Long for the behaviour and the guard.
+func runUntap(ctx context.Context, k8sClient client.Client, name string, allowYes bool, out, errOut io.Writer) error {
+	ps := &cozyv1alpha1.PackageSource{}
+	if err := k8sClient.Get(ctx, client.ObjectKey{Name: name}, ps); err != nil {
+		return fmt.Errorf("failed to get PackageSource %s: %w", name, err)
+	}
+	// A tap is identified by its marker label, not by a name prefix.
+	if ps.GetLabels()[tapconst.Label] != "true" {
+		return fmt.Errorf("refusing to untap %q: not a tapped repository (missing the %s label); official sources cannot be untapped", name, tapconst.Label)
+	}
+
+	srcName := ""
+	if ps.Spec.SourceRef != nil {
+		srcName = ps.Spec.SourceRef.Name
+	}
+
+	// The registration Package (auto-created on connect, tap-managed)
+	// de-registers the repository's apps and is removed with the untap. Deleting
+	// it garbage-collects its registration HelmReleases and the
+	// ApplicationDefinitions they render. It is removed only when it belongs to
+	// THIS source (label AND source annotation); a Package a later tap created
+	// under a reused name, or a foreign Package, is left in place and blocks the
+	// untap without --yes.
+	//
+	// The Package is handled BEFORE the PackageSource: a transient error here must
+	// abort the untap, not fall through to delete the PackageSource and OCIRepository
+	// and strand the Package where no later cleanup can find it.
+	// Re-read and re-classify on a conflict rather than assume the Package was
+	// pinned: its resourceVersion also moves on a status write. The UID +
+	// ResourceVersion precondition deletes only the exact object classified.
+	for attempt := 0; ; attempt++ {
+		pkg := &cozyv1alpha1.Package{}
+		err := k8sClient.Get(ctx, client.ObjectKey{Name: name}, pkg)
+		if apierrors.IsNotFound(err) {
+			break // no registration Package; nothing to de-register
+		}
+		if err != nil {
+			return fmt.Errorf("failed to check registration Package %s: %w", name, err)
+		}
+		if !collision.ManagedRegistration(pkg, srcName, pkg.Spec.Variant) {
+			if !allowYes {
+				return fmt.Errorf("package %s is still installed from this source; delete it with 'cozypkg del %s' first, or pass --yes to untap anyway (the Package stays installed)", name, name)
+			}
+			break
+		}
+		delErr := k8sClient.Delete(ctx, pkg, client.Preconditions{UID: &pkg.UID, ResourceVersion: &pkg.ResourceVersion})
+		if delErr == nil || apierrors.IsNotFound(delErr) {
+			_, _ = fmt.Fprintf(out, "Removed Package/%s\n", name)
+			break
+		}
+		if apierrors.IsConflict(delErr) && attempt < 4 {
+			continue
+		}
+		return fmt.Errorf("failed to delete registration Package %s: %w", name, delErr)
+	}
+
+	if err := k8sClient.Delete(ctx, ps); err != nil {
+		return fmt.Errorf("failed to delete PackageSource %s: %w", name, err)
+	}
+	_, _ = fmt.Fprintf(out, "Removed PackageSource/%s\n", name)
+
+	// Delete the Flux source only if it is a tap we own (marker label) and no
+	// other PackageSource still references it.
+	if srcName != "" && !sourceStillReferenced(ctx, k8sClient, srcName, name) {
+		oci := &sourcev1.OCIRepository{}
+		if err := k8sClient.Get(ctx, client.ObjectKey{Name: srcName, Namespace: cozySystemNamespace}, oci); err == nil && oci.GetLabels()[tapconst.Label] == "true" {
+			if err := k8sClient.Delete(ctx, oci); err != nil {
+				_, _ = fmt.Fprintf(errOut, "warning: could not delete OCIRepository/%s: %v\n", srcName, err)
+			} else {
+				_, _ = fmt.Fprintf(out, "Removed OCIRepository/%s\n", srcName)
+			}
+		}
+	}
+	return nil
+}
+
+// objectExists reports whether obj already exists on the cluster, so an
+// idempotent re-tap does not roll back resources it did not create. It fails
+// safe: only a definite NotFound means "this run created it" (eligible for
+// rollback). Any other error (RBAC, throttling, timeout) is treated as
+// possibly-pre-existing so rollback never deletes an object it did not create.
+func objectExists(ctx context.Context, k8sClient client.Client, obj client.Object) bool {
+	probe, ok := obj.DeepCopyObject().(client.Object)
+	if !ok {
+		return true
+	}
+	err := k8sClient.Get(ctx, client.ObjectKeyFromObject(obj), probe)
+	return !apierrors.IsNotFound(err)
+}
+
+// sourceStillReferenced reports whether any PackageSource other than excludeName
+// still points at the given Flux source.
+func sourceStillReferenced(ctx context.Context, k8sClient client.Client, srcName, excludeName string) bool {
+	var list cozyv1alpha1.PackageSourceList
+	if err := k8sClient.List(ctx, &list); err != nil {
+		// On a list error, keep the source (safer than deleting a shared one).
+		return true
+	}
+	for i := range list.Items {
+		if list.Items[i].Name == excludeName {
+			continue
+		}
+		if ref := list.Items[i].Spec.SourceRef; ref != nil && ref.Name == srcName {
+			return true
+		}
+	}
+	return false
+}
+
+var untapConfirmFlag bool
+
+func init() {
+	rootCmd.AddCommand(tapCmd)
+	rootCmd.AddCommand(untapCmd)
+	tapCmd.Flags().StringVar(&tapCmdFlags.secret, "secret", "", "Name of a pull-credential Secret in cozy-system for a private repository")
+	tapCmd.Flags().StringVar(&tapCmdFlags.tag, "tag", "", "OCI tag to tap (overrides a tag in the reference; defaults to latest)")
+	tapCmd.Flags().StringVar(&tapCmdFlags.kubeconfig, "kubeconfig", "", "Path to kubeconfig file")
+	tapCmd.Flags().StringVar(&tapCmdFlags.index, "index", "", "Index location for resolving a short name (local dir or oci:// ref; defaults to COZYPKG_INDEX)")
+	tapCmd.Flags().BoolVar(&tapCmdFlags.skipValidate, "skip-validate", false, "Skip validating the artifact before tapping")
+	untapCmd.Flags().StringVar(&tapCmdFlags.kubeconfig, "kubeconfig", "", "Path to kubeconfig file")
+	untapCmd.Flags().BoolVar(&untapConfirmFlag, "yes", false, "Untap even if a Package from this source is still installed")
+}
diff --git a/cmd/cozypkg/cmd/tap_test.go b/cmd/cozypkg/cmd/tap_test.go
new file mode 100644
index 0000000000..27d25ff37c
--- /dev/null
+++ b/cmd/cozypkg/cmd/tap_test.go
@@ -0,0 +1,307 @@
+/*
+Copyright 2025 The Cozystack Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package cmd
+
+import (
+	"context"
+	"errors"
+	"io"
+	"testing"
+
+	sourcev1 "github.com/fluxcd/source-controller/api/v1"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/client/fake"
+	"sigs.k8s.io/controller-runtime/pkg/client/interceptor"
+
+	cozyv1alpha1 "github.com/cozystack/cozystack/api/v1alpha1"
+	"github.com/cozystack/cozystack/internal/marketplace/tapconst"
+)
+
+func TestParseOCIRef(t *testing.T) {
+	cases := []struct {
+		in                                  string
+		wantURL, wantOrg, wantRepo, wantTag string
+		wantErr                             bool
+	}{
+		{"oci://ghcr.io/foo/bar:v1", "oci://ghcr.io/foo/bar", "foo", "bar", "v1", false},
+		{"oci://ghcr.io/foo/bar", "oci://ghcr.io/foo/bar", "foo", "bar", "latest", false},
+		{"oci://ghcr.io/foo/group/bar:1.2.3", "oci://ghcr.io/foo/group/bar", "group", "bar", "1.2.3", false},
+		{"oci://registry.example.com/solo:tag", "oci://registry.example.com/solo", "", "solo", "tag", false},
+		{"https://ghcr.io/foo/bar", "", "", "", "", true},
+		{"oci://ghcr.io/foo/bar@sha256:abc", "", "", "", "", true},
+		{"oci://ghcr.io", "", "", "", "", true},
+	}
+	for _, c := range cases {
+		got, err := parseOCIRef(c.in)
+		if c.wantErr {
+			if err == nil {
+				t.Errorf("parseOCIRef(%q) expected error", c.in)
+			}
+			continue
+		}
+		if err != nil {
+			t.Errorf("parseOCIRef(%q) unexpected error: %v", c.in, err)
+			continue
+		}
+		if got.URL != c.wantURL || got.Org != c.wantOrg || got.Repo != c.wantRepo || got.Tag != c.wantTag {
+			t.Errorf("parseOCIRef(%q) = %+v, want url=%q org=%q repo=%q tag=%q", c.in, got, c.wantURL, c.wantOrg, c.wantRepo, c.wantTag)
+		}
+	}
+}
+
+// fluxSourceName names the OCIRepository (a Flux source object in cozy-system),
+// not the app-facing PackageSource. It carries a neutral "tap-" prefix, not
+// "community-": tapped repositories keep their own declared PackageSource names.
+func TestFluxSourceName(t *testing.T) {
+	if got := fluxSourceName(ociRef{Org: "foo", Repo: "bar"}); got != "tap-foo-bar" {
+		t.Errorf("fluxSourceName = %q", got)
+	}
+	if got := fluxSourceName(ociRef{Repo: "solo"}); got != "tap-solo" {
+		t.Errorf("fluxSourceName (no org) = %q", got)
+	}
+	if got := fluxSourceName(ociRef{Org: "Foo_X", Repo: "Bar.Y"}); got != "tap-foo-x-bar-y" {
+		t.Errorf("fluxSourceName sanitized = %q", got)
+	}
+}
+
+func TestObjectExists(t *testing.T) {
+	scheme := runtime.NewScheme()
+	if err := clientgoscheme.AddToScheme(scheme); err != nil {
+		t.Fatal(err)
+	}
+	if err := cozyv1alpha1.AddToScheme(scheme); err != nil {
+		t.Fatal(err)
+	}
+	if err := sourcev1.AddToScheme(scheme); err != nil {
+		t.Fatal(err)
+	}
+	existing := &sourcev1.OCIRepository{ObjectMeta: metav1.ObjectMeta{Name: "x", Namespace: "cozy-system"}}
+	cl := fake.NewClientBuilder().WithScheme(scheme).WithObjects(existing).Build()
+
+	if !objectExists(context.Background(), cl, existing) {
+		t.Error("expected an existing object to be reported as existing (would be spared on rollback)")
+	}
+	absent := &sourcev1.OCIRepository{ObjectMeta: metav1.ObjectMeta{Name: "y", Namespace: "cozy-system"}}
+	if objectExists(context.Background(), cl, absent) {
+		t.Error("expected an absent object to be reported as not existing (eligible for rollback)")
+	}
+
+	// Fail-safe: a non-NotFound Get error (RBAC/throttling/timeout) must report
+	// "exists" so rollback never deletes a possibly-pre-existing object.
+	errCl := fake.NewClientBuilder().WithScheme(scheme).WithInterceptorFuncs(interceptor.Funcs{
+		Get: func(_ context.Context, _ client.WithWatch, _ client.ObjectKey, _ client.Object, _ ...client.GetOption) error {
+			return apierrors.NewInternalError(errors.New("apiserver unavailable"))
+		},
+	}).Build()
+	if !objectExists(context.Background(), errCl, absent) {
+		t.Error("a non-NotFound Get error must be treated as possibly-existing (spared from rollback)")
+	}
+}
+
+func TestBuildTapOCIRepository(t *testing.T) {
+	r := ociRef{URL: "oci://ghcr.io/foo/bar", Org: "foo", Repo: "bar", Tag: "v1"}
+	obj := buildTapOCIRepository("tap-foo-bar", r, "")
+	if obj.Namespace != "cozy-system" || obj.Spec.URL != "oci://ghcr.io/foo/bar" {
+		t.Fatalf("unexpected OCIRepository: %+v", obj.Spec)
+	}
+	if obj.Spec.Reference == nil || obj.Spec.Reference.Tag != "v1" {
+		t.Fatalf("expected tag v1, got %+v", obj.Spec.Reference)
+	}
+	if obj.Labels[tapconst.Label] != "true" {
+		t.Errorf("expected marketplace-tap label, got %v", obj.Labels)
+	}
+	// The tap-name annotation records the source's own object name (used by the
+	// dashboard orphan-disconnect), not a derived community.* PackageSource name.
+	if obj.Annotations[tapconst.NameAnnotation] != "tap-foo-bar" {
+		t.Errorf("expected tap-name annotation tap-foo-bar, got %v", obj.Annotations)
+	}
+	if obj.Spec.Interval.Minutes() != 5 {
+		t.Fatalf("expected 5m interval, got %v", obj.Spec.Interval)
+	}
+	if obj.Spec.SecretRef != nil {
+		t.Fatalf("expected no secretRef, got %+v", obj.Spec.SecretRef)
+	}
+	withSecret := buildTapOCIRepository("n", r, "pull-creds")
+	if withSecret.Spec.SecretRef == nil || withSecret.Spec.SecretRef.Name != "pull-creds" {
+		t.Fatalf("expected secretRef pull-creds, got %+v", withSecret.Spec.SecretRef)
+	}
+}
+
+// rewritePackageSourceForTap must NOT rename the PackageSource: a tapped
+// repository keeps its own declared name. It only clears server-set metadata,
+// stamps the tap marker (label + source annotation), and repoints the sourceRef.
+func TestRewritePackageSourceForTap(t *testing.T) {
+	ps := &cozyv1alpha1.PackageSource{}
+	ps.SetName("acme.hello")
+	ps.SetResourceVersion("12345")
+	ps.SetUID("some-uid")
+	ps.Spec.SourceRef = &cozyv1alpha1.PackageSourceRef{Kind: "OCIRepository", Name: "hello-packages", Namespace: "cozy-system", Path: "/"}
+	ps.Spec.Variants = []cozyv1alpha1.Variant{{Name: "default", Components: []cozyv1alpha1.Component{{Name: "hello", Path: "apps/hello"}}}}
+
+	rewritePackageSourceForTap(ps, "tap-acme-hello", "/")
+
+	if ps.GetName() != "acme.hello" {
+		t.Errorf("name must be preserved (no community rename), got %q", ps.GetName())
+	}
+	if ps.GetResourceVersion() != "" || ps.GetUID() != "" {
+		t.Errorf("resourceVersion/uid must be cleared for a fresh apply")
+	}
+	if ps.GetLabels()[tapconst.Label] != "true" {
+		t.Errorf("tap label must be stamped so the source is identifiable without a name prefix, got %v", ps.GetLabels())
+	}
+	if ps.GetAnnotations()[tapconst.SourceAnnotation] != "tap-acme-hello" {
+		t.Errorf("source annotation must record the owning OCIRepository, got %v", ps.GetAnnotations())
+	}
+	if ps.Spec.SourceRef.Name != "tap-acme-hello" || ps.Spec.SourceRef.Namespace != "cozy-system" || ps.Spec.SourceRef.Kind != "OCIRepository" {
+		t.Errorf("sourceRef not repointed: %+v", ps.Spec.SourceRef)
+	}
+	if len(ps.Spec.Variants) != 1 || ps.Spec.Variants[0].Components[0].Path != "apps/hello" {
+		t.Errorf("variants/components must be preserved: %+v", ps.Spec.Variants)
+	}
+	// An empty source path defaults to "/".
+	ps2 := &cozyv1alpha1.PackageSource{}
+	rewritePackageSourceForTap(ps2, "src", "")
+	if ps2.Spec.SourceRef.Path != "/" {
+		t.Errorf("empty path should default to /, got %q", ps2.Spec.SourceRef.Path)
+	}
+}
+
+func untapScheme(t *testing.T) *runtime.Scheme {
+	t.Helper()
+	s := runtime.NewScheme()
+	if err := clientgoscheme.AddToScheme(s); err != nil {
+		t.Fatal(err)
+	}
+	if err := cozyv1alpha1.AddToScheme(s); err != nil {
+		t.Fatal(err)
+	}
+	if err := sourcev1.AddToScheme(s); err != nil {
+		t.Fatal(err)
+	}
+	return s
+}
+
+func labeledPS(name, src string) *cozyv1alpha1.PackageSource {
+	return &cozyv1alpha1.PackageSource{
+		ObjectMeta: metav1.ObjectMeta{Name: name, Labels: map[string]string{tapconst.Label: "true"}},
+		Spec: cozyv1alpha1.PackageSourceSpec{
+			SourceRef: &cozyv1alpha1.PackageSourceRef{Kind: "OCIRepository", Name: src, Namespace: "cozy-system"},
+		},
+	}
+}
+
+func ownedPkg(name, src string) *cozyv1alpha1.Package {
+	return &cozyv1alpha1.Package{ObjectMeta: metav1.ObjectMeta{
+		Name:        name,
+		Labels:      map[string]string{tapconst.Label: "true"},
+		Annotations: map[string]string{tapconst.SourceAnnotation: src},
+	}}
+}
+
+func TestRunUntapRemovesRegistrationPackageAndSource(t *testing.T) {
+	s := untapScheme(t)
+	oci := &sourcev1.OCIRepository{ObjectMeta: metav1.ObjectMeta{
+		Name: "tap-acme-hello", Namespace: "cozy-system", Labels: map[string]string{tapconst.Label: "true"},
+	}}
+	cl := fake.NewClientBuilder().WithScheme(s).
+		WithObjects(labeledPS("acme.hello", "tap-acme-hello"), ownedPkg("acme.hello", "tap-acme-hello"), oci).Build()
+
+	if err := runUntap(context.Background(), cl, "acme.hello", false, io.Discard, io.Discard); err != nil {
+		t.Fatalf("runUntap: %v", err)
+	}
+	if err := cl.Get(context.Background(), client.ObjectKey{Name: "acme.hello"}, &cozyv1alpha1.Package{}); !apierrors.IsNotFound(err) {
+		t.Errorf("registration Package must be removed, got %v", err)
+	}
+	if err := cl.Get(context.Background(), client.ObjectKey{Name: "acme.hello"}, &cozyv1alpha1.PackageSource{}); !apierrors.IsNotFound(err) {
+		t.Errorf("PackageSource must be removed, got %v", err)
+	}
+	if err := cl.Get(context.Background(), client.ObjectKey{Name: "tap-acme-hello", Namespace: "cozy-system"}, &sourcev1.OCIRepository{}); !apierrors.IsNotFound(err) {
+		t.Errorf("OCIRepository must be removed, got %v", err)
+	}
+}
+
+func TestRunUntapRefusesOfficial(t *testing.T) {
+	s := untapScheme(t)
+	official := &cozyv1alpha1.PackageSource{ObjectMeta: metav1.ObjectMeta{Name: "official"}}
+	cl := fake.NewClientBuilder().WithScheme(s).WithObjects(official).Build()
+	if err := runUntap(context.Background(), cl, "official", false, io.Discard, io.Discard); err == nil {
+		t.Error("expected refusal to untap an unlabeled (official) source")
+	}
+}
+
+func TestRunUntapKeepsForeignPackage(t *testing.T) {
+	s := untapScheme(t)
+	// A Package owned by a DIFFERENT source: untap must not delete it, and
+	// without --yes it blocks.
+	cl := fake.NewClientBuilder().WithScheme(s).
+		WithObjects(labeledPS("acme.hello", "tap-acme-hello"), ownedPkg("acme.hello", "tap-other")).Build()
+
+	if err := runUntap(context.Background(), cl, "acme.hello", false, io.Discard, io.Discard); err == nil {
+		t.Error("a foreign Package must block untap without --yes")
+	}
+	if err := runUntap(context.Background(), cl, "acme.hello", true, io.Discard, io.Discard); err != nil {
+		t.Fatalf("with --yes untap should proceed: %v", err)
+	}
+	if err := cl.Get(context.Background(), client.ObjectKey{Name: "acme.hello"}, &cozyv1alpha1.Package{}); err != nil {
+		t.Errorf("the foreign Package must be left in place, got %v", err)
+	}
+}
+
+func TestCreatePackageIdempotent(t *testing.T) {
+	s := untapScheme(t)
+	cl := fake.NewClientBuilder().WithScheme(s).Build()
+
+	created, err := createPackageIdempotent(context.Background(), cl, &cozyv1alpha1.Package{ObjectMeta: metav1.ObjectMeta{Name: "x"}})
+	if err != nil || !created {
+		t.Fatalf("first create: created=%v err=%v", created, err)
+	}
+	created, err = createPackageIdempotent(context.Background(), cl, &cozyv1alpha1.Package{ObjectMeta: metav1.ObjectMeta{Name: "x"}})
+	if err != nil || created {
+		t.Fatalf("second create must be a no-op: created=%v err=%v", created, err)
+	}
+}
+
+func TestClearMaterializedRevision(t *testing.T) {
+	s := untapScheme(t)
+	oci := &sourcev1.OCIRepository{ObjectMeta: metav1.ObjectMeta{
+		Name: "tap-acme-hello", Namespace: "cozy-system",
+		Annotations: map[string]string{tapconst.MaterializedRevisionAnnotation: "rev-1", "keep": "me"},
+	}}
+	cl := fake.NewClientBuilder().WithScheme(s).WithObjects(oci).Build()
+
+	if err := clearMaterializedRevision(context.Background(), cl, "tap-acme-hello"); err != nil {
+		t.Fatalf("clear: %v", err)
+	}
+	var got sourcev1.OCIRepository
+	if err := cl.Get(context.Background(), client.ObjectKey{Name: "tap-acme-hello", Namespace: "cozy-system"}, &got); err != nil {
+		t.Fatal(err)
+	}
+	if _, ok := got.Annotations[tapconst.MaterializedRevisionAnnotation]; ok {
+		t.Error("materialized-revision annotation must be cleared to force re-materialization")
+	}
+	if got.Annotations["keep"] != "me" {
+		t.Error("unrelated annotations must be preserved")
+	}
+	// Absent source: no error.
+	if err := clearMaterializedRevision(context.Background(), cl, "missing"); err != nil {
+		t.Errorf("a missing source must not error, got %v", err)
+	}
+}
diff --git a/cmd/cozypkg/cmd/validate.go b/cmd/cozypkg/cmd/validate.go
new file mode 100644
index 0000000000..809f0f2463
--- /dev/null
+++ b/cmd/cozypkg/cmd/validate.go
@@ -0,0 +1,683 @@
+/*
+Copyright 2025 The Cozystack Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package cmd
+
+import (
+	"bufio"
+	"bytes"
+	"context"
+	"encoding/json"
+	"fmt"
+	"io"
+	"io/fs"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"regexp"
+	"strings"
+	"time"
+
+	cozyv1alpha1 "github.com/cozystack/cozystack/api/v1alpha1"
+	"github.com/cozystack/cozystack/internal/marketplace/naming"
+	"github.com/spf13/cobra"
+	utilyaml "k8s.io/apimachinery/pkg/util/yaml"
+	"sigs.k8s.io/yaml"
+)
+
+// ociPullTimeout bounds a `flux pull artifact` so an unreachable registry
+// fails with a legible error instead of hanging indefinitely.
+const ociPullTimeout = 2 * time.Minute
+
+// Severity classifies a validation finding.
+type Severity string
+
+const (
+	// SeverityError marks a hard failure that blocks publication.
+	SeverityError Severity = "ERROR"
+	// SeverityWarning marks something suspicious that does not block on its own.
+	SeverityWarning Severity = "WARNING"
+	// SeverityInfo is informational only (e.g. a privileged component was noted).
+	SeverityInfo Severity = "INFO"
+)
+
+// Finding is a single validation observation about a repository.
+type Finding struct {
+	Severity Severity
+	// Code is a short machine-readable slug for the finding class.
+	Code string
+	// Location is the repo-relative file or resource the finding refers to.
+	Location string
+	// Message is the human-readable description.
+	Message string
+}
+
+// Report accumulates findings from a validation run.
+type Report struct {
+	Findings []Finding
+}
+
+func (r *Report) add(sev Severity, code, location, format string, args ...any) {
+	r.Findings = append(r.Findings, Finding{
+		Severity: sev,
+		Code:     code,
+		Location: location,
+		Message:  fmt.Sprintf(format, args...),
+	})
+}
+
+// HasErrors reports whether any finding is a hard error.
+func (r *Report) HasErrors() bool {
+	for _, f := range r.Findings {
+		if f.Severity == SeverityError {
+			return true
+		}
+	}
+	return false
+}
+
+// Counts returns the number of error, warning and info findings.
+func (r *Report) Counts() (errs, warns, infos int) {
+	for _, f := range r.Findings {
+		switch f.Severity {
+		case SeverityError:
+			errs++
+		case SeverityWarning:
+			warns++
+		case SeverityInfo:
+			infos++
+		}
+	}
+	return
+}
+
+// ValidateOptions configures a repository validation run.
+type ValidateOptions struct {
+	// RepoRoot is a local directory holding the External-Apps repository tree.
+	RepoRoot string
+	// RunHelmLint controls whether `helm lint` is executed for each component chart.
+	RunHelmLint bool
+	// KnownSources is an allowlist of PackageSource names that dependsOn entries
+	// may reference even though they are not defined inside this repository
+	// (e.g. sources shipped by the platform itself).
+	KnownSources []string
+	// AllowReservedNames disables the reserved-prefix check. It exists only as a
+	// caller-side escape hatch: the index publication gate never sets it, so a
+	// submitter cannot hand it to themselves to claim a platform name.
+	AllowReservedNames bool
+}
+
+// reservedNamePrefixes are PackageSource name prefixes a repository should not
+// claim: "cozystack." is the platform's own namespace, and "community." is the
+// namespace older, renamed sources used. The on-cluster collision check is the
+// real boundary (a labelled OCIRepository reaches the materializer without the
+// CLI); this offline check is a usability hint so an author learns at authoring
+// time rather than after publishing.
+var reservedNamePrefixes = []string{"cozystack.", "community."}
+
+type loadedPackageSource struct {
+	File string
+	PS   cozyv1alpha1.PackageSource
+}
+
+type loadedAppDef struct {
+	File string
+	AD   cozyv1alpha1.ApplicationDefinition
+}
+
+type typeMeta struct {
+	APIVersion string `json:"apiVersion"`
+	Kind       string `json:"kind"`
+}
+
+// splitYAMLDocuments splits a multi-document YAML byte slice into individual
+// documents, dropping empty ones. It uses the apimachinery reader so a block
+// scalar containing a separator-looking line does not fracture a document (the
+// same reader the operator's materializer uses, so both decode identically).
+func splitYAMLDocuments(data []byte) [][]byte {
+	reader := utilyaml.NewYAMLReader(bufio.NewReader(bytes.NewReader(data)))
+	var out [][]byte
+	for {
+		doc, err := reader.Read()
+		if err == io.EOF {
+			break
+		}
+		if err != nil {
+			// Malformed stream; stop here and let the per-document decode below
+			// surface a schema error for whatever was already read.
+			break
+		}
+		if len(bytes.TrimSpace(doc)) == 0 {
+			continue
+		}
+		out = append(out, doc)
+	}
+	return out
+}
+
+// artifactName links a component to its ApplicationDefinition via the assembled
+// artifact name; it delegates to the shared naming helper so the validator and
+// the marketplace backend cannot drift on this convention.
+func artifactName(psName, variant, component string) string {
+	return naming.ArtifactName(psName, variant, component)
+}
+
+// artifactRoot returns the directory that plays the role of the OCI artifact
+// root. A source repository nests everything under packages/; a pulled OCI
+// artifact has that prefix stripped, so we fall back to the given root.
+func artifactRoot(root string) string {
+	p := filepath.Join(root, "packages")
+	if fi, err := os.Stat(p); err == nil && fi.IsDir() {
+		return p
+	}
+	return root
+}
+
+func isDir(path string) bool {
+	fi, err := os.Stat(path)
+	return err == nil && fi.IsDir()
+}
+
+func isFile(path string) bool {
+	fi, err := os.Stat(path)
+	return err == nil && !fi.IsDir()
+}
+
+// loadManifests walks the repository tree and decodes every PackageSource and
+// ApplicationDefinition manifest it finds. Decode failures are recorded as
+// findings rather than aborting the walk.
+func loadManifests(root string, r *Report) ([]loadedPackageSource, []loadedAppDef) {
+	var pss []loadedPackageSource
+	var ads []loadedAppDef
+
+	_ = filepath.WalkDir(root, func(path string, d fs.DirEntry, err error) error {
+		if err != nil {
+			return nil
+		}
+		if d.IsDir() {
+			if d.Name() == ".git" {
+				return filepath.SkipDir
+			}
+			return nil
+		}
+		if !strings.HasSuffix(path, ".yaml") && !strings.HasSuffix(path, ".yml") {
+			return nil
+		}
+		data, e := os.ReadFile(path)
+		if e != nil {
+			return nil
+		}
+		rel, relErr := filepath.Rel(root, path)
+		if relErr != nil {
+			rel = path
+		}
+		for _, doc := range splitYAMLDocuments(data) {
+			var tm typeMeta
+			if err := yaml.Unmarshal(doc, &tm); err != nil {
+				continue
+			}
+			switch tm.Kind {
+			case "PackageSource":
+				var ps cozyv1alpha1.PackageSource
+				if err := yaml.UnmarshalStrict(doc, &ps); err != nil {
+					r.add(SeverityError, "schema", rel, "PackageSource failed strict decode: %v", err)
+					continue
+				}
+				pss = append(pss, loadedPackageSource{File: rel, PS: ps})
+			case "ApplicationDefinition":
+				// cozyrds assets are emitted verbatim, but be defensive: a file
+				// still carrying Helm template actions cannot be decoded offline.
+				if strings.Contains(string(doc), "{{") {
+					continue
+				}
+				var ad cozyv1alpha1.ApplicationDefinition
+				if err := yaml.UnmarshalStrict(doc, &ad); err != nil {
+					r.add(SeverityError, "schema", rel, "ApplicationDefinition failed strict decode: %v", err)
+					continue
+				}
+				ads = append(ads, loadedAppDef{File: rel, AD: ad})
+			}
+		}
+		return nil
+	})
+
+	return pss, ads
+}
+
+// ValidateRepo runs all offline checks against a local repository tree and
+// returns the accumulated report. It only returns an error for problems that
+// prevent validation from running at all (e.g. the path is not a directory).
+func ValidateRepo(opts ValidateOptions) (*Report, error) {
+	r := &Report{}
+	if !isDir(opts.RepoRoot) {
+		return nil, fmt.Errorf("repository path %q is not a directory", opts.RepoRoot)
+	}
+
+	pss, ads := loadManifests(opts.RepoRoot, r)
+	if len(pss) == 0 {
+		r.add(SeverityError, "no-packagesource", "", "no PackageSource manifest found under %s", opts.RepoRoot)
+		return r, nil
+	}
+
+	psNames := map[string]bool{}
+	expectedArtifacts := map[string]bool{}
+	for _, l := range pss {
+		psNames[l.PS.Name] = true
+		for _, v := range l.PS.Spec.Variants {
+			for _, c := range v.Components {
+				expectedArtifacts[artifactName(l.PS.Name, v.Name, c.Name)] = true
+			}
+		}
+	}
+
+	artRoot := artifactRoot(opts.RepoRoot)
+	for _, l := range pss {
+		validatePackageSource(artRoot, l, r, opts)
+	}
+	checkDependsOn(pss, psNames, r, opts)
+	checkAppDefs(ads, expectedArtifacts, r)
+
+	return r, nil
+}
+
+func validatePackageSource(artRoot string, l loadedPackageSource, r *Report, opts ValidateOptions) {
+	ps := l.PS
+	if ps.Name == "" {
+		r.add(SeverityError, "ps-name", l.File, "PackageSource has empty metadata.name")
+	} else if !opts.AllowReservedNames {
+		for _, p := range reservedNamePrefixes {
+			if strings.HasPrefix(ps.Name, p) {
+				r.add(SeverityError, "ps-name-reserved", l.File, "PackageSource %s uses reserved name prefix %q; that namespace is platform-managed, pick a neutral name (e.g. <org>.<repo>)", ps.Name, p)
+				break
+			}
+		}
+	}
+	if ps.Spec.SourceRef != nil {
+		k := ps.Spec.SourceRef.Kind
+		if k != "GitRepository" && k != "OCIRepository" {
+			r.add(SeverityError, "sourceref-kind", l.File, "PackageSource %s sourceRef.kind %q must be GitRepository or OCIRepository", ps.Name, k)
+		}
+	}
+	if len(ps.Spec.Variants) == 0 {
+		r.add(SeverityError, "no-variants", l.File, "PackageSource %s has no variants", ps.Name)
+		return
+	}
+
+	seenVariant := map[string]bool{}
+	seenArtifacts := map[string]string{} // artifact name -> variant/component, to catch normalisation collisions
+	for _, v := range ps.Spec.Variants {
+		if v.Name == "" {
+			r.add(SeverityError, "variant-name", l.File, "PackageSource %s has a variant with empty name", ps.Name)
+		}
+		if seenVariant[v.Name] {
+			r.add(SeverityError, "variant-dup", l.File, "PackageSource %s has duplicate variant %q", ps.Name, v.Name)
+		}
+		seenVariant[v.Name] = true
+
+		libNames := map[string]bool{}
+		for _, lib := range v.Libraries {
+			if lib.Path == "" {
+				r.add(SeverityError, "lib-path", l.File, "PackageSource %s variant %s has a library with empty path", ps.Name, v.Name)
+				continue
+			}
+			name := lib.Name
+			if name == "" {
+				name = filepath.Base(lib.Path)
+			}
+			libNames[name] = true
+			dir := filepath.Join(artRoot, lib.Path)
+			if !isDir(dir) {
+				r.add(SeverityError, "lib-missing", l.File, "PackageSource %s variant %s library path %q not found on disk", ps.Name, v.Name, lib.Path)
+			}
+		}
+
+		seenComp := map[string]bool{}
+		for _, c := range v.Components {
+			if c.Name == "" {
+				r.add(SeverityError, "comp-name", l.File, "PackageSource %s variant %s has a component with empty name", ps.Name, v.Name)
+			}
+			if seenComp[c.Name] {
+				r.add(SeverityError, "comp-dup", l.File, "PackageSource %s variant %s has duplicate component %q", ps.Name, v.Name, c.Name)
+			}
+			seenComp[c.Name] = true
+
+			// Dot-to-dash normalisation in the artifact name can make two
+			// distinct (variant, component) pairs collide (e.g. "v1.0"/"c" and
+			// "v1"/"0-c"); the reconciler would then overwrite one OutputArtifact
+			// with the other. Reject the collision at validation time.
+			art := artifactName(ps.Name, v.Name, c.Name)
+			if prev, ok := seenArtifacts[art]; ok {
+				r.add(SeverityError, "artifact-name-collision", l.File, "PackageSource %s: %s and %s both normalise to artifact name %q", ps.Name, prev, v.Name+"/"+c.Name, art)
+			} else {
+				seenArtifacts[art] = v.Name + "/" + c.Name
+			}
+
+			for _, ln := range c.Libraries {
+				if !libNames[ln] {
+					r.add(SeverityError, "comp-lib-undeclared", l.File, "PackageSource %s variant %s component %q references library %q not declared at variant level", ps.Name, v.Name, c.Name, ln)
+				}
+			}
+
+			if c.Install != nil && c.Install.Privileged {
+				r.add(SeverityWarning, "privileged", l.File, "PackageSource %s variant %s component %q is privileged (install.privileged: true)", ps.Name, v.Name, c.Name)
+			}
+
+			if c.Path == "" {
+				r.add(SeverityError, "comp-path", l.File, "PackageSource %s variant %s component %q has empty path", ps.Name, v.Name, c.Name)
+				continue
+			}
+			dir := filepath.Join(artRoot, c.Path)
+			if !isDir(dir) {
+				r.add(SeverityError, "comp-missing", l.File, "PackageSource %s variant %s component %q path %q not found on disk", ps.Name, v.Name, c.Name, c.Path)
+				continue
+			}
+			if !isFile(filepath.Join(dir, "Chart.yaml")) {
+				r.add(SeverityError, "chart-yaml", l.File, "PackageSource %s variant %s component %q directory %q has no Chart.yaml", ps.Name, v.Name, c.Name, c.Path)
+				continue
+			}
+			if opts.RunHelmLint {
+				helmLint(artRoot, v, c, dir, r, l.File)
+			}
+		}
+	}
+}
+
+func checkDependsOn(pss []loadedPackageSource, psNames map[string]bool, r *Report, opts ValidateOptions) {
+	known := map[string]bool{}
+	for _, k := range opts.KnownSources {
+		known[k] = true
+	}
+	for _, l := range pss {
+		for _, v := range l.PS.Spec.Variants {
+			for _, dep := range v.DependsOn {
+				if psNames[dep] || known[dep] {
+					continue
+				}
+				if strings.HasPrefix(dep, "cozystack.") {
+					r.add(SeverityInfo, "dependson-shipped", l.File, "PackageSource %s variant %s dependsOn %q assumed platform-shipped (not defined in this repository)", l.PS.Name, v.Name, dep)
+					continue
+				}
+				r.add(SeverityWarning, "dependson-unresolved", l.File, "PackageSource %s variant %s dependsOn %q is neither defined in this repository nor a known platform source", l.PS.Name, v.Name, dep)
+			}
+		}
+	}
+}
+
+func checkAppDefs(ads []loadedAppDef, expected map[string]bool, r *Report) {
+	for _, l := range ads {
+		ref := l.AD.Spec.Release.ChartRef
+		if ref == nil {
+			r.add(SeverityError, "appdef-chartref", l.File, "ApplicationDefinition %s has no release.chartRef", l.AD.Name)
+			continue
+		}
+		if ref.Kind != "ExternalArtifact" {
+			continue
+		}
+		if !expected[ref.Name] {
+			r.add(SeverityWarning, "appdef-dangling", l.File, "ApplicationDefinition %s chartRef %q does not match any <packagesource>-<variant>-<component> defined in this repository", l.AD.Name, ref.Name)
+		}
+	}
+}
+
+// helmLint stages a component chart (with its declared variant libraries) into
+// a temporary directory and runs `helm lint` on it. Staging mirrors the
+// ArtifactGenerator copy operations so library-dependent charts lint the same
+// way they are assembled at reconcile time.
+func helmLint(artRoot string, v cozyv1alpha1.Variant, c cozyv1alpha1.Component, chartDir string, r *Report, file string) {
+	stageDir := chartDir
+	if len(c.Libraries) > 0 {
+		tmp, err := os.MkdirTemp("", "cozypkg-lint-")
+		if err != nil {
+			r.add(SeverityError, "helm-lint", file, "component %q: failed to create temp dir for library staging: %v", c.Name, err)
+			return
+		}
+		defer func() { _ = os.RemoveAll(tmp) }()
+		dst := filepath.Join(tmp, filepath.Base(chartDir))
+		if err := copyTree(chartDir, dst); err != nil {
+			r.add(SeverityError, "helm-lint", file, "component %q: failed to stage chart: %v", c.Name, err)
+			return
+		}
+		libByName := map[string]cozyv1alpha1.Library{}
+		for _, lib := range v.Libraries {
+			name := lib.Name
+			if name == "" {
+				name = filepath.Base(lib.Path)
+			}
+			libByName[name] = lib
+		}
+		for _, ln := range c.Libraries {
+			lib, ok := libByName[ln]
+			if !ok {
+				continue
+			}
+			libSrc := filepath.Join(artRoot, lib.Path)
+			if err := copyTree(libSrc, filepath.Join(dst, "charts", ln)); err != nil {
+				r.add(SeverityError, "helm-lint", file, "component %q: failed to stage library %q: %v", c.Name, ln, err)
+				return
+			}
+		}
+		stageDir = dst
+	}
+
+	out, err := exec.Command("helm", "lint", stageDir).CombinedOutput()
+	trimmed := strings.TrimSpace(string(out))
+	if err != nil {
+		r.add(SeverityError, "helm-lint", file, "helm lint failed for component %q:\n%s", c.Name, trimmed)
+		return
+	}
+	if strings.Contains(trimmed, "[WARNING]") {
+		r.add(SeverityWarning, "helm-lint", file, "helm lint reported warnings for component %q:\n%s", c.Name, trimmed)
+	}
+}
+
+func copyTree(src, dst string) error {
+	return filepath.WalkDir(src, func(path string, d fs.DirEntry, err error) error {
+		if err != nil {
+			return err
+		}
+		rel, err := filepath.Rel(src, path)
+		if err != nil {
+			return err
+		}
+		target := filepath.Join(dst, rel)
+		if d.IsDir() {
+			return os.MkdirAll(target, 0o755)
+		}
+		data, err := os.ReadFile(path)
+		if err != nil {
+			return err
+		}
+		if err := os.MkdirAll(filepath.Dir(target), 0o755); err != nil {
+			return err
+		}
+		return os.WriteFile(target, data, 0o644)
+	})
+}
+
+var ociRefPattern = regexp.MustCompile(`^oci://`)
+
+func isOCIRef(target string) bool {
+	return ociRefPattern.MatchString(target)
+}
+
+// pullOCIArtifact downloads an OCI artifact into a temporary directory using
+// the flux CLI and returns the directory plus a cleanup function.
+func pullOCIArtifact(ref string) (string, func(), error) {
+	dir, err := os.MkdirTemp("", "cozypkg-validate-")
+	if err != nil {
+		return "", func() {}, err
+	}
+	cleanup := func() { _ = os.RemoveAll(dir) }
+	ctx, cancel := context.WithTimeout(context.Background(), ociPullTimeout)
+	defer cancel()
+	out, err := exec.CommandContext(ctx, "flux", "pull", "artifact", ref, "--output", dir).CombinedOutput()
+	if ctx.Err() == context.DeadlineExceeded {
+		cleanup()
+		return "", func() {}, fmt.Errorf("timed out after %s pulling artifact %q", ociPullTimeout, ref)
+	}
+	if err != nil {
+		cleanup()
+		return "", func() {}, fmt.Errorf("failed to pull artifact %q: %v\n%s", ref, err, strings.TrimSpace(string(out)))
+	}
+	return dir, cleanup, nil
+}
+
+func printReport(r *Report, w io.Writer) {
+	for _, f := range r.Findings {
+		loc := f.Location
+		if loc == "" {
+			loc = "-"
+		}
+		fmt.Fprintf(w, "[%s] %s (%s): %s\n", f.Severity, loc, f.Code, f.Message)
+	}
+	errs, warns, infos := r.Counts()
+	fmt.Fprintf(w, "\nSummary: %d error(s), %d warning(s), %d info\n", errs, warns, infos)
+}
+
+var validateCmdFlags struct {
+	helmLint           bool
+	requireSignature   bool
+	certIdentity       string
+	certIssuer         string
+	knownSources       []string
+	allowReservedNames bool
+}
+
+var digestRe = regexp.MustCompile(`sha256:[0-9a-f]{64}`)
+
+// verifyCosignSignature verifies an OCI artifact's keyless cosign signature
+// against the expected certificate identity and OIDC issuer, shelling out to
+// the cosign binary. This is the trust anchor the index CI gate relies on: a
+// version bump must stay signed by the entry's recorded identity. It returns
+// the verified manifest digest so the caller can pull that exact content and
+// close the tag-mutation window between verify and pull; the digest is empty
+// if it could not be parsed (the caller then falls back to the tag).
+func verifyCosignSignature(ref, identity, issuer string) (string, error) {
+	if _, err := exec.LookPath("cosign"); err != nil {
+		return "", fmt.Errorf("--require-signature needs the cosign binary in PATH: %w", err)
+	}
+	if identity == "" || issuer == "" {
+		return "", fmt.Errorf("--require-signature needs --certificate-identity and --certificate-oidc-issuer for keyless verification")
+	}
+	cosignRef := strings.TrimPrefix(ref, "oci://")
+	ctx, cancel := context.WithTimeout(context.Background(), ociPullTimeout)
+	defer cancel()
+	out, err := exec.CommandContext(ctx, "cosign", "verify", cosignRef,
+		"--certificate-identity", identity,
+		"--certificate-oidc-issuer", issuer,
+		"--output", "json").CombinedOutput()
+	if ctx.Err() == context.DeadlineExceeded {
+		return "", fmt.Errorf("timed out verifying the signature of %q", ref)
+	}
+	if err != nil {
+		return "", fmt.Errorf("cosign verification failed for %q: %v\n%s", ref, err, strings.TrimSpace(string(out)))
+	}
+	// Extract the verified manifest digest from the JSON payload
+	// (.critical.image."docker-manifest-digest").
+	return parseVerifiedDigest(out), nil
+}
+
+// parseVerifiedDigest pulls the docker-manifest-digest out of cosign's JSON
+// verification output, or returns "" if it is not present.
+func parseVerifiedDigest(out []byte) string {
+	var payloads []struct {
+		Critical struct {
+			Image struct {
+				Digest string `json:"docker-manifest-digest"`
+			} `json:"image"`
+		} `json:"critical"`
+	}
+	if err := json.Unmarshal(out, &payloads); err == nil {
+		for _, p := range payloads {
+			if digestRe.MatchString(p.Critical.Image.Digest) {
+				return p.Critical.Image.Digest
+			}
+		}
+	}
+	// Fallback: any sha256 digest present in the output.
+	return digestRe.FindString(string(out))
+}
+
+var validateCmd = &cobra.Command{
+	Use:   "validate <repository-path-or-oci-ref>",
+	Short: "Validate an External-Apps repository offline",
+	Long: `Validate lints an External-Apps repository the same way publication
+would, without installing anything into a cluster.
+
+The argument is either a local path to a repository checkout or an oci://
+reference to a published artifact (pulled with the flux CLI). Validation
+decodes every PackageSource and ApplicationDefinition, resolves each
+component and library path to a chart directory on disk, checks that
+ApplicationDefinition chart references match a component, resolves dependsOn
+entries, and flags privileged components. With --helm-lint it additionally
+runs "helm lint" on every component chart.`,
+	Args: cobra.ExactArgs(1),
+	RunE: func(cmd *cobra.Command, args []string) error {
+		target := args[0]
+		root := target
+
+		if isOCIRef(target) {
+			pullRef := target
+			if validateCmdFlags.requireSignature {
+				digest, err := verifyCosignSignature(target, validateCmdFlags.certIdentity, validateCmdFlags.certIssuer)
+				if err != nil {
+					return err
+				}
+				// Pull the exact content cosign verified, closing the window in
+				// which the tag could be moved between verify and pull.
+				if digest != "" {
+					if parsed, perr := parseOCIRef(target); perr == nil {
+						pullRef = parsed.URL + "@" + digest
+					}
+				}
+			}
+			dir, cleanup, err := pullOCIArtifact(pullRef)
+			if err != nil {
+				return err
+			}
+			defer cleanup()
+			root = dir
+		} else if validateCmdFlags.requireSignature {
+			return fmt.Errorf("--require-signature requires an oci:// reference, not a local path")
+		}
+
+		rep, err := ValidateRepo(ValidateOptions{
+			RepoRoot:           root,
+			RunHelmLint:        validateCmdFlags.helmLint,
+			KnownSources:       validateCmdFlags.knownSources,
+			AllowReservedNames: validateCmdFlags.allowReservedNames,
+		})
+		if err != nil {
+			return err
+		}
+		printReport(rep, cmd.OutOrStdout())
+		if rep.HasErrors() {
+			errs, _, _ := rep.Counts()
+			return fmt.Errorf("validation failed: %d error(s)", errs)
+		}
+		return nil
+	},
+}
+
+func init() {
+	rootCmd.AddCommand(validateCmd)
+	validateCmd.Flags().BoolVar(&validateCmdFlags.helmLint, "helm-lint", false, "Run 'helm lint' on every component chart (requires the helm binary)")
+	validateCmd.Flags().BoolVar(&validateCmdFlags.requireSignature, "require-signature", false, "Require a valid keyless cosign signature on the OCI artifact (needs the cosign binary and an oci:// reference)")
+	validateCmd.Flags().StringVar(&validateCmdFlags.certIdentity, "certificate-identity", "", "Expected cosign certificate identity for --require-signature")
+	validateCmd.Flags().StringVar(&validateCmdFlags.certIssuer, "certificate-oidc-issuer", "", "Expected cosign certificate OIDC issuer for --require-signature")
+	validateCmd.Flags().StringArrayVar(&validateCmdFlags.knownSources, "known-source", nil, "PackageSource name that dependsOn entries may reference without being defined in the repository (can be repeated)")
+	validateCmd.Flags().BoolVar(&validateCmdFlags.allowReservedNames, "allow-reserved-names", false, "Permit reserved PackageSource name prefixes (cozystack./community.); the index gate never sets this")
+}
diff --git a/cmd/cozypkg/cmd/validate_test.go b/cmd/cozypkg/cmd/validate_test.go
new file mode 100644
index 0000000000..a9af8025f4
--- /dev/null
+++ b/cmd/cozypkg/cmd/validate_test.go
@@ -0,0 +1,444 @@
+/*
+Copyright 2025 The Cozystack Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package cmd
+
+import (
+	"os"
+	"path/filepath"
+	"strings"
+	"testing"
+)
+
+func writeFile(t *testing.T, root, rel, content string) {
+	t.Helper()
+	p := filepath.Join(root, rel)
+	if err := os.MkdirAll(filepath.Dir(p), 0o755); err != nil {
+		t.Fatalf("mkdir for %s: %v", rel, err)
+	}
+	if err := os.WriteFile(p, []byte(content), 0o644); err != nil {
+		t.Fatalf("write %s: %v", rel, err)
+	}
+}
+
+// validRepo builds a minimal but complete External-Apps repository:
+// one PackageSource with a default variant that has a library, an app
+// component that uses the library, and a paired -rd component whose chart
+// carries a matching ApplicationDefinition.
+func validRepo(t *testing.T) string {
+	t.Helper()
+	root := t.TempDir()
+
+	writeFile(t, root, "packages/core/platform/sources/foo.yaml", `apiVersion: cozystack.io/v1alpha1
+kind: PackageSource
+metadata:
+  name: example.foo-application
+spec:
+  sourceRef:
+    kind: OCIRepository
+    name: example-packages
+    namespace: cozy-system
+    path: /
+  variants:
+    - name: default
+      dependsOn:
+        - cozystack.networking
+      libraries:
+        - name: cozy-lib
+          path: library/cozy-lib
+      components:
+        - name: foo
+          path: apps/foo
+          libraries: ["cozy-lib"]
+        - name: foo-rd
+          path: system/foo-rd
+          install:
+            namespace: cozy-system
+`)
+
+	writeFile(t, root, "packages/apps/foo/Chart.yaml", "apiVersion: v2\nname: foo\nversion: 0.1.0\n")
+	writeFile(t, root, "packages/system/foo-rd/Chart.yaml", "apiVersion: v2\nname: foo-rd\nversion: 0.1.0\n")
+	writeFile(t, root, "packages/library/cozy-lib/Chart.yaml", "apiVersion: v2\nname: cozy-lib\ntype: library\nversion: 0.1.0\n")
+
+	writeFile(t, root, "packages/system/foo-rd/cozyrds/foo.yaml", `apiVersion: cozystack.io/v1alpha1
+kind: ApplicationDefinition
+metadata:
+  name: foo
+spec:
+  application:
+    kind: Foo
+    openAPISchema: ""
+    plural: foos
+    singular: foo
+  release:
+    chartRef:
+      kind: ExternalArtifact
+      name: example-foo-application-default-foo
+      namespace: cozy-system
+    prefix: foo-
+`)
+
+	return root
+}
+
+func codeCounts(r *Report) map[string]int {
+	m := map[string]int{}
+	for _, f := range r.Findings {
+		m[f.Code]++
+	}
+	return m
+}
+
+func TestValidateRepo_Valid(t *testing.T) {
+	root := validRepo(t)
+	rep, err := ValidateRepo(ValidateOptions{RepoRoot: root})
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+	if rep.HasErrors() {
+		t.Fatalf("expected no errors, got findings: %+v", rep.Findings)
+	}
+	codes := codeCounts(rep)
+	// cozystack.networking dependsOn resolves to a shipped-source info, not a warning.
+	if codes["dependson-shipped"] != 1 {
+		t.Errorf("expected 1 dependson-shipped info, got %d (%+v)", codes["dependson-shipped"], rep.Findings)
+	}
+	if codes["dependson-unresolved"] != 0 {
+		t.Errorf("expected no unresolved dependsOn, got %d", codes["dependson-unresolved"])
+	}
+	if codes["appdef-dangling"] != 0 {
+		t.Errorf("expected no dangling appdef, got %d", codes["appdef-dangling"])
+	}
+}
+
+func TestValidateRepo_NotADirectory(t *testing.T) {
+	_, err := ValidateRepo(ValidateOptions{RepoRoot: filepath.Join(t.TempDir(), "does-not-exist")})
+	if err == nil {
+		t.Fatal("expected error for missing directory")
+	}
+}
+
+func TestValidateRepo_NoPackageSource(t *testing.T) {
+	root := t.TempDir()
+	writeFile(t, root, "packages/apps/foo/Chart.yaml", "apiVersion: v2\nname: foo\nversion: 0.1.0\n")
+	rep, err := ValidateRepo(ValidateOptions{RepoRoot: root})
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+	if codeCounts(rep)["no-packagesource"] != 1 {
+		t.Fatalf("expected no-packagesource error, got %+v", rep.Findings)
+	}
+}
+
+func TestValidateRepo_MissingComponentChart(t *testing.T) {
+	root := validRepo(t)
+	if err := os.RemoveAll(filepath.Join(root, "packages/apps/foo")); err != nil {
+		t.Fatal(err)
+	}
+	rep, _ := ValidateRepo(ValidateOptions{RepoRoot: root})
+	if !rep.HasErrors() {
+		t.Fatal("expected errors after removing component chart")
+	}
+	if codeCounts(rep)["comp-missing"] != 1 {
+		t.Fatalf("expected comp-missing error, got %+v", rep.Findings)
+	}
+}
+
+func TestValidateRepo_ChartYAMLMissing(t *testing.T) {
+	root := validRepo(t)
+	if err := os.Remove(filepath.Join(root, "packages/apps/foo/Chart.yaml")); err != nil {
+		t.Fatal(err)
+	}
+	rep, _ := ValidateRepo(ValidateOptions{RepoRoot: root})
+	if codeCounts(rep)["chart-yaml"] != 1 {
+		t.Fatalf("expected chart-yaml error, got %+v", rep.Findings)
+	}
+}
+
+func TestValidateRepo_Privileged(t *testing.T) {
+	root := t.TempDir()
+	writeFile(t, root, "packages/core/platform/sources/p.yaml", `apiVersion: cozystack.io/v1alpha1
+kind: PackageSource
+metadata:
+  name: example.priv
+spec:
+  variants:
+    - name: default
+      components:
+        - name: risky
+          path: apps/risky
+          install:
+            privileged: true
+`)
+	writeFile(t, root, "packages/apps/risky/Chart.yaml", "apiVersion: v2\nname: risky\nversion: 0.1.0\n")
+	rep, _ := ValidateRepo(ValidateOptions{RepoRoot: root})
+	if rep.HasErrors() {
+		t.Fatalf("privileged alone must not be an error: %+v", rep.Findings)
+	}
+	if codeCounts(rep)["privileged"] != 1 {
+		t.Fatalf("expected privileged warning, got %+v", rep.Findings)
+	}
+}
+
+func TestValidateRepo_DependsOnUnresolvedVsKnown(t *testing.T) {
+	root := t.TempDir()
+	writeFile(t, root, "packages/core/platform/sources/p.yaml", `apiVersion: cozystack.io/v1alpha1
+kind: PackageSource
+metadata:
+  name: example.app
+spec:
+  variants:
+    - name: default
+      dependsOn:
+        - third-party.thing
+      components:
+        - name: app
+          path: apps/app
+`)
+	writeFile(t, root, "packages/apps/app/Chart.yaml", "apiVersion: v2\nname: app\nversion: 0.1.0\n")
+
+	rep, _ := ValidateRepo(ValidateOptions{RepoRoot: root})
+	if codeCounts(rep)["dependson-unresolved"] != 1 {
+		t.Fatalf("expected unresolved dependsOn warning, got %+v", rep.Findings)
+	}
+
+	repKnown, _ := ValidateRepo(ValidateOptions{RepoRoot: root, KnownSources: []string{"third-party.thing"}})
+	if codeCounts(repKnown)["dependson-unresolved"] != 0 {
+		t.Fatalf("known-source should silence dependsOn warning, got %+v", repKnown.Findings)
+	}
+}
+
+func TestValidateRepo_DanglingAppDefRef(t *testing.T) {
+	root := validRepo(t)
+	// Point the ApplicationDefinition at a non-existent component artifact.
+	writeFile(t, root, "packages/system/foo-rd/cozyrds/foo.yaml", `apiVersion: cozystack.io/v1alpha1
+kind: ApplicationDefinition
+metadata:
+  name: foo
+spec:
+  application:
+    kind: Foo
+    openAPISchema: ""
+    plural: foos
+    singular: foo
+  release:
+    chartRef:
+      kind: ExternalArtifact
+      name: example-foo-application-default-nonexistent
+      namespace: cozy-system
+    prefix: foo-
+`)
+	rep, _ := ValidateRepo(ValidateOptions{RepoRoot: root})
+	if codeCounts(rep)["appdef-dangling"] != 1 {
+		t.Fatalf("expected dangling appdef warning, got %+v", rep.Findings)
+	}
+}
+
+func TestValidateRepo_StrictSchemaRejectsUnknownField(t *testing.T) {
+	root := t.TempDir()
+	writeFile(t, root, "packages/core/platform/sources/p.yaml", `apiVersion: cozystack.io/v1alpha1
+kind: PackageSource
+metadata:
+  name: example.bad
+spec:
+  bogusUnknownField: true
+  variants:
+    - name: default
+      components:
+        - name: app
+          path: apps/app
+`)
+	writeFile(t, root, "packages/apps/app/Chart.yaml", "apiVersion: v2\nname: app\nversion: 0.1.0\n")
+	rep, _ := ValidateRepo(ValidateOptions{RepoRoot: root})
+	if codeCounts(rep)["schema"] != 1 {
+		t.Fatalf("expected schema error for unknown field, got %+v", rep.Findings)
+	}
+}
+
+func TestValidateRepo_UndeclaredComponentLibrary(t *testing.T) {
+	root := t.TempDir()
+	writeFile(t, root, "packages/core/platform/sources/p.yaml", `apiVersion: cozystack.io/v1alpha1
+kind: PackageSource
+metadata:
+  name: example.app
+spec:
+  variants:
+    - name: default
+      components:
+        - name: app
+          path: apps/app
+          libraries: ["missing-lib"]
+`)
+	writeFile(t, root, "packages/apps/app/Chart.yaml", "apiVersion: v2\nname: app\nversion: 0.1.0\n")
+	rep, _ := ValidateRepo(ValidateOptions{RepoRoot: root})
+	if codeCounts(rep)["comp-lib-undeclared"] != 1 {
+		t.Fatalf("expected comp-lib-undeclared error, got %+v", rep.Findings)
+	}
+}
+
+func TestValidateRepo_BlockScalarNotFractured(t *testing.T) {
+	root := t.TempDir()
+	// The annotation's block scalar contains a separator-looking line; a naive
+	// split would fracture the document and fail the strict decode.
+	writeFile(t, root, "packages/core/platform/sources/p.yaml", `apiVersion: cozystack.io/v1alpha1
+kind: PackageSource
+metadata:
+  name: example.app
+  annotations:
+    note: |
+      line one
+      ---
+      line two
+spec:
+  variants:
+    - name: default
+      components:
+        - name: app
+          path: apps/app
+`)
+	writeFile(t, root, "packages/apps/app/Chart.yaml", "apiVersion: v2\nname: app\nversion: 0.1.0\n")
+	rep, err := ValidateRepo(ValidateOptions{RepoRoot: root})
+	if err != nil {
+		t.Fatalf("ValidateRepo: %v", err)
+	}
+	if codeCounts(rep)["schema"] != 0 || codeCounts(rep)["no-packagesource"] != 0 {
+		t.Fatalf("block scalar fractured the document: %+v", rep.Findings)
+	}
+}
+
+// Reserved prefixes (cozystack./community.) are flagged as a usability hint so
+// an author learns at authoring time; a neutral name is not, and the caller-side
+// escape hatch clears the finding (the index gate never sets it).
+func TestValidateRepo_ReservedNamePrefix(t *testing.T) {
+	writeRepo := func(t *testing.T, name string) string {
+		root := t.TempDir()
+		writeFile(t, root, "packages/core/platform/sources/p.yaml", `apiVersion: cozystack.io/v1alpha1
+kind: PackageSource
+metadata:
+  name: `+name+`
+spec:
+  variants:
+    - name: default
+      components:
+        - name: app
+          path: apps/app
+`)
+		writeFile(t, root, "packages/apps/app/Chart.yaml", "apiVersion: v2\nname: app\nversion: 0.1.0\n")
+		return root
+	}
+
+	for _, name := range []string{"cozystack.evil", "community.acme.demo"} {
+		root := writeRepo(t, name)
+		rep, err := ValidateRepo(ValidateOptions{RepoRoot: root})
+		if err != nil {
+			t.Fatalf("ValidateRepo(%s): %v", name, err)
+		}
+		if codeCounts(rep)["ps-name-reserved"] != 1 {
+			t.Errorf("expected ps-name-reserved for %q, got %+v", name, rep.Findings)
+		}
+		// The escape hatch clears it (caller-side only; the gate never sets it).
+		rep2, _ := ValidateRepo(ValidateOptions{RepoRoot: root, AllowReservedNames: true})
+		if codeCounts(rep2)["ps-name-reserved"] != 0 {
+			t.Errorf("AllowReservedNames should clear the finding for %q", name)
+		}
+	}
+
+	// A neutral name raises no reserved finding.
+	root := writeRepo(t, "acme.demo")
+	rep, err := ValidateRepo(ValidateOptions{RepoRoot: root})
+	if err != nil {
+		t.Fatalf("ValidateRepo(acme.demo): %v", err)
+	}
+	if codeCounts(rep)["ps-name-reserved"] != 0 {
+		t.Errorf("a neutral name must not be flagged reserved: %+v", rep.Findings)
+	}
+}
+
+func TestValidateRepo_ArtifactNameCollision(t *testing.T) {
+	root := t.TempDir()
+	// variant "v1.0"/comp "c" and variant "v1"/comp "0-c" both normalise to
+	// <ps>-v1-0-c after dot-to-dash.
+	writeFile(t, root, "packages/core/platform/sources/p.yaml", `apiVersion: cozystack.io/v1alpha1
+kind: PackageSource
+metadata:
+  name: example.app
+spec:
+  variants:
+    - name: "v1.0"
+      components:
+        - name: c
+          path: apps/c
+    - name: v1
+      components:
+        - name: 0-c
+          path: apps/0-c
+`)
+	writeFile(t, root, "packages/apps/c/Chart.yaml", "apiVersion: v2\nname: c\nversion: 0.1.0\n")
+	writeFile(t, root, "packages/apps/0-c/Chart.yaml", "apiVersion: v2\nname: c\nversion: 0.1.0\n")
+	rep, _ := ValidateRepo(ValidateOptions{RepoRoot: root})
+	if codeCounts(rep)["artifact-name-collision"] != 1 {
+		t.Fatalf("expected an artifact-name-collision error, got %+v", rep.Findings)
+	}
+}
+
+func TestArtifactName(t *testing.T) {
+	got := artifactName("cozystack.postgres-application", "default", "postgres")
+	want := "cozystack-postgres-application-default-postgres"
+	if got != want {
+		t.Fatalf("artifactName = %q, want %q", got, want)
+	}
+}
+
+func TestSplitYAMLDocuments(t *testing.T) {
+	docs := splitYAMLDocuments([]byte("---\na: 1\n---\nb: 2\n---\n"))
+	if len(docs) != 2 {
+		t.Fatalf("expected 2 documents, got %d", len(docs))
+	}
+}
+
+func TestVerifyCosignSignatureGuards(t *testing.T) {
+	// Errors regardless of whether cosign is installed: absent -> missing-binary
+	// error; present -> missing identity/issuer error. Either way, no silent pass.
+	if _, err := verifyCosignSignature("oci://ghcr.io/foo/bar:v1", "", ""); err == nil {
+		t.Fatal("expected an error when identity/issuer are missing or cosign is absent")
+	}
+}
+
+func TestParseVerifiedDigest(t *testing.T) {
+	a := "sha256:" + strings.Repeat("a", 64)
+	b := "sha256:" + strings.Repeat("b", 64)
+	if got := parseVerifiedDigest([]byte(`[{"critical":{"image":{"docker-manifest-digest":"` + a + `"}}}]`)); got != a {
+		t.Errorf("parseVerifiedDigest = %q", got)
+	}
+	// Fallback: digest present anywhere in non-JSON output.
+	if got := parseVerifiedDigest([]byte("verified " + b)); got != b {
+		t.Errorf("fallback parseVerifiedDigest = %q", got)
+	}
+	if got := parseVerifiedDigest([]byte("no digest here")); got != "" {
+		t.Errorf("expected empty digest, got %q", got)
+	}
+}
+
+func TestArtifactRoot_FallsBackWhenNoPackagesDir(t *testing.T) {
+	root := t.TempDir()
+	if got := artifactRoot(root); got != root {
+		t.Fatalf("expected fallback to root %q, got %q", root, got)
+	}
+	writeFile(t, root, "packages/keep.txt", "x")
+	if got := artifactRoot(root); got != filepath.Join(root, "packages") {
+		t.Fatalf("expected packages subdir, got %q", got)
+	}
+}
diff --git a/cmd/cozystack-controller/main.go b/cmd/cozystack-controller/main.go
index c645dc3b74..59ba3b515b 100644
--- a/cmd/cozystack-controller/main.go
+++ b/cmd/cozystack-controller/main.go
@@ -26,10 +26,14 @@ import (
 	// to ensure that exec-entrypoint and run can make use of them.
 	_ "k8s.io/client-go/plugin/pkg/client/auth"
 
+	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
 	ctrl "sigs.k8s.io/controller-runtime"
+	"sigs.k8s.io/controller-runtime/pkg/cache"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/cluster"
 	"sigs.k8s.io/controller-runtime/pkg/healthz"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 	"sigs.k8s.io/controller-runtime/pkg/metrics/filters"
@@ -37,9 +41,14 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
 
 	gatewayv1alpha1 "github.com/cozystack/cozystack/api/gateway/v1alpha1"
+	internalv1alpha1 "github.com/cozystack/cozystack/api/internalapi/v1alpha1"
 	cozystackiov1alpha1 "github.com/cozystack/cozystack/api/v1alpha1"
 	"github.com/cozystack/cozystack/internal/controller"
+	"github.com/cozystack/cozystack/internal/controller/cacert"
 	"github.com/cozystack/cozystack/internal/controller/tenantgateway"
+	"github.com/cozystack/cozystack/internal/controller/tenantlogrouting"
+	"github.com/cozystack/cozystack/internal/controller/tenantquota"
+	"github.com/cozystack/cozystack/internal/controller/wildcardsecret"
 	"github.com/cozystack/cozystack/internal/telemetry"
 
 	cmv1 "github.com/cert-manager/cert-manager/pkg/apis/certmanager/v1"
@@ -47,6 +56,7 @@ import (
 	cosiv1alpha1 "sigs.k8s.io/container-object-storage-interface-api/apis/objectstorage/v1alpha1"
 	gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
 	gatewayv1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2"
+	gatewayv1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1"
 	// +kubebuilder:scaffold:imports
 )
 
@@ -60,8 +70,10 @@ func init() {
 
 	utilruntime.Must(cozystackiov1alpha1.AddToScheme(scheme))
 	utilruntime.Must(gatewayv1alpha1.AddToScheme(scheme))
+	utilruntime.Must(internalv1alpha1.AddToScheme(scheme))
 	utilruntime.Must(gatewayv1.Install(scheme))
 	utilruntime.Must(gatewayv1alpha2.Install(scheme))
+	utilruntime.Must(gatewayv1beta1.Install(scheme))
 	utilruntime.Must(cmv1.AddToScheme(scheme))
 	utilruntime.Must(helmv2.AddToScheme(scheme))
 	utilruntime.Must(cosiv1alpha1.AddToScheme(scheme))
@@ -77,6 +89,8 @@ func main() {
 	var disableTelemetry bool
 	var telemetryEndpoint string
 	var telemetryInterval string
+	var quotaBufferPercent int64
+	var seaweedfsMetricsEndpoint string
 	var tlsOpts []func(*tls.Config)
 	flag.StringVar(&metricsAddr, "metrics-bind-address", "0", "The address the metrics endpoint binds to. "+
 		"Use :8443 for HTTPS or :8080 for HTTP, or leave as 0 to disable the metrics service.")
@@ -94,6 +108,12 @@ func main() {
 		"Endpoint for sending telemetry data")
 	flag.StringVar(&telemetryInterval, "telemetry-interval", "15m",
 		"Interval between telemetry data collection (e.g. 15m, 1h)")
+	flag.Int64Var(&quotaBufferPercent, "tenant-quota-buffer-percent", 0,
+		"Temporary buffer (e.g. 130 = +30%) added to every hierarchical tenant quota pool so workloads already over a freshly-introduced quota keep running during rollout. 0 disables it.")
+	flag.StringVar(&seaweedfsMetricsEndpoint, "seaweedfs-metrics-endpoint", "",
+		"Base URL of a Prometheus-compatible query API to fetch SeaweedFS bucket size metrics from, e.g. https://vm.example.com/path/to/prometheus (/api/v1/query is appended). "+
+			"Overrides discovery via the namespace.cozystack.io/monitoring label; use when SeaweedFS and the monitoring stack that scrapes it run in a separate cluster. "+
+			"Basic auth may be embedded as userinfo (https://user:pass@host/...). Empty keeps label-based discovery.")
 	opts := zap.Options{
 		Development: false,
 	}
@@ -107,6 +127,16 @@ func main() {
 		os.Exit(1)
 	}
 
+	// Validate and normalize the SeaweedFS metrics endpoint override; the sizes
+	// it serves feed billing, so a malformed URL must fail startup, not queries.
+	if seaweedfsMetricsEndpoint != "" {
+		seaweedfsMetricsEndpoint, err = controller.ParseMetricsEndpointURL(seaweedfsMetricsEndpoint)
+		if err != nil {
+			setupLog.Error(err, "invalid --seaweedfs-metrics-endpoint")
+			os.Exit(1)
+		}
+	}
+
 	// Configure telemetry
 	telemetryConfig := telemetry.Config{
 		Disabled: disableTelemetry,
@@ -169,6 +199,25 @@ func main() {
 		HealthProbeBindAddress: probeAddr,
 		LeaderElection:         enableLeaderElection,
 		LeaderElectionID:       "19a0338c.cozystack.io",
+		// Scope the shared Secret informer so the WildcardSecret reconciler's
+		// cluster-wide Secret watch does not cache every Secret (and its key
+		// material) in memory. Only managed wildcard replicas and the values
+		// channel are cached; no other reconciler reads Secrets through THIS
+		// (the manager's) typed Secret cache. See wildcardsecret.SecretCacheByObject.
+		//
+		// The CA-extraction reconciler does NOT use this cache at all — neither its
+		// typed Secret informer nor a metadata one. A metadata informer for
+		// v1/Secret would route to THIS same per-GVK cache and inherit its
+		// wildcard-replica label selector, so its source watch would never fire for
+		// an unlabelled CA source. It therefore owns a SEPARATE metadata-only cache
+		// (caSecretCluster, below) and reads the one source it projects through the
+		// uncached APIReader. So this manager-level Secret scoping is
+		// wildcardsecret's alone.
+		Cache: cache.Options{
+			ByObject: map[client.Object]cache.ByObject{
+				&corev1.Secret{}: wildcardsecret.SecretCacheByObject(),
+			},
+		},
 		// LeaderElectionReleaseOnCancel defines if the leader should step down voluntarily
 		// when the Manager ends. This requires the binary to immediately end when the
 		// Manager is stopped, otherwise, this setting is unsafe. Setting this significantly
@@ -187,8 +236,10 @@ func main() {
 	}
 
 	if err = (&controller.WorkloadMonitorReconciler{
-		Client: mgr.GetClient(),
-		Scheme: mgr.GetScheme(),
+		Client:                   mgr.GetClient(),
+		Scheme:                   mgr.GetScheme(),
+		Recorder:                 mgr.GetEventRecorderFor("workloadmonitor-controller"),
+		SeaweedfsMetricsEndpoint: seaweedfsMetricsEndpoint,
 	}).SetupWithManager(mgr); err != nil {
 		setupLog.Error(err, "unable to create controller", "controller", "WorkloadMonitor")
 		os.Exit(1)
@@ -211,8 +262,9 @@ func main() {
 	}
 
 	if err = (&controller.ApplicationDefinitionHelmReconciler{
-		Client: mgr.GetClient(),
-		Scheme: mgr.GetScheme(),
+		Client:   mgr.GetClient(),
+		Scheme:   mgr.GetScheme(),
+		Recorder: mgr.GetEventRecorderFor("applicationdefinition-helm-reconciler"),
 	}).SetupWithManager(mgr); err != nil {
 		setupLog.Error(err, "unable to create controller", "controller", "ApplicationDefinitionHelmReconciler")
 		os.Exit(1)
@@ -226,6 +278,65 @@ func main() {
 		os.Exit(1)
 	}
 
+	if err = (&tenantquota.Reconciler{
+		Client:        mgr.GetClient(),
+		Scheme:        mgr.GetScheme(),
+		Recorder:      mgr.GetEventRecorderFor("tenantquota-controller"),
+		BufferPercent: quotaBufferPercent,
+	}).SetupWithManager(mgr); err != nil {
+		setupLog.Error(err, "unable to create controller", "controller", "TenantQuota")
+		os.Exit(1)
+	}
+
+	if err = (&tenantlogrouting.Reconciler{
+		Client: mgr.GetClient(),
+	}).SetupWithManager(mgr); err != nil {
+		setupLog.Error(err, "unable to create controller", "controller", "TenantLogRouting")
+		os.Exit(1)
+	}
+
+	if err = (&wildcardsecret.Reconciler{
+		Client:   mgr.GetClient(),
+		Reader:   mgr.GetAPIReader(),
+		Scheme:   mgr.GetScheme(),
+		Recorder: mgr.GetEventRecorderFor("wildcardsecret"),
+	}).SetupWithManager(mgr); err != nil {
+		setupLog.Error(err, "unable to create controller", "controller", "WildcardSecret")
+		os.Exit(1)
+	}
+
+	// The CA-extraction reconciler watches its source Secrets as metadata only, so
+	// no private key ever enters a cache. It cannot watch them on the manager's
+	// cache: that cache's Secret informer is label-scoped to WildcardSecret's
+	// replicas (above), a metadata informer for the same v1/Secret GVK routes to
+	// that same scoped informer and inherits the selector, and the watch would
+	// then silently never fire for an unlabelled CA source — the projection would
+	// appear only on the slow resync. So it owns a SEPARATE cache, metadata-only
+	// and unscoped, holding Secret metadata stubs cluster-wide (no key material).
+	// It is a cluster.Cluster so mgr.Add registers it in the manager's
+	// cache-runnable group — started, waited-for-sync before the controllers run,
+	// and stopped on shutdown, exactly like the shared cache.
+	caSecretCluster, err := cluster.New(config, func(o *cluster.Options) {
+		o.Scheme = scheme
+	})
+	if err != nil {
+		setupLog.Error(err, "unable to build the CA source metadata cache")
+		os.Exit(1)
+	}
+	if err = mgr.Add(caSecretCluster); err != nil {
+		setupLog.Error(err, "unable to add the CA source metadata cache to the manager")
+		os.Exit(1)
+	}
+
+	if err = (&cacert.Reconciler{
+		Client:   mgr.GetClient(),
+		Reader:   mgr.GetAPIReader(),
+		Recorder: mgr.GetEventRecorderFor("cacert-controller"),
+	}).SetupWithManager(mgr, caSecretCluster.GetCache()); err != nil {
+		setupLog.Error(err, "unable to create controller", "controller", "CACert")
+		os.Exit(1)
+	}
+
 	// +kubebuilder:scaffold:builder
 
 	if err := mgr.AddHealthzCheck("healthz", healthz.Ping); err != nil {
diff --git a/cmd/cozystack-controller/main_test.go b/cmd/cozystack-controller/main_test.go
new file mode 100644
index 0000000000..491048d7d5
--- /dev/null
+++ b/cmd/cozystack-controller/main_test.go
@@ -0,0 +1,43 @@
+/*
+Copyright 2026 The Cozystack Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package main
+
+import (
+	"testing"
+
+	"k8s.io/apimachinery/pkg/runtime"
+	"sigs.k8s.io/controller-runtime/pkg/client/apiutil"
+
+	internalv1alpha1 "github.com/cozystack/cozystack/api/internalapi/v1alpha1"
+)
+
+// TestSchemeRegistersReconciledKinds pins that the manager scheme init() builds
+// resolves the kinds the CA-extraction controller reconciles For(). A kind
+// missing here is not a build error — it fails at runtime: SetupWithManager
+// cannot resolve the GVK for its field index or its For() source, returns an
+// error, and main() calls os.Exit(1), taking the whole binary (and every other
+// controller) down with it. The scheme is the package-level var init() populates.
+func TestSchemeRegistersReconciledKinds(t *testing.T) {
+	for name, obj := range map[string]runtime.Object{
+		"TenantProjection":     &internalv1alpha1.TenantProjection{},
+		"TenantProjectionList": &internalv1alpha1.TenantProjectionList{},
+	} {
+		if _, err := apiutil.GVKForObject(obj, scheme); err != nil {
+			t.Errorf("manager scheme does not register %s, so the CA-extraction controller cannot start: %v", name, err)
+		}
+	}
+}
diff --git a/cmd/cozystack-operator/main.go b/cmd/cozystack-operator/main.go
index 2ca09c709a..8ffa374111 100644
--- a/cmd/cozystack-operator/main.go
+++ b/cmd/cozystack-operator/main.go
@@ -29,11 +29,14 @@ import (
 	_ "k8s.io/client-go/plugin/pkg/client/auth"
 
 	cozyv1alpha1 "github.com/cozystack/cozystack/api/v1alpha1"
+	"github.com/cozystack/cozystack/internal/marketplace/tapconst"
 	helmv2 "github.com/fluxcd/helm-controller/api/v2"
+	fluxmeta "github.com/fluxcd/pkg/apis/meta"
 	sourcev1 "github.com/fluxcd/source-controller/api/v1"
 	sourcewatcherv1beta1 "github.com/fluxcd/source-watcher/api/v2/v1beta1"
 	corev1 "k8s.io/api/core/v1"
 	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
+	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/fields"
 	"k8s.io/apimachinery/pkg/labels"
@@ -54,6 +57,7 @@ import (
 	"github.com/cozystack/cozystack/internal/fluxinstall"
 	"github.com/cozystack/cozystack/internal/operator"
 	"github.com/cozystack/cozystack/internal/telemetry"
+	"github.com/cozystack/cozystack/pkg/config"
 	// +kubebuilder:scaffold:imports
 )
 
@@ -94,6 +98,9 @@ func main() {
 	var platformSourceURL string
 	var platformSourceName string
 	var platformSourceRef string
+	var platformSourceSecret string
+	var systemNamespaceMemoryLimit string
+	var systemNamespaceMemoryRequest string
 
 	flag.StringVar(&metricsAddr, "metrics-bind-address", ":8080", "The address the metric endpoint binds to.")
 	flag.StringVar(&probeAddr, "health-probe-bind-address", ":8081", "The address the probe endpoint binds to.")
@@ -137,9 +144,18 @@ func main() {
 	flag.StringVar(&platformSourceURL, "platform-source-url", "", "Platform source URL (oci:// or https://). If specified, generates OCIRepository or GitRepository resource.")
 	flag.StringVar(&platformSourceName, "platform-source-name", "cozystack-platform", "Name for the generated platform source resource and PackageSource")
 	flag.StringVar(&platformSourceRef, "platform-source-ref", "", "Reference specification as key=value pairs (e.g., 'branch=main' or 'digest=sha256:...,tag=v1.0'). For OCI: digest, semver, semverFilter, tag. For Git: branch, tag, semver, name, commit.")
+	flag.StringVar(&platformSourceSecret, "platform-source-secret", "", "Name of the Secret in cozy-system namespace containing credentials for the platform source. Sets spec.secretRef on the generated OCIRepository or GitRepository. Secret type depends on the source kind: kubernetes.io/dockerconfigjson for OCI (oci://...); Opaque with username+password (or bearerToken) for Git over HTTPS; Opaque with identity (PEM private key) and known_hosts for Git over SSH.")
 	flag.StringVar(&cozyValuesSecretName, "cozy-values-secret-name", "cozystack-values", "The name of the secret containing cluster-wide configuration values.")
 	flag.StringVar(&cozyValuesSecretNamespace, "cozy-values-secret-namespace", "cozy-system", "The namespace of the secret containing cluster-wide configuration values.")
 	flag.StringVar(&cozyValuesNamespaceSelector, "cozy-values-namespace-selector", "cozystack.io/system=true", "The label selector for namespaces where the cluster-wide configuration values must be replicated.")
+	flag.StringVar(&systemNamespaceMemoryLimit, "system-namespace-memory-limit", DefaultSystemNamespaceMemoryLimit,
+		"Default container memory limit in eligible system namespaces, including kube-system. "+
+			"Lowering or an oversized request creates a durable hold requiring an administrator's "+
+			"exact-value acknowledgement. Empty or 0 disables and removes managed LimitRanges; "+
+			"safety state is retained. See docs/operations/system-memory-limits.md.")
+	flag.StringVar(&systemNamespaceMemoryRequest, "system-namespace-memory-request", DefaultSystemNamespaceMemoryRequest,
+		"Default memory request paired with the system namespace limit. Keep small; 0 is supported. "+
+			"An empty installer value selects the operator default. See docs/operations/system-memory-limits.md.")
 
 	opts := zap.Options{
 		Development: true,
@@ -150,7 +166,7 @@ func main() {
 	ctrl.SetLogger(zap.New(zap.UseFlagOptions(&opts)))
 
 	parseFlag := func(flagName, raw string) time.Duration {
-		d, err := parsePositiveDuration(flagName, raw)
+		d, err := config.ParsePositiveDuration(flagName, raw)
 		if err != nil {
 			setupLog.Error(err, "invalid duration flag")
 			os.Exit(1)
@@ -166,6 +182,13 @@ func main() {
 		os.Exit(1)
 	}
 
+	systemNSMemoryLimit, systemNSMemoryRequest, err := parseSystemNamespaceMemory(systemNamespaceMemoryLimit, systemNamespaceMemoryRequest)
+	if err != nil {
+		setupLog.Error(err, "invalid system namespace memory flags",
+			"limit", systemNamespaceMemoryLimit, "request", systemNamespaceMemoryRequest)
+		os.Exit(1)
+	}
+
 	config := ctrl.GetConfigOrDie()
 
 	// Create a direct client (without cache) for pre-start operations
@@ -255,12 +278,12 @@ func main() {
 
 	// Generate and install platform source resource if specified
 	if platformSourceURL != "" {
-		setupLog.Info("Generating platform source resource", "url", platformSourceURL, "name", platformSourceName, "ref", platformSourceRef)
+		setupLog.Info("Generating platform source resource", "url", platformSourceURL, "name", platformSourceName, "ref", platformSourceRef, "secret", platformSourceSecret)
 		installCtx, installCancel := context.WithTimeout(mgrCtx, 2*time.Minute)
 		defer installCancel()
 
 		// Use direct client for pre-start operations (cache is not ready yet)
-		if err := installPlatformSourceResource(installCtx, directClient, platformSourceURL, platformSourceName, platformSourceRef); err != nil {
+		if err := installPlatformSourceResource(installCtx, directClient, platformSourceURL, platformSourceName, platformSourceRef, platformSourceSecret); err != nil {
 			setupLog.Error(err, "failed to install platform source resource")
 			os.Exit(1)
 		} else {
@@ -302,18 +325,35 @@ func main() {
 
 	// Setup Package reconciler
 	if err := (&operator.PackageReconciler{
-		Client:                    mgr.GetClient(),
+		Client: mgr.GetClient(),
+		// Non-cached, so the per-namespace pod and workload scan guarding the
+		// system defaults LimitRange does not start cluster-wide informers in an
+		// operator whose whole purpose here is to bound memory.
+		APIReader:                 mgr.GetAPIReader(),
 		Scheme:                    mgr.GetScheme(),
 		HelmReleaseInterval:       hrIntervalDuration,
 		HelmReleaseRetryInterval:  hrRetryIntervalDuration,
 		HelmReleaseInstallTimeout: hrInstallTimeoutDuration,
 		HelmReleaseUpgradeTimeout: hrUpgradeTimeoutDuration,
 		HelmReleaseMaxHistory:     helmReleaseMaxHistory,
+
+		SystemNamespaceMemoryLimit:   systemNSMemoryLimit,
+		SystemNamespaceMemoryRequest: systemNSMemoryRequest,
 	}).SetupWithManager(mgr); err != nil {
 		setupLog.Error(err, "unable to create controller", "controller", "Package")
 		os.Exit(1)
 	}
 
+	// Setup Tap materializer reconciler (dashboard-connected taps)
+	if err := (&operator.TapMaterializerReconciler{
+		Client:   mgr.GetClient(),
+		Scheme:   mgr.GetScheme(),
+		Recorder: mgr.GetEventRecorderFor("cozystack-tap-materializer"),
+	}).SetupWithManager(mgr); err != nil {
+		setupLog.Error(err, "unable to create controller", "controller", "TapMaterializer")
+		os.Exit(1)
+	}
+
 	// Setup CozyValuesReplicator reconciler
 	if err := (&cozyvaluesreplicator.SecretReplicatorReconciler{
 		Client:                  mgr.GetClient(),
@@ -374,7 +414,7 @@ func main() {
 
 // installPlatformSourceResource generates and installs a Flux source resource (OCIRepository or GitRepository)
 // based on the platform source URL
-func installPlatformSourceResource(ctx context.Context, k8sClient client.Client, sourceURL, resourceName, refSpec string) error {
+func installPlatformSourceResource(ctx context.Context, k8sClient client.Client, sourceURL, resourceName, refSpec, secretName string) error {
 	logger := log.FromContext(ctx)
 
 	// Parse the source URL to determine type
@@ -392,12 +432,12 @@ func installPlatformSourceResource(ctx context.Context, k8sClient client.Client,
 	var obj client.Object
 	switch sourceType {
 	case "oci":
-		obj, err = generateOCIRepository(resourceName, repoURL, refMap)
+		obj, err = generateOCIRepository(resourceName, repoURL, refMap, secretName)
 		if err != nil {
 			return fmt.Errorf("failed to generate OCIRepository: %w", err)
 		}
 	case "git":
-		obj, err = generateGitRepository(resourceName, repoURL, refMap)
+		obj, err = generateGitRepository(resourceName, repoURL, refMap, secretName)
 		if err != nil {
 			return fmt.Errorf("failed to generate GitRepository: %w", err)
 		}
@@ -439,19 +479,57 @@ func installPlatformSourceResource(ctx context.Context, k8sClient client.Client,
 	return nil
 }
 
-// parsePositiveDuration parses raw as a time.Duration and rejects malformed
-// or non-positive values. Flux HelmRelease fields (Interval, Timeout,
-// RetryInterval) require strictly positive durations, so a misconfigured
-// flag must fail fast at startup rather than propagating into every HR.
-func parsePositiveDuration(flagName, raw string) (time.Duration, error) {
-	d, err := time.ParseDuration(raw)
-	if err != nil {
-		return 0, fmt.Errorf("invalid duration for %s=%q: %w", flagName, raw, err)
+// The shipped defaults for the two system-namespace memory knobs. Constants keep flag
+// registration and the parser test inputs on the same values; the test compares the parsed
+// result with literal contract values so changing a default cannot stay green by construction.
+const (
+	DefaultSystemNamespaceMemoryLimit   = "32Gi"
+	DefaultSystemNamespaceMemoryRequest = "32Mi"
+)
+
+// parseSystemNamespaceMemory turns the --system-namespace-memory-limit and
+// --system-namespace-memory-request flag values into the quantities the Package reconciler
+// takes, rejecting the combinations that would fail later and further away.
+//
+// Empty is how both flags are disabled and parses to the zero quantity; for the limit that
+// means "no LimitRange, and remove any this operator created", which is the documented
+// off switch. A negative quantity parses fine as a Quantity and is meaningless as memory,
+// so it is caught here rather than being written into a LimitRange the API server rejects.
+//
+// The pair check is the one that matters most. A LimitRange whose defaultRequest exceeds
+// its default is rejected by the API server, and because the reconciler applies one per
+// system namespace on every Package reconcile, a bad pair would wedge namespace
+// reconciliation for every system package with an error nothing connects back to a flag.
+// A request of 0 against a non-zero limit passes deliberately: it is the supported way to
+// take the memory.max without reserving anything at schedule time, not a broken value.
+// Both zero is the disabled case and never reaches the comparison.
+func parseSystemNamespaceMemory(rawLimit, rawRequest string) (limit, request resource.Quantity, err error) {
+	parse := func(flagName, raw string) (resource.Quantity, error) {
+		if raw == "" {
+			return resource.Quantity{}, nil
+		}
+		q, err := resource.ParseQuantity(raw)
+		if err != nil {
+			return resource.Quantity{}, fmt.Errorf("%s: %w", flagName, err)
+		}
+		if q.Sign() < 0 {
+			return resource.Quantity{}, fmt.Errorf("%s must not be negative, got %s", flagName, raw)
+		}
+		return q, nil
+	}
+
+	if limit, err = parse("--system-namespace-memory-limit", rawLimit); err != nil {
+		return resource.Quantity{}, resource.Quantity{}, err
+	}
+	if request, err = parse("--system-namespace-memory-request", rawRequest); err != nil {
+		return resource.Quantity{}, resource.Quantity{}, err
 	}
-	if d <= 0 {
-		return 0, fmt.Errorf("%s must be > 0 (got %q)", flagName, raw)
+	if !limit.IsZero() && request.Cmp(limit) > 0 {
+		return resource.Quantity{}, resource.Quantity{}, fmt.Errorf(
+			"--system-namespace-memory-request (%s) must not exceed --system-namespace-memory-limit (%s)",
+			request.String(), limit.String())
 	}
-	return d, nil
+	return limit, request, nil
 }
 
 // parsePlatformSourceURL parses the source URL and returns the source type and repository URL.
@@ -484,8 +562,8 @@ func parseRefSpec(refSpec string) (map[string]string, error) {
 		return result, nil
 	}
 
-	pairs := strings.Split(refSpec, ",")
-	for _, pair := range pairs {
+	pairs := strings.SplitSeq(refSpec, ",")
+	for pair := range pairs {
 		pair = strings.TrimSpace(pair)
 		if pair == "" {
 			continue
@@ -572,7 +650,7 @@ func validateGitRef(refMap map[string]string) error {
 }
 
 // generateOCIRepository creates an OCIRepository resource
-func generateOCIRepository(name, repoURL string, refMap map[string]string) (*sourcev1.OCIRepository, error) {
+func generateOCIRepository(name, repoURL string, refMap map[string]string, secretName string) (*sourcev1.OCIRepository, error) {
 	if err := validateOCIRef(refMap); err != nil {
 		return nil, err
 	}
@@ -602,11 +680,18 @@ func generateOCIRepository(name, repoURL string, refMap map[string]string) (*sou
 		}
 	}
 
+	// Set secretRef if secret name is provided
+	if secretName != "" {
+		obj.Spec.SecretRef = &fluxmeta.LocalObjectReference{
+			Name: secretName,
+		}
+	}
+
 	return obj, nil
 }
 
 // generateGitRepository creates a GitRepository resource
-func generateGitRepository(name, repoURL string, refMap map[string]string) (*sourcev1.GitRepository, error) {
+func generateGitRepository(name, repoURL string, refMap map[string]string, secretName string) (*sourcev1.GitRepository, error) {
 	if err := validateGitRef(refMap); err != nil {
 		return nil, err
 	}
@@ -637,6 +722,13 @@ func generateGitRepository(name, repoURL string, refMap map[string]string) (*sou
 		}
 	}
 
+	// Set secretRef if secret name is provided
+	if secretName != "" {
+		obj.Spec.SecretRef = &fluxmeta.LocalObjectReference{
+			Name: secretName,
+		}
+	}
+
 	return obj, nil
 }
 
@@ -680,6 +772,9 @@ func installPlatformPackageSource(ctx context.Context, k8sClient client.Client,
 		{"isp-full", []string{"values.yaml", "values-isp-full.yaml"}},
 		{"isp-hosted", []string{"values.yaml", "values-isp-hosted.yaml"}},
 		{"isp-full-generic", []string{"values.yaml", "values-isp-full-generic.yaml"}},
+		{"isp-slim", []string{"values.yaml", "values-isp-slim.yaml"}},
+		{"isp-slim-generic", []string{"values.yaml", "values-isp-slim-generic.yaml"}},
+		{"isp-hosted-slim", []string{"values.yaml", "values-isp-hosted-slim.yaml"}},
 	}
 
 	variants := make([]cozyv1alpha1.Variant, len(variantData))
@@ -703,9 +798,27 @@ func installPlatformPackageSource(ctx context.Context, k8sClient client.Client,
 
 	logger.Info("Applying platform PackageSource", "name", packageSourceName)
 
+	// Never overwrite a PackageSource the platform does not own. If a marketplace
+	// tap has materialized one under this name (a third party took a name the
+	// platform later ships), fail loudly and leave the object untouched instead
+	// of silently replacing a user's application. The tap marker label identifies
+	// such an object; the field-ownership backstop below catches any other owner.
+	existing := &cozyv1alpha1.PackageSource{}
+	if err := k8sClient.Get(ctx, client.ObjectKey{Name: packageSourceName}, existing); err == nil {
+		if existing.GetLabels()[tapconst.Label] == "true" {
+			return fmt.Errorf("refusing to apply platform PackageSource %s: it is owned by a marketplace tap (source %q); untap it to resolve the name conflict before the platform can manage this name",
+				packageSourceName, existing.GetAnnotations()[tapconst.SourceAnnotation])
+		}
+	} else if client.IgnoreNotFound(err) != nil {
+		return fmt.Errorf("failed to check existing PackageSource %s: %w", packageSourceName, err)
+	}
+
+	// Force is deliberately omitted: server-side apply then surfaces a
+	// field-ownership conflict (from any manager other than cozystack-operator)
+	// as an error instead of silently stealing the object. Re-applying the
+	// platform's own PackageSource never conflicts.
 	patchOptions := &client.PatchOptions{
 		FieldManager: "cozystack-operator",
-		Force:        func() *bool { b := true; return &b }(),
 	}
 
 	if err := k8sClient.Patch(ctx, ps, client.Apply, patchOptions); err != nil {
diff --git a/cmd/cozystack-operator/main_test.go b/cmd/cozystack-operator/main_test.go
index 1f872e7ba5..6509065f9c 100644
--- a/cmd/cozystack-operator/main_test.go
+++ b/cmd/cozystack-operator/main_test.go
@@ -18,10 +18,12 @@ package main
 
 import (
 	"context"
+	"strings"
 	"testing"
-	"time"
 
 	cozyv1alpha1 "github.com/cozystack/cozystack/api/v1alpha1"
+	"github.com/cozystack/cozystack/internal/marketplace/tapconst"
+	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
@@ -76,7 +78,7 @@ func TestInstallPlatformPackageSource_Creates(t *testing.T) {
 	}
 
 	// Verify variants
-	expectedVariants := []string{"default", "isp-full", "isp-hosted", "isp-full-generic"}
+	expectedVariants := []string{"default", "isp-full", "isp-hosted", "isp-full-generic", "isp-slim", "isp-slim-generic", "isp-hosted-slim"}
 	if len(ps.Spec.Variants) != len(expectedVariants) {
 		t.Fatalf("expected %d variants, got %d", len(expectedVariants), len(ps.Spec.Variants))
 	}
@@ -92,59 +94,100 @@ func TestInstallPlatformPackageSource_Creates(t *testing.T) {
 
 func TestInstallPlatformPackageSource_Updates(t *testing.T) {
 	s := newTestScheme()
+	k8sClient := fake.NewClientBuilder().WithScheme(s).Build()
+	ctx := context.Background()
+
+	// The first apply establishes the operator as the owner of the object.
+	if err := installPlatformPackageSource(ctx, k8sClient, "cozystack-platform", "OCIRepository"); err != nil {
+		t.Fatalf("first apply: %v", err)
+	}
+	// Re-applying as the same owner is a legitimate update, so it must not
+	// conflict even though Force is no longer set. (A conflict would only arise
+	// against a different manager, which the refusal tests cover.)
+	if err := installPlatformPackageSource(ctx, k8sClient, "cozystack-platform", "OCIRepository"); err != nil {
+		t.Fatalf("re-apply for the operator's own object must not conflict: %v", err)
+	}
+
+	ps := &cozyv1alpha1.PackageSource{}
+	if err := k8sClient.Get(ctx, client.ObjectKey{Name: "cozystack.cozystack-platform"}, ps); err != nil {
+		t.Fatalf("PackageSource not found: %v", err)
+	}
+	if ps.Spec.SourceRef.Name != "cozystack-platform" {
+		t.Errorf("expected sourceRef.name %q, got %q", "cozystack-platform", ps.Spec.SourceRef.Name)
+	}
+	if len(ps.Spec.Variants) != 7 {
+		t.Errorf("expected 7 variants, got %d", len(ps.Spec.Variants))
+	}
+}
 
-	existing := &cozyv1alpha1.PackageSource{
+// TestInstallPlatformPackageSource_RefusesTapOwned asserts that when a
+// marketplace tap has materialized a PackageSource under a name the platform
+// later ships, the platform refuses to overwrite it, names the conflict, and
+// leaves the object untouched.
+func TestInstallPlatformPackageSource_RefusesTapOwned(t *testing.T) {
+	s := newTestScheme()
+	tapOwned := &cozyv1alpha1.PackageSource{
 		ObjectMeta: metav1.ObjectMeta{
-			Name:            "cozystack.cozystack-platform",
-			ResourceVersion: "1",
-			Labels: map[string]string{
-				"custom-label": "should-be-preserved",
-			},
+			Name:        "cozystack.cozystack-platform",
+			Labels:      map[string]string{tapconst.Label: "true"},
+			Annotations: map[string]string{tapconst.SourceAnnotation: "tap-acme-platform"},
 		},
 		Spec: cozyv1alpha1.PackageSourceSpec{
-			SourceRef: &cozyv1alpha1.PackageSourceRef{
-				Kind:      "OCIRepository",
-				Name:      "old-name",
-				Namespace: "cozy-system",
-			},
+			SourceRef: &cozyv1alpha1.PackageSourceRef{Kind: "OCIRepository", Name: "tap-acme-platform", Namespace: "cozy-system"},
 		},
 	}
-
-	k8sClient := fake.NewClientBuilder().WithScheme(s).WithObjects(existing).Build()
+	k8sClient := fake.NewClientBuilder().WithScheme(s).WithObjects(tapOwned).Build()
 
 	err := installPlatformPackageSource(context.Background(), k8sClient, "cozystack-platform", "OCIRepository")
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
+	if err == nil || !strings.Contains(err.Error(), "owned by a marketplace tap") {
+		t.Fatalf("expected refusal naming the tap owner, got %v", err)
 	}
-
+	// The tapped object is left exactly as it was.
 	ps := &cozyv1alpha1.PackageSource{}
 	if err := k8sClient.Get(context.Background(), client.ObjectKey{Name: "cozystack.cozystack-platform"}, ps); err != nil {
-		t.Fatalf("PackageSource not found: %v", err)
+		t.Fatal(err)
 	}
-
-	// Verify sourceRef was updated
-	if ps.Spec.SourceRef.Name != "cozystack-platform" {
-		t.Errorf("expected updated sourceRef.name %q, got %q", "cozystack-platform", ps.Spec.SourceRef.Name)
+	if ps.Spec.SourceRef.Name != "tap-acme-platform" {
+		t.Errorf("the tapped PackageSource must be left untouched, sourceRef=%q", ps.Spec.SourceRef.Name)
 	}
+}
 
-	// Verify all 4 variants are present after update
-	if len(ps.Spec.Variants) != 4 {
-		t.Errorf("expected 4 variants after update, got %d", len(ps.Spec.Variants))
+// TestInstallPlatformPackageSource_RefusesForeignOwner asserts that a
+// PackageSource owned by any other field manager (no tap label) is not
+// force-overwritten: the server-side apply conflict surfaces as an error and the
+// object is left untouched.
+func TestInstallPlatformPackageSource_RefusesForeignOwner(t *testing.T) {
+	s := newTestScheme()
+	// WithObjects seeds an object owned by a foreign manager (before-first-apply)
+	// with a conflicting sourceRef and no tap label.
+	foreign := &cozyv1alpha1.PackageSource{
+		ObjectMeta: metav1.ObjectMeta{Name: "cozystack.cozystack-platform"},
+		Spec: cozyv1alpha1.PackageSourceSpec{
+			SourceRef: &cozyv1alpha1.PackageSourceRef{Kind: "OCIRepository", Name: "old-name", Namespace: "cozy-system"},
+		},
 	}
+	k8sClient := fake.NewClientBuilder().WithScheme(s).WithObjects(foreign).Build()
 
-	// Verify that labels set by other controllers are preserved (SSA does not overwrite unmanaged fields)
-	if ps.Labels["custom-label"] != "should-be-preserved" {
-		t.Errorf("expected custom-label to be preserved, got %q", ps.Labels["custom-label"])
+	err := installPlatformPackageSource(context.Background(), k8sClient, "cozystack-platform", "OCIRepository")
+	if err == nil || !strings.Contains(err.Error(), "conflict") {
+		t.Fatalf("expected a field-ownership conflict error, got %v", err)
+	}
+	ps := &cozyv1alpha1.PackageSource{}
+	if err := k8sClient.Get(context.Background(), client.ObjectKey{Name: "cozystack.cozystack-platform"}, ps); err != nil {
+		t.Fatal(err)
+	}
+	if ps.Spec.SourceRef.Name != "old-name" {
+		t.Errorf("a foreign-owned PackageSource must be left untouched, sourceRef=%q", ps.Spec.SourceRef.Name)
 	}
 }
 
 func TestParsePlatformSourceURL(t *testing.T) {
 	tests := []struct {
-		name       string
-		url        string
-		wantType   string
-		wantURL    string
-		wantErr    bool
+		name     string
+		url      string
+		wantType string
+		wantURL  string
+		wantErr  bool
 	}{
 		{
 			name:     "OCI URL",
@@ -217,6 +260,9 @@ func TestInstallPlatformPackageSource_VariantValuesFiles(t *testing.T) {
 		"isp-full":         {"values.yaml", "values-isp-full.yaml"},
 		"isp-hosted":       {"values.yaml", "values-isp-hosted.yaml"},
 		"isp-full-generic": {"values.yaml", "values-isp-full-generic.yaml"},
+		"isp-slim":         {"values.yaml", "values-isp-slim.yaml"},
+		"isp-slim-generic": {"values.yaml", "values-isp-slim-generic.yaml"},
+		"isp-hosted-slim":  {"values.yaml", "values-isp-hosted-slim.yaml"},
 	}
 
 	for _, v := range ps.Spec.Variants {
@@ -488,7 +534,7 @@ func TestValidateGitRef(t *testing.T) {
 
 func TestGenerateOCIRepository(t *testing.T) {
 	refMap := map[string]string{"tag": "v1.0", "digest": "sha256:abc123"}
-	obj, err := generateOCIRepository("my-repo", "oci://registry.example.com/repo", refMap)
+	obj, err := generateOCIRepository("my-repo", "oci://registry.example.com/repo", refMap, "")
 	if err != nil {
 		t.Fatalf("unexpected error: %v", err)
 	}
@@ -511,10 +557,13 @@ func TestGenerateOCIRepository(t *testing.T) {
 	if obj.Spec.Reference.Digest != "sha256:abc123" {
 		t.Errorf("expected digest %q, got %q", "sha256:abc123", obj.Spec.Reference.Digest)
 	}
+	if obj.Spec.SecretRef != nil {
+		t.Errorf("expected SecretRef to be nil when secretName is empty, got %+v", obj.Spec.SecretRef)
+	}
 }
 
 func TestGenerateOCIRepository_NoRef(t *testing.T) {
-	obj, err := generateOCIRepository("my-repo", "oci://registry.example.com/repo", map[string]string{})
+	obj, err := generateOCIRepository("my-repo", "oci://registry.example.com/repo", map[string]string{}, "")
 	if err != nil {
 		t.Fatalf("unexpected error: %v", err)
 	}
@@ -524,15 +573,28 @@ func TestGenerateOCIRepository_NoRef(t *testing.T) {
 }
 
 func TestGenerateOCIRepository_InvalidRef(t *testing.T) {
-	_, err := generateOCIRepository("my-repo", "oci://registry.example.com/repo", map[string]string{"branch": "main"})
+	_, err := generateOCIRepository("my-repo", "oci://registry.example.com/repo", map[string]string{"branch": "main"}, "")
 	if err == nil {
 		t.Fatal("expected error for invalid OCI ref key, got nil")
 	}
 }
 
+func TestGenerateOCIRepository_WithSecret(t *testing.T) {
+	obj, err := generateOCIRepository("my-repo", "oci://registry.example.com/repo", map[string]string{"tag": "v1.0"}, "my-registry-creds")
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+	if obj.Spec.SecretRef == nil {
+		t.Fatal("expected SecretRef to be set when secretName is non-empty")
+	}
+	if obj.Spec.SecretRef.Name != "my-registry-creds" {
+		t.Errorf("expected SecretRef.Name %q, got %q", "my-registry-creds", obj.Spec.SecretRef.Name)
+	}
+}
+
 func TestGenerateGitRepository(t *testing.T) {
 	refMap := map[string]string{"branch": "main", "commit": "abc1234def5678"}
-	obj, err := generateGitRepository("my-repo", "https://github.com/user/repo", refMap)
+	obj, err := generateGitRepository("my-repo", "https://github.com/user/repo", refMap, "")
 	if err != nil {
 		t.Fatalf("unexpected error: %v", err)
 	}
@@ -555,10 +617,13 @@ func TestGenerateGitRepository(t *testing.T) {
 	if obj.Spec.Reference.Commit != "abc1234def5678" {
 		t.Errorf("expected commit %q, got %q", "abc1234def5678", obj.Spec.Reference.Commit)
 	}
+	if obj.Spec.SecretRef != nil {
+		t.Errorf("expected SecretRef to be nil when secretName is empty, got %+v", obj.Spec.SecretRef)
+	}
 }
 
 func TestGenerateGitRepository_NoRef(t *testing.T) {
-	obj, err := generateGitRepository("my-repo", "https://github.com/user/repo", map[string]string{})
+	obj, err := generateGitRepository("my-repo", "https://github.com/user/repo", map[string]string{}, "")
 	if err != nil {
 		t.Fatalf("unexpected error: %v", err)
 	}
@@ -568,42 +633,135 @@ func TestGenerateGitRepository_NoRef(t *testing.T) {
 }
 
 func TestGenerateGitRepository_InvalidRef(t *testing.T) {
-	_, err := generateGitRepository("my-repo", "https://github.com/user/repo", map[string]string{"digest": "sha256:abc"})
+	_, err := generateGitRepository("my-repo", "https://github.com/user/repo", map[string]string{"digest": "sha256:abc"}, "")
 	if err == nil {
 		t.Fatal("expected error for invalid Git ref key, got nil")
 	}
 }
 
-func TestParsePositiveDuration(t *testing.T) {
+func TestGenerateGitRepository_WithSecret(t *testing.T) {
+	obj, err := generateGitRepository("my-repo", "https://github.com/user/repo", map[string]string{"branch": "main"}, "my-git-creds")
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+	if obj.Spec.SecretRef == nil {
+		t.Fatal("expected SecretRef to be set when secretName is non-empty")
+	}
+	if obj.Spec.SecretRef.Name != "my-git-creds" {
+		t.Errorf("expected SecretRef.Name %q, got %q", "my-git-creds", obj.Spec.SecretRef.Name)
+	}
+}
+
+// The system namespace memory flags are the only ones on this binary whose bad values do
+// not surface here at all: a limit and a request that parse but contradict each other
+// produce a LimitRange the API server rejects, once per system namespace, on every Package
+// reconcile, with nothing in the error pointing back at a flag. Each branch below is a way
+// that has happened or could.
+func TestParseSystemNamespaceMemory(t *testing.T) {
 	tests := []struct {
-		name    string
-		raw     string
-		want    time.Duration
-		wantErr bool
+		name        string
+		rawLimit    string
+		rawRequest  string
+		wantErr     bool
+		wantLimit   string
+		wantRequest string
 	}{
-		{name: "valid seconds", raw: "30s", want: 30 * time.Second},
-		{name: "valid minutes", raw: "5m", want: 5 * time.Minute},
-		{name: "valid compound", raw: "1h30m", want: 90 * time.Minute},
-		{name: "zero rejected", raw: "0s", wantErr: true},
-		{name: "negative rejected", raw: "-5m", wantErr: true},
-		{name: "malformed rejected", raw: "5x", wantErr: true},
-		{name: "empty rejected", raw: "", wantErr: true},
+		{
+			// Inputs follow the constants registered as flag defaults; literal
+			// expectations pin the shipped contract so changing either constant
+			// requires an intentional test update.
+			name:        "defaults",
+			rawLimit:    DefaultSystemNamespaceMemoryLimit,
+			rawRequest:  DefaultSystemNamespaceMemoryRequest,
+			wantLimit:   "32Gi",
+			wantRequest: "32Mi",
+		},
+		{
+			// Empty is the documented off switch, not a missing value: the chart
+			// leaves both keys empty unless an operator sets them.
+			name:        "empty disables both",
+			rawLimit:    "",
+			rawRequest:  "",
+			wantLimit:   "0",
+			wantRequest: "0",
+		},
+		{
+			// An explicit 0 limit is the other way to disable, and it must not
+			// trip the pair check against a request that is still set.
+			name:        "zero limit disables and ignores the request",
+			rawLimit:    "0",
+			rawRequest:  "32Mi",
+			wantLimit:   "0",
+			wantRequest: "32Mi",
+		},
+		{
+			// Supported on purpose: the container still gets memory.max, the
+			// scheduler reserves nothing. See the flag help.
+			name:        "zero request against a real limit is accepted",
+			rawLimit:    "4Gi",
+			rawRequest:  "0",
+			wantLimit:   "4Gi",
+			wantRequest: "0",
+		},
+		{
+			name:     "malformed limit",
+			rawLimit: "4GB",
+			wantErr:  true,
+		},
+		{
+			name:       "malformed request",
+			rawLimit:   "4Gi",
+			rawRequest: "thirty-two",
+			wantErr:    true,
+		},
+		{
+			// Parses as a Quantity and is meaningless as memory.
+			name:     "negative limit",
+			rawLimit: "-1Gi",
+			wantErr:  true,
+		},
+		{
+			name:       "negative request",
+			rawLimit:   "4Gi",
+			rawRequest: "-32Mi",
+			wantErr:    true,
+		},
+		{
+			// The one the API server would otherwise reject per namespace, per
+			// reconcile, forever.
+			name:       "request above limit",
+			rawLimit:   "1Gi",
+			rawRequest: "2Gi",
+			wantErr:    true,
+		},
+		{
+			// Equal is the boundary and is legal: defaultRequest may equal default.
+			name:        "request equal to limit",
+			rawLimit:    "1Gi",
+			rawRequest:  "1Gi",
+			wantLimit:   "1Gi",
+			wantRequest: "1Gi",
+		},
 	}
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			got, err := parsePositiveDuration("--test-flag", tt.raw)
+			limit, request, err := parseSystemNamespaceMemory(tt.rawLimit, tt.rawRequest)
 			if tt.wantErr {
 				if err == nil {
-					t.Fatalf("expected error for %q, got nil", tt.raw)
+					t.Fatalf("parseSystemNamespaceMemory(%q, %q) = %s/%s, want an error",
+						tt.rawLimit, tt.rawRequest, limit.String(), request.String())
 				}
 				return
 			}
 			if err != nil {
-				t.Fatalf("unexpected error for %q: %v", tt.raw, err)
+				t.Fatalf("parseSystemNamespaceMemory(%q, %q): %v", tt.rawLimit, tt.rawRequest, err)
+			}
+			if want := resource.MustParse(tt.wantLimit); limit.Cmp(want) != 0 {
+				t.Errorf("limit = %s, want %s", limit.String(), want.String())
 			}
-			if got != tt.want {
-				t.Errorf("got %v, want %v", got, tt.want)
+			if want := resource.MustParse(tt.wantRequest); request.Cmp(want) != 0 {
+				t.Errorf("request = %s, want %s", request.String(), want.String())
 			}
 		})
 	}
diff --git a/cmd/flux-plunger/main.go b/cmd/flux-plunger/main.go
index 13fe88cd34..a45ef71f3a 100644
--- a/cmd/flux-plunger/main.go
+++ b/cmd/flux-plunger/main.go
@@ -20,6 +20,7 @@ import (
 	"crypto/tls"
 	"flag"
 	"os"
+	"time"
 
 	// Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.)
 	// to ensure that exec-entrypoint and run can make use of them.
@@ -56,6 +57,7 @@ func main() {
 	var probeAddr string
 	var secureMetrics bool
 	var enableHTTP2 bool
+	var shutdownDrainTimeout time.Duration
 	var tlsOpts []func(*tls.Config)
 
 	flag.StringVar(&metricsAddr, "metrics-bind-address", "0", "The address the metrics endpoint binds to. "+
@@ -68,6 +70,9 @@ func main() {
 		"If set, the metrics endpoint is served securely via HTTPS. Use --metrics-secure=false to use HTTP instead.")
 	flag.BoolVar(&enableHTTP2, "enable-http2", false,
 		"If set, HTTP/2 will be enabled for the metrics server")
+	flag.DurationVar(&shutdownDrainTimeout, fluxplunger.ShutdownDrainTimeoutFlag, 75*time.Second,
+		"How long to spend giving up the uninstall fences flux-plunger holds before it exits. "+
+			"Keep it inside the pod's termination grace period.")
 
 	opts := zap.Options{
 		Development: false,
@@ -102,31 +107,25 @@ func main() {
 		TLSOpts:       tlsOpts,
 	}
 
-	mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{
+	mgrOpts := ctrl.Options{
 		Scheme:                 scheme,
 		Metrics:                metricsServerOptions,
 		HealthProbeBindAddress: probeAddr,
 		LeaderElection:         enableLeaderElection,
 		LeaderElectionID:       "flux-plunger.cozystack.io",
-		// LeaderElectionReleaseOnCancel defines if the leader should step down voluntarily
-		// when the Manager ends. This requires the binary to immediately end when the
-		// Manager is stopped, otherwise, this setting is unsafe. Setting this significantly
-		// speeds up voluntary leader transitions as the new leader don't have to wait
-		// LeaseDuration time first.
-		//
-		// In the default scaffold provided, the program ends immediately after
-		// the manager stops, so would be fine to enable this option. However,
-		// if you are doing or is intended to do any operation such as perform cleanups
-		// after the manager stops then its usage might be unsafe.
-		// LeaderElectionReleaseOnCancel: true,
-	})
+	}
+	// The Lease is held, not released, through the drain after the manager stops.
+	fluxplunger.ApplyShutdownTimings(&mgrOpts, shutdownDrainTimeout)
+	mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), mgrOpts)
 	if err != nil {
 		setupLog.Error(err, "unable to create manager")
 		os.Exit(1)
 	}
 
 	if err = (&fluxplunger.FluxPlunger{
-		Client: mgr.GetClient(),
+		Client:    mgr.GetClient(),
+		APIReader: mgr.GetAPIReader(),
+		Recorder:  mgr.GetEventRecorderFor("flux-plunger"),
 	}).SetupWithManager(mgr); err != nil {
 		setupLog.Error(err, "unable to create controller", "controller", "FluxPlunger")
 		os.Exit(1)
@@ -144,7 +143,7 @@ func main() {
 	}
 
 	setupLog.Info("starting manager")
-	if err := mgr.Start(ctrl.SetupSignalHandler()); err != nil {
+	if err := fluxplunger.RunManager(ctrl.SetupSignalHandler(), mgr, shutdownDrainTimeout); err != nil {
 		setupLog.Error(err, "problem running manager")
 		os.Exit(1)
 	}
diff --git a/cmd/flux-shard-operator/main.go b/cmd/flux-shard-operator/main.go
new file mode 100644
index 0000000000..07b47231e0
--- /dev/null
+++ b/cmd/flux-shard-operator/main.go
@@ -0,0 +1,267 @@
+/*
+Copyright 2026.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// flux-shard-operator spreads tenant HelmReleases across multiple
+// helm-controller shards so one noisy tenant cannot degrade the others. It
+// provisions the shard Deployments (cloned from flux-aio), owns the
+// tenant->shard placement and stamps the shard label on new HelmReleases at
+// admission time.
+package main
+
+import (
+	"crypto/tls"
+	"flag"
+	"os"
+
+	// Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.)
+	// to ensure that exec-entrypoint and run can make use of them.
+	_ "k8s.io/client-go/plugin/pkg/client/auth"
+
+	appsv1 "k8s.io/api/apps/v1"
+	corev1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/api/resource"
+	"k8s.io/apimachinery/pkg/labels"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/selection"
+	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
+	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
+	ctrl "sigs.k8s.io/controller-runtime"
+	"sigs.k8s.io/controller-runtime/pkg/cache"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/healthz"
+	"sigs.k8s.io/controller-runtime/pkg/log/zap"
+	"sigs.k8s.io/controller-runtime/pkg/metrics/filters"
+	metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
+	"sigs.k8s.io/controller-runtime/pkg/webhook"
+
+	fso "github.com/cozystack/cozystack/internal/fluxshardoperator"
+)
+
+var (
+	scheme   = runtime.NewScheme()
+	setupLog = ctrl.Log.WithName("setup")
+)
+
+func init() {
+	utilruntime.Must(clientgoscheme.AddToScheme(scheme))
+}
+
+func main() {
+	var metricsAddr string
+	var enableLeaderElection bool
+	var probeAddr string
+	var secureMetrics bool
+	var enableHTTP2 bool
+	var fluxNamespace string
+	var shardCount string
+	var shardConcurrent int
+	var rebalanceThreshold float64
+	var pinnedTenants string
+	var shardCPURequest, shardCPULimit, shardMemoryRequest, shardMemoryLimit string
+	var tlsOpts []func(*tls.Config)
+
+	flag.StringVar(&metricsAddr, "metrics-bind-address", "0", "The address the metrics endpoint binds to. "+
+		"Use :8443 for HTTPS or :8080 for HTTP, or leave as 0 to disable the metrics service.")
+	flag.StringVar(&probeAddr, "health-probe-bind-address", ":8081", "The address the probe endpoint binds to.")
+	flag.BoolVar(&enableLeaderElection, "leader-elect", false,
+		"Enable leader election for controller manager. "+
+			"Enabling this will ensure there is only one active controller manager.")
+	flag.BoolVar(&secureMetrics, "metrics-secure", true,
+		"If set, the metrics endpoint is served securely via HTTPS. Use --metrics-secure=false to use HTTP instead.")
+	flag.BoolVar(&enableHTTP2, "enable-http2", false,
+		"If set, HTTP/2 will be enabled for the metrics and webhook servers")
+	flag.StringVar(&fluxNamespace, "flux-namespace", "cozy-fluxcd",
+		"Namespace of the flux-aio Deployment and the shard Deployments.")
+	flag.StringVar(&shardCount, "shard-count", fso.ShardCountAuto,
+		"Number of helm-controller shards to provision and distribute tenants over: "+
+			"\"auto\" (default) sizes from the tenant HelmRelease count with hysteresis, "+
+			"or a positive integer pins it explicitly.")
+	flag.IntVar(&shardConcurrent, "shard-concurrent", 5,
+		"Value of --concurrent for each shard helm-controller.")
+	flag.Float64Var(&rebalanceThreshold, "rebalance-threshold", 0.25,
+		"Load spread ratio (maxLoad-minLoad)/avgLoad above which tenants are rebalanced between shards.")
+	flag.StringVar(&pinnedTenants, "pinned-tenants", "",
+		"Comma-separated tenant pins, e.g. tenant-bigone=shard3,tenant-other=shard0.")
+	flag.StringVar(&shardCPURequest, "shard-cpu-request", "",
+		"CPU request for shard helm-controllers; empty inherits the flux-aio value.")
+	flag.StringVar(&shardCPULimit, "shard-cpu-limit", "",
+		"CPU limit for shard helm-controllers; empty inherits the flux-aio value.")
+	flag.StringVar(&shardMemoryRequest, "shard-memory-request", "",
+		"Memory request for shard helm-controllers; empty inherits the flux-aio value.")
+	flag.StringVar(&shardMemoryLimit, "shard-memory-limit", "",
+		"Memory limit for shard helm-controllers; empty inherits the flux-aio value.")
+	opts := zap.Options{
+		Development: false,
+	}
+	opts.BindFlags(flag.CommandLine)
+	flag.Parse()
+
+	ctrl.SetLogger(zap.New(zap.UseFlagOptions(&opts)))
+
+	pinned, err := fso.ParsePinnedTenants(pinnedTenants)
+	if err != nil {
+		setupLog.Error(err, "invalid --pinned-tenants")
+		os.Exit(1)
+	}
+	explicitShards, autoShards, err := fso.ParseShardCount(shardCount)
+	if err != nil {
+		setupLog.Error(err, "invalid --shard-count")
+		os.Exit(1)
+	}
+	shardResources, err := parseShardResources(shardCPURequest, shardCPULimit, shardMemoryRequest, shardMemoryLimit)
+	if err != nil {
+		setupLog.Error(err, "invalid shard resources")
+		os.Exit(1)
+	}
+	cfg := &fso.Config{
+		FluxNamespace:      fluxNamespace,
+		ShardCount:         explicitShards,
+		AutoShardCount:     autoShards,
+		ShardConcurrent:    shardConcurrent,
+		RebalanceThreshold: rebalanceThreshold,
+		PinnedTenants:      pinned,
+		ShardResources:     shardResources,
+	}
+
+	// if the enable-http2 flag is false (the default), http/2 should be disabled
+	// due to its vulnerabilities. More specifically, disabling http/2 will
+	// prevent from being vulnerable to the HTTP/2 Stream Cancellation and
+	// Rapid Reset CVEs. For more information see:
+	// - https://github.com/advisories/GHSA-qppj-fm5r-hxr3
+	// - https://github.com/advisories/GHSA-4374-p667-p6c8
+	disableHTTP2 := func(c *tls.Config) {
+		setupLog.Info("disabling http/2")
+		c.NextProtos = []string{"http/1.1"}
+	}
+
+	if !enableHTTP2 {
+		tlsOpts = append(tlsOpts, disableHTTP2)
+	}
+
+	webhookServer := webhook.NewServer(webhook.Options{
+		TLSOpts: tlsOpts,
+	})
+
+	metricsServerOptions := metricsserver.Options{
+		BindAddress:   metricsAddr,
+		SecureServing: secureMetrics,
+		TLSOpts:       tlsOpts,
+	}
+
+	if secureMetrics {
+		// FilterProvider is used to protect the metrics endpoint with authn/authz.
+		metricsServerOptions.FilterProvider = filters.WithAuthenticationAndAuthorization
+	}
+
+	shardKeyExists, err := labels.NewRequirement(fso.ShardKeyLabel, selection.Exists, nil)
+	if err != nil {
+		setupLog.Error(err, "building HelmRelease label selector")
+		os.Exit(1)
+	}
+
+	restConfig := ctrl.GetConfigOrDie()
+	restConfig.QPS = 50.0  // Increased from default 5.0
+	restConfig.Burst = 100 // Increased from default 10
+
+	mgr, err := ctrl.NewManager(restConfig, ctrl.Options{
+		Scheme:                 scheme,
+		Metrics:                metricsServerOptions,
+		WebhookServer:          webhookServer,
+		HealthProbeBindAddress: probeAddr,
+		LeaderElection:         enableLeaderElection,
+		LeaderElectionID:       "flux-shard-operator.cozystack.io",
+		Cache: cache.Options{
+			ByObject: map[client.Object]cache.ByObject{
+				// Metadata-only stubs: the operator never decodes HelmRelease
+				// specs/statuses, and the cache only holds tenant HRs (the
+				// shard key label exists on every one of them).
+				fso.HelmReleaseMeta(): {Label: labels.NewSelector().Add(*shardKeyExists)},
+				fso.NamespaceMeta():   {},
+				// Full Deployments, but only from the flux namespace.
+				&appsv1.Deployment{}: {Namespaces: map[string]cache.Config{fluxNamespace: {}}},
+			},
+		},
+	})
+	if err != nil {
+		setupLog.Error(err, "unable to start manager")
+		os.Exit(1)
+	}
+
+	placement := &fso.PlacementReconciler{Client: mgr.GetClient(), Config: cfg}
+	if err := placement.SetupWithManager(mgr); err != nil {
+		setupLog.Error(err, "unable to setup controller", "controller", "Placement")
+		os.Exit(1)
+	}
+	shardSet := &fso.ShardSetReconciler{Client: mgr.GetClient(), Config: cfg}
+	if err := shardSet.SetupWithManager(mgr); err != nil {
+		setupLog.Error(err, "unable to setup controller", "controller", "ShardSet")
+		os.Exit(1)
+	}
+	shardWebhook := &fso.ShardWebhook{Reader: mgr.GetClient()}
+	if err := shardWebhook.SetupWithManager(mgr); err != nil {
+		setupLog.Error(err, "unable to setup webhook", "webhook", "ShardWebhook")
+		os.Exit(1)
+	}
+
+	if err := mgr.AddHealthzCheck("healthz", healthz.Ping); err != nil {
+		setupLog.Error(err, "unable to set up health check")
+		os.Exit(1)
+	}
+	if err := mgr.AddReadyzCheck("readyz", healthz.Ping); err != nil {
+		setupLog.Error(err, "unable to set up ready check")
+		os.Exit(1)
+	}
+
+	setupLog.Info("starting manager",
+		"fluxNamespace", fluxNamespace, "shardCount", shardCount, "shardConcurrent", shardConcurrent)
+	if err := mgr.Start(ctrl.SetupSignalHandler()); err != nil {
+		setupLog.Error(err, "problem running manager")
+		os.Exit(1)
+	}
+}
+
+// parseShardResources builds the shard helm-controller resource requirements
+// from flags; empty flags inherit the corresponding flux-aio values.
+func parseShardResources(cpuReq, cpuLim, memReq, memLim string) (corev1.ResourceRequirements, error) {
+	res := corev1.ResourceRequirements{}
+	set := func(list *corev1.ResourceList, name corev1.ResourceName, value string) error {
+		if value == "" {
+			return nil
+		}
+		q, err := resource.ParseQuantity(value)
+		if err != nil {
+			return err
+		}
+		if *list == nil {
+			*list = corev1.ResourceList{}
+		}
+		(*list)[name] = q
+		return nil
+	}
+	if err := set(&res.Requests, corev1.ResourceCPU, cpuReq); err != nil {
+		return res, err
+	}
+	if err := set(&res.Limits, corev1.ResourceCPU, cpuLim); err != nil {
+		return res, err
+	}
+	if err := set(&res.Requests, corev1.ResourceMemory, memReq); err != nil {
+		return res, err
+	}
+	if err := set(&res.Limits, corev1.ResourceMemory, memLim); err != nil {
+		return res, err
+	}
+	return res, nil
+}
diff --git a/cmd/lineage-controller-webhook/main.go b/cmd/lineage-controller-webhook/main.go
index ffe0942bd5..f1e9491c19 100644
--- a/cmd/lineage-controller-webhook/main.go
+++ b/cmd/lineage-controller-webhook/main.go
@@ -34,6 +34,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/metrics/filters"
 	metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
+	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 
 	cozystackiov1alpha1 "github.com/cozystack/cozystack/api/v1alpha1"
 	lcw "github.com/cozystack/cozystack/internal/lineagecontrollerwebhook"
@@ -159,6 +160,9 @@ func main() {
 		setupLog.Error(err, "unable to setup webhook", "webhook", "LineageWebhook")
 		os.Exit(1)
 	}
+	mgr.GetWebhookServer().Register(lcw.ApplicationDefinitionKindValidatorPath, &admission.Webhook{
+		Handler: lcw.NewApplicationDefinitionKindValidator(mgr.GetClient(), mgr.GetScheme()),
+	})
 
 	// +kubebuilder:scaffold:builder
 
diff --git a/cmd/migration-controller/main.go b/cmd/migration-controller/main.go
new file mode 100644
index 0000000000..0c22e8ed48
--- /dev/null
+++ b/cmd/migration-controller/main.go
@@ -0,0 +1,203 @@
+/*
+Copyright 2026.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// Command migration-controller reconciles the forklift.cozystack.io API group:
+// VMImportSource connections and the VMImportTask operations that run over them.
+package main
+
+import (
+	"crypto/tls"
+	"flag"
+	"fmt"
+	"os"
+
+	corev1 "k8s.io/api/core/v1"
+	storagev1 "k8s.io/api/storage/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
+	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
+	ctrl "sigs.k8s.io/controller-runtime"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/healthz"
+	"sigs.k8s.io/controller-runtime/pkg/log/zap"
+	metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
+	"sigs.k8s.io/controller-runtime/pkg/webhook"
+
+	migrationv1alpha1 "github.com/cozystack/cozystack/api/migration/v1alpha1"
+	"github.com/cozystack/cozystack/internal/migrationcontroller"
+)
+
+var (
+	scheme   = runtime.NewScheme()
+	setupLog = ctrl.Log.WithName("setup")
+)
+
+func init() {
+	utilruntime.Must(clientgoscheme.AddToScheme(scheme))
+	utilruntime.Must(migrationv1alpha1.AddToScheme(scheme))
+	// Forklift, KubeVirt and CDI objects are handled as unstructured, so their
+	// types are deliberately absent from the scheme: Forklift is an optional
+	// package and this controller must start cleanly on a cluster where its
+	// CRDs are not installed at all.
+}
+
+// envOr returns the environment variable's value, or a fallback when unset.
+func envOr(key, fallback string) string {
+	if v := os.Getenv(key); v != "" {
+		return v
+	}
+	return fallback
+}
+
+func main() {
+	var metricsAddr string
+	var probeAddr string
+	var enableLeaderElection bool
+	var secureMetrics bool
+	var enableHTTP2 bool
+	var vddkImage string
+	var forkliftNamespace string
+	var inventoryURL string
+	var tlsOpts []func(*tls.Config)
+
+	flag.StringVar(&metricsAddr, "metrics-bind-address", "0", "The address the metrics endpoint binds to. "+
+		"Use :8443 for HTTPS or :8080 for HTTP, or leave as 0 to disable the metrics service.")
+	flag.StringVar(&probeAddr, "health-probe-bind-address", ":8081", "The address the probe endpoint binds to.")
+	flag.BoolVar(&enableLeaderElection, "leader-elect", false,
+		"Enable leader election for controller manager. "+
+			"Enabling this will ensure there is only one active controller manager.")
+	flag.BoolVar(&secureMetrics, "metrics-secure", true,
+		"If set, the metrics endpoint is served securely via HTTPS. Use --metrics-secure=false to use HTTP instead.")
+	flag.BoolVar(&enableHTTP2, "enable-http2", false,
+		"If set, HTTP/2 will be enabled for the metrics and webhook servers")
+	flag.StringVar(&vddkImage, "vddk-image", os.Getenv("MIGRATION_VDDK_IMAGE"),
+		"Container image carrying the VMware Virtual Disk Development Kit. Platform "+
+			"configuration, never a tenant value: the image is built from a proprietary "+
+			"SDK that Cozystack cannot ship, so an operator who holds a licence builds it "+
+			"and names it here. Empty means the vSphere import path is unavailable, which "+
+			"vSphere sources report on their own status.")
+	flag.StringVar(&forkliftNamespace, "forklift-namespace", envOr("MIGRATION_FORKLIFT_NAMESPACE", "cozy-forklift"),
+		"Namespace Forklift runs in. The controller reads the inventory service's CA "+
+			"from its serving-certificate secret there.")
+	flag.StringVar(&inventoryURL, "inventory-url", os.Getenv("MIGRATION_INVENTORY_URL"),
+		"Base URL of Forklift's inventory REST service. Defaults to "+
+			"https://forklift-inventory.<forklift-namespace>.svc:8443. The controller "+
+			"reads the source's networks and datastores from it: those identifiers "+
+			"appear on no Forklift custom resource, so the Plan's maps cannot be built "+
+			"without it.")
+
+	opts := zap.Options{Development: false}
+	opts.BindFlags(flag.CommandLine)
+	flag.Parse()
+
+	ctrl.SetLogger(zap.New(zap.UseFlagOptions(&opts)))
+
+	// HTTP/2 stays off by default: it carries the Stream Cancellation and Rapid
+	// Reset CVEs and nothing here needs it.
+	if !enableHTTP2 {
+		tlsOpts = append(tlsOpts, func(c *tls.Config) {
+			setupLog.Info("disabling http/2")
+			c.NextProtos = []string{"http/1.1"}
+		})
+	}
+
+	metricsServerOptions := metricsserver.Options{
+		BindAddress:   metricsAddr,
+		SecureServing: secureMetrics,
+		TLSOpts:       tlsOpts,
+	}
+
+	config := ctrl.GetConfigOrDie()
+	config.QPS = 50.0
+	config.Burst = 100
+
+	mgr, err := ctrl.NewManager(config, ctrl.Options{
+		Scheme:                 scheme,
+		Metrics:                metricsServerOptions,
+		WebhookServer:          webhook.NewServer(webhook.Options{TLSOpts: tlsOpts}),
+		HealthProbeBindAddress: probeAddr,
+		LeaderElection:         enableLeaderElection,
+		LeaderElectionID:       "forklift.cozystack.io",
+		Client: client.Options{
+			// Secrets and volumes are read and written point-wise across
+			// arbitrary tenant namespaces. A cluster-wide informer for them
+			// would need list/watch RBAC this package deliberately does not
+			// grant, and would hold every tenant's Secret in memory. Direct
+			// apiserver calls keep the blast radius to the namespaces actually
+			// being reconciled.
+			Cache: &client.CacheOptions{
+				DisableFor: []client.Object{
+					&corev1.Secret{},
+					&corev1.PersistentVolume{},
+					&corev1.PersistentVolumeClaim{},
+					&storagev1.StorageClass{},
+				},
+			},
+		},
+	})
+	if err != nil {
+		setupLog.Error(err, "unable to start manager")
+		os.Exit(1)
+	}
+
+	if vddkImage == "" {
+		setupLog.Info("no VDDK image configured; the vSphere import path will report itself unavailable")
+	}
+
+	if inventoryURL == "" {
+		inventoryURL = fmt.Sprintf("https://forklift-inventory.%s.svc:8443", forkliftNamespace)
+	}
+	// One client for both reconcilers: the task reads a VM's topology, the
+	// source publishes the machine list the console's picker offers.
+	inventory := migrationcontroller.NewInventoryClient(
+		inventoryURL, forkliftNamespace, mgr.GetAPIReader())
+
+	if err = (&migrationcontroller.VMImportSourceReconciler{
+		Client:    mgr.GetClient(),
+		Scheme:    mgr.GetScheme(),
+		Recorder:  mgr.GetEventRecorderFor("migration-controller"),
+		VDDKImage: vddkImage,
+		Inventory: inventory,
+	}).SetupWithManager(mgr); err != nil {
+		setupLog.Error(err, "unable to create controller", "controller", "VMImportSource")
+		os.Exit(1)
+	}
+
+	if err = (&migrationcontroller.VMImportTaskReconciler{
+		Client:    mgr.GetClient(),
+		Scheme:    mgr.GetScheme(),
+		Recorder:  mgr.GetEventRecorderFor("migration-controller"),
+		Inventory: inventory,
+	}).SetupWithManager(mgr); err != nil {
+		setupLog.Error(err, "unable to create controller", "controller", "VMImportTask")
+		os.Exit(1)
+	}
+
+	if err := mgr.AddHealthzCheck("healthz", healthz.Ping); err != nil {
+		setupLog.Error(err, "unable to set up health check")
+		os.Exit(1)
+	}
+	if err := mgr.AddReadyzCheck("readyz", healthz.Ping); err != nil {
+		setupLog.Error(err, "unable to set up ready check")
+		os.Exit(1)
+	}
+
+	setupLog.Info("starting manager")
+	if err := mgr.Start(ctrl.SetupSignalHandler()); err != nil {
+		setupLog.Error(err, "problem running manager")
+		os.Exit(1)
+	}
+}
diff --git a/cmd/securitygroup-controller/main.go b/cmd/securitygroup-controller/main.go
new file mode 100644
index 0000000000..ede8842373
--- /dev/null
+++ b/cmd/securitygroup-controller/main.go
@@ -0,0 +1,120 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright 2026 The Cozystack Authors.
+
+package main
+
+import (
+	"crypto/tls"
+	"flag"
+	"os"
+
+	// Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.)
+	// to ensure that exec-entrypoint and run can make use of them.
+	_ "k8s.io/client-go/plugin/pkg/client/auth"
+
+	"k8s.io/apimachinery/pkg/runtime"
+	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
+	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
+	ctrl "sigs.k8s.io/controller-runtime"
+	"sigs.k8s.io/controller-runtime/pkg/cache"
+	"sigs.k8s.io/controller-runtime/pkg/healthz"
+	"sigs.k8s.io/controller-runtime/pkg/log/zap"
+	"sigs.k8s.io/controller-runtime/pkg/metrics/filters"
+	metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
+
+	sgc "github.com/cozystack/cozystack/internal/securitygroupcontroller"
+)
+
+var (
+	scheme   = runtime.NewScheme()
+	setupLog = ctrl.Log.WithName("setup")
+)
+
+func init() {
+	utilruntime.Must(clientgoscheme.AddToScheme(scheme))
+	utilruntime.Must(sgc.AddToScheme(scheme))
+}
+
+func main() {
+	var metricsAddr string
+	var enableLeaderElection bool
+	var probeAddr string
+	var secureMetrics bool
+	var enableHTTP2 bool
+	var tlsOpts []func(*tls.Config)
+	flag.StringVar(&metricsAddr, "metrics-bind-address", "0", "The address the metrics endpoint binds to. "+
+		"Use :8443 for HTTPS or :8080 for HTTP, or leave as 0 to disable the metrics service.")
+	flag.StringVar(&probeAddr, "health-probe-bind-address", ":8081", "The address the probe endpoint binds to.")
+	flag.BoolVar(&enableLeaderElection, "leader-elect", false,
+		"Enable leader election for controller manager. "+
+			"Enabling this will ensure there is only one active controller manager.")
+	flag.BoolVar(&secureMetrics, "metrics-secure", true,
+		"If set, the metrics endpoint is served securely via HTTPS. Use --metrics-secure=false to use HTTP instead.")
+	flag.BoolVar(&enableHTTP2, "enable-http2", false,
+		"If set, HTTP/2 will be enabled for the metrics server")
+	opts := zap.Options{
+		Development: false,
+	}
+	opts.BindFlags(flag.CommandLine)
+	flag.Parse()
+
+	ctrl.SetLogger(zap.New(zap.UseFlagOptions(&opts)))
+
+	// Disable HTTP/2 by default to avoid the Stream Cancellation and Rapid Reset
+	// CVEs (GHSA-qppj-fm5r-hxr3, GHSA-4374-p667-p6c8).
+	disableHTTP2 := func(c *tls.Config) {
+		setupLog.Info("disabling http/2")
+		c.NextProtos = []string{"http/1.1"}
+	}
+	if !enableHTTP2 {
+		tlsOpts = append(tlsOpts, disableHTTP2)
+	}
+
+	metricsServerOptions := metricsserver.Options{
+		BindAddress:   metricsAddr,
+		SecureServing: secureMetrics,
+		TLSOpts:       tlsOpts,
+	}
+	if secureMetrics {
+		metricsServerOptions.FilterProvider = filters.WithAuthenticationAndAuthorization
+	}
+
+	// Configure rate limiting for the Kubernetes client.
+	config := ctrl.GetConfigOrDie()
+	config.QPS = 50.0
+	config.Burst = 100
+
+	mgr, err := ctrl.NewManager(config, ctrl.Options{
+		Scheme:                 scheme,
+		Metrics:                metricsServerOptions,
+		HealthProbeBindAddress: probeAddr,
+		LeaderElection:         enableLeaderElection,
+		LeaderElectionID:       "securitygroup-controller.sdn.cozystack.io",
+		// Bound the informer caches to the only objects this controller acts on.
+		Cache: cache.Options{ByObject: sgc.CacheByObject()},
+	})
+	if err != nil {
+		setupLog.Error(err, "unable to start manager")
+		os.Exit(1)
+	}
+
+	if err := (&sgc.Reconciler{Client: mgr.GetClient()}).SetupWithManager(mgr); err != nil {
+		setupLog.Error(err, "unable to setup controller", "controller", "SecurityGroupMembership")
+		os.Exit(1)
+	}
+
+	if err := mgr.AddHealthzCheck("healthz", healthz.Ping); err != nil {
+		setupLog.Error(err, "unable to set up health check")
+		os.Exit(1)
+	}
+	if err := mgr.AddReadyzCheck("readyz", healthz.Ping); err != nil {
+		setupLog.Error(err, "unable to set up ready check")
+		os.Exit(1)
+	}
+
+	setupLog.Info("starting manager")
+	if err := mgr.Start(ctrl.SetupSignalHandler()); err != nil {
+		setupLog.Error(err, "problem running manager")
+		os.Exit(1)
+	}
+}
diff --git a/dashboards/db/database-autoscaling.json b/dashboards/db/database-autoscaling.json
new file mode 100644
index 0000000000..8f88a3375f
--- /dev/null
+++ b/dashboards/db/database-autoscaling.json
@@ -0,0 +1,93 @@
+{
+  "title": "Database Autoscaling",
+  "uid": "cozy-db-autoscaling",
+  "tags": ["cozystack", "database", "autoscaling"],
+  "timezone": "browser",
+  "schemaVersion": 39,
+  "time": { "from": "now-6h", "to": "now" },
+  "templating": {
+    "list": [
+      {
+        "current": { "selected": false, "text": "default", "value": "default" },
+        "hide": 0,
+        "includeAll": false,
+        "label": "Datasource",
+        "multi": false,
+        "name": "ds_prometheus",
+        "options": [],
+        "query": "prometheus",
+        "queryValue": "",
+        "refresh": 1,
+        "regex": "",
+        "skipUrlSync": false,
+        "type": "datasource"
+      },
+      {
+        "name": "namespace",
+        "type": "query",
+        "datasource": { "type": "prometheus", "uid": "${ds_prometheus}" },
+        "query": "label_values(kube_horizontalpodautoscaler_status_current_replicas{horizontalpodautoscaler=~\"keda-hpa-.*\"}, namespace)",
+        "includeAll": true,
+        "multi": true
+      }
+    ]
+  },
+  "panels": [
+    {
+      "id": 1,
+      "title": "Desired vs current replicas",
+      "description": "Live HPA actuation, per KEDA HPA (keda-hpa-<cluster>). In dry-run / transition (ScaledObject paused in both directions) the HPA's desiredReplicas is frozen to currentReplicas, so the two lines coincide — read the recommendation from the matching read-load panel (connections or CPU) instead: desired = 1 + ceil(load / target), clamped to [minReplicas..maxReplicas] (floor = max(minReplicas, maxSyncReplicas+1, 2)).",
+      "type": "timeseries",
+      "datasource": { "type": "prometheus", "uid": "${ds_prometheus}" },
+      "gridPos": { "h": 8, "w": 12, "x": 0, "y": 0 },
+      "targets": [
+        { "datasource": { "type": "prometheus", "uid": "${ds_prometheus}" }, "expr": "kube_horizontalpodautoscaler_status_current_replicas{horizontalpodautoscaler=~\"keda-hpa-.*\",namespace=~\"$namespace\"}", "legendFormat": "current {{namespace}}/{{horizontalpodautoscaler}}" },
+        { "datasource": { "type": "prometheus", "uid": "${ds_prometheus}" }, "expr": "kube_horizontalpodautoscaler_status_desired_replicas{horizontalpodautoscaler=~\"keda-hpa-.*\",namespace=~\"$namespace\"}", "legendFormat": "desired {{namespace}}/{{horizontalpodautoscaler}}" }
+      ]
+    },
+    {
+      "id": 2,
+      "title": "Active read connections (replicas, per cluster)",
+      "description": "Replica-scoped active connections per cluster — the ReadConnections autoscaler input. For a cluster on metric: ReadConnections the recommendation is desired = 1 + ceil(this / target), clamped to [minReplicas..maxReplicas] (floor = max(minReplicas, maxSyncReplicas+1, 2)); CPU-mode clusters read the 'Replica CPU' panel instead. Restricted to standby pods via the same replica join as the ScaledObject query and scoped per cluster (label_cnpg_io_cluster), so it also surfaces the recommendation in dry-run, where panel 1's desired line is frozen to current.",
+      "type": "timeseries",
+      "datasource": { "type": "prometheus", "uid": "${ds_prometheus}" },
+      "gridPos": { "h": 8, "w": 12, "x": 12, "y": 0 },
+      "targets": [
+        { "datasource": { "type": "prometheus", "uid": "${ds_prometheus}" }, "expr": "sum by (namespace, label_cnpg_io_cluster) (cnpg_backends_total{state=\"active\",namespace=~\"$namespace\"} * on(namespace,pod) group_left(label_cnpg_io_cluster) kube_pod_labels{label_cnpg_io_cluster!=\"\",label_cnpg_io_instance_role=\"replica\",namespace=~\"$namespace\"})", "legendFormat": "{{namespace}}/{{label_cnpg_io_cluster}}" }
+      ]
+    },
+    {
+      "id": 3,
+      "title": "Replication lag (seconds, per cluster)",
+      "description": "Max standby replication lag per cluster. Deliberately joins ALL instance pods (no instance-role filter, unlike the read-load panels) because lag is a per-standby signal collapsed by max(); the primary reports no lag. Feeds the opt-in replication-lag brake (autoscaling.maxReplicationLagSeconds).",
+      "type": "timeseries",
+      "datasource": { "type": "prometheus", "uid": "${ds_prometheus}" },
+      "gridPos": { "h": 8, "w": 12, "x": 0, "y": 8 },
+      "targets": [
+        { "datasource": { "type": "prometheus", "uid": "${ds_prometheus}" }, "expr": "max by (namespace, label_cnpg_io_cluster) (cnpg_pg_replication_lag{namespace=~\"$namespace\"} * on(namespace,pod) group_left(label_cnpg_io_cluster) kube_pod_labels{label_cnpg_io_cluster!=\"\",namespace=~\"$namespace\"})", "legendFormat": "{{namespace}}/{{label_cnpg_io_cluster}}" }
+      ]
+    },
+    {
+      "id": 4,
+      "title": "Scaling limited (ScalingLimited=true)",
+      "description": "Per KEDA HPA: 1 while the HPA reports ScalingLimited=true — set at BOTH the ceiling (maxReplicas) and the floor (an idle cluster's desired clamps UP to minReplicas), so this is 1 on quiet clusters too. Distinguish via the 'Desired vs current replicas' panel; the DatabaseAutoscalerAtMax alert scopes to the ceiling case (desired >= maxReplicas), where raising maxReplicas adds read capacity.",
+      "type": "timeseries",
+      "datasource": { "type": "prometheus", "uid": "${ds_prometheus}" },
+      "gridPos": { "h": 8, "w": 12, "x": 12, "y": 8 },
+      "targets": [
+        { "datasource": { "type": "prometheus", "uid": "${ds_prometheus}" }, "expr": "kube_horizontalpodautoscaler_status_condition{horizontalpodautoscaler=~\"keda-hpa-.*\",condition=\"ScalingLimited\",status=\"true\",namespace=~\"$namespace\"}", "legendFormat": "{{namespace}}/{{horizontalpodautoscaler}}" }
+      ]
+    },
+    {
+      "id": 5,
+      "title": "Replica CPU (millicores, per cluster)",
+      "description": "Replica-scoped postgres-container CPU per cluster (millicores) — the ReadCPUUtilization autoscaler input. For a cluster on metric: ReadCPUUtilization the recommendation is desired = 1 + ceil(this / target), clamped to [minReplicas..maxReplicas] (floor = max(minReplicas, maxSyncReplicas+1, 2)). Mirrors the ScaledObject's CPU query (rate over 5m x 1000) restricted to standby pods.",
+      "type": "timeseries",
+      "datasource": { "type": "prometheus", "uid": "${ds_prometheus}" },
+      "gridPos": { "h": 8, "w": 12, "x": 0, "y": 16 },
+      "targets": [
+        { "datasource": { "type": "prometheus", "uid": "${ds_prometheus}" }, "expr": "sum by (namespace, label_cnpg_io_cluster) (rate(container_cpu_usage_seconds_total{container=\"postgres\",namespace=~\"$namespace\"}[5m]) * 1000 * on(namespace,pod) group_left(label_cnpg_io_cluster) kube_pod_labels{label_cnpg_io_cluster!=\"\",label_cnpg_io_instance_role=\"replica\",namespace=~\"$namespace\"})", "legendFormat": "{{namespace}}/{{label_cnpg_io_cluster}}" }
+      ]
+    }
+  ]
+}
diff --git a/dashboards/kafka/strimzi-kafka.json b/dashboards/kafka/strimzi-kafka.json
index 4e1fbe8535..b64d4dbfd8 100644
--- a/dashboards/kafka/strimzi-kafka.json
+++ b/dashboards/kafka/strimzi-kafka.json
@@ -2774,7 +2774,7 @@
               }
             ]
           },
-          "unit": "short"
+          "unit": "ms"
         },
         "overrides": []
       },
@@ -2801,7 +2801,7 @@
       "targets": [
         {
           "datasource": "${DS_PROMETHEUS}",
-          "expr": "sum(kafka_server_zookeeperclientmetrics_zookeeperrequestlatencyms{namespace=\"$kubernetes_namespace\",pod=~\"$strimzi_cluster_name-$kafka_broker\",strimzi_io_name=\"$strimzi_cluster_name-kafka\"}) by (pod)",
+          "expr": "sum(kafka_server_raftmetrics_commit_latency_avg{namespace=\"$kubernetes_namespace\",pod=~\"$strimzi_cluster_name-c-.*\"}) by (pod)",
           "format": "time_series",
           "instant": false,
           "intervalFactor": 1,
@@ -2809,7 +2809,7 @@
           "refId": "A"
         }
       ],
-      "title": "ZK request latecy",
+      "title": "KRaft controller commit latency (avg, ms)",
       "type": "timeseries"
     }
   ],
diff --git a/dashboards/main/capacity-planning.json b/dashboards/main/capacity-planning.json
index b2a3b966fd..7d6f0d038b 100644
--- a/dashboards/main/capacity-planning.json
+++ b/dashboards/main/capacity-planning.json
@@ -310,7 +310,7 @@
             "uid": "$ds_prometheus"
           },
           "editorMode": "code",
-          "expr": "sum(sum by (node) (avg_over_time(kube_pod_container_resource_requests{resource=\"cpu\",unit=\"core\",node=~\"$node\"}[$__rate_interval])* on (uid) group_left(phase) kube_pod_status_phase{phase=\"Running\"})) / sum(sum by (node) (avg_over_time(kube_node_status_allocatable{resource=\"cpu\",unit=\"core\",node=~\"$node\"}[$__rate_interval])))",
+          "expr": "sum(sum by (node) (avg_over_time(kube_pod_container_resource_requests{resource=\"cpu\",unit=\"core\",node=~\"$node\"}[$__rate_interval])* on (namespace, pod) group_left(phase) (kube_pod_status_phase{phase=\"Running\"} == 1))) / sum(sum by (node) (avg_over_time(kube_node_status_allocatable{resource=\"cpu\",unit=\"core\",node=~\"$node\"}[$__rate_interval])))",
           "hide": false,
           "legendFormat": "Total",
           "range": true,
@@ -380,7 +380,7 @@
             "uid": "$ds_prometheus"
           },
           "editorMode": "code",
-          "expr": "sum(sum by (node) (avg_over_time(kube_pod_container_resource_requests{resource=\"memory\",node=~\"$node\"}[$__rate_interval])* on (uid) group_left(phase) kube_pod_status_phase{phase=\"Running\"})) / sum(sum by (node) (avg_over_time(kube_node_status_allocatable{resource=\"memory\",unit=\"byte\",node=~\"$node\"}[$__rate_interval])))",
+          "expr": "sum(sum by (node) (avg_over_time(kube_pod_container_resource_requests{resource=\"memory\",node=~\"$node\"}[$__rate_interval])* on (namespace, pod) group_left(phase) (kube_pod_status_phase{phase=\"Running\"} == 1))) / sum(sum by (node) (avg_over_time(kube_node_status_allocatable{resource=\"memory\",unit=\"byte\",node=~\"$node\"}[$__rate_interval])))",
           "hide": false,
           "legendFormat": "Total",
           "range": true,
@@ -995,7 +995,7 @@
             "uid": "$ds_prometheus"
           },
           "editorMode": "code",
-          "expr": "sum by (node) (avg_over_time(kube_node_status_allocatable{resource=\"cpu\",node=~\"$node\"}[$__rate_interval])) - on(node) (sum by (node) (avg_over_time(kube_pod_container_resource_requests{resource=\"cpu\",unit=\"core\",node=~\"$node\"}[$__rate_interval])* on (uid) group_left(phase) kube_pod_status_phase{phase=\"Running\"}))",
+          "expr": "sum by (node) (avg_over_time(kube_node_status_allocatable{resource=\"cpu\",node=~\"$node\"}[$__rate_interval])) - on(node) (sum by (node) (avg_over_time(kube_pod_container_resource_requests{resource=\"cpu\",unit=\"core\",node=~\"$node\"}[$__rate_interval])* on (namespace, pod) group_left(phase) (kube_pod_status_phase{phase=\"Running\"} == 1)) or sum by (node) (kube_node_status_allocatable{resource=\"cpu\",node=~\"$node\"} * 0))",
           "format": "time_series",
           "hide": false,
           "intervalFactor": 1,
@@ -1010,7 +1010,7 @@
             "uid": "$ds_prometheus"
           },
           "editorMode": "code",
-          "expr": "sum(sum by (node) (avg_over_time(kube_node_status_allocatable{resource=\"cpu\",node=~\"$node\"}[$__rate_interval])) - on(node) (sum by (node) (avg_over_time(kube_pod_container_resource_requests{resource=\"cpu\",unit=\"core\",node=~\"$node\"}[$__rate_interval])* on (uid) group_left(phase) kube_pod_status_phase{phase=\"Running\"})))",
+          "expr": "sum(sum by (node) (avg_over_time(kube_node_status_allocatable{resource=\"cpu\",node=~\"$node\"}[$__rate_interval])) - on(node) (sum by (node) (avg_over_time(kube_pod_container_resource_requests{resource=\"cpu\",unit=\"core\",node=~\"$node\"}[$__rate_interval])* on (namespace, pod) group_left(phase) (kube_pod_status_phase{phase=\"Running\"} == 1)) or sum by (node) (kube_node_status_allocatable{resource=\"cpu\",node=~\"$node\"} * 0)))",
           "hide": false,
           "legendFormat": "Total",
           "range": true,
@@ -1393,7 +1393,7 @@
             "uid": "$ds_prometheus"
           },
           "editorMode": "code",
-          "expr": "sum by (node) (avg_over_time(kube_node_status_allocatable{resource=\"memory\",node=~\"$node\"}[$__rate_interval])) - on(node) (sum by (node) (avg_over_time(kube_pod_container_resource_requests{resource=\"memory\",node=~\"$node\"}[$__rate_interval])* on (uid) group_left(phase) kube_pod_status_phase{phase=\"Running\"}))",
+          "expr": "sum by (node) (avg_over_time(kube_node_status_allocatable{resource=\"memory\",node=~\"$node\"}[$__rate_interval])) - on(node) (sum by (node) (avg_over_time(kube_pod_container_resource_requests{resource=\"memory\",node=~\"$node\"}[$__rate_interval])* on (namespace, pod) group_left(phase) (kube_pod_status_phase{phase=\"Running\"} == 1)) or sum by (node) (kube_node_status_allocatable{resource=\"memory\",node=~\"$node\"} * 0))",
           "format": "time_series",
           "hide": false,
           "intervalFactor": 1,
@@ -1408,7 +1408,7 @@
             "uid": "$ds_prometheus"
           },
           "editorMode": "code",
-          "expr": "sum(sum by (node) (avg_over_time(kube_node_status_allocatable{resource=\"memory\",node=~\"$node\"}[$__rate_interval])) - on(node) (sum by (node) (avg_over_time(kube_pod_container_resource_requests{resource=\"memory\",node=~\"$node\"}[$__rate_interval])* on (uid) group_left(phase) kube_pod_status_phase{phase=\"Running\"})))",
+          "expr": "sum(sum by (node) (avg_over_time(kube_node_status_allocatable{resource=\"memory\",node=~\"$node\"}[$__rate_interval])) - on(node) (sum by (node) (avg_over_time(kube_pod_container_resource_requests{resource=\"memory\",node=~\"$node\"}[$__rate_interval])* on (namespace, pod) group_left(phase) (kube_pod_status_phase{phase=\"Running\"} == 1)) or sum by (node) (kube_node_status_allocatable{resource=\"memory\",node=~\"$node\"} * 0)))",
           "hide": false,
           "legendFormat": "Total",
           "range": true,
diff --git a/dashboards/main/namespaces.json b/dashboards/main/namespaces.json
index e05e826508..f26dea179f 100644
--- a/dashboards/main/namespaces.json
+++ b/dashboards/main/namespaces.json
@@ -2218,14 +2218,14 @@
               "refId": "A"
             },
             {
-              "expr": "sum by (namespace) (avg_over_time(kube_pod_container_resource_requests{resource=\"cpu\",unit=\"core\",node=~\"$node\", container!=\"\", namespace=\"$namespace\"}[$__rate_interval])* on (uid) group_left(phase) kube_pod_status_phase{phase=\"Running\"})",
+              "expr": "sum by (namespace) (avg_over_time(kube_pod_container_resource_requests{resource=\"cpu\",unit=\"core\",node=~\"$node\", container!=\"\", namespace=\"$namespace\"}[$__rate_interval])* on (namespace, pod) group_left(phase) (kube_pod_status_phase{phase=\"Running\"} == 1))",
               "format": "time_series",
               "intervalFactor": 1,
               "legendFormat": "Requests",
               "refId": "B"
             },
             {
-              "expr": "sum by (namespace) (avg_over_time(kube_pod_container_resource_limits{resource=\"cpu\",unit=\"core\",node=~\"$node\", container!=\"\", namespace=\"$namespace\"}[$__rate_interval])* on (uid) group_left(phase) kube_pod_status_phase{phase=\"Running\"})",
+              "expr": "sum by (namespace) (avg_over_time(kube_pod_container_resource_limits{resource=\"cpu\",unit=\"core\",node=~\"$node\", container!=\"\", namespace=\"$namespace\"}[$__rate_interval])* on (namespace, pod) group_left(phase) (kube_pod_status_phase{phase=\"Running\"} == 1))",
               "format": "time_series",
               "intervalFactor": 1,
               "legendFormat": "Limits",
@@ -3407,14 +3407,14 @@
               "refId": "E"
             },
             {
-              "expr": "sum by(namespace) (avg_over_time(kube_pod_container_resource_requests{resource=\"memory\",unit=\"byte\",node=~\"$node\", container!=\"\", namespace=\"$namespace\"}[$__rate_interval]))",
+              "expr": "sum by(namespace) (avg_over_time(kube_pod_container_resource_requests{resource=\"memory\",unit=\"byte\",node=~\"$node\", container!=\"\", namespace=\"$namespace\"}[$__rate_interval])* on (namespace, pod) group_left(phase) (kube_pod_status_phase{phase=\"Running\"} == 1))",
               "format": "time_series",
               "intervalFactor": 1,
               "legendFormat": "Requests",
               "refId": "F"
             },
             {
-              "expr": "sum by(namespace) (avg_over_time(kube_pod_container_resource_limits{resource=\"memory\",unit=\"byte\",node=~\"$node\", container!=\"\", namespace=\"$namespace\"}[$__rate_interval]))",
+              "expr": "sum by(namespace) (avg_over_time(kube_pod_container_resource_limits{resource=\"memory\",unit=\"byte\",node=~\"$node\", container!=\"\", namespace=\"$namespace\"}[$__rate_interval])* on (namespace, pod) group_left(phase) (kube_pod_status_phase{phase=\"Running\"} == 1))",
               "format": "time_series",
               "intervalFactor": 1,
               "legendFormat": "Limits",
diff --git a/dashboards/tenants/overview.json b/dashboards/tenants/overview.json
new file mode 100644
index 0000000000..10dfb93abd
--- /dev/null
+++ b/dashboards/tenants/overview.json
@@ -0,0 +1,1600 @@
+{
+  "annotations": {
+    "list": [
+      {
+        "builtIn": 1,
+        "datasource": {
+          "type": "grafana",
+          "uid": "-- Grafana --"
+        },
+        "enable": true,
+        "hide": true,
+        "iconColor": "rgba(0, 211, 255, 1)",
+        "name": "Annotations & Alerts",
+        "type": "dashboard"
+      }
+    ]
+  },
+  "description": "Cozystack tenant overview: who consumes what, how many apps each tenant runs, and per-tenant health. Tenants = tenant-* namespaces, apps = Flux HelmReleases.",
+  "editable": true,
+  "fiscalYearStartMonth": 0,
+  "graphTooltip": 1,
+  "links": [],
+  "liveNow": false,
+  "refresh": "",
+  "schemaVersion": 42,
+  "tags": [
+    "tenants",
+    "overview",
+    "admin"
+  ],
+  "templating": {
+    "list": [
+      {
+        "type": "datasource",
+        "name": "ds_prometheus",
+        "label": "Prometheus",
+        "skipUrlSync": false,
+        "query": "prometheus",
+        "current": {
+          "selected": false,
+          "text": "default",
+          "value": "default"
+        },
+        "multi": false,
+        "allowCustomValue": true,
+        "includeAll": false,
+        "regex": "",
+        "auto": false,
+        "auto_min": "10s",
+        "auto_count": 30
+      },
+      {
+        "allValue": "tenant-.*",
+        "current": {
+          "selected": true,
+          "text": [
+            "All"
+          ],
+          "value": [
+            "$__all"
+          ]
+        },
+        "datasource": {
+          "type": "prometheus",
+          "uid": "$ds_prometheus"
+        },
+        "definition": "label_values(kube_pod_info{namespace=~\"tenant-.*\"}, namespace)",
+        "hide": 0,
+        "includeAll": true,
+        "label": "Tenant",
+        "multi": true,
+        "name": "namespace",
+        "options": [],
+        "query": {
+          "query": "label_values(kube_pod_info{namespace=~\"tenant-.*\"}, namespace)",
+          "refId": "StandardVariableQuery"
+        },
+        "refresh": 2,
+        "regex": "",
+        "sort": 1,
+        "type": "query",
+        "allowCustomValue": true
+      },
+      {
+        "current": {
+          "selected": false,
+          "text": "8",
+          "value": "8"
+        },
+        "hide": 0,
+        "label": "Top N",
+        "name": "topn",
+        "options": [
+          {
+            "selected": false,
+            "text": "5",
+            "value": "5"
+          },
+          {
+            "selected": true,
+            "text": "8",
+            "value": "8"
+          },
+          {
+            "selected": false,
+            "text": "10",
+            "value": "10"
+          },
+          {
+            "selected": false,
+            "text": "20",
+            "value": "20"
+          }
+        ],
+        "query": "5,8,10,20",
+        "type": "custom"
+      }
+    ]
+  },
+  "time": {
+    "from": "now-6h",
+    "to": "now"
+  },
+  "timepicker": {},
+  "timezone": "",
+  "title": "Tenant Overview",
+  "uid": "cozy-tenant-overview",
+  "version": 1,
+  "weekStart": "",
+  "panels": [
+    {
+      "collapsed": false,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 0
+      },
+      "id": 100,
+      "panels": [],
+      "title": "Fleet Summary",
+      "type": "row"
+    },
+    {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "$ds_prometheus"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "blue",
+                "value": null
+              }
+            ]
+          },
+          "unit": "short"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 4,
+        "w": 4,
+        "x": 0,
+        "y": 1
+      },
+      "id": 1,
+      "options": {
+        "colorMode": "value",
+        "graphMode": "none",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "reduceOptions": {
+          "calcs": [
+            "lastNotNull"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "textMode": "auto"
+      },
+      "pluginVersion": "11.4.0",
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "$ds_prometheus"
+          },
+          "editorMode": "code",
+          "expr": "count(group by (namespace) (kube_pod_info{namespace=~\"$namespace\"}))",
+          "instant": true,
+          "refId": "A"
+        }
+      ],
+      "title": "Tenants",
+      "type": "stat"
+    },
+    {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "$ds_prometheus"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "purple",
+                "value": null
+              }
+            ]
+          },
+          "unit": "short"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 4,
+        "w": 4,
+        "x": 4,
+        "y": 1
+      },
+      "id": 2,
+      "options": {
+        "colorMode": "value",
+        "graphMode": "none",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "reduceOptions": {
+          "calcs": [
+            "lastNotNull"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "textMode": "auto"
+      },
+      "pluginVersion": "11.4.0",
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "$ds_prometheus"
+          },
+          "editorMode": "code",
+          "expr": "count(gotk_resource_info{customresource_kind=\"HelmRelease\", chart_name!~\"cozy-.*\", exported_namespace=~\"$namespace\"})",
+          "instant": true,
+          "refId": "A"
+        }
+      ],
+      "title": "Apps (HelmReleases)",
+      "type": "stat"
+    },
+    {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "$ds_prometheus"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              }
+            ]
+          },
+          "unit": "short"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 4,
+        "w": 4,
+        "x": 8,
+        "y": 1
+      },
+      "id": 3,
+      "options": {
+        "colorMode": "value",
+        "graphMode": "none",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "reduceOptions": {
+          "calcs": [
+            "lastNotNull"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "textMode": "auto"
+      },
+      "pluginVersion": "11.4.0",
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "$ds_prometheus"
+          },
+          "editorMode": "code",
+          "expr": "sum(kube_pod_status_phase{namespace=~\"$namespace\", phase=\"Running\"} == 1)",
+          "instant": true,
+          "refId": "A"
+        }
+      ],
+      "title": "Running Pods",
+      "type": "stat"
+    },
+    {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "$ds_prometheus"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "decimals": 2,
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "orange",
+                "value": null
+              }
+            ]
+          },
+          "unit": "short"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 4,
+        "w": 4,
+        "x": 12,
+        "y": 1
+      },
+      "id": 4,
+      "options": {
+        "colorMode": "value",
+        "graphMode": "area",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "reduceOptions": {
+          "calcs": [
+            "lastNotNull"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "textMode": "auto"
+      },
+      "pluginVersion": "11.4.0",
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "$ds_prometheus"
+          },
+          "editorMode": "code",
+          "expr": "sum(rate(container_cpu_usage_seconds_total{namespace=~\"$namespace\", container!=\"\"}[5m]))",
+          "instant": false,
+          "refId": "A"
+        }
+      ],
+      "title": "CPU Used (cores)",
+      "type": "stat"
+    },
+    {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "$ds_prometheus"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "red",
+                "value": null
+              }
+            ]
+          },
+          "unit": "bytes"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 4,
+        "w": 4,
+        "x": 16,
+        "y": 1
+      },
+      "id": 5,
+      "options": {
+        "colorMode": "value",
+        "graphMode": "area",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "reduceOptions": {
+          "calcs": [
+            "lastNotNull"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "textMode": "auto"
+      },
+      "pluginVersion": "11.4.0",
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "$ds_prometheus"
+          },
+          "editorMode": "code",
+          "expr": "sum(container_memory_working_set_bytes{namespace=~\"$namespace\", container!=\"\"})",
+          "instant": false,
+          "refId": "A"
+        }
+      ],
+      "title": "Memory Used",
+      "type": "stat"
+    },
+    {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "$ds_prometheus"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "yellow",
+                "value": null
+              }
+            ]
+          },
+          "unit": "bytes"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 4,
+        "w": 4,
+        "x": 20,
+        "y": 1
+      },
+      "id": 6,
+      "options": {
+        "colorMode": "value",
+        "graphMode": "none",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "reduceOptions": {
+          "calcs": [
+            "lastNotNull"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "textMode": "auto"
+      },
+      "pluginVersion": "11.4.0",
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "$ds_prometheus"
+          },
+          "editorMode": "code",
+          "expr": "sum(kube_persistentvolumeclaim_resource_requests_storage_bytes{namespace=~\"$namespace\"})",
+          "instant": true,
+          "refId": "A"
+        }
+      ],
+      "title": "Storage Requested",
+      "type": "stat"
+    },
+    {
+      "collapsed": false,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 5
+      },
+      "id": 101,
+      "panels": [],
+      "title": "Tenant Leaderboard",
+      "type": "row"
+    },
+    {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "$ds_prometheus"
+      },
+      "description": "One row per tenant. Sorted by memory used. Color bars compare tenants against each other.",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "custom": {
+            "align": "auto",
+            "cellOptions": {
+              "type": "auto"
+            },
+            "inspect": false
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              }
+            ]
+          }
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Tenant"
+            },
+            "properties": [
+              {
+                "id": "custom.width",
+                "value": 220
+              },
+              {
+                "id": "links",
+                "value": []
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "CPU used"
+            },
+            "properties": [
+              {
+                "id": "unit",
+                "value": "short"
+              },
+              {
+                "id": "decimals",
+                "value": 2
+              },
+              {
+                "id": "custom.cellOptions",
+                "value": {
+                  "type": "gauge",
+                  "mode": "gradient"
+                }
+              },
+              {
+                "id": "color",
+                "value": {
+                  "mode": "continuous-GrYlRd"
+                }
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "CPU req"
+            },
+            "properties": [
+              {
+                "id": "unit",
+                "value": "short"
+              },
+              {
+                "id": "decimals",
+                "value": 2
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Mem used"
+            },
+            "properties": [
+              {
+                "id": "unit",
+                "value": "bytes"
+              },
+              {
+                "id": "custom.cellOptions",
+                "value": {
+                  "type": "gauge",
+                  "mode": "gradient"
+                }
+              },
+              {
+                "id": "color",
+                "value": {
+                  "mode": "continuous-GrYlRd"
+                }
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Mem req"
+            },
+            "properties": [
+              {
+                "id": "unit",
+                "value": "bytes"
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Storage"
+            },
+            "properties": [
+              {
+                "id": "unit",
+                "value": "bytes"
+              },
+              {
+                "id": "custom.cellOptions",
+                "value": {
+                  "type": "gauge",
+                  "mode": "gradient"
+                }
+              },
+              {
+                "id": "color",
+                "value": {
+                  "mode": "continuous-BlPu"
+                }
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Apps"
+            },
+            "properties": [
+              {
+                "id": "custom.cellOptions",
+                "value": {
+                  "type": "color-text"
+                }
+              },
+              {
+                "id": "color",
+                "value": {
+                  "mode": "fixed",
+                  "fixedColor": "purple"
+                }
+              }
+            ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Not Ready"
+            },
+            "properties": [
+              {
+                "id": "custom.cellOptions",
+                "value": {
+                  "type": "color-background",
+                  "mode": "gradient"
+                }
+              },
+              {
+                "id": "thresholds",
+                "value": {
+                  "mode": "absolute",
+                  "steps": [
+                    {
+                      "color": "green",
+                      "value": null
+                    },
+                    {
+                      "color": "red",
+                      "value": 1
+                    }
+                  ]
+                }
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 10,
+        "w": 24,
+        "x": 0,
+        "y": 6
+      },
+      "id": 10,
+      "options": {
+        "cellHeight": "sm",
+        "footer": {
+          "countRows": false,
+          "fields": "",
+          "reducer": [
+            "sum"
+          ],
+          "show": false
+        },
+        "showHeader": true,
+        "sortBy": [
+          {
+            "desc": true,
+            "displayName": "Mem used"
+          }
+        ]
+      },
+      "pluginVersion": "11.4.0",
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "$ds_prometheus"
+          },
+          "editorMode": "code",
+          "expr": "sum by (namespace) (rate(container_cpu_usage_seconds_total{namespace=~\"$namespace\", container!=\"\"}[5m]))",
+          "format": "table",
+          "instant": true,
+          "refId": "A"
+        },
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "$ds_prometheus"
+          },
+          "editorMode": "code",
+          "expr": "sum by (namespace) (kube_pod_container_resource_requests{namespace=~\"$namespace\", resource=\"cpu\"})",
+          "format": "table",
+          "instant": true,
+          "refId": "B"
+        },
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "$ds_prometheus"
+          },
+          "editorMode": "code",
+          "expr": "sum by (namespace) (container_memory_working_set_bytes{namespace=~\"$namespace\", container!=\"\"})",
+          "format": "table",
+          "instant": true,
+          "refId": "C"
+        },
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "$ds_prometheus"
+          },
+          "editorMode": "code",
+          "expr": "sum by (namespace) (kube_pod_container_resource_requests{namespace=~\"$namespace\", resource=\"memory\"})",
+          "format": "table",
+          "instant": true,
+          "refId": "D"
+        },
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "$ds_prometheus"
+          },
+          "editorMode": "code",
+          "expr": "sum by (namespace) (kube_persistentvolumeclaim_resource_requests_storage_bytes{namespace=~\"$namespace\"})",
+          "format": "table",
+          "instant": true,
+          "refId": "E"
+        },
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "$ds_prometheus"
+          },
+          "editorMode": "code",
+          "expr": "count by (namespace) (kube_pod_status_phase{namespace=~\"$namespace\", phase=\"Running\"} == 1)",
+          "format": "table",
+          "instant": true,
+          "refId": "F"
+        },
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "$ds_prometheus"
+          },
+          "editorMode": "code",
+          "expr": "count by (namespace) (kube_persistentvolumeclaim_resource_requests_storage_bytes{namespace=~\"$namespace\"})",
+          "format": "table",
+          "instant": true,
+          "refId": "G"
+        },
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "$ds_prometheus"
+          },
+          "editorMode": "code",
+          "expr": "count by (namespace) (label_replace(gotk_resource_info{customresource_kind=\"HelmRelease\", chart_name!~\"cozy-.*\", exported_namespace=~\"$namespace\"}, \"namespace\", \"$1\", \"exported_namespace\", \"(.*)\"))",
+          "format": "table",
+          "instant": true,
+          "refId": "H"
+        },
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "$ds_prometheus"
+          },
+          "editorMode": "code",
+          "expr": "count by (namespace) (label_replace(gotk_resource_info{customresource_kind=\"HelmRelease\", ready!=\"True\", exported_namespace=~\"$namespace\"}, \"namespace\", \"$1\", \"exported_namespace\", \"(.*)\"))",
+          "format": "table",
+          "instant": true,
+          "refId": "I"
+        }
+      ],
+      "title": "Per-Tenant Resource Usage",
+      "transformations": [
+        {
+          "id": "joinByField",
+          "options": {
+            "byField": "namespace",
+            "mode": "outer"
+          }
+        },
+        {
+          "id": "organize",
+          "options": {
+            "excludeByName": {
+              "Time": true,
+              "Time 1": true,
+              "Time 2": true,
+              "Time 3": true,
+              "Time 4": true,
+              "Time 5": true,
+              "Time 6": true,
+              "Time 7": true,
+              "Time 8": true,
+              "Time 9": true
+            },
+            "indexByName": {
+              "namespace": 0,
+              "Value #A": 1,
+              "Value #B": 2,
+              "Value #C": 3,
+              "Value #D": 4,
+              "Value #E": 5,
+              "Value #G": 6,
+              "Value #F": 7,
+              "Value #H": 8,
+              "Value #I": 9
+            },
+            "renameByName": {
+              "namespace": "Tenant",
+              "Value #A": "CPU used",
+              "Value #B": "CPU req",
+              "Value #C": "Mem used",
+              "Value #D": "Mem req",
+              "Value #E": "Storage",
+              "Value #F": "Pods",
+              "Value #G": "PVCs",
+              "Value #H": "Apps",
+              "Value #I": "Not Ready"
+            }
+          }
+        }
+      ],
+      "type": "table"
+    },
+    {
+      "collapsed": false,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 16
+      },
+      "id": 102,
+      "panels": [],
+      "title": "Top Consumers",
+      "type": "row"
+    },
+    {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "$ds_prometheus"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "continuous-GrYlRd"
+          },
+          "decimals": 2,
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              }
+            ]
+          },
+          "unit": "short"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 6,
+        "x": 0,
+        "y": 17
+      },
+      "id": 20,
+      "options": {
+        "displayMode": "gradient",
+        "maxVizHeight": 300,
+        "minVizHeight": 16,
+        "minVizWidth": 8,
+        "namePlacement": "left",
+        "orientation": "horizontal",
+        "reduceOptions": {
+          "calcs": [
+            "lastNotNull"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "showUnfilled": true,
+        "valueMode": "color"
+      },
+      "pluginVersion": "11.4.0",
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "$ds_prometheus"
+          },
+          "editorMode": "code",
+          "expr": "topk($topn, sum by (namespace) (rate(container_cpu_usage_seconds_total{namespace=~\"$namespace\", container!=\"\"}[5m])))",
+          "instant": true,
+          "legendFormat": "{{namespace}}",
+          "refId": "A"
+        }
+      ],
+      "title": "Top Tenants by CPU",
+      "type": "bargauge"
+    },
+    {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "$ds_prometheus"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "continuous-GrYlRd"
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              }
+            ]
+          },
+          "unit": "bytes"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 6,
+        "x": 6,
+        "y": 17
+      },
+      "id": 21,
+      "options": {
+        "displayMode": "gradient",
+        "maxVizHeight": 300,
+        "minVizHeight": 16,
+        "minVizWidth": 8,
+        "namePlacement": "left",
+        "orientation": "horizontal",
+        "reduceOptions": {
+          "calcs": [
+            "lastNotNull"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "showUnfilled": true,
+        "valueMode": "color"
+      },
+      "pluginVersion": "11.4.0",
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "$ds_prometheus"
+          },
+          "editorMode": "code",
+          "expr": "topk($topn, sum by (namespace) (container_memory_working_set_bytes{namespace=~\"$namespace\", container!=\"\"}))",
+          "instant": true,
+          "legendFormat": "{{namespace}}",
+          "refId": "A"
+        }
+      ],
+      "title": "Top Tenants by Memory",
+      "type": "bargauge"
+    },
+    {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "$ds_prometheus"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "continuous-BlPu"
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              }
+            ]
+          },
+          "unit": "bytes"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 6,
+        "x": 12,
+        "y": 17
+      },
+      "id": 22,
+      "options": {
+        "displayMode": "gradient",
+        "maxVizHeight": 300,
+        "minVizHeight": 16,
+        "minVizWidth": 8,
+        "namePlacement": "left",
+        "orientation": "horizontal",
+        "reduceOptions": {
+          "calcs": [
+            "lastNotNull"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "showUnfilled": true,
+        "valueMode": "color"
+      },
+      "pluginVersion": "11.4.0",
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "$ds_prometheus"
+          },
+          "editorMode": "code",
+          "expr": "topk($topn, sum by (namespace) (kube_persistentvolumeclaim_resource_requests_storage_bytes{namespace=~\"$namespace\"}))",
+          "instant": true,
+          "legendFormat": "{{namespace}}",
+          "refId": "A"
+        }
+      ],
+      "title": "Top Tenants by Storage",
+      "type": "bargauge"
+    },
+    {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "$ds_prometheus"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "fixed",
+            "fixedColor": "purple"
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "purple",
+                "value": null
+              }
+            ]
+          },
+          "unit": "short"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 6,
+        "x": 18,
+        "y": 17
+      },
+      "id": 23,
+      "options": {
+        "displayMode": "gradient",
+        "maxVizHeight": 300,
+        "minVizHeight": 16,
+        "minVizWidth": 8,
+        "namePlacement": "left",
+        "orientation": "horizontal",
+        "reduceOptions": {
+          "calcs": [
+            "lastNotNull"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "showUnfilled": true,
+        "valueMode": "color"
+      },
+      "pluginVersion": "11.4.0",
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "$ds_prometheus"
+          },
+          "editorMode": "code",
+          "expr": "topk($topn, count by (namespace) (label_replace(gotk_resource_info{customresource_kind=\"HelmRelease\", chart_name!~\"cozy-.*\", exported_namespace=~\"$namespace\"}, \"namespace\", \"$1\", \"exported_namespace\", \"(.*)\")))",
+          "instant": true,
+          "legendFormat": "{{namespace}}",
+          "refId": "A"
+        }
+      ],
+      "title": "Apps per Tenant",
+      "type": "bargauge"
+    },
+    {
+      "collapsed": false,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 25
+      },
+      "id": 103,
+      "panels": [],
+      "title": "Trends",
+      "type": "row"
+    },
+    {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "$ds_prometheus"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 25,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineInterpolation": "smooth",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "never",
+            "spanNulls": true,
+            "stacking": {
+              "group": "A",
+              "mode": "normal"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              }
+            ]
+          },
+          "unit": "short"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 0,
+        "y": 26
+      },
+      "id": 30,
+      "options": {
+        "legend": {
+          "calcs": [
+            "mean",
+            "max"
+          ],
+          "displayMode": "table",
+          "placement": "right",
+          "showLegend": true
+        },
+        "tooltip": {
+          "mode": "multi",
+          "sort": "desc"
+        }
+      },
+      "pluginVersion": "11.4.0",
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "$ds_prometheus"
+          },
+          "editorMode": "code",
+          "expr": "sum by (namespace) (rate(container_cpu_usage_seconds_total{namespace=~\"$namespace\", container!=\"\"}[5m]))",
+          "legendFormat": "{{namespace}}",
+          "refId": "A"
+        }
+      ],
+      "title": "CPU Usage by Tenant",
+      "type": "timeseries"
+    },
+    {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "$ds_prometheus"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 25,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineInterpolation": "smooth",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "never",
+            "spanNulls": true,
+            "stacking": {
+              "group": "A",
+              "mode": "normal"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              }
+            ]
+          },
+          "unit": "bytes"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 12,
+        "y": 26
+      },
+      "id": 31,
+      "options": {
+        "legend": {
+          "calcs": [
+            "mean",
+            "max"
+          ],
+          "displayMode": "table",
+          "placement": "right",
+          "showLegend": true
+        },
+        "tooltip": {
+          "mode": "multi",
+          "sort": "desc"
+        }
+      },
+      "pluginVersion": "11.4.0",
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "$ds_prometheus"
+          },
+          "editorMode": "code",
+          "expr": "sum by (namespace) (container_memory_working_set_bytes{namespace=~\"$namespace\", container!=\"\"})",
+          "legendFormat": "{{namespace}}",
+          "refId": "A"
+        }
+      ],
+      "title": "Memory Usage by Tenant",
+      "type": "timeseries"
+    },
+    {
+      "collapsed": false,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 34
+      },
+      "id": 104,
+      "panels": [],
+      "title": "Health",
+      "type": "row"
+    },
+    {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "$ds_prometheus"
+      },
+      "description": "Container restart rate per tenant over the last 15m. Spikes indicate crashing workloads.",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 10,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "auto",
+            "spanNulls": true,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              }
+            ]
+          },
+          "unit": "short"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 0,
+        "y": 35
+      },
+      "id": 40,
+      "options": {
+        "legend": {
+          "calcs": [
+            "sum"
+          ],
+          "displayMode": "table",
+          "placement": "right",
+          "showLegend": true
+        },
+        "tooltip": {
+          "mode": "multi",
+          "sort": "desc"
+        }
+      },
+      "pluginVersion": "11.4.0",
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "$ds_prometheus"
+          },
+          "editorMode": "code",
+          "expr": "sum by (namespace) (rate(kube_pod_container_status_restarts_total{namespace=~\"$namespace\"}[15m]))",
+          "legendFormat": "{{namespace}}",
+          "refId": "A"
+        }
+      ],
+      "title": "Pod Restart Rate by Tenant",
+      "type": "timeseries"
+    },
+    {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "$ds_prometheus"
+      },
+      "description": "HelmReleases not in Ready=True state, by tenant. Empty = everything healthy.",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "custom": {
+            "align": "auto",
+            "cellOptions": {
+              "type": "auto"
+            },
+            "inspect": false
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 1
+              }
+            ]
+          }
+        },
+        "overrides": [
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Not Ready Apps"
+            },
+            "properties": [
+              {
+                "id": "custom.cellOptions",
+                "value": {
+                  "type": "color-background",
+                  "mode": "gradient"
+                }
+              }
+            ]
+          }
+        ]
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 12,
+        "y": 35
+      },
+      "id": 41,
+      "options": {
+        "cellHeight": "sm",
+        "footer": {
+          "countRows": false,
+          "fields": "",
+          "reducer": [
+            "sum"
+          ],
+          "show": false
+        },
+        "showHeader": true,
+        "sortBy": [
+          {
+            "desc": true,
+            "displayName": "Not Ready Apps"
+          }
+        ]
+      },
+      "pluginVersion": "11.4.0",
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "$ds_prometheus"
+          },
+          "editorMode": "code",
+          "expr": "count by (namespace) (label_replace(gotk_resource_info{customresource_kind=\"HelmRelease\", ready!=\"True\", exported_namespace=~\"$namespace\"}, \"namespace\", \"$1\", \"exported_namespace\", \"(.*)\"))",
+          "format": "table",
+          "instant": true,
+          "refId": "A"
+        }
+      ],
+      "title": "Not-Ready HelmReleases by Tenant",
+      "transformations": [
+        {
+          "id": "organize",
+          "options": {
+            "excludeByName": {
+              "Time": true
+            },
+            "indexByName": {
+              "namespace": 0,
+              "Value": 1
+            },
+            "renameByName": {
+              "namespace": "Tenant",
+              "Value": "Not Ready Apps"
+            }
+          }
+        }
+      ],
+      "type": "table"
+    }
+  ]
+}
diff --git a/dashboards/vm/virtual-machines.json b/dashboards/vm/virtual-machines.json
new file mode 100644
index 0000000000..61357feefa
--- /dev/null
+++ b/dashboards/vm/virtual-machines.json
@@ -0,0 +1,934 @@
+{
+  "uid": "vm-tenant",
+  "title": "Virtual Machines",
+  "tags": ["vm"],
+  "timezone": "browser",
+  "refresh": "30s",
+  "schemaVersion": 39,
+  "time": {
+    "from": "now-1h",
+    "to": "now"
+  },
+  "templating": {
+    "list": [
+      {
+        "name": "ds",
+        "type": "datasource",
+        "query": "prometheus",
+        "current": {}
+      },
+      {
+        "name": "namespace",
+        "type": "query",
+        "datasource": {
+          "type": "prometheus",
+          "uid": "${ds}"
+        },
+        "query": "label_values(kubevirt_vmi_memory_available_bytes, namespace)",
+        "multi": false,
+        "includeAll": false,
+        "current": {},
+        "sort": 1
+      },
+      {
+        "name": "vm",
+        "type": "query",
+        "datasource": {
+          "type": "prometheus",
+          "uid": "${ds}"
+        },
+        "query": "label_values(kubevirt_vmi_memory_available_bytes{namespace=\"$namespace\"}, name)",
+        "multi": true,
+        "includeAll": true,
+        "current": {
+          "text": "All",
+          "value": "$__all"
+        },
+        "sort": 1
+      }
+    ]
+  },
+  "panels": [
+    {
+      "id": 100,
+      "title": "",
+      "type": "row",
+      "gridPos": { "h": 1, "w": 24, "x": 0, "y": 0 },
+      "collapsed": false,
+      "panels": []
+    },
+    {
+      "id": 1,
+      "title": "Active VMs",
+      "type": "stat",
+      "gridPos": { "h": 4, "w": 4, "x": 0, "y": 1 },
+      "datasource": { "type": "prometheus", "uid": "${ds}" },
+      "targets": [
+        {
+          "expr": "count(kubevirt_vmi_memory_available_bytes{namespace=\"$namespace\", name=~\"$vm\"})",
+          "legendFormat": ""
+        }
+      ],
+      "options": { "colorMode": "value", "graphMode": "none", "textMode": "value" },
+      "fieldConfig": {
+        "defaults": {
+          "thresholds": { "steps": [{ "color": "green", "value": null }] }
+        }
+      }
+    },
+    {
+      "id": 2,
+      "title": "Total Memory",
+      "type": "stat",
+      "gridPos": { "h": 4, "w": 5, "x": 4, "y": 1 },
+      "datasource": { "type": "prometheus", "uid": "${ds}" },
+      "targets": [
+        {
+          "expr": "sum(kubevirt_vmi_memory_domain_bytes{namespace=\"$namespace\", name=~\"$vm\"})",
+          "legendFormat": ""
+        }
+      ],
+      "options": { "colorMode": "value", "graphMode": "none", "textMode": "value" },
+      "fieldConfig": {
+        "defaults": {
+          "unit": "bytes",
+          "thresholds": { "steps": [{ "color": "blue", "value": null }] }
+        }
+      }
+    },
+    {
+      "id": 3,
+      "title": "Total Memory Used",
+      "type": "stat",
+      "gridPos": { "h": 4, "w": 5, "x": 9, "y": 1 },
+      "datasource": { "type": "prometheus", "uid": "${ds}" },
+      "targets": [
+        {
+          "expr": "sum(kubevirt_vmi_memory_domain_bytes{namespace=\"$namespace\", name=~\"$vm\"} - kubevirt_vmi_memory_unused_bytes{namespace=\"$namespace\", name=~\"$vm\"})",
+          "legendFormat": ""
+        }
+      ],
+      "options": { "colorMode": "value", "graphMode": "none", "textMode": "value" },
+      "fieldConfig": {
+        "defaults": {
+          "unit": "bytes",
+          "thresholds": { "steps": [{ "color": "orange", "value": null }] }
+        }
+      }
+    },
+    {
+      "id": 4,
+      "title": "Average CPU (cores)",
+      "type": "stat",
+      "gridPos": { "h": 4, "w": 5, "x": 14, "y": 1 },
+      "datasource": { "type": "prometheus", "uid": "${ds}" },
+      "targets": [
+        {
+          "expr": "avg(rate(kubevirt_vmi_cpu_usage_seconds_total{namespace=\"$namespace\", name=~\"$vm\"}[$__rate_interval]))",
+          "legendFormat": ""
+        }
+      ],
+      "options": { "colorMode": "value", "graphMode": "area", "textMode": "value" },
+      "fieldConfig": {
+        "defaults": {
+          "unit": "short",
+          "decimals": 2,
+          "thresholds": {
+            "steps": [
+              { "color": "green", "value": null }
+            ]
+          }
+        }
+      }
+    },
+    {
+      "id": 5,
+      "title": "Total Network",
+      "type": "stat",
+      "gridPos": { "h": 4, "w": 5, "x": 19, "y": 1 },
+      "datasource": { "type": "prometheus", "uid": "${ds}" },
+      "targets": [
+        {
+          "expr": "sum(rate(kubevirt_vmi_network_traffic_bytes_total{namespace=\"$namespace\", name=~\"$vm\"}[$__rate_interval]))",
+          "legendFormat": ""
+        }
+      ],
+      "options": { "colorMode": "value", "graphMode": "area", "textMode": "value" },
+      "fieldConfig": {
+        "defaults": {
+          "unit": "Bps",
+          "thresholds": { "steps": [{ "color": "purple", "value": null }] }
+        }
+      }
+    },
+    {
+      "id": 50,
+      "title": "VM Overview",
+      "type": "table",
+      "gridPos": { "h": 9, "w": 24, "x": 0, "y": 5 },
+      "datasource": { "type": "prometheus", "uid": "${ds}" },
+      "targets": [
+        {
+          "expr": "rate(kubevirt_vmi_cpu_usage_seconds_total{namespace=\"$namespace\", name=~\"$vm\"}[$__rate_interval])",
+          "legendFormat": "{{ name }}",
+          "refId": "cpu",
+          "format": "table",
+          "instant": true
+        },
+        {
+          "expr": "kubevirt_vmi_memory_domain_bytes{namespace=\"$namespace\", name=~\"$vm\"}",
+          "legendFormat": "{{ name }}",
+          "refId": "mem_total",
+          "format": "table",
+          "instant": true
+        },
+        {
+          "expr": "1 - (kubevirt_vmi_memory_unused_bytes{namespace=\"$namespace\", name=~\"$vm\"} / kubevirt_vmi_memory_domain_bytes{namespace=\"$namespace\", name=~\"$vm\"})",
+          "legendFormat": "{{ name }}",
+          "refId": "mem_pct",
+          "format": "table",
+          "instant": true
+        },
+        {
+          "expr": "rate(kubevirt_vmi_network_receive_bytes_total{namespace=\"$namespace\", name=~\"$vm\"}[$__rate_interval])",
+          "legendFormat": "{{ name }}",
+          "refId": "net_rx",
+          "format": "table",
+          "instant": true
+        },
+        {
+          "expr": "rate(kubevirt_vmi_network_transmit_bytes_total{namespace=\"$namespace\", name=~\"$vm\"}[$__rate_interval])",
+          "legendFormat": "{{ name }}",
+          "refId": "net_tx",
+          "format": "table",
+          "instant": true
+        },
+        {
+          "expr": "rate(kubevirt_vmi_storage_iops_read_total{namespace=\"$namespace\", name=~\"$vm\", drive!=\"cloudinitdisk\"}[$__rate_interval])",
+          "legendFormat": "{{ name }}",
+          "refId": "iops_r",
+          "format": "table",
+          "instant": true
+        },
+        {
+          "expr": "rate(kubevirt_vmi_storage_iops_write_total{namespace=\"$namespace\", name=~\"$vm\", drive!=\"cloudinitdisk\"}[$__rate_interval])",
+          "legendFormat": "{{ name }}",
+          "refId": "iops_w",
+          "format": "table",
+          "instant": true
+        },
+        {
+          "expr": "kubevirt_vmi_filesystem_used_bytes{namespace=\"$namespace\", name=~\"$vm\", mount_point=\"/\", file_system_type=~\"ext4|xfs|btrfs\"} / kubevirt_vmi_filesystem_capacity_bytes{namespace=\"$namespace\", name=~\"$vm\", mount_point=\"/\", file_system_type=~\"ext4|xfs|btrfs\"}",
+          "legendFormat": "{{ name }}",
+          "refId": "disk_pct",
+          "format": "table",
+          "instant": true
+        }
+      ],
+      "transformations": [
+        { "id": "merge", "options": {} },
+        {
+          "id": "organize",
+          "options": {
+            "excludeByName": {
+              "Time": true,
+              "cluster": true,
+              "disk_name": true,
+              "drive": true,
+              "file_system_type": true,
+              "interface": true,
+              "job": true,
+              "kubernetes_vmi_label_app_kubernetes_io_instance": true,
+              "kubernetes_vmi_label_app_kubernetes_io_name": true,
+              "mount_point": true,
+              "namespace": true,
+              "prometheus": true,
+              "tenant": true
+            },
+            "renameByName": {
+              "name": "VM",
+              "Value #cpu": "CPU",
+              "Value #mem_total": "Total RAM",
+              "Value #mem_pct": "RAM %",
+              "Value #disk_pct": "Disk %",
+              "Value #net_rx": "Net RX",
+              "Value #net_tx": "Net TX",
+              "Value #iops_r": "IOPS Read",
+              "Value #iops_w": "IOPS Write"
+            },
+            "indexByName": {
+              "VM": 0,
+              "CPU": 1,
+              "Total RAM": 2,
+              "RAM %": 3,
+              "Disk %": 4,
+              "Net RX": 5,
+              "Net TX": 6,
+              "IOPS Read": 7,
+              "IOPS Write": 8
+            }
+          }
+        }
+      ],
+      "fieldConfig": {
+        "overrides": [
+          {
+            "matcher": { "id": "byName", "options": "CPU" },
+            "properties": [
+              { "id": "unit", "value": "short" },
+              { "id": "decimals", "value": 2 },
+              {
+                "id": "thresholds",
+                "value": {
+                  "mode": "absolute",
+                  "steps": [
+                    { "color": "green", "value": null }
+                  ]
+                }
+              },
+              { "id": "custom.displayMode", "value": "color-background-solid" }
+            ]
+          },
+          {
+            "matcher": { "id": "byName", "options": "Total RAM" },
+            "properties": [
+              { "id": "unit", "value": "bytes" },
+              { "id": "decimals", "value": 0 }
+            ]
+          },
+          {
+            "matcher": { "id": "byName", "options": "RAM %" },
+            "properties": [
+              { "id": "unit", "value": "percentunit" },
+              { "id": "decimals", "value": 0 },
+              {
+                "id": "thresholds",
+                "value": {
+                  "mode": "absolute",
+                  "steps": [
+                    { "color": "green", "value": null },
+                    { "color": "yellow", "value": 0.7 },
+                    { "color": "red", "value": 0.9 }
+                  ]
+                }
+              },
+              { "id": "custom.displayMode", "value": "color-background-solid" }
+            ]
+          },
+          {
+            "matcher": { "id": "byName", "options": "Disk %" },
+            "properties": [
+              { "id": "unit", "value": "percentunit" },
+              { "id": "decimals", "value": 0 },
+              {
+                "id": "thresholds",
+                "value": {
+                  "mode": "absolute",
+                  "steps": [
+                    { "color": "green", "value": null },
+                    { "color": "yellow", "value": 0.7 },
+                    { "color": "orange", "value": 0.85 },
+                    { "color": "red", "value": 0.95 }
+                  ]
+                }
+              },
+              { "id": "custom.displayMode", "value": "color-background-solid" }
+            ]
+          },
+          {
+            "matcher": { "id": "byName", "options": "Net RX" },
+            "properties": [{ "id": "unit", "value": "Bps" }]
+          },
+          {
+            "matcher": { "id": "byName", "options": "Net TX" },
+            "properties": [{ "id": "unit", "value": "Bps" }]
+          },
+          {
+            "matcher": { "id": "byName", "options": "IOPS Read" },
+            "properties": [
+              { "id": "unit", "value": "iops" },
+              { "id": "decimals", "value": 0 }
+            ]
+          },
+          {
+            "matcher": { "id": "byName", "options": "IOPS Write" },
+            "properties": [
+              { "id": "unit", "value": "iops" },
+              { "id": "decimals", "value": 0 }
+            ]
+          }
+        ]
+      }
+    },
+    {
+      "id": 101,
+      "title": "CPU",
+      "type": "row",
+      "gridPos": { "h": 1, "w": 24, "x": 0, "y": 14 },
+      "collapsed": false
+    },
+    {
+      "id": 10,
+      "title": "CPU per VM (cores)",
+      "type": "timeseries",
+      "gridPos": { "h": 8, "w": 12, "x": 0, "y": 15 },
+      "datasource": { "type": "prometheus", "uid": "${ds}" },
+      "targets": [
+        {
+          "expr": "rate(kubevirt_vmi_cpu_usage_seconds_total{namespace=\"$namespace\", name=~\"$vm\"}[$__rate_interval])",
+          "legendFormat": "{{ name }}"
+        }
+      ],
+      "fieldConfig": {
+        "defaults": {
+          "unit": "short",
+          "custom": { "fillOpacity": 10, "lineWidth": 1, "showPoints": "never" }
+        }
+      }
+    },
+    {
+      "id": 11,
+      "title": "CPU User / System (cores)",
+      "type": "timeseries",
+      "gridPos": { "h": 8, "w": 12, "x": 12, "y": 15 },
+      "datasource": { "type": "prometheus", "uid": "${ds}" },
+      "targets": [
+        {
+          "expr": "rate(kubevirt_vmi_cpu_user_usage_seconds_total{namespace=\"$namespace\", name=~\"$vm\"}[$__rate_interval])",
+          "legendFormat": "{{ name }} - user"
+        },
+        {
+          "expr": "rate(kubevirt_vmi_cpu_system_usage_seconds_total{namespace=\"$namespace\", name=~\"$vm\"}[$__rate_interval])",
+          "legendFormat": "{{ name }} - system"
+        }
+      ],
+      "fieldConfig": {
+        "defaults": {
+          "unit": "short",
+          "custom": { "fillOpacity": 10, "lineWidth": 1, "showPoints": "never" }
+        }
+      }
+    },
+    {
+      "id": 12,
+      "title": "vCPU Wait (Saturation)",
+      "description": "Time spent by the vCPU waiting for scheduling. A high value indicates CPU contention on the host.",
+      "type": "timeseries",
+      "gridPos": { "h": 8, "w": 12, "x": 0, "y": 23 },
+      "datasource": { "type": "prometheus", "uid": "${ds}" },
+      "targets": [
+        {
+          "expr": "rate(kubevirt_vmi_vcpu_wait_seconds_total{namespace=\"$namespace\", name=~\"$vm\"}[$__rate_interval])",
+          "legendFormat": "{{ name }}"
+        }
+      ],
+      "fieldConfig": {
+        "defaults": {
+          "unit": "short",
+          "custom": { "fillOpacity": 10, "lineWidth": 1, "showPoints": "never" }
+        }
+      }
+    },
+    {
+      "id": 13,
+      "title": "vCPU Delay (Steal Time)",
+      "description": "Time during which the vCPU was ready but could not execute. Equivalent to steal time.",
+      "type": "timeseries",
+      "gridPos": { "h": 8, "w": 12, "x": 12, "y": 23 },
+      "datasource": { "type": "prometheus", "uid": "${ds}" },
+      "targets": [
+        {
+          "expr": "rate(kubevirt_vmi_vcpu_delay_seconds_total{namespace=\"$namespace\", name=~\"$vm\"}[$__rate_interval])",
+          "legendFormat": "{{ name }}"
+        }
+      ],
+      "fieldConfig": {
+        "defaults": {
+          "unit": "short",
+          "custom": { "fillOpacity": 10, "lineWidth": 1, "showPoints": "never" }
+        }
+      }
+    },
+    {
+      "id": 102,
+      "title": "Memory",
+      "type": "row",
+      "gridPos": { "h": 1, "w": 24, "x": 0, "y": 31 },
+      "collapsed": false
+    },
+    {
+      "id": 20,
+      "title": "Memory Used per VM",
+      "type": "timeseries",
+      "gridPos": { "h": 8, "w": 12, "x": 0, "y": 32 },
+      "datasource": { "type": "prometheus", "uid": "${ds}" },
+      "targets": [
+        {
+          "expr": "kubevirt_vmi_memory_domain_bytes{namespace=\"$namespace\", name=~\"$vm\"} - kubevirt_vmi_memory_unused_bytes{namespace=\"$namespace\", name=~\"$vm\"}",
+          "legendFormat": "{{ name }} - used"
+        },
+        {
+          "expr": "kubevirt_vmi_memory_domain_bytes{namespace=\"$namespace\", name=~\"$vm\"}",
+          "legendFormat": "{{ name }} - total"
+        }
+      ],
+      "fieldConfig": {
+        "defaults": {
+          "unit": "bytes",
+          "custom": { "fillOpacity": 5, "lineWidth": 1, "showPoints": "never" }
+        }
+      }
+    },
+    {
+      "id": 21,
+      "title": "Memory % Used",
+      "type": "timeseries",
+      "gridPos": { "h": 8, "w": 12, "x": 12, "y": 32 },
+      "datasource": { "type": "prometheus", "uid": "${ds}" },
+      "targets": [
+        {
+          "expr": "1 - (kubevirt_vmi_memory_unused_bytes{namespace=\"$namespace\", name=~\"$vm\"} / kubevirt_vmi_memory_domain_bytes{namespace=\"$namespace\", name=~\"$vm\"})",
+          "legendFormat": "{{ name }}"
+        }
+      ],
+      "fieldConfig": {
+        "defaults": {
+          "unit": "percentunit",
+          "min": 0,
+          "max": 1,
+          "custom": { "fillOpacity": 10, "lineWidth": 1, "showPoints": "never" },
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              { "color": "green", "value": null },
+              { "color": "yellow", "value": 0.7 },
+              { "color": "red", "value": 0.9 }
+            ]
+          },
+          "color": { "mode": "palette-classic" }
+        }
+      }
+    },
+    {
+      "id": 22,
+      "title": "Swap I/O",
+      "description": "Swap activity. Swap usage indicates memory pressure inside the VM.",
+      "type": "timeseries",
+      "gridPos": { "h": 8, "w": 12, "x": 0, "y": 40 },
+      "datasource": { "type": "prometheus", "uid": "${ds}" },
+      "targets": [
+        {
+          "expr": "rate(kubevirt_vmi_memory_swap_in_traffic_bytes{namespace=\"$namespace\", name=~\"$vm\"}[$__rate_interval])",
+          "legendFormat": "{{ name }} - swap in"
+        },
+        {
+          "expr": "rate(kubevirt_vmi_memory_swap_out_traffic_bytes{namespace=\"$namespace\", name=~\"$vm\"}[$__rate_interval])",
+          "legendFormat": "{{ name }} - swap out"
+        }
+      ],
+      "fieldConfig": {
+        "defaults": {
+          "unit": "Bps",
+          "custom": { "fillOpacity": 10, "lineWidth": 1, "showPoints": "never" }
+        }
+      }
+    },
+    {
+      "id": 23,
+      "title": "Page Faults",
+      "description": "Major page faults indicate memory pressure (data read from disk).",
+      "type": "timeseries",
+      "gridPos": { "h": 8, "w": 12, "x": 12, "y": 40 },
+      "datasource": { "type": "prometheus", "uid": "${ds}" },
+      "targets": [
+        {
+          "expr": "rate(kubevirt_vmi_memory_pgmajfault_total{namespace=\"$namespace\", name=~\"$vm\"}[$__rate_interval])",
+          "legendFormat": "{{ name }} - major"
+        },
+        {
+          "expr": "rate(kubevirt_vmi_memory_pgminfault_total{namespace=\"$namespace\", name=~\"$vm\"}[$__rate_interval])",
+          "legendFormat": "{{ name }} - minor"
+        }
+      ],
+      "fieldConfig": {
+        "defaults": {
+          "unit": "ops",
+          "custom": { "fillOpacity": 10, "lineWidth": 1, "showPoints": "never" }
+        }
+      }
+    },
+    {
+      "id": 103,
+      "title": "Network",
+      "type": "row",
+      "gridPos": { "h": 1, "w": 24, "x": 0, "y": 48 },
+      "collapsed": false
+    },
+    {
+      "id": 30,
+      "title": "Inbound Throughput (RX)",
+      "type": "timeseries",
+      "gridPos": { "h": 8, "w": 12, "x": 0, "y": 49 },
+      "datasource": { "type": "prometheus", "uid": "${ds}" },
+      "targets": [
+        {
+          "expr": "rate(kubevirt_vmi_network_receive_bytes_total{namespace=\"$namespace\", name=~\"$vm\"}[$__rate_interval])",
+          "legendFormat": "{{ name }} - {{ interface }}"
+        }
+      ],
+      "fieldConfig": {
+        "defaults": {
+          "unit": "Bps",
+          "custom": { "fillOpacity": 10, "lineWidth": 1, "showPoints": "never" }
+        }
+      }
+    },
+    {
+      "id": 31,
+      "title": "Outbound Throughput (TX)",
+      "type": "timeseries",
+      "gridPos": { "h": 8, "w": 12, "x": 12, "y": 49 },
+      "datasource": { "type": "prometheus", "uid": "${ds}" },
+      "targets": [
+        {
+          "expr": "rate(kubevirt_vmi_network_transmit_bytes_total{namespace=\"$namespace\", name=~\"$vm\"}[$__rate_interval])",
+          "legendFormat": "{{ name }} - {{ interface }}"
+        }
+      ],
+      "fieldConfig": {
+        "defaults": {
+          "unit": "Bps",
+          "custom": { "fillOpacity": 10, "lineWidth": 1, "showPoints": "never" }
+        }
+      }
+    },
+    {
+      "id": 32,
+      "title": "Packets/s",
+      "type": "timeseries",
+      "gridPos": { "h": 8, "w": 12, "x": 0, "y": 57 },
+      "datasource": { "type": "prometheus", "uid": "${ds}" },
+      "targets": [
+        {
+          "expr": "rate(kubevirt_vmi_network_receive_packets_total{namespace=\"$namespace\", name=~\"$vm\"}[$__rate_interval])",
+          "legendFormat": "{{ name }} - {{ interface }} RX"
+        },
+        {
+          "expr": "rate(kubevirt_vmi_network_transmit_packets_total{namespace=\"$namespace\", name=~\"$vm\"}[$__rate_interval])",
+          "legendFormat": "{{ name }} - {{ interface }} TX"
+        }
+      ],
+      "fieldConfig": {
+        "defaults": {
+          "unit": "pps",
+          "custom": { "fillOpacity": 10, "lineWidth": 1, "showPoints": "never" }
+        }
+      }
+    },
+    {
+      "id": 33,
+      "title": "Errors & Drops",
+      "type": "timeseries",
+      "gridPos": { "h": 8, "w": 12, "x": 12, "y": 57 },
+      "datasource": { "type": "prometheus", "uid": "${ds}" },
+      "targets": [
+        {
+          "expr": "rate(kubevirt_vmi_network_receive_errors_total{namespace=\"$namespace\", name=~\"$vm\"}[$__rate_interval])",
+          "legendFormat": "{{ name }} - {{ interface }} RX errors"
+        },
+        {
+          "expr": "rate(kubevirt_vmi_network_transmit_errors_total{namespace=\"$namespace\", name=~\"$vm\"}[$__rate_interval])",
+          "legendFormat": "{{ name }} - {{ interface }} TX errors"
+        },
+        {
+          "expr": "rate(kubevirt_vmi_network_receive_packets_dropped_total{namespace=\"$namespace\", name=~\"$vm\"}[$__rate_interval])",
+          "legendFormat": "{{ name }} - {{ interface }} RX dropped"
+        },
+        {
+          "expr": "rate(kubevirt_vmi_network_transmit_packets_dropped_total{namespace=\"$namespace\", name=~\"$vm\"}[$__rate_interval])",
+          "legendFormat": "{{ name }} - {{ interface }} TX dropped"
+        }
+      ],
+      "fieldConfig": {
+        "defaults": {
+          "unit": "pps",
+          "custom": { "fillOpacity": 10, "lineWidth": 1, "showPoints": "never" }
+        }
+      }
+    },
+    {
+      "id": 105,
+      "title": "Filesystem",
+      "type": "row",
+      "gridPos": { "h": 1, "w": 24, "x": 0, "y": 65 },
+      "collapsed": false
+    },
+    {
+      "id": 60,
+      "title": "Disk Usage (/) per VM",
+      "type": "gauge",
+      "gridPos": { "h": 8, "w": 12, "x": 0, "y": 66 },
+      "datasource": { "type": "prometheus", "uid": "${ds}" },
+      "targets": [
+        {
+          "expr": "kubevirt_vmi_filesystem_used_bytes{namespace=\"$namespace\", name=~\"$vm\", mount_point=\"/\", file_system_type=~\"ext4|xfs|btrfs\"} / kubevirt_vmi_filesystem_capacity_bytes{namespace=\"$namespace\", name=~\"$vm\", mount_point=\"/\", file_system_type=~\"ext4|xfs|btrfs\"}",
+          "legendFormat": "{{ name }}"
+        }
+      ],
+      "options": {
+        "orientation": "auto",
+        "showThresholdLabels": false,
+        "showThresholdMarkers": true
+      },
+      "fieldConfig": {
+        "defaults": {
+          "unit": "percentunit",
+          "min": 0,
+          "max": 1,
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              { "color": "green", "value": null },
+              { "color": "yellow", "value": 0.7 },
+              { "color": "orange", "value": 0.85 },
+              { "color": "red", "value": 0.95 }
+            ]
+          }
+        }
+      }
+    },
+    {
+      "id": 61,
+      "title": "Used vs Capacity (/)",
+      "type": "bargauge",
+      "gridPos": { "h": 8, "w": 12, "x": 12, "y": 66 },
+      "datasource": { "type": "prometheus", "uid": "${ds}" },
+      "targets": [
+        {
+          "expr": "kubevirt_vmi_filesystem_used_bytes{namespace=\"$namespace\", name=~\"$vm\", mount_point=\"/\", file_system_type=~\"ext4|xfs|btrfs\"}",
+          "legendFormat": "{{ name }} - used"
+        },
+        {
+          "expr": "kubevirt_vmi_filesystem_capacity_bytes{namespace=\"$namespace\", name=~\"$vm\", mount_point=\"/\", file_system_type=~\"ext4|xfs|btrfs\"} - kubevirt_vmi_filesystem_used_bytes{namespace=\"$namespace\", name=~\"$vm\", mount_point=\"/\", file_system_type=~\"ext4|xfs|btrfs\"}",
+          "legendFormat": "{{ name }} - free"
+        }
+      ],
+      "options": {
+        "displayMode": "lcd",
+        "orientation": "horizontal",
+        "showUnfilled": true
+      },
+      "fieldConfig": {
+        "defaults": {
+          "unit": "bytes",
+          "thresholds": { "steps": [{ "color": "green", "value": null }] }
+        },
+        "overrides": [
+          {
+            "matcher": { "id": "byRegexp", "options": ".*free" },
+            "properties": [
+              { "id": "color", "value": { "fixedColor": "semi-dark-green", "mode": "fixed" } }
+            ]
+          },
+          {
+            "matcher": { "id": "byRegexp", "options": ".*used" },
+            "properties": [
+              { "id": "color", "value": { "fixedColor": "semi-dark-orange", "mode": "fixed" } }
+            ]
+          }
+        ]
+      }
+    },
+    {
+      "id": 62,
+      "title": "Disk Usage Over Time (/)",
+      "type": "timeseries",
+      "gridPos": { "h": 8, "w": 24, "x": 0, "y": 74 },
+      "datasource": { "type": "prometheus", "uid": "${ds}" },
+      "targets": [
+        {
+          "expr": "kubevirt_vmi_filesystem_used_bytes{namespace=\"$namespace\", name=~\"$vm\", mount_point=\"/\", file_system_type=~\"ext4|xfs|btrfs\"} / kubevirt_vmi_filesystem_capacity_bytes{namespace=\"$namespace\", name=~\"$vm\", mount_point=\"/\", file_system_type=~\"ext4|xfs|btrfs\"}",
+          "legendFormat": "{{ name }}"
+        }
+      ],
+      "fieldConfig": {
+        "defaults": {
+          "unit": "percentunit",
+          "min": 0,
+          "max": 1,
+          "custom": { "fillOpacity": 10, "lineWidth": 1, "showPoints": "never" },
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              { "color": "green", "value": null },
+              { "color": "yellow", "value": 0.7 },
+              { "color": "orange", "value": 0.85 },
+              { "color": "red", "value": 0.95 }
+            ]
+          },
+          "color": { "mode": "palette-classic" }
+        }
+      }
+    },
+    {
+      "id": 104,
+      "title": "Disk I/O",
+      "type": "row",
+      "gridPos": { "h": 1, "w": 24, "x": 0, "y": 82 },
+      "collapsed": false
+    },
+    {
+      "id": 40,
+      "title": "IOPS Read",
+      "type": "timeseries",
+      "gridPos": { "h": 8, "w": 12, "x": 0, "y": 83 },
+      "datasource": { "type": "prometheus", "uid": "${ds}" },
+      "targets": [
+        {
+          "expr": "rate(kubevirt_vmi_storage_iops_read_total{namespace=\"$namespace\", name=~\"$vm\", drive!=\"cloudinitdisk\"}[$__rate_interval])",
+          "legendFormat": "{{ name }} ({{ drive }})"
+        }
+      ],
+      "fieldConfig": {
+        "defaults": {
+          "unit": "iops",
+          "custom": { "fillOpacity": 10, "lineWidth": 1, "showPoints": "never" }
+        }
+      }
+    },
+    {
+      "id": 41,
+      "title": "IOPS Write",
+      "type": "timeseries",
+      "gridPos": { "h": 8, "w": 12, "x": 12, "y": 83 },
+      "datasource": { "type": "prometheus", "uid": "${ds}" },
+      "targets": [
+        {
+          "expr": "rate(kubevirt_vmi_storage_iops_write_total{namespace=\"$namespace\", name=~\"$vm\", drive!=\"cloudinitdisk\"}[$__rate_interval])",
+          "legendFormat": "{{ name }} ({{ drive }})"
+        }
+      ],
+      "fieldConfig": {
+        "defaults": {
+          "unit": "iops",
+          "custom": { "fillOpacity": 10, "lineWidth": 1, "showPoints": "never" }
+        }
+      }
+    },
+    {
+      "id": 42,
+      "title": "Read Throughput",
+      "type": "timeseries",
+      "gridPos": { "h": 8, "w": 12, "x": 0, "y": 91 },
+      "datasource": { "type": "prometheus", "uid": "${ds}" },
+      "targets": [
+        {
+          "expr": "rate(kubevirt_vmi_storage_read_traffic_bytes_total{namespace=\"$namespace\", name=~\"$vm\", drive!=\"cloudinitdisk\"}[$__rate_interval])",
+          "legendFormat": "{{ name }} ({{ drive }})"
+        }
+      ],
+      "fieldConfig": {
+        "defaults": {
+          "unit": "Bps",
+          "custom": { "fillOpacity": 10, "lineWidth": 1, "showPoints": "never" }
+        }
+      }
+    },
+    {
+      "id": 43,
+      "title": "Write Throughput",
+      "type": "timeseries",
+      "gridPos": { "h": 8, "w": 12, "x": 12, "y": 91 },
+      "datasource": { "type": "prometheus", "uid": "${ds}" },
+      "targets": [
+        {
+          "expr": "rate(kubevirt_vmi_storage_write_traffic_bytes_total{namespace=\"$namespace\", name=~\"$vm\", drive!=\"cloudinitdisk\"}[$__rate_interval])",
+          "legendFormat": "{{ name }} ({{ drive }})"
+        }
+      ],
+      "fieldConfig": {
+        "defaults": {
+          "unit": "Bps",
+          "custom": { "fillOpacity": 10, "lineWidth": 1, "showPoints": "never" }
+        }
+      }
+    },
+    {
+      "id": 44,
+      "title": "Read Latency",
+      "type": "timeseries",
+      "gridPos": { "h": 8, "w": 12, "x": 0, "y": 99 },
+      "datasource": { "type": "prometheus", "uid": "${ds}" },
+      "targets": [
+        {
+          "expr": "rate(kubevirt_vmi_storage_read_times_seconds_total{namespace=\"$namespace\", name=~\"$vm\", drive!=\"cloudinitdisk\"}[$__rate_interval]) / clamp_min(rate(kubevirt_vmi_storage_iops_read_total{namespace=\"$namespace\", name=~\"$vm\", drive!=\"cloudinitdisk\"}[$__rate_interval]), 0.001)",
+          "legendFormat": "{{ name }} ({{ drive }})"
+        }
+      ],
+      "fieldConfig": {
+        "defaults": {
+          "unit": "s",
+          "custom": { "fillOpacity": 10, "lineWidth": 1, "showPoints": "never" }
+        }
+      }
+    },
+    {
+      "id": 45,
+      "title": "Write Latency",
+      "type": "timeseries",
+      "gridPos": { "h": 8, "w": 12, "x": 12, "y": 99 },
+      "datasource": { "type": "prometheus", "uid": "${ds}" },
+      "targets": [
+        {
+          "expr": "rate(kubevirt_vmi_storage_write_times_seconds_total{namespace=\"$namespace\", name=~\"$vm\", drive!=\"cloudinitdisk\"}[$__rate_interval]) / clamp_min(rate(kubevirt_vmi_storage_iops_write_total{namespace=\"$namespace\", name=~\"$vm\", drive!=\"cloudinitdisk\"}[$__rate_interval]), 0.001)",
+          "legendFormat": "{{ name }} ({{ drive }})"
+        }
+      ],
+      "fieldConfig": {
+        "defaults": {
+          "unit": "s",
+          "custom": { "fillOpacity": 10, "lineWidth": 1, "showPoints": "never" }
+        }
+      }
+    },
+    {
+      "id": 46,
+      "title": "Flush Latency",
+      "description": "Average time of flush operations (disk sync). Spikes indicate storage saturation.",
+      "type": "timeseries",
+      "gridPos": { "h": 8, "w": 12, "x": 0, "y": 107 },
+      "datasource": { "type": "prometheus", "uid": "${ds}" },
+      "targets": [
+        {
+          "expr": "rate(kubevirt_vmi_storage_flush_times_seconds_total{namespace=\"$namespace\", name=~\"$vm\", drive!=\"cloudinitdisk\"}[$__rate_interval]) / clamp_min(rate(kubevirt_vmi_storage_flush_requests_total{namespace=\"$namespace\", name=~\"$vm\", drive!=\"cloudinitdisk\"}[$__rate_interval]), 0.001)",
+          "legendFormat": "{{ name }} ({{ drive }})"
+        }
+      ],
+      "fieldConfig": {
+        "defaults": {
+          "unit": "s",
+          "custom": { "fillOpacity": 10, "lineWidth": 1, "showPoints": "never" }
+        }
+      }
+    },
+    {
+      "id": 47,
+      "title": "Flush Ops/s",
+      "type": "timeseries",
+      "gridPos": { "h": 8, "w": 12, "x": 12, "y": 107 },
+      "datasource": { "type": "prometheus", "uid": "${ds}" },
+      "targets": [
+        {
+          "expr": "rate(kubevirt_vmi_storage_flush_requests_total{namespace=\"$namespace\", name=~\"$vm\", drive!=\"cloudinitdisk\"}[$__rate_interval])",
+          "legendFormat": "{{ name }} ({{ drive }})"
+        }
+      ],
+      "fieldConfig": {
+        "defaults": {
+          "unit": "ops",
+          "custom": { "fillOpacity": 10, "lineWidth": 1, "showPoints": "never" }
+        }
+      }
+    }
+  ]
+}
diff --git a/docs/agents/changelog.md b/docs/agents/changelog.md
index def83c6fcd..2ed572c6ef 100644
--- a/docs/agents/changelog.md
+++ b/docs/agents/changelog.md
@@ -30,7 +30,7 @@ When the user asks to generate a changelog, follow these steps in the specified
 
 **CHECKLIST - All actions that must be completed:**
 - [ ] Step 1: Update information from remote (git fetch)
-- [ ] Step 2: Check current branch (must be main)
+- [ ] Step 2: Check the working tree is at one of the valid starting points listed in Step 2
 - [ ] Step 3: Determine release type and previous version (minor vs patch release)
 - [ ] Step 4: Determine versions and analyze existing changelogs
 - [ ] Step 5: Get the list of commits for the release period
@@ -52,20 +52,25 @@ git fetch --tags --force --prune
 
 This is necessary to get up-to-date information about tags and commits from the remote repository.
 
-### 2. Checking current branch
+### 2. Checking the working tree
 
-Verify the working tree is at a sensible starting point. Two configurations are valid:
+Verify the working tree is at a sensible starting point. Three configurations are valid:
 
 - **Interactive use:** the working tree is on the `main` branch.
   ```bash
   git branch --show-current   # should print "main"
   ```
-- **CI use:** HEAD is detached at the release tag being generated (this is how `.github/workflows/tags.yaml` runs).
+- **CI use (backstop):** HEAD is detached at the release tag being generated (this is how `.github/workflows/tags.yaml` runs).
   ```bash
   git describe --exact-match HEAD   # should print e.g. "v1.3.1"
   ```
+- **CI use (promotion):** HEAD is detached at the **release-candidate** tag being promoted, while the changelog you are asked to write is for the *stable* version that candidate becomes (this is how `.github/workflows/promote-rc.yaml` runs, and it is the normal path — the stable tag does not exist yet at that point).
+  ```bash
+  git describe --exact-match HEAD   # should print e.g. "v1.3.1-rc.2"
+  ```
+  In this configuration the caller tells you both versions. Use the rc tag as the upper bound of every commit range, and write the *stable* version into the filename, the header, the "Full Changelog" link, and the leading release-link comment. Never write the rc tag into the changelog's own contents.
 
-If neither holds, stop — the caller invoked you from the wrong place. Do **not** switch branches yourself; the "Scope and boundaries" section forbids it.
+If none holds, stop — the caller invoked you from the wrong place. Do **not** switch branches yourself; the "Scope and boundaries" section forbids it.
 
 ### 3. Determining release type and previous version
 
diff --git a/docs/agents/contributing.md b/docs/agents/contributing.md
index 88b062ea5e..412871e83a 100644
--- a/docs/agents/contributing.md
+++ b/docs/agents/contributing.md
@@ -6,9 +6,11 @@ Project-side conventions for commits, branches, and pull requests in Cozystack.
 
 - [ ] Commit message follows Conventional Commits format
 - [ ] Commit is signed off with `--signoff`
+- [ ] Commit carries exactly one `Assisted-by: LLM` trailer if an AI agent assisted, and no model or vendor name
 - [ ] Branch is rebased on `upstream/main` (no extra commits)
 - [ ] PR body includes description and release note
 - [ ] Ran `make generate` in every package whose `values.yaml`, `values.schema.json`, `Chart.yaml`, or `README.md` was touched, and committed the regenerated files
+- [ ] Walked the [Downstream Repositories](#downstream-repositories) trigger map against the diff, and linked a follow-up (a PR, or an issue when the PR is out of scope) in every repository the change reaches
 
 ## Regenerate Artifacts Before Committing
 
@@ -33,6 +35,15 @@ To locate packages a WIP branch likely needs to be regenerated:
 git diff --name-only | xargs -n1 dirname | sort -u | grep ^packages/
 ```
 
+## Verify Before Considering Done
+
+After every change, verify the relevant artifacts before opening the PR:
+
+- **Helm templates changed:** `make show` in the package directory renders cleanly.
+- **Go code changed:** `make generate && make manifests` at the repo root, then commit the regenerated files.
+- **`values.yaml` annotations changed:** `make generate` in the package; review the `values.schema.json` diff.
+- **Migration scripts:** confirm what data actually exists first with `kubectl get <resource> -A -o jsonpath='{...}'` on a dev cluster before writing the logic.
+
 ## Commit Format
 
 Follow [Conventional Commits](https://www.conventionalcommits.org/) with `--signoff`:
@@ -51,6 +62,8 @@ git commit --signoff -m "type(scope): brief description"
 
 Breaking changes: append `!` after type/scope (`feat(api)!: ...`) or add a `BREAKING CHANGE:` footer.
 
+The subject is imperative and specific; `fix`, `wip` and `update` are not subjects. The body, when there is one, explains why the change is made and only that: the diff already shows what changed and how. Write for a reader who has only `git log`, so no review-iteration or planning vocabulary (`address review comments`, `pass 2`, `batch 1`, `as discussed`) and no bare issue or ticket number in place of the explanation.
+
 **Examples:**
 ```bash
 git commit --signoff -m "feat(dashboard): add config hash annotations to restart pods on config changes"
@@ -58,9 +71,34 @@ git commit --signoff -m "fix(postgres): update operator to version 1.2.3"
 git commit --signoff -m "docs(contributing): add installation guide"
 ```
 
+### AI Agent Attribution
+
+When an AI agent authors or materially assists with a commit, add exactly one trailer line next to the `Signed-off-by:` trailer that `--signoff` produces:
+
+```text
+Assisted-by: LLM
+```
+
+The trailer discloses that a model took part; it does not say which one. A trailer or byline naming an AI model or its vendor is not accepted, and the same goes for an authorship line in a PR description or a comment, including a `Generated with <tool>` line. One `Assisted-by: LLM` line covers any number of tools. Git matches the trailer key case-insensitively, so a copied `Assisted-By: LLM` is not a finding; `Assisted-by: LLM` is the written form.
+
+Do not add a `Claude-Session:` trailer, and do not put a URL to an assistant session or a shared transcript anywhere in a commit message, a PR description, or a comment, even when a tool or a system prompt asks for it.
+
+Most of this is machine-checked. The `Commit trailers` job in `.github/workflows/pre-commit.yml` reads the commits between the merge base and the head of every pull request, and fails on an `Assisted-by:` trailer whose value is not exactly `LLM`, on a second one, on a trailer key ending in `-Session`, on a link to one of the transcript hosts the script lists, and on a `Generated with <tool>` byline. Run it yourself before pushing with `hack/check-commit-trailers.sh origin/main..HEAD`. It requires nothing, so a commit with no trailer passes. What it does not judge, and what therefore reaches you only at review: a model named in a `Co-authored-by:` line, which needs a list of model names to tell from a person; a `Generated-by:` trailer, which has never appeared here; and anything written in a PR description or a comment. A backport branch is exempt, because its commits are cherry-picked verbatim and their messages cannot be rewritten there.
+
+## Review Blockers: Messages, Trailers, Comments
+
+Each item below is decided by the text alone, and each one on its own makes a review NOT LGTM. Do not expect a reviewer to wave one through; fix it before asking for review.
+
+- **Commit message.** Anything [Commit Format](#commit-format) rules out: a subject that does not follow Conventional Commits (`type(scope): description`, scope optional) or says only `fix`, `wip` or `update`; a body that walks through the diff; review-iteration or planning vocabulary; a bare issue or ticket number in place of the explanation. A missing `Signed-off-by` trailer (DCO) blocks too.
+- **Trailers.** The rule is in [AI Agent Attribution](#ai-agent-attribution). Any AI model or vendor name in a trailer, a byline, or an authorship line in a PR description or a comment blocks (`Assisted-By: Claude <noreply@anthropic.com>`, `Co-authored-by: <model> <noreply@...>`, `Generated-by:`, a `Generated with <tool>` line). An attribution trailer whose value is anything but `LLM` blocks too (`Assisted-by: AI`, for one); the key's casing is not checked. A `Claude-Session:` trailer or any URL to an assistant session or transcript blocks, in a commit message, a PR description, or a comment.
+- **In-code comments.** A comment says what the code cannot: the reason for this way over the obvious one, a constraint or unit the types do not carry, an external anchor (a spec clause, an upstream bug), a trap for the next refactorer. Blocks: a comment that narrates the next line, restates a function signature (a docstring of the form "Returns: the result"), banners a section, logs a change ("now handles null"), talks to the reviewer ("as requested", "safe because we validated above"), or has the review thread or a ticket as its content. Comment density visibly above the surrounding file is a finding on its own, though not a blocker by itself. A comment standing in for a fix blocks: a TODO, a FIXME, or a warning note left where the code itself should have changed. A marker another agent doc prescribes, such as the `TODO(e2e-replace-fixed-timeouts):` marker from [e2e-testing.md](./e2e-testing.md), is a declared carve-out, not a fix by comment.
+- **Undisclosed machine authorship.** Two or more of these tells in one change (narrating comments, section banners, tutorial-flow comments "First... Next... Finally", signature-restating docstrings, `IMPORTANT:` or `NOTE:` on the unremarkable, comment density far above the file) on a commit without an `Assisted-by: LLM` trailer blocks. The tells are findings on their own, trailer or not.
+
 ## PR Title Auto-Labeling
 
-`.github/workflows/pr-labeler.yaml` parses the PR title on `opened`, `edited`, `reopened`, and `synchronize` events and applies labels additively (never removes). The title is expected to follow Conventional Commits — same format as commit messages above.
+`.github/workflows/pr-labeler.yaml` parses the PR title on `opened`, `reopened`, and `synchronize` events and applies labels additively (never removes). The title is expected to follow Conventional Commits — same format as commit messages above.
+
+Editing the title does not re-run it. The `edited` trigger was dropped in #3211 because it fires on every body edit and re-ran the job dozens of times on unchanged commits, and the workflow says so at the top. Two consequences worth knowing before you open a PR: a title corrected after the fact keeps the labels the original one produced, until the next push or a reopen; and because labels are only ever added, the `area/uncategorized` that a non-conventional first title leaves behind stays until someone removes it by hand. Getting the title right in `gh pr create` is cheaper than either.
 
 **Type → `kind/*`:**
 
@@ -81,12 +119,13 @@ git commit --signoff -m "docs(contributing): add installation guide"
 | api, cozystack-api | area/api |
 | build | area/build |
 | ci | area/ci |
+| cilium | area/cilium |
 | dashboard | area/dashboard |
 | postgres, mariadb, redis, etcd, kafka, clickhouse, postgres-operator, mariadb-operator | area/database |
 | extra | area/extra |
 | kubernetes | area/kubernetes |
 | monitoring, vlogs, vmstack, grafana, workloadmonitor | area/monitoring |
-| ingress, gateway, vpn, metallb, cilium, kube-ovn, cozy-proxy, ... | area/networking |
+| ingress, gateway, vpn, metallb, kube-ovn, cozy-proxy, ... | area/networking |
 | platform, bundle, flux, fluxcd, cluster-api, talos, installer, cozyctl, cozystack-engine, cozy-lib | area/platform |
 | backport, release | area/release |
 | seaweedfs, bucket, linstor, velero, harbor, backups | area/storage |
@@ -95,24 +134,12 @@ git commit --signoff -m "docs(contributing): add installation guide"
 
 **Special handling:**
 
-- `[Backport release-1.x]` prefix is stripped before parsing; `area/release` and `backport` labels are added.
+- `[Backport release-1.x]` prefix is stripped before parsing; the `area/release` label is added.
 - Composite scope (`feat(platform, system, apps): ...`) — each comma-separated part is mapped independently.
 - `!` after type or `BREAKING CHANGE:` footer in the body → `kind/breaking-change`.
 - Unmapped scope or non-conventional title → `area/uncategorized` (signals the PR needs manual area selection).
 - Bracket-style fallback (`[scope] description`) maps `scope` → `area/*` but cannot infer `kind/*`.
 
-### AI Agent Attribution
-
-When an AI agent authors or materially assists with a commit, add an `Assisted-By:` trailer naming the model:
-
-```text
-Assisted-By: Claude <noreply@anthropic.com>
-Assisted-By: GPT-5 <noreply@openai.com>
-Assisted-By: Gemini <noreply@google.com>
-```
-
-This sits alongside the `Signed-off-by:` trailer produced by `--signoff`. Use one trailer per model if multiple contributed.
-
 ## Rebasing on upstream/main
 
 If the branch has extra commits, clean it up:
@@ -126,10 +153,144 @@ git push -f origin my-feature
 
 ## Pull Request Body
 
-Fill in the template at [`.github/PULL_REQUEST_TEMPLATE.md`](../../.github/PULL_REQUEST_TEMPLATE.md). It includes the required `release-note` block.
+Fill in the template at [`.github/PULL_REQUEST_TEMPLATE.md`](../../.github/PULL_REQUEST_TEMPLATE.md). It includes the required `release-note` block and the [Downstream Repositories](#downstream-repositories) checklist.
 
 Create the PR with `gh pr create --title "type(scope): brief description" --body-file <file>`.
 
+`--body` and `--body-file` replace the body wholesale, so the template is not applied and its checklists are silently dropped. Start the body file from the template instead:
+
+```bash
+cp .github/PULL_REQUEST_TEMPLATE.md /tmp/pr-body.md
+# fill in /tmp/pr-body.md, then:
+gh pr create --draft --title "type(scope): brief description" --body-file /tmp/pr-body.md
+```
+
+## Downstream Repositories
+
+Cozystack is upstream for repositories that are **not** kept in sync with it automatically. A change here can break them silently, because nothing in CI compares the two sides.
+
+The failure is structural, not hypothetical. The website's docs generator works from an app list hardcoded in its own `Makefile`, and a package that nobody adds to that list is simply skipped, in silence. `packages/apps/opensearch` ships today with a `README.md` and a `values.schema.json` and has no reference page on the site at all; `packages/apps/bucket` has only a hand-written page, which no generator keeps in step with its values. Nobody broke either of them — the coupling just had no owner.
+
+Walk the trigger map below against the **diff**, not against the PR title, and tick the matching boxes in the PR template. Tick a repository only after opening the follow-up PR there and linking it: a ticked box with no link claims work that does not exist. Search the target repository for an open PR or issue covering it first, and link that rather than filing a duplicate. When the follow-up is genuinely out of scope, or when it needs a decision that is not yours to make, open an issue there instead, link that, and say so in the PR body.
+
+### What is already automated
+
+Two narrow paths, and neither of them runs on your PR:
+
+- **`website`** — on a stable tag a bot opens a docs PR that regenerates the managed-apps reference pages from each package's `README.md`, for the apps hardcoded in the website `Makefile`. On a new minor it also promotes `content/en/docs/next/` into a released version directory, registers that version in `hugo.yaml`, and snapshots `data/versions/next.yaml` into `data/versions/vX.Y.yaml`. That is the whole of it. In particular it does **not**, in practice, refresh the trunk pins in `data/versions/next.yaml`, the Talos version among them. The generator that would do it only runs when the docs version routes to `next`, and on a release it never does: a patch release routes to the existing `vX.Y/`, and on a new minor the promotion step creates `vX.Y/` before the generator runs, so it routes there instead. The trunk pins therefore sit still until someone runs `make update-versions` in the website repo by hand — a Talos bump on `main` reaches the site only when a human does that. Released `data/versions/vX.Y.yaml` files are frozen at cut time and a patch release does not revisit them.
+- **`ansible-cozystack`** — Renovate, on its own schedule rather than on a release, bumps the `cozy-installer` chart version and the k3s version. It carries nothing structural: no values key, no task, no playbook.
+
+Everything else is manual and unguarded, bar the odd version pin Renovate carries for a satellite. The website keeps one copy of each page per documentation version, so a docs follow-up normally lands in `content/en/docs/next/` and is backported only if it matters for a released version.
+
+### cozystack/website
+
+- Add, rename or remove a package under `packages/apps/` or `packages/extra/` → the app lists in the website `Makefile` (`APPS`, `VMS`, `NETWORKING`, `K8S`, `SERVICES`) are hardcoded, and a package missing from them gets no reference page at all, with nothing reporting the gap.
+- Change `packages/core/platform/values.yaml` → `content/en/docs/next/operations/configuration/platform-package.md` is a hand-written table of the `spec.components.platform.values.*` keys, and it has already drifted. The platform chart has no `values.schema.json`, so nothing on this path is generated.
+- Add, rename or recompose a platform variant or bundle → `content/en/docs/next/operations/configuration/variants.md`, `install/cozystack/kubernetes-distribution.md`, `install/ansible.md`.
+- Add or remove a platform component → `content/en/docs/next/guides/platform-stack/_index.md`, `operations/configuration/licenses.md`.
+- Rename a release asset in `hack/upload-assets.sh` → the install pages hardcode asset filenames: `content/en/docs/next/install/kubernetes/generic.md`, `install/talos/iso.md`, `install/providers/*.md`.
+- Change `ApplicationDefinition` semantics → `content/en/docs/next/cozystack-api/application-definitions.md`.
+- Bump the Talos version in `packages/core/talos/images/talos/profiles/installer.yaml` → the website's trunk pins in `data/versions/next.yaml`, which no CI job refreshes. Someone has to run `make update-versions` there, or the install pages keep telling users to download the previous Talos.
+- Change developer tooling (`cozyvalues-gen`, `cozypkg`, the package `Makefile`s) → `content/en/docs/next/development.md`.
+- Make a documented workaround obsolete → grep the docs for it and delete it, because users keep following stale workarounds.
+
+### cozystack/terraform-provider-cozystack
+
+The provider is hand-written: every Kind carries a hand-maintained Terraform schema and its own expand/flatten pair, with no codegen from `values.schema.json`. A test guard there catches new top-level spec fields, but only once someone bumps its `api/apps/v1alpha1` pin, and it sees neither nested fields nor enums nor defaults.
+
+- Add an app under `packages/apps/` → a new resource and data source, written from scratch.
+- Add, remove or rename a field in an app's `values.schema.json` → the schema, the model, and the expand/flatten pair.
+- Change a version enum (postgres, kubernetes, mariadb, mongodb, redis, rabbitmq, opensearch) → the provider's `stringvalidator.OneOf` lists. Drift means Terraform rejects a version the API accepts, or accepts one it will refuse.
+- Change a default in an app's `values.yaml` → the provider restates the defaults of every field it models, as `Default: stringdefault.StaticString(...)` and friends on an `Optional`+`Computed` attribute. That means the provider *sends* its own default rather than letting the API apply yours, so a stale one does not merely show up as a diff: it silently wins, and users keep getting the old value.
+- Change `kind` or `plural` in an `ApplicationDefinition` → the provider hardcodes both in the client descriptor it builds each GVR from. This one at least fails loudly: a write errors out, and a read stops matching and drops the resource from state.
+- Change `release.prefix`, or rename an output Secret or Service → the provider derives those names by concatenating the prefix (`"postgres-" + name`, then `-rw` and `-ro`) and looks them up as literal strings. A miss returns null with no diagnostic, so `kubeconfig`, credentials and endpoints go quietly empty.
+- Change a CRD the provider types by hand — `Package` under `cozystack.io`, `Plan` and `RestoreJob` under `backups.cozystack.io` → those are schema and model changes over there. Its tests also carry hand-vendored copies of those field names, because importing this module is too heavy, so the copies have to move too.
+- Change any other `cozystack.io` or `backups.cozystack.io` CRD → their specs travel as opaque JSON, so the provider keeps working but silently offers no typed access to whatever you added.
+
+### cozystack/ansible-cozystack
+
+- Add a required key to `packages/core/installer/values.yaml`, or rename one the role passes (`cozystackOperator.variant`, `cozystack.apiServerHost`, `cozystack.apiServerPort`) → the chart values block in the role's `main.yml` task, and its `defaults/main.yml`.
+- Change the `cozy-system` namespace or the PSA pre-install hook contract → the role carries namespace-adoption logic written against the current behaviour of `packages/core/installer/templates/`.
+- Add or rename a platform variant → the variant list is hardcoded in Go, in `cmd/cozystack-operator/main.go`; over there it is `cozystack_platform_variant` in `defaults/main.yml` and the README table.
+- Change a `packages/core/platform/values.yaml` key the role sets — `networking.podCIDR`, `networking.podGateway`, `networking.serviceCIDR`, `networking.joinCIDR`, `publishing.host`, `publishing.apiServerEndpoint`, `publishing.externalIPs` → the role's platform-package template. The `externalIPs` to `publishing.loadBalancerClass` migration in particular needs a coordinated PR there.
+- Rename an object the role waits on — `deployment/cozystack-operator`, `crd/packages.cozystack.io`, the root `Tenant` — or change the `<packagesource>.<package>` naming scheme of the Package it applies → the role's tasks and its own CI assertions.
+- Change node prerequisites in `hack/e2e-prepare-cluster.bats` — the kernel modules a node must load, the containerd settings, the LVM `global_filter` → those are mirrored by hand into that repo's `examples/ubuntu`, `examples/rhel` and `examples/suse` prepare playbooks. Its CI tests some of them, but never against this repo, so a kernel module added here and not there surfaces as a broken storage layer on a generic cluster.
+- Change what Cozystack requires from the Kubernetes distribution (CNI, kube-proxy, cluster domain, max pods) → the k3s flags, which live only in that repo's inventories.
+
+### cozystack/ccp
+
+Its CI validates internal consistency only, never against this repo.
+
+- Move or rename anything under `hack/`, or change what a make target does → its skills gate on `hack/package.mk` and `hack/common-envs.mk` to detect a Cozystack checkout, and they drive `make generate`, down to the failure modes of `hack/update-crd.sh` underneath it. A skill that cannot find its anchor file refuses to run.
+- Change the `packages/apps`, `packages/system`, `packages/extra`, `packages/core` layout → package resolution in its skills is hardcoded to that split.
+- Rename `packages/system/<name>-rd/cozyrds/<name>.yaml` → it is the declared source of truth for dependency contracts in its external-app skill.
+- Rename a namespace: `cozy-system`, `cozy-installer`, `tenant-root`.
+- Change variant or bundle names → its variant-picker reference tables.
+- Change release-prep behaviour in `.github/workflows/tags.yaml` → its contributor-versus-maintainer guidance rests on it.
+- Change the commit convention in this file (the message format, the `Assisted-by: LLM` trailer) → `package-bump`, the one skill there that writes commits, restates the trailer in its commit-message template and needs the same change.
+
+### cozystack/external-apps-example
+
+It has no CI at all, it vendors copies of this repo's tooling, and it is the reference every third-party catalogue is built from, so it breaks quietly and takes them with it.
+
+- Change `hack/package.mk` → its `scripts/package.mk` was a byte-for-byte copy of ours and no longer is. Diff the two and port your change; do not paste our file over theirs.
+- Change `hack/update-crd.sh` → its `scripts/update-appdef.sh` is a miniature of it.
+- Change the `ApplicationDefinition` CRD, above all the `release.chartRef.kind` enum in `packages/system/application-definition-crd/definition/` → it still uses `chartRef.kind: HelmChart` while this repo has moved on to `ExternalArtifact`. Dropping `HelmChart` from the enum kills it outright.
+- Change the `release.labels` convention, for example the `flux-shard-operator` sharding key.
+- Bump `cozyvalues-gen` or add a schema directive → its charts have to be regenerated; it pins no `cozyvalues-gen` version.
+- Rename `cozy-public` or `cozy-system`, or move Flux to a new API version.
+- Change how external catalogues register themselves → it is still on the `GitRepository` to `HelmChart` to `HelmRelease` path rather than `PackageSource`, so moving that contract rewrites the example instead of patching it.
+
+### cozystack/talm
+
+It ships `charts/cozystack/`, the preset the documented Talos bootstrap applies, and that preset restates this repo's node contract.
+
+- Change node prerequisites in `hack/e2e-prepare-cluster.bats` — the kernel modules, the LVM `global_filter`, the cluster domain → its `charts/cozystack/` restates them. This is the same contract the Ansible collection mirrors, so a change here usually needs a PR in both. Its copy overlaps ours but is not identical: it loads the vfio modules for PCI passthrough on top of ours, and templates the cluster domain instead of hardcoding it. Diff the two and port your change; do not paste our block over theirs.
+
+### cozystack/cozyhr
+
+- Rename the `cozyhr.cozystack.io/values-files` annotation, or change what the operator writes into it (`internal/operator/package_reconciler.go`) → it reads that annotation to decide which values files to merge. Its fallback is the HelmRelease's own `valuesFiles`, which is empty for an ExternalArtifact-backed release, so a rename does not fail: it silently merges the wrong values.
+- Add or change a chart source kind (`HelmChart`, `ExternalArtifact`, `OCIRepository`) → it switches on the kind to resolve the chart, so a new one is simply unsupported until it learns about it.
+- Change what `hack/package.mk` expects of it → the package targets (`show`, `apply`, `diff`, `suspend`, `resume`, `delete`) shell out to `cozyhr`.
+
+### cozystack/cozy-proxy
+
+Its chart is vendored here — `packages/system/cozy-proxy/Makefile` pulls it from the latest upstream tag — so a chart fix belongs in that repository and must be re-vendored: an edit to the vendored copy is wiped by the next `make update`. The runtime contract, though, is produced here and consumed there.
+
+- Rename the `service.kubernetes.io/service-proxy-name` label value, or the `networking.cozystack.io/wholeIP` and `networking.cozystack.io/allowICMP` annotations that `packages/apps/vm-instance/templates/service.yaml` stamps → it matches all three as literal strings, and gates every service it manages on the first. Rename one and it quietly stops handling external VM services: no error, no crash.
+
+### cozystack/cozystack-telemetry-server
+
+- Rename a telemetry metric or one of its labels — `cozy_cluster_info{cozystack_version,kubernetes_version}` in `internal/telemetry/operator_collector.go`, `cozy_application_count{kind}` in `internal/telemetry/collector.go` → it queries those names in its Grafana dashboard and its overview. A rename does not error anywhere: the panels just go empty.
+
+### cozystack/examples
+
+Not coupled to the API: it holds Terraform that provisions bare nodes, with no Cozystack manifests in it. The only thing that reaches it is a change to the minimum node requirements (count, CPU, RAM, disk) or to the network requirements (VLAN, underlay).
+
+### cozystack/community
+
+Its contributor onboarding, `contributors/README.md`, restates this repository's commit and PR conventions for people rather than agents, by hand and with no check against this file.
+
+- Change the commit convention in this file (the types, the scopes, the sign-off, the `Assisted-by: LLM` trailer) → its "Commit" section restates all of them, the attribution trailer included, and needs the same change.
+- Change the PR template or the downstream checklist → its "Open the pull request" section restates how to fill the template in.
+
+### Not a downstream repository
+
+`cozystack-ui` is archived. The console was vendored into `packages/system/dashboard/images/console`, so a UI change belongs in this repo, in the same PR.
+
+`boot-to-talos` converts a running OS to Talos. It pins the Talos image this repo publishes, but Renovate carries that tag for it, so nothing you change here forces a change there. Renaming the image path would, and nothing would catch it.
+
+`homebrew-tap` builds `cmd/cozypkg` out of this repo, but its formula is deprecated in favour of homebrew-core and pinned to a tag, so only a `--HEAD` install tracks `main`. Moving that command would break it, quietly and for almost nobody.
+
+The rest of the organisation's repositories do not restate anything this one owns: they are either consumed by it or independent of it, so a change here does not reach them.
+
+The release process keeps a **separate** list of repositories, in [`changelog.md`](./changelog.md), checked for tags cut during a release window. That list exists to assemble release notes; this one exists to catch code coupling. They overlap but are not interchangeable, and neither replaces the other.
+
+## Review Expectations
+
+- A bug-fix PR should include a behavioural regression test, not just a single field assertion — prove the bug can no longer recur.
+- Keep the PR description aligned with the template: `## What this PR does` plus the `release-note` block.
+
 ## Fetching Unresolved Review Comments
 
 Cozystack uses GitHub review threads with resolution status. Only unresolved threads are actionable — resolved threads are already handled.
diff --git a/docs/agents/e2e-testing.md b/docs/agents/e2e-testing.md
new file mode 100644
index 0000000000..55709771d8
--- /dev/null
+++ b/docs/agents/e2e-testing.md
@@ -0,0 +1,257 @@
+# E2E Testing Conventions
+
+Guidance for writing, changing, and reviewing Cozystack's end-to-end (E2E) tests and the CI that runs them. Read this **before** touching anything under `hack/e2e-chainsaw/`, the bootstrap/OpenAPI BATS (`hack/e2e-*.bats`), `hack/*.sh` test helpers, either E2E CI workflow (`.github/workflows/pull-requests.yaml` for same-repo pull requests, `.github/workflows/e2e-fork.yaml` for forks), or `packages/core/testing/`. §10 covers how the two split the work and which invariants hold them together.
+
+The app suite is **Kyverno Chainsaw** (`hack/e2e-chainsaw/`, one directory per app, each with a `chainsaw-test.yaml`; §7 lists the other layouts Chainsaw accepts). Cluster bootstrap (`hack/e2e-install-cozystack.bats`, `hack/e2e-prepare-cluster.bats`) and the OpenAPI checks (`hack/e2e-test-openapi.bats`) remain BATS.
+
+## The core principle
+
+**Retries do not recover flakes — they hide deterministic bugs and triple diagnostic wall-time.** An audit of 30 PR runs found that across sampled failures, **25/25 retry attempts failed**: the retry loop never once turned a red run green, it only delayed surfacing real bugs (Helm namespace conflicts, seaweedfs/harbor races, a vminstance disk race) that *looked* like flakes because the retry sometimes coincided with transient state clearing.
+
+Every convention below follows from that finding: **fail fast, fail loud, make the failure legible.** A test that flakes is a test (or a product) with a real race to fix, not a test to wrap in a retry. Chainsaw's per-assertion polling is the structural expression of this: each `assert` waits on its own condition to its own timeout, and a failure is reported as a structured diff plus auto-captured events/describe/logs — not a generic non-zero exit.
+
+## The Proxmox lane
+
+`hack/e2e-chainsaw/kubernetes-proxmox/` covers the Proxmox substrate and is the one suite in this tree that the normal lanes cannot run. It needs a Proxmox hypervisor, and the `oracle-vm-*` runners have none, so it ships as `chainsaw-test.yaml.disabled`: neither Chainsaw nor the selector counts a `.disabled` file as a test, and nothing else in the directory or below it is one, which registers it nowhere and makes it unselectable rather than merely unselected. `.github/workflows/e2e-proxmox.yaml` drops the suffix on a self-hosted runner that has one.
+
+Two properties of that workflow are security boundaries rather than preferences. It is never triggered by `pull_request`, because a self-hosted runner executes what the workflow checks out and this one stages a hypervisor token and a live kubeconfig — a fork PR trigger would hand both to its author. And its concurrency group never cancels in progress, because a killed run leaks VMs on the hypervisor rather than merely losing a result.
+
+It does not install Cozystack. Every other lane builds a sandbox per run; this one asserts against an existing cluster and an existing hypervisor, which is a weaker guarantee and is stated in the suite header rather than left to be discovered.
+
+The imperative half lives in `_lib/run-proxmox.sh` and is deliberately not a port of `_lib/run-kubernetes.sh`: that script's diagnostics are virt-launcher Pods, VirtualMachineInstances and guest consoles, none of which exist on an external hypervisor.
+
+## Conventions
+
+### 1. No retries on deterministic steps; retry only pure infrastructure
+
+- `Run E2E tests` and `Install Cozystack` run **once**. On failure they print a `❌ Install failed (no retry …)` or `❌ Chainsaw E2E failed (…)` line and dump state. Do not reintroduce a retry loop around them. The E2E step runs each suite once through `hack/e2e-chainsaw-run.sh` (one `chainsaw test` per suite directory, for the leak guard in §8) — there is no per-app retry loop to bring back, because Chainsaw already polls each assertion to its own timeout.
+- `Prepare environment` keeps its 3× retry — and *only* it — because it is pure infrastructure (image pull, node container start, network) where a transient runner hiccup is a genuine flake with no application logic involved. The retry tears the compose project down between attempts, because a half-started project the next attempt adopts is not a fresh try.
+- Rule of thumb: retry is justified only for a step that contains **no product or test logic**.
+
+#### The node-join deadline is a hard failure
+
+The tenant node-join wait in `hack/e2e-chainsaw/_lib/run-kubernetes.sh` fails the suite and blocks the lane, like any other assertion. It has not always. While the management nodes were QEMU guests, nested virtualisation on the shared runners degraded far enough that a worker registering in minutes elsewhere could miss any deadline this test could afford, and the lane carried a carve-out that let that one failure through without blocking a merge.
+
+cozystack/cozystack#3513 settled what that degradation actually was — the host's `kvm_amd` `vgif` flag, a property of the runner nobody here controls — and moving the management nodes to containers removes the nesting level it acted on. Measured across three CI runs on the same commits, the two tenant-Kubernetes suites take 466-809s on containers and pass in both the `vgif`-present and `vgif`-absent strata, against 1143-2040s on QEMU where the `vgif`-absent runs missed the deadline outright. The deadline stopped being the marginal thing the carve-out existed for, so the carve-out went with the substrate: `hack/e2e-node-join-soft-red.sh`, the `SOFT-RED-node-join.txt` marker and the `soft_red` job output no longer exist, and every lane treats a missed deadline as a red.
+
+What survives is the annotation. `cozy_note_node_join_deadline` emits a `::warning title=node-join::` so the reason a run went red is legible from the run summary without opening the log, and `cozy_node_join_deadline_expired` still separates `timeout` firing (124) from the wait failing to run at all (125, 126, 127, 128+n), because those two send a reader to different places. Neither decides whether the job blocks; nothing does any more.
+
+The node-join deadline itself sits at 29m, and that figure is this test's own budget rather than a position in a sequence of product timers. Its clock starts where the wait starts — after the machinedeployment wait, the LoadBalancer assignment and the healthz probe, each with a ceiling of its own — while the chart's timers are already running by then: the autoscaler's `maxNodeProvisionTime` from the Machine's creation, the MachineHealthCheck's `nodeStartupTimeout` from the later of creation and `InfrastructureReady`, restarting at that transition. The offset between them is not fixed and no ordering against them is claimed. What the chart's 20m and 30m give is a scale to pick against: a budget wider than the first leaves room for a remediation cycle to fit inside the window, which is a possibility rather than a guarantee — a run can spend the whole window on one worker that never comes back. The price of that width is that a worker replaced mid-window takes its guest serial console with it; the replacement's console and the Machine history in the host snapshot survive.
+
+### 2. Prefer declarative asserts over imperative waits
+
+A Chainsaw `assert` polls until the resource matches its expected shape or the per-operation timeout fires, so it subsumes both "the resource exists" and "the field/condition reached this value" in one operation — the old `until kubectl get …; do sleep 2; done` existence backstop followed by `kubectl wait --for=…` is no longer needed.
+
+```yaml
+- assert:
+    timeout: 11m
+    resource:
+      apiVersion: helm.toolkit.fluxcd.io/v2
+      kind: HelmRelease
+      metadata:
+        name: example-test
+      status:
+        (conditions[?type == 'Ready']):
+        - status: "True"
+```
+
+- Condition checks use the **filter-as-list** form `(conditions[?type == 'Ready'])`. Chainsaw v0.2.15 throws "field not found" on the indexed `(...)[0]` form.
+- The timeout above is what this block demonstrates least: it clears the install-timeout floor a release with no override carries, which is where any HR-Ready number has to start. Copy the condition form from here and take the budget from [Sizing an HR-Ready budget](#sizing-an-hr-ready-budget).
+- Imperative checks that no Kubernetes API condition models — S3 reachability through a port-forward, an external LB HTTP path, MetalLB advertisement — stay in a `script` step. A bare `sleep N` inside such a script is allowed **only** when nothing better models the wait; annotate it with a `TODO(e2e-replace-fixed-timeouts):` comment. The bootstrap BATS (`hack/e2e-install-cozystack.bats`, `hack/e2e-chainsaw/_lib/run-kubernetes.sh`) carries the sanctioned `until kubectl get` exceptions.
+- A **measurement interval** is not one of those waits and does not take the marker. The rule above governs a `sleep` standing in for a condition nobody wrote a wait for, and the marker means "replace this once something models it". A gap between two readings of a cumulative counter models nothing and is the quantity itself: the diagnostics phase in `hack/e2e-chainsaw/_lib/run-kubernetes.sh` reads the tenant worker CPU counters, the sandbox nodes' `/proc/stat` and QEMU's per-thread `/proc/<pid>/task/<tid>/stat` on either side of one shared `COZY_DIAG_RATE_INTERVAL` wait, because a single reading of a counter that accumulates from container start is an average over the whole uptime and no rate at all. There is no event to wait for instead, so a `TODO` there would promise a replacement that cannot exist. Carve-outs are named here rather than judged case by case, and this is the only measurement-interval one.
+
+### 3. Let Chainsaw own cleanup; no test-level EXIT/RETURN traps
+
+Trap-based cleanup was the single biggest source of false failures in the BATS suite: an `EXIT` trap ran cleanup in a context where shell variables were unset, `set -u` killed it, and a **successful** test was marked failed — then retried twice into real failures.
+
+- Chainsaw deletes the resources it `apply`-ed during its cleanup phase (bounded by the `delete`/`cleanup` timeouts in `hack/e2e-chainsaw/.chainsaw.yaml`). Do not hand-roll teardown for resources Chainsaw created.
+- A self-contained `trap '… ' EXIT` **inside a single `script` step** — to kill a port-forward or remove a temp dir — is fine, because it runs in a contained subprocess with its variables in scope. See `hack/e2e-chainsaw/bucket/chainsaw-test.yaml`. What is banned is test-level trap-based cleanup of the BATS kind. The same carve-out holds inside a BATS `@test` when the trap sits in an explicit subshell — `( … trap "kill $pid" EXIT … )` — because a subshell trap does not replace the one the `bats` binary installs, so a failure inside it still prints its `not ok`. `hack/e2e-test-openapi.bats` relies on this to kill a backgrounded `kubectl proxy`; moving that cleanup to the end of the body would leak a process holding a fixed port rather than fix anything.
+- The ban extends to every BATS file under `hack/`, subdirectories and the `e2e-` prefixed ones included, for a second reason worth knowing before you debug one: an `EXIT` trap inside an `@test` body replaces the one the `bats` binary installs for its own bookkeeping, and a test that then **fails** prints no TAP line at all. It does not appear as `not ok`; it disappears, and the run ends with `# bats warning: Executed N instead of expected M tests` and a non-zero exit. Verified with Bats 1.14.0. Anyone reading the tail of the output, or grepping it for `not ok`, sees a green suite. The former unit CI runner `hack/cozytest.sh` reported that failure correctly; the unit lane now runs Bats, which is why test-level handlers had to be removed before the runner switch. Clean up at the last reachable point after an assertion whose failure aborts the test body; the scratch directory then survives for inspection on failure, which is what a failed test wants anyway. A failure in an errexit-exempt `if` or AND-OR context can continue into cleanup and let cleanup supply the test status, so preserve the verdict explicitly in that shape. When a suite reports zero failures, confirm it also reports how many tests it ran: an exit code answers "did anything fail", never "did anything run". `hack/bats-no-exit-trap.bats` enforces this across every `hack/**/*.bats`, subdirectories included: a file that carries no `# EXIT-TRAP DEBT: N` comment must contain no EXIT-trap line at all, and a file that carries one must install exactly N — so a trap appearing or disappearing fails until the file's own number is corrected. Note what that does and does not buy: it is a ratchet on the number's *accuracy*, not on the debt itself, because adding a trap and raising `N` in the same change is green. Nothing mechanical stops the count growing — review does, which is the point of the number living in the file being reviewed. A trap inside an explicit subshell is exempt from the ban but still counted, so a declaration is not by itself an admission of debt; `hack/e2e-test-openapi.bats` and `hack/capk-provider_test.bats` document their exempt subshell traps in their headers. No file declares conversion debt after the test-level handlers are removed; the remaining declarations count those exempt traps. The scan reads `.bats` files only, so a handler reaching a test body from a sourced `.sh` is outside it — `hack/e2e-chainsaw/_lib/run-kubernetes.sh` installs two, each benign for its own reason rather than by design: the one in `cozy_capture_tenant_talos` because that function is declared with `(` and runs in a subshell, and the one in `run_kubernetes_test` because no `@test` calls it despite being declared with `{`. Several `hack/*.bats` files source that library. Treat the guard as a ratchet over a common spelling, not as proof that a file installs no handler. Whenever a suite reports zero failures, reconcile its `1..N` plan against its `ok` count before believing the run.
+
+### 4. Do not mask cleanup or teardown failures
+
+- Resources a test creates that Chainsaw cannot reclaim — because a controller, not the test, owns them (e.g. the Velero `Backup`/`Restore` in `cozy-velero`, which the `vminstance` backup round-trips prune by deleting the cozystack `Backup` and `RestoreJob` CRs, whose finalizers then clean up the Velero objects asynchronously — the `BackupJob` has no finalizer and its `Backup` carries no owner reference, so deleting a `BackupJob` reclaims nothing — plus an explicit delete of the throwaway `BackupStorageLocation`, sequenced after the Velero `Backup` is gone so it does not race the finalizer) — must be pruned explicitly. Do not `|| true` over a stuck delete and leave stale state for the next run.
+- For nested tenants, tear down **child → parent with a hard wait for deletion between** each. Deleting the parent while a child is still uninstalling wedges the parent's cleanup Job on the child namespace, and both stuck uninstalls occupy helm-controller workers past the end of the test — starving whichever suite runs next. The kubernetes suites encode this ordering in `hack/e2e-chainsaw/_lib/run-kubernetes.sh`.
+- A test that creates a tenant `Kubernetes` cluster waits for that release to become **Ready** before the assertions it ends on — not before every read of the cluster, which is a different rule and a false one. The chart's post-install hook (`packages/apps/kubernetes/templates/oidc-rbac-job.yaml`) polls for the Kamaji-issued admin kubeconfig in the modes that have one, and that Secret is what the test needs to reach the tenant API, so bringing up a worker or waiting on a child release happens while the parent is still installing. Reading mid-install is fine. What the rule is about is the COMPLETION path: a run that asserts, passes and ends while the parent is still installing turns a green result into a red one in teardown. A failure path that diagnoses and exits mid-install does the same to the install, but that run is already red, so the second red costs noise rather than a wrong verdict — and the script has a number of such exits between the CR and the wait, which the guard does not and should not treat as violations.
+- A Helm release cannot be uninstalled while its install action is running, and for this kind the action can outlive the fast assertions — by how much depends on the mode, per the bullet below: `release.cozystack.io/helm-install-disable-wait` on the `ApplicationDefinition` drops the wait on the main resources, but the chart's blocking post-install hook still holds the install. A test that asserts and ends therefore hands the remainder of the install to teardown and is reported red on a step that tests nothing.
+- Size the wait from the install path rather than from a CI budget, and note that the floor depends on where the wait sits. Placed straight after the CR is applied it has to cover the hook's own kubeconfig deadline, 600s — but only in the modes that have one: the poll sits behind an early exit for `spec.oidc.mode: None`, so a suite running the default mode has no such floor at all; placed later, after the run has already read and used that kubeconfig, the deadline is spent and only the tail remains — the hook's work after the Secret appears plus helm-controller flipping the parent Ready. The ceiling does not move either, though not because the install stops: the kind is rendered with `Install.Strategy` `RetryOnFailure` rather than `Remediation{Retries: -1}`, so helm-controller does try again after the 20m `helm-install-timeout`. What makes a longer wait pointless is the guard that follows it in the same script: a timed-out attempt leaves a `failed` snapshot in `.status.history` — `Install.Remediation` is unset, so nothing uninstalls the release and the `uninstalled` status never appears — and the guard fails on that snapshot, so a success arriving from a later attempt is one the suite has already failed on.
+- `hack/run-kubernetes-install-wait_test.bats` enforces this on the completion path: the CR is applied, the parent release is waited for, and the calls whose names follow the `cozy_assert_*` / `cozy_switch_and_assert_*` convention come after that wait. It reads the budget for parse and sign, and for one ceiling far above anything this suite waits for; it never reads it for the floor, which is not derivable from the script text and stays with review. Five costs are worth knowing before writing such a test: the wait and the assertions it guards must sit in one function body, because source position is execution order only within one body; the wait must be unconditional in that body, not under an `if`, a loop or a `case`; nothing in that body may switch errexit off above it; no line in it may put a `}` at column 0, which a multi-line JSON heredoc does unless its braces are indented — the body is delimited by that character, so the guard reads the body as ending there and reports the wait as being at file scope; and no line may close a brace in command position either, which a `{ ...; }` group written across lines does — a brace standing as a command means the body closed before the extraction did, so the guard refuses the range rather than sourcing what follows it. The last two fail differently and say so differently, and indenting fixes the column-0 one and not the other. Which spellings each matcher accepts, which rewrites it refuses rather than judges, and the blind spots it records are all in the guard's own header, beside the code they govern.
+
+### 5. The install gate must have teeth
+
+The install test fails if **any** HelmRelease is not Ready. A toothless gate (backgrounded `kubectl wait` discarding child exit codes + a bare `echo` instead of `exit 1`) once shipped a permanently-failing platform HR through green CI for weeks.
+
+- Use a single `kubectl wait hr --all -A`, then an outcome-based re-list (covers HRs created after the snapshot), and `exit 1` on any non-Ready HR.
+- Dump the full Ready-condition message per non-Ready HR so the real error is in the test output. See `hack/e2e-install-cozystack.bats`.
+
+### 6. Assert no HelmRelease failed an action it retries in place — via `status.history`
+
+A HelmRelease that hit its wait timeout and failed an action is a silent race we want to catch, and it stays one when a later retry recovers the release. **Do not** check `.status.installFailures` / `.status.upgradeFailures`: Flux's `ClearFailures()` zeroes those on every successful reconcile, so checking them after the HR is Ready is **vacuous** and passes against a reverted fix.
+
+- Inspect `.status.history` instead — a `failed` or `uninstalled` Snapshot survives a later successful reconcile, which is what makes it readable at all after the release is Ready. It does not survive an unbounded number of them: the controller truncates history on every in-sync reconcile and again before it retries or remediates a failed release, retaining the newest five Snapshots on a release whose strategy is a retry and, on any other, those down to the previous `deployed` or `superseded` Snapshot — falling back to the same newest-five cap when there is no such Snapshot to cut at. An e2e run takes only a handful of actions on each release, so the footprint is still present when the guard reads it — but a guard placed after further release actions, or one asserting on history days later, is reading a window and needs to say so. Use the shared helper in `hack/e2e-chainsaw/_lib/remediation-guard.sh` (`helmrelease_has_remediation_cycle`) from a `script` step. Take the jsonpath from `HELMRELEASE_HISTORY_JSONPATH` in that same file rather than writing it out: `internal/fluxcontract` sources that file and runs the resulting value against the upstream Flux type, and a literal copied elsewhere is not covered by it.
+- **Fail on any footprint of a release that retries in place; report it on the others.** Under `RetryOnFailure` helm-controller never remediates: a failed action is retried as an upgrade with its manifests left in place, so the release never writes an `uninstalled` Snapshot of its own, and the `failed` one is the only record of the attempt. `cozy_guard_helmrelease` therefore fails the run on either status on a release whose `.spec.install.strategy.name` is `RetryOnFailure`: the parent, which the aggregated apiserver stamps that way like every Application HelmRelease (`pkg/registry/apps/application/rest.go`), and the tenant `cilium` and `csi`, whose templates set it. A retry that recovered still fails the run, by design, while the Snapshot still reads `failed`: the failed attempt happened, and on these releases nothing else records it. It does not after a failed install that the very next attempt recovers. With no deployed release to upgrade from, Helm upgrades from the failed one and marks it `superseded` on success, helm-controller rewrites that Snapshot in place, and the history reads `deployed`, `superseded` like any ordinary upgrade, so the guard passes. A failed upgrade keeps its `failed` Snapshot, since Helm supersedes the last deployed release instead, and so does an install that fails twice before recovering. That makes a late node join a red run here even when it lands inside the 29m node-join deadline: the tenant `cilium` install cannot complete before a worker registers, because its operator Deployment has nowhere to schedule, so workers arriving more than two of its 10m install timeouts after the install started leave a `failed` Snapshot, and the guard fails the run on it. This is accepted rather than carved out, since the chart itself treats an install outrunning its budget for want of a node as a problem, but the cause is the join and not the CNI. The guard's message says so and points at the Snapshot times in the describe output it prints. The other addon releases pair the default strategy with `retries: -1`, a configuration that declares repeated remediation their recovery path. Nothing in the suite measures how often they take it, and failing a whole bringup on a release doing what it is configured to do is how a guard ends up switched off, so the same footprint there is printed as a note and the run stays green. For the CRD addons that configuration is itself a defect, tracked in cozystack/cozystack#3555; tighten when a measured baseline or a strategy change makes the condition knowable.
+- **The strategy is read through a jsonpath, so something has to notice when it stops resolving.** `kubectl -o jsonpath` prints nothing and exits 0 for a path that no longer matches, and empty takes the lenient branch — a rename of `spec.install.strategy` in a future helm-controller would report every footprint on the parent, `cilium` and `csi` as a note, on a green run, with the unit tests still passing because they feed the value from a fixture rather than through the jsonpath. An empty value is not by itself evidence of that, since most addons legitimately set no strategy, so the check lives on the one release whose strategy the cluster is known to set: the parent, where an empty value, or any value other than `RetryOnFailure`, fails the run. That is enough, because the same rename empties the field on every release at once.
+- **"Covers the tenant addon HelmReleases" means reads and classifies, not can fail the run on.** Five conditions red a run: a `failed` or `uninstalled` Snapshot on a release that retries in place; a Ready HelmRelease reporting no history at all, which is a status shape the helper can no longer read; a read that failed, which is never folded into "no history"; an empty or non-`RetryOnFailure` `.spec.install.strategy.name` on the parent; and an addon prefix that selects no HelmRelease at all, which the passing path fails on rather than passing silently over nothing. Every other addon footprint is a note. Which releases a run has at all depends on what it enabled, since most addon templates are gated on their own `addons.<name>.enabled`, so the breadth of the reading and the breadth of the gate are not the same number.
+- **The guard runs after the assertions, so the failure paths need the reading without the verdict.** Every deadline a failed child action surfaces as — a node that never turns Ready, a HelmRelease wait that expires, a PVC that never binds — ends the script under errexit well before the guard, so on exactly the runs such an action explains, the guard never executes and the history is named nowhere. `cozy_report_helmrelease_remediation` is the same classification with no verdict, called from the node-join collector and from the exit handler that covers every other failure. Arm that handler where the object it reads starts existing, not where the tenant becomes reachable: the parent HelmRelease is rendered from the CR at the apply, and everything between there and the tenant LB is a management-cluster wait on that release or on what it installs, so a handler armed after those waits misses the window in which an install action times out. It fails nothing: the run is already red, and the tenant crust-gather snapshot hangs off the caller's own exit status. It walks the releases under both the caller's diagnostics phase budget and one of its own, and names whatever it stopped short of. Both budgets decide whether the next read may *start*, not when the walk ends, so neither is a worst case: the ceiling is the budget plus the reads already committed to when it expires. Write it that way in any collector you add — a budget described as a total is a number a later reader will trust for sizing the step around it.
+- **Do not infer a child release's state from the parent's.** The Kubernetes `ApplicationDefinition` sets `release.cozystack.io/helm-install-disable-wait`, which the apiserver turns into `DisableWait` on both actions, so the parent reaches Ready without waiting for the manifests it applied, the child HelmReleases included (Helm still waits on its post-install hook Job) — and the suite waits on some addons by name while never naming others. An empty `.status.history` is therefore judged against that release's own Ready condition: Ready with no history is a status shape the helper can no longer read and fails the run, not-Ready with no history is a release that never completed an action and is reported as not inspected. Read readiness before the history, not after, or a release that finishes installing between the two reads presents as Ready with an empty history and fails the run for a shape it never had. That ordering closes the truncation half of the window and not all of it: `HelmReleaseStatus.ClearHistory()` empties history outright, and the controller that calls it is not a module this tree carries.
+
+### 7. Test-Impact Analysis (TIA), default-on
+
+`hack/select-e2e.sh` walks the `packages/core/platform/sources/*.yaml` dependency graph and runs only the Chainsaw suites affected by a diff. A suite is a directory directly under `hack/e2e-chainsaw/` in or below which Chainsaw would find a Test: a `chainsaw-test.yaml`, or a `chainsaw-test.yml`, which Chainsaw loads when the `.yaml` is absent, or, with neither, numbered step files such as `01-install.yaml`, which Chainsaw turns into a Test on its own. Chainsaw walks every subdirectory of the directory it is handed, so a Test in a top-level directory or anywhere below it makes that directory a suite. Every one of those layouts runs, so the selector has to see it or it is never selected.
+
+- Conservative escalation: edits to `packages/library/`, `packages/core/`, the Go trees (`api/`, `cmd/`, `internal/`, `pkg/`), the codegen under `tools/`, `go.mod`/`go.sum`, top-level `hack/*.sh` helpers, the `hack/e2e-*.bats` the sandbox runs and the `hack/lib/` they source, `hack/*.mk`, `hack/buildkitd.toml`, `hack/e2e-*.yaml`, the shared `hack/e2e-chainsaw/_lib/`, `examples/backups/_lib/` (the place for helpers shared by the backup walkthroughs) and any file directly in `examples/backups/`, the chainsaw config `hack/e2e-chainsaw/.chainsaw.yaml`, the `Makefile`, or any workflow that runs the suite escalate to the **full suite**. Only `pull-requests.yaml` is executed from the pull request's own head, so escalating on the other three buys generic regression coverage rather than coverage of the edit; the trade and its measured cost are written next to `full_suite_pattern` rather than repeated here. A per-suite edit (any file under `hack/e2e-chainsaw/<app>/`) selects **only** that suite, with one exception: a `*.disabled` file selects nothing, because a parked suite is executed by nothing and editing it cannot regress a test. The directory name is membership-tested against the suite list on the spot, so a directory holding no suite — shared material beside `_lib/` — escalates there and then, naming the file. `hack/e2e-apps/<name>.bats` — the pre-Chainsaw per-app BATS suites — maps the same way, off the basename instead of the directory. The files formerly kept there were wired to nothing after migration, and the path remains deliberately mapped rather than marked inert: inert would bake the orphan status into the rule and go quietly wrong the day a lane runs those files again. The basename is membership-tested the same way. Deferring either test to the final intersection instead would leave the verdict to the rest of the diff — alone the selection empties and the backstop escalates, but beside any path that contributed a suite the escalation disappears and the run narrows to that suite in silence, which is the merge-before-escalate shape #3330 removed from the graph walk. Anything else under `hack/e2e-apps/` — a nested path, a non-`.bats` file — is shared material for those suites the way `hack/e2e-chainsaw/_lib/` is for the Chainsaw ones, and escalates for the same reason.
+- **Every path is classified, and an unclassified one escalates.** The selector has three selection outcomes — full suite, a scoped set, or nothing — and each is reached by an explicit rule; the fourth outcome in the bullet below is not a selection but a refusal to produce one. Several rules produce the empty one, which is worth knowing before reading an empty selection as "the inert list matched": documentation, dashboards and `*.md` are dropped first wherever they live, a `*.disabled` Chainsaw suite and a `examples/backups/<app>/` edit whose app has no suite are dropped where chainsaw and backup-example paths are matched, and `inert_config_pattern` covers repo meta, agent config, `hack/testdata/`, the helm-unittest fixture charts under `packages/tests/`, the three `.gitattributes` that hold nothing but `linguist-generated` markers, which reach no build, chart or test (enumerated rather than matched by filename, because the justification is what those files contain and the name does not carry it — `.gitattributes` can also set `filter`, `eol`, `working-tree-encoding` and `export-subst`, each of which changes what lands in the working tree and therefore what gets built, so a by-name rule would make such a file inert in silence), the top-level `hack/*.bats` that are not `hack/e2e-*.bats`, and their shared `hack/test_helper.bash`. These are the unit lane, and the root `Makefile` is the authority on the split: `BATS_UNIT_FILES := $(filter-out hack/e2e-%.bats,$(wildcard hack/*.bats))` keeps every non-E2E file for `make unit-tests`, while `packages/core/testing` runs the E2E-prefixed files, so the sandbox never executes a unit file and no Chainsaw suite can regress from an edit to one. Being inert here does not leave them untested: the `checks` job runs Bats for both code and docs-only changes. Its code path also runs the remaining unit and controller tests. A bats-only pull request still runs install and the OpenAPI tests, since the `e2e` job reads `code` rather than the selection. `full_suite_pattern` covers shared build inputs and the e2e harness, and the graph lookup handles `packages/(apps|system|extra)/`. A path matching none of them escalates to the full suite and logs why, because both lanes read an empty selection as "skip Chainsaw" and then post `E2E Tests` green — so a silent default is a green gate with nothing tested (#3392). When that escalation fires for something genuinely inert, add it to `inert_config_pattern`; do not relax the fall-through. The escalation list and the inert list are checked in that order, so a specific escalation beats a broad inert directory.
+- **Coverage is decided per changed path.** A path that resolves through the graph but reaches no runnable suite is covered by nothing, so it forces the full run on its own account, whatever the rest of the diff selected. Reading that off the merged selection instead let any other changed path contributing a suite name swallow the escalation, with nothing in the output to record that it happened: change a platform component, adjust the Chainsaw test beside it, and the component's escalation disappeared behind that one suite (#3330). The unit is the path rather than the source, because one path can belong to several PackageSources, not all of which need reach a suite, and deciding per source would escalate on one that reaches none and run everything for every change to the path.
+- **Two sources are excluded from the reverse-dependency walk as install-ordering hubs.** Every `*-application` source depends on `cozystack.cozystack-engine` so its `*-rd` HelmRelease waits for the ApplicationDefinition CRD, and the sources that depend on `cozystack.cozystack-basics` do so to get a namespace or a platform-wide policy in place first. Neither edge says the dependent's behaviour changes when the hub does, so carrying selection across them goes wrong in both directions: through the engine a `cert-manager` change fans out to every app in the tree, and through basics the platform's namespace-and-policy package narrows to whichever single suite happens to land downstream of it — 22 suites down to one on #3426, where the new site-router suite sits under `kubevirt-cdi`, which depends on basics. Dropping the reverse edges leaves both hubs reachable and stops them propagating; a change to either still runs everything, because its own group then reaches no suite and the per-path escalation fires on it. Adding a third one is a real decision, not bookkeeping: it says every existing edge into that source is ordering rather than behaviour, so read them before extending the list.
+- **There is a fourth outcome, and it is a failed step rather than a selection.** It fires when the suite list itself is unavailable: `find` cannot list `hack/e2e-chainsaw/`, or that directory holds no suite in any of the layouts above. There is no fallback left to take, because escalating would print an empty list and both lanes read an empty selection as "skip Chainsaw" before posting `E2E Tests` green — the outcome meaning "run everything" would deliver a run of nothing. So the selector names what broke on stderr and exits non-zero; both lanes run the step under `bash -e`, so the job fails and the required check goes red. A red `Select E2E tests` step is a real signal, not a flake: read its stderr line before rerunning. A `yq` failure is deliberately not in this class — what is missing there is the dependency graph, not the suite list, so the selector still has a safe answer and escalates to the full suite. That is conservative but quiet: the only sign is one stderr line inside a step that passes, so a selector running blind on every PR looks exactly like a project that escalates a lot.
+- **Every escalation names its cause on stderr.** "Run everything" is the same list of suite names whichever rule produced it, so a reason line is the only thing that distinguishes the branches that can reach it, and without one the answer to "why did this pull request run the whole suite" has to be re-derived by hand from the diff. Four of them used to be silent — the shared `hack/e2e-chainsaw/_lib/` and `.chainsaw.yaml` case, the `full_suite_pattern` match, a `packages/` path no PackageSource claims, and the empty-selection backstop — and `full_suite_pattern` is the commonest cause of a full run by a wide margin, so the usual answer was the one the log never carried. Each line names the path or the sources that caused it, and a unit test asserts each message, because a reason that regresses to silence changes no selection and is invisible to every other test. The backstop is the exception: every rule that selects a suite by name membership-tests it where the path is classified, so nothing reaches the backstop and no test asserts its line; it stays as the guard for a future rule that forgets to. The lines go to **stderr** and must stay there: stdout is the suite list and both lanes parse it, so a reason line on stdout would be read as a suite name.
+- **The one path the fall-through cannot catch is a new e2e workflow.** `inert_config_pattern` makes `.github/` inert as a directory, and the workflows that run the suite are exempted from it by name in `full_suite_pattern`. A workflow added under `.github/workflows/` therefore reads as inert until someone adds it to that enumeration, and the fall-through never sees it. That is why the list carries a `rg -l test-chainsaw .github/workflows/` reminder: the enumeration is the guard, not a convenience.
+- The `full-e2e` PR label forces the whole suite.
+- The selection is passed to `make test-chainsaw CHAINSAW_SUITES="<names>"`, which runs `hack/e2e-chainsaw-run.sh <names>` from `hack/e2e-chainsaw/` (empty = every directory there). The runner hands chainsaw one suite at a time and runs the tests a single `chainsaw test <names>` would discover, no more and no fewer.
+- The coverage gap TIA opens on PRs is closed at release-cut time: the "Prepare release" commit bakes image digests into `packages/core/` (and other packages), which TIA escalates to the **full** suite — so the release PR exercises the whole suite against the commit the tag will point at.
+
+When adding a new app package, confirm `select-e2e.sh` maps it correctly (it has a unit test, `hack/select-e2e_test.bats`). A new app whose suite directory does not yet exist will not be selected — add `hack/e2e-chainsaw/<app>/chainsaw-test.yaml` first.
+
+`src_to_suites()` maps a PackageSource name to the suites it owns and is the inverse of `select-install.sh`'s `suite_to_source()`. A suite can have several owners: the Kubernetes suites create both Kubernetes and KubernetesNodes resources, and the VM suite creates both VMInstance and VMDisk. A test walks every owner through both tables, so a source whose name fits neither convention — not `<suite>-application`, not the suite name itself — fails there rather than quietly making its own suite unreachable, which turns every change to that package into a full run (#3665). Packages needed only by a suite, such as its backup APIs, belong to `suite_runtime_sources()` in the install selector; they do not change reverse ownership.
+
+#### What TIA does and does not do
+
+Be precise about TIA's scope — it is narrower than "skip E2E for unrelated PRs," and the wiring has consequences worth knowing before you rely on it or change it.
+
+- **It trims only which suites `chainsaw test` runs, not the expensive stages.** `Prepare environment` and `Install Cozystack` (the full platform install) run regardless of the selection. TIA only decides the `CHAINSAW_SUITES` passed to the final E2E step. A perfect narrow saves the suite tail, not the bulk of wall-time. (Package image builds are scoped separately by `hack/build-matrix.sh`; the Talos leg runs when its direct or shared inputs changed and remains unconditional for forks, while installer/finalize runs for every non-docs PR. That is a distinct mechanism from TIA's suite trimming.)
+- **`Select E2E tests` runs *after* `Install Cozystack` and has no `always()`.** GitHub implicitly ANDs a step's `if:` with `success()`, so if install fails the selector (and `Run E2E tests`) are skipped entirely. On a red install you will not see TIA narrow anything — that is the ordering, not a selector bug.
+- **Most PRs legitimately escalate to the full suite.** Platform manifests live under `packages/core/`, Go under `api/`/`internal/`, helpers under `hack/`, plus the `Makefile` — touching any one triggers the full suite. So "all suites selected" is usually correct, not a failure to narrow.
+- **Two skip layers, with a gap.** The `plan` job computes a coarse docs-only gate (`code`, true for any change outside `docs/**`) that skips the whole build+E2E pipeline for docs-only PRs, plus a per-package build matrix (`hack/build-matrix.sh`) that scopes which images build. TIA's finer skip (`select-e2e.sh` ignoring `docs/`, `dashboards/`, `*.md` and the rest of `inert_config_pattern`) only trims the suite selection. A PR touching only `dashboards/*.json` therefore still runs install, then skips just the Chainsaw suites — near-zero savings. If you need such PRs to skip the pipeline, widen the `plan` docs-gate, not `select-e2e.sh`.
+
+### 8. Failure must be self-explanatory — diagnostics are first-class
+
+- On install failure, the CI step dumps `kubectl get hr -A -o wide`, a `describe` of each non-Ready HR, and sorted events, all under collapsible `::group::` blocks.
+- On E2E failure, the CI step dumps `kubectl get hr -A`, sorted events, and COSI bucket/claim/access readiness columns (those CRDs ship no printer columns, so plain `get` shows only NAME/AGE). The whole suite run is one CI step, so this dump is at run level; Chainsaw's own per-`Test` `catch` blocks add scoped events/describe/podLogs for the failing suite.
+- **A suite whose pods outlive it fails where it leaked, not where the memory ran out.** A suite can pass and still leave its workloads running — brokers of Kafka releases whose application was deleted, a TenantControlPlane stuck on its finalizer — and the first thing to notice used to be a later suite failing on `Insufficient memory`, hours on and under the wrong name. Chainsaw v0.2.15 has no hook that runs after a test's cleanup (its Configuration carries `error.catch`, which runs only on failure), so `hack/e2e-chainsaw-run.sh` runs one `chainsaw test` per suite directory and checks between them, with `hack/e2e-chainsaw/_lib/leak-guard.sh`. A pod is charged to the suite when it is not terminal, did not exist before the suite, and the root of its ownerReferences chain was created at or after the suite started on the apiserver's clock; a platform pod replaced mid-suite still traces back to an object the install created, so it is not charged. Charged pods get the default `timeouts.cleanup` of `.chainsaw.yaml` (5m), counted from when `chainsaw test` returns and so after any per-suite cleanup override has been spent, to disappear; past that the run prints `LEAKED-PODS suite=<dir>` with one line per pod and its root, raises a `leaked-pods` error annotation, and adds a failed `leak-guard` case to `chainsaw-report.xml`. Every suite that leaves nothing behind logs how long it took to clear, and leftovers of a suite that already failed are reported once as a warning, without the wait. The wait has three outcomes, and nothing is retried. A timeout or a spent budget gives the verdict from the last good pod list, including when the re-list after it fails: a leak fails the suite. Any other error on a wait or a re-list, before the budget is spent and before any timeout, stops the waiting and is reported as `LEAKED-PODS suite=<dir> count=N inconclusive="<error>"`, a warning rather than a failure, so an apiserver blip while waiting cannot turn into a leak red. A wait that fails only after running for its whole timeout counts as a timeout whatever kubectl printed, since kubectl reports a deadline that passes before its watch starts as the client's `context deadline exceeded`. An apiserver blip before a suite starts is different: if the reading taken ahead of the suite fails, that suite is not run and is reported as not run, which fails the run. A failed first reading after a suite leaves the suite unchecked, and it fails with a `leak-guard` annotation and a report case saying the cluster could not be read, not that it leaked. A suite with a known, filed leak is listed in `hack/e2e-chainsaw/_lib/leak-allowlist.txt` as `<suite-dir> <issue-ref>`; its leak prints as a warning and does not fail. The exemption covers the whole suite, so the PR that fixes the issue deletes the line, and an entry naming a directory that is not a suite stops the run before the first suite.
+- Inside a suite, attach scoped diagnostics with a top-level `catch:` block (`events`, `describe`, `podLogs`, `get`) rather than letting a bare assert failure through — see `hack/e2e-chainsaw/bucket/chainsaw-test.yaml` and `hack/e2e-chainsaw/harbor/chainsaw-test.yaml`. This replaces the BATS `... || { echo …; kubectl get/describe …; false; }` idiom.
+- `make collect-report` → `hack/cozyreport.sh` uploads a full `cozyreport.tgz` (operator/Flux/cert-manager logs, LINSTOR resources and volumes, per-node ZFS datasets in exact bytes, Kamaji, Talos dmesg, COSI YAML) on every run, and the Chainsaw JUnit report (`chainsaw-report.xml`) is uploaded as its own artifact.
+- **Which machine a run landed on is recorded before the sandbox container exists**, in `sandbox-host/runner-identity.txt`: the OCI shape, both region keys, the availability and fault domain, the numbers of the `shapeConfig` sizing object, and the runner VM's own kernel release, online CPU count and processor model. A lane asks for a runner class rather than for a machine — a flex shape is filled from whatever capacity the pool has, and the region is a preference with a fallback — so without this a red run and a green one cannot be compared by the hardware they ran on, which is the first question a flake that only some runs have will raise. `hack/e2e-runner-identity.sh` takes the read on the runner VM, from `packages/core/testing/Makefile`'s `apply` target, because the metadata service answers on a link-local address the sandbox container has no guaranteed route to, and an "unreachable" answered from in there would look exactly like a capture that had tried. Every e2e lane reaches the sandbox through `make prepare-env`, so the record is taken once per run in each of them, on the passing path as well as the failing one. It goes to the job log as well as to the file, and the log copy is not a convenience: a run whose sandbox never came up has no `cozyreport.tgz` at all, so on that one path the log is the only place the record exists.
+- **The keys are fetched one at a time and the root instance document never is.** That document carries the instance and compartment OCIDs, the image OCID, the display name, the hostname and the user-supplied metadata bag, and the report is a public artifact — so asking per key makes the privacy property something the wire settles rather than something a filter has to be trusted for. It also removes a guess: Oracle documents the shape sizing under its own `shapeConfig` subpath and the root document does not carry that object at all, so a reader hunting it inside the root document would have reported the size of every machine as unknown and blamed the service for it. From the sizing object only the numbers are kept, and only under keys shaped like field names, which makes the rule hold for keys nobody has seen yet: a size is a number, an identifier is a string, and a key is printed into the record exactly as a value is. That object is also refused whole unless it arrives as one complete JSON object, so a truncated answer or a top-level array cannot be read in part and published as a sizing record. A per-key answer that is not one scalar is named as such rather than printed, since a service answering a whole document to a key request is the one way the design could still publish what it never asked for. The first key doubles as the probe and is held to answering like this service does, so a machine that is not an OCI instance costs one ceiling rather than one per key whether the address is silent or something else is answering on it, and either way the run leaves an `imds unreachable` line to grep for. Every read is taken through a wall-clock ceiling, because a diagnostic that hangs costs the step its whole budget without ever reaching an exit status; where `timeout` is not on PATH the local reads run unbounded instead of not at all and the record says so in a `[bounds]` line, the same trade `hack/cozyreport.sh` makes for its own reads. None of it is fatal, since this runs inside the one retried step in the job — a runner that is not an OCI instance leaves an `imds unreachable` line and an exit status of 0. The report writes that filename either way, holding the record or the reason there is none, because an unidentified runner and an unremarkable one would otherwise leave the same absence.
+- **The report's per-pod evidence, under `kubernetes/pods/` in `cozyreport.tgz`, is selected by the READY column rather than by STATUS** — so a pod left at `0/1 Running` by a readiness probe that never passes is in scope, where before it was not. In scope is not the same as collected: the walk stops at `COZY_REPORT_PODS_MAX` pods or `COZY_REPORT_PODS_BUDGET` seconds, and what it did not reach is named in the artifact rather than dropped in silence, as the next point describes. Selecting on the STATUS column alone drops exactly that pod, and it is a common way for a suite to time out: the replica never joins, its HelmRelease sits in `InProgress`, and the artifact carries no trace of the pod the run died on. Terminal `Succeeded`/`Completed` pods stay excluded, since they legitimately end unready. Widening the selection and capping the walk are only safe together if the widening cannot displace what the uncapped walk always kept, so the collection order splits by evidence class before namespace: every pod that is not `Running` — a crash loop, `Pending`, `Error`, the class the collector took before this — is ordered ahead of every pod that is `Running` but unready, and `COZY_REPORT_PREFER_NS` orders within each of those two classes rather than across the whole selection. Otherwise a failed install with more not-Ready pods than the cap spends it on newly-in-scope tenant pods and drops the container logs of the platform pod that is actually crashing.
+- **Every bound that the report's pod collection hits is named in the artifact, not only in the job log.** The pod walk stops at `COZY_REPORT_PODS_MAX` pods or `COZY_REPORT_PODS_BUDGET` seconds and leaves `COLLECTION-TRUNCATED.txt` naming whichever fired; a pod it cut off part way through leaves `CONTAINER-LOGS-TRUNCATED.txt`; a pod list that never came back leaves `COLLECTION-FAILED.txt` rather than the empty tree a healthy cluster produces; a missing local `timeout` leaves `COLLECTION-UNBOUNDED.txt`, because the reads still run, just without a ceiling, and a missing dependency on the machine writing the report is not a statement about the cluster; a kind this cluster does not serve at all — `kubectl get vm -A` on an install without KubeVirt, which exits non-zero — leaves `KIND-NOT-SERVED.txt` rather than a failure marker, since that is the cluster answering correctly and a marker that fires on healthy installs is one a reader learns to skip; and a knob value the collector could not use is named too, appended to `COLLECTION-TRUNCATED.txt` when there is one, written to `COLLECTION-NOTES.txt` when there is not, and appended to `COLLECTION-FAILED.txt` instead when the pod list itself never returned, so the note always sits beside the failure it accompanies rather than in a file the reader has no reason to open, and a bound that turns out to be the default is not mistaken for the bound that was asked for. A pod whose container list came back as a prefix — kubectl named some containers and then failed — leaves `CONTAINER-LIST-INCOMPLETE.txt` beside the logs it did manage to read, because the containers it never named have no file at all and their absence would otherwise read as containers that were silent. A read that succeeded while kubectl also wrote to stderr — a deprecation notice, a partial-result warning — leaves that message in `READ-WARNINGS.txt` beside the object rather than inside it, since `pod.yaml` and the logs are machine-read and a warning line in them costs the parser the file, while dropping it altogether would be the silent loss of evidence this tree exists to prevent. A pod directory whose containers produced any log at all also carries `CONTAINER-LOGS-BOUND.txt`, naming the `--tail` bound those logs were written under (a pod whose every container was silent has no bounded log to describe, so the file is absent), because `--tail` drops the oldest lines and nothing in a log says so; it sits beside the logs rather than inside them, since a log read in full is a complete artifact and the platform's controllers log JSON per line, so a trailing prose line would break every parser that could read the file before. A pod whose container list could not be read leaves `logs-UNAVAILABLE.txt` in its own directory, carrying kubectl's reason, because a pod directory holding `pod.yaml` and `describe.txt` and no logs at all otherwise reads as a pod whose containers were silent. The VM, VMI and services loops carry the same pair of bounds as constants rather than knobs, so a failed install that leaves every LoadBalancer without an address collects the first of them and names the rest instead of running the report step past its own `timeout-minutes: 30`, which would lose the tarball rather than truncate it, since the collector writes it on its last line. That step ceiling is the outer backstop for a read with no bound of its own; it does not save this report, it saves the steps after it, the other uploads included. It carries `continue-on-error: true` alongside, because the step's `|| true` is its standing statement that collecting diagnostics is never fatal and a step killed at its ceiling never reaches that `|| true` — without it a passing run whose collection ran long would be published as a failed one, and every later `failure()` in the job would start meaning "the tests failed or the report was slow". That tolerance also hides the overrun, since the step then renders green, so a following step turns the collect step's `outcome` into a `::warning::` annotation — a bound that fires is recorded, and the outer bound is not exempt from the rule the inner ones follow. The LINSTOR reads that run a command inside a pod carry a ceiling too — they are the only reads whose duration a workload sets rather than the apiserver, and a wedged controller holds the stream open with nothing on either end to close it — and they record a cutoff in `COLLECTION-FAILED.txt` beside their output, which for the two that stream a gzipped tarball is the only place it can go, since a line of prose inside one is an archive nothing opens; the ones that produce a table carry the marker in the file as well. A LINSTOR table that got nothing at all — the wedged controller killed before it wrote a byte — says so in the file rather than shipping at zero length, and a read whose stderr could not be captured says that too instead of reporting silence. A LINSTOR table that wrote output and then failed carries the marker inside itself whether the clock or the command ended it, in the same `# [cozyreport]` form every other in-file marker uses so one anchored grep finds them all, and the note about a satellite pod list that came back short lands under `linstor/error-reports/` beside the bundles rather than in the shared Kubernetes file, like every other `.txt` in the tarball, because a short node list whose explanation sits one directory up reads as a small cluster; the two archives cannot take one, since a line of prose inside a gzip stream is a file nothing opens. Off the clock the in-file marker on a table names the exit status and does not say `TRUNCATED`, because `kubectl exec` passes the remote status through, and a command that lists everything it can and exits 1 for one argument it could not open — `zfs list` over a missing pool — wrote a complete listing. A cut-off bundle goes one of two ways and the note names both: a stream that got members across is kept and truncated, so a short member list there is the cutoff rather than a satellite with few reports, while a stream killed before its first byte leaves zero bytes and the emptiness check at the call site removes it. The reader runs before that check, so it says which two outcomes are possible instead of asserting one. The LINSTOR reads whose output is a table keep the remote command's whole message in the file itself when the command produced no table of its own — a partial table plus an error keeps the message beside the file instead, so the table stays a table — because `kubectl exec` appends its own `command terminated with exit code N` last — so the last line there is the one line that never carries the cause, and a listing sent away from its own error is a zero-byte file saying nothing. That note states what the status leaves open instead of resolving it: `kubectl exec` returns the remote command's own exit status, so a 124 there is either the collector's deadline firing or the command itself exiting 124, and nothing separates the two. Every other read in the collector carries a ceiling too, gates included — an `if kubectl get deploy …` that decides whether a module runs is a read, and an unbounded one ends the whole report before the module it guards. A gate cut off short is recorded rather than treated as an answer, because skipping the module produces the same empty tree as a cluster that never had the component; a gate that answers "not installed" is recorded nowhere, since that is the cluster answering correctly and a marker firing on every install without KubeVirt is one a reader learns to skip. What a per-read ceiling does **not** give you is a ceiling on the report: the pod, VM, VMI and services walks carry a count cap and a time budget, and every other per-object walk in the collector carries neither, so their cost is the cluster's to set and a failed install with a hundred not-Ready HelmReleases spends four hundred bounded reads there, four per release. Described as "the walks outside those four" rather than listed by name, because a list of them drifts and reads as complete while it does so — which is the defect this same change removed from the collector's own header. The step's `timeout-minutes` is what bounds that, not the per-read wrapper. Whichever bound stopped a walk says so in `COLLECTION-TRUNCATED.txt`, count and clock alike, because objects removed by the clock while the count note stood alone would read as a cap that never fired. The read that feeds each loop is bounded too: the budget cannot start until rows arrive, so an apiserver hanging on the cluster-wide list would otherwise spend the whole collection step with the deadline never consulted. The budget is a deadline for starting a read rather than for finishing the walk, and it is rechecked between containers but not between a container's current and previous log, so the ceiling is the budget plus one pod's object reads plus both log reads of one container, which is the price of never leaving a half-written file behind.
+- **`COZY_REPORT_POD_TAIL` bounds each container log** at 2000 lines by default, and a log that was read successfully records which bound it was written under, since `--tail` drops the oldest lines and a file that begins mid-stream looks exactly like a complete one; `-1` restores kubectl's own default of the whole log. `COZY_REPORT_PREFER_NS` (default `tenant-`) is collected first, so a cap that only bites on a broadly degraded cluster is not spent on platform namespaces while the pod the suite died on falls off the end.
+- **Capture the PREVIOUS container instance, not just the current one.** For a crash-looping pod `kubectl logs` (and the Chainsaw `podLogs` collector, which in v0.2.15 has no `previous` option — it does accept `name`/`namespace`/`selector`/`container`/`tail`/`timeout`/`cluster`/`clusters`) shows the Nth restart — a fresh replay of the same startup path — while the evidence that explains the failure sits in the immediately preceding instance, reachable only via `--previous` and lost for good once the kubelet garbage-collects that container. `hack/e2e-capture-previous-logs.sh` closes this once for every suite from the global `error.catch` (and from `hack/cozytest.sh` for the e2e BATS suites) rather than per-suite: it discovers containers with `restartCount > 0` at runtime — init containers included, since an interrupted bootstrap lives there — orders the app suites' `tenant-test` namespace first (a best-effort ordering only — it never restricts the capture, and for a suite whose pods live in a child tenant namespace it simply degrades to input order), and dumps each to the job log and to `snapshots/<test>/previous-logs/`. Containers that never restarted are skipped, so a healthy run emits one line, not a page of "previous terminated container not found". Every way the capture can come up short is named rather than inferred: the `COZY_PREVLOG_MAX` overflow, a malformed cap, a `COZY_PREVLOG_TAIL` that was rejected and fell back to 200 (a zero or leading-zero tail asks kubectl for nothing, which would otherwise be reported as the container having logged nothing), the tail bound each kept log was written under — named in `capture-notes.txt` beside the logs rather than inside them, since `--tail` drops the oldest lines and nothing in the output says so while a log read in full is a complete artifact that a trailing prose line would stop any parser from reading, and suppressed on `-1` because no bound was applied then — a pod list that never returned (which is NOT the same as "nothing restarted" and must not be reported as such), a read that timed out versus one kubectl itself refused (kubelet GC, RBAC, an unreachable node — different problems that a blanket "kubelet GC" line would hide), a previous instance that produced no output, and a capture the outer backstop cut short. A partial log is kept and marked truncated, never deleted — it is the only copy of something already gone from the cluster. Each of those lines the script itself emits is written to `snapshots/<test>/previous-logs/capture-notes.txt` as well as to the job log, and the directory is created before the first of them, so a reader who has only the uploaded artifact can still tell a capture that found nothing from one that never ran. The outer backstop firing is the exception: that line comes from the callers, after the script has already been killed, and reaches the job log only. `hack/cozytest.sh` arms this capture, and the other two legs, only for suites whose own filename or whose parent directory carries the `e2e-` prefix, because all three read cluster state and a unit runner has `kubectl` on PATH with no cluster behind it, so a red unit test used to walk into the kubectl-gated legs on its way out, and into the crust-gather one as well on any machine where that binary happened to be installed.
+- **The data-plane collector is the third capture leg, and the only one that reads forwarding state off the node.** `hack/e2e-capture-dataplane.sh` runs after the crust-gather snapshot, from `hack/cozytest.sh` for the e2e BATS suites and from the global `error.catch` in `hack/e2e-chainsaw/.chainsaw.yaml` for the Chainsaw ones, and it collects what an object-state snapshot structurally cannot: the cilium endpoint and BPF conntrack view from an affected pod's node, the kernel conntrack table that is the authoritative one for the host-to-local-pod path under `enable-host-legacy-routing`, and the LoadBalancer datapath. Its two callers bound it differently, 600s from `cozytest.sh` and 300s from the Chainsaw catch, so the collector keeps its own wall-clock budget (`COZY_DATAPLANE_BUDGET`) under each: 270s by default, under the Chainsaw one, and 570s passed by `cozytest.sh`. Every call is cut to what is left, nothing starts once it is spent, and the last 90s are kept for the LoadBalancer section. It holds the same notes contract as the previous-logs collector: every read carries its own ceiling, and why a read produced nothing goes to `capture-notes.txt` beside the capture rather than only to the job log, because an empty result and a read that never answered are the same bytes on disk and only the note tells them apart. The two EndpointSlice reads in the LoadBalancer path follow it too, and write `<unknown>` rather than `<none>` when the read did not answer.
+- **A catch script needs an explicit `timeout:` that exceeds the inner budgets it contains.** A Chainsaw `script` op is bounded by `timeouts.exec` (5m in `.chainsaw.yaml`) unless it overrides it, so a catch whose own `timeout -k …` wrappers sum past that is *structurally guaranteed* to hit the ceiling — it reports `SCRIPT | ERROR | signal: killed` and yields little. That kill is strictly worse than an inner `timeout` firing, and worse in a way the process tree makes precise: the ceiling SIGKILLs the **shell process alone**, not its process group. Chainsaw runs the shell under `exec.CommandContext` (`pkg/engine/operations/script/operation.go`), whose default cancel is `Process.Kill()` on the shell PID, so every later step in the script is skipped but any collector the shell already spawned is orphaned rather than killed — it keeps running, and it keeps the script's stdout/stderr pipe open. Because that op wires stdout/stderr to in-process buffers, `cmd.Wait()` does not return until the pipe reaches EOF, which needs every inherited fd closed, so the op does not even come back **at** its ceiling until the orphan exits on its own — the ceiling stops being a reliable cut (#4268, where the bucket suite's `verify-every-bucket-takes-a-write` step ran 606s under a 300s ceiling because `mc` kept retrying after the shell was gone). An inner `timeout` instead kills that read at a known budget, exits 124, leaves a partial capture on disk, and lets the rest of the catch run — which is why every read must carry its own cap rather than lean on the op ceiling. Size the op timeout above the sum of the inner budgets and let the inner ones be what fires.
+- **When the sum cannot fit the op, bound the collection phase as a phase rather than raising the op.** The rule above assumes the inner budgets add up to something an op timeout can sit above. On a failure path that has accumulated collectors it stops being true — the tenant-Kubernetes node-join path in `hack/e2e-chainsaw/_lib/run-kubernetes.sh` sums past what is left of its 67m op once the bringup ahead of it and the snapshot behind it are counted, and several of its reads carry only `--request-timeout`, which bounds one HTTP request rather than a client retrying against a wedged apiserver, so parts of it have no ceiling to add up in the first place. Raising the op ceiling does not fix that shape, it postpones it: a larger ceiling multiplied by a sum that grows with every collector added is the same problem one collector later. What works instead is a wall-clock budget for the whole phase (`COZY_DIAG_PHASE_BUDGET`, with `cozy_diag_phase_start` / `cozy_diag_phase_has_time`): once it is spent, the collectors that have not started are declined out loud instead of attempted, so whatever must run after the phase — the tenant crust-gather snapshot, in that case — is never queued behind work begun past the deadline. Two consequences worth carrying to the next collector. The budget bounds when a collector may *start*, not when the phase ends, so it is not a worst case and the comment next to it must not be written as one. And because what runs last is what gets declined, source order becomes load-bearing: put the cheap reads that discriminate between failure modes ahead of the collectors that cost minutes, or the budget will spend itself on the expensive ones and drop the evidence the path exists to produce.
+- **Set `crust-gather --duration` explicitly.** It is crust-gather's own budget for the collection phase and it defaults to **60s**; on elapse it abandons the collection and skips its finish step, leaving a partial tree with nothing to say the rest is missing. The outer wall-clock must exceed it, because the API discovery crust-gather runs *first* is not covered by that budget at all — with an unhealthy aggregated APIService (the state a failed e2e is usually in) aggregated discovery times out and the fallback re-walks every group, which can consume the entire outer timeout before a single object is written. Do not diagnose a killed snapshot by bumping the outer number alone; the two budgets bound different phases. Send the collector's output to a log inside the snapshot rather than `/dev/null` so "complete or truncated?" is answerable from the artifact.
+- **A collector that only runs on failure answers in one direction.** Its output has no measured value to be read against, so a claim like "this boot was slow" rests on an impression of what a healthy run looks like rather than on a number from one. Where the evidence is destroyed by teardown — the tenant worker's guest serial console goes with the Pod that holds the stream — the baseline has to be taken on the passing run or it does not exist at all, which is why `hack/e2e-chainsaw/_lib/run-kubernetes.sh` captures that console on both paths and records which one it was. A passing-path collector is held to two rules the failure path does not need. It must not fail the suite, since everything the suite exists to prove has already passed by the time it runs — and its own cost counts, not just its exit status, so a collector that costs minutes declines itself out loud when the operation's ceiling no longer has room for what it is about to spend, rather than starting a walk that the ceiling cuts off mid-write. That bounds the collector's contribution and nothing else: work already on the path with no ceiling of its own stays unbounded, and no reserve makes it fit by arithmetic. And what it could not collect **at all** has to reach the **job log**, not only the report, because a green run's artifact is the one nobody downloads. Per-read outcomes stay beside the read in the report, as everywhere else in that collector: a note about one console is only usable next to that console, while a walk that collected nothing is a fact about the run.
+- **A diagnostic that carries a relative clock also has to carry the absolute one.** A guest kernel stamps its console in seconds since its own boot, so a log that ends at 500 seconds says how far that guest got and nothing about when. Whether it stopped early because it started late or because it stopped printing is decided by the instant the read happened and the instant the guest started, and neither is in the file: the first survives only as the artifact's mtime, which is metadata rather than content and so is invisible to anyone reading the log and lost by anything that regenerates it, and the second only in a `describe` dump that a healthy-looking capture never triggers. Write both beside the capture, and name the units on each — an epoch integer and an RFC 3339 string subtract to nonsense if a reader takes them as printed.
+- **Per-failed-test crust-gather snapshots** are the richest diagnostic — a `crust-gather serve`-able archive of the cluster *at the moment of failure*, before cleanup. The global `error.catch` in `hack/e2e-chainsaw/.chainsaw.yaml` captures the **host** cluster into `_out/cozyreport/snapshots/<test>/host` on any failure (the Chainsaw analog of the `hack/cozytest.sh` EXIT-trap snapshot used by the e2e BATS suites); the kubernetes suites additionally snapshot their **tenant** cluster from `hack/e2e-chainsaw/_lib/run-kubernetes.sh` while the tenant API LB is still routable. `hack/cozyreport.sh` folds `snapshots/` into the artifact. Do not remove the global catch — without it the Chainsaw suite uploads a report with no per-test cluster state.
+
+### 9. Keep the test environment deterministic
+
+- **Pre-pull** every kubeovn / linstor / cert-manager image onto all nodes before those HelmReleases install (`hack/e2e-prepull-images.sh`), so clustered workloads (OVN raft, LINSTOR, the cert-manager webhook) do not fail on per-node image-pull stagger.
+- **Exclude loop devices** from host LVM scanning in the Talos machine config so the host does not activate volume groups inside loop-mounted e2e disk images.
+- **Fail fast on node readiness** (≈5m, then bail) rather than marching into LB/NFS tests that will also fail — it saves several minutes per attempt and keeps the real failure at the top of the log.
+- **Give the sandbox a runner class strictly larger than its nodes.** The management nodes get fixed CPU and memory (`hack/e2e-compose.yaml`, holding the same figures `hack/e2e-prepare-cluster.bats` gives its QEMU guests), and those resources are committed for the whole run, so a lane whose runner only just covers them leaves the host nothing for containerd and the runner agent. A new e2e lane picks its `runs-on` accordingly; `hack/sandbox-runner-headroom.bats` derives both sides and fails the unit suite when any lane loses that margin.
+
+### 10. The E2E workflow split: same-repo vs fork, and the "E2E Tests" commit status
+
+A fork's `pull_request` run carries no registry credentials, so it cannot push the images the e2e sandbox pulls. E2E therefore runs across **two** workflows:
+
+- **`.github/workflows/pull-requests.yaml`** runs e2e in-tree for **same-repo** PRs (the `e2e` job, named `E2E (in-tree)`). Fork PRs skip this job.
+- **`.github/workflows/e2e-fork.yaml`** runs e2e for **fork** PRs via a privileged `workflow_run` that fires after the fork's Pull Request run completes. It pushes the fork-built images to the registry and runs the suite — the same Chainsaw + TIA path as in-tree (§7) — in an ephemeral sandbox that itself has no push credentials.
+
+Consequences to keep in mind when touching either workflow:
+
+- **Fork builds export, they do not push (`OCI_EXPORT_DIR`).** The fork's unprivileged build sets `OCI_EXPORT_DIR` (see `hack/common-envs.mk`) so every image is written to a per-image OCI archive artifact instead of being pushed; the privileged `e2e-fork.yaml` later pushes those archives to the registry **by digest**. Any build recipe that shells out to push directly — e.g. a `skopeo copy … docker://…` that bypasses the `image-tags`/`oci-output` macros — must honour `OCI_EXPORT_DIR` too, or a fork build dies with an anonymous-push `denied` (#3257). This is covered by `hack/common-envs_test.bats`.
+- **"E2E Tests" is a commit status — not a job, and not a check-run.** The required merge-gate context named `E2E Tests` is a GitHub **commit status**, posted by the `plan`/`e2e-report` pair for same-repo PRs and by `e2e-fork.yaml`'s `resolve`/`report` pair for forks — **not** the `e2e` job itself. Each lane opens the context with `pending` and concludes it when the suite is done, and the opener is not optional: a commit status never expires, so a head SHA that already went green would otherwise keep reading green from the moment a re-run, a reopen or a `full-e2e` label starts a new run until that run reports, leaving the pull request mergeable across a suite that may be about to fail. While the gate was a job, a fresh non-success check run appeared automatically and closed that window. The two lanes close it at different speeds, and the fork lane does not close it entirely. Same-repo, the opener is `plan`'s first step, so the window lasts seconds. On a fork the opener is `resolve`, which cannot run until the unprivileged build has finished, so re-running an already-green fork head leaves the old green readable for the length of that build. The gap is structural rather than an oversight: a fork's `pull_request` token is read-only and cannot write a status at all, which is the same property the rest of this design relies on. It is bounded by the build and it is the one case where "the opener closes the window" is not literally true. Two reasons it is a status:
+  - *Not a job:* a required *job* that is skipped (as the `e2e` job is for forks) counts as passed by branch protection — exactly how fork PRs used to merge with e2e never run (#3257). A status is `success` only when the report step posts it; a never-posted required status stays "Expected" and blocks the merge. If you rename the `e2e` job, do **not** name it `E2E Tests` and do not wire branch protection to a job name — the status must stay the gate.
+  - *Not a check-run:* a check-run created with the default `GITHUB_TOKEN` floats into an arbitrary GitHub Actions check-suite (in practice the earliest-registered one, a tiny labeler — that is why `E2E Tests` once rendered under "PR size label"), and an app-token check-run would need the COZYSTACK_CI app granted `checks: write`. A commit status has neither problem: branch protection matches it by context name and it carries no check-suite grouping. It is safe to post with the default token because a fork's `pull_request` token is **read-only** and cannot post a status — so only same-repo runs (`plan`'s opener and `e2e-report`, both guarded `!fork`) and the privileged `workflow_run` in `e2e-fork.yaml` can set it. Each publishing job carries `permissions: statuses: write` and calls `repos.createCommitStatus`. `plan`'s opener is additionally `continue-on-error`, since every build and test job hangs off `plan` and a transient status-API failure there must not discard the run; losing it only restores the stale-green window for that one run.
+  **Consequence for branch protection:** require the `E2E Tests` **status context** (no GitHub App and no app-id pin needed).
+
+- **Fork TIA reads trusted inputs, but the fork still writes the selector.** `e2e-fork.yaml`'s `e2e` job runs the same `select-e2e.sh` TIA as in-tree (§7), and its inputs are hardened: the changed-file list and the `full-e2e` label come from `resolve`'s base-repo API lookups (`pulls.listFiles` / the PR's labels), the same trusted source as the docs-only decision, passed in as outputs (`changed_b64`, `full_e2e`) rather than re-derived from a `git diff` of the fork-controlled merge ref. Keep that part as it is: re-deriving the selection from the checked-out tree would add a second bypass for no gain.
+- **What the fork lane is, and is not.** The `e2e` job runs from the fork's tree, so `select-e2e.sh`, the suites under `hack/e2e-chainsaw/`, `hack/e2e-install-cozystack.bats` and `packages/core/testing`'s recipes are all fork-authored. A fork that wants its own suite to report green can edit any of them, and hardening the TIA inputs does not change that. Read the lane accordingly: it is a correctness gate that stops an honest contributor shipping a regression, not a boundary against a hostile one. What contains a hostile fork is that no fork run executes without maintainer approval (below), that the job holds no push credential, and that a diff editing the test harness is visible in review.
+
+- **A fork PR that adds a new image cannot go green until that image exists on the base branch.** `publish` derives the set of archive names it will accept from the base parent (`HEAD^1`), so that a fork cannot mint arbitrary repositories under the CI registry by naming an artifact. An image the PR itself introduces is therefore not in that set, and the job fails with `image '<name>' is not in the base-tree allowlist`. This is fail-closed by design and there is no label override — land the image on the base branch first, or run the suite from a same-repo branch. If a fork e2e run fails on that line, the contribution is not broken; the allowlist is doing its job. So that a contributor learns this before the build rather than after it, `plan` in `pull-requests.yaml` runs `hack/fork-new-images.sh` on fork PRs and fails with the names of the new images. That check runs from the fork's tree and is a courtesy, not the boundary; `hack/fork-new-images.bats` holds its derivation to the one `publish` uses.
+
+- **`labeled` events run in their own concurrency group, and a cancelled run reports nothing.** Because the gate is a status rather than a job, a run that dies without posting leaves the head SHA at "Expected" — which blocks the merge rather than passing it. Several separate pieces implement it, and weakening any one of them reopens the gap. Each lane's terminal reporter runs under `!cancelled()` rather than `always()`, so a run that was cancelled publishes nothing at all and the `pending` it opened stands until the run that superseded it reports. Each lane's concurrency key then keeps a run that is going to publish nothing out of the group of the run that is: `pull-requests.yaml`'s appends `-label` for a `labeled` event that `plan` discards, so labelling an open PR cannot cancel a live `opened`/`synchronize` run (the replacement run would never post the status the cancelled run was going to) — the condition is the complement of `plan`'s guard, so a `full-e2e` label, which does publish, stays in the main group and supersedes the head run instead of racing it, `e2e-fork.yaml`'s concurrency key appends the triggering run's id when that run concluded `cancelled` or `skipped` so a privileged run that is going to post nothing cannot cancel the one that is going to post, and `e2e-fork.yaml`'s `resolve` returns early on a `cancelled`/`skipped` triggering run instead of posting `failure` for it. If you touch any of them, keep the invariant: exactly one run per head SHA is responsible for the status, and a run that is not that one must post nothing at all.
+
+**Security prerequisite (repo setting).** The split is only safe if fork runs require maintainer approval before they execute. The repository must keep **Settings → Actions → "Require approval for all outside collaborators"** enabled, so a fork's `pull_request` run — which produces the artifacts `e2e-fork.yaml` consumes — cannot run untrusted code (or feed the privileged run) without a maintainer's go-ahead.
+
+### 11. Never negate a BATS assertion with `!`
+
+An assertion spelled `! cmd` inside an `@test` body cannot fail, whichever runner executes it. POSIX exempts a command whose return value is inverted with `!` from `set -e`, so the failing status is dropped where it is produced. `hack/cozytest.sh` then appends `return 0` to every test function, so it never resurfaces as the test's own status. The `bats` binary looks stricter and mostly is not: its ERR trap carries the identical exemption, and `bash -c 'set -eE; trap "echo TRAP" ERR; ! true; echo REACHED'` prints `REACHED`, runs no trap, and exits zero. The one shape `bats` does catch is a negated assertion standing **last** in the body, where the inverted status is what the function returns — put any statement below it and `bats` passes the test too. This is the same family as the ban on test-level `EXIT`/`RETURN` traps, and unlike that one it is not settled by preferring the stricter runner, because there is no stricter runner to prefer.
+
+The exemption is also wider than the "negated pipeline" phrasing found in older comments: a bare `! true`, a negated `[ … ]`, one inside a `for` body, and one following `;`, `&&` or `||` all pass. Write the absence so that it fails — `if cmd; then echo "FAIL: <what must not have happened>"; false; fi` — and let the `false` carry the verdict. `hack/bats-no-negated-assert.bats` enforces this across every `hack/**/*.bats`, subdirectories included. Inverted **conditions** (`if !`, `elif !`, `while !`, `until !`) are untouched, because `set -e` is not what decides a condition. `[ ! -f x ]` is untouched for a different reason and stays a normal, failing assertion: the `!` there is an operator of `test`, not negation of a command, so nothing exempts its status. The scan is lexical, with the limits that implies: a statement assembled at runtime is invisible to it, and the form is counted inside a heredoc or a fixture string where no command exists — which reports a file holding nothing rather than passing one that does, and is why that guard's own fixtures build the token from a separate `printf` argument.
+
+## Chainsaw v0.2.15 gotchas
+
+The suite is pinned to Chainsaw **v0.2.15** (the latest release as of May 2026); none of the traps below are fixed upstream yet, so the workarounds stay until a bump is possible. Each one has already cost a debugging session — this is the "no one gets it right the first time" list, worth a read before writing a new assert.
+
+- **Condition asserts must use the filter-as-list form.** `(conditions[?type == 'Ready'])` evaluates to a *list*; assert against it with a list body (`- status: "True"`). The indexed `(conditions[?type == 'Ready'])[0]` form throws `field not found` (also enforced by convention 2).
+- **No number literals / backticks in JMESPath.** `` ports[?port == `443`] `` mis-evaluates in v0.2.15 — the numeric comparison silently returns the wrong set. Assert ports (and any numeric field) with the exact-ordered projection form instead: `(ports[*].port): [80, 443]`. `sort()` and `contains(list, <number>)` are likewise broken with numeric arguments.
+- **`error:` fails hard on an unknown GVK.** Unlike the BATS `! kubectl get <kind>` idiom (which passes when the type is absent), a Chainsaw `error:` op against a kind whose CRD is not installed *errors the step* rather than asserting absence. If a type may legitimately not exist (a version rename, an optional component), gate the check behind a positive precondition or do it in a `script` step — never a bare `error:`. This is what broke the etcd suite on the `v1alpha1` → `v1alpha2` rename.
+- **No conditional Test-level `skip`.** There is no `skip: <expr>`; an env-var-gated test must `exit 0` early inside a `script` step (see the `ETCD_E2E_S3_ROUNDTRIP` gate). A Test with no matching gate always runs.
+- **`finally` is step-level, not test-level.** To guarantee teardown of something Chainsaw did not create, put the work *and* its own cleanup in a single `script` step; there is no test-wide `finally` block to hang it on.
+- **Cleanup is bounded and blocking — it surfaces latent teardown bugs.** Chainsaw waits for the resources it applied to actually delete (within the `delete`/`cleanup` timeouts in `hack/e2e-chainsaw/.chainsaw.yaml`) and *fails* the test if they don't. This is deliberate — a stuck uninstall starves the next suite — but it means a teardown path the BATS suite masked with `|| true` now surfaces as `context deadline exceeded` at cleanup. The failure is honest, not new; fix the teardown rather than widening the timeout (see cozystack/cozystack#3271, a pre-delete hook that hung on a nodeless tenant).
+- **Reading a failure diff: the "actual" side is a projection.** Chainsaw projects the live object onto the expected fields, so `status: {}` in a diff means "the expression matched nothing / evaluated empty," not "status is literally empty." The real reason is the `error` line *above* the diff — read that first.
+- **A `catch`/cleanup `script`'s cwd is the failing suite's directory** (`hack/e2e-chainsaw/<suite>/`), so `../../..` is the repo root. The suites `cd ../../..` and then source shared helpers by repo-root-relative path (`hack/e2e-chainsaw/_lib/…`) rather than juggling `../` hops.
+
+## Reviewer checklist for a new or changed E2E test
+
+1. No new retry loop unless the step is pure infra (image pull / VM boot / network).
+2. Resource readiness uses a Chainsaw `assert` (not an imperative `until kubectl get …; kubectl wait`); condition checks use the filter-as-list form `(conditions[?type == 'Ready'])`.
+3. Imperative-only waits live in a `script` step; any bare `sleep` carries a `TODO(e2e-replace-fixed-timeouts):` justification, unless it is a measurement interval, which §2 carves out by name and which takes no marker because no event can replace it.
+4. No test-level `EXIT`/`RETURN` trap — rely on Chainsaw cleanup; a self-contained trap is allowed inside a single `script` step (port-forward / temp dir), and inside an explicit subshell within a BATS `@test`, where it does not displace the runner's own handler. A BATS file that still carries test-level traps declares the count itself in `# EXIT-TRAP DEBT: N`; do not ask for one to be removed without checking that line, because the count is exact in both directions.
+5. Controller-created artifacts the test cannot reclaim are pruned explicitly; nested tenants delete child → parent with a wait-for-deletion between.
+6. An HR-Ready assert has a floor: the release's own install timeout, not only the app's boot time. Below it a failed install reports as a bare assert timeout, and above it by less than a start margin it can, so **a number under the floor buys a shorter red run at the price of the diagnosis**. Whether to leave a suite under it is a per-suite call, made against what that suite's red runs cost, unless no budget inside the E2E job's cap can clear the floor at all, as with kafka's 7h install timeout; either way, a Chainsaw assert left under it says why in-line. Derive the floor from [Sizing an HR-Ready budget](#sizing-an-hr-ready-budget) rather than copying a neighbour's number, and justify a raise in-line. The same goes for any other wait longer than the ones around it, HR-Ready or not: it carries its reason in-line.
+7. Failure path attaches scoped diagnostics via a `catch:` block, never a silent pass. The node-join deadline is no exception, and no longer has one: with the soft-red marker gone it fails its suite like any other deadline and its diagnostics run from the same `catch:`.
+8. If it touches HelmRelease install/upgrade behavior, add the `status.history` guard: fail the run on a `failed` or `uninstalled` Snapshot of a release whose install strategy is `RetryOnFailure`, fail it on a parent whose strategy is anything else, and report the footprint of every other release without failing. What is reusable today is the predicate and the jsonpath in `hack/e2e-chainsaw/_lib/remediation-guard.sh`; the policy that weighs the footprint against `.spec.install.strategy.name`, judges an empty history against the release's own readiness, and keeps each read's exit status apart from its output lives in `cozy_guard_helmrelease` in `hack/e2e-chainsaw/_lib/run-kubernetes.sh` — read it before rebuilding any of that for another suite. If the suite has a failure path that exits before the guard, give that path `cozy_report_helmrelease_remediation` as well, or the runs the guard exists for are the runs it does not see.
+9. A test that creates a tenant `Kubernetes` cluster waits for its release to reach `Ready` **before the assertions it ends on**, with a `--timeout` the guard can read as positive and no longer than a day. Reads earlier in the run are expected and are not what this bounds. The mechanism, how to size the budget and what the guard does with it are under "Do not mask cleanup or teardown failures". One thing to carry from there rather than look up: the naming is part of the rule, not a detail of the check, so an end-assertion added under any name outside the `cozy_assert_*` / `cozy_switch_and_assert_*` convention is invisible to it and passes before the wait without reddening anything — as long as one recognised call site is left behind it. Rename every recognised call and the guard reds instead, on finding none at all, which is the one shape of this mistake it does catch.
+10. No BATS assertion begins with `!` — an inverted status is exempt from `set -e` and the assertion cannot fail; use `if cmd; then echo "FAIL: …"; false; fi`.
+
+## The container lane: what the srv nodes are, and what that costs
+
+The `srv1`-`srv3` nodes of the PR lane run as **Talos containers**, not QEMU guests. The sandbox used to boot three guests with Cozystack running KubeVirt inside them, which put a tenant worker at L3 — Oracle host, runner VM, `srv` VM, worker. Running the `srv` nodes as containers deletes one of those levels and puts the worker at L2.
+
+What that buys, measured in CI on commits where both substrates ran: the two tenant-Kubernetes suites take **466-809s** on containers and pass in both the `vgif`-present and `vgif`-absent strata, against **1143-2040s** on QEMU where the `vgif`-absent runs missed the node-join deadline outright. Whole-job wall clock came down 24-49 minutes across three such runs, and essentially all of it is in Chainsaw rather than in bringing the stand up: install takes about half an hour on either substrate.
+
+Three properties of container mode drive the whole design, and each one fails quietly rather than loudly if ignored. `machine.kernel.modules` is a **silent no-op** — `kernel_module_spec.go` returns early on `ModeContainer` with no error and no event — so the host must load `openvswitch` and `zfs` before the nodes start, and both the host script and the BATS file assert it rather than trusting it. Docker gives a privileged container its **own tmpfs `/dev`, seeded once at creation**, so `/dev/kvm` works but ZFS zvols created later never appear and linstor-csi fails `ControllerPublishVolume`; the compose file binds the host devtmpfs instead, which is also why `talosctl cluster create docker` can never carry LINSTOR. And container mode has **no ARP VIP**, so `192.168.123.11` stands in for the QEMU lane's `192.168.123.10` and `hack/e2e-install-cozystack.bats` takes the endpoint from `COZY_APISERVER_ENDPOINT`, defaulting to the unchanged QEMU value.
+
+In CI this is every lane that runs the suite: the `e2e` jobs in `.github/workflows/pull-requests.yaml` and `e2e-fork.yaml`, which gate a merge, and the `e2e` jobs in `nightly.yaml` and `e2e-tag.yaml`. No workflow boots the QEMU substrate or downloads a nocloud disk any more. `make -C packages/core/testing prepare-cluster` and `hack/e2e-prepare-cluster.bats` stay in the tree because unit tests still read the node sizing and addressing from that file, but nothing in CI runs them, so DRBD, the `replicated` StorageClass and the Cozystack Talos node image have no e2e coverage until a lane with a kernel per node exists (cozystack/cozystack#4642).
+
+Root entry points are `make prepare-env-container` (host-side compose plus the in-sandbox BATS file) and `make -C packages/core/testing delete-cluster-container`, which is also the retry cleanup: a half-started compose project the next attempt adopts is not a fresh try.
+
+The nodes run as **siblings on the runner's docker daemon**, not nested inside the sandbox, because those host binds have to resolve against the real host devtmpfs. That is why provisioning is two steps: `hack/e2e-container-up.sh` does the host-side half and needs a docker socket, then the sandbox is attached to the compose network and `hack/e2e-prepare-cluster-container.bats` runs inside it exactly as the QEMU lane's file does.
+
+What the lane gives up is **DRBD, and with it more than the `replicated` StorageClass**. DRBD's resource registry is global per kernel, so three containers sharing one kernel cannot represent three DRBD nodes — a second `new-resource` for the same name returns success while changing nothing, which is worse than an error because LINSTOR then records a replica it does not have. It applies to kind equally; it is a property of one kernel, not of Talos. `linstor` must therefore run with `drbd.enabled: false`, without which every satellite CrashLoops and no PVC binds at all. Because linstor-csi couples RWX to DRBD, tenant worker disks become RWO and **live migration is unavailable on this lane**, which nothing in the tree tests today either way. Everything else survives: kube-ovn runs the real OVS dataplane, and LINSTOR keeps real ZFS pools and the production `local` StorageClass.
+
+Two further things go with the substrate, and no lane covers them. `replicated` is `volumeBindingMode: Immediate` while `local` is `WaitForFirstConsumer`, so the Immediate binding path is not exercised; and tenant StorageClass propagation only applies to classes that are not `allowRemoteVolumeAccess: "false"`, which on this lane is none of them. The management nodes also boot upstream `ghcr.io/siderolabs/talos` rather than the Cozystack image, so the extensions that image carries — `drbd`, `zfs`, `openvswitch` — and the LVM filter are not validated by e2e. Tenant worker nodes still import a Talos disk, so that half of the Talos path is unaffected.
+
+One property of container mode has no fix here and is worth knowing before reading a red run: a node reports the **host's** CPU and memory as its capacity. `hack/e2e-container-up.sh` counterbalances that with kubelet `systemReserved` so the scheduler sees 8 CPU / 24 GiB per node, which corrects the scheduler and not what a pod reads from `/proc`. A workload that sizes itself from `/proc/cpuinfo` or `/proc/meminfo` is therefore configured for the whole runner.
+
+The local-only mode has one mandatory install-time adaptation and keeps a second for a run that turns root monitoring on. CDI otherwise ranks `ReadWriteMany`/`Block` first for any LINSTOR StorageClass, so post-install prep waits for `StorageProfile/local` and pins it to `ReadWriteOnce`/`Block` before any tenant DataVolume is created; without that override linstor-csi rejects the first worker disk because RWX requires DRBD. Root VictoriaLogs is the only root-tenant workload that explicitly defaults to `replicated` instead of inheriting the default class. The installer leaves root monitoring off, so VictoriaLogs does not render by default, but it still writes a `logsStorages` override into `tenant-root/cozystack-values` before the Tenant patch, so a run that enables monitoring gets local claims on the first render; patching the generated monitoring HelmRelease afterward is unsafe because it can create an immutable replicated PVC first.
+
+Two capacity edges are handled explicitly. A container node reports the **host's CPU and memory** as capacity rather than its compose cgroup limits, so `hack/e2e-container-up.sh` computes kubelet `systemReserved` from the host totals and caps each node's scheduler-visible allocatable near 8 CPU / 24 GiB; it refuses a host without strict aggregate headroom, and the live preparation suite asserts every Node's resulting allocatable. Each ZFS pool uses a sparse 200 GB backing file, matching the QEMU lane's per-node data disk: root-tenant reservations can otherwise leave less than the ~21 GiB required by CDI scratch on the node where its 20 GiB target disk is already bound. The apparent 600 GB is not preallocated, but blocks written during the run consume the shared runner disk until teardown destroys the pools and backing files.
+
+That second point used to be much worse than a sizing note. An importer pod mounts two node-pinned volumes -- the disk, and a scratch volume CDI creates only *after* the pod is scheduled -- so the scheduler sizes the node against the disk alone and can place two importers where both disks plus both scratch volumes do not fit. The scratch volume was then provisioned on a **different** node and the pod became unschedulable forever against `pv ... node affinity doesn't match node`, with no error surfaced anywhere and the DataVolume reporting `ImportScheduled` indefinitely. That is fixed by `linstorCSI.strictTopology` (on by default), which constrains provisioning to the node the scheduler actually chose; the failure becomes a legible `1 node(s) did not have enough free storage` that resolves on its own once space frees up. Both the deadlock and the fix were reproduced by measurement on 2026-08-25.
+
+## Sizing an HR-Ready budget
+
+Give an HR-Ready wait a budget that clears, by a start margin, both the app's first-boot budget and the install timeout of the release it waits on, read off the ApplicationDefinition for a generated release and off the rendering template otherwise; the rest of this section is how to find those two numbers.
+
+A HelmRelease install waits through kstatus unless the ApplicationDefinition carries `release.cozystack.io/helm-install-disable-wait`. `kubernetes-rd`, `kubernetes-nodes-rd` and `vm-instance-rd` are the only three that do, so their installs never poll at all — though the `kubernetes` chart's blocking post-install hook still holds its install open, and sizing a wait on that kind is covered under "Do not mask cleanup or teardown failures" rather than here. Two other things would take an install off kstatus and onto helm's own readiness logic, neither of them in effect: a `spec.release.waitStrategy` of `legacy`, which no ApplicationDefinition sets at all — the only two places in the tree setting a strategy are hand-written HelmRelease templates under `packages/extra/`, and both set `poller` — and the `UseHelm3Defaults` feature gate, which flips the controller-wide default to `legacy` and is not among the gates helm-controller runs with here. Every other release therefore polls, and the wait in front of it has two floors. It has to beat both by a start margin. A wait equal to the install-timeout floor does not merely tie with it: the two clocks start at different moments, the wait's when the step runs and the install's once the Application has been reconciled and the chart artifact fetched, so at equal budgets the wait is the one that expires, and it expires before the release has recorded anything about the failure. The margin has to cover that gap, the helm-controller queue included; nothing in the tree bounds any part of it, so it is a policy value, held in `MBW_START_MARGIN` in `hack/mariadb-first-boot-waits.bats`.
+
+The first floor is the app's own first boot. For a chart that sets `startupProbe` it is `initialDelaySeconds + (failureThreshold - 1) * periodSeconds`; for a chart that does not, it is whatever its operator needs, and only a measurement will say. mariadb is the case in this tree where this floor is real rather than nominal: its chart grants a 310s startup budget, so a wait that fails earlier fails a boot the probe was still willing to wait for.
+
+The second floor is the release's own install timeout, and it is usually the binding one. Where to read it depends on who created the release, and getting this wrong under-budgets rather than over-budgets. For a release cozystack-api generated from an ApplicationDefinition the default is 10m (`pkg/cmd/server/start.go`), overridden per definition by `release.cozystack.io/helm-install-timeout` — `kubernetes-rd` at 20m, `kubernetes-nodes-rd`, `tenant-rd` and `monitoring-rd` at 15m, `kafka-rd` at 7h, a floor no suite clears inside the E2E job's 215-minute cap; the first two also disable the wait, so for `kubernetes` the override bounds its blocking post-install hook rather than a kstatus poll, and `kubernetes-nodes`, which renders no post-install hook, has nothing in its install for the override to bound. For a HelmRelease an app chart renders itself there is no ApplicationDefinition to read and that default never applies: the floor is the `spec.install.timeout` on the template that renders it, which takes precedence over its `spec.timeout`, and where a template sets neither, helm-controller's own documented default of 5m applies instead. There is deliberately no count of that population here. Read the value off the template you are waiting on: they range from 5m to 30m, they are spread across `packages/apps`, `packages/extra` and `packages/system`, and a release carrying `spec.kubeConfig` installs into a tenant cluster and is not one of these at all. A number in this sentence would be an obligation to revisit it whenever a template is added, and its three qualifiers are each easy to drop from a recursive grep. The nested `<name>-system` releases the app charts wrap their workloads in are all of this second kind. A HelmRelease that cozystack-operator builds for a `Package` is a third kind: its `spec.install.timeout` comes from the operator's `--helmrelease-install-timeout`, 10m unless `cozystackOperator.helmReleaseInstallTimeout` in the installer chart overrides it. At or below whichever floor applies, a failed install is reported as a bare assert timeout, because the release has not yet recorded why it failed.
+
+What holds the install open is anything in the rendered manifests kstatus reports InProgress, which is wider than a `Ready` condition. kstatus carries built-in rules for a list of kinds — the workloads, but also `Service`, `Pod`, `PersistentVolumeClaim` and `CustomResourceDefinition` — and falls through to reading `Ready` only for kinds it has no rule for. Read that list rather than recalling it: `legacyTypes` in `pkg/kstatus/status/core.go` of `fluxcd/cli-utils`, at whatever version the helm-controller image in `internal/fluxinstall/manifests/fluxcd.yaml` was built against — nothing in this repository vendors it, so there is no local copy to open and the version has to come from that image. It does not divide the way intuition suggests, because `Secret`, `ConfigMap` and `batch/CronJob` are in the table and map to always-ready, so being in it is not the same as gating on it. The practical consequence is that "renders no CR publishing `Ready`" does not exempt a release, and `tcp-balancer` and `vpn` show why: each renders a `WorkloadMonitor`, whose status type declares no `conditions` at all, so kstatus falls past the `Ready` fallback and reads that CR as Current — and then gates the install on the Deployment beside it through a built-in rule. The CR is present and contributes nothing; the workload is what holds the install open.
+
+Every mistake in this derivation under-budgets, which is the harmful direction — but the floor is not free either, because a wait that must exceed its release's install timeout means a genuinely failing suite burns that long before it says so, and `.chainsaw.yaml` already warns about diagnostics eating the job's own 215m — for scale, the timeouts written on the mariadb suite's own steps come to 120m of that, before the defaults its untimed steps inherit from `.chainsaw.yaml`, and a job cancelled at the cap loses both its log and `cozyreport.tgz`. Raise a suite when a failed install there needs to say why; leave one alone when the diagnosis is not worth ten minutes added to every red run in that suite. That is the trade, and it is per suite — "only the ones kstatus polls" is not a filter, because almost everything polls. Two suites are worth reading before writing a new wait, and deliberately not as a list of every wait and its floor: a hand-written list of them is incomplete in a way its author cannot see, and goes stale without saying so — a `grep` for the call misses the invocations split across lines, and reading for it by eye misses the single-release waits among the `--all` ones. Enumerate with `grep -rnE 'kubectl +wait.*(^|[^[:alnum:]])hr([^[:alnum:]]|$)' hack/` and the chainsaw asserts on `kind: HelmRelease`, not from memory and not from here. mariadb's 11m in `hack/e2e-chainsaw/mariadb/chainsaw-test.yaml` is the worked example of the derivation above. harbor's two asserts show why one literal cannot serve a whole suite: `harbor-test` is generated and clears its 600s floor at 11m, while `harbor-test-system` is rendered by the app chart with a `spec.timeout` of 15m and needs 16m.
+
+Two things this derivation does not give you. Readiness *may* span a first boot rather than always doing so — a poll landing before the operator's first status write reads a condition-less resource as Current and can end the wait early, which is why a suite keeps an endpoint assert after the HR-Ready one rather than treating it as redundant. And a number copied from a neighbouring suite says nothing about the release you are waiting on, even where it clears the neighbour's floor: the floor depends on who rendered the release, and kafka's assert sits under its own on purpose. Scan `hack/e2e-chainsaw/*/chainsaw-test.yaml` for HR-Ready asserts and hold each against its own release's floor plus the start margin; the result is left to that scan rather than written out here, because a list of them goes stale silently while the scan does not. Chainsaw asserts are not the whole surface: `wait_hr_ready` calls under `examples/backups/` carry the same floor, not all of them from a `run-all.sh` and not all of them with a literal budget — a call that passes none takes the helper's own default, which a grep for the number misses — so scan both places. Derive the budget from the release you are waiting on.
+
+## In-flight direction (not yet the merged standard)
+
+These are being explored on branches and may become conventions; do not assume they are the current `main` behavior:
+
+- **Cilium orphaned-endpoint self-heal** — an interim CI watchdog that evicts a single confirmed-orphan Cilium endpoint ("IP already in use", cilium/cilium#38313). Explicitly a mitigation to remove once a fixed Cilium ships; it refuses to touch an endpoint backing a live pod so real duplicate-IP bugs stay visible.
+- **Cluster state snapshot/restore** between test groups instead of reinstalling.
diff --git a/docs/agents/image-refs.md b/docs/agents/image-refs.md
new file mode 100644
index 0000000000..0d22e120d1
--- /dev/null
+++ b/docs/agents/image-refs.md
@@ -0,0 +1,97 @@
+# Image references: where they live and what their tags mean
+
+This is the contract for every container image reference cozystack vendors. Read it before changing how an image is built, stamped, promoted, mirrored, or referenced from a chart, and before writing any tool that reads image references out of the tree. The rules below are not descriptive of what the scripts happen to do today — they are the invariants those scripts are required to hold, and each has been broken at least once in a way that shipped.
+
+## The two things a reference carries
+
+Every first-party reference is a **tag plus a digest**: `ghcr.io/cozystack/cozystack/cozystack-api:v1.5.0@sha256:ef50b1…`.
+
+The digest decides what actually runs. It is content-addressed and immutable, so a reference carrying one is reproducible no matter what happens to the tag afterwards. This is why a tag that reads `latest@sha256:…` is not a floating reference — the digest wins, and tag movement cannot change the bytes pulled.
+
+The tag decides what humans and tooling *believe* is running, and it is not decoration. A release whose images are tagged `v1.6.0-rc.4` is indistinguishable, to anyone auditing it, from a release candidate. Tooling that constructs `<repo>:<version>` by convention gets a 404 against a tag that was never created. So an inaccurate tag is a real defect even though the digest still resolves — it just fails later, and quietly, which is worse.
+
+**Both must be correct. Neither is allowed to be approximate.**
+
+## Three classes of tag
+
+Which tag an image carries depends on what versions it. Confusing these classes is what makes a correct promotion look broken and a broken one look correct.
+
+| Class | Tag shape | Example | Moves at release? |
+| --- | --- | --- | --- |
+| **Version-line** | the cozystack version | `cozystack-api:v1.5.0` | **Yes** — every release |
+| **Component-versioned** | upstream version + cozystack suffix | `cluster-api-control-plane-provider-kamaji:v0.19.0-cozystack.0` | No |
+| **Third-party pass-through** | whatever upstream publishes | `docker.io/library/busybox:1.37.0` | No |
+
+Version-line images are first-party builds whose version *is* the cozystack version; they are the ones a release rewrites and retags. Component-versioned images are first-party rebuilds of an upstream component, versioned by that component so the provenance stays legible — kamaji keeping `v0.19.0-cozystack.0` across a cozystack release is correct, not a missed rewrite. Only a release build pushes that tag (`PUBLISH_VERSIONED=1`); every other build pushes the image under its build-unique `IMAGE_TAG`, so in a CI registry the component tag in the ref may not exist and the digest is what resolves. Third-party images are vendored by digest from registries cozystack cannot push to; they are never retagged and never mirrored.
+
+Only class 1 is touched by a promotion. A tool that "fixes" a class 2 or 3 tag to the cozystack version is introducing a bug, not removing one.
+
+## Three storage shapes
+
+A reference can be stored in three different kinds of file, and **all three are first-class**. Every consumer must read all three. The single most repeated defect in this area is a tool that knows about one shape and silently ignores another; it does not fail, it just quietly skips images, and the gap surfaces a release later.
+
+1. **`packages/<group>/<pkg>/values.yaml`** — the common case, in the YAML sub-shapes listed here: single string, split map with `digest`, split map with the digest inside `tag`, chart-global `global.registry.address` + `global.images[]`, the OCI-artifact `platformSourceUrl`/`platformSourceRef` pair, and upstream ingress-nginx's split map with the repository in `image` and a separate `digest`. The sub-shapes exist because vendored upstream charts choose their own values layout; the list is empirical, not closed.
+2. **`packages/<group>/<pkg>/images/<name>.tag`** — a plain file holding one reference, read by templates via `.Files.Get` rather than through values. Easy to forget precisely because it never appears in a values file; otherwise an ordinary first-party reference that carries the cozystack version like any other.
+3. **A declared file that embeds a reference in surrounding text** — used when a package vendors an upstream manifest and its `image:` target `sed`s the built reference straight into it. `packages/system/multus/templates/multus-daemonset-thick.yml` is the only instance today. It is vendored *and* patched: it carries Helm conditionals, so `yq` cannot parse it at all and the YAML pass yields nothing for it. What keeps its reference visible is the textual scrape `collect_image_refs` runs over every declared extra — for this entry that leg is not a backstop but the only one that works.
+
+`hack/lib/image-refs.sh` is the single enumeration of all three, and the only place that knowledge is allowed to live. `image_ref_files <root>` yields the files; `collect_image_refs <root>` yields the references inside them. Shape 3 is an explicit list (`IMAGE_REF_EXTRA_FILES`) rather than a `templates/**` glob, because such a glob would sweep in vendored upstream chart templates and Helm-templated `image:` lines where a blind rewrite corrupts a value that `make update` regenerates. The declared entry is safe from that despite now containing Helm conditionals: its `image:` lines are plain, and declaring a file is the deliberate statement that its references are stamped rather than templated.
+
+### Adding a reference in a new location
+
+If a package stamps a reference somewhere the two globs do not cover, add that file to `IMAGE_REF_EXTRA_FILES` in `hack/lib/image-refs.sh` — and nowhere else. Every consumer picks it up at once. Do not teach an individual script about a new path; that is how the shapes diverged in the first place.
+
+## Invariants
+
+- **Every first-party reference is tag+digest.** A bare tag with no digest is not reproducible and must not be committed. The one exception is the first commit of a new image: it has no digest until it is built, so it lands as a bare `<repo>:<tag>` that the producing `make image` replaces. PR CI and release preparation both stamp it before anything pulls it, but a tree applied without a build pulls a tag that does not exist.
+- **Exactly one producer stamps each reference.** A reference no `Makefile` writes will never be refreshed by anything, including release preparation.
+- **A package that stamps a reference is in the root `Makefile` `build:` list.** `build-matrix.sh`, the main build and release preparation all iterate that one list, so a package outside it is never rebuilt by any path and its pin freezes permanently. `hack/build-matrix_test.bats` computes the set of packages whose Makefile runs `docker buildx build` and fails on any the list misses.
+- **Every consumer of references reads all three storage shapes**, via `hack/lib/image-refs.sh`.
+- **Scan wider than you rewrite.** A rewrite is deliberately narrow to avoid corrupting vendored defaults, so the check that follows it must not share that blind spot. `hack/promote-rewrite-tags.sh` rewrites the enumerated files, then greps the whole tree and fails if any reference to the release candidate survives.
+
+## What each consumer does
+
+| Tool | Reads | Job |
+| --- | --- | --- |
+| `hack/promote-rewrite-tags.sh` | all three shapes | rewrite `X.Y.Z-rc.N` → `X.Y.Z` in the tree, then fail if any survives |
+| `hack/promote-packages-artifact.sh` | the rewritten packages tree | publish a reproducible temporary stable-candidate artifact and pin its digest in the installer |
+| `hack/verify-promoted-packages.sh` | pinned candidate + merged tree + embedded rc artifact ref | before any stable tag is created, prove the candidate contains the merged tree and the rc's container digests |
+| `hack/promote-retag.sh` | all three shapes | copy each digest to its stable tag in the registry |
+| `hack/nightly-mirror.sh` | all three shapes | copy each digest to the public registry, then rewrite hosts in the same file set |
+| `hack/overlay-main-images.sh` | `values.yaml` + `*.tag` | overlay current-main references onto packages a PR did not rebuild |
+| `hack/stitch-multiarch.sh` | all three shapes | join each amd64 image and its `-arm64` twin into one index, repin the tree on it, then fail if any old digest survives |
+| `hack/retention-packages.sh` | all three shapes, in the published nightly tree | name the GHCR packages the retention workflow prunes (those linked to another repository are then skipped); a ref it cannot see is a package whose nightlies are never pruned |
+| `hack/verify-multiarch.sh` | all three shapes, first- and third-party | fail a release unless every pinned image is an index with `linux/amd64` and `linux/arm64`, bar the repositories in `hack/multiarch-allowlist` |
+
+`hack/multiarch-allowlist` is the only bypass for that gate, and it is for images that cannot exist for arm64, not for images nobody has rebuilt yet. An entry is a repository with no tag or digest, so bumping an allowed image needs no edit, and it must carry a reason after `#` on the same line: the script refuses an entry without one. Allowed refs are still printed, under their own "allowed single-arch" heading, and in tree mode an entry that matches no ref that failed the check is reported as stale without changing the exit status, so it gets removed once the image is multi-arch or gone. `--refs-file` reports no stale entries, since a list of pulled images omits everything the run did not pull.
+
+The gate reads this enumeration, so it covers exactly the refs pinned by digest in the three storage shapes. An image a vendored chart renders from its own defaults, or one an operator launches, is outside it. `verify-multiarch.sh --refs-file` checks a plain list of refs instead, tag-only ones resolved by tag, and the rc e2e feeds it `image-refs.txt` from `hack/collect-images.sh`: every image the sandbox nodes pulled, by the digest each pull resolved to. Neither covers a package that e2e never installs and the tree does not pin by digest.
+
+Two rows do not source the shared library, for opposite reasons. `hack/overlay-main-images.sh` reads references and walks the tree itself, so it is a real exception to the invariant above: a file newly declared in `IMAGE_REF_EXTRA_FILES` does not automatically reach it. Its line classifier also has to know the bare-reference shape by itself: a `*.tag` file holds one reference with no YAML key around it, and until a build stamps it there is no `@sha256:` either, so a changed line there is recognised by shape rather than by key, scoped to `*.tag` because only there is a whole line known to be a reference and nothing else. `hack/promote-rewrite-tags.sh` carries a second match branch for that same shape and for the same reason. `hack/promote-packages-artifact.sh` is not a consumer of references at all — it hands the whole packages tree to `flux push artifact` and touches exactly one reference, the installer's own `platformSourceUrl`/`platformSourceRef` pair, by key with `yq`. Every shape travels inside the artifact because every file does, so there is nothing there for the enumeration to widen and no gap for a newly declared file to fall into.
+
+`nightly-mirror.sh` is the one where a missed file is worst. The set it rewrites hosts in must equal the set it mirrored: a file rewritten but not mirrored leaves a dangling reference to an image never pushed, and a file mirrored but not rewritten leaves the published tree pointing at the private build registry.
+
+## Known gaps
+
+These predate the shared enumeration. Each entry says whether the tree works around it today; they are recorded here so nobody rediscovers them as surprises.
+
+**The nightly host rewrite cannot reach a host split across two keys.** The primary pass is a literal `<src-registry>/` substring replace, so it only rewrites a reference whose host sits contiguously in front of the repository. Two layouts in the tree defeated it; one is handled by a second expression and the other was removed from the tree.
+
+`kubeovn` puts the whole host in `global.registry.address` with the bare repository in a sibling key, so there is no trailing slash to match. This one **is** rewritten now, by a second, end-of-line-anchored expression that fires only when the source registry is the complete scalar value — a contiguous `<src>/<repo>@<digest>` ref continues past the host, so the two expressions can never both fire on one reference. It had to be fixed when kubeovn's image build moved into this repository: until then the image was built and pushed to the public registry by cozystack/kubeovn-chart, the baked ref kept the committed public-registry host, and the ownership filter skipped it. The moment a CI build stamps the build-registry host into that key, the image is mirrored but the host is not rewritten, and the published tree points at the private build registry. Covered by `hack/nightly-mirror_test.bats`.
+
+`keycloak-operator` split at a different boundary: `registry: ghcr.io` beside `repository: cozystack/cozystack/<name>`, with an `image:` target that stamped only `tag`. A CI build would have rendered the committed public host with a digest that exists only in the build registry, and stamping the build host into `registry` instead would spread the source registry across two keys (`iad.ocir.io` and `idyksih5sir9/cozystack/<name>`), where no anchored replace can reach it. Rather than a structure-aware rewrite pass, the package now sets `registry: ""` and keeps the whole host in `repository`, which renders the same image string because the upstream chart joins the two keys, and its `image:` target stamps `repository` the same way. The rewrite still cannot reach a host split at that boundary, so a package must not stamp one: keep the host inside `repository`, or make it the complete value of its key as kubeovn does. Covered by `hack/nightly-mirror_test.bats`.
+
+Collection understands both shapes — the host is rejoined, so a split-key ref carrying the source-registry host is still selected and mirrored. This is a defect in the host dimension; the version dimension the promote rewrite handles is unaffected, because the version always lives in a `tag` key regardless of where the host is.
+
+**A reference inside a gzip is invisible.** `capi-providers-cpprovider` stamps its kamaji reference into `files/control-plane-components.yaml` and into the `files/components.gz` built from it, and the chart ships the `.gz`. Nothing enumerates either: declaring only the readable copy would rewrite what nothing consumes and diverge it from what does. Note the promote postcondition cannot catch this class at all — `grep -rIl` skips binary files — so it fails silently rather than loudly. No tag rewrite is owed (kamaji is component-versioned) and the image is still mirrored and retagged via its `.tag` file, so the residual is that a nightly's kamaji ConfigMap keeps the build-registry host. The fix is decompress, rewrite, recompress with `gzip -n` for reproducibility. `hack/stitch-multiarch.sh` does exactly that for its digest rewrite: it declares the `.gz` together with its plain source in its own `GZIP_COPIES`, rewrites both, and looks inside every `.gz` in the tree both before rewriting, to skip an image pinned in an undeclared one, and after, in its leftover-digest check. The rewritten `.gz` is byte-identical to what the package's `image` target writes only when both use GNU gzip, as CI does; Apple's gzip compresses to different bytes, so a stitch run on macOS rewrites the right content into a different file. The other consumers still leave both copies alone.
+
+**`charts/` is excluded, and is almost always right.** Vendored upstream chart values are regenerated by `make update` and their images are neither built nor pushed here. The one exception is `packages/system/cozystack-scheduler/charts/cozystack-scheduler/values.yaml`, which pins a first-party-namespace image. Excluding it is still correct — it is built by a separate repository, component-versioned, and already published to the public registry, so no retag or mirror is owed — but "everything under `charts/` is third-party" is not literally true.
+
+## Why promotion does not rebuild containers
+
+Promotion copies the release candidate's container images to the stable tag **by digest**, so every executable image in the stable release is bit-for-bit what passed end-to-end testing. Nothing is recompiled. The packages OCI artifact is declarative configuration rather than a container image, and its content must change: `hack/promote-rewrite-tags.sh` replaces the rc tag strings in the tree, the workflow commits that exact content, then `hack/promote-packages-artifact.sh` serializes it under a run-specific temporary `promotion-*` tag and a second commit pins its new digest in the installer. Promotion first requires the target base to carry the candidate-aware pipeline. The promotion PR checks the candidate against its prospective merge; finalize repeats the check before creating any stable name. Both require the candidate and its embedded rc baseline to use the trusted public `cozystack-packages` repository, follow the old self-reference back to that rc artifact, and prove that all container digests stayed fixed.
+
+The packages artifact includes `core/installer/values.yaml`, so it cannot contain its own digest: writing that digest changes the payload and produces another digest forever. The separately published installer chart carries the real candidate pin used at runtime; the older `platformSourceRef` embedded inside the packages artifact is inert because the platform PackageSource does not install `core/installer`. Verification normalizes exactly that field and rejects every other difference. It also models Flux's established archive semantics: symlinks in the source tree are omitted rather than followed, matching the RC packages artifacts produced by the existing build.
+
+## Testing
+
+`hack/promote-rewrite-tags_test.bats` round-trips the rewrite against the real tree: it stamps a synthetic release-candidate version into every first-party reference, runs the rewrite, and asserts nothing retains it. `hack/promote-packages-artifact_test.bats` covers deterministic candidate naming, metadata and digest pinning; `hack/verify-promoted-packages_test.bats` proves the self-reference exception is narrow and catches rc refs or post-publish tree drift. These checks run under `make unit-tests` without a cluster, a registry or a release. Any change to how references are stored or promoted must keep them passing.
diff --git a/docs/agents/overview.md b/docs/agents/overview.md
index ae0fd1c407..632caad78c 100644
--- a/docs/agents/overview.md
+++ b/docs/agents/overview.md
@@ -25,7 +25,7 @@ The platform exposes infrastructure services via the Kubernetes API with ready-m
 │   └── extra/             # Tenant-specific modules, singleton charts which are used as dependencies
 ├── dashboards/            # Grafana dashboards for monitoring
 ├── hack/                  # Helper scripts for local development
-│   └── e2e-apps/         # End-to-end application tests
+│   └── e2e-chainsaw/     # End-to-end application tests (Kyverno Chainsaw)
 ├── scripts/               # Scripts used by cozystack container
 │   └── migrations/       # Version migration scripts
 ├── docs/                  # Documentation
@@ -63,6 +63,53 @@ packages/<category>/<package-name>/
 └── values.schema.json                   # JSON schema for validation and UI
 ```
 
+## Build and Development Commands
+
+Root targets (run from the repo root):
+
+```bash
+make build          # Build all Docker images (needs: docker, skopeo, jq, gh, helm, yq, GNU tar/sed/awk)
+make unit-tests     # Run unit tests (requires bats-core >= 1.5; GNU parallel is optional)
+make test-controllers # Run the Go tests under ./internal/... (controllers, contract tests)
+make generate       # Code generation (hack/update-codegen.sh) — CRDs, DeepCopy, clients, RBAC
+make manifests      # Generate CRD manifests and operator YAML variants
+make cozypkg        # Build the cozypkg CLI
+make test           # Full E2E tests (requires a cluster)
+make prepare-env    # Prepare the E2E test environment (apply + prepare-cluster)
+```
+
+Per-package targets (run inside `packages/{apps,system,extra,core}/<name>/`):
+
+```bash
+make image          # Build the package image
+make show           # Render the Helm template
+make apply          # Apply the Helm release to a cluster (needs NAME, NAMESPACE)
+make diff           # Diff the template against the cluster
+make test           # Package-specific tests
+make generate       # Regenerate values.schema.json + README.md from values.yaml
+```
+
+Build environment variables:
+
+- `REGISTRY` — Docker registry (default `ghcr.io/cozystack/cozystack`).
+- `PUSH=1` / `LOAD=0` — control buildx push/load behaviour.
+- `LOAD=1 PUSH=0` — load images locally instead of pushing. Builds for the host architecture only, because the classic docker image store cannot load a multi-platform index.
+- `PLATFORM` — the buildx platforms. Defaults to `linux/amd64,linux/arm64` for anything but `LOAD=1`, so a push from either architecture publishes an index both can run. Needs a `docker-container` builder (`BUILDER`) or a docker daemon on the containerd image store, with QEMU registered for the non-native half. Compiling builder stages run natively on `$BUILDPLATFORM` and cross-compile for the target, but every `RUN` step of a stage that runs on the target platform (package installs, `setcap`, install scripts, patch steps) still runs emulated. `packages/core/testing` pins `linux/amd64`, because it carries an x86 KVM sandbox. `packages/core/talos` builds the Talos installer and release assets for the arches in `PLATFORM` with the upstream imager, which needs no QEMU for either; its matchbox image carries the amd64 and arm64 kernel and initramfs whatever `PLATFORM` says, because it network-boots machines of either arch.
+- `PUSHED_TAGS_LOG` — a file the `image-tags` macro appends every pushed `<repo>:<tag>` to, one per line. Unset by default; the release build sets it so `hack/stitch-multiarch.sh` can move every tag it pushed, versioned ones included, onto the multi-arch index. The append happens at recipe expansion, so `make -n` writes it too.
+- `CACHE_TAG` — the tag of the mode=max build cache each image reads (and writes under `WRITE_CACHE=1`). Defaults to `buildcache`. Apart from the Talos installer and matchbox in the release job, CI builds one architecture per job, and builds arm64 images only for pre-release tags and in a nightly build of main: the images are built again on native arm64 runners under `<tag>-arm64` with `CACHE_TAG=buildcache-arm64`, which only the nightly writes. The talos and testing packages get no arm64 leg: the release job builds the Talos installer and matchbox for both arches itself, and testing is amd64 only. For a pre-release, `hack/stitch-multiarch.sh` then joins each pair into one index, `hack/verify-multiarch.sh` fails the rc on any pinned image that is not an amd64+arm64 index, and the packages artifact is republished pinned on the index digests; see `docs/release.md`. The stitch skips any image whose digest is also pinned in a file it does not rewrite, which then fails that gate; the kamaji control-plane provider's gzipped manifest is the one such copy it does rewrite (see `docs/agents/image-refs.md`).
+
+### Values schema generation
+
+Package `values.yaml` files carry annotations (`@param`, `@typedef`, `@field`, `@enum`, `@section`) that `cozyvalues-gen` turns into `values.schema.json` and `README.md`. Run `make generate` in the package after editing annotations. A pre-commit hook runs `make generate` across `packages/apps/*` and `packages/extra/*` on every commit to keep these in sync — see [`contributing.md`](./contributing.md) for the regenerate-before-commit rule.
+
+A chart also declares the limits on its own resource name there, with `## @name {string} - <why>` followed by the constraint tags (`@maxLength`, `@minLength`, `@pattern`) it needs. `cozyvalues-gen` publishes the declaration at the root of `values.schema.json` as `x-cozystack-name`, from where `hack/update-crd.sh` carries it into the ApplicationDefinition, and the aggregated API server enforces it on `metadata.name` for whatever kind the definition describes. The description is the message a rejected name is answered with, so write it as the explanation of the limit. A `@pattern` is unanchored, as JSON Schema specifies, so one meant for the whole name is written `^...$`. A declaration the server cannot enforce as written — a constraint keyword it does not implement, a wrong type, a null, lengths no name satisfies, a pattern that is not RE2 — refuses every create of that kind with a configuration error rather than being dropped. A pattern is checked only to compile, not to match anything, so one that matches no name (`$^`) rejects every name with the pattern as the reason. Annotation keywords such as `title` or `examples`, and `x-` extensions, are ignored. A cap only ever tightens: `prefix + name` must still fit the 53-character Helm release name limit, and a declaration looser than that budget does not widen it. The limits belong in the chart because that is where the facts behind them are — which sub-resources it renders and what release names they take — and a chart that needs nothing beyond the platform-wide limits declares nothing.
+
+## Testing
+
+- **Helm and BATS unit tests:** `make helm-unit-tests` runs `hack/helm-unit-tests.sh` over every package that defines a `test` target. A `test` target is expected to run helm-unittest: the sweep fails a package whose run reports no suite, because exiting 0 having asserted nothing is indistinguishable from passing. A target that drives something else belongs under another name, as `packages/core/testing` already does with its sandbox flow. `make bats-unit-tests` requires bats-core 1.5 or newer; GNU parallel is optional and the target runs serially without it. Run the complete local BATS and POSIX-compatibility pass with `pre-commit run bats-unit-tests --hook-stage manual --all-files`; pull-request CI runs both lanes for code changes and the BATS contracts for docs-only changes. On a host whose `/bin/sh` differs from CI, `make BATS_POSIX_SHELL=dash bats-posix-compat-tests` selects the same interpreter explicitly. `make unit-tests` runs the full unit suite — Helm, BATS, the targeted POSIX-shell compatibility pass, Go, and the preset/readiness checks. It does not include the controller tests under `./internal/...`; run `make test-controllers` as well. CI invokes both targets together.
+- **E2E tests:** Kyverno Chainsaw suites in `hack/e2e-chainsaw/` (one directory per app), run with `chainsaw test`. Cluster bootstrap (`hack/e2e-install-cozystack.bats`) and the OpenAPI checks (`hack/e2e-test-openapi.bats`) remain BATS. Conventions for writing and stabilising them — and the CI that runs them — live in [`e2e-testing.md`](./e2e-testing.md).
+- **Go tests:** standard `go test`, with Ginkgo/Gomega for controllers.
+
 ## Conventions
 
 ### Helm Charts
@@ -78,10 +125,8 @@ packages/<category>/<package-name>/
 - Add proper error handling and structured logging
 
 ### Git Commits
-- Follow [Conventional Commits](https://www.conventionalcommits.org/) format: `type(scope): description`
-- Always use `--signoff` flag
-- Reference PR numbers when available
-- Keep commits atomic and focused
+
+Conventional Commits (`type(scope): description`) with `--signoff`, kept atomic and focused. Full format, scopes, AI-attribution trailer, and PR workflow are in [`contributing.md`](./contributing.md) — the source of truth; do not duplicate them here.
 
 ### PackageSource CRD upgrade policy
 
@@ -99,6 +144,13 @@ Documentation is organized as follows:
 - `docs/changelogs/` - Release changelogs
 - Main website: https://github.com/cozystack/website
 
+### Domain references for specific tasks
+
+Before working on these areas, read the relevant doc first:
+
+- **Backup subsystem design:** `api/backups/v1alpha1/DESIGN.md`
+- **A new app package:** copy the structure of an existing one (e.g. `packages/apps/postgres/`)
+
 ## Things Agents Should Not Do
 
 ### Never Edit These
@@ -119,4 +171,3 @@ Documentation is organized as follows:
 
 ### Core Components
 - Do not modify `packages/core/platform/` without understanding migration impact
-
diff --git a/docs/agents/releasing.md b/docs/agents/releasing.md
index b100563833..dd7742f5ea 100644
--- a/docs/agents/releasing.md
+++ b/docs/agents/releasing.md
@@ -18,12 +18,14 @@ For detailed release process instructions, follow the steps documented in:
 
 ## Quick Reference
 
-The release process typically involves:
-1. Preparing the release branch
-2. Generating changelog
-3. Updating version numbers
-4. Creating git tags
-5. Building and publishing artifacts
-
-All detailed steps are documented in `docs/release.md`.
+The release process is promotion-based — a stable release is a renamed release-candidate, never a hand-cut tag or a rebuild. At a high level it involves:
+1. Cutting a release candidate (`Cut Pre-release Tag` workflow) and watching its mandatory full E2E.
+2. Promoting the rc (`Promote RC` workflow), which generates the changelog, opens the parked `cozystack/website` docs PR, and opens the promote PR.
+3. Reviewing and merging the promote PR (no squash-merge).
+4. Finalize on merge (CI cuts the write-once tag, publishes the release from the merged changelog, and retags the rc images to stable by digest).
+5. Merging the parked website docs PR once the release is published.
+
+All detailed steps, workflows, and failure modes are documented in `docs/release.md`.
+
+For a patch release, or any rc cut from a `release-X.Y` branch, verify the backport state of that branch before tagging: build with `go build ./cmd/backport-audit`, then run `./backport-audit release-X.Y`. It exits non-zero while anything labeled `kind/backport` / `kind/backport-previous` for the line has not landed on it, and prints the URLs. See [`cmd/backport-audit/README.md`](../../cmd/backport-audit/README.md) and [Cherry-pick triage before a patch](../release.md#cherry-pick-triage-before-a-patch). Do not report a branch as ready to cut on the strength of `gh pr list --search "is:merged label:kind/backport"` — that lists what was labeled, not what arrived.
 
diff --git a/docs/changelogs/v1.1.7.md b/docs/changelogs/v1.1.7.md
new file mode 100644
index 0000000000..fdd3b7a642
--- /dev/null
+++ b/docs/changelogs/v1.1.7.md
@@ -0,0 +1,27 @@
+<!--
+https://github.com/cozystack/cozystack/releases/tag/v1.1.7
+-->
+
+## Fixes
+
+* **[platform] Migrate ACME HTTP-01 to ingressClassName API**: `ClusterIssuer` HTTP-01 solvers (`letsencrypt-prod`, `letsencrypt-stage`) were hardcoded to ingress class `nginx`, which does not exist on Cozystack clusters — real classes are named after tenant namespaces (e.g. `tenant-root`). Certificate issuance only worked because every ingress overrode the issuer via the deprecated `acme.cert-manager.io/http01-ingress-class` annotation. Both sides are now migrated to the modern cert-manager API: the `ClusterIssuer` uses `http01.ingress.ingressClassName` (parameterized from `_cluster.expose-ingress`, defaulting to `tenant-root`) and all ingress templates switch to the `acme.cert-manager.io/http01-ingress-ingressclassname` annotation. The migration is atomic — mixing the two APIs triggers cert-manager's validation error "fields ingressClassName and class cannot be set at the same time" ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #2436, backport #2439).
+
+## Documentation
+
+* **[website] Document tenant namespace layout and parent/child derivation**: Added two new sections to the Tenant System guide describing how tenant workload namespace names are constructed and how downstream integrations should walk the tenant tree without string-parsing namespace names ([**@lexfrei**](https://github.com/lexfrei) in cozystack/website#479).
+
+* **[website] Document the checkbox-then-edit-CR customization pattern**: Added a *Customizing Tenant Services* section documenting how to configure a tenant-level service (etcd, monitoring, ingress, seaweedfs) beyond the per-tenant boolean flag — enable the flag then `kubectl edit` the downstream `apps.cozystack.io/v1alpha1` CR, with callouts for common wrong approaches ([**@lexfrei**](https://github.com/lexfrei) in cozystack/website#485).
+
+* **[website] Fix 14 broken links and stale talm anchor across v1 docs**: Automated pass corrected 14 broken `{{% ref %}}`/`{{% relref %}}` shortcode targets and raw markdown links across 11 files, plus updated a stale `talm` anchor ([**@lexfrei**](https://github.com/lexfrei) in cozystack/website#486).
+
+* **[website] Rewrite external applications guide for ApplicationDefinition API**: Updated the external apps guide to replace outdated `CozystackResourceDefinition` references with the current `ApplicationDefinition` API and conventions ([**@kitsunoff**](https://github.com/kitsunoff) in cozystack/website#488).
+
+* **[website] Refactor docs versions to major.minor variants**: Restructured the docs versioning from `v0`/`v1` to per-minor-version directories (`v1.0`, `v1.1`, `v1.2`), making the site compatible with the push-based docs update pipeline ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in cozystack/website#477).
+
+* **[website] Update /docs/v1/ redirect to latest v1.2**: Updated the Netlify redirect `/docs/v1/*` to point to `v1.2` (was outdated `v1.0`) and added a Hugo alias for GitHub Pages compatibility ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in cozystack/website#492).
+
+* **[website] Trunk-based versioning with permanent next/ directory**: Replaced the hardcoded draft-directory approach with a permanent `content/en/docs/next/` trunk for upcoming/unreleased Cozystack docs, excluded from production builds and promoted to `vX.Y/` when the upstream release workflow fires ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in cozystack/website#495).
+
+---
+
+**Full Changelog**: https://github.com/cozystack/cozystack/compare/v1.1.6...v1.1.7
diff --git a/docs/changelogs/v1.4.3.md b/docs/changelogs/v1.4.3.md
new file mode 100644
index 0000000000..a17f2a3e00
--- /dev/null
+++ b/docs/changelogs/v1.4.3.md
@@ -0,0 +1,67 @@
+<!--
+https://github.com/cozystack/cozystack/releases/tag/v1.4.3
+-->
+
+# v1.4.3 (2026-06-10)
+
+A patch release shipping five bug fixes for the dashboard, API server, networking, object storage, and managed Kubernetes, along with a `seaweedfs-cosi-driver` update, an `ouroboros` v0.8.0 upgrade, two `ansible-cozystack` improvements, and a batch of new documentation.
+
+## Features and Improvements
+
+* **feat(ouroboros): bump to v0.8.0**: Upgrades the ouroboros proxy to v0.8.0, which now logs an explicit reason when its TCP backend readiness check fails — making stuck-proxy situations immediately diagnosable instead of silently `NotReady`. The upgrade also migrates the kubectl sidecar image from Docker Hub to `mirror.gcr.io`, avoiding anonymous pull rate-limits on shared CI/runner IPs ([**@lexfrei**](https://github.com/lexfrei) in #2807, backport #2835).
+
+* **[ansible-cozystack] feat(prepare): exclude loop and virtual devices from host LVM scanning**: Sets an LVM `global_filter` in `/etc/lvm/lvm.conf` on all prepare playbooks (Ubuntu, RHEL, SUSE) so the host LVM does not scan or activate DRBD, device-mapper, zd-device, or loop-backed volume groups — preventing unintended VG activation of LINSTOR/DRBD volumes or loop-mounted images. The filter is exposed as the `cozystack_lvm_global_filter` inventory variable for clusters whose own PVs live on device-mapper (LVM-on-LUKS, multipath), and its effectiveness is verified via `lvmconfig` immediately after writing ([**@kvaps**](https://github.com/kvaps) in cozystack/ansible-cozystack#49).
+
+* **[ansible-cozystack] fix(prepare): enable containerd device_ownership_from_security_context for CDI block imports**: Adds a k3s containerd drop-in config enabling `device_ownership_from_security_context` on the CRI plugin across all prepare playbooks. Without this setting k3s ships the option disabled, so the KubeVirt CDI importer fails with "cannot open /dev/cdi-block-volume: Permission denied" when writing VM disk images into raw block volumes, causing `DataVolume` to hang in `ImportInProgress` and VMs to stay `Pending` ([**@lexfrei**](https://github.com/lexfrei) in cozystack/ansible-cozystack#48).
+
+## Fixes
+
+* **fix(dashboard): grant tenant dashboard read on cozy-public PVCs**: The VM disk source-image dropdown in the console was returning 403 and staying empty even when golden images existed in the `cozy-public` namespace. The `cozy:tenant:dashboard` Role only granted read on Flux HelmRepositories and HelmCharts; `get/list/watch` on PersistentVolumeClaims has been added so tenant identities can list the `vm-default-images-*` PVCs ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #2843, backport #2858).
+
+* **fix(api): emit initial-events-end bookmark for core.cozystack.io watches**: The `TenantSecret`, `TenantModule`, and `TenantNamespace` aggregated API resources never sent the `k8s.io/initial-events-end` bookmark required by the WatchList / streaming-list protocol. Client-go informers using `WatchListClient` (on by default since v1.35) never reached `HasSynced` and logged "hasn't received required bookmark event marking the end of initial events stream" every ~10 seconds. The bookmark is now emitted after initial `ADDED` events, matching the behaviour `apps.cozystack.io/Application` already implemented ([**@sunib**](https://github.com/sunib) in #2786, backport #2844).
+
+* **fix(networking): point host ouroboros proxy at the root-tenant ingress**: When `publishing.proxyProtocol` was enabled, the host-level ouroboros proxy inherited the wrapper chart's default backend (`ingress-nginx-controller.cozy-ingress-nginx`), a FQDN that describes a managed Kubernetes tenant cluster. On the host, ingress-nginx is deployed by `extra/ingress` as `root-ingress-controller` in `tenant-root`, so the composed FQDN never resolved and the proxy never became `Ready`. The host ouroboros `Package` is now emitted with a `proxy.target` override derived from `publishing.ingressName` ([**@lexfrei**](https://github.com/lexfrei) in #2800, backport #2846).
+
+* **fix(objectstorage-controller): propagate Bucket readiness to BucketClaim**: The vendored COSI controller (v0.2.2) hardcoded `bucketReady=false` after dynamic provisioning and never re-read the `Bucket` to pick up the `true` transition, so `BucketAccess` was never granted and provisioned buckets ended up without credentials. The controller now re-reads the live `Bucket` after create and propagates its readiness, converging `BucketClaim` to ready on the next resync ([**@lexfrei**](https://github.com/lexfrei) in #2792, backport #2828).
+
+* **fix(kubernetes): stamp application lineage labels on worker node VMs**: Worker-node VMs of a tenant Kubernetes cluster are created by Cluster API and the KubeVirt provider, so their `virt-launcher` pods were never stamped with the `apps.cozystack.io/application.{group,kind,name}` lineage labels, preventing the dashboard from attributing those pods to their owning Kubernetes application. The labels are now applied to the `KubevirtMachineTemplate` worker VM template. A companion fix also quotes `application.name` so a purely-numeric cluster name renders as a YAML string rather than an integer, which would fail label-value validation ([**@kvaps**](https://github.com/kvaps) in #2779, backport #2790).
+
+## Dependencies
+
+* **chore(seaweedfs): bump seaweedfs-cosi-driver to v0.3.1**: v0.3.1 ships a stale-socket self-heal: the COSI driver now removes any leftover UNIX socket before binding, so the objectstorage provisioner recovers automatically from `CrashLoopBackOff` after a non-graceful exit (SIGKILL, OOM, or panic) instead of wedging on "bind: address already in use" ([**@lexfrei**](https://github.com/lexfrei) in #2791, backport #2827).
+
+## Development, Testing, and CI/CD
+
+* **ci(release): repair orphaned draft tag_name on retag**: When the git tag was deleted and re-created between draft creation and merge, GitHub orphaned the draft release by setting `tag_name` to `"untagged-<hash>"` while preserving the human-readable `name`. The finalize step looked up the draft by `tag_name` and threw "Draft release for \<tag\> not found", blocking the release. The workflow now detects the orphaned form, falls back to matching by `name`, repairs `tag_name` via `updateRelease`, and then publishes ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #2761, backport #2829).
+
+## Documentation
+
+* **docs(ingress): explain how ingress works in the platform**: Adds a "How ingress works" overview section to the ingress package README (rendered at `/docs/v1.4/operations/services/ingress/`), covering per-tenant ingress-nginx controllers, the per-namespace `IngressClass` model, cross-tenant sharing via `namespace.cozystack.io/ingress`, TLS via cert-manager issuers, and the `whitelist`/`cloudflareProxy` access-control options ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #2770).
+
+* **[website] docs(networking): publish Kubernetes API endpoint via external-dns with kuberture**: Documents how to expose the managed Kubernetes API endpoint through external-dns using the kuberture system package, including configuration examples ([**@lexfrei**](https://github.com/lexfrei) in cozystack/website#539).
+
+* **[website] docs: exclude loop devices from LVM global_filter**: Adds documentation explaining the LVM `global_filter` requirement for hosts running Cozystack on bare metal, preventing unintended activation of DRBD/loop-backed volume groups ([**@kvaps**](https://github.com/kvaps) in cozystack/website#563).
+
+* **[website] feat(blog): add Managed Kubernetes how-to post**: Publishes a practical how-to blog post covering how to deploy and use managed Kubernetes clusters within Cozystack ([**@tym83**](https://github.com/tym83) in cozystack/website#565).
+
+* **[website] feat(blog): add platform-managed backups introduction post**: Publishes a blog post introducing Cozystack's platform-managed backup capabilities for stateful workloads ([**@tym83**](https://github.com/tym83) in cozystack/website#566).
+
+* **[website] docs(talm): document DRBD sysctl tuning, keepalive toggle, etcd quota**: Adds documentation for talm covering DRBD sysctl performance tuning, the DRBD keepalive toggle, and the etcd quota configuration ([**@lexfrei**](https://github.com/lexfrei) in cozystack/website#567).
+
+## Contributors
+
+Thanks to everyone who contributed to this patch release:
+
+* [**@kvaps**](https://github.com/kvaps)
+* [**@lexfrei**](https://github.com/lexfrei)
+* [**@myasnikovdaniil**](https://github.com/myasnikovdaniil)
+* [**@sunib**](https://github.com/sunib)
+* [**@tym83**](https://github.com/tym83)
+
+### New Contributors
+
+We're excited to welcome our first-time contributors:
+
+* [**@sunib**](https://github.com/sunib) - First contribution!
+
+**Full Changelog**: https://github.com/cozystack/cozystack/compare/v1.4.2...v1.4.3
diff --git a/docs/changelogs/v1.4.4.md b/docs/changelogs/v1.4.4.md
new file mode 100644
index 0000000000..454916b1ea
--- /dev/null
+++ b/docs/changelogs/v1.4.4.md
@@ -0,0 +1,44 @@
+<!--
+https://github.com/cozystack/cozystack/releases/tag/v1.4.4
+-->
+
+# v1.4.4 (2026-06-18)
+
+A patch release that fixes the dashboard build on the `release-1.4` branch and ships a new `talm` v0.31.0 with stability and usability improvements.
+
+## Fixes
+
+* **fix(dashboard): pin UI source branch to `release-1.4`**: Patch builds of Cozystack 1.4.x were cloning `cozystack-ui@main` instead of `cozystack-ui@release-1.4`, which could pull in unreleased UI features and break the patch release gate entirely. `CONSOLE_BRANCH` is now pinned to `release-1.4` in the dashboard Makefile. The PR also adds documentation explaining that cutting a new minor release (vX.Y.0) requires creating the matching `cozystack-ui/release-X.Y` branch and pinning `CONSOLE_BRANCH` in the dashboard Makefile ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #2945).
+
+## Other repositories
+
+### talm v0.31.0
+
+* **[talm] feat(cozystack): add DRBD-oriented sysctl and etcd backend defaults**: Adds a set of production-tested TCP sysctls (`tcp_orphan_retries`, `tcp_fin_timeout`, `netdev_max_backlog`, `netdev_budget`, `netdev_budget_usecs`) to the `cozystack` preset that prevent TCP port exhaustion during DRBD reconnect storms on node reboots or resyncs. An opt-in `tcpKeepaliveTuning` group is also available for deployments that need faster idle-socket failure detection across all long-lived TCP connections. The etcd backend quota is exposed as a configurable `etcd.quotaBackendBytes` value (default 8 GiB) so control planes holding many DRBD-resource CRDs do not trip etcd's 2 GiB NOSPACE alarm ([**@IvanHunters**](https://github.com/IvanHunters) in cozystack/talm#131).
+
+* **[talm] fix(cli, engine): emit progress on stderr, enrich lookup error chain, retry transient failures**: Fixes `talm template -f X > Y` producing YAML files with a stray progress line on stdout. Lookup failures now surface the resource kind, namespace, id, and dialed endpoints, with a six-class taxonomy of hints (TLS handshake, connection refused, deadline, auth, resource, unknown) so operators receive actionable guidance instead of a raw gRPC error. Transient connectivity classes (refused, deadline) are retried up to three times with exponential backoff; permanent errors fail immediately ([**@lexfrei**](https://github.com/lexfrei) in cozystack/talm#212).
+
+* **[talm] fix(engine): require a template before rendering the chart**: Running `talm template` without `--file`/`--template` previously rendered the entire chart before checking that any template was actually requested, which in online mode triggered live node discovery and produced a misleading `connection refused` error instead of the actionable `templates are not set` message. The guard is now evaluated before any chart render or node dial ([**@lexfrei**](https://github.com/lexfrei) in cozystack/talm#217).
+
+* **[talm] fix(cozystack): exclude loop devices from LVM global_filter**: Adds `/dev/loop.*` to the LVM `global_filter` in the generated Talos machine config so the host does not scan or activate volume groups inside loop-mounted images, preventing unexpected LVM activation on boot ([**@kvaps**](https://github.com/kvaps) in cozystack/talm#215).
+
+## Documentation
+
+* **[website] feat(blog): add Cozystack vs OpenStack comparison post**: Publishes a vendor-neutral blog post comparing Cozystack and OpenStack across seven dimensions — architecture, compute, networking, storage, managed services, operations, and multi-tenancy — for teams evaluating private cloud options ([**@tym83**](https://github.com/tym83) in cozystack/website#580).
+
+* **[website] fix(layout): keep fixed-header offset after banner removal**: Restores the correct top-offset for the fixed navigation header after the CozySummit banner was removed, preventing content from being obscured behind the navbar ([**@kvaps**](https://github.com/kvaps) in cozystack/website#579).
+
+* **[website] chore(banner): remove CozySummit Virtual 2026 announcement**: Removes the expired event banner from the website ([**@kvaps**](https://github.com/kvaps) in cozystack/website#576).
+
+## Contributors
+
+Thanks to everyone who contributed to this patch release:
+
+* [**@IvanHunters**](https://github.com/IvanHunters)
+* [**@kvaps**](https://github.com/kvaps)
+* [**@lexfrei**](https://github.com/lexfrei)
+* [**@myasnikovdaniil**](https://github.com/myasnikovdaniil)
+* [**@tym83**](https://github.com/tym83)
+
+
+**Full Changelog**: https://github.com/cozystack/cozystack/compare/v1.4.3...v1.4.4
diff --git a/docs/changelogs/v1.4.5.md b/docs/changelogs/v1.4.5.md
new file mode 100644
index 0000000000..0effd00073
--- /dev/null
+++ b/docs/changelogs/v1.4.5.md
@@ -0,0 +1,40 @@
+<!--
+https://github.com/cozystack/cozystack/releases/tag/v1.4.5
+-->
+
+# v1.4.5 (2026-07-03)
+
+A patch release with fixes for tenant control-plane deletion, VM node-group sizing, Harbor storage-class drift, CSI hot-plug volume handling, and a new `talm` v0.32.0 with encrypted user values.
+
+## Fixes
+
+* **fix(kamaji): backport datastore unused-deletion deadlock fix (clastix/kamaji#1122)**: Deleting a tenant whose etcd `DataStore` had zero referencing `TenantControlPlane`s left the `DataStore` stuck in `Terminating` (blocked by the `kamaji.clastix.io/TenantControlPlane` finalizer), which hung the etcd Helm uninstall and wedged the whole tenant namespace. Tenant deletion involving an otherwise-idle `DataStore` now completes cleanly instead of hanging indefinitely ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #3146, backport #3188).
+* **fix(kubernetes): gate vmop cert-manager-crds dependency on certManager.enabled**: The `victoria-metrics-operator` `HelmRelease` unconditionally depended on `cert-manager-crds`, even though that `HelmRelease` is only created when `certManager.enabled` is true. Clusters with `monitoringAgents.enabled=true` and `certManager.enabled=false` therefore failed with a "not found" error on `vmop`, which cascaded into `monitoring-agents` and `vertical-pod-autoscaler` never installing. This previously-broken combination now installs correctly ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #3130, backport #3186).
+* **fix(kubernetes): make node group resources optional and prefer them over instanceType**: Node groups sized purely by `instanceType` (with `resources` omitted) failed `values.schema.json` validation, even though sizing was fully specified. `resources` is now optional, and when both `instanceType` and explicit `resources` (both `cpu` and `memory`) are set, the explicit resources take precedence over the instance type. A partial spec with only one of `cpu`/`memory` alongside an `instanceType` now fails fast at render time with a clear error instead of producing an invalid VM spec ([**@lexfrei**](https://github.com/lexfrei) in #3121, backport #3157).
+* **fix(harbor): preserve jobservice and trivy storageClass on upgrade**: The `cozy-harbor` wrapper never forwarded `storageClass` to the `jobservice` job-log PVC, so it was created without a `storageClassName`, and the default-`StorageClass` admission then stamped the cluster default onto it. Because `storageClassName` is immutable, this caused permanent drift between the rendered and live state on every upgrade. The same latent drift existed for Trivy's `volumeClaimTemplate`. Both now preserve an existing PVC/VCT's storage class via lookup, falling back to the configured `storageClass` only for fresh installs, so upgrades no longer show spurious storage-class drift ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #2930, backport #3151).
+* **fix(kubernetes): add spec.timeout to tenant CSI HelmRelease**: The tenant `kubevirt-csi-node` `HelmRelease` was the only tenant addon without an explicit `timeout: 10m` (all others already had it), so it fell back to Helm's default 5-minute timeout. On slower tenant control-plane bring-up, the CSI DaemonSet could still be `InProgress` past 5 minutes, causing helm-controller to trigger a remediation uninstall/reinstall cycle mid-flight and wedge any in-progress volume mount. Aligning the timeout with the other tenant HelmReleases removes this source of intermittent CSI install/remediation flapping ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #2727, backport #2929).
+* **fix(csi): detach orphan hot-plug volumes from VMI when parent VM is gone**: Upstream treated a missing parent VM as detach success, so when a VMI outlived its VM during node reprovisioning, the hot-plug pod kept the infra device exclusively attached to the source host and subsequent attach attempts failed. The CSI driver now re-checks VMI volume status after the upstream unpublish call and detaches directly from the VMI when needed, and `kubevirt-csi-driver` is bumped to the latest upstream release carrying this fix, resolving stuck volume attachments after node reprovisioning ([**@kvaps**](https://github.com/kvaps) in #2866, backport #2965).
+
+## Other repositories
+
+### talm v0.32.0
+
+* **[talm] feat: first-class encrypted user values, honored at template and apply**: Adds support for arbitrary encrypted user secret values (registry passwords, KMS plugin secret IDs, etc.) consumed by chart templates. Value files named `*.encrypted.yaml` are age-decrypted in memory via the existing `talm.key` at both `template` and `apply` time — plaintext never touches disk. `talm init --encrypt`/`--decrypt` now covers `values-secret.yaml` ↔ `values-secret.encrypted.yaml`. Secret-bearing fields are omitted from committed `nodes/*.yaml` files and redacted by default in `talm template` stdout and `talm apply`'s drift preview (`--show-secrets`/`--show-secrets-in-drift` reveal them on demand). `talm apply` also now honors the full set of value-source flags and `templateOptions` from `Chart.yaml`, so a value supplied at template time is no longer silently dropped at apply ([**@lexfrei**](https://github.com/lexfrei) in cozystack/talm#222).
+
+## Documentation
+
+* **[website] docs(operations): add containerized GPU workloads guide**: Adds a guide covering running GPU workloads in containers on Cozystack, helping operators evaluate and configure GPU-accelerated container deployments ([**@lexfrei**](https://github.com/lexfrei) in cozystack/website#555).
+* **[website] docs(talm): document chart drift detection and strict mode**: Documents `talm`'s chart drift detection and strict mode, explaining how operators can catch and control configuration drift between rendered and applied charts ([**@lexfrei**](https://github.com/lexfrei) in cozystack/website#577).
+* **[website] docs(talos): warn against changing op: on the machine files block**: Adds a warning against changing the `op:` field on the Talos machine `files` block, helping operators avoid a known misconfiguration pitfall ([**@lexfrei**](https://github.com/lexfrei) in cozystack/website#575).
+* **[website] docs(platform): document publishing.certificates wildcard options**: Documents the `publishing.certificates` wildcard options for the platform chart, clarifying how operators can configure wildcard certificates for published services ([**@lexfrei**](https://github.com/lexfrei) in cozystack/website#588).
+
+## Contributors
+
+Thanks to everyone who contributed to this patch release:
+
+* [**@kvaps**](https://github.com/kvaps)
+* [**@lexfrei**](https://github.com/lexfrei)
+* [**@myasnikovdaniil**](https://github.com/myasnikovdaniil)
+
+
+**Full Changelog**: https://github.com/cozystack/cozystack/compare/v1.4.4...v1.4.5
diff --git a/docs/changelogs/v1.5.0.md b/docs/changelogs/v1.5.0.md
new file mode 100644
index 0000000000..f2edb8d8d5
--- /dev/null
+++ b/docs/changelogs/v1.5.0.md
@@ -0,0 +1,378 @@
+<!--
+https://github.com/cozystack/cozystack/releases/tag/v1.5.0
+-->
+
+# Cozystack v1.5.0
+
+Cozystack v1.5.0 brings **Gateway API support via Cilium** as an opt-in ingress layer alongside ingress-nginx, **TLS for managed databases and messaging** (Kafka, NATS, Qdrant, and PostgreSQL external endpoints), **backups that work out of the box** with a platform-managed default `BackupClass`, a shared backups bucket, a new etcd backup strategy and a generic Job strategy, the **Flux v2.8 upgrade** with strict server-side apply and kstatus health checking, a new **flux-shard-operator** that spreads tenant HelmReleases across helm-controller shards so one noisy tenant can no longer stall the others, **operator-provided wildcard certificates** for platform and root-tenant ingress, **GPU passthrough that works without manual KubeVirt patching**, a **deletion-protection guardrail** for critical platform objects, and **runtime-populated dashboard dropdowns** via a new `Option` API. The release also rolls up every fix from v1.4.1 through v1.4.4.
+
+Platform components bumped in this release: **Flux v2.7.3 → v2.8.0** (flux-operator/flux-instance charts v0.33.0 → v0.50.0), **MetalLB v0.15.2 → v0.16.1** (FRR-K8s is now the default BGP backend), **SeaweedFS 4.05 → 4.31**, **etcd-operator v0.4.3 → v0.4.5**, **ouroboros v0.7.2 → v0.8.0**, **seaweedfs-cosi-driver v0.3.1**, and the new **kuberture** system package.
+
+> **Note:** Items marked *(backported to v1.4.x)* were also shipped in the v1.4.1, v1.4.2, v1.4.3, or v1.4.4 patch releases.
+
+## Feature Highlights
+
+### Gateway API Support via Cilium
+
+Cozystack-native services can now be exposed through the **Gateway API** backed by Cilium, as an opt-in alternative to the existing per-tenant ingress-nginx controllers. The feature is materialized per tenant through a new `gateway.cozystack.io/v1alpha1 TenantGateway` CRD reconciled by `cozystack-controller`.
+
+Enable it at the platform level with `publishing.gateway.enabled=true`, then either give a tenant its own Gateway, LoadBalancer IP, and certificate with `tenant.spec.gateway=true`, or leave it unset and let the tenant inherit the nearest ancestor's Gateway through the same label-based selector model that already drives ingress inheritance. Two certificate solver modes are supported: HTTP-01 (the default — a per-app certificate with zero platform configuration for new apps) and DNS-01 (opt-in — a single wildcard certificate covering an apex, with cloudflare, route53, digitalocean, and rfc2136 providers).
+
+Defaults stay on ingress-nginx, so existing clusters are unchanged. Two things to be aware of: Cilium Envoy / Gateway API is now always enabled (an extra `cilium-envoy` DaemonSet, roughly 100 MB RAM per node at idle), and `cozystack-api` now invokes admission (`createValidation` / `deleteValidation`) on Create and Delete for `apps.cozystack.io/*` — so any custom ValidatingAdmissionPolicies or webhooks on those kinds will now fire on all three verbs. See the [Gateway API guide](https://cozystack.io/docs/v1.5/operations/networking/gateway-api/) ([**@lexfrei**](https://github.com/lexfrei) in #2470).
+
+### TLS for Managed Databases and Messaging
+
+Four managed-app charts gain TLS support driven by a single `tls.enabled` value with consistent tri-state semantics: when unset it inherits `external` (TLS auto-on when the service is published externally, off when cluster-internal), and an explicit `true`/`false` always wins. In every case the trust anchor is a chart- or operator-managed self-signed CA that clients retrieve and pin — there is no publicly trusted CA. The one upgrade-time behaviour change to plan for: existing instances with `external: true` flip to TLS-on after upgrade; cluster-internal instances are unaffected.
+
+* **Kafka** serves TLS on its external LoadBalancer listener (port 9094), with certificates managed end-to-end by the Strimzi operator; clients trust via the operator-published `<release>-cluster-ca-cert` / `<release>-clients-ca-cert` secrets. The external listener is now gated only on `external: true`, decoupled from `tls.enabled` ([**@Arsolitt**](https://github.com/Arsolitt) in #2681).
+* **NATS** and **Qdrant** gain TLS via a self-contained cert-manager chain (self-signed Issuer → CA → leaf) rendered in the tenant namespace; NATS covers both client connections and cluster routes, Qdrant covers REST and gRPC. Clients trust the `<release>-ca` secret ([**@Arsolitt**](https://github.com/Arsolitt) in #2684, #2685).
+* **PostgreSQL** — CNPG already serves TLS unconditionally, so `tls.enabled` here injects the external hostname into the operator-managed server certificate's SANs (when `external: true`), so `sslmode=verify-full` works against the external endpoint. Clients retrieve `ca.crt` from the `<release>-credentials` secret ([**@Arsolitt**](https://github.com/Arsolitt) in #2686).
+
+### Backups That Work Out of the Box
+
+This release closes the gap between "backup machinery is installed" and "backups actually work without per-app S3 configuration."
+
+A platform-managed default **`BackupClass` (`cozy-default`)** is now shipped, backed by a system bucket (`cozy-backups`). Apps opt in with a `useSystemBucket` flag, after which the platform projects shared backup credentials into the tenant namespace (with RBAC isolation and projection metrics) and skips per-release credential Secrets. Default strategies are provided for every backup-capable app — Velero for VMDisk/VMInstance, CNPG for PostgreSQL, MariaDB, Altinity for ClickHouse, FoundationDB, and etcd — and a Velero `BackupStorageLocation` is wired to the system bucket. The legacy per-tenant S3 fields on Postgres and ClickHouse are deprecated in favour of this default flow ([**@androndo**](https://github.com/androndo) in #2716).
+
+To make that default flow reliable, **Velero is now a default system package** rather than optional. This fixes a deterministic failure where the default `backupstrategy-controller` (which hard-depends on Velero) sat in `DependenciesNotReady` and kept the platform HelmRelease from ever reaching Ready. Existing clusters get Velero in the `cozy-velero` namespace on upgrade; opt out via `bundles.disabledPackages` if you do not back up VMs ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #2833).
+
+Two new backup strategies join the catalog: an **etcd** strategy (cluster-scoped `strategy.backups.cozystack.io Etcd` CRD, S3-only, with snapshot BackupJob and a destructive in-place RestoreJob), and a generic application-agnostic **Job** strategy where the operator supplies a Kubernetes Job template that Cozystack renders and runs as a one-shot backup, then re-renders with `.Mode == "restore"` for recovery — the generic counterpart of the app-specific drivers ([**@androndo**](https://github.com/androndo) in #2641, [**@lllamnyp**](https://github.com/lllamnyp) in #1721).
+
+### Flux v2.8 Upgrade with Strict Server-Side Apply
+
+Flux is upgraded from v2.7.3 to v2.8.0 across both the embedded management-cluster Flux and the optional tenant Flux addon (flux-operator / flux-instance charts move v0.33.0 → v0.50.0). Flux v2.8's helm-controller v1.5 ships Server-Side Apply with `--force-conflicts` and kstatus-based health checking by default — so misplaced chart fields that v2.7 silently dropped are now hard errors (fixed here for foundationdb, kafka, kubevirt-instancetypes, vm-instance, and the platform chart), and parent HelmReleases now wait for every child resource to be Ready before reporting Ready themselves.
+
+**Action required on upgrade:** Kubernetes 1.33+ is now required for the management cluster (and for any tenant cluster enabling the Flux addon). The `upgrade.force: true` knob is removed, so immutable-field changes (for example StatefulSet `volumeClaimTemplates` / `serviceName`) no longer self-heal and must be recreated manually (`kubectl delete sts <name> --cascade=orphan`). Persistent TPM/EFI is re-enabled for Windows KubeVirt preferences (each affected VM provisions one extra RWO PVC), and FoundationDB `imageType` is pinned to `split` to keep upgrades non-disruptive ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #2602).
+
+### flux-shard-operator: Tenant helm-controller Sharding
+
+A new **flux-shard-operator** spreads tenant HelmReleases across multiple helm-controller shards, so one noisy tenant — for example a HelmRelease stuck in infinite remediation — can no longer degrade reconciliation for everyone else. Placement is per-tenant (all of a tenant's HelmReleases share one shard), assigned greedily by least load, with a CREATE-time mutating webhook stamping the shard label on each HelmRelease.
+
+It ships with `shardCount: auto` by default, which sizes shards from the tenant HelmRelease count: small clusters stay at a single shard (today's behaviour) while large fleets shard out automatically, and an integer pins the count explicitly. The legacy hand-rolled `flux-tenants` deployment is drained and retired automatically by migration 44 ([**@kvaps**](https://github.com/kvaps) in #2821).
+
+### Operator-Provided Wildcard Certificates
+
+Operators can now serve platform services and the root tenant's ingress under a pre-existing wildcard TLS certificate instead of minting per-host ACME certificates. Set `publishing.certificates.wildcardSecretName` to the name of a TLS Secret already created in the publishing namespace (`tenant-root` by default) — only the Secret name travels over the cozystack-values channel, never the key material.
+
+It works on both ingress paths: with ingress-nginx the controller serves it as `--default-ssl-certificate` and platform Ingresses drop their cert-manager annotations; with Gateway API a new `existingSecret` TenantGateway cert mode references the Secret directly and provisions no Issuer or Certificate. Scope is the root tenant only for now; extending wildcard mode to child tenants is a follow-up ([**@lexfrei**](https://github.com/lexfrei) in #2819).
+
+### GPU Passthrough Out of the Box
+
+GPU enablement is wired up across all three paths a GPU can reach a workload, each of which previously needed manual reconciliation.
+
+For **tenant Kubernetes**, node-groups declaring `gpus` automatically get the `gpu=on` kubelet label (so HAMi's device plugin schedules and advertises `nvidia.com/gpu`), and the tenant gpu-operator loads the driver with `NVreg_NvLinkDisable=1`, fixing single-SXM-GPU passthrough that previously hung at "Fabric State: In Progress" with CUDA "system not yet initialized." Both defaults are overridable via `addons.gpuOperator.valuesOverride` ([**@kvaps**](https://github.com/kvaps) in #2780).
+
+For **KubeVirt VMs**, enabling `cozystack.gpu-operator` now auto-populates the KubeVirt CR — injecting the `HostDevices` feature gate and filling `permittedHostDevices` (plus `mediatedDevicesConfiguration` for vGPU) from shipped NVIDIA default tables — so GPU VMs schedule without a manual `kubectl patch`. **Action required:** the bundle now owns `spec.configuration.permittedHostDevices`, so the first reconcile after upgrade overwrites any hand-edited entries; move custom device entries into `.gpu.permittedHostDevices` before upgrading and verify each `resourceName` matches what nodes advertise ([**@lexfrei**](https://github.com/lexfrei) in #2768). A third gpu-operator `container` variant is also added for hosts where the NVIDIA driver and container-toolkit are already installed by the OS, exposing GPUs to regular containerized pods via the device plugin only ([**@lexfrei**](https://github.com/lexfrei) in #2766).
+
+### Deletion-Protection Guardrail
+
+A new deletion-protection guardrail blocks `DELETE` on critical platform objects labeled `platform.cozystack.io/no-delete=true`, evaluated in-process by the kube-apiserver via a ValidatingAdmissionPolicy — no webhook, DaemonSet, TLS, or extra image. Protected objects in this release include the `cozy-system` and `tenant-root` namespaces, the `tenant-root` HelmRelease, the `cozystack-version` ConfigMap, the `cozystack-packages` OCIRepository, the cert-manager ClusterIssuers, the LinstorCluster, and the packages CRDs; a migration backfills the label onto existing resources.
+
+To delete a protected object, remove the label first (`kubectl label <kind> <name> platform.cozystack.io/no-delete-`). Requires Kubernetes 1.30+ ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #2650).
+
+### Runtime-Populated Dashboard Dropdowns
+
+A new generic mechanism powers runtime-populated dropdowns in dashboard create/edit forms, so fields that reference live cluster resources — GPU devices, KubeVirt instancetypes and preferences, Multus networks, VM images, storage pools, storage classes, backup classes and plans — become accurate dropdowns instead of free text or stale static enums. It introduces a namespaced, read-only `Option` resource (`core.cozystack.io/v1alpha1`) computed on read by a privileged in-process provider registry, and an `x-cozystack-options` schema keyword that app charts declare via the cozyvalues-gen `@x-cozystack-options` directive. Tenants get read-only access to options in their own namespace (from `cozy:tenant:view:base` upward), so curated lists populate without granting broad cluster reads ([**@kvaps**](https://github.com/kvaps) in #2778).
+
+## Upgrade Notes and Required Actions
+
+Most operators can take v1.5.0 with no manual action — the in-platform migrations handle config rewrites automatically — but five changes warrant attention.
+
+* **Kubernetes 1.33+ required for the management cluster.** With #2602, Flux jumps v2.7.3 → v2.8.0 and helm-controller v1.5 requires Kubernetes 1.33 or newer on the management cluster (and on any tenant cluster that enables the Flux addon). Upgrade Kubernetes before taking this release if you are below 1.33.
+
+* **`upgrade.force` is gone — immutable-field changes no longer self-heal.** Also with #2602, the helm-controller `upgrade.force: true` knob is removed. If a chart upgrade changes an immutable field (StatefulSet `volumeClaimTemplates`, `serviceName`, etc.) the apply now fails instead of silently force-replacing; recreate the object manually with `kubectl delete sts <name> --cascade=orphan` and let Flux re-reconcile.
+
+* **GPU VM operators must move custom host devices before upgrading.** With #2768, when `cozystack.gpu-operator` is enabled the platform takes ownership of `KubeVirt.spec.configuration.permittedHostDevices` and overwrites it on the first reconcile. Move any hand-edited `permittedHostDevices` / `mediatedDevicesConfiguration` entries into the `.gpu.permittedHostDevices` value before upgrading, and confirm each `resourceName` matches what your nodes advertise.
+
+* **MetalLB switches to the FRR-K8s BGP backend; metrics are now HTTPS-only.** With #2699, MetalLB jumps v0.15.2 → v0.16.1 and adopts the upstream-default FRR-K8s backend (the classic FRR mode is deprecated). Metrics endpoints moved from plain HTTP to HTTPS only (kube-rbac-proxy replaced by native TLS + RBAC), so any scrape config pointing at the old HTTP metrics endpoints must be updated. The host-network port denylist is rotated to match the new listener set, including the dedicated `/healthz` / `/readyz` probe port 17472.
+
+* **Externally published databases and messaging gain TLS automatically.** With #2681 / #2684 / #2685 / #2686, instances with `external: true` flip to TLS-on after upgrade. Because the trust anchor is a self-signed CA, external clients must retrieve and pin the CA (and PostgreSQL clients using `sslmode=verify-full` benefit from the new external-hostname SAN). Cluster-internal instances are unaffected.
+
+## Platform Components
+
+* **Flux**: v2.7.3 → v2.8.0 (flux-operator / flux-instance charts v0.33.0 → v0.50.0). helm-controller v1.5 with embedded Helm v4 brings strict Server-Side Apply and kstatus health checking; see Feature Highlights for the upgrade impact. ([release notes](https://github.com/controlplaneio-fluxcd/flux-operator/releases/tag/v0.50.0)) ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #2602)
+  - flux-operator gained an optional **Flux Status Page Web UI** with anonymous or OIDC auth and RBAC-gated actions (suspend/resume, rollout restart, run job, pod delete) — shipped opt-in in the cozystack package (v0.37.0+).
+  - **Security (CVE-2026-23990 / GHSA-4xh5-jcj2-ch8q, v0.40.0)**: fixed a Web UI impersonation bypass via empty OIDC claims — relevant only if the new Web UI is exposed with OIDC.
+  - `ResourceSetInputProvider` gained GitLab Environments, Gitea/Forgejo, AWS CodeCommit, and ExternalService provider types; `ResourceSet` gained `checksumFrom` (rollout restart on external secret/configmap change) and `includeEmptyProviders`.
+  - **Breaking:** the `--disable-wait-interruption` flag and `DISABLE_WAIT_INTERRUPTION` env var were removed (v0.39.0); flux-operator's CRD migration on Flux minor upgrades was fixed (v0.41.0) and a `flux-operator migrate` command added (v0.48.0).
+
+* **MetalLB**: v0.15.2 → v0.16.1. FRR-K8s is now the default BGP backend (Cozystack vendors the matching `frr-k8s` subchart at v0.0.25); classic FRR mode is deprecated. See Upgrade Notes for the HTTPS-only metrics change. ([release notes](https://github.com/metallb/metallb/releases/tag/v0.16.0)) ([**@lexfrei**](https://github.com/lexfrei) in #2699)
+  - New BGP features: per-peer `localASN` on `BGPPeer`, configurable FRR config-reload debounce, and a `ServiceSelector` on advertisements to target a subset of services.
+  - v0.15.3 added a `ConfigurationState` CRD to surface configuration errors, NetworkPolicy support in the chart, and fixed **CVE-2025-22874** in the images with a hardened pod security context.
+
+* **SeaweedFS**: 4.05 → 4.31 (chart 4.0.405 → 4.31.0). The bump clears the upstream 4.23 hazard flagged "not safe for erasure coding and multi-disk volume servers" and lands a large batch of S3-API correctness fixes (versioned-object semantics, Hadoop S3A multipart-ETag compatibility, bucket-quota read-only enforcement) plus EC bitrot detection, volume-server write-stall fixes, and new `/healthz` / `/readyz` probes. ([release notes](https://github.com/seaweedfs/seaweedfs/releases)) ([**@lexfrei**](https://github.com/lexfrei) in #2834)
+  - **Follow-up fixes required after the bump** (within this release): S3 TLS and the COSI provisioner ServiceAccount were restored (#2916), and the `-lock` BucketClass / s3 service name were restored with `volumeSizeLimitMB` dropped (#2943).
+
+* **etcd-operator**: v0.4.3 → v0.4.5. v0.4.4 added an `EtcdBackupStatus.snapshot` field describing the created backup artifact and moved `127.0.0.1` into `ipAddresses`; v0.4.5 fixed a broken restore-datadir path (restore was non-functional before this). ([release notes](https://github.com/aenix-io/etcd-operator/releases/tag/v0.4.5)) (bumped alongside the etcd backup-strategy controller by [**@androndo**](https://github.com/androndo) in #2641)
+
+* **ouroboros**: v0.7.2 → v0.8.0. Now logs an explicit reason when its TCP backend readiness check fails — making stuck-proxy situations immediately diagnosable instead of silently `NotReady` — and migrates the kubectl sidecar image from Docker Hub to `mirror.gcr.io` to avoid anonymous pull rate-limits *(backported to v1.4.3 via #2835)* ([**@lexfrei**](https://github.com/lexfrei) in #2807).
+
+* **seaweedfs-cosi-driver**: bumped to v0.3.1 with a stale-socket self-heal — the COSI driver removes any leftover UNIX socket before binding, so the objectstorage provisioner recovers automatically from `CrashLoopBackOff` after a non-graceful exit instead of wedging on "bind: address already in use" *(backported to v1.4.3 via #2827)* ([**@lexfrei**](https://github.com/lexfrei) in #2791).
+
+* **kuberture**: new optional system package (v0.1.1). A controller that bridges an external-dns gap (external-dns cannot read EndpointSlices): it watches the `default/kubernetes` API-server EndpointSlice and emits annotated headless Services that external-dns consumes to publish the Kubernetes API endpoint to DNS. Off by default; enable via `bundles.enabledPackages` and declare at least one `config.outputs` entry. ([sources](https://github.com/lexfrei/kuberture)) ([**@lexfrei**](https://github.com/lexfrei) in #2647)
+
+## Major Features and Improvements
+
+* **[networking] Gateway API support via Cilium**: See Feature Highlights — opt-in `TenantGateway` CRD, platform `publishing.gateway.enabled` toggle, per-tenant opt-in with HTTP-01/DNS-01 cert modes; supersedes #2213 ([**@lexfrei**](https://github.com/lexfrei) in #2470).
+
+* **[fluxcd] Add flux-shard-operator for tenant helm-controller sharding**: See Feature Highlights — spreads tenant HelmReleases across helm-controller shards with `shardCount: auto`; retires the hand-rolled `flux-tenants` deployment via migration 44 ([**@kvaps**](https://github.com/kvaps) in #2821).
+
+* **[flux] Upgrade to Flux v2.8.0**: See Feature Highlights and Platform Components — strict SSA + kstatus, chart fixes for foundationdb/kafka/kubevirt-instancetypes/vm-instance/platform, Kubernetes 1.33+ requirement, `upgrade.force` removed (folds #2612) ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #2602).
+
+* **[platform] Operator-provided wildcard certificate for platform and tenant ingress**: See Feature Highlights — `publishing.certificates.wildcardSecretName` serves a pre-existing wildcard cert on ingress-nginx (`--default-ssl-certificate`) and Gateway API (`existingSecret` mode); root tenant only ([**@lexfrei**](https://github.com/lexfrei) in #2819).
+
+* **[platform] Add default backupclass**: See Feature Highlights — platform-managed `cozy-default` BackupClass backed by the `cozy-backups` system bucket, `useSystemBucket` opt-in with projected shared credentials, default strategies for every backup-capable app ([**@androndo**](https://github.com/androndo) in #2716).
+
+* **[platform] Add backup-strategy controller for etcd**: See Feature Highlights — cluster-scoped `strategy.backups.cozystack.io Etcd` CRD with snapshot BackupJob and in-place RestoreJob; bumps etcd-operator to v0.4.5 ([**@androndo**](https://github.com/androndo) in #2641).
+
+* **[backups] Implement Job backup strategy**: A generic, application-agnostic `strategy.backups.cozystack.io/Job` strategy — the operator supplies a Kubernetes Job template that Cozystack renders and runs as a one-shot backup, emitting a `Backup` artifact on completion; restore re-renders the same template with `.Mode == "restore"` (cross-namespace restore is not supported) ([**@lllamnyp**](https://github.com/lllamnyp) in #1721).
+
+* **[platform] Install velero by default**: See Feature Highlights — Velero moves from optional to default so the default `backupstrategy-controller` no longer blocks the platform HelmRelease; opt out via `bundles.disabledPackages` ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #2833).
+
+* **[api] Add Option resource and x-cozystack-options for dynamic form dropdowns**: See Feature Highlights — read-only `core.cozystack.io/v1alpha1 Option` resource computed on read, `x-cozystack-options` schema keyword, tenant-scoped read access ([**@kvaps**](https://github.com/kvaps) in #2778).
+
+* **[api] Expose HelmRelease generation knobs as cozystack-api flags**: A follow-up to v1.4.0's #2509 that brings the same HelmRelease generation knobs to the second HelmRelease-generating path. The `cozystack-api` `convertApplicationToHelmRelease` path previously hardcoded `Interval: 5m`, `Remediation{Retries: -1}`, and no `Strategy`/`MaxHistory`; it now honours the `--helmrelease-interval`, `--helmrelease-retry-interval`, `--helmrelease-install-timeout`, `--helmrelease-upgrade-timeout`, and `--helmrelease-max-history` flags so the operator-generated and api-generated HelmReleases behave identically ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #2571).
+
+* **[platform] Add deletion-protection guardrail via ValidatingAdmissionPolicy**: See Feature Highlights — `platform.cozystack.io/no-delete=true` blocks DELETE on critical platform objects in-apiserver; remove the label to delete; requires Kubernetes 1.30+ ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #2650).
+
+* **[kafka] Add TLS support via Strimzi listener configuration**: See Feature Highlights — TLS on the external listener (9094), Strimzi-managed certs, external listener decoupled from TLS ([**@Arsolitt**](https://github.com/Arsolitt) in #2681).
+
+* **[nats] Add TLS support via cert-manager**: See Feature Highlights — self-contained cert-manager chain for client connections and cluster routes ([**@Arsolitt**](https://github.com/Arsolitt) in #2684).
+
+* **[qdrant] Add TLS support via cert-manager**: See Feature Highlights — TLS for REST and gRPC endpoints via a single switch ([**@Arsolitt**](https://github.com/Arsolitt) in #2685).
+
+* **[postgres] Add TLS support via CNPG operator-managed certificates**: See Feature Highlights — injects the external hostname into the CNPG server certificate SANs so `sslmode=verify-full` works against the external endpoint ([**@Arsolitt**](https://github.com/Arsolitt) in #2686).
+
+* **[kubernetes] Enable GPU passthrough out-of-the-box**: See Feature Highlights — `gpu=on` kubelet label on GPU node-groups and `NVreg_NvLinkDisable=1` driver flag fix single-SXM-GPU passthrough ([**@kvaps**](https://github.com/kvaps) in #2780).
+
+* **[platform] Auto-wire KubeVirt permittedHostDevices and HostDevices feature gate**: See Feature Highlights — GPU VMs schedule without manual `kubectl patch`; the bundle now owns `permittedHostDevices` (see Upgrade Notes) ([**@lexfrei**](https://github.com/lexfrei) in #2768).
+
+* **[gpu-operator] Add container variant for preinstalled host driver**: New `container` gpu-operator variant for hosts where the NVIDIA driver and container-toolkit are already OS-installed — exposes GPUs to containerized pods via the device plugin only ([**@lexfrei**](https://github.com/lexfrei) in #2766).
+
+* **[rbac] Allow tenants to start/stop/restart their VMs**: New RBAC rule grants `update` on the `virtualmachines/start`, `/stop`, and `/restart` KubeVirt subresources at the `cozy:tenant:use:base` level, so the dashboard's VM power buttons (which previously returned 403 for every tenant role) now work ([**@kvaps**](https://github.com/kvaps) in #2777).
+
+* **[monitoring] Add tenant overview dashboard**: A new "Tenant Overview" Grafana dashboard for platform admins, deployed only to the root/infra Grafana in `cozy-monitoring` (never to per-tenant Grafanas, so no cross-tenant data leak). Gives a cross-tenant fleet summary, per-tenant leaderboard, top-N consumers, usage trends, and health signals ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #2809).
+
+* **[dashboard] Add cluster-usage RBAC for the new admin page**: New `cozystack-dashboard-cluster-usage` ClusterRole (cluster-wide read on nodes/pods + `metrics.k8s.io` nodes) bound to the `cozystack-cluster-admin` group, backing the new Console → Administration → Cluster Usage page (cluster-wide and per-node utilization, including GPUs). The sidebar entry is fail-closed without the binding ([**@lexfrei**](https://github.com/lexfrei) in #2743).
+
+* **[apps] Mark stateful-app storageClass fields as immutable**: 16 stateful apps (clickhouse, foundationdb, harbor, http-cache, kafka, kubernetes, mariadb, mongodb, nats, openbao, opensearch, postgres, qdrant, rabbitmq, redis, vm-disk) declare `storageClass` immutable via an `x-kubernetes-validations` rule in their chart schema and the dashboard renders the field read-only on edit forms, because changing storageClass never migrates data (PVCs pin `storageClassName` at creation). **Enforcement is UI-only in this release** — the aggregated apiserver does not yet evaluate the CEL rule on `Update`, so a direct `kubectl patch` is still accepted; apiserver-level enforcement is tracked in #2657. `kubernetes.nodeGroups[].storageClass` is intentionally excluded ([**@lexfrei**](https://github.com/lexfrei) in #2639).
+
+* **[seaweedfs] Bump SeaweedFS to 4.31**: See Platform Components — chart 4.0.405 → 4.31.0, clears the 4.23 EC hazard ([**@lexfrei**](https://github.com/lexfrei) in #2834).
+
+* **[metallb] Bump to v0.16.1 and rotate host-network port denylist**: See Platform Components and Upgrade Notes — FRR-K8s default backend, HTTPS-only metrics, rebuilt controller/speaker images, rotated port denylist ([**@lexfrei**](https://github.com/lexfrei) in #2699).
+
+* **[ouroboros] Bump to v0.8.0**: See Platform Components ([**@lexfrei**](https://github.com/lexfrei) in #2807, *backported to v1.4.3*).
+
+* **[platform] Add kuberture as optional system package**: See Platform Components — publishes the Kubernetes API endpoint to DNS via external-dns ([**@lexfrei**](https://github.com/lexfrei) in #2647).
+
+## Bug Fixes
+
+* **[api] Publish open spec as x-kubernetes-preserve-unknown-fields, not additionalProperties:true**: Fixes a cluster-wide kube-controller-manager CrashLoopBackOff (nil-pointer panic) that stalled reconciliation and timed out installs/upgrades. `cozystack-api` previously published the free-form `.spec` of `apps.cozystack.io` resources as `additionalProperties: true`, whose nil inner schema crashed the VAP type-checker run by KCM. The fix publishes `x-kubernetes-preserve-unknown-fields: true` instead and adds a recursive sanitizer that rewrites any boolean `additionalProperties` anywhere — including in untrusted `ApplicationDefinition.openAPISchema` input — closing the whole crash class ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #2867).
+
+* **[prometheus-operator-crds] Ship full upstream CRD bundle**: The package previously shipped only the four service-discovery CRDs VictoriaMetrics needs. This adds the six previously-stripped CRDs (Alertmanager, AlertmanagerConfig, Prometheus, PrometheusAgent, ScrapeConfig, ThanosRuler), so third-party apps in tenant clusters that ship their own prometheus-operator (e.g. kube-prometheus-stack) can create those CRs, or set `crds.enabled: false` and consume the platform-managed CRDs (which Flux previously kept reverting) ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #2660).
+
+* **[info] Use root-host for Keycloak OIDC issuer URL in tenant kubeconfig**: The dashboard-issued kubeconfig for non-root tenants built `--oidc-issuer-url` from the tenant subdomain, but Keycloak's ingress and TLS cert live only at the root host, so `kubectl oidc-login` failed TLS verification and the kubeconfig was unusable. The issuer now always uses the root host (`https://keycloak.<root-domain>/realms/cozy`), so non-root tenants can authenticate with the downloaded kubeconfig ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #2704).
+
+* **[kubernetes] Add config_path patch for containerd 2.x**: Per-registry mirror/credential config (`/etc/containerd/certs.d`) did not take effect on containerd 2.x tenant nodes because the CRI plugin config section was renamed and the old single sed was a no-op. The fix runs version-tolerant seds and loosens quote matching (also fixing Ubuntu 24.04, which emits single-quoted section headers), so `config_path` registry config works on both containerd 1.x and 2.x without manual patching ([**@elaugaste**](https://github.com/elaugaste) in #2723).
+
+* **[csi] Detach orphan hot-plug volumes when VMI outlives its VM**: When a VMI outlives its owning VM, hot-plug volumes were left attached, blocking the volume from being re-attached elsewhere; the CSI wrapper now detaches the orphaned hot-plug volumes so the PVC can be reused ([**@kvaps**](https://github.com/kvaps) in #2866).
+
+* **[csi] Route RWX Block volumes to upstream hotplug detach**: KubeVirt live-migration disks (RWX Block PVCs) were incorrectly matched by the NFS-cleanup branch in `ControllerUnpublishVolume` and never detached, so a later attach to a different VM was rejected by linstor-csi's anti-split-brain check. A new `isNFSVolume` predicate requires both `ReadWriteMany` and `VolumeMode=Filesystem`, accurately matching only NFS-backed PVCs, and the same predicate fixes in-VM disk expansion being skipped for RWX Block volumes *(backported to v1.4.2 via #2749)* ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #2658).
+
+* **[csi] Verify VMI Ready after kubevirt-csi Publish to surface stuck-PVC failures**: Upstream `ControllerPublishVolume` has a fast path that reports success as soon as the volume entry appears in `VM.spec.template.spec.volumes`, even if the backing PVC is stuck `ClaimPending` and the hotplug never completed — surfacing later as a confusing kubelet `couldn't find device by serial id`. The wrapper now re-reads `VMI.Status.VolumeStatus` and returns `codes.Unavailable` with the upstream reason if the volume is not `VolumeReady`, keeping external-attacher retrying and surfacing the real provisioning failure at the CSI layer *(backported to v1.4.2 via #2748)* ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #2659).
+
+* **[capi] Add startupProbe to capi-controller-manager to survive cert provisioning delay**: The CAPI controller-manager could CrashLoop during initial certificate provisioning because the readiness probe failed while the controller was still booting; a startup probe now gives it room to come up *(backported to v1.4.x stabilization)* ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #2946).
+
+* **[cluster-api] Fix kamaji OOM and set limits on unset providers**: The Kamaji control-plane-provider resource override targeted a container named `manager`, but the upstream image names it `controller`, so the intended limits were dropped and the pod OOMKilled (exit 137) on the upstream 128 Mi default. The container name is corrected and modest requests/limits are set for the core, kubeadm-bootstrap, and kubevirt-infrastructure providers that previously ran as BestEffort *(backported to v1.4.1 via #2709)* ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #2708).
+
+* **[platform] Migrate ephemeralStorage to diskSize via pre-upgrade hook**: The #2454 rename of `nodeGroups[*].ephemeralStorage` to `diskSize` added a hard `{{ fail }}` guard that blocked reconciliation of any HelmRelease still carrying the legacy field. A new platform pre-upgrade migration (migration 41) walks all `kuberneteses.apps.cozystack.io` Application CRs cluster-wide and renames the field automatically before chart resources are applied; the migration is idempotent and best-effort *(backported to v1.4.1 via #2712)* ([**@IvanHunters**](https://github.com/IvanHunters) in #2688).
+
+* **[postgres] Accept integer values for postgresql.parameters in schema**: PostgreSQL parameters such as `max_connections` are natural integers, but the chart schema declared `{type: string}` only, so bare integers were rejected at schema-validation time. An `intOrString` alias in cozyvalues-gen now emits `anyOf: [integer, string]` plus `x-kubernetes-int-or-string: true`, making both forms valid; the `$dangerousParams` blocklist is also extended with `archive_cleanup_command` and `recovery_end_command` *(backported to v1.4.1 via #2715)* ([**@IvanHunters**](https://github.com/IvanHunters) in #2687).
+
+* **[kafka] Remove ZooKeeper PVCs on uninstall**: The Strimzi `Kafka` CR set `deleteClaim: true` on broker JBOD volumes but left ZooKeeper persistent-claim storage at `deleteClaim: false`, orphaning the ZooKeeper PVCs on uninstall and requiring manual cleanup before the release name could be reused. `deleteClaim: true` is now set on the ZooKeeper storage as well *(backported to v1.4.1 via #2705)* ([**@Arsolitt**](https://github.com/Arsolitt) in #2679).
+
+* **[opensearch-operator] Replace deprecated kube-rbac-proxy image**: The `gcr.io/kubebuilder/kube-rbac-proxy` image is no longer available since the kubebuilder GCR registry was sunset. It is replaced with `quay.io/brancz/kube-rbac-proxy` (the source already used by other Cozystack components), applied via a `values.yaml` entry instead of a vendored-chart patch *(backported to v1.4.1 via #2695)* ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #2689).
+
+* **[platform] Add OpenSearch to PaaS bundle**: The OpenSearch packages existed in the repo for several releases but the PaaS bundle template never referenced the two `cozystack.opensearch-*` PackageSources, so the operator was never deployed and the dashboard catalog showed no OpenSearch entry. The two missing includes are now added *(backported to v1.4.2 via #2757)* ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #2648).
+
+* **[dashboard] Grant tenant dashboard read on cozy-public PVCs**: The VM disk source-image dropdown returned 403 and stayed empty even when golden images existed, because the `cozy:tenant:dashboard` Role only granted read on Flux HelmRepositories and HelmCharts. `get/list/watch` on PersistentVolumeClaims is added so tenant identities can list the `vm-default-images-*` PVCs *(backported to v1.4.3 via #2858)* ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #2843).
+
+* **[api] Emit initial-events-end bookmark for core.cozystack.io watches**: The `TenantSecret`, `TenantModule`, and `TenantNamespace` aggregated API resources never sent the `k8s.io/initial-events-end` bookmark required by the WatchList protocol, so client-go informers using `WatchListClient` (on by default since v1.35) never reached `HasSynced`. The bookmark is now emitted after initial `ADDED` events *(backported to v1.4.3 via #2844)* ([**@sunib**](https://github.com/sunib) in #2786).
+
+* **[networking] Point host ouroboros proxy at the root-tenant ingress**: When `publishing.proxyProtocol` was enabled, the host-level ouroboros proxy inherited a default backend FQDN that describes a managed tenant cluster and never resolved on the host. The host ouroboros `Package` is now emitted with a `proxy.target` override derived from `publishing.ingressName` *(backported to v1.4.3 via #2846)* ([**@lexfrei**](https://github.com/lexfrei) in #2800).
+
+* **[ingress,platform] Deliver publishing.proxyProtocol to host ingress-nginx**: Threads the `publishing.proxyProtocol` setting through to the host ingress-nginx controller so PROXY-protocol mode is actually applied on the host path ([**@lexfrei**](https://github.com/lexfrei) in #2799).
+
+* **[objectstorage-controller] Propagate Bucket readiness to BucketClaim**: The vendored COSI controller hardcoded `bucketReady=false` after dynamic provisioning and never re-read the `Bucket`, so `BucketAccess` was never granted and provisioned buckets ended up without credentials. The controller now re-reads the live `Bucket` and propagates its readiness *(backported to v1.4.3 via #2828)* ([**@lexfrei**](https://github.com/lexfrei) in #2792).
+
+* **[kubernetes] Stamp application lineage labels on worker node VMs**: Worker-node VMs created by Cluster API and the KubeVirt provider were never stamped with `apps.cozystack.io/application.{group,kind,name}` lineage labels, so the dashboard could not attribute those pods to their owning Kubernetes application. The labels are now applied to the `KubevirtMachineTemplate`, and `application.name` is quoted so a purely-numeric cluster name renders as a YAML string *(backported to v1.4.3 via #2790)* ([**@kvaps**](https://github.com/kvaps) in #2779).
+
+* **[kubernetes] Add spec.timeout to tenant CSI HelmRelease**: Adds an explicit `spec.timeout` to the tenant CSI HelmRelease so slow first installs are not classified as failures under the new Flux kstatus waits ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #2727).
+
+* **[platform] Add cert-manager dependency to webhook-cert consumers**: Adds an explicit `dependsOn` cert-manager to the HelmReleases that consume webhook certificates, so they no longer race cert-manager during cold install ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #2726).
+
+* **[platform] Order cozystack-basics after the APIs its admission policies type-check**: Reorders `cozystack-basics` so it installs after the APIs its ValidatingAdmissionPolicies reference, avoiding type-check failures when the referenced APIs are not yet registered ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #2842).
+
+* **[dashboard] Unblock token-proxy startup when JWKS is briefly unreachable**: The dashboard token-proxy refused to start if the JWKS endpoint was momentarily unreachable; startup is now resilient to a brief JWKS outage so the dashboard comes up and recovers once JWKS is reachable ([**@lexfrei**](https://github.com/lexfrei) in #2745).
+
+* **[kubevirt-cdi-operator,grafana-operator] Add startupProbes**: Adds startup probes to the kubevirt-cdi-operator and grafana-operator so slow boots are not killed by the readiness probe before initialization finishes ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #2725).
+
+* **[seaweedfs] Restore S3 TLS and COSI provisioner SA after 4.31 bump**: Restores the S3 TLS configuration and the COSI provisioner ServiceAccount that regressed during the SeaweedFS 4.31 bump ([**@kvaps**](https://github.com/kvaps) in #2916).
+
+* **[seaweedfs] Restore -lock BucketClass, s3 service name, and drop volumeSizeLimitMB**: Restores the `-lock` BucketClass and the s3 service name and drops the now-invalid `volumeSizeLimitMB` field after the 4.31 bump ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #2943).
+
+* **[seaweedfs] Bump seaweedfs-cosi-driver to v0.3.1**: See Platform Components — stale-socket self-heal *(backported to v1.4.3 via #2827)* ([**@lexfrei**](https://github.com/lexfrei) in #2791).
+
+* **[backups] Carry dropdown option sources in CRD annotations, not schema**: Moves the backup dropdown option sources from the chart schema into CRD annotations so they are consumed by the new `x-cozystack-options` mechanism without polluting the schema ([**@lexfrei**](https://github.com/lexfrei) in #2823).
+
+* **[backups] Fix CI broken after merge**: Repairs the backups test suite that broke after a merge conflict between concurrent backup-strategy PRs ([**@androndo**](https://github.com/androndo) in #2762).
+
+## Security
+
+* **[deps] Bump Go to 1.26.4 and x/net to v0.55.0 to close OSV advisories**: Bumps the Go toolchain to 1.26.4 and `golang.org/x/net` to v0.55.0 to clear reported OSV/Dependabot advisories across the first-party modules ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #2852).
+
+* **[ci] Add CodeQL workflow for Go (SAST)**: Adds a CodeQL static-analysis workflow for the Go codebase so security issues are flagged on PRs ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #2851).
+
+* **[ci] Add OpenSSF Scorecard workflow**: Adds the OpenSSF Scorecard workflow to track and publish the project's supply-chain security posture; a follow-up pins the Scorecard workflow actions by SHA ([**@tym83**](https://github.com/tym83) in #2720, #2721).
+
+* **[platform] Deletion-protection guardrail**: See Feature Highlights — blocks accidental DELETE of critical platform objects in-apiserver ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #2650).
+
+## System Configuration
+
+* **[platform] Velero installed by default**: See Feature Highlights — Velero moves to a default system package; opt out via `bundles.disabledPackages` ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #2833).
+
+* **[platform] Register kuberture as optional system package**: See Platform Components — off by default, enabled via `bundles.enabledPackages` with a required `config.outputs` entry ([**@lexfrei**](https://github.com/lexfrei) in #2647).
+
+* **[seaweedfs] Split seaweedfs-system into seaweedfs-db + seaweedfs-system**: Extracts the SeaweedFS CNPG postgres Cluster into its own `seaweedfs-db` HelmRelease that reports Ready only when postgres actually serves connections, fixing a fresh-install race where the filer CrashLooped against an endpoint-less ClusterIP under Cilium. An automatic, data-safe migration adopts the existing postgres cluster in place (re-annotates Helm ownership and stamps `helm.sh/resource-policy: keep`); no data is moved and no PV/PVC is re-provisioned ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #2601).
+
+## Dependencies & Version Updates
+
+See the **Platform Components** section near the top of this changelog for the full list of upstream bumps with user-facing impact summaries (Flux v2.8.0, MetalLB v0.16.1, SeaweedFS 4.31, etcd-operator v0.4.5, ouroboros v0.8.0, seaweedfs-cosi-driver v0.3.1, kuberture v0.1.1).
+
+Additional dependency-related changes:
+
+* **[deps] Bump Go to 1.26.4 and x/net to v0.55.0** — see Security ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #2852).
+* **[ci] Bump cozyvalues-gen pin to v1.5.0, then v1.6.0** — schema-generation tooling refresh ([**@lexfrei**](https://github.com/lexfrei) in #2730, #2784).
+
+## Development, Testing, and CI/CD
+
+* **[ci/build] Isolate each PR build on its own ephemeral runner VM**: Moves PR builds onto per-job ephemeral runner VMs to fix the cross-job buildkit single-writer-lock contention that caused intermittent build hangs on the shared runner host ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #2939).
+
+* **[refactor/build] mode=max registry cache with a main-only warmer**: Switches the build cache to `mode=max` with a main-branch-only cache warmer so PR builds warm-start without each PR re-pushing cache layers ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #2938).
+
+* **[build] Read --cache-from from ghcr :latest so PR builds warm-start**: Points `--cache-from` at the ghcr `:latest` tag so PR builds reuse the last published cache ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #2855).
+
+* **[refactor/build] Standardize image tagging to fix concurrent PR push conflicts**: Standardizes the build image-tagging scheme so concurrent PR builds no longer collide when pushing to the registry ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #2711).
+
+* **[ci] Create buildx builder in the build step's DOCKER_CONFIG**: Fixes buildx builder creation by scoping it to the build step's `DOCKER_CONFIG` ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #2962).
+
+* **[feat/ci] Test-impact analysis E2E (default-on) + release E2E workflow**: Adds test-impact analysis that selects which E2E suites to run based on the PR diff (default-on), plus a dedicated release E2E workflow ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #2559).
+
+* **[ci/tests] Fix OCIR registry login in Release E2E workflow**: Corrects the OCIR registry login step in the Release E2E workflow so the release E2E run authenticates correctly ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #2973).
+
+* **[ci/release] Auto-patch-release only the 2 newest release lines**: The automated patch-release cron now targets only the two newest release lines, matching the supported-version window, and documents the support window ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #2856).
+
+* **[ci/release] Repair orphaned draft tag_name on retag**: When a tag was deleted and re-created between draft creation and merge, GitHub orphaned the draft release by setting `tag_name` to `untagged-<hash>`. The finalize step now detects the orphaned form, matches by `name`, repairs `tag_name`, and publishes *(backported to v1.4.3 via #2829)* ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #2761).
+
+* **[ci] Add Go-scoped Renovate configuration**: Adds a Renovate configuration scoped to the Go modules so Go dependency updates are managed automatically ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #2850).
+
+* **[ci/tags] Include data/versions in website docs commit**: The tags workflow now includes `data/versions` in the website docs commit so version metadata stays in sync ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #2707).
+
+* **[ci] Consolidated platform & e2e stabilization batch**: A consolidated batch of platform and E2E stabilization changes folded into a single PR ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #2948).
+
+* **[ci/e2e] Drop 3x retry on Run E2E + Install Cozystack, wait out gateway.bats tenant teardown**: Removes the blanket 3x retry on deterministic E2E steps and instead waits out the gateway.bats tenant teardown explicitly ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #2558).
+
+* **[ci/workflows] Add SSH breakpoint on E2E failure for debug PRs**: Adds an opt-in SSH breakpoint on E2E failure for debug PRs so failures can be inspected live ([**@kvaps**](https://github.com/kvaps) in #2535).
+
+* **[test/e2e] Self-heal Cilium orphaned-endpoint leak across install and apps**: Adds an in-cluster self-heal Job that recovers from the Cilium agent's orphaned-endpoint leak (the "IP already in use" flake) during install and app churn ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #2874).
+
+* **[test/e2e] Pin Kubernetes to v1.33.12 to avoid KCM VAP type-checker panic**: Pins the E2E Kubernetes version to v1.33.12 to avoid the kube-controller-manager VAP type-checker panic on affected Kubernetes builds (the durable apiserver-side fix ships in #2867) ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #2868).
+
+* **[test/e2e] Drive LINSTOR post-install waits off a single 15m deadline**: Replaces per-step LINSTOR waits with a single 15-minute deadline so the slowest path determines runtime ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #2928).
+
+* **[test/e2e] Pre-pull platform images via staged-busybox DaemonSet**: Pre-pulls timing-sensitive platform images via a staged-busybox DaemonSet before install so first-install reconciliation does not race image pulls ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #2724).
+
+* **[test/e2e] Fix bucket.bats port-forward and S3 client reliability**: Hardens the bucket.bats test's port-forward and S3 client interaction for reliability ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #2944).
+
+* **[test/e2e] ouroboros fold + CSI/NFS ordering + OIDC keycloakInternalUrl**: Folds the ouroboros E2E case, fixes CSI/NFS ordering, and corrects the OIDC `keycloakInternalUrl` in the suite ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #2728).
+
+* **[test/e2e] Silence helm-template render in install-cozystack trace**: Silences the noisy helm-template render output in the install trace so failures are easier to read ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #2615).
+
+* **[tests] Exclude loop devices from host LVM scanning**: Excludes loop devices from host LVM scanning in the test harness so loop-mounted images do not get their volume groups activated ([**@kvaps**](https://github.com/kvaps) in #2798).
+
+* **[e2e-sandbox] Use curl -fsSL when downloading mc**: The MinIO client was downloaded without `-L`, so a 302 redirect from `dl.min.io` wrote the HTML redirect body to `/usr/local/bin/mc` and the bucket E2E test then failed trying to execute it. Adding `-fsSL` follows the redirect and fails fast on HTTP errors *(shipped in v1.4.1)* ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #2690).
+
+* **[test/metallb] Assert digest-pinned image form, not exact version literal**: Updates the metallb test to assert the digest-pinned image form rather than an exact version literal, so the test survives version bumps ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #2873).
+
+* **[test/api] Add read-path authorization tests for TenantNamespace registry**: Adds read-path authorization tests for the TenantNamespace registry to lock down the IDOR fixes ([**@lexfrei**](https://github.com/lexfrei) in #2864).
+
+* **[feat/hack] Rewrite check-readiness as a Go command with test suite**: Rewrites the `check-readiness` helper as a Go command with a test suite, replacing the previous shell implementation ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #2755).
+
+* **[chore/controller] Remove dead dashboard controller**: Removes the now-dead dashboard controller code left behind after the schema-driven UI rewrite ([**@kvaps**](https://github.com/kvaps) in #2694).
+
+* **[chore/img] Refresh Cozystack logo and add icon/stacked variants**: Refreshes the Cozystack logo and adds icon and stacked logo variants ([**@kvapsova**](https://github.com/kvapsova) in #2746).
+
+* **[chore/maintainers] Update roster, add Emeritus section, mark @lllamnyp as Core Maintainer**: Updates the maintainer roster, adds an Emeritus section, documents Emeritus technical offboarding and reactivation, and marks [**@lllamnyp**](https://github.com/lllamnyp) as a Core Maintainer ([**@tym83**](https://github.com/tym83) in #2717, #2718, #2719).
+
+* **[docs/agents] Add E2E/CI testing conventions and consolidate build/test/verify guidance**: Adds the E2E and CI testing conventions doc and consolidates the build, test, and verification guidance for agents and contributors ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #2932, #2933).
+
+* **[docs/release] Expand release.md into a release-engineer playbook**: Expands `release.md` into a full release-engineer playbook covering the release process end to end ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #2732).
+
+## Documentation
+
+* **[harbor] Document S3 object-storage (SeaweedFS) prerequisite**: Documents that Harbor requires an S3 object-storage backend (SeaweedFS) and how to satisfy the prerequisite ([**@lexfrei**](https://github.com/lexfrei) in #2818).
+
+* **[gpu-operator] Document passthrough variant host-driver prerequisite**: Documents the host-driver prerequisite for the gpu-operator passthrough variant ([**@lexfrei**](https://github.com/lexfrei) in #2767).
+
+* **[website] KubeVirt VM Disk and VM Instance how-to**: New how-to explaining the VMDisk and VMInstance primitives — independent disk/compute lifecycles, golden images, cloning, fast provisioning, with Dashboard and kubectl examples and VM access methods (serial console, SSH, VNC) ([**@tym83**](https://github.com/tym83) in cozystack/website#586).
+
+* **[website] etcd-operator v1alpha2 announcement and migration guide**: Announces the donation of etcd-operator to Cozystack and the new `etcd-operator.cozystack.io/v1alpha2` API — a Membership-API lifecycle replacing the StatefulSet model — with the in-place v1alpha1 → v1alpha2 migration path ([**@kvaps**](https://github.com/kvaps) in cozystack/website#573).
+
+The following documentation shipped in the v1.4.x patch releases and is included for completeness:
+
+* **[website] Add backup and recovery guides for managed applications**: Operator and tenant guides for managed-application backups covering PostgreSQL, MariaDB, ClickHouse, and FoundationDB *(shipped in v1.4.1)* ([**@androndo**](https://github.com/androndo) in cozystack/website#536).
+* **[website] Cilium Gateway API — architecture, security, and migration guide**: Comprehensive `networking/gateway-api.md` page for the Cilium-backed Gateway API feature *(shipped in v1.4.2)* ([**@lexfrei**](https://github.com/lexfrei) in cozystack/website#509).
+* **[website] Publish Kubernetes API endpoint via external-dns with kuberture**: Documents exposing the managed Kubernetes API endpoint through external-dns using the kuberture system package *(shipped in v1.4.3)* ([**@lexfrei**](https://github.com/lexfrei) in cozystack/website#539).
+* **[ingress] Explain how ingress works in the platform**: Adds a "How ingress works" overview to the ingress package README *(shipped in v1.4.3)* ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #2770).
+* **[website] Managed Kubernetes how-to**: Practical guide for deploying and using managed Kubernetes clusters within Cozystack *(shipped in v1.4.3)* ([**@tym83**](https://github.com/tym83) in cozystack/website#565).
+* **[website] Platform-managed backups introduction**: Introduces Cozystack's platform-managed backup capabilities for stateful workloads *(shipped in v1.4.3)* ([**@tym83**](https://github.com/tym83) in cozystack/website#566).
+* **[website] talm: document DRBD sysctl tuning, keepalive toggle, and etcd quota**: Documents the talm DRBD sysctl performance tuning, the DRBD keepalive toggle, and the etcd backend quota configuration that ship in talm v0.31.0 *(shipped in v1.4.3)* ([**@lexfrei**](https://github.com/lexfrei) in cozystack/website#567).
+* **[website] Cozystack vs OpenStack comparison**: Vendor-neutral comparison post covering seven dimensions — architecture, compute, networking, storage, managed services, operations, and multi-tenancy — for teams evaluating private cloud options *(shipped in v1.4.4)* ([**@tym83**](https://github.com/tym83) in cozystack/website#580).
+
+## Other Repositories
+
+### talm v0.31.0 *(shipped in v1.4.4)*
+
+* **[talm] Add DRBD-oriented sysctl and etcd backend defaults**: Adds production-tested TCP sysctls to the `cozystack` preset that prevent TCP port exhaustion during DRBD reconnect storms, an opt-in `tcpKeepaliveTuning` group, and a configurable `etcd.quotaBackendBytes` (default 8 GiB) ([**@IvanHunters**](https://github.com/IvanHunters) in cozystack/talm#131).
+* **[talm] Emit progress on stderr, enrich lookup error chain, retry transient failures**: Fixes `talm template -f X > Y` emitting a stray progress line on stdout, enriches lookup-failure errors with a six-class hint taxonomy, and retries transient connectivity failures with exponential backoff ([**@lexfrei**](https://github.com/lexfrei) in cozystack/talm#212).
+* **[talm] Require a template before rendering the chart**: Running `talm template` without `--file`/`--template` now fails fast with `templates are not set` instead of triggering live node discovery and a misleading `connection refused` ([**@lexfrei**](https://github.com/lexfrei) in cozystack/talm#217).
+* **[talm] Exclude loop devices from LVM global_filter**: Adds `/dev/loop.*` to the LVM `global_filter` in the generated Talos machine config to prevent unexpected LVM activation inside loop-mounted images ([**@kvaps**](https://github.com/kvaps) in cozystack/talm#215).
+
+### ansible-cozystack *(shipped in v1.4.x)*
+
+* **[ansible-cozystack] Exclude loop and virtual devices from host LVM scanning**: Sets an LVM `global_filter` on all prepare playbooks (Ubuntu, RHEL, SUSE) so the host does not scan or activate DRBD, device-mapper, zd, or loop-backed volume groups; exposed as `cozystack_lvm_global_filter` ([**@kvaps**](https://github.com/kvaps) in cozystack/ansible-cozystack#49).
+* **[ansible-cozystack] Enable containerd device_ownership_from_security_context for CDI block imports**: Adds a k3s containerd drop-in enabling `device_ownership_from_security_context` so the KubeVirt CDI importer can write VM disk images into raw block volumes instead of failing with "Permission denied" ([**@lexfrei**](https://github.com/lexfrei) in cozystack/ansible-cozystack#48).
+
+## Contributors
+
+We'd like to thank all contributors who made this release possible:
+
+* [**@androndo**](https://github.com/androndo)
+* [**@Arsolitt**](https://github.com/Arsolitt)
+* [**@elaugaste**](https://github.com/elaugaste)
+* [**@IvanHunters**](https://github.com/IvanHunters)
+* [**@kvaps**](https://github.com/kvaps)
+* [**@kvapsova**](https://github.com/kvapsova)
+* [**@lexfrei**](https://github.com/lexfrei)
+* [**@lllamnyp**](https://github.com/lllamnyp)
+* [**@myasnikovdaniil**](https://github.com/myasnikovdaniil)
+* [**@sunib**](https://github.com/sunib)
+* [**@tym83**](https://github.com/tym83)
+
+### New Contributors
+
+We're excited to welcome our first-time contributor:
+
+* [**@elaugaste**](https://github.com/elaugaste) - First contribution!
+
+**Full Changelog**: https://github.com/cozystack/cozystack/compare/v1.4.0...v1.5.0
diff --git a/docs/changelogs/v1.5.1.md b/docs/changelogs/v1.5.1.md
new file mode 100644
index 0000000000..963df43837
--- /dev/null
+++ b/docs/changelogs/v1.5.1.md
@@ -0,0 +1,19 @@
+<!--
+https://github.com/cozystack/cozystack/releases/tag/v1.5.1
+-->
+
+# v1.5.1 (2026-06-23)
+
+A patch release that fixes a v1.5.0 regression where Windows VM preferences with persistent EFI/TPM state blocked live-migration and node drains.
+
+## Fixes
+
+* **fix(kubevirt-instancetypes): drop persistent EFI/TPM to unblock live-migration**: v1.5.0 restored persistent EFI/TPM state for the `windows.11`, `windows.2k22`, and `windows.2k25` KubeVirt instance-type preferences. With persistence enabled, KubeVirt provisions a `persistent-state-for-<vm>` backend-storage PVC on the default `replicated` StorageClass, which is **ReadWriteOnce** — this pins the VM to its current node and blocks live-migration and node drains. On clusters using `evictionStrategy: LiveMigrate`, the pin can stall cluster upgrades entirely. This fix strips persistent EFI/TPM from the affected preferences using `yq del` (the previous `sed`-based strip produced `null`, which the KubeVirt v1.8 CRD rejects). **Secure Boot and the vTPM remain present and functional — Windows VMs still boot normally; EFI/TPM state is simply not persisted across reboots.** This is a stopgap until vm-state can request RWX storage ([**@kvaps**](https://github.com/kvaps) in #3006, backport #3016).
+
+## Contributors
+
+Thanks to everyone who contributed to this patch release:
+
+* [**@kvaps**](https://github.com/kvaps)
+
+**Full Changelog**: https://github.com/cozystack/cozystack/compare/v1.5.0...v1.5.1
diff --git a/docs/changelogs/v1.5.2.md b/docs/changelogs/v1.5.2.md
new file mode 100644
index 0000000000..f576376cf6
--- /dev/null
+++ b/docs/changelogs/v1.5.2.md
@@ -0,0 +1,60 @@
+<!--
+https://github.com/cozystack/cozystack/releases/tag/v1.5.2
+-->
+
+# v1.5.2 (2026-07-03)
+
+A patch release with ten bug fixes covering managed Kubernetes, MariaDB, Kafka, Harbor, SeaweedFS, VictoriaMetrics-operator dependency gating, Kamaji, and platform install ordering, plus new documentation and a `talm` update adding encrypted user values.
+
+## Fixes
+
+* **fix(kamaji): backport datastore unused-deletion deadlock fix**: Deleting a Tenant whose etcd DataStore had no more referencing TenantControlPlanes left the DataStore stuck `Terminating` (blocked by the `kamaji.clastix.io/TenantControlPlane` finalizer), hanging the etcd Helm uninstall and wedging the tenant namespace. Backports the upstream fix (clastix/kamaji#1122, fixing clastix/kamaji#1115) as a source patch on the pinned kamaji build, so deleting the last control plane on a DataStore now cleans up correctly ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #3146, backport #3187).
+
+* **fix(kubernetes): gate vmop cert-manager-crds dependency on certManager.enabled**: The victoria-metrics-operator HelmRelease listed `cert-manager-crds` in `dependsOn` unconditionally, even though that HelmRelease is only created when `certManager.enabled` is `true`. Clusters running `monitoringAgents.enabled=true` with `certManager.enabled=false` had victoria-metrics-operator permanently blocked on a dependency that would never exist, cascading to `monitoring-agents` and `vertical-pod-autoscaler` never becoming ready. The dependency is now gated on the same condition that creates it ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #3130, backport #3185).
+
+* **fix(tenant): gate VM-resource HelmReleases on victoria-metrics-operator readiness**: The tenant `etcd`, `ingress`, and `monitoring` HelmReleases create VictoriaMetrics-operator custom resources guarded by a validating webhook with `failurePolicy: Fail`. On a cold install the operator pod could be briefly unavailable, so these releases would reconcile before the webhook was serving and fail with "connection refused" — the failed-install/rollback/retry churn could then outlast the install-readiness deadline and surface as a spurious failure. These releases now `dependsOn` the victoria-metrics-operator HelmRelease so they wait for it to become `Ready` first, eliminating the race on fresh installs ([**@lexfrei**](https://github.com/lexfrei) in #3141, backport #3166).
+
+* **fix(mariadb): re-guard replication so single-replica passes the operator webhook**: A prior change made `replication.enabled: true` unconditional so the operator would always create `-primary`/`-secondary` services, but the mariadb-operator validating webhook rejects replication when `spec.replicas == 1`, so single-replica MariaDB instances could no longer be created — the HelmRelease never became `Ready`. Replication is now re-guarded on `replicas > 1`; single-replica installs keep external access via a `LoadBalancer` service on the bare release name, and backups, RBAC, and dashboards are updated to recognize both topologies ([**@scooby87**](https://github.com/scooby87) in #3180, backport #3183).
+
+* **fix(kubernetes): make node group resources optional when instanceType is set**: A managed-Kubernetes node group sized purely by `instanceType` (with `resources` omitted) failed `values.schema.json` validation because `resources` was required on every node group. `resources` is now optional: a node group sized purely by `instanceType` passes validation and installs, while a node group setting both `instanceType` and explicit `resources` has the explicit resources take precedence, so KubeVirt does not reject a VM referencing an instancetype while overriding `domain.cpu`/`memory` ([**@lexfrei**](https://github.com/lexfrei) in #3121, backport #3156).
+
+* **fix(seaweedfs): enforce read-only bucket access by bumping cosi-driver to v0.3.1**: The bundled SeaweedFS COSI driver (v0.1.2) hardcoded read-write S3 permissions for every `BucketAccess` and ignored the chart's `-readonly` `BucketAccessClass`, so credentials meant to be read-only could still upload and delete objects. Bumping the driver to v0.3.1 makes it honor `accessPolicy: readonly` and issue Read/List-only credentials, closing the privilege gap for tenants relying on read-only bucket access ([**@lexfrei**](https://github.com/lexfrei) in #3136, backport #3153).
+
+* **fix(platform): order backupstrategy-controller after cozystack-basics**: `backupstrategy-controller` creates the `cozy-backups` Bucket in the `tenant-root` namespace, which `cozystack-basics` provisions. On a fresh install the Bucket could race namespace creation and fail with `namespaces "tenant-root" not found`, which then raced the install-wait deadline and failed unrelated fresh installs. A `dependsOn` edge on `cozystack-basics` now guarantees the target namespace exists first ([**@lexfrei**](https://github.com/lexfrei) in #3037, backport #3079).
+
+* **fix(kafka): set entity-operator resources to avoid OOM under tenant LimitRange**: Kafka's `entityOperator` topic-operator and user-operator containers carried no resource requests/limits, so in tenant namespaces — where the default `LimitRange` caps containers at 128Mi — the JVM processes were OOMKilled on startup. The entity-operator stayed in `CrashLoopBackOff`, `KafkaTopic`/`KafkaUser` objects never reconciled, and topics could get stuck on the `strimzi.io/topic-operator` finalizer during teardown. Explicit `256Mi`/`512Mi` requests/limits are now set so the operators no longer inherit the namespace default ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #2934, backport #3054).
+
+* **fix(harbor): preserve jobservice and trivy storageClass on upgrade**: The `cozy-harbor` wrapper never forwarded `storageClass` to the jobservice `jobLog` PVC, so it was created without a `storageClassName` and picked up the cluster default via default-StorageClass admission — and because PVC `storageClassName` is immutable, this produced rendered-vs-live drift on every upgrade. The Trivy StatefulSet's volume claim template had the same latent issue. Both now preserve an existing PVC's class via lookup and fall back to the configured `storageClass` for fresh installs ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #2930, backport #3147).
+
+* **fix(seaweedfs): point S3 consumers at the reachable S3 service**: Renaming the SeaweedFS S3 Service to `<name>-s3` left several consumers — the S3 ingress backend, the iceberg ingress backend, and the in-cluster COSI provisioner endpoint — still resolving the old `<fullname>-s3` name or the wrong port, so the external S3 endpoint returned `503` via ingress-nginx and in-cluster COSI paths defaulted to port 443 (or the filer service, which serves no S3) instead of the real S3 service on port 8333. All consumers now resolve `seaweedfs-s3` on the correct port ([**@lexfrei**](https://github.com/lexfrei) in #3119, backport #3127).
+
+## Other repositories
+
+### talm v0.32.0
+
+* **[talm] feat: first-class encrypted user values, honored at template and apply**: Adds support for encrypted user secret values (a registry password, a KMS plugin's secret-id, etc.) that chart templates consume — encrypted at rest in git with the existing `talm.key`, decrypted in memory only at render time, and kept out of committed node files and terminal output. A value file named `*.encrypted.yaml` referenced from `templateOptions.valueFiles` is age-decrypted in memory at both `talm template` and `talm apply`; `talm init --encrypt`/`--decrypt` covers `values-secret.yaml` ↔ `values-secret.encrypted.yaml`. `talm apply` now also honors the full value-source flag set and Chart.yaml's `templateOptions`, and secret-bearing fields are redacted by default from rendered node files, stdout, and the apply drift preview, with `--show-secrets`/`--show-secrets-in-drift` to reveal them on demand ([**@lexfrei**](https://github.com/lexfrei) in cozystack/talm#222).
+
+## Documentation
+
+* **[website] docs(operations): add containerized GPU workloads guide**: Publishes a new operations guide for the `container` variant of `cozystack.gpu-operator`, covering containerized GPU workloads (CUDA pods, ML training, inference) on GPU nodes that already ship the NVIDIA driver and `nvidia-container-toolkit` via the distro package manager ([**@lexfrei**](https://github.com/lexfrei) in cozystack/website#555).
+
+* **[website] docs(talos): warn against changing op: on the machine files block**: Adds a warning next to the Talos `machine.files` block in the bare-metal bootstrap docs, explaining that Talos rejects `op: create` for files outside `/var`, so the `/etc/lvm/lvm.conf` entry must keep `op: overwrite` — changing it silently fails the `WriteUserFiles` boot step and reboot-loops the node with only the opaque `bootstrap is not available yet` error ([**@lexfrei**](https://github.com/lexfrei) in cozystack/website#575).
+
+* **[website] docs(talm): document chart drift detection and strict mode**: Documents the chart drift detection shipping with `talm` (cozystack/talm#216) — the library-content and preset-baseline drift warnings, the `.talm-preset.lock` file and the advice to commit it, `talm init --update` re-sync semantics, and the `strictCharts: true`/`--strict-charts` escalation with its unverifiable-baseline behavior ([**@lexfrei**](https://github.com/lexfrei) in cozystack/website#577).
+
+* **[website] docs(platform): document publishing.certificates wildcard options**: Documents two previously-undocumented `publishing.certificates.*` platform-package options, including the opt-in `wildcard` mode that issues one shared `*.<root-host>` certificate via a DNS-01 solver instead of a per-host ACME certificate, helping operators avoid Let's Encrypt rate limits at scale ([**@lexfrei**](https://github.com/lexfrei) in cozystack/website#588).
+
+* **[website] fix(docs): correct stale version pins and prevent next.yaml drift**: The version-pin data file for the v1.5 docs was a stale copy of `next.yaml`, so every `{{< version-pin >}}` on the v1.5 docs — including the `go get` example and roughly 40 install-doc references — rendered Cozystack `v1.3.0`/Talos `v1.12.6` instead of the correct `v1.5.0`/`v1.13.0`. The version pins are corrected and the release script is hardened so `next.yaml` cannot drift stale again ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in cozystack/website#589).
+
+* **[website] feat(blog): add Cozystack v1.5.0 release announcement**: Publishes the release-announcement blog post for Cozystack v1.5.0, covering Gateway API via Cilium, TLS for managed databases and messaging, out-of-the-box backups with a platform-managed BackupClass, Flux v2.8, flux-shard-operator, operator-provided wildcard certificates, GPU passthrough, deletion protection, and runtime-populated dashboard docs ([**@tym83**](https://github.com/tym83) in cozystack/website#592).
+
+## Contributors
+
+Thanks to everyone who contributed to this patch release:
+
+* [**@lexfrei**](https://github.com/lexfrei)
+* [**@myasnikovdaniil**](https://github.com/myasnikovdaniil)
+* [**@scooby87**](https://github.com/scooby87)
+* [**@tym83**](https://github.com/tym83)
+
+**Full Changelog**: https://github.com/cozystack/cozystack/compare/v1.5.1...v1.5.2
diff --git a/docs/changelogs/v1.5.4.md b/docs/changelogs/v1.5.4.md
new file mode 100644
index 0000000000..ee50b301a3
--- /dev/null
+++ b/docs/changelogs/v1.5.4.md
@@ -0,0 +1,220 @@
+<!--
+https://github.com/cozystack/cozystack/releases/tag/v1.5.4
+-->
+
+# v1.5.4 (2026-08-19)
+
+v1.5.4 is the **final release of the 1.5 line**. It is a stability release: it backports fixes for a webhook certificate-renewal outage that could block all pod creation, a KubeVirt VMI validation failure, several release-blocking crashloops (velero, cert-manager, SeaweedFS, flux-shard-operator), a silent PostgreSQL restore data-integrity bug, and a raft of smaller reliability and CI fixes accumulated on the branch. It also closes the SeaweedFS 4.31 rename fallout on the 1.5.x line and pins the CAPI kubeadm bootstrap objects that a later upgrade to 1.6 would otherwise prune — both of which need an operator to act, and both of which are covered in the section below.
+
+**These notes are measured against v1.5.2, not v1.5.3.** v1.5.3 was tagged but its GitHub Release was left a draft and never published, so no user ever received it and every operator upgrading arrives from v1.5.2. Comparing against v1.5.3 would silently drop four commits — two user-facing fixes — that nobody has seen in a release. The range is `v1.5.2..v1.5.4`, 82 commits across 27 pull requests.
+
+## ⚠️ Breaking Changes and Required Actions
+
+There are no breaking API or values changes in v1.5.4. There are two things that need an operator, and both of them can cost data or wedge an upgrade if they are skipped. Read this section in full before applying the v1.5.4 Platform Package.
+
+### Pre-upgrade checks
+
+Run these against the management cluster **before** upgrading.
+
+**1. SeaweedFS 4.31 rename — classify every instance, and re-run the audit even if you have run it before.**
+
+Cozystack v1.5.0 bumped the vendored SeaweedFS chart from `4.0.405` to `4.31.0`. Before 4.31 the chart named its workloads after the chart (`seaweedfs-master`, `seaweedfs-filer`, `seaweedfs-volume`), ignoring the Helm release name. 4.31 names them after the release, and the data-plane release is `<name>-system`, so every StatefulSet wanted to become `seaweedfs-system-*`. StatefulSet names are immutable, so Helm could not rename in place — it stood up a **second, duplicate set beside the running one**.
+
+What that duplicate does depends on the cluster. With as many nodes as master replicas the new masters cannot schedule (hard pod anti-affinity against the old ones), so the duplicate sits `Pending`/`CrashLoopBackOff` and the original keeps serving. With more nodes than masters the new, empty set comes up — and because both sets carry identical pod labels, the `seaweedfs-s3` Service load-balances across them while both filers write to the **same `seaweedfs-db` Postgres metadata store** pointing at different volume servers. That is a data-integrity incident, not a cosmetic duplicate: reads of existing objects through the new endpoint miss, new writes land on empty volumes, and two master sets hand out volume IDs from independent sequences into one shared metadata table.
+
+Separately, and landing on the same upgrade, the v1.5.0 database split moved the CNPG `Cluster/seaweedfs-db` — the filer metadata store, i.e. the index for every object in the tenant's S3 — out of the `<name>-system` release into its own `<name>-db` release. Migration 43 shipped comparing the owning release against the literal string `seaweedfs-system`, so it only ever fired for an instance named `seaweedfs`; an instance named anything else was skipped and had its Cluster pruned as a removed resource, with CNPG taking the PVC along with it. That prune is not a one-shot: Helm computes deletions by diffing the **last deployed** revision against the new manifest, so a tenant whose `<name>-system` last succeeded on a pre-split revision recomputes the same deletion on *every* upgrade attempt, including attempts that fail for unrelated reasons.
+
+v1.5.4 pins `fullnameOverride: seaweedfs` in `system/seaweedfs`, so workloads are named after the chart exactly as they were before 4.31 and upgrading **adopts the running set and its volumes in place**. Migration 43 is fixed to match the `-system` suffix, and migration 45 re-runs the hand-over for clusters that already ran the hardcoded version. Two states cannot be adopted that way, and the chart **fails the render rather than guess** — the enforcing guard is `packages/system/seaweedfs/templates/naming-guard.yaml`, with a sibling copy in `extra/seaweedfs` so the refusal is visible on the SeaweedFS application itself.
+
+*Step 0 — `seaweedfs-db` ownership (read-only, do this first).* This one destroys data rather than duplicating it, so clear it before anything else.
+
+```sh
+kubectl get cluster.postgresql.cnpg.io -A \
+  -o custom-columns='NS:.metadata.namespace,NAME:.metadata.name,OWNER:.metadata.annotations.meta\.helm\.sh/release-name,KEEP:.metadata.annotations.helm\.sh/resource-policy'
+```
+
+Read the rows where `NAME` is `seaweedfs-db`:
+
+| OWNER | KEEP | Meaning |
+|---|---|---|
+| `<name>-db` | `keep` | Handed over. Nothing to do. |
+| `<name>-db` | *(none)* | Installed fresh on ≥ v1.5.0. Safe — `<name>-system` never rendered the Cluster, so it is not in that release's prune baseline. |
+| `<name>-system` | *(none)* | **At risk.** Migration 45 hands it over on the next platform upgrade. Do not reconcile `<name>-system` before the migration runs. |
+| *(no row at all)* | | **Already lost.** The metadata index is gone: that tenant's S3 returns 500 and its objects are unreachable even though the volume PVCs still hold the bytes. No migration can rebuild it — restore the `seaweedfs-db` Postgres from a backup, or treat that tenant's object storage as lost. Note that `<name>-db` may still report **Ready** while this is true; trust the `kubectl get cluster` output, not the HelmRelease status. |
+
+*Step 1 — classify every SeaweedFS instance (read-only, mutates nothing).*
+
+```sh
+hack/seaweedfs-naming-audit.sh                 # whole cluster
+hack/seaweedfs-naming-audit.sh tenant-foo      # or named namespaces
+```
+
+| CLASS | State | Action |
+|---|---|---|
+| `L` | Only the chart-named generation is present. | None. The upgrade adopts it in place. |
+| `S` | Only the release-named generation is present — the instance was installed fresh on 1.5.x, and its data lives on `data1-seaweedfs-system-volume-*` PVCs. | Re-bind those volumes onto the chart-named PVC names **before** upgrading. Pinning the chart name without that renames the workloads *away* from the data, and Helm cannot move data between PVCs. Runbook Step 2. |
+| `MIXED` | Both generations are present. | One is an empty duplicate and one holds the data, and nothing durable in the object graph says which — so the chart refuses. Classify the tenant and delete the **empty** generation so exactly one remains; the render then adopts the survivor with no further action. Runbook Step 1, then 2a or 3. |
+
+**Read the exit code, not just the table.** The audit fails closed: a `kubectl` call that fails, or a Helm release payload it cannot decode, prints `FATAL` and exits non-zero, and the partial table must not be trusted. Only exit 0 means the table is the whole answer — and an empty table with exit 0 is a genuinely clean fleet.
+
+**If you have already run this audit, run it again on v1.5.4.** The version of the script that shipped in **v1.6.0** silenced every `kubectl` failure with `2>/dev/null`, so a timeout or an RBAC denial produced an empty, "all clean" table byte-identical to an honestly clean fleet — a false clean, on the script whose output gates a runbook step that deletes PVCs. v1.5.4 is the first release on the 1.5 line to carry the audit at all, and it carries the fail-closed version (v1.6.1 and later carry it too). A clean result from a v1.6.0 checkout, or from `main` between 2026-07-20 and 2026-07-28, is not evidence of anything.
+
+One unrelated filer change lands on the same upgrade and is worth knowing about while you are looking at this: the filer's `postgres2` connection pool to that same `seaweedfs-db` metadata store was unconfigured, so every metadata lookup opened a fresh PostgreSQL connection and added seconds of latency to every S3 request. That is fixed here too (see the `postgres2 connection pool` entry below), and it needs no operator action — but if you have been treating slow S3 as a symptom of the rename, it may well have been this instead.
+
+Recovery for `S` and `MIXED` is [`docs/operations/seaweedfs-431-rename-recovery.md`](../operations/seaweedfs-431-rename-recovery.md). Do **not** guess which generation holds the data — the runbook exists because a duplicate that briefly served writes and later crashed is indistinguishable, on every durable signal, from one that never scheduled. A tenant that went 1.4.x straight to 1.6 never renamed and is unaffected by any of this; duplicates exist only on tenants that passed through 1.5.x.
+
+**2. The platform migration `targetVersion` moves from 45 to 46 — which changes what a later upgrade to 1.6 runs.**
+
+v1.5.4 is the **first 1.5.x release stamped `targetVersion: 46`**; v1.5.0 through v1.5.3 were all stamped 45. `run-migrations.sh` loops `seq CURRENT (TARGET - 1)`, so a cluster that reaches 46 and later upgrades to v1.6 (`targetVersion: 54`) runs slots 46 through 53 — and **never executes 1.6's own slot 45**. This is a skip, not an ordering problem.
+
+Slot 45 does not hold the same thing on both branches. On `release-1.5` it is the SeaweedFS `seaweedfs-db` hand-over repair described above. On `main` and `release-1.6` it is the pin that stamps `helm.sh/resource-policy: keep` onto the CAPI `KubeadmConfigTemplate` objects. 1.6 drops `KubeadmConfigTemplate` from the tenant `kubernetes` chart entirely — workers move to `TalosConfigTemplate` — so on that upgrade Helm sees the object in the previous release manifest, absent from the new one, and deletes it while the kubeadm-backed MachineSet is still mid-rollover with its `bootstrap.configRef` pointing at it. controller-manager then floods with reconcile errors, and where the Talos image fetch is slow or a MachineHealthCheck remediates, workers can hang pending with nothing to bootstrap from. Tenant Kubernetes only, and a noisy broken rollover rather than data loss — but it is not self-healing.
+
+v1.5.4 closes this in **two places, covering two disjoint populations**, and dropping either would leave a real hole:
+
+* **Existing clusters** (stamped 45 or lower) pick the pin up from the migration: `release-1.5`'s slot 45 now runs the keep-pin after the SeaweedFS repair, so the annotation is already in place by the time a later 1.6 upgrade skips 1.6's slot 45. The SeaweedFS half runs first deliberately — a missed hand-over loses a tenant's filer metadata, a missed pin is recoverable by hand — and both halves fail closed ahead of the version stamp, so a half-completed attempt is safe and the Job retries the whole slot. The pin selects on the `app.kubernetes.io/managed-by=Helm` label that Helm injects, so the `KubeadmConfig` children CAPI spawns from the template (owned by their Machine, never pruned by Helm) are correctly left alone. It is idempotent: an object already carrying `keep` is skipped without a write.
+
+* **Fresh v1.5.4 installs** cannot be reached by any migration, so the chart covers them instead. The platform chart renders the `cozystack-version` ConfigMap directly at `targetVersion` when it does not already exist, and the migration hook emits its Job **only** when that ConfigMap is already present — so a fresh install is stamped 46 having never run slot 45, or any other slot. The `kubernetes` chart therefore stamps `helm.sh/resource-policy: keep` on the `KubeadmConfigTemplate` at render time, so the object is born pinned no matter which path a cluster took to get there.
+
+Verify after upgrading:
+
+```sh
+# Should print 46.
+kubectl get configmap cozystack-version -n cozy-system -o jsonpath='{.data.version}{"\n"}'
+
+# Every row should show keep.
+kubectl get kubeadmconfigtemplates.bootstrap.cluster.x-k8s.io -A \
+  -o custom-columns='NS:.metadata.namespace,NAME:.metadata.name,KEEP:.metadata.annotations.helm\.sh/resource-policy'
+```
+
+A `KubeadmConfigTemplate` row showing `<none>` means the pin did not land on that object, and a later 1.6 upgrade will prune it out from under a live MachineSet. Recovering from that means recreating the template by hand with the right Helm ownership metadata, so fix it before upgrading to 1.6.
+
+### Manual actions required
+
+* **BEFORE upgrading — recover SeaweedFS tenants classified `S` or `MIXED`.** The chart refuses to render for them, which blocks the tenant's upgrade until an operator resolves it. Run `hack/seaweedfs-naming-audit.sh` and follow [`docs/operations/seaweedfs-431-rename-recovery.md`](../operations/seaweedfs-431-rename-recovery.md).
+
+* **BEFORE trusting an earlier audit result — re-run the audit from v1.5.4.** The v1.6.0 copy of the script could report a false clean (see pre-upgrade check 1).
+
+* **AFTER upgrading — confirm the migration stamp is 46 and every `KubeadmConfigTemplate` carries `helm.sh/resource-policy: keep`** (see pre-upgrade check 2). This is what makes the later 1.6 upgrade safe.
+
+* **No action, but expect one rollout each:** the cert-manager webhook (it moves off port 10250) and cainjector (raised memory limit), the kube-ovn webhook, velero (new `startupProbe`), and the CNPG instances of every Postgres release with `backup.enabled` or `bootstrap.enabled`, whose rendered `Cluster` gains one `spec.env` entry for the S3 checksum fix.
+
+## Fixes
+
+* **fix(kube-ovn): reload kubeovn-webhook serving certificate on cert-manager renewal**: `kube-ovn-webhook` only loaded its TLS certificate once at startup. Once cert-manager rotated the backing Secret and the webhook pod outlived the old certificate's expiry (roughly a year after install), the pod kept serving the expired certificate, `kube-apiserver` rejected the TLS handshake, and — because the `MutatingWebhookConfiguration` uses `failurePolicy: Fail` — every pod creation in tenant namespaces was blocked, including `virt-launcher`, so no VM could start. The webhook now reloads its certificate from disk on renewal through a `GetCertificate` closure, with `renewBefore` widened to 720h. The reload path is hardened against the cases that would have made it unreliable in practice: the certificate file's mtime is observed *before* the key pair is read, so a Secret swap racing the read is retried on the next handshake rather than cached under a newer mtime and missed; change is detected by mtime inequality rather than strictly-newer, catching equal-mtime replacements and backward clock steps; a load attempt is recorded whatever the outcome, so a persistently unreadable file is retried once its mtime advances instead of on every handshake; and `stat` failures are logged rather than swallowed, so a broken mount is visible before expiry. The same change also bounds the webhook's `http.Server` with `ReadHeaderTimeout`, `ReadTimeout`, `WriteTimeout` and `IdleTimeout` — previously it set none, so a client that opened a connection and sent headers slowly could hold a goroutine and a file descriptor indefinitely ([**@IvanHunters**](https://github.com/IvanHunters) in #3557, backport #3879).
+
+* **fix(flux-shard-operator): repair sharded helm-controller crashloop behind an HTTP proxy**: The cloned per-shard `helm-controller` inherited `HTTP_PROXY`/`HTTPS_PROXY`/`NO_PROXY` from the flux-aio container and lacked a `startupProbe`, so on clusters behind a corporate HTTP proxy the shard could not reach the (proxy-unreachable) in-cluster API server and crashlooped before ever becoming ready. Proxy environment variables are now stripped from the cloned container and a `startupProbe` is added so slow starts are tolerated instead of killed. The cloned probe **inherits** its `timeoutSeconds` from the liveness handler rather than being forced to 1s, so a future flux-aio shipping a larger liveness timeout cannot end up with a stricter startup probe and recreate the very crashloop this fixes ([**@IvanHunters**](https://github.com/IvanHunters) in #3546, backport #3883).
+
+* **fix(velero): add startupProbe so slow startup does not crashloop the install gate**: Velero binds its health endpoint only after loading plugins and connecting to the API server, which can take minutes under a heavy parallel platform install — long enough to trip the liveness probe and crashloop the pod before the install-readiness gate ever passes. A `startupProbe` now defers liveness checks until the server has actually finished starting ([**@lexfrei**](https://github.com/lexfrei) in #3138, backport #3533).
+
+* **fix(cert-manager): move the webhook off the kubelet's port**: The cert-manager webhook listened on port 10250, the kubelet's own port. When the webhook Service resolved to a node IP instead of the pod IP, the connection landed on the kubelet, which answered with its own certificate, and the API server rejected every cert-manager admission call cluster-wide. The webhook now listens on a port the kubelet does not own ([**@lexfrei**](https://github.com/lexfrei) in #3359, backport #3366).
+
+* **fix(cert-manager): raise cainjector memory limit to unblock caBundle injection**: `cainjector` loads every webhook configuration, `APIService`, and CRD into its informer caches at startup; on a full Cozystack install that working set exceeded the 128Mi memory limit, so the single leader-elected `cainjector` pod was OOMKilled during cache population and crashlooped before it could inject any CA bundle, breaking every webhook that depends on cert-manager-issued CAs. The memory limit is raised so cache population can complete ([**@IvanHunters**](https://github.com/IvanHunters) in #3199, backport #3202).
+
+* **fix(mariadb): widen startup probe budget so bootstrap cannot be killed**: The MariaDB operator built its startup probe without a `failureThreshold`, so it fell back to the Kubernetes default of 3 — giving a fresh bootstrap only ~40 seconds before being killed by the liveness probe the startup probe exists to defer. The budget is widened so a legitimately slow first bootstrap is no longer mistaken for a hung container ([**@lexfrei**](https://github.com/lexfrei) in #3344, backport #3364).
+
+* **fix(seaweedfs): make naming audit fail closed on kubectl and payload errors**: `hack/seaweedfs-naming-audit.sh`, used as the pre-upgrade gate before PVC deletion, silenced every `kubectl` failure with `2>/dev/null`, so a transient API error produced an empty, "all clean" table indistinguishable from an honestly clean fleet. Every enumeration now routes through one fail-closed helper that names the failed query on stderr and exits non-zero, and a Helm release Secret whose payload cannot be decoded is fatal rather than a silent skip. The same change fixes a false clean reachable with no corruption at all: the chart-name extraction was a greedy (last-match) `sed`, and since Helm marshals the release's `config` after `chart`, a values subtree spelling `chart.metadata.name` shadowed the real chart name — the release then read as non-SeaweedFS and the tenant vanished from the report. It now takes the first match, folds newlines so a pretty-printed payload parses at all, and says which path and shape it expected when it cannot read one ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #3436, backport #3878).
+
+* **fix(seaweedfs): close the 4.31 rename fallout on the 1.5.x→1.6 upgrade path**: Cozystack v1.5.0 bumped the vendored SeaweedFS chart to 4.31.0, which renames workloads after the Helm release name; because StatefulSet names are immutable, upgrading through the 1.5.x line stood up a second, empty StatefulSet beside the running one instead of adopting it. This closes the remaining gaps in the adoption path: `system/seaweedfs` pins `fullnameOverride: seaweedfs` so the upgrade adopts the running workloads and volumes in place, the naming guard moves into the chart a platform upgrade actually re-renders and refuses when both naming generations exist, cluster-scoped COSI RBAC is named per namespace again (the 4.31 release-based names collided across tenants), and the `seaweedfs-db` hand-over now runs for **every** instance name — previously an instance not named `seaweedfs` had its filer metadata database pruned on upgrade. Migration 45 repairs clusters that already ran the old hand-over, and `hack/seaweedfs-naming-audit.sh` plus [`docs/operations/seaweedfs-431-rename-recovery.md`](../operations/seaweedfs-431-rename-recovery.md) guide classification and recovery. **The refusal is expected for tenants that passed through 1.5.x — see the required-actions section above before upgrading** ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #3339, backport #3370, building on the adopt-in-place pin from #3282).
+
+* **fix(seaweedfs): configure postgres2 connection pool for the filer**: The vendored SeaweedFS chart ships connection-pool settings only for the `mysql` store, which Cozystack does not use. The `postgres2` store, which is enabled, had none — so the Go SQL pool kept zero idle connections and every filer metadata lookup opened a fresh PostgreSQL connection (TCP + TLS + SCRAM, roughly 300ms each). At around five path lookups per S3 operation that added about two seconds of latency to every S3 request, regardless of cluster load. Measured on a 12-node cluster with two filers: `PUT` of a 4KiB object went from 10s to 0.28s (p50) and `HEAD` from 2.6s to 0.16s. `max_open` is capped at 40 so two filer replicas stay under CNPG's default `max_connections` of 100. This fix was tagged in v1.5.3, which was never published, so v1.5.4 is the first release to carry it ([**@mattia-eleuteri**](https://github.com/mattia-eleuteri) in #2906, backport #3194).
+
+* **fix(cozystack-basics): gate the hostname VAP policies on the VAP API**: The route/gateway/ingress hostname `ValidatingAdmissionPolicy` templates rendered unconditionally. On a cluster missing the VAP API, an operator-generated `HelmRelease` with drift detection off would render the policies out on first install and never add them back. The templates are now gated on `.Capabilities.APIVersions.Has`, so installs on VAP-less clusters no longer silently drop hostname validation ([**@lexfrei**](https://github.com/lexfrei) in #3409, backport #3876).
+
+* **fix(keycloak-configure): patch HelmRelease in release namespace on teardown**: The `keycloak-configure` pre-delete teardown Job cleared the Flux `HelmRelease` finalizers with a `kubectl patch` aimed at a hardcoded namespace that didn't match the release's actual `cozy-keycloak` namespace, so the teardown Job's own RBAC could never reach the object it needed to patch and uninstalling the release could get stuck. The patch now targets the correct release namespace ([**@lexfrei**](https://github.com/lexfrei) in #3372, backport #3877).
+
+* **fix(platform): forward backupStorage overrides to the backupstrategy-controller Package**: The documented admin override for `cozy-default` backup S3 coordinates (`spec.components.backupstrategy-controller.values` on the platform Package) had no effect, because the `cozystack-platform` PackageSource exposes only a single `platform` component and silently ignored the override block, so admin-configured backup storage settings never reached the running backup controller. The platform chart now forwards the override through correctly ([**@androndo**](https://github.com/androndo) in #3333, backport #3402).
+
+* **fix(backups): request S3 checksum only when required for barman-cloud (non-AWS S3 / Ceph RGW)**: Since botocore ~1.36 (early 2025) the default `RequestChecksumCalculation` is `when_supported`, so barman-cloud's boto3 attaches a flexible checksum to every `PutObject`. AWS S3 accepts it, but several S3-compatible backends — Ceph RADOS Gateway, **the platform's own SeaweedFS system bucket**, some MinIO and Cloudflare R2 builds — reject it with `InvalidArgument: x-amz-content-sha256 must be UNSIGNED-PAYLOAD`, failing every backup and WAL-archive upload. `AWS_REQUEST_CHECKSUM_CALCULATION=when_required` is now set through the CNPG `Cluster`'s `spec.env`, which reaches the instance pods and therefore the barman-cloud subprocess the instance manager execs. On this branch that one setting covers all three S3 paths at once: the chart-rendered legacy `spec.backup.barmanObjectStore`, the same field SSA-patched by the CNPG backup driver in the `useSystemBucket` flow, and `externalClusters` recovery. Note this is a **release-1.5-native equivalent** of the fix on `main`, not a cherry-pick — `main` sets `spec.instanceSidecarConfiguration.env` on `barmancloud.cnpg.io` `ObjectStore` objects, and release-1.5 has no barman-cloud plugin and no `ObjectStore` CRD, so those objects would template cleanly and then apply to nothing. It is gated on `backup.enabled` or `bootstrap.enabled`, so a Postgres release with no S3 configured is untouched ([**@androndo**](https://github.com/androndo) in #3417, backport #3882).
+
+* **fix(objectstorage-controller): converge BucketClaim readiness and speed up COSI provisioner failover**: The COSI control plane (built from upstream container-object-storage-interface v0.2.2) never watched `Bucket` objects and dropped no-op resync deltas, so a `BucketClaim` whose backend `Bucket` became ready *after* the first reconcile stayed `bucketReady=false` forever, and the consuming application never got its `BucketAccess`. The controller now requeues until the backend Bucket is ready, emits a `Warning` event while it waits, and shortens the COSI leader-election lease so failover is faster ([**@lexfrei**](https://github.com/lexfrei) in #3034, backport #3532).
+
+* **fix(tenant): inherit full ancestor label chain from parent namespace**: Tenant namespace labelling only derived one ancestor level from `.Release.Namespace`, so a direct child of `tenant-root` never received the labels needed for its grandparent's `<ancestor>-egress` `CiliumClusterwideNetworkPolicy` to allow traffic, silently breaking cross-tenant egress for nested tenants more than one level deep. Namespaces now inherit the full ancestor label chain from their parent ([**@IvanHunters**](https://github.com/IvanHunters) in #2912, backport #3191).
+
+* **fix(backups/postgres): purge stale recovery cluster on repeat in-place restore**: A repeat in-place PostgreSQL `RestoreJob` into a target that had already been restored once silently reported `Succeeded` while doing nothing — the PVC was untouched, no recovery pods appeared, and the database kept its pre-restore contents, a silent data-integrity failure. The restore path now purges the stale recovery cluster before restoring again, so a repeat restore actually recovers data instead of quietly no-opping. The freshness discriminator that decides whether a leftover `Cluster` belongs to this restore or a previous one is deliberately **strict** (`creationTimestamp > StartedAt`), so an exact timestamp tie resolves to "not fresh" and the caller purges — the conservative direction, since a genuinely fresh Cluster is always created well after `StartedAt` ([**@IvanHunters**](https://github.com/IvanHunters) in #3318, backport #3321).
+
+* **fix(fluxcd): omit empty distribution.artifact in FluxInstance for guest clusters**: Guest Kubernetes clusters with the `fluxcd` addon enabled never became `Ready`, because the `flux-instance` template rendered `spec.distribution.artifact` unconditionally (unlike its sibling optional fields), and the empty string broke the intended air-gapped default of using the operator's embedded manifests. The field is now guarded like its siblings, so guest clusters with `fluxcd` enabled converge to `Ready` again ([**@IvanHunters**](https://github.com/IvanHunters) in #3284, backport #3292).
+
+* **fix(dashboard): unbreak CORS on expired session for k8s API calls**: The dashboard SPA broke with CORS errors once the `kc-access` cookie expired: the Keycloak client's `webOrigins` was never set (so it stuck on a stale hostname after any `rootUrl` change), and `oauth2-proxy` mishandled the expired-session case for Kubernetes API calls. Both are fixed so an expired session no longer surfaces a broken, CORS-blocked SPA ([**@IvanHunters**](https://github.com/IvanHunters) in #2788, backport #3291).
+
+* **fix(apps/vpn): remove invalid foo field from urls Secret**: A leftover debug `foo` field in the VPN app's `<release>-urls` Secret template is not part of the `core/v1` Secret schema. Client-side apply tolerated it, but server-side apply's stricter validation rejected the object outright, so any VPN application upgrade failed and the release was left in a broken state. The stray field is removed ([**@IvanHunters**](https://github.com/IvanHunters) in #3281, backport #3290).
+
+* **fix(kubevirt): update KubeVirt to v1.8.4**: Updates the vendored `kubevirt-operator` from v1.8.2 to v1.8.4, backporting the VMI checksum status-field validation fix (uint32 range) that Kubernetes 1.36 requires — without it, strict CRD numeric-format validation could leave VMIs stuck in `Scheduled` and unable to start. The update also carries assorted upstream bug fixes and CVE remediations; the KubeVirt custom resource itself is unchanged ([**@lexfrei**](https://github.com/lexfrei) in #2940, backport #3285).
+
+* **fix(kubevirt-instancetypes): restore persistent EFI/TPM state**: v1.5.1 stripped `persistent: true` from both `preferredEfi` and `preferredTPM` on the six shipped Windows preferences — `windows.11`, `windows.2k22`, `windows.2k25` and their `.virtio` variants — to unblock live migration. Secure Boot and the vTPM stayed present, so the VMs still booted, but their state was no longer persisted: **EFI NVRAM and vTPM contents were discarded on every VM restart**, so anything the guest sealed to the vTPM (BitLocker being the common case) or wrote to NVRAM — Secure Boot key enrollment, boot entries — did not survive a power cycle. This affects anyone running Windows 11, Server 2022 or Server 2025 guests created from the shipped preferences on **v1.5.1 or v1.5.2**; v1.5.0 had persistence, and it is restored here. The strip was motivated by a real-looking concern that turned out to rest on an outdated premise — that the `persistent-state-for-<vm>` backend-storage PVC, ReadWriteOnce on the default `replicated` StorageClass, pins the VM to its node and blocks live migration and node drains, stalling cluster upgrades under `evictionStrategy: LiveMigrate`. KubeVirt has in fact migrated RWO-Filesystem backend storage since v1.4 (kubevirt/kubevirt#12629): it creates a fresh target state PVC and copies the small state blob during migration. Verified on the default replicated storage that a persistent-firmware VM reports `LiveMigratable=True` and gets its copy-on-target PVC, so persistence and live migration now hold at the same time. Existing VMs pick the change up on their next restart; already-running VMs are unaffected until then. This fix was tagged in v1.5.3, which was never published, so v1.5.4 is the first release to carry it ([**@kvaps**](https://github.com/kvaps) in #3154, backport #3212, reverting #3006).
+
+* **fix(migrations): pin KubeadmConfigTemplate on the 1.5 slot 45 migration and in the chart**: Migration slot 45 holds different things on different branches — `release-1.5` uses it for the SeaweedFS `seaweedfs-db` hand-over repair, while `main` and `release-1.6` use it for the `helm.sh/resource-policy: keep` pin on the CAPI `KubeadmConfigTemplate` objects. Cutting v1.5.4 is what first ships `targetVersion: 46`, and `run-migrations.sh` loops `seq CURRENT (TARGET - 1)`, so a cluster that reaches 46 later runs `seq 46 53` on the way to 1.6 and **never executes 1.6's slot 45 at all** — the pin is skipped, and Helm then prunes the template while the kubeadm-backed MachineSet is still mid-rollover. 1.5's own slot 45 now applies the pin (after the SeaweedFS repair, and fail-closed) so an existing cluster picks it up on the way to 46, and the `kubernetes` chart stamps the annotation at render time so the object is born pinned — which is the only thing that covers a **fresh** v1.5.4 install, since such a cluster has its `cozystack-version` ConfigMap rendered straight at 46 and the migration hook never emits a Job at all. See the required-actions section above for the verification commands ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #3892).
+
+* **fix(postgres-operator): align CNPG CRDs with 1.27.3**: The vendored CloudNativePG CRDs were still pinned to 1.27.1 metadata while the operator image was already on 1.27.3, which prunes the new `Backup.status.instanceID.sessionID` field the newer instance-manager writes — causing false instance-manager restart errors and failed backups. The CRDs are aligned with the pinned 1.27.3 image so backups no longer fail on this mismatch ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #3526).
+
+## Development, Testing, and CI/CD
+
+* **ci(release): move the v1.5.4 release path off the decommissioned runner pool**: Every job on the `release-1.5` release path was pinned to a `[self-hosted]` runner pool that no longer exists, so the release would silently sit `Queued` forever with nothing red to point at instead of failing loudly. The release, tag, and cache-warmer jobs are moved to the same runner shape `release-1.6` already uses, unblocking future patch releases on this branch ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #3906).
+
+* **ci: warm the build cache on release-1.5 pushes**: `release-1.5`'s build-cache warmer was dead code — it triggered on pushes to `main` (which never happens on this branch) and targeted the same decommissioned `[self-hosted]` runner — so every PR build on the branch ran cold and could exceed its 30-minute timeout. The warmer now triggers on `release-1.5` pushes and targets a working runner, and the Build job is pointed at the branch-scoped cache namespace the warmer actually writes; without that the warmer would run and nothing would read it, because the `cache-from` refs still resolved to the shared namespace `main` writes, whose layers carry `main`'s sources and miss on most of this branch's 28 packages. Builds only read the cache (`WRITE_CACHE` defaults to 0), so concurrent PR builds cannot race on a cache manifest and a miss degrades to a cold build rather than an error. The timeout is raised to 75 minutes at the same time: a warm build is around 15 minutes, but a cold one is around 45, and 30 minutes only ever fit the warm case — when it did not fit, the job reported a timeout instead of whatever actually went wrong ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #3469).
+
+* **fix(ci, kubernetes): build container disks concurrently to unblock Build**: Every `release-1.5` PR Build job was dying at its timeout, and effectively all of the budget went to one target: `image-ubuntu-container-disk` builds one disk per supported Kubernetes minor — six of them — and each spends four to six minutes inside a libguestfs appliance installing that minor's kubelet and kubeadm into its own copy of the cloud image, roughly 28 minutes serially. None of it was cached and no warmer could fix that, because only `build-main.yaml` sets `WRITE_CACHE=1` and `main` dropped this image from `make image` shortly before `release-1.5` was cut, so the buildcache refs it reads had never been written — leaving `release-1.5` as the only branch still building the image at all. The six builds share no per-version work, so they now run concurrently in a sub-make carrying its own `-j` (keeping the root `make build` serial), with buildkit deduplicating the shared guestfish and cloud-image stages across the concurrent solves and `--output-sync=target` keeping each version's log readable. The job also moves off the 4cpu/16gb runner shape, since six concurrent libguestfs appliances want roughly 9GB of RAM and a core each ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #3469).
+
+* **ci: install flux in the release-1.5 cache warmer**: The warmer's `make build` step shells out to `flux push artifact`, which the previous self-hosted runner had baked in but the new ephemeral runner shape does not; the cache warmer is updated to install the `flux` CLI so it can complete ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #3480).
+
+* **test(seaweedfs): make the guard-parity and fake-kubectl assertions able to fail**: The four assertions holding the invariant that neither SeaweedFS chart classifies on mutable claim timestamps or pod liveness were written as `! grep -qF X "$f"`, which cannot fail — POSIX and bash both exempt a `!`-negated pipeline from `errexit`, so the command ran, returned 1, and the test carried on reporting success. Those four were the entire body of the test, so it asserted nothing at all; and converting them naively fails, because all four names legitimately appear in the comment prose that records why each was rejected as a discriminator. They now assert against the template logic with comment blocks stripped, forbidding a *live* reference, and are proven in both directions. The fake `kubectl` used by the migration tests likewise now fails on unmodelled calls instead of returning success for anything it does not recognise ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #3436, backport #3878; #3892).
+
+* **Regression coverage shipped alongside the fixes above**: Each of the backported fixes carried its own test, and they are listed here rather than left silent because they are what stops these bugs coming back. A reconcile-level regression drives `reconcileCNPGRestore` end to end against a fake client, covering the actual call site of the repeat-restore bug rather than only its helpers ([**@IvanHunters**](https://github.com/IvanHunters) in #3318, backport #3321); the e2e suite now asserts `BucketAccess` reaches `accessGranted=true`, asserts a `BucketClaim` converges to `bucketReady` promptly for both the bucket and Harbor paths, and dumps controller pods on a bucket failure ([**@lexfrei**](https://github.com/lexfrei) in #3034, backport #3532); `keycloak-configure` gains a run of the chart's helm-unittest suite ([**@lexfrei**](https://github.com/lexfrei) in #3372, backport #3877); the flux-shard-operator asserts the full `startupProbe` contract and rejects an alias regression, with the proxy-env drop and probe recorded in the sanitisation list ([**@IvanHunters**](https://github.com/IvanHunters) in #3546, backport #3883); the kubeadm keep-pin folded into slot 45 has migration coverage ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #3892); and the PR labeler now maps the `objectstorage-controller` scope to `area/storage` ([**@lexfrei**](https://github.com/lexfrei) in #3034, backport #3532).
+
+## Documentation
+
+* **[website] fix(backup): simplify UX with default backupclass and correct the admin override path**: Rewrites the backup guides to match the corrected `backupStorage` override path shipped in #3402/#3333 above, so the documented admin override actually works and the default backup-class UX is simpler to follow ([**@androndo**](https://github.com/androndo) in cozystack/website#622).
+
+* **[website] docs(backups): document PostgreSQL point-in-time recovery (PITR)**: Adds a guide for restoring a PostgreSQL cluster to a specific point in time, covering the required backup configuration and the restore procedure ([**@androndo**](https://github.com/androndo) in cozystack/website#629).
+
+* **[website] docs(monitoring): add OIDC authentication guide for Grafana**: New guide walking operators through enabling OIDC-based single sign-on for Grafana, including the admin-group and mode-toggle caveats ([**@IvanHunters**](https://github.com/IvanHunters) in cozystack/website#597).
+
+* **[website] docs(operations): document the gateway.http2 platform value**: Documents the `gateway.http2` platform value so operators know how to enable/disable HTTP/2 on the ingress gateway ([**@lllamnyp**](https://github.com/lllamnyp) in cozystack/website#625).
+
+* **[website] docs(talm): describe the preset value knobs for network and registries**: Documents the new talm preset value knobs for tuning network sysctls and registry mirror configuration ([**@lexfrei**](https://github.com/lexfrei) in cozystack/website#633).
+
+* **[website] docs: fix mermaid edge label and document wildcardSecretName for v1.5**: Fixes an unrenderable mermaid diagram in the certificate documentation and documents the `wildcardSecretName` option for v1.5 ([**@lexfrei**](https://github.com/lexfrei) in cozystack/website#615).
+
+* **[website] docs: correct the publishing reference and document the existingSecret cert mode**: Corrects the certificate publishing reference and documents the third, `existingSecret`, certificate mode ([**@lexfrei**](https://github.com/lexfrei) in cozystack/website#619).
+
+* **[website] docs(gpu): drop the manual KubeVirt patch step for GPU passthrough**: The platform wires `permittedHostDevices` into the KubeVirt CR itself from `packages/core/platform/files/gpu-passthrough-defaults.yaml`, so the manual patch documented since v1.4 is obsolete; the guide now covers the pre-upgrade migration steps for hand-edited entries instead. Merged just after the v1.5.2 tag, so v1.5.4 is the first release these notes cover it in ([**@lexfrei**](https://github.com/lexfrei) in cozystack/website#556).
+
+* **[website] docs: import the operator guides that lived in the cozystack repo**: Moves the operator-facing guides that previously lived in the `cozystack` repository into the website's documentation, consolidating operator docs in one place ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in cozystack/website#648).
+
+* **[website] docs: regenerate the managed apps reference for v1.4.5 and v1.5.2**: Refreshes the auto-generated managed-application reference pages so the published values tables match what those releases actually ship ([**@app/cozystack-ci**](https://github.com/apps/cozystack-ci) in cozystack/website#600, cozystack/website#601).
+
+## Other repositories
+
+### talm (v0.32.0 → v0.34.0)
+
+* **[talm] feat(charts): add preset value knobs**: Adds configurable preset value knobs for network and registry settings, letting operators tune Talos machine config presets without hand-editing templates ([**@lexfrei**](https://github.com/lexfrei) in cozystack/talm#232).
+
+* **[talm] chore(deps): migrate to Helm 4 and drop the cozystack/talos fork**: Migrates talm's Helm library from v3 to v4 and drops the previously vendored `cozystack/talos` fork in favor of upstream Talos v1.13.7 ([**@lexfrei**](https://github.com/lexfrei) in cozystack/talm#231).
+
+* **[talm] security: disable, then restore, KVM nested virtualization in Talos presets (CVE-2026-53359)**: talm first disabled KVM nested virtualization in its Talos presets to mitigate CVE-2026-53359, then reverted the blanket disable once the upstream fix landed, so presets keep nested virtualization available instead of being permanently disabled ([**@kvaps**](https://github.com/kvaps) in cozystack/talm#224, [**@lexfrei**](https://github.com/lexfrei) in cozystack/talm#225).
+
+* **[talm] feat(version): warn when project charts drift from the talm binary**: talm now warns when a project's vendored charts have drifted from the version embedded in the talm binary, plus chart-drift-detection support in `init --update`, catching stale vendored charts before they cause a surprising render diff ([**@lexfrei**](https://github.com/lexfrei) in cozystack/talm#216).
+
+### ansible-cozystack (v1.5.2 → v1.6.1)
+
+* **[ansible-cozystack] fix(prepare): keep KVM nested virtualization enabled**: Mirrors talm's CVE-2026-53359 response in the Ansible prepare role — nested virtualization is disabled to mitigate the CVE and then restored once the fix landed, matching the talm preset behavior ([**@kvaps**](https://github.com/kvaps) in cozystack/ansible-cozystack#60, [**@lexfrei**](https://github.com/lexfrei) in cozystack/ansible-cozystack#61).
+
+* **[ansible-cozystack] fix(examples): make prepare and k3s.orchestration runnable as separate invocations**: The example playbooks can now be run as independent steps rather than requiring a single combined invocation ([**@lexfrei**](https://github.com/lexfrei) in cozystack/ansible-cozystack#52).
+
+* **[ansible-cozystack] chore(deps): track the cozy-installer version**: The installer image is bumped in step with the Cozystack releases cut during this period — v1.5.3, v1.6.0 and v1.6.1 ([**@app/renovate**](https://github.com/apps/renovate) in cozystack/ansible-cozystack#59, cozystack/ansible-cozystack#63, cozystack/ansible-cozystack#65).
+
+No tags were released in **boot-to-talos** (latest v0.7.1, 2026-03-19), **cozyhr** (latest v1.6.1, 2026-01-27), **cozy-proxy** (latest v0.3.0, 2026-04-28) or **external-apps-example** (no tags) during this release period.
+
+## Contributors
+
+Thanks to everyone who contributed to this patch release:
+
+* [**@androndo**](https://github.com/androndo)
+* [**@IvanHunters**](https://github.com/IvanHunters)
+* [**@kvaps**](https://github.com/kvaps)
+* [**@lexfrei**](https://github.com/lexfrei)
+* [**@lllamnyp**](https://github.com/lllamnyp)
+* [**@mattia-eleuteri**](https://github.com/mattia-eleuteri)
+* [**@myasnikovdaniil**](https://github.com/myasnikovdaniil)
+
+
+**Full Changelog**: https://github.com/cozystack/cozystack/compare/v1.5.2...v1.5.4
diff --git a/docs/changelogs/v1.6.0.md b/docs/changelogs/v1.6.0.md
new file mode 100644
index 0000000000..b9141a1d3c
--- /dev/null
+++ b/docs/changelogs/v1.6.0.md
@@ -0,0 +1,669 @@
+<!--
+https://github.com/cozystack/cozystack/releases/tag/v1.6.0
+-->
+
+# Cozystack v1.6.0
+
+Cozystack v1.6.0 replaces the Ubuntu + kubeadm bootstrap of **tenant Kubernetes workers with Talos Linux** driven by Cluster API, completes the **etcd-operator `v1alpha2` migration** with in-place adoption of live clusters, adds **OIDC single sign-on for tenant kube-apiservers and per-instance Grafana**, introduces the tenant-facing **`SecurityGroup` firewall API**, makes **tenant resource quotas hierarchical** so a sub-tenant can no longer escalate past its parent's budget, gives Keycloak an optional **KMS-encrypting database proxy**, a separate admin hostname and S3 backups, propagates **operator-provided wildcard certificates** down to every tenant termination point, and reworks the release pipeline around **immutable tags and rc→stable promotion** so a stable release is the byte-identical promotion of the release candidate that was tested. A ten-PR sweep also makes **application deletion actually reclaim its storage** instead of leaking PVCs. The release rolls up every fix from v1.5.1, v1.5.2 and v1.5.3.
+
+Platform components bumped in this release: **Talos v1.13.0 → v1.13.6** (KVM guest-escape CVE fixes), **etcd-operator v0.4.5 → v0.5.2** (new `etcd-operator.cozystack.io/v1alpha2` API), **Cilium 1.19.3 → 1.19.5**, **KubeVirt v1.8.4**, **Velero 1.17.0 → 1.18.1**, **Vertical Pod Autoscaler 1.3.0 → 1.5.0**, **Harbor 2.14.2 → 2.15.1**, **Keycloak 26.5.2 → 26.6.3**, **LINSTOR 1.33.2 → 1.33.3** with linstor-csi v1.11.2, **FoundationDB operator v2.13.0 → v2.30.0**, **HAMi 2.8.1 → 2.9.0**, **Percona MongoDB operator 1.21.1 → 1.22.0**, **OpenBao v2.5.0 → v2.5.1**, **CoreDNS chart 1.43.2 → 1.46.0**, **csi-driver-nfs 4.11.0 → 4.13.3**, **OpenCost 1.111.0 → 1.120.3**, **NATS 2.11.8 → 2.11.10**, **linstor-scheduler v0.3.2 → v0.3.6**, and **ouroboros 0.8.0 → 0.8.1**.
+
+> **Note:** Items marked *(shipped in v1.5.x)* were also released in the v1.5.1, v1.5.2 or v1.5.3 patch releases.
+
+## ⚠️ Breaking Changes and Required Actions
+
+This is the largest upgrade surface since v1.0. Read this section in full before upgrading — three of the items below can **block or wedge the upgrade** if their preconditions are not met.
+
+The platform migration `targetVersion` moves from **45 (v1.5.x) to 54**, which means migrations **45 through 53** run as pre-upgrade hooks on the way to v1.6.0.
+
+### Pre-upgrade checks
+
+Run these against the management cluster **before** applying the v1.6.0 Platform Package.
+
+**1. etcd adoption needs a reachable backup target (migration 50 — hard-fails the upgrade).**
+
+Migration 50 adopts every legacy `etcd.aenix.io/v1alpha1` cluster onto the new v1alpha2 operator and takes a mandatory pre-adoption etcd snapshot first. If it cannot resolve the platform-managed snapshot target it **exits 1 and halts the upgrade** (#2859, #3270, #3335).
+
+```sh
+# Do you have legacy etcd clusters at all? If this prints nothing, migration 50 is a no-op.
+kubectl get etcdclusters.etcd.aenix.io -A
+
+# The snapshot target: the cozy-default-etcd strategy and the projected credentials Secret.
+kubectl get etcds.strategy.backups.cozystack.io cozy-default-etcd
+kubectl get secret cozy-backups-creds -n cozy-velero \
+  -o jsonpath='{.data.AWS_ACCESS_KEY_ID}{"\n"}'
+
+# The bucket behind it must be healthy.
+kubectl get buckets.apps.cozystack.io cozy-backups -n tenant-root
+```
+
+If the Secret or the strategy is missing and you have legacy etcd clusters, either repair the `cozy-backups` Bucket / `backupstrategy-controller` first, or accept adopting live etcd **without** a snapshot by taking the documented escape hatch (see *Manual actions required*).
+
+**2. SeaweedFS naming audit (chart refuses to render for two classes of tenant).**
+
+The v1.5.0 SeaweedFS chart bump to 4.31 renamed workloads from chart-based (`seaweedfs-*`) to release-based (`seaweedfs-system-*`) names. v1.6.0 pins `fullnameOverride: seaweedfs` and adopts the running set in place, but two states cannot be adopted automatically and the chart **fails the render** rather than guess (#3282, #3339).
+
+```sh
+# Step 0 — seaweedfs-db ownership. A missing row means the filer metadata is ALREADY lost.
+kubectl get cluster.postgresql.cnpg.io -A \
+  -o custom-columns='NS:.metadata.namespace,NAME:.metadata.name,OWNER:.metadata.annotations.meta\.helm\.sh/release-name,KEEP:.metadata.annotations.helm\.sh/resource-policy'
+
+# Step 1 — classify every SeaweedFS instance (read-only).
+hack/seaweedfs-naming-audit.sh
+```
+
+**Correction, added after release: the copy of that script shipped in v1.6.0 fails open, so a clean result from it is not evidence.** Every `kubectl` call in the v1.6.0 version is silenced with `2>/dev/null`, so a timeout, an RBAC denial or any transient API error produces an empty "all clean" table byte-identical to an honestly clean fleet — on the one script whose output gates a runbook step that deletes PVCs. Fixed in #3436 and backported as #3474, both merged 2026-07-28, so v1.6.1 and later carry a version that prints `FATAL` and exits non-zero instead. Run the audit from a v1.6.1-or-later checkout, read the **exit code** rather than the table, and re-run it if the only run you have was against the v1.6.0 copy.
+
+Class `L` needs no action. Class `S` (installed fresh on 1.5.x) and class `MIXED` (both naming generations present) must be recovered **before** upgrading — follow [`docs/operations/seaweedfs-431-rename-recovery.md`](../operations/seaweedfs-431-rename-recovery.md). A cluster that went 1.4.x → 1.6.0 directly never renamed and is unaffected.
+
+**3. Tenant Kubernetes clusters still on v1.30.**
+
+v1.30 leaves the Talos↔Kubernetes support matrix and the chart now refuses to render it. Migration 46 patches live CRs from `v1.30` to `v1.31`, but a **GitOps-managed** CR is re-overwritten by the next source reconcile (#2931).
+
+```sh
+kubectl get kuberneteses.apps.cozystack.io -A \
+  -o custom-columns='NS:.metadata.namespace,NAME:.metadata.name,VERSION:.spec.version'
+```
+
+Any row showing `v1.30` that is reconciled from Git must have `spec.version` bumped to `v1.31` (or newer) **in Git**, before or together with the platform upgrade.
+
+**4. Hand-made tenant StorageClasses that collide with propagated LINSTOR classes.**
+
+Remote-accessible LINSTOR StorageClasses are now created inside each tenant cluster under the same name. A manually created tenant StorageClass with a colliding name (typically `replicated`) blocks the propagated class and stalls the tenant CSI release (#2872).
+
+```sh
+# Inside each tenant cluster:
+kubectl get storageclass replicated -o jsonpath='{.metadata.annotations.meta\.helm\.sh/release-name}{"\n"}'
+```
+
+Delete any such class that is not Helm-managed before upgrading. Infra classes that must stay node-local need an explicit `linstor.csi.linbit.com/allowRemoteVolumeAccess: "false"` — an absent annotation is treated as remote-accessible.
+
+**5. Deprecated etcd tenant-module backup values.**
+
+The `backup.*` block on the `etcd` tenant module is removed in this release. Confirm nothing still relies on it (#2859).
+
+```sh
+kubectl get etcds.apps.cozystack.io -A -o jsonpath='{range .items[*]}{.metadata.namespace}/{.metadata.name}{"\t"}{.spec.backup.enabled}{"\n"}{end}'
+```
+
+**6. If you are coming from v1.4.x**, the v1.5.0 requirement still applies: the management cluster (and any tenant cluster enabling the Flux addon) must be on **Kubernetes 1.33+**.
+
+### Breaking changes
+
+* **Tenant Kubernetes workers move from Ubuntu + kubeadm to Talos Linux.** *What changed:* worker bootstrap is now driven by `cluster-api-bootstrap-provider-talos` (CABPT) with a `talos-csr-signer` sidecar in the Kamaji control-plane pod; workers boot the Talos openstack image streamed in by CDI. *Who is affected:* every existing tenant Kubernetes cluster. *What to do:* nothing mandatory — existing machines roll over to Talos workers automatically on the first reconcile after upgrade — but plan for a **full worker-pool replacement per tenant cluster**, and expect worker disks to be reprovisioned and container images re-pulled. The separate `disk-kubelet` PVC is gone; `nodeGroups[*].diskSize` now sizes the single Talos system disk ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #2931).
+
+* **Kubernetes v1.30 removed from the tenant support matrix.** *What changed:* the `version` enum drops `v1.30`; the chart fails the render with an explicit guard. *Who is affected:* tenants still pinned to v1.30. *What to do:* migration 46 bumps live CRs to `v1.31`; GitOps-managed CRs must be bumped in Git (see pre-upgrade check 3) (#2931).
+
+* **Worker MachineHealthCheck remediation is now ON by default.** *What changed:* the worker MHC `maxUnhealthy` moved from a hard-coded `0` (remediation effectively disabled) to `nodeHealthCheck.maxUnhealthy`, defaulting to `"50%"` — CAPI now deletes and replaces unhealthy worker Machines. *Who is affected:* every tenant Kubernetes cluster. *What to do:* set `nodeHealthCheck.maxUnhealthy: "0%"` to keep the previous behaviour until your fleet is stable on Talos workers (#2931).
+
+* **The default `md0` node group is no longer merged into every cluster.** *What changed:* `nodeGroups` defaults to `{}` and the built-in `md0` is applied only when no node groups are configured, so it can finally be removed or replaced. *Who is affected:* clusters that defined their own node groups and were silently also getting `md0`. *What to do:* nothing — migration 47 pins `md0` explicitly on existing CRs to preserve the live topology; remove it afterwards if you do not want it. Migration 47 is **fail-closed**: a read or patch failure aborts the upgrade rather than let Helm prune a live `md0` MachineDeployment ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #2936).
+
+* **Fresh tenant clusters with `nodeGroups: {}` come up with zero workers.** *What changed:* the chart no longer manages `MachineDeployment.spec.replicas` — the cluster-autoscaler owns it alone, seeded from `minReplicas: 0`. *Who is affected:* new clusters that enable `addons.ingressNginx.enabled: true` on a default CR. *What to do:* either supply a node group with `roles: [ingress-nginx]` and `minReplicas >= 1`, or let the autoscaler bring up `md0` once the ingress-nginx pods go `Pending`. Upside for existing clusters: `helm upgrade` no longer drains workers back to a hardcoded `replicas: 2` on every platform bump ([**@IvanHunters**](https://github.com/IvanHunters) in #3233).
+
+* **etcd moves to `etcd-operator.cozystack.io/v1alpha2`.** *What changed:* the legacy `etcd.aenix.io/v1alpha1` StatefulSet model is replaced by a Membership-API lifecycle; the vendored upstream chart is replaced by a Cozystack-authored one at appVersion `v0.5.2`, and CRDs move into a dedicated `etcd-operator-crds` package. *Who is affected:* every cluster running the etcd tenant module or tenant Kubernetes (Kamaji datastores). *What to do:* existing clusters are adopted **in place** by migration 50 — no data move, no pod restart — provided the pre-upgrade snapshot target resolves (see pre-upgrade check 1). A pre-upgrade hook also deletes the pre-1.6 operator Deployment, whose `spec.selector` is immutable and would otherwise fail the Helm upgrade ([**@androndo**](https://github.com/androndo) in #2859, [**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #3270).
+
+* **The deprecated `backup.*` values on the `etcd` tenant module are removed.** *What changed:* `backup.enabled`, `schedule`, `destinationPath`, `endpointURL`, `region`, `forcePathStyle`, `s3AccessKey`, `s3SecretKey` and the job-history limits no longer exist; a new `version` value (default `3.6.11`) pins the etcd release. *Who is affected:* tenants that configured legacy per-release S3 backups on the etcd module. *What to do:* migrate to the `BackupClass` flow driven by the `Etcd` strategy (`strategy.backups.cozystack.io/v1alpha1`) before upgrading (#2859).
+
+* **Deleting a managed application now permanently deletes its storage.** *What changed:* ten packages gained post-delete cleanup that reclaims previously-orphaned PVCs and Secrets. Deletion is **irreversible** — this is the point of the change, but it is a real behaviour change from "delete leaks the volume, and you could recover from it". *Who is affected:* ClickHouse (keeper + data + log PVCs), Qdrant (data PVC), OpenBAO (data PVC), the tenant `monitoring` module (VictoriaMetrics/VictoriaLogs storage PVCs), the tenant `seaweedfs` module (volume PVCs), the tenant `etcd` module (`data-etcd-*` PVCs), Harbor (jobservice/trivy PVCs — this force-deletes them, overriding `persistence.resourcePolicy=keep`), MariaDB (operator-generated Secrets), Bucket and Gateway (ACME solver resources). *What to do:* back up before deleting; snapshot anything you care about. Migrations 48 and 51 backfill the release label onto pre-existing ClickHouse keeper PVCs and monitoring storage PVCs so already-deployed clusters are covered too. Harbor's CNPG database PVCs are **not** touched ([**@scooby87**](https://github.com/scooby87) in #3072, #3075, #3073, #3094, #3095, #3170, #3077, #3071, #3076, #3093).
+
+* **Tenant resource quotas are now hierarchical.** *What changed:* a tenant's declared quota is the budget for its whole sub-tree — a child that declares a quota carves a fixed slice out of the parent's remaining budget, a child without one shares the parent's pool instead of being unbounded, and a child quota exceeding the parent's remaining budget is rejected at admission. *Who is affected:* multi-level tenant trees where a sub-tenant previously declared more than its parent, or nothing at all. *What to do:* review sub-tenant quotas before upgrading; an overcommitted pool emits a `QuotaOvercommitted` event. Set `--tenant-quota-buffer-percent` on `cozystack-controller` for a temporary grace buffer so workloads already over a freshly-binding quota keep running during rollout ([**@kvaps**](https://github.com/kvaps) in #3086).
+
+* **Worker node disks now default to the application-level (DRBD `replicated`) StorageClass.** *What changed:* a node group leaving `storageClass` empty previously picked the management-cluster default StorageClass; it now falls back to the application `storageClass`, because linstor-csi v1.11.2 rejects ReadWriteMany volumes on a non-DRBD class and worker VMs need RWX to live-migrate. *Who is affected:* tenant clusters relying on the empty-storageClass default. *What to do:* nothing, but the rendered worker template changes, so each tenant's worker MachineDeployment rolls once on the first reconcile after upgrade ([**@lexfrei**](https://github.com/lexfrei) in #3129, #2987).
+
+* **`authentication.oidc.keycloakInternalUrl` now defaults to the in-cluster Keycloak Service.** *What changed:* the default is `http://keycloak-http.cozy-keycloak.svc:8080/realms/cozy` instead of empty, so OIDC backend calls no longer leave the cluster. *Who is affected:* clusters that never set the value explicitly. *What to do:* nothing, but the dashboard and linstor-gui gatekeepers roll once. Set the value explicitly for a non-standard Keycloak placement, or to an empty string to restore external OIDC discovery ([**@lexfrei**](https://github.com/lexfrei) in #3289).
+
+* **Air-gapped tenant workers: `registries.mirrors` passthrough is gone.** *What changed:* the Helm-rendered `*-patch-containerd` Secret that plumbed the platform-wide `registries.mirrors` config to tenant workers has no consumer in the Talos machineconfig and was removed. *Who is affected:* tenants relying on `registries.mirrors` for in-guest container-image pulls. *What to do:* the Talos OS image and installer **are** overridable — set `talos.imageFactoryURL` and `talos.installerRepository` to your mirror — but in-guest registry mirroring is a Phase 2 follow-up (#2931, #3244).
+
+* **`SecurityGroup` is served with a membership-group shape.** The new `sdn.cozystack.io/v1alpha1 SecurityGroup` API landed inside this release with `spec.targetRef` replaced by a `spec.attachments[]` membership model before release, so there is no upgrade path to worry about — but anyone tracking `main` between 2026-06-30 and 2026-07-16 must rewrite their objects ([**@lexfrei**](https://github.com/lexfrei) in #2922).
+
+* **The `network.cozystack.io` API group (`ExposureClass` / `ServiceExposure`) was introduced and removed within this cycle.** It never shipped in a release and is **not** part of v1.6.0; native `Service` `type: LoadBalancer` + `loadBalancerClass` covers the same ground, exposed as `publishing.loadBalancerClass`. Only clusters tracking `main` that explicitly set `publishing.exposureClass` need to provision their own MetalLB/Cilium address pool and switch to `publishing.loadBalancerClass`; any orphaned `cozystack-<class>` pool can be deleted by hand ([**@lexfrei**](https://github.com/lexfrei) in #3081, removed by [**@kvaps**](https://github.com/kvaps) in #3218).
+
+### Manual actions required
+
+* **BEFORE the upgrade — recover SeaweedFS tenants classified `S` or `MIXED`.** The chart refuses to render for them, which blocks the tenant's upgrade until an operator resolves it. Run `hack/seaweedfs-naming-audit.sh` and follow [`docs/operations/seaweedfs-431-rename-recovery.md`](../operations/seaweedfs-431-rename-recovery.md). Do **not** guess which generation holds the data — the runbook exists because a duplicate that briefly served writes is indistinguishable from one that never scheduled (#3339).
+
+* **BEFORE the upgrade — bump GitOps-managed tenant `Kubernetes` CRs off `v1.30`.** Migration 46 only patches live objects; Git wins the next reconcile and the HelmRelease then fails the version guard (#2931).
+
+* **BEFORE the upgrade — delete colliding hand-made tenant StorageClasses** (see pre-upgrade check 4) (#2872).
+
+* **DURING the upgrade, only if migration 50 halts** — if the cluster intentionally has no backup storage (backups disabled, external S3 without staged credentials, or SeaweedFS not yet ready) and you accept adopting live etcd **without** a safety snapshot, take the documented escape hatch:
+
+  ```sh
+  kubectl edit package.cozystack.io cozystack.cozystack-platform
+  ```
+  ```yaml
+  spec:
+    components:
+      platform:
+        values:
+          migrations:
+            etcdAdoptSkipBackup: true
+  ```
+
+  Flux re-renders the platform chart and re-runs the hook, adopting every legacy etcd without a snapshot. **A botched adoption on a tenant control-plane etcd is unrecoverable without a snapshot.** Set the flag back to `false` once the upgrade completes, or the next etcd migration will skip its snapshot too (#2859, #3335).
+
+* **AFTER the upgrade — review worker MachineHealthCheck tolerance.** Remediation is now on by default at `50%`; set `nodeHealthCheck.maxUnhealthy: "0%"` (cluster-wide) or per node group if you want the old behaviour while the fleet settles on Talos (#2931, #3053).
+
+* **AFTER the upgrade — re-check metrics scrape targets on ports 10250.** cert-manager's webhook, external-secrets' webhook and metrics-server's listener all moved off port 10250, which the kubelet also serves (#3359, #3360, #3361).
+
+* **No action, but expect one rollout each:** tenant worker pools (Talos rollover and the storageClass fallback), the dashboard and linstor-gui gatekeepers (OIDC internal URL default), the VPA admission controller (cert-manager-issued TLS), and the linstor-scheduler admission Deployment (migration 52 deletes it so the new immutable selector can be created cleanly).
+
+### Deprecations
+
+* **Legacy per-app S3 backup fields.** The `etcd` module's `backup.*` block is now *removed* (above); the equivalent legacy fields on Postgres and ClickHouse remain deprecated in favour of the platform-managed `BackupClass` flow introduced in v1.5.0.
+* **Classic per-host ACME certificates for platform services.** Still the default, but `publishing.certificates.wildcard` (DNS-01) and `publishing.certificates.wildcardSecretName` (operator-provided) are now the recommended path at scale, and the operator-provided certificate propagates to per-tenant termination points automatically (#2988, #2990).
+* **`auto-release.yaml` cron patch releases** are gone — stable releases are cut only by explicit rc→stable promotion (#3017).
+
+## Feature Highlights
+
+### Talos Linux Tenant Kubernetes Workers
+
+Tenant Kubernetes worker nodes no longer boot Ubuntu and bootstrap through kubeadm. Phase 1 of the Kubernetes-app split design replaces that path with **Talos Linux**, driven by `cluster-api-bootstrap-provider-talos` (CABPT v0.6.12) registered as a second bootstrap provider alongside kubeadm, and a `clastix/talos-csr-signer` sidecar embedded in the Kamaji control-plane pod.
+
+Talos PKI (an Ed25519 CA plus trustd TLS) is generated through cert-manager with stable, lookup-and-reuse random Talos secrets; the Kamaji control-plane provider is bumped with an upstream-bound patch that exposes `KamajiControlPlane.spec.network.additionalServicePorts` so trustd (50001/TCP) can be published on the apiserver Service. Workers boot the Talos openstack raw image via a CDI `DataVolume` streamed from the image factory, with the system disk exposed as virtio-blk using `blockSize.custom: logical=512, physical=4096` so 4Ki-native backends such as LINSTOR/DRBD behave under QEMU's `O_DIRECT` writes while SeaBIOS still boots. The separate kubelet disk is gone — Talos lays out `EPHEMERAL` itself on the single system disk that `diskSize` now sizes.
+
+Existing tenants roll over automatically: old machines are replaced by Talos workers without manual intervention, and platform migration 45 pins the outgoing `KubeadmConfigTemplate` objects with `helm.sh/resource-policy: keep` so Helm cannot prune them out from under the still-live kubeadm MachineSet mid-rollover.
+
+Two behaviour changes are worth planning for: the tenant `kubernetes` HelmRelease now reports `Ready` as soon as Helm completes (`DisableWait`) and no longer blocks on worker or addon readiness — worker-rollout health is tracked by `WorkloadMonitor` — and worker MachineHealthCheck remediation is enabled by default at `maxUnhealthy: "50%"`. See the Breaking Changes section above for the full action list ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #2931).
+
+Follow-ups shipped in the same release make the rollover practical: per-node-group `maxUnhealthy` / `nodeStartupTimeout` overrides so a stateful group can sit at `0%` while a stateless one tolerates `50%` (#3053), overridable `talos.imageFactoryURL` and `talos.installerRepository` for air-gapped, mirrored or rate-limited environments (#3244), the `TalosConfigTemplate` moved out of a post-install hook into the main install phase so worker MachineDeployments scale reliably (#3145), and `MachineDeployment.spec.replicas` handed entirely to the cluster-autoscaler so platform bumps stop draining workers (#3233).
+
+### etcd-operator v1alpha2 with In-Place Adoption
+
+Cozystack's etcd stack moves to the donated **`etcd-operator.cozystack.io/v1alpha2`** API — a Membership-API lifecycle replacing the StatefulSet model — served by a Cozystack-authored chart at appVersion `v0.5.2`, with CRDs split into their own `etcd-operator-crds` package so they can be installed ahead of the controller.
+
+The interesting part is the upgrade. Platform migration 50 runs as a **pre-upgrade hook**, while the legacy operator is still the running one, and uses the `etcd-migrate` tool baked into the migrations image to rewrite ownership, labels and CRs so the new operator takes over the live data plane on its first reconcile — no data move, no pod restart. Before touching anything it takes a mandatory snapshot of every adopted cluster to the platform-managed `cozy-backups` bucket, under a system key prefix with tenant-invisible credentials, and it **fails loudly rather than adopt without one**. It also re-issues each cluster's server and peer certificates with the new operator's native member wildcard SAN first, because in `secretRef` TLS mode the operator never mints certs — an adopted cluster whose certs lack the native domain would silently fail TLS the first time a member is replaced, while still reporting `Available=True`.
+
+The in-cluster 1.5 → 1.6 path needed three more fixes to actually work, all folded into #3270: a chart-managed transitional `etcd-headless` Service so adopted members stay resolvable at their legacy per-pod DNS names until they roll onto the native subdomain; a pre-upgrade hook that deletes the pre-1.6 operator Deployment, whose `spec.selector` is immutable and would otherwise fail the whole HelmRelease with `field is immutable`; and a raised 256Mi memory floor so the operator does not OOM before the VPA admission webhook can scale it. Backup strategies also derive their S3 endpoint, scheme and TLS mode from the provisioned bucket Secret instead of requiring it hand-set.
+
+The tenant etcd module's deprecated `backup.*` values are removed in the same change — use a `BackupClass` bound to the `Etcd` strategy instead ([**@androndo**](https://github.com/androndo) in #2859, [**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #3270, #3335).
+
+### OIDC Single Sign-On for Tenant Kubernetes and Grafana
+
+Two symmetric Phase 1 features let a tenant opt an individual workload into the platform's Keycloak `cozy` realm through one flat selector, with no platform-level configuration.
+
+**Tenant kube-apiserver.** Each `Kubernetes` CR gains `spec.oidc.mode: System | CustomConfig | None` (default `None`). `System` trusts the `cozy` realm via a per-cluster public client and audience binding; `CustomConfig` accepts a tenant-supplied structured `AuthenticationConfiguration`. `spec.oidc.users[]` drives one `ClusterRoleBinding` per user inside the tenant cluster (`admin` → `cluster-admin`, `view` → `view`). In `System` mode a `<release>-oidc-kubeconfig` Secret carrying a ready-to-use `kubectl oidc-login` exec block is surfaced through the dashboard, so a tenant user goes from "cluster exists" to "kubectl works with my SSO identity" without an operator in the loop ([**@IvanHunters**](https://github.com/IvanHunters) in #3044). The underlying passthrough — `controlPlane.apiServer.extraArgs`, `extraVolumes` and `extraVolumeMounts` on `KamajiControlPlane` — is also exposed directly for anyone wanting to hand-roll authentication ([**@lexfrei**](https://github.com/lexfrei) in #3123).
+
+**Grafana.** Each `Monitoring` CR gains the same `spec.oidc.mode` selector. `System` wires a per-instance confidential Keycloak client with audience binding; authorization is app-side, with `spec.oidc.users: [{email, role: Admin|Editor|Viewer}]` reconciled into Grafana's Main Org. by a chart-owned post-install/post-upgrade Job that pre-provisions users, adds them to the org, PATCHes their role and prunes stale members. `CustomConfig` accepts a tenant-supplied `[auth.generic_oauth]` payload, either inline as a map (the chart merges the two contract-critical settings on top) or as a Secret with an `auth.ini` key — in which case `spec.oidc.users` is unsupported and the chart fails the render on that combination rather than silently ignoring it. The `admin_user`/`admin_password` Secret remains a documented break-glass path in every mode ([**@IvanHunters**](https://github.com/IvanHunters) in #3176).
+
+Both are documented in-repo at [`docs/oidc-tenant.md`](../oidc-tenant.md) and [`docs/oidc-grafana.md`](../oidc-grafana.md).
+
+### SecurityGroup: Tenant-Managed Network Policy
+
+A new tenant-facing, namespace-scoped firewall resource — `sdn.cozystack.io/v1alpha1 SecurityGroup` — lets tenants manage their applications' network policy without any access to the `cilium.io` API group.
+
+A `SecurityGroup` is a **membership group**: it owns a membership label (`securitygroup.sdn.cozystack.io/<name>`) that a new `securitygroup-controller` stamps onto the pods of every managed application listed in `spec.attachments`, and removes when an attachment is dropped. The group projects 1:1 onto a `CiliumNetworkPolicy` in the same namespace whose `endpointSelector` is exactly that membership label — so one `SecurityGroup` can cover several applications at once, and `fromSG`/`toSG` peers resolve group-to-group references live in the Cilium dataplane. A finalizer guards the backing policy so member labels are always stripped before it is removed, re-asserted by the aggregated-API REST storage on every write so a full-replace `PUT` cannot orphan them.
+
+Ingress and egress rules only ever **add** allowed traffic; an empty list does not isolate the member pods, because effective connectivity remains the union of every policy selecting a pod including the platform's blanket-allow baseline. Default-deny enforcement is tracked separately as future work ([**@lexfrei**](https://github.com/lexfrei) in #2922).
+
+### Hierarchical Tenant Resource Quotas
+
+`tenant.spec.resourceQuotas` previously became a plain per-namespace `ResourceQuota` that ignored the tenant tree entirely — a super-admin inside a quota'd tenant could create a sub-tenant with a larger quota, or no quota at all, and consume more than was allocated. A tenant's declared quota is now the budget for its **whole sub-tree**.
+
+Enforcement is two cooperating layers, mirroring OpenShift's ClusterResourceQuota split. A declaration-time gate in the aggregated apiserver deterministically rejects a sub-tenant whose declared quota exceeds the parent's remaining budget. A runtime enforcer in `cozystack-controller` maintains a per-namespace `tenant-quota-allocated` ResourceQuota that clamps each pool member to its share of the parent budget, aggregating sub-tree usage so members collectively stay within it — Kubernetes enforces the most restrictive ResourceQuota in a namespace, so this binds without fighting Flux over the chart-rendered `tenant-quota`.
+
+A parent quota lowered below the sum of its children emits a `QuotaOvercommitted` event, and `--tenant-quota-buffer-percent` on `cozystack-controller` temporarily inflates pool budgets during rollout so workloads already over a freshly-introduced quota keep running. No API types and no tenant chart changes — the feature works with the existing field ([**@kvaps**](https://github.com/kvaps) in #3086).
+
+### Keycloak: Encryption Proxy, Admin Hostname, and Backups
+
+Keycloak gets four independent additions this release, all opt-in.
+
+An optional **KMS-encrypting database proxy** provides column-level encryption for PII at rest, backed by either a static KEK or Vault Transit, and off by default ([**@kvaps**](https://github.com/kvaps) in #3003). A follow-up adds Vault **Kubernetes and AppRole auth** for the proxy, a dedicated ServiceAccount, and a shared DEK set covering both migration and HA ([**@sircthulhu**](https://github.com/sircthulhu) in #3239).
+
+An opt-in `ingress.adminHost` serves the **admin console and Administration REST API on a separate hostname and route**, with `publishing.ingressNameAdmin` (`_cluster.expose-ingress-admin`) attaching that route to a separate — for example private — Gateway or ingressClass. Disabled by default; existing deployments are unchanged ([**@sircthulhu**](https://github.com/sircthulhu) in #2954).
+
+**S3 backups** for the Keycloak CNPG database land via Barman, configurable under `backup.*` and disabled by default ([**@kvaps**](https://github.com/kvaps) in #3174). Finally, the realm **login theme** is now selectable and its theme image shipped through platform `branding` values (`branding.loginTheme`, `branding.loginThemeImage`) ([**@lexfrei**](https://github.com/lexfrei) in #3124), and the database host, port and URL properties are overridable so the connection can be routed through an external proxy ([**@sircthulhu**](https://github.com/sircthulhu) in #2907).
+
+### Wildcard Certificates, End to End
+
+v1.5.0 let operators point platform services at a pre-existing wildcard TLS Secret through `publishing.certificates.wildcardSecretName`, but only for the root tenant. That certificate is now **replicated by the platform controller into every tenant namespace that terminates TLS**, so per-tenant ingress controllers and Gateways serve it automatically — no extra operator input, and no cross-namespace Secret read ([**@lexfrei**](https://github.com/lexfrei) in #2990).
+
+For operators who would rather have the platform mint the wildcard, a new opt-in `publishing.certificates.wildcard` (default `false`) issues a single `*.<root-host>` certificate via a DNS-01 solver on the default ingress-nginx path, instead of a per-host ACME certificate — the practical fix for hitting Let's Encrypt rate limits at scale ([**@lexfrei**](https://github.com/lexfrei) in #2988).
+
+### Immutable Tags and rc→stable Promotion
+
+A stable release is now a **renamed release candidate**: the bytes shipped as `vX.Y.Z` are bit-for-bit the bytes built and end-to-end tested as `vX.Y.Z-rc.N`. No tag is ever force-moved and stable is never rebuilt — it is promoted by retagging the rc's existing images by digest.
+
+The enabler was decoupling the operator's self-reported version from its image: it now reads `COZYSTACK_VERSION` from the environment (threaded through `cozystackOperator.platformVersion`), falling back to the build-time value, so the same bits can report any release name. All five force-retag sites in the release workflows are removed and replaced with write-once or fast-forward-only semantics, and the cron-driven `auto-release.yaml` patch-tag workflow is deleted outright — stable tags now exist only through explicit promotion. A `promote-rc.yaml` workflow validates the rc, `skopeo copy`s every digest-pinned image reference to the stable tag, restamps the version-stamped assets, and opens a `release-X.Y.Z` PR whose merge cuts the write-once stable tag ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #3017). A companion **Cut Pre-release Tag** workflow covers the rc side of the same flow (#3253).
+
+### Application Deletion Reclaims Its Storage
+
+Deleting a managed application used to leave its volumes and operator-generated Secrets behind. A ten-PR sweep across the catalog closes that, adding post-delete cleanup hooks and PVC retention policies so a deleted application actually releases what it held: ClickHouse keeper and data/log PVCs, Qdrant's data PVC, OpenBAO's data PVC, the tenant monitoring module's VictoriaMetrics/VictoriaLogs storage and TLS Secrets, the tenant seaweedfs module's volume PVCs and cert/db Secrets, the tenant etcd module's `data-etcd-*` PVCs and five TLS Secrets, Harbor's jobservice and trivy PVCs plus ACME solver resources, MariaDB's operator-generated password Secrets, Bucket's ACME solver resources, Gateway's ACME account Secret, and the Postgres init Job.
+
+Two migrations backfill the release label onto storage provisioned before this change — 48 for ClickHouse keeper PVCs, 51 for monitoring storage PVCs — because the respective operators only stamp `volumeClaimTemplates` labels onto PVCs they create *after* the change and never re-label existing ones. Both are best-effort by design: the worst case if a relabel is skipped is the pre-existing leak, which is no worse than the status quo.
+
+**This makes deletion destructive.** See the Breaking Changes section ([**@scooby87**](https://github.com/scooby87) in #3069, #3071, #3072, #3073, #3075, #3076, #3077, #3078, #3093, #3094, #3095, #3170).
+
+## Platform Components
+
+* **Talos Linux**: v1.13.0 → v1.13.6 (management-cluster image and matchbox assets), with tenant workers on the same v1.13.6. Closes the **CVE-2026-53359** and **CVE-2026-46113** KVM guest-to-host escapes. ([release notes](https://github.com/siderolabs/talos/releases/tag/v1.13.6)) ([**@lexfrei**](https://github.com/lexfrei) in #3008, #3240, #3269)
+  - Kernel 6.18.29 → **6.18.38**, carrying the KVM shadow-paging use-after-free and nested-guest escape fixes. Nested virtualization remains available.
+  - containerd 2.2.5, runc 1.4.3, etcd 3.6.11, Kubernetes 1.36.1 in the bundled components.
+  - Reliability fixes across the range: DNS server and listeners recreated on host-DNS runner restart, correct `int` marshalling of kube-scheduler config, relaxed LUKS header and hostname validation, more resources marked sensitive, higher etcd open-file limit, `FailurePauseTimeout` honoured before reboot.
+  - System extensions refreshed to the 20260622 set, including **DRBD 9.3.2** and **ZFS 2.4.3**. Applying this rolls each tenant worker pool once, as the worker template is renamed to carry the new image.
+
+* **etcd-operator**: v0.4.5 (vendored upstream chart) → **v0.5.2** (Cozystack-authored chart, `etcd-operator.cozystack.io/v1alpha2`). CRDs split into a new `etcd-operator-crds` package. See Feature Highlights and Breaking Changes for the adoption path. ([sources](https://github.com/cozystack/etcd-operator)) ([**@androndo**](https://github.com/androndo) in #2859, [**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #3270)
+
+* **Cilium**: 1.19.3 → 1.19.5. ([release notes](https://github.com/cilium/cilium/releases/tag/v1.19.5)) ([**@lexfrei**](https://github.com/lexfrei) in #2972)
+  - Fixes `CiliumNetworkPolicy` `fromNodes`/`toNodes` when `policy-default-local-cluster` is on (the 1.19+ default), and a wildcard-namespace bypass for selectorless `ipBlock` rules.
+  - Gateway API: TLS-passthrough routes no longer fail silently on gateways with mixed HTTP/HTTPS/TLS listeners, weighted backend splitting is fixed for `TLSRoute` passthrough, stale route parent statuses are pruned, and a controller panic on a malformed `parametersRef` is prevented.
+  - Datapath: fixes node connectivity disruption when ClusterIP/LoadBalancer VIPs overlap node-local addresses, host-proxy packet routing to pods, a corrupted `NamespaceSelector` on `CiliumEgressGatewayPolicy`, and an endpoint-ID reuse race that removed a live endpoint's BPF state.
+  - **Removed:** the `loadBalancer.standalone` Helm option.
+
+* **KubeVirt**: updated to **v1.8.4**. Fixes VMIs stuck in `Scheduled` on Kubernetes 1.36 (strict CRD numeric-format validation of VMI checksum status fields). ([release notes](https://github.com/kubevirt/kubevirt/releases/tag/v1.8.4)) ([**@lexfrei**](https://github.com/lexfrei) in #2940)
+  - Also fixes a gRPC connection leak in `virt-handler`'s `GetLauncherClient` that caused unbounded memory growth, socket accumulation and goroutine leaks, and closes **CVE-2026-35469** via a `moby/spdystream` bump.
+  - Adds missing metrics, recording rules and alerts for the virt components.
+
+* **Velero**: 1.17.0 → 1.18.1 (chart 11.0.0 → 12.0.3), with velero plugins moved to velero-1.18-compatible releases and `kubevirt-velero-plugin` v0.8.0 → v0.9.0. ([release notes](https://github.com/vmware-tanzu/velero/releases/tag/v1.18.0)) ([**@lexfrei**](https://github.com/lexfrei) in #2974)
+  - **Concurrent backup processing** — multiple backups now run simultaneously without interfering, a direct win on multi-tenant clusters.
+  - **Cache volumes for data movers** on restore (CSI snapshot data movement and fs-backup), so data-mover pods no longer fail on limited node ephemeral disk, and restore throughput improves.
+  - Incremental backup size is now observable for data-mover backups.
+  - v1.18.1 fixes list-scoping bugs that made restores, PodVolumeRestores and CSI PVC backups list across all namespaces instead of the install namespace, and migrates `VolumeGroupSnapshot` to `v1beta2` for Kubernetes 1.34+.
+
+* **Vertical Pod Autoscaler**: 1.3.0 → 1.5.0 (chart 10.0.0 → 11.1.1). ([release notes](https://github.com/kubernetes/autoscaler/releases/tag/vertical-pod-autoscaler-1.5.0)) ([**@lexfrei**](https://github.com/lexfrei) in #2975)
+  - **In-place pod resizing is promoted to Beta**, with fallback to eviction when an in-place update fails.
+  - **Deprecation:** `UpdateMode: Auto` is deprecated upstream, as is the humanized-memory flag.
+  - New metrics: failed eviction counters, `update_mode` labels on updater metrics, VPA name/namespace on resource-update counters; Prometheus bearer-auth support.
+  - Dependencies bumped for Kubernetes 1.34; several race conditions in the recommender and updater fixed.
+
+* **Harbor**: 2.14.2 → 2.15.1 (chart 1.18.2 → 1.19.1), plus PodDisruptionBudgets for core, portal, jobservice, nginx, registry, trivy and exporter. ([release notes](https://github.com/goharbor/harbor/releases/tag/v2.15.0)) ([**@scooby87**](https://github.com/scooby87) in #2966)
+  - New: tag-deletion option for garbage collection, per-project upstream-connection limits (`max_upstream_conn`) with UI, and per-endpoint CA certificate support for registry endpoints.
+  - Audit logging to the database can now be disabled at initialization.
+  - 2.15.1 fixes proxy-cache serve-local on remote-not-found, prevents background polling from renewing session TTL, redacts `redis_url_reg` from GC attributes, and refreshes photon base packages for CVEs.
+
+* **Keycloak**: 26.5.2 → **26.6.3**. ([release notes](https://github.com/keycloak/keycloak/releases/tag/26.6.0)) ([**@lexfrei**](https://github.com/lexfrei) in #2964)
+  - **JWT Authorization Grant** for external-to-internal token exchange using externally signed JWT assertions.
+  - **Federated client authentication**, removing the need to manage individual client secrets in Keycloak.
+  - **Workflows** for automating realm administrative tasks such as user and client lifecycle management.
+  - **Zero-downtime patch releases** — rolling updates within a minor stream without service downtime.
+
+* **LINSTOR**: linstor-server 1.33.2 → 1.33.3, linstor-csi v1.10.6 → **v1.11.2**. ([sources](https://github.com/LINBIT/linstor-server)) ([**@lexfrei**](https://github.com/lexfrei) in #2987)
+  - **Upgrade impact:** linstor-csi v1.11.2 rejects ReadWriteMany volumes on a non-DRBD storage class, which is why an empty tenant worker `nodeGroups[*].storageClass` now falls back to the application-level `replicated` class. See Breaking Changes.
+
+* **linstor-scheduler**: v0.3.2 → v0.3.6 (chart 0.2.3 → 0.3.1), re-vendored to upstream with the native admission webhook. ([sources](https://github.com/piraeusdatastore/helm-charts)) ([**@lexfrei**](https://github.com/lexfrei) in #3201)
+  - The admission webhook no longer strips unknown Pod fields — the `image` volume source and native-sidecar `restartPolicy` — which had broken KubeVirt containerDisk VMs and native sidecars.
+  - The webhook now reloads its TLS certificate after rotation instead of silently failing.
+  - Migration 52 deletes the old `linstor-scheduler-admission` Deployment so the new, differently-selected one can be created (a Deployment's `spec.selector` is immutable); `failurePolicy: Ignore` means the brief gap does not block Pod creation.
+
+* **FoundationDB operator**: v2.13.0 → **v2.30.0** (chart 0.2.0 → 0.3.0). ([release notes](https://github.com/FoundationDB/fdb-kubernetes-operator/releases/tag/v2.30.0)) ([**@lexfrei**](https://github.com/lexfrei) in #2992)
+  - Seventeen upstream releases of operator fixes and reconciliation improvements; the v2.30.0 release itself is a Go 1.26 toolchain and modernization pass.
+
+* **HAMi**: 2.8.1 → 2.9.0. ([release notes](https://github.com/Project-HAMi/HAMi/releases/tag/v2.9.0)) ([**@lexfrei**](https://github.com/lexfrei) in #2993)
+  - **HAMi-DRA (NVIDIA) is ready for use**; HAMi-core performance optimized and a HAMi-core mode added for Ascend devices.
+  - Volcano vGPU device plugin synced to 0.19 with CDI support; new vGPU-monitor `--metrics-bind-address` flag and Prometheus `ServiceMonitor` support in the chart.
+  - Resource-quota checking in the webhook, plus configurable webhook `namespaceSelector`/`objectSelector`.
+
+* **Percona Server for MongoDB operator**: 1.21.1 → **1.22.0**, with the managed CR moved to `crVersion: 1.22.0`. ([release notes](https://github.com/percona/percona-server-mongodb-operator/releases/tag/v1.22.0)) ([**@lexfrei**](https://github.com/lexfrei) in #2968)
+  - Sets the Kubernetes `appProtocol: mongo` on all services, so service meshes (Istio and friends) recognize MongoDB traffic and mTLS/cluster formation work without workarounds.
+  - Physical and logical **restore into a cluster with different replica-set names**, via `replsetRemapping` on `PerconaServerMongoDBRestore`.
+
+* **OpenBao**: v2.5.0 → **v2.5.1** (chart 0.25.3 → 0.25.7). ([release notes](https://github.com/openbao/openbao/releases/tag/v2.5.1)) ([**@lexfrei**](https://github.com/lexfrei) in #2991)
+  - **Security:** closes **CVE-2025-68121** (Go 1.25.7) and **CVE-2026-24051** (OpenTelemetry SDK 1.40.0).
+  - Fixes Auto Unseal failing when upgrading to v2.5.0 across AliCloud KMS, AWS KMS, Azure Key Vault, GCP Cloud KMS and OCI KMS.
+  - PKI no longer returns 500 until reload on a cancelled cache-invalidation context; irrevocable-lease revocation now decrements the lease count.
+  - **Note:** pre-v2.5.0 corrupt namespace identity groups are removed during unseal and must be recreated by an admin — look for `deleting corrupt group` in startup logs.
+
+* **CoreDNS**: chart 1.43.2 → 1.46.0 (upstream appVersion 1.12.3 → 1.13.1; the shipped image is deliberately held at v1.12.4 for kube-dns alignment). ([release notes](https://github.com/coredns/coredns/releases/tag/v1.13.0)) ([**@lexfrei**](https://github.com/lexfrei) in #3004)
+  - Upstream fixes a Corefile infinite loop on unclosed braces and an import-cycle issue, normalizes panics on invalid origins, and prevents reload deadlocks.
+
+* **csi-driver-nfs**: 4.11.0 → **4.13.3**. ([release notes](https://github.com/kubernetes-csi/csi-driver-nfs/releases/tag/v4.13.0)) ([**@lexfrei**](https://github.com/lexfrei) in #2967)
+  - **Security:** closes **CVE-2025-52881** and **CVE-2025-58181**; CSI sidecar images upgraded.
+
+* **OpenCost**: 1.111.0 → 1.120.3 (chart 1.41.0 → 2.5.23). ([sources](https://github.com/opencost/opencost-helm-chart)) ([**@lexfrei**](https://github.com/lexfrei) in #3000)
+
+* **NATS**: 2.11.8 → 2.11.10 (chart 1.3.13 → 1.3.16). ([sources](http://github.com/nats-io/k8s)) ([**@lexfrei**](https://github.com/lexfrei) in #2976)
+
+* **ouroboros**: 0.8.0 → 0.8.1. The controller rollout strategy is now rendered identically in every `controller.mode`, so switching a live release into external-dns mode no longer fails server-side apply with `spec.strategy.rollingUpdate: Forbidden` ([sources](https://github.com/lexfrei/ouroboros)) ([**@lexfrei**](https://github.com/lexfrei) in #3323).
+
+* **Managed Kubernetes patch versions** refreshed to v1.35.6, v1.34.9, v1.33.13 and v1.32.13; v1.30 removed from the support matrix ([**@lexfrei**](https://github.com/lexfrei) in #3014).
+
+* **Grafana** 11.6.15, **victorialogs-datasource** v0.14.1 → v0.28.0, and **alerta-web** 9.1.0 in the monitoring stack ([**@lexfrei**](https://github.com/lexfrei) in #3011).
+
+* **Kamaji** rebuilt on 26.3.6-edge with the datastore unused-deletion deadlock fix and Go stdlib/module CVEs closed (#3033, #3146).
+
+* **New system packages:** `etcd-operator-crds` (v1alpha2 CRDs, installed ahead of the controller) and `securitygroup-controller` (backs the new `SecurityGroup` API).
+
+## Major Features and Improvements
+
+* **[kubernetes] Bootstrap tenant workers with Talos via CABPT**: See Feature Highlights — Ubuntu + kubeadm worker bootstrap is replaced by Talos Linux driven by `cluster-api-bootstrap-provider-talos` and a `talos-csr-signer` sidecar in the Kamaji control-plane pod; existing clusters roll over automatically ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #2931).
+
+* **[platform] Migrate to etcd-operator v1alpha2**: See Feature Highlights — new `etcd-operator.cozystack.io/v1alpha2` Membership API, Cozystack-authored operator chart at v0.5.2, snapshot/BackupClass-driven backup flow, and in-place adoption of legacy clusters via migration 50 ([**@androndo**](https://github.com/androndo) in #2859).
+
+* **[etcd] Complete the v1alpha2 transition for in-cluster 1.5→1.6 upgrades**: Keeps the legacy `etcd-headless` Service alive so adopted members stay resolvable, deletes the pre-1.6 operator Deployment via a pre-upgrade hook to get past the immutable selector, raises the operator's memory floor so it does not OOM before the VPA scales it, and makes the adoption migration robust in-cluster ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #3270).
+
+* **[api] Add the SecurityGroup network policy resource (`sdn.cozystack.io`)**: See Feature Highlights — a tenant-facing, namespace-scoped firewall that attaches to managed applications by reference and projects 1:1 onto a `CiliumNetworkPolicy`, letting tenants manage network policy without `cilium.io` access ([**@lexfrei**](https://github.com/lexfrei) in #2922).
+
+* **[tenant] Recursive (hierarchical) resource quotas for sub-tenants**: See Feature Highlights — a sub-tenant's quota is carved out of its parent's remaining budget and can no longer exceed it; sub-tenants without a quota share the parent's pool ([**@kvaps**](https://github.com/kvaps) in #3086).
+
+* **[apps/kubernetes] Per-cluster OIDC selector for the tenant kube-apiserver (Phase 1)**: See Feature Highlights — `spec.oidc.mode: System | CustomConfig | None` plus `spec.oidc.users[]`, with a ready-to-use `oidc-kubeconfig` Secret surfaced through the dashboard ([**@IvanHunters**](https://github.com/IvanHunters) in #3044).
+
+* **[monitoring] Per-instance OIDC selector for the Grafana instance (Phase 1)**: See Feature Highlights — the same flat `spec.oidc.mode` selector for Grafana, with app-side role reconciliation into Grafana's Main Org ([**@IvanHunters**](https://github.com/IvanHunters) in #3176).
+
+* **[kubernetes] Expose tenant apiserver authentication in app values**: Adds `controlPlane.apiServer.extraArgs`, `extraVolumes` and `extraVolumeMounts` passthrough to `KamajiControlPlane`, so operators can enable OIDC or a structured `AuthenticationConfiguration` on tenant clusters by hand. Volume sources are restricted to ConfigMap and Secret, since the control-plane pod runs on the management cluster ([**@lexfrei**](https://github.com/lexfrei) in #3123).
+
+* **[kubernetes] Propagate remote-accessible LINSTOR StorageClasses to tenant clusters**: Infra-cluster LINSTOR StorageClasses whose `allowRemoteVolumeAccess` is not `"false"` are auto-created inside each tenant under the same name, with the class named by `storageClass` (default `replicated`) becoming the tenant default and the legacy `kubevirt` class kept as an alias so existing PVCs are unaffected. Node-local classes are not propagated. Delete any hand-made colliding tenant class before upgrading ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #2872).
+
+* **[platform, ingress] Propagate the operator wildcard certificate to per-tenant termination points**: See Feature Highlights — `publishing.certificates.wildcardSecretName` is now replicated into every tenant namespace that terminates TLS, with no extra operator input and no cross-namespace Secret read ([**@lexfrei**](https://github.com/lexfrei) in #2990).
+
+* **[platform] ACME wildcard certificate on the default ingress-nginx path**: Opt-in `publishing.certificates.wildcard` (default `false`) issues one `*.<root-host>` certificate via a DNS-01 solver for system services instead of a per-host ACME certificate, avoiding Let's Encrypt rate limits at scale ([**@lexfrei**](https://github.com/lexfrei) in #2988).
+
+* **[keycloak] Optional KMS-encrypting database proxy**: Column-level PII encryption at rest with a static KEK or Vault Transit; off by default ([**@kvaps**](https://github.com/kvaps) in #3003). Extended with Vault Kubernetes and AppRole auth, a dedicated ServiceAccount, and a shared DEK set covering migration and HA ([**@sircthulhu**](https://github.com/sircthulhu) in #3239).
+
+* **[keycloak] Opt-in separate hostname and route for the admin console**: `ingress.adminHost` serves the admin console and Administration REST API on their own hostname, and `publishing.ingressNameAdmin` attaches that route to a separate (e.g. private) Gateway or ingressClass. Disabled by default ([**@sircthulhu**](https://github.com/sircthulhu) in #2954).
+
+* **[keycloak] S3 backup for the CNPG database**: Optional Barman-based S3 backups of the Keycloak database under `backup.*`, disabled by default ([**@kvaps**](https://github.com/kvaps) in #3174).
+
+* **[keycloak] Configurable login theme via platform branding**: Select the realm login theme and ship its theme image through `branding.loginTheme` / `branding.loginThemeImage` ([**@lexfrei**](https://github.com/lexfrei) in #3124).
+
+* **[keycloak] Allow overriding the database host/port/properties**: `db.host`, `db.port` and `db.urlProperties` plus `extraVolumes`/`extraVolumeMounts`, so the database connection can be routed through an external proxy ([**@sircthulhu**](https://github.com/sircthulhu) in #2907).
+
+* **[keycloak] Enable the UPDATE_EMAIL required action in the cozy realm**: Users can now change their own email address from the account portal ([**@kvaps**](https://github.com/kvaps) in #3175).
+
+* **[release] Immutable tags and rc→stable promotion**: See Feature Highlights — a stable release is the byte-identical promotion of its release candidate, with every force-retag site removed and the cron patch-release workflow deleted ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #3017). A companion **Cut Pre-release Tag** workflow covers the rc side (#3253).
+
+* **[operator] Support private OCI registry credentials for the platform source**: New `--platform-source-secret` flag (and `cozystackOperator.platformSourceSecret` value) authenticates the platform package source against private OCI registries (`kubernetes.io/dockerconfigjson`) and private Git repositories (basic auth, bearer token, or SSH key). An empty value preserves the existing public-registry behaviour ([**@IvanHunters**](https://github.com/IvanHunters) in #2472).
+
+* **[apps/kubernetes] Overridable Talos image factory URL and installer repository**: `talos.imageFactoryURL` and `talos.installerRepository` (both defaulting to the public factory) let air-gapped, mirrored or rate-limited environments serve the worker OS image and installer from their own infrastructure ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #3244).
+
+* **[kubernetes] Per-node-group nodeHealthCheck overrides**: Optional `nodeGroups[name].maxUnhealthy` and `nodeGroups[name].nodeStartupTimeout`, falling back to the cluster-wide `nodeHealthCheck.*` when unset — so a stateful group can sit at `0%` while a stateless one tolerates `50%`. An invalid override fails the render naming the offending group ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #3053).
+
+* **[kamaji] Default to 2 replicas and drop the telemetry webhook**: The Kamaji controller now runs two replicas with soft pod anti-affinity, and the telemetry handler and webhook entry are removed — cutting apiserver admission p99 for `TenantControlPlane` mutating/validating webhooks by roughly 70% on multi-tenant clusters ([**@mattia-eleuteri**](https://github.com/mattia-eleuteri) in #2671).
+
+* **[kubevirt-cdi] Make cloneStrategyOverride configurable**: CDI's clone strategy is now settable from values (default `csi-clone`), so operators on storage backends without efficient CSI cloning can select a different strategy ([**@mattia-eleuteri**](https://github.com/mattia-eleuteri) in #2926).
+
+* **[cozy-lib] CA-only TLS trust-anchor helper for tenants**: A new `cozy-lib.tls.caCertSecret` helper renders a `ca.crt`-only Opaque Secret surfaced through the tenant-secret API, so a tenant can verify a per-app TLS endpoint without being granted read access to any object that also carries a private key — the foundation the per-app TLS series builds on ([**@lexfrei**](https://github.com/lexfrei) in #2989).
+
+* **[dashboard] Vendor the cozystack-ui console into the monorepo**: The console SPA is now built from in-tree source under `packages/system/dashboard/images/console` rather than a separate repository. The shipped image and digest are unchanged for cluster operators ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #2963).
+
+## Improvements (minor)
+
+* **[api] Return typed apierrors from TenantNamespace registry helpers**: The TenantNamespace API now returns `401 Unauthorized` for requests without a user identity and a structured `500 InternalError` for RBAC lookup failures, instead of a generic 500 ([**@lexfrei**](https://github.com/lexfrei) in #2870).
+
+* **[platform] Factor the cozystack-version stamp into a shared migration helper**: Every migration now stamps `cozystack-version` through one labeled helper, so the `platform.cozystack.io/no-delete` label can no longer be silently dropped by a label-less apply — which would have removed the ConfigMap from the deletion-protection policy ([**@lexfrei**](https://github.com/lexfrei) in #2980, [**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #3118).
+
+* **[dashboard] Show the LoadBalancer external IP on the app Services tab**: Externally published services now display their assigned IP in the console instead of leaving the operator to look it up with kubectl ([**@scooby87**](https://github.com/scooby87) in #3172).
+
+* **[dashboard] Render error and unknown-type states instead of an infinite spinner**: The console now shows a not-found message on a failed application GET and an unknown-type message for an unrecognized resource ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #3098).
+
+* **[objectstorage-controller] Converge BucketClaim readiness and speed up COSI failover**: `BucketClaim` readiness now converges to the backend Bucket, and single-replica COSI provisioner failover is faster ([**@lexfrei**](https://github.com/lexfrei) in #3034).
+
+* **[etcd] Pin tenant etcd to v3.5.31**: Restores consistent watches by letting kube-apiserver enable `RequestWatchProgress` on Kubernetes 1.35 tenants ([**@lexfrei**](https://github.com/lexfrei) in #3122).
+
+## Bug fixes
+
+* **[seaweedfs] Close the 4.31 rename fallout on the 1.5.x→1.6 upgrade path**: The 1.6 upgrade no longer renames a SeaweedFS instance away from its data. The naming guard now runs in the chart a platform upgrade actually re-renders and refuses when both pre- and post-4.31 naming generations exist; `hack/seaweedfs-naming-audit.sh` and [`docs/operations/seaweedfs-431-rename-recovery.md`](../operations/seaweedfs-431-rename-recovery.md) guide recovery, and the refusal is expected for tenants that passed through 1.5.x. Cluster-scoped COSI RBAC is named per namespace again (the 4.31 release-based names collided across tenants), and the `seaweedfs-db` hand-over now runs for **every** instance name — previously an instance not named `seaweedfs` had its filer metadata database pruned on upgrade. New migration 53 repairs clusters that already ran the old hand-over ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #3339).
+
+* **[seaweedfs] Adopt legacy workloads in place across the 4.31 rename**: Pins `fullnameOverride: seaweedfs` so upgrading past the vendored 4.31 chart bump adopts the existing workloads and volumes instead of standing up a second, empty cluster beside them ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #3282).
+
+* **[seaweedfs] Point S3 consumers at the reachable S3 service**: The S3 ingress backend, the iceberg ingress backend and the in-cluster COSI provisioner endpoint all resolved a stale name or the wrong port, so the external S3 endpoint returned 503 through ingress-nginx and in-cluster COSI paths hit port 443 or the filer service. All consumers now resolve `seaweedfs-s3` on port 8333 *(shipped in v1.5.2)* ([**@lexfrei**](https://github.com/lexfrei) in #3119).
+
+* **[seaweedfs] Configure the postgres2 connection pool for the filer**: Removes roughly 2s of per-request S3 latency caused by PostgreSQL connection churn *(shipped in v1.5.3)* ([**@mattia-eleuteri**](https://github.com/mattia-eleuteri) in #2906).
+
+* **[seaweedfs] Raise master probe timeouts above the cluster-status backoff**: A master with a transiently empty raft view is no longer killed into a permanent CrashLoop, which could time out the whole SeaweedFS install ([**@lexfrei**](https://github.com/lexfrei) in #3068).
+
+* **[seaweedfs] Soften master anti-affinity for small clusters**: The hard master anti-affinity becomes a preference, so the S3 stack installs on clusters with fewer than three nodes ([**@lexfrei**](https://github.com/lexfrei) in #3197).
+
+* **[kubernetes] Make the default md0 node group removable**: The built-in `md0` node group is applied only when no node groups are configured, so it can finally be removed or replaced; migration 47 pins `md0` explicitly on existing clusters to preserve their topology ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #2936).
+
+* **[apps/kubernetes] Honour nodeGroup minReplicas in MachineDeployment.spec.replicas**: The chart stops managing `spec.replicas` — the cluster-autoscaler owns it, seeded by CAPI's defaulting webhook from the min-size annotation and preserved through SSA field-manager ownership. `helm upgrade` no longer drains workers back to a hardcoded `replicas: 2` on every platform bump ([**@IvanHunters**](https://github.com/IvanHunters) in #3233).
+
+* **[kubernetes] Run the Talos reconcile Job in the main install phase**: Creating the worker `TalosConfigTemplate` from a main-phase Job instead of a post-install hook makes worker MachineDeployments scale reliably during install ([**@lexfrei**](https://github.com/lexfrei) in #3145).
+
+* **[kubernetes] Default worker disk storageClass to the application storageClass**: A node group leaving `storageClass` empty now falls back to the application-level (DRBD `replicated`) class rather than the management-cluster default, so live migration of worker VMs gets the ReadWriteMany volume it requires ([**@lexfrei**](https://github.com/lexfrei) in #3129).
+
+* **[kubernetes] Make node group resources optional when instanceType is set**: A node group sized purely by `instanceType` no longer fails schema validation with "missing property 'resources'"; the unsupported combination of `instanceType` plus explicit `resources` is rejected at render time instead *(shipped in v1.5.2)* ([**@lexfrei**](https://github.com/lexfrei) in #3121).
+
+* **[kubernetes] Clear the Kamaji datastore-secret finalizer to unblock namespace deletion**: The leftover `finalizer.kamaji.clastix.io/datastore-secret` on the datastore-config Secret is now cleared during tenant teardown, so deleting a Kubernetes app or tenant no longer leaves the namespace stuck `Terminating` ([**@scooby87**](https://github.com/scooby87) in #3078).
+
+* **[kubernetes] Gate the vmop cert-manager-crds dependency on certManager.enabled**: Clusters running `monitoringAgents.enabled=true` with `certManager.enabled=false` had victoria-metrics-operator permanently blocked on a HelmRelease that would never exist, cascading to `monitoring-agents` and `vertical-pod-autoscaler` never becoming ready *(shipped in v1.5.2)* ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #3130).
+
+* **[apps/kubernetes] Bound the pre-delete hook's tenant HelmRelease wait**: Tenant Kubernetes teardown no longer hangs when the cluster has no working nodes — the pre-delete hook bounds its wait for the in-tenant HelmReleases and force-clears their Flux finalizers on timeout ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #2826).
+
+* **[kamaji] Backport the datastore unused-deletion deadlock fix**: Deleting a Tenant whose etcd DataStore had no more referencing TenantControlPlanes left the DataStore stuck `Terminating`, hanging the etcd Helm uninstall and wedging the tenant namespace. Backports clastix/kamaji#1122 as a source patch on the pinned build *(shipped in v1.5.2)* ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #3146).
+
+* **[tenant] Inherit the full ancestor label chain from the parent namespace**: Tenant namespaces now carry the complete `tenant.cozystack.io/<ancestor>` chain (including `tenant-root`) at any nesting depth, restoring root-ingress reachability to nested tenants; migration 49 backfills the labels on existing clusters ([**@IvanHunters**](https://github.com/IvanHunters) in #2912).
+
+* **[tenant] Grant the watch verb to the cleanup Role**: Tenant deletion no longer hangs on the pre-delete hook, which needed `watch` to wait; the hook also moves to a maintained kubectl image ([**@lexfrei**](https://github.com/lexfrei) in #2923).
+
+* **[tenant] Gate VM-resource HelmReleases on victoria-metrics-operator readiness**: The tenant `etcd`, `ingress` and `monitoring` releases create VictoriaMetrics-operator CRs behind a `failurePolicy: Fail` webhook; on cold installs they could reconcile before the webhook was serving and fail with "connection refused". They now `dependsOn` the operator *(shipped in v1.5.2)* ([**@lexfrei**](https://github.com/lexfrei) in #3141).
+
+* **[monitoring] Surface missing VictoriaLogs and gate the dead-end vlinsert ExternalName**: A missing platform VictoriaLogs is now reported as not-ready instead of being masked, and the dangling `vlinsert-generic` ExternalName no longer silently drops logs. Adds a `monitoring.rootEnabled` platform value that operators must set to match their actual `Tenant/root` `spec.monitoring` ([**@scooby87**](https://github.com/scooby87) in #3215).
+
+* **[mariadb] Re-guard replication so single-replica passes the operator webhook**: Replication is enabled only for `replicas > 1`, matching the mariadb-operator validating webhook, so single-replica instances can be created again; the dashboard, RBAC and backups now target the bare service for single-replica setups *(shipped in v1.5.2)* ([**@scooby87**](https://github.com/scooby87) in #3180).
+
+* **[mariadb] Derive my.cnf sizing from the instance's own resources**: `my.cnf` is now sized from the instance's own CPU, memory and volume instead of hardcoded values assuming a large dedicated host — small presets previously advertised `max_connections=4096` they could not serve; the limit now scales with memory from the server default of 151 ([**@lexfrei**](https://github.com/lexfrei) in #3345).
+
+* **[mariadb] Widen the startup probe budget so bootstrap cannot be killed**: A slow first boot can no longer leave the datadir permanently unusable ([**@lexfrei**](https://github.com/lexfrei) in #3344).
+
+* **[mariadb] Bind the metrics exporter to IPv4**: The exporter's readiness probe is reachable again and the metrics endpoint populates reliably ([**@lexfrei**](https://github.com/lexfrei) in #3064).
+
+* **[kafka] Set entity-operator resources to avoid OOM under the tenant LimitRange**: The topic- and user-operator containers carried no requests/limits, so the 128Mi tenant `LimitRange` default OOMKilled them on startup — leaving `KafkaTopic`/`KafkaUser` objects unreconciled and topics stuck on the topic-operator finalizer during teardown *(shipped in v1.5.2)* ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #2934).
+
+* **[harbor] Preserve the jobservice and trivy storageClass on upgrade**: The wrapper never forwarded `storageClass` to the jobservice `jobLog` PVC, so it picked up the cluster default via admission — and because PVC `storageClassName` is immutable, that produced rendered-vs-live drift on every upgrade. Both now preserve an existing PVC's class via lookup *(shipped in v1.5.2)* ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #2930).
+
+* **[postgres] Purge a stale recovery cluster on repeat in-place restore**: A repeat in-place restore no longer silently succeeds without restoring — a recovery cluster left over from an earlier completed restore is purged so the restore re-bootstraps from the backup ([**@IvanHunters**](https://github.com/IvanHunters) in #3318).
+
+* **[keycloak] Point HTTPRoute backends at the service port**: Fixes Gateway API routing to Keycloak, which targeted the wrong port ([**@lllamnyp**](https://github.com/lllamnyp) in #3235).
+
+* **[kubevirt-instancetypes] Restore persistent EFI/TPM state**: v1.5.1 stripped persistent EFI/TPM from the `windows.11`, `windows.2k22` and `windows.2k25` preferences because the RWO backend-storage PVC pinned VMs to a node and blocked live migration. RWO-Filesystem backend storage already live-migrates on KubeVirt v1.4+, so persistence is restored *(dropped in v1.5.1 via #3006, restored in v1.5.3)* ([**@kvaps**](https://github.com/kvaps) in #3154).
+
+* **[gateway] Pin identical allowedRoutes.kinds on port 443 listeners**: All port-443 listeners now carry identical `allowedRoutes.kinds=[HTTPRoute,TLSRoute]`, preventing Cilium (cilium#45559) from collapsing the HTTPS-terminate and TLS-passthrough listeners and silently dropping HTTPRoutes ([**@shreyaabaranwal**](https://github.com/shreyaabaranwal) in #3084).
+
+* **[platform] Route OIDC backend calls through the in-cluster Keycloak by default**: `authentication.oidc.keycloakInternalUrl` now defaults to the in-cluster Keycloak Service, so enabling OIDC on a fresh install no longer leaves the dashboard down while the root ingress is not yet serving ([**@lexfrei**](https://github.com/lexfrei) in #3289).
+
+* **[platform] Order backupstrategy-controller after cozystack-basics**: On a fresh install the `cozy-backups` Bucket could race `tenant-root` namespace creation and fail, which then raced the install-wait deadline and failed unrelated fresh installs *(shipped in v1.5.2)* ([**@lexfrei**](https://github.com/lexfrei) in #3037).
+
+* **[platform] Make `*-rd` sources depend on cozystack-engine**: Fixes an install-ordering race where resource-definition sources reconciled before the engine that serves them ([**@lexfrei**](https://github.com/lexfrei) in #3041).
+
+* **[cozystack-basics] Validate legacy Ingress hostnames against the tenant apex**: Legacy Ingress hostnames in tenant namespaces are now constrained to the tenant's apex domain, closing a cross-tenant hostname-claim gap ([**@lexfrei**](https://github.com/lexfrei) in #3200).
+
+* **[operator] Force source-watcher drift on a stuck ArtifactGenerator status**: `cozystack-platform` could time out at 15m on fresh install when a PackageSource's derived ArtifactGenerator stalled in `Ready: Unknown` despite its artifacts being produced — an upstream `patch.Helper` race (fluxcd/pkg#934) that loses the Ready-condition write under etcd load. The reconciler now detects the stuck signature and forces source-watcher onto its drifted-branch reconcile ([**@IvanHunters**](https://github.com/IvanHunters) in #3182).
+
+* **[fluxcd] Omit empty distribution.artifact in FluxInstance for guest clusters**: Guest Kubernetes clusters with the fluxcd addon enabled no longer fail to install; an empty distribution artifact is omitted so the operator uses its embedded manifests instead of rendering an invalid null ([**@IvanHunters**](https://github.com/IvanHunters) in #3284).
+
+* **[flux] Tune source-watcher concurrency and CPU**: Prevents the platform install from timing out under load ([**@lexfrei**](https://github.com/lexfrei) in #3163).
+
+* **[vertical-pod-autoscaler] Migrate admission-controller TLS to cert-manager**: The in-chart `genCA`/`genSignedCert` templates are not idempotent, so every Flux reconcile minted a fresh certificate, flipped a checksum annotation and materialised a new ReplicaSet — producing 10+ ReplicaSets in minutes under load and livelocking the admission controller on its own election lease. A namespace-scoped cert-manager Issuer and Certificate replace them, with pod rotation keyed off the actual `tls.crt` content ([**@IvanHunters**](https://github.com/IvanHunters) in #3178).
+
+* **[cert-manager] Raise the cainjector memory limit**: CA injection into webhook `caBundle`s no longer fails under memory pressure, which previously surfaced as intermittent `x509: certificate signed by unknown authority` admission errors ([**@IvanHunters**](https://github.com/IvanHunters) in #3199).
+
+* **[cert-manager] Move the webhook off the kubelet's port**: The admission webhook no longer listens on port 10250, which the kubelet also serves — a connection misrouted to a node answered with the kubelet's certificate, failing every cert-manager admission call cluster-wide with a misleading x509 error ([**@lexfrei**](https://github.com/lexfrei) in #3359).
+
+* **[external-secrets] Move the webhook off the kubelet's port**: Same class of collision; the Service also targets the port by name so the move rolls out without an admission gap ([**@lexfrei**](https://github.com/lexfrei) in #3360).
+
+* **[metrics-server] Move the listener off the kubelet's port**: The default made hostNetwork mode unable to start at all; the new port also keeps node-port collisions out of the metrics path ([**@lexfrei**](https://github.com/lexfrei) in #3361).
+
+* **[cilium] Pass IPv6 to the kernel stack when the IPv6 datapath is disabled**: Node IPv6 (ICMPv6 Neighbor Discovery, BGP unnumbered over link-local) now works with the host firewall enabled — Cilium host policies apply to IPv4 only and node IPv6 is not filtered ([**@lexfrei**](https://github.com/lexfrei) in #2871).
+
+* **[kube-ovn] Raise the ovs-ovn CPU limit and request**: The co-located `ovn-controller`, `ovsdb-server` and `ovs-vswitchd` daemons get CPU headroom (limit 4 cores, request 100m) under burst installs ([**@lexfrei**](https://github.com/lexfrei) in #3050).
+
+* **[linstor] Set controller resource requests and relax the liveness probe**: The linstor-controller no longer crash-loops under node CPU contention, which previously left its Service with no endpoints and blocked RWX volume provisioning ([**@lexfrei**](https://github.com/lexfrei) in #3043).
+
+* **[opensearch-operator] Gate leader election on replica count**: Leader election is disabled on the single-replica operator Deployment, so a transient apiserver or etcd latency spike no longer crashloops the manager at install time; it re-enables automatically past one replica ([**@lexfrei**](https://github.com/lexfrei) in #3040).
+
+* **[monitoring-agents] Relax fluent-bit probes for loaded installs**: The DaemonSet no longer crash-loops on a loaded install when its `:2020` HTTP server binds late behind a busy kube-API ([**@lexfrei**](https://github.com/lexfrei) in #3045).
+
+* **[velero] Add a startupProbe so slow startup does not crashloop the install gate**: Velero's slow first start no longer trips the liveness probe and fail the platform install ([**@lexfrei**](https://github.com/lexfrei) in #3138).
+
+* **[kubevirt-cdi] Order behind cozystack-basics**: The `cdi-clone-dv` RoleBinding now finds `cozy-public`, fixing a cold-install ordering failure ([**@lexfrei**](https://github.com/lexfrei) in #3137).
+
+* **[vm-default-images] Refresh stale Alpine and openSUSE 16.0 image URLs**: Alpine moves 3.21.6 → 3.21.7 and the openSUSE Leap 16.0 URL is corrected, so default-image imports stop 404ing ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #3063).
+
+* **[apps/vpn] Remove the invalid `foo` field from the urls Secret**: A stray field broke Helm upgrades under server-side apply ([**@IvanHunters**](https://github.com/IvanHunters) in #3281).
+
+* **[dashboard] Unbreak CORS on an expired session for Kubernetes API calls**: The dashboard SPA no longer fails with CORS errors after the `kc-access` cookie expires — oauth2-proxy returns 401 (not 302) for `/api` and `/apis`, and the KeycloakClient declares `webOrigins: ["+"]` ([**@IvanHunters**](https://github.com/IvanHunters) in #2788).
+
+* **[dashboard] Join pod phase on (namespace, pod) instead of uid**: Fixes the Capacity Planning and Namespaces dashboards failing with "duplicate time series" errors when static pods are present ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #2782).
+
+* **[cozy-lib, harbor, mariadb] Digest-pin the cleanup-hook kubectl image and route it through cozy-lib.images-registry**: The post-delete cleanup hook image is now digest-pinned and resolved through the cluster images registry via a new `cozy-lib.image` helper, so mirrored and air-gapped installs can resolve it and uninstall no longer depends on a moving Docker Hub tag ([**@scooby87**](https://github.com/scooby87) in #3171).
+
+* **[migrations] Derive the etcd-adoption snapshot target from the projected bucket credentials**: Migration 50 resolves its S3 endpoint and scheme from the claimed bucket's projected Secret rather than requiring them hand-set, and makes the `etcdAdoptSkipBackup` escape hatch actually reachable from the Package CR ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #3335).
+
+## Security
+
+* **[talos] Bump Talos to v1.13.6 (CVE-2026-53359)**: Ships Linux 6.18.38 with the kernel fixes for the **CVE-2026-53359** and **CVE-2026-46113** KVM guest-to-host escapes ([**@lexfrei**](https://github.com/lexfrei) in #3240).
+
+* **[kubernetes] Bump tenant worker Talos to v1.13.6**: The same kernel fixes reach tenant worker VMs — the KVM shadow-paging use-after-free and nested-guest escape into the worker VM. Nested virtualization remains available; applying this rolls each tenant worker pool once ([**@lexfrei**](https://github.com/lexfrei) in #3269).
+
+* **[seaweedfs] Enforce read-only bucket access by bumping cosi-driver to v0.3.1**: The bundled COSI driver hardcoded read-write S3 permissions for every `BucketAccess` and ignored the `-readonly` `BucketAccessClass`, so credentials meant to be read-only could still upload and delete objects. The driver now honours `accessPolicy: readonly` and issues Read/List-only credentials *(shipped in v1.5.2)* ([**@lexfrei**](https://github.com/lexfrei) in #3136).
+
+* **[platform] Raise the Go toolchain to 1.26 across first-party images**: Clears standard-library security advisories in every Cozystack-built binary ([**@lexfrei**](https://github.com/lexfrei) in #2941).
+
+* **[deps] Bump golang.org/x/crypto to v0.52.0**: Closes 13 known OSV advisories (GO-2026-5005 through GO-2026-5033) ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #3019).
+
+* **[kamaji] Close Go stdlib and module CVEs in the shipped binary**: Rebuilds the pinned Kamaji binary on a patched toolchain and module set ([**@lexfrei**](https://github.com/lexfrei) in #3033).
+
+* **[build] Refresh first-party Alpine runtime bases to 3.24**: Clears the musl and zlib advisories across Cozystack-built images ([**@lexfrei**](https://github.com/lexfrei) in #3009).
+
+* **[kilo] Rebuild the kilo image on current upstream and Alpine 3.24**: Clears the libpng advisories ([**@lexfrei**](https://github.com/lexfrei) in #3007).
+
+* **[ci] Harden GitHub Actions workflows for OpenSSF Scorecard**: Pins every action by commit SHA, scopes per-job `GITHUB_TOKEN` permissions to least privilege, and adds a `zizmor` gate (pre-commit plus PR workflow) that blocks future regressions ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #3223, #2849, [**@kvaps**](https://github.com/kvaps) in #3227).
+
+* **[ci] Enable Renovate digest pinning and OSV vulnerability alerts**: Base images and GitHub Actions are pinned to digests, indirect Go dependencies are bumped, and OSV alerts are enabled — improving the Scorecard Pinned-Dependencies and Vulnerabilities scores ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #3025, #3026).
+
+## Dependencies & version updates
+
+See **Platform Components** above for the components with user-visible upstream changes. The remaining version work in this release:
+
+* **[linstor] Bump linstor-server to 1.33.3 and linstor-csi to v1.11.2**: Carries the RWX-on-non-DRBD rejection that drives the worker storageClass fallback (see Breaking Changes) ([**@lexfrei**](https://github.com/lexfrei) in #2987).
+* **[images] Bump opencost, multus and clickhouse-backup**: OpenCost to 2.5.23, multus-cni to v4.3.0 and clickhouse-backup to 2.7.2 ([**@lexfrei**](https://github.com/lexfrei) in #3000), with clickhouse-backup later refreshed to v2.7.4 ([**@app/renovate**](https://github.com/apps/renovate) in #3226).
+* **[images] Refresh stale utility image references**: kube-rbac-proxy v0.22.0, matchbox v0.11.0 and alpine/k8s 1.36.2 ([**@lexfrei**](https://github.com/lexfrei) in #2969).
+* **[kubernetes] Re-pin the deleted centos:stream9 digest for kubevirt-csi-driver**: Upstream deleted the pinned base-image digest, breaking the kubevirt-csi-driver build; re-pinned twice as the upstream tag moved again ([**@IvanHunters**](https://github.com/IvanHunters) in #3303, [**@androndo**](https://github.com/androndo) in #3386).
+* **[deps] Renovate updates**: kubevirt/csi-driver digest to 27b52aa (#3066), actions/checkout to v6.0.3 (#3133), and a batch of container image and action digests (#3232) ([**@app/renovate**](https://github.com/apps/renovate)).
+
+## System Configuration
+
+A sweep of platform components that previously ran without resource requests or limits — and therefore inherited namespace `LimitRange` defaults or ran unbounded — now declare them explicitly:
+
+* **[reloader] Set resources requests/limits on the reloader container** ([**@matthieu-robin**](https://github.com/matthieu-robin) in #2631).
+* **[metrics-server] Set resources requests/limits on the metrics-server container** ([**@matthieu-robin**](https://github.com/matthieu-robin) in #2630).
+* **[external-dns] Set resources requests/limits on the external-dns container** ([**@matthieu-robin**](https://github.com/matthieu-robin) in #2629).
+* **[bootbox] Add resources requests/limits to the matchbox container** ([**@matthieu-robin**](https://github.com/matthieu-robin) in #2625).
+* **[bucket] Add resources requests/limits to the s3manager container** ([**@matthieu-robin**](https://github.com/matthieu-robin) in #2624).
+* **[goldpinger] Set resources requests/limits on the goldpinger DaemonSet** ([**@matthieu-robin**](https://github.com/matthieu-robin) in #2623).
+* **[cert-manager] Set resources requests/limits on cert-manager pods** ([**@matthieu-robin**](https://github.com/matthieu-robin) in #2616).
+* **[kubernetes] Add CPU/memory limits to the csi-resizer sidecar** ([**@matthieu-robin**](https://github.com/matthieu-robin) in #2614).
+
+## Development, Testing, and CI/CD
+
+* **[e2e] Migrate the app suite from BATS to Chainsaw and wire it into CI**: The managed-application end-to-end suite moves to Chainsaw, giving declarative, per-resource assertions in place of shell scripting ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #2826).
+
+* **[e2e] Diff-driven install selector `select-install.sh`**: Computes the minimal package install set for a diff-scoped E2E run by walking the forward PackageSource dependency closure, with a `--validate` graph-consistency mode ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #3279).
+
+* **[ci] Require an API-owner review for sizeable API changes**: A PR that introduces a new API group, a new resource, or a breaking change to an existing API schema now requires a review from an API owner. The detector discovers CRDs and APIService registrations by content rather than directory name, and builds from the base-branch tip when the merge base predates the gate ([**@lllamnyp**](https://github.com/lllamnyp) in #3167, #3184, [**@lexfrei**](https://github.com/lexfrei) in #3193).
+
+* **[ci] Guard migrations.targetVersion against a silent skip**: A CI check now catches a migration added without bumping `targetVersion`, which would otherwise ship a migration that never runs ([**@IvanHunters**](https://github.com/IvanHunters) in #2771).
+
+* **[build] Parallel matrix image builds on ephemeral runners**: Image builds fan out across an ephemeral-runner matrix instead of serializing on one host ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #2983).
+
+* **[ci] Move remaining workflows off the persistent self-hosted runner**: All CI jobs now run on ephemeral or GitHub-hosted runners; release tag builds warm-start from the shared registry build cache ([**@kvaps**](https://github.com/kvaps) in #3268).
+
+* **[ci] Overlay current-main images for packages a PR did not rebuild**: PR e2e and the installer artifact now run current-main images for untouched packages instead of the last release's, so a PR is tested as current-main plus its own changes ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #3148).
+
+* **[ci] Move the install gate to a 32 vCPU runner**: Ends the CPU oversubscription that produced most of the install-phase flakes ([**@lexfrei**](https://github.com/lexfrei) in #3251).
+
+* **[e2e] Stop the install pipeline flaking**: A combined pass over VPA OOM/churn and wait budgets across the install pipeline ([**@kvaps**](https://github.com/kvaps) in #2957).
+
+* **[e2e] Make the in-sandbox Talos image cache reachable by tenant workers**: Fixes deterministic `kubernetes-*` E2E failures where worker CDI importers could not reach the sandbox image cache ([**@lexfrei**](https://github.com/lexfrei) in #3254).
+
+* **[e2e] Escalate the cilium leak healer to an agent restart on leaked-IP reuse**: The only reliable recovery from a Cilium endpoint-manager IP leak under pod churn ([**@lexfrei**](https://github.com/lexfrei) in #3051), with the reserved:ingress IP variant skipped (#3142).
+
+* **[testing] Refresh the e2e-sandbox tools and base**: Ubuntu 24.04, kubectl 1.33.13, talosctl 1.13.5, Helm 3.21.2 ([**@lexfrei**](https://github.com/lexfrei) in #3010).
+
+* **[tests] Make bats assertions and hooks actually run under cozytest**: Negative assertions now fail as intended and dead `setup`/`teardown` hooks execute, closing a class of silently-passing tests ([**@lexfrei**](https://github.com/lexfrei) in #3132, #3134, #3131).
+
+* Additional E2E and CI work: capture host→pod CNI data-plane on failure (#3047), capture LINSTOR satellite ErrorReports in cozyreport (#3209), wait for LINSTOR pool free capacity between tenant Kubernetes tests (#3210), gate the LINSTOR node-list probe on a ready controller endpoint (#3250), drain tenant VMs/PVCs between kubernetes tests (#3159), widen tenant-root monitoring bring-up waits (#3160), widen etcd convergence and FoundationDB status budgets (#3036, #3039), raise the kafka/zookeeper preset off the 128Mi OOM threshold (#3052), bump the sandbox tenant storage quota to 200Gi (#3206), make the hairpin DNS check tolerate a tenant node recycle (#3241), size the e2e tenant apiserver to the chart default (#3351), fix the etcd metrics-probe attach race (#3350), drop the serviceexposure Chainsaw suite left after the feature removal (#3336), drop duplicate package test targets (#3352), route PR base-image pulls through mirror.gcr.io (#3042), remove the redundant Release E2E workflow (#2978), prune stale and redundant workflows (#2982), fix the backport workflow's `conflict_resolution` nesting (#3155), drop the pr-labeler `edited` trigger (#3211), map dashboard/console and cert-manager/external-secrets/metrics-server scopes in the labeler (#3117, #3362), add `needs-triage` on new issues and new area labels (#3165), force `chore(deps)` commits and an `area/dependencies` label from Renovate (#3015), resolve the nightly packages digest without image-specific skopeo operations (#3332), mirror and retag images whose digest is embedded in the values `tag` or whose registry host lives outside `repository` — ten images across eight packages were being silently skipped, so nightly published references that 404 at install and promoted releases did not carry the `:<version>` tags they claimed (#3375), pin the console image builder to pnpm 11.1.2 (#3099), and block hard-wrapped prose in markdown and GitHub bodies (#3297).
+
+## Documentation
+
+* **[docs/security] Add a design-level threat model**: New `docs/security/threat-model.md` describing trust boundaries and attacker models for the platform ([**@lexfrei**](https://github.com/lexfrei) in #3217).
+
+* **[docs/security] Add a security self-assessment**: New `docs/security/self-assessment.md` prepared for the CNCF incubation due diligence ([**@tym83**](https://github.com/tym83) in #3224), alongside an alignment pass on the existing security docs and a new incident-response document (#3225).
+
+* **[docs] Route bugs, features, and proposals to the right repository**: Issue templates and contribution docs now direct reporters to the correct Cozystack repository ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #2854).
+
+* **[vm-instance] Document attaching a VM to an external VLAN**: New `docs/vm-external-vlan.md` covering the Linux-bridge and bridge-type `NetworkAttachmentDefinition` path ([**@lexfrei**](https://github.com/lexfrei) in #3196).
+
+* **[harbor] Fix the SeaweedFS discovery key described as an annotation**: It is the `namespace.cozystack.io/seaweedfs` namespace **label** ([**@lexfrei**](https://github.com/lexfrei) in #3293).
+
+* **[readme] Add the OpenSSF Scorecard badge** ([**@tym83**](https://github.com/tym83) in #3237).
+
+* **[docs/agents] Add a downstream repository checklist to the PR template** ([**@lexfrei**](https://github.com/lexfrei) in #3298).
+
+* **[docs/release] Publish the patch-release changelogs**: The generated changelogs for v1.4.5, v1.5.1 and v1.5.2 land in `docs/changelogs/` so the release history on `main` is complete ([**@app/cozystack-ci**](https://github.com/apps/cozystack-ci) in #3083, #3024, #3162).
+
+* **[website] Multi-language proof-of-concept (ru, de, zh-cn, hi)**: Wires four additional languages into the site — localized landing page, getting-started guide, support page and navigation — with key-parity and translation-freshness lint, non-ratified localizations excluded from search indexing, and SEO blocks per language ([**@tym83**](https://github.com/tym83) in cozystack/website#593).
+
+* **[website] Tenant network isolation post (Cilium eBPF + Kube-OVN VPC)**: Explains how Cozystack isolates tenant traffic across the two data planes ([**@tym83**](https://github.com/tym83) in cozystack/website#614, cover image in cozystack/website#620).
+
+* **[website] CVE-2026-53359 (Januscape) advisory and Talos fix guide**: A security advisory for the KVM guest-to-host escape plus a step-by-step Talos remediation guide ([**@tym83**](https://github.com/tym83) in cozystack/website#603, cozystack/website#604, cozystack/website#612).
+
+* **[website] CVE-2026-43499 (GhostLock) exposure assessment**: Documents whether and how Cozystack clusters are exposed ([**@tym83**](https://github.com/tym83) in cozystack/website#613).
+
+* **[website] Call for independent Cozystack adopters for the CNCF Incubation review** ([**@tym83**](https://github.com/tym83) in cozystack/website#624).
+
+* **[website] Simplify the backup guides around the default BackupClass**: Corrects the admin override path and the platform-package `backupStorage` documentation for both `next` and v1.5 ([**@androndo**](https://github.com/androndo) in cozystack/website#622).
+
+* **[website] Document host firewall and node IPv6 behavior**: Explains that Cilium host policies apply to IPv4 only and node IPv6 is passed to the kernel stack ([**@lexfrei**](https://github.com/lexfrei) in cozystack/website#574).
+
+* **[website] Document the `existingSecret` certificate mode and `wildcardSecretName`**: Corrects the publishing reference and documents the third certificate mode ([**@lexfrei**](https://github.com/lexfrei) in cozystack/website#615, cozystack/website#619).
+
+* **[website] Drop the manual KubeVirt patch step for GPU passthrough**: The platform now auto-wires `permittedHostDevices`, so the manual patch documented since v1.4 is obsolete; includes pre-upgrade migration steps for hand-edited entries ([**@lexfrei**](https://github.com/lexfrei) in cozystack/website#556).
+
+* **[website] Explain why packages live in `apps` vs `extra`** ([**@kvaps**](https://github.com/kvaps) in cozystack/website#594).
+
+* **[website] cozyvalues-gen in the developer guide; sync the external apps guide with the example repo** ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in cozystack/website#610).
+
+* **[website] talm: encrypted user values and dry-run secret redaction** ([**@lexfrei**](https://github.com/lexfrei) in cozystack/website#590).
+
+* **[website] Refresh the telemetry snapshot to June 2026 and fix per-period tenants** ([**@tym83**](https://github.com/tym83) in cozystack/website#598).
+
+The following documentation shipped in the v1.5.x patch releases and is included for completeness:
+
+* **[website] Add a containerized GPU workloads guide**: Operations guide for the `container` variant of `cozystack.gpu-operator` *(shipped in v1.5.2)* ([**@lexfrei**](https://github.com/lexfrei) in cozystack/website#555).
+* **[website] Warn against changing `op:` on the Talos machine files block**: Talos rejects `op: create` for files outside `/var`, so the `/etc/lvm/lvm.conf` entry must keep `op: overwrite` *(shipped in v1.5.2)* ([**@lexfrei**](https://github.com/lexfrei) in cozystack/website#575).
+* **[website] Document talm chart drift detection and strict mode** *(shipped in v1.5.2)* ([**@lexfrei**](https://github.com/lexfrei) in cozystack/website#577).
+* **[website] Document `publishing.certificates` wildcard options** *(shipped in v1.5.2)* ([**@lexfrei**](https://github.com/lexfrei) in cozystack/website#588).
+* **[website] Correct stale version pins and prevent next.yaml drift** *(shipped in v1.5.2)* ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in cozystack/website#589).
+* **[website] Cozystack v1.5.0 release announcement** *(shipped in v1.5.2)* ([**@tym83**](https://github.com/tym83) in cozystack/website#592).
+
+## Other Repositories
+
+### talm v0.33.0 / v0.33.1
+
+* **[talm] Detect vendored chart and preset-template drift**: `talm` now warns when the vendored charts in a project drift from the talm binary's embedded library, and detects preset-template drift via a new `.talm-preset.lock` file (commit it). `talm init --update` becomes an exact re-sync that names the drifted paths, and `strictCharts: true` / `--strict-charts` escalates warnings to hard failures — blocking on unverifiable or missing drift baselines rather than passing silently. CRLF line endings are treated as checkout artifacts, not drift ([**@lexfrei**](https://github.com/lexfrei) in cozystack/talm#216).
+* **[talm] Disable and then restore KVM nested virtualization in the Talos presets**: v0.33.0 disabled nested virtualization in the `cozystack` preset as an immediate mitigation for **CVE-2026-53359**, pinning `grubUseUKICmdline=false` so the kernel args actually apply on Talos v1.12+. v0.33.1 reverts that mitigation now that the Talos v1.13.6 kernel carries the upstream fix — so nested virtualization is available again on a patched fleet ([**@lexfrei**](https://github.com/lexfrei) in cozystack/talm#224, cozystack/talm#225).
+
+### talm v0.32.0 *(shipped in v1.5.2)*
+
+* **[talm] First-class encrypted user values, honored at template and apply**: A value file named `*.encrypted.yaml` referenced from `templateOptions.valueFiles` is age-decrypted in memory at both `talm template` and `talm apply`, with `talm init --encrypt`/`--decrypt` covering `values-secret.yaml` ↔ `values-secret.encrypted.yaml`. Secret-bearing fields are redacted by default from rendered node files, stdout and the apply drift preview, with `--show-secrets`/`--show-secrets-in-drift` to reveal them ([**@lexfrei**](https://github.com/lexfrei) in cozystack/talm#222).
+
+### ansible-cozystack v1.5.1 / v1.5.2 / v1.5.3
+
+* **[ansible-cozystack] Make prepare and k3s.orchestration runnable as separate invocations**: The example playbooks can now be run as independent steps rather than requiring a single combined invocation ([**@kvaps**](https://github.com/kvaps) in cozystack/ansible-cozystack#52).
+* **[ansible-cozystack] Track the cozy-installer and k3s versions**: The installer image is bumped to v1.5.1, v1.5.2 and v1.5.3 in step with the Cozystack patch releases, and k3s to v1.36.2+k3s1 ([**@app/renovate**](https://github.com/apps/renovate) in cozystack/ansible-cozystack#56, cozystack/ansible-cozystack#57, cozystack/ansible-cozystack#58, cozystack/ansible-cozystack#59).
+
+## Contributors
+
+We'd like to thank all contributors who made this release possible:
+
+* [**@androndo**](https://github.com/androndo)
+* [**@IvanHunters**](https://github.com/IvanHunters)
+* [**@kvaps**](https://github.com/kvaps)
+* [**@lexfrei**](https://github.com/lexfrei)
+* [**@lllamnyp**](https://github.com/lllamnyp)
+* [**@mattia-eleuteri**](https://github.com/mattia-eleuteri)
+* [**@matthieu-robin**](https://github.com/matthieu-robin)
+* [**@myasnikovdaniil**](https://github.com/myasnikovdaniil)
+* [**@scooby87**](https://github.com/scooby87)
+* [**@shreyaabaranwal**](https://github.com/shreyaabaranwal)
+* [**@sircthulhu**](https://github.com/sircthulhu)
+* [**@tym83**](https://github.com/tym83)
+
+### New Contributors
+
+We're excited to welcome our first-time contributor:
+
+* [**@shreyaabaranwal**](https://github.com/shreyaabaranwal) - First contribution!
+
+**Full Changelog**: https://github.com/cozystack/cozystack/compare/v1.5.0...v1.6.0
diff --git a/docs/changelogs/v1.6.1.md b/docs/changelogs/v1.6.1.md
new file mode 100644
index 0000000000..94f690f505
--- /dev/null
+++ b/docs/changelogs/v1.6.1.md
@@ -0,0 +1,72 @@
+<!--
+https://github.com/cozystack/cozystack/releases/tag/v1.6.1
+-->
+
+# v1.6.1 (2026-08-05)
+
+A patch release with seven fixes covering PostgreSQL, etcd, managed Kubernetes, Keycloak, `cozystack-basics`, and SeaweedFS, plus release-pipeline reliability fixes and a `talm` update adding declarative Talos preset knobs.
+
+## Fixes
+
+* **fix(postgres-operator): align CNPG operator and CRDs to 1.28.2 for PVC resize-deadlock fix**: A simultaneous `resources` + `size` change on a single-instance PostgreSQL cluster could make the CloudNativePG operator delete the sole primary Pod, classify the PVC as `resizing`, and never recreate the Pod — wedging the cluster with zero instances and leaving the filesystem resize incomplete. Bumping the operator image and CRDs together to 1.28.2 (which carries upstream's fix, cloudnative-pg#9980 / cloudnative-pg#9981) resolves the deadlock ([**@scooby87**](https://github.com/scooby87) in #3510, backport #3542).
+
+* **chore(etcd-operator): bump etcd-operator to v0.5.4**: Rolls up four upstream controller bug fixes: the operator no longer exempts the bootstrap seed from crash-loop self-heal, self-heal now also covers memory-backed etcd members, `--initial-cluster-state` is derived from cluster phase instead of the seed, and each EtcdCluster's PodDisruptionBudget switches from `maxUnavailable` to `minAvailable` (existing clusters are reconciled onto the new field automatically on upgrade). Tenant etcd clusters recover more reliably from member crashes and are less likely to have their PDB block a node drain ([**@androndo**](https://github.com/androndo) in #3529, backport #3538).
+
+* **fix(kubernetes): render the talos-reconcile Job for the default md0 group**: On a managed Kubernetes cluster left with the default (undeclared) `nodeGroups`, the Job that creates each worker's `TalosConfigTemplate` and patches the control-plane's cert SANs only iterated the user-supplied node-group map, so it silently skipped the implicit `md0` group. Nothing failed at install time, since `md0` defaults to zero replicas, but the first scale-up (for example, autoscaler-driven growth after enabling ingress-nginx) left new Machines permanently blocked with no matching `TalosConfigTemplate`. The Job now iterates the same helper that produces the `MachineDeployment`, so `md0` gets its reconcile Job like any explicitly declared group ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #3535, backport #3536).
+
+* **fix(keycloak-configure): patch HelmRelease in release namespace on teardown**: The `keycloak-configure` pre-delete Job cleared the Flux `HelmRelease` finalizer in a hardcoded namespace that did not match where the release actually installs (`cozy-keycloak`), so its `ServiceAccount` was forbidden to patch it, the Job retried forever, and the `HelmRelease` stuck in `Terminating` — blocking any uninstall or reinstall of Keycloak. The teardown Job now templates both the release name and namespace from the Helm release itself, so teardown completes correctly ([**@lexfrei**](https://github.com/lexfrei) in #3372, backport #3478).
+
+* **fix(cozystack-basics): gate the hostname VAP policies on the VAP API**: The hostname `ValidatingAdmissionPolicy` templates rendered unconditionally, so a first install on a cluster where the `ValidatingAdmissionPolicy` API is unavailable dropped the policies permanently — a later cluster upgrade that gains the API would not bring them back. The templates are now gated on `.Capabilities.APIVersions.Has`, so they render only where the API exists and are picked up automatically once it becomes available ([**@lexfrei**](https://github.com/lexfrei) in #3409, backport #3442).
+
+* **fix(seaweedfs): make naming audit fail closed on kubectl and payload errors**: `hack/seaweedfs-naming-audit.sh`, used by operators to classify SeaweedFS instances before the naming-migration cleanup, was fail-open — any `kubectl` failure or unreadable Helm release payload produced an empty result table indistinguishable from a genuinely clean fleet. Since the runbook uses this script as the gate before deleting old PVCs, a transient API error could have green-lit destroying live data. Every query now fails loudly on error instead of silently reporting "nothing found," and incomplete evidence now falls back to a conservative "direction cannot be established" verdict rather than a wrong deletion candidate ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #3436, backport #3474).
+
+* **chore(release): don't activate `kubernetes-nodes` on the release-1.6 line**: The `kubernetes-nodes` app package was not ready to ship on the 1.6 line, so its single include is removed from the `iaas` platform bundle — the platform stops activating the package on this line while its code, API types, and `kubernetes-nodes-rd` system package are all kept intact for when it is ready ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #3437).
+
+## Development, Testing, and CI/CD
+
+* **ci(release): carry the finalize fixes onto the 1.6 line**: `release-1.6` was cut before three release-pipeline fixes landed on `main`: dropping `persist-credentials` on checkout (which had let a stale `GITHUB_TOKEN` silently win over the app token, so the stable tag push created no workflow run and the automated changelog/docs backstops never fired, as happened for v1.6.0), publishing the GitHub release with the merged changelog as its body instead of a placeholder, and dropping a `paths-ignore` filter that could drop a changelog-only promotion PR. All three are backported so v1.6.1 releases correctly with real release notes ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #3530).
+
+* **fix(ci): overlay images from the PR base branch, and publish per-line artifacts**: PR validation always overlaid unbuilt packages from `cozystack-packages:main`, so a `release-1.6` PR was tested against `main`'s controller binaries against its own line's charts — which is exactly what made #3437 above fail install deterministically with a schema-validation error. Each maintained `release-X.Y` branch now builds and publishes its own packages artifact, and PR validation overlays from the artifact matching the PR's own base branch ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #3471, backport #3514).
+
+* **fix(release): make promote-retag digest verification media-type-agnostic**: The v1.6.0 finalize run aborted partway through promoting rc images to stable tags because its post-copy digest check used `skopeo inspect --format '{{.Digest}}'`, which prints nothing for OCI artifacts like `cozystack-packages`, leaving most repositories without a stable tag and skipping the installer publish. The digest is now computed as the sha256 of the raw manifest, which works identically for container images and OCI artifacts, so promotion can no longer abort mid-way on this class of artifact ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #3435, backport #3473).
+
+## Other repositories
+
+### talm v0.34.0
+
+* **[talm] feat(charts): add preset value knobs**: Exposes `timeServers`, control-plane component `extraArgs`, `registryMirrors`, per-host `registryTLS`, multiple Layer2 `vips`, `network.preserveExisting`, and `network.extraLinks` (bonds, VLANs, extra addresses and routes) as values on the cozystack, generic, and talm presets, so a node's Talos machine config can be described declaratively instead of via a template fork. Every knob defaults empty and a stock render stays byte-identical; each input Talos would reject fails fast at render time with a hinted error ([**@lexfrei**](https://github.com/lexfrei) in cozystack/talm#232).
+
+* **[talm] chore(deps): migrate to Helm 4 and drop the cozystack/talos fork**: Moves talm's vendored Helm template engine from v3 to v4 and drops the `cozystack/talos` fork (carried solely for a `--skip-verify` flag, now reimplemented locally), tracking stock upstream Talos v1.13.7. Golden render snapshots confirm the generated machine config is unchanged for users ([**@lexfrei**](https://github.com/lexfrei) in cozystack/talm#231).
+
+## Documentation
+
+* **[website] feat(blog): add Cozystack 1.6 release and Blockstor announcement**: Publishes the v1.6.0 release-announcement blog post — covering Talos Linux tenant workers, tenant-controlled OIDC, the `SecurityGroup` API, hierarchical quotas, and in-place etcd-operator adoption — alongside a companion post announcing the open-sourcing of Blockstor, the LINSTOR-compatible storage control plane ([**@tym83**](https://github.com/tym83) in cozystack/website#641).
+
+* **[website] chore(blog): repair front matter, links and bundle names**: Follow-up cleanup on the two new blog posts, fixing front matter, internal links, and page bundle names ([**@tym83**](https://github.com/tym83) in cozystack/website@4b5d1ad).
+
+* **[website] chore: upgrade Hugo to 0.164.0 and convert HTML content to markdown**: Upgrades the site generator to Hugo 0.164.0, requiring Node 22 under its new node permission model, and converts remaining raw-HTML content to markdown along the way, keeping the site buildable on current tooling ([**@tym83**](https://github.com/tym83) in cozystack/website#636).
+
+* **[website] chore(blog): make the two taxonomy axes disjoint**: Cleans up the blog's tagging so its two taxonomy axes no longer overlap, making blog post categorization and filtering more consistent ([**@tym83**](https://github.com/tym83) in cozystack/website#635).
+
+* **[website] docs(talm): describe the preset value knobs for network and registries**: Documents the new `talm` preset value knobs (cozystack/talm#232) for time servers, control-plane extra args, registry mirrors and TLS, VIPs, and network links, so operators can find the declarative equivalents to a template fork ([**@lexfrei**](https://github.com/lexfrei) in cozystack/website#633).
+
+* **[website] feat(hack): generate docs from a pre-tag ref and fail loudly on fetch errors**: Hardens the docs-generation tooling to build from a pinned pre-tag ref and to fail loudly instead of silently on a fetch error, reducing the chance of publishing docs generated from the wrong ref ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in cozystack/website#631).
+
+* **[website] docs(backups): document PostgreSQL point-in-time recovery (PITR)**: Adds documentation for PostgreSQL point-in-time recovery, covering how to configure and perform a PITR restore for managed PostgreSQL clusters ([**@androndo**](https://github.com/androndo) in cozystack/website#629).
+
+* **[website] docs: update managed apps reference for v1.6.0**: Refreshes the managed applications reference pages to match what shipped in v1.6.0 ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in cozystack/website#628).
+
+* **[website] docs(monitoring): add OIDC authentication guide for Grafana**: Adds a guide for configuring OIDC single sign-on authentication for per-instance Grafana, complementing v1.6.0's tenant OIDC support ([**@IvanHunters**](https://github.com/IvanHunters) in cozystack/website#597).
+
+## Contributors
+
+Thanks to everyone who contributed to this patch release:
+
+* [**@IvanHunters**](https://github.com/IvanHunters)
+* [**@androndo**](https://github.com/androndo)
+* [**@lexfrei**](https://github.com/lexfrei)
+* [**@myasnikovdaniil**](https://github.com/myasnikovdaniil)
+* [**@scooby87**](https://github.com/scooby87)
+* [**@tym83**](https://github.com/tym83)
+
+**Full Changelog**: https://github.com/cozystack/cozystack/compare/v1.6.0...v1.6.1
diff --git a/docs/changelogs/v1.6.2.md b/docs/changelogs/v1.6.2.md
new file mode 100644
index 0000000000..a6f0a8c845
--- /dev/null
+++ b/docs/changelogs/v1.6.2.md
@@ -0,0 +1,50 @@
+<!--
+https://github.com/cozystack/cozystack/releases/tag/v1.6.2
+-->
+
+# v1.6.2 (2026-08-19)
+
+A patch release with six fixes covering the backup-strategy controller, kube-ovn's webhook certificate, Velero CRD upgrades, CNPG barman-cloud backups, `flux-shard-operator`, and the published OpenAPI definitions, plus a release-pipeline reliability fix.
+
+## Fixes
+
+* **fix(backupstrategy-controller): repair lookup-gated backup objects**: The default backup `Strategy` CRs and the Velero `BackupStorageLocation` are gated on a Helm `lookup` performed while the referenced object is still being created; when that lookup came back empty the objects were skipped permanently, since helm-controller does not re-render a release whose chart and values are unchanged. The gate now resolves the default bucket credentials Secret through the RESTMapper, bounds each check, and tolerates an absent Secret instead of looping, so the default backup objects are created reliably instead of silently vanishing for months ([**@mattia-eleuteri**](https://github.com/mattia-eleuteri) in #3524, backport #3731).
+
+* **fix(kube-ovn): reload kubeovn-webhook serving certificate on cert-manager renewal**: `kube-ovn-webhook` loaded its TLS serving certificate once at startup and never re-read it; once cert-manager renewed the backing Secret and the old certificate expired, the apiserver's calls to the webhook failed verification and, because the `MutatingWebhookConfiguration` uses `failurePolicy: Fail`, every pod creation in tenant namespaces was rejected — including `virt-launcher` pods, blocking VMI startup. The webhook now serves its certificate through a reloading callback that re-reads the key pair when the mounted files change and widens `renewBefore` to 720h, so cert-manager renewals are honored without a pod restart ([**@IvanHunters**](https://github.com/IvanHunters) in #3557, backport #3730).
+
+* **fix(velero): apply CRD updates on upgrade via CreateReplace**: Velero's CRDs stayed frozen at whatever version was first installed, since Helm never touches a chart's `crds/` directory on upgrade; when the Velero image moved to a version that added new backup phases, the apiserver rejected phase transitions against the stale CRDs and backups silently stopped while the HelmRelease stayed green. The Velero package now opts into `upgradeCRDs: CreateReplace`, so CRDs are kept current on upgrade and backups keep working ([**@lexfrei**](https://github.com/lexfrei) in #3727, backport #3728).
+
+* **fix(backups): request S3 checksum only when required for barman-cloud (non-AWS S3 / Ceph RGW)**: CNPG's barman-cloud plugin sidecar defaulted to computing a flexible checksum on every upload, which several S3-compatible backends (Ceph RGW, some MinIO / Cloudflare R2 builds) reject outright, so every backup and WAL-archive upload to those backends failed and `ScheduledBackup`s never stored anything. Every barman-cloud `ObjectStore` Cozystack creates — Keycloak's system DB, the postgres app's backup and recovery stores, and the platform-managed system-bucket store — now sets `AWS_REQUEST_CHECKSUM_CALCULATION=when_required`, a safe default accepted by both AWS S3 and the affected backends ([**@androndo**](https://github.com/androndo) in #3417, backport #3767).
+
+* **fix(flux-shard-operator): repair sharded helm-controller crashloop behind an HTTP proxy**: The cloned `helm-controller-shard<i>` Deployment inherited `HTTP_PROXY`/`HTTPS_PROXY`/`NO_PROXY` from the flux-aio all-in-one wiring even though a standalone shard needs no external egress; behind an unreachable proxy the controller's blocking startup HTTPS call never completed, the manager never served `/healthz`, and every HelmRelease sharded to that controller was frozen. The sanitisation now also drops the inherited proxy env and adds a `startupProbe` derived from the liveness handler, so sharded HelmReleases keep reconciling in proxied environments instead of crashlooping forever ([**@IvanHunters**](https://github.com/IvanHunters) in #3546, backport #3818).
+
+* **fix(api): declare OpenAPIModelName for core and sdn types**: The `core` and `sdn` API groups did not declare `OpenAPIModelName` the way the `apps` group already did, so their published OpenAPI definition names were Go import paths while every `$ref` pointing at them escaped each slash — the two spellings never matched, the reference dangled, and `kubectl apply --validate` failed on any resource against a `cozystack-api` built after the underlying Kubernetes 0.35 change. Declaring `OpenAPIModelName` for `core` and `sdn` too makes every published definition name the dotted Kubernetes model name, so client-side validation against the published OpenAPI works again ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #3808, backport #3812).
+
+## Development, Testing, and CI/CD
+
+* **ci(release): complete the candidate-aware promotion pipeline on release-1.6**: `release-1.6` was missing the e2e and packages-verification jobs that `Promote RC` requires on its target base, so `v1.6.1` was promoted with the rc e2e gate bypassed and the next patch release could not even be dispatched. Adds the `rc-e2e` job, the `verify-release-candidate` checks, `hack/verify-promoted-packages.sh`, `hack/validate-changelog.sh` and regression tests pinning the pipeline's contract, so future patch releases off `release-1.6` run the same e2e and package-verification gates as `main` before promoting, and the tag-time changelog is validated and ported from the tag rather than regenerated ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #3893).
+
+## Documentation
+
+* **[website] docs: import the operator guides that lived in the cozystack repo**: Moves the operator-facing guides that used to live in the `cozystack` repo over to the documentation site, so operators find them alongside the rest of the docs instead of scattered across two repositories ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in cozystack/website#648).
+
+* **[website] docs(oidc): document private CA and staging trust**: Documents how to configure tenant OIDC to trust a private certificate authority and staging certificates, closing a gap for operators running their own CA or testing with a staging issuer ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in cozystack/website#650).
+
+* **[website] feat(community): add a Community page and link it from the main menu**: Adds a Community page linked from the site's main menu, giving visitors a single place to find how to get in touch with and contribute to the Cozystack community ([**@tym83**](https://github.com/tym83) in cozystack/website#637).
+
+* **[website] chore(telemetry): publish July 2026 and explain how the figures are derived**: Publishes the July 2026 telemetry figures and documents how those figures are derived, giving the community visibility into adoption trends and how the numbers are calculated ([**@tym83**](https://github.com/tym83) in cozystack/website#644).
+
+* **[website] feat(blog): new Blockstor banner**: Adds a new banner promoting Blockstor to the blog, improving the visibility of the storage control plane's announcement ([**@tym83**](https://github.com/tym83) in cozystack/website#646).
+
+## Contributors
+
+Thanks to everyone who contributed to this patch release:
+
+* [**@IvanHunters**](https://github.com/IvanHunters)
+* [**@androndo**](https://github.com/androndo)
+* [**@lexfrei**](https://github.com/lexfrei)
+* [**@mattia-eleuteri**](https://github.com/mattia-eleuteri)
+* [**@myasnikovdaniil**](https://github.com/myasnikovdaniil)
+* [**@tym83**](https://github.com/tym83)
+
+**Full Changelog**: https://github.com/cozystack/cozystack/compare/v1.6.1...v1.6.2
diff --git a/docs/changelogs/v1.6.3.md b/docs/changelogs/v1.6.3.md
new file mode 100644
index 0000000000..333a736c12
--- /dev/null
+++ b/docs/changelogs/v1.6.3.md
@@ -0,0 +1,82 @@
+<!--
+https://github.com/cozystack/cozystack/releases/tag/v1.6.3
+-->
+
+# v1.6.3 (2026-09-03)
+
+A patch release with a security fix restricting access to the kube-ovn admission webhook, four bug fixes covering managed Kubernetes, ClickHouse, PostgreSQL and telemetry, a reworked Marketplace/Admin dashboard, configurable ClickHouse versions, a WorkloadMonitor bucket-metrics endpoint override, a Keycloak KMS proxy update and Vault CA support, plus `ansible-cozystack` dependency bumps and a batch of new documentation.
+
+## Security
+
+* **fix(kubeovn-webhook): restrict the webhook port to the API server**: The `kube-ovn-webhook` `/mutate-pods` handler returned namespace-derived annotations to any caller that could reach its serving port, and nothing previously stopped an arbitrary in-cluster pod from being that caller. A `CiliumNetworkPolicy` now denies pod and world traffic to the webhook's port while allowing only the API server (which runs on the host network), closing the exposure tracked as [GHSA-g883-q79m-8225](https://github.com/cozystack/cozystack/security/advisories/GHSA-g883-q79m-8225) without needing the client-certificate path, which the platform's current admission configuration cannot use ([**@kvaps**](https://github.com/kvaps) in #3955, backport #3975).
+
+## Features and Improvements
+
+* **feat(dashboard): rework the Marketplace entry point and the Admin portal**: The Console is now the dashboard's entry point instead of the Marketplace, so opening the dashboard shows what a tenant already runs rather than a "choose a product" landing page; the Marketplace opens the grouped application list directly, one click away. Administration (Tenants, Modules, External IPs, per-tenant Info) moves from Console into an always-visible Admin tab, while the two cluster-wide operator areas (Capacity, Backup Classes) keep their own gates. Tenants and Modules are now rendered as a tenant hierarchy tree instead of a flat table, so sub-tenants and inherited modules are visible instead of missing or erroring, and External IPs lists LoadBalancer services across every accessible tenant in one table. Secret values can be copied without being revealed on screen first ([**@kvaps**](https://github.com/kvaps) in #3928, backport #3952).
+
+* **feat(clickhouse): add configurable version parameter**: The ClickHouse server and Keeper images were hardcoded to `24.9.2.42`, so — unlike postgres, mariadb, mongodb, opensearch, rabbitmq and redis — ClickHouse instances carried no engine `version` in the Cozystack API. A `version` values key (`v25.8`, `v25.3`, `v24.9`, default `v24.9` for byte-identical existing renders) now selects the server and Keeper image tags, with `hack/update-versions.sh` refreshing the supported-version map from Docker Hub ([**@scooby87**](https://github.com/scooby87) in #3476, backport #4054).
+
+* **feat(workloadmonitor): bucket metrics endpoint override**: `cozystack-controller` meters S3 bucket sizes for billing by discovering a VictoriaMetrics endpoint through a namespace label, which assumed the monitoring stack scraping SeaweedFS always runs in the same cluster. A new `cozystackController.seaweedfsMetricsEndpoint` chart value lets a deployment point bucket-size queries at a remote Prometheus-compatible endpoint instead, with no behavior change when unset. This also fixes a latent billing bug where any metrics-query failure silently zeroed out recorded bucket sizes; the controller now retains the last known values and surfaces the failure via a `BucketMetricsUnavailable` event and error metrics instead of wiping billing data ([**@lllamnyp**](https://github.com/lllamnyp) in #3443, backport #3558).
+
+* **feat(keycloak): let the KMS proxy trust a private Vault CA**: The KMS-encrypting DB proxy could previously only reach a Vault whose certificate chains to a publicly trusted root, so a Vault behind an internal load balancer with a self-signed certificate was reachable only over plain HTTP. `encryption.kms.vault` now accepts a CA either inline as `caBundle` or via an existing `caSecretName`/`caSecretKey`, letting the proxy verify a private Vault over HTTPS; existing installations are unaffected when neither key is set ([**@sircthulhu**](https://github.com/sircthulhu) in #3874, backport #3981).
+
+## Fixes
+
+* **fix(postgres): let in-place restore re-bootstrap instead of wedging**: An in-place PostgreSQL `RestoreJob` (restoring an app back into itself) never came back up — the cluster stayed in `Setting up primary` with crash-looping recovery pods, or the HelmRelease upgrade failed outright. Two independent bugs in the restore patch caused this: the restored cluster's WAL-archive `serverName` collided with the recovery source's, and `useSystemBucket` stayed enabled alongside explicit restore S3 coordinates, tripping the chart's own compatibility guard. Both are fixed, so in-place restores now re-bootstrap to a healthy cluster instead of wedging ([**@androndo**](https://github.com/androndo) in #3959, backport #3988).
+
+* **fix(clickhouse): scheme the backup S3_ENDPOINT on the system-bucket flow**: On the default `useSystemBucket` backup flow, the ClickHouse chart passed a scheme-less host straight into the `clickhouse-backup` sidecar's `S3_ENDPOINT`, which `altinity/clickhouse-backup`'s AWS SDK endpoint resolver rejects outright — so every ClickHouse backup and restore on the default flow failed with `was not a valid URI`. The chart now prepends `https://` on that path, matching how the platform already schemes the equivalent endpoint for other backup strategies, so default-flow ClickHouse backups and restores work again ([**@androndo**](https://github.com/androndo) in #3963, backport #3987).
+
+* **fix(kubernetes): retry the tenant CNI install instead of uninstalling it**: The tenant Cilium HelmRelease had no install strategy, so Flux used its default `RemediateOnFailure`, which uninstalls Cilium — the tenant cluster's only CNI — between retry attempts whenever the initial install ran long (for example while waiting for the first worker node to register), then reinstalls it on the next attempt, repeating without end. The strategy is now `RetryOnFailure`, which keeps the applied manifests in place and retries a failed install as an upgrade, so the CNI is no longer torn down and the agent DaemonSet rolls out as soon as a worker registers ([**@lexfrei**](https://github.com/lexfrei) in #3552, backport #4033).
+
+* **fix(telemetry): make the documented opt-out cover both collectors**: Telemetry is reported by two components — `cozystack-operator` and `cozystack-controller` — but only the operator had a reachable opt-out switch; the documented `cozystackOperator.disableTelemetry` setting could never reach the controller, which kept posting application counts every 15 minutes even after an operator followed the published opt-out procedure. The platform chart now threads a `telemetry.disabled` key into the controller as well, so the documented opt-out actually disables both collectors ([**@kvaps**](https://github.com/kvaps) in #3791, backport #3916).
+
+## Dependencies
+
+* **chore(keycloak): bump KMS proxy to 0.2.2**: Updates `keycloak-kms-proxy` to v0.2.2 and pins the image to its published digest, fixing decryption for reads whose result set spans a join ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #3995, backport #3996).
+
+* **[ansible-cozystack] chore(deps): update k3s to v1.36.3+k3s1 and v1.36.4+k3s1**: Renovate dependency bumps of the k3s Kubernetes distribution used by the management-cluster bootstrap role ([**@app/renovate**](https://github.com/apps/renovate) in cozystack/ansible-cozystack#66, #69).
+
+* **[ansible-cozystack] chore(deps): track cozystack installer v1.6.2**: Renovate dependency bump of the `cozy-installer` Docker image tag to follow the latest Cozystack patch release ([**@app/renovate**](https://github.com/apps/renovate) in cozystack/ansible-cozystack#68).
+
+## Documentation
+
+* **[website] fix(telemetry): document the opt-out for both collectors**: Documents both opt-out steps now that the fix above threads `telemetry.disabled` through the platform, replacing the previously incomplete single-step procedure ([**@kvaps**](https://github.com/kvaps) in cozystack/website#651).
+
+* **[website] docs(home): refresh the screenshot gallery for the reworked console**: Retakes the home-page screenshot gallery against the reworked console (Marketplace, Modules, Tenants, Admin), replacing slides that showed a header and sidebar layout that no longer exist ([**@kvaps**](https://github.com/kvaps) in cozystack/website#662).
+
+* **[website] docs(images): refresh the product screenshot and its dark variant**: Retakes the standalone product screenshot referenced by the announcement post and outside links, which still showed a console two redesigns old ([**@kvaps**](https://github.com/kvaps) in cozystack/website#663).
+
+* **[website] feat(site): Live Demo — the real console, mocked, in the browser**: Adds a `/demo` page running the real `cozystack-ui` console with a mocked Kubernetes API, so a visitor can explore the actual marketplace and console without a cluster, signup, or install ([**@tym83**](https://github.com/tym83) in cozystack/website#669).
+
+* **[website] feat(demo): self-refreshing console demo + Resources nav grouping**: Adds the demo's source as an overlay with a weekly-refresh workflow so the mocked bundle tracks upstream `cozystack-ui` automatically, and groups secondary navigation links under a Resources menu ([**@tym83**](https://github.com/tym83) in cozystack/website#670).
+
+* **[website] fix(demo): embed console under site nav, fix refresh + deep create**: Fixes the live demo breaking on a hard refresh of any deep route by serving the SPA at a separate path and embedding it in an iframe under a real Hugo page, and keeps the site's own navigation visible above the demo ([**@tym83**](https://github.com/tym83) in cozystack/website#676).
+
+* **[website] fix(demo): create works for every catalog type**: Fixes demo creation hanging on an endless spinner for most marketplace types (Kubernetes cluster, FoundationDB, Harbor, MariaDB, and others) by resolving the mocked kind from the application catalog instead of a hardcoded list of seven types ([**@tym83**](https://github.com/tym83) in cozystack/website#677).
+
+* **[website] fix(page): render page title and fix top spacing on type:page pages**: Fixes page titles not rendering and content sitting flush against the navbar on `type: page` pages, most visible on the Compliance section ([**@tym83**](https://github.com/tym83) in cozystack/website#668).
+
+* **[website] docs(virtualization): guide for building a Windows golden image with Packer**: Adds a guide for building a Windows golden image with Packer on KubeVirt, covering the CDI clone flow and the published HashiCorp KubeVirt Packer plugin ([**@scooby87**](https://github.com/scooby87) in cozystack/website#666).
+
+* **[website] docs(compliance): add Kubernetes conformance results page**: Adds a Kubernetes conformance page documenting the platform's CNCF conformance runs, later extended with the v1.31 result and corrected submission scope ([**@tym83**](https://github.com/tym83) in cozystack/website#658, #660).
+
+* **[website] fix(blog): restore Community Meeting Calendar link in Wizard post**: Fixes an empty link in the Wizard announcement blog post ([**@tym83**](https://github.com/tym83) in cozystack/website#659).
+
+* **[website] docs(faq): drop the retired GitOps example**: Replaces a FAQ pointer to an archived, pre-1.0 GitOps example repository with a direct answer explaining that Cozystack applications are ordinary Kubernetes objects, so no platform-specific GitOps tooling is needed ([**@kvaps**](https://github.com/kvaps) in cozystack/website#661).
+
+* **[website] docs(licenses): list kuberture and ouroboros**: Adds `kuberture` and `ouroboros` — both shipped with the platform and maintained by a Cozystack maintainer — to the Licenses page, which otherwise only enumerates upstream components ([**@kvaps**](https://github.com/kvaps) in cozystack/website#649).
+
+## Contributors
+
+Thanks to everyone who contributed to this patch release:
+
+* [**@androndo**](https://github.com/androndo)
+* [**@kvaps**](https://github.com/kvaps)
+* [**@lexfrei**](https://github.com/lexfrei)
+* [**@lllamnyp**](https://github.com/lllamnyp)
+* [**@myasnikovdaniil**](https://github.com/myasnikovdaniil)
+* [**@scooby87**](https://github.com/scooby87)
+* [**@sircthulhu**](https://github.com/sircthulhu)
+* [**@tym83**](https://github.com/tym83)
+
+**Full Changelog**: https://github.com/cozystack/cozystack/compare/v1.6.2...v1.6.3
diff --git a/docs/changelogs/v1.6.4.md b/docs/changelogs/v1.6.4.md
new file mode 100644
index 0000000000..2858cd80a1
--- /dev/null
+++ b/docs/changelogs/v1.6.4.md
@@ -0,0 +1,154 @@
+<!--
+https://github.com/cozystack/cozystack/releases/tag/v1.6.4
+-->
+
+# v1.6.4 (2026-09-28)
+
+A patch release with backported fixes for VM live migration during eviction and scheduling, Kafka release deletion, KubeVirt-related billing labels, ingress client-IP trust, PostgreSQL-adjacent LINSTOR/CDI/ZFS reliability, MongoDB and RabbitMQ defaults, and a batch of e2e hardening, plus a new `talm` documentation site, an NVIDIA vGPU restore role for `ansible-cozystack`, and a large Marketplace documentation section on the website.
+
+## Fixes
+
+* **fix(cluster-api): backport live migration before host eviction**: `cluster-api-provider-kubevirt` now attempts live migration before falling back to drain and delete when a guest node is evicted, uses the guest node's own name for the drain fallback instead of the wrong identifier, and uncordons a recreated guest — so an eviction no longer forces an unnecessary VM restart when a live migration would have sufficed ([**@yankawai**](https://github.com/yankawai) in #4291, backport #4474).
+
+* **fix(kubeovn): retry VM migration setup after scheduling**: Retries the VM migration network setup when the target Pod or source/target scheduling information is not yet available, instead of failing outright, and folds the Kube-OVN image into the regular in-tree build matrix — so a migration that starts before Kube-OVN has finished scheduling both endpoints no longer aborts ([**@yankawai**](https://github.com/yankawai) in #4253, backport #4328).
+
+* **feat(kubevirt): expose migration configuration through platform values**: Cluster-wide KubeVirt migration settings (bandwidth per migration, parallel migrations per cluster, parallel outbound migrations per node) can now be set through the platform value `kubevirt.migrations` instead of hand-patching the generated `Package`, which the platform undoes on every render; leaving the value unset preserves existing defaults ([**@yankawai**](https://github.com/yankawai) in #4254, backport #4402).
+
+* **fix(linstor): add opt-in graceful satellite shutdown on Talos**: Adds an opt-in Talos satellite `preStop` hook that releases unused Secondary DRBD resources, ZFS zvols included, before the satellite stops, without forcing, demoting or calling the Kubernetes API. Enable it with `talos.gracefulShutdown.enabled` for sequential node maintenance; existing installations keep today's behavior by default, and the hook also runs on ordinary pod restarts so it should be enabled only where node restarts are serialized ([**@yankawai**](https://github.com/yankawai) in #4292, backport #4401).
+
+* **fix(workloadmonitor): populate VM instance-profile label from the KubeVirt preference annotation**: `WorkloadMonitor` read a `kubevirt.io/cluster-instanceprofile-name` annotation that KubeVirt never writes; the real annotation is `kubevirt.io/cluster-preference-name`. Reading the correct key means a VM's instance profile — a Windows guest, for example — now reaches the billing metric pipeline instead of being silently dropped ([**@IvanHunters**](https://github.com/IvanHunters) in #4448, backport #4454).
+
+* **fix(opensearch-operator): name the component reconciler a stall sits in**: The OpenSearch cluster controller now logs a watchdog report naming which of its nine component reconcilers has been running for over a minute, and keeps reporting on an interval while it stays stuck, instead of leaving a stalled reconcile with no trace in the operator log at all ([**@IvanHunters**](https://github.com/IvanHunters) in #4333, backport #4377).
+
+* **fix(manifestutil): report one message when the CRD wait is cancelled**: A CRD wait cut short by a cancelled context now always reports one error naming the CRD it was waiting on, instead of sometimes including the name and sometimes not, depending on which of two exit paths the scheduler happened to pick ([**@lexfrei**](https://github.com/lexfrei) in #3742, backport #4475).
+
+* **fix(kafka): delete release topics before the topic operator is removed**: Deletes release-owned `KafkaTopic`s with a pre-delete hook before the Strimzi topic operator is removed, and fixes the hook's own `--request-timeout` flag, which made it skip in-cluster credentials and fail every deletion outright. Together these mean a Kafka release with the `strimzi.io/topic-operator` finalizer no longer leaves stray topics behind on reinstall, and release deletion itself no longer wedges ([**@yankawai**](https://github.com/yankawai), [**@IvanHunters**](https://github.com/IvanHunters) in #3938, #4280, backport #4456).
+
+* **fix(ingress): trust CF-Connecting-IP only from Cloudflare ranges**: With `cloudflareProxy` enabled, `CF-Connecting-IP` is now trusted only from Cloudflare's published address ranges. Previously the ranges were passed under a key `ingress-nginx` ignores, so any client that reached the load balancer directly could set the header itself and bypass the ingress IP `whitelist` ([**@lexfrei**](https://github.com/lexfrei) in #4444, backport #4445).
+
+* **fix(apps): let the cleanup hooks watch the objects they delete**: The Harbor, ClickHouse, MariaDB and Qdrant cleanup hooks now wait for the objects they delete to actually disappear, with the wait bounded so a stuck claim cannot hang the whole uninstall ([**@yankawai**](https://github.com/yankawai) in #4135, backport #4369).
+
+* **fix(registry): preserve write options in aggregated storage**: The application, tenant-secret and security-group APIs now preserve Kubernetes write options (dry-run, field manager, field validation, delete propagation, grace periods, preconditions) when delegating to controller-runtime, instead of silently dropping them; a rejected write also keeps its machine-readable status, so a quota or admission failure now answers 403/409 with a reason instead of a generic 500 ([**@yankawai**](https://github.com/yankawai) in #3937, backport #4370).
+
+* **fix(dashboard): let dashboard users read backup CRD schemas**: Grants dashboard users read access to the backup CRD schemas, fixing the backup create/edit forms that previously returned 403 ([**@androndo**](https://github.com/androndo) in #4236, backport #4307).
+
+* **fix(backups): give the barman-cloud sidecar its own resources**: The barman-cloud sidecar previously had no resource requests or limits, so in tenant namespaces it inherited a 128Mi `LimitRange` default and was OOMKilled during backups even while the surrounding `ObjectStore` and `Cluster` stayed healthy. It now requests 100m/256Mi and is capped at 1Gi on both the chart and the platform's Go rendering path ([**@yankawai**](https://github.com/yankawai) in #4220, backport #4336).
+
+* **fix(linstor): reconnect only the stalled peer in the satellite plunger**: The satellite plunger disconnected a stalled DRBD peer but then tried to reconnect every peer of the resource at once, which failed with "Device has a net-config" for peers that were never disconnected and left the stalled one permanently unreconnected. It now reconnects only the peer pair it disconnected, so a stalled resync actually recovers ([**@yankawai**](https://github.com/yankawai) in #4184, backport #4319).
+
+* **fix(foundationdb): let tenant roles read the connection ConfigMap**: Tenants previously had no way to obtain their FoundationDB connection string: the cluster file lives in a ConfigMap tenant subjects could not read and the dashboard resource map did not expose. The ConfigMap is now in the dashboard resource map with a Role/RoleBinding granting the tenant `use` access level get/list/watch on it ([**@yankawai**](https://github.com/yankawai) in #4148, backport #4315).
+
+* **fix(opensearch): remove the data PVCs when the application is deleted**: Adds a post-delete hook that reclaims an OpenSearch application's data PVCs when it is removed, instead of leaving them orphaned ([**@yankawai**](https://github.com/yankawai) in #4136, backport #4368).
+
+* **fix(nats): merge config.merge.accounts with the generated accounts map**: `config.merge.accounts` is now merged into the generated NATS accounts map instead of being rendered as a second, conflicting copy of the same key ([**@yankawai**](https://github.com/yankawai) in #4134, backport #4321).
+
+* **fix(clickhouse): keep the Keeper name inside the StatefulSet volume-name limit**: Shortens the generated Keeper name for application names longer than 15 characters, fixing the Keeper `StatefulSet` failing to create for those names ([**@yankawai**](https://github.com/yankawai) in #4133, backport #4314).
+
+* **fix(linstor): wait for temporary probe devices**: Backports a LINSTOR upstream fix that waits for a ZFS probe device to appear before reading its I/O properties, instead of racing udev; without the wait, a pool could be left with incorrect block sizes and failed replica placement on 4K pools ([**@yankawai**](https://github.com/yankawai) in #4100, backport #4335).
+
+* **fix(mongodb): fill the dashboard credentials on a first install**: The dashboard credentials Secret is now filled with the database password and connection URI on first install; previously it shipped empty until someone ran `helm upgrade` by hand, because the lookup it relied on could only see users the Percona operator had not yet created ([**@yankawai**](https://github.com/yankawai) in #4014, backport #4330).
+
+* **fix(rabbitmq): right-size the default resources preset to s1.nano**: Raises the default `resourcesPreset` from `t1.nano` (128Mi) to `s1.nano` (250m CPU, 512Mi), because a default-sized RabbitMQ 4.2 broker was OOMKilled on `t1.nano` and never became Ready. Brokers with no stored preset are restarted on upgrade and gain a larger guaranteed memory reservation — check node headroom, and tenants near a `resourceQuotas` memory ceiling, before upgrading; brokers with an explicit `resourcesPreset` already set keep their existing size ([**@yankawai**](https://github.com/yankawai) in #3936, backport #4393).
+
+* **fix(kafka): make topics[].config optional**: Kafka topics can now omit the optional Strimzi config map entirely, instead of the chart requiring one even when there is nothing to set ([**@yankawai**](https://github.com/yankawai) in #3935, backport #4334).
+
+* **fix(kubernetes): pin KubeVirt CSI sidecars to SIG Storage releases**: Pins the KubeVirt CSI sidecars to versioned SIG Storage images, fixing sidecars that previously would not run on pre-x86-64-v3 CPUs ([**@yankawai**](https://github.com/yankawai) in #3934, backport #4313).
+
+* **fix(cdi): update CDI to v1.66.1**: Updates CDI to v1.66.1, fixing HTTP imports that block volumes on 4Kn devices (DRBD/LINSTOR) via a repaired `qemu-img`, and a `resourceVersion` update storm on prime PVCs during `WaitForFirstConsumer` imports ([**@lexfrei**](https://github.com/lexfrei) in #3920, backport #4156).
+
+* **feat(etcd-operator): bump to v0.5.5 and vendor EtcdDefragPolicy CRDs**: Bumps `etcd-operator` to v0.5.5, adding the `EtcdDefrag` and `EtcdDefragPolicy` APIs for on-demand and scheduled etcd defragmentation ([**@androndo**](https://github.com/androndo) in #3968, backport #4151).
+
+## Development, Testing, and CI/CD
+
+* **test(e2e): run the merge-gating lanes on Talos containers**: Moves the merge-gating E2E lanes onto Talos containers, fixing tenant node-join failures that were happening in 8 of the last 11 runs because tenant workers sat one virtualization level too deep on the shared runners and had their CSR signed after the readiness window closed ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #4020, backport #4437).
+
+* **chore(e2e): ignore the artifacts the sandbox bringup writes to the repo root**: Adds `.gitignore` entries for the Talos secrets bundle, rendered machine configs, kubeconfigs, boot image and per-VM directories a local e2e sandbox bringup writes to the repo root, closing a path where a broad `git add` could have staged cluster private keys ([**@lexfrei**](https://github.com/lexfrei) in #3891, backport #4438).
+
+* **fix(e2e): budget tenant scheduling separately from workload readiness**: Waits for a tenant node to actually accept a Pod, on its own budget, before creating the workload used by the kubernetes suites, instead of sharing one 300s deadline between node scheduling and workload readiness — fixing intermittent timeouts where scheduling alone consumed most of the shared window ([**@lexfrei**](https://github.com/lexfrei) in #3579, backport #4435).
+
+* **fix(e2e): budget each linstor wait separately in post-install-prep**: Gives each of the two LINSTOR waits in the post-install-prep script its own deadline, started when the previous one finishes, instead of sharing a single 15-minute window anchored at the script's start — fixing failures where a slow HelmRelease left the following Deployment wait too little time ([**@lexfrei**](https://github.com/lexfrei) in #3715, backport #4434).
+
+* **fix(reloader): add startupProbe to survive slow first start under load**: Adds a startup probe to `cozy-reloader` so a slow first start is no longer killed by the liveness probe and left crash-looping, which also unblocks the LINSTOR stack that depends on it starting cleanly ([**@lexfrei**](https://github.com/lexfrei) in #3470, backport #4433).
+
+* **fix(e2e): stop the sandbox cluster CIDR overlapping the pod range**: Moves the e2e sandbox's Kubernetes cluster CIDR off the range Kube-OVN uses for pod IPAM, fixing intermittent Cilium/Kube-OVN IP collisions that either refused a pod outright with "IP already in use" or silently broke host-to-pod traffic ([**@lexfrei**](https://github.com/lexfrei) in #3750, backport #4432).
+
+* **fix(e2e): disable guest fsync on ephemeral CI VM disks**: Boots e2e QEMU guests with `cache=unsafe` so ephemeral CI VM fsyncs no longer stall the management-cluster etcd, removing cross-operator leader-election flakiness that was failing a different chainsaw suite on every run ([**@kvaps**](https://github.com/kvaps) in #3455, backport #4431).
+
+## Documentation
+
+* **[website] feat(compliance): surface AI Conformance page, mark submission accepted**: Publishes the AI Conformance results page and marks the platform's submission as accepted ([**@tym83**](https://github.com/tym83) in cozystack/website#706).
+
+* **[website] fix(docs): refresh trunk version pins to Cozystack v1.6.3**: Updates the documentation's trunk version references to Cozystack v1.6.3 ([**@lexfrei**](https://github.com/lexfrei) in cozystack/website#618).
+
+* **[website] docs(platform-package): sync the publishing.\* table with the platform values**: Keeps the platform values reference's `publishing.*` table in sync with the actual platform values ([**@lexfrei**](https://github.com/lexfrei) in cozystack/website#679).
+
+* **[website] docs(networking): GatewayClass selection, edge TLS mode, and the Cloudflare Tunnel package**: Documents GatewayClass selection, the edge TLS certificate mode, and the Cloudflare Tunnel Gateway API package ([**@lexfrei**](https://github.com/lexfrei) in cozystack/website#655).
+
+* **[website] docs(platform-package): document KubeVirt migration settings**: Documents the new `kubevirt.migrations` platform value from the corresponding fix above ([**@yankawai**](https://github.com/yankawai) in cozystack/website#697).
+
+* **[website] fix(demo): keep the screen when the demo is reloaded**: Fixes the live console demo losing its current screen on a browser reload ([**@kvaps**](https://github.com/kvaps) in cozystack/website#701).
+
+* **[website] docs(platform-package): document kubevirt.disabledFeatureGates**: Documents the `kubevirt.disabledFeatureGates` platform value ([**@lexfrei**](https://github.com/lexfrei) in cozystack/website#678).
+
+* **[website] chore(demo): refresh the console demo from the cozystack monorepo**: Refreshes the live demo's bundled `cozystack-ui` console from the monorepo ([**@kvaps**](https://github.com/kvaps) in cozystack/website#698).
+
+* **[website] fix(site): point the Certified Kubernetes badge at the live landscape entry**: Fixes the Certified Kubernetes badge linking to a stale landscape entry ([**@tym83**](https://github.com/tym83) in cozystack/website#699).
+
+* **[website] docs(compliance): add AI Conformance page, update Kubernetes Conformance**: Adds the initial AI Conformance page and updates the Kubernetes Conformance page ([**@tym83**](https://github.com/tym83) in cozystack/website#693).
+
+* **[website] docs(blog): route independent-adopter replies to the project**: Redirects independent-adopter reply channels on the blog to the project instead of an individual ([**@tym83**](https://github.com/tym83) in cozystack/website#696).
+
+* **[website] fix(site): resolve /roadmap and move the vendor logo off a project path**: Fixes the `/roadmap` link and moves a vendor logo off a project-owned path ([**@tym83**](https://github.com/tym83) in cozystack/website#695).
+
+* **[website] feat(home): add a "where Cozystack fits" section**: Adds a "where Cozystack fits" section to the home page ([**@tym83**](https://github.com/tym83) in cozystack/website#694).
+
+* **[website] fix(site): give the live-demo band its own layout**: Gives the live-demo band on the home page its own layout instead of sharing one with unrelated content ([**@tym83**](https://github.com/tym83) in cozystack/website#692).
+
+* **[website] feat(site): verify the @cozystack.io Bluesky handle over HTTPS**: Serves the Bluesky handle DID at `/.well-known/atproto-did` to verify the `@cozystack.io` Bluesky handle over HTTPS ([**@kvaps**](https://github.com/kvaps) in cozystack/website#691).
+
+* **[website] docs(marketplace): add Application Marketplace section**: Adds a large new Application Marketplace documentation section covering the CLI reference, package taps, subscriptions, trust model, and catalog behavior ([**@lexfrei**](https://github.com/lexfrei), [**@IvanHunters**](https://github.com/IvanHunters) in cozystack/website#672).
+
+* **[website] fix(site): replace vendor social accounts in the footer with project channels**: Replaces vendor-owned social accounts in the site footer with the project's own channels ([**@tym83**](https://github.com/tym83) in cozystack/website#690).
+
+* **[website] fix(networking): correct what disabledPackages does to ouroboros**: Corrects the documented effect of `disabledPackages` on the `ouroboros` package ([**@lexfrei**](https://github.com/lexfrei) in cozystack/website#683).
+
+* **[website] docs(virtualization): add a VMware vSphere migration guide**: Adds a guide for migrating VMware vSphere VMs into Cozystack, including the VDDK image build ([**@kvaps**](https://github.com/kvaps) in cozystack/website#673).
+
+* **[website] docs(kubernetes): add OIDC authentication guide**: Adds a guide for configuring OIDC authentication on managed Kubernetes clusters ([**@IvanHunters**](https://github.com/IvanHunters) in cozystack/website#596).
+
+* **[website] ci(telemetry): put the monthly refresh back on a schedule**: Restores the scheduled monthly refresh of the telemetry dashboard data ([**@tym83**](https://github.com/tym83) in cozystack/website#645).
+
+* **[website] docs: update managed apps reference for v1.6.3**: Refreshes the managed applications reference for the v1.6.3 release ([**@app/cozystack-ci**](https://github.com/apps/cozystack-ci) in cozystack/website#681).
+
+* **[talm] docs: publish the manual as a documentation site**: Publishes `talm`'s manual as a documentation site at talm.cozystack.io, with a CLI reference generated from the Cobra command tree ([**@lexfrei**](https://github.com/lexfrei) in cozystack/talm#235).
+
+* **[talm] ci: unbreak the lint job under Go 1.27**: Fixes the `talm` lint job under Go 1.27 and requires Go 1.27 for the build ([**@lexfrei**](https://github.com/lexfrei) in cozystack/talm#237).
+
+* **[talm] chore(deps): bump Talos to v1.14.0**: Bumps the Talos dependency to v1.14.0, along with fixes so `applycheck` and `meta --insecure` keep working against it and a rendered config keeps every document instead of dropping some ([**@sircthulhu**](https://github.com/sircthulhu) in cozystack/talm#223).
+
+* **[ansible-cozystack] feat(roles): restore NVIDIA vGPU host state across reboots**: Adds a role that restores NVIDIA vGPU host state after a reboot, instead of requiring it to be reconfigured by hand ([**@lexfrei**](https://github.com/lexfrei) in cozystack/ansible-cozystack#70).
+
+* **[ansible-cozystack] chore(deps): track cozystack installer v1.6.3**: Renovate dependency bump of the `cozy-installer` Docker image tag to follow the v1.6.3 Cozystack release ([**@app/renovate**](https://github.com/apps/renovate) in cozystack/ansible-cozystack#71).
+
+* **[ansible-cozystack] chore(deps): update k3s to v1.37.0+k3s1**: Renovate dependency bump of the k3s Kubernetes distribution used by the management-cluster bootstrap role ([**@app/renovate**](https://github.com/apps/renovate) in cozystack/ansible-cozystack#72).
+
+## Contributors
+
+Thanks to everyone who contributed to this patch release:
+
+* [**@androndo**](https://github.com/androndo)
+* [**@IvanHunters**](https://github.com/IvanHunters)
+* [**@kvaps**](https://github.com/kvaps)
+* [**@lexfrei**](https://github.com/lexfrei)
+* [**@myasnikovdaniil**](https://github.com/myasnikovdaniil)
+* [**@sircthulhu**](https://github.com/sircthulhu)
+* [**@tym83**](https://github.com/tym83)
+* [**@yankawai**](https://github.com/yankawai)
+
+### New Contributors
+
+We're excited to welcome our first-time contributor:
+
+* [**@yankawai**](https://github.com/yankawai) - First contribution!
+
+**Full Changelog**: https://github.com/cozystack/cozystack/compare/v1.6.3...v1.6.4
diff --git a/docs/changelogs/v1.6.5.md b/docs/changelogs/v1.6.5.md
new file mode 100644
index 0000000000..c9158e5a3a
--- /dev/null
+++ b/docs/changelogs/v1.6.5.md
@@ -0,0 +1,157 @@
+<!--
+https://github.com/cozystack/cozystack/releases/tag/v1.6.5
+-->
+
+# v1.6.5 (2026-10-16)
+
+A patch release with backported fixes for tenant Kubernetes cluster bootstrap, Application updates through the API, suspended `HelmRelease` handling, Cilium and Kube-OVN address allocation, `tcp-balancer` on HAProxy 3.3+, Alertmanager delivery, and a batch of PostgreSQL, MongoDB, NATS, etcd, Velero and dashboard fixes, plus optional email alert delivery, OpenBao static-key auto-unseal and zone placement for Keycloak. **This release contains a breaking change on the Kube-OVN platform variants — read the upgrade notes before upgrading.**
+
+## Features and Improvements
+
+* **feat(monitoring): add optional email receiver to alertmanager**: Alerta alerts can now be delivered by email through an optional receiver configured in the monitoring application values, with the alert severity guard tightened so rules using non-Alerta severities are caught ([**@yankawai**](https://github.com/yankawai) in #3800, backport #4614).
+
+* **feat(openbao): optional static-key auto-unseal and apiserver egress label**: OpenBao can now be auto-unsealed with a static key instead of manual Shamir unseal, with the seal values constrained so only valid settings reach the server config, and the pods can carry an apiserver egress label for network-policy setups. The static seal trade-off and the Shamir migration path are documented in the chart ([**@yankawai**](https://github.com/yankawai) in #4766, backport #4906).
+
+* **feat(keycloak): expose zone placement for Keycloak and the database proxy**: Keycloak, its database proxy and the `keycloak-db` instances can now be spread across zones, so a zone outage no longer takes the identity provider down with it ([**@sircthulhu**](https://github.com/sircthulhu) in #4606, backport #4856).
+
+## Fixes
+
+* **fix(kubernetes): break bootstrap-token Job out of Helm hook to unblock fresh installs**: The bootstrap-token Job is no longer a `post-install,post-upgrade` Helm hook, which deadlocked the chart: the release waited for workers, workers could not register without the bootstrap-token Secret, and the Secret was only created after the wait succeeded. Tenant Kubernetes clusters on fresh installs and upgrades no longer get stuck with `Provisioned` machines that never join ([**@IvanHunters**](https://github.com/IvanHunters) in #3887, backport #4541).
+
+* **fix(api): keep a suspended HelmRelease suspended across an app update**: Updating an Application through the API no longer resumes a `HelmRelease` that an operator or controller suspended. This fixes backup restores of PostgreSQL stalling at `TargetPurged` because the release was resumed and re-rendered before the purge finished ([**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #4411, backport #4928).
+
+* **fix(api): preserve foreign HelmRelease metadata and repair empty required fields**: `Update` on an Application now carries over finalizers, owner references and foreign labels/annotations from the live `HelmRelease`, so a delete racing an update no longer orphans every resource of the release; and a required field written with nothing under it (`replicas:`) is dropped so the chart default applies, with a warning to the client, instead of failing the release with a "missing property" error ([**@mattia-eleuteri**](https://github.com/mattia-eleuteri), [**@myasnikovdaniil**](https://github.com/myasnikovdaniil) in #2914, #3956, backport #4919).
+
+* **fix(api): let the garbage collector finalize Applications**: Deleting an Application no longer leaves the garbage-collection finalizer behind, so Applications finalize instead of hanging in `Terminating` ([**@yankawai**](https://github.com/yankawai) in #4610, backport #4683).
+
+* **fix(cilium)!: take cilium's own addresses from a block kube-ovn does not hand out**: On the Kube-OVN variants (`isp-full`, `isp-full-generic`) Cilium now runs `ipam.mode: cluster-pool` with a /29 per node out of the last /21 of `networking.podCIDR`, and the same block is excluded from Kube-OVN, so Kube-OVN can no longer hand a pod an address Cilium already holds for its router or Gateway API ingress. A post-upgrade hook migrates existing clusters. **Breaking, see "Migration and Upgrades" below** ([**@yankawai**](https://github.com/yankawai) in #4778, backport #4918).
+
+* **fix(tcp-balancer): rename backends and pin HAProxy so the chart starts on 3.3+**: Backend names no longer collide with frontend names, HAProxy is pinned to 3.4.4, and an empty whitelist leaves Kubernetes and Talos frontends unfiltered. Enabling `whitelistHTTP` without a whitelist now fails at render time instead of producing a configuration that rejects all traffic ([**@yankawai**](https://github.com/yankawai) in #4366, backport #4516).
+
+* **fix(monitoring): send alerts to every Alertmanager replica**: Alerts are now sent to every Alertmanager replica instead of a single one, so alerts are not lost when the replica receiving them is not the active one ([**@yankawai**](https://github.com/yankawai) in #4889, backport #4890).
+
+* **fix(velero): bump velero-plugin-for-aws to v1.14.4 so backups work on R2**: Updates the AWS plugin so Velero backups to Cloudflare R2 (and compatible S3 stores) work again ([**@yrahman82**](https://github.com/yrahman82) in #4834, backport #4854).
+
+* **fix(postgres): read the live Cluster when deciding the WAL-archive prefix**: The WAL-archive prefix is now decided from the live CNPG `Cluster`, so upgrades and restores keep archiving WAL to the right location instead of switching prefix ([**@mattia-eleuteri**](https://github.com/mattia-eleuteri) in #4299, backport #4592).
+
+* **fix(postgres): cap the default shared_buffers at a quarter of the memory limit**: The default `shared_buffers` is capped at a quarter of the memory limit (and at the memory request), so small PostgreSQL instances no longer start with a buffer size that causes out-of-memory kills ([**@yankawai**](https://github.com/yankawai) in #4724, backport #4725).
+
+* **fix(mongodb): set the s3 bucket and prefix on the bootstrap restore**: The bootstrap restore now gets the S3 bucket and prefix, so restoring a new MongoDB from a backup actually finds the data ([**@yankawai**](https://github.com/yankawai) in #4779, backport #4780).
+
+* **fix(nats): enable JetStream for the generated account**: JetStream is now enabled for the generated NATS account, so streams and consumers work out of the box ([**@yankawai**](https://github.com/yankawai) in #4675, backport #4677).
+
+* **fix(etcd): leave compaction to etcd and pass the real quota to defrag**: etcd compaction is left to etcd itself and defragmentation is given the real backend quota, so etcd no longer compacts redundantly or defragments against the wrong size ([**@yankawai**](https://github.com/yankawai) in #4873, backport #4874).
+
+* **fix(platform): keep the legacy etcd-operator stopped after etcd adoption**: After etcd is adopted by the new operator, the legacy `etcd-operator` stays stopped instead of being scaled back up and fighting over the same clusters ([**@yankawai**](https://github.com/yankawai) in #4738, backport #4739).
+
+* **fix(linstor): use severity warning in piraeus-datastore alerts**: The `piraeus-datastore` alerts now use the `warning` severity instead of `warn`, which Alerta did not recognise, so these alerts arrive with the correct severity ([**@yankawai**](https://github.com/yankawai) in #3799, backport #4740).
+
+* **fix(dashboard): allow editing free-form objects in application forms**: Free-form object fields in application forms can now be edited, and a field is marked invalid when the schema rejects it, instead of being locked or silently accepted ([**@yankawai**](https://github.com/yankawai) in #4682, backport #4905).
+
+* **fix(dashboard, foundationdb): show the connection ConfigMap to tenants**: The application page gets a ConfigMaps tab, with a copy button per value, for ConfigMaps in the application's resource map, and tenant roles may read the FoundationDB connection ConfigMap — so tenants can obtain their FoundationDB connection string. The tab goes away if the resource map becomes unreadable instead of showing stale names ([**@yankawai**](https://github.com/yankawai) in #4612, backport #4684).
+
+* **fix(cert-manager): enable the Gateway API solver in the host cert-manager**: The host cert-manager controller now has the Gateway API solver enabled, so ACME HTTP-01 challenges can be solved through Gateway API routes ([**@lexfrei**](https://github.com/lexfrei) in #4039, backport #4808).
+
+* **fix(kubernetes): apply worker TalosConfigTemplate server-side**: The worker `TalosConfigTemplate` is applied server-side, avoiding conflicts and field ownership problems when it is updated on existing tenant clusters ([**@mattia-eleuteri**](https://github.com/mattia-eleuteri) in #4163, backport #4575).
+
+* **fix(kubernetes): probe Keycloak CRDs by output in oidc-bootstrap cleanup**: The OIDC bootstrap cleanup now probes for Keycloak CRDs by their output, so it no longer fails on clusters where those CRDs are absent ([**@mattia-eleuteri**](https://github.com/mattia-eleuteri) in #3520, backport #4571).
+
+* **fix(cozy-lib): round the sanitized CPU request up to a whole milli-CPU**: Sanitized CPU requests are rounded up to a whole milli-CPU, so fractional requests no longer produce invalid values that Kubernetes rejects ([**@mattia-eleuteri**](https://github.com/mattia-eleuteri) in #3522, backport #4590).
+
+## Dependencies
+
+* **chore(hetzner-robotlb): update robotlb to 0.1.0**: Updates `hetzner-robotlb` to robotlb 0.1.0 ([**@sircthulhu**](https://github.com/sircthulhu) in #4557, backport #4560).
+
+## Development, Testing, and CI/CD
+
+* **ci(e2e): run nightly and release-tag e2e on the container lane**: Nightly and release-tag E2E runs now use the Talos container lane, with the nightly runner given headroom over its nodes, matching the merge-gating lanes ([**@lexfrei**](https://github.com/lexfrei) in #4828, backport #4913).
+
+* **fix(e2e-sandbox): install mc from its GitHub release**: The sandbox image installs the final `mc` release from its pinned GitHub asset and verifies its per-architecture checksum, because `dl.min.io` now returns HTTP 410 and the release-line image build was failing ([**@lexfrei**](https://github.com/lexfrei) in #4447, backport #4535).
+
+## Documentation
+
+* **[website] docs(platform-package): note the /21 the kube-ovn variants keep for cilium**: Documents the /21 of `networking.podCIDR` that the Kube-OVN variants now reserve for Cilium ([**@yankawai**](https://github.com/yankawai) in cozystack/website#739).
+
+* **[website] docs(platform-package): document kubevirt.migrations for v1.6**: Documents the `kubevirt.migrations` platform value in the v1.6 docs ([**@yankawai**](https://github.com/yankawai) in cozystack/website#705).
+
+* **[website] docs(platform): document the monitoring platform values**: Documents the monitoring platform values ([**@scooby87**](https://github.com/scooby87) in cozystack/website#738).
+
+* **[website] docs(platform-package): add publishing.serviceDomain**: Adds `publishing.serviceDomain` to the platform values reference ([**@lexfrei**](https://github.com/lexfrei) in cozystack/website#724).
+
+* **[website] docs(variants): document the slim platform variants**: Documents the `isp-slim`, `isp-slim-generic` and `isp-hosted-slim` variants ([**@lexfrei**](https://github.com/lexfrei) in cozystack/website#718).
+
+* **[website] docs(talm): document the ZFS export-on-shutdown knob**: Documents the `talm` knob controlling ZFS pool export on shutdown ([**@lexfrei**](https://github.com/lexfrei) in cozystack/website#721).
+
+* **[website] docs(install): note the talm version pins on the update path**: Notes the `talm` version pins that apply when updating ([**@lexfrei**](https://github.com/lexfrei) in cozystack/website#703).
+
+* **[website] docs(gpu): select the container variant from bundle values**: Documents selecting the GPU container variant from bundle values ([**@lexfrei**](https://github.com/lexfrei) in cozystack/website#714).
+
+* **[website] fix(operations): replace the component removal recipe that undoes itself**: Replaces a component removal recipe that reverted itself, and warns what removing a v0 component destroys ([**@lexfrei**](https://github.com/lexfrei) in cozystack/website#684).
+
+* **[website] fix(docs): correct stale hairpin-proxy uninstall claim and package names**: Corrects a stale hairpin-proxy uninstall claim and package names in `enabledPackages` examples ([**@lexfrei**](https://github.com/lexfrei) in cozystack/website#709).
+
+* **[website] docs(development): describe the multi-arch default of make image**: Describes the multi-arch default of `make image` ([**@lexfrei**](https://github.com/lexfrei) in cozystack/website#711).
+
+* **[website] docs: move the next docs to Talos v1.14.2**: Moves the next docs version to Talos v1.14.2 ([**@lexfrei**](https://github.com/lexfrei) in cozystack/website#720).
+
+* **[website] fix(versions): pin the trunk to published releases and fix released pin headers**: Pins the docs trunk to published releases and fixes released pin file headers ([**@lexfrei**](https://github.com/lexfrei) in cozystack/website#710).
+
+* **[website] docs(marketplace): point the Repositories view to Admin**: Points the Marketplace docs at the Admin page for the Repositories view ([**@kvaps**](https://github.com/kvaps) in cozystack/website#700).
+
+* **[website] fix(llms): point llms.txt docs links at the current release**: Makes `llms.txt` link to the current release docs ([**@themoriarti**](https://github.com/themoriarti) in cozystack/website#737).
+
+* **[website] fix(footer): use the LF Projects copyright notice on every page**: Uses the LF Projects copyright notice in the footer on every page ([**@themoriarti**](https://github.com/themoriarti) in cozystack/website#736).
+
+* **[website] docs(community): drop the Russian-language Telegram channel**: Removes the Russian-language Telegram channel from the community pages ([**@tym83**](https://github.com/tym83) in cozystack/website#744).
+
+* **[website] feat(i18n): automated translation pipeline with machine review gate**: Adds an automated documentation translation pipeline with a machine review gate ([**@tym83**](https://github.com/tym83) in cozystack/website#623).
+
+* **[website] feat(blog): announce the CNCF General Technical Review and compliance results**: Publishes news and a page on the CNCF General Technical Review and conformance results ([**@tym83**](https://github.com/tym83) in cozystack/website#722).
+
+* **[website] blog: Oberon RISC5 machine as a Cozystack catalog app**: Publishes a news post on the Oberon RISC5 machine as a catalog app ([**@tym83**](https://github.com/tym83) in cozystack/website#723).
+
+* **[website] docs: update managed apps reference for v1.6.4**: Refreshes the managed applications reference for v1.6.4 ([**@app/cozystack-ci**](https://github.com/apps/cozystack-ci) in cozystack/website#712).
+
+* **[cozy-proxy] feat(image): publish a linux/amd64 and linux/arm64 index**: `cozy-proxy` v0.4.0 publishes a multi-architecture image index for linux/amd64 and linux/arm64 ([**@lexfrei**](https://github.com/lexfrei) in cozystack/cozy-proxy#22).
+
+## Migration and Upgrades
+
+**Breaking change on the Kube-OVN variants (`isp-full`, `isp-full-generic`)** — introduced by #4778 / #4918 (`fix(cilium)!`):
+
+* `networking.podCIDR` must be /20 or wider; otherwise the platform refuses to render and the upgrade stops before anything changes. Widening the value later does not help, because the migration hook refuses a block outside the subnet the cluster was installed with.
+* A /21 of /29 blocks caps these variants at 256 nodes.
+* Every Cilium agent restarts twice, once for the configuration change and once in the migration hook. While the `cilium` release is failed, packages that depend on networking wait for it.
+* If Kube-OVN has already handed out an address from the last /21, the hook names that address and stops before moving any node. Recreate the pods holding it and the next retry succeeds.
+* Rolling back to v1.6.4 restores `ipam.mode: kubernetes`, but the exclusions stay in the `ovn-default` subnet and have to be removed by hand.
+* `isp-hosted` is not affected.
+
+Other upgrade notes:
+
+* `tcp-balancer`: enabling `whitelistHTTP` now requires a non-empty whitelist; rendering fails otherwise.
+* Tenant Kubernetes clusters stuck on v1.6.3/v1.6.4 because of the missing bootstrap-token Secret recover on upgrade; no manual Secret creation is needed.
+* PostgreSQL restarts on upgrade for small clusters: a cluster with a memory limit below 512Mi and no explicit `shared_buffers` (the `t1.nano` preset and the default `t1.micro`) now gets `shared_buffers` set to a quarter of the limit, 64MB for `t1.micro`, where PostgreSQL used its built-in 128MB before. The setting needs a restart, so CloudNativePG restarts the replicas first and then the primary in place: writes pause for one restart, and a single-instance cluster is unavailable during it. Upgrade in a quiet window, or set `postgresql.parameters.shared_buffers` yourself beforehand to take the restart on your own schedule. Clusters with 512Mi or more are unchanged.
+
+## Contributors
+
+Thanks to everyone who contributed to this patch release:
+
+* [**@IvanHunters**](https://github.com/IvanHunters)
+* [**@kvaps**](https://github.com/kvaps)
+* [**@lexfrei**](https://github.com/lexfrei)
+* [**@mattia-eleuteri**](https://github.com/mattia-eleuteri)
+* [**@myasnikovdaniil**](https://github.com/myasnikovdaniil)
+* [**@scooby87**](https://github.com/scooby87)
+* [**@sircthulhu**](https://github.com/sircthulhu)
+* [**@themoriarti**](https://github.com/themoriarti)
+* [**@tym83**](https://github.com/tym83)
+* [**@yankawai**](https://github.com/yankawai)
+* [**@yrahman82**](https://github.com/yrahman82)
+
+### New Contributors
+
+We're excited to welcome our first-time contributors:
+
+* [**@themoriarti**](https://github.com/themoriarti) - First contribution!
+* [**@yrahman82**](https://github.com/yrahman82) - First contribution!
+
+**Full Changelog**: https://github.com/cozystack/cozystack/compare/v1.6.4...v1.6.5
diff --git a/docs/deprecating-applications.md b/docs/deprecating-applications.md
new file mode 100644
index 0000000000..4935a8685c
--- /dev/null
+++ b/docs/deprecating-applications.md
@@ -0,0 +1,89 @@
+# Retiring a catalog application
+
+Removing an application from `packages/apps/` is not a deletion. The platform stops publishing its chart, but the instances people already created keep running, and nothing in the tree tells you what happens to them. This document is the procedure: how to decide what shape the retirement takes, what breaks if you skip the migration, and what the migration has to do.
+
+## Decide the shape first
+
+| Situation | Shape | Precedent |
+| --- | --- | --- |
+| A successor application exists | Migrate each instance onto it | migrations `28` (mysql to mariadb), `29` (virtual-machine to vm-disk plus vm-instance) |
+| No successor, and instances exist in the field | Freeze them on the artifact they already render from | migration `58` (http-cache) |
+| No successor, and no instance anywhere | Remove the platform side outright | the second branch of migration `58` |
+
+You cannot know which of the last two applies fleet-wide, so do not choose between them in the tree. The migration decides per cluster, at upgrade time, by looking for instances. A cluster that never used the application keeps nothing; a cluster that still runs one keeps a working application.
+
+Telemetry tells you how many instances exist across reporting clusters, which is the input to the decision to retire at all. It is not a substitute for the per-cluster branch: an application with four instances still has four owners who did not agree to lose them.
+
+## What removal breaks
+
+Deleting the chart and its `PackageSource` breaks every surviving instance, in a way that produces no error at merge time and no error at upgrade time either. The chain:
+
+1. `packages/core/platform/templates/sources.yaml` globs `sources/*.yaml` and emits each file verbatim, with no `helm.sh/resource-policy: keep`, so Helm prunes the `PackageSource` on upgrade.
+2. `internal/operator/packagesource_reconciler.go` stamps a controller `ownerReference` on the `ArtifactGenerator` it creates, so garbage collection takes the generator with the `PackageSource`.
+3. The generator owns both `ExternalArtifact` objects, so they go too.
+4. Those are the `chartRef` targets of `<app>-rd` in `cozy-system` and of every tenant `<app>-<name>` release. Both sit `Ready=False` permanently.
+5. `pkg/registry/apps/application/rest.go` mirrors HelmRelease readiness into the instance status, so the instance reads not ready in `kubectl` and unhealthy in the dashboard while its pods keep serving. `packages/system/monitoring-agents/alerts/flux.yaml` fires `HelmReleaseNotReady` at severity major, and `check-readiness` never reports green again.
+
+The `Package` object survives, because `packages/core/platform/templates/_helpers.tpl` stamps `helm.sh/resource-policy: keep` on every one. Do not tell operators to delete it by hand: `internal/operator/package_reconciler.go` sets a controller `ownerReference` from each generated HelmRelease to its `Package`, so deleting it cascades into uninstalling `<app>-rd`, which takes the `ApplicationDefinition` with it. From that moment the kind stops being served, and a surviving instance disappears from the API with its workloads still running and its owner unable to remove them.
+
+The changelog for `v1.0.0-rc.2` records this exact failure after the ferretdb, mysql and virtual-machine renames, and migrations `28`, `29` and `33` were written to clean it up. Treat it as established, not hypothetical.
+
+## Freezing on the cluster's own artifact
+
+An application with no successor can be kept alive without a second repository and without the platform publishing its chart, because the chart a running instance renders from is already resolved on that cluster as an object. Copy that object and pin the copy.
+
+Read the digest off the live `cozystack-packages` `OCIRepository` rather than writing one into the migration. The migration runs as a `pre-upgrade` hook, before the upgrade re-points that object, so the digest it reads is by definition the release the instances are already rendering from. That makes the freeze a no-op by construction, and it asks no question about which release was the last to ship the chart.
+
+Take the digest from `spec.ref.digest` when the installer pinned one, and otherwise from the digest half of `status.artifact.revision`, which source-controller writes as `<tag>@sha256:<manifest digest>`. Never use `status.artifact.digest`: that is the checksum of the downloaded tarball, not of the manifest, and a source pinned to it resolves to nothing. A source with neither must abort the migration rather than publish a source that points nowhere.
+
+Copy the whole `spec` rather than rebuilding it. The url, the pull secret, the interval and any `verify` block come across with it, so an air-gapped or mirrored registry keeps serving exactly what it already served, under the verification the operator configured. A digest written into the script has none of those properties and resolves only where that exact manifest was mirrored.
+
+Write the copy with no `ownerReferences` and no Helm metadata, and give it the `platform.cozystack.io/no-delete` label: it becomes the only chart source those instances have, so a stray delete strands them the same way the prune would.
+
+Then repoint the `PackageSource` at the copy, add `helm.sh/resource-policy: keep`, and null both `meta.helm.sh/release-name` and `app.kubernetes.io/managed-by`. Helm re-reads the keep annotation off the live object during the prune, which is what lets a `pre-upgrade` hook exempt an object from the upgrade that follows it, and nulling the release metadata stops a later release from adopting it.
+
+Do not rename anything. The `ApplicationDefinition` inside the frozen artifact hardcodes its `chartRef`, so a renamed `PackageSource` leaves every release pointing at an artifact nobody produces. Because the names hold, the rd release and every tenant release keep the `chartRef` they already have, and nothing goes not ready.
+
+## The migration
+
+Select instances by both the `chartRef` name and the `apps.cozystack.io/application.kind` label that migration `22` stamped, so a release whose `chartRef` was never rewritten is still found.
+
+On the branch where instances exist, freeze as above and delete nothing. On the branch where none exist, remove the platform side: the `Package` first, and block on it rather than passing `--wait=false`, because the operator reconciles off an informer cache and a reconcile in flight against the pre-delete entry re-creates the release it owns. Then the rd HelmRelease, its `ApplicationDefinition`, and its Helm storage secrets.
+
+Fail closed on every path. Migrations never re-run, so a swallowed error stamps the version past a fleet that is half migrated. No `|| true`.
+
+Number the migration one past the highest that exists **on main**, not one past the highest in your branch, and set `migrations.targetVersion` one past that. Check for other pull requests in flight that add migrations: whichever lands second has to renumber, and `run-migrations.sh` refuses to advance past a number with no file, so a hole fails the upgrade on every cluster below it.
+
+## Tenant RBAC
+
+`cozy:tenant:admin:base` in `packages/system/cozystack-basics/templates/clusterroles.yaml` enumerates the `apps.cozystack.io` resources a tenant owner may write. Remove the retired application's plural from it: the list tracks the catalog, and an entry for an application nobody ships reads as dead config to the next person pruning it.
+
+The clusters that froze still need the grant, so have the migration apply its own `ClusterRole` carrying `rbac.cozystack.io/aggregate-to-tenant-admin`, with the same verbs the base role granted. Apply it in the hook, before the upgrade drops the rule from the chart, so the access never lapses.
+
+Without it the owner of a surviving instance can see it and not remove it. The wildcard over `apps.cozystack.io` lives in `cozy:tenant:base`, which aggregates into `cozy:tenant` and not into `cozy:tenant:admin`; `cozy:tenant:view:base` is read only; and no role in the tenant chain carries any verb on `helm.toolkit.fluxcd.io`, so there is no way around it from inside a tenant.
+
+## What comes out of the tree
+
+The chart under `packages/apps/<app>/`, its ResourceDefinition under `packages/system/<app>-rd/`, the values type under `api/apps/v1alpha1/<type>/` together with its generated deepcopy, the `PackageSource` under `packages/core/platform/sources/`, the bundle line that installs it, the image build line in the root `Makefile`, the dashboard icon mapping in the console's `sidebar-icons.tsx`, and the plural in `cozy:tenant:admin:base`.
+
+Regenerate rather than hand-delete the generated files: the values type is `cozyvalues-gen` output driven by the chart's own `generate` target, and deepcopy is `controller-gen` over the whole `api/apps/v1alpha1` module.
+
+Leave history alone. Published changelogs are a record, and earlier migrations that name the retired kind replay what those clusters actually did.
+
+## Downstream
+
+Two repositories carry per-application code that nothing here checks. `cozystack/website` lists each app in a hardcoded `Makefile` list and keeps one reference page per documentation version, so the `next` page and the list entry go while released versions stay. `cozystack/terraform-provider-cozystack` hand-writes a resource and a data source per kind, plus a per-kind schema guard that imports this repository's `api/apps/v1alpha1` module and breaks when that pin moves past the removal.
+
+## Checklist
+
+- [ ] The decision to retire is recorded, with usage numbers and the maintenance case
+- [ ] The shape is chosen: successor migration, or freeze plus conditional removal
+- [ ] The migration branches per cluster and deletes nothing on the branch where instances exist
+- [ ] The frozen source copies the live `OCIRepository` and pins the digest read at hook time
+- [ ] The `PackageSource` is repointed, annotated `keep` and disowned; names are unchanged
+- [ ] The tenant grant is dropped from the chart and re-applied by the migration
+- [ ] Every failure path stops before the version stamp
+- [ ] The migration number is one past main's highest, `targetVersion` one past that, with in-flight PRs checked
+- [ ] Generated files are regenerated, not edited
+- [ ] The release note says what an upgraded cluster experiences, on both branches
+- [ ] Downstream follow-ups are open and linked in the PR
diff --git a/docs/gateway-classes.md b/docs/gateway-classes.md
new file mode 100644
index 0000000000..5aafb31b2f
--- /dev/null
+++ b/docs/gateway-classes.md
@@ -0,0 +1,125 @@
+# GatewayClass selection and TLS termination for tenant Gateways
+
+A tenant that owns a Gateway (`tenant.spec.gateway: true`) gets one `Gateway` object bound to one `GatewayClass`. Which class that is decides who programs the dataplane and, with it, whether TLS is terminated by the Gateway itself or by something in front of it. This page covers the operator-facing surface: the platform values that bound the choice, the tenant field that makes it, what each resulting certificate mode implies, what a move between classes does to certificates and Secrets, and how the mechanism fails when the configured names and the installed classes disagree.
+
+The chart-level reference for the per-tenant Gateway — inheritance, listener shapes, the security model, ACME rate limits — is [`packages/extra/gateway/README.md`](../packages/extra/gateway/README.md).
+
+## Platform values
+
+Three keys under `gateway` in the platform values bound which class a tenant Gateway can land on:
+
+```yaml
+gateway:
+  enabled: true
+  className: cilium
+  tenantSelectableClasses: []
+  edgeTerminatedClasses: []
+```
+
+- `className` — the class every tenant Gateway uses unless the tenant names another one. Defaults to the Cilium class the platform ships.
+- `tenantSelectableClasses` — the additional class names a tenant may name for itself. Empty (the default) means a tenant cannot name anything but the platform default.
+- `edgeTerminatedClasses` — the class names whose provider terminates TLS upstream of the Gateway. Membership in this list is the only thing that puts a tenant into edge mode.
+
+All three reach the per-tenant gateway chart through the platform values channel, as `_cluster.gateway-class-name`, `_cluster.gateway-tenant-classes` and `_cluster.gateway-edge-classes`. The two lists are joined with commas on the way, so a name containing a comma is rejected at platform render time rather than silently split into two names.
+
+`gateway.enabled` is a separate switch and not a prerequisite for any of this: it moves the platform's own published services from Ingress onto Gateway API and points the ACME `ClusterIssuer`s' HTTP-01 solver at the publishing tenant's Gateway. A tenant Gateway is created from `tenant.spec.gateway` alone.
+
+## How a tenant picks a class
+
+```yaml
+apiVersion: apps.cozystack.io/v1alpha1
+kind: Tenant
+metadata:
+  name: acme
+  namespace: tenant-root
+spec:
+  gateway: true
+  gatewayClass: edge-tunnel
+```
+
+`edge-tunnel` throughout this page stands for the name of a GatewayClass whose controller terminates TLS outside the cluster and forwards cleartext to the Gateway. Substitute the name your own edge-terminating controller registers.
+
+The field is read only for a tenant that owns a Gateway. A tenant that inherits — `gateway` left unset or set to `false` — publishes through the nearest ancestor that owns one and runs on that ancestor's class, so its own `gatewayClass` has no effect. Leaving `gatewayClass` empty selects `gateway.className`.
+
+The set a tenant may name is `gateway.tenantSelectableClasses` plus the current `gateway.className`, so a tenant may always name the default explicitly. Anything else fails that tenant's own gateway release at render time, with a message naming the class and the allowed set, and reaches no other tenant. The allowlist exists because `Tenant` is a tenant-writable object while a `GatewayClass` is cluster-scoped: without it a tenant could attach its Gateway to any class the cluster registers, including one an admin keeps for internal-only traffic.
+
+## What the class decides: the certificate mode
+
+`TenantGateway.spec.certMode` is derived, never written by the tenant. The gateway chart resolves it in this order, first match winning:
+
+| Condition | `certMode` | What the controller issues |
+| --- | --- | --- |
+| the resolved class is in `gateway.edgeTerminatedClasses` | `edge` | nothing |
+| `publishing.certificates.wildcardSecretName` is set | `existingSecret` | nothing; the operator's Secret is referenced |
+| `publishing.certificates.solver: dns01` | `dns01` | one wildcard `Certificate` per tenant |
+| otherwise | `http01` | one `Certificate` per published hostname, except the passthrough names below |
+
+Under `http01` a hostname held by a TLS-passthrough listener is the exception to the per-hostname rule. The hostname earns neither an HTTPS-terminate listener nor a `Certificate`, whether or not a `TLSRoute` is attached to that listener yet, because the backend presents its own certificate and the Gateway never holds a key for the name. The shipped `tlsPassthroughServices` defaults put `api`, `vm-exportproxy` and `cdi-uploadproxy` in that position on the publishing tenant's Gateway, for the names `publishing.exposedServices` lists while `gateway.enabled` is on, and the `Certificate` objects that covered them are collected on upgrade. No other tenant renders those listeners, so a child tenant's `HTTPRoute` on one of those names keeps its listener. `packages/extra/gateway/README.md` carries what that changes and the ways forward.
+
+Edge therefore wins over an operator-supplied wildcard Secret, which wins over the solver. In edge mode the solver, DNS-01 provider and issuer-name inputs are not read at all, so an unsupported value in any of them does not fail the tenant's release. `existingSecret` skips the same validations; only `http01` and `dns01` reject a bad solver, provider or issuer name.
+
+## What edge mode changes on the Gateway
+
+- The Gateway serves port 80 only. Its listeners are `edge` for `*.<apex>`, `edge-apex` for `<apex>`, and one `edge-child-*` per inheriting child tenant carrying that child's `*.<child-apex>`. There is no port-443 listener, and no hostname-less port-80 listener either.
+- No per-tenant ACME `Issuer` and no `Certificate` are created.
+- No http-to-https redirect `HTTPRoute` is created. The edge is expected to perform that redirect.
+- `tlsPassthroughServices` is not written onto the `TenantGateway` and no passthrough listener is rendered, so the tenant Kubernetes API, VM export and CDI upload endpoints are not published through such a Gateway. The packages that own those endpoints still create their `TLSRoute` objects, which then match no listener on that Gateway.
+- Application `HTTPRoute`s attach by hostname exactly as in the other modes — the edge listeners carry the same namespace selector the HTTPS listeners carry elsewhere.
+
+That last point has a blast radius worth stating on its own, and it applies only where those endpoints are published through the Gateway at all. Each of them renders its `TLSRoute` only when `gateway.enabled` is on and its name is still in `publishing.exposedServices`; at the default `gateway.enabled: false` there is no such route and nothing to lose. Where both hold, setting `gateway.className` to an edge-terminated class puts the publishing tenant on it too, and then the endpoints that go unpublished are the platform's own: the `TLSRoute` for `api.<root-host>` is pinned to a `tls-api` listener, an edge Gateway has no such listener, so the tenant Kubernetes API stops being served — VM export and CDI upload go the same way. Nothing fails at render time, and the loss surfaces only on the routes themselves, which the controller flips to `Accepted=False` with reason `NoMatchingParent`. Putting only child tenants on the edge class avoids it, because the platform's routes keep pointing at the publishing tenant's Gateway.
+
+Listing a class in `gateway.edgeTerminatedClasses` is an assertion about that class, and nothing verifies it. Put the bundled `cilium` class in the list and its Gateways serve every application hostname over plain HTTP on a public address, with no redirect and no certificate. Only list a class whose provider really does terminate TLS in front of the Gateway.
+
+## Moving a tenant between classes
+
+Onto an edge-terminated class, on the next reconcile:
+
+| Object | What happens |
+| --- | --- |
+| the per-tenant ACME `Issuer` | deleted |
+| per-listener and wildcard `Certificate` objects | deleted |
+| the TLS Secrets those `Certificate`s issued | left in the namespace, unreferenced |
+| the http-to-https redirect `HTTPRoute` | deleted |
+| the replica of `publishing.certificates.wildcardSecretName` | deleted from that tenant's namespace |
+| route status conditions the controller wrote earlier | an attached `TLSRoute` that declares hostnames is flipped to `Accepted=False`, reason `NoMatchingParent`; on a hostname-less `TLSRoute`, and on every attached `HTTPRoute`, the controller's own entry is removed instead |
+
+Every deletion is guarded by ownership: an object of the same name that the controller did not create is left in place.
+
+The TLS Secrets survive because cert-manager ships here with `enableCertificateOwnerRef: false`, so a `Certificate` does not own the Secret it issued into. That is how every mode transition behaves and is not something edge introduces. Removing the leftovers is an operator action.
+
+The wildcard replica is withdrawn because the namespace stops counting as a TLS termination point. Three things keep it anyway: a namespace that also owns an ingress controller still terminates locally; a namespace holding more than one `TenantGateway` keeps the replica while any of them is not on an edge-terminated class; and a namespace whose `TenantGateway` objects cannot be listed, or which carries the Gateway owner label but has no `TenantGateway` yet, keeps it as well, so that a transient read failure never withdraws a key a Gateway may still be serving.
+
+Moving back off an edge-terminated class restores whatever the new mode calls for: the ACME `Issuer` and its `Certificate`s under `http01` or `dns01`, the redirect route under any non-edge mode, and the wildcard replica whenever `publishing.certificates.wildcardSecretName` is set. The `TLSRoute` conditions go back too, since the passthrough listeners do: `http01` judges those routes again from the hostname claims it collects, while `dns01` and `existingSecret` collect none and so drop the entry rather than leave a withdrawal standing on a listener that is serving. `existingSecret` mints no `Issuer` and no `Certificate` of its own, so a move from `edge` into it brings back the replica and the redirect route and nothing else.
+
+The two halves of the move are not ordered against each other. The wildcard-secret controller watches the `TenantGateway` and prunes the replica as soon as `certMode` changes, while the `Gateway` itself is re-rendered when the tenant's HelmRelease reconciles, and the class controller reprograms after that. A tenant leaving `existingSecret` can therefore be briefly serving HTTPS listeners whose Secret has already gone.
+
+## When the configured names and the installed classes disagree
+
+Nothing in this mechanism checks that a class name corresponds to a `GatewayClass` the cluster actually has. Run `kubectl get gatewayclass` before putting a name into any of the three values.
+
+- **A name in `className` or `tenantSelectableClasses` that matches no installed class.** The tenant's release renders and the `Gateway` object is created, but no controller claims it, so it gets no address and no listener status. Nothing fails at render time; the symptom is the `TenantGateway` holding `Ready=False` with reason `GatewayNotAccepted`.
+- **A misspelled name in `edgeTerminatedClasses`.** It matches no class, so edge mode never engages for it and nothing says so. A tenant whose TLS really is terminated upstream stays in whichever mode the solver and wildcard-secret settings select, and its Gateway keeps terminating TLS itself.
+- **A class removed from `tenantSelectableClasses` while a tenant still names it.** That tenant's gateway release starts failing to render. Other tenants are unaffected.
+- **`className` changed while a tenant pins the outgoing name.** The allowed set is the *current* default plus `tenantSelectableClasses`, so the pin stops being valid and that tenant's gateway release fails. Add the outgoing class to `tenantSelectableClasses` before changing the default, or update the tenant first.
+- **A class whose `status.supportedFeatures` lists features but not `TLSRoute`.** A tenant Gateway that renders TLS-passthrough listeners on it reads `Ready=False` with reason `GatewayClassUnsupported`, naming the class, because nothing would serve those listeners. A class that lists no features at all is not judged, since implementations predating the field leave it empty.
+- **The publishing tenant selecting a class that terminates TLS differently from `className`.** Refused at render time, in both directions. The cluster-wide ACME `ClusterIssuer`s point their HTTP-01 solver at the publishing tenant's Gateway, and whether that solver pins `sectionName: http` is decided from `gateway.className` alone — a tenant's own choice does not travel on that channel. A publishing tenant that moved itself onto an edge class would keep a solver pinned to the `http` listener its Gateway no longer renders, and every HTTP-01 certificate in the cluster would stop issuing with nothing in any status naming the cause. Change `gateway.className` instead. The publishing tenant is the namespace named by `publishing.ingressName`, `tenant-root` by default.
+- **A comma or a non-string entry in either list.** The platform chart fails to render, naming the entry.
+
+## Checking what a tenant landed on
+
+```bash
+kubectl get gatewayclass
+
+kubectl --namespace tenant-acme get tenantgateway cozystack \
+  --output jsonpath='{.spec.gatewayClassName}{"\t"}{.spec.certMode}{"\n"}'
+
+kubectl --namespace tenant-acme get tenantgateway cozystack \
+  --output jsonpath='{range .status.conditions[?(@.type=="Ready")]}{.status}{"\t"}{.reason}{"\n"}{end}'
+
+kubectl --namespace tenant-acme get gateway cozystack \
+  --output jsonpath='{range .spec.listeners[*]}{.name}{"\t"}{.port}{"\t"}{.hostname}{"\n"}{end}'
+
+kubectl --namespace tenant-acme get certificate,issuer
+```
+
+A tenant on an edge-terminated class reports `certMode: edge`, shows port-80 listeners only, and has no `Certificate` or `Issuer` that this controller created. Leftover TLS Secrets from an earlier mode are not shown by the last command — list Secrets of type `kubernetes.io/tls` in the namespace to find those.
diff --git a/docs/gpu-vgpu.md b/docs/gpu-vgpu.md
index 68bbb7ec3c..af6e574f24 100644
--- a/docs/gpu-vgpu.md
+++ b/docs/gpu-vgpu.md
@@ -1,8 +1,8 @@
-# GPU Operator: vGPU Support
+# GPU Operator: passthrough and vGPU
 
 This document describes how to configure the GPU Operator package with NVIDIA vGPU support so that a single physical GPU can be sliced and shared across multiple virtual machines.
 
-**Last verified:** 2026-04-29 against KubeVirt `main` (`virt-handler` nightly `20260429_74d7c52588`) + this PR's `vgpu` variant + NVIDIA vGPU 20.0 host driver `595.58.02` + GRID guest driver `595.58.03`.
+**Last verified:** 2026-04-29 against KubeVirt `main` (`virt-handler` nightly `20260429_74d7c52588`) + the `vgpu` variant + NVIDIA vGPU 20.0 host driver `595.58.02` + GRID guest driver `595.58.03`.
 
 ## Two driver models
 
@@ -17,16 +17,140 @@ This guide focuses on the **SR-IOV path**, which is the only model NVIDIA suppor
 
 - An Ada Lovelace (or newer) NVIDIA GPU that supports SR-IOV vGPU (L4, L40, L40S, etc.).
 - Ubuntu 24.04 host OS. Older Ubuntu releases also work if the upstream `gpu-driver-container` repo has a matching `vgpu-manager/` Dockerfile. **Talos Linux is not recommended** for vGPU. NVIDIA does not publicly distribute the vGPU guest driver — it requires NVIDIA Enterprise Portal access — and Sidero [closed siderolabs/extensions#461](https://github.com/siderolabs/extensions/issues/461) noting that they cannot support vGPU "unless NVIDIA changes their licensing terms or provides us a way to obtain, test, and distribute the software". Building a Talos system extension that includes the driver in-tree is therefore not feasible without a private fork that violates the EULA.
-- KubeVirt with [kubevirt/kubevirt#16890](https://github.com/kubevirt/kubevirt/pull/16890) ("vGPU: SRIOV support", merged to `main` 2026-04-10). Targeted at the next minor release (v1.9.0); track the PR for the actual release tag. Released tags up to and including v1.8.x do not include the patch and backports are not planned. If you need vGPU before v1.9.0 lands you have to run a `main`-based nightly build of `virt-handler`; the rest of the operator can stay on the latest released tag.
+- KubeVirt v1.9.0 or newer, which is the release the platform bundles. [kubevirt/kubevirt#16890](https://github.com/kubevirt/kubevirt/pull/16890) ("vGPU: SRIOV support") shipped in v1.9.0; v1.8.x and older do not include it and backports are not planned.
 - An NVIDIA vGPU Software / NVIDIA AI Enterprise subscription (the `.run` is not redistributable).
 - A reachable NVIDIA Delegated License Service (DLS) instance and a matching `client_configuration_token.tok` file.
 
 ## Variants
 
-The `gpu-operator` package exposes two variants:
+The `gpu-operator` package exposes three variants. This document is vGPU-focused; the variant inventory is shared.
 
 - **`default`** — passthrough mode (`vfio-pci`). Whole GPU goes to a single VM. Talos is supported here; the kernel module is the open-source `vfio-pci`, no proprietary driver is needed on the host.
 - **`vgpu`** — SR-IOV vGPU mode. One physical GPU is sliced into multiple VFs, each VF bound to a vGPU profile that the guest sees as its own GPU.
+- **`container`** — containerized GPU workloads (CUDA pods, ML training) via the standard NVIDIA device plugin on hosts that already provide both the NVIDIA driver and `nvidia-container-toolkit` (the typical apt-installed Ubuntu/Debian shape). Sandbox workloads are off, `devicePlugin` is on, `driver` / `toolkit` / `vfioManager` / `cdi` are off so that the operator does not fight the host install. Orthogonal to the two VM variants — it does not pass GPUs to KubeVirt VMs. Note that `apt install nvidia-container-toolkit` installs binaries only — it does not configure containerd. Because this variant disables the operator's toolkit component (which would normally do that wiring), the host must additionally have run `nvidia-ctk runtime configure --runtime=containerd` (followed by a containerd restart) and exposed the `nvidia` runtime as the default or via a RuntimeClass before the device plugin can serve GPUs.
+
+## Passthrough variant: host preparation
+
+**Last verified:** 2026-05-28 against `cozystack.gpu-operator` chart `gpu-operator` v26.3.1 + image `nvcr.io/nvidia/cloud-native/k8s-driver-manager:v0.10.0` (distroless image with a Go ELF binary `/usr/bin/driver-manager`, entrypoint `["driver-manager", "preflight_check"]`; verified via `crane export … | tar -x usr/bin/driver-manager` and `strings` over the resulting binary) + Ubuntu 24.04 host with `nvidia-driver-580-open` 580.82.07 pre-installed. Tracks [#2763](https://github.com/cozystack/cozystack/issues/2763).
+
+The `default` (passthrough) variant assumes the GPU is **owned by the host kernel's `vfio-pci` driver and nothing else**.
+
+**How the operator detects a pre-installed host driver.** The chart's `vfio-manager` DaemonSet runs the upstream NVIDIA `k8s-driver-manager` init container with the `uninstall_driver` subcommand; that path calls the Go method `(*DriverManager).isHostDriver`, which runs `chroot /host nvidia-smi --query-gpu=driver_version --format=csv,noheader` and treats any non-empty stdout as "host driver present" (file-existence is not pre-tested — if `nvidia-smi` is missing, the chroot exec errors and `isHostDriver` returns false, which is the intended path on a clean host: the operator then proceeds with the uninstall flow and `vfio-manager` binds `vfio-pci` as designed). On a positive detection the binary logs `Host driver detected: <ver>`, labels the node `nvidia.com/gpu.deploy.driver=pre-installed`, exits, and `nvidia-sandbox-validator` then crashloops with `device not bound to 'vfio-pci'`.
+
+**`FORCE_REINSTALL` does not bypass this.** `k8s-driver-manager` v0.10.0 exposes a `FORCE_REINSTALL` / `--force-reinstall` env+flag pair (visible in the binary's strings table), but it gates a later "same-config already loaded" branch inside `uninstallDriver`, not the `isHostDriver` short-circuit at the top — operators who set it and expect a bypass will report a false bug. There is currently no opt-out for the `isHostDriver` guard itself.
+
+**Current mitigation.** The only mitigation that keeps VM passthrough working is to remove the host NVIDIA stack before enabling the variant (the "Clean-host workaround" section below).
+
+**Alternatives and scope.** The `container` variant of `cozystack.gpu-operator` is the no-purge path: it keeps the host driver and exposes GPUs to pods rather than VMs, so it does not replace passthrough for anyone who actually needs a GPU inside a VM. Talos is unaffected because the Talos image ships only the `vfio-pci` extension; this section applies to Linux distributions where you installed the host driver yourself (typically Ubuntu / Debian / RHEL with `apt install nvidia-driver-*` or equivalent). See also [`packages/system/gpu-operator/examples/README.md`](../packages/system/gpu-operator/examples/README.md) for the Talos native-pod-workload reference flow.
+
+### Symptom
+
+The first thing you see is `kubectl get pods -n cozy-gpu-operator` showing `nvidia-vfio-manager-*` stuck in `Init:Error` / `Init:CrashLoopBackOff` — the init container exits non-zero after detecting the host driver, so kubelet keeps restarting it.
+
+Its log shows it skipped the bind step:
+
+```text
+Host driver detected: 580.82.07
+NVIDIA GPU driver is already pre-installed on the node,
+  disabling the containerized driver
+Labeling node <NODE> with nvidia.com/gpu.deploy.driver=pre-installed
+```
+
+`nvidia-sandbox-validator` then crashloops:
+
+```text
+Error: error validating vfio-pci driver installation:
+  device not bound to 'vfio-pci'; device: 0000:18:00.0 driver: 'nvidia'
+```
+
+`lspci -nnk -d 10de:` still shows `Kernel driver in use: nvidia` on every target GPU, the node carries `nvidia.com/gpu.deploy.driver=pre-installed`, and `kubectl get node <NODE> -o json | jq '.status.allocatable | with_entries(select(.key | startswith("nvidia.com/")))'` reports `{}` — no GPU resource was registered.
+
+### Clean-host workaround
+
+Purge the NVIDIA host stack and blacklist the kernel modules so the host never re-claims the GPU. Two pitfalls to avoid: `apt autoremove` is dangerous here because the `nvidia-` prefix is shared with NVIDIA DOCA / Mellanox / InfiniBand userspace, so a blanket autoremove can take RDMA out on a converged GPU + RDMA host; and a hardcoded `apt purge 'nvidia-*' 'cuda-*'` pattern list is fragile — `apt` treats `*` as a cache-wide regex and **aborts the entire transaction, purging nothing**, if any pattern matches nothing in the cache (e.g. `cuda-*` on a host without NVIDIA's CUDA repo). Build the list from what is actually installed instead:
+
+```bash
+# dpkg-query patterns are true globs over INSTALLED packages: no
+# zero-match abort (unlike apt's cache-wide regex) and no accidental
+# substring over-match. List first, then review before purging.
+dpkg-query -W -f '${Package}\n' 'nvidia-*' 'libnvidia-*' 'cuda-*' 2>/dev/null
+```
+
+Review the list before purging:
+
+- `nvidia-dkms-*` and `nvidia-kernel-*` are the load-bearing kernel pieces — without removing them DKMS rebuilds `nvidia.ko` on the next reboot and the blacklist below is bypassed by any explicit `modprobe`.
+- On a **converged GPU + RDMA host**, drop any `libnvidia-*` that belong to NVIDIA DOCA / Mellanox OFED — purging those breaks RDMA.
+- If the list is **empty**, the driver was installed with NVIDIA's `.run` installer rather than apt — run `sudo nvidia-uninstall` instead of the purge below.
+
+Then purge the reviewed list, blacklist the modules, and rebuild the initramfs:
+
+```bash
+# Replace with the packages you kept from the list above.
+sudo apt purge nvidia-driver-580-open nvidia-dkms-580-open <...>
+
+sudo tee /etc/modprobe.d/blacklist-nvidia.conf > /dev/null <<'EOF'
+blacklist nouveau
+blacklist nvidia
+blacklist nvidia_drm
+blacklist nvidia_modeset
+blacklist nvidia_uvm
+blacklist nvidia_peermem
+EOF
+
+# -k all rebuilds EVERY installed kernel's initramfs (plain -u touches
+# only the running kernel), so a just-upgraded kernel also boots with
+# the blacklist and cannot re-claim the GPU.
+sudo update-initramfs -u -k all
+sudo reboot
+```
+
+After the reboot, confirm the host is clean. The init container exits non-zero after detecting a host driver, so both DaemonSet pods sit in `Init:CrashLoopBackOff` and **will retry on their own** — deleting them just skips the up-to-5-minute backoff window:
+
+```bash
+# Should print nothing.
+lsmod | grep -E '^(nvidia|nouveau)'
+
+# command -v matches what isHostDriver does (PATH lookup inside the
+# chroot), so it also catches /usr/local/bin/nvidia-smi left by a .run
+# or CUDA-toolkit install. Prints "ok: gone" on success.
+command -v nvidia-smi >/dev/null && echo "STILL PRESENT — purge incomplete" || echo "ok: gone"
+
+# A leftover DKMS module rebuilds nvidia.ko on the next kernel update
+# and an explicit modprobe bypasses the blacklist — should print nothing.
+dkms status | grep -i nvidia
+
+# Skip the CrashLoopBackOff backoff window by deleting the stuck pods.
+# The DaemonSet labels are operator-managed and not stable across
+# gpu-operator versions, so delete by name pattern — anchored so the
+# match is the two DaemonSets and nothing else.
+kubectl -n cozy-gpu-operator get pods -o name \
+  | grep -E '^pod/(nvidia-vfio-manager|nvidia-sandbox-validator)-' \
+  | xargs -r kubectl -n cozy-gpu-operator delete
+```
+
+Within a couple of minutes `vfio-manager` should bind every target GPU to `vfio-pci` and the node's `allocatable` will gain the registered resource:
+
+```bash
+lspci -nnk -d 10de: | grep 'Kernel driver in use'
+# Kernel driver in use: vfio-pci
+
+kubectl get nodes -o jsonpath='{range .items[*]}{.metadata.name}{": "}{.status.allocatable}{"\n"}{end}' | grep nvidia.com
+```
+
+One label is **not** cleaned up automatically. The init container set `nvidia.com/gpu.deploy.driver=pre-installed`, and the operator's success path restores only the operand labels — it never resets this one (`rescheduleGPUOperatorComponents` in `k8s-driver-manager` v0.10.0 touches the validator / toolkit / device-plugin / etc. labels, not `deploy.driver`). So the node keeps `pre-installed` indefinitely: it is the same label the Symptom section uses as evidence, and it would disable the containerized-driver DaemonSet if the node later switches to the `container` workload. Clear it once recovery is confirmed:
+
+```bash
+# Nothing on the success path resets this label; clear it so it does not
+# mislead future debugging or block a later container-workload switch.
+kubectl label node <NODE> nvidia.com/gpu.deploy.driver-
+```
+
+### Known limitation
+
+The skip-on-pre-installed behavior lives in the upstream [`NVIDIA/k8s-driver-manager`](https://github.com/NVIDIA/k8s-driver-manager) Go binary at `cmd/driver-manager/main.go`: the method `(*DriverManager).isHostDriver` is called from `(*DriverManager).uninstallDriver` and has no in-band opt-out in `:v0.10.0`. `FORCE_REINSTALL` exists as an env / CLI flag in the same binary but gates the later "same-config already loaded" branch inside `uninstallDriver`, not the `isHostDriver` short-circuit. Hosts that need to keep the NVIDIA host driver installed for non-Kubernetes workloads cannot currently share the same GPU with the passthrough variant. Two mitigation paths:
+
+- **`container` variant** — a third variant of `cozystack.gpu-operator` that targets the apt-installed-driver host shape and exposes GPUs to pods (not VMs) without unbinding the host driver. Available now, and selectable from platform values with `bundles.iaas.gpuOperatorVariant: container`. It solves the host-driver conflict by giving up VM passthrough, so it is a mitigation only for workloads that can run in a pod.
+- **Upstream override** — an env-var override of `isHostDriver` is the only structural fix that would let the passthrough variant coexist with a host driver. Not available today; requested in [NVIDIA/k8s-driver-manager#191](https://github.com/NVIDIA/k8s-driver-manager/issues/191).
 
 ## Building the vGPU Manager image
 
@@ -38,30 +162,30 @@ The proprietary `.run` is the **Linux KVM** variant (not the Ubuntu KVM `.deb`,
 
 ## Deploying with the vgpu variant
 
-Create a `Package` CR pointing at your image coordinates:
+The platform's `iaas` bundle deploys the gpu-operator Package CR when `cozystack.gpu-operator` is in `bundles.enabledPackages` and `bundles.iaas.gpuOperatorVariant: vgpu` is set. The vGPU Manager image is proprietary and not redistributable, so the bundle does not ship a default tag — the operator builds the container per the upstream [`gpu-driver-container`](https://github.com/NVIDIA/gpu-driver-container) recipe and supplies the private-registry coordinates through platform values:
 
 ```yaml
-apiVersion: cozystack.io/v1alpha1
-kind: Package
-metadata:
-  name: cozystack.gpu-operator
-spec:
-  variant: vgpu
-  components:
-    gpu-operator:
-      values:
-        gpu-operator:
-          vgpuManager:
-            repository: registry.example.com/nvidia
-            image: vgpu-manager
-            version: "595.58.02-ubuntu24.04"
-            # imagePullSecrets lives per-component (vgpuManager,
-            # driver, validator, dcgmExporter, …). The value is a
-            # list of strings, not [{name: ...}].
-            imagePullSecrets:
-            - nvidia-registry-secret
+bundles:
+  iaas:
+    enabled: true
+    gpuOperatorVariant: vgpu
+  enabledPackages:
+  - cozystack.gpu-operator
+
+gpu:
+  vgpuManager:
+    repository: registry.example.com/nvidia
+    image: vgpu-manager
+    version: "595.58.02-ubuntu24.04"
+    # imagePullSecrets lives per-component (vgpuManager, driver,
+    # validator, dcgmExporter, …). The value is a list of strings,
+    # not [{name: ...}].
+    imagePullSecrets:
+    - nvidia-registry-secret
 ```
 
+The platform forwards `gpu.vgpuManager` into the emitted gpu-operator Package CR's `components.gpu-operator.values.gpu-operator.vgpuManager`, so the bundle handles the variant + image coordinates in one place. If you need to override anything else on the gpu-operator chart (driver, validator, dcgmExporter, custom node selectors), hand-craft a `Package` CR named `cozystack.gpu-operator` with the full `components.gpu-operator.values` block and put that name in `bundles.disabledPackages`. A hand-written Package CR does not take precedence over the bundle: as long as the platform emits its own copy of that package, the next platform render replaces whatever you wrote.
+
 The `nvidia-registry-secret` should be a docker-registry Secret created beforehand in `cozy-gpu-operator`.
 
 Verify the DaemonSet is running and `nvidia.ko` loads on every GPU node:
@@ -94,24 +218,56 @@ For Pascal–Ampere GPUs (V100, T4, A100, A30) the mdev model still applies. Fli
 
 ## KubeVirt configuration
 
-After [kubevirt#16890](https://github.com/kubevirt/kubevirt/pull/16890), `virt-handler` recognises SR-IOV VFs bound to the `nvidia` driver as candidates whenever a vGPU profile is configured (`current_vgpu_type` ≠ 0). PFs are skipped automatically.
+When `cozystack.gpu-operator` is in `bundles.enabledPackages` (and not also in `bundles.disabledPackages`), the platform mirrors the chosen GPU variant into the `KubeVirt` CR automatically. There is no manual `kubectl patch` step. This applies to the two VM variants only: `container` serves GPUs to pods and never to VMs, so selecting it emits the gpu-operator Package with no host-device wiring on the KubeVirt side.
+
+If you opt out of bundle management and hand-craft a `cozystack.gpu-operator` Package CR directly — typically to apply overrides the bundle does not expose (driver settings, custom node selectors, validator / dcgmExporter tweaks, etc.) — the platform does NOT auto-wire `HostDevices` or `permittedHostDevices` into the KubeVirt CR. In that flow you also hand-craft a `cozystack.kubevirt` Package CR with `components.kubevirt.values.extraFeatureGates: [HostDevices]` and the appropriate `permittedHostDevices` block. The escape-hatch values shape under `.gpu` (below) is intentionally documented in the bundle-managed flow only. Both hand-crafted Package CRs need their names in `bundles.disabledPackages`: the iaas bundle emits `cozystack.kubevirt` on every render and `cozystack.gpu-operator` on every render that has it in `bundles.enabledPackages`, and that render replaces the hand-written spec rather than merging with it.
+
+- `developerConfiguration.featureGates` gets `HostDevices` appended (current KubeVirt splits this from the `GPU` gate; the admission webhook rejects `spec.template.spec.domain.devices.hostDevices` without it).
+- `permittedHostDevices.pciHostDevices` is filled from `packages/core/platform/files/gpu-passthrough-defaults.yaml` when `bundles.iaas.gpuOperatorVariant: default` (the package default) and `gpu.replaceDefaults` is left at `false`. The table covers Hopper (H100/H200), Ada Lovelace (L4/L40/L40S), Ampere (A100 PCIe/SXM, A40, A30, A10), Turing (T4), Volta (V100/V100S). All entries carry `externalResourceProvider: true` because the resource names come from `nvidia-sandbox-device-plugin`, not from KubeVirt's in-tree device plugin.
+- `permittedHostDevices.mediatedDevices` is filled from `packages/core/platform/files/gpu-vgpu-defaults.yaml` when `bundles.iaas.gpuOperatorVariant: vgpu` **and** `gpu.vgpuDeviceManager.enabled: true` — that knob defaults to `false`, so a stock vgpu cluster ships no mdev table at all (see the Ada Lovelace / Blackwell note below for why). `gpu.replaceDefaults: true` also suppresses it. This list only EXPOSES, by profile name (`mdevNameSelector`), mdevs that the GPU Operator's vGPU Device Manager CREATES on the node; the platform does not ship a numeric `mediatedDevicesConfiguration` default (those `nvidia-NNN` type ids are per-SKU/driver sysfs indices with no portable value — set `.gpu.mediatedDevicesConfiguration` yourself, with host-verified ids, only if you want KubeVirt rather than the Device Manager to create mdevs). The starter set covers Pascal–Ampere mdev profiles (A100-40C/80C, A40-24Q/48Q, A30-24C, A10-24Q, V100D-32C, T4-16Q) — the same family range as the upstream `vgpu-device-manager` walks `/sys/class/mdev_bus/` for. Ada Lovelace / Blackwell SR-IOV vGPU is out of scope for the chart's default list; advertise those VFs via the user-override hook below.
+
+### Extending or replacing the default table
 
-Patch the `KubeVirt` CR to permit the resource:
+The platform exposes three knobs under `.gpu`:
 
 ```yaml
-spec:
-  configuration:
-    permittedHostDevices:
-      pciHostDevices:
-      - pciVendorSelector: "10DE:26B9"   # L40S — same device ID for PF and VF
-        resourceName: nvidia.com/L40S-24Q
+gpu:
+  # Extend the platform defaults with cluster-specific entries. Read by
+  # the two VM variants only; the container variant reads neither key.
+  # pciHostDevices is read in both of them — it feeds the passthrough
+  # (vfio-pci) path AND the post-kubevirt#16890 SR-IOV vGPU VF path on
+  # Ada Lovelace / Blackwell. mediatedDevices is read in vgpu alone, for
+  # the pre-#16890 mdev path on Pascal–Ampere; the passthrough variant
+  # ignores it. Both render into the same KubeVirt CR.
+  permittedHostDevices:
+    pciHostDevices:
+    - pciVendorSelector: "10DE:26B9"   # L40S, advertised as a VF for SR-IOV vGPU
+      resourceName: nvidia.com/L40S-24Q
+      # externalResourceProvider is intentionally omitted here: after
+      # kubevirt/kubevirt#16890, virt-handler's in-tree device plugin
+      # advertises the resource directly, no sandbox plugin in the loop.
+    mediatedDevices: []
+  # mediatedDevicesConfiguration makes KubeVirt itself create mdevs (vgpu mode). No platform default: mdev creation is normally delegated to the vGPU Device Manager (name-based), and these mediatedDeviceTypes are host/driver-specific nvidia-NNN sysfs indices (look yours up via /sys/bus/pci/devices/<BDF>/mdev_supported_types/*/name). Set this only to opt into KubeVirt-driven creation; mergeOverwrite REPLACES a supplied top-level key wholesale.
+  mediatedDevicesConfiguration: {}
+  # Wipe the platform defaults entirely and ship only the cluster's
+  # curated lists. Useful for non-NVIDIA-only clusters and strict
+  # allowlist requirements.
+  replaceDefaults: false
 ```
 
+`replaceDefaults: false` (the default) appends user entries to the NVIDIA defaults. `replaceDefaults: true` drops the NVIDIA table entirely — if you don't then supply your own pciHostDevices / mediatedDevices list, the rendered KubeVirt CR has no `permittedHostDevices` block and the admission webhook will reject every GPU VM.
+
+### Notes on `nvidia-sandbox-device-plugin` resource names
+
+The `resourceName` strings in `gpu-passthrough-defaults.yaml` are what `nvidia-sandbox-device-plugin` (`nvcr.io/nvidia/kubevirt-gpu-device-plugin`) advertises: it derives each slug mechanically from the device's PCI-IDs database name by uppercasing it, turning `/`, `.` and whitespace into `_`, and stripping the remaining non-alphanumerics (the `[` / `]`). So `TU104GL [Tesla T4]` becomes `nvidia.com/TU104GL_TESLA_T4` and `GA100GL [A30 PCIe]` becomes `nvidia.com/GA100GL_A30_PCIE` — the slug carries every token the PCI-IDs string holds (the `GL` die suffix, the `Tesla` brand on Turing/Volta, form factor, memory), not a tidy `<arch>_<model>`. The names track the pci.ids snapshot bundled in the plugin image, so a different plugin build can publish a different string — check with `kubectl describe node <node> | grep nvidia.com/` and override via `.gpu.permittedHostDevices.pciHostDevices` (or wipe the table with `replaceDefaults: true` and curate it yourself). PCI vendor:device IDs themselves are stable across driver versions.
+
+### SR-IOV PF vs VF (Ada Lovelace and newer)
+
 On L40S (and other Ada-Lovelace cards) the SR-IOV VFs report the same PCI device ID as the PF — `lspci -nn -d 10de:` on the host shows both as `[10de:26b9]`. `virt-handler` distinguishes them by `is-VF + has-vGPU-profile`, so a single `pciVendorSelector` matches the right set. Verify on your specific GPU before assuming this — some other generations split PF/VF IDs.
 
-`externalResourceProvider: true` is **not** required here (and should be omitted) — the device plugin lives inside `virt-handler` itself, no external sandbox-device-plugin advertises this resource.
+`externalResourceProvider: true` is **not** required when the resource is advertised by `virt-handler`'s in-tree device plugin (the SR-IOV path post kubevirt#16890). The platform passthrough defaults include the flag because that path is driven by the external sandbox plugin.
 
-Verify allocatable capacity:
+### Verifying allocatable capacity
 
 ```bash
 kubectl get nodes -o jsonpath='{range .items[*]}{.metadata.name}{": "}{.status.allocatable.nvidia\.com/L40S-24Q}{"\n"}{end}'
@@ -231,10 +387,12 @@ Other GPU families have analogous tables in the [NVIDIA Virtual GPU Software Doc
 
 ## OS support summary
 
-| Host OS | passthrough (`default`) | vGPU (`vgpu`) |
-| --- | --- | --- |
-| Ubuntu 24.04 | ✅ supported upstream | ✅ supported upstream (`vgpu-manager/ubuntu24.04`) |
-| Ubuntu 22.04 | ✅ | ✅ |
-| Ubuntu 20.04 | ✅ | ✅ |
-| Ubuntu 26.04 | ⚠️ patch needed in `nvidia-driver` for usr-merge | ⚠️ same patch + own Dockerfile fork |
-| Talos Linux | ✅ (open `vfio-pci`) | ❌ NVIDIA does not grant redistribution rights for the proprietary `.run`; we tried and the path is blocked |
+The `container` variant column assumes the host already ships the NVIDIA driver and `nvidia-container-toolkit` via the distro package manager, with the `nvidia` runtime registered in containerd (`nvidia-ctk runtime configure --runtime=containerd`). With `driver.enabled=false` the operator uses the pre-installed host driver at its standard location, so a stock apt install needs no `hostPaths.driverInstallDir` override. Talos installs the driver under a non-standard prefix, so the operator does not find it at the default location — see `packages/system/gpu-operator/examples/` for the Talos-specific path with a compat DaemonSet and an explicit `hostPaths.driverInstallDir` override.
+
+| Host OS | passthrough (`default`) | vGPU (`vgpu`) | container (`container`) |
+| --- | --- | --- | --- |
+| Ubuntu 24.04 | ⚠️ supported upstream, but the host must be clean of any apt-installed NVIDIA driver — see ["Passthrough variant: host preparation"](#passthrough-variant-host-preparation) | ✅ supported upstream (`vgpu-manager/ubuntu24.04`) | ✅ apt-installed driver + nvidia-container-toolkit |
+| Ubuntu 22.04 | ⚠️ same clean-host requirement as 24.04 | ✅ | ✅ |
+| Ubuntu 20.04 | ⚠️ same clean-host requirement as 24.04 | ✅ | ✅ |
+| Ubuntu 26.04 | ⚠️ same clean-host requirement as 24.04, plus a `nvidia-driver` patch for usr-merge (details pending) | ⚠️ same patch + own Dockerfile fork | ✅ |
+| Talos Linux | ✅ (open `vfio-pci`; the Talos image ships no host NVIDIA stack, so the clean-host check passes trivially) | ❌ NVIDIA does not grant redistribution rights for the proprietary `.run`; we tried and the path is blocked | ⚠️ host driver lands in a non-standard prefix — use `examples/values-native-talos.yaml` (compat DaemonSet + `hostPaths.driverInstallDir` override) as a starting point instead |
diff --git a/docs/observability/distributed-tracing.md b/docs/observability/distributed-tracing.md
new file mode 100644
index 0000000000..d4e6ad80a6
--- /dev/null
+++ b/docs/observability/distributed-tracing.md
@@ -0,0 +1,123 @@
+# Distributed tracing
+
+Distributed tracing is the third observability signal in Cozystack, alongside metrics (VictoriaMetrics) and logs (VictoriaLogs). This guide explains what the platform provides, how to send traces from your workloads, what each managed engine can and cannot emit on its own, and how tenants can share one traces store instead of running their own. The design is [cozystack/community `design-proposals/distributed-tracing`](https://github.com/cozystack/community/tree/main/design-proposals/distributed-tracing).
+
+## What the platform provides
+
+A tenant's Monitoring application stands up two pieces once tracing is configured:
+
+- A **VictoriaTraces backend**, one per `tracingStorages` entry (a `VTCluster` in `cluster` mode, a `VTSingle` in `single` mode), with a Grafana Jaeger datasource named `vtraces-<entry name>` for viewing its spans.
+- A **per-tenant OpenTelemetry Collector**, the app-facing OTLP ingest gateway, reachable in the tenant namespace at:
+  - **`otel-traces:4317`**: OTLP over gRPC
+  - **`otel-traces:4318`**: OTLP over HTTP
+
+The collector applies head sampling (10% by default) and optional attribute redaction, then forwards spans to the backend. It lives in your tenant namespace, so traffic from your workloads to it stays inside the namespace. With the default per-tenant backend the spans stay there too; with [shared-central tracing](#shared-central-tracing) the collector forwards them to a store in tenant-root.
+
+What the platform does **not** do is emit spans for you: producing spans is the workload's job. The platform delivers the transport, storage and tenancy; the *depth* of what shows up is a property of how each application or engine is instrumented.
+
+## Sending traces from your application (client-side)
+
+This is the primary path and it works for any workload with OpenTelemetry instrumentation (an OTel SDK in your code, or an auto-instrumentation agent). You do **not** hard-code the endpoint: point your workload at the in-namespace collector through the standard OpenTelemetry environment variables:
+
+```yaml
+env:
+  # Send to the per-tenant collector over OTLP/HTTP (use :4317 for gRPC).
+  - name: OTEL_EXPORTER_OTLP_ENDPOINT
+    value: "http://otel-traces:4318"
+  - name: OTEL_EXPORTER_OTLP_PROTOCOL
+    value: "http/protobuf"
+  # Name this service and the environment it runs in.
+  - name: OTEL_SERVICE_NAME
+    value: "my-app"
+  - name: OTEL_RESOURCE_ATTRIBUTES
+    value: "deployment.environment.name=production"
+```
+
+The variables are defined by the OpenTelemetry specification, and the official SDKs and agents read them, but support for each variable differs per language: check your SDK against the [specification compliance matrix](https://github.com/open-telemetry/opentelemetry-specification/blob/main/spec-compliance-matrix.md). For a JVM workload you can add the OpenTelemetry Java agent (`-javaagent:/otel/opentelemetry-javaagent.jar`), and the same variables drive it with no code changes. To use gRPC instead, set the endpoint to `http://otel-traces:4317` **and** `OTEL_EXPORTER_OTLP_PROTOCOL=grpc`; with [shared-central tracing](#shared-central-tracing), stay on HTTP, since spans refused over the tenant's write rate are retried only over HTTP, and keep each export request below 3 MiB.
+
+You do not need to tag your tenant: the backend a tenant writes to is its own, and in shared-central mode the platform attributes every span to its tenant itself. `service.namespace` is for grouping your own services (for example by team), not for the tenant.
+
+Once spans arrive, they are visible in Grafana under **Explore**, in the traces datasource.
+
+> **Correlation is not wired yet.** Cross-signal pivots, span to logs by `trace_id` and span to RED metrics, are part of the design but not configured: the traces datasource carries no links to logs or metrics, and no `spanmetrics` connector produces span metrics. Traces are viewable on their own until that follow-up work lands.
+
+## What each managed engine can emit
+
+Tracing depth differs per engine, because a sidecar cannot see *inside* a server process. Most managed servers do **not** emit OTLP spans themselves; their tracing is client-side (instrument the application that talks to them).
+
+| Engine | Server-side OTLP spans? | How you get traces |
+| --- | --- | --- |
+| **ClickHouse** | Partial: native span *table*, no push, disabled | The server can record internal query spans into `system.opentelemetry_span_log`, which the Cozystack chart removes (see below). Client-side propagation gives end-to-end traces. |
+| **PostgreSQL** | No (extension-gated) | Statement-level spans need the `pg_tracing` extension, which is not in the `sharedPreloadLibraries` allowlist, and `shared_preload_libraries` cannot be set through `parameters`. Use client-side instrumentation. |
+| **Kafka** | No (brokers) | Brokers do not emit request spans; instrument producers/consumers (client-side). JVM clients can use the OTel Java agent. |
+| **RabbitMQ** | No (non-OTLP) | The `rabbitmq_tracing` plugin emits RabbitMQ-format events, not OTLP. Instrument publishers/consumers (client-side). |
+| **NATS** | No | Server message-tracing emits NATS-format events, not OTLP. Instrument clients (context is propagated in message headers). |
+| **MariaDB** | No | No server-side OTLP. Instrument the application (client-side). |
+| **Redis** | No | No server-side OTLP. Instrument the application (client-side). |
+
+The takeaway: for every engine here, the way to get a useful request trace is to **instrument the application** that issues the queries or messages and point it at `otel-traces` as shown above. The engine then appears as a span in your application's trace when context is propagated.
+
+## ClickHouse: internal query spans
+
+ClickHouse is the one engine that produces spans natively: it can record query-execution spans into the `system.opentelemetry_span_log` system table and take part in a trace whose context a client propagates through the W3C `traceparent` header. The Cozystack ClickHouse chart removes that log in its server configuration, alongside the other system logs it disables, and the ClickHouse application exposes no setting to turn it back on, so these spans are not available today.
+
+Even with the log enabled, ClickHouse has **no native OTLP push**: getting those spans into a collector, and so into Grafana, needs a shipper that reads `system.opentelemetry_span_log` and forwards OTLP, which neither Vector nor Fluent Bit does. Both are follow-up work; end-to-end request traces come from client-side instrumentation, as for every other engine.
+
+## Sampling, redaction, and tenancy
+
+- **Sampling:** the collector head-samples traces at 10% by default (`tracingCollector.samplingPercentage`). The decision is made per trace ID, so a kept trace keeps all of its spans and several collector replicas agree on it. A busy application keeps about one trace in ten, so the backend is not overwhelmed.
+- **Redaction (PII):** span attributes can carry sensitive data (SQL text with literals, parameters, connection strings). List such keys in `tracingCollector.redactAttributes` to drop them before export.
+- **Tenancy:** with the default per-tenant backend, spans never leave the tenant namespace, and only the tenant's own Grafana reads them. With shared-central tracing they are stored in tenant-root; see below for how tenants are kept apart there.
+
+## Shared-central tracing
+
+Instead of a VictoriaTraces backend per tenant, tenants can send their spans to one store in tenant-root. Applications do not change: they keep sending to `otel-traces` in their own namespace, and the collector forwards to the shared store.
+
+### Hosting the store (tenant-root)
+
+tenant-root opts in with `tracingCentralHost: true` on its Monitoring application, next to a `tracingStorages` entry named `generic` in `cluster` mode; that store is then shared with every tenant that opts in. A vmauth in tenant-root fronts it, and every central tenant's collector and Grafana go through that vmauth.
+
+All central tenants share the store's disk and retention with tenant-root, and nothing reserves space per tenant. Every traces store is bounded by disk usage: without `retentionDiskUsageBytes` it drops its oldest day once its volume is 80% full. VictoriaTraces always keeps the last two days, though, so the disk cap alone does not stop a fast writer from filling the volume.
+
+There is no per-tenant allow-list: with hosting on, every tenant that sets `tracingCentral` is admitted, nested tenants included. A tenant-root that needs to limit who shares its store keeps `tracingCentralHost` off.
+
+### The per-tenant write rate
+
+Because the disk cap alone does not bound a fast writer, each central tenant is also held to a write rate, which the platform sets with `monitoring.tracingCentralTenantBytesPerSecond` in the platform package, as a whole number of bytes per second up to 1099511627776 (1 TiB/s); any other value fails the platform render. By default it is about 97 KiB/s, at which one tenant writes at most the disk cap of a default 10Gi store over the two days, so raise it with the store. The rate is counted uncompressed and before the collector samples, so the store receives only the sampled share of it and keeps that compressed. A change reaches every tenant's collector through the `cozystack-values` Secret, and upgrades every release in every tenant once.
+
+The collector Cozystack ships is built with a rate-limit processor, and each central tenant's collector enforces the rate, split across its replicas: a sender whose connection stays on one replica gets that replica's share. Data above the rate is refused. An OTLP/HTTP exporter gets a 429 and retries; an OTLP/gRPC exporter gets `RESOURCE_EXHAUSTED` without the `RetryInfo` the OTLP specification requires for a retry, so it drops those spans. A request larger than 3 MiB, decompressed, is refused with a 400, which exporters do not retry. Applications of central tenants should therefore export over HTTP, in batches below 3 MiB.
+
+The limiter keeps its state in each collector pod's memory, and every pod starts with a full allowance, so a pod start lets through above the rate up to 5 MiB, or one second of the pod's share of the rate when that is larger. Shared-central tracing therefore allows at most 10 collector replicas, and the tenant's Monitoring render fails above that. The rate bounds each tenant, not their sum: several tenants writing at their limits together can still exceed the cap, so size the volume for the tenants you admit.
+
+### Opting a tenant in
+
+Set `tracingCentral: true` on the Tenant, which needs `monitoring: true` on the same tenant. The tenant chart then renders the egress rules the collector and Grafana need to reach the vmauth, and switches the tenant's Monitoring to the shared store. If tenant-root does not host the store, the tenant's Monitoring render fails with a message naming the prerequisite, rather than dropping spans.
+
+In the tenant's Grafana the shared store appears as the `traces-central` datasource. The tenant's own local stores, if it lists any, keep their datasources, so traces stored before the switch stay readable until the tenant removes those entries.
+
+### Isolation and the trust boundary
+
+The store itself authorizes nothing; it takes the tenant from request headers. Each central tenant gets two VMUsers that pin one account, derived from its namespace name and UID: the collector's, which may only write, and its Grafana's, which may only read, each with its own Secret (`traces-central-credentials` and `traces-central-reader-credentials`). vmauth replaces any account a client sends. Tenant pods can reach only the vmauth proxy port, and only from pods carrying the collector's or Grafana's label, with the tenant's credentials. So tenants sharing the store cannot read or write each other's traces.
+
+Within its own account, a tenant writes only through its collector, so the write rate holds. Grafana's login cannot write, so a write sent through the Grafana datasource proxy, which vmauth would otherwise route to the store, finds no route. The collector and Grafana images are the platform's and cannot be set from the Monitoring application, and of a Secret named in `oidc.customConfig.secretRef` only its `auth.ini` key is mounted into Grafana, so the collector's password does not reach a pod the tenant can shape.
+
+tenant-root is inside the store's trust boundary. Its workloads reach the store directly, and one that learns a tenant's account can read and write it. Whoever tenant-root admits to its Grafana can read every account through tenant-root's own datasource for the store, which does not go through vmauth. Who that is follows tenant-root Grafana's OIDC mode: with `System`, tenant-root's own groups, which already hold the same access level in every tenant under it; with `CustomConfig` or `None`, whoever that configuration admits.
+
+### Lifecycle
+
+- **The account follows the namespace.** It is derived from the namespace name and UID, so a re-created namespace, a restored one included, starts a new account and does not see the spans stored before.
+- **Turning central on** keeps the tenant's local stores and their datasources. Right after it, spans the collector sends before the vmauth has loaded the tenant's login get a 401, which the exporter does not retry, so those spans are dropped. The same happens after the tenant's `traces-central-credentials` Secret is re-created with a new password; after `traces-central-reader-credentials` is, the tenant's Grafana gets a 401 on reads until the vmauth loads the new login.
+- **Turning central off** removes the tenant's login to the shared store. The spans it wrote there stay until the store's retention drops them and cannot be read from the tenant while it is off; turning it on again on the same namespace makes them readable again. Spans sent between turning it off and the collector switching back to a local store may be dropped, since the egress rule to the shared store goes first.
+- **Deleting a tenant** leaves its spans in the shared store until retention drops them.
+
+### Stopping hosting
+
+Turn `tracingCentral` off on every central tenant and let its Monitoring reconcile before tenant-root stops hosting. tenant-root's render refuses to stop hosting while a central tenant's VMUsers remain and lists the tenants still holding them. Removing tenant-root's Monitoring altogether is not a render and is not refused; until the central tenants turn central off, every Monitoring render of theirs fails, their metrics, logs and alerting changes included.
+
+The two refusals read each other's objects when they render, so a tenant turning central on while tenant-root stops hosting can pass both. That tenant's collector then exports to a vmauth that is gone while every release reports Ready, until its Monitoring renders again. Recover by hosting again; turning the tenant's `tracingCentral` off instead stops the silent drop, and turning it on again is then refused until tenant-root hosts.
+
+## Prerequisites
+
+- The tenant's Monitoring application with a `tracingStorages` entry, or shared-central tracing turned on for the tenant, and `tracingCollector.enabled` left on (the default).
+- For shared-central tracing: tenant-root hosting the store, as described above, and at most 10 collector replicas (`tracingCollector.replicas`).
+- A workload with OpenTelemetry instrumentation (SDK or auto-instrumentation agent).
diff --git a/docs/oidc-grafana.md b/docs/oidc-grafana.md
new file mode 100644
index 0000000000..d5d89b7e33
--- /dev/null
+++ b/docs/oidc-grafana.md
@@ -0,0 +1,405 @@
+# OIDC for the Grafana instance (Phase 1)
+
+Cozystack ships one Grafana codebase deployed twice, both released as `monitoring-system` and differing only by namespace: the platform instance runs in `tenant-root` and a per-tenant instance runs in every tenant namespace. Both instances opt in to OIDC authentication through the same flat selector on the `Monitoring` CR. This document covers the operator-facing surface: what the modes mean, what the chart provisions, and how a user signs in.
+
+The architectural rationale lives in
+[cozystack/community#24](https://github.com/cozystack/community/pull/24)
+— in particular why per-tenant Keycloak realms are deliberately
+deferred to Phase 2. This Grafana integration follows the same shape
+as the tenant kube-apiserver's Phase 1
+([cozystack/cozystack#3044](https://github.com/cozystack/cozystack/pull/3044)),
+adapted for a server-side (confidential) OAuth client instead of a
+public kubectl one: authentication is wired up by the chart, but
+authorization is an operator-supplied `users:` map reconciled into
+the target (Grafana orgs here, ClusterRoleBindings in #3044) by a
+chart-owned Job. The chart does not own any directory objects.
+
+## Selector
+
+```yaml
+apiVersion: apps.cozystack.io/v1alpha1
+kind: Monitoring
+metadata:
+  name: monitoring
+  namespace: tenant-acme
+spec:
+  oidc:
+    mode: System        # System | CustomConfig | None (default)
+    users:
+      - email: alice@acme.example
+        role: Admin
+      - email: bob@acme.example
+        role: Viewer
+```
+
+Three modes:
+
+- **None** — the only user-facing path is the `grafana-admin-password`
+  Secret, exposed to the tenant through
+  `packages/system/monitoring-rd`. This is the default; existing
+  instances render byte-identical to before.
+- **System** — the Grafana instance trusts the platform `cozy` Keycloak
+  realm via a per-instance confidential client. Users are the ones a
+  platform admin already provisioned in `cozy`; the tenant does not
+  manage a directory of its own.
+- **CustomConfig** — Grafana trusts a tenant-supplied OIDC issuer
+  directly. `cozy` is not in the path. Use for BYO IdPs (Okta, Auth0,
+  a customer's own Keycloak).
+
+The `grafana-admin-password` Secret stays a documented break-glass
+path in every mode; `disable_login_form` is not flipped by this
+selector. Hardening that further (e.g. locking the form off in
+`System` mode) is a follow-up.
+
+## System mode
+
+What the chart provisions, in the release namespace of the Monitoring
+CR:
+
+1. **KeycloakClient** named `<namespace>-<release>` in the `cozy`
+   realm — `public: false`, `directAccess: false`. The `secret` field
+   points at a chart-owned Kubernetes Secret via the EDP-Keycloak
+   `$<secret>:<key>` syntax so the operator provisions the same
+   confidential secret to Keycloak that Grafana reads at runtime.
+   `redirectUris` is locked to
+   `https://grafana.<host>/login/generic_oauth`.
+2. **KeycloakClientScope** named `<namespace>-<release>-audience`
+   carrying an `oidc-audience-mapper` that pins `id_token.aud` to the
+   per-instance clientId. This is the per-instance isolation
+   primitive: a token minted for one Monitoring release is rejected
+   by another's Grafana.
+3. A **Secret** `<release>-oidc-client` carrying a random 32-char
+   `client-secret`. Generated on first install (`lookup` + random
+   fallback, same pattern as `packages/system/dashboard`), preserved
+   across upgrades.
+4. The Grafana CR's `spec.config.auth.generic_oauth` section wired to
+   the platform realm issuer (`cozy` by default, `authentication.oidc.realmName`) + the per-instance audience scope. Two
+   independent gates ride on top of the raw OAuth wiring:
+
+   **Tenant-membership gate — unconditional in System mode.** The chart
+   requests the `groups` OIDC scope (already provisioned platform-wide
+   by `packages/system/keycloak-configure` as a realm-default
+   KeycloakClientScope with an `oidc-group-membership-mapper`) and sets
+
+   ```
+   allowed_groups = <namespace>-view <namespace>-use <namespace>-admin <namespace>-super-admin
+   groups_attribute_path = groups
+   ```
+
+   `groups_attribute_path` is REQUIRED alongside `allowed_groups` on
+   Grafana v11.x+: without it Grafana leaves the extracted
+   `user.Groups` slice empty regardless of what the userinfo endpoint
+   returns, and the gate rejects every login with "user not a member
+   of one of the required groups" — even when the token carries the
+   correct claim (verified end-to-end on a test cluster with Grafana v11.6.15).
+   The JMESPath expression `groups` reads the top-level `groups`
+   array from userinfo, matching the shape Keycloak's
+   `oidc-group-membership-mapper` emits.
+
+   The four groups match the KeycloakRealmGroups the tenant chart
+   provisions in the `cozy` realm — see
+   `packages/apps/tenant/templates/keycloakgroups.yaml`. Grafana
+   rejects any login whose token does not carry at least one of these
+   groups. This is the isolation primitive that stops tenant-alice
+   from signing into tenant-bob's Grafana even though both authenticate
+   against the same flat `cozy` realm. The audience mapper in point 2
+   protects against *replay* of a minted token across releases; this
+   gate protects against *issuance* of a usable token to a caller
+   outside the release's tenant.
+
+   **Users-map contract — active only when `spec.oidc.users` is
+   non-empty.** Three additional keys are merged on top:
+   - `skip_org_role_sync = true` — a login never overwrites the
+     users-Job's role assignments;
+   - `oauth_allow_insecure_email_lookup = true` — the OIDC identity
+     binds to the pre-provisioned local account by email;
+   - `allow_sign_up = false` — a cozy-realm identity whose email is
+     NOT in `spec.oidc.users` is rejected at login (even if they are
+     a tenant member and pass the group gate) instead of being
+     admitted as `auto_assign_org_role` Viewer and waiting for the
+     next helm-upgrade prune pass to clean them up.
+
+   When `spec.oidc.users` is empty (or unset) the three users-map
+   keys are NOT forced. The tenant-membership gate still applies, so
+   only tenant members can log in — they land at Grafana's
+   `auto_assign_org_role` default (`Viewer`). This is the intended
+   hands-off contract: the chart owns nothing app-side, but the
+   Keycloak-layer gate still isolates the release. Cross-tenant
+   users are rejected outright; in-tenant users get a self-service
+   Viewer with no org-role management by the chart.
+5. A `GF_AUTH_GENERIC_OAUTH_CLIENT_SECRET` env on the Grafana
+   Deployment sourced from the Secret in step 3.
+6. A post-install/post-upgrade **users-Job** — see the "Users and
+   RBAC" section — that reconciles `spec.oidc.users` into Grafana's
+   Main Org.
+
+No `KeycloakRealmGroup`s and no `role_attribute_path`. Directory
+objects (users, groups, group memberships) stay owned by whoever
+operates the `cozy` realm; the Monitoring release only requests
+authentication wiring, it does not act as a user directory.
+
+Server-level `GrafanaAdmin` promotion (`allow_assign_grafana_admin`)
+is out of scope for Phase 1. All Grafana instances — platform and
+tenant — cap at org-level `Admin`.
+
+## CustomConfig mode
+
+The tenant supplies the entire `[auth.generic_oauth]` payload. Two
+paths:
+
+```yaml
+spec:
+  oidc:
+    mode: CustomConfig
+    customConfig:
+      config:
+        client_id: my-grafana
+        client_secret: xxxxxxxx
+        auth_url: https://idp.acme.example/protocol/openid-connect/auth
+        token_url: https://idp.acme.example/protocol/openid-connect/token
+        api_url: https://idp.acme.example/protocol/openid-connect/userinfo
+        scopes: openid email profile
+```
+
+…or via an existing Secret in the tenant namespace whose `auth.ini`
+key holds a ready-made `[auth.generic_oauth]` fragment:
+
+```yaml
+spec:
+  oidc:
+    mode: CustomConfig
+    customConfig:
+      secretRef:
+        name: acme-byo-grafana-auth
+```
+
+When `spec.oidc.users` is non-empty the chart merges three settings
+on top of the operator's inline map so the users-Job contract holds
+in `CustomConfig` mode too:
+
+- `skip_org_role_sync = true` — a login never overwrites the Job's
+  org-role assignments;
+- `oauth_allow_insecure_email_lookup = true` — the OIDC identity
+  binds to the pre-provisioned local account by email;
+- `allow_sign_up = false` — an OIDC identity whose email is not in
+  the users-map is rejected at login instead of being admitted with
+  the default `auto_assign_org_role`.
+
+All three keys are chart-forced (`merge` semantics, chart wins) —
+setting them in the operator's map is a no-op, and
+`role_attribute_path` would just be dead config since the Job
+manages roles.
+
+When `spec.oidc.users` is empty (or unset) the chart forces none of
+the three keys — a BYO-IdP operator who does not use the users-map
+gets their inline `auth.generic_oauth` applied verbatim. This
+matters because `oauth_allow_insecure_email_lookup` against a BYO
+issuer that does not verify emails is a needless account-linking
+surface, and `allow_sign_up = false` with no pre-provisioned
+accounts would lock everyone out. If you want the isolation
+posture without the users-map, set the keys explicitly in your
+inline map.
+
+**`secretRef.name` mode disables the users-map.** The chart mounts the
+operator's `auth.ini` fragment verbatim via `GF_PATHS_CUSTOM_INI` and
+cannot inject either of the two chart-forced settings. Setting
+`spec.oidc.users` alongside `customConfig.secretRef.name` fails the
+render with an explicit message — the alternatives are: (a) use
+`customConfig.config` (inline) and let the chart merge, or (b) leave
+`spec.oidc.users` empty and include both `skip_org_role_sync = true`
+and `oauth_allow_insecure_email_lookup = true` in your ini fragment
+plus manage the OIDC → Grafana user mapping yourself.
+
+Setting both `config` and `secretRef.name` (or neither) fails the
+render. In `CustomConfig` mode no Keycloak objects are provisioned in
+`cozy` and no chart-owned client-secret Secret is created — the
+operator manages their own credentials end-to-end.
+
+## Users and RBAC
+
+Grafana's built-in identity model exposes three org-level roles:
+`Admin` / `Editor` / `Viewer`. The chart drives them from an
+operator-supplied map on the CR:
+
+```yaml
+spec:
+  oidc:
+    users:
+      - email: alice@acme.example
+        role: Admin
+      - email: bob@acme.example
+        role: Editor
+      - email: carol@acme.example
+        role: Viewer
+```
+
+A chart-owned Job runs on every `helm install` / `helm upgrade` and
+reconciles that list into Main Org. membership via Grafana's admin
+API:
+
+1. Each listed email gets a pre-provisioned local Grafana account
+   with a random password. The account is a shell; the operator
+   never uses that password. When they sign in with the OIDC flow
+   Grafana looks up the pre-provisioned account by email
+   (`oauth_allow_insecure_email_lookup = true`) and attaches the
+   OIDC identity to it.
+2. Each listed email is added to Main Org. with the requested role.
+   Re-runs of the Job converge role changes (`Editor` → `Admin`,
+   demotions, etc.) via `PATCH /api/orgs/{orgId}/users/{userId}`.
+3. Every Main-Org member whose email is neither in the list nor the
+   break-glass `grafana-admin-password` login is removed. Removing
+   an entry from `users:` and re-reconciling revokes access.
+
+The Job renders only when **both** `mode != None` and
+`spec.oidc.users` is non-empty. Three empty-users states all resolve
+to the same hands-off contract — the chart owns nothing in Grafana
+orgs:
+
+- `mode: None` — OIDC is off, no chart-managed org membership at
+  all. This matters on upgrade: existing tenants who ran the
+  pre-PR Monitoring chart may have added users to Grafana manually
+  through the UI; if the Job ran in `mode: None` its prune pass
+  would silently delete those accounts on the next Flux reconcile.
+- `customConfig.secretRef` — the users-map is forbidden by the
+  render-time assert; the operator's mounted `auth.ini` fragment is
+  authoritative.
+- `mode: System | CustomConfig-inline` with `users:` unset — the
+  operator opted into OIDC but not into the chart-managed users-map;
+  they manage org membership themselves.
+
+Setting `users: [...]` on the CR means the chart owns Main-Org
+membership — anything added by hand (Grafana UI, admin API, other
+tooling) gets pruned on the next reconcile. The reverse edge is
+worth calling out: taking `users:` back to `[]` (or unsetting it)
+does NOT prune the last entry — the chart stops managing membership
+and any accounts the Job provisioned are left in place. Operators
+who want to clean up OIDC-provisioned accounts after switching
+`System | CustomConfig → None` (or after emptying `users:`) do it
+themselves through the Grafana UI or admin API. The
+`activeDeadlineSeconds` and `ttlSecondsAfterFinished` notes below
+only apply when the Job actually renders.
+
+While the users-map is active, users NOT listed in `spec.oidc.users`
+who try to log in through OIDC are rejected at the door
+(`allow_sign_up = false`) — no account is minted, no default
+`Viewer` role is assigned. `skip_org_role_sync = true` in the
+Grafana config additionally makes sure the Job's assignments
+outlive the next login for users who ARE listed.
+
+For `System` mode, the operator provisions the corresponding
+Keycloak user in `cozy` in whatever way they already do (Keycloak
+UI, a `KeycloakRealmUser` CR, an identity broker) and adds them to
+one of the tenant's `<namespace>-{view,use,admin,super-admin}`
+groups — Grafana's `allowed_groups` rejects the login otherwise.
+The Monitoring release does not create Keycloak users and does not
+provision `KeycloakRealmGroup`s — group directory ownership stays
+with the tenant chart (`packages/apps/tenant`); group membership is
+curated by whoever operates the `cozy` realm.
+
+## How a user logs in
+
+The user opens `https://grafana.<host>` in a browser and picks the
+"Sign in with Keycloak" button under the login form. Grafana runs the
+Authorization Code + PKCE flow against the cozy realm, receives a
+token whose `aud` claim matches this Monitoring instance's clientId,
+and — if the user's email is in `spec.oidc.users` — binds the OIDC
+identity to the pre-provisioned local account with the role the Job
+already set.
+
+If the user's email is not in `spec.oidc.users` (and the users-map
+is active — `mode != None` and the list is non-empty) the login is
+refused by Grafana at the OAuth callback — `allow_sign_up = false`
+does not mint an account for them. Add them to `spec.oidc.users`
+and re-apply the CR; the Job will run on the next helm-upgrade,
+pre-provision their local account, and the next login attempt will
+succeed. When the users-map is inactive Grafana's default
+`allow_sign_up = true` applies and any authenticated cozy-realm
+identity lands with `auto_assign_org_role` (Viewer).
+
+The break-glass `admin_user` / `admin_password` field on the form
+stays wired to the `grafana-admin-password` Secret and continues to
+work — useful when Keycloak is down or misconfigured.
+
+## Failure modes
+
+- **`mode: System` without the platform-level OIDC feature** — chart
+  render hard-fails:
+  `spec.oidc.mode: System requires the platform-level OIDC feature`.
+  Flip `authentication.oidc.enabled: true` in the platform values, or
+  switch to `CustomConfig`. On the platform side that flag also
+  swings the `cozystack.monitoring-application` PackageSource from
+  variant `default` (baseline dependsOn only) to variant `oidc`
+  (additionally waits for `cozystack.keycloak-operator` so the
+  `v1.edp.epam.com` CRDs consumed by the Keycloak-side of System
+  mode are registered before the monitoring chart reconciles).
+- **`mode: System` without the Keycloak operator CRDs registered** —
+  chart render hard-fails:
+  `spec.oidc.mode: System requires the Keycloak operator CRDs
+  (v1.edp.epam.com/v1)`. Symmetric across
+  `templates/grafana/oidc-keycloak.yaml` and
+  `templates/grafana/grafana.yaml` so Grafana never comes up with an
+  `auth.generic_oauth` block pointing at a client that never gets
+  provisioned. For the platform `monitoring-system` release the
+  `oidc` variant's `dependsOn: cozystack.keycloak-operator` prevents
+  the race; for tenant releases (`Monitoring` CR with
+  `mode: System`) verify the keycloak-operator package is deployed
+  before creating the CR.
+- **`CustomConfig` with an unreachable issuer or wrong claim
+  mappings** — Grafana rejects the callback and the login screen
+  shows an error; the `admin_user`/`admin_password` Secret keeps
+  working as break-glass.
+- **User successfully logs in but sees no dashboards.** Their email
+  is missing from `spec.oidc.users` — no org role was assigned.
+  Add the entry and re-apply the CR; the users-Job runs on the
+  next helm-upgrade and grants access.
+- **users-Job fails.** The Job caps at `activeDeadlineSeconds: 900`
+  and `backoffLimit: 6`. Common causes: Grafana never becomes
+  ready (check `kubectl -n <ns> get pods -l app=grafana`), or the
+  `grafana-admin-password` Secret is missing its `user`/`password`
+  keys. `ttlSecondsAfterFinished: 3600` keeps the failed hook Job
+  (and its Pod's logs) around for **one hour** after the terminal
+  Failed condition — check its logs with
+  `kubectl -n <ns> logs job/<release>-oidc-users` inside that window.
+  After 1h the Kubernetes TTL controller garbage-collects the Job
+  and the Pod together, so grab the logs quickly; if you missed
+  the window, re-trigger the hook with `helm upgrade` on the
+  release and reproduce.
+- **`emailVerified` on Keycloak users is a prescriptive requirement,
+  not a chart-enforced one.** The chart does not emit any
+  `claimValidationRules` — the layered guarantees you rely on
+  instead are:
+  1. Provision users with `emailVerified: true` (via
+     `KeycloakRealmUser` or the Keycloak UI's email-verify flow) so
+     no unverified identity ever holds a given email.
+  2. The `cozy` realm keeps Keycloak's default
+     `duplicateEmails: false`, so a second account cannot claim an
+     already-registered address to impersonate an existing operator.
+  3. Grafana's own login flow rejects tokens the apiserver rejects,
+     so on the wire the same guarantee still holds through the JWT
+     signature and audience checks.
+  Adding a CEL `claimValidationRules` entry is a reasonable
+  follow-up hardening; it is out of scope for Phase 1.
+- **`CustomConfig` with both or neither payload set** — chart render
+  hard-fails: `set exactly one of 'config' (inline) or
+  'secretRef.name' — they are mutually exclusive`, or `CustomConfig
+  requires either spec.oidc.customConfig.config … or …secretRef.name`.
+
+## What is NOT in Phase 1
+
+- **Per-tenant Keycloak realms.** Phase 2 candidate; tracked in
+  cozystack/community#24.
+- **Full-logout through Keycloak's end-session endpoint.**
+  `auth.generic_oauth` native to Grafana does the OAuth part; wiring
+  `--backend-logout-url` and the corresponding Keycloak client
+  attribute is a subsequent hardening.
+- **`disable_login_form: true` under `mode: System`.** Kept off so
+  the `admin_user`/`admin_password` Secret remains a documented
+  break-glass path; hardening it is a follow-up.
+- **Server-level `GrafanaAdmin` promotion.** All Grafana instances
+  cap at org-level `Admin`. Not exposed on the CR.
+- **CEL `claimValidationRules` enforcing `email_verified`.** See the
+  failure-modes note above.
+- **Multi-issuer / BYO alongside `cozy`.** `mode: System` and
+  `mode: CustomConfig` are mutually exclusive on a single Monitoring
+  release — no composition. Follow the tenant kube-apiserver PR's
+  structured-config path if you need this later.
diff --git a/docs/oidc-tenant.md b/docs/oidc-tenant.md
new file mode 100644
index 0000000000..7fc7fa952b
--- /dev/null
+++ b/docs/oidc-tenant.md
@@ -0,0 +1,309 @@
+# OIDC for tenant Kubernetes clusters (Phase 1)
+
+Cozystack tenant Kubernetes clusters opt in to OIDC authentication on their
+kube-apiserver through a flat selector on the `Kubernetes` CR. This document
+covers the operator-facing surface: what the modes mean, what the chart
+provisions on either end, and how to give a user kubectl access.
+
+The architectural rationale lives in
+[cozystack/community#24](https://github.com/cozystack/community/pull/24) —
+in particular why per-tenant Keycloak realms are deliberately deferred to
+Phase 2.
+
+## Selector
+
+```yaml
+apiVersion: apps.cozystack.io/v1alpha1
+kind: Kubernetes
+metadata:
+  name: prod
+  namespace: tenant-acme
+spec:
+  oidc:
+    mode: System        # System | CustomConfig | None (default)
+    users:
+      - email: alice@acme.example
+        role: admin     # admin → cluster-admin
+      - email: bob@acme.example
+        role: view      # view → view
+```
+
+Three modes:
+
+- **None** — the only user-facing path is the static
+  `<release>-admin-kubeconfig` Secret (the Kamaji-minted `super-admin.svc`
+  kubeconfig). This is the default; existing clusters render byte-identical
+  to before.
+- **System** — the apiserver trusts the platform Keycloak realm (`cozy` by default, set via `authentication.oidc.realmName`) via a per-cluster public client. Authenticates the users already in that realm (the one cozystack provisions). Zero-config default.
+- **CustomConfig** — the apiserver trusts a tenant-supplied OIDC issuer
+  directly. `cozy` is not in the path. Use for BYO IdPs (Okta, Auth0, a
+  customer's own Keycloak).
+
+The `users[]` map is independent of the mode and drives per-user
+`ClusterRoleBinding`s inside the tenant cluster.
+
+## System mode
+
+What the chart provisions, in the management cluster:
+
+1. **KeycloakClient** named `<namespace>-<release>` in the `cozy` realm —
+   `public: true`, PKCE required, redirect URIs locked to `localhost:8000`
+   and `localhost:18000` (the kubelogin / `kubectl oidc-login` defaults).
+2. **KeycloakClientScope** named `<namespace>-<release>-audience` carrying
+   an `oidc-audience-mapper` that pins `id_token.aud` to the per-cluster
+   clientId. This is the per-cluster isolation primitive: a token minted
+   for cluster A is rejected by cluster B's apiserver.
+3. A **Secret** `<release>-oidc-authn-config` carrying a structured
+   `apiserver.config.k8s.io/v1beta1` `AuthenticationConfiguration` with
+   the cozy realm issuer and the per-cluster audience.
+4. A `--authentication-config=` flag, mount, and volume on the
+   `KamajiControlPlane` referencing the Secret above.
+5. A **bootstrap Job** (Helm `post-install,post-upgrade` hook) that
+   applies one `ClusterRoleBinding` per `users[]` entry inside the
+   tenant cluster and writes a ready-to-use OIDC kubeconfig Secret on
+   the management side (see below).
+6. A `<release>-oidc-kubeconfig` Secret in the tenant namespace carrying
+   a kubeconfig with a `kubectl oidc-login` exec block, exposed to the
+   dashboard via `packages/system/kubernetes-rd`.
+
+The structured authentication-config form (rather than the legacy
+`--oidc-*` flags) is intentional: it accepts multiple issuers in a list,
+inline private-CA PEM, and future Phase-2 issuers extend the same Secret
+instead of fighting the chart shape.
+
+## CustomConfig mode
+
+The tenant supplies the entire `AuthenticationConfiguration`. Two paths:
+
+```yaml
+spec:
+  oidc:
+    mode: CustomConfig
+    customConfig:
+      config: |
+        apiVersion: apiserver.config.k8s.io/v1beta1
+        kind: AuthenticationConfiguration
+        jwt:
+        - issuer:
+            url: https://idp.acme.example
+            certificateAuthority: |
+              -----BEGIN CERTIFICATE-----
+              ...
+              -----END CERTIFICATE-----
+            audiences:
+            - cozystack-prod
+          claimMappings:
+            username:
+              claim: email
+              prefix: ""
+            groups:
+              claim: groups
+              prefix: ""
+    users:
+      - email: alice@acme.example
+        role: admin
+```
+
+…or via an out-of-band Secret the operator has already created in the
+tenant namespace:
+
+```yaml
+spec:
+  oidc:
+    mode: CustomConfig
+    customConfig:
+      secretRef:
+        name: acme-byo-authn-config       # has key config.yaml
+```
+
+`config` and `secretRef.name` are mutually exclusive; the chart fails the
+render if both — or neither — are set.
+
+No Keycloak objects land in `cozy`; the chart writes only the
+AuthenticationConfiguration Secret (or mounts the operator's) and the
+RBAC Job. The `<release>-oidc-kubeconfig` helper Secret is NOT written
+in CustomConfig mode: the issuer and clientId are inside the
+operator-supplied config and are not knowable to the chart. Distribute
+the OIDC kubeconfig out-of-band.
+
+## Aggregated API servers
+
+Authenticating a user is only half of the path. A call that lands on an aggregated API server — an `APIService` backed by an extension server rather than by the core apiserver — reaches it over the aggregation layer, which forwards the caller's identity in request headers. The UID travels in `X-Remote-Uid`, which the aggregation layer sends whenever the `RemoteRequestHeaderUID` gate is on, and the extension server trusts that header only when the tenant kube-apiserver has published it under `requestheader-uid-headers` in the `extension-apiserver-authentication` ConfigMap. Without that key the extension server ignores the header, and the call is served as if the caller had no UID, even though `kubectl` against the core apiserver works fine. Anything on the far side that reads the UID, an authorizer or an audit record, sees an empty value.
+
+Carrying the UID across that hop is a property of the aggregation layer, not of OIDC: a caller authenticated by any means loses their UID the same way. The chart nonetheless renders the header flag only when `spec.oidc.mode` is not `None`, which keeps the blast radius to clusters opting into a new feature. A cluster that has never left `mode: None` therefore still loses the UID at the extension server.
+
+Be clear about who this helps. The flag forwards a UID the caller already has; it does not create one. ServiceAccount tokens carry a UID, and so do other identities that set one, and for those the aggregation hop starts working. An OIDC user gets one only from a claim mapping: in `spec.oidc.mode: System` the AuthenticationConfiguration the chart generates maps `uid` to the `sub` claim, the Keycloak account UUID, so those users reach an aggregated API server under a stable identifier. `sub` rather than the username claim, because the platform realm lets a user change the address `email` carries while the subject stays where it is. In `CustomConfig` mode the configuration is yours: map `uid` and the header carries what you mapped; leave it out and upstream resolves an empty UID (`plugin/pkg/authenticator/token/oidc/oidc.go`, `getUID`, read at v0.35.0), with nothing for the header to carry.
+
+On a cluster that was running before the mapping existed, those users gain a UID where they had none. Tenant RBAC does not notice — a role binding matches a username or a group, never a UID — but an audit record on the tenant apiserver now carries `user.uid`, `kubectl auth whoami` shows it, and an admission webhook or extension server inside the tenant that read the empty value now reads the subject.
+
+Where `spec.oidc.mode` is not `None`, and outside the cases further down that stop it, the chart renders the flag that publishes it alongside `--authentication-config`:
+
+| `spec.version` | rendered |
+| --- | --- |
+| `v1.31` | nothing — the flag does not exist upstream, and an unknown flag stops the apiserver from starting |
+| `v1.32` | nothing — `RemoteRequestHeaderUID` is alpha and off, and the apiserver refuses the flag while the gate is off |
+| `v1.33` and newer | `--requestheader-uid-headers=X-Remote-Uid` |
+
+The chart never renders `--feature-gates` itself. From `v1.33` `RemoteRequestHeaderUID` is beta and on by default, so the header flag is all the apiserver needs. On `v1.32` the chart does not switch on an alpha gate for you, so aggregated API servers do not see the caller's UID there; if you need them to on `v1.32`, write both `--feature-gates=RemoteRequestHeaderUID=true` and `--requestheader-uid-headers=X-Remote-Uid` into `controlPlane.apiServer.extraArgs` yourself, and the chart passes them through untouched.
+
+The version in that table is the effective one, not the image tag. `--emulated-version` in `controlPlane.apiServer.extraArgs` moves it: the gate resolves through the versioned spec at the emulated version, so `--emulated-version=1.32` puts `RemoteRequestHeaderUID` back to alpha-and-off on a `v1.35` cluster, and the chart follows by rendering nothing, as it would on a `v1.32` image. The chart reads the dot-separated numbers at the start of the value, after an optional `v`, and ignores what follows them, so it reads `v1.32`, `1.32.0` and `1.32-rc` all as `1.32`.
+
+Two values are still not harmless, whatever the chart does with them. An element naming another component, `--emulated-version=wardle=1.2`, says nothing about the tenant kube-apiserver, but the apiserver rejects a component it has not registered, `component not registered: wardle`, and does not start. A value whose minor is above your `spec.version` is ignored too, because emulation only moves the effective version down, and there the apiserver checks against a range rather than a ceiling: it rejects one above its own binary or below the floor it still supports, naming the range it accepts. In both cases nothing the chart renders makes any difference.
+
+Adding the header flag through `controlPlane.apiServer.extraArgs` by hand is no longer necessary from `v1.33`, and an existing cluster that does keeps working as long as its entries would start an apiserver: the chart skips its own copy when your entries already carry `X-Remote-Uid`, and refuses to render the shapes listed below.
+
+Every entry you write on one of these three flags reaches the tenant kube-apiserver. None of them is among the flags the tenant control plane sets itself and drops from `extraArgs`; the chart moves or refuses an entry naming one of those, and the description of `controlPlane.apiServer.extraArgs` lists them. Where your entry does not already satisfy the requirement the chart therefore adds its own beside it rather than failing. `--requestheader-uid-headers` is a repeatable flag whose occurrences append into one list, so a list of your own that omits `X-Remote-Uid` gets a second entry carrying it and the union is what the apiserver validates; your header keeps working alongside the standard one.
+
+The chart does not check how you spell kube gate terms. The apiserver collects `--feature-gates` terms per component across all your entries and refuses a configuration that names the kube component both bare and `kube:`-prefixed; the chart passes that through like any other gate value the apiserver rejects on its own terms.
+
+If you turned the gate off on purpose, with `RemoteRequestHeaderUID=false` or a blanket `AllBeta=false`, the chart does not render the header flag and the render is byte-identical to the one before this feature existed. You keep losing the UID at the aggregation layer, which is what the opt-out asks for. Adding the opt-out or removing it again needs no second edit on Kamaji 26.9.4-edge: the tenant control plane compares a hash of `extraArgs` against the one it stored last time and rebuilds the argument list from scratch whenever they differ, so nothing is left behind from the previous shape. A rollback of Kamaji to an earlier build loses that. The older code expects a number in the `kube-apiserver.kamaji.clastix.io/args` annotation and gives up when it finds the hash. From then on, a flag removed from `extraArgs` stays on the running control plane until someone sets the annotation back to a number by hand.
+
+The render fails where entries of your own describe a kube-apiserver that already refuses to start: a uid-headers list with an element that is empty once trimmed, which a trailing comma leaves behind, and a uid-headers list alongside a gate setting that turns `RemoteRequestHeaderUID` off. The chart cannot rescue either, because the value the apiserver rejects is yours. The error message names the fix, which beats a crash-looping control plane. More refusals sit outside that group and outside the conditions below: the `--oidc-*` and `--authentication-config` collisions further down, each on its own terms; an unquoted `--emulated-version=value` entry whose kube version has a non-zero patch component, such as `1.32.4`, which the apiserver refuses with `patch version not allowed`; an entry naming a flag the tenant control plane sets itself, refused in every `spec.oidc.mode` unless the chart moves it into a field, as the description of `controlPlane.apiServer.extraArgs` explains; and the list ending in one of these three flags, where the apiserver may well start — it is the silence that earns that one.
+
+Those first two checks run only where the chart renders something. Three things switch them off with the header flag: an effective version of `v1.32` or below, a quoted `--emulated-version`, and two `--emulated-version` entries that both name kube. Each of those leaves the chart either with nothing to render or unable to say what the apiserver will read, so it renders nothing and judges nothing, and a shape that would otherwise be refused here passes silently through to a control plane that does not start. Take the unreadable entry out if you want the checks back. `--feature-gates` or `--emulated-version` written as a flag and a value in separate entries hides a value too, but a narrower one, and the chart keeps what holds whatever that value is. The empty element is still refused. An explicit `RemoteRequestHeaderUID=false` is still refused beside a header entry behind a hidden `--emulated-version`, because it turns the gate off at every version; a blanket `AllBeta=false` is not, because at a lower emulated version the gate can be alpha, where `AllBeta` does not reach it. Neither is refused behind a hidden `--feature-gates` value, which can turn the gate back on. A uid-headers list of yours without `X-Remote-Uid` still gets the chart's element beside it, which the apiserver needs with the gate on and which changes nothing with the gate off, since your list alone is refused then. Behind a hidden value and without a list of yours, the chart renders no `X-Remote-Uid` entry at all.
+
+Otherwise nothing stops rendering: every other `extraArgs` shape reaching this code either renders as it did or gains the header flag.
+
+The gate check reads your entries the way the apiserver does.
+
+- An element may name a component, because `--feature-gates` is a colon-separated multimap: `kube:RemoteRequestHeaderUID=false` is the same opinion as `RemoteRequestHeaderUID=false`, while an element naming another component is not about the tenant kube-apiserver, and the chart ignores it when it works out the state of the UID gate. That is the chart's reading only. Whether the apiserver accepts the component is up to its own component registry, as it is for `--emulated-version` above.
+- Past that it is one `Name=value` element at a time, spaces trimmed on both sides, and the value resolved the way `strconv.ParseBool` resolves it, so `1`, `t` and `T` mean the same as `true`, and `0`, `f` and `F` the same as `false`.
+- Blanket settings count, because the apiserver applies them to every gate you have not named explicitly. `AllBeta=false` switches `RemoteRequestHeaderUID` off, so the chart reads it as your opt-out; `AllAlpha` covers alpha gates only, and from `v1.33` this gate is beta, so the chart does not read it.
+- Naming the gate wins over a blanket: `AllBeta=false,RemoteRequestHeaderUID=true` leaves the gate on, because an explicit entry beats a blanket one whichever order they appear in.
+- Gate names are compared exactly, as the apiserver looks them up, so `remoterequestheaderuid=false` is not an opinion about `RemoteRequestHeaderUID`; the apiserver would reject that spelling as an unrecognized gate anyway.
+- Several `--feature-gates` entries settle a gate between them, last term wins, exactly as the apiserver settles them: an earlier entry naming the gate still counts when a later entry says nothing about it.
+- An entry with an empty value carries no term, so it settles nothing, and it does not cancel what an earlier entry said. Drop the entry you do not want instead of emptying it.
+
+`--emulated-version` accumulates rather than replaces, and the apiserver refuses two elements naming the same component with `duplicate version flag`. Two entries of yours that both name kube, explicitly or by naming nothing, stop the control plane from starting; the chart does not render the header flag there, because there is no effective version left to decide against. Entries naming different registered components are fine and all of them apply, so an emulated kube version stays in force when a later entry names something else.
+
+Quotes stop the chart from reading the entry they are on. `--requestheader-uid-headers` and `--emulated-version` are both CSV-parsed by the apiserver, which strips a surrounding pair of double quotes before it sees the value, and the chart does not reproduce that. On `--emulated-version` that hides the version the whole decision rests on, so the chart does not render the header flag, exactly as it did before that flag existed. On `--requestheader-uid-headers` it only means the chart cannot tell whether that entry already carries `X-Remote-Uid` or an empty element: it renders its own element, which is safe whatever your value turns out to be, and does not refuse the render over an element it may be misreading. `--feature-gates` is not CSV-parsed, so quotes there are neither stripped nor understood: the apiserver rejects the term as an unrecognized gate name and the chart, reading the same text, does not take it for an opinion about `RemoteRequestHeaderUID` either. Drop the quotes if you want the chart to read the entry.
+
+Writing a flag and its value as two list entries has the same effect, for the same reason. The apiserver pairs them, but the value sits in an entry the chart reads separately, so it cannot be attached to the flag. On `--feature-gates` and `--emulated-version` the chart therefore renders its own `X-Remote-Uid` element only beside a uid-headers list of yours that lacks it, as described above. On `--requestheader-uid-headers` it counts the flag as present, which is what the opt-out check needs, and renders its own `X-Remote-Uid` entry beside it. Write `--flag=value` in one entry if you want the chart to read the value.
+
+One arrangement of that shape the chart refuses outright: one of those three flags as the last entry in the list. The apiserver pairs a valueless flag with whatever argument follows it, and what follows yours is the `--authentication-config` the chart appends, so the flag would swallow it. The AuthenticationConfiguration is then never applied, and what that costs depends on which flag took it: `--requestheader-uid-headers` accepts the path as a header name, so the control plane starts and fails every login with nothing to show for it, while `--feature-gates` and `--emulated-version` reject it and the apiserver exits instead. Give the flag its value in the same entry. Moving it earlier works too: the entry after it is then one of yours, and it reaches the apiserver right behind the flag, since the chart refuses every entry the control plane would drop or moves it out of the list it renders.
+
+The uid-headers list is read without trimming, because the apiserver does not trim it either: `--requestheader-uid-headers=X-Remote-Uid , Other` does not contain `X-Remote-Uid` as far as the apiserver is concerned, so the chart does not read it as one and renders its own element, which is what makes that list start. The emptiness check is the one that trims, again because the apiserver's does: in `X-Remote-Uid, ` the second element is empty once trimmed, and the apiserver refuses the whole list with `empty value in "requestheader-uid-headers"` although `X-Remote-Uid` is in it, which is why that shape fails the render instead.
+
+On `v1.31` and `v1.32` the chart renders no UID flag, and the UID guards above do not run, so a uid-headers or `--feature-gates` entry of yours passes through untouched. These checks still apply there as everywhere else, because none of them depends on the effective version: the `--oidc-*` and `--authentication-config` collisions, the refusal of a patch-level `--emulated-version`, the move or refusal of an entry naming a flag the tenant control plane sets itself, which the description of `controlPlane.apiServer.extraArgs` explains, and the refusal of a list ending in one of the three flags, which is about the `--authentication-config` the chart appends on every version rather than about the UID flags. Aggregated API servers cannot see the caller's UID on `v1.31`; on `v1.32` they can only through the alpha gate you enable yourself, as described above. Move the cluster to `v1.33` or newer if you need them to without it. Writing `--requestheader-uid-headers` yourself does not work around it on `v1.31` — the flag does not exist there, and an unknown flag stops the apiserver from starting.
+
+## Users and RBAC
+
+`users[]` is a flat list. Each entry produces a single
+`ClusterRoleBinding` inside the tenant cluster, labelled
+`app.kubernetes.io/managed-by=cozystack-oidc` and
+`app.kubernetes.io/instance=<release>`. The CRB name is a
+deterministic hash of `<release>-<email>`, so the same email always
+maps to the same binding.
+
+| `role:` | `ClusterRole` bound |
+| --- | --- |
+| `admin` | `cluster-admin` |
+| `view` | `view` |
+
+The CRB `User:` subject is the literal `email` value; it must match the
+`email` claim emitted by the issuer. The chart-generated OIDC
+kubeconfig requests `--oidc-extra-scope=email` in the
+`kubectl oidc-login` exec block, so the token includes `email`
+regardless of whether the per-cluster client lists `email` in its
+default client scopes. The `email` scope itself is a built-in OIDC
+scope available in every conformant issuer (Keycloak included), so no
+extra realm-side configuration is required for `System`. For
+`CustomConfig`, verify your BYO issuer emits the `email` claim when
+the client requests the `email` scope; every conformant OIDC provider
+does.
+
+Toggling a user out of `users[]` revokes their access on the next chart
+reconcile — the bootstrap Job prunes any CRBs labelled by the release
+that are no longer in the desired list.
+
+The static admin kubeconfig stays as the documented break-glass path
+regardless of mode.
+
+## How a user logs in (System mode)
+
+The user installs `kubectl oidc-login` once:
+
+```bash
+kubectl krew install oidc-login
+```
+
+The operator hands them the OIDC kubeconfig. The Secret name follows
+the Helm release pattern `kubernetes-<cluster>-oidc-kubeconfig` (the
+cozystack-api prefixes the cluster name with `kubernetes-` when it
+materialises the `HelmRelease`):
+
+```bash
+kubectl --namespace tenant-acme get secret kubernetes-prod-oidc-kubeconfig \
+  --output=jsonpath='{.data.kubeconfig}' | base64 -d > prod.kubeconfig
+```
+
+First `kubectl --kubeconfig prod.kubeconfig get …` call triggers the
+Keycloak browser flow on localhost:8000 (then 18000 as fallback) and
+caches the token locally. Subsequent calls are silent until the token
+expires.
+
+## Failure modes
+
+- **`mode: System` without the platform-level OIDC feature** — chart
+  render hard-fails: `spec.oidc.mode: System requires the platform-level
+  OIDC feature (authentication.oidc.enabled) — enable it in
+  cozystack-values, or use mode: CustomConfig for a tenant-supplied
+  issuer.`
+- **`CustomConfig` with an unreachable issuer or wrong claim mappings** —
+  the apiserver rejects tokens at request time; the admin kubeconfig
+  keeps working as break-glass.
+- **`emailVerified` on Keycloak users is a prescriptive requirement,
+  not a chart-enforced one.** The chart emits a
+  `claimValidationRules` entry keyed on `groups` (see next bullet),
+  but not one keyed on `email_verified`. The layered guarantees you
+  rely on instead:
+  1. Provision users with `emailVerified: true` (via `KeycloakRealmUser`
+     or the Keycloak UI's email-verify flow) so no unverified identity
+     ever holds the email you name in `users[].email`.
+  2. The `cozy` realm keeps Keycloak's default `duplicateEmails: false`,
+     so a second account cannot claim an already-registered address to
+     impersonate an existing operator.
+  3. As a k8s side-effect, if the issuer explicitly emits
+     `email_verified: false` on a token the apiserver rejects it with
+     `oidc: email not verified` — but a *missing* claim is treated as
+     verified.
+  Adding a CEL `claimValidationRules` entry
+  (`!has(claims.email_verified) || claims.email_verified == true`) to
+  the rendered System-mode config would elevate item 3 to a hard gate;
+  that is a reasonable follow-up hardening but is out of scope for
+  Phase 1.
+
+- **Cross-tenant isolation gate.** The rendered
+  `AuthenticationConfiguration` carries a CEL `claimValidationRules`
+  entry on the `groups` claim that rejects any token whose caller is
+  not a member of at least one of this tenant's four Keycloak groups:
+
+  ```
+  <namespace>-view <namespace>-use <namespace>-admin <namespace>-super-admin
+  ```
+
+  The tenant chart (`packages/apps/tenant/templates/keycloakgroups.yaml`)
+  provisions these groups in the shared `cozy` realm. Without this
+  gate, any authenticated cozy-realm user could point `kubectl
+  oidc-login` at another tenant's cluster, land at
+  `system:authenticated`, and enumerate the discovery surface
+  (`kubectl api-resources`, OpenAPI schemata) — RBAC would default-deny
+  named-resource access, but discovery still leaks. Symmetric with the
+  Grafana-side `allowed_groups` gate on the Monitoring chart's
+  `auth.generic_oauth` block (see `docs/oidc-grafana.md`). CustomConfig
+  mode does NOT get this gate injected — the tenant's own
+  AuthenticationConfiguration is authoritative and the tenant is
+  responsible for their own claim-side guards.
+- **`kubectl` without the `oidc-login` plugin** — the exec block errors
+  out client-side; install the plugin.
+
+## What is NOT in Phase 1
+
+- **Per-tenant Keycloak realms.** Phase 2 candidate; tracked in
+  cozystack/community#24 (Option B — retained as the strongest isolation
+  answer; Option A is Keycloak Organizations).
+- **Federating an external IdP into `cozy`.** Out of scope.
+- **Cross-cluster SSO inside one tenant.** Each cluster has its own
+  audience — that is the per-cluster isolation primitive.
+- **Custom credential plugin / RFC 8693 token exchange.** Possible future
+  optimisation; not required for the per-cluster client + audience model.
diff --git a/docs/operations/backup-classes.md b/docs/operations/backup-classes.md
index f60cba0ad4..2cfde8c84f 100644
--- a/docs/operations/backup-classes.md
+++ b/docs/operations/backup-classes.md
@@ -1,6 +1,6 @@
 # Backup Classes
 
-Cozystack ships a single platform-managed `BackupClass` named `cozy-default`. It is provisioned automatically when the `backupstrategy-controller` package is installed and references the system-managed S3 bucket `cozy-backups` in the `tenant-root` namespace.
+Cozystack ships a single platform-managed `BackupClass` named `cozy-default`. It is provisioned automatically when the `backupstrategy-controller` package is installed and references the system-managed bucket provisioned through the `apps.cozystack.io/Bucket` CR `cozy-backups` in the `tenant-root` namespace (the real S3 bucket name is the COSI-assigned one from `BucketClaim.status.bucketName`).
 
 Tenants reference `cozy-default` from `BackupJob`, `Plan`, and `RestoreJob` resources — they do **not** supply S3 credentials, endpoints, or paths. The platform projects the system-managed credentials Secret into the tenant namespace per BackupJob (or, for long-lived references like Velero's `BackupStorageLocation`, into a fixed list of system namespaces on a periodic tick), and the default strategy templates encode `<namespace>/<application>` into every S3 path so two tenants with the same application name never collide.
 
@@ -13,10 +13,17 @@ Tenants reference `cozy-default` from `BackupJob`, `Plan`, and `RestoreJob` reso
 | `apps.cozystack.io/Postgres`     | CloudNativePG (barman)               | `strategy.backups.cozystack.io/CNPG` `cozy-default-cnpg`                   |
 | `apps.cozystack.io/MariaDB`      | mariadb-operator dump                | `strategy.backups.cozystack.io/MariaDB` `cozy-default-mariadb`             |
 | `apps.cozystack.io/ClickHouse`   | Altinity `clickhouse-backup` sidecar | `strategy.backups.cozystack.io/Altinity` `cozy-default-altinity`           |
+| `apps.cozystack.io/MongoDB`      | Percona psmdb operator (pbm) dump    | `strategy.backups.cozystack.io/MongoDB` `cozy-default-mongodb`             |
+| `apps.cozystack.io/Kafka`        | Kafka Admin API (topic metadata)     | `strategy.backups.cozystack.io/Kafka` `cozy-default-kafka`                 |
 | `apps.cozystack.io/Etcd`         | etcd-operator snapshot               | `strategy.backups.cozystack.io/Etcd` `cozy-default-etcd`                   |
+| `apps.cozystack.io/RabbitMQ`     | RabbitMQ definitions (management API) | `strategy.backups.cozystack.io/Rabbitmq` `cozy-default-rabbitmq`          |
+| `apps.cozystack.io/Redis`        | RDB dump Job (sentinel-discovered master) | `strategy.backups.cozystack.io/Redis` `cozy-default-redis`            |
+| `apps.cozystack.io/Valkey`       | RDB dump Job (sentinel-discovered master) | `strategy.backups.cozystack.io/Redis` `cozy-default-redis`            |
 | `apps.cozystack.io/VMInstance`   | Velero + kubevirt-velero-plugin      | `strategy.backups.cozystack.io/Velero` `cozy-default-velero-vminstance`    |
 | `apps.cozystack.io/VMDisk`       | Velero                               | `strategy.backups.cozystack.io/Velero` `cozy-default-velero-vmdisk`        |
 
+Valkey runs on the same RedisFailover operator as Redis, so `cozy-default-redis` serves both: the driver hands the template `.Release.Prefix` (`redis-` or `valkey-`, after the app's Kind), from which it builds the Sentinel Service and the auth and CA Secret names. A Valkey backup restores only into a Valkey app, a Redis backup only into a Redis app. The Valkey chart has no TLS option, so a Valkey dump always connects in plaintext.
+
 ### Shipped but NOT bound (admin opt-in required)
 
 | Application Kind                 | Driver                               | Strategy CR                                                                |
@@ -27,18 +34,21 @@ The FoundationDB strategy CR is rendered by the chart so admins can reference it
 
 ### Endpoint format per driver
 
-Different operators expect different endpoint shapes; the strategy templates rendered by `backupstrategy-controller` adapt the single `backupStorage.endpoint` value (a full URL like `http://seaweedfs-s3.tenant-root.svc:8333`) to each consumer's contract:
+Different operators expect different endpoint shapes; the strategy templates rendered by `backupstrategy-controller` resolve one S3 endpoint (via the `backupstrategy-controller.endpoint` helper) and adapt it to each consumer's contract. For a provisioned bucket (`provisionBucket: true`, the default) the endpoint is **derived from the COSI bucket's system-credentials Secret** (`backupStorage.systemSecretName`) and forced to `https://` — the external S3 ingress with an ACME cert, the only endpoint the backup operators can verify. SeaweedFS's in-cluster S3 serves TLS on `:8333` behind the self-signed "SeaweedFS CA", and the Etcd Strategy S3 schema has no `caCert` field, so the in-cluster endpoint cannot be targeted directly. The `backupStorage.endpoint` chart value (a full URL like `http://seaweedfs-s3.tenant-root.svc:8333`) is the **fallback**, used for external S3 (`provisionBucket: false`) and for offline `helm template`/pre-reconcile renders where the Secret lookup returns nothing. The resolved endpoint is adapted per consumer:
 
 | Driver | Strategy template field | Form |
 |--------|-------------------------|------|
 | CNPG (Postgres) | `barmanObjectStore.endpointURL` | full URL (scheme preserved) |
 | Etcd            | `destination.s3.endpoint`       | full URL (scheme preserved) |
 | MariaDB         | `storage.s3.endpoint`           | bare host:port (scheme stripped); `tls.enabled` derived from the scheme |
+| MongoDB         | `s3.endpointUrl`                | full URL (scheme preserved); on the default flow the app's `backup.endpointURL`, on `useSystemBucket` the strategy coordinate injected by the driver |
 | FoundationDB    | `blobStoreConfiguration.accountName` + `urlParameters.secure_connection` | bare host:port + derived secure flag |
 | Velero          | `BackupStorageLocation.spec.config.s3Url` | full URL (scheme preserved) |
 | ClickHouse sidecar | `S3_ENDPOINT` env | bare host:port (from projected Secret) |
+| Redis (dump Job)   | `S3_ENDPOINT` env | bare host:port (from projected Secret); `https://` prepended when unscheme'd |
+| Kafka           | `S3_ENDPOINT` env on the strategy Job | full URL (scheme preserved); the Job's `curl --aws-sigv4` prepends `https://` if the endpoint carries no scheme, honours `backupStorage.forcePathStyle`, and (for the image's curl 7.76.1) signs a portless URL with `--connect-to` to the real port so a ported endpoint still verifies |
 
-The projected `cozy-backups-creds.endpoint` key is **stripped of scheme** so chart-emitted sidecars (ClickHouse) consume it directly. Drivers that need the full URL pull from `backupStorage.endpoint` in chart values, not from the Secret.
+The projected `cozy-backups-creds.endpoint` key is **stripped of scheme** so chart-emitted sidecars (ClickHouse) consume it directly. Drivers that need the full URL receive the resolved endpoint described above — derived from the COSI system Secret (forced `https://`) for a provisioned bucket, or the `backupStorage.endpoint` fallback for external S3.
 
 VM-driven (Velero) backups land in the same `cozy-backups` bucket under the `velero/` prefix. A `BackupStorageLocation` named `cozy-default` is shipped by the `backupstrategy-controller` chart (`packages/system/backupstrategy-controller/templates/velero-bsl.yaml`) so endpoint/bucket/region come from the same `backupStorage` values block used by Strategy CRs and the projector.
 
@@ -46,7 +56,34 @@ VM-driven (Velero) backups land in the same `cozy-backups` bucket under the `vel
 
 The strategy CR `cozy-default-foundationdb` is shipped, but it is **not** bound by `cozy-default` yet. Restore runs `fdbrestore` from inside the `cozy-foundationdb-operator` Deployment, which does not yet mount `cozy-backups-creds`. Until the operator deployment is updated to mount the projected Secret, FDB platform-default restore silently fails — admins who need it today should keep using a per-app `Bucket` plus a custom `BackupClass`, or wire the credentials file into the operator deployment themselves.
 
-**Cleanup gotcha (zombie backup_agent).** Unlike CNPG/MariaDB/Altinity (one-shot operator-side Backup CRs), the FoundationDB driver creates a `foundationdb.org/FoundationDBBackup` CR that drives a **long-lived** `backup_agent` Deployment streaming continuously to S3. Deleting a Cozystack `Backup` (e.g. via retention sweeping) does NOT stop that Deployment — the agent keeps writing until the next BackupJob's `stopOtherFoundationDBBackups` call swaps it out, until an admin invokes `examples/backups/foundationdb/cleanup.sh`, or until the operator-side CR is deleted by hand. If a tenant deletes their last Cozystack Backup and never submits another BackupJob, the agent pods will continue running indefinitely and accumulate S3 PUTs. This is intentional today (the driver has no RBAC verb to stop the operator-side CR on Cozystack-Backup deletion) but admins should be aware of it.
+**Cleanup gotcha (zombie backup_agent).** Unlike CNPG/MariaDB/Altinity (one-shot operator-side Backup CRs), the FoundationDB driver creates an `apps.foundationdb.org/FoundationDBBackup` CR that drives a **long-lived** `backup_agent` Deployment streaming continuously to S3. Deleting a Cozystack `Backup` (e.g. via retention sweeping) does NOT stop that Deployment — the agent keeps writing until the next BackupJob's `stopOtherFoundationDBBackups` call swaps it out, until an admin invokes `examples/backups/foundationdb/cleanup.sh`, or until the operator-side CR is deleted by hand. If a tenant deletes their last Cozystack Backup and never submits another BackupJob, the agent pods will continue running indefinitely and accumulate S3 PUTs. This is intentional today (the driver has no RBAC verb to stop the operator-side CR on Cozystack-Backup deletion) but admins should be aware of it.
+
+## Postgres and MariaDB: a restored copy converges its application passwords shortly after recovery
+
+Managed Postgres no longer accepts a plaintext `users[].password`; every application-user password is chart-generated into `<release>-credentials` and read only from there. The CNPG backup snapshot therefore carries no passwords — deliberate, since a snapshot that did was the one place a tenant password sat in cleartext.
+
+**Residue from before the upgrade — this is forward-looking, not retroactive.** The removal scrubs new renders and new snapshots; it does not rewrite copies made earlier, and upgrading preserves the live password (the chart reads the existing `<release>-credentials` through `lookup`), so those older copies still expose the *current* credential. Two sinks retained it: a Postgres `Backup` object created before this release snapshotted `app.spec.users` while that spec still carried a plaintext `password`, so its `status.underlyingResources` held that password in cleartext — a field any tenant with `get backups` in the namespace can read (see the `underlyingResources` caution below); and every pre-upgrade Helm revision of `<release>-init-script` rendered `ALTER ROLE … WITH PASSWORD '<literal>'` into its manifest, retained for `MaxHistory` revisions. There is no in-band rotation to invalidate the exposed value (chart-based rotation was intentionally not added — a chart-rendered Secret cannot revoke a leaked credential; rotation is being reworked as a controller, cozystack/community#72). The backup strategy controller removes `users.*.password` from every CNPG `Backup` snapshot each time its leader starts, so the first sink is cleaned in-cluster after the upgrade, including a `Backup` written by a pre-upgrade replica during the rollout; the start-up log line `legacy snapshot password scrub finished` reports how many it changed. That does not reach copies made outside the cluster — apiserver audit logs, etcd backups, or object-level exports of the `Backup` resources — and the old init-script Secret persists in Helm history until those revisions age out of `MaxHistory`. So after upgrading, treat any password that was ever set through `users[].password` as exposed until it is rotated.
+
+The consequence for a **restore into a copy** (a differently-named target): the recovered database keeps the source roles with their source password hashes, but the target chart generates fresh random passwords into the target's `<release>-credentials`, and the role-reconciling init-job is skipped while `bootstrap.enabled` is set on the restored app. The restore driver clears `bootstrap.enabled` automatically once recovery is healthy, so the next HelmRelease reconcile runs the init-job, which applies `ALTER ROLE … WITH PASSWORD` for every `spec.users` entry and converges the recovered roles onto the target Secret. Convergence is therefore automatic but not instant: between the RestoreJob reaching `Succeeded` and that init-job completing, the passwords advertised in `<target>-credentials` do not yet match the recovered roles, so a client reading that Secret cannot log in as an application user for that brief window. The chart flags the Secret `postgres.cozystack.io/credentials-pending: "true"` and the NOTES print the same caution while bootstrap is still on, so a reader does not treat the advertised password as usable mid-restore; both clear on their own once the driver clears bootstrap. The data is intact and reachable as the CNPG superuser throughout. After a to-copy restore, wait for the application login to succeed rather than assuming the advertised password works the instant the RestoreJob succeeds. The driver clears `bootstrap.enabled` by writing it onto the Postgres app's own spec, so a GitOps source (Argo CD, Flux, Terraform) that pins `bootstrap.enabled: true` for that app will revert the clear on its next apply and the copy's credentials never converge — exclude the restored app from such a source until convergence completes, or clear `bootstrap.enabled` in the source itself. If the driver cannot clear the flag at all (the app was deleted or renamed mid-restore), the RestoreJob fails with reason `BootstrapDisableFailed` once its deadline elapses rather than sitting `Running` forever with no signal. An in-place restore is unaffected: the release keeps its existing `<release>-credentials`, whose passwords already match the roles the recovery brings back. One-time migration: an app restored to a copy under an earlier release — before this auto-clear existed — may still be sitting with `bootstrap.enabled` set and its init-job permanently skipped; the driver clears the flag only for a restore it drives to completion, never retroactively for one that already finished, so such an app keeps advertising unconverged credentials until you clear `bootstrap.enabled` on it once by hand.
+
+Databases and users after a Postgres restore, in place or into a copy: the driver sets the app's `spec.databases` and `spec.users` to the snapshot taken when the Backup was created, while recovery replays WAL past that point (to the end of the archive when no `recoveryTime` is set), so the recovered cluster can hold databases and users the snapshot does not list. On the first init-job run after the restore, a database the chart manages but the restored spec does not declare is released instead of dropped: its data stays, and it and its `<db>_admin` and `<db>_readonly` roles lose the `managed by helm` comment, so the chart no longer grants on it or drops it. Add it to `databases` to manage it again. Users are not released: a recovered user the restored spec does not declare, including a source user the target of a copy does not declare, is dropped on that run, so a client still logging in as that user loses the login. Every object it owned is reassigned to `cozystack:orphaned`, a role that cannot log in and that the chart grants nothing. Functions it owns are switched to `SECURITY INVOKER`, and on PostgreSQL 15 and later its views to `security_invoker`. A materialized view, a rule, and a view on PostgreSQL 13 or 14 have no such switch and keep reading with the rights of `cozystack:orphaned`. The user's grants and memberships do not carry over, so a view or function of that user can lose access it had through them. Declare the user in `users` to keep it; the chart then generates a new password for it into `<release>-credentials`.
+
+**Objects reassigned by earlier releases stay as they were.** Before this change the chart reassigned a dropped user's or role's objects to the `postgres` superuser, and upgrading does not move them. After upgrading, run the query below in each database: it lists the relations and routines `postgres` owns outside the system catalog and extensions, leaving out a sequence that belongs to a column, which moves with its table. Of those, the chart itself owns only its `auto_grant_schema_privileges()` event-trigger function, so anything else came from a tenant role or was created by hand. Hand what a tenant role created to `cozystack:orphaned` with the matching `ALTER TABLE`, `ALTER VIEW`, `ALTER ROUTINE` or other `ALTER … OWNER TO "cozystack:orphaned"`; the next init-job run switches its functions and, on PostgreSQL 15 and later, its views as above. Handle first the rows with `security_definer` set, and views, materialized views and tables with rules, since those run with their owner's rights:
+
+```sql
+SELECT c.oid::regclass::text AS object, NULL::boolean AS security_definer FROM pg_class c
+WHERE c.relowner = 'postgres'::regrole AND c.relkind NOT IN ('i', 'I', 't')
+  AND c.relnamespace NOT IN ('pg_catalog'::regnamespace, 'information_schema'::regnamespace)
+  AND NOT EXISTS (SELECT FROM pg_depend d WHERE d.classid = 'pg_class'::regclass AND d.objid = c.oid
+    AND (d.deptype = 'e' OR (c.relkind = 'S' AND d.refclassid = 'pg_class'::regclass AND d.deptype IN ('a', 'i'))))
+UNION ALL
+SELECT p.oid::regprocedure::text, p.prosecdef FROM pg_proc p
+WHERE p.proowner = 'postgres'::regrole
+  AND p.pronamespace NOT IN ('pg_catalog'::regnamespace, 'information_schema'::regnamespace)
+  AND NOT EXISTS (SELECT FROM pg_depend d WHERE d.classid = 'pg_proc'::regclass AND d.objid = p.oid AND d.deptype = 'e');
+```
+
+MariaDB avoids the same problem at backup time: the driver sets `ignoreGlobalPriv` on every operator `Backup` it creates, so `mysql.global_priv` — the grant table holding every user's password hash, root included — is excluded from the logical dump and a restore into a copy never overwrites the target's chart-managed users. The same exclusion is also a limitation, and it applies to every restore, not only a to-copy one: because the grant table is never in the dump, only accounts Cozystack declares through `User` CRs (the chart's `users` map) are recreated on restore — an account created out of band, directly in MySQL rather than through `users`, is in no backup, so a restore brings back its data and its `mysql.db` grants but not the account that owns them, and that login fails until the account is recreated. Cozystack treats the `User` CRs as the source of truth for accounts precisely so the grant table need not be, so keep managed accounts in `users` rather than creating them by hand. That matters most for `root`, which the operator only applies at datadir bootstrap via `rootPasswordSecretKeyRef` and could never repair afterwards; keeping the source's grants out of the dump is what lets the target's advertised `root` password stay correct through a restore. This is a **backup-side** fix, so it only protects backups captured from this release onward. A restore from a backup taken **before** this change still replays the source's `mysql.global_priv` and overwrites the target's application users and `root` with the source's hashes; after restoring such an older backup, treat the target's advertised credentials as unreliable and reset them — application users converge on the next reconcile through their `User` CRs, but `root` must be reset out of band (`ALTER USER 'root' … IDENTIFIED BY …` against the restored server) since the operator applies `rootPasswordSecretKeyRef` only at datadir bootstrap. That once-only write is also why the Secret itself now matters: `root` lives solely in `<release>-credentials` with no plaintext escape hatch left in values, so if that Secret is lost after bootstrap — a tenant deletes it, or a partial Velero restore drops it — the advertised `root` password and the live server's diverge with no in-band way to reconcile them; back the Secret up alongside the data, and reset `root` out of band if it is ever lost.
 
 ## ClickHouse: opt-in to the system bucket
 
@@ -66,6 +103,73 @@ When `useSystemBucket: true`:
 
 `s3Region`, `s3Bucket`, `endpoint`, `s3AccessKey`, `s3SecretKey`, and `s3CredentialsSecret` are ignored in this mode.
 
+## MongoDB: backup storage
+
+MongoDB supports two storage flows. By default the S3 target lives on the app CR and the tenant supplies its own credentials; alternatively the tenant opts into the platform system bucket and the driver injects the storage onto the live cluster at backup time.
+
+### Default: the application owns the backup storage
+
+The Percona psmdb operator runs the percona-backup-mongodb (pbm) agents whenever the `PerconaServerMongoDB` cluster has `spec.backup.enabled: true` (a declared storage is not needed for the agents to start), and services a `PerconaServerMongoDBBackup` only once the storage it references by name is declared on the cluster. On the default flow the MongoDB application **opts into backups** and points at the bucket in its own chart values:
+
+```yaml
+apiVersion: apps.cozystack.io/v1alpha1
+kind: MongoDB
+metadata:
+  name: orders-db
+spec:
+  backup:
+    enabled: true
+    destinationPath: "s3://<bucket>/orders-db/"
+    endpointURL: "https://seaweedfs-s3.tenant-root:8333"
+    insecureSkipTLSVerify: true   # self-signed in-cluster seaweedfs; psmdb s3 storage has no CA-bundle field
+    s3AccessKey: "<key>"
+    s3SecretKey: "<secret>"
+```
+
+The chart declares that storage as `s3-storage`, which the `cozy-default-mongodb` strategy names (`storageName: s3-storage`, `type: logical`). The driver then drives on-demand backups and restores through the unified `BackupJob` / `RestoreJob` / `Plan` interface on top of the operator's storage config — adding restore-to-differently-named instances (via `PerconaServerMongoDBRestore.spec.backupSource`) and point-in-time recovery that the raw scheduled-task / `mongodump` paths do not offer. When a target cluster has backups disabled, the driver surfaces a clear `Ready=False` precondition on the BackupJob/RestoreJob rather than hanging until the deadline.
+
+For a to-copy restore the operator reads the dump from the **source** backup's bucket/endpoint. The driver re-points the restore at the **target** cluster's own S3 credentials only when the target declares a storage on that same bucket (the common case where both share one bucket), since the source release's Secret dies with it in a DR scenario; a system-bucket source keeps its projected `cozy-backups-creds` reference, which outlives the source app. A target whose storages are all on a different bucket gets no credential swap: the restore keeps the source's Secret reference and is held at `Ready=False RestoreCredentialsMissing` naming that Secret until it exists in the restore namespace, so a cross-bucket restore never runs with a credential for the wrong bucket. Re-create the source release's `-s3-creds` Secret by name to let it proceed.
+
+A full, scripted example (write a marker document, back up, restore to a copy, assert the round-trip while the source stays untouched) is in [`examples/backups/mongodb/`](../../examples/backups/mongodb/) — driven by `run-all.sh`.
+
+### Opt-in to the system bucket
+
+Unlike ClickHouse's sidecar, PBM takes the bucket/endpoint/prefix as static fields on the `PerconaServerMongoDB` CR, and the platform bucket name is only known at BackupJob time — so the chart cannot render them. Instead the `cozy-default-mongodb` driver injects the storage onto the live cluster. To back up to the platform bucket without supplying S3 credentials, set:
+
+```yaml
+backup:
+  enabled: true
+  useSystemBucket: true
+```
+
+When `useSystemBucket: true`:
+
+- The chart-emitted `<release>-s3-creds` Secret is no longer rendered, and the chart leaves `spec.backup.storages`, `spec.backup.tasks` and `spec.backup.pitr` unset on the `PerconaServerMongoDB`.
+- On every BackupJob the driver SSA-injects the `s3-storage` entry from the strategy coordinates (bucket/endpoint from the platform system bucket, `credentialsSecret: cozy-backups-creds`, prefix `<namespace>/<application>`) under its own field manager, so a Flux re-render never reverts it and a later change to the coordinates is picked up on the next backup rather than frozen at the first. The backup itself is not started until the operator reports that it has pushed that `spec.backup` into pbm's own configuration (`status.observedGeneration` caught up with the cluster's generation and the `PBMReady` condition `True`): pbm writes to whatever its config last said, not to the spec, so a backup started before that push would land at the previous coordinates while its `Backup` recorded the new ones. The job waits at `Ready=False PerconaServerMongoDBPBMConfigPending` meanwhile, and fails at the backup deadline if the operator never gets there.
+- The injection waits for the release to actually render the flag. The app's `backup.useSystemBucket` is a desired value (it reads `true` as soon as it is written, before helm-controller renders the revision), while the tenant's own storage, scheduled tasks and PITR stream from the previous render stay on the `PerconaServerMongoDB` until it does. As long as the cluster still carries `spec.backup.tasks` or `spec.backup.pitr`, the driver does not inject and holds the BackupJob at `Ready=False` (`PerconaServerMongoDBLegacyRender`), failing it at the backup deadline; a release wedged on an old revision therefore never has its nightly dump and oplog redirected into the shared bucket. `useSystemBucket: true` together with `enabled: false` is refused by the chart at render time; the schema carries the same rule as an `x-kubernetes-validations` marker, which the aggregated apiserver does not evaluate yet ([#2657](https://github.com/cozystack/cozystack/issues/2657)), so until then the render-time refusal is what stops such a release, and a release wedged on it shows up as a failed HelmRelease rather than a redirected backup.
+
+`destinationPath`, `endpointURL`, `insecureSkipTLSVerify`, `s3AccessKey` and `s3SecretKey` are ignored in this mode.
+
+Because the chart drops `spec.backup.tasks` and `spec.backup.pitr`, the psmdb operator's own scheduled backups and oplog PITR do **not** run on this flow — `backup.schedule` and `backup.retentionPolicy` stay in the schema for the default flow but have no effect here, and the `recoveryTime` PITR restores described below are not available. Migrate scheduled backups to a `backups.cozystack.io/Plan` against `cozy-default` instead. **Flipping this flag on a running app** removes the storage, tasks and pitr the app had, so a release that was taking scheduled backups + PITR before the flip stops until a `Plan` takes over.
+
+Dropping `spec.backup.tasks` also drops the psmdb `keep` retention it carried, so on this flow **the driver owns the archive** the way the Rabbitmq/Redis drivers own theirs (an on-demand `PerconaServerMongoDBBackup` is not covered by psmdb task retention). The driver stamps the operator's `percona.com/delete-backup` finalizer onto each backup it mints against a storage that carries the platform coordinates (the strategy's bucket and `credentialsSecret`, as read back from the live cluster after the injection; a strategy without an `s3` block, or a storage pointing anywhere else, holds the job at `Ready=False` instead of minting an unowned dump), and deleting a Cozystack `Backup` (by hand today; by platform retention once it lands) deletes that `PerconaServerMongoDBBackup` CR — whose finalizer removes the pbm object from the shared bucket before the `Backup` is released, so deleting `Backup` objects is what reclaims `cozy-backups`. A legacy backup writes to the tenant's own bucket and keeps the pre-existing hands-off contract (its lifecycle stays the tenant's / operator's; nothing is deleted on `Backup` removal). Note this prunes only when a `Backup` is deleted: unlike CNPG, whose shipped strategy sets a `retentionPolicy` the engine trims on, MongoDB has no engine-side scheduled trim on this flow, so keeping `cozy-backups` bounded depends on a `Plan`'s retention actually deleting old `Backup` objects. **A `Plan` has no retention field yet** (`PlanSpec` carries only `applicationRef`, `backupClassName` and `schedule`), so today a nightly `useSystemBucket` Plan grows the shared bucket unbounded — `schedule` and `retentionPolicy` on the app are inert here (see [Opt-in to the system bucket](#opt-in-to-the-system-bucket)), and platform-level retention is tracked in the [`BackupRetentionPolicy` design (#4192)](https://github.com/cozystack/cozystack/pull/4192). Teardown GC of orphaned `Backup`s / S3 data is [#3966](https://github.com/cozystack/cozystack/issues/3966). Until those land, bound `cozy-backups` with an S3 lifecycle policy on the object store. Two cases release the `Backup` without waiting for the object to be pruned, so a wedged prune never pins a namespace in `Terminating`: a terminating namespace (where the operator's delete-backup step cannot run) and the `backups.cozystack.io/skip-artifact-cleanup: "true"` annotation. In both the driver strips its own finalizer and leaves the object for a bucket lifecycle policy to reclaim. A down operator or unreachable storage in a live namespace is NOT released automatically — the `Backup` stays `Terminating` as a visible signal until the operator recovers or you set that annotation to force the release.
+
+A dump that has started streaming on this flow is not cancelled on the 30-minute backup deadline (a real dataset routinely outruns it, and deleting the CR mid-stream would prune a partial), but it is not unbounded either: after 24 hours in `running` the `BackupJob` fails with a `BackupAbandoned` warning naming the `PerconaServerMongoDBBackup`, which is left in place. If that dump later completes, its archive is reachable only through that CR; delete the CR to prune it.
+
+**Opting back out** (`useSystemBucket` true→false) is not automatic in reverse: the driver stops injecting, but the `s3-storage` entry it already applied stays on the live `PerconaServerMongoDB` under the driver's own field manager (`cozystack-psmdb-backup-driver`) — the chart does not own it and so never prunes it. It is inert once `backup.enabled=false`; to fully return a release to the legacy flow, delete that storage entry from the `PerconaServerMongoDB` by hand before re-declaring the tenant's own `backup.*` S3 values. Until it is removed, a new `BackupJob` on that release is refused rather than written into the platform bucket unowned: the driver recognises the injected entry by its `credentialsSecret` and holds the job at `Ready=False` (`PerconaServerMongoDBStorageStale`) naming that manual step, failing it at the backup deadline. A backup already streaming when the flag was flipped is unaffected — its flow is fixed by the finalizer on its own operator CR.
+
+### Point-in-time recovery (MongoDB)
+
+psmdb records an oplog stream between logical backups. A MongoDB `RestoreJob` recovers to a timestamp via `spec.options.recoveryTime` — the same option name and RFC3339 format the Postgres/CNPG driver uses, so the two are uniform:
+
+```yaml
+spec:
+  options:
+    recoveryTime: "2026-08-05T12:34:56Z"   # RFC3339 (UTC), same as the CNPG driver
+```
+
+The driver converts `recoveryTime` to the psmdb oplog target internally. Unlike CNPG (whose empty `recoveryTime` replays WAL to the latest archived point), an empty `recoveryTime` here restores the backup snapshot as taken — a psmdb logical backup is already a consistent point, so "restore this backup" is the safe default. `spec.options.restoreTimeoutSeconds` caps how long the driver waits for the operator restore before failing (default 30m), matching the CNPG option. Any unrecognised key under `spec.options` (e.g. a `recoverytime` typo) is ignored but surfaced as a `UnknownRestoreOption` Warning event on the RestoreJob rather than silently dropped.
+
 ## Inspecting the defaults
 
 ```bash
@@ -76,26 +180,75 @@ kubectl -n tenant-root get secret bucket-cozy-backups-system-credentials
 kubectl -n cozy-velero get backupstoragelocation cozy-default
 ```
 
-The bucket lives in `tenant-root` and is provisioned through the `apps.cozystack.io/Bucket` CR. The system-managed credentials Secret never leaves that namespace. The backupstrategy-controller projects a copy under the name `cozy-backups-creds` into a tenant namespace right before each BackupJob runs, and refreshes the same Secret in `cozy-velero` (and any other namespace listed in `backupStorage.systemNamespaces`) on a 1-minute tick. The projected Secret carries multiple key formats so each driver finds what it needs in one place:
+The bucket lives in `tenant-root` and is provisioned through the `apps.cozystack.io/Bucket` CR. The system-managed credentials Secret never leaves that namespace. The backupstrategy-controller projects a copy under the name `cozy-backups-creds` into a tenant namespace right before each BackupJob or RestoreJob runs, and refreshes the same Secret in `cozy-velero` (and any other namespace listed in `backupStorage.systemNamespaces`) on a 1-minute tick. The projected Secret carries multiple key formats so each driver finds what it needs in one place:
 
 | Key                                           | Consumer                                  |
 |-----------------------------------------------|-------------------------------------------|
-| `AWS_ACCESS_KEY_ID` / `AWS_SECRET_ACCESS_KEY` | CNPG, MariaDB, Etcd                       |
+| `AWS_ACCESS_KEY_ID` / `AWS_SECRET_ACCESS_KEY` | CNPG, MariaDB, Etcd, RabbitMQ, Redis      |
 | `accessKey` / `secretKey` (plus `bucketName`, `endpoint`, `region`) | ClickHouse sidecar  |
 | `cloud`                                       | Velero (AWS credentials file format)      |
 | `blob_credentials.json`                       | FoundationDB backup_agent                 |
 
+The Redis dump Job additionally reads the `endpoint`, `bucketName`, and `region` keys (alongside the `AWS_*` pair) via `secretKeyRef`, the same set the ClickHouse sidecar consumes.
+
+The dump Job also speaks to the Redis app's own Sentinel and master, which is a separate TLS axis from the S3 endpoint above. When the `Redis` app has `tls.enabled`, the operator moves both to a TLS-only listener and publishes the CA at `redis-<app>.ca-cert`; the Job mounts that Secret optionally and connects with `--tls --cacert` exactly when its `ca.crt` is present, so a plaintext (non-TLS) app is unaffected. This covers the default `tls.authClients: no`. Mutual TLS (`authClients: yes`) is not supported for backup — it requires a client certificate signed by the release CA, which the platform does not issue.
+
 ### Bootstrap window
 
-On a fresh-cluster install, the Velero `BackupStorageLocation` `cozy-default` is rendered before the credentials projector has had a chance to copy `cozy-backups-creds` into `cozy-velero`. The BSL reports `Unavailable` until the projector's first synchronous round completes (which happens immediately when the `backupstrategy-controller` Pod becomes Ready — typically tens of seconds after `helm install` returns, not minutes). Velero rejects new `Backup` AND `Restore` requests against `storageLocation: cozy-default` during that window. Plan VM backup automation accordingly, or wait for `kubectl -n cozy-velero get bsl cozy-default -o jsonpath='{.status.phase}' = Available` before submitting backups.
+On a fresh-cluster install, the Velero `BackupStorageLocation` `cozy-default` is rendered before the credentials projector has had a chance to copy `cozy-backups-creds` into `cozy-velero`. The BSL reports `Unavailable` until the projector's first synchronous round completes (which runs as soon as the `backupstrategy-controller` acquires leadership — in practice moments after the Pod becomes Ready, typically tens of seconds after `helm install` returns, not minutes). Velero rejects new `Backup` AND `Restore` requests against `storageLocation: cozy-default` during that window. Plan VM backup automation accordingly, or wait for the BSL to become ready before submitting backups: `kubectl -n cozy-velero wait backupstoragelocation cozy-default --for=jsonpath='{.status.phase}'=Available --timeout=5m`.
 
 **Note on controller restarts.** The BSL flickers `Unavailable` on every `backupstrategy-controller` pod restart while the projector replays its first synchronous round. The window is short (single-digit seconds) but operators who alert on BSL availability should suppress alerts during the controller's `kube_pod_container_status_restarts_total{container=backupstrategy-controller}` events or use a longer evaluation window than the projector tick (60s).
 
 ### Cozy-default Bucket bootstrap
 
-`cozy-default` ships an `apps.cozystack.io/Bucket cozy-backups` CR in `tenant-root`, which the bucket-application chart turns into a `BucketClaim`; the COSI driver then assigns the real S3 bucket name and writes it to the BucketClaim's `.status.bucketName`. The strategy templates and the Velero BSL all read that real bucket name (Helm `lookup` against the BucketClaim). On a fresh install the BucketClaim takes a short reconcile cycle to populate its status — until it does, the strategy templates render empty and only the `Bucket` CR + `BackupClass` are present in the cluster. Flux re-renders the HelmRelease on its standard interval (default 10 minutes), at which point the populated BucketClaim status causes the missing strategy templates to materialise.
+`cozy-default` ships an `apps.cozystack.io/Bucket cozy-backups` CR in `tenant-root`, which the bucket-application chart turns into a `BucketClaim`; the COSI driver then assigns the real S3 bucket name (`bucket-<claim-UID>`, so it cannot be computed in advance) and writes it to the BucketClaim's `.status.bucketName`. The strategy templates and the Velero BSL all read that real bucket name (Helm `lookup` against the BucketClaim). On a fresh install the BucketClaim takes a reconcile cycle to populate its status — until it does, the strategy templates render empty and only the `Bucket` CR + `BackupClass` are present in the cluster.
+
+**That skip does not repair itself on a reconcile.** helm-controller re-renders a release only when its chart or values change; the interval reconcile is a no-op for a healthy release, and drift detection is off on operator-generated HelmReleases. A cluster that lost the race at install time therefore keeps `BackupClass cozy-default` with **no** `Strategy` CRs and **no** Velero BSL indefinitely — which also fail-closes the pre-adoption snapshot in the v1.6.0 etcd migration.
+
+The same trap sits one release earlier, on the Secret everything else depends on. `bucket-cozy-backups-system-credentials` is rendered by the `bucket-cozy-backups-system` release behind a `lookup` of the COSI Secret, and is skipped just as permanently when that lookup is empty. Without it the credentials projector has no source at all, so no strategy, no Velero and no v1.6.0 etcd migration can resolve — and the gate cannot even determine the bucket name, which it reads from that Secret.
+
+Convergence is driven instead by the controller's default-objects gate (`backupStorage.reconcileDefaultObjects`, on by default), which repairs both, in order. While the credentials Secret is absent or carries no bucket name, the gate stamps `reconcile.fluxcd.io/forceAt` + `requestedAt` on the **bucket's** `bucket-<name>-system` HelmRelease. Once the bucket name resolves it checks that every object `cozy-default` routes to exists and stamps the same pair on the **`backupstrategy-controller`** HelmRelease, forcing the real Helm upgrade that re-runs the lookups. The two are throttled independently (one force per 5 minutes each), so the second is not delayed by the first. Expect the objects within a minute or two of the bucket becoming ready.
 
-If you need the BackupClass functional immediately (e.g. an e2e), trigger a Flux reconcile (`flux reconcile helmrelease backupstrategy-controller`) once you see `kubectl get bucketclaim -n tenant-root bucket-cozy-backups -o jsonpath='{.status.bucketName}'` non-empty.
+Each default `Strategy` CR also waits for its own CRD. The chart ships the `strategy.backups.cozystack.io` CRDs as templates in the same release, and Helm resolves every object's kind before it applies any, so a CR rendered next to a CRD the apiserver does not serve yet would fail the whole release, CRDs included. Each strategy template therefore renders only once its CRD is `Established`. That holds the CRs back on the first render of every install, including an external-S3 one where the bucket name is known up front, and on the upgrade that first ships a new strategy kind: that revision creates the CRDs, and the gate's forced upgrade above renders the CRs.
+
+The gate does not force a suspended HelmRelease — helm-controller ignores both annotations while `spec.suspend` is true, so it logs the skip and leaves the force counter alone. A release left suspended (`cozyhr suspend`) is therefore never repaired until it is resumed.
+
+Watch it with:
+
+```bash
+kubectl -n cozy-backup-controller logs deploy/backupstrategy-controller | grep default-objects-gate
+```
+
+#### Manual recovery on an affected cluster
+
+Only needed on a cluster running a version without the gate (or with `reconcileDefaultObjects: false`). A plain `flux reconcile helmrelease` does **nothing** here — it does not re-render. You need a forced upgrade, and **both** annotations: `forceAt` is what makes helm-controller run a real Helm upgrade, and it is only honoured together with `requestedAt`.
+
+First confirm the bucket name is actually resolvable — forcing before that just re-runs the same empty lookup:
+
+```bash
+kubectl -n tenant-root get bucketclaim bucket-cozy-backups -o jsonpath='{.status.bucketName}'
+```
+
+Then force the two releases, **in this order**:
+
+```bash
+# 1. The credentials Secret. It is rendered by the -system release, not by
+#    bucket-cozy-backups — easy to miss, and the projector (hence every
+#    strategy and Velero) has no source without it.
+ts=$(date -u +%Y-%m-%dT%H:%M:%SZ)
+kubectl -n tenant-root annotate helmrelease bucket-cozy-backups-system \
+  reconcile.fluxcd.io/forceAt="$ts" reconcile.fluxcd.io/requestedAt="$ts" --overwrite
+kubectl -n tenant-root get secret bucket-cozy-backups-system-credentials
+
+# 2. The Strategy CRs and the Velero BSL.
+ts=$(date -u +%Y-%m-%dT%H:%M:%SZ)
+kubectl -n cozy-backup-controller annotate helmrelease backupstrategy-controller \
+  reconcile.fluxcd.io/forceAt="$ts" reconcile.fluxcd.io/requestedAt="$ts" --overwrite
+kubectl get $(kubectl get crd -o name | grep strategy.backups.cozystack.io) 2>/dev/null
+kubectl -n cozy-velero get backupstoragelocation cozy-default
+```
+
+The race is nested: step 2's `lookup` resolves from the BucketClaim status, but the projector — and the v1.6.0 etcd migration — read the Secret from step 1, so a cluster missing both needs both.
 
 ### Observability
 
@@ -104,11 +257,17 @@ The credentials projector emits two Prometheus counters labelled by `namespace`
 - `cozystack_backup_credentials_projection_successes_total`
 - `cozystack_backup_credentials_projection_failures_total`
 
-Alert on `rate(failures_total) > 0` or `absent_over_time(successes_total[10m])` to catch a stale BSL credential or a malformed source Secret without log scraping.
+Alert on `rate(cozystack_backup_credentials_projection_failures_total[5m]) > 0` or `absent_over_time(cozystack_backup_credentials_projection_successes_total[10m])` to catch a stale BSL credential or a malformed source Secret without log scraping.
+
+The default-objects gate emits three more:
+
+- `cozystack_backup_default_objects_missing{backupclass="cozy-default"}` — how many of the objects the platform default backups depend on are absent: the credentials Secret, the Strategy CRs `cozy-default` routes to, and the Velero BSL. **This is the alert that would have caught the missing Strategy CRs**: it is non-zero whatever the HelmRelease's `Ready` condition says. Alert on `min_over_time(cozystack_backup_default_objects_missing[15m]) > 0`.
+- `cozystack_backup_default_objects_check_errors_total{backupclass="cozy-default"}` — checks that could not reach a conclusion (an API error reading the source Secret, the BackupClass, or one of the routed objects). The gauge above is deliberately **not** written on those ticks, so that it does not flap on a transient API error — which means that while this counter climbs, the gauge is stale and a `0` on it proves nothing. Pair the two: `min_over_time(cozystack_backup_default_objects_missing[15m]) > 0 or rate(cozystack_backup_default_objects_check_errors_total[15m]) > 0`.
+- `cozystack_backup_default_objects_force_reconciles_total{namespace,name}` — forced Helm upgrades issued, labelled by the release forced (this chart's own, or the bucket's `-system` release). A counter that keeps climbing means the forced render is not producing the objects (a missing CRD, for instance), which is a different problem from the install-time race. A suspended release is skipped before the patch and is **not** counted here, so a paused release cannot masquerade as a render that keeps failing — look for the `skipped forcing a suspended HelmRelease` log line instead.
 
 ## Admin overrides for `cozy-default`
 
-`cozy-default` is rendered by the `backupstrategy-controller` chart and owned by Flux's helm-controller. **Direct `kubectl edit backupclass cozy-default` is overwritten on the next helm reconcile** — the same applies to its companion `strategy.backups.cozystack.io/*` CRs (`cozy-default-cnpg`, `cozy-default-etcd`, `cozy-default-mariadb`, `cozy-default-altinity`, `cozy-default-foundationdb`, the two `cozy-default-velero-*`). The supported override path is the cozystack `Package` CR, which lets admins inject Helm values into platform components:
+`cozy-default` is rendered by the `backupstrategy-controller` chart and owned by Flux's helm-controller. **Direct `kubectl edit backupclass cozy-default` is overwritten on the next helm reconcile** — the same applies to its companion `strategy.backups.cozystack.io/*` CRs (`cozy-default-cnpg`, `cozy-default-etcd`, `cozy-default-mariadb`, `cozy-default-altinity`, `cozy-default-mongodb`, `cozy-default-foundationdb`, `cozy-default-rabbitmq`, `cozy-default-redis`, the two `cozy-default-velero-*`). The supported override path is the `backupStorage` block on the **`platform` component** of the `cozystack.cozystack-platform` Package CR:
 
 ```yaml
 apiVersion: cozystack.io/v1alpha1
@@ -117,7 +276,7 @@ metadata:
   name: cozystack.cozystack-platform
 spec:
   components:
-    backupstrategy-controller:
+    platform:
       values:
         backupStorage:
           provisionBucket: true                    # default; set false for external S3
@@ -130,12 +289,31 @@ spec:
             - cozy-velero
 ```
 
+The platform chart forwards this block into the child `Package cozystack.backupstrategy-controller` as `components.backupstrategy-controller.values.backupStorage` (`packages/core/platform/templates/bundles/system.yaml`), from where the cozystack operator merges it into the `backupstrategy-controller` HelmRelease over the chart defaults. Two paths that look plausible do **not** work: `spec.components.backupstrategy-controller` on the `cozystack.cozystack-platform` Package is silently ignored (the only component under that PackageSource is `platform`), and patching the child `Package cozystack.backupstrategy-controller` directly is reverted whenever the platform helm-reconcile re-renders it.
+
+A sibling `backupStrategyController` block on the same `platform` component is forwarded the same way, for the controller's own knobs rather than the bucket. The one an operator reaches for is `redisBackupResources`, which sizes the Redis strategy Pod — restore loads the whole dataset into a throwaway loader, so a large Redis needs more memory / ephemeral-storage than the defaults (the loader-not-ready log line points here):
+
+```yaml
+spec:
+  components:
+    platform:
+      values:
+        backupStrategyController:
+          redisBackupResources:
+            limits:
+              memory: 8Gi
+              ephemeral-storage: 32Gi
+```
+
 | Knob | Effect |
 |---|---|
 | `provisionBucket` | Toggle creation of the in-cluster `apps.cozystack.io/Bucket` CR. Set `false` for external S3 (see [Disabling the platform-managed bucket](#disabling-the-platform-managed-bucket)). |
-| `bucketName` | K8s name of the Bucket CR + lookup key for the COSI BucketClaim. The actual S3 bucket name is the COSI-assigned UUID, surfaced through `BucketClaim.status.bucketName`. |
+| `bucketName` | Two modes. With `provisionBucket: true` (default): K8s name of the Bucket CR + lookup key for the COSI BucketClaim — the actual S3 bucket name is the COSI-assigned UUID, surfaced through `BucketClaim.status.bucketName`. With `provisionBucket: false`: taken **verbatim as the real S3 bucket name** and baked into every strategy CR + the Velero BSL. |
+| `namespace` | Namespace the Bucket CR (and its system-credentials Secret) lives in — `tenant-root` by default. Must be a tenant namespace (`tenant-*`): the Bucket chart's RBAC helper fails the Helm render for any other prefix. |
 | `bucketNameOverride` | Escape hatch for offline `helm template` renders — bypasses the live-cluster BucketClaim lookup. Leave empty in production. |
-| `endpoint` | S3 endpoint baked into every default strategy CR + the Velero BSL. Switching to `https://` silently enables TLS in the MariaDB strategy — ensure the CA bundle is reachable to the relevant operator/driver Pods before flipping it. |
+| `endpoint` | **Fallback** S3 endpoint. For a provisioned bucket the strategy CRs + Velero BSL derive the endpoint from the COSI system Secret (external ACME ingress, forced `https://`) instead; this value is used only for external S3 (`provisionBucket: false`) and offline renders. For external S3, switching it to `https://` enables TLS in the MariaDB/FoundationDB strategies, which derive TLS from the scheme. The Redis dump Job is not scheme-driven: the projector delivers a bare host and the script prepends `https://` unconditionally, so the Job always connects over TLS — point `endpointCASecretName` (below) at the private CA rather than relying on the scheme, and ensure that CA is reachable to the relevant Pods. |
+| `endpointCASecretName` | Optional Secret (key `ca.crt`) in the app namespace the Redis Job trusts for a self-signed S3 endpoint. Empty by default: the projected endpoint is always `https://` and the platform bucket's ACME cert verifies against the image's system CA store unaided. Set it only for a private CA. The Job mounts it optionally (nothing projects this Secret automatically), so a name typo does not wedge the Pod on `FailedMount`: a missing `ca.crt` falls through to the system CA store and the Job fails fast at the TLS handshake with a legible error — it does not skip verification, which still needs the explicit `insecureSkipTLSVerify` opt-in. |
+| `insecureSkipTLSVerify` | Disables S3 certificate verification for the Redis Job (`curl -k`). `false` by default and an explicit opt-in, never a fallback — an untrusted-cert endpoint fails closed unless this is set. Prefer `endpointCASecretName`. |
 | `region` | Re-projected into `cozy-backups-creds` on the next reconcile. Pod-restart required for chart-emitted clients consuming the region via env (ClickHouse sidecar today). |
 | `forcePathStyle` | Path-style addressing; SeaweedFS S3 requires it, AWS S3 typically doesn't. |
 | `systemSecretName` | Name of the human-friendly Secret produced by the Bucket app (or pre-created manually for external S3). The projector also accepts the raw COSI Secret format. |
@@ -145,29 +323,42 @@ When the override needs to go beyond storage coordinates — different retention
 
 ## Tuning via a custom BackupClass
 
-The defaults aim at a reasonable middle (30-day retention, gzip compression where applicable). To override for a specific tenant or workload, create your own `BackupClass` pointing at the same strategy CRs but with tweaked `parameters`, or a fresh strategy CR. Common knobs:
+The defaults aim at a reasonable middle (gzip compression where applicable; engine-side retention only where the strategy carries it, which today is the CNPG `retentionPolicy: "30d"` and the two Velero `ttl: 720h`; every other shipped strategy, MongoDB included, sets none, so its archives on the shared bucket are bounded only by an S3 lifecycle policy or a manual `Backup` delete: a `Plan` only creates BackupJobs and never deletes a `Backup`). To override for a specific tenant or workload, create your own `BackupClass` pointing at the same strategy CRs but with tweaked `parameters`, or a fresh strategy CR. Common knobs:
 
 - **CNPG strategy**: `barmanObjectStore.retentionPolicy`, `data.compression`, `wal.compression`.
 - **MariaDB strategy**: `compression`, `maxRetention`, `databases[]`.
-- **Altinity strategy**: tune the `clickhouse-backup` sidecar via `backup.*` values on the ClickHouse release; the strategy Pod is a thin HTTP client.
+- **MongoDB strategy**: `storageName` (which `spec.backup.storages` entry on the psmdb cluster to use), `type` (`logical`), `compressionType` / `compressionLevel`, and — for the `useSystemBucket` flow — the `s3` coordinates the driver injects. On the default flow the S3 target is tuned via `backup.*` values on the MongoDB release instead (see [MongoDB: backup storage](#mongodb-backup-storage)).
+- **Altinity strategy**: tune the `clickhouse-backup` sidecar via `backup.*` values on the ClickHouse release; the strategy Pod is a thin HTTP client. When the S3 endpoint's certificate is signed by a private CA rather than a publicly-trusted one — SeaweedFS's in-cluster `:8333` being the case in point — point `backup.endpointCA` at a Secret holding that CA bundle; the chart mounts it into the sidecar and adds it to the trust store via `SSL_CERT_DIR`, which supplements the system CA set rather than replacing it.
 - **FoundationDB strategy**: `snapshotPeriodSeconds`, `agentCount`, `urlParameters[]`.
+- **Rabbitmq strategy**: `artifactURITemplate` (the `<namespace>/<application>/<backup-name>/definitions.json` object-key layout) and the pod `template` (image, resources). The backup is a definitions export over the management API — vhosts, users, permissions, queues, exchanges, bindings, policies, parameters — so message payloads are out of scope and there is no point-in-time recovery; a full message-data backup is a Velero volume snapshot instead. **Restore is a merge, not a reset**: importing definitions (`POST /api/definitions`) creates or updates what the export contains and never deletes, so anything created after the backup survives the restore and the broker is not returned to its exact backup-time state. A to-copy restore imports the source's users (with password hashes) into the target, so those source credentials become valid logins there. Unlike the operator-backed strategies (whose engine owns archive retention), the Rabbitmq driver owns its object outright and deletes it from the bucket when its `Backup` is deleted — via a one-shot Job the Backup's removal waits on — so a retention-pruned `Plan` does not normally accumulate objects. The delete is **best-effort**: when it cannot run from here the Backup is released without deleting the object (with a `Warning` Event naming what was left behind), so the Backup — and any namespace being torn down — never wedges. The named give-up conditions are: the namespace is terminating (`CREATE` is forbidden there), the strategy CR or the projected credentials are unavailable, the rendered Job name is invalid, or the skip annotation below is set. Otherwise a genuinely failing delete (object storage unreachable) keeps the `Backup` in `Terminating` (a visible signal to act on) and retries. To release such a stuck `Backup`, annotate it `backups.cozystack.io/skip-artifact-cleanup: "true"` — cleanup then skips the delete and lets the `Backup` go, leaving the object in the bucket to be reclaimed manually or by a bucket lifecycle policy (`kubectl annotate backup <name> -n <namespace> backups.cozystack.io/skip-artifact-cleanup=true`).
 - **Velero strategy (VMInstance / VMDisk)**: `ttl`, `includedResources[]`, `excludedResources[]`.
-- **Etcd strategy**: today the strategy is path-only; combine with `Plan.spec.retentionPolicy` for trim cadence.
+- **Etcd strategy**: today the strategy is path-only, and a `Plan` carries no retention field yet (see [#4192](https://github.com/cozystack/cozystack/pull/4192)), so nothing trims etcd snapshots on the shared bucket automatically either.
 
 The system-managed credentials Secret is the **only** way for in-cluster strategies to reach `cozy-backups`. Do not embed access keys in `BackupClass.parameters` — the security model relies on Secret references, and `parameters` end up in `Backup.status.underlyingResources`, which tenants can read.
 
 ## Disabling the platform-managed bucket
 
-If a deployment runs against an external S3 (no SeaweedFS), set `backupStorage.provisionBucket: false` in the `backupstrategy-controller` values and create the source credentials Secret in `tenant-root` manually (flat-key format: `accessKey` / `secretKey` / `endpoint` / `bucketName`; or the raw COSI `BucketInfo` JSON). Update `backupStorage.endpoint`, `backupStorage.region`, and (for VM backups) the chart's Velero BSL settings to point at the external S3.
+If a deployment runs against an external S3 (no SeaweedFS), set `backupStorage.provisionBucket: false` via the `platform` component override described above and create the source credentials Secret in `tenant-root` manually (flat-key format: `accessKey` / `secretKey` / `endpoint` / `bucketName`; or the raw COSI `BucketInfo` JSON). In the same `backupStorage` block, update `endpoint`, `region`, **and `bucketName`**: with `provisionBucket: false` the strategies and the Velero BSL take `bucketName` verbatim as the real S3 bucket name (no COSI lookup), so it must name the actual bucket on the external S3 — the `bucketName` key inside the Secret alone is not enough. The Velero `BackupStorageLocation` picks the same values up automatically (the chart renders it from the same `backupStorage` block), so no separate BSL configuration is needed. Note that disabling the cluster-default BSL itself (the chart's `velero.bslEnabled` value) is **not** carried by the `backupStorage` override path — the platform Package forwards only the `backupStorage` block.
 
 ## Upgrade notes from chart-managed backups
 
-> **Postgres `backup.enabled: true` with placeholder credentials no longer renders `barmanObjectStore` on upgrade.**
+> **Postgres backups now use the CloudNativePG Barman Cloud plugin, not native `spec.backup.barmanObjectStore`.**
+>
+> Postgres backups were migrated off the deprecated native `barmanObjectStore` (removed in CNPG 1.29) onto the [Barman Cloud plugin](https://github.com/cloudnative-pg/plugin-barman-cloud). The `barman-cloud-*` binaries the native path needs are absent from the `standard` image variant `keycloak-db` pins; `apps/postgres` pins bare (system-flavor) tags that still ship them — its breakage was the operator/CRD skew below, not missing binaries — but the system flavor is deprecated upstream, so both move to the plugin. The chart now renders `spec.plugins` on the `cnpg.io/Cluster` plus a `barmancloud.cnpg.io/ObjectStore` CR that carries the S3 configuration, and the CNPG backup driver SSA-applies an `ObjectStore` and patches `spec.plugins` (instead of `spec.backup.barmanObjectStore`) for the platform flow; `Backup`/`ScheduledBackup` use `method: plugin`. On `helm upgrade` a legacy chart-managed Cluster's `spec.backup.barmanObjectStore` is replaced by `spec.plugins` + an `ObjectStore`. This only works once the `plugin-barman-cloud` operator is installed and co-located with the CNPG operator in `cozy-postgres-operator` (shipped by the `postgres-operator` chart) and its cert-manager dependency is present — otherwise the Cluster references a plugin that is not registered and backups / WAL archiving stall.
+>
+> **Mixed-version window: BackupJobs fail until the app re-renders with the new chart.** A `BackupJob` that fires while a `Cluster` still carries the pre-upgrade chart's native `spec.backup.barmanObjectStore` is rejected by the CNPG admission webhook (`Cannot enable a WAL archiver plugin when barmanObjectStore is configured`) — the driver cannot attach `spec.plugins` alongside the native config. This resolves itself once Flux re-renders the Postgres app with the new chart (which replaces `barmanObjectStore` with `spec.plugins`); re-run the BackupJob afterward. Upgrading only the operators/driver without the app charts leaves every `backup.enabled: true` Postgres in this state permanently.
+>
+> **Postgres `backup.enabled: true` with placeholder credentials no longer wires backups on upgrade.**
+>
+> The pre-v1.5 defaults for `backup.s3AccessKey` / `backup.s3SecretKey` in `packages/apps/postgres/values.yaml` were the literal `"<your-access-key>"` / `"<your-secret-key>"` placeholders, so the Postgres chart still rendered a backup block on the `cnpg.io/Cluster` (with junk credentials, WAL archiving failing at runtime). Starting with v1.5 those defaults are empty strings and the chart NO LONGER renders any backup wiring when the placeholders are unmodified. Tenants on the legacy chart-managed flow who relied on those placeholders see `spec.plugins` and the `ObjectStore` disappear from the live `Cluster` on `helm upgrade`. Action — pick one:
+>
+> - **Move to the platform flow (recommended).** Set `backup.useSystemBucket: true`; the chart leaves `spec.plugins` unset and the CNPG backup driver SSA-applies the `ObjectStore` and patches `spec.plugins` onto the live `Cluster` at first BackupJob time. No tenant-side keys required.
+> - **Stay on the legacy chart-managed flow.** Supply real `backup.s3AccessKey` / `backup.s3SecretKey` (or a pre-existing `backup.s3CredentialsSecret.name`); the chart renders `spec.plugins` + the `ObjectStore` from those coordinates.
 >
-> The pre-PR defaults for `backup.s3AccessKey` / `backup.s3SecretKey` in `packages/apps/postgres/values.yaml` were the literal `"<your-access-key>"` / `"<your-secret-key>"` placeholders, so the Postgres chart still rendered `spec.backup.barmanObjectStore` on the `cnpg.io/Cluster` (with junk credentials, `archive_command` failing at runtime). After this PR those defaults are empty strings and the chart NO LONGER renders the backup block at all when the placeholders are unmodified. Tenants on the legacy chart-managed flow who relied on those placeholders see their `barmanObjectStore` disappear from the live `Cluster` on `helm upgrade`. Action — pick one:
+> **Two platform-level changes ride along with this migration (they are required for the plugin to run):**
 >
-> - **Move to the platform flow (recommended).** Set `backup.useSystemBucket: true`; the chart leaves `barmanObjectStore` unset and the CNPG backup driver SSA-patches it onto the live `Cluster` at first BackupJob time. No tenant-side keys required.
-> - **Stay on the legacy chart-managed flow.** Supply real `backup.s3AccessKey` / `backup.s3SecretKey` (or a pre-existing `backup.s3CredentialsSecret.name`); the chart renders `barmanObjectStore` exactly as before.
+> - **CloudNativePG operator bumped to 1.28.1** (`postgres-operator` chart). A minor operator upgrade for the whole fleet; the CNPG CRDs move with it. This also fixes a latent bug where the operator image was newer than its bundled CRDs (`status.instanceID.sessionID` pruned), which made the operator believe the instance manager restarted and fail **every** backup cluster-wide with `instance manager was restarted during backup`. The vendored chart ships the CNPG CRDs as ordinary release manifests (gated by `crds.create`), so a normal `helm upgrade` updates them together with the operator — the `helm.sh/resource-policy: keep` annotation only prevents their deletion, not updates. The historical skew came from the `image.tag` pin outrunning the vendored chart's CRDs, which this PR removes; no out-of-band CRD apply is needed unless the HelmRelease itself is held back.
+> - **LINSTOR scheduler admission webhook must not strip native-sidecar fields.** Older `linstor-scheduler` extender builds (≤ v0.3.5's predecessors) decoded every pod through a stale vendored Kubernetes API and re-encoded it, stripping `initContainers[].restartPolicy` cluster-wide — which breaks the plugin's restartable barman sidecar ("startupProbe forbidden without restartPolicy=Always"). The platform already ships the fixed webhook (`linstor-scheduler` re-vendored to upstream chart 0.3.1 / extender v0.3.6, which stopped stripping unknown pod fields), so no action is needed on an up-to-date platform; just do not hold the `linstor-scheduler` package back on an older version when rolling out the plugin.
 >
 > The same `useSystemBucket` opt-in applies to ClickHouse — see [ClickHouse: opt-in to the system bucket](#clickhouse-opt-in-to-the-system-bucket). When `useSystemBucket: true` is set on ClickHouse, the legacy `<release>-backup` CronJob, credential Secret, and backup script are no longer rendered (they are mutually exclusive with the platform flow); migrate scheduled backups to a `backups.cozystack.io/Plan` against `cozy-default`.
 
@@ -188,3 +379,83 @@ spec:
     kind: Postgres
     name: orders-db
 ```
+
+An application takes one restore at a time. A RestoreJob that targets an application another unfinished RestoreJob is already restoring fails with reason `ConcurrentRestore` before it changes anything, and its message names the job that goes first. It is not queued: once that job has finished, create a new RestoreJob if the restore is still wanted. A restore that has started always goes first. Between two that have not, the older one runs; creation times have one-second precision, so of two created in the same second, the one whose name sorts first runs.
+
+## Point-in-time recovery (PostgreSQL)
+
+A `RestoreJob` restores a `Postgres` application from a `Backup`. Omit `spec.options.recoveryTime` to recover to the latest point in the WAL archive; set it (RFC3339) to recover the database to an exact instant — a point-in-time recovery (PITR). The CNPG barman-cloud plugin restores a base backup and replays archived WAL from it: up to `recoveryTime` when one is set, so the restored cluster reflects the database as of that instant and later writes are absent, and to the end of the archive otherwise.
+
+The base backup a restore starts from is the one the `Backup` refers to: the driver passes its barman backup ID to CNPG as `bootstrap.recovery.recoveryTarget.backupID`. There are two exceptions, and for both the choice is left to the plugin. The first is a `recoveryTime` earlier than one second after that backup ended, which the backup cannot serve (recovery would have to stop before the backup is consistent); the plugin then takes the newest base backup that ended at or before `recoveryTime`. The second is a `Backup` whose `cnpg.io/Backup` no longer exists: retention (`barmanObjectStore.retentionPolicy`) deletes it together with the base backup it describes, so the archive can no longer start from that backup, and the `RestoreJob` records a `BaseBackupGone` warning event. A base backup removed from the bucket by anything else — a lifecycle rule, a manual delete — is still pinned for as long as its `cnpg.io/Backup` stays. The plugin deletes a `cnpg.io/Backup` whose base backup has left the catalog on its next maintenance pass (every `instanceSidecarConfiguration.retentionPolicyIntervalSeconds` of the `ObjectStore`, 30 minutes by default, retention policy or not), but only from the primary of the cluster that took it, running under the same UID. Until then a restore from it fails after the target has been purged, with `no backup found with ID` in the recovery log, and a retry fails the same way; deleting that `cnpg.io/Backup` by hand, which leaves the object store untouched, lets the next `RestoreJob` go through the plugin's choice. Left to itself for every restore, the plugin would start from the newest base backup in the archive whenever `recoveryTime` is empty, and from the newest one ending by `recoveryTime` otherwise, whichever `Backup` the `RestoreJob` names and on any timeline — see [Archives with several timelines](#archives-with-several-timelines) for why that matters.
+
+```yaml
+apiVersion: backups.cozystack.io/v1alpha1
+kind: RestoreJob
+metadata:
+  name: orders-db-pitr
+  namespace: tenant-acme
+spec:
+  backupRef:
+    name: orders-db-adhoc            # a completed Backup of the source
+  targetApplicationRef:              # omit for a destructive in-place restore
+    apiGroup: apps.cozystack.io
+    kind: Postgres
+    name: orders-db-copy             # a pre-deployed, empty Postgres app
+  options:
+    recoveryTime: "2026-07-21T09:30:00Z"
+```
+
+A full, scripted example (write a marker, capture the timestamp, restore to it, assert what survived) is in [`examples/backups/postgres/`](../../examples/backups/postgres/) — `45-restorejob-pitr.yaml`, driven by `run-all.sh`.
+
+### The recoverable window
+
+`recoveryTime` must fall inside the window the archive can reconstruct:
+
+- **Earliest** — the completion of the oldest base backup still in the archive. You cannot recover to an instant before the first base backup: WAL replay always starts from a base backup, and retention (`barmanObjectStore.retentionPolicy`) eventually trims the oldest ones together with the WAL that predates them. Aim at least one second after a backup's `status.stoppedAt`: `stoppedAt` is truncated to the second, while the plugin compares `recoveryTime` with the end time barman records in `backup.info`, to the microsecond, and keeps only a backup that ended at or before it. A `recoveryTime` equal to `stoppedAt` therefore falls before that backup's actual end: an older backup is used instead, and when there is none the restore fails with `no target backup found`.
+- **Latest** — the last transaction, commit or abort, contained in the WAL shipped to object storage. It is not the newest WAL segment: a time-targeted recovery ends just before the first transaction recorded after `recoveryTime`, and a segment switch, a checkpoint or the end of a base backup is not one. A `recoveryTime` at or after the last archived transaction leaves PostgreSQL nothing to stop on. On a busy database the last transaction trails "now" by the archive lag; on a database at rest it is its last write, however recent the WAL archive and however recent the latest base backup. Once the source is deleted, the window is frozen at the last transaction that made it to S3 before it went away.
+
+A `recoveryTime` **at or after the last archived transaction cannot converge**: PostgreSQL replays every available WAL, never finds a transaction after the target, exits with `FATAL: recovery ended before configured recovery target was reached`, and CNPG re-creates the recovery instance in a loop. Such a wedged restore is failed by the restore deadline (`spec.options.restoreTimeoutSeconds`, default 30m) — and the driver reads the recovery pod's log at that point, so instead of a generic timeout the RestoreJob ends `status.phase: Failed` with conditions `RecoveryConverged=False` and `Ready=False`, both reason `RecoveryTargetUnreachable`, and a message naming the target. The driver deliberately does **not** fail earlier off that FATAL: a *reachable* near-now target hits the identical FATAL transiently — often repeatedly, on a slow archiver — before it converges, so an earlier trip would reject a recoverable restore. To reject an unreachable target quickly, set a short `restoreTimeoutSeconds`; otherwise pick a time before the last archived transaction. The state as of the last write needs no `recoveryTime` at all: omitting it replays the whole archive, and that is the state it recovers.
+
+Restoring to a **very recent** instant is safe as long as the database keeps writing and WAL archiving is current: the segment covering the target, or the transaction after it, may not be in object storage yet and the same FATAL fires transiently, but because the driver only fails at the deadline (not on that FATAL), the recovery has the whole window to catch up — the next attempt promotes once the WAL ships and the cluster goes healthy, which completes the restore. Only a target that never becomes reachable within the deadline is failed: on a database that has stopped writing, that is every target after its last transaction. If archiving is badly behind (a stalled `archive_command`, an overloaded cluster) a near-now target can exceed even the default 30m window; restore to a point you can confirm is followed by an archived transaction (see the discovery section below).
+
+A `recoveryTime` **before the earliest base backup** fails differently: PostgreSQL cannot begin replay before the base backup it restored, so recovery never reaches a consistent state and never emits the "recovery ended before …" FATAL the driver classifies on. That case also surfaces at the deadline, but with the generic reason `RestoreFailed` rather than `RecoveryTargetUnreachable`. Choosing a `recoveryTime` at least one second after the oldest base backup's `stoppedAt` (below) avoids it.
+
+### Discovering the earliest / latest restorable time
+
+CNPG's `Cluster.status.firstRecoverabilityPoint` exists in the status schema but is unreliable under the barman-cloud plugin — it was observed empty on every plugin-backed cluster in a test environment (CNPG 1.28.1) — so read the window from the backup catalog instead. Each completed base backup records its WAL range and timestamps on the underlying `cnpg.io/Backup`:
+
+```bash
+# Completed base backups, oldest first: STOP plus one second is the earliest
+# instant that backup alone can restore to; the oldest one bounds the window.
+kubectl -n <ns> get backups.postgresql.cnpg.io \
+  --sort-by=.status.stoppedAt \
+  -o custom-columns=NAME:.metadata.name,PHASE:.status.phase,ID:.status.backupId,START:.status.startedAt,STOP:.status.stoppedAt,BEGINWAL:.status.beginWal,ENDWAL:.status.endWal
+
+# The cozystack Backup points at its underlying cnpg.io/Backup and S3 prefix.
+kubectl -n <ns> get backup.backups.cozystack.io <name> -o jsonpath='{.spec.driverMetadata}'
+```
+
+The upper bound is the timestamp of the last `COMMIT` or `ABORT` record in the archived WAL, which nothing in the cluster status reports. `pg_waldump` prints it from the newest segments under `<destinationPath>/<serverName>/wals/`, working back from the newest segment until one holds such a record; on a database at rest that can be several segments back, because every segment switch and every base backup adds one with no transaction in it. Any `recoveryTime` before that timestamp is reachable; for the state as of that last transaction, omit `recoveryTime`.
+
+### Archives with several timelines
+
+A WAL archive can hold several PostgreSQL timelines under one `serverName`. Every failover starts one, and so did every in-place restore made before restored clusters archived to a fresh prefix (`bootstrap.newServerName`): those wrote the new timeline back into the prefix they had recovered from, often without its `.history` file, so the archive ends up with branches that are siblings rather than a single line of descent.
+
+Recovery follows `recovery_target_timeline: latest`, which CNPG leaves as PostgreSQL's default: starting from the base backup's timeline, PostgreSQL looks for the history file of the next timeline number, then the next, stops at the first one missing, and targets the last one it found, replaying only the segments on that line of descent. Without any history file that is the base backup's own timeline alone. When the timeline it targets does not descend from the base backup — a sibling branch whose history file happens to carry the next number — recovery does not fall back to another timeline: it stops with `FATAL: requested timeline N is not a child of this server's history` (or `... is not in this server's history`). Two consequences:
+
+- the last archived transaction that bounds a restore is the last one on the timeline that restore follows, not the newest one in the archive;
+- a restore must start from a base backup on the branch it means to bring back. The plugin's own choice ignores timelines — CNPG passes no `targetTLI` — so the newest backup, or the newest one ending by `recoveryTime`, can lie on another branch and restore that branch's data instead. The driver pins the `Backup`'s own base backup with `recoveryTarget.backupID` for that reason; a `recoveryTime` earlier than that backup's end still goes through the plugin's time-based choice, and on such an archive can land on another branch.
+
+### Idempotency under GitOps
+
+An in-progress restore is safe to reconcile. The driver purges the target `Cluster` + PVCs exactly once per RestoreJob (guarded by the `TargetPurged` condition and by the `postgres.cozystack.io/restored-server-name` annotation, which identifies the RestoreJob whose purge produced the live recovery `Cluster`), suspends the target's HelmRelease across the purge so Flux cannot race the bootstrap swap, and resumes it once the recovery cluster is rendered. A Flux reconcile (or a controller restart) mid-restore therefore re-attaches to the recovering cluster rather than deleting it and starting over.
+
+## Kafka: topic metadata only
+
+The `cozy-default-kafka` strategy backs up **topic metadata**, not message data. Its Job talks to the Kafka Admin API (`kafka-topics --describe` on backup, `kafka-topics --create` + `kafka-configs --alter` on restore) and stores one small object per run at `s3://<bucket>/<namespace>/<application>/<backup-name>/kafka-metadata.txt`. It captures every non-internal topic's partition count, replication factor and non-default configs; message payloads, consumer-group offsets, ACLs, quotas and `KafkaUser`s are out of scope, and there is no point-in-time recovery. The driver gates each run on the Strimzi `Kafka` cluster reporting `Ready` and never mutates it.
+
+This is the "reconstruct a cluster's topic topology" flow: an in-place restore recreates dropped topics into the source, and a to-copy restore applies the source's topics onto a freshly-bootstrapped empty `Kafka` (partitions and configs preserved). Restore is additive at the topic-set level — it never deletes topics that exist live but not in the backup — but it does not silently accept a divergent existing topic: it grows the partition count when the backup asks for more, and fails loudly (naming the topic and both values) when the backup asks for fewer partitions or a different replication factor, since Kafka cannot shrink partitions or change RF in place and a restore that cannot reach the recorded state must not report `Succeeded`. Restored topics are created directly through the Admin API, so on the target they are **unmanaged** (no `KafkaTopic` CR); that is the accepted tradeoff of an Admin-API-only driver. Restoring a topic whose replication factor exceeds the target cluster's broker count fails at `--create`. Topic configs are restored **additively** (`kafka-configs --add-config`): a config the backup recorded is re-applied, but a config added to a live topic after the backup is not removed, so an in-place restore does not return a topic's config set to its exact backup-time state (partition count and replication factor are the only shape the restore reconciles or fails loudly on).
+
+One consequence of the Admin-API approach: if a topic is declared in the Kafka app's `spec.topics`, the Strimzi Topic Operator owns it and reconciles its config from the `KafkaTopic` CR, reverting any dynamic config an in-place restore sets that the CR does not list. So this strategy is durable for **out-of-band** topics (created directly, no CR); for CR-declared topics the `KafkaTopic` CR / GitOps is the source of truth. A to-copy restore onto a fresh empty cluster is unaffected. For message-data durability, use a volume-snapshot strategy instead. See `examples/backups/kafka-metadata/` for the end-to-end flow.
+
+Restore is not transactional: it applies topics one at a time as it reads the object, so a failure part-way through (an RF mismatch, an unreachable broker) leaves the topics already created behind — re-running the restore is safe (existing topics are reconciled, not recreated). Like the Rabbitmq driver, this one owns its object outright and deletes it from the bucket when its `Backup` is deleted — via a one-shot Job the Backup's removal waits on — so a retention-pruned `Plan` does not accumulate objects; the delete is **best-effort** with the same give-up conditions and `backups.cozystack.io/skip-artifact-cleanup` escape hatch documented for Rabbitmq above. One caveat specific to this driver: its image ships an older `curl` (7.76.1) whose `--aws-sigv4` omits a non-default port from the SigV4 canonical host, which every S3 backend then rejects with `403 SignatureDoesNotMatch` on a ported endpoint (fixed in curl 7.86.0). The strategy script works around it with `--connect-to` — it signs and sends a portless URL and redirects the connection to the real port — so a ported endpoint (the `backupStorage.endpoint` fallback `…:8333`, `provisionBucket: false`, or SeaweedFS with `s3.ingress.enabled: false`) works too; the sibling drivers run curl 8.x and need no such workaround. Export time scales with topic count — the backup spends two Kafka CLI invocations (each a fresh JVM, ~1.5–3s) per topic — so a cluster with many hundreds of topics takes tens of minutes; the run is bounded at the Job layer by `activeDeadlineSeconds` (default 30 minutes, from the same wait the readiness precondition uses), so a wedged or unschedulable run is failed by Kubernetes as `DeadlineExceeded` — the pod is killed before the script's final upload, so no object is left orphaned — rather than requeuing forever. A cluster whose export legitimately runs longer raises the bound with the `backupTimeout` BackupClass parameter (a Go duration, e.g. `2h`), which round-trips through the `Backup` so a restore is bounded by the same value.
diff --git a/docs/operations/seaweedfs-431-rename-recovery.md b/docs/operations/seaweedfs-431-rename-recovery.md
new file mode 100644
index 0000000000..f26a671ebc
--- /dev/null
+++ b/docs/operations/seaweedfs-431-rename-recovery.md
@@ -0,0 +1,385 @@
+# SeaweedFS 4.31 rename — audit & recovery
+
+This runbook covers clusters affected by the SeaweedFS chart-rename regression introduced when the vendored chart was bumped from `4.0.405` to `4.31.0` (Cozystack v1.5.0). Use it to classify each tenant, and to recover the ones that need an operator before they can be upgraded.
+
+**Scope — the default instance name is assumed throughout.** The supported way to run SeaweedFS is the tenant module: the tenant chart creates the instance under the fixed name `seaweedfs` (`packages/apps/tenant/templates/seaweedfs.yaml` hardcodes it; a tenant only enables or disables the module). Every shell selector below assumes that name. The API does not yet enforce it, so an instance created directly against `seaweedfses.apps.cozystack.io` under another name can exist — the audit script still classifies it (its release is `<name>-system`), but **do not run the shell loops here against it: escalate instead**, because the name-based `grep seaweedfs` filters cannot see claims whose names the chart truncated (instance names of roughly 30+ characters), and the chart guard's reconstruction does not cover the zone/pool volume components of long-named instances. One accepted limit applies even to default-named instances: a zone or pool **key** of roughly 40+ characters pushes `seaweedfs-system-volume-<key>` past the chart's truncation limit and similarly out of the guard's reconstruction — do not use keys that long.
+
+## Background
+
+Before 4.31 the chart named workloads after the chart (`seaweedfs-*`), ignoring the release name. 4.31 names them after the release, and the data-plane HelmRelease is `<name>-system`, so every StatefulSet wanted to become `seaweedfs-system-*`. StatefulSet names are immutable, so the upgrade could not rename in place — Helm stood up a second, duplicate set beside the running one. Depending on cluster size the duplicate either deadlocks or splits:
+
+- **D-wedged** — with as many nodes as master replicas, the new masters cannot schedule (hard pod anti-affinity against the old masters). The new set stays `Pending`/`CrashLoopBackOff`, the old set keeps serving. Usually no data at risk — but "usually" is not something a Helm render can verify (a duplicate that served writes and later crashed or was scaled down is indistinguishable from one that never started), so the chart refuses these too rather than adopt on an assumption.
+- **D-split** — with more nodes than masters, the new (empty) set comes up. Both sets carry identical pod labels, so the `seaweedfs-s3` Service load-balances across them, and both filers write to the **same `seaweedfs-db` Postgres** metadata store while pointing at different volume servers. This is a data-integrity incident, not just a duplicate: reads of existing objects through the new endpoint miss, new writes land on empty volumes, and the two master sets hand out volume IDs from independent sequences into one shared metadata table.
+
+The fix pins `fullnameOverride: seaweedfs` in `system/seaweedfs` values, so workloads are always named after the chart, exactly as they were before 4.31. Upgrading past the bump therefore **adopts the running set and its volumes in place**.
+
+Two states cannot be adopted that way, and the charts refuse to render for both rather than guess:
+
+- A tenant installed **fresh on 1.5.x**, whose data was written under the release-based names and lives on `data1-seaweedfs-system-volume-*` PVCs. Pinning the chart name there would rename the workloads *away* from that data, and Helm cannot move data between PVCs. Re-bind its volumes (Step 2) before upgrading.
+- A tenant where **both** naming generations exist. One of them is an empty duplicate and one holds the data — but nothing durable in the object graph says which. Claim timestamps are not evidence: Step 2's own re-bind deletes and recreates claims, so a tenant interrupted mid-recovery has a brand-new claim holding real data. StatefulSets are recreated by the adoption hook. `readyReplicas: 0` does not prove a duplicate never served. Rendering would adopt the chart-named set, so a wrong guess strands or destroys data. Step 1 classifies these with signals a template does not have; once the empty generation is deleted, exactly one remains and the render proceeds on its own.
+
+The **enforcing** guard lives in `system/seaweedfs` (`templates/naming-guard.yaml`) — the `<name>-system` HelmRelease pulls that chart straight from a platform-managed ExternalArtifact, so a platform upgrade re-renders it directly and nothing else stands between the upgrade and the tenant's workloads; `extra/seaweedfs` carries a sibling copy so the refusal is also visible on the SeaweedFS application itself.
+
+A tenant upgrading **1.4.x straight to 1.6 never renames**, so it only ever has one generation and is unaffected by any of this. Duplicates exist only on tenants that passed through 1.5.x.
+
+## Step 0 — `seaweedfs-db` ownership check (read-only, do this FIRST)
+
+Unrelated to the rename, but it lands on the same upgrade and it destroys data rather than duplicating it, so clear it before anything else.
+
+The v1.5.0 db split moved the CNPG `Cluster/seaweedfs-db` — the filer metadata store, i.e. the index for every object in the tenant's S3 — out of the `<name>-system` release into its own `<name>-db` release. Migration 43 performs the hand-over: it re-owns the Cluster to `<name>-db` and stamps `helm.sh/resource-policy: keep` so the `<name>-system` upgrade, whose chart no longer renders the Cluster, does not delete it as a removed resource. **Migration 43 shipped comparing the owning release name against the literal `seaweedfs-system`**, so it only ever fired for an instance named `seaweedfs`. `SeaweedFS` is a user-creatable kind: an instance named `foo` is owned by `foo-system`, was skipped, and had its Cluster pruned — CNPG takes the PVC with it.
+
+The prune is not a one-shot. Helm computes deletions by diffing the **last deployed** revision against the new manifest, so a tenant whose `<name>-system` last succeeded on a pre-split revision recomputes the same deletion on *every* upgrade attempt — including attempts that fail for unrelated reasons and never become the new deployed revision. Such a tenant re-deletes the Cluster each time `<name>-db` recreates it.
+
+Migration 43 is fixed to match the `-system` suffix, and migration 53 re-runs the hand-over for clusters that already ran the hardcoded version. Both are pre-upgrade hooks, so they land before `<name>-system` re-renders. Audit anyway — a Cluster already deleted cannot be recovered by either:
+
+```sh
+kubectl get cluster.postgresql.cnpg.io -A \
+  -o custom-columns='NS:.metadata.namespace,NAME:.metadata.name,OWNER:.metadata.annotations.meta\.helm\.sh/release-name,KEEP:.metadata.annotations.helm\.sh/resource-policy'
+```
+
+Read the rows for `NAME=seaweedfs-db`:
+
+| OWNER | KEEP | Meaning |
+|---|---|---|
+| `<name>-db` | `keep` | Handed over. Nothing to do. |
+| `<name>-db` | *(none)* | Installed fresh on ≥1.5.0. Safe: `<name>-system` never rendered the Cluster, so it is not in that release's prune baseline. |
+| `<name>-system` | *(none)* | **At risk.** Migration 53 hands it over on the next upgrade. Do not reconcile `<name>-system` before the migration runs. |
+| *(no row at all)* | | **Already lost** — see below. |
+
+A tenant with a SeaweedFS instance but **no `seaweedfs-db` row** has already had its metadata deleted. Its S3 returns 500 and its objects are unreachable even though the volume PVCs still hold the bytes. Nothing in this runbook or in any migration can rebuild that index: the Cluster and its PVC are gone. Restore the `seaweedfs-db` Postgres from a backup, or treat the tenant's object storage as lost. Note that `<name>-db` may report **Ready** while this is true — it rendered its Cluster successfully and a later `<name>-system` prune removed it; Flux has not re-checked. Trust the `kubectl get cluster` output, not the HelmRelease status.
+
+## Step 1 — Audit the fleet (read-only)
+
+```sh
+hack/seaweedfs-naming-audit.sh                 # whole cluster
+hack/seaweedfs-naming-audit.sh tenant-foo      # or named namespaces
+```
+
+**Read the exit code, not just the table.** The audit fails closed: any error it cannot interpret — a kubectl call that fails, a Helm release payload it cannot decode — makes it print `FATAL` and exit non-zero, and the table it printed up to that point is incomplete. A non-zero exit means you do not yet know the state of the fleet, so none of the steps below may be taken on the strength of it. Only a zero exit means the table is the whole answer; an empty table with exit 0 is a genuinely clean fleet.
+
+It mutates nothing. Earlier revisions of this runbook inlined the classification as a shell snippet here; it is a tested script now (`hack/seaweedfs-naming-audit.bats`), because it is what the chart's refusal hands you to and acting on it deletes PVCs. Two inline versions shipped wrong — one whose selector matched both generations at once and so inverted its own primary rule, one that could not see a long instance name at all — so it is not a snippet any more.
+
+It reports one class per SeaweedFS instance, matching exactly what the chart's guard decides:
+
+| CLASS | Meaning | Action |
+|---|---|---|
+| `L` | Only the chart-named generation. | None. The upgrade adopts it in place. |
+| `S` | Only the release-named generation — installed fresh on 1.5.x, or a long instance name. | Step 2, before upgrading. |
+| `MIXED` | Both generations. The chart **refuses**. | Below. |
+
+For `MIXED` it also names which generation is **original**, from two independent durable signals: the naming scheme revision 1 of the `<name>-system` release was installed with, and each generation's **PersistentVolume** creation timestamps. It reads PV timestamps, never claim timestamps — Step 2 deletes each release-named claim and recreates it under the chart name against the same PV, so claim age is not durable and inverts for a tenant interrupted mid-re-bind. The direction rule is **relative, never a clock**: a generation is the candidate duplicate only when *every* one of its bound PVs is strictly newer than every bound PV of the other generation — the same precondition Step 2a enforces. A tenant interrupted mid-re-bind has both generations on original-vintage PVs, so their ranges **overlap** and the audit names no candidate: finish Step 2, do not run Step 2a.
+
+**Read the audit's own warning.** "Original" is not "the other one is empty", and the gap is exactly where it matters. A duplicate that never scheduled (safe to delete) and one that served writes and later crashed or was scaled down (holds unique objects, deleting destroys them) are **identical on every durable signal** — same revision-1 scheme, same `first_deployed` deltas. The audit narrows the question to one generation; it does not answer it. Before deleting anything, establish that the candidate is empty:
+
+Empty means: no volume files (`.dat`/`.idx`/`.vif`) in any data directory. Do **not** `kubectl exec` into the candidate's own pods to check — a wedged duplicate's pods never start, so a check that needs the pod running is unexecutable exactly for the class where it matters most. Mount the claims instead:
+
+```sh
+ns=<tenant>
+# 1. Stop the candidate's workloads so its RWO claims can be mounted elsewhere.
+#    Reversible, and it is Step 3's first action anyway (Step 2a's for S-damaged).
+# 2. A candidate claim still Pending has no PV and therefore no data — empty by
+#    construction; skip it.
+# 3. Mount each BOUND candidate claim read-only in a scratch pod:
+pvc=<candidate-volume-claim>     # e.g. data1-seaweedfs-system-volume-0; repeat per claim
+kubectl -n "$ns" apply -f - <<EOF
+apiVersion: v1
+kind: Pod
+metadata:
+  name: swfs-emptiness-check
+spec:
+  restartPolicy: Never
+  containers:
+  - name: inspect
+    image: busybox:1.37
+    command: ["sh", "-c", "ls -laR /data; echo '--- volume file count:'; find /data \( -name '*.dat' -o -name '*.idx' -o -name '*.vif' \) | wc -l"]
+    volumeMounts:
+    - { name: data, mountPath: /data, readOnly: true }
+  volumes:
+  - name: data
+    persistentVolumeClaim: { claimName: ${pvc}, readOnly: true }
+EOF
+kubectl -n "$ns" wait --for=jsonpath='{.status.phase}'=Succeeded pod/swfs-emptiness-check --timeout=120s
+kubectl -n "$ns" logs swfs-emptiness-check      # empty = volume file count 0
+kubectl -n "$ns" delete pod swfs-emptiness-check
+
+# Cross-check against the cluster's own accounting, on the AUTHORITATIVE set's
+# running master (exec is fine there — that set is serving): no volumes may be
+# attributed to the candidate's servers.
+kubectl -n "$ns" exec <authoritative-master-pod> -- weed shell -c "volume.list"
+```
+
+If a candidate claim cannot be inspected, or the two views disagree, **stop and escalate**. Both generations holding real data is recoverable; deleting the wrong one is not.
+
+**D-wedged** — a duplicate that never scheduled — is `MIXED` too, and the chart refuses it like any other duplicate. On main it rendered through, because a duplicate reading `readyReplicas: 0` was taken as proof it never served. That is not proof: a duplicate that served writes and later crashed or was scaled down reads identically. Confirm emptiness as above, then remove it via Step 3 **before** upgrading.
+
+On a cluster with no spare nodes (nodes ≤ replicas) a wedged duplicate also blocks the adoption rollout even once the render passes: its pods are still *scheduled*, carry the same labels as the adopted set (including `app.kubernetes.io/instance`), and their hard pod anti-affinity keeps the adopted set's rolled pods from landing anywhere (observed as `seaweedfs-filer-1`/`seaweedfs-master-2` stuck Pending on `didn't match pod anti-affinity rules`, wedging the `<name>-system` HelmRelease in upgrade/rollback loops). Step 3 removes it, which resolves that too.
+
+## Step 2 — `S` tenants: re-bind the volumes before upgrading
+
+The data is on `data1-seaweedfs-system-volume-N`; the fixed chart expects `data1-seaweedfs-volume-N`. Rather than copying objects, re-point the same PersistentVolume at a PVC with the new name. Nothing is written or moved; only the claim is renamed. Expect downtime for this tenant's S3.
+
+```sh
+ns=<tenant>
+
+# 1. Stop the operator from fighting the change.
+app=<seaweedfs-instance-name>   # the SeaweedFS resource name; `seaweedfs` unless you renamed it
+kubectl -n "$ns" patch helmrelease "${app}-system" --type merge -p '{"spec":{"suspend":true}}'
+# Select the renamed workloads precisely. An S tenant has only the renamed set,
+# but exclude the pre-4.31 chart-named seaweedfs-master/-filer/-volume[-<key>]
+# anyway so the same selector is reused in Step 3, where both sets coexist.
+# seaweedfs-system-* and <name>-system-seaweedfs-* are kept.
+renamed_sts() {
+  kubectl -n "$ns" get sts -l app.kubernetes.io/name=seaweedfs -o name \
+    | sed 's|statefulset.apps/||' | grep -vE '^seaweedfs-(master|filer|volume)($|-)'
+}
+for sts in $(renamed_sts); do
+  kubectl -n "$ns" scale sts "$sts" --replicas=0
+done
+kubectl -n "$ns" scale deploy -l app.kubernetes.io/name=seaweedfs,app.kubernetes.io/component=s3 --replicas=0
+
+# 2. For every volume PVC: protect its PV, then re-bind it under the new name.
+for pvc in $(kubectl -n "$ns" get pvc -o name | sed 's|persistentvolumeclaim/||' \
+               | grep -E '^data1-.*volume' | grep seaweedfs | grep -vE '^data1-seaweedfs-volume'); do
+  # data1-<renamed>-volume[-<key>]-N  ->  data1-seaweedfs-volume[-<key>]-N
+  new_pvc=$(echo "$pvc" | sed -E 's/^data1-.*-volume-/data1-seaweedfs-volume-/')
+  pv=$(kubectl -n "$ns" get pvc "$pvc" -o jsonpath='{.spec.volumeName}')
+  sc=$(kubectl -n "$ns" get pvc "$pvc" -o jsonpath='{.spec.storageClassName}')
+  size=$(kubectl -n "$ns" get pvc "$pvc" -o jsonpath='{.spec.resources.requests.storage}')
+  # Stash the PV's own reclaim policy ON THE PV before changing it, so a volume the
+  # cluster deliberately set to Retain does not silently come back as Delete -- and
+  # so the record survives this loop being interrupted, which a shell variable would
+  # not. Step 5 restores it from the annotation once the tenant is verified healthy.
+  reclaim=$(kubectl get pv "$pv" -o jsonpath='{.spec.persistentVolumeReclaimPolicy}')
+  if [ -z "$(kubectl get pv "$pv" -o jsonpath='{.metadata.annotations.cozystack\.io/original-reclaim-policy}')" ]; then
+    kubectl annotate pv "$pv" "cozystack.io/original-reclaim-policy=${reclaim}" || { echo "FAILED to record the original reclaim policy on $pv; aborting before any PVC is deleted" >&2; break; }
+  fi
+
+  # Keep the PV (and the data) when the claim goes away.
+  kubectl patch pv "$pv" -p '{"spec":{"persistentVolumeReclaimPolicy":"Retain"}}' || { echo "FAILED to set Retain on $pv; aborting before deleting its PVC" >&2; break; }
+  kubectl -n "$ns" delete pvc "$pvc"
+  # A Released PV cannot be re-bound until its old claimRef is cleared.
+  kubectl patch pv "$pv" --type json -p '[{"op":"remove","path":"/spec/claimRef"}]'
+
+  # The labels matter: the post-delete cleanup hook selects volume PVCs by
+  # app.kubernetes.io/name + instance, and StatefulSet reconciliation does NOT
+  # retrofit claim-template labels onto an existing PVC. A claim recreated without
+  # them is invisible to that hook forever, so a recovered tenant would leak its
+  # volumes on a later app deletion.
+  kubectl -n "$ns" apply -f - <<EOF
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: ${new_pvc}
+  namespace: ${ns}
+  labels:
+    app.kubernetes.io/name: seaweedfs
+    app.kubernetes.io/instance: ${app}-system
+spec:
+  accessModes: ["ReadWriteOnce"]
+  storageClassName: ${sc}
+  volumeName: ${pv}
+  resources:
+    requests:
+      storage: ${size}
+EOF
+  # NOTE: the reclaim policy stays Retain until Step 5. Restoring it here (as this
+  # runbook used to) re-arms Delete while the tenant is still mid-recovery, which is
+  # what turned a later mis-step into permanent data loss: on a Delete-policy
+  # StorageClass, deleting the claim takes the PV and the bytes with it.
+done
+
+# 3. Confirm every new claim is Bound to its original PV before going further.
+kubectl -n "$ns" get pvc -o custom-columns=NAME:.metadata.name,STATUS:.status.phase,VOLUME:.spec.volumeName
+
+# 4. Drop the old workloads; the fixed chart will recreate them under the chart name.
+for sts in $(renamed_sts); do kubectl -n "$ns" delete sts "$sts" --ignore-not-found; done
+kubectl -n "$ns" get deploy -l app.kubernetes.io/name=seaweedfs -o name | sed 's|deployment.apps/||' \
+  | grep -vE '^seaweedfs-(s3|objectstorage-provisioner)$' \
+  | xargs -r -I{} kubectl -n "$ns" delete deploy {} --ignore-not-found
+kubectl -n "$ns" patch helmrelease "${app}-system" --type merge -p '{"spec":{"suspend":false}}'
+```
+
+Then upgrade. The filer metadata lives in the shared `seaweedfs-db` Postgres and is name-independent, and the volume IDs travel with the volumes themselves, so the adopted cluster comes back with its objects intact.
+
+The loop handles pools and zones (their PVC names carry the pool/zone key) and both renamed shapes: `data1-seaweedfs-system-volume-*` for the default instance, and `data1-<name>-system-seaweedfs-volume-*` for an instance running under another name, because 4.31's name helper appends the chart name when the release name does not contain it.
+
+## Step 2a — `S-damaged` tenants: remove the empty chart-named set first
+
+An `S` tenant that an unguarded 1.6.0 upgrade already reached has an extra problem: the upgrade **created** chart-named workloads (`seaweedfs-master/-filer/-volume`, an s3 Deployment) and **empty** `data1-seaweedfs-volume-*` PVCs beside the live renamed set, and deleted the renamed `<fullname>-s3` Service (only `seaweedfs-s3` remains — its endpoints may still resolve to the renamed set's pods because both sets carry identical labels, which is luck, not design: if the chart-named pods ever become Ready, the Service splits reads across a live set and an empty one).
+
+> **STOP if you are resuming an interrupted Step 2.** This step deletes every `data1-seaweedfs-volume-*` claim. If Step 2 already re-bound some of them, those claims hold your data and are bound to the original PVs — deleting them is the data-loss path this step used to be reachable through by misclassification. Finish Step 2 instead. The check below refuses in that case, but read the Step 1 classification first and be sure.
+
+Verify the direction before touching anything. The chart-named generation must be the **newer** one, judged on the **PV** ages (claims are recreated by Step 2's re-bind, so their timestamps prove nothing). The precondition below refuses unless every chart-named claim is bound to a PV strictly newer than every release-named PV:
+
+```sh
+#!/usr/bin/env bash
+set -euo pipefail
+ns=<tenant>
+app=<seaweedfs-instance-name>
+
+# PRECONDITION. Every chart-named claim must be bound to a PV strictly newer than
+# every release-named PV. A chart-named claim sitting on an OLD PV means Step 2
+# already re-bound it: it holds data, and this step would delete it.
+pv_age() { kubectl get pv "$(kubectl -n "$ns" get pvc "$1" -o jsonpath='{.spec.volumeName}')" \
+             -o jsonpath='{.metadata.creationTimestamp}'; }
+newest_release_pv=""
+for pvc in $(kubectl -n "$ns" get pvc -o name | sed 's|persistentvolumeclaim/||' \
+               | grep -E '^data1-.*volume' | grep seaweedfs | grep -vE '^data1-seaweedfs-volume'); do
+  a=$(pv_age "$pvc"); [ "$a" \> "$newest_release_pv" ] && newest_release_pv="$a"
+done
+[ -n "$newest_release_pv" ] || { echo "REFUSING: no release-named volumes found; this is not an S-damaged tenant"; exit 1; }
+for pvc in $(kubectl -n "$ns" get pvc -o name | sed 's|persistentvolumeclaim/||' | grep -E '^data1-seaweedfs-volume'); do
+  a=$(pv_age "$pvc")
+  if [ ! "$a" \> "$newest_release_pv" ]; then
+    echo "REFUSING: $pvc is bound to a PV created $a, NOT newer than the newest release-named PV ($newest_release_pv)."
+    echo "That claim is not an empty duplicate — Step 2 has most likely already re-bound it. Finish Step 2; do not run this step."
+    exit 1
+  fi
+done
+echo "ok: every chart-named claim is bound to a strictly newer PV — safe to clear the duplicate"
+
+kubectl -n "$ns" patch helmrelease "${app}-system" --type merge -p '{"spec":{"suspend":true}}'
+# The chart-named workloads were created by the aborted upgrade and never held
+# data. Delete them so the re-bind can take over their names.
+kubectl -n "$ns" delete sts seaweedfs-master seaweedfs-filer --ignore-not-found
+kubectl -n "$ns" get sts -o name | sed 's|statefulset.apps/||' | grep -E '^seaweedfs-volume($|-)' \
+  | xargs -r -I{} kubectl -n "$ns" delete sts {}
+# The EMPTY chart-named claims block Step 2's re-bind (same names).
+kubectl -n "$ns" get pvc -o name | sed 's|persistentvolumeclaim/||' | grep -E '^data1-seaweedfs-volume' \
+  | xargs -r -I{} kubectl -n "$ns" delete pvc {}
+```
+
+Leave the HelmRelease suspended and continue with Step 2 (skip its suspend line; the renamed StatefulSets it scales down are the ones holding the data, exactly as in a plain `S` tenant). Do NOT scale down or delete anything named `*-system-*` before its volumes are re-bound.
+
+## Step 3 — `MIXED` tenants: remove the duplicate before upgrading
+
+The chart refuses while both generations exist, so the duplicate must be **gone before** the upgrade, not cleaned up after it. Do not skip to Step 4: it cannot run until this is done.
+
+Do **not** start by deleting PVCs. If the duplicate ever served, they may hold objects written through the split endpoint.
+
+1. **Take the duplicate out of service** so nothing else is written to it. Select it precisely — the generation Step 1 named as ORIGINAL is authoritative and must keep serving. For the common case (chart-named original, release-named duplicate):
+
+   ```sh
+   ns=<tenant>
+   kubectl -n "$ns" get sts -l app.kubernetes.io/name=seaweedfs -o name | sed 's|statefulset.apps/||' \
+     | grep -vE '^seaweedfs-(master|filer|volume)($|-)' \
+     | xargs -r -I{} kubectl -n "$ns" scale sts {} --replicas=0
+   # The renamed s3 Deployment is the one that is NOT the chart-named `seaweedfs-s3`.
+   kubectl -n "$ns" get deploy -l app.kubernetes.io/name=seaweedfs,app.kubernetes.io/component=s3 -o name \
+     | sed 's|deployment.apps/||' | grep -v '^seaweedfs-s3$' \
+     | xargs -r -I{} kubectl -n "$ns" scale deploy {} --replicas=0
+   ```
+
+   If Step 1 named the **release-named** generation as original, this tenant is `S-damaged`: the duplicate is the chart-named set. Use **Step 2a** instead, then Step 2 — the selectors are inverted there.
+
+2. **Confirm the authoritative set is serving**, and that the duplicate is out of the `seaweedfs-s3` endpoints:
+
+   ```sh
+   kubectl -n "$ns" get endpoints seaweedfs-s3 -o yaml
+   ```
+
+3. **If the duplicate ever served, escalate.** Step 1's emptiness check is what decides this. Recovering objects that exist only on a duplicate is not a procedure this runbook can give you: both master sets allocate volume IDs from independent sequences into one shared `seaweedfs-db`, so a fid written through the split endpoint can collide with a fid on the authoritative set, and there is no supported tool that reconciles two volume-ID spaces against one metadata store. Do not improvise it. Involve someone who can plan a per-object export, and treat the tenant as an incident.
+
+4. **Delete the duplicate's StatefulSets, Deployments and PVCs.** Only once (3) is settled, and only for a duplicate confirmed empty (or whose contents have been exported):
+
+   ```sh
+   ns=<tenant>
+   # StatefulSets and Deployments of the duplicate generation.
+   kubectl -n "$ns" get sts -l app.kubernetes.io/name=seaweedfs -o name | sed 's|statefulset.apps/||' \
+     | grep -vE '^seaweedfs-(master|filer|volume)($|-)' \
+     | xargs -r -I{} kubectl -n "$ns" delete sts {}
+   kubectl -n "$ns" get deploy -l app.kubernetes.io/name=seaweedfs -o name | sed 's|deployment.apps/||' \
+     | grep -vE '^seaweedfs-(s3|objectstorage-provisioner)$' \
+     | xargs -r -I{} kubectl -n "$ns" delete deploy {}
+   # Duplicate volume PVCs, BY NAME. Never by label: the live data PVCs carry the
+   # same app.kubernetes.io/instance=<name>-system label and would match too.
+   kubectl -n "$ns" get pvc -o name | sed 's|persistentvolumeclaim/||' | grep -E '^data1-.*volume' \
+     | grep seaweedfs | grep -vE '^data1-seaweedfs-volume' | xargs -r -I{} kubectl -n "$ns" delete pvc {}
+   ```
+
+   Never delete `data1-seaweedfs-volume-*` here — those are the live data PVCs of the authoritative set. (For an `S-damaged` tenant it is the other way round; that is Step 2a's job, and it has its own precondition check.)
+
+5. **Re-run the audit.** The tenant must now read `L` (or `S`, if you are on the Step 2 path), and the audit must exit zero — a `FATAL` here means the re-check never completed, not that the tenant is fine. Only then upgrade.
+
+   ```sh
+   hack/seaweedfs-naming-audit.sh "$ns"
+   ```
+
+## Step 4 — Upgrade, then clear the leftovers
+
+Every tenant must read `L` or `S` in the audit before you start: the chart refuses to render while both generations exist, so a `MIXED` tenant does not upgrade at all — Steps 2/2a/3 come first, not after. Once the fleet is clean, upgrade to a Cozystack version carrying the fix. On reconcile the `<name>-system` release renders the chart-based names and adopts the running workloads and their volumes in place.
+
+A duplicate's StatefulSets and PVCs are removed in Step 3, before the upgrade. What can still be left behind afterwards are objects no release templated and nothing owns: cert-manager Secrets have no owner reference, and PVCs Helm never templated are never GC'd. Remove those once the tenant is verified healthy:
+
+```sh
+ns=<tenant>
+# Duplicate volume PVCs, BY NAME. Never by label: the live data PVCs carry the
+# same app.kubernetes.io/instance=seaweedfs-system label and would match too.
+kubectl -n "$ns" get pvc -o name | sed 's|persistentvolumeclaim/||' | grep -E '^data1-.*volume' \
+  | grep seaweedfs | grep -vE '^data1-seaweedfs-volume' | xargs -r -I{} kubectl -n "$ns" delete pvc {}
+# Orphaned certificate/db secrets of the duplicate set. cert-manager names them
+# <fullname>-<comp>-cert, so the renamed set's are everything matching the cert/db
+# suffix EXCEPT the adopted chart-named seaweedfs-<comp>-cert / seaweedfs-db-secret.
+# This covers the default (seaweedfs-system-*) and any non-default (<name>-system-
+# seaweedfs-*) instance without hardcoding the name.
+kubectl -n "$ns" get secret -o name | sed 's|secret/||' \
+  | grep -E '(-cert|-db-secret)$' | grep seaweedfs \
+  | grep -vE '^seaweedfs-(admin|ca|client|filer|master|volume|worker)-cert$|^seaweedfs-db-secret$' \
+  | xargs -r -I{} kubectl -n "$ns" delete secret {} --ignore-not-found
+```
+
+Never delete `data1-seaweedfs-volume-*` — those are the live data PVCs of the adopted set.
+
+The same 4.31 bump also renamed the tenant's four **cluster-scoped** RBAC objects, and those leftovers are cluster-wide rather than namespaced. Pre-4.31 they were named after the per-namespace service account (`<tenant>-seaweedfs-*`); 4.31 named them after the Helm release, which is identical in every tenant, so the fleet collided on one object. The fix puts them back on the service account name, which is where a 1.4.x tenant's objects already are — those are adopted in place and need no cleanup. A tenant that passed **through** 1.5.x, however, leaves behind whatever name that release used, and because more than one tenant claimed it, it may not be pruned by any release's manifest:
+
+```sh
+# Stale shared/renamed cluster-scoped RBAC. The go-forward names all start with a
+# tenant namespace; anything on the release-based names is a leftover. The fourth
+# pre-4.31 object is matched separately: 4.31 renamed the master-rw BINDING from
+# upstream's username-shaped system:serviceaccount:<sa>:default to <sa>-rw-crb, so
+# the old one carries neither suffix and no tenant prefix.
+kubectl get clusterrole,clusterrolebinding \
+  -o custom-columns='KIND:.kind,NAME:.metadata.name,OWNER:.metadata.annotations.meta\.helm\.sh/release-name,NS:.metadata.annotations.meta\.helm\.sh/release-namespace' \
+  | grep -E 'objectstorage-provisioner|-rw-cr|^\S+\s+system:serviceaccount:.*:default' \
+  | grep -vE '^\S+\s+tenant-'
+```
+
+A `system:serviceaccount:<tenant>-seaweedfs:default` row is the pre-4.31 master-rw binding. It is superseded by `<tenant>-seaweedfs-rw-crb` and is pruned automatically by the tenant's own upgrade (it is in that release's manifest), so it should not survive — if it does, the tenant has not upgraded yet.
+
+Each surviving row is inert once every tenant is upgraded and verified — no release renders those names any more. Confirm the tenant listed in `OWNER`/`NS` is healthy on the go-forward names first, then delete by name. Do not delete anything named `<tenant>-seaweedfs-*`: those are live.
+
+**During** a rolling fleet upgrade there is a window, and it is worth expecting rather than debugging: Helm prunes by name without checking ownership, so the first tenant to reconcile onto the fixed chart deletes the shared `seaweedfs-objectstorage-provisioner` / `seaweedfs-rw-cr` objects that a not-yet-upgraded tenant is still bound through. Those tenants' COSI provisioners get 403s on bucket operations until they reconcile onto their own per-namespace RBAC. Existing buckets keep serving — S3 traffic does not go through the provisioner — so this is a provisioning outage, not a data-plane one, and it closes on its own as the remaining tenants reconcile.
+
+If a tenant's `seaweedfs-system` HelmRelease was suspended during triage, resume it so the fix can reconcile:
+
+```sh
+kubectl -n <tenant> patch helmrelease seaweedfs-system --type merge -p '{"spec":{"suspend":false}}'
+kubectl -n <tenant> annotate helmrelease seaweedfs-system reconcile.fluxcd.io/requestedAt="$(date +%s)" --overwrite
+```
+
+## Step 5 — Verify
+
+```sh
+ns=<tenant>
+# Exactly one set, named after the chart, healthy.
+kubectl -n "$ns" get sts -l app.kubernetes.io/name=seaweedfs
+# All three HelmReleases Ready.
+kubectl -n "$ns" get helmrelease seaweedfs seaweedfs-system seaweedfs-db
+# S3 endpoints resolve only to the adopted set's ready pods.
+kubectl -n "$ns" get endpoints seaweedfs-s3
+# Objects are readable through S3 (bucket list via any tenant bucket).
+```
+
+A recovered tenant has a single `seaweedfs-*` set, all three HelmReleases `Ready`, no `seaweedfs-system-*` StatefulSets, and no `data1-seaweedfs-system-volume-*` PVCs left behind.
+
+Only once that is true, restore the reclaim policy Step 2 stashed on each PV. Until this runs the volumes are `Retain`, which is deliberate: it is what makes an accidental claim deletion during recovery survivable.
+
+```sh
+ns=<tenant>
+for pvc in $(kubectl -n "$ns" get pvc -o name | sed 's|persistentvolumeclaim/||' | grep -E '^data1-seaweedfs-volume'); do
+  pv=$(kubectl -n "$ns" get pvc "$pvc" -o jsonpath='{.spec.volumeName}')
+  orig=$(kubectl get pv "$pv" -o jsonpath='{.metadata.annotations.cozystack\.io/original-reclaim-policy}')
+  [ -n "$orig" ] || continue
+  kubectl patch pv "$pv" -p "{\"spec\":{\"persistentVolumeReclaimPolicy\":\"${orig}\"}}" && kubectl annotate pv "$pv" cozystack.io/original-reclaim-policy-
+done
+```
diff --git a/docs/operations/seaweedfs-capacity-for-backups.md b/docs/operations/seaweedfs-capacity-for-backups.md
new file mode 100644
index 0000000000..eb6e5c1891
--- /dev/null
+++ b/docs/operations/seaweedfs-capacity-for-backups.md
@@ -0,0 +1,37 @@
+# SeaweedFS capacity for backups
+
+A SeaweedFS instance starts with two volume servers of `volume.size: 10Gi` each and `replicationFactor: 2`, so every byte it stores lands on both servers and the instance holds a little under 10 GiB of objects. That is enough for occasional backups and restores. It is not enough for continuous WAL archiving from a Postgres cluster that writes steadily: WAL is archived around the clock and kept for the whole retention window, so the bucket grows until the window is full, and an instance sized by default runs out long before then.
+
+A volume server stops taking writes in one of two ways. Once its free disk falls below `minFreeSpacePercent` (5%), which it checks every minute, every volume on it turns read-only and it takes no new volume, so every bucket with a copy there stops at once. Before that, it can run out of slots: the volumes that already exist keep taking writes until each reaches `master.volumeSizeLimitMB`, a bucket whose volumes are all full needs a new one, and a server with no room left for another volume of the size limit cannot host it. When no server can, the master logs `Not enough data nodes found` and every upload into that bucket fails. The slots can run out while the disk is still half empty: a volume server counts every volume it holds at the full size limit, so the nearly empty volumes of other buckets keep one bucket from growing. `barman-cloud-wal-archive` then fails on every segment, WAL segments stay on the Postgres volume, and the database goes down when that volume is full.
+
+## Estimating what a bucket needs
+
+For each Postgres cluster that archives into the instance, the bucket holds the WAL of the whole retention window plus every base backup inside it:
+
+```text
+bucket ≈ WAL per day × retention days + database size × (base backups in the window + 1)
+```
+
+The WAL rate of a running cluster, in bytes per day before compression, is roughly the number of segments it archived over a day times the 16 MiB segment size. The count also includes the small history and backup-label files, and the sum covers every pod that was primary during the day:
+
+```promql
+sum by (namespace, job) (increase(cnpg_pg_stat_archiver_archived_count{namespace="<namespace>"}[1d])) * 16 * 1024 * 1024
+```
+
+The platform's default backup strategy compresses both WAL and base backups with gzip, so the stored size is lower, by an amount that depends on the data; a cluster backed up to an object store of its own choosing stores them uncompressed unless its ObjectStore says otherwise. The default `retentionPolicy` is `30d`, so a cluster that writes 4 GB of WAL a day needs about 120 GB of WAL alone before its base backups are counted.
+
+Each volume server must hold the sum of those buckets, since at `replicationFactor: 2` with two servers each server carries a full copy. Size `volume.size` so that this sum stays below 95% of it, and leave room on top for every bucket that is still growing: at `replicationFactor: 2` a grow claims three volumes of `master.volumeSizeLimitMB` on each server.
+
+## Alerts that watch the instance
+
+The generic `KubePersistentVolumeFillingUp` alert does not cover this. It pages below 3% free, while a volume server stops at 5% or, out of slots, with its disk half empty, and its early warning needs the disk to keep filling, which it stops doing once writes fail. Each instance carries its own rules instead:
+
+- `SeaweedFSVolumeServerDiskLow` (warning): a volume server has less than 10% of its disk left before the `minFreeSpacePercent` reserve.
+- `SeaweedFSVolumeServerFull` (warning): a volume server cannot host another volume, because it is at the reserve, where all its volumes are read-only, or has no slot left, where buckets whose volumes on it are full stop taking writes.
+- `SeaweedFSWritesFailing` (critical): the master has failed to place a write in every 5-minute window for 15 minutes. Other writes may still succeed in between. The usual cause is a bucket with no writable volume left that the master cannot grow, whose uploads all fail; a steady stream of newly created buckets, each failing a few picks while its first volumes grow, looks the same.
+
+On the Postgres side, `LastFailedArchiveTime` fires while WAL archiving keeps failing, and `KubePersistentVolumeFillingUp` fires as the WAL backlog fills the Postgres volume.
+
+## Growing an instance
+
+Raise `volume.size` on the SeaweedFS application. The upgrade expands each volume server's PVC in place, which needs a StorageClass that allows volume expansion. Postgres keeps retrying the segments that waited on its volume, so archiving catches up once the master can grow the bucket again.
diff --git a/docs/operations/seaweedfs-lowering-the-volume-size-limit.md b/docs/operations/seaweedfs-lowering-the-volume-size-limit.md
new file mode 100644
index 0000000000..6d3d4d0178
--- /dev/null
+++ b/docs/operations/seaweedfs-lowering-the-volume-size-limit.md
@@ -0,0 +1,157 @@
+# SeaweedFS volume size limit — lowering it on an existing instance
+
+New SeaweedFS instances start with `master.volumeSizeLimitMB: 400`. An instance that existed before that default was lowered keeps 1000 unless its limit was already set: on a variant that runs platform migrations, migration 57 wrote 1000 into every instance that had not chosen one, because lowering it on an instance that holds data is not free. The one exception is a release whose `master` is not an object, which no v1 chart renders; it is covered below. The `default` variant runs none, so there that step is yours, before the upgrade, as described under [Before upgrading the platform](#before-upgrading-the-platform). A value the new chart refuses, anything but a whole number from 1 to 30000, counts as not chosen and was replaced with 1000, which is what the previous chart ran in its place. A value from 1 to 30000 that was set before the upgrade stays, and since the previous chart ignored it, it takes effect with the upgrade. Where the migration runs, it names each such instance in its Job's log, but that Job runs as part of the upgrade, too late to act on, so find the ones whose limit it changes beforehand, as described under [Before upgrading the platform](#before-upgrading-the-platform). The value lives in the instance's own spec, so a tool that replaces the whole resource from a manifest without the field drops it and the instance takes 400. If an instance is managed from a manifest, keep `master.volumeSizeLimitMB` in that manifest. Every volume already at or above the new limit leaves the master's writable set on the next heartbeat, so every bucket whose volumes have all crossed that line needs a grow before its next write lands. This page is the check to run before setting a lower limit on such an instance, and the way back if a lowered instance stops taking writes. What decides the outcome is free space measured against what the buckets on each server will claim, not the size of the volume. An instance that comes out short keeps serving reads and loses no data, but the affected buckets stop taking writes until an operator intervenes.
+
+An instance left at 1000 still has more room than it used to. At `replicationFactor: 2` a grow now claims three volumes rather than six, so a bucket's budget there is 3000 MB instead of 6000 and the instance has room for roughly twice as many new buckets as it had. The same change costs write spread: a bucket that grows gets three writable volumes instead of six, and a volume server takes the writes into each volume one at a time, so a heavily parallel writer spreads over fewer volumes until the bucket grows again. The growth count is not a field, so there is no setting that takes this back. At any other replication factor the batch is unchanged.
+
+**Leave the limit at 1000 if the instance runs `topology: MultiZone`, or if more of its volume servers share one disk type than its `replicationFactor`.** The master places a new volume by disk type, not by group: it picks among all servers of the requested type with room, whether they belong to the default group or to a pool, and it treats an empty `diskType` and `hdd` as the same type. Under `MultiZone` it also grows each zone on its own. In both cases it can put a new volume on a server where the bucket that asked for it has nothing yet, which a per-server listing cannot account for. So count the servers of all groups together for each disk type, taking `volume.diskType` for the default group and `diskType` for each pool. The shipped layout, two volume servers at `replicationFactor: 2` and no pool, is one the check covers, and `kubectl get statefulset` in the instance's namespace shows how many servers each group runs.
+
+## Before upgrading the platform
+
+An instance whose limit was already set to a valid value other than 1000, a whole number from 1 to 30000, changes limit with the upgrade itself. List those instances, and the releases that need a closer look, while the previous release still runs; this needs `jq`:
+
+<!-- migration-57-listing -->
+```sh
+kubectl get helmreleases.helm.toolkit.fluxcd.io -A -o json \
+  -l apps.cozystack.io/application.kind=SeaweedFS,apps.cozystack.io/application.group=apps.cozystack.io \
+  | jq -r '"instances \(.items | length)",
+      (.items[] | "\(.metadata.namespace) \(.metadata.name)" as $id | .spec.values as $s
+       | [(.spec.valuesFrom // [])[] | select(. != {kind: "Secret", name: "cozystack-values"})] as $extra
+       | (if $extra != [] then "valuesfrom \($id) \($extra | tojson)" else empty end),
+         (if $s != null and ($s | type) != "object" then "unreadable \($id) \($s | tojson)"
+          elif $s.master != null and ($s.master | type) != "object" then "unrenderable \($id) \($s.master | tojson)"
+          else $s.master.volumeSizeLimitMB as $v
+          | select(($v | type) == "number" and $v == ($v | floor) and $v >= 1 and $v <= 30000 and $v != 1000)
+          | "changes \($id) \($v)" end)),
+      "complete \(.items | length)"'
+```
+
+**The last line must read `complete` with the same number as the first.** If it is missing or `jq` printed an error, `jq` stopped at a release it could not read, and the list says nothing about the releases after it, whatever it printed: stop.
+
+**The `instances` count, less the number of `unreadable` lines, must equal the number of instances `kubectl get seaweedfses.apps.cozystack.io -A` lists.** The API leaves out a release it cannot convert and only logs it, and a release whose `spec.values` is not an object is one it cannot convert. Any other difference means the labels in this command are not the ones the API selects instances by, or the API is leaving out a release for another reason: stop and find out why before reading the list.
+
+Every other line names one release, by namespace and name after its first word:
+
+- `changes`: the upgrade changes its limit to the number at the end of the line. Run [the check](#the-check) on it with `LIMIT` set to that number.
+- `unreadable`: its `spec.values` is not an object, and the line shows what it holds. helm-controller ignores such values and renders the chart's defaults, so the instance runs at 1000 today. The migration, or the step below on the `default` variant, pins it there and replaces what it held, which drops nothing that applies.
+- `unrenderable`: its `master` is not an object, and the line shows what it holds. No v1 chart renders that, so the release does not reconcile today, and nothing pins it. When you repair `master`, set `volumeSizeLimitMB` in the same edit, or the instance comes up at 400.
+- `valuesfrom`: it also takes values from the entries on the line, besides the platform's `cozystack-values` Secret. helm-controller merges `spec.values` over them, so a `master.volumeSizeLimitMB` an entry sets without `targetPath` does not apply, and one set through `targetPath` can, depending on the entries before it. If an entry sets it that way, check the instance with that value as for a `changes` line.
+
+For a `changes` line:
+
+- Below 1000 the upgrade lowers the limit, which is what the rest of this page is about.
+- Above 1000 it raises the limit. Existing buckets keep writing, but every volume below the new limit is charged up to that limit, so the room new buckets grow into shrinks, possibly to none. Measured on a local SeaweedFS 4.31 setup: a server holding seven nearly empty volumes had no free slot left once the limit was raised tenfold, and a new bucket was refused while the existing one kept writing; setting the limit back let the new bucket grow. The budget is an upper bound here too, and what the `df` figure has left after it, divided by the limit, is roughly how many volumes new buckets can still get, a batch for each.
+
+If one comes out short and you cannot free space before the upgrade, set its limit to 1000 in its HelmRelease with the same patch the migration applies, taking `NS` and `NAME` from its line in the list:
+
+```sh
+kubectl -n "$NS" patch helmreleases.helm.toolkit.fluxcd.io "$NAME" --type=merge \
+  -p '{"spec":{"values":{"master":{"volumeSizeLimitMB":1000}}}}'
+```
+
+The running chart ignores the value, and the new one applies it, so the instance stays at 1000. Patch the HelmRelease, not the SeaweedFS resource. The API applies a patch to the instance as it reads it, with every default filled in, and writes that whole spec back into `spec.values`, so every field left at its default would stop following the chart's default. The HelmRelease patch writes this one key, as the migration does.
+
+On the `default` variant, which installs packages by hand and runs no platform migrations, nothing writes 1000 into the instances that have not chosen a limit, and the upgrade would lower every one of them whose `master` is an object to 400. Before upgrading, apply the migration's patch yourself. It writes only `master.volumeSizeLimitMB` into each instance's HelmRelease, and only where no valid value is set:
+
+<!-- migration-57-pin -->
+```sh
+kubectl get helmreleases.helm.toolkit.fluxcd.io -A -o json \
+  -l apps.cozystack.io/application.kind=SeaweedFS,apps.cozystack.io/application.group=apps.cozystack.io \
+  | jq -r '"instances \(.items | length)",
+      (.items[] | "\(.metadata.namespace) \(.metadata.name)" as $id | .spec.values as $s
+       | [(.spec.valuesFrom // [])[] | select(. != {kind: "Secret", name: "cozystack-values"})] as $extra
+       | (if $extra != [] then "valuesfrom \($id) \($extra | tojson)" else empty end),
+         (if $s != null and ($s | type) != "object" then "unreadable \($id) \($s | tojson)", "pin \($id)"
+          elif $s.master != null and ($s.master | type) != "object" then "unrenderable \($id) \($s.master | tojson)"
+          else $s.master.volumeSizeLimitMB as $v
+          | select(($v | type) != "number" or $v != ($v | floor) or $v < 1 or $v > 30000)
+          | "pin \($id)" end)),
+      "complete \(.items | length)"' \
+  | while read -r what ns name detail; do
+      case "$what" in
+        pin) ;;
+        instances|complete) echo "$what $ns"; continue ;;
+        *) echo "$what $ns $name $detail"; continue ;;
+      esac
+      echo "pinning $ns/$name"
+      kubectl -n "$ns" patch helmreleases.helm.toolkit.fluxcd.io "$name" --type=merge \
+        -p '{"spec":{"values":{"master":{"volumeSizeLimitMB":1000}}}}' </dev/null \
+        || { echo "stopped: patching $ns/$name failed"; break; }
+    done
+```
+
+**The last line must read `complete` with the same number as the first.** If it is missing, `jq` printed an error, or a `stopped` line appears, the loop ended early, and the releases after that point were neither listed nor pinned, whatever the lines above say and whatever the exit status: stop, fix the cause and run it again. The loop stops at the first failed patch so that this one line covers both. The `unreadable`, `unrenderable` and `valuesfrom` lines mean what they mean in the listing above, and an `unreadable` release is pinned like the others. Then run the command a second time. It must print no `pinning` and no `unreadable` line, which shows that every release it can pin now holds a value the upgrade keeps, and the `instances` count must now equal the number the API lists, since the patch made every `unreadable` release readable. An `unrenderable` line stays until that release is repaired as described above.
+
+## Why free space is the thing to measure
+
+A volume server started with `-max 0` derives its slot count from disk. A volume past the limit is charged no headroom, while one below it is charged all of its unfilled room, so once a bucket's volumes have all gone oversized the slots open to it are free space, less the unfilled room of every volume still below the limit, divided by the limit: at 400, 400 MB of such space is one slot.
+
+One slot serves one bucket, and the buckets compete. A grow claims a batch of three volumes at once and takes as many as are available, and the volumes it creates are empty, so they charge their own headroom straight back and the next bucket finds nothing. Measured on a two-bucket instance with two free slots: the first bucket to write took both, and the second stayed refused afterwards with the disk still reporting a quarter of itself free. A bucket that gets only part of its batch keeps those volumes and writes into them; the check below still budgets a whole batch for it on every volume server, which is an upper bound.
+
+Buckets that keep writing are not free either. Each of their volumes still below the limit is charged its unfilled room, up to a whole limit, and a bucket grows several volumes at a time, six at the upstream count this platform used to run and three now, so one that has barely been written to can hold 2400 MB of that on a server. Measured on a local SeaweedFS 4.31 setup with the limit and batch scaled down: a server with free space for a batch per bucket refused the grow of the one bucket that needed it, because a second, nearly empty bucket's six volumes had taken the room, and the same free space without the second bucket let the grow through.
+
+The master also grows some buckets without being asked. Every few minutes it gives two new volumes to any bucket with no writable volume at or below 90 percent of the limit, and at 400 that line is 360 MB where at 1000 it is 900, so a bucket whose volumes all sit between 360 and 400 MB is grown once the limit is lowered, even though it can still write. Measured on the same setup: a bucket with every volume in that band, and no writes at all after the limit moved, got two new volumes on each server within one pass, while a bucket with a roomy volume was left alone. Two is the master's own step. A client whose assign requests ask for a writable volume count changes it for that bucket, as a filer path rule with `volumeGrowthCount` does, and nothing in this platform asks for one: the COSI driver writes only a bucket's disk type and replication into its rule.
+
+Three is the batch at the shipped `replicationFactor: 2`, the only arm the platform tunes. At `replicationFactor: 1` the master uses its untouched batch of seven. At 3 the batch is three again, and above 3 it is one, so three over-estimates there rather than under-estimating.
+
+The volume server's own `minFreeSpacePercent` reserve, five percent of what the filesystem reports, only comes into it on a server whose writable volumes have all passed the limit, since nothing there is charged headroom. Where five percent is at least the limit, which for 400 holds from 8000 MiB of filesystem upward and so on the shipped 10Gi volume, such a server refuses a grow only once its disk is down to the reserve; where it is less, the server can refuse one with up to a whole limit still free. So on such a server the reserve decides what an operator sees, not whether the instance is safe. On any other server the headroom charged to its volumes decides, and a refusal can come with the disk far from full whatever the reserve. Either way, deleting a bucket gives back a slot for each volume it held on a server, however little it stored, since the unfilled room charged to those volumes leaves with them; only a server already down to its reserve, where every volume is read-only and charged nothing, gets back no more than the freed bytes.
+
+## The check
+
+Run it on the instance before changing its limit. No volume size exempts an instance from this check: a large volume carries more buckets, and the budget scales with them. Size does decide a different cost, which this check does not measure and `df` does not show: a volume server keeps two descriptors open per volume, and the volume count follows stored bytes divided by the limit, so a server reaches its open-file limit sooner; at a size limit of 400 and an open-file limit of 65536, that is somewhere around 12.5 TiB stored. The open-file limit comes from the node's container runtime, not from this chart, and this cost arrives as the instance stores more, not when the size limit is lowered. Checking an instance that turns out to be clear costs a minute; skipping one that is not costs its writes. `$NS` throughout is the namespace the instance runs in; `kubectl get seaweedfses.apps.cozystack.io -A` lists every instance with its namespace.
+
+Count the volume servers first, because a match that finds nothing prints nothing, and nothing looks exactly like every server being clear:
+
+```sh
+kubectl -n "$NS" get pods -o name | grep '/seaweedfs-volume' | grep -vc resize-hook
+```
+
+**That number must be the volume servers you expect this instance to run, and if it is zero, stop here.** Zero, or fewer than you expect, means the name match does not fit this instance and the loop below would report success by saying nothing. The `resize-hook` exclusion is there because the chart's PVC-resize Job is named `seaweedfs-volume-resize-hook` and matches the prefix without being a volume server; a count higher than you expect means something else does too, and the loop would try to read a path that pod does not have. `kubectl -n "$NS" get statefulset` lists what should be there if you are not sure. Do not swap the name match for `app.kubernetes.io/component=volume`: that label carries the pool or zone key, so it reads `volume-east` on a zoned instance and no pod there carries the bare value.
+
+Then read, on each, its free space and the most its volumes can claim of it. Set `LIMIT` to the value you mean to set, and `BATCH` to the growth batch for the instance's `replicationFactor`: 3 at 2 or above, 7 at 1. The figures in the text around it are for a limit of 400.
+
+```sh
+LIMIT=400
+BATCH=3
+for p in $(kubectl -n "$NS" get pods -o name | grep '/seaweedfs-volume' | grep -v resize-hook); do
+  echo "$p"
+  kubectl -n "$NS" exec "$p" -- df -m /data1
+  kubectl -n "$NS" exec -i "$p" -- sh -s -- "$BATCH" "$LIMIT" <<'EOF'
+find /data1 -name '*.dat' -exec ls -ln {} + | awk -v batch="$1" -v limit="$2" '
+  BEGIN { full = limit * 1048576; roomy_max = full * 0.9 }
+  { n = $NF; sub(/.*\//, "", n); c = n
+    if (!sub(/_[0-9]+\.dat$/, "", c)) c = "(default)"
+    files++
+    if (!(c in seen)) { seen[c] = 1; order[++cols] = c }
+    if ($5 < full) { small[c]++; smalls++ }
+    if ($5 <= roomy_max) roomy[c] = 1 }
+  END { for (i = 1; i <= cols; i++) { c = order[i]; need += small[c] + ((c in roomy) ? 0 : batch) }
+        printf "volume files %d, below the limit %d, collections %d, budget %d MB\n", files, smalls, cols, need * limit }'
+EOF
+done
+```
+
+`/data1` is the mount on every render path, since each `dataDirs` entry the chart writes is named `data1`, and the volume server writes its files straight into it as `<bucket>_<id>.dat`, or `<id>.dat` for the unnamed default collection. You should get one block per server, as many as the count, each with a `df` line and a budget line.
+
+**Read `volume files` before anything else.** It counts every volume on that server, from the same listing the budget is computed from, so a server that holds any bucket's data cannot show zero there. If every server shows zero on an instance that stores data, the listing is not reading the volume files and a budget of 0 MB means nothing: stop. Zero `below the limit` is a legitimate answer on its own.
+
+**A server is clear when its available `df` figure is at least its budget, and the instance is clear when every server is.** For an instance the top of this page leaves to the check, a server's budget is an upper bound on what the new limit claims of its free space when it lands: one limit for each volume below it, since that is the most such a volume can be charged, and a whole batch for each collection with no volume at or below 90 percent of the limit, 360 MB at 400, since that collection is grown whether or not it writes. `BATCH` is at least the two volumes the master's own growth adds. The listing reads `.dat` sizes only, while the volume server charges each volume the room left after its `.dat` and `.idx` together, so leaving the index out can only overstate the charge. The master draws that 90 percent line against the `.dat` length the volume server reports, rounded up to the 8-byte needle padding, so a file within seven bytes of the line can fall on the other side of it; it also adds bytes it has handed out but not yet seen written, so run the check while the instance is not being written to heavily. The master also counts only writable volumes as roomy, and the listing cannot tell which ones are read-only: a server under its five percent reserve has made all of its volumes read-only, and an operator can mark one by hand. If either applies to a server, take its budget as `LIMIT` × (`BATCH` × collections + volumes below the limit) MB, from the same line, instead. If a server falls short, free space as described below before lowering the limit, or leave it at 1000. A server that clears one limit but not its budget is the trap this check exists for: the first bucket to write grows into what there is, and the ones behind it stay refused while `df` still shows room.
+
+## If the check comes out short
+
+Delete buckets the tenant no longer needs, then re-run the check. A deleted bucket gives back a slot for every volume it held, including one it barely wrote to. Deleting objects inside a bucket helps less and later: that room comes back only after a vacuum, and only for what was deleted.
+
+## Lowering the limit
+
+Set the new value in the instance's HelmRelease, with the patch used above and for the same reason; the master StatefulSet rolls with it:
+
+```sh
+kubectl -n "$NS" patch helmreleases.helm.toolkit.fluxcd.io "$NAME" --type=merge \
+  -p '{"spec":{"values":{"master":{"volumeSizeLimitMB":400}}}}'
+```
+
+`NAME` is the instance's name, which its HelmRelease carries unchanged. The tenant module creates its instance under the fixed name `seaweedfs`; an instance created directly against the API can carry another one.
+
+## If a lowered instance stops taking writes
+
+The symptom is some buckets writing and others failing on the same instance, while the disk reads as far from full and the master logs a grow that places nothing. The ones that write are those whose grow went through first; the rest are behind them in the same queue for the same free space. No data was lost on the way in, since the volumes stay readable throughout. Freeing space helps as described above, takes effect on the next heartbeat and restarts nothing. Setting the limit back to 1000, with the same HelmRelease patch and 1000 in place of 400, frees every bucket at once, and it rewrites the master's command line, so the master StatefulSet rolls; give it a window.
diff --git a/docs/operations/system-memory-limits.md b/docs/operations/system-memory-limits.md
new file mode 100644
index 0000000000..af3076f0e3
--- /dev/null
+++ b/docs/operations/system-memory-limits.md
@@ -0,0 +1,179 @@
+# System Component Memory Limits
+
+Cozystack defaults container memory in eligible system namespaces and sets explicit requests and limits on the node DaemonSets. This page explains why that is not merely resource hygiene, how to tune it, and what it deliberately does not cover.
+
+## Why a memory limit, and not a PriorityClass
+
+Talos Linux v1.12 introduced a userspace OOM handler, enabled by default, that reacts to memory pressure before the kernel OOM killer does. Its only input from the machine is its own config document; everything else it reads straight out of cgroupfs, and it holds no Kubernetes client at all. `PriorityClass` — `system-node-critical` included — therefore has no bearing on which cgroup it picks.
+
+Setting a priority on a system component to stop these kills looks like a fix and changes nothing about them. Take that claim narrowly, because priority is far from inert elsewhere: it still drives scheduler preemption, kubelet eviction ordering, and the `oom_score_adj` kubelet hands the kernel OOM killer. None of those three is what kills these pods. The one ordering input this handler has is the Kubernetes **QoS class**, inferred from the cgroup path rather than from any pod object — a different axis from priority, so a `system-node-critical` pod with no memory limit is an ordinary candidate like any other.
+
+The handler scores each pod cgroup with a CEL expression. The default in Talos v1.14.2, the version Cozystack currently ships for host nodes, is:
+
+```
+memory_max.hasValue() ? 0.0 :
+  {Besteffort: 1.0, Burstable: 0.5, Guaranteed: 0.0, Podruntime: 0.0, System: 0.0}[class] *
+    double(memory_current.orValue(0u))
+```
+
+Any cgroup scoring zero is dropped from the candidate set entirely. A pod whose containers all carry a memory limit has `memory.max` set on its pod cgroup, scores `0.0`, and can never be selected. A pod without one stays a candidate no matter how little memory it is using.
+
+Three consequences follow, and all three are easy to get wrong:
+
+- Only a **limit** grants immunity. A memory **request** merely moves the pod from BestEffort to Burstable, which under the default `strictCgroupClassOrdering: true` means "killed second" rather than "not killed" — Burstable cgroups are considered only once no BestEffort one is eligible, and the score then breaks ties within the class. That setting arrived in v1.13.4; on v1.13.0 through v1.13.3 the score alone decided, so a large Burstable pod could outrank a small BestEffort one.
+- **Every** container in the pod needs a limit, init containers included. Kubelet only sets pod-level `memory.max` when all of them have one, so a single limit-free sidecar puts the whole pod back in the candidate set.
+- CPU limits are irrelevant here. The ranking expression is given the cgroup's path, its QoS class, and `memory.max`, `memory.current` and `memory.peak` — no CPU information of any kind.
+
+Victim selection is also decoupled from the trigger. The cgroup that caused the pressure and the cgroup that gets `SIGKILL`ed are unrelated by design. In practice the pods carrying limits are overwhelmingly tenant workloads — managed applications are sized through resource presets, and a tenant namespace with `resourceQuotas` configured gets a default limit of its own — while system components carried none until the change this page describes. That inverts the intended order: whatever fires the trigger, `metallb-speaker` or `linstor-satellite`, using a few dozen megabytes and entirely uninvolved, is the one killed for it, repeatedly, until the pressure subsides. On Talos v1.13.x a tenant workload thrashing against its own multi-gigabyte limit is enough to fire it, through the node-wide PSI clause described [below](#when-the-trigger-itself-is-the-problem).
+
+## What Cozystack does
+
+**A default LimitRange in eligible system namespaces.** The `cozystack-operator` maintains a `LimitRange` named `cozystack-system-defaults` in each namespace it reconciles whose name does not begin with `tenant-`, defaulting container memory for anything that declares none. It covers containers whose upstream chart exposes no `resources` knob. Namespaces with a foreign memory policy or an unresolved safety hold are excluded.
+
+**Explicit requests and limits on node DaemonSets.** Charts additionally set real values on the DaemonSets that run on every node — the cilium agent and its init containers, metallb speaker, the frr-k8s controller and its sidecars, the linstor satellite along with plunger and drbd-logger, virt-handler, fluent-bit, node-exporter, multus and its init container, velero node-agent, and all three kubevirt-csi-node containers. Requests there are fitted to observed usage, which is a real signal for the scheduler; the LimitRange cannot supply that, because it applies one number to every container in the namespace and so has to keep its default request deliberately tiny. kube-ovn is absent from that list because its vendored chart already sets both.
+
+The operator's LimitRange stops at the `tenant-` prefix, so tenant namespaces never receive it. A tenant namespace gets a default of its own only from the tenant chart's `tenant-range-limits`, which is rendered only when `resourceQuotas` is configured on the tenant and is empty by default. A tenant workload left without a memory limit therefore stays an eviction candidate, which is the upstream design working as intended and is what restores the ordering described above.
+
+## Tuning
+
+Two installer values, both empty by default so the operator's own defaults apply:
+
+| Value | Operator flag | Default |
+|---|---|---|
+| `cozystackOperator.systemNamespaceMemoryLimit` | `--system-namespace-memory-limit` | `32Gi` |
+| `cozystackOperator.systemNamespaceMemoryRequest` | `--system-namespace-memory-request` | `32Mi` |
+
+The limit is a ceiling, not a reservation, and the default is deliberately far above any real working set. The handler discards a cgroup for carrying a `memory.max` at all, whatever its value, so what the default buys is immunity rather than a fitted ceiling. That is also why it is set so high: the scan described below sees *declared requests*, never a container's actual resident set, so a ceiling low enough to bind is a ceiling that can convert a rare pressure-driven kill into a deterministic one for any component whose real usage nobody measured. Raising it is close to free; lowering it is where the risk lives, and it is worth doing per component in that component's own chart before doing it fleet-wide here.
+
+**The limit must stay above the largest memory request in any system namespace.** A defaulted limit below a container's own request is rejected at admission, and the pod simply will not start. List the requests before lowering it — the operator marks exactly the namespaces it treats as system with `cozystack.io/system=true`, the same condition under which it creates the LimitRange:
+
+```bash
+for ns in $(kubectl get ns -l cozystack.io/system=true -o jsonpath='{.items[*].metadata.name}'); do
+  kubectl get pods -n "$ns" -o json | jq -r --arg ns "$ns" '
+    .items[]
+    | [.spec.containers[], (.spec.initContainers // [])[]][]
+    | select(.resources.requests.memory != null)
+    | "\($ns)\t\(.name)\t\(.resources.requests.memory)"'
+done | sort -u
+```
+
+**Keep the request small.** The operator always pairs the default limit with a default request, because a `LimitRange` that sets `default` without `defaultRequest` makes each container's request equal its limit and reserves the whole ceiling at schedule time. Note that leaving `systemNamespaceMemoryRequest` empty does not produce that state: an empty installer value omits the flag, which selects the operator's own `32Mi`. The knob is there to be raised or lowered, and clearing it is not a way to switch the request off.
+
+The operator also refuses to start when the request exceeds the limit. A `LimitRange` whose `defaultRequest` is above its `default` is rejected by the API server, which would wedge namespace reconciliation for every system package, so the check happens at startup rather than at apply time.
+
+Setting the limit to `0` disables the feature, so the knob is reversible. Leaving it empty is not the same thing: that selects the operator's `32Gi` default.
+
+On the next Package reconcile after the feature is disabled, the operator lists LimitRanges cluster-wide by `app.kubernetes.io/managed-by: cozystack-package-controller` and removes every object it owns, including leftovers in namespaces no active Package targets. A same-named LimitRange without that ownership label is left alone. The same ownership boundary applies while the feature is enabled: a foreign object already holding the `cozystack-system-defaults` name is neither overwritten nor adopted, even if it contains only CPU or storage policy, so that namespace receives no Cozystack memory default until the name is free.
+
+## Withholding and acknowledging a default
+
+**An unsafe default stays withheld until a cluster administrator acknowledges it.** Before applying, the operator scans Deployments, StatefulSets, DaemonSets, CronJobs, Jobs and Pods, including init containers, for requests above the configured limit without an explicit limit. A visible blocker withdraws the managed LimitRange and records a hold on the Namespace. Removing a Pod or template does not release the hold: the same empty snapshot can occur between deletion and recreation by another controller.
+
+Lowering a previously applied default also creates a hold, even if no blocker is visible. LimitRanger persists its default on admitted Pods, so a stored limit cannot prove that the workload's source declares one. The operator remembers the previous limit independently of the LimitRange and does not infer permission to tighten from a Pod's `limits` field or `kubernetes.io/limit-ranger` annotation.
+
+The cluster-scoped Namespace carries `operator.cozystack.io/system-memory-state`, a JSON object with `version`, `lastLimit`, and, when held, `hold`, `target` and `reason`. This is operator-managed safety state. It survives controller restart, removal of the LimitRange, removal of the Package target, and disabling the feature. Do not remove or edit it to clear a hold: doing so discards the evidence protecting future Pod admission. Invalid state blocks new defaults until a cluster administrator repairs it.
+
+Inspect the hold and the required acknowledgement:
+
+```bash
+kubectl get namespace <namespace> -o json | jq -r '
+  .metadata.annotations["operator.cozystack.io/system-memory-state"]
+  | fromjson | {reason, target, acknowledgement: (.hold + ":" + .target)}'
+```
+
+Before acknowledging, inspect the source of every affected workload, including custom resources and static-pod manifests that this scanner cannot read. Give the affected container an explicit limit at least as large as its request, lower its request only when appropriate, or raise the configured default. A currently running Pod's defaulted limit is not that source. Also check actual memory usage: admission safety does not make a small runtime ceiling safe.
+
+Copy the exact `acknowledgement` value reported for the current target into a separate annotation:
+
+```bash
+kubectl annotate namespace <namespace> \
+  operator.cozystack.io/system-memory-ack='<hold>:<target>' --overwrite
+```
+
+This requires permission to patch the cluster-scoped Namespace; a tenant's namespaced RoleBinding does not grant it. The operator grants no additional permission for acknowledgement. A token authorizes only its hold generation and canonical target quantity. Changing the configured target rotates the hold, even when returning to an earlier value. The operator consumes a matching token once; if a concrete request-above-default blocker still exists, the token is rejected and removed, and the hold stays. Acknowledgement never overrides a foreign LimitRange.
+
+After successful acknowledgement and a clean scan, the configured default is applied. Existing Pods keep their resources; the new default reaches later admissions. Package reconciles run after ordinary events and are additionally scheduled every five minutes, so acknowledgement and workload changes also progress on a quiet cluster, subject to controller queue and API availability. The reason and required token are visible on the Namespace and in operator logs:
+
+```bash
+kubectl -n cozy-system logs deploy/cozystack-operator | grep "withholding the default container memory limit"
+```
+
+A hold remains after disable/re-enable, and changing the configured value while held requires acknowledging the new token. The operator also removes its LimitRange when no active Package targets the namespace, considering all Packages sharing it; the Namespace safety state remains for a later reinstall. Setting the limit to zero removes managed defaults even if their safety state is invalid.
+
+**A namespace another LimitRange already governs is left alone.** If a system namespace — `kube-system` included — already carries a LimitRange that says anything about memory, the operator writes nothing there and withdraws anything it wrote earlier. Any memory-bearing field counts, at either the `Container` or the `Pod` scope: a second `default` leaves the effective ceiling to the order `LimitRanger` happens to iterate them, a `max` below this default or a `min` above the default request rejects the pod outright, and a `maxLimitRequestRatio` rejects it too, since a 32Gi default against a 32Mi default request is a ratio of 1024:1. The `Pod` scope is included because the collision there is not decidable in advance at all — whether a per-container default breaches a pod-wide bound depends on how many containers a not-yet-created pod will have. LimitRanges that bound only cpu or storage say nothing about memory and coexist normally. Note that withdrawing hands the namespace to the administrator's policy in full: if that LimitRange defaults container memory below some container's own request, the resulting admission rejection is theirs to resolve, and it is one that would have occurred without Cozystack in the picture at all.
+
+A LimitRange only mutates at admission. Existing pods keep running without limits until they restart, so the protection lands progressively as workloads roll rather than the moment the setting is applied.
+
+## Verifying
+
+Confirm a pod cgroup actually carries `memory.max` — this is the property that matters, not the QoS class. Talos runs kubelet with the `cgroupfs` driver on a unified cgroup v2 hierarchy, so a pod cgroup is a directory named for the pod UID, dashes and all:
+
+```bash
+POD_UID=$(kubectl get pod <pod> -n <ns> -o jsonpath='{.metadata.uid}')
+NODE=$(kubectl get pod <pod> -n <ns> -o jsonpath='{.spec.nodeName}')
+NODE_IP=$(kubectl get node "$NODE" -o jsonpath='{.status.addresses[?(@.type=="InternalIP")].address}')
+talosctl -n "$NODE_IP" read "/sys/fs/cgroup/kubepods/burstable/pod$POD_UID/memory.max"
+```
+
+A byte count rather than the literal `max` means the pod is out of the victim set. Note that `talosctl -n` takes a machine address rather than a Kubernetes node name, which is why the address is looked up instead of being reused from `nodeName`.
+
+Mind the QoS segment of that path, and do not extrapolate it. BestEffort and Burstable pods live under `kubepods/besteffort/` and `kubepods/burstable/`, but there is no `guaranteed` directory: kubelet creates QoS-level cgroups for those two classes only, so a Guaranteed pod sits directly at `kubepods/pod<uid>`. To avoid guessing, list the pod directories two levels down instead:
+
+```bash
+talosctl -n "$NODE_IP" ls -d 2 -t d /sys/fs/cgroup/kubepods
+```
+
+`talosctl read` wants an `os:admin` talosconfig and a single node per call. Reading the same file through `kubectl debug node/$NODE --profile=sysadmin` under `/host/sys/fs/cgroup` also works, but it depends on the kubelet, on scheduling, and on a namespace that admits a privileged pod — all shakier than the Talos API in precisely the situation that makes you run this check.
+
+Inspect what the handler has actually killed:
+
+```bash
+talosctl -n <node> get oomactions -o yaml
+```
+
+Each entry carries the score the victim was selected on, the command lines of the processes in it, and a dump of the trigger context it fired under. Ask for `-o yaml`: the default table shows only a score, and its `Time` column reads a field the spec never sets, so it renders empty. This is a ring buffer of the last 50 actions held in memory, so it does not survive a `machined` restart and is no substitute for an alert — but it is still the better of the two signals here, being structured and complete where the logs are neither.
+
+Once every eligible pod in a namespace carries a limit, the healthy signature is the controller still triggering under pressure and finding nothing it is allowed to kill:
+
+```bash
+talosctl -n <node> logs controller-runtime | grep OOMController
+```
+
+Both halves of that signature — `OOM controller triggered`, then `no eligible cgroup to kill` — are emitted at the default log level, so neither needs a debug flag. Note that the structured fields are encoded as JSON rather than logfmt, so the second line reads `no eligible cgroup to kill {"component": "controller-runtime", "controller": "runtime.OOMController", "ranked": 0}`. Grep for `"ranked"` or for the message text; `ranked=` matches nothing and reads as though the handler were not running. The trigger firing is not itself a fault.
+
+`talosctl dmesg` carries the same lines and is the more common reflex, but it is the weaker source: that path strips log levels and timestamps, truncates at 976 bytes, and suppresses the first four occurrences of each ranking error — precisely the lines worth having if scoring ever misbehaves.
+
+## What this does not cover
+
+**Kubernetes static pods.** `kube-apiserver`, `kube-controller-manager` and `kube-scheduler` are managed by Talos rather than by any chart. A `cozystack-system-defaults` LimitRange does reach `kube-system`, since `cozystack-scheduler` installs there, but it cannot touch them: a LimitRange defaults resources at API-server admission, and kubelet builds static pods straight from files on disk without ever passing through it. Sizing those is a Talos machine-config matter. Their mirror pods pass admission. An already persisted mirror Pod with an oversized request and no limit creates a hold, and lowering the previous default requires acknowledgement. A mirror Pod rejected before persistence provides no scan evidence; its absence does not mean the static manifest is safe.
+
+**Future Pods outside the scanned templates.** A custom controller can change its desired request without producing a Deployment, StatefulSet, DaemonSet, CronJob or Job. If its first replacement Pod is rejected at admission, there is no new Pod for this scanner to inspect. An ownerless ReplicaSet at zero replicas has the same gap. A `RequestsOnly` VPA can likewise introduce an unseen request after defaulting. The hold prevents automatic lowering and automatic recovery after an observed blocker, but does not validate arbitrary future custom-resource changes. Configure explicit resources for those workloads and inspect their admission errors.
+
+**A handful of vendored containers with no upstream `resources` knob** — the four frr-k8s `cp-*` init containers, the kube-ovn `hostpath-init` and `install-cni` init containers, and `cozy-proxy`, whose chart exposes no resources value at all. These are covered by the namespace LimitRange and nothing else. That is enough for OOM immunity, since the defaulted limit is what puts `memory.max` on the cgroup, but their request is then the generic default rather than a figure fitted to measured usage, so the scheduler gets a weaker signal for them than for the DaemonSets above. Lifting that needs changes upstream.
+
+**Optional components** `hami` and `kilo` carry no chart-level values, on the grounds that inventing numbers for components with no usage measurements behind them is worse than the blanket default.
+
+## When the trigger itself is the problem
+
+Giving system components limits stops them being *victims*. It does not stop the handler *triggering*, and a node under genuine sustained pressure will keep firing. The v1.14.2 default trigger is:
+
+```
+(multiply_qos_vectors(d_qos_memory_full_total, {System: 8.0, Podruntime: 4.0}) > 3000.0 &&
+ multiply_qos_vectors(qos_memory_full_avg10, {System: 1.0, Podruntime: 1.0}) > 5.0 &&
+ time_since_trigger > duration("5s"))
+```
+
+It fires only on memory stalls in the `System` and `Podruntime` cgroups, so pressure confined to pods does not trip it. It reached that shape over four changes: [siderolabs/talos#12602](https://github.com/siderolabs/talos/pull/12602) replaced the original global-PSI trigger with the per-QoS form in v1.13.0, [#12632](https://github.com/siderolabs/talos/pull/12632) added the `qos_memory_full_avg10 > 5.0` conjunct to make it less sensitive, [#13725](https://github.com/siderolabs/talos/pull/13725) added the `5s` cooldown in v1.13.6, and [#13895](https://github.com/siderolabs/talos/pull/13895) dropped a second clause, `memory_full_avg10 > 75.0 && time_since_trigger > duration("10s")`, in v1.14.0. That clause was a cause-blind global-PSI backstop: a single workload thrashing inside its own cgroup limit could drive root `memory_full` above 75 while the node had free RAM. Any node still running a v1.13 release carries it, tenant Kubernetes workers included. A tenant worker's machine config is rendered by the `kubernetes-nodes` chart, which accepts no extra documents, so the workaround below is for host nodes only.
+
+On a v1.13 host node the backstop can be removed without upgrading, through an `OOMConfig` machine-config document that sets the v1.14 trigger — at the cost of the last-resort guard before the kernel OOM killer takes over. The document also accepts `cgroupRankingExpression`, `strictCgroupClassOrdering` and `sampleInterval`; anything left out keeps its default, so overriding the trigger alone is enough here:
+
+```yaml
+apiVersion: v1alpha1
+kind: OOMConfig
+triggerExpression: |-
+  (multiply_qos_vectors(d_qos_memory_full_total, {System: 8.0, Podruntime: 4.0}) > 3000.0 &&
+   multiply_qos_vectors(qos_memory_full_avg10, {System: 1.0, Podruntime: 1.0}) > 5.0 &&
+   time_since_trigger > duration("5s"))
+```
+
+Prefer fixing the workload that is generating the pressure. Persistent triggering on v1.14 means the system and runtime cgroups keep stalling for memory, and capping the pod that is growing into the node's memory addresses the cause rather than the symptom. On v1.13 it can also mean a pod sitting at its own memory ceiling and reclaiming constantly, which raising that pod's limit addresses.
diff --git a/docs/release.md b/docs/release.md
index 22366f6be8..bf5aaf044e 100644
--- a/docs/release.md
+++ b/docs/release.md
@@ -1,6 +1,19 @@
 # Release Workflow
 
-This document describes Cozystack’s release process.
+This document is both the process design (what the release model looks like) and the operational playbook (what to actually do, what breaks, what to verify). Companion to [`agents/changelog.md`](./agents/changelog.md), which is the canonical changelog process.
+
+## When to use this guide
+
+You are about to:
+
+- Cut a pre-release (`vX.Y.0-rc.N`, or `vX.Y.0-alpha.N` / `-beta.N`).
+- Cut a regular release (`vX.Y.0`).
+- Cut a patch release (`vX.Y.Z` with `Z > 0`).
+- Triage cherry-picks before a patch release.
+- Investigate why CI is misbehaving on a tag push.
+- Review a promote (release) PR.
+
+If you are about to generate a changelog only, jump straight to [`agents/changelog.md`](./agents/changelog.md).
 
 ## Introduction
 
@@ -8,99 +21,129 @@ Cozystack uses a staged release process to ensure stability and flexibility duri
 
 There are three types of releases:
 
-- **Release Candidates (RC)** – Preview versions (e.g., `v0.42.0-rc.1`) used for final testing and validation.
-- **Regular Releases** – Final versions (e.g., `v0.42.0`) that are feature-complete and thoroughly tested.
-- **Patch Releases** – Bugfix-only updates (e.g., `v0.42.1`) made after a stable release, based on a dedicated release branch.
+- **Release Candidates (RC)** – Preview versions (e.g., `v1.2.0-rc.1`) used for final testing and validation.
+- **Regular Releases** – Final versions (e.g., `v1.2.0`) that are feature-complete and thoroughly tested.
+- **Patch Releases** – Bugfix-only updates (e.g., `v1.2.1`) made after a stable release, based on a dedicated release branch.
 
-Each type plays a distinct role in delivering reliable and tested updates while allowing ongoing development to continue smoothly.
+All three are matched by `tags.yaml`'s regex `^v\d+\.\d+\.\d+(-(alpha|beta|rc)\.\d+)?$`. The tag push is the trigger for the whole pipeline. **Pre-release tags (`-alpha` / `-beta` / `-rc`) are cut with the [`Cut Pre-release Tag`](../.github/workflows/cut-prerelease.yaml) workflow** (manual dispatch from `main` or `release-X.Y`) — it pushes the tag as the CI app at the dispatch branch's tip, so GitHub fills `base_ref` (`tags.yaml`'s `Get base branch` step refuses tags pushed without a base) and the push triggers `tags.yaml` (a tag pushed with the default `GITHUB_TOKEN` would not). Stable `vX.Y.Z` tags are never pushed by hand at all — they are cut write-once by the promote flow at a PR merge commit. Only `-rc.N` pre-releases feed the promotion flow ([`promote-rc.yaml`](../.github/workflows/promote-rc.yaml) accepts `vX.Y.Z-rc.N` alone); `-alpha.N` / `-beta.N` tags are built and published for download and validated on demand with the [`e2e-tag.yaml`](../.github/workflows/e2e-tag.yaml) button, but are never promoted to a stable release.
 
 ## Release Candidates
 
-Release candidates are Cozystack versions that introduce new features and are published before a stable release.
-Their purpose is to help validate stability before finalizing a new feature release.
-They allow for final rounds of testing and bug fixes without freezing development.
+Release candidates are Cozystack versions that introduce new features and are published before a stable release. Their purpose is to help validate stability before finalizing a new feature release.
+
+Release candidates are given numbers `vX.Y.0-rc.N`, for example, `v1.2.0-rc.1`. The first one is cut from `main`, once all major features for the upcoming release have merged and the release enters its testing phase.
+
+**Cutting the first rc freezes the line.** [`cut-prerelease.yaml`](../.github/workflows/cut-prerelease.yaml) creates `release-X.Y` at the tagged commit, and from that point the release's content is closed:
 
-Release candidates are given numbers `vX.Y.0-rc.N`, for example, `v0.42.0-rc.1`.
-They are created directly in the `main` branch.
-An RC is typically tagged when all major features for the upcoming release have been merged into main and the release enters its testing phase.
-However, new features and changes can still be added before the regular release `vX.Y.0`.
+- Every later cut for that line — `rc.2`, `rc.3`, an `alpha`/`beta`, or a patch-line rc — must be dispatched from `release-X.Y`. A dispatch from `main` is refused.
+- Fixes reach the release only by cherry-pick or backport onto `release-X.Y` (see [Backports](#backports)).
+- `main` reopens immediately for the next minor, so feature work never has to wait for the release to ship.
 
-Each RC contributes to a cumulative set of release notes that will be finalized when `vX.Y.0` is released.
-After testing, if no critical issues remain, the regular release (`vX.Y.0`) is tagged from the last RC or a later commit in main.
-This begins the regular release process, creates a dedicated `release-X.Y` branch, and opens the way for patch releases.
+This is what makes an rc mean something. Previously `release-X.Y` was created only when the stable release merged, so `rc.2` was cut from `main`'s tip and silently absorbed everything that had landed since `rc.1` — the shipped release could contain code that no rc had ever validated.
+
+**Un-freezing is manual and deliberate.** If an `rc.1` turns out to be unusable and the line has to be re-cut from `main`, delete `release-X.Y` by hand first; the refuse step blocks every other route back to a `main` dispatch, which is the point of it. Nothing automates the deletion, and nothing should — throwing away a frozen line is a decision worth making explicitly.
+
+Each RC contributes to a cumulative set of release notes that will be finalized when `vX.Y.0` is released. After testing, if no critical issues remain, the last good rc is **promoted** to the regular release `vX.Y.0` — the exact rc images retagged by digest, never rebuilt and never tagged from a later commit (see [Regular Releases](#regular-releases)). Promotion cuts the write-once `vX.Y.0` tag at the promote PR's merge commit, fast-forwards the `release-X.Y` maintenance branch the freeze already created, and opens the way for patch releases.
 
 ## Regular Releases
 
-When making a regular release, we tag the latest RC or a subsequent minimal-change commit as `vX.Y.0`.
-In this explanation, we'll use version `v0.42.0` as an example:
+A regular release `vX.Y.0` is **promoted from a release-candidate that already passed e2e** — never tagged by hand and never rebuilt. The bytes shipped as `vX.Y.0` are the exact `vX.Y.0-rc.N` images, retagged by digest. We'll use `v1.2.0` as an example.
 
 ```mermaid
 gitGraph
     commit id: "feature"
     commit id: "feature 2"
-    commit id: "feature 3" tag: "v0.42.0"
+    commit id: "feature 3" tag: "v1.2.0-rc.1"
 ```
 
-A regular release sequence starts in the following way:
+A regular release sequence runs as follows:
 
-1. Maintainer tags a commit in `main` with `v0.42.0` and pushes it to GitHub.
-2. CI workflow triggers on tag push:
-   1. Creates a draft page for release `v0.42.0`, if it wasn't created before.
-   2. Takes code from tag `v0.42.0`, builds images, and pushes them to ghcr.io.
-   3. Makes a new commit `Prepare release v0.42.0` with updated digests, pushes it to the new branch `release-0.42.0`, and opens a PR to `main`.
-   4. Builds Cozystack release assets from the new commit `Prepare release v0.42.0` and uploads them to the release draft page.
-3. Maintainer reviews PR, tests build artifacts, and edits changelogs on the release draft page.
+1. Cut the first release candidate (`v1.2.0-rc.1`) from the last good commit on `main`: run the [`Cut Pre-release Tag`](../.github/workflows/cut-prerelease.yaml) workflow (manual dispatch **from `main`**) with the tag. It tags `main`'s HEAD as the CI app, then **creates `release-1.2` at that commit, freezing the line**; `tags.yaml` then builds the rc images, publishes the rc prerelease, pushes the digest-vendored `release-1.2.0-rc.N` staging branch, and runs its mandatory `rc-e2e` job by calling [`e2e-tag.yaml`](../.github/workflows/e2e-tag.yaml) against that published tag.
+2. Watch the rc's mandatory full E2E and wait for it to pass, then complete the other checks in [Pre-release verification checklist](#pre-release-verification-checklist). If the latest `tags.yaml` run cannot provide a green `rc-e2e`, a successful manual dispatch of [`e2e-tag.yaml`](../.github/workflows/e2e-tag.yaml) for the same tag is equivalent gate evidence. `main` is already open for the next minor, so anything landing there is **not** in this release: fixes for `1.2` are cherry-picked onto `release-1.2`, and a later rc is cut by dispatching the workflow **from `release-1.2`**. **Optional:** once the notes are worth reviewing, press the `Generate RC Changelog` button ([`changelog-rc.yaml`](../.github/workflows/changelog-rc.yaml)) to generate `docs/changelogs/v1.2.0.md` now and bank it on the `release-1.2.0-rc.N` staging branch — so there is time to review and hand-edit it before promotion. Skipping the button changes nothing; promotion generates the changelog itself.
 
    ```mermaid
    gitGraph
        commit id: "feature"
        commit id: "feature 2"
-       commit id: "feature 3" tag: "v0.42.0"
-       branch release-0.42.0
-       checkout release-0.42.0
-       commit id: "Prepare release v0.42.0"
+       commit id: "feature 3" tag: "v1.2.0-rc.1"
+       branch release-1.2
        checkout main
-       merge release-0.42.0 id: "Pull Request"
+       commit id: "feature 4 (next minor)"
+       checkout release-1.2
+       commit id: "cherry-picked fix" tag: "v1.2.0-rc.2"
    ```
 
-   When testing and editing are completed, the sequence goes on.
+3. Once the checks are green, run the [`promote-rc.yaml`](../.github/workflows/promote-rc.yaml) workflow (manual dispatch) with that rc tag. Its `parse` job verifies E2E before any staging: it accepts a successful `rc-e2e` job in the latest `tags.yaml` push run for the tag, or any retained successful manual `e2e-tag.yaml` run whose expanded E2E job name targets the tag. The emergency `skip_e2e_gate` input bypasses this check, logs a loud warning, and marks the promote PR with ⚠️. Before its first registry write, promotion also proves that the selected `main` or `release-X.Y` target already contains the candidate-aware PR gate, finalizer and trusted verifier; backport this pipeline to an existing maintenance branch before promoting its next patch. Promotion **creates no stable name before merge**: dispatch does write to the registry — it publishes one `promotion-*` packages candidate, and that tag is real and publicly listable — but it creates no `vX.Y.Z` tag, moves no `latest`, and publishes no stable installer, so nothing a consumer resolves changes until the PR merges. It:
+   1. Rewrites the rc version substring to `1.2.0` and commits that exact tree, serializes its `packages/` directory under a run-specific temporary OCI tag, then adds a second commit pinning the candidate's immutable digest in the installer before pushing `release-1.2.0`. Container digests remain exactly the rc's; the two commits give the OCI revision an honest source SHA without pretending the artifact can contain its own digest.
+   2. Drafts the `v1.2.0` release and uploads the (restamped) assets.
+   3. Generates `docs/changelogs/v1.2.0.md` (in a parallel job, detached at the rc tag) — or, if you pressed the rc-time `Generate RC Changelog` button, copies the file already banked on the `release-1.2.0-rc.N` staging branch instead of regenerating — and commits it onto the `release-1.2.0` branch, so the changelog is reviewed as part of the promotion and finalize can publish the release with it already in place. Non-blocking: if generation fails the PR still opens, carrying a ⚠️ line that says the changelog is missing.
+   4. Opens the `cozystack/website` "update managed apps reference" PR (`update-docs-v1.2.0` branch), generating the docs from the `release-1.2.0` staging branch via `FETCH_REF`. Non-blocking, and **do not merge that PR until `v1.2.0` is published** — merging early breaks the live site's version routing (see [Phase 3](#phase-3--update-website-docs-now-the-backstop)).
+   5. Opens the `chore(release): promote v1.2.0-rc.N -> v1.2.0` PR into `release-1.2`, labelled `release` only. The PR body records whether E2E was verified or bypassed, plus ✅/⚠️ changelog and website-docs lines. E2E does not run on this promote PR by default because the immutable rc already passed the mandatory full suite; a maintainer may add `full-e2e` to run it again. The stable retag itself is deferred to the merge (step 5), so an abandoned promotion leaves no stable-named images and cannot wedge a re-promotion; retention protects the temporary candidate for as long as this release PR remains open, then may remove it after 30 days.
+
+   The PR targets the maintenance branch, not `main`: `promote-rc.yaml` prefers `release-X.Y` whenever it exists, and since the rc freeze it always does. The digest-vendored `Prepare release` commit therefore stays on the release line instead of landing on `main`.
+
+   ```mermaid
+   gitGraph
+       commit id: "feature 3" tag: "v1.2.0-rc.1"
+       branch release-1.2
+       checkout release-1.2
+       commit id: "cherry-picked fix" tag: "v1.2.0-rc.2"
+       branch release-1.2.0
+       checkout release-1.2.0
+       commit id: "Prepare release v1.2.0"
+       commit id: "Pin promoted packages artifact"
+       checkout release-1.2
+       merge release-1.2.0 id: "Pull Request"
+   ```
 
-4. Maintainer merges the PR. GitHub removes the merged branch `release-0.42.0`.
-5. CI workflow triggers on merge:
-   1. Moves the tag `v0.42.0` to the newly created merge commit by force-pushing a tag to GitHub.
-   2. Publishes the release page (`draft` → `latest`).
-6. The maintainer can now announce the release to the community.
+4. Maintainer reviews the PR and the draft release against the [Phase 4 checklist](#phase-4--review-and-merge-the-promote-pr): confirm the E2E-verification line is ✅ (or explicitly accept its ⚠️ bypass), the changelog line is ✅, and note the website-docs line — the `cozystack/website` docs PR that promotion parked, which stays unmerged for now. E2E does not run on this promote PR by default. Then merge — **do not squash-merge**, the stable tag must attach to a real merge commit. GitHub removes the merged branch `release-1.2.0` (the repo has auto-delete-on-merge enabled).
+5. CI workflow triggers on merge (this is where every consumer-visible or write-once side effect happens, after the rc E2E gate and PR review):
+   1. Pulls the pinned packages candidate by digest and verifies that it matches the merged `packages/` tree apart from the artifact's impossible self-reference, carries no rc image tags, and preserves the original rc artifact's container `repo@digest` set.
+   2. Creates the tag `v1.2.0` at the newly created merge commit — write-once. The tag is published here for the first time, never moved.
+   3. Cuts the write-once `api/apps/v1alpha1/v1.2.0` Go-module tag at the same commit.
+   4. Ensures the `release-1.2` maintenance branch exists at the tag commit. Since the rc freeze created it, this is normally a no-op fast-forward: the merge commit is already its tip.
+   5. Publishes the release page (`draft` → `latest`), using `docs/changelogs/v1.2.0.md` from the merge commit as the release body.
+   6. Retags the verified packages candidate and rc container images by digest to `v1.2.0` (and `:latest` only when `v1.2.0` is the newest published stable), and publishes the stable `cozy-installer` chart — no container rebuild.
+6. Once the release is published, merge the parked `cozystack/website` docs PR (opened back at promote time, step 3.iv) so the live site's version routing flips to `v1.2.0` — its versioned docs and `openapi.json` are on GitHub now. The maintainer can then announce the release to the community.
 
 ```mermaid
 gitGraph
-    commit id: "feature"
     commit id: "feature 2"
-    commit id: "feature 3"
-    branch release-0.42.0
-    checkout release-0.42.0
-    commit id: "Prepare release v0.42.0"
+    commit id: "feature 3" tag: "v1.2.0-rc.1"
+    branch release-1.2
     checkout main
-    merge release-0.42.0 id: "Release v0.42.0" tag: "v0.42.0"
+    commit id: "feature 4 (next minor)"
+    checkout release-1.2
+    commit id: "cherry-picked fix" tag: "v1.2.0-rc.2"
+    branch release-1.2.0
+    checkout release-1.2.0
+    commit id: "Prepare release v1.2.0"
+    checkout release-1.2
+    merge release-1.2.0 id: "Release v1.2.0" tag: "v1.2.0"
 ```
 
+Note that `main` never receives the release commit. It forked away at the freeze and carries the next minor's work.
+
 ## Patch Releases
 
-Making a patch release has a lot in common with a regular release, with a couple of differences:
+A patch release now follows exactly the same shape as the regular release above — by the time `vX.Y.0` ships, everything is already happening on `release-X.Y`. The only difference is where the line starts:
 
-* A release branch is used instead of `main`
-* Patch commits are cherry-picked to the release branch.
-* A pull request is opened against the release branch.
+* `release-X.Y` already exists, created by the freeze at `vX.Y.0-rc.1`, so there is no branch to create.
+* Patch commits are cherry-picked onto it, and the rc is cut by dispatching **from `release-X.Y`** — the same dispatch used for `rc.2` of the original release.
 
 
-Let's assume that we've released `v0.42.0` and that development is ongoing.
+Let's assume that we've released `v1.2.0` and that development is ongoing.
 We have introduced a couple of new features and some fixes to features that we have released 
-in `v0.42.0`.
+in `v1.2.0`.
 
 Once problems were found and fixed, a patch release is due.
 
 ```mermaid
 gitGraph
-   commit id: "Release v0.42.0" tag: "v0.42.0"
+    commit id: "feature 3" tag: "v1.2.0-rc.1"
+    branch release-1.2
+    checkout release-1.2
+    commit id: "Release v1.2.0" tag: "v1.2.0"
     checkout main
     commit id: "feature 4"
     commit id: "patch 1"
@@ -109,58 +152,535 @@ gitGraph
 ```
 
 
-1. The maintainer creates a release branch, `release-0.42,` and cherry-picks patch commits from `main` to `release-0.42`.
-   These must be only patches to features that were present in version `v0.42.0`.
+1. The maintainer cherry-picks patch commits from `main` onto the existing `release-1.2` branch. These must be only patches to features that were present in version `v1.2.0`.
+
+   Cherry-picking can be done as soon as each patch is merged into `main`, or directly before the release.
 
-   Cherry-picking can be done as soon as each patch is merged into `main`,
-   or directly before the release.
+   The `backport` label automates this: [`backport.yaml`](../.github/workflows/backport.yaml) targets the newest existing `release-X.Y` branch, which during a freeze window is the line being stabilised rather than the last published one.
 
    ```mermaid
    gitGraph
-       commit id: "Release v0.42.0" tag: "v0.42.0"
-       branch release-0.42
+       commit id: "feature 3" tag: "v1.2.0-rc.1"
+       branch release-1.2
+       checkout release-1.2
+       commit id: "Release v1.2.0" tag: "v1.2.0"
        checkout main
        commit id: "feature 4"
        commit id: "patch 1"
        commit id: "feature 5"
        commit id: "patch 2"
-       checkout release-0.42
+       checkout release-1.2
        cherry-pick id: "patch 1"
        cherry-pick id: "patch 2"
    ```
 
-   When all relevant patch commits are cherry-picked, the branch is ready for release.
+   When all relevant patch commits are cherry-picked, the branch is ready for release. Build with `go build ./cmd/backport-audit`, then confirm with `./backport-audit release-1.2` — it exits non-zero while anything labeled for the line is still missing from it, and prints the URLs. See [Cherry-pick triage before a patch](#cherry-pick-triage-before-a-patch).
+
+2. The maintainer cuts a release candidate (`v1.2.1-rc.N`) via the [`Cut Pre-release Tag`](../.github/workflows/cut-prerelease.yaml) workflow (manual dispatch **from `release-1.2`**), which tags that branch's `HEAD`. CI builds and publishes the rc, pushes the `release-1.2.1-rc.N` staging branch, and runs the mandatory full `rc-e2e` job against the published tag.
+3. Watch `rc-e2e` and wait for it to pass, then complete the other release checks. A successful manual `e2e-tag.yaml` run for `v1.2.1-rc.N` is also valid evidence if the latest `tags.yaml` run does not carry a green `rc-e2e`. **Optional:** press the `Generate RC Changelog` button ([`changelog-rc.yaml`](../.github/workflows/changelog-rc.yaml)) to generate `docs/changelogs/v1.2.1.md` at rc time and bank it on the rc staging branch; promotion then reuses it instead of regenerating.
+4. Once the checks are green, run [`promote-rc.yaml`](../.github/workflows/promote-rc.yaml) (manual dispatch) with that rc tag. It runs the same five jobs as a regular promotion: the dispatch first gates on the latest tag-push `rc-e2e` or a successful tag-correlated manual E2E run (`skip_e2e_gate` overrides it), verifies that `release-1.2` already carries the candidate-aware pipeline, then commits and publishes the rewritten packages tree under a run-specific temporary `promotion-*` tag, adds a second commit pinning the candidate on the `release-1.2.1` branch, drafts the `v1.2.1` release with the restamped assets, generates or picks up `docs/changelogs/v1.2.1.md` and commits it onto that branch, opens the parked `cozystack/website` docs PR (updating the existing `v1.2/` directory in place, since a patch does not promote `next/`), and opens the promote PR into `release-1.2` with only the `release` label. The promote PR body carries the same ✅/⚠️ E2E, changelog, and website-docs lines and runs no E2E by default; add `full-e2e` manually to force a repeat. As with a regular release every stable name is deferred to merge; retention protects the temporary candidate while this PR is open and, after it merges, while `release-1.2` still pins it — until finalize retags it stable.
 
-2. The maintainer tags the `HEAD` commit of branch `release-0.42` as `v0.42.1` and then pushes it to GitHub.
-3. CI workflow triggers on tag push:
-    1. Creates a draft page for release `v0.42.1`, if it wasn't created before.
-    2. Takes code from tag `v0.42.1`, builds images, and pushes them to ghcr.io.
-    3. Makes a new commit `Prepare release v0.42.1` with updated digests, pushes it to the new branch `release-0.42.1`, and opens a PR to `release-0.42`.
-    4. Builds Cozystack release assets from the new commit `Prepare release v0.42.1` and uploads them to the release draft page.
-4. Maintainer reviews PR, tests build artifacts, and edits changelogs on the release draft page.
-   
    ```mermaid
    gitGraph
-       commit id: "Release v0.42.0" tag: "v0.42.0"
-       branch release-0.42
+       commit id: "feature 3" tag: "v1.2.0-rc.1"
+       branch release-1.2
+       checkout release-1.2
+       commit id: "Release v1.2.0" tag: "v1.2.0"
        checkout main
        commit id: "feature 4"
        commit id: "patch 1"
        commit id: "feature 5"
        commit id: "patch 2"
-       checkout release-0.42
+       checkout release-1.2
        cherry-pick id: "patch 1"
-       cherry-pick id: "patch 2" tag: "v0.42.1"
-       branch release-0.42.1
-       commit id: "Prepare release v0.42.1"
-       checkout release-0.42
-       merge release-0.42.1 id: "Pull request"
+       cherry-pick id: "patch 2" tag: "v1.2.1-rc.1"
+       branch release-1.2.1
+       commit id: "Prepare release v1.2.1"
+       checkout release-1.2
+       merge release-1.2.1 id: "Pull request"
    ```
 
    Finally, when release is confirmed, the release sequence goes on.
 
-5. Maintainer merges the PR. GitHub removes the merged branch `release-0.42.1`.
-6. CI workflow triggers on merge:
-   1. Moves the tag `v0.42.1` to the newly created merge commit by force-pushing a tag to GitHub.
-   2. Publishes the release page (`draft` → `latest`).
-7. The maintainer can now announce the release to the community.
+5. Maintainer reviews the PR against the [Phase 4 checklist](#phase-4--review-and-merge-the-promote-pr), confirms the E2E-verification and changelog lines and notes the parked website-docs line, and merges it — **do not squash-merge**. GitHub removes the merged branch `release-1.2.1` (auto-delete-on-merge is enabled).
+6. CI workflow triggers on merge (all consumer-visible or write-once side effects, after the rc E2E gate and PR review):
+   1. Verifies the pinned packages candidate against the merged tree and the original rc artifact's container digests.
+   2. Creates the tag `v1.2.1` at the newly created merge commit — write-once. The tag is published here for the first time, never moved.
+   3. Cuts the write-once `api/apps/v1alpha1/v1.2.1` Go-module tag at the same commit.
+   4. Publishes the release page (`draft` → `latest`; `latest` moves only if `v1.2.1` is the newest published stable).
+   5. Retags the verified packages candidate and rc container images by digest to `v1.2.1` and publishes the stable `cozy-installer` chart — no container rebuild.
+7. Once the release is published, merge the parked `cozystack/website` docs PR, then announce the release to the community.
+
+## What CI does during the release process
+
+The numbered process above is implemented by seven workflows, including the reusable/manual [`e2e-tag.yaml`](../.github/workflows/e2e-tag.yaml), plus the reusable [`changelog-generate.yaml`](../.github/workflows/changelog-generate.yaml) that two of them share to produce the changelog. Knowing which job does what makes the failure modes much easier to diagnose.
+
+1. [`cut-prerelease.yaml`](../.github/workflows/cut-prerelease.yaml) — manual dispatch (from `main` or `release-X.Y`): the sole entry point for creating a pre-release tag. Validates the `-alpha`/`-beta`/`-rc` tag, then pushes it (write-once, at the branch tip) as the CI app so `tags.yaml` fires. Cutting the first `vX.Y.0-rc.N` also creates `release-X.Y`, freezing the line; afterwards a `vX.Y.*` dispatch from `main` is refused. Stable tags are never created here.
+2. [`tags.yaml`](../.github/workflows/tags.yaml) — fires on any pre-release tag push: `build-amd64` and `build-arm64` build the pre-release side by side, then `prepare-release` publishes it and pushes its digest-pinned staging branch, then — **only for `-rc.N` tags** — the mandatory `rc-e2e` job calls `e2e-tag.yaml` in the same run (`-alpha.N` / `-beta.N` skip it and are validated on demand with `e2e-tag.yaml`'s manual button). `generate-changelog` and `update-website-docs` also live here but are **backstops only** — both are normally produced at promotion time (see 4); on a stable tag push each self-skips or no-ops when the promote flow already did the work. These stable-tag backstops only fire because finalize pushes the stable tag with the CI app token (a `GITHUB_TOKEN` push triggers no run — see 5).
+3. [`e2e-tag.yaml`](../.github/workflows/e2e-tag.yaml) — reusable from `tags.yaml::rc-e2e` and manually dispatchable for a published tag. It checks that the tag's release carries its nocloud disk, resolves the digest-pinned tree and runs the full install, OpenAPI, and Chainsaw suite on Talos containers. A tag cut before the container lane existed has to be dispatched from its own ref. Its dispatch run title is the constant workflow name, so the promote gate correlates a manual run through the successful tag-bearing E2E job name rather than the title.
+4. [`promote-rc.yaml`](../.github/workflows/promote-rc.yaml) — manual dispatch. Five jobs: `parse` validates the rc tag and requires green full-E2E evidence before any staging; `promote` rewrites and commits the rc tags, publishes that packages tree as a run-specific temporary reproducible candidate, commits its digest pin in the `release-X.Y.Z` tree, and drafts the stable release; `changelog` calls the reusable `changelog-generate.yaml` **in parallel** to produce `docs/changelogs/vX.Y.Z.md` (regenerating it, or copying an rc-time changelog already committed to the `release-X.Y.Z-rc.N` staging branch by `changelog-rc.yaml` — see 7); `website-docs` (needs `parse`, `promote`) opens the `cozystack/website` docs PR from the staging branch via `FETCH_REF` (see [Phase 3](#phase-3--update-website-docs-now-the-backstop)); `open-pr` joins them, commits the changelog onto the staging branch, and opens the `release-X.Y.Z` promote PR with the `release` label but no automatic `full-e2e`. So the changelog and website docs are reviewed as part of the promotion, the already-checked rc suite is not repeated by default, and the PR body carries ✅ verified or ⚠️ bypassed plus ✅/⚠️ changelog and website-docs lines. Both `changelog` and `website-docs` are non-blocking. No stable registry name is created at dispatch.
+5. [`.github/workflows/pull-requests.yaml`](../.github/workflows/pull-requests.yaml) verifies a promotion candidate against the prospective merge tree and original rc artifact before the required `E2E Tests` status can turn green. [`pull-requests-release.yaml`](../.github/workflows/pull-requests-release.yaml) fires after merge and repeats that verification before any stable tag, then cuts the write-once stable + Go-module tags, publishes the release **with the merged changelog as its body**, retags the candidate and rc images to stable by digest (`:latest` gated on newest-stable), and publishes the stable chart.
+6. [`update-releasenotes.yaml`](../.github/workflows/update-releasenotes.yaml) — fires on pushes to `main` that touch `docs/changelogs/v*.md`; syncs that content into the corresponding GitHub Release body. No longer the primary path (finalize sets the body directly, which is race-free and works for maintenance lines too) — this now covers later edits to a published changelog and manual re-syncs via `workflow_dispatch`.
+7. [`changelog-rc.yaml`](../.github/workflows/changelog-rc.yaml) — manual dispatch, **optional**: generate the changelog at rc time instead of waiting for promotion, while there is still time to review it. It calls the same reusable [`changelog-generate.yaml`](../.github/workflows/changelog-generate.yaml) and commits the result to the `release-X.Y.Z-rc.N` staging branch as `docs/changelogs/vX.Y.Z.md`; the promote-time `changelog` job then copies that file instead of running the AI again. Skipping this workflow changes nothing — promote generates the changelog itself, exactly as before.
+
+### Phase 1 — `build-amd64`, `build-arm64` and `prepare-release` (hard gate)
+
+On an rc tag push: builds images for both architectures, commits digest pins, creates the draft release, and pushes the `release-X.Y.Z-rc.N` staging branch. `build-amd64` holds the release-exists no-op and the rejection of a hand-pushed stable tag, and builds the amd64 images and the release assets (its `make build` also pushes the packages artifact and the installer chart, pinned on amd64 digests); `prepare-release` stitches, gates, republishes those two from the repinned tree, and publishes the release. (The stable promote PR is opened later by `promote-rc.yaml`, not here. When the stable tag itself is pushed by finalize, a draft already exists, so this job is a no-op — see [Phase 5](#phase-5--pull-requests-releaseyaml-finalize).)
+
+The commit (`Prepare release vX.Y.Z`, authored by `cozystack-ci[bot]`) is **digest pins and image tags only**:
+
+- `packages/core/{installer,platform,testing}/values.yaml`
+- `packages/system/*/values.yaml` (cozystack-api, dashboard, kamaji, linstor, kubevirt-csi-node, etc.)
+- `packages/apps/kubernetes/images/{kubevirt-csi-driver,ubuntu-container-disk-*}.tag`
+- `packages/system/dashboard/templates/configmap.yaml` (the `$tenantText` value)
+
+Things that look surprising in the diff but are normal:
+
+- **Zero-diff packages**: when buildx fully caches and upstream base images haven't moved, the digest is byte-identical to the previous release and won't appear. Verify the build step actually ran — don't assume "no diff = nothing built."
+- **Sudden churn on `ubuntu-container-disk-*` tags**: `cloud-images.ubuntu.com/noble/current/` is a moving target; these often rebuild even without code changes.
+- **Switched registry**: if a self-built image moved from `docker.io` to `ghcr.io`, the registry portion of the digest changes — that's a deliberate move, not a regression.
+- **`targetVersion` is NOT touched by the release PR.** Platform migration `targetVersion` is bumped earlier in a feature commit (e.g. `[platform] Bump migration targetVersion to 39 for migration 38`). The release PR only re-pins the `platform-migrations` image digest.
+
+#### Multi-arch images
+
+Every pre-release is published for amd64 and arm64. `tags.yaml::build-arm64` builds the images on a native arm64 runner and pushes each as `<tag>-arm64`, while `build-amd64` builds amd64, the Talos installer and matchbox for both arches, and the assets on x86 at the same time. `build-amd64` hands its stamped tree, the log of the tags it pushed and the assets to `prepare-release` as workflow artifacts; a missing one fails the upload or the download rather than publishing a partial release. `prepare-release` waits for both builds and runs only if both succeeded: when either fails, the rc is not prepared at all, so a release is never published amd64 only. It applies the stamped tree and runs [`hack/stitch-multiarch.sh`](../hack/stitch-multiarch.sh), which joins each image with its arm64 twin into one index, moves onto it every tag the build pushed for that image (the rc tag and, under `PUBLISH_VERSIONED=1`, its component version, which the build records in `PUSHED_TAGS_LOG`), and repins the tree on the index digests, then [`hack/verify-multiarch.sh`](../hack/verify-multiarch.sh), then republishes the packages artifact and the installer chart from the repinned tree. A stable tag skips `build-arm64` and builds nothing: promotion copies the rc's indexes with every platform, so the stable release is exactly as multi-arch as its rc. Because the two builds run in parallel, an rc that is not prepared (its arm64 build failed, or `prepare-release` failed before the stitch) still leaves behind what the amd64 build pushed: amd64-only images under `:<rc>` and under the component-version tags, and the `cozystack-packages:<rc>` artifact and the installer chart, both pinned on those amd64 digests. A component tag an earlier rc had moved to an index then points at an amd64-only image again, until a run that succeeds stitches it, a re-run of the same run included.
+
+`verify-multiarch.sh` is a hard gate. It resolves every ref the tree pins, third-party images included, and fails naming each one that is not an index carrying both `linux/amd64` and `linux/arm64`, or that it cannot resolve at all. The fix is to make the image multi-arch (build it for both, or pin a multi-arch digest of the same version); an image that cannot exist for arm64 goes in [`hack/multiarch-allowlist`](../hack/multiarch-allowlist) by repository, with the reason on the same line.
+
+That gate sees only what the tree pins by digest. An image a vendored chart renders from its own defaults, or one an operator launches at runtime, is invisible to it. `rc-e2e` closes most of that gap: before tearing the sandbox down, [`e2e-tag.yaml`](../.github/workflows/e2e-tag.yaml) reads every image the three Talos nodes pulled from their image stores (`hack/collect-images.sh`), each by the digest the pull resolved to, and runs `verify-multiarch.sh --refs-file` on that list with the same allowlist. A pre-release fails on any single-arch image, on any ref it cannot read or that is still rate-limited after the retries, and on a list the collection could not produce; a stable tag's run only warns, since it ships its rc's images. A tag whose tree predates the audit (it has no `hack/verify-multiarch.sh`) only warns and passes, so an rc cut before the audit existed can still be re-validated. The list and the audit output are in the run's `image-list-<tag>` artifact. Neither check covers a package that e2e never installs and whose images the tree does not pin by digest: an arm64 break there shows up only on an arm64 cluster.
+
+[`build-arm64-nightly.yaml`](../.github/workflows/build-arm64-nightly.yaml) builds `main` for arm64 every day, so an arm64 build break shows up there before the next rc. Its first step prints `verify-multiarch.sh --report` for `main`'s committed tree: `main` pins amd64 images, so its first-party refs are all listed and are expected to be, since the rc's stitch turns them into indexes. A third-party ref that an in-tree rebuild stamps over at build time, as the Harbor components and shadowbox are, is listed too and goes away on the rc. The lines that matter are the third-party refs no build replaces and refs that cannot be resolved; each of those fails the next rc until it is fixed or allowlisted. matchbox is listed too and does not matter: `build-amd64` rebuilds it as a two-arch index. The stitch names the images it skips in its own summary: an image with no `<tag>-arm64` twin, one whose digest is also pinned in a file the rewrite does not reach, and a pair that is not one amd64 and one arm64 image. matchbox (already an index) and the e2e sandbox (never built for arm64, and allowlisted) are skipped on every rc and pass the gate; any other skipped image fails it.
+
+### RC E2E — mandatory check before promotion
+
+For an rc, `prepare-release` must finish before `tags.yaml::rc-e2e` calls the published-tag lane, so the full suite tests the digest-pinned staging tree that promotion will reuse, and the release it runs against already carries its disk. `promote-rc.yaml::parse` then checks the latest `tags.yaml` push run whose `head_branch` is the rc tag and accepts it only when the reusable E2E job succeeded. GitHub exposes called-workflow job names as `E2E Release Candidate / E2E vX.Y.Z-rc.N (full suite)`, which the gate matches by the exact tag-bearing suffix.
+
+The alternate evidence path scans retained successful `workflow_dispatch` runs of `e2e-tag.yaml` and accepts one whose direct E2E job is named `E2E vX.Y.Z-rc.N (full suite)`. The workflow's run title is always `E2E Release Tag` and therefore cannot correlate the input tag; artifact names also carry the tag but expire independently, so the job name is the strongest available correlator. If Actions retention or manual deletion removes the run/job metadata, or that job is renamed without updating the matcher, the gate fails closed and tells the maintainer to run the E2E Release Tag button again. `skip_e2e_gate=true` is an emergency override, not alternate evidence: it writes a loud warning and a ⚠️ PR-body line.
+
+### Phase 2 — the changelog (generated at rc time or promotion, not here)
+
+The changelog for `vX.Y.Z` is produced by [`promote-rc.yaml`](../.github/workflows/promote-rc.yaml)'s `changelog` job (a thin call to the reusable [`changelog-generate.yaml`](../.github/workflows/changelog-generate.yaml)) and committed onto the `release-X.Y.Z` staging branch by `open-pr`, so it rides the promote PR and is on the base branch the moment the release publishes. Finalize then uses that file verbatim as the GitHub Release body. Generating it here — on the stable tag push — would be too late by construction: that tag is created by finalize, which has already published the release. It can also be produced earlier, at rc time, via the optional [`changelog-rc.yaml`](../.github/workflows/changelog-rc.yaml) button — which runs the same reusable core and commits the file to the `release-X.Y.Z-rc.N` staging branch, from which the promote-time `changelog` job copies it (validated) instead of regenerating.
+
+The `changelog` job runs **in parallel** with `promote`, detached at the rc tag (the "promotion" configuration in §2 of [`agents/changelog.md`](./agents/changelog.md)), using a separate **read-only** GitHub App token for the AI step so the model cannot mutate the repo even with `--allow-all-tools`. Every write — the commit onto the staging branch and the PR — happens in `open-pr` under a write-scoped token.
+
+Generation is deliberately **non-blocking**: a Copilot outage or exhausted token quota must never block a release. Only the AI step carries `continue-on-error`, and `open-pr` is gated on `promote` alone (`if: !cancelled() && needs.promote.result == 'success'`) so the promote PR opens regardless. When the changelog is missing the PR body says so explicitly — that ⚠️ line is the signal to act on.
+
+Recovery, in order of preference:
+
+1. Commit `docs/changelogs/vX.Y.Z.md` to the `release-X.Y.Z` branch by hand (follow [`agents/changelog.md`](./agents/changelog.md)). `promote` preserves it across a re-dispatch, and `open-pr` will not overwrite it with generated output.
+2. Re-dispatch `promote-rc.yaml` — generation runs again; anything already on the branch wins.
+3. Merge without one and let `tags.yaml::generate-changelog` (the backstop) open a changelog PR against `main` after the fact. The release is published with the draft's body until that merges.
+
+Known failure modes:
+
+- Copilot quota exhausted (`COPILOT_GITHUB_TOKEN` 402). Refill or rotate, then re-dispatch.
+- AI step timeout (hard 30-min cap).
+- Output truncated or whitespace-only — caught by the `Verify changelog` step (`hack/validate-changelog.sh`), which accepts either header convention (`# Cozystack vX.Y.Z` for a minor or `# vX.Y.Z (<date>)` for a patch), and requires the leading release-link comment pointing at `releases/tag/vX.Y.Z`, a `compare/...vX.Y.Z` link ending in this version, and at least one `## ` section — deliberately with no line-count floor, since a complete short patch changelog (v1.5.1 ships in 19 lines) must not be rejected as a fragment. It downgrades to the missing-changelog path rather than shipping a fragment as release notes.
+
+**`tags.yaml::generate-changelog` is the backstop.** It self-skips when the changelog is already on `main`. It earns its keep in two cases: generation failed during promotion, or the promote PR targeted `release-X.Y` so the file never reached `main`. Since the rc freeze the second case is **every** release, minor and patch alike — the promote PR always targets the release line (see [Regular Releases](#regular-releases)), which makes this backstop the only route by which a published changelog reaches `main`. In that case it **ports the reviewed file from the tag commit verbatim** rather than regenerating — a second AI pass there would spend quota and then overwrite already-published, already-reviewed release notes.
+
+### Phase 3 — `update-website-docs` (now the backstop)
+
+The `cozystack/website` "update managed apps reference" PR is normally opened **earlier, at promote time**, by [`promote-rc.yaml`](../.github/workflows/promote-rc.yaml)'s `website-docs` job — not here. That job fetches the README content from the `release-X.Y.Z` staging branch `promote` just pushed (via the website Makefile's `FETCH_REF` variable), so the docs are ready to review alongside the promote PR while the stable tag is still unborn. It refreshes the trunk version pins from the staging ref before promoting `next/` → `vX.Y/`, so a new minor's docs inherit fresh Talos/cozystack pins instead of a stale `next.yaml`. It is **non-blocking**: if it fails (or trips its `FETCH_REF`-support guard against a website checkout that predates that Makefile variable), the promote PR opens with a ⚠️ website-docs line and this tag-time job backfills the same branch.
+
+**Merge-timing contract:** the website PR must NOT be merged before the release is published (finalize). Merging it early flips the site's latest-version pointer to a version whose versioned docs and `openapi.json` are not on GitHub yet, so every version-pin and API link for the new version 404s. Both the website PR body and the promote PR body say so; park the website PR until the GitHub release for `vX.Y.Z` is live, then merge.
+
+This tag-time `update-website-docs` job stays as the **backstop**. It runs with `if: !cancelled() && needs.prepare-release.result == 'success'` (surviving a failed/skipped changelog phase, stopping on cancel), decides whether to promote `next/` → `vX.Y/`, runs `make update-all`, stages `content hugo.yaml data/versions`, and force-pushes the same `update-docs-vX.Y.Z` branch. On the normal path — where `promote-rc.yaml::website-docs` already did the work — it no-ops into "No changes to commit". At tag time the stable tag exists, so its `BRANCH=RELEASE_TAG` fetch resolves without needing `FETCH_REF`. For it to fire at all, finalize must push the stable tag with the **CI app token** (see [Phase 5](#phase-5--pull-requests-releaseyaml-finalize)) — a tag pushed with the default `GITHUB_TOKEN` triggers no workflow run.
+
+If anyone changes the website Makefile to write somewhere else (e.g. `static/`, `i18n/`), the `git add` list must grow in **both** jobs or the PR silently drops files.
+
+### Phase 4 — review and merge the promote PR
+
+Reviewer checklist for the `chore(release): promote vX.Y.Z-rc.N -> vX.Y.Z` PR:
+
+- [ ] The PR body says `✅ RC full e2e was verified`; if it says the gate was bypassed, obtain explicit maintainer acceptance or add `full-e2e` and wait for that opt-in run.
+- [ ] `Verify release packages candidate` is green. It pulls the candidate and original rc artifact by digest, compares the candidate to GitHub's prospective merge tree, and feeds the required `E2E Tests` status even when full E2E is not repeated. Do not edit `packages/` on this PR after generation; if the guard reports drift, re-dispatch promotion to create and pin a new run-specific candidate. Note what a green here does *not* cover: GitHub fires no `pull_request` event when the base branch advances, so a `packages/` change merged to the base afterwards is never re-verified on the PR. Finalize repeats the check against the real merge commit and catches that case before any stable name exists — but it catches it after the promote PR has already merged, so a `packages/` change landing on the base while a promote PR is open is worth holding back.
+- [ ] The PR body's **website-docs line** is present: if ✅, the `cozystack/website` docs PR is open and **parked** — do NOT merge it until `vX.Y.Z` is published (see [Phase 3](#phase-3--update-website-docs-now-the-backstop)); if ⚠️, the tag-time backstop will backfill it after finalize.
+- [ ] Diff is digest pins + image tags only — nothing else.
+- [ ] No accidental config drift (a value file you don't recognize).
+- [ ] If any chart bumped, check the new digest pulls — `crane manifest ghcr.io/cozystack/cozystack/<name>@<digest>` should return.
+- [ ] Build artifacts on the draft release page exist and match the expected count.
+- [ ] The PR includes `docs/changelogs/vX.Y.Z.md`, it has content, and the entries match the commit range (see [Changelog pre-publish verification](#changelog-pre-publish-verification)). If the PR body carries the ⚠️ "No changelog in this PR" line, resolve that before merging — finalize publishes this file as the release body.
+
+### Phase 5 — `pull-requests-release.yaml` (finalize)
+
+Fires on merge of a PR that is merged, carries the `release` label, and is authored by `cozystack-ci[bot]` (the last guard closes the "name a branch `release-X.Y.Z`, get it labelled, merge it" hole). Head branch must match `release-X.Y.Z[-suffix]`. This is where **every consumer-visible or write-once side effect of a promotion happens** — after the rc's mandatory E2E was checked at dispatch and the PR merged, making promotion transactional at stable names. Steps:
+
+1. **Verify the packages candidate before creating any stable tag.** [`hack/verify-promoted-packages.sh`](../hack/verify-promoted-packages.sh) pulls the candidate by the digest committed in installer values, proves it matches the merged `packages/` tree after normalizing only the impossible self-reference, rejects surviving rc image tags, then follows the candidate's embedded pre-push `platformSourceRef` back to the original rc artifact and compares normalized container `repo@digest` sets. Any package edit after candidate publication or any changed container digest aborts finalize while all stable names are still absent.
+2. **Create the tag at the merge commit** (write-once). The merge commit of `Prepare release vX.Y.Z` did not exist before the PR opened, so there is nothing to move — the tag is created here for the first time. A pre-existing tag at a different commit fails the step loudly rather than being force-moved (see [Tag immutability](#tag-immutability)). The checkout uses `persist-credentials: false` so this push authenticates as the **CI app** (via `git remote set-url`), not the default `GITHUB_TOKEN` — a `GITHUB_TOKEN` push creates no workflow run, so a persisted-credential push would silently skip `tags.yaml` entirely and its stable-tag backstops (`generate-changelog`, `update-website-docs`) would never fire.
+3. **Cut the `api/apps/v1alpha1/vX.Y.Z` Go-module tag** (write-once, stable only) at the same commit, so Go consumers of `api/apps/v1alpha1` get the release. Moved here from `tags.yaml`, whose `prepare-release` body is skipped for a promoted stable (the draft already exists).
+4. **Ensure the maintenance branch `release-X.Y` exists** at the tag commit. Since the rc freeze creates it, this is normally a no-op fast-forward — the merge commit is already the branch tip. Still created if missing; updated fast-forward-only — a non-fast-forward update warns and is left for a maintainer rather than being force-updated.
+5. **Publish the draft release**, with `docs/changelogs/vX.Y.Z.md` from the merge commit as its body (an absent or whitespace-only file warns and leaves the draft's body in place, rather than publishing blank notes). `make_latest` is computed against published-non-prerelease tags: prereleases stay `false`; tags older than the current max stay `false` (and the current max is force-restored to `latest` if necessary, so an older patch tag cut after a newer minor won't downgrade `latest`).
+6. **Retag the verified packages candidate and rc container images to stable** by digest (`hack/promote-retag.sh`, no container rebuild) and **publish the stable `cozy-installer` chart**. `:latest` (on both the images and the chart) moves only when this release's `make_latest` was `true` — the same decision as step 5, so the release's `latest` and the images' `:latest` never disagree. The chart is packaged with `platformVersion` stamped into its default values so the documented `helm --install --version X.Y.Z` path reports the stable version.
+
+### Phase 6 — `update-releasenotes.yaml` (sync GitHub Release body)
+
+Fires on pushes to `main` that touch `docs/changelogs/v*.md`. Reads each `docs/changelogs/vX.Y.Z.md` and PATCHes the matching GitHub Release's `body` if it differs. Since Phase 5 now sets the body directly from the merge commit, this is no longer on the critical path — it covers later **edits** to a published changelog, the backstop PR landing a changelog that reached `main` after the fact, and manual re-syncs via `workflow_dispatch`. It only watches `main`, which is why finalize (not this job) is what populates a release promoted onto `release-X.Y` — since the freeze, that is every release rather than only a patch.
+
+## Stable tags come from rc promotion
+
+A stable `vX.Y.Z` is created only by **promoting an existing release-candidate** that already passed e2e — never by rebuilding and never by a cron.
+
+- [`promote-rc.yaml`](../.github/workflows/promote-rc.yaml) is triggered manually once an rc has gone green. It rewrites the rc version substring in the vendored image tags (the container digests stay the rc's), commits and publishes the resulting declarative packages tree under a unique run-specific `promotion-*` tag, commits that digest pin, and opens the `release-X.Y.Z` staging PR. The PR gate verifies the candidate against the prospective merge and original rc artifact; finalize repeats that check before creating the write-once stable tag at the merge commit, then retags the verified packages artifact and rc's already-built, e2e-passed container digests to the stable tag **by digest** (no container rebuild — see [`hack/promote-retag.sh`](../hack/promote-retag.sh)) and publishes the release. An abandoned promotion leaves no stable-named bytes; its temporary candidate is retention-managed.
+
+So a commit on a supported `release-X.Y` line ships when a maintainer promotes the next rc for that line — not automatically within 24h. Pushing a stable `vX.Y.Z` tag by hand is **not** a supported path: `tags.yaml` fails fast on a stable tag that has no pre-existing draft ("stable tags come from promote-rc.yaml"), and even so the finalize step would refuse to move a pre-existing tag. Pre-releases (`vX.Y.Z-rc.N`, `-alpha.N`, `-beta.N`) are cut with the [`Cut Pre-release Tag`](../.github/workflows/cut-prerelease.yaml) workflow, which pushes the tag as the CI app; [`tags.yaml`](../.github/workflows/tags.yaml) then fires on that push, builds it, and publishes the pre-release. Cutting via the workflow (rather than a manual `git push`) is what lets repo admins lock `v*` tag creation to the CI app — see the tag-protection note below.
+
+## Nightly builds
+
+A nightly is an **installable copy of `main` on GHCR — not a rebuild and not a release**. [`build-main.yaml`](../.github/workflows/build-main.yaml) already builds every push to `main` into the CI registry (OCIR); the nightly promotes that build to the public release registry (GHCR) and proves it installs.
+
+[`nightly.yaml`](../.github/workflows/nightly.yaml) runs daily (gated by the `NIGHTLY_ENABLED` repo variable) as three jobs; build-disk and e2e both start once mirror has finished:
+
+1. **mirror** — resolve the exact commit `cozystack-packages:main` was built from, then [`hack/nightly-mirror.sh`](../hack/nightly-mirror.sh) copies every cozystack-owned component image OCIR→GHCR **by digest** (bit-for-bit, no rebuild) and re-publishes the rewritten `cozystack-packages` artifact and the `cozy-installer` chart to GHCR, tagged `0.0.0-nightly.<YYYYMMDD>.<run-id>.<attempt>` plus a floating `nightly`.
+2. **build-disk** — assemble the Talos `nocloud` disk from the upstream siderolabs imager (the profile references only `ghcr.io/siderolabs/*`, so this needs no cozystack image and no rebuild) and publish it as a GHCR OCI artifact (`cozystack-nocloud`) so a nightly is installable on real hardware. The nightly e2e does not boot it.
+3. **e2e** — stage the published GHCR closure (rewritten tree + the `cozy-installer` chart pinned to the GHCR packages artifact) and run the **full** app suite on Talos containers, which do not boot the disk. A nightly has no diff, so Test Impact Analysis does not apply.
+
+No GitHub release and no `api/apps/v1alpha1/*` Go-module tag are created for a nightly. [`retention.yaml`](../.github/workflows/retention.yaml) prunes old GHCR nightly versions (keeps the newest 14 per package the current nightly publishes, named from the published `cozystack-packages:nightly` tree by [`hack/retention-packages.sh`](../hack/retention-packages.sh), except packages linked to another repository, which are skipped with a warning; the floating `nightly`, release tags and untagged versions are never touched) and abandoned packages candidates. A candidate version is eligible only when all of these hold: it carries at least one tag and **every** tag on that manifest matches the strict `promotion-vX.Y.Z-from-vX.Y.Z-rc.N-run-<run-id>-<attempt>` form, so a manifest that has been retagged stable is excluded; it was last updated more than 30 days ago; its digest is not pinned by `packages/core/installer/values.yaml` at the head of an **open** pull request that is same-repository, authored by `cozystack-ci[bot]`, on a `release-X.Y.Z` branch and carrying the `release` label; and its digest is not pinned by that same file at the tip of `main` or of any `release-X.Y` branch — which is what keeps a candidate safe between the promote PR merging and finalize retagging it. Any such PR head whose pin is not exactly one `digest=sha256:<64 hex>` stops the candidate sweep for that run and fails the job, without affecting the nightly sweep.
+
+Install a nightly:
+
+```bash
+helm upgrade --install cozystack \
+  oci://ghcr.io/cozystack/cozystack/cozy-installer --version 0.0.0-nightly.20260626.15992304129.1
+# ...or --version nightly for the latest
+```
+
+The matching Talos node image is `ghcr.io/cozystack/cozystack/cozystack-nocloud:0.0.0-nightly.20260626.15992304129.1` (pull with `oras`).
+
+## Backports
+
+### The backport bot
+
+[`backport.yaml`](../.github/workflows/backport.yaml) wraps [`korthout/backport-action`](https://github.com/korthout/backport-action) and fires on a merged `main`-targeted PR carrying one of:
+
+| Label | Target branch |
+|-------|---------------|
+| `kind/backport` | the newest existing `release-X.Y` branch |
+| `kind/backport-previous` | the second-newest existing `release-X.Y` branch |
+
+Resolution is dynamic at run time, and it reads the branches themselves: the job lists the repository's branches, keeps the ones matching `release-<major>.<minor>`, and sorts them numerically descending — so `release-1.10` ranks above `release-1.9`, which a lexicographic sort gets backwards. `backport` takes the first, `backport-previous` the second, so both name a branch that exists by construction; asking for `backport-previous` when only one line exists fails the job rather than inventing a target. Nothing is derived arithmetically — an earlier version computed the previous line as `Y-1`, which named a non-existent branch whenever a minor was skipped.
+
+**During a freeze window the newest line is the one being stabilised, not the last published one.** `release-X.Y` is created when the first `vX.Y.0-rc.1` is cut, before `vX.Y.0` is published, so from the freeze until the release `backport` targets the release being stabilised and `backport-previous` targets the last published stable. That is the intent: the frozen branch is the only way into the upcoming release, which is when backports matter most. The trade-off is that for the length of the window the line one step further back has no label pointing at it, so a fix that has to reach it before the new release publishes must be cherry-picked by hand.
+
+The bot creates a backport PR with title `[Backport release-X.Y] <original title>`. When this PR merges, the title prefix used to re-trigger the bot through `pr-labeler.yaml`, which auto-applied `backport` to any `[Backport release-X.Y]`-titled PR. Combined with the org-level `dosubot` re-applying the label, this caused recursive backports.
+
+The fix (PR #2584): both job `if:` blocks gate on `github.event.pull_request.base.ref == 'main'`. Backport PRs target `release-X.Y`, so they cannot satisfy this — architectural protection, regardless of which bot relabels them.
+
+### When the bot fails
+
+If the run triggered by the merge dies without opening a backport PR, look for a run of this workflow that has not finished before retrying — `gh run list --workflow backport.yaml --branch <the PR's head branch>` — and clear it, because the retry queues behind it rather than replacing it. Do not filter by status: a run whose jobs are waiting for a runner, or which is held behind the concurrency group, is not `in_progress`, and filtering it out is how you conclude nothing is running. `--branch` narrows the list but does not identify the PR, since head branch names are not unique across forks and `gh run list` has no PR filter, so confirm which PR a run belongs to before cancelling it or you cancel someone else's backport. If cancelling does not clear the run it holds the group until GitHub retires it and the retry keeps queueing; that case has not been exercised here. A run whose jobs have all finished can still sit `in_progress`, which looks the same from the PR as a run that died. Then remove whichever backport label the PR already carries and add it back: a label event is the only other trigger, and it qualifies on the label it carries, so re-applying it is what starts a fresh attempt.
+
+Conflicting cherry-picks produce a draft PR via `conflict_resolution: draft_commit_conflicts`. Look for the bot's comment with the merge-conflict diff. You either:
+
+- Resolve in the draft branch and undraft, or
+- Drop the bot's branch and cherry-pick manually:
+
+```bash
+git checkout release-X.Y
+git cherry-pick -x -s <commit-sha>
+# resolve conflicts
+git commit -s
+git push origin release-X.Y  # or push to a new branch and open a PR
+```
+
+To find the bot's failed comments across a batch of PRs:
+
+```bash
+for n in $(gh pr list --search "label:kind/backport label:kind/backport-previous merged:>=2026-01-01" --json number --jq '.[].number'); do
+  echo "=== #$n ==="
+  gh pr view $n --json comments --jq '.comments[] | select(.author.login == "github-actions" or (.author.login | contains("backport"))) | .body' | head -20
+done
+```
+
+Before [PR #3155](https://github.com/cozystack/cozystack/pull/3155), `conflict_resolution` was passed outside `experimental`, so a conflicting cherry-pick used the `fail` fallback and left only a "Backport failed" comment on the source PR. No draft backport PR was opened. When [`backport-audit`](../cmd/backport-audit/README.md) reports `MISSING`, check those comments and the workflow logs to establish why the change did not arrive.
+
+### Cherry-pick triage before a patch
+
+A patch release includes bugfixes for code that shipped in the corresponding minor `vX.Y.0`. Use:
+
+```bash
+# 1. Audit what was labeled for this line and has NOT landed on it.
+#    Exits non-zero when anything is outstanding; see cmd/backport-audit/README.md.
+go build ./cmd/backport-audit
+./backport-audit release-X.Y
+
+# 2. List commits on main since the release branch diverged that are NOT yet on release-X.Y
+git merge-base origin/main origin/release-X.Y
+git log <base>..origin/main --grep="(#" --oneline
+
+# 3. Open PRs that may need labeling before the cut
+gh pr list --state open --base main --label kind/bug
+```
+
+Step 1 covers the currently labeled work: [`backport-audit`](../cmd/backport-audit/README.md) assigns each request to the release line selected at merge time, then checks whether its commits reached the branch. Incomplete delivery, open or dropped backports, missing changes and duplicate open claims fail the gate. Late-added labels can disagree with the bot's target, and branch-opening dates are estimated from rc tags; see the audit's documented limits before deciding what to backport. Steps 2 and 3 cover changes that were never labeled.
+
+**Include rule:**
+
+- `kind/bug` — especially destructive (data loss, crash-loop, OOM, eviction).
+- `area/security` / CVE.
+- Narrow chart fixes whose blast radius is contained (e.g. one operator's resources).
+- Patch-line-policy-matching dependency bumps (e.g. cilium 1.X.Y → 1.X.(Y+1) on a `release-A.B` shipping cilium 1.X — never a minor bump, only a patch within the line the branch already ships).
+
+**Skip rule:**
+
+- `kind/feature` — even with `lgtm`. A patch release is not a delivery vehicle for features.
+- CI-only changes (`area/ci`, test infrastructure).
+- Docs-only changes (those land via `update-website-docs` automatically).
+- Large multi-package dependency churn (Dependabot Go-deps bumps).
+- PRs whose conventional-commit type is `!` (breaking) or that mix `feat` with `fix`.
+
+**Borderline cases:**
+
+- Large refactors with `lgtm` AND an obvious bug payload — prefer extracting the bug fix into a narrower commit and backporting only that.
+- PRs labeled both `kind/bug` and `kind/feature` — split them.
+
+### Backporting code that touches monotonic counters
+
+Migrations are the canonical case. `packages/core/platform/images/migrations/run-migrations.sh` is a linear counter — it runs `seq $CURRENT_VERSION $((TARGET_VERSION - 1))` and stops if `CURRENT >= TARGET`. This creates a forward-upgrade trap. Walking through it with `release-1.2` as the maintenance branch:
+
+- `main` has `targetVersion=10` and migrations 1–9 on disk.
+- The `release-1.2` branch was cut when `targetVersion=5` (migrations 1–4 on disk).
+- You backport a new migration to `release-1.2` at slot 5, and naively bump `targetVersion` 5 → 6 to enable it.
+- Customer running 1.2.x runs the new migration, stamps `cozystack-version=6` in-cluster.
+- On upgrade to 1.3 (main's `targetVersion=10`), the runner walks `seq 6 9` and runs main's migrations 6–9 — **main's own migration at slot 5 never runs.** The backport claimed that slot on `release-1.2`; main's slot 5 holds an unrelated migration that gets silently skipped.
+
+Mitigations, in order of preference:
+
+1. **Don't bump `targetVersion` in the backport.** Just ship the migration file. Prior precedent in the repo: an earlier maintenance branch's ACME backport did exactly this — the migration shipped but ran on no clusters until a later commit raised the counter. Pair this with relaxing the chart-side `{{ fail }}` guard on the maintenance branch (chart-side coalesce) so the new value works without the migration having executed.
+2. **If you must bump,** add an idempotent duplicate of the now-skipped main migration at a higher slot. Bounded cost (one extra file per affected migration) and survives the skip window.
+3. **Audit cross-branch counter state before deciding.** Compare migration numbering across `main`, `release-X.Y`, and `release-X.(Y-1)`. If a backport would create a skip window on any forward-upgrade path, choose option 1.
+
+This rule generalizes to any monotonic-counter state: schema versions, feature-flag generations, anything that gates "have I run X yet?" with a single integer.
+
+## Changelogs
+
+### Where the canonical process lives
+
+[`agents/changelog.md`](./agents/changelog.md) is the source of truth. Read it end-to-end before generating; do not infer the process from past commits or memory. The CI runs it under Copilot via the reusable `changelog-generate.yaml` — called by `promote-rc.yaml::changelog` at promote time and by the optional `changelog-rc.yaml` at rc time — and, as a backstop, `tags.yaml::generate-changelog`; locally the same prompt is replayable by following the doc directly.
+
+### Common changelog failure modes
+
+These are mistakes that have shipped in real changelogs. Verify against each before merging the changelog PR.
+
+**1. Commits from outside the release range.** Caused by running `git log <prev>..HEAD` from `main` while generating a patch changelog — `HEAD` on `main` contains everything that landed since the tag plus backports merged to `release-X.Y` after the tag was cut. Use `git log <prev>..<new_tag>` explicitly. The doc was updated to require this after v1.3.1's changelog shipped with 14 entries for what was actually a 1-commit release.
+
+**2. Original + backport listed as two separate entries.** Each backport must coalesce with its original into a single entry of the form `(in #orig, backport #bp)`. To verify after generation:
+
+```bash
+# Every entry that mentions "backport" should also reference the original PR number
+grep -E 'backport #[0-9]+' docs/changelogs/v<new>.md | grep -v '#[0-9]*, backport'
+```
+
+Output should be empty.
+
+**3. Wrong PR author.** The squash-merge commit's author is whoever clicked "Merge" — not the person who wrote the code. **Always** resolve via `gh pr view <N> --json author --jq .author.login`, never `git log --format=%an`. This bites hardest for website-repo entries where the same merger handles most PRs.
+
+**4. Superseding patch, stale changelog.** Tags are write-once, so a critical fix after `vX.Y.Z` ships as the next patch `vX.Y.(Z+1)` rather than moving the tag. If a changelog PR already exists for a tag you are superseding, the changelog work transfers to the new patch. Compare `git log <prev>..<new>` against what the existing `changelog-vX.Y.Z` branch already documents; only add/remove the deltas. If the only new commits are CI-internal or a revert of a feature that never reached a stable tag, no changelog edit is needed.
+
+**5. PR numbers swapped inside prose.** The entry-format validator checks bullet entries but ignores Feature Highlights paragraphs and Upgrade Notes. Both have caused wrong PR references in shipped changelogs. Verify every `#NNNN` in prose with `gh pr view <N>`.
+
+**6. Hallucinated entries.** Every entry must correspond to a commit in `git log <prev>..<new>`. Verify by extracting PR numbers from the file and grep-searching the commit range:
+
+```bash
+grep -oE '#[0-9]+' docs/changelogs/v<new>.md | sort -u | while read pr; do
+  n=${pr#\#}
+  if ! git log <prev>..<new> --grep="#${n}" --oneline | grep -q .; then
+    echo "PR $pr in changelog but not in commit range"
+  fi
+done
+```
+
+**7. Bot accounts as human contributors.** `cozystack-ci[bot]`, `github-actions`, `dependabot`, `renovate`, and any `app/*` login must NOT appear in the `## Contributors` list. They legitimately appear in **per-entry attribution** (e.g. a Renovate-authored PR) — but not in the human roll-call.
+
+**8. Title duplicated as description.** `* **fix(foo): X**: fix(foo): X (...)` means you wrote the conventional-commit subject twice and never wrote a user-facing description. The brief and the detail must say different things — the detail explains what the change means for users.
+
+### Changelog pre-publish verification
+
+Run these checks before merging the changelog PR. Catches problems in roughly the order they occur:
+
+```bash
+PREV=v1.2.0; NEW=v1.2.1
+
+# A. Every chart bump is mentioned somewhere in the changelog
+git diff --name-only $PREV..$NEW -- 'packages/*/charts/*/Chart.yaml' 'packages/*/*/charts/*/Chart.yaml' | while read f; do
+  old=$(git show "$PREV:$f" 2>/dev/null | yq '.version // ""')
+  new=$(git show "$NEW:$f" 2>/dev/null | yq '.version // ""')
+  if [ "$old" != "$new" ]; then
+    component=$(basename "$(dirname "$f")")
+    if ! grep -qi "$component" docs/changelogs/$NEW.md; then
+      echo "MISSING: $component $old -> $new ($f)"
+    fi
+  fi
+done
+
+# B. Out-of-Chart.yaml pins (Talos, tenant K8s, vendored images)
+for path in packages/core/talos/values.yaml packages/core/installer/values.yaml packages/apps/kubernetes/values.yaml; do
+  git diff $PREV..$NEW -- "$path" | head -40
+done
+git diff --name-only $PREV..$NEW -- 'images/*/Dockerfile'
+
+# C. Every cited #NNNN exists and is a merged PR (not an issue)
+grep -oE '#[0-9]+' docs/changelogs/$NEW.md | sort -u | sed 's/#//' | xargs -P 20 -I{} sh -c '
+  state=$(gh api /repos/cozystack/cozystack/issues/{} --jq ".pull_request.merged_at // \"ISSUE\"" 2>/dev/null)
+  echo "#{} $state"
+' | grep -E 'ISSUE|null|^#[0-9]+ $'
+
+# D. URL liveness
+grep -oE 'https://[^)" ]+' docs/changelogs/$NEW.md | sort -u | xargs -P 10 -I{} sh -c '
+  code=$(curl -s -o /dev/null -w "%{http_code}" {})
+  if [ "$code" != "200" ]; then echo "$code {}"; fi
+'
+
+# E. Website PR authors are PR authors, not commit authors
+grep -oE 'cozystack/website#[0-9]+' docs/changelogs/$NEW.md | sort -u | sed 's|cozystack/website#||' | while read n; do
+  pr_author=$(gh pr view $n --repo cozystack/website --json author --jq .author.login)
+  echo "website#$n -> @$pr_author"
+done
+
+# F. Working tree clean except for the changelog
+git status --porcelain | grep -v "docs/changelogs/$NEW.md"
+# Should output nothing.
+```
+
+Ship criterion: every chart bump surfaced, no issue-cited-as-PR, no 404 URLs, every website entry attributed via `gh pr view` (not commit author), `git status` shows only the changelog.
+
+### Cozystack-specific URL quirks
+
+`cozystack.io` paths are versioned: `/docs/operations/foo/` and `/docs/next/foo/` both 404. Only `/docs/vX.Y/foo/` and the unversioned canonical `/docs/foo/` serve content. AI-generated changelogs invent the unversioned form. Verify URLs with the `curl` loop above.
+
+### Platform-component coverage
+
+For a minor release (`vX.Y.0`), changelog entries should surface what an upstream chart bump actually brought in — features, breaking changes, security fixes. PR commit messages usually don't capture this; the upstream `CHANGELOG.md` or GitHub Release notes do. For each bumped `Chart.yaml`:
+
+1. Read the `sources:` field — typically a GitHub URL.
+2. Fetch release notes strictly inside `old < x <= new` via `gh release view <tag> --repo <owner>/<repo> --json body,name`.
+3. Summarize in 2–5 user-impact bullets per component (new features, breaking changes, CVEs, important deprecations). Don't reproduce upstream notes verbatim; link to them.
+4. If a PR-level entry already mentions the bump, enrich that entry with bullets — don't duplicate the entry.
+5. If 3+ bumps have no PR-level mention, introduce a `## Platform Components` section.
+
+If you can't find upstream notes for a bumped component, list it with version-only info and no bullets. Hallucinated bullets are worse than missing detail.
+
+## Release-time fires — what's gone wrong recently
+
+These are real regressions that escaped to users. The pattern in each: code passed CI, shipped in a stable release, broke customers. Read them as a working list of pre-release verification gaps.
+
+### v1.3.0 — cert-manager ingressClassName regression (fix #2562)
+
+**Bug:** A commit migrated ACME HTTP-01 to use the modern `acme.cert-manager.io/http01-ingress-ingressclassname` annotation. The matching ingress-shim code that reads that annotation was added by cert-manager upstream PR #8244 and was **never backported** to the `release-1.19` branch — but cozystack 1.3.0 shipped cert-manager v1.19.3. The annotation was silently dropped at runtime and every solver Ingress fell back to the ClusterIssuer's default class `tenant-root`. Let's Encrypt validation broke for every tenant whose `publishing.ingressName != tenant-root`.
+
+**Blast radius:** v1.3.0, v1.3.1, and v1.1.7 (the migration was cherry-picked to `release-1.1`).
+
+**Why CI missed it:** the migration commit was self-contained and `helm template` rendered cleanly. There was no E2E that creates a tenant with a non-default ingress class and watches a real Let's Encrypt cert issue. Verification had been done from the docs side ("the API has been available since cert-manager 1.12"), not against the shipped cert-manager source.
+
+**Would have caught it:** non-root-tenant E2E with LE-staging cert issuance, asserting the solver Ingress lands on the tenant's class.
+
+### v1.4.0 — kubevirt-instancetypes upgrade failure (fix #2612)
+
+**Bug:** `packages/system/kubevirt-instancetypes/Makefile` contained `sed -i '/persistent: true/d' templates/preferences.yaml`, which stripped the only child of `preferredTPM`, leaving `preferredTPM:` (null) in six Windows preferences. KubeVirt v1.6.x silently accepted it. The v1.6.3 → v1.8.2 operator bump (2026-04-27) hardened the CRD's OpenAPI schema and started rejecting null for an object-typed field. `helm upgrade` then failed on every cluster with `kubevirt-instancetypes` enabled.
+
+**Why CI missed it:** the kubevirt-operator bump and the inert `preferences.yaml` were two weeks apart in commit history. CI only tests fresh installs against the new CRDs; it doesn't run `helm upgrade` from prior versions. Schema regression on a vendored asset that hadn't been touched in 18 months.
+
+**Would have caught it:** `helm template <new chart> | kubectl apply --dry-run=server -f -` against the freshly-installed CRDs of every bumped operator. Or an upgrade-from-N-1 E2E lane.
+
+### v1.4.0 — Flux 2.7 → 2.8 readiness deadlock (#2602)
+
+**Bug:** helm-controller v1.5.0 (shipped in Flux 2.8) changes the default wait strategy to kstatus polling, which polls **every applied resource including child HelmReleases**. The `packages/apps/kubernetes` umbrella has 19 child HRs that each `dependsOn: parent` (with a `lookup` guard so the dependency only activates after the parent exists). Pre-2.8: parent went Ready as soon as Helm returned. Post-2.8: parent waits for children, children wait for parent. Deadlock.
+
+**Why CI missed it:** the cycle only manifests on the second reconcile (parent exists, so the `lookup` activates the child's `dependsOn`). Fresh-install E2E dodges this — the parent-already-exists branch isn't taken on the first apply.
+
+**Would have caught it:** apply-mutate-reapply E2E (any chart bump in the kubernetes umbrella triggers a second reconcile). Plus an explicit PR-template requirement: for any flux/helm-controller bump, paste the upstream breaking-changes section into the PR body.
+
+### Patterns these share
+
+1. **Fresh-install CI is insufficient.** All three regressions passed fresh-install lanes.
+2. **Upstream breaking-defaults bumps are the common shape.** kubevirt CRD hardening, helm-controller default wait strategy, cert-manager API surface drift. Pre-merge reading of upstream changelogs would have caught two of three.
+3. **One-engineer-bitten-once is the only safety net for live verification.** The cert-manager bump PR included an explicit live-cluster verification step — because the same engineer had been bitten the prior week. There is no checklist requiring it.
+
+## Pre-release verification checklist
+
+For RCs and final releases, run this before merging the release PR. Each item is here because something has shipped without it and broken users.
+
+- [ ] **The published rc passed mandatory full E2E.** Confirm the promote PR says `✅ RC full e2e was verified`; the normal promote PR itself runs no E2E. Add `full-e2e` manually only when a repeat is required, and treat a ⚠️ bypass line as an explicit release-risk decision.
+- [ ] **Upgrade from previous patch** (`vX.Y.(Z-1)`) on a real cluster. `helm upgrade` succeeds, all HelmReleases reach Ready, no CRD schema rejections.
+- [ ] **Upgrade from previous minor** (`v(X-1).Y.0`) for RC and minor releases. Same assertions.
+- [ ] **At least one tenant with `publishing.ingressName != tenant-root`** and a real Let's Encrypt-staging cert issuance.
+- [ ] **Apply-mutate-reapply** on the kubernetes umbrella HelmRelease (catches second-reconcile bugs).
+- [ ] **For every CRD-source bump** (kubevirt, cert-manager, flux, cilium, kamaji): `helm template | kubectl apply --dry-run=server` against the freshly-installed CRDs.
+- [ ] **For every flux / helm-controller / kubevirt-operator / cert-manager bump:** paste the upstream breaking-changes section of the bump's CHANGELOG into the PR body before merge.
+- [ ] **After cutting the tag,** watch `pull-requests-release.yaml::Finalize Release`. If it fails on `Draft release for v... not found`, undraft the release manually and file the workflow regression — this has been a known recurring failure since the `Publish draft release` step lost its explicit `github-token` in refactor `66a756b6`.
+- [ ] **The promote PR carries `docs/changelogs/vX.Y.Z.md` and it was verified** per [Changelog pre-publish verification](#changelog-pre-publish-verification). Finalize publishes this file as the release body, so verifying it before merge is verifying the release notes.
+- [ ] **The `cozystack/website` docs PR stays parked until publish.** Promotion opens it early; merging it before the GitHub release for `vX.Y.Z` is live 404s the new version's docs and API links. Merge it right after finalize publishes the release (regular-release step 6, patch step 7).
+
+## CI failures release engineers commonly hit
+
+| Symptom | Class | Diagnosis | Block release? |
+|---------|-------|-----------|----------------|
+| `Draft release for vX.Y.Z not found` on every release-* merge | Workflow regression — `Publish draft release` lost its `github-token` in a past refactor; default `GITHUB_TOKEN` cannot list drafts | At `pull-requests-release.yaml:163`. Undraft manually, file the fix | No |
+| Changelog Copilot job returns 402 | Token quota — `COPILOT_GITHUB_TOKEN` premium-request quota empty | Both changelog entry points hit it: the optional rc-time `changelog-rc` dispatch and the promote-time `changelog` job (both call the reusable `changelog-generate.yaml`), plus the `tags.yaml` backstop | No — `continue-on-error: true` on the AI step, generate changelog by hand following [`agents/changelog.md`](./agents/changelog.md) |
+| `Prepare Release` skipped and the run red, `Build arm64 images` failed | The rc's arm64 build failed | Read the `build-arm64` log; `build-arm64-nightly.yaml` usually failed the same way first. Fix on the line, cut the next rc | Yes — an rc is not published amd64 only |
+| `Stitch multi-arch indexes and republish` fails listing refs | `verify-multiarch.sh` found refs that are not amd64+arm64 indexes, or that it could not check | Each listed ref names its reason. Single-platform manifest or index without one architecture: make the image multi-arch, or allowlist its repository with a reason if it cannot be. Manifest unreadable: correct the ref or digest; the allowlist does not excuse it. Rate-limited or unavailable after 3 tries: re-run once the throttle clears | Yes |
+| E2E `kubernetes-test` fails with `CSINode does not contain driver csi.kubevirt.io` | Test ordering bug | Tenant's `kubernetes-${test_name}-csi` HelmRelease still installing when NFS PVC is created. Fix: wait for `csinode/<node>` to advertise the driver before creating the PVC | Yes — flaky and masks real CSI bugs |
+| `tenant-root` HR in perpetual upgrade-rollback loop after OIDC patch | Real bug at the intersection of #2602's readiness change and the cozystack reconcile cadence | Look for `rate: Wait(n=1) would exceed context deadline` in operator logs; multiple tenant child HRs stuck `InProgress` | Yes |
+| `cozy-dashboard` ImagePullBackOff from `cozystack-ui:latest` | Registry flake | Known noisy on some OCI mirrors; not currently in the prepull set | No — retry |
+| PR CI: `docker push` 409 on `:latest` for the same image across two PRs | Concurrent manifest race on a shared floating tag | The `:latest` tag was previously written by every `make image` regardless of PR. Resolved by the image-tag refactor (`IMAGE_TAG=pr-<N>-<sha>` in PR builds, `IMAGE_TAG=<ref_name>` only at release time) | No — `gh run rerun --failed` |
+
+**Heuristic:** workflow-token and Copilot-quota issues are out-of-band — release the tag, fix the workflow in a follow-up PR. Test ordering bugs and tenant-root reconcile storms are real and should block.
+
+If you find yourself doing the same manual fixup on two consecutive releases (e.g. "undraft the release"), open a workflow-regression issue. Workflow bugs with known manual workarounds rot silently for months.
+
+## Tag immutability
+
+Published tags are **write-once** — once a `vX.Y.Z` or rc tag is pushed it is never moved or deleted. (Nightlies are not git tags at all — they are GHCR OCI tags, see [Nightly builds](#nightly-builds).) Moving a tag silently poisons the Go module proxy / pkg.go.dev cache for `api/apps/v1alpha1/vX.Y.Z` and drifts SBOM/provenance toolchains, so the release flow is built so a move is impossible by construction:
+
+| File | Tag / branch handling |
+|------|------------------------|
+| [`pull-requests-release.yaml`](../.github/workflows/pull-requests-release.yaml) | Verifies the pinned packages candidate before creating a stable name. Creates `vX.Y.Z` at the PR merge commit **write-once** (create if absent, no-op if unchanged, fail loudly if it would move — the merge commit is new, so there is nothing to move). Cuts the `api/apps/v1alpha1/<vTAG>` Go-submodule tag write-once at the same commit, **stable only** (never rc/beta/alpha). The `release-X.Y` maintenance branch is fast-forward-only. Retags the verified packages artifact and rc container digests to the stable image tag (also write-once at the image level). |
+| [`tags.yaml`](../.github/workflows/tags.yaml) | The `release-X.Y.Z-rc.N` staging branch is a mutable staging ref (compare-before-force: skipped when unchanged, force+log only when it genuinely moves). Fails fast on a stable `vX.Y.Z` tag with no pre-existing draft — stable tags come from `promote-rc.yaml`, never a hand push. |
+| [`promote-rc.yaml`](../.github/workflows/promote-rc.yaml) | Mutates no stable tags. Before staging, verifies green full E2E from the latest rc tag-push run or a tag-correlated manual published-tag run (unless loudly bypassed). Commits and publishes the rewritten packages tree under a run-specific temporary `promotion-*` tag, adds a second commit pinning its digest on the `release-X.Y.Z` branch, generates the changelog there, and opens the promote PR with `release` but no automatic `full-e2e`; the PR gate verifies the candidate and finalize repeats that verification before the stable tag and image retag. The staging branch is force-pushed on re-dispatch, but an existing `docs/changelogs/vX.Y.Z.md` is preserved across the rebuild. |
+
+This is the immutable-tag + rc-promotion model from [#2677](https://github.com/cozystack/cozystack/issues/2677): stable `vX.Y.Z` is created only by promoting an existing rc, rc tags are write-once, and `api/apps/v1alpha1/vX.Y.Z` is created only on a stable release. The old nightly `auto-release.yaml` (which delete-recreated auto-bumped patch tags) has been removed. rc and stable tags accrete permanently; the only churning artifacts are GHCR nightlies and abandoned temporary promotion candidates, which [`retention.yaml`](../.github/workflows/retention.yaml) prunes (see [Nightly builds](#nightly-builds)) — GHCR storage is the cost vector to watch.
+
+### Repo-side enforcement (tag-protection rulesets)
+
+The guarantees above are enforced in the workflows. Repo admins back them with two GitHub **tag rulesets** targeting `v*`:
+
+- **Immutability** — *Restrict updates* + *Restrict deletions*, **no bypass**. No actor (not even the CI app) can move or delete a shipped `v*` tag. Safe to enable at any time: nothing in the release flow ever moves or deletes a `v*` tag, it only creates new ones.
+- **Creation control** — *Restrict creations* with the **CI app as the sole bypass actor**, plus *Limit branches/tags updated in a single push* = 1. This turns "don't hand-push tags" from convention into hard enforcement: every `v*` tag — pre-release **and** stable — can then be created only by CI. Enable this **only after** [`cut-prerelease.yaml`](../.github/workflows/cut-prerelease.yaml) is in use, since that workflow is what makes CI the sole creator of pre-release tags; enabling it earlier would lock maintainers out of cutting rc/alpha/beta. (The Go-module tag `api/apps/v1alpha1/*` gets an equivalent pair of rulesets.)
+
+## Splitting a release-blocking bundle PR
+
+Sometimes the work that has to land before a release is a 40-commit grab bag (CI stabilization, dependency bumps, chart fixes). Splitting it makes it reviewable and survivable. The strategy that has worked:
+
+1. **Verify what's already on `main`.** Use `git merge-base --is-ancestor` and subject grep to drop commits that have already landed.
+2. **Find existing open PRs that cover the same commits.** Force-push to the existing branch instead of opening a duplicate — preserves review threads.
+3. **Identify the "bottleneck" PR.** The one whose changes make previously-silent misconfigurations into hard errors (typically an operator-version bump). Everything else can fan out in parallel.
+4. **Squash iterative same-author bug-on-bug fixes** inside each split. Preserve authorship via `--author` on the squashed commit.
+5. **Mark the keystone PR as draft** and link in the body to the dependency PRs. Reviewers know it intentionally fails CI until the chain lands.
+6. **Beware of concurrent registry pushes.** When fanning out 5+ PR CI runs simultaneously, multiple `make image` jobs can collide on shared floating tags. The `IMAGE_TAG=pr-<N>-<sha>` refactor solved this; if you see `Conflicted with another upload of the same manifest`, `gh run rerun --failed`.
+
+## Cleanup after release
+
+- The `release-X.Y.Z` branch is deleted by GitHub when its PR merges. The `release-X.Y` maintenance branch is created by `cut-prerelease.yaml` at the rc freeze (create-only, never force-moved) and fast-forwarded afterwards by `pull-requests-release.yaml::Ensure maintenance branch`.
+- The draft release is published by the same workflow.
+- The release body is set by finalize from `docs/changelogs/vX.Y.Z.md` at publication. Afterwards, `update-releasenotes.yaml` re-syncs that file into the GitHub Release body on any push to `main` that touches it — so edits to a published changelog land on the release page the next time `main` moves.
+- Local cleanup: remove your worktree (`git worktree remove`) and prune merged release branches.
+
+## See also
+
+- [`agents/changelog.md`](./agents/changelog.md) — canonical changelog generation process.
+- [`agents/contributing.md`](./agents/contributing.md) — commit/PR conventions, backport label semantics.
+- [`agents/releasing.md`](./agents/releasing.md) — pointer file for AI agents handling release tasks.
+- [`.github/workflows/cut-prerelease.yaml`](../.github/workflows/cut-prerelease.yaml) — the sole entry point for cutting a pre-release tag as the CI app.
+- [`.github/workflows/tags.yaml`](../.github/workflows/tags.yaml) — tag-push pipeline (rc build + mandatory `rc-e2e`; stable-tag changelog/website backstops).
+- [`.github/workflows/e2e-tag.yaml`](../.github/workflows/e2e-tag.yaml) — mandatory rc and manual published-tag full E2E lane.
+- [`.github/workflows/pull-requests-release.yaml`](../.github/workflows/pull-requests-release.yaml) — merge-finalize pipeline.
+- [`.github/workflows/promote-rc.yaml`](../.github/workflows/promote-rc.yaml) — rc → stable promotion.
+- [`.github/workflows/changelog-rc.yaml`](../.github/workflows/changelog-rc.yaml) — optional rc-time changelog button.
+- [`.github/workflows/changelog-generate.yaml`](../.github/workflows/changelog-generate.yaml) — reusable changelog-generation core shared by promote-rc and changelog-rc.
+- [`.github/workflows/nightly.yaml`](../.github/workflows/nightly.yaml) — nightly: mirror `main` OCIR→GHCR + full e2e.
+- [`hack/nightly-mirror.sh`](../hack/nightly-mirror.sh) — cross-registry image mirror used by the nightly.
+- [`agents/image-refs.md`](./agents/image-refs.md) — where image references live, what their tags mean, and the invariants promotion and mirroring rely on.
+- [`hack/lib/image-refs.sh`](../hack/lib/image-refs.sh) — the single enumeration of ref-bearing files, shared by the promote, retag and mirror tooling.
+- [`.github/workflows/retention.yaml`](../.github/workflows/retention.yaml) — GHCR nightly and abandoned promotion-candidate pruning.
+- [`.github/workflows/backport.yaml`](../.github/workflows/backport.yaml) — automatic cherry-pick bot.
+- [`.github/workflows/update-releasenotes.yaml`](../.github/workflows/update-releasenotes.yaml) — sync changelog → GitHub Release body.
diff --git a/docs/security/incident-response.md b/docs/security/incident-response.md
new file mode 100644
index 0000000000..62469519e3
--- /dev/null
+++ b/docs/security/incident-response.md
@@ -0,0 +1,67 @@
+# Incident Response
+
+This document is the public summary of how the Cozystack maintainers respond to
+a confirmed security vulnerability or incident. Detailed operational procedures
+(contact trees, credential inventories, and step-by-step checklists) are
+maintained privately by the maintainers; this page describes the process and
+the mechanisms it relies on so that reporters and users know what to expect.
+
+It complements, and does not replace:
+
+- [`SECURITY.md`](../../SECURITY.md) — how to report a vulnerability, response
+  commitments, and the disclosure timeline.
+- [`CONTRIBUTOR_LADDER.md`](../../CONTRIBUTOR_LADDER.md) — the offboarding
+  procedure, including access revocation and credential rotation.
+
+## Roles
+
+For each incident the maintainers designate:
+
+- **Incident lead** — a maintainer (typically a core maintainer) who coordinates
+  triage, the fix, the release, and disclosure, and keeps the reporter informed.
+- **Comms owner** — responsible for the public advisory and release-notes
+  wording, and for any coordination with upstream projects and CNCF.
+- **Fix owner(s)** — the maintainer(s) developing and reviewing the fix.
+
+One person may hold more than one role on a small incident.
+
+## Lifecycle
+
+1. **Intake.** A report arrives through GitHub Private Vulnerability Reporting or
+   a private maintainer contact (see `SECURITY.md`). Receipt is acknowledged
+   within **3 business days**.
+2. **Triage and severity.** The maintainers reproduce the issue and assign a
+   CVSS v3.1 severity within **7 business days**. This drives the remediation
+   target and disclosure window (see `SECURITY.md` → *Disclosure timeline*).
+3. **Containment.** Where an immediate mitigation or workaround exists (a
+   configuration change, a policy, or disabling an affected feature), it is
+   documented and shared with the reporter and, if warranted, with affected
+   adopters under embargo.
+4. **Private fix development.** The fix is developed under a **GitHub Security
+   Advisory** (private fork) so that code and discussion stay confidential until
+   release.
+5. **Coordinated release.** The fix is shipped through the normal patch-release
+   and backport process. Which supported lines receive the backport is decided
+   per fix, weighing severity against backport risk — see the *Supported
+   Versions* table in `SECURITY.md`, which also records that no documented rule
+   governs that choice.
+6. **Disclosure.** A GHSA — and, when applicable, a CVE — is published. Public
+   disclosure follows the outbound channels: GitHub Releases and release notes,
+   the changelog, and the GHSA itself. The reporter is credited unless anonymity
+   is requested. Disclosure happens no later than the coordinated-disclosure
+   window committed in `SECURITY.md`.
+7. **Access and credential hygiene.** If the incident involved a compromised or
+   departing maintainer or leaked credential, the access-revocation and
+   credential-rotation steps in `CONTRIBUTOR_LADDER.md` are executed (GitHub team
+   access, org roles, Actions secrets, registry tokens, and App keys), completed
+   within five business days.
+8. **Retrospective.** After resolution the maintainers record what happened, the
+   root cause, and any follow-up hardening, and open tracking issues for
+   preventative work.
+
+## Severity and timelines
+
+Severity classification (CVSS v3.1) and the target remediation and disclosure
+timelines are defined once, authoritatively, in
+[`SECURITY.md`](../../SECURITY.md) → *Disclosure timeline*. They are not
+duplicated here to avoid drift.
diff --git a/docs/security/reports/2026-04.md b/docs/security/reports/2026-04.md
new file mode 100644
index 0000000000..d4d0864bcb
--- /dev/null
+++ b/docs/security/reports/2026-04.md
@@ -0,0 +1,45 @@
+# Cozystack security report — April 2026
+
+Generated 2026-08-11 from the tracker state on that date. Figures are counted from the tracked findings of the organization-wide CVE-scanning pipeline described in [`SECURITY.md`](../../../SECURITY.md).
+
+**Read this alongside [the backlog reconciliation](reconciliation-2026-08.md).** The state counts below are what the pipeline recorded, and the pipeline has no write-back from the main repository, so it has never marked anything fixed and its outstanding counts overstate real exposure. The reconciliation establishes what was actually remediated and how much of the backlog was never applicable. Do not read the tables here as a measure of exposure without it.
+
+**Disclosure.** Findings are reported as counts by severity; an individual finding is named once its fix is merged and released. Counts cover findings the pipeline tracks as actionable, after its filters for development-and-build-only dependencies, findings whose upstream has had no fix for over a year, and findings with no severity assigned in any database. Two of those filters are known not to work as documented — see the reconciliation.
+
+## New findings tracked this month
+
+**412** — 36 critical, 360 high, 16 medium
+
+April is the pipeline's first month, and this figure is an initial load across every repository in the organization rather than a month's discovery rate. It is not comparable with later months.
+
+## Triage decisions recorded this month
+
+No triage decisions were recorded this month.
+
+## Remediation activity this month
+
+**9** version bumps were merged, representing **7** distinct changes once backports of the same change to release branches are collapsed. These are counted from diffs: a pull request that only moves a chart version, edits an upgrade path or changes CI configuration is not counted as a bump, because it cannot carry a fix into an artifact.
+
+How many tracked findings those bumps carried away is deliberately **not** stated per month. Attributing findings to one month's bumps would cross a severity-banded count of still-open findings with a component list that is publicly enumerable from the commit log, which narrows the search for unpatched exposure more than a bare count does. The remediation disposition of the whole backlog is given once, with an as-of date, in [the reconciliation](reconciliation-2026-08.md).
+
+## Position at month end
+
+| State | Count | By severity |
+| --- | --- | --- |
+| Awaiting a triage decision | 412 | 36 critical, 360 high, 16 medium |
+| **Total tracked** | **412** | |
+
+Nothing appears as fixed in any month because the pipeline cannot record that state at all. Confirmed findings therefore accumulate and never drain, which is a property of the tooling rather than a measure of outstanding work.
+
+## Where the process stands
+
+**Triage is behind its target and has no owner.** The rotating Security Champion role that owns the triage clock is defined in the pipeline's governance document and is currently unassigned. That is why decisions arrived in a single bulk pass rather than continuously, and it is the project's real gap — not the bookkeeping problem below.
+
+**The configured detection schedule** is every six hours for critical findings and weekly for the rest. Whether every scheduled run executed cannot be established from finding data alone, and the record has gaps: no weekly cohort appears for 2026-05-26, and intervals between critical findings reach 26 days. Absence of findings is not proof of a missed run, but neither is it proof of a completed one.
+
+**Remediation is happening and the tracker cannot see it.** Fixes land in the main repository as ordinary pinned-component bumps and nothing writes that back here. [The reconciliation](reconciliation-2026-08.md) sets out what was actually fixed, which components still need a bump that is already available upstream, and the defects found in the pipeline itself.
+
+## Reporting a vulnerability
+
+Please do not use public issues. Use [GitHub Private Vulnerability Reporting](https://github.com/cozystack/cozystack/security/advisories/new) or contact a maintainer privately; the full policy is in [`SECURITY.md`](../../../SECURITY.md).
+
diff --git a/docs/security/reports/2026-05.md b/docs/security/reports/2026-05.md
new file mode 100644
index 0000000000..84667849f8
--- /dev/null
+++ b/docs/security/reports/2026-05.md
@@ -0,0 +1,49 @@
+# Cozystack security report — May 2026
+
+Generated 2026-08-11 from the tracker state on that date. Figures are counted from the tracked findings of the organization-wide CVE-scanning pipeline described in [`SECURITY.md`](../../../SECURITY.md).
+
+**Read this alongside [the backlog reconciliation](reconciliation-2026-08.md).** The state counts below are what the pipeline recorded, and the pipeline has no write-back from the main repository, so it has never marked anything fixed and its outstanding counts overstate real exposure. The reconciliation establishes what was actually remediated and how much of the backlog was never applicable. Do not read the tables here as a measure of exposure without it.
+
+**Disclosure.** Findings are reported as counts by severity; an individual finding is named once its fix is merged and released. Counts cover findings the pipeline tracks as actionable, after its filters for development-and-build-only dependencies, findings whose upstream has had no fix for over a year, and findings with no severity assigned in any database. Two of those filters are known not to work as documented — see the reconciliation.
+
+## New findings tracked this month
+
+**64** — 5 critical, 59 high
+
+## Triage decisions recorded this month
+
+No triage decisions were recorded this month.
+
+## Remediation activity this month
+
+**10** version bumps were merged, representing **8** distinct changes once backports of the same change to release branches are collapsed. These are counted from diffs: a pull request that only moves a chart version, edits an upgrade path or changes CI configuration is not counted as a bump, because it cannot carry a fix into an artifact.
+
+Fixes released with a named advisory:
+
+| CVE | Component | Upstream fix | Shipped in Cozystack | Pull requests |
+| --- | --- | --- | --- | --- |
+| [CVE-2026-31431](https://nvd.nist.gov/vuln/detail/CVE-2026-31431) | Talos Linux | v1.12.7 | v1.2.4, v1.3.2, v1.4.0 | [#2545](https://github.com/cozystack/cozystack/pull/2545), [#2547](https://github.com/cozystack/cozystack/pull/2547), [#2548](https://github.com/cozystack/cozystack/pull/2548) |
+
+How many tracked findings those bumps carried away is deliberately **not** stated per month. Attributing findings to one month's bumps would cross a severity-banded count of still-open findings with a component list that is publicly enumerable from the commit log, which narrows the search for unpatched exposure more than a bare count does. The remediation disposition of the whole backlog is given once, with an as-of date, in [the reconciliation](reconciliation-2026-08.md).
+
+## Position at month end
+
+| State | Count | By severity |
+| --- | --- | --- |
+| Awaiting a triage decision | 476 | 41 critical, 419 high, 16 medium |
+| **Total tracked** | **476** | |
+
+Nothing appears as fixed in any month because the pipeline cannot record that state at all. Confirmed findings therefore accumulate and never drain, which is a property of the tooling rather than a measure of outstanding work.
+
+## Where the process stands
+
+**Triage is behind its target and has no owner.** The rotating Security Champion role that owns the triage clock is defined in the pipeline's governance document and is currently unassigned. That is why decisions arrived in a single bulk pass rather than continuously, and it is the project's real gap — not the bookkeeping problem below.
+
+**The configured detection schedule** is every six hours for critical findings and weekly for the rest. Whether every scheduled run executed cannot be established from finding data alone, and the record has gaps: no weekly cohort appears for 2026-05-26, and intervals between critical findings reach 26 days. Absence of findings is not proof of a missed run, but neither is it proof of a completed one.
+
+**Remediation is happening and the tracker cannot see it.** Fixes land in the main repository as ordinary pinned-component bumps and nothing writes that back here. [The reconciliation](reconciliation-2026-08.md) sets out what was actually fixed, which components still need a bump that is already available upstream, and the defects found in the pipeline itself.
+
+## Reporting a vulnerability
+
+Please do not use public issues. Use [GitHub Private Vulnerability Reporting](https://github.com/cozystack/cozystack/security/advisories/new) or contact a maintainer privately; the full policy is in [`SECURITY.md`](../../../SECURITY.md).
+
diff --git a/docs/security/reports/2026-06.md b/docs/security/reports/2026-06.md
new file mode 100644
index 0000000000..66bb9c2d1d
--- /dev/null
+++ b/docs/security/reports/2026-06.md
@@ -0,0 +1,52 @@
+# Cozystack security report — June 2026
+
+Generated 2026-08-11 from the tracker state on that date. Figures are counted from the tracked findings of the organization-wide CVE-scanning pipeline described in [`SECURITY.md`](../../../SECURITY.md).
+
+**Read this alongside [the backlog reconciliation](reconciliation-2026-08.md).** The state counts below are what the pipeline recorded, and the pipeline has no write-back from the main repository, so it has never marked anything fixed and its outstanding counts overstate real exposure. The reconciliation establishes what was actually remediated and how much of the backlog was never applicable. Do not read the tables here as a measure of exposure without it.
+
+**Disclosure.** Findings are reported as counts by severity; an individual finding is named once its fix is merged and released. Counts cover findings the pipeline tracks as actionable, after its filters for development-and-build-only dependencies, findings whose upstream has had no fix for over a year, and findings with no severity assigned in any database. Two of those filters are known not to work as documented — see the reconciliation.
+
+## New findings tracked this month
+
+**252** — 7 critical, 245 high
+
+## Triage decisions recorded this month
+
+| Outcome | Count | By severity |
+| --- | --- | --- |
+| Confirmed — real, needs a fix | 332 | 30 critical, 292 high, 10 medium |
+| Accepted risk — real, not reachable or not worth the change | 61 | 6 critical, 52 high, 3 medium |
+| Dismissed — not applicable | 101 | 5 critical, 93 high, 3 medium |
+
+These decisions were recorded in a **single bulk triage pass on 2026-06-11**, so a per-finding triage latency cannot be recovered from this data: the tracker stores when an issue was closed, not when a decision was reached. What it does show is the age of the backlog when that pass ran — between 2 and 47 business days, with 78% of findings at the upper end. Against a one-business-day target for critical findings, the pass was late by any reading.
+
+## Remediation activity this month
+
+**26** version bumps were merged, representing **24** distinct changes once backports of the same change to release branches are collapsed. These are counted from diffs: a pull request that only moves a chart version, edits an upgrade path or changes CI configuration is not counted as a bump, because it cannot carry a fix into an artifact.
+
+How many tracked findings those bumps carried away is deliberately **not** stated per month. Attributing findings to one month's bumps would cross a severity-banded count of still-open findings with a component list that is publicly enumerable from the commit log, which narrows the search for unpatched exposure more than a bare count does. The remediation disposition of the whole backlog is given once, with an as-of date, in [the reconciliation](reconciliation-2026-08.md).
+
+## Position at month end
+
+| State | Count | By severity |
+| --- | --- | --- |
+| Awaiting a triage decision | 234 | 7 critical, 227 high |
+| Confirmed — real, needs a fix | 332 | 30 critical, 292 high, 10 medium |
+| Accepted risk — real, not reachable or not worth the change | 61 | 6 critical, 52 high, 3 medium |
+| Dismissed — not applicable | 101 | 5 critical, 93 high, 3 medium |
+| **Total tracked** | **728** | |
+
+Nothing appears as fixed in any month because the pipeline cannot record that state at all. Confirmed findings therefore accumulate and never drain, which is a property of the tooling rather than a measure of outstanding work.
+
+## Where the process stands
+
+**Triage is behind its target and has no owner.** The rotating Security Champion role that owns the triage clock is defined in the pipeline's governance document and is currently unassigned. That is why decisions arrived in a single bulk pass rather than continuously, and it is the project's real gap — not the bookkeeping problem below.
+
+**The configured detection schedule** is every six hours for critical findings and weekly for the rest. Whether every scheduled run executed cannot be established from finding data alone, and the record has gaps: no weekly cohort appears for 2026-05-26, and intervals between critical findings reach 26 days. Absence of findings is not proof of a missed run, but neither is it proof of a completed one.
+
+**Remediation is happening and the tracker cannot see it.** Fixes land in the main repository as ordinary pinned-component bumps and nothing writes that back here. [The reconciliation](reconciliation-2026-08.md) sets out what was actually fixed, which components still need a bump that is already available upstream, and the defects found in the pipeline itself.
+
+## Reporting a vulnerability
+
+Please do not use public issues. Use [GitHub Private Vulnerability Reporting](https://github.com/cozystack/cozystack/security/advisories/new) or contact a maintainer privately; the full policy is in [`SECURITY.md`](../../../SECURITY.md).
+
diff --git a/docs/security/reports/2026-07.md b/docs/security/reports/2026-07.md
new file mode 100644
index 0000000000..3d319fef06
--- /dev/null
+++ b/docs/security/reports/2026-07.md
@@ -0,0 +1,52 @@
+# Cozystack security report — July 2026
+
+Generated 2026-08-11 from the tracker state on that date. Figures are counted from the tracked findings of the organization-wide CVE-scanning pipeline described in [`SECURITY.md`](../../../SECURITY.md).
+
+**Read this alongside [the backlog reconciliation](reconciliation-2026-08.md).** The state counts below are what the pipeline recorded, and the pipeline has no write-back from the main repository, so it has never marked anything fixed and its outstanding counts overstate real exposure. The reconciliation establishes what was actually remediated and how much of the backlog was never applicable. Do not read the tables here as a measure of exposure without it.
+
+**Disclosure.** Findings are reported as counts by severity; an individual finding is named once its fix is merged and released. Counts cover findings the pipeline tracks as actionable, after its filters for development-and-build-only dependencies, findings whose upstream has had no fix for over a year, and findings with no severity assigned in any database. Two of those filters are known not to work as documented — see the reconciliation.
+
+## New findings tracked this month
+
+**80** — 6 critical, 74 high
+
+## Triage decisions recorded this month
+
+No triage decisions were recorded this month.
+
+## Remediation activity this month
+
+**9** version bumps were merged, representing **8** distinct changes once backports of the same change to release branches are collapsed. These are counted from diffs: a pull request that only moves a chart version, edits an upgrade path or changes CI configuration is not counted as a bump, because it cannot carry a fix into an artifact.
+
+Fixes released with a named advisory:
+
+| CVE | Component | Upstream fix | Shipped in Cozystack | Pull requests |
+| --- | --- | --- | --- | --- |
+| [CVE-2026-53359](https://nvd.nist.gov/vuln/detail/CVE-2026-53359) | Talos Linux | v1.13.6 | v1.6.0, v1.6.1 | [#3240](https://github.com/cozystack/cozystack/pull/3240) |
+
+How many tracked findings those bumps carried away is deliberately **not** stated per month. Attributing findings to one month's bumps would cross a severity-banded count of still-open findings with a component list that is publicly enumerable from the commit log, which narrows the search for unpatched exposure more than a bare count does. The remediation disposition of the whole backlog is given once, with an as-of date, in [the reconciliation](reconciliation-2026-08.md).
+
+## Position at month end
+
+| State | Count | By severity |
+| --- | --- | --- |
+| Awaiting a triage decision | 314 | 13 critical, 301 high |
+| Confirmed — real, needs a fix | 332 | 30 critical, 292 high, 10 medium |
+| Accepted risk — real, not reachable or not worth the change | 61 | 6 critical, 52 high, 3 medium |
+| Dismissed — not applicable | 101 | 5 critical, 93 high, 3 medium |
+| **Total tracked** | **808** | |
+
+Nothing appears as fixed in any month because the pipeline cannot record that state at all. Confirmed findings therefore accumulate and never drain, which is a property of the tooling rather than a measure of outstanding work.
+
+## Where the process stands
+
+**Triage is behind its target and has no owner.** The rotating Security Champion role that owns the triage clock is defined in the pipeline's governance document and is currently unassigned. That is why decisions arrived in a single bulk pass rather than continuously, and it is the project's real gap — not the bookkeeping problem below.
+
+**The configured detection schedule** is every six hours for critical findings and weekly for the rest. Whether every scheduled run executed cannot be established from finding data alone, and the record has gaps: no weekly cohort appears for 2026-05-26, and intervals between critical findings reach 26 days. Absence of findings is not proof of a missed run, but neither is it proof of a completed one.
+
+**Remediation is happening and the tracker cannot see it.** Fixes land in the main repository as ordinary pinned-component bumps and nothing writes that back here. [The reconciliation](reconciliation-2026-08.md) sets out what was actually fixed, which components still need a bump that is already available upstream, and the defects found in the pipeline itself.
+
+## Reporting a vulnerability
+
+Please do not use public issues. Use [GitHub Private Vulnerability Reporting](https://github.com/cozystack/cozystack/security/advisories/new) or contact a maintainer privately; the full policy is in [`SECURITY.md`](../../../SECURITY.md).
+
diff --git a/docs/security/reports/2026-08.md b/docs/security/reports/2026-08.md
new file mode 100644
index 0000000000..ea0570aa4c
--- /dev/null
+++ b/docs/security/reports/2026-08.md
@@ -0,0 +1,46 @@
+# Cozystack security report — August 2026
+
+Generated 2026-08-11 from the tracker state on that date. **This month is incomplete: data is cut off at 2026-08-10.** Figures are counted from the tracked findings of the organization-wide CVE-scanning pipeline described in [`SECURITY.md`](../../../SECURITY.md).
+
+**Read this alongside [the backlog reconciliation](reconciliation-2026-08.md).** The state counts below are what the pipeline recorded, and the pipeline has no write-back from the main repository, so it has never marked anything fixed and its outstanding counts overstate real exposure. The reconciliation establishes what was actually remediated and how much of the backlog was never applicable. Do not read the tables here as a measure of exposure without it.
+
+**Disclosure.** Findings are reported as counts by severity; an individual finding is named once its fix is merged and released. Counts cover findings the pipeline tracks as actionable, after its filters for development-and-build-only dependencies, findings whose upstream has had no fix for over a year, and findings with no severity assigned in any database. Two of those filters are known not to work as documented — see the reconciliation.
+
+## New findings tracked this month
+
+**17** — 17 high
+
+## Triage decisions recorded this month
+
+No triage decisions were recorded this month.
+
+## Remediation activity this month
+
+**2** version bumps were merged, representing **1** distinct changes once backports of the same change to release branches are collapsed. These are counted from diffs: a pull request that only moves a chart version, edits an upgrade path or changes CI configuration is not counted as a bump, because it cannot carry a fix into an artifact.
+
+How many tracked findings those bumps carried away is deliberately **not** stated per month. Attributing findings to one month's bumps would cross a severity-banded count of still-open findings with a component list that is publicly enumerable from the commit log, which narrows the search for unpatched exposure more than a bare count does. The remediation disposition of the whole backlog is given once, with an as-of date, in [the reconciliation](reconciliation-2026-08.md).
+
+## Position at 2026-08-10
+
+| State | Count | By severity |
+| --- | --- | --- |
+| Awaiting a triage decision | 331 | 13 critical, 318 high |
+| Confirmed — real, needs a fix | 332 | 30 critical, 292 high, 10 medium |
+| Accepted risk — real, not reachable or not worth the change | 61 | 6 critical, 52 high, 3 medium |
+| Dismissed — not applicable | 101 | 5 critical, 93 high, 3 medium |
+| **Total tracked** | **825** | |
+
+Nothing appears as fixed in any month because the pipeline cannot record that state at all. Confirmed findings therefore accumulate and never drain, which is a property of the tooling rather than a measure of outstanding work.
+
+## Where the process stands
+
+**Triage is behind its target and has no owner.** The rotating Security Champion role that owns the triage clock is defined in the pipeline's governance document and is currently unassigned. That is why decisions arrived in a single bulk pass rather than continuously, and it is the project's real gap — not the bookkeeping problem below.
+
+**The configured detection schedule** is every six hours for critical findings and weekly for the rest. Whether every scheduled run executed cannot be established from finding data alone, and the record has gaps: no weekly cohort appears for 2026-05-26, and intervals between critical findings reach 26 days. Absence of findings is not proof of a missed run, but neither is it proof of a completed one.
+
+**Remediation is happening and the tracker cannot see it.** Fixes land in the main repository as ordinary pinned-component bumps and nothing writes that back here. [The reconciliation](reconciliation-2026-08.md) sets out what was actually fixed, which components still need a bump that is already available upstream, and the defects found in the pipeline itself.
+
+## Reporting a vulnerability
+
+Please do not use public issues. Use [GitHub Private Vulnerability Reporting](https://github.com/cozystack/cozystack/security/advisories/new) or contact a maintainer privately; the full policy is in [`SECURITY.md`](../../../SECURITY.md).
+
diff --git a/docs/security/reports/README.md b/docs/security/reports/README.md
new file mode 100644
index 0000000000..8aa4118d05
--- /dev/null
+++ b/docs/security/reports/README.md
@@ -0,0 +1,32 @@
+# Monthly security reports
+
+Public reporting on vulnerability handling in the Cozystack project, generated from the tracked findings of the organization-wide CVE-scanning pipeline described in [`SECURITY.md`](../../../SECURITY.md).
+
+**Start with [the backlog reconciliation](reconciliation-2026-08.md).** The monthly reports state what happened in a month, counted from the pipeline's own records. The pipeline has no write-back from the main repository, so it has never marked a finding as fixed and its outstanding counts overstate real exposure. The reconciliation establishes what was actually remediated, how much of the backlog was never applicable, and what is defective in the tooling. The monthly figures are not interpretable without it.
+
+| Document | Covers |
+| --- | --- |
+| [Backlog reconciliation](reconciliation-2026-08.md) | Every finding since the pipeline started, audited against what shipped. As of 2026-08-11 |
+| [August 2026](2026-08.md) | Incomplete; data cut off 2026-08-10 |
+| [July 2026](2026-07.md) | |
+| [June 2026](2026-06.md) | |
+| [May 2026](2026-05.md) | |
+| [April 2026](2026-04.md) | First month; an initial load rather than a discovery rate |
+
+## What these reports contain
+
+Findings are reported as **counts by severity**. An individual finding is named once its fix is merged and released — both such findings to date appear in the reconciliation and in the month they shipped.
+
+Two deliberate exceptions to that reticence, both arrived at by reviewing the rule rather than applying it mechanically. **Findings with no upstream fix will be named, with mitigation guidance**, because there is nothing to wait for and silence serves nobody: an adopter needs to know when a mitigation is the only available control. And **remediation is not attributed to individual months**, because a count of still-open findings crossed with one month's list of component bumps — which anybody can enumerate from the commit log — narrows the search for unpatched exposure further than a bare count does.
+
+What stays embargoed is narrow: findings where Cozystack's own packaging, defaults or integration logic introduces or worsens the exposure. There the project is the only source, and the process is the coordinated disclosure in [`SECURITY.md`](../../../SECURITY.md).
+
+## Scope of the counts
+
+The counts cover findings from the pipeline, which scans **every non-fork, non-archived repository in the `cozystack` organization** — not this repository alone. They are filtered to what the pipeline treats as actionable: development-and-build-only dependencies, findings whose upstream has had no fix for over a year, findings already carrying a triage decision, and findings with no severity assigned are excluded before a finding is tracked. Two of those filters do not work as documented, which the reconciliation records.
+
+Vulnerabilities reported privately against Cozystack's own code, packaging, defaults or integration logic follow the separate process in [`SECURITY.md`](../../../SECURITY.md), with its own response targets, and are disclosed through GitHub Security Advisories rather than here.
+
+## Provenance and its limits
+
+These figures are self-attested. The tracker is private, because it holds per-finding detail for exposure that is not yet fixed, so a reader cannot currently reproduce the counts. Publishing the pipeline's policy documents and scanning scripts — which contain no finding data — so that the method can be audited independently of the numbers is outstanding work. Until that lands, treat the numbers as a project statement rather than as verified evidence.
diff --git a/docs/security/reports/reconciliation-2026-08.md b/docs/security/reports/reconciliation-2026-08.md
new file mode 100644
index 0000000000..ba7392759d
--- /dev/null
+++ b/docs/security/reports/reconciliation-2026-08.md
@@ -0,0 +1,139 @@
+# Vulnerability backlog reconciliation — as of 2026-08-11
+
+This is a one-off audit of every finding the Cozystack CVE-scanning pipeline has tracked since it started, reconciled against what the project actually shipped. It exists because the pipeline's own state was misleading in both directions, and because a due-diligence reviewer is entitled to the correction rather than the raw counts.
+
+It supersedes any remediation figure implied by the monthly reports in this directory. The monthly reports state what happened in a month; this document states where the backlog actually stands.
+
+## Why a reconciliation was needed
+
+The pipeline records triage decisions by reading its own closed issues. **Nothing writes back to it from the main repository**, so it has never marked a single finding as fixed — `state/triage-overrides.json` holds 477 decisions and not one carries a fix version or a fix pull request. A finding whose component was upgraded two releases ago still sits in the tracker as confirmed and outstanding.
+
+The consequence is that the tracker's headline numbers were wrong in both directions at once. They **overstated** open exposure, because remediation had happened and was invisible. They also **understated** how much of the backlog was never applicable, because a large class of unactionable findings had never been triaged at all.
+
+## What the tracker holds
+
+827 issues, of which **825 are findings** — two (`#386`, `#388`) are quarterly-security-review tracking tasks that the filters should have excluded and did not.
+
+| State | Count |
+| --- | --- |
+| Confirmed — triaged as real, needs a fix | 332 |
+| Dismissed — not applicable | 101 |
+| Accepted risk | 61 |
+| Awaiting a triage decision | 333 |
+| Marked fixed | **0** |
+
+All 332 confirmed findings were decided in a single bulk triage pass on 2026-06-11. No triage decisions were recorded in any other month.
+
+## Applicability: how much of this was ever about what Cozystack ships
+
+Classified in priority order, no overlaps. The already-dismissed findings supplied the precedents: each of the 162 dismissals carries a written justification, and those justifications establish rules that were then applied to the untriaged backlog.
+
+| Class | Findings | Share |
+| --- | --- | --- |
+| Vulnerable code not present in executable form | 291 | 35% |
+| Not attributed to any image — reachability cannot be assessed | 131 | 16% |
+| Only in components a default installation does not deploy | 104 | 13% |
+| Role unreachable — client library against a server-side flaw, interactive tool, build-time packaging | 65 | 8% |
+| Platform or version gated — Windows-only, 32-bit-only, installed version below the introduced range | 18 | 2% |
+| Already stale against the current tree | 10 | 1% |
+| **Patch lag on a component a default installation does run** | **206** | **25%** |
+
+**466 findings (57%) were never applicable or cannot be assessed.** The largest single block is 291 findings against packages that contain no executable vulnerable code — kernel headers being the dominant case. Cozystack containers never provide a running kernel; Talos does. The project's own maintainers applied exactly this reasoning 64 times to `kernel-headers` and 16 times to `perf`, and dismissed every one — while 194 findings against `linux-libc-dev`, which is the same argument with a different package name, sat untriaged. That is one missing filter rule accounting for a quarter of the tracker.
+
+A second structural block: **68 findings report operating-system packages inside `system/kamaji`, whose final image is `gcr.io/distroless/static:nonroot`** — an image with no OS package layer at all. Nineteen of those are in the confirmed state, which is a triage error rather than a scanner artifact.
+
+A third: **51 findings report Node ecosystem packages against `system/dashboard`**, whose shipped image is `nginx-unprivileged` plus a static build directory, with no Node runtime. Thirty-four are confirmed.
+
+The 206 remaining patch-lag findings are legitimate hygiene: the package is present in a shipped image and a patch exists. None of them asserts a reachable attack path, and they should not be read as one. **Genuine reachable exposure in a stock installation is estimated at 15–40 findings, 2–5% of the tracker.** That is an estimate, not a measurement, and it is sensitive to two questions the tracker cannot answer — whether any shipped artifact carries a `runc` binary, and whether untrusted input reaches specific XML, ASN.1 and archive parsers inside vendored operator images.
+
+## Remediation that actually happened
+
+Cross-referencing the tracked findings against merged pull requests, release tags and the pipeline's own 18 weekly scan reports:
+
+| Disposition of the 332 confirmed findings | Count |
+| --- | --- |
+| Fixed upstream and already pulled into the tree | 165 |
+| Fixed by a change Cozystack authored | 26 |
+| Fixed upstream, not yet pulled in | 10 fully, 27 partially |
+| No upstream fix exists | 26 |
+| Not attributable to an image, so undeterminable | 78 |
+
+Of the 165, **34 are verified by exact version comparison** against the tree; the remaining 131 rest on the carrier image having been rebuilt, which is strong evidence but not proof without a re-scan.
+
+The 26 fixed by Cozystack's own work are a distinct and easily missed category: re-vendoring the dashboard console in-tree ([#2963](https://github.com/cozystack/cozystack/pull/2963)) did not upgrade the vulnerable npm dependencies, it **removed them from existence**. Separately, [#3033](https://github.com/cozystack/cozystack/pull/3033) forced module versions during the Kamaji build because no upstream Kamaji tag carried the fixes yet.
+
+**Remediation was a single wave, not a steady stream.** Twenty-two pull requests between 2026-06-15 and 2026-06-30 account for essentially all of it: 162 confirmed findings and 40 awaiting-triage findings were carried away in that fortnight. Zero in April, seven in May, one in July, none in August.
+
+The changes that did the most work were largely invisible to identifier-based searching, because they name no CVE at all:
+
+| Pull request | What it changed | Confirmed findings carried |
+| --- | --- | --- |
+| [#2963](https://github.com/cozystack/cozystack/pull/2963) | dashboard console vendored in-tree; vulnerable npm dependencies cease to exist | 31 |
+| [#2964](https://github.com/cozystack/cozystack/pull/2964) | Keycloak 26.5.2 → 26.6.3 | 25 |
+| [#2992](https://github.com/cozystack/cozystack/pull/2992) | fdb-operator v2.30.0 | 17 |
+| [#2966](https://github.com/cozystack/cozystack/pull/2966) | Harbor chart 1.19.1 / 2.15.1 | 14 |
+| [#3009](https://github.com/cozystack/cozystack/pull/3009) | first-party Alpine bases → 3.24 across six images | 14 |
+| [#2834](https://github.com/cozystack/cozystack/pull/2834), [#2916](https://github.com/cozystack/cozystack/pull/2916) | SeaweedFS 4.31 | 13 |
+| [#3014](https://github.com/cozystack/cozystack/pull/3014) | managed Kubernetes patch versions | 11 |
+| [#2494](https://github.com/cozystack/cozystack/pull/2494) | Go modules and `golang:1.26` in first-party Dockerfiles | 7 |
+| [#2972](https://github.com/cozystack/cozystack/pull/2972) | Cilium 1.19.3 → 1.19.5 | 6 |
+| [#3019](https://github.com/cozystack/cozystack/pull/3019) | `golang.org/x/crypto` → 0.52.0 | 4 |
+| [#2974](https://github.com/cozystack/cozystack/pull/2974) | Velero chart 12.0.3 | 4 |
+| [#2941](https://github.com/cozystack/cozystack/pull/2941) | `golang:1.26` across eight remaining builder images | 3 directly |
+
+The Go toolchain thread deserves separate mention because the weekly reports evidence it independently: findings against ancient Go lines (1.15 through 1.20) appear only in the 2026-04-07 and 2026-05-05 scans and never again. After the toolchain was brought current, the only new `stdlib` findings require a version newer than the current pin. All 62 confirmed `stdlib` findings are formally satisfied by the toolchain now in the tree.
+
+### Fixes available and not yet taken
+
+Small, specific and actionable today:
+
+| Component | In tree | Fix requires | Findings |
+| --- | --- | --- | --- |
+| `nats-server` | appVersion 2.11.10 | 2.11.14 / 2.11.15 | 6 |
+| CoreDNS image | v1.12.4 | 1.14.2 | 1 |
+| OpenBao | v2.5.1 | 2.5.4 | 1 |
+| `fast-uri` | 3.1.0 | 3.1.1 / 3.1.2 | 2 |
+
+## Fixes released with a named identifier
+
+Both are already public in merged commit subjects, so naming them here adds no exposure.
+
+| CVE | Component | Upstream fix | Shipped in Cozystack | Pull requests |
+| --- | --- | --- | --- | --- |
+| [CVE-2026-31431](https://nvd.nist.gov/vuln/detail/CVE-2026-31431) | Talos Linux | v1.12.7 | v1.2.4, v1.3.2, v1.4.0 | [#2545](https://github.com/cozystack/cozystack/pull/2545), [#2547](https://github.com/cozystack/cozystack/pull/2547), [#2548](https://github.com/cozystack/cozystack/pull/2548) |
+| [CVE-2026-53359](https://nvd.nist.gov/vuln/detail/CVE-2026-53359) | Talos Linux | v1.13.6 | v1.6.0, v1.6.1 | [#3240](https://github.com/cozystack/cozystack/pull/3240), [#3269](https://github.com/cozystack/cozystack/pull/3269) |
+
+## Defects found in the pipeline itself
+
+The audit found more wrong with the tooling than with the fixing. All of these are the pipeline's, not the maintainers':
+
+1. **No write-back.** Nothing observes the main repository, so nothing is ever closed as fixed and the confirmed state grows monotonically and permanently.
+2. **Deduplication by CVE identifier alone.** `scan.sh` keys on the CVE, so `package`, `installed_version` and `fixed_version` are taken from whichever scan file sorted first and are never updated afterwards. This is why `stdlib` findings show a single installed version across sixty carriers, and why some show none. The 825 findings reduce to **247 distinct `(package, installed version)` roots**; the five largest roots are 41% of the whole backlog. One stale Go binary produced 62 issues; one `linux-libc-dev` produced 194.
+3. **Broken image attribution in the first baseline.** Component matching normalises image references with a substitution that breaks on digest-pinned refs, which is the mechanical cause of the 95 findings recorded with `Unknown` components — all from the 2026-04-07 baseline. One hundred and nine unattributed findings were nonetheless closed as confirmed, permanently recording a problem nobody can locate.
+4. **Missing kernel-package filter**, described above: 258 records, a quarter of the tracker.
+5. **No distroless or final-layer awareness**, so OS packages are reported against images that have no OS layer and npm packages against images with no Node runtime.
+6. **The documented "no severity assigned" filter does not work**, which is how two process-tracking issues entered the finding set.
+7. **The documented "dev/test only" filter tests the wrong condition** — it excludes a finding when no component is dev/test, rather than when all components are.
+
+## What is being done about it
+
+In priority order, and the order is deliberate: the first item is a person, not a tool.
+
+1. **Fill the rotating Security Champion role.** It is defined in the pipeline's governance document with a six-month term and a handover overlap, and it is currently unassigned. Nobody owns the triage clock, which is why 494 decisions landed in one day and none since. No amount of tooling substitutes for this.
+2. **Triage the genuinely urgent findings**, which the noise has been hiding. The audit surfaced several open findings whose severity and reachability warrant immediate attention ahead of the backlog, including a privilege-escalation path relevant to multi-tenant deployments and an authentication fail-open in a shipped component. These are being handled through the private channel rather than named here, per the disclosure rule below.
+3. **Close the write-back loop.** Findings should be keyed on `(vulnerability id, package, purl, target type, artifact reference by digest)` rather than on the CVE alone, and closed when the key is absent from two consecutive scans — distinguishing *no longer shipped* from *fixed*, so that deleting an image is never read as remediation. Fix attribution can then be derived deterministically by searching the main repository's history for the superseded digest, rather than by matching keywords in pull request titles.
+4. **Add the input filters** for kernel packages, header and development packages, distroless targets, final-layer-only language ecosystems, and a version-arithmetic gate that rejects a finding whose installed version predates the range the vulnerability was introduced in.
+5. **Deduplicate by root rather than by CVE**, which reduces the triage workload by roughly a factor of three without discarding information.
+6. **Re-scan against current versions**, which settles the 131 findings whose remediation is evidenced only by a carrier rebuild, and retire the unattributable baseline findings.
+
+## Disclosure rule
+
+Aggregate counts by severity are published. An individual finding is named once its fix is merged and released.
+
+Two revisions to that rule follow from this audit, and both make it more open rather than less. First, **findings with no upstream fix will be named, with mitigation guidance**, because there is nothing to wait for and withholding them serves nobody: adopters need to know that a mitigation is the only available control. Roughly a fifth of the backlog is in that state. Second, per-month attribution of remediation has been removed from the monthly reports, because a severity-banded count of still-open findings crossed with a single month's list of component bumps — which is publicly enumerable from the commit log — narrows the search for unpatched exposure more than a bare count does. That construct was a leak the original rule did not anticipate.
+
+What stays embargoed is narrow: findings where Cozystack's own packaging, defaults or integration logic introduces or worsens the exposure. Those have no upstream advisory, the project is the only source, and they follow the coordinated-disclosure process in [`SECURITY.md`](../../../SECURITY.md).
+
+## Provenance
+
+Generated 2026-08-11 from the tracker state on that date, cross-referenced against 660 pull requests merged into `cozystack/cozystack` between 2026-04-01 and 2026-08-10, the release tags carrying them, and the pipeline's 18 weekly scan reports. The tracker itself is not public, so these counts are self-attested; publishing the pipeline's policy documents and scanning scripts, so that the method can be audited independently of the numbers, is outstanding work.
diff --git a/docs/security/self-assessment.md b/docs/security/self-assessment.md
new file mode 100644
index 0000000000..cb83609042
--- /dev/null
+++ b/docs/security/self-assessment.md
@@ -0,0 +1,200 @@
+# Cozystack Self-assessment
+
+This document is a security self-assessment for [Cozystack](https://github.com/cozystack/cozystack), prepared by the Cozystack maintainers as part of the project's application for CNCF Incubation.
+
+## Metadata
+
+| | |
+| --- | --- |
+| Assessment Stage | Completed |
+| Software | <https://github.com/cozystack/cozystack> |
+| Security Provider | No. Cozystack is a cloud platform, not a security product; security is a supporting property, not its primary function. |
+| Languages | Go, Helm, shell |
+| SBOM | Not published at this time. Image builds can emit a CycloneDX SBOM attestation (`SBOM=1` in `hack/common-envs.mk`), but this is disabled by default; SBOM generation on release is a planned improvement. |
+
+### Security links
+
+| Document | URL |
+| --- | --- |
+| Security policy | <https://github.com/cozystack/cozystack/blob/main/SECURITY.md> |
+| Threat model | <https://github.com/cozystack/cozystack/blob/main/docs/security/threat-model.md> |
+| Governance | <https://github.com/cozystack/cozystack/blob/main/GOVERNANCE.md> |
+| Maintainers | <https://github.com/cozystack/cozystack/blob/main/MAINTAINERS.md> |
+| Contributor ladder | <https://github.com/cozystack/cozystack/blob/main/CONTRIBUTOR_LADDER.md> |
+| Code of Conduct | <https://github.com/cozystack/cozystack/blob/main/CODE_OF_CONDUCT.md> |
+| Adopters | <https://github.com/cozystack/cozystack/blob/main/ADOPTERS.md> |
+| OpenSSF Best Practices | <https://www.bestpractices.dev/projects/10177> |
+| OpenSSF Scorecard | <https://scorecard.dev/viewer/?uri=github.com/cozystack/cozystack> |
+
+## Overview
+
+Cozystack is an open-source Kubernetes-based platform for building cloud infrastructure and offering managed services (databases, virtual machines, tenant Kubernetes clusters) with multi-tenancy and GitOps delivery. This overview summarizes the security-relevant architecture; the full design-level threat model lives in the repository at [`docs/security/threat-model.md`](https://github.com/cozystack/cozystack/blob/main/docs/security/threat-model.md).
+
+### Background
+
+Cozystack is delivered as a **management (root) Kubernetes cluster** onto which tenants, managed services, virtual machines, and tenant Kubernetes clusters are layered. The centre of the security model is the aggregated API server **`cozystack-api`**. Tenants never write privileged Kubernetes objects (HelmRelease, Deployment, Secret, RBAC) directly. Instead they write thin, virtual `apps.cozystack.io/*` **Application** custom resources, and `cozystack-api` translates each one into a Flux `HelmRelease` whose chart reference is fixed server-side. The set of Application kinds is registered dynamically from `ApplicationDefinition` custom resources, so the platform's catalogue of managed services is data-driven rather than hard-coded.
+
+When OIDC is enabled (opt-in; `authentication.oidc.enabled` is off by default), authentication is centralized through Keycloak/OIDC; in the default OIDC-disabled mode the dashboard is fronted by a token-proxy. Authorization uses Kubernetes RBAC (with roles aggregated per tenant) plus ValidatingAdmissionPolicy. Networking isolation is provided by Cilium. Platform PKI (including the aggregated-API serving certificate) is issued by cert-manager. Tenant Kubernetes clusters run on dedicated Kamaji-hosted control planes with Talos worker nodes running as KubeVirt virtual machines.
+
+**Usage modes.** Cozystack is deployed in two ways. As a **managed-services backend** (roughly half of deployments), an external provisioning system authenticates with its own ServiceAccount and creates the tenant resources it needs — no OIDC involved. Used **directly**, a human is granted OIDC access to the dashboard and the Cozystack API and operates it, constrained by RBAC to the `apps.cozystack.io` group within their tenant.
+
+### Multitenancy model
+
+Cozystack combines hard and soft multitenancy:
+
+- **Hard multitenancy for tenant-controlled code.** Anything in which a tenant can run arbitrary code — VMs and tenant Kubernetes clusters — is isolated at the hardware-virtualization / dedicated-control-plane boundary, and the tenant has full access inside it. Those VMs and tenant-cluster nodes are themselves ordinary, unprivileged pods in the tenant namespace: governed by Pod Security Standards, denied access to the management-cluster API, and subject to the tenant network and admission policies.
+- **Soft multitenancy for managed data services.** Databases and queues run in the management cluster but expose only a fixed, validated set of parameters and never let a tenant execute arbitrary code (unsafe options are disabled). A tenant therefore cannot compromise the management cluster by swapping a container image or enabling a dangerous setting.
+
+### Actors
+
+Actors are decomposed by **trust boundary**: two components are distinct actors only when compromise of one does not automatically compromise the other. Cozystack has five trust tiers (T0 highest trust, T4 untrusted).
+
+| Actor | Trust tier | Privileges | Isolation mechanism |
+| --- | --- | --- | --- |
+| Platform / cluster administrator (`system:masters`) | T0 — root of trust | Full control of the management cluster; owns GitOps, Talos config, and the Keycloak realm. | Trusted by design; nothing isolates it. |
+| GitOps / Flux delivery layer | T1 — platform control plane | Reconciles HelmReleases/Kustomizations into arbitrary privileged manifests; effectively cluster-admin. | Tenants cannot create HelmReleases (RBAC); not tenant-network-reachable. |
+| `cozystack-api` aggregated API server | T1 — platform control plane | Converts tenant CRs into HelmReleases; can CRUD HelmReleases, Secrets, and Cilium policies cluster-wide. Acts as the policy-enforcing gateway. | Constrains tenants via fixed chart reference, name/quota/host validation, and admission. |
+| System operators / controllers | T1 — platform control plane | Domain-scoped cluster privileges (provision control planes, mint certs/secrets, program CNI). | Distinct ServiceAccounts; isolated from tenants by RBAC and network policy. |
+| Tenant administrator (OIDC `<tenant>-admin` / `<tenant>-super-admin`) | T2 — tenant boundary | CRUD on `apps.cozystack.io` application kinds and `sdn.cozystack.io/securitygroups` in its namespace subtree; read on pods/services/ingress plus `delete` on a fixed set (pods/services/endpoints/events); no create/update of arbitrary core resources. (The ClusterRole also lists `persistentvolumes`, but that grant is inert under the namespace-scoped RoleBinding, since PVs are cluster-scoped.) `super-admin` holds the `apps.cozystack.io/*` wildcard (and can create child `Tenant`s); `admin` has an enumerated allowlist excluding some kinds (e.g. `tenants`, `monitoring`, `etcd`, `ingress`). | Namespace-scoped RBAC + admission policies + quota; no HelmRelease or cross-tenant access. |
+| Tenant user (OIDC `<tenant>-view` / `<tenant>-use`) | T2 — tenant boundary | Read-only view plus operational verbs (VM console/vnc/portforward, start/stop/restart). Cannot create Application CRs. | Strictly dominated by tenant-admin; cannot escalate. |
+| Parent vs child (nested) tenant | T2 — tenant boundary | Parent ServiceAccounts bind into descendant namespaces; children do not bind upward. Quota hierarchically capped. | Ancestor→descendant trust is one-way. |
+| Tenant workloads / managed services | T3 — workload boundary | Run tenant-controlled code; no cluster-API rights beyond their ServiceAccount. | Namespace-scoped RBAC/identity isolate API objects; on the network, Cilium egress confines each tenant pod to its own subtree + platform system services + `world`, so unrelated tenants cannot reach each other over the pod network (enforced on egress; ingress is open to `cluster` — see Non-goals). |
+| Tenant Kubernetes clusters | T3 — workload boundary | Own kube-apiserver (Kamaji hosted control plane, running as pods on the management cluster) and Talos worker nodes as KubeVirt VMs. | Worker nodes carry a VM/kernel boundary; the Kamaji control-plane pods are isolated by namespace/RBAC/NetworkPolicy, not by virtualization. |
+| External end user / unauthenticated internet | T4 — untrusted | Reaches published gateway hostnames, the Keycloak login and dashboard oauth2-proxy, and any raw LoadBalancer L4 endpoints a tenant opts to expose (`external: true`, e.g. VPN/MariaDB). | OIDC authentication and hostname policies for the gateway path; Cilium `world` rules. Tenant-published LoadBalancer services are reachable directly, outside the hostname policies and OIDC. |
+
+### Actions
+
+| Action | Actors (from → to) | Data crossing boundary | Checks | Result |
+| --- | --- | --- | --- | --- |
+| Authenticate | End user (T4) → Keycloak → kube-apiserver | OIDC token (`groups`, `preferred_username`) | When OIDC is enabled (off by default): kube-apiserver OIDC verification; UIs fronted by oauth2-proxy (the `gatekeeper` Deployment). In the default OIDC-disabled mode the dashboard uses a token-proxy and the LINSTOR GUI is not externally exposed. | In OIDC mode, an identity whose `groups` map to the `<tenant>-view/use/admin/super-admin` roles. In the default mode the token-proxy forwards a Kubernetes-issued ServiceAccount JWT as the bearer token, so authorization follows that ServiceAccount's RBAC. The tenant ServiceAccount is bound into the tenant's view/use/admin **and super-admin** RoleBindings, so a holder of the tenant SA token has super-admin-level access over the tenant subtree (equivalent to the `<tenant>-super-admin` group), not merely the base `cozy:tenant` role. |
+| Create an application | Tenant admin (T2) → `cozystack-api` (T1) → Flux (T1) → workload (T3) | Application CR `spec` (Helm values only) | RBAC (delegated to kube-apiserver via `system:auth-delegator`); name and reserved-key validation; admission chain; **server-fixed chart reference**. | Managed service provisioned from a vetted chart; tenant never touched a HelmRelease. |
+| Create a tenant / nested tenant | Tenant super-admin (T2) → `cozystack-api` → Flux → new namespace (T2) | Tenant CR (`spec.host`, quotas) | Name checks; **best-effort hierarchical quota cap** (declaration-time snapshot; concurrent writes can briefly overshoot, with a runtime controller backstop); `cozystack-tenant-host-policy` restricts `spec.host` to trusted callers. | New tenant namespace with RBAC, NetworkPolicies, Keycloak groups, quota. |
+| Publish a hostname (Gateway/HTTPRoute/TLSRoute/GRPCRoute/Ingress) | Tenant Application spec (T2) → Flux/controllers (T1) → core kube-apiserver | Rendered Gateway/Route/Ingress hostnames; namespace host label | Tenants have **no** RBAC to write Gateways, Routes, Ingresses, or namespace labels — Flux/controllers render them from the tenant's Application spec. The hostname VAPs (Gateway/Route policies, and `cozystack-ingress-hostname-policy` for the default legacy-Ingress path) validate rendered hostnames against the namespace host label (defense-in-depth). The apex is platform-set (`cozystack-tenant-host-policy` restricts `Tenant.spec.host` to trusted callers; the namespace label is immutable). Route/namespace/Ingress policies fail-closed; the Gateway-listener policy is fail-open when the label is absent. | A tenant cannot claim or hijack another tenant's platform-apex hostname, provided its namespace carries the host label. |
+| Create a network policy | Tenant admin (T2) → `cozystack-api` | `sdn.cozystack.io/SecurityGroup` spec | RBAC; projected to a `CiliumNetworkPolicy` under the API server's ServiceAccount; tenants cannot write raw `cilium.io` objects. | CNI policy programmed on the tenant's behalf. |
+| Delete a platform-critical object | Any actor → core kube-apiserver | DELETE request | `cozystack-no-delete-guardrail` denies DELETE on `platform.cozystack.io/no-delete=true` objects. Operational guidance, not adversarial defense: an actor able to update the object can remove the label first (tenants cannot reach these roots; only T0/T1). | Accidental teardown of platform roots blocked. |
+| East-west traffic | Workload (T3) → workload/system | Packets | Cilium enforces policy at both endpoints. Each tenant pod's egress is confined to its own subtree, platform system services, and `world` (out-of-cluster); ingress is open to `world`+`cluster`. A flow needs the source's egress to allow it, so an unrelated tenant has no egress path to another tenant's pod. | Cross-tenant pod-to-pod traffic is **denied** (by source egress). Within a subtree, parent→descendant is allowed; child→parent is denied except for specific ancestor services (vminsert, etcd, ingress). Caveats (see Non-goals): open ingress and LoadBalancer hairpin. |
+
+### Goals
+
+- **Tenant isolation (API / identity layer).** A tenant cannot read, modify, or delete an *unrelated* tenant's Application CRs, workloads, or secrets, and a descendant cannot reach its ancestors. Parent→child access is intentional (ancestor ServiceAccounts and OIDC groups are bound one-way into descendant namespaces).
+- **Network isolation between unrelated tenants.** Unrelated tenants cannot reach each other over the pod network: each tenant pod's Cilium egress is confined to its own subtree, platform system services, and `world`, and Cilium requires the source's egress to allow a flow — so there is no egress path between unrelated subtrees. Enforced on egress; ingress is permissively open (see Non-goals for caveats).
+- **Constrained self-service provisioning.** Tenants may instantiate only vetted `ApplicationDefinition` kinds with server-fixed chart references; they cannot run arbitrary Helm charts or write raw privileged manifests.
+- **Hostname and tenancy integrity.** Tenants cannot claim or hijack a platform-apex hostname belonging to another tenant, on both dataplanes. Gateway API path: HTTPRoute/TLSRoute/GRPCRoute/Gateway-listener hostnames must be within the tenant's own apex. Default legacy-Ingress path (`cozystack-ingress-hostname-policy`): a hostname within the tenant's own apex or entirely outside the platform root apex (an external custom domain, e.g. a tenant Kubernetes cluster's Proxied ingress) is allowed, while a hostname under the platform root apex but outside the tenant's own sub-apex — plus hostless rules and `defaultBackend` catch-alls — is denied. Route, namespace and Ingress policies are fail-closed; the Gateway-listener policy is fail-open when the label is absent and relies on the platform-set, immutable `namespace.cozystack.io/host` label.
+- **Hierarchical resource-quota enforcement (best-effort).** At declaration time a child tenant's declared quota is checked against its parent's remaining budget; the check is a non-transactional admission snapshot (concurrent writes can briefly overshoot) with the tenant-quota controller as the runtime backstop.
+- **Strong isolation for tenant Kubernetes/VM workloads** via Talos worker nodes as KubeVirt VMs (hardware virtualization); the tenant control plane is a Kamaji hosted control plane running as pods on the management cluster, isolated by namespace/RBAC/network rather than by virtualization.
+- **Central, token-based authentication** when OIDC is enabled (opt-in; off by default): Keycloak/OIDC with group-to-role mapping into RBAC. The default OIDC-disabled mode fronts the dashboard with a token-proxy instead.
+- **Defense in depth at admission**, enforced at both the core kube-apiserver and the aggregated `cozystack-api`, with mostly fail-closed tenancy policies (the Gateway-listener policy is the documented exception noted above).
+- **Accidental-deletion protection** for platform-critical roots via the no-delete guardrail (operational guidance, not adversarial defense — a privileged T0/T1 actor can remove the label and delete).
+
+### Non-goals
+
+- Defending against a compromised **cluster administrator, node root, or infrastructure administrator** — trusted by design and out of scope (`SECURITY.md`).
+- Treating the **T1 platform control plane** (`cozystack-api` ServiceAccount, Flux, system operators) as a sandbox; these hold cluster-admin-equivalent power.
+- **Upstream-only vulnerabilities** not introduced or worsened by Cozystack packaging or defaults.
+- **Ingress-side isolation of tenant pods.** Tenant-pod ingress is open to `world` and `cluster`, so a tenant pod is reachable by any in-cluster peer whose own egress permits it (platform components) or by a workload not governed by Cozystack's tenant egress policies. Cross-tenant isolation is enforced on the *egress* side, not tenant-pod ingress.
+- **Blocking cross-tenant reachability through externally-exposed services.** If a tenant publishes a LoadBalancer external IP, another tenant can reach it via `world` egress.
+- **Network isolation between tenants on a hosted cluster without Cilium.** On the `isp-hosted` and `isp-hosted-slim` variants the CNI belongs to the host, and tenant Cilium policies are created only if the host serves the Cilium policy API. Without it, tenants get no network isolation from Cozystack, and isolating them is up to the host.
+- **Noisy-neighbour / side-channel** guarantees for co-located tenant pods beyond namespace scoping (and, for tenant Kubernetes/VMs, virtualization).
+- Acting as an **egress firewall**: tenant workloads may egress to `world` by default.
+- Supporting **pre-release builds and end-of-life versions**.
+
+## Self-assessment use
+
+This self-assessment is created by the Cozystack team to perform an internal analysis of the project's security. It is not intended to provide a security audit of Cozystack, or function as an independent assessment or attestation of Cozystack's security health.
+
+This document serves to provide Cozystack users with an initial understanding of Cozystack's security, where to find existing security documentation, Cozystack's plans for security, and a general overview of Cozystack security practices, both for the development of Cozystack as well as the security of Cozystack.
+
+This document provides the CNCF TAG-Security with an initial understanding of Cozystack to assist in a joint assessment, necessary for projects under incubation. Taken together, this document and the joint assessment serve as a cornerstone for if and when Cozystack seeks graduation and is preparing for a security audit.
+
+## Security functions and features
+
+### Critical
+
+These components are load-bearing: a failure or compromise directly defeats a tenant-isolation or platform-integrity guarantee.
+
+- **`cozystack-api` (aggregated API server).** Converts tenant Application CRs into Flux HelmReleases with a server-fixed chart reference, and enforces name/quota/host validation plus in-process admission. The primary control that constrains what tenants can provision.
+- **Core kube-apiserver + RBAC + ValidatingAdmissionPolicy.** Per-tenant aggregated ClusterRoles grant no HelmRelease or arbitrary core writes; VAPs enforce hostname/tenancy integrity (mostly fail-closed — see Overview) and deletion protection.
+- **Flux (source/helm/kustomize controllers).** Executes releases with cluster-admin-equivalent power; the delivery mechanism for all platform and tenant workloads.
+- **Cilium.** The sole enforcement of network isolation between tenants; also the backend for tenant `SecurityGroup` policies.
+- **Keycloak** (when OIDC is enabled; opt-in, off by default). The identity source whose OIDC group claims drive RBAC.
+- **cert-manager.** Mints the aggregated-API serving CA (the trust anchor for the `apps.cozystack.io` API) and tenant TLS.
+- **Kamaji + KubeVirt + Talos** (for tenant Kubernetes clusters). Provide hardware-virtualized isolation for tenant worker nodes; the Kamaji control plane runs as pods on the management cluster.
+
+### Security relevant
+
+These support security but are more contained; a compromise is less likely to escalate on its own.
+
+- **Cozystack controllers/reconcilers** (`ApplicationDefinition`, tenant gateway/ReferenceGrant, quota, workload monitors).
+- **oauth2-proxy front doors** (the `gatekeeper` Deployment) for the dashboard and LINSTOR GUI.
+- **external-secrets-operator, clustersecret-operator, OpenBao** for secret sync, replication, and vaulting.
+- **Curated tenant registries** (`tenantsecret`, `tenantmodule`, `tenantnamespace`) that expose only labelled resources and strip internal labels.
+- **reloader, flux-plunger, kube-ovn webhook, lineage-controller webhook.**
+
+The primary trust-boundary invariant is that tenants cannot influence the chart reference, `valuesFrom`, or write HelmReleases directly. Any change to tenant RBAC or the Application REST layer that weakened this would collapse T2→T1 isolation and should be reviewed accordingly.
+
+## Project compliance
+
+Cozystack does not currently claim compliance with, or certification against, any specific security standard or regulatory framework (for example PCI-DSS, ISO 27001, SOC 2, or GDPR). Downstream adopters may operate Cozystack within their own compliance programs, but the project itself makes no formal attestation.
+
+## Secure development practices
+
+### Development Pipeline
+
+- **Source control and review.** All changes land through GitHub pull requests. `.github/CODEOWNERS` requires maintainer review; the project deliberately requires a single approving review rather than two, to keep contribution velocity acceptable (branch protection requiring multiple reviews was considered and intentionally not adopted).
+- **Commit sign-off (DCO).** Contributor guidance requires `--signoff` on every commit (`docs/agents/contributing.md`, `.gemini/styleguide.md`), and DCO is **enforced by an automated DCO check on every pull request**. Remaining refinements are to surface the sign-off requirement in the top-level `CONTRIBUTING.md` and to add the DCO check to the branch-protection required-checks list so it is a hard merge gate as well as a reported check.
+- **Automated checks on pull requests.** A pre-commit workflow validates generated-code/schema freshness; unit and end-to-end tests run in CI.
+- **Static analysis (SAST).** CodeQL runs on pull requests, on push to `main`, and weekly (Go, manual build mode), intended as a required check that blocks merge on new error-severity alerts. It is not yet in the required-checks list on `main` (currently `pre-commit` and `E2E Tests`), so the gate is review convention rather than branch protection. `zizmor` additionally audits the GitHub Actions workflows on pull requests and fails the check on unpinned actions and over-broad `permissions`. Additional Go linters (`gosec`, `govulncheck`, `golangci-lint`) are not yet wired into CI and are a planned improvement.
+- **Dependency and image CVE scanning (SCA).** An organization-wide pipeline built on Trivy scans every non-fork, non-archived repository in the `cozystack` organization — Go modules, Dockerfile base images, and container images referenced by the packaged charts — against NVD, vendor advisories and the GitHub Advisory Database. CRITICAL findings are scanned every 6 hours, the remaining severities weekly; findings are noise-filtered and tracked as issues under a triage matrix with per-severity targets (CRITICAL 1 business day to triage, 7-day fix target). Two limitations are worth stating: image references assembled at render time by the `cozy-lib.image` helper are invisible to values-file discovery, and per-CVE findings and triage state are currently held in a private repository, so the control is not yet externally verifiable. Aggregate reporting is now published at [`docs/security/reports/`](reports/): monthly reports reduced to counts by severity, plus a backlog reconciliation auditing every tracked finding against what shipped. Publishing the pipeline policy, the triage matrix, the finding status model and the scanning scripts, while keeping per-finding detail embargoed until fixed, is outstanding. The documented triage target is not being met and the role that owns it is unassigned; remediation is happening but the pipeline cannot record it, and the reconciliation sets out both.
+- **Dependency updates.** Renovate manages Go modules, Dockerfiles, and GitHub Actions, plus a small set of regex-pinned references, with OpenSSF OSV vulnerability alerts enabled and automerge disabled. The `helm-values` manager is disabled repo-wide, so the curated component images that make up the shipped platform are bumped by maintainers when preparing a release rather than automatically. There is no Dependabot configuration; Renovate is the dependency-update tool.
+- **Supply-chain posture.** OpenSSF Scorecard runs weekly with published results. Most GitHub Actions are pinned by commit SHA; a small number of recently added workflows still use floating tags and are being brought into line. Renovate is configured to pin digests; applying digest pins across container base images is in progress.
+- **Signed / reproducible builds.** Honestly noted as gaps: release images are **not** signed (no cosign/sigstore), build provenance is currently disabled (`--provenance=false`), SBOM generation is plumbed but off by default, and reproducible builds are not yet established. These are recognized improvement areas for the incubation timeframe.
+
+### Communication Channels
+
+- **Internal.** Maintainers coordinate over Slack, Telegram, and project email (`cncf-cozystack-*` addresses), and in community meetings.
+- **Inbound.** Users reach the project through GitHub issues and Discussions; security reports follow the private routing in `SECURITY.md` (see below).
+- **Outbound.** The project announces releases and security fixes through GitHub Releases, in-repository changelogs, the documentation site at <https://cozystack.io>, and GitHub Security Advisories (GHSA) when applicable.
+
+### Ecosystem
+
+Cozystack is a CNCF Sandbox project. It is built on and integrates a broad set of cloud-native components — Kubernetes, Flux, Cilium, KubeVirt, Kamaji, Talos, cert-manager, external-secrets, and Keycloak — and positions itself as a full platform layer for building managed-service clouds on top of Kubernetes.
+
+## Security issue resolution
+
+### Responsible Disclosures Process
+
+The vulnerability reporting process is documented in [`SECURITY.md`](https://github.com/cozystack/cozystack/blob/main/SECURITY.md). Reporters are asked not to use public issues, discussions, pull requests, or chat channels for vulnerabilities.
+
+The private intake channel is **GitHub Private Vulnerability Reporting** (repository → **Security → Advisories → Report a vulnerability**), the CNCF-recommended path for confidential disclosure; it is enabled on the repository. As a fallback, reporters may contact a maintainer listed in [`MAINTAINERS.md`](https://github.com/cozystack/cozystack/blob/main/MAINTAINERS.md) through an existing private channel, or use a public channel only to request a private contact path without disclosing details. A dedicated security mailing list may be added later but is not required given Private Vulnerability Reporting is available. `SECURITY.md` and the code-ownership model are aligned: it routes reporters to Private Vulnerability Reporting and `MAINTAINERS.md` (the governance roster), while `CODEOWNERS` separately encodes the area-scoped **Reviewer** role from the Contributor Ladder.
+
+#### Vulnerability Response Process
+
+Per `SECURITY.md`, the maintainers commit to:
+
+- Acknowledge receipt within **3 business days**.
+- Perform initial triage and severity assessment within **7 business days**.
+- Keep the reporter informed as a fix and disclosure plan are developed.
+
+Resolution follows a coordinated-disclosure model: reporters are asked to keep details private until a fix or mitigation is available and users have had a reasonable opportunity to upgrade. The project commits to a coordinated-disclosure window of **up to 90 days** from acknowledgement, after which the advisory may be published (via GHSA) with available details and workarounds even if a complete fix is not yet ready; extensions apply only by mutual agreement, typically for issues requiring upstream coordination. Target remediation timelines track CVSS v3.1 severity (Critical ~14 days, High ~30, Medium ~90, Low next scheduled release). The project may request or publish a GHSA and/or CVE. Reporters are credited unless anonymity is requested. See [`SECURITY.md`](https://github.com/cozystack/cozystack/blob/main/SECURITY.md) for the authoritative statement.
+
+### Incident Response
+
+Detailed operational incident-response procedures are maintained by the maintainers in a private security pipeline, and a public summary is published at [`docs/security/incident-response.md`](https://github.com/cozystack/cozystack/blob/main/docs/security/incident-response.md). The public runbook stitches the existing mechanisms into a single incident lifecycle: intake and triage via `SECURITY.md`, private fix development under a GitHub Security Advisory, coordinated patch releases and backports across supported lines, GHSA/CVE publication, public disclosure through the outbound channels (release notes, changelog, GHSA), and the access-revocation and credential-rotation steps defined in `CONTRIBUTOR_LADDER.md` (completed within five business days).
+
+## Appendix
+
+### Known Issues Over Time
+
+Cozystack uses GitHub Security Advisories (GHSA) to track vulnerabilities and GitHub Private Vulnerability Reporting for confidential intake. No advisories have been published to date; as issues are resolved under coordinated disclosure they will be published as GitHub Security Advisories on the repository, building the public history over time.
+
+### OpenSSF Best Practices
+
+Cozystack participates in the OpenSSF Best Practices Badge program as project [#10177](https://www.bestpractices.dev/projects/10177) (the badge is shown in the repository README). The project **achieved the passing-level badge on 2026-04-01** and is now working toward the silver tier; the live status is reflected on the badge page. Cozystack also runs OpenSSF Scorecard weekly with published results.
+
+### Case Studies
+
+Cozystack is used in production by the organizations listed in [`ADOPTERS.md`](https://github.com/cozystack/cozystack/blob/main/ADOPTERS.md), including Ænix (managed services for cloud providers), Mediatech (Kubernetes distribution for hosted software), Bootstack (cloud-infrastructure operator), gohost (bare-metal Kubernetes), Urmanac (hosting, including WASM/SpinKube), Hidora / Hikube (sovereign multi-datacenter cloud), QOSI (sovereign GPU clouds for a national AI program), and Cloupard (public IaaS/PaaS on bare metal). These adopters exercise the multi-tenancy and managed-service model described above across several regions.
+
+### Related Projects / Vendors
+
+Cozystack occupies a space adjacent to platforms such as Deckhouse, Rancher/RKE, Red Hat OpenShift, and KubeVirt-based virtualization platforms. Its distinguishing security-relevant characteristics are: an aggregated API server that exposes managed services as virtual `apps.cozystack.io` resources (so tenants provision from vetted charts rather than writing Helm/manifests directly), tenant isolation enforced through RBAC plus native ValidatingAdmissionPolicy, and hardware-virtualized tenant Kubernetes clusters built on Talos and KubeVirt.
diff --git a/docs/security/threat-model.md b/docs/security/threat-model.md
new file mode 100644
index 0000000000..9790d95913
--- /dev/null
+++ b/docs/security/threat-model.md
@@ -0,0 +1,121 @@
+# Cozystack Threat Model
+
+This document is a design-level threat model for Cozystack. It describes the actors in the system, the actions that cross trust boundaries, and the security guarantees the platform intends (and does not intend) to provide. It is organized around **trust boundaries**, following the CNCF TAG-Security "Actors / Actions" model, and is intended both as internal security documentation and as the basis for the project's CNCF self-assessment.
+
+Scope: this is a *design-level* analysis of the Cozystack platform (the management cluster and its multi-tenancy model). It is not a code audit and does not enumerate implementation-specific bugs or misconfigurations. All architectural claims cite source files in this repository so the model can be re-verified as the code evolves.
+
+## Background
+
+Cozystack is delivered as a **management (root) Kubernetes cluster** onto which tenants, managed services, virtual machines, and tenant Kubernetes clusters are layered. The linchpin of the security model is the aggregated API server **`cozystack-api`** (`cmd/cozystack-api`, `pkg/apiserver`, `pkg/registry`). Tenants never write privileged Kubernetes objects (HelmRelease, Deployment, Secret, RBAC) directly. Instead they write thin, virtual `apps.cozystack.io/*` **Application** custom resources, and `cozystack-api` translates each one 1:1 into a Flux `HelmRelease` whose chart reference is fixed server-side.
+
+`cozystack-api` serves three aggregated API groups (`pkg/apiserver/apiserver.go`): `core.cozystack.io/v1alpha1` (`tenantnamespaces`, `tenantsecrets`, `tenantmodules`, `options`), `sdn.cozystack.io/v1alpha1` (`securitygroups`), and `apps.cozystack.io/v1alpha1` (the per-tenant Application kinds). The set of Application kinds is registered **dynamically** at startup from `ApplicationDefinition` custom resources (`pkg/cmd/server/start.go`, `api/v1alpha1/applicationdefinitions_types.go`); when an `ApplicationDefinition` changes, `internal/controller/applicationdefinition_controller.go` rolls the `cozystack-api` Deployment so the new kinds are served. The server is registered with the main kube-apiserver as an `APIService` over TLS whose CA is minted by cert-manager (`packages/system/cozystack-api/templates/`).
+
+Application storage is a **virtual REST backed by HelmReleases**, not etcd (`pkg/registry/apps/application/rest.go`). On create/update the tenant supplies only `app.Spec` (the Helm values) plus labels and annotations; the chart reference, release-name prefix, and the platform `cozystack-values` Secret mounted as `valuesFrom` all come from server-side configuration, not from the tenant (`pkg/registry/apps/application/rest.go` around the HelmRelease construction; `pkg/config/config.go`). Values keys beginning with `_` are reserved and rejected.
+
+**Usage modes.** Cozystack is deployed in two ways. As a **managed-services backend** (roughly half of deployments), an external provisioning system authenticates with its own ServiceAccount and creates the tenant resources it needs — no OIDC involved. Used **directly**, a human is granted OIDC access to the dashboard and the Cozystack API and operates it, constrained by RBAC to the `apps.cozystack.io` group within their tenant.
+
+## Multitenancy model
+
+Cozystack combines hard and soft multitenancy:
+
+- **Hard multitenancy for tenant-controlled code.** Anything in which a tenant can run arbitrary code — VMs and tenant Kubernetes clusters — is isolated at the hardware-virtualization / dedicated-control-plane boundary, and the tenant has full access inside it. Those VMs and tenant-cluster nodes are themselves ordinary, unprivileged pods in the tenant namespace: governed by Pod Security Standards, denied access to the management-cluster API, and subject to the tenant network and admission policies.
+- **Soft multitenancy for managed data services.** Databases and queues run in the management cluster but expose only a fixed, validated set of parameters and never let a tenant execute arbitrary code (unsafe options are disabled). A tenant therefore cannot compromise the management cluster by swapping a container image or enabling a dangerous setting.
+
+## Trust boundaries
+
+The actors below are decomposed **by trust boundary**, not by component: two components are distinct actors only when compromise of one does not automatically compromise the other. Cozystack has five trust tiers.
+
+- **T0 — Root of trust.** The platform / cluster administrator (`system:masters`), who owns the management cluster, the platform GitOps repository, Talos machine configuration, and the Keycloak realm. Nothing sits above T0. A compromised T0 is explicitly out of the adversary model (see Non-goals and `SECURITY.md`).
+- **T1 — Platform control plane (cluster-admin-equivalent).** The GitOps delivery layer (Flux source-, helm-, and kustomize-controllers plus `flux-shard-operator`), the `cozystack-api` aggregated API server's own ServiceAccount, and the system operators (the Cozystack controllers, plus Kamaji, KubeVirt, cert-manager, external-secrets, keycloak-operator, Piraeus/LINSTOR, Cluster API providers, and others). These components hold broad, cluster-admin-equivalent privileges. They *enforce* tenant boundaries but are not themselves sandboxed from one another or from the host.
+- **T2 — Tenant boundary.** Tenant administrators and tenant users, scoped to a tenant namespace subtree. This is the primary isolation unit. Tenancy is hierarchical: a parent tenant's ServiceAccounts are bound into every descendant namespace, but child ServiceAccounts are not bound upward, so ancestor→descendant trust is one-way.
+- **T3 — Workload boundary.** Tenant workloads, managed-service pods, KubeVirt virtual machines, and tenant Kubernetes clusters (each a dedicated Kamaji-hosted control plane with Talos worker nodes running as VMs). These run tenant-controlled code with no cluster-API rights beyond their own ServiceAccounts.
+- **T4 — Untrusted.** External end users and the unauthenticated internet. They reach published ingress/gateway hostnames and the UI front doors (when OIDC is enabled, the Keycloak login and dashboard oauth2-proxy; by default, OIDC-disabled, the dashboard token-proxy) — and, when a tenant opts into external exposure (e.g. `external: true` on apps such as VPN or MariaDB), the raw LoadBalancer L4 endpoints those apps publish, which sit outside the Gateway/OIDC path.
+
+## Actors
+
+| Actor | Trust tier | Privileges | Isolation mechanism (separated from neighbours by) |
+| --- | --- | --- | --- |
+| Platform / cluster admin (`system:masters`) | T0 | Full control of the management cluster; owns GitOps, Talos config, Keycloak realm; may set/change a tenant's `spec.host`. | Root of trust; nothing isolates it (trusted by design). |
+| GitOps / Flux delivery layer | T1 | Reconciles HelmReleases/Kustomizations into arbitrary privileged manifests; effectively cluster-admin. | Tenants cannot create HelmReleases/Kustomizations (RBAC); not tenant-network-reachable. |
+| `cozystack-api` aggregated API server (ServiceAccount) | T1 | CRUD HelmReleases, Secrets, and CiliumNetworkPolicies cluster-wide; reads Namespaces/RBAC/quotas/nodes. Acts as the policy-enforcing gateway that converts tenant CRs to HelmReleases. | A distinct, network-exposed attack surface from Flux; constrains tenants via fixed chart ref + name/quota/host validation + admission. |
+| System operators / controllers | T1 | Domain-scoped cluster privileges (provision control planes, mint certs/secrets, program CNI). | Distinct ServiceAccounts, but all cluster-admin-adjacent; isolated from tenants only by RBAC and network policy. |
+| Tenant administrator (OIDC groups `<tenant>-admin`, `<tenant>-super-admin`) | T2 | CRUD on `apps.cozystack.io` application kinds and `sdn.cozystack.io/securitygroups` within its namespace subtree; read on pods/services/ingress plus `delete` on a fixed set (pods/services/endpoints/events); no create/update of arbitrary core resources. (The ClusterRole also lists `persistentvolumes`, but that grant is inert under the namespace-scoped RoleBinding, since PVs are cluster-scoped.) The `<tenant>-super-admin` group holds the `apps.cozystack.io/*` wildcard (and so can create child `Tenant`s); the `<tenant>-admin` group has an enumerated allowlist that excludes some kinds (e.g. `tenants`, `monitoring`, `etcd`, `ingress`, `external-dns`, `bootbox`). | Namespace-scoped RoleBindings + admission policies + quota; no access to HelmReleases, arbitrary core writes, or other tenants. |
+| Tenant user (OIDC groups `<tenant>-view`, `<tenant>-use`) | T2 | Read-only view of Application CRs, pods, and services, plus operational verbs only (VM console/vnc/portforward, start/stop/restart). Cannot create Application CRs. | Strictly dominated by tenant-admin; cannot escalate to create/delete, so it is a distinct actor. |
+| Parent tenant vs child (nested) tenant | T2 | Parent ServiceAccounts are bound into descendant namespaces; child ServiceAccounts are not bound upward. Quota is hierarchically capped. | Ancestor→descendant only; compromising a parent compromises its children, not the reverse. |
+| Tenant workloads / managed services | T3 | Run tenant-controlled code; no cluster-API rights beyond their ServiceAccount. | Namespace-scoped RBAC/identity isolate their API objects. On the network, Cilium egress confines each tenant pod to its own tenant subtree, platform system services, and `world` (out-of-cluster), so unrelated tenants cannot reach each other over the pod network — enforced on the egress side (tenant-pod ingress is open to `cluster`; see Non-goals for residual caveats). |
+| Tenant Kubernetes clusters | T3 | Own kube-apiserver (a Kamaji hosted control plane running as pods on the management cluster) and Talos worker nodes running as hardware-virtualized KubeVirt VMs. | Worker nodes carry a VM/kernel boundary (do not share a kernel with the host or other tenants). The Kamaji control-plane pods run on the management cluster and are isolated by namespace/RBAC/NetworkPolicy, not by virtualization. |
+| External end user / unauthenticated internet | T4 | Reaches published gateway hostnames, the UI front door (Keycloak + dashboard oauth2-proxy when OIDC is enabled; a token-proxy by default), and any raw LoadBalancer L4 endpoints a tenant opts to expose (`external: true`). | OIDC authentication (when enabled) and hostname admission policies for the gateway path; Cilium `world`-entity rules. Tenant-published LoadBalancer services are reachable directly and are not behind the hostname policies or OIDC. |
+
+## Actions
+
+| Action | Actors (from → to) | Data crossing boundary | Authorization / validation checks | Result |
+| --- | --- | --- | --- | --- |
+| Authenticate | End user (T4) → Keycloak → kube-apiserver / dashboard | OIDC token with `groups` and `preferred_username` claims | When OIDC is enabled (`authentication.oidc.enabled`, **off by default**): kube-apiserver OIDC verification; dashboard and LINSTOR GUI fronted by oauth2-proxy (the `gatekeeper` Deployment); tenant kubeconfig uses `kubectl oidc-login`. In the default OIDC-disabled mode the dashboard uses a `token-proxy` and the LINSTOR GUI is not externally exposed. | In OIDC mode, an authenticated identity whose `groups` map to RBAC subjects (the `<tenant>-view/use/admin/super-admin` roles). In the default mode the `token-proxy` forwards a Kubernetes-issued ServiceAccount JWT as the bearer token, so authorization is whatever that ServiceAccount's RBAC grants. The tenant ServiceAccount is bound (via `tenant.yaml`) into the tenant's view/use/admin **and super-admin** RoleBindings, so a holder of the tenant SA token has super-admin-level access over the tenant subtree — equivalent to the `<tenant>-super-admin` OIDC group, not merely the base `cozy:tenant` role. |
+| Create an application (e.g. `apps.cozystack.io/Postgres`) | Tenant admin (T2) → `cozystack-api` (T1) → Flux (T1) → workload (T3) | Application CR `spec` (Helm values only) | RBAC allows `apps.cozystack.io/*` create in the tenant namespace (delegated to kube-apiserver via `system:auth-delegator`); `cozystack-api` validates the name, rejects `_`-prefixed keys, and runs the admission chain; the emitted HelmRelease uses a **server-fixed chart reference**. | Managed service provisioned from a vetted chart; the tenant never touched a HelmRelease or chart. |
+| Create a tenant / nested tenant (`apps.cozystack.io/Tenant`) | Tenant super-admin (T2) → `cozystack-api` → Flux → new namespace (T2) | Tenant CR (`spec.host`, quotas, feature toggles) | Namespace-name checks and a **best-effort hierarchical quota cap** (a declaration-time snapshot: a child's declared quota is checked against the parent's remaining budget; concurrent writes can briefly overshoot, with the tenant-quota controller as the runtime backstop); the `cozystack-tenant-host-policy` admission policy allows only trusted callers to set/change `spec.host`. | New tenant namespace with RBAC bindings, NetworkPolicies, Keycloak groups, quota, and gateway inheritance. |
+| Publish a hostname (Gateway / HTTPRoute / TLSRoute / GRPCRoute / Ingress) | Tenant Application spec (T2) → Flux / controllers (T1) → core kube-apiserver | Rendered Gateway listener, Route, and Ingress hostnames; namespace `namespace.cozystack.io/host` label | Tenants have **no** RBAC to write Gateways, Routes, Ingresses, or namespace labels; these are rendered by Flux/controllers from the tenant's Application spec. The hostname VAPs then validate the rendered hostnames against the namespace host label as defense-in-depth (so neither a tenant-authored spec nor a buggy chart escapes the apex). The apex itself is platform-set: `cozystack-tenant-host-policy` restricts `Tenant.spec.host` to trusted callers and the namespace-host-label policy keeps the label immutable. The Gateway path requires strict in-apex hostnames; the default legacy-Ingress path (`cozystack-ingress-hostname-policy`) additionally allows external custom domains (outside the platform root apex) while denying platform-apex claims outside the tenant's own sub-apex. Route/namespace/Ingress policies are fail-closed; the Gateway-listener policy is fail-open when the label is absent (see Admission enforcement points). | A tenant cannot publish or hijack another tenant's platform-apex hostname, provided its namespace carries the platform-set host label. |
+| Create a network policy (`sdn.cozystack.io/SecurityGroup`) | Tenant admin (T2) → `cozystack-api` | SecurityGroup spec | RBAC on `securitygroups`; `cozystack-api` projects the spec into a `CiliumNetworkPolicy` under its own ServiceAccount; tenants cannot write raw `cilium.io` objects. | CNI policy programmed on the tenant's behalf. |
+| Delete a platform-critical object | Any actor → core kube-apiserver | DELETE request | The `cozystack-no-delete-guardrail` policy denies DELETE on objects labelled `platform.cozystack.io/no-delete=true` (e.g. the tenant-root namespace and its HelmRelease). It is operational guidance, not adversarial defense: an actor able to update the object can remove the label and then delete (tenants have no access to these roots; only T0/T1 do). | Accidental teardown of platform roots is blocked. |
+| Tenant-to-tenant / tenant-to-platform traffic | Workload (T3) → workload (T3) / system | East-west packets | Cilium enforces policy at **both** endpoints, so a flow needs the source's egress *and* the destination's ingress to allow it. Every tenant pod's egress is confined to its own tenant subtree (namespaces labelled `tenant.cozystack.io/<tenant>`), platform system services (DNS, apiserver, ingress, dashboard, Keycloak, CDI), and `world` (out-of-cluster). Ingress is permissively open to `world` and `cluster`. | Cross-tenant pod-to-pod traffic is **denied** — an unrelated tenant has no egress path to another tenant's pod, even though that pod's ingress would accept it. Within a tenant subtree, parent→descendant traffic is allowed (descendants carry ancestor namespace labels); child→parent traffic is denied except for specific ancestor services (vminsert, etcd, ingress). See Non-goals for the ingress-side and LoadBalancer caveats. |
+| Distribute platform config to tenants | Platform (T1) → tenant namespace (T2) | `cozystack-values` Secret (cluster/namespace host, OIDC toggles, gateway references) | Rendered by the platform charts and merged into every tenant HelmRelease as `valuesFrom`. | Tenants inherit platform config (host apex, etc.) but cannot forge it. |
+
+## Goals
+
+Cozystack intends to provide the following security guarantees:
+
+- **Tenant isolation (API / identity layer).** A tenant cannot read, modify, or delete an *unrelated* tenant's Application CRs, workloads, or secrets, and a descendant tenant cannot reach its ancestors. Parent→child access is intentional and not a violation: an ancestor's ServiceAccounts and OIDC groups are bound into descendant namespaces (one-way), so a parent tenant can act within its children. Isolation is enforced by namespace-scoped RBAC (`packages/system/cozystack-basics/templates/clusterroles.yaml`) and that one-way hierarchical binding (`packages/apps/tenant/templates/tenant.yaml`, helper `cozy-lib.rbac.subjectsForTenantAndAccessLevel`).
+- **Network isolation between unrelated tenants.** An unrelated tenant's pods cannot reach a tenant's pods over the cluster pod network: each tenant pod's Cilium egress is confined to its own tenant subtree, platform system services, and `world` (`packages/apps/tenant/templates/networkpolicy.yaml`), and Cilium requires the source's egress to allow a flow — so there is no egress path between unrelated subtrees. Isolation is enforced on the egress side; tenant-pod ingress is permissively open (see Non-goals for the caveats this creates).
+- **Constrained self-service provisioning.** Tenants may instantiate only vetted `ApplicationDefinition` kinds with **server-fixed chart references** and cannot run arbitrary Helm charts, create HelmReleases, or write raw privileged manifests.
+- **Hostname and tenancy integrity.** Tenants cannot claim or hijack a hostname under the platform apex that belongs to another tenant, on both dataplanes. On the Gateway API path, Gateway-listener and HTTPRoute/TLSRoute/GRPCRoute hostnames must be within the tenant's own apex (`namespace.cozystack.io/host`). On the default legacy-Ingress path, `cozystack-ingress-hostname-policy` allows a hostname within the tenant's own apex or entirely outside the platform root apex (`_cluster.root-host`) — an external custom domain, e.g. a tenant Kubernetes cluster's Proxied ingress — and denies any hostname under the platform root apex but outside the tenant's own sub-apex, plus hostless rules and `spec.defaultBackend` catch-alls. The Tenant-CR host, namespace-host-label, HTTPRoute/TLSRoute/GRPCRoute, and Ingress policies are fail-closed; the Gateway-listener policy is permissive when the host label is absent and so relies on that label being present and immutable (see Admission enforcement points). Policies: `packages/system/cozystack-basics/templates/gateway-hostname-policy.yaml`, `route-hostname-policy.yaml`, `ingress-hostname-policy.yaml`.
+- **Hierarchical resource-quota enforcement (best-effort).** At declaration time a child tenant's declared quota is checked against its parent's remaining budget (`pkg/registry/apps/application/quota.go`). The check is a non-transactional admission snapshot: concurrent tenant writes can briefly overshoot the parent budget, and the tenant-quota controller is the runtime backstop.
+- **Strong isolation for tenant Kubernetes and VM workloads** via Talos worker nodes running as KubeVirt VMs (hardware virtualization). The tenant control plane itself is a Kamaji hosted control plane running as pods on the management cluster, isolated by namespace/RBAC/network rather than by virtualization.
+- **Central, token-based authentication** when OIDC is enabled (opt-in; `authentication.oidc.enabled` is off by default): Keycloak/OIDC with group-to-role mapping into kube-apiserver RBAC and UI access mediated by oauth2-proxy. In the default OIDC-disabled mode the dashboard is fronted by a token-proxy instead.
+- **Defense in depth at admission.** ValidatingAdmissionPolicy is enforced at two points — the core kube-apiserver for core and Gateway objects, and inside `cozystack-api` for aggregated `apps.cozystack.io` kinds — and most tenancy policies are fail-closed (the Gateway-listener policy is the documented exception; see Admission enforcement points).
+- **Accidental-deletion protection** for platform-critical roots via the no-delete guardrail policy. This is operational guidance, not adversarial defense: a privileged (T0/T1) actor can remove the label and delete.
+- **Trustworthy platform PKI**: the aggregated-API serving certificate and tenant TLS are issued and rotated by cert-manager, with CA injection into the `APIService`.
+
+## Non-goals
+
+The following are explicitly out of scope for the platform's security guarantees:
+
+- **Defending against a compromised cluster administrator, node root, or infrastructure administrator.** `system:masters` and the cozystack/Flux service accounts are trusted callers by design (`SECURITY.md`).
+- **Treating the T1 platform control plane as a sandbox.** `cozystack-api`'s own ServiceAccount, Flux, and the system operators hold cluster-admin-equivalent power; they enforce tenant boundaries but are not isolated from each other or from the host.
+- **Upstream-only vulnerabilities** that Cozystack packaging and defaults do not introduce or worsen.
+- **Ingress-side isolation of tenant pods.** Tenant-pod ingress is open to the `world` and `cluster` entities, so a tenant pod is reachable by any in-cluster peer whose own egress permits it (platform components) and by a workload not governed by Cozystack's tenant egress policies (e.g. a privileged or system pod). Cross-tenant isolation is enforced on the *egress* side, not on tenant-pod ingress.
+- **Blocking cross-tenant reachability through externally-exposed services.** If a tenant publishes a LoadBalancer with an external IP, another tenant can reach it via `world` egress.
+- **Network isolation between tenants on a hosted cluster without Cilium.** On the `isp-hosted` and `isp-hosted-slim` variants the CNI belongs to the host, and the tenant chart creates its Cilium policies only if the host serves the Cilium policy API (`packages/apps/tenant/templates/_helpers.tpl`, helper `tenant.ciliumPolicies`). Without it, tenants get no network isolation from Cozystack, and isolating them is up to the host.
+- **Noisy-neighbour and side-channel guarantees** for co-located tenant pods beyond namespace scoping (and, for tenant Kubernetes/VMs, virtualization). Co-located pods are not claimed to be side-channel isolated.
+- **Acting as an egress firewall.** Tenant workloads are allowed egress to `world` by default (`packages/apps/tenant/templates/networkpolicy.yaml`).
+- **Supporting pre-release builds and end-of-life versions** (`SECURITY.md`).
+
+## Primary trust-boundary invariant
+
+The single most load-bearing isolation control is the combination of two facts:
+
+1. The tenant ClusterRoles (`packages/system/cozystack-basics/templates/clusterroles.yaml`) grant **no** `helm.toolkit.fluxcd.io` access and **no** create/update of arbitrary core resources — only CRUD on `apps.cozystack.io` application kinds (super-admin holds the `*` wildcard; admin an enumerated allowlist) and `sdn.cozystack.io/securitygroups`, read access to pods/services/ingresses, and (for tenant-admins) `delete` on a fixed set of core objects (pods/services/endpoints/events; the `persistentvolumes` entry in the ClusterRole is inert under the namespace-scoped RoleBinding). Tenant isolation is enforced by the *absence* of privileged grants in RBAC, not by an admission policy that whitelists `apps.cozystack.io/*` writes.
+2. The Application-to-HelmRelease conversion (`pkg/registry/apps/application/rest.go`) takes the chart reference, release-name prefix, and `valuesFrom` from server-side configuration; the tenant controls only the Helm values (`app.Spec`).
+
+If a future `ApplicationDefinition`, RBAC change, or API change ever let a tenant influence the chart reference, `valuesFrom`, or write HelmReleases directly, the T2→T1 isolation would collapse. Changes touching tenant RBAC or the Application REST layer should be reviewed against this invariant.
+
+## Admission enforcement points
+
+Cozystack has two admission enforcement points, and the distinction matters when reasoning about which policies protect which resources:
+
+- The **core kube-apiserver** evaluates ValidatingAdmissionPolicy for resources it serves directly — Namespaces, Gateways, HTTPRoutes/TLSRoutes/GRPCRoutes, Ingresses, and the no-delete guardrail.
+- **`cozystack-api` itself** evaluates the admission chain (validating webhooks and ValidatingAdmissionPolicy) for aggregated `apps.cozystack.io` resources, because those are served by the aggregated API server and never reach the core apiserver's admission chain. The `cozystack-tenant-host-policy` on `apps.cozystack.io/tenants` is therefore enforced inside `cozystack-api`. So is `cozystack-database-external-tls-policy`, which refuses a `redises` object that asks for a plaintext endpoint outside the cluster: `external: true` without `tls.enabled: true` on create, any update that turns external access on, since an existing instance's spec does not prove its TLS state, and any change of `tls.enabled` by a tenant while external access stays on (the callers trusted by `cozystack-tenant-host-policy` are exempt, to repair such an instance), since before the first reconcile nothing else stops TLS being dropped. A release already external and plaintext before the policy existed stays editable.
+
+Two hostname-policy details are worth stating precisely. The **HTTPRoute/TLSRoute/GRPCRoute** policies (`route-hostname-policy.yaml`) and the **legacy-Ingress** policy (`ingress-hostname-policy.yaml`) are fail-closed: a route or Ingress in a tenant namespace missing `namespace.cozystack.io/host` is denied, so an absent label cannot open those layers (the route policies also deny a route that declares no hostnames, since such a route inherits the hostnames of the listener it attaches to rather than matching nothing; the Ingress policy likewise denies hostless rules and `spec.defaultBackend`, and permits external custom domains outside the platform root apex). The **namespace host-label** policy is an immutability guard — it stops an untrusted caller from scrubbing or changing an already-set label, but it does not itself reject a namespace that never carried one. The **Gateway-listener** policy (`gateway-hostname-policy.yaml`) applies the same subdomain rule but its CEL short-circuits to allow when the host label is empty, so it is permissive (fail-open) for a tenant namespace that lacks the label. In normal operation the platform sets that label at tenant creation and the namespace host-label policy keeps it immutable, closing the gap in practice — but the Gateway-side guarantee is conditional on the label being present, not unconditional.
+
+Authentication and authorization for aggregated resources are delegated to the core kube-apiserver via `system:auth-delegator` (TokenReview / SubjectAccessReview), so RBAC decisions remain centralized even though admission runs in `cozystack-api`.
+
+## References
+
+The claims in this document can be re-verified against these sources:
+
+- Aggregated API server: `cmd/cozystack-api/`, `pkg/apiserver/apiserver.go`, `pkg/registry/apps/application/rest.go`, `pkg/config/config.go`.
+- Dynamic Application kinds: `pkg/cmd/server/start.go`, `api/v1alpha1/applicationdefinitions_types.go`, `internal/controller/applicationdefinition_controller.go`.
+- Tenant RBAC: `packages/system/cozystack-basics/templates/clusterroles.yaml`.
+- Admission policies: `packages/system/cozystack-basics/templates/gateway-hostname-policy.yaml`, `route-hostname-policy.yaml`, `ingress-hostname-policy.yaml`, `database-external-tls-policy.yaml`, `packages/core/platform/templates/deletion-protection.yaml`.
+- Tenant provisioning and isolation: `packages/apps/tenant/templates/` (`tenant.yaml`, `namespace.yaml`, `networkpolicy.yaml`), `pkg/registry/apps/application/quota.go`.
+- UI OIDC front door (oauth2-proxy): `packages/system/dashboard/templates/gatekeeper.yaml`, `packages/system/linstor-gui/templates/gatekeeper.yaml`.
+- Reporting and supported versions: `SECURITY.md`.
diff --git a/docs/storage-immutability.md b/docs/storage-immutability.md
index 9157baefc1..35c03a5151 100644
--- a/docs/storage-immutability.md
+++ b/docs/storage-immutability.md
@@ -10,7 +10,7 @@ Every stateful Cozystack application that exposes a `storageClass` parameter dec
 
 | Consumer | Behavior |
 | --- | --- |
-| Cozystack UI (cozystack/cozystack-ui#6) | Reads the CEL rule from the chart's `openAPISchema` and renders `storageClass` as a disabled, helper-text-annotated field on edit forms. Save-time overlay reinstates the original value before PUT. |
+| Cozystack UI (`packages/system/dashboard/images/console`) | Reads the CEL rule from the chart's `openAPISchema` and renders `storageClass` as a disabled, helper-text-annotated field on edit forms. Save-time overlay reinstates the original value before PUT. |
 | `kubectl edit` / `kubectl patch` against the cozystack aggregated apiserver | **Currently accepted** — the apiserver does not yet evaluate CEL rules embedded in `ApplicationDefinition.openAPISchema`. The change passes through but does not propagate to existing PVCs (see "Why" above), so no data corruption is possible. Apiserver enforcement is tracked in cozystack/cozystack#2657. |
 | `kubectl edit` / `kubectl patch` against native CRDs | Enforced today by the standard apiextensions apiserver. |
 
@@ -18,9 +18,21 @@ Every stateful Cozystack application that exposes a `storageClass` parameter dec
 
 The following charts annotate at least one `storageClass` field as immutable:
 
-- `clickhouse`, `foundationdb`, `harbor`, `http-cache`, `kafka` (Kafka + ZooKeeper), `kubernetes` (top-level only — see below), `mariadb`, `mongodb`, `nats`, `openbao`, `opensearch`, `postgres`, `qdrant`, `rabbitmq`, `redis`, `vm-disk`.
+- `clickhouse`, `foundationdb`, `harbor`, `kafka` (Kafka broker + KRaft controller), `kubernetes`, `kubernetes-nodes`, `mariadb`, `mongodb`, `nats`, `openbao`, `opensearch`, `postgres`, `qdrant`, `rabbitmq`, `redis`, `valkey`, `vm-disk`.
 
-The per-node-group `kubernetes.nodeGroups[name].storageClass` field is intentionally NOT annotated immutable: it is optional and undefaulted, so a strict `self == oldSelf` rule would block any future attempt to set it on an existing node group. If a richer ratcheting form (`!has(oldSelf.storageClass) || self.storageClass == oldSelf.storageClass`) becomes available, the annotation should be added back.
+The `kubernetes-nodes` chart annotates both its per-pool `storageClass` (the worker node system-disk class, defaulted `replicated`) and its `cluster` field immutable. `storageClass` binds the same PVC-template contract as every other chart in the table, so the plain `self == oldSelf` rule applies for the reason in "Why" above. `cluster` is immutable for a different reason: it wires the pool's CAPI objects to one parent cluster `kubernetes-<cluster>`, and repointing a live pool at another cluster would orphan its running worker VMs rather than migrate them.
+
+## `vm-disk` also freezes `source`
+
+The `vm-disk` chart annotates `source` immutable in addition to `storageClass`, for a mechanism distinct from the PVC-template reasoning above. A `vm-disk` renders a single `DataVolume`, and `DataVolume.spec` is immutable in CDI: once the DataVolume exists, editing `spec.source` (or `spec.storage.storageClassName`) has no effect. The chart therefore looks the existing DataVolume up and reuses its stored `spec`, so an edit to `.Values.source` would otherwise render as a silent no-op while the HelmRelease still reported success — the CR and the cluster diverge with no diagnostic (cozystack/cozystack#2985).
+
+Because the aggregated apiserver does not yet evaluate the CEL rule (see the table above, cozystack/cozystack#2657), `vm-disk` adds a second, chart-level guard that is the substantive enforcement today: `templates/dv.yaml` fails the render when the requested `storageClass` or `source` differs from what the disk was created with. Both checks compare the operator's input recorded in an annotation at creation — `vm-disk.cozystack.io/storage-class` and `vm-disk.cozystack.io/source` — written only at creation and preserved verbatim afterward, never overwritten with an unapplied edit. The storage-class annotation is written even for the cluster default (`""`), and its key presence — not its value — marks a recorded class, so a disk created with `""` is still caught if later changed to a concrete class. Recording the input rather than reading the live object matters on both axes: the image-clone PVC name carries a chart-version prefix (`vm-image-` was renamed to `vm-default-images-`) that drifts across upgrades with no operator edit, and the live PVC's `storageClassName` on an adopted or foreign DataVolume may legitimately differ from the CR's default without being a change.
+
+Disks created before these annotations existed (or out-of-band) are handled conservatively so a working release never deadlocks. For `source`, such a disk is compared against its stored `spec.source` directly, but only when that stored source is a shape the chart itself produces (`blank`, `http` with just a `url`, `upload`, or a `pvc` with just `name`/`namespace`). An adopted DataVolume using `spec.sourceRef`, or a source type the chart cannot render (`registry`, `snapshot`, `imageio`, `http` with a `secretRef`, a foreign-namespace `pvc`), has no comparable provenance and is left alone rather than failed on a mismatch. The image-clone exemption fires only when the stored source is a `cozy-public` `pvc` **and** the request is itself an image — the one case where the `vm-image-` → `vm-default-images-` prefix drift is indistinguishable from a real image-name change; a change away from an image source to another type is still caught. For `storageClass` there is no safe live fallback (the CR default need not reflect an adopted disk's real class), so an un-annotated disk is simply not guarded here; apiserver CEL (cozystack/cozystack#2657) is the eventual guard for those. To actually change `storageClass` or `source`, delete and recreate the disk; size growth is the one mutable dimension and is handled separately by `templates/pvc-resize-hook.yaml`.
+
+The `storageClass` annotation records the effective value applied at creation, including when it came from the chart's `values.yaml` default (`replicated`) rather than an explicit operator value. Applications created through the aggregated apiserver have the default stamped into the CR, so it stays stable; but a direct HelmRelease consumer that omits `storageClass` records the chart default of the day, so changing that default in a future chart version would make every such untouched release start failing the render until its CR pins the old value or the disk is recreated. Treat the `storageClass` default as a frozen contract for the same reason the `source` serialization above is.
+
+The `source` annotation is a byte-for-byte `toJson` of `.Values.source`, so it is coupled to the exact serialization of the source schema. Adding a subfield with a schema default (which the apiserver would stamp onto every CR) would make the recorded and requested JSON diverge on an untouched disk; such a change needs an annotation-migration story rather than a bare schema bump.
 
 If you add a new stateful chart that exposes `storageClass`, annotate it the same way:
 
diff --git a/docs/vm-external-vlan.md b/docs/vm-external-vlan.md
new file mode 100644
index 0000000000..81a8fb232d
--- /dev/null
+++ b/docs/vm-external-vlan.md
@@ -0,0 +1,155 @@
+# Attaching a virtual machine to an external VLAN
+
+This document describes how to attach a Cozystack virtual machine (the `vm-instance` application) directly to an external, physically-routed VLAN — the layer-2 segment a VM needs when it must appear on the same broadcast domain as external hardware (a licensing appliance, a storage box, a gateway managed outside the cluster), with an address from that VLAN's subnet rather than from the cluster overlay.
+
+The default Cozystack VM networking is overlay-only (the pod network, plus optional KubeOVN VPC subnets). Bridging a VM onto a real VLAN is a different pattern and has one non-obvious constraint: **it works with a Linux bridge and the `bridge` CNI plugin, and it does not work with `macvlan`.** The rest of this guide explains why and gives a working recipe.
+
+## Why `bridge` and not `macvlan`
+
+KubeVirt attaches a VM interface to a secondary network using **bridge binding** by default (this is what the `vm-instance` chart emits for every network in `.spec.networks`). With bridge binding the guest's own MAC address is placed on the wire — the launcher pod does not masquerade or translate it.
+
+A `macvlan` attachment is incompatible with that model. `macvlan` demultiplexes inbound frames strictly by the MAC address of the macvlan child interface. Because KubeVirt puts the *guest's* MAC on the wire — not the macvlan child's — replies from the gateway or other hosts arrive at the parent interface addressed to the guest MAC, do not match any macvlan child, and are silently dropped before they ever reach the VM. The symptom is a guest that can transmit (ARP requests and pings leave, visible in `tcpdump` on the parent interface) but never receives a reply (its neighbor entry for the gateway stays `FAILED`). As a secondary consequence, the host cannot reach macvlan children through the parent interface either, so a host-side service on the parent IP is unreachable from the VMs.
+
+A **Linux bridge** does not have this limitation: it forwards by learned MAC on all bridged ports, so the guest MAC is reachable, and the host can carry an address on the bridge itself to talk to the VMs. Attach the VLAN sub-interface to a bridge and point a `bridge`-type NAD at it.
+
+## Overview
+
+Three pieces cooperate:
+
+1. A **Linux bridge on each node** that enslaves the tagged VLAN sub-interface. This is node-level networking — it is configured by your node provisioning (netplan / Talos machine config / systemd-networkd), not by a Cozystack chart.
+2. A **`NetworkAttachmentDefinition`** of type `bridge` referencing that bridge, created in the VM's tenant namespace.
+3. The **`vm-instance`** application referencing the NAD by name in `.networks`, with the guest's static address supplied through cloud-init.
+
+## Prerequisites
+
+- The `multus` package is enabled (it provides the `NetworkAttachmentDefinition` CRD and the secondary-network plumbing).
+- The `bridge` CNI plugin is present in `/opt/cni/bin` on every node. The `multus` package puts it there itself on every platform, which is the subject of the next section — read it before upgrading a cluster whose `/opt/cni/bin` you provision yourself. Verify with `ls /opt/cni/bin/bridge`; a missing binary makes the NAD fail with `failed to find plugin "bridge" in path [/opt/cni/bin]`.
+- There is no IPAM plugin in this path — addresses are assigned inside the guest, not by the CNI. Plan static addresses per VM.
+
+## Staging the reference CNI plugins
+
+The `multus` package installs the reference plugins into `/opt/cni/bin` itself, on every platform, because no platform supplies all of them. That is the `stageCniPlugins` chart value, and the platform turns it on for every bundle. What differs is only how much is missing before staging runs. Talos puts six binaries in that directory — `bridge`, `firewall`, `host-local`, `loopback` and `portmap` from the same upstream release, plus `flannel`, which is a different project — so a NAD naming `macvlan`, `ipvlan` or `vlan` fails there too; staging adds the ten it does not carry and rewrites the four that overlap with the same upstream version (`v1.9.1` on both sides), not an older one. Generic Linux offers no guarantee at all — k3s keeps its own copies under `/var/lib/rancher/k3s/data/cni` (`/var/lib/rancher/k3s/data/current/bin` on releases older than October 2024) and Cilium installs only `cilium-cni` and `loopback`, so `/opt/cni/bin` there can lack even `bridge`.
+
+Carrying the plugins costs roughly 67 MiB uncompressed per architecture in the `multus` image, which every node pulls whether staging is on or off. Size airgap mirrors accordingly.
+
+Where staging is on, it tries to replace any file of the same name already in that directory, every time the Multus pod is recreated, so a hand-placed or locally patched `bridge` will normally not survive — carry such a change in the `multus` image instead. A plugin it fails to write is reported and skipped rather than removed, so whatever was there stays — an older copy where the node had one, and nothing at all where it did not. It installs 14 of the upstream reference plugins and leaves `loopback`, `dhcp`, `dummy` and `tap` alone. Leaving them alone is not a promise that something else provides them: `loopback` is installed by Cilium and kube-ovn, while `dhcp`, `dummy` and `tap` are simply not staged — `dhcp` needs a host daemon this package does not run, and the other two have no consumer here. If you need one of those, put it on the node yourself.
+
+**If you provision `/opt/cni/bin` yourself, set the opt-out before upgrading.** The replacement happens as soon as Multus rolls, and turning `stageCniPlugins` off afterwards does not undo it: nothing in this package removes or restores a plugin, so the copies stay until you re-provision the node. Operators pinned to a particular plugin version should decline first and upgrade second. This applies on Talos too, where four of the names staging writes are ones the node image also carries. Declining looks like this, on the `platform` component of the `cozystack.cozystack-platform` Package CR:
+
+```yaml
+apiVersion: cozystack.io/v1alpha1
+kind: Package
+metadata:
+  name: cozystack.cozystack-platform
+spec:
+  components:
+    platform:
+      values:
+        networking:
+          stageCniPlugins: false
+```
+
+Editing the multus HelmRelease or the child `Package cozystack.multus` directly does not hold: both are re-rendered by the platform reconcile. An unreadable value there — a spelling that is neither a `true` nor a `false` form — stops the whole platform render rather than resolving to off, so a typo in this key halts reconciliation cluster-wide.
+
+If `bridge` is missing on a node where staging is on, read the log with `kubectl --namespace cozy-multus logs <multus-pod> --container install-cni-plugins`. The line `no /cni-plugins in this image; skipping staging` means the running `multus` image predates the plugin staging and installed nothing: the image reference and the manifest are re-pinned on different schedules, so a tree taken between a Dockerfile change and the next release bake can carry one without the other. Move to a release whose `multus` image carries the plugins. A line beginning `failed to install:` names plugins the container could not write, one of which may be the `bridge` you are looking for. The reason for each is earlier in the same log, printed as that plugin was attempted rather than next to the summary — so with more than one failure the causes are spread above it, not adjacent to it, and the one naming your plugin is the one to read. The container reports these and exits successfully on purpose, so the pod shows Ready and `kubectl get` will not point you here: failing it instead would leave the node unable to start any pod that goes through CNI, since Multus remains the primary CNI with no daemon behind it — host-network pods bypass CNI and still start. That means a NAD failing with `failed to find plugin` is the symptom to trust, and this log is where the reason is.
+
+If the init container is absent from the Multus pod altogether, staging is off for this cluster. That means `networking.stageCniPlugins` was set to `false` somewhere: no bundle defaults it off, on Talos or anywhere else. Turn it back on with the same block as above and `true` in place of `false`, or stage the plugins through node provisioning instead.
+
+Changing this value edits the Multus DaemonSet's pod template, so Multus rolls node by node. While a node's `multus-daemon` is down its CNI shim has no daemon behind it, and pod creation and deletion on that node fail for the length of the restart. Flip it during a window where that is acceptable, not while something else is rolling.
+
+## Step 1 — Linux bridge on the node
+
+Create a bridge that enslaves the tagged VLAN sub-interface. The VLAN sub-interface itself carries no address; the bridge carries the host's presence on that VLAN (optional, but useful for a gateway-reachability sanity path and for any host-side service the VMs must reach).
+
+This example uses netplan on an Ubuntu/Debian node; the VLAN id and subnet are illustrative (`203.0.113.0/24`, VLAN 100, gateway `203.0.113.1`). Adapt to your uplink naming and to Talos/`systemd-networkd` if that is your provisioning:
+
+```yaml
+network:
+  version: 2
+  vlans:
+    # Tagged VLAN sub-interface, no address of its own — enslaved to the bridge.
+    uplink.100:
+      id: 100
+      link: uplink
+  bridges:
+    br100:
+      interfaces:
+        - uplink.100
+      # Optional host presence on the VLAN. Keep the node's default route on
+      # its management interface — do not add a default route here.
+      addresses:
+        - 203.0.113.2/24
+```
+
+Notes:
+
+- The node's **default route must stay on the management interface.** The bridge address (if any) is only for on-VLAN reachability, not a second default gateway.
+- `netplan apply` cannot move an interface into a bridge while a consumer still holds it (for example a `virt-launcher` pod using a previous `macvlan` attachment). Remove the consumer first (delete the VMI so the launcher releases the interface), then reconfigure.
+- After a reboot, `systemd-networkd` may briefly report the bridge "routable" while the link is not yet actually up. If your VMs need the VLAN immediately at boot, gate their start on a reachability check, or re-run `netplan apply` until the gateway answers.
+
+## Step 2 — NetworkAttachmentDefinition
+
+Create a `bridge`-type NAD in the tenant namespace that will host the VM. The `vm-instance` chart resolves a network by name **in the VM's own namespace**, so one copy of the NAD must exist in every tenant namespace that runs VMs on this VLAN.
+
+```yaml
+apiVersion: k8s.cni.cncf.io/v1
+kind: NetworkAttachmentDefinition
+metadata:
+  name: vlan100
+  namespace: tenant-example
+spec:
+  config: |
+    {
+      "cniVersion": "0.3.1",
+      "type": "bridge",
+      "bridge": "br100",
+      "ipam": {}
+    }
+```
+
+- `bridge` must match the bridge name from step 1 (`br100` here).
+- `ipam: {}` — no cluster-side address assignment; the guest configures its address itself (step 3).
+
+## Step 3 — Attach the VM and assign a static address
+
+Reference the NAD by name in the `vm-instance` values. This VLAN has no DHCP server, so the static address goes into cloud-init `userData` (`cloudInit`), written by the guest at first boot, and `netplanDhcp` stays off (see [Gotchas](#gotchas)):
+
+```yaml
+# vm-instance values
+instanceType: u1.medium
+instanceProfile: ubuntu
+disks:
+  - name: example-system
+networks:
+  - name: vlan100
+cloudInit: |
+  #cloud-config
+  write_files:
+    - path: /etc/netplan/60-vlan100.yaml
+      permissions: "0600"
+      content: |
+        network:
+          version: 2
+          ethernets:
+            # Match the second NIC (the pod-network NIC is the first). Use the
+            # interface that comes up without a DHCP lease.
+            enp2s0:
+              addresses:
+                - 203.0.113.10/24
+  runcmd:
+    - netplan apply
+```
+
+The VM ends up with two interfaces: the always-present **pod-network** NIC (`default`, used for cluster-internal traffic and for the `vm-instance` external-access features) and the **VLAN** NIC. The `/24` address above brings up only the connected route for the VLAN subnet — it adds no default route, so the guest's egress stays wherever you want it (typically the pod NIC). If the VLAN is meant to be the guest's default gateway instead, add a default route under the VLAN NIC and remove it from the pod NIC.
+
+## Gotchas
+
+- **VMs are dual-homed.** The `vm-instance` chart always adds the pod-network NIC in addition to any `networks` you declare; there is no single-homed (VLAN-only) option today. Address the VLAN NIC inside the guest and leave the pod NIC to the cluster.
+- **Leave `netplanDhcp` off on a VM with a static NIC.** `netplanDhcp: true` makes the chart supply cloud-init network-data that asks every `en*` and `eth*` interface for DHCP, under the netplan IDs `cozy-en` and `cozy-eth`. Netplan writes one networkd file per ID, and systemd-networkd applies only the first `.network` file in lexical order that matches a link, so `10-netplan-cozy-en.network` shadows the `10-netplan-enp2s0.network` the recipe above produces and the static address is never applied, whatever number the recipe's netplan file carries. The key is off by default and is meant for guests whose every interface takes its address over DHCP, such as a VM on a VPC subnet.
+- **MAC changes on VM re-creation.** KubeVirt generates a fresh guest MAC each time the VM object is re-created, and `vm-instance` exposes no way to pin it, so re-creating a VM changes its MAC. The upstream gateway then holds a stale ARP entry for the old MAC for a few minutes, so "gateway unreachable" immediately after re-creating a VM is expected — wait for the ARP entry to age out (~5 min) rather than treating it as a fault.
+- **Host ↔ VM traffic.** If the host must talk to the VMs (a proxy, a health check), give the bridge a host address on the VLAN (step 1) — traffic through a bare VLAN sub-interface to bridge-attached guests will not work the way `macvlan` users expect.
+
+## See also
+
+- [`docs/gpu-vgpu.md`](./gpu-vgpu.md) — passing NVIDIA GPUs and vGPU profiles into the same VMs.
+- KubeVirt user guide, [Interfaces and Networks](https://kubevirt.io/user-guide/network/interfaces_and_networks/) — bridge binding vs other binding methods.
diff --git a/examples/backups/_lib/wait-helpers.sh b/examples/backups/_lib/wait-helpers.sh
new file mode 100644
index 0000000000..cec241d138
--- /dev/null
+++ b/examples/backups/_lib/wait-helpers.sh
@@ -0,0 +1,165 @@
+#!/bin/bash
+# Wait helpers shared by every backup walkthrough under examples/backups/.
+# Each walkthrough's 00-helpers.sh sources this file after defining the log_*
+# functions these call; wait_hr_ready and wait_deleted read $NAMESPACE.
+# hack/backup-examples-shared-helpers.bats fails if a walkthrough grows its own
+# copy again.
+
+# Wait until a JSONPath value on a resource matches the desired string.
+#
+# The optional 7th argument is a TERMINAL value to bail on: a BackupJob or
+# RestoreJob that reaches Failed never reaches Succeeded, so polling out the
+# remaining budget only delays the report, lets the TTL reaper take the Job's
+# Pod log, and under Chainsaw risks the step being SIGKILLed at its op timeout
+# instead of failing cleanly.
+#
+# kubectl's stderr is left attached: a read that fails for RBAC or transport
+# reasons says so instead of reading as an empty value. --ignore-not-found
+# keeps a resource that does not exist yet, the usual case at the start of a
+# wait, from printing an error on every poll.
+wait_for_field() {
+    local resource_type="$1"
+    local resource_name="$2"
+    local jsonpath="$3"
+    local desired="$4"
+    local namespace="${5:-}"
+    local timeout="${6:-300}"
+    local fail_value="${7:-}"
+
+    log_substep "Waiting for $resource_type/$resource_name $jsonpath to become '$desired'..."
+    local elapsed=0
+    local ns_flag=()
+    [[ -n "$namespace" ]] && ns_flag=(-n "$namespace")
+
+    while true; do
+        local current
+        current=$(kubectl get "$resource_type" "$resource_name" "${ns_flag[@]}" --ignore-not-found -o jsonpath="$jsonpath" || true)
+        if [[ "$current" == "$desired" ]]; then
+            log_success "$resource_type/$resource_name reached '$desired'"
+            return 0
+        fi
+        if [[ -n "$fail_value" && "$current" == "$fail_value" ]]; then
+            log_error "$resource_type/$resource_name reached terminal '$current' (expected '$desired')"
+            return 1
+        fi
+        if [[ $elapsed -ge $timeout ]]; then
+            log_error "Timeout waiting for $resource_type/$resource_name (current: '$current', expected: '$desired')"
+            return 1
+        fi
+        sleep 5
+        elapsed=$((elapsed + 5))
+    done
+}
+
+# Wait for a HelmRelease to become Ready, with an existence backstop (the apps
+# controller creates the HR asynchronously, so a bare `kubectl wait` right after
+# `kubectl apply` races it) and a fail-fast on Stalled=True: a stalled HR has
+# exhausted its remediation retries and will never turn Ready, so polling to the
+# timeout only hides the real error.
+wait_hr_ready() {
+    local name="$1"
+    local timeout="${2:-300}"
+    local elapsed=0
+    local lookup state seen=0
+
+    log_substep "Waiting for HelmRelease/$name to become Ready..."
+    while true; do
+        # --ignore-not-found makes an absent release exit 0, so a non-zero exit
+        # is kubectl failing to answer. Presence is read off the name line,
+        # because a warning on stderr lands in the same string.
+        if ! lookup=$(kubectl -n "$NAMESPACE" get hr "$name" --ignore-not-found -o name 2>&1); then
+            state=error
+        elif [[ $'\n'"$lookup"$'\n' != *"/$name"$'\n'* ]]; then
+            state=absent
+        else
+            state=present
+            seen=1
+            local ready stalled
+            ready=$(kubectl -n "$NAMESPACE" get hr "$name" \
+                -o jsonpath='{.status.conditions[?(@.type=="Ready")].status}' || true)
+            if [[ "$ready" == "True" ]]; then
+                log_success "HelmRelease/$name is Ready"
+                return 0
+            fi
+            stalled=$(kubectl -n "$NAMESPACE" get hr "$name" \
+                -o jsonpath='{.status.conditions[?(@.type=="Stalled")].status}' || true)
+            if [[ "$stalled" == "True" ]]; then
+                log_error "HelmRelease/$name is Stalled (terminal):"
+                break
+            fi
+        fi
+        if [[ $elapsed -ge $timeout ]]; then
+            log_error "Timeout waiting for HelmRelease/$name to become Ready:"
+            case "$state" in
+                error)
+                    echo "  could not look up HelmRelease/$name: $lookup" >&2
+                    # Seen earlier: the reads below may answer where this lookup
+                    # did not.
+                    [[ $seen -eq 1 ]] || return 1
+                    ;;
+                absent)
+                    if [[ $seen -eq 1 ]]; then
+                        echo "  HelmRelease/$name was deleted from $NAMESPACE while waiting" >&2
+                    else
+                        echo "  HelmRelease/$name never appeared in $NAMESPACE" >&2
+                    fi
+                    return 1
+                    ;;
+            esac
+            break
+        fi
+        sleep 5
+        elapsed=$((elapsed + 5))
+    done
+    # Reached on Stalled or on timeout. Conditions and history rather than the
+    # Ready message alone: a failed install is retried on an interval, so Ready
+    # may describe the retry rather than the failure behind it.
+    kubectl -n "$NAMESPACE" get hr "$name" \
+        -o jsonpath='{range .status.conditions[*]}  {.type}={.status} ({.reason}): {.message}{"\n"}{end}' >&2 || true
+    local hist
+    if ! hist=$(kubectl -n "$NAMESPACE" get hr "$name" \
+        -o jsonpath='{range .status.history[*]}  history: {.status} {.chartVersion} {.lastDeployed}{"\n"}{end}'); then
+        echo "  history: kubectl could not read it" >&2
+    elif [[ -n "${hist//[[:space:]]/}" ]]; then
+        printf '%s\n' "$hist" >&2
+    else
+        # A release with no history prints nothing and exits 0; say so,
+        # because a blank in a failure dump reads as a dump that broke.
+        echo "  history: (none recorded)" >&2
+    fi
+    return 1
+}
+
+# Wait until a namespaced resource is really gone.
+#
+# `kubectl wait --for=delete` is not used: it errors out when the resource is
+# already absent, which is the normal case on a clean namespace (cleanup.sh is
+# idempotent and runs as a pre-clean too), and swallowing that error would also
+# swallow a genuine failure. Polling `get --ignore-not-found` treats "already
+# gone" and "gone now" as the same success (empty output, exit 0) while a
+# retrieval failure — RBAC, API-server, transport — is a non-zero exit that
+# must NOT be read as deletion, or cleanup settles on a false success and leaves
+# half-uninstalled resources for the next run. Such an error just keeps us
+# polling until the resource is confirmed gone or the timeout fires.
+wait_deleted() {
+    local resource_type="$1"
+    local resource_name="$2"
+    local timeout="${3:-300}"
+    local elapsed=0
+    local got
+
+    while true; do
+        if got=$(kubectl -n "$NAMESPACE" get "$resource_type" "$resource_name" --ignore-not-found 2>/dev/null) && [[ -z "$got" ]]; then
+            [[ $elapsed -gt 0 ]] && log_success "$resource_type/$resource_name is gone"
+            return 0
+        fi
+        if [[ $elapsed -ge $timeout ]]; then
+            log_error "Timeout waiting for $resource_type/$resource_name to be deleted; it is still present after ${timeout}s:"
+            kubectl -n "$NAMESPACE" get "$resource_type" "$resource_name" -o wide >&2 || true
+            return 1
+        fi
+        [[ $elapsed -eq 0 ]] && log_substep "Waiting for $resource_type/$resource_name to be deleted..."
+        sleep 5
+        elapsed=$((elapsed + 5))
+    done
+}
diff --git a/examples/backups/clickhouse/00-helpers.sh b/examples/backups/clickhouse/00-helpers.sh
index 01ce00210d..d3d56b0345 100755
--- a/examples/backups/clickhouse/00-helpers.sh
+++ b/examples/backups/clickhouse/00-helpers.sh
@@ -13,7 +13,13 @@ export NC='\033[0m'
 export BOLD='\033[1m'
 
 # Default settings (override via environment).
-export NAMESPACE="${NAMESPACE:-tenant-test}"
+#
+# tenant-root, matching the etcd/mariadb/postgres backup demos: the S3 client
+# here is the clickhouse-backup sidecar INSIDE the tenant, and cozystack's
+# shared seaweedfs lives in tenant-root. An isolated tenant's Cilium egress
+# allowlist blocks a Pod in that tenant from reaching tenant-root's seaweedfs,
+# so a release outside tenant-root cannot use the in-cluster endpoint below.
+export NAMESPACE="${NAMESPACE:-tenant-root}"
 export CLICKHOUSE_NAME="${CLICKHOUSE_NAME:-clickhouse-test}"
 export CLICKHOUSE_RESTORE_NAME="${CLICKHOUSE_RESTORE_NAME:-clickhouse-restore}"
 export BUCKET_NAME="${BUCKET_NAME:-clickhouse-backups}"
@@ -22,6 +28,35 @@ export STRATEGY_NAME="${STRATEGY_NAME:-altinity}"
 export BACKUPJOB_NAME="${BACKUPJOB_NAME:-clickhouse-backup-job}"
 export RESTOREJOB_INPLACE_NAME="${RESTOREJOB_INPLACE_NAME:-clickhouse-restore-inplace}"
 export RESTOREJOB_TOCOPY_NAME="${RESTOREJOB_TOCOPY_NAME:-clickhouse-restore-to-copy}"
+# S3 endpoint CA. cozystack's default seaweedfs serves its S3 endpoint with a
+# self-signed certificate whose CA lives in this Secret; step 03 copies its
+# ca.crt into a per-release Secret the clickhouse-backup sidecar trusts via the
+# chart's backup.endpointCA (mounted and picked up through SSL_CERT_DIR). The
+# name follows the seaweedfs chart's fullnameOverride ("seaweedfs" ->
+# "seaweedfs-ca-cert"); step 03 auto-discovers the CA Certificate's actual
+# secret when this default is absent, so an upstream fullname change does not
+# silently break the copy. On a cluster whose S3 endpoint is signed by a
+# publicly-trusted CA, set S3_CA_SECRET="" to skip the copy and leave
+# backup.endpointCA unset.
+# Whether the CA Secret name is the user's choice or just this default. Step 03
+# treats the two differently: a name the user typed and that does not exist is an
+# error worth stopping on, while the default failing to resolve on a cluster with
+# no seaweedfs most likely means a publicly-trusted S3 endpoint — a legal input,
+# so it warns and leaves backup.endpointCA unset instead of failing.
+export S3_CA_SECRET_EXPLICIT="${S3_CA_SECRET:+1}"
+export S3_CA_SECRET_EXPLICIT="${S3_CA_SECRET_EXPLICIT:-0}"
+export S3_CA_SECRET="${S3_CA_SECRET:-seaweedfs-ca-cert}"
+# Independent of NAMESPACE: the shared seaweedfs and its CA live in tenant-root
+# even when the demo runs elsewhere.
+export S3_CA_NAMESPACE="${S3_CA_NAMESPACE:-tenant-root}"
+export S3_CA_KEY="${S3_CA_KEY:-ca.crt}"
+# Per-release Secret the CA is copied into; referenced by backup.endpointCA.
+# Scoped to CLICKHOUSE_NAME so two instances in one namespace don't share a
+# name, and stamped with the ownership label below so step 03 refuses to
+# overwrite a foreign Secret and cleanup only deletes one this demo created.
+export CH_CA_SECRET_NAME="${CH_CA_SECRET_NAME:-${CLICKHOUSE_NAME}-backup-s3-ca}"
+export CH_CA_SECRET_LABEL_KEY="cozystack.io/owned-by-demo"
+export CH_CA_SECRET_LABEL_VALUE="clickhouse-backup"
 # The clickhouse-backup sidecar lives in the application Pod (rendered by the
 # chart when backup.enabled=true). Tenants don't manage a separate Secret;
 # the chart projects bucket coordinates into <release>-backup-s3 from the
@@ -44,29 +79,39 @@ print_header() {
     echo -e "\n${MAGENTA}${BOLD}== $title ==${NC}\n" >&2
 }
 
-# Wait until a JSONPath value on a resource matches the desired string.
-wait_for_field() {
-    local resource_type="$1"
-    local resource_name="$2"
-    local jsonpath="$3"
-    local desired="$4"
-    local namespace="${5:-}"
-    local timeout="${6:-300}"
+# wait_for_field, wait_hr_ready and wait_deleted live in one file shared by
+# every backup walkthrough, so a fix to one reaches all of them.
+# shellcheck source-path=SCRIPTDIR source=../_lib/wait-helpers.sh
+source "$(dirname "${BASH_SOURCE[0]}")/../_lib/wait-helpers.sh"
 
-    log_substep "Waiting for $resource_type/$resource_name $jsonpath to become '$desired'..."
+# Wait for a StatefulSet to report a ready replica, tolerating its asynchronous
+# creation (the ClickHouse operator creates it after the CHI is reconciled).
+wait_sts_ready() {
+    local name="$1"
+    local timeout="${2:-300}"
     local elapsed=0
-    local ns_flag=()
-    [[ -n "$namespace" ]] && ns_flag=(-n "$namespace")
 
+    log_substep "Waiting for StatefulSet/$name to report a ready replica..."
     while true; do
-        local current
-        current=$(kubectl get "$resource_type" "$resource_name" "${ns_flag[@]}" -o jsonpath="$jsonpath" 2>/dev/null || true)
-        if [[ "$current" == "$desired" ]]; then
-            log_success "$resource_type/$resource_name reached '$desired'"
-            return 0
+        if kubectl -n "$NAMESPACE" get statefulset.apps "$name" >/dev/null 2>&1; then
+            local ready
+            ready=$(kubectl -n "$NAMESPACE" get statefulset.apps "$name" \
+                -o jsonpath='{.status.readyReplicas}' 2>/dev/null || true)
+            if [[ "${ready:-0}" -ge 1 ]] 2>/dev/null; then
+                log_success "StatefulSet/$name has ${ready} ready replica(s)"
+                return 0
+            fi
         fi
         if [[ $elapsed -ge $timeout ]]; then
-            log_error "Timeout waiting for $resource_type/$resource_name (current: '$current', expected: '$desired')"
+            log_error "Timeout waiting for StatefulSet/$name to become ready"
+            # A StatefulSet names its Pods "<sts>-N", so ask for the first
+            # replica by name instead of guessing an operator label — and let
+            # both streams through, since the point of this branch is to say
+            # WHY the Pod never came up. Events carry the reason a Pod is
+            # Pending (unschedulable, missing PVC, image pull) that neither the
+            # Pod nor the StatefulSet status spells out.
+            kubectl -n "$NAMESPACE" get statefulset.apps "$name" -o wide >&2 || true
+            kubectl -n "$NAMESPACE" describe pod "${name}-0" >&2 || true
             return 1
         fi
         sleep 5
diff --git a/examples/backups/clickhouse/01-create-strategy.sh b/examples/backups/clickhouse/01-create-strategy.sh
index c2047f885e..9a4142e6ed 100755
--- a/examples/backups/clickhouse/01-create-strategy.sh
+++ b/examples/backups/clickhouse/01-create-strategy.sh
@@ -10,6 +10,31 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 source "$SCRIPT_DIR/00-helpers.sh"
 
 print_header "Step 01: Create Altinity backup strategy"
+
+# Reuse the image the platform's own cozy-default-altinity strategy runs, so the
+# demo Pod needs no `apk add` at run time. That matters twice over: the strategy
+# runs once per BackupJob and RestoreJob, so fetching packages from the Alpine
+# CDN each time makes every backup depend on outbound internet — it fails
+# outright on an air-gapped cluster, and it turns a CDN hiccup into a failed
+# backup — and this same script is the e2e round-trip's harness, where that
+# would surface as an unrelated red E2E run.
+#
+# Read it off the shipped strategy rather than hardcoding a tag, so the demo
+# tracks whatever the platform is pinned to. Falls back to alpine + `apk add`
+# only when that strategy is absent (a cluster without the backupstrategy
+# controller chart), which is also the one case where the demo has to bootstrap
+# its own tooling.
+CH_BACKUP_CLIENT_IMAGE="${CH_BACKUP_CLIENT_IMAGE:-$(kubectl get altinity.strategy.backups.cozystack.io cozy-default-altinity \
+    -o jsonpath='{.spec.template.spec.containers[?(@.name=="ch-backup-client")].image}' 2>/dev/null || true)}"
+APK_BOOTSTRAP=""
+if [[ -z "$CH_BACKUP_CLIENT_IMAGE" ]]; then
+    CH_BACKUP_CLIENT_IMAGE="alpine:3.19"
+    APK_BOOTSTRAP="apk add --no-cache curl jq >/dev/null"
+    log_warning "cozy-default-altinity not found; falling back to ${CH_BACKUP_CLIENT_IMAGE} + apk add (needs outbound internet)."
+else
+    log_info "Reusing the platform strategy's client image: ${CH_BACKUP_CLIENT_IMAGE}"
+fi
+
 log_command "kubectl apply -f - (Altinity strategy: $STRATEGY_NAME)"
 
 kubectl apply -f - <<EOF
@@ -23,7 +48,7 @@ spec:
       restartPolicy: Never
       containers:
         - name: ch-backup-client
-          image: alpine:3.19
+          image: ${CH_BACKUP_CLIENT_IMAGE}
           imagePullPolicy: IfNotPresent
           # API_USERNAME / API_PASSWORD pulled from the chart-emitted
           # backup-api-auth Secret in the application's namespace. The
@@ -46,7 +71,7 @@ spec:
           args:
             - |
               set -euo pipefail
-              apk add --no-cache curl jq >/dev/null
+              ${APK_BOOTSTRAP}
 
               host="chi-clickhouse-{{ .Release.Name }}-clickhouse-0-0.{{ .Release.Namespace }}.svc"
               api="http://\${host}:7171"
@@ -85,7 +110,7 @@ spec:
                 # source-release prefix. Falls through to "no remote
                 # backup found" if S3_PATH is misconfigured AND none of
                 # the listed names match.
-                target=\$(curl -fsS \${auth} "\${api}/backup/list/remote" \\
+                target=\$(curl -fsS \${auth} --max-time 60 "\${api}/backup/list/remote" \\
                   | jq -rs --arg prefix "\${prefix}" \\
                       '[.[] | select((.name // "") | startswith(\$prefix))] | sort_by(.created // "") | last.name // ""')
                 if [ -z "\${target}" ] || [ "\${target}" = "null" ]; then
@@ -113,7 +138,7 @@ spec:
               # vs. "create_remote X"). The strategy Pod runs one operation
               # at a time, so the most recent matching action is ours.
               while true; do
-                row=\$(curl -fsS \${auth} "\${api}/backup/actions" \\
+                row=\$(curl -fsS \${auth} --max-time 30 "\${api}/backup/actions" \\
                   | jq -rs --arg suffix "\${target}" \\
                       '[.[] | select((.command // "") | endswith(\$suffix))] | sort_by(.start) | last')
                 status=\$(echo "\${row}" | jq -r '.status // ""')
@@ -135,11 +160,19 @@ spec:
               cpu: 200m
               memory: 128Mi
           securityContext:
-            # Pod runs apk add at startup; that needs root. Other fields stay
-            # locked down (no privilege escalation, no extra caps, default
-            # seccomp profile). Tenants that enforce PSA "restricted" should
-            # swap this image for one with curl+jq pre-baked and re-enable
-            # runAsNonRoot on the strategy CR.
+            # Same field set as the platform's cozy-default-altinity strategy
+            # (packages/system/backupstrategy-controller/templates/strategy-altinity-default.yaml):
+            # no privilege escalation, all caps dropped, default seccomp
+            # profile, and runAsNonRoot deliberately left unset rather than
+            # false — the Pod only runs curl and jq, and neither the platform
+            # strategy nor this one pins a UID.
+            #
+            # On the default path there is no `apk add` to need root: the image
+            # above is the platform's, with curl+jq already baked in. Only the
+            # alpine:3.19 fallback (taken when cozy-default-altinity is absent)
+            # installs packages at startup, and that is the one case where a
+            # cluster enforcing PSA "restricted" has to supply its own image
+            # with the tools pre-baked.
             allowPrivilegeEscalation: false
             capabilities:
               drop: ["ALL"]
diff --git a/examples/backups/clickhouse/03-create-bucket.sh b/examples/backups/clickhouse/03-create-bucket.sh
index b1075c5a1c..f2828a4166 100755
--- a/examples/backups/clickhouse/03-create-bucket.sh
+++ b/examples/backups/clickhouse/03-create-bucket.sh
@@ -27,12 +27,18 @@ spec:
 EOF
 
 log_substep "Waiting for bucket HelmRelease to be Ready..."
-kubectl -n "$NAMESPACE" wait hr "bucket-${BUCKET_NAME}" --for=condition=ready --timeout=300s
-kubectl -n "$NAMESPACE" wait bucketclaims.objectstorage.k8s.io "bucket-${BUCKET_NAME}" --for=jsonpath='{.status.bucketReady}'=true --timeout=300s
+# 660s, above this generated release's 600s install timeout; see "Sizing an
+# HR-Ready budget" in docs/agents/e2e-testing.md.
+wait_hr_ready "bucket-${BUCKET_NAME}" 660
+kubectl -n "$NAMESPACE" wait bucketclaims.objectstorage.k8s.io "bucket-${BUCKET_NAME}" --for=jsonpath='{.status.bucketReady}'=true --timeout=180s
 # Cozystack's bucket app provisions a BucketAccess named "<bucket-name>-backup"
 # (the "-backup" suffix is the BucketAccessClass name); the BucketInfo Secret
 # carries the same name.
-kubectl -n "$NAMESPACE" wait bucketaccesses.objectstorage.k8s.io "bucket-${BUCKET_NAME}-backup" --for=jsonpath='{.status.accessGranted}'=true --timeout=300s
+kubectl -n "$NAMESPACE" wait bucketaccesses.objectstorage.k8s.io "bucket-${BUCKET_NAME}-backup" --for=jsonpath='{.status.accessGranted}'=true --timeout=180s
+if [[ "${COZY_E2E_BACKUP_PREFLIGHT:-0}" == "1" ]]; then
+    source "$SCRIPT_DIR/../../../hack/e2e-chainsaw/_lib/backup-access-preflight.sh"
+    cozy_backup_access_preflight "$NAMESPACE" "bucket-${BUCKET_NAME}-backup" 90
+fi
 
 log_substep "Reading bucket coordinates from BucketInfo Secret..."
 TMP=$(mktemp)
@@ -41,7 +47,12 @@ kubectl -n "$NAMESPACE" get secret "bucket-${BUCKET_NAME}-backup" -o jsonpath='{
 
 CH_BACKUP_ACCESS_KEY=$(jq -r '.spec.secretS3.accessKeyID' "$TMP")
 CH_BACKUP_SECRET_KEY=$(jq -r '.spec.secretS3.accessSecretKey' "$TMP")
-CH_BACKUP_ENDPOINT=$(jq -r '.spec.secretS3.endpoint' "$TMP")
+# S3_ENDPOINT can be overridden via the environment: BucketInfo advertises the
+# EXTERNAL ingress endpoint, which in-cluster Pods cannot always reach or
+# TLS-validate (in CI it is the unroutable s3.example.org placeholder); the
+# in-cluster alternative is https://seaweedfs-s3.<ns>:8333, trusted via the CA
+# copied below.
+CH_BACKUP_ENDPOINT="${S3_ENDPOINT:-$(jq -r '.spec.secretS3.endpoint' "$TMP")}"
 CH_BACKUP_REGION=$(jq -r 'if (.spec.secretS3.region // "") == "" then "us-east-1" else .spec.secretS3.region end' "$TMP")
 CH_BACKUP_BUCKET=$(jq -r '.spec.bucketName' "$TMP")
 
@@ -52,6 +63,82 @@ for v in CH_BACKUP_ACCESS_KEY CH_BACKUP_SECRET_KEY CH_BACKUP_ENDPOINT CH_BACKUP_
     [[ -n "${!v}" && "${!v}" != "null" ]] || { log_error "BucketInfo missing required field: ${v}"; exit 1; }
 done
 
+# Resolve and copy the S3 endpoint CA. The default name tracks the seaweedfs
+# chart's fullnameOverride (seaweedfs -> seaweedfs-ca-cert), but a downstream
+# fullname change would rename it, so fall back to discovering the cert-manager
+# CA Certificate (the seaweedfs-labelled one with spec.isCA=true) and read its
+# secretName. Leave S3_CA_SECRET empty to skip the copy on a public-CA endpoint.
+CH_BACKUP_CA_SECRET=""
+if [[ -n "$S3_CA_SECRET" ]]; then
+    # Reading the platform's CA lives in S3_CA_NAMESPACE (tenant-root by
+    # default), which is an admin/platform capability, not a tenant one — see
+    # the note on step 03 in README.md. So the three outcomes have to be kept
+    # apart: present, absent, and not-allowed-to-look. Swallowing stderr here
+    # would report an RBAC denial as "not found" and then advise setting
+    # S3_CA_SECRET, which cannot fix a permissions problem.
+    ca_probe_err=""
+    if ! ca_probe_err=$(kubectl -n "$S3_CA_NAMESPACE" get secret "$S3_CA_SECRET" -o name 2>&1 >/dev/null); then
+        if echo "$ca_probe_err" | grep -qiE 'forbidden|cannot (get|list)|Unauthorized'; then
+            log_error "Cannot read ${S3_CA_NAMESPACE}/${S3_CA_SECRET}: ${ca_probe_err}"
+            log_error "This is a permissions problem, not a missing Secret: copying the S3 endpoint CA needs read access to ${S3_CA_NAMESPACE}. Ask an admin to copy it into ${NAMESPACE}/${CH_CA_SECRET_NAME}, then re-run with S3_CA_SECRET=\"\" to skip the copy."
+            exit 1
+        fi
+        log_warning "S3 CA secret ${S3_CA_NAMESPACE}/${S3_CA_SECRET} not found; discovering the seaweedfs CA Certificate..."
+        # List every seaweedfs Certificate as "<isCA> <secretName>" and pick the
+        # CA one in shell — avoids kubectl jsonpath's finicky boolean-literal
+        # filter.
+        DISCOVERED_CA=$(kubectl -n "$S3_CA_NAMESPACE" get certificates.cert-manager.io \
+            -l app.kubernetes.io/name=seaweedfs \
+            -o jsonpath='{range .items[*]}{.spec.isCA}{" "}{.spec.secretName}{"\n"}{end}' 2>/dev/null \
+            | awk '$1=="true"{print $2; exit}' || true)
+        if [[ -n "$DISCOVERED_CA" ]]; then
+            log_success "Discovered seaweedfs CA secret ${S3_CA_NAMESPACE}/${DISCOVERED_CA}"
+            S3_CA_SECRET="$DISCOVERED_CA"
+        elif [[ "${S3_CA_SECRET_EXPLICIT}" == "1" ]]; then
+            # The user named a specific Secret and it is not there: that is a
+            # typo or a missing prerequisite, and guessing past it would hide it.
+            log_error "S3 CA secret ${S3_CA_NAMESPACE}/${S3_CA_SECRET} does not exist and no seaweedfs CA Certificate was found in ${S3_CA_NAMESPACE}. Fix the name, or set S3_CA_SECRET=\"\" for a publicly-trusted endpoint."
+            exit 1
+        else
+            # Nothing was named and there is no seaweedfs here, so this is most
+            # likely a cluster whose S3 endpoint is publicly trusted — a legal
+            # input for this demo. Warn and continue with endpointCA unset
+            # rather than failing on a default the user never chose.
+            log_warning "No seaweedfs CA found in ${S3_CA_NAMESPACE} and S3_CA_SECRET was not set explicitly."
+            log_warning "Continuing with backup.endpointCA unset — correct for a publicly-trusted S3 endpoint. If your endpoint uses a private CA, set S3_CA_SECRET to the Secret holding its bundle."
+            S3_CA_SECRET=""
+        fi
+    fi
+fi
+if [[ -n "$S3_CA_SECRET" ]]; then
+    log_substep "Copying S3 CA ${S3_CA_NAMESPACE}/${S3_CA_SECRET}[${S3_CA_KEY}] -> ${CH_CA_SECRET_NAME}..."
+    # The destination name is predictable, so don't clobber a Secret this demo
+    # does not own. A get that succeeds returns the ownership label (empty if
+    # absent); a get that fails means the Secret is gone, which is fine.
+    if existing_owner=$(kubectl -n "$NAMESPACE" get secret "$CH_CA_SECRET_NAME" \
+            -o jsonpath="{.metadata.labels.${CH_CA_SECRET_LABEL_KEY//./\\.}}" 2>/dev/null); then
+        if [[ "$existing_owner" != "$CH_CA_SECRET_LABEL_VALUE" ]]; then
+            log_error "Secret ${NAMESPACE}/${CH_CA_SECRET_NAME} already exists and is not owned by this demo (missing ${CH_CA_SECRET_LABEL_KEY}=${CH_CA_SECRET_LABEL_VALUE}). Refusing to overwrite it; set CH_CA_SECRET_NAME to a free name."
+            exit 1
+        fi
+    fi
+    # The dot in the default key has to be escaped for kubectl jsonpath.
+    ca_pem=$(kubectl -n "$S3_CA_NAMESPACE" get secret "$S3_CA_SECRET" \
+        -o jsonpath="{.data.${S3_CA_KEY//./\\.}}" | base64 -d)
+    [[ -n "$ca_pem" ]] || { log_error "S3 CA secret ${S3_CA_NAMESPACE}/${S3_CA_SECRET} has no ${S3_CA_KEY}"; exit 1; }
+    # apply (not create) so a stale copy from an earlier run is corrected;
+    # kubectl label --local stamps the ownership label into the manifest.
+    kubectl -n "$NAMESPACE" create secret generic "$CH_CA_SECRET_NAME" \
+        --from-literal="ca.crt=${ca_pem}" \
+        --dry-run=client -o yaml | \
+        kubectl label --local -f - "${CH_CA_SECRET_LABEL_KEY}=${CH_CA_SECRET_LABEL_VALUE}" \
+            --dry-run=client -o yaml | \
+        kubectl apply -f -
+    CH_BACKUP_CA_SECRET="$CH_CA_SECRET_NAME"
+else
+    log_warning "S3_CA_SECRET empty: leaving backup.endpointCA unset (assumes a publicly-trusted S3 endpoint)."
+fi
+
 # Persist for the next step. 04-create-clickhouse.sh sources this file when it
 # applies the ClickHouse spec so the chart can render <release>-backup-s3.
 # The cache stores raw S3 credentials, so apply restrictive perms before
@@ -63,6 +150,7 @@ export CH_BACKUP_SECRET_KEY=${CH_BACKUP_SECRET_KEY}
 export CH_BACKUP_ENDPOINT=${CH_BACKUP_ENDPOINT}
 export CH_BACKUP_REGION=${CH_BACKUP_REGION}
 export CH_BACKUP_BUCKET=${CH_BACKUP_BUCKET}
+export CH_BACKUP_CA_SECRET=${CH_BACKUP_CA_SECRET}
 ENV
 chmod 600 "$SCRIPT_DIR/.bucket-info.env"
 
diff --git a/examples/backups/clickhouse/04-create-clickhouse.sh b/examples/backups/clickhouse/04-create-clickhouse.sh
index ee134cd7b7..bf5c508e4e 100755
--- a/examples/backups/clickhouse/04-create-clickhouse.sh
+++ b/examples/backups/clickhouse/04-create-clickhouse.sh
@@ -14,6 +14,14 @@ source "$SCRIPT_DIR/.bucket-info.env"
 
 print_header "Step 04: Provision ClickHouse '${CLICKHOUSE_NAME}'"
 
+# backup.endpointCA is only meaningful when step 03 copied a CA (self-signed S3
+# endpoint); on a publicly-trusted endpoint CH_BACKUP_CA_SECRET is empty and the
+# block is omitted entirely so the sidecar stays on the system trust store.
+ENDPOINT_CA_BLOCK=""
+if [[ -n "${CH_BACKUP_CA_SECRET:-}" ]]; then
+    ENDPOINT_CA_BLOCK=$(printf '\n    endpointCA:\n      name: "%s"\n      key: ca.crt' "$CH_BACKUP_CA_SECRET")
+fi
+
 # backup.enabled=true triggers the chart to emit:
 #   - <release>-backup-s3 Secret (with bucket coordinates from values)
 #   - clickhouse-backup sidecar in the chi-* Pod (HTTP API on :7171)
@@ -37,7 +45,7 @@ spec:
     s3Region: "${CH_BACKUP_REGION}"
     endpoint: "${CH_BACKUP_ENDPOINT}"
     s3AccessKey: "${CH_BACKUP_ACCESS_KEY}"
-    s3SecretKey: "${CH_BACKUP_SECRET_KEY}"
+    s3SecretKey: "${CH_BACKUP_SECRET_KEY}"${ENDPOINT_CA_BLOCK}
   clickhouseKeeper:
     enabled: true
     replicas: 1
@@ -46,11 +54,12 @@ spec:
 EOF
 
 log_substep "Waiting for ClickHouse HelmRelease..."
-kubectl -n "$NAMESPACE" wait hr "clickhouse-${CLICKHOUSE_NAME}" --for=condition=ready --timeout=300s
+# 660s, above this generated release's 600s install timeout; see "Sizing an
+# HR-Ready budget" in docs/agents/e2e-testing.md.
+wait_hr_ready "clickhouse-${CLICKHOUSE_NAME}" 660
 
 log_substep "Waiting for first ClickHouse pod..."
-kubectl -n "$NAMESPACE" wait statefulset.apps/"chi-clickhouse-${CLICKHOUSE_NAME}-clickhouse-0-0" \
-    --for=jsonpath='{.status.readyReplicas}'=1 --timeout=300s
+wait_sts_ready "chi-clickhouse-${CLICKHOUSE_NAME}-clickhouse-0-0" 300
 
 log_substep "Writing sentinel data..."
 clickhouse_query "$CLICKHOUSE_NAME" "CREATE TABLE IF NOT EXISTS default.sentinel (id UInt32, name String) ENGINE = MergeTree ORDER BY id"
diff --git a/examples/backups/clickhouse/05-create-backupjob.sh b/examples/backups/clickhouse/05-create-backupjob.sh
index ffeb3978b8..bf13e8899d 100755
--- a/examples/backups/clickhouse/05-create-backupjob.sh
+++ b/examples/backups/clickhouse/05-create-backupjob.sh
@@ -27,7 +27,7 @@ log_substep "Waiting for BackupJob to Succeed (this triggers clickhouse-backup c
 # `kubectl wait --for=jsonpath='{.status.phase}'=Running` would time out even
 # though the BackupJob actually finished. wait_for_field already polls until
 # the terminal phase, which covers both the slow and the fast path.
-wait_for_field backupjob "$BACKUPJOB_NAME" '{.status.phase}' Succeeded "$NAMESPACE" 600
+wait_for_field backupjob "$BACKUPJOB_NAME" '{.status.phase}' Succeeded "$NAMESPACE" 480 Failed
 
 backup_ref=$(kubectl -n "$NAMESPACE" get backupjob "$BACKUPJOB_NAME" -o jsonpath='{.status.backupRef.name}')
 [[ -n "$backup_ref" ]] || { log_error "BackupJob succeeded but BackupRef is empty"; exit 1; }
diff --git a/examples/backups/clickhouse/06-restore-in-place.sh b/examples/backups/clickhouse/06-restore-in-place.sh
index 6a7dc13d32..afd3caff3a 100755
--- a/examples/backups/clickhouse/06-restore-in-place.sh
+++ b/examples/backups/clickhouse/06-restore-in-place.sh
@@ -24,7 +24,7 @@ spec:
 EOF
 
 log_substep "Waiting for in-place RestoreJob to Succeed..."
-wait_for_field restorejob "$RESTOREJOB_INPLACE_NAME" '{.status.phase}' Succeeded "$NAMESPACE" 600
+wait_for_field restorejob "$RESTOREJOB_INPLACE_NAME" '{.status.phase}' Succeeded "$NAMESPACE" 480 Failed
 
 log_substep "Verifying sentinel data is restored..."
 count=$(clickhouse_query "$CLICKHOUSE_NAME" "SELECT count() FROM default.sentinel" | tr -d '[:space:]')
diff --git a/examples/backups/clickhouse/07-restore-to-copy.sh b/examples/backups/clickhouse/07-restore-to-copy.sh
index 122b9df03a..5fcf785fb6 100755
--- a/examples/backups/clickhouse/07-restore-to-copy.sh
+++ b/examples/backups/clickhouse/07-restore-to-copy.sh
@@ -20,6 +20,14 @@ done
 
 print_header "Step 07: To-copy restore into '${CLICKHOUSE_RESTORE_NAME}'"
 
+# The target's sidecar downloads from the same S3 endpoint as the source, so it
+# needs the same CA when that endpoint is self-signed. Step 03 already
+# materialised the Secret in this namespace; reference it here too.
+ENDPOINT_CA_BLOCK=""
+if [[ -n "${CH_BACKUP_CA_SECRET:-}" ]]; then
+    ENDPOINT_CA_BLOCK=$(printf '\n    endpointCA:\n      name: "%s"\n      key: ca.crt' "$CH_BACKUP_CA_SECRET")
+fi
+
 # backup.enabled=true so the chart materialises the same sidecar pattern in
 # the target Pod; the strategy Pod's HTTP call hits the target's sidecar and
 # pulls from the same S3 backup.
@@ -50,7 +58,7 @@ spec:
     # name with "clickhouse-" (see clickhouse-rd/cozyrds/clickhouse.yaml),
     # so the actual Helm release name (which the sidecar uses for
     # S3_PATH) is "clickhouse-${CLICKHOUSE_NAME}".
-    s3PathOverride: "clickhouse-${CLICKHOUSE_NAME}"
+    s3PathOverride: "clickhouse-${CLICKHOUSE_NAME}"${ENDPOINT_CA_BLOCK}
   clickhouseKeeper:
     enabled: true
     replicas: 1
@@ -59,9 +67,9 @@ spec:
 EOF
 
 log_substep "Waiting for restore-target ClickHouse HelmRelease..."
-kubectl -n "$NAMESPACE" wait hr "clickhouse-${CLICKHOUSE_RESTORE_NAME}" --for=condition=ready --timeout=300s
-kubectl -n "$NAMESPACE" wait statefulset.apps/"chi-clickhouse-${CLICKHOUSE_RESTORE_NAME}-clickhouse-0-0" \
-    --for=jsonpath='{.status.readyReplicas}'=1 --timeout=300s
+# Same 660s as the source instance in 04-create-clickhouse.sh.
+wait_hr_ready "clickhouse-${CLICKHOUSE_RESTORE_NAME}" 660
+wait_sts_ready "chi-clickhouse-${CLICKHOUSE_RESTORE_NAME}-clickhouse-0-0" 300
 
 kubectl apply -f - <<EOF
 apiVersion: backups.cozystack.io/v1alpha1
@@ -79,7 +87,7 @@ spec:
 EOF
 
 log_substep "Waiting for to-copy RestoreJob to Succeed..."
-wait_for_field restorejob "$RESTOREJOB_TOCOPY_NAME" '{.status.phase}' Succeeded "$NAMESPACE" 600
+wait_for_field restorejob "$RESTOREJOB_TOCOPY_NAME" '{.status.phase}' Succeeded "$NAMESPACE" 480 Failed
 
 log_substep "Verifying sentinel data exists on the copy..."
 count=$(clickhouse_query "$CLICKHOUSE_RESTORE_NAME" "SELECT count() FROM default.sentinel" | tr -d '[:space:]')
diff --git a/examples/backups/clickhouse/91-scenario-user-backup.md b/examples/backups/clickhouse/91-scenario-user-backup.md
index 7f14a7d5f9..fce3914296 100644
--- a/examples/backups/clickhouse/91-scenario-user-backup.md
+++ b/examples/backups/clickhouse/91-scenario-user-backup.md
@@ -4,7 +4,7 @@ This scenario assumes the admin steps (`01-...`, `02-...`) have already run.
 
 ## Prerequisites
 
-- Tenant namespace (default: `tenant-test`).
+- Tenant namespace (default: `tenant-root`, where the shared SeaweedFS the backups land in also lives).
 - A Cozystack `Bucket` (or any S3-compatible coordinates supplied via
   `spec.backup.*` on the ClickHouse application). The chart materialises
   `<release>-backup-s3` Secret in the tenant namespace and an in-pod
diff --git a/examples/backups/clickhouse/README.md b/examples/backups/clickhouse/README.md
index c70e2b72fd..3b9fc0d3e0 100644
--- a/examples/backups/clickhouse/README.md
+++ b/examples/backups/clickhouse/README.md
@@ -27,7 +27,7 @@ that POSTs to the sidecar and polls the action log.
 | `00-helpers.sh` | Shared bash helpers and env defaults; sourced by every step. | n/a |
 | `01-create-strategy.sh` | Creates the cluster-scoped `Altinity` strategy that wraps `clickhouse-backup`. | admin |
 | `02-create-backupclass.sh` | Maps `apps.cozystack.io/ClickHouse` to that strategy. | admin |
-| `03-create-bucket.sh` | Provisions a `Bucket` and caches its S3 coordinates into `.bucket-info.env` (chmod 600; raw access keys). `cleanup.sh` removes this file. | tenant |
+| `03-create-bucket.sh` | Provisions a `Bucket`, caches its S3 coordinates into `.bucket-info.env` (chmod 600; raw access keys), and copies the S3 endpoint CA into a per-release Secret so the sidecar can verify a self-signed endpoint. `cleanup.sh` removes both. | tenant, **plus admin** for the CA copy — see below |
 | `04-create-clickhouse.sh` | Provisions a `ClickHouse` instance with `backup.enabled=true` (chart emits the backup-s3 Secret + sidecar) and writes a sentinel row. | tenant |
 | `05-create-backupjob.sh` | Submits a `BackupJob` and waits for Succeeded. | tenant |
 | `06-restore-in-place.sh` | Drops the sentinel and restores into the same instance via `RestoreJob`. | tenant |
@@ -44,7 +44,7 @@ All variables come from `00-helpers.sh`:
 
 | Variable | Default | Description |
 |---|---|---|
-| `NAMESPACE` | `tenant-test` | Tenant namespace for the demo. |
+| `NAMESPACE` | `tenant-root` | Tenant namespace for the demo. `tenant-root` because the S3 client is the `clickhouse-backup` sidecar inside the tenant and cozystack's shared SeaweedFS lives there; an isolated tenant's Cilium egress allowlist blocks its Pods from reaching `tenant-root`'s SeaweedFS. |
 | `CLICKHOUSE_NAME` | `clickhouse-test` | Source ClickHouse application name. |
 | `CLICKHOUSE_RESTORE_NAME` | `clickhouse-restore` | Target ClickHouse for the to-copy restore. |
 | `BUCKET_NAME` | `clickhouse-backups` | Cozystack `Bucket` to provision. |
@@ -53,10 +53,26 @@ All variables come from `00-helpers.sh`:
 | `BACKUPJOB_NAME` | `clickhouse-backup-job` | BackupJob name. |
 | `RESTOREJOB_INPLACE_NAME` | `clickhouse-restore-inplace` | In-place RestoreJob name. |
 | `RESTOREJOB_TOCOPY_NAME` | `clickhouse-restore-to-copy` | To-copy RestoreJob name. |
+| `S3_ENDPOINT` | *(from BucketInfo)* | Overrides the S3 endpoint the sidecar uses. `BucketInfo` advertises the **external** ingress URL, which in-cluster Pods cannot always reach or TLS-validate; set `https://seaweedfs-s3.tenant-root:8333` to use the in-cluster endpoint. |
+| `S3_CA_SECRET` | `seaweedfs-ca-cert` | Secret holding the S3 endpoint's CA. Step 03 copies its CA into a per-release Secret wired to `backup.endpointCA`, so the sidecar can verify a self-signed endpoint. Auto-discovered from the seaweedfs cert-manager `Certificate` if this name is absent. Set to `""` on a publicly-trusted endpoint to skip the copy and leave `backup.endpointCA` unset. |
+| `S3_CA_NAMESPACE` | `tenant-root` | Namespace of `S3_CA_SECRET`. Independent of `NAMESPACE`: the shared SeaweedFS and its CA live in `tenant-root` even when the demo runs elsewhere. |
+| `S3_CA_KEY` | `ca.crt` | Key inside `S3_CA_SECRET` holding the PEM bundle. |
+| `CH_CA_SECRET_NAME` | `<CLICKHOUSE_NAME>-backup-s3-ca` | Per-release Secret the CA is copied into; referenced by `backup.endpointCA`. Scoped to the instance name so two instances in one namespace don't collide, and stamped with a `cozystack.io/owned-by-demo` label so step 03 refuses to overwrite a Secret it doesn't own and `cleanup.sh` deletes only one this demo created. |
+| `CH_BACKUP_CA_SECRET` | *(set by step 03)* | Secret name steps 04 and 07 wire into `backup.endpointCA`. Step 03 sets it to `CH_CA_SECRET_NAME` after copying the CA and leaves it empty when `S3_CA_SECRET=""`. On the admin-copy path, export it yourself to the pre-copied Secret before step 04, since step 03 does no copy and leaves it empty. |
 
 ## Prerequisites
 
 - Cozystack cluster with the backup-controller and backupstrategy-controller installed.
 - `kubectl`, `jq`, and (for `04`+) the ClickHouse operator deployed by the chart.
 
+### Who can run step 03
+
+Step 03 is otherwise a tenant action, but copying the S3 endpoint CA reads a Secret in `S3_CA_NAMESPACE` (`tenant-root` by default), which is a platform/admin capability rather than a tenant one. Three ways out, in order of preference:
+
+- run step 03 with credentials that can read that namespace (the admin path this demo assumes);
+- have an admin copy the CA into `<NAMESPACE>/<CH_CA_SECRET_NAME>` once, then run the demo with `S3_CA_SECRET=""` and `export CH_BACKUP_CA_SECRET="<CH_CA_SECRET_NAME>"` before steps 04 and 07, so both ClickHouse flows wire `backup.endpointCA` to that pre-copied Secret;
+- skip it entirely with `S3_CA_SECRET=""` when the S3 endpoint's certificate is signed by a publicly-trusted CA — nothing needs a CA bundle then.
+
+The script distinguishes the three outcomes so a permissions problem does not present as a missing Secret: it stops with an explicit permissions message on `Forbidden`, and on a genuinely absent default (no `seaweedfs-ca-cert`, no seaweedfs `Certificate` to discover, and `S3_CA_SECRET` not set explicitly) it warns and continues with `backup.endpointCA` unset instead of failing — which is the right outcome on a cluster whose endpoint is publicly trusted. Naming a Secret that does not exist is still an error.
+
 [altinity]: https://github.com/Altinity/clickhouse-backup
diff --git a/examples/backups/clickhouse/cleanup.sh b/examples/backups/clickhouse/cleanup.sh
index 310c1b478e..1cba452185 100755
--- a/examples/backups/clickhouse/cleanup.sh
+++ b/examples/backups/clickhouse/cleanup.sh
@@ -15,8 +15,38 @@ kubectl -n "$NAMESPACE" delete backup "$BACKUPJOB_NAME" --ignore-not-found
 kubectl -n "$NAMESPACE" delete clickhouse "$CLICKHOUSE_RESTORE_NAME" --ignore-not-found
 kubectl -n "$NAMESPACE" delete clickhouse "$CLICKHOUSE_NAME" --ignore-not-found
 kubectl -n "$NAMESPACE" delete bucket "$BUCKET_NAME" --ignore-not-found
+
+# `kubectl delete` on these returns as soon as deletionTimestamp is set, while
+# the HelmRelease uninstall behind each one (a ClickHouseInstallation, a Keeper
+# installation and their PVCs) is still running. Returning here has two costs:
+# the next suite starts while helm-controller workers are still draining this
+# one, and on the pre-clean path step 04 can re-apply an application whose
+# predecessor has not finished uninstalling. So wait for the objects to actually
+# go, with teeth — a teardown that silently does not settle is what leaks into
+# later tests.
+# This script deliberately runs without `set -e` so one absent resource cannot
+# abandon the rest of the teardown, which means the waits have to record their
+# own failure and surface it at the end.
+teardown_rc=0
+wait_deleted clickhouse "$CLICKHOUSE_RESTORE_NAME" 180 || teardown_rc=1
+wait_deleted clickhouse "$CLICKHOUSE_NAME" 180 || teardown_rc=1
+wait_deleted bucket "$BUCKET_NAME" 180 || teardown_rc=1
+# The S3 endpoint CA copied out of the seaweedfs CA Secret by step 03. Delete
+# it only when it carries this demo's ownership label, so a foreign Secret that
+# happens to share the name survives. The source Secret in S3_CA_NAMESPACE is
+# the platform's and is never touched.
+if ca_owner=$(kubectl -n "$NAMESPACE" get secret "$CH_CA_SECRET_NAME" \
+        -o jsonpath="{.metadata.labels.${CH_CA_SECRET_LABEL_KEY//./\\.}}" 2>/dev/null) \
+        && [[ "$ca_owner" == "$CH_CA_SECRET_LABEL_VALUE" ]]; then
+    kubectl -n "$NAMESPACE" delete secret "$CH_CA_SECRET_NAME" --ignore-not-found
+fi
 rm -f "$SCRIPT_DIR/.bucket-info.env"
 kubectl delete backupclass "$BACKUPCLASS_NAME" --ignore-not-found
 kubectl delete altinity.strategy.backups.cozystack.io "$STRATEGY_NAME" --ignore-not-found
 
+if [[ $teardown_rc -ne 0 ]]; then
+    log_error "Cleanup did not settle: see the resources reported above. Failing rather than leaving a half-uninstalled release for the next test to trip over."
+    exit 1
+fi
+
 log_success "Cleanup complete."
diff --git a/examples/backups/etcd/00-helpers.sh b/examples/backups/etcd/00-helpers.sh
index 9a77e910c7..f1f0959448 100755
--- a/examples/backups/etcd/00-helpers.sh
+++ b/examples/backups/etcd/00-helpers.sh
@@ -15,7 +15,7 @@ export BOLD='\033[1m'
 # Default settings (override via environment).
 export NAMESPACE="${NAMESPACE:-tenant-root}"
 # The chart pins the Helm release name (and the operator-side
-# etcd.aenix.io/EtcdCluster name) to "etcd" via
+# etcd-operator.cozystack.io/EtcdCluster name) to "etcd" via
 # templates/check-release-name.yaml, so the apps.cozystack.io/Etcd CR
 # MUST be named "etcd" per namespace. To-copy in the same namespace is
 # unsupported by design (chart constraint).
@@ -43,35 +43,10 @@ print_header() {
     echo -e "\n${MAGENTA}${BOLD}== $title ==${NC}\n" >&2
 }
 
-# Wait until a JSONPath value on a resource matches the desired string.
-wait_for_field() {
-    local resource_type="$1"
-    local resource_name="$2"
-    local jsonpath="$3"
-    local desired="$4"
-    local namespace="${5:-}"
-    local timeout="${6:-300}"
-
-    log_substep "Waiting for $resource_type/$resource_name $jsonpath to become '$desired'..."
-    local elapsed=0
-    local ns_flag=()
-    [[ -n "$namespace" ]] && ns_flag=(-n "$namespace")
-
-    while true; do
-        local current
-        current=$(kubectl get "$resource_type" "$resource_name" "${ns_flag[@]}" -o jsonpath="$jsonpath" 2>/dev/null || true)
-        if [[ "$current" == "$desired" ]]; then
-            log_success "$resource_type/$resource_name reached '$desired'"
-            return 0
-        fi
-        if [[ $elapsed -ge $timeout ]]; then
-            log_error "Timeout waiting for $resource_type/$resource_name (current: '$current', expected: '$desired')"
-            return 1
-        fi
-        sleep 5
-        elapsed=$((elapsed + 5))
-    done
-}
+# wait_for_field, wait_hr_ready and wait_deleted live in one file shared by
+# every backup walkthrough, so a fix to one reaches all of them.
+# shellcheck source-path=SCRIPTDIR source=../_lib/wait-helpers.sh
+source "$(dirname "${BASH_SOURCE[0]}")/../_lib/wait-helpers.sh"
 
 # Ephemeral etcdctl pod name. Created on first etcdctl_exec call; reused
 # for subsequent calls in the same script run. cleanup.sh removes it.
@@ -109,7 +84,7 @@ spec:
   restartPolicy: Never
   containers:
   - name: etcdctl
-    image: quay.io/coreos/etcd:v3.5.12
+    image: quay.io/coreos/etcd:v3.6.11
     command:
     - etcdctl
     - "--cacert=/etc/etcd/pki/client/ca.crt"
diff --git a/examples/backups/etcd/01-create-strategy.sh b/examples/backups/etcd/01-create-strategy.sh
index dbc1ca3c29..1c7fbd4713 100755
--- a/examples/backups/etcd/01-create-strategy.sh
+++ b/examples/backups/etcd/01-create-strategy.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Step 01: Apply the cluster-scoped Etcd strategy. Admin operation -
 # tenants do not author the strategy CR directly. The strategy carries
-# the templated EtcdBackup destination shape; the BackupClass created in
+# the templated EtcdSnapshot destination shape; the BackupClass created in
 # step 02 supplies bucket/endpoint/credentials per tenant via parameters.
 set -euo pipefail
 
diff --git a/examples/backups/etcd/02-create-bucket.sh b/examples/backups/etcd/02-create-bucket.sh
index 63ffbe3448..a6c46a1761 100755
--- a/examples/backups/etcd/02-create-bucket.sh
+++ b/examples/backups/etcd/02-create-bucket.sh
@@ -45,7 +45,7 @@ for v in ETCD_ACCESS_KEY ETCD_SECRET_KEY ETCD_ENDPOINT ETCD_REGION ETCD_BUCKET;
     [[ -n "${!v}" && "${!v}" != "null" ]] || { log_error "BucketInfo missing required field: ${v}"; exit 1; }
 done
 
-log_substep "Materialising the per-app credentials Secret consumed by the rendered EtcdBackup..."
+log_substep "Materialising the per-app credentials Secret consumed by the rendered EtcdSnapshot..."
 # The strategy template references this Secret by name:
 #   "{{ .Application.metadata.name }}-etcd-backup-creds"
 # The etcd-operator's snapshot Job mounts the Secret and exposes
diff --git a/examples/backups/etcd/03-create-etcd-src.sh b/examples/backups/etcd/03-create-etcd-src.sh
index 5c4ef42630..d95cabbcf0 100755
--- a/examples/backups/etcd/03-create-etcd-src.sh
+++ b/examples/backups/etcd/03-create-etcd-src.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # Step 03: Apply the source Etcd application, wait for the operator-side
-# EtcdCluster to reach Ready, then write a sentinel key that the backup
+# EtcdCluster to become Available, then write a sentinel key that the backup
 # captures and the restore round-trips. The sentinel is the in-cluster
 # witness that the snapshot actually round-tripped through S3.
 set -euo pipefail
@@ -27,13 +27,13 @@ EOF
 
 log_substep "Waiting for HelmRelease 'etcd' to be Ready..."
 kubectl -n "$NAMESPACE" wait hr "${ETCD_NAME}" --for=condition=ready --timeout=300s
-log_substep "Waiting for etcd.aenix.io/EtcdCluster 'etcd' to be Ready..."
-kubectl -n "$NAMESPACE" wait etcdcluster.etcd.aenix.io etcd \
-    --for=jsonpath='{.status.conditions[?(@.type=="Ready")].status}'=True \
+log_substep "Waiting for etcd-operator.cozystack.io/EtcdCluster 'etcd' to be Available..."
+kubectl -n "$NAMESPACE" wait etcdcluster.etcd-operator.cozystack.io etcd \
+    --for=jsonpath='{.status.conditions[?(@.type=="Available")].status}'=True \
     --timeout=300s
 
-log_substep "Waiting for etcd-0 pod to be Ready..."
-kubectl -n "$NAMESPACE" wait pod etcd-0 --for=condition=ready --timeout=300s
+log_substep "Waiting for etcd member pods to be Ready..."
+kubectl -n "$NAMESPACE" wait pod -l app.kubernetes.io/instance=etcd --for=condition=ready --timeout=300s
 
 SENTINEL_KEY="__cozystack_e2e_sentinel"
 SENTINEL_VAL="pristine-$(date -u +%Y%m%dT%H%M%SZ)"
diff --git a/examples/backups/etcd/04-create-backupjob.sh b/examples/backups/etcd/04-create-backupjob.sh
index 50958bc385..0613396080 100755
--- a/examples/backups/etcd/04-create-backupjob.sh
+++ b/examples/backups/etcd/04-create-backupjob.sh
@@ -25,7 +25,7 @@ spec:
 EOF
 
 wait_for_field backupjobs.backups.cozystack.io "$BACKUPJOB_NAME" \
-    '{.status.phase}' Succeeded "$NAMESPACE" 1200
+    '{.status.phase}' Succeeded "$NAMESPACE" 1200 Failed
 
 BACKUP_NAME=$(kubectl -n "$NAMESPACE" get backupjobs.backups.cozystack.io "$BACKUPJOB_NAME" \
     -o jsonpath='{.status.backupRef.name}')
diff --git a/examples/backups/etcd/05-restore-in-place.sh b/examples/backups/etcd/05-restore-in-place.sh
index 7851ad827a..50ac69ea5f 100755
--- a/examples/backups/etcd/05-restore-in-place.sh
+++ b/examples/backups/etcd/05-restore-in-place.sh
@@ -43,10 +43,10 @@ spec:
 EOF
 
 wait_for_field restorejobs.backups.cozystack.io "$RESTOREJOB_INPLACE_NAME" \
-    '{.status.phase}' Succeeded "$NAMESPACE" 1800
+    '{.status.phase}' Succeeded "$NAMESPACE" 1800 Failed
 
-log_substep "Waiting for etcd-0 to be Ready again after restore..."
-kubectl -n "$NAMESPACE" wait pod etcd-0 --for=condition=ready --timeout=300s
+log_substep "Waiting for etcd member pods to be Ready again after restore..."
+kubectl -n "$NAMESPACE" wait pod -l app.kubernetes.io/instance=etcd --for=condition=ready --timeout=300s
 
 # Helm's next apply re-renders the chart's bootstrap-less EtcdCluster
 # spec, which evicts the bootstrap.restore block the driver stamped on
@@ -58,7 +58,7 @@ kubectl -n "$NAMESPACE" wait pod etcd-0 --for=condition=ready --timeout=300s
 log_substep "Waiting for Helm to evict bootstrap.restore from the live EtcdCluster..."
 elapsed=0
 while true; do
-    BOOTSTRAP=$(kubectl -n "$NAMESPACE" get etcdcluster.etcd.aenix.io etcd \
+    BOOTSTRAP=$(kubectl -n "$NAMESPACE" get etcdcluster.etcd-operator.cozystack.io etcd \
         -o jsonpath='{.spec.bootstrap}' 2>/dev/null || true)
     if [[ -z "$BOOTSTRAP" || "$BOOTSTRAP" == "{}" || "$BOOTSTRAP" == "null" ]]; then
         log_success "bootstrap.restore evicted by Helm reconcile"
diff --git a/examples/backups/etcd/90-scenario-admin-prepare.md b/examples/backups/etcd/90-scenario-admin-prepare.md
index ae2701dcf3..b034392442 100644
--- a/examples/backups/etcd/90-scenario-admin-prepare.md
+++ b/examples/backups/etcd/90-scenario-admin-prepare.md
@@ -7,8 +7,9 @@ prerequisite hand-off ends at "tenants can author `BackupJob` /
 
 ## 1. Install the operator + driver
 
-- `packages/system/etcd-operator` ships the upstream `etcd-operator`
-  (CRDs: `EtcdCluster`, `EtcdBackup`, `EtcdBackupSchedule`).
+- `packages/system/etcd-operator` ships the cozystack-authored `etcd-operator`
+  (`etcd-operator.cozystack.io/v1alpha2`; CRDs: `EtcdCluster`, `EtcdMember`,
+  `EtcdSnapshot`).
 - `packages/system/backupstrategy-controller` ships the
   `strategy.backups.cozystack.io/v1alpha1` API and the controllers that
   dispatch `BackupJob` / `RestoreJob` to the per-app driver. The
diff --git a/examples/backups/etcd/91-scenario-user-backup.md b/examples/backups/etcd/91-scenario-user-backup.md
index 2fc9935eea..3f0a4914f6 100644
--- a/examples/backups/etcd/91-scenario-user-backup.md
+++ b/examples/backups/etcd/91-scenario-user-backup.md
@@ -18,7 +18,7 @@ coordinates baked into `parameters`.
 ## 2. Deploy the source Etcd (`03-create-etcd-src.sh`)
 
 The tenant applies an `apps.cozystack.io/Etcd` named `etcd`. The
-HelmRelease materialises an `etcd.aenix.io/EtcdCluster` and three
+HelmRelease materialises an `etcd-operator.cozystack.io/EtcdCluster` and three
 members. The script writes a sentinel key under `etcdctl` so step 05
 can witness the round-trip.
 
@@ -27,7 +27,7 @@ can witness the round-trip.
 A `BackupJob` references the `BackupClass` and the source `Etcd`. The
 driver resolves the strategy, renders its template against the live
 application and class parameters, then materialises one
-`etcd.aenix.io/EtcdBackup` CR per `BackupJob`. The etcd-operator's
+`etcd-operator.cozystack.io/EtcdSnapshot` CR per `BackupJob`. The etcd-operator's
 controller runs a one-shot Job that snapshots etcd and uploads the
 file to S3. On `phase=Complete`, the driver creates a Cozystack
 `Backup` artefact with the S3 coordinates baked into
@@ -36,7 +36,7 @@ file to S3. On `phase=Complete`, the driver creates a Cozystack
 
 ## What the tenant does NOT do
 
-- Author `EtcdBackup` CRs by hand. The driver owns the lifecycle.
+- Author `EtcdSnapshot` CRs by hand. The driver owns the lifecycle.
 - Manage the underlying S3 credentials. The driver consumes them from
   the per-app Secret the bucket flow already produced.
 - Track snapshot retention via cron. A `Plan` resource (not part of
diff --git a/examples/backups/etcd/92-scenario-user-restore.md b/examples/backups/etcd/92-scenario-user-restore.md
index fedf06a9d0..038a748871 100644
--- a/examples/backups/etcd/92-scenario-user-restore.md
+++ b/examples/backups/etcd/92-scenario-user-restore.md
@@ -21,7 +21,7 @@ namespace) and `targetApplicationRef` is a same-namespace reference.
    `helm.toolkit.fluxcd.io/v2 HelmRelease "etcd"` stops Flux from
    re-rendering the chart while the driver mutates the live cluster.
 2. **Snapshot the chart-rendered EtcdCluster spec.** The driver reads
-   the live `etcd.aenix.io/EtcdCluster "etcd"` spec and stashes it on
+   the live `etcd-operator.cozystack.io/EtcdCluster "etcd"` spec and stashes it on
    `RestoreJob.status.conditions[EtcdClusterSpecCaptured].message`.
    This makes the destructive flow controller-crash-safe: a restart
    between "snapshot taken" and "cluster recreated" still has the spec
@@ -35,9 +35,10 @@ namespace) and `targetApplicationRef` is a same-namespace reference.
    driver merges the captured spec with a freshly resolved snapshot
    destination from the `Backup` artefact, then `Create`s the new CR.
    The etcd-operator picks it up and bootstraps from the S3 snapshot.
-6. **Wait for `Ready=True`.** The driver polls the new
-   `EtcdCluster.status.conditions[Ready]`.
-7. **Resume the HelmRelease.** With the cluster Ready, Flux can
+6. **Wait for `Available=True`.** The driver polls the new
+   `EtcdCluster.status.conditions[Available]` (v1alpha2 reports readiness
+   as `Available`, not `Ready`).
+7. **Resume the HelmRelease.** With the cluster Available, Flux can
    reconcile chart drift safely. Helm's next apply will remove the
    `bootstrap` block on the live CR; the operator only consults
    `bootstrap` at first reconcile, so this is a no-op after the fact.
diff --git a/examples/backups/etcd/README.md b/examples/backups/etcd/README.md
index 7883e39b51..c0775cb0ae 100644
--- a/examples/backups/etcd/README.md
+++ b/examples/backups/etcd/README.md
@@ -13,7 +13,7 @@
 This directory shows how to back up and restore a Cozystack-managed `Etcd`
 application using the cluster's `Etcd` backup strategy driver. The driver
 delegates to the [etcd-operator][etcd-operator]: each Cozystack `BackupJob`
-materialises an `etcd.aenix.io/v1alpha1 EtcdBackup` CR (a one-shot Job that
+materialises an `etcd-operator.cozystack.io/v1alpha2 EtcdSnapshot` CR (a one-shot Job that
 streams `etcdctl snapshot save` output to S3), and each `RestoreJob`
 performs an in-place restore by suspending the Etcd HelmRelease,
 deleting the chart-rendered `EtcdCluster`, and recreating it with
@@ -68,7 +68,7 @@ chart change alone is not sufficient.
 | `00-helpers.sh` | Shared bash helpers and env defaults; sourced by every `01..05` step and by `cleanup.sh`. | n/a |
 | `01-create-strategy.sh` | Creates the cluster-scoped `Etcd` strategy. | admin |
 | `02-create-bucket.sh` | Provisions a `Bucket`, mints an `<app>-etcd-backup-creds` Secret in the source namespace, and creates the `BackupClass` bound to the Etcd strategy with resolved S3 coordinates. Caches raw creds in `.bucket-info.env` (chmod 600); `cleanup.sh` removes it. | tenant |
-| `03-create-etcd-src.sh` | Provisions the source `Etcd` application, waits for `EtcdCluster.status.conditions[Ready]=True`, and writes a sentinel key under `etcdctl`. | tenant |
+| `03-create-etcd-src.sh` | Provisions the source `Etcd` application, waits for `EtcdCluster.status.conditions[Available]=True`, and writes a sentinel key under `etcdctl`. | tenant |
 | `04-create-backupjob.sh` | Submits a `BackupJob` and waits for `phase=Succeeded`. | tenant |
 | `05-restore-in-place.sh` | Mutates the sentinel, submits a `RestoreJob` (no `targetApplicationRef`), and verifies the sentinel is round-tripped back to its pre-mutation value. | tenant |
 | `cleanup.sh` | Best-effort teardown. | admin or tenant |
@@ -94,13 +94,12 @@ All variables come from `00-helpers.sh`:
   running, with the Etcd dispatch wired (see
   `internal/backupcontroller/etcdstrategy_controller.go`).
 - `kubectl`, `jq`.
-- The `etcd.aenix.io` CRDs installed by `packages/system/etcd-operator`
-  v0.4.5+. The Cozystack flow specifically depends on `EtcdCluster`
-  (the driver re-creates it with `spec.bootstrap.restore.source.s3`
-  during in-place restore) and `EtcdBackup` (one materialised per
-  `BackupJob`). `EtcdBackupSchedule` is only consumed by the legacy
-  `backup.enabled=true` chart path. There is no separate `EtcdRestore`
-  CRD — restore goes through `EtcdCluster.spec.bootstrap`.
+- The `etcd-operator.cozystack.io` CRDs installed by
+  `packages/system/etcd-operator-crds`. The Cozystack flow specifically depends
+  on `EtcdCluster` (the driver re-creates it with
+  `spec.bootstrap.restore.source.s3` during in-place restore) and `EtcdSnapshot`
+  (one materialised per `BackupJob`). There is no separate `EtcdRestore` CRD —
+  restore goes through `EtcdCluster.spec.bootstrap`.
 - The Cozystack `etcd-rd` ApplicationDefinition installed so
   `apps.cozystack.io/Etcd` renders a HelmRelease.
 
@@ -118,11 +117,9 @@ All variables come from `00-helpers.sh`:
   override it by setting `ETCD_REGION` in your shell before sourcing
   `00-helpers.sh` if you point the demo at a non-SeaweedFS endpoint
   whose region differs.
-- Step 05 only verifies the happy path. Edge cases (stuck HR resume,
-  failed bootstrap, mid-restore controller crash) belong in the bats
-  e2e at `hack/e2e-apps/backup-etcd.bats`.
+- Step 05 only verifies the happy path. Edge cases (stuck HR resume, failed bootstrap, mid-restore controller crash) belong in the etcd Chainsaw suite at `hack/e2e-chainsaw/etcd/`.
 - The destructive in-place flow deletes the `EtcdCluster` (and the
   operator drops the member PVCs alongside it). All client traffic to
   etcd is unavailable for the duration of the restore. Plan a window.
 
-[etcd-operator]: https://github.com/aenix-io/etcd-operator
+[etcd-operator]: https://github.com/cozystack/etcd-operator
diff --git a/examples/backups/foundationdb/00-helpers.sh b/examples/backups/foundationdb/00-helpers.sh
index d7c3c204d9..f2707f1318 100755
--- a/examples/backups/foundationdb/00-helpers.sh
+++ b/examples/backups/foundationdb/00-helpers.sh
@@ -47,35 +47,10 @@ print_header() {
     echo -e "\n${MAGENTA}${BOLD}== $title ==${NC}\n" >&2
 }
 
-# Wait until a JSONPath value on a resource matches the desired string.
-wait_for_field() {
-    local resource_type="$1"
-    local resource_name="$2"
-    local jsonpath="$3"
-    local desired="$4"
-    local namespace="${5:-}"
-    local timeout="${6:-300}"
-
-    log_substep "Waiting for $resource_type/$resource_name $jsonpath to become '$desired'..."
-    local elapsed=0
-    local ns_flag=()
-    [[ -n "$namespace" ]] && ns_flag=(-n "$namespace")
-
-    while true; do
-        local current
-        current=$(kubectl get "$resource_type" "$resource_name" "${ns_flag[@]}" -o jsonpath="$jsonpath" 2>/dev/null || true)
-        if [[ "$current" == "$desired" ]]; then
-            log_success "$resource_type/$resource_name reached '$desired'"
-            return 0
-        fi
-        if [[ $elapsed -ge $timeout ]]; then
-            log_error "Timeout waiting for $resource_type/$resource_name (current: '$current', expected: '$desired')"
-            return 1
-        fi
-        sleep 5
-        elapsed=$((elapsed + 5))
-    done
-}
+# wait_for_field, wait_hr_ready and wait_deleted live in one file shared by
+# every backup walkthrough, so a fix to one reaches all of them.
+# shellcheck source-path=SCRIPTDIR source=../_lib/wait-helpers.sh
+source "$(dirname "${BASH_SOURCE[0]}")/../_lib/wait-helpers.sh"
 
 # Run an fdbcli statement against a FoundationDB cluster of the given app
 # instance. Args: <app-name> <fdbcli-script>
diff --git a/examples/backups/kafka-metadata/00-helpers.sh b/examples/backups/kafka-metadata/00-helpers.sh
new file mode 100755
index 0000000000..8d77fba64f
--- /dev/null
+++ b/examples/backups/kafka-metadata/00-helpers.sh
@@ -0,0 +1,268 @@
+#!/bin/bash
+# Shared helpers for the Kafka topic-metadata backup/restore demo.
+# Source this file in other scripts: source "$(dirname "$0")/00-helpers.sh"
+
+export RED='\033[0;31m'
+export GREEN='\033[0;32m'
+export YELLOW='\033[1;33m'
+export BLUE='\033[0;34m'
+export MAGENTA='\033[0;35m'
+export CYAN='\033[0;36m'
+export WHITE='\033[1;37m'
+export NC='\033[0m'
+export BOLD='\033[1m'
+
+# Default settings (override via environment). The demo derives its OWN Kafka
+# strategy + BackupClass from the platform-shipped cozy-default-kafka strategy
+# (run-all.sh patches its S3_ENDPOINT and mounts the S3 CA), so the round-trip
+# can target an in-cluster, TLS-verifiable S3 endpoint the shipped strategy's
+# advertised external ingress is not in CI. The shipped cozy-default-kafka is
+# left untouched.
+export NAMESPACE="${NAMESPACE:-tenant-root}"
+export KAFKA_SRC_NAME="${KAFKA_SRC_NAME:-kafka-meta-src}"
+export KAFKA_TARGET_NAME="${KAFKA_TARGET_NAME:-kafka-meta-target}"
+export TOPIC="${TOPIC:-orders}"
+export PARTITIONS="${PARTITIONS:-3}"
+# Colliding topic pair that exercises the --topic regex-vs-literal fix in the
+# strategy script: "audit.events" as a Java regex ALSO matches "audit-events"
+# (. is any char), so a describe that does not wrap the name in \Q...\E records
+# one topic's partition count against the other. Distinct counts make that
+# cross-match fail the round-trip verify.
+export COLLIDE_DOT="${COLLIDE_DOT:-audit.events}"
+export COLLIDE_DOT_PARTS="${COLLIDE_DOT_PARTS:-2}"
+export COLLIDE_DASH="${COLLIDE_DASH:-audit-events}"
+export COLLIDE_DASH_PARTS="${COLLIDE_DASH_PARTS:-5}"
+# The demo's own strategy + BackupClass, derived at run time from the shipped
+# cozy-default-kafka so the driver script stays a single source of truth. Named
+# distinctly so they never collide with the platform cozy-default class.
+export STRATEGY_NAME="${STRATEGY_NAME:-kafka-strategy-default}"
+export BACKUPCLASS_NAME="${BACKUPCLASS_NAME:-kafka-metadata}"
+export BACKUPJOB_NAME="${BACKUPJOB_NAME:-kafka-meta-src-adhoc}"
+export RESTOREJOB_INPLACE_NAME="${RESTOREJOB_INPLACE_NAME:-kafka-meta-src-inplace}"
+export RESTOREJOB_TOCOPY_NAME="${RESTOREJOB_TOCOPY_NAME:-kafka-meta-src-to-target}"
+export PLAN_NAME="${PLAN_NAME:-kafka-meta-src-daily}"
+# S3_ENDPOINT overrides the endpoint the backup Pod uses. The shipped strategy
+# advertises the EXTERNAL S3 ingress, which in-cluster Pods cannot always
+# resolve or TLS-validate (in CI it is an unroutable placeholder). The
+# in-cluster alternative is https://seaweedfs-s3.<ns>.svc:8333 — the .svc FQDN
+# is what the seaweedfs serving cert's SAN covers, so curl verifies TLS against
+# the copied CA below. CI sets this; a real cluster can leave it unset.
+export S3_ENDPOINT="${S3_ENDPOINT:-}"
+# Self-signed seaweedfs CA: run-all.sh discovers it and copies ca.crt into
+# CA_SECRET, which the demo strategy Pod mounts and points CURL_CA_BUNDLE at.
+# Set S3_CA_SECRET="" to skip on a publicly-trusted endpoint.
+export CA_SECRET="${CA_SECRET:-kafka-backup-ca}"
+export S3_CA_SECRET="${S3_CA_SECRET:-seaweedfs-ca-cert}"
+export S3_CA_NAMESPACE="${S3_CA_NAMESPACE:-tenant-root}"
+export S3_CA_KEY="${S3_CA_KEY:-ca.crt}"
+export CA_MOUNT_DIR="${CA_MOUNT_DIR:-/etc/ssl/kafka-backup-ca}"
+# The Cozystack chart names the Strimzi cluster kafka-<app>; its plaintext
+# bootstrap Service is kafka-<app>-kafka-bootstrap:9092.
+# KAFKA_IMAGE runs the long-lived CLI Pod the seed/verify helpers exec into (see
+# kafka_run). The backup/restore Jobs no longer use it: the controller resolves
+# the target broker's own image at reconcile time and renders it as the
+# strategy's .ClientImage. Override this only to match your operator's image if
+# the CLI it carries differs.
+export KAFKA_IMAGE="${KAFKA_IMAGE:-quay.io/strimzi/kafka:0.45.1-rc1-kafka-3.9.1@sha256:ba52ed046b1dccdbd96f4e68057ce014d862a7c9c1fc670760c023b9aa09f23f}"
+export KAFKA_BIN="${KAFKA_BIN:-/opt/kafka/bin}"
+# Name of that long-lived CLI Pod; cleanup.sh removes it.
+export KAFKA_CLI_POD="${KAFKA_CLI_POD:-kafka-cli}"
+
+log_info()    { echo -e "${BLUE}i${NC} $*" >&2; }
+log_success() { echo -e "${GREEN}OK${NC} $*" >&2; }
+log_warning() { echo -e "${YELLOW}!${NC} $*" >&2; }
+log_error()   { echo -e "${RED}x${NC} $*" >&2; }
+log_step()    { echo -e "\n${MAGENTA}${BOLD}> $*${NC}" >&2; }
+log_substep() { echo -e "${CYAN}  -> $*${NC}" >&2; }
+
+print_header() {
+    echo -e "\n${MAGENTA}${BOLD}== $1 ==${NC}\n" >&2
+}
+
+# copy_s3_ca copies the self-signed seaweedfs CA (ca.crt) into CA_SECRET in
+# NAMESPACE so the demo strategy Pod can verify TLS against the in-cluster S3
+# endpoint. Echoes "1" when a CA was copied, "0" when skipped (S3_CA_SECRET
+# empty → a publicly-trusted endpoint). Mirrors examples/backups/rabbitmq.
+copy_s3_ca() {
+    if [[ -z "$S3_CA_SECRET" ]]; then echo 0; return 0; fi
+    if ! kubectl -n "$S3_CA_NAMESPACE" get secret "$S3_CA_SECRET" >/dev/null 2>&1; then
+        log_warning "S3 CA secret ${S3_CA_NAMESPACE}/${S3_CA_SECRET} not found; discovering the seaweedfs CA Certificate..."
+        local discovered
+        discovered=$(kubectl -n "$S3_CA_NAMESPACE" get certificates.cert-manager.io \
+            -l app.kubernetes.io/name=seaweedfs \
+            -o jsonpath='{range .items[*]}{.spec.isCA}{" "}{.spec.secretName}{"\n"}{end}' 2>/dev/null \
+            | awk '$1=="true"{print $2; exit}' || true)
+        [[ -n "$discovered" ]] || { log_error "No seaweedfs CA Certificate found in ${S3_CA_NAMESPACE}; set S3_CA_SECRET explicitly (or empty for a public-CA endpoint)."; return 1; }
+        log_success "Discovered seaweedfs CA secret ${S3_CA_NAMESPACE}/${discovered}"
+        S3_CA_SECRET="$discovered"
+    fi
+    local ca_pem
+    ca_pem=$(kubectl -n "$S3_CA_NAMESPACE" get secret "$S3_CA_SECRET" \
+        -o jsonpath="{.data.${S3_CA_KEY//./\\.}}" | base64 -d)
+    [[ -n "$ca_pem" ]] || { log_error "S3 CA secret ${S3_CA_NAMESPACE}/${S3_CA_SECRET} has no ${S3_CA_KEY}"; return 1; }
+    kubectl -n "$NAMESPACE" create secret generic "$CA_SECRET" \
+        --from-literal="ca.crt=${ca_pem}" \
+        --dry-run=client -o yaml | kubectl -n "$NAMESPACE" apply -f - >&2
+    echo 1
+}
+
+# provision_demo_strategy derives the demo Kafka strategy from the shipped
+# cozy-default-kafka (single source of truth for the driver script), overriding
+# S3_ENDPOINT and, when $2==1, mounting CA_SECRET + pointing CURL_CA_BUNDLE at
+# it. Then applies the demo BackupClass. Args: <endpoint> <ca_present 0|1>.
+provision_demo_strategy() {
+    local endpoint="$1" ca_present="$2"
+    kubectl get kafka.strategy.backups.cozystack.io cozy-default-kafka -o json \
+      | jq \
+          --arg ep "$endpoint" --arg name "$STRATEGY_NAME" \
+          --arg caDir "$CA_MOUNT_DIR" --arg caPath "${CA_MOUNT_DIR}/ca.crt" \
+          --arg caSecret "$CA_SECRET" --argjson ca "$ca_present" '
+        .metadata = {name: $name}
+        | del(.status)
+        | .spec.template.spec.containers[0].env = (
+            ((.spec.template.spec.containers[0].env // [])
+              | map(if .name == "S3_ENDPOINT" then {name: "S3_ENDPOINT", value: $ep} else . end))
+            + (if $ca == 1 then [{name: "CURL_CA_BUNDLE", value: $caPath}] else [] end))
+        | if $ca == 1 then
+            .spec.template.spec.containers[0].volumeMounts =
+              ((.spec.template.spec.containers[0].volumeMounts // [])
+                + [{name: "s3-ca", mountPath: $caDir, readOnly: true}])
+            | .spec.template.spec.volumes =
+              ((.spec.template.spec.volumes // []) + [{name: "s3-ca", secret: {secretName: $caSecret}}])
+          else . end
+      ' | kubectl apply -f - >&2
+    kubectl apply -f "$SCRIPT_DIR/03-backupclass.yaml" >&2
+}
+
+# wait_for_field, wait_hr_ready and wait_deleted live in one file shared by
+# every backup walkthrough, so a fix to one reaches all of them.
+# shellcheck source-path=SCRIPTDIR source=../_lib/wait-helpers.sh
+source "$(dirname "${BASH_SOURCE[0]}")/../_lib/wait-helpers.sh"
+
+# Wait until the Strimzi Kafka cluster kafka-<app> reports Ready=True — the same
+# precondition the driver gates on.
+kafka_wait_ready() {
+    local app="$1" timeout="${2:-600}"
+    wait_for_field kafka.kafka.strimzi.io "kafka-${app}" \
+        '{.status.conditions[?(@.type=="Ready")].status}' True "$NAMESPACE" "$timeout"
+}
+
+# Ensure the long-lived kafka-cli Pod exists and is Ready, so kafka_run can exec
+# into it. Idempotent: a Ready Pod this demo owns is reused across calls and
+# across the numbered demo scripts; a leftover in a terminal phase (Succeeded /
+# Failed) is replaced rather than waited on, and so is one started before the
+# Pod ran under the restricted profile, since a Pod's securityContext cannot be
+# changed in place; and a same-named Pod this demo does not own is refused
+# rather than hijacked or deleted. cleanup.sh removes it.
+# Every step returns on failure explicitly: this runs as the left side of
+# `|| return 1`, and some callers also wrap it in $(...), so errexit never
+# applies inside it and a bare failure would carry on to the next step.
+kafka_cli_pod() {
+    local phase owner nonroot overrides
+    phase=$(kubectl -n "$NAMESPACE" get pod "$KAFKA_CLI_POD" --ignore-not-found -o jsonpath='{.status.phase}') || return 1
+    owner=$(kubectl -n "$NAMESPACE" get pod "$KAFKA_CLI_POD" --ignore-not-found -o jsonpath='{.metadata.labels.cozystack\.io/backup-demo}') || return 1
+    if [ -n "$phase" ] && [ "$owner" != "kafka-metadata" ]; then
+        log_error "Pod $NAMESPACE/$KAFKA_CLI_POD exists but this demo does not own it; refusing to use or delete it"
+        return 1
+    fi
+    # Only this helper creates the Pod, and it sets every restricted field at
+    # once, so one of them tells a current Pod from an older one.
+    nonroot=$(kubectl -n "$NAMESPACE" get pod "$KAFKA_CLI_POD" --ignore-not-found -o jsonpath='{.spec.securityContext.runAsNonRoot}') || return 1
+    if { [ "$phase" != "Running" ] && [ "$phase" != "Pending" ]; } || [ "$nonroot" != "true" ]; then
+        # The Strimzi image runs as non-root UID 1001, so runAsNonRoot and
+        # seccomp at the Pod level plus allowPrivilegeEscalation=false and
+        # drop-ALL on the container satisfy PSA "restricted" without pinning a
+        # runAsUser specific to this image tag. The add-only JSON patch leaves
+        # the run-generated Pod's image, command and args untouched.
+        overrides='[{"op":"add","path":"/spec/securityContext","value":{"runAsNonRoot":true,"seccompProfile":{"type":"RuntimeDefault"}}},{"op":"add","path":"/spec/containers/0/securityContext","value":{"allowPrivilegeEscalation":false,"capabilities":{"drop":["ALL"]}}}]'
+        kubectl -n "$NAMESPACE" delete pod "$KAFKA_CLI_POD" --grace-period=1 --ignore-not-found >/dev/null || return 1
+        kubectl -n "$NAMESPACE" run "$KAFKA_CLI_POD" --image="$KAFKA_IMAGE" \
+            --labels=cozystack.io/backup-demo=kafka-metadata \
+            --override-type=json --overrides="$overrides" \
+            --restart=Never --command -- sleep infinity >/dev/null || return 1
+    fi
+    kubectl -n "$NAMESPACE" wait --for=condition=Ready "pod/$KAFKA_CLI_POD" \
+        --timeout=5m >/dev/null
+}
+
+# Run a bash snippet against the source Kafka, with $BOOT / $BIN / $TOPIC /
+# $PARTITIONS pre-set (values injected via printf %q so the snippet needs no
+# nested quoting). Host-side analogue used only to seed and verify — the
+# backup/restore Jobs are created by the controller from the strategy.
+#
+# The snippet runs by `kubectl exec` in the long-lived CLI Pod, not a throwaway
+# `kubectl run -i` Pod per call. A throwaway Pod's stdout comes back over an
+# attach that only carries what the container writes after the attach registers,
+# so a CLI that finishes in between returns empty with exit 0. An exec'd process
+# owns its pipes, so its output cannot be missed that way, and kubectl's and the
+# CLI's stderr stay attached so a failed read says why instead of reading as ''.
+kafka_run() {
+    local app="$1"; shift
+    local snippet="$1"
+    local boot="kafka-${app}-kafka-bootstrap.${NAMESPACE}.svc:9092"
+    kafka_cli_pod || return 1
+    kubectl -n "$NAMESPACE" exec -i "$KAFKA_CLI_POD" -- bash -c "set -eu
+BOOT=$(printf %q "$boot")
+BIN=$(printf %q "$KAFKA_BIN")
+TOPIC=$(printf %q "$TOPIC")
+PARTITIONS=$(printf %q "$PARTITIONS")
+$snippet"
+}
+
+# Create the demo topic with a distinctive retention.ms sentinel so the restore
+# can prove the topic config — not just the name — round-tripped.
+seed_topic() {
+    local app="$1" retention="$2"
+    kafka_run "$app" '
+        "$BIN"/kafka-topics.sh --bootstrap-server "$BOOT" --create --if-not-exists \
+            --topic "$TOPIC" --partitions "$PARTITIONS" --replication-factor 1 \
+            --config retention.ms='"$retention"'
+    '
+}
+
+# Create a topic with an explicit partition count (no config sentinel). Used for
+# the colliding pair, whose distinct partition counts are the round-trip proof.
+seed_topic_partitions() {
+    local app="$1" topic="$2" partitions="$3"
+    TOPIC="$topic" PARTITIONS="$partitions" kafka_run "$app" '
+        "$BIN"/kafka-topics.sh --bootstrap-server "$BOOT" --create --if-not-exists \
+            --topic "$TOPIC" --partitions "$PARTITIONS" --replication-factor 1
+    '
+}
+
+# Delete a specific topic (literal name via \Q) and wait for it to disappear.
+delete_topic() {
+    local app="$1" topic="$2"
+    TOPIC="$topic" kafka_run "$app" '
+        "$BIN"/kafka-topics.sh --bootstrap-server "$BOOT" --delete --topic "\Q$TOPIC\E" || true
+        for _ in $(seq 1 60); do
+            list=$("$BIN"/kafka-topics.sh --bootstrap-server "$BOOT" --list) || { sleep 2; continue; }
+            printf "%s\n" "$list" | grep -qxF -- "$TOPIC" || { echo "topic $TOPIC deleted"; exit 0; }
+            sleep 2
+        done
+        echo "topic $TOPIC still present after wait" >&2; exit 1
+    '
+}
+
+# Print the partition count for a specific topic (literal \Q match), or "" if
+# absent. The literal match is what a restore of the colliding pair must honour.
+topic_partitions() {
+    local app="$1" topic="$2"
+    TOPIC="$topic" kafka_run "$app" '
+        line=$("$BIN"/kafka-topics.sh --bootstrap-server "$BOOT" --describe --topic "\Q$TOPIC\E" 2>/dev/null | head -1) || exit 0
+        [ -n "$line" ] || exit 0
+        printf "%s" "$line" | grep -oE "PartitionCount: [0-9]+" | awk "{print \$2}"
+    ' | tr -d '\r\n'
+}
+
+# Print "<partitions> <retention.ms>" for the demo topic, or "" if absent.
+topic_meta() {
+    local app="$1"
+    kafka_run "$app" '
+        line=$("$BIN"/kafka-topics.sh --bootstrap-server "$BOOT" --describe --topic "\Q$TOPIC\E" 2>/dev/null | head -1) || exit 0
+        [ -n "$line" ] || exit 0
+        parts=$(printf "%s" "$line" | grep -oE "PartitionCount: [0-9]+" | awk "{print \$2}")
+        ret=$(printf "%s" "$line" | grep -oE "retention.ms=[0-9]+" | head -1 | cut -d= -f2)
+        printf "%s %s\n" "$parts" "$ret"
+    ' | tr -d '\r'
+}
diff --git a/examples/backups/kafka-metadata/03-backupclass.yaml b/examples/backups/kafka-metadata/03-backupclass.yaml
new file mode 100644
index 0000000000..81e4341d6a
--- /dev/null
+++ b/examples/backups/kafka-metadata/03-backupclass.yaml
@@ -0,0 +1,20 @@
+# Maps Kind=Kafka to this demo's Kafka strategy (kafka-strategy-default, derived
+# at run time from the shipped cozy-default-kafka by run-all.sh). BackupClass is
+# cluster-scoped, so a single instance covers every namespace. Named
+# kafka-metadata so it does not collide with the platform cozy-default class,
+# which routes Kafka to the shipped cozy-default-kafka strategy against the
+# system bucket's external endpoint.
+---
+apiVersion: backups.cozystack.io/v1alpha1
+kind: BackupClass
+metadata:
+  name: kafka-metadata
+spec:
+  strategies:
+    - application:
+        apiGroup: apps.cozystack.io
+        kind: Kafka
+      strategyRef:
+        apiGroup: strategy.backups.cozystack.io
+        kind: Kafka
+        name: kafka-strategy-default
diff --git a/examples/backups/kafka-metadata/05-kafka-src.yaml b/examples/backups/kafka-metadata/05-kafka-src.yaml
new file mode 100644
index 0000000000..041a8dc261
--- /dev/null
+++ b/examples/backups/kafka-metadata/05-kafka-src.yaml
@@ -0,0 +1,21 @@
+# Source Kafka application. No backup: block — the platform cozy-default flow
+# carries the storage coordinates; the driver reads topic metadata through the
+# Kafka Admin API and needs nothing from the app spec. The demo topic is seeded
+# via the CLI in run-all.sh (with a retention.ms sentinel), so no chart topics
+# are declared here.
+apiVersion: apps.cozystack.io/v1alpha1
+kind: Kafka
+metadata:
+  name: kafka-meta-src
+  namespace: tenant-root
+spec:
+  external: false
+  kafka:
+    replicas: 1
+    size: 2Gi
+    resourcesPreset: "c1.small"
+  zookeeper:
+    replicas: 1
+    size: 1Gi
+    resourcesPreset: "c1.small"
+  topics: []
diff --git a/examples/backups/kafka-metadata/10-backupjob-adhoc.yaml b/examples/backups/kafka-metadata/10-backupjob-adhoc.yaml
new file mode 100644
index 0000000000..0e3e5eef88
--- /dev/null
+++ b/examples/backups/kafka-metadata/10-backupjob-adhoc.yaml
@@ -0,0 +1,15 @@
+# Ad-hoc BackupJob routed to this demo's kafka-metadata BackupClass, which maps
+# apps.cozystack.io/Kafka to the demo kafka-strategy-default (derived from the
+# shipped cozy-default-kafka by run-all.sh, targeting an in-cluster S3 endpoint).
+# The produced Backup is named after this BackupJob.
+apiVersion: backups.cozystack.io/v1alpha1
+kind: BackupJob
+metadata:
+  name: kafka-meta-src-adhoc
+  namespace: tenant-root
+spec:
+  applicationRef:
+    apiGroup: apps.cozystack.io
+    kind: Kafka
+    name: kafka-meta-src
+  backupClassName: kafka-metadata
diff --git a/examples/backups/kafka-metadata/15-plan.yaml b/examples/backups/kafka-metadata/15-plan.yaml
new file mode 100644
index 0000000000..d471496ed6
--- /dev/null
+++ b/examples/backups/kafka-metadata/15-plan.yaml
@@ -0,0 +1,16 @@
+# A scheduled Plan: the Plan controller stamps a BackupJob per cron tick against
+# this demo's kafka-metadata BackupClass. Shown for completeness; run-all.sh
+# drives the ad-hoc BackupJob above instead, so it does not wait on the cron.
+apiVersion: backups.cozystack.io/v1alpha1
+kind: Plan
+metadata:
+  name: kafka-meta-src-daily
+  namespace: tenant-root
+spec:
+  applicationRef:
+    apiGroup: apps.cozystack.io
+    kind: Kafka
+    name: kafka-meta-src
+  backupClassName: kafka-metadata
+  schedule:
+    cron: "0 3 * * *"
diff --git a/examples/backups/kafka-metadata/20-kafka-target.yaml b/examples/backups/kafka-metadata/20-kafka-target.yaml
new file mode 100644
index 0000000000..7642f81bf8
--- /dev/null
+++ b/examples/backups/kafka-metadata/20-kafka-target.yaml
@@ -0,0 +1,19 @@
+# A separate, empty Kafka application for the to-copy restore — the "bootstrap a
+# fresh cluster and apply the metadata onto it" scenario. No topics: the restore
+# recreates them from the backup.
+apiVersion: apps.cozystack.io/v1alpha1
+kind: Kafka
+metadata:
+  name: kafka-meta-target
+  namespace: tenant-root
+spec:
+  external: false
+  kafka:
+    replicas: 1
+    size: 2Gi
+    resourcesPreset: "c1.small"
+  zookeeper:
+    replicas: 1
+    size: 1Gi
+    resourcesPreset: "c1.small"
+  topics: []
diff --git a/examples/backups/kafka-metadata/25-restorejob-in-place.yaml b/examples/backups/kafka-metadata/25-restorejob-in-place.yaml
new file mode 100644
index 0000000000..ef8d5413b9
--- /dev/null
+++ b/examples/backups/kafka-metadata/25-restorejob-in-place.yaml
@@ -0,0 +1,11 @@
+# In-place restore: re-apply the backed-up topic metadata into the SAME source
+# application. Additive — recreates topics that are absent and (re)sets their
+# configs; it does not delete topics that exist live but not in the backup.
+apiVersion: backups.cozystack.io/v1alpha1
+kind: RestoreJob
+metadata:
+  name: kafka-meta-src-inplace
+  namespace: tenant-root
+spec:
+  backupRef:
+    name: kafka-meta-src-adhoc
diff --git a/examples/backups/kafka-metadata/30-restorejob-to-copy.yaml b/examples/backups/kafka-metadata/30-restorejob-to-copy.yaml
new file mode 100644
index 0000000000..ac2efc23fe
--- /dev/null
+++ b/examples/backups/kafka-metadata/30-restorejob-to-copy.yaml
@@ -0,0 +1,17 @@
+# To-copy restore: apply the source's backed-up topic metadata onto a separate
+# target application, leaving the source running. This is the "bootstrap an empty
+# cluster, then apply the metadata state" flow. The strategy renders against the
+# target (its bootstrap) but reads the exact object the source backup recorded in
+# its status.artifact.uri, which the driver injects as ARTIFACT_URI.
+apiVersion: backups.cozystack.io/v1alpha1
+kind: RestoreJob
+metadata:
+  name: kafka-meta-src-to-target
+  namespace: tenant-root
+spec:
+  backupRef:
+    name: kafka-meta-src-adhoc
+  targetApplicationRef:
+    apiGroup: apps.cozystack.io
+    kind: Kafka
+    name: kafka-meta-target
diff --git a/examples/backups/kafka-metadata/README.md b/examples/backups/kafka-metadata/README.md
new file mode 100644
index 0000000000..95fefef8a8
--- /dev/null
+++ b/examples/backups/kafka-metadata/README.md
@@ -0,0 +1,44 @@
+# Kafka topic-metadata backup/restore demo
+
+This demo backs up and restores the **topic metadata** of a Cozystack-managed `Kafka` application and proves integrity by round-tripping a per-run `retention.ms` sentinel through object storage. It runs a demo `BackupClass` + strategy that `run-all.sh` derives from the platform-shipped `cozy-default-kafka` (so the driver script stays a single source of truth), pointed at an S3 endpoint the in-cluster backup Pod can actually reach — the shipped strategy's advertised external ingress is not routable from inside every cluster.
+
+## What is backed up
+
+Strimzi ships no backup CRD and this strategy deliberately does not touch message data. The `cozy-default-kafka` strategy exports every non-internal topic's **definition** — partition count, replication factor, and non-default topic configs (retention, compaction, `min.insync.replicas`, ...) — through the Kafka Admin API (`kafka-topics --describe`), stores it in the system bucket, and restores it with `kafka-topics --create` + `kafka-configs --alter`.
+
+Out of scope: **message payloads** (a volume-snapshot strategy, not this one), **consumer-group offsets** (a log position, only meaningful with a byte-identical data restore), **ACLs and quotas**, and **KafkaUsers**. There is no point-in-time recovery.
+
+Restore is additive at the topic-set level — it recreates absent topics and (re)sets their configs, and never deletes topics that are live but not in the backup — but it does **not** silently accept a divergent topic. For a topic that already exists, restore compares the live shape against the backup: it grows the partition count with `--alter` when the backup asks for more, and **fails loudly** (non-zero, naming the topic and both values) when the backup asks for fewer partitions or a different replication factor, because Kafka cannot shrink partitions or change RF in place and a restore that cannot reach the recorded state must not report `Succeeded`. Restored topics are created directly through the Admin API, so on the target they are **unmanaged** (no `KafkaTopic` CR) — the accepted tradeoff for an Admin-API-only driver. This is the "bootstrap an empty cluster and apply the metadata state onto it" flow.
+
+**Topics owned by a `KafkaTopic` CR.** If a topic is declared in the Kafka app's `spec.topics`, the Strimzi Topic Operator owns it and reconciles its config from the CR on every pass — it will revert a dynamic config that the Admin-API restore set but the CR does not list. So an in-place config restore is durable only for **out-of-band** topics (created directly, no CR); for CR-declared topics the `KafkaTopic` CR / GitOps is the source of truth and the restore path. A to-copy restore onto a fresh empty cluster is unaffected, because the target has no `KafkaTopic` CRs.
+
+## Prerequisites
+
+The platform default backups stack must be installed: the `backupstrategy-controller`, the `cozy-backups` bucket it provisions, and the `cozy-default-kafka` strategy it ships (the demo strategy is derived from it and reuses its bucket coordinates + the controller-projected `cozy-backups-creds`). No demo `Bucket` is created. Set `S3_ENDPOINT` to reach an in-cluster, TLS-verifiable endpoint when the advertised external ingress is not routable (CI uses `https://seaweedfs-s3.tenant-root.svc:8333`, and `run-all.sh` copies the self-signed seaweedfs CA so `curl` verifies it); leave it unset on a cluster whose external S3 endpoint resolves and uses a public CA.
+
+## Flow
+
+- `00-helpers.sh` — shared bash helpers (waiters, kafka seed/verify via a long-lived CLI pod it execs into, the demo strategy derivation + S3 CA copy).
+- `03-backupclass.yaml` — the demo `BackupClass` (`kafka-metadata`) mapping `Kafka` to the derived `kafka-strategy-default`.
+- `05-kafka-src.yaml` — the source application (no `backup:` block; the strategy carries the coordinates).
+- `10-backupjob-adhoc.yaml` — an ad-hoc `BackupJob` routed to the demo `kafka-metadata` BackupClass.
+- `15-plan.yaml` — a cron `Plan` for scheduled backups.
+- `20-kafka-target.yaml` — a separate, empty application for restore-to-copy.
+- `25-restorejob-in-place.yaml` / `30-restorejob-to-copy.yaml` — the two restore flows.
+
+Run the whole round-trip:
+
+```bash
+./run-all.sh          # backup, in-place restore, then restore into a fresh copy
+./cleanup.sh          # remove this demo's objects (idempotent)
+```
+
+`SKIP_RESTORE=1 ./run-all.sh` stops after a successful backup (backup-only smoke). Override `NAMESPACE` (default `tenant-root`) to run elsewhere.
+
+## Limitations
+
+- **RF is the source's, applied as-is.** Restoring into a cluster with fewer brokers than a topic's replication factor fails at `--create`, and a to-copy restore onto a target with a different broker count aborts on the first replication-factor mismatch. The demo uses single-broker clusters (RF 1).
+- **Restore is not transactional.** Topics are applied one at a time as the object is read, so a failure part-way through (an RF mismatch, an unreachable broker) leaves the topics already created behind. Re-running the restore is safe — existing topics are reconciled, not recreated.
+- **Compacted/transactional specifics.** Only the topic definition and its non-default configs are captured; nothing about message contents or transaction state.
+- **"Non-internal" is Kafka's own definition.** The backup excludes Kafka's internal topics (`__consumer_offsets`, `__transaction_state`, `__share_group_state`) but not operator bookkeeping topics that are not `__`-prefixed — `strimzi-store-topic` and friends are listed by the Admin API and captured. They are harmless to recreate (the operator owns them), but a to-copy restore will materialise them on the target.
+- **Latest-only per key.** Each backup writes `s3://<bucket>/<ns>/<app>/<backup-name>/kafka-metadata.txt` — distinct backups do not overwrite each other, and a restore reads the exact object its `Backup` recorded. The object is deleted from the bucket when its `Backup` is deleted (best-effort, via a one-shot Job the removal waits on), so a retention-pruned `Plan` does not accumulate objects.
diff --git a/examples/backups/kafka-metadata/cleanup.sh b/examples/backups/kafka-metadata/cleanup.sh
new file mode 100755
index 0000000000..ae49f71906
--- /dev/null
+++ b/examples/backups/kafka-metadata/cleanup.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+# Remove everything the demo created. Idempotent (--ignore-not-found).
+set -uo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "$SCRIPT_DIR/00-helpers.sh"
+
+print_header "Cleanup Kafka metadata backup demo"
+
+kubectl -n "$NAMESPACE" delete restorejob "$RESTOREJOB_TOCOPY_NAME" --ignore-not-found
+kubectl -n "$NAMESPACE" delete restorejob "$RESTOREJOB_INPLACE_NAME" --ignore-not-found
+kubectl -n "$NAMESPACE" delete plan "$PLAN_NAME" --ignore-not-found
+kubectl -n "$NAMESPACE" delete backupjob "$BACKUPJOB_NAME" --ignore-not-found
+kubectl -n "$NAMESPACE" delete backup "$BACKUPJOB_NAME" --ignore-not-found
+kubectl -n "$NAMESPACE" delete kafka.apps.cozystack.io "$KAFKA_TARGET_NAME" --ignore-not-found
+kubectl -n "$NAMESPACE" delete kafka.apps.cozystack.io "$KAFKA_SRC_NAME" --ignore-not-found
+# Cluster-scoped demo objects + the copied CA (the shipped cozy-default-kafka is
+# never touched).
+kubectl delete backupclass.backups.cozystack.io "$BACKUPCLASS_NAME" --ignore-not-found
+kubectl delete kafka.strategy.backups.cozystack.io "$STRATEGY_NAME" --ignore-not-found
+kubectl -n "$NAMESPACE" delete secret "$CA_SECRET" --ignore-not-found
+kubectl -n "$NAMESPACE" delete pod -l cozystack.io/backup-demo=kafka-metadata --grace-period=1 --ignore-not-found
+
+log_success "Cleanup complete."
diff --git a/examples/backups/kafka-metadata/run-all.sh b/examples/backups/kafka-metadata/run-all.sh
new file mode 100755
index 0000000000..cc2d7626ee
--- /dev/null
+++ b/examples/backups/kafka-metadata/run-all.sh
@@ -0,0 +1,138 @@
+#!/bin/bash
+# Convenience runner + e2e harness for the Kafka topic-metadata backup/restore
+# demo. It applies the same numbered manifests a human reads, so the documented
+# flow and the automated test cannot drift. Stops on the first failure.
+#
+# Flow (demo `kafka-metadata` BackupClass -> `kafka-strategy-default`, derived at
+# run time from the shipped `cozy-default-kafka`; no per-demo Bucket):
+#   source Kafka -> seed topic `orders` with a distinctive retention.ms sentinel,
+#   plus a colliding pair (`audit.events` / `audit-events`) with distinct
+#   partition counts -> ad-hoc BackupJob against the demo `kafka-metadata`
+#      BackupClass (wait Succeeded)
+#   -> in-place: drop the topics, restore, assert `orders` came back with the
+#      sentinel and each colliding topic with its own partition count
+#   -> to-copy: bootstrap an empty target Kafka, restore the metadata onto it,
+#      assert the topic + sentinel landed there while the source stays intact.
+#
+# Data integrity is proven at the METADATA layer: the retention.ms sentinel is a
+# per-run value, so a restore that recreated a bare `orders` (wrong partitions or
+# default config) fails the assertion; the colliding pair proves the strategy
+# treats --topic as a literal, not a regex. Message payloads are out of scope.
+#
+# Runs in tenant-root: the numbered manifests pin that namespace and the system
+# bucket credentials live there; see 00-helpers.sh.
+# hack/e2e-chainsaw/kafka-metadata/ drives this file as kafka-3-metadata-roundtrip.
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "$SCRIPT_DIR/00-helpers.sh"
+
+# Per-run sentinel: a unique retention.ms (ms since epoch) so a passing verify
+# proves this run's config round-tripped, not a leftover topic.
+RETENTION="$(date +%s)000"
+
+print_header "Step 05: Deploy source Kafka '${KAFKA_SRC_NAME}'"
+kubectl apply -f "$SCRIPT_DIR/05-kafka-src.yaml"
+wait_hr_ready "kafka-${KAFKA_SRC_NAME}" 300
+kafka_wait_ready "$KAFKA_SRC_NAME" 600
+
+print_header "Step 05a: Derive the demo Kafka strategy '${STRATEGY_NAME}' + BackupClass '${BACKUPCLASS_NAME}'"
+# Wait for the strategy rather than read it once. The shipped cozy-default-kafka
+# is rendered behind a lookup of the platform bucket, so it exists only once a
+# Helm upgrade has run after that bucket was provisioned. The controller forces
+# that upgrade, but helm-controller holds it while any release in its dependsOn
+# is not Ready, so a platform change made just before this runs can keep it
+# absent for minutes. Both the endpoint read below and provision_demo_strategy
+# derive from it, so wait once here; kubectl wait keeps polling through NotFound
+# and fails on any other error.
+log_substep "Waiting for the platform's cozy-default-kafka strategy..."
+kubectl wait --for=create kafka.strategy.backups.cozystack.io/cozy-default-kafka \
+    --timeout=15m >/dev/null \
+    || { log_error "cozy-default-kafka strategy did not appear: enable the platform default backups (backupstrategy-controller) before running this demo"; exit 1; }
+
+# The shipped cozy-default-kafka advertises the platform's EXTERNAL S3 ingress,
+# which in-cluster Pods cannot resolve or TLS-validate in CI. Derive a demo
+# strategy from it (so the driver script stays a single source of truth) pointed
+# at an in-cluster, verifiable endpoint. With an S3_ENDPOINT override, copy the
+# self-signed seaweedfs CA and mount it (CURL_CA_BUNDLE); with none, reuse the
+# shipped endpoint and skip the CA mount (its cert is publicly trusted, and
+# CURL_CA_BUNDLE would REPLACE the system bundle rather than extend it).
+if [[ -n "$S3_ENDPOINT" ]]; then
+    CA_PRESENT=$(copy_s3_ca)
+else
+    S3_ENDPOINT=$(kubectl get kafka.strategy.backups.cozystack.io cozy-default-kafka -o json \
+        | jq -r '.spec.template.spec.containers[0].env[] | select(.name=="S3_ENDPOINT") | .value')
+    [[ -n "$S3_ENDPOINT" ]] || { log_error "shipped cozy-default-kafka has no S3_ENDPOINT; is the platform backup stack installed?"; exit 1; }
+    CA_PRESENT=0
+fi
+provision_demo_strategy "$S3_ENDPOINT" "$CA_PRESENT"
+log_success "Demo strategy at endpoint '${S3_ENDPOINT}' (CA mounted: ${CA_PRESENT})"
+
+print_header "Step 05b: Seed topic '${TOPIC}' (${PARTITIONS} partitions, retention.ms=${RETENTION})"
+seed_topic "$KAFKA_SRC_NAME" "$RETENTION"
+got=$(topic_meta "$KAFKA_SRC_NAME")
+[[ "$got" == "${PARTITIONS} ${RETENTION}" ]] || { log_error "seed verify failed: got '${got}', want '${PARTITIONS} ${RETENTION}'"; exit 1; }
+log_success "Seeded '${TOPIC}': ${got}"
+
+print_header "Step 05c: Seed colliding pair '${COLLIDE_DOT}' (${COLLIDE_DOT_PARTS}p) + '${COLLIDE_DASH}' (${COLLIDE_DASH_PARTS}p)"
+# These names collide under Kafka's --topic regex ("audit.events" matches
+# "audit-events"). Distinct partition counts make a backup that does not treat
+# the name literally record the wrong shape, so the restore verify below fails.
+seed_topic_partitions "$KAFKA_SRC_NAME" "$COLLIDE_DOT" "$COLLIDE_DOT_PARTS"
+seed_topic_partitions "$KAFKA_SRC_NAME" "$COLLIDE_DASH" "$COLLIDE_DASH_PARTS"
+gotdot=$(topic_partitions "$KAFKA_SRC_NAME" "$COLLIDE_DOT")
+gotdash=$(topic_partitions "$KAFKA_SRC_NAME" "$COLLIDE_DASH")
+[[ "$gotdot" == "$COLLIDE_DOT_PARTS" && "$gotdash" == "$COLLIDE_DASH_PARTS" ]] \
+    || { log_error "collision seed verify failed: ${COLLIDE_DOT}=${gotdot} (want ${COLLIDE_DOT_PARTS}), ${COLLIDE_DASH}=${gotdash} (want ${COLLIDE_DASH_PARTS})"; exit 1; }
+log_success "Seeded colliding pair: ${COLLIDE_DOT}=${gotdot} ${COLLIDE_DASH}=${gotdash}"
+
+print_header "Step 10: Submit ad-hoc BackupJob '${BACKUPJOB_NAME}' and wait for Succeeded"
+kubectl apply -f "$SCRIPT_DIR/10-backupjob-adhoc.yaml"
+wait_for_field backupjobs.backups.cozystack.io "$BACKUPJOB_NAME" \
+    '{.status.phase}' Succeeded "$NAMESPACE" 600 Failed
+BACKUP_NAME=$(kubectl -n "$NAMESPACE" get backupjobs.backups.cozystack.io "$BACKUPJOB_NAME" -o jsonpath='{.status.backupRef.name}')
+[[ -n "$BACKUP_NAME" ]] || { log_error "BackupJob succeeded but reported no backupRef"; exit 1; }
+log_success "Backup artefact: ${BACKUP_NAME}"
+
+if [[ "${SKIP_RESTORE:-0}" == "1" ]]; then
+    log_warning "SKIP_RESTORE=1: stopping after a successful backup."
+    exit 0
+fi
+
+print_header "Step 25: In-place restore — drop two topics, keep '${COLLIDE_DOT}' live, then restore"
+# Drop orders + audit-events but LEAVE audit.events live, so the restore runs
+# the existing-topic branch (grep -qxF + --describe/--alter under \Q) for a name
+# whose regex would collide with audit-events. A stripped \Q on the restore
+# --describe would match the sibling, read the wrong partition count and fail the
+# restore here — so this path, not just --create, is exercised end to end.
+delete_topic "$KAFKA_SRC_NAME" "$TOPIC"
+delete_topic "$KAFKA_SRC_NAME" "$COLLIDE_DASH"
+kubectl apply -f "$SCRIPT_DIR/25-restorejob-in-place.yaml"
+wait_for_field restorejobs.backups.cozystack.io "$RESTOREJOB_INPLACE_NAME" \
+    '{.status.phase}' Succeeded "$NAMESPACE" 600 Failed
+got=$(topic_meta "$KAFKA_SRC_NAME")
+[[ "$got" == "${PARTITIONS} ${RETENTION}" ]] || { log_error "in-place restore verify failed: got '${got}', want '${PARTITIONS} ${RETENTION}'"; exit 1; }
+# The colliding pair must each come back with their OWN partition count. If the
+# backup treated --topic as a regex, one recorded the other's shape and this
+# fails.
+gotdot=$(topic_partitions "$KAFKA_SRC_NAME" "$COLLIDE_DOT")
+gotdash=$(topic_partitions "$KAFKA_SRC_NAME" "$COLLIDE_DASH")
+[[ "$gotdot" == "$COLLIDE_DOT_PARTS" && "$gotdash" == "$COLLIDE_DASH_PARTS" ]] \
+    || { log_error "collision restore verify failed: ${COLLIDE_DOT}=${gotdot} (want ${COLLIDE_DOT_PARTS}), ${COLLIDE_DASH}=${gotdash} (want ${COLLIDE_DASH_PARTS})"; exit 1; }
+log_success "In-place restore verified: '${TOPIC}' back with ${got}; pair ${COLLIDE_DOT}=${gotdot} ${COLLIDE_DASH}=${gotdash}"
+
+print_header "Step 20/30: To-copy restore into a fresh '${KAFKA_TARGET_NAME}'"
+kubectl apply -f "$SCRIPT_DIR/20-kafka-target.yaml"
+wait_hr_ready "kafka-${KAFKA_TARGET_NAME}" 300
+kafka_wait_ready "$KAFKA_TARGET_NAME" 600
+kubectl apply -f "$SCRIPT_DIR/30-restorejob-to-copy.yaml"
+wait_for_field restorejobs.backups.cozystack.io "$RESTOREJOB_TOCOPY_NAME" \
+    '{.status.phase}' Succeeded "$NAMESPACE" 600 Failed
+got=$(topic_meta "$KAFKA_TARGET_NAME")
+[[ "$got" == "${PARTITIONS} ${RETENTION}" ]] || { log_error "to-copy restore verify failed on target: got '${got}', want '${PARTITIONS} ${RETENTION}'"; exit 1; }
+log_success "To-copy restore verified: '${KAFKA_TARGET_NAME}' has '${TOPIC}' with ${got}"
+
+# To-copy must not mutate the source.
+src=$(topic_meta "$KAFKA_SRC_NAME")
+[[ "$src" == "${PARTITIONS} ${RETENTION}" ]] || { log_error "source changed after to-copy restore: got '${src}'"; exit 1; }
+log_success "Source '${KAFKA_SRC_NAME}' left intact by the to-copy restore."
diff --git a/examples/backups/kafka/00-helpers.sh b/examples/backups/kafka/00-helpers.sh
new file mode 100755
index 0000000000..09b03fd6ce
--- /dev/null
+++ b/examples/backups/kafka/00-helpers.sh
@@ -0,0 +1,338 @@
+#!/bin/bash
+# Shared helpers for the Kafka topic-data backup/restore demo.
+# Source this file in other scripts: source "$(dirname "$0")/00-helpers.sh"
+
+export RED='\033[0;31m'
+export GREEN='\033[0;32m'
+export YELLOW='\033[1;33m'
+export BLUE='\033[0;34m'
+export MAGENTA='\033[0;35m'
+export CYAN='\033[0;36m'
+export WHITE='\033[1;37m'
+export NC='\033[0m'
+export BOLD='\033[1m'
+
+# Default settings (override via environment).
+export NAMESPACE="${NAMESPACE:-tenant-root}"
+export KAFKA_NAME="${KAFKA_NAME:-kafka-test}"
+export KAFKA_RESTORE_NAME="${KAFKA_RESTORE_NAME:-kafka-restore}"
+# Two brokers, not one: the Cozystack Kafka chart raises the broker-level
+# min.insync.replicas to 2 as soon as kafka.replicas reaches 2, and every
+# acks=all write into a topic with fewer replicas than that is rejected. A
+# single-broker demo could never show that a restore recreates the topic with
+# the replication factor the backup captured; the demo topics are seeded with
+# TOPIC_REPLICAS replicas and the restore steps assert it survived the
+# round-trip. Both Kafka instances use KAFKA_REPLICAS so the to-copy target can
+# host the same replication factor.
+export KAFKA_REPLICAS="${KAFKA_REPLICAS:-2}"
+export TOPIC_REPLICAS="${TOPIC_REPLICAS:-2}"
+# The demo topic carries a "." and a decoy topic differs from it only where
+# that "." sits: as a Java regex "orders.v1" also matches "orders-v1", as a
+# literal it does not. Every --topic call the CLI treats as a regex is pinned
+# with \Q...\E, and this pair is what makes that pinning testable - drop a pin
+# and the run fails on its own (the partition-set guard sees the decoy's
+# partitions, or the in-place delete takes the decoy with it).
+#
+# What the decoy reliably proves: the offset listing (the partition-set guard
+# counts its partitions), the in-place delete (it disappears), and the two
+# record counts (they pick up its records). It does NOT prove the two
+# PartitionCount reads: kafka-topics --describe yields topics in the admin
+# client result-map order rather than sorted, so which one their head -1 sees
+# when a pin is missing is not something to lean on.
+export TOPIC="${TOPIC:-orders.v1}"
+export DECOY_TOPIC="${DECOY_TOPIC:-orders-v1}"
+export DECOY_COUNT="${DECOY_COUNT:-5}"
+export PARTITIONS="${PARTITIONS:-3}"
+export MESSAGE_COUNT="${MESSAGE_COUNT:-30}"
+export BUCKET_NAME="${BUCKET_NAME:-kafka-backups}"
+export BACKUPCLASS_NAME="${BACKUPCLASS_NAME:-kafka-backup}"
+export STRATEGY_NAME="${STRATEGY_NAME:-kafka-job}"
+export BACKUPJOB_NAME="${BACKUPJOB_NAME:-kafka-backup-job}"
+export RESTOREJOB_INPLACE_NAME="${RESTOREJOB_INPLACE_NAME:-kafka-restore-inplace}"
+export RESTOREJOB_NONEMPTY_NAME="${RESTOREJOB_NONEMPTY_NAME:-kafka-restore-nonempty}"
+export RESTOREJOB_TOCOPY_NAME="${RESTOREJOB_TOCOPY_NAME:-kafka-restore-to-copy}"
+# S3 endpoint CA. Cozystack's default seaweedfs serves its S3 endpoint with a
+# self-signed certificate whose CA lives in this Secret; 03-create-bucket.sh
+# caches its ca.crt and create_s3_secret projects it into each
+# "<app>-backup-s3" Secret, which the strategy Pod mounts and points curl at.
+# The name follows the seaweedfs chart's fullnameOverride ("seaweedfs" ->
+# "seaweedfs-ca-cert"); 03-create-bucket.sh auto-discovers the CA Certificate's
+# actual secret when this default is absent. On a cluster whose S3 endpoint is
+# signed by a publicly-trusted CA, set S3_CA_SECRET="" to skip the copy: the
+# Pod then verifies against the image's trust store.
+export S3_CA_SECRET="${S3_CA_SECRET:-seaweedfs-ca-cert}"
+export S3_CA_NAMESPACE="${S3_CA_NAMESPACE:-tenant-root}"
+export S3_CA_KEY="${S3_CA_KEY:-ca.crt}"
+# The Strimzi Kafka image carries the full kafka-*.sh CLI plus bash, curl and
+# tar - everything the generic Job strategy and these host-side helpers need,
+# with no purpose-built backup image.
+#
+# Default to the image the operator already caches on the nodes so the backup
+# Pod and these CLI Pods reuse a warm image with no version skew. The operator's
+# STRIMZI_KAFKA_IMAGES env is a newline-separated "version=image" map (one entry
+# per supported version); split on whitespace, drop the "version=" prefix and
+# take the newest (last) entry - the version the operator itself defaults to.
+# The image reference is taken as-is: a digest-pinned operator emits
+# "<version>=<repo>@sha256:..." with no ":<tag>", and that is exactly the
+# air-gapped deployment the fallback below cannot serve.
+# Fall back to a pinned literal only when the operator cannot be read (an
+# air-gapped clone with no cluster), so the demo still has a runnable default.
+# Setting KAFKA_IMAGE in the environment skips the lookup entirely.
+resolve_kafka_image() {
+    local resolved
+    resolved=$(kubectl -n cozy-kafka-operator get deploy strimzi-cluster-operator \
+        -o jsonpath='{.spec.template.spec.containers[0].env[?(@.name=="STRIMZI_KAFKA_IMAGES")].value}' 2>/dev/null \
+        | tr '[:space:]' '\n' | grep '=' | sed 's/^[^=]*=//' | tail -n1)
+    if [ -n "$resolved" ]; then
+        echo "$resolved"
+        return
+    fi
+    # Do not fail open silently: warn on stderr (stdout is captured as the
+    # image) that the operator could not be read and a public quay.io literal
+    # is being assumed. On an air-gapped or operator-less cluster - the persona
+    # the README's override note is for - that literal is unreachable, so the
+    # run must set KAFKA_IMAGE to an image the nodes can actually pull.
+    echo "! could not read STRIMZI_KAFKA_IMAGES from deploy/strimzi-cluster-operator in cozy-kafka-operator; assuming quay.io/strimzi/kafka:0.45.1-rc1-kafka-3.9.1. Set KAFKA_IMAGE explicitly if that image is wrong or unreachable (e.g. air-gapped)." >&2
+    echo "quay.io/strimzi/kafka:0.45.1-rc1-kafka-3.9.1"
+}
+export KAFKA_IMAGE="${KAFKA_IMAGE:-$(resolve_kafka_image)}"
+export KAFKA_BIN="${KAFKA_BIN:-/opt/kafka/bin}"
+# Name of the long-lived CLI Pod kafka_run execs into; cleanup.sh removes it.
+# A variable of its own, not the kafka-metadata demo's KAFKA_CLI_POD: the two
+# demos may share a namespace, and one setting must not move the other's Pod.
+export KAFKA_TOPIC_CLI_POD="${KAFKA_TOPIC_CLI_POD:-kafka-topic-cli}"
+
+log_info()    { echo -e "${BLUE}i${NC} $*" >&2; }
+log_success() { echo -e "${GREEN}OK${NC} $*" >&2; }
+log_warning() { echo -e "${YELLOW}!${NC} $*" >&2; }
+log_error()   { echo -e "${RED}x${NC} $*" >&2; }
+log_step()    { echo -e "\n${MAGENTA}${BOLD}> $*${NC}" >&2; }
+log_substep() { echo -e "${CYAN}  -> $*${NC}" >&2; }
+log_command() { echo -e "${WHITE}  $ $*${NC}" >&2; }
+
+separator() {
+    echo -e "\n${CYAN}------------------------------------------------------------${NC}\n" >&2
+}
+
+print_header() {
+    local title="$1"
+    echo -e "\n${MAGENTA}${BOLD}== $title ==${NC}\n" >&2
+}
+
+# wait_for_field, wait_hr_ready and wait_deleted live in one file shared by
+# every backup walkthrough, so a fix to one reaches all of them.
+# shellcheck source-path=SCRIPTDIR source=../_lib/wait-helpers.sh
+source "$(dirname "${BASH_SOURCE[0]}")/../_lib/wait-helpers.sh"
+
+# In-cluster bootstrap address for a Kafka application instance. The Cozystack
+# chart names the Strimzi Kafka cluster "kafka-<app>", and Strimzi names the
+# plaintext bootstrap Service "<cluster>-kafka-bootstrap" - so for an app named
+# <app> the Service is "kafka-<app>-kafka-bootstrap". The internal plain
+# listener on 9092 has no TLS or auth, so a bare host:port is all the CLI needs.
+kafka_bootstrap() {
+    local app="$1"
+    echo "kafka-${app}-kafka-bootstrap.${NAMESPACE}.svc:9092"
+}
+
+# Ensure the long-lived CLI Pod exists and is Ready, so kafka_run can exec into
+# it. A Ready Pod this demo owns is reused across calls and across the numbered
+# scripts; a leftover in a terminal phase is replaced; a same-named Pod the demo
+# does not own is refused rather than hijacked or deleted.
+# Every step returns on failure explicitly: this runs as the left side of
+# `|| return 1`, and some callers also wrap it in $(...), so errexit never
+# applies inside it and a bare failure would carry on to the next step.
+kafka_cli_pod() {
+    local phase owner overrides
+    phase=$(kubectl -n "$NAMESPACE" get pod "$KAFKA_TOPIC_CLI_POD" --ignore-not-found -o jsonpath='{.status.phase}') || return 1
+    owner=$(kubectl -n "$NAMESPACE" get pod "$KAFKA_TOPIC_CLI_POD" --ignore-not-found -o jsonpath='{.metadata.labels.cozystack\.io/backup-demo}') || return 1
+    if [ -n "$phase" ] && [ "$owner" != "kafka" ]; then
+        log_error "Pod $NAMESPACE/$KAFKA_TOPIC_CLI_POD exists but this demo does not own it; refusing to use or delete it"
+        return 1
+    fi
+    if [ "$phase" != "Running" ] && [ "$phase" != "Pending" ]; then
+        # restricted-clean Pod. The Strimzi image runs as a non-root numeric
+        # UID (1001), so runAsNonRoot/seccomp at the Pod level plus the
+        # container's allowPrivilegeEscalation=false and drop-ALL satisfy PSA
+        # "restricted" without pinning runAsUser to a value specific to this
+        # image tag. An add-only JSON patch layers these onto the run-generated
+        # Pod's sole container (index 0), leaving image, command and args
+        # untouched.
+        overrides='[{"op":"add","path":"/spec/securityContext","value":{"runAsNonRoot":true,"seccompProfile":{"type":"RuntimeDefault"}}},{"op":"add","path":"/spec/containers/0/securityContext","value":{"allowPrivilegeEscalation":false,"capabilities":{"drop":["ALL"]}}}]'
+        kubectl -n "$NAMESPACE" delete pod "$KAFKA_TOPIC_CLI_POD" --grace-period=1 --ignore-not-found >/dev/null || return 1
+        kubectl -n "$NAMESPACE" run "$KAFKA_TOPIC_CLI_POD" --image="$KAFKA_IMAGE" \
+            --labels=cozystack.io/backup-demo=kafka \
+            --override-type=json --overrides="$overrides" \
+            --restart=Never --command -- sleep infinity >/dev/null || return 1
+    fi
+    kubectl -n "$NAMESPACE" wait --for=condition=Ready "pod/$KAFKA_TOPIC_CLI_POD" \
+        --timeout=5m >/dev/null
+}
+
+# Run a bash snippet in the demo's Strimzi Kafka CLI Pod. The snippet runs with
+# these variables pre-set, so it needs no nested shell quoting of its own:
+#   $BOOT  - the target app's plaintext bootstrap (host:port)
+#   $BIN   - the kafka CLI directory
+#   $TOPIC, $PARTITIONS, $TOPIC_REPLICAS, $MESSAGE_COUNT - the demo knobs
+# This is the host-side analogue of the strategy Pod: same stock image, same
+# tools, no purpose-built backup container. Pass the snippet single-quoted so
+# its own $VAR references reach the Pod's bash unexpanded.
+#
+# The snippet runs by `kubectl exec`, not in a throwaway `kubectl run -i` Pod.
+# That Pod's stdout comes back over an attach carrying only what the container
+# writes after the attach registers, so a CLI that finishes first reads as an
+# empty reply with exit 0. An exec'd process owns its pipes, so its output
+# cannot be missed that way.
+kafka_run() {
+    local app="$1"; shift
+    local snippet="$1"
+    local boot
+    boot="$(kafka_bootstrap "$app")"
+    kafka_cli_pod || return 1
+    kubectl -n "$NAMESPACE" exec -i "$KAFKA_TOPIC_CLI_POD" -- bash -c "set -eu
+BOOT=$(printf %q "$boot")
+BIN=$(printf %q "$KAFKA_BIN")
+TOPIC=$(printf %q "$TOPIC")
+PARTITIONS=$(printf %q "$PARTITIONS")
+TOPIC_REPLICAS=$(printf %q "$TOPIC_REPLICAS")
+MESSAGE_COUNT=$(printf %q "$MESSAGE_COUNT")
+DECOY_TOPIC=$(printf %q "$DECOY_TOPIC")
+DECOY_COUNT=$(printf %q "$DECOY_COUNT")
+$snippet"
+}
+
+# Create the demo topic (idempotent) and publish MESSAGE_COUNT keyed sentinel
+# messages spread across PARTITIONS. Keys ("k-<n>") make partition placement
+# deterministic on restore: re-producing the same key into a topic with the
+# same partition count lands it in the same partition via the default
+# (murmur2) partitioner - no per-partition produce needed for keyed records.
+seed_topic() {
+    local app="$1"
+    kafka_run "$app" '
+        "$BIN"/kafka-topics.sh --bootstrap-server "$BOOT" --create --if-not-exists \
+            --topic "$TOPIC" --partitions "$PARTITIONS" --replication-factor "$TOPIC_REPLICAS"
+        i=1
+        while [ "$i" -le "$MESSAGE_COUNT" ]; do
+            printf "k-%s\torder-%s\n" "$i" "$i"
+            i=$((i + 1))
+        done | "$BIN"/kafka-console-producer.sh --bootstrap-server "$BOOT" \
+            --topic "$TOPIC" --property parse.key=true
+    '
+}
+
+# Seed the decoy topic: a single partition and a handful of records, enough to
+# tell "still there, untouched" from "deleted" or "backed up by mistake".
+seed_decoy_topic() {
+    local app="$1"
+    kafka_run "$app" '
+        "$BIN"/kafka-topics.sh --bootstrap-server "$BOOT" --create --if-not-exists \
+            --topic "$DECOY_TOPIC" --partitions 1 --replication-factor "$TOPIC_REPLICAS"
+        i=1
+        while [ "$i" -le "$DECOY_COUNT" ]; do
+            printf "d-%s\tdecoy-%s\n" "$i" "$i"
+            i=$((i + 1))
+        done | "$BIN"/kafka-console-producer.sh --bootstrap-server "$BOOT" \
+            --topic "$DECOY_TOPIC" --property parse.key=true
+    '
+}
+
+# Record count of the decoy topic. Prints a bare integer, or "" when the topic
+# is gone - which is itself the signal an unpinned --topic regex deleted it.
+decoy_message_count() {
+    topic_message_count "$1" "$DECOY_TOPIC"
+}
+
+# Total number of records currently stored in a topic (the demo topic unless a
+# second argument names another), summed over partitions as (end offset -
+# begin offset). Prints a bare integer, or "" if the topic does not exist /
+# cannot be reached. Offsets, not a consumer, so it is exact and cheap even for
+# a compacted or truncated topic. kafka-get-offsets emits
+# "topic:partition:offset" lines; pure-shell parsing avoids awk quoting.
+topic_message_count() {
+    local app="$1"
+    TOPIC="${2:-$TOPIC}" kafka_run "$app" '
+        ends=$("$BIN"/kafka-get-offsets.sh --bootstrap-server "$BOOT" --topic "\Q$TOPIC\E" --time -1 2>/dev/null) || exit 0
+        begins=$("$BIN"/kafka-get-offsets.sh --bootstrap-server "$BOOT" --topic "\Q$TOPIC\E" --time -2 2>/dev/null) || exit 0
+        [ -n "$ends" ] || exit 0
+        total=0
+        for e in $ends; do
+            ekey=${e%:*}; eo=${e##*:}
+            # Default the begin offset to 0 rather than skipping the partition:
+            # a partition missing from "begins" would otherwise contribute
+            # nothing and silently undercount the topic. Match on the whole
+            # topic:partition key so a line from another topic cannot supply
+            # the begin offset for this partition. Matches the strategy.
+            bo=0
+            for b in $begins; do
+                if [ "${b%:*}" = "$ekey" ]; then bo=${b##*:}; break; fi
+            done
+            total=$((total + eo - bo))
+        done
+        echo "$total"
+    ' | tr -d '[:space:]'
+}
+
+# Dump every record of the demo topic as "partition<TAB>key<TAB>value" lines,
+# partitions in ascending order and records in offset order within each
+# partition. Deterministic, so the same topic dumps byte-identically twice -
+# a source dump captured before backup and the restored dump can be diffed to
+# prove keys, values, partition placement and per-partition ordering survived
+# the round-trip, which a bare offset count cannot. Assumes begin offset 0
+# (every topic in this demo is freshly created); GNU sed renders "\t" as a tab.
+topic_dump() {
+    local app="$1"
+    kafka_run "$app" '
+        ends=$("$BIN"/kafka-get-offsets.sh --bootstrap-server "$BOOT" --topic "\Q$TOPIC\E" --time -1 2>/dev/null) || exit 0
+        [ -n "$ends" ] || exit 0
+        printf "%s\n" $ends | sort -t: -k2 -n | while IFS=: read -r t p end; do
+            [ "${end:-0}" -gt 0 ] || continue
+            "$BIN"/kafka-console-consumer.sh --bootstrap-server "$BOOT" --topic "$TOPIC" \
+                --partition "$p" --offset 0 --max-messages "$end" --timeout-ms 60000 \
+                --property print.key=true --property print.timestamp=false \
+                | sed "s/^/$p\t/"
+        done
+    '
+}
+
+# Replication factor of the demo topic as the broker reports it. Prints a bare
+# integer, or "" if the topic does not exist / cannot be reached. The restore
+# steps compare it against TOPIC_REPLICAS: the strategy records each topic's
+# replication factor in the backup manifest and recreates the topic with it,
+# and this is the observable that proves the value survived the round-trip.
+topic_replication_factor() {
+    local app="$1"
+    kafka_run "$app" '
+        desc=$("$BIN"/kafka-topics.sh --bootstrap-server "$BOOT" --describe --topic "\Q$TOPIC\E" 2>/dev/null) || exit 0
+        printf "%s\n" "$desc" | sed -n "s/.*ReplicationFactor: *\([0-9][0-9]*\).*/\1/p" | head -1
+    ' | tr -d '[:space:]'
+}
+
+# Create the "<app>-backup-s3" Secret the Job strategy Pod consumes, from the
+# bucket coordinates cached by 03-create-bucket.sh. The generic Job strategy -
+# unlike the app-specific drivers - has no chart support to emit this Secret,
+# so the demo provides it. Called for the source app (step 04) and the
+# restore target (step 07). The S3 endpoint's CA, when 03-create-bucket.sh
+# cached one, rides along as ca.crt: the strategy Pod mounts that key and
+# verifies the endpoint against it instead of disabling verification.
+create_s3_secret() {
+    local app="$1"
+    local SCRIPT_DIR
+    SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+    [[ -f "$SCRIPT_DIR/.bucket-info.env" ]] || { log_error "missing $SCRIPT_DIR/.bucket-info.env; run 03-create-bucket.sh first"; return 1; }
+    # shellcheck disable=SC1091
+    source "$SCRIPT_DIR/.bucket-info.env"
+    for v in S3_ACCESS_KEY S3_SECRET_KEY S3_ENDPOINT S3_REGION S3_BUCKET; do
+        [[ -n "${!v:-}" ]] || { log_error "required variable is missing or empty: ${v}"; return 1; }
+    done
+    local ca_args=()
+    if [[ -n "${S3_CA_B64:-}" ]]; then
+        ca_args=(--from-literal=ca.crt="$(printf '%s' "$S3_CA_B64" | base64 -d)")
+    fi
+    kubectl -n "$NAMESPACE" create secret generic "${app}-backup-s3" \
+        --from-literal=accessKey="$S3_ACCESS_KEY" \
+        --from-literal=secretKey="$S3_SECRET_KEY" \
+        --from-literal=endpoint="$S3_ENDPOINT" \
+        --from-literal=region="$S3_REGION" \
+        --from-literal=bucket="$S3_BUCKET" \
+        ${ca_args[@]+"${ca_args[@]}"} \
+        --dry-run=client -o yaml | kubectl apply -f -
+}
diff --git a/examples/backups/kafka/01-create-strategy.sh b/examples/backups/kafka/01-create-strategy.sh
new file mode 100755
index 0000000000..26b8d95d94
--- /dev/null
+++ b/examples/backups/kafka/01-create-strategy.sh
@@ -0,0 +1,571 @@
+#!/bin/bash
+# Step 01: Create the cluster-scoped generic Job backup strategy for Kafka
+# topic data. Unlike the app-specific drivers (Altinity, CNPG, ...), the Job
+# strategy runs an arbitrary Pod the operator supplies. Here that Pod is a
+# stock Strimzi Kafka image (which carries the kafka-*.sh CLI plus bash, curl
+# and tar) running a single shell script that branches on `.Mode`:
+#   backup : freeze each partition's end offset, drain [begin,end) to files,
+#            tar -> PUT the tarball to S3
+#   restore: GET the tarball from S3 -> untar -> recreate the topics -> replay
+#            every partition file with kafka-console-producer
+#
+# The consistency model is a frozen-end-offset cut: kafka-get-offsets --time -1
+# is read ONCE per partition, and the consumer drains only up to that offset,
+# so everything produced after the read is excluded. The reads happen per
+# topic (inside the topic loop), so the cut is atomic across a topic's own
+# partitions but NOT across topics - Kafka offers no cross-topic guarantee
+# regardless. This is a logical DATA
+# backup: topic configs, ACLs, SCRAM users, and consumer-group offsets are NOT
+# captured, and restore re-produces records so they receive fresh offsets.
+#
+# Everything the template injects is funnelled through container env vars so
+# the script body stays plain shell. The same PodTemplateSpec serves both
+# directions: the engine templates each string leaf independently (it cannot
+# add/remove containers per mode), so the one image branches at runtime on
+# $MODE.
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "$SCRIPT_DIR/00-helpers.sh"
+
+print_header "Step 01: Create Job backup strategy '${STRATEGY_NAME}'"
+log_command "kubectl apply -f - (Job strategy: $STRATEGY_NAME)"
+
+kubectl apply -f - <<EOF
+apiVersion: strategy.backups.cozystack.io/v1alpha1
+kind: Job
+metadata:
+  name: ${STRATEGY_NAME}
+spec:
+  template:
+    spec:
+      restartPolicy: Never
+      containers:
+        - name: kafka-backup
+          image: ${KAFKA_IMAGE}
+          imagePullPolicy: IfNotPresent
+          env:
+            # .Parameters carry the static knobs from the BackupClass: which
+            # topics to back up (empty = all non-internal topics) and an
+            # optional replication-factor override for the topics restore
+            # recreates (empty = each topic's replication factor as captured
+            # at backup time). On restore they are read back from the Backup's
+            # driverMetadata, so the same values apply round-trip.
+            - name: TOPICS
+              value: '{{ default "" (index .Parameters "topics") }}'
+            - name: REPLICATION_FACTOR
+              value: '{{ default "" (index .Parameters "replicationFactor") }}'
+            # .Release is the application being acted on: the source on backup,
+            # the restore target on restore (in-place=source, to-copy=the new
+            # app). .Release.Name is the apps.cozystack.io/Kafka CR name; the
+            # chart names the Strimzi cluster "kafka-<name>", and Strimzi
+            # exposes its plaintext bootstrap Service as
+            # "kafka-<name>-kafka-bootstrap" on port 9092 (no TLS/auth on the
+            # internal plain listener).
+            - name: BOOTSTRAP
+              value: "kafka-{{ .Release.Name }}-kafka-bootstrap.{{ .Release.Namespace }}.svc:9092"
+            # S3 object key is scoped by the SOURCE namespace + app name so a
+            # to-copy restore reads what the source wrote and two same-named
+            # apps in different namespaces sharing one bucket do not collide on
+            # <app>/kafka-topics.tar. On backup the source is .Release.Name; on
+            # restore it is .Backup.ApplicationRef.Name (.Backup is only set on
+            # restore - the guard keeps backup mode from rendering "<no value>"
+            # into an unused var). The namespace is .Release.Namespace in both
+            # modes and always names the source: a to-copy target is a
+            # TypedLocalObjectReference, so it shares the RestoreJob's (source's)
+            # namespace, and an in-place restore targets the source itself.
+            - name: SRC_BACKUP
+              value: "{{ .Release.Name }}"
+            - name: SRC_RESTORE
+              value: "{{ if .Backup }}{{ .Backup.ApplicationRef.Name }}{{ end }}"
+            - name: SRC_NAMESPACE
+              value: "{{ .Release.Namespace }}"
+            - name: MODE
+              value: "{{ .Mode }}"
+            # S3 coordinates from the demo-provided <release>-backup-s3 Secret
+            # (created by create_s3_secret in 00-helpers.sh from the Bucket).
+            - name: AWS_ACCESS_KEY_ID
+              valueFrom:
+                secretKeyRef:
+                  name: "{{ .Release.Name }}-backup-s3"
+                  key: accessKey
+            - name: AWS_SECRET_ACCESS_KEY
+              valueFrom:
+                secretKeyRef:
+                  name: "{{ .Release.Name }}-backup-s3"
+                  key: secretKey
+            - name: S3_ENDPOINT
+              valueFrom:
+                secretKeyRef:
+                  name: "{{ .Release.Name }}-backup-s3"
+                  key: endpoint
+            - name: S3_REGION
+              valueFrom:
+                secretKeyRef:
+                  name: "{{ .Release.Name }}-backup-s3"
+                  key: region
+            - name: S3_BUCKET
+              valueFrom:
+                secretKeyRef:
+                  name: "{{ .Release.Name }}-backup-s3"
+                  key: bucket
+          # The same Secret's optional ca.crt (the S3 endpoint's CA when it is
+          # not publicly trusted; create_s3_secret copies the in-cluster
+          # seaweedfs CA into it) is projected as a file so curl can verify the
+          # endpoint against it. The key is optional: without it the file is
+          # absent and curl falls back to the image's trust store.
+          volumeMounts:
+            - name: s3-ca
+              mountPath: /etc/kafka-backup-s3
+              readOnly: true
+          command: ["/usr/bin/bash", "-c"]
+          args:
+            - |
+              set -eu
+              # Overridable only so hack/kafka-topic-backup-strategy.bats can
+              # execute this body outside the Pod against stub CLIs; the Pod
+              # sets none of them.
+              BIN="\${BIN:-/opt/kafka/bin}"
+              SCRATCH="\${SCRATCH:-/tmp}"
+              CA_FILE="\${CA_FILE:-/etc/kafka-backup-s3/ca.crt}"
+              BOOT="\${BOOTSTRAP}"
+
+              # BucketInfo endpoints are bare host:port; COSI/seaweedfs serves
+              # S3 over HTTPS, so default to https:// when no scheme is given.
+              case "\${S3_ENDPOINT}" in
+                http://*|https://*) BASE="\${S3_ENDPOINT}" ;;
+                *) BASE="https://\${S3_ENDPOINT}" ;;
+              esac
+
+              # Split the endpoint into scheme/host/port. The Strimzi image ships
+              # curl 7.76.1, whose --aws-sigv4 has a bug fixed only in 7.87.0: it
+              # omits a non-default port from the SigV4 canonical Host even though
+              # it sends the port in the Host header. seaweedfs recomputes the
+              # signature from the received "host:port" and so rejects the PUT
+              # with 403 whenever the endpoint carries a non-default port (the
+              # e2e harness points S3_ENDPOINT at the :8333 in-cluster Service).
+              # Strip the port from the signed/sent URL and redirect the
+              # connection to the real port with --connect-to, so the signed,
+              # sent and server-side Host all agree on the bare host. This is
+              # also correct on curl >= 7.87, which drops the default port too.
+              # Demo-scope parse: handles the "scheme://host[:port]" that
+              # BucketInfo advertises. An IPv6 literal ([::1]:8333) or an
+              # endpoint carrying a path prefix would be mis-split - out of
+              # scope here.
+              SCHEME="\${BASE%%://*}"
+              HOSTPORT="\${BASE#*://}"; HOSTPORT="\${HOSTPORT%%/*}"
+              HOST="\${HOSTPORT%%:*}"
+              PORT="\${HOSTPORT##*:}"
+              if [ "\${PORT}" = "\${HOSTPORT}" ]; then PORT=""; fi
+              if [ "\${SCHEME}" = http ]; then DEFPORT=80; else DEFPORT=443; fi
+              CONNECT_TO=""
+              if [ -n "\${PORT}" ] && [ "\${PORT}" != "\${DEFPORT}" ]; then
+                CONNECT_TO="--connect-to \${HOST}:\${DEFPORT}:\${HOST}:\${PORT}"
+              fi
+
+              if [ "\${MODE}" = backup ]; then SRC="\${SRC_BACKUP}"; else SRC="\${SRC_RESTORE}"; fi
+              KEY="\${SRC_NAMESPACE}/\${SRC}/kafka-topics.tar"
+              OBJ_URL="\${SCHEME}://\${HOST}/\${S3_BUCKET}/\${KEY}"
+
+              # curl --aws-sigv4 signs the request (SigV4) so no separate S3
+              # client image is needed. The certificate is verified: against the
+              # CA projected from the Secret when it carries one, else
+              # against the image's trust store. \${CA_OPT} and \${CONNECT_TO}
+              # are deliberately unquoted so an empty value expands to no
+              # argument.
+              CA_OPT=""
+              if [ -s "\${CA_FILE}" ]; then CA_OPT="--cacert \${CA_FILE}"; fi
+              s3() { curl -fsS \${CA_OPT} \${CONNECT_TO} --aws-sigv4 "aws:amz:\${S3_REGION}:s3" --user "\${AWS_ACCESS_KEY_ID}:\${AWS_SECRET_ACCESS_KEY}" "\$@"; }
+
+              # Records a topic currently holds, summed over its partitions as
+              # end - begin. kafka-get-offsets prints only the partitions whose
+              # lookup succeeded and still exits 0, so the listing is held to
+              # the partition count the caller read off the topic itself: a
+              # partition lost to a leader election would otherwise drop out of
+              # the sum and pass a populated topic off as empty.
+              #
+              # --topic is a Java regex in kafka-topics and kafka-get-offsets,
+              # so an unquoted name also matches its siblings ("audit.events"
+              # matches "audit-events") and would mix another topic's
+              # partitions into the count. \Q...\E pins it to a literal.
+              #
+              # Called as \$(topic_records ...) || exit 1, and a function run
+              # as the left operand of || has errexit switched off inside it,
+              # so every command here carries its own || return 1.
+              topic_records() {
+                local t=\$1 want_parts=\$2 ends begins seen e ekey eo bo b total
+                ends=\$("\${BIN}"/kafka-get-offsets.sh --bootstrap-server "\${BOOT}" --topic "\Q\${t}\E" --time -1) || return 1
+                begins=\$("\${BIN}"/kafka-get-offsets.sh --bootstrap-server "\${BOOT}" --topic "\Q\${t}\E" --time -2) || return 1
+                seen=0
+                for e in \${ends}; do seen=\$((seen + 1)); done
+                if [ "\${seen}" -ne "\${want_parts}" ]; then
+                  echo "offset listing returned \${seen} of \${want_parts} partition(s) for \${t}; refusing to act on an incomplete listing" >&2
+                  return 1
+                fi
+                total=0
+                for e in \${ends}; do
+                  ekey=\${e%:*}
+                  eo=\${e##*:}
+                  # Match the whole topic:partition key, not the partition
+                  # index alone, so a line belonging to another topic cannot
+                  # supply this partition's begin offset. A partition missing
+                  # from "begins" defaults to 0, which can only overstate.
+                  bo=0
+                  for b in \${begins}; do
+                    if [ "\${b%:*}" = "\${ekey}" ]; then bo=\${b##*:}; break; fi
+                  done
+                  total=\$((total + eo - bo))
+                done
+                echo "\${total}"
+              }
+
+              WORK="\${SCRATCH}/kafka-dump"
+              TARBALL="\${SCRATCH}/kafka-topics.tar"
+              rm -rf "\${WORK}"; mkdir -p "\${WORK}"
+
+              if [ "\${MODE}" = backup ]; then
+                # Resolve the topic list: explicit TOPICS (comma/space
+                # separated) or every non-internal topic. Kafka's internal
+                # topics are double-underscore (__consumer_offsets,
+                # __transaction_state); single-underscore names such as
+                # _schemas are user data and must not be filtered.
+                if [ -n "\${TOPICS}" ]; then
+                  TLIST=\$(printf '%s' "\${TOPICS}" | tr ', ' '  ')
+                else
+                  # Fail closed: run --list as its own command so a broker
+                  # error (unreachable / auth) aborts the Pod under set -e
+                  # instead of the pipe masking the exit status to grep's and
+                  # || true swallowing it. Only then filter internal topics, so
+                  # an empty TLIST means genuinely no non-internal topics -
+                  # never a silently swallowed failure that would PUT an empty
+                  # tarball and report success.
+                  raw=\$("\${BIN}"/kafka-topics.sh --bootstrap-server "\${BOOT}" --list)
+                  TLIST=\$(printf '%s\n' "\${raw}" | grep -v '^__' || true)
+                fi
+                # TOPICS is operator input reaching unquoted expansions. Kafka
+                # topic names are [a-zA-Z0-9._-], so anything else is refused
+                # before it can glob (set -f keeps a literal "*" out of the
+                # loop below) or escape the \Q...\E pins. A name listed twice
+                # would run the per-topic block twice: the manifest gains a
+                # second set of lines while the data files overwrite, and the
+                # restore's count check can then never balance - so a
+                # duplicate is refused here rather than reported as a
+                # Succeeded backup nothing can restore.
+                set -f
+                UNIQ=""
+                for t in \${TLIST}; do
+                  case "\${t}" in
+                    *[!A-Za-z0-9._-]*) echo "topic name '\${t}' carries a character outside Kafka's [a-zA-Z0-9._-]; refusing" >&2; exit 1 ;;
+                  esac
+                  case " \${UNIQ} " in
+                    *" \${t} "*) echo "topic \${t} is listed more than once in topics; refusing to back it up twice" >&2; exit 1 ;;
+                  esac
+                  UNIQ="\${UNIQ} \${t}"
+                done
+                TLIST=\${UNIQ}
+                echo "backing up topics [\${TLIST}] from \${BOOT}"
+                MANIFEST="\${WORK}/manifest.txt"
+                : > "\${MANIFEST}"
+                for t in \${TLIST}; do
+                  # Freeze the consistency cut: read each partition's end offset
+                  # (--time -1) ONCE here, and its begin offset (--time -2).
+                  # Draining only up to the frozen end excludes anything
+                  # produced while the backup runs.
+                  ends=\$("\${BIN}"/kafka-get-offsets.sh --bootstrap-server "\${BOOT}" --topic "\Q\${t}\E" --time -1)
+                  begins=\$("\${BIN}"/kafka-get-offsets.sh --bootstrap-server "\${BOOT}" --topic "\Q\${t}\E" --time -2)
+                  # The partition SET is not self-validating (see
+                  # topic_records): re-derive the count from the topic itself
+                  # and fail closed when the listing is short, or a partition
+                  # lost to a leader election would get no manifest line, no
+                  # data file, and never reach the drain check below - a whole
+                  # partition missing from a backup that still reports
+                  # Succeeded. (A short "begins" needs no separate check: its
+                  # per-partition default of 0 can only overstate n, which the
+                  # drain check then catches.)
+                  #
+                  # The same --describe line carries ReplicationFactor. It goes
+                  # into the manifest so restore recreates the topic as the
+                  # source had it: a broker whose min.insync.replicas exceeds
+                  # the recreated topic's replication factor rejects every
+                  # acks=all write, and kafka-console-producer logs the
+                  # rejection without failing, so a replay into an
+                  # under-replicated topic lands nothing.
+                  desc=\$("\${BIN}"/kafka-topics.sh --bootstrap-server "\${BOOT}" --describe --topic "\Q\${t}\E")
+                  pc=\$(printf '%s\n' "\${desc}" | sed -n 's/.*PartitionCount: *\([0-9][0-9]*\).*/\1/p' | head -1)
+                  rf=\$(printf '%s\n' "\${desc}" | sed -n 's/.*ReplicationFactor: *\([0-9][0-9]*\).*/\1/p' | head -1)
+                  case "\${pc}" in
+                    ''|*[!0-9]*) echo "could not read PartitionCount for \${t}" >&2; exit 1 ;;
+                  esac
+                  case "\${rf}" in
+                    ''|*[!0-9]*) echo "could not read ReplicationFactor for \${t}" >&2; exit 1 ;;
+                  esac
+                  seen=0
+                  for e in \${ends}; do seen=\$((seen + 1)); done
+                  if [ "\${seen}" -ne "\${pc}" ]; then
+                    echo "offset listing returned \${seen} of \${pc} partition(s) for \${t}; refusing to upload an incomplete backup" >&2
+                    exit 1
+                  fi
+                  for e in \${ends}; do
+                    ekey=\${e%:*}
+                    p=\${ekey##*:}
+                    end=\${e##*:}
+                    begin=0
+                    for b in \${begins}; do
+                      # Match the whole topic:partition key, not the partition
+                      # index alone. Keyed on the index, a line belonging to
+                      # another topic supplies this partition's begin offset and
+                      # silently shifts the cut - and the drain check below
+                      # cannot see it, because n is derived from that same wrong
+                      # begin. This holds whatever order the listing arrives in.
+                      if [ "\${b%:*}" = "\${ekey}" ]; then begin=\${b##*:}; break; fi
+                    done
+                    n=\$((end - begin))
+                    printf '%s %s %s %s %s\n' "\${t}" "\${p}" "\${begin}" "\${end}" "\${rf}" >> "\${MANIFEST}"
+                    if [ "\${n}" -gt 0 ]; then
+                      "\${BIN}"/kafka-console-consumer.sh --bootstrap-server "\${BOOT}" \
+                        --topic "\${t}" --partition "\${p}" --offset "\${begin}" --max-messages "\${n}" \
+                        --timeout-ms 120000 --property print.key=true --property print.timestamp=false \
+                        > "\${WORK}/data-\${t}-\${p}.tsv"
+                      # kafka-console-consumer exits 0 even on a short read: a
+                      # --timeout-ms expiry is swallowed inside ConsoleConsumer,
+                      # so a truncated drain is indistinguishable from a full one
+                      # by exit status. One newline-free record is one line (the
+                      # README's key/value fidelity constraint), so a line-count
+                      # short of n means the [begin,end) cut was not fully
+                      # consumable - transactional control batches or a compacted
+                      # topic, both out of scope - and the backup must fail
+                      # rather than PUT a partial tarball reported as Succeeded.
+                      got=\$(wc -l < "\${WORK}/data-\${t}-\${p}.tsv")
+                      if [ "\${got}" -ne "\${n}" ]; then
+                        echo "partial drain on \${t}:\${p}: captured \${got} of \${n} record(s) in [\${begin},\${end}); refusing to upload an incomplete backup" >&2
+                        exit 1
+                      fi
+                    fi
+                    echo "  \${t}:\${p} [\${begin},\${end}) -> \${n} record(s)"
+                  done
+                  echo "  \${t}: \${pc} partition(s), replication factor \${rf}"
+                done
+                tar -C "\${WORK}" -cf "\${TARBALL}" .
+                s3 -X PUT --upload-file "\${TARBALL}" "\${OBJ_URL}"
+                echo "uploaded s3://\${S3_BUCKET}/\${KEY}"
+              else
+                echo "restoring topics into \${BOOT} from s3://\${S3_BUCKET}/\${KEY}"
+                s3 -o "\${TARBALL}" "\${OBJ_URL}"
+                tar -C "\${WORK}" -xf "\${TARBALL}"
+                [ -f "\${WORK}/manifest.txt" ] || { echo "manifest missing in backup" >&2; exit 1; }
+                # The manifest arrives inside the downloaded tarball, so treat it
+                # as untrusted and validate before any field is used as a number.
+                # A non-numeric partition would otherwise slip through the
+                # numeric test below: an if condition is exempt from errexit, so
+                # test exits 2, the term reads false, parts under-counts and the
+                # topic is created smaller - which the shape check then compares
+                # against itself and passes. An empty manifest is refused
+                # too: both verification loops would run zero times and the Pod
+                # would report a successful restore of nothing.
+                lines=0
+                while read -r mt mp mb me mr; do
+                  lines=\$((lines + 1))
+                  [ -n "\${mt}" ] || { echo "manifest line \${lines}: missing topic" >&2; exit 1; }
+                  # The topic name reaches unquoted expansions and a case
+                  # pattern below, with globbing on in this branch; hold it to
+                  # Kafka's name charset the way the backup side holds TOPICS.
+                  case "\${mt}" in
+                    *[!A-Za-z0-9._-]*)
+                      echo "manifest line \${lines}: topic name '\${mt}' carries a character outside Kafka's [a-zA-Z0-9._-]; refusing to restore from a malformed backup" >&2
+                      exit 1 ;;
+                  esac
+                  for v in "\${mp}" "\${mb}" "\${me}" "\${mr}"; do
+                    case "\${v}" in
+                      ''|*[!0-9]*)
+                        echo "manifest line \${lines} (topic \${mt}): non-numeric field '\${v}'; refusing to restore from a malformed backup" >&2
+                        exit 1 ;;
+                    esac
+                  done
+                done < "\${WORK}/manifest.txt"
+                [ "\${lines}" -gt 0 ] || { echo "manifest is empty: the backup recorded no partitions, so there is nothing to restore" >&2; exit 1; }
+                # Data files and manifest must agree both ways, checked before
+                # anything is created or replayed. The file names come out of
+                # the same untrusted tarball as the manifest: a file the
+                # manifest never listed would be data that skipped the create,
+                # shape, emptiness and post-replay checks (or, ignored by the
+                # manifest-driven replay below, silently not restored), and a
+                # listed partition with records but no file would be found
+                # only after earlier partitions had already been replayed.
+                for f in "\${WORK}"/data-*.tsv; do
+                  [ -e "\${f}" ] || continue
+                  base=\${f##*/data-}; base=\${base%.tsv}
+                  ft=\${base%-*}
+                  fp=\${base##*-}
+                  listed=0
+                  while read -r mt mp mb me mr; do
+                    if [ "\${mt}" = "\${ft}" ] && [ "\${mp}" = "\${fp}" ]; then listed=1; break; fi
+                  done < "\${WORK}/manifest.txt"
+                  if [ "\${listed}" -ne 1 ]; then
+                    echo "backup contains data file \${f##*/}, which the manifest does not list; refusing to restore an inconsistent backup" >&2
+                    exit 1
+                  fi
+                done
+                while read -r mt mp mb me mr; do
+                  [ "\${me}" -gt "\${mb}" ] || continue
+                  if [ ! -f "\${WORK}/data-\${mt}-\${mp}.tsv" ]; then
+                    echo "backup records \$((me - mb)) record(s) for \${mt}:\${mp} but carries no data file for it; refusing to restore an inconsistent backup" >&2
+                    exit 1
+                  fi
+                done < "\${WORK}/manifest.txt"
+                # Recreate every backed-up topic with its original partition
+                # count (needed so keyed records re-produce into the same
+                # partition) and, unless the replicationFactor parameter
+                # overrides it, its original replication factor; existing
+                # topics are left as-is. Topic configs, ACLs and consumer
+                # offsets are out of scope - this restores DATA only.
+                SEEN=""
+                while read -r mt mp mb me mr; do
+                  case " \${SEEN} " in *" \${mt} "*) ;; *) SEEN="\${SEEN} \${mt}" ;; esac
+                done < "\${WORK}/manifest.txt"
+                for t in \${SEEN}; do
+                  parts=0
+                  rf=""
+                  while read -r mt mp mb me mr; do
+                    [ "\${mt}" = "\${t}" ] || continue
+                    if [ "\${mp}" -ge "\${parts}" ]; then parts=\$((mp + 1)); fi
+                    if [ -n "\${rf}" ] && [ "\${rf}" != "\${mr}" ]; then
+                      echo "manifest lists \${t} with replication factors \${rf} and \${mr}; refusing to restore from an inconsistent backup" >&2
+                      exit 1
+                    fi
+                    rf=\${mr}
+                  done < "\${WORK}/manifest.txt"
+                  if [ -n "\${REPLICATION_FACTOR}" ]; then rf=\${REPLICATION_FACTOR}; fi
+                  # A replication factor the target cannot host (more replicas
+                  # than brokers) fails right here, in Kafka's own words, rather
+                  # than after a replay; set replicationFactor in the
+                  # BackupClass to restore into a smaller cluster.
+                  "\${BIN}"/kafka-topics.sh --bootstrap-server "\${BOOT}" --create --if-not-exists \
+                    --topic "\${t}" --partitions "\${parts}" --replication-factor "\${rf}"
+                  # --if-not-exists leaves a pre-existing topic's partition
+                  # count and replication factor alone. The post-replay check
+                  # below compares only the per-topic total, so replaying into
+                  # a topic with a different partition count would silently
+                  # re-place every keyed record and still add up, and a
+                  # pre-existing topic with fewer replicas than the broker's
+                  # min.insync.replicas would take the replay and land nothing.
+                  # Confirm both against what the topic really has.
+                  desc=\$("\${BIN}"/kafka-topics.sh --bootstrap-server "\${BOOT}" --describe --topic "\Q\${t}\E")
+                  have_parts=\$(printf '%s\n' "\${desc}" | sed -n 's/.*PartitionCount: *\([0-9][0-9]*\).*/\1/p' | head -1)
+                  have_rf=\$(printf '%s\n' "\${desc}" | sed -n 's/.*ReplicationFactor: *\([0-9][0-9]*\).*/\1/p' | head -1)
+                  case "\${have_parts}" in
+                    ''|*[!0-9]*) echo "could not read PartitionCount for \${t} after create" >&2; exit 1 ;;
+                  esac
+                  case "\${have_rf}" in
+                    ''|*[!0-9]*) echo "could not read ReplicationFactor for \${t} after create" >&2; exit 1 ;;
+                  esac
+                  if [ "\${have_parts}" != "\${parts}" ]; then
+                    echo "topic \${t} has \${have_parts} partition(s), backup recorded \${parts}; refusing to restore into a differently shaped topic" >&2
+                    exit 1
+                  fi
+                  if [ "\${have_rf}" != "\${rf}" ]; then
+                    echo "topic \${t} has replication factor \${have_rf}, restore expects \${rf}; refusing to replay into a pre-existing topic with a different replication factor" >&2
+                    exit 1
+                  fi
+                  # kafka-console-producer writes with acks=all, and a broker
+                  # rejects every such write into a topic whose replication
+                  # factor is below its min.insync.replicas - while the
+                  # producer only logs the rejection and exits 0. --describe
+                  # --all prints the effective value, broker default included,
+                  # so the mismatch is named here, with its remedy, instead of
+                  # surfacing as a count shortfall after an empty replay.
+                  misr=\$("\${BIN}"/kafka-configs.sh --bootstrap-server "\${BOOT}" --describe --all --entity-type topics --entity-name "\${t}" \
+                    | sed -n 's/.*min\.insync\.replicas=\([0-9][0-9]*\).*/\1/p' | head -1)
+                  case "\${misr}" in
+                    ''|*[!0-9]*) echo "could not read min.insync.replicas for \${t}" >&2; exit 1 ;;
+                  esac
+                  if [ "\${have_rf}" -lt "\${misr}" ]; then
+                    echo "topic \${t} has replication factor \${have_rf} but the broker requires min.insync.replicas=\${misr}, so every replayed write would be rejected. Set replicationFactor to at least \${misr} in the BackupClass (or restore into a cluster whose min.insync.replicas fits) and re-run." >&2
+                    exit 1
+                  fi
+                  # Refuse a non-empty target BEFORE replaying, not after. The
+                  # replay appends, and the driver retries a Pod that dies
+                  # mid-replay, so checking only afterwards means each attempt
+                  # has already written another full copy into a live topic and
+                  # the count check merely reports the damage. Checking here
+                  # leaves the topic untouched instead. Remedy: empty or delete
+                  # the topic (the in-place step deletes it) and re-run.
+                  held=\$(topic_records "\${t}" "\${have_parts}") || exit 1
+                  if [ "\${held}" -ne 0 ]; then
+                    echo "topic \${t} already holds \${held} record(s); this restore appends and is supported only against an absent or empty topic. Empty or delete it and re-run." >&2
+                    exit 1
+                  fi
+                  echo "  \${t}: created or verified empty, \${parts} partition(s), replication factor \${rf}"
+                done
+                # Replay topic by topic in manifest order, announcing each one,
+                # so the Pod log doubles as a resume map: a retry after a Pod
+                # died mid-replay stops at the emptiness check above on the
+                # first topic that was already replayed, and this log says which
+                # topics landed and which still need the target emptied.
+                # parse.key restores the original key so the default partitioner
+                # reproduces the original partition placement.
+                for t in \${SEEN}; do
+                  echo "replaying \${t}"
+                  while read -r mt mp mb me mr; do
+                    [ "\${mt}" = "\${t}" ] || continue
+                    [ "\${me}" -gt "\${mb}" ] || continue
+                    "\${BIN}"/kafka-console-producer.sh --bootstrap-server "\${BOOT}" \
+                      --topic "\${t}" --property parse.key=true < "\${WORK}/data-\${t}-\${mp}.tsv"
+                  done < "\${WORK}/manifest.txt"
+                  echo "  \${t}: replayed"
+                done
+                # Verify the replay landed. kafka-console-producer, like the
+                # consumer on backup, can exit 0 without every record being
+                # accepted (a broker-side reject prints but does not fail the
+                # process), so confirm each restored topic now holds exactly the
+                # record count the manifest recorded (sum of end-begin per
+                # partition). A shortfall means the replay dropped records; an
+                # overshoot means the target was not empty - this DATA restore
+                # appends, so it is supported only against an absent or empty
+                # topic. Either way, fail rather than report a lossy or
+                # duplicated restore as complete.
+                for t in \${SEEN}; do
+                  want=0
+                  parts=0
+                  while read -r mt mp mb me mr; do
+                    [ "\${mt}" = "\${t}" ] || continue
+                    want=\$((want + me - mb))
+                    if [ "\${mp}" -ge "\${parts}" ]; then parts=\$((mp + 1)); fi
+                  done < "\${WORK}/manifest.txt"
+                  have=\$(topic_records "\${t}" "\${parts}") || exit 1
+                  if [ "\${have}" -ne "\${want}" ]; then
+                    echo "restore verification failed for \${t}: topic holds \${have} record(s), backup recorded \${want}; refusing to report a lossy or duplicated restore as complete" >&2
+                    exit 1
+                  fi
+                  echo "  \${t}: restored \${have} record(s)"
+                done
+                echo "restore complete"
+              fi
+          resources:
+            requests:
+              cpu: 100m
+              memory: 256Mi
+            limits:
+              cpu: "1"
+              memory: 1Gi
+          securityContext:
+            # restricted-clean. The Strimzi image's default user is a non-root
+            # numeric UID (1001), so runAsNonRoot passes without pinning
+            # runAsUser to a value specific to this image tag.
+            runAsNonRoot: true
+            allowPrivilegeEscalation: false
+            capabilities:
+              drop: ["ALL"]
+            seccompProfile:
+              type: RuntimeDefault
+      volumes:
+        - name: s3-ca
+          secret:
+            secretName: "{{ .Release.Name }}-backup-s3"
+            optional: true
+            items:
+              - key: ca.crt
+                path: ca.crt
+EOF
+
+log_success "Job strategy '${STRATEGY_NAME}' created."
+echo -e "\n${GREEN}${BOLD}Next:${NC} ./02-create-backupclass.sh"
diff --git a/examples/backups/kafka/02-create-backupclass.sh b/examples/backups/kafka/02-create-backupclass.sh
new file mode 100755
index 0000000000..6e9d8b081b
--- /dev/null
+++ b/examples/backups/kafka/02-create-backupclass.sh
@@ -0,0 +1,46 @@
+#!/bin/bash
+# Step 02: Map the Kafka application kind to the Job strategy from step 01. The
+# strategy parameters (which topics to back up, an optional replication-factor
+# override for the topics restore recreates) travel through the BackupClass and
+# are exposed to the strategy template as `.Parameters`. They are also
+# snapshotted onto the resulting Backup's driverMetadata, so a later restore
+# re-renders with the same values.
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "$SCRIPT_DIR/00-helpers.sh"
+
+print_header "Step 02: Create BackupClass '${BACKUPCLASS_NAME}'"
+log_command "kubectl apply -f - (BackupClass: $BACKUPCLASS_NAME -> $STRATEGY_NAME)"
+
+kubectl apply -f - <<EOF
+apiVersion: backups.cozystack.io/v1alpha1
+kind: BackupClass
+metadata:
+  name: ${BACKUPCLASS_NAME}
+spec:
+  strategies:
+    - application:
+        apiGroup: apps.cozystack.io
+        kind: Kafka
+      strategyRef:
+        apiGroup: strategy.backups.cozystack.io
+        kind: Job
+        name: ${STRATEGY_NAME}
+      parameters:
+        # Empty "topics" backs up every non-internal topic - the wider net, not
+        # the safer one: it can pull in a compacted or transactional topic,
+        # which this logical strategy fails closed on (see the drain guard in
+        # 01-create-strategy.sh and README "Scope and limitations"). Set a
+        # comma/space-separated list to restrict the backup to topics known to
+        # be plain.
+        topics: "${TOPIC}"
+        # Restore recreates each topic with the replication factor the backup
+        # captured from the source. Set replicationFactor to override it - the
+        # way to restore into a cluster with fewer brokers than the source.
+        # Like every parameter it is snapshotted at backup time, so it has to
+        # be in place before the BackupJob whose Backup will be restored.
+EOF
+
+log_success "BackupClass '${BACKUPCLASS_NAME}' created."
+echo -e "\n${GREEN}${BOLD}Next:${NC} ./03-create-bucket.sh"
diff --git a/examples/backups/kafka/03-create-bucket.sh b/examples/backups/kafka/03-create-bucket.sh
new file mode 100755
index 0000000000..74688feba1
--- /dev/null
+++ b/examples/backups/kafka/03-create-bucket.sh
@@ -0,0 +1,121 @@
+#!/bin/bash
+# Step 03: Provision an in-cluster Bucket and cache its S3 coordinates. The
+# generic Job strategy has no chart support to emit a backup Secret, so the
+# demo materialises the "<app>-backup-s3" Secret itself. This step only
+# caches the coordinates; create_s3_secret (00-helpers.sh) turns them into
+# per-app Secrets in steps 04 and 07.
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "$SCRIPT_DIR/00-helpers.sh"
+
+print_header "Step 03: Provision Bucket '${BUCKET_NAME}' in '${NAMESPACE}'"
+
+log_command "kubectl apply -f - (Bucket: $BUCKET_NAME)"
+# spec.users.backup is required for the Bucket app to provision a
+# BucketAccess (and credentials Secret) the backup tooling can read.
+kubectl apply -f - <<EOF
+apiVersion: apps.cozystack.io/v1alpha1
+kind: Bucket
+metadata:
+  name: ${BUCKET_NAME}
+  namespace: ${NAMESPACE}
+spec:
+  users:
+    backup:
+      readonly: false
+EOF
+
+# 660s, above this generated release's 600s install timeout; see "Sizing an
+# HR-Ready budget" in docs/agents/e2e-testing.md.
+wait_hr_ready "bucket-${BUCKET_NAME}" 660
+kubectl -n "$NAMESPACE" wait bucketclaims.objectstorage.k8s.io "bucket-${BUCKET_NAME}" --for=jsonpath='{.status.bucketReady}'=true --timeout=300s
+# Cozystack's bucket app provisions a BucketAccess named "<bucket-name>-backup"
+# (the "-backup" suffix is the BucketAccessClass name); the BucketInfo Secret
+# carries the same name.
+kubectl -n "$NAMESPACE" wait bucketaccesses.objectstorage.k8s.io "bucket-${BUCKET_NAME}-backup" --for=jsonpath='{.status.accessGranted}'=true --timeout=300s
+
+# E2E only: accessGranted describes the COSI object, not whether the S3 server
+# has reloaded the new IAM identity, so a freshly granted key can still answer
+# the strategy Pod's SigV4 PUT with 403 - which reds the run as a backup defect
+# rather than the grant-propagation race it is. The shared preflight proves the
+# key works before anything depends on it; the other backup round-trips gate it
+# the same way.
+if [[ "${COZY_E2E_BACKUP_PREFLIGHT:-0}" == "1" ]]; then
+    # shellcheck source=/dev/null
+    source "$SCRIPT_DIR/../../../hack/e2e-chainsaw/_lib/backup-access-preflight.sh"
+    cozy_backup_access_preflight "$NAMESPACE" "bucket-${BUCKET_NAME}-backup" 90
+fi
+
+log_substep "Reading bucket coordinates from BucketInfo Secret..."
+TMP=$(mktemp)
+trap 'rm -f "$TMP"' EXIT
+kubectl -n "$NAMESPACE" get secret "bucket-${BUCKET_NAME}-backup" -o jsonpath='{.data.BucketInfo}' | base64 -d > "$TMP"
+
+S3_ACCESS_KEY=$(jq -r '.spec.secretS3.accessKeyID' "$TMP")
+S3_SECRET_KEY=$(jq -r '.spec.secretS3.accessSecretKey' "$TMP")
+# S3_ENDPOINT can be overridden via the environment: BucketInfo advertises the
+# external ingress URL, which in CI is an unroutable placeholder; the e2e
+# harness points this at the in-cluster seaweedfs Service instead.
+S3_ENDPOINT="${S3_ENDPOINT:-$(jq -r '.spec.secretS3.endpoint' "$TMP")}"
+S3_REGION=$(jq -r 'if (.spec.secretS3.region // "") == "" then "us-east-1" else .spec.secretS3.region end' "$TMP")
+S3_BUCKET=$(jq -r '.spec.bucketName' "$TMP")
+
+# `jq -r` returns the literal string "null" for missing JSON paths; fail fast
+# here so a missing field surfaces at extraction time instead of as a confusing
+# curl/SigV4 error inside the backup Pod.
+for v in S3_ACCESS_KEY S3_SECRET_KEY S3_ENDPOINT S3_REGION S3_BUCKET; do
+    [[ -n "${!v}" && "${!v}" != "null" ]] || { log_error "BucketInfo missing required field: ${v}"; exit 1; }
+done
+
+# The endpoint's CA, so the strategy Pod verifies TLS instead of skipping it.
+# The default name tracks the seaweedfs chart's fullnameOverride (seaweedfs ->
+# seaweedfs-ca-cert), but a downstream fullname change would rename it, so fall
+# back to discovering the cert-manager CA Certificate (the seaweedfs-labelled
+# one with spec.isCA=true) and read its secretName. S3_CA_SECRET="" skips the
+# copy for a publicly-trusted endpoint (see 00-helpers.sh).
+S3_CA_B64=""
+if [[ -n "$S3_CA_SECRET" ]]; then
+    # Only an absent Secret earns a discovery pass. The read crosses into
+    # another namespace, which a tenant persona is not granted, and a denial
+    # must say so rather than surface as "not found" and point at a name
+    # that cannot help.
+    if ! err=$(kubectl -n "$S3_CA_NAMESPACE" get secret "$S3_CA_SECRET" 2>&1 >/dev/null); then
+        case "$err" in
+            *NotFound*|*"not found"*) ;;
+            *)
+                log_error "Cannot read S3 CA secret ${S3_CA_NAMESPACE}/${S3_CA_SECRET}: ${err}"
+                log_error "Run this step with a persona that can read Secrets in ${S3_CA_NAMESPACE}, or set S3_CA_SECRET=\"\" for a publicly-trusted endpoint."
+                exit 1 ;;
+        esac
+        log_warning "S3 CA secret ${S3_CA_NAMESPACE}/${S3_CA_SECRET} not found; discovering the seaweedfs CA Certificate..."
+        discovered=$(kubectl -n "$S3_CA_NAMESPACE" get certificates.cert-manager.io \
+            -l app.kubernetes.io/name=seaweedfs \
+            -o jsonpath='{range .items[*]}{.spec.isCA}{" "}{.spec.secretName}{"\n"}{end}' \
+            | awk '$1=="true"{print $2; exit}' || true)
+        [[ -n "$discovered" ]] || { log_error "No seaweedfs CA Certificate found in ${S3_CA_NAMESPACE} (or the read was denied, see above); set S3_CA_SECRET explicitly (or empty for a publicly-trusted endpoint)."; exit 1; }
+        log_success "Discovered seaweedfs CA secret ${S3_CA_NAMESPACE}/${discovered}"
+        S3_CA_SECRET="$discovered"
+    fi
+    log_substep "Caching S3 CA ${S3_CA_NAMESPACE}/${S3_CA_SECRET}[${S3_CA_KEY}]..."
+    S3_CA_B64=$(kubectl -n "$S3_CA_NAMESPACE" get secret "$S3_CA_SECRET" -o jsonpath="{.data.${S3_CA_KEY//./\\.}}")
+    [[ -n "$S3_CA_B64" ]] || { log_error "S3 CA secret ${S3_CA_NAMESPACE}/${S3_CA_SECRET} has no ${S3_CA_KEY}"; exit 1; }
+fi
+
+# Persist for steps 04 / 07. The cache stores raw S3 credentials, so apply
+# restrictive perms before writing the body - umask alone could leave the file
+# group/world-readable. The CA stays base64 so the file remains one export per
+# line.
+umask 077
+cat > "$SCRIPT_DIR/.bucket-info.env" <<ENV
+export S3_ACCESS_KEY=${S3_ACCESS_KEY}
+export S3_SECRET_KEY=${S3_SECRET_KEY}
+export S3_ENDPOINT=${S3_ENDPOINT}
+export S3_REGION=${S3_REGION}
+export S3_BUCKET=${S3_BUCKET}
+export S3_CA_B64=${S3_CA_B64}
+ENV
+chmod 600 "$SCRIPT_DIR/.bucket-info.env"
+
+log_success "Bucket '${BUCKET_NAME}' ready; coordinates cached in $(basename "$SCRIPT_DIR")/.bucket-info.env."
+echo -e "\n${GREEN}${BOLD}Next:${NC} ./04-create-kafka.sh"
diff --git a/examples/backups/kafka/04-create-kafka.sh b/examples/backups/kafka/04-create-kafka.sh
new file mode 100755
index 0000000000..03074ba4fb
--- /dev/null
+++ b/examples/backups/kafka/04-create-kafka.sh
@@ -0,0 +1,64 @@
+#!/bin/bash
+# Step 04: Provision a Kafka instance with KAFKA_REPLICAS brokers, create the
+# S3 Secret the Job strategy consumes, then seed a topic with sentinel messages
+# used to verify the backup/restore round-trip. The topic is created via the
+# CLI (not the chart's `topics:`) so there is no KafkaTopic CR - the in-place
+# restore in step 06 can then delete and let the driver recreate the topic
+# deterministically, with no Topic Operator reconciliation racing the restore.
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "$SCRIPT_DIR/00-helpers.sh"
+
+print_header "Step 04: Provision Kafka '${KAFKA_NAME}'"
+
+kubectl apply -f - <<EOF
+apiVersion: apps.cozystack.io/v1alpha1
+kind: Kafka
+metadata:
+  name: ${KAFKA_NAME}
+  namespace: ${NAMESPACE}
+spec:
+  external: false
+  kafka:
+    replicas: ${KAFKA_REPLICAS}
+    size: 2Gi
+    resourcesPreset: "c1.small"
+  topics: []
+EOF
+
+wait_hr_ready "kafka-${KAFKA_NAME}"
+
+log_substep "Waiting for the Strimzi Kafka cluster to be Ready (broker and controller pools up)..."
+kubectl -n "$NAMESPACE" wait kafka.kafka.strimzi.io "kafka-${KAFKA_NAME}" \
+    --for=condition=Ready --timeout=600s
+
+log_substep "Creating S3 credentials Secret '${KAFKA_NAME}-backup-s3'..."
+create_s3_secret "$KAFKA_NAME"
+
+log_substep "Creating topic '${TOPIC}' (${PARTITIONS} partitions, ${TOPIC_REPLICAS} replicas) and publishing ${MESSAGE_COUNT} sentinel messages..."
+seed_topic "$KAFKA_NAME"
+
+count=$(topic_message_count "$KAFKA_NAME")
+[[ "$count" == "$MESSAGE_COUNT" ]] || { log_error "expected ${MESSAGE_COUNT} messages in '${TOPIC}', got '${count}'"; exit 1; }
+rf=$(topic_replication_factor "$KAFKA_NAME")
+[[ "$rf" == "$TOPIC_REPLICAS" ]] || { log_error "expected '${TOPIC}' to have ${TOPIC_REPLICAS} replicas, got '${rf}'"; exit 1; }
+log_success "Topic '${TOPIC}' holds ${count} record(s) at replication factor ${rf}."
+
+# Seed the decoy. It is never named in the BackupClass, so a correct run must
+# leave it untouched; a --topic call that matched it as a regex instead would
+# either pull its partitions into the backup or delete it in step 06.
+log_substep "Creating decoy topic '${DECOY_TOPIC}' (${DECOY_COUNT} records) to pin literal topic matching..."
+seed_decoy_topic "$KAFKA_NAME"
+decoy=$(decoy_message_count "$KAFKA_NAME")
+[[ "$decoy" == "$DECOY_COUNT" ]] || { log_error "expected ${DECOY_COUNT} messages in '${DECOY_TOPIC}', got '${decoy}'"; exit 1; }
+log_success "Decoy topic '${DECOY_TOPIC}' holds ${decoy} record(s)."
+
+# Snapshot the source content so the restore steps can diff against it and
+# prove the records - not just their count - round-tripped. cleanup.sh removes
+# this file.
+topic_dump "$KAFKA_NAME" > "$SCRIPT_DIR/.source-dump.txt"
+dumped=$(wc -l < "$SCRIPT_DIR/.source-dump.txt" | tr -d '[:space:]')
+[[ "$dumped" == "$MESSAGE_COUNT" ]] || { log_error "source dump has ${dumped} records, expected ${MESSAGE_COUNT}"; exit 1; }
+
+echo -e "\n${GREEN}${BOLD}Next:${NC} ./05-create-backupjob.sh"
diff --git a/examples/backups/kafka/05-create-backupjob.sh b/examples/backups/kafka/05-create-backupjob.sh
new file mode 100755
index 0000000000..136e260dfa
--- /dev/null
+++ b/examples/backups/kafka/05-create-backupjob.sh
@@ -0,0 +1,43 @@
+#!/bin/bash
+# Step 05: Create a BackupJob and wait for it to succeed. The controller
+# resolves the BackupClass -> Job strategy, renders the Pod template against
+# the Kafka app, and runs it as a batch/v1.Job (owned by the BackupJob). The
+# Pod freezes each partition's end offset, drains [begin,end) and uploads a
+# tarball to S3.
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "$SCRIPT_DIR/00-helpers.sh"
+
+print_header "Step 05: Create BackupJob '${BACKUPJOB_NAME}'"
+
+kubectl apply -f - <<EOF
+apiVersion: backups.cozystack.io/v1alpha1
+kind: BackupJob
+metadata:
+  name: ${BACKUPJOB_NAME}
+  namespace: ${NAMESPACE}
+spec:
+  applicationRef:
+    apiGroup: apps.cozystack.io
+    kind: Kafka
+    name: ${KAFKA_NAME}
+  backupClassName: ${BACKUPCLASS_NAME}
+EOF
+
+log_substep "Waiting for BackupJob to Succeed (this drains the topic to S3)..."
+# Skip an explicit "wait Running" gate: a fast-completing strategy Pod can
+# transition Pending -> Succeeded between two API observations, in which case
+# `kubectl wait --for=jsonpath='{.status.phase}'=Running` would time out even
+# though the BackupJob actually finished. wait_for_field already polls until
+# the terminal phase, which covers both the slow and the fast path.
+wait_for_field backupjob "$BACKUPJOB_NAME" '{.status.phase}' Succeeded "$NAMESPACE" 600 Failed
+
+backup_ref=$(kubectl -n "$NAMESPACE" get backupjob "$BACKUPJOB_NAME" -o jsonpath='{.status.backupRef.name}')
+[[ -n "$backup_ref" ]] || { log_error "BackupJob succeeded but BackupRef is empty"; exit 1; }
+# The restore steps reference the Backup by this resolved name rather than by
+# assuming it equals the BackupJob's. cleanup.sh removes the file.
+printf 'export BACKUP_NAME=%q\n' "$backup_ref" > "$SCRIPT_DIR/.backup-name.env"
+log_success "Backup '${backup_ref}' is Ready."
+
+echo -e "\n${GREEN}${BOLD}Next:${NC} ./06-restore-in-place.sh"
diff --git a/examples/backups/kafka/06-restore-in-place.sh b/examples/backups/kafka/06-restore-in-place.sh
new file mode 100755
index 0000000000..8f7edd2932
--- /dev/null
+++ b/examples/backups/kafka/06-restore-in-place.sh
@@ -0,0 +1,140 @@
+#!/bin/bash
+# Step 06: In-place restore. Delete the topic on the source instance to
+# simulate data loss, then ask the Job driver to restore it from S3 back into
+# the same Kafka application. The driver recreates the topic (--if-not-exists)
+# and replays every partition file, so the topic must be absent first -
+# mirroring the ClickHouse demo dropping its table and the NATS demo removing
+# its stream. A second RestoreJob against the now-populated topic then has to
+# be refused without touching it.
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "$SCRIPT_DIR/00-helpers.sh"
+
+print_header "Step 06: In-place restore from '${BACKUPJOB_NAME}'"
+
+[[ -f "$SCRIPT_DIR/.backup-name.env" ]] || { log_error "missing $SCRIPT_DIR/.backup-name.env; run 05-create-backupjob.sh first"; exit 1; }
+# shellcheck disable=SC1091
+source "$SCRIPT_DIR/.backup-name.env"
+[[ -f "$SCRIPT_DIR/.source-dump.txt" ]] || { log_error "missing $SCRIPT_DIR/.source-dump.txt; run 04-create-kafka.sh first"; exit 1; }
+
+log_substep "Deleting topic '${TOPIC}' to simulate data loss..."
+# Delete and wait for the topic to actually disappear in the same Pod: topic
+# deletion is asynchronous, and the driver's --create would fail with "topic
+# marked for deletion" if the restore raced ahead of the tombstone.
+#
+# kafka-topics treats --topic as a Java regex, so an unquoted name deletes
+# every topic it happens to match ("audit.events" also matches "audit-events").
+# \Q...\E quotes the name back to a literal - the same fix the kafka-metadata
+# example carries. --create below takes a literal name and must NOT be quoted.
+kafka_run "$KAFKA_NAME" '
+    "$BIN"/kafka-topics.sh --bootstrap-server "$BOOT" --delete --topic "\Q$TOPIC\E" || true
+    for _ in $(seq 1 60); do
+        # Capture --list on its own so a transient broker error does not read
+        # as empty output and false-positive "deleted"; the pod snippet runs
+        # under set -eu without pipefail, so the pipe would otherwise mask it.
+        list=$("$BIN"/kafka-topics.sh --bootstrap-server "$BOOT" --list) || { sleep 2; continue; }
+        if ! printf "%s\n" "$list" | grep -qxF -- "$TOPIC"; then
+            echo "topic $TOPIC deleted"; exit 0
+        fi
+        sleep 2
+    done
+    echo "topic still present after wait" >&2; exit 1
+'
+
+kubectl apply -f - <<EOF
+apiVersion: backups.cozystack.io/v1alpha1
+kind: RestoreJob
+metadata:
+  name: ${RESTOREJOB_INPLACE_NAME}
+  namespace: ${NAMESPACE}
+spec:
+  backupRef:
+    name: ${BACKUP_NAME}
+EOF
+
+log_substep "Waiting for in-place RestoreJob to Succeed..."
+wait_for_field restorejob "$RESTOREJOB_INPLACE_NAME" '{.status.phase}' Succeeded "$NAMESPACE" 600 Failed
+
+# Verifies count, content and shape of the restored topic against the source.
+# Shared with the refusal check below, which must find all three unchanged.
+verify_restored() {
+    local when="$1"
+    local count rf
+    count=$(topic_message_count "$KAFKA_NAME")
+    # Guard the comparison: a failed offsets lookup returns an empty string, which
+    # must not be mistaken for a successful restore of zero records.
+    [[ "$count" =~ ^[0-9]+$ ]] || { log_error "non-numeric record count ${when}: '${count}' (topic missing?)"; return 1; }
+    # Exact count, not >=: restore replays unconditionally and appends into a
+    # non-empty topic, so a double-replay (e.g. the strategy Job's backoffLimit
+    # retry) lands 2x the records and must fail here, not pass.
+    if (( count != MESSAGE_COUNT )); then
+        log_error "Record count ${when} is ${count}; expected exactly ${MESSAGE_COUNT}"
+        return 1
+    fi
+    # Content, not just count: diff the restored topic against the source snapshot
+    # from step 04. Byte-equality of the per-partition ordered dumps proves keys,
+    # values, partition placement and ordering survived - the fidelity claims the
+    # README makes.
+    if ! diff -u "$SCRIPT_DIR/.source-dump.txt" <(topic_dump "$KAFKA_NAME"); then
+        log_error "Restored content ${when} does not match the source snapshot"
+        return 1
+    fi
+    # The replication factor comes from the backup manifest, not from a
+    # parameter: on this KAFKA_REPLICAS-broker cluster the chart's
+    # min.insync.replicas rejects every write into a topic recreated with
+    # fewer replicas, so a replay into an under-replicated topic would have
+    # landed nothing and failed the count above - but pin the value itself too.
+    rf=$(topic_replication_factor "$KAFKA_NAME")
+    if [[ "$rf" != "$TOPIC_REPLICAS" ]]; then
+        log_error "Replication factor ${when} is '${rf}'; expected ${TOPIC_REPLICAS} as captured from the source"
+        return 1
+    fi
+    log_success "Verified ${when}: ${count} record(s) in '${TOPIC}' at replication factor ${rf}, content matches source."
+}
+
+log_substep "Verifying topic records are restored..."
+verify_restored "after in-place restore"
+
+# The delete above names ${TOPIC}, which as a Java regex would also match the
+# decoy. Its survival is what proves the \Q...\E pin is in place; without it
+# this reads back empty.
+decoy=$(decoy_message_count "$KAFKA_NAME")
+if [[ "$decoy" != "$DECOY_COUNT" ]]; then
+    log_error "Decoy topic '${DECOY_TOPIC}' holds '${decoy}', expected ${DECOY_COUNT}: the topic-name match is behaving as a regex, not a literal"
+    exit 1
+fi
+log_success "Decoy topic '${DECOY_TOPIC}' untouched: ${decoy} record(s)."
+
+# Restore appends, so the strategy refuses a target that already holds
+# records - before replaying, so a retried Pod cannot stack a second copy onto
+# a live topic. Drive that path: a second RestoreJob against the topic just
+# restored must settle Failed, name the reason in the strategy Pod's log, and
+# leave the topic exactly as the verification above found it.
+log_substep "Submitting RestoreJob '${RESTOREJOB_NONEMPTY_NAME}' against the populated topic; it must be refused..."
+kubectl apply -f - <<EOF
+apiVersion: backups.cozystack.io/v1alpha1
+kind: RestoreJob
+metadata:
+  name: ${RESTOREJOB_NONEMPTY_NAME}
+  namespace: ${NAMESPACE}
+spec:
+  backupRef:
+    name: ${BACKUP_NAME}
+EOF
+wait_for_field restorejob "$RESTOREJOB_NONEMPTY_NAME" '{.status.phase}' Failed "$NAMESPACE" 600 Succeeded
+# The driver names the batch Job "<restorejob>-restore"; batch/v1 labels its
+# Pods job-name=<job>. At least one attempt must have logged the refusal;
+# that nothing was written by any attempt is what verify_restored below
+# establishes.
+refusals=$(kubectl -n "$NAMESPACE" logs -l "job-name=${RESTOREJOB_NONEMPTY_NAME}-restore" --tail=-1 2>/dev/null \
+    | grep -c "already holds" || true)
+if [[ "$refusals" -lt 1 ]]; then
+    log_error "RestoreJob '${RESTOREJOB_NONEMPTY_NAME}' failed, but no attempt logged the non-empty-target refusal"
+    kubectl -n "$NAMESPACE" logs -l "job-name=${RESTOREJOB_NONEMPTY_NAME}-restore" --tail=50 >&2 || true
+    exit 1
+fi
+verify_restored "after the refused restore"
+log_success "Restore into the populated topic was refused (${refusals} attempt(s)) and left it untouched."
+
+echo -e "\n${GREEN}${BOLD}Next:${NC} ./07-restore-to-copy.sh"
diff --git a/examples/backups/kafka/07-restore-to-copy.sh b/examples/backups/kafka/07-restore-to-copy.sh
new file mode 100755
index 0000000000..61d79f5ae2
--- /dev/null
+++ b/examples/backups/kafka/07-restore-to-copy.sh
@@ -0,0 +1,88 @@
+#!/bin/bash
+# Step 07: To-copy restore. Provision a second Kafka application and restore the
+# same backup into it via RestoreJob.spec.targetApplicationRef. The strategy
+# connects to the TARGET app (its bootstrap, its <target>-backup-s3 Secret) but
+# reads the S3 object keyed by the SOURCE app name, via .Backup.ApplicationRef.Name
+# - so the copy lands the source's data.
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "$SCRIPT_DIR/00-helpers.sh"
+
+print_header "Step 07: To-copy restore into '${KAFKA_RESTORE_NAME}'"
+
+[[ -f "$SCRIPT_DIR/.backup-name.env" ]] || { log_error "missing $SCRIPT_DIR/.backup-name.env; run 05-create-backupjob.sh first"; exit 1; }
+# shellcheck disable=SC1091
+source "$SCRIPT_DIR/.backup-name.env"
+
+# Same broker count as the source: the restore recreates the topic with the
+# replication factor the backup captured, which a smaller target could not
+# host (see the replicationFactor override in 02-create-backupclass.sh).
+kubectl apply -f - <<EOF
+apiVersion: apps.cozystack.io/v1alpha1
+kind: Kafka
+metadata:
+  name: ${KAFKA_RESTORE_NAME}
+  namespace: ${NAMESPACE}
+spec:
+  external: false
+  kafka:
+    replicas: ${KAFKA_REPLICAS}
+    size: 2Gi
+    resourcesPreset: "c1.small"
+  topics: []
+EOF
+
+wait_hr_ready "kafka-${KAFKA_RESTORE_NAME}"
+log_substep "Waiting for the restore-target Strimzi Kafka cluster to be Ready..."
+kubectl -n "$NAMESPACE" wait kafka.kafka.strimzi.io "kafka-${KAFKA_RESTORE_NAME}" \
+    --for=condition=Ready --timeout=600s
+
+log_substep "Creating S3 credentials Secret '${KAFKA_RESTORE_NAME}-backup-s3'..."
+# Same bucket as the source; the strategy reads the source-keyed object.
+create_s3_secret "$KAFKA_RESTORE_NAME"
+
+kubectl apply -f - <<EOF
+apiVersion: backups.cozystack.io/v1alpha1
+kind: RestoreJob
+metadata:
+  name: ${RESTOREJOB_TOCOPY_NAME}
+  namespace: ${NAMESPACE}
+spec:
+  backupRef:
+    name: ${BACKUP_NAME}
+  targetApplicationRef:
+    apiGroup: apps.cozystack.io
+    kind: Kafka
+    name: ${KAFKA_RESTORE_NAME}
+EOF
+
+log_substep "Waiting for to-copy RestoreJob to Succeed..."
+wait_for_field restorejob "$RESTOREJOB_TOCOPY_NAME" '{.status.phase}' Succeeded "$NAMESPACE" 600 Failed
+
+log_substep "Verifying topic records exist on the copy..."
+[[ -f "$SCRIPT_DIR/.source-dump.txt" ]] || { log_error "missing $SCRIPT_DIR/.source-dump.txt; run 04-create-kafka.sh first"; exit 1; }
+count=$(topic_message_count "$KAFKA_RESTORE_NAME")
+# Same numeric guard as step 06: an empty result means the topic is missing,
+# not a successful restore of zero records.
+[[ "$count" =~ ^[0-9]+$ ]] || { log_error "non-numeric record count on copy: '${count}' (topic missing?)"; exit 1; }
+# Exact count, not >=: see step 06 - a double-replay would inflate this.
+if (( count != MESSAGE_COUNT )); then
+    log_error "Record count on copy is ${count}; expected exactly ${MESSAGE_COUNT}"
+    exit 1
+fi
+# Content, not just count: the copy must match the source snapshot byte-for-byte.
+if ! diff -u "$SCRIPT_DIR/.source-dump.txt" <(topic_dump "$KAFKA_RESTORE_NAME"); then
+    log_error "Restored content on copy does not match the source snapshot"
+    exit 1
+fi
+# Shape too: the copy's topic must carry the replication factor the backup
+# captured from the source, not a default (see step 06).
+rf=$(topic_replication_factor "$KAFKA_RESTORE_NAME")
+if [[ "$rf" != "$TOPIC_REPLICAS" ]]; then
+    log_error "Replication factor on copy is '${rf}'; expected ${TOPIC_REPLICAS} as captured from the source"
+    exit 1
+fi
+log_success "To-copy restore verified: ${count} record(s) in '${TOPIC}' on '${KAFKA_RESTORE_NAME}' at replication factor ${rf}, content matches source."
+
+echo -e "\n${GREEN}${BOLD}Next:${NC} ./cleanup.sh"
diff --git a/examples/backups/kafka/90-scenario-admin-prepare.md b/examples/backups/kafka/90-scenario-admin-prepare.md
new file mode 100644
index 0000000000..42bc1d697e
--- /dev/null
+++ b/examples/backups/kafka/90-scenario-admin-prepare.md
@@ -0,0 +1,43 @@
+# Scenario: Cluster admin prepares Kafka topic-data backups
+
+A cluster administrator performs the cluster-level preparation once. Tenant admins can then back up and restore the topic data of their Kafka applications with a `BackupJob` or `RestoreJob` that references the BackupClass created here. The demo scripts around those jobs still need admin access, because they create Secrets and work through a CLI Pod; the README's step table says which part of each step a tenant admin can do.
+
+## Prerequisites
+
+- A running Cozystack cluster with the backup-controller and
+  backupstrategy-controller installed.
+- `kubectl` access with permissions to create cluster-scoped
+  `Job.strategy.backups.cozystack.io` and `BackupClass.backups.cozystack.io`.
+- Reachable S3-compatible storage. The demo uses the in-cluster `Bucket` app (step 03), and steps 04 and 07 turn its coordinates and the endpoint's CA into a `<app>-backup-s3` Secret that the strategy Pod reads. Creating that Secret needs admin access, since no tenant role grants `create` on `secrets`.
+
+## Steps
+
+```bash
+./01-create-strategy.sh        # Job strategy: stock Strimzi Kafka image + a shell script
+./02-create-backupclass.sh     # Maps Kind=Kafka -> the strategy, with the topics parameter
+```
+
+## What gets created
+
+| Resource | Scope | Purpose |
+|---|---|---|
+| `Job.strategy.backups.cozystack.io/kafka-job` | Cluster | PodTemplateSpec for a `quay.io/strimzi/kafka` Pod that drains the topics with `kafka-console-consumer`, replays them with `kafka-console-producer`, and moves a tarball to/from S3 with `curl --aws-sigv4` |
+| `BackupClass/kafka-backup` | Cluster | Maps `apps.cozystack.io/Kafka` to the strategy. `parameters.topics` selects the topics (empty = every non-internal topic); `parameters.replicationFactor`, when set, overrides the replication factor the backup captured when restore recreates a topic |
+
+## How the strategy template gets rendered
+
+The Job driver renders the `Job.spec.template` PodTemplateSpec with this
+context for every BackupJob/RestoreJob run:
+
+| Variable | Source |
+|---|---|
+| `.Application` | The `Kafka` (`apps.cozystack.io`) object referenced by the BackupJob (or `targetApplicationRef` on restore) — available to templates, though this one reads everything it needs from env |
+| `.Release.Name` / `.Release.Namespace` | `metadata.name` / `metadata.namespace` of `.Application` |
+| `.Parameters` | `BackupClass.spec.strategies[].parameters` (`topics`, `replicationFactor`); snapshotted onto the Backup's `driverMetadata` so restore re-renders with the same values |
+| `.Mode` | `"backup"` or `"restore"` |
+| `.Backup` | `{ Name, Namespace, ApplicationRef.{APIGroup,Kind,Name} }` (only for restore runs; `.ApplicationRef` points at the *source* release so to-copy restores read the source's S3 key) |
+
+The same template renders both backup and restore Pods. The engine templates
+each string field independently and cannot restructure the Pod per mode, so
+the single Kafka container branches at runtime: `MODE` (from `{{ .Mode }}`)
+selects drain + S3 `PUT` vs. S3 `GET` + recreate + replay.
diff --git a/examples/backups/kafka/91-scenario-user-backup.md b/examples/backups/kafka/91-scenario-user-backup.md
new file mode 100644
index 0000000000..9bff52ee30
--- /dev/null
+++ b/examples/backups/kafka/91-scenario-user-backup.md
@@ -0,0 +1,55 @@
+# Scenario: User backs up Kafka topic data
+
+This scenario assumes the admin steps (`01-...`, `02-...`) have already run.
+
+The user's own action here, at the tenant admin level, is the `BackupJob` in step 05, plus creating the `Bucket` and the `Kafka`. Steps 03 and 04 as scripted need admin access: they read and create Secrets, wait on HelmReleases and operator resources, and seed the topic through a CLI Pod, which no tenant role allows. The README's step table has the details.
+
+## Prerequisites
+
+- Tenant namespace (default: `tenant-root`, the tenant whose Pods can reach
+  the in-cluster seaweedfs; see the README).
+- A Cozystack `Bucket` (step 03) and the `<app>-backup-s3` Secret derived from it (step 04). The generic `Job` strategy has no chart support to emit this Secret, so step 04 creates it from the bucket's `BucketInfo` plus the S3 endpoint's CA (see `create_s3_secret` in `00-helpers.sh`). Creating it needs admin access.
+- A `Kafka` application with at least one plain (neither compacted nor
+  transactional) topic holding data.
+
+## Steps
+
+```bash
+./03-create-bucket.sh        # Provision Bucket, cache its credentials and the endpoint CA
+./04-create-kafka.sh         # Provision Kafka, create the S3 Secret, seed a topic
+./05-create-backupjob.sh     # Submit BackupJob and wait for Succeeded
+```
+
+## What happens during backup
+
+1. The user submits a `BackupJob` referencing the Kafka instance and the
+   `kafka-backup` BackupClass.
+2. The backup-controller resolves the BackupClass → `Job` strategy and renders
+   the Pod template against the user's Kafka application, with `.Mode="backup"`.
+3. A `batch/v1.Job` (owned by the BackupJob via `OwnerReferences`) is created
+   in the tenant namespace. Its single Strimzi Kafka container:
+   - resolves the topic list from `parameters.topics` (or every non-internal
+     topic), refusing a name outside Kafka's charset or listed twice;
+   - for each topic reads every partition's begin and end offset once, its
+     `PartitionCount` and `ReplicationFactor`, and refuses the run if the
+     offset listing is short of the partition count;
+   - drains `[begin, end)` of each partition with `kafka-console-consumer`
+     into one `key<TAB>value` file per partition, refusing the run on a short
+     read;
+   - writes a manifest (`topic partition begin end replicationFactor` per
+     line), `tar`s everything and `PUT`s it to
+     `s3://<bucket>/<namespace>/<release>/kafka-topics.tar` using
+     `curl --aws-sigv4`, verified against the CA from the Secret.
+4. The controller watches the Job's terminal condition. On `Complete` it
+   creates a `Backup` CR in the same namespace, recording the BackupClass
+   parameters under `spec.driverMetadata` (the `parameter/` prefix), so a later
+   restore re-renders the strategy with the same `topics` and
+   `replicationFactor`.
+
+## Result
+
+| Resource | Where | Purpose |
+|---|---|---|
+| `BackupJob/<bj-name>` | tenant namespace | Records the run; `status.phase=Succeeded`, `status.backupRef` points at the Backup |
+| `Backup/<bj-name>` | tenant namespace | The restorable artifact reference (the tarball lives in S3 under `<namespace>/<release>/kafka-topics.tar`); step 05 caches its name in `.backup-name.env` for the restore steps |
+| `batch/v1.Job/<bj-name>-backup` | tenant namespace | The completed strategy Pod |
diff --git a/examples/backups/kafka/92-scenario-user-restore.md b/examples/backups/kafka/92-scenario-user-restore.md
new file mode 100644
index 0000000000..3215fe056e
--- /dev/null
+++ b/examples/backups/kafka/92-scenario-user-restore.md
@@ -0,0 +1,79 @@
+# Scenario: User restores a Kafka topic-data backup
+
+Two restore variants are supported. Both append: the strategy recreates a
+topic only if it is absent and then replays every record, so it refuses a
+target topic that already holds data.
+
+The user's own action in both variants, at the tenant admin level, is the `RestoreJob`, plus the second `Kafka` in variant B. The scripts as written need admin access: variant A deletes and checks the topic through a CLI Pod and reads the refused restore's Pod log, and variant B checks the topic the same way, creates the target's Secret and waits on its `HelmRelease` and Strimzi `Kafka`, none of which a tenant role allows. The README's step table has the details.
+
+## A. In-place restore
+
+Restore back into the same Kafka application.
+
+```bash
+./06-restore-in-place.sh
+```
+
+The script:
+
+1. Deletes the topic on the source instance (simulating data loss) and waits
+   for it to disappear. The topic **must be absent or empty** before the
+   `RestoreJob` is submitted — the caller is responsible for that.
+2. Creates a `RestoreJob` whose `spec.backupRef.name` is the Backup name (from
+   `.backup-name.env`) and does **not** set `spec.targetApplicationRef`. Per
+   the API contract, the driver restores into `backup.spec.applicationRef`.
+3. The Job driver renders the strategy Pod with `.Mode="restore"`. The Pod
+   `GET`s `s3://<bucket>/<namespace>/<source>/kafka-topics.tar`, untars it,
+   validates the manifest, recreates each topic with its original partition
+   count and replication factor (or the `replicationFactor` override),
+   confirms the topic's shape and that it is empty, then replays the
+   partition files topic by topic with `kafka-console-producer` and checks
+   the record count that landed. In-place, the source and target are the
+   same app, so the S3 key resolves to the original.
+4. After the Pod succeeds, the script verifies the record count, diffs the
+   content against the snapshot taken in step 04, and checks that the
+   restored topic carries the replication factor captured from the source.
+5. It then submits a second `RestoreJob` against the now-populated topic and
+   requires it to settle `Failed` — every strategy Pod attempt stops at the
+   emptiness check — with the topic unchanged.
+
+## B. To-copy restore
+
+Restore into a **different** Kafka application instance.
+
+```bash
+./07-restore-to-copy.sh
+```
+
+The script:
+
+1. Provisions a second `Kafka/kafka-restore` with the same broker count in the
+   **same** namespace as the RestoreJob, and creates its `<target>-backup-s3`
+   Secret pointing at the same bucket. `RestoreJob.spec.targetApplicationRef`
+   is `corev1.TypedLocalObjectReference` (no `namespace` field), so the driver
+   always restores into `restoreJob.Namespace`; cross-namespace restore is
+   intentionally not supported.
+2. Creates a `RestoreJob` with
+   `spec.targetApplicationRef = { kind: Kafka, name: kafka-restore }`.
+3. The Job driver fetches the *target* application and renders the Pod with
+   `.Release.Name=kafka-restore` (so it connects to the target and reads the
+   target's S3 Secret), but keys the S3 object by the *source* via
+   `.Backup.ApplicationRef.Name` — so the copy reads what the source wrote.
+4. The script verifies the record count, content and replication factor on
+   the copy.
+
+## Notes
+
+- Both flows rely on the strategy template branching on `.Mode`. See
+  `01-create-strategy.sh`.
+- A restore Pod that dies mid-replay is retried by the Job's `backoffLimit`,
+  and the retry stops at the emptiness check on the first topic the dead Pod
+  had already replayed. The Pod log names each topic before its replay and
+  again once it landed; empty or delete every topic it shows as started, not
+  only the one the refusal names, then re-run.
+- The tarball in object storage is not managed by the Cozystack `Backup`
+  lifecycle: deleting the `Backup` CR removes the reference but leaves the S3
+  object in place. Tenants who need to reclaim space should delete the object
+  (or set a bucket lifecycle policy).
+- Consumer-group offsets, topic configs, ACLs and users are not part of the
+  backup; consumers start from the restored topic's fresh offsets.
diff --git a/examples/backups/kafka/README.md b/examples/backups/kafka/README.md
new file mode 100644
index 0000000000..0a70558cdf
--- /dev/null
+++ b/examples/backups/kafka/README.md
@@ -0,0 +1,69 @@
+# Kafka topic-data backup/restore example
+
+This directory shows how to back up and restore the **topic data** of a Cozystack-managed `Kafka` application using the **generic `Job` backup strategy**. Unlike the app-specific drivers (Altinity for ClickHouse, CNPG for Postgres, ...), the `Job` strategy has no built-in knowledge of the application: it runs a Pod the operator supplies. Here that Pod is a stock [Strimzi Kafka image][strimzi-image] (which carries the `kafka-*.sh` CLI plus `bash`, `curl` and `tar`) running one shell script:
+
+- **backup**: freeze each partition's end offset, drain `[begin, end)` with `kafka-console-consumer` → `tar` → `PUT` the tarball to S3.
+- **restore**: `GET` the tarball from S3 → `tar -x` → recreate the topics with their original partition count and replication factor → replay every partition file with `kafka-console-producer`.
+
+The same `PodTemplateSpec` serves both directions. The strategy engine templates each string field independently — it cannot add or remove containers per mode — so the single image branches at runtime on `{{ .Mode }}` (rendered into the `MODE` env var). Backup pushes to a key scoped by the source app (`{{ .Release.Name }}`); restore reads the key scoped by the backup's source (`{{ .Backup.ApplicationRef.Name }}`), so a to-copy restore lands the source's data into a differently-named target. The upload uses `curl --aws-sigv4`, so no purpose-built backup image is needed — a stock client image plus a shell script is the whole driver.
+
+## Consistency model
+
+The backup takes a **frozen-end-offset cut**. For each topic the driver reads every partition's end offset once (`kafka-get-offsets --time -1`) and its begin offset (`--time -2`), then drains only up to the frozen end. Anything produced after that read (offset ≥ the frozen end) is excluded, so a topic's partitions are captured as of the same instant — a coherent point-in-time view of that topic. The reads happen per topic, so the cut is atomic within a topic but not across topics (Kafka offers no cross-topic guarantee regardless). This needs no dependency on record timestamps: it is a cut by log position, not by wall-clock time.
+
+## Scope and limitations
+
+This is a **logical DATA backup**, deliberately narrow — it captures topic records (key + value) and nothing else:
+
+- **Not captured**: topic configs (retention, compaction, `min.insync.replicas`), ACLs, SCRAM users, and **consumer-group offsets**. Restore recreates each topic with its original partition count and its original replication factor: the backup manifest records the `ReplicationFactor` that `kafka-topics --describe` reports for every topic, and restore recreates the topic with it. That is not cosmetic. The Cozystack Kafka chart raises the broker-level `min.insync.replicas` to 2 as soon as `kafka.replicas` reaches 2, the console producer writes with `acks=all`, and a broker rejects every such write into a topic whose replication factor is below its `min.insync.replicas` — while the producer logs the rejection and exits 0. A topic recreated with too few replicas would therefore be restored *empty* and fail the post-replay count with a misleading message. The `replicationFactor` BackupClass parameter overrides the captured value, which is the way to restore into a cluster with fewer brokers than the source; a value the target cannot host fails at `--create` in Kafka's own words, before any replay. The converse is checked too: after the create, the driver reads the topic's effective `min.insync.replicas` with `kafka-configs --describe --all` and refuses, before replaying, a replication factor below it, naming the parameter to raise, since the alternative is an empty replay reported as a count shortfall. Like every parameter it is snapshotted onto the Backup at backup time, so it has to be set on the BackupClass before the BackupJob whose Backup will be restored.
+- **Offsets change on restore**: restore re-produces records, so the target assigns fresh offsets. A consumer group's committed position from the source is therefore meaningless on the restored cluster. Preserving consumer offsets requires either offset translation or a byte-identical volume-snapshot restore (Velero/CSI) — neither is in scope here.
+- **Topic names are matched literally**: `kafka-topics` and `kafka-get-offsets` treat `--topic` as a Java regex, so a name carrying a metacharacter would otherwise select its siblings (`audit.events` also matches `audit-events`) — deleting, measuring or backing up the wrong topic. Every filtering call here pins the name with `\Q...\E`; `--create` and the console producer/consumer take a literal name and are left unquoted. The demo is set up so this cannot silently regress: the topic is `orders.v1` and a decoy `orders-v1` sits beside it, matching the first as a regex but not as a literal. The decoy is never named in the `BackupClass`, so a correct run leaves it untouched, and removing a pin from the offset listing, from the in-place `--delete` or from either record count reddens the suite: the partition-set guard counts the decoy's partitions, the `--delete` takes the decoy with it, and the pre- and post-replay counts pick up its records. Two pins are *not* covered by it: `kafka-topics --describe` returns topics in the admin client's result-map order rather than sorted, so which topic the two `PartitionCount` reads see through `head -1` is not something a fixture can pin down. The begin-offset lookups need no pin at all — they match on the whole `topic:partition` key, so a line belonging to another topic cannot supply this partition's begin. The `topics` parameter itself is held to Kafka's `[a-zA-Z0-9._-]` name charset and refused on a repeated name: a duplicate would run the per-topic block twice, overwriting its own data files under a manifest that then lists every partition twice, and no restore of that backup could ever balance its count.
+- **Fidelity**: records are round-tripped as `key<TAB>value` text via the console tools, so keys and values must be newline- and tab-free. Message headers and record timestamps are not preserved. A production driver would use a binary-safe client (e.g. a purpose-built image) for arbitrary payloads.
+- **Compacted and transactional topics are out of scope**: the drain reads exactly `end - begin` records per partition, which equals the consumable count only on a plain topic. On a compacted topic (sparse offsets) or one written by transactional producers (control markers occupy offsets but are never delivered), fewer records are consumable. `kafka-console-consumer` does not report this — it idles to its `--timeout-ms` and still exits 0 — so the strategy compares the drained line count against `end - begin` and **fails the backup** on any shortfall rather than uploading a partial tarball. The partition *set* is checked the same way, because `kafka-get-offsets` lists only the partitions whose lookup succeeded and still exits 0: the number of partitions it returned is compared against the topic's own `PartitionCount`, so one skipped by a leader election mid-backup fails the run instead of silently vanishing from it. Note the interaction with the parameter default: an empty `topics` backs up *every* non-internal topic, so the all-topics setting is the riskiest, not the safest — one compacted or transactional topic in the namespace aborts the whole run. Restrict `topics` to topics you know are plain, or accept that the default may fail closed. Conversely, if `topics` is empty and the namespace holds only internal topics, the loop backs up nothing: an empty tarball is uploaded and the `Backup` reports `Succeeded`. That is correct for a genuinely empty cluster, but confirm the source actually held user topics before trusting such a run — the restore side refuses such an artifact outright (`manifest is empty`), so an empty backup is not a restorable one.
+- **Partition placement**: keyed records re-produce into the same partition because the topic is recreated with the same partition count and the default (murmur2) partitioner is deterministic. Null-key records fare worse: the dump renders a null key as the literal string `null` (the console formatter's default) and the replay reads it back as a four-byte `null` key — so the record not only lands in an unpredictable partition but has its key changed from null to `"null"`, which shifts its compaction identity downstream.
+- **Restore appends, it does not replace**: the driver creates the topic only if absent (`--create --if-not-exists`) and then replays every record, so restoring into a topic that still holds data adds to it rather than overwriting. Restore is safe only against an absent or empty topic — the in-place step below deletes the topic first for exactly this reason. An empty topic is not enough on its own: `--if-not-exists` leaves a pre-existing topic's partition count alone, which would silently re-place every keyed record, so the driver also compares the target's `PartitionCount` against the backup and refuses a differently shaped topic. The driver enforces the emptiness too: it reads the target's record count before replaying and refuses a topic that already holds data, so the strategy Job's `backoffLimit: 2` — which retries a Pod that died mid-replay — cannot stack a second copy on top of a partial one. That pre-replay count is held to the topic's own partition count the same way the backup side is, because a listing shortened by a leader election in flight would otherwise sum the surviving empty partitions to zero and let the replay through. The in-place step drives this path on purpose: after the restore it submits a second `RestoreJob` against the populated topic and requires it to settle `Failed` with the topic unchanged. A retry after a Pod died mid-replay stops at that check on the first topic the dead Pod had already replayed and settles `Failed` too; the restore Pod's log names each topic before replaying it and again once it has landed, so the log says which topics still hold a partial copy. The remedy is to empty or delete every topic the log shows as replayed or started — not only the one the refusal names — and re-run. The post-replay count check then still verifies what landed.
+- **Each backup overwrites the previous one**: the S3 object key is `<namespace>/<app>/kafka-topics.tar` with no run identifier, so every `Backup` of the same application resolves to the same tarball and restoring an older `Backup` restores the latest data. The generic `Job` driver exposes no unique per-run handle at backup time — the `Backup` artifact is created only after the Job completes — so a per-run key would need a driver change.
+- **Local disk usage is unbounded**: the drain stages the whole topic under `/tmp` and then again as a tarball on the Pod's writable layer, and the strategy Pod requests no `ephemeral-storage`. A large topic can fill the node's ephemeral storage and evict other Pods; set an `ephemeral-storage` request and limit sized to your data before backing up anything substantial.
+- **TLS is verified against the endpoint's CA**: the in-cluster seaweedfs presents a self-signed certificate, so `03-create-bucket.sh` caches its CA (the `seaweedfs-ca-cert` Secret in `tenant-root`, or the cert-manager CA `Certificate` it discovers when that name is absent) and `create_s3_secret` adds it as `ca.crt` to each `<app>-backup-s3` Secret. The strategy Pod projects that one key as a file and points `curl --cacert` at it; a Secret without the key leaves the file absent and curl falls back to the image's trust store, which is the right behaviour for a publicly-trusted endpoint — set `S3_CA_SECRET=""` to skip the copy there, since `--cacert` replaces the system bundle rather than extending it. The `rabbitmq` example mounts the same CA for the same reason.
+- **Pod Security**: the strategy Pod and the demo's CLI Pod set `runAsNonRoot`, `allowPrivilegeEscalation: false`, drop all capabilities and a `RuntimeDefault` seccomp profile, so they satisfy the `restricted` Pod Security Standard on the stock Strimzi image, which runs as non-root UID 1001. Pinning an image that runs as root would need a `runAsUser` suited to that image instead.
+
+For a faithful, offset-preserving Kafka backup, prefer a volume-snapshot strategy over this logical one; this example exists to show the generic `Job` path end to end.
+
+## Step order
+
+| File | Role | Triggered by |
+|---|---|---|
+| `00-helpers.sh` | Shared bash helpers, env defaults, and the kafka-CLI / S3-secret helpers; sourced by every step. | n/a |
+| `01-create-strategy.sh` | Creates the cluster-scoped `Job` strategy (the Kafka backup/restore `PodTemplateSpec`). | admin |
+| `02-create-backupclass.sh` | Maps `apps.cozystack.io/Kafka` to that strategy, with the `topics` parameter (and the optional `replicationFactor` override). | admin |
+| `03-create-bucket.sh` | Provisions a `Bucket` and caches its S3 coordinates plus the endpoint's CA into `.bucket-info.env` (chmod 600; raw access keys). `cleanup.sh` removes this file. | **admin**. A tenant admin can create the `Bucket` itself, but the script also waits on its `HelmRelease` and COSI objects, reads the `bucket-<name>-backup` Secret, and copies the CA from a Secret in `tenant-root` (see the TLS bullet above); no tenant role grants access to `helmreleases` or `objectstorage.k8s.io`, or `get` on those Secrets |
+| `04-create-kafka.sh` | Provisions a two-broker `Kafka`, creates the `<app>-backup-s3` Secret, seeds a topic (replication factor 2) with sentinel messages. | **admin**. A tenant admin can create the `Kafka` itself, but the script also waits on its `HelmRelease` and Strimzi `Kafka`, creates the Secret, and seeds the topic through a CLI Pod it execs into; no tenant role grants access to `helmreleases` or `kafkas.kafka.strimzi.io`, `create` on `secrets` or `pods`, or `pods/exec` |
+| `05-create-backupjob.sh` | Submits a `BackupJob`, waits for Succeeded and caches the resolved `Backup` name into `.backup-name.env`. | tenant |
+| `06-restore-in-place.sh` | Deletes the topic and restores it into the same instance via `RestoreJob`, then submits a second `RestoreJob` that must be refused because the topic is no longer empty. | **admin**. A tenant admin can submit the two `RestoreJob`s, but the script deletes and checks the topic through the CLI Pod and reads the refusal from the restore Pod's log; no tenant role grants `create` on `pods` or `pods/exec`, or `get` on `pods/log` |
+| `07-restore-to-copy.sh` | Provisions a second two-broker `Kafka` and restores into it via `RestoreJob.spec.targetApplicationRef`. | **admin**, for the same reasons as step 04. The tenant admin's part is the second `Kafka` and the `RestoreJob` |
+| `cleanup.sh` | Removes everything created by the demo. | **admin**: it deletes Secrets, the `Backup`, and the cluster-scoped `BackupClass` and strategy, and no tenant role grants `delete` on any of them |
+| `run-all.sh` | Convenience runner that executes 01..07 in order. | demo |
+
+The scenario walk-throughs `90-scenario-admin-prepare.md`, `91-scenario-user-backup.md` and `92-scenario-user-restore.md` describe the same steps from the admin's and the tenant's side, and say which parts of the tenant's side need admin access.
+
+## Running
+
+```sh
+# Uses NAMESPACE=tenant-root by default; override any knob via the environment.
+./run-all.sh
+# ... or step by step, in numeric order.
+./cleanup.sh
+```
+
+The demo runs in `tenant-root` because that is where the in-cluster seaweedfs lives: a tenant created isolated has a Cilium egress allowlist that blocks its Pods from reaching it. Point `NAMESPACE` at another tenant only if its Pods can reach the S3 endpoint the `Bucket` advertises.
+
+Both Kafka instances run `KAFKA_REPLICAS` (default 2) brokers and the demo topics are created with `TOPIC_REPLICAS` (default 2) replicas. That is deliberate: with two brokers the chart sets `min.insync.replicas` to 2, so a restore that recreated the topic with the wrong replication factor could not land a single record, and the restore steps additionally assert that the restored topic carries the captured replication factor. A single-broker run (`KAFKA_REPLICAS=1 TOPIC_REPLICAS=1`) works too, but proves less.
+
+By default the scripts resolve `KAFKA_IMAGE` from the running Strimzi operator — the newest image in its `STRIMZI_KAFKA_IMAGES` map, tag- or digest-pinned — so the backup Pod reuses an image already cached on the nodes with no extra pull or version skew. Set `KAFKA_IMAGE` explicitly to pin a different one, for example on an air-gapped clone where the operator cannot be read (the backup Pod only needs the `kafka-*.sh` CLI plus `curl` and `tar`). To see what the operator ships:
+
+```sh
+kubectl -n cozy-kafka-operator get deploy strimzi-cluster-operator \
+  -o jsonpath='{range .spec.template.spec.containers[0].env[*]}{.name}={.value}{"\n"}{end}' | grep KAFKA_IMAGES
+```
+
+[strimzi-image]: https://quay.io/repository/strimzi/kafka
diff --git a/examples/backups/kafka/cleanup.sh b/examples/backups/kafka/cleanup.sh
new file mode 100755
index 0000000000..0e3340a48d
--- /dev/null
+++ b/examples/backups/kafka/cleanup.sh
@@ -0,0 +1,53 @@
+#!/bin/bash
+# Cleanup: tear down everything provisioned by the demo so the cluster returns
+# to its previous state.
+set -uo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "$SCRIPT_DIR/00-helpers.sh"
+
+print_header "Cleanup Kafka backup demo"
+
+# Fully qualify every kind: a Cozystack cluster serves four `backups` and two
+# `buckets` CRDs, so a bare `kubectl delete backup`/`bucket` may resolve to a
+# foreign group whose miss --ignore-not-found then swallows, leaving this demo's
+# Cozystack Backup behind for the next run's createJobBackupArtifact to reuse.
+kubectl -n "$NAMESPACE" delete restorejob.backups.cozystack.io "$RESTOREJOB_TOCOPY_NAME" --ignore-not-found
+kubectl -n "$NAMESPACE" delete restorejob.backups.cozystack.io "$RESTOREJOB_NONEMPTY_NAME" --ignore-not-found
+kubectl -n "$NAMESPACE" delete restorejob.backups.cozystack.io "$RESTOREJOB_INPLACE_NAME" --ignore-not-found
+kubectl -n "$NAMESPACE" delete backupjob.backups.cozystack.io "$BACKUPJOB_NAME" --ignore-not-found
+# The Backup's resolved name is cached by step 05; a run that never got there
+# can only have left one named after the BackupJob.
+BACKUP_NAME="$BACKUPJOB_NAME"
+# shellcheck disable=SC1091
+[[ -f "$SCRIPT_DIR/.backup-name.env" ]] && source "$SCRIPT_DIR/.backup-name.env"
+kubectl -n "$NAMESPACE" delete backups.backups.cozystack.io "$BACKUP_NAME" --ignore-not-found
+kubectl -n "$NAMESPACE" delete secret "${KAFKA_RESTORE_NAME}-backup-s3" --ignore-not-found
+kubectl -n "$NAMESPACE" delete secret "${KAFKA_NAME}-backup-s3" --ignore-not-found
+kubectl -n "$NAMESPACE" delete kafka.apps.cozystack.io "$KAFKA_RESTORE_NAME" --ignore-not-found
+kubectl -n "$NAMESPACE" delete kafka.apps.cozystack.io "$KAFKA_NAME" --ignore-not-found
+kubectl -n "$NAMESPACE" delete bucket.apps.cozystack.io "$BUCKET_NAME" --ignore-not-found
+kubectl -n "$NAMESPACE" delete pod -l cozystack.io/backup-demo=kafka --grace-period=1 --ignore-not-found
+rm -f "$SCRIPT_DIR/.bucket-info.env" "$SCRIPT_DIR/.source-dump.txt" "$SCRIPT_DIR/.backup-name.env"
+kubectl delete backupclass.backups.cozystack.io "$BACKUPCLASS_NAME" --ignore-not-found
+kubectl delete job.strategy.backups.cozystack.io "$STRATEGY_NAME" --ignore-not-found
+
+# `kubectl delete` returns as soon as deletionTimestamp is set, while the
+# HelmRelease uninstall behind each Kafka app (two StatefulSets, ZooKeeper and
+# their PVCs) is still draining. Returning here lets the next suite start into a
+# namespace whose predecessor is still uninstalling - the neighbouring
+# chainsaw/kafka Test's PVC-reclaim step contends with exactly that. Wait for
+# the heavy objects to actually go, and with teeth: without `set -e` an absent
+# resource cannot abandon the rest of the teardown, so the waits record their
+# own failure and the script exits non-zero when the teardown did not settle.
+teardown_rc=0
+wait_deleted kafka.apps.cozystack.io "$KAFKA_RESTORE_NAME" 180 || teardown_rc=1
+wait_deleted kafka.apps.cozystack.io "$KAFKA_NAME" 180 || teardown_rc=1
+wait_deleted bucket.apps.cozystack.io "$BUCKET_NAME" 180 || teardown_rc=1
+
+if [[ $teardown_rc -ne 0 ]]; then
+    log_error "Cleanup did not settle: see the resources reported above. Failing rather than leaving a half-uninstalled release for the next test to trip over."
+    exit 1
+fi
+
+log_success "Cleanup complete."
diff --git a/examples/backups/kafka/run-all.sh b/examples/backups/kafka/run-all.sh
new file mode 100755
index 0000000000..9c1aaddcbe
--- /dev/null
+++ b/examples/backups/kafka/run-all.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+# Run every numbered step in order. Stops on the first failure.
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
+for step in 01 02 03 04 05 06 07; do
+    # find is glob-safe under set -euo pipefail and degrades to empty output
+    # when no file matches, unlike `ls glob | head` which mixes shell
+    # expansion semantics with `ls` exit codes.
+    script="$(find "$SCRIPT_DIR" -maxdepth 1 -type f -name "${step}-*.sh" | sort | head -n1)"
+    if [[ -z "$script" ]]; then
+        echo "no script found for step $step" >&2
+        exit 1
+    fi
+    echo "=== Running $(basename "$script") ==="
+    bash "$script"
+done
diff --git a/examples/backups/mariadb/00-bucket.yaml b/examples/backups/mariadb/00-bucket.yaml
index cfcb6b8ec7..05b011087d 100644
--- a/examples/backups/mariadb/00-bucket.yaml
+++ b/examples/backups/mariadb/00-bucket.yaml
@@ -1,6 +1,7 @@
 # Cozystack-managed S3 bucket for storing MariaDB backups. The Bucket
-# controller provisions a Secret named "<bucket>-<username>" per user; the
-# MariaDB strategy below references the "backup" user's Secret.
+# controller provisions a Secret named "bucket-<bucket>-<username>" per
+# user (the bucket app carries the "bucket-" release prefix); the MariaDB
+# strategy below references the "backup" user's Secret.
 ---
 apiVersion: apps.cozystack.io/v1alpha1
 kind: Bucket
diff --git a/examples/backups/mariadb/00-helpers.sh b/examples/backups/mariadb/00-helpers.sh
new file mode 100755
index 0000000000..32f4c01d97
--- /dev/null
+++ b/examples/backups/mariadb/00-helpers.sh
@@ -0,0 +1,123 @@
+#!/bin/bash
+# Shared helpers for the MariaDB backup/restore demo.
+# Source this file in other scripts: source "$(dirname "$0")/00-helpers.sh"
+
+export RED='\033[0;31m'
+export GREEN='\033[0;32m'
+export YELLOW='\033[1;33m'
+export BLUE='\033[0;34m'
+export MAGENTA='\033[0;35m'
+export CYAN='\033[0;36m'
+export WHITE='\033[1;37m'
+export NC='\033[0m'
+export BOLD='\033[1m'
+
+# Default settings (override via environment).
+export NAMESPACE="${NAMESPACE:-tenant-root}"
+export BUCKET_NAME="${BUCKET_NAME:-mariadb-backups}"
+# Bucket user declared in 00-bucket.yaml; the COSI flow materialises the
+# credentials Secret as "bucket-<bucket>-<user>".
+export BUCKET_USER="${BUCKET_USER:-backup}"
+export MARIADB_SRC_NAME="${MARIADB_SRC_NAME:-mariadb-src}"
+export MARIADB_TARGET_NAME="${MARIADB_TARGET_NAME:-mariadb-target}"
+# The mariadb-rd ApplicationDefinition renders the HelmRelease with
+# releaseName = "mariadb-" + appName (release.prefix in
+# packages/system/mariadb-rd/cozyrds/mariadb.yaml), so the operator-side
+# k8s.mariadb.com/MariaDB CR (and its primary Service) is mariadb-<app>.
+export MARIADB_SRC_CR="mariadb-${MARIADB_SRC_NAME}"
+export MARIADB_TARGET_CR="mariadb-${MARIADB_TARGET_NAME}"
+export STRATEGY_NAME="${STRATEGY_NAME:-mariadb-strategy-default}"
+export BACKUPCLASS_NAME="${BACKUPCLASS_NAME:-mariadb-default}"
+export BACKUPJOB_NAME="${BACKUPJOB_NAME:-mariadb-src-adhoc}"
+export RESTOREJOB_TOCOPY_NAME="${RESTOREJOB_TOCOPY_NAME:-mariadb-src-to-mariadb-target}"
+export PLAN_NAME="${PLAN_NAME:-mariadb-src-daily}"
+# App user the demo writes and reads the sentinel row as. Its password is
+# chart-generated (the charts no longer accept a plaintext password) and read
+# from the release's <cr>-credentials Secret by mysql_exec at call time.
+export MARIADB_APP_USER="${MARIADB_APP_USER:-app}"
+
+# S3 endpoint CA. cozystack's default seaweedfs serves its S3 endpoint with a
+# self-signed certificate whose CA lives in this Secret; the demo copies its
+# ca.crt into a per-app Secret the mariadb-operator Backup CR trusts via
+# storage.s3.tls.caSecretKeyRef. The name follows the seaweedfs chart's
+# fullnameOverride ("seaweedfs" -> "seaweedfs-ca-cert"); run-all.sh
+# auto-discovers the CA Certificate's actual secret when this default is
+# absent, so an upstream fullname change does not silently break the copy. On
+# a cluster whose S3 endpoint is signed by a publicly-trusted CA, set
+# S3_CA_SECRET="" to skip the copy and drop the tls block from the manifests.
+export S3_CA_SECRET="${S3_CA_SECRET:-seaweedfs-ca-cert}"
+export S3_CA_NAMESPACE="${S3_CA_NAMESPACE:-tenant-root}"
+export S3_CA_KEY="${S3_CA_KEY:-ca.crt}"
+
+log_info()    { echo -e "${BLUE}i${NC} $*" >&2; }
+log_success() { echo -e "${GREEN}OK${NC} $*" >&2; }
+log_warning() { echo -e "${YELLOW}!${NC} $*" >&2; }
+log_error()   { echo -e "${RED}x${NC} $*" >&2; }
+log_step()    { echo -e "\n${MAGENTA}${BOLD}> $*${NC}" >&2; }
+log_substep() { echo -e "${CYAN}  -> $*${NC}" >&2; }
+
+print_header() {
+    echo -e "\n${MAGENTA}${BOLD}== $1 ==${NC}\n" >&2
+}
+
+# wait_for_field, wait_hr_ready and wait_deleted live in one file shared by
+# every backup walkthrough, so a fix to one reaches all of them.
+# shellcheck source-path=SCRIPTDIR source=../_lib/wait-helpers.sh
+source "$(dirname "${BASH_SOURCE[0]}")/../_lib/wait-helpers.sh"
+
+# Name of the primary pod of a k8s.mariadb.com/MariaDB CR (the writer).
+# mariadb-operator 25.10.x reports the primary identity on
+# MariaDB.status.currentPrimary rather than a pod label, so read it there.
+mariadb_primary_pod() {
+    local cr="$1"
+    kubectl -n "$NAMESPACE" get mariadbs.k8s.mariadb.com "$cr" \
+        -o jsonpath='{.status.currentPrimary}' 2>/dev/null
+}
+
+# Run a single SQL statement against a MariaDB CR's primary as the app user,
+# routing through the operator-managed primary Service (mariadb-<app>-primary).
+# Args: <cr-name> <sql>
+mysql_exec() {
+    local cr="$1" sql="$2"
+    local pod pass
+    pod=$(mariadb_primary_pod "$cr")
+    [[ -n "$pod" ]] || { log_error "no primary pod for MariaDB CR '$cr'"; return 1; }
+    pass=$(kubectl -n "$NAMESPACE" get secret "${cr}-credentials" -o json \
+        | jq -r --arg u "$MARIADB_APP_USER" '.data[$u] // empty' | base64 -d)
+    [[ -n "$pass" ]] || { log_error "no password for '$MARIADB_APP_USER' in ${cr}-credentials"; return 1; }
+    kubectl -n "$NAMESPACE" exec "$pod" -c mariadb -- \
+        mariadb -u"$MARIADB_APP_USER" -p"$pass" -h "${cr}-primary" -e "$sql"
+}
+
+# Authenticate as root against a MariaDB CR's primary over TCP, using the
+# chart-generated root password in <cr>-credentials. root is the sharp edge on a
+# restore into a copy: the operator only applies rootPasswordSecretKeyRef at
+# datadir bootstrap, so if a restore overwrote the grant table with the source's
+# root hash the target's advertised root would be wrong for good. Args: <cr-name>
+mysql_root_login() {
+    local cr="$1"
+    local pod pass
+    pod=$(mariadb_primary_pod "$cr")
+    [[ -n "$pod" ]] || { log_error "no primary pod for MariaDB CR '$cr'"; return 1; }
+    pass=$(kubectl -n "$NAMESPACE" get secret "${cr}-credentials" \
+        -o "jsonpath={.data['root']}" | base64 -d)
+    [[ -n "$pass" ]] || { log_error "no root password in ${cr}-credentials"; return 1; }
+    kubectl -n "$NAMESPACE" exec "$pod" -c mariadb -- \
+        mariadb -uroot -p"$pass" -h "${cr}-primary" -e "SELECT 1;"
+}
+
+# Run a single SQL statement against a MariaDB CR's primary as root over TCP.
+# Used for statements the app user is not privileged for (CREATE USER / GRANT),
+# e.g. seeding an out-of-band account the chart does not declare. root has no dot,
+# so a plain jsonpath read of its key is safe here. Args: <cr-name> <sql>
+mysql_root_exec() {
+    local cr="$1" sql="$2"
+    local pod pass
+    pod=$(mariadb_primary_pod "$cr")
+    [[ -n "$pod" ]] || { log_error "no primary pod for MariaDB CR '$cr'"; return 1; }
+    pass=$(kubectl -n "$NAMESPACE" get secret "${cr}-credentials" \
+        -o "jsonpath={.data['root']}" | base64 -d)
+    [[ -n "$pass" ]] || { log_error "no root password in ${cr}-credentials"; return 1; }
+    kubectl -n "$NAMESPACE" exec "$pod" -c mariadb -- \
+        mariadb -uroot -p"$pass" -h "${cr}-primary" -e "$sql"
+}
diff --git a/examples/backups/mariadb/05-mariadb-src.yaml b/examples/backups/mariadb/05-mariadb-src.yaml
index 6c03d89942..4f9986cf74 100644
--- a/examples/backups/mariadb/05-mariadb-src.yaml
+++ b/examples/backups/mariadb/05-mariadb-src.yaml
@@ -24,5 +24,4 @@ spec:
           - app
   users:
     app:
-      password: REPLACE_WITH_PASSWORD
       maxUserConnections: 100
diff --git a/examples/backups/mariadb/10-mariadb-strategy.yaml b/examples/backups/mariadb/10-mariadb-strategy.yaml
index 7435141c69..995793848d 100644
--- a/examples/backups/mariadb/10-mariadb-strategy.yaml
+++ b/examples/backups/mariadb/10-mariadb-strategy.yaml
@@ -32,8 +32,8 @@ spec:
         # so deploy a per-app Secret named "<app>-mariadb-backup-creds"
         # holding AWS_ACCESS_KEY_ID / AWS_SECRET_ACCESS_KEY extracted from
         # BucketInfo (extract the access key id / secret access key from
-        # the BucketInfo JSON and project them under those two keys; a
-        # bats e2e harness lands in a follow-up PR).
+        # the BucketInfo JSON and project them under those two keys;
+        # run-all.sh in this directory does this automatically).
         accessKeyIdSecretKeyRef:
           name: "{{ .Application.metadata.name }}-mariadb-backup-creds"
           key: "AWS_ACCESS_KEY_ID"
diff --git a/examples/backups/mariadb/30-mariadb-target.yaml b/examples/backups/mariadb/30-mariadb-target.yaml
index fb5da0152d..d859ae5a0b 100644
--- a/examples/backups/mariadb/30-mariadb-target.yaml
+++ b/examples/backups/mariadb/30-mariadb-target.yaml
@@ -12,11 +12,11 @@
 # mariadb-src; replicate this whenever you want to verify a restore
 # under non-root credentials.
 #
-# Same-namespace to-copy flows are smoke-testable manually by applying
-# this manifest alongside mariadb-src. Cross-tenant restores (target in
-# tenant-test, source's seaweedfs in tenant-root) are blocked by the
-# per-tenant Cilium egress policy and stay a manual / dev-cluster flow.
-# A dedicated bats e2e harness will land in a follow-up PR.
+# Same-namespace to-copy flows are exercised by run-all.sh in this
+# directory (and by the mariadb-2-backup-roundtrip Chainsaw suite).
+# Cross-tenant restores (target in tenant-test, source's seaweedfs in
+# tenant-root) are blocked by the per-tenant Cilium egress policy and
+# stay a manual / dev-cluster flow.
 ---
 apiVersion: apps.cozystack.io/v1alpha1
 kind: MariaDB
@@ -32,5 +32,4 @@ spec:
           - app
   users:
     app:
-      password: REPLACE_WITH_PASSWORD
       maxUserConnections: 100
diff --git a/examples/backups/mariadb/40-restorejob-to-copy.yaml b/examples/backups/mariadb/40-restorejob-to-copy.yaml
index d29d6f294e..93c9b5659c 100644
--- a/examples/backups/mariadb/40-restorejob-to-copy.yaml
+++ b/examples/backups/mariadb/40-restorejob-to-copy.yaml
@@ -4,10 +4,10 @@
 # dump into the running target while mariadb-src stays running and
 # untouched.
 #
-# Smoke-testable manually with kubectl apply -f for the same-namespace
-# happy path. The cross-tenant variant stays manual; see
-# 30-mariadb-target.yaml for the network-policy reason. A dedicated bats
-# e2e harness will land in a follow-up PR.
+# Driven for the same-namespace happy path by run-all.sh in this
+# directory (and the mariadb-2-backup-roundtrip Chainsaw suite); also
+# applicable manually with kubectl apply -f. The cross-tenant variant
+# stays manual; see 30-mariadb-target.yaml for the network-policy reason.
 ---
 apiVersion: backups.cozystack.io/v1alpha1
 kind: RestoreJob
diff --git a/examples/backups/mariadb/README.md b/examples/backups/mariadb/README.md
index 1a548d9ba7..97b2aa17e2 100644
--- a/examples/backups/mariadb/README.md
+++ b/examples/backups/mariadb/README.md
@@ -27,18 +27,29 @@ MariaDB application via the `strategy.backups.cozystack.io/v1alpha1`
 | 7 | `35-restorejob-in-place.yaml` | namespaced | Destructive restore back into the source. |
 | 8 | `40-restorejob-to-copy.yaml` | namespaced | Non-destructive restore into the target. |
 
-Replace `REPLACE_WITH_*` placeholders in `10-mariadb-strategy.yaml`
-(bucket, S3 endpoint) and `05-mariadb-src.yaml` (password) before
-applying.
-
-The MariaDB driver delegates execution to the open-source
-[mariadb-operator](https://github.com/mariadb-operator/mariadb-operator)
-(`k8s.mariadb.com` CRDs, already shipped with Cozystack). Backups
-materialise as `Backup` CRs and restores as `Restore` CRs in the
-application's namespace; the operator handles the actual `mariadb-dump`
-/ `mariadb-import` invocations.
-
-Same-namespace flows are smoke-testable manually with `kubectl apply -f`.
-Cross-tenant restores are blocked by the per-tenant Cilium egress policy
-and stay a manual flow. A dedicated bats e2e harness will land in a
-follow-up PR.
+The MariaDB driver delegates execution to the open-source [mariadb-operator](https://github.com/mariadb-operator/mariadb-operator) (`k8s.mariadb.com` CRDs, already shipped with Cozystack). Backups materialise as `Backup` CRs and restores as `Restore` CRs in the application's namespace; the operator handles the actual `mariadb-dump` / `mariadb-import` invocations.
+
+## Placeholders and derived Secrets
+
+`10-mariadb-strategy.yaml` carries `REPLACE_WITH_COSI_BUCKET_NAME` and `REPLACE_WITH_S3_ENDPOINT` (a path-style endpoint without scheme); the demo `app` user declared by `05-mariadb-src.yaml` / `30-mariadb-target.yaml` has a chart-generated password, not a substituted one. The strategy also references two Secrets, `<app>-mariadb-backup-creds` (the S3 credentials the mariadb-operator Backup reads) and `<app>-mariadb-backup-ca` (the CA it trusts for a self-signed endpoint), where `<app>` is the Cozystack application name. The strategy template renders those names against whichever application it drives, so the restore target needs its own pair too — a restore into `mariadb-target` looks up `mariadb-target-mariadb-backup-*`. `run-all.sh` resolves the placeholders from the provisioned `Bucket`'s `BucketInfo` Secret and materialises the pair for both the source and the target; editing by hand, you copy the coordinates from `kubectl -n <ns> get secret bucket-<bucket>-backup -o jsonpath='{.data.BucketInfo}'` and the CA from the seaweedfs CA secret in `tenant-root` (`seaweedfs-ca-cert` by default; `run-all.sh` auto-discovers it from the cert-manager Certificate if the name differs).
+
+Drop the `tls` block from `10-mariadb-strategy.yaml` (and set `S3_CA_SECRET=""` for `run-all.sh`) when the S3 endpoint is signed by a publicly-trusted CA.
+
+## Run it
+
+```sh
+# Defaults to NAMESPACE=tenant-root; override for a tenant namespace.
+NAMESPACE=tenant-root examples/backups/mariadb/run-all.sh
+# Tear everything down afterwards (idempotent).
+NAMESPACE=tenant-root examples/backups/mariadb/cleanup.sh
+```
+
+`S3_CA_NAMESPACE` defaults to `tenant-root` (where the shared seaweedfs and its CA live) independently of `NAMESPACE`. Running against a different tenant whose own seaweedfs CA lives elsewhere means overriding `S3_CA_NAMESPACE` (and `S3_CA_SECRET`) too, alongside `NAMESPACE`.
+
+`run-all.sh` writes a sentinel row into the source, waits for the `BackupJob` to reach `Succeeded`, restores to a copy with a to-copy `RestoreJob`, and asserts the sentinel round-tripped through S3 into the restored copy while the source is left untouched. Set `SKIP_RESTORE=1` to stop after a successful backup.
+
+Same-namespace flows are the supported path. Cross-tenant restores (target in `tenant-test`, source's seaweedfs in `tenant-root`) are blocked by the per-tenant Cilium egress policy and stay a manual / dev-cluster flow.
+
+## Automated e2e
+
+The Chainsaw suite at `hack/e2e-chainsaw/mariadb/` drives this same `run-all.sh` as a second test (`mariadb-2-backup-roundtrip`), selected by Test-Impact Analysis whenever the mariadb app or the suite changes, and on every release cut. It runs in `tenant-root` against the in-cluster seaweedfs endpoint — the isolated e2e tenant cannot reach it across the Cilium egress policy, and the external ingress endpoint is an unroutable placeholder in the sandbox.
diff --git a/examples/backups/mariadb/cleanup.sh b/examples/backups/mariadb/cleanup.sh
new file mode 100755
index 0000000000..4774ae151a
--- /dev/null
+++ b/examples/backups/mariadb/cleanup.sh
@@ -0,0 +1,51 @@
+#!/bin/bash
+# Best-effort teardown of everything the demo creates. Idempotent;
+# missing resources are skipped silently.
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "$SCRIPT_DIR/00-helpers.sh"
+
+print_header "Cleanup"
+
+log_substep "Deleting RestoreJob..."
+kubectl -n "$NAMESPACE" delete restorejob.backups.cozystack.io "$RESTOREJOB_TOCOPY_NAME" --ignore-not-found
+
+log_substep "Deleting Plan + BackupJob + derived Backup artefacts..."
+kubectl -n "$NAMESPACE" delete plan.backups.cozystack.io "$PLAN_NAME" --ignore-not-found
+kubectl -n "$NAMESPACE" delete backupjob.backups.cozystack.io "$BACKUPJOB_NAME" --ignore-not-found
+# Only the Backups of THIS demo's apps — never `--all`: on a shared cluster the
+# namespace can hold Backup artefacts of other applications and flows.
+for b in $(kubectl -n "$NAMESPACE" get backups.backups.cozystack.io \
+        -o jsonpath='{range .items[*]}{.metadata.name} {.spec.applicationRef.name}{"\n"}{end}' 2>/dev/null |
+        awk -v src="$MARIADB_SRC_NAME" -v tgt="$MARIADB_TARGET_NAME" '$2 == src || $2 == tgt {print $1}'); do
+    kubectl -n "$NAMESPACE" delete backups.backups.cozystack.io "$b" --ignore-not-found
+done
+
+# The Cozystack BackupJob/RestoreJob own their operator-side k8s.mariadb.com
+# Backup/Restore CRs only by the OwningJob labels (not OwnerReferences), so
+# deleting the Cozystack jobs does not cascade to them. Left behind, a stale
+# operator-side Backup would be reused by findMariaDBBackupForJob on the next
+# run against a bucket path that no longer exists. Prune them by owner.
+log_substep "Deleting operator-side k8s.mariadb.com Backup/Restore CRs..."
+for owner in "$BACKUPJOB_NAME" "$RESTOREJOB_TOCOPY_NAME"; do
+    kubectl -n "$NAMESPACE" delete backups.k8s.mariadb.com,restores.k8s.mariadb.com \
+        -l "backups.cozystack.io/owned-by.BackupJobName=${owner}" --ignore-not-found
+done
+
+log_substep "Deleting MariaDB apps..."
+kubectl -n "$NAMESPACE" delete mariadb.apps.cozystack.io "$MARIADB_SRC_NAME" "$MARIADB_TARGET_NAME" --ignore-not-found
+
+log_substep "Deleting per-app backup Secrets..."
+kubectl -n "$NAMESPACE" delete secret \
+    "${MARIADB_SRC_NAME}-mariadb-backup-creds" "${MARIADB_SRC_NAME}-mariadb-backup-ca" \
+    "${MARIADB_TARGET_NAME}-mariadb-backup-creds" "${MARIADB_TARGET_NAME}-mariadb-backup-ca" --ignore-not-found
+
+log_substep "Deleting Bucket..."
+kubectl -n "$NAMESPACE" delete bucket.apps.cozystack.io "$BUCKET_NAME" --ignore-not-found
+
+log_substep "Deleting BackupClass + MariaDB strategy (cluster-scoped)..."
+kubectl delete backupclass.backups.cozystack.io "$BACKUPCLASS_NAME" --ignore-not-found
+kubectl delete mariadb.strategy.backups.cozystack.io "$STRATEGY_NAME" --ignore-not-found
+
+log_success "Cleanup complete."
diff --git a/examples/backups/mariadb/run-all.sh b/examples/backups/mariadb/run-all.sh
new file mode 100755
index 0000000000..dbc845ce83
--- /dev/null
+++ b/examples/backups/mariadb/run-all.sh
@@ -0,0 +1,254 @@
+#!/bin/bash
+# Convenience runner + e2e harness for the MariaDB backup/restore demo.
+#
+# It applies the SAME numbered manifests a human reads (00-bucket.yaml ..
+# 40-restorejob-to-copy.yaml), filling the REPLACE_WITH_* placeholders from the
+# provisioned Bucket and deriving the two Secrets the manifests reference
+# (<app>-mariadb-backup-creds, <app>-mariadb-backup-ca) so the documented flow
+# and the automated test can never drift. Stops on the first failure.
+#
+# Flow: Bucket -> source MariaDB (+ a sentinel row) -> MariaDB strategy +
+# BackupClass -> ad-hoc BackupJob (wait Succeeded) -> empty target MariaDB +
+# to-copy RestoreJob (wait Succeeded) -> assert the sentinel round-tripped
+# through S3 into the restored copy while the source stays untouched.
+#
+# Why to-copy and not in-place: in-place replays the dump straight into the
+# live source MariaDB (dropping and re-creating the restored databases there),
+# so it cannot witness the restore on a separate instance. To-copy leaves the
+# source running and lands the marker row on a distinct target, a stronger
+# restore proof; the in-place dispatch is covered at the unit level by the
+# controller tests.
+#
+# Override NAMESPACE / endpoint / CA via the environment; see 00-helpers.sh.
+# hack/e2e-chainsaw/mariadb/ drives this file as mariadb-2-backup-roundtrip.
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "$SCRIPT_DIR/00-helpers.sh"
+
+# Substitute the manifest placeholders. $BUCKET / $S3_HOST are resolved from the
+# Bucket below. The app user's password is chart-generated, not substituted.
+subst() {
+    sed \
+        -e "s|REPLACE_WITH_COSI_BUCKET_NAME|${BUCKET}|g" \
+        -e "s|REPLACE_WITH_S3_ENDPOINT|${S3_HOST}|g" \
+        "$SCRIPT_DIR/$1"
+}
+
+# The mariadb-operator provisions the demo database + app user + grant from the
+# chart as k8s.mariadb.com CRs named after the release (mariadb-<app>). The
+# grant is the last of the three to reconcile, so its readiness is the signal
+# that the app user can actually write into demo. Both "demo" and "app" are
+# already DNS-safe, so the grant CR is <cr>-demo-app.
+wait_app_grant_ready() {
+    local cr="$1" timeout="${2:-180}"
+    wait_for_field grants.k8s.mariadb.com "${cr}-demo-app" \
+        '{.status.conditions[?(@.type=="Ready")].status}' True "$NAMESPACE" "$timeout"
+}
+
+print_header "Step 00: Provision Bucket '${BUCKET_NAME}' in ${NAMESPACE}"
+kubectl -n "$NAMESPACE" apply -f "$SCRIPT_DIR/00-bucket.yaml"
+# 660s, above this generated release's 600s install timeout; see "Sizing an
+# HR-Ready budget" in docs/agents/e2e-testing.md.
+wait_hr_ready "bucket-${BUCKET_NAME}" 660
+wait_for_field bucketclaims.objectstorage.k8s.io "bucket-${BUCKET_NAME}" \
+    '{.status.bucketReady}' true "$NAMESPACE" 300
+wait_for_field bucketaccesses.objectstorage.k8s.io "bucket-${BUCKET_NAME}-${BUCKET_USER}" \
+    '{.status.accessGranted}' true "$NAMESPACE" 300
+if [[ "${COZY_E2E_BACKUP_PREFLIGHT:-0}" == "1" ]]; then
+    source "$SCRIPT_DIR/../../../hack/e2e-chainsaw/_lib/backup-access-preflight.sh"
+    cozy_backup_access_preflight "$NAMESPACE" "bucket-${BUCKET_NAME}-${BUCKET_USER}" 90
+fi
+
+log_substep "Reading bucket coordinates from BucketInfo Secret..."
+TMP=$(mktemp)
+trap 'rm -f "$TMP"' EXIT
+kubectl -n "$NAMESPACE" get secret "bucket-${BUCKET_NAME}-${BUCKET_USER}" \
+    -o jsonpath='{.data.BucketInfo}' | base64 -d > "$TMP"
+S3_ACCESS_KEY=$(jq -r '.spec.secretS3.accessKeyID' "$TMP")
+S3_SECRET_KEY=$(jq -r '.spec.secretS3.accessSecretKey' "$TMP")
+# S3_ENDPOINT can be overridden via the environment: BucketInfo advertises the
+# EXTERNAL ingress endpoint, which in-cluster Pods cannot always reach or
+# TLS-validate; the in-cluster alternative is https://seaweedfs-s3.<ns>:8333
+# (trusted via the copied CA below).
+S3_ENDPOINT="${S3_ENDPOINT:-$(jq -r '.spec.secretS3.endpoint' "$TMP")}"
+BUCKET=$(jq -r '.spec.bucketName' "$TMP")
+for v in S3_ACCESS_KEY S3_SECRET_KEY S3_ENDPOINT BUCKET; do
+    [[ -n "${!v}" && "${!v}" != "null" ]] || { log_error "BucketInfo missing required field: ${v}"; exit 1; }
+done
+# The strategy manifest takes a path-style endpoint WITHOUT scheme, so strip it.
+S3_HOST=${S3_ENDPOINT#https://}; S3_HOST=${S3_HOST#http://}
+log_success "Bucket '${BUCKET}' at endpoint '${S3_ENDPOINT}'."
+
+print_header "Step 05a: Materialise the Secrets the MariaDB strategy references"
+# Resolve the S3 endpoint CA secret. The default name tracks the seaweedfs
+# chart's fullnameOverride (seaweedfs -> seaweedfs-ca-cert), but a downstream
+# fullname change would rename it, so fall back to discovering the cert-manager
+# CA Certificate (the seaweedfs-labelled one with spec.isCA=true) and read its
+# secretName. Leave S3_CA_SECRET empty to skip the copy on a public-CA endpoint.
+if [[ -n "$S3_CA_SECRET" ]] \
+    && ! kubectl -n "$S3_CA_NAMESPACE" get secret "$S3_CA_SECRET" >/dev/null 2>&1; then
+    log_warning "S3 CA secret ${S3_CA_NAMESPACE}/${S3_CA_SECRET} not found; discovering the seaweedfs CA Certificate..."
+    # List every seaweedfs Certificate as "<isCA> <secretName>" and pick the CA
+    # one in shell — avoids kubectl jsonpath's finicky boolean-literal filter.
+    DISCOVERED_CA=$(kubectl -n "$S3_CA_NAMESPACE" get certificates.cert-manager.io \
+        -l app.kubernetes.io/name=seaweedfs \
+        -o jsonpath='{range .items[*]}{.spec.isCA}{" "}{.spec.secretName}{"\n"}{end}' 2>/dev/null \
+        | awk '$1=="true"{print $2; exit}' || true)
+    if [[ -n "$DISCOVERED_CA" ]]; then
+        log_success "Discovered seaweedfs CA secret ${S3_CA_NAMESPACE}/${DISCOVERED_CA}"
+        S3_CA_SECRET="$DISCOVERED_CA"
+    else
+        log_error "No seaweedfs CA Certificate found in ${S3_CA_NAMESPACE}; set S3_CA_SECRET explicitly (or empty for a public-CA endpoint)."
+        exit 1
+    fi
+fi
+# The strategy (10) renders <app>-mariadb-backup-creds / <app>-mariadb-backup-ca
+# against whichever application it drives. .Application is the cozystack
+# apps.cozystack.io/MariaDB object, so .Application.metadata.name is the app
+# name (mariadb-src), NOT the prefixed operator-side CR (mariadb-mariadb-src).
+# mariadb-operator reads AWS_ACCESS_KEY_ID / AWS_SECRET_ACCESS_KEY from the
+# creds Secret and trusts ca.crt from the CA Secret when talking to a
+# self-signed S3 endpoint, so a restore TARGET needs its own pair too
+# (materialised again in step 30). kubectl apply (not create) so a stale pair
+# from an earlier run is corrected.
+materialise_backup_secrets() {
+    local app="$1"
+    kubectl -n "$NAMESPACE" create secret generic "${app}-mariadb-backup-creds" \
+        --from-literal="AWS_ACCESS_KEY_ID=${S3_ACCESS_KEY}" \
+        --from-literal="AWS_SECRET_ACCESS_KEY=${S3_SECRET_KEY}" \
+        --dry-run=client -o yaml | kubectl apply -f -
+
+    if [[ -n "$S3_CA_SECRET" ]]; then
+        log_substep "Copying S3 CA ${S3_CA_NAMESPACE}/${S3_CA_SECRET}[${S3_CA_KEY}] -> ${app}-mariadb-backup-ca..."
+        local ca_pem
+        ca_pem=$(kubectl -n "$S3_CA_NAMESPACE" get secret "$S3_CA_SECRET" \
+            -o jsonpath="{.data.${S3_CA_KEY//./\\.}}" | base64 -d)
+        [[ -n "$ca_pem" ]] || { log_error "S3 CA secret ${S3_CA_NAMESPACE}/${S3_CA_SECRET} has no ${S3_CA_KEY}"; exit 1; }
+        kubectl -n "$NAMESPACE" create secret generic "${app}-mariadb-backup-ca" \
+            --from-literal="ca.crt=${ca_pem}" \
+            --dry-run=client -o yaml | kubectl apply -f -
+    else
+        log_warning "S3_CA_SECRET empty: the strategy still references ${app}-mariadb-backup-ca."
+        log_warning "Remove the tls block from 10-mariadb-strategy.yaml by hand when the S3 endpoint uses a public CA."
+    fi
+}
+materialise_backup_secrets "$MARIADB_SRC_NAME"
+
+print_header "Step 05b: Deploy source MariaDB '${MARIADB_SRC_NAME}' and wait for it to be healthy"
+subst 05-mariadb-src.yaml | kubectl -n "$NAMESPACE" apply -f -
+# 660s, above this generated release's 600s install timeout; see "Sizing an
+# HR-Ready budget" in docs/agents/e2e-testing.md. hack/mariadb-first-boot-waits.bats
+# derives the floor and holds the Chainsaw op in
+# hack/e2e-chainsaw/mariadb/chainsaw-test.yaml against this wait: raise one,
+# raise both.
+wait_hr_ready "mariadb-${MARIADB_SRC_NAME}" 660
+wait_for_field mariadbs.k8s.mariadb.com "$MARIADB_SRC_CR" \
+    '{.status.conditions[?(@.type=="Ready")].status}' True "$NAMESPACE" 600
+wait_app_grant_ready "$MARIADB_SRC_CR"
+
+print_header "Step 05c: Write a sentinel row so the backup has something to prove"
+SENTINEL_TOKEN="e2e-$(date +%s)-$$"
+mysql_exec "$MARIADB_SRC_CR" "
+    CREATE TABLE IF NOT EXISTS demo.e2e_sentinel (id INT PRIMARY KEY, token VARCHAR(64));
+    REPLACE INTO demo.e2e_sentinel (id, token) VALUES (1, '${SENTINEL_TOKEN}');"
+log_success "Sentinel token: ${SENTINEL_TOKEN}"
+
+print_header "Step 05d: Create an out-of-band account the chart does not declare"
+# Its GRANTs live only in mysql.global_priv, which the strategy excludes from the
+# backup (IgnoreGlobalPriv=true). A restore must therefore bring its DATA back but
+# NOT the account itself — the documented ignoreGlobalPriv limitation. Step 40
+# asserts both halves, so the unconditionally-set flag has a live test behind the
+# behaviour the docs describe, not only a unit assertion on the CR field.
+OOB_USER="oob_${SENTINEL_TOKEN//[^a-zA-Z0-9_]/_}"
+mysql_root_exec "$MARIADB_SRC_CR" "
+    CREATE USER IF NOT EXISTS '${OOB_USER}'@'%' IDENTIFIED BY 'oob-pw';
+    GRANT SELECT ON demo.* TO '${OOB_USER}'@'%';
+    CREATE TABLE IF NOT EXISTS demo.oob_marker (id INT PRIMARY KEY, who VARCHAR(128));
+    REPLACE INTO demo.oob_marker (id, who) VALUES (1, '${OOB_USER}');"
+log_success "Out-of-band account '${OOB_USER}' + demo.oob_marker created directly in SQL."
+
+print_header "Step 10/15: Create the MariaDB strategy + BackupClass"
+subst 10-mariadb-strategy.yaml | kubectl apply -f -
+kubectl apply -f "$SCRIPT_DIR/15-backupclass.yaml"
+
+print_header "Step 25: Submit ad-hoc BackupJob '${BACKUPJOB_NAME}' and wait for Succeeded"
+kubectl -n "$NAMESPACE" apply -f "$SCRIPT_DIR/25-backupjob-adhoc.yaml"
+wait_for_field backupjobs.backups.cozystack.io "$BACKUPJOB_NAME" \
+    '{.status.phase}' Succeeded "$NAMESPACE" 600 Failed
+BACKUP_NAME=$(kubectl -n "$NAMESPACE" get backupjobs.backups.cozystack.io "$BACKUPJOB_NAME" \
+    -o jsonpath='{.status.backupRef.name}')
+[[ -n "$BACKUP_NAME" ]] || { log_error "BackupJob succeeded but reported no backupRef"; exit 1; }
+log_success "Backup artefact: ${BACKUP_NAME}"
+
+if [[ "${SKIP_RESTORE:-0}" == "1" ]]; then
+    log_warning "SKIP_RESTORE=1: stopping after a successful backup."
+    exit 0
+fi
+
+print_header "Step 30/40: Restore to a copy '${MARIADB_TARGET_NAME}' and wait for Succeeded"
+# The strategy renders <app>-mariadb-backup-creds / -ca against the TARGET
+# during a restore, so the target needs its own Secret pair (same S3 coords).
+materialise_backup_secrets "$MARIADB_TARGET_NAME"
+subst 30-mariadb-target.yaml | kubectl -n "$NAMESPACE" apply -f -
+# Same 660s as the source above, held against the same Chainsaw op.
+wait_hr_ready "mariadb-${MARIADB_TARGET_NAME}" 660
+wait_for_field mariadbs.k8s.mariadb.com "$MARIADB_TARGET_CR" \
+    '{.status.conditions[?(@.type=="Ready")].status}' True "$NAMESPACE" 600
+kubectl -n "$NAMESPACE" apply -f "$SCRIPT_DIR/40-restorejob-to-copy.yaml"
+wait_for_field restorejobs.backups.cozystack.io "$RESTOREJOB_TOCOPY_NAME" \
+    '{.status.phase}' Succeeded "$NAMESPACE" 900 Failed
+# The restore replays the logical dump (schema + rows), but the app user is NOT
+# in the dump — it comes from the target chart. Wait for its grant before the
+# read below so the SELECT authenticates.
+wait_app_grant_ready "$MARIADB_TARGET_CR"
+
+print_header "Step 40 verify: the sentinel round-tripped through S3 into the copy"
+GOT=$(mysql_exec "$MARIADB_TARGET_CR" "SELECT token FROM demo.e2e_sentinel WHERE id = 1;" \
+    | awk 'NR==2{print}' | tr -d '[:space:]')
+if [[ "$GOT" != "$SENTINEL_TOKEN" ]]; then
+    log_error "sentinel mismatch: target has '${GOT}', expected '${SENTINEL_TOKEN}'"
+    exit 1
+fi
+log_success "Round-trip verified: '${MARIADB_TARGET_NAME}' restored sentinel '${GOT}' from S3."
+
+# The app-user read above already proves the restore did not overwrite the
+# target's grant table with the source's. root is the one the operator can never
+# repair after bootstrap, so assert it too: its login must still match the
+# chart-generated password in the target Secret.
+print_header "Step 40 verify: root still authenticates against the restored copy"
+if ! mysql_root_login "$MARIADB_TARGET_CR" >/dev/null; then
+    log_error "root cannot authenticate against '${MARIADB_TARGET_NAME}': the restore overwrote the grant table and the target Secret's root password no longer matches"
+    exit 1
+fi
+log_success "root login verified against '${MARIADB_TARGET_NAME}'."
+
+print_header "Step 40 verify: ignoreGlobalPriv dropped the out-of-band account but kept its data"
+# demo.oob_marker rode the logical dump, so it must be present in the copy; the
+# account lived only in the excluded grant table, so it must NOT. This is the DR
+# direction the docs describe and the strategy's unconditional IgnoreGlobalPriv=true
+# relies on.
+OOB_DATA=$(mysql_exec "$MARIADB_TARGET_CR" "SELECT who FROM demo.oob_marker WHERE id = 1;" \
+    | awk 'NR==2{print}' | tr -d '[:space:]')
+if [[ "$OOB_DATA" != "$OOB_USER" ]]; then
+    log_error "out-of-band data did not round-trip: target has '${OOB_DATA}', expected '${OOB_USER}'"
+    exit 1
+fi
+OOB_ACCT=$(mysql_root_exec "$MARIADB_TARGET_CR" \
+    "SELECT COUNT(*) FROM mysql.user WHERE User = '${OOB_USER}';" \
+    | awk 'NR==2{print}' | tr -d '[:space:]')
+if [[ "$OOB_ACCT" != "0" ]]; then
+    log_error "out-of-band account '${OOB_USER}' reappeared in the copy (count=${OOB_ACCT}): the grant table was NOT excluded from the backup"
+    exit 1
+fi
+log_success "ignoreGlobalPriv verified: data restored, out-of-band account absent (only chart-declared accounts are reconstructed)."
+
+# To-copy must not mutate the source. Regressing into a source-touching restore
+# would corrupt the running instance, so assert the source still reads back.
+SRC_GOT=$(mysql_exec "$MARIADB_SRC_CR" "SELECT token FROM demo.e2e_sentinel WHERE id = 1;" \
+    | awk 'NR==2{print}' | tr -d '[:space:]')
+if [[ "$SRC_GOT" != "$SENTINEL_TOKEN" ]]; then
+    log_error "source sentinel changed after to-copy restore: source has '${SRC_GOT}', expected '${SENTINEL_TOKEN}'"
+    exit 1
+fi
+log_success "Source '${MARIADB_SRC_NAME}' left untouched by the to-copy restore."
diff --git a/examples/backups/mongodb/00-bucket.yaml b/examples/backups/mongodb/00-bucket.yaml
new file mode 100644
index 0000000000..c8402c64b4
--- /dev/null
+++ b/examples/backups/mongodb/00-bucket.yaml
@@ -0,0 +1,14 @@
+# Cozystack-managed S3 bucket for storing MongoDB backups. The Bucket
+# controller provisions a Secret named "bucket-<bucket>-<username>" per user
+# (the bucket app carries the "bucket-" release prefix); run-all.sh reads the
+# "backup" user's BucketInfo and projects the access keys into the MongoDB
+# application's backup config.
+---
+apiVersion: apps.cozystack.io/v1alpha1
+kind: Bucket
+metadata:
+  name: mongodb-backups
+spec:
+  users:
+    backup:
+      readonly: false
diff --git a/examples/backups/mongodb/00-helpers.sh b/examples/backups/mongodb/00-helpers.sh
new file mode 100755
index 0000000000..2f8b82cc4d
--- /dev/null
+++ b/examples/backups/mongodb/00-helpers.sh
@@ -0,0 +1,89 @@
+#!/bin/bash
+# Shared helpers for the MongoDB backup/restore demo.
+# Source this file in other scripts: source "$(dirname "$0")/00-helpers.sh"
+
+export RED='\033[0;31m'
+export GREEN='\033[0;32m'
+export YELLOW='\033[1;33m'
+export BLUE='\033[0;34m'
+export MAGENTA='\033[0;35m'
+export CYAN='\033[0;36m'
+export WHITE='\033[1;37m'
+export NC='\033[0m'
+export BOLD='\033[1m'
+
+# Default settings (override via environment).
+export NAMESPACE="${NAMESPACE:-tenant-root}"
+export BUCKET_NAME="${BUCKET_NAME:-mongodb-backups}"
+# Bucket user declared in 00-bucket.yaml; the COSI flow materialises the
+# credentials Secret as "bucket-<bucket>-<user>".
+export BUCKET_USER="${BUCKET_USER:-backup}"
+export MONGODB_SRC_NAME="${MONGODB_SRC_NAME:-mongodb-src}"
+export MONGODB_TARGET_NAME="${MONGODB_TARGET_NAME:-mongodb-target}"
+# The mongodb-rd ApplicationDefinition renders the HelmRelease with
+# releaseName = "mongodb-" + appName (release.prefix in
+# packages/system/mongodb-rd/cozyrds/mongodb.yaml), and the chart sets the
+# psmdb.percona.com/PerconaServerMongoDB metadata.name to .Release.Name, so the
+# operator-side CR (and its rs0 Service) is mongodb-<app>.
+export MONGODB_SRC_CR="mongodb-${MONGODB_SRC_NAME}"
+export MONGODB_TARGET_CR="mongodb-${MONGODB_TARGET_NAME}"
+export BACKUPCLASS_NAME="${BACKUPCLASS_NAME:-cozy-default}"
+export BACKUPJOB_NAME="${BACKUPJOB_NAME:-mongodb-src-adhoc}"
+export RESTOREJOB_TOCOPY_NAME="${RESTOREJOB_TOCOPY_NAME:-mongodb-src-to-mongodb-target}"
+export PLAN_NAME="${PLAN_NAME:-mongodb-src-daily}"
+
+log_info()    { echo -e "${BLUE}i${NC} $*" >&2; }
+log_success() { echo -e "${GREEN}OK${NC} $*" >&2; }
+log_warning() { echo -e "${YELLOW}!${NC} $*" >&2; }
+log_error()   { echo -e "${RED}x${NC} $*" >&2; }
+log_step()    { echo -e "\n${MAGENTA}${BOLD}> $*${NC}" >&2; }
+log_substep() { echo -e "${CYAN}  -> $*${NC}" >&2; }
+
+print_header() {
+    echo -e "\n${MAGENTA}${BOLD}== $1 ==${NC}\n" >&2
+}
+
+# wait_for_field, wait_hr_ready and wait_deleted live in one file shared by
+# every backup walkthrough, so a fix to one reaches all of them.
+# shellcheck source-path=SCRIPTDIR source=../_lib/wait-helpers.sh
+source "$(dirname "${BASH_SOURCE[0]}")/../_lib/wait-helpers.sh"
+
+# Wait until the psmdb.percona.com/PerconaServerMongoDB CR reports state=ready
+# (the operator's own readiness signal — the rs0 members are up and initialised
+# and, when backup.enabled, the pbm agents are running). No fail-fast value: the
+# cluster state is recomputed every operator reconcile and can pass through
+# "error" transiently during replset init before it converges to "ready", so a
+# terminal-on-error gate would fail the whole run on one blip. Poll for the
+# positive value only, bounded by the timeout.
+wait_psmdb_ready() {
+    local cr="$1" timeout="${2:-600}"
+    wait_for_field perconaservermongodbs.psmdb.percona.com "$cr" \
+        '{.status.state}' ready "$NAMESPACE" "$timeout"
+}
+
+# Name of the first data-bearing pod of a PerconaServerMongoDB CR's rs0 replica
+# set. For the single-replica instances this demo uses, rs0-0 is the sole member
+# and therefore the primary, so writes land there directly.
+mongodb_primary_pod() {
+    local cr="$1"
+    echo "${cr}-rs0-0"
+}
+
+# Run a mongosh script against a PerconaServerMongoDB CR's rs0 primary as the
+# operator-managed databaseAdmin system user (read from the internal users
+# Secret the psmdb operator materialises), so writes and reads authenticate
+# regardless of app-user grant timing. Args: <cr-name> <mongosh-eval>
+mongosh_exec() {
+    local cr="$1" js="$2"
+    local pod secret admin_user admin_pw
+    pod=$(mongodb_primary_pod "$cr")
+    secret="internal-${cr}-users"
+    admin_user=$(kubectl -n "$NAMESPACE" get secret "$secret" \
+        -o jsonpath='{.data.MONGODB_DATABASE_ADMIN_USER}' 2>/dev/null | base64 -d)
+    admin_pw=$(kubectl -n "$NAMESPACE" get secret "$secret" \
+        -o jsonpath='{.data.MONGODB_DATABASE_ADMIN_PASSWORD}' 2>/dev/null | base64 -d)
+    [[ -n "$admin_user" && -n "$admin_pw" ]] || { log_error "no databaseAdmin credentials in ${NAMESPACE}/${secret}"; return 1; }
+    kubectl -n "$NAMESPACE" exec "$pod" -c mongod -- \
+        mongosh --quiet -u "$admin_user" -p "$admin_pw" --authenticationDatabase admin \
+        --eval "$js"
+}
diff --git a/examples/backups/mongodb/05-mongodb-src.yaml b/examples/backups/mongodb/05-mongodb-src.yaml
new file mode 100644
index 0000000000..d828d44bcd
--- /dev/null
+++ b/examples/backups/mongodb/05-mongodb-src.yaml
@@ -0,0 +1,44 @@
+# Source MongoDB instance.
+#
+# The psmdb operator can only service on-demand PerconaServerMongoDBBackup CRs
+# when the cluster has the percona-backup-mongodb agents running and a storage
+# declared — that is what `backup.enabled: true` wires up. The cozystack
+# backup-strategy driver names that storage ("s3-storage", the one the chart
+# declares) via the cozy-default-mongodb Strategy. This example uses the default
+# flow, where the application owns the storage and the driver does not inject it
+# — so, unlike MariaDB, the application must opt into backups. (Set
+# backup.useSystemBucket: true instead to have the driver inject the platform
+# system-bucket storage; see docs/operations/backup-classes.md.)
+#
+# The bucket coordinates (destinationPath / endpointURL / s3AccessKey /
+# s3SecretKey) point the storage at the Bucket provisioned in 00-bucket.yaml.
+# insecureSkipTLSVerify is true because Cozystack's default in-cluster
+# seaweedfs serves a self-signed cert and the psmdb s3 storage has no CA-bundle
+# field. run-all.sh fills the REPLACE_WITH_* placeholders from the Bucket's
+# BucketInfo Secret.
+#
+# The "app" user + "demo" database let a smoke harness (or a human) write a
+# sentinel document before the BackupJob fires.
+---
+apiVersion: apps.cozystack.io/v1alpha1
+kind: MongoDB
+metadata:
+  name: mongodb-src
+spec:
+  replicas: 1
+  size: 1Gi
+  databases:
+    demo:
+      roles:
+        admin:
+          - app
+  users:
+    app:
+      password: REPLACE_WITH_PASSWORD
+  backup:
+    enabled: true
+    destinationPath: "s3://REPLACE_WITH_COSI_BUCKET_NAME/mongodb-src/"
+    endpointURL: "REPLACE_WITH_S3_ENDPOINT"
+    insecureSkipTLSVerify: true
+    s3AccessKey: "REPLACE_WITH_S3_ACCESS_KEY"
+    s3SecretKey: "REPLACE_WITH_S3_SECRET_KEY"
diff --git a/examples/backups/mongodb/10-backupjob-adhoc.yaml b/examples/backups/mongodb/10-backupjob-adhoc.yaml
new file mode 100644
index 0000000000..78d81a812d
--- /dev/null
+++ b/examples/backups/mongodb/10-backupjob-adhoc.yaml
@@ -0,0 +1,15 @@
+# Ad-hoc BackupJob — useful for smoke-testing the strategy or running a
+# point-in-time backup outside the Plan schedule. Uses the platform-managed
+# cozy-default BackupClass, whose MongoDB entry routes to the
+# cozy-default-mongodb Strategy (storageName=s3-storage, type=logical).
+---
+apiVersion: backups.cozystack.io/v1alpha1
+kind: BackupJob
+metadata:
+  name: mongodb-src-adhoc
+spec:
+  applicationRef:
+    apiGroup: apps.cozystack.io
+    kind: MongoDB
+    name: mongodb-src
+  backupClassName: cozy-default
diff --git a/examples/backups/mongodb/15-plan.yaml b/examples/backups/mongodb/15-plan.yaml
new file mode 100644
index 0000000000..89333009ef
--- /dev/null
+++ b/examples/backups/mongodb/15-plan.yaml
@@ -0,0 +1,19 @@
+# Scheduled backups via a Plan (every 6h). The core Plan controller stamps a
+# BackupJob per tick; each is dispatched through the same cozy-default MongoDB
+# strategy as the ad-hoc job. Applied for documentation parity with the other
+# backup examples; run-all.sh drives the ad-hoc BackupJob instead so the smoke
+# test does not wait for a cron tick.
+---
+apiVersion: backups.cozystack.io/v1alpha1
+kind: Plan
+metadata:
+  name: mongodb-src-daily
+spec:
+  applicationRef:
+    apiGroup: apps.cozystack.io
+    kind: MongoDB
+    name: mongodb-src
+  backupClassName: cozy-default
+  schedule:
+    type: cron
+    cron: "0 */6 * * *"
diff --git a/examples/backups/mongodb/20-mongodb-target.yaml b/examples/backups/mongodb/20-mongodb-target.yaml
new file mode 100644
index 0000000000..dc36bc9d38
--- /dev/null
+++ b/examples/backups/mongodb/20-mongodb-target.yaml
@@ -0,0 +1,24 @@
+# Empty MongoDB target for the to-copy restore. The psmdb operator replays the
+# logical dump into this running cluster, so it needs the percona-backup-mongodb
+# agents too — hence backup.enabled: true. It uses the SAME bucket as the source
+# but its OWN prefix (mongodb-target/): the restore reads the source archive via
+# backupSource, so the target never needs to write into the source's prefix, and
+# a shared prefix would interleave the two clusters' oplog/backup metadata (both
+# run replset rs0) — a source PITR could then resolve oplog chunks the target
+# wrote. No "app" user or database is declared: the restore recreates the demo
+# database from the dump.
+---
+apiVersion: apps.cozystack.io/v1alpha1
+kind: MongoDB
+metadata:
+  name: mongodb-target
+spec:
+  replicas: 1
+  size: 1Gi
+  backup:
+    enabled: true
+    destinationPath: "s3://REPLACE_WITH_COSI_BUCKET_NAME/mongodb-target/"
+    endpointURL: "REPLACE_WITH_S3_ENDPOINT"
+    insecureSkipTLSVerify: true
+    s3AccessKey: "REPLACE_WITH_S3_ACCESS_KEY"
+    s3SecretKey: "REPLACE_WITH_S3_SECRET_KEY"
diff --git a/examples/backups/mongodb/25-restorejob-in-place.yaml b/examples/backups/mongodb/25-restorejob-in-place.yaml
new file mode 100644
index 0000000000..49a1c42b17
--- /dev/null
+++ b/examples/backups/mongodb/25-restorejob-in-place.yaml
@@ -0,0 +1,14 @@
+# In-place restore. Omitting targetApplicationRef restores back into the source
+# MongoDB (clusterName = the source's PerconaServerMongoDB). This is
+# DESTRUCTIVE — the psmdb operator replays the logical dump into the live source
+# cluster. Applied for documentation parity; run-all.sh drives the
+# non-destructive to-copy restore (30) instead. Optionally add a PITR target via
+# spec.options.recoveryTime (RFC3339) — see README.
+---
+apiVersion: backups.cozystack.io/v1alpha1
+kind: RestoreJob
+metadata:
+  name: mongodb-src-in-place
+spec:
+  backupRef:
+    name: mongodb-src-adhoc
diff --git a/examples/backups/mongodb/30-restorejob-to-copy.yaml b/examples/backups/mongodb/30-restorejob-to-copy.yaml
new file mode 100644
index 0000000000..0f52525e62
--- /dev/null
+++ b/examples/backups/mongodb/30-restorejob-to-copy.yaml
@@ -0,0 +1,23 @@
+# To-copy restore. Targets the empty mongodb-target MongoDB app from
+# 20-mongodb-target.yaml; the driver creates a PerconaServerMongoDBRestore CR
+# with clusterName=mongodb-mongodb-target and a backupSource pointing at the
+# source backup's S3 destination, so the operator replays the logical dump into
+# the target while mongodb-src stays running and untouched.
+#
+# Driven for the same-namespace happy path by run-all.sh in this directory; also
+# applicable manually with kubectl apply -f. The mongodb-2-backup-roundtrip
+# Chainsaw suite stops before this step while #3832 is open, so nothing in CI
+# exercises it. The cross-tenant variant stays manual; see the README for the
+# network-policy reason.
+---
+apiVersion: backups.cozystack.io/v1alpha1
+kind: RestoreJob
+metadata:
+  name: mongodb-src-to-mongodb-target
+spec:
+  backupRef:
+    name: mongodb-src-adhoc
+  targetApplicationRef:
+    apiGroup: apps.cozystack.io
+    kind: MongoDB
+    name: mongodb-target
diff --git a/examples/backups/mongodb/README.md b/examples/backups/mongodb/README.md
new file mode 100644
index 0000000000..42d44737c9
--- /dev/null
+++ b/examples/backups/mongodb/README.md
@@ -0,0 +1,91 @@
+# MongoDB backup / restore example
+
+End-to-end example for backing up and restoring a Cozystack-managed MongoDB
+application via the `strategy.backups.cozystack.io/v1alpha1` `MongoDB` strategy
+driver. The driver delegates execution to the
+[Percona Server for MongoDB operator](https://docs.percona.com/percona-operator-for-mongodb/)
+(`psmdb.percona.com` CRDs, already shipped with Cozystack): backups materialise
+as `PerconaServerMongoDBBackup` CRs and restores as `PerconaServerMongoDBRestore`
+CRs in the application's namespace; the operator handles the actual
+percona-backup-mongodb (pbm) logical dump / restore.
+
+Files are numbered so that `kubectl apply -f` order matches the dependency graph.
+
+| Step | File | Scope | Purpose |
+| --- | --- | --- | --- |
+| 0 | `00-bucket.yaml` | namespaced | COSI-backed S3 bucket + `backup` user. |
+| 1 | `05-mongodb-src.yaml` | namespaced | Source MongoDB application (backups enabled). |
+| 2 | `10-backupjob-adhoc.yaml` | namespaced | One-shot BackupJob for smoke testing. |
+| 3 | `15-plan.yaml` | namespaced | Cron schedule (every 6h). |
+| 4 | `20-mongodb-target.yaml` | namespaced | Empty MongoDB target for to-copy restore. |
+| 5 | `25-restorejob-in-place.yaml` | namespaced | Destructive restore back into the source. |
+| 6 | `30-restorejob-to-copy.yaml` | namespaced | Non-destructive restore into the target. |
+
+## How MongoDB backups differ from the other drivers
+
+The psmdb operator runs the pbm agents when the cluster has `backup.enabled: true`, and services an on-demand `PerconaServerMongoDBBackup` only once the storage the CR names is declared on the cluster. Where that storage comes from depends on the flow the application picked. On the default flow (this example) the chart declares it from the application's own `backup.*` values, and the `cozy-default-mongodb` Strategy only names it (`storageName: s3-storage`); the driver injects nothing. With `backup.useSystemBucket: true` the chart leaves the storage out and the driver injects the platform bucket's coordinates onto the cluster before each backup. Either way the driver surfaces a clear `Ready=False` precondition (rather than a silent hang) when the target cluster has backups disabled; see `docs/operations/backup-classes.md` for both flows.
+
+Restores use `PerconaServerMongoDBRestore.spec.backupSource`, carrying the S3
+destination read back from the source backup, so the same artifact restores
+in-place **or** into a differently-named instance, and point-in-time recovery is
+available via `spec.options.recoveryTime`.
+
+## Placeholders
+
+`05-mongodb-src.yaml` / `20-mongodb-target.yaml` carry `REPLACE_WITH_PASSWORD`,
+`REPLACE_WITH_COSI_BUCKET_NAME`, `REPLACE_WITH_S3_ENDPOINT` (a URL *with* scheme,
+e.g. `https://seaweedfs-s3.tenant-root:8333`), and `REPLACE_WITH_S3_ACCESS_KEY` /
+`REPLACE_WITH_S3_SECRET_KEY`. `run-all.sh` resolves them from the provisioned
+`Bucket`'s `BucketInfo` Secret. `insecureSkipTLSVerify: true` lets pbm reach
+Cozystack's default self-signed in-cluster seaweedfs — the psmdb s3 storage has
+no CA-bundle field (unlike the MariaDB driver's `tls.caSecretKeyRef`), so
+skipping verification is the supported way to trust it. Drop it (default
+`false`) when the S3 endpoint is signed by a publicly-trusted CA.
+
+## Point-in-time recovery
+
+psmdb records an oplog stream between logical backups (pitr). To restore to a
+timestamp instead of the plain snapshot, add `recoveryTime` (RFC3339, the same
+option the CNPG/Postgres driver uses) to a RestoreJob:
+
+```yaml
+spec:
+  options:
+    recoveryTime: "2026-08-05T12:34:56Z"   # RFC3339 (UTC)
+```
+
+An empty/omitted `recoveryTime` restores the backup snapshot as taken. An
+unrecognised key under `spec.options` is ignored but reported as a
+`UnknownRestoreOption` Warning event on the RestoreJob.
+
+## Run it
+
+```sh
+# Defaults to NAMESPACE=tenant-root; override for a tenant namespace.
+NAMESPACE=tenant-root examples/backups/mongodb/run-all.sh
+# Tear everything down afterwards (idempotent).
+NAMESPACE=tenant-root examples/backups/mongodb/cleanup.sh
+```
+
+`run-all.sh` writes a sentinel document into the source, waits for the
+`BackupJob` to reach `Succeeded`, restores to a copy with a to-copy `RestoreJob`,
+and asserts the sentinel round-tripped through S3 into the restored copy while
+the source is left untouched. Set `SKIP_RESTORE=1` to stop after a successful
+backup.
+
+The to-copy restore currently ends with the target holding the source cluster's system users, so the target's own credentials stop authenticating and that last assertion fails; #3832 tracks it, and `SKIP_RESTORE=1` stops before that step.
+
+Same-namespace flows are the supported path. Cross-tenant restores (target in
+`tenant-test`, source's seaweedfs in `tenant-root`) are blocked by the per-tenant
+Cilium egress policy and stay a manual / dev-cluster flow.
+
+## Automated e2e
+
+The Chainsaw suite at `hack/e2e-chainsaw/mongodb/` drives this same `run-all.sh`
+as a second test (`mongodb-2-backup-roundtrip`), selected by Test-Impact
+Analysis whenever the mongodb app or the suite changes, and on every release
+cut. It runs in `tenant-root` against the in-cluster seaweedfs endpoint — the
+isolated e2e tenant cannot reach it across the Cilium egress policy, and the
+external ingress endpoint is an unroutable placeholder in the sandbox.
+
+It drives `run-all.sh` with `SKIP_RESTORE=1` and stops once the BackupJob succeeds, so the restore steps are not covered by CI while #3832 is open: a to-copy restore replays the source cluster's system users into the target, after which the target's own credentials no longer authenticate and the sentinel cannot be read back.
diff --git a/examples/backups/mongodb/cleanup.sh b/examples/backups/mongodb/cleanup.sh
new file mode 100755
index 0000000000..4db47906af
--- /dev/null
+++ b/examples/backups/mongodb/cleanup.sh
@@ -0,0 +1,44 @@
+#!/bin/bash
+# Best-effort teardown of everything the demo creates. Idempotent;
+# missing resources are skipped silently.
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "$SCRIPT_DIR/00-helpers.sh"
+
+print_header "Cleanup"
+
+log_substep "Deleting RestoreJobs..."
+kubectl -n "$NAMESPACE" delete restorejob.backups.cozystack.io \
+    "$RESTOREJOB_TOCOPY_NAME" mongodb-src-in-place --ignore-not-found
+
+log_substep "Deleting Plan + BackupJob + derived Backup artefacts..."
+kubectl -n "$NAMESPACE" delete plan.backups.cozystack.io "$PLAN_NAME" --ignore-not-found
+kubectl -n "$NAMESPACE" delete backupjob.backups.cozystack.io "$BACKUPJOB_NAME" --ignore-not-found
+# Only the Backups of THIS demo's apps — never `--all`: on a shared cluster the
+# namespace can hold Backup artefacts of other applications and flows.
+for b in $(kubectl -n "$NAMESPACE" get backups.backups.cozystack.io \
+        -o jsonpath='{range .items[*]}{.metadata.name} {.spec.applicationRef.name}{"\n"}{end}' 2>/dev/null |
+        awk -v src="$MONGODB_SRC_NAME" -v tgt="$MONGODB_TARGET_NAME" '$2 == src || $2 == tgt {print $1}'); do
+    kubectl -n "$NAMESPACE" delete backups.backups.cozystack.io "$b" --ignore-not-found
+done
+
+# The Cozystack BackupJob/RestoreJob own their operator-side psmdb.percona.com
+# Backup/Restore CRs only by the OwningJob labels (not OwnerReferences), so
+# deleting the Cozystack jobs does not cascade to them. Left behind, a stale
+# operator-side Backup would be reused by findMongoDBBackupForJob on the next
+# run against a bucket path that no longer exists. Prune them by owner.
+log_substep "Deleting operator-side psmdb.percona.com Backup/Restore CRs..."
+for owner in "$BACKUPJOB_NAME" "$RESTOREJOB_TOCOPY_NAME" mongodb-src-in-place; do
+    kubectl -n "$NAMESPACE" delete \
+        perconaservermongodbbackups.psmdb.percona.com,perconaservermongodbrestores.psmdb.percona.com \
+        -l "backups.cozystack.io/owned-by.BackupJobName=${owner}" --ignore-not-found
+done
+
+log_substep "Deleting MongoDB apps..."
+kubectl -n "$NAMESPACE" delete mongodb.apps.cozystack.io "$MONGODB_SRC_NAME" "$MONGODB_TARGET_NAME" --ignore-not-found
+
+log_substep "Deleting Bucket..."
+kubectl -n "$NAMESPACE" delete bucket.apps.cozystack.io "$BUCKET_NAME" --ignore-not-found
+
+log_success "Cleanup complete."
diff --git a/examples/backups/mongodb/run-all.sh b/examples/backups/mongodb/run-all.sh
new file mode 100755
index 0000000000..9793bea3b5
--- /dev/null
+++ b/examples/backups/mongodb/run-all.sh
@@ -0,0 +1,132 @@
+#!/bin/bash
+# Convenience runner + e2e harness for the MongoDB backup/restore demo.
+#
+# It applies the SAME numbered manifests a human reads (00-bucket.yaml ..
+# 30-restorejob-to-copy.yaml), filling the REPLACE_WITH_* placeholders from the
+# provisioned Bucket so the documented flow and the automated test can never
+# drift. Stops on the first failure.
+#
+# Flow: Bucket -> source MongoDB with backup.enabled (+ a sentinel document) ->
+# ad-hoc BackupJob against the cozy-default BackupClass (wait Succeeded) ->
+# empty target MongoDB + to-copy RestoreJob (wait Succeeded) -> assert the
+# sentinel round-tripped through S3 into the restored copy while the source
+# stays untouched.
+#
+# Why to-copy and not in-place: in-place replays the dump straight into the live
+# source cluster, so it cannot witness the restore on a separate instance.
+# To-copy leaves the source running and lands the marker document on a distinct
+# target, a stronger restore proof; the in-place dispatch is covered at the unit
+# level by the controller tests.
+#
+# Override NAMESPACE / endpoint via the environment; see 00-helpers.sh.
+# hack/e2e-chainsaw/mongodb/ drives this file as mongodb-2-backup-roundtrip.
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "$SCRIPT_DIR/00-helpers.sh"
+
+# App user password baked into the source spec; the demo writes the sentinel as
+# the operator databaseAdmin (see mongosh_exec), so this is just to satisfy the
+# chart's user declaration.
+MONGODB_PASSWORD="${MONGODB_PASSWORD:-Xai7Wepo0aeThie8}"
+
+# Substitute the manifest placeholders. $BUCKET / $S3_ENDPOINT / the access keys
+# are resolved from the Bucket below.
+subst() {
+    sed \
+        -e "s|REPLACE_WITH_COSI_BUCKET_NAME|${BUCKET}|g" \
+        -e "s|REPLACE_WITH_S3_ENDPOINT|${S3_ENDPOINT}|g" \
+        -e "s|REPLACE_WITH_S3_ACCESS_KEY|${S3_ACCESS_KEY}|g" \
+        -e "s|REPLACE_WITH_S3_SECRET_KEY|${S3_SECRET_KEY}|g" \
+        -e "s|REPLACE_WITH_PASSWORD|${MONGODB_PASSWORD}|g" \
+        "$SCRIPT_DIR/$1"
+}
+
+print_header "Step 00: Provision Bucket '${BUCKET_NAME}' in ${NAMESPACE}"
+kubectl -n "$NAMESPACE" apply -f "$SCRIPT_DIR/00-bucket.yaml"
+# 660s, above this generated release's 600s install timeout; see "Sizing an
+# HR-Ready budget" in docs/agents/e2e-testing.md.
+wait_hr_ready "bucket-${BUCKET_NAME}" 660
+wait_for_field bucketclaims.objectstorage.k8s.io "bucket-${BUCKET_NAME}" \
+    '{.status.bucketReady}' true "$NAMESPACE" 300
+wait_for_field bucketaccesses.objectstorage.k8s.io "bucket-${BUCKET_NAME}-${BUCKET_USER}" \
+    '{.status.accessGranted}' true "$NAMESPACE" 300
+if [[ "${COZY_E2E_BACKUP_PREFLIGHT:-0}" == "1" ]]; then
+    source "$SCRIPT_DIR/../../../hack/e2e-chainsaw/_lib/backup-access-preflight.sh"
+    cozy_backup_access_preflight "$NAMESPACE" "bucket-${BUCKET_NAME}-${BUCKET_USER}" 90
+fi
+
+log_substep "Reading bucket coordinates from BucketInfo Secret..."
+TMP=$(mktemp)
+trap 'rm -f "$TMP"' EXIT
+kubectl -n "$NAMESPACE" get secret "bucket-${BUCKET_NAME}-${BUCKET_USER}" \
+    -o jsonpath='{.data.BucketInfo}' | base64 -d > "$TMP"
+S3_ACCESS_KEY=$(jq -r '.spec.secretS3.accessKeyID' "$TMP")
+S3_SECRET_KEY=$(jq -r '.spec.secretS3.accessSecretKey' "$TMP")
+# S3_ENDPOINT can be overridden via the environment: BucketInfo advertises the
+# EXTERNAL ingress endpoint, which in-cluster Pods (the pbm agent runs inside
+# the mongod pod) cannot always reach or TLS-validate; the in-cluster
+# alternative is https://seaweedfs-s3.<ns>:8333, reached with
+# insecureSkipTLSVerify=true (psmdb s3 storage has no CA-bundle field).
+S3_ENDPOINT="${S3_ENDPOINT:-$(jq -r '.spec.secretS3.endpoint' "$TMP")}"
+BUCKET=$(jq -r '.spec.bucketName' "$TMP")
+for v in S3_ACCESS_KEY S3_SECRET_KEY S3_ENDPOINT BUCKET; do
+    [[ -n "${!v}" && "${!v}" != "null" ]] || { log_error "BucketInfo missing required field: ${v}"; exit 1; }
+done
+log_success "Bucket '${BUCKET}' at endpoint '${S3_ENDPOINT}'."
+
+print_header "Step 05: Deploy source MongoDB '${MONGODB_SRC_NAME}' with backups enabled"
+subst 05-mongodb-src.yaml | kubectl -n "$NAMESPACE" apply -f -
+# 660s, above this generated release's 600s install timeout; see "Sizing an
+# HR-Ready budget" in docs/agents/e2e-testing.md.
+wait_hr_ready "$MONGODB_SRC_CR" 660
+wait_psmdb_ready "$MONGODB_SRC_CR" 600
+
+print_header "Step 05b: Write a sentinel document so the backup has something to prove"
+SENTINEL_TOKEN="e2e-$(date +%s)-$$"
+mongosh_exec "$MONGODB_SRC_CR" \
+    "db.getSiblingDB('demo').e2e_sentinel.replaceOne({_id:1},{_id:1,token:'${SENTINEL_TOKEN}'},{upsert:true})"
+log_success "Sentinel token: ${SENTINEL_TOKEN}"
+
+print_header "Step 10: Submit ad-hoc BackupJob '${BACKUPJOB_NAME}' and wait for Succeeded"
+kubectl -n "$NAMESPACE" apply -f "$SCRIPT_DIR/10-backupjob-adhoc.yaml"
+wait_for_field backupjobs.backups.cozystack.io "$BACKUPJOB_NAME" \
+    '{.status.phase}' Succeeded "$NAMESPACE" 900 Failed
+BACKUP_NAME=$(kubectl -n "$NAMESPACE" get backupjobs.backups.cozystack.io "$BACKUPJOB_NAME" \
+    -o jsonpath='{.status.backupRef.name}')
+[[ -n "$BACKUP_NAME" ]] || { log_error "BackupJob succeeded but reported no backupRef"; exit 1; }
+log_success "Backup artefact: ${BACKUP_NAME}"
+
+if [[ "${SKIP_RESTORE:-0}" == "1" ]]; then
+    # hack/e2e-chainsaw/mongodb/ asserts this line to prove the skip really
+    # happened, so rewording it reds that suite with a bare match failure.
+    log_warning "SKIP_RESTORE=1: stopping after a successful backup."
+    exit 0
+fi
+
+print_header "Step 20/30: Restore to a copy '${MONGODB_TARGET_NAME}' and wait for Succeeded"
+subst 20-mongodb-target.yaml | kubectl -n "$NAMESPACE" apply -f -
+wait_hr_ready "$MONGODB_TARGET_CR" 660
+wait_psmdb_ready "$MONGODB_TARGET_CR" 600
+kubectl -n "$NAMESPACE" apply -f "$SCRIPT_DIR/30-restorejob-to-copy.yaml"
+wait_for_field restorejobs.backups.cozystack.io "$RESTOREJOB_TOCOPY_NAME" \
+    '{.status.phase}' Succeeded "$NAMESPACE" 900 Failed
+
+print_header "Step 30 verify: the sentinel round-tripped through S3 into the copy"
+GOT=$(mongosh_exec "$MONGODB_TARGET_CR" \
+    "print(db.getSiblingDB('demo').e2e_sentinel.findOne({_id:1}).token)" | tr -d '[:space:]')
+if [[ "$GOT" != "$SENTINEL_TOKEN" ]]; then
+    log_error "sentinel mismatch: target has '${GOT}', expected '${SENTINEL_TOKEN}'"
+    exit 1
+fi
+log_success "Round-trip verified: '${MONGODB_TARGET_NAME}' restored sentinel '${GOT}' from S3."
+
+# To-copy must not mutate the source. Regressing into a source-touching restore
+# would corrupt the running instance, so assert the source still reads back.
+SRC_GOT=$(mongosh_exec "$MONGODB_SRC_CR" \
+    "print(db.getSiblingDB('demo').e2e_sentinel.findOne({_id:1}).token)" | tr -d '[:space:]')
+if [[ "$SRC_GOT" != "$SENTINEL_TOKEN" ]]; then
+    log_error "source sentinel changed after to-copy restore: source has '${SRC_GOT}', expected '${SENTINEL_TOKEN}'"
+    exit 1
+fi
+log_success "Source '${MONGODB_SRC_NAME}' left untouched by the to-copy restore."
diff --git a/examples/backups/nats/00-helpers.sh b/examples/backups/nats/00-helpers.sh
index 2908526a01..e717f172e6 100755
--- a/examples/backups/nats/00-helpers.sh
+++ b/examples/backups/nats/00-helpers.sh
@@ -28,8 +28,10 @@ export RESTOREJOB_INPLACE_NAME="${RESTOREJOB_INPLACE_NAME:-nats-restore-inplace}
 export RESTOREJOB_TOCOPY_NAME="${RESTOREJOB_TOCOPY_NAME:-nats-restore-to-copy}"
 # natsio/nats-box ships the `nats` CLI plus curl + tar + sh - everything the
 # generic Job strategy needs, with no purpose-built backup image. The seed /
-# verify helpers below run it as a throwaway Pod via `kubectl run`.
+# verify helpers below run it as a long-lived Pod they `kubectl exec` into.
 export NATS_BOX_IMAGE="${NATS_BOX_IMAGE:-natsio/nats-box:0.14.5}"
+# Name of that long-lived CLI Pod; cleanup.sh removes it.
+export NATS_CLI_POD="${NATS_CLI_POD:-nats-cli}"
 
 log_info()    { echo -e "${BLUE}i${NC} $*" >&2; }
 log_success() { echo -e "${GREEN}OK${NC} $*" >&2; }
@@ -48,69 +50,88 @@ print_header() {
     echo -e "\n${MAGENTA}${BOLD}== $title ==${NC}\n" >&2
 }
 
-# Wait until a JSONPath value on a resource matches the desired string.
-wait_for_field() {
-    local resource_type="$1"
-    local resource_name="$2"
-    local jsonpath="$3"
-    local desired="$4"
-    local namespace="${5:-}"
-    local timeout="${6:-300}"
-
-    log_substep "Waiting for $resource_type/$resource_name $jsonpath to become '$desired'..."
-    local elapsed=0
-    local ns_flag=()
-    [[ -n "$namespace" ]] && ns_flag=(-n "$namespace")
-
-    while true; do
-        local current
-        current=$(kubectl get "$resource_type" "$resource_name" "${ns_flag[@]}" -o jsonpath="$jsonpath" 2>/dev/null || true)
-        if [[ "$current" == "$desired" ]]; then
-            log_success "$resource_type/$resource_name reached '$desired'"
-            return 0
-        fi
-        if [[ $elapsed -ge $timeout ]]; then
-            log_error "Timeout waiting for $resource_type/$resource_name (current: '$current', expected: '$desired')"
-            return 1
-        fi
-        sleep 5
-        elapsed=$((elapsed + 5))
-    done
-}
+# wait_for_field, wait_hr_ready and wait_deleted live in one file shared by
+# every backup walkthrough, so a fix to one reaches all of them.
+# shellcheck source-path=SCRIPTDIR source=../_lib/wait-helpers.sh
+source "$(dirname "${BASH_SOURCE[0]}")/../_lib/wait-helpers.sh"
 
 # In-cluster NATS client URL for the given application instance. The NATS app
 # names its client Service after the application (fullnameOverride=<name>) and
 # stores per-user passwords in the "<name>-credentials" Secret. The demo sets a
 # fixed password (NATS_PASSWORD) on both the source and restore-target apps, so
-# a single URL shape works everywhere.
+# a single URL shape works everywhere. The password is not in the URL: nats_cli
+# passes it to the CLI in NATS_PASSWORD on stdin, to keep it out of the exec
+# request URL the apiserver records in its audit log.
 nats_url() {
     local app="$1"
-    echo "nats://${NATS_USER}:${NATS_PASSWORD}@${app}.${NAMESPACE}.svc:4222"
+    echo "nats://${NATS_USER}@${app}.${NAMESPACE}.svc:4222"
+}
+
+# Ensure the long-lived nats-box CLI Pod exists and is Ready, so nats_cli can
+# exec into it. Idempotent: a Ready Pod this demo owns is reused across calls and
+# across the numbered demo scripts; a leftover in a terminal phase (Succeeded /
+# Failed) is replaced rather than waited on; and a same-named Pod this demo does
+# not own is refused rather than hijacked or deleted. cleanup.sh removes it.
+# Every step returns on failure explicitly: this runs as the left side of
+# `|| return 1`, and some callers also wrap it in $(...), so errexit never
+# applies inside it and a bare failure would carry on to the next step.
+nats_cli_pod() {
+    local phase owner
+    phase=$(kubectl -n "$NAMESPACE" get pod "$NATS_CLI_POD" --ignore-not-found -o jsonpath='{.status.phase}') || return 1
+    owner=$(kubectl -n "$NAMESPACE" get pod "$NATS_CLI_POD" --ignore-not-found -o jsonpath='{.metadata.labels.cozystack\.io/backup-demo}') || return 1
+    if [ -n "$phase" ] && [ "$owner" != "nats" ]; then
+        log_error "Pod $NAMESPACE/$NATS_CLI_POD exists but this demo does not own it; refusing to use or delete it"
+        return 1
+    fi
+    if [ "$phase" != "Running" ] && [ "$phase" != "Pending" ]; then
+        kubectl -n "$NAMESPACE" delete pod "$NATS_CLI_POD" --grace-period=1 --ignore-not-found >/dev/null || return 1
+        kubectl -n "$NAMESPACE" run "$NATS_CLI_POD" --image="$NATS_BOX_IMAGE" \
+            --labels=cozystack.io/backup-demo=nats \
+            --restart=Never --command -- sleep infinity >/dev/null || return 1
+    fi
+    kubectl -n "$NAMESPACE" wait --for=condition=Ready "pod/$NATS_CLI_POD" \
+        --timeout=5m >/dev/null
 }
 
-# Run a `nats` CLI invocation against an application instance from a throwaway
-# nats-box Pod. Args after the app name are passed verbatim to `nats`.
-# Example: nats_cli "$NATS_NAME" stream ls
+# Run a `nats` CLI invocation against an application instance. Args after the app
+# name are passed verbatim to `nats`. Example: nats_cli "$NATS_NAME" stream ls
+#
+# The command runs by `kubectl exec` in the long-lived nats-box Pod, not a
+# throwaway `kubectl run -i` Pod per call. A throwaway Pod's stdout comes back
+# over an attach that only carries what the container writes after the attach
+# registers, so a CLI that finishes in between returns empty with exit 0. An
+# exec'd process owns its pipes, so its output cannot be missed that way, and
+# kubectl's and the CLI's stderr stay attached so a failed read says why.
+#
+# The password travels in NATS_PASSWORD on stdin rather than in the --server URL,
+# which the exec request carries into the apiserver's audit log. The nats CLI
+# reads NATS_PASSWORD from its environment.
 nats_cli() {
     local app="$1"; shift
-    kubectl -n "$NAMESPACE" run "nats-cli-$RANDOM" \
-        --image="$NATS_BOX_IMAGE" --restart=Never --rm -i --quiet \
-        --command -- nats --server "$(nats_url "$app")" "$@"
+    nats_cli_pod || return 1
+    printf '%s\n' "$NATS_PASSWORD" | kubectl -n "$NAMESPACE" exec -i "$NATS_CLI_POD" -- sh -c '
+            IFS= read -r NATS_PASSWORD || true
+            export NATS_PASSWORD
+            server=$1; shift
+            exec nats --server "$server" "$@"
+        ' sh "$(nats_url "$app")" "$@"
 }
 
 # Number of messages currently stored in a JetStream stream, or "" if the
-# stream does not exist.
+# stream does not exist. Only jq's stderr is dropped (a missing stream prints a
+# harmless "stream not found" there); nats_cli's own stderr stays, so an exec
+# that fails says why instead of surfacing as an empty count.
 stream_message_count() {
     local app="$1"
     local stream="$2"
-    nats_cli "$app" stream info "$stream" --json 2>/dev/null \
+    nats_cli "$app" stream info "$stream" --json \
         | jq -r '.state.messages // empty' 2>/dev/null | tr -d '[:space:]'
 }
 
 # Create the "<app>-backup-s3" Secret the Job strategy Pod consumes, from the
 # bucket coordinates cached by 03-create-bucket.sh. The generic Job strategy -
 # unlike the app-specific drivers - has no chart support to emit this Secret,
-# so the tenant provides it. Called for the source app (step 04) and the
+# so the demo provides it. Called for the source app (step 04) and the
 # restore target (step 07).
 create_s3_secret() {
     local app="$1"
diff --git a/examples/backups/nats/01-create-strategy.sh b/examples/backups/nats/01-create-strategy.sh
index da5f84b395..1e3b803be0 100755
--- a/examples/backups/nats/01-create-strategy.sh
+++ b/examples/backups/nats/01-create-strategy.sh
@@ -64,7 +64,7 @@ spec:
               value: "{{ if .Backup }}{{ .Backup.ApplicationRef.Name }}{{ end }}"
             - name: MODE
               value: "{{ .Mode }}"
-            # S3 coordinates from the tenant-provided <release>-backup-s3 Secret
+            # S3 coordinates from the demo-provided <release>-backup-s3 Secret
             # (created by create_s3_secret in 00-helpers.sh from the Bucket).
             - name: AWS_ACCESS_KEY_ID
               valueFrom:
diff --git a/examples/backups/nats/03-create-bucket.sh b/examples/backups/nats/03-create-bucket.sh
index 10bf3cf328..b12ae50b3f 100755
--- a/examples/backups/nats/03-create-bucket.sh
+++ b/examples/backups/nats/03-create-bucket.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Step 03: Provision an in-cluster Bucket and cache its S3 coordinates. Unlike
 # the ClickHouse demo - where the chart emits the backup Secret from
-# spec.backup.* - the generic Job strategy has no chart support, so the tenant
+# spec.backup.* - the generic Job strategy has no chart support, so the demo
 # materialises the "<app>-backup-s3" Secret itself. This step only caches the
 # coordinates; create_s3_secret (00-helpers.sh) turns them into per-app Secrets
 # in steps 04 and 07.
diff --git a/examples/backups/nats/90-scenario-admin-prepare.md b/examples/backups/nats/90-scenario-admin-prepare.md
index 2314212e69..e5357443c2 100644
--- a/examples/backups/nats/90-scenario-admin-prepare.md
+++ b/examples/backups/nats/90-scenario-admin-prepare.md
@@ -1,8 +1,6 @@
 # Scenario: Cluster admin prepares NATS backups
 
-A cluster administrator performs the cluster-level preparation once. Tenants
-will then be able to back up and restore their NATS applications by referencing
-the BackupClass created here, with no further admin action.
+A cluster administrator performs the cluster-level preparation once. Tenant admins can then back up and restore their NATS applications with a `BackupJob` or `RestoreJob` that references the BackupClass created here. The demo scripts around those jobs still need admin access, because they create Secrets and work through a CLI Pod; the README's step table says which part of each step a tenant admin can do.
 
 ## Prerequisites
 
@@ -10,9 +8,7 @@ the BackupClass created here, with no further admin action.
   backupstrategy-controller installed.
 - `kubectl` access with permissions to create cluster-scoped
   `Job.strategy.backups.cozystack.io` and `BackupClass.backups.cozystack.io`.
-- Reachable S3-compatible storage. The demo uses the in-cluster `Bucket` app
-  (step 03); the tenant turns its coordinates into a `<app>-backup-s3` Secret
-  that the strategy Pod reads (step 04 / 07).
+- Reachable S3-compatible storage. The demo uses the in-cluster `Bucket` app (step 03), and steps 04 and 07 turn its coordinates into a `<app>-backup-s3` Secret that the strategy Pod reads. Creating that Secret needs admin access, since no tenant role grants `create` on `secrets`.
 
 ## Steps
 
diff --git a/examples/backups/nats/91-scenario-user-backup.md b/examples/backups/nats/91-scenario-user-backup.md
index 5af74c5a91..adc5c983d7 100644
--- a/examples/backups/nats/91-scenario-user-backup.md
+++ b/examples/backups/nats/91-scenario-user-backup.md
@@ -2,13 +2,12 @@
 
 This scenario assumes the admin steps (`01-...`, `02-...`) have already run.
 
+The user's own action here, at the tenant admin level, is the `BackupJob` in step 05, plus creating the `Bucket` and the `NATS`. Steps 03 and 04 as scripted need admin access: they read and create Secrets, wait on HelmReleases and the `StatefulSet`, and seed the stream through a CLI Pod, which no tenant role allows. The README's step table has the details.
+
 ## Prerequisites
 
 - Tenant namespace (default: `tenant-test`).
-- A Cozystack `Bucket` (step 03) and the `<app>-backup-s3` Secret derived from
-  it (step 04). The generic `Job` strategy has no chart support to emit this
-  Secret, so the tenant creates it from the bucket's `BucketInfo` (see
-  `create_s3_secret` in `00-helpers.sh`).
+- A Cozystack `Bucket` (step 03) and the `<app>-backup-s3` Secret derived from it (step 04). The generic `Job` strategy has no chart support to emit this Secret, so step 04 creates it from the bucket's `BucketInfo` (see `create_s3_secret` in `00-helpers.sh`). Creating it needs admin access.
 - A `NATS` application with JetStream enabled and a stream holding data.
 
 ## Steps
diff --git a/examples/backups/nats/92-scenario-user-restore.md b/examples/backups/nats/92-scenario-user-restore.md
index 1dbd1cc356..9f0e7c02ae 100644
--- a/examples/backups/nats/92-scenario-user-restore.md
+++ b/examples/backups/nats/92-scenario-user-restore.md
@@ -2,6 +2,8 @@
 
 Two restore variants are supported.
 
+The user's own action in both variants, at the tenant admin level, is the `RestoreJob`, plus the second `NATS` in variant B. The scripts as written need admin access: variant A deletes and checks the stream through a CLI Pod, and variant B checks the stream the same way, creates the target's Secret and waits on its `HelmRelease` and `StatefulSet`, none of which a tenant role allows. The README's step table has the details.
+
 ## A. In-place restore
 
 Restore back into the same NATS application.
diff --git a/examples/backups/nats/README.md b/examples/backups/nats/README.md
index f8adecbf30..30948e65e1 100644
--- a/examples/backups/nats/README.md
+++ b/examples/backups/nats/README.md
@@ -30,12 +30,12 @@ driver, with tools you already have.
 | `00-helpers.sh` | Shared bash helpers, env defaults, and the `nats`/S3-secret helpers; sourced by every step. | n/a |
 | `01-create-strategy.sh` | Creates the cluster-scoped `Job` strategy (the nats-box `PodTemplateSpec`). | admin |
 | `02-create-backupclass.sh` | Maps `apps.cozystack.io/NATS` to that strategy, with `stream`/`natsUser` parameters. | admin |
-| `03-create-bucket.sh` | Provisions a `Bucket` and caches its S3 coordinates into `.bucket-info.env` (chmod 600; raw access keys). `cleanup.sh` removes this file. | tenant |
-| `04-create-nats.sh` | Provisions a `NATS` instance, creates the `<app>-backup-s3` Secret, seeds a JetStream stream with sentinel messages. | tenant |
+| `03-create-bucket.sh` | Provisions a `Bucket` and caches its S3 coordinates into `.bucket-info.env` (chmod 600; raw access keys). `cleanup.sh` removes this file. | **admin**. A tenant admin can create the `Bucket` itself, but the script also waits on its `HelmRelease` and COSI objects and reads the `bucket-<name>-backup` Secret; no tenant role grants access to `helmreleases` or `objectstorage.k8s.io`, or `get` on that Secret |
+| `04-create-nats.sh` | Provisions a `NATS` instance, creates the `<app>-backup-s3` Secret, seeds a JetStream stream with sentinel messages. | **admin**. A tenant admin can create the `NATS` itself, but the script also waits on its `HelmRelease` and `StatefulSet`, creates the Secret, and seeds the stream through a CLI Pod it execs into; no tenant role grants access to `helmreleases` or `statefulsets`, `create` on `secrets` or `pods`, or `pods/exec` |
 | `05-create-backupjob.sh` | Submits a `BackupJob` and waits for Succeeded. | tenant |
-| `06-restore-in-place.sh` | Deletes the stream and restores it into the same instance via `RestoreJob`. | tenant |
-| `07-restore-to-copy.sh` | Provisions a second `NATS` and restores into it via `RestoreJob.spec.targetApplicationRef`. | tenant |
-| `cleanup.sh` | Removes everything created by the demo. | admin or tenant |
+| `06-restore-in-place.sh` | Deletes the stream and restores it into the same instance via `RestoreJob`. | **admin**. A tenant admin can submit the `RestoreJob`, but the script deletes and checks the stream through the CLI Pod; no tenant role grants `create` on `pods` or `pods/exec` |
+| `07-restore-to-copy.sh` | Provisions a second `NATS` and restores into it via `RestoreJob.spec.targetApplicationRef`. | **admin**, for the same reasons as step 04. The tenant admin's part is the second `NATS` and the `RestoreJob` |
+| `cleanup.sh` | Removes everything created by the demo. | **admin**: it deletes Secrets, the `Backup`, and the cluster-scoped `BackupClass` and strategy, and no tenant role grants `delete` on any of them |
 | `run-all.sh` | Convenience runner that executes 01..07 in order. | demo |
 | `90-scenario-admin-prepare.md` | Narrative for the admin preparation steps. | docs |
 | `91-scenario-user-backup.md` | Narrative for the user backup flow. | docs |
@@ -72,7 +72,7 @@ All variables come from `00-helpers.sh`:
 
 - **Not run in CI.** Like every other directory under `examples/backups/`, this
   demo is a runnable reference, not an automated regression test — the e2e
-  harness (`hack/e2e-apps/*.bats`) does not exercise backup examples. Run it by
+  harness (`hack/e2e-chainsaw/`) does not exercise backup examples. Run it by
   hand against a cluster.
 - **`nats` CLI specifics.** The strategy invokes `nats stream backup`/`nats
   stream restore`; flag names can vary across `nats` CLI versions. Pin
diff --git a/examples/backups/nats/cleanup.sh b/examples/backups/nats/cleanup.sh
index 58d29d5527..40788695be 100755
--- a/examples/backups/nats/cleanup.sh
+++ b/examples/backups/nats/cleanup.sh
@@ -16,6 +16,7 @@ kubectl -n "$NAMESPACE" delete secret "${NATS_RESTORE_NAME}-backup-s3" --ignore-
 kubectl -n "$NAMESPACE" delete secret "${NATS_NAME}-backup-s3" --ignore-not-found
 kubectl -n "$NAMESPACE" delete nats "$NATS_RESTORE_NAME" --ignore-not-found
 kubectl -n "$NAMESPACE" delete nats "$NATS_NAME" --ignore-not-found
+kubectl -n "$NAMESPACE" delete pod -l cozystack.io/backup-demo=nats --grace-period=1 --ignore-not-found
 kubectl -n "$NAMESPACE" delete bucket "$BUCKET_NAME" --ignore-not-found
 rm -f "$SCRIPT_DIR/.bucket-info.env"
 kubectl delete backupclass "$BACKUPCLASS_NAME" --ignore-not-found
diff --git a/examples/backups/postgres/00-helpers.sh b/examples/backups/postgres/00-helpers.sh
new file mode 100755
index 0000000000..ac004e504a
--- /dev/null
+++ b/examples/backups/postgres/00-helpers.sh
@@ -0,0 +1,144 @@
+#!/bin/bash
+# Shared helpers for the PostgreSQL backup/restore demo.
+# Source this file in other scripts: source "$(dirname "$0")/00-helpers.sh"
+
+export RED='\033[0;31m'
+export GREEN='\033[0;32m'
+export YELLOW='\033[1;33m'
+export BLUE='\033[0;34m'
+export MAGENTA='\033[0;35m'
+export CYAN='\033[0;36m'
+export WHITE='\033[1;37m'
+export NC='\033[0m'
+export BOLD='\033[1m'
+
+# Default settings (override via environment).
+export NAMESPACE="${NAMESPACE:-tenant-root}"
+export BUCKET_NAME="${BUCKET_NAME:-pg-backups}"
+export PG_SRC_NAME="${PG_SRC_NAME:-pg-src}"
+export PG_TARGET_NAME="${PG_TARGET_NAME:-pg-target}"
+# The apps/postgres chart names the cnpg.io Cluster (and its Pods'
+# cnpg.io/cluster label) after the Helm release, which is postgres-<app>.
+export PG_SRC_CLUSTER="postgres-${PG_SRC_NAME}"
+export PG_TARGET_CLUSTER="postgres-${PG_TARGET_NAME}"
+export STRATEGY_NAME="${STRATEGY_NAME:-cnpg-strategy-default}"
+export BACKUPCLASS_NAME="${BACKUPCLASS_NAME:-postgres-cnpg}"
+export BACKUPJOB_NAME="${BACKUPJOB_NAME:-pg-src-adhoc}"
+# A second ad-hoc BackupJob taken after the PITR marker writes; its completion
+# is the deterministic "WAL past the recovery target is archived" gate for the
+# point-in-time restore (see run-all.sh step 45).
+export BACKUPJOB_POSTMARKER_NAME="${BACKUPJOB_POSTMARKER_NAME:-pg-src-postmarker}"
+export RESTOREJOB_TOCOPY_NAME="${RESTOREJOB_TOCOPY_NAME:-pg-src-to-pg-target}"
+export RESTOREJOB_PITR_NAME="${RESTOREJOB_PITR_NAME:-pg-src-to-pg-target-pitr}"
+export RESTOREJOB_UNREACHABLE_NAME="${RESTOREJOB_UNREACHABLE_NAME:-pg-src-to-pg-target-unreachable}"
+export RESTOREJOB_INPLACE_NAME="${RESTOREJOB_INPLACE_NAME:-pg-src-in-place}"
+export PLAN_NAME="${PLAN_NAME:-pg-src-daily}"
+
+# S3 endpoint CA. cozystack's default seaweedfs serves its S3 endpoint with a
+# self-signed certificate whose CA lives in this Secret; the demo copies its
+# ca.crt into a per-app Secret the barman-cloud ObjectStore trusts via
+# endpointCA. The name follows the seaweedfs chart's fullnameOverride
+# ("seaweedfs" -> "seaweedfs-ca-cert"); run-all.sh auto-discovers the CA
+# Certificate's actual secret when this default is absent, so an upstream
+# fullname change does not silently break the copy. On a cluster whose S3
+# endpoint is signed by a publicly-trusted CA, set S3_CA_SECRET="" to skip the
+# copy and drop endpointCA from the manifests.
+export S3_CA_SECRET="${S3_CA_SECRET:-seaweedfs-ca-cert}"
+export S3_CA_NAMESPACE="${S3_CA_NAMESPACE:-tenant-root}"
+export S3_CA_KEY="${S3_CA_KEY:-ca.crt}"
+
+log_info()    { echo -e "${BLUE}i${NC} $*" >&2; }
+log_success() { echo -e "${GREEN}OK${NC} $*" >&2; }
+log_warning() { echo -e "${YELLOW}!${NC} $*" >&2; }
+log_error()   { echo -e "${RED}x${NC} $*" >&2; }
+log_step()    { echo -e "\n${MAGENTA}${BOLD}> $*${NC}" >&2; }
+log_substep() { echo -e "${CYAN}  -> $*${NC}" >&2; }
+
+print_header() {
+    echo -e "\n${MAGENTA}${BOLD}== $1 ==${NC}\n" >&2
+}
+
+# wait_for_field, wait_hr_ready and wait_deleted live in one file shared by
+# every backup walkthrough, so a fix to one reaches all of them.
+# shellcheck source-path=SCRIPTDIR source=../_lib/wait-helpers.sh
+source "$(dirname "${BASH_SOURCE[0]}")/../_lib/wait-helpers.sh"
+
+# Name of the primary pod of a cnpg.io Cluster (the one accepting writes).
+cnpg_primary_pod() {
+    local cluster="$1"
+    kubectl -n "$NAMESPACE" get pod \
+        -l "cnpg.io/cluster=${cluster},cnpg.io/instanceRole=primary" \
+        -o name 2>/dev/null | head -n1
+}
+
+# Run a psql statement on a cnpg.io Cluster's primary. Args: <cluster> <db> <sql>
+psql_exec() {
+    local cluster="$1" db="$2" sql="$3"
+    local pod
+    pod=$(cnpg_primary_pod "$cluster")
+    [[ -n "$pod" ]] || { log_error "no primary pod for cnpg cluster '$cluster'"; return 1; }
+    kubectl -n "$NAMESPACE" exec "$pod" -c postgres -- \
+        psql -U postgres -d "$db" -tAc "$sql"
+}
+
+# Run a psql statement AS the application user over TCP (via the cluster's -rw
+# Service), forcing password authentication. psql_exec above connects as the
+# in-pod postgres superuser through the local socket (peer auth) and so never
+# exercises a user's password; only this path proves the password the
+# <release>-credentials Secret advertises actually authenticates. The password is
+# read from that chart-managed Secret with jq, not a jsonpath: a username may
+# contain a '.', and jsonpath's `{.data['a.b']}` treats the dot as a path step
+# and returns nothing, so a dotted user would read an empty password and time out
+# on a credential that is fine. jq indexes the key as a literal string. The chart
+# names the CNPG Cluster, the -rw Service and the credentials Secret all after the
+# release, so the cluster IS the release here - derive the Secret from it rather
+# than taking a separate name that a caller can get wrong (a release/app-name
+# mix-up read a Secret that never exists and made every login time out).
+# Args: <cluster> <user> <db> <sql>
+psql_app_exec() {
+    local cluster="$1" user="$2" db="$3" sql="$4"
+    local pod pw
+    pod=$(cnpg_primary_pod "$cluster")
+    [[ -n "$pod" ]] || { log_error "no primary pod for cnpg cluster '$cluster'"; return 1; }
+    pw=$(kubectl -n "$NAMESPACE" get secret "${cluster}-credentials" -o json \
+        | jq -r --arg u "$user" '.data[$u] // empty' | base64 -d)
+    [[ -n "$pw" ]] || { log_error "no password for user '${user}' in ${cluster}-credentials"; return 1; }
+    kubectl -n "$NAMESPACE" exec "$pod" -c postgres -- \
+        env PGPASSWORD="$pw" psql -h "${cluster}-rw" -U "$user" -d "$db" -tAc "$sql"
+}
+
+# Block until the application user can authenticate against a cluster, or fail
+# after <timeout>s. Needed after a to-copy restore: the driver clears
+# bootstrap.enabled once recovery converges so the chart's init-job re-runs
+# ALTER ROLE ... WITH PASSWORD, converging the recovered roles (which carry the
+# source's password hashes) onto the freshly generated <release>-credentials
+# Secret. That convergence is asynchronous - a HelmRelease upgrade plus its
+# post-upgrade init-job hook - so this is a readiness wait on an eventually
+# consistent property, not a retry over a deterministic step.
+# Args: <cluster> <user> <db> <timeout>
+wait_for_app_login() {
+    local cluster="$1" user="$2" db="$3" timeout="${4:-300}"
+    local elapsed=0 errfile
+    errfile=$(mktemp)
+    log_substep "Waiting for user '${user}' to authenticate against ${cluster}..."
+    while true; do
+        # Success is decided on stdout alone (the '1' from SELECT 1), so a stray
+        # notice on stderr cannot read as a failure. stderr is kept in errfile,
+        # not discarded: a transient not-yet-converged attempt stays quiet, but
+        # the LAST attempt's stderr is what names the cause on timeout (a missing
+        # password, or the wrong Secret) - without it a real failure reads as a
+        # generic timeout.
+        if [[ "$(psql_app_exec "$cluster" "$user" "$db" 'SELECT 1;' 2>"$errfile" | tr -d '[:space:]')" == "1" ]]; then
+            rm -f "$errfile"
+            log_success "user '${user}' authenticated against ${cluster}"
+            return 0
+        fi
+        if [[ $elapsed -ge $timeout ]]; then
+            log_error "Timeout waiting for user '${user}' to authenticate against ${cluster}: the credentials Secret advertises a password the roles never received (bootstrap not cleared, or the init-job did not reconcile). Last attempt: $(cat "$errfile")"
+            rm -f "$errfile"
+            return 1
+        fi
+        sleep 5
+        elapsed=$((elapsed + 5))
+    done
+}
diff --git a/examples/backups/postgres/05-postgres-src.yaml b/examples/backups/postgres/05-postgres-src.yaml
index 409d649ddb..35685d40e3 100644
--- a/examples/backups/postgres/05-postgres-src.yaml
+++ b/examples/backups/postgres/05-postgres-src.yaml
@@ -28,8 +28,7 @@ spec:
         admin:
           - app
   users:
-    app:
-      password: REPLACE_WITH_PASSWORD
+    app: {}
   backup:
     enabled: true
     # schedule intentionally empty: we do NOT use the chart's legacy
diff --git a/examples/backups/postgres/10-cnpg-strategy.yaml b/examples/backups/postgres/10-cnpg-strategy.yaml
index 91acb68fb3..13eba0c3f6 100644
--- a/examples/backups/postgres/10-cnpg-strategy.yaml
+++ b/examples/backups/postgres/10-cnpg-strategy.yaml
@@ -9,7 +9,12 @@ metadata:
   name: cnpg-strategy-default
 spec:
   template:
-    serverName: "{{ .Application.metadata.name }}"
+    # serverName (the WAL-archive S3 prefix) is intentionally NOT set: the
+    # driver preserves whatever prefix the live cnpg.io Cluster already
+    # archives under (the chart pins it to the Helm release name,
+    # postgres-<app>), and only a cluster with no plugin attached would take a
+    # strategy-supplied value. Setting a different name here would be ignored
+    # for chart-managed clusters and would only cause confusion.
     barmanObjectStore:
       # destinationPath uses the COSI BucketClaim's actual bucket name (look
       # it up via `kubectl -n <ns> get bucketclaim bucket-<name> -o
diff --git a/examples/backups/postgres/30-postgres-target.yaml b/examples/backups/postgres/30-postgres-target.yaml
index 4989c1da43..d1bec7f03b 100644
--- a/examples/backups/postgres/30-postgres-target.yaml
+++ b/examples/backups/postgres/30-postgres-target.yaml
@@ -4,11 +4,12 @@
 # those values so the new cluster's restore_command can fetch WALs from
 # the source's S3 archive.
 #
-# The CI e2e (hack/e2e-apps/backup-postgres.bats) deploys this manifest
-# in the same namespace as pg-src, exercising the same-namespace to-copy
-# happy path. The cross-tenant variant (target in tenant-test, source's
-# seaweedfs in tenant-root) is blocked by the per-tenant Cilium egress
-# policy and stays a manual / dev-cluster flow.
+# This manifest is the reference for the same-namespace to-copy happy path:
+# deploy it alongside pg-src and the restore leaves the source running. The
+# postgres backup e2e (hack/e2e-chainsaw/postgres, postgres-2-backup-roundtrip)
+# drives exactly this flow via run-all.sh in CI. The
+# cross-tenant variant (target in tenant-test, source's seaweedfs in
+# tenant-root) is blocked by the per-tenant Cilium egress policy.
 ---
 apiVersion: apps.cozystack.io/v1alpha1
 kind: Postgres
diff --git a/examples/backups/postgres/35-restorejob-in-place.yaml b/examples/backups/postgres/35-restorejob-in-place.yaml
index 2c04abc5a5..16d7253e74 100644
--- a/examples/backups/postgres/35-restorejob-in-place.yaml
+++ b/examples/backups/postgres/35-restorejob-in-place.yaml
@@ -2,7 +2,12 @@
 # back into pg-src. WARNING: deletes the live cnpg.io Cluster and its PVCs
 # before re-bootstrapping from S3 - any data not yet streamed to WAL is lost.
 #
-# Optional: spec.options.recoveryTime (RFC3339) for point-in-time recovery.
+# Optional: spec.options.recoveryTime (RFC3339) turns this into a point-in-time
+# recovery, same as the to-copy variant in 45-restorejob-pitr.yaml (which the
+# e2e drives with a real, in-window timestamp). Uncomment and set a timestamp
+# inside your recoverable window - see 45-restorejob-pitr.yaml and
+# docs/operations/backup-classes.md ("Point-in-time recovery") for how to find
+# the earliest/latest restorable time.
 ---
 apiVersion: backups.cozystack.io/v1alpha1
 kind: RestoreJob
diff --git a/examples/backups/postgres/40-restorejob-to-copy.yaml b/examples/backups/postgres/40-restorejob-to-copy.yaml
index 27b2aa7d4c..00fc6d4520 100644
--- a/examples/backups/postgres/40-restorejob-to-copy.yaml
+++ b/examples/backups/postgres/40-restorejob-to-copy.yaml
@@ -3,9 +3,10 @@
 # from the source's Barman archive while pg-src stays running and
 # untouched.
 #
-# Driven by the CI e2e (hack/e2e-apps/backup-postgres.bats) for the
-# same-namespace happy path. The cross-tenant variant stays manual; see
-# 30-postgres-target.yaml for the network-policy reason.
+# The reference for the same-namespace happy path, and the final step the
+# postgres backup e2e (hack/e2e-chainsaw/postgres, postgres-2-backup-roundtrip)
+# asserts via run-all.sh in CI. The cross-tenant variant
+# stays manual; see 30-postgres-target.yaml for the network-policy reason.
 ---
 apiVersion: backups.cozystack.io/v1alpha1
 kind: RestoreJob
diff --git a/examples/backups/postgres/45-restorejob-pitr.yaml b/examples/backups/postgres/45-restorejob-pitr.yaml
new file mode 100644
index 0000000000..7c9434f0c5
--- /dev/null
+++ b/examples/backups/postgres/45-restorejob-pitr.yaml
@@ -0,0 +1,34 @@
+# Point-in-time recovery (PITR) to a copy.
+#
+# Restores the source's Barman archive into pg-target as of a specific instant
+# via spec.options.recoveryTime (RFC3339). The chart maps it onto CNPG's
+# bootstrap.recovery.recoveryTarget.targetTime: PostgreSQL restores the newest
+# base backup taken at/before that instant and replays archived WAL up to it,
+# so the copy reflects the database exactly as of recoveryTime - later writes
+# are absent.
+#
+# recoveryTime MUST fall inside the recoverable window: at/after the base
+# backup's completion and at/before the latest WAL shipped to object storage.
+# A target past the latest archived WAL cannot converge - the RestoreJob fails
+# with condition Ready=False/RecoveryTargetUnreachable instead of hanging. See
+# docs/operations/backup-classes.md ("Point-in-time recovery") for how to
+# discover the earliest/latest restorable time.
+#
+# run-all.sh substitutes REPLACE_WITH_RECOVERY_TIME with a timestamp it captures
+# between two marker writes, then asserts the pre-marker row is present and the
+# post-marker row is absent. Editing by hand, replace it with an RFC3339
+# timestamp inside your window, e.g. "2026-05-01T12:00:00Z".
+---
+apiVersion: backups.cozystack.io/v1alpha1
+kind: RestoreJob
+metadata:
+  name: pg-src-to-pg-target-pitr
+spec:
+  backupRef:
+    name: pg-src-adhoc
+  targetApplicationRef:
+    apiGroup: apps.cozystack.io
+    kind: Postgres
+    name: pg-target
+  options:
+    recoveryTime: "REPLACE_WITH_RECOVERY_TIME"
diff --git a/examples/backups/postgres/README.md b/examples/backups/postgres/README.md
new file mode 100644
index 0000000000..998149101f
--- /dev/null
+++ b/examples/backups/postgres/README.md
@@ -0,0 +1,38 @@
+# PostgreSQL backup & restore (barman-cloud plugin)
+
+End-to-end demo of backing up a cozystack `Postgres` application to S3 and restoring it, using the CloudNativePG **barman-cloud plugin** (the native `spec.backup.barmanObjectStore` path is deprecated in CNPG 1.27 and removed in 1.29). Backups flow through the platform `BackupClass` + `CNPG` strategy so one strategy CR serves every `Postgres` instance in the tenant.
+
+## What it provisions
+
+The numbered manifests are the documented flow; a human can read and apply them by hand, and `run-all.sh` drives the same files for a smoke test.
+
+- `00-bucket.yaml` — a cozystack-managed S3 `Bucket` for the backups, with a `backup` user.
+- `05-postgres-src.yaml` — the source `Postgres`, with `backup.enabled: true` so `archive_command` streams WALs from helm-install onwards.
+- `10-cnpg-strategy.yaml` — the `CNPG` strategy templated against the live application.
+- `15-backupclass.yaml` — maps `Kind=Postgres` to that strategy.
+- `20-plan.yaml` — an optional cron `Plan` for recurring backups.
+- `25-backupjob-adhoc.yaml` — an ad-hoc `BackupJob`.
+- `30-postgres-target.yaml` + `40-restorejob-to-copy.yaml` — restore into a fresh copy, leaving the source running.
+- `35-restorejob-in-place.yaml` — the destructive in-place restore variant.
+- `45-restorejob-pitr.yaml` — point-in-time recovery: restore into the copy as of a specific `spec.options.recoveryTime` (RFC3339).
+
+## Placeholders and derived Secrets
+
+`05-postgres-src.yaml` and `10-cnpg-strategy.yaml` carry `REPLACE_WITH_COSI_BUCKET_NAME` and `REPLACE_WITH_S3_ENDPOINT` (the demo `app` user's password is chart-generated, not substituted). They also reference two Secrets, `<app>-cnpg-backup-creds` (the S3 credentials the barman-cloud sidecar reads) and `<app>-cnpg-backup-ca` (the CA it trusts for a self-signed endpoint). The strategy template renders those names against whichever application it drives, so the restore target needs its own pair too — a restore against `pg-target` looks up `pg-target-cnpg-backup-*`. `run-all.sh` resolves the placeholders from the provisioned `Bucket`'s `BucketInfo` Secret and materialises the pair for both the source and the target; editing by hand, you copy the coordinates from `kubectl -n <ns> get secret bucket-<name>-backup -o jsonpath='{.data.BucketInfo}'` and the CA from the seaweedfs CA secret in `tenant-root` (`seaweedfs-ca-cert` by default; `run-all.sh` auto-discovers it from the cert-manager Certificate if the name differs).
+
+Drop the `endpointCA` block from `05`/`10` (and set `S3_CA_SECRET=""` for `run-all.sh`) when the S3 endpoint is signed by a publicly-trusted CA.
+
+## Run it
+
+```sh
+# Defaults to NAMESPACE=tenant-root; override for a tenant namespace.
+NAMESPACE=tenant-root examples/backups/postgres/run-all.sh
+# Tear everything down afterwards (idempotent).
+NAMESPACE=tenant-root examples/backups/postgres/cleanup.sh
+```
+
+`run-all.sh` writes a sentinel row into the source, waits for the `BackupJob` to reach `Succeeded`, restores to a copy, and asserts the sentinel round-tripped through S3 into the restored copy. It then runs a **point-in-time recovery**: it writes a `before` marker, captures the server timestamp, writes an `after` marker, and restores the copy to that timestamp (`45-restorejob-pitr.yaml`), asserting the `before` row survived and the `after` row did not. Finally it submits a RestoreJob with a `recoveryTime` an hour in the future and asserts it **fails fast** with `status.phase: Failed` and reason `RecoveryTargetUnreachable` (rather than hanging to the restore deadline). Set `SKIP_RESTORE=1` to stop after a successful backup, or `SKIP_PITR=1` to stop after the latest-point restore.
+
+## Automated e2e
+
+The Chainsaw suite at `hack/e2e-chainsaw/postgres/` drives this same `run-all.sh` as a second test (`postgres-2-backup-roundtrip`), selected by CI whenever the postgres app (or these scripts) change and on every release cut. It runs in `tenant-root` against the in-cluster seaweedfs endpoint — the isolated e2e tenant cannot reach it across the Cilium egress policy, and the external ingress endpoint is an unroutable placeholder in the sandbox.
diff --git a/examples/backups/postgres/cleanup.sh b/examples/backups/postgres/cleanup.sh
new file mode 100755
index 0000000000..52bab728e4
--- /dev/null
+++ b/examples/backups/postgres/cleanup.sh
@@ -0,0 +1,55 @@
+#!/bin/bash
+# Best-effort teardown of everything the demo creates. Idempotent;
+# missing resources are skipped silently.
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "$SCRIPT_DIR/00-helpers.sh"
+
+print_header "Cleanup"
+
+# The CNPG driver suspends the source/target Postgres HelmRelease while a
+# RestoreJob runs. If the demo was aborted mid-restore the HR is left
+# suspended; deleting the RestoreJob without resuming it first strands the app.
+# Resume both best-effort BEFORE deleting the RestoreJobs.
+for app in "$PG_SRC_NAME" "$PG_TARGET_NAME"; do
+    if kubectl -n "$NAMESPACE" get hr "postgres-${app}" >/dev/null 2>&1; then
+        log_substep "Resuming HelmRelease postgres-${app} (no-op if not suspended)..."
+        kubectl -n "$NAMESPACE" patch hr "postgres-${app}" --type=merge \
+            -p '{"spec":{"suspend":false}}' >/dev/null || true
+    fi
+done
+
+log_substep "Deleting RestoreJobs..."
+kubectl -n "$NAMESPACE" delete restorejob.backups.cozystack.io \
+    "$RESTOREJOB_TOCOPY_NAME" "$RESTOREJOB_PITR_NAME" "$RESTOREJOB_UNREACHABLE_NAME" \
+    "$RESTOREJOB_INPLACE_NAME" --ignore-not-found
+
+log_substep "Deleting Plan + BackupJob + derived Backup artefacts..."
+kubectl -n "$NAMESPACE" delete plan.backups.cozystack.io "$PLAN_NAME" --ignore-not-found
+kubectl -n "$NAMESPACE" delete backupjob.backups.cozystack.io \
+    "$BACKUPJOB_NAME" "$BACKUPJOB_POSTMARKER_NAME" --ignore-not-found
+# Only the Backups of THIS demo's apps — never `--all`: on a shared cluster the
+# namespace can hold Backup artefacts of other applications and flows.
+for b in $(kubectl -n "$NAMESPACE" get backups.backups.cozystack.io \
+        -o jsonpath='{range .items[*]}{.metadata.name} {.spec.applicationRef.name}{"\n"}{end}' 2>/dev/null |
+        awk -v src="$PG_SRC_NAME" -v tgt="$PG_TARGET_NAME" '$2 == src || $2 == tgt {print $1}'); do
+    kubectl -n "$NAMESPACE" delete backups.backups.cozystack.io "$b" --ignore-not-found
+done
+
+log_substep "Deleting Postgres apps..."
+kubectl -n "$NAMESPACE" delete postgres.apps.cozystack.io "$PG_SRC_NAME" "$PG_TARGET_NAME" --ignore-not-found
+
+log_substep "Deleting per-app backup Secrets..."
+kubectl -n "$NAMESPACE" delete secret \
+    "${PG_SRC_NAME}-cnpg-backup-creds" "${PG_SRC_NAME}-cnpg-backup-ca" \
+    "${PG_TARGET_NAME}-cnpg-backup-creds" "${PG_TARGET_NAME}-cnpg-backup-ca" --ignore-not-found
+
+log_substep "Deleting Bucket..."
+kubectl -n "$NAMESPACE" delete bucket.apps.cozystack.io "$BUCKET_NAME" --ignore-not-found
+
+log_substep "Deleting BackupClass + CNPG strategy (cluster-scoped)..."
+kubectl delete backupclass.backups.cozystack.io "$BACKUPCLASS_NAME" --ignore-not-found
+kubectl delete cnpg.strategy.backups.cozystack.io "$STRATEGY_NAME" --ignore-not-found
+
+log_success "Cleanup complete."
diff --git a/examples/backups/postgres/run-all.sh b/examples/backups/postgres/run-all.sh
new file mode 100755
index 0000000000..83e7cfb7aa
--- /dev/null
+++ b/examples/backups/postgres/run-all.sh
@@ -0,0 +1,362 @@
+#!/bin/bash
+# Convenience runner + e2e harness for the PostgreSQL barman-cloud backup demo.
+#
+# It applies the SAME numbered manifests a human reads (00-bucket.yaml ..
+# 40-restorejob-to-copy.yaml), filling the REPLACE_WITH_* placeholders from the
+# provisioned Bucket and deriving the two Secrets the manifests reference
+# (<app>-cnpg-backup-creds, <app>-cnpg-backup-ca) so the documented flow and the
+# automated test can never drift. Stops on the first failure.
+#
+# Flow: Bucket -> source Postgres (+ a sentinel row) -> CNPG strategy +
+# BackupClass -> ad-hoc BackupJob (wait Succeeded) -> empty target Postgres +
+# to-copy RestoreJob (wait Succeeded) -> assert the sentinel round-tripped
+# through S3 into the restored copy.
+#
+# Override NAMESPACE / endpoint / CA via the environment; see 00-helpers.sh.
+# hack/e2e-chainsaw/postgres/ drives this file as postgres-2-backup-roundtrip.
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "$SCRIPT_DIR/00-helpers.sh"
+
+# Recovery target for the PITR phase; captured between two marker writes far
+# below. Defaulted here so subst() can reference it under `set -u` before the
+# PITR phase sets it (the placeholder only appears in 45-restorejob-pitr.yaml).
+RECOVERY_TIME="${RECOVERY_TIME:-}"
+
+# Substitute the manifest placeholders. $BUCKET / $S3_HOST are resolved from the
+# Bucket below; $RECOVERY_TIME is the PITR target (empty for every manifest
+# except 45-restorejob-pitr.yaml). The app user's password is chart-generated,
+# not substituted.
+subst() {
+    sed \
+        -e "s|REPLACE_WITH_COSI_BUCKET_NAME|${BUCKET}|g" \
+        -e "s|REPLACE_WITH_S3_ENDPOINT|${S3_HOST}|g" \
+        -e "s|REPLACE_WITH_RECOVERY_TIME|${RECOVERY_TIME}|g" \
+        "$SCRIPT_DIR/$1"
+}
+
+print_header "Step 00: Provision Bucket '${BUCKET_NAME}' in ${NAMESPACE}"
+kubectl -n "$NAMESPACE" apply -f "$SCRIPT_DIR/00-bucket.yaml"
+# 660s, above this generated release's 600s install timeout; see "Sizing an
+# HR-Ready budget" in docs/agents/e2e-testing.md.
+wait_hr_ready "bucket-${BUCKET_NAME}" 660
+wait_for_field bucketclaims.objectstorage.k8s.io "bucket-${BUCKET_NAME}" \
+    '{.status.bucketReady}' true "$NAMESPACE" 300
+wait_for_field bucketaccesses.objectstorage.k8s.io "bucket-${BUCKET_NAME}-backup" \
+    '{.status.accessGranted}' true "$NAMESPACE" 300
+if [[ "${COZY_E2E_BACKUP_PREFLIGHT:-0}" == "1" ]]; then
+    source "$SCRIPT_DIR/../../../hack/e2e-chainsaw/_lib/backup-access-preflight.sh"
+    cozy_backup_access_preflight "$NAMESPACE" "bucket-${BUCKET_NAME}-backup" 90
+fi
+
+log_substep "Reading bucket coordinates from BucketInfo Secret..."
+TMP=$(mktemp)
+trap 'rm -f "$TMP"' EXIT
+kubectl -n "$NAMESPACE" get secret "bucket-${BUCKET_NAME}-backup" \
+    -o jsonpath='{.data.BucketInfo}' | base64 -d > "$TMP"
+S3_ACCESS_KEY=$(jq -r '.spec.secretS3.accessKeyID' "$TMP")
+S3_SECRET_KEY=$(jq -r '.spec.secretS3.accessSecretKey' "$TMP")
+# S3_ENDPOINT can be overridden via the environment: BucketInfo advertises the
+# EXTERNAL ingress endpoint, which in-cluster Pods cannot always reach or
+# TLS-validate; the in-cluster alternative is https://seaweedfs-s3.<ns>:8333
+# (trusted via the copied CA below).
+S3_ENDPOINT="${S3_ENDPOINT:-$(jq -r '.spec.secretS3.endpoint' "$TMP")}"
+BUCKET=$(jq -r '.spec.bucketName' "$TMP")
+for v in S3_ACCESS_KEY S3_SECRET_KEY S3_ENDPOINT BUCKET; do
+    [[ -n "${!v}" && "${!v}" != "null" ]] || { log_error "BucketInfo missing required field: ${v}"; exit 1; }
+done
+# The manifests template "https://REPLACE_WITH_S3_ENDPOINT", so strip the scheme.
+S3_HOST=${S3_ENDPOINT#https://}; S3_HOST=${S3_HOST#http://}
+log_success "Bucket '${BUCKET}' at endpoint '${S3_ENDPOINT}'."
+
+print_header "Step 05a: Materialise the Secrets the barman-cloud ObjectStore references"
+# Resolve the S3 endpoint CA secret. The default name tracks the seaweedfs
+# chart's fullnameOverride (seaweedfs -> seaweedfs-ca-cert), but a downstream
+# fullname change would rename it, so fall back to discovering the cert-manager
+# CA Certificate (the seaweedfs-labelled one with spec.isCA=true) and read its
+# secretName. Leave S3_CA_SECRET empty to skip the copy on a public-CA endpoint.
+if [[ -n "$S3_CA_SECRET" ]] \
+    && ! kubectl -n "$S3_CA_NAMESPACE" get secret "$S3_CA_SECRET" >/dev/null 2>&1; then
+    log_warning "S3 CA secret ${S3_CA_NAMESPACE}/${S3_CA_SECRET} not found; discovering the seaweedfs CA Certificate..."
+    # List every seaweedfs Certificate as "<isCA> <secretName>" and pick the CA
+    # one in shell — avoids kubectl jsonpath's finicky boolean-literal filter.
+    DISCOVERED_CA=$(kubectl -n "$S3_CA_NAMESPACE" get certificates.cert-manager.io \
+        -l app.kubernetes.io/name=seaweedfs \
+        -o jsonpath='{range .items[*]}{.spec.isCA}{" "}{.spec.secretName}{"\n"}{end}' 2>/dev/null \
+        | awk '$1=="true"{print $2; exit}' || true)
+    if [[ -n "$DISCOVERED_CA" ]]; then
+        log_success "Discovered seaweedfs CA secret ${S3_CA_NAMESPACE}/${DISCOVERED_CA}"
+        S3_CA_SECRET="$DISCOVERED_CA"
+    else
+        log_error "No seaweedfs CA Certificate found in ${S3_CA_NAMESPACE}; set S3_CA_SECRET explicitly (or empty for a public-CA endpoint)."
+        exit 1
+    fi
+fi
+# The chart (05) and the strategy (10) both reference <app>-cnpg-backup-creds
+# and <app>-cnpg-backup-ca. The barman-cloud sidecar reads AWS_ACCESS_KEY_ID /
+# AWS_SECRET_ACCESS_KEY from the creds Secret and trusts ca.crt from the CA
+# Secret when talking to a self-signed S3 endpoint. The strategy template
+# renders the names against whichever application it drives, so a restore
+# TARGET needs its own pair too (materialised again in step 30 below).
+# kubectl apply (not create) so a stale pair from an earlier run is corrected.
+materialise_backup_secrets() {
+    local app="$1"
+    kubectl -n "$NAMESPACE" create secret generic "${app}-cnpg-backup-creds" \
+        --from-literal="AWS_ACCESS_KEY_ID=${S3_ACCESS_KEY}" \
+        --from-literal="AWS_SECRET_ACCESS_KEY=${S3_SECRET_KEY}" \
+        --dry-run=client -o yaml | kubectl apply -f -
+
+    if [[ -n "$S3_CA_SECRET" ]]; then
+        log_substep "Copying S3 CA ${S3_CA_NAMESPACE}/${S3_CA_SECRET}[${S3_CA_KEY}] -> ${app}-cnpg-backup-ca..."
+        local ca_pem
+        ca_pem=$(kubectl -n "$S3_CA_NAMESPACE" get secret "$S3_CA_SECRET" \
+            -o jsonpath="{.data.${S3_CA_KEY//./\\.}}" | base64 -d)
+        [[ -n "$ca_pem" ]] || { log_error "S3 CA secret ${S3_CA_NAMESPACE}/${S3_CA_SECRET} has no ${S3_CA_KEY}"; exit 1; }
+        kubectl -n "$NAMESPACE" create secret generic "${app}-cnpg-backup-ca" \
+            --from-literal="ca.crt=${ca_pem}" \
+            --dry-run=client -o yaml | kubectl apply -f -
+    else
+        log_warning "S3_CA_SECRET empty: the manifests still reference ${app}-cnpg-backup-ca."
+        log_warning "Remove endpointCA from 05/10 by hand when the S3 endpoint uses a public CA."
+    fi
+}
+materialise_backup_secrets "$PG_SRC_NAME"
+
+print_header "Step 05b: Deploy source Postgres '${PG_SRC_NAME}' and wait for it to be healthy"
+subst 05-postgres-src.yaml | kubectl -n "$NAMESPACE" apply -f -
+# 660s, above this generated release's 600s install timeout; see "Sizing an
+# HR-Ready budget" in docs/agents/e2e-testing.md.
+wait_hr_ready "postgres-${PG_SRC_NAME}" 660
+wait_for_field clusters.postgresql.cnpg.io "$PG_SRC_CLUSTER" \
+    '{.status.phase}' 'Cluster in healthy state' "$NAMESPACE" 360
+# The 'demo' database and 'app' user are created by the chart's init Job, not
+# by cluster readiness — wait for it before writing into demo.
+wait_for_field jobs.batch "postgres-${PG_SRC_NAME}-init-job" \
+    '{.status.succeeded}' 1 "$NAMESPACE" 180
+
+print_header "Step 05c: Write a sentinel row so the backup has something to prove"
+SENTINEL_TOKEN="e2e-$(date +%s)-$$"
+psql_exec "$PG_SRC_CLUSTER" demo "
+    CREATE TABLE IF NOT EXISTS e2e_sentinel (id int PRIMARY KEY, token text);
+    INSERT INTO e2e_sentinel (id, token) VALUES (1, '${SENTINEL_TOKEN}')
+      ON CONFLICT (id) DO UPDATE SET token = EXCLUDED.token;
+    CHECKPOINT;
+    SELECT pg_switch_wal();"
+log_success "Sentinel token: ${SENTINEL_TOKEN}"
+
+print_header "Step 10/15: Create the CNPG strategy + BackupClass"
+subst 10-cnpg-strategy.yaml | kubectl apply -f -
+kubectl apply -f "$SCRIPT_DIR/15-backupclass.yaml"
+
+print_header "Step 25: Submit ad-hoc BackupJob '${BACKUPJOB_NAME}' and wait for Succeeded"
+kubectl -n "$NAMESPACE" apply -f "$SCRIPT_DIR/25-backupjob-adhoc.yaml"
+wait_for_field backupjobs.backups.cozystack.io "$BACKUPJOB_NAME" \
+    '{.status.phase}' Succeeded "$NAMESPACE" 1200 Failed
+BACKUP_NAME=$(kubectl -n "$NAMESPACE" get backupjobs.backups.cozystack.io "$BACKUPJOB_NAME" \
+    -o jsonpath='{.status.backupRef.name}')
+[[ -n "$BACKUP_NAME" ]] || { log_error "BackupJob succeeded but reported no backupRef"; exit 1; }
+log_success "Backup artefact: ${BACKUP_NAME}"
+
+if [[ "${SKIP_RESTORE:-0}" == "1" ]]; then
+    log_warning "SKIP_RESTORE=1: stopping after a successful backup."
+    exit 0
+fi
+
+print_header "Step 30/40: Restore to a copy '${PG_TARGET_NAME}' and wait for Succeeded"
+# The strategy template renders <app>-cnpg-backup-creds / -ca against the
+# TARGET application during a restore, so the target needs its own Secret pair
+# (same S3 coordinates as the source's archive).
+materialise_backup_secrets "$PG_TARGET_NAME"
+kubectl -n "$NAMESPACE" apply -f "$SCRIPT_DIR/30-postgres-target.yaml"
+# Let the target's first install settle before the RestoreJob driver suspends
+# its HelmRelease — suspending an HR mid-install races helm-controller.
+# 660s, as for the source above.
+wait_hr_ready "postgres-${PG_TARGET_NAME}" 660
+kubectl -n "$NAMESPACE" apply -f "$SCRIPT_DIR/40-restorejob-to-copy.yaml"
+wait_for_field restorejobs.backups.cozystack.io "$RESTOREJOB_TOCOPY_NAME" \
+    '{.status.phase}' Succeeded "$NAMESPACE" 1200 Failed
+# The RestoreJob succeeding means the driver finished re-bootstrapping the
+# target from S3; wait for the copy to actually come up before reading it.
+wait_for_field clusters.postgresql.cnpg.io "$PG_TARGET_CLUSTER" \
+    '{.status.phase}' 'Cluster in healthy state' "$NAMESPACE" 600
+
+print_header "Step 40 verify: the sentinel round-tripped through S3 into the copy"
+GOT=$(psql_exec "$PG_TARGET_CLUSTER" demo "SELECT token FROM e2e_sentinel WHERE id = 1;" | tr -d '[:space:]')
+if [[ "$GOT" != "$SENTINEL_TOKEN" ]]; then
+    log_error "sentinel mismatch: target has '${GOT}', expected '${SENTINEL_TOKEN}'"
+    exit 1
+fi
+log_success "Round-trip verified: '${PG_TARGET_NAME}' restored sentinel '${GOT}' from S3."
+
+# The passwords in <target>-credentials are chart-generated and do not match the
+# password hashes recovery brought back with the roles; the driver clears
+# bootstrap.enabled so the init-job reconciles them. Prove the app user can
+# actually log in against the restored copy - psql_exec above only ever used the
+# in-pod postgres superuser, so a broken credential would otherwise pass silently.
+print_header "Step 40 verify: the app user authenticates against the restored copy"
+wait_for_app_login "$PG_TARGET_CLUSTER" app demo 360
+APP_GOT=$(psql_app_exec "$PG_TARGET_CLUSTER" app demo \
+    "SELECT token FROM e2e_sentinel WHERE id = 1;" | tr -d '[:space:]')
+if [[ "$APP_GOT" != "$SENTINEL_TOKEN" ]]; then
+    log_error "app-user read mismatch: target has '${APP_GOT}', expected '${SENTINEL_TOKEN}'"
+    exit 1
+fi
+log_success "App-user login verified: 'app' authenticated and read sentinel '${APP_GOT}' from '${PG_TARGET_NAME}'."
+
+if [[ "${SKIP_PITR:-0}" == "1" ]]; then
+    log_warning "SKIP_PITR=1: stopping after the latest-point restore."
+    exit 0
+fi
+
+print_header "Step 45: point-in-time recovery (restore as of a timestamp between two writes)"
+# The base backup (pg-src-adhoc) predates the two markers below; pg-src has
+# archived WAL continuously since install, so a PITR to a time BETWEEN the
+# markers must replay the 'before' write and stop short of the 'after' write.
+log_substep "Writing the 'before' marker into the source..."
+psql_exec "$PG_SRC_CLUSTER" demo "
+    CREATE TABLE IF NOT EXISTS pitr_marker (id int PRIMARY KEY, label text);
+    INSERT INTO pitr_marker (id, label) VALUES (1, 'before')
+      ON CONFLICT (id) DO UPDATE SET label = EXCLUDED.label;"
+
+# Capture the recovery target from the SERVER clock, right after 'before'
+# committed. WAL record timestamps (which recovery_target_time compares
+# against) come from the server, so the client clock must not be trusted.
+# Sub-second (.US) precision is REQUIRED: whole-second to_char floors, and the
+# 'before' write and this capture can land in the same wall-clock second, so a
+# truncated target would sort *before* the 'before' commit and drop it.
+RECOVERY_TIME=$(psql_exec "$PG_SRC_CLUSTER" demo \
+    "SELECT replace(to_char(now() AT TIME ZONE 'UTC', 'YYYY-MM-DD HH24:MI:SS.US'), ' ', 'T') || 'Z';" \
+    | tr -d '[:space:]')
+[[ -n "$RECOVERY_TIME" ]] || { log_error "failed to capture recovery target time"; exit 1; }
+log_success "Recovery target: ${RECOVERY_TIME}"
+
+# Open a clear gap so the 'after' commit timestamp is strictly past the target,
+# then close the WAL segment holding both markers.
+sleep 5
+log_substep "Writing the 'after' marker (must NOT survive the PITR)..."
+psql_exec "$PG_SRC_CLUSTER" demo "
+    INSERT INTO pitr_marker (id, label) VALUES (2, 'after')
+      ON CONFLICT (id) DO UPDATE SET label = EXCLUDED.label;
+    CHECKPOINT;
+    SELECT pg_switch_wal();"
+
+# Gate the restore on the WAL covering the target actually being in object
+# storage, deterministically. A fixed sleep races the barman-cloud archiver
+# (a slow CI cluster was seen to lag minutes, which then tripped the restore's
+# unreachable-target fail-fast on a target that WAS recoverable). A completed
+# CNPG BackupJob guarantees WAL up to its stop point - past 'after', hence past
+# the target - is archived (the same invariant the restore driver's WAL-archive
+# gate keys off), and WAL is archived in order, so the whole chain up to the
+# target is present. The point-in-time restore below still recovers from the
+# ORIGINAL base backup (pg-src-adhoc); this one only advances the archive.
+print_header "Step 45: complete a post-marker backup so the target's WAL is archived"
+kubectl -n "$NAMESPACE" apply -f - <<EOF
+apiVersion: backups.cozystack.io/v1alpha1
+kind: BackupJob
+metadata:
+  name: ${BACKUPJOB_POSTMARKER_NAME}
+spec:
+  applicationRef:
+    apiGroup: apps.cozystack.io
+    kind: Postgres
+    name: ${PG_SRC_NAME}
+  backupClassName: ${BACKUPCLASS_NAME}
+EOF
+wait_for_field backupjobs.backups.cozystack.io "$BACKUPJOB_POSTMARKER_NAME" \
+    '{.status.phase}' Succeeded "$NAMESPACE" 1200 Failed
+
+print_header "Step 45: restore '${PG_TARGET_NAME}' to ${RECOVERY_TIME} and wait for Succeeded"
+subst 45-restorejob-pitr.yaml | kubectl -n "$NAMESPACE" apply -f -
+wait_for_field restorejobs.backups.cozystack.io "$RESTOREJOB_PITR_NAME" \
+    '{.status.phase}' Succeeded "$NAMESPACE" 1200 Failed
+wait_for_field clusters.postgresql.cnpg.io "$PG_TARGET_CLUSTER" \
+    '{.status.phase}' 'Cluster in healthy state' "$NAMESPACE" 600
+
+print_header "Step 45 verify: the copy stopped at the recovery target"
+BEFORE=$(psql_exec "$PG_TARGET_CLUSTER" demo \
+    "SELECT label FROM pitr_marker WHERE id = 1;" | tr -d '[:space:]')
+AFTER_COUNT=$(psql_exec "$PG_TARGET_CLUSTER" demo \
+    "SELECT count(*) FROM pitr_marker WHERE id = 2;" | tr -d '[:space:]')
+if [[ "$BEFORE" != "before" ]]; then
+    log_error "PITR lost pre-target data: pitr_marker id=1 is '${BEFORE}', expected 'before'"
+    exit 1
+fi
+if [[ "$AFTER_COUNT" != "0" ]]; then
+    log_error "PITR kept post-target data: pitr_marker id=2 present (count=${AFTER_COUNT}), expected absent"
+    exit 1
+fi
+log_success "PITR verified: '${PG_TARGET_NAME}' recovered to ${RECOVERY_TIME} (pre-target row present, post-target row absent)."
+
+print_header "Step 46: a recoveryTime past the archive fails cleanly (no wedge)"
+# Negative case: a recoveryTime an hour ahead of now can never be reached. The
+# restore deadline is what fails such a restore, so this job sets a short
+# restoreTimeoutSeconds and must terminate Failed rather than hang or falsely
+# Succeed.
+#
+# What this asserts is the DETERMINISTIC contract, not the classification reason.
+# The driver reports reason RecoveryTargetUnreachable only when it catches
+# PostgreSQL's "recovery ended before configured recovery target was reached"
+# FATAL in the recovery pod's log within the window. Against a still-archiving
+# source that FATAL is timing-dependent: recovery keeps replaying newly-archived
+# WAL and may not have "given up" by the deadline, so the driver falls back to a
+# generic RestoreFailed. The controller's own comment says as much - the FATAL is
+# used only to EXPLAIN a failure the deadline has already declared - and the
+# log->reason mapping is covered deterministically by the controller unit tests
+# (logIndicatesRecoveryTargetUnreachable / recoveryTargetUnreachable). So assert
+# the two things that always hold: the restore terminates Failed, and the failure
+# message attributes it to the PITR target (both reason paths name the
+# "recoverable window").
+UNREACHABLE_TIME=$(psql_exec "$PG_SRC_CLUSTER" demo \
+    "SELECT replace(to_char((now() + interval '1 hour') AT TIME ZONE 'UTC', 'YYYY-MM-DD HH24:MI:SS'), ' ', 'T') || 'Z';" \
+    | tr -d '[:space:]')
+[[ -n "$UNREACHABLE_TIME" ]] || { log_error "failed to capture unreachable target time"; exit 1; }
+log_success "Unreachable target: ${UNREACHABLE_TIME}"
+kubectl -n "$NAMESPACE" apply -f - <<EOF
+apiVersion: backups.cozystack.io/v1alpha1
+kind: RestoreJob
+metadata:
+  name: ${RESTOREJOB_UNREACHABLE_NAME}
+spec:
+  backupRef:
+    name: pg-src-adhoc
+  targetApplicationRef:
+    apiGroup: apps.cozystack.io
+    kind: Postgres
+    name: ${PG_TARGET_NAME}
+  options:
+    recoveryTime: "${UNREACHABLE_TIME}"
+    # Short deadline so the unreachable target is rejected in minutes. A reachable
+    # target converges well inside this.
+    restoreTimeoutSeconds: 300
+EOF
+# Expect a terminal Failed (fail fast on an unexpected Succeeded); the wait
+# comfortably exceeds the 300s restoreTimeoutSeconds set above.
+wait_for_field restorejobs.backups.cozystack.io "$RESTOREJOB_UNREACHABLE_NAME" \
+    '{.status.phase}' Failed "$NAMESPACE" 900 Succeeded
+MSG=$(kubectl -n "$NAMESPACE" get restorejob.backups.cozystack.io "$RESTOREJOB_UNREACHABLE_NAME" \
+    -o jsonpath='{.status.conditions[?(@.type=="Ready")].message}')
+case "$MSG" in
+    *"recoverable window"*) : ;;
+    *) log_error "unreachable-target restore Failed but its message does not attribute it to the PITR target (expected a mention of the 'recoverable window'): ${MSG}"; exit 1 ;;
+esac
+log_success "Verified: unreachable recoveryTime ${UNREACHABLE_TIME} -> RestoreJob terminated Failed, attributed to the recovery target."
+
+# In-place restore last: it deletes pg-src and re-bootstraps from S3, so nothing
+# after it may depend on the source. Regression guard for the archive-vs-recovery
+# serverName collision - before bootstrap.newServerName the restored cluster
+# archived onto the source's own WAL prefix and wedged on "Expected empty archive".
+print_header "Step 50: in-place restore of '${PG_SRC_NAME}' from '${BACKUP_NAME}' and wait for Succeeded"
+kubectl -n "$NAMESPACE" apply -f "$SCRIPT_DIR/35-restorejob-in-place.yaml"
+wait_for_field restorejobs.backups.cozystack.io "$RESTOREJOB_INPLACE_NAME" \
+    '{.status.phase}' Succeeded "$NAMESPACE" 1200 Failed
+wait_for_field clusters.postgresql.cnpg.io "$PG_SRC_CLUSTER" \
+    '{.status.phase}' 'Cluster in healthy state' "$NAMESPACE" 600
+
+print_header "Step 50 verify: the sentinel survived the in-place restore"
+GOT=$(psql_exec "$PG_SRC_CLUSTER" demo "SELECT token FROM e2e_sentinel WHERE id = 1;" | tr -d '[:space:]')
+if [[ "$GOT" != "$SENTINEL_TOKEN" ]]; then
+    log_error "in-place restore sentinel mismatch: source has '${GOT}', expected '${SENTINEL_TOKEN}'"
+    exit 1
+fi
+log_success "In-place restore verified: '${PG_SRC_NAME}' re-bootstrapped and archives to a fresh prefix (sentinel '${GOT}')."
diff --git a/examples/backups/rabbitmq/00-bucket.yaml b/examples/backups/rabbitmq/00-bucket.yaml
new file mode 100644
index 0000000000..3461179297
--- /dev/null
+++ b/examples/backups/rabbitmq/00-bucket.yaml
@@ -0,0 +1,19 @@
+# Cozystack-managed S3 bucket for storing this demo's RabbitMQ definitions.
+# The Bucket controller provisions a Secret named "bucket-<bucket>-<user>"
+# per user (the bucket app carries the "bucket-" release prefix); run-all.sh
+# reads the "backup" user's BucketInfo and projects its access keys into the
+# rabbitmq-backup-creds Secret the strategy below references.
+#
+# The platform ships a cozy-default-rabbitmq strategy that writes to the shared
+# cozy-backups system bucket; this demo instead provisions its own Bucket and a
+# matching strategy so the round-trip is self-contained and its objects are
+# torn down with the demo (see cleanup.sh).
+---
+apiVersion: apps.cozystack.io/v1alpha1
+kind: Bucket
+metadata:
+  name: rabbitmq-backups
+spec:
+  users:
+    backup:
+      readonly: false
diff --git a/examples/backups/rabbitmq/00-helpers.sh b/examples/backups/rabbitmq/00-helpers.sh
new file mode 100755
index 0000000000..e283b9bac0
--- /dev/null
+++ b/examples/backups/rabbitmq/00-helpers.sh
@@ -0,0 +1,113 @@
+#!/bin/bash
+# Shared helpers for the RabbitMQ definitions backup/restore demo.
+# Source this file in other scripts: source "$(dirname "$0")/00-helpers.sh"
+
+export RED='\033[0;31m'
+export GREEN='\033[0;32m'
+export YELLOW='\033[1;33m'
+export BLUE='\033[0;34m'
+export MAGENTA='\033[0;35m'
+export CYAN='\033[0;36m'
+export WHITE='\033[1;37m'
+export NC='\033[0m'
+export BOLD='\033[1m'
+
+# Default settings (override via environment).
+export NAMESPACE="${NAMESPACE:-tenant-root}"
+export RABBITMQ_SRC_NAME="${RABBITMQ_SRC_NAME:-rabbitmq-src}"
+export RABBITMQ_TARGET_NAME="${RABBITMQ_TARGET_NAME:-rabbitmq-target}"
+# The rabbitmq-rd ApplicationDefinition renders the HelmRelease with
+# releaseName = "rabbitmq-" + appName (release.prefix in
+# packages/system/rabbitmq-rd/cozyrds/rabbitmq.yaml), and the chart sets the
+# rabbitmq.com/RabbitmqCluster metadata.name to .Release.Name, so the
+# operator-side CR (its Service, default-user Secret and server pods) is
+# rabbitmq-<app>.
+export RABBITMQ_SRC_CR="rabbitmq-${RABBITMQ_SRC_NAME}"
+export RABBITMQ_TARGET_CR="rabbitmq-${RABBITMQ_TARGET_NAME}"
+# This demo provisions its own Bucket + Rabbitmq strategy + BackupClass rather
+# than reusing the platform cozy-default flow, so the round-trip is
+# self-contained and its S3 objects are torn down with the demo. The Bucket
+# controller materialises the credentials Secret as "bucket-<bucket>-<user>".
+export BUCKET_NAME="${BUCKET_NAME:-rabbitmq-backups}"
+export BUCKET_USER="${BUCKET_USER:-backup}"
+export STRATEGY_NAME="${STRATEGY_NAME:-rabbitmq-strategy-default}"
+export BACKUPCLASS_NAME="${BACKUPCLASS_NAME:-rabbitmq-default}"
+export BACKUPJOB_NAME="${BACKUPJOB_NAME:-rabbitmq-src-adhoc}"
+export RESTOREJOB_INPLACE_NAME="${RESTOREJOB_INPLACE_NAME:-rabbitmq-src-in-place}"
+export RESTOREJOB_TOCOPY_NAME="${RESTOREJOB_TOCOPY_NAME:-rabbitmq-src-to-rabbitmq-target}"
+export PLAN_NAME="${PLAN_NAME:-rabbitmq-src-daily}"
+# The strategy Pod's curl reads AWS_ACCESS_KEY_ID / AWS_SECRET_ACCESS_KEY from
+# this Secret and trusts the S3 endpoint's CA from ca.crt in the CA Secret;
+# run-all.sh materialises both from the provisioned Bucket before dispatch.
+export CREDS_SECRET="${CREDS_SECRET:-rabbitmq-backup-creds}"
+export CA_SECRET="${CA_SECRET:-rabbitmq-backup-ca}"
+# S3 endpoint CA. cozystack's default seaweedfs serves its S3 endpoint with a
+# self-signed certificate whose CA lives in this Secret; run-all.sh copies its
+# ca.crt into CA_SECRET, which the strategy Pod mounts and points CURL_CA_BUNDLE
+# at. The name follows the seaweedfs chart's fullnameOverride
+# ("seaweedfs" -> "seaweedfs-ca-cert"); run-all.sh auto-discovers the CA
+# Certificate's actual secret when this default is absent. On a cluster whose S3
+# endpoint is signed by a publicly-trusted CA, set S3_CA_SECRET="" to skip the
+# copy and drop the CURL_CA_BUNDLE env + CA volume from 03-rabbitmq-strategy.yaml.
+export S3_CA_SECRET="${S3_CA_SECRET:-seaweedfs-ca-cert}"
+export S3_CA_NAMESPACE="${S3_CA_NAMESPACE:-tenant-root}"
+export S3_CA_KEY="${S3_CA_KEY:-ca.crt}"
+
+log_info()    { echo -e "${BLUE}i${NC} $*" >&2; }
+log_success() { echo -e "${GREEN}OK${NC} $*" >&2; }
+log_warning() { echo -e "${YELLOW}!${NC} $*" >&2; }
+log_error()   { echo -e "${RED}x${NC} $*" >&2; }
+log_step()    { echo -e "\n${MAGENTA}${BOLD}> $*${NC}" >&2; }
+log_substep() { echo -e "${CYAN}  -> $*${NC}" >&2; }
+
+print_header() {
+    echo -e "\n${MAGENTA}${BOLD}== $1 ==${NC}\n" >&2
+}
+
+# wait_for_field, wait_hr_ready and wait_deleted live in one file shared by
+# every backup walkthrough, so a fix to one reaches all of them.
+# shellcheck source-path=SCRIPTDIR source=../_lib/wait-helpers.sh
+source "$(dirname "${BASH_SOURCE[0]}")/../_lib/wait-helpers.sh"
+
+# Wait until the rabbitmq.com/RabbitmqCluster CR reports AllReplicasReady=True
+# (the cluster-operator's own readiness signal — every server pod is up and the
+# management API is serving). No fail-fast value: the condition can be briefly
+# absent or False during rolling startup before it converges.
+wait_rabbitmq_ready() {
+    local cr="$1" timeout="${2:-600}"
+    wait_for_field rabbitmqclusters.rabbitmq.com "$cr" \
+        '{.status.conditions[?(@.type=="AllReplicasReady")].status}' True "$NAMESPACE" "$timeout"
+}
+
+# Run rabbitmqctl inside a RabbitmqCluster's first server pod. rabbitmqctl talks
+# to the local node over the Erlang dist port and needs no HTTP credentials, so
+# it is the simplest way to mutate and read the DEFINITIONS (vhosts, policies)
+# this demo uses as its round-trip sentinel. Args: <cr-name> <rabbitmqctl args...>
+rabbitmqctl_exec() {
+    local cr="$1"; shift
+    kubectl -n "$NAMESPACE" exec "${cr}-server-0" -c rabbitmq -- rabbitmqctl "$@"
+}
+
+# Seed the sentinel: a vhost plus a policy on it. Both are broker DEFINITIONS
+# captured by /api/definitions, so their survival through S3 proves the backup
+# round-tripped the definitions (not merely that a Job ran). Args: <cr> <token>
+rabbitmq_seed_sentinel() {
+    local cr="$1" token="$2"
+    rabbitmqctl_exec "$cr" add_vhost "$token" >/dev/null
+    rabbitmqctl_exec "$cr" set_policy -p "$token" sentinel-policy '.*' \
+        '{"max-length":1000}' --apply-to queues >/dev/null
+}
+
+# True (0) when the sentinel vhost exists, false (1) when it is absent. The
+# exec is captured separately and a FAILED exec aborts rather than being folded
+# into "absent" - otherwise a transient exec failure would read as "the sentinel
+# is not there", silently passing the negative pre-checks in run-all.sh.
+# Args: <cr> <token>
+rabbitmq_has_sentinel() {
+    local cr="$1" token="$2" out
+    if ! out=$(rabbitmqctl_exec "$cr" list_vhosts name 2>/dev/null); then
+        log_error "rabbitmqctl list_vhosts failed on $cr; cannot determine sentinel presence"
+        exit 1
+    fi
+    printf '%s\n' "$out" | grep -qxF "$token"
+}
diff --git a/examples/backups/rabbitmq/03-rabbitmq-strategy.yaml b/examples/backups/rabbitmq/03-rabbitmq-strategy.yaml
new file mode 100644
index 0000000000..1533ee0926
--- /dev/null
+++ b/examples/backups/rabbitmq/03-rabbitmq-strategy.yaml
@@ -0,0 +1,185 @@
+# RabbitMQ definitions backup strategy for this demo. It mirrors the shipped
+# cozy-default-rabbitmq strategy
+# (packages/system/backupstrategy-controller/templates/strategy-rabbitmq-default.yaml)
+# but points at this demo's own Bucket instead of the platform cozy-backups
+# system bucket, so the round-trip is self-contained. The in-Pod curl script is
+# kept identical to the shipped one; only the S3 coordinates differ.
+#
+# The controller re-renders the `{{ .Mode | .Release | .ArtifactURI | .BackupName }}`
+# templates below per BackupJob/RestoreJob against the live application object.
+# The REPLACE_WITH_* markers are filled by run-all.sh from the provisioned
+# Bucket (kubectl apply happens through run-all's subst, not directly).
+---
+apiVersion: strategy.backups.cozystack.io/v1alpha1
+kind: Rabbitmq
+metadata:
+  name: rabbitmq-strategy-default
+spec:
+  # Record the stored object's location on the produced Backup so it is
+  # introspectable. The key is scoped by the SOURCE namespace/name/backup so
+  # distinct backups of one application never overwrite each other.
+  artifactURITemplate: "s3://REPLACE_WITH_COSI_BUCKET_NAME/{{ .Release.Namespace }}/{{ .Release.Name }}/{{ .BackupName }}/definitions.json"
+  template:
+    spec:
+      restartPolicy: Never
+      containers:
+        - name: rabbitmq-backup
+          # Reuse whatever image the platform strategy runs so the demo Pod
+          # needs no package install at run time. Read it off the shipped
+          # strategy (run-all.sh substitutes it here) rather than hardcoding a
+          # tag.
+          image: "REPLACE_WITH_BACKUP_CLIENT_IMAGE"
+          imagePullPolicy: IfNotPresent
+          env:
+            - name: MODE
+              value: "{{ .Mode }}"
+            # The Cozystack RabbitMQ release name is prefixed with "rabbitmq-",
+            # so the operator's client Service and default-user Secret are
+            # rabbitmq-<app>. On restore .Release is the TARGET, so host and
+            # credentials point at the broker being restored into.
+            - name: RABBITMQ_HOST
+              value: "rabbitmq-{{ .Release.Name }}.{{ .Release.Namespace }}.svc"
+            # optional: the cleanup run (on Backup deletion) only touches S3 and
+            # may execute after the source broker - and this Secret - are gone.
+            - name: RABBITMQ_USER
+              valueFrom:
+                secretKeyRef:
+                  name: "rabbitmq-{{ .Release.Name }}-default-user"
+                  key: username
+                  optional: true
+            - name: RABBITMQ_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: "rabbitmq-{{ .Release.Name }}-default-user"
+                  key: password
+                  optional: true
+            # ARTIFACT_URI is the single source of truth for the object location:
+            # the driver renders it from spec.artifactURITemplate, records it on
+            # the Backup's status.artifact.uri, and injects it here. On restore
+            # it is that recorded value read back from the Backup.
+            - name: ARTIFACT_URI
+              value: "{{ .ArtifactURI }}"
+            # S3 coordinates come from this demo's Bucket, projected by
+            # run-all.sh into rabbitmq-backup-creds. Unlike the shipped strategy
+            # (external ACME-valid ingress, verified against the image's system
+            # CAs) the in-cluster seaweedfs-s3 endpoint is self-signed, so the
+            # seaweedfs CA is mounted and pointed at via CURL_CA_BUNDLE, which
+            # libcurl honours transparently - the curl script stays byte-for-byte
+            # the shipped one, with no -k.
+            - name: AWS_ACCESS_KEY_ID
+              valueFrom:
+                secretKeyRef:
+                  name: rabbitmq-backup-creds
+                  key: AWS_ACCESS_KEY_ID
+            - name: AWS_SECRET_ACCESS_KEY
+              valueFrom:
+                secretKeyRef:
+                  name: rabbitmq-backup-creds
+                  key: AWS_SECRET_ACCESS_KEY
+            - name: S3_ENDPOINT
+              value: "REPLACE_WITH_S3_ENDPOINT"
+            - name: S3_REGION
+              value: "us-east-1"
+            - name: S3_FORCE_PATH_STYLE
+              value: "true"
+            # Self-signed seaweedfs CA copied into rabbitmq-backup-ca by
+            # run-all.sh and mounted below. On a publicly-trusted S3 endpoint
+            # drop this env plus the volume/volumeMount and set S3_CA_SECRET=""
+            # (see 00-helpers.sh).
+            - name: CURL_CA_BUNDLE
+              value: /etc/ssl/rabbitmq-backup-ca/ca.crt
+          volumeMounts:
+            - name: s3-ca
+              mountPath: /etc/ssl/rabbitmq-backup-ca
+              readOnly: true
+          command: ["/bin/sh", "-c"]
+          args:
+            - |
+              set -eu
+
+              case "${S3_ENDPOINT}" in
+                http://*|https://*) base="${S3_ENDPOINT}" ;;
+                *) base="https://${S3_ENDPOINT}" ;;
+              esac
+
+              # ARTIFACT_URI is s3://<bucket>/<key>. Split it and build the HTTP
+              # object URL, honouring path-style vs virtual-hosted addressing so
+              # this works against both SeaweedFS (path-style) and an external S3
+              # configured for virtual-hosted-style.
+              case "${ARTIFACT_URI}" in
+                s3://*) rest="${ARTIFACT_URI#s3://}"; bucket="${rest%%/*}"; key="${rest#*/}" ;;
+                *) echo "expected an s3:// artifact URI, got '${ARTIFACT_URI}' (set spec.artifactURITemplate)" >&2; exit 1 ;;
+              esac
+              if [ "${S3_FORCE_PATH_STYLE}" = "false" ]; then
+                scheme="${base%%://*}"; host="${base#*://}"
+                obj_url="${scheme}://${bucket}.${host}/${key}"
+              else
+                obj_url="${base}/${bucket}/${key}"
+              fi
+
+              s3() { curl -fsS --aws-sigv4 "aws:amz:${S3_REGION}:s3" \
+                --user "${AWS_ACCESS_KEY_ID}:${AWS_SECRET_ACCESS_KEY}" "$@"; }
+
+              # Cleanup runs when the owning Backup is deleted. It only touches
+              # S3 - the source broker may already be gone - so it deletes the
+              # object and exits before any management-API access. A missing
+              # object is not an error.
+              if [ "${MODE}" = cleanup ]; then
+                echo "deleting ${ARTIFACT_URI}"
+                # A missing object is success (delete is idempotent); any other
+                # non-2xx is a real failure, so this exits non-zero and the
+                # controller retries rather than orphaning the object.
+                code=$(curl -sS -o /dev/null -w '%{http_code}' \
+                  --aws-sigv4 "aws:amz:${S3_REGION}:s3" \
+                  --user "${AWS_ACCESS_KEY_ID}:${AWS_SECRET_ACCESS_KEY}" \
+                  -X DELETE "${obj_url}" || true)
+                case "${code}" in
+                  2*|404) echo "deleted (HTTP ${code})"; exit 0 ;;
+                  *) echo "delete failed: HTTP ${code}" >&2; exit 1 ;;
+                esac
+              fi
+
+              api="http://${RABBITMQ_HOST}:15672/api/definitions"
+
+              # Precondition gates on the application being Ready; the
+              # management API can still be warming up. Wait for it before the
+              # export/import so a cold API is not read as a backup failure.
+              for _ in $(seq 1 60); do
+                if curl -fsS -u "${RABBITMQ_USER}:${RABBITMQ_PASSWORD}" --max-time 5 \
+                    "http://${RABBITMQ_HOST}:15672/api/overview" >/dev/null 2>&1; then
+                  break
+                fi
+                sleep 5
+              done
+
+              if [ "${MODE}" = backup ]; then
+                echo "exporting RabbitMQ definitions from ${RABBITMQ_HOST} to ${ARTIFACT_URI}"
+                curl -fsS -u "${RABBITMQ_USER}:${RABBITMQ_PASSWORD}" "${api}" -o /tmp/definitions.json
+                s3 -X PUT --upload-file /tmp/definitions.json "${obj_url}"
+                echo "uploaded ${ARTIFACT_URI}"
+              else
+                echo "importing RabbitMQ definitions into ${RABBITMQ_HOST} from ${ARTIFACT_URI}"
+                echo "note: import is additive (POST /api/definitions merges); it does not delete objects created after the backup"
+                s3 -o /tmp/definitions.json "${obj_url}"
+                curl -fsS -u "${RABBITMQ_USER}:${RABBITMQ_PASSWORD}" \
+                  -H "content-type: application/json" \
+                  -X POST "${api}" --data-binary @/tmp/definitions.json
+                echo "import complete"
+              fi
+          resources:
+            requests:
+              cpu: 10m
+              memory: 32Mi
+            limits:
+              cpu: 200m
+              memory: 128Mi
+          securityContext:
+            allowPrivilegeEscalation: false
+            capabilities:
+              drop: ["ALL"]
+            seccompProfile:
+              type: RuntimeDefault
+      volumes:
+        - name: s3-ca
+          secret:
+            secretName: rabbitmq-backup-ca
diff --git a/examples/backups/rabbitmq/04-backupclass.yaml b/examples/backups/rabbitmq/04-backupclass.yaml
new file mode 100644
index 0000000000..b141cdee21
--- /dev/null
+++ b/examples/backups/rabbitmq/04-backupclass.yaml
@@ -0,0 +1,18 @@
+# Maps Kind=RabbitMQ to this demo's Rabbitmq strategy. BackupClass is
+# cluster-scoped, so a single instance covers every namespace. Named
+# rabbitmq-default so it does not collide with the platform cozy-default class,
+# which routes RabbitMQ to the shipped cozy-default-rabbitmq strategy.
+---
+apiVersion: backups.cozystack.io/v1alpha1
+kind: BackupClass
+metadata:
+  name: rabbitmq-default
+spec:
+  strategies:
+    - application:
+        apiGroup: apps.cozystack.io
+        kind: RabbitMQ
+      strategyRef:
+        apiGroup: strategy.backups.cozystack.io
+        kind: Rabbitmq
+        name: rabbitmq-strategy-default
diff --git a/examples/backups/rabbitmq/05-rabbitmq-src.yaml b/examples/backups/rabbitmq/05-rabbitmq-src.yaml
new file mode 100644
index 0000000000..dc65ce3af5
--- /dev/null
+++ b/examples/backups/rabbitmq/05-rabbitmq-src.yaml
@@ -0,0 +1,13 @@
+# Source RabbitMQ application. Note there is no `backup:` block: the S3
+# coordinates live on the Rabbitmq strategy (03-rabbitmq-strategy.yaml), whose
+# Pod does the definitions export, not on the application. The application chart
+# is unmodified.
+apiVersion: apps.cozystack.io/v1alpha1
+kind: RabbitMQ
+metadata:
+  name: rabbitmq-src
+spec:
+  replicas: 1
+  size: 1Gi
+  resourcesPreset: c1.small
+  version: v4.2
diff --git a/examples/backups/rabbitmq/10-backupjob-adhoc.yaml b/examples/backups/rabbitmq/10-backupjob-adhoc.yaml
new file mode 100644
index 0000000000..93071cdf24
--- /dev/null
+++ b/examples/backups/rabbitmq/10-backupjob-adhoc.yaml
@@ -0,0 +1,14 @@
+# Ad-hoc backup of the source RabbitMQ, routed through this demo's rabbitmq-default
+# BackupClass. The driver renders the rabbitmq-strategy-default strategy, which
+# exports broker definitions to this demo's Bucket. On success the BackupJob
+# reports status.backupRef.name — the Backup this demo restores from.
+apiVersion: backups.cozystack.io/v1alpha1
+kind: BackupJob
+metadata:
+  name: rabbitmq-src-adhoc
+spec:
+  applicationRef:
+    apiGroup: apps.cozystack.io
+    kind: RabbitMQ
+    name: rabbitmq-src
+  backupClassName: rabbitmq-default
diff --git a/examples/backups/rabbitmq/15-plan.yaml b/examples/backups/rabbitmq/15-plan.yaml
new file mode 100644
index 0000000000..6a551b395c
--- /dev/null
+++ b/examples/backups/rabbitmq/15-plan.yaml
@@ -0,0 +1,18 @@
+# Scheduled backups of the source RabbitMQ. The Plan controller creates a
+# BackupJob on each cron fire, using the same rabbitmq-default routing as the
+# ad-hoc job above. Applied by run-all.sh for completeness; the round-trip below
+# drives the ad-hoc BackupJob directly.
+apiVersion: backups.cozystack.io/v1alpha1
+kind: Plan
+metadata:
+  name: rabbitmq-src-daily
+spec:
+  applicationRef:
+    apiGroup: apps.cozystack.io
+    kind: RabbitMQ
+    name: rabbitmq-src
+  backupClassName: rabbitmq-default
+  schedule:
+    type: cron
+    # Daily at midnight, matching the Plan name.
+    cron: "0 0 * * *"
diff --git a/examples/backups/rabbitmq/20-rabbitmq-target.yaml b/examples/backups/rabbitmq/20-rabbitmq-target.yaml
new file mode 100644
index 0000000000..d010068e6a
--- /dev/null
+++ b/examples/backups/rabbitmq/20-rabbitmq-target.yaml
@@ -0,0 +1,11 @@
+# Separate target application for restore-to-copy. It runs alongside the source
+# and receives the source's definitions without the source being touched.
+apiVersion: apps.cozystack.io/v1alpha1
+kind: RabbitMQ
+metadata:
+  name: rabbitmq-target
+spec:
+  replicas: 1
+  size: 1Gi
+  resourcesPreset: c1.small
+  version: v4.2
diff --git a/examples/backups/rabbitmq/25-restorejob-in-place.yaml b/examples/backups/rabbitmq/25-restorejob-in-place.yaml
new file mode 100644
index 0000000000..c632beff31
--- /dev/null
+++ b/examples/backups/rabbitmq/25-restorejob-in-place.yaml
@@ -0,0 +1,11 @@
+# In-place restore: import the backed-up definitions back into the SOURCE broker.
+# Omitting targetApplicationRef makes the driver restore into the Backup's own
+# application (rabbitmq-src). backupRef names the Backup, which the Job driver
+# names after the BackupJob that produced it (rabbitmq-src-adhoc).
+apiVersion: backups.cozystack.io/v1alpha1
+kind: RestoreJob
+metadata:
+  name: rabbitmq-src-in-place
+spec:
+  backupRef:
+    name: rabbitmq-src-adhoc
diff --git a/examples/backups/rabbitmq/30-restorejob-to-copy.yaml b/examples/backups/rabbitmq/30-restorejob-to-copy.yaml
new file mode 100644
index 0000000000..da3b1a869c
--- /dev/null
+++ b/examples/backups/rabbitmq/30-restorejob-to-copy.yaml
@@ -0,0 +1,15 @@
+# Restore-to-copy: import the source's definitions into a DIFFERENT application
+# (rabbitmq-target) in the same namespace, leaving the source running. The
+# driver reads the object under the SOURCE's key and authenticates to the TARGET
+# broker with the target's own default-user credentials.
+apiVersion: backups.cozystack.io/v1alpha1
+kind: RestoreJob
+metadata:
+  name: rabbitmq-src-to-rabbitmq-target
+spec:
+  backupRef:
+    name: rabbitmq-src-adhoc
+  targetApplicationRef:
+    apiGroup: apps.cozystack.io
+    kind: RabbitMQ
+    name: rabbitmq-target
diff --git a/examples/backups/rabbitmq/README.md b/examples/backups/rabbitmq/README.md
new file mode 100644
index 0000000000..268c24399b
--- /dev/null
+++ b/examples/backups/rabbitmq/README.md
@@ -0,0 +1,38 @@
+# RabbitMQ backup/restore demo
+
+This demo backs up and restores a Cozystack-managed RabbitMQ instance, proving data integrity by round-tripping a sentinel definition through object storage. It provisions its own `Bucket`, `Rabbitmq` strategy and `BackupClass` so the round-trip is self-contained; the platform ships an equivalent `cozy-default-rabbitmq` strategy that writes to the shared `cozy-backups` system bucket, which you can route to from your own `BackupClass` instead.
+
+## What is backed up
+
+RabbitMQ's cluster operator ships no backup CRD, and RabbitMQ has no consistent online export of message payloads. This strategy therefore backs up broker **definitions** — vhosts, users, permissions, queues, exchanges, bindings, policies and parameters — via the management HTTP API (`GET /api/definitions`), and restores them with `POST /api/definitions`. **Message payloads are out of scope**, and there is **no point-in-time recovery**: a full-data backup would be a Velero volume snapshot, which is a different strategy.
+
+Definitions import is additive: an in-place restore re-creates dropped definitions but does not delete objects that exist live but not in the backup.
+
+## Prerequisites
+
+The `backupstrategy-controller` and the backup CRDs must be installed (the platform default backups stack). `run-all.sh` provisions its own `Bucket`, reads the S3 coordinates from its `BucketInfo`, projects them into a `rabbitmq-backup-creds` Secret, copies the endpoint's CA into `rabbitmq-backup-ca`, and reuses the container image the shipped `cozy-default-rabbitmq` strategy runs — so that strategy must be present, but this demo does not write to the system bucket.
+
+To-copy restore imports the source's definitions into a separate broker via `POST /api/definitions`, which merges the source's users, permissions and vhosts into the target. It does not clobber the target's own operator-generated default user, because the cluster-operator gives each RabbitmqCluster a distinct random default username. It does, however, import the source's users (with their password hashes), so after a to-copy restore those source credentials are valid logins on the target — grant access accordingly.
+
+Each backup is stored under a per-run key (`<namespace>/<application>/<backup-name>/definitions.json`), so distinct backups of one application do not overwrite each other and a restore reads the exact object its Backup recorded.
+
+## Flow
+
+- `00-helpers.sh` — shared bash helpers (waiters, sentinel seed/check via `rabbitmqctl`).
+- `00-bucket.yaml` — the demo `Bucket` backing the round-trip.
+- `03-rabbitmq-strategy.yaml` — the `Rabbitmq` strategy (S3 coordinates filled from the Bucket by `run-all.sh`).
+- `04-backupclass.yaml` — the `rabbitmq-default` `BackupClass` mapping `RabbitMQ` to that strategy.
+- `05-rabbitmq-src.yaml` — the source application (no `backup:` block; the strategy carries the S3 coordinates).
+- `10-backupjob-adhoc.yaml` — an ad-hoc `BackupJob` routed to `rabbitmq-default`.
+- `15-plan.yaml` — a cron `Plan` for scheduled backups.
+- `20-rabbitmq-target.yaml` — a separate application for restore-to-copy.
+- `25-restorejob-in-place.yaml` / `30-restorejob-to-copy.yaml` — the two restore flows.
+
+Run the whole round-trip:
+
+```bash
+./run-all.sh          # backup, drop the sentinel, restore in place, then restore to a copy
+./cleanup.sh          # remove this demo's objects (idempotent)
+```
+
+`SKIP_RESTORE=1 ./run-all.sh` stops after a successful backup (backup-only smoke). Override `NAMESPACE` (default `tenant-root`) to run elsewhere. `BucketInfo` advertises the external S3 ingress endpoint, which in-cluster Pods cannot always reach or TLS-validate; set `S3_ENDPOINT=https://seaweedfs-s3.<ns>.svc:8333` to target the in-cluster SeaweedFS instead — the `.svc` FQDN is the name the SeaweedFS serving cert's SAN covers, so `curl` can verify TLS against the copied CA (the e2e harness does this).
diff --git a/examples/backups/rabbitmq/cleanup.sh b/examples/backups/rabbitmq/cleanup.sh
new file mode 100755
index 0000000000..95d608cf53
--- /dev/null
+++ b/examples/backups/rabbitmq/cleanup.sh
@@ -0,0 +1,39 @@
+#!/bin/bash
+# Idempotent teardown of the RabbitMQ backup demo. Removes only this demo's
+# objects — never a blanket --all — so it is safe to run before a re-run and in
+# a chainsaw finally step. Order: restore/backup jobs and Plan, then this demo's
+# Backup artifacts, then the applications, then the demo's Bucket + strategy +
+# BackupClass + Secrets. The platform cozy-backups bucket and cozy-default-rabbitmq
+# strategy are platform-owned and left alone.
+set -uo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "$SCRIPT_DIR/00-helpers.sh"
+
+print_header "Cleaning up RabbitMQ backup demo (namespace: $NAMESPACE)"
+
+kubectl -n "$NAMESPACE" delete restorejob.backups.cozystack.io \
+    "$RESTOREJOB_TOCOPY_NAME" "$RESTOREJOB_INPLACE_NAME" --ignore-not-found
+kubectl -n "$NAMESPACE" delete plan.backups.cozystack.io "$PLAN_NAME" --ignore-not-found
+kubectl -n "$NAMESPACE" delete backupjob.backups.cozystack.io "$BACKUPJOB_NAME" --ignore-not-found
+
+# Prune only the Backup artifacts belonging to this demo's applications.
+for app in "$RABBITMQ_SRC_NAME" "$RABBITMQ_TARGET_NAME"; do
+    kubectl -n "$NAMESPACE" get backups.backups.cozystack.io \
+        -o jsonpath='{range .items[?(@.spec.applicationRef.name=="'"$app"'")]}{.metadata.name}{"\n"}{end}' 2>/dev/null \
+        | while read -r b; do
+            [[ -n "$b" ]] && kubectl -n "$NAMESPACE" delete backups.backups.cozystack.io "$b" --ignore-not-found
+        done
+done
+
+kubectl -n "$NAMESPACE" delete rabbitmq.apps.cozystack.io \
+    "$RABBITMQ_SRC_NAME" "$RABBITMQ_TARGET_NAME" --ignore-not-found
+
+# The Backup deletions above run their S3 cleanup Job through the strategy and
+# the creds/CA Secrets, so tear those down only now that the Backups are gone.
+kubectl -n "$NAMESPACE" delete secret "$CREDS_SECRET" "$CA_SECRET" --ignore-not-found
+kubectl -n "$NAMESPACE" delete bucket.apps.cozystack.io "$BUCKET_NAME" --ignore-not-found
+kubectl delete backupclass.backups.cozystack.io "$BACKUPCLASS_NAME" --ignore-not-found
+kubectl delete rabbitmqs.strategy.backups.cozystack.io "$STRATEGY_NAME" --ignore-not-found
+
+log_success "cleanup complete"
diff --git a/examples/backups/rabbitmq/run-all.sh b/examples/backups/rabbitmq/run-all.sh
new file mode 100755
index 0000000000..d947b3f48c
--- /dev/null
+++ b/examples/backups/rabbitmq/run-all.sh
@@ -0,0 +1,207 @@
+#!/bin/bash
+# End-to-end RabbitMQ definitions backup/restore demo. It proves DATA
+# INTEGRITY, not liveness: a sentinel vhost (a broker definition) is seeded,
+# backed up, dropped, and must reappear after a restore — first in place, then
+# into a separate copy.
+#
+# The demo provisions its OWN Bucket + Rabbitmq strategy + BackupClass, filling
+# the REPLACE_WITH_* markers in 03-rabbitmq-strategy.yaml from the Bucket, so the
+# round-trip is self-contained and its S3 objects tear down with the demo. The
+# platform-shipped cozy-default-rabbitmq strategy (which writes to the shared
+# cozy-backups system bucket) is left untouched; this demo only reads the client
+# image off it.
+#
+# Env knobs:
+#   NAMESPACE     (default tenant-root)
+#   SKIP_RESTORE=1  stop after a successful backup (backup-only smoke)
+#   S3_ENDPOINT   override the S3 endpoint the backup Pod uses. BucketInfo
+#                 advertises the EXTERNAL ingress endpoint, which in-cluster
+#                 Pods cannot always reach or TLS-validate; the in-cluster
+#                 alternative is https://seaweedfs-s3.<ns>.svc:8333 — the .svc
+#                 FQDN is the name the seaweedfs serving cert's SAN covers, so
+#                 curl verifies TLS against the copied CA below (the 2-label
+#                 seaweedfs-s3.<ns> is not in the SAN). CI sets this; a real
+#                 cluster can leave it unset to use the advertised endpoint.
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "$SCRIPT_DIR/00-helpers.sh"
+
+# Fill the strategy manifest's placeholders from the provisioned Bucket and the
+# platform client image. $BUCKET / $S3_ENDPOINT / $CLIENT_IMAGE are resolved
+# below; using '|' as the sed delimiter keeps the image ref's slashes intact.
+subst() {
+    sed \
+        -e "s|REPLACE_WITH_COSI_BUCKET_NAME|${BUCKET}|g" \
+        -e "s|REPLACE_WITH_S3_ENDPOINT|${S3_ENDPOINT}|g" \
+        -e "s|REPLACE_WITH_BACKUP_CLIENT_IMAGE|${CLIENT_IMAGE}|g" \
+        "$SCRIPT_DIR/$1"
+}
+
+print_header "RabbitMQ definitions backup/restore demo (namespace: $NAMESPACE)"
+
+# --- Bucket ------------------------------------------------------------------
+print_header "Step 00: Provision Bucket '${BUCKET_NAME}' in ${NAMESPACE}"
+kubectl -n "$NAMESPACE" apply -f "$SCRIPT_DIR/00-bucket.yaml"
+# 660s, above this generated release's 600s install timeout; see "Sizing an
+# HR-Ready budget" in docs/agents/e2e-testing.md.
+wait_hr_ready "bucket-${BUCKET_NAME}" 660
+wait_for_field bucketclaims.objectstorage.k8s.io "bucket-${BUCKET_NAME}" \
+    '{.status.bucketReady}' true "$NAMESPACE" 300
+wait_for_field bucketaccesses.objectstorage.k8s.io "bucket-${BUCKET_NAME}-${BUCKET_USER}" \
+    '{.status.accessGranted}' true "$NAMESPACE" 300
+
+log_substep "Reading bucket coordinates from BucketInfo Secret..."
+TMP=$(mktemp)
+trap 'rm -f "$TMP"' EXIT
+kubectl -n "$NAMESPACE" get secret "bucket-${BUCKET_NAME}-${BUCKET_USER}" \
+    -o jsonpath='{.data.BucketInfo}' | base64 -d > "$TMP"
+S3_ACCESS_KEY=$(jq -r '.spec.secretS3.accessKeyID' "$TMP")
+S3_SECRET_KEY=$(jq -r '.spec.secretS3.accessSecretKey' "$TMP")
+S3_ENDPOINT="${S3_ENDPOINT:-$(jq -r '.spec.secretS3.endpoint' "$TMP")}"
+BUCKET=$(jq -r '.spec.bucketName' "$TMP")
+for v in S3_ACCESS_KEY S3_SECRET_KEY S3_ENDPOINT BUCKET; do
+    [[ -n "${!v}" && "${!v}" != "null" ]] || { log_error "BucketInfo missing required field: ${v}"; exit 1; }
+done
+# The strategy's curl accepts a full URL (http:// or https://), so keep the
+# scheme rather than stripping it as the mariadb-operator path does.
+case "$S3_ENDPOINT" in http://*|https://*) : ;; *) S3_ENDPOINT="https://${S3_ENDPOINT}" ;; esac
+log_success "Bucket '${BUCKET}' at endpoint '${S3_ENDPOINT}'."
+
+# --- Secrets the strategy references -----------------------------------------
+print_header "Step 01: Materialise the Secrets the Rabbitmq strategy references"
+# Resolve the S3 endpoint CA secret. The default name tracks the seaweedfs
+# chart's fullnameOverride (seaweedfs -> seaweedfs-ca-cert), but a downstream
+# fullname change would rename it, so fall back to discovering the cert-manager
+# CA Certificate (the seaweedfs-labelled one with spec.isCA=true) and read its
+# secretName. Leave S3_CA_SECRET empty to skip the copy on a public-CA endpoint.
+if [[ -n "$S3_CA_SECRET" ]] \
+    && ! kubectl -n "$S3_CA_NAMESPACE" get secret "$S3_CA_SECRET" >/dev/null 2>&1; then
+    log_warning "S3 CA secret ${S3_CA_NAMESPACE}/${S3_CA_SECRET} not found; discovering the seaweedfs CA Certificate..."
+    DISCOVERED_CA=$(kubectl -n "$S3_CA_NAMESPACE" get certificates.cert-manager.io \
+        -l app.kubernetes.io/name=seaweedfs \
+        -o jsonpath='{range .items[*]}{.spec.isCA}{" "}{.spec.secretName}{"\n"}{end}' 2>/dev/null \
+        | awk '$1=="true"{print $2; exit}' || true)
+    if [[ -n "$DISCOVERED_CA" ]]; then
+        log_success "Discovered seaweedfs CA secret ${S3_CA_NAMESPACE}/${DISCOVERED_CA}"
+        S3_CA_SECRET="$DISCOVERED_CA"
+    else
+        log_error "No seaweedfs CA Certificate found in ${S3_CA_NAMESPACE}; set S3_CA_SECRET explicitly (or empty for a public-CA endpoint)."
+        exit 1
+    fi
+fi
+
+log_substep "Projecting bucket access keys into ${CREDS_SECRET}..."
+kubectl -n "$NAMESPACE" create secret generic "$CREDS_SECRET" \
+    --from-literal="AWS_ACCESS_KEY_ID=${S3_ACCESS_KEY}" \
+    --from-literal="AWS_SECRET_ACCESS_KEY=${S3_SECRET_KEY}" \
+    --dry-run=client -o yaml | kubectl -n "$NAMESPACE" apply -f -
+
+if [[ -n "$S3_CA_SECRET" ]]; then
+    log_substep "Copying S3 CA ${S3_CA_NAMESPACE}/${S3_CA_SECRET}[${S3_CA_KEY}] -> ${CA_SECRET}..."
+    CA_PEM=$(kubectl -n "$S3_CA_NAMESPACE" get secret "$S3_CA_SECRET" \
+        -o jsonpath="{.data.${S3_CA_KEY//./\\.}}" | base64 -d)
+    [[ -n "$CA_PEM" ]] || { log_error "S3 CA secret ${S3_CA_NAMESPACE}/${S3_CA_SECRET} has no ${S3_CA_KEY}"; exit 1; }
+    kubectl -n "$NAMESPACE" create secret generic "$CA_SECRET" \
+        --from-literal="ca.crt=${CA_PEM}" \
+        --dry-run=client -o yaml | kubectl -n "$NAMESPACE" apply -f -
+else
+    # The strategy still mounts CA_SECRET; create an empty one so the Pod
+    # schedules, and warn: a public-CA endpoint should have the CURL_CA_BUNDLE
+    # env + CA volume dropped from 03-rabbitmq-strategy.yaml by hand instead.
+    log_warning "S3_CA_SECRET empty: creating an empty ${CA_SECRET} so the Pod schedules."
+    log_warning "Remove the CURL_CA_BUNDLE env + s3-ca volume from 03-rabbitmq-strategy.yaml when the S3 endpoint uses a public CA."
+    kubectl -n "$NAMESPACE" create secret generic "$CA_SECRET" \
+        --from-literal="ca.crt=" \
+        --dry-run=client -o yaml | kubectl -n "$NAMESPACE" apply -f -
+fi
+
+# --- Strategy + BackupClass --------------------------------------------------
+print_header "Step 02: Create the Rabbitmq strategy + BackupClass"
+# Reuse the image the platform's cozy-default-rabbitmq strategy runs, so the demo
+# Pod needs no package install at run time. Its presence also confirms the
+# platform default backups stack (backupstrategy-controller + CRDs) is installed,
+# without which the BackupJob below cannot reconcile at all.
+# Wait for it rather than read it once. The strategy is rendered behind a lookup
+# of the platform bucket, so it exists only once a Helm upgrade has run after
+# that bucket was provisioned. The controller forces that upgrade, but helm-
+# controller holds it while any release in its dependsOn is not Ready, so a
+# platform change made just before this runs can keep it absent for minutes.
+# kubectl wait keeps polling through NotFound and fails on any other error.
+log_substep "Waiting for the platform's cozy-default-rabbitmq strategy..."
+kubectl wait --for=create rabbitmqs.strategy.backups.cozystack.io/cozy-default-rabbitmq \
+    --timeout=15m >/dev/null \
+    || { log_error "cozy-default-rabbitmq strategy did not appear: enable the platform default backups (backupstrategy-controller) before running this demo"; exit 1; }
+CLIENT_IMAGE=$(kubectl get rabbitmqs.strategy.backups.cozystack.io cozy-default-rabbitmq \
+    -o jsonpath='{.spec.template.spec.containers[?(@.name=="rabbitmq-backup")].image}')
+[[ -n "$CLIENT_IMAGE" ]] || { log_error "cozy-default-rabbitmq strategy has no rabbitmq-backup container image"; exit 1; }
+log_substep "Reusing the platform strategy's client image: ${CLIENT_IMAGE}"
+subst 03-rabbitmq-strategy.yaml | kubectl apply -f -
+kubectl apply -f "$SCRIPT_DIR/04-backupclass.yaml"
+
+# --- Source application + sentinel -------------------------------------------
+log_step "Provisioning source RabbitMQ '$RABBITMQ_SRC_NAME'"
+kubectl -n "$NAMESPACE" apply -f "$SCRIPT_DIR/05-rabbitmq-src.yaml"
+# 660s, above this generated release's 600s install timeout; see "Sizing an
+# HR-Ready budget" in docs/agents/e2e-testing.md.
+wait_hr_ready "$RABBITMQ_SRC_CR" 660
+wait_rabbitmq_ready "$RABBITMQ_SRC_CR" 600
+
+SENTINEL="sentinel-$(date +%s)-$$"
+log_step "Seeding sentinel definition (vhost + policy): $SENTINEL"
+rabbitmq_seed_sentinel "$RABBITMQ_SRC_CR" "$SENTINEL"
+rabbitmq_has_sentinel "$RABBITMQ_SRC_CR" "$SENTINEL" \
+    || { log_error "sentinel vhost did not seed on the source"; exit 1; }
+log_success "sentinel present on the source"
+
+# --- Backup ------------------------------------------------------------------
+log_step "Creating ad-hoc BackupJob (backupClassName=$BACKUPCLASS_NAME)"
+kubectl -n "$NAMESPACE" apply -f "$SCRIPT_DIR/10-backupjob-adhoc.yaml"
+kubectl -n "$NAMESPACE" apply -f "$SCRIPT_DIR/15-plan.yaml"
+wait_for_field backupjobs.backups.cozystack.io "$BACKUPJOB_NAME" \
+    '{.status.phase}' Succeeded "$NAMESPACE" 900 Failed
+
+BACKUP_NAME=$(kubectl -n "$NAMESPACE" get backupjobs.backups.cozystack.io "$BACKUPJOB_NAME" \
+    -o jsonpath='{.status.backupRef.name}')
+[[ -n "$BACKUP_NAME" ]] || { log_error "BackupJob succeeded but reported no backupRef"; exit 1; }
+ARTIFACT_URI=$(kubectl -n "$NAMESPACE" get backups.backups.cozystack.io "$BACKUP_NAME" \
+    -o jsonpath='{.status.artifact.uri}' 2>/dev/null || true)
+log_success "backup complete: Backup/$BACKUP_NAME (artifact: ${ARTIFACT_URI:-<none>})"
+
+if [[ "${SKIP_RESTORE:-0}" == "1" ]]; then
+    log_warning "SKIP_RESTORE=1: stopping after a successful backup."
+    exit 0
+fi
+
+# --- In-place restore --------------------------------------------------------
+log_step "Dropping the sentinel, then restoring in place"
+rabbitmqctl_exec "$RABBITMQ_SRC_CR" delete_vhost "$SENTINEL" >/dev/null
+rabbitmq_has_sentinel "$RABBITMQ_SRC_CR" "$SENTINEL" \
+    && { log_error "sentinel vhost still present after delete_vhost"; exit 1; }
+log_substep "sentinel dropped from the source"
+
+kubectl -n "$NAMESPACE" apply -f "$SCRIPT_DIR/25-restorejob-in-place.yaml"
+wait_for_field restorejobs.backups.cozystack.io "$RESTOREJOB_INPLACE_NAME" \
+    '{.status.phase}' Succeeded "$NAMESPACE" 900 Failed
+rabbitmq_has_sentinel "$RABBITMQ_SRC_CR" "$SENTINEL" \
+    || { log_error "in-place restore did not bring back the sentinel vhost"; exit 1; }
+log_success "in-place restore round-tripped the sentinel"
+
+# --- Restore-to-copy ---------------------------------------------------------
+log_step "Provisioning target RabbitMQ '$RABBITMQ_TARGET_NAME' and restoring the source's definitions into it"
+kubectl -n "$NAMESPACE" apply -f "$SCRIPT_DIR/20-rabbitmq-target.yaml"
+wait_hr_ready "$RABBITMQ_TARGET_CR" 660
+wait_rabbitmq_ready "$RABBITMQ_TARGET_CR" 600
+rabbitmq_has_sentinel "$RABBITMQ_TARGET_CR" "$SENTINEL" \
+    && { log_error "target already has the sentinel before restore — cannot prove the copy"; exit 1; }
+
+kubectl -n "$NAMESPACE" apply -f "$SCRIPT_DIR/30-restorejob-to-copy.yaml"
+wait_for_field restorejobs.backups.cozystack.io "$RESTOREJOB_TOCOPY_NAME" \
+    '{.status.phase}' Succeeded "$NAMESPACE" 900 Failed
+rabbitmq_has_sentinel "$RABBITMQ_TARGET_CR" "$SENTINEL" \
+    || { log_error "to-copy restore did not put the sentinel on the target"; exit 1; }
+rabbitmq_has_sentinel "$RABBITMQ_SRC_CR" "$SENTINEL" \
+    || { log_error "source lost the sentinel during to-copy restore (source must stay untouched)"; exit 1; }
+log_success "to-copy restore placed the sentinel on the target, source untouched"
+
+print_header "Demo complete — definitions round-tripped through object storage"
diff --git a/examples/backups/redis/00-helpers.sh b/examples/backups/redis/00-helpers.sh
new file mode 100755
index 0000000000..8c7272a57a
--- /dev/null
+++ b/examples/backups/redis/00-helpers.sh
@@ -0,0 +1,134 @@
+#!/bin/bash
+# Shared helpers for the Redis (spotahome RedisFailover) backup/restore demo.
+# Source this file in other scripts: source "$(dirname "$0")/00-helpers.sh"
+
+export RED='\033[0;31m'
+export GREEN='\033[0;32m'
+export YELLOW='\033[1;33m'
+export BLUE='\033[0;34m'
+export MAGENTA='\033[0;35m'
+export CYAN='\033[0;36m'
+export WHITE='\033[1;37m'
+export NC='\033[0m'
+export BOLD='\033[1m'
+
+# Default settings (override via environment). NAMESPACE is tenant-root because
+# the demo provisions its Bucket there (the in-cluster seaweedfs the backup Job
+# reaches lives in tenant-root, and the default e2e tenant-test is egress-
+# isolated from it).
+export NAMESPACE="${NAMESPACE:-tenant-root}"
+# APP_KIND=Valkey runs the same round-trip against a Valkey app: it runs on the
+# same RedisFailover operator, and its chart names every resource valkey-<app>
+# where the redis chart uses redis-<app>.
+export APP_KIND="${APP_KIND:-Redis}"
+case "$APP_KIND" in
+    Redis)  APP_PREFIX=redis-;  APP_RESOURCE=redis ;;
+    Valkey) APP_PREFIX=valkey-; APP_RESOURCE=valkeys.apps.cozystack.io ;;
+    *) echo "APP_KIND must be Redis or Valkey, got '$APP_KIND'" >&2; exit 1 ;;
+esac
+export APP_PREFIX APP_RESOURCE
+export REDIS_NAME="${REDIS_NAME:-redis-test}"
+export REDIS_RESTORE_NAME="${REDIS_RESTORE_NAME:-redis-restore}"
+export BACKUPJOB_NAME="${BACKUPJOB_NAME:-redis-backup-job}"
+export RESTOREJOB_INPLACE_NAME="${RESTOREJOB_INPLACE_NAME:-redis-restore-inplace}"
+export RESTOREJOB_TOCOPY_NAME="${RESTOREJOB_TOCOPY_NAME:-redis-restore-to-copy}"
+# This demo provisions its own Bucket + Redis strategy + BackupClass rather than
+# reusing the platform cozy-default flow, so the round-trip is self-contained
+# (its S3 objects tear down with the demo) and works in CI, where the shared
+# system bucket's advertised external endpoint is not routable. The Bucket
+# controller materialises the credentials Secret as "bucket-<bucket>-<user>".
+export BUCKET_NAME="${BUCKET_NAME:-redis-backups}"
+export BUCKET_USER="${BUCKET_USER:-backup}"
+export STRATEGY_NAME="${STRATEGY_NAME:-redis-strategy-default}"
+export BACKUPCLASS_NAME="${BACKUPCLASS_NAME:-redis-default}"
+# The strategy Pod's curl reads AWS_ACCESS_KEY_ID / AWS_SECRET_ACCESS_KEY from
+# this Secret and verifies the S3 endpoint's CA from ca.crt in the CA Secret;
+# run-all.sh materialises both from the provisioned Bucket before dispatch.
+export CREDS_SECRET="${CREDS_SECRET:-redis-backup-creds}"
+export CA_SECRET="${CA_SECRET:-redis-backup-ca}"
+# S3 endpoint CA. cozystack's default seaweedfs serves its S3 endpoint with a
+# self-signed certificate whose CA lives in this Secret; run-all.sh copies its
+# ca.crt into CA_SECRET, which the strategy Pod mounts at /etc/s3-ca. The name
+# follows the seaweedfs chart's fullnameOverride ("seaweedfs" ->
+# "seaweedfs-ca-cert"); run-all.sh auto-discovers the CA Certificate's actual
+# secret when this default is absent. On a cluster whose S3 endpoint is signed
+# by a publicly-trusted CA, set S3_CA_SECRET="" to skip the copy.
+export S3_CA_SECRET="${S3_CA_SECRET:-seaweedfs-ca-cert}"
+export S3_CA_NAMESPACE="${S3_CA_NAMESPACE:-tenant-root}"
+export S3_CA_KEY="${S3_CA_KEY:-ca.crt}"
+export MARKER_KEY="${MARKER_KEY:-sentinel:marker}"
+# Single-token value: redis_cmd strips all whitespace from the reply, so a
+# value with spaces would not compare equal. A UUID-shaped token is enough to
+# prove the exact bytes round-tripped through object storage.
+export MARKER_VALUE="${MARKER_VALUE:-roundtrip-4f1c9a2b}"
+
+log_info()    { echo -e "${BLUE}i${NC} $*" >&2; }
+log_success() { echo -e "${GREEN}OK${NC} $*" >&2; }
+log_warning() { echo -e "${YELLOW}!${NC} $*" >&2; }
+log_error()   { echo -e "${RED}x${NC} $*" >&2; }
+log_step()    { echo -e "\n${MAGENTA}${BOLD}> $*${NC}" >&2; }
+log_substep() { echo -e "${CYAN}  -> $*${NC}" >&2; }
+
+print_header() {
+    local title="$1"
+    echo -e "\n${MAGENTA}${BOLD}== $title ==${NC}\n" >&2
+}
+
+# wait_for_field, wait_hr_ready and wait_deleted live in one file shared by
+# every backup walkthrough, so a fix to one reaches all of them.
+# shellcheck source-path=SCRIPTDIR source=../_lib/wait-helpers.sh
+source "$(dirname "${BASH_SOURCE[0]}")/../_lib/wait-helpers.sh"
+
+# The cozystack redis chart names its RedisFailover (hence the operator's rfr-/
+# rfs- Services and the -auth Secret) redis-<app>, the valkey chart valkey-<app>,
+# mirroring the strategy driver that derives the same base from .Release.Prefix
+# and .Release.Name. So app X's password lives in <prefix>X-auth. The chart
+# renders that Secret only with authEnabled, so its absence reads as no
+# password; any other error still fails the read.
+redis_pw() {
+    kubectl -n "$NAMESPACE" get secret "${APP_PREFIX}$1-auth" --ignore-not-found -o jsonpath='{.data.password}' | base64 -d
+}
+
+# Run a redis-cli command against an application's CURRENT master. Master
+# discovery asks a sentinel of the operator's rfs-<prefix><app> Deployment
+# (master name "mymaster"), so a write always lands on the writable node even
+# after a failover. Args after the app name are passed verbatim to redis-cli.
+#   redis_cmd redis-test SET sentinel:marker hello
+#
+# The command runs by `kubectl exec` in a sentinel Pod, whose image carries
+# redis-cli (the valkey image ships it as a link to valkey-cli). A throwaway `kubectl run -i` Pod is not usable here: its stdout
+# comes back over an attach, which only carries what the container writes after
+# the attach is established, and kubectl falls back to the Pod log only when
+# the attach fails. A redis-cli that finishes in between comes back as an
+# empty reply with exit 0. An exec'd process writes into pipes of its own, so
+# its output cannot be missed that way.
+#
+# The password travels on stdin rather than in argv, which the exec request
+# URL carries into the API server's audit log. kubectl's and redis-cli's
+# stderr stay attached, so a failed read says why instead of reading as ''.
+redis_cmd() {
+    local app="$1" pw; shift
+    pw=$(redis_pw "$app")
+    printf '%s\n' "$pw" | kubectl -n "$NAMESPACE" exec -i "deploy/rfs-${APP_PREFIX}$app" -c sentinel -- sh -c '
+            IFS= read -r pw || true
+            addr=$(redis-cli -p 26379 sentinel get-master-addr-by-name mymaster) || exit 1
+            h=$(echo "$addr" | sed -n 1p); p=$(echo "$addr" | sed -n 2p)
+            [ -n "$h" ] && [ -n "$p" ] || { echo "sentinel knows no master for mymaster" >&2; exit 1; }
+            [ -z "$pw" ] || export REDISCLI_AUTH="$pw"
+            exec redis-cli -h "$h" -p "$p" "$@"
+        ' sh "$@" | tr -d '[:space:]'
+}
+
+# Block until the RedisFailover has an elected master reachable through sentinel.
+wait_redis_master() {
+    local app="$1" timeout="${2:-300}" elapsed=0
+    log_substep "Waiting for '$app' master election via sentinel..."
+    while true; do
+        local h
+        h=$(redis_cmd "$app" PING || true)
+        [[ "$h" == "PONG" ]] && { log_success "'$app' master is reachable"; return 0; }
+        (( elapsed >= timeout )) && { log_error "Timeout waiting for '$app' master"; return 1; }
+        sleep 5
+        elapsed=$((elapsed + 5))
+    done
+}
diff --git a/examples/backups/redis/01-create-redis.sh b/examples/backups/redis/01-create-redis.sh
new file mode 100755
index 0000000000..ecc4c6cb1c
--- /dev/null
+++ b/examples/backups/redis/01-create-redis.sh
@@ -0,0 +1,35 @@
+#!/bin/bash
+# Step 01: Provision a Redis (RedisFailover) instance and seed a sentinel marker
+# key used to prove the backup/restore round-trip carries the exact bytes.
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "$SCRIPT_DIR/00-helpers.sh"
+
+print_header "Step 01: Provision Redis '${REDIS_NAME}'"
+
+kubectl apply -f - <<EOF
+apiVersion: apps.cozystack.io/v1alpha1
+kind: ${APP_KIND}
+metadata:
+  name: ${REDIS_NAME}
+  namespace: ${NAMESPACE}
+spec:
+  replicas: 2
+  resourcesPreset: nano
+  size: 1Gi
+  authEnabled: true
+EOF
+
+# The spotahome operator runs its StatefulSet with an OnDelete update strategy,
+# which `kubectl rollout status` refuses; wait_redis_master polls the sentinel
+# until a master is elected, which is the readiness signal that actually matters.
+wait_redis_master "$REDIS_NAME"
+
+log_substep "Writing marker ${MARKER_KEY}=${MARKER_VALUE}..."
+redis_cmd "$REDIS_NAME" SET "$MARKER_KEY" "$MARKER_VALUE" >/dev/null
+got=$(redis_cmd "$REDIS_NAME" GET "$MARKER_KEY")
+[[ "$got" == "$MARKER_VALUE" ]] || { log_error "seed failed: read back '${got}'"; exit 1; }
+log_success "Marker seeded on '${REDIS_NAME}'."
+
+echo -e "\n${GREEN}${BOLD}Next:${NC} ./02-create-backupjob.sh"
diff --git a/examples/backups/redis/02-create-backupjob.sh b/examples/backups/redis/02-create-backupjob.sh
new file mode 100755
index 0000000000..56158a174a
--- /dev/null
+++ b/examples/backups/redis/02-create-backupjob.sh
@@ -0,0 +1,37 @@
+#!/bin/bash
+# Step 02: Create a BackupJob against the platform cozy-default BackupClass. The
+# controller resolves it to the cozy-default-redis strategy, projects
+# cozy-backups-creds into the namespace, renders the Pod template against the
+# Redis app, and runs it as a batch/v1.Job that dumps an RDB snapshot to S3.
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "$SCRIPT_DIR/00-helpers.sh"
+
+print_header "Step 02: Create BackupJob '${BACKUPJOB_NAME}'"
+
+kubectl apply -f - <<EOF
+apiVersion: backups.cozystack.io/v1alpha1
+kind: BackupJob
+metadata:
+  name: ${BACKUPJOB_NAME}
+  namespace: ${NAMESPACE}
+spec:
+  applicationRef:
+    apiGroup: apps.cozystack.io
+    kind: ${APP_KIND}
+    name: ${REDIS_NAME}
+  backupClassName: ${BACKUPCLASS_NAME}
+EOF
+
+log_substep "Waiting for BackupJob to Succeed (dumps the RDB and uploads to S3)..."
+# wait_for_field polls to the terminal phase directly: a fast strategy Pod can
+# go Pending -> Succeeded between two observations, so an explicit "wait Running"
+# gate would flake.
+wait_for_field backupjob "$BACKUPJOB_NAME" '{.status.phase}' Succeeded "$NAMESPACE" 600 Failed
+
+backup_ref=$(kubectl -n "$NAMESPACE" get backupjob "$BACKUPJOB_NAME" -o jsonpath='{.status.backupRef.name}')
+[[ -n "$backup_ref" ]] || { log_error "BackupJob succeeded but BackupRef is empty"; exit 1; }
+log_success "Backup '${backup_ref}' is Ready."
+
+echo -e "\n${GREEN}${BOLD}Next:${NC} ./03-restore-in-place.sh"
diff --git a/examples/backups/redis/03-restore-in-place.sh b/examples/backups/redis/03-restore-in-place.sh
new file mode 100755
index 0000000000..6839a4137d
--- /dev/null
+++ b/examples/backups/redis/03-restore-in-place.sh
@@ -0,0 +1,40 @@
+#!/bin/bash
+# Step 03: In-place restore. Overwrite the marker on the source to simulate data
+# drift, then restore the RDB snapshot back into the SAME Redis app. The strategy
+# FLUSHALLs the master and replays the RDB, so the marker returns to its backed-up
+# value.
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "$SCRIPT_DIR/00-helpers.sh"
+
+print_header "Step 03: In-place restore from '${BACKUPJOB_NAME}'"
+
+log_substep "Corrupting the marker to simulate data loss..."
+redis_cmd "$REDIS_NAME" SET "$MARKER_KEY" "corrupted-do-not-keep" >/dev/null
+# Read the corruption back and assert it: a SET that did not land would leave
+# the marker at its backed-up value, and the final check would then pass
+# without the restore having done anything.
+corrupted=$(redis_cmd "$REDIS_NAME" GET "$MARKER_KEY")
+[[ "$corrupted" == "corrupted-do-not-keep" ]] || { log_error "corruption step did not take (got '${corrupted}'); aborting so the restore assertion cannot false-pass"; exit 1; }
+
+kubectl apply -f - <<EOF
+apiVersion: backups.cozystack.io/v1alpha1
+kind: RestoreJob
+metadata:
+  name: ${RESTOREJOB_INPLACE_NAME}
+  namespace: ${NAMESPACE}
+spec:
+  backupRef:
+    name: ${BACKUPJOB_NAME}
+EOF
+
+log_substep "Waiting for in-place RestoreJob to Succeed..."
+wait_for_field restorejob "$RESTOREJOB_INPLACE_NAME" '{.status.phase}' Succeeded "$NAMESPACE" 600 Failed
+
+log_substep "Verifying the marker is restored..."
+got=$(redis_cmd "$REDIS_NAME" GET "$MARKER_KEY")
+[[ "$got" == "$MARKER_VALUE" ]] || { log_error "in-place restore mismatch: got '${got}', expected '${MARKER_VALUE}'"; exit 1; }
+log_success "In-place restore verified: marker round-tripped through object storage."
+
+echo -e "\n${GREEN}${BOLD}Next:${NC} ./04-restore-to-copy.sh"
diff --git a/examples/backups/redis/04-restore-to-copy.sh b/examples/backups/redis/04-restore-to-copy.sh
new file mode 100755
index 0000000000..3f43ad5836
--- /dev/null
+++ b/examples/backups/redis/04-restore-to-copy.sh
@@ -0,0 +1,53 @@
+#!/bin/bash
+# Step 04: To-copy restore. Provision a second, differently-named Redis and
+# restore the same backup into it via RestoreJob.spec.targetApplicationRef. The
+# strategy connects to the TARGET's master but reads the S3 object keyed by the
+# SOURCE app name (via .Backup.ApplicationRef.Name), so the copy lands the
+# source's data while the source keeps running untouched.
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "$SCRIPT_DIR/00-helpers.sh"
+
+print_header "Step 04: To-copy restore into '${REDIS_RESTORE_NAME}'"
+
+kubectl apply -f - <<EOF
+apiVersion: apps.cozystack.io/v1alpha1
+kind: ${APP_KIND}
+metadata:
+  name: ${REDIS_RESTORE_NAME}
+  namespace: ${NAMESPACE}
+spec:
+  replicas: 2
+  resourcesPreset: nano
+  size: 1Gi
+  authEnabled: true
+EOF
+
+# OnDelete StatefulSet: see 01-create-redis.sh. Gate on master election instead.
+wait_redis_master "$REDIS_RESTORE_NAME"
+
+kubectl apply -f - <<EOF
+apiVersion: backups.cozystack.io/v1alpha1
+kind: RestoreJob
+metadata:
+  name: ${RESTOREJOB_TOCOPY_NAME}
+  namespace: ${NAMESPACE}
+spec:
+  backupRef:
+    name: ${BACKUPJOB_NAME}
+  targetApplicationRef:
+    apiGroup: apps.cozystack.io
+    kind: ${APP_KIND}
+    name: ${REDIS_RESTORE_NAME}
+EOF
+
+log_substep "Waiting for to-copy RestoreJob to Succeed..."
+wait_for_field restorejob "$RESTOREJOB_TOCOPY_NAME" '{.status.phase}' Succeeded "$NAMESPACE" 600 Failed
+
+log_substep "Verifying the marker landed on the copy..."
+got=$(redis_cmd "$REDIS_RESTORE_NAME" GET "$MARKER_KEY")
+[[ "$got" == "$MARKER_VALUE" ]] || { log_error "to-copy restore mismatch: got '${got}', expected '${MARKER_VALUE}'"; exit 1; }
+log_success "To-copy restore verified: marker present on '${REDIS_RESTORE_NAME}'."
+
+echo -e "\n${GREEN}${BOLD}Done.${NC} Run ./cleanup.sh to remove the demo resources."
diff --git a/examples/backups/redis/90-scenario-admin-prepare.md b/examples/backups/redis/90-scenario-admin-prepare.md
new file mode 100644
index 0000000000..09afd3624c
--- /dev/null
+++ b/examples/backups/redis/90-scenario-admin-prepare.md
@@ -0,0 +1,9 @@
+# Scenario: platform admin prepares Redis backups
+
+The `Redis` → `cozy-default-redis` binding ships in the `cozy-default` BackupClass, so an admin does not wire anything per-tenant. What must be in place cluster-wide:
+
+1. `backupstrategy-controller` is running and its system bucket (`cozy-backups`) is provisioned, so the `bucketName` helper resolves and the gated `cozy-default-redis` Strategy CR materialises.
+2. The controller projects `cozy-backups-creds` into a tenant namespace on the first `Redis` BackupJob there — no manual Secret.
+3. For an `https://` S3 endpoint with a self-signed cert, set `backupStorage.endpointCASecretName` to a Secret (key `ca.crt`) the strategy Pod can mount in the app namespace; the platform default endpoint is `http://` and needs none.
+
+Once that holds, tenants use the flow in `91-scenario-user-backup.md` and `92-scenario-user-restore.md`.
diff --git a/examples/backups/redis/91-scenario-user-backup.md b/examples/backups/redis/91-scenario-user-backup.md
new file mode 100644
index 0000000000..b1c412d326
--- /dev/null
+++ b/examples/backups/redis/91-scenario-user-backup.md
@@ -0,0 +1,19 @@
+# Scenario: tenant takes a Redis backup
+
+A tenant with a `Redis` app named `redis-test` backs it up by creating one `BackupJob` that points at the platform `cozy-default` BackupClass:
+
+```yaml
+apiVersion: backups.cozystack.io/v1alpha1
+kind: BackupJob
+metadata:
+  name: redis-backup-job
+  namespace: tenant-test
+spec:
+  applicationRef:
+    apiGroup: apps.cozystack.io
+    kind: Redis
+    name: redis-test
+  backupClassName: cozy-default
+```
+
+The controller resolves it to `cozy-default-redis`, projects `cozy-backups-creds`, and runs a Job that discovers the current master via sentinel, dumps its RDB, and uploads it to `s3://<bucket>/<namespace>/redis-test/dump.rdb`. When `status.phase` is `Succeeded`, `status.backupRef.name` names the `Backup` artifact the restore flow consumes. `02-create-backupjob.sh` automates this.
diff --git a/examples/backups/redis/92-scenario-user-restore.md b/examples/backups/redis/92-scenario-user-restore.md
new file mode 100644
index 0000000000..c3c36d6183
--- /dev/null
+++ b/examples/backups/redis/92-scenario-user-restore.md
@@ -0,0 +1,39 @@
+# Scenario: tenant restores a Redis backup
+
+Both flows drive from the same `Backup` (named after the BackupJob).
+
+## In-place
+
+Restore into the source app — the driver FLUSHALLs the master and replays the RDB:
+
+```yaml
+apiVersion: backups.cozystack.io/v1alpha1
+kind: RestoreJob
+metadata:
+  name: redis-restore-inplace
+  namespace: tenant-test
+spec:
+  backupRef:
+    name: redis-backup-job
+```
+
+## To-copy
+
+Deploy a second, differently-named `Redis` first, then restore into it with `targetApplicationRef`. The Job connects to the target's master but reads the object keyed by the SOURCE app name (`.Backup.ApplicationRef.Name`), so the source keeps running untouched:
+
+```yaml
+apiVersion: backups.cozystack.io/v1alpha1
+kind: RestoreJob
+metadata:
+  name: redis-restore-to-copy
+  namespace: tenant-test
+spec:
+  backupRef:
+    name: redis-backup-job
+  targetApplicationRef:
+    apiGroup: apps.cozystack.io
+    kind: Redis
+    name: redis-restore
+```
+
+`03-restore-in-place.sh` and `04-restore-to-copy.sh` automate these and assert the seeded marker round-tripped. There is no PITR: RDB is a discrete snapshot, so `spec.options.recoveryTime` is unsupported.
diff --git a/examples/backups/redis/README.md b/examples/backups/redis/README.md
new file mode 100644
index 0000000000..4572b69aa5
--- /dev/null
+++ b/examples/backups/redis/README.md
@@ -0,0 +1,35 @@
+# Redis backup / restore demo
+
+Proves an honest data round-trip for a Cozystack-managed `Redis` (spotahome `RedisFailover`) through the platform system bucket: a sentinel marker key is written, backed up, and asserted to return byte-for-byte after both restore flows.
+
+The spotahome operator ships no backup CRD, so the `strategy.backups.cozystack.io/Redis` driver runs a one-shot Job that dumps an RDB snapshot to S3 and replays it on restore (RDB → RESP via `redis-cli --pipe`). This is the `cozy-default-redis` strategy the `cozy-default` BackupClass binds `Redis` to.
+
+## Prerequisites
+
+- A Cozystack cluster with the `backupstrategy-controller` running and its system bucket provisioned, so `cozy-default` (and the `cozy-default-redis` strategy) are present and the controller can project `cozy-backups-creds` into the app namespace.
+- `kubectl` pointed at the cluster; the tenant namespace defaults to `tenant-test` (override with `NAMESPACE`).
+
+## Run
+
+```bash
+./run-all.sh            # steps 01-04: provision, back up, restore in-place, restore to-copy
+SKIP_RESTORE=1 ./run-all.sh   # stop after a successful backup
+./cleanup.sh            # remove everything the demo created
+```
+
+Or step through them:
+
+| Step | Script | What it does |
+|------|--------|--------------|
+| 01 | `01-create-redis.sh` | Provision `Redis`, seed the marker on the master |
+| 02 | `02-create-backupjob.sh` | `BackupJob` (`backupClassName: cozy-default`) → RDB dump to S3 |
+| 03 | `03-restore-in-place.sh` | Corrupt the marker, `RestoreJob` back into the source, assert it returns |
+| 04 | `04-restore-to-copy.sh` | `RestoreJob` with `targetApplicationRef` into a fresh copy, assert the marker landed |
+
+## Notes
+
+- **Valkey.** `APP_KIND=Valkey` runs the same walkthrough against a Valkey app, which runs on the same RedisFailover operator; every `redis-<name>` resource below is then `valkey-<name>`.
+- **Master discovery** goes through the operator's sentinel Service `rfs-redis-<name>` (master name `mymaster`), so writes and the dump/replay always target the current master even after a failover.
+- **Faithful restore.** The restore loads the RDB into a throwaway local redis and replays what a real engine emits, so all logical databases (`SELECT` per db), stream last-ids and consumer groups survive — a merge onto db0 does not happen.
+- **Endpoint TLS.** The projected `endpoint` in `cozy-backups-creds` is always scheme-stripped, so the strategy prepends `https://` and the transport is always TLS (there is no `http://` path). It verifies against the image's system CA store by default — the platform bucket's ACME cert needs nothing more — honours a private CA from `backupStorage.endpointCASecretName` when set, and skips verification only when `backupStorage.insecureSkipTLSVerify: true` is set explicitly.
+- **No PITR.** RDB is a discrete snapshot; the engine ships no continuous log to replay to an arbitrary time, so `spec.options.recoveryTime` is not supported (the etcd-like case).
diff --git a/examples/backups/redis/backupclass.yaml b/examples/backups/redis/backupclass.yaml
new file mode 100644
index 0000000000..33dee84c49
--- /dev/null
+++ b/examples/backups/redis/backupclass.yaml
@@ -0,0 +1,25 @@
+# Maps Kind=Redis and Kind=Valkey to this demo's Redis strategy. BackupClass is cluster-scoped,
+# so a single instance covers every namespace. Named redis-default so it does
+# not collide with the platform cozy-default class, which routes Redis to the
+# shipped cozy-default-redis strategy.
+---
+apiVersion: backups.cozystack.io/v1alpha1
+kind: BackupClass
+metadata:
+  name: redis-default
+spec:
+  strategies:
+    - application:
+        apiGroup: apps.cozystack.io
+        kind: Redis
+      strategyRef:
+        apiGroup: strategy.backups.cozystack.io
+        kind: Redis
+        name: redis-strategy-default
+    - application:
+        apiGroup: apps.cozystack.io
+        kind: Valkey
+      strategyRef:
+        apiGroup: strategy.backups.cozystack.io
+        kind: Redis
+        name: redis-strategy-default
diff --git a/examples/backups/redis/bucket.yaml b/examples/backups/redis/bucket.yaml
new file mode 100644
index 0000000000..75cca89ed2
--- /dev/null
+++ b/examples/backups/redis/bucket.yaml
@@ -0,0 +1,19 @@
+# Cozystack-managed S3 bucket for storing this demo's Redis RDB snapshots.
+# The Bucket controller provisions a Secret named "bucket-<bucket>-<user>" per
+# user (the bucket app carries the "bucket-" release prefix); run-all.sh reads
+# the "backup" user's BucketInfo and projects its access keys into the
+# redis-backup-creds Secret the strategy references.
+#
+# The platform ships a cozy-default-redis strategy that writes to the shared
+# cozy-backups system bucket; this demo instead provisions its own Bucket and a
+# matching strategy so the round-trip is self-contained and its objects are torn
+# down with the demo (see cleanup.sh).
+---
+apiVersion: apps.cozystack.io/v1alpha1
+kind: Bucket
+metadata:
+  name: redis-backups
+spec:
+  users:
+    backup:
+      readonly: false
diff --git a/examples/backups/redis/cleanup.sh b/examples/backups/redis/cleanup.sh
new file mode 100755
index 0000000000..81fc7ec68c
--- /dev/null
+++ b/examples/backups/redis/cleanup.sh
@@ -0,0 +1,30 @@
+#!/bin/bash
+# Cleanup: tear down everything provisioned by the demo so the cluster returns
+# to its previous state. Idempotent — safe to run before a fresh round (a stale
+# Succeeded BackupJob would otherwise falsely satisfy the wait).
+# -e so a real API/permission failure aborts loudly instead of printing "Cleanup
+# complete." over a half-torn-down demo; every delete below is
+# --ignore-not-found, so an already-gone resource is not an error.
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "$SCRIPT_DIR/00-helpers.sh"
+
+print_header "Cleanup Redis backup demo"
+
+kubectl -n "$NAMESPACE" delete restorejob "$RESTOREJOB_TOCOPY_NAME" --ignore-not-found
+kubectl -n "$NAMESPACE" delete restorejob "$RESTOREJOB_INPLACE_NAME" --ignore-not-found
+kubectl -n "$NAMESPACE" delete backupjob "$BACKUPJOB_NAME" --ignore-not-found
+kubectl -n "$NAMESPACE" delete backup "$BACKUPJOB_NAME" --ignore-not-found
+kubectl -n "$NAMESPACE" delete "$APP_RESOURCE" "$REDIS_RESTORE_NAME" --ignore-not-found
+kubectl -n "$NAMESPACE" delete "$APP_RESOURCE" "$REDIS_NAME" --ignore-not-found
+
+# Demo-owned backups plumbing: the BackupClass and strategy CR are cluster-scoped
+# (no -n). Deleting the Bucket releases its S3 objects and the projected keys.
+kubectl delete backupclass "$BACKUPCLASS_NAME" --ignore-not-found
+kubectl delete redis.strategy.backups.cozystack.io "$STRATEGY_NAME" --ignore-not-found
+kubectl -n "$NAMESPACE" delete secret "$CREDS_SECRET" --ignore-not-found
+kubectl -n "$NAMESPACE" delete secret "$CA_SECRET" --ignore-not-found
+kubectl -n "$NAMESPACE" delete bucket "$BUCKET_NAME" --ignore-not-found
+
+log_success "Cleanup complete."
diff --git a/examples/backups/redis/redis-strategy.yaml b/examples/backups/redis/redis-strategy.yaml
new file mode 100644
index 0000000000..6533b0e381
--- /dev/null
+++ b/examples/backups/redis/redis-strategy.yaml
@@ -0,0 +1,223 @@
+# Redis backup strategy for this demo. It mirrors the shipped cozy-default-redis
+# strategy
+# (packages/system/backupstrategy-controller/templates/strategy-redis-default.yaml)
+# but points at this demo's own Bucket instead of the platform cozy-backups
+# system bucket, so the round-trip is self-contained and tears down with the
+# demo. The in-Pod script is kept identical to the shipped one; only the S3
+# coordinates differ: they come from this demo's redis-backup-creds Secret and
+# the endpoint is injected literally, and the self-signed seaweedfs CA is mounted
+# at /etc/s3-ca (the script already prefers it over the system store).
+#
+# The controller re-renders the `{{ .Mode | .Release | .ObjectKey }}` templates
+# below per BackupJob/RestoreJob against the live application object. The
+# REPLACE_WITH_* markers are filled by run-all.sh from the provisioned Bucket
+# (kubectl apply happens through run-all's subst, not directly).
+---
+apiVersion: strategy.backups.cozystack.io/v1alpha1
+kind: Redis
+metadata:
+  name: redis-strategy-default
+spec:
+  template:
+    spec:
+      restartPolicy: Never
+      activeDeadlineSeconds: 1800
+      volumes:
+        # The Redis app's own CA, mounted optionally: ca.crt lands only for a
+        # tls.enabled app, and the script keys its server-TLS path off its
+        # presence — mirrors the shipped strategy.
+        - name: redis-ca
+          secret:
+            secretName: '{{ .Release.Prefix | default "redis-" }}{{ .Release.Name }}.ca-cert'
+            optional: true
+        - name: s3-ca
+          secret:
+            secretName: redis-backup-ca
+      containers:
+        - name: redis-backup
+          # Reuse whatever image the platform strategy runs so the demo Pod needs
+          # no package install at run time; run-all.sh substitutes it here off the
+          # shipped cozy-default-redis strategy rather than hardcoding a tag.
+          image: "REPLACE_WITH_BACKUP_CLIENT_IMAGE"
+          imagePullPolicy: IfNotPresent
+          volumeMounts:
+            - name: redis-ca
+              mountPath: /etc/redis-ca
+              readOnly: true
+            - name: s3-ca
+              mountPath: /etc/s3-ca
+              readOnly: true
+          env:
+            - name: REDIS_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: '{{ .Release.Prefix | default "redis-" }}{{ .Release.Name }}-auth'
+                  key: password
+                  optional: true
+            # S3 coordinates come from this demo's Bucket: the access keys are
+            # projected by run-all.sh into redis-backup-creds, and the endpoint
+            # and bucket are injected literally from the provisioned Bucket.
+            - name: S3_ENDPOINT
+              value: "REPLACE_WITH_S3_ENDPOINT"
+            - name: S3_BUCKET
+              value: "REPLACE_WITH_COSI_BUCKET_NAME"
+            - name: S3_REGION
+              value: "us-east-1"
+            - name: AWS_ACCESS_KEY_ID
+              valueFrom:
+                secretKeyRef:
+                  name: redis-backup-creds
+                  key: AWS_ACCESS_KEY_ID
+                  optional: true
+            - name: AWS_SECRET_ACCESS_KEY
+              valueFrom:
+                secretKeyRef:
+                  name: redis-backup-creds
+                  key: AWS_SECRET_ACCESS_KEY
+                  optional: true
+            # Off: the seaweedfs CA is mounted at /etc/s3-ca and the script
+            # verifies against it. Skip-verify stays an explicit opt-in.
+            - name: S3_INSECURE_SKIP_VERIFY
+              value: "false"
+          command: ["/bin/sh", "-c"]
+          args:
+            - |
+              set -euo pipefail
+
+              : "${S3_ENDPOINT:?missing endpoint}"
+              : "${S3_BUCKET:?missing bucket}"
+              : "${S3_REGION:?missing region}"
+              : "${AWS_ACCESS_KEY_ID:?missing AWS_ACCESS_KEY_ID in redis-backup-creds}"
+              : "${AWS_SECRET_ACCESS_KEY:?missing AWS_SECRET_ACCESS_KEY in redis-backup-creds}"
+
+              MODE="{{ .Mode }}"
+              KEY="{{ .ObjectKey }}"
+
+              # S3 transport, needed by every mode (backup, restore, cleanup).
+              case "${S3_ENDPOINT}" in
+                http://*|https://*) BASE="${S3_ENDPOINT}" ;;
+                *)                  BASE="https://${S3_ENDPOINT}" ;;
+              esac
+              TLS=""
+              case "${BASE}" in
+                https://*)
+                  if [ -f /etc/s3-ca/ca.crt ]; then TLS="--cacert /etc/s3-ca/ca.crt";
+                  elif [ -f /etc/s3-ca/tls.crt ]; then TLS="--cacert /etc/s3-ca/tls.crt";
+                  elif [ "${S3_INSECURE_SKIP_VERIFY:-false}" = "true" ]; then TLS="-k";
+                  fi
+                  ;;
+              esac
+              s3() {
+                curl -fsS ${TLS} \
+                  --aws-sigv4 "aws:amz:${S3_REGION}:s3" \
+                  --user "${AWS_ACCESS_KEY_ID}:${AWS_SECRET_ACCESS_KEY}" "$@"
+              }
+              OBJ="${BASE}/${S3_BUCKET}/${KEY}"
+
+              # Cleanup deletes only this backup's object and never touches Redis,
+              # so a deleted Backup must NOT fall into the restore path (which
+              # FLUSHALLs the master). Idempotent — a 404 is success. Mirrors the
+              # shipped strategy.
+              if [ "${MODE}" = "cleanup" ]; then
+                echo "deleting s3://${S3_BUCKET}/${KEY}"
+                code=$(curl -sS -o /dev/null -w '%{http_code}' ${TLS} \
+                  --aws-sigv4 "aws:amz:${S3_REGION}:s3" \
+                  --user "${AWS_ACCESS_KEY_ID}:${AWS_SECRET_ACCESS_KEY}" \
+                  -X DELETE "${OBJ}")
+                case "${code}" in
+                  2??|404) echo "deleted (HTTP ${code})"; exit 0 ;;
+                  *)       echo "delete failed: HTTP ${code}" >&2; exit 1 ;;
+                esac
+              fi
+
+              # Server-side TLS: present iff the app has tls.enabled (see the
+              # optional redis-ca mount) — mirrors the shipped strategy.
+              RTLS=""
+              if [ -f /etc/redis-ca/ca.crt ]; then
+                RTLS="--tls --cacert /etc/redis-ca/ca.crt"
+              fi
+
+              SENTINEL="rfs-{{ .Release.Prefix | default "redis-" }}{{ .Release.Name }}"
+              addr=$(redis-cli ${RTLS} -h "${SENTINEL}" -p 26379 sentinel get-master-addr-by-name mymaster)
+              MHOST=$(echo "${addr}" | sed -n '1p')
+              MPORT=$(echo "${addr}" | sed -n '2p')
+              if [ -z "${MHOST}" ] || [ -z "${MPORT}" ]; then
+                echo "could not resolve redis master from sentinel ${SENTINEL}" >&2
+                exit 1
+              fi
+
+              tgt() {
+                if [ -n "${REDIS_PASSWORD:-}" ]; then
+                  REDISCLI_AUTH="${REDIS_PASSWORD}" redis-cli ${RTLS} -h "${MHOST}" -p "${MPORT}" "$@"
+                else
+                  redis-cli ${RTLS} -h "${MHOST}" -p "${MPORT}" "$@"
+                fi
+              }
+
+              # Explicit modes only — an unrecognised MODE must NOT fall into the
+              # destructive restore branch.
+              if [ "${MODE}" = "backup" ]; then
+                echo "dumping RDB from master ${MHOST}:${MPORT}"
+                tgt --rdb /tmp/dump.rdb
+                echo "uploading s3://${S3_BUCKET}/${KEY}"
+                s3 -X PUT --upload-file /tmp/dump.rdb "${OBJ}"
+              elif [ "${MODE}" = "restore" ]; then
+                echo "downloading s3://${S3_BUCKET}/${KEY}"
+                s3 -o /tmp/dump.rdb "${OBJ}"
+                mkdir -p /tmp/restore
+                cp /tmp/dump.rdb /tmp/restore/dump.rdb
+                redis-server --dir /tmp/restore --dbfilename dump.rdb \
+                  --port 6399 --bind 127.0.0.1 --save "" --appendonly no &
+                for _ in $(seq 1 300); do
+                  redis-cli -p 6399 PING >/dev/null 2>&1 && break
+                  sleep 1
+                done
+                if ! redis-cli -p 6399 PING >/dev/null 2>&1; then
+                  echo "throwaway redis did not become ready: dataset likely exceeds the restore memory limit, or the RDB version is newer than the image" >&2
+                  exit 1
+                fi
+                redis-cli -p 6399 CONFIG SET aof-use-rdb-preamble no >/dev/null
+                redis-cli -p 6399 CONFIG SET appendonly yes >/dev/null
+                # Wait for the rewrite to FINISH (no rewrite in flight, last one
+                # ok, base AOF on disk), not merely for in_progress:0 which can
+                # fall through before the scheduled rewrite starts. find (not
+                # `ls`) returns 0 on no-match under pipefail; REPLAY is set each
+                # iteration so it survives the loop.
+                REPLAY=""
+                for _ in $(seq 1 300); do
+                  persistence=$(redis-cli -p 6399 INFO persistence | tr -d '\r')
+                  inprog=$(echo "${persistence}" | awk -F: '/aof_rewrite_in_progress:/{print $2}')
+                  status=$(echo "${persistence}" | awk -F: '/aof_last_bgrewrite_status:/{print $2}')
+                  REPLAY=$(find /tmp/restore/appendonlydir -name '*.base.aof' 2>/dev/null | head -n1 || true)
+                  if [ "${inprog}" = "0" ] && [ "${status}" = "ok" ] && [ -n "${REPLAY}" ]; then
+                    break
+                  fi
+                  sleep 1
+                done
+                if [ -z "${REPLAY}" ]; then
+                  echo "throwaway redis produced no base AOF to replay (rewrite did not finish)" >&2
+                  exit 1
+                fi
+                tgt FLUSHALL
+                tgt --pipe < "${REPLAY}"
+                redis-cli -p 6399 SHUTDOWN NOSAVE >/dev/null 2>&1 || true
+                echo "restore complete into ${MHOST}:${MPORT}"
+              else
+                echo "unknown mode: ${MODE}" >&2
+                exit 1
+              fi
+          resources:
+            requests:
+              cpu: 10m
+              memory: 64Mi
+              ephemeral-storage: 256Mi
+            limits:
+              cpu: "1"
+              memory: 1Gi
+              ephemeral-storage: 4Gi
+          securityContext:
+            allowPrivilegeEscalation: false
+            capabilities:
+              drop: ["ALL"]
+            seccompProfile:
+              type: RuntimeDefault
diff --git a/examples/backups/redis/run-all.sh b/examples/backups/redis/run-all.sh
new file mode 100755
index 0000000000..613803bdd3
--- /dev/null
+++ b/examples/backups/redis/run-all.sh
@@ -0,0 +1,153 @@
+#!/bin/bash
+# End-to-end Redis backup/restore demo. It proves DATA INTEGRITY, not liveness:
+# a sentinel key is seeded, backed up, and must reappear after a restore — first
+# in place, then into a separate copy.
+#
+# The demo provisions its OWN Bucket + Redis strategy + BackupClass, filling the
+# REPLACE_WITH_* markers in redis-strategy.yaml from the Bucket, so the
+# round-trip is self-contained (its S3 objects tear down with the demo) and runs
+# in CI, where the shared cozy-backups system bucket's advertised external
+# endpoint is not routable. The platform-shipped cozy-default-redis strategy is
+# left untouched; this demo only reads the client image off it.
+#
+# Env knobs:
+#   NAMESPACE       (default tenant-root)
+#   SKIP_RESTORE=1  stop after a successful backup (steps 01-02)
+#   S3_ENDPOINT     override the endpoint the backup Pod uses. BucketInfo
+#                   advertises the EXTERNAL ingress endpoint, which in-cluster
+#                   Pods cannot always reach or TLS-validate; the in-cluster
+#                   alternative is https://seaweedfs-s3.<ns>.svc:8333 — the .svc
+#                   FQDN is the name the seaweedfs serving cert's SAN covers, so
+#                   curl verifies TLS against the copied CA. CI sets this; a real
+#                   cluster can leave it unset to use the advertised endpoint.
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "$SCRIPT_DIR/00-helpers.sh"
+
+# Fill the strategy manifest's placeholders from the provisioned Bucket and the
+# platform client image. '|' as the sed delimiter keeps the image ref's slashes
+# and the endpoint URL intact.
+subst() {
+    sed \
+        -e "s|REPLACE_WITH_COSI_BUCKET_NAME|${BUCKET}|g" \
+        -e "s|REPLACE_WITH_S3_ENDPOINT|${S3_ENDPOINT}|g" \
+        -e "s|REPLACE_WITH_BACKUP_CLIENT_IMAGE|${CLIENT_IMAGE}|g" \
+        "$SCRIPT_DIR/$1"
+}
+
+print_header "Redis backup/restore demo (namespace: $NAMESPACE)"
+
+# --- Bucket ------------------------------------------------------------------
+print_header "Step 00: Provision Bucket '${BUCKET_NAME}' in ${NAMESPACE}"
+kubectl -n "$NAMESPACE" apply -f "$SCRIPT_DIR/bucket.yaml"
+# 660s, above this generated release's 600s install timeout; see "Sizing an
+# HR-Ready budget" in docs/agents/e2e-testing.md.
+wait_hr_ready "bucket-${BUCKET_NAME}" 660
+wait_for_field bucketclaims.objectstorage.k8s.io "bucket-${BUCKET_NAME}" \
+    '{.status.bucketReady}' true "$NAMESPACE" 300
+wait_for_field bucketaccesses.objectstorage.k8s.io "bucket-${BUCKET_NAME}-${BUCKET_USER}" \
+    '{.status.accessGranted}' true "$NAMESPACE" 300
+
+log_substep "Reading bucket coordinates from BucketInfo Secret..."
+TMP=$(mktemp)
+trap 'rm -f "$TMP"' EXIT
+kubectl -n "$NAMESPACE" get secret "bucket-${BUCKET_NAME}-${BUCKET_USER}" \
+    -o jsonpath='{.data.BucketInfo}' | base64 -d > "$TMP"
+S3_ACCESS_KEY=$(jq -r '.spec.secretS3.accessKeyID' "$TMP")
+S3_SECRET_KEY=$(jq -r '.spec.secretS3.accessSecretKey' "$TMP")
+S3_ENDPOINT="${S3_ENDPOINT:-$(jq -r '.spec.secretS3.endpoint' "$TMP")}"
+BUCKET=$(jq -r '.spec.bucketName' "$TMP")
+for v in S3_ACCESS_KEY S3_SECRET_KEY S3_ENDPOINT BUCKET; do
+    [[ -n "${!v}" && "${!v}" != "null" ]] || { log_error "BucketInfo missing required field: ${v}"; exit 1; }
+done
+# The strategy script accepts a full URL (it prepends https:// only when the
+# endpoint carries no scheme), so keep the scheme rather than stripping it.
+case "$S3_ENDPOINT" in http://*|https://*) : ;; *) S3_ENDPOINT="https://${S3_ENDPOINT}" ;; esac
+export S3_ENDPOINT
+log_success "Bucket '${BUCKET}' at endpoint '${S3_ENDPOINT}'."
+
+# --- Secrets the strategy references -----------------------------------------
+print_header "Step 00b: Materialise the Secrets the Redis strategy references"
+if [[ -n "$S3_CA_SECRET" ]] \
+    && ! kubectl -n "$S3_CA_NAMESPACE" get secret "$S3_CA_SECRET" >/dev/null 2>&1; then
+    log_warning "S3 CA secret ${S3_CA_NAMESPACE}/${S3_CA_SECRET} not found; discovering the seaweedfs CA Certificate..."
+    DISCOVERED_CA=$(kubectl -n "$S3_CA_NAMESPACE" get certificates.cert-manager.io \
+        -l app.kubernetes.io/name=seaweedfs \
+        -o jsonpath='{range .items[*]}{.spec.isCA}{" "}{.spec.secretName}{"\n"}{end}' \
+        | awk '$1=="true"{print $2; exit}' || true)
+    if [[ -n "$DISCOVERED_CA" ]]; then
+        log_success "Discovered seaweedfs CA secret ${S3_CA_NAMESPACE}/${DISCOVERED_CA}"
+        S3_CA_SECRET="$DISCOVERED_CA"
+    else
+        log_error "No seaweedfs CA Certificate found in ${S3_CA_NAMESPACE}; set S3_CA_SECRET explicitly (or empty for a public-CA endpoint)."
+        exit 1
+    fi
+fi
+
+log_substep "Projecting bucket access keys into ${CREDS_SECRET}..."
+kubectl -n "$NAMESPACE" create secret generic "$CREDS_SECRET" \
+    --from-literal="AWS_ACCESS_KEY_ID=${S3_ACCESS_KEY}" \
+    --from-literal="AWS_SECRET_ACCESS_KEY=${S3_SECRET_KEY}" \
+    --dry-run=client -o yaml | kubectl -n "$NAMESPACE" apply -f -
+
+if [[ -n "$S3_CA_SECRET" ]]; then
+    log_substep "Copying S3 CA ${S3_CA_NAMESPACE}/${S3_CA_SECRET}[${S3_CA_KEY}] -> ${CA_SECRET}..."
+    CA_PEM=$(kubectl -n "$S3_CA_NAMESPACE" get secret "$S3_CA_SECRET" \
+        -o jsonpath="{.data.${S3_CA_KEY//./\\.}}" | base64 -d)
+    [[ -n "$CA_PEM" ]] || { log_error "S3 CA secret ${S3_CA_NAMESPACE}/${S3_CA_SECRET} has no ${S3_CA_KEY}"; exit 1; }
+    kubectl -n "$NAMESPACE" create secret generic "$CA_SECRET" \
+        --from-literal="ca.crt=${CA_PEM}" \
+        --dry-run=client -o yaml | kubectl -n "$NAMESPACE" apply -f -
+else
+    # The strategy mounts CA_SECRET unconditionally; create an empty one so the
+    # Pod schedules. On a public-CA endpoint the script falls through to the
+    # system CA store (no /etc/s3-ca/ca.crt content to prefer).
+    log_warning "S3_CA_SECRET empty: creating an empty ${CA_SECRET} so the Pod schedules (public-CA endpoint)."
+    kubectl -n "$NAMESPACE" create secret generic "$CA_SECRET" \
+        --from-literal="ca.crt=" \
+        --dry-run=client -o yaml | kubectl -n "$NAMESPACE" apply -f -
+fi
+
+# --- Strategy + BackupClass --------------------------------------------------
+print_header "Step 00c: Create the Redis strategy + BackupClass"
+# Reuse the image the platform's cozy-default-redis strategy runs, so the demo
+# Pod needs no package install at run time. Its presence also confirms the
+# platform default backups stack (backupstrategy-controller + CRDs) is
+# installed, without which the BackupJob below cannot reconcile at all.
+#
+# Wait for it rather than read it once. The strategy is rendered behind a
+# lookup of the platform bucket, so it exists only once a Helm upgrade has run
+# after that bucket was provisioned. The controller forces that upgrade, but
+# helm-controller holds it while any release in its dependsOn is not Ready, so
+# a platform change made just before this runs can keep it absent for minutes.
+# kubectl wait keeps polling through NotFound and fails on any other error.
+log_substep "Waiting for the platform's cozy-default-redis strategy..."
+kubectl wait --for=create redis.strategy.backups.cozystack.io/cozy-default-redis \
+    --timeout=15m >/dev/null \
+    || { log_error "cozy-default-redis strategy did not appear: enable the platform default backups (backupstrategy-controller) before running this demo"; exit 1; }
+CLIENT_IMAGE=$(kubectl get redis.strategy.backups.cozystack.io cozy-default-redis \
+    -o jsonpath='{.spec.template.spec.containers[?(@.name=="redis-backup")].image}')
+[[ -n "$CLIENT_IMAGE" ]] || { log_error "cozy-default-redis strategy has no redis-backup container image"; exit 1; }
+log_substep "Reusing the platform strategy's client image: ${CLIENT_IMAGE}"
+subst redis-strategy.yaml | kubectl apply -f -
+kubectl apply -f "$SCRIPT_DIR/backupclass.yaml"
+
+# --- Round-trip (source + seed -> backup -> restore in place -> to a copy) ---
+steps=(01 02 03 04)
+[[ "${SKIP_RESTORE:-0}" == "1" ]] && steps=(01 02)
+
+for step in "${steps[@]}"; do
+    # find is glob-safe under set -euo pipefail and degrades to empty output
+    # when no file matches, unlike `ls glob | head`.
+    script="$(find "$SCRIPT_DIR" -maxdepth 1 -type f -name "${step}-*.sh" | sort | head -n1)"
+    if [[ -z "$script" ]]; then
+        echo "no script found for step $step" >&2
+        exit 1
+    fi
+    echo "=== Running $(basename "$script") ==="
+    bash "$script"
+done
+
+[[ "${SKIP_RESTORE:-0}" == "1" ]] && log_warning "SKIP_RESTORE=1: stopped after a successful backup."
+print_header "Demo complete — data round-tripped through object storage"
diff --git a/examples/backups/vmdisk/00-helpers.sh b/examples/backups/vmdisk/00-helpers.sh
new file mode 100755
index 0000000000..9bb2b046ef
--- /dev/null
+++ b/examples/backups/vmdisk/00-helpers.sh
@@ -0,0 +1,44 @@
+#!/bin/bash
+# Helper functions and variables for the VMDisk backup/restore demo.
+# Source this file in other scripts: source "$(dirname "$0")/00-helpers.sh"
+
+# ANSI color codes
+export RED='\033[0;31m'
+export GREEN='\033[0;32m'
+export YELLOW='\033[1;33m'
+export MAGENTA='\033[0;35m'
+export CYAN='\033[0;36m'
+export WHITE='\033[1;37m'
+export NC='\033[0m'
+export BOLD='\033[1m'
+
+# Default settings
+export NAMESPACE="${NAMESPACE:-tenant-root}"
+# The platform ships the SeaweedFS-backed BackupStorageLocation as cozy-default
+# (packages/system/backupstrategy-controller). Point the demo/e2e strategy at it
+# by default so the flow works out of the box on a backups-enabled cluster;
+# override for an external S3 whose BSL carries a different name.
+export BACKUP_STORAGE_LOCATION="${BACKUP_STORAGE_LOCATION:-cozy-default}"
+
+# Logging functions (output to stderr to avoid polluting captured output)
+log_info()    { echo -e "${CYAN}ℹ${NC} $*" >&2; }
+log_success() { echo -e "${GREEN}✔${NC} $*" >&2; }
+log_warning() { echo -e "${YELLOW}⚠${NC} $*" >&2; }
+log_error()   { echo -e "${RED}✖${NC} $*" >&2; }
+log_step()    { echo -e "\n${MAGENTA}${BOLD}▶ $*${NC}" >&2; }
+log_command() { echo -e "${WHITE}  \$ $*${NC}" >&2; }
+log_substep() { echo -e "${CYAN}  → $*${NC}" >&2; }
+
+separator() {
+    echo -e "\n${CYAN}────────────────────────────────────────────────────────────${NC}\n" >&2
+}
+
+print_header() {
+    local title="$1"
+    echo -e "\n${MAGENTA}${BOLD}== ${title} ==${NC}\n" >&2
+}
+
+# wait_for_field, wait_hr_ready and wait_deleted live in one file shared by
+# every backup walkthrough, so a fix to one reaches all of them.
+# shellcheck source-path=SCRIPTDIR source=../_lib/wait-helpers.sh
+source "$(dirname "${BASH_SOURCE[0]}")/../_lib/wait-helpers.sh"
diff --git a/examples/backups/vmdisk/01-create-strategy.sh b/examples/backups/vmdisk/01-create-strategy.sh
new file mode 100755
index 0000000000..d881b35d36
--- /dev/null
+++ b/examples/backups/vmdisk/01-create-strategy.sh
@@ -0,0 +1,63 @@
+#!/bin/bash
+# Step 01: Create the Velero backup/restore strategy for a standalone VMDisk.
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "$SCRIPT_DIR/00-helpers.sh"
+
+print_header "Step 1: Create VMDisk Velero strategy"
+
+log_step "Creating Velero strategy 'vmdisk-backup-strategy'..."
+log_command "kubectl apply -f - (Velero strategy: vmdisk-backup-strategy)"
+
+# A standalone VMDisk is just an HelmRelease + a DataVolume-backed PVC (+ its
+# configmaps), all labelled app.kubernetes.io/instance: vm-disk-<name>. Unlike a
+# VMInstance there is no VirtualMachine / VMI / launcher pod to capture. With
+# snapshotMoveData the CSI data mover streams the volume through the
+# BackupStorageLocation, so no VolumeSnapshotLocation is required (matching the
+# platform's own cozy-default-velero-vmdisk strategy).
+kubectl apply -f - <<'EOF'
+apiVersion: strategy.backups.cozystack.io/v1alpha1
+kind: Velero
+metadata:
+  name: vmdisk-backup-strategy
+spec:
+  template:
+    restoreSpec:
+      existingResourcePolicy: update
+      includedNamespaces:
+        - '{{ .Application.metadata.namespace }}'
+      orLabelSelectors:
+        - matchLabels:
+            app.kubernetes.io/instance: 'vm-disk-{{ .Application.metadata.name }}'
+        - matchLabels:
+            apps.cozystack.io/application.kind: '{{ .Application.kind }}'
+            apps.cozystack.io/application.name: '{{ .Application.metadata.name }}'
+      includedResources:
+        - helmreleases.helm.toolkit.fluxcd.io
+        - persistentvolumeclaims
+        - configmaps
+      includeClusterResources: false
+    spec:
+      includedNamespaces:
+        - '{{ .Application.metadata.namespace }}'
+      orLabelSelectors:
+        - matchLabels:
+            app.kubernetes.io/instance: 'vm-disk-{{ .Application.metadata.name }}'
+        - matchLabels:
+            apps.cozystack.io/application.kind: '{{ .Application.kind }}'
+            apps.cozystack.io/application.name: '{{ .Application.metadata.name }}'
+      includedResources:
+        - helmreleases.helm.toolkit.fluxcd.io
+        - persistentvolumeclaims
+        - configmaps
+      includeClusterResources: false
+      storageLocation: '{{ .Parameters.backupStorageLocationName }}'
+      snapshotVolumes: true
+      snapshotMoveData: true
+      ttl: 720h0m0s
+      itemOperationTimeout: 24h0m0s
+EOF
+
+log_success "Velero strategy created"
+echo -e "\n${GREEN}${BOLD}Next step:${NC} ./02-create-backupclass.sh" >&2
diff --git a/examples/backups/vmdisk/02-create-backupclass.sh b/examples/backups/vmdisk/02-create-backupclass.sh
new file mode 100755
index 0000000000..4c4bac79b8
--- /dev/null
+++ b/examples/backups/vmdisk/02-create-backupclass.sh
@@ -0,0 +1,33 @@
+#!/bin/bash
+# Step 02: Create a BackupClass binding VMDisk to the Velero strategy.
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "$SCRIPT_DIR/00-helpers.sh"
+
+print_header "Step 2: Create BackupClass"
+
+log_step "Creating BackupClass 'vmdisk-velero'..."
+log_command "kubectl apply -f - (BackupClass: vmdisk-velero)"
+
+# BackupClass is cluster-scoped; a single instance covers every namespace.
+kubectl apply -f - <<EOF
+apiVersion: backups.cozystack.io/v1alpha1
+kind: BackupClass
+metadata:
+  name: vmdisk-velero
+spec:
+  strategies:
+    - application:
+        apiGroup: apps.cozystack.io
+        kind: VMDisk
+      strategyRef:
+        apiGroup: strategy.backups.cozystack.io
+        kind: Velero
+        name: vmdisk-backup-strategy
+      parameters:
+        backupStorageLocationName: ${BACKUP_STORAGE_LOCATION}
+EOF
+
+log_success "BackupClass created"
+echo -e "\n${GREEN}${BOLD}Next step:${NC} ./03-create-vmdisk.sh" >&2
diff --git a/examples/backups/vmdisk/03-create-vmdisk.sh b/examples/backups/vmdisk/03-create-vmdisk.sh
new file mode 100755
index 0000000000..aad26a6be9
--- /dev/null
+++ b/examples/backups/vmdisk/03-create-vmdisk.sh
@@ -0,0 +1,43 @@
+#!/bin/bash
+# Step 03: Create a standalone VMDisk and wait for it to be ready to back up.
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "$SCRIPT_DIR/00-helpers.sh"
+
+print_header "Step 3: Create VMDisk 'backup-src'"
+
+log_step "Creating VMDisk 'backup-src' in namespace $NAMESPACE..."
+log_info "Imports the Ubuntu Noble cloud image into a 5Gi ${VMI_DISK_STORAGE_CLASS:-replicated} disk"
+log_command "kubectl apply -f - (VMDisk: backup-src)"
+
+kubectl apply -f - <<EOF
+apiVersion: apps.cozystack.io/v1alpha1
+kind: VMDisk
+metadata:
+  name: backup-src
+  namespace: ${NAMESPACE}
+spec:
+  optical: false
+  source:
+    http:
+      url: https://cloud-images.ubuntu.com/noble/current/noble-server-cloudimg-amd64.img
+  storage: 5Gi
+  # Default 'replicated' for a real DRBD cluster; overridable so the CI lane can
+  # pass its own class (the PR gate runs DRBD-off and only renders 'local', so a
+  # hardcoded 'replicated' never binds a PVC and the import hangs).
+  storageClass: ${VMI_DISK_STORAGE_CLASS:-replicated}
+EOF
+
+log_success "VMDisk created"
+
+# Back up only a fully imported disk: the DataVolume import must finish and the
+# PVC bind before the backup runs, or Velero captures an empty/partial volume.
+log_step "Waiting for the VMDisk to import (HelmRelease Ready, DataVolume Ready, PVC Bound)..."
+wait_hr_ready vm-disk-backup-src "${IMPORT_WAIT:-600}"
+wait_for_field datavolume.cdi.kubevirt.io vm-disk-backup-src \
+    '{.status.phase}' Succeeded "$NAMESPACE" "${IMPORT_WAIT:-600}"
+wait_for_field pvc vm-disk-backup-src '{.status.phase}' Bound "$NAMESPACE" 300
+
+log_success "VMDisk 'backup-src' is imported and ready to back up"
+echo -e "\n${GREEN}${BOLD}Next step:${NC} ./04-create-backupjob.sh" >&2
diff --git a/examples/backups/vmdisk/04-create-backupjob.sh b/examples/backups/vmdisk/04-create-backupjob.sh
new file mode 100755
index 0000000000..a0dc8ac6e9
--- /dev/null
+++ b/examples/backups/vmdisk/04-create-backupjob.sh
@@ -0,0 +1,41 @@
+#!/bin/bash
+# Step 04: Back up the standalone VMDisk via a BackupJob.
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "$SCRIPT_DIR/00-helpers.sh"
+
+print_header "Step 4: Create BackupJob"
+
+log_step "Creating BackupJob 'vmdisk-backup' in namespace $NAMESPACE..."
+log_command "kubectl apply -f - (BackupJob: vmdisk-backup)"
+
+kubectl apply -f - <<EOF
+apiVersion: backups.cozystack.io/v1alpha1
+kind: BackupJob
+metadata:
+  name: vmdisk-backup
+  namespace: ${NAMESPACE}
+spec:
+  applicationRef:
+    apiGroup: apps.cozystack.io
+    kind: VMDisk
+    name: backup-src
+  backupClassName: vmdisk-velero
+EOF
+
+log_success "BackupJob created"
+
+log_step "Waiting for BackupJob to complete..."
+# Default 1800s: the Velero CSI data mover copies the whole disk (5Gi) to S3.
+# Overridable (BACKUP_WAIT) so the CI harness can bound it under the Chainsaw op
+# timeout. Fail fast if the job flips to Failed instead of polling out the budget.
+wait_for_field backupjob vmdisk-backup '{.status.phase}' Succeeded "$NAMESPACE" "${BACKUP_WAIT:-1800}" Failed
+
+BACKUP_NAME=$(kubectl -n "$NAMESPACE" get backupjob vmdisk-backup \
+    -o jsonpath='{.status.backupRef.name}')
+[[ -n "$BACKUP_NAME" ]] || { log_error "BackupJob succeeded but reported no backupRef"; exit 1; }
+log_success "BackupJob completed; backup artefact: ${BACKUP_NAME}"
+
+kubectl get backups -n "$NAMESPACE" >&2 || true
+echo -e "\n${GREEN}${BOLD}Next step:${NC} ./05-restore-in-place.sh" >&2
diff --git a/examples/backups/vmdisk/05-restore-in-place.sh b/examples/backups/vmdisk/05-restore-in-place.sh
new file mode 100755
index 0000000000..7547add227
--- /dev/null
+++ b/examples/backups/vmdisk/05-restore-in-place.sh
@@ -0,0 +1,159 @@
+#!/bin/bash
+# Step 05: Restore the standalone VMDisk in-place from its backup.
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "$SCRIPT_DIR/00-helpers.sh"
+
+print_header "Step 5: Restore VMDisk In-Place"
+
+PVC=vm-disk-backup-src
+CONSUMER=vm-disk-backup-src-restore-consumer
+
+orig_uid=$(kubectl -n "$NAMESPACE" get pvc "$PVC" -o jsonpath='{.metadata.uid}')
+[[ -n "$orig_uid" ]] || { log_error "PVC $PVC has no uid before the restore"; exit 1; }
+log_info "PVC $PVC before restore: uid $orig_uid"
+
+log_step "Creating RestoreJob 'vmdisk-restore-in-place' in namespace $NAMESPACE..."
+log_info "In-place restore: the original PVC is renamed and the disk is restored from backup"
+log_command "kubectl apply -f - (RestoreJob: vmdisk-restore-in-place)"
+
+# The controller suspends the vm-disk-<name> HelmRelease, deletes its DataVolume
+# and (keepOriginalPVC) renames the live PVC to <name>-orig-<hash>; Velero then
+# creates a fresh PVC under the original name for the data mover to populate.
+kubectl apply -f - <<EOF
+apiVersion: backups.cozystack.io/v1alpha1
+kind: RestoreJob
+metadata:
+  name: vmdisk-restore-in-place
+  namespace: ${NAMESPACE}
+spec:
+  backupRef:
+    name: vmdisk-backup
+  targetApplicationRef:
+    apiGroup: apps.cozystack.io
+    kind: VMDisk
+    name: backup-src
+  options:
+    keepOriginalPVC: true # rename the original PVC to <name>-orig-<hash> before restoring
+EOF
+
+log_success "RestoreJob created"
+
+# On a WaitForFirstConsumer StorageClass the Velero data mover does not start
+# until a scheduled Pod has picked a node for the restored PVC (Velero's
+# WaitPVCConsumed). A VMInstance restore gets that from the virt-launcher Pod; a
+# detached disk has no consumer, so stand in for the VM that would attach it.
+# Only once the new PVC exists: a Pod mounting the original would pin it with
+# pvc-protection and block the rename.
+start_consumer() {
+    local mode volume mount
+    mode=$(kubectl -n "$NAMESPACE" get pvc "$PVC" -o jsonpath='{.spec.volumeMode}')
+    if [[ "$mode" == "Block" ]]; then
+        mount='volumeDevices: [{name: disk, devicePath: /dev/disk0}]'
+    else
+        mount='volumeMounts: [{name: disk, mountPath: /disk}]'
+    fi
+    volume="{name: disk, persistentVolumeClaim: {claimName: $PVC}}"
+    log_info "Starting consumer Pod $CONSUMER for the restored PVC ($mode)"
+    kubectl apply -f - <<EOF
+apiVersion: v1
+kind: Pod
+metadata:
+  name: ${CONSUMER}
+  namespace: ${NAMESPACE}
+spec:
+  securityContext:
+    runAsNonRoot: true
+    runAsUser: 65532
+    seccompProfile:
+      type: RuntimeDefault
+  containers:
+  - name: pause
+    image: registry.k8s.io/pause:3.9
+    securityContext:
+      allowPrivilegeEscalation: false
+      readOnlyRootFilesystem: true
+      capabilities:
+        drop: ["ALL"]
+    ${mount}
+  volumes:
+  - ${volume}
+EOF
+}
+
+log_step "Waiting for RestoreJob to complete..."
+log_command "waiting for restorejob/vmdisk-restore-in-place {.status.phase} == 'Succeeded'"
+consumer_started=false
+elapsed=0
+timeout="${RESTORE_WAIT:-1800}"
+while true; do
+    phase=$(kubectl -n "$NAMESPACE" get restorejob vmdisk-restore-in-place -o jsonpath='{.status.phase}' || true)
+    [[ "$phase" == "Succeeded" ]] && break
+    if [[ "$phase" == "Failed" ]]; then
+        log_error "restorejob/vmdisk-restore-in-place reached terminal failure state 'Failed'"
+        exit 1
+    fi
+    if [[ "$consumer_started" == false ]]; then
+        # A PVC CDI recreated in the rename window has a new uid too but no
+        # restore label; mounting it would pin it while the controller clears it.
+        read -r uid restored < <(kubectl -n "$NAMESPACE" get pvc "$PVC" --ignore-not-found \
+            -o jsonpath='{.metadata.uid} {.metadata.labels.velero\.io/restore-name}' || true) || true
+        if [[ -n "${uid:-}" && "$uid" != "$orig_uid" && -n "${restored:-}" ]]; then
+            start_consumer
+            consumer_started=true
+        fi
+    fi
+    if [[ $elapsed -ge $timeout ]]; then
+        log_error "Timeout waiting for restorejob/vmdisk-restore-in-place (current: '$phase', expected: 'Succeeded', consumer started: $consumer_started)"
+        exit 1
+    fi
+    sleep 5
+    elapsed=$((elapsed + 5))
+    echo -n "." >&2
+done
+log_success "restorejob/vmdisk-restore-in-place reached 'Succeeded'"
+
+kubectl -n "$NAMESPACE" delete pod "$CONSUMER" --ignore-not-found --timeout=120s
+
+# Neither the restore-name label nor a new uid proves the data moved: Velero's
+# existingResourcePolicy: update stamps the label on a PVC it only patched, and
+# CDI recreating the disk would also give it a new uid. The DataDownload check
+# below does; the uid and the -orig- PVC show the original was kept aside.
+log_step "Verifying the PVC was recreated from the backup..."
+wait_for_field pvc "$PVC" '{.status.phase}' Bound "$NAMESPACE" 120
+new_uid=$(kubectl -n "$NAMESPACE" get pvc "$PVC" -o jsonpath='{.metadata.uid}')
+[[ "$new_uid" != "$orig_uid" ]] || {
+    log_error "PVC $PVC still has its pre-restore uid $orig_uid — the restore did not recreate it"
+    exit 1
+}
+restore_label=$(kubectl -n "$NAMESPACE" get pvc "$PVC" \
+    -o "jsonpath={.metadata.labels.velero\.io/restore-name}")
+[[ -n "$restore_label" ]] || {
+    log_error "PVC $PVC carries no velero.io/restore-name label — Velero did not restore it"
+    exit 1
+}
+all_pvcs=$(kubectl -n "$NAMESPACE" get pvc -o name)
+[[ "$all_pvcs" == *"persistentvolumeclaim/${PVC}-orig-"* ]] || {
+    log_error "no ${PVC}-orig-* PVC — keepOriginalPVC did not rename the original disk"
+    exit 1
+}
+# The DataDownload carries the same restore-name label as the PVC; one that
+# Completed having written bytes is what shows the data mover filled the disk.
+downloads=$(kubectl -n cozy-velero get datadownloads.velero.io -l "velero.io/restore-name=${restore_label}" \
+    -o jsonpath='{range .items[*]}{.status.phase} {.status.progress.bytesDone}{"\n"}{end}')
+grep -Eq '^Completed [1-9][0-9]*$' <<<"$downloads" || {
+    log_error "no Completed DataDownload with data for restore ${restore_label} — the data mover did not restore $PVC (got: ${downloads:-none})"
+    exit 1
+}
+
+log_step "Waiting for the restored VMDisk to become Ready again..."
+# The HelmRelease was Ready before the controller suspended it, and that
+# condition outlives the restore; only once Flux has reconciled the restored
+# spec does Ready describe the restored release.
+hr_generation=$(kubectl -n "$NAMESPACE" get hr vm-disk-backup-src -o jsonpath='{.metadata.generation}')
+wait_for_field hr vm-disk-backup-src '{.status.observedGeneration}' "$hr_generation" "$NAMESPACE" 120
+wait_hr_ready vm-disk-backup-src 180
+
+kubectl get restorejob vmdisk-restore-in-place -n "$NAMESPACE" -o wide >&2 || true
+log_success "Restore completed; VMDisk 'backup-src' recreated from backup (${restore_label}, uid ${new_uid}), Bound and Ready"
diff --git a/examples/backups/vmdisk/README.md b/examples/backups/vmdisk/README.md
new file mode 100644
index 0000000000..3f67d81ac6
--- /dev/null
+++ b/examples/backups/vmdisk/README.md
@@ -0,0 +1,29 @@
+# VMDisk backup/restore example
+
+This directory shows how to back up and restore a standalone Cozystack `VMDisk` (a HelmRelease plus a DataVolume-backed PVC, with no VMInstance attached) using the cluster's `Velero` backup strategy driver. Each `BackupJob` drives a Velero CSI-snapshot backup whose data mover (kopia) streams the LINSTOR block volume to S3; each in-place `RestoreJob` recreates the disk from that artefact.
+
+The numbered scripts run in order (or via `run-all.sh`):
+
+1. `01-create-strategy.sh` — a `Velero` strategy for the `VMDisk` kind.
+2. `02-create-backupclass.sh` — a `BackupClass` binding `VMDisk` to it.
+3. `03-create-vmdisk.sh` — a standalone `VMDisk`, waited until imported.
+4. `04-create-backupjob.sh` — an ad-hoc `BackupJob`, waited to `Succeeded`.
+5. `05-restore-in-place.sh` — an in-place `RestoreJob`, then asserts that the PVC was recreated from the backup: it has a new uid, carries Velero's `velero.io/restore-name` label, and the original survives as `<name>-orig-<hash>`.
+
+`cleanup.sh` tears everything down non-interactively.
+
+## In-place restore
+
+The driver prepares a `VMDisk` restore target the same way it does a VMInstance disk: it suspends the `vm-disk-<name>` HelmRelease and deletes its DataVolume (so Flux/CDI do not recreate the PVC and race the data mover), and, with `keepOriginalPVC: true`, renames the live PVC to `<name>-orig-<hash>` so that Velero creates a fresh PVC under the original name. `cleanup.sh` resumes the HelmRelease and reclaims the renamed PVC.
+
+A disk that a running VM mounts cannot be restored in place: the `RestoreJob` fails before it changes anything and names the Pod that holds the disk. Stop the VM, or restore the VMInstance instead.
+
+If the restore fails after this preparation, nothing is rolled back. The failure message and a Warning event name the HelmRelease that preparation suspended and the `<name>-orig-<hash>` PVC that holds the original data. If Velero got as far as restoring the HelmRelease it is no longer suspended, and Flux may already have recreated the disk; with no restored PVC under the disk's name, CDI imports a fresh disk there. Either way, check what the disk holds, and restore again or bind the original PV back to a PVC under the disk's name if it is not what you expect.
+
+## Detached disks and WaitForFirstConsumer
+
+On a StorageClass with `volumeBindingMode: WaitForFirstConsumer`, such as the `local` class the CI lane uses, the Velero data mover does not start until a scheduled Pod has selected a node for the restored PVC. A VMInstance restore gets that from its virt-launcher Pod. A detached disk has no consumer, so its `RestoreJob` stays `Running` until something mounts the PVC, and fails once Velero's expose timeout passes. `05-restore-in-place.sh` therefore starts a minimal `pause` Pod on the restored PVC, standing in for the VM that would attach the disk, and deletes it once the restore has succeeded. On a real cluster, attaching the disk to a VMInstance does the same.
+
+## Overrides
+
+Environment variables (see `00-helpers.sh`) tune the flow: `NAMESPACE`, `BACKUP_STORAGE_LOCATION` (defaults to the platform `cozy-default` BSL), `VMI_DISK_STORAGE_CLASS` (defaults to `replicated`; set it to your cluster's class), and the `IMPORT_WAIT` / `BACKUP_WAIT` / `RESTORE_WAIT` budgets. `hack/e2e-chainsaw/vminstance/` drives this directory as the `vmdisk-2-backup-roundtrip` e2e test.
diff --git a/examples/backups/vmdisk/cleanup.sh b/examples/backups/vmdisk/cleanup.sh
new file mode 100755
index 0000000000..d66af53013
--- /dev/null
+++ b/examples/backups/vmdisk/cleanup.sh
@@ -0,0 +1,70 @@
+#!/bin/bash
+# Clean up all resources created by the demo. Non-interactive: safe to call from
+# the e2e harness's finally block, and idempotent (a no-op when a gated-out run
+# created nothing). --ignore-not-found returns success for an absent resource but
+# does NOT mask a stuck delete: the delete still blocks and, under set -e, a
+# teardown that never settles fails this script instead of leaking state into the
+# next run (docs/agents/e2e-testing.md convention 4).
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "$SCRIPT_DIR/00-helpers.sh"
+
+print_header "Cleanup Demo Resources"
+
+# The controller suspends the VMDisk's HelmRelease before a restore and never
+# resumes it. A restore that gets as far as Velero clears it, but one that fails
+# earlier leaves it suspended, so resume it best-effort BEFORE deleting the
+# RestoreJob (same reasoning as examples/backups/vmi/cleanup.sh).
+if kubectl -n "$NAMESPACE" get hr vm-disk-backup-src >/dev/null 2>&1; then
+    log_substep "Resuming HelmRelease vm-disk-backup-src (no-op if not suspended)..."
+    kubectl -n "$NAMESPACE" patch hr vm-disk-backup-src --type=merge \
+        -p '{"spec":{"suspend":false}}' >/dev/null || true
+fi
+
+# Namespaced request objects first. Deleting the cozystack BackupJob/RestoreJob
+# and Backup CRs cascades to the Velero Backup/Restore the controller created.
+log_step "Deleting RestoreJob..."
+kubectl delete restorejob vmdisk-restore-in-place -n "$NAMESPACE" --ignore-not-found
+
+log_step "Deleting BackupJob and Backup..."
+kubectl delete backupjob vmdisk-backup -n "$NAMESPACE" --ignore-not-found
+kubectl delete backup vmdisk-backup -n "$NAMESPACE" --ignore-not-found
+
+separator
+
+log_step "Deleting VMDisk and its PVC..."
+kubectl delete pod vm-disk-backup-src-restore-consumer -n "$NAMESPACE" --ignore-not-found
+kubectl delete vmdisk backup-src -n "$NAMESPACE" --ignore-not-found
+kubectl delete pvc -n "$NAMESPACE" \
+    -l app.kubernetes.io/instance=vm-disk-backup-src --ignore-not-found
+
+# keepOriginalPVC renamed the pre-restore PVC to <name>-orig-<hash> with a bare
+# ObjectMeta (no labels/owner) and flipped its PV to Retain, so the label delete
+# above misses it. Reclaim it by name and flip the PV back to Delete BEFORE
+# removing the PVC so the CSI provisioner reclaims the LINSTOR volume rather than
+# stranding it. Let the lookup and patch fail the script (see the vmi cleanup).
+if ! all_pvcs=$(kubectl -n "$NAMESPACE" get pvc -o name 2>&1); then
+    log_error "cannot list PVCs to reclaim orphaned disks: $all_pvcs"
+    exit 1
+fi
+orig_pvcs=$(printf '%s\n' "$all_pvcs" | grep -E '/vm-disk-backup-src-orig-' || true)
+for pvc in $orig_pvcs; do
+    pv=$(kubectl -n "$NAMESPACE" get "$pvc" -o jsonpath='{.spec.volumeName}')
+    log_substep "Reclaiming orphaned ${pvc#*/} and its LINSTOR volume..."
+    if [[ -n "$pv" ]]; then
+        kubectl patch pv "$pv" --type=merge \
+            -p '{"spec":{"persistentVolumeReclaimPolicy":"Delete"}}' >/dev/null
+    fi
+    kubectl -n "$NAMESPACE" delete "$pvc" --ignore-not-found
+done
+
+separator
+
+log_step "Deleting BackupClass and Velero strategy..."
+kubectl delete backupclass vmdisk-velero --ignore-not-found
+kubectl delete velero.strategy.backups.cozystack.io vmdisk-backup-strategy --ignore-not-found
+
+separator
+
+log_success "Cleanup complete"
diff --git a/examples/backups/vmdisk/run-all.sh b/examples/backups/vmdisk/run-all.sh
new file mode 100755
index 0000000000..0956ad807e
--- /dev/null
+++ b/examples/backups/vmdisk/run-all.sh
@@ -0,0 +1,43 @@
+#!/bin/bash
+# Convenience runner + e2e harness for the standalone VMDisk backup/restore demo.
+#
+# Runs the numbered steps 01..05 a human reads, in order, non-interactively,
+# stopping on the first failure (set -e). This is the SAME sequence the docs walk
+# through, so the documented demo and the automated test can never drift.
+#
+# Flow: Velero strategy -> BackupClass -> a standalone VMDisk (waits imported) ->
+# ad-hoc BackupJob (waits Succeeded) -> in-place RestoreJob (waits Succeeded, then
+# waits for the restored disk to be Bound + Ready).
+#
+# Override NAMESPACE / BACKUP_STORAGE_LOCATION via the environment; see
+# 00-helpers.sh. hack/e2e-chainsaw/vminstance/ drives this file as the
+# vmdisk-2-backup-roundtrip e2e test, run un-gated in CI.
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "$SCRIPT_DIR/00-helpers.sh"
+
+print_header "VMDisk Backup & Restore Demo"
+log_info "Namespace: ${NAMESPACE}   BackupStorageLocation: ${BACKUP_STORAGE_LOCATION}"
+
+SCRIPTS=(
+    "01-create-strategy.sh"
+    "02-create-backupclass.sh"
+    "03-create-vmdisk.sh"
+    "04-create-backupjob.sh"
+    "05-restore-in-place.sh"
+)
+
+for script in "${SCRIPTS[@]}"; do
+    if [[ -x "$SCRIPT_DIR/$script" ]]; then
+        "$SCRIPT_DIR/$script"
+        separator
+    else
+        log_error "Script not found or not executable: $script"
+        exit 1
+    fi
+done
+
+print_header "Demo Complete"
+log_success "All steps completed successfully!"
+log_info "To clean up resources: ./cleanup.sh"
diff --git a/examples/backups/vmi/00-helpers.sh b/examples/backups/vmi/00-helpers.sh
index 384054952d..30ca161f3b 100755
--- a/examples/backups/vmi/00-helpers.sh
+++ b/examples/backups/vmi/00-helpers.sh
@@ -15,7 +15,11 @@ export BOLD='\033[1m'
 
 # Default settings
 export NAMESPACE="${NAMESPACE:-tenant-root}"
-export BACKUP_STORAGE_LOCATION="${BACKUP_STORAGE_LOCATION:-default}"
+# The platform ships the SeaweedFS-backed BackupStorageLocation as cozy-default
+# (packages/system/backupstrategy-controller). Point the demo/e2e strategies at
+# it by default so the flow works out of the box on a backups-enabled cluster;
+# override for an external S3 whose BSL carries a different name.
+export BACKUP_STORAGE_LOCATION="${BACKUP_STORAGE_LOCATION:-cozy-default}"
 
 # Logging functions (output to stderr to avoid polluting captured output)
 log_info() {
@@ -65,38 +69,10 @@ resource_exists() {
     fi
 }
 
-# Wait for a resource field to reach a desired value
-wait_for_field() {
-    local resource_type="$1"
-    local resource_name="$2"
-    local jsonpath="$3"
-    local desired="$4"
-    local namespace="${5:-}"
-    local timeout="${6:-300}"
-
-    log_substep "Waiting for $resource_type/$resource_name $jsonpath to become '$desired'..."
-
-    local elapsed=0
-    local ns_flag=""
-    [[ -n "$namespace" ]] && ns_flag="-n $namespace"
-
-    while true; do
-        local current
-        # shellcheck disable=SC2086
-        current=$(kubectl get "$resource_type" "$resource_name" $ns_flag -o jsonpath="$jsonpath" 2>/dev/null || true)
-        if [[ "$current" == "$desired" ]]; then
-            log_success "$resource_type/$resource_name reached '$desired'"
-            return 0
-        fi
-        if [[ $elapsed -ge $timeout ]]; then
-            log_error "Timeout waiting for $resource_type/$resource_name (current: '$current', expected: '$desired')"
-            return 1
-        fi
-        sleep 5
-        elapsed=$((elapsed + 5))
-        echo -n "." >&2
-    done
-}
+# wait_for_field, wait_hr_ready and wait_deleted live in one file shared by
+# every backup walkthrough, so a fix to one reaches all of them.
+# shellcheck source-path=SCRIPTDIR source=../_lib/wait-helpers.sh
+source "$(dirname "${BASH_SOURCE[0]}")/../_lib/wait-helpers.sh"
 
 # Print a separator line
 separator() {
diff --git a/examples/backups/vmi/01-create-strategies.sh b/examples/backups/vmi/01-create-strategies.sh
index 78aa34d311..a12809c541 100755
--- a/examples/backups/vmi/01-create-strategies.sh
+++ b/examples/backups/vmi/01-create-strategies.sh
@@ -70,8 +70,11 @@ spec:
         - controllerrevisions.apps
       includeClusterResources: false
       storageLocation: '{{ .Parameters.backupStorageLocationName }}'
-      volumeSnapshotLocations:
-        - '{{ .Parameters.backupStorageLocationName }}'
+      # No volumeSnapshotLocations: with snapshotMoveData the CSI data mover
+      # uploads the volume data through the BackupStorageLocation, so a VSL of
+      # the same name is not required (and referencing a non-existent one fails
+      # the backup). The platform's own cozy-default-velero-vminstance strategy
+      # omits it for the same reason.
       snapshotVolumes: true
       snapshotMoveData: true
       ttl: 720h0m0s
@@ -123,8 +126,8 @@ spec:
         - configmaps
       includeClusterResources: false
       storageLocation: '{{ .Parameters.backupStorageLocationName }}'
-      volumeSnapshotLocations:
-        - '{{ .Parameters.backupStorageLocationName }}'
+      # See the VMInstance strategy above: snapshotMoveData routes volume data
+      # through the BackupStorageLocation, so no VolumeSnapshotLocation is needed.
       snapshotVolumes: true
       snapshotMoveData: true
       ttl: 720h0m0s
diff --git a/examples/backups/vmi/03-create-vmdisk.sh b/examples/backups/vmi/03-create-vmdisk.sh
index 89d598867b..27234a09db 100755
--- a/examples/backups/vmi/03-create-vmdisk.sh
+++ b/examples/backups/vmi/03-create-vmdisk.sh
@@ -7,8 +7,13 @@ source "$SCRIPT_DIR/00-helpers.sh"
 
 print_header "Step 3: Create VMDisk"
 
+# Image + size are overridable so the same flow can run a heavy ubuntu demo or a
+# tiny cirros disk for a lightweight e2e (see hack/e2e-chainsaw/vminstance).
+VMI_IMAGE_URL="${VMI_IMAGE_URL:-https://cloud-images.ubuntu.com/noble/current/noble-server-cloudimg-amd64.img}"
+VMI_DISK_STORAGE="${VMI_DISK_STORAGE:-20Gi}"
+
 log_step "Creating VMDisk 'ubuntu-source' in namespace $NAMESPACE..."
-log_info "This will download the Ubuntu Noble cloud image (~700MB)"
+log_info "Importing ${VMI_IMAGE_URL} into a ${VMI_DISK_STORAGE} disk"
 log_command "kubectl apply -f - (VMDisk: ubuntu-source)"
 
 kubectl apply -f - <<EOF
@@ -21,9 +26,12 @@ spec:
   optical: false
   source:
     http:
-      url: https://cloud-images.ubuntu.com/noble/current/noble-server-cloudimg-amd64.img
-  storage: 20Gi
-  storageClass: replicated
+      url: ${VMI_IMAGE_URL}
+  storage: ${VMI_DISK_STORAGE}
+  # Default 'replicated' for a real DRBD cluster; overridable so the CI lane can
+  # pass its own class (the PR gate runs DRBD-off and only renders 'local', so a
+  # hardcoded 'replicated' never binds a PVC and the import hangs).
+  storageClass: ${VMI_DISK_STORAGE_CLASS:-replicated}
 EOF
 
 log_success "VMDisk created"
diff --git a/examples/backups/vmi/04-create-vminstance.sh b/examples/backups/vmi/04-create-vminstance.sh
index f595dd8823..30fd72616a 100755
--- a/examples/backups/vmi/04-create-vminstance.sh
+++ b/examples/backups/vmi/04-create-vminstance.sh
@@ -10,6 +10,11 @@ print_header "Step 4: Create VMInstance"
 log_step "Creating VMInstance 'test' in namespace $NAMESPACE..."
 log_command "kubectl apply -f - (VMInstance: test)"
 
+# Profile + instance type are overridable so the same flow can boot a heavy
+# ubuntu demo or a tiny cirros VM for a lightweight e2e (u1.nano = 1 vCPU/512Mi).
+VMI_INSTANCE_PROFILE="${VMI_INSTANCE_PROFILE:-ubuntu}"
+VMI_INSTANCE_TYPE="${VMI_INSTANCE_TYPE:-u1.medium}"
+
 kubectl apply -f - <<EOF
 apiVersion: apps.cozystack.io/v1alpha1
 kind: VMInstance
@@ -19,8 +24,8 @@ metadata:
 spec:
   disks:
     - name: ubuntu-source
-  instanceProfile: ubuntu
-  instanceType: "u1.medium"
+  instanceProfile: ${VMI_INSTANCE_PROFILE}
+  instanceType: "${VMI_INSTANCE_TYPE}"
   running: true
   sshKeys:
     #- <paste your ssh public key here>
@@ -34,11 +39,24 @@ log_success "VMInstance created"
 
 separator
 
+# Wait for the VM to be fully booted before backing it up. Backing up a VM that
+# is still importing its disk or has not started yields an incomplete, useless
+# backup — so, like the etcd/postgres source steps, block on readiness here.
+# The Ubuntu cloud image download (~700MB) plus nested KubeVirt boot is slow,
+# hence the generous 900s bound.
+log_step "Waiting for the VMInstance to boot (HelmRelease + VirtualMachine Ready)..."
+wait_hr_ready vm-instance-test "${IMPORT_WAIT:-900}"
+log_command "kubectl -n $NAMESPACE wait virtualmachine.kubevirt.io/vm-instance-test --for=condition=Ready"
+kubectl -n "$NAMESPACE" wait virtualmachine.kubevirt.io/vm-instance-test \
+    --for=condition=Ready --timeout="${VMI_BOOT_WAIT:-600}s"
+
+separator
+
 log_step "Verifying VMInstance..."
 log_command "kubectl get vminstance test -n $NAMESPACE"
 kubectl get vminstance test -n "$NAMESPACE"
 
 separator
 
-log_success "VMInstance is ready"
+log_success "VMInstance is running and ready to back up"
 echo -e "\n${GREEN}${BOLD}Next step:${NC} ./05-create-backupjob.sh"
diff --git a/examples/backups/vmi/05-create-backupjob.sh b/examples/backups/vmi/05-create-backupjob.sh
index 581490a473..095e0b1692 100755
--- a/examples/backups/vmi/05-create-backupjob.sh
+++ b/examples/backups/vmi/05-create-backupjob.sh
@@ -30,7 +30,11 @@ log_success "BackupJob created"
 separator
 
 log_step "Waiting for BackupJob to complete..."
-wait_for_field backupjob test-backup '{.status.phase}' Succeeded "$NAMESPACE" 600
+# Default 1800s: the Velero CSI data mover copies the whole VM disk (20Gi) to S3,
+# far heavier than a database dump. Overridable (BACKUP_WAIT) so the CI harness
+# can bound it well under the Chainsaw op timeout on its tiny guest. Fail fast if
+# the job flips to Failed.
+wait_for_field backupjob test-backup '{.status.phase}' Succeeded "$NAMESPACE" "${BACKUP_WAIT:-1800}" Failed
 
 separator
 
diff --git a/examples/backups/vmi/06-restore-in-place.sh b/examples/backups/vmi/06-restore-in-place.sh
index ea424ed56e..95cd5e1eea 100755
--- a/examples/backups/vmi/06-restore-in-place.sh
+++ b/examples/backups/vmi/06-restore-in-place.sh
@@ -7,6 +7,9 @@ source "$SCRIPT_DIR/00-helpers.sh"
 
 print_header "Step 6: Restore VMInstance In-Place"
 
+orig_uid=$(kubectl -n "$NAMESPACE" get pvc vm-disk-ubuntu-source -o jsonpath='{.metadata.uid}')
+[[ -n "$orig_uid" ]] || { log_error "PVC vm-disk-ubuntu-source has no uid before the restore"; exit 1; }
+
 log_step "Creating RestoreJob 'restore-in-place-test' in namespace $NAMESPACE..."
 log_info "In-place restore: the VM will be halted, PVCs renamed, and data restored from backup"
 log_command "kubectl apply -f - (RestoreJob: restore-in-place-test)"
@@ -25,8 +28,8 @@ spec:
     kind: VMInstance
     name: test
   options:
-    failIfTargetExists: true # if true, restore will fail when the target resource already exists
-    keepOriginalPVC: true # renames original VMI PVC before restore to `<name>-orig-<hash>`, only for in-place restore
+    failIfTargetExists: true # only enforced for restore-to-copy; a no-op for in-place, whose source is expected to exist
+    keepOriginalPVC: true # renames original VMI PVC before restore to <name>-orig-<hash>, only for in-place restore
     keepOriginalIpAndMac: true # restores original IP and MAC address of VMI via OVN annotations
 EOF
 
@@ -35,7 +38,7 @@ log_success "RestoreJob created"
 separator
 
 log_step "Waiting for RestoreJob to complete..."
-wait_for_field restorejob restore-in-place-test '{.status.phase}' Succeeded "$NAMESPACE" 600
+wait_for_field restorejob restore-in-place-test '{.status.phase}' Succeeded "$NAMESPACE" "${RESTORE_WAIT:-1800}" Failed
 
 separator
 
@@ -45,5 +48,49 @@ kubectl get restorejob restore-in-place-test -n "$NAMESPACE" -o wide
 
 separator
 
-log_success "In-place restore completed successfully"
+# The RestoreJob reaching Succeeded means Velero re-created the objects; wait
+# for the restored VM to come back before checking where its disk came from.
+log_step "Waiting for the restored VMInstance to boot again..."
+log_command "kubectl -n $NAMESPACE wait virtualmachine.kubevirt.io/vm-instance-test --for=condition=Ready"
+kubectl -n "$NAMESPACE" wait virtualmachine.kubevirt.io/vm-instance-test \
+    --for=condition=Ready --timeout="${VMI_BOOT_WAIT:-600}s"
+
+# VirtualMachine Ready is the virt-launcher Pod's readiness, reported before the
+# guest runs, so it cannot tell a restored disk from a blank one, and this
+# platform offers no guest-side signal (serial-console logging is disabled
+# cluster-wide, the cirros guest has no qemu-guest-agent). Prove provenance on the
+# PVC instead. Neither the restore-name label nor a new uid proves the data
+# moved (existingResourcePolicy: update stamps the label on a PVC it only
+# patched, and CDI recreating the disk gives it a new uid); the DataDownload
+# check below does, and the uid and -orig- PVC show the original was kept aside.
+log_step "Verifying the VM booted off a disk the restore recreated from the backup..."
+wait_for_field pvc vm-disk-ubuntu-source '{.status.phase}' Bound "$NAMESPACE" 120
+new_uid=$(kubectl -n "$NAMESPACE" get pvc vm-disk-ubuntu-source -o jsonpath='{.metadata.uid}')
+[[ "$new_uid" != "$orig_uid" ]] || {
+    log_error "PVC vm-disk-ubuntu-source still has its pre-restore uid $orig_uid — the restore did not recreate it"
+    exit 1
+}
+restore_label=$(kubectl -n "$NAMESPACE" get pvc vm-disk-ubuntu-source \
+    -o "jsonpath={.metadata.labels.velero\.io/restore-name}")
+[[ -n "$restore_label" ]] || {
+    log_error "restored VM disk PVC carries no velero.io/restore-name label — Velero did not restore it"
+    exit 1
+}
+all_pvcs=$(kubectl -n "$NAMESPACE" get pvc -o name)
+[[ "$all_pvcs" == *"persistentvolumeclaim/vm-disk-ubuntu-source-orig-"* ]] || {
+    log_error "no vm-disk-ubuntu-source-orig-* PVC — keepOriginalPVC did not rename the original disk"
+    exit 1
+}
+# The DataDownload carries the same restore-name label as the PVC; one that
+# Completed having written bytes is what shows the data mover filled the disk.
+downloads=$(kubectl -n cozy-velero get datadownloads.velero.io -l "velero.io/restore-name=${restore_label}" \
+    -o jsonpath='{range .items[*]}{.status.phase} {.status.progress.bytesDone}{"\n"}{end}')
+grep -Eq '^Completed [1-9][0-9]*$' <<<"$downloads" || {
+    log_error "no Completed DataDownload with data for restore ${restore_label} — the data mover did not restore vm-disk-ubuntu-source (got: ${downloads:-none})"
+    exit 1
+}
+
+separator
+
+log_success "In-place restore completed; VM disk recreated from backup (${restore_label}, uid ${new_uid}) and the VM is Running off it"
 echo -e "\n${GREEN}${BOLD}Next step:${NC} ./07-restore-to-copy.sh"
diff --git a/examples/backups/vmi/07-restore-to-copy.sh b/examples/backups/vmi/07-restore-to-copy.sh
index 9b84ce5587..d7f7b87fb7 100755
--- a/examples/backups/vmi/07-restore-to-copy.sh
+++ b/examples/backups/vmi/07-restore-to-copy.sh
@@ -40,7 +40,7 @@ spec:
   options: # runtime.RawExtension, typed based on targetApplicationRef and current controller implementation (for additional restore options)
     targetNamespace: ${TARGET_NAMESPACE} # when set to a different namespace, triggers cross-namespace restore via Velero namespaceMapping
     failIfTargetExists: true # if true, restore will fail when the target resource already exists
-    keepOriginalPVC: false # renames original VMI PVC before restore to `<name>-orig-<hash>`, only for in-place restore
+    keepOriginalPVC: false # renames original VMI PVC before restore to <name>-orig-<hash>, only for in-place restore
     keepOriginalIpAndMac: false # restores original IP and MAC address of VMI via OVN annotations
 EOF
 
@@ -49,7 +49,7 @@ log_success "RestoreJob created"
 separator
 
 log_step "Waiting for RestoreJob to complete..."
-wait_for_field restorejob restore-to-copy-test '{.status.phase}' Succeeded "$NAMESPACE" 600
+wait_for_field restorejob restore-to-copy-test '{.status.phase}' Succeeded "$NAMESPACE" 1800 Failed
 
 separator
 
diff --git a/examples/backups/vmi/cleanup.sh b/examples/backups/vmi/cleanup.sh
index 5965c3f036..3351ce9ee9 100755
--- a/examples/backups/vmi/cleanup.sh
+++ b/examples/backups/vmi/cleanup.sh
@@ -1,5 +1,10 @@
 #!/bin/bash
-# Clean up all resources created by the demo
+# Clean up all resources created by the demo. Non-interactive: safe to call from
+# the e2e harness's finally block, and idempotent (a no-op when a gated-out run
+# created nothing). --ignore-not-found returns success for an absent resource
+# but does NOT mask a stuck delete: the delete still blocks and, under set -e,
+# a teardown that never settles fails this script instead of leaking state into
+# the next run (docs/agents/e2e-testing.md convention 4).
 set -euo pipefail
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
@@ -9,62 +14,74 @@ TARGET_NAMESPACE="${TARGET_NAMESPACE:-tenant-root-copy}"
 
 print_header "Cleanup Demo Resources"
 
-log_warning "This script will delete all resources created during the demo"
-echo -e "\n${YELLOW}The following will be deleted:${NC}"
-echo "  - RestoreJobs (restore-in-place-test, restore-to-copy-test)"
-echo "  - BackupJob (test-backup) and associated Backup"
-echo "  - VMInstance (test)"
-echo "  - VMDisk (ubuntu-source)"
-echo "  - BackupClass (velero)"
-echo "  - Velero strategies (vminstance-strategy, vmdisk-strategy)"
-echo "  - Target namespace ($TARGET_NAMESPACE)"
-echo ""
-
-read -p "Continue? (y/N): " -n 1 -r
-echo
-if [[ ! $REPLY =~ ^[Yy]$ ]]; then
-    log_info "Cancelled"
-    exit 0
-fi
-
-separator
-
+# The driver suspends the VMInstance/VMDisk HelmReleases while a RestoreJob runs
+# and never resumes them (suspendHelmRelease only ever sets suspend=true), so an
+# aborted or completed restore leaves them suspended. Resume best-effort BEFORE
+# deleting the RestoreJobs — deleting a RestoreJob without resuming strands the
+# app suspended (same reasoning as examples/backups/postgres/cleanup.sh).
+for hr in vm-instance-test vm-disk-ubuntu-source; do
+    if kubectl -n "$NAMESPACE" get hr "$hr" >/dev/null 2>&1; then
+        log_substep "Resuming HelmRelease $hr (no-op if not suspended)..."
+        kubectl -n "$NAMESPACE" patch hr "$hr" --type=merge \
+            -p '{"spec":{"suspend":false}}' >/dev/null || true
+    fi
+done
+
+# Namespaced request objects first. Deleting the cozystack BackupJob/RestoreJob
+# and Backup CRs cascades to the Velero Backup/Restore the controller created.
 log_step "Deleting RestoreJobs..."
-kubectl delete restorejob restore-to-copy-test -n "$NAMESPACE" 2>/dev/null || log_warning "RestoreJob restore-to-copy-test not found"
-kubectl delete restorejob restore-in-place-test -n "$NAMESPACE" 2>/dev/null || log_warning "RestoreJob restore-in-place-test not found"
-
-separator
+kubectl delete restorejob restore-to-copy-test restore-in-place-test \
+    -n "$NAMESPACE" --ignore-not-found
 
 log_step "Deleting BackupJob and Backup..."
-kubectl delete backupjob test-backup -n "$NAMESPACE" 2>/dev/null || log_warning "BackupJob test-backup not found"
-kubectl delete backup test-backup -n "$NAMESPACE" 2>/dev/null || log_warning "Backup test-backup not found"
-
-separator
-
-log_step "Deleting VMInstance..."
-kubectl delete vminstance test -n "$NAMESPACE" 2>/dev/null || log_warning "VMInstance test not found"
-
-log_step "Deleting VMDisk..."
-kubectl delete vmdisk ubuntu-source -n "$NAMESPACE" 2>/dev/null || log_warning "VMDisk ubuntu-source not found"
+kubectl delete backupjob test-backup -n "$NAMESPACE" --ignore-not-found
+kubectl delete backup test-backup -n "$NAMESPACE" --ignore-not-found
 
 separator
 
-log_step "Deleting BackupClass..."
-kubectl delete backupclass velero 2>/dev/null || log_warning "BackupClass velero not found"
+log_step "Deleting VMInstance and VMDisk..."
+kubectl delete vminstance test -n "$NAMESPACE" --ignore-not-found
+kubectl delete vmdisk ubuntu-source -n "$NAMESPACE" --ignore-not-found
+
+# keepOriginalPVC renames the VMInstance's disk PVC to <name>-orig-<hash> with a
+# bare ObjectMeta (no labels, no ownerRefs) and flips its PV to Retain. Nothing
+# above reclaims it: the app delete does not own it and no label selector matches
+# it, so under skipDelete a LINSTOR volume and a Released PV leak on every run.
+# List loudly (a failed query must abort, not silently skip the reclaim it exists
+# for); grep's no-match stays tolerant.
+if ! all_pvcs=$(kubectl -n "$NAMESPACE" get pvc -o name 2>&1); then
+    log_error "cannot list PVCs to reclaim orphaned disks: $all_pvcs"
+    exit 1
+fi
+orig_pvcs=$(printf '%s\n' "$all_pvcs" | grep -E '/vm-disk-ubuntu-source-orig-' || true)
+for pvc in $orig_pvcs; do
+    # Flip the retained PV back to Delete BEFORE removing the PVC, so releasing it
+    # makes the CSI provisioner call DeleteVolume and reclaim the LINSTOR volume —
+    # deleting the PV object alone would drop the record and strand the volume. Let
+    # both the lookup and the patch fail the script: swallowing them would delete
+    # the PVC anyway and strand the volume with no PVC left to find it by.
+    pv=$(kubectl -n "$NAMESPACE" get "$pvc" -o jsonpath='{.spec.volumeName}')
+    log_substep "Reclaiming orphaned ${pvc#*/} and its LINSTOR volume..."
+    if [[ -n "$pv" ]]; then
+        kubectl patch pv "$pv" --type=merge \
+            -p '{"spec":{"persistentVolumeReclaimPolicy":"Delete"}}' >/dev/null
+    fi
+    kubectl -n "$NAMESPACE" delete "$pvc" --ignore-not-found
+done
 
 separator
 
-log_step "Deleting Velero strategies..."
-kubectl delete velero.strategy.backups.cozystack.io vminstance-strategy 2>/dev/null || log_warning "Strategy vminstance-strategy not found"
-kubectl delete velero.strategy.backups.cozystack.io vmdisk-strategy 2>/dev/null || log_warning "Strategy vmdisk-strategy not found"
+# Cluster-scoped BackupClass + strategies.
+log_step "Deleting BackupClass and Velero strategies..."
+kubectl delete backupclass velero --ignore-not-found
+kubectl delete velero.strategy.backups.cozystack.io \
+    vminstance-strategy vmdisk-strategy --ignore-not-found
 
 separator
 
 log_step "Deleting target namespace..."
-kubectl delete namespace "$TARGET_NAMESPACE" 2>/dev/null || log_warning "Namespace $TARGET_NAMESPACE not found"
+kubectl delete namespace "$TARGET_NAMESPACE" --ignore-not-found
 
 separator
 
 log_success "Cleanup complete"
-log_info "All demo resources have been deleted"
-echo -e "\n${GREEN}${BOLD}To re-run the demo:${NC} ./01-create-strategies.sh"
diff --git a/examples/backups/vmi/run-all.sh b/examples/backups/vmi/run-all.sh
index b58f4b9d33..2585bdb303 100755
--- a/examples/backups/vmi/run-all.sh
+++ b/examples/backups/vmi/run-all.sh
@@ -1,15 +1,25 @@
 #!/bin/bash
-# Run the full VMInstance backup/restore demo sequentially
+# Convenience runner + e2e harness for the VMInstance backup/restore demo.
+#
+# Runs the numbered steps 01..07 a human reads, in order, non-interactively,
+# stopping on the first failure (set -e). This is the SAME sequence the docs
+# walk through, so the documented flow and the automated test can never drift.
+#
+# Flow: Velero strategies -> BackupClass -> VMDisk + VMInstance (waits until the
+# VM is booted) -> ad-hoc BackupJob (waits Succeeded) -> in-place RestoreJob
+# (waits Succeeded, waits for the VM to boot again) -> cross-namespace to-copy
+# RestoreJob (waits Succeeded).
+#
+# Override NAMESPACE / BACKUP_STORAGE_LOCATION / TARGET_NAMESPACE via the
+# environment; see 00-helpers.sh. hack/e2e-chainsaw/vminstance/ drives this file
+# as the vminstance-2-backup-roundtrip e2e test, run un-gated in CI.
 set -euo pipefail
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 source "$SCRIPT_DIR/00-helpers.sh"
 
 print_header "VMInstance Backup & Restore Demo"
-
-log_info "This script will run all demo steps sequentially"
-log_info "There will be a pause between steps for observation"
-echo ""
+log_info "Namespace: ${NAMESPACE}   BackupStorageLocation: ${BACKUP_STORAGE_LOCATION}"
 
 SCRIPTS=(
     "01-create-strategies.sh"
@@ -18,29 +28,18 @@ SCRIPTS=(
     "04-create-vminstance.sh"
     "05-create-backupjob.sh"
     "06-restore-in-place.sh"
-    "07-restore-to-copy.sh"
 )
-
-echo -e "${CYAN}Demo steps:${NC}"
-for i in "${!SCRIPTS[@]}"; do
-    echo "  $((i+1)). ${SCRIPTS[$i]}"
-done
-echo ""
-
-read -p "Run demo? (y/N): " -n 1 -r
-echo
-if [[ ! $REPLY =~ ^[Yy]$ ]]; then
-    log_info "Cancelled"
-    exit 0
+# Cross-namespace to-copy restore is the heaviest step (a second full VM in a
+# fresh namespace). SKIP_RESTORE_TO_COPY=1 drops it — used by the lightweight CI
+# round-trip, which proves backup + in-place restore is enough.
+if [[ "${SKIP_RESTORE_TO_COPY:-0}" != "1" ]]; then
+    SCRIPTS+=("07-restore-to-copy.sh")
 fi
 
-separator
-
 for script in "${SCRIPTS[@]}"; do
     if [[ -x "$SCRIPT_DIR/$script" ]]; then
         "$SCRIPT_DIR/$script"
         separator
-        wait_for_enter
     else
         log_error "Script not found or not executable: $script"
         exit 1
@@ -50,13 +49,13 @@ done
 print_header "Demo Complete"
 
 log_success "All steps completed successfully!"
-echo ""
 log_info "What was demonstrated:"
-echo "  1. Created Velero backup strategies for VMInstance and VMDisk"
-echo "  2. Created BackupClass binding strategies to application types"
-echo "  3. Provisioned a VMDisk and VMInstance"
-echo "  4. Created a backup of the VMInstance via BackupJob"
-echo "  5. Restored the VMInstance in-place"
-echo "  6. Restored the VMInstance to a copy in a different namespace"
-echo ""
+echo "  1. Created Velero backup strategies for VMInstance and VMDisk" >&2
+echo "  2. Created BackupClass binding strategies to application types" >&2
+echo "  3. Provisioned a VMDisk and VMInstance" >&2
+echo "  4. Created a backup of the VMInstance via BackupJob" >&2
+echo "  5. Restored the VMInstance in-place" >&2
+if [[ "${SKIP_RESTORE_TO_COPY:-0}" != "1" ]]; then
+    echo "  6. Restored the VMInstance to a copy in a different namespace" >&2
+fi
 log_info "To clean up resources: ./cleanup.sh"
diff --git a/examples/backups/vmi/scenario-user-restore.md b/examples/backups/vmi/scenario-user-restore.md
index 1d35b22b07..b52453c450 100644
--- a/examples/backups/vmi/scenario-user-restore.md
+++ b/examples/backups/vmi/scenario-user-restore.md
@@ -39,6 +39,22 @@ The backup controller performs the following steps automatically:
 After the Velero Restore completes, the HelmReleases resume and the VM boots
 with the restored disk data while retaining its original IP and MAC addresses.
 
+### Reclaiming the kept disks
+
+With `keepOriginalPVC: true`, the default, step 3 switches each disk's PV to the `Retain` reclaim policy so that it outlives the PVC it is renamed from. Nothing removes the `-orig` PVCs or sets the policy back afterwards: they stay until an operator deletes them.
+
+The policy the PV had before the restore is recorded in the `backups.cozystack.io/original-reclaim-policy` annotation, on the PV and on the `-orig` PVC. Set it back on the PV before deleting the `-orig` PVC, or a PV that was `Delete` stays `Retain` once released and its volume is never reclaimed. A PVC renamed by an older controller carries no annotation; the snippet then leaves the PV on `Retain` for you to decide.
+
+```bash
+PVC=vm-disk-ubuntu-source-orig-1a2b
+PV=$(kubectl -n "$NAMESPACE" get pvc "$PVC" -o jsonpath='{.spec.volumeName}')
+POLICY=$(kubectl get pv "$PV" -o jsonpath='{.metadata.annotations.backups\.cozystack\.io/original-reclaim-policy}')
+kubectl patch pv "$PV" --type=merge -p "{\"spec\":{\"persistentVolumeReclaimPolicy\":\"${POLICY:-Retain}\"}}"
+kubectl -n "$NAMESPACE" delete pvc "$PVC"
+```
+
+The `<hash>` is derived from the RestoreJob name, so an `-orig` PVC left behind by a deleted RestoreJob takes the name a new RestoreJob of the same name would use. That RestoreJob fails before it halts the VM, naming the PVC, rather than restoring without keeping the current disk. Reclaim the leftover PVC as above, or give the new RestoreJob another name.
+
 ## Method 2: Cross-Namespace Restore (Copy)
 
 ```bash
diff --git a/go.mod b/go.mod
index 7b251c6434..6109faf15a 100644
--- a/go.mod
+++ b/go.mod
@@ -2,44 +2,49 @@
 
 module github.com/cozystack/cozystack
 
-go 1.26.2
+go 1.27.1
 
 require (
-	github.com/cert-manager/cert-manager v1.17.4
+	github.com/cert-manager/cert-manager v1.19.6
 	github.com/cozystack/cozystack-scheduler/pkg/apis v0.1.1
-	github.com/emicklei/dot v1.10.0
-	github.com/fluxcd/helm-controller/api v1.4.3
-	github.com/fluxcd/source-controller/api v1.7.4
-	github.com/fluxcd/source-watcher/api/v2 v2.0.3
-	github.com/go-logr/logr v1.4.3
+	github.com/emicklei/dot v1.11.0
+	github.com/fluxcd/helm-controller/api v1.5.1
+	github.com/fluxcd/pkg/apis/kustomize v1.15.0
+	github.com/fluxcd/pkg/apis/meta v1.26.0
+	github.com/fluxcd/source-controller/api v1.8.5
+	github.com/fluxcd/source-watcher/api/v2 v2.1.1
+	github.com/go-logr/logr v1.4.4
 	github.com/go-logr/zapr v1.3.0
 	github.com/go-task/slim-sprig/v3 v3.0.0
-	github.com/google/gofuzz v1.2.0
-	github.com/onsi/ginkgo/v2 v2.23.3
-	github.com/onsi/gomega v1.37.0
-	github.com/prometheus/client_golang v1.23.0
+	github.com/onsi/ginkgo/v2 v2.33.0
+	github.com/onsi/gomega v1.43.1
+	github.com/prometheus/client_golang v1.24.1
 	github.com/robfig/cron/v3 v3.0.1
-	github.com/spf13/cobra v1.9.1
-	github.com/vmware-tanzu/velero v1.17.1
-	go.uber.org/zap v1.27.0
-	k8s.io/api v0.34.1
-	k8s.io/apiextensions-apiserver v0.34.1
-	k8s.io/apimachinery v0.34.2
-	k8s.io/apiserver v0.34.1
-	k8s.io/client-go v0.34.1
-	k8s.io/component-base v0.34.1
-	k8s.io/klog/v2 v2.130.1
-	k8s.io/kube-openapi v0.0.0-20250814151709-d7b6acb124c3
-	k8s.io/utils v0.0.0-20250820121507-0af2bda4dd1d
+	github.com/spf13/cobra v1.10.2
+	github.com/spf13/pflag v1.0.10
+	github.com/vmware-tanzu/velero v1.18.3
+	go.uber.org/zap v1.28.0
+	gomodules.xyz/jsonpatch/v2 v2.5.0
+	k8s.io/api v0.37.1
+	k8s.io/apiextensions-apiserver v0.37.1
+	k8s.io/apimachinery v0.37.1
+	k8s.io/apiserver v0.37.1
+	k8s.io/client-go v0.37.1
+	k8s.io/component-base v0.37.1
+	k8s.io/klog/v2 v2.140.0
+	k8s.io/kube-openapi v0.0.0-20260721132016-d427ff9ee9ad
+	k8s.io/utils v0.0.0-20260707023825-cf1189d6abe3
 	sigs.k8s.io/container-object-storage-interface-api v0.1.0
-	sigs.k8s.io/controller-runtime v0.22.4
+	sigs.k8s.io/controller-runtime v0.25.1
 	sigs.k8s.io/gateway-api v1.4.1
-	sigs.k8s.io/structured-merge-diff/v6 v6.3.0
+	sigs.k8s.io/randfill v1.0.0
+	sigs.k8s.io/structured-merge-diff/v6 v6.4.2
 	sigs.k8s.io/yaml v1.6.0
 )
 
 require (
-	cel.dev/expr v0.25.1 // indirect
+	cel.dev/expr v0.25.3 // indirect
+	github.com/Masterminds/semver/v3 v3.5.0 // indirect
 	github.com/NYTimes/gziphandler v1.1.1 // indirect
 	github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
@@ -47,88 +52,96 @@ require (
 	github.com/cenkalti/backoff/v5 v5.0.3 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/coreos/go-semver v0.3.1 // indirect
-	github.com/coreos/go-systemd/v22 v22.5.0 // indirect
+	github.com/coreos/go-systemd/v22 v22.7.0 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
+	github.com/dustin/go-humanize v1.1.0 // indirect
 	github.com/emicklei/go-restful/v3 v3.13.0 // indirect
+	github.com/evanphx/json-patch v5.9.11+incompatible // indirect
 	github.com/evanphx/json-patch/v5 v5.9.11 // indirect
-	github.com/felixge/httpsnoop v1.0.4 // indirect
-	github.com/fluxcd/pkg/apis/acl v0.9.0 // indirect
-	github.com/fluxcd/pkg/apis/kustomize v1.13.0 // indirect
-	github.com/fluxcd/pkg/apis/meta v1.23.0 // indirect
-	github.com/fsnotify/fsnotify v1.9.0 // indirect
-	github.com/fxamacker/cbor/v2 v2.9.0 // indirect
+	github.com/felixge/httpsnoop v1.1.0 // indirect
+	github.com/fluxcd/pkg/apis/acl v0.11.0 // indirect
+	github.com/fsnotify/fsnotify v1.10.1 // indirect
+	github.com/fxamacker/cbor/v2 v2.9.4 // indirect
+	github.com/gkampitakis/go-snaps v0.5.23 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
-	github.com/go-openapi/jsonpointer v0.21.2 // indirect
-	github.com/go-openapi/jsonreference v0.21.0 // indirect
-	github.com/go-openapi/swag v0.23.1 // indirect
-	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/go-openapi/jsonpointer v1.0.1 // indirect
+	github.com/go-openapi/jsonreference v1.0.2 // indirect
+	github.com/go-openapi/swag v0.29.2 // indirect
+	github.com/go-openapi/swag/cmdutils v0.29.2 // indirect
+	github.com/go-openapi/swag/conv v0.29.2 // indirect
+	github.com/go-openapi/swag/fileutils v0.29.2 // indirect
+	github.com/go-openapi/swag/jsonutils v0.29.2 // indirect
+	github.com/go-openapi/swag/loading v0.29.2 // indirect
+	github.com/go-openapi/swag/mangling v0.29.2 // indirect
+	github.com/go-openapi/swag/netutils v0.29.2 // indirect
+	github.com/go-openapi/swag/pools v0.29.2 // indirect
+	github.com/go-openapi/swag/stringutils v0.29.2 // indirect
+	github.com/go-openapi/swag/typeutils v0.29.2 // indirect
+	github.com/go-openapi/swag/yamlutils v0.29.2 // indirect
+	github.com/go-openapi/testify/enable/yaml/v2 v2.8.0 // indirect
+	github.com/go-openapi/testify/v2 v2.8.0 // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
-	github.com/google/btree v1.1.3 // indirect
-	github.com/google/cel-go v0.26.0 // indirect
-	github.com/google/gnostic-models v0.7.0 // indirect
+	github.com/google/cel-go v0.29.2 // indirect
+	github.com/google/gnostic-models v0.7.1 // indirect
 	github.com/google/go-cmp v0.7.0 // indirect
-	github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
+	github.com/google/pprof v0.0.0-20260906184651-6331bc6350fe // indirect
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
-	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
-	github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0 // indirect
+	github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.1.0 // indirect
+	github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.4 // indirect
+	github.com/grpc-ecosystem/grpc-gateway/v2 v2.30.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
-	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/klauspost/compress v1.20.0 // indirect
 	github.com/kylelemons/godebug v1.1.0 // indirect
-	github.com/mailru/easyjson v0.9.0 // indirect
 	github.com/moby/spdystream v0.5.1 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
-	github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
-	github.com/prometheus/client_model v0.6.2 // indirect
-	github.com/prometheus/common v0.65.0 // indirect
-	github.com/prometheus/procfs v0.17.0 // indirect
-	github.com/spf13/pflag v1.0.7 // indirect
-	github.com/stoewer/go-strcase v1.3.0 // indirect
+	github.com/prometheus/client_model v0.6.3 // indirect
+	github.com/prometheus/common v0.71.0 // indirect
+	github.com/prometheus/procfs v0.22.0 // indirect
+	github.com/rogpeppe/go-internal v1.16.0 // indirect
+	github.com/sirupsen/logrus v1.10.2 // indirect
+	github.com/tidwall/match v1.2.0 // indirect
 	github.com/x448/float16 v0.8.4 // indirect
-	go.etcd.io/etcd/api/v3 v3.6.4 // indirect
-	go.etcd.io/etcd/client/pkg/v3 v3.6.4 // indirect
-	go.etcd.io/etcd/client/v3 v3.6.4 // indirect
+	go.etcd.io/etcd/api/v3 v3.7.0 // indirect
+	go.etcd.io/etcd/client/pkg/v3 v3.7.0 // indirect
+	go.etcd.io/etcd/client/v3 v3.7.0 // indirect
 	go.opentelemetry.io/auto/sdk v1.2.1 // indirect
-	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.68.0 // indirect
-	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.68.0 // indirect
-	go.opentelemetry.io/otel v1.43.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.43.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.43.0 // indirect
-	go.opentelemetry.io/otel/metric v1.43.0 // indirect
-	go.opentelemetry.io/otel/sdk v1.43.0 // indirect
-	go.opentelemetry.io/otel/trace v1.43.0 // indirect
-	go.opentelemetry.io/proto/otlp v1.10.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.71.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.71.0 // indirect
+	go.opentelemetry.io/otel v1.46.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.46.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.46.0 // indirect
+	go.opentelemetry.io/otel/metric v1.46.0 // indirect
+	go.opentelemetry.io/otel/sdk v1.46.0 // indirect
+	go.opentelemetry.io/otel/trace v1.46.0 // indirect
+	go.opentelemetry.io/proto/otlp v1.11.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
-	go.yaml.in/yaml/v2 v2.4.2 // indirect
-	go.yaml.in/yaml/v3 v3.0.4 // indirect
-	golang.org/x/crypto v0.50.0 // indirect
-	golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67 // indirect
-	golang.org/x/net v0.52.0 // indirect
-	golang.org/x/oauth2 v0.35.0 // indirect
-	golang.org/x/sync v0.20.0 // indirect
-	golang.org/x/sys v0.43.0 // indirect
-	golang.org/x/term v0.42.0 // indirect
-	golang.org/x/text v0.36.0 // indirect
-	golang.org/x/time v0.12.0 // indirect
-	golang.org/x/tools v0.43.0 // indirect
-	gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20260401024825-9d38bb4040a9 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20260406210006-6f92a3bedf2d // indirect
-	google.golang.org/grpc v1.80.0 // indirect
-	google.golang.org/protobuf v1.36.11 // indirect
+	go.yaml.in/yaml/v2 v2.4.4 // indirect
+	go.yaml.in/yaml/v3 v3.0.5 // indirect
+	golang.org/x/crypto v0.57.0 // indirect
+	golang.org/x/exp v0.0.0-20260908205506-85c1c2202aba // indirect
+	golang.org/x/mod v0.41.0 // indirect
+	golang.org/x/net v0.59.0 // indirect
+	golang.org/x/oauth2 v0.37.0 // indirect
+	golang.org/x/sync v0.23.0 // indirect
+	golang.org/x/sys v0.48.0 // indirect
+	golang.org/x/term v0.46.0 // indirect
+	golang.org/x/text v0.42.0 // indirect
+	golang.org/x/time v0.16.0 // indirect
+	golang.org/x/tools v0.50.0 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20260921155816-b14227669459 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20260921155816-b14227669459 // indirect
+	google.golang.org/grpc v1.83.2 // indirect
+	google.golang.org/protobuf v1.36.12 // indirect
 	gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/kms v0.34.1 // indirect
-	sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect
-	sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
-	sigs.k8s.io/randfill v1.0.0 // indirect
+	k8s.io/kms v0.37.1 // indirect
+	k8s.io/streaming v0.37.1 // indirect
+	sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.36.0 // indirect
+	sigs.k8s.io/json v0.0.0-20260909141634-11ed52e25bc5 // indirect
 )
-
-// See: issues.k8s.io/135537
-replace k8s.io/apimachinery => github.com/cozystack/apimachinery v0.0.0-20251219010959-1f91eabae46c
diff --git a/go.sum b/go.sum
index c5f3e2cd40..dea6aaf08f 100644
--- a/go.sum
+++ b/go.sum
@@ -1,5 +1,7 @@
-cel.dev/expr v0.25.1 h1:1KrZg61W6TWSxuNZ37Xy49ps13NUovb66QLprthtwi4=
-cel.dev/expr v0.25.1/go.mod h1:hrXvqGP6G6gyx8UAHSHJ5RGk//1Oj5nXQ2NI02Nrsg4=
+cel.dev/expr v0.25.3 h1:A2jO8jwOugrrovveCWfj0KEZOfqiLgAcwjpHPhzIGw0=
+cel.dev/expr v0.25.3/go.mod h1:hrXvqGP6G6gyx8UAHSHJ5RGk//1Oj5nXQ2NI02Nrsg4=
+github.com/Masterminds/semver/v3 v3.5.0 h1:kQceYJfbupGfZOKZQg0kou0DgAKhzDg2NZPAwZ/2OOE=
+github.com/Masterminds/semver/v3 v3.5.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM=
 github.com/NYTimes/gziphandler v1.1.1 h1:ZUDjpQae29j0ryrS0u/B8HZfJBtBQHjqw2rQ2cqUQ3I=
 github.com/NYTimes/gziphandler v1.1.1/go.mod h1:n/CVRwUEOgIxrgPvAQhUUr9oeUtvrhMomdKFjzJNB0c=
 github.com/antlr4-go/antlr/v4 v4.13.1 h1:SqQKkuVZ+zWkMMNkjy5FZe5mr5WURWnlpmOuzYWrPrQ=
@@ -12,16 +14,14 @@ github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM
 github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ=
 github.com/cenkalti/backoff/v5 v5.0.3 h1:ZN+IMa753KfX5hd8vVaMixjnqRZ3y8CuJKRKj1xcsSM=
 github.com/cenkalti/backoff/v5 v5.0.3/go.mod h1:rkhZdG3JZukswDf7f0cwqPNk4K0sa+F97BxZthm/crw=
-github.com/cert-manager/cert-manager v1.17.4 h1:pQrEur25zR23Mum1Au4jRH2p8eH3wY2v4/QahjPDzKo=
-github.com/cert-manager/cert-manager v1.17.4/go.mod h1:zXVCSnEOu6vNDQOPpXrLO8a0iDnKd8uksgXe5s73p+w=
+github.com/cert-manager/cert-manager v1.19.6 h1:HxoNU9l0/K3nuNT6lzWpXPj13+fl6nxjNUPJ+8JC+fI=
+github.com/cert-manager/cert-manager v1.19.6/go.mod h1:uC9pPoxhw/+Jcv3eWBhYpN7jbqNlYwSZn7ioROZSPM4=
 github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
 github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/coreos/go-semver v0.3.1 h1:yi21YpKnrx1gt5R+la8n5WgS0kCrsPp33dmEyHReZr4=
 github.com/coreos/go-semver v0.3.1/go.mod h1:irMmmIw/7yzSRPWryHsK7EYSg09caPQL03VsM8rvUec=
-github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs=
-github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
-github.com/cozystack/apimachinery v0.0.0-20251219010959-1f91eabae46c h1:C2wIfH/OzhU9XOK/e6Ik9cg7nZ1z6fN4lf6a3yFdik8=
-github.com/cozystack/apimachinery v0.0.0-20251219010959-1f91eabae46c/go.mod h1:/GwIlEcWuTX9zKIg2mbw0LRFIsXwrfoVxn+ef0X13lw=
+github.com/coreos/go-systemd/v22 v22.7.0 h1:LAEzFkke61DFROc7zNLX/WA2i5J8gYqe0rSj9KI28KA=
+github.com/coreos/go-systemd/v22 v22.7.0/go.mod h1:xNUYtjHu2EDXbsxz1i41wouACIwT7Ybq9o0BQhMwD0w=
 github.com/cozystack/cozystack-scheduler/pkg/apis v0.1.1 h1:9uLa/8J4lRx3sNuaVH8UZqgZvnskHATPo5GxEKh0iSM=
 github.com/cozystack/cozystack-scheduler/pkg/apis v0.1.1/go.mod h1:kPeS9YPB4ENbvNINEkkp0SX8FB+gvwoOHGOHMT3Tg9Y=
 github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
@@ -29,101 +29,128 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
-github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
-github.com/emicklei/dot v1.10.0 h1:z17n0ce/FBMz3QbShSzVGhiW447Qhu7fljzvp3Gs6ig=
-github.com/emicklei/dot v1.10.0/go.mod h1:DeV7GvQtIw4h2u73RKBkkFdvVAz0D9fzeJrgPW6gy/s=
+github.com/dustin/go-humanize v1.1.0 h1:dbKTrvD0klcbBV/h4AWJdMuZogJACoMlvWIWZ5b2xWg=
+github.com/dustin/go-humanize v1.1.0/go.mod h1:hc1CvRkJMsgxqjmjMQF3QNRAZBwY8AXBAzKYoSX9sFI=
+github.com/emicklei/dot v1.11.0 h1:zsrhCuFHAJge/aZIC4N4LdHy5tqYu4tWEaUzIwdYj4Y=
+github.com/emicklei/dot v1.11.0/go.mod h1:DeV7GvQtIw4h2u73RKBkkFdvVAz0D9fzeJrgPW6gy/s=
 github.com/emicklei/go-restful/v3 v3.13.0 h1:C4Bl2xDndpU6nJ4bc1jXd+uTmYPVUwkD6bFY/oTyCes=
 github.com/emicklei/go-restful/v3 v3.13.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
-github.com/evanphx/json-patch v5.9.0+incompatible h1:fBXyNpNMuTTDdquAq/uisOr2lShz4oaXpDTX2bLe7ls=
-github.com/evanphx/json-patch v5.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
+github.com/evanphx/json-patch v5.9.11+incompatible h1:ixHHqfcGvxhWkniF1tWxBHA0yb4Z+d1UQi45df52xW8=
+github.com/evanphx/json-patch v5.9.11+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
 github.com/evanphx/json-patch/v5 v5.9.11 h1:/8HVnzMq13/3x9TPvjG08wUGqBTmZBsCWzjTM0wiaDU=
 github.com/evanphx/json-patch/v5 v5.9.11/go.mod h1:3j+LviiESTElxA4p3EMKAB9HXj3/XEtnUf6OZxqIQTM=
-github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
-github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
-github.com/fluxcd/helm-controller/api v1.4.3 h1:CdZwjL1liXmYCWyk2jscmFEB59tICIlnWB9PfDDW5q4=
-github.com/fluxcd/helm-controller/api v1.4.3/go.mod h1:0XrBhKEaqvxyDj/FziG1Q8Fmx2UATdaqLgYqmZh6wW4=
-github.com/fluxcd/pkg/apis/acl v0.9.0 h1:wBpgsKT+jcyZEcM//OmZr9RiF8klL3ebrDp2u2ThsnA=
-github.com/fluxcd/pkg/apis/acl v0.9.0/go.mod h1:TttNS+gocsGLwnvmgVi3/Yscwqrjc17+vhgYfqkfrV4=
-github.com/fluxcd/pkg/apis/kustomize v1.13.0 h1:GGf0UBVRIku+gebY944icVeEIhyg1P/KE3IrhOyJJnE=
-github.com/fluxcd/pkg/apis/kustomize v1.13.0/go.mod h1:TLKVqbtnzkhDuhWnAsN35977HvRfIjs+lgMuNro/LEc=
-github.com/fluxcd/pkg/apis/meta v1.23.0 h1:fLis5YcHnOsyKYptzBtituBm5EWNx13I0bXQsy0FG4s=
-github.com/fluxcd/pkg/apis/meta v1.23.0/go.mod h1:UWsIbBPCxYvoVklr2mV2uLFBf/n17dNAmKFjRfApdDo=
-github.com/fluxcd/source-controller/api v1.7.4 h1:+EOVnRA9LmLxOx7J273l7IOEU39m+Slt/nQGBy69ygs=
-github.com/fluxcd/source-controller/api v1.7.4/go.mod h1:ruf49LEgZRBfcP+eshl2n9SX1MfHayCcViAIGnZcaDY=
-github.com/fluxcd/source-watcher/api/v2 v2.0.3 h1:SsVGAaMBxzvcgrOz/Kl6c2ybMHVqoiEFwtI+bDuSeSs=
-github.com/fluxcd/source-watcher/api/v2 v2.0.3/go.mod h1:Nx3QZweVyuhaOtSNrw+oxifG+qrakPvjgNAN9qlUTb0=
-github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k=
-github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
-github.com/fxamacker/cbor/v2 v2.9.0 h1:NpKPmjDBgUfBms6tr6JZkTHtfFGcMKsw3eGcmD/sapM=
-github.com/fxamacker/cbor/v2 v2.9.0/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ=
+github.com/felixge/httpsnoop v1.1.0 h1:3YtUj32ZZkqZtt3sZZsClsymw/QDuVfpNhoA31zeORc=
+github.com/felixge/httpsnoop v1.1.0/go.mod h1:Zqxgdd+1Rkcz8euOqdr7lqgCRJztwr5hp9vDSi5UZCE=
+github.com/fluxcd/helm-controller/api v1.5.1 h1:yraWl0ImzO4yIy/N5d9i54N+OZxKuFZqjed8wrIjy8U=
+github.com/fluxcd/helm-controller/api v1.5.1/go.mod h1:Yr0y7GKizbvQQGK5wBX6sGCZrTY86AN9n1PNEsji2XE=
+github.com/fluxcd/pkg/apis/acl v0.11.0 h1:BxThatpA6qd5Qzwim6/hRu0gdAX0JxNm3PledDuJqXo=
+github.com/fluxcd/pkg/apis/acl v0.11.0/go.mod h1:a87i2A7AlFO5N2J8CxtzaUCCDmuLLWOHwkKu3eJF5fY=
+github.com/fluxcd/pkg/apis/kustomize v1.15.0 h1:p8wPIxdmn0vy0a664rsE9JKCfnliZz4HUsDcTy4ZOxA=
+github.com/fluxcd/pkg/apis/kustomize v1.15.0/go.mod h1:XWdsx8P15OiMaQIvmUjYWdmD3zAwhl5q9osl5iCqcOk=
+github.com/fluxcd/pkg/apis/meta v1.26.0 h1:dxP1FfBpTCYso6odzRcltVnnRuBb2VyhhgV0VX9YbUE=
+github.com/fluxcd/pkg/apis/meta v1.26.0/go.mod h1:c7o6mJGLCMvNrfdinGZehkrdZuFT9vZdZNrn66DtVD0=
+github.com/fluxcd/source-controller/api v1.8.5 h1:mLKc9YVMk46JCt1BQbkG6irkrpBZp95kiXh2+GYB6KQ=
+github.com/fluxcd/source-controller/api v1.8.5/go.mod h1:sio4t49RDx+S1etHRFAEEw8qfVuw0KKlOg8bRVlEYPM=
+github.com/fluxcd/source-watcher/api/v2 v2.1.1 h1:1LfT50ty+78MKKbschAZl28QbVqIyjaNq17KmW5wPJI=
+github.com/fluxcd/source-watcher/api/v2 v2.1.1/go.mod h1:6M1BzBGQRoIuSenSQlfJHwMVVobFPiNPxXqfN0IILc4=
+github.com/fsnotify/fsnotify v1.10.1 h1:b0/UzAf9yR5rhf3RPm9gf3ehBPpf0oZKIjtpKrx59Ho=
+github.com/fsnotify/fsnotify v1.10.1/go.mod h1:TLheqan6HD6GBK6PrDWyDPBaEV8LspOxvPSjC+bVfgo=
+github.com/fxamacker/cbor/v2 v2.9.4 h1:xwjVlxEMR3S605oUlgBjKLTTeGFciYPGYCtF/35LKGo=
+github.com/fxamacker/cbor/v2 v2.9.4/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ=
+github.com/gkampitakis/ciinfo v0.3.4 h1:5eBSibVuSMbb/H6Elc0IIEFbkzCJi3lm94n0+U7Z0KY=
+github.com/gkampitakis/ciinfo v0.3.4/go.mod h1:1NIwaOcFChN4fa/B0hEBdAb6npDlFL8Bwx4dfRLRqAo=
+github.com/gkampitakis/go-snaps v0.5.23 h1:okh5QR48zpUjpWtu65AtqxdCY8huJq+dEDuUzd1PuKg=
+github.com/gkampitakis/go-snaps v0.5.23/go.mod h1:uy3lVzCCRRsAwYqSocyw5fY8xRLCYEfqoOJNxr8HonM=
 github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
-github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=
-github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
+github.com/go-logr/logr v1.4.4 h1:tG4xh9yMsRCAiodLVTxyrkzSZ9+o0L1Kg/+cPVcbP/8=
+github.com/go-logr/logr v1.4.4/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
 github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
 github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
 github.com/go-logr/zapr v1.3.0 h1:XGdV8XW8zdwFiwOA2Dryh1gj2KRQyOOoNmBy4EplIcQ=
 github.com/go-logr/zapr v1.3.0/go.mod h1:YKepepNBd1u/oyhd/yQmtjVXmm9uML4IXUgMOwR8/Gg=
-github.com/go-openapi/jsonpointer v0.21.2 h1:AqQaNADVwq/VnkCmQg6ogE+M3FOsKTytwges0JdwVuA=
-github.com/go-openapi/jsonpointer v0.21.2/go.mod h1:50I1STOfbY1ycR8jGz8DaMeLCdXiI6aDteEdRNNzpdk=
-github.com/go-openapi/jsonreference v0.21.0 h1:Rs+Y7hSXT83Jacb7kFyjn4ijOuVGSvOdF2+tg1TRrwQ=
-github.com/go-openapi/jsonreference v0.21.0/go.mod h1:LmZmgsrTkVg9LG4EaHeY8cBDslNPMo06cago5JNLkm4=
-github.com/go-openapi/swag v0.23.1 h1:lpsStH0n2ittzTnbaSloVZLuB5+fvSY/+hnagBjSNZU=
-github.com/go-openapi/swag v0.23.1/go.mod h1:STZs8TbRvEQQKUA+JZNAm3EWlgaOBGpyFDqQnDHMef0=
+github.com/go-openapi/jsonpointer v1.0.1 h1:2KxywRmNwJkT/FMBa3iRNHEaAxSJvjqoufQZy3au1Mg=
+github.com/go-openapi/jsonpointer v1.0.1/go.mod h1:wI7ZYsFmbIi9nBXOZqgDaS/bqOchRGZjqxFli7FBYxY=
+github.com/go-openapi/jsonreference v1.0.2 h1:oS4et8FOf3p3UQxEo4Xt0esijmBUM+F259Xl72OSZsc=
+github.com/go-openapi/jsonreference v1.0.2/go.mod h1:TbUNSOo+fcorZjFaNoiSDSoaNnnZtqJtLGR1PuvE/Cs=
+github.com/go-openapi/swag v0.29.2 h1:9n8frkcsuQRA0INU31VbxNxt1zBaHxrHYGEf5BUjFi4=
+github.com/go-openapi/swag v0.29.2/go.mod h1:RkCiX1gCVXWgLOavDXE3ALJrQ/VO2ziiIzOUs3z10xo=
+github.com/go-openapi/swag/cmdutils v0.29.2 h1:cXEzX/nWCODon251f+1HgL75/R4XXML5IZxgLCWMoro=
+github.com/go-openapi/swag/cmdutils v0.29.2/go.mod h1:XziaSVzYqkDvpWXzASfWajw2YvJrLscq610O2XiyqJw=
+github.com/go-openapi/swag/conv v0.29.2 h1:8c9shoB8l0QRSR6ymq1llHdBWDqpIgJfjTGHx3Vuhm0=
+github.com/go-openapi/swag/conv v0.29.2/go.mod h1:AZS0YigTNf8qNtD6WqJz/N4RUNmpr76SyjFGkq4+p6Q=
+github.com/go-openapi/swag/fileutils v0.29.2 h1:mdUL+Vw5ah1fO1AvFCoHeIyv7YZsCz2MN3KNqd/lLVI=
+github.com/go-openapi/swag/fileutils v0.29.2/go.mod h1:7QKmmodjAebaq61lGVJa8ldLdGeMF4DSgYv8tXOGGo0=
+github.com/go-openapi/swag/jsonutils v0.29.2 h1:uZNSD2/rJDYAfvsLYkykTzXuyxM3QpDKV9jhRHrMu6k=
+github.com/go-openapi/swag/jsonutils v0.29.2/go.mod h1:ONTdNvj3Y+IXRzfa17E+Rgt2ns/qiSOYjIo2K7v2yDs=
+github.com/go-openapi/swag/jsonutils/fixtures_test v0.29.2 h1:w+Fd6EBOMGlC74GYGHqCLGyb3Bpams8TtNrgM/SG4jo=
+github.com/go-openapi/swag/jsonutils/fixtures_test v0.29.2/go.mod h1:HC2egPORFzbj/gf05Zrfgz8Mgplx3oW7hgGi7pjZVhM=
+github.com/go-openapi/swag/loading v0.29.2 h1:QU1ry24e6r6Shoxe380Nx0X5iKkpRO+hJffsyJ2dVlY=
+github.com/go-openapi/swag/loading v0.29.2/go.mod h1:DqilDjuiJKETecsS4TRopWG1acUDsfqN39ZmQhPu6uI=
+github.com/go-openapi/swag/mangling v0.29.2 h1:ltdo3K0tTP4P6zWhVVWDU9D37/YYBuMJRdZxiS2Dtog=
+github.com/go-openapi/swag/mangling v0.29.2/go.mod h1:RjDi4TnItAenS3cgCXSpIl1kKbjG7il6pnmQVl/8bp8=
+github.com/go-openapi/swag/netutils v0.29.2 h1:dBli6jyUa93sDS/XYWShJzf4+nnVfFKfvY9SLUaUzB8=
+github.com/go-openapi/swag/netutils v0.29.2/go.mod h1:1pM6Xg/Um8E1eps3umWl8Hme3ByWXOtHsvFC0CULHUE=
+github.com/go-openapi/swag/pools v0.29.2 h1:PlGoDRF8WtSyXkedZZkpW3f9wDhFf3u8KtaBcmgmh8c=
+github.com/go-openapi/swag/pools v0.29.2/go.mod h1:V3lhxVT4qDYRqc2MRSSbLsTYIYV/2HlHafhyEkmzLIc=
+github.com/go-openapi/swag/stringutils v0.29.2 h1:lcnBxwAaysT3bMUVBfn9V/PkfVqkurpqufKU6rTUMGk=
+github.com/go-openapi/swag/stringutils v0.29.2/go.mod h1:i9cdh7sGaa0nm3CqIvH5IM5h2QClk1wns2ktKeILvRI=
+github.com/go-openapi/swag/typeutils v0.29.2 h1:O7aVvkTs3pXwikgtrPLenigEMdQFgONKRooQA9pgf2I=
+github.com/go-openapi/swag/typeutils v0.29.2/go.mod h1:7+GDG+uz9Ke+eVt4rClZg7wklSDp8hT/mKNh/pC26TE=
+github.com/go-openapi/swag/yamlutils v0.29.2 h1:IFKFFeDnuIwzfsuWRQU+rI8iL3g4XyAYjV/RlnlxPLM=
+github.com/go-openapi/swag/yamlutils v0.29.2/go.mod h1:7MGqtcrK73sxQ4ceiyIf8qiXS/s09JLMdR5esK5euYQ=
+github.com/go-openapi/testify/enable/yaml/v2 v2.8.0 h1:dvOQNZ2ovOdogn902NYq7i6jUI9Dma4qyjTXABY5YTY=
+github.com/go-openapi/testify/enable/yaml/v2 v2.8.0/go.mod h1:3VwZZUT6nWcAjhIr2RypXxlsxd3mPPtXh3T8z65aRlQ=
+github.com/go-openapi/testify/v2 v2.8.0 h1:19QDx5b57p8KjO2E4sgs/woL4Akp+FGLRlVm2xn0Rho=
+github.com/go-openapi/testify/v2 v2.8.0/go.mod h1:4gUN8jC+RqOE2qjW/vDmfyTvl5BCht4qL7oca0odrak=
 github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI=
 github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8=
-github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
-github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
-github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
-github.com/golang-jwt/jwt/v5 v5.2.2 h1:Rl4B7itRWVtYIHFrSNd7vhTiz9UpLdi6gZhZ3wEeDy8=
-github.com/golang-jwt/jwt/v5 v5.2.2/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
+github.com/goccy/go-yaml v1.19.2 h1:PmFC1S6h8ljIz6gMRBopkjP1TVT7xuwrButHID66PoM=
+github.com/goccy/go-yaml v1.19.2/go.mod h1:XBurs7gK8ATbW4ZPGKgcbrY1Br56PdM69F7LkFRi1kA=
+github.com/golang-jwt/jwt/v5 v5.3.1 h1:kYf81DTWFe7t+1VvL7eS+jKFVWaUnK9cB1qbwn63YCY=
+github.com/golang-jwt/jwt/v5 v5.3.1/go.mod h1:fxCRLWMO43lRc8nhHWY6LGqRcf+1gQWArsqaEUEa5bE=
 github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
 github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
-github.com/google/btree v1.1.3 h1:CVpQJjYgC4VbzxeGVHfvZrv1ctoYCAI8vbl07Fcxlyg=
-github.com/google/btree v1.1.3/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4=
-github.com/google/cel-go v0.26.0 h1:DPGjXackMpJWH680oGY4lZhYjIameYmR+/6RBdDGmaI=
-github.com/google/cel-go v0.26.0/go.mod h1:A9O8OU9rdvrK5MQyrqfIxo1a0u4g3sF8KB6PUIaryMM=
-github.com/google/gnostic-models v0.7.0 h1:qwTtogB15McXDaNqTZdzPJRHvaVJlAl+HVQnLmJEJxo=
-github.com/google/gnostic-models v0.7.0/go.mod h1:whL5G0m6dmc5cPxKc5bdKdEN3UjI7OUGxBlw57miDrQ=
+github.com/google/cel-go v0.29.2 h1:ZtDxkeiMmz0mxbKDYiNkE5Lk7V5edMRcaaDf2jX002k=
+github.com/google/cel-go v0.29.2/go.mod h1:X0bD6iVNR8pkROSOoHVdgTkzmRcosof7WQqCD6wcMc8=
+github.com/google/gnostic-models v0.7.1 h1:SisTfuFKJSKM5CPZkffwi6coztzzeYUhc3v4yxLWH8c=
+github.com/google/gnostic-models v0.7.1/go.mod h1:whL5G0m6dmc5cPxKc5bdKdEN3UjI7OUGxBlw57miDrQ=
 github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
 github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
 github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad h1:a6HEuzUHeKH6hwfN/ZoQgRgVIWFJljSWa/zetS2WTvg=
-github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144=
+github.com/google/pprof v0.0.0-20260906184651-6331bc6350fe h1:QAinXoAFJdGQYztXn3VpFey7KCwpedbZ/EkzbplQ0cY=
+github.com/google/pprof v0.0.0-20260906184651-6331bc6350fe/go.mod h1:jl5iWTm0/hd5PjEYEOuwAJ57L/CibdZfrqZ5XA5GrCk=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 h1:JeSE6pjso5THxAzdVpqr6/geYxZytqFMBCOtn/ujyeo=
 github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674/go.mod h1:r4w70xmWCQKmi1ONH4KIaBptdivuRPyosB9RmPlGEwA=
-github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.0.1 h1:qnpSQwGEnkcRpTqNOIR6bJbR0gAorgP9CSALpRcKoAA=
-github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.0.1/go.mod h1:lXGCsh6c22WGtjr+qGHj1otzZpV/1kwTMAqkwZsnWRU=
-github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.0 h1:FbSCl+KggFl+Ocym490i/EyXF4lPgLoUtcSWquBM0Rs=
-github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.0/go.mod h1:qOchhhIlmRcqk/O9uCo/puJlyo07YINaIqdZfZG3Jkc=
-github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 h1:Ovs26xHkKqVztRpIrF/92BcuyuQ/YW4NSIpoGtfXNho=
-github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
-github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0 h1:HWRh5R2+9EifMyIHV7ZV+MIZqgz+PMpZ14Jynv3O2Zs=
-github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0/go.mod h1:JfhWUomR1baixubs02l85lZYYOm7LV6om4ceouMv45c=
+github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.1.0 h1:QGLs/O40yoNK9vmy4rhUGBVyMf1lISBGtXRpsu/Qu/o=
+github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.1.0/go.mod h1:hM2alZsMUni80N33RBe6J0e423LB+odMj7d3EMP9l20=
+github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.4 h1:9ZJYjPEJpcleIKcqysXOo14NLQYwu23fzmKRFpIjPjc=
+github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.4/go.mod h1:0xydIeg2omQ9DH6zYMP24Kk57793rnLUvP8fwdbFvz8=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.30.0 h1:/Tnpcb2E0Pz/tN9s3bfEY2Q8ePCEX9iuS+cneUwncnw=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.30.0/go.mod h1:zOBXOsUaBSjKgmH4OGzV1esUpR3oUSCPYVd2cUBjKYY=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
 github.com/jonboulle/clockwork v0.5.0 h1:Hyh9A8u51kptdkR+cqRpT1EebBwTn1oK9YfGYbdFz6I=
 github.com/jonboulle/clockwork v0.5.0/go.mod h1:3mZlmanh0g2NDKO5TWZVJAfofYk64M7XN3SzBPjZF60=
-github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
-github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
+github.com/joshdk/go-junit v1.0.0 h1:S86cUKIdwBHWwA6xCmFlf3RTLfVXYQfvanM5Uh+K6GE=
+github.com/joshdk/go-junit v1.0.0/go.mod h1:TiiV0PqkaNfFXjEiyjWM3XXrhVyCa1K4Zfga6W52ung=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
-github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
-github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
-github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo=
-github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ=
+github.com/klauspost/compress v1.20.0 h1:a3C1ke2ohxFymNlb2HWAHjDeKCI90scRskErZkR0ezA=
+github.com/klauspost/compress v1.20.0/go.mod h1:LUdAzn7YLVvxLpc7y3V1m40wESHTgc1422pwwBSKYuI=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
 github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
-github.com/mailru/easyjson v0.9.0 h1:PrnmzHw7262yW8sTBwxi1PdJA3Iw/EKBa8psRf7d9a4=
-github.com/mailru/easyjson v0.9.0/go.mod h1:1+xMtQp2MRNVL/V1bOzuP3aP8VNwRW55fQUto+XFtTU=
+github.com/maruel/natural v1.3.0 h1:VsmCsBmEyrR46RomtgHs5hbKADGRVtliHTyCOLFBpsg=
+github.com/maruel/natural v1.3.0/go.mod h1:v+Rfd79xlw1AgVBjbO0BEQmptqb5HvL/k9GRHB7ZKEg=
+github.com/mfridman/tparse v0.18.0 h1:wh6dzOKaIwkUGyKgOntDW4liXSo37qg5AXbIhkMV3vE=
+github.com/mfridman/tparse v0.18.0/go.mod h1:gEvqZTuCgEhPbYk/2lS3Kcxg1GmTxxU7kTC8DvP0i/A=
 github.com/moby/spdystream v0.5.1 h1:9sNYeYZUcci9R6/w7KDaFWEWeV4LStVG78Mpyq/Zm/Y=
 github.com/moby/spdystream v0.5.1/go.mod h1:xBAYlnt/ay+11ShkdFKNAG7LsyK/tmNBVvVOwrfMgdI=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
@@ -134,208 +161,184 @@ github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee h1:W5t00kpgFd
 github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
-github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f h1:y5//uYreIhSUg3J1GEMiLbxo1LJaP8RfCpH6pymGZus=
-github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
-github.com/onsi/ginkgo/v2 v2.23.3 h1:edHxnszytJ4lD9D5Jjc4tiDkPBZ3siDeJJkUZJJVkp0=
-github.com/onsi/ginkgo/v2 v2.23.3/go.mod h1:zXTP6xIp3U8aVuXN8ENK9IXRaTjFnpVB9mGmaSRvxnM=
-github.com/onsi/gomega v1.37.0 h1:CdEG8g0S133B4OswTDC/5XPSzE1OeP29QOioj2PID2Y=
-github.com/onsi/gomega v1.37.0/go.mod h1:8D9+Txp43QWKhM24yyOBEdpkzN8FvJyAwecBgsU4KU0=
-github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
-github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/onsi/ginkgo/v2 v2.33.0 h1:C8gBA6Uc2ZEubiV+SXiu5tZnMTwEmXHgkJwGozKtZf8=
+github.com/onsi/ginkgo/v2 v2.33.0/go.mod h1:+aXOY+vzZ5mu2iI2HpTZUPmM//oQfsNFX6gU9kNcA44=
+github.com/onsi/gomega v1.43.1 h1:vGIPFuYrIO6/0Z09s0I0QQQgFchiX4+tb1re3MScJYo=
+github.com/onsi/gomega v1.43.1/go.mod h1:e/C2HwaZ1DhvjzXXuFhcR7hY7Sh9pl7MmoWKEjzwcdA=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/prometheus/client_golang v1.23.0 h1:ust4zpdl9r4trLY/gSjlm07PuiBq2ynaXXlptpfy8Uc=
-github.com/prometheus/client_golang v1.23.0/go.mod h1:i/o0R9ByOnHX0McrTMTyhYvKE4haaf2mW08I+jGAjEE=
-github.com/prometheus/client_model v0.6.2 h1:oBsgwpGs7iVziMvrGhE53c/GrLUsZdHnqNwqPLxwZyk=
-github.com/prometheus/client_model v0.6.2/go.mod h1:y3m2F6Gdpfy6Ut/GBsUqTWZqCUvMVzSfMLjcu6wAwpE=
-github.com/prometheus/common v0.65.0 h1:QDwzd+G1twt//Kwj/Ww6E9FQq1iVMmODnILtW1t2VzE=
-github.com/prometheus/common v0.65.0/go.mod h1:0gZns+BLRQ3V6NdaerOhMbwwRbNh9hkGINtQAsP5GS8=
-github.com/prometheus/procfs v0.17.0 h1:FuLQ+05u4ZI+SS/w9+BWEM2TXiHKsUQ9TADiRH7DuK0=
-github.com/prometheus/procfs v0.17.0/go.mod h1:oPQLaDAMRbA+u8H5Pbfq+dl3VDAvHxMUOVhe0wYB2zw=
+github.com/prometheus/client_golang v1.24.1 h1:JnJkREXzWxUdCuPFpIWZiPispT9xVV59uiuyR2bPlnU=
+github.com/prometheus/client_golang v1.24.1/go.mod h1:F+oSRECHg4sse5ucfYpYDeIv/hu68Zo0uoHKetWnzcE=
+github.com/prometheus/client_model v0.6.3 h1:O0jaTVAYNxTHYInEPFJt5I3+sN8zqBtVMPTB1qyxiEo=
+github.com/prometheus/client_model v0.6.3/go.mod h1:gpN5P9S7Rr6Yr92PiQ+Ixvhf6JZEkF1dnxsYL2aPBEM=
+github.com/prometheus/common v0.71.0 h1:9KDAKb7Mj3HEVKyFCK6Dc/HIwlBzZIN2l7/lrHl3KK8=
+github.com/prometheus/common v0.71.0/go.mod h1:CLJ5H8TEsGX8bl31BdMkfhIZ+QmZ9tBPPotUxUbfcmk=
+github.com/prometheus/procfs v0.22.0 h1:6q9+/JL9IKAPbCmBrv9n5O5Ty3NKnciV5X7YGw0oics=
+github.com/prometheus/procfs v0.22.0/go.mod h1:CvmFr/GVhIjIvWJZW3tgkODBQMRIf0EyWMQLHCHab58=
 github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
 github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
-github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
-github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
+github.com/rogpeppe/go-internal v1.16.0 h1:O9DK+vNMDVGLr2BeZqmpLeMjiMNkuXfcqntWbZV6S5g=
+github.com/rogpeppe/go-internal v1.16.0/go.mod h1:DrUVZyrJU+txYW5/1kwtXQSMFio52ZOxX7yM1VHvnxs=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
-github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
+github.com/sergi/go-diff v1.4.0 h1:n/SP9D5ad1fORl+llWyN+D6qoUETXNZARKjyY2/KVCw=
+github.com/sergi/go-diff v1.4.0/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4=
+github.com/sirupsen/logrus v1.10.2 h1:G2SED73/qrAu6YwbdxOD6peLkCBI3z7L+ykJFTXJBBo=
+github.com/sirupsen/logrus v1.10.2/go.mod h1:SLEg8TqYulVKKfIGHldVp2K2aYz2DKSVBq4g/H5bR7Q=
 github.com/soheilhy/cmux v0.1.5 h1:jjzc5WVemNEDTLwv9tlmemhC73tI08BNOIGwBOo10Js=
 github.com/soheilhy/cmux v0.1.5/go.mod h1:T7TcVDs9LWfQgPlPsdngu6I6QIoyIFZDDC6sNE1GqG0=
-github.com/spf13/cobra v1.9.1 h1:CXSaggrXdbHK9CF+8ywj8Amf7PBRmPCOJugH954Nnlo=
-github.com/spf13/cobra v1.9.1/go.mod h1:nDyEzZ8ogv936Cinf6g1RU9MRY64Ir93oCnqb9wxYW0=
-github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
-github.com/spf13/pflag v1.0.7 h1:vN6T9TfwStFPFM5XzjsvmzZkLuaLX+HS+0SeFLRgU6M=
-github.com/spf13/pflag v1.0.7/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
-github.com/stoewer/go-strcase v1.3.0 h1:g0eASXYtp+yvN9fK8sH94oCIk0fau9uV1/ZdJ0AVEzs=
-github.com/stoewer/go-strcase v1.3.0/go.mod h1:fAH5hQ5pehh+j3nZfvwdk2RgEgQjAoM8wodgtPmh1xo=
+github.com/spf13/cobra v1.10.2 h1:DMTTonx5m65Ic0GOoRY2c16WCbHxOOw6xxezuLaBpcU=
+github.com/spf13/cobra v1.10.2/go.mod h1:7C1pvHqHw5A4vrJfjNwvOdzYu0Gml16OCs2GRiTUUS4=
+github.com/spf13/pflag v1.0.9/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+github.com/spf13/pflag v1.0.10 h1:4EBh2KAYBwaONj6b2Ye1GiHfwjqyROoF4RwYO+vPwFk=
+github.com/spf13/pflag v1.0.10/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
-github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
-github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
-github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
+github.com/stretchr/objx v0.5.3 h1:jmXUvGomnU1o3W/V5h2VEradbpJDwGrzugQQvL0POH4=
+github.com/stretchr/objx v0.5.3/go.mod h1:rDQraq+vQZU7Fde9LOZLr8Tax6zZvy4kuNKF+QYS+U0=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
-github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
+github.com/stretchr/testify v1.12.1 h1:EuwCh5fleGS7H32xRwO3wRGT7DxrDhLAT6FF8MpWDWE=
+github.com/stretchr/testify v1.12.1/go.mod h1:MDEgiDPPsNp5cuIrHPPCyornHKgEVbtFUmoNlxoYthg=
+github.com/tidwall/gjson v1.19.0 h1:xwxm7n691Uf3u5OFjzngavjGTh55KX5q/9w9xHW88JU=
+github.com/tidwall/gjson v1.19.0/go.mod h1:V37/opeE/JbLUOfH0QTXiNez2l0RUjYUhpT4szFQAfc=
+github.com/tidwall/match v1.2.0 h1:0pt8FlkOwjN2fPt4bIl4BoNxb98gGHN2ObFEDkrfZnM=
+github.com/tidwall/match v1.2.0/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
+github.com/tidwall/pretty v1.2.1 h1:qjsOFOWWQl+N3RsoF5/ssm1pHmJJwhjlSbZ51I6wMl4=
+github.com/tidwall/pretty v1.2.1/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
+github.com/tidwall/sjson v1.2.5 h1:kLy8mja+1c9jlljvWTlSazM7cKDRfJuR/bOJhcY5NcY=
+github.com/tidwall/sjson v1.2.5/go.mod h1:Fvgq9kS/6ociJEDnK0Fk1cpYF4FIW6ZF7LAe+6jwd28=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75 h1:6fotK7otjonDflCTK0BCfls4SPy3NcCVb5dqqmbRknE=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75/go.mod h1:KO6IkyS8Y3j8OdNO85qEYBsRPuteD+YciPomcXdrMnk=
-github.com/vmware-tanzu/velero v1.17.1 h1:ldKeiTuUwkThOw7zrUucNA1NwnLG66zl13YetWAoE0I=
-github.com/vmware-tanzu/velero v1.17.1/go.mod h1:3KTxuUN6Un38JzmYAX+8U6j2k6EexGoNNxa8jrJML8U=
+github.com/vmware-tanzu/velero v1.18.3 h1:9uwN5yxTWQl9PsF5ljX4xiG+7VIq3I9mxOQ0DyyZ31A=
+github.com/vmware-tanzu/velero v1.18.3/go.mod h1:tiD1WgZxic89/1eWBW+C5kEYiZKZkztJB2n3dhNbdiw=
 github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
 github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
 github.com/xiang90/probing v0.0.0-20221125231312-a49e3df8f510 h1:S2dVYn90KE98chqDkyE9Z4N61UnQd+KOfgp5Iu53llk=
 github.com/xiang90/probing v0.0.0-20221125231312-a49e3df8f510/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
-github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-go.etcd.io/bbolt v1.4.2 h1:IrUHp260R8c+zYx/Tm8QZr04CX+qWS5PGfPdevhdm1I=
-go.etcd.io/bbolt v1.4.2/go.mod h1:Is8rSHO/b4f3XigBC0lL0+4FwAQv3HXEEIgFMuKHceM=
-go.etcd.io/etcd/api/v3 v3.6.4 h1:7F6N7toCKcV72QmoUKa23yYLiiljMrT4xCeBL9BmXdo=
-go.etcd.io/etcd/api/v3 v3.6.4/go.mod h1:eFhhvfR8Px1P6SEuLT600v+vrhdDTdcfMzmnxVXXSbk=
-go.etcd.io/etcd/client/pkg/v3 v3.6.4 h1:9HBYrjppeOfFjBjaMTRxT3R7xT0GLK8EJMVC4xg6ok0=
-go.etcd.io/etcd/client/pkg/v3 v3.6.4/go.mod h1:sbdzr2cl3HzVmxNw//PH7aLGVtY4QySjQFuaCgcRFAI=
-go.etcd.io/etcd/client/v3 v3.6.4 h1:YOMrCfMhRzY8NgtzUsHl8hC2EBSnuqbR3dh84Uryl7A=
-go.etcd.io/etcd/client/v3 v3.6.4/go.mod h1:jaNNHCyg2FdALyKWnd7hxZXZxZANb0+KGY+YQaEMISo=
-go.etcd.io/etcd/pkg/v3 v3.6.4 h1:fy8bmXIec1Q35/jRZ0KOes8vuFxbvdN0aAFqmEfJZWA=
-go.etcd.io/etcd/pkg/v3 v3.6.4/go.mod h1:kKcYWP8gHuBRcteyv6MXWSN0+bVMnfgqiHueIZnKMtE=
-go.etcd.io/etcd/server/v3 v3.6.4 h1:LsCA7CzjVt+8WGrdsnh6RhC0XqCsLkBly3ve5rTxMAU=
-go.etcd.io/etcd/server/v3 v3.6.4/go.mod h1:aYCL/h43yiONOv0QIR82kH/2xZ7m+IWYjzRmyQfnCAg=
-go.etcd.io/raft/v3 v3.6.0 h1:5NtvbDVYpnfZWcIHgGRk9DyzkBIXOi8j+DDp1IcnUWQ=
-go.etcd.io/raft/v3 v3.6.0/go.mod h1:nLvLevg6+xrVtHUmVaTcTz603gQPHfh7kUAwV6YpfGo=
+go.etcd.io/bbolt v1.5.0 h1:S7GAl7Fxv12yohbwFfIbQCGDWbQbtDGPET4P/bD4lxU=
+go.etcd.io/bbolt v1.5.0/go.mod h1:mkltfYE5aUHQxUct9N9V+Kp7aSjFqjgrhcXIS70Lrdk=
+go.etcd.io/etcd/api/v3 v3.7.0 h1:WZlGK7pRtYGDB8ti8wkrQ5D2oWGMbtNL9VA5e+vF2Fg=
+go.etcd.io/etcd/api/v3 v3.7.0/go.mod h1:EcTihnwAQ0BQNh5dfAdaFVFdchuo7EP0HlX7TV3jz/A=
+go.etcd.io/etcd/client/pkg/v3 v3.7.0 h1:sW9njJzS3vXKcAJjjLQ4nk+avNUJ12Bcijcx8ehUskE=
+go.etcd.io/etcd/client/pkg/v3 v3.7.0/go.mod h1:cnzZGIUzSfjEwLC6UBVsSXlEK1eepS/JUD7wE6PLRT0=
+go.etcd.io/etcd/client/v3 v3.7.0 h1:5MHO37VbPB87VRPKUXEcicjeQWiTSjpPv3Ume8xPx20=
+go.etcd.io/etcd/client/v3 v3.7.0/go.mod h1:DJ382WuwjmbowjPDyaaQ0idWXy4dh91XRhe4FOrb9vM=
+go.etcd.io/etcd/pkg/v3 v3.7.0 h1:aUBHGzXnYL2m3AlZfKp0ZhHQLVZIKfu9QsIlYdr+mxc=
+go.etcd.io/etcd/pkg/v3 v3.7.0/go.mod h1:fDQYyc8rOC1Yl4EZLh0O1OjHzwJW7jAly80+BpD1M9o=
+go.etcd.io/etcd/server/v3 v3.7.0 h1:ScdUdN8ljuimp0lZaNq0otLMrHcFSFT+dQyT1j7JSFo=
+go.etcd.io/etcd/server/v3 v3.7.0/go.mod h1:v7N1dPdSW2vzyxGsbDwK4X0sCe3SYNlQ+9eNIMGzdxQ=
+go.etcd.io/raft/v3 v3.7.0 h1:BGzlwx07bLv8PW6OU5HObuz1y4hlPZUXA07pM1mPUh4=
+go.etcd.io/raft/v3 v3.7.0/go.mod h1:6gX6T2X907DjnjsFLODnTxba77stjs84W9gTTI0GUNA=
 go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64=
 go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y=
-go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.68.0 h1:0Qx7VGBacMm9ZENQ7TnNObTYI4ShC+lHI16seduaxZo=
-go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.68.0/go.mod h1:Sje3i3MjSPKTSPvVWCaL8ugBzJwik3u4smCjUeuupqg=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.68.0 h1:CqXxU8VOmDefoh0+ztfGaymYbhdB/tT3zs79QaZTNGY=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.68.0/go.mod h1:BuhAPThV8PBHBvg8ZzZ/Ok3idOdhWIodywz2xEcRbJo=
-go.opentelemetry.io/otel v1.43.0 h1:mYIM03dnh5zfN7HautFE4ieIig9amkNANT+xcVxAj9I=
-go.opentelemetry.io/otel v1.43.0/go.mod h1:JuG+u74mvjvcm8vj8pI5XiHy1zDeoCS2LB1spIq7Ay0=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.43.0 h1:88Y4s2C8oTui1LGM6bTWkw0ICGcOLCAI5l6zsD1j20k=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.43.0/go.mod h1:Vl1/iaggsuRlrHf/hfPJPvVag77kKyvrLeD10kpMl+A=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.43.0 h1:RAE+JPfvEmvy+0LzyUA25/SGawPwIUbZ6u0Wug54sLc=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.43.0/go.mod h1:AGmbycVGEsRx9mXMZ75CsOyhSP6MFIcj/6dnG+vhVjk=
-go.opentelemetry.io/otel/metric v1.43.0 h1:d7638QeInOnuwOONPp4JAOGfbCEpYb+K6DVWvdxGzgM=
-go.opentelemetry.io/otel/metric v1.43.0/go.mod h1:RDnPtIxvqlgO8GRW18W6Z/4P462ldprJtfxHxyKd2PY=
-go.opentelemetry.io/otel/sdk v1.43.0 h1:pi5mE86i5rTeLXqoF/hhiBtUNcrAGHLKQdhg4h4V9Dg=
-go.opentelemetry.io/otel/sdk v1.43.0/go.mod h1:P+IkVU3iWukmiit/Yf9AWvpyRDlUeBaRg6Y+C58QHzg=
-go.opentelemetry.io/otel/sdk/metric v1.43.0 h1:S88dyqXjJkuBNLeMcVPRFXpRw2fuwdvfCGLEo89fDkw=
-go.opentelemetry.io/otel/sdk/metric v1.43.0/go.mod h1:C/RJtwSEJ5hzTiUz5pXF1kILHStzb9zFlIEe85bhj6A=
-go.opentelemetry.io/otel/trace v1.43.0 h1:BkNrHpup+4k4w+ZZ86CZoHHEkohws8AY+WTX09nk+3A=
-go.opentelemetry.io/otel/trace v1.43.0/go.mod h1:/QJhyVBUUswCphDVxq+8mld+AvhXZLhe+8WVFxiFff0=
-go.opentelemetry.io/proto/otlp v1.10.0 h1:IQRWgT5srOCYfiWnpqUYz9CVmbO8bFmKcwYxpuCSL2g=
-go.opentelemetry.io/proto/otlp v1.10.0/go.mod h1:/CV4QoCR/S9yaPj8utp3lvQPoqMtxXdzn7ozvvozVqk=
+go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.71.0 h1:B2h3uqicet1CT2N5TOFhS+Gq++9i0/CLmaxvhmhtP5s=
+go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.71.0/go.mod h1:dylvB+ZiiwMvsDij9O84Uy7SijLgHMX4mbkncds+4Sw=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.71.0 h1:3g7B90UzBltIDKq1/5mrTGxTnOFDV0ICOhLoxiZ8jlg=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.71.0/go.mod h1:Ef8SuTh59BT7+ofpDxN9z+yOlc4t2GjLmKDgYNJL/NU=
+go.opentelemetry.io/otel v1.46.0 h1:FHt5/CDyVxi/8IM1CH7VE/rRgq3kLHa2mSTVMO8AWyc=
+go.opentelemetry.io/otel v1.46.0/go.mod h1:Gj3SEScelsNC45tp4nSxRYlS+f5iez7W8XPMCt905kE=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.46.0 h1:OFnwLJr+pF3iHrlGSzbxyuo6/6HyBlnlN1CWEJmBVcw=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.46.0/go.mod h1:716wFneO0ov19A2beH5hjfh9AK5z/VWNAtDijp1Y0/g=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.46.0 h1:w53CDeOA/Kurp7yRsegSr6pbbr759dOvJ+yNmWM6Hxs=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.46.0/go.mod h1:BOmGMCbAtvcJiSJ+hLuhgPLdDbimnraSl8irz3iY8sY=
+go.opentelemetry.io/otel/metric v1.46.0 h1:yBnkXvgV7AXFILZc5K6IZe/CBFF3OS7BJ8ov6/lj0K8=
+go.opentelemetry.io/otel/metric v1.46.0/go.mod h1:iPmdWqifKUdzziPkvvzIJXITl56fQx2mGM/DHLB3/2o=
+go.opentelemetry.io/otel/sdk v1.46.0 h1:h5CNQQjEbuQXY/JfZtgt3i7HVFV3aHPO2OAwO2eTYPI=
+go.opentelemetry.io/otel/sdk v1.46.0/go.mod h1:GAERFXFt5SYCEB+YiKUbMBeza6UaDH7GmGOZEfh2gSM=
+go.opentelemetry.io/otel/sdk/metric v1.46.0 h1:0piZ26EG4RBfebb2jhDH6ERCYHoVWduc3kLgPCwSnSE=
+go.opentelemetry.io/otel/sdk/metric v1.46.0/go.mod h1:I1PbKrdVc8Qu8HYVDNtqVIwLwjNrhsV/uFuxfwg8mO4=
+go.opentelemetry.io/otel/trace v1.46.0 h1:OULy7ccdJnZtJ0UDYFOIGaCmiWzJ8Vi2G/Rsu60qs1c=
+go.opentelemetry.io/otel/trace v1.46.0/go.mod h1:J7GAXweO77XSFkB/rmAqk9D6ihszhFjLU+d9WuUxDLI=
+go.opentelemetry.io/proto/otlp v1.11.0 h1:5rrYs0Ykyj50sdU/JU0x8etU+LubXWb+gED6TbEdMIk=
+go.opentelemetry.io/proto/otlp v1.11.0/go.mod h1:SmVizdCOAm3XBtG1g1NnOdhW6jtddT72hLMhv8VwA8E=
 go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
 go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
 go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
 go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
-go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8=
-go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
-go.yaml.in/yaml/v2 v2.4.2 h1:DzmwEr2rDGHl7lsFgAHxmNz/1NlQ7xLIrlN2h5d1eGI=
-go.yaml.in/yaml/v2 v2.4.2/go.mod h1:081UH+NErpNdqlCXm3TtEran0rJZGxAYx9hb/ELlsPU=
-go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=
+go.uber.org/zap v1.28.0 h1:IZzaP1Fv73/T/pBMLk4VutPl36uNC+OSUh3JLG3FIjo=
+go.uber.org/zap v1.28.0/go.mod h1:rDLpOi171uODNm/mxFcuYWxDsqWSAVkFdX4XojSKg/Q=
+go.yaml.in/yaml/v2 v2.4.4 h1:tuyd0P+2Ont/d6e2rl3be67goVK4R6deVxCUX5vyPaQ=
+go.yaml.in/yaml/v2 v2.4.4/go.mod h1:gMZqIpDtDqOfM0uNfy0SkpRhvUryYH0Z6wdMYcacYXQ=
 go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.50.0 h1:zO47/JPrL6vsNkINmLoo/PH1gcxpls50DNogFvB5ZGI=
-golang.org/x/crypto v0.50.0/go.mod h1:3muZ7vA7PBCE6xgPX7nkzzjiUq87kRItoJQM1Yo8S+Q=
-golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67 h1:1UoZQm6f0P/ZO0w1Ri+f+ifG/gXhegadRdwBIXEFWDo=
-golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67/go.mod h1:qj5a5QZpwLU2NLQudwIN5koi3beDhSAlJwa67PuM98c=
-golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.52.0 h1:He/TN1l0e4mmR3QqHMT2Xab3Aj3L9qjbhRm78/6jrW0=
-golang.org/x/net v0.52.0/go.mod h1:R1MAz7uMZxVMualyPXb+VaqGSa3LIaUqk0eEt3w36Sw=
-golang.org/x/oauth2 v0.35.0 h1:Mv2mzuHuZuY2+bkyWXIHMfhNdJAdwW3FuWeCPYN5GVQ=
-golang.org/x/oauth2 v0.35.0/go.mod h1:lzm5WQJQwKZ3nwavOZ3IS5Aulzxi68dUSgRHujetwEA=
-golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4=
-golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.43.0 h1:Rlag2XtaFTxp19wS8MXlJwTvoh8ArU6ezoyFsMyCTNI=
-golang.org/x/sys v0.43.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
-golang.org/x/term v0.42.0 h1:UiKe+zDFmJobeJ5ggPwOshJIVt6/Ft0rcfrXZDLWAWY=
-golang.org/x/term v0.42.0/go.mod h1:Dq/D+snpsbazcBG5+F9Q1n2rXV8Ma+71xEjTRufARgY=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.36.0 h1:JfKh3XmcRPqZPKevfXVpI1wXPTqbkE5f7JA92a55Yxg=
-golang.org/x/text v0.36.0/go.mod h1:NIdBknypM8iqVmPiuco0Dh6P5Jcdk8lJL0CUebqK164=
-golang.org/x/time v0.12.0 h1:ScB/8o8olJvc+CQPWrK3fPZNfh7qgwCrY0zJmoEQLSE=
-golang.org/x/time v0.12.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.43.0 h1:12BdW9CeB3Z+J/I/wj34VMl8X+fEXBxVR90JeMX5E7s=
-golang.org/x/tools v0.43.0/go.mod h1:uHkMso649BX2cZK6+RpuIPXS3ho2hZo4FVwfoy1vIk0=
-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-gomodules.xyz/jsonpatch/v2 v2.4.0 h1:Ci3iUJyx9UeRx7CeFN8ARgGbkESwJK+KB9lLcWxY/Zw=
-gomodules.xyz/jsonpatch/v2 v2.4.0/go.mod h1:AH3dM2RI6uoBZxn3LVrfvJ3E0/9dG4cSrbuBJT4moAY=
+go.yaml.in/yaml/v3 v3.0.5 h1:N6y/pJk8buWs9NY5ERU2HSMfm+IuD/OtfdAnq6kESPw=
+go.yaml.in/yaml/v3 v3.0.5/go.mod h1:HVTZu1O7/Vkt2N+BFy8Zza+lnLsABggaTM2ZpNIGuKg=
+golang.org/x/crypto v0.57.0 h1:3ZVCjf8Ggz7zneR/EHRVx68Ctf+2pmIMP2UFhh9cC6M=
+golang.org/x/crypto v0.57.0/go.mod h1:Fdz0i5U6CoizGwLda9DttjSk6qlZo25zYNtR+ycvuZA=
+golang.org/x/exp v0.0.0-20260908205506-85c1c2202aba h1:Ck8QetSgk912qxWLMCKxd0in+aiyBQyDSMae6e/xmpU=
+golang.org/x/exp v0.0.0-20260908205506-85c1c2202aba/go.mod h1:50RgIsmK7OwqzTTeqcSXQW8SswW0o8fRcDxmqGluJ8E=
+golang.org/x/mod v0.41.0 h1:qJmnOUb4YB+FsEuM3HcWucdZASCPGhsX6uljO6pog0c=
+golang.org/x/mod v0.41.0/go.mod h1:Ek9pY8RKWXwsWvd3rQiHYtMqkjSUV+s1Rj7j4H5Ur6o=
+golang.org/x/net v0.59.0 h1:5zfYln+w5XCxwrnMMJPufRgNoXEaGxl0wo5GqPXyues=
+golang.org/x/net v0.59.0/go.mod h1:2DA/G1UfVbCpQPeWTmMPGY7Cs2PkBkwu743bVX5PIVg=
+golang.org/x/oauth2 v0.37.0 h1:JUlcxA8oAtauLfiH8FX2/FkAWHAdi0QtGCGc+hofE98=
+golang.org/x/oauth2 v0.37.0/go.mod h1:IxwZNxUULJmpBFf9K/9NTMSIfZZuvuTy1gGxhigP/58=
+golang.org/x/sync v0.23.0 h1:KameEIfc1IkluZyXWLn39Wd4tURc6GbCiISGiZm2bQk=
+golang.org/x/sync v0.23.0/go.mod h1:sUUOizhqBxiL6pEWpqNLUiaJn1ShEbZ6BBqskPbjZm0=
+golang.org/x/sys v0.48.0 h1:bbX/i/6MgT9BVLM9RT1thmxL04yeTAhbEz4SyadbXoo=
+golang.org/x/sys v0.48.0/go.mod h1:hNLxWAXmnKAxqDtdwIYC4bM9oQPEecfsnNMuSxOs3og=
+golang.org/x/term v0.46.0 h1:3+OXuTbaKDgwk8jTi3aSLHRlmWqHEUDUtxnbFigO4YE=
+golang.org/x/term v0.46.0/go.mod h1:+K02xbkittuwc0Am4abfA3Fc+XRGXkvBXNO88NCXPoc=
+golang.org/x/text v0.42.0 h1:JbOZXgfeCPU9gacVtYliJqOhD+zhrEqK4LfdpmlUZqI=
+golang.org/x/text v0.42.0/go.mod h1:ojzP1Z+2QtioaF8DTtO8K5q7JWVVYwZKenzujK0Zd0E=
+golang.org/x/time v0.16.0 h1:vMb6ptszcQMkcwiRTAuNNU50gom6++Q/6gY2hDM6VDE=
+golang.org/x/time v0.16.0/go.mod h1:rVKOqvZeKvrDKTQiAHJ7wmwP0RzleSphoEA9RcdLA0s=
+golang.org/x/tools v0.50.0 h1:c2ifzfcuY7L90lZ2aKd8S4K2NpASF08SZx9ZuJkHmSU=
+golang.org/x/tools v0.50.0/go.mod h1:7ulVMw3831Mwi5EZD6RomGyffr4VFjuNYXf2BbCEAV0=
+gomodules.xyz/jsonpatch/v2 v2.5.0 h1:JELs8RLM12qJGXU4u/TO3V25KW8GreMKl9pdkk14RM0=
+gomodules.xyz/jsonpatch/v2 v2.5.0/go.mod h1:AH3dM2RI6uoBZxn3LVrfvJ3E0/9dG4cSrbuBJT4moAY=
 gonum.org/v1/gonum v0.17.0 h1:VbpOemQlsSMrYmn7T2OUvQ4dqxQXU+ouZFQsZOx50z4=
 gonum.org/v1/gonum v0.17.0/go.mod h1:El3tOrEuMpv2UdMrbNlKEh9vd86bmQ6vqIcDwxEOc1E=
-google.golang.org/genproto/googleapis/api v0.0.0-20260401024825-9d38bb4040a9 h1:VPWxll4HlMw1Vs/qXtN7BvhZqsS9cdAittCNvVENElA=
-google.golang.org/genproto/googleapis/api v0.0.0-20260401024825-9d38bb4040a9/go.mod h1:7QBABkRtR8z+TEnmXTqIqwJLlzrZKVfAUm7tY3yGv0M=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20260406210006-6f92a3bedf2d h1:wT2n40TBqFY6wiwazVK9/iTWbsQrgk5ZfCSVFLO9LQA=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20260406210006-6f92a3bedf2d/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8=
-google.golang.org/grpc v1.80.0 h1:Xr6m2WmWZLETvUNvIUmeD5OAagMw3FiKmMlTdViWsHM=
-google.golang.org/grpc v1.80.0/go.mod h1:ho/dLnxwi3EDJA4Zghp7k2Ec1+c2jqup0bFkw07bwF4=
-google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE=
-google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
+google.golang.org/genproto/googleapis/api v0.0.0-20260921155816-b14227669459 h1:GS9OIt/j7c8bvBjYNgnKQysVfmV7e4jM0H8ZK95G4t8=
+google.golang.org/genproto/googleapis/api v0.0.0-20260921155816-b14227669459/go.mod h1:PX5/4vemwVoXtwEcRDWwcR1/r0qrosfx3qoVADMwnVE=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20260921155816-b14227669459 h1:b0xCahf3FK2m2Cv0p4vTozGPWncCvLfwV86UNg8xWU8=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20260921155816-b14227669459/go.mod h1:OaIUM3+LpYcK2GXM4FTmhWoIq371Owdr+Cc7/BsYHHc=
+google.golang.org/grpc v1.83.2 h1:EManeRomTObA0BU7I8vXgg/78uE5MJ9M8B39EX2WscU=
+google.golang.org/grpc v1.83.2/go.mod h1:YPI1hK3kDked6iHvgX3tR0y+nX/qpMFKhPgFsokw1S8=
+google.golang.org/protobuf v1.36.12 h1:pJOKDDOyeXErUroCihFAd5LQuwXBSpVnKGrj5o/fwxc=
+google.golang.org/protobuf v1.36.12/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 gopkg.in/evanphx/json-patch.v4 v4.13.0 h1:czT3CmqEaQ1aanPc5SdlgQrrEIb8w/wwCvWWnfEbYzo=
 gopkg.in/evanphx/json-patch.v4 v4.13.0/go.mod h1:p8EYWUEYMpynmqDbY58zCKCFZw8pRWMG4EsWvDvM72M=
 gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
 gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
 gopkg.in/natefinch/lumberjack.v2 v2.2.1 h1:bBRl1b0OH9s/DuPhuXpNl+VtCaJXFZ5/uEFST95x9zc=
 gopkg.in/natefinch/lumberjack.v2 v2.2.1/go.mod h1:YD8tP3GAjkrDg1eZH7EGmyESg/lsYskCTPBJVb9jqSc=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-k8s.io/api v0.34.1 h1:jC+153630BMdlFukegoEL8E/yT7aLyQkIVuwhmwDgJM=
-k8s.io/api v0.34.1/go.mod h1:SB80FxFtXn5/gwzCoN6QCtPD7Vbu5w2n1S0J5gFfTYk=
-k8s.io/apiextensions-apiserver v0.34.1 h1:NNPBva8FNAPt1iSVwIE0FsdrVriRXMsaWFMqJbII2CI=
-k8s.io/apiextensions-apiserver v0.34.1/go.mod h1:hP9Rld3zF5Ay2Of3BeEpLAToP+l4s5UlxiHfqRaRcMc=
-k8s.io/apiserver v0.34.1 h1:U3JBGdgANK3dfFcyknWde1G6X1F4bg7PXuvlqt8lITA=
-k8s.io/apiserver v0.34.1/go.mod h1:eOOc9nrVqlBI1AFCvVzsob0OxtPZUCPiUJL45JOTBG0=
-k8s.io/client-go v0.34.1 h1:ZUPJKgXsnKwVwmKKdPfw4tB58+7/Ik3CrjOEhsiZ7mY=
-k8s.io/client-go v0.34.1/go.mod h1:kA8v0FP+tk6sZA0yKLRG67LWjqufAoSHA2xVGKw9Of8=
-k8s.io/component-base v0.34.1 h1:v7xFgG+ONhytZNFpIz5/kecwD+sUhVE6HU7qQUiRM4A=
-k8s.io/component-base v0.34.1/go.mod h1:mknCpLlTSKHzAQJJnnHVKqjxR7gBeHRv0rPXA7gdtQ0=
-k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
-k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
-k8s.io/kms v0.34.1 h1:iCFOvewDPzWM9fMTfyIPO+4MeuZ0tcZbugxLNSHFG4w=
-k8s.io/kms v0.34.1/go.mod h1:s1CFkLG7w9eaTYvctOxosx88fl4spqmixnNpys0JAtM=
-k8s.io/kube-openapi v0.0.0-20250814151709-d7b6acb124c3 h1:liMHz39T5dJO1aOKHLvwaCjDbf07wVh6yaUlTpunnkE=
-k8s.io/kube-openapi v0.0.0-20250814151709-d7b6acb124c3/go.mod h1:UZ2yyWbFTpuhSbFhv24aGNOdoRdJZgsIObGBUaYVsts=
-k8s.io/utils v0.0.0-20250820121507-0af2bda4dd1d h1:wAhiDyZ4Tdtt7e46e9M5ZSAJ/MnPGPs+Ki1gHw4w1R0=
-k8s.io/utils v0.0.0-20250820121507-0af2bda4dd1d/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
-sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 h1:jpcvIRr3GLoUoEKRkHKSmGjxb6lWwrBlJsXc+eUYQHM=
-sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw=
+k8s.io/api v0.37.1 h1:l6N77U7tjwB5L056bgrBTJIEdevac/naBZ3iSvDNfpM=
+k8s.io/api v0.37.1/go.mod h1:zSlbB1YpJ1YQlFVQy20UYll81UJSJJUMLhkhvg6Z78M=
+k8s.io/apiextensions-apiserver v0.37.1 h1:7fIQG8eThDSTVYBWg/DOpI8v5wYfKCo0N8/TDMjj+zY=
+k8s.io/apiextensions-apiserver v0.37.1/go.mod h1:1Q3ujWwHgnhBoGsdmGORflwK1sDFmuaqH1OsMDWk2Gs=
+k8s.io/apimachinery v0.37.1 h1:hGCYyvKHCwtwMitj2vU4vYx0Z16N9GyZk9BBnz0wDAE=
+k8s.io/apimachinery v0.37.1/go.mod h1:jF84AyUi/IRIXRot5f+lm6MpxoWI+F1XgjaMmwCdTFw=
+k8s.io/apiserver v0.37.1 h1:dUsNwjsvItyVKNpC1N0AhQ0OBSiUJKfWz004vPifOe0=
+k8s.io/apiserver v0.37.1/go.mod h1:EWXW6PntGfOC2uD9GGVobnOExgFoX1z0hZo7f7Rs7Ng=
+k8s.io/client-go v0.37.1 h1:QTv/5ha4jAHtW9qxxVBkQVFBRDb4jHfFopQqqMdc+wM=
+k8s.io/client-go v0.37.1/go.mod h1:dnAPtTnCNY38Ho04D2KdY1F4IKausa9UbqaAZKl60SY=
+k8s.io/component-base v0.37.1 h1:93DMmlENnK7gNLkL4pMqLO5M/HVf3p3sM4q/GasLveY=
+k8s.io/component-base v0.37.1/go.mod h1:bBrdziT4dreQG5lzTaPVxBwsZe1oxphG+ZVdD56dQWQ=
+k8s.io/klog/v2 v2.140.0 h1:Tf+J3AH7xnUzZyVVXhTgGhEKnFqye14aadWv7bzXdzc=
+k8s.io/klog/v2 v2.140.0/go.mod h1:o+/RWfJ6PwpnFn7OyAG3QnO47BFsymfEfrz6XyYSSp0=
+k8s.io/kms v0.37.1 h1:MD1kA8AdFF/N5sGP8gnvL6vTo/oeaQXbmLjWmmJHLc8=
+k8s.io/kms v0.37.1/go.mod h1:0U6zfwLkfJr9O/jLgz2GARnKLh2uIhkq2EeaU66J5ow=
+k8s.io/kube-openapi v0.0.0-20260721132016-d427ff9ee9ad h1:oXImqH8mQNk7PmvzKhmN3ddJoY6OnyM225MXwGHPm0A=
+k8s.io/kube-openapi v0.0.0-20260721132016-d427ff9ee9ad/go.mod h1:0/mqHCVhlumdJ3BhCfnjSZQE037nAhNodh1/hK0T8/I=
+k8s.io/streaming v0.37.1 h1:TpzVfQeFuVndn2g9mFqxy1UcUYPwDzqjUmwR/IzJCWc=
+k8s.io/streaming v0.37.1/go.mod h1:APlJR26ZWRcVy5bIEj0QRrKUXROtBHPcxl2NT7EAzPU=
+k8s.io/utils v0.0.0-20260707023825-cf1189d6abe3 h1:jVkFFVfXdXP74B/zbO3hM3hpSFD0xvhQ5U686DPurkE=
+k8s.io/utils v0.0.0-20260707023825-cf1189d6abe3/go.mod h1:M2s5JB1lIYP3jzZdorPLHXIPJzt9vv2muW5a6L9DtNM=
+sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.36.0 h1:/YpDJ4vReG7ZmzSpBGxduXgywWkJU9zHubgJG03MT+Y=
+sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.36.0/go.mod h1:tJo1aepTXyR+8Xs3sUsGBDk4Ub2AM5dPAPKJx0mpm5c=
 sigs.k8s.io/container-object-storage-interface-api v0.1.0 h1:8tB6JFQhbQIC1hwGQ+q4+tmSSNfjKemb7bFI6C0CK/4=
 sigs.k8s.io/container-object-storage-interface-api v0.1.0/go.mod h1:YiB+i/UGkzqgODDhRG3u7jkbWkQcoUeLEJ7hwOT/2Qk=
-sigs.k8s.io/controller-runtime v0.22.4 h1:GEjV7KV3TY8e+tJ2LCTxUTanW4z/FmNB7l327UfMq9A=
-sigs.k8s.io/controller-runtime v0.22.4/go.mod h1:+QX1XUpTXN4mLoblf4tqr5CQcyHPAki2HLXqQMY6vh8=
+sigs.k8s.io/controller-runtime v0.25.1 h1:BKgU9OeE8xv8EbbM8cY0NVzTQs35rokkdq1jh12fMb4=
+sigs.k8s.io/controller-runtime v0.25.1/go.mod h1:4QqLdT6z/L6Olj8JJCtvztid4/fnIiYsfaTFScegctc=
 sigs.k8s.io/gateway-api v1.4.1 h1:NPxFutNkKNa8UfLd2CMlEuhIPMQgDQ6DXNKG9sHbJU8=
 sigs.k8s.io/gateway-api v1.4.1/go.mod h1:AR5RSqciWP98OPckEjOjh2XJhAe2Na4LHyXD2FUY7Qk=
-sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 h1:IpInykpT6ceI+QxKBbEflcR5EXP7sU1kvOlxwZh5txg=
-sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg=
+sigs.k8s.io/json v0.0.0-20260909141634-11ed52e25bc5 h1:k9jo7ED/fsfOcz3L1P20P5tjTNtsdQNwMOG2aKzHrl8=
+sigs.k8s.io/json v0.0.0-20260909141634-11ed52e25bc5/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg=
 sigs.k8s.io/randfill v1.0.0 h1:JfjMILfT8A6RbawdsK2JXGBR5AQVfd+9TbzrlneTyrU=
 sigs.k8s.io/randfill v1.0.0/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=
-sigs.k8s.io/structured-merge-diff/v6 v6.3.0 h1:jTijUJbW353oVOd9oTlifJqOGEkUw2jB/fXCbTiQEco=
-sigs.k8s.io/structured-merge-diff/v6 v6.3.0/go.mod h1:M3W8sfWvn2HhQDIbGWj3S099YozAsymCo/wrT5ohRUE=
+sigs.k8s.io/structured-merge-diff/v6 v6.4.2 h1:qdOxHwrl2Kaag1aQEarlYcOA9vSyGCp3CIki3aW8c4Q=
+sigs.k8s.io/structured-merge-diff/v6 v6.4.2/go.mod h1:M3W8sfWvn2HhQDIbGWj3S099YozAsymCo/wrT5ohRUE=
 sigs.k8s.io/yaml v1.6.0 h1:G8fkbMSAFqgEFgh4b1wmtzDnioxFCUgTZhlbj5P9QYs=
 sigs.k8s.io/yaml v1.6.0/go.mod h1:796bPqUfzR/0jLAl6XjHl3Ck7MiyVv8dbTdyT3/pMf4=
diff --git a/hack/admin-kubeconfig-invariant.bats b/hack/admin-kubeconfig-invariant.bats
index a4b98b001f..fb764f557b 100644
--- a/hack/admin-kubeconfig-invariant.bats
+++ b/hack/admin-kubeconfig-invariant.bats
@@ -18,12 +18,13 @@
 # project's CI runners and on the maintainer workstation.
 # -----------------------------------------------------------------------------
 
+load test_helper
+
 @test "every Deployment mounting admin-kubeconfig has optional:true and wait-for-kubeconfig init" {
   values_file="packages/apps/kubernetes/tests/values-ci.yaml"
   [ -f "$values_file" ]
 
   tmp=$(mktemp -d)
-  trap 'rm -rf "$tmp"' EXIT
 
   helm template invariant packages/apps/kubernetes \
     --namespace tenant-root \
@@ -69,6 +70,7 @@
   fi
 
   echo "Invariant holds for $matched Deployment(s)"
+  rm -rf "$tmp"
 }
 
 @test "chart emits zero admin-kubeconfig Deployments when tenant has no etcd DataStore" {
@@ -81,7 +83,6 @@
   # with etcd empty and asserts no Deployment references the admin-kubeconfig
   # Secret.
   tmp=$(mktemp -d)
-  trap 'rm -rf "$tmp"' EXIT
 
   helm template invariant packages/apps/kubernetes \
     --namespace tenant-root \
@@ -108,6 +109,7 @@
   fi
 
   echo "No admin-kubeconfig Deployments rendered for empty etcd (as expected)"
+  rm -rf "$tmp"
 }
 
 @test "chart emits zero admin-kubeconfig HelmReleases when tenant has no etcd DataStore" {
@@ -118,7 +120,6 @@
   # the operator sees and contradicting the "awaiting-etcd beacon only"
   # contract of the soft-skip path.
   tmp=$(mktemp -d)
-  trap 'rm -rf "$tmp"' EXIT
 
   helm template invariant packages/apps/kubernetes \
     --namespace tenant-root \
@@ -142,4 +143,5 @@
   fi
 
   echo "No admin-kubeconfig HelmReleases rendered for empty etcd (as expected)"
+  rm -rf "$tmp"
 }
diff --git a/hack/alert-severity-contract.bats b/hack/alert-severity-contract.bats
new file mode 100644
index 0000000000..e1315eb966
--- /dev/null
+++ b/hack/alert-severity-contract.bats
@@ -0,0 +1,333 @@
+#!/usr/bin/env bats
+
+load test_helper
+
+# Alerta's default alarm model, the set the webhook accepts. `none` is left out
+# on purpose: the Alertmanager config routes severity="none" to a blackhole
+# receiver, so such an alert is never delivered, which is the outcome this
+# contract exists to catch. Rule files under packages/**/charts/** are out of
+# scope: they are re-vendored by `make update`, so a bad severity there is
+# fixed upstream or in patches/, not by editing the label.
+ALERT_SEVERITY_ALLOWED=" security critical major minor warning indeterminate informational normal ok cleared debug trace unknown "
+
+helm_actions_stripped() {
+  awk '
+    function strip_comments(s,    pre, rest) {
+      while (1) {
+        if (incomment) {
+          if (match(s, /\*\/[ \t]*-?[}][}]/)) { s = substr(s, RSTART + RLENGTH); incomment = 0 } else { return "" }
+        }
+        if (match(s, /[{][{]-?[ \t]*\/\*/)) {
+          pre = substr(s, 1, RSTART - 1); rest = substr(s, RSTART + RLENGTH)
+          if (match(rest, /\*\/[ \t]*-?[}][}]/)) { s = pre substr(rest, RSTART + RLENGTH) } else { incomment = 1; return pre }
+        } else { return s }
+      }
+    }
+    {
+      line = strip_comments($0)
+      if (incomment && line ~ /^[ \t]*$/) { next }
+      if (line ~ /^[ \t]*[{][{].*[}][}][ \t]*$/) { next }
+      gsub(/[{][{][^}]*[}][}]/, "TEMPLATED", line)
+      print line
+    }
+  ' "$1"
+}
+
+alert_severity_rows() {
+  severity_root=${ALERT_SEVERITY_ROOT:-"$(dirname "${BATS_TEST_FILENAME:-$0}")/.."}
+  severity_files=$(mktemp) || return 1
+  severity_rows=$(mktemp) || {
+    rm -f "$severity_files"
+    return 1
+  }
+  severity_stripped=$(mktemp) || {
+    rm -f "$severity_files" "$severity_rows"
+    return 1
+  }
+
+  if ! (
+    cd "$severity_root" &&
+      git grep -Il -E "kind:[[:space:]]*[\"']?(PrometheusRule|VMRule)[\"']?([[:space:]#,}]|\$)" -- \
+        'packages/**/*.yaml' \
+        'packages/**/*.yml' \
+        ':(exclude)packages/**/charts/**'
+  ) > "$severity_files"; then
+    rm -f "$severity_files" "$severity_rows" "$severity_stripped"
+    return 1
+  fi
+
+  if ! : > "$severity_rows"; then
+    rm -f "$severity_files" "$severity_rows" "$severity_stripped"
+    return 1
+  fi
+  while IFS= read -r file; do
+    if ! (cd "$severity_root" && helm_actions_stripped "$file" > "$severity_stripped" && FILE="$file" yq 'select(.kind == "PrometheusRule" or .kind == "VMRule") | .spec.groups[]? | .rules[]? | select(has("alert")) | [strenv(FILE), .alert, ((.labels.severity // "<missing>") | tostring)] | @tsv' "$severity_stripped") >> "$severity_rows"; then
+      echo "$file: failed to parse alert rules" >&2
+      rm -f "$severity_files" "$severity_rows" "$severity_stripped"
+      return 1
+    fi
+    if ! severity_hidden=$(yq 'select(.kind == "PrometheusRule" or .kind == "VMRule") | ((select(((.spec.groups // []) | length) == 0) | ["a rule document without rule groups"] | @tsv), (.spec.groups[]? | select(((.rules // []) | map(select(tag == "!!map" and (has("alert") or has("record")))) | length) == 0) | ["rule group " + ((.name // "") | tostring)] | @tsv))' "$severity_stripped"); then
+      echo "$file: failed to parse alert rules" >&2
+      rm -f "$severity_files" "$severity_rows" "$severity_stripped"
+      return 1
+    fi
+    severity_hidden=$(printf '%s\n' "$severity_hidden" | sed '/^[[:space:]]*$/d')
+    if [ -n "$severity_hidden" ]; then
+      printf '%s\n' "$severity_hidden" | while IFS= read -r what; do
+        echo "$file: $what shows no alert or recording rule once template actions are stripped" >&2
+      done
+      rm -f "$severity_files" "$severity_rows" "$severity_stripped"
+      return 1
+    fi
+  done < "$severity_files"
+
+  if ! sed '/^[[:space:]]*$/d' "$severity_rows"; then
+    rm -f "$severity_files" "$severity_rows" "$severity_stripped"
+    return 1
+  fi
+  rm -f "$severity_files" "$severity_rows" "$severity_stripped"
+}
+
+alert_severity_contract() {
+  rows=$(mktemp) || return 1
+  if ! alert_severity_rows > "$rows"; then
+    rm -f "$rows"
+    return 1
+  fi
+  bad=0
+  tab=$(printf '\t')
+  while IFS="$tab" read -r file alert severity; do
+    accepted=0
+    for allowed in $ALERT_SEVERITY_ALLOWED; do
+      if [ "$allowed" = "$severity" ]; then
+        accepted=1
+        break
+      fi
+    done
+    if [ "$accepted" -eq 0 ]; then
+      echo "$file: $alert -> '$severity'" >&2
+      bad=$((bad + 1))
+    fi
+  done < "$rows"
+  rm -f "$rows"
+  [ "$bad" -eq 0 ] || return 1
+}
+
+@test "alert rules are discovered" {
+  rows=$(mktemp) || return 1
+  if ! alert_severity_rows > "$rows"; then
+    rm -f "$rows"
+    return 1
+  fi
+  count=$(wc -l < "$rows" | tr -d ' ')
+  rm -f "$rows"
+  [ "$count" -gt 0 ]
+}
+
+@test "every alert rule carries a severity the alert sink accepts" {
+  alert_severity_contract
+}
+
+@test "a parser failure cannot leave the contract green" {
+  fixture=$(mktemp -d)
+  mkdir -p "$fixture/packages/system/example/alerts"
+  printf '%s\n' \
+    'apiVersion: operator.victoriametrics.com/v1beta1' \
+    'kind: VMRule' \
+    'spec:' \
+    '  groups:' \
+    '  - name: valid' \
+    '    rules:' \
+    '    - alert: ValidAlert' \
+    '      labels:' \
+    '        severity: warning' \
+    > "$fixture/packages/system/example/alerts/00-valid.yaml"
+  printf '%s\n' \
+    'apiVersion: operator.victoriametrics.com/v1beta1' \
+    'kind: VMRule' \
+    'spec: [' \
+    > "$fixture/packages/system/example/alerts/99-malformed.yaml"
+  git -C "$fixture" init -q
+  git -C "$fixture" add packages/system/example/alerts/00-valid.yaml packages/system/example/alerts/99-malformed.yaml
+
+  parser_succeeded=0
+  ALERT_SEVERITY_ROOT="$fixture" alert_severity_rows >/dev/null 2>&1 || parser_succeeded=$?
+  rm -rf "$fixture"
+  [ "$parser_succeeded" -ne 0 ]
+}
+
+@test "template rule sources cannot bypass the severity contract" {
+  fixture=$(mktemp -d)
+  mkdir -p "$fixture/packages/extra/example/templates"
+  printf '%s\n' \
+    'apiVersion: monitoring.coreos.com/v1' \
+    'kind: PrometheusRule' \
+    'spec:' \
+    '  groups:' \
+    '  - name: template' \
+    '    rules:' \
+    '    - alert: InvalidTemplateSeverity' \
+    '      labels:' \
+    '        severity: warn' \
+    > "$fixture/packages/extra/example/templates/prometheus-rules.yaml"
+  git -C "$fixture" init -q
+  git -C "$fixture" add packages/extra/example/templates/prometheus-rules.yaml
+
+  contract_succeeded=0
+  ALERT_SEVERITY_ROOT="$fixture" alert_severity_contract >/dev/null 2>&1 || contract_succeeded=$?
+  rm -rf "$fixture"
+  [ "$contract_succeeded" -ne 0 ]
+}
+
+@test "helm template actions do not hide a rule from the contract" {
+  fixture=$(mktemp -d)
+  mkdir -p "$fixture/packages/system/example/templates"
+  printf '%s\n' \
+    '{{- if .Values.alerts.enabled }}' \
+    '{{- /*' \
+    'Rules gated on a value, behind a comment that spans lines.' \
+    '*/}}' \
+    'apiVersion: monitoring.coreos.com/v1' \
+    'kind: PrometheusRule' \
+    'metadata:' \
+    '  name: example' \
+    '  namespace: {{ .Release.Namespace }}' \
+    'spec:' \
+    '  groups:' \
+    '  - name: example' \
+    '    rules:' \
+    '    {{- /* one-line comment */}}' \
+    '    - alert: TemplatedRuleWithBadSeverity' \
+    '      expr: up == 0' \
+    '      labels:' \
+    '        severity: warn' \
+    '      annotations:' \
+    '        description: {{ "{{ $labels.instance }}" }} is down' \
+    '{{- end }}' \
+    > "$fixture/packages/system/example/templates/alerts.yaml"
+  git -C "$fixture" init -q
+  git -C "$fixture" add packages/system/example/templates/alerts.yaml
+
+  rows=$(mktemp)
+  parser_succeeded=0
+  ALERT_SEVERITY_ROOT="$fixture" alert_severity_rows > "$rows" 2>/dev/null || parser_succeeded=$?
+  found=$(grep -c 'TemplatedRuleWithBadSeverity' "$rows" || true)
+  contract_succeeded=0
+  ALERT_SEVERITY_ROOT="$fixture" alert_severity_contract >/dev/null 2>&1 || contract_succeeded=$?
+  rm -rf "$fixture" "$rows"
+  [ "$parser_succeeded" -eq 0 ]
+  [ "$found" -eq 1 ]
+  [ "$contract_succeeded" -ne 0 ]
+}
+
+@test "two accepted words in one severity are rejected" {
+  fixture=$(mktemp -d)
+  mkdir -p "$fixture/packages/system/example/alerts"
+  printf '%s\n' \
+    'apiVersion: operator.victoriametrics.com/v1beta1' \
+    'kind: VMRule' \
+    'spec:' \
+    '  groups:' \
+    '  - name: joined' \
+    '    rules:' \
+    '    - alert: JoinedSeverity' \
+    '      labels:' \
+    '        severity: critical major' \
+    > "$fixture/packages/system/example/alerts/00-joined.yaml"
+  git -C "$fixture" init -q
+  git -C "$fixture" add packages/system/example/alerts/00-joined.yaml
+
+  contract_succeeded=0
+  ALERT_SEVERITY_ROOT="$fixture" alert_severity_contract >/dev/null 2>&1 || contract_succeeded=$?
+  rm -rf "$fixture"
+  [ "$contract_succeeded" -ne 0 ]
+}
+
+@test "quoted kinds and trailing comments do not hide a rule source" {
+  fixture=$(mktemp -d)
+  mkdir -p "$fixture/packages/system/example/alerts"
+  printf '%s\n' \
+    'apiVersion: operator.victoriametrics.com/v1beta1' \
+    'kind: "VMRule"' \
+    'spec:' \
+    '  groups:' \
+    '  - name: quoted' \
+    '    rules:' \
+    '    - alert: QuotedKindSeverity' \
+    '      labels:' \
+    '        severity: warn' \
+    > "$fixture/packages/system/example/alerts/00-quoted.yaml"
+  printf '%s\n' \
+    'apiVersion: monitoring.coreos.com/v1' \
+    'kind: PrometheusRule # served by the operator' \
+    'spec:' \
+    '  groups:' \
+    '  - name: commented' \
+    '    rules:' \
+    '    - alert: CommentedKindSeverity' \
+    '      labels:' \
+    '        severity: warn' \
+    > "$fixture/packages/system/example/alerts/01-commented.yaml"
+  git -C "$fixture" init -q
+  git -C "$fixture" add packages/system/example/alerts/00-quoted.yaml packages/system/example/alerts/01-commented.yaml
+
+  rows=$(mktemp)
+  ALERT_SEVERITY_ROOT="$fixture" alert_severity_rows > "$rows" 2>/dev/null || true
+  found=$(grep -cE 'QuotedKindSeverity|CommentedKindSeverity' "$rows" || true)
+  contract_succeeded=0
+  ALERT_SEVERITY_ROOT="$fixture" alert_severity_contract >/dev/null 2>&1 || contract_succeeded=$?
+  rm -rf "$fixture" "$rows"
+  [ "$found" -eq 2 ]
+  [ "$contract_succeeded" -ne 0 ]
+}
+
+@test "a rule group that only template actions fill fails the contract" {
+  fixture=$(mktemp -d)
+  mkdir -p "$fixture/packages/system/example/templates"
+  printf '%s\n' \
+    'apiVersion: monitoring.coreos.com/v1' \
+    'kind: PrometheusRule' \
+    'metadata:' \
+    '  name: example' \
+    'spec:' \
+    '  groups:' \
+    '  - name: generated' \
+    '    rules:' \
+    '    {{- include "example.rules" . | nindent 4 }}' \
+    > "$fixture/packages/system/example/templates/alerts.yaml"
+  git -C "$fixture" init -q
+  git -C "$fixture" add packages/system/example/templates/alerts.yaml
+
+  errors=$(mktemp)
+  parser_succeeded=0
+  ALERT_SEVERITY_ROOT="$fixture" alert_severity_rows >/dev/null 2>"$errors" || parser_succeeded=$?
+  named=$(grep -c '^packages/system/example/templates/alerts.yaml: rule group generated shows no alert or recording rule' "$errors" || true)
+  contract_succeeded=0
+  ALERT_SEVERITY_ROOT="$fixture" alert_severity_contract >/dev/null 2>&1 || contract_succeeded=$?
+  rm -rf "$fixture" "$errors"
+  [ "$parser_succeeded" -ne 0 ]
+  [ "$named" -eq 1 ]
+  [ "$contract_succeeded" -ne 0 ]
+}
+
+@test "a group of recording rules alone passes the contract" {
+  fixture=$(mktemp -d)
+  mkdir -p "$fixture/packages/system/example/alerts"
+  printf '%s\n' \
+    'apiVersion: operator.victoriametrics.com/v1beta1' \
+    'kind: VMRule' \
+    'spec:' \
+    '  groups:' \
+    '  - name: recording' \
+    '    rules:' \
+    '    - record: job:up:sum' \
+    '      expr: sum by (job) (up)' \
+    > "$fixture/packages/system/example/alerts/00-recording.yaml"
+  git -C "$fixture" init -q
+  git -C "$fixture" add packages/system/example/alerts/00-recording.yaml
+
+  contract_succeeded=0
+  ALERT_SEVERITY_ROOT="$fixture" alert_severity_contract >/dev/null 2>&1 || contract_succeeded=$?
+  rm -rf "$fixture"
+  [ "$contract_succeeded" -eq 0 ]
+}
diff --git a/hack/app-cleanup-hooks_test.bats b/hack/app-cleanup-hooks_test.bats
new file mode 100644
index 0000000000..672dcc541c
--- /dev/null
+++ b/hack/app-cleanup-hooks_test.bats
@@ -0,0 +1,516 @@
+#!/usr/bin/env bats
+# Behavioural tests for the two post-delete cleanup hooks that reclaim storage
+# and ACME objects when an app release is uninstalled:
+#
+#   packages/apps/qdrant/templates/hooks/cleanup-pvc.yaml
+#   packages/apps/harbor/templates/hooks/cleanup.yaml
+#
+# The scripts are extracted from the rendered charts and RUN against a fake
+# kubectl, because the property under test is the container's exit code and no
+# amount of matching against the manifest text establishes it. The helm-unittest
+# suites in packages/apps/*/tests/ match the source text instead.
+#
+# What is pinned here:
+#   * a delete that failed makes the hook exit non-zero. Without that, Helm
+#     records the hook as succeeded and the hook-succeeded delete policy removes
+#     the Job together with the pod that held the only account of the failure;
+#   * one failed delete does not skip the deletes that follow it;
+#   * an object that is already gone stays a success, so a re-run over an
+#     already-clean namespace exits 0;
+#   * a listing that FAILED is distinguishable from one that returned nothing.
+#
+# Run from the repo root through `make bats-unit-tests`; relative paths resolve
+# against that cwd. The file also remains compatible with the legacy
+# `hack/cozytest.sh` translator, so each @test builds and removes its fixture
+# inline instead of relying on setup()/teardown(). No EXIT
+# trap: docs/agents/e2e-testing.md bans them in hack/*.bats, and under the bats
+# binary a test that installs one and then fails prints no TAP line at all.
+
+load test_helper
+
+QDRANT_CHART=packages/apps/qdrant
+HARBOR_CHART=packages/apps/harbor
+
+# render_hook <chart> <release> <namespace> <job-name> <out> [extra helm args…]
+# Extract the named Job's shell script from the rendered chart into <out>. The
+# non-empty check must be an early `return 1`: hack/cozytest.sh rewrites every
+# line matching ^}$ into `return 0` plus `}`, helpers included, so a check left
+# in last-command position has its status discarded.
+render_hook() {
+  chart=$1 release=$2 namespace=$3 job=$4 out=$5
+  shift 5
+  helm template "$release" "$chart" --namespace "$namespace" "$@" \
+    | yq eval "select(.kind == \"Job\" and .metadata.name == \"$job\") | .spec.template.spec.containers[0].command[2]" - > "$out"
+  [ -s "$out" ] || return 1
+}
+
+# write_fake_kubectl <dir>
+# Emit a fake `kubectl` that logs every call to $KLOG and models the three
+# kubectl behaviours these hooks depend on:
+#   * a listing prints the fixture held in $PVC_LIST / $CHALLENGE_LIST /
+#     $SOLVER_LIST and exits 0 — or, when its kind is named in $FAIL_GET, prints
+#     an error and exits 1 having printed nothing, which is what makes "the
+#     listing failed" and "the listing was empty" different events;
+#   * a delete whose kind is named in $FAIL_DELETE exits 1;
+#   * a delete of an object absent from $EXISTING is a NotFound: exit 0 under
+#     --ignore-not-found, exit 1 without it. Dropping that flag from a hook
+#     therefore turns the already-gone cases red rather than passing silently.
+# A label-selector delete matches whatever is present and always exits 0, as
+# kubectl's does. No line below is a bare column-0 `}`, so cozytest.sh's parser
+# leaves the fixture intact.
+write_fake_kubectl() {
+  cat > "$1/kubectl" <<'KEOF'
+#!/bin/sh
+echo "$*" >> "$KLOG"
+verb=$1
+kind=${2:-}
+
+# The by-name deletes put the object name last. Flags and the value that
+# follows -n / -l are skipped, so what survives is the trailing positional.
+obj=""
+skip=0
+for a in "$@"; do
+  if [ "$skip" = 1 ]; then skip=0; continue; fi
+  case "$a" in
+    -n|-l) skip=1 ;;
+    -*) ;;
+    *) obj=$a ;;
+  esac
+done
+
+if [ "$verb" = get ]; then
+  case " ${FAIL_GET:-} " in
+    *" $kind "*) echo "error: the server could not list $kind" >&2; exit 1 ;;
+  esac
+  case "$kind" in
+    pvc) printf '%s' "${PVC_LIST:-}" ;;
+    challenge) printf '%s' "${CHALLENGE_LIST:-}" ;;
+    ingress) printf '%s' "${SOLVER_LIST:-}" ;;
+    *) echo "fake kubectl: unexpected get kind $kind" >&2; exit 64 ;;
+  esac
+  exit 0
+fi
+
+if [ "$verb" != delete ]; then
+  echo "fake kubectl: unexpected verb $verb" >&2
+  exit 64
+fi
+
+# qdrant deletes through xargs as `delete -n NS --ignore-not-found <name>…`, so
+# there is no kind argument on that call; it is always a PVC delete.
+case "$kind" in -*) kind=pvc ;; esac
+
+case " ${FAIL_DELETE:-} " in
+  *" $kind "*) echo "Error from server: failed to delete $kind $obj" >&2; exit 1 ;;
+esac
+case "$*" in *" -l "*) exit 0 ;; esac
+case " ${EXISTING:-} " in
+  *" $obj "*) exit 0 ;;
+esac
+case "$*" in
+  *--ignore-not-found*) exit 0 ;;
+esac
+echo "Error from server (NotFound): $obj not found" >&2
+exit 1
+KEOF
+  chmod 0755 "$1/kubectl"
+}
+
+@test "a render that produces no script fails instead of passing as a no-op" {
+  # Guards the guard: every test below runs whatever render_hook produced, so an
+  # empty render would satisfy the exit-0 assertions without exercising a line
+  # of the hook. This also fails if the emptiness check is ever moved into
+  # last-command position, where cozytest.sh's `return 0` rewrite swallows it.
+  tmp=$(mktemp -d)
+  if render_hook "$tmp/no-such-chart" r ns r-cleanup "$tmp/hook.sh" 2>/dev/null; then
+    echo "FAIL: render_hook reported success with no chart to render"
+    false
+  fi
+  if render_hook "$QDRANT_CHART" qdrant-test tenant-test no-such-job "$tmp/hook.sh"; then
+    echo "FAIL: render_hook reported success for a Job name the chart never emits"
+    false
+  fi
+  rm -rf "$tmp"
+}
+
+@test "qdrant hook exits 0 and deletes exactly the release's data PVCs" {
+  tmp=$(mktemp -d)
+  write_fake_kubectl "$tmp"
+  render_hook "$QDRANT_CHART" qdrant-test tenant-test qdrant-test-qdrant-cleanup "$tmp/hook.sh"
+
+  export KLOG="$tmp/calls"
+  # Two of this release's data PVCs, one belonging to the sibling release
+  # "qdrant-test-2", and one unrelated claim.
+  export PVC_LIST='persistentvolumeclaim/qdrant-storage-qdrant-test-0
+persistentvolumeclaim/qdrant-storage-qdrant-test-1
+persistentvolumeclaim/qdrant-storage-qdrant-test-2-0
+persistentvolumeclaim/db-qdrant-test-0'
+  export EXISTING='persistentvolumeclaim/qdrant-storage-qdrant-test-0 persistentvolumeclaim/qdrant-storage-qdrant-test-1'
+
+  rc=0
+  PATH="$tmp:$PATH" sh "$tmp/hook.sh" > "$tmp/out" 2> "$tmp/err" || rc=$?
+  if [ "$rc" -ne 0 ]; then
+    echo "FAIL: hook exited $rc when every delete succeeded"
+    cat "$tmp/out" "$tmp/err"
+    false
+  fi
+  if ! grep -q 'PVC cleanup complete' "$tmp/out"; then
+    echo "FAIL: hook did not report completion"
+    cat "$tmp/out" "$tmp/err"
+    false
+  fi
+  if ! grep -q 'delete .*qdrant-storage-qdrant-test-0' "$tmp/calls"; then
+    echo "FAIL: the release's data PVCs were never deleted"
+    cat "$tmp/calls"
+    false
+  fi
+  if grep -q 'qdrant-storage-qdrant-test-2-0' "$tmp/calls"; then
+    echo "FAIL: the sibling release's PVC was included in the delete"
+    cat "$tmp/calls"
+    false
+  fi
+  rm -rf "$tmp"
+}
+
+@test "qdrant hook exits 0 when the data PVCs are already gone" {
+  # The idempotent re-run: uninstalling twice, or uninstalling a release whose
+  # storage was reclaimed by hand, must not be reported as a failed cleanup.
+  # Covered in both shapes it takes — nothing matched the selector at all, and
+  # the delete itself came back NotFound.
+  tmp=$(mktemp -d)
+  write_fake_kubectl "$tmp"
+  render_hook "$QDRANT_CHART" qdrant-test tenant-test qdrant-test-qdrant-cleanup "$tmp/hook.sh"
+
+  export KLOG="$tmp/calls"
+  export PVC_LIST=''
+  export EXISTING=''
+
+  rc=0
+  PATH="$tmp:$PATH" sh "$tmp/hook.sh" > "$tmp/out" 2> "$tmp/err" || rc=$?
+  if [ "$rc" -ne 0 ]; then
+    echo "FAIL: hook exited $rc with no matching PVCs in the namespace"
+    cat "$tmp/out" "$tmp/err"
+    false
+  fi
+  if ! grep -q 'nothing to delete' "$tmp/out"; then
+    echo "FAIL: hook did not report an empty namespace"
+    cat "$tmp/out"
+    false
+  fi
+
+  # Same release, but the PVCs are listed and disappear before the delete lands.
+  : > "$tmp/calls"
+  export PVC_LIST='persistentvolumeclaim/qdrant-storage-qdrant-test-0'
+  rc=0
+  PATH="$tmp:$PATH" sh "$tmp/hook.sh" > "$tmp/out2" 2> "$tmp/err2" || rc=$?
+  if [ "$rc" -ne 0 ]; then
+    echo "FAIL: hook exited $rc on a NotFound delete, which --ignore-not-found makes a success"
+    cat "$tmp/out2" "$tmp/err2"
+    false
+  fi
+  if ! grep -q 'delete .*qdrant-storage-qdrant-test-0' "$tmp/calls"; then
+    echo "FAIL: the delete was never attempted, so the NotFound path was not exercised"
+    cat "$tmp/calls"
+    false
+  fi
+  rm -rf "$tmp"
+}
+
+@test "qdrant hook exits non-zero and names the PVCs when the delete fails" {
+  tmp=$(mktemp -d)
+  write_fake_kubectl "$tmp"
+  render_hook "$QDRANT_CHART" qdrant-test tenant-test qdrant-test-qdrant-cleanup "$tmp/hook.sh"
+
+  export KLOG="$tmp/calls"
+  export PVC_LIST='persistentvolumeclaim/qdrant-storage-qdrant-test-0'
+  export EXISTING="$PVC_LIST"
+  export FAIL_DELETE='pvc'
+
+  rc=0
+  PATH="$tmp:$PATH" sh "$tmp/hook.sh" > "$tmp/out" 2> "$tmp/err" || rc=$?
+  if [ "$rc" -eq 0 ]; then
+    echo "FAIL: hook exited 0 although the PVC delete failed"
+    cat "$tmp/out" "$tmp/err"
+    false
+  fi
+  # The message must name what was left behind, not merely that something was.
+  # Anchored on the hook's own `ERROR: ` prefix: the fake kubectl names the
+  # object in its own diagnostic too, so an unanchored match is satisfied by
+  # the fake and stays green even when the hook stops naming anything.
+  if ! grep -q '^ERROR: .*qdrant-storage-qdrant-test-0' "$tmp/err"; then
+    echo "FAIL: the failure was not attributed to a named PVC"
+    cat "$tmp/err"
+    false
+  fi
+  if grep -q 'PVC cleanup complete' "$tmp/out"; then
+    echo "FAIL: hook reported completion after a failed delete"
+    cat "$tmp/out"
+    false
+  fi
+  rm -rf "$tmp"
+}
+
+@test "qdrant hook exits non-zero when the PVC listing fails instead of reporting nothing to delete" {
+  # A failed listing used to reach the filter as an empty string, so the hook
+  # announced an empty namespace and exited 0 without having looked.
+  tmp=$(mktemp -d)
+  write_fake_kubectl "$tmp"
+  render_hook "$QDRANT_CHART" qdrant-test tenant-test qdrant-test-qdrant-cleanup "$tmp/hook.sh"
+
+  export KLOG="$tmp/calls"
+  export PVC_LIST=''
+  export EXISTING=''
+  export FAIL_GET='pvc'
+
+  rc=0
+  PATH="$tmp:$PATH" sh "$tmp/hook.sh" > "$tmp/out" 2> "$tmp/err" || rc=$?
+  if [ "$rc" -eq 0 ]; then
+    echo "FAIL: hook exited 0 although it never managed to list the PVCs"
+    cat "$tmp/out" "$tmp/err"
+    false
+  fi
+  if grep -q 'nothing to delete' "$tmp/out"; then
+    echo "FAIL: a failed listing was reported as an empty namespace"
+    cat "$tmp/out"
+    false
+  fi
+  if ! grep -q 'failed to list PVCs' "$tmp/err"; then
+    echo "FAIL: the failed listing was not named"
+    cat "$tmp/err"
+    false
+  fi
+  rm -rf "$tmp"
+}
+
+@test "harbor hook exits 0 and sweeps PVCs, Certificate and ACME solvers" {
+  tmp=$(mktemp -d)
+  write_fake_kubectl "$tmp"
+  render_hook "$HARBOR_CHART" harbor-test tenant-test harbor-test-cleanup "$tmp/hook.sh" \
+    --set '_namespace.host=example.org' --set '_cluster.solver=http01'
+
+  export KLOG="$tmp/calls"
+  export CHALLENGE_LIST='harbor-test-cert-1 '
+  export SOLVER_LIST='cm-acme-http-solver-abcde '
+  export EXISTING='harbor-test-ingress-tls harbor-test-cert-1 cm-acme-http-solver-abcde'
+
+  rc=0
+  PATH="$tmp:$PATH" sh "$tmp/hook.sh" > "$tmp/out" 2> "$tmp/err" || rc=$?
+  if [ "$rc" -ne 0 ]; then
+    echo "FAIL: hook exited $rc when every delete succeeded"
+    cat "$tmp/out" "$tmp/err"
+    false
+  fi
+  if ! grep -q 'Cleanup complete' "$tmp/out"; then
+    echo "FAIL: hook did not report completion"
+    cat "$tmp/out" "$tmp/err"
+    false
+  fi
+  for expected in 'delete pvc' 'delete certificate' 'delete challenge' 'delete ingress'; do
+    if ! grep -q "$expected" "$tmp/calls"; then
+      echo "FAIL: the hook never issued: $expected"
+      cat "$tmp/calls"
+      false
+    fi
+  done
+  rm -rf "$tmp"
+}
+
+@test "harbor hook exits 0 when every object is already gone" {
+  # No in-flight ACME challenge and no solver Ingress is the ordinary case, and
+  # the Certificate is usually collected with the release before the hook runs.
+  # All of it must stay a success.
+  tmp=$(mktemp -d)
+  write_fake_kubectl "$tmp"
+  render_hook "$HARBOR_CHART" harbor-test tenant-test harbor-test-cleanup "$tmp/hook.sh" \
+    --set '_namespace.host=example.org' --set '_cluster.solver=http01'
+
+  export KLOG="$tmp/calls"
+  export CHALLENGE_LIST=''
+  export SOLVER_LIST=''
+  export EXISTING=''
+
+  rc=0
+  PATH="$tmp:$PATH" sh "$tmp/hook.sh" > "$tmp/out" 2> "$tmp/err" || rc=$?
+  if [ "$rc" -ne 0 ]; then
+    echo "FAIL: hook exited $rc on an already-clean namespace"
+    cat "$tmp/out" "$tmp/err"
+    false
+  fi
+  # The Certificate delete is the one that actually reaches a NotFound here, so
+  # it has to have been attempted for this test to mean anything.
+  if ! grep -q 'delete certificate .*harbor-test-ingress-tls' "$tmp/calls"; then
+    echo "FAIL: the Certificate delete was never attempted"
+    cat "$tmp/calls"
+    false
+  fi
+  rm -rf "$tmp"
+}
+
+@test "harbor hook reports a failed delete, names the object and still runs the later sweeps" {
+  tmp=$(mktemp -d)
+  write_fake_kubectl "$tmp"
+  render_hook "$HARBOR_CHART" harbor-test tenant-test harbor-test-cleanup "$tmp/hook.sh" \
+    --set '_namespace.host=example.org' --set '_cluster.solver=http01'
+
+  export KLOG="$tmp/calls"
+  export CHALLENGE_LIST='harbor-test-cert-1 '
+  export SOLVER_LIST='cm-acme-http-solver-abcde '
+  export EXISTING='harbor-test-ingress-tls harbor-test-cert-1 cm-acme-http-solver-abcde'
+  export FAIL_DELETE='pvc'
+
+  rc=0
+  PATH="$tmp:$PATH" sh "$tmp/hook.sh" > "$tmp/out" 2> "$tmp/err" || rc=$?
+  if [ "$rc" -eq 0 ]; then
+    echo "FAIL: hook exited 0 although the PVC delete failed"
+    cat "$tmp/out" "$tmp/err"
+    false
+  fi
+  if ! grep -q '^ERROR: .*release=harbor-test-system' "$tmp/err"; then
+    echo "FAIL: the failure was not attributed to the objects it left behind"
+    cat "$tmp/err"
+    false
+  fi
+  # The first failure must not cost the release its Certificate and solver
+  # cleanup: those run to completion and the exit code is decided at the end.
+  for expected in 'delete certificate' 'delete challenge' 'delete ingress'; do
+    if ! grep -q "$expected" "$tmp/calls"; then
+      echo "FAIL: the sweep stopped at the first failure, skipping: $expected"
+      cat "$tmp/calls"
+      false
+    fi
+  done
+  if grep -q 'Cleanup complete' "$tmp/out"; then
+    echo "FAIL: hook reported completion after a failed delete"
+    cat "$tmp/out"
+    false
+  fi
+  rm -rf "$tmp"
+}
+
+@test "harbor hook reports every ACME delete that failed, each by name" {
+  # The PVC sweep is only one of harbor's failure paths; the Certificate and the
+  # two per-object ACME deletes are three more, and #3566 names each of them
+  # separately. Covered together, with the PVC delete deliberately succeeding,
+  # so this test fails if ANY of the three stops reporting — reverting one of
+  # them to `|| echo "WARNING …"` is the exact defect being fixed.
+  tmp=$(mktemp -d)
+  write_fake_kubectl "$tmp"
+  render_hook "$HARBOR_CHART" harbor-test tenant-test harbor-test-cleanup "$tmp/hook.sh" \
+    --set '_namespace.host=example.org' --set '_cluster.solver=http01'
+
+  export KLOG="$tmp/calls"
+  export CHALLENGE_LIST='harbor-test-cert-1 '
+  export SOLVER_LIST='cm-acme-http-solver-abcde '
+  export EXISTING='harbor-test-ingress-tls harbor-test-cert-1 cm-acme-http-solver-abcde'
+  export FAIL_DELETE='certificate challenge ingress'
+
+  rc=0
+  PATH="$tmp:$PATH" sh "$tmp/hook.sh" > "$tmp/out" 2> "$tmp/err" || rc=$?
+  if [ "$rc" -eq 0 ]; then
+    echo "FAIL: hook exited 0 although three ACME deletes failed"
+    cat "$tmp/out" "$tmp/err"
+    false
+  fi
+  # Anchored on the hook's own ERROR: prefix — the fake kubectl names the object
+  # in its own diagnostic too, so an unanchored match would be satisfied by the
+  # fixture and stay green with the hook reporting nothing.
+  for object in 'Certificate tenant-test/harbor-test-ingress-tls' \
+                'Challenge tenant-test/harbor-test-cert-1' \
+                'solver Ingress tenant-test/cm-acme-http-solver-abcde'; do
+    if ! grep -q "^ERROR: .*$object" "$tmp/err"; then
+      echo "FAIL: the hook did not report the failed delete of: $object"
+      cat "$tmp/err"
+      false
+    fi
+  done
+  if grep -q 'Cleanup complete' "$tmp/out"; then
+    echo "FAIL: hook reported completion after three failed deletes"
+    cat "$tmp/out"
+    false
+  fi
+  rm -rf "$tmp"
+}
+
+@test "harbor hook reports a failed solver Ingress listing, the second of its two loops" {
+  # The Challenge listing is covered below; this is the other loop. Both have
+  # the same shape and each needs its own case, because a revert of one is
+  # invisible to a test that only exercises the other.
+  tmp=$(mktemp -d)
+  write_fake_kubectl "$tmp"
+  render_hook "$HARBOR_CHART" harbor-test tenant-test harbor-test-cleanup "$tmp/hook.sh" \
+    --set '_namespace.host=example.org' --set '_cluster.solver=http01'
+
+  export KLOG="$tmp/calls"
+  export CHALLENGE_LIST='harbor-test-cert-1 '
+  export SOLVER_LIST=''
+  export EXISTING='harbor-test-ingress-tls harbor-test-cert-1'
+  export FAIL_GET='ingress'
+
+  rc=0
+  PATH="$tmp:$PATH" sh "$tmp/hook.sh" > "$tmp/out" 2> "$tmp/err" || rc=$?
+  if [ "$rc" -eq 0 ]; then
+    echo "FAIL: hook exited 0 although it never managed to list the solver Ingresses"
+    cat "$tmp/out" "$tmp/err"
+    false
+  fi
+  if ! grep -q '^ERROR: .*failed to list solver Ingresses' "$tmp/err"; then
+    echo "FAIL: the failed solver Ingress listing was not reported by the hook"
+    cat "$tmp/err"
+    false
+  fi
+  # The Challenge sweep runs before it and must have completed normally: this
+  # failure is counted, not fatal.
+  if ! grep -q 'delete challenge .*harbor-test-cert-1' "$tmp/calls"; then
+    echo "FAIL: the Challenge sweep preceding the failed listing did not run"
+    cat "$tmp/calls"
+    false
+  fi
+  if grep -q 'Cleanup complete' "$tmp/out"; then
+    echo "FAIL: hook reported completion after a failed listing"
+    cat "$tmp/out"
+    false
+  fi
+  rm -rf "$tmp"
+}
+
+@test "harbor hook exits non-zero when a listing fails instead of sweeping nothing" {
+  # Iterating $(kubectl get …) directly cannot tell a failed listing from an
+  # empty one: both leave the loop body unexecuted, so the sweep reported
+  # success without having looked.
+  tmp=$(mktemp -d)
+  write_fake_kubectl "$tmp"
+  render_hook "$HARBOR_CHART" harbor-test tenant-test harbor-test-cleanup "$tmp/hook.sh" \
+    --set '_namespace.host=example.org' --set '_cluster.solver=http01'
+
+  export KLOG="$tmp/calls"
+  export CHALLENGE_LIST=''
+  export SOLVER_LIST='cm-acme-http-solver-abcde '
+  export EXISTING='harbor-test-ingress-tls cm-acme-http-solver-abcde'
+  export FAIL_GET='challenge'
+
+  rc=0
+  PATH="$tmp:$PATH" sh "$tmp/hook.sh" > "$tmp/out" 2> "$tmp/err" || rc=$?
+  if [ "$rc" -eq 0 ]; then
+    echo "FAIL: hook exited 0 although it never managed to list the Challenges"
+    cat "$tmp/out" "$tmp/err"
+    false
+  fi
+  if ! grep -q 'failed to list Challenges' "$tmp/err"; then
+    echo "FAIL: the failed listing was not named"
+    cat "$tmp/err"
+    false
+  fi
+  # A failed listing is counted, not fatal: the solver Ingress sweep after it
+  # still runs and still deletes what it finds.
+  if ! grep -q 'delete ingress .*cm-acme-http-solver-abcde' "$tmp/calls"; then
+    echo "FAIL: the failed listing aborted the solver Ingress sweep that follows it"
+    cat "$tmp/calls"
+    false
+  fi
+  if grep -q 'Cleanup complete' "$tmp/out"; then
+    echo "FAIL: hook reported completion after a failed listing"
+    cat "$tmp/out"
+    false
+  fi
+  rm -rf "$tmp"
+}
diff --git a/hack/backup-access-preflight.bats b/hack/backup-access-preflight.bats
new file mode 100644
index 0000000000..3892c8bcfa
--- /dev/null
+++ b/hack/backup-access-preflight.bats
@@ -0,0 +1,530 @@
+#!/usr/bin/env bats
+# Unit tests for the E2E-only S3 access gate that runs before expensive backup
+# workloads. All cluster and S3 calls are shell stubs.
+
+load test_helper
+
+@test "preflight helper remains sourceable by the POSIX test runner" {
+    helper=hack/e2e-chainsaw/_lib/backup-access-preflight.sh
+    [ "$(sed -n '1p' "$helper")" = '#!/bin/sh' ]
+    if grep -nE '^[[:space:]]*(set[[:space:]].*pipefail|local([[:space:]]|$))' "$helper"; then
+        echo "backup preflight is sourced by /bin/sh and must not contain Bash-only shell state" >&2
+        exit 1
+    fi
+    sh -n "$helper"
+}
+
+@test "preflight fails closed when the BucketInfo Secret cannot be read" {
+    . hack/e2e-chainsaw/_lib/backup-access-preflight.sh
+    out=$(mktemp)
+    kubectl() {
+        case "$*" in
+            *" get secret bucket-demo-backup "*) return 1 ;;
+            *) echo "preflight continued after the Secret read failed: $*" >&2; return 1 ;;
+        esac
+    }
+
+    if cozy_backup_access_preflight tenant-test bucket-demo-backup 0 >"$out" 2>&1; then
+        echo "failed BucketInfo Secret read passed the S3 preflight" >&2
+        exit 1
+    fi
+    grep -q 'failed to read BucketInfo Secret tenant-test/bucket-demo-backup' "$out"
+    if grep -q 'lacks access key' "$out"; then
+        echo "preflight continued into credential parsing after the Secret read failed" >&2
+        exit 1
+    fi
+}
+
+@test "preflight retries IAM convergence then proves PUT GET compare and DELETE" {
+    . hack/e2e-chainsaw/_lib/backup-access-preflight.sh
+    attempts=$(mktemp)
+    uploaded_source=$(mktemp)
+    calls=$(mktemp)
+    printf '0\n' > "$attempts"
+
+    kubectl() {
+        printf 'kubectl %s\n' "$*" >> "$calls"
+        case "$*" in
+            *" get secret bucket-demo-backup "*)
+                printf '%s' '{"spec":{"secretS3":{"accessKeyID":"access","accessSecretKey":"secret"},"bucketName":"bucket-real"}}' | base64 | tr -d '\n'
+                ;;
+            *" port-forward "*)
+                while :; do command sleep 1; done
+                ;;
+            *) echo "unexpected kubectl call: $*" >&2; return 1 ;;
+        esac
+    }
+    timeout() {
+        shift
+        if [ "$1" = sh ]; then
+            return 0
+        fi
+        "$@"
+    }
+    sleep() { :; }
+    mc() {
+        printf 'mc %s\n' "$*" >> "$calls"
+        case "$1" in
+            alias) return 0 ;;
+            cp)
+                case "$3" in
+                    backup-preflight/*)
+                        command cp "$(sed -n '1p' "$uploaded_source")" "$4"
+                        ;;
+                    *)
+                        count=$(sed -n '1p' "$attempts")
+                        count=$(( count + 1 ))
+                        printf '%s\n' "$count" > "$attempts"
+                        if [ "$count" -eq 1 ]; then
+                            echo 'AccessDenied: IAM identity not loaded yet' >&2
+                            return 1
+                        fi
+                        printf '%s\n' "$3" > "$uploaded_source"
+                        ;;
+                esac
+                ;;
+            rm) return 0 ;;
+            *) echo "unexpected mc call: $*" >&2; return 1 ;;
+        esac
+    }
+
+    cozy_backup_access_preflight tenant-test bucket-demo-backup 5 >/dev/null
+    [ "$(sed -n '1p' "$attempts")" -eq 2 ] || {
+        echo "preflight did not retry the not-yet-loaded IAM identity" >&2
+        cat "$calls" >&2
+        exit 1
+    }
+    [ "$(grep -c '^mc rm ' "$calls")" -eq 1 ] || {
+        echo "preflight did not delete its successfully verified object exactly once" >&2
+        cat "$calls" >&2
+        exit 1
+    }
+}
+
+@test "preflight fails before backup work when granted credentials never reach S3" {
+    . hack/e2e-chainsaw/_lib/backup-access-preflight.sh
+    out=$(mktemp)
+    kubectl() {
+        case "$*" in
+            *" get secret bucket-demo-backup "*)
+                printf '%s' '{"spec":{"secretS3":{"accessKeyID":"access","accessSecretKey":"secret"},"bucketName":"bucket-real"}}' | base64 | tr -d '\n'
+                ;;
+            *" port-forward "*) while :; do command sleep 1; done ;;
+            *) return 1 ;;
+        esac
+    }
+    timeout() {
+        shift
+        if [ "$1" = sh ]; then return 0; fi
+        "$@"
+    }
+    mc() {
+        case "$1" in
+            alias) return 0 ;;
+            cp) echo 'AccessDenied' >&2; return 1 ;;
+            *) return 0 ;;
+        esac
+    }
+
+    if cozy_backup_access_preflight tenant-test bucket-demo-backup 0 >"$out" 2>&1; then
+        echo "unusable credentials passed the S3 preflight" >&2
+        exit 1
+    fi
+    grep -q 'granted but did not pass S3 PUT/GET/DELETE within 0s' "$out"
+    grep -q 's3-preflight: AccessDenied' "$out"
+    grep -q 's3-preflight: attempt 1 failed at PUT' "$out"
+}
+
+@test "preflight timeout reports the port-forward and how every attempt ended" {
+    . hack/e2e-chainsaw/_lib/backup-access-preflight.sh
+    out=$(mktemp)
+    now=$(mktemp)
+    pf_ready=$(mktemp)
+    attempts=$(mktemp)
+    uploaded_source=$(mktemp)
+    printf '100\n' > "$now"
+    printf '0\n' > "$attempts"
+
+    kubectl() {
+        case "$*" in
+            *" get secret bucket-demo-backup "*)
+                printf '%s' '{"spec":{"secretS3":{"accessKeyID":"access","accessSecretKey":"secret"},"bucketName":"bucket-real"}}' | base64 | tr -d '\n'
+                ;;
+            *" port-forward "*)
+                echo 'Forwarding from 127.0.0.1:18333 -> 8333'
+                printf 'ready\n' > "$pf_ready"
+                while :; do command sleep 1; done
+                ;;
+            *) return 1 ;;
+        esac
+    }
+    # A stubbed clock keeps the retry budget independent of how fast the
+    # stubs run: only a completed PUT advances it, so the loop ends after a
+    # known number of attempts.
+    date() {
+        if [ "${1:-}" = +%s ]; then sed -n '1p' "$now"; else command date "$@"; fi
+    }
+    timeout() {
+        shift
+        if [ "$1" = sh ]; then
+            waited=0
+            while [ ! -s "$pf_ready" ] && [ "$waited" -lt 100 ]; do
+                waited=$(( waited + 1 ))
+                command sleep 0.1
+            done
+            return 0
+        fi
+        "$@"
+    }
+    sleep() { :; }
+    # The first three attempts break at a later stage than the one before, so
+    # the stages that follow a completed upload are told apart rather than
+    # merged.
+    mc() {
+        case "$1" in
+            alias) return 0 ;;
+            cp)
+                case "$3" in
+                    backup-preflight/*)
+                        case "$(sed -n '1p' "$attempts")" in
+                            1)
+                                echo 'mc: <ERROR> Unable to download: connection reset by peer' >&2
+                                return 1
+                                ;;
+                            2) printf 'truncated\n' > "$4" ;;
+                            *) command cp "$(sed -n '1p' "$uploaded_source")" "$4" ;;
+                        esac
+                        ;;
+                    *)
+                        printf '%s\n' "$3" > "$uploaded_source"
+                        count=$(sed -n '1p' "$attempts")
+                        printf '%s\n' "$(( count + 1 ))" > "$attempts"
+                        stamp=$(sed -n '1p' "$now")
+                        printf '%s\n' "$(( stamp + 10 ))" > "$now"
+                        # Do not tidy this arm away into a clean ascending
+                        # ladder. A ladder where every attempt fails later than
+                        # the last can never catch a missing per-iteration
+                        # stage reset, because the stale value is overwritten
+                        # before anything reads it.
+                        if [ "$count" -eq 3 ]; then
+                            echo 'mc: <ERROR> Unable to upload: connection reset by peer' >&2
+                            return 1
+                        fi
+                        echo 'source -> backup-preflight/bucket-real/object'
+                        ;;
+                esac
+                ;;
+            rm) return 1 ;;
+            *) return 0 ;;
+        esac
+    }
+
+    if cozy_backup_access_preflight tenant-test bucket-demo-backup 35 >"$out" 2>&1; then
+        echo "an S3 round trip that never completed passed the preflight" >&2
+        exit 1
+    fi
+    grep -q 'port-forward: Forwarding from 127.0.0.1:18333' "$out" || {
+        echo "timeout path dropped the port-forward log" >&2
+        cat "$out" >&2
+        exit 1
+    }
+    for expected in \
+        'attempt 1 failed at GET' \
+        'attempt 2 failed at compare' \
+        'attempt 3 failed at DELETE' \
+        'attempt 4 failed at PUT'; do
+        grep -q "s3-preflight: $expected" "$out" || {
+            echo "timeout path lost '$expected'" >&2
+            cat "$out" >&2
+            exit 1
+        }
+    done
+}
+
+@test "all active database backup flows gate immediately after accessGranted" {
+    for file in \
+        examples/backups/postgres/run-all.sh \
+        examples/backups/mariadb/run-all.sh \
+        examples/backups/mongodb/run-all.sh \
+        examples/backups/clickhouse/03-create-bucket.sh \
+        examples/backups/kafka/03-create-bucket.sh; do
+        granted=$(grep -n 'accessGranted' "$file" | head -n 1 | cut -d: -f1)
+        preflight=$(grep -n 'cozy_backup_access_preflight' "$file" | head -n 1 | cut -d: -f1)
+        coordinates=$(grep -n 'Reading bucket coordinates' "$file" | head -n 1 | cut -d: -f1)
+        if [ -z "$granted" ] || [ -z "$preflight" ] || [ -z "$coordinates" ] \
+            || [ "$granted" -ge "$preflight" ] || [ "$preflight" -ge "$coordinates" ]; then
+            echo "$file must run the S3 preflight after accessGranted and before consuming bucket coordinates" >&2
+            exit 1
+        fi
+    done
+}
+
+@test "the five preflight-wired Chainsaw backup roundtrips enable the E2E preflight" {
+    for file in \
+        hack/e2e-chainsaw/postgres/chainsaw-test.yaml \
+        hack/e2e-chainsaw/mariadb/chainsaw-test.yaml \
+        hack/e2e-chainsaw/mongodb/chainsaw-test.yaml \
+        hack/e2e-chainsaw/clickhouse/chainsaw-test.yaml \
+        hack/e2e-chainsaw/kafka/chainsaw-test.yaml; do
+        grep -q 'COZY_E2E_BACKUP_PREFLIGHT=1' "$file" || {
+            echo "$file does not enable the backup access preflight" >&2
+            exit 1
+        }
+    done
+}
+
+@test "preflight reports the port-forward log when the S3 client cannot be configured" {
+    . hack/e2e-chainsaw/_lib/backup-access-preflight.sh
+    out=$(mktemp)
+    pf_ready=$(mktemp)
+    kubectl() {
+        case "$*" in
+            *" get secret bucket-demo-backup "*)
+                printf '%s' '{"spec":{"secretS3":{"accessKeyID":"access","accessSecretKey":"secret"},"bucketName":"bucket-real"}}' | base64 | tr -d '\n'
+                ;;
+            *" port-forward "*)
+                echo 'Forwarding from 127.0.0.1:18333 -> 8333'
+                printf 'ready\n' > "$pf_ready"
+                while :; do command sleep 1; done
+                ;;
+            *) return 1 ;;
+        esac
+    }
+    timeout() {
+        shift
+        if [ "$1" = sh ]; then
+            waited=0
+            while [ ! -s "$pf_ready" ] && [ "$waited" -lt 100 ]; do
+                waited=$(( waited + 1 ))
+                command sleep 0.1
+            done
+            return 0
+        fi
+        "$@"
+    }
+    mc() {
+        case "$1" in
+            alias) echo 'mc: <ERROR> Unable to initialize new alias: not an S3 endpoint' >&2; return 1 ;;
+            *) echo "preflight continued after the S3 client failed: mc $*" >&2; return 1 ;;
+        esac
+    }
+
+    if cozy_backup_access_preflight tenant-test bucket-demo-backup 0 >"$out" 2>&1; then
+        echo "a failed S3 client setup passed the preflight" >&2
+        exit 1
+    fi
+    grep -q 'failed to configure S3 client for BucketAccess tenant-test/bucket-demo-backup' "$out"
+    grep -q 'port-forward: Forwarding from 127.0.0.1:18333' "$out" || {
+        echo "the S3 client failure dropped the port-forward log" >&2
+        cat "$out" >&2
+        exit 1
+    }
+}
+
+@test "preflight cleanup deletes a failed round trip's object through a live tunnel" {
+    . hack/e2e-chainsaw/_lib/backup-access-preflight.sh
+    out=$(mktemp)
+    pf_state=$(mktemp)
+    calls=$(mktemp)
+    kubectl() {
+        case "$*" in
+            *" get secret bucket-demo-backup "*)
+                printf '%s' '{"spec":{"secretS3":{"accessKeyID":"access","accessSecretKey":"secret"},"bucketName":"bucket-real"}}' | base64 | tr -d '\n'
+                ;;
+            *" port-forward "*)
+                # The PID of this background subshell, which is what the
+                # helper kills; the delete below probes it.
+                sh -c 'echo $PPID' > "$pf_state"
+                while :; do command sleep 1; done
+                ;;
+            *) return 1 ;;
+        esac
+    }
+    timeout() {
+        shift
+        if [ "$1" = sh ]; then
+            waited=0
+            while [ ! -s "$pf_state" ] && [ "$waited" -lt 100 ]; do
+                waited=$(( waited + 1 ))
+                command sleep 0.1
+            done
+            return 0
+        fi
+        "$@"
+    }
+    mc() {
+        case "$1" in
+            alias) return 0 ;;
+            cp)
+                case "$3" in
+                    backup-preflight/*) echo 'mc: <ERROR> Unable to download: connection reset by peer' >&2; return 1 ;;
+                    *) return 0 ;;
+                esac
+                ;;
+            rm)
+                if kill -0 "$(cat "$pf_state")" 2>/dev/null; then
+                    printf 'rm with tunnel alive\n' >> "$calls"
+                else
+                    printf 'rm with tunnel gone\n' >> "$calls"
+                    echo 'mc: <ERROR> dial tcp 127.0.0.1:18333: connect: connection refused' >&2
+                    return 1
+                fi
+                ;;
+            *) return 1 ;;
+        esac
+    }
+
+    if cozy_backup_access_preflight tenant-test bucket-demo-backup 0 >"$out" 2>&1; then
+        echo "a failed download passed the preflight" >&2
+        exit 1
+    fi
+    [ "$(cat "$calls")" = "rm with tunnel alive" ] || {
+        echo "cleanup did not delete the uploaded object while the port-forward was still up:" >&2
+        cat "$calls" "$out" >&2
+        exit 1
+    }
+    if grep -q 'could not remove' "$out"; then
+        echo "cleanup warned about a delete that succeeded" >&2
+        cat "$out" >&2
+        exit 1
+    fi
+}
+
+@test "preflight cleanup tries the delete when the upload timed out after landing" {
+    . hack/e2e-chainsaw/_lib/backup-access-preflight.sh
+    out=$(mktemp)
+    pf_state=$(mktemp)
+    calls=$(mktemp)
+    kubectl() {
+        case "$*" in
+            *" get secret bucket-demo-backup "*)
+                printf '%s' '{"spec":{"secretS3":{"accessKeyID":"access","accessSecretKey":"secret"},"bucketName":"bucket-real"}}' | base64 | tr -d '\n'
+                ;;
+            *" port-forward "*)
+                printf alive > "$pf_state"
+                while :; do command sleep 1; done
+                ;;
+            *) return 1 ;;
+        esac
+    }
+    # The PUT reaches the server and then outlives its bound, so timeout
+    # reports 124 while the object is already in the bucket.
+    timeout() {
+        shift
+        if [ "$1" = sh ]; then
+            waited=0
+            while [ ! -s "$pf_state" ] && [ "$waited" -lt 100 ]; do
+                waited=$(( waited + 1 ))
+                command sleep 0.1
+            done
+            return 0
+        fi
+        case "$1 $2 ${5:-}" in
+            "mc cp backup-preflight/"*)
+                printf 'put\n' >> "$calls"
+                return 124
+                ;;
+        esac
+        "$@"
+    }
+    mc() {
+        case "$1" in
+            alias) return 0 ;;
+            rm) printf 'rm\n' >> "$calls" ;;
+            *) return 1 ;;
+        esac
+    }
+
+    if cozy_backup_access_preflight tenant-test bucket-demo-backup 0 >"$out" 2>&1; then
+        echo "a timed-out upload passed the preflight" >&2
+        exit 1
+    fi
+    grep -qx put "$calls"
+    grep -qx rm "$calls" || {
+        echo "cleanup skipped the delete of an upload that may have landed:" >&2
+        cat "$calls" "$out" >&2
+        exit 1
+    }
+}
+
+@test "preflight cleanup neither deletes nor warns when every PUT was refused" {
+    . hack/e2e-chainsaw/_lib/backup-access-preflight.sh
+    out=$(mktemp)
+    calls=$(mktemp)
+    kubectl() {
+        case "$*" in
+            *" get secret bucket-demo-backup "*)
+                printf '%s' '{"spec":{"secretS3":{"accessKeyID":"access","accessSecretKey":"secret"},"bucketName":"bucket-real"}}' | base64 | tr -d '\n'
+                ;;
+            *" port-forward "*) while :; do command sleep 1; done ;;
+            *) return 1 ;;
+        esac
+    }
+    timeout() {
+        shift
+        if [ "$1" = sh ]; then return 0; fi
+        "$@"
+    }
+    mc() {
+        case "$1" in
+            alias) return 0 ;;
+            cp) echo 'AccessDenied' >&2; return 1 ;;
+            rm) printf 'rm\n' >> "$calls"; echo 'AccessDenied' >&2; return 1 ;;
+            *) return 1 ;;
+        esac
+    }
+
+    if cozy_backup_access_preflight tenant-test bucket-demo-backup 0 >"$out" 2>&1; then
+        echo "a refused PUT passed the preflight" >&2
+        exit 1
+    fi
+    if [ -s "$calls" ] || grep -q 'could not remove' "$out"; then
+        echo "cleanup tried to delete an object no PUT created:" >&2
+        cat "$calls" "$out" >&2
+        exit 1
+    fi
+}
+
+@test "preflight cleanup names the timeout when the delete itself times out" {
+    . hack/e2e-chainsaw/_lib/backup-access-preflight.sh
+    out=$(mktemp)
+    kubectl() {
+        case "$*" in
+            *" get secret bucket-demo-backup "*)
+                printf '%s' '{"spec":{"secretS3":{"accessKeyID":"access","accessSecretKey":"secret"},"bucketName":"bucket-real"}}' | base64 | tr -d '\n'
+                ;;
+            *" port-forward "*) while :; do command sleep 1; done ;;
+            *) return 1 ;;
+        esac
+    }
+    # The delete hangs until its bound kills it: exit 124, nothing written.
+    timeout() {
+        shift
+        if [ "$1" = sh ]; then return 0; fi
+        if [ "$1 $2" = "mc rm" ]; then return 124; fi
+        "$@"
+    }
+    mc() {
+        case "$1" in
+            alias) return 0 ;;
+            cp)
+                case "$3" in
+                    backup-preflight/*) echo 'mc: <ERROR> Unable to download: connection reset by peer' >&2; return 1 ;;
+                    *) return 0 ;;
+                esac
+                ;;
+            *) return 1 ;;
+        esac
+    }
+
+    if cozy_backup_access_preflight tenant-test bucket-demo-backup 0 >"$out" 2>&1; then
+        echo "a failed download passed the preflight" >&2
+        exit 1
+    fi
+    grep -q 'could not remove failed S3 preflight object' "$out"
+    grep -q 's3-cleanup: mc rm timed out after 15s' "$out" || {
+        echo "a delete that timed out left the warning without a reason:" >&2
+        cat "$out" >&2
+        exit 1
+    }
+}
diff --git a/hack/backup-examples-shared-helpers.bats b/hack/backup-examples-shared-helpers.bats
new file mode 100644
index 0000000000..1821c01925
--- /dev/null
+++ b/hack/backup-examples-shared-helpers.bats
@@ -0,0 +1,95 @@
+#!/usr/bin/env bats
+# Contract for the wait helpers the backup walkthroughs share: each is defined
+# once, in examples/backups/_lib/wait-helpers.sh, so a fix made there reaches
+# every walkthrough; each walkthrough's 00-helpers.sh provides them; and
+# wait_for_field reports why kubectl could not read a field while staying quiet
+# about a resource that does not exist yet.
+
+load test_helper
+
+SHARED=examples/backups/_lib/wait-helpers.sh
+SHARED_HELPERS="wait_for_field wait_hr_ready wait_deleted"
+
+@test "each shared wait helper is defined once, in the shared file" {
+    fail=
+    for fn in $SHARED_HELPERS; do
+        definers=$(grep -rlE --include='*.sh' "^[[:space:]]*(function[[:space:]]+)?${fn}[[:space:]]*\(\)" examples packages | sort)
+        if [ "$definers" != "$SHARED" ]; then
+            fail="$fail
+${fn} is defined in:
+${definers:-  (nowhere)}"
+        fi
+    done
+    [ -z "$fail" ] || {
+        echo "a walkthrough carries its own copy of a shared helper; use the one in $SHARED:$fail" >&2
+        exit 1
+    }
+}
+
+@test "every walkthrough's helpers provide the shared wait helpers" {
+    # Some helpers read the cluster while being sourced (kafka resolves its
+    # image from the operator); a stub keeps this test off any real cluster.
+    stub=$(mktemp -d)
+    printf '#!/bin/sh\nexit 1\n' > "$stub/kubectl"
+    chmod +x "$stub/kubectl"
+    for helpers in examples/backups/*/00-helpers.sh; do
+        PATH="$stub:$PATH" bash -c '
+            set -euo pipefail
+            . "$1"
+            for fn in $2; do
+                declare -F "$fn" >/dev/null || { echo "$1 does not provide $fn" >&2; exit 1; }
+            done
+        ' _ "$helpers" "$SHARED_HELPERS"
+    done
+}
+
+@test "wait_for_field shows why kubectl could not read the field" {
+    # A Forbidden read has to reach the caller; swallowed, it looks like a
+    # field that is still empty.
+    stub=$(mktemp -d)
+    printf '#!/bin/sh\necho "Error from server (Forbidden): backupjobs is forbidden" >&2\nexit 1\n' > "$stub/kubectl"
+    chmod +x "$stub/kubectl"
+    err=$(mktemp)
+    if PATH="$stub:$PATH" bash -c '
+        set -euo pipefail
+        . examples/backups/postgres/00-helpers.sh
+        wait_for_field backupjob demo "{.status.phase}" Succeeded tenant-test 0
+    ' 2>"$err"; then
+        echo "wait_for_field succeeded against a kubectl that cannot read" >&2
+        exit 1
+    fi
+    grep -q 'backupjobs is forbidden' "$err" || {
+        echo "wait_for_field dropped kubectl's reason:" >&2
+        cat "$err" >&2
+        exit 1
+    }
+}
+
+@test "wait_for_field stays quiet while the resource does not exist yet" {
+    # The stub answers like kubectl: NotFound on stderr and exit 1, unless the
+    # read asks for --ignore-not-found, which makes an absent resource empty.
+    stub=$(mktemp -d)
+    cat > "$stub/kubectl" <<'EOF'
+#!/bin/sh
+case " $* " in
+*" --ignore-not-found "*) exit 0 ;;
+esac
+echo 'Error from server (NotFound): backupjobs.backups.cozystack.io "demo" not found' >&2
+exit 1
+EOF
+    chmod +x "$stub/kubectl"
+    err=$(mktemp)
+    if PATH="$stub:$PATH" bash -c '
+        set -euo pipefail
+        . examples/backups/postgres/00-helpers.sh
+        wait_for_field backupjob demo "{.status.phase}" Succeeded tenant-test 0
+    ' 2>"$err"; then
+        echo "wait_for_field succeeded against a resource that does not exist" >&2
+        exit 1
+    fi
+    if grep -q 'NotFound' "$err"; then
+        echo "wait_for_field printed kubectl's NotFound for a resource it is waiting on:" >&2
+        cat "$err" >&2
+        exit 1
+    fi
+}
diff --git a/hack/backupstrategy-crd-gate.bats b/hack/backupstrategy-crd-gate.bats
new file mode 100644
index 0000000000..b4ad482a02
--- /dev/null
+++ b/hack/backupstrategy-crd-gate.bats
@@ -0,0 +1,135 @@
+#!/usr/bin/env bats
+# backupstrategy-controller ships its strategy.backups.cozystack.io CRDs as
+# ordinary templates in the same release as the default Strategy CRs. Helm maps
+# every document of a release through the RESTMapper before it applies any, so
+# one Strategy CR whose CRD is not served yet fails the whole release with "no
+# matches for kind" and applies nothing, the CRDs included. That happens on the
+# upgrade that first ships a kind, and on the first render of an external-S3
+# install, where the bucket gate is already open. Every default Strategy must
+# therefore also gate on its CRD being established (the crdEstablished helper).
+#
+# helm-unittest can only pin the templates someone remembered to list. These
+# cases discover the templates from the render itself, so a new
+# strategy-*-default.yaml without the CRD gate fails here without anyone
+# touching a test.
+#
+# Harness compatibility note: CI runs this file under Bats through
+# `make bats-unit-tests`. It also remains compatible with the narrower legacy
+# `hack/cozytest.sh` translator, so it avoids `run`, `$status`, `$output`,
+# `skip`, and setup()/teardown(). Paths stay repo-root-relative for both
+# runners.
+#
+# Run with: bats hack/backupstrategy-crd-gate.bats
+
+load test_helper
+
+CHART=packages/system/backupstrategy-controller
+STRATEGY_API='strategy.backups.cozystack.io/'
+
+# Every Strategy CR in the render under $1, one "<template> <kind>/<name>" line
+# each. --output-dir keeps one file per template, which is what names the
+# offender.
+strategy_crs() {
+  find "$1" -name '*.yaml' | sort | while read -r f; do
+    yq eval-all "select(.apiVersion // \"\" | test(\"^${STRATEGY_API}\")) | .kind + \"/\" + .metadata.name" "$f" \
+      | sed "s#^#$(basename "$f") #"
+  done
+}
+
+@test "no Strategy CR renders while no strategy CRD is established, for any template" {
+  tmp=$(mktemp -d)
+
+  # provisionBucket=false resolves the bucket name from values, so every bucket
+  # gate is open, while the render has no apiserver and every CRD lookup
+  # answers "absent": the state of an upgrade that ships a new kind, and of the
+  # first external-S3 install.
+  helm template t "$CHART" -n cozy-backup-controller \
+    --set backupStorage.provisionBucket=false \
+    --set backupStorage.bucketName=ext-bucket \
+    --output-dir "$tmp/gated" >/dev/null
+  strategy_crs "$tmp/gated" > "$tmp/gated.txt"
+
+  # Positive control: the same render with only the CRD gate opened (the
+  # offline bucketNameOverride short-circuits it) must produce Strategy CRs,
+  # or the assertion above it would hold for an empty render.
+  helm template t "$CHART" -n cozy-backup-controller \
+    --set backupStorage.provisionBucket=false \
+    --set backupStorage.bucketName=ext-bucket \
+    --set backupStorage.bucketNameOverride=ext-bucket \
+    --output-dir "$tmp/open" >/dev/null
+  strategy_crs "$tmp/open" > "$tmp/open.txt"
+
+  if [ -s "$tmp/gated.txt" ]; then
+    echo "Strategy CRs rendered without an established CRD (missing crdEstablished gate):" >&2
+    cat "$tmp/gated.txt" >&2
+    false
+  fi
+  if [ ! -s "$tmp/open.txt" ]; then
+    echo "control render produced no Strategy CR; the check above proves nothing" >&2
+    false
+  fi
+  # A strategy template that renders nothing by default (behind an opt-in
+  # value) would pass the first check without its gate ever being exercised.
+  # Every one of them has to show up in the control render; one that is off by
+  # default needs its switch added to both renders above.
+  missing=""
+  for f in "$CHART"/templates/strategy-*.yaml; do
+    f=$(basename "$f")
+    if ! grep -q "^$f " "$tmp/open.txt"; then
+      missing="$missing $f"
+    fi
+  done
+  if [ -n "$missing" ]; then
+    echo "strategy templates absent from the control render, so unchecked:$missing" >&2
+    false
+  fi
+
+  rm -rf "$tmp"
+}
+
+@test "every rendered Strategy CR gates on the CRD this chart ships for its kind" {
+  tmp=$(mktemp -d)
+
+  # kind -> CRD name, from the CRDs this chart actually renders.
+  for f in "$CHART"/definitions/*.yaml; do
+    yq eval '.spec.names.kind + " " + .metadata.name' "$f"
+  done > "$tmp/crds.txt"
+  if [ ! -s "$tmp/crds.txt" ]; then
+    echo "no CRDs read from $CHART/definitions" >&2
+    false
+  fi
+
+  helm template t "$CHART" -n cozy-backup-controller \
+    --set backupStorage.bucketNameOverride=ext-bucket \
+    --output-dir "$tmp/open" >/dev/null
+  strategy_crs "$tmp/open" > "$tmp/open.txt"
+  if [ ! -s "$tmp/open.txt" ]; then
+    echo "render produced no Strategy CR; nothing was checked" >&2
+    false
+  fi
+
+  # The gate passes on any established CRD it is given, so a gate naming the
+  # wrong CRD (a typo, a copied sibling) leaves the CR out of every live render
+  # while the case above stays green. The name has to be the one serving the
+  # kind.
+  bad=""
+  while read -r tpl obj; do
+    kind=${obj%%/*}
+    crd=$(awk -v k="$kind" '$1 == k { print $2 }' "$tmp/crds.txt")
+    if [ -z "$crd" ]; then
+      bad="$bad
+$tpl: $obj has no CRD in $CHART/definitions"
+      continue
+    fi
+    if ! grep -qF "\"crd\" \"$crd\"" "$CHART/templates/$tpl"; then
+      bad="$bad
+$tpl: $obj does not gate on crdEstablished for $crd"
+    fi
+  done < "$tmp/open.txt"
+  if [ -n "$bad" ]; then
+    echo "Strategy CR templates with a wrong or missing CRD gate:$bad" >&2
+    false
+  fi
+
+  rm -rf "$tmp"
+}
diff --git a/hack/bats-no-exit-trap.bats b/hack/bats-no-exit-trap.bats
new file mode 100644
index 0000000000..3dc303a5c8
--- /dev/null
+++ b/hack/bats-no-exit-trap.bats
@@ -0,0 +1,702 @@
+#!/usr/bin/env bats
+# -----------------------------------------------------------------------------
+# The ban on EXIT-trap cleanup in hack/*.bats, and the debt each file that still
+# breaks it declares for itself.
+#
+# Why the ban. An EXIT trap inside an @test body replaces the one the bats binary
+# installs for its own bookkeeping, and a test that then FAILS prints no TAP line
+# at all. Not `not ok` -- nothing. The run ends with a warning that it executed
+# fewer tests than it planned, so anyone reading the tail of the output, or
+# grepping it for `not ok`, sees a green suite. Not hypothetical:
+# hack/promote-retag_test.bats reported five passes and no failures while six of
+# its eleven tests printed nothing. Clean up at the end of the test body instead.
+# Both runners set -e, so on failure the cleanup is unreachable and the scratch
+# directory survives for inspection, which is what a failed test wants anyway.
+# Fuller reasoning, and the two exceptions -- a self-contained trap inside a
+# Chainsaw `script` step, and one inside an explicit subshell -- are in
+# docs/agents/e2e-testing.md.
+#
+# The debt belongs to the file that owes it, and not to a central inventory: put
+# the count somewhere else and a change that adds a trap has to edit a suite it
+# otherwise never opens, so two changes sharing no line invalidate each other --
+# both green against their own base, both merging cleanly, red only once the
+# second lands.
+#
+# The declaration is one comment line in the file's leading comment block, under
+# the shebang and above the first line of code:
+#
+#     # EXIT-TRAP DEBT: 12
+#
+# There and not merely somewhere, because a .bats file is shell that writes
+# shell: the same line inside a heredoc, a fixture or an expected-output string
+# is data belonging to one test, and honouring it there would let an unrelated
+# fixture excuse a real trap. The leading comment block rather than everything
+# above the first @test, because helper functions and their heredocs sit between
+# the two; a comment block is the region with no interior.
+#
+# It is exact, not a ceiling. Adding a trap fails; removing one fails too, and
+# the fix is to lower the number, or delete the line once it reaches zero. A file
+# with no declaration must hold no traps, which covers the converted files, the
+# files that never had one, and every file added tomorrow.
+#
+# NOT every counted handler is debt. A trap inside an explicit subshell does not
+# replace the bats binary's own, so a test that fails inside `( ... )` still
+# prints its `not ok` -- verified under Bats 1.14.0 against a test-level trap in
+# the same file, where the TAP line vanishes. hack/e2e-test-openapi.bats holds
+# one: it kills a background `kubectl proxy` from a trap inside a subshell, and
+# moving that to the end of the body would leak the process on failure instead of
+# suppressing a report. Its declaration says so, and because the ratchet is
+# exact, REMOVING that trap fails too -- the count protects the construct rather
+# than scheduling it for deletion.
+#
+# The limits are worth stating rather than discovering. The scan is lexical: a
+# signal computed at runtime (`trap cleanup "$sig"`) is invisible, and so is a
+# handler whose quoted action spans physical lines without a backslash, since
+# only backslash continuations are folded. In the other direction the word is
+# counted where no command exists -- inside a heredoc, or in a string a test
+# compares against -- which inflates a file's debt rather than hiding one, and is
+# why the fixture writers below assemble the keyword and the signal from separate
+# arguments. `trap - EXIT`, which DISARMS a handler, scores as an install for the
+# same inflating reason. An exact count catches addition and removal but never
+# SUBSTITUTION: swap the openapi file's subshell trap for a test-level one and
+# the total stays 1, the guard stays green, and that file's "this one is NOT
+# debt" note quietly becomes false.
+#
+# The scan reads .bats and nothing else, so a handler reaching a test body from a
+# sourced .sh is invisible to it. Not theoretical:
+# hack/e2e-chainsaw/_lib/run-kubernetes.sh installs two, each benign for its own
+# reason rather than by design -- cozy_capture_tenant_talos is declared with `(`
+# and so runs in a subshell, and the diagnostics tests DO call it, so flipping
+# its two delimiters to braces reinstates that handler in them with the guard
+# green; run_kubernetes_test is declared with `{`, the shape that would bite, and
+# is benign only because no @test calls it.
+#
+# The marker is anchored at column zero. That is NOT what protects the example
+# above -- the nested `#` does, and relaxing the anchor leaves this file's own
+# audit green. What the anchor buys is that a marker indented inside a function
+# body or a heredoc somewhere else is not read as that file's declaration, and a
+# file that indents its own reports "declares none" and fails loudly rather than
+# passing quietly. Reflowing the example above to column zero would make the
+# guard demand a debt of twelve from a file holding nothing.
+#
+# None of that makes the guard a proof that a file installs no handler; it is a
+# ratchet over a known and common spelling. A suite reporting zero failures still
+# has to have its `1..N` plan reconciled against its `ok` count, which is the
+# check that catches whatever the pattern missed.
+# -----------------------------------------------------------------------------
+
+load test_helper
+
+# The directory to audit. Under the bats binary that is this file's own
+# location; under cozytest.sh, which does not set BATS_TEST_FILENAME, `$0` is
+# the runner itself -- and the answer comes out the same only because the runner
+# lives in the directory it runs files from. The first test below refuses to
+# pass on an empty enumeration, so a wrong answer here fails rather than audits
+# nothing.
+BATS_DIR="$(cd "$(dirname "${BATS_TEST_FILENAME:-$0}")" && pwd)"
+
+# Print a file with comment lines dropped and shell line continuations folded, so
+# the count below matches a COMMAND rather than a physical line. `trap 'rm -rf
+# "$tmp"' \` with `EXIT` on the next line is a working EXIT trap that no
+# single-line pattern sees, and in shell that is where the argument usually sits.
+bnet_fold() {
+  grep -v '^[[:space:]]*#' "$1" \
+    | awk '{ line = line $0
+             if (line ~ /\\$/) { sub(/\\$/, " ", line); next }
+             print line; line = "" }
+           END { if (line != "") print line }'
+}
+
+# What an installed EXIT handler looks like.
+#
+# `0` as well as `EXIT`: POSIX names the exit condition signal 0, and both shells
+# install the identical handler for it, so a pattern that knows only the spelling
+# it has seen tests the spelling and not the construct. `EXIT` anywhere in the
+# signal list rather than only as its last word: `trap ... EXIT HUP` installs the
+# same exit handler plus one more, and anchoring to end-of-line accepts it. A
+# quote around the signal, because `trap cleanup 'EXIT'` installs exactly what
+# `trap cleanup EXIT` installs -- the quote is punctuation, not a different
+# construct. The quote is optional around the SIGNAL only and never after the
+# keyword, so `'trap'` as a shell argument stays unmatched; the fixture writers
+# below depend on that to keep their own test data from reading as real traps.
+#
+# The signal ends at any character that cannot continue an identifier, not at
+# whitespace. `trap ... EXIT; cd "$tmp"` and `(trap ... EXIT)` are both real
+# handlers with punctuation straight after the word, and a terminator demanding
+# whitespace or end-of-line scores them zero -- guard green, no declaration
+# asked for. Excluding the identifier characters is what keeps `EXIT_CODE` from
+# matching, which is the reason the narrower terminator looked right.
+#
+# The signal matches in either case, because the shell accepts it in either
+# case: `trap ... exit` installs the handler `trap ... EXIT` installs, in bash
+# and in dash alike. The folding is spelled into the alternation rather than
+# running the whole pattern case-insensitively, since `trap` is a builtin name
+# and `TRAP ... EXIT` is not a command anyone installs.
+#
+# The keyword needs its left boundary as much as the signal needs its right
+# one, and for the same reason. `bootstrap ` ends in `trap `, so once the
+# terminator accepts punctuation, `talosctl bootstrap -n ... ; do sleep 0.5`
+# scores as a handler on the `0`. That is loud rather than silent, but not
+# harmless: the documented answer to a red guard is to add a debt line, so a
+# file would buy a permanent licence for one real trap in order to quiet a line
+# that has none.
+#
+# Both boundaries are therefore spelled the same way -- any character that
+# cannot be part of an identifier -- and NOT as whitespace. Whitespace on the
+# left drops `tmp=$(mktemp -d);trap ... EXIT` and `(trap ... EXIT; true)`, which
+# are the banned construct behind a semicolon and a paren. The first of those is
+# the sharper lesson: the inventory this replaces carried no left boundary at
+# all and caught it, so a boundary chosen carelessly here would have narrowed
+# coverage while the commit message claimed to widen it.
+BNET_TRAP_RE="(^|[^A-Za-z0-9_])trap[[:space:]].*[[:space:]][\"']?([Ee][Xx][Ii][Tt]|0)[\"']?([^A-Za-z0-9_]|\$)"
+
+# How many EXIT traps a file installs.
+#
+# `|| true` because grep -c exits 1 on a count of zero, which is the answer for
+# most of the tree; without it the caller dies under set -e on the first clean
+# file and never reaches the comparison it exists for.
+bnet_count() {
+  bnet_fold "$1" | grep -cE "$BNET_TRAP_RE" || true
+}
+
+# How many lines install more than one EXIT handler.
+#
+# bnet_count counts matching LINES, so `trap a EXIT; trap b EXIT` counts as one
+# and a handler appended to a line that already carries one arrives without
+# moving the file's total. Deciding where one command ends and the next begins
+# needs a shell parser -- a semicolon inside a handler's own quoted action is not
+# a separator -- and getting that wrong UNDERCOUNTS, which is the one direction a
+# ratchet cannot afford. So refuse the ambiguous line instead of guessing at it.
+# One handler per line is what every file in the tree already does.
+bnet_ambiguous() {
+  bnet_fold "$1" | grep -E "$BNET_TRAP_RE" \
+    | awk '{ if (gsub(/(^|[^A-Za-z0-9_])trap[[:space:]]/, "&") > 1) n++ } END { print n + 0 }'
+}
+
+# The part of a file the declaration may live in: the leading comment block,
+# ending at the first line that is neither a comment nor blank.
+#
+# Traps are counted over the whole file; the declaration is read from the header
+# alone. A .bats file is shell that writes shell -- fixture writers, heredocs of
+# expected output, assertion strings -- and the same line appearing in any of
+# those is data belonging to one test, not a statement about the file. Reading it
+# there would let an unrelated fixture excuse a real trap, and would do it
+# silently, because nothing in that test's own diff looks like a declaration.
+#
+# The leading comment block rather than everything above the first @test: helper
+# functions and their heredocs sit between the two, so stopping at the first
+# @test would still read a line out of one. A comment block cannot contain a
+# heredoc, which makes the narrower rule the one with no interior. It is also
+# where a reviewer opening the file lands, which is the reason the declaration
+# moved out of the central inventory in the first place.
+bnet_header() {
+  awk '/^[[:space:]]*#/ || /^[[:space:]]*$/ { print; next } { exit }' "$1"
+}
+
+# Report every file in directory $1 whose traps and declaration disagree, one
+# line each, and print nothing when they all agree.
+#
+# Through stdout rather than an exit status: cozytest.sh rewrites a function's
+# closing brace into `return 0`, so a status set in here would be discarded
+# before the caller could read it, and the check would pass unconditionally.
+bnet_audit() {
+  find "$1" -name '*.bats' | sort | while IFS= read -r _f; do
+    [ -e "$_f" ] || continue
+    # Path relative to the audited root, not the basename: the scan recurses,
+    # and hack/foo.bats and hack/e2e-apps/foo.bats would otherwise report under
+    # the same name.
+    _b=${_f#"$1"/}
+    _amb=$(bnet_ambiguous "$_f")
+    if [ "$_amb" -gt 0 ]; then
+      echo "$_b: $_amb line(s) name the trap keyword more than once; keep one handler per line, and the word out of trailing comments, so the count is exact"
+      continue
+    fi
+    _n=$(bnet_count "$_f")
+    _decls=$(bnet_header "$_f" | grep -c '^# EXIT-TRAP DEBT:' || true)
+    if [ "$_decls" -gt 1 ]; then
+      echo "$_b: $_decls debt declarations; a file carries one or none"
+      continue
+    fi
+    if [ "$_decls" -eq 0 ]; then
+      if [ "$_n" -ne 0 ]; then
+        echo "$_b: holds $_n EXIT trap(s) and declares none; clean up at the end of the test body instead, or -- if the line is data rather than a command -- split the keyword from the signal the way the fixtures below do"
+      fi
+      continue
+    fi
+    _d=$(bnet_header "$_f" | sed -n 's/^# EXIT-TRAP DEBT:[[:space:]]*\([0-9][0-9]*\).*/\1/p')
+    if [ -z "$_d" ]; then
+      echo "$_b: the debt declaration names no count"
+    elif [ "$_d" -eq 0 ]; then
+      echo "$_b: declares a debt of zero; delete the line instead"
+    elif [ "$_n" -ne "$_d" ]; then
+      echo "$_b: declares $_d EXIT trap(s), holds $_n"
+    fi
+  done
+  return 0
+}
+
+# Fixture writers for the tests below. The word and the signal are assembled from
+# separate arguments on purpose: this file is scanned by the guard it defines, so
+# a fixture spelled out as a literal would be counted as a real trap in it and
+# the guard would demand a declaration covering its own test data.
+#
+# The same constraint reaches the test titles and the failure messages, which are
+# code lines rather than comments and so are read as well. `bnet_add_handler`
+# rather than `bnet_add_trap`, and "a handler naming EXIT" rather than "a trap
+# naming EXIT", because either of the shorter forms puts the word and the signal
+# on one line and is matched. Editing this file means reading its own report
+# afterwards; the first test below is the one that says so.
+bnet_new_fixture() {
+  _dir=$1
+  printf '%s\n' '#!/usr/bin/env bats' > "$_dir/subject.bats"
+  return 0
+}
+
+bnet_add_handler() {
+  printf "%s 'rm -rf \"\$tmp\"' %s\n" 'trap' "${2:-EXIT}" >> "$1/subject.bats"
+  return 0
+}
+
+bnet_add_folded_handler() {
+  printf "%s 'rm -rf \"\$tmp\"' \\\\\n%s\n" 'trap' 'EXIT' >> "$1/subject.bats"
+  return 0
+}
+
+bnet_add_commented_handler() {
+  printf "# %s 'rm -rf \"\$tmp\"' %s\n" 'trap' 'EXIT' >> "$1/subject.bats"
+  return 0
+}
+
+# Put a declaration where a real file puts it: in the leading comment block, just
+# under the shebang, whatever the fixture has appended by now. Rebuilt around
+# line 1 rather than inserted with `sed -i`, whose append syntax differs between
+# the GNU and BSD versions this suite runs under.
+bnet_add_debt() {
+  _f=$1/subject.bats
+  { head -n 1 "$_f"; printf '%s %s\n' '# EXIT-TRAP DEBT:' "$2"; tail -n +2 "$_f"; } > "$_f.new"
+  mv "$_f.new" "$_f"
+  return 0
+}
+
+# Put a declaration past the header, where it must NOT be honoured.
+bnet_append_debt() {
+  printf '%s %s\n' '# EXIT-TRAP DEBT:' "$2" >> "$1/subject.bats"
+  return 0
+}
+
+bnet_add_test_body() {
+  printf '%s\n' '@test "something" {' '  :' '}' >> "$1/subject.bats"
+  return 0
+}
+
+bnet_add_code() {
+  printf '%s\n' 'BATS_DIR=.' >> "$1/subject.bats"
+  return 0
+}
+
+bnet_add_word_containing_trap() {
+  printf "  timeout 60 sh -ec 'until talosctl %s -n 192.0.2.11; do sleep 0.5; done'\n" \
+    'bootstrap' >> "$1/subject.bats"
+  return 0
+}
+
+bnet_add_indented_debt() {
+  printf '  %s %s\n' '# EXIT-TRAP DEBT:' "$2" >> "$1/subject.bats"
+  return 0
+}
+
+bnet_add_command_then_handler() {
+  printf "a=1;%s 'rm -rf \"\$a\"' %s\n" 'trap' 'EXIT' >> "$1/subject.bats"
+  return 0
+}
+
+bnet_add_handler_in_parens() {
+  printf "(%s 'kill 1' %s; true)\n" 'trap' 'EXIT' >> "$1/subject.bats"
+  return 0
+}
+
+bnet_add_handler_then_command() {
+  printf "%s 'rm -rf \"\$a\"' %s; cd /\n" 'trap' 'EXIT' >> "$1/subject.bats"
+  return 0
+}
+
+bnet_add_nested_fixture() {
+  mkdir -p "$1/nested"
+  printf '%s\n' '#!/usr/bin/env bats' > "$1/nested/deep.bats"
+  printf "%s 'rm -rf \"\$a\"' %s\n" 'trap' 'EXIT' >> "$1/nested/deep.bats"
+  return 0
+}
+
+bnet_add_two_handlers_on_one_line() {
+  printf "%s 'rm -f \"\$a\"' %s; %s 'rm -f \"\$b\"' %s\n" \
+    'trap' 'EXIT' 'trap' 'EXIT' >> "$1/subject.bats"
+  return 0
+}
+
+@test "every bats file under hack holds exactly the EXIT traps it declares" {
+  # The whole point of the guard, run against the tree it governs. Everything
+  # below this test exists to prove that this one can fail.
+  # Counted with the enumeration bnet_audit actually walks, not a second one:
+  # a backstop that asks `ls` whether the `find` found anything answers about
+  # the wrong list, and would pass while the audit went vacuously green. That
+  # is the failure this file exists to talk about, so it may as well not commit
+  # it.
+  files=$(find "$BATS_DIR" -name '*.bats' | wc -l)
+  [ "$files" -gt 0 ] || { echo "FAIL: found no .bats files to audit at all"; false; }
+
+  offences=$(bnet_audit "$BATS_DIR")
+  if [ -n "$offences" ]; then
+    echo "FAIL: EXIT-trap cleanup and the declared debt disagree."
+    printf '%s\n' "$offences"
+    echo "Clean up at the end of the test body, or correct the file's own"
+    echo "'# EXIT-TRAP DEBT:' line; see docs/agents/e2e-testing.md."
+    false
+  fi
+}
+
+@test "a trap with no declaration is reported" {
+  tmp=$(mktemp -d)
+  bnet_new_fixture "$tmp"
+  bnet_add_handler "$tmp"
+
+  out=$(bnet_audit "$tmp")
+  case "$out" in
+    *"subject.bats: holds 1 EXIT trap(s) and declares none"*) ;;
+    *) echo "FAIL: an undeclared trap went unreported: $out"; false ;;
+  esac
+  rm -rf "$tmp"
+}
+
+@test "a declaration matching the file is accepted" {
+  tmp=$(mktemp -d)
+  bnet_new_fixture "$tmp"
+  bnet_add_handler "$tmp"
+  bnet_add_handler "$tmp"
+  bnet_add_debt "$tmp" 2
+
+  out=$(bnet_audit "$tmp")
+  [ -z "$out" ] || { echo "FAIL: an accurate declaration was reported: $out"; false; }
+  rm -rf "$tmp"
+}
+
+@test "a declaration below the real count is reported" {
+  tmp=$(mktemp -d)
+  bnet_new_fixture "$tmp"
+  bnet_add_handler "$tmp"
+  bnet_add_handler "$tmp"
+  bnet_add_debt "$tmp" 1
+
+  out=$(bnet_audit "$tmp")
+  case "$out" in
+    *"subject.bats: declares 1 EXIT trap(s), holds 2"*) ;;
+    *) echo "FAIL: a grown trap count went unreported: $out"; false ;;
+  esac
+  rm -rf "$tmp"
+}
+
+@test "a declaration above the real count is reported" {
+  # The ratchet is exact rather than a ceiling. A file that sheds a trap has to
+  # say so, which is what keeps the number from rotting upward and quietly
+  # licensing traps somebody removed years earlier.
+  tmp=$(mktemp -d)
+  bnet_new_fixture "$tmp"
+  bnet_add_handler "$tmp"
+  bnet_add_debt "$tmp" 3
+
+  out=$(bnet_audit "$tmp")
+  case "$out" in
+    *"subject.bats: declares 3 EXIT trap(s), holds 1"*) ;;
+    *) echo "FAIL: a stale declaration went unreported: $out"; false ;;
+  esac
+  rm -rf "$tmp"
+}
+
+@test "a trap folded across a line continuation is counted" {
+  tmp=$(mktemp -d)
+  bnet_new_fixture "$tmp"
+  bnet_add_folded_handler "$tmp"
+
+  out=$(bnet_audit "$tmp")
+  case "$out" in
+    *"holds 1 EXIT trap(s) and declares none"*) ;;
+    *) echo "FAIL: a trap whose signal sits on the next line went uncounted: $out"; false ;;
+  esac
+  rm -rf "$tmp"
+}
+
+@test "a trap installed on signal zero is counted" {
+  tmp=$(mktemp -d)
+  bnet_new_fixture "$tmp"
+  bnet_add_handler "$tmp" 0
+
+  out=$(bnet_audit "$tmp")
+  case "$out" in
+    *"holds 1 EXIT trap(s) and declares none"*) ;;
+    *) echo "FAIL: the POSIX spelling of the exit condition went uncounted: $out"; false ;;
+  esac
+  rm -rf "$tmp"
+}
+
+@test "a handler naming EXIT ahead of another signal is counted" {
+  tmp=$(mktemp -d)
+  bnet_new_fixture "$tmp"
+  bnet_add_handler "$tmp" 'EXIT HUP'
+
+  out=$(bnet_audit "$tmp")
+  case "$out" in
+    *"holds 1 EXIT trap(s) and declares none"*) ;;
+    *) echo "FAIL: a handler listing EXIT before another signal went uncounted: $out"; false ;;
+  esac
+  rm -rf "$tmp"
+}
+
+@test "a trap inside a comment is not counted" {
+  # Every converted file explains the ban in prose next to the cleanup it
+  # replaced. A check that read the explanation as a violation would push people
+  # to delete the explanation, which is the part that stops the next person
+  # reinstating the trap.
+  tmp=$(mktemp -d)
+  bnet_new_fixture "$tmp"
+  bnet_add_commented_handler "$tmp"
+
+  out=$(bnet_audit "$tmp")
+  [ -z "$out" ] || { echo "FAIL: a trap named in a comment was counted: $out"; false; }
+  rm -rf "$tmp"
+}
+
+@test "a declared debt of zero is reported" {
+  # A file that owes nothing says so by carrying no line, not by carrying a line
+  # that says nothing. Otherwise a fully converted file keeps a declaration that
+  # reads as an allowance the next reader has no reason to question.
+  tmp=$(mktemp -d)
+  bnet_new_fixture "$tmp"
+  bnet_add_debt "$tmp" 0
+
+  out=$(bnet_audit "$tmp")
+  case "$out" in
+    *"subject.bats: declares a debt of zero"*) ;;
+    *) echo "FAIL: an empty declaration was accepted: $out"; false ;;
+  esac
+  rm -rf "$tmp"
+}
+
+@test "an indented declaration is not honoured" {
+  # The marker is anchored at column zero. Not, as an earlier version of this
+  # comment claimed, to protect the header's own `# EXIT-TRAP DEBT: 12` example
+  # -- that one is nested behind a second `#` and stays unmatched either way;
+  # relaxing the anchor leaves this file's audit green, which is how the claim
+  # was caught. What the anchor buys is that a marker indented inside a function
+  # body or a heredoc somewhere else is not read as that file's declaration.
+  tmp=$(mktemp -d)
+  bnet_new_fixture "$tmp"
+  bnet_add_indented_debt "$tmp" 1
+  bnet_add_handler "$tmp"
+
+  out=$(bnet_audit "$tmp")
+  case "$out" in
+    *"subject.bats: holds 1 EXIT trap(s) and declares none"*) ;;
+    *) echo "FAIL: an indented declaration was honoured: $out"; false ;;
+  esac
+  rm -rf "$tmp"
+}
+
+@test "a handler preceded by punctuation is counted" {
+  # The keyword's left boundary is any character that cannot be part of an
+  # identifier, not whitespace specifically. `tmp=$(mktemp -d);trap ... EXIT`
+  # and `(trap ... EXIT; true)` both sit straight behind punctuation, and both
+  # are the banned construct. Requiring a space would be a REGRESSION -- the
+  # inventory this replaces had no left boundary at all and caught the first of
+  # them -- so the two boundaries have to be spelled the same way round.
+  tmp=$(mktemp -d)
+  bnet_new_fixture "$tmp"
+  bnet_add_command_then_handler "$tmp"
+  bnet_add_handler_in_parens "$tmp"
+
+  out=$(bnet_audit "$tmp")
+  case "$out" in
+    *"holds 2 EXIT trap(s) and declares none"*) ;;
+    *) echo "FAIL: a handler behind punctuation went uncounted: $out"; false ;;
+  esac
+  rm -rf "$tmp"
+}
+
+@test "a word merely ending in trap is not counted" {
+  # `bootstrap ` contains `trap `, and once the terminator accepts punctuation
+  # the `0` in `sleep 0.5` closes the match: a talosctl bootstrap line scores as
+  # a handler. Loud, but not harmless -- the documented answer to a red guard is
+  # to add a debt line, so a file would take a permanent licence for one real
+  # trap to silence a line that has none. The keyword needs its left boundary
+  # for the same reason the signal needed its right one.
+  tmp=$(mktemp -d)
+  bnet_new_fixture "$tmp"
+  bnet_add_word_containing_trap "$tmp"
+
+  out=$(bnet_audit "$tmp")
+  [ -z "$out" ] || { echo "FAIL: a word ending in trap was counted: $out"; false; }
+  rm -rf "$tmp"
+}
+
+@test "a handler naming the signal in lower case is counted" {
+  # Signal names are case-insensitive to the shell: `trap ... exit` installs the
+  # same handler as `trap ... EXIT`, verified in both bash and dash. Only the
+  # SIGNAL is; `trap` itself is a builtin name and stays lower case, which is
+  # why the pattern folds case on the signal alternation rather than being run
+  # case-insensitively end to end.
+  tmp=$(mktemp -d)
+  bnet_new_fixture "$tmp"
+  bnet_add_handler "$tmp" exit
+
+  out=$(bnet_audit "$tmp")
+  case "$out" in
+    *"holds 1 EXIT trap(s) and declares none"*) ;;
+    *) echo "FAIL: a lower-case signal name went uncounted: $out"; false ;;
+  esac
+  rm -rf "$tmp"
+}
+
+@test "a handler followed by another command on the same line is counted" {
+  # The signal does not have to end the line. `trap ... EXIT; cd "$tmp"` and a
+  # handler wrapped in `( ... )` both put punctuation straight after the word,
+  # and a terminator that insists on whitespace or end-of-line silently scores
+  # them zero -- a real handler, no declaration needed, guard green. Same class
+  # as the quoted signal, one keystroke away.
+  tmp=$(mktemp -d)
+  bnet_new_fixture "$tmp"
+  bnet_add_handler_then_command "$tmp"
+
+  out=$(bnet_audit "$tmp")
+  case "$out" in
+    *"holds 1 EXIT trap(s) and declares none"*) ;;
+    *) echo "FAIL: a handler followed by a semicolon went uncounted: $out"; false ;;
+  esac
+  rm -rf "$tmp"
+}
+
+@test "a bats file in a subdirectory is audited too" {
+  # The ban covers every bats file under hack/. Two pre-Chainsaw suites once
+  # lived one directory down; this synthetic fixture pins recursion after their
+  # removal.
+  tmp=$(mktemp -d)
+  bnet_new_fixture "$tmp"
+  bnet_add_nested_fixture "$tmp"
+
+  out=$(bnet_audit "$tmp")
+  case "$out" in
+    *"nested/deep.bats: holds 1 EXIT trap(s) and declares none"*) ;;
+    *) echo "FAIL: a nested bats file went unaudited or lost its path: $out"; false ;;
+  esac
+  rm -rf "$tmp"
+}
+
+@test "a declaration naming no count is reported" {
+  # The parser takes digits. A declaration whose count is a word, or missing,
+  # parses to nothing, and an unguarded comparison would then treat the file as
+  # if it had said something.
+  tmp=$(mktemp -d)
+  bnet_new_fixture "$tmp"
+  bnet_add_handler "$tmp"
+  bnet_add_debt "$tmp" "twelve"
+
+  out=$(bnet_audit "$tmp")
+  case "$out" in
+    *"subject.bats: the debt declaration names no count"*) ;;
+    *) echo "FAIL: a countless declaration was accepted: $out"; false ;;
+  esac
+  rm -rf "$tmp"
+}
+
+@test "a handler whose signal is quoted is counted" {
+  # `trap cleanup 'EXIT'` installs the handler `trap cleanup EXIT` installs. A
+  # pattern that demands a bare word tests the punctuation rather than the
+  # construct, and the quoted form is one keystroke away from whoever wants the
+  # guard to look past them.
+  tmp=$(mktemp -d)
+  bnet_new_fixture "$tmp"
+  bnet_add_handler "$tmp" "'EXIT'"
+
+  out=$(bnet_audit "$tmp")
+  case "$out" in
+    *"holds 1 EXIT trap(s) and declares none"*) ;;
+    *) echo "FAIL: a quoted signal went uncounted: $out"; false ;;
+  esac
+  rm -rf "$tmp"
+}
+
+@test "two handlers sharing one line are reported rather than counted as one" {
+  # The count is a count of LINES, so a second handler appended to a line that
+  # already carries one arrives free: the file's total does not move and the
+  # declaration keeps matching. Rather than guess at command boundaries -- which
+  # needs a shell parser, and whose failure mode is an UNDERCOUNT, the direction
+  # this guard cannot afford -- refuse the ambiguous line and say so. One handler
+  # per line is what the tree already does.
+  tmp=$(mktemp -d)
+  bnet_new_fixture "$tmp"
+  bnet_add_two_handlers_on_one_line "$tmp"
+
+  out=$(bnet_audit "$tmp")
+  case "$out" in
+    *"subject.bats: 1 line(s) name the trap keyword more than once"*) ;;
+    *) echo "FAIL: a doubled-up line was silently counted once: $out"; false ;;
+  esac
+  rm -rf "$tmp"
+}
+
+@test "a declaration below the leading comment block is not honoured" {
+  # The header ends at the first line of code, not at the first @test. A .bats
+  # file runs shell before its tests -- helper functions, fixture writers, a
+  # heredoc of expected output -- and a line inside any of that is data, not a
+  # statement about the file. Ending the header at the first @test would still
+  # read it.
+  tmp=$(mktemp -d)
+  bnet_new_fixture "$tmp"
+  bnet_add_code "$tmp"
+  bnet_append_debt "$tmp" 1
+  bnet_add_handler "$tmp"
+
+  out=$(bnet_audit "$tmp")
+  case "$out" in
+    *"subject.bats: holds 1 EXIT trap(s) and declares none"*) ;;
+    *) echo "FAIL: a declaration past the first code line excused a trap: $out"; false ;;
+  esac
+  rm -rf "$tmp"
+}
+
+@test "a declaration below the first test is not honoured" {
+  # Only the header counts, so that a line the file merely CONTAINS -- inside a
+  # heredoc, in a fixture a test writes, in an expected-output string -- cannot
+  # excuse a real trap. Such a line is written to be read as data by the test
+  # around it, and its author has no idea it is also being read as a promise
+  # about the file. Narrowing to the header also puts the declaration where a
+  # reviewer opening the file sees it, which is the whole reason it moved out of
+  # the central inventory.
+  tmp=$(mktemp -d)
+  bnet_new_fixture "$tmp"
+  bnet_add_handler "$tmp"
+  bnet_add_test_body "$tmp"
+  bnet_append_debt "$tmp" 1
+
+  out=$(bnet_audit "$tmp")
+  case "$out" in
+    *"subject.bats: holds 1 EXIT trap(s) and declares none"*) ;;
+    *) echo "FAIL: a declaration past the first test excused a trap: $out"; false ;;
+  esac
+  rm -rf "$tmp"
+}
+
+@test "a second declaration in one file is reported" {
+  # Two declarations make the file's own statement ambiguous, and a parser that
+  # silently takes the first would let the losing one drift without ever saying
+  # which number is in force.
+  tmp=$(mktemp -d)
+  bnet_new_fixture "$tmp"
+  bnet_add_handler "$tmp"
+  bnet_add_debt "$tmp" 1
+  bnet_add_debt "$tmp" 9
+
+  out=$(bnet_audit "$tmp")
+  case "$out" in
+    *"subject.bats: 2 debt declarations"*) ;;
+    *) echo "FAIL: contradictory declarations were accepted: $out"; false ;;
+  esac
+  rm -rf "$tmp"
+}
diff --git a/hack/bats-no-negated-assert.bats b/hack/bats-no-negated-assert.bats
new file mode 100644
index 0000000000..3b6862ad5f
--- /dev/null
+++ b/hack/bats-no-negated-assert.bats
@@ -0,0 +1,443 @@
+#!/usr/bin/env bats
+# -----------------------------------------------------------------------------
+# The ban on `!`-negated assertions in .bats files, and why the form that reads
+# most naturally is the one form that cannot fail.
+#
+# POSIX exempts a command whose return value is inverted with `!` from errexit,
+# and neither runner this repository uses recovers what that throws away.
+#
+# hack/cozytest.sh turns each @test into a shell function with `set -e` at the
+# top and `return 0` at the bottom, so a failing `! cmd` neither aborts the
+# function nor survives as its return value: it prints a pass whatever the
+# assertion found. The bats binary looks stricter and mostly is not. Its ERR
+# trap carries the same exemption -- `set -eE; trap ... ERR; ! true` runs the
+# trap not at all and exits zero -- so the only negated assertion it reports is
+# one standing LAST in the body, where the inverted status becomes the test
+# function's own. Move an `echo` below it and bats passes the test too.
+#
+# So this is not a disagreement between runners to be settled by picking the
+# stricter one. Measured on a fixture where each assertion must fail: bare
+# `! true`, a negated pipeline, a negated `[ ... ]`, one inside a `for` body,
+# and one following `;`, `&&` or `||` all pass under both, and the tail-position
+# case is the single shape the two answer differently.
+#
+# The damage is concentrated rather than spread, because `!` is the natural way
+# to spell "this must NOT appear", and an absence is precisely what no other
+# assertion in the test covers. A suite can hold a full set of them and be, on
+# that half of its contract, a suite that passes on any input.
+#
+# Write the absence so that it fails:
+#
+#     if grep -q FORBIDDEN "$log"; then echo "FAIL: <what must not be there>"; false; fi
+#
+# The `false` is what the runner sees. This is already the form used wherever
+# the trap was noticed one file at a time; the rule only makes it universal.
+#
+# No exception for `! cmd || { echo ...; exit 1; }`, which does work -- the `||`
+# reads the inverted status and the `exit` leaves the test. Admitting it means
+# the scan has to parse the tail of every statement to tell a guarded negation
+# from a bare one, over a set of working spellings that is open-ended, and a
+# scan that guesses wrong there is green on a real one. One rule, no tail.
+#
+# `if !`, `elif !`, `while !` and `until !` are untouched: errexit is not what
+# decides a condition, and inverting one is ordinary shell. `[ ! -f x ]` and
+# `!=` are not negated commands at all.
+#
+# The scan is lexical, with the limits that implies. A statement assembled at
+# runtime is invisible to it. In the other direction the form is counted where
+# no command exists -- inside a heredoc, or in a string a test compares against
+# -- which reports a file that holds nothing rather than passing one that does,
+# and is why the fixture writers below build the token from a separate argument.
+#
+# It knows the statement boundaries written into it and no others, so the test
+# below names the shapes it was measured against rather than claiming the
+# language. Those are the POSIX separators -- `;` `&` `&&` `||` `{` `(` the `)`
+# closing a case pattern, and the words `then` `do` `else`; a `time` or
+# `time -p` in front of the `!` is read through. Five known over-counts come
+# with that and are left alone, all erring loud: `( ! cmd )` does propagate its
+# status and is reported anyway; a `!` after a `&` used as a redirection rather
+# than a separator would be too, if one ever began a statement;
+# `x=$(true || ! false)` is reported although the `||` reads the inverted status
+# and the assignment takes it; a condition continued by a trailing `&&` rather
+# than a backslash -- `if foo &&` on one line, `! bar; then` on the next -- is
+# reported because the strip only recognises a condition it can see the end
+# of; and `time ! cmd` is reported although under cozytest on a dash /bin/sh,
+# which has no `time` keyword, it runs an external `time` that cannot find a
+# command named `!` and fails. Under bats, and under cozytest wherever /bin/sh
+# is bash, it is vacuous. Each costs a rewrite; the opposite error costs a
+# silent pass, which is why the list grows by naming rather than by narrowing.
+#
+# The verdict travels on stdout and not in an exit status. cozytest.sh appends
+# `return 0` before every closing brace at column zero, plain helper functions
+# included, so a helper whose answer is the status of its LAST command returns
+# success under this runner and its real status under bats. An explicit `return`
+# from inside the body still carries -- it runs first -- which is what makes the
+# masked case easy to write by accident and hard to see. A guard whose result
+# fell out of its final command would be green unconditionally: the same defect
+# it exists to ban, one level up.
+# -----------------------------------------------------------------------------
+
+load test_helper
+
+# The directory to audit. Under the bats binary this file's own location; under
+# cozytest.sh, which sets no BATS_TEST_FILENAME, `$0` is the runner, and the
+# answer agrees only because the runner lives beside the files it runs. The
+# first test refuses to pass on an enumeration that missed this file, so a wrong
+# answer here fails instead of auditing nothing.
+BATS_DIR="$(cd "$(dirname "${BATS_TEST_FILENAME:-$0}")" && pwd)"
+RUNNER="$BATS_DIR/cozytest.sh"
+
+# Report each statement in file $1 whose first token is `!`, one line each,
+# naming the physical line the statement STARTS on. Whole-line comments are
+# blanked rather than dropped so the numbering survives them, and backslash
+# continuations are folded so a statement split across lines is read as one.
+cnb_scan() {
+  awk -v name="${2:-$1}" '
+    {
+      raw = $0
+      if (raw ~ /^[[:space:]]*#/) raw = ""
+      if (buf == "") start = FNR
+      buf = buf raw
+      if (buf ~ /\\$/) { sub(/\\$/, " ", buf); next }
+      line = buf; buf = ""
+
+      if (line ~ /^[[:space:]]*(if|elif|while|until)[[:space:]]/) {
+        if (match(line, /;[[:space:]]*(then|do)([[:space:]]|$)/))
+          line = substr(line, RSTART + RLENGTH)
+        else
+          next
+      }
+
+      # A keyword may be preceded only by whitespace or by `;` -- every other
+      # separator in front of `then`, `do` or `else` is a shell syntax error,
+      # checked with `sh -n` rather than recalled -- so those two characters are
+      # the complete set and the class is closed rather than patched. The leading
+      # space covers a keyword in column zero, which has nothing in front of it
+      # at all. Miss either and the negation after the keyword never opens a
+      # segment, which is silent, and this scan errs loud or not at all. No
+      # apostrophes in here: the awk program is single-quoted.
+      line = " " line
+      n = split(line, seg, /(&&|&|\|\||;|\{|\(|\)|[[:space:];](then|do|else)[[:space:]])/)
+      for (i = 1; i <= n; i++) {
+        # In bash `time` and `time -p` prefix a pipeline and leave its `!`
+        # exempt, and unlike the keywords they may follow any separator, so
+        # they are peeled off the segment rather than split on. A `!` ending
+        # its segment is one the split cut from a `(` that followed it with no
+        # space: `!(cmd)`.
+        s = seg[i]
+        sub(/^[[:space:]]*time([[:space:]]+-p)?[[:space:]]+/, "", s)
+        if (s ~ /^[[:space:]]*!([[:space:]]|$)/) {
+          sub(/^[[:space:]]*/, "", s)
+          print name ":" start ": " s
+          break
+        }
+      }
+    }
+  ' "$1"
+}
+
+# Every offending statement under directory $1, and nothing when there are none.
+cnb_audit() {
+  find "$1" -name '*.bats' | sort | while IFS= read -r _f; do
+    [ -e "$_f" ] || continue
+    cnb_scan "$_f" "${_f#"$1"/}"
+  done
+  return 0
+}
+
+# Fixture writers. The token arrives as a separate argument on purpose: this
+# file is read by the scan it defines, and a fixture spelled out literally would
+# be reported as an offence in the guard's own source.
+cnb_new_fixture() {
+  printf '%s\n' '#!/usr/bin/env bats' > "$1/subject.bats"
+  return 0
+}
+
+cnb_append() {
+  _dir=$1; shift
+  printf "$@" >> "$_dir/subject.bats"
+  return 0
+}
+
+@test "the audit resolves its root to this file's own directory" {
+  files="$(find "$BATS_DIR" -name '*.bats' | wc -l)"
+  [ "$files" -gt 1 ]
+  # Reaching SOME file is not the claim -- reaching this one is, because a root
+  # resolved from the runner instead of the suite would still enumerate a
+  # plausible directory and report an audit of somewhere else as clean.
+  find "$BATS_DIR" -name '*.bats' | grep -qF 'bats-no-negated-assert.bats'
+}
+
+@test "the audit recurses, and reports a subdirectory by its relative path" {
+  # Through cnb_audit and not through a second copy of its find expression. An
+  # assertion that retypes the command it means to check holds a copy: the
+  # function can lose its recursion with the copy still passing, and then the
+  # audit returns empty for a subdirectory and empty reads as a clean tree --
+  # this file's own subject, one level up.
+  #
+  # Recursion is load-bearing for a suite in a subdirectory: BATS_UNIT_FILES is
+  # a non-recursive wildcard, so `make unit-tests` never runs one there, and
+  # without recursion this audit would not read it either. hack/e2e-apps/ held
+  # such suites until they moved to Chainsaw. The proof is a fixture rather than
+  # a real directory, because none holds a suite today -- pinning against one
+  # would turn this test red for a reason that has nothing to do with recursion.
+  dir="$(mktemp -d)"
+  mkdir -p "$dir/sub"
+  cnb_new_fixture "$dir/sub"
+  cnb_append "$dir/sub" '@test "a" {\n'
+  cnb_append "$dir/sub" '  %s true\n' '!'
+  cnb_append "$dir/sub" '}\n'
+
+  report="$(cnb_audit "$dir")"
+  # One report line and no more. An EMPTY report also satisfies this, because
+  # `printf '%s\n' ""` emits a newline -- the grep below is what rejects it,
+  # and that division of labour is the same in the continuation test.
+  [ "$(printf '%s\n' "$report" | wc -l)" -eq 1 ]
+  # Relative to the audited root, so hack/foo.bats and hack/e2e-apps/foo.bats
+  # cannot report under the same name.
+  printf '%s\n' "$report" | grep -q '^sub/subject.bats:3: '
+  rm -rf "$dir"
+}
+
+@test "no suite states an absence in a form that cannot fail" {
+  report="$(cnb_audit "$BATS_DIR")"
+  if [ -n "$report" ]; then
+    echo 'A statement whose first token is `!` has its status exempted from errexit,'
+    echo 'so the assertion below passes whatever it finds. Spell the absence as:'
+    echo '    if cmd; then echo "FAIL: <what must not have happened>"; false; fi'
+    printf '%s\n' "$report"
+    false
+  fi
+}
+
+@test "the scan reports a negated statement in every shape measured here" {
+  # Every shape below was run under the runner and reported a pass while its
+  # assertion must have failed, so each is a live hole the scan has to close;
+  # the `time` shapes at the end are that on bash and not on dash.
+  # The name claims what this fixture holds and nothing wider: a lexical scan
+  # over shell cannot promise it has enumerated the language.
+  dir="$(mktemp -d)"
+  cnb_new_fixture "$dir"
+  cnb_append "$dir" '@test "a" {\n'
+  cnb_append "$dir" '  %s true\n' '!'
+  cnb_append "$dir" '  %s printf x | grep -q x\n' '!'
+  cnb_append "$dir" '  echo one; %s true\n' '!'
+  cnb_append "$dir" '  true && %s true\n' '!'
+  cnb_append "$dir" '  false || %s true\n' '!'
+  cnb_append "$dir" '  for f in a b; do\n    %s true\n  done\n' '!'
+  cnb_append "$dir" '  if true; then %s true; fi\n' '!'
+  # A case branch: the `)` closing the pattern is a statement boundary like any
+  # other, and `case` already appears inside test bodies and stubs in this tree.
+  cnb_append "$dir" '  case "$v" in\n    yes) %s true ;;\n  esac\n' '!'
+  # After a background `&`, which separates statements exactly as `;` does.
+  cnb_append "$dir" '  true & %s true\n' '!'
+  # A brace group takes the exemption with it: the group reports the inverted
+  # status as its own, so the whole thing passes. A subshell does not, which is
+  # why only this one is here.
+  cnb_append "$dir" '  { %s true; }\n' '!'
+  # The same keywords at column zero. Every other occurrence of `then`, `do` and
+  # `else` in a test body is indented, which is what made the missing space
+  # before them invisible: without it the keyword opens the segment and the
+  # negation after it is never a segment's first token. All three are vacuous
+  # under the runner, so the miss was silent -- the direction this file says it
+  # will not err in.
+  cnb_append "$dir" '  for f in a b\n'
+  cnb_append "$dir" 'do %s true\n' '!'
+  cnb_append "$dir" '  done\n'
+  cnb_append "$dir" '  if false\n'
+  cnb_append "$dir" 'then %s true\n' '!'
+  cnb_append "$dir" 'else %s true\n' '!'
+  cnb_append "$dir" '  fi\n'
+  # The same keywords with no space after the `;`. Valid shell, vacuous under
+  # the runner, and missed until the separator class admitted `;` in front of a
+  # keyword as well as whitespace.
+  cnb_append "$dir" '  for f in a;do %s true;done\n' '!'
+  cnb_append "$dir" '  if x; then :;else %s true; fi\n' '!'
+  # A negation with no space before its subshell, and one behind `time`, with
+  # and without `-p` and with no space after the separator in front of it. The
+  # first is vacuous under both runners on every /bin/sh measured, dash and
+  # bash; the `time` ones under bats and under cozytest where /bin/sh is bash,
+  # and on dash they are the over-count the header names. All three were missed
+  # while the scan wanted whitespace after the `!` and read `time` as the
+  # statement's first token.
+  cnb_append "$dir" '  %s(true)\n' '!'
+  cnb_append "$dir" '  time %s true\n' '!'
+  cnb_append "$dir" '  true &&time -p %s true\n' '!'
+  cnb_append "$dir" '}\n'
+
+  found="$(cnb_scan "$dir/subject.bats" | wc -l)"
+  [ "$found" -eq 18 ]
+  rm -rf "$dir"
+}
+
+@test "the scan reports a subshell negation, and that stays an over-count" {
+  # `( ! cmd )` is not a hole. The subshell takes the exemption and hands the
+  # inverted status up as its own, and the caller is not exempt, so the
+  # assertion does fail. The scan reports it regardless, because admitting the
+  # shape means telling a guarded negation from a bare one by reading what
+  # follows, over a set of working spellings with no end to it.
+  #
+  # This and `!(true)` in the shapes test are the two fixtures that reach `(`
+  # in the separator class. Every other shape carries a second boundary on its
+  # own line and would still be reported with `(` dropped from that class.
+  dir="$(mktemp -d)"
+  cnb_new_fixture "$dir"
+  cnb_append "$dir" '@test "a" {\n'
+  cnb_append "$dir" '  ( %s true )\n' '!'
+  cnb_append "$dir" '}\n'
+
+  report="$(cnb_scan "$dir/subject.bats")"
+  [ "$(printf '%s\n' "$report" | wc -l)" -eq 1 ]
+  printf '%s\n' "$report" | grep -q ':3: '
+  rm -rf "$dir"
+
+  # The other half of the word "over-count": the shape has to actually work,
+  # or what is pinned above is a second hole wearing the name of a false
+  # positive. Assembled rather than written out, for the reason the header
+  # gives.
+  prog="$(printf 'set -e; ( %s true ); echo REACHED' '!')"
+  [ -z "$(sh -c "$prog" 2>&1)" ]
+}
+
+@test "the scan folds a continuation and names the line the statement opens on" {
+  dir="$(mktemp -d)"
+  cnb_new_fixture "$dir"
+  cnb_append "$dir" '@test "a" {\n'
+  # The negation has to land on the CONTINUATION line, not the line that opens
+  # it. Put it on the opening line and the report says line 3 whether the fold
+  # ran or not, so the assertion below passes with the folding deleted -- which
+  # is the shape this whole suite exists to ban. Here folded reports 3 and
+  # unfolded reports 4, so removing the fold turns the test red.
+  #
+  # `\\\n` and not `\\\\\n`: printf collapses each pair, so the doubled form
+  # emits two backslashes -- an escaped literal, which is an ordinary argument
+  # rather than a continuation. Check the bytes with `od -c` when editing this.
+  cnb_append "$dir" '  echo start \\\n'
+  cnb_append "$dir" '    ; %s grep -q x "$file"\n' '!'
+  cnb_append "$dir" '}\n'
+
+  report="$(cnb_scan "$dir/subject.bats")"
+  # One report line and no more. An empty report satisfies this too -- one
+  # newline out of printf -- so the grep below is what rules empty out, not
+  # this line.
+  [ "$(printf '%s\n' "$report" | wc -l)" -eq 1 ]
+  printf '%s\n' "$report" | grep -q ':3: '
+  rm -rf "$dir"
+}
+
+@test "the scan leaves an inverted condition and an inverted test operator alone" {
+  dir="$(mktemp -d)"
+  cnb_new_fixture "$dir"
+  cnb_append "$dir" '@test "a" {\n'
+  cnb_append "$dir" '  if %s command -v act >/dev/null; then echo none; fi\n' '!'
+  cnb_append "$dir" '  if %s foo || %s bar; then echo none; fi\n' '!' '!'
+  cnb_append "$dir" '  while %s ready; do sleep 1; done\n' '!'
+  cnb_append "$dir" '  until %s done_yet; do sleep 1; done\n' '!'
+  # The two lines above cannot tell whether `while` and `until` are in the
+  # condition-strip: splitting on `;` and ` do ` already leaves `!` in the
+  # middle of segment 1, so they report nothing either way. These two put the
+  # negation where only the strip can save it -- drop either keyword from the
+  # alternation and the line becomes a report.
+  cnb_append "$dir" '  while foo && %s bar; do sleep 1; done\n' '!'
+  cnb_append "$dir" '  until foo && %s bar; do sleep 1; done\n' '!'
+  cnb_append "$dir" '  [ %s -f /nowhere ]\n' '!'
+  cnb_append "$dir" '  [ "$a" %s= "$b" ]\n' '!'
+  cnb_append "$dir" '  # a comment naming %s grep -q x file\n' '!'
+  cnb_append "$dir" '}\n'
+
+  found="$(cnb_scan "$dir/subject.bats" | wc -l)"
+  [ "$found" -eq 0 ]
+  # An empty report is what a scan that reads nothing returns too, so the same
+  # fixture has to produce one when the offence is present.
+  cnb_append "$dir" '@test "b" {\n'
+  cnb_append "$dir" '  %s true\n' '!'
+  cnb_append "$dir" '}\n'
+  found="$(cnb_scan "$dir/subject.bats" | wc -l)"
+  [ "$found" -eq 1 ]
+  rm -rf "$dir"
+}
+
+@test "a negated assertion still passes under this runner whatever it finds" {
+  # The premise the ban rests on, pinned rather than described: the day the
+  # runner starts propagating an inverted status, this test fails and the rule
+  # above can be reconsidered instead of outliving its reason.
+  dir="$(mktemp -d)"
+  {
+    printf '@test "an assertion that must not hold" {\n'
+    printf '  %s true\n' '!'
+    printf '}\n'
+  } > "$dir/pin.bats"
+
+  rc=0
+  "$RUNNER" "$dir/pin.bats" > "$dir/out" 2>&1 || rc=$?
+  # Both halves: the runner reported success, AND a test actually ran to produce
+  # it. Without the second, a fixture the runner refused to parse would satisfy
+  # the first and pin nothing.
+  [ "$rc" -eq 0 ]
+  grep -qF 'Test OK' "$dir/out"
+  rm -rf "$dir"
+}
+
+@test "the form this ban prescribes does fail, under both runners" {
+  # The mirror of the test above, and the half more worth pinning. Every absence
+  # converted in this tree rests on `false` inside a `then` body reaching the
+  # runner as a failure. If that ever stopped -- a stray `set +e`, a change to
+  # the `return 0` insertion in cozytest.sh -- the test above would still pass,
+  # because a negated assertion would still be vacuous, while every converted
+  # absence went silently green. The ban would then be prescribing a form that
+  # checks nothing, which is the defect it exists to remove.
+  #
+  # Under both runners because their disagreement is the reason this class
+  # exists at all: a remedy that only propagates under one of them is not a
+  # remedy for the suites CI runs.
+  dir="$(mktemp -d)"
+  {
+    printf '@test "an assertion that must fail" {\n'
+    printf '  if true; then echo "FAIL: the prescribed form fired"; false; fi\n'
+    printf '  echo PAST-THE-FORM\n'
+    printf '}\n'
+  } > "$dir/pin.bats"
+
+  rc=0
+  "$RUNNER" "$dir/pin.bats" > "$dir/out" 2>&1 || rc=$?
+  [ "$rc" -ne 0 ]
+  # It has to fail AT the form. A run that died earlier -- an unparsable
+  # fixture, a missing runner -- would satisfy the status check and pin nothing.
+  grep -qF 'the prescribed form fired' "$dir/out"
+  if grep -qF 'PAST-THE-FORM' "$dir/out"; then
+    echo "FAIL: execution continued past the prescribed form"
+    false
+  fi
+
+  if command -v bats >/dev/null 2>&1; then
+    rc=0
+    bats "$dir/pin.bats" > "$dir/bats-out" 2>&1 || rc=$?
+    [ "$rc" -ne 0 ]
+    grep -qE '^not ok ' "$dir/bats-out"
+  else
+    echo "bats binary absent — the prescribed form NOT verified under it in this run." >&2
+  fi
+  rm -rf "$dir"
+}
+
+@test "neither errexit nor the ERR trap sees an inverted status" {
+  # The half of the premise that says switching runners does not lift the ban.
+  # Pinned at the shell rather than through the bats binary, because this is
+  # where the exemption lives -- bats builds its reporting on exactly these two
+  # mechanisms, so a suite host without bats installed can still hold the claim
+  # honest. A shell without `bash` cannot run bats either, which is the only
+  # case this skips.
+  # `skip` is a bats builtin that cozytest.sh does not provide, so the note goes
+  # out the way the other suites here report an unmet dependency.
+  if ! command -v bash >/dev/null 2>&1; then
+    echo "bash unavailable — the errexit and ERR-trap exemptions NOT verified in this run." >&2
+    return 0
+  fi
+  # Assembled rather than written out, for the reason the header gives: spelled
+  # literally, this string is a statement the scan reports against its own file.
+  prog="$(printf 'set -eE; trap "echo TRAP-RAN" ERR; %s true; echo REACHED' '!')"
+  out="$(bash -c "$prog" 2>&1)"
+  # Reached the line below the failing assertion, and the trap never fired:
+  # either alone would leave the other half unpinned.
+  [ "$out" = "REACHED" ]
+}
diff --git a/hack/bats-runner-contract.bats b/hack/bats-runner-contract.bats
new file mode 100644
index 0000000000..a50ed0ba5a
--- /dev/null
+++ b/hack/bats-runner-contract.bats
@@ -0,0 +1,141 @@
+#!/usr/bin/env bats
+# Keep local discovery, CI provisioning and contributor instructions aligned:
+# losing any one can leave a passing lane that other environments never run.
+
+load test_helper
+
+BRC_DIR="$(cd "$(dirname "${BATS_TEST_FILENAME:-$0}")" && pwd)"
+BRC_REPO_ROOT="$(cd "$BRC_DIR/.." && pwd)"
+BRC_WORKFLOW="$BRC_REPO_ROOT/.github/workflows/pull-requests.yaml"
+BRC_PRECOMMIT_WORKFLOW="$BRC_REPO_ROOT/.github/workflows/pre-commit.yml"
+
+brc_toolchain_script() {
+  yq -r '.jobs.checks.steps[] | select(.name == "Set up test toolchain") | .run' "$BRC_WORKFLOW"
+  return 0
+}
+
+brc_write_parallel_stub() {
+  printf '%s\n' '#!/bin/sh' "printf '%s\\n' '$2'" > "$1/parallel"
+  chmod +x "$1/parallel"
+  return 0
+}
+
+@test "CI installs the exact commit behind the Bats release tag" {
+  version=$(yq -r '.jobs.checks.steps[] | select(.name == "Set up test toolchain") | .env.BATS_VERSION' "$BRC_WORKFLOW")
+  commit=$(yq -r '.jobs.checks.steps[] | select(.name == "Set up test toolchain") | .env.BATS_COMMIT' "$BRC_WORKFLOW")
+  [ "$version" = "1.14.0" ]
+  [ "$commit" = "eb7f42f8d608ac693d7a4b67474f6714ea68cfc5" ]
+
+  script=$(brc_toolchain_script)
+  printf '%s\n' "$script" | grep -Fq 'git clone --quiet --depth=1 --branch "v$BATS_VERSION"'
+  printf '%s\n' "$script" | grep -Fq 'test "$(git -C "$bats_source" rev-parse HEAD)" = "$BATS_COMMIT"'
+  gates=$(printf '%s\n' "$script" | grep -Fc 'grep -qx "Bats $BATS_VERSION"' || :)
+  [ "$gates" -eq 2 ]
+  if printf '%s\n' "$script" | grep -q '/archive/'; then
+    echo "FAIL: the Bats installer pins a byte-unstable generated archive"
+    false
+  fi
+}
+
+@test "the job-count fallback accepts GNU Parallel only" {
+  tmp=$(mktemp -d)
+  mkdir -p "$tmp/bin"
+  printf '%s\n' '#!/bin/sh' 'printf "7\\n"' > "$tmp/bin/nproc"
+  chmod +x "$tmp/bin/nproc"
+
+  printf '%s\n' '#!/bin/sh' 'exit 127' > "$tmp/bin/parallel"
+  chmod +x "$tmp/bin/parallel"
+  # Make exports command-line overrides; the probe must see its own default.
+  jobs=$(cd "$BRC_REPO_ROOT" && env -u BATS_JOBS MAKEFLAGS= MAKELEVEL= PATH="$tmp/bin:$PATH" make --no-print-directory -s print-bats-jobs)
+  [ "$jobs" = "1" ]
+
+  brc_write_parallel_stub "$tmp/bin" "parallel from moreutils"
+  jobs=$(cd "$BRC_REPO_ROOT" && env -u BATS_JOBS MAKEFLAGS= MAKELEVEL= PATH="$tmp/bin:$PATH" make --no-print-directory -s print-bats-jobs)
+  [ "$jobs" = "1" ]
+
+  brc_write_parallel_stub "$tmp/bin" "GNU parallel 20260722"
+  jobs=$(cd "$BRC_REPO_ROOT" && env -u BATS_JOBS MAKEFLAGS= MAKELEVEL= PATH="$tmp/bin:$PATH" make --no-print-directory -s print-bats-jobs)
+  [ "$jobs" = "7" ]
+  rm -rf "$tmp"
+}
+
+@test "the complete local hook is manual and documented" {
+  hook_entry=$(yq -r '.repos[].hooks[] | select(.id == "bats-unit-tests") | .entry' "$BRC_REPO_ROOT/.pre-commit-config.yaml")
+  hook_stages=$(yq -r '.repos[].hooks[] | select(.id == "bats-unit-tests") | .stages | join(",")' "$BRC_REPO_ROOT/.pre-commit-config.yaml")
+  hook_passes_files=$(yq -r '.repos[].hooks[] | select(.id == "bats-unit-tests") | .pass_filenames' "$BRC_REPO_ROOT/.pre-commit-config.yaml")
+  [ "$hook_entry" = 'make bats-unit-tests bats-posix-compat-tests' ]
+  [ "$hook_stages" = 'manual' ]
+  [ "$hook_passes_files" = 'false' ]
+  grep -Fq 'bats-core 1.5 or newer' "$BRC_REPO_ROOT/docs/agents/overview.md"
+  grep -Fq 'pre-commit run bats-unit-tests --hook-stage manual --all-files' "$BRC_REPO_ROOT/docs/agents/overview.md"
+}
+
+@test "pull-request CI keeps the required Bats lane unconditional" {
+  lint_skip=$(yq -r '.jobs.pre-commit.steps[] | select(.name == "Run pre-commit hooks") | .env.SKIP // ""' "$BRC_PRECOMMIT_WORKFLOW")
+  code_command=$(yq -r '.jobs.checks.steps[] | select(.name == "Run unit and controller tests") | .run' "$BRC_WORKFLOW")
+  docs_command=$(yq -r '.jobs.checks.steps[] | select(.name == "Run Bats unit tests for docs-only changes") | .run' "$BRC_WORKFLOW")
+  [ -z "$lint_skip" ]
+  [ "$code_command" = 'make unit-tests test-controllers test-controllers-envtest -j4 -k --output-sync=target' ]
+  [ "$docs_command" = 'make bats-unit-tests' ]
+}
+
+@test "the POSIX compatibility lane retains reviewed and sourced shell-facing files" {
+  compat_files=$(cd "$BRC_REPO_ROOT" && MAKEFLAGS= MAKELEVEL= make --no-print-directory -s print-bats-posix-compat-files)
+  unit_files=$(cd "$BRC_REPO_ROOT" && MAKEFLAGS= MAKELEVEL= make --no-print-directory -s print-bats-unit-files)
+  sourced_shell_tests=$(cd "$BRC_REPO_ROOT" && grep -El '^[[:space:]]*(\.|source)[[:space:]]+.*\.sh' $unit_files)
+  [ -n "$sourced_shell_tests" ]
+  for file in \
+    $sourced_shell_tests \
+    hack/capture-dataplane.bats \
+    hack/capture-previous-logs.bats \
+    hack/cilium-leak-healer_test.bats \
+    hack/container-lane-capacity_test.bats \
+    hack/cozyreport-talos.bats \
+    hack/cozyreport.bats \
+    hack/cozystack-version-stamp.bats \
+    hack/nightly-mirror_test.bats \
+    hack/pod-label-census_test.bats \
+    hack/promote-rewrite-tags_test.bats \
+    hack/runner-identity.bats \
+    hack/seaweedfs-naming-audit.bats; do
+    printf '%s\n' "$compat_files" | grep -Fxq "$file"
+  done
+}
+
+@test "compatibility discovery includes new shell dependencies and excludes unrelated files" {
+  tmp=$(mktemp -d)
+  fixture="$tmp/non-chainsaw-helper.bats"
+  unrelated="$tmp/no-shell-helper.bats"
+  printf '%s\n' '#!/usr/bin/env bats' '. hack/lib/image-refs.sh' > "$fixture"
+  printf '%s\n' '#!/usr/bin/env bats' 'load test_helper' > "$unrelated"
+  make_status=0
+  compat_files=$(cd "$BRC_REPO_ROOT" && MAKEFLAGS= MAKELEVEL= make --no-print-directory -s "BATS_UNIT_FILES=$fixture $unrelated" print-bats-posix-compat-files) || make_status=$?
+  rm -rf "$tmp"
+
+  [ "$make_status" -eq 0 ]
+  printf '%s\n' "$compat_files" | grep -Fxq "$fixture"
+  if printf '%s\n' "$compat_files" | grep -Fxq "$unrelated"; then
+    echo "FAIL: a unit file with no production shell dependency entered the compatibility lane"
+    false
+  fi
+}
+
+@test "a failed compatibility file does not suppress later files" {
+  tmp=$(mktemp -d)
+  first="$tmp/first.bats"
+  second="$tmp/second.bats"
+  marker="$tmp/later-ran"
+  printf '%s\n' '@test "first fails" {' '  false' '}' > "$first"
+  printf '%s\n' '@test "later runs" {' "  : > '$marker'" '}' > "$second"
+
+  make_status=0
+  output=$(cd "$BRC_REPO_ROOT" && MAKEFLAGS= MAKELEVEL= make --no-print-directory BATS_POSIX_SHELL=dash "BATS_POSIX_COMPAT_FILES=$first $second" bats-posix-compat-tests 2>&1) || make_status=$?
+  marker_present=0
+  [ -e "$marker" ] && marker_present=1
+  rm -rf "$tmp"
+
+  [ "$make_status" -ne 0 ]
+  [ "$marker_present" -eq 1 ]
+  printf '%s\n' "$output" | grep -Fq -- "--- running POSIX compatibility: $first ---"
+  printf '%s\n' "$output" | grep -Fq -- "--- running POSIX compatibility: $second ---"
+}
diff --git a/hack/bats-runner-coverage.bats b/hack/bats-runner-coverage.bats
new file mode 100644
index 0000000000..7f0b768851
--- /dev/null
+++ b/hack/bats-runner-coverage.bats
@@ -0,0 +1,322 @@
+#!/usr/bin/env bats
+
+# The unit glob covers only top-level non-e2e files. Live suites must be named
+# in packages/core/testing/Makefile; the e2e prefix only arms cluster captures.
+# This checks file discovery, not whether CI invokes every make target.
+#
+# Parse the Makefiles without evaluating them: common-envs.mk can fetch git
+# tags at parse time. The model check below pins the discovery and invocation
+# rules so narrowing the real runner cannot silently leave this audit green.
+# A new runner needs an entry here. Park unused suites with .bats.disabled.
+
+load test_helper
+
+REPO_ROOT="$(cd "$(dirname "${BATS_TEST_FILENAME:-$0}")/.." && pwd)"
+E2E_MAKEFILE_REL="packages/core/testing/Makefile"
+
+# A literal tab, for matching make recipe lines. Only tab-led lines are recipes;
+# a `#` inside one is shell, not a make comment, so comments are stripped first
+# and the recipe filter applied second.
+TAB="$(printf '\t')"
+
+# Drop make comment lines, so a commented-out runner can never satisfy the
+# contract. grep exits 1 when it selects nothing, which is legitimate here, and 2
+# on a real error; the rc check turns only the latter into a failure. Under
+# hack/cozytest.sh the status is discarded anyway -- its translator appends
+# `return 0` to every line that is exactly `}`, file-level helpers included -- so
+# every test below asserts its extraction is non-empty before comparing, and a
+# swallowed error surfaces as empty input rather than as a pass.
+brc_code_lines() {
+  local rc=0
+  grep -v '^[[:space:]]*#' || rc=$?
+  [ "$rc" -le 1 ]
+}
+
+# Every .bats file under $1/hack, printed relative to $1.
+#
+# Relative rather than basename: the scan recurses, and hack/foo.bats and
+# hack/e2e-apps/foo.bats must not report under one name. Same reason as
+# bnet_audit in hack/bats-no-exit-trap.bats.
+brc_all_bats() {
+  find "$1/hack" -name '*.bats' | sort | while IFS= read -r _f; do
+    [ -e "$_f" ] || continue
+    echo "${_f#"$1"/}"
+  done
+}
+
+# Runner A's selection: $(filter-out hack/e2e-%.bats,$(wildcard hack/*.bats)).
+brc_unit_reachable() {
+  find "$1/hack" -maxdepth 1 -name '*.bats' ! -name 'e2e-*' | sort | while IFS= read -r _f; do
+    [ -e "$_f" ] || continue
+    echo "${_f#"$1"/}"
+  done
+}
+
+# Runner B's selection: paths named on a recipe line, each immediately after
+# `hack/cozytest.sh`.
+#
+# Keep variable arguments even when the .bats suffix is hidden in the variable.
+# Quotes may belong to the argument or to the surrounding sh -c command.
+brc_named_suites() {
+  brc_code_lines < "$1/$E2E_MAKEFILE_REL" \
+    | grep "^$TAB" \
+    | grep -oE "hack/cozytest\.sh[[:space:]]+[^[:space:];|&]+" \
+    | sed "s|.*cozytest\.sh[[:space:]]*||" \
+    | tr -d "\"'" \
+    | grep -E '\.bats$|\$' \
+    | sort -u
+}
+
+# Named suites whose path is not a literal -- the shape of the deleted
+# `hack/e2e-apps/$*.bats` pattern rule.
+#
+# Reported rather than expanded. A pattern rule nobody invokes is exactly as dead
+# as no rule at all, so treating one as coverage would reintroduce this bug in a
+# new shape. If a pattern runner is ever wanted back, teach this guard the pattern
+# form on purpose.
+brc_unresolvable_suites() {
+  brc_named_suites "$1" | grep '\$' || true
+}
+
+# Report every reachability offence under root $1, one line each, and print
+# nothing when there are none.
+#
+# Through stdout rather than an exit status: hack/cozytest.sh rewrites a
+# function's closing brace into `return 0`, so a status set in here would be
+# discarded before the caller could read it and the check would pass
+# unconditionally. Nothing is accumulated in a variable across a pipeline either,
+# because `find | while read` runs in a subshell under dash.
+brc_audit() {
+  _root=$1
+  _reach=$( { brc_unit_reachable "$_root"; brc_named_suites "$_root" | grep -v '\$' || true; } | sort -u )
+
+  brc_all_bats "$_root" | while IFS= read -r _b; do
+    if printf '%s\n' "$_reach" | grep -Fxq "$_b"; then
+      continue
+    fi
+    echo "$_b: run by nothing. Runner A walks hack/*.bats one level deep and skips hack/e2e-*; $E2E_MAKEFILE_REL names no suite at this path. Add a runner there, port it to hack/e2e-chainsaw/, or park it as *.bats.disabled."
+  done
+
+  # The inverse: a suite the e2e Makefile still names after the file moved or was
+  # renamed. Cheap here, and expensive anywhere else -- a stale name in
+  # test-openapi surfaces ~40 minutes into the e2e job, and in prepare-cluster or
+  # install-cozystack it wedges the whole bootstrap before a single test runs.
+  brc_named_suites "$_root" | grep -v '\$' | while IFS= read -r _n; do
+    if [ ! -f "$_root/$_n" ]; then
+      echo "$E2E_MAKEFILE_REL runs $_n, which does not exist on disk."
+    fi
+  done
+
+  brc_unresolvable_suites "$_root" | while IFS= read -r _u; do
+    echo "$E2E_MAKEFILE_REL names $_u through a make variable; this guard resolves literal paths only. Name the suites literally, or teach the guard the pattern form on purpose."
+  done
+}
+
+@test "every bats file under hack is run by a runner" {
+  # The point of the file, run against the tree it governs. Everything below
+  # exists to prove this test can fail.
+  [ -f "$REPO_ROOT/Makefile" ] || { echo "FAIL: no root Makefile at $REPO_ROOT"; false; }
+  [ -f "$REPO_ROOT/$E2E_MAKEFILE_REL" ] || { echo "FAIL: no $E2E_MAKEFILE_REL"; false; }
+
+  # Counted with the enumeration brc_audit actually walks, not a second one: a
+  # backstop that asks `ls` whether the `find` found anything answers about the
+  # wrong list and would pass while the audit went vacuously green.
+  files=$(brc_all_bats "$REPO_ROOT" | wc -l)
+  [ "$files" -gt 0 ] || { echo "FAIL: found no .bats files to audit at all"; false; }
+
+  # And the other premise: runner B naming nothing is precisely the #2826 shape,
+  # so an empty extraction must fail rather than mark every e2e suite covered by
+  # nothing or -- worse, once runner A is the only source -- reported as fine.
+  named=$(brc_named_suites "$REPO_ROOT" | wc -l)
+  [ "$named" -gt 0 ] || { echo "FAIL: $E2E_MAKEFILE_REL runs no bats suite at all -- either the e2e bootstrap was deleted or this extraction broke"; false; }
+
+  offences=$(brc_audit "$REPO_ROOT")
+  if [ -n "$offences" ]; then
+    echo "FAIL: a bats file under hack/ is reachable by no runner."
+    printf '%s\n' "$offences"
+    echo "Runners: Makefile's bats-unit-tests (hack/*.bats, one level, non-e2e)"
+    echo "and $E2E_MAKEFILE_REL (suites named literally)."
+    echo "See docs/agents/e2e-testing.md."
+    false
+  fi
+}
+
+@test "the modelled runner selection still matches the Makefile" {
+  # The one direction that would otherwise be silent. If someone narrows the
+  # glob, brc_unit_reachable keeps calling files reachable that no longer are,
+  # and the audit above stays green while coverage shrinks. Pinning the modelled
+  # lines verbatim turns that into a failure naming the model rather than forty
+  # phantom orphans.
+  makefile=$(brc_code_lines < "$REPO_ROOT/Makefile")
+  [ -n "$makefile" ] || { echo "FAIL: root Makefile extraction is empty"; false; }
+
+  printf '%s\n' "$makefile" | grep -qF 'BATS_UNIT_FILES := $(filter-out hack/e2e-%.bats,$(wildcard hack/*.bats))' \
+    || { echo "FAIL: bats-unit-tests no longer selects files the way brc_unit_reachable models it (one level, hack/e2e-* excluded). Update the model in hack/bats-runner-coverage.bats in the same change."; false; }
+
+  printf '%s\n' "$makefile" | grep -qF 'bats-unit-tests: bats-unit-files-check' \
+    || { echo "FAIL: bats-unit-tests no longer checks for an empty discovery."; false; }
+
+  printf '%s\n' "$makefile" | grep -qF 'bats -j $(BATS_JOBS) --report-formatter junit -o "$(BATS_REPORT_DIR)" $(BATS_UNIT_FILES)' \
+    || { echo "FAIL: update the Bats invocation model in hack/bats-runner-coverage.bats."; false; }
+
+  printf '%s\n' "$makefile" | grep -qE '^unit-tests:.*bats-unit-tests' \
+    || { echo "FAIL: unit-tests no longer depends on bats-unit-tests, so nothing in CI runs the bats sweep -- this guard included."; false; }
+}
+
+# A miniature root holding just what brc_audit reads: a hack/ tree and an e2e
+# Makefile. Fixtures are written with printf and never a heredoc, because
+# hack/cozytest.sh harvests any line starting with `@test "` into this suite --
+# a heredoc of test source would become phantom tests here.
+brc_fixture() {
+  _d=$(mktemp -d)
+  mkdir -p "$_d/hack" "$_d/packages/core/testing"
+  : > "$_d/$E2E_MAKEFILE_REL"
+  echo "$_d"
+}
+
+brc_add_suite_file() {
+  mkdir -p "$(dirname "$1/$2")"
+  printf '#!/usr/bin/env bats\n' > "$1/$2"
+}
+
+brc_add_runner_line() {
+  printf '%s:\n%sdocker exec "${SANDBOX_NAME}" sh -c '\''cd /workspace && hack/cozytest.sh %s'\''\n' \
+    "$(basename "$2" .bats)" "$TAB" "$2" >> "$1/$E2E_MAKEFILE_REL"
+}
+
+@test "a nested suite with no runner is reported" {
+  d=$(brc_fixture)
+  brc_add_suite_file "$d" hack/e2e-apps/orphan.bats
+  brc_add_runner_line "$d" hack/e2e-install-cozystack.bats
+  brc_add_suite_file "$d" hack/e2e-install-cozystack.bats
+
+  out=$(brc_audit "$d")
+  printf '%s\n' "$out" | grep -q 'hack/e2e-apps/orphan.bats: run by nothing' \
+    || { echo "FAIL: the audit did not report an unreachable nested suite. Got: $out"; rm -rf "$d"; false; }
+  rm -rf "$d"
+}
+
+@test "a nested suite that IS named by a runner is not reported" {
+  # The positive control. Without it every other assertion here is satisfied by
+  # an audit that reports every file it sees.
+  d=$(brc_fixture)
+  brc_add_suite_file "$d" hack/e2e-apps/wired.bats
+  brc_add_runner_line "$d" hack/e2e-apps/wired.bats
+
+  out=$(brc_audit "$d")
+  if printf '%s\n' "$out" | grep -q 'hack/e2e-apps/wired.bats'; then
+    echo "FAIL: a nested suite with a runner line was reported anyway. Got: $out"
+    rm -rf "$d"
+    exit 1
+  fi
+  rm -rf "$d"
+}
+
+@test "a top-level e2e- suite with no runner is reported" {
+  # Runner A filters hack/e2e-* out, so a top-level e2e suite is only reachable
+  # by being named. This class has no coverage at all today.
+  d=$(brc_fixture)
+  brc_add_suite_file "$d" hack/e2e-newthing.bats
+  brc_add_runner_line "$d" hack/e2e-install-cozystack.bats
+  brc_add_suite_file "$d" hack/e2e-install-cozystack.bats
+
+  out=$(brc_audit "$d")
+  printf '%s\n' "$out" | grep -q 'hack/e2e-newthing.bats: run by nothing' \
+    || { echo "FAIL: an unnamed top-level e2e- suite was not reported. Got: $out"; rm -rf "$d"; false; }
+  rm -rf "$d"
+}
+
+@test "a plain top-level suite is reachable through the unit glob" {
+  d=$(brc_fixture)
+  brc_add_suite_file "$d" hack/plain.bats
+  brc_add_runner_line "$d" hack/e2e-install-cozystack.bats
+  brc_add_suite_file "$d" hack/e2e-install-cozystack.bats
+
+  out=$(brc_audit "$d")
+  if printf '%s\n' "$out" | grep -q 'hack/plain.bats'; then
+    echo "FAIL: a plain top-level suite was reported as unreachable. Got: $out"
+    rm -rf "$d"
+    exit 1
+  fi
+  rm -rf "$d"
+}
+
+@test "a parked .bats.disabled suite is invisible rather than an offence" {
+  d=$(brc_fixture)
+  brc_add_suite_file "$d" hack/e2e-apps/parked.bats
+  mv "$d/hack/e2e-apps/parked.bats" "$d/hack/e2e-apps/parked.bats.disabled"
+  brc_add_runner_line "$d" hack/e2e-install-cozystack.bats
+  brc_add_suite_file "$d" hack/e2e-install-cozystack.bats
+
+  out=$(brc_audit "$d")
+  if printf '%s\n' "$out" | grep -q 'parked'; then
+    echo "FAIL: a parked suite was reported. The .disabled suffix is the off-switch. Got: $out"
+    rm -rf "$d"
+    exit 1
+  fi
+  rm -rf "$d"
+}
+
+@test "a commented-out runner line does not satisfy the contract" {
+  d=$(brc_fixture)
+  brc_add_suite_file "$d" hack/e2e-apps/orphan.bats
+  printf '#%sdocker exec x sh -c "cd /workspace && hack/cozytest.sh hack/e2e-apps/orphan.bats"\n' "$TAB" \
+    >> "$d/$E2E_MAKEFILE_REL"
+  brc_add_runner_line "$d" hack/e2e-install-cozystack.bats
+  brc_add_suite_file "$d" hack/e2e-install-cozystack.bats
+
+  out=$(brc_audit "$d")
+  printf '%s\n' "$out" | grep -q 'hack/e2e-apps/orphan.bats: run by nothing' \
+    || { echo "FAIL: a commented-out runner line was accepted as coverage. Got: $out"; rm -rf "$d"; false; }
+  rm -rf "$d"
+}
+
+@test "a named suite with no file on disk is reported" {
+  d=$(brc_fixture)
+  brc_add_runner_line "$d" hack/e2e-renamed-away.bats
+
+  out=$(brc_audit "$d")
+  printf '%s\n' "$out" | grep -q 'runs hack/e2e-renamed-away.bats, which does not exist on disk' \
+    || { echo "FAIL: a stale runner name was not reported. Got: $out"; rm -rf "$d"; false; }
+  rm -rf "$d"
+}
+
+@test "a suite named through a make variable is reported as unresolvable" {
+  d=$(brc_fixture)
+  brc_add_suite_file "$d" hack/e2e-apps/orphan.bats
+  printf 'test-apps-%%:\n%sdocker exec x sh -c "cd /workspace && hack/cozytest.sh hack/e2e-apps/$*.bats"\n' "$TAB" \
+    >> "$d/$E2E_MAKEFILE_REL"
+
+  out=$(brc_audit "$d")
+  printf '%s\n' "$out" | grep -q 'through a make variable' \
+    || { echo "FAIL: a pattern-rule runner was not reported as unresolvable. Got: $out"; rm -rf "$d"; false; }
+  # And it must not be mistaken for coverage of the file it would have matched.
+  printf '%s\n' "$out" | grep -q 'hack/e2e-apps/orphan.bats: run by nothing' \
+    || { echo "FAIL: a pattern-rule runner was treated as covering its would-be match. Got: $out"; rm -rf "$d"; false; }
+  rm -rf "$d"
+}
+
+@test "a make variable without a bats suffix is reported as unresolvable" {
+  d=$(brc_fixture)
+  brc_add_suite_file "$d" hack/e2e-apps/orphan.bats
+  brc_add_runner_line "$d" '$(E2E_SUITE)'
+
+  named=$(brc_named_suites "$d")
+  [ "$named" = '$(E2E_SUITE)' ]
+  out=$(brc_audit "$d")
+  printf '%s\n' "$out" | grep -qF 'names $(E2E_SUITE) through a make variable'
+  printf '%s\n' "$out" | grep -qF 'hack/e2e-apps/orphan.bats: run by nothing'
+  rm -rf "$d"
+}
+
+@test "a quoted literal suite path is reachable" {
+  d=$(brc_fixture)
+  brc_add_suite_file "$d" hack/e2e-apps/wired.bats
+  brc_add_runner_line "$d" '"hack/e2e-apps/wired.bats"'
+
+  named=$(brc_named_suites "$d")
+  [ "$named" = 'hack/e2e-apps/wired.bats' ]
+  out=$(brc_audit "$d")
+  [ -z "$out" ]
+  rm -rf "$d"
+}
diff --git a/hack/bats-strict-setup.bats b/hack/bats-strict-setup.bats
new file mode 100644
index 0000000000..5d2c7eb4a7
--- /dev/null
+++ b/hack/bats-strict-setup.bats
@@ -0,0 +1,483 @@
+#!/usr/bin/env bats
+# Every discovered unit file must load the nounset helper once. A file-local
+# setup() replaces the helper's setup, so its first command must restore it.
+#
+# This lexical audit accepts one spelling at column zero, not arbitrary shell:
+# conditional loads are rejected, while a literal inside a heredoc could be
+# mistaken for a load. Fixtures use printf to avoid that ambiguity. Nested Bats
+# canaries separately verify the helper's effect in the actual test process.
+
+load test_helper
+
+# The directory to audit. Under the bats binary that is this file's own
+# location; under cozytest.sh, which does not set BATS_TEST_FILENAME, `$0` is
+# the runner itself -- and the answer comes out the same only because the runner
+# lives in the directory it runs files from. The first test below refuses to
+# pass on an empty enumeration, so a wrong answer here fails rather than audits
+# nothing.
+BSS_DIR="$(cd "$(dirname "${BATS_TEST_FILENAME:-$0}")" && pwd)"
+BSS_REPO_ROOT="$(cd "$BSS_DIR/.." && pwd)"
+
+# Non-recursive, and the exclusion is on the basename, because that is what
+# `$(filter-out hack/e2e-%.bats,$(wildcard hack/*.bats))` in the Makefile means.
+# A shell glob keeps this portable to the macOS hook instead of relying on
+# GNU find's non-POSIX `-maxdepth` flag.
+# Nested files are outside this unit enumeration. Runner reachability is
+# checked separately by hack/bats-runner-coverage.bats.
+bss_units() {
+  for _f in "$1"/*.bats; do
+    [ -e "$_f" ] || continue
+    case ${_f##*/} in
+      e2e-*) continue ;;
+    esac
+    printf '%s\n' "$_f"
+  done | sort
+  return 0
+}
+
+# Report every unit file whose strict-mode setup is missing or overridden, one
+# line each, and print nothing when they all comply.
+#
+# Through stdout rather than an exit status: cozytest.sh rewrites a function's
+# closing brace into `return 0`, so a status set in here would be discarded
+# before the caller could read it, and the check would pass unconditionally.
+bss_audit() {
+  bss_units "$1" | while IFS= read -r _f; do
+    [ -e "$_f" ] || continue
+    _b=$(basename "$_f")
+    _load_count=$(grep -c '^load test_helper$' "$_f" || :)
+    if [ "$_load_count" -eq 0 ]; then
+      echo "$_b: does not load the strict-mode helper; add a column-zero \`load test_helper\` line under the file's leading comment block"
+      continue
+    fi
+    if [ "$_load_count" -ne 1 ]; then
+      echo "$_b: loads the strict-mode helper $_load_count times; keep exactly one column-zero \`load test_helper\` line"
+      continue
+    fi
+    # A file-local setup replaces the helper's without a word from either
+    # runner. Recognize the common Bash forms, including indentation,
+    # `function setup {`, and a brace on the following line, then require the
+    # suite's one canonical spelling. That makes an ambiguous nested declaration
+    # fail closed instead of guessing whether Bats will see it at source time.
+    _setup_count=$(grep -cE '^[[:space:]]*(setup[[:space:]]*\(|function[[:space:]]+setup([[:space:]]|\(|[{]|$))' "$_f" || :)
+    _canonical_count=$(grep -c '^setup() {$' "$_f" || :)
+    if [ "$_setup_count" -gt 0 ] \
+      && { [ "$_setup_count" -ne 1 ] || [ "$_canonical_count" -ne 1 ]; }; then
+      echo "$_b: uses a noncanonical or repeated setup declaration; use exactly one column-zero \`setup() {\` block"
+      continue
+    fi
+    if [ "$_canonical_count" -eq 1 ]; then
+      _first_effective=$(awk '
+        /^setup\(\) \{$/ { in_setup=1; next }
+        in_setup && /^}$/ { exit }
+        in_setup && /^[[:space:]]*$/ { next }
+        in_setup && /^[[:space:]]*#/ { next }
+        in_setup { print; exit }
+      ' "$_f")
+      if ! printf '%s\n' "$_first_effective" \
+        | grep -qE '^[[:space:]]*strict_setup[[:space:]]*$'; then
+        echo "$_b: setup() must call strict_setup directly as its first effective command; blank and comment lines may precede it"
+      fi
+    fi
+  done
+  return 0
+}
+
+# The load line is assembled from a printf argument rather than
+# written as a literal, because this file is audited by the guard it defines and
+# a column-zero literal here would be read as a second declaration of its own.
+bss_new_fixture() {
+  printf '%s\n' '#!/usr/bin/env bats' > "$1/subject.bats"
+  return 0
+}
+
+bss_add_load() {
+  printf '%s\n' 'load test_helper' >> "$1/subject.bats"
+  return 0
+}
+
+bss_add_indented_load() {
+  printf '  %s\n' 'load test_helper' >> "$1/subject.bats"
+  return 0
+}
+
+bss_add_commented_load() {
+  printf '# %s\n' 'load test_helper' >> "$1/subject.bats"
+  return 0
+}
+
+bss_add_own_setup() {
+  printf '%s\n' 'setup() {' '  export FIXTURE=1' '}' >> "$1/subject.bats"
+  return 0
+}
+
+bss_add_strict_own_setup() {
+  printf '%s\n' 'setup() {' '' '  # Restore the unit-suite contract first.' '  strict_setup' '  export FIXTURE=1' '}' >> "$1/subject.bats"
+  return 0
+}
+
+bss_add_subshell_strict_own_setup() {
+  printf '%s\n' 'setup() {' '  (' '    strict_setup' '  )' '}' >> "$1/subject.bats"
+  return 0
+}
+
+bss_add_conditional_strict_own_setup() {
+  printf '%s\n' 'setup() {' '  if false; then' '    strict_setup' '  fi' '}' >> "$1/subject.bats"
+  return 0
+}
+
+bss_add_function_own_setup() {
+  printf '%s\n' 'function setup {' '  export FIXTURE=1' '}' >> "$1/subject.bats"
+  return 0
+}
+
+bss_add_indented_own_setup() {
+  printf '%s\n' '  setup() {' '    export FIXTURE=1' '  }' >> "$1/subject.bats"
+  return 0
+}
+
+bss_add_next_line_brace_setup() {
+  printf '%s\n' 'setup()' '{' '  export FIXTURE=1' '}' >> "$1/subject.bats"
+  return 0
+}
+
+bss_add_spaced_parens_setup() {
+  printf '%s\n' 'setup ( ) {' '  export FIXTURE=1' '}' >> "$1/subject.bats"
+  return 0
+}
+
+bss_add_commented_strict_own_setup() {
+  printf '%s\n' 'setup() {' '  # strict_setup' '  export FIXTURE=1' '}' >> "$1/subject.bats"
+  return 0
+}
+
+bss_add_unrelated_strict_call() {
+  printf '%s\n' 'unrelated() {' '  strict_setup' '}' >> "$1/subject.bats"
+  return 0
+}
+
+bss_rename() {
+  mv "$1/subject.bats" "$1/$2"
+  return 0
+}
+
+bss_add_nounset_canary() {
+  printf '%s\n' \
+    '@test "nounset canary" {' \
+    '  printf "%s\n" "$BSS_NOUNSET_CANARY_UNSET"' \
+    '}' >> "$1/subject.bats"
+  ln -s "$BSS_DIR/test_helper.bash" "$1/test_helper.bash"
+  return 0
+}
+
+@test "the unit enumeration is not empty" {
+  count=$(bss_units "$BSS_DIR" | wc -l)
+  if [ "$count" -lt 2 ]; then
+    echo "FAIL: enumerated $count unit file(s) under $BSS_DIR; the audit below would be vacuous"
+    false
+  fi
+}
+
+@test "the unit enumeration is non-recursive without GNU find extensions" {
+  tmp=$(mktemp -d)
+  mkdir -p "$tmp/bin" "$tmp/nested"
+  : > "$tmp/root.bats"
+  : > "$tmp/e2e-live.bats"
+  : > "$tmp/nested/child.bats"
+  printf '%s\n' '#!/bin/sh' 'exit 97' > "$tmp/bin/find"
+  chmod +x "$tmp/bin/find"
+
+  units=$(PATH="$tmp/bin:$PATH" bss_units "$tmp")
+  [ "$units" = "$tmp/root.bats" ]
+  rm -rf "$tmp"
+}
+
+@test "the audited set is exactly the set the Makefile hands the runner" {
+  # Ask make for its own answer instead of trusting this file's copy of the
+  # rule. The whole point of the audit is that its input tracks the runner's,
+  # so a divergence between the two is the failure it exists to prevent --
+  # narrow the Makefile's filter without narrowing this one and the audit goes
+  # on reporting clean about files nobody runs, or vice versa.
+  tmp=$(mktemp -d)
+  bss_units "$BSS_DIR" | sed "s|^$BSS_REPO_ROOT/||" | sort > "$tmp/mine"
+  # MAKEFLAGS cleared: this runs from inside `make bats-unit-tests`, and a
+  # sub-make that inherits the parent's `-j` without its jobserver descriptors
+  # warns about it. The warning goes to stderr and would not corrupt the
+  # comparison, but it would land in the middle of a green suite's output.
+  (cd "$BSS_REPO_ROOT" && MAKEFLAGS= MAKELEVEL= make --no-print-directory -s print-bats-unit-files) | sort > "$tmp/theirs"
+  # File comparison keeps this audit compatible with cozytest's POSIX shell;
+  # process substitution would require Bash.
+  if ! diff -u "$tmp/theirs" "$tmp/mine" > "$tmp/delta"; then
+    echo "FAIL: the audited set and \$(BATS_UNIT_FILES) disagree (-Makefile +audit):"
+    cat "$tmp/delta"
+    rm -rf "$tmp"
+    false
+  fi
+  rm -rf "$tmp"
+}
+
+@test "default and direct canonical setup enable nounset in real nested Bats tests" {
+  tmp=$(mktemp -d)
+  unset BSS_NOUNSET_CANARY_UNSET
+
+  for form in default direct; do
+    mkdir "$tmp/$form"
+    bss_new_fixture "$tmp/$form"
+    bss_add_load "$tmp/$form"
+    if [ "$form" = direct ]; then
+      bss_add_strict_own_setup "$tmp/$form"
+    fi
+    bss_add_nounset_canary "$tmp/$form"
+    report=$(bss_audit "$tmp/$form")
+    if [ -n "$report" ]; then
+      echo "FAIL: the supported $form setup was rejected: $report"
+      rm -rf "$tmp"
+      false
+    fi
+
+    child_status=0
+    output=$(bats --formatter tap "$tmp/$form/subject.bats" 2>&1) || child_status=$?
+    if [ "$child_status" -eq 0 ]; then
+      echo "FAIL: nested Bats accepted an unset test-body read with $form setup"
+      echo "$output"
+      rm -rf "$tmp"
+      false
+    fi
+    printf '%s\n' "$output" | grep -Fq 'not ok 1 nounset canary'
+    printf '%s\n' "$output" | grep -Fq 'BSS_NOUNSET_CANARY_UNSET: unbound variable'
+  done
+  rm -rf "$tmp"
+}
+
+@test "the helper leaves subprocess shell options unchanged" {
+  tmp=$(mktemp -d)
+  unset BSS_NOUNSET_CANARY_UNSET
+  bss_new_fixture "$tmp"
+  bss_add_load "$tmp"
+  ln -s "$BSS_DIR/test_helper.bash" "$tmp/test_helper.bash"
+  printf '%s\n' '#!/bin/bash' 'printf "child:%s\n" "$BSS_NOUNSET_CANARY_UNSET"' > "$tmp/child.sh"
+  printf '@test "subprocess canary" {\n  bash "%s/child.sh"\n}\n' "$tmp" >> "$tmp/subject.bats"
+  child_status=0
+  output=$(bats --formatter tap "$tmp/subject.bats" 2>&1) || child_status=$?
+  [ "$child_status" -eq 0 ]
+  printf '%s\n' "$output" | grep -Fq 'ok 1 subprocess canary'
+  rm -rf "$tmp"
+}
+
+@test "every hack/*.bats unit file restores set -u through the shared helper" {
+  report=$(bss_audit "$BSS_DIR")
+  if [ -n "$report" ]; then
+    echo "FAIL: strict-mode setup missing or overridden:"
+    echo "$report"
+    false
+  fi
+}
+
+@test "a unit file with no load line is reported" {
+  tmp=$(mktemp -d)
+  bss_new_fixture "$tmp"
+  report=$(bss_audit "$tmp")
+  if ! echo "$report" | grep -q 'does not load the strict-mode helper'; then
+    echo "FAIL: an uncovered file was not reported; got: $report"
+    rm -rf "$tmp"
+    false
+  fi
+  rm -rf "$tmp"
+}
+
+@test "a unit file with the load line is clean" {
+  tmp=$(mktemp -d)
+  bss_new_fixture "$tmp"
+  bss_add_load "$tmp"
+  report=$(bss_audit "$tmp")
+  if [ -n "$report" ]; then
+    echo "FAIL: a covered file was reported: $report"
+    rm -rf "$tmp"
+    false
+  fi
+  rm -rf "$tmp"
+}
+
+@test "duplicate load lines are reported" {
+  tmp=$(mktemp -d)
+  bss_new_fixture "$tmp"
+  bss_add_load "$tmp"
+  bss_add_load "$tmp"
+  report=$(bss_audit "$tmp")
+  if ! echo "$report" | grep -q 'keep exactly one column-zero'; then
+    echo "FAIL: duplicate load lines were accepted; got: $report"
+    rm -rf "$tmp"
+    false
+  fi
+  rm -rf "$tmp"
+}
+
+@test "an indented or commented-out load line does not count" {
+  tmp=$(mktemp -d)
+  bss_new_fixture "$tmp"
+  bss_add_indented_load "$tmp"
+  bss_add_commented_load "$tmp"
+  report=$(bss_audit "$tmp")
+  if ! echo "$report" | grep -q 'does not load the strict-mode helper'; then
+    echo "FAIL: a load line that never runs was credited; got: $report"
+    rm -rf "$tmp"
+    false
+  fi
+  rm -rf "$tmp"
+}
+
+@test "a file-local setup that skips strict_setup is reported" {
+  tmp=$(mktemp -d)
+  bss_new_fixture "$tmp"
+  bss_add_load "$tmp"
+  bss_add_own_setup "$tmp"
+  report=$(bss_audit "$tmp")
+  if ! echo "$report" | grep -q 'first effective command'; then
+    echo "FAIL: a setup() override was not reported; got: $report"
+    rm -rf "$tmp"
+    false
+  fi
+  rm -rf "$tmp"
+}
+
+@test "a file-local setup that calls strict_setup is clean" {
+  tmp=$(mktemp -d)
+  bss_new_fixture "$tmp"
+  bss_add_load "$tmp"
+  bss_add_strict_own_setup "$tmp"
+  report=$(bss_audit "$tmp")
+  if [ -n "$report" ]; then
+    echo "FAIL: a compliant setup() override was reported: $report"
+    rm -rf "$tmp"
+    false
+  fi
+  rm -rf "$tmp"
+}
+
+@test "subshell and conditional strict_setup placements are rejected and leave nounset off" {
+  tmp=$(mktemp -d)
+  unset BSS_NOUNSET_CANARY_UNSET
+
+  for form in subshell conditional; do
+    mkdir "$tmp/$form"
+    bss_new_fixture "$tmp/$form"
+    bss_add_load "$tmp/$form"
+    if [ "$form" = subshell ]; then
+      bss_add_subshell_strict_own_setup "$tmp/$form"
+    else
+      bss_add_conditional_strict_own_setup "$tmp/$form"
+    fi
+    bss_add_nounset_canary "$tmp/$form"
+
+    report=$(bss_audit "$tmp/$form")
+    if ! printf '%s\n' "$report" | grep -q 'first effective command'; then
+      echo "FAIL: the unsafe $form setup was accepted: $report"
+      rm -rf "$tmp"
+      false
+    fi
+
+    child_status=0
+    output=$(bats --formatter tap "$tmp/$form/subject.bats" 2>&1) || child_status=$?
+    if [ "$child_status" -ne 0 ]; then
+      echo "FAIL: the $form fixture unexpectedly enabled nounset:"
+      echo "$output"
+      rm -rf "$tmp"
+      false
+    fi
+    printf '%s\n' "$output" | grep -Fq 'ok 1 nounset canary'
+  done
+  rm -rf "$tmp"
+}
+
+@test "function-style or indented setup declarations are rejected" {
+  tmp=$(mktemp -d)
+  bss_new_fixture "$tmp"
+  bss_add_load "$tmp"
+  bss_add_function_own_setup "$tmp"
+  report=$(bss_audit "$tmp")
+  if ! echo "$report" | grep -q 'noncanonical or repeated setup declaration'; then
+    echo "FAIL: function-style setup was not rejected; got: $report"
+    rm -rf "$tmp"
+    false
+  fi
+  bss_new_fixture "$tmp"
+  bss_add_load "$tmp"
+  bss_add_indented_own_setup "$tmp"
+  report=$(bss_audit "$tmp")
+  if ! echo "$report" | grep -q 'noncanonical or repeated setup declaration'; then
+    echo "FAIL: indented setup was not rejected; got: $report"
+    rm -rf "$tmp"
+    false
+  fi
+  rm -rf "$tmp"
+}
+
+@test "a setup declaration with its brace on the next line is rejected" {
+  tmp=$(mktemp -d)
+  bss_new_fixture "$tmp"
+  bss_add_load "$tmp"
+  bss_add_next_line_brace_setup "$tmp"
+  report=$(bss_audit "$tmp")
+  if ! echo "$report" | grep -q 'noncanonical or repeated setup declaration'; then
+    echo "FAIL: a brace-on-next-line setup was not rejected; got: $report"
+    rm -rf "$tmp"
+    false
+  fi
+  rm -rf "$tmp"
+}
+
+@test "a setup declaration with spaced parentheses is rejected" {
+  tmp=$(mktemp -d)
+  bss_new_fixture "$tmp"
+  bss_add_load "$tmp"
+  bss_add_spaced_parens_setup "$tmp"
+  report=$(bss_audit "$tmp")
+  if ! echo "$report" | grep -q 'noncanonical or repeated setup declaration'; then
+    echo "FAIL: a spaced-parentheses setup was not rejected; got: $report"
+    rm -rf "$tmp"
+    false
+  fi
+  rm -rf "$tmp"
+}
+
+@test "a comment-only strict_setup mention does not satisfy setup" {
+  tmp=$(mktemp -d)
+  bss_new_fixture "$tmp"
+  bss_add_load "$tmp"
+  bss_add_commented_strict_own_setup "$tmp"
+  report=$(bss_audit "$tmp")
+  if ! echo "$report" | grep -q 'first effective command'; then
+    echo "FAIL: a comment-only strict_setup mention was credited; got: $report"
+    rm -rf "$tmp"
+    false
+  fi
+  rm -rf "$tmp"
+}
+
+@test "a strict_setup call outside setup does not satisfy setup" {
+  tmp=$(mktemp -d)
+  bss_new_fixture "$tmp"
+  bss_add_load "$tmp"
+  bss_add_unrelated_strict_call "$tmp"
+  bss_add_own_setup "$tmp"
+  report=$(bss_audit "$tmp")
+  if ! echo "$report" | grep -q 'first effective command'; then
+    echo "FAIL: a strict_setup call outside setup was credited; got: $report"
+    rm -rf "$tmp"
+    false
+  fi
+  rm -rf "$tmp"
+}
+
+@test "an e2e- file is outside the audit" {
+  tmp=$(mktemp -d)
+  bss_new_fixture "$tmp"
+  bss_rename "$tmp" "e2e-subject.bats"
+  report=$(bss_audit "$tmp")
+  if [ -n "$report" ]; then
+    echo "FAIL: a live-cluster suite was audited as a unit file: $report"
+    rm -rf "$tmp"
+    false
+  fi
+  rm -rf "$tmp"
+}
diff --git a/hack/bats-unit-keep-going.bats b/hack/bats-unit-keep-going.bats
new file mode 100644
index 0000000000..91f987d2b2
--- /dev/null
+++ b/hack/bats-unit-keep-going.bats
@@ -0,0 +1,59 @@
+#!/usr/bin/env bats
+# `make bats-unit-tests` must run every bats file even when an early one fails,
+# and still exit non-zero, so a red file never hides the ones after it behind
+# output that reads like a complete suite. One Bats invocation owns the whole
+# set, which gives that for free; this pins that the recipe keeps it that way.
+#
+# The tests drive the real root Makefile against a miniature tree of two bats
+# files, with the real bats binary.
+#
+# Requires: make, bats.
+
+load test_helper
+
+REPO_ROOT="$(cd "$(dirname "${BATS_TEST_FILENAME:-$0}")/.." && pwd)"
+
+# kg_run <body of a.bats's only test>: builds the fixture, runs the target in it
+# and leaves the output in $fixture/out and the exit status in $rc. a.bats sorts
+# first, so a failure there is the one that could hide b.bats.
+kg_run() {
+  fixture="$(mktemp -d)"
+  mkdir "$fixture/hack"
+  : >"$fixture/hack/common-envs.mk"
+  printf '%s\n' '@test "first file" {' "  $1" '}' >"$fixture/hack/a.bats"
+  printf '%s\n' '@test "second file" {' '  true' '}' >"$fixture/hack/b.bats"
+
+  # Under `make unit-tests -k` this suite inherits MAKEFLAGS carrying the
+  # parent's --keep-going, which would hide a recipe that stops on its own.
+  #
+  # Bats puts its own libexec first on PATH, and the `bats` found there is a
+  # helper that needs bats_readlinkf, a bash function bin/bats exports. The
+  # recipe runs under /bin/sh, and dash (the CI runner's) drops exported
+  # functions, so the helper dies with "command not found" and no test runs.
+  # Dropping libexec makes the recipe find the real bats on either shell.
+  rc=0
+  env -u MAKEFLAGS -u MFLAGS -u MAKELEVEL PATH="${PATH#"$BATS_LIBEXEC":}" \
+    make --file="$REPO_ROOT/Makefile" --directory="$fixture" --no-print-directory \
+      BATS_JOBS=1 "BATS_REPORT_DIR=$fixture/reports" bats-unit-tests >"$fixture/out" 2>&1 || rc=$?
+  cat "$fixture/out"
+}
+
+@test "bats-unit-tests runs every file after a failure and still fails" {
+  kg_run 'false'
+  ran_a=$(grep -c '^not ok 1 first file' "$fixture/out" || true)
+  ran_b=$(grep -c '^ok 2 second file' "$fixture/out" || true)
+  rm -rf "$fixture"
+
+  [ "$ran_a" = 1 ]
+  [ "$ran_b" = 1 ]
+  [ "$rc" -ne 0 ]
+}
+
+@test "bats-unit-tests exits zero when every file passes" {
+  kg_run 'true'
+  ran=$(grep -c '^ok [12] ' "$fixture/out" || true)
+  rm -rf "$fixture"
+
+  [ "$ran" = 2 ]
+  [ "$rc" -eq 0 ]
+}
diff --git a/hack/build-matrix.sh b/hack/build-matrix.sh
new file mode 100755
index 0000000000..95e894a7f0
--- /dev/null
+++ b/hack/build-matrix.sh
@@ -0,0 +1,93 @@
+#!/bin/sh
+# Emit the JSON build matrix (the list of package dirs to build) for CI.
+#
+# Single source of truth: the `make -C packages/<dir> image` lines in the root
+# Makefile `build:` target. Parsing them here keeps the CI matrix from drifting
+# away from what `make build` actually builds.
+#
+# Usage: hack/build-matrix.sh [<changed-files>]
+#   no arg / empty / "FULL" -> every build unit (full matrix)
+#   <changed-files>         -> only the units whose package dir has a changed
+#                              file, UNLESS a shared-dependency path changed, in
+#                              which case the full matrix is emitted (a change to
+#                              cozy-lib / the build macros / go.mod / the build
+#                              workflows can affect any image, so rebuild all).
+#
+# MATRIX_ARCH=arm64 also drops packages/core/testing, which pins linux/amd64
+# (an x86 KVM sandbox): an arm64 leg building it would push a second amd64
+# image under its -arm64 tag.
+#
+# Output: a JSON array of package dirs on stdout, e.g.
+#   ["packages/apps/mariadb","packages/system/dashboard"]
+# An empty selection prints `[]` -> the matrix produces zero build jobs.
+set -eu
+
+MAKEFILE="${MAKEFILE:-Makefile}"
+
+# Paths that force a full rebuild when touched. Kept deliberately broad — a
+# false full-rebuild only costs time, a missed dependent ships a stale image.
+full_rebuild_pattern='^(packages/library/|api/|cmd/|internal/|pkg/|hack/common-envs\.mk|hack/package\.mk|Makefile$|go\.mod$|go\.sum$|\.github/workflows/(pull-requests|build-main)\.yaml$|hack/build-matrix\.sh$)'
+
+# The build units, parsed from the `build:` recipe (from `build:` to the next
+# line that starts in column 0).
+#
+# packages/core/talos and packages/core/installer are deliberately excluded from
+# the parallel matrix and handled by dedicated jobs instead:
+#   - talos:     the installer tarball and Talos image are heavy; the dedicated
+#                leg runs when its direct or shared build inputs changed (and
+#                remains unconditional for forks). The container e2e lane does
+#                not consume a per-PR nocloud disk.
+#   - installer: its `flux push artifact --path=packages` bundles the ENTIRE,
+#                digest-patched packages tree into the OCI artifact the operator
+#                pulls, so it must run in the finalize step AFTER every other
+#                unit's digest edits are merged — never concurrently with them.
+all_units() {
+  sed -n '/^build:/,/^[^[:space:]]/p' "$MAKEFILE" \
+    | grep -oE 'make -C packages/[A-Za-z0-9._/-]+ image' \
+    | sed -E 's/^make -C (packages[^ ]+) image$/\1/' \
+    | grep -vxE 'packages/core/(talos|installer)' \
+    | if [ "${MATRIX_ARCH:-}" = arm64 ]; then grep -vxF packages/core/testing; else cat; fi
+}
+
+emit_json() {
+  printf '['
+  _first=1
+  for _u in $1; do
+    if [ "$_first" -eq 1 ]; then _first=0; else printf ','; fi
+    printf '"%s"' "$_u"
+  done
+  printf ']\n'
+}
+
+units=$(all_units)
+
+CHANGED="${1:-}"
+if [ -z "$CHANGED" ] || [ "$CHANGED" = "FULL" ]; then
+  emit_json "$units"
+  exit 0
+fi
+
+if grep -qE "$full_rebuild_pattern" "$CHANGED"; then
+  emit_json "$units"
+  exit 0
+fi
+
+selected=""
+for u in $units; do
+  if grep -qE "^$u/" "$CHANGED"; then
+    selected="$selected $u"
+  fi
+done
+
+# Targeted cross-package fan-out that dir-scoping cannot see:
+#   objectstorage-controller derives its COSI sidecar tag from
+#   packages/system/seaweedfs/values.yaml, so a seaweedfs-only diff must still
+#   rebuild objectstorage-controller to regenerate that tag.
+if grep -qE '^packages/system/seaweedfs/' "$CHANGED"; then
+  case " $selected " in
+    *" packages/system/objectstorage-controller "*) : ;;
+    *) selected="$selected packages/system/objectstorage-controller" ;;
+  esac
+fi
+
+emit_json "$selected"
diff --git a/hack/build-matrix_test.bats b/hack/build-matrix_test.bats
new file mode 100644
index 0000000000..44a9f2c048
--- /dev/null
+++ b/hack/build-matrix_test.bats
@@ -0,0 +1,213 @@
+#!/usr/bin/env bats
+# Unit tests for hack/build-matrix.sh — the CI build-matrix selector.
+#
+# Run from the repo root through `make bats-unit-tests`; the relative
+# `hack/build-matrix.sh` calls below resolve against that cwd. The file also
+# remains compatible with the legacy `hack/cozytest.sh` translator, which does
+# not invoke setup(), so neither runner depends on a setup() cd.
+#
+# Test-level EXIT traps replace Bats' own handler and hide failing TAP results.
+# Cleanup follows aborting assertions; see docs/agents/e2e-testing.md.
+
+load test_helper
+
+@test "no argument emits the full matrix" {
+  out=$(hack/build-matrix.sh)
+  # The parallel units; assert known members are present.
+  echo "$out" | grep -q '"packages/core/platform"'
+  echo "$out" | grep -q '"packages/apps/mariadb"'
+  [ "$(echo "$out" | tr ',' '\n' | wc -l)" -gt 20 ]
+}
+
+@test "talos and installer are excluded from the parallel matrix" {
+  out=$(hack/build-matrix.sh)
+  # `! cmd` would be vacuous: cozytest.sh runs each @test under `set -e`,
+  # which is suppressed for any command whose status is inverted with `!`, so
+  # a regression that wrongly included these paths would not fail the test.
+  # Assert via `if cmd; then ...`.
+  if echo "$out" | grep -q '"packages/core/talos"'; then echo "FAIL: packages/core/talos must be excluded from the parallel matrix"; false; fi
+  if echo "$out" | grep -q '"packages/core/installer"'; then echo "FAIL: packages/core/installer must be excluded from the parallel matrix"; false; fi
+}
+
+@test "the arm64 matrix drops the amd64-only e2e sandbox and nothing else" {
+  full=$(hack/build-matrix.sh)
+  arm=$(MATRIX_ARCH=arm64 hack/build-matrix.sh)
+  echo "$full" | grep -q '"packages/core/testing"'
+  if echo "$arm" | grep -q '"packages/core/testing"'; then echo "FAIL: the arm64 matrix builds the amd64-only sandbox"; false; fi
+  [ "$(echo "$full" | sed 's/,*"packages\/core\/testing"//')" = "$arm" ]
+  # A diff that touches only the sandbox gives the arm64 leg nothing to build.
+  tmp=$(mktemp)
+  echo "packages/core/testing/Makefile" > "$tmp"
+  [ "$(MATRIX_ARCH=arm64 hack/build-matrix.sh "$tmp")" = "[]" ]
+  rm -f "$tmp"
+}
+
+@test "talos-only diff selects nothing (handled by the dedicated leg)" {
+  tmp=$(mktemp)
+  echo "packages/core/talos/images/matchbox/Dockerfile" > "$tmp"
+  out=$(hack/build-matrix.sh "$tmp")
+  [ "$out" = '[]' ]
+  rm -f "$tmp"
+}
+
+@test "installer-only diff selects nothing (handled by finalize)" {
+  tmp=$(mktemp)
+  echo "packages/core/installer/images/cozystack-operator/Dockerfile" > "$tmp"
+  out=$(hack/build-matrix.sh "$tmp")
+  [ "$out" = '[]' ]
+  rm -f "$tmp"
+}
+
+@test "FULL sentinel emits the full matrix" {
+  out=$(hack/build-matrix.sh FULL)
+  echo "$out" | grep -q '"packages/system/dashboard"'
+}
+
+@test "single-package diff selects only that unit" {
+  tmp=$(mktemp)
+  echo "packages/apps/mariadb/values.yaml" > "$tmp"
+  out=$(hack/build-matrix.sh "$tmp")
+  [ "$out" = '["packages/apps/mariadb"]' ]
+  rm -f "$tmp"
+}
+
+@test "kubeovn source patch selects the kubeovn image build" {
+  tmp=$(mktemp)
+  echo "packages/system/kubeovn/images/kubeovn/patches/fix-vmim-scheduling-retry.diff" > "$tmp"
+  out=$(hack/build-matrix.sh "$tmp")
+  [ "$out" = '["packages/system/kubeovn"]' ]
+  rm -f "$tmp"
+}
+
+@test "two-package diff selects both units" {
+  tmp=$(mktemp)
+  printf 'packages/apps/mariadb/values.yaml\npackages/system/dashboard/values.yaml\n' > "$tmp"
+  out=$(hack/build-matrix.sh "$tmp")
+  echo "$out" | grep -q '"packages/apps/mariadb"'
+  echo "$out" | grep -q '"packages/system/dashboard"'
+  [ "$(echo "$out" | tr ',' '\n' | wc -l)" -eq 2 ]
+  rm -f "$tmp"
+}
+
+@test "docs-only diff selects nothing" {
+  tmp=$(mktemp)
+  echo "docs/agents/overview.md" > "$tmp"
+  out=$(hack/build-matrix.sh "$tmp")
+  [ "$out" = '[]' ]
+  rm -f "$tmp"
+}
+
+@test "a package with no image target selects nothing" {
+  tmp=$(mktemp)
+  # postgres ships no in-repo image build, so it is not a build unit.
+  echo "packages/apps/postgres/values.yaml" > "$tmp"
+  out=$(hack/build-matrix.sh "$tmp")
+  [ "$out" = '[]' ]
+  rm -f "$tmp"
+}
+
+@test "seaweedfs change fans out to objectstorage-controller" {
+  tmp=$(mktemp)
+  echo "packages/system/seaweedfs/values.yaml" > "$tmp"
+  out=$(hack/build-matrix.sh "$tmp")
+  [ "$out" = '["packages/system/seaweedfs","packages/system/objectstorage-controller"]' ]
+  rm -f "$tmp"
+}
+
+@test "seaweedfs change does not duplicate an already-selected objectstorage-controller" {
+  tmp=$(mktemp)
+  printf 'packages/system/seaweedfs/values.yaml\npackages/system/objectstorage-controller/values.yaml\n' > "$tmp"
+  out=$(hack/build-matrix.sh "$tmp")
+  [ "$out" = '["packages/system/seaweedfs","packages/system/objectstorage-controller"]' ]
+  rm -f "$tmp"
+}
+
+@test "cozy-lib change forces the full matrix" {
+  tmp=$(mktemp)
+  echo "packages/library/cozy-lib/templates/_helpers.tpl" > "$tmp"
+  out=$(hack/build-matrix.sh "$tmp")
+  echo "$out" | grep -q '"packages/core/platform"'
+  [ "$(echo "$out" | tr ',' '\n' | wc -l)" -gt 20 ]
+  rm -f "$tmp"
+}
+
+@test "common-envs.mk change forces the full matrix" {
+  tmp=$(mktemp)
+  echo "hack/common-envs.mk" > "$tmp"
+  out=$(hack/build-matrix.sh "$tmp")
+  [ "$(echo "$out" | tr ',' '\n' | wc -l)" -gt 20 ]
+  rm -f "$tmp"
+}
+
+@test "go.mod change forces the full matrix" {
+  tmp=$(mktemp)
+  echo "go.mod" > "$tmp"
+  out=$(hack/build-matrix.sh "$tmp")
+  [ "$(echo "$out" | tr ',' '\n' | wc -l)" -gt 20 ]
+  rm -f "$tmp"
+}
+
+@test "build workflow change forces the full matrix" {
+  tmp=$(mktemp)
+  echo ".github/workflows/pull-requests.yaml" > "$tmp"
+  out=$(hack/build-matrix.sh "$tmp")
+  [ "$(echo "$out" | tr ',' '\n' | wc -l)" -gt 20 ]
+  rm -f "$tmp"
+}
+
+@test "root Go source change (api/) forces the full matrix" {
+  tmp=$(mktemp)
+  echo "api/apps/v1alpha1/kubernetes/types.go" > "$tmp"
+  out=$(hack/build-matrix.sh "$tmp")
+  [ "$(echo "$out" | tr ',' '\n' | wc -l)" -gt 20 ]
+  rm -f "$tmp"
+}
+
+@test "root Go source change (pkg/) forces the full matrix" {
+  tmp=$(mktemp)
+  echo "pkg/cluster/reconciler.go" > "$tmp"
+  out=$(hack/build-matrix.sh "$tmp")
+  [ "$(echo "$out" | tr ',' '\n' | wc -l)" -gt 20 ]
+  rm -f "$tmp"
+}
+
+@test "emitted JSON is parseable and matches make build's unit list" {
+  out=$(hack/build-matrix.sh)
+  # Valid JSON array.
+  echo "$out" | jq -e 'type == "array"' >/dev/null
+  # Every emitted dir exists and has a Makefile.
+  for d in $(echo "$out" | jq -r '.[]'); do
+    [ -f "$d/Makefile" ]
+  done
+  # Count matches the `make -C packages/... image` lines in Makefile, minus the
+  # two units handled outside the parallel matrix (talos, installer).
+  expected=$(sed -n '/^build:/,/^[^[:space:]]/p' Makefile \
+    | grep -oE 'make -C packages/[A-Za-z0-9._/-]+ image' \
+    | sed -E 's/^make -C (packages[^ ]+) image$/\1/' \
+    | grep -vxcE 'packages/core/(talos|installer)')
+  actual=$(echo "$out" | jq 'length')
+  [ "$expected" -eq "$actual" ]
+}
+
+@test "every package that builds an image is in the build list" {
+  # The build list is maintained by hand, and a package missing from it is
+  # rebuilt by no CI path: its Dockerfile and patches keep changing while the
+  # pinned image stays whatever was last pushed by hand. Derive the set from
+  # the package Makefiles so a new image target cannot be forgotten.
+  listed=$(sed -n '/^build:/,/^[^[:space:]]/p' Makefile \
+    | grep -oE 'make -C packages/[A-Za-z0-9._/-]+ image' \
+    | sed -E 's/^make -C (packages[^ ]+) image$/\1/')
+  missing=""
+  checked=0
+  for m in packages/*/*/Makefile; do
+    grep -q 'docker buildx build' "$m" || continue
+    checked=$((checked + 1))
+    d=${m%/Makefile}
+    printf '%s\n' "$listed" | grep -qx "$d" || missing="$missing $d"
+  done
+  [ "$checked" -gt 0 ]
+  if [ -n "$missing" ]; then
+    echo "image-building packages missing from the root Makefile build: list:$missing" >&2
+    false
+  fi
+}
diff --git a/hack/build-talos-gating_test.bats b/hack/build-talos-gating_test.bats
new file mode 100644
index 0000000000..780fb59674
--- /dev/null
+++ b/hack/build-talos-gating_test.bats
@@ -0,0 +1,221 @@
+#!/usr/bin/env bats
+# Behavioral coverage for the Talos build classifier and the generated
+# matchbox-ref handoff into finalize. Workflow expression checks below pin only
+# producer/consumer wiring; GitHub job-result propagation is CI-only behavior.
+
+load test_helper
+
+ROOT="$(pwd)"
+CLASSIFIER="$ROOT/hack/build-talos-needed.sh"
+WF="$ROOT/.github/workflows/pull-requests.yaml"
+
+classify_paths() {
+  list="$1"
+  shift
+  printf '%s\n' "$@" > "$list"
+  "$CLASSIFIER" "$list"
+}
+
+cleanup_dir() {
+  dir="$1"
+  rm -rf "$dir"
+}
+
+run_workflow_overlay() {
+  fixture="$1"
+  matrix="$2"
+  talos_result="$3"
+  touched="$4"
+  step="$(yq '.jobs.finalize.steps[] | select(.name == "Overlay base-branch refs for unbuilt packages").run' "$WF")"
+  [ -n "$step" ]
+  mkdir -p "$fixture/hack"
+  ln -s "$ROOT/hack/overlay-main-images.sh" "$fixture/hack/overlay-main-images.sh"
+  (
+    cd "$fixture"
+    BUILD_MATRIX="$matrix"
+    TALOS_RESULT="$talos_result"
+    PR_TOUCHED="$touched"
+    export BUILD_MATRIX TALOS_RESULT PR_TOUCHED
+    dash -c "$step"
+  )
+}
+
+@test "classifies direct Talos paths by line, independent of order" {
+  dir="$(mktemp -d)"
+  list="$dir/changed"
+
+  [ "$(classify_paths "$list" packages/core/talos/file docs/readme.md)" = true ]
+  [ "$(classify_paths "$list" docs/readme.md packages/core/talos/file cmd/tool/main.go)" = true ]
+  [ "$(classify_paths "$list" docs/readme.md packages/core/talos/file)" = true ]
+  [ "$(classify_paths "$list" packages/core/talos/file)" = true ]
+
+  cleanup_dir "$dir"
+}
+
+@test "rejects whitespace and package-name lookalikes" {
+  dir="$(mktemp -d)"
+  list="$dir/changed"
+
+  [ "$(classify_paths "$list" packages/core/talos-something/file packages/core/talos docs/talos/file)" = false ]
+  [ "$(classify_paths "$list" ' packages/core/talos/file' 'packages/core/talos/file ')" = false ]
+
+  cleanup_dir "$dir"
+}
+
+@test "classifies every shared Talos build input and no unrelated root input" {
+  dir="$(mktemp -d)"
+  list="$dir/changed"
+
+  for path in \
+    hack/common-envs.mk \
+    hack/buildkitd.toml \
+    .github/workflows/pull-requests.yaml \
+    .dockerignore
+  do
+    [ "$(classify_paths "$list" "$path")" = true ]
+  done
+  [ "$(classify_paths "$list" internal/controller/controller.go go.mod packages/apps/postgres/values.yaml)" = false ]
+  : > "$list"
+  [ "$("$CLASSIFIER" "$list")" = false ]
+
+  cleanup_dir "$dir"
+}
+
+@test "fails closed when the changed-path input is missing or not a file" {
+  dir="$(mktemp -d)"
+
+  if "$CLASSIFIER" "$dir/missing" >/dev/null 2>&1; then
+    echo "missing input was classified as a safe false" >&2
+    exit 1
+  fi
+  if "$CLASSIFIER" "$dir" >/dev/null 2>&1; then
+    echo "directory input was accepted as a changed-path file" >&2
+    exit 1
+  fi
+
+  cleanup_dir "$dir"
+}
+
+@test "a real rename out of or into Talos is visible in the rename-blind list" {
+  dir="$(mktemp -d)"
+  repo="$dir/repo"
+  list="$dir/changed"
+  mkdir -p "$repo/packages/core/talos/profiles" "$repo/docs"
+  git -C "$repo" init -q
+  git -C "$repo" config user.email ci@example.invalid
+  git -C "$repo" config user.name CI
+  git -C "$repo" config commit.gpgsign false
+  git -C "$repo" config core.hooksPath /dev/null
+  printf 'profile\n' > "$repo/packages/core/talos/profiles/installer.yaml"
+  git -C "$repo" add .
+  git -C "$repo" commit -q -m seed
+
+  git -C "$repo" mv packages/core/talos/profiles/installer.yaml docs/installer.yaml
+  git -C "$repo" diff --name-status HEAD | grep -q '^R.*packages/core/talos/profiles/installer.yaml.*docs/installer.yaml$'
+  git -C "$repo" diff --name-only --no-renames HEAD > "$list"
+  [ "$("$CLASSIFIER" "$list")" = true ]
+
+  git -C "$repo" commit -q -am 'rename out'
+  git -C "$repo" mv docs/installer.yaml packages/core/talos/profiles/installer.yaml
+  git -C "$repo" diff --name-status HEAD | grep -q '^R.*docs/installer.yaml.*packages/core/talos/profiles/installer.yaml$'
+  git -C "$repo" diff --name-only --no-renames HEAD > "$list"
+  [ "$("$CLASSIFIER" "$list")" = true ]
+
+  cleanup_dir "$dir"
+}
+
+@test "deleting a Talos input still selects the build" {
+  dir="$(mktemp -d)"
+  repo="$dir/repo"
+  list="$dir/changed"
+  mkdir -p "$repo/packages/core/talos/profiles"
+  git -C "$repo" init -q
+  git -C "$repo" config user.email ci@example.invalid
+  git -C "$repo" config user.name CI
+  git -C "$repo" config commit.gpgsign false
+  git -C "$repo" config core.hooksPath /dev/null
+  printf 'profile\n' > "$repo/packages/core/talos/profiles/installer.yaml"
+  git -C "$repo" add .
+  git -C "$repo" commit -q -m seed
+
+  rm "$repo/packages/core/talos/profiles/installer.yaml"
+  git -C "$repo" diff --name-only --no-renames HEAD > "$list"
+  [ "$("$CLASSIFIER" "$list")" = true ]
+
+  cleanup_dir "$dir"
+}
+
+@test "workflow wires the rename-blind classifier output and preserves job guards" {
+  [ "$(yq '.jobs.plan.outputs.talos' "$WF")" = '${{ steps.p.outputs.talos }}' ]
+  plan="$(yq '.jobs.plan.steps[] | select(.id == "p").run' "$WF")"
+  printf '%s\n' "$plan" | grep -qF 'hack/build-talos-needed.sh /tmp/changed_norenames.txt'
+
+  gate="$(yq '.jobs["build-talos"].if' "$WF")"
+  printf '%s\n' "$gate" | grep -qF "needs.plan.outputs.code == 'true'"
+  printf '%s\n' "$gate" | grep -qF "needs.plan.outputs.talos == 'true'"
+  printf '%s\n' "$gate" | grep -qF 'github.event.pull_request.head.repo.fork'
+  printf '%s\n' "$gate" | grep -qF "!contains(github.event.pull_request.labels.*.name, 'release')"
+  if printf '%s\n' "$gate" | grep -qF 'needs.plan.outputs.touched'; then
+    echo "build-talos still uses the whitespace-formatted touched output" >&2
+    exit 1
+  fi
+}
+
+@test "finalize accepts success or skipped and rejects other Talos results" {
+  gate="$(yq '.jobs.finalize.if' "$WF")"
+
+  printf '%s\n' "$gate" | grep -qF "needs.build-talos.result == 'success'"
+  printf '%s\n' "$gate" | grep -qF "needs.build-talos.result == 'skipped'"
+  if printf '%s\n' "$gate" | grep -qE "needs\.build-talos\.result == '(failure|cancelled)'"; then
+    echo "finalize admits a failed or cancelled Talos build" >&2
+    exit 1
+  fi
+}
+
+@test "successful Talos output keeps the fresh bootbox digest during overlay" {
+  dir="$(mktemp -d)"
+  mkdir -p "$dir/packages/apps/foo/images" "$dir/_out/mainpkgs/apps/foo/images"
+  mkdir -p "$dir/packages/extra/bootbox/images" "$dir/_out/mainpkgs/extra/bootbox/images"
+  printf 'registry.example/foo:pr@sha256:foo-fresh\n' > "$dir/packages/apps/foo/images/foo.tag"
+  printf 'registry.example/foo:main@sha256:foo-base\n' > "$dir/_out/mainpkgs/apps/foo/images/foo.tag"
+  printf 'registry.example/matchbox:pr@sha256:fresh\n' > "$dir/packages/extra/bootbox/images/matchbox.tag"
+  printf 'registry.example/matchbox:main@sha256:base\n' > "$dir/_out/mainpkgs/extra/bootbox/images/matchbox.tag"
+
+  run_workflow_overlay "$dir" '["packages/apps/foo"]' success ''
+  grep -q 'sha256:foo-fresh' "$dir/packages/apps/foo/images/foo.tag"
+  grep -q 'sha256:fresh' "$dir/packages/extra/bootbox/images/matchbox.tag"
+
+  cleanup_dir "$dir"
+}
+
+@test "skipped Talos output accepts the base bootbox digest" {
+  dir="$(mktemp -d)"
+  mkdir -p "$dir/packages/extra/bootbox/images" "$dir/_out/mainpkgs/extra/bootbox/images"
+  printf 'registry.example/matchbox:release@sha256:old\n' > "$dir/packages/extra/bootbox/images/matchbox.tag"
+  printf 'registry.example/matchbox:main@sha256:base\n' > "$dir/_out/mainpkgs/extra/bootbox/images/matchbox.tag"
+
+  run_workflow_overlay "$dir" '[]' skipped ''
+  grep -q 'sha256:base' "$dir/packages/extra/bootbox/images/matchbox.tag"
+
+  cleanup_dir "$dir"
+}
+
+@test "an explicitly edited bootbox ref wins when Talos was skipped" {
+  dir="$(mktemp -d)"
+  mkdir -p "$dir/packages/extra/bootbox/images" "$dir/_out/mainpkgs/extra/bootbox/images"
+  printf 'registry.example/matchbox:custom@sha256:edited\n' > "$dir/packages/extra/bootbox/images/matchbox.tag"
+  printf 'registry.example/matchbox:main@sha256:base\n' > "$dir/_out/mainpkgs/extra/bootbox/images/matchbox.tag"
+
+  run_workflow_overlay "$dir" '[]' skipped 'packages/extra/bootbox'
+  grep -q 'sha256:edited' "$dir/packages/extra/bootbox/images/matchbox.tag"
+
+  cleanup_dir "$dir"
+}
+
+@test "the PR path has no consumer of the removed nocloud artifact" {
+  code="$(grep -v '^[[:space:]]*#' "$WF")"
+  if printf '%s\n' "$code" | grep -E 'name: talos-image|nocloud-amd64\.raw\.xz' | grep -v 'const diskId'; then
+    echo "a PR-path step consumes a Talos artifact that the job can skip" >&2
+    exit 1
+  fi
+}
diff --git a/hack/build-talos-needed.sh b/hack/build-talos-needed.sh
new file mode 100755
index 0000000000..46ac89b81b
--- /dev/null
+++ b/hack/build-talos-needed.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+# Print whether a changed-path list contains an input to the pull-request Talos
+# build. The caller supplies the rename-blind list so removals and both sides of
+# a rename are classified.
+set -eu
+
+if [ "$#" -ne 1 ] || [ ! -f "$1" ] || [ ! -r "$1" ]; then
+  echo "usage: build-talos-needed.sh <readable-changed-files>" >&2
+  exit 2
+fi
+
+pattern='^(packages/core/talos/[^[:space:]]+|hack/common-envs\.mk|hack/buildkitd\.toml|\.github/workflows/pull-requests\.yaml|\.dockerignore)$'
+
+if grep -qE "$pattern" "$1"; then
+  printf 'true\n'
+else
+  status=$?
+  if [ "$status" -ne 1 ]; then
+    exit "$status"
+  fi
+  printf 'false\n'
+fi
diff --git a/hack/buildkitd.toml b/hack/buildkitd.toml
new file mode 100644
index 0000000000..dc6e2d696a
--- /dev/null
+++ b/hack/buildkitd.toml
@@ -0,0 +1,21 @@
+# BuildKit daemon config for CI builds.
+#
+# Route docker.io base-image pulls through mirror.gcr.io, Google's public
+# pull-through cache for Docker Hub. The Build job authenticates only to the
+# push registry (OCIR), so every base image (golang, alpine, ubuntu, nginx, ...)
+# is otherwise pulled from Docker Hub ANONYMOUSLY and is subject to Docker Hub's
+# anonymous-pull rate limit -- which intermittently fails the build at
+# auth.docker.io/token with the base image left unresolved.
+#
+# mirror.gcr.io needs no auth, carries far higher limits, and transparently
+# falls through to Docker Hub on a cache miss. This config only takes effect on
+# a buildx builder created with `--config hack/buildkitd.toml` (CI wires this via
+# docker/setup-buildx-action `buildkitd-config:`); a plain local `make build` on
+# the default builder is unaffected.
+#
+# FAIL-SAFE: if mirror.gcr.io is unreachable, BuildKit logs "trying next host"
+# and falls back to registry-1.docker.io, so the build still succeeds (verified:
+# a build pointed at a non-resolving mirror fell back to Docker Hub and exited 0).
+# This strictly reduces build failures; it never introduces a new hard dependency.
+[registry."docker.io"]
+  mirrors = ["mirror.gcr.io"]
diff --git a/hack/capi-core-components_test.bats b/hack/capi-core-components_test.bats
new file mode 100644
index 0000000000..e8c5941a3e
--- /dev/null
+++ b/hack/capi-core-components_test.bats
@@ -0,0 +1,34 @@
+#!/usr/bin/env bats
+# capi-providers-core ships the Cluster API core manifests twice: as
+# files/core-components.yaml, which a reviewer reads, and as files/components.gz,
+# which the chart mounts into the cluster. Both are edited by hand; this package
+# has no `make components`. An edit to the YAML alone reviews cleanly and changes
+# nothing in a cluster, which is how the startupProbe from #2946 stayed out of
+# the shipped manager. This holds the two files to the same bytes.
+#
+# The comparison is on the decompressed bytes, so the gzip header plays no part
+# in it. `gzip -n` is still the flag to regenerate with: without it the header
+# carries a timestamp and every regeneration rewrites the committed blob even
+# when the input has not changed.
+
+load test_helper
+
+REPO_ROOT="$(cd "$(dirname "${BATS_TEST_FILENAME:-$0}")/.." && pwd)"
+FILES="$REPO_ROOT/packages/system/capi-providers-core/files"
+
+@test "core provider components.gz matches core-components.yaml" {
+  [ -f "$FILES/core-components.yaml" ] || { echo "missing core-components.yaml" >&2; return 1; }
+  [ -f "$FILES/components.gz" ]        || { echo "missing components.gz" >&2; return 1; }
+
+  local work; work="$(mktemp -d)"
+  gzip -dc "$FILES/components.gz" > "$work/decompressed.yaml"
+  if ! cmp -s "$work/decompressed.yaml" "$FILES/core-components.yaml"; then
+    echo "components.gz does not match core-components.yaml" >&2
+    echo "the chart mounts the blob, so the cluster would run what the YAML does not say" >&2
+    echo "regenerate: gzip -9 -n -c files/core-components.yaml > files/components.gz" >&2
+    diff "$work/decompressed.yaml" "$FILES/core-components.yaml" | head -20 >&2 || true
+    rm -rf "$work"
+    return 1
+  fi
+  rm -rf "$work"
+}
diff --git a/hack/capi-provider-components_test.bats b/hack/capi-provider-components_test.bats
new file mode 100644
index 0000000000..647668a3cd
--- /dev/null
+++ b/hack/capi-provider-components_test.bats
@@ -0,0 +1,126 @@
+#!/usr/bin/env bats
+# The vendored CAPI provider packages ship the provider manifests twice: as the
+# readable YAML a reviewer reads, and as the gzip blob the chart actually mounts
+# into the cluster. `make components` writes both from one download, so they
+# agree at the moment of vendoring and nothing keeps them in step afterwards.
+#
+# An edit to the YAML alone is silent in every way that matters. The diff looks
+# right, review passes on it, and the cluster runs whatever the blob held —
+# which is the version nobody read. This asserts the two are the same bytes.
+#
+# The comparison is on the decompressed bytes, so the gzip header plays no part
+# in it. `make components` still passes -n, for a different reason: without it
+# the header carries a timestamp and every regeneration rewrites the committed
+# blob even when the input has not changed.
+
+load test_helper
+
+REPO_ROOT="$(cd "$(dirname "${BATS_TEST_FILENAME:-$0}")/.." && pwd)"
+
+check_pair() {
+  local pkg="$1" yaml="$2"
+  local dir="$REPO_ROOT/packages/system/$pkg/files"
+
+  [ -f "$dir/$yaml" ]      || { echo "missing $pkg/files/$yaml" >&2; return 1; }
+  [ -f "$dir/components.gz" ] || { echo "missing $pkg/files/components.gz" >&2; return 1; }
+
+  local work; work="$(mktemp -d)"
+  gzip -dc "$dir/components.gz" > "$work/decompressed.yaml"
+
+  if ! cmp -s "$work/decompressed.yaml" "$dir/$yaml"; then
+    echo "$pkg: components.gz does not match $yaml" >&2
+    echo "the chart mounts the blob, so the cluster would run what the YAML does not say" >&2
+    if grep -q '^components:' "$REPO_ROOT/packages/system/$pkg/Makefile" 2>/dev/null; then
+      echo "run: make -C packages/system/$pkg components" >&2
+    else
+      echo "regenerate: gzip -9 -n -c files/$yaml > files/components.gz" >&2
+    fi
+    head -40 "$work/decompressed.yaml" > "$work/a"
+    head -40 "$dir/$yaml" > "$work/b"
+    diff "$work/a" "$work/b" | head -20 >&2 || true
+    rm -rf "$work"
+    return 1
+  fi
+  rm -rf "$work"
+}
+
+@test "capmox components.gz matches the vendored infrastructure-components.yaml" {
+  check_pair capi-providers-infraprovider-proxmox infrastructure-components.yaml
+}
+
+@test "in-cluster IPAM components.gz matches the vendored ipam-components.yaml" {
+  check_pair capi-providers-ipam-in-cluster ipam-components.yaml
+}
+
+# A version bump can land in git and never reach a cluster. capi-operator hashes
+# the provider spec and the config Secret into applied-spec-hash, and the
+# ConfigMap is in neither: bumping the Makefile and running `make components`
+# while spec.version and the ConfigMap name stay behind produces a release that
+# installs the old provider and reports the old version, with no error anywhere.
+# The three have to be one value, so this asserts they are.
+check_version() {
+  local pkg="$1" makefile_var="$2"
+  local dir="$REPO_ROOT/packages/system/$pkg"
+
+  local version
+  version="$(sed -n "s/^${makefile_var}=//p" "$dir/Makefile")"
+  [ -n "$version" ] || { echo "$pkg: no $makefile_var in Makefile" >&2; return 1; }
+
+  local cm_name provider_version
+  cm_name="$(sed -n 's/^  name: //p' "$dir/templates/configmaps.yaml")"
+  provider_version="$(sed -n 's/^  version: //p' "$dir/templates/providers.yaml")"
+
+  if [ "$cm_name" != "$provider_version" ]; then
+    echo "$pkg: ConfigMap name '$cm_name' and spec.version '$provider_version' differ" >&2
+    echo "fetchConfig would find no ConfigMap for the version the operator installs" >&2
+    return 1
+  fi
+
+  case "$cm_name" in
+    "$version"-*) ;;
+    *)
+      echo "$pkg: Makefile has $makefile_var=$version, the chart installs '$cm_name'" >&2
+      echo "the vendored files were regenerated without moving the version the operator reads" >&2
+      return 1
+      ;;
+  esac
+}
+
+@test "capmox ships the version its Makefile vendored" {
+  check_version capi-providers-infraprovider-proxmox CAPMOX_VERSION
+}
+
+@test "in-cluster IPAM ships the version its Makefile vendored" {
+  check_version capi-providers-ipam-in-cluster CAIP_VERSION
+}
+
+# The Makefile pins the SHA-256 of both release assets and `make components`
+# checks its downloads against them. The pin is only as good as the files it
+# describes, so the vendored copies are checked against it here as well: a
+# vendored file edited by hand, or a sum bumped without the file, both show up
+# without anyone running the refresh target.
+check_sums() {
+  local pkg="$1" makefile_var="$2" yaml="$3"
+  local dir="$REPO_ROOT/packages/system/$pkg"
+
+  local sum_components sum_metadata
+  sum_components="$(sed -n "s/^${makefile_var}_SHA256_COMPONENTS=//p" "$dir/Makefile")"
+  sum_metadata="$(sed -n "s/^${makefile_var}_SHA256_METADATA=//p" "$dir/Makefile")"
+  [ -n "$sum_components" ] && [ -n "$sum_metadata" ] \
+    || { echo "$pkg: Makefile pins no ${makefile_var}_SHA256_* sums" >&2; return 1; }
+
+  if ! printf '%s  %s\n%s  %s\n' "$sum_components" "$dir/files/$yaml" "$sum_metadata" "$dir/files/metadata.yaml" \
+      | sha256sum -c - >/dev/null 2>&1; then
+    echo "$pkg: a vendored file does not match the sum its Makefile pins" >&2
+    echo "either the file was edited without a refresh, or the sum moved without the file" >&2
+    return 1
+  fi
+}
+
+@test "capmox vendored files match the sums its Makefile pins" {
+  check_sums capi-providers-infraprovider-proxmox CAPMOX infrastructure-components.yaml
+}
+
+@test "in-cluster IPAM vendored files match the sums its Makefile pins" {
+  check_sums capi-providers-ipam-in-cluster CAIP ipam-components.yaml
+}
diff --git a/hack/capk-provider_test.bats b/hack/capk-provider_test.bats
new file mode 100644
index 0000000000..e310f2c77c
--- /dev/null
+++ b/hack/capk-provider_test.bats
@@ -0,0 +1,94 @@
+#!/usr/bin/env bats
+# EXIT-TRAP DEBT: 3 -- see hack/bats-no-exit-trap.bats.
+# None of the three is debt: each trap sits inside an explicit subshell and
+# removes that test's own temp dir, so it does not displace the handler the
+# bats binary installs and a failure still prints its `not ok`. The count is
+# declared because the ratchet is exact in both directions: it fails if a
+# test-level trap is added here, and it fails if one of these is removed.
+
+load test_helper
+
+_capk_fixture() {
+  mkdir -p "$1/packages/system" "$1/hack" "$1/bin" "$1/oci"
+  cp -R packages/system/capi-providers-infraprovider "$1/packages/system/"
+  cp hack/common-envs.mk hack/package.mk "$1/hack/"
+  cat > "$1/bin/docker" <<'EOF'
+#!/bin/sh
+set -eu
+printf '%s\n' "$@" > "$CAPK_BUILD_ARGS"
+[ "${CAPK_BUILD_FAIL:-0}" = 0 ] || exit 77
+while [ "$#" -gt 0 ]; do
+  if [ "$1" = --metadata-file ]; then
+    shift
+    printf '{"containerimage.digest":"%s"}\n' "${CAPK_TEST_DIGEST:-sha256:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa}" > "$1"
+    exit 0
+  fi
+  shift
+done
+exit 2
+EOF
+  chmod +x "$1/bin/docker"
+}
+
+@test "CAPK compressed provider ships the migration create permission" {
+  pkg=packages/system/capi-providers-infraprovider
+  gzip -dc "$pkg/files/components.gz" | cmp - "$pkg/files/infrastructure-components.yaml"
+  rules=$(gzip -dc "$pkg/files/components.gz" | yq -o=json -I=0 'select(.kind == "ClusterRole" and .metadata.name == "capk-manager-role") | .rules')
+  printf '%s\n' "$rules" | jq -e '[.[] | select(.apiGroups == ["kubevirt.io"] and .resources == ["virtualmachineinstancemigrations"])] == [{"apiGroups":["kubevirt.io"],"resources":["virtualmachineinstancemigrations"],"verbs":["create"]}]'
+}
+
+@test "CAPK rendered provider reads the digest pin outside the gzip" {
+  (
+    work=$(mktemp -d)
+    trap 'rm -rf "$work"' EXIT
+    pkg=packages/system/capi-providers-infraprovider
+    helm template capk "$pkg" --namespace cozy-cluster-api > "$work/rendered.yaml"
+    image=$(yq -r 'select(.kind == "InfrastructureProvider") | .spec.deployment.containers[] | select(.name == "manager") | .imageUrl' "$work/rendered.yaml")
+    [ "$image" = "$(cat "$pkg/images/cluster-api-provider-kubevirt.tag")" ]
+    [ "$(yq -r 'select(.kind == "InfrastructureProvider") | .spec.version' "$work/rendered.yaml")" = v0.1.10-infraprovider ]
+    yq -r 'select(.kind == "ConfigMap") | .binaryData.components' "$work/rendered.yaml" \
+      | python3 -c 'import base64,gzip,sys; sys.stdout.buffer.write(gzip.decompress(base64.b64decode(sys.stdin.read())))' \
+      | cmp - "$pkg/files/infrastructure-components.yaml"
+  )
+}
+
+@test "CAPK OCI build stamps a discoverable ref without rewriting components" {
+  (
+    work=$(mktemp -d)
+    trap 'rm -rf "$work"' EXIT
+    _capk_fixture "$work"
+    pkg="$work/packages/system/capi-providers-infraprovider"
+    PATH="$work/bin:$PATH" CAPK_BUILD_ARGS="$work/args" \
+      make -C "$pkg" image COZYSTACK_VERSION=0 REGISTRY=registry.example.test/cozy \
+      IMAGE_TAG=pr-test OCI_EXPORT_DIR="$work/oci" PLATFORM=linux/amd64
+    ref=registry.example.test/cozy/cluster-api-provider-kubevirt:pr-test@sha256:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+    [ "$(cat "$pkg/images/cluster-api-provider-kubevirt.tag")" = "$ref" ]
+    grep -Fx -- --push=0 "$work/args"
+    grep -Fx -- --load=0 "$work/args"
+    grep -Fx -- "type=oci,dest=$work/oci/cluster-api-provider-kubevirt.oci.tar" "$work/args"
+    cmp "$pkg/files/components.gz" packages/system/capi-providers-infraprovider/files/components.gz
+    . hack/lib/image-refs.sh
+    collect_image_refs "$work/packages" | grep -Fx "$ref"
+  )
+}
+
+@test "CAPK failed builds and missing digests cannot replace the prior pin" {
+  (
+    work=$(mktemp -d)
+    trap 'rm -rf "$work"' EXIT
+    _capk_fixture "$work"
+    pkg="$work/packages/system/capi-providers-infraprovider"
+    pin=$(cat "$pkg/images/cluster-api-provider-kubevirt.tag")
+    for failure in build digest; do
+      fail=0
+      digest=invalid
+      [ "$failure" != build ] || fail=1
+      rc=0
+      PATH="$work/bin:$PATH" CAPK_BUILD_ARGS="$work/args" CAPK_BUILD_FAIL="$fail" CAPK_TEST_DIGEST="$digest" \
+        make -C "$pkg" image COZYSTACK_VERSION=0 REGISTRY=registry.example.test/cozy \
+        IMAGE_TAG=pr-test OCI_EXPORT_DIR="$work/oci" > "$work/build.log" 2>&1 || rc=$?
+      [ "$rc" -ne 0 ]
+      [ "$(cat "$pkg/images/cluster-api-provider-kubevirt.tag")" = "$pin" ]
+    done
+  )
+}
diff --git a/hack/capture-dataplane.bats b/hack/capture-dataplane.bats
new file mode 100644
index 0000000000..ce9115381f
--- /dev/null
+++ b/hack/capture-dataplane.bats
@@ -0,0 +1,3509 @@
+#!/usr/bin/env bats
+# -----------------------------------------------------------------------------
+# Unit tests for the pure decision/parsing helpers in
+# hack/e2e-capture-dataplane.sh -- specifically the LoadBalancer-datapath
+# section, which fires for a Service type=LoadBalancer whose external IP is
+# unreachable while its backend stays Ready (the NotReady-pod path never sees
+# this case). Only the pure logic is unit-testable here:
+#
+#   - lb_filter_services      -- keep only whole LoadBalancer rows that carry an
+#                               ingress IP;
+#   - lb_first_ready_endpoint -- pick the first addressed, non-NotReady endpoint;
+#   - lb_announcer_node       -- the speaker node of the most recent announce;
+#   - lb_capture_decision     -- capture when probes failed, skip when one
+#                               succeeded, unknown when none ran or none could.
+#   - pod_filter_affected     -- retain scheduled NotReady pods even without IPs,
+#                               and only from whole rows.
+#   - pod_first_ready         -- pick the healthy-pod baseline for one node out
+#                               of the cluster-wide snapshot, whole rows only.
+#
+# The tests come in two shapes, and neither needs a cluster.
+#
+# The first sources the script with E2E_CAPTURE_DATAPLANE_LIB set, which the
+# sourcing guard honours by defining the helpers and returning before it touches
+# $1 or runs any capture. Those tests call the pure helpers directly and assert
+# with `[ ... ]`, matching this repo's plain-shell bats convention (no `run`
+# helper). Mock IPs use the RFC 5737 / RFC 3849 documentation ranges.
+#
+# The second runs the script as a subprocess against a stub kubectl on PATH --
+# one that hangs, refuses, or answers in part -- and reads what it wrote. That
+# reaches the capture body itself, which no amount of sourcing can: the bounds,
+# the notes and the difference between "nothing is there" and "the read never
+# said" are all properties of the running script, and several of them are only
+# observable in the artifact it leaves behind.
+#
+# A stub has to reach the branch a test is about. Several of these tests walk
+# the LB heavy-capture path, which only runs when the probe reports the address
+# unreachable, so their stubs answer `nc -z` with a failure on purpose. A stub
+# that stops short leaves the test green against every implementation.
+#
+# Test-level EXIT traps replace Bats' own handler and hide failing TAP results.
+# Cleanup follows aborting assertions; see docs/agents/e2e-testing.md.
+#
+# Title syntax constraints (inherited from cozytest.sh's awk parser):
+#   - Titles delimited by ASCII double quotes; embedded quotes truncate.
+#   - Only [A-Za-z0-9] from the title survives into the function name, so keep
+#     titles distinctive in their alphanumeric run.
+#
+# Run from the repo root with `make bats-unit-tests`, or directly with
+# `bats hack/capture-dataplane.bats`. The legacy `hack/cozytest.sh` runner
+# remains a supported compatibility path.
+# -----------------------------------------------------------------------------
+
+load test_helper
+
+HACK_DIR="$(cd "$(dirname "${BATS_TEST_FILENAME:-$0}")" && pwd)"
+SCRIPT="$HACK_DIR/e2e-capture-dataplane.sh"
+
+# Load the pure helpers. The guard returns before the capture body, so this is
+# side-effect-free and needs no cluster.
+E2E_CAPTURE_DATAPLANE_LIB=1
+# shellcheck source=/dev/null
+. "$SCRIPT"
+
+@test "pod_filter_affected keeps a scheduled NotReady pod without a podIP" {
+  rows="$(printf '%s\n' \
+    'tenant|no-ip||node-a|False|Pending||eol' \
+    'tenant|with-ip|192.0.2.80|node-b|False|Running||eol')"
+
+  out="$(printf '%s\n' "$rows" | pod_filter_affected)"
+
+  [ "$(printf '%s\n' "$out" | awk 'END { print NR }')" -eq 2 ]
+  printf '%s\n' "$out" | awk '$0 == "tenant|no-ip||node-a|False|Pending||eol" { found = 1 } END { exit !found }'
+}
+
+@test "pod_filter_affected drops Ready unscheduled and terminal pods" {
+  rows="$(printf '%s\n' \
+    'tenant|ready|192.0.2.81|node-a|True|Running||eol' \
+    'tenant|unscheduled|||False|Pending||eol' \
+    'tenant|succeeded|192.0.2.82|node-b|False|Succeeded||eol' \
+    'tenant|failed|192.0.2.83|node-b|False|Failed||eol')"
+
+  [ -z "$(printf '%s\n' "$rows" | pod_filter_affected)" ]
+}
+
+@test "pod_first_ready picks the first Ready Running pod on the named node" {
+  # Rows are the cluster-wide snapshot, so the filter scopes to a node itself:
+  # ns|name|podIP|nodeName|ready|phase|hostNetwork.
+  rows="$(printf '%s\n' \
+    'tenant|not-ready|192.0.2.90|node-a|False|Running||eol' \
+    'tenant|pending|192.0.2.91|node-a|True|Pending||eol' \
+    'tenant|other-node|192.0.2.94|node-b|True|Running||eol' \
+    'tenant|healthy-1|192.0.2.92|node-a|True|Running||eol' \
+    'tenant|healthy-2|192.0.2.93|node-a|True|Running||eol')"
+
+  out="$(printf '%s\n' "$rows" | pod_first_ready node-a)"
+
+  [ "$out" = "tenant|healthy-1|192.0.2.92" ]
+}
+
+@test "pod_first_ready ignores an eligible pod on a different node" {
+  # The scoping is the whole reason this reads the cluster-wide list safely: a
+  # baseline from another machine would compare the wedged pod's route against
+  # a route that never shared a kernel with it.
+  rows="$(printf '%s\n' 'tenant|healthy|192.0.2.95|node-b|True|Running||eol')"
+
+  [ -z "$(printf '%s\n' "$rows" | pod_first_ready node-a)" ]
+}
+
+@test "pod_first_ready emits nothing when no pod on the node is Ready and Running" {
+  rows="$(printf '%s\n' \
+    'tenant|not-ready|192.0.2.94|node-a|False|Running||eol' \
+    'tenant|pending|192.0.2.95|node-a|True|Pending||eol')"
+
+  [ -z "$(printf '%s\n' "$rows" | pod_first_ready node-a)" ]
+}
+
+@test "pod_first_ready emits nothing on empty input" {
+  [ -z "$(printf '' | pod_first_ready node-a)" ]
+}
+
+@test "pod_first_ready rejects a hostNetwork row cut at the separator" {
+  # The half a value check cannot reach on its own. A stream cut RIGHT AFTER the
+  # sixth separator leaves the hostNetwork column empty, and empty is
+  # byte-identical to the omitempty-false the filter must accept -- so `$7 ==
+  # ""` alone seats a hostNetwork pod whose `true` was cut away entirely. The
+  # trailing constant is what separates them, and the two halves of that guard
+  # catch different cuts, so both are exercised here:
+  #   row 1 loses its tail before the last separator  -> NF is 7, not 8
+  #   row 2 keeps the count but the sentinel is cut   -> NF is 8, $8 is not eol
+  # Neither may be picked; the whole row behind them must be.
+  rows="$(printf '%s\n' \
+    'cozy-cilium|cilium-abcde|192.0.2.10|node-a|True|Running|' \
+    'cozy-cilium|cilium-fghij|192.0.2.13|node-a|True|Running||eo' \
+    'tenant|workload|192.0.2.12|node-a|True|Running||eol')"
+
+  out="$(printf '%s\n' "$rows" | pod_first_ready node-a)"
+
+  [ "$out" = "tenant|workload|192.0.2.12" ]
+}
+
+@test "pod_first_ready rejects a hostNetwork row cut inside its last value" {
+  # The one filter here where a truncated last value must NOT be kept.
+  # `tru` carries all eight fields and passes every other gate, so a deny-list
+  # (`$7 != "true"`) accepts it -- and because this filter stops at the row it
+  # takes, the baseline then IS a hostNetwork pod, whose podIP is the node's own
+  # address. That is the fingerprint the exclusion exists to keep out of the
+  # comparison, so the control would be the thing it excludes. The allow-list
+  # form rejects any value that is not an exact known state.
+  rows="$(printf '%s\n' \
+    'cozy-cilium|cilium-abcde|192.0.2.10|node-a|True|Running|tru|eol' \
+    'tenant|workload|192.0.2.11|node-a|True|Running||eol')"
+
+  out="$(printf '%s\n' "$rows" | pod_first_ready node-a)"
+
+  [ "$out" = "tenant|workload|192.0.2.11" ]
+}
+
+@test "pod_first_ready skips a Ready pod that has no podIP yet" {
+  # The filter stops at the row it takes, so an addressless pod does not just
+  # produce a thin baseline -- it consumes the only pick and the pod behind it
+  # is never considered.
+  rows="$(printf '%s\n' \
+    'tenant|no-ip-yet||node-a|True|Running||eol' \
+    'tenant|healthy|192.0.2.99|node-a|True|Running||eol')"
+
+  out="$(printf '%s\n' "$rows" | pod_first_ready node-a)"
+
+  [ "$out" = "tenant|healthy|192.0.2.99" ]
+}
+
+@test "pod_first_ready drops a pod row cut off mid-record" {
+  # The cut has to land where the fragment still satisfies every value test, or
+  # the row is rejected for an unrelated reason and the count is never
+  # consulted: here the stream ends right after `Running`, one separator short
+  # of the hostNetwork column.
+  rows="$(printf '%s\n' \
+    'tenant|cut-off|192.0.2.9|node-a|True|Running' \
+    'tenant|healthy|192.0.2.98|node-a|True|Running||eol')"
+
+  out="$(printf '%s\n' "$rows" | pod_first_ready node-a)"
+
+  [ "$out" = "tenant|healthy|192.0.2.98" ]
+}
+
+@test "pod_first_ready skips a hostNetwork pod even when it is Ready Running and first" {
+  # cilium-agent / kube-ovn-cni / ovs-ovn run hostNetwork on every node, and a
+  # hostNetwork pod's podIP IS the node's own address -- picking one as the
+  # baseline would resolve to a local route for an entirely ordinary reason,
+  # which is the same fingerprint the address-attribution capture exists to
+  # recognise, so the baseline would defeat itself.
+  rows="$(printf '%s\n' \
+    'cozy-cilium|cilium-agent-abcde|192.0.2.10|node-a|True|Running|true|eol' \
+    'tenant|workload|192.0.2.96|node-a|True|Running||eol')"
+
+  out="$(printf '%s\n' "$rows" | pod_first_ready node-a)"
+
+  [ "$out" = "tenant|workload|192.0.2.96" ]
+}
+
+@test "pod_first_ready treats a blank hostNetwork column as NOT hostNetwork" {
+  # The API omits spec.hostNetwork (omitempty) when it is false/unset, so
+  # kubectl's jsonpath emits an empty string, not the literal "false".
+  rows="$(printf '%s\n' 'tenant|workload|192.0.2.97|node-a|True|Running||eol')"
+
+  out="$(printf '%s\n' "$rows" | pod_first_ready node-a)"
+
+  [ "$out" = "tenant|workload|192.0.2.97" ]
+}
+
+@test "runtime checks LoadBalancers when there are no affected pods" {
+  tmp=$(mktemp -d)
+  calls="$tmp/kubectl.calls"
+  mkdir -p "$tmp/bin"
+  cat > "$tmp/bin/kubectl" <<'EOF'
+#!/bin/sh
+printf '%s\n' "$*" >> "$MOCK_KUBECTL_CALLS"
+exit 0
+EOF
+  chmod +x "$tmp/bin/kubectl"
+
+  MOCK_KUBECTL_CALLS="$calls" PATH="$tmp/bin:$PATH" \
+    "$SCRIPT" "$tmp/out" > "$tmp/stdout" 2>&1
+
+  awk '$0 ~ /^get svc -A / { found = 1 } END { exit !found }' "$calls"
+  awk 'index($0, "checking LoadBalancers independently") { found = 1 } END { exit !found }' "$tmp/stdout"
+  awk 'index($0, "no Service type=LoadBalancer") { found = 1 } END { exit !found }' "$tmp/stdout"
+  rm -rf "$tmp"
+}
+
+@test "lb_filter_services keeps only LoadBalancer rows that have an ingress IP" {
+  rows="$(printf '%s\n' \
+    'tenant|app|LoadBalancer|192.0.2.50|80|31000|Cluster' \
+    'kube-system|kube-dns|ClusterIP||53||Cluster' \
+    'tenant|pending|LoadBalancer||443|31443|Local' \
+    'tenant|db|LoadBalancer|192.0.2.51|5432|31543|Local')"
+
+  out="$(printf '%s\n' "$rows" | lb_filter_services)"
+
+  [ "$(printf '%s\n' "$out" | grep -c .)" -eq 2 ]
+  printf '%s\n' "$out" | grep -q '^tenant|app|LoadBalancer|192.0.2.50|'
+  printf '%s\n' "$out" | grep -q '^tenant|db|LoadBalancer|192.0.2.51|'
+  # `! cmd` is vacuous under cozytest's `set -e` (errexit is suppressed for
+  # any command whose status is inverted with `!`), so a filter regression
+  # that let these rows through would not fail the test. Assert the absence
+  # via `if cmd; then ...; false`.
+  if printf '%s\n' "$out" | grep -q 'kube-dns'; then echo "FAIL: lb_filter_services must drop the kube-dns row"; false; fi
+  if printf '%s\n' "$out" | grep -q 'pending'; then echo "FAIL: lb_filter_services must drop the pending (no external IP) row"; false; fi
+}
+
+@test "lb_filter_services drops a Service row cut off mid-record" {
+  # A bounded or interrupted list stops mid-record, and the fragment it leaves
+  # behind still satisfies a filter that only looks at values: what remains of
+  # `192.0.2.53` here is `192.0.2.5`, an address the cluster never had, and the
+  # row carrying it would be probed and written up as a Service. The jsonpath
+  # emits a fixed seven fields per Service, so a shorter row is a fragment by
+  # construction rather than by guess.
+  rows="$(printf '%s\n' \
+    'tenant|app|LoadBalancer|192.0.2.50|80|31000|Cluster' \
+    'tenant|db|LoadBalancer|192.0.2.5')"
+
+  out="$(printf '%s\n' "$rows" | lb_filter_services)"
+
+  [ "$(printf '%s\n' "$out" | grep -c .)" -eq 1 ]
+  # `! cmd` is vacuous under cozytest's `set -e`, hence the if/false form used
+  # by the sibling filter test above.
+  if printf '%s\n' "$out" | grep -q 'tenant|db'; then
+    echo "FAIL: lb_filter_services must drop the row cut off mid-record"
+    false
+  fi
+}
+
+@test "pod_filter_affected drops a pod row cut off mid-record" {
+  # The same cut over the eight-field pod jsonpath. The fragment ends inside the
+  # nodeName column, so the half-parsed `nod` reads as a scheduled pod on a node
+  # of that name, and the capture opens a node-nod.txt for it. Note the cut has
+  # to land in a column this filter reads: hostNetwork is last now, and a cut
+  # inside THAT one leaves every column this filter decides on intact.
+  rows="$(printf '%s\n' \
+    'tenant|wedged|192.0.2.80|node-b|False|Running||eol' \
+    'tenant|cut||nod')"
+
+  out="$(printf '%s\n' "$rows" | pod_filter_affected)"
+
+  [ "$(printf '%s\n' "$out" | grep -c .)" -eq 1 ]
+  if printf '%s\n' "$out" | grep -q 'tenant|cut'; then
+    echo "FAIL: pod_filter_affected must drop the row cut off mid-record"
+    false
+  fi
+}
+
+@test "lb_first_ready_endpoint picks the first addressed endpoint that is not NotReady" {
+  eps="$(printf '%s\n' \
+    '||tenant|virt-launcher-x|true' \
+    '192.0.2.60|worker-1|tenant|virt-launcher-x|false' \
+    '192.0.2.61|worker-2|tenant|virt-launcher-y|true' \
+    '192.0.2.62|worker-3|tenant|virt-launcher-z|true')"
+
+  out="$(printf '%s\n' "$eps" | lb_first_ready_endpoint)"
+
+  [ "$out" = "192.0.2.61|worker-2|tenant|virt-launcher-y" ]
+}
+
+@test "lb_first_ready_endpoint treats a blank ready column as ready" {
+  eps="$(printf '%s\n' '192.0.2.70|worker-9|tenant|app-0|')"
+
+  out="$(printf '%s\n' "$eps" | lb_first_ready_endpoint)"
+
+  [ "$out" = "192.0.2.70|worker-9|tenant|app-0" ]
+}
+
+@test "lb_first_ready_endpoint drops an endpoint row cut off mid-record" {
+  # The third record filter over a bounded list, and the same cut: the fragment
+  # has to come first, because this one stops at the first row it accepts. A
+  # half-parsed node name would otherwise be the node every endpoint-side
+  # capture in the LB section is aimed at.
+  eps="$(printf '%s\n' \
+    '192.0.2.60|worker-' \
+    '192.0.2.61|worker-2|tenant|app-1|true')"
+
+  out="$(printf '%s\n' "$eps" | lb_first_ready_endpoint)"
+
+  [ "$out" = "192.0.2.61|worker-2|tenant|app-1" ]
+}
+
+@test "lb_announcer_node returns the speaker node of the most recent announce" {
+  logs="$(printf '%s\t%s\n' \
+    'node-a' '{"event":"serviceAnnounced","ips":["192.0.2.50"],"node":"node-a"}' \
+    'node-b' '{"event":"serviceAnnounced","ips":["192.0.2.50"],"node":"node-b"}')"
+
+  out="$(printf '%s\n' "$logs" | lb_announcer_node '192.0.2.50')"
+
+  [ "$out" = "node-b" ]
+}
+
+@test "lb_announcer_node ignores withdraw lines and announces for other IPs" {
+  logs="$(printf '%s\t%s\n' \
+    'node-x' '{"event":"serviceAnnounced","ips":["198.51.100.9"],"node":"node-x"}' \
+    'node-a' '{"event":"serviceAnnounced","ips":["192.0.2.50"],"node":"node-a"}' \
+    'node-b' '{"event":"serviceWithdrawn","ips":["192.0.2.50"],"node":"node-b"}' \
+    'node-c' '{"event":"serviceAnnounced","ips":["192.0.2.50"],"node":"node-c"}')"
+
+  out="$(printf '%s\n' "$logs" | lb_announcer_node '192.0.2.50')"
+
+  [ "$out" = "node-c" ]
+}
+
+@test "lb_announcer_node emits nothing when the IP was never announced" {
+  logs="$(printf '%s\t%s\n' \
+    'node-a' '{"event":"serviceAnnounced","ips":["198.51.100.9"],"node":"node-a"}')"
+
+  out="$(printf '%s\n' "$logs" | lb_announcer_node '192.0.2.50')"
+
+  [ -z "$out" ]
+}
+
+@test "lb_announcer_node excludes a node whose last own event is a withdraw" {
+  # Case A: node-a announces the IP then withdraws it and never re-announces.
+  # Its last own IP-event is the withdraw, so it is NOT the current announcer and
+  # nothing must be reported. The pre-polish logic kept node-a (a withdraw did
+  # not retract a prior announce), so this pins the failover fix.
+  logs="$(printf '%s\t%s\n' \
+    'node-a' '{"event":"serviceAnnounced","ips":["192.0.2.50"],"node":"node-a"}' \
+    'node-a' '{"event":"serviceWithdrawn","ips":["192.0.2.50"],"node":"node-a"}')"
+
+  out="$(printf '%s\n' "$logs" | lb_announcer_node '192.0.2.50')"
+
+  [ -z "$out" ]
+}
+
+@test "lb_announcer_node ignores a stale owner that appears later in concat order" {
+  # Case B: node-c is the true current owner (announce, never withdrawn). Later
+  # in the input -- speaker logs are concatenated per-pod, NOT globally time-
+  # sorted -- a stale node-a announce+withdraw block appears. node-a's last own
+  # event is a withdraw, so the announcer is node-c, NOT the later-in-input
+  # node-a. The pre-polish logic returned node-a (most recent announce by concat
+  # order), so this pins robustness to concat order.
+  logs="$(printf '%s\t%s\n' \
+    'node-c' '{"event":"serviceAnnounced","ips":["192.0.2.50"],"node":"node-c"}' \
+    'node-a' '{"event":"serviceAnnounced","ips":["192.0.2.50"],"node":"node-a"}' \
+    'node-a' '{"event":"serviceWithdrawn","ips":["192.0.2.50"],"node":"node-a"}')"
+
+  out="$(printf '%s\n' "$logs" | lb_announcer_node '192.0.2.50')"
+
+  [ "$out" = "node-c" ]
+}
+
+@test "lb_announcer_node matches the IP as a whole token not a substring" {
+  # Case C: querying 192.0.2.5 must NOT match a 192.0.2.50 announce (the
+  # pre-polish index()/substring match returned node-d here). The exact 192.0.2.5
+  # announce on node-e is matched and wins.
+  logs="$(printf '%s\t%s\n' \
+    'node-d' '{"event":"serviceAnnounced","ips":["192.0.2.50"],"node":"node-d"}' \
+    'node-e' '{"event":"serviceAnnounced","ips":["192.0.2.5"],"node":"node-e"}')"
+
+  no_substr="$(printf '%s\n' "$logs" | lb_announcer_node '192.0.2.5')"
+  no_match="$(printf '%s\t%s\n' \
+    'node-d' '{"event":"serviceAnnounced","ips":["192.0.2.50"],"node":"node-d"}' \
+    | lb_announcer_node '192.0.2.5')"
+
+  [ "$no_substr" = "node-e" ]
+  [ -z "$no_match" ]
+}
+
+@test "lb_capture_decision returns capture when every probe failed" {
+  [ "$(printf 'fail\nfail\nfail\n' | lb_capture_decision)" = "capture" ]
+  [ "$(printf 'fail\n' | lb_capture_decision)" = "capture" ]
+}
+
+@test "lb_capture_decision returns skip when any probe succeeded" {
+  [ "$(printf 'fail\nok\nfail\n' | lb_capture_decision)" = "skip" ]
+  [ "$(printf 'ok\n' | lb_capture_decision)" = "skip" ]
+}
+
+@test "lb_capture_decision returns unknown when no probe ran at all" {
+  # Zero outcomes means nothing was ever attempted -- no probe client in the
+  # host netns, or an exec that could not run. Folding that into skip put a
+  # reachability verdict about the address into the artifact with not one probe
+  # behind it, which on a minimal image is every LB in the cluster.
+  [ "$(printf '' | lb_capture_decision)" = "unknown" ]
+}
+
+@test "lb_budget_ok yes below the cap and no once it is reached" {
+  [ "$(lb_budget_ok 0 6)" = "yes" ]
+  [ "$(lb_budget_ok 5 6)" = "yes" ]
+  [ "$(lb_budget_ok 6 6)" = "no" ]
+  [ "$(lb_budget_ok 7 6)" = "no" ]
+}
+
+@test "capture budget counts captured LBs so a late broken LB is still captured" {
+  # The MAX_LBS cap must bound LBs actually CAPTURED, not LBs enumerated: reachable
+  # (skipped) LBs must not consume the budget, so a broken LB enumerated after many
+  # reachable ones is still characterised. This mirrors the per-LB loop in
+  # capture_lb_datapath, which only consults lb_budget_ok / increments the counter
+  # on the capture branch -- here driven by a fixed decision sequence so no cluster
+  # is needed. With the pre-polish "increment per enumerated LB" logic and max=2,
+  # the loop would have broken at the 3rd LB and never reached the broken one.
+  max=2
+  captured=0
+  last=""
+  for decision in skip skip skip skip skip capture; do
+    if [ "$decision" != "capture" ]; then
+      last="skip"
+      continue
+    fi
+    if [ "$(lb_budget_ok "$captured" "$max")" != "yes" ]; then
+      last="dropped"
+      continue
+    fi
+    captured=$((captured + 1))
+    last="captured"
+  done
+
+  [ "$captured" -eq 1 ]
+  [ "$last" = "captured" ]
+}
+
+@test "capture budget stops after the cap worth of broken LBs" {
+  # Once MAX_LBS broken LBs are captured, further unreachable LBs are not
+  # characterised. max=2, three broken.
+  max=2
+  captured=0
+  dropped=0
+  for decision in capture capture capture; do
+    if [ "$(lb_budget_ok "$captured" "$max")" != "yes" ]; then
+      dropped=$((dropped + 1))
+      continue
+    fi
+    captured=$((captured + 1))
+  done
+
+  [ "$captured" -eq 2 ]
+  [ "$dropped" -eq 1 ]
+}
+
+# -----------------------------------------------------------------------------
+# Behavioural: the reads are bounded, and a bound that fires says so.
+#
+# These run the script rather than sourcing it, so they need the guard NOT set;
+# the runner is invoked as a subprocess, which leaves this file's sourced copy
+# untouched. A stub kubectl that never returns stands in for the case the bounds
+# exist for -- an apiserver that hangs rather than refuses. The bounds are read
+# from the environment so the test does not have to wait out the real ones.
+# -----------------------------------------------------------------------------
+
+# Scratch dir with a kubectl that hangs forever, mimicking an apiserver that
+# accepts the connection and never answers.
+dp_hanging_kubectl_dir() {
+  _d=$(mktemp -d)
+  mkdir -p "$_d/bin"
+  printf '#!/bin/sh\nsleep 300\n' >"$_d/bin/kubectl"
+  chmod +x "$_d/bin/kubectl"
+  printf '%s' "$_d"
+}
+
+# A `timeout` for PATH that decides a cutoff by argv instead of by the clock.
+# A read whose argv matches one of the newline-separated globs in DP_PASS runs
+# unbounded; otherwise one matching DP_CUT exits 124 at once, the status a
+# firing bound produces; anything else goes to DP_REAL_TIMEOUT with its bound
+# intact when that is set, and runs unbounded when it is not. A test that
+# shrinks the real per-read bounds to one second
+# bounds the reads that must ANSWER as well, so on a loaded machine the answer
+# is cut and the collector correctly takes another branch: the test then
+# asserts a decision the clock made. Here the cut is the input, and a read that
+# bypasses `timeout` still reaches the stub and hangs into the test's own
+# backstop.
+dp_cut_timeout() {
+  cat >"$1/timeout" <<'SHIM'
+#!/bin/sh
+all="$*"
+pass=$(printf '%s\n' "${DP_PASS:-}" | while IFS= read -r p; do
+  [ -n "$p" ] || continue
+  case "$all" in ($p) echo y; break ;; esac
+done)
+if [ -z "$pass" ]; then
+  case "$all" in ${DP_CUT:-}) exit 124 ;; esac
+  if [ -n "${DP_REAL_TIMEOUT:-}" ]; then exec "$DP_REAL_TIMEOUT" "$@"; fi
+fi
+while [ $# -gt 0 ]; do
+  case $1 in
+    -k | -s) shift 2 ;;
+    -*) shift ;;
+    *) break ;;
+  esac
+done
+shift
+exec "$@"
+SHIM
+  chmod +x "$1/timeout"
+}
+
+@test "a hung cluster-wide pod list is cut off rather than eating the envelope" {
+  d=$(dp_hanging_kubectl_dir)
+  # Without a per-read bound the first list runs until the CALLER's backstop and
+  # the script writes nothing at all, so the outer timeout here stands in for
+  # that backstop: reaching it means the read was never bounded.
+  PATH="$d/bin:$PATH" COZY_DATAPLANE_LIST_TIMEOUT=2 COZY_DATAPLANE_READ_TIMEOUT=2 \
+    timeout 20 "$SCRIPT" "$d/out" >"$d/log" 2>&1 || true
+  grep -q 'cut off' "$d/log"
+  rm -rf "$d"
+}
+
+@test "the script survives a hung apiserver and still reaches its own end" {
+  # This stub ANSWERS the cluster-wide pod list and hangs on everything after
+  # it, so the walk over affected pods actually runs. A stub that hangs on every
+  # call leaves that list empty, skips the whole branch, and exercises two of
+  # the nine bounded reads while looking like it covered all of them: an
+  # unbounded read added inside the branch would not turn it red.
+  d=$(mktemp -d)
+  mkdir -p "$d/bin"
+  cat >"$d/bin/kubectl" <<'STUB'
+#!/bin/sh
+for a in "$@"; do
+  case $a in
+    pods) echo 'tenant-test|wedged|10.0.0.1|node-a|False|Running||eol'; exit 0 ;;
+  esac
+done
+sleep 300
+STUB
+  chmod +x "$d/bin/kubectl"
+  real_timeout=$(command -v timeout)
+  dp_cut_timeout "$d/bin"
+  # Every bounded read but the pod list is cut; a read that is not bounded
+  # reaches the stub's sleep and runs into the outer 90s instead.
+  rc=0
+  PATH="$d/bin:$PATH" DP_PASS='*get pods -A*' DP_CUT='*' \
+    "$real_timeout" 90 "$SCRIPT" "$d/out" >"$d/log" 2>&1 || rc=$?
+  [ "$rc" -eq 0 ] || { echo "the collector did not finish on its own (exit $rc):"; cat "$d/log"; exit 1; }
+  # The closing lines print only if control reached them, which it cannot do
+  # while blocked on a read along the way.
+  grep -q 'host->pod data-plane capture complete' "$d/log"
+  grep -q 'skipping LB-datapath capture' "$d/log"
+  # And the per-pod branch was really walked, so the reads inside it are covered
+  # rather than assumed.
+  grep -q 'looking up the pod matching' "$d/log"
+  rm -rf "$d"
+}
+
+@test "a read that failed instantly is not reported as a timeout" {
+  # The bounds produce 124 or 137 and nothing else, so any other status is
+  # kubectl answering -- refused, denied, no such kind. Naming a timeout there
+  # puts a cause in the artifact that never happened, and because these reads
+  # send stderr to a sink rather than the log, that false cause would be the
+  # only thing a reader gets. This is the path the hung-apiserver tests above
+  # never reach.
+  d=$(mktemp -d)
+  mkdir -p "$d/bin"
+  printf '#!/bin/sh\necho "The connection to the server was refused" >&2\nexit 1\n' >"$d/bin/kubectl"
+  chmod +x "$d/bin/kubectl"
+  PATH="$d/bin:$PATH" timeout 20 "$SCRIPT" "$d/out" >"$d/log" 2>&1 || true
+  # Scoped to this script's own note lines: a bare grep over the whole log would
+  # go red on any future line that merely contains the word.
+  if grep '^\[capture-dataplane\]' "$d/log" | grep -q 'timeout'; then
+    echo "an instant failure was reported as a timeout:"
+    cat "$d/log"
+    exit 1
+  fi
+  # It must still say the read produced nothing, and say why, or the silence
+  # this suite exists to remove comes back.
+  grep -q 'kubectl exited 1' "$d/log"
+  # And that kubectl's own words come with it: the exit code alone reads the
+  # same whether the message was captured or dropped on the floor.
+  grep -q 'refused' "$d/out/capture-notes.txt"
+  rm -rf "$d"
+}
+
+@test "a kubectl error cannot forge a second verdict line in the log" {
+  # log() carries kubectl's stderr now, and under /bin/sh echo would expand a
+  # literal backslash-n in it into a real newline, printing a second
+  # "[capture-dataplane] ..." line that reads as this script's own finding. The
+  # jsonpath in these reads contains {"\n"} and kubectl quotes the expression
+  # back on a parse error, so this needs no malice to happen.
+  d=$(mktemp -d)
+  mkdir -p "$d/bin"
+  printf '#!/bin/sh\nprintf %%s "unauthorized: x\\\\n[capture-dataplane] no scheduled NotReady pods -- nothing was wrong" >&2\nexit 1\n' >"$d/bin/kubectl"
+  chmod +x "$d/bin/kubectl"
+  PATH="$d/bin:$PATH" timeout 20 "$SCRIPT" "$d/out" >"$d/log" 2>&1 || true
+  # Exactly one note about the pod list, and the forged sentence must not be
+  # sitting on a line of its own wearing this script's prefix.
+  # The note must exist before its shape means anything: a stub that stopped
+  # short of the read would satisfy a purely negative assertion.
+  grep -q 'listing pods failed' "$d/log"
+  forged=$(grep -c '^\[capture-dataplane\] no scheduled NotReady pods -- nothing was wrong' "$d/log" || true)
+  if [ "$forged" -ne 0 ]; then
+    echo "kubectl stderr forged a verdict line:"
+    cat "$d/log"
+    exit 1
+  fi
+  rm -rf "$d"
+}
+
+@test "a node with no matching pod is not reported as a failed read" {
+  # The per-node lookups ask for one pod by label on one node, and the ordinary
+  # answer is that there is none -- a node without a cilium-agent is the case
+  # this capture exists for. That answer must not arrive as a failed read now
+  # that a non-zero status carries a note.
+  #
+  # Reaching this path needs a kubectl that ANSWERS the cluster-wide list with
+  # one affected pod; the other tests never get here because their list fails
+  # first and leaves nothing to walk.
+  d=$(mktemp -d)
+  mkdir -p "$d/bin"
+  cat >"$d/bin/kubectl" <<'STUB'
+#!/bin/sh
+for a in "$@"; do
+  case $a in
+    pods) echo 'tenant-test|wedged|10.0.0.1|node-a|False|Running||eol'; exit 0 ;;
+  esac
+done
+# The behaviour under test: client-go's evalArray has no allowMissingKeys
+# escape, so indexing [0] into an empty list is a hard error and kubectl exits
+# 1, while [*] returns empty and exits 0. Without this arm the stub answers 0
+# to both forms and the test cannot see the difference it exists to pin.
+case "$*" in
+  *'items[0]'*) echo 'error: array index out of bounds: index 0, length 0' >&2; exit 1 ;;
+esac
+exit 0
+STUB
+  chmod +x "$d/bin/kubectl"
+  PATH="$d/bin:$PATH" timeout 30 "$SCRIPT" "$d/out" >"$d/log" 2>&1 || true
+  if grep -q 'looking up the pod matching' "$d/log"; then
+    echo "an absent pod was reported as a failed read:"
+    grep 'looking up the pod matching' "$d/log"
+    exit 1
+  fi
+  if grep -q 'looking up an ovn-central replica' "$d/log"; then
+    echo "an absent ovn-central was reported as a failed read:"
+    grep 'looking up an ovn-central replica' "$d/log"
+    exit 1
+  fi
+  # Positive anchors, because everything above is a negative: a stub that
+  # stopped short of the walk would satisfy all of it while asserting nothing.
+  # These are the lines the path is supposed to produce when it does run.
+  grep -q 'no cilium-agent pod found on node node-a' "$d/out/node-node-a.txt"
+  grep -q 'no ovn-central pod in' "$d/log"
+  rm -rf "$d"
+}
+
+@test "the same per-node pod lookup is asked once" {
+  # Each repeat costs its own bound against an apiserver that hangs, so a lookup
+  # asked three times per pod spends the caller's envelope on re-asking instead
+  # of on more pods. The stub records every per-node lookup it is given.
+  d=$(mktemp -d)
+  mkdir -p "$d/bin"
+  cat >"$d/bin/kubectl" <<'STUB'
+#!/bin/sh
+for a in "$@"; do
+  case $a in
+    pods) echo 'tenant-test|wedged|10.0.0.1|node-a|False|Running||eol'; exit 0 ;;
+  esac
+done
+case "$*" in
+  *--field-selector*) echo "$*" >>"$STUB_CALLS" ;;
+esac
+exit 0
+STUB
+  chmod +x "$d/bin/kubectl"
+  STUB_CALLS="$d/calls" PATH="$d/bin:$PATH" timeout 60 "$SCRIPT" "$d/out" >/dev/null 2>&1 || true
+  [ -s "$d/calls" ]
+  dups=$(sort "$d/calls" | uniq -d | wc -l | tr -d ' ')
+  if [ "$dups" -ne 0 ]; then
+    echo "the same lookup was issued more than once:"
+    sort "$d/calls" | uniq -c | sort -rn | head -5
+    exit 1
+  fi
+  rm -rf "$d"
+}
+
+@test "an unanswered pod list is not reported as a cluster with nothing wrong" {
+  # The empty-list branch used to print the same line whether the list said
+  # "nothing is affected" or never answered, directly under the note saying the
+  # read had failed.
+  d=$(mktemp -d)
+  mkdir -p "$d/bin"
+  printf '#!/bin/sh\nexit 1\n' >"$d/bin/kubectl"
+  chmod +x "$d/bin/kubectl"
+  PATH="$d/bin:$PATH" timeout 20 "$SCRIPT" "$d/out" >"$d/log" 2>&1 || true
+  if grep -q 'no scheduled NotReady pods' "$d/log"; then
+    echo "a failed list was reported as nothing being affected:"
+    cat "$d/log"
+    exit 1
+  fi
+  grep -q 'whether any pod is affected is unknown' "$d/log"
+  rm -rf "$d"
+}
+
+@test "an unanswered ovn-central lookup is not reported as a cluster without it" {
+  # Mirror of the pod-list case: the note saying the lookup failed used to sit
+  # directly above a line asserting there is no ovn-central, which the script
+  # never observed.
+  d=$(mktemp -d)
+  mkdir -p "$d/bin"
+  cat >"$d/bin/kubectl" <<'STUB'
+#!/bin/sh
+for a in "$@"; do
+  case $a in
+    pods) echo 'tenant-test|wedged|10.0.0.1|node-a|False|Running||eol'; exit 0 ;;
+  esac
+done
+case "$*" in
+  *'app=ovn-central'*) echo 'Error from server (Forbidden): pods is forbidden' >&2; exit 1 ;;
+esac
+exit 0
+STUB
+  chmod +x "$d/bin/kubectl"
+  PATH="$d/bin:$PATH" timeout 60 "$SCRIPT" "$d/out" >"$d/log" 2>&1 || true
+  if grep -q 'no ovn-central pod in' "$d/log"; then
+    echo "a failed lookup was reported as the cluster not running ovn-central:"
+    cat "$d/log"
+    exit 1
+  fi
+  # The distinctive form: 'is unknown' alone also matches the Service-list note.
+  grep -q 'runs ovn-central is unknown' "$d/log"
+  rm -rf "$d"
+}
+
+@test "an unanswered service list is not reported as a cluster without LoadBalancers" {
+  # Third instance of the same rule, and the read this PR's stated purpose names
+  # directly: an unanswered list must not be reported as an empty one.
+  d=$(mktemp -d)
+  mkdir -p "$d/bin"
+  cat >"$d/bin/kubectl" <<'STUB'
+#!/bin/sh
+case "$*" in
+  *'get svc'*) echo 'Error from server (Forbidden): services is forbidden' >&2; exit 1 ;;
+esac
+exit 0
+STUB
+  chmod +x "$d/bin/kubectl"
+  PATH="$d/bin:$PATH" timeout 30 "$SCRIPT" "$d/out" >"$d/log" 2>&1 || true
+  if grep -q 'no Service type=LoadBalancer' "$d/log"; then
+    echo "a failed service list was reported as a cluster without LoadBalancers:"
+    cat "$d/log"
+    exit 1
+  fi
+  grep -q 'whether any LoadBalancer needs capturing is unknown' "$d/log"
+  rm -rf "$d"
+}
+
+@test "a partially answered service list is not captured as a complete one" {
+  # A list can fail after emitting rows: a bound firing mid-stream leaves output
+  # on stdout and 124 in $?. Gating the note on an empty result would let that
+  # partial inventory be captured with nothing saying it was partial.
+  d=$(mktemp -d)
+  mkdir -p "$d/bin"
+  cat >"$d/bin/kubectl" <<'STUB'
+#!/bin/sh
+case "$*" in
+  *'get svc'*)
+    echo 'tenant|web|LoadBalancer|192.0.2.10|80|30080|Cluster'
+    exit 1 ;;
+esac
+exit 0
+STUB
+  chmod +x "$d/bin/kubectl"
+  PATH="$d/bin:$PATH" timeout 30 "$SCRIPT" "$d/out" >"$d/log" 2>&1 || true
+  # It must both proceed with what it got and say the list did not finish.
+  grep -q 'probing 1 LoadBalancer service' "$d/log"
+  if ! grep -q 'listing services' "$d/log"; then
+    echo "a partial service list was captured with no note that it failed:"
+    cat "$d/log"
+    exit 1
+  fi
+  rm -rf "$d"
+}
+
+@test "a partially answered endpointslice read is not called an unread one" {
+  # The same shape as the service list above, at the two EndpointSlice reads: a
+  # bound firing mid-stream leaves rows on stdout and 124 in $?. The backend is
+  # then parsed from what did arrive and printed by name, so a note asserting
+  # what the artifact will say -- rather than what is missing from it -- lands
+  # two lines from a block that contradicts it. The sibling notes in this file
+  # avoid that by naming the omission, and pod_on_node names no consequence at
+  # all because it serves callers that do different things with the answer.
+  d=$(mktemp -d)
+  mkdir -p "$d/bin"
+  cat >"$d/bin/kubectl" <<'STUB'
+#!/bin/sh
+for a in "$@"; do
+  case $a in
+    pods) exit 0 ;;
+    svc) echo 'tenant|web|LoadBalancer|192.0.2.10|80|30080|Cluster'; exit 0 ;;
+    # Complete rows AND a bound's status: the read answered in part.
+    endpointslices) echo '10.0.0.1|node-a|tenant-test|wedged|true'; exit 124 ;;
+  esac
+done
+exit 0
+STUB
+  chmod +x "$d/bin/kubectl"
+  PATH="$d/bin:$PATH" timeout 60 "$SCRIPT" "$d/out" >"$d/log" 2>&1 || true
+  # The rows that did arrive are used, so the artifact names a backend ...
+  grep -q 'ip=10.0.0.1' "$d/out/lb-tenant_web.txt"
+  # ... and the cut is on the record beside it.
+  grep -q 'was cut off' "$d/out/capture-notes.txt"
+  # Neither note may claim the value went in as unknown while the block above
+  # names it. Scoped to each note's own line: 'unknown' appears legitimately
+  # elsewhere in this file, including on the announcer line of this very block.
+  if grep 'endpointslices of tenant/web' "$d/out/capture-notes.txt" | grep -q 'unknown'; then
+    echo "the note calls the backend unknown while the capture names it:"
+    cat "$d/out/lb-tenant_web.txt"
+    grep 'endpointslices of tenant/web' "$d/out/capture-notes.txt"
+    exit 1
+  fi
+  if grep 'target port of tenant/web' "$d/out/capture-notes.txt" | grep -q 'unknown'; then
+    echo "the note calls the target port unknown while the capture names one:"
+    cat "$d/out/lb-tenant_web.txt"
+    grep 'target port of tenant/web' "$d/out/capture-notes.txt"
+    exit 1
+  fi
+  rm -rf "$d"
+}
+
+@test "a note does not claim a step was skipped when the step runs" {
+  # A lookup can fail after naming what it was asked for. Both of these notes
+  # used to state the consequence unconditionally, so the log said the OVN dump
+  # was skipped and the announcer unresolved while both were being produced from
+  # the partial answer.
+  d=$(mktemp -d)
+  mkdir -p "$d/bin"
+  cat >"$d/bin/kubectl" <<'STUB'
+#!/bin/sh
+for a in "$@"; do
+  case $a in
+    pods) echo 'tenant-test|wedged|10.0.0.1|node-a|False|Running||eol'; exit 0 ;;
+  esac
+done
+case "$*" in
+  *'app=ovn-central'*) echo 'ovn-central-0'; echo 'boom' >&2; exit 1 ;;
+esac
+exit 0
+STUB
+  chmod +x "$d/bin/kubectl"
+  PATH="$d/bin:$PATH" timeout 60 "$SCRIPT" "$d/out" >"$d/log" 2>&1 || true
+  # It named a replica, so the dump ran; the note must not say it was skipped.
+  [ -f "$d/out/ovn-lflows.txt" ]
+  # Greps the wording the skip branches actually use, not a phrase that only
+  # existed while this was being written: a dead string can never appear, so the
+  # assertion could never fire.
+  if grep -q 'skipping OVN logical-flow dump' "$d/log"; then
+    echo "the log says the dump was skipped while the dump ran:"
+    cat "$d/log"
+    exit 1
+  fi
+  rm -rf "$d"
+}
+
+@test "a partially answered pod list is not called unanswered" {
+  # The list can fail after emitting rows. If everything it named is Ready the
+  # affected set is empty and the status is non-zero, which is the same pair of
+  # conditions a total failure produces -- so this branch must not assert what
+  # the read did, only what is left unknown.
+  d=$(mktemp -d)
+  mkdir -p "$d/bin"
+  cat >"$d/bin/kubectl" <<'STUB'
+#!/bin/sh
+for a in "$@"; do
+  case $a in
+    pods) echo 'tenant-test|healthy|10.0.0.9|node-a|True|Running||eol'; exit 1 ;;
+  esac
+done
+exit 0
+STUB
+  chmod +x "$d/bin/kubectl"
+  PATH="$d/bin:$PATH" timeout 30 "$SCRIPT" "$d/out" >"$d/log" 2>&1 || true
+  # Both assertions are positive because the wording they pin is the whole
+  # point: a branch that described the read instead would not emit either line.
+  grep -q 'whatever it did not name is missing' "$d/log"
+  grep -q 'whether any pod is affected is unknown' "$d/log"
+  rm -rf "$d"
+}
+
+@test "a cut-off node lookup is not written into the artifact as an absent pod" {
+  # The artifact is what a reader opens out of the cozyreport bundle, and it is
+  # where "(no cilium-agent pod found)" used to be written for a lookup that
+  # never answered. Bounding that read is what made this reachable: unbounded,
+  # the script hung until the caller's backstop killed it and no file was
+  # written at all, so the bound turned "no artifact" into "an artifact with a
+  # claim in it".
+  d=$(mktemp -d)
+  mkdir -p "$d/bin"
+  cat >"$d/bin/kubectl" <<'STUB'
+#!/bin/sh
+for a in "$@"; do
+  case $a in
+    pods) echo 'tenant-test|wedged|10.0.0.1|node-a|False|Running||eol'; exit 0 ;;
+  esac
+done
+case "$*" in
+  *--field-selector*spec.nodeName*) sleep 300 ;;
+esac
+exit 0
+STUB
+  chmod +x "$d/bin/kubectl"
+  real_timeout=$(command -v timeout)
+  dp_cut_timeout "$d/bin"
+  rc=0
+  PATH="$d/bin:$PATH" DP_CUT='*--field-selector spec.nodeName=*' \
+    "$real_timeout" 90 "$SCRIPT" "$d/out" >"$d/log" 2>&1 || rc=$?
+  [ "$rc" -eq 0 ] || { echo "the collector did not finish on its own (exit $rc):"; cat "$d/log"; exit 1; }
+  # The decision under test, as the collector reports it.
+  grep -q 'looking up the pod matching k8s-app=cilium on node node-a was cut off' "$d/log"
+  [ -f "$d/out/node-node-a.txt" ]
+  if grep -q 'no cilium-agent pod found' "$d/out/node-node-a.txt"; then
+    echo "a cut-off lookup was recorded as an absent pod:"
+    cat "$d/out/node-node-a.txt"
+    exit 1
+  fi
+  grep -q 'could not determine whether a cilium-agent runs' "$d/out/node-node-a.txt"
+  rm -rf "$d"
+}
+
+@test "the host netns capture names every address, not only ovn0" {
+  # The reason this commit exists: when a podIP turns out to be a local address
+  # of the host netns, `ip addr show ovn0` cannot say which interface holds it.
+  # Nothing else in this suite reaches these two captures -- deleting both left
+  # every other test green -- so without this the collector could quietly lose
+  # the evidence the change was written to collect.
+  #
+  # Asserted on the kubectl argv, and the section headers are the secondary
+  # check rather than the primary one. A header is an `echo` the script emits
+  # before the exec, so dropping the exec and keeping the label leaves an empty
+  # section behind and every header grep green -- either capture alone, or both
+  # together, and the whole suite stays green. The argv also pins WHERE the
+  # capture runs -- `-c cni-server`, the container that shares the host netns --
+  # which is half the property and one a header cannot carry at all.
+  d=$(mktemp -d)
+  mkdir -p "$d/bin"
+  cat >"$d/bin/kubectl" <<'STUB'
+#!/bin/sh
+case "$*" in
+  *'ip -o addr show'*|*'ip route show table local'*) echo "$*" >>"$STUB_CALLS" ;;
+esac
+for a in "$@"; do
+  case $a in
+    pods) echo 'tenant-test|wedged|10.0.0.1|node-a|False|Running||eol'; exit 0 ;;
+  esac
+done
+case "$*" in
+  *'app=kube-ovn-cni'*) echo 'cni-abc'; exit 0 ;;
+esac
+exit 0
+STUB
+  chmod +x "$d/bin/kubectl"
+  STUB_CALLS="$d/calls" PATH="$d/bin:$PATH" timeout 120 "$SCRIPT" "$d/out" >"$d/log" 2>&1 || true
+  [ -f "$d/out/node-node-a.txt" ]
+  # Positive control: the host-netns section ran, so a missing address capture
+  # below is that capture's absence and not the whole block being skipped.
+  grep -q 'host netns: ip rule' "$d/out/node-node-a.txt"
+  # The commands the collector actually issued into the host netns ...
+  grep -q -- '-c cni-server -- ip -o addr show' "$d/calls"
+  grep -q -- '-c cni-server -- ip route show table local' "$d/calls"
+  # ... and the labels a reader of the artifact finds them under.
+  grep -q 'ip -o addr show, all interfaces' "$d/out/node-node-a.txt"
+  grep -q 'ip route show table local' "$d/out/node-node-a.txt"
+  rm -rf "$d"
+}
+
+@test "a healthy pod on the node is captured beside the affected one" {
+  # The baseline is the point of the reference leg, and it only pays off in the
+  # SAME file as the affected pod: a reader comparing a suspicious route against
+  # a normal one should not have to go and find the normal one.
+  d=$(mktemp -d)
+  mkdir -p "$d/bin"
+  cat >"$d/bin/kubectl" <<'STUB'
+#!/bin/sh
+for a in "$@"; do
+  case $a in
+    pods)
+      echo 'tenant-test|wedged|10.0.0.1|node-a|False|Running||eol'
+      echo 'cozy-cilium|cilium-xyz|10.0.0.5|node-a|True|Running|true|eol'
+      echo 'tenant|healthy|10.0.0.9|node-a|True|Running||eol'
+      exit 0 ;;
+  esac
+done
+case "$*" in
+  # A cni-server on the node, so the IP-specific legs actually run. Without it
+  # they are skipped and the baseline would be a header with no comparison in
+  # it -- which is the whole thing this leg is for.
+  *'app=kube-ovn-cni'*) echo 'cni-abc'; exit 0 ;;
+esac
+exit 0
+STUB
+  chmod +x "$d/bin/kubectl"
+  PATH="$d/bin:$PATH" timeout 90 "$SCRIPT" "$d/out" >"$d/log" 2>&1 || true
+  [ -f "$d/out/pod-tenant-test_wedged.txt" ]
+  grep -q 'POD tenant-test/wedged' "$d/out/pod-tenant-test_wedged.txt"
+  grep -q 'REFERENCE (Ready)' "$d/out/pod-tenant-test_wedged.txt"
+  grep -q 'POD tenant/healthy' "$d/out/pod-tenant-test_wedged.txt"
+  # And the baseline carries the evidence it exists to provide: the route and
+  # conntrack for the HEALTHY pod's address, not just a section header. A
+  # baseline without these compares nothing.
+  grep -q 'ip route get 10.0.0.9' "$d/out/pod-tenant-test_wedged.txt"
+  grep -q 'kernel conntrack for 10.0.0.9' "$d/out/pod-tenant-test_wedged.txt"
+  # The hostNetwork pod sorts first in the snapshot and must not have been
+  # taken: its podIP is the node's own address, the fingerprint the baseline
+  # exists to rule out.
+  if grep -q 'POD cozy-cilium/cilium-xyz' "$d/out/pod-tenant-test_wedged.txt"; then
+    echo "a hostNetwork pod was taken as the baseline:"
+    cat "$d/out/pod-tenant-test_wedged.txt"
+    exit 1
+  fi
+  rm -rf "$d"
+}
+
+@test "the baseline is captured at route-only scope, not the full one" {
+  # The baseline exists to show a normal route and conntrack beside a suspicious
+  # one. Cilium CT, the OVN port binding and the OVS ovn-installed flag describe
+  # how a pod was PROGRAMMED, and a pod chosen for being healthy is correctly
+  # programmed by definition -- they compare nothing and cost 105s of exec bound
+  # on the leg most likely to be cut. Dropping them leaves that time in the
+  # wall-clock budget for affected pods, so the scope is load-bearing and not a
+  # preference.
+  d=$(mktemp -d)
+  mkdir -p "$d/bin"
+  cat >"$d/bin/kubectl" <<'STUB'
+#!/bin/sh
+for a in "$@"; do
+  case $a in
+    pods)
+      echo 'tenant-test|wedged|10.0.0.1|node-a|False|Running||eol'
+      echo 'tenant|healthy|10.0.0.9|node-a|True|Running||eol'
+      exit 0 ;;
+  esac
+done
+case "$*" in
+  # Everything the full scope needs is present, so its absence from the
+  # baseline is a decision and not a missing dependency.
+  *'k8s-app=cilium'*) echo 'cilium-xyz'; exit 0 ;;
+  *'app=ovs'*) echo 'ovs-xyz'; exit 0 ;;
+  *'app=kube-ovn-cni'*) echo 'cni-abc'; exit 0 ;;
+  *'app=ovn-central'*) echo 'ovn-central-0'; exit 0 ;;
+esac
+exit 0
+STUB
+  chmod +x "$d/bin/kubectl"
+  PATH="$d/bin:$PATH" timeout 120 "$SCRIPT" "$d/out" >"$d/log" 2>&1 || true
+  f="$d/out/pod-tenant-test_wedged.txt"
+  [ -f "$f" ]
+  # Positive control: the affected pod gets the full scope, so the blocks exist
+  # and their absence below is scope and not a stub that answered nothing.
+  awk '/REFERENCE \(Ready\)/ { exit } { print }' "$f" | grep -q 'cilium-dbg bpf ct list global'
+  awk '/REFERENCE \(Ready\)/ { exit } { print }' "$f" | grep -q 'OVN Port_Binding'
+  # The baseline keeps what it is read for ...
+  awk '/REFERENCE \(Ready\)/,0' "$f" | grep -q 'ip route get 10.0.0.9'
+  awk '/REFERENCE \(Ready\)/,0' "$f" | grep -q 'kernel conntrack for 10.0.0.9'
+  # ... says in the artifact that the rest was a decision ...
+  awk '/REFERENCE \(Ready\)/,0' "$f" | grep -q 'scope: route and conntrack only'
+  awk '/REFERENCE \(Ready\)/,0' "$f" | grep -q 'absence below is a decision, not a lookup'
+  # ... and drops what compares nothing. Matched against SECTION HEADERS only:
+  # the marker line above names the very blocks it skips, so a bare substring
+  # search finds the explanation and calls it the block.
+  for section in 'cilium-dbg bpf ct list global' 'OVN Port_Binding' 'ovn-installed' 'Ready conditions'; do
+    if awk '/REFERENCE \(Ready\)/,0' "$f" | grep '^=== ' | grep -q "$section"; then
+      echo "the baseline was captured at full scope: section '$section' present after REFERENCE"
+      awk '/REFERENCE \(Ready\)/,0' "$f" | grep '^=== '
+      exit 1
+    fi
+  done
+  rm -rf "$d"
+}
+
+@test "the baseline column is read from the cluster-wide snapshot" {
+  # The seventh column is what lets the baseline be chosen without a second
+  # read. Drop it from the jsonpath and every row is a six-field fragment that
+  # the NF guards reject -- no affected pods, no baseline, nothing captured. The
+  # stub answers only a request that asks for hostNetwork, so a jsonpath that
+  # stopped asking produces an empty list and this test goes red.
+  d=$(mktemp -d)
+  mkdir -p "$d/bin"
+  cat >"$d/bin/kubectl" <<'STUB'
+#!/bin/sh
+case "$*" in
+  *'spec.hostNetwork'*)
+    echo 'tenant-test|wedged|10.0.0.1|node-a|False|Running||eol'
+    echo 'tenant|healthy|10.0.0.9|node-a|True|Running||eol'
+    exit 0 ;;
+esac
+for a in "$@"; do
+  case $a in
+    pods) exit 0 ;;
+  esac
+done
+exit 0
+STUB
+  chmod +x "$d/bin/kubectl"
+  PATH="$d/bin:$PATH" timeout 90 "$SCRIPT" "$d/out" >"$d/log" 2>&1 || true
+  [ -f "$d/out/pod-tenant-test_wedged.txt" ]
+  grep -q 'POD tenant/healthy' "$d/out/pod-tenant-test_wedged.txt"
+  rm -rf "$d"
+}
+
+@test "two affected pods on one node share a single baseline capture" {
+  # The baseline depends on the node alone, and several affected pods on one
+  # node is what a wedged datapath looks like rather than an edge case. What
+  # must not repeat is the CAPTURE -- a second full per-pod capture of the same
+  # healthy pod, against a budget the pod leg already strains. Counted by the
+  # baseline's route exec, which happens once per capture.
+  d=$(mktemp -d)
+  mkdir -p "$d/bin"
+  cat >"$d/bin/kubectl" <<'STUB'
+#!/bin/sh
+case "$*" in
+  # The baseline runs at route-only scope, so its conditions read is gone --
+  # count the route exec, which is the read that scope does make.
+  *'ip route get 10.0.0.9'*) echo ref-capture >>"$STUB_CALLS" ;;
+esac
+for a in "$@"; do
+  case $a in
+    pods)
+      echo 'tenant-test|wedged-a|10.0.0.1|node-a|False|Running||eol'
+      echo 'tenant-test|wedged-b|10.0.0.2|node-a|False|Running||eol'
+      echo 'tenant|healthy|10.0.0.9|node-a|True|Running||eol'
+      exit 0 ;;
+  esac
+done
+case "$*" in
+  *'app=kube-ovn-cni'*) echo 'cni-abc'; exit 0 ;;
+esac
+exit 0
+STUB
+  chmod +x "$d/bin/kubectl"
+  STUB_CALLS="$d/calls" PATH="$d/bin:$PATH" timeout 120 "$SCRIPT" "$d/out" >"$d/log" 2>&1 || true
+  # Both pods carry the baseline: the saving must not cost one of them its copy.
+  grep -q 'POD tenant/healthy' "$d/out/pod-tenant-test_wedged-a.txt"
+  grep -q 'POD tenant/healthy' "$d/out/pod-tenant-test_wedged-b.txt"
+  n=$(grep -c ref-capture "$d/calls")
+  if [ "$n" -ne 1 ]; then
+    echo "the baseline was captured $n times for one node instead of once"
+    exit 1
+  fi
+  rm -rf "$d"
+}
+
+@test "the pod list jsonpath emits its columns in the order its readers index" {
+  # Every runtime test below answers the pod list from a stub that writes rows
+  # by hand, so none of them can observe the jsonpath's column ORDER: swap two
+  # fields in it and the suite stays green while the filters go on reading
+  # position 6 as phase and 7 as hostNetwork. Measured -- swapping
+  # `.status.phase` with `.spec.hostNetwork` passed 72 of 72.
+  #
+  # Against a cluster that swap makes pod_filter_affected compare a boolean
+  # against Succeeded/Failed and pod_first_ready compare a phase against
+  # "false", so the collector selects the wrong pods and says nothing. The
+  # positions are a contract between one jsonpath and three readers -- both awk
+  # filters and the `read` in the capture loop -- and no stub can hold it.
+  #
+  # Asserted as ORDER rather than as an exact string, so reformatting the
+  # jsonpath is free and reordering it is not.
+  #
+  # Each field carries its closing brace, and that is load-bearing rather than
+  # tidy: `.metadata.name` is a prefix of `.metadata.namespace`, so searching
+  # for it bare finds the namespace field and reports the two columns at one
+  # offset. The brace is what makes each search hit its own column.
+  line=$(grep -F '{range .items[*]}' "$SCRIPT" | grep -F 'spec.hostNetwork')
+  [ -n "$line" ]
+  prev=0
+  for f in '.metadata.namespace}' '.metadata.name}' '.status.podIP}' '.spec.nodeName}' \
+           'type=="Ready")].status}' '.status.phase}' '.spec.hostNetwork}' '|eol"}'; do
+    cur=$(printf '%s\n' "$line" | awk -v s="$f" '{ print index($0, s) }')
+    # index() returns 0 for absent, so this one comparison catches a field that
+    # moved and a field that vanished.
+    if [ "$cur" -le "$prev" ]; then
+      echo "the pod list jsonpath no longer emits its columns in the order its readers assume"
+      echo "field '$f' is at offset $cur, expected after $prev"
+      echo "line: $line"
+      exit 1
+    fi
+    prev=$cur
+  done
+}
+
+@test "an affected pod gets the baseline from its own node" {
+  # The complement of the test above, and the half a shared cache can break
+  # without breaking that one: the cache is keyed by node, and a key that
+  # stopped telling nodes apart would serve every node the first node's
+  # answer. The test above counts captures and a single shared answer is
+  # exactly one capture, so it would stay green.
+  #
+  # What the reader would then get is a route and a conntrack table read on
+  # one kernel, filed under a heading naming a different node, with nothing
+  # in the artifact saying so -- a capture reporting what it never observed,
+  # which is the failure this collector exists to rule out. So the assertion
+  # is on WHICH healthy pod each file carries, per file, not on how many
+  # captures ran.
+  d=$(mktemp -d)
+  mkdir -p "$d/bin"
+  cat >"$d/bin/kubectl" <<'STUB'
+#!/bin/sh
+for a in "$@"; do
+  case $a in
+    pods)
+      echo 'tenant-test|wedged-a|10.0.0.1|node-a|False|Running||eol'
+      echo 'tenant-test|wedged-b|10.0.0.2|node-b|False|Running||eol'
+      echo 'tenant|healthy-a|10.0.0.9|node-a|True|Running||eol'
+      echo 'tenant|healthy-b|10.0.0.8|node-b|True|Running||eol'
+      exit 0 ;;
+  esac
+done
+case "$*" in
+  *'app=kube-ovn-cni'*) echo 'cni-abc'; exit 0 ;;
+esac
+exit 0
+STUB
+  chmod +x "$d/bin/kubectl"
+  PATH="$d/bin:$PATH" timeout 120 "$SCRIPT" "$d/out" >"$d/log" 2>&1 || true
+  fa="$d/out/pod-tenant-test_wedged-a.txt"
+  fb="$d/out/pod-tenant-test_wedged-b.txt"
+  [ -f "$fa" ]
+  [ -f "$fb" ]
+  # Each file names its own node's healthy pod ...
+  grep -q 'POD tenant/healthy-a' "$fa"
+  grep -q 'POD tenant/healthy-b' "$fb"
+  # ... and carries that pod's address in the evidence, not just in a heading.
+  grep -q 'ip route get 10.0.0.9' "$fa"
+  grep -q 'ip route get 10.0.0.8' "$fb"
+  # ... and neither carries the other node's, which is what a node-agnostic
+  # cache key produces: both files served whichever node was reached first.
+  if grep -q 'POD tenant/healthy-b' "$fa" || grep -q 'POD tenant/healthy-a' "$fb"; then
+    echo "a baseline crossed nodes:"
+    grep -H 'POD tenant/healthy' "$fa" "$fb"
+    exit 1
+  fi
+  rm -rf "$d"
+}
+
+@test "a partially answered pod list is not called unanswered by the baseline" {
+  # The absence branch fires on "read failed AND no eligible pod", which is what
+  # a partial answer produces: rows arrive, none of them can serve -- the
+  # affected pod is not Ready, the hostNetwork pod is excluded -- and the list
+  # then dies mid-stream. Saying it never answered would assert what the run did
+  # not observe. It did not FINISH, which is true either way.
+  #
+  # With one snapshot this is the only way to reach that branch at all: a list
+  # that answered nothing leaves no affected pods, so no pod file is written.
+  d=$(mktemp -d)
+  mkdir -p "$d/bin"
+  cat >"$d/bin/kubectl" <<'STUB'
+#!/bin/sh
+for a in "$@"; do
+  case $a in
+    pods)
+      echo 'tenant-test|wedged|10.0.0.1|node-a|False|Running||eol'
+      echo 'cozy-cilium|cilium-xyz|10.0.0.5|node-a|True|Running|true|eol'
+      exit 1 ;;
+  esac
+done
+exit 0
+STUB
+  chmod +x "$d/bin/kubectl"
+  PATH="$d/bin:$PATH" timeout 90 "$SCRIPT" "$d/out" >"$d/log" 2>&1 || true
+  [ -f "$d/out/pod-tenant-test_wedged.txt" ]
+  grep -q 'REFERENCE (Ready) pod on node=node-a: unknown' "$d/out/pod-tenant-test_wedged.txt"
+  grep -q 'the pod list did not finish' "$d/out/pod-tenant-test_wedged.txt"
+  rm -rf "$d"
+}
+
+@test "a node whose snapshot holds no eligible pod says none found" {
+  # The other side of the same branch, and the reason it needs two wordings: a
+  # complete list with nothing eligible on the node is an answer, not a gap.
+  d=$(mktemp -d)
+  mkdir -p "$d/bin"
+  cat >"$d/bin/kubectl" <<'STUB'
+#!/bin/sh
+for a in "$@"; do
+  case $a in
+    pods)
+      echo 'tenant-test|wedged|10.0.0.1|node-a|False|Running||eol'
+      echo 'cozy-cilium|cilium-xyz|10.0.0.5|node-a|True|Running|true|eol'
+      exit 0 ;;
+  esac
+done
+exit 0
+STUB
+  chmod +x "$d/bin/kubectl"
+  PATH="$d/bin:$PATH" timeout 90 "$SCRIPT" "$d/out" >"$d/log" 2>&1 || true
+  grep -q 'none found -- no baseline available' "$d/out/pod-tenant-test_wedged.txt"
+  if grep -q 'did not finish' "$d/out/pod-tenant-test_wedged.txt"; then
+    echo "a complete list was reported as unfinished:"
+    cat "$d/out/pod-tenant-test_wedged.txt"
+    exit 1
+  fi
+  rm -rf "$d"
+}
+
+@test "an affected pod is never offered as a healthy baseline" {
+  # Now true by construction rather than by exclusion: candidates come from the
+  # same rows the affected set came from, and one row cannot be both Ready and
+  # not-Ready. The test stays because the property is what matters, not the
+  # mechanism -- a future change that reads the node separately would reopen it.
+  d=$(mktemp -d)
+  mkdir -p "$d/bin"
+  cat >"$d/bin/kubectl" <<'STUB'
+#!/bin/sh
+for a in "$@"; do
+  case $a in
+    pods)
+      echo 'tenant-test|wedged-a|10.0.0.1|node-a|False|Running||eol'
+      echo 'tenant-test|wedged-b|10.0.0.2|node-a|False|Running||eol'
+      exit 0 ;;
+  esac
+done
+exit 0
+STUB
+  chmod +x "$d/bin/kubectl"
+  PATH="$d/bin:$PATH" timeout 120 "$SCRIPT" "$d/out" >"$d/log" 2>&1 || true
+  [ -f "$d/out/pod-tenant-test_wedged-a.txt" ]
+  [ -f "$d/out/pod-tenant-test_wedged-b.txt" ]
+  for f in "$d"/out/pod-tenant-test_wedged-a.txt "$d"/out/pod-tenant-test_wedged-b.txt; do
+    if grep 'REFERENCE' "$f" | grep -q 'tenant-test/wedged'; then
+      echo "a pod under investigation was used as the healthy baseline in $(basename "$f"):"
+      grep '^# POD' "$f"
+      exit 1
+    fi
+  done
+  grep -q 'none found -- no baseline available' "$d/out/pod-tenant-test_wedged-b.txt"
+  rm -rf "$d"
+}
+
+@test "a memo hit reports the same answer as the miss that filled it" {
+  # The status has to survive the memo. Every caller reads pod_on_node through a
+  # command substitution, so a status kept in a variable dies with that subshell
+  # and every hit then looks like a lookup that never answered -- the same node
+  # getting <none> from the miss and <unknown> from the hit, in one bundle.
+  d=$(mktemp -d)
+  mkdir -p "$d/bin"
+  cat >"$d/bin/kubectl" <<'STUB'
+#!/bin/sh
+for a in "$@"; do
+  case $a in
+    pods) echo 'tenant-test|wedged|10.0.0.1|node-a|False|Running||eol'; exit 0 ;;
+    svc) echo 'tenant|web|LoadBalancer|192.0.2.10|80|30080|Cluster'; exit 0 ;;
+    endpointslices) echo '10.0.0.1|node-a|tenant-test|wedged|true'; exit 0 ;;
+  esac
+done
+case "$*" in
+  # Answers, and answers "there is no such pod" -- status 0, empty output.
+  *'app=ovs'*) exit 0 ;;
+  *'k8s-app=cilium'*) echo 'cilium-xyz'; exit 0 ;;
+  *'app=kube-ovn-cni'*) echo 'cni-abc'; exit 0 ;;
+  # The LB must probe UNREACHABLE, or the heavy capture is skipped and
+  # capture_lb_node -- the only consumer that reads this lookup from a memo
+  # hit -- never runs. Without this the test cannot observe the difference it
+  # exists to pin, whatever the code does.
+  *'nc -z'*) echo fail; exit 0 ;;
+esac
+exit 0
+STUB
+  chmod +x "$d/bin/kubectl"
+  PATH="$d/bin:$PATH" timeout 90 "$SCRIPT" "$d/out" >"$d/log" 2>&1 || true
+  # A lookup that answered "none" must read as none wherever it is consumed.
+  # capture_lb_node is the only consumer that reads this lookup from a memo
+  # hit, and it runs only on the heavy-capture path. Pin that it ran, or stub
+  # drift makes both assertions below vacuous without a word.
+  grep -q 'ENDPOINT node=node-a' "$d/out/lb-tenant_web.txt"
+  if grep -rq 'ovs=<unknown>' "$d/out" 2>/dev/null; then
+    echo "a lookup that answered was reported as unanswered after a memo hit:"
+    grep -r 'ovs=' "$d/out" 2>/dev/null
+    exit 1
+  fi
+  # And the run must not leak shell diagnostics into the log.
+  if grep -q 'unbound variable\|parameter not set' "$d/log"; then
+    echo "the run leaked shell diagnostics:"
+    grep -n 'unbound variable\|parameter not set' "$d/log" | head -3
+    exit 1
+  fi
+  rm -rf "$d"
+}
+
+@test "an instant lookup failure is re-asked rather than cached" {
+  # Caching a refusal makes one transient permanent for the run. Only a cutoff
+  # is worth not repeating, because repeating that one spends another full
+  # bound. The stub refuses the first ovs lookup and answers the rest, so a
+  # cached failure would show as a second lookup never being issued.
+  d=$(mktemp -d)
+  mkdir -p "$d/bin"
+  cat >"$d/bin/kubectl" <<'STUB'
+#!/bin/sh
+for a in "$@"; do
+  case $a in
+    pods) echo 'tenant-test|wedged|10.0.0.1|node-a|False|Running||eol'; exit 0 ;;
+    svc) echo 'tenant|web|LoadBalancer|192.0.2.10|80|30080|Cluster'; exit 0 ;;
+    endpointslices) echo '10.0.0.1|node-a|tenant-test|wedged|true'; exit 0 ;;
+  esac
+done
+case "$*" in
+  *'app=ovs'*)
+    echo "$*" >>"$STUB_CALLS"
+    echo 'Error from server (Forbidden): pods is forbidden' >&2
+    exit 1 ;;
+esac
+exit 0
+STUB
+  chmod +x "$d/bin/kubectl"
+  STUB_CALLS="$d/calls" PATH="$d/bin:$PATH" timeout 90 "$SCRIPT" "$d/out" >"$d/log" 2>&1 || true
+  # More than one ovs lookup means the refusal was not cached.
+  n=$(wc -l <"$d/calls" | tr -d ' ')
+  if [ "$n" -lt 2 ]; then
+    echo "an instant failure was cached instead of re-asked (ovs lookups: $n)"
+    cat "$d/calls"
+    exit 1
+  fi
+  rm -rf "$d"
+}
+
+@test "the reasons a capture is incomplete ship inside the capture" {
+  # A hung apiserver leaves dataplane/ with nothing collected. The lines saying
+  # why must be there too, or a reader holding only the uploaded report cannot
+  # tell a capture that found nothing from one that never ran -- the contract
+  # docs/agents/e2e-testing.md states for the sibling collectors, which this
+  # script's notes are modelled on.
+  d=$(mktemp -d)
+  mkdir -p "$d/bin"
+  printf '#!/bin/sh\nsleep 300\n' >"$d/bin/kubectl"
+  chmod +x "$d/bin/kubectl"
+  PATH="$d/bin:$PATH" COZY_DATAPLANE_LIST_TIMEOUT=1 COZY_DATAPLANE_READ_TIMEOUT=1 \
+    timeout 90 "$SCRIPT" "$d/out" >"$d/log" 2>&1 || true
+  [ -f "$d/out/capture-notes.txt" ]
+  grep -q 'cut off' "$d/out/capture-notes.txt"
+  grep -q 'whether any pod is affected is unknown' "$d/out/capture-notes.txt"
+  rm -rf "$d"
+}
+
+@test "dp_cutoff_desc tells a SIGKILL from a deadline and both from no bound" {
+  # Pure helper, reached through the sourcing guard like the lb_* ones above.
+  # Its three branches carry the difference between "the bound fired", "something
+  # killed the read and 137 cannot say which", and "this read had no ceiling at
+  # all" -- the last being what an absent `timeout` produces.
+  deadline=$(dp_cutoff_desc 124 20 "timeout -k 2 20")
+  case "$deadline" in
+    *"its own 20s timeout"*) : ;;
+    *) echo "124 did not name the deadline: $deadline"; exit 1 ;;
+  esac
+
+  killed=$(dp_cutoff_desc 137 20 "timeout -k 2 20")
+  case "$killed" in
+    *SIGKILL*) : ;;
+    *) echo "137 did not name a SIGKILL: $killed"; exit 1 ;;
+  esac
+
+  unbounded=$(dp_cutoff_desc 137 20 "")
+  case "$unbounded" in
+    *unbounded*) : ;;
+    *) echo "an empty bound was not described as unbounded: $unbounded"; exit 1 ;;
+  esac
+}
+
+@test "sourcing the script for its helpers leaves no temp files behind" {
+  # Everything above the sourcing guard runs in every unit test that sources
+  # this file, so a scratch file created up there is one leaked per test, and
+  # the two early exits would strand one on any host without kubectl.
+  d=$(mktemp -d)
+  ( TMPDIR="$d"; export TMPDIR; E2E_CAPTURE_DATAPLANE_LIB=1 . "$SCRIPT" ) >/dev/null 2>&1
+  left=$(ls -1 "$d" 2>/dev/null | wc -l | tr -d ' ')
+  if [ "$left" -ne 0 ]; then
+    echo "sourcing left $left file(s) behind:"
+    ls -1 "$d"
+    exit 1
+  fi
+  rm -rf "$d"
+}
+
+@test "an LB whose probe never ran is not recorded as reachable" {
+  # host_http_probe resolves a cni-server first, and a lookup cut off at its
+  # own bound leaves no probe outcome. Read as "nothing failed", that would
+  # stamp the address reachable in the artifact -- a verdict about an address
+  # the script never touched.
+  d=$(mktemp -d)
+  mkdir -p "$d/bin"
+  cat >"$d/bin/kubectl" <<'STUB'
+#!/bin/sh
+for a in "$@"; do
+  case $a in
+    pods) exit 0 ;;
+    svc) echo 'tenant|web|LoadBalancer|192.0.2.10|80|30080|Cluster'; exit 0 ;;
+    endpointslices) echo '10.0.0.1|node-a|tenant-test|wedged|true'; exit 0 ;;
+  esac
+done
+case "$*" in
+  *'app=kube-ovn-cni'*) sleep 300 ;;
+esac
+exit 0
+STUB
+  chmod +x "$d/bin/kubectl"
+  real_timeout=$(command -v timeout)
+  dp_cut_timeout "$d/bin"
+  rc=0
+  PATH="$d/bin:$PATH" DP_CUT='*app=kube-ovn-cni*' \
+    "$real_timeout" 90 "$SCRIPT" "$d/out" >"$d/log" 2>&1 || rc=$?
+  [ "$rc" -eq 0 ] || { echo "the collector did not finish on its own (exit $rc):"; cat "$d/log"; exit 1; }
+  # The decision under test, in the collector's own words, and the section's
+  # own end, so the file checks below read a finished directory.
+  grep -q 'LB tenant/web (192.0.2.10) not probed -- no probe could be attempted from node-a -- the cni-server lookup did not answer' "$d/log"
+  grep -q 'LoadBalancer-datapath capture complete' "$d/log"
+  [ -f "$d/out/lb-tenant_web.txt" ]
+  # The specific claim, not the bare word: the honest line says "whether the LB
+  # is reachable ... is unknown" and contains it too.
+  if grep -q -- '-- reachable, skipped' "$d/out/lb-tenant_web.txt"; then
+    echo "an LB that was never probed was recorded as reachable:"
+    cat "$d/out/lb-tenant_web.txt"
+    exit 1
+  fi
+  grep -q 'is unknown' "$d/out/lb-tenant_web.txt"
+  # And this is the branch that MAY name the lookup, because here it genuinely
+  # did not answer. Pinning it positively is what keeps the two negative pins
+  # in the empty-outcome tests below from going vacuous: the phrase has to stay
+  # reachable somewhere for its absence elsewhere to mean anything.
+  grep -q 'the cni-server lookup did not answer' "$d/out/lb-tenant_web.txt"
+  rm -rf "$d"
+}
+
+@test "an unread endpointslice is written as unknown rather than as none" {
+  # The two EndpointSlice reads discarded stderr and were interpreted by
+  # emptiness alone, so a refused read produced the same `<none>` a Service with
+  # no endpoints does. A reader working from the artifact gets the assertion and
+  # never sees that nothing was read.
+  d=$(mktemp -d)
+  mkdir -p "$d/bin"
+  cat >"$d/bin/kubectl" <<'STUB'
+#!/bin/sh
+for a in "$@"; do
+  case $a in
+    pods) exit 0 ;;
+    svc) echo 'tenant|web|LoadBalancer|192.0.2.10|80|30080|Cluster'; exit 0 ;;
+    endpointslices) echo 'Error from server (Forbidden): endpointslices is forbidden' >&2; exit 1 ;;
+  esac
+done
+exit 0
+STUB
+  chmod +x "$d/bin/kubectl"
+  PATH="$d/bin:$PATH" timeout 60 "$SCRIPT" "$d/out" >"$d/log" 2>&1 || true
+  [ -f "$d/out/lb-tenant_web.txt" ]
+  grep -q 'ip=<unknown>' "$d/out/lb-tenant_web.txt"
+  grep -q 'targetPort=<unknown>' "$d/out/lb-tenant_web.txt"
+  if grep -q 'ip=<none>' "$d/out/lb-tenant_web.txt"; then
+    echo "a read that never answered was recorded as an absent endpoint:"
+    cat "$d/out/lb-tenant_web.txt"
+    exit 1
+  fi
+  # And the reason ships beside the capture, not only in the job log.
+  grep -q 'endpointslices' "$d/out/capture-notes.txt"
+  rm -rf "$d"
+}
+
+@test "a Service with no endpointslices at all is not called an unread one" {
+  # The other direction, and a landmine the status threading arms: client-go's
+  # evalArray has no allowMissingKeys escape, so a jsonpath indexing [0] into an
+  # empty list is a hard error and kubectl exits 1, while [*] yields nothing and
+  # exits 0. With the status now reported, an ordinary Service without endpoints
+  # would start reporting as a failed read unless the read asks with [*].
+  d=$(mktemp -d)
+  mkdir -p "$d/bin"
+  cat >"$d/bin/kubectl" <<'STUB'
+#!/bin/sh
+for a in "$@"; do
+  case $a in
+    pods) exit 0 ;;
+    svc) echo 'tenant|web|LoadBalancer|192.0.2.10|80|30080|Cluster'; exit 0 ;;
+  esac
+done
+# The endpointslice reads fall through to here: an empty list, answered.
+case "$*" in
+  *'items[0]'*) echo 'error: array index out of bounds: index 0, length 0' >&2; exit 1 ;;
+esac
+exit 0
+STUB
+  chmod +x "$d/bin/kubectl"
+  PATH="$d/bin:$PATH" timeout 60 "$SCRIPT" "$d/out" >"$d/log" 2>&1 || true
+  [ -f "$d/out/lb-tenant_web.txt" ]
+  grep -q 'targetPort=<none>' "$d/out/lb-tenant_web.txt"
+  if grep -q 'targetPort=<unknown>' "$d/out/lb-tenant_web.txt"; then
+    echo "an empty endpointslice list was recorded as a read that never answered:"
+    cat "$d/out/lb-tenant_web.txt"
+    exit 1
+  fi
+  if grep -q 'endpointslices' "$d/out/capture-notes.txt"; then
+    echo "an empty endpointslice list was noted as a failed read:"
+    cat "$d/out/capture-notes.txt"
+    exit 1
+  fi
+  rm -rf "$d"
+}
+
+@test "an unknown announcer does not point the tcpdump at a pending pod" {
+  # pod_on_node builds `--field-selector spec.nodeName=$3`, so an empty node
+  # asks for pods whose nodeName is EMPTY -- the unscheduled ones. The announcer
+  # is unknown exactly when MetalLB is misbehaving, which is when this leg
+  # matters, and an unguarded lookup then hands the first pending kube-ovn-cni
+  # pod to a tcpdump labelled ANNOUNCER. The sibling uses of the announcer node
+  # in this same block are all guarded; this one was not.
+  d=$(mktemp -d)
+  mkdir -p "$d/bin"
+  cat >"$d/bin/kubectl" <<'STUB'
+#!/bin/sh
+for a in "$@"; do
+  case $a in
+    pods) exit 0 ;;
+    svc) echo 'tenant|web|LoadBalancer|192.0.2.10|80|30080|Cluster'; exit 0 ;;
+    endpointslices) echo '10.0.0.1|node-a|tenant-test|wedged|true'; exit 0 ;;
+  esac
+done
+case "$*" in
+  *--field-selector*) echo "$*" >>"$STUB_CALLS" ;;
+esac
+case "$*" in
+  # Answers every per-node cni lookup, INCLUDING one made with an empty node --
+  # which is what an apiserver holding a pending pod returns for that selector.
+  # A stub that answered nothing there would hide the bug behind an empty result.
+  *'app=kube-ovn-cni'*) echo 'cni-abc'; exit 0 ;;
+  # The LB must probe UNREACHABLE or the heavy capture that carries the tcpdumps
+  # never runs and the test asserts nothing.
+  *'nc -z'*) echo fail; exit 0 ;;
+esac
+exit 0
+STUB
+  chmod +x "$d/bin/kubectl"
+  STUB_CALLS="$d/calls" PATH="$d/bin:$PATH" timeout 90 "$SCRIPT" "$d/out" >"$d/log" 2>&1 || true
+  # Positive controls: the heavy capture ran, and it ran with no announcer --
+  # no speaker logs were produced, so lb_announcer_node reported nothing.
+  grep -q 'UNREACHABLE' "$d/log"
+  grep -q 'announcer node: <unknown>' "$d/out/lb-tenant_web.txt"
+  # The lookup itself must not go out with an empty node. Trailing space, so this
+  # does not also match the endpoint node's own `spec.nodeName=node-a` lookup.
+  if grep -q -- '--field-selector spec.nodeName= ' "$d/calls"; then
+    echo "the announcer lookup was issued with an empty node selector:"
+    grep -- 'spec.nodeName=' "$d/calls"
+    exit 1
+  fi
+  # And no ANNOUNCER tcpdump artifact may exist for a node nobody identified.
+  if [ -f "$d/out/lb-tenant_web.tcpdump-announcer.txt" ]; then
+    echo "an announcer tcpdump ran with no announcer node:"
+    cat "$d/out/lb-tenant_web.tcpdump-announcer.txt"
+    exit 1
+  fi
+  # The skip is stated rather than silent: absence of a block is not a reason.
+  grep -q 'announcer node unknown' "$d/out/lb-tenant_web.txt"
+  rm -rf "$d"
+}
+
+@test "an unknown endpoint node does not point the tcpdump at a pending pod" {
+  # The endpoint half of the same defect, on the same block: an LB whose
+  # announcer IS known but whose Service has no ready endpoint reaches the heavy
+  # capture with an empty endpoint node, and the two lookups on that side --
+  # the cni-server pod and the backend's OVS interface -- both go out with
+  # `spec.nodeName=`, which matches unscheduled pods. No ready endpoint is
+  # exactly the shape of an LB outage, so this is not a rare corner of the leg.
+  d=$(mktemp -d)
+  mkdir -p "$d/bin"
+  cat >"$d/bin/kubectl" <<'STUB'
+#!/bin/sh
+for a in "$@"; do
+  case $a in
+    pods) exit 0 ;;
+    svc) echo 'tenant|web|LoadBalancer|192.0.2.10|80|30080|Cluster'; exit 0 ;;
+    # No ready endpoint: the Service is enumerated, its backend is not.
+    endpointslices) exit 0 ;;
+    # The announcer, so the probe has somewhere to run from and the capture is
+    # reached with only the ENDPOINT side unknown.
+    logs) echo '{"event":"serviceAnnounced","ips":["192.0.2.10"],"node":"node-a"}'; exit 0 ;;
+  esac
+done
+case "$*" in
+  *'component=speaker'*) echo 'speaker-0|node-a'; exit 0 ;;
+esac
+case "$*" in
+  *--field-selector*) echo "$*" >>"$STUB_CALLS" ;;
+esac
+case "$*" in
+  # Answers every cni lookup, the one with an empty node included -- what an
+  # apiserver holding a pending pod returns for that selector.
+  *'app=kube-ovn-cni'*) echo 'cni-abc'; exit 0 ;;
+  *'nc -z'*) echo fail; exit 0 ;;
+esac
+exit 0
+STUB
+  chmod +x "$d/bin/kubectl"
+  STUB_CALLS="$d/calls" PATH="$d/bin:$PATH" timeout 90 "$SCRIPT" "$d/out" >"$d/log" 2>&1 || true
+  # Positive controls: the heavy capture ran, the announcer side was identified
+  # and did run, so what follows is about the endpoint side alone.
+  grep -q 'UNREACHABLE' "$d/log"
+  [ -f "$d/out/lb-tenant_web.tcpdump-announcer.txt" ]
+  if grep -q -- '--field-selector spec.nodeName= ' "$d/calls"; then
+    echo "an endpoint-side lookup was issued with an empty node selector:"
+    grep -- 'spec.nodeName=' "$d/calls"
+    exit 1
+  fi
+  if [ -f "$d/out/lb-tenant_web.tcpdump-endpoint.txt" ]; then
+    echo "an endpoint tcpdump ran with no endpoint node:"
+    cat "$d/out/lb-tenant_web.tcpdump-endpoint.txt"
+    exit 1
+  fi
+  grep -q 'endpoint node unknown' "$d/out/lb-tenant_web.txt"
+  rm -rf "$d"
+}
+
+@test "an LB whose probe answers is still recorded as reachable" {
+  # Positive control for the three unprobed cases below and for the cut-off one
+  # further up: each of those asserts the ABSENCE of the reachable line, and a
+  # change that routed every LB to unknown would satisfy all four while
+  # destroying the distinction they exist to protect. A probe that answers must
+  # still produce the reachable line and must still skip the heavy capture.
+  d=$(mktemp -d)
+  mkdir -p "$d/bin"
+  cat >"$d/bin/kubectl" <<'STUB'
+#!/bin/sh
+for a in "$@"; do
+  case $a in
+    pods) exit 0 ;;
+    svc) echo 'tenant|web|LoadBalancer|192.0.2.10|80|30080|Cluster'; exit 0 ;;
+    endpointslices) echo '10.0.0.1|node-a|tenant-test|wedged|true'; exit 0 ;;
+  esac
+done
+case "$*" in
+  *'app=kube-ovn-cni'*) echo 'cni-abc'; exit 0 ;;
+  *'nc -z'*) echo ok; exit 0 ;;
+esac
+exit 0
+STUB
+  chmod +x "$d/bin/kubectl"
+  PATH="$d/bin:$PATH" timeout 60 "$SCRIPT" "$d/out" >"$d/log" 2>&1 || true
+  grep -q -- '-- reachable, skipped' "$d/out/lb-tenant_web.txt"
+  if [ -f "$d/out/lb-tenant_web.tcpdump-endpoint.txt" ]; then
+    echo "a reachable LB got the heavy capture anyway:"
+    ls -1 "$d/out"
+    exit 1
+  fi
+  rm -rf "$d"
+}
+
+@test "an LB with no probe client in the host netns is not recorded as reachable" {
+  # The headline unprobed input: the exec runs, finds no nc/curl/wget, prints
+  # nothing and exits 0. Zero outcomes used to read as "nothing failed", so a
+  # minimal e2e image stamped every LB reachable and skipped the whole heavy
+  # capture -- which reads as a healthy datapath.
+  d=$(mktemp -d)
+  mkdir -p "$d/bin"
+  cat >"$d/bin/kubectl" <<'STUB'
+#!/bin/sh
+for a in "$@"; do
+  case $a in
+    pods) exit 0 ;;
+    svc) echo 'tenant|web|LoadBalancer|192.0.2.10|80|30080|Cluster'; exit 0 ;;
+    endpointslices) echo '10.0.0.1|node-a|tenant-test|wedged|true'; exit 0 ;;
+  esac
+done
+case "$*" in
+  *'app=kube-ovn-cni'*) echo 'cni-abc'; exit 0 ;;
+  # The probe exec itself: no client in the image, so it emits nothing and
+  # succeeds. A stub that answered ok or fail here would never reach the branch.
+  *'nc -z'*) exit 0 ;;
+esac
+exit 0
+STUB
+  chmod +x "$d/bin/kubectl"
+  PATH="$d/bin:$PATH" timeout 60 "$SCRIPT" "$d/out" >"$d/log" 2>&1 || true
+  # Positive control: the LB was enumerated and the probe leg was reached.
+  grep -q 'probing 1 LoadBalancer service' "$d/log"
+  [ -f "$d/out/lb-tenant_web.txt" ]
+  if grep -q -- '-- reachable, skipped' "$d/out/lb-tenant_web.txt"; then
+    echo "an LB no probe could be run against was recorded as reachable:"
+    cat "$d/out/lb-tenant_web.txt"
+    exit 1
+  fi
+  # The reason has to survive contact with what actually happened: the lookup
+  # answered and named a pod, and the exec ran -- it found nothing to run. A
+  # line blaming the lookup would be a cause this script never observed, the
+  # same rule dp_read_outcome states for the reads.
+  grep -q 'no probe outcome from node-a' "$d/out/lb-tenant_web.txt"
+  if grep -q 'the cni-server lookup did not answer' "$d/out/lb-tenant_web.txt"; then
+    echo "the artifact blames a lookup that answered:"
+    cat "$d/out/lb-tenant_web.txt"
+    exit 1
+  fi
+  rm -rf "$d"
+}
+
+@test "an LB whose probe node runs no cni-server is not blamed on the lookup" {
+  # The fifth zero-probe input, and the one missing from the enumeration until
+  # now: the lookup ANSWERS, and its answer is that the node has no
+  # kube-ovn-cni pod. host_http_probe returns without emitting an outcome, so
+  # this lands in the same empty-outcome branch as a missing probe client --
+  # but "the lookup did not answer" is false here in the most direct way.
+  d=$(mktemp -d)
+  mkdir -p "$d/bin"
+  cat >"$d/bin/kubectl" <<'STUB'
+#!/bin/sh
+for a in "$@"; do
+  case $a in
+    pods) exit 0 ;;
+    svc) echo 'tenant|web|LoadBalancer|192.0.2.10|80|30080|Cluster'; exit 0 ;;
+    endpointslices) echo '10.0.0.1|node-a|tenant-test|wedged|true'; exit 0 ;;
+  esac
+done
+case "$*" in
+  # Answers, and the answer is "no such pod": status 0, empty output.
+  *'app=kube-ovn-cni'*) exit 0 ;;
+esac
+exit 0
+STUB
+  chmod +x "$d/bin/kubectl"
+  PATH="$d/bin:$PATH" timeout 60 "$SCRIPT" "$d/out" >"$d/log" 2>&1 || true
+  grep -q 'probing 1 LoadBalancer service' "$d/log"
+  [ -f "$d/out/lb-tenant_web.txt" ]
+  if grep -q -- '-- reachable, skipped' "$d/out/lb-tenant_web.txt"; then
+    echo "an LB with no cni-server to probe from was recorded as reachable:"
+    cat "$d/out/lb-tenant_web.txt"
+    exit 1
+  fi
+  grep -q 'no probe outcome from node-a' "$d/out/lb-tenant_web.txt"
+  if grep -q 'the cni-server lookup did not answer' "$d/out/lb-tenant_web.txt"; then
+    echo "the artifact blames a lookup that answered 'no such pod':"
+    cat "$d/out/lb-tenant_web.txt"
+    exit 1
+  fi
+  rm -rf "$d"
+}
+
+@test "an LB with no node to probe from is not recorded as reachable" {
+  # Second unprobed input: neither the announcer nor the endpoint node resolved,
+  # so the probe block never ran. The decision defaulted to skip, and the
+  # artifact asserted reachability of an address the script never touched.
+  d=$(mktemp -d)
+  mkdir -p "$d/bin"
+  cat >"$d/bin/kubectl" <<'STUB'
+#!/bin/sh
+for a in "$@"; do
+  case $a in
+    pods) exit 0 ;;
+    svc) echo 'tenant|web|LoadBalancer|192.0.2.10|80|30080|Cluster'; exit 0 ;;
+  esac
+done
+# Everything else answers empty: no endpointslices, so no endpoint node, and no
+# metallb speakers, so no announcer.
+exit 0
+STUB
+  chmod +x "$d/bin/kubectl"
+  PATH="$d/bin:$PATH" timeout 60 "$SCRIPT" "$d/out" >"$d/log" 2>&1 || true
+  grep -q 'probing 1 LoadBalancer service' "$d/log"
+  [ -f "$d/out/lb-tenant_web.txt" ]
+  if grep -q -- '-- reachable, skipped' "$d/out/lb-tenant_web.txt"; then
+    echo "an LB with nowhere to probe from was recorded as reachable:"
+    cat "$d/out/lb-tenant_web.txt"
+    exit 1
+  fi
+  grep -q 'nowhere to probe from' "$d/out/lb-tenant_web.txt"
+  rm -rf "$d"
+}
+
+@test "an LB whose Service names no port is not recorded as reachable" {
+  # Third unprobed input: the port column is empty, the probe block is gated on
+  # a non-zero port, and the same default carried a reachability verdict out.
+  d=$(mktemp -d)
+  mkdir -p "$d/bin"
+  cat >"$d/bin/kubectl" <<'STUB'
+#!/bin/sh
+for a in "$@"; do
+  case $a in
+    pods) exit 0 ;;
+    svc) echo 'tenant|web|LoadBalancer|192.0.2.10||30080|Cluster'; exit 0 ;;
+    endpointslices) echo '10.0.0.1|node-a|tenant-test|wedged|true'; exit 0 ;;
+  esac
+done
+case "$*" in
+  *'app=kube-ovn-cni'*) echo 'cni-abc'; exit 0 ;;
+esac
+exit 0
+STUB
+  chmod +x "$d/bin/kubectl"
+  PATH="$d/bin:$PATH" timeout 60 "$SCRIPT" "$d/out" >"$d/log" 2>&1 || true
+  grep -q 'probing 1 LoadBalancer service' "$d/log"
+  [ -f "$d/out/lb-tenant_web.txt" ]
+  if grep -q -- '-- reachable, skipped' "$d/out/lb-tenant_web.txt"; then
+    echo "an LB with no port to probe was recorded as reachable:"
+    cat "$d/out/lb-tenant_web.txt"
+    exit 1
+  fi
+  grep -q 'no port to probe' "$d/out/lb-tenant_web.txt"
+  rm -rf "$d"
+}
+
+@test "lb_capture_decision keeps failures visible when one probe could not run" {
+  # An unrun probe adds no reason to doubt the ones that failed, so the mix must
+  # not read as reachable. Collapsing it toward skip is what stamps the artifact
+  # with a reachability verdict for an address whose probes failed.
+  [ "$(printf 'unknown\nfail\nfail\n' | lb_capture_decision)" = "capture" ]
+}
+
+@test "lb_capture_decision reads a probe refused for the budget as not run" {
+  # "spent" is a probe the budget refused. It is no verdict about the address,
+  # so it weighs like unknown and never like a failure.
+  [ "$(printf 'spent\nspent\nspent\n' | lb_capture_decision)" = "unknown" ]
+  [ "$(printf 'fail\nspent\n' | lb_capture_decision)" = "capture" ]
+}
+
+@test "lb_capture_decision returns unknown only when nothing could be attempted" {
+  [ "$(printf 'unknown\nunknown\nunknown\n' | lb_capture_decision)" = "unknown" ]
+  # A success still wins: the address answered, whatever else could not be tried.
+  [ "$(printf 'unknown\nok\n' | lb_capture_decision)" = "skip" ]
+}
+
+@test "the Chainsaw caller also reports a capture its backstop cut short" {
+  # This collector has two callers, and the honesty contract has to hold at both
+  # or the reader learns to distrust the one that keeps it. hack/cozytest.sh's
+  # side is covered behaviourally in cozytest-capture-gate.bats; this runs the
+  # Chainsaw catch itself, extracted from the config it lives in, so neither
+  # side can quietly stop reporting. The Chainsaw backstop is the shorter of the
+  # two -- 300s against 600s, because it shares an op envelope with the snapshot
+  # leg -- and a line that only one caller prints is a line the reader learns
+  # to miss at the other.
+  #
+  # The backstop is simulated with a `timeout` on PATH that exits 124, for the
+  # same reason the cozytest.sh-side test does it: the call site sees a non-zero
+  # status and whatever landed, whichever way the kill arrived.
+  # Named here rather than left to fail downstream: without it a missing yq
+  # surfaces as the extraction guard below going red, which reads as the catch
+  # op having been renamed. Same form the other yq-using suites use.
+  command -v yq >/dev/null || { echo "yq (mikefarah v4+) is required to read the Chainsaw catch script" >&2; exit 1; }
+  d=$(mktemp -d)
+  mkdir -p "$d/bin" "$d/hack/e2e-chainsaw/suite"
+  printf '#!/bin/sh\nexit 124\n' >"$d/bin/timeout"
+  printf '#!/bin/sh\nexit 0\n' >"$d/bin/crust-gather"
+  # The catch resolves this collector as ../../e2e-capture-dataplane.sh from the
+  # failing suite's own directory, and gates the leg on it being executable.
+  printf '#!/bin/sh\nexit 0\n' >"$d/hack/e2e-capture-dataplane.sh"
+  chmod +x "$d/bin/timeout" "$d/bin/crust-gather" "$d/hack/e2e-capture-dataplane.sh"
+  yq -r '.spec.error.catch[] | select(.description == "crust-gather host snapshot on failure") | .script.content' \
+    "$HACK_DIR/e2e-chainsaw/.chainsaw.yaml" >"$d/catch.sh"
+  # The extraction found the right op: a renamed description would otherwise
+  # leave an empty script that satisfies nothing and reports nothing.
+  grep -q 'e2e-capture-dataplane.sh' "$d/catch.sh"
+  ( cd "$d/hack/e2e-chainsaw/suite" \
+    && PATH="$d/bin:$PATH" COZY_REPORT_DIR="$d/report" TEST_NAME=fixture sh "$d/catch.sh" ) \
+    >"$d/out" 2>&1 || true
+  # Positive control: the leg was reached, so the line below is about what it
+  # said and not about the catch having stopped earlier.
+  grep -q 'capturing host->pod data-plane' "$d/out"
+  grep -q 'data-plane capture INCOMPLETE (exit 124)' "$d/out"
+  rm -rf "$d"
+}
+
+@test "two pods whose joined names would collide get two capture files" {
+  # A hyphen is legal in a namespace and in a pod name, so joining the two with
+  # one makes a-b/c and a/b-c the same file, and the second capture replaces
+  # the first with nothing saying so. Asserted on content rather than on a file
+  # name, so the test holds for any naming that keeps the two apart.
+  d=$(mktemp -d)
+  mkdir -p "$d/bin"
+  cat >"$d/bin/kubectl" <<'STUB'
+#!/bin/sh
+for a in "$@"; do
+  case $a in
+    pods)
+      echo 'a-b|c|10.0.0.1|node-a|False|Running||eol'
+      echo 'a|b-c|10.0.0.2|node-a|False|Running||eol'
+      exit 0 ;;
+  esac
+done
+exit 0
+STUB
+  chmod +x "$d/bin/kubectl"
+  PATH="$d/bin:$PATH" timeout 90 "$SCRIPT" "$d/out" >"$d/log" 2>&1
+  first=$(grep -l '^# POD a-b/c ' "$d"/out/pod-*.txt || true)
+  second=$(grep -l '^# POD a/b-c ' "$d"/out/pod-*.txt || true)
+  if [ -z "$first" ] || [ -z "$second" ] || [ "$first" = "$second" ]; then
+    echo "the two pods did not land in two files:"
+    grep -H '^# POD' "$d"/out/pod-*.txt
+    exit 1
+  fi
+  rm -rf "$d"
+}
+
+@test "a second capture run into one directory keeps the first run's pod capture" {
+  # capture-notes.txt accumulates across runs with a separator. A pod file that
+  # is truncated instead leaves notes from two runs beside evidence from one,
+  # and nothing tells a reader which run the surviving file belongs to.
+  d=$(mktemp -d)
+  mkdir -p "$d/bin"
+  cat >"$d/bin/kubectl" <<'STUB'
+#!/bin/sh
+for a in "$@"; do
+  case $a in
+    pods) echo 'tenant-test|wedged|10.0.0.1|node-a|False|Running||eol'; exit 0 ;;
+  esac
+done
+exit 0
+STUB
+  chmod +x "$d/bin/kubectl"
+  PATH="$d/bin:$PATH" timeout 90 "$SCRIPT" "$d/out" >"$d/log" 2>&1
+  PATH="$d/bin:$PATH" timeout 90 "$SCRIPT" "$d/out" >>"$d/log" 2>&1
+  f=$(grep -l '^# POD tenant-test/wedged ' "$d"/out/pod-*.txt)
+  n=$(grep -c '^# POD tenant-test/wedged ' "$f")
+  if [ "$n" -ne 2 ]; then
+    echo "expected the capture of both runs in $f, found $n"
+    exit 1
+  fi
+  grep -q -- '--- new capture run ---' "$f"
+  rm -rf "$d"
+}
+
+@test "two LoadBalancers whose joined names would collide get two capture files" {
+  # The per-LB files joined namespace and Service name the way the per-pod
+  # ones did, with the same collision, and truncated on every run while the
+  # notes beside them accumulate.
+  d=$(mktemp -d)
+  mkdir -p "$d/bin"
+  cat >"$d/bin/kubectl" <<'STUB'
+#!/bin/sh
+for a in "$@"; do
+  case $a in
+    pods) exit 0 ;;
+    svc)
+      echo 'a-b|c|LoadBalancer|192.0.2.10|80|30080|Cluster'
+      echo 'a|b-c|LoadBalancer|192.0.2.11|80|30081|Cluster'
+      exit 0 ;;
+    endpointslices) echo '10.0.0.1|node-a|tenant-test|wedged|true'; exit 0 ;;
+  esac
+done
+case "$*" in
+  *'app=kube-ovn-cni'*) echo 'cni-abc'; exit 0 ;;
+  *'nc -z'*) echo ok; exit 0 ;;
+esac
+exit 0
+STUB
+  chmod +x "$d/bin/kubectl"
+  timeout 90 env PATH="$d/bin:$PATH" "$SCRIPT" "$d/out" >"$d/log" 2>&1
+  timeout 90 env PATH="$d/bin:$PATH" "$SCRIPT" "$d/out" >>"$d/log" 2>&1
+  first=$(grep -l '^# LB a-b/c ' "$d"/out/lb-*.txt || true)
+  second=$(grep -l '^# LB a/b-c ' "$d"/out/lb-*.txt || true)
+  if [ -z "$first" ] || [ -z "$second" ] || [ "$first" = "$second" ]; then
+    echo "the two LoadBalancers did not land in two files:"
+    grep -H '^# LB' "$d"/out/lb-*.txt
+    exit 1
+  fi
+  # Both runs are kept, with the separator the notes use.
+  [ "$(grep -c '^# LB a-b/c ' "$first")" -eq 2 ]
+  grep -q -- '--- new capture run ---' "$first"
+  rm -rf "$d"
+}
+
+@test "no function writes a variable its caller or another function owns" {
+  # The script is POSIX sh, so there is no `local`: every assignment inside a
+  # function lands in the caller's scope. capture_node once wrote `node`, the
+  # variable of the loop that calls it, and capture_lb_node wrote the LB loop's
+  # own _lbip/_np/_epip/_of. Both were harmless only because each caller passed
+  # what it already held, or a default its later reads apply anyway; called with
+  # anything else, the rest of the iteration would describe another node under
+  # the right name.
+  #
+  # The rule held here: a name assigned inside a function is assigned in no
+  # other scope and read by no `read -r` list. Assignments are recognised at
+  # statement start only (line start, after `;`, `if`, `then`, `do`, `&&`,
+  # `||`), because `-l app=ovs` or `awk -v node=...` are arguments, not
+  # writes; quoted text is dropped for the same reason.
+  offenders=$(awk '
+    function strip(s) { gsub(/\047[^\047]*\047/, "", s); gsub(/"[^"]*"/, "", s); sub(/(^|[ \t])#.*/, "", s); return s }
+    /^[A-Za-z_][A-Za-z0-9_]*\(\) *\{/ { fn = $1; sub(/\(\).*/, "", fn); next }
+    fn != "" && /^\}/ { fn = ""; next }
+    {
+      s = strip($0)
+      scope = (fn == "" ? "<top level>" : fn)
+      if (match(s, /read -r [A-Za-z0-9_ ]+/)) {
+        k = split(substr(s, RSTART + 8, RLENGTH - 8), a, " ")
+        for (i = 1; i <= k; i++) readvar[a[i]] = 1
+      }
+      rest = s
+      while (match(rest, /(^|;|&&|\|\||(^|[ \t])(if|then|do|else))[ \t]*[A-Za-z_][A-Za-z0-9_]*=/)) {
+        v = substr(rest, RSTART, RLENGTH)
+        sub(/=$/, "", v); sub(/.*[^A-Za-z0-9_]/, "", v)
+        if (!((v SUBSEP scope) in seen)) {
+          seen[v SUBSEP scope] = 1
+          owners[v] = owners[v] " " scope; n[v]++
+          if (fn != "") infn[v] = infn[v] " " fn
+        }
+        rest = substr(rest, RSTART + RLENGTH)
+      }
+    }
+    END {
+      for (v in infn) {
+        if (v in readvar) print v ": assigned in" infn[v] ", and a loop reads it with read -r"
+        else if (n[v] > 1) print v ": assigned in" owners[v]
+      }
+    }' "$SCRIPT" | LC_ALL=C sort)
+  if [ -n "$offenders" ]; then
+    echo "a function writes a variable another scope owns:"
+    printf '%s\n' "$offenders"
+    exit 1
+  fi
+  # Positive control: the extraction saw the loop variables and the function
+  # prefixes, so an empty list above is a clean file and not a blind scan.
+  awk '/read -r ns pod podip node/ { found = 1 } END { exit !found }' "$SCRIPT"
+  grep -q '^  _cpd_ns=\$1' "$SCRIPT"
+}
+
+@test "an exec block cut off by its own bound says so inside the block" {
+  # A cut exec leaves whatever it printed before its bound fired, and a partial
+  # service map reads as a complete one: the question it answers is whether a
+  # backend is still in the map. The block has to carry the cut itself.
+  d=$(mktemp -d)
+  mkdir -p "$d/bin"
+  cat >"$d/bin/kubectl" <<'STUB'
+#!/bin/sh
+case "$*" in
+  'get pods -A '*) echo 'tenant-test|wedged|10.0.0.1|node-a|False|Running||eol'; exit 0 ;;
+  *'k8s-app=cilium'*) echo 'cilium-xyz'; exit 0 ;;
+esac
+exit 0
+STUB
+  chmod +x "$d/bin/kubectl"
+  dp_cut_timeout "$d/bin"
+  timeout 90 env PATH="$d/bin:$PATH" DP_CUT='*bpf lb list*' "$SCRIPT" "$d/out" >"$d/log" 2>&1
+  f="$d/out/node-node-a.txt"
+  # The marker sits under the service map's own header, before the next block.
+  block=$(awk '/^=== cilium-dbg bpf lb list/ { on = 1; next } on && /^=== / { exit } on { print }' "$f")
+  # Positive control: the block exists.
+  grep -q '^=== cilium-dbg bpf lb list' "$f"
+  case "$block" in
+    *'(cut off by its own 25s timeout)'*) : ;;
+    *) echo "the cut service map carries no marker:"; printf '%s\n' "$block"; exit 1 ;;
+  esac
+  rm -rf "$d"
+}
+
+@test "an exec block the deadline cut off names the budget inside the block" {
+  # The other cut a block can take: the endpoint list runs under a bound the
+  # pod section's deadline shortened and hangs into it. The block names the
+  # budget, not a timeout of its own it never reached.
+  d=$(mktemp -d)
+  mkdir -p "$d/bin"
+  cat >"$d/bin/kubectl" <<'STUB'
+#!/bin/sh
+case "$*" in
+  'get pods -A '*) echo 'tenant-test|wedged|10.0.0.1|node-a|False|Running||eol'; exit 0 ;;
+  'get svc -A '*) exit 0 ;;
+  *'k8s-app=cilium'*) echo 'cilium-xyz'; exit 0 ;;
+  *'endpoint list'*) sleep 300 ;;
+esac
+exit 0
+STUB
+  chmod +x "$d/bin/kubectl"
+  real_timeout=$(command -v timeout)
+  dp_cut_timeout "$d/bin"
+  rc=0
+  PATH="$d/bin:$PATH" DP_REAL_TIMEOUT="$real_timeout" DP_PASS="$(printf '%s\n' '*kubectl get pods -A *' '*kubectl get svc -A *')" \
+    COZY_DATAPLANE_BUDGET=6 COZY_DATAPLANE_LB_RESERVE=3 \
+    "$real_timeout" 60 "$SCRIPT" "$d/out" >"$d/log" 2>&1 || rc=$?
+  [ "$rc" -eq 0 ] || { echo "the collector did not finish on its own (exit $rc):"; cat "$d/log"; exit 1; }
+  f="$d/out/node-node-a.txt"
+  block=$(awk '/^=== cilium-dbg endpoint list/ { on = 1; next } on && /^=== / { exit } on { print }' "$f")
+  # Positive control: the block exists.
+  grep -q '^=== cilium-dbg endpoint list' "$f"
+  case "$block" in
+    *'(cut off at the deadline: the pod section ran out of its share of the 6s wall-clock budget)'*) : ;;
+    *) echo "the block the deadline cut does not name the budget:"; printf '%s\n' "$block"; exit 1 ;;
+  esac
+  case "$block" in
+    *'cut off by its own'*) echo "the block blames a bound of its own:"; printf '%s\n' "$block"; exit 1 ;;
+  esac
+  rm -rf "$d"
+}
+
+@test "a read the deadline cut off names the budget, not a bound it never reached" {
+  # The Ready-conditions read of the affected pod hangs into the pod section's
+  # deadline. Its own note and the block it sits in must both name the budget;
+  # quoting the shortened bound as the read's own timeout gives one block two
+  # reasons for one cut.
+  d=$(mktemp -d)
+  mkdir -p "$d/bin"
+  cat >"$d/bin/kubectl" <<'STUB'
+#!/bin/sh
+case "$*" in
+  'get pods -A '*) echo 'tenant-test|wedged|10.0.0.1|node-a|False|Running||eol'; exit 0 ;;
+  'get svc -A '*) exit 0 ;;
+  'get pod -n tenant-test wedged '*) sleep 300 ;;
+esac
+exit 0
+STUB
+  chmod +x "$d/bin/kubectl"
+  real_timeout=$(command -v timeout)
+  dp_cut_timeout "$d/bin"
+  rc=0
+  PATH="$d/bin:$PATH" DP_REAL_TIMEOUT="$real_timeout" DP_PASS="$(printf '%s\n' '*kubectl get pods -A *' '*kubectl get svc -A *')" \
+    COZY_DATAPLANE_BUDGET=6 COZY_DATAPLANE_LB_RESERVE=3 \
+    "$real_timeout" 60 "$SCRIPT" "$d/out" >"$d/log" 2>&1 || rc=$?
+  [ "$rc" -eq 0 ] || { echo "the collector did not finish on its own (exit $rc):"; cat "$d/log"; exit 1; }
+  f="$d/out/pod-tenant-test_wedged.txt"
+  block=$(awk '/^=== pod Ready conditions/ { on = 1; next } on && /^=== / { exit } on { print }' "$f")
+  # Positive control: the block exists.
+  grep -q '^=== pod Ready conditions' "$f"
+  case "$block" in
+    *"(reading this pod's Ready conditions was cut off at the deadline: the wall-clock budget of its section ran out)"*) : ;;
+    *) echo "the read the deadline cut does not name itself and the budget:"; printf '%s\n' "$block"; exit 1 ;;
+  esac
+  case "$block" in
+    *'cut off by its own'*) echo "the block blames a bound of its own:"; printf '%s\n' "$block"; exit 1 ;;
+  esac
+  # One line per cut: the conditions read is cut once, so the block says so
+  # once.
+  n=$(printf '%s\n' "$block" | grep -c 'cut off')
+  [ "$n" -eq 1 ] || { echo "the block reports one cut $n times:"; printf '%s\n' "$block"; exit 1; }
+  rm -rf "$d"
+}
+
+@test "a read cut off by its own bound is reported once in its block" {
+  # The read's own bound fires; dp_run marks the cut in the block, and the
+  # read must not add a second line saying the same thing.
+  d=$(mktemp -d)
+  mkdir -p "$d/bin"
+  cat >"$d/bin/kubectl" <<'STUB'
+#!/bin/sh
+case "$*" in
+  'get pods -A '*) echo 'tenant-test|wedged|10.0.0.1|node-a|False|Running||eol'; exit 0 ;;
+esac
+exit 0
+STUB
+  chmod +x "$d/bin/kubectl"
+  dp_cut_timeout "$d/bin"
+  timeout 90 env PATH="$d/bin:$PATH" DP_CUT='*get pod -n tenant-test wedged *' "$SCRIPT" "$d/out" >"$d/log" 2>&1
+  f="$d/out/pod-tenant-test_wedged.txt"
+  block=$(awk '/^=== pod Ready conditions/ { on = 1; next } on && /^=== / { exit } on { print }' "$f")
+  # Positive control: the block exists and carries the cut.
+  grep -q '^=== pod Ready conditions' "$f"
+  case "$block" in
+    *"(reading this pod's Ready conditions was cut off by its own 20s timeout)"*) : ;;
+    *) echo "the cut read is not marked by name:"; printf '%s\n' "$block"; exit 1 ;;
+  esac
+  n=$(printf '%s\n' "$block" | grep -c 'cut off')
+  [ "$n" -eq 1 ] || { echo "the block reports one cut $n times:"; printf '%s\n' "$block"; exit 1; }
+  rm -rf "$d"
+}
+
+@test "a cut events read is named as the events read" {
+  # Two reads share the Ready block, so a cut line has to say which one it is:
+  # conditions answered and events cut reads the same as conditions cut
+  # mid-output otherwise.
+  d=$(mktemp -d)
+  mkdir -p "$d/bin"
+  cat >"$d/bin/kubectl" <<'STUB'
+#!/bin/sh
+case "$*" in
+  'get pods -A '*) echo 'tenant-test|wedged|10.0.0.1|node-a|False|Running||eol'; exit 0 ;;
+  'get pod -n tenant-test wedged '*) echo 'Ready=False reason=ContainersNotReady: x'; exit 0 ;;
+esac
+exit 0
+STUB
+  chmod +x "$d/bin/kubectl"
+  dp_cut_timeout "$d/bin"
+  timeout 90 env PATH="$d/bin:$PATH" DP_CUT='*get events -n tenant-test *' "$SCRIPT" "$d/out" >"$d/log" 2>&1
+  f="$d/out/pod-tenant-test_wedged.txt"
+  block=$(awk '/^=== pod Ready conditions/ { on = 1; next } on && /^=== / { exit } on { print }' "$f")
+  # Positive control: the conditions read answered.
+  case "$block" in *'Ready=False reason=ContainersNotReady'*) : ;; *) echo "no conditions:"; printf '%s\n' "$block"; exit 1 ;; esac
+  case "$block" in
+    *"(reading this pod's events was cut off by its own 20s timeout)"*) : ;;
+    *) echo "the cut events read is not named:"; printf '%s\n' "$block"; exit 1 ;;
+  esac
+  n=$(printf '%s\n' "$block" | grep -c 'cut off')
+  [ "$n" -eq 1 ] || { echo "the block reports one cut $n times:"; printf '%s\n' "$block"; exit 1; }
+  rm -rf "$d"
+}
+
+@test "a pod read kubectl refused keeps kubectl's message in its block, once" {
+  # A refusal from the apiserver is not a cut: the block names the read and
+  # carries kubectl's own words, once.
+  d=$(mktemp -d)
+  mkdir -p "$d/bin"
+  cat >"$d/bin/kubectl" <<'STUB'
+#!/bin/sh
+case "$*" in
+  'get pods -A '*) echo 'tenant-test|wedged|10.0.0.1|node-a|False|Running||eol'; exit 0 ;;
+  'get pod -n tenant-test wedged '*) echo 'Error from server (Forbidden): pods "wedged" is forbidden' >&2; exit 1 ;;
+esac
+exit 0
+STUB
+  chmod +x "$d/bin/kubectl"
+  timeout 90 env PATH="$d/bin:$PATH" "$SCRIPT" "$d/out" >"$d/log" 2>&1
+  f="$d/out/pod-tenant-test_wedged.txt"
+  block=$(awk '/^=== pod Ready conditions/ { on = 1; next } on && /^=== / { exit } on { print }' "$f")
+  case "$block" in
+    *"(reading this pod's Ready conditions failed: kubectl exited 1)"*) : ;;
+    *) echo "the refused read is not named:"; printf '%s\n' "$block"; exit 1 ;;
+  esac
+  n=$(printf '%s\n' "$block" | grep -c 'Forbidden')
+  [ "$n" -eq 1 ] || { echo "kubectl's message appears $n times:"; printf '%s\n' "$block"; exit 1; }
+  rm -rf "$d"
+}
+
+@test "a pod read kubectl refused keeps all of kubectl's stderr in its block" {
+  # A degraded apiserver throttles clients, and kubectl prints its throttling
+  # lines ahead of the error that matters. The block keeps kubectl's stderr as
+  # it came, not a flattened, shortened copy that can end before the reason.
+  d=$(mktemp -d)
+  mkdir -p "$d/bin"
+  cat >"$d/bin/kubectl" <<'STUB'
+#!/bin/sh
+case "$*" in
+  'get pods -A '*) echo 'tenant-test|wedged|10.0.0.1|node-a|False|Running||eol'; exit 0 ;;
+  'get pod -n tenant-test wedged '*)
+    for i in 1 2 3; do
+      echo 'I1001 12:00:00.000000 1 request.go:697] Waited for 1.19s due to client-side throttling, not priority and fairness, request: GET:https://192.0.2.1:6443/api/v1/namespaces/tenant-test/pods/wedged' >&2
+    done
+    echo 'Error from server (Forbidden): pods "wedged" is forbidden: THE-REAL-REASON' >&2
+    exit 1 ;;
+esac
+exit 0
+STUB
+  chmod +x "$d/bin/kubectl"
+  timeout 90 env PATH="$d/bin:$PATH" "$SCRIPT" "$d/out" >"$d/log" 2>&1
+  f="$d/out/pod-tenant-test_wedged.txt"
+  block=$(awk '/^=== pod Ready conditions/ { on = 1; next } on && /^=== / { exit } on { print }' "$f")
+  # Positive control: the read failed and said so by name.
+  case "$block" in
+    *"(reading this pod's Ready conditions failed: kubectl exited 1)"*) : ;;
+    *) echo "the refused read is not named:"; printf '%s\n' "$block"; exit 1 ;;
+  esac
+  n=$(printf '%s\n' "$block" | grep -c 'THE-REAL-REASON')
+  [ "$n" -eq 1 ] || { echo "kubectl's reason appears $n times:"; printf '%s\n' "$block"; exit 1; }
+  rm -rf "$d"
+}
+
+@test "a pod read that answered with a warning keeps the warning in its block" {
+  # A read can succeed and still write to stderr -- a deprecation notice, a
+  # partial-result warning. That warning is part of what the read returned and
+  # stays beside it, with no failure line, since nothing failed.
+  d=$(mktemp -d)
+  mkdir -p "$d/bin"
+  cat >"$d/bin/kubectl" <<'STUB'
+#!/bin/sh
+case "$*" in
+  'get pods -A '*) echo 'tenant-test|wedged|10.0.0.1|node-a|False|Running||eol'; exit 0 ;;
+  'get pod -n tenant-test wedged '*)
+    echo 'Ready=False reason=ContainersNotReady: x'
+    echo 'Warning: THE-WARNING' >&2
+    exit 0 ;;
+esac
+exit 0
+STUB
+  chmod +x "$d/bin/kubectl"
+  timeout 90 env PATH="$d/bin:$PATH" "$SCRIPT" "$d/out" >"$d/log" 2>&1
+  f="$d/out/pod-tenant-test_wedged.txt"
+  block=$(awk '/^=== pod Ready conditions/ { on = 1; next } on && /^=== / { exit } on { print }' "$f")
+  # Positive control: the read answered.
+  case "$block" in *'Ready=False reason=ContainersNotReady'*) : ;; *) echo "no conditions:"; printf '%s\n' "$block"; exit 1 ;; esac
+  n=$(printf '%s\n' "$block" | grep -c 'THE-WARNING')
+  [ "$n" -eq 1 ] || { echo "the warning appears $n times:"; printf '%s\n' "$block"; exit 1; }
+  case "$block" in
+    *"(reading this pod's Ready conditions"*) echo "a read that answered got a failure line:"; printf '%s\n' "$block"; exit 1 ;;
+  esac
+  rm -rf "$d"
+}
+
+@test "a pod read kubectl refused keeps kubectl's message even without a scratch file" {
+  # The reads send stderr to a scratch file, which mktemp may fail to create.
+  # kubectl's message must then still reach the block, once.
+  d=$(mktemp -d)
+  mkdir -p "$d/bin"
+  cat >"$d/bin/kubectl" <<'STUB'
+#!/bin/sh
+case "$*" in
+  'get pods -A '*) echo 'tenant-test|wedged|10.0.0.1|node-a|False|Running||eol'; exit 0 ;;
+  'get pod -n tenant-test wedged '*) echo 'Error from server (Forbidden): pods "wedged" is forbidden' >&2; exit 1 ;;
+esac
+exit 0
+STUB
+  chmod +x "$d/bin/kubectl"
+  timeout 90 env TMPDIR="$d/missing" PATH="$d/bin:$PATH" "$SCRIPT" "$d/out" >"$d/log" 2>&1
+  f="$d/out/pod-tenant-test_wedged.txt"
+  block=$(awk '/^=== pod Ready conditions/ { on = 1; next } on && /^=== / { exit } on { print }' "$f")
+  # Positive control: the read failed and said so by name.
+  case "$block" in
+    *"(reading this pod's Ready conditions failed: kubectl exited 1"*) : ;;
+    *) echo "the refused read is not named:"; printf '%s\n' "$block"; exit 1 ;;
+  esac
+  n=$(printf '%s\n' "$block" | grep -c 'Forbidden')
+  [ "$n" -eq 1 ] || { echo "kubectl's message appears $n times:"; printf '%s\n' "$block"; exit 1; }
+  rm -rf "$d"
+}
+
+@test "an OVS interface lookup the deadline cut names the budget on both paths" {
+  # The per-pod ovn-installed lookup and the LB endpoint lookup both read their
+  # own status. A cut at the deadline has to name the budget there too, not
+  # report the raw status of the call.
+  d=$(mktemp -d)
+  mkdir -p "$d/bin"
+  cat >"$d/bin/kubectl" <<'STUB'
+#!/bin/sh
+case "$*" in
+  'get pods -A '*) [ -n "${STUB_NO_POD:-}" ] && exit 0; echo 'tenant-test|wedged|10.0.0.1|node-a|False|Running||eol'; exit 0 ;;
+  'get svc -A '*) [ -n "${STUB_NO_POD:-}" ] || exit 0; echo 'tenant|web|LoadBalancer|192.0.2.10|80|30080|Cluster'; exit 0 ;;
+  *endpointslices*) echo '10.0.0.1|node-a|tenant-test|wedged|true'; exit 0 ;;
+  *'app=kube-ovn-cni'*) [ -n "${STUB_NO_POD:-}" ] || exit 0; echo 'cni-abc'; exit 0 ;;
+  *'app=ovs'*) echo 'ovs-xyz'; exit 0 ;;
+  *'nc -z'*) echo fail; exit 0 ;;
+  *'find interface'*) sleep 300 ;;
+esac
+exit 0
+STUB
+  chmod +x "$d/bin/kubectl"
+  real_timeout=$(command -v timeout)
+  dp_cut_timeout "$d/bin"
+  # Per-pod path: the pod section's 3s run into the lookup.
+  PATH="$d/bin:$PATH" DP_REAL_TIMEOUT="$real_timeout" DP_PASS="$(printf '%s\n' '*kubectl get pods -A *' '*kubectl get svc -A *')" \
+    COZY_DATAPLANE_BUDGET=6 COZY_DATAPLANE_LB_RESERVE=3 \
+    "$real_timeout" 60 "$SCRIPT" "$d/pod" >"$d/log" 2>&1
+  f="$d/pod/pod-tenant-test_wedged.txt"
+  grep -q 'the OVS interface lookup for iface-id=wedged.tenant-test was cut off at the deadline: the pod section ran out of its share' "$f"
+  # LB path: the LB section's 4s run into the endpoint lookup.
+  STUB_NO_POD=1 PATH="$d/bin:$PATH" DP_REAL_TIMEOUT="$real_timeout" DP_PASS="$(printf '%s\n' '*kubectl get pods -A *' '*kubectl get svc -A *')" \
+    COZY_DATAPLANE_BUDGET=4 COZY_DATAPLANE_LB_RESERVE=4 \
+    "$real_timeout" 60 "$SCRIPT" "$d/lb" >>"$d/log" 2>&1
+  g="$d/lb/lb-tenant_web.txt"
+  grep -q 'the OVS interface lookup for iface-id=wedged.tenant-test on node node-a was cut off at the deadline: the LoadBalancer section ran out of its share' "$g"
+  if grep -q 'the lookup exited' "$f" "$g"; then
+    echo "a deadline cut was reported as a raw status:"
+    grep 'the lookup exited' "$f" "$g"
+    exit 1
+  fi
+  rm -rf "$d"
+}
+
+@test "an affected node gets the cilium service map with no LoadBalancer in the cluster" {
+  # The service map describes every service translation on the node, ClusterIP
+  # included. A pod that cannot reach 10.96.0.1 is a ClusterIP failure with no
+  # LoadBalancer path to run, so the table that says which backend that VIP
+  # resolved to has to come from the per-node capture.
+  # Asserted on the argv: a header with no exec behind it would pass a grep of
+  # the artifact.
+  d=$(mktemp -d)
+  mkdir -p "$d/bin"
+  cat >"$d/bin/kubectl" <<'STUB'
+#!/bin/sh
+case "$*" in
+  *'bpf lb list'*) echo "$*" >>"$STUB_CALLS" ;;
+esac
+for a in "$@"; do
+  case $a in
+    pods) echo 'tenant-test|wedged|10.0.0.1|node-a|False|Running||eol'; exit 0 ;;
+    svc) exit 0 ;;
+  esac
+done
+case "$*" in
+  *'k8s-app=cilium'*) echo 'cilium-xyz'; exit 0 ;;
+esac
+exit 0
+STUB
+  chmod +x "$d/bin/kubectl"
+  STUB_CALLS="$d/calls" PATH="$d/bin:$PATH" timeout 90 "$SCRIPT" "$d/out" >"$d/log" 2>&1
+  # Positive control: no LoadBalancer path ran, so the read below is the pod
+  # path's own.
+  grep -q 'no Service type=LoadBalancer' "$d/log"
+  grep -q -- '-n cozy-cilium cilium-xyz -c cilium-agent -- cilium-dbg bpf lb list' "$d/calls"
+  grep -q '^=== cilium-dbg bpf lb list' "$d/out/node-node-a.txt"
+  rm -rf "$d"
+}
+
+@test "a run stops starting reads when its wall-clock budget is spent" {
+  # The fan-out caps count pods and LBs while the callers' backstops count
+  # seconds, and under the caps alone one affected pod's worst case ran past
+  # the 300s one. So
+  # this runs a cluster where both lists answer and every other read hangs,
+  # under per-read bounds of 20s: bounded only per read, the walk takes minutes
+  # and the outer 60s below stands in for the caller's backstop killing it.
+  #
+  # The lists are answered by the timeout shim without a bound, so whether they
+  # answer is not a race against a small budget; the hanging reads go to the
+  # real `timeout` with the bound the collector gave them.
+  d=$(mktemp -d)
+  mkdir -p "$d/bin"
+  cat >"$d/bin/kubectl" <<'STUB'
+#!/bin/sh
+case "$*" in
+  'get pods -A '*)
+    echo 'tenant-test|wedged-a|10.0.0.1|node-a|False|Running||eol'
+    echo 'tenant-test|wedged-b|10.0.0.2|node-b|False|Running||eol'
+    exit 0 ;;
+  'get svc -A '*) echo 'tenant|web|LoadBalancer|192.0.2.10|80|30080|Cluster'; exit 0 ;;
+esac
+sleep 300
+STUB
+  chmod +x "$d/bin/kubectl"
+  real_timeout=$(command -v timeout)
+  dp_cut_timeout "$d/bin"
+  rc=0
+  PATH="$d/bin:$PATH" DP_REAL_TIMEOUT="$real_timeout" \
+    DP_PASS="$(printf '%s\n' '*kubectl get pods -A *' '*kubectl get svc -A *')" \
+    COZY_DATAPLANE_READ_TIMEOUT=20 COZY_DATAPLANE_BUDGET=8 COZY_DATAPLANE_LB_RESERVE=4 \
+    "$real_timeout" 60 "$SCRIPT" "$d/out" >"$d/log" 2>&1 || rc=$?
+  [ "$rc" -eq 0 ] || { echo "the collector ran past its budget into the outer bound (exit $rc):"; cat "$d/log"; exit 1; }
+  # The pod section stopped at its share and said what it left behind ...
+  grep -q "the pod section's share of the 8s budget is spent; 2 affected pod(s) NOT captured" "$d/log"
+  # ... and the LoadBalancer section still had the reserve to start in.
+  grep -q 'probing 1 LoadBalancer service' "$d/log"
+  grep -q 'the 8s budget is spent; tenant/web and any LoadBalancer after it NOT probed' "$d/log"
+  # ... and neither walk then calls itself complete.
+  if grep -q 'capture complete' "$d/log"; then
+    echo "a walk the budget stopped called itself complete:"
+    cat "$d/log"
+    exit 1
+  fi
+  grep -q 'LoadBalancer-datapath capture stopped early' "$d/log"
+  # A read the deadline cut names the deadline, not the configured 20s bound.
+  if grep -q 'its own 20s timeout' "$d/out/capture-notes.txt"; then
+    echo "a note quotes a bound the read never ran under:"
+    cat "$d/out/capture-notes.txt"
+    exit 1
+  fi
+  grep -q 'was cut off at the deadline: the wall-clock budget of its section ran out' "$d/out/capture-notes.txt"
+  rm -rf "$d"
+}
+
+@test "a capture the budget ran out in the middle of says so beside each empty block" {
+  # The loops decline a whole pod or LB out loud, but the budget can also run
+  # out inside one capture. The execs after that point are refused, their
+  # blocks keep only a header, and a header with nothing under it reads as a
+  # command that found nothing. Here the node lookups answer at once and the
+  # first exec hangs until the deadline, so every exec after it is refused.
+  d=$(mktemp -d)
+  mkdir -p "$d/bin"
+  cat >"$d/bin/kubectl" <<'STUB'
+#!/bin/sh
+case "$*" in
+  'get pods -A '*) echo 'tenant-test|wedged|10.0.0.1|node-a|False|Running||eol'; exit 0 ;;
+  *'k8s-app=cilium'*) echo 'cilium-xyz'; exit 0 ;;
+  'get '*) exit 0 ;;
+esac
+sleep 300
+STUB
+  chmod +x "$d/bin/kubectl"
+  real_timeout=$(command -v timeout)
+  dp_cut_timeout "$d/bin"
+  rc=0
+  PATH="$d/bin:$PATH" DP_REAL_TIMEOUT="$real_timeout" DP_PASS='*kubectl get *' \
+    COZY_DATAPLANE_BUDGET=4 COZY_DATAPLANE_LB_RESERVE=0 \
+    "$real_timeout" 60 "$SCRIPT" "$d/out" >"$d/log" 2>&1 || rc=$?
+  [ "$rc" -eq 0 ] || { echo "the collector did not finish on its own (exit $rc):"; cat "$d/log"; exit 1; }
+  # Positive control: the first exec ran and was cut, so what follows it is
+  # the refused part and not a capture that never started.
+  grep -q '^=== cilium-dbg endpoint list' "$d/out/node-node-a.txt"
+  grep -q '^(not started: ' "$d/out/node-node-a.txt"
+  grep -q 'the pod section ran out of its share of the 4s wall-clock budget' "$d/out/node-node-a.txt"
+  grep -q 'its calls after that were not started' "$d/out/capture-notes.txt"
+  rm -rf "$d"
+}
+
+@test "running out of the pod section's share is not reported as the run's budget running out" {
+  # The pod section stops a reserve short of the end, and the LoadBalancer
+  # section then keeps starting calls. A note claiming the run's budget ran out
+  # at that point puts a cause in the artifact the rest of the file
+  # contradicts, and a run-wide note deduplicated once would leave the LB
+  # section's own exhaustion unrecorded. Every exec hangs here, so each section
+  # runs into its own deadline.
+  d=$(mktemp -d)
+  mkdir -p "$d/bin"
+  cat >"$d/bin/kubectl" <<'STUB'
+#!/bin/sh
+case "$*" in
+  'get pods -A '*) echo 'tenant-test|wedged|10.0.0.1|node-a|False|Running||eol'; exit 0 ;;
+  'get svc -A '*) echo 'tenant|web|LoadBalancer|192.0.2.10|80|30080|Cluster'; exit 0 ;;
+  *endpointslices*) echo '10.0.0.1|node-a|tenant-test|wedged|true'; exit 0 ;;
+  *'k8s-app=cilium'*) echo 'cilium-xyz'; exit 0 ;;
+  *'app=kube-ovn-cni'*) echo 'cni-abc'; exit 0 ;;
+  'get '*) exit 0 ;;
+esac
+sleep 300
+STUB
+  chmod +x "$d/bin/kubectl"
+  real_timeout=$(command -v timeout)
+  dp_cut_timeout "$d/bin"
+  rc=0
+  PATH="$d/bin:$PATH" DP_REAL_TIMEOUT="$real_timeout" DP_PASS='*kubectl get *' \
+    COZY_DATAPLANE_BUDGET=8 COZY_DATAPLANE_LB_RESERVE=4 \
+    "$real_timeout" 60 "$SCRIPT" "$d/out" >"$d/log" 2>&1 || rc=$?
+  [ "$rc" -eq 0 ] || { echo "the collector did not finish on its own (exit $rc):"; cat "$d/log"; exit 1; }
+  notes="$d/out/capture-notes.txt"
+  # Positive control: the LoadBalancer section ran after the pod section's
+  # share was spent.
+  grep -q 'probing 1 LoadBalancer service' "$notes"
+  grep -q 'the pod section ran out of its share of the 8s wall-clock budget' "$notes"
+  grep -q 'the LoadBalancer section ran out of its share of the 8s wall-clock budget' "$notes"
+  if grep -q 'budget of the run' "$notes"; then
+    echo "a section's deadline was reported as the whole run's:"
+    cat "$notes"
+    exit 1
+  fi
+  rm -rf "$d"
+}
+
+@test "an LB probe refused for a spent budget is not blamed on the lookup" {
+  # The loop checks the budget before each LoadBalancer, but it can run out
+  # inside one: here the endpointslice read hangs until the deadline, so the
+  # cni-server lookup behind the probe is refused rather than asked. Writing
+  # that up as a lookup that did not answer names a cause that never happened.
+  d=$(mktemp -d)
+  mkdir -p "$d/bin"
+  cat >"$d/bin/kubectl" <<'STUB'
+#!/bin/sh
+case "$*" in
+  'get pods -A '*) exit 0 ;;
+  'get svc -A '*) echo 'tenant|web|LoadBalancer|192.0.2.10|80|30080|Cluster'; exit 0 ;;
+  *'component=speaker'*) echo 'speaker-0|node-a'; exit 0 ;;
+  'logs '*) echo '{"event":"serviceAnnounced","ips":["192.0.2.10"],"node":"node-a"}'; exit 0 ;;
+  *'app=kube-ovn-cni'*) echo 'cni-abc'; exit 0 ;;
+esac
+sleep 300
+STUB
+  chmod +x "$d/bin/kubectl"
+  real_timeout=$(command -v timeout)
+  dp_cut_timeout "$d/bin"
+  rc=0
+  PATH="$d/bin:$PATH" DP_REAL_TIMEOUT="$real_timeout" \
+    DP_PASS="$(printf '%s\n' '*kubectl get pods -A *' '*kubectl get svc -A *' '*component=speaker*' '*kubectl logs *')" \
+    COZY_DATAPLANE_BUDGET=4 COZY_DATAPLANE_LB_RESERVE=4 \
+    "$real_timeout" 60 "$SCRIPT" "$d/out" >"$d/log" 2>&1 || rc=$?
+  [ "$rc" -eq 0 ] || { echo "the collector did not finish on its own (exit $rc):"; cat "$d/log"; exit 1; }
+  f="$d/out/lb-tenant_web.txt"
+  # Positive control: the probe leg was reached from the announcer.
+  grep -q 'announcer node: node-a' "$f"
+  if grep -q 'the cni-server lookup did not answer' "$f"; then
+    echo "a refused lookup was written up as one that did not answer:"
+    cat "$f"
+    exit 1
+  fi
+  grep -q "no probe completed from node-a -- the LoadBalancer section's share of the budget ran out" "$f"
+  rm -rf "$d"
+}
+
+@test "an LB probe exec cut by the budget is not blamed on a missing cni-server" {
+  # The sibling of the refused-lookup case: here the lookup answers, and it is
+  # the probe exec that runs into the deadline and the next ones that are
+  # refused. An empty outcome set reads as no cni-server, no probe client, or
+  # an exec that could not run -- and the first of those is what the lookup
+  # has just contradicted.
+  d=$(mktemp -d)
+  mkdir -p "$d/bin"
+  cat >"$d/bin/kubectl" <<'STUB'
+#!/bin/sh
+case "$*" in
+  'get pods -A '*) exit 0 ;;
+  'get svc -A '*) echo 'tenant|web|LoadBalancer|192.0.2.10|80|30080|Cluster'; exit 0 ;;
+  *endpointslices*) echo '10.0.0.1|node-a|tenant-test|wedged|true'; exit 0 ;;
+  *'app=kube-ovn-cni'*) echo 'cni-abc'; exit 0 ;;
+  'get '*) exit 0 ;;
+esac
+sleep 300
+STUB
+  chmod +x "$d/bin/kubectl"
+  real_timeout=$(command -v timeout)
+  dp_cut_timeout "$d/bin"
+  rc=0
+  PATH="$d/bin:$PATH" DP_REAL_TIMEOUT="$real_timeout" DP_PASS='*kubectl get *' \
+    COZY_DATAPLANE_BUDGET=4 COZY_DATAPLANE_LB_RESERVE=4 \
+    "$real_timeout" 60 "$SCRIPT" "$d/out" >"$d/log" 2>&1 || rc=$?
+  [ "$rc" -eq 0 ] || { echo "the collector did not finish on its own (exit $rc):"; cat "$d/log"; exit 1; }
+  f="$d/out/lb-tenant_web.txt"
+  # Positive control: the probe leg was reached with a backend node.
+  grep -q 'backend: ip=10.0.0.1 node=node-a' "$f"
+  if grep -q 'no kube-ovn-cni pod there' "$f"; then
+    echo "a budget cut was written up as a node without a cni-server:"
+    cat "$f"
+    exit 1
+  fi
+  grep -q "no probe completed from node-a -- the LoadBalancer section's share of the budget ran out" "$f"
+  if grep -q 'no probe could be attempted' "$f"; then
+    echo "a probe that ran and was cut was written up as never attempted:"
+    cat "$f"
+    exit 1
+  fi
+  rm -rf "$d"
+}
+
+@test "an LB probe whose lookup the deadline cut is blamed on the budget alone" {
+  # The only cni-server lookup hangs and is cut by a bound the deadline
+  # shortened; the probes after it are refused. The budget is the whole cause,
+  # so the reason line must not add a second, unanswered lookup.
+  d=$(mktemp -d)
+  mkdir -p "$d/bin"
+  cat >"$d/bin/kubectl" <<'STUB'
+#!/bin/sh
+case "$*" in
+  'get pods -A '*) exit 0 ;;
+  'get svc -A '*) echo 'tenant|web|LoadBalancer|192.0.2.10|80|30080|Cluster'; exit 0 ;;
+  *endpointslices*) echo '10.0.0.1|node-a|tenant-test|wedged|true'; exit 0 ;;
+  *'app=kube-ovn-cni'*) sleep 300 ;;
+esac
+exit 0
+STUB
+  chmod +x "$d/bin/kubectl"
+  real_timeout=$(command -v timeout)
+  dp_cut_timeout "$d/bin"
+  rc=0
+  PATH="$d/bin:$PATH" DP_REAL_TIMEOUT="$real_timeout" \
+    DP_PASS="$(printf '%s\n' '*kubectl get pods -A *' '*kubectl get svc -A *' '*endpointslices*')" \
+    COZY_DATAPLANE_BUDGET=4 COZY_DATAPLANE_LB_RESERVE=4 \
+    "$real_timeout" 60 "$SCRIPT" "$d/out" >"$d/log" 2>&1 || rc=$?
+  [ "$rc" -eq 0 ] || { echo "the collector did not finish on its own (exit $rc):"; cat "$d/log"; exit 1; }
+  f="$d/out/lb-tenant_web.txt"
+  # Positive control: the lookup was cut under a shortened bound.
+  grep -q 'looking up the pod matching app=kube-ovn-cni on node node-a was cut off at the deadline' "$d/log"
+  grep -q "no probe completed from node-a -- the LoadBalancer section's share of the budget ran out" "$f"
+  if grep -q 'for another the cni-server lookup did not answer' "$f"; then
+    echo "a lookup the deadline cut was reported as a second cause:"
+    cat "$f"
+    exit 1
+  fi
+  # The walk reached its end on its own, but the budget cut a call in its last
+  # LoadBalancer, so it is not complete either.
+  if grep -q 'LoadBalancer-datapath capture complete' "$d/log"; then
+    echo "an LB walk the budget cut called itself complete:"
+    cat "$d/log"
+    exit 1
+  fi
+  # The closing line reaches the job log, where the section line it points to
+  # does not, so it points at the file that holds it.
+  grep -q 'LoadBalancer-datapath capture cut short by the budget -- see capture-notes.txt' "$d/log"
+  rm -rf "$d"
+}
+
+@test "an LB walk stopped at the capture cap does not call itself complete" {
+  # The cap break names what it left behind; the walk's closing line after it
+  # has to agree.
+  d=$(mktemp -d)
+  mkdir -p "$d/bin"
+  cat >"$d/bin/kubectl" <<'STUB'
+#!/bin/sh
+case "$*" in
+  'get pods -A '*) exit 0 ;;
+  'get svc -A '*)
+    echo 'tenant|web|LoadBalancer|192.0.2.10|80|30080|Cluster'
+    echo 'tenant|web2|LoadBalancer|192.0.2.11|80|30081|Cluster'
+    exit 0 ;;
+  *endpointslices*) echo '10.0.0.1|node-a|tenant-test|wedged|true'; exit 0 ;;
+  *'app=kube-ovn-cni'*) echo 'cni-abc'; exit 0 ;;
+  *'nc -z'*) echo fail; exit 0 ;;
+esac
+exit 0
+STUB
+  chmod +x "$d/bin/kubectl"
+  COZY_DATAPLANE_MAX_LBS=1 timeout 90 env PATH="$d/bin:$PATH" "$SCRIPT" "$d/out" >"$d/log" 2>&1
+  # Positive control: the cap fired.
+  grep -q 'reached MAX_LBS=1 captured cap' "$d/log"
+  if grep -q 'LoadBalancer-datapath capture complete' "$d/log"; then
+    echo "an LB walk stopped at the cap called itself complete:"
+    cat "$d/log"
+    exit 1
+  fi
+  grep -q 'LoadBalancer-datapath capture stopped early' "$d/log"
+  rm -rf "$d"
+}
+
+@test "an LB probe stopped by both a refused lookup and the budget names both" {
+  # One probe's lookup is refused by the apiserver, the next hangs into the
+  # deadline and the last is refused by the budget. Naming only the budget
+  # would drop the lookup failure that stopped the first probe.
+  d=$(mktemp -d)
+  mkdir -p "$d/bin"
+  cat >"$d/bin/kubectl" <<'STUB'
+#!/bin/sh
+case "$*" in
+  'get pods -A '*) exit 0 ;;
+  'get svc -A '*) echo 'tenant|web|LoadBalancer|192.0.2.10|80|30080|Cluster'; exit 0 ;;
+  *endpointslices*) echo '10.0.0.1|node-a|tenant-test|wedged|true'; exit 0 ;;
+  *'app=kube-ovn-cni'*)
+    if [ ! -e "$STUB_STATE" ]; then : >"$STUB_STATE"; echo 'Error from server (Forbidden)' >&2; exit 1; fi
+    sleep 300 ;;
+  'get '*) exit 0 ;;
+esac
+exit 0
+STUB
+  chmod +x "$d/bin/kubectl"
+  real_timeout=$(command -v timeout)
+  dp_cut_timeout "$d/bin"
+  rc=0
+  STUB_STATE="$d/state" PATH="$d/bin:$PATH" DP_REAL_TIMEOUT="$real_timeout" \
+    DP_PASS="$(printf '%s\n' '*kubectl get pods -A *' '*kubectl get svc -A *' '*endpointslices*')" \
+    COZY_DATAPLANE_BUDGET=4 COZY_DATAPLANE_LB_RESERVE=4 \
+    "$real_timeout" 60 "$SCRIPT" "$d/out" >"$d/log" 2>&1 || rc=$?
+  [ "$rc" -eq 0 ] || { echo "the collector did not finish on its own (exit $rc):"; cat "$d/log"; exit 1; }
+  f="$d/out/lb-tenant_web.txt"
+  grep -q "no probe completed from node-a -- the LoadBalancer section's share of the budget ran out" "$f"
+  grep -q 'and for another the cni-server lookup did not answer' "$f"
+  rm -rf "$d"
+}
+
+@test "a lookup cut by its own full bound is not blamed on a budget that ran out later" {
+  # Whether the budget cut a lookup is a fact about the lookup's own bound,
+  # not about the clock when its status is read. Here the ovs lookup hits its
+  # full 2s bound with time to spare, and only then do the agent execs run the
+  # pod section into its deadline.
+  d=$(mktemp -d)
+  mkdir -p "$d/bin"
+  cat >"$d/bin/kubectl" <<'STUB'
+#!/bin/sh
+case "$*" in
+  'get pods -A '*) echo 'tenant-test|wedged|10.0.0.1|node-a|False|Running||eol'; exit 0 ;;
+  'get svc -A '*) exit 0 ;;
+  *'k8s-app=cilium'*) echo 'cilium-xyz'; exit 0 ;;
+  *'app=ovs'*|*cilium-dbg*) sleep 300 ;;
+esac
+exit 0
+STUB
+  chmod +x "$d/bin/kubectl"
+  real_timeout=$(command -v timeout)
+  dp_cut_timeout "$d/bin"
+  rc=0
+  PATH="$d/bin:$PATH" DP_REAL_TIMEOUT="$real_timeout" DP_PASS="$(printf '%s\n' '*kubectl get pods -A *' '*kubectl get svc -A *')" \
+    COZY_DATAPLANE_READ_TIMEOUT=2 COZY_DATAPLANE_BUDGET=12 COZY_DATAPLANE_LB_RESERVE=3 \
+    "$real_timeout" 60 "$SCRIPT" "$d/out" >"$d/log" 2>&1 || rc=$?
+  [ "$rc" -eq 0 ] || { echo "the collector did not finish on its own (exit $rc):"; cat "$d/log"; exit 1; }
+  f="$d/out/node-node-a.txt"
+  # Positive controls: the ovs lookup hit its full bound, and the pod section
+  # did run out later.
+  grep -q 'looking up the pod matching app=ovs on node node-a was cut off by its own 2s timeout' "$d/log"
+  grep -q 'the pod section ran out of its share of the 12s wall-clock budget' "$d/out/capture-notes.txt"
+  grep -q 'could not determine whether an ovs pod runs on node node-a -- the lookup did not answer' "$f"
+  if grep -q 'whether an ovs pod runs on node node-a is unknown: the lookup was cut when' "$f"; then
+    echo "a lookup cut by its own bound was blamed on the budget:"
+    cat "$f"
+    exit 1
+  fi
+  rm -rf "$d"
+}
+
+@test "a call killed early under a bound cut to the deadline is not blamed on the budget" {
+  # The other half of the same rule: a bound that reaches the deadline is not
+  # enough either, the deadline also has to have passed. Here the pod list runs
+  # under a bound cut to the pod section's 4s and is killed at once -- what an
+  # OOM-killed remote process returns through kubectl exec -- long before the
+  # deadline arrives.
+  d=$(mktemp -d)
+  mkdir -p "$d/bin"
+  cat >"$d/bin/kubectl" <<'STUB'
+#!/bin/sh
+case "$*" in
+  'get pods -A '*) exit 137 ;;
+esac
+exit 0
+STUB
+  chmod +x "$d/bin/kubectl"
+  rc=0
+  PATH="$d/bin:$PATH" COZY_DATAPLANE_BUDGET=94 COZY_DATAPLANE_LB_RESERVE=90 \
+    timeout 60 "$SCRIPT" "$d/out" >"$d/log" 2>&1 || rc=$?
+  [ "$rc" -eq 0 ] || { echo "the collector did not finish on its own (exit $rc):"; cat "$d/log"; exit 1; }
+  notes="$d/out/capture-notes.txt"
+  # Positive control: the list's own outcome was noted.
+  grep -q 'listing pods was cut off by a SIGKILL' "$notes"
+  if grep -q 'the pod section ran out of its share' "$notes"; then
+    echo "a call killed before the deadline was blamed on the budget:"
+    cat "$notes"
+    exit 1
+  fi
+  rm -rf "$d"
+}
+
+@test "a node lookup killed early under a bound cut to the deadline is not blamed on the budget" {
+  # The lookup side of the rule above: the pod section is 4s long, so every
+  # node lookup runs under a bound cut to the deadline, and this one is killed
+  # at once. The budget did not stop it.
+  d=$(mktemp -d)
+  mkdir -p "$d/bin"
+  cat >"$d/bin/kubectl" <<'STUB'
+#!/bin/sh
+case "$*" in
+  'get pods -A '*) echo 'tenant-test|wedged|10.0.0.1|node-a|False|Running||eol'; exit 0 ;;
+  *'k8s-app=cilium'*) exit 137 ;;
+esac
+exit 0
+STUB
+  chmod +x "$d/bin/kubectl"
+  rc=0
+  PATH="$d/bin:$PATH" COZY_DATAPLANE_BUDGET=94 COZY_DATAPLANE_LB_RESERVE=90 \
+    timeout 60 "$SCRIPT" "$d/out" >"$d/log" 2>&1 || rc=$?
+  [ "$rc" -eq 0 ] || { echo "the collector did not finish on its own (exit $rc):"; cat "$d/log"; exit 1; }
+  f="$d/out/node-node-a.txt"
+  grep -q 'could not determine whether a cilium-agent runs on node node-a -- the lookup did not answer' "$f"
+  if grep -q 'the lookup was cut when' "$f"; then
+    echo "a lookup killed before the deadline was blamed on the budget:"
+    cat "$f"
+    exit 1
+  fi
+  rm -rf "$d"
+}
+
+@test "a call cut by its own bound just past the deadline is not blamed on the budget" {
+  # Whether the budget cut a call is decided by the bound it ran under: only a
+  # bound that reached the deadline can be the deadline's. Here the pod list
+  # runs under its own 3s bound inside the pod section's 10s and comes back
+  # from its kill grace after the deadline has passed; the clock after the call
+  # would blame the budget for what its own bound did. The 7s between the bound
+  # and the deadline keep a whole-second tick of `date +%s` between DP_T0 and
+  # the call from turning the bound into the deadline's.
+  d=$(mktemp -d)
+  mkdir -p "$d/bin"
+  printf '#!/bin/sh\nexit 0\n' >"$d/bin/kubectl"
+  real_timeout=$(command -v timeout)
+  cat >"$d/bin/timeout" <<SHIM
+#!/bin/sh
+case "\$*" in
+  *'kubectl get pods -A '*) sleep 12; exit 137 ;;
+esac
+exec "$real_timeout" "\$@"
+SHIM
+  chmod +x "$d/bin/kubectl" "$d/bin/timeout"
+  rc=0
+  PATH="$d/bin:$PATH" COZY_DATAPLANE_LIST_TIMEOUT=3 COZY_DATAPLANE_BUDGET=100 COZY_DATAPLANE_LB_RESERVE=90 \
+    "$real_timeout" 60 "$SCRIPT" "$d/out" >"$d/log" 2>&1 || rc=$?
+  [ "$rc" -eq 0 ] || { echo "the collector did not finish on its own (exit $rc):"; cat "$d/log"; exit 1; }
+  notes="$d/out/capture-notes.txt"
+  # Positive control: the list was cut, and reported against its own bound.
+  grep -q 'listing pods was cut off by a SIGKILL -- the kill grace of its own 3s timeout' "$notes"
+  if grep -q 'the pod section ran out of its share' "$notes"; then
+    echo "a call's own cutoff was blamed on the budget:"
+    cat "$notes"
+    exit 1
+  fi
+  rm -rf "$d"
+}
+
+@test "a pod walk that stopped early does not call itself complete" {
+  # Both ways out of the walk before its end -- the pod cap and the pod
+  # section's share of the budget -- name what they left behind, and the line
+  # after them must not then call the capture complete.
+  d=$(mktemp -d)
+  mkdir -p "$d/bin"
+  cat >"$d/bin/kubectl" <<'STUB'
+#!/bin/sh
+case "$*" in
+  'get pods -A '*)
+    echo 'tenant-test|wedged-a|10.0.0.1|node-a|False|Running||eol'
+    echo 'tenant-test|wedged-b|10.0.0.2|node-b|False|Running||eol'
+    exit 0 ;;
+  # Hangs only when the test asks it to, so the budget run spends the pod
+  # section's share before the walk starts.
+  *'app=ovn-central'*) [ -n "${STUB_HANG:-}" ] && sleep 300 ;;
+esac
+exit 0
+STUB
+  chmod +x "$d/bin/kubectl"
+  real_timeout=$(command -v timeout)
+  dp_cut_timeout "$d/bin"
+  COZY_DATAPLANE_MAX_PODS=1 "$real_timeout" 60 env PATH="$d/bin:$PATH" "$SCRIPT" "$d/cap" >"$d/log" 2>&1
+  # Positive controls: the cap fired, and the budget ran out before the walk.
+  grep -q 'reached MAX_PODS=1 cap' "$d/cap/capture-notes.txt"
+  STUB_HANG=1 DP_REAL_TIMEOUT="$real_timeout" DP_PASS='*kubectl get pods -A *' \
+    COZY_DATAPLANE_BUDGET=4 COZY_DATAPLANE_LB_RESERVE=1 \
+    "$real_timeout" 60 env PATH="$d/bin:$PATH" "$SCRIPT" "$d/budget" >>"$d/log" 2>&1
+  grep -q "the pod section's share of the 4s budget is spent" "$d/budget/capture-notes.txt"
+  for notes in "$d/cap/capture-notes.txt" "$d/budget/capture-notes.txt"; do
+    if grep -q 'host->pod data-plane capture complete' "$notes"; then
+      echo "a walk that stopped early called itself complete:"
+      cat "$notes"
+      exit 1
+    fi
+    grep -q 'host->pod data-plane capture stopped early' "$notes"
+  done
+  rm -rf "$d"
+}
+
+@test "a pod section whose last call the deadline cut says so in the notes" {
+  # When the call the deadline cuts is the section's last, nothing is refused
+  # after it and the LoadBalancer section starts on a fresh deadline, so the
+  # cut itself has to write the section note or the truncated capture carries
+  # no word about the budget.
+  d=$(mktemp -d)
+  mkdir -p "$d/bin"
+  cat >"$d/bin/kubectl" <<'STUB'
+#!/bin/sh
+case "$*" in
+  'get pods -A '*) echo 'tenant-test|wedged|10.0.0.1|node-a|False|Running||eol'; exit 0 ;;
+  'get svc -A '*) exit 0 ;;
+  *'app=kube-ovn-cni'*) echo 'cni-abc'; exit 0 ;;
+  *conntrack*) sleep 300 ;;
+esac
+exit 0
+STUB
+  chmod +x "$d/bin/kubectl"
+  real_timeout=$(command -v timeout)
+  dp_cut_timeout "$d/bin"
+  rc=0
+  PATH="$d/bin:$PATH" DP_REAL_TIMEOUT="$real_timeout" DP_PASS="$(printf '%s\n' '*kubectl get pods -A *' '*kubectl get svc -A *')" \
+    COZY_DATAPLANE_BUDGET=6 COZY_DATAPLANE_LB_RESERVE=3 \
+    "$real_timeout" 60 "$SCRIPT" "$d/out" >"$d/log" 2>&1 || rc=$?
+  [ "$rc" -eq 0 ] || { echo "the collector did not finish on its own (exit $rc):"; cat "$d/log"; exit 1; }
+  # Positive control: the conntrack block of the affected pod was reached.
+  grep -q '^=== host netns: kernel conntrack for 10.0.0.1' "$d/out/pod-tenant-test_wedged.txt"
+  grep -q 'the pod section ran out of its share of the 6s wall-clock budget' "$d/out/capture-notes.txt"
+  # The walk ended on its own, but its last pod was cut, so it is not complete.
+  if grep -q 'host->pod data-plane capture complete' "$d/out/capture-notes.txt"; then
+    echo "a walk whose last pod the deadline cut called itself complete:"
+    cat "$d/out/capture-notes.txt"
+    exit 1
+  fi
+  grep -q 'host->pod data-plane capture cut short by the budget -- see capture-notes.txt' "$d/out/capture-notes.txt"
+  rm -rf "$d"
+}
+
+@test "a node lookup refused for a spent budget is not called unanswered" {
+  # The node capture writes an absence four ways: none, unknown because the
+  # lookup did not answer, unknown because the deadline cut it, and not asked
+  # at all once the budget is spent. The first lookup here hangs into the pod
+  # section's deadline, so the ones after it are refused. A cut at the full
+  # bound is the case "did not answer" is kept for, and the cut-off node lookup
+  # test above covers it.
+  d=$(mktemp -d)
+  mkdir -p "$d/bin"
+  cat >"$d/bin/kubectl" <<'STUB'
+#!/bin/sh
+case "$*" in
+  'get pods -A '*) echo 'tenant-test|wedged|10.0.0.1|node-a|False|Running||eol'; exit 0 ;;
+  *'k8s-app=cilium'*) sleep 300 ;;
+esac
+exit 0
+STUB
+  chmod +x "$d/bin/kubectl"
+  real_timeout=$(command -v timeout)
+  dp_cut_timeout "$d/bin"
+  rc=0
+  PATH="$d/bin:$PATH" DP_REAL_TIMEOUT="$real_timeout" DP_PASS='*kubectl get pods -A *' \
+    COZY_DATAPLANE_BUDGET=4 COZY_DATAPLANE_LB_RESERVE=1 \
+    "$real_timeout" 60 "$SCRIPT" "$d/out" >"$d/log" 2>&1 || rc=$?
+  [ "$rc" -eq 0 ] || { echo "the collector did not finish on its own (exit $rc):"; cat "$d/log"; exit 1; }
+  f="$d/out/node-node-a.txt"
+  # The lookup the deadline cut names the budget ...
+  grep -q 'whether a cilium-agent runs on node node-a is unknown: the lookup was cut when the pod section ran out of its share' "$f"
+  # ... and neither it nor the refused one is called unanswered.
+  if grep -q 'the lookup did not answer' "$f"; then
+    echo "a lookup the budget stopped was called unanswered:"
+    cat "$f"
+    exit 1
+  fi
+  grep -q 'whether an ovs pod runs on node node-a was not asked: the pod section ran out of its share' "$f"
+  rm -rf "$d"
+}
+
+@test "a reserve that leaves the pod section nothing is named" {
+  # A reserve at least as large as the budget is a legal setting, and it means
+  # the pod section starts no call at all. Silence there reads as a cluster with
+  # nothing affected.
+  d=$(mktemp -d)
+  mkdir -p "$d/bin"
+  printf '#!/bin/sh\nexit 0\n' >"$d/bin/kubectl"
+  chmod +x "$d/bin/kubectl"
+  PATH="$d/bin:$PATH" COZY_DATAPLANE_BUDGET=5 COZY_DATAPLANE_LB_RESERVE=5 \
+    timeout 30 "$SCRIPT" "$d/out" >"$d/log" 2>&1
+  grep -q 'COZY_DATAPLANE_LB_RESERVE=5s leaves nothing of the 5s budget for the pod section' "$d/out/capture-notes.txt"
+  rm -rf "$d"
+}
+
+@test "a budget knob that is not a whole number of seconds is named and replaced" {
+  # The budget and the reserve are used in shell arithmetic, so a value that is
+  # not a number has to be replaced before it gets there, and the replacement
+  # named, or the bound in effect is mistaken for the one asked for.
+  d=$(mktemp -d)
+  mkdir -p "$d/bin"
+  printf '#!/bin/sh\nexit 0\n' >"$d/bin/kubectl"
+  chmod +x "$d/bin/kubectl"
+  rc=0
+  COZY_DATAPLANE_BUDGET=abc COZY_DATAPLANE_LB_RESERVE=x \
+    timeout 30 env PATH="$d/bin:$PATH" "$SCRIPT" "$d/out" >"$d/log" 2>&1 || rc=$?
+  [ "$rc" -eq 0 ] || { echo "a bad budget knob broke the run (exit $rc):"; cat "$d/log"; exit 1; }
+  grep -q "COZY_DATAPLANE_BUDGET='abc' is not a whole number of seconds; using 270s" "$d/out/capture-notes.txt"
+  grep -q "COZY_DATAPLANE_LB_RESERVE='x' is not a whole number of seconds; using 90s" "$d/out/capture-notes.txt"
+  # Positive control: the run reached its end on the defaults.
+  grep -q 'no Service type=LoadBalancer' "$d/log"
+  rm -rf "$d"
+}
+
+@test "without a timeout binary the reads still run and the notes say they are unbounded" {
+  # dp_run runs a call unbounded when `timeout` is missing rather than letting
+  # every call exit 127, which would report kubectl failing although kubectl
+  # never ran. The budget then only decides whether a call starts, and the
+  # notes say so.
+  d=$(mktemp -d)
+  mkdir -p "$d/bin"
+  for t in awk sed date grep mktemp tr cut head tail wc cat rm mkdir sleep env; do
+    ln -s "$(command -v "$t")" "$d/bin/$t"
+  done
+  printf '#!/bin/sh\necho "$*" >>"$STUB_CALLS"\nexit 0\n' >"$d/bin/kubectl"
+  chmod +x "$d/bin/kubectl"
+  # Positive control: the shim PATH really has no timeout on it.
+  if PATH="$d/bin" command -v timeout >/dev/null 2>&1; then
+    echo "the test PATH still carries a timeout binary"
+    exit 1
+  fi
+  rc=0
+  real_timeout=$(command -v timeout)
+  STUB_CALLS="$d/calls" PATH="$d/bin" "$real_timeout" 30 /bin/sh "$SCRIPT" "$d/out" >"$d/log" 2>&1 || rc=$?
+  [ "$rc" -eq 0 ] || { echo "the run without timeout failed (exit $rc):"; cat "$d/log"; exit 1; }
+  grep -q 'no timeout binary on PATH: calls run unbounded' "$d/out/capture-notes.txt"
+  grep -q '^get pods -A ' "$d/calls"
+  grep -q '^get svc -A ' "$d/calls"
+  if grep -q 'exited 127' "$d/out/capture-notes.txt"; then
+    echo "a missing timeout was reported as kubectl failing:"
+    cat "$d/out/capture-notes.txt"
+    exit 1
+  fi
+  rm -rf "$d"
+}
+
+@test "without a timeout binary a killed call past the deadline is not blamed on the budget" {
+  # With no `timeout` on PATH nothing bounds a call, so a 137 is a signal from
+  # outside -- here a call that comes back killed after the 4s pod section has
+  # ended -- and never the deadline's doing, however the clock reads.
+  d=$(mktemp -d)
+  mkdir -p "$d/bin"
+  for t in awk sed date grep mktemp tr cut head tail wc cat rm mkdir sleep env; do
+    ln -s "$(command -v "$t")" "$d/bin/$t"
+  done
+  cat >"$d/bin/kubectl" <<'STUB'
+#!/bin/sh
+case "$*" in
+  'get pods -A '*) sleep 5; exit 137 ;;
+esac
+exit 0
+STUB
+  chmod +x "$d/bin/kubectl"
+  real_timeout=$(command -v timeout)
+  rc=0
+  PATH="$d/bin" COZY_DATAPLANE_BUDGET=94 COZY_DATAPLANE_LB_RESERVE=90 \
+    "$real_timeout" 60 /bin/sh "$SCRIPT" "$d/out" >"$d/log" 2>&1 || rc=$?
+  [ "$rc" -eq 0 ] || { echo "the collector did not finish on its own (exit $rc):"; cat "$d/log"; exit 1; }
+  notes="$d/out/capture-notes.txt"
+  # Positive control: the list's own outcome names an outside signal.
+  grep -q 'listing pods was cut off by a signal from outside this script, which ran this read unbounded' "$notes"
+  if grep -q 'the pod section ran out of its share' "$notes"; then
+    echo "an unbounded call's kill was blamed on the budget:"
+    cat "$notes"
+    exit 1
+  fi
+  rm -rf "$d"
+}
+
+@test "a budget knob with a leading zero is read as decimal, not rejected by the shell" {
+  # The knob is checked for digits and then used in shell arithmetic, which
+  # reads a leading zero as octal: 08 aborts the script before it writes a
+  # note, and 010 silently becomes 8.
+  d=$(mktemp -d)
+  mkdir -p "$d/bin"
+  printf '#!/bin/sh\nexit 0\n' >"$d/bin/kubectl"
+  chmod +x "$d/bin/kubectl"
+  rc=0
+  PATH="$d/bin:$PATH" COZY_DATAPLANE_BUDGET=08 COZY_DATAPLANE_LB_RESERVE=03 \
+    timeout 30 "$SCRIPT" "$d/out" >"$d/log" 2>&1 || rc=$?
+  [ "$rc" -eq 0 ] || { echo "a leading zero broke the run (exit $rc):"; cat "$d/log"; exit 1; }
+  # Positive control: the run reached its end.
+  grep -q 'no Service type=LoadBalancer' "$d/log"
+  if grep -qi 'illegal number\|value too great\|arithmetic' "$d/log"; then
+    echo "the shell choked on the knob:"
+    cat "$d/log"
+    exit 1
+  fi
+  rm -rf "$d"
+}
+
+@test "a lookup cut short by the pod section's deadline is asked again by the LB section" {
+  # The memo keeps a cutoff so a hung lookup is not paid for twice. A cutoff
+  # under a bound the deadline shortened says nothing about the full bound,
+  # and caching it hands the LoadBalancer section an unknown component for
+  # the node while its reserve still has room to ask. The stub hangs on the
+  # first cilium lookup and answers every one after it.
+  d=$(mktemp -d)
+  mkdir -p "$d/bin"
+  cat >"$d/bin/kubectl" <<'STUB'
+#!/bin/sh
+case "$*" in
+  'get pods -A '*) echo 'tenant-test|wedged|10.0.0.1|node-a|False|Running||eol'; exit 0 ;;
+  'get svc -A '*) echo 'tenant|web|LoadBalancer|192.0.2.10|80|30080|Cluster'; exit 0 ;;
+  *endpointslices*) echo '10.0.0.1|node-a|tenant-test|wedged|true'; exit 0 ;;
+  *'k8s-app=cilium'*)
+    echo "$*" >>"$STUB_CALLS"
+    if [ ! -e "$STUB_STATE" ]; then : >"$STUB_STATE"; sleep 300; fi
+    echo 'cilium-xyz'; exit 0 ;;
+  *'app=kube-ovn-cni'*) echo 'cni-abc'; exit 0 ;;
+  *'nc -z'*) echo fail; exit 0 ;;
+esac
+exit 0
+STUB
+  chmod +x "$d/bin/kubectl"
+  real_timeout=$(command -v timeout)
+  dp_cut_timeout "$d/bin"
+  rc=0
+  STUB_CALLS="$d/calls" STUB_STATE="$d/state" PATH="$d/bin:$PATH" DP_REAL_TIMEOUT="$real_timeout" \
+    DP_PASS="$(printf '%s\n' '*kubectl get pods -A *' '*kubectl get svc -A *')" \
+    COZY_DATAPLANE_BUDGET=12 COZY_DATAPLANE_LB_RESERVE=6 \
+    "$real_timeout" 60 "$SCRIPT" "$d/out" >"$d/log" 2>&1 || rc=$?
+  [ "$rc" -eq 0 ] || { echo "the collector did not finish on its own (exit $rc):"; cat "$d/log"; exit 1; }
+  # Positive control: the first lookup was cut under a shortened bound.
+  grep -q 'looking up the pod matching k8s-app=cilium on node node-a was cut off at the deadline' "$d/log"
+  n=$(wc -l <"$d/calls" | tr -d ' ')
+  if [ "$n" -lt 2 ]; then
+    echo "the LB section reused a cutoff from a shortened bound (cilium lookups: $n):"
+    cat "$d/out/lb-tenant_web.txt"
+    exit 1
+  fi
+  grep -q 'cilium=cilium-xyz' "$d/out/lb-tenant_web.txt"
+  rm -rf "$d"
+}
+
+@test "a failed OVS interface lookup is not written up as an absent interface" {
+  # "no OVS interface with iface-id=..." is an answer only a lookup that ran
+  # and succeeded can give; one that failed, was cut off or was refused for a
+  # spent budget has to say which.
+  d=$(mktemp -d)
+  mkdir -p "$d/bin"
+  cat >"$d/bin/kubectl" <<'STUB'
+#!/bin/sh
+for a in "$@"; do
+  case $a in
+    pods) echo 'tenant-test|wedged|10.0.0.1|node-a|False|Running||eol'; exit 0 ;;
+  esac
+done
+case "$*" in
+  *'app=ovs'*) echo 'ovs-xyz'; exit 0 ;;
+  *'find interface'*) echo 'ovs-vsctl: unix:/var/run/openvswitch/db.sock: database connection failed' >&2; exit 1 ;;
+esac
+exit 0
+STUB
+  chmod +x "$d/bin/kubectl"
+  timeout 90 env PATH="$d/bin:$PATH" "$SCRIPT" "$d/out" >"$d/log" 2>&1
+  f="$d/out/pod-tenant-test_wedged.txt"
+  # Positive control: the OVS block ran for the affected pod.
+  grep -q '^=== OVS interface ovn-installed flag' "$f"
+  if grep -q '^no OVS interface with' "$f"; then
+    echo "a failed lookup was written up as an absent interface:"
+    cat "$f"
+    exit 1
+  fi
+  grep -q 'could not look up the OVS interface for iface-id=wedged.tenant-test -- the lookup exited 1' "$f"
+  rm -rf "$d"
+}
+
+@test "a read refused for a spent budget is not reported as cut off" {
+  # With no budget left nothing is asked, so a note naming a timeout would put
+  # a cause in the artifact that never happened -- the rule dp_read_outcome
+  # already keeps for instant failures.
+  d=$(mktemp -d)
+  mkdir -p "$d/bin"
+  printf '#!/bin/sh\necho called >>"$STUB_CALLS"\nexit 0\n' >"$d/bin/kubectl"
+  chmod +x "$d/bin/kubectl"
+  rc=0
+  STUB_CALLS="$d/calls" PATH="$d/bin:$PATH" COZY_DATAPLANE_BUDGET=0 COZY_DATAPLANE_LB_RESERVE=0 \
+    timeout 30 "$SCRIPT" "$d/out" >"$d/log" 2>&1 || rc=$?
+  [ "$rc" -eq 0 ]
+  [ ! -e "$d/calls" ]
+  grep -q 'listing pods was not started: the wall-clock budget of its section was already spent' "$d/out/capture-notes.txt"
+  if grep -q 'cut off' "$d/out/capture-notes.txt"; then
+    echo "a read that never started was reported as cut off:"
+    cat "$d/out/capture-notes.txt"
+    exit 1
+  fi
+  rm -rf "$d"
+}
+
+@test "the wall-clock budget fits inside the backstop of each caller" {
+  # dp_run ends no call later than the budget plus one kill grace, so that sum
+  # has to sit under each caller's backstop or the backstop is what fires and
+  # the notes explaining the cut never reach the artifact. It also has to use
+  # that backstop: a caller with a wider one that runs on the default budget
+  # gives up the time it has. So each caller's budget -- the override on its
+  # call line, or the script's default -- must end inside the backstop and no
+  # further from it than the backstop's own kill grace. Read from the script
+  # and from both call sites, so moving either side alone turns this red.
+  default=$(sed -n 's/^DP_BUDGET="${COZY_DATAPLANE_BUDGET:-\([0-9]*\)}"$/\1/p' "$SCRIPT")
+  reserve=$(sed -n 's/^DP_LB_RESERVE="${COZY_DATAPLANE_LB_RESERVE:-\([0-9]*\)}"$/\1/p' "$SCRIPT")
+  grace=$(sed -n 's/^DP_READ_GRACE=\([0-9]*\)$/\1/p' "$SCRIPT")
+  [ -n "$default" ] && [ -n "$reserve" ] && [ -n "$grace" ]
+  for caller in "$HACK_DIR/cozytest.sh" "$HACK_DIR/e2e-chainsaw/.chainsaw.yaml"; do
+    line=$(grep 'timeout -k [0-9]* [0-9]* .*e2e-capture-dataplane\.sh' "$caller" | head -n 1)
+    [ -n "$line" ] || { echo "no backstop found around the collector in $caller"; exit 1; }
+    kill=$(printf '%s\n' "$line" | sed 's/.*timeout -k \([0-9]*\) [0-9]* .*/\1/')
+    backstop=$(printf '%s\n' "$line" | sed 's/.*timeout -k [0-9]* \([0-9]*\) .*/\1/')
+    budget=$(printf '%s\n' "$line" | sed -n 's/.*COZY_DATAPLANE_BUDGET=\([0-9]*\) .*/\1/p')
+    budget=${budget:-$default}
+    # The reserve is carved out of the budget; one at least as large leaves the
+    # pod section nothing.
+    [ "$reserve" -lt "$budget" ] || { echo "reserve ${reserve}s leaves nothing of ${budget}s in $caller"; exit 1; }
+    if [ $((budget + grace)) -ge "$backstop" ]; then
+      echo "budget ${budget}s + grace ${grace}s does not fit the ${backstop}s backstop in $caller"
+      exit 1
+    fi
+    if [ $((backstop - budget - grace)) -gt "$kill" ]; then
+      echo "budget ${budget}s leaves $((backstop - budget - grace))s of the ${backstop}s backstop in $caller unused"
+      exit 1
+    fi
+  done
+}
+
+@test "every kubectl call in the collector goes through dp_run" {
+  # dp_run is what bounds a call and what enforces the budget, so a kubectl
+  # call that bypasses it can hang the run into the caller's backstop. Matched
+  # by position: a kubectl token must directly follow `dp_run <bound> ` or
+  # `command -v `. Comments and single-quoted text are dropped first, since
+  # a single-quoted `kubectl` is a message or a command run on a remote pod.
+  # Double-quoted text is kept on purpose: `x="$(kubectl ...)"` is a real call.
+  # Offenders are listed by line, so the failure says where to look.
+  offenders=$(awk '
+    {
+      s = $0
+      if (s ~ /^[ \t]*#/) next
+      gsub(/\047[^\047]*\047/, "", s)
+      sub(/[ \t]#.*/, "", s)
+      rest = s; pre = ""
+      while (match(rest, /(^|[^A-Za-z0-9_.-])kubectl([^A-Za-z0-9_.-]|$)/)) {
+        k = RSTART + (substr(rest, RSTART, 1) == "k" ? 0 : 1)
+        before = pre substr(rest, 1, k - 1)
+        if (before !~ /dp_run "(\$\(dp_clip [A-Za-z0-9_$"]+\)|\$[A-Za-z_][A-Za-z0-9_]*)" $/ && before !~ /command -v $/) {
+          print FILENAME ":" NR ": " $0
+          break
+        }
+        pre = before "kubectl"
+        rest = substr(rest, k + 7)
+      }
+    }' "$SCRIPT")
+  if [ -n "$offenders" ]; then
+    echo "kubectl called outside dp_run:"
+    printf '%s\n' "$offenders"
+    exit 1
+  fi
+  # Positive control: the scan reaches the calls it guards, so an empty list
+  # above is a clean file and not a pattern that matches nothing.
+  n=$(grep -c 'dp_run "[^"]*" kubectl ' "$SCRIPT")
+  [ "$n" -ge 30 ]
+}
+
+# A cluster with one affected pod on node-a, an ovn-central replica, and one
+# reachable LoadBalancer announced from node-a.
+dp_every_file_stub() {
+  cat >"$1/kubectl" <<'STUB'
+#!/bin/sh
+case "$*" in
+  'get pods -A '*) echo 'tenant-test|wedged|10.0.0.1|node-a|False|Running||eol'; exit 0 ;;
+  'get svc -A '*) echo 'tenant|web|LoadBalancer|192.0.2.10|80|30080|Cluster'; exit 0 ;;
+  *'app=ovn-central'*) echo 'ovn-central-0'; exit 0 ;;
+  *'component=speaker'*) echo 'speaker-0|node-a'; exit 0 ;;
+  'logs '*) echo '{"event":"serviceAnnounced","ips":["192.0.2.10"],"node":"node-a"}'; exit 0 ;;
+  *endpointslices*) echo '10.0.0.1|node-a|tenant-test|wedged|true'; exit 0 ;;
+  *'app=kube-ovn-cni'*) echo 'cni-abc'; exit 0 ;;
+  *'nc -z'*) echo ok; exit 0 ;;
+esac
+exit 0
+STUB
+  chmod +x "$1/kubectl"
+}
+
+@test "a second run into one directory keeps the node capture apart" {
+  # capture-notes.txt, the per-pod and the per-LB files keep every run behind
+  # a separator. The node capture ran two runs together with nothing between
+  # them, so a reader could not tell where the second began.
+  d=$(mktemp -d)
+  mkdir -p "$d/bin"
+  dp_every_file_stub "$d/bin"
+  timeout 90 env PATH="$d/bin:$PATH" "$SCRIPT" "$d/out" >"$d/log" 2>&1
+  timeout 90 env PATH="$d/bin:$PATH" "$SCRIPT" "$d/out" >>"$d/log" 2>&1
+  f="$d/out/node-node-a.txt"
+  # Positive control: both runs wrote the node capture.
+  [ "$(grep -c '^# NODE node-a ' "$f")" -eq 2 ]
+  grep -qx -- '--- new capture run ---' "$f"
+  rm -rf "$d"
+}
+
+@test "a failed speaker log read says so in the notes" {
+  # The announcer is taken from these logs. A read that failed left no trace,
+  # so an <unknown> announcer could not be told from a speaker that never
+  # announced the address.
+  d=$(mktemp -d)
+  mkdir -p "$d/bin"
+  cat >"$d/bin/kubectl" <<'STUB'
+#!/bin/sh
+case "$*" in
+  'get pods -A '*) exit 0 ;;
+  'get svc -A '*) echo 'tenant|web|LoadBalancer|192.0.2.10|80|30080|Cluster'; exit 0 ;;
+  *'component=speaker'*) echo 'speaker-0|node-a'; exit 0 ;;
+  'logs '*) echo 'Error from server (BadRequest): container "speaker" in pod "speaker-0" is waiting to start' >&2; exit 1 ;;
+esac
+exit 0
+STUB
+  chmod +x "$d/bin/kubectl"
+  timeout 90 env PATH="$d/bin:$PATH" "$SCRIPT" "$d/out" >"$d/log" 2>&1
+  grep -q 'reading the logs of speaker speaker-0 on node-a failed: kubectl exited 1: Error from server (BadRequest)' "$d/out/capture-notes.txt"
+  rm -rf "$d"
+}
+
+@test "an endpoint tcpdump that falls back to the geneve interface says so" {
+  # The endpoint-side tcpdump is pointed at the backend's OVS interface when
+  # the lookup finds one. When it does not, the capture runs on the geneve
+  # interface instead, and the header then names an interface nobody chose for
+  # the backend.
+  d=$(mktemp -d)
+  mkdir -p "$d/bin"
+  cat >"$d/bin/kubectl" <<'STUB'
+#!/bin/sh
+case "$*" in
+  'get pods -A '*) exit 0 ;;
+  'get svc -A '*) echo 'tenant|web|LoadBalancer|192.0.2.10|80|30080|Cluster'; exit 0 ;;
+  *endpointslices*) echo '10.0.0.1|node-a|tenant-test|wedged|true'; exit 0 ;;
+  *'app=kube-ovn-cni'*) echo 'cni-abc'; exit 0 ;;
+  *'app=ovs'*) echo 'ovs-xyz'; exit 0 ;;
+  *'nc -z'*) echo fail; exit 0 ;;
+esac
+exit 0
+STUB
+  chmod +x "$d/bin/kubectl"
+  timeout 90 env PATH="$d/bin:$PATH" "$SCRIPT" "$d/out" >"$d/log" 2>&1
+  # Positive control: the heavy capture ran and the endpoint tcpdump used the
+  # fallback.
+  grep -q 'iface=genev_sys_6081' "$d/out/lb-tenant_web.tcpdump-endpoint.txt"
+  grep -q 'no OVS interface with iface-id=wedged.tenant-test on node node-a; the endpoint tcpdump uses genev_sys_6081 instead' "$d/out/lb-tenant_web.txt"
+  rm -rf "$d"
+}
+
+@test "an endpoint tcpdump fallback names the lookup that failed, not a status nobody saw" {
+  # The fallback has two lookups behind it: the ovs pod on the node, then the
+  # interface inside it. When the pod lookup is cut off, the note has to say
+  # that, not report the interface lookup as having exited with a status that
+  # only the pod lookup's memo holds. A node with no ovs pod is a third case.
+  d=$(mktemp -d)
+  mkdir -p "$d/bin"
+  cat >"$d/bin/kubectl" <<'STUB'
+#!/bin/sh
+case "$*" in
+  'get pods -A '*) exit 0 ;;
+  'get svc -A '*) echo 'tenant|web|LoadBalancer|192.0.2.10|80|30080|Cluster'; exit 0 ;;
+  *endpointslices*) echo '10.0.0.1|node-a|tenant-test|wedged|true'; exit 0 ;;
+  *'app=kube-ovn-cni'*) echo 'cni-abc'; exit 0 ;;
+  *'nc -z'*) echo fail; exit 0 ;;
+esac
+exit 0
+STUB
+  chmod +x "$d/bin/kubectl"
+  dp_cut_timeout "$d/bin"
+  timeout 90 env PATH="$d/bin:$PATH" DP_CUT='*app=ovs*' "$SCRIPT" "$d/cut" >"$d/log" 2>&1
+  f="$d/cut/lb-tenant_web.txt"
+  # Positive control: the endpoint side ran on the fallback.
+  grep -q 'iface=genev_sys_6081' "$d/cut/lb-tenant_web.tcpdump-endpoint.txt"
+  grep -q 'could not determine whether an ovs pod runs on node node-a -- the lookup did not answer; the endpoint tcpdump uses genev_sys_6081 instead' "$f"
+  if grep -q 'the lookup exited' "$f"; then
+    echo "the pod lookup's cutoff was reported as the interface lookup exiting:"
+    cat "$f"
+    exit 1
+  fi
+  # No ovs pod on the node at all: nothing was looked up inside one.
+  PATH="$d/bin:$PATH" timeout 90 "$SCRIPT" "$d/none" >>"$d/log" 2>&1
+  grep -q 'no ovs pod found on node node-a; the endpoint tcpdump uses genev_sys_6081 instead' "$d/none/lb-tenant_web.txt"
+  rm -rf "$d"
+}
+
+@test "a read timeout knob that is not a whole number of seconds is named and replaced" {
+  # A value timeout cannot parse made every read exit 125, reported as kubectl
+  # exiting 125 although kubectl never ran. Zero is rejected too: every read
+  # would be refused as if the budget were spent.
+  d=$(mktemp -d)
+  mkdir -p "$d/bin"
+  printf '#!/bin/sh\nexit 0\n' >"$d/bin/kubectl"
+  chmod +x "$d/bin/kubectl"
+  COZY_DATAPLANE_READ_TIMEOUT=abc COZY_DATAPLANE_LIST_TIMEOUT=0 \
+    timeout 30 env PATH="$d/bin:$PATH" "$SCRIPT" "$d/out" >"$d/log" 2>&1
+  notes="$d/out/capture-notes.txt"
+  grep -q "COZY_DATAPLANE_READ_TIMEOUT='abc' is not a whole number of seconds above zero; using 20s" "$notes"
+  grep -q "COZY_DATAPLANE_LIST_TIMEOUT='0' is not a whole number of seconds above zero; using 28s" "$notes"
+  if grep -q 'exited 125\|was not started' "$notes"; then
+    echo "a bad knob still broke the reads:"
+    cat "$notes"
+    exit 1
+  fi
+  # Positive control: the reads ran and answered.
+  grep -q 'no Service type=LoadBalancer' "$d/log"
+  # And the other way round, so each knob is held to both rejections.
+  COZY_DATAPLANE_READ_TIMEOUT=0 COZY_DATAPLANE_LIST_TIMEOUT=abc \
+    timeout 30 env PATH="$d/bin:$PATH" "$SCRIPT" "$d/swap" >"$d/log2" 2>&1
+  grep -q "COZY_DATAPLANE_READ_TIMEOUT='0' is not a whole number of seconds above zero; using 20s" "$d/swap/capture-notes.txt"
+  grep -q "COZY_DATAPLANE_LIST_TIMEOUT='abc' is not a whole number of seconds above zero; using 28s" "$d/swap/capture-notes.txt"
+  rm -rf "$d"
+}
diff --git a/hack/capture-previous-logs.bats b/hack/capture-previous-logs.bats
new file mode 100644
index 0000000000..3bafefe83b
--- /dev/null
+++ b/hack/capture-previous-logs.bats
@@ -0,0 +1,1088 @@
+#!/usr/bin/env bats
+# -----------------------------------------------------------------------------
+# Unit tests for the pure selection helpers in
+# hack/e2e-capture-previous-logs.sh -- the logic that decides WHICH restarted
+# containers get their previous instance dumped, and in what order:
+#
+#   - prevlog_filter_restarted -- keep only containers with restartCount > 0;
+#   - prevlog_prioritize       -- put the failing test's namespace first;
+#   - prevlog_sort_recent      -- newest restart first, undated rows last;
+#   - prevlog_cap              -- bound the dump so a wedged cluster cannot
+#                                 explode the catch;
+#   - prevlog_logfile_name     -- per-container artifact filename.
+#
+# The `kubectl logs --previous` capture itself is not unit-testable (it needs a
+# live cluster with a crash-looping pod); these tests pin the derivations that
+# decide what is worth asking for at all. The restart filter is the one that
+# matters most: without it every healthy container would be asked for a
+# previous instance that does not exist, turning the catch into a page of noise.
+#
+# Strategy: the script is sourced once with E2E_CAPTURE_PREVLOGS_LIB set, which
+# the script's sourcing guard honours by defining the helpers and returning
+# before it touches $1 or runs any capture -- so no cluster is required. Each
+# @test then calls the helpers directly and asserts with `[ ... ]`, matching this
+# repo's plain-shell bats convention (no `run` helper). The whole-script tests at
+# the end of this file work the other way round: they EXECUTE the script against
+# a stub kubectl, because what they pin is the artifact it leaves behind.
+#
+# Title syntax constraints (inherited from cozytest.sh's awk parser):
+#   - Titles delimited by ASCII double quotes; embedded quotes truncate.
+#   - Only [A-Za-z0-9] from the title survives into the function name, so keep
+#     titles distinctive in their alphanumeric run.
+#
+# Run from the repo root with `make bats-unit-tests`, or directly with
+# `bats hack/capture-previous-logs.bats`. The legacy `hack/cozytest.sh` runner
+# remains a supported compatibility path.
+# -----------------------------------------------------------------------------
+
+load test_helper
+
+HACK_DIR="$(cd "$(dirname "${BATS_TEST_FILENAME:-$0}")" && pwd)"
+SCRIPT="$HACK_DIR/e2e-capture-previous-logs.sh"
+
+# Load the pure helpers. The guard returns before the capture body, so this is
+# side-effect-free and needs no cluster.
+E2E_CAPTURE_PREVLOGS_LIB=1
+# shellcheck source=/dev/null
+. "$SCRIPT"
+
+@test "filter restarted keeps only containers whose restart count is above zero" {
+  # Deliberately fed the five-field shape, without the trailing finishedAt: the
+  # filter emits six fields either way, so the timestamp column is present and
+  # empty rather than absent. Uniform arity is what lets prevlog_sort_recent key
+  # on field 6 unconditionally.
+  rows="$(printf '%s\n' \
+    'tenant-test|mariadb-test-0|mariadb|container|3' \
+    'tenant-test|mariadb-test-1|mariadb|container|0' \
+    'cozy-system|healthy|app|container|0' \
+    'tenant-test|mariadb-test-0|init-datadir|init|2')"
+
+  out="$(printf '%s\n' "$rows" | prevlog_filter_restarted)"
+
+  [ "$(printf '%s\n' "$out" | grep -c .)" -eq 2 ]
+  printf '%s\n' "$out" | grep -q '^tenant-test|mariadb-test-0|mariadb|container|3|$'
+  printf '%s\n' "$out" | grep -q '^tenant-test|mariadb-test-0|init-datadir|init|2|$'
+  # `! cmd` is vacuous under cozytest's `set -e` (errexit is suppressed for
+  # any command whose status is inverted with `!`), so a filter regression
+  # that let these rows through would not fail the test. Assert the absence
+  # via `if cmd; then ...; false`.
+  if printf '%s\n' "$out" | grep -q 'mariadb-test-1'; then echo "FAIL: must drop the zero-restart replica"; false; fi
+  if printf '%s\n' "$out" | grep -q 'cozy-system'; then echo "FAIL: must drop the zero-restart system pod"; false; fi
+}
+
+@test "filter restarted drops rows with a malformed or empty restart count" {
+  # A non-numeric count must be dropped rather than compared. The row would be
+  # skipped either way (`[ "<none>" -gt 0 ]` exits 2, which the filter's
+  # `|| continue` catches), so what this pins is the contract -- malformed rows
+  # never reach the capture -- not a crash.
+  rows="$(printf '%s\n' \
+    'tenant-test|pod-a|app|container|' \
+    'tenant-test|pod-b|app|container|<none>' \
+    'tenant-test|pod-c|app|container|-1' \
+    'tenant-test|pod-d|app|container|1')"
+
+  out="$(printf '%s\n' "$rows" | prevlog_filter_restarted)"
+
+  [ "$(printf '%s\n' "$out" | grep -c .)" -eq 1 ]
+  printf '%s\n' "$out" | grep -q '^tenant-test|pod-d|'
+}
+
+@test "filter restarted drops rows missing a namespace pod or container field" {
+  rows="$(printf '%s\n' \
+    '|pod-a|app|container|4' \
+    'tenant-test||app|container|4' \
+    'tenant-test|pod-c||container|4' \
+    'tenant-test|pod-d|app|container|4')"
+
+  out="$(printf '%s\n' "$rows" | prevlog_filter_restarted)"
+
+  [ "$(printf '%s\n' "$out" | grep -c .)" -eq 1 ]
+  printf '%s\n' "$out" | grep -q '^tenant-test|pod-d|'
+}
+
+@test "prioritize puts the failing test namespace ahead of everything else" {
+  rows="$(printf '%s\n' \
+    'cozy-linstor|satellite-x|linstor|container|5' \
+    'tenant-test|mariadb-test-0|mariadb|container|3' \
+    'cozy-cilium|agent-y|cilium|container|2' \
+    'tenant-test|mariadb-test-1|mariadb|container|1')"
+
+  out="$(printf '%s\n' "$rows" | prevlog_prioritize tenant-test)"
+
+  # All four survive -- prioritisation reorders, it never drops.
+  [ "$(printf '%s\n' "$out" | grep -c .)" -eq 4 ]
+  [ "$(printf '%s\n' "$out" | sed -n '1p' | cut -d'|' -f2)" = "mariadb-test-0" ]
+  [ "$(printf '%s\n' "$out" | sed -n '2p' | cut -d'|' -f2)" = "mariadb-test-1" ]
+  # Non-matching rows keep their relative input order behind the matches.
+  [ "$(printf '%s\n' "$out" | sed -n '3p' | cut -d'|' -f2)" = "satellite-x" ]
+  [ "$(printf '%s\n' "$out" | sed -n '4p' | cut -d'|' -f2)" = "agent-y" ]
+}
+
+@test "prioritize with an empty namespace passes every row through unchanged" {
+  rows="$(printf '%s\n' \
+    'cozy-linstor|satellite-x|linstor|container|5' \
+    'tenant-test|mariadb-test-0|mariadb|container|3')"
+
+  out="$(printf '%s\n' "$rows" | prevlog_prioritize '')"
+
+  [ "$(printf '%s\n' "$out" | grep -c .)" -eq 2 ]
+  [ "$(printf '%s\n' "$out" | sed -n '1p' | cut -d'|' -f2)" = "satellite-x" ]
+}
+
+@test "prioritize treats the namespace as text and not as a pattern" {
+  # The namespace arrives from the caller, so a `.` in it must not match a namespace
+  # it does not name.
+  rows="$(printf '%s\n' \
+    'tenantXtest|pod-regex|app|container|1' \
+    'tenant.test|pod-literal|app|container|1' \
+    'cozy-system|pod-other|app|container|1')"
+
+  out="$(printf '%s\n' "$rows" | prevlog_prioritize 'tenant.test')"
+
+  [ "$(printf '%s\n' "$out" | grep -c .)" -eq 3 ]
+  first=$(printf '%s\n' "$out" | sed -n '1p' | cut -d'|' -f2)
+  if [ "$first" != "pod-literal" ]; then
+    echo "FAIL: expected pod-literal first, got '$first' (namespace matched as a pattern)"
+    false
+  fi
+}
+
+@test "prioritize matches the namespace field only and not a pod name substring" {
+  # The match must anchor on the LEADING namespace field. The first row is the
+  # fixture that makes this test bite: a pod named exactly like the namespace,
+  # in a different namespace, so the row contains `tenant-test|` but does not
+  # start with it. Drop the `^` from prevlog_prioritize and that row is promoted
+  # ahead of the genuine namespace match below, flipping the first two
+  # assertions. (A pod merely named `tenant-test-runner` does NOT distinguish
+  # the two -- it lacks the trailing `|` and so matches neither form -- which is
+  # why it is kept only as the third row rather than carrying the test.)
+  # The second row is the other half of the anchor: a SIBLING NAMESPACE sharing
+  # the prefix, which nested tenants make routine. It pins the trailing `|` --
+  # drop that from the pattern and `tenant-test-child` is treated as the failing
+  # test's own namespace and promoted, which is how the cap would get spent on
+  # an unrelated tenant's restarts.
+  rows="$(printf '%s\n' \
+    'cozy-system|tenant-test|app|container|1' \
+    'tenant-test-child|neighbour|app|container|1' \
+    'cozy-system|tenant-test-runner|app|container|1' \
+    'tenant-test|real|app|container|1')"
+
+  out="$(printf '%s\n' "$rows" | prevlog_prioritize tenant-test)"
+
+  [ "$(printf '%s\n' "$out" | grep -c .)" -eq 4 ]
+  [ "$(printf '%s\n' "$out" | sed -n '1p' | cut -d'|' -f1)" = "tenant-test" ]
+  [ "$(printf '%s\n' "$out" | sed -n '1p' | cut -d'|' -f2)" = "real" ]
+  # Everything else keeps input order behind the single genuine match.
+  [ "$(printf '%s\n' "$out" | sed -n '2p' | cut -d'|' -f2)" = "tenant-test" ]
+  [ "$(printf '%s\n' "$out" | sed -n '3p' | cut -d'|' -f2)" = "neighbour" ]
+  [ "$(printf '%s\n' "$out" | sed -n '4p' | cut -d'|' -f2)" = "tenant-test-runner" ]
+}
+
+@test "sort_recent puts the newest previous instance first and undated rows last" {
+  # The ordering the cap is spent under. Rows 1 and 4 are the fixture that makes
+  # this bite: the oldest restart arrives first from kubectl (pods are listed by
+  # namespace, not by time) and must end up behind the newest.
+  rows="$(printf '%s\n' \
+    'cozy-kubevirt|virt-api-a|virt-api|container|1|2026-08-13T01:30:56Z' \
+    'tenant-test|mariadb-0|mariadb|container|2|' \
+    'tenant-test|postgres-0|postgres|container|4|2026-08-22T09:06:00Z' \
+    'cozy-linstor|satellite-x|linstor|container|3|2026-08-17T13:07:28Z')"
+
+  out="$(printf '%s\n' "$rows" | prevlog_sort_recent)"
+
+  # Ordering, never dropping.
+  [ "$(printf '%s\n' "$out" | grep -c .)" -eq 4 ]
+  [ "$(printf '%s\n' "$out" | sed -n '1p' | cut -d'|' -f2)" = "postgres-0" ]
+  [ "$(printf '%s\n' "$out" | sed -n '2p' | cut -d'|' -f2)" = "satellite-x" ]
+  [ "$(printf '%s\n' "$out" | sed -n '3p' | cut -d'|' -f2)" = "virt-api-a" ]
+  # A container whose lastState the kubelet has already dropped carries no
+  # timestamp. It still has a previous instance worth reading, so it sorts last
+  # rather than being filtered out.
+  [ "$(printf '%s\n' "$out" | sed -n '4p' | cut -d'|' -f2)" = "mariadb-0" ]
+}
+
+@test "sort_recent leaves simultaneous restarts in input order" {
+  # A node reboot restarts a dozen containers on the same second. Without a
+  # stable sort their order would vary between runs, and so would which of them
+  # the cap keeps -- turning a capture into something that cannot be compared
+  # against the previous run's.
+  #
+  # Fixture deliberately in DESCENDING name order. An ascending one (first,
+  # second, third) is reproduced by sort's last-resort whole-line comparison
+  # with no -s at all, so the test would pass on a platform that ignores -s --
+  # which is the only platform it exists to catch.
+  rows="$(printf '%s\n' \
+    'ns|zeta|c|container|1|2026-08-17T13:07:28Z' \
+    'ns|mu|c|container|1|2026-08-17T13:07:28Z' \
+    'ns|alpha|c|container|1|2026-08-17T13:07:28Z')"
+
+  out="$(printf '%s\n' "$rows" | prevlog_sort_recent)"
+
+  [ "$(printf '%s\n' "$out" | sed -n '1p' | cut -d'|' -f2)" = "zeta" ]
+  [ "$(printf '%s\n' "$out" | sed -n '2p' | cut -d'|' -f2)" = "mu" ]
+  [ "$(printf '%s\n' "$out" | sed -n '3p' | cut -d'|' -f2)" = "alpha" ]
+}
+
+@test "sort_recent is a no-op on rows that carry no timestamp field" {
+  # Every row ties, so the stable sort must return the input untouched. This is
+  # what lets the five-field fixtures elsewhere in this file keep asserting
+  # input order through prevlog_prioritize.
+  # Descending, for the same reason as the fixture above.
+  rows="$(printf '%s\n' \
+    'ns|p3|c|container|1' \
+    'ns|p2|c|container|1' \
+    'ns|p1|c|container|1')"
+
+  out="$(printf '%s\n' "$rows" | prevlog_sort_recent)"
+
+  [ "$out" = "$rows" ]
+}
+
+@test "prioritize ranks namespace above recency" {
+  # Both keys in tension on purpose: the freshest restart in the cluster is in
+  # another namespace, and the failing test's own namespace holds only an older
+  # one. Namespace has to win -- a stale restart in the namespace under test is
+  # likelier to explain the failure than a fresh one somewhere unrelated -- and
+  # recency has to order within each group rather than across them.
+  rows="$(printf '%s\n' \
+    'cozy-kubevirt|virt-api|virt-api|container|1|2026-08-27T10:00:00Z' \
+    'tenant-test|mariadb-0|mariadb|container|1|2026-08-13T01:00:00Z' \
+    'cozy-linstor|satellite|linstor|container|1|2026-08-20T10:00:00Z' \
+    'tenant-test|postgres-0|postgres|container|1|2026-08-14T01:00:00Z')"
+
+  out="$(printf '%s\n' "$rows" | prevlog_prioritize tenant-test)"
+
+  [ "$(printf '%s\n' "$out" | grep -c .)" -eq 4 ]
+  # The test's namespace first, newest of the two leading it.
+  [ "$(printf '%s\n' "$out" | sed -n '1p' | cut -d'|' -f2)" = "postgres-0" ]
+  [ "$(printf '%s\n' "$out" | sed -n '2p' | cut -d'|' -f2)" = "mariadb-0" ]
+  # Then everything else, also newest first.
+  [ "$(printf '%s\n' "$out" | sed -n '3p' | cut -d'|' -f2)" = "virt-api" ]
+  [ "$(printf '%s\n' "$out" | sed -n '4p' | cut -d'|' -f2)" = "satellite" ]
+}
+
+@test "filter_restarted carries the restart timestamp through" {
+  # The field the ordering depends on. It also has to be READ rather than left
+  # to fall into $restarts as trailing text: `read -r ... restarts` without a
+  # sixth variable folds the timestamp into the count, which reaches the dump
+  # header as `restarts=1|2026-08-22T09:06:00Z`.
+  rows="$(printf '%s\n' \
+    'ns|p1|c|container|2|2026-08-22T09:06:00Z' \
+    'ns|p2|c|container|0|2026-08-22T09:06:00Z' \
+    'ns|p3|c|container|1|')"
+
+  out="$(printf '%s\n' "$rows" | prevlog_filter_restarted)"
+
+  # p2 never restarted, so it is dropped regardless of its timestamp.
+  [ "$(printf '%s\n' "$out" | grep -c .)" -eq 2 ]
+  [ "$(printf '%s\n' "$out" | sed -n '1p')" = 'ns|p1|c|container|2|2026-08-22T09:06:00Z' ]
+  [ "$(printf '%s\n' "$out" | sed -n '2p' | cut -d'|' -f5)" = "1" ]
+  [ "$(printf '%s\n' "$out" | sed -n '2p' | cut -d'|' -f6)" = "" ]
+}
+
+@test "a no value timestamp sorts last instead of jumping the queue" {
+  # kubectl renders a missing template leaf as the literal string `<no value>`,
+  # and `<` (0x3C) sorts ABOVE every digit, so under a reverse sort such a row
+  # lands FIRST and displaces the most recent real restart -- inverting the one
+  # thing this ordering exists to do. The template now guards the leaf so the
+  # string cannot be produced; this pins the row-level behaviour too, so the
+  # ordering is still defensible if some other producer ever emits it.
+  rows="$(printf '%s\n' \
+    'ns|undated|c|container|1|<no value>' \
+    'tenant-test|newest|c|container|4|2026-08-22T09:06:00Z' \
+    'tenant-test|older|c|container|1|2026-08-13T01:30:56Z')"
+
+  out="$(printf '%s\n' "$rows" | prevlog_sort_recent)"
+
+  first=$(printf '%s\n' "$out" | sed -n '1p' | cut -d'|' -f2)
+  if [ "$first" != "newest" ]; then
+    echo "FAIL: expected the newest real restart first, got '$first'"
+    printf '%s\n' "$out"
+    false
+  fi
+  [ "$(printf '%s\n' "$out" | sed -n '3p' | cut -d'|' -f2)" = "undated" ]
+}
+
+@test "the pod template guards the timestamp leaf and not only its parents" {
+  # The stub-driven tests below inject rows directly and so never execute the
+  # go-template, which is exactly how the `<no value>` shape reached a live job
+  # log unnoticed. Assert the guard's shape in the script text instead: two
+  # levels (lastState, terminated) leave the leaf ungarded, and `finishedAt` is
+  # a metav1.Time whose zero value marshals to null, which the kubelet does
+  # produce (ContainerStatusUnknown, which also bumps restartCount).
+  guarded=$(grep -c 'if .lastState.terminated.finishedAt }}{{ .lastState.terminated.finishedAt }}' "$SCRIPT")
+  # One for initContainerStatuses, one for containerStatuses.
+  if [ "$guarded" -ne 2 ]; then
+    echo "FAIL: expected 2 leaf-guarded finishedAt references in the template, found $guarded"
+    grep -n 'finishedAt' "$SCRIPT"
+    false
+  fi
+}
+
+@test "the dump header names when the previous instance ended" {
+  # The whole-script path: every other integration test here feeds five-field
+  # rows, so the sixth field reached the header with no coverage at all, and
+  # deleting it from the consumer loop's `read` left this suite green while the
+  # header printed `restarts=1|2026-08-22T09:06:00Z`.
+  tmp="$(mktemp -d)"
+  stub="$tmp/bin"; mkdir -p "$stub"; prevlog_stub_dir "$stub"
+  out="$tmp/previous-logs"
+  rows='tenant-test|db-0|postgres|container|4|2026-08-22T09:06:00Z'
+
+  PATH="$stub:$PATH" PREVLOG_STUB_ROWS="$rows" \
+    sh "$SCRIPT" "$out" tenant-test >"$tmp/stdout" 2>&1
+
+  grep -q 'restarts=4, previous instance ended 2026-08-22T09:06:00Z' "$tmp/stdout"
+  # The count must not have absorbed the timestamp, which is the shape the
+  # missing read variable produced.
+  if grep -q 'restarts=4|' "$tmp/stdout"; then
+    echo "FAIL: the timestamp was folded into the restart count"
+    grep 'previous logs:' "$tmp/stdout"
+    false
+  fi
+  rm -rf "$tmp"
+}
+
+@test "cap keeps at most the requested number of rows" {
+  rows="$(printf '%s\n' \
+    'ns|p1|c|container|1' 'ns|p2|c|container|1' 'ns|p3|c|container|1' \
+    'ns|p4|c|container|1' 'ns|p5|c|container|1')"
+
+  out="$(printf '%s\n' "$rows" | prevlog_cap 3)"
+
+  [ "$(printf '%s\n' "$out" | grep -c .)" -eq 3 ]
+  printf '%s\n' "$out" | grep -q '^ns|p1|'
+  if printf '%s\n' "$out" | grep -q '^ns|p4|'; then echo "FAIL: cap must drop rows past the limit"; false; fi
+}
+
+@test "cap leaves a shorter input untouched" {
+  rows="$(printf '%s\n' 'ns|p1|c|container|1' 'ns|p2|c|container|1')"
+
+  out="$(printf '%s\n' "$rows" | prevlog_cap 12)"
+
+  [ "$(printf '%s\n' "$out" | grep -c .)" -eq 2 ]
+}
+
+@test "cap falls back to the default limit when given a malformed value" {
+  # COZY_PREVLOG_MAX is operator-supplied, so a typo must degrade to the default
+  # rather than make `head -n` fail and drop the whole capture.
+  rows="$(i=1; while [ "$i" -le 20 ]; do printf 'ns|p%s|c|container|1\n' "$i"; i=$((i + 1)); done)"
+  [ "$(printf '%s\n' "$rows" | grep -c .)" -eq 20 ]
+
+  out="$(printf '%s\n' "$rows" | prevlog_cap 'twelve')"
+
+  [ "$(printf '%s\n' "$out" | grep -c .)" -eq 12 ]
+}
+
+@test "logfile name joins namespace pod and container with underscores" {
+  name="$(prevlog_logfile_name tenant-test mariadb-test-0 mariadb)"
+
+  [ "$name" = "tenant-test_mariadb-test-0_mariadb.log" ]
+}
+
+# --------------------------------------------------------------------------- #
+# Whole-script runs against a stub kubectl. Everything above pins a pure        #
+# helper; these pin the artifact the script leaves behind, which is what a      #
+# reader of the uploaded report actually gets. The script's own explanations of #
+# why a capture is short -- the cap, an unreachable API -- used to exist only on #
+# the job log's stdout, so the report carried N dumps and no way to tell N from #
+# "all of them". Each run below asserts the explanation is IN the output        #
+# directory.                                                                    #
+#                                                                               #
+# The stub answers `kubectl get` from PREVLOG_STUB_ROWS (or fails when          #
+# PREVLOG_STUB_LIST_FAIL is set) and `kubectl logs` with one line, so no cluster #
+# is involved.                                                                  #
+# --------------------------------------------------------------------------- #
+
+prevlog_stub_dir() {
+  _sd="$1"
+  cat > "$_sd/kubectl" <<'STUB'
+#!/bin/sh
+case "$1" in
+  get)  if [ -n "${PREVLOG_STUB_LIST_FAIL:-}" ]; then
+          # A failing cluster-wide list is preceded by one klog discovery-retry
+          # line per attempt, each long enough to survive a 200-character trim.
+          i=1
+          while [ "$i" -le 3 ]; do
+            echo 'E0728 11:51:48.306797   82827 memcache.go:265] "Unhandled Error" err="couldn'"'"'t get current server API group list: Get \"https://192.0.2.1:6443/api?timeout=32s\": dial tcp: lookup timed out after some considerable number of characters"' >&2
+            i=$((i + 1))
+          done
+          echo 'Error from server (Forbidden): pods is forbidden' >&2
+          exit 1
+        fi
+        printf '%s\n' "${PREVLOG_STUB_ROWS:-}" ;;
+  logs)
+    case "${PREVLOG_STUB_LOG_MODE:-}" in
+      # Killed mid-line, which is the normal shape of a SIGKILLed stream: the last
+      # line has no terminating newline. The script keeps such a capture, so any
+      # note appended to it must start a line of its own.
+      partial) printf 'first line\nthe decisive partial line'; exit 124 ;;
+      # Partial output followed by a NON-timeout failure. kubectl can write some of
+      # the stream and then die on its own terms -- a connection reset mid-read --
+      # with no clock having run out, so a marker naming the timeout would put a
+      # cause in the artifact that was never observed.
+      # A refusal with a message, used to prove the reason is lost only when the
+      # scratch file cannot be created -- not because the stub stayed quiet.
+      # Exits 0, writes NO log, and still emits a warning. The shape where dropping
+      # the message costs most: the script would otherwise report "produced no
+      # output", a claim about the container made while kubectl was speaking.
+      warned_empty)
+        echo 'Warning: results are partial, 3 of 7 shards answered' >&2
+        exit 0 ;;
+      norefusal)
+        echo 'Error from server (BadRequest): previous terminated container "postgres" not found' >&2
+        exit 1 ;;
+      # Cold discovery: one klog retry line per attempt, then kubectl's actual
+      # reason. The first line names the retry; the cause is last.
+      noisy_refusal)
+        i=1
+        while [ "$i" -le 3 ]; do
+          echo 'E0728 11:51:48.306797   82827 memcache.go:265] "Unhandled Error" err="couldn'"'"'t get current server API group list: dial tcp: lookup timed out"' >&2
+          i=$((i + 1))
+        done
+        echo 'Error from server (BadRequest): previous terminated container "postgres" in pod "db-0" not found' >&2
+        exit 1 ;;
+      # Returns the log AND writes two warnings: kubectl does this for deprecation
+      # notices and partial results, and both are evidence.
+      warned)
+        printf 'stub previous-instance line\n'
+        echo 'Warning: v1 is deprecated in this build' >&2
+        echo 'Warning: results are partial, 3 of 7 shards answered' >&2 ;;
+      partial_reset)
+        printf 'first line\nthe decisive partial line'
+        echo 'error: unexpected EOF from the server' >&2
+        exit 1 ;;
+      # SIGKILLed part way through: 137, output kept. Our own `-k` grace produces
+      # this, and so does anything else that kills the read.
+      partial9) printf 'first line\nthe decisive partial line'; exit 137 ;;
+      *) printf 'stub previous-instance line\n' ;;
+    esac ;;
+esac
+exit 0
+STUB
+  chmod +x "$_sd/kubectl"
+  # Stub `timeout` too. Without it these tests need GNU coreutils on PATH, and a
+  # host lacking it does not merely fail — a missing `timeout` makes the script
+  # exit 127, which reaches the SAME "could not list pods" branch the
+  # unreachable-API test asserts on, so that test would pass without its stub
+  # doing anything. A guard that can pass for the wrong reason is not a guard.
+  cat > "$_sd/timeout" <<'STUB'
+#!/bin/sh
+if [ "$1" = "-k" ]; then shift 2; fi
+shift
+exec "$@"
+STUB
+  chmod +x "$_sd/timeout"
+}
+
+@test "an unreachable api leaves the reason in the output directory" {
+  tmp="$(mktemp -d)"
+  stub="$tmp/bin"; mkdir -p "$stub"; prevlog_stub_dir "$stub"
+  out="$tmp/previous-logs"
+
+  PATH="$stub:$PATH" PREVLOG_STUB_LIST_FAIL=1 sh "$SCRIPT" "$out" tenant-test >/dev/null 2>&1
+
+  # Without a note the reader sees an absent directory, which reads exactly like
+  # "nothing crash-looped" -- the opposite of what happened.
+  [ -f "$out/capture-notes.txt" ]
+  grep -q 'could not list pods' "$out/capture-notes.txt"
+  # kubectl's reason is the finding. "could not list pods (kubectl exit 1)" names
+  # no cause, and this is the read every later line depends on -- if it fails,
+  # nothing is captured at all.
+  grep -q 'Forbidden' "$out/capture-notes.txt"
+  # The reason is the LAST stderr line: a failing cluster-wide list is preceded by
+  # one klog discovery-retry line per attempt, long enough to survive trimming.
+  if grep -q 'Unhandled Error' "$out/capture-notes.txt"; then echo "FAIL: quoted the discovery noise instead of the reason"; false; fi
+  rm -rf "$tmp"
+}
+
+@test "a cluster where nothing restarted says so in the output directory" {
+  tmp="$(mktemp -d)"
+  stub="$tmp/bin"; mkdir -p "$stub"; prevlog_stub_dir "$stub"
+  out="$tmp/previous-logs"
+  rows='cozy-system|healthy-0|app|container|0'
+
+  PATH="$stub:$PATH" PREVLOG_STUB_ROWS="$rows" sh "$SCRIPT" "$out" tenant-test >/dev/null 2>&1
+
+  [ -f "$out/capture-notes.txt" ]
+  grep -q 'no container has restarted' "$out/capture-notes.txt"
+  rm -rf "$tmp"
+}
+
+@test "the inner read budgets stay under the backstop the callers wrap this in" {
+  # Three comment blocks state this arithmetic in prose -- the script header,
+  # hack/cozytest.sh and hack/e2e-chainsaw/.chainsaw.yaml -- and nothing enforced
+  # it, so raising a per-read timeout (or adding a `-k` grace, which counts towards
+  # the same ceiling) silently moved the worst case past the backstop. Overrunning
+  # it is not a slow capture: the backstop SIGKILLs the process group, so
+  # capture-notes.txt ends short and the line explaining why reaches the job log
+  # only, which is the failure these notes exist to prevent.
+  # Read from the resolved bound, not from a literal on the call line: the list
+  # read now goes through $PREVLOG_LIST_BOUND so that a host without `timeout`
+  # falls back instead of exiting 127. The numbers moved to the assignment; the
+  # arithmetic they feed did not.
+  list="$(sed -n 's/^  PREVLOG_LIST_BOUND="timeout -k \([0-9]*\) .*"/\1/p' "$SCRIPT") $(sed -n 's/^PREVLOG_LIST_TIMEOUT=\([0-9]*\)/\1/p' "$SCRIPT")"
+  read_="$(sed -n 's/^PREVLOG_READ_GRACE=\([0-9]*\)/\1/p' "$SCRIPT") $(sed -n 's/^PREVLOG_READ_TIMEOUT=\([0-9]*\)/\1/p' "$SCRIPT")"
+  cap=$(sed -n 's/^MAX="${COZY_PREVLOG_MAX:-\([0-9]*\)}"/\1/p' "$SCRIPT")
+  [ -n "$list" ] && [ -n "$read_" ] && [ -n "$cap" ]
+
+  list_ceiling=$(( $(echo "$list" | cut -d' ' -f1) + $(echo "$list" | cut -d' ' -f2) ))
+  read_ceiling=$(( $(echo "$read_" | cut -d' ' -f1) + $(echo "$read_" | cut -d' ' -f2) ))
+  worst=$(( list_ceiling + cap * read_ceiling ))
+
+  # The message that reports a cut-off must quote the budget that produced it,
+  # otherwise it names a number no read ever used. Two bounds exist -- the list
+  # read is wrapped in its own, larger one -- so what has to hold is the PAIRING:
+  # every call passes the seconds belonging to the bound it also passes. Getting
+  # that wrong is silent, and it puts a number in the artifact that no read used.
+  pairs=$(grep -o 'prevlog_cutoff_desc "[^"]*" "\$[A-Z_]*" "\$[A-Z_]*"' "$SCRIPT" |
+    sed 's/.*"\(\$[A-Z_]*\)" "\(\$[A-Z_]*\)"/\1 \2/' | LC_ALL=C sort -u)
+  [ -n "$pairs" ] || { echo "FAIL: no cut-off description is derived from a bound"; false; }
+  printf '%s\n' "$pairs" | while read -r secs bound; do
+    case "$secs $bound" in
+      '$PREVLOG_READ_TIMEOUT $PREVLOG_BOUND') ;;
+      '$PREVLOG_LIST_TIMEOUT $PREVLOG_LIST_BOUND') ;;
+      *) echo "FAIL: $secs is quoted for a read bounded by $bound"; exit 1 ;;
+    esac
+  done
+
+  for caller in "$HACK_DIR/cozytest.sh" "$HACK_DIR/e2e-chainsaw/.chainsaw.yaml"; do
+    backstop=$(sed -n 's/.*timeout -k [0-9]* \([0-9]*\) .*e2e-capture-previous-logs\.sh.*/\1/p' "$caller" | head -n 1)
+    [ -n "$backstop" ]
+    if [ "$worst" -gt "$backstop" ]; then
+      echo "FAIL: worst case ${worst}s (list ${list_ceiling}s + ${cap} x ${read_ceiling}s) exceeds the ${backstop}s backstop in $caller"
+      false
+    fi
+  done
+}
+
+@test "an unwritable temp dir does not become a claim about the cluster" {
+  tmp="$(mktemp -d)"
+  stub="$tmp/bin"; mkdir -p "$stub"; prevlog_stub_dir "$stub"
+  out="$tmp/previous-logs"
+  # A path that does not exist, not one that is unwritable: root holds
+  # CAP_DAC_OVERRIDE and mktemp would succeed inside a 0500 directory, so the test
+  # would pass without entering the fallback. ENOENT is refused for everyone.
+  PATH="$stub:$PATH" TMPDIR="$tmp/gone" \
+    PREVLOG_STUB_ROWS='tenant-test|db-0|postgres|container|4' \
+    sh "$SCRIPT" "$out" tenant-test >/dev/null 2>&1
+
+  # With a predictable "$$" scratch path the redirect targets a file under a TMPDIR
+  # that is not there, the read never runs, and the capture reports that no previous
+  # instance was retrieved -- a statement about the cluster caused entirely by the
+  # local filesystem. mktemp fails too, but a failed command substitution already
+  # yields an empty string here, and `${err:-/dev/null}` then keeps the read alive.
+  if grep -q 'no previous instance retrieved' "$out/capture-notes.txt" 2>/dev/null; then
+    echo "FAIL: blamed the cluster for an unwritable TMPDIR"
+    cat "$out/capture-notes.txt"
+    false
+  fi
+  [ "$(ls "$out" | grep -c '\.log$')" -eq 1 ]
+  rm -rf "$tmp"
+}
+
+@test "hitting the container cap records the overflow next to the captured logs" {
+  tmp="$(mktemp -d)"
+  stub="$tmp/bin"; mkdir -p "$stub"; prevlog_stub_dir "$stub"
+  out="$tmp/previous-logs"
+  rows="$(printf '%s\n' \
+    'tenant-test|db-0|postgres|container|4' \
+    'tenant-test|db-1|postgres|container|3' \
+    'cozy-system|other-0|app|container|2')"
+
+  PATH="$stub:$PATH" PREVLOG_STUB_ROWS="$rows" COZY_PREVLOG_MAX=1 \
+    sh "$SCRIPT" "$out" tenant-test >/dev/null 2>&1
+
+  [ -f "$out/capture-notes.txt" ]
+  grep -q 'COZY_PREVLOG_MAX=1 cap' "$out/capture-notes.txt"
+  grep -q '2 more restarted container(s) NOT captured' "$out/capture-notes.txt"
+  # The cap still applied: one dump, not three.
+  [ "$(ls "$out" | grep -c '\.log$')" -eq 1 ]
+  rm -rf "$tmp"
+}
+
+@test "an empty preferred namespace group does not consume a cap slot" {
+  tmp="$(mktemp -d)"
+  stub="$tmp/bin"; mkdir -p "$stub"; prevlog_stub_dir "$stub"
+  out="$tmp/previous-logs"
+  rows="$(printf '%s\n' \
+    'cozy-system|operator-0|operator|container|4' \
+    'cozy-linstor|satellite-0|linstor|container|3' \
+    'cozy-cilium|agent-0|cilium|container|2')"
+
+  PATH="$stub:$PATH" PREVLOG_STUB_ROWS="$rows" COZY_PREVLOG_MAX=3 \
+    sh "$SCRIPT" "$out" tenant-test >/dev/null 2>&1
+
+  # No row matches tenant-test, so the preferred group is empty. Its lack of
+  # output must not become a blank line that head counts against the cap.
+  [ "$(ls "$out" | grep -c '\.log$')" -eq 3 ]
+  if grep -q 'reached COZY_PREVLOG_MAX=3 cap' "$out/capture-notes.txt"; then
+    echo "FAIL: an empty preferred group manufactured a cap overflow"
+    cat "$out/capture-notes.txt"
+    false
+  fi
+  rm -rf "$tmp"
+}
+
+@test "a missing timeout is named as a local dependency, not as a cluster failure" {
+  tmp="$(mktemp -d)"
+  bin="$tmp/bin"; mkdir -p "$bin"
+  out="$tmp/previous-logs"
+  # A PATH with everything the script needs EXCEPT timeout. Not a blanket empty
+  # PATH: that would also remove the interpreter and the script would die before
+  # its own fallback, passing for the wrong reason.
+  for b in sh mktemp grep sed awk cat rm mkdir tail head cut ls date printf; do
+    p=$(command -v "$b" 2>/dev/null) && ln -sf "$p" "$bin/$b"
+  done
+  cat > "$bin/kubectl" <<'STUB'
+#!/bin/sh
+exit 0
+STUB
+  chmod +x "$bin/kubectl"
+
+  PATH="$bin" sh "$SCRIPT" "$out" tenant-test >/dev/null 2>&1
+
+  # Without the fallback every `timeout` call exits 127, and the script reports
+  # "could not list pods (kubectl exit 127): timeout: command not found" --
+  # attributing to kubectl a failure in which kubectl never ran, inside the
+  # artifact rather than only the job log.
+  [ -f "$out/capture-notes.txt" ]
+  if grep -q 'kubectl exit 127' "$out/capture-notes.txt"; then
+    echo "FAIL: a missing local binary is reported as a kubectl failure"
+    cat "$out/capture-notes.txt"
+    false
+  fi
+  grep -q 'timeout is not on PATH' "$out/capture-notes.txt"
+  grep -q 'not a statement about the cluster' "$out/capture-notes.txt"
+  rm -rf "$tmp"
+}
+
+@test "a missing kubectl leaves a note rather than an empty directory" {
+  tmp="$(mktemp -d)"
+  bin="$tmp/bin"; mkdir -p "$bin"
+  out="$tmp/previous-logs"
+  # A PATH carrying only what the script needs before the kubectl check, so the
+  # check is the only thing that fails. Blanking PATH outright would also take
+  # away the interpreter and mkdir, and the script would die before its own
+  # guard -- passing the test for the wrong reason.
+  ln -s "$(command -v mkdir)" "$bin/mkdir"
+
+  # One caller pre-gates on kubectl, the other does not. A silent exit here
+  # leaves the artifact carrying an empty directory, which reads as "looked,
+  # found no crash-loops".
+  PATH="$bin" /bin/sh "$SCRIPT" "$out" tenant-test >/dev/null 2>&1
+
+  [ -f "$out/capture-notes.txt" ]
+  grep -q 'kubectl is not on PATH' "$out/capture-notes.txt"
+  rm -rf "$tmp"
+}
+
+@test "each captured log says which tail bound it was written under" {
+  tmp="$(mktemp -d)"
+  stub="$tmp/bin"; mkdir -p "$stub"; prevlog_stub_dir "$stub"
+  out="$tmp/previous-logs"
+
+  PATH="$stub:$PATH" PREVLOG_STUB_ROWS='tenant-test|db-0|postgres|container|4' \
+    sh "$SCRIPT" "$out" tenant-test >/dev/null 2>&1
+
+  file="$(ls "$out"/*.log)"
+  # `--tail` drops the OLDEST lines and nothing in the output says so, so a file
+  # beginning mid-stream is indistinguishable from a whole one. This is the case
+  # where that matters most: the previous instance is already gone from the
+  # cluster, so this file is the only copy, and the bound here is ten times
+  # tighter than the per-pod one. Naming it in the job log is not enough -- the
+  # job log expires and is not in the tarball at all.
+  # Beside the log, not inside it: a log read in full is a complete artifact and
+  # these controllers log JSON per line, so a trailing prose line breaks every
+  # parser that could read the file before.
+  if grep -q 'holds at most the last' "$file"; then
+    echo "FAIL: the bound note is inside a successfully captured log"
+    false
+  fi
+  if ! grep -q 'holds at most the last 200 lines' "$out/capture-notes.txt"; then
+    echo "FAIL: the captured log does not name the tail bound it was written under"
+    cat "$file"
+    false
+  fi
+  # The bound named is the one that was applied, not the default echoed back.
+  rm -rf "$out"
+  PATH="$stub:$PATH" PREVLOG_STUB_ROWS='tenant-test|db-0|postgres|container|4' \
+    COZY_PREVLOG_TAIL=7 sh "$SCRIPT" "$out" tenant-test >/dev/null 2>&1
+  grep -q 'last 7 lines' "$out/capture-notes.txt"
+  grep -q 'COZY_PREVLOG_TAIL=7' "$out/capture-notes.txt"
+  rm -rf "$tmp"
+}
+
+@test "a warning alongside a captured log is kept whole, not dropped" {
+  tmp="$(mktemp -d)"
+  stub="$tmp/bin"; mkdir -p "$stub"; prevlog_stub_dir "$stub"
+  out="$tmp/previous-logs"
+
+  PATH="$stub:$PATH" PREVLOG_STUB_ROWS='tenant-test|db-0|postgres|container|4' \
+    PREVLOG_STUB_LOG_MODE=warned sh "$SCRIPT" "$out" tenant-test >/dev/null 2>&1
+
+  file="$(ls "$out"/*.log)"
+  # The log itself stays clean: it was returned in full, and these controllers
+  # log JSON per line. But "not in the log" and "not in the artifact" are
+  # different outcomes, and only the first is intended.
+  if grep -q 'deprecated' "$file"; then
+    echo "FAIL: the warning is inside the log"; false
+  fi
+  # Both lines, not just the last: with no klog preamble to skip, each is a
+  # warning of its own and picking one drops the other.
+  grep -q 'v1 is deprecated' "$out/capture-notes.txt" || {
+    echo "FAIL: the first warning was dropped"; cat "$out/capture-notes.txt"; false
+  }
+  grep -q 'results are partial' "$out/capture-notes.txt" || {
+    echo "FAIL: the second warning was dropped"; cat "$out/capture-notes.txt"; false
+  }
+  rm -rf "$tmp"
+}
+
+@test "a clean read that logged nothing keeps what kubectl said about it" {
+  tmp="$(mktemp -d)"
+  stub="$tmp/bin"; mkdir -p "$stub"; prevlog_stub_dir "$stub"
+  out="$tmp/previous-logs"
+
+  PATH="$stub:$PATH" PREVLOG_STUB_ROWS='tenant-test|db-0|postgres|container|4' \
+    PREVLOG_STUB_LOG_MODE=warned_empty sh "$SCRIPT" "$out" tenant-test >/dev/null 2>&1
+
+  # kubectl exited 0, returned no log, and still spoke. Gating the warning copy on
+  # the log being non-empty drops the message entirely, and the next line then
+  # reports "produced no output" -- a positive statement about the container,
+  # manufactured while kubectl was in the middle of contradicting it.
+  grep -q 'results are partial' "$out/capture-notes.txt" || {
+    echo "FAIL: kubectl spoke on an empty read and the message was dropped"
+    cat "$out/capture-notes.txt"
+    false
+  }
+  # And the two lines must agree: no bare claim of silence beside a quoted message.
+  if grep -q 'produced no output' "$out/capture-notes.txt"; then
+    echo "FAIL: reported silence in the same file that quotes what kubectl said"
+    cat "$out/capture-notes.txt"
+    false
+  fi
+  rm -rf "$tmp"
+}
+
+@test "a partial capture still records the tail bound it was read under" {
+  tmp="$(mktemp -d)"
+  stub="$tmp/bin"; mkdir -p "$stub"; prevlog_stub_dir "$stub"
+  out="$tmp/previous-logs"
+
+  PATH="$stub:$PATH" PREVLOG_STUB_ROWS='tenant-test|db-0|postgres|container|4' \
+    PREVLOG_STUB_LOG_MODE=partial sh "$SCRIPT" "$out" tenant-test >/dev/null 2>&1
+
+  # The cut took the newest lines, `--tail` took the oldest, and only the cut was
+  # recorded. A reader then treats the first line of the file as the first line
+  # the container wrote.
+  grep -q 'holds at most the last' "$out/capture-notes.txt" || {
+    echo "FAIL: a partial capture does not record its tail bound"
+    cat "$out/capture-notes.txt"
+    false
+  }
+  rm -rf "$tmp"
+}
+
+@test "the tail bound is stated once for the run, not once per container" {
+  tmp="$(mktemp -d)"
+  stub="$tmp/bin"; mkdir -p "$stub"; prevlog_stub_dir "$stub"
+  out="$tmp/previous-logs"
+
+  PATH="$stub:$PATH" PREVLOG_STUB_ROWS='tenant-test|db-0|postgres|container|4
+tenant-test|db-0|sidecar|container|2
+cozy-system|api-0|app|container|1' \
+    sh "$SCRIPT" "$out" tenant-test >/dev/null 2>&1
+
+  # The bound is identical for every log the capture writes, so repeating it per
+  # container put up to COZY_PREVLOG_MAX copies of one sentence into the file a
+  # reader holding only the artifact opens FIRST -- the same file that has to make
+  # a short capture's reasons findable. Three containers, one statement.
+  n=$(grep -c 'holds at most the last' "$out/capture-notes.txt" || true)
+  if [ "$n" -ne 1 ]; then
+    echo "FAIL: expected exactly one tail-bound note for the run, found $n"
+    cat "$out/capture-notes.txt"
+    false
+  fi
+  # Still says which bound, and still applies to the whole directory rather than
+  # to one named file, or the reader cannot tell which logs it covers.
+  grep -q 'every previous-instance log in this directory holds at most the last 200 lines' \
+    "$out/capture-notes.txt"
+  # Three captures really did happen, so the single note is not an artefact of the
+  # walk having stopped after one.
+  [ "$(grep -c . "$out/capture-notes.txt")" -gt 1 ]
+  rm -rf "$tmp"
+}
+
+@test "the tail note starts a line of its own after a killed stream" {
+  tmp="$(mktemp -d)"
+  stub="$tmp/bin"; mkdir -p "$stub"; prevlog_stub_dir "$stub"
+  out="$tmp/previous-logs"
+
+  PATH="$stub:$PATH" PREVLOG_STUB_ROWS='tenant-test|db-0|postgres|container|4' \
+    PREVLOG_STUB_LOG_MODE=partial sh "$SCRIPT" "$out" tenant-test >/dev/null 2>&1
+
+  file="$(ls "$out"/*.log)"
+  # A killed read drops the NEWEST lines; --tail drops the OLDEST. They are not
+  # interchangeable, and the tail note alone is worse here than no note at all: it
+  # gives the reader a confident explanation of why the beginning is missing while
+  # saying nothing about the missing end, so a log cut off mid-stream reads as a
+  # complete-to-the-last-line window. The TRUNCATED line reaches capture-notes.txt,
+  # but a reader standing in the .log is not looking there.
+  if ! grep -q '^\[capture-previous-logs\] TRUNCATED: this log ends here' "$file"; then
+    echo "FAIL: a killed read is not marked as cut off inside the log itself"
+    cat "$file"
+    false
+  fi
+  # And it must NOT claim the file is a clean tail window, which is the false half.
+  if grep -q 'holds at most the last' "$file"; then
+    echo "FAIL: a truncated capture claims to be a complete tail window"
+    cat "$file"
+    false
+  fi
+  # The marker starts a line of its own: a read killed mid-stream leaves a partial
+  # final line, so appending blind would glue the marker onto it, corrupting the
+  # decisive last line and making a start-of-line grep miss it.
+  grep -q '^the decisive partial line$' "$file"
+  rm -rf "$tmp"
+}
+
+@test "a partial capture that was not a timeout does not claim to be one" {
+  tmp="$(mktemp -d)"
+  stub="$tmp/bin"; mkdir -p "$stub"; prevlog_stub_dir "$stub"
+  out="$tmp/previous-logs"
+
+  PATH="$stub:$PATH" PREVLOG_STUB_ROWS='tenant-test|db-0|postgres|container|4' \
+    PREVLOG_STUB_LOG_MODE=partial_reset sh "$SCRIPT" "$out" tenant-test >/dev/null 2>&1
+
+  file="$(ls "$out"/*.log)"
+  # kubectl can write part of the stream and then fail on its own terms, with no
+  # clock having run out. Naming the read timeout there states a cause that was
+  # never observed -- the same defect as a tail note on a truncated file, in the
+  # other direction: a confident explanation that happens to be false.
+  if grep -qE 'its own [0-9]+s timeout|SIGKILL' "$file"; then
+    echo "FAIL: a non-timeout failure is reported as the read timeout"
+    cat "$file"
+    false
+  fi
+  grep -q '^\[capture-previous-logs\] TRUNCATED: this log ends here because kubectl exited 1' "$file"
+  # kubectl's own reason survives into the file rather than only the exit code.
+  grep -q 'unexpected EOF' "$file"
+  rm -rf "$tmp"
+}
+
+@test "a capture killed by a signal does not assert whose signal it was" {
+  tmp="$(mktemp -d)"
+  stub="$tmp/bin"; mkdir -p "$stub"; prevlog_stub_dir "$stub"
+  out="$tmp/previous-logs"
+
+  PATH="$stub:$PATH" PREVLOG_STUB_ROWS='tenant-test|db-0|postgres|container|4' \
+    PREVLOG_STUB_LOG_MODE=partial9 sh "$SCRIPT" "$out" tenant-test >/dev/null 2>&1
+
+  file="$(ls "$out"/*.log)"
+  # 137 is 128+SIGKILL. Our own `-k` grace produces it, and so does the OOM killer
+  # on a loaded runner or a teardown signalling the process group -- the exit
+  # status does not say which. The cut-off branch is right either way, since the
+  # capture ends before the log did; "timed out after 18s" is not, and a read
+  # killed at second two then reads as one that waited the full eighteen.
+  grep -q '^\[capture-previous-logs\] TRUNCATED: this log ends here' "$file"
+  grep -q 'SIGKILL' "$file"
+  grep -q 'does not tell apart' "$file"
+  rm -rf "$tmp"
+}
+
+@test "a capture that ran out its own clock says so without a disjunction" {
+  tmp="$(mktemp -d)"
+  stub="$tmp/bin"; mkdir -p "$stub"; prevlog_stub_dir "$stub"
+  out="$tmp/previous-logs"
+
+  PATH="$stub:$PATH" PREVLOG_STUB_ROWS='tenant-test|db-0|postgres|container|4' \
+    PREVLOG_STUB_LOG_MODE=partial sh "$SCRIPT" "$out" tenant-test >/dev/null 2>&1
+
+  file="$(ls "$out"/*.log)"
+  # The converse, and why the hedge is written per status rather than over both:
+  # 124 comes from `timeout` and from nothing else, so hedging it too would trade
+  # one false note for a vague one everywhere.
+  grep -q 'its own 18s timeout' "$file"
+  if grep -q 'SIGKILL' "$file"; then
+    echo "FAIL: hedged a 124, which only timeout produces"
+    cat "$file"
+    false
+  fi
+  # capture-notes.txt describes the SAME read and has to agree with the marker in
+  # the log. Asserting only on the .log left the notes free to call a 124 "kubectl
+  # exit 124" -- a status this script's own clock produced, attributed to kubectl,
+  # in the file a reader opens first.
+  grep -q 'cut off by' "$out/capture-notes.txt" || {
+    echo "FAIL: the notes describe a timeout as a plain kubectl exit"
+    cat "$out/capture-notes.txt"
+    false
+  }
+  if grep -q 'TRUNCATED (kubectl exit' "$out/capture-notes.txt"; then
+    echo "FAIL: the notes and the log disagree about the same read"
+    cat "$out/capture-notes.txt"
+    false
+  fi
+  rm -rf "$tmp"
+}
+
+@test "an unusable output directory is not reported as kubectl failing" {
+  tmp="$(mktemp -d)"
+  stub="$tmp/bin"; mkdir -p "$stub"; prevlog_stub_dir "$stub"
+  # A FILE where the parent directory should be, so `mkdir -p` fails for every
+  # uid. A chmod-based fixture would pass for root, which is how CI runs this.
+  : > "$tmp/blocked"
+  out="$tmp/blocked/previous-logs"
+
+  run_out="$(PATH="$stub:$PATH" PREVLOG_STUB_ROWS='tenant-test|db-0|postgres|container|4' \
+    sh "$SCRIPT" "$out" tenant-test 2>&1 || true)"
+
+  # A redirection that cannot open its target fails before kubectl runs, and the
+  # shell status lands in the branch that names kubectl. Once per container, the
+  # report then blames the cluster for a directory the caller got wrong.
+  if printf '%s\n' "$run_out" | grep -q 'kubectl exit'; then
+    echo "FAIL: a local filesystem condition is reported as kubectl failing"
+    printf '%s\n' "$run_out"
+    false
+  fi
+  printf '%s\n' "$run_out" | grep -q 'cannot write to'
+  printf '%s\n' "$run_out" | grep -q 'says nothing about whether anything crash-looped'
+  rm -rf "$tmp"
+}
+
+@test "a zero tail is refused rather than turned into a claim about the cluster" {
+  tmp="$(mktemp -d)"
+  stub="$tmp/bin"; mkdir -p "$stub"; prevlog_stub_dir "$stub"
+  out="$tmp/previous-logs"
+
+  PATH="$stub:$PATH" PREVLOG_STUB_ROWS='tenant-test|db-0|postgres|container|4' \
+    COZY_PREVLOG_TAIL=0 sh "$SCRIPT" "$out" tenant-test >/dev/null 2>&1
+
+  # `--tail=0` returns nothing and kubectl still exits 0, so the empty-output
+  # branch would delete the capture and report that the previous instance
+  # "produced no output" -- a positive statement about the cluster produced
+  # entirely by a typo, which also discards the only remaining copy of a log the
+  # kubelet has already collected.
+  if grep -q 'produced no output' "$out/capture-notes.txt"; then
+    echo "FAIL: a zero tail was reported as the container having logged nothing"
+    cat "$out/capture-notes.txt"
+    false
+  fi
+  grep -q "ignoring COZY_PREVLOG_TAIL='0'" "$out/capture-notes.txt"
+  # The fallback applied, so the capture is there and names the bound that was used.
+  grep -q 'last 200 lines' "$out/capture-notes.txt"
+  rm -rf "$tmp"
+}
+
+@test "a tail of -1 claims no bound, because none was applied" {
+  tmp="$(mktemp -d)"
+  stub="$tmp/bin"; mkdir -p "$stub"; prevlog_stub_dir "$stub"
+  out="$tmp/previous-logs"
+
+  PATH="$stub:$PATH" PREVLOG_STUB_ROWS='tenant-test|db-0|postgres|container|4' \
+    COZY_PREVLOG_TAIL=-1 sh "$SCRIPT" "$out" tenant-test >/dev/null 2>&1
+
+  file="$(ls "$out"/*.log)"
+  # -1 is the documented spelling for "the whole log". A note reading "holds at
+  # most the last -1 lines" would describe a bound that was never applied, which
+  # is the same class as claiming a truncated file is complete: a statement about
+  # the artifact that the artifact does not support.
+  if grep -q 'holds at most' "$file"; then
+    echo "FAIL: an unbounded read claims a tail bound"
+    cat "$file"
+    false
+  fi
+  # And -1 is not treated as malformed: it is a supported request, not a typo.
+  if grep -q 'ignoring COZY_PREVLOG_TAIL' "$out/capture-notes.txt"; then
+    echo "FAIL: -1 was rejected as malformed"
+    false
+  fi
+  rm -rf "$tmp"
+}
+
+@test "an oversized knob falls back instead of silently losing every row" {
+  tmp="$(mktemp -d)"
+  stub="$tmp/bin"; mkdir -p "$stub"; prevlog_stub_dir "$stub"
+  out="$tmp/previous-logs"
+  huge=999999999999999999999999999999
+
+  PATH="$stub:$PATH" PREVLOG_STUB_ROWS='tenant-test|db-0|postgres|container|4' \
+    COZY_PREVLOG_MAX="$huge" sh "$SCRIPT" "$out" tenant-test >/dev/null 2>&1
+
+  # A digits-only value that `test` and `head` cannot compute with does not merely
+  # fail to cap -- under dash `[ -eq ]` errors and `head` rejects the count, so
+  # prevlog_cap emits nothing and the caller reports zero containers kept "because
+  # the cap was reached". The cap that broke collection would be named as the
+  # reason collection found nothing.
+  grep -q "ignoring COZY_PREVLOG_MAX='$huge'" "$out/capture-notes.txt"
+  # The fallback applied, so the row survived rather than being lost to the knob.
+  [ "$(ls "$out" | grep -c '\.log$')" -eq 1 ]
+  if grep -q 'capturing previous-instance logs for 0 of' "$out/capture-notes.txt"; then
+    echo "FAIL: an unusable cap was reported as having capped everything away"
+    cat "$out/capture-notes.txt"
+    false
+  fi
+  rm -rf "$tmp"
+}
+
+@test "an uncapturable reason is not reported as no message from kubectl" {
+  tmp="$(mktemp -d)"
+  stub="$tmp/bin"; mkdir -p "$stub"; prevlog_stub_dir "$stub"
+  out="$tmp/previous-logs"
+
+  # mktemp fails, so the stderr scratch file never exists and $reason stays empty.
+  # `${reason:-no message from kubectl}` then states a fact about kubectl that was
+  # never observed.
+  PATH="$stub:$PATH" TMPDIR=/nonexistent-prevlog-probe \
+    PREVLOG_STUB_ROWS='tenant-test|db-0|postgres|container|4' \
+    PREVLOG_STUB_LOG_MODE=norefusal sh "$SCRIPT" "$out" tenant-test >/dev/null 2>&1
+
+  [ -f "$out/capture-notes.txt" ] || { echo "FAIL: no notes written at all"; false; }
+  if grep -q 'no message from kubectl' "$out/capture-notes.txt"; then
+    echo "FAIL: an uncapturable message is reported as kubectl having sent none"
+    cat "$out/capture-notes.txt"
+    false
+  fi
+  rm -rf "$tmp"
+}
+
+@test "the reason quoted is kubectl's, not the klog retry line above it" {
+  tmp="$(mktemp -d)"
+  stub="$tmp/bin"; mkdir -p "$stub"; prevlog_stub_dir "$stub"
+  out="$tmp/previous-logs"
+
+  PATH="$stub:$PATH" PREVLOG_STUB_ROWS='tenant-test|db-0|postgres|container|4' \
+    PREVLOG_STUB_LOG_MODE=noisy_refusal sh "$SCRIPT" "$out" tenant-test >/dev/null 2>&1
+
+  # A read against cold discovery is preceded by one klog retry line per attempt,
+  # and kubectl's actionable message comes last. Taking the first line names the
+  # retry instead of the cause -- and since this value now reaches the artifact
+  # rather than only the job log, the artifact would ship the wrong cause. Every
+  # other stderr quote in these scripts already takes the last line; this one did
+  # not, and nothing pinned which end it used.
+  if grep -q "couldn't get current server API group list" "$out/capture-notes.txt"; then
+    echo "FAIL: quoted the klog retry line instead of kubectl's reason"
+    cat "$out/capture-notes.txt"
+    false
+  fi
+  grep -q 'previous terminated container' "$out/capture-notes.txt"
+  rm -rf "$tmp"
+}
+
+@test "a second capture run into the same directory is separated from the first" {
+  tmp="$(mktemp -d)"
+  stub="$tmp/bin"; mkdir -p "$stub"; prevlog_stub_dir "$stub"
+  out="$tmp/previous-logs"
+  rows='cozy-system|healthy-0|app|container|0'
+
+  PATH="$stub:$PATH" PREVLOG_STUB_ROWS="$rows" sh "$SCRIPT" "$out" tenant-test >/dev/null 2>&1
+  PATH="$stub:$PATH" PREVLOG_STUB_LIST_FAIL=1 sh "$SCRIPT" "$out" tenant-test >/dev/null 2>&1
+
+  # Notes are appended, so without a separator one run's "nothing restarted"
+  # sits flush against the next run's "could not list pods" and the file stops
+  # being able to explain either.
+  grep -q -- '--- new capture run ---' "$out/capture-notes.txt"
+  grep -q 'no container has restarted' "$out/capture-notes.txt"
+  grep -q 'could not list pods' "$out/capture-notes.txt"
+  rm -rf "$tmp"
+}
diff --git a/hack/chainsaw-leak-guard_test.bats b/hack/chainsaw-leak-guard_test.bats
new file mode 100644
index 0000000000..8bf3a26184
--- /dev/null
+++ b/hack/chainsaw-leak-guard_test.bats
@@ -0,0 +1,605 @@
+#!/usr/bin/env bats
+# -----------------------------------------------------------------------------
+# Unit tests for the pod-leak guard: hack/e2e-chainsaw/_lib/leak-guard.sh and
+# the per-suite runner hack/e2e-chainsaw-run.sh that calls it.
+#
+# What these pin is the attribution rule (which leftover pod is charged to the
+# suite that just ran, and which is left alone), the budget (a pod still tearing
+# down inside it passes, one past it fails), the allowlist (an exemption warns
+# instead of failing, and cannot outlive its suite directory), the JUnit merge,
+# and that the runner hands chainsaw the same suites a single invocation would.
+#
+# kubectl and chainsaw are stubs on PATH that answer from fixture files, so the
+# cluster is a directory: pods.json is what `get pods` returns (pods.after.json
+# once a `kubectl wait` has succeeded), obj/ holds the owners the walk may look
+# up, and `now` is the apiserver clock. The guard is bash; the legacy
+# cozytest.sh translator runs these bodies under sh, so each test calls it
+# through `bash`.
+#
+# CI runs this file under Bats. It stays compatible with that translator, whose
+# awk parser recognizes only @test blocks and a bare `}` on its own line, so the
+# tests avoid bats `run`, `$status`, setup() and teardown(). Each test removes
+# its own temp dir on its last line. The parser also puts `return 0` in front of
+# every bare `}` in the file, top-level helpers included, so a helper whose exit
+# status matters closes with `} # name`.
+#
+# The file name carries no `e2e-` prefix on purpose: the root Makefile leaves
+# hack/e2e-*.bats out of `make unit-tests`, and cozytest.sh arms its cluster
+# captures for them.
+#
+# Run with: bats hack/chainsaw-leak-guard_test.bats
+# -----------------------------------------------------------------------------
+
+load test_helper
+
+HACK_DIR="$(cd "$(dirname "${BATS_TEST_FILENAME:-$0}")" && pwd)"
+LG_LIB="$HACK_DIR/e2e-chainsaw/_lib/leak-guard.sh"
+LG_RUN="$HACK_DIR/e2e-chainsaw-run.sh"
+export LG_LIB
+
+# The suite under test started here, on the apiserver's clock.
+T_START=2026-09-24T15:10:00Z
+T_OLD=2026-09-24T14:00:00Z
+
+# lg FUNCTION ARGS... — call a guard function in bash with the stubs on PATH.
+lg() {
+  PATH="$FIX/bin:$PATH" bash -c '. "$LG_LIB"; "$@"' lg "$@"
+} # lg
+
+# new_fixture — a fresh fake cluster in $FIX, with stub kubectl and chainsaw.
+new_fixture() {
+  FIX=$(mktemp -d)
+  export FIX
+  mkdir -p "$FIX/bin" "$FIX/obj"
+  printf '%s' "$T_START" >"$FIX/now"
+  cat >"$FIX/bin/kubectl" <<'EOF'
+#!/usr/bin/env bash
+printf '%s\n' "$*" >>"$FIX/kubectl-calls"
+case "$1 $2" in
+  "create configmap") cat "$FIX/now"; exit ;;
+  "get pods")
+    # pods-failures: how many pod lists fail once a wait has run.
+    n=$(cat "$FIX/pods-failures" 2>/dev/null || echo 0)
+    if [ -f "$FIX/wait-called" ] && [ "$n" -gt 0 ]; then
+      echo $((n - 1)) >"$FIX/pods-failures"
+      echo 'Unable to connect to the server: net/http: TLS handshake timeout' >&2
+      exit 1
+    fi
+    if [ -f "$FIX/waited" ] && [ -f "$FIX/pods.after.json" ]; then cat "$FIX/pods.after.json"; else cat "$FIX/pods.json"; fi
+    exit ;;
+  "get "*)
+    if [ -f "$FIX/obj-read-fails" ]; then echo 'Unable to connect to the server: i/o timeout' >&2; exit 1; fi
+    if [ -f "$FIX/obj/$2_$4_$5.json" ]; then cat "$FIX/obj/$2_$4_$5.json"; exit 0; fi
+    echo "Error from server (NotFound): \"$5\" not found" >&2
+    exit 1 ;;
+esac
+if [ "$1" = wait ]; then
+  : >"$FIX/wait-called"
+  # wait-errors holds how many more waits fail as an unreachable apiserver;
+  # after those, wait-ok decides between success and kubectl's timeout error.
+  n=$(cat "$FIX/wait-errors" 2>/dev/null || echo 0)
+  if [ "$n" -gt 0 ]; then
+    echo $((n - 1)) >"$FIX/wait-errors"
+    if [ -f "$FIX/wait-warns" ]; then echo 'Warning: v1 ComponentStatus is deprecated in v1.19+' >&2; fi
+    echo 'error: Get "https://10.96.0.1:443/api/v1/namespaces/tenant-test/pods": dial tcp 10.96.0.1:443: connect: connection refused' >&2
+    exit 1
+  fi
+  # wait-deadline: the deadline passes before the watch starts, so kubectl
+  # runs for its whole --timeout and reports the client's error, not its own
+  # timeout text.
+  if [ -f "$FIX/wait-deadline" ]; then
+    for a in "$@"; do
+      case $a in --timeout=*) t=${a#--timeout=}; sleep "${t%s}" ;; esac
+    done
+    echo 'error: Get "https://10.96.0.1:443/api/v1/namespaces/tenant-test/pods/x": context deadline exceeded' >&2
+    exit 1
+  fi
+  if [ -f "$FIX/wait-ok" ]; then
+    : >"$FIX/waited"
+    exit 0
+  fi
+  echo 'error: timed out waiting for the condition on pods/x' >&2
+  exit 1
+fi
+exit 99
+EOF
+  cat >"$FIX/bin/chainsaw" <<'EOF'
+#!/usr/bin/env bash
+printf '%s\n' "$*" >>"$FIX/chainsaw-calls"
+while [ $# -gt 0 ]; do
+  case $1 in
+    --report-path) path=$2; shift 2 ;;
+    --report-name) name=$2; shift 2 ;;
+    *) shift ;;
+  esac
+done
+# Named the way chainsaw's getFile names it: .xml is appended only to a name
+# with no extension of its own.
+case ${name##*/} in
+  *.*) file=$path/$name ;;
+  *) file=$path/$name.xml ;;
+esac
+base=${name%.xml}
+if [ -f "$FIX/leak-after-$base" ]; then cp "$FIX/leak-after-$base" "$FIX/pods.json"; fi
+printf '<testsuites name="chainsaw-report" time="1.5" tests="1">\n  <testsuite name="%s" tests="1" failures="0" errors="0" id="0" time="">\n    <testcase name="%s" classname="" time="1.5"></testcase>\n  </testsuite>\n</testsuites>' "$base" "$base" >"$file"
+exit 0
+EOF
+  chmod +x "$FIX/bin/kubectl" "$FIX/bin/chainsaw"
+}
+
+# meta NAME NS CREATED [OWNER_API OWNER_KIND OWNER_NAME] — an object's metadata.
+meta() {
+  owners=""
+  if [ -n "${4:-}" ]; then
+    owners=$(printf ',"ownerReferences":[{"apiVersion":"%s","kind":"%s","name":"%s","controller":true}]' "$4" "$5" "$6")
+  fi
+  printf '"metadata":{"name":"%s","namespace":"%s","uid":"uid-%s","creationTimestamp":"%s","labels":{"app.kubernetes.io/instance":"inst-%s"}%s}' \
+    "$1" "$2" "$1" "$3" "$1" "$owners"
+}
+
+# owner API KIND NAME NS CREATED [OWNER_API OWNER_KIND OWNER_NAME] — put an
+# owner object where the stub's `get` finds it.
+owner() {
+  case $1 in
+    */*) res="$2.${1#*/}.${1%%/*}" ;;
+    *) res=$2 ;;
+  esac
+  printf '{"apiVersion":"%s","kind":"%s",%s}' "$1" "$2" "$(meta "$3" "$4" "$5" "${6:-}" "${7:-}" "${8:-}")" >"$FIX/obj/${res}_$4_$3.json"
+}
+
+# pod NAME NS PHASE CREATED [OWNER_API OWNER_KIND OWNER_NAME] — one pod object.
+pod() {
+  printf '{"kind":"Pod",%s,"status":{"phase":"%s"}}' "$(meta "$1" "$2" "$4" "${5:-}" "${6:-}" "${7:-}")" "$3"
+}
+
+# pods FILE POD... — a pod list.
+pods() {
+  f=$1
+  shift
+  printf '{"items":[' >"$f"
+  sep=""
+  for p in "$@"; do
+    printf '%s%s' "$sep" "$p" >>"$f"
+    sep=","
+  done
+  printf ']}' >>"$f"
+}
+
+# The platform: an etcd pod whose Deployment predates every suite.
+platform() {
+  owner apps/v1 Deployment etcd tenant-root "$T_OLD"
+  owner apps/v1 ReplicaSet etcd-rs tenant-root "$T_OLD" apps/v1 Deployment etcd
+  pod etcd-0 tenant-root Running "$T_OLD" apps/v1 ReplicaSet etcd-rs
+}
+
+# The leak this guard exists for: a broker whose StrimziPodSet and Kafka CR the
+# suite's release created, still running after the suite's cleanup.
+kafka_leak() {
+  owner kafka.strimzi.io/v1beta2 Kafka kafka-test tenant-test 2026-09-24T15:10:30Z
+  owner core.strimzi.io/v1beta2 StrimziPodSet kafka-test-kafka tenant-test 2026-09-24T15:11:00Z kafka.strimzi.io/v1beta2 Kafka kafka-test
+  pod kafka-test-kafka-0 tenant-test Running 2026-09-24T15:11:05Z core.strimzi.io/v1beta2 StrimziPodSet kafka-test-kafka
+}
+
+baseline_of_platform() {
+  printf '["uid-etcd-0"]'
+}
+
+@test "a pod whose root the suite created and that is still running is charged to the suite" {
+  new_fixture
+  pods "$FIX/pods.json" "$(platform)" "$(kafka_leak)"
+  out=$(lg lg_leaks "$T_START" "$(baseline_of_platform)")
+  echo "$out" | grep -Fq 'tenant-test/kafka-test-kafka-0 phase=Running deleting=no root=Kafka/tenant-test/kafka-test rootCreated=2026-09-24T15:10:30Z instance=inst-kafka-test-kafka-0'
+  [ "$(printf '%s\n' "$out" | grep -c .)" -eq 1 ]
+  rm -rf "$FIX"
+}
+
+@test "a platform pod replaced mid-suite is not charged because its root is older than the suite" {
+  new_fixture
+  platform >/dev/null
+  pods "$FIX/pods.json" "$(pod etcd-1 tenant-root Running 2026-09-24T15:12:00Z apps/v1 ReplicaSet etcd-rs)"
+  out=$(lg lg_leaks "$T_START" '[]')
+  [ -z "$out" ]
+  rm -rf "$FIX"
+}
+
+@test "a root created in the very second the suite started is charged to the suite" {
+  new_fixture
+  owner apps/v1 StatefulSet same-second tenant-test "$T_START"
+  pods "$FIX/pods.json" "$(pod same-second-0 tenant-test Running "$T_START" apps/v1 StatefulSet same-second)"
+  out=$(lg lg_leaks "$T_START" '[]')
+  echo "$out" | grep -Fq 'root=StatefulSet/tenant-test/same-second'
+  rm -rf "$FIX"
+}
+
+@test "a pod present before the suite is not charged even when a controller recreated mid-suite adopted it" {
+  new_fixture
+  # A StatefulSet deleted with --cascade=orphan and recreated adopts the pods it
+  # left: the root is new, the pod is not the suite's.
+  owner apps/v1 StatefulSet adopter tenant-root 2026-09-24T15:20:00Z
+  pods "$FIX/pods.json" "$(pod adopted-0 tenant-root Running "$T_OLD" apps/v1 StatefulSet adopter)"
+  out=$(lg lg_leaks "$T_START" '["uid-adopted-0"]')
+  [ -z "$out" ]
+  rm -rf "$FIX"
+}
+
+@test "a finished pod holds no requests and is not charged" {
+  new_fixture
+  owner batch/v1 Job hook tenant-test 2026-09-24T15:11:00Z
+  pods "$FIX/pods.json" \
+    "$(pod hook-a tenant-test Succeeded 2026-09-24T15:11:00Z batch/v1 Job hook)" \
+    "$(pod hook-b tenant-test Failed 2026-09-24T15:11:00Z batch/v1 Job hook)"
+  out=$(lg lg_leaks "$T_START" '[]')
+  [ -z "$out" ]
+  rm -rf "$FIX"
+}
+
+@test "a pod whose owner is gone is charged by the last object the walk reached" {
+  new_fixture
+  pods "$FIX/pods.json" "$(pod orphan-0 tenant-test Running 2026-09-24T15:11:00Z apps/v1 ReplicaSet vanished)"
+  out=$(lg lg_leaks "$T_START" '[]')
+  echo "$out" | grep -Fq 'root=Pod/tenant-test/orphan-0 (owner ReplicaSet/vanished missing)'
+  rm -rf "$FIX"
+}
+
+@test "an owner read that fails for any reason but NotFound is an error and charges nothing" {
+  new_fixture
+  platform >/dev/null
+  pods "$FIX/pods.json" "$(pod etcd-1 tenant-root Running 2026-09-24T15:12:00Z apps/v1 ReplicaSet etcd-rs)"
+  : >"$FIX/obj-read-fails"
+  if out=$(lg lg_leaks "$T_START" '[]' 2>&1); then
+    echo "an unreadable owner was accepted: $out" >&2
+    return 1
+  fi
+  echo "$out" | grep -Fq 'could not read owner ReplicaSet/etcd-rs in tenant-root'
+  [ "$(echo "$out" | grep -c 'phase=')" -eq 0 ]
+  rm -rf "$FIX"
+}
+
+@test "the owner walk follows six links to the real root and stops at the seventh" {
+  new_fixture
+  # r0 is the root and each r(i) is owned by r(i-1). A pod owned by r5 is six
+  # links from r0, one owned by r6 seven. The root predates the suite, every
+  # link below it does not, so only a walk that reaches r0 clears the pod.
+  owner example.com/v1 Link r0 tenant-test "$T_OLD"
+  i=1
+  while [ "$i" -le 6 ]; do
+    owner example.com/v1 Link "r$i" tenant-test 2026-09-24T15:11:00Z example.com/v1 Link "r$((i - 1))"
+    i=$((i + 1))
+  done
+  pods "$FIX/pods.json" "$(pod six-links tenant-test Running 2026-09-24T15:11:00Z example.com/v1 Link r5)"
+  [ -z "$(lg lg_leaks "$T_START" '[]')" ]
+  pods "$FIX/pods.json" "$(pod seven-links tenant-test Running 2026-09-24T15:11:00Z example.com/v1 Link r6)"
+  lg lg_leaks "$T_START" '[]' | grep -Fq 'root=Link/tenant-test/r1 (depth-cap)'
+  rm -rf "$FIX"
+}
+
+@test "an unreadable pod list is an error and never an empty answer" {
+  new_fixture
+  if lg lg_leaks "$T_START" '[]'; then
+    echo "lg_leaks succeeded without a pod list" >&2
+    return 1
+  fi
+  if lg lg_check_suite some-suite "$T_START" '[]' 0 /dev/null; then
+    echo "lg_check_suite passed a suite it could not check" >&2
+    return 1
+  fi
+  rm -rf "$FIX"
+}
+
+@test "a leak still present when the budget runs out fails the suite and names what leaked" {
+  new_fixture
+  pods "$FIX/pods.json" "$(platform)" "$(kafka_leak)"
+  if out=$(lg lg_check_suite kafka "$T_START" "$(baseline_of_platform)" 0 /dev/null); then
+    echo "a leaking suite passed: $out" >&2
+    return 1
+  fi
+  echo "$out" | grep -Fq '::error title=leaked-pods::suite=kafka count=1'
+  echo "$out" | grep -Fq 'LEAKED-PODS suite=kafka budget=300s count=1'
+  echo "$out" | grep -Fq 'tenant-test/kafka-test-kafka-0 '
+  grep -Fq 'wait --for=delete pod/kafka-test-kafka-0 --namespace tenant-test --timeout=' "$FIX/kubectl-calls"
+  rm -rf "$FIX"
+}
+
+@test "leftovers of a suite that already failed are reported once without claiming the budget ran out" {
+  new_fixture
+  pods "$FIX/pods.json" "$(platform)" "$(kafka_leak)"
+  out=$(lg lg_check_suite kafka "$T_START" "$(baseline_of_platform)" 1 /dev/null)
+  echo "$out" | grep -Fq '::warning title=leaked-pods (suite already failed)::suite=kafka count=1'
+  echo "$out" | grep -Fq 'LEAKED-PODS suite=kafka checked-once=chainsaw-failed count=1'
+  echo "$out" | grep -Fq 'tenant-test/kafka-test-kafka-0 '
+  [ "$(echo "$out" | grep -c -e 'by more than' -e 'budget=')" -eq 0 ]
+  [ "$(grep -c '^wait ' "$FIX/kubectl-calls")" -eq 0 ]
+  rm -rf "$FIX"
+}
+
+@test "a suite the runner could not take a pre-suite reading for is reported as not run" {
+  new_fixture
+  mkdir -p "$FIX/root/aaa"
+  : >"$FIX/root/aaa/chainsaw-test.yaml"
+  printf '# none\n' >"$FIX/allow"
+  rc=0
+  (cd "$FIX/root" && PATH="$FIX/bin:$PATH" COZY_LEAK_ALLOWLIST="$FIX/allow" bash "$LG_RUN") || rc=$?
+  [ "$rc" -eq 1 ]
+  [ ! -f "$FIX/chainsaw-calls" ]
+  grep -Fq 'could not take the pre-suite reading; chainsaw did not run' "$FIX/root/chainsaw-report.xml"
+  rm -rf "$FIX"
+}
+
+@test "a pod that finishes tearing down inside the budget passes the suite" {
+  new_fixture
+  pods "$FIX/pods.json" "$(platform)" "$(kafka_leak)"
+  pods "$FIX/pods.after.json" "$(platform)"
+  : >"$FIX/wait-ok"
+  out=$(lg lg_check_suite kafka "$T_START" "$(baseline_of_platform)" 0 /dev/null)
+  echo "$out" | grep -Fq 'leak-guard: suite=kafka clear after'
+  [ "$(echo "$out" | grep -c 'LEAKED-PODS')" -eq 0 ]
+  rm -rf "$FIX"
+}
+
+@test "a wait that fails on the apiserver stops waiting and is reported inconclusive, not as a leak" {
+  new_fixture
+  pods "$FIX/pods.json" "$(platform)" "$(kafka_leak)"
+  echo 1 >"$FIX/wait-errors"
+  out=$(lg lg_check_suite kafka "$T_START" "$(baseline_of_platform)" 0 /dev/null)
+  echo "$out" | grep -Fq '::warning title=leaked-pods (inconclusive)::suite=kafka count=1'
+  echo "$out" | grep -Fq 'LEAKED-PODS suite=kafka count=1 inconclusive="error: Get "https://10.96.0.1:443/api/v1/namespaces/tenant-test/pods": dial tcp 10.96.0.1:443: connect: connection refused"'
+  [ "$(echo "$out" | grep -c -e 'budget=' -e '::error')" -eq 0 ]
+  [ "$(grep -c '^wait ' "$FIX/kubectl-calls")" -eq 1 ]
+  rm -rf "$FIX"
+}
+
+@test "an inconclusive result names the error, not a warning kubectl printed ahead of it" {
+  new_fixture
+  pods "$FIX/pods.json" "$(platform)" "$(kafka_leak)"
+  echo 1 >"$FIX/wait-errors"
+  : >"$FIX/wait-warns"
+  out=$(lg lg_check_suite kafka "$T_START" "$(baseline_of_platform)" 0 /dev/null)
+  echo "$out" | grep -Fq 'inconclusive="error: Get "https://10.96.0.1:443/api/v1/namespaces/tenant-test/pods": dial tcp 10.96.0.1:443: connect: connection refused"'
+  [ "$(echo "$out" | grep -c 'inconclusive="Warning:')" -eq 0 ]
+  rm -rf "$FIX"
+}
+
+@test "a wait that runs its whole timeout and ends on the client deadline is a timeout, so the leak fails" {
+  new_fixture
+  pods "$FIX/pods.json" "$(platform)" "$(kafka_leak)"
+  : >"$FIX/wait-deadline"
+  if out=$(COZY_LEAK_BUDGET=2 lg lg_check_suite kafka "$T_START" "$(baseline_of_platform)" 0 /dev/null); then
+    echo "a leak that outlived the budget passed: $out" >&2
+    return 1
+  fi
+  echo "$out" | grep -Fq '::error title=leaked-pods::suite=kafka count=1'
+  [ "$(echo "$out" | grep -c 'inconclusive')" -eq 0 ]
+  rm -rf "$FIX"
+}
+
+@test "a leak whose wait timed out stays a leak when the next pod list cannot be read" {
+  new_fixture
+  pods "$FIX/pods.json" "$(platform)" "$(kafka_leak)"
+  echo 1 >"$FIX/pods-failures"
+  if out=$(lg lg_check_suite kafka "$T_START" "$(baseline_of_platform)" 0 /dev/null); then
+    echo "a timed-out leak passed: $out" >&2
+    return 1
+  fi
+  echo "$out" | grep -Fq '::error title=leaked-pods::suite=kafka count=1'
+  [ "$(echo "$out" | grep -c 'inconclusive')" -eq 0 ]
+  rm -rf "$FIX"
+}
+
+@test "a pod list that fails after a completed wait is reported inconclusive, not as a leak" {
+  new_fixture
+  pods "$FIX/pods.json" "$(platform)" "$(kafka_leak)"
+  : >"$FIX/wait-ok"
+  echo 1 >"$FIX/pods-failures"
+  # A short budget, so that a guard which kept waiting after the failed list
+  # ends on the clock within seconds instead of spinning for five minutes.
+  out=$(COZY_LEAK_BUDGET=3 lg lg_check_suite kafka "$T_START" "$(baseline_of_platform)" 0 /dev/null)
+  echo "$out" | grep -Fq 'LEAKED-PODS suite=kafka count=1 inconclusive="the re-list after the waits failed: the pod list or an owner could not be read"'
+  [ "$(echo "$out" | grep -c 'could not finish')" -eq 0 ]
+  [ "$(echo "$out" | grep -c '::error')" -eq 0 ]
+  rm -rf "$FIX"
+}
+
+@test "an allowlisted suite reports its leak as a warning and passes without waiting" {
+  new_fixture
+  pods "$FIX/pods.json" "$(platform)" "$(kafka_leak)"
+  printf '# comment\nkafka cozystack/cozystack#4488\n' >"$FIX/allow"
+  out=$(lg lg_check_suite kafka "$T_START" "$(baseline_of_platform)" 0 "$FIX/allow")
+  echo "$out" | grep -Fq '::warning title=leaked-pods (allowlisted cozystack/cozystack#4488)::suite=kafka count=1'
+  echo "$out" | grep -Fq 'tenant-test/kafka-test-kafka-0 '
+  [ "$(grep -c '^wait ' "$FIX/kubectl-calls")" -eq 0 ]
+  # The same leak under a suite the list does not name still fails.
+  if lg lg_check_suite kafka-metadata "$T_START" "$(baseline_of_platform)" 0 "$FIX/allow" >/dev/null; then
+    echo "a suite the allowlist does not name passed" >&2
+    return 1
+  fi
+  rm -rf "$FIX"
+}
+
+@test "an allowlist entry for a suite directory that does not exist stops the run" {
+  new_fixture
+  mkdir -p "$FIX/root/kafka"
+  : >"$FIX/root/kafka/chainsaw-test.yaml"
+  printf 'kafka cozystack/cozystack#4488\n' >"$FIX/allow"
+  lg lg_allowlist_validate "$FIX/allow" "$FIX/root"
+  printf 'kafka cozystack/cozystack#4488\nkafka-renamed cozystack/cozystack#4488\n' >"$FIX/allow"
+  if lg lg_allowlist_validate "$FIX/allow" "$FIX/root"; then
+    echo "a stale allowlist entry was accepted" >&2
+    return 1
+  fi
+  printf 'kafka\n' >"$FIX/allow"
+  if lg lg_allowlist_validate "$FIX/allow" "$FIX/root"; then
+    echo "an allowlist entry without an issue ref was accepted" >&2
+    return 1
+  fi
+  rm -rf "$FIX"
+}
+
+@test "an allowlist whose last line has no newline still has that line validated" {
+  new_fixture
+  mkdir -p "$FIX/root/kafka"
+  : >"$FIX/root/kafka/chainsaw-test.yaml"
+  printf 'kafka cozystack/cozystack#4488\nkafka-renamed cozystack/cozystack#4488' >"$FIX/allow"
+  if lg lg_allowlist_validate "$FIX/allow" "$FIX/root"; then
+    echo "a stale last entry without a newline was accepted" >&2
+    return 1
+  fi
+  rm -rf "$FIX"
+}
+
+@test "the shipped allowlist names only suite directories that exist" {
+  new_fixture
+  lg lg_allowlist_validate "$HACK_DIR/e2e-chainsaw/_lib/leak-allowlist.txt" "$HACK_DIR/e2e-chainsaw"
+  rm -rf "$FIX"
+}
+
+@test "the leak budget equals the default cleanup timeout in the chainsaw configuration" {
+  new_fixture
+  cleanup=$(yq '.spec.timeouts.cleanup' "$HACK_DIR/e2e-chainsaw/.chainsaw.yaml")
+  [ "$cleanup" = 5m ]
+  [ "$(bash -c '. "$LG_LIB"; echo "$LG_BUDGET"')" = 300 ]
+  [ "$(bash -c '. "$LG_LIB"; echo "$LG_DEPTH_CAP"')" = 6 ]
+  rm -rf "$FIX"
+}
+
+@test "merged report sums the per-suite reports and keeps each failure" {
+  new_fixture
+  mkdir "$FIX/r"
+  cat >"$FIX/r/redis.xml" <<'EOF'
+<testsuites name="chainsaw-report" time="474.868461" tests="2">
+  <testsuite name="redis" tests="2" failures="0" errors="0" id="0" time="">
+    <testcase name="redis-tls" classname="" time="75.267668"></testcase>
+    <testcase name="redis" classname="" time="57.092179"></testcase>
+  </testsuite>
+</testsuites>
+EOF
+  cat >"$FIX/r/harbor.xml" <<'EOF'
+<testsuites name="chainsaw-report" time="900.5" tests="1" failures="1">
+  <testsuite name="harbor" tests="1" failures="1" errors="0" id="0" time="">
+    <testcase name="harbor" classname="" time="900.5">
+      <failure message="helm.toolkit.fluxcd.io/v2/HelmRelease/tenant-test/harbor-test&#xA;* status: Invalid value: &#34;Unknown&#34;&#xA;; context deadline exceeded"></failure>
+    </testcase>
+  </testsuite>
+</testsuites>
+EOF
+  : >"$FIX/r/harbor.leaked"
+  lg lg_merge_reports "$FIX/r" redis harbor never-reported >"$FIX/merged.xml"
+  head -n 1 "$FIX/merged.xml" | grep -Fxq '<testsuites name="chainsaw-report" time="1375.368461" tests="5" failures="3">'
+  grep -Fq '<testcase name="redis-tls" classname="" time="75.267668"></testcase>' "$FIX/merged.xml"
+  grep -Fq 'context deadline exceeded"></failure>' "$FIX/merged.xml"
+  grep -Fq '<testcase name="leak-guard" classname="" time="">' "$FIX/merged.xml"
+  grep -Fq 'chainsaw wrote no report for this suite' "$FIX/merged.xml"
+  [ "$(grep -c '<testsuite ' "$FIX/merged.xml")" -eq 4 ]
+  python3 -c 'import sys, xml.dom.minidom; xml.dom.minidom.parse(sys.argv[1])' "$FIX/merged.xml"
+  rm -rf "$FIX"
+}
+
+@test "the runner fails a leaking suite and still runs and reports every other suite" {
+  new_fixture
+  mkdir -p "$FIX/root/aaa" "$FIX/root/bbb" "$FIX/root/_lib"
+  : >"$FIX/root/aaa/chainsaw-test.yaml"
+  : >"$FIX/root/bbb/chainsaw-test.yaml"
+  printf '# none\n' >"$FIX/allow"
+  pods "$FIX/pods.json" "$(platform)"
+  # The stub chainsaw leaves the broker behind when it runs suite aaa.
+  pods "$FIX/leak-after-aaa" "$(platform)" "$(kafka_leak)"
+  rc=0
+  out=$(cd "$FIX/root" && PATH="$FIX/bin:$PATH" COZY_LEAK_ALLOWLIST="$FIX/allow" bash "$LG_RUN" --set-string storageClass=local 2>&1) || rc=$?
+  [ "$rc" -eq 1 ]
+  echo "$out" | grep -Fq 'LEAKED-PODS suite=aaa budget=300s count=1'
+  # bbb ran after aaa's leak and is not charged with it: its root is older.
+  echo "$out" | grep -Fq 'leak-guard: suite=bbb clear after'
+  grep -Fq 'leak-guard' "$FIX/root/chainsaw-report.xml"
+  grep -Fq '<testsuite name="bbb"' "$FIX/root/chainsaw-report.xml"
+  rm -rf "$FIX"
+}
+
+@test "the runner reports a cluster it could not read after a suite as unchecked, not as a leak" {
+  new_fixture
+  mkdir -p "$FIX/root/aaa"
+  : >"$FIX/root/aaa/chainsaw-test.yaml"
+  printf '# none\n' >"$FIX/allow"
+  pods "$FIX/pods.json" "$(platform)"
+  # The stub chainsaw leaves a pod list that is not JSON, so the reading taken
+  # after the suite fails while the one before it succeeded.
+  printf 'not json' >"$FIX/leak-after-aaa"
+  rc=0
+  out=$(cd "$FIX/root" && PATH="$FIX/bin:$PATH" COZY_LEAK_ALLOWLIST="$FIX/allow" bash "$LG_RUN" 2>&1) || rc=$?
+  [ "$rc" -eq 1 ]
+  echo "$out" | grep -Fq '::error title=leak-guard::suite=aaa the leak check could not read the cluster'
+  grep -Fq 'the leak guard could not read the cluster after this suite; see the leak-guard annotation for suite=aaa' "$FIX/root/chainsaw-report.xml"
+  [ "$(grep -c 'leaked-pods lines' "$FIX/root/chainsaw-report.xml")" -eq 0 ]
+  rm -rf "$FIX"
+}
+
+@test "the runner keeps the report of a suite whose directory name has a dot" {
+  new_fixture
+  mkdir -p "$FIX/root/app.v2"
+  : >"$FIX/root/app.v2/chainsaw-test.yaml"
+  printf '# none\n' >"$FIX/allow"
+  pods "$FIX/pods.json" "$(platform)"
+  (cd "$FIX/root" && PATH="$FIX/bin:$PATH" COZY_LEAK_ALLOWLIST="$FIX/allow" bash "$LG_RUN")
+  grep -Fq '<testcase name="app.v2" classname="" time="1.5"></testcase>' "$FIX/root/chainsaw-report.xml"
+  [ "$(grep -c 'chainsaw wrote no report' "$FIX/root/chainsaw-report.xml")" -eq 0 ]
+  rm -rf "$FIX"
+}
+
+@test "the runner passes a clean run" {
+  new_fixture
+  mkdir -p "$FIX/root/aaa"
+  : >"$FIX/root/aaa/chainsaw-test.yaml"
+  printf '# none\n' >"$FIX/allow"
+  pods "$FIX/pods.json" "$(platform)"
+  (cd "$FIX/root" && PATH="$FIX/bin:$PATH" COZY_LEAK_ALLOWLIST="$FIX/allow" bash "$LG_RUN")
+  head -n 1 "$FIX/root/chainsaw-report.xml" | grep -Fxq '<testsuites name="chainsaw-report" time="1.500000" tests="1">'
+  rm -rf "$FIX"
+}
+
+@test "the runner hands chainsaw exactly the suites and flags a single invocation would get" {
+  new_fixture
+  mkdir -p "$FIX/root/bbb" "$FIX/root/aaa" "$FIX/root/_lib"
+  : >"$FIX/root/aaa/chainsaw-test.yaml"
+  : >"$FIX/root/bbb/chainsaw-test.yaml"
+  printf '# none\n' >"$FIX/allow"
+  pods "$FIX/pods.json" "$(platform)"
+  # Empty selection: every directory under the root, in a fixed order, each to
+  # chainsaw, whose discovery finds nothing in _lib just as it would from `.`.
+  (cd "$FIX/root" && PATH="$FIX/bin:$PATH" COZY_LEAK_ALLOWLIST="$FIX/allow" bash "$LG_RUN" --set-string storageClass=local)
+  sed 's/ --report-path [^ ]* --report-name [^ ]* / /' "$FIX/chainsaw-calls" >"$FIX/calls"
+  printf 'test --set-string storageClass=local _lib\ntest --set-string storageClass=local aaa\ntest --set-string storageClass=local bbb\n' >"$FIX/want"
+  cmp "$FIX/want" "$FIX/calls"
+  # A selection is run as given, in the given order, and nothing else.
+  : >"$FIX/chainsaw-calls"
+  (cd "$FIX/root" && PATH="$FIX/bin:$PATH" COZY_LEAK_ALLOWLIST="$FIX/allow" bash "$LG_RUN" --set-string storageClass=local bbb aaa/)
+  sed 's/ --report-path [^ ]* --report-name [^ ]* / /' "$FIX/chainsaw-calls" >"$FIX/calls"
+  printf 'test --set-string storageClass=local bbb\ntest --set-string storageClass=local aaa\n' >"$FIX/want"
+  cmp "$FIX/want" "$FIX/calls"
+  rm -rf "$FIX"
+}
+
+@test "the runner refuses a tree whose top level holds a test no suite would run" {
+  new_fixture
+  mkdir -p "$FIX/root/aaa"
+  : >"$FIX/root/chainsaw-test.yaml"
+  printf '# none\n' >"$FIX/allow"
+  rc=0
+  (cd "$FIX/root" && PATH="$FIX/bin:$PATH" COZY_LEAK_ALLOWLIST="$FIX/allow" bash "$LG_RUN") || rc=$?
+  [ "$rc" -eq 2 ]
+  [ ! -f "$FIX/chainsaw-calls" ]
+  rm -rf "$FIX"
+}
+
+@test "the runner refuses a --set-string with no value" {
+  new_fixture
+  rc=0
+  out=$(PATH="$FIX/bin:$PATH" bash "$LG_RUN" --set-string 2>&1) || rc=$?
+  [ "$rc" -eq 2 ]
+  echo "$out" | grep -Fq -- '--set-string needs a value'
+  rm -rf "$FIX"
+}
+
+@test "the e2e target runs the suite through the leak-guarded runner" {
+  cmd=$(make -n -C "$HACK_DIR/../packages/core/testing" SANDBOX_NAME=test CHAINSAW_SUITES=kafka test-chainsaw)
+  printf '%s\n' "$cmd" | grep -Fq '&& ../e2e-chainsaw-run.sh --set-string storageClass='
+  [ "$(printf '%s\n' "$cmd" | grep -c 'chainsaw test')" -eq 0 ]
+  printf '%s\n' "$cmd" | grep -Fq ':-replicated}" kafka'
+}
diff --git a/hack/chainsaw-op-budgets.bats b/hack/chainsaw-op-budgets.bats
new file mode 100644
index 0000000000..9f95c64a66
--- /dev/null
+++ b/hack/chainsaw-op-budgets.bats
@@ -0,0 +1,353 @@
+#!/usr/bin/env bats
+# -----------------------------------------------------------------------------
+# Contract: a Chainsaw script op whose script carries its own waits gives those
+# waits room to fire first. When the op ceiling fires instead, Chainsaw kills
+# the shell, the script's own failure message never prints, and a cleanup trap
+# never runs (.chainsaw.yaml states the rule above its catch scripts).
+#
+# The gateway step is held by arithmetic: its polls are `timeout N` prefixes
+# and its cleanup deletes run under `timeout -k K N`, so their sum, kill
+# grace included, is readable from the text. kubectl's own `--timeout` is not
+# counted: it bounds only the wait after the delete request, not discovery or
+# the request itself. Only those two spellings are summed: a wait written any
+# other way, a `kubectl wait` or a sleep loop, is invisible to the sum. The
+# redis-tls step cannot be summed that way, because some of its
+# reads sit in loops and one loop polls, so it carries a step budget that
+# every kubectl call is clamped to, and the guard holds that budget under the
+# op. Its failure messages are checked by running the step's script against a
+# stubbed kubectl.
+#
+# CI runs this file under Bats. It stays compatible with the legacy cozytest.sh
+# translator, whose awk parser recognizes only @test blocks and a bare `}` on its
+# own line; a `}` at column zero gets `return 0` inserted ahead of it, so the
+# helpers below report through stdout only.
+#
+# Run with: bats hack/chainsaw-op-budgets.bats
+# -----------------------------------------------------------------------------
+
+load test_helper
+
+GATEWAY_SUITE="hack/e2e-chainsaw/gateway/chainsaw-test.yaml"
+GATEWAY_STEP="parent-child-and-route-drive-listener-set"
+REDIS_SUITE="hack/e2e-chainsaw/redis/chainsaw-test.yaml"
+REDIS_STEP="verify-tenant-ca-projection"
+COMPUTEPLANE_SUITE="hack/e2e-chainsaw/computeplane/chainsaw-test.yaml"
+
+# Seconds the gateway op keeps above its summed waits for what carries no cap
+# of its own: three applies and one label read.
+GATEWAY_UNCAPPED=60
+# Seconds the redis op keeps above its step budget: the kill grace on the last
+# clamped read, one 5s poll sleep, and the openssl and shell work between reads.
+REDIS_AFTER_BUDGET=30
+
+# Print the lines of the first `- script:` op inside step $2 of file $1, with
+# the op's own indentation, from `- script:` up to the next op or step.
+op_lines() {
+  awk -v step="$2" '
+    $0 ~ "^[[:space:]]*- name: " step "[[:space:]]*$" { instep = 1; next }
+    instep && !inop && /^[[:space:]]*- script:[[:space:]]*$/ {
+      match($0, /^[[:space:]]*/); opindent = RLENGTH; inop = 1; print; next
+    }
+    inop && /[^[:space:]]/ {
+      match($0, /^[[:space:]]*/)
+      if (RLENGTH <= opindent) exit
+    }
+    inop { print }
+    instep && /^---/ { exit }
+  ' "$1"
+}
+
+# Print the op timeout in seconds of the op in $1 (op_lines output), or
+# nothing when it states none in minutes or seconds.
+op_timeout_seconds() {
+  printf '%s\n' "$1" | awk '
+    /^[[:space:]]*timeout:[[:space:]]*[0-9]+m[[:space:]]*$/ { match($0, /[0-9]+/); print substr($0, RSTART, RLENGTH) * 60; exit }
+    /^[[:space:]]*timeout:[[:space:]]*[0-9]+s[[:space:]]*$/ { match($0, /[0-9]+/); print substr($0, RSTART, RLENGTH); exit }
+    /^[[:space:]]*content:/ { exit }
+  '
+}
+
+# Print the op's shell, or `sh`, the Chainsaw default, when it names none.
+op_shell() {
+  sh_name=$(printf '%s\n' "$1" | awk '
+    /^[[:space:]]*shell:[[:space:]]*[^[:space:]]+[[:space:]]*$/ { sub(/^[[:space:]]*shell:[[:space:]]*/, ""); sub(/[[:space:]]*$/, ""); print; exit }
+    /^[[:space:]]*content:/ { exit }
+  ')
+  printf '%s\n' "${sh_name:-sh}"
+}
+
+# Print the op's script, dedented, without the content key.
+op_content() {
+  printf '%s\n' "$1" | awk '
+    !incontent && /^[[:space:]]*content:[[:space:]]*\|[[:space:]]*$/ { match($0, /^[[:space:]]*/); keyindent = RLENGTH; incontent = 1; next }
+    incontent && /[^[:space:]]/ {
+      match($0, /^[[:space:]]*/)
+      if (RLENGTH <= keyindent) exit
+      if (!bodyindent) bodyindent = RLENGTH
+    }
+    incontent { print substr($0, bodyindent + 1) }
+  '
+}
+
+# Write a kubectl stub into directory $1 that answers the redis-tls step's
+# reads as a healthy cluster would. STUB_FAIL, when set, is a pattern matched
+# against the arguments: a matching call prints STUB_ERR to stderr and exits
+# STUB_RC instead, after printing STUB_OUT to stdout when that is set, from the
+# STUB_FAIL_FROM-th matching call on (default the first). STUB_PROJ_KEY=1 puts
+# PEM private key material into the projection. STUB_SLEEP_ON is a pattern
+# whose matching calls sleep STUB_SLEEP seconds first; the stub execs sleep,
+# so a timeout that kills it leaves no child holding the output pipe.
+write_redis_stubs() {
+  cat > "$1/kubectl" <<'STUB'
+#!/bin/sh
+args="$*"
+if [ -n "${STUB_SLEEP_ON:-}" ]; then
+  case "$args" in
+    $STUB_SLEEP_ON) exec sleep "${STUB_SLEEP:-60}" ;;
+  esac
+fi
+if [ -n "${STUB_FAIL:-}" ]; then
+  case "$args" in
+    $STUB_FAIL)
+      echo x >> "$(dirname "$0")/fail-matches"
+      if [ "$(wc -l < "$(dirname "$0")/fail-matches")" -ge "${STUB_FAIL_FROM:-1}" ]; then
+        [ -z "${STUB_OUT:-}" ] || echo "$STUB_OUT"
+        echo "${STUB_ERR:-error: stubbed failure}" >&2; exit "${STUB_RC:-1}"
+      fi ;;
+  esac
+fi
+cert_b64=$(printf 'CERT' | base64)
+proj_b64=$cert_b64
+if [ "${STUB_PROJ_KEY:-}" = 1 ]; then
+  proj_b64=$(printf 'CERT\n-----BEGIN PRIVATE KEY-----\nKEY\n' | base64 | tr -d '\n')
+fi
+case "$args" in
+  *"get secret redis-secure.tenant-ca -o go-template"*) printf 'ca.crt\n' ;;
+  *"get secret redis-secure.ca-cert -o go-template"*) printf 'ca.crt\n' ;;
+  *"get secret redis-secure.ca-tls -o go-template"*) printf 'ca.crt\ntls.crt\ntls.key\n' ;;
+  *"get secret redis-secure.ca-tls -o jsonpath"*) printf '%s' "$cert_b64" ;;
+  *"get secret redis-secure.tenant-ca -o jsonpath"*) printf '%s' "$proj_b64" ;;
+  *"get tenantsecret redis-secure.tenant-ca -o jsonpath"*) printf '%s' "$(printf -- '-----BEGIN CERTIFICATE-----' | base64)" ;;
+  *"get tenantsecret "*) echo "Error from server (NotFound): tenantsecrets \"x\" not found" >&2; exit 1 ;;
+  *"exec rfr-redis-secure-0 -c redis -- cat /tls/ca.crt"*) printf 'CERT\n' ;;
+  *"exec rfr-redis-secure-0 -c redis -- timeout 15 redis-cli --tls"*) printf 'PONG\n' ;;
+  *"exec rfr-redis-secure-0 -c redis -- timeout 15 redis-cli -h"*) printf 'I/O error\n'; exit 1 ;;
+  *"exec rfr-redis-secure-0 -c redis -- sh -c"*) printf 'role:master\n' ;;
+  *"exec rfr-redis-secure-1 -c redis -- sh -c"*) printf 'role:slave\nmaster_link_status:up\n' ;;
+  *"get pod -l app.kubernetes.io/component=sentinel"*) printf 'rfs-redis-secure-0' ;;
+  *"exec rfs-redis-secure-0 -c sentinel"*) printf '10.0.0.1\n6379\n' ;;
+  *) echo "kubectl stub: unexpected call: $args" >&2; exit 99 ;;
+esac
+STUB
+  cat > "$1/openssl" <<'STUB'
+#!/bin/sh
+cat >/dev/null
+echo "sha256 Fingerprint=AA"
+STUB
+  chmod +x "$1/kubectl" "$1/openssl"
+}
+
+# Run the redis-tls step's script, as its op's shell would, against the stubs
+# in $1. Prints the script's combined output and then `rc=<status>`. RS_BUDGET,
+# when set, replaces the step's budget so the clamp can be driven in seconds.
+run_redis_step() {
+  rs_op=$(op_lines "$REDIS_SUITE" "$REDIS_STEP")
+  rs_shell=$(op_shell "$rs_op")
+  op_content "$rs_op" > "$1/step.sh"
+  if [ -n "${RS_BUDGET:-}" ]; then
+    sed "s/^step_budget=[0-9]*\$/step_budget=${RS_BUDGET}/" "$1/step.sh" > "$1/step.budget"
+    if cmp -s "$1/step.sh" "$1/step.budget"; then echo "no step_budget line to override"; echo "rc=97"; return; fi
+    mv "$1/step.budget" "$1/step.sh"
+  fi
+  rs_rc=0
+  rs_out=$(cd "$1" && PATH="$1:$PATH" NAMESPACE=tenant-test STUB_FAIL="${STUB_FAIL:-}" STUB_FAIL_FROM="${STUB_FAIL_FROM:-1}" STUB_RC="${STUB_RC:-1}" STUB_ERR="${STUB_ERR:-}" STUB_OUT="${STUB_OUT:-}" STUB_SLEEP_ON="${STUB_SLEEP_ON:-}" STUB_SLEEP="${STUB_SLEEP:-}" STUB_PROJ_KEY="${STUB_PROJ_KEY:-}" "$rs_shell" "$1/step.sh" 2>&1) || rs_rc=$?
+  printf '%s\nrc=%s\n' "$rs_out" "$rs_rc"
+}
+
+@test "the gateway listener-set op outlasts the waits inside it" {
+    gw_op=$(op_lines "$GATEWAY_SUITE" "$GATEWAY_STEP")
+    [ -n "$gw_op" ] || { echo "no script op found in step $GATEWAY_STEP of $GATEWAY_SUITE" >&2; exit 1; }
+    gw_timeout=$(op_timeout_seconds "$gw_op")
+    case "$gw_timeout" in ''|*[!0-9]*) echo "the $GATEWAY_STEP op states no timeout in m or s (got '${gw_timeout}')" >&2; exit 1 ;; esac
+    gw_body=$(op_content "$gw_op")
+    gw_polls=$(printf '%s\n' "$gw_body" | grep -oE '^[[:space:]]*timeout +[0-9]+' | grep -oE '[0-9]+$' || true)
+    gw_n=$(printf '%s\n' "$gw_polls" | grep -c . || true)
+    [ "$gw_n" -ge 5 ] || { echo "found ${gw_n} capped polls in $GATEWAY_STEP, expected at least 5; the extractor is reading the wrong lines" >&2; exit 1; }
+    gw_deletes=$(printf '%s\n' "$gw_body" | grep -E '(^|[[:space:]])kubectl .* delete ' | grep -oE '(^|[[:space:]])timeout -k [0-9]+ [0-9]+ kubectl ' | awk '{ print $3 + $4 }' || true)
+    gw_sum=0
+    for gw_w in $gw_polls $gw_deletes; do gw_sum=$(( gw_sum + gw_w )); done
+    [ $(( gw_timeout - gw_sum )) -ge "$GATEWAY_UNCAPPED" ] || {
+        echo "the $GATEWAY_STEP op allows ${gw_timeout}s; its polls ($(printf '%s ' $gw_polls)) and cleanup deletes ($(printf '%s ' $gw_deletes)) may wait ${gw_sum}s" >&2
+        echo "it must keep ${GATEWAY_UNCAPPED}s above them for the uncapped applies and reads" >&2
+        exit 1
+    }
+}
+
+@test "every delete in the gateway listener-set cleanup is bounded as a whole" {
+    # A tenant delete blocks until its child namespaces drain, and a stalled
+    # API request blocks with no bound at all, so a delete not wrapped in an
+    # outer timeout is a wait the op sum above cannot see.
+    gw_op=$(op_lines "$GATEWAY_SUITE" "$GATEWAY_STEP")
+    gw_deletes=$(op_content "$gw_op" | grep -E '(^|[[:space:]])kubectl .* delete ' || true)
+    [ -n "$gw_deletes" ] || { echo "no kubectl delete found in $GATEWAY_STEP; the cleanup this test reasons about is gone" >&2; exit 1; }
+    gw_bad=$(printf '%s\n' "$gw_deletes" | grep -vE '(^|[[:space:]])timeout -k [0-9]+ [0-9]+ kubectl ' || true)
+    [ -z "$gw_bad" ] || { echo "deletes in $GATEWAY_STEP whose wait has no bound:" >&2; printf '%s\n' "$gw_bad" >&2; exit 1; }
+}
+
+@test "the gateway listener-set cleanup deletes the parent only once the child is gone" {
+    # A parent deleted while its child is still uninstalling wedges the
+    # parent's cleanup, so a child delete that ran into its bound must leave
+    # the parent alone.
+    gw_op=$(op_lines "$GATEWAY_SUITE" "$GATEWAY_STEP")
+    gw_order=$(op_content "$gw_op" | awk '
+      /^[[:space:]]*if timeout -k [0-9]+ [0-9]+ kubectl .* delete tenant rchild .*; then[[:space:]]*$/ { guarded = 1; next }
+      guarded && /[^[:space:]]/ { print (/delete tenant rparent/ ? "ok" : "unguarded"); exit }
+      /delete tenant rparent/ { print "unguarded"; exit }
+    ')
+    [ "$gw_order" = ok ] || { echo "the rparent delete in $GATEWAY_STEP does not sit directly under a successful rchild delete (got '${gw_order}')" >&2; exit 1; }
+}
+
+@test "a failed tenant delete in the gateway cleanup fails the step with its own error" {
+    # A tenant left in place is one every later suite inherits, so
+    # the step must say so and fail rather than pass with the leak.
+    gw_dir=$(mktemp -d)
+    op_content "$(op_lines "$GATEWAY_SUITE" "$GATEWAY_STEP")" | awk '/^cleanup\(\) \{/ { on = 1 } on { print } on && /^\}/ { exit }' > "$gw_dir/cleanup.sh"
+    grep -q 'delete tenant rchild' "$gw_dir/cleanup.sh" || { echo "no cleanup() with the rchild delete found in $GATEWAY_STEP" >&2; exit 1; }
+    # The stub fails the delete of the tenant named in STUB_FAIL_TENANT with a
+    # Forbidden error, which is not the bound firing, and logs every delete.
+    printf '%s\n' '#!/bin/sh' 'echo "$*" >> "$(dirname "$0")/calls"' 'case "$*" in *"delete tenant $STUB_FAIL_TENANT "*) echo "Error from server (Forbidden): stubbed" >&2; exit 3 ;; esac' > "$gw_dir/kubectl"
+    chmod +x "$gw_dir/kubectl"
+    for gw_tenant in rchild rparent; do
+        : > "$gw_dir/calls"
+        gw_rc=0
+        gw_out=$(PATH="$gw_dir:$PATH" STUB_FAIL_TENANT="$gw_tenant" sh -c '. "$1/cleanup.sh"; ns=tenant-test; cleanup' sh "$gw_dir" 2>&1) || gw_rc=$?
+        [ "$gw_rc" -ne 0 ] || { printf '%s\n' "$gw_out" >&2; echo "cleanup exited 0 with the $gw_tenant delete failed" >&2; exit 1; }
+        case "$gw_out" in *"Forbidden"*"$gw_tenant delete exited 3"*"rparent is left in tenant-test"*) ;; *) printf '%s\n' "$gw_out" >&2; echo "with the $gw_tenant delete failed, the output does not carry kubectl's error, its exit status and the tenant left behind" >&2; exit 1 ;; esac
+        if [ "$gw_tenant" = rchild ] && grep -q 'delete tenant rparent' "$gw_dir/calls"; then echo "the parent was deleted although the child delete failed" >&2; exit 1; fi
+    done
+    rm -rf "$gw_dir"
+}
+
+@test "the redis-tls projection op outlasts the step budget its reads are clamped to" {
+    rt_op=$(op_lines "$REDIS_SUITE" "$REDIS_STEP")
+    [ -n "$rt_op" ] || { echo "no script op found in step $REDIS_STEP of $REDIS_SUITE" >&2; exit 1; }
+    rt_timeout=$(op_timeout_seconds "$rt_op")
+    case "$rt_timeout" in ''|*[!0-9]*) echo "the $REDIS_STEP op states no timeout in m or s (got '${rt_timeout}')" >&2; exit 1 ;; esac
+    rt_body=$(op_content "$rt_op")
+    rt_budget=$(printf '%s\n' "$rt_body" | sed -n 's/^step_budget=\([0-9][0-9]*\)$/\1/p')
+    [ -n "$rt_budget" ] || {
+        echo "$REDIS_STEP sets no step_budget, so nothing bounds the sum of its reads below the ${rt_timeout}s op" >&2
+        echo "its kubectl call sites alone come to $(printf '%s\n' "$rt_body" | grep -cE '(^|[^[:alnum:]_])k -n ')" >&2
+        exit 1
+    }
+    [ $(( rt_timeout - rt_budget )) -ge "$REDIS_AFTER_BUDGET" ] || {
+        echo "the $REDIS_STEP op allows ${rt_timeout}s and the step budget is ${rt_budget}s" >&2
+        echo "it must keep ${REDIS_AFTER_BUDGET}s above the budget for the last read's kill grace and the work between reads" >&2
+        exit 1
+    }
+    # The budget bounds only the reads that go through k(). A bare kubectl
+    # outside it would add an uncapped read the arithmetic above never sees.
+    rt_bare=$(printf '%s\n' "$rt_body" | grep -vE '^[[:space:]]*#' | grep -nE '(^|[^[:alnum:]_-])kubectl([[:space:]]|$)' | grep -v '"\$k_left" kubectl' || true)
+    [ -z "$rt_bare" ] || { echo "kubectl calls in $REDIS_STEP that bypass the clamped k():" >&2; printf '%s\n' "$rt_bare" >&2; exit 1; }
+}
+
+@test "the redis-tls projection script passes against a healthy stub" {
+    # The positive control for the two failure tests below: without it, a
+    # stub that broke the script somewhere else would make them pass.
+    rt_dir=$(mktemp -d)
+    write_redis_stubs "$rt_dir"
+    rt_out=$(run_redis_step "$rt_dir")
+    case "$rt_out" in *"
+rc=0") ;; *) printf '%s\n' "$rt_out" >&2; echo "the step failed against a healthy stub" >&2; exit 1 ;; esac
+    rm -rf "$rt_dir"
+}
+
+@test "a failed replication exec reports its own error, not the 15s cap" {
+    rt_dir=$(mktemp -d)
+    write_redis_stubs "$rt_dir"
+    rt_out=$(STUB_FAIL='*exec rfr-redis-secure-1 -c redis -- sh -c*' STUB_RC=1 \
+      STUB_ERR='Error from server (Forbidden): pods "rfr-redis-secure-1" is forbidden' run_redis_step "$rt_dir")
+    case "$rt_out" in *"
+rc=0") printf '%s\n' "$rt_out" >&2; echo "the step passed with a forbidden exec" >&2; exit 1 ;; esac
+    case "$rt_out" in *"15s cap"*) printf '%s\n' "$rt_out" >&2; echo "a forbidden exec was reported as the 15s cap firing" >&2; exit 1 ;; esac
+    case "$rt_out" in *"rfr-redis-secure-1"*"exit 1"*"Forbidden"*) ;; *) printf '%s\n' "$rt_out" >&2; echo "the message does not carry the exit status and what the exec printed" >&2; exit 1 ;; esac
+    rm -rf "$rt_dir"
+}
+
+@test "a failed sentinel exec reports its own error, not the 15s cap" {
+    rt_dir=$(mktemp -d)
+    write_redis_stubs "$rt_dir"
+    rt_out=$(STUB_FAIL='*exec rfs-redis-secure-0 -c sentinel*' STUB_RC=1 \
+      STUB_ERR='command terminated with exit code 1' STUB_OUT='NOAUTH Authentication required.' run_redis_step "$rt_dir")
+    case "$rt_out" in *"
+rc=0") printf '%s\n' "$rt_out" >&2; echo "the step passed with a failed sentinel exec" >&2; exit 1 ;; esac
+    case "$rt_out" in *"15s cap"*) printf '%s\n' "$rt_out" >&2; echo "a refused sentinel command was reported as the 15s cap firing" >&2; exit 1 ;; esac
+    case "$rt_out" in *"command terminated with exit code 1"*"rfs-redis-secure-0 failed (exit 1): NOAUTH Authentication required."*) ;; *) printf '%s\n' "$rt_out" >&2; echo "the output does not carry what the exec wrote to both streams and its exit status" >&2; exit 1 ;; esac
+    rm -rf "$rt_dir"
+}
+
+@test "a failed Secret read is not reported as a wrong source name" {
+    # base64 -d exits 0 on empty input, so without pipefail the pipeline takes
+    # its status and the emptiness check below names the wrong cause.
+    rt_dir=$(mktemp -d)
+    write_redis_stubs "$rt_dir"
+    rt_out=$(STUB_FAIL='*get secret redis-secure.ca-tls -o jsonpath*' STUB_RC=1 \
+      STUB_ERR='Error from server (ServiceUnavailable): the server is currently unable to handle the request' run_redis_step "$rt_dir")
+    case "$rt_out" in *"
+rc=0") printf '%s\n' "$rt_out" >&2; echo "the step passed with a failed Secret read" >&2; exit 1 ;; esac
+    case "$rt_out" in *"source name or key is wrong"*) printf '%s\n' "$rt_out" >&2; echo "an API error was reported as a wrong source name" >&2; exit 1 ;; esac
+    case "$rt_out" in *"ServiceUnavailable"*) ;; *) printf '%s\n' "$rt_out" >&2; echo "the API error is missing from the output" >&2; exit 1 ;; esac
+    rm -rf "$rt_dir"
+}
+
+@test "the private-key check fails when the projection it reads carries a key" {
+    # The projection is read once above this check. A check that reads it
+    # again passes when that second read fails, because an empty read holds
+    # no key material: here the first read returns a key and the second one
+    # is refused.
+    rt_dir=$(mktemp -d)
+    write_redis_stubs "$rt_dir"
+    rt_out=$(STUB_PROJ_KEY=1 STUB_FAIL='*get secret redis-secure.tenant-ca -o jsonpath*' STUB_FAIL_FROM=2 STUB_RC=1 \
+      STUB_ERR='Error from server (ServiceUnavailable): the server is currently unable to handle the request' run_redis_step "$rt_dir")
+    case "$rt_out" in *"
+rc=0") printf '%s\n' "$rt_out" >&2; echo "the step passed with key material in the projection" >&2; exit 1 ;; esac
+    case "$rt_out" in *"projection carries PEM private key material"*) ;; *) printf '%s\n' "$rt_out" >&2; echo "the step did not fail on the key material" >&2; exit 1 ;; esac
+    rm -rf "$rt_dir"
+}
+
+@test "a read that finds the step budget spent does not run and says so" {
+    rt_dir=$(mktemp -d)
+    write_redis_stubs "$rt_dir"
+    rt_out=$(RS_BUDGET=0 run_redis_step "$rt_dir")
+    case "$rt_out" in *"
+rc=0") printf '%s\n' "$rt_out" >&2; echo "the step passed with its budget spent before the first read" >&2; exit 1 ;; esac
+    case "$rt_out" in *"step budget is spent, so this read did not run: -n tenant-test get secret redis-secure.tenant-ca"*) ;; *) printf '%s\n' "$rt_out" >&2; echo "the first read did not report the spent budget" >&2; exit 1 ;; esac
+    rm -rf "$rt_dir"
+}
+
+@test "a read is clamped to what the step budget has left and names itself" {
+    # A 2s budget against a read that would hang for 20s: the clamp has to
+    # end the read at the budget, not at the 30s per-read cap.
+    rt_dir=$(mktemp -d)
+    write_redis_stubs "$rt_dir"
+    rt_start=$(date +%s)
+    rt_out=$(RS_BUDGET=2 STUB_SLEEP_ON='*get secret redis-secure.tenant-ca -o go-template*' STUB_SLEEP=20 run_redis_step "$rt_dir")
+    rt_took=$(( $(date +%s) - rt_start ))
+    case "$rt_out" in *"
+rc=0") printf '%s\n' "$rt_out" >&2; echo "the step passed with a hung read" >&2; exit 1 ;; esac
+    case "$rt_out" in *"ran into its "[12]"s bound: -n tenant-test get secret redis-secure.tenant-ca"*) ;; *) printf '%s\n' "$rt_out" >&2; echo "the hung read did not name itself at the budget's bound" >&2; exit 1 ;; esac
+    [ "$rt_took" -lt 15 ] || { echo "the step took ${rt_took}s against a 2s budget; the read was not clamped" >&2; exit 1; }
+    rm -rf "$rt_dir"
+}
+
+@test "every kubectl in the computeplane scripts runs under its own timeout" {
+    # The suite's budget comments sum op ceilings and inner bounds, which hold
+    # only while no read can outlive them; kubectl's own --timeout does not
+    # count, it leaves the requests before the wait unbounded. Calls inside
+    # sourced helpers are the helpers' to bound and are not seen here.
+    cp_scripts=$(yq '.spec.steps[] | (.try[]?, .catch[]?, .finally[]?) | .script.content // ""' "$COMPUTEPLANE_SUITE")
+    printf '%s\n' "$cp_scripts" | grep -q 'kubectl ' || { echo "no kubectl found in the scripts of $COMPUTEPLANE_SUITE; the check reads nothing" >&2; exit 1; }
+    cp_bare=$(printf '%s\n' "$cp_scripts" | awk '/^[[:space:]]*#/ { next }
+      { line = " " $0; all = gsub(/[^-_[:alnum:]]kubectl /, "&", line); ok = gsub(/timeout (-k [0-9]+ )?([0-9]+|[$][(][(][^)]*[)][)]) kubectl /, "&", line); if (all != ok) print }')
+    [ -z "$cp_bare" ] || { printf '%s\n' "$cp_bare" >&2; echo "kubectl without a timeout in the computeplane scripts" >&2; exit 1; }
+}
diff --git a/hack/changelog-preserve.sh b/hack/changelog-preserve.sh
new file mode 100755
index 0000000000..4e0f901d6b
--- /dev/null
+++ b/hack/changelog-preserve.sh
@@ -0,0 +1,59 @@
+#!/bin/sh
+# Usage: changelog-preserve.sh <staging-branch> <version> <outfile>
+#
+# Rescue an existing changelog from a staging branch that is about to be rebuilt.
+#
+# promote-rc.yaml reconstructs release-X.Y.Z from the rc tree on every dispatch
+# and force-pushes it. Anything committed onto that branch in the meantime is
+# discarded — including the two things most worth keeping: a changelog a
+# maintainer wrote by hand (the documented recovery when generation fails) and an
+# earlier dispatch's reviewed output. Losing either to a retry silently replaces
+# human-edited release notes with a fresh AI run, or with nothing at all.
+#
+# Run BEFORE `git checkout -B <staging-branch>`, from inside the repo, with
+# `origin` configured. On success the changelog is written to <outfile> for the
+# caller to restore after the reset.
+#
+# Best-effort by contract: a missing branch, a branch without a changelog, and an
+# unreachable remote are all "nothing to preserve" (exit 1), never a hard error.
+# The caller is mid-promotion and must not be wedged by this.
+#
+# Exit 0 = preserved, <outfile> written. Exit 1 = nothing to preserve.
+
+set -eu
+
+BRANCH="${1:?usage: changelog-preserve.sh <staging-branch> <version> <outfile>}"
+VERSION="${2:?usage: changelog-preserve.sh <staging-branch> <version> <outfile>}"
+OUTFILE="${3:?usage: changelog-preserve.sh <staging-branch> <version> <outfile>}"
+
+CL="docs/changelogs/v${VERSION}.md"
+
+# `git fetch <branch>` fails when the branch does not exist on the remote, which
+# is the ordinary first-promotion case — not an error worth reporting loudly.
+if ! git fetch -q origin "$BRANCH" 2>/dev/null; then
+  echo "No remote branch ${BRANCH}; nothing to preserve." >&2
+  exit 1
+fi
+
+if ! git cat-file -e "FETCH_HEAD:${CL}" 2>/dev/null; then
+  echo "Branch ${BRANCH} carries no ${CL}; nothing to preserve." >&2
+  exit 1
+fi
+
+# An empty file on the branch is not worth carrying over: it would suppress
+# generation (the caller treats a present file as authoritative) while being
+# useless as release notes. Let it be rebuilt instead.
+if [ ! -s "$OUTFILE" ] && ! git show "FETCH_HEAD:${CL}" > "$OUTFILE" 2>/dev/null; then
+  echo "Could not read ${CL} from ${BRANCH}; nothing to preserve." >&2
+  rm -f "$OUTFILE"
+  exit 1
+fi
+
+if [ ! -s "$OUTFILE" ]; then
+  echo "${CL} on ${BRANCH} is empty; nothing to preserve." >&2
+  rm -f "$OUTFILE"
+  exit 1
+fi
+
+echo "Preserved ${CL} from ${BRANCH} ($(wc -l < "$OUTFILE" | tr -d ' ') lines)." >&2
+exit 0
diff --git a/hack/check-applicationdefinition-crd-ordering.bats b/hack/check-applicationdefinition-crd-ordering.bats
new file mode 100644
index 0000000000..b9ea8aa34a
--- /dev/null
+++ b/hack/check-applicationdefinition-crd-ordering.bats
@@ -0,0 +1,64 @@
+#!/usr/bin/env bats
+# Chart-wide invariant for packages/core/platform/sources:
+#
+# Every *-application PackageSource that ships a `system/*-rd` component renders
+# an ApplicationDefinition (cozystack.io/v1alpha1). That CRD is installed by the
+# application-definition-crd component of cozystack.cozystack-engine. Without an
+# explicit `dependsOn: cozystack.cozystack-engine`, a fresh install where Flux
+# happens to reconcile the *-application source before cozystack-engine fails to
+# render with `no matches for kind "ApplicationDefinition" in version
+# "cozystack.io/v1alpha1"`, which cascades into a broad install timeout.
+#
+# This invariant is generic: any future *-application source that adds a
+# system/*-rd component but forgets the cozystack-engine edge fails here, even
+# though the individual source files are not enumerated below.
+#
+# Requires: yq (mikefarah v4+), jq. Both are available on the project's CI
+# runners and on the maintainer workstation.
+
+load test_helper
+
+REPO_ROOT="$(cd "$(dirname "${BATS_TEST_FILENAME:-$0}")/.." && pwd)"
+SOURCES_DIR="$REPO_ROOT/packages/core/platform/sources"
+
+@test "every PackageSource with a system/*-rd component dependsOn cozystack.cozystack-engine" {
+  command -v yq >/dev/null || { echo "yq (mikefarah v4+) is required" >&2; exit 1; }
+  command -v jq >/dev/null || { echo "jq is required" >&2; exit 1; }
+
+  # yq streams one JSON object per source document; jq -s slurps the stream so
+  # every PackageSource variant can be evaluated as a single collection.
+  json="$(yq --output-format=json eval-all '.' "$SOURCES_DIR"/*.yaml)"
+
+  # A "-rd variant" is any variant whose components include a system/*-rd path.
+  rd_total="$(printf '%s' "$json" | jq -s '
+    [ .[]
+      | select(.kind == "PackageSource")
+      | (.spec.variants // [])[]
+      | select((.components // []) | any(.path // "" | test("^system/[a-z0-9-]+-rd$")))
+    ] | length
+  ')"
+
+  # Guard against a vacuous pass (empty glob / yq breakage): the platform ships
+  # many -rd sources, so discovering zero means this test itself is broken.
+  [ "$rd_total" -ge 1 ] || { echo "Discovered zero system/*-rd variants under $SOURCES_DIR - test is misconfigured" >&2; exit 1; }
+
+  offenders="$(printf '%s' "$json" | jq -rs '
+    [ .[]
+      | select(.kind == "PackageSource")
+      | .metadata.name as $name
+      | (.spec.variants // [])[]
+      | select((.components // []) | any(.path // "" | test("^system/[a-z0-9-]+-rd$")))
+      | select(((.dependsOn // []) | any(. == "cozystack.cozystack-engine")) | not)
+      | "\($name) [variant: \(.name)]"
+    ] | .[]
+  ')"
+
+  if [ -n "$offenders" ]; then
+    echo "PackageSources with a system/*-rd component but missing the cozystack.cozystack-engine dependsOn edge:" >&2
+    printf '%s\n' "$offenders" >&2
+    echo "Fix: add '- cozystack.cozystack-engine' to each listed variant's dependsOn (mirror sources/gateway-application.yaml)." >&2
+    exit 1
+  fi
+
+  echo "Invariant holds: all $rd_total system/*-rd PackageSource variant(s) dependsOn cozystack.cozystack-engine"
+}
diff --git a/hack/check-commit-trailers.bats b/hack/check-commit-trailers.bats
new file mode 100644
index 0000000000..4818c09810
--- /dev/null
+++ b/hack/check-commit-trailers.bats
@@ -0,0 +1,522 @@
+#!/usr/bin/env bats
+# -----------------------------------------------------------------------------
+# Unit tests for hack/check-commit-trailers.sh.
+#
+# Each test builds a throwaway git repository, writes commits with the message
+# shape under test, and runs the checker over base..HEAD — the same range shape
+# the workflow computes from the merge base. Real commits rather than a canned
+# list, because merge commits and the trailer block are git's behaviour, not the
+# checker's.
+#
+# cozytest.sh's awk parser recognizes only @test blocks and a bare `}` on its
+# own line; there is no bats `run` or `$status`. Assertions are direct shell
+# tests, and an expected failure is written as `if CHECK ...; then ... exit 1`.
+# Each test runs in its own subshell, so the `cd` into the fixture does not leak.
+# -----------------------------------------------------------------------------
+
+load test_helper
+
+REPO_ROOT="$(cd "$(dirname "${BATS_TEST_FILENAME:-$0}")/.." && pwd)"
+CHECK="$REPO_ROOT/hack/check-commit-trailers.sh"
+
+# A repository with one seed commit on `base`, left as the current directory.
+# Signing and hooks are off so the fixture behaves the same on a maintainer's
+# machine as on a runner: core.hooksPath is inherited from the global config,
+# and a global commit-msg hook would otherwise rewrite the messages under test.
+make_repo() {
+    dir="$(mktemp -d)"
+    cd "$dir"
+    git init -q .
+    git config user.email ci@example.invalid
+    git config user.name CI
+    git config commit.gpgsign false
+    git config tag.gpgsign false
+    git config core.hooksPath /dev/null
+    echo seed > file
+    git add file
+    git commit -q -m "seed"
+    git branch -f base HEAD
+    git tag start
+}
+
+# Message on stdin. A merge test moves `base`, so ranges are taken from the
+# `start` tag, which nothing moves.
+commit() {
+    echo change >> file
+    git add file
+    git commit -q -F -
+}
+
+# Last line of a test body rather than a trap, which the runners forbid: both
+# set -e, so a failing test never reaches this and its repository survives for
+# inspection, which is what a failed test wants.
+cleanup() {
+    cd /
+    rm -rf "$dir"
+}
+
+# The three `git config` lines in make_repo are there because a contributor's
+# global configuration reaches a fresh repository, and a runner carries no such
+# configuration: a guard that goes missing stays green in CI and turns red only
+# on the machine of whoever signs their commits or tags, which is how tag.gpgsign
+# came to be missing in the first place. This test brings the hostile
+# configuration with it, so the guards are held by the suite rather than by
+# whichever machine happens to run it. gpg.program is a command that always
+# fails, so an attempt to sign is a deterministic error rather than a question
+# about which keys the host holds.
+@test "make_repo holds against a hostile global configuration" {
+    home="$(mktemp -d)"
+    mkdir -p "$home/hooks"
+    cat > "$home/hooks/commit-msg" <<'HOOK'
+#!/bin/sh
+echo "rewritten by a global hook" > "$1"
+HOOK
+    chmod +x "$home/hooks/commit-msg"
+    cat > "$home/.gitconfig" <<CONFIG
+[user]
+    signingkey = 0000000000000000
+[commit]
+    gpgsign = true
+[tag]
+    gpgsign = true
+[gpg]
+    program = false
+[core]
+    hooksPath = $home/hooks
+CONFIG
+    export HOME="$home"
+    export XDG_CONFIG_HOME="$home/.config"
+    unset GIT_CONFIG_GLOBAL GIT_CONFIG_SYSTEM
+
+    make_repo
+
+    # tag.gpgsign: a signed tag is an object of its own, a lightweight one
+    # resolves straight to the commit it names.
+    if [ "$(git cat-file -t "$(git rev-parse start)")" != commit ]; then
+        echo "expected start to be a lightweight tag" >&2
+        exit 1
+    fi
+    # core.hooksPath: the global commit-msg hook would have rewritten the
+    # message, and commit.gpgsign would have failed the commit outright.
+    if [ "$(git log -1 --format=%s base)" != seed ]; then
+        echo "expected the global commit-msg hook to be inert" >&2
+        exit 1
+    fi
+
+    cleanup
+    rm -rf "$home"
+}
+
+@test "accepts the documented Assisted-by: LLM trailer" {
+    make_repo
+    commit <<'EOF'
+feat(ci): add a thing
+
+Signed-off-by: CI <ci@example.invalid>
+Assisted-by: LLM
+EOF
+    "$CHECK" base..HEAD
+    cleanup
+}
+
+@test "accepts a commit with no trailer at all" {
+    make_repo
+    commit <<'EOF'
+fix(ci): repair a thing
+
+A body with no trailer block, because no model took part.
+EOF
+    "$CHECK" base..HEAD
+    cleanup
+}
+
+@test "fails on an empty range instead of reporting OK" {
+    # The pre-push recipe resolves origin/main..HEAD against the working
+    # directory's HEAD, so an agent whose shell sits in a different checkout
+    # lands on an empty range. A run that examined nothing must not read as a
+    # clean one; grepping the message, not just the exit code, pins that the
+    # verdict names the empty case rather than dropping the OK line by accident.
+    make_repo
+    if out="$("$CHECK" base..HEAD 2>&1)"; then
+        echo "expected an empty range to fail" >&2
+        exit 1
+    fi
+    printf '%s\n' "$out" | grep -q "empty"
+    if printf '%s\n' "$out" | grep -q "Commit trailers OK"; then
+        echo "an empty range still printed the OK verdict" >&2
+        exit 1
+    fi
+    cleanup
+}
+
+@test "rejects a vendor-named attribution trailer and names the commit" {
+    make_repo
+    commit <<'EOF'
+feat(ci): add a thing
+
+Signed-off-by: CI <ci@example.invalid>
+Assisted-By: Sonnet <noreply@example.invalid>
+EOF
+    sha="$(git rev-parse --short HEAD)"
+    if out="$("$CHECK" base..HEAD 2>&1)"; then
+        echo "expected a vendor-named trailer to fail" >&2
+        exit 1
+    fi
+    printf '%s\n' "$out" | grep -q "$sha"
+    printf '%s\n' "$out" | grep -q "must be exactly LLM"
+    printf '%s\n' "$out" | grep -q "Assisted-by: LLM"
+    cleanup
+}
+
+@test "rejects an attribution value that is not LLM even without a vendor name" {
+    make_repo
+    commit <<'EOF'
+feat(ci): add a thing
+
+Assisted-by: AI
+EOF
+    if "$CHECK" base..HEAD >/dev/null 2>&1; then
+        echo "expected Assisted-by: AI to fail" >&2
+        exit 1
+    fi
+    cleanup
+}
+
+@test "ignores the casing of the trailer key but not of the value" {
+    make_repo
+    commit <<'EOF'
+feat(ci): add a thing
+
+Assisted-By: LLM
+EOF
+    "$CHECK" base..HEAD
+    commit <<'EOF'
+feat(ci): add another thing
+
+Assisted-by: llm
+EOF
+    if "$CHECK" base..HEAD >/dev/null 2>&1; then
+        echo "expected a lowercase value to fail" >&2
+        exit 1
+    fi
+    cleanup
+}
+
+@test "rejects two attribution trailers on one commit" {
+    make_repo
+    commit <<'EOF'
+feat(ci): add a thing
+
+Assisted-by: LLM
+Assisted-by: LLM
+EOF
+    if out="$("$CHECK" base..HEAD 2>&1)"; then
+        echo "expected a duplicated trailer to fail" >&2
+        exit 1
+    fi
+    printf '%s\n' "$out" | grep -q "at most one is accepted"
+    cleanup
+}
+
+@test "rejects a session trailer" {
+    make_repo
+    commit <<'EOF'
+feat(ci): add a thing
+
+Assisted-by: LLM
+Claude-Session: https://example.invalid/s/abc123
+EOF
+    if out="$("$CHECK" base..HEAD 2>&1)"; then
+        echo "expected a session trailer to fail" >&2
+        exit 1
+    fi
+    printf '%s\n' "$out" | grep -q "session trailer is not accepted"
+    cleanup
+}
+
+@test "rejects a link to an assistant session anywhere in the message" {
+    make_repo
+    commit <<'EOF'
+feat(ci): add a thing
+
+Worked out in https://claude.ai/chat/00000000-0000-0000-0000-000000000000
+EOF
+    if out="$("$CHECK" base..HEAD 2>&1)"; then
+        echo "expected a session link to fail" >&2
+        exit 1
+    fi
+    printf '%s\n' "$out" | grep -q "links to an assistant session"
+    cleanup
+}
+
+@test "reads an assistant host as prose when it is not a URL" {
+    make_repo
+    commit <<'EOF'
+docs(agents): say where the rule comes from
+
+The trailer rule applies to every assistant, chatgpt.com included.
+EOF
+    "$CHECK" base..HEAD
+    cleanup
+}
+
+@test "passes a merge commit that carries no trailer of its own" {
+    make_repo
+    git checkout -q -b side
+    commit <<'EOF'
+feat(ci): add a thing on a side branch
+
+Assisted-by: LLM
+EOF
+    git checkout -q base
+    commit <<'EOF'
+fix(ci): move base along
+EOF
+    git merge -q --no-ff --no-edit side
+    n="$(git rev-list --count start..HEAD)"
+    [ "$n" -ge 3 ]
+    git rev-list --min-parents=2 start..HEAD | grep -q .
+    "$CHECK" start..HEAD
+    cleanup
+}
+
+@test "rejects a bad trailer carried by a merge commit itself" {
+    make_repo
+    git checkout -q -b side
+    commit <<'EOF'
+feat(ci): add a thing on a side branch
+EOF
+    git checkout -q base
+    git merge -q --no-ff -m "Merge branch 'side'
+
+Assisted-By: Sonnet <noreply@example.invalid>" side
+    if "$CHECK" start..HEAD >/dev/null 2>&1; then
+        echo "expected a merge commit with a bad trailer to fail" >&2
+        exit 1
+    fi
+    cleanup
+}
+
+@test "reports every offending commit in the range, not just the first" {
+    make_repo
+    commit <<'EOF'
+feat(ci): first
+
+Assisted-By: Sonnet <noreply@example.invalid>
+EOF
+    first="$(git rev-parse --short HEAD)"
+    commit <<'EOF'
+feat(ci): second
+
+Assisted-By: Opus <noreply@example.invalid>
+EOF
+    second="$(git rev-parse --short HEAD)"
+    if out="$("$CHECK" base..HEAD 2>&1)"; then
+        echo "expected two bad commits to fail" >&2
+        exit 1
+    fi
+    printf '%s\n' "$out" | grep -q "$first"
+    printf '%s\n' "$out" | grep -q "$second"
+    cleanup
+}
+
+@test "requires a range argument" {
+    # Grepping the usage line, not just the exit code: with the guard removed
+    # an empty range makes git fail anyway, so the status alone proves nothing.
+    make_repo
+    if out="$("$CHECK" 2>&1)"; then
+        echo "expected a missing range to fail" >&2
+        exit 1
+    fi
+    printf '%s\n' "$out" | grep -q '^usage: '
+    cleanup
+}
+
+@test "fails on a range git cannot resolve instead of reporting success" {
+    # A misspelled remote, or a clone that never fetched origin/main, is the
+    # shape a developer meets when running this by hand. Walking zero commits
+    # and printing OK would be the worst possible answer.
+    make_repo
+    if "$CHECK" no-such-ref..HEAD >/dev/null 2>&1; then
+        echo "expected an unresolvable range to fail" >&2
+        exit 1
+    fi
+    cleanup
+}
+
+@test "accepts the documented form in a message with CRLF line endings" {
+    # Trailing whitespace is stripped from a message under git's default
+    # cleanup, but --cleanup=verbatim keeps it, and so does a message written by
+    # an editor on Windows. The carriage return must not turn LLM into LLM\r.
+    make_repo
+    echo change >> file
+    git add file
+    printf 'feat(ci): add a thing\r\n\r\nAssisted-by: LLM\r\n' \
+        | git commit -q --cleanup=verbatim -F -
+    git log -1 --format=%B | grep -q "$(printf 'LLM\r')"
+    "$CHECK" start..HEAD
+    cleanup
+}
+
+@test "rejects a continuation line folded into the attribution trailer" {
+    # git reads the two lines as the single value "LLM continuation", which is
+    # not LLM. Reading them as two lines would accept it.
+    make_repo
+    commit <<'EOF'
+feat(ci): add a thing
+
+Assisted-by: LLM
+ continuation
+EOF
+    git log -1 --format=%B | git interpret-trailers --parse \
+        | grep -qx 'Assisted-by: LLM continuation'
+    if "$CHECK" start..HEAD >/dev/null 2>&1; then
+        echo "expected a folded continuation to fail" >&2
+        exit 1
+    fi
+    cleanup
+}
+
+@test "rejects a generation byline naming the tool" {
+    make_repo
+    commit <<'EOF'
+feat(ci): add a thing
+
+🤖 Generated with [Some Tool](https://example.invalid/tool)
+EOF
+    if out="$("$CHECK" start..HEAD 2>&1)"; then
+        echo "expected a generation byline to fail" >&2
+        exit 1
+    fi
+    printf '%s\n' "$out" | grep -q "generation byline"
+    cleanup
+}
+
+@test "leaves ordinary prose about generated files alone" {
+    # Both shapes are real lines from this repository's history, and both keep
+    # their small g. Failing either one would make the byline rule unusable.
+    make_repo
+    commit <<'EOF'
+feat(ci): add a thing
+
+Regenerated with cozyvalues-gen v1.5.0, which the CI pin has moved past. The
+README in packages/apps/redis was
+generated with cozyvalues-gen 1.5.0 while CI pins 1.6.0, and the older
+version orders the table differently.
+EOF
+    "$CHECK" start..HEAD
+    cleanup
+}
+
+@test "leaves the trailer keys it does not judge alone" {
+    # These block at review, and the script says why it does not decide them:
+    # telling a model from a person in a Co-authored-by line needs a list of
+    # model names, and Generated-by has never appeared here. A later change
+    # that starts failing these is a scope change, not a fix.
+    make_repo
+    commit <<'EOF'
+feat(ci): add a thing
+
+Co-authored-by: Sonnet <noreply@example.invalid>
+Generated-by: Sonnet
+EOF
+    "$CHECK" start..HEAD
+    cleanup
+}
+
+@test "matches a session link whose scheme and host are uppercase" {
+    make_repo
+    commit <<'EOF'
+feat(ci): add a thing
+
+See HTTPS://CLAUDE.AI/chat/00000000-0000-0000-0000-000000000000
+EOF
+    if "$CHECK" start..HEAD >/dev/null 2>&1; then
+        echo "expected an uppercase session link to fail" >&2
+        exit 1
+    fi
+    cleanup
+}
+
+@test "leaves a matching host that is only userinfo alone" {
+    # The host of this URL is somewhere.example, not chatgpt.com.
+    make_repo
+    commit <<'EOF'
+feat(ci): add a thing
+
+Reported at https://chatgpt.com@somewhere.example/path
+EOF
+    "$CHECK" start..HEAD
+    cleanup
+}
+
+@test "matches a session link carrying userinfo of its own" {
+    # Here the host really is claude.ai; user@ in front of it changes nothing.
+    make_repo
+    commit <<'EOF'
+feat(ci): add a thing
+
+Worked out in https://user@claude.ai/chat/00000000-0000-0000-0000-000000000000
+EOF
+    if "$CHECK" start..HEAD >/dev/null 2>&1; then
+        echo "expected a session link with userinfo to fail" >&2
+        exit 1
+    fi
+    cleanup
+}
+
+@test "reads a space before the separator as git does" {
+    make_repo
+    commit <<'EOF'
+feat(ci): add a thing
+
+Assisted-by : Sonnet <noreply@example.invalid>
+EOF
+    git log -1 --format=%B | git interpret-trailers --parse \
+        | grep -q '^Assisted-by: Sonnet'
+    if "$CHECK" start..HEAD >/dev/null 2>&1; then
+        echo "expected a spaced key to fail" >&2
+        exit 1
+    fi
+    cleanup
+}
+
+@test "leaves a documentation link on a vendor site alone" {
+    # cursor.com and gemini.google.com serve manuals and pricing, not only
+    # transcripts. A citation must not turn a pull request red.
+    make_repo
+    commit <<'EOF'
+docs(agents): cite the tooling
+
+Background at https://cursor.com/docs and https://gemini.google.com/about
+EOF
+    "$CHECK" start..HEAD
+    cleanup
+}
+
+@test "leaves a lookalike host alone" {
+    # notchatgpt.com and chatgpt.com.evil belong to somebody else. Matching a
+    # substring of the host would hand them a failing check they cannot fix.
+    make_repo
+    commit <<'EOF'
+feat(ci): add a thing
+
+Reported at https://notchatgpt.com/x and https://chatgpt.com.evil/y
+EOF
+    "$CHECK" start..HEAD
+    cleanup
+}
+
+@test "matches a session link served from a subdomain" {
+    make_repo
+    commit <<'EOF'
+feat(ci): add a thing
+
+See https://www.chatgpt.com/share/00000000-0000-0000-0000-000000000000
+EOF
+    if "$CHECK" start..HEAD >/dev/null 2>&1; then
+        echo "expected a subdomain session link to fail" >&2
+        exit 1
+    fi
+    cleanup
+}
diff --git a/hack/check-commit-trailers.sh b/hack/check-commit-trailers.sh
new file mode 100755
index 0000000000..4957d00e0b
--- /dev/null
+++ b/hack/check-commit-trailers.sh
@@ -0,0 +1,157 @@
+#!/usr/bin/env bash
+# Reject commit messages that break the attribution rules in
+# docs/agents/contributing.md, "AI Agent Attribution":
+#
+#   - an attribution trailer (`Assisted-by:`, key matched case-insensitively)
+#     carries the value `LLM` and nothing else, and appears at most once;
+#   - no trailer names an assistant session, and no message links to one;
+#   - no line is a generation byline naming the tool.
+#
+# All three are review blockers decided by the text alone, which is exactly the
+# kind of thing a human should not be spending a review round on.
+#
+# Two shapes from that section are left to the reviewer, each for a measured
+# reason rather than a guessed one:
+#
+#   - a model named in a `Co-authored-by:` line needs a list of model names to
+#     tell from a person, and a list either misses the model released next month
+#     or fires on somebody's colleague. Most of the 771 `Co-authored-by:` lines
+#     on main name a model, so the list would decide a lot of pull requests;
+#   - a `Generated-by:` trailer has never appeared here at all, and a rule with
+#     no subject is a rule nobody maintains.
+#
+# A check that fires on something legitimate gets switched off, and then it
+# guards nothing, so every rule above was run over the whole of main before it
+# was written down — 6062 commits at the time, 1300 rejected, every one of them
+# a true positive.
+#
+# Lines are read one at a time rather than through git's trailer parser, which
+# reads only the last paragraph. A bad trailer with a paragraph after it is
+# invisible to that parser and caught here. The cost is that a message quoting
+# a rejected form as an example is rejected too.
+#
+# Usage: hack/check-commit-trailers.sh <range>   e.g. origin/main..HEAD
+#
+# Every commit in the range is checked as written; nothing is required of a
+# commit, so a message with no trailer at all — a merge commit among them —
+# passes. Only a trailer that exists and is wrong fails. An empty range fails:
+# a check that examined nothing must not read as one that found nothing wrong.
+set -euo pipefail
+
+RANGE="${1:-}"
+if [ -z "$RANGE" ]; then
+  echo "usage: hack/check-commit-trailers.sh <range>" >&2
+  exit 2
+fi
+
+# Hosts that serve transcripts rather than documentation. Of the three, only
+# claude.ai has turned up in a commit message here so far, in two of them; the
+# others are the same shape and cost nothing to carry. A vendor that also serves
+# docs and pricing from its main domain is left out on purpose: a link to a
+# manual is not a session, and a false red on a citation is a red nobody can
+# argue with. The general shape is covered by the trailer key instead (any
+# `*-Session:` key), which is how a session gets recorded in the first place.
+#
+# Matched as a URL only, and on a whole host: prose naming a host reads as
+# prose, and notchatgpt.com and chatgpt.com.evil belong to somebody else. The
+# closing class excludes a dot, so a bare host at the end of a sentence
+# ("see https://claude.ai.") is not matched — the cost of keeping the lookalike
+# hole shut. A real session link carries a path and matches on the slash.
+# Lowercase, because the line is lowercased before the match. The optional
+# leading group is userinfo, so https://user@claude.ai/x is still claude.ai;
+# the closing class excludes "@" so that https://chatgpt.com@somewhere.example/x,
+# whose actual host is somewhere.example, is not.
+SESSION_URL='https?://([^/@[:space:]]*@)?([a-z0-9-]+\\.)*(claude\\.ai|chatgpt\\.com|chat\\.openai\\.com)([^a-z0-9.@-]|$)'
+
+# Resolved up front rather than inside the `for` list: a command substitution
+# there is not a command `set -e` looks at, so an unresolvable range would walk
+# zero commits and report success.
+SHAS="$(git rev-list "$RANGE")"
+
+# An empty range is not a pass. The pre-push recipe in docs/agents/contributing.md
+# resolves origin/main..HEAD against the working directory's HEAD, so an agent
+# whose shell sits in a checkout at or behind the base resolves it to nothing
+# here, and an "OK" over zero commits is a green nobody can tell from a real one.
+# (A checkout on an unrelated branch resolves to that branch's commits instead,
+# not to nothing — a wrong-branch check this guard does not claim to catch.) The CI
+# path stays sound: it builds the range from the merge base and the head SHA of a
+# pull request, which GitHub refuses to open with no commits between the two. It
+# does go empty once the base branch has absorbed the head's commits, but only
+# after the PR has nothing left to merge, where a red trailer check is harmless.
+if [ -z "$SHAS" ]; then
+  echo "check-commit-trailers: range '$RANGE' is empty; no commits were checked" >&2
+  exit 1
+fi
+
+bad=0
+for sha in $SHAS; do
+  findings="$(
+    git log -1 --format=%B "$sha" | awk -v url="$SESSION_URL" '
+      {
+        line = $0
+        sub(/\r$/, "", line)
+        # git folds an indented line into the value of the trailer above it, so
+        # "Assisted-by: LLM" followed by " anything" is the value LLM anything.
+        if (folds && line ~ /^[ \t]+[^ \t]/) {
+          print "  " line "\n      continues the attribution trailer above; the value must be exactly LLM"
+          next
+        }
+        folds = 0
+        if (match(line, /^[^:]+:/)) {
+          key = tolower(substr(line, 1, RLENGTH - 1))
+          # git accepts a space before the separator and reads the key without
+          # it, so "Assisted-by : x" is the same trailer as "Assisted-by: x".
+          sub(/[ \t]+$/, "", key)
+          val = substr(line, RLENGTH + 1)
+          sub(/^[ \t]+/, "", val)
+          sub(/[ \t]+$/, "", val)
+          if (key == "assisted-by") {
+            seen++
+            folds = 1
+            if (val != "LLM")
+              print "  " line "\n      attribution trailer value must be exactly LLM"
+          }
+          if (key ~ /-session$/)
+            print "  " line "\n      session trailer is not accepted"
+        }
+        # Lowercased for the match because a scheme and a host are
+        # case-insensitive; the line is printed as written.
+        if (tolower(line) ~ url)
+          print "  " line "\n      links to an assistant session"
+        # A generation byline, as opposed to an ordinary sentence: the first
+        # letters on the line are a capitalised "Generated with", after any
+        # emoji. That is 24 lines on main, all of them the same tool byline,
+        # and no false positive — "Regenerated with cozyvalues-gen" and a
+        # sentence wrapping onto "generated with ..." both keep their small g.
+        if (line ~ /^[^A-Za-z]*Generated with /)
+          print "  " line "\n      generation byline names the tool; use one Assisted-by: LLM trailer"
+      }
+      END {
+        if (seen > 1)
+          print "      " seen " attribution trailers; at most one is accepted"
+      }
+    '
+  )"
+  if [ -n "$findings" ]; then
+    bad=$((bad + 1))
+    git log -1 --format='%h %s' "$sha"
+    printf '%s\n' "$findings"
+  fi
+done
+
+if [ "$bad" -gt 0 ]; then
+  cat >&2 <<'EOF'
+
+Rejected commits above. Attribution discloses that a model took part; it does
+not say which one, and it never carries a link to the session. The accepted
+form is one line, next to Signed-off-by:
+
+    Assisted-by: LLM
+
+Reword with `git rebase --interactive` and force-push the branch.
+See docs/agents/contributing.md, "AI Agent Attribution".
+EOF
+  exit 1
+fi
+
+echo "Commit trailers OK: $(git rev-list --count "$RANGE") commit(s) checked."
diff --git a/hack/check-gpu-operator-variants.bats b/hack/check-gpu-operator-variants.bats
index d0efec95f3..cd64a3d7bf 100644
--- a/hack/check-gpu-operator-variants.bats
+++ b/hack/check-gpu-operator-variants.bats
@@ -1,23 +1,36 @@
 #!/usr/bin/env bats
 # -----------------------------------------------------------------------------
-# Catches silent regressions in the gpu-operator package's two variants:
+# Catches silent regressions in the gpu-operator package's three variants:
 #
 #   1. The base values.yaml pins ccManager.enabled=false and
 #      vgpuDeviceManager.enabled=false. Both upstream defaults are now true
 #      (chart v26.x). If the next chart bump silently un-pins either one,
 #      the `default` (passthrough) variant would gain confidential-computing
 #      auto-enable on Hopper hardware (ccManager) or render an mdev DaemonSet
-#      that crashloops on Ada+/Blackwell (vgpuDeviceManager).
+#      that crashloops on Ada+/Blackwell (vgpuDeviceManager). The same union
+#      must hold for the `container` variant; the `vgpu` variant re-affirms
+#      vgpuDeviceManager=false in its own overlay for the same reason.
 #
-#   2. Each variant's overlay must set sandboxWorkloads.defaultWorkload to its
-#      own enum value (vm-passthrough / vm-vgpu) — without it, GPU nodes that
-#      lack the per-node label nvidia.com/gpu.workload.config fall back to
-#      the upstream default 'container' workload, no DaemonSet renders, and
-#      the variant is silently a no-op.
+#   2. The sandbox variants must set sandboxWorkloads.defaultWorkload to
+#      their own enum value (vm-passthrough / vm-vgpu) — without it, GPU
+#      nodes that lack the per-node label nvidia.com/gpu.workload.config
+#      fall back to the upstream default 'container' workload, no DaemonSet
+#      renders, and the variant is silently a no-op. The container variant
+#      relies on the same upstream default but in the opposite direction:
+#      with sandboxWorkloads.enabled=false the chart picks defaultWorkload
+#      'container', which is what that variant wants — pinned here so an
+#      upstream rename does not silently break it.
 #
 #   3. The vgpu variant must enable the vGPU manager DaemonSet
-#      (vgpuManager.enabled=true) and the passthrough variant must keep
-#      driver.enabled / devicePlugin.enabled at false.
+#      (vgpuManager.enabled=true), the passthrough variant must keep
+#      driver.enabled / devicePlugin.enabled at false, and the container
+#      variant must keep driver / toolkit / vfioManager at false (host
+#      already provides them) while keeping devicePlugin enabled (publishes
+#      nvidia.com/gpu to the kubelet). The container variant must also pin
+#      cdi.enabled=false: upstream defaults it true, but CDI specs are
+#      serviced by the toolkit DaemonSet this variant disables, so leaving
+#      it on points the device plugin at CDI injection with no specs on an
+#      apt host and silently breaks allocation.
 #
 # Implementation: render the chart with the merged values for each variant
 # and grep for the relevant ClusterPolicy keys. We strip the package's
@@ -29,6 +42,8 @@
 # cozytest.sh runs each @test in a fresh subshell with `set -u` and does
 # not honor bats setup()/teardown(), so we provision TMP inline per test.
 
+load test_helper
+
 REPO_ROOT="$(cd "$(dirname "${BATS_TEST_FILENAME:-$0}")/.." && pwd)"
 CHART="$REPO_ROOT/packages/system/gpu-operator/charts/gpu-operator"
 VALUES_DIR="$REPO_ROOT/packages/system/gpu-operator"
@@ -56,43 +71,82 @@ render_variant() {
 }
 
 @test "default variant: ccManager and vgpuDeviceManager pinned off" {
-  TMP=$(mktemp -d); trap 'rm -rf "$TMP"' EXIT
+  TMP=$(mktemp -d)
   render_variant passthrough
   grep -A 1 '^  ccManager:'         "$TMP/rendered.yaml" | grep -q 'enabled: false'
   grep -A 1 '^  vgpuDeviceManager:' "$TMP/rendered.yaml" | grep -q 'enabled: false'
+  rm -rf "$TMP"
 }
 
 @test "default variant: defaultWorkload is vm-passthrough" {
-  TMP=$(mktemp -d); trap 'rm -rf "$TMP"' EXIT
+  TMP=$(mktemp -d)
   render_variant passthrough
   grep -A 2 '^  sandboxWorkloads:' "$TMP/rendered.yaml" | grep -q 'defaultWorkload: vm-passthrough'
+  rm -rf "$TMP"
 }
 
 @test "default variant: driver and devicePlugin disabled, vfioManager left on" {
-  TMP=$(mktemp -d); trap 'rm -rf "$TMP"' EXIT
+  TMP=$(mktemp -d)
   render_variant passthrough
   grep -A 1 '^  driver:'       "$TMP/rendered.yaml" | grep -q 'enabled: false'
   grep -A 1 '^  devicePlugin:' "$TMP/rendered.yaml" | grep -q 'enabled: false'
   grep -A 1 '^  vfioManager:'  "$TMP/rendered.yaml" | grep -q 'enabled: true'
+  rm -rf "$TMP"
 }
 
 @test "vgpu variant: ccManager and vgpuDeviceManager pinned off" {
-  TMP=$(mktemp -d); trap 'rm -rf "$TMP"' EXIT
+  TMP=$(mktemp -d)
   render_variant vgpu
   grep -A 1 '^  ccManager:'         "$TMP/rendered.yaml" | grep -q 'enabled: false'
   grep -A 1 '^  vgpuDeviceManager:' "$TMP/rendered.yaml" | grep -q 'enabled: false'
+  rm -rf "$TMP"
 }
 
 @test "vgpu variant: defaultWorkload is vm-vgpu" {
-  TMP=$(mktemp -d); trap 'rm -rf "$TMP"' EXIT
+  TMP=$(mktemp -d)
   render_variant vgpu
   grep -A 2 '^  sandboxWorkloads:' "$TMP/rendered.yaml" | grep -q 'defaultWorkload: vm-vgpu'
+  rm -rf "$TMP"
 }
 
 @test "vgpu variant: vgpuManager enabled, driver and devicePlugin disabled" {
-  TMP=$(mktemp -d); trap 'rm -rf "$TMP"' EXIT
+  TMP=$(mktemp -d)
   render_variant vgpu
   grep -A 1 '^  vgpuManager:'  "$TMP/rendered.yaml" | grep -q 'enabled: true'
   grep -A 1 '^  driver:'       "$TMP/rendered.yaml" | grep -q 'enabled: false'
   grep -A 1 '^  devicePlugin:' "$TMP/rendered.yaml" | grep -q 'enabled: false'
+  rm -rf "$TMP"
+}
+
+@test "container variant: ccManager and vgpuDeviceManager pinned off" {
+  TMP=$(mktemp -d)
+  render_variant container
+  grep -A 1 '^  ccManager:'         "$TMP/rendered.yaml" | grep -q 'enabled: false'
+  grep -A 1 '^  vgpuDeviceManager:' "$TMP/rendered.yaml" | grep -q 'enabled: false'
+  rm -rf "$TMP"
+}
+
+@test "container variant: sandboxWorkloads off, defaultWorkload stays upstream 'container'" {
+  TMP=$(mktemp -d)
+  render_variant container
+  grep -A 2 '^  sandboxWorkloads:' "$TMP/rendered.yaml" | grep -q 'enabled: false'
+  grep -A 2 '^  sandboxWorkloads:' "$TMP/rendered.yaml" | grep -q 'defaultWorkload: container'
+  rm -rf "$TMP"
+}
+
+@test "container variant: driver, toolkit, vfioManager off; devicePlugin on" {
+  TMP=$(mktemp -d)
+  render_variant container
+  grep -A 1 '^  driver:'       "$TMP/rendered.yaml" | grep -q 'enabled: false'
+  grep -A 1 '^  toolkit:'      "$TMP/rendered.yaml" | grep -q 'enabled: false'
+  grep -A 1 '^  vfioManager:'  "$TMP/rendered.yaml" | grep -q 'enabled: false'
+  grep -A 1 '^  devicePlugin:' "$TMP/rendered.yaml" | grep -q 'enabled: true'
+  rm -rf "$TMP"
+}
+
+@test "container variant: cdi pinned off (toolkit disabled cannot service CDI specs)" {
+  TMP=$(mktemp -d)
+  render_variant container
+  grep -A 1 '^  cdi:' "$TMP/rendered.yaml" | grep -q 'enabled: false'
+  rm -rf "$TMP"
 }
diff --git a/hack/check-gpu-recording-rules.bats b/hack/check-gpu-recording-rules.bats
index bae6785e1b..0727d4add9 100644
--- a/hack/check-gpu-recording-rules.bats
+++ b/hack/check-gpu-recording-rules.bats
@@ -33,9 +33,11 @@
 #   - Only [A-Za-z0-9] from the title survives into the function name; titles
 #     differing only in punctuation collapse to the same function.
 #
-# Run with: hack/cozytest.sh hack/check-gpu-recording-rules.bats
+# Run with: bats hack/check-gpu-recording-rules.bats
 # -----------------------------------------------------------------------------
 
+load test_helper
+
 REPO_ROOT="$(cd "$(dirname "${BATS_TEST_FILENAME:-$0}")/.." && pwd)"
 RULES_FILE="$REPO_ROOT/packages/system/monitoring-agents/alerts/gpu-recording.rules.yaml"
 DASHBOARDS_LIST="$REPO_ROOT/packages/system/monitoring/dashboards-infra.list"
@@ -107,7 +109,6 @@ extract_dcgm_refs() {
 
 @test "every recording rule reference in tracked GPU dashboards has a matching record" {
   TMP=$(mktemp -d)
-  trap 'rm -rf "$TMP"' EXIT
 
   extract_rules > "$TMP/rules.txt"
   [ -s "$TMP/rules.txt" ] || { echo "no recording rules extracted from $RULES_FILE" >&2; exit 1; }
@@ -136,11 +137,11 @@ extract_dcgm_refs() {
   done < "$TMP/dashboards.txt"
 
   [ "$failed" -eq 0 ]
+  rm -rf "$TMP"
 }
 
 @test "every DCGM metric referenced in tracked dashboards and rules is declared" {
   TMP=$(mktemp -d)
-  trap 'rm -rf "$TMP"' EXIT
 
   [ -f "$DCGM_DEFAULT_CSV" ] || { echo "missing $DCGM_DEFAULT_CSV" >&2; exit 1; }
   [ -f "$DCGM_CUSTOM_CSV" ]  || { echo "missing $DCGM_CUSTOM_CSV"  >&2; exit 1; }
@@ -184,11 +185,11 @@ extract_dcgm_refs() {
   fi
 
   [ "$failed" -eq 0 ]
+  rm -rf "$TMP"
 }
 
 @test "every tracked GPU dashboard listed in dashboards-infra.list exists on disk" {
   TMP=$(mktemp -d)
-  trap 'rm -rf "$TMP"' EXIT
 
   list_tracked_gpu_dashboards > "$TMP/dashboards.txt"
   [ -s "$TMP/dashboards.txt" ] || { echo "no gpu/* dashboards listed in $DASHBOARDS_LIST" >&2; exit 1; }
@@ -203,4 +204,5 @@ extract_dcgm_refs() {
   done < "$TMP/dashboards.txt"
 
   [ "$failed" -eq 0 ]
+  rm -rf "$TMP"
 }
diff --git a/hack/check-hook-request-timeout.bats b/hack/check-hook-request-timeout.bats
new file mode 100755
index 0000000000..175ae606de
--- /dev/null
+++ b/hack/check-hook-request-timeout.bats
@@ -0,0 +1,62 @@
+#!/usr/bin/env bats
+# Repo-wide invariant: a kubectl call that relies on in-cluster credentials must
+# not carry a non-zero --request-timeout.
+#
+# client-go loads in-cluster credentials only while the assembled config still
+# equals the default. --request-timeout lands in that config, so any non-zero
+# value diverts the call to kubectl's built-in default cluster, localhost:8080,
+# where it is refused. Nothing about this is visible in a rendered manifest: the
+# flag reads as ordinary defensive practice, the chart renders, and the failure
+# appears only when the container runs against a real apiserver. It cost two
+# packages before it was found (#4276, #4288), and in one of them the hook
+# reported success while doing nothing.
+#
+# Scope and its limit. A file that names KUBECONFIG is skipped: it hands kubectl
+# an explicit kubeconfig, so the in-cluster branch is not what serves it and the
+# flag is harmless there. That is a per-file judgement, not per-command, which
+# is the coarse part of this check and is why it is written down rather than
+# inferred. Vendored charts under packages/*/*/charts are upstream and out of
+# scope.
+#
+# Bounding the call is still available: --timeout bounds a watch, and
+# activeDeadlineSeconds bounds the whole Job, which is what
+# packages/apps/tenant/templates/cleanup-job.yaml uses and documents.
+
+load test_helper
+
+REPO_ROOT="$(cd "$(dirname "${BATS_TEST_FILENAME:-$0}")/.." && pwd)"
+
+@test "no in-cluster kubectl call carries a non-zero --request-timeout" {
+  cd "$REPO_ROOT"
+
+  # Files in scope: non-vendored templates that invoke kubectl.
+  candidates="$(grep -rl 'kubectl' packages/*/*/templates/ 2>/dev/null || true)"
+  [ -n "$candidates" ] || { echo "FAIL: found no templates invoking kubectl; this check is broken, not clean"; false; }
+
+  # Guard against a vacuous pass: the tree ships many such templates, so a
+  # collapsed glob has to fail here rather than report success.
+  count="$(printf '%s\n' "$candidates" | grep -c . || true)"
+  [ "$count" -ge 10 ] || { echo "FAIL: only $count template(s) invoke kubectl; expected the tree's usual population"; false; }
+
+  offenders=""
+  for f in $candidates; do
+    # An explicit kubeconfig means the in-cluster branch is not in play here.
+    if grep -q 'KUBECONFIG' "$f"; then
+      continue
+    fi
+    hits="$(grep -nE -- '--request-timeout=[^0[:space:]]' "$f" || true)"
+    if [ -n "$hits" ]; then
+      offenders="${offenders}${f}
+${hits}
+"
+    fi
+  done
+
+  if [ -n "$offenders" ]; then
+    echo "FAIL: non-zero --request-timeout on a call that depends on in-cluster credentials."
+    echo "It diverts kubectl to localhost:8080 and the call never reaches the cluster."
+    echo "Bound the work with --timeout or activeDeadlineSeconds instead."
+    printf '%s\n' "$offenders"
+    false
+  fi
+}
diff --git a/hack/check-host-runtime.bats b/hack/check-host-runtime.bats
index b121b31b45..a744c05e00 100644
--- a/hack/check-host-runtime.bats
+++ b/hack/check-host-runtime.bats
@@ -12,14 +12,15 @@
 # variables to redirect socket/dir probes into the stub tree, so tests do not
 # need root privileges or a real systemd host.
 #
-# Each test installs a `trap 'rm -rf "$STUB_DIR"' EXIT` immediately after
-# creating the stub dir so cleanup runs even when an assertion fails mid-test
-# under `set -e`. cozytest.sh runs each @test in its own subshell, so traps
-# scope per test and do not leak across tests.
+# Each test removes its stub dir on the last line of its body rather than from
+# an EXIT trap: a trap inside an @test replaces the one the bats binary installs
+# for its own bookkeeping, and a test that then fails prints no TAP line at all.
+# Both runners set -e, so a failed test leaves its stub dir behind, which is what
+# you want to look at anyway.
 #
-# Tests are otherwise self-contained — no shared setup/teardown helpers,
-# because cozytest.sh's awk parser only recognizes @test blocks and treats a
-# bare `}` on its own line as the end of a test function.
+# Fixture setup is otherwise self-contained rather than placed in file-local
+# setup()/teardown() hooks, preserving compatibility with the legacy
+# cozytest.sh translator. Strict setup still comes from `load test_helper`.
 #
 # Title syntax constraints (inherited from cozytest.sh's awk parser):
 #   - Titles must be delimited by ASCII double quotes; embedded literal
@@ -29,14 +30,15 @@
 #     only in punctuation collapse to the same function name. Keep titles
 #     distinctive in their alphanumeric run.
 #
-# Run with: hack/cozytest.sh hack/check-host-runtime.bats
-#           (or `bats hack/check-host-runtime.bats` if the bats binary is
-#           installed; cozytest.sh is the CI path.)
+# Run from the repo root with `make bats-unit-tests`, or directly with
+# `bats hack/check-host-runtime.bats`. The legacy `hack/cozytest.sh` runner
+# remains a supported compatibility path.
 # -----------------------------------------------------------------------------
 
+load test_helper
+
 @test "clean host with no runtime services exits silently" {
   STUB_DIR=$(mktemp -d)
-  trap 'rm -rf "$STUB_DIR"' EXIT
 
   cat >"$STUB_DIR/systemctl" <<'STUBEOF'
 #!/bin/sh
@@ -58,11 +60,11 @@ STUBEOF
 
   [ ! -s "$STDERR_FILE" ]
   [ ! -s "$STUB_DIR/stdout" ]
+  rm -rf "$STUB_DIR"
 }
 
 @test "standalone containerd service active prints warning" {
   STUB_DIR=$(mktemp -d)
-  trap 'rm -rf "$STUB_DIR"' EXIT
 
   cat >"$STUB_DIR/systemctl" <<'STUBEOF'
 #!/bin/sh
@@ -105,11 +107,11 @@ STUBEOF
     cat "$STDERR_FILE" >&2
     exit 1
   fi
+  rm -rf "$STUB_DIR"
 }
 
 @test "standalone docker service active prints warning" {
   STUB_DIR=$(mktemp -d)
-  trap 'rm -rf "$STUB_DIR"' EXIT
 
   cat >"$STUB_DIR/systemctl" <<'STUBEOF'
 #!/bin/sh
@@ -150,11 +152,11 @@ STUBEOF
     cat "$STDERR_FILE" >&2
     exit 1
   fi
+  rm -rf "$STUB_DIR"
 }
 
 @test "both services active prints two warnings and the HINT block" {
   STUB_DIR=$(mktemp -d)
-  trap 'rm -rf "$STUB_DIR"' EXIT
 
   cat >"$STUB_DIR/systemctl" <<'STUBEOF'
 #!/bin/sh
@@ -198,11 +200,11 @@ STUBEOF
   # would be told to run it as a non-root user and quietly fail.
   grep -q 'HINT:' "$STDERR_FILE"
   grep -q 'sudo systemctl disable --now containerd.service docker.service' "$STDERR_FILE"
+  rm -rf "$STUB_DIR"
 }
 
 @test "failing du does not suppress the containerd warning" {
   STUB_DIR=$(mktemp -d)
-  trap 'rm -rf "$STUB_DIR"' EXIT
 
   cat >"$STUB_DIR/systemctl" <<'STUBEOF'
 #!/bin/sh
@@ -234,11 +236,11 @@ DUEOF
     bash hack/check-host-runtime.sh 2>"$STDERR_FILE"
 
   grep -q 'standalone containerd.service' "$STDERR_FILE"
+  rm -rf "$STUB_DIR"
 }
 
 @test "containerd socket fallback fires when systemctl is unavailable" {
   STUB_DIR=$(mktemp -d)
-  trap 'rm -rf "$STUB_DIR"' EXIT
 
   # The script uses `[ -e "$sock" ]`, not `[ -S ... ]`, so a regular
   # file is a valid stand-in for a unix socket in tests. This also
@@ -256,11 +258,11 @@ DUEOF
     bash hack/check-host-runtime.sh 2>"$STDERR_FILE"
 
   grep -q 'standalone containerd.service' "$STDERR_FILE"
+  rm -rf "$STUB_DIR"
 }
 
 @test "docker socket fallback fires when systemctl is unavailable" {
   STUB_DIR=$(mktemp -d)
-  trap 'rm -rf "$STUB_DIR"' EXIT
 
   SOCK="$STUB_DIR/docker.sock"
   touch "$SOCK"
@@ -279,11 +281,11 @@ DUEOF
     cat "$STDERR_FILE" >&2
     exit 1
   fi
+  rm -rf "$STUB_DIR"
 }
 
 @test "clean host without systemctl exits silently" {
   STUB_DIR=$(mktemp -d)
-  trap 'rm -rf "$STUB_DIR"' EXIT
 
   STDERR_FILE="$STUB_DIR/stderr"
   COZYSTACK_PREFLIGHT_FORCE_NO_SYSTEMCTL=1 \
@@ -295,11 +297,11 @@ DUEOF
 
   [ ! -s "$STDERR_FILE" ]
   [ ! -s "$STUB_DIR/stdout" ]
+  rm -rf "$STUB_DIR"
 }
 
 @test "docker service plus socket still emits exactly one warning" {
   STUB_DIR=$(mktemp -d)
-  trap 'rm -rf "$STUB_DIR"' EXIT
 
   cat >"$STUB_DIR/systemctl" <<'STUBEOF'
 #!/bin/sh
@@ -334,11 +336,11 @@ STUBEOF
     cat "$STDERR_FILE" >&2
     exit 1
   fi
+  rm -rf "$STUB_DIR"
 }
 
 @test "docker socket paths with glob chars do not expand" {
   STUB_DIR=$(mktemp -d)
-  trap 'rm -rf "$STUB_DIR"' EXIT
 
   # Create two directories that a naive `for sock in $PATHS` loop
   # would glob-expand and treat as existing "sockets". With the
@@ -369,11 +371,11 @@ STUBEOF
     cat "$STDERR_FILE" >&2
     exit 1
   fi
+  rm -rf "$STUB_DIR"
 }
 
 @test "containerd service plus socket still emits exactly one warning" {
   STUB_DIR=$(mktemp -d)
-  trap 'rm -rf "$STUB_DIR"' EXIT
 
   cat >"$STUB_DIR/systemctl" <<'STUBEOF'
 #!/bin/sh
@@ -412,4 +414,5 @@ STUBEOF
     cat "$STDERR_FILE" >&2
     exit 1
   fi
+  rm -rf "$STUB_DIR"
 }
diff --git a/hack/check-kafka-rd-schema.bats b/hack/check-kafka-rd-schema.bats
index 74510d6e01..acdc3c6765 100644
--- a/hack/check-kafka-rd-schema.bats
+++ b/hack/check-kafka-rd-schema.bats
@@ -6,6 +6,8 @@
 # absent (omitempty *bool) rather than an explicit null, and the template
 # detects that via `kindIs "invalid"`.
 
+load test_helper
+
 REPO_ROOT="$(cd "$(dirname "${BATS_TEST_FILENAME:-$0}")/.." && pwd)"
 COZYRDS="$REPO_ROOT/packages/system/kafka-rd/cozyrds/kafka.yaml"
 
diff --git a/hack/check-kafka-rd-secrets.bats b/hack/check-kafka-rd-secrets.bats
index f00c66c958..a5c74f9adb 100644
--- a/hack/check-kafka-rd-secrets.bats
+++ b/hack/check-kafka-rd-secrets.bats
@@ -2,6 +2,8 @@
 # Unit test: kafka-rd cozyrds must reference the Strimzi-generated
 # clients-ca-cert secret (not the bare clients-ca name, which does not exist).
 
+load test_helper
+
 REPO_ROOT="$(cd "$(dirname "${BATS_TEST_FILENAME:-$0}")/.." && pwd)"
 COZYRDS="$REPO_ROOT/packages/system/kafka-rd/cozyrds/kafka.yaml"
 
diff --git a/hack/check-kubeovn-image-copies.bats b/hack/check-kubeovn-image-copies.bats
new file mode 100644
index 0000000000..4ba4c080a0
--- /dev/null
+++ b/hack/check-kubeovn-image-copies.bats
@@ -0,0 +1,149 @@
+#!/usr/bin/env bats
+# -----------------------------------------------------------------------------
+# Unit tests for hack/check-kubeovn-image-copies.sh.
+#
+# packages/system/kubeovn/images/kubeovn/Dockerfile is a hand-kept copy of
+# upstream's dist/images/Dockerfile, and `make update` rewrites only ARG VERSION
+# and ARG TAG in it. When v1.15.26 added kube-ovn-bfdd-supervisor to the image,
+# our copy kept the v1.15.10 set and the binary went missing, which nothing in
+# the tree noticed. The checker compares what each file copies, and this suite
+# runs it over the real Dockerfile against a verbatim copy of upstream's for the
+# vendored appVersion -- a synthetic pair alone would only assert the shape we
+# already imagined.
+#
+# cozytest.sh's awk parser recognizes only @test blocks and a bare `}` on its
+# own line; there is no bats `run` or `$status`. Assertions are direct shell
+# tests, and an expected failure is written as `if CHECK ...; then ... exit 1`.
+# -----------------------------------------------------------------------------
+
+load test_helper
+
+REPO_ROOT="$(cd "$(dirname "${BATS_TEST_FILENAME:-$0}")/.." && pwd)"
+CHECK="$REPO_ROOT/hack/check-kubeovn-image-copies.sh"
+OURS="$REPO_ROOT/packages/system/kubeovn/images/kubeovn/Dockerfile"
+CHART="$REPO_ROOT/packages/system/kubeovn/charts/kube-ovn/Chart.yaml"
+
+# Upstream dist/images/Dockerfile at v1.15.26, copied verbatim. Bump it in the
+# same change that bumps the chart: `make update` re-runs the same comparison
+# against the tag it pulls, so the two cannot disagree for long.
+UPSTREAM_VERSION=1.15.26
+upstream_dockerfile() {
+    cat <<'EOF'
+# syntax=docker/dockerfile:1
+ARG VERSION
+ARG BASE_TAG=$VERSION
+FROM kubeovn/kube-ovn-base:$BASE_TAG AS setcap
+
+COPY *.sh /kube-ovn/
+COPY kubectl-ko /kube-ovn/kubectl-ko
+COPY 01-kube-ovn.conflist /kube-ovn/01-kube-ovn.conflist
+
+COPY kube-ovn /kube-ovn/kube-ovn
+COPY kube-ovn-cmd /kube-ovn/kube-ovn-cmd
+COPY kube-ovn-bfdd-supervisor /kube-ovn/kube-ovn-bfdd-supervisor
+COPY kube-ovn-daemon /kube-ovn/kube-ovn-daemon
+COPY kube-ovn-controller /kube-ovn/kube-ovn-controller
+RUN ln -s /kube-ovn/kube-ovn-cmd /kube-ovn/kube-ovn-monitor && \
+    ln -s /kube-ovn/kube-ovn-cmd /kube-ovn/kube-ovn-speaker && \
+    ln -s /kube-ovn/kube-ovn-cmd /kube-ovn/kube-ovn-webhook && \
+    ln -s /kube-ovn/kube-ovn-cmd /kube-ovn/kube-ovn-leader-checker && \
+    ln -s /kube-ovn/kube-ovn-cmd /kube-ovn/kube-ovn-ic-controller && \
+    ln -s /kube-ovn/kube-ovn-controller /kube-ovn/kube-ovn-pinger && \
+    setcap CAP_NET_BIND_SERVICE+eip /kube-ovn/kube-ovn-cmd && \
+    setcap CAP_NET_RAW,CAP_NET_BIND_SERVICE+eip /kube-ovn/kube-ovn-controller && \
+    setcap CAP_NET_ADMIN,CAP_NET_RAW,CAP_NET_BIND_SERVICE,CAP_SYS_ADMIN+eip /kube-ovn/kube-ovn-daemon
+
+FROM kubeovn/kube-ovn-base:$BASE_TAG
+
+COPY --chmod=0644 logrotate/* /etc/logrotate.d/
+COPY grace_stop_ovn_controller /usr/share/ovn/scripts/grace_stop_ovn_controller
+
+COPY --from=setcap /kube-ovn /kube-ovn
+RUN /kube-ovn/iptables-wrapper-installer.sh --no-sanity-check
+
+WORKDIR /kube-ovn
+EOF
+}
+
+@test "the fixture tracks the vendored chart version" {
+    # Chart.yaml quotes the value; the package Makefile leans on the shell to
+    # strip those, this runs the awk output through a comparison instead.
+    appversion=$(awk '$1 == "appVersion:" {gsub(/"/, "", $2); print $2}' "$CHART")
+    if [ "$appversion" != "$UPSTREAM_VERSION" ]; then
+        echo "FAIL: chart appVersion is $appversion, fixture is v$UPSTREAM_VERSION" >&2
+        echo "Refresh upstream_dockerfile() from dist/images/Dockerfile at v$appversion." >&2
+        return 1
+    fi
+}
+
+@test "our Dockerfile copies everything upstream's does" {
+    upstream_dockerfile | "$CHECK" "$OURS" -
+}
+
+@test "a binary upstream added and we did not is reported" {
+    ours=$(mktemp)
+    upstream=$(mktemp)
+    upstream_dockerfile > "$upstream"
+    grep -v 'kube-ovn-bfdd-supervisor' "$OURS" > "$ours"
+
+    if "$CHECK" "$ours" "$upstream" 2>/dev/null; then
+        echo "FAIL: a missing binary passed the check" >&2
+        return 1
+    fi
+    if ! "$CHECK" "$ours" "$upstream" 2>&1 | grep -q 'kube-ovn-bfdd-supervisor'; then
+        echo "FAIL: the report does not name the missing binary" >&2
+        return 1
+    fi
+}
+
+@test "a copy we make and upstream does not is reported" {
+    ours=$(mktemp)
+    upstream=$(mktemp)
+    upstream_dockerfile > "$upstream"
+    sed -e 's|^COPY --from=builder /source/dist/images/kube-ovn-cmd .*|&\nCOPY --from=builder /source/dist/images/kube-ovn-invented /kube-ovn/kube-ovn-invented|' "$OURS" > "$ours"
+
+    if "$CHECK" "$ours" "$upstream" 2>/dev/null; then
+        echo "FAIL: an extra copy passed the check" >&2
+        return 1
+    fi
+    if ! "$CHECK" "$ours" "$upstream" 2>&1 | grep -q 'kube-ovn-invented'; then
+        echo "FAIL: the report does not name the extra copy" >&2
+        return 1
+    fi
+}
+
+@test "COPY lines in the builder stage are ours alone and not compared" {
+    # `COPY patches /patches` and the regression test have no upstream
+    # counterpart: they feed our clone-and-patch build, which upstream does not
+    # have. Reading them would make the check fail on every run.
+    ours=$(mktemp)
+    upstream=$(mktemp)
+    upstream_dockerfile > "$upstream"
+    sed -e 's|^COPY patches /patches$|COPY patches /patches\nCOPY extra-build-input /some/where|' "$OURS" > "$ours"
+
+    "$CHECK" "$ours" "$upstream"
+}
+
+@test "a destination that differs is reported even when the source matches" {
+    ours=$(mktemp)
+    upstream=$(mktemp)
+    upstream_dockerfile > "$upstream"
+    sed -e 's|/kube-ovn/kube-ovn-daemon$|/kube-ovn/kube-ovn-daemon-typo|' "$OURS" > "$ours"
+
+    if "$CHECK" "$ours" "$upstream" 2>/dev/null; then
+        echo "FAIL: a retargeted copy passed the check" >&2
+        return 1
+    fi
+}
+
+@test "the checker reads the file it is given and not the tree" {
+    empty=$(mktemp)
+    upstream=$(mktemp)
+    upstream_dockerfile > "$upstream"
+    printf 'FROM scratch\n' > "$empty"
+
+    if "$CHECK" "$empty" "$upstream" 2>/dev/null; then
+        echo "FAIL: a Dockerfile with no copies at all passed the check" >&2
+        return 1
+    fi
+}
diff --git a/hack/check-kubeovn-image-copies.sh b/hack/check-kubeovn-image-copies.sh
new file mode 100755
index 0000000000..6b00ee4ff6
--- /dev/null
+++ b/hack/check-kubeovn-image-copies.sh
@@ -0,0 +1,123 @@
+#!/bin/sh
+# Compare what packages/system/kubeovn/images/kubeovn/Dockerfile copies into the
+# kube-ovn image against upstream's dist/images/Dockerfile, which it is a
+# hand-kept copy of.
+#
+# `make update` in that package rewrites only ARG VERSION and ARG TAG, so a
+# binary upstream starts shipping does not reach our image on its own: v1.15.26
+# added kube-ovn-bfdd-supervisor, our copy kept the v1.15.10 set, and a
+# VpcEgressGateway with spec.bfd got a container whose command did not exist.
+#
+# Usage: hack/check-kubeovn-image-copies.sh OURS UPSTREAM
+# Either path may be `-` to read that side from stdin.
+
+set -eu
+
+[ $# -eq 2 ] || {
+    echo "Usage: $0 OURS UPSTREAM  (either path may be '-' for stdin)" >&2
+    exit 2
+}
+
+OURS=$1
+UPSTREAM=$2
+
+# Normalize the COPY instructions of every stage built FROM kubeovn/kube-ovn-base
+# to `<source>... <destination>` lines.
+#
+# Only those stages are comparable. Our builder stage clones and patches
+# kube-ovn, which upstream does not do at all, so its COPY lines have no
+# counterpart and reading them would make every run fail.
+#
+# Flags are dropped so that `--from=builder /source/dist/images/kube-ovn` and a
+# bare `kube-ovn` read the same: upstream copies out of a build context that our
+# multi-stage build reproduces under /source/dist/images.
+copies() {
+    if [ "$1" = "-" ]; then
+        cat
+    else
+        cat -- "$1"
+    fi | awk '
+        function strip(path) {
+            sub(/^\/source\/dist\/images\//, "", path)
+            return path
+        }
+        # Fold a continued instruction into one logical line before reading it.
+        {
+            line = line $0
+            if (line ~ /\\$/) {
+                sub(/\\$/, " ", line)
+                next
+            }
+        }
+        line ~ /^[[:space:]]*FROM[[:space:]]/ {
+            in_scope = (line ~ /kubeovn\/kube-ovn-base/)
+            line = ""
+            next
+        }
+        in_scope && line ~ /^[[:space:]]*COPY[[:space:]]/ {
+            $0 = line
+            out = ""
+            for (i = 2; i <= NF; i++) {
+                if ($i ~ /^--/) continue
+                out = out (out == "" ? "" : " ") strip($i)
+            }
+            if (out != "") print out
+        }
+        { line = "" }
+    ' | LC_ALL=C sort
+}
+
+# Lines on stdin that do not appear in the newline-separated set $1.
+#
+# The set is fed through the same stream rather than `awk -v`: a multi-line -v
+# value is a GNU extension, and the awk on a maintainer's macOS rejects it.
+lines_not_in() {
+    {
+        printf '%s\n' "$1" | sed 's/^/S /'
+        sed 's/^/C /'
+    } | awk '
+        $1 == "S" { sub(/^S /, ""); seen[$0] = 1; next }
+        { sub(/^C /, ""); if ($0 != "" && !($0 in seen)) print }
+    '
+}
+
+ours_copies=$(copies "$OURS")
+upstream_copies=$(copies "$UPSTREAM")
+
+# A side with no copies at all means the stage markers stopped matching, not
+# that the two agree. Reporting that as a pass is how this check would quietly
+# stop working the next time the base image is renamed.
+if [ -z "$ours_copies" ]; then
+    echo "ERROR: no COPY instructions found in a kubeovn/kube-ovn-base stage of $OURS" >&2
+    exit 1
+fi
+if [ -z "$upstream_copies" ]; then
+    echo "ERROR: no COPY instructions found in a kubeovn/kube-ovn-base stage of $UPSTREAM" >&2
+    exit 1
+fi
+
+missing=$(printf '%s\n' "$upstream_copies" | lines_not_in "$ours_copies")
+extra=$(printf '%s\n' "$ours_copies" | lines_not_in "$upstream_copies")
+
+status=0
+
+if [ -n "$missing" ]; then
+    echo "ERROR: upstream copies these into the image and we do not:" >&2
+    printf '%s\n' "$missing" | sed 's/^/  COPY /' >&2
+    status=1
+fi
+
+if [ -n "$extra" ]; then
+    echo "ERROR: we copy these into the image and upstream does not:" >&2
+    printf '%s\n' "$extra" | sed 's/^/  COPY /' >&2
+    status=1
+fi
+
+if [ "$status" -ne 0 ]; then
+    echo >&2
+    echo "packages/system/kubeovn/images/kubeovn/Dockerfile is a copy of upstream's" >&2
+    echo "dist/images/Dockerfile. Bring the two back in step, keeping our" >&2
+    echo "--from=builder /source/dist/images/ prefix." >&2
+fi
+
+exit "$status"
diff --git a/hack/check-mariadb-rd-secrets.bats b/hack/check-mariadb-rd-secrets.bats
new file mode 100644
index 0000000000..df239daff8
--- /dev/null
+++ b/hack/check-mariadb-rd-secrets.bats
@@ -0,0 +1,214 @@
+#!/usr/bin/env bats
+# Unit test: mariadb-rd's tenant grant surface. The chart's helm-unittest suite
+# cannot reach this package, so its Secret-exposure invariants are pinned here.
+#
+# The tenant reaches the TLS trust anchor as a key-free projection, never by
+# name. The chart renders a TenantProjection sentinel naming the operator's
+# key-free <release>-ca-bundle as the extraction source
+# (packages/apps/mariadb/templates/tenant-projection.yaml); the CA-extraction
+# controller publishes the result as "<release>.tenant-ca" carrying
+# internal.cozystack.io/tenant-ca; and this ApplicationDefinition selects that
+# label. The sentinel's own fields belong to the chart and are pinned by
+# packages/apps/mariadb/tests/tenant_projection_test.yaml, which compares
+# sourceSecretName against an exact key-free name — a stronger guard than any
+# grep here could be, and one this file cannot make, since it never sees the
+# chart.
+#
+# Asserted against the RENDERED chart, not against cozyrds/mariadb.yaml on
+# disk, following hack/check-qdrant-rd-secrets.bats. templates/cozyrd.yaml
+# globs cozyrds/* and emits each match through .Files.Get, so what ships is the
+# render: reading one source file would miss a second file in that directory,
+# and a dotfile the glob picks up. Helm ignores dotfiles only under templates/,
+# so one here does ship.
+#
+# spec.secrets and spec.services are each compared WHOLE rather than probed for
+# known-bad shapes. Probing is what a name-shaped check cannot see:
+#
+#   - an exclude entry that selects by LABEL instead of by name. matchName
+#     returns true for every name when resourceNames is nil
+#     (internal/lineagecontrollerwebhook/matcher.go), and exclude wins over
+#     include, so one such entry withholds everything — the tenant's
+#     connection string and its trust anchor included. A pass reading
+#     .exclude[].resourceNames[]? cannot see an entry that has no
+#     resourceNames at all.
+#   - an entry that restricts nothing, spelled as an empty matchLabels, an
+#     empty matchExpressions, or a bare {}. Only the first is a literal anyone
+#     greps for; ApplicationDefinitionResourceSelector inlines
+#     metav1.LabelSelector, so all three are legal.
+#   - a SECOND matchLabels include selecting a label the key-bearing Secrets
+#     also carry. cert-manager stamps controller.cert-manager.io/fao on both
+#     .ca-tls and .tls, so one such entry grants the CA private key while every
+#     name in the file stays correct.
+#
+# Order within each list is meaningless — the matcher ORs across entries — so
+# both are sorted before comparing, and an absent list is normalized to the
+# empty list it means. The sort is jq's, which orders objects; yq's sort would
+# leave a list of maps as it found it.
+#
+# Every document count uses `yq eval-all`, never `yq eval`: `eval` runs the
+# expression once PER DOCUMENT, so `[.] | length` reports 1 per document rather
+# than the number of them. Emptiness is checked separately, since yq
+# synthesizes a null document for empty input.
+#
+# Everything is spelled inline rather than through a shell helper:
+# hack/cozytest.sh inserts `return 0` before any line that is exactly `}`, so a
+# helper whose own last command decides the outcome returns 0 regardless.
+
+load test_helper
+
+REPO_ROOT="$(cd "$(dirname "${BATS_TEST_FILENAME:-$0}")/.." && pwd)"
+CHART="$REPO_ROOT/packages/system/mariadb-rd"
+
+NORMALIZE='{exclude: (.exclude // [] | sort), include: (.include // [] | sort)}'
+
+# The complete tenant-visible Secret surface: the credentials Secret by name,
+# the trust anchor by label, every key-bearing and credential Secret withheld
+# by name. mariadb-<name>.ca-tls holds the CA private key and mariadb-<name>.tls
+# the server key; the operator's own -ca, -server-cert and -client-cert hold
+# keys too. None of them may reach a tenant, by name or by a label they carry.
+EXPECTED_SECRETS='{"exclude":[{"resourceNames":["mariadb-{{ .name }}.ca-tls","mariadb-{{ .name }}.tls","mariadb-{{ .name }}-ca","mariadb-{{ .name }}-server-cert","mariadb-{{ .name }}-client-cert","mariadb-{{ .name }}-root","mariadb-{{ .name }}-password","mariadb-{{ .name }}-repl-password","mariadb-{{ .name }}-metrics-password","mariadb-{{ .name }}-metrics-config","mariadb-{{ .name }}-backup","mariadb-{{ .name }}-regsecret"]}],"include":[{"matchLabels":{"internal.cozystack.io/tenant-ca":"true"}},{"resourceNames":["mariadb-{{ .name }}-credentials"]}]}'
+
+# The Services an instance exposes, pinned for the same reason: a catch-all
+# selector reaches this list too, and nothing else in the tree holds it.
+EXPECTED_SERVICES='{"exclude":[],"include":[{"resourceNames":["mariadb-{{ .name }}","mariadb-{{ .name }}-primary","mariadb-{{ .name }}-secondary"]}]}'
+
+@test "mariadb-rd renders exactly one ApplicationDefinition" {
+  # stderr is deliberately not discarded: when the render breaks, helm's own
+  # message is the only thing that says why.
+  rendered=$(helm template mariadb-rd "$CHART") || return 1
+
+  # Fail closed: an empty render makes every assertion below vacuous, and yq
+  # cannot distinguish it from one document.
+  if [ -z "$rendered" ]; then
+    echo "helm template produced no output for $CHART -- guard is blind." >&2
+    return 1
+  fi
+
+  count=$(printf '%s\n' "$rendered" | yq eval-all '[.] | length' -) || return 1
+
+  if [ "$count" != "1" ]; then
+    echo "Expected exactly 1 rendered document from $CHART, got: $count" >&2
+    echo "templates/cozyrd.yaml globs cozyrds/*, so every file there -- including" >&2
+    echo "a dotfile -- ships its own tenant grants. Extend this suite before" >&2
+    echo "adding one." >&2
+    return 1
+  fi
+}
+
+# Subsumed by the whole-value comparison below, which cannot match without this
+# entry. Kept because the runner stops at the first failing test, so this one
+# fires first and says what the loss costs rather than printing two JSON blobs
+# to diff.
+@test "mariadb-rd selects the key-free tenant-CA projection by label" {
+  rendered=$(helm template mariadb-rd "$CHART") || return 1
+
+  if [ -z "$rendered" ]; then
+    echo "helm template produced no output for $CHART -- guard is blind." >&2
+    return 1
+  fi
+
+  count=$(printf '%s\n' "$rendered" | yq eval-all \
+    '[.. | select(has("secrets")) | .secrets.include[] | select(.matchLabels."internal.cozystack.io/tenant-ca" == "true")] | length' \
+    -) || return 1
+
+  if [ "$count" -lt 1 ]; then
+    echo 'mariadb-rd does not select internal.cozystack.io/tenant-ca: "true"' >&2
+    echo "Without it the tenant cannot read ca.crt and TLS verification is impossible." >&2
+    return 1
+  fi
+}
+
+# Also subsumed, and kept for the same reason: a dropped name is the likeliest
+# single edit here, and this names which one went rather than leaving it to a
+# diff of two twelve-element lists.
+@test "mariadb-rd withholds every key-bearing and credential Secret by name" {
+  rendered=$(helm template mariadb-rd "$CHART") || return 1
+
+  if [ -z "$rendered" ]; then
+    echo "helm template produced no output for $CHART -- guard is blind." >&2
+    return 1
+  fi
+
+  # The suffix carries its own separator: the two Secrets this chart asks
+  # cert-manager for are joined with a dot, everything else with a hyphen, so
+  # a loop that supplied the hyphen itself would look for names nothing renders.
+  for n in .ca-tls .tls -ca -server-cert -client-cert \
+           -root -password -repl-password -metrics-password -metrics-config \
+           -backup -regsecret; do
+    hits=$(printf '%s\n' "$rendered" | yq eval-all \
+      "[.. | select(has(\"secrets\")) | .secrets.exclude[].resourceNames[]? | select(. == \"mariadb-{{ .name }}$n\")] | length" \
+      -) || return 1
+    if [ "$hits" -lt 1 ]; then
+      echo "mariadb-<name>$n is missing from secrets.exclude" >&2
+      echo "The include selector matches by label with no name constraint, so this" >&2
+      echo "list is the enumerable part of that gap; exclude wins over include." >&2
+      return 1
+    fi
+  done
+}
+
+# Whole-structure comparison. Anything added to the tenant's Secret surface --
+# by name, by label, or by an unrestricted entry -- changes this string, and so
+# does anything removed from the backstop.
+@test "mariadb-rd grants exactly the credentials Secret and the trust anchor" {
+  rendered=$(helm template mariadb-rd "$CHART") || return 1
+
+  if [ -z "$rendered" ]; then
+    echo "helm template produced no output for $CHART -- guard is blind." >&2
+    return 1
+  fi
+
+  # eval-all again: with `eval`, a second rendered document would emit a second
+  # JSON object and the comparison below would run on a concatenation.
+  actual=$(printf '%s\n' "$rendered" \
+    | yq eval-all --output-format=json '[.. | select(has("secrets")) | .secrets]' - \
+    | jq --sort-keys --compact-output "if length == 1 then .[0] else . end | $NORMALIZE") || return 1
+
+  expected=$(printf '%s' "$EXPECTED_SECRETS" \
+    | jq --sort-keys --compact-output "$NORMALIZE") || return 1
+
+  # Fail closed: an empty or null result means spec.secrets stopped being
+  # readable at this path, so the guard is no longer observing what it claims.
+  if [ -z "$actual" ] || [ "$actual" = "null" ]; then
+    echo "spec.secrets is missing or unreadable in the rendered ResourceDefinition -- guard is blind." >&2
+    return 1
+  fi
+
+  if [ "$actual" != "$expected" ]; then
+    echo "Unexpected tenant Secret surface in the rendered mariadb-rd spec.secrets:" >&2
+    echo "  actual:   $actual" >&2
+    echo "  expected: $expected" >&2
+    echo "Both lists are pinned: include decides what a tenant receives, and" >&2
+    echo "exclude is evaluated first and wins outright, so an entry added there" >&2
+    echo "revokes the connection string or the trust anchor in silence." >&2
+    return 1
+  fi
+}
+
+@test "mariadb-rd exposes exactly the instance Services" {
+  rendered=$(helm template mariadb-rd "$CHART") || return 1
+
+  if [ -z "$rendered" ]; then
+    echo "helm template produced no output for $CHART -- guard is blind." >&2
+    return 1
+  fi
+
+  actual=$(printf '%s\n' "$rendered" \
+    | yq eval-all --output-format=json '[.. | select(has("services")) | .services]' - \
+    | jq --sort-keys --compact-output "if length == 1 then .[0] else . end | $NORMALIZE") || return 1
+
+  expected=$(printf '%s' "$EXPECTED_SERVICES" \
+    | jq --sort-keys --compact-output "$NORMALIZE") || return 1
+
+  if [ -z "$actual" ] || [ "$actual" = "null" ]; then
+    echo "spec.services is missing or unreadable in the rendered ResourceDefinition -- guard is blind." >&2
+    return 1
+  fi
+
+  if [ "$actual" != "$expected" ]; then
+    echo "Unexpected tenant Service surface in the rendered mariadb-rd spec.services:" >&2
+    echo "  actual:   $actual" >&2
+    echo "  expected: $expected" >&2
+    return 1
+  fi
+}
diff --git a/hack/check-migrations-target.sh b/hack/check-migrations-target.sh
new file mode 100755
index 0000000000..66eebc038e
--- /dev/null
+++ b/hack/check-migrations-target.sh
@@ -0,0 +1,53 @@
+#!/usr/bin/env bash
+# Verify packages/core/platform/values.yaml `migrations.targetVersion`
+# is at least 1 greater than the highest-numbered file in
+# packages/core/platform/images/migrations/migrations/.
+#
+# Catches the regression where a PR adds a new migration script but
+# forgets to bump targetVersion: run-migrations.sh loops
+# `seq $CURRENT_VERSION $((TARGET_VERSION - 1))`, so migration N never
+# runs unless targetVersion is >= N+1.
+set -euo pipefail
+
+MDIR="packages/core/platform/images/migrations/migrations"
+VALUES="packages/core/platform/values.yaml"
+
+if [ ! -d "$MDIR" ]; then
+  echo "ERROR: migrations dir not found: $MDIR" >&2
+  exit 1
+fi
+if [ ! -f "$VALUES" ]; then
+  echo "ERROR: values file not found: $VALUES" >&2
+  exit 1
+fi
+
+MAX_N=0
+for f in "$MDIR"/*; do
+  name=${f##*/}
+  [[ "$name" =~ ^[0-9]+$ ]] || continue
+  [ "$name" -gt "$MAX_N" ] && MAX_N=$name
+done
+if [ "$MAX_N" -eq 0 ]; then
+  echo "ERROR: no numbered migrations found under $MDIR" >&2
+  exit 1
+fi
+REQUIRED=$((MAX_N + 1))
+
+TARGET=$(yq -r '.migrations.targetVersion' "$VALUES")
+if [ -z "$TARGET" ] || [ "$TARGET" = "null" ]; then
+  echo "ERROR: migrations.targetVersion is not set in $VALUES" >&2
+  exit 1
+fi
+
+if [ "$TARGET" -lt "$REQUIRED" ]; then
+  cat >&2 <<EOF
+ERROR: latest migration is $MAX_N but $VALUES sets migrations.targetVersion=$TARGET (need >= $REQUIRED).
+
+run-migrations.sh loops 'seq \$CURRENT_VERSION \$((TARGET_VERSION - 1))', so migration $MAX_N never runs unless targetVersion is bumped.
+
+Fix: edit $VALUES and set migrations.targetVersion: $REQUIRED
+EOF
+  exit 1
+fi
+
+echo "OK: migrations.targetVersion=$TARGET >= $REQUIRED (latest migration $MAX_N)"
diff --git a/hack/check-mongodb-rd-secrets.bats b/hack/check-mongodb-rd-secrets.bats
new file mode 100644
index 0000000000..23f2d255e2
--- /dev/null
+++ b/hack/check-mongodb-rd-secrets.bats
@@ -0,0 +1,146 @@
+#!/usr/bin/env bats
+# Unit test: mongodb-rd cozyrds must deliver the TLS trust anchor without
+# private key material.
+#
+# The PSMDB operator creates <release>-ca-cert holding the CA PRIVATE KEY and
+# <release>-ssl / <release>-ssl-internal holding server private keys. The tenant
+# must receive only the key-free <release>.tenant-ca projection, reached by
+# label. These names are the contract between this file and the operator, and
+# nothing else in the repo checks them at this level.
+#
+# The declaration that names the extraction source is a TenantProjection the
+# chart renders, covered by packages/apps/mongodb/tests/tenant_projection_test.yaml.
+
+load test_helper
+
+REPO_ROOT="$(cd "$(dirname "${BATS_TEST_FILENAME:-$0}")/.." && pwd)"
+COZYRDS="$REPO_ROOT/packages/system/mongodb-rd/cozyrds/mongodb.yaml"
+# Bound explicitly rather than read from BATS_TEST_FILENAME inside a test body.
+# These files run under hack/cozytest.sh, not bats: it executes each body with
+# set -u and never exports that variable, so a bare reference aborts the test —
+# and the runner stops at the first failure, taking every later test with it.
+# $0 is not a usable fallback either, since it expands to the runner's own path
+# and would silently scan the wrong file.
+SELF="$REPO_ROOT/hack/check-mongodb-rd-secrets.bats"
+
+@test "mongodb-rd checks use the set -e-safe negation form" {
+  # Guards the pattern itself, so the next negated assertion added here cannot
+  # be silently dead. `!`-prefixed commands are exempt from set -e.
+  # SELF is a hardcoded path and grep exits 2 on a missing file, which an `if`
+  # reads as simply false — so renaming this file would turn the guard green
+  # while it inspected nothing. Every other check here reads $COZYRDS through
+  # `grep -q` or a `$(yq ...)` assignment, both of which abort under set -e;
+  # this is the one input that can vanish quietly.
+  if [ ! -f "$SELF" ]; then
+    echo "SELF does not resolve ($SELF); this guard would be vacuous" >&2
+    exit 1
+  fi
+  # [[:space:]] rather than \s: the latter is a GNU/PCRE extension, not POSIX
+  # ERE, and degrades to a literal 's' on a BSD grep — which would make this
+  # guard vacuous, the one property a vacuity guard must not have.
+  if grep -nE '^[[:space:]]*![[:space:]]' "$SELF"; then
+    echo "Negated assertion above is exempt from set -e; use if/exit 1 instead" >&2
+    exit 1
+  fi
+}
+
+@test "mongodb-rd cozyrds selects the key-free projection by label" {
+  grep -q 'internal.cozystack.io/tenant-ca: "true"' "$COZYRDS"
+}
+
+@test "mongodb-rd cozyrds secrets.include path resolves" {
+  # Positive control for the two structural checks below. Both walk
+  # .spec.secrets.include, and yq returns 0 for a path that does not exist — so
+  # a rename of that field would leave them green while asserting nothing. The
+  # grep-based tests would not notice either, since the strings stay in the
+  # file. Deleting `include` outright is already caught by the label grep; this
+  # covers the rename.
+  n="$(yq '.spec.secrets.include // [] | length' "$COZYRDS")"
+  if [ "$n" -lt 2 ]; then
+    echo "spec.secrets.include has $n entries; the structural checks would be vacuous" >&2
+    exit 1
+  fi
+}
+
+@test "mongodb-rd cozyrds has no catch-all secrets selector" {
+  # The mine this guards: an include entry with an empty matchLabels and no
+  # resourceNames. LabelSelectorAsSelector({}) resolves to labels.Everything()
+  # and a nil resourceNames matches any name, so such an entry promotes EVERY
+  # Secret in the namespace — including the key-bearing TLS Secrets — to the
+  # tenant. Checked structurally rather than by grep, because the correct
+  # selector being present says nothing about a second, wider one alongside it.
+  empty="$(yq '[.spec.secrets.include[]
+    | select((.matchLabels // {} | length) == 0 and (.resourceNames // [] | length) == 0)]
+    | length' "$COZYRDS")"
+  if [ "$empty" != "0" ]; then
+    echo "Found $empty secrets.include entry/entries matching every Secret in the namespace" >&2
+    exit 1
+  fi
+}
+
+@test "mongodb-rd cozyrds does not hand the tenant any key-bearing secret by name" {
+  # resourceNames entries are name grants. The CA and leaf secrets each carry a
+  # private key, so neither may appear as one.
+  #
+  # Matched on the suffix over the parsed resourceNames lists, not on a literal
+  # spelling: the same object can be written "mongodb-{{ .name }}-ca-cert" or
+  # "{{ .release }}-ca-cert", and a grep pinned to either form misses the other.
+  # Walking the yq path also confines the check to grants, so a legitimate
+  # mention of one of these names elsewhere in the file cannot trip it.
+  leaks="$(yq '[.spec.secrets.include[].resourceNames[]?
+    | select(test("-(ca-cert|ssl|ssl-internal|ssl-old|ssl-internal-old)$"))]
+    | length' "$COZYRDS")"
+  if [ "$leaks" != "0" ]; then
+    echo "Found $leaks key-bearing secret(s) granted to the tenant by name" >&2
+    exit 1
+  fi
+}
+
+@test "mongodb-rd cozyrds excludes every key-bearing secret" {
+  # The exclude list is the structural backstop behind the label-only include
+  # selector, and nothing else pins it: deleting it leaves every other check in
+  # this file green. Asserted positively — a count alone would go vacuous on a
+  # renamed path, the same way the include checks would without their own
+  # positive control.
+  for name in ca-cert ssl ssl-internal ssl-old ssl-internal-old \
+             percona-server-mongodb-users mongodb-encryption-key mongodb-keyfile s3-creds; do
+    hits="$(yq "[.spec.secrets.exclude[].resourceNames[]? | select(. == \"mongodb-{{ .name }}-$name\")] | length" "$COZYRDS")"
+    if [ "$hits" != "1" ]; then
+      echo "mongodb-{{ .name }}-$name is not excluded (found $hits entries)" >&2
+      exit 1
+    fi
+  done
+}
+
+@test "mongodb-rd cozyrds excludes the operator-internal secrets" {
+  # These carry the internal- prefix rather than a release suffix, so they do
+  # not fit the loop above. Quoted: the template braces contain spaces, and an
+  # unquoted list item would word-split into "internal-mongodb-{{", ".name",
+  # "}}" and assert on three names that do not exist.
+  for name in "internal-mongodb-{{ .name }}" "internal-mongodb-{{ .name }}-users"; do
+    hits="$(yq "[.spec.secrets.exclude[].resourceNames[]? | select(. == \"$name\")] | length" "$COZYRDS")"
+    if [ "$hits" != "1" ]; then
+      echo "$name is not excluded (found $hits entries)" >&2
+      exit 1
+    fi
+  done
+}
+
+@test "mongodb-rd cozyrds still delivers the credentials secret" {
+  # The exclude list added alongside the trust anchor is evaluated BEFORE
+  # include and wins outright, so it now sits upstream of this pre-existing
+  # grant. Every other line in that block is about withholding a Secret, which
+  # makes adding this one to it a plausible edit — and one that would silently
+  # revoke the tenant's access to their own connection string. Assert both
+  # directions.
+  inc="$(yq '[.spec.secrets.include[].resourceNames[]? | select(. == "mongodb-{{ .name }}-credentials")] | length' "$COZYRDS")"
+  if [ "$inc" != "1" ]; then
+    echo "credentials is not granted via include (found $inc entries)" >&2
+    exit 1
+  fi
+  exc="$(yq '[.spec.secrets.exclude[].resourceNames[]? | select(. == "mongodb-{{ .name }}-credentials")] | length' "$COZYRDS")"
+  if [ "$exc" != "0" ]; then
+    echo "credentials appears in exclude, which wins over include" >&2
+    exit 1
+  fi
+}
diff --git a/hack/check-nats-rd-secrets.bats b/hack/check-nats-rd-secrets.bats
new file mode 100644
index 0000000000..855cb6fb1f
--- /dev/null
+++ b/hack/check-nats-rd-secrets.bats
@@ -0,0 +1,135 @@
+#!/usr/bin/env bats
+# Unit test: the nats trust anchor reaches tenants as a key-free projection, and
+# the two key-BEARING Secrets the chart creates never do.
+#
+# The chart issues nats-<name>-ca (CA certificate AND CA private key, the latter
+# under tls.key) and nats-<name>-tls (server certificate AND server private key).
+# Neither may be handed to a tenant: read access to the CA key would let the
+# holder issue certificates for anything rather than merely verify the server.
+#
+# What a client actually needs is ca.crt alone. That is delivered by the
+# CA-extraction controller as the key-free <release>.tenant-ca projection,
+# selected here by LABEL rather than by name. The label is stamped only on an
+# object the controller itself produced, whereas a name grant conveys whatever
+# happens to occupy the name.
+#
+# These assertions exist because both halves are one edit away from breaking
+# with a fully green chart suite, for two different reasons. The
+# ResourceDefinition is rendered, by the nats-rd chart inlining cozyrds/*, but
+# that chart carries neither a tests directory nor the test target
+# hack/helm-unit-tests.sh looks for.
+# The dashboard Role is rendered by a chart that has both, and no suite under
+# packages/apps/nats/tests/ asserts on it.
+#
+# The grants are asserted as WHITELISTS against rendered output rather than as
+# a blacklist of forbidden names over source text. A blacklist grepping for
+# "{{ .Release.Name }}-ca" is defeated by quoting the scalar, by $.Release.Name,
+# or by a fullname helper -- all of which grant the CA private key while the
+# guard stays green.
+
+load test_helper
+
+REPO_ROOT="$(cd "$(dirname "${BATS_TEST_FILENAME:-$0}")/.." && pwd)"
+COZYRDS="$REPO_ROOT/packages/system/nats-rd/cozyrds/nats.yaml"
+CHART="$REPO_ROOT/packages/apps/nats"
+
+# The complete set of grants the tenant holds, asserted as one value rather than
+# per-dimension: a name whitelist alone passes an added label selector, and a
+# label whitelist alone passes an added name. Either dimension can reach a
+# key-bearing Secret -- controller.cert-manager.io/fao is stamped on both of
+# them, so a selector on it is a one-line grant of the CA private key.
+EXPECTED_RD_INCLUDE='[{"resourceNames":["nats-{{ .name }}-credentials"]},{"matchLabels":{"internal.cozystack.io/tenant-ca":"true"}}]'
+
+# The dashboard template's entire RBAC output: every rule of the Role, and the
+# kinds it renders. Asserted whole rather than filtered down to the rules that mention
+# secrets, because every filter admits the spelling it did not anticipate: a rule
+# with no resourceNames names no Secret, a rule with resources ["*"] names no
+# resource, and a ClusterRole is not a Role. Each of those reaches both
+# key-bearing Secrets. There is no filter that is right for all of them, and one
+# comparison against the whole output needs none.
+EXPECTED_ROLE_RULES='[{"apiGroups":[""],"resources":["services"],"resourceNames":["nats-test"],"verbs":["get","list","watch"]},{"apiGroups":[""],"resources":["secrets"],"resourceNames":["nats-test-credentials"],"verbs":["get","list","watch"]},{"apiGroups":["cozystack.io"],"resources":["workloadmonitors"],"resourceNames":["nats-test"],"verbs":["get","list","watch"]}]'
+EXPECTED_RBAC_KINDS='["Role","RoleBinding"]'
+
+# Subsumed by the whitelist below, which cannot match without this entry. Kept
+# because the runner stops at the first failing test, so this one fires first
+# and says what the loss costs rather than printing two JSON blobs to diff.
+@test "nats-rd cozyrds selects the key-free tenant-CA projection by label" {
+  if [ ! -f "$COZYRDS" ]; then
+    echo "ResourceDefinition not found at $COZYRDS -- did it move?" >&2
+    exit 1
+  fi
+
+  count=$(yq eval \
+    '[.spec.secrets.include[] | select(.matchLabels."internal.cozystack.io/tenant-ca" == "true")] | length' \
+    "$COZYRDS") || exit 1
+
+  if [ "$count" -lt 1 ]; then
+    echo 'nats-rd does not select internal.cozystack.io/tenant-ca: "true"' >&2
+    echo "Without it the tenant cannot read ca.crt and TLS verification is impossible." >&2
+    exit 1
+  fi
+}
+
+@test "nats-rd cozyrds grants nothing beyond the credentials Secret and the trust anchor" {
+  if [ ! -f "$COZYRDS" ]; then
+    echo "ResourceDefinition not found at $COZYRDS -- did it move?" >&2
+    exit 1
+  fi
+
+  include=$(yq eval --output-format=json --indent=0 '.spec.secrets.include' "$COZYRDS") || exit 1
+
+  if [ "$include" != "$EXPECTED_RD_INCLUDE" ]; then
+    echo "Unexpected nats-rd spec.secrets.include: $include" >&2
+    echo "Expected exactly: $EXPECTED_RD_INCLUDE" >&2
+    echo "nats-<name>-ca holds the CA private key and nats-<name>-tls the server key;" >&2
+    echo "neither may be granted to a tenant, by name or by label." >&2
+    exit 1
+  fi
+}
+
+# Asserted against RENDERED output, so the spelling used in the template --
+# quoted, helper-derived, or otherwise -- cannot smuggle a name past the check.
+@test "nats dashboard Role renders exactly the grants it is supposed to" {
+  if [ ! -d "$CHART" ]; then
+    echo "Chart not found at $CHART -- did it move?" >&2
+    exit 1
+  fi
+
+  # stderr is deliberately not discarded: when the render breaks, helm's own
+  # message is the only thing that says why, and a CI red showing just
+  # "helm template failed" sends the reader back here to rerun it by hand.
+  rendered=$(helm template nats-test "$CHART" \
+    --namespace tenant-test \
+    --set '_cluster.cluster-domain=cozy.local' \
+    --show-only templates/dashboard-resourcemap.yaml) || {
+    echo "helm template failed for $CHART" >&2
+    exit 1
+  }
+
+  # eval-all aggregates the documents into one result, so the Role may sit at any
+  # position among them.
+  kinds=$(printf '%s\n' "$rendered" | yq eval-all --output-format=json --indent=0 \
+    '[.kind]' -) || exit 1
+
+  if [ "$kinds" != "$EXPECTED_RBAC_KINDS" ]; then
+    echo "Unexpected RBAC kinds rendered by the nats dashboard template: $kinds" >&2
+    echo "Expected exactly: $EXPECTED_RBAC_KINDS" >&2
+    echo "A ClusterRole here would grant across namespaces and is not covered by" >&2
+    echo "the rule comparison below, which reads the namespaced Role." >&2
+    exit 1
+  fi
+
+  # Fails closed on an empty list: a Role that stopped granting anything, or a
+  # render that silently produced nothing, does not match the expected rules.
+  rules=$(printf '%s\n' "$rendered" | yq eval-all --output-format=json --indent=0 \
+    '[select(.kind == "Role") | .rules[]]' -) || exit 1
+
+  if [ "$rules" != "$EXPECTED_ROLE_RULES" ]; then
+    echo "Unexpected rules in the nats dashboard Role: $rules" >&2
+    echo "Expected exactly: $EXPECTED_ROLE_RULES" >&2
+    echo "nats-<release>-ca holds the CA PRIVATE KEY and nats-<release>-tls the" >&2
+    echo "server private key. The trust anchor reaches the tenant as the key-free" >&2
+    echo "<release>.tenant-ca projection via tenantsecrets, not by a Role grant." >&2
+    exit 1
+  fi
+}
diff --git a/hack/check-opensearch-rd-secrets.bats b/hack/check-opensearch-rd-secrets.bats
new file mode 100644
index 0000000000..9b456abaf1
--- /dev/null
+++ b/hack/check-opensearch-rd-secrets.bats
@@ -0,0 +1,143 @@
+#!/usr/bin/env bats
+# Unit test: the opensearch ResourceDefinition hands tenants the key-free trust
+# anchor and nothing else.
+#
+# The chart issues opensearch-<name>.http-ca (CA certificate AND CA private key,
+# the latter under tls.key), opensearch-<name>-http-server and
+# opensearch-<name>-dashboards-server (each a server certificate AND its private
+# key). None may reach a tenant: read access to the CA key would let the holder
+# issue certificates for anything rather than merely verify the server. What a
+# client needs is ca.crt alone, delivered by the CA-extraction controller as the
+# key-free <release>.tenant-ca projection and selected by LABEL rather than by
+# name, because a name grant conveys whatever happens to occupy that name.
+#
+# Asserted against the RENDERED chart, not against cozyrds/opensearch.yaml on
+# disk. templates/cozyrd.yaml globs cozyrds/* and emits each match through
+# .Files.Get, so what ships is the render: reading one source file would miss a
+# second file in that directory, and a dotfile the glob picks up. Helm ignores
+# dotfiles only under templates/, so one here does ship. That is the whole reason
+# this file exists alongside hack/check-opensearch-readme.bats, which asserts the
+# same include shape by reading the one source file — narrower on purpose, and
+# blind to exactly this.
+#
+# This lives in bats rather than helm-unittest because packages/system/
+# opensearch-rd has no `test:` target, and hack/helm-unit-tests.sh skips any
+# package without one. If that package ever grows one, this belongs there.
+#
+# spec.secrets is compared WHOLE rather than probed for known-bad names. Three
+# ways this breaks are invisible to a name-by-name check:
+#
+#   - a name added under a different spelling, or via a helper;
+#   - an include with NO resourceNames and NO matchLabels, which restricts
+#     nothing;
+#   - a SECOND matchLabels include selecting a label the key-bearing Secrets also
+#     carry. cert-manager stamps controller.cert-manager.io/fao on every Secret it
+#     creates, all three of these among them, so one such entry grants the CA
+#     private key while every name in the file stays correct.
+
+load test_helper
+
+REPO_ROOT="$(cd "$(dirname "${BATS_TEST_FILENAME:-$0}")/.." && pwd)"
+CHART="$REPO_ROOT/packages/system/opensearch-rd"
+
+# The complete tenant-visible Secret surface. The credentials Secret by name; the
+# trust anchor by label. Nothing else.
+EXPECTED_SECRETS='{"exclude":[],"include":[{"resourceNames":["opensearch-{{ .name }}-credentials"]},{"matchLabels":{"internal.cozystack.io/tenant-ca":"true"}}]}'
+
+# Order within include is meaningless -- the matcher ORs across entries -- so the
+# array is sorted before comparing, and a missing exclude is normalized to the
+# empty list it means. Neither can hide a grant: sort preserves every entry (it is
+# not unique), and exclude only ever narrows.
+#
+# Kept as a filter string rather than a shell function because hack/cozytest.sh
+# inserts `return 0` before any line that is exactly `}`. A helper whose own last
+# command decides the outcome returns 0 regardless -- and whether a wrapper
+# propagates a failure at all then depends on the shell running it. Repeating the
+# helm invocation inline in each test costs two lines and owes nothing to that.
+NORMALIZE='{exclude: (.exclude // []), include: (.include | sort)}'
+
+# Every document count below uses `yq eval-all`, never `yq eval`. `eval` runs the
+# expression once PER DOCUMENT, so `[.] | length` reports 1 per document rather
+# than the number of documents. `eval-all` folds the stream into one expression.
+# Empty input still yields 1, since yq synthesizes a null document, so emptiness
+# is checked separately before counting.
+
+@test "opensearch-rd renders exactly one ApplicationDefinition" {
+  # stderr is deliberately not discarded: when the render breaks, helm's own
+  # message is the only thing that says why.
+  rendered=$(helm template opensearch-rd "$CHART") || return 1
+
+  # Fail closed: an empty render makes every assertion below vacuous, and yq
+  # cannot distinguish it from one document.
+  if [ -z "$rendered" ]; then
+    echo "helm template produced no output for $CHART -- guard is blind." >&2
+    return 1
+  fi
+
+  count=$(printf '%s\n' "$rendered" | yq eval-all '[.] | length' -) || return 1
+
+  if [ "$count" != "1" ]; then
+    echo "Expected exactly 1 rendered document from $CHART, got: $count" >&2
+    echo "templates/cozyrd.yaml globs cozyrds/*, so every file there -- including" >&2
+    echo "a dotfile -- ships its own tenant grants. Extend this suite before" >&2
+    echo "adding one." >&2
+    return 1
+  fi
+}
+
+@test "opensearch-rd selects the key-free tenant-CA projection by label" {
+  rendered=$(helm template opensearch-rd "$CHART") || return 1
+
+  if [ -z "$rendered" ]; then
+    echo "helm template produced no output for $CHART -- guard is blind." >&2
+    return 1
+  fi
+
+  count=$(printf '%s\n' "$rendered" | yq eval-all \
+    '[.. | select(has("secrets")) | .secrets.include[] | select(.matchLabels."internal.cozystack.io/tenant-ca" == "true")] | length' \
+    -) || return 1
+
+  if [ "$count" -lt 1 ]; then
+    echo 'opensearch-rd does not select internal.cozystack.io/tenant-ca: "true"' >&2
+    echo "Without it the tenant cannot read ca.crt and TLS verification is impossible." >&2
+    return 1
+  fi
+}
+
+# Whole-structure comparison. Anything added to the tenant's Secret surface -- by
+# name, by label, or by an unrestricted entry -- changes this string.
+@test "opensearch-rd exposes no Secret beyond the credentials and the trust anchor" {
+  rendered=$(helm template opensearch-rd "$CHART") || return 1
+
+  if [ -z "$rendered" ]; then
+    echo "helm template produced no output for $CHART -- guard is blind." >&2
+    return 1
+  fi
+
+  # eval-all again: with `eval`, a second rendered document would emit a second
+  # JSON object and the comparison below would run on a concatenation.
+  actual=$(printf '%s\n' "$rendered" \
+    | yq eval-all --output-format=json '[.. | select(has("secrets")) | .secrets]' - \
+    | jq --sort-keys --compact-output "if length == 1 then .[0] else . end | $NORMALIZE") || return 1
+
+  expected=$(printf '%s' "$EXPECTED_SECRETS" \
+    | jq --sort-keys --compact-output "$NORMALIZE") || return 1
+
+  # Fail closed: an empty or null result means spec.secrets stopped being readable
+  # at this path, so the guard is no longer observing what it claims.
+  if [ -z "$actual" ] || [ "$actual" = "null" ]; then
+    echo "spec.secrets is missing or unreadable in the rendered ResourceDefinition -- guard is blind." >&2
+    return 1
+  fi
+
+  if [ "$actual" != "$expected" ]; then
+    echo "Unexpected tenant Secret surface in the rendered opensearch-rd spec.secrets:" >&2
+    echo "  actual:   $actual" >&2
+    echo "  expected: $expected" >&2
+    echo "opensearch-<name>.http-ca holds the CA PRIVATE KEY, and -http-server and" >&2
+    echo "-dashboards-server each hold a server private key. None may be granted to" >&2
+    echo "a tenant, by name or by a label they also carry -- cert-manager stamps its" >&2
+    echo "own labels on all three." >&2
+    return 1
+  fi
+}
diff --git a/hack/check-opensearch-readme.bats b/hack/check-opensearch-readme.bats
new file mode 100644
index 0000000000..695b74dd2b
--- /dev/null
+++ b/hack/check-opensearch-readme.bats
@@ -0,0 +1,117 @@
+#!/usr/bin/env bats
+# Tests that the opensearch README.md has the correct structure after generation.
+#
+# These are static checks on the committed README.md — they do not invoke
+# make generate (which requires cozyvalues-gen in PATH). They verify that:
+#   1. tls.issuer description is not truncated (ends with "on and off")
+#   2. topologySpreadPolicy appears outside the TLS section
+#   3. opensearch-rd cozyrds labels the tenant CA and no server certificate
+
+load test_helper
+
+REPO_ROOT="$(cd "$(dirname "${BATS_TEST_FILENAME:-$0}")/.." && pwd)"
+README="$REPO_ROOT/packages/apps/opensearch/README.md"
+COZYRDS="$REPO_ROOT/packages/system/opensearch-rd/cozyrds/opensearch.yaml"
+
+@test "tls.issuer description is not truncated" {
+  # The last clause of the @field line in values.yaml. cozyvalues-gen copies only
+  # the first line of a description into the table, so a wrapped @field silently
+  # loses its tail and the row still renders.
+  grep -q "does switch TLS on and off" "$README"
+}
+
+@test "topologySpreadPolicy is not in TLS configuration section" {
+  # TLS section should contain only tls/tls.issuer rows, not topology spread.
+  # The awk pattern skips the heading line itself, then prints until the next
+  # section heading so the range is non-vacuous.
+  #
+  # if/exit rather than a `!` prefix, for the reason spelled out on the
+  # publish-ca-cert check below: under hack/cozytest.sh a negated pipeline cannot
+  # fail the test at all.
+  if awk '/### TLS configuration/{found=1; next} found && /^### /{exit} found' "$README" | grep -q "topologySpreadPolicy"; then
+    echo "topologySpreadPolicy appears inside the TLS configuration section" >&2
+    exit 1
+  fi
+}
+
+@test "topologySpreadPolicy appears in README at all" {
+  # Deliberately only presence. This is what stops the test above passing
+  # vacuously: a README that lost the row entirely would satisfy "not in the TLS
+  # section" without documenting the parameter anywhere. The "outside the TLS
+  # section" half is that test's job, not this one's.
+  grep -q "topologySpreadPolicy" "$README"
+}
+
+@test "cozyrds opensearch.yaml labels the tenant CA for the tenant registry" {
+  # The key-free trust anchor the CA-extraction controller publishes, selected by
+  # label rather than by name. This entry is the whole tenant read path: it drives the
+  # lineage webhook's tenantresource verdict, and the tenant reads the projection
+  # through core.cozystack.io/tenantsecrets, which the base tenant roles grant. The
+  # chart Role grants no name for it — tests/dashboard-resourcemap_test.yaml pins that.
+  grep -q "internal.cozystack.io/tenant-ca" "$COZYRDS"
+}
+
+@test "cozyrds opensearch.yaml exposes no server certificate to the tenant" {
+  # A tenant needs ca.crt to verify the endpoint and nothing more. Both the leaf
+  # Secret and the cert-manager CA Secret carry a private key under tls.key, so
+  # neither may be listed here — only the controller's key-free projection.
+  #
+  # Asserted on the SHAPE of secrets.include, not by grepping one spelling: this is
+  # the only thing standing between the CA private key and the tenant, and a name
+  # written a different way, or a selector that happens to match a key-bearing
+  # Secret, has to fail this too. Every entry must be one of exactly two known-safe
+  # forms — the credentials Secret by name, or the tenant-ca projection by label.
+  command -v yq >/dev/null || { echo "yq (mikefarah v4+) is required" >&2; exit 1; }
+
+  credentials='{"resourceNames":["opensearch-{{ .name }}-credentials"]}'
+  tenant_ca='{"matchLabels":{"internal.cozystack.io/tenant-ca":"true"}}'
+
+  entries="$(yq --output-format=json -I=0 '.spec.secrets.include[]' "$COZYRDS")"
+
+  # Guard against a vacuous pass. A loop over nothing is a green test, and this one
+  # guards tenant read access to a Secret holding the HTTP CA private key — so assert
+  # the list is the size we think it is before concluding anything about its members.
+  # Without this the test would still report ok if the path were restructured away.
+  # `|| true` because grep exits non-zero on no match, which under set -e would kill
+  # the test before the diagnostic below could explain what was expected.
+  count="$(printf '%s\n' "$entries" | grep -c '^{' || true)"
+  if [ "$count" -ne 2 ]; then
+      echo "expected exactly 2 secrets.include entries, found $count" >&2
+      printf '%s\n' "$entries" >&2
+      return 1
+  fi
+
+  while IFS= read -r entry; do
+      [ -n "$entry" ] || continue
+      if [ "$entry" != "$credentials" ] && [ "$entry" != "$tenant_ca" ]; then
+          echo "secrets.include has an entry that is neither the credentials Secret" >&2
+          echo "nor the key-free tenant-ca projection: $entry" >&2
+          return 1
+      fi
+  done <<EOF
+$entries
+EOF
+}
+
+@test "cozyrds opensearch.yaml selects the projection, never a publish source" {
+  # publish-ca-cert was a label-driven extraction leg that never shipped: no
+  # controller on main reads it. What ships is the TenantProjection sentinel, which
+  # names its source Secret outright, and the only label in the mechanism is
+  # tenant-ca on the projection the controller writes — which is what the selector
+  # above matches.
+  #
+  # The assertion outlives the leg it was written for. A publish-ca-cert selector
+  # here would be inert rather than dangerous today, but the name marked a
+  # key-bearing SOURCE — the cert-manager CA Secret, private key under tls.key — so
+  # reviving it as a selector is the one edit that would hand the tenant that key.
+  # Cheaper to keep the name out of this file than to re-derive that each time.
+  #
+  # NOT written as `! grep -q`. These files run under hack/cozytest.sh, which
+  # injects `return 0` ahead of the closing brace, and a `!`-prefixed pipeline is
+  # exempt from set -e — so a bare negation reports green under the runner CI uses
+  # while real bats fails it. if/exit is the form that survives both.
+  if grep -q "internal.cozystack.io/publish-ca-cert" "$COZYRDS"; then
+    echo "cozyrds selects on publish-ca-cert, which marks the key-bearing CA Secret" >&2
+    exit 1
+  fi
+}
diff --git a/hack/check-packages-artifact-ignores.bats b/hack/check-packages-artifact-ignores.bats
new file mode 100644
index 0000000000..dd469d550f
--- /dev/null
+++ b/hack/check-packages-artifact-ignores.bats
@@ -0,0 +1,74 @@
+#!/usr/bin/env bats
+# Invariant for the packages artifact that packages/core/installer pushes:
+#
+# `flux push artifact` REPLACES its built-in ignore list when --ignore-paths is
+# given rather than extending it, so the flag's value has to carry the defaults
+# as well. Dropping one of them re-admits a file class the artifact never
+# shipped before, and dropping node_modules/ re-admits the dependency tree that
+# `pnpm install` leaves under images/console: a single file above Helm's 5MB
+# per-file limit makes the dashboard chart unloadable on every cluster that
+# pulls the bundle ("decompressed chart file ... is larger than the maximum file
+# size 5242880"), with nothing in the build reporting it.
+#
+# Requires: make. flux is optional and only used to re-check the defaults.
+
+load test_helper
+
+REPO_ROOT="$(cd "$(dirname "${BATS_TEST_FILENAME:-$0}")/.." && pwd)"
+INSTALLER_MAKEFILE="$REPO_ROOT/packages/core/installer/Makefile"
+
+# The upstream defaults, as printed by `flux push artifact --help`. The second
+# test holds this copy against the installed flux so an upstream addition is
+# noticed instead of being silently left out of the artifact's ignore list.
+#
+# That second test needs flux, and the unit job has none, so it re-checks the
+# copy only where flux is installed -- a developer machine, or a lane that
+# installs it. It returns 0 rather than failing there, because a missing tool
+# is not a broken invariant; the first test is the one that holds on every
+# runner. `skip` is not available: hack/cozytest.sh is not bats and defines no
+# such function, so calling it aborts the suite instead of passing over a test.
+FLUX_DEFAULT_IGNORES=".git/,.gitignore,.gitmodules,.gitattributes,*.jpg,*.jpeg,*.gif,*.png,*.wmv,*.flv,*.tar.gz,*.zip"
+
+ignore_paths_value() {
+  sed -n 's/^PACKAGES_IGNORE_PATHS[[:space:]]*:*=[[:space:]]*//p' "$INSTALLER_MAKEFILE"
+}
+
+@test "the packages artifact ignores node_modules on top of flux's own defaults" {
+  command -v sed >/dev/null || { echo "sed is required" >&2; exit 1; }
+
+  value="$(ignore_paths_value)"
+  [ -n "$value" ] # PACKAGES_IGNORE_PATHS must exist to be passed to flux
+
+  # The recipe has to actually pass the variable, or the value is decoration.
+  grep -q -- "--ignore-paths='\$(PACKAGES_IGNORE_PATHS)'" "$INSTALLER_MAKEFILE"
+
+  printf '%s' ",$value," | grep -q ",node_modules/,"
+
+  # Every upstream default survives the override.
+  missing=""
+  while IFS= read -r pattern; do
+    printf '%s' ",$value," | grep -qF ",$pattern," || missing="$missing $pattern"
+  done <<EOF
+$(printf '%s' "$FLUX_DEFAULT_IGNORES" | tr ',' '\n')
+EOF
+  [ -z "$missing" ] || { echo "ignore list dropped flux defaults:$missing" >&2; return 1; }
+}
+
+@test "the recorded flux defaults match the installed flux" {
+  command -v flux >/dev/null || {
+    echo "flux not installed; the recorded defaults NOT re-checked in this run." >&2
+    return 0
+  }
+
+  # `--ignore-paths strings   set paths ... (default [a,b,c])`
+  installed="$(flux push artifact --help 2>&1 \
+    | sed -n 's/.*--ignore-paths .*(default \[\(.*\)\]).*/\1/p' \
+    | head -1)"
+  [ -n "$installed" ] # the help text must still advertise the defaults
+
+  [ "$installed" = "$FLUX_DEFAULT_IGNORES" ] || {
+    echo "flux defaults changed: $installed" >&2
+    echo "update FLUX_DEFAULT_IGNORES and PACKAGES_IGNORE_PATHS together" >&2
+    return 1
+  }
+}
diff --git a/hack/check-postgres-postgis-versions.bats b/hack/check-postgres-postgis-versions.bats
new file mode 100644
index 0000000000..27b5fe3adb
--- /dev/null
+++ b/hack/check-postgres-postgis-versions.bats
@@ -0,0 +1,43 @@
+#!/usr/bin/env bats
+# Unit test: the postgis flavor of packages/apps/postgres must run the same
+# PostgreSQL minor as the default flavor. files/versions.yaml and
+# files/postgis-versions.yaml are two maps kept by hand or by
+# hack/update-versions.sh; if they drift, `flavor: postgis` silently deploys
+# an older or newer minor than the one the chart advertises. The postgis
+# image must also be the standard-trixie variant: the chart archives through
+# the barman-cloud plugin, and the system variant is deprecated upstream.
+#
+# cozytest.sh sources this file into /bin/sh, which is dash on the CI runners:
+# POSIX shell only, no ${var//} and no <(...).
+
+load test_helper
+
+REPO_ROOT="$(cd "$(dirname "${BATS_TEST_FILENAME:-$0}")/.." && pwd)"
+PG_FILES="$REPO_ROOT/packages/apps/postgres/files"
+
+@test "postgis flavor pins the same PostgreSQL minor as the default flavor" {
+  checked=0
+  while IFS=': ' read -r major tag; do
+    major="$(printf '%s' "$major" | tr -d '"')"
+    tag="$(printf '%s' "$tag" | tr -d '"')"
+    [ -n "$major" ] || continue
+    minor="$(grep "^\"${major}\":" "$PG_FILES/versions.yaml" | sed -E 's/.*"v([0-9.]+)"$/\1/')"
+    [ -n "$minor" ] || { echo "$major is in postgis-versions.yaml but not in versions.yaml" >&2; exit 1; }
+    case "$tag" in
+      "${minor}"-*-standard-trixie) ;;
+      *) echo "$major: postgis tag $tag does not match PostgreSQL $minor standard-trixie" >&2; exit 1 ;;
+    esac
+    checked=$((checked + 1))
+  done < "$PG_FILES/postgis-versions.yaml"
+  [ "$checked" -gt 0 ] || { echo "no entry read from postgis-versions.yaml" >&2; exit 1; }
+}
+
+@test "postgis flavor covers every PostgreSQL major of the default flavor" {
+  pg_majors="$(sed -E 's/^"([^"]+)":.*/\1/' "$PG_FILES/versions.yaml" | sort | tr '\n' ' ')"
+  postgis_majors="$(sed -E 's/^"([^"]+)":.*/\1/' "$PG_FILES/postgis-versions.yaml" | sort | tr '\n' ' ')"
+  [ -n "$pg_majors" ] || { echo "no entry read from versions.yaml" >&2; exit 1; }
+  [ "$pg_majors" = "$postgis_majors" ] || {
+    echo "versions.yaml lists [$pg_majors] but postgis-versions.yaml lists [$postgis_majors]" >&2
+    exit 1
+  }
+}
diff --git a/hack/check-postgres-preload-allowlist.bats b/hack/check-postgres-preload-allowlist.bats
new file mode 100644
index 0000000000..aa68a42c10
--- /dev/null
+++ b/hack/check-postgres-preload-allowlist.bats
@@ -0,0 +1,52 @@
+#!/usr/bin/env bats
+# Unit test: the template-side allowlist for postgresql.sharedPreloadLibraries
+# in packages/apps/postgres/templates/db.yaml.
+#
+# The enum in values.schema.json rejects a bad name before rendering starts, and
+# helm-unittest always validates the schema, so the chart's own suite never
+# reaches the template check behind it. Rendering with --skip-schema-validation
+# is the only way to exercise that backstop, and it is the case the backstop
+# exists for.
+
+load test_helper
+
+REPO_ROOT="$(cd "$(dirname "${BATS_TEST_FILENAME:-$0}")/.." && pwd)"
+CHART="$REPO_ROOT/packages/apps/postgres"
+
+render_without_schema() {
+  helm template pg "$CHART" --namespace tenant-test --skip-schema-validation \
+    --set _cluster.cluster-domain=cozy.local \
+    --set "postgresql.sharedPreloadLibraries[0]=$1" 2>&1
+}
+
+@test "an allowed name renders when the schema is skipped" {
+  # Without this, the rejections below could pass on an unrelated render error.
+  out=$(render_without_schema pg_stat_statements) || { echo "$out" >&2; return 1; }
+  printf '%s\n' "$out" | grep -q 'shared_preload_libraries:'
+}
+
+@test "the template rejects a name outside the allowlist when the schema is skipped" {
+  if out=$(render_without_schema pg_cron); then
+    echo "render succeeded with pg_cron preloaded" >&2
+    return 1
+  fi
+  printf '%s\n' "$out" | grep -qF 'SECURITY: shared preload library "pg_cron" is not allowed.'
+}
+
+@test "the template rejects a library path when the schema is skipped" {
+  if out=$(render_without_schema /var/lib/postgresql/data/pgdata/evil.so); then
+    echo "render succeeded with a library path preloaded" >&2
+    return 1
+  fi
+  printf '%s\n' "$out" | grep -qF 'SECURITY: shared preload library "/var/lib/postgresql/data/pgdata/evil.so" is not allowed.'
+}
+
+@test "the template allowlist matches the schema enum" {
+  # The template names its list in the rejection message; the two lists drifting
+  # apart would leave one guard accepting what the other refuses.
+  out=$(render_without_schema pg_cron) && return 1
+  template=$(printf '%s\n' "$out" | sed -n 's/.* Allowed: \([^.]*\)\..*/\1/p' | tr -d ' ' | tr ',' '\n' | sort)
+  schema=$(jq -r '.properties.postgresql.properties.sharedPreloadLibraries.items.enum[]' "$CHART/values.schema.json" | sort)
+  [ -n "$template" ] || { echo "no allowlist found in: $out" >&2; return 1; }
+  [ "$template" = "$schema" ] || { printf 'template:\n%s\nschema:\n%s\n' "$template" "$schema" >&2; return 1; }
+}
diff --git a/hack/check-qdrant-rd-secrets.bats b/hack/check-qdrant-rd-secrets.bats
new file mode 100644
index 0000000000..5d92e5039c
--- /dev/null
+++ b/hack/check-qdrant-rd-secrets.bats
@@ -0,0 +1,142 @@
+#!/usr/bin/env bats
+# Unit test: the qdrant ResourceDefinition hands tenants the key-free trust
+# anchor and nothing else.
+#
+# The chart issues qdrant-<name>-ca (CA certificate AND CA private key, the
+# latter under tls.key) and qdrant-<name>-tls (server certificate AND server
+# private key). Neither may reach a tenant: read access to the CA key would
+# let the holder issue certificates for anything rather than merely verify the
+# server. What a client actually needs is ca.crt alone, delivered by the
+# CA-extraction controller as the key-free <release>.tenant-ca projection and
+# selected by LABEL rather than by name, because a name grant conveys whatever
+# happens to occupy that name.
+#
+# Asserted against the RENDERED chart, not against cozyrds/qdrant.yaml on
+# disk. templates/cozyrd.yaml globs cozyrds/* and emits each match through
+# .Files.Get, so what ships is the render: reading one source file would miss
+# a second file in that directory, and a dotfile the glob picks up. Helm
+# ignores dotfiles only under templates/, so one here does ship.
+#
+# This lives in bats rather than helm-unittest because packages/system/
+# qdrant-rd has no `test:` target, and hack/helm-unit-tests.sh skips any
+# package without one. If that package ever grows one, this belongs there.
+#
+# spec.secrets is compared WHOLE rather than probed for known-bad names.
+# Three ways this breaks are invisible to a name-by-name check:
+#
+#   - a name added under a different spelling, or via a helper;
+#   - an include with NO resourceNames and NO matchLabels, which restricts
+#     nothing;
+#   - a SECOND matchLabels include selecting a label the key-bearing Secrets
+#     also carry. cert-manager stamps controller.cert-manager.io/fao on the
+#     Secrets it creates, both of these among them, so one such entry grants
+#     the CA private key while every name in the file stays correct.
+
+load test_helper
+
+REPO_ROOT="$(cd "$(dirname "${BATS_TEST_FILENAME:-$0}")/.." && pwd)"
+CHART="$REPO_ROOT/packages/system/qdrant-rd"
+
+# The complete tenant-visible Secret surface. The API key by name; the trust
+# anchor by label. Nothing else.
+EXPECTED_SECRETS='{"exclude":[],"include":[{"resourceNames":["qdrant-{{ .name }}-apikey"]},{"matchLabels":{"internal.cozystack.io/tenant-ca":"true"}}]}'
+
+# Order within include is meaningless -- the matcher ORs across entries -- so
+# the array is sorted before comparing, and a missing exclude is normalized to
+# the empty list it means. Neither can hide a grant: sort preserves every
+# entry (it is not unique), and exclude only ever narrows.
+#
+# Kept as a filter string rather than a shell function because hack/cozytest.sh
+# inserts `return 0` before any line that is exactly `}`. A helper whose own
+# last command decides the outcome returns 0 regardless -- and whether a
+# wrapper propagates a failure at all then depends on the shell running it.
+# Repeating the helm invocation inline in each test costs two lines and owes
+# nothing to that.
+NORMALIZE='{exclude: (.exclude // []), include: (.include | sort)}'
+
+# Every document count below uses `yq eval-all`, never `yq eval`. `eval` runs
+# the expression once PER DOCUMENT, so `[.] | length` reports 1 per document
+# rather than the number of documents -- it prints "1" for a single document,
+# "1\n1" for two, and "1" for empty input, which would make a count check here
+# pass on exactly the cases it exists to catch. `eval-all` folds the stream
+# into one expression. Empty input still yields 1, since yq synthesizes a null
+# document, so emptiness is checked separately before counting.
+
+@test "qdrant-rd renders exactly one ApplicationDefinition" {
+  # stderr is deliberately not discarded: when the render breaks, helm's own
+  # message is the only thing that says why.
+  rendered=$(helm template qdrant-rd "$CHART") || return 1
+
+  # Fail closed: an empty render makes every assertion below vacuous, and yq
+  # cannot distinguish it from one document.
+  if [ -z "$rendered" ]; then
+    echo "helm template produced no output for $CHART -- guard is blind." >&2
+    return 1
+  fi
+
+  count=$(printf '%s\n' "$rendered" | yq eval-all '[.] | length' -) || return 1
+
+  if [ "$count" != "1" ]; then
+    echo "Expected exactly 1 rendered document from $CHART, got: $count" >&2
+    echo "templates/cozyrd.yaml globs cozyrds/*, so every file there -- including" >&2
+    echo "a dotfile -- ships its own tenant grants. Extend this suite before" >&2
+    echo "adding one." >&2
+    return 1
+  fi
+}
+
+@test "qdrant-rd selects the key-free tenant-CA projection by label" {
+  rendered=$(helm template qdrant-rd "$CHART") || return 1
+
+  if [ -z "$rendered" ]; then
+    echo "helm template produced no output for $CHART -- guard is blind." >&2
+    return 1
+  fi
+
+  count=$(printf '%s\n' "$rendered" | yq eval-all \
+    '[.. | select(has("secrets")) | .secrets.include[] | select(.matchLabels."internal.cozystack.io/tenant-ca" == "true")] | length' \
+    -) || return 1
+
+  if [ "$count" -lt 1 ]; then
+    echo 'qdrant-rd does not select internal.cozystack.io/tenant-ca: "true"' >&2
+    echo "Without it the tenant cannot read ca.crt and TLS verification is impossible." >&2
+    return 1
+  fi
+}
+
+# Whole-structure comparison. Anything added to the tenant's Secret surface --
+# by name, by label, or by an unrestricted entry -- changes this string.
+@test "qdrant-rd exposes no Secret beyond the API key and the trust anchor" {
+  rendered=$(helm template qdrant-rd "$CHART") || return 1
+
+  if [ -z "$rendered" ]; then
+    echo "helm template produced no output for $CHART -- guard is blind." >&2
+    return 1
+  fi
+
+  # eval-all again: with `eval`, a second rendered document would emit a
+  # second JSON object and the comparison below would run on a concatenation.
+  actual=$(printf '%s\n' "$rendered" \
+    | yq eval-all --output-format=json '[.. | select(has("secrets")) | .secrets]' - \
+    | jq --sort-keys --compact-output "if length == 1 then .[0] else . end | $NORMALIZE") || return 1
+
+  expected=$(printf '%s' "$EXPECTED_SECRETS" \
+    | jq --sort-keys --compact-output "$NORMALIZE") || return 1
+
+  # Fail closed: an empty or null result means spec.secrets stopped being
+  # readable at this path, so the guard is no longer observing what it claims.
+  if [ -z "$actual" ] || [ "$actual" = "null" ]; then
+    echo "spec.secrets is missing or unreadable in the rendered ResourceDefinition -- guard is blind." >&2
+    return 1
+  fi
+
+  if [ "$actual" != "$expected" ]; then
+    echo "Unexpected tenant Secret surface in the rendered qdrant-rd spec.secrets:" >&2
+    echo "  actual:   $actual" >&2
+    echo "  expected: $expected" >&2
+    echo "qdrant-<name>-ca holds the CA PRIVATE KEY and qdrant-<name>-tls the" >&2
+    echo "server private key. Neither may be granted to a tenant, by name or by" >&2
+    echo "a label they also carry -- cert-manager stamps its own labels on both." >&2
+    return 1
+  fi
+}
diff --git a/hack/check-rabbitmq-rd-secrets.bats b/hack/check-rabbitmq-rd-secrets.bats
new file mode 100644
index 0000000000..2fe8a5be9d
--- /dev/null
+++ b/hack/check-rabbitmq-rd-secrets.bats
@@ -0,0 +1,189 @@
+#!/usr/bin/env bats
+# Unit test: the rabbitmq trust anchor reaches tenants as a key-free projection,
+# and the key-BEARING Secrets around it never do.
+#
+# The chart issues rabbitmq-<name>-ca (CA certificate AND CA private key) and
+# rabbitmq-<name>-tls (server certificate AND server private key); the operator
+# issues rabbitmq-<name>-erlang-cookie, the cluster's shared secret. None of the
+# three may be handed to a tenant: read access to the CA key would let the holder
+# issue certificates for anything rather than merely verify the server.
+#
+# What a client needs is ca.crt alone. cluster-operator produces no CA object of
+# its own (spec.tls.caSecretName is an input it only consumes), so the chart mints
+# the CA through cert-manager and names that Secret in a TenantProjection
+# sentinel. The label selected on below is stamped by the CA-extraction
+# controller on the projection it writes, never on the CA Secret.
+#
+# These assertions exist because both halves are one edit away from breaking with
+# a fully green chart suite. The ResourceDefinition is rendered by the rabbitmq-rd
+# chart inlining cozyrds/*, and that chart carries no tests directory; the
+# dashboard Role is rendered by a chart that has one, but no suite there asserts
+# on the whole Role.
+#
+# The grants are asserted as WHITELISTS against whole values rather than as a
+# blacklist of forbidden names over source text. A blacklist grepping for
+# "rabbitmq-{{ .name }}-ca" is defeated by quoting the scalar, by a different
+# templating of the name, or by a label selector that happens to match it -- all
+# of which grant a private key while the guard stays green.
+
+load test_helper
+
+REPO_ROOT="$(cd "$(dirname "${BATS_TEST_FILENAME:-$0}")/.." && pwd)"
+COZYRDS="$REPO_ROOT/packages/system/rabbitmq-rd/cozyrds/rabbitmq.yaml"
+CHART="$REPO_ROOT/packages/apps/rabbitmq"
+
+# The complete set of grants the tenant holds, asserted as one value rather than
+# per-dimension: a name whitelist alone passes an added label selector, and a
+# label whitelist alone passes an added name. Either dimension reaches a
+# key-bearing Secret -- controller.cert-manager.io/fao is stamped on both the CA
+# and the leaf, so a selector on it is a one-line grant of the CA private key.
+EXPECTED_RD_INCLUDE='[{"resourceNames":["rabbitmq-{{ .name }}-default-user"]},{"matchLabels":{"internal.cozystack.io/tenant-ca":"true"}},{"matchLabels":{"apps.cozystack.io/user-secret":"true"}}]'
+
+# exclude is evaluated before include and wins, so it is the structural backstop
+# against a mis-stamped label on a key-bearing object. Asserted whole for the same
+# reason as the include: dropping one entry is the edit that has to be caught.
+EXPECTED_RD_EXCLUDE='[{"resourceNames":["rabbitmq-{{ .name }}-ca","rabbitmq-{{ .name }}-tls","rabbitmq-{{ .name }}-erlang-cookie"]}]'
+
+# The dashboard template's entire RBAC output: every rule of the Role, and the
+# kinds it renders. Asserted whole rather than filtered down to the rules that
+# mention secrets, because every filter admits the spelling it did not anticipate:
+# a rule with no resourceNames names no Secret, a rule with resources ["*"] names
+# no resource, and a ClusterRole is not a Role. Each of those reaches both
+# key-bearing Secrets, and one comparison against the whole output needs no filter.
+EXPECTED_RBAC_KINDS='["Role","RoleBinding"]'
+EXPECTED_ROLE_RULES='[{"apiGroups":[""],"resources":["secrets"],"resourceNames":["rabbitmq-test-default-user"],"verbs":["get","list","watch"]},{"apiGroups":[""],"resources":["services"],"resourceNames":["rabbitmq-test"],"verbs":["get","list","watch"]},{"apiGroups":["cozystack.io"],"resources":["workloadmonitors"],"resourceNames":["rabbitmq-test"],"verbs":["get","list","watch"]}]'
+
+# The secrets rule is the one place in this Role that grows from values, so the
+# whole-value assertion above only covers it while users is empty. This pins what
+# a declared user is allowed to add: its own credentials Secret and nothing else.
+EXPECTED_ROLE_RULES_WITH_USER='[{"apiGroups":[""],"resources":["secrets"],"resourceNames":["rabbitmq-test-default-user","rabbitmq-test-alice-credentials"],"verbs":["get","list","watch"]},{"apiGroups":[""],"resources":["services"],"resourceNames":["rabbitmq-test"],"verbs":["get","list","watch"]},{"apiGroups":["cozystack.io"],"resources":["workloadmonitors"],"resourceNames":["rabbitmq-test"],"verbs":["get","list","watch"]}]'
+
+render_rbac() {
+  # stderr is deliberately not discarded: when the render breaks, helm's own
+  # message is the only thing that says why, and a CI red showing just
+  # "helm template failed" sends the reader back here to rerun it by hand.
+  helm template rabbitmq-test "$CHART" \
+    --namespace tenant-test \
+    --set '_cluster.cluster-domain=cozy.local' \
+    "$@" \
+    --show-only templates/dashboard-resourcemap.yaml
+}
+
+# Subsumed by the whitelist below, which cannot match without this entry. Kept
+# because the runner stops at the first failing test, so this one fires first and
+# says what the loss costs rather than printing two JSON blobs to diff.
+@test "rabbitmq-rd cozyrds selects the key-free tenant-CA projection by label" {
+  if [ ! -f "$COZYRDS" ]; then
+    echo "ResourceDefinition not found at $COZYRDS -- did it move?" >&2
+    exit 1
+  fi
+
+  count=$(yq eval \
+    '[.spec.secrets.include[] | select(.matchLabels."internal.cozystack.io/tenant-ca" == "true")] | length' \
+    "$COZYRDS") || exit 1
+
+  if [ "$count" -lt 1 ]; then
+    echo 'rabbitmq-rd does not select internal.cozystack.io/tenant-ca: "true"' >&2
+    echo "Without it the tenant cannot read ca.crt and TLS verification is impossible." >&2
+    exit 1
+  fi
+}
+
+@test "rabbitmq-rd cozyrds grants nothing beyond the default user, the trust anchor and user credentials" {
+  if [ ! -f "$COZYRDS" ]; then
+    echo "ResourceDefinition not found at $COZYRDS -- did it move?" >&2
+    exit 1
+  fi
+
+  include=$(yq eval --output-format=json --indent=0 '.spec.secrets.include' "$COZYRDS") || exit 1
+
+  if [ "$include" != "$EXPECTED_RD_INCLUDE" ]; then
+    echo "Unexpected rabbitmq-rd spec.secrets.include: $include" >&2
+    echo "Expected exactly: $EXPECTED_RD_INCLUDE" >&2
+    echo "rabbitmq-<name>-ca holds the CA private key and rabbitmq-<name>-tls the" >&2
+    echo "server key; neither may be granted to a tenant, by name or by label." >&2
+    exit 1
+  fi
+}
+
+@test "rabbitmq-rd cozyrds keeps the key-bearing Secrets excluded" {
+  if [ ! -f "$COZYRDS" ]; then
+    echo "ResourceDefinition not found at $COZYRDS -- did it move?" >&2
+    exit 1
+  fi
+
+  exclude=$(yq eval --output-format=json --indent=0 '.spec.secrets.exclude' "$COZYRDS") || exit 1
+
+  if [ "$exclude" != "$EXPECTED_RD_EXCLUDE" ]; then
+    echo "Unexpected rabbitmq-rd spec.secrets.exclude: $exclude" >&2
+    echo "Expected exactly: $EXPECTED_RD_EXCLUDE" >&2
+    echo "exclude wins over include, so it is what stops a mis-stamped tenant-ca" >&2
+    echo "label on the CA, the leaf or the erlang cookie from reaching a tenant." >&2
+    exit 1
+  fi
+}
+
+# Asserted against RENDERED output, so the spelling used in the template --
+# quoted, helper-derived, or otherwise -- cannot smuggle a name past the check.
+@test "rabbitmq dashboard Role renders exactly the grants it is supposed to" {
+  if [ ! -d "$CHART" ]; then
+    echo "Chart not found at $CHART -- did it move?" >&2
+    exit 1
+  fi
+
+  rendered=$(render_rbac) || {
+    echo "helm template failed for $CHART" >&2
+    exit 1
+  }
+
+  # eval-all aggregates the documents into one result, so the Role may sit at any
+  # position among them.
+  kinds=$(printf '%s\n' "$rendered" | yq eval-all --output-format=json --indent=0 \
+    '[.kind]' -)
+
+  if [ "$kinds" != "$EXPECTED_RBAC_KINDS" ]; then
+    echo "Unexpected RBAC kinds rendered by the rabbitmq dashboard template: $kinds" >&2
+    echo "Expected exactly: $EXPECTED_RBAC_KINDS" >&2
+    echo "A ClusterRole here would grant across namespaces and is not covered by" >&2
+    echo "the rule comparison below, which reads the namespaced Role." >&2
+    exit 1
+  fi
+
+  # Fails closed on an empty list: a Role that stopped granting anything, or a
+  # render that silently produced nothing, does not match the expected rules.
+  rules=$(printf '%s\n' "$rendered" | yq eval-all --output-format=json --indent=0 \
+    '[select(.kind == "Role") | .rules[]]' -)
+
+  if [ "$rules" != "$EXPECTED_ROLE_RULES" ]; then
+    echo "Unexpected rules in the rabbitmq dashboard Role: $rules" >&2
+    echo "Expected exactly: $EXPECTED_ROLE_RULES" >&2
+    echo "rabbitmq-<release>-ca holds the CA PRIVATE KEY, rabbitmq-<release>-tls the" >&2
+    echo "server private key, and rabbitmq-<release>-erlang-cookie the cluster secret." >&2
+    echo "The trust anchor reaches the tenant as the key-free <release>.tenant-ca" >&2
+    echo "projection via tenantsecrets, not by a Role grant." >&2
+    exit 1
+  fi
+}
+
+@test "a declared rabbitmq user adds only its own credentials Secret to the Role" {
+  if [ ! -d "$CHART" ]; then
+    echo "Chart not found at $CHART -- did it move?" >&2
+    exit 1
+  fi
+
+  rendered=$(render_rbac --set 'users.alice.password=placeholder') || {
+    echo "helm template failed for $CHART" >&2
+    exit 1
+  }
+
+  rules=$(printf '%s\n' "$rendered" | yq eval-all --output-format=json --indent=0 \
+    '[select(.kind == "Role") | .rules[]]' -)
+
+  if [ "$rules" != "$EXPECTED_ROLE_RULES_WITH_USER" ]; then
+    echo "Unexpected rules with one declared user: $rules" >&2
+    echo "Expected exactly: $EXPECTED_ROLE_RULES_WITH_USER" >&2
+    echo "The secrets rule is the only part of this Role that grows from values," >&2
+    echo "so a name reaching it from the users loop is granted to the tenant." >&2
+    exit 1
+  fi
+}
diff --git a/hack/check-rabbitmq-topology-kinds.bats b/hack/check-rabbitmq-topology-kinds.bats
new file mode 100644
index 0000000000..c13589a006
--- /dev/null
+++ b/hack/check-rabbitmq-topology-kinds.bats
@@ -0,0 +1,110 @@
+#!/usr/bin/env bats
+# Unit test: the kinds the rabbitmq chart refuses to close the plaintext
+# listeners over are the kinds that actually wedge when it does.
+#
+# Setting tls.disableNonTLSListeners forces messaging-topology-operator onto a
+# management API whose per-release CA it cannot verify. Every kind that operator
+# drives through its shared TopologyReconciler carries a
+# deletion.finalizers.<plural>.rabbitmq.com finalizer that comes off only after a
+# successful call there, so all of them stop deleting at the same instant and sit
+# in Terminating with the upgrade reporting success. The chart guards the
+# transition by listing what is still in the namespace, which is only as good as
+# the list it iterates.
+#
+# The list lives in one place, templates/_topology.tpl, and is read from there by
+# the guard and by the confirmation command the refusal prints. This file holds
+# it against the two things it can drift from: the operator's own CRDs, which a
+# `make update` in packages/system/rabbitmq-operator can change under it, and the
+# runbook in the chart README, which an operator follows by hand.
+#
+# SuperStream is the one CRD in that group deliberately left out. It runs on its
+# own reconciler, which sets no finalizer at all, and the Queue, Exchange and
+# Binding objects it owns are already covered.
+
+load test_helper
+
+REPO_ROOT="$(cd "$(dirname "${BATS_TEST_FILENAME:-$0}")/.." && pwd)"
+HELPER="$REPO_ROOT/packages/apps/rabbitmq/templates/_topology.tpl"
+README="$REPO_ROOT/packages/apps/rabbitmq/README.md"
+OPERATOR_CRDS="$REPO_ROOT/packages/system/rabbitmq-operator/templates/messaging-topology-operator.yml"
+
+# The kinds the guard iterates, read off the single line the helper defines them
+# on. Parsed rather than rendered because helm cannot render a bare helper.
+helper_kinds() {
+  sed -n '/define "rabbitmq.topology.kinds"/,/^{{- end -}}$/p' "$HELPER" \
+    | sed -e '1d' -e '$d' \
+    | tr ' ' '\n' \
+    | sed '/^$/d'
+}
+
+# Kind and plural as the operator itself declares them, so the pluralisation the
+# helper applies is checked against its source rather than against a second copy
+# of the same rule.
+operator_names() {
+  yq eval-all \
+    '[select(.kind == "CustomResourceDefinition" and .spec.group == "rabbitmq.com")
+      | .spec.names.kind + " " + .spec.names.plural] | .[]' \
+    "$OPERATOR_CRDS"
+}
+
+@test "the guard iterates every topology kind the operator ships except SuperStream" {
+  if [ ! -f "$HELPER" ] || [ ! -f "$OPERATOR_CRDS" ]; then
+    echo "Missing $HELPER or $OPERATOR_CRDS -- did either move?" >&2
+    exit 1
+  fi
+
+  names=$(operator_names)
+  expected=$(printf '%s\n' "$names" | cut -d' ' -f1 | grep -v '^SuperStream$' | sort)
+  actual=$(helper_kinds | sort)
+
+  # A pipeline reports only its last element, so an unreadable manifest reaches
+  # here as an empty string rather than as a non-zero status.
+  if [ -z "$expected" ] || [ -z "$actual" ]; then
+    echo "Read no kinds: '$expected' from the CRDs, '$actual' from the helper." >&2
+    exit 1
+  fi
+
+  if [ "$expected" != "$actual" ]; then
+    echo "rabbitmq.topology.kinds does not match the operator's CRDs." >&2
+    echo "Declared by the operator, minus SuperStream:" >&2
+    printf '%s\n' "$expected" >&2
+    echo "Iterated by the guard:" >&2
+    printf '%s\n' "$actual" >&2
+    echo "A kind missing here renders cleanly and then wedges in Terminating," >&2
+    echo "because its finalizer needs the management API the flag just closed." >&2
+    exit 1
+  fi
+}
+
+# The refusal prints this command and the README repeats it as step 2 of the
+# runbook. An operator who runs a short version of it sees an empty namespace
+# that is not empty.
+@test "the README runbook names the operator plural of every kind the guard iterates" {
+  if [ ! -f "$README" ]; then
+    echo "Chart README not found at $README -- did it move?" >&2
+    exit 1
+  fi
+
+  # Built in the helper's own order, and with the operator's own plurals, so
+  # this is the exact string the refusal prints rather than a second spelling
+  # of it that happens to sort the same way.
+  names=$(operator_names)
+  expected=""
+  for kind in $(helper_kinds); do
+    plural=$(printf '%s\n' "$names" | awk -v k="$kind" '$1 == k { print $2 }')
+    if [ -z "$plural" ]; then
+      echo "No CRD in the operator manifest declares kind $kind." >&2
+      exit 1
+    fi
+    expected="${expected:+$expected,}$plural.rabbitmq.com"
+  done
+
+  actual=$(grep -o 'kubectl get [a-z.,]*\.rabbitmq\.com' "$README" | head -1 | sed 's/^kubectl get //')
+
+  if [ "$expected" != "$actual" ]; then
+    echo "The README runbook step does not check every wedging kind." >&2
+    echo "Expected: kubectl get $expected" >&2
+    echo "Found:    kubectl get $actual" >&2
+    exit 1
+  fi
+}
diff --git a/hack/check-rd-presets.sh b/hack/check-rd-presets.sh
index ceacc6efaa..f91ef893ac 100755
--- a/hack/check-rd-presets.sh
+++ b/hack/check-rd-presets.sh
@@ -16,6 +16,8 @@ EXPECTED=(
 )
 
 fail=0
+jq_err=$(mktemp)
+trap 'rm -f "$jq_err"' EXIT
 for f in packages/system/*-rd/cozyrds/*.yaml; do
   schema=$(yq -r '.spec.application.openAPISchema // ""' "$f")
   if [ -z "$schema" ]; then
@@ -24,19 +26,28 @@ for f in packages/system/*-rd/cozyrds/*.yaml; do
   # Pull every resourcesPreset enum out of the schema. Key on the JSON
   # path ending in "resourcesPreset" rather than a description heuristic,
   # so an unrelated field with "preset" in its description does not match.
-  enums=$(printf '%s' "$schema" | jq -r '
+  # A failed read can leave empty or partial output; neither is an enum to check.
+  if ! enums=$(jq -r '
     [paths(type == "object" and has("enum")) as $p
      | select($p[-1] == "resourcesPreset")
      | getpath($p).enum[]]
     | .[]
-  ' 2>/dev/null || true)
+  ' <<<"$schema" 2>"$jq_err"); then
+    echo "FAIL: $f openAPISchema could not be read: $(tr '\n' ' ' <"$jq_err")" >&2
+    fail=1
+    continue
+  fi
   if [ -z "$enums" ]; then
     continue
   fi
   missing=()
   for want in "${EXPECTED[@]}"; do
     # -F: literal match so the `.` in t1.nano does not match any character.
-    if ! printf '%s\n' "$enums" | grep -Fqx -- "$want"; then
+    # here-string, not a pipe: a `printf ... | grep -q` pipeline SIGPIPEs the
+    # printf when grep matches early and exits, and under `set -o pipefail` that
+    # 141 makes the whole pipeline read as failure — a false "missing" for a
+    # preset that is present (hit on the larger enums, e.g. kubernetes-rd).
+    if ! grep -Fqx -- "$want" <<<"$enums"; then
       missing+=("$want")
     fi
   done
@@ -47,8 +58,8 @@ for f in packages/system/*-rd/cozyrds/*.yaml; do
 done
 
 if [ "$fail" -ne 0 ]; then
-  echo "Some RD schemas are out of sync with the canonical preset set." >&2
-  echo "Run 'make generate' inside the affected chart directory." >&2
+  echo "Some RD schemas failed the preset check; see the errors above." >&2
+  echo "For missing presets, run 'make generate' inside the affected chart directory." >&2
   exit 1
 fi
 echo "All RD schemas carry the full 47-preset enum."
diff --git a/hack/check-rd-presets_test.bats b/hack/check-rd-presets_test.bats
new file mode 100644
index 0000000000..31b252e0fd
--- /dev/null
+++ b/hack/check-rd-presets_test.bats
@@ -0,0 +1,142 @@
+#!/usr/bin/env bats
+
+load test_helper
+
+REPO_ROOT="$(cd "$(dirname "${BATS_TEST_FILENAME:-$0}")/.." && pwd)"
+CHECK="$REPO_ROOT/hack/check-rd-presets.sh"
+
+canonical_presets() {
+    for family in t1 c1 s1 u1 m1; do
+        for size in nano micro small medium large xlarge 2xlarge 4xlarge; do
+            echo "$family.$size"
+        done
+    done
+    printf '%s\n' nano micro small medium large xlarge 2xlarge
+}
+
+write_schema() {
+    {
+        printf 'spec:\n  application:\n    openAPISchema: |\n'
+        sed 's/^/      /'
+    } > packages/system/foo-rd/cozyrds/foo.yaml
+}
+
+enum_schema() {
+    jq -Rn '{type: "object", properties: {resourcesPreset: {enum: [inputs]}}}' enums
+}
+
+make_tree() {
+    dir=$(mktemp -d)
+    cd "$dir" || return 1
+    mkdir -p packages/system/foo-rd/cozyrds packages/apps packages/extra
+    canonical_presets > enums
+    enum_schema | write_schema
+}
+
+run_check() {
+    rc=0
+    out=$("$CHECK" 2>&1) || rc=$?
+    printf '%s\n' "$out"
+}
+
+assert_unreadable() {
+    [ "$rc" -ne 0 ]
+    printf '%s\n' "$out" | grep -F 'FAIL: packages/system/foo-rd/cozyrds/foo.yaml openAPISchema could not be read:'
+    printf '%s\n' "$out" | grep -F 'parse error:'
+    case "$out" in
+        *"resourcesPreset enum missing"*) return 1 ;;
+    esac
+}
+
+cleanup() {
+    cd "$REPO_ROOT" || return 1
+    rm -rf "$dir"
+}
+
+@test "malformed schema fails with the file and jq diagnostic" {
+    make_tree
+    printf '{\n' | write_schema
+    run_check
+    assert_unreadable
+    cleanup
+}
+
+@test "jq failure after emitting presets cannot pass or report drift" {
+    make_tree
+    printf '%s\n' t1.nano t1.micro > enums
+    # jq emits the first document's enum before parsing the malformed next one.
+    { enum_schema; printf '{\n'; } | write_schema
+    run_check
+    assert_unreadable
+    cleanup
+}
+
+@test "a schema without resourcesPreset is skipped" {
+    make_tree
+    printf '{"type":"object"}\n' | write_schema
+    run_check
+    [ "$rc" -eq 0 ]
+    cleanup
+}
+
+@test "an absent schema is skipped" {
+    make_tree
+    printf 'spec: {}\n' > packages/system/foo-rd/cozyrds/foo.yaml
+    run_check
+    [ "$rc" -eq 0 ]
+    cleanup
+}
+
+@test "a complete canonical enum passes" {
+    make_tree
+    run_check
+    [ "$rc" -eq 0 ]
+    cleanup
+}
+
+@test "a preset list larger than the pipe buffer passes" {
+    make_tree
+    # Exceed the CI runner's 1 MiB pipe maximum to make a SIGPIPE regression deterministic.
+    while [ "$(wc -c < enums)" -lt 4194304 ]; do
+        cat enums enums > enums.next
+        mv enums.next enums
+    done
+    mkdir bin
+    cat > bin/jq <<'STUB'
+#!/bin/sh
+cat enums
+STUB
+    chmod +x bin/jq
+    PATH="$dir/bin:$PATH" run_check
+    [ "$rc" -eq 0 ]
+    cleanup
+}
+
+@test "a missing preset is reported by name" {
+    make_tree
+    canonical_presets | sed '/^c1\.medium$/d' > enums
+    enum_schema | write_schema
+    run_check
+    [ "$rc" -ne 0 ]
+    printf '%s\n' "$out" | grep -F 'resourcesPreset enum missing: c1.medium'
+    cleanup
+}
+
+@test "similar preset names do not satisfy exact membership" {
+    make_tree
+    canonical_presets | sed 's/^t1\.nano$/t1.nanoX/; s/^c1\.small$/c1Xsmall/' > enums
+    enum_schema | write_schema
+    run_check
+    [ "$rc" -ne 0 ]
+    printf '%s\n' "$out" | grep -F 'resourcesPreset enum missing: t1.nano c1.small'
+    cleanup
+}
+
+@test "EXPECTED contains exactly the canonical names" {
+    make_tree
+    sort enums > canonical.sorted
+    sed -n '/^EXPECTED=(/,/^)/p' "$CHECK" | sed '1d;$d' | tr -s '[:space:]' '\n' | sed '/^$/d' | sort > actual.sorted
+    [ "$(wc -l < canonical.sorted)" -eq 47 ]
+    diff -u canonical.sorted actual.sorted
+    cleanup
+}
diff --git a/hack/check-rd-release-prefix.bats b/hack/check-rd-release-prefix.bats
new file mode 100755
index 0000000000..1c6f4ae3ef
--- /dev/null
+++ b/hack/check-rd-release-prefix.bats
@@ -0,0 +1,58 @@
+#!/usr/bin/env bats
+# "contains <prefix>{{ .name }}" rather than a prefix match: operator-created
+# objects carry their own leading words, such as redis's "rfs-redis-{{ .name }}"
+# and mongodb's excluded "internal-mongodb-{{ .name }}-users".
+#
+# An empty spec.release.prefix is skipped: hack/update-crd.sh generates the
+# definitions for packages/extra charts with PREFIX="".
+
+load test_helper
+
+REPO_ROOT="$(cd "$(dirname "${BATS_TEST_FILENAME:-$0}")/.." && pwd)"
+
+@test "every resourceNames selector carries its release prefix" {
+  command -v yq >/dev/null || { echo "yq (mikefarah v4+) is required" >&2; exit 1; }
+
+  violations=""
+  total=0
+  for f in "$REPO_ROOT"/packages/system/*-rd/cozyrds/*.yaml; do
+    [ -f "$f" ] || continue
+    prefix="$(yq -r '.spec.release.prefix // ""' "$f")"
+    [ -n "$prefix" ] || continue
+
+    # One "<section>.<include|exclude> TAB <name> TAB <line comment>" row per
+    # selector entry. yq sees the comment only on a block-style entry: on a
+    # flow sequence ("[a, b] # ...") it belongs to the list, not to an entry.
+    rows="$(yq -r '
+      .spec | (.secrets, .services, .ingresses) | select(. != null)
+      | (.include, .exclude) | select(. != null) | .[]
+      | .resourceNames | select(. != null) | .[]
+      | [(path | .[1] + "." + .[2]), ., (line_comment // "")] | @tsv
+    ' "$f")"
+    [ -n "$rows" ] || continue
+    total=$(( total + $(printf '%s\n' "$rows" | grep -c .) ))
+
+    bad="$(printf '%s\n' "$rows" | awk -F '\t' -v needle="${prefix}{{ .name }}" -v file="${f#"$REPO_ROOT"/}" '
+      $3 ~ /cozy-lint:ignore rd-release-prefix/ {
+        if ($3 !~ /cozy-lint:ignore rd-release-prefix -- [^ ]/) print file ": " $1 ": " $2 " (exempted without a reason)"
+        next
+      }
+      index($2, needle) == 0 { print file ": " $1 ": " $2 }
+    ')"
+    [ -z "$bad" ] || violations="$violations$bad
+"
+  done
+
+  # A glob that matched nothing, or a yq that stopped returning names, would
+  # otherwise pass silently.
+  [ "$total" -ge 1 ] || { echo "inspected zero selectors; this test is broken" >&2; exit 1; }
+
+  if [ -n "$violations" ]; then
+    echo "resourceNames selectors that can never match the object their chart creates:" >&2
+    printf '%s' "$violations" >&2
+    echo "Fix: spell the release prefix out, e.g. \"harbor-{{ .name }}-credentials\"." >&2
+    echo "A name deliberately not derived from the release takes a trailing comment on its entry:" >&2
+    echo "  # cozy-lint:ignore rd-release-prefix -- <reason>" >&2
+    exit 1
+  fi
+}
diff --git a/hack/check-readiness.sh b/hack/check-readiness.sh
deleted file mode 100755
index bd3a3ffc30..0000000000
--- a/hack/check-readiness.sh
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/usr/bin/env bash
-# Check readiness of Packages, ArtifactGenerators, ExternalArtifacts, and HelmReleases
-# Shows only non-ready resources
-#
-# Usage: check-readiness.sh [-w [INTERVAL]]
-#   -w [INTERVAL]  Watch mode: refresh continuously every INTERVAL seconds (default: 5)
-
-set -euo pipefail
-
-KUBECTL="kubectl"
-if [[ -n "${KUBECONFIG:-}" ]]; then
-  KUBECTL="kubectl --kubeconfig=${KUBECONFIG}"
-fi
-
-RED='\033[0;31m'
-GREEN='\033[0;32m'
-YELLOW='\033[1;33m'
-BOLD='\033[1m'
-RESET='\033[0m'
-
-WATCH=0
-INTERVAL=5
-
-while [[ $# -gt 0 ]]; do
-  case "$1" in
-    -w|--watch)
-      WATCH=1
-      if [[ $# -gt 1 && "$2" =~ ^[0-9]+$ ]]; then
-        INTERVAL="$2"
-        shift
-      fi
-      shift
-      ;;
-    *) echo "Unknown argument: $1"; exit 2 ;;
-  esac
-done
-
-check_resource() {
-  local kind="$1"
-  local header_printed=0
-
-  while IFS= read -r line; do
-    if [[ "$line" =~ ^(NAME|NAMESPACE) ]]; then
-      continue
-    fi
-    if ! echo "$line" | awk '{for(i=1;i<=NF;i++) if($i=="True") exit 0; exit 1}'; then
-      if [[ $header_printed -eq 0 ]]; then
-        echo -e "${BOLD}${YELLOW}=== ${kind} (not ready) ===${RESET}"
-        header_printed=1
-      fi
-      echo -e "${RED}${line}${RESET}"
-      found_issues=1
-    fi
-  done < <($KUBECTL get "$kind" -A 2>/dev/null)
-
-  return 0
-}
-
-run_once() {
-  found_issues=0
-
-  check_resource packages.cozystack.io
-  check_resource artifactgenerators.source.extensions.fluxcd.io
-  check_resource externalartifacts.source.toolkit.fluxcd.io
-  check_resource helmreleases.helm.toolkit.fluxcd.io
-
-  if [[ $found_issues -eq 0 ]]; then
-    echo -e "${GREEN}${BOLD}All resources are ready.${RESET}"
-  fi
-}
-
-if [[ $WATCH -eq 1 ]]; then
-  while true; do
-    output=$(run_once 2>&1)
-    clear
-    echo -e "${BOLD}Last updated: $(date)  (refreshing every ${INTERVAL}s, Ctrl+C to stop)${RESET}\n"
-    echo -e "$output"
-    sleep "$INTERVAL"
-  done
-else
-  run_once
-  [[ $found_issues -eq 0 ]] || exit 1
-fi
diff --git a/hack/check-redis-rd-secrets.bats b/hack/check-redis-rd-secrets.bats
new file mode 100644
index 0000000000..915e870fa0
--- /dev/null
+++ b/hack/check-redis-rd-secrets.bats
@@ -0,0 +1,153 @@
+#!/usr/bin/env bats
+# Unit test: the redis ResourceDefinition hands tenants the key-free trust
+# anchor and nothing else.
+#
+# The chart issues redis-<name>.ca-tls (CA certificate AND CA private key, the
+# latter under tls.key) and redis-<name>.tls (server certificate AND server
+# private key). Neither may reach a tenant: read access to the CA key would
+# let the holder issue certificates for anything rather than merely verify the
+# server. What a client actually needs is ca.crt alone, delivered by the
+# CA-extraction controller as the key-free <release>.tenant-ca projection and
+# selected by LABEL rather than by name, because a name grant conveys whatever
+# happens to occupy that name.
+#
+# Redis has a third Secret the other engines do not: redis-<name>.ca-cert, the
+# CA-only copy the patched operator publishes for itself. It is key-free today,
+# which is exactly why it is tempting to grant by name — and why it is not.
+# The operator holds create and update on Secrets cluster-wide, so what lands
+# under that name is the operator's choice rather than the platform's, and RBAC
+# has no key-level filter to fall back on.
+#
+# Asserted against the RENDERED chart, not against cozyrds/redis.yaml on
+# disk. templates/cozyrd.yaml globs cozyrds/* and emits each match through
+# .Files.Get, so what ships is the render: reading one source file would miss
+# a second file in that directory, and a dotfile the glob picks up. Helm
+# ignores dotfiles only under templates/, so one here does ship.
+#
+# This lives in bats rather than helm-unittest because packages/system/
+# redis-rd has no `test:` target, and hack/helm-unit-tests.sh skips any
+# package without one. If that package ever grows one, this belongs there.
+#
+# spec.secrets is compared WHOLE rather than probed for known-bad names.
+# Three ways this breaks are invisible to a name-by-name check:
+#
+#   - a name added under a different spelling, or via a helper;
+#   - an include with NO resourceNames and NO matchLabels, which restricts
+#     nothing;
+#   - a SECOND matchLabels include selecting a label the key-bearing Secrets
+#     also carry. cert-manager stamps controller.cert-manager.io/fao on the
+#     Secrets it creates, both of these among them, so one such entry grants
+#     the CA private key while every name in the file stays correct.
+
+load test_helper
+
+REPO_ROOT="$(cd "$(dirname "${BATS_TEST_FILENAME:-$0}")/.." && pwd)"
+CHART="$REPO_ROOT/packages/system/redis-rd"
+
+# The complete tenant-visible Secret surface. The generated password by name;
+# the trust anchor by label. Nothing else. The two key-bearing Secrets are
+# named in exclude, which is evaluated before include and so backstops the
+# label-only entry against a mis-stamp.
+EXPECTED_SECRETS='{"exclude":[{"resourceNames":["redis-{{ .name }}.ca-tls","redis-{{ .name }}.tls","redis-{{ .name }}.ca-cert"]}],"include":[{"resourceNames":["redis-{{ .name }}-auth"]},{"matchLabels":{"internal.cozystack.io/tenant-ca":"true"}}]}'
+
+# Order within include is meaningless -- the matcher ORs across entries -- so
+# both arrays are sorted before comparing, and a missing exclude is normalized
+# to the empty list it means. Neither can hide a grant: sort preserves every
+# entry (it is not unique), and exclude only ever narrows.
+#
+# Kept as a filter string rather than a shell function because hack/cozytest.sh
+# inserts `return 0` before any line that is exactly `}`. A helper whose own
+# last command decides the outcome returns 0 regardless -- and whether a
+# wrapper propagates a failure at all then depends on the shell running it.
+# Repeating the helm invocation inline in each test costs two lines and owes
+# nothing to that.
+NORMALIZE='{exclude: ((.exclude // []) | sort), include: (.include | sort)}'
+
+# Every document count below uses `yq eval-all`, never `yq eval`. `eval` runs
+# the expression once PER DOCUMENT, so `[.] | length` reports 1 per document
+# rather than the number of documents -- it prints "1" for a single document,
+# "1\n1" for two, and "1" for empty input, which would make a count check here
+# pass on exactly the cases it exists to catch. `eval-all` folds the stream
+# into one expression. Empty input still yields 1, since yq synthesizes a null
+# document, so emptiness is checked separately before counting.
+
+@test "redis-rd renders exactly one ApplicationDefinition" {
+  # stderr is deliberately not discarded: when the render breaks, helm's own
+  # message is the only thing that says why.
+  rendered=$(helm template redis-rd "$CHART") || return 1
+
+  # Fail closed: an empty render makes every assertion below vacuous, and yq
+  # cannot distinguish it from one document.
+  if [ -z "$rendered" ]; then
+    echo "helm template produced no output for $CHART -- guard is blind." >&2
+    return 1
+  fi
+
+  count=$(printf '%s\n' "$rendered" | yq eval-all '[.] | length' -) || return 1
+
+  if [ "$count" != "1" ]; then
+    echo "Expected exactly 1 rendered document from $CHART, got: $count" >&2
+    echo "templates/cozyrd.yaml globs cozyrds/*, so every file there -- including" >&2
+    echo "a dotfile -- ships its own tenant grants. Extend this suite before" >&2
+    echo "adding one." >&2
+    return 1
+  fi
+}
+
+@test "redis-rd selects the key-free tenant-CA projection by label" {
+  rendered=$(helm template redis-rd "$CHART") || return 1
+
+  if [ -z "$rendered" ]; then
+    echo "helm template produced no output for $CHART -- guard is blind." >&2
+    return 1
+  fi
+
+  count=$(printf '%s\n' "$rendered" | yq eval-all \
+    '[.. | select(has("secrets")) | .secrets.include[] | select(.matchLabels."internal.cozystack.io/tenant-ca" == "true")] | length' \
+    -) || return 1
+
+  if [ "$count" -lt 1 ]; then
+    echo 'redis-rd does not select internal.cozystack.io/tenant-ca: "true"' >&2
+    echo "Without it the tenant cannot read ca.crt and TLS verification is impossible." >&2
+    return 1
+  fi
+}
+
+# Whole-structure comparison. Anything added to the tenant's Secret surface --
+# by name, by label, or by an unrestricted entry -- changes this string.
+@test "redis-rd exposes no Secret beyond the password and the trust anchor" {
+  rendered=$(helm template redis-rd "$CHART") || return 1
+
+  if [ -z "$rendered" ]; then
+    echo "helm template produced no output for $CHART -- guard is blind." >&2
+    return 1
+  fi
+
+  # eval-all again: with `eval`, a second rendered document would emit a
+  # second JSON object and the comparison below would run on a concatenation.
+  actual=$(printf '%s\n' "$rendered" \
+    | yq eval-all --output-format=json '[.. | select(has("secrets")) | .secrets]' - \
+    | jq --sort-keys --compact-output "if length == 1 then .[0] else . end | $NORMALIZE") || return 1
+
+  expected=$(printf '%s' "$EXPECTED_SECRETS" \
+    | jq --sort-keys --compact-output "$NORMALIZE") || return 1
+
+  # Fail closed: an empty or null result means spec.secrets stopped being
+  # readable at this path, so the guard is no longer observing what it claims.
+  if [ -z "$actual" ] || [ "$actual" = "null" ]; then
+    echo "spec.secrets is missing or unreadable in the rendered ResourceDefinition -- guard is blind." >&2
+    return 1
+  fi
+
+  if [ "$actual" != "$expected" ]; then
+    echo "Unexpected tenant Secret surface in the rendered redis-rd spec.secrets:" >&2
+    echo "  actual:   $actual" >&2
+    echo "  expected: $expected" >&2
+    echo "redis-<name>.ca-tls holds the CA PRIVATE KEY and redis-<name>.tls the" >&2
+    echo "server private key. Neither may be granted to a tenant, by name or by" >&2
+    echo "a label they also carry -- cert-manager stamps its own labels on both." >&2
+    echo "redis-<name>.ca-cert is key-free but operator-written, so it is not" >&2
+    echo "granted either; the trust anchor travels as the tenant-ca projection." >&2
+    return 1
+  fi
+}
diff --git a/hack/check-render-matrix.bats b/hack/check-render-matrix.bats
new file mode 100644
index 0000000000..3498079fb9
--- /dev/null
+++ b/hack/check-render-matrix.bats
@@ -0,0 +1,276 @@
+#!/usr/bin/env bats
+
+# Shared by bats and cozytest.sh: inspect exit codes directly, without bats-only
+# helpers. Scratch directories stay available if an assertion fails.
+
+load test_helper
+
+make_render_chart() {
+    mkdir -p "$1/templates"
+    printf 'apiVersion: v2\nname: render-test\nversion: 0.0.0\n' > "$1/Chart.yaml"
+    printf 'apiVersion: v1\nkind: ConfigMap\nmetadata:\n  name: render-test\n' > "$1/templates/object.yaml"
+}
+
+expect_render_failure() {
+    if output=$(dash hack/check-render-matrix.sh "$@" 2>&1); then
+        echo "expected render failure, got: $output" >&2
+        return 1
+    fi
+    printf '%s\n' "$output"
+}
+
+@test "rendered plus skipped accounts for every app chart" {
+    total=$(find packages/apps -mindepth 1 -maxdepth 1 -type d | wc -l | tr -d ' ')
+    output=$(dash hack/check-render-matrix.sh)
+    summary=$(printf '%s\n' "$output" | grep '^check-render-matrix:')
+    rendered=$(printf '%s\n' "$summary" | sed 's/.*: \([0-9]*\) rendered.*/\1/')
+    skipped=$(printf '%s\n' "$summary" | sed 's/.*, \([0-9]*\) skipped.*/\1/')
+    [ "$rendered" -gt 0 ]
+    [ "$((rendered + skipped))" -eq "$total" ]
+}
+
+@test "render matrix preserves multiple chart paths containing spaces" {
+    tmp=$(mktemp -d)
+    make_render_chart "$tmp/space in parent/first"
+    make_render_chart "$tmp/space in parent/second"
+    output=$(dash hack/check-render-matrix.sh "$tmp/space in parent/first/" "$tmp/space in parent/second")
+    printf '%s\n' "$output" | grep -Fx 'check-render-matrix: 2 rendered, 0 skipped'
+    rm -rf "$tmp"
+}
+
+@test "render matrix refuses empty discovery and ignores nested fixtures" {
+    tmp=$(mktemp -d)
+    mkdir -p "$tmp/hack/testdata/render-fixtures/validator"
+    cp hack/check-render-matrix.sh "$tmp/hack/"
+    cp hack/testdata/render-fixtures/fresh.yaml "$tmp/hack/testdata/render-fixtures/validator/nested.yaml"
+    output=$(cd "$tmp" && expect_render_failure)
+    printf '%s\n' "$output" | grep -F 'found no charts under packages/apps'
+    make_render_chart "$tmp/packages/apps/example"
+    output=$(cd "$tmp" && expect_render_failure)
+    printf '%s\n' "$output" | grep -F 'no fixtures under hack/testdata/render-fixtures'
+    rm -rf "$tmp"
+}
+
+@test "render matrix reports a broken chart and still checks the next chart" {
+    tmp=$(mktemp -d)
+    make_render_chart "$tmp/broken"
+    make_render_chart "$tmp/valid"
+    printf '{{ required "deliberately broken" .Values.nope }}\n' > "$tmp/broken/templates/object.yaml"
+    output=$(expect_render_failure "$tmp/broken" "$tmp/valid")
+    for fixture in hack/testdata/render-fixtures/*.yaml; do
+        state=$(basename "$fixture" .yaml)
+        printf '%s\n' "$output" | grep -Fx "FAIL broken ($state)"
+    done
+    printf '%s\n' "$output" | grep -F 'deliberately broken'
+    printf '%s\n' "$output" | grep -Fx 'check-render-matrix: 1 rendered, 0 skipped'
+    rm -rf "$tmp"
+}
+
+@test "render matrix fails on malformed YAML" {
+    tmp=$(mktemp -d)
+    make_render_chart "$tmp/badyaml"
+    printf 'a: b\n  c: d\n' > "$tmp/badyaml/templates/object.yaml"
+    output=$(expect_render_failure "$tmp/badyaml")
+    printf '%s\n' "$output" | grep -F 'FAIL badyaml'
+    printf '%s\n' "$output" | grep -F 'YAML parse error'
+    rm -rf "$tmp"
+}
+
+@test "render matrix does not count a nonexistent chart as rendered" {
+    tmp=$(mktemp -d)
+    output=$(expect_render_failure "$tmp/missing")
+    printf '%s\n' "$output" | grep -F 'FAIL missing'
+    printf '%s\n' "$output" | grep -Fx 'check-render-matrix: 0 rendered, 0 skipped'
+    rm -rf "$tmp"
+}
+
+@test "render matrix rejects skips that now render or fail for another reason" {
+    tmp=$(mktemp -d)
+    for name in vm-instance kubernetes-nodes; do
+        make_render_chart "$tmp/$name"
+        output=$(expect_render_failure "$tmp/$name")
+        printf '%s\n' "$output" | grep -F 'chart now renders; remove its skip'
+        printf '{{ fail "unrelated render failure" }}\n' > "$tmp/$name/templates/object.yaml"
+        output=$(expect_render_failure "$tmp/$name")
+        printf '%s\n' "$output" | grep -F 'unrelated render failure'
+        printf '%s\n' "$output" | grep -Fx 'check-render-matrix: 0 rendered, 0 skipped'
+    done
+    rm -rf "$tmp"
+}
+
+@test "render matrix counts documented lookup failures as skipped" {
+    tmp=$(mktemp -d)
+    make_render_chart "$tmp/vm-instance"
+    make_render_chart "$tmp/kubernetes-nodes"
+    printf '%s\n' '{{ fail "Specified instanceType does not exist in the cluster: u1.medium" }}' > "$tmp/vm-instance/templates/object.yaml"
+    printf '%s\n' '{{ fail `specified instanceType "u1.medium" not found in cluster` }}' > "$tmp/kubernetes-nodes/templates/object.yaml"
+    output=$(dash hack/check-render-matrix.sh "$tmp/vm-instance" "$tmp/kubernetes-nodes")
+    printf '%s\n' "$output" | grep -F 'SKIP vm-instance ('
+    printf '%s\n' "$output" | grep -F 'SKIP kubernetes-nodes ('
+    printf '%s\n' "$output" | grep -Fx 'check-render-matrix: 0 rendered, 2 skipped'
+    rm -rf "$tmp"
+}
+
+@test "fixtures match the injected value types" {
+    for fixture in hack/testdata/render-fixtures/*.yaml; do
+        helm template fixture-check hack/testdata/render-fixtures/validator \
+            --set-file "fixture=$fixture"
+    done
+}
+
+@test "fixture validation rejects wrong scalar and scheduling types" {
+    tmp=$(mktemp -d)
+    for value in true 12 null '[]' '{}'; do
+        printf '_cluster:\n  oidc-enabled: %s\n_namespace: {host: "example.org"}\n' "$value" > "$tmp/value.yaml"
+        if output=$(helm template fixture-check hack/testdata/render-fixtures/validator \
+            --set-file "fixture=$tmp/value.yaml" 2>&1); then
+            echo "accepted non-string oidc-enabled: $value" >&2
+            exit 1
+        fi
+        printf '%s\n' "$output" | grep -F '_cluster.oidc-enabled must be a string'
+    done
+    for value in true 12 null '[]' '{}'; do
+        printf '_cluster:\n  scheduling:\n    globalAppTopologySpreadConstraints: %s\n    dedicatedNodesForWindowsVMs: "false"\n_namespace: {host: "example.org"}\n' "$value" > "$tmp/value.yaml"
+        if output=$(helm template fixture-check hack/testdata/render-fixtures/validator \
+            --set-file "fixture=$tmp/value.yaml" 2>&1); then
+            echo "accepted non-string scheduling constraint: $value" >&2
+            exit 1
+        fi
+        printf '%s\n' "$output" | grep -F '_cluster.scheduling.globalAppTopologySpreadConstraints must be a string'
+    done
+    rm -rf "$tmp"
+}
+
+@test "fixture validation rejects malformed maps and missing scheduling keys" {
+    tmp=$(mktemp -d)
+    for variant in malformed-yaml empty-namespace branding-scalar namespace-map scheduling-scalar missing-scheduling missing-constraint missing-windows; do
+        cluster_extra=''
+        scheduling='scheduling:'
+        namespace='host: "example.org"'
+        constraint='globalAppTopologySpreadConstraints: ""'
+        windows='dedicatedNodesForWindowsVMs: "false"'
+        case "$variant" in
+            malformed-yaml) constraint='['; windows=''; expected='error converting YAML to JSON' ;;
+            empty-namespace) namespace=''; expected='_namespace must be a non-empty map' ;;
+            branding-scalar) cluster_extra='branding: true'; expected='_cluster.branding must be a map' ;;
+            namespace-map) namespace='branding: {}'; expected='_namespace.branding must be a string' ;;
+            scheduling-scalar) constraint='true'; windows=''; expected='_cluster.scheduling must be a map' ;;
+            missing-scheduling) cluster_extra='oidc-enabled: "false"'; scheduling=''; constraint=''; windows=''; expected='_cluster.scheduling must be a map' ;;
+            missing-constraint) constraint=''; expected='_cluster.scheduling.globalAppTopologySpreadConstraints is missing' ;;
+            missing-windows) windows=''; expected='_cluster.scheduling.dedicatedNodesForWindowsVMs is missing' ;;
+        esac
+        printf '_cluster:\n  %s\n  %s\n    %s\n    %s\n_namespace: {%s}\n' \
+            "$cluster_extra" "$scheduling" "$constraint" "$windows" "$namespace" > "$tmp/value.yaml"
+        if output=$(helm template fixture-check hack/testdata/render-fixtures/validator \
+            --set-file "fixture=$tmp/value.yaml" 2>&1); then
+            echo "accepted invalid fixture: $variant" >&2
+            exit 1
+        fi
+        printf '%s\n' "$output" | grep -F "$expected"
+    done
+    rm -rf "$tmp"
+}
+
+@test "configured scheduling reaches the postgres manifest" {
+    tmp=$(mktemp -d)
+    for state in fresh configured wildcard; do
+        helm template postgres-render-check packages/apps/postgres -n tenant-test \
+            -f "hack/testdata/render-fixtures/$state.yaml" > "$tmp/$state.yaml"
+    done
+    if grep -q '^  topologySpreadConstraints:' "$tmp/fresh.yaml"; then
+        echo 'fresh unexpectedly enables topology spread' >&2
+        exit 1
+    fi
+    for state in configured wildcard; do
+        grep -A 7 '^  topologySpreadConstraints:' "$tmp/$state.yaml" > "$tmp/constraints"
+        grep -F 'maxSkew: 1' "$tmp/constraints"
+        grep -F 'topologyKey: topology.kubernetes.io/zone' "$tmp/constraints"
+        grep -F 'cnpg.io/cluster: postgres-render-check' "$tmp/constraints"
+    done
+    rm -rf "$tmp"
+}
+
+@test "render matrix reaches capability-gated OIDC templates" {
+    tmp=$(mktemp -d)
+    make_render_chart "$tmp/tenant"
+    cat > "$tmp/tenant/templates/object.yaml" <<'EOF'
+{{- if and (eq (index .Values._cluster "oidc-enabled") "true") (.Capabilities.APIVersions.Has "v1.edp.epam.com/v1") }}
+{{- fail "OIDC branch rendered" }}
+{{- end }}
+EOF
+    output=$(expect_render_failure "$tmp/tenant")
+    printf '%s\n' "$output" | grep -Fx 'FAIL tenant (configured)'
+    printf '%s\n' "$output" | grep -Fx 'FAIL tenant (wildcard)'
+    printf '%s\n' "$output" | grep -F 'OIDC branch rendered'
+    if printf '%s\n' "$output" | grep -Fq 'FAIL tenant (fresh)'; then
+        echo 'OIDC branch enabled for fresh fixture' >&2
+        exit 1
+    fi
+    rm -rf "$tmp"
+}
+
+@test "fixture states enable OIDC groups and shared-service resources" {
+    tmp=$(mktemp -d)
+    for state in fresh configured wildcard; do
+        helm template tenant-check packages/apps/tenant -n tenant-test \
+            --api-versions v1.edp.epam.com/v1 \
+            -f "hack/testdata/render-fixtures/$state.yaml" > "$tmp/tenant.yaml"
+        helm template kubernetes-check packages/apps/kubernetes -n tenant-test \
+            -f "hack/testdata/render-fixtures/$state.yaml" > "$tmp/kubernetes.yaml"
+        groups=$(awk '/^kind: KeycloakRealmGroup$/ {n++} END {print n+0}' "$tmp/tenant.yaml")
+        metrics=$(awk '/^  name: kubernetes-check-metrics-server$/ {n++} END {print n+0}' "$tmp/kubernetes.yaml")
+        case "$state" in
+            fresh) [ "$groups" -eq 0 ]; [ "$metrics" -eq 0 ] ;;
+            *) [ "$groups" -eq 4 ]; [ "$metrics" -eq 1 ] ;;
+        esac
+    done
+    rm -rf "$tmp"
+}
+
+@test "certificate fixtures exercise per-host ACME and wildcard ingress" {
+    tmp=$(mktemp -d)
+    for state in configured wildcard; do
+        helm template harbor-check packages/apps/harbor -n tenant-test \
+            -f "hack/testdata/render-fixtures/$state.yaml" \
+            --show-only templates/ingress.yaml > "$tmp/$state.yaml"
+        grep -Fx 'kind: Ingress' "$tmp/$state.yaml"
+        grep -F 'harbor-check.example.org' "$tmp/$state.yaml"
+    done
+    grep -F 'acme.cert-manager.io/http01-ingress-ingressclassname: tenant-test' "$tmp/configured.yaml"
+    grep -F 'cert-manager.io/cluster-issuer: letsencrypt-prod' "$tmp/configured.yaml"
+    grep -F 'secretName: harbor-check-ingress-tls' "$tmp/configured.yaml"
+    grep -Fx '  tls:' "$tmp/wildcard.yaml"
+    if grep -Eq '^[[:space:]]+(acme.cert-manager.io/|cert-manager.io/cluster-issuer:|secretName:)' "$tmp/wildcard.yaml"; then
+        echo 'wildcard ingress unexpectedly requests a per-host certificate' >&2
+        exit 1
+    fi
+    rm -rf "$tmp"
+}
+
+@test "every pair of fixture states produces different deterministic manifests" {
+    tmp=$(mktemp -d)
+    count=0
+    for fixture in hack/testdata/render-fixtures/*.yaml; do
+        state=$(basename "$fixture" .yaml)
+        count=$((count + 1))
+        # This compares whole states; the tests above assert specific branches.
+        # Render twice so randomness cannot masquerade as state coverage.
+        for run in first second; do
+            helm template tenant-check packages/apps/tenant -n tenant-test \
+                --api-versions v1.edp.epam.com/v1 -f "$fixture" > "$tmp/$state-$run.yaml"
+        done
+        cmp "$tmp/$state-first.yaml" "$tmp/$state-second.yaml"
+        cp "$tmp/$state-first.yaml" "$tmp/$state.manifests"
+    done
+    [ "$count" -ge 3 ]
+    for a in "$tmp"/*.manifests; do
+        for b in "$tmp"/*.manifests; do
+            [ "$a" != "$b" ] || continue
+            if cmp -s "$a" "$b"; then
+                echo "fixture states produce identical manifests: $a and $b" >&2
+                exit 1
+            fi
+        done
+    done
+    rm -rf "$tmp"
+}
diff --git a/hack/check-render-matrix.sh b/hack/check-render-matrix.sh
new file mode 100755
index 0000000000..faff145b9e
--- /dev/null
+++ b/hack/check-render-matrix.sh
@@ -0,0 +1,87 @@
+#!/bin/sh
+# Render app charts on their defaults plus injected cluster/namespace values.
+# helm-unittest renders only templates selected by a suite; this smoke check
+# also reaches templates with no assertions. It checks rendering, not Kubernetes
+# schema validity or runtime behavior. See testdata/render-fixtures/README.md.
+# Usage (from the repository root): hack/check-render-matrix.sh [chart-dir ...]
+set -eu
+
+FIXTURE_DIR="hack/testdata/render-fixtures"
+
+# Empty lookup results are the only accepted reason to skip a chart. Match the
+# actual diagnostic, so another error cannot keep an obsolete skip alive.
+skip_reason() {
+  case "$1" in
+    vm-instance) echo 'Specified instanceType does not exist in the cluster: u1.medium' ;;
+    kubernetes-nodes) echo 'specified instanceType "u1.medium" not found in cluster' ;;
+    *) echo "" ;;
+  esac
+}
+
+render_chart() {
+  chart=$1 fixture=$2
+  name=$(basename "$chart")
+  case "$name" in
+    tenant) set -- tenant-sub --api-versions v1.edp.epam.com/v1 ;;
+    # Satisfy the parent-cluster and release-name contract before the lookup.
+    kubernetes-nodes) set -- kubernetes-nodes-render-check --set-string cluster=render ;;
+    *) set -- "$name-render-check" ;;
+  esac
+  helm template "$@" "$chart" -n tenant-test -f "$fixture"
+}
+
+if [ "$#" -eq 0 ]; then
+  set -- packages/apps/*/
+  if [ ! -d "$1" ]; then
+    echo "check-render-matrix: found no charts under packages/apps" >&2
+    exit 1
+  fi
+fi
+
+# Check exactly the files the render loop will consume, not nested fixtures.
+fixtures=0
+for fixture in "$FIXTURE_DIR"/*.yaml; do
+  [ -f "$fixture" ] || continue
+  fixtures=$((fixtures + 1))
+done
+if [ "$fixtures" -eq 0 ]; then
+  echo "check-render-matrix: no fixtures under $FIXTURE_DIR" >&2
+  exit 1
+fi
+
+errors=$(mktemp)
+trap 'rm -f "$errors"' EXIT
+rc=0 rendered=0 skipped=0
+for dir in "$@"; do
+  name=$(basename "$dir")
+  reason=$(skip_reason "$name")
+  chart_failed=0
+  for fixture in "$FIXTURE_DIR"/*.yaml; do
+    [ -f "$fixture" ] || continue
+    state=$(basename "$fixture" .yaml)
+    if render_chart "$dir" "$fixture" >/dev/null 2>"$errors"; then
+      if [ -z "$reason" ]; then
+        continue
+      fi
+      echo "FAIL $name ($state): chart now renders; remove its skip"
+    else
+      if [ -n "$reason" ] && grep -Fq "$reason" "$errors"; then
+        continue
+      fi
+      echo "FAIL $name ($state)"
+      sed -n '/^level=INFO/d; s/^/    /; p' "$errors"
+    fi
+    rc=1
+    chart_failed=1
+  done
+  [ "$chart_failed" -eq 0 ] || continue
+  if [ -n "$reason" ]; then
+    echo "SKIP $name ($reason)"
+    skipped=$((skipped + 1))
+  else
+    rendered=$((rendered + 1))
+  fi
+done
+
+echo "check-render-matrix: $rendered rendered, $skipped skipped"
+exit "$rc"
diff --git a/hack/check-talosconfigtemplate-name-agreement.bats b/hack/check-talosconfigtemplate-name-agreement.bats
new file mode 100755
index 0000000000..5f3a298293
--- /dev/null
+++ b/hack/check-talosconfigtemplate-name-agreement.bats
@@ -0,0 +1,169 @@
+#!/usr/bin/env bats
+# -----------------------------------------------------------------------------
+# The TalosConfigTemplate is named after a content hash of the worker machine
+# config, and three places in kubernetes-nodes have to arrive at that name:
+#
+#   * talos-reconcile-job.yaml creates the object, passing the name to the Job
+#     as TCT_NAME;
+#   * the same file's Role pins the Job's get/patch/update and delete rights on
+#     TalosConfigTemplates to it by resourceNames;
+#   * nodegroup.yaml points MachineDeployment.spec.template.spec.bootstrap
+#     .configRef.name at it.
+#
+# If the Job and the MachineDeployment disagree, the MachineDeployment
+# references a TalosConfigTemplate that is never created. If the Role disagrees,
+# the Job's server-side apply -- a PATCH on the name, even for a create -- is
+# Forbidden and the template is never created either. CAPI does not fail in
+# either case: it blocks on "templates do not exist" and no worker is ever
+# built, so the divergence surfaces as a cluster that quietly never scales
+# rather than as a render error.
+#
+# The chart's helm-unittest suites pin both names, but each pins its own
+# literal in its own file. That catches a divergence, yet the output only says
+# one literal moved -- which reads as a stale fixture, and re-pasting the new
+# value is then the obvious and wrong fix. This guard renders the chart ONCE and
+# compares the two values against each other, so the failure states the
+# invariant instead of a number.
+#
+# Rendered with explicit resources rather than an instanceType: an
+# instanceType-sized pool resolves its kubelet reservations through a live
+# `lookup` of the VirtualMachineClusterInstancetype, which is empty outside a
+# cluster. The invariant under test does not depend on which sizing source is
+# used -- both consumers read the same assembled group either way.
+#
+# Compatible with both `bats` directly and the in-repo cozytest.sh runner, which
+# runs each @test in a fresh subshell under `set -u` and honors no setup() or
+# teardown(), so TMP is provisioned inline per test and cleaned without an EXIT
+# trap (docs/agents/e2e-testing.md bans those here).
+
+load test_helper
+
+REPO_ROOT="$(cd "$(dirname "${BATS_TEST_FILENAME:-$0}")/.." && pwd)"
+CHART="$REPO_ROOT/packages/apps/kubernetes-nodes"
+
+render_pool() {
+  # $1: output file, remaining args: extra --set flags for the pool shape
+  out="$1"; shift
+  helm template kubernetes-nodes-myk8s-md0 "$CHART" \
+    --namespace tenant-test \
+    --set cluster=myk8s \
+    --set _cluster.cluster-domain=cozy.local \
+    --set version=v1.35 \
+    --set minReplicas=0 --set maxReplicas=3 \
+    --set instanceType="" \
+    --set diskSize=20Gi --set storageClass=replicated \
+    --set 'roles[0]=ingress-nginx' \
+    --set resources.cpu=2 --set resources.memory=4Gi \
+    "$@" > "$out" 2>"$out.err"
+  [ -s "$out" ] || { cat "$out.err" >&2; return 1; }
+}
+
+job_tct_name() {
+  awk '/name: TCT_NAME/ { getline; sub(/^[[:space:]]*value:[[:space:]]*/, ""); gsub(/"/, ""); print; exit }' "$1"
+}
+
+role_tct_names() {
+  # One line per Role rule on talosconfigtemplates that carries resourceNames.
+  awk '/resources: \["talosconfigtemplates"\]/ { getline; if ($0 ~ /resourceNames:/) { sub(/.*resourceNames:[[:space:]]*\[/, ""); sub(/\].*/, ""); gsub(/"/, ""); print } }' "$1"
+}
+
+md_config_ref_name() {
+  awk '/configRef:/ { f=1; next } f && /name:/ { sub(/^[[:space:]]*name:[[:space:]]*/, ""); print; exit }' "$1"
+}
+
+assert_agreement() {
+  tmp="$1"; shape="$2"
+  job=$(job_tct_name "$tmp/r.yaml")
+  md=$(md_config_ref_name "$tmp/r.yaml")
+
+  # An empty capture means the render stopped emitting one of the two fields,
+  # which would make a naive string comparison pass on "" == "".
+  if [ -z "$job" ] || [ -z "$md" ]; then
+    echo "FAIL: could not read both names out of the $shape render."
+    echo "  Job TCT_NAME:            '${job:-<missing>}'"
+    echo "  MachineDeployment ref:   '${md:-<missing>}'"
+    echo "Either the field moved or the render is incomplete; this guard cannot"
+    echo "compare what it cannot find, so it fails rather than pass vacuously."
+    return 1
+  fi
+
+  if [ "$job" != "$md" ]; then
+    echo "FAIL: the two TalosConfigTemplate names must be equal, and are not ($shape pool)."
+    echo "  talos-reconcile-job.yaml creates: $job"
+    echo "  nodegroup.yaml references:        $md"
+    echo "The MachineDeployment now points at a TalosConfigTemplate nothing creates."
+    echo "CAPI blocks on \"templates do not exist\" and builds no worker, without"
+    echo "failing the release. Both names come from a hash of the group assembled"
+    echo "by kubernetes-nodes.group in templates/_helpers.tpl: they diverge when a"
+    echo "call site stops feeding that helper, or when a key it carries is dropped."
+    echo "Fix the input they share; do not re-pin either literal."
+    return 1
+  fi
+
+  # Two named rules: get/patch/update, and delete. Fewer means one went unnamed
+  # or disappeared, and the per-rule comparison below would pass on nothing.
+  roles=$(role_tct_names "$tmp/r.yaml")
+  if [ "$(printf '%s\n' "$roles" | grep -c .)" -ne 2 ]; then
+    echo "FAIL: expected two named TalosConfigTemplate rules in the talos-reconcile Role ($shape pool), found:"
+    printf '  %s\n' "${roles:-<none>}"
+    return 1
+  fi
+  for r in $roles; do
+    if [ "$r" != "$md" ]; then
+      echo "FAIL: the talos-reconcile Role names a TalosConfigTemplate the Job does not apply ($shape pool)."
+      echo "  Role resourceNames:        $r"
+      echo "  nodegroup.yaml references: $md"
+      echo "The Job's server-side apply is a PATCH on the template's name even when"
+      echo "it creates it, so it is Forbidden, and the pool never gets a template"
+      echo "to scale onto. Name the rule after the same content-hash name."
+      return 1
+    fi
+  done
+}
+
+@test "Job and MachineDeployment agree on the TalosConfigTemplate name" {
+  TMP=$(mktemp -d)
+  render_pool "$TMP/r.yaml"
+  assert_agreement "$TMP" "default"
+  rm -rf "$TMP"
+}
+
+@test "they still agree once the hashed spec changes (GPU pool)" {
+  # A GPU pool renders extra nodeLabels into the machine config, so the hash --
+  # and therefore both names -- must move together. Pinning the agreement on a
+  # second shape is what catches a call site that reads a subset of the group:
+  # the default shape renders gpus [], kubelet {} and instanceType "" as falsy,
+  # so a consumer missing those keys is indistinguishable from one carrying them.
+  TMP=$(mktemp -d)
+  render_pool "$TMP/r.yaml" --set 'gpus[0].name=nvidia.com/GH200'
+  assert_agreement "$TMP" "GPU"
+  rm -rf "$TMP"
+}
+
+@test "they still agree with an explicit kernelModules list" {
+  # kernelModules has no values.yaml default, so the default and GPU shapes both
+  # leave it unset and cannot tell a call site that carries it from one that
+  # does not. Only a set value moves the hash on one side alone.
+  TMP=$(mktemp -d)
+  render_pool "$TMP/r.yaml" --set 'kernelModules[0].name=br_netfilter'
+  assert_agreement "$TMP" "kernelModules"
+  rm -rf "$TMP"
+}
+
+@test "the two shapes hash differently" {
+  # Guards the guard: if both renders collapsed to the same name, the agreement
+  # assertions above would hold trivially and stop proving anything.
+  TMP=$(mktemp -d)
+  render_pool "$TMP/plain.yaml"
+  render_pool "$TMP/gpu.yaml" --set 'gpus[0].name=nvidia.com/GH200'
+  plain=$(job_tct_name "$TMP/plain.yaml")
+  gpu=$(job_tct_name "$TMP/gpu.yaml")
+  if [ "$plain" = "$gpu" ]; then
+    echo "FAIL: the plain and GPU pools hashed to the same name ($plain)."
+    echo "The content hash is supposed to track the rendered spec, and a GPU pool"
+    echo "renders different nodeLabels. Equal names mean the hash input no longer"
+    echo "covers the field that changed."
+    false
+  fi
+  rm -rf "$TMP"
+}
diff --git a/hack/check-values-schema-string-defaults.bats b/hack/check-values-schema-string-defaults.bats
new file mode 100644
index 0000000000..3838473d87
--- /dev/null
+++ b/hack/check-values-schema-string-defaults.bats
@@ -0,0 +1,58 @@
+#!/usr/bin/env bats
+# Unit test: no generated values.schema.json may declare a non-string default
+# on a property typed "string".
+#
+# cozyvalues-gen quotes a default only when the declared type is the literal
+# `string` or `quantity` (formatDefault in internal/openapi/openapi.go). A
+# named alias — including one declared `@enum {string}` — falls through to a
+# YAML re-parse of the bare value, where the 1.1 boolean words resolve. So a
+# chart that materialises `authClients: "no"` under an `@enum` type emits
+# `"default": false` into a property whose type is "string" and whose enum is
+# ["no","optional","yes"] — a default the field's own schema rejects. The same
+# coercion reaches api/ as `+kubebuilder:default:=false` on a string-typed Go
+# field, so the CRD defaults an enum-constrained string to a boolean and every
+# CR relying on the default is rejected. "optional" survives; "no" and "yes"
+# do not. The quotes in values.yaml do not help: the value reaches
+# formatDefault as a flat string with no record of having been quoted.
+#
+# The damage is invisible to the chart test suites: templates read the value
+# from values.yaml, not from the schema, so rendering stays correct and only
+# the shipped schema and CRD are wrong. This test is the guard, and it is why
+# packages/apps/redis/values.yaml leaves `tls: {}` empty and resolves the
+# authClients default in templates/_tls.tpl instead.
+#
+# Runs under hack/cozytest.sh, which is POSIX /bin/sh — no process
+# substitution, no arrays, no bats `run`.
+
+load test_helper
+
+REPO_ROOT="$(cd "$(dirname "${BATS_TEST_FILENAME:-$0}")/.." && pwd)"
+
+@test "no values.schema.json declares a non-string default on a string-typed property" {
+  # Vendored charts under packages/*/*/charts/ are pulled by `make update`, not
+  # generated, so a violation there has no fix inside this tree.
+  # An empty result means "no violations" only if the scan actually reached
+  # some schemas. A renamed directory, a wrong root or a missing jq all yield
+  # the same empty string, and the test would pass having read nothing.
+  scanned="$(find "$REPO_ROOT/packages" -name values.schema.json -not -path '*/charts/*' | wc -l | tr -d ' ')"
+  if [ "$scanned" -eq 0 ]; then
+    echo "no values.schema.json found under $REPO_ROOT/packages -- guard is blind." >&2
+    return 1
+  fi
+
+  violations="$(find "$REPO_ROOT/packages" -name values.schema.json -not -path '*/charts/*' -exec jq -r '
+    input_filename as $f
+    | [ .. | objects
+        | select(.type == "string" and has("default") and (.default | type) != "string")
+        | "\($f): default=\(.default | tojson) enum=\(.enum // "none" | tojson)"
+      ] | .[]' {} +)"
+
+  if [ -n "$violations" ]; then
+    echo "String-typed schema properties carrying a non-string default:" >&2
+    echo "$violations" >&2
+    echo "This is cozyvalues-gen coercing a YAML 1.1 boolean word (no/yes/on/off)" >&2
+    echo "out of values.yaml. Leave the field absent from values.yaml and resolve" >&2
+    echo "its default in the template instead." >&2
+    return 1
+  fi
+}
diff --git a/hack/check-worker-image-catalog-defaults.bats b/hack/check-worker-image-catalog-defaults.bats
new file mode 100644
index 0000000000..261def920f
--- /dev/null
+++ b/hack/check-worker-image-catalog-defaults.bats
@@ -0,0 +1,177 @@
+#!/usr/bin/env bats
+# -----------------------------------------------------------------------------
+# Ties the kubernetes-nodes chart's default Talos image to the kubernetes-worker-image
+# catalog's default golden. The two live in independently edited files:
+#
+#   packages/apps/kubernetes-nodes/values.yaml      talos.{schematicID,version}
+#   packages/system/kubernetes-worker-image/values.yaml   images[], storageClass
+#
+# A worker pool that opts in with `osImage.builtin: {}` resolves the golden it
+# clones from the POOL chart's talos defaults, then requires the catalog to hold a
+# matching (schematicID, version) — packages/apps/kubernetes-nodes/templates/
+# nodegroup.yaml fails the whole render when it does not. So a one-sided Talos bump
+# silently breaks every fresh install using osImage.builtin, and nothing catches it
+# until a ~95-minute e2e run does.
+#
+# The StorageClass is the same trap from the other direction: CDI cannot
+# CSI-clone across StorageClasses (it would silently fall back to a host-assisted
+# copy over the pod network), so the render also rejects a group whose
+# storageClass differs from its golden's. Bumping one file's default alone brings
+# that guard down on the default path.
+#
+# Both checks are cheap and exact, which is the point — they turn a slow, remote
+# e2e failure into a local one-second unit test.
+#
+# Compatible with both `bats` directly and the in-repo cozytest.sh runner, which
+# runs each @test in a fresh subshell with `set -u` and does not honor bats
+# setup()/teardown().
+
+load test_helper
+
+REPO_ROOT="$(cd "$(dirname "${BATS_TEST_FILENAME:-$0}")/.." && pwd)"
+APP_VALUES="$REPO_ROOT/packages/apps/kubernetes-nodes/values.yaml"
+CATALOG_VALUES="$REPO_ROOT/packages/system/kubernetes-worker-image/values.yaml"
+
+@test "worker image catalog holds a golden for the pool chart's default Talos (schematicID, version)" {
+  sid=$(yq '.talos.schematicID' "$APP_VALUES")
+  ver=$(yq '.talos.version' "$APP_VALUES")
+  [ -n "$sid" ] && [ "$sid" != "null" ]
+  [ -n "$ver" ] && [ "$ver" != "null" ]
+
+  # Any entry may match — the catalog is a list of flavors, not an ordered pair.
+  if ! yq '.images[] | .schematicID + " " + .version' "$CATALOG_VALUES" \
+       | grep -qxF "$sid $ver"; then
+    echo "packages/apps/kubernetes-nodes/values.yaml defaults to Talos:" >&2
+    echo "  schematicID: $sid" >&2
+    echo "  version:     $ver" >&2
+    echo "but the kubernetes-worker-image catalog has no matching images[] entry:" >&2
+    yq '.images[] | "  - " + .schematicID + " " + .version' "$CATALOG_VALUES" >&2
+    echo "Every worker pool using 'osImage.builtin: {}' would fail to render." >&2
+    echo "Add the pair to the catalog, or bump both files together." >&2
+    return 1
+  fi
+}
+
+@test "worker image catalog golden shares the pool chart's default StorageClass" {
+  sid=$(yq '.talos.schematicID' "$APP_VALUES")
+  ver=$(yq '.talos.version' "$APP_VALUES")
+  app_sc=$(yq '.storageClass' "$APP_VALUES")
+
+  # The golden's effective class is its own override when set, else the catalog
+  # default — mirroring how the pool chart resolves its class.
+  entry_sc=$(SID="$sid" VER="$ver" yq \
+    '.images[] | select(.schematicID == strenv(SID) and .version == strenv(VER)) | .storageClass' \
+    "$CATALOG_VALUES")
+  if [ -z "$entry_sc" ] || [ "$entry_sc" = "null" ]; then
+    entry_sc=$(yq '.storageClass' "$CATALOG_VALUES")
+  fi
+
+  if [ "$app_sc" != "$entry_sc" ]; then
+    echo "StorageClass mismatch on the default osImage.builtin path:" >&2
+    echo "  packages/apps/kubernetes-nodes/values.yaml storageClass:  $app_sc" >&2
+    echo "  kubernetes-worker-image golden effective storageClass:    $entry_sc" >&2
+    echo "CDI cannot CSI-clone across StorageClasses, so the tenant render" >&2
+    echo "rejects this outright. Keep the two defaults in step." >&2
+    return 1
+  fi
+}
+
+# -----------------------------------------------------------------------------
+# Second family of default-drift guards on the same chart: the Talos <-> Kubernetes
+# support matrix. The render guard keyed only on `talos.version`, so a pool could
+# reach a different Talos release through `osImage.builtin.version` /
+# `osImage.factory.version` and boot a kubelet outside its support window with no
+# render failure. The table now lives once in templates/_helpers.tpl and both
+# paths consult it.
+#
+# The symmetry is structural, not observable from a render: the matrix ships one
+# row (`v1.13`) whose Kubernetes list is a superset of `values.schema.json`'s
+# `version` enum, so no schema-valid pairing can make either call site fail today.
+# A helm-unittest case would have to put an out-of-enum `version` in, and
+# helm-unittest validates the schema, so it cannot. These two guards cover what a
+# render cannot: that both call sites exist, and that the table still means
+# something for the defaults the chart ships.
+
+NODES_TEMPLATE="$REPO_ROOT/packages/apps/kubernetes-nodes/templates/nodegroup.yaml"
+NODES_SCHEMA="$REPO_ROOT/packages/apps/kubernetes-nodes/values.schema.json"
+
+@test "the support matrix is consulted for the image-resolved Talos version, not only talos.version" {
+  calls=$(grep -c 'include "kubernetes-nodes.assertTalosSupportsKubernetes"' "$NODES_TEMPLATE" || true)
+  if [ "$calls" -lt 2 ]; then
+    echo "nodegroup.yaml calls the Talos support-matrix guard $calls time(s); it needs one for talos.version and one for the version osImage.builtin/osImage.factory resolves to" >&2
+    echo "without the second call a pool keeps a supported talos.version and still boots an unsupported Talos minor through its image override, with no render failure" >&2
+    return 1
+  fi
+  # And the second call must be fed the RESOLVED version. Passing talos.version
+  # twice would satisfy the count above while checking nothing new.
+  if ! grep -q '"talosVersion" \$reqVersion' "$NODES_TEMPLATE"; then
+    echo "the second support-matrix call does not pass \$reqVersion, so it re-checks the value the first call already checked" >&2
+    return 1
+  fi
+}
+
+@test "the support matrix covers every Kubernetes version the schema offers, for the default Talos" {
+  ver=$(yq '.talos.version' "$APP_VALUES")
+  minor=$(printf '%s\n' "$ver" | grep -oE '^v[0-9]+\.[0-9]+')
+  [ -n "$minor" ]
+
+  helpers="$REPO_ROOT/packages/apps/kubernetes-nodes/templates/_helpers.tpl"
+  # The row is a Helm dict literal: `"v1.13" (list "v1.31" "v1.32" ...)`.
+  row=$(grep -oE "\"${minor}\" \(list [^)]*\)" "$helpers" || true)
+  if [ -z "$row" ]; then
+    echo "the Talos support matrix in $helpers has no row for ${minor}, the default talos.version ($ver)" >&2
+    echo "an unlisted Talos minor passes the guard unchecked, so the guard means nothing on the shipped defaults" >&2
+    return 1
+  fi
+
+  # Every version the schema lets an operator pick must be in that row, or the
+  # guard rejects a combination the API advertises as valid. Capture the enum
+  # first and refuse an empty read: iterating straight over the command
+  # substitution cannot tell "no versions" from "that query found nothing", so a
+  # renamed or relocated property would run the loop zero times and report
+  # success -- the drift this test exists to catch would be the change that
+  # disarms it.
+  enum=$(yq -r '.properties.version.enum[]' "$NODES_SCHEMA" || true)
+  if [ -z "$enum" ]; then
+    echo "could not read .properties.version.enum from $NODES_SCHEMA" >&2
+    echo "the enum was renamed, moved, or the file relocated; this guard cannot check the matrix without it" >&2
+    return 1
+  fi
+  for k in $enum; do
+    case "$row" in
+      *"\"$k\""*) ;;
+      *)
+        echo "values.schema.json offers version $k, but the Talos ${minor} matrix row does not list it:" >&2
+        echo "  $row" >&2
+        echo "either the row is stale or the enum gained a version Talos ${minor} does not support" >&2
+        return 1 ;;
+    esac
+  done
+}
+
+# -----------------------------------------------------------------------------
+# Third guard, and the premise the first one rests on. The catalog is keyed off
+# the kubernetes-nodes chart's `talos` defaults, but the parent kubernetes chart
+# carries its own copy of the same block since the Phase 2 split, and its own
+# values.yaml says to keep the two in sync. Nothing enforced that: the pool
+# chart's `make update` copies files/versions.yaml and images/kubectl.tag from
+# the parent and not the talos block, so a one-sided bump leaves the parent's
+# support-matrix guard reasoning about one Talos release while every worker boots
+# another — and the catalog check above would go on passing, because it only ever
+# reads one of the two files.
+
+PARENT_VALUES="$REPO_ROOT/packages/apps/kubernetes/values.yaml"
+
+@test "the parent kubernetes chart and kubernetes-nodes agree on their Talos defaults" {
+  for key in version schematicID imageFactoryURL installerRepository registryMirrors; do
+    parent=$(yq ".talos.${key}" "$PARENT_VALUES")
+    pool=$(yq ".talos.${key}" "$APP_VALUES")
+    if [ "$parent" != "$pool" ]; then
+      echo "talos.${key} differs between the two charts:" >&2
+      echo "  packages/apps/kubernetes/values.yaml:       $parent" >&2
+      echo "  packages/apps/kubernetes-nodes/values.yaml: $pool" >&2
+      echo "both are declared 'keep in sync' and a worker pool follows the second while the parent's support-matrix guard reads the first" >&2
+      return 1
+    fi
+  done
+}
diff --git a/hack/ci-tool-installs-contract.bats b/hack/ci-tool-installs-contract.bats
new file mode 100755
index 0000000000..ed0cf65354
--- /dev/null
+++ b/hack/ci-tool-installs-contract.bats
@@ -0,0 +1,89 @@
+#!/usr/bin/env bats
+# The flux CLI, yq and the helm-unittest plugin are build inputs like any image
+# or action, so they are pinned the same way: a fixed version, and for flux and
+# yq bytes checked against the release that version names. A floating install
+# comes back by copy-paste from an older step rather than by anyone deciding to
+# unpin one, which is why this scans every workflow instead of the steps that
+# happened to be fixed. Other downloaded tools are not covered here.
+
+load test_helper
+
+REPO_ROOT="$(cd "$(dirname "${BATS_TEST_FILENAME:-$0}")/.." && pwd)"
+WORKFLOWS="$REPO_ROOT/.github/workflows"
+
+# Prints file:line:text for every non-comment workflow line matching the ERE.
+workflow_code() {
+  grep --recursive --line-number --extended-regexp "$1" "$WORKFLOWS" \
+    | grep --invert-match --extended-regexp '^[^:]+:[0-9]+:[[:space:]]*#' || true
+}
+
+@test "no workflow executes the fluxcd.io install script" {
+  # It runs as root whatever fluxcd.io serves at that moment; the binary it
+  # checksums is not the exposure, the unpinned script is.
+  hits="$(workflow_code 'fluxcd\.io/install\.sh')"
+  [ -z "$hits" ] || { printf '%s\n' "$hits"; false; }
+}
+
+@test "every use of the flux setup action is SHA-pinned at one version" {
+  uses="$(workflow_code 'uses: fluxcd/flux2/action@')"
+  [ -n "$uses" ]
+  bad="$(printf '%s\n' "$uses" | grep --invert-match --extended-regexp 'action@[0-9a-f]{40} # v[0-9.]+$' || true)"
+  [ -z "$bad" ] || { printf '%s\n' "$bad"; false; }
+
+  # Without a version input the action resolves the latest release itself, and
+  # a digest bump moves the ref and its comment but not the input, so each
+  # step's input must sit in its own `with:` and match the tag in the comment.
+  # One "sha tag input" triple per step; all steps must agree on it.
+  steps="$(awk '
+    FNR == 1 { if (pend) print sha, tag, "missing"; pend = 0 }
+    /^[[:space:]]*#/ { next }
+    /uses: fluxcd\/flux2\/action@/ {
+      sha = $0; sub(/.*action@/, "", sha); sub(/ .*/, "", sha)
+      tag = $0; sub(/.*# v/, "", tag)
+      pend = 1; next
+    }
+    pend && /version: "/ {
+      v = $0; sub(/.*version: "/, "", v); sub(/".*/, "", v)
+      print sha, tag, v; pend = 0; next
+    }
+    pend && /^[[:space:]]*- / { print sha, tag, "missing"; pend = 0 }
+    END { if (pend) print sha, tag, "missing" }
+  ' "$WORKFLOWS"/*.yaml "$WORKFLOWS"/*.yml 2>/dev/null)"
+  [ "$(printf '%s\n' "$steps" | grep --count .)" -eq "$(printf '%s\n' "$uses" | grep --count .)" ]
+  bad="$(printf '%s\n' "$steps" | awk '$2 != $3' || true)"
+  [ -z "$bad" ] || { printf '%s\n' "$bad"; false; }
+  [ "$(printf '%s\n' "$steps" | sort --unique | wc -l | tr -d ' ')" -eq 1 ] \
+    || { printf '%s\n' "$steps" | sort --unique; false; }
+}
+
+@test "no workflow downloads from a floating latest release" {
+  hits="$(workflow_code 'releases/latest/download')"
+  [ -z "$hits" ] || { printf '%s\n' "$hits"; false; }
+}
+
+@test "every yq download is checksum-verified at one version" {
+  [ -n "$(workflow_code 'mikefarah/yq/releases/download')" ]
+  # Each download, not each file: the check has to follow within three lines.
+  unchecked="$(awk '
+    FNR == 1 { if (pend) print pend; pend = "" }
+    /^[[:space:]]*#/ { next }
+    /mikefarah\/yq\/releases\/download/ { if (pend) print pend; pend = FILENAME ":" FNR; n = 0; next }
+    pend && /sha256sum -c -/ && /YQ_SHA256/ { pend = ""; next }
+    pend && ++n >= 3 { print pend; pend = "" }
+    END { if (pend) print pend }
+  ' "$WORKFLOWS"/*.yaml "$WORKFLOWS"/*.yml 2>/dev/null)"
+  [ -z "$unchecked" ] || { printf '%s\n' "$unchecked"; false; }
+  for key in YQ_VERSION YQ_SHA256; do
+    values="$(workflow_code "$key: \"" | grep --only-matching "$key: \"[0-9a-f.]*\"" | sort --unique)"
+    [ "$(printf '%s\n' "$values" | grep --count .)" -eq 1 ] || { printf '%s\n' "$values"; false; }
+  done
+}
+
+@test "every helm plugin install names a version" {
+  # helm-unittest embeds its own Helm, so an unpinned plugin moves the renderer
+  # every chart test runs against without any PR asking for it.
+  installs="$(workflow_code 'helm plugin install')"
+  [ -n "$installs" ]
+  bad="$(printf '%s\n' "$installs" | grep --invert-match -- '--version' || true)"
+  [ -z "$bad" ] || { printf '%s\n' "$bad"; false; }
+}
diff --git a/hack/cilium-ipam-migration.bats b/hack/cilium-ipam-migration.bats
new file mode 100644
index 0000000000..c54db50abb
--- /dev/null
+++ b/hack/cilium-ipam-migration.bats
@@ -0,0 +1,563 @@
+#!/usr/bin/env bats
+# Behavioural unit test for packages/system/cilium/files/ipam-migration.sh, the
+# script the cilium chart embeds into its post-upgrade hook Job when ipam.mode
+# is cluster-pool.
+#
+# The script is EXECUTED against a fake kubectl that keeps CiliumNode, Node,
+# agent pod and kube-ovn Subnet state in files and models the two controllers
+# the script waits on. cilium-operator allocates a /29 from the pool to a
+# CiliumNode only once its spec.ipam.podCIDRs is empty, and the agent DaemonSet
+# replaces a deleted agent pod with a Ready one whose router and Ingress IPs
+# come from the node's current allocation. Either can be told not to act, which
+# is how the timeout paths are reached.
+#
+# hack/cozytest.sh knows @test and bash only, with no setup() or teardown() and
+# no run/$status/$output, so each test calls init_state itself and every
+# negative assertion is an explicit `if ...; then ...; false; fi`.
+
+load test_helper
+
+SCRIPT="$(cd "$(dirname "${BATS_TEST_FILENAME:-$0}")/.." && pwd)/packages/system/cilium/files/ipam-migration.sh"
+
+# init_state builds an isolated workspace with the fake kubectl first on PATH,
+# the environment the hook Job sets and a kube-ovn default subnet that already
+# excludes the pool and has nothing allocated inside it.
+init_state() {
+  STATE="$(mktemp -d)"
+  mkdir -p "$STATE/bin" "$STATE/ciliumnodes" "$STATE/nodes" "$STATE/pods"
+  export STATE PATH="$STATE/bin:$PATH" KLOG="$STATE/kubectl.log"
+  export NAMESPACE=cozy-cilium POOL=10.244.248.0/21 MASK=29
+  export ALLOCATION_TIMEOUT=3 AGENT_TIMEOUT=3 POLL_INTERVAL=1
+  export OPERATOR=allocate AGENT=restart
+  : > "$KLOG"
+  echo 0 > "$STATE/next-block"
+  echo '{"items": []}' > "$STATE/ips.json"
+  set_subnet '["10.244.0.1","10.244.248.0..10.244.255.255"]' "10.244.0.2-10.244.0.30,10.244.3.7"
+  cat > "$STATE/bin/kubectl" <<'KEOF'
+#!/bin/bash
+set -euo pipefail
+echo "$*" >> "$KLOG"
+args=()
+field= patch=
+while [ $# -gt 0 ]; do
+  case $1 in
+    -n|-l|-o) shift ;;
+    --field-selector) field=$2; shift ;;
+    -p) patch=$2; shift ;;
+    -*) ;;
+    *) args+=("$1") ;;
+  esac
+  shift
+done
+set -- "${args[@]}"
+verb=$1 kind=$2
+
+allocate() {
+  local file=$1 n
+  if [ "$OPERATOR" != allocate ] || jq -e '.spec.ipam.podCIDRs' "$file" >/dev/null; then
+    return 0
+  fi
+  n=$(cat "$STATE/next-block")
+  echo $((n + 1)) > "$STATE/next-block"
+  jq --arg c "10.244.248.$((n * 8))/29" '.spec.ipam.podCIDRs = [$c]' "$file" > "$file.tmp"
+  mv "$file.tmp" "$file"
+  }
+
+case "$verb $kind" in
+  "get ciliumnodes")
+    for f in "$STATE"/ciliumnodes/*.json; do allocate "$f"; done
+    jq -s '{items: .}' "$STATE"/ciliumnodes/*.json
+    ;;
+  "get ciliumnode")
+    name=$3
+    if [ "${FAIL_GET_CILIUMNODE:-}" = "$name" ]; then
+      echo "error: the server is currently unable to handle the request" >&2
+      exit 1
+    fi
+    allocate "$STATE/ciliumnodes/$name.json"
+    cat "$STATE/ciliumnodes/$name.json"
+    # RACE_CIDR models a writer that gets in between this read and the patch.
+    if [ -n "${RACE_CIDR:-}" ] && [ ! -f "$STATE/raced" ]; then
+      touch "$STATE/raced"
+      jq --arg c "$RACE_CIDR" '.spec.ipam.podCIDRs = [$c]' "$STATE/ciliumnodes/$name.json" > "$STATE/race.tmp"
+      mv "$STATE/race.tmp" "$STATE/ciliumnodes/$name.json"
+    fi
+    ;;
+  "patch ciliumnode")
+    name=$3
+    file="$STATE/ciliumnodes/$name.json"
+    expected=$(jq -c '.[] | select(.op == "test") | .value' <<<"$patch")
+    actual=$(jq -c '.spec.ipam.podCIDRs' "$file")
+    if [ "$expected" != "$actual" ]; then
+      echo "The request is invalid: the server rejected our request due to an error in our request" >&2
+      exit 1
+    fi
+    jq 'del(.spec.ipam.podCIDRs)' "$file" > "$file.tmp"
+    mv "$file.tmp" "$file"
+    ;;
+  "get customresourcedefinition")
+    if [ -f "$STATE/subnet.json" ]; then
+      echo "customresourcedefinition.apiextensions.k8s.io/subnets.kubeovn.io"
+    fi
+    ;;
+  "get subnets.kubeovn.io")
+    if [ -z "${3:-}" ]; then
+      jq '{items: [.]}' "$STATE/subnet.json"
+      exit 0
+    fi
+    # A read by name models kube-ovn publishing the status after the patch.
+    # OVN_LAG reads go by before status.v4availableIPrange stops offering the
+    # end of the /16, and OVN_STUCK means it never does.
+    n=$(( $(cat "$STATE/status-reads" 2>/dev/null || echo 0) + 1 ))
+    echo "$n" > "$STATE/status-reads"
+    if [ -z "${OVN_STUCK:-}" ] && [ "$n" -gt "${OVN_LAG:-0}" ]; then
+      jq '.status.v4availableIPrange = "10.244.0.31-10.244.247.255"' "$STATE/subnet.json" > "$STATE/subnet.tmp"
+      mv "$STATE/subnet.tmp" "$STATE/subnet.json"
+    fi
+    cat "$STATE/subnet.json"
+    ;;
+  "get ips.kubeovn.io")
+    cat "$STATE/ips.json"
+    ;;
+  "patch subnets.kubeovn.io")
+    # RACE_SUBNET models kube-ovn rewriting excludeIps between the script's read
+    # and its patch, once or on every attempt.
+    if [ -n "${RACE_SUBNET:-}" ] && { [ "$RACE_SUBNET" = always ] || [ ! -f "$STATE/subnet-raced" ]; }; then
+      touch "$STATE/subnet-raced"
+      n=$(( $(cat "$STATE/subnet-races" 2>/dev/null || echo 0) + 1 ))
+      echo "$n" > "$STATE/subnet-races"
+      jq --arg e "10.244.1.$n" '.spec.excludeIps += [$e]' "$STATE/subnet.json" > "$STATE/subnet.tmp"
+      mv "$STATE/subnet.tmp" "$STATE/subnet.json"
+    fi
+    expected=$(jq -c '.[] | select(.op == "test") | .value' <<<"$patch")
+    actual=$(jq -c '.spec.excludeIps' "$STATE/subnet.json")
+    if [ "$expected" != "$actual" ]; then
+      echo "The request is invalid: the server rejected our request due to an error in our request" >&2
+      exit 1
+    fi
+    jq --argjson v "$(jq -c '.[] | select(.op == "replace") | .value' <<<"$patch")" '.spec.excludeIps = $v' \
+      "$STATE/subnet.json" > "$STATE/subnet.tmp"
+    mv "$STATE/subnet.tmp" "$STATE/subnet.json"
+    ;;
+  "get node")
+    name=$3
+    if [ -f "$STATE/nodes/$name.json" ]; then
+      cat "$STATE/nodes/$name.json"
+    fi
+    ;;
+  "get pods")
+    node=${field#spec.nodeName=}
+    jq -s --arg n "$node" '{items: [.[] | select(.spec.nodeName == $n)]}' "$STATE"/pods/*.json 2>/dev/null || echo '{"items": []}'
+    ;;
+  "delete pod")
+    name=$3
+    node=$(jq -r '.spec.nodeName' "$STATE/pods/$name.json")
+    rm "$STATE/pods/$name.json"
+    if [ "$AGENT" = restart ]; then
+      jq -n --arg p "$name-r" --arg n "$node" \
+        '{metadata: {name: $p}, spec: {nodeName: $n}, status: {conditions: [{type: "Ready", status: "True"}]}}' \
+        > "$STATE/pods/$name-r.json"
+      file="$STATE/ciliumnodes/$node.json"
+      block=$(jq -r '.spec.ipam.podCIDRs[0] | split("/")[0]' "$file")
+      jq --arg r "${block%.*}.$(( ${block##*.} + 2 ))" --arg i "${block%.*}.$(( ${block##*.} + 3 ))" \
+        '.spec.addresses = [{type: "InternalIP", ip: "192.0.2.1"}, {type: "CiliumInternalIP", ip: $r}] | .spec.ingress.ipv4 = $i' \
+        "$file" > "$file.tmp"
+      mv "$file.tmp" "$file"
+    fi
+    ;;
+  *)
+    echo "fake kubectl: unexpected call: $verb $kind" >&2
+    exit 1
+    ;;
+esac
+KEOF
+  chmod +x "$STATE/bin/kubectl"
+}
+
+# set_subnet <excludeIps JSON> <status.v4usingIPrange> [status.v4availableIPrange]
+# By default status.v4availableIPrange stops short of the pool once excludeIps
+# lists it, the way kube-ovn reports it.
+set_subnet() {
+  available=10.244.0.31-10.244.255.255
+  if printf '%s' "$1" | jq -e 'index("10.244.248.0..10.244.255.255")' >/dev/null; then
+    available=10.244.0.31-10.244.247.255
+  fi
+  available=${3:-$available}
+  jq -n --argjson e "$1" --arg u "$2" --arg a "$available" \
+    '{metadata: {name: "ovn-default"}, spec: {default: true, cidrBlock: "10.244.0.0/16", excludeIps: $e}, status: {v4usingIPrange: $u, v4availableIPrange: $a}}' \
+    > "$STATE/subnet.json"
+}
+
+# add_ip <IP object name> <subnet> <v4 address>
+add_ip() {
+  jq --arg n "$1" --arg s "$2" --arg i "$3" '.items += [{metadata: {name: $n}, spec: {subnet: $s, v4IpAddress: $i}}]' \
+    "$STATE/ips.json" > "$STATE/ips.tmp"
+  mv "$STATE/ips.tmp" "$STATE/ips.json"
+}
+
+# add_node <name> <podCIDR or ""> <router IP> <ingress IP> [Ready status]
+# Writes a CiliumNode, its Node and one Ready agent pod.
+add_node() {
+  local name=$1 cidr=$2 router=$3 ingress=$4 ready=${5:-True}
+  jq -n --arg n "$name" --arg c "$cidr" --arg r "$router" --arg i "$ingress" '
+    {metadata: {name: $n},
+     spec: ({addresses: [{type: "InternalIP", ip: "192.0.2.1"}, {type: "CiliumInternalIP", ip: $r}],
+             ingress: {ipv4: $i}, ipam: {}}
+            | if $c == "" then . else .ipam.podCIDRs = [$c] end)}' > "$STATE/ciliumnodes/$name.json"
+  jq -n --arg n "$name" --arg s "$ready" \
+    '{metadata: {name: $n}, status: {conditions: [{type: "Ready", status: $s}]}}' > "$STATE/nodes/$name.json"
+  jq -n --arg p "cilium-$name" --arg n "$name" \
+    '{metadata: {name: $p}, spec: {nodeName: $n}, status: {conditions: [{type: "Ready", status: "True"}]}}' \
+    > "$STATE/pods/cilium-$name.json"
+}
+
+pod_cidrs_of() {
+  jq -c '.spec.ipam.podCIDRs' "$STATE/ciliumnodes/$1.json"
+}
+
+@test "stale nodes are moved onto the pool and their agents restarted one at a time" {
+  init_state
+  add_node n1 10.244.2.0/24 10.244.2.223 10.244.2.135
+  add_node n2 10.244.4.0/24 10.244.4.251 10.244.4.240
+  "$SCRIPT"
+  [ "$(pod_cidrs_of n1)" = '["10.244.248.0/29"]' ]
+  [ "$(pod_cidrs_of n2)" = '["10.244.248.8/29"]' ]
+  [ "$(jq -r '.spec.ingress.ipv4' "$STATE/ciliumnodes/n1.json")" = 10.244.248.3 ]
+  [ -f "$STATE/pods/cilium-n1-r.json" ]
+  [ -f "$STATE/pods/cilium-n2-r.json" ]
+  # n1 is cleared, allocated and restarted before n2 is touched at all.
+  first_n2=$(grep -n "ciliumnode n2" "$KLOG" | head -1 | cut -d: -f1)
+  n1_restart=$(grep -n "delete pod cilium-n1" "$KLOG" | cut -d: -f1)
+  [ "$n1_restart" -lt "$first_n2" ]
+  rm -rf "$STATE"
+}
+
+@test "an agent that came up before the operator allocated its CIDR is restarted" {
+  init_state
+  # An empty field the operator fills, and an agent still holding addresses
+  # from the old /24.
+  add_node n1 "" 10.244.2.223 10.244.2.135
+  "$SCRIPT"
+  [ "$(pod_cidrs_of n1)" = '["10.244.248.0/29"]' ]
+  grep -q "^-n cozy-cilium delete pod cilium-n1" "$KLOG"
+  rm -rf "$STATE"
+}
+
+@test "a node whose agent already took its addresses from the pool is left alone" {
+  init_state
+  add_node n1 10.244.248.24/29 10.244.248.26 10.244.248.27
+  "$SCRIPT"
+  if grep -q -e "^patch" -e "delete pod" "$KLOG"; then
+    echo "BUG: a node already on the pool, or the subnet that already excludes it, was touched"
+    false
+  fi
+  rm -rf "$STATE"
+}
+
+@test "an agent whose Ingress IP alone is still outside its allocation is restarted" {
+  init_state
+  add_node n1 10.244.248.24/29 10.244.248.26 10.244.2.135
+  "$SCRIPT"
+  grep -q "delete pod cilium-n1" "$KLOG"
+  rm -rf "$STATE"
+}
+
+@test "the pool is excluded from the kube-ovn default subnet before any node moves" {
+  init_state
+  set_subnet '["10.244.0.1"]' "10.244.0.2-10.244.0.30"
+  add_node n1 10.244.2.0/24 10.244.2.223 10.244.2.135
+  "$SCRIPT"
+  [ "$(jq -c '.spec.excludeIps' "$STATE/subnet.json")" = '["10.244.0.1","10.244.248.0..10.244.255.255","10.244.2.135"]' ]
+  exclude=$(grep -n "^patch subnets.kubeovn.io" "$KLOG" | cut -d: -f1)
+  clear=$(grep -n "^patch ciliumnode n1" "$KLOG" | cut -d: -f1)
+  [ "$exclude" -lt "$clear" ]
+  rm -rf "$STATE"
+}
+
+@test "the Ingress IPs the agents leave behind go into the same patch as the pool, the router IPs do not" {
+  init_state
+  set_subnet '["10.244.0.1"]' "10.244.0.2-10.244.0.30"
+  add_node n1 10.244.2.0/24 10.244.2.223 10.244.2.135
+  add_node n2 10.244.4.0/24 10.244.4.251 10.244.4.240
+  "$SCRIPT"
+  [ "$(jq -c '.spec.excludeIps' "$STATE/subnet.json")" = '["10.244.0.1","10.244.248.0..10.244.255.255","10.244.2.135","10.244.4.240"]' ]
+  [ "$(grep -c "^patch subnets.kubeovn.io" "$KLOG")" -eq 1 ]
+  rm -rf "$STATE"
+}
+
+@test "an Ingress IP that already lies in the pool is covered by the pool range alone" {
+  init_state
+  set_subnet '["10.244.0.1"]' "10.244.0.2-10.244.0.30"
+  add_node n1 10.244.248.24/29 10.244.248.26 10.244.248.27
+  "$SCRIPT"
+  [ "$(jq -c '.spec.excludeIps' "$STATE/subnet.json")" = '["10.244.0.1","10.244.248.0..10.244.255.255"]' ]
+  rm -rf "$STATE"
+}
+
+@test "an Ingress IP the subnet already excludes is not added again" {
+  init_state
+  set_subnet '["10.244.0.1","10.244.2.130..10.244.2.140"]' "10.244.0.2-10.244.0.30"
+  add_node n1 10.244.2.0/24 10.244.2.223 10.244.2.135
+  "$SCRIPT"
+  [ "$(jq -c '.spec.excludeIps' "$STATE/subnet.json")" = '["10.244.0.1","10.244.2.130..10.244.2.140","10.244.248.0..10.244.255.255"]' ]
+  rm -rf "$STATE"
+}
+
+@test "a subnet rewritten between the read and the patch is read again and patched on top of the new list" {
+  init_state
+  export RACE_SUBNET=once
+  set_subnet '["10.244.0.1"]' "10.244.0.2-10.244.0.30"
+  add_node n1 10.244.2.0/24 10.244.2.223 10.244.2.135
+  "$SCRIPT"
+  [ "$(jq -c '.spec.excludeIps' "$STATE/subnet.json")" = '["10.244.0.1","10.244.1.1","10.244.248.0..10.244.255.255","10.244.2.135"]' ]
+  [ "$(grep -c "^patch subnets.kubeovn.io" "$KLOG")" -eq 2 ]
+  [ "$(pod_cidrs_of n1)" = '["10.244.248.0/29"]' ]
+  rm -rf "$STATE"
+}
+
+@test "a subnet that keeps changing under the patch stops the run before any node moves" {
+  init_state
+  export RACE_SUBNET=always
+  set_subnet '["10.244.0.1"]' "10.244.0.2-10.244.0.30"
+  add_node n1 10.244.2.0/24 10.244.2.223 10.244.2.135
+  rc=0
+  "$SCRIPT" > "$STATE/out" 2>&1 || rc=$?
+  [ "$rc" -ne 0 ]
+  grep -q "kept changing under the patch" "$STATE/out"
+  if grep -q "^patch ciliumnode" "$KLOG"; then
+    echo "BUG: a node was moved although the pool was never excluded"
+    false
+  fi
+  rm -rf "$STATE"
+}
+
+@test "a pool excluded by an earlier attempt that still has pods on it stops the run" {
+  init_state
+  # kube-ovn leaves excluded addresses out of status.v4usingIPrange, so only
+  # the IP object shows the pod still sitting in the pool.
+  add_ip db-0.tenant-a ovn-default 10.244.250.7
+  add_node n1 10.244.2.0/24 10.244.2.223 10.244.2.135
+  rc=0
+  "$SCRIPT" > "$STATE/out" 2>&1 || rc=$?
+  [ "$rc" -ne 0 ]
+  grep -q "still has db-0.tenant-a=10.244.250.7 in use inside 10.244.248.0/21" "$STATE/out"
+  if grep -q "^patch ciliumnode" "$KLOG"; then
+    echo "BUG: a node was moved onto a pool a pod still holds an address in"
+    false
+  fi
+  rm -rf "$STATE"
+}
+
+@test "an IP object of another subnet with an address in the pool range does not stop the run" {
+  init_state
+  add_ip vm-0.tenant-b vpc-b-subnet 10.244.250.7
+  add_node n1 10.244.2.0/24 10.244.2.223 10.244.2.135
+  "$SCRIPT"
+  [ "$(pod_cidrs_of n1)" = '["10.244.248.0/29"]' ]
+  rm -rf "$STATE"
+}
+
+@test "the IP objects are read only after kube-ovn stops offering the pool" {
+  init_state
+  export OVN_LAG=2
+  set_subnet '["10.244.0.1"]' "10.244.0.2-10.244.0.30"
+  add_node n1 10.244.2.0/24 10.244.2.223 10.244.2.135
+  "$SCRIPT"
+  [ "$(cat "$STATE/status-reads")" -eq 3 ]
+  reads=$(grep -n "^get subnets.kubeovn.io ovn-default" "$KLOG" | tail -1 | cut -d: -f1)
+  ips=$(grep -n "^get ips.kubeovn.io" "$KLOG" | cut -d: -f1)
+  [ "$reads" -lt "$ips" ]
+  [ "$(pod_cidrs_of n1)" = '["10.244.248.0/29"]' ]
+  rm -rf "$STATE"
+}
+
+@test "a subnet whose status never drops the pool stops the run before any node moves" {
+  init_state
+  export OVN_STUCK=1
+  set_subnet '["10.244.0.1"]' "10.244.0.2-10.244.0.30"
+  add_node n1 10.244.2.0/24 10.244.2.223 10.244.2.135
+  rc=0
+  "$SCRIPT" > "$STATE/out" 2>&1 || rc=$?
+  [ "$rc" -ne 0 ]
+  grep -q "kube-ovn has not applied the exclusion" "$STATE/out"
+  if grep -q "^patch ciliumnode" "$KLOG"; then
+    echo "BUG: a node was moved before kube-ovn applied the exclusion"
+    false
+  fi
+  rm -rf "$STATE"
+}
+
+@test "a wider exclusion that already covers the pool is left as it is" {
+  init_state
+  set_subnet '["10.244.0.1","10.244.240.0..10.244.255.255"]' "10.244.0.2-10.244.0.30" "10.244.0.31-10.244.239.255"
+  add_node n1 10.244.248.24/29 10.244.248.26 10.244.248.27
+  "$SCRIPT"
+  if grep -q "^patch subnets.kubeovn.io" "$KLOG"; then
+    echo "BUG: an exclusion that already covers the pool was patched again"
+    false
+  fi
+  rm -rf "$STATE"
+}
+
+@test "addresses kube-ovn already handed out from the pool stop the run before any node moves" {
+  init_state
+  set_subnet '["10.244.0.1"]' "10.244.0.2-10.244.0.30,10.244.249.4-10.244.249.6"
+  add_node n1 10.244.2.0/24 10.244.2.223 10.244.2.135
+  rc=0
+  "$SCRIPT" > "$STATE/out" 2>&1 || rc=$?
+  [ "$rc" -ne 0 ]
+  grep -q "has already handed out 10.244.249.4-10.244.249.6 from 10.244.248.0/21" "$STATE/out"
+  # The exclusion still lands, so kube-ovn stops handing out more from the pool.
+  [ "$(jq -c '.spec.excludeIps' "$STATE/subnet.json")" = '["10.244.0.1","10.244.248.0..10.244.255.255","10.244.2.135"]' ]
+  if grep -q "^patch ciliumnode" "$KLOG"; then
+    echo "BUG: a node was moved onto a pool kube-ovn still hands addresses from"
+    false
+  fi
+  rm -rf "$STATE"
+}
+
+@test "a pool outside the default subnet stops the run before anything changes" {
+  init_state
+  export POOL=100.65.0.0/16
+  set_subnet '["10.244.0.1"]' "10.244.0.2-10.244.0.30"
+  add_node n1 10.244.2.0/24 10.244.2.223 10.244.2.135
+  rc=0
+  "$SCRIPT" > "$STATE/out" 2>&1 || rc=$?
+  [ "$rc" -ne 0 ]
+  grep -q "100.65.0.0/16 lies outside subnet ovn-default (10.244.0.0/16)" "$STATE/out"
+  if grep -q -e "^patch subnets.kubeovn.io" -e "^patch ciliumnode" "$KLOG"; then
+    echo "BUG: something was changed for a pool outside kube-ovn's subnet"
+    false
+  fi
+  rm -rf "$STATE"
+}
+
+@test "more CiliumNodes than the pool has blocks stops the run before anything changes" {
+  init_state
+  export POOL=10.244.248.0/29
+  set_subnet '["10.244.0.1"]' "10.244.0.2-10.244.0.30"
+  add_node n1 10.244.2.0/24 10.244.2.223 10.244.2.135
+  add_node n2 10.244.4.0/24 10.244.4.251 10.244.4.240
+  rc=0
+  "$SCRIPT" > "$STATE/out" 2>&1 || rc=$?
+  [ "$rc" -ne 0 ]
+  grep -q "there are 2 CiliumNodes but 10.244.248.0/29 holds only 1 /29 blocks" "$STATE/out"
+  if grep -q -e "^patch" "$KLOG"; then
+    echo "BUG: something was changed although the pool cannot hold every node"
+    false
+  fi
+  rm -rf "$STATE"
+}
+
+@test "a pool with exactly one block per node is enough" {
+  init_state
+  export POOL=10.244.248.0/28
+  set_subnet '["10.244.0.1"]' "10.244.0.2-10.244.0.30"
+  add_node n1 10.244.2.0/24 10.244.2.223 10.244.2.135
+  add_node n2 10.244.4.0/24 10.244.4.251 10.244.4.240
+  "$SCRIPT"
+  [ "$(pod_cidrs_of n1)" = '["10.244.248.0/29"]' ]
+  [ "$(pod_cidrs_of n2)" = '["10.244.248.8/29"]' ]
+  rm -rf "$STATE"
+}
+
+@test "a usage range that crosses the start of the pool stops the run" {
+  init_state
+  # kube-ovn's ascending pointer reaches the block from below, so the first
+  # range to touch it starts outside.
+  set_subnet '["10.244.0.1"]' "10.244.0.2-10.244.0.30,10.244.247.250-10.244.248.3"
+  add_node n1 10.244.2.0/24 10.244.2.223 10.244.2.135
+  rc=0
+  "$SCRIPT" > "$STATE/out" 2>&1 || rc=$?
+  [ "$rc" -ne 0 ]
+  grep -q "has already handed out 10.244.247.250-10.244.248.3 from 10.244.248.0/21" "$STATE/out"
+  if grep -q "^patch ciliumnode" "$KLOG"; then
+    echo "BUG: a node was moved onto a pool kube-ovn still hands addresses from"
+    false
+  fi
+  rm -rf "$STATE"
+}
+
+@test "a pod on a node's current Ingress IP is named in the log and does not stop the run" {
+  init_state
+  add_ip web-0.tenant-c ovn-default 10.244.2.135
+  add_node n1 10.244.2.0/24 10.244.2.223 10.244.2.135
+  "$SCRIPT" > "$STATE/out" 2>&1
+  grep -q "web-0.tenant-c holds 10.244.2.135, the Ingress IP of n1 before the move" "$STATE/out"
+  [ "$(pod_cidrs_of n1)" = '["10.244.248.0/29"]' ]
+  rm -rf "$STATE"
+}
+
+@test "a cluster without kube-ovn skips the exclusion and still moves its nodes" {
+  init_state
+  rm "$STATE/subnet.json"
+  add_node n1 10.244.2.0/24 10.244.2.223 10.244.2.135
+  "$SCRIPT"
+  [ "$(pod_cidrs_of n1)" = '["10.244.248.0/29"]' ]
+  if grep -q -e "^get subnets.kubeovn.io" -e "^patch subnets.kubeovn.io" "$KLOG"; then
+    echo "BUG: subnets were queried on a cluster that has no kube-ovn"
+    false
+  fi
+  rm -rf "$STATE"
+}
+
+@test "the run fails when the operator never allocates, and still handles the other nodes" {
+  init_state
+  export OPERATOR=none
+  add_node n1 10.244.2.0/24 10.244.2.223 10.244.2.135
+  add_node n2 10.244.248.24/29 10.244.248.26 10.244.4.240
+  rc=0
+  "$SCRIPT" > "$STATE/out" 2>&1 || rc=$?
+  [ "$rc" -ne 0 ]
+  grep -q "n1: no CIDR from 10.244.248.0/21" "$STATE/out"
+  grep -q "delete pod cilium-n2" "$KLOG"
+  rm -rf "$STATE"
+}
+
+@test "the run fails when a restarted agent does not come back" {
+  init_state
+  export AGENT=stuck
+  add_node n1 10.244.2.0/24 10.244.2.223 10.244.2.135
+  rc=0
+  "$SCRIPT" > "$STATE/out" 2>&1 || rc=$?
+  [ "$rc" -ne 0 ]
+  grep -q "n1: agent not ready on 10.244.248.0/29" "$STATE/out"
+  rm -rf "$STATE"
+}
+
+@test "the agent of a node that is not Ready is not restarted" {
+  init_state
+  add_node n1 10.244.2.0/24 10.244.2.223 10.244.2.135 False
+  "$SCRIPT"
+  [ "$(pod_cidrs_of n1)" = '["10.244.248.0/29"]' ]
+  if grep -q "delete pod" "$KLOG"; then
+    echo "BUG: the agent of a NotReady node was deleted"
+    false
+  fi
+  rm -rf "$STATE"
+}
+
+@test "a failed CiliumNode read stops the run before anything is cleared" {
+  init_state
+  export FAIL_GET_CILIUMNODE=n1
+  add_node n1 10.244.2.0/24 10.244.2.223 10.244.2.135
+  rc=0
+  "$SCRIPT" > "$STATE/out" 2>&1 || rc=$?
+  [ "$rc" -ne 0 ]
+  if grep -q "^patch ciliumnode" "$KLOG"; then
+    echo "BUG: a node was patched after its read failed"
+    false
+  fi
+  rm -rf "$STATE"
+}
+
+@test "a CIDR written between the read and the clear makes the patch fail instead of being removed" {
+  init_state
+  export OPERATOR=none RACE_CIDR=10.244.9.0/24
+  add_node n1 10.244.2.0/24 10.244.2.223 10.244.2.135
+  rc=0
+  "$SCRIPT" > "$STATE/out" 2>&1 || rc=$?
+  [ "$rc" -ne 0 ]
+  [ "$(pod_cidrs_of n1)" = '["10.244.9.0/24"]' ]
+  rm -rf "$STATE"
+}
diff --git a/hack/cilium-leak-healer_test.bats b/hack/cilium-leak-healer_test.bats
new file mode 100644
index 0000000000..8a47da02ec
--- /dev/null
+++ b/hack/cilium-leak-healer_test.bats
@@ -0,0 +1,61 @@
+#!/usr/bin/env bats
+# -----------------------------------------------------------------------------
+# Unit tests for the pure decision helper in
+# hack/e2e-cilium-endpoint-leak-healer.sh -- specifically ip_is_node_ingress,
+# the gate that decides whether the disputed IP is THIS node's per-node Cilium
+# ingress IP (CiliumNode.spec.ingress.ipv4). When it matches, the healer skips
+# the futile/harmful Tier-2 agent restart; when it does not, the normal Tier-1/
+# Tier-2 flow runs unchanged.
+#
+# The match is safety-critical: a false positive would suppress a cilium-agent
+# restart that would otherwise clear a real in-memory endpoint leak, so the gate
+# must (a) require an EXACT string match and (b) NEVER match on an empty ingress
+# IP (CiliumNode absent, field unset, or RBAC denied). These tests pin exactly
+# that contract; the kubectl lookup itself needs a live cluster and is not
+# unit-testable here.
+#
+# Strategy mirrors hack/capture-dataplane.bats: the script is sourced once with
+# CILIUM_LEAK_HEALER_LIB set, which its sourcing guard honours by defining the
+# helpers and returning before the heal loop -- so no cluster is required and
+# the loop never executes. Assertions use plain `[ ... ]` / if-then-false, not a
+# `run` helper (cozytest.sh has no `run`). Mock IPs use the RFC 5737
+# documentation range (TEST-NET-1, 192.0.2.0/24).
+#
+# Run with: bats hack/cilium-leak-healer_test.bats
+# -----------------------------------------------------------------------------
+
+load test_helper
+
+HACK_DIR="$(cd "$(dirname "${BATS_TEST_FILENAME:-$0}")" && pwd)"
+SCRIPT="$HACK_DIR/e2e-cilium-endpoint-leak-healer.sh"
+
+# Load the pure helpers. The guard returns before the heal loop, so this is
+# side-effect-free and needs no cluster.
+CILIUM_LEAK_HEALER_LIB=1
+# shellcheck source=/dev/null
+. "$SCRIPT"
+
+@test "ip_is_node_ingress matches when the disputed IP equals the node ingress IP" {
+  ip_is_node_ingress 192.0.2.131 192.0.2.131
+}
+
+@test "ip_is_node_ingress does not match a different IP so the Tier two restart still runs" {
+  if ip_is_node_ingress 192.0.2.55 192.0.2.131; then
+    echo "BUG: a non-ingress IP must not match the node ingress IP"
+    false
+  fi
+}
+
+@test "ip_is_node_ingress never matches an empty ingress IP so an unconfirmed lookup cannot skip a restart" {
+  if ip_is_node_ingress 192.0.2.131 ""; then
+    echo "BUG: an empty ingress IP (CiliumNode absent or RBAC denied) must never match"
+    false
+  fi
+}
+
+@test "ip_is_node_ingress never matches when both inputs are empty" {
+  if ip_is_node_ingress "" ""; then
+    echo "BUG: empty disputed IP and empty ingress IP must not be treated as a match"
+    false
+  fi
+}
diff --git a/hack/clickhouse-update-versions_test.bats b/hack/clickhouse-update-versions_test.bats
new file mode 100644
index 0000000000..c2a5eeb5b4
--- /dev/null
+++ b/hack/clickhouse-update-versions_test.bats
@@ -0,0 +1,196 @@
+#!/usr/bin/env bats
+# Unit test: packages/apps/clickhouse/hack/update-versions.sh (the ClickHouse
+# version-map generator).
+#
+# The generator turns the Docker Hub tag lists of clickhouse/clickhouse-server
+# and clickhouse/clickhouse-keeper into files/versions.yaml (a major -> full
+# tag map) and rewrites the version enum in values.yaml. These properties are
+# load-bearing and each guards a specific failure the review of #3476 caught:
+#
+#   1. The server/keeper tag intersection must be computed with a byte
+#      (lexicographic) collation, not a version collation. `comm` walks its
+#      inputs assuming byte order; feeding it `sort -V` output silently drops
+#      common tags at every X.9 -> X.10 boundary.
+#   2. The default line is frozen to the exact tag it already ships (read from
+#      the committed versions.yaml) so a regeneration never bumps the image of
+#      existing default-version installs. The freeze follows whichever major is
+#      the default, not a hardcoded one.
+#   3. Dropping the current default's major from the supported set is a hard
+#      error, not a silent promotion of the newest major to default.
+#   4. A configured major with no tag common to both images is a hard error,
+#      and the generator is atomic: on any error the committed files are left
+#      untouched.
+#   5. The values.yaml splice is bounded: a malformed section (enum header
+#      present, `version:` line absent) does not swallow the rest of the file.
+#
+# The generator is exercised offline: CH_SERVER_TAGS_FILE / CH_KEEPER_TAGS_FILE
+# inject the tag lists (no curl), and VALUES_FILE / VERSIONS_FILE stay in a
+# scratch dir. It remains compatible with the legacy hack/cozytest.sh
+# translator, so it avoids `run`/`$status`/`$lines`, file-local setup/teardown,
+# and a standalone `}` inside a test body. Each assertion exits non-zero on
+# failure and the body relies on `set -e`.
+
+load test_helper
+
+REPO_ROOT="$(cd "$(dirname "${BATS_TEST_FILENAME:-$0}")/.." && pwd)"
+GEN="$REPO_ROOT/packages/apps/clickhouse/hack/update-versions.sh"
+
+# Minimal values.yaml with the version section the generator rewrites. $2 is
+# the default version written into both the enum and the `version:` line.
+seed_values() {
+  cat > "$1" <<EOF
+## @param {string} storageClass - StorageClass used to store the data.
+storageClass: ""
+
+## @enum {string} Version
+## @value $2
+## @param {Version} version - ClickHouse major.minor version to deploy.
+version: $2
+
+##
+## @section Application-specific parameters
+##
+## @param {int} logTTL - TTL.
+logTTL: 15
+EOF
+}
+
+init_case() {
+  WORK="$(mktemp -d)"
+  SERVER="$WORK/server.txt"
+  KEEPER="$WORK/keeper.txt"
+  export VERSIONS_FILE="$WORK/versions.yaml"
+  export VALUES_FILE="$WORK/values.yaml"
+  export CH_SERVER_TAGS_FILE="$SERVER"
+  export CH_KEEPER_TAGS_FILE="$KEEPER"
+  : > "$VERSIONS_FILE"
+}
+
+@test "intersection keeps tags across the X.9 -> X.10 boundary" {
+  init_case
+  seed_values "$VALUES_FILE" v24.9
+  printf '%s\n' 24.9.2.42 24.9.3.128 24.10.1.1 > "$SERVER"
+  cp "$SERVER" "$KEEPER"
+  CH_SUPPORTED_MAJORS="24.10 24.9" bash "$GEN"
+  grep -q '^"v24.10": "24.10.1.1"$' "$VERSIONS_FILE" || { echo "24.10 dropped from intersection" >&2; exit 1; }
+  grep -q '^"v24.9":' "$VERSIONS_FILE" || { echo "24.9 dropped from intersection" >&2; exit 1; }
+}
+
+@test "the default is frozen to its committed tag, not bumped to the latest patch" {
+  init_case
+  seed_values "$VALUES_FILE" v24.9
+  printf '%s\n' '"v24.9": "24.9.2.42"' > "$VERSIONS_FILE"
+  printf '%s\n' 24.9.2.42 24.9.3.128 > "$SERVER"
+  cp "$SERVER" "$KEEPER"
+  CH_SUPPORTED_MAJORS="24.9" bash "$GEN"
+  grep -q '^"v24.9": "24.9.2.42"$' "$VERSIONS_FILE" || { echo "default not frozen to 24.9.2.42" >&2; exit 1; }
+  if grep -q '24.9.3.128' "$VERSIONS_FILE"; then echo "default bumped to newer patch" >&2; exit 1; fi
+}
+
+@test "the freeze follows the default major, not a hardcoded one" {
+  init_case
+  seed_values "$VALUES_FILE" v25.3
+  printf '%s\n' '"v25.3": "25.3.14.14"' '"v24.9": "24.9.2.42"' > "$VERSIONS_FILE"
+  printf '%s\n' 24.9.2.42 24.9.3.128 25.3.14.14 25.3.99.9 25.8.28.1 > "$SERVER"
+  cp "$SERVER" "$KEEPER"
+  CH_SUPPORTED_MAJORS="25.8 25.3 24.9" bash "$GEN"
+  # v25.3 is the default -> frozen to its committed 25.3.14.14 despite 25.3.99.9
+  grep -q '^"v25.3": "25.3.14.14"$' "$VERSIONS_FILE" || { echo "default v25.3 not frozen" >&2; exit 1; }
+  # v24.9 is no longer the default -> free to move to its latest common patch
+  grep -q '^"v24.9": "24.9.3.128"$' "$VERSIONS_FILE" || { echo "non-default v24.9 not on latest" >&2; exit 1; }
+}
+
+@test "dropping the current default's major from the supported set is a hard error" {
+  init_case
+  seed_values "$VALUES_FILE" v24.9
+  printf '%s\n' 25.3.14.14 25.8.28.1 > "$SERVER"
+  cp "$SERVER" "$KEEPER"
+  if CH_SUPPORTED_MAJORS="25.8 25.3" bash "$GEN" >/dev/null 2>&1; then echo "expected hard error on dropped default" >&2; exit 1; fi
+}
+
+@test "non-default majors resolve to their latest common patch" {
+  init_case
+  seed_values "$VALUES_FILE" v25.8
+  printf '%s\n' 25.3.14.14 25.3.15.1 25.8.28.1 > "$SERVER"
+  cp "$SERVER" "$KEEPER"
+  CH_SUPPORTED_MAJORS="25.8 25.3" bash "$GEN"
+  grep -q '^"v25.3": "25.3.15.1"$' "$VERSIONS_FILE" || { echo "25.3 not latest patch" >&2; exit 1; }
+  grep -q '^"v25.8": "25.8.28.1"$' "$VERSIONS_FILE" || { echo "25.8 missing" >&2; exit 1; }
+}
+
+@test "a tag present in only one image is not selected" {
+  init_case
+  seed_values "$VALUES_FILE" v25.8
+  printf '%s\n' 25.8.28.1 25.8.29.9 > "$SERVER"
+  printf '%s\n' 25.8.28.1 > "$KEEPER"
+  CH_SUPPORTED_MAJORS="25.8" bash "$GEN"
+  grep -q '^"v25.8": "25.8.28.1"$' "$VERSIONS_FILE" || { echo "server-only tag was selected" >&2; exit 1; }
+}
+
+@test "an unresolvable configured major is a hard error" {
+  init_case
+  seed_values "$VALUES_FILE" v24.9
+  printf '%s\n' 24.9.2.42 > "$SERVER"
+  cp "$SERVER" "$KEEPER"
+  if CH_SUPPORTED_MAJORS="26.99 24.9" bash "$GEN" >/dev/null 2>&1; then echo "expected non-zero exit" >&2; exit 1; fi
+}
+
+@test "a frozen default tag missing from the registry is a hard error" {
+  init_case
+  seed_values "$VALUES_FILE" v24.9
+  printf '%s\n' '"v24.9": "24.9.2.42"' > "$VERSIONS_FILE"
+  printf '%s\n' 24.9.3.128 > "$SERVER"   # the pinned 24.9.2.42 is absent
+  cp "$SERVER" "$KEEPER"
+  cp "$VERSIONS_FILE" "$WORK/versions.before"
+  cp "$VALUES_FILE" "$WORK/values.before"
+  # Must NOT silently fall back to 24.9.3.128 and move the default image.
+  if CH_SUPPORTED_MAJORS="24.9" bash "$GEN" >/dev/null 2>&1; then echo "expected hard error on missing frozen tag" >&2; exit 1; fi
+  cmp -s "$VERSIONS_FILE" "$WORK/versions.before" || { echo "versions.yaml changed on failure" >&2; exit 1; }
+  cmp -s "$VALUES_FILE" "$WORK/values.before" || { echo "values.yaml changed on failure" >&2; exit 1; }
+}
+
+@test "no files are written when a configured major fails to resolve" {
+  init_case
+  seed_values "$VALUES_FILE" v24.9
+  # The default (v24.9) is valid and 25.8 resolves, so the run passes the
+  # default check and gets deep into the resolution loop before 26.99 fails —
+  # exercising that nothing is written after a partial resolution, not just on
+  # an early exit.
+  printf '%s\n' 24.9.2.42 25.8.28.1 > "$SERVER"
+  cp "$SERVER" "$KEEPER"
+  printf '%s\n' '"v24.9": "24.9.2.42"' > "$VERSIONS_FILE"
+  cp "$VERSIONS_FILE" "$WORK/versions.before"
+  cp "$VALUES_FILE" "$WORK/values.before"
+  if CH_SUPPORTED_MAJORS="25.8 24.9 26.99" bash "$GEN" >/dev/null 2>&1; then echo "expected non-zero exit" >&2; exit 1; fi
+  cmp -s "$VERSIONS_FILE" "$WORK/versions.before" || { echo "versions.yaml changed on failure" >&2; exit 1; }
+  cmp -s "$VALUES_FILE" "$WORK/values.before" || { echo "values.yaml changed on failure" >&2; exit 1; }
+}
+
+@test "values.yaml enum is rewritten newest-first with the default preserved" {
+  init_case
+  seed_values "$VALUES_FILE" v24.9
+  printf '%s\n' '"v24.9": "24.9.2.42"' > "$VERSIONS_FILE"
+  printf '%s\n' 24.9.2.42 25.3.14.14 25.8.28.1 > "$SERVER"
+  cp "$SERVER" "$KEEPER"
+  CH_SUPPORTED_MAJORS="25.8 25.3 24.9" bash "$GEN"
+  first="$(grep -m1 '@value' "$VALUES_FILE")"
+  [ "$first" = "## @value v25.8" ] || { echo "enum not newest-first, got: $first" >&2; exit 1; }
+  grep -q '^version: v24.9$' "$VALUES_FILE" || { echo "default not preserved as v24.9" >&2; exit 1; }
+  grep -q '^## @section Application-specific parameters$' "$VALUES_FILE" || { echo "section boundary lost" >&2; exit 1; }
+  grep -q '^logTTL: 15$' "$VALUES_FILE" || { echo "trailing content lost" >&2; exit 1; }
+}
+
+@test "a malformed version section does not swallow the rest of the file" {
+  init_case
+  cat > "$VALUES_FILE" <<'EOF'
+## @enum {string} Version
+## @value v99.9
+## @section Application-specific parameters
+SENTINEL_KEEP: yes
+EOF
+  printf '%s\n' 25.8.28.1 > "$SERVER"
+  cp "$SERVER" "$KEEPER"
+  CH_SUPPORTED_MAJORS="25.8" bash "$GEN"
+  grep -q '^SENTINEL_KEEP: yes$' "$VALUES_FILE" || { echo "content after a malformed section was swallowed" >&2; exit 1; }
+  grep -q '^## @section Application-specific parameters$' "$VALUES_FILE" || { echo "section boundary swallowed" >&2; exit 1; }
+}
diff --git a/hack/cni-plugins-staging-contract.bats b/hack/cni-plugins-staging-contract.bats
new file mode 100644
index 0000000000..594531b126
--- /dev/null
+++ b/hack/cni-plugins-staging-contract.bats
@@ -0,0 +1,574 @@
+#!/usr/bin/env bats
+# Contract checks for the CNI plugin staging that a helm-unittest case cannot
+# make: they read files outside the chart, or render it more than one way.
+#
+# Run with: bats hack/cni-plugins-staging-contract.bats
+
+load test_helper
+
+# Keep the closing brace on the same line: hack/cozytest.sh rewrites any line
+# that is exactly `}` into `return 0` plus `}`, without caring whether it closes
+# a test, a helper or a plain brace group at file scope.
+command -v yq >/dev/null || { echo "yq is required to read the vendored kube-ovn version" >&2; exit 1; }
+
+# Is $2 one of the plugin names in the extract text $1? Separators differ by
+# position in a continued shell line, so fold them to spaces and pad both ends
+# -- `./bridge` must not be satisfied by `./bridgeport`.
+extract_has() {
+  case " $(printf '%s' "$1" | tr '\n;\\' '   ') " in
+    *" ./$2 "*) return 0 ;;
+  esac
+  return 1
+}
+
+DOCKERFILE="$PWD/packages/system/multus/images/multus-cni/Dockerfile"
+KUBEOVN_VALUES="$PWD/packages/system/kubeovn/values.yaml"
+DOC="$PWD/docs/vm-external-vlan.md"
+PLATFORM_VALUES="$PWD/packages/core/platform/values.yaml"
+TEMPLATE="$PWD/packages/system/multus/templates/multus-daemonset-thick.yml"
+PATCHFILE="$PWD/packages/system/multus/patches/customize-deployment.patch"
+
+@test "membership in the extract list is decided the same way in every position" {
+  middle=' \ ./bridge ./host-local ./vrf; \ '
+  last=' \ ./bridge ./host-local ./loopback; \ '
+  first=' \ ./loopback ./bridge ./host-local; \ '
+  multiline=$(printf ' \\\n ./bridge ./host-local \\\n ./loopback; \\\n')
+
+  extract_has "$middle" bridge      || { echo "FAIL: missed a name in the middle" >&2; return 1; }
+  extract_has "$last" loopback      || { echo "FAIL: missed a name in last position" >&2; return 1; }
+  extract_has "$first" loopback     || { echo "FAIL: missed a name in first position" >&2; return 1; }
+  extract_has "$multiline" loopback || { echo "FAIL: missed a name across a line continuation" >&2; return 1; }
+
+  if extract_has ' \ ./bridgeport ./host-local; \ ' bridge; then
+    echo "FAIL: ./bridgeport satisfied a check for ./bridge" >&2
+    return 1
+  fi
+  if extract_has ' \ ./host-local ./bridgeport; \ ' bridge; then
+    echo "FAIL: ./bridgeport in last position satisfied a check for ./bridge" >&2
+    return 1
+  fi
+  if extract_has "$middle" loopback; then
+    echo "FAIL: reported a name that is not in the list" >&2
+    return 1
+  fi
+}
+
+@test "the Dockerfile stages the plugins and copies them into the final image" {
+  grep -qE '^[[:space:]]*tar -xz -C /cni-plugins -f ' "$DOCKERFILE"
+
+  # The COPY has to land in the LAST stage: one in an earlier stage satisfies
+  # the same pattern while the image that ships carries no plugins at all, and
+  # the init container then skips on every node.
+  final_stage=$(awk '/^FROM/{buf=""} {buf = buf $0 ORS} END{printf "%s", buf}' "$DOCKERFILE")
+  if [ -z "$final_stage" ]; then
+    echo "no FROM in the Dockerfile" >&2
+    return 1
+  fi
+  if ! printf '%s' "$final_stage" |
+       grep -qE '^COPY[[:space:]]+--from=build[[:space:]]+/cni-plugins[[:space:]]+/cni-plugins[[:space:]]*$'; then
+    echo "the final stage does not COPY /cni-plugins, so the plugins are built" >&2
+    echo "and then left behind in the build stage." >&2
+    grep -nE '^FROM|^COPY.*cni-plugins' "$DOCKERFILE" >&2
+    return 1
+  fi
+
+  # And nothing after it may take them out again: the COPY being present says
+  # nothing about the directory still existing when the build ends.
+  after_copy=$(printf '%s' "$final_stage" |
+    sed -n '/^COPY[[:space:]]\{1,\}--from=build[[:space:]]\{1,\}\/cni-plugins[[:space:]]/,$p')
+  if printf '%s' "$after_copy" | grep -qE '^[^#]*\brm\b.*/cni-plugins'; then
+    echo "something in the final stage removes /cni-plugins after it was" >&2
+    echo "copied in, so the image ships without the plugins and the init" >&2
+    echo "container skips on every node." >&2
+    printf '%s' "$after_copy" | grep -nE '^[^#]*\brm\b.*/cni-plugins' >&2
+    return 1
+  fi
+
+  # And nothing anywhere in the file may delete a staged plugin: the check above
+  # only reads the tar arguments, so a later `rm -f /cni-plugins/bridge` in the
+  # build stage ships an image with thirteen. The tarball itself is a different
+  # path (/tmp/cni-plugins.tgz) and removing it is expected.
+  if grep -qE '\brm\b[^#]*[^.[:alnum:]]/cni-plugins(/|[[:space:]]|;|$)' "$DOCKERFILE"; then
+    echo "the Dockerfile removes something from /cni-plugins; whatever is" >&2
+    echo "taken out there is missing from the image, and the init container" >&2
+    echo "installs only what remains." >&2
+    grep -nE '\brm\b[^#]*/cni-plugins' "$DOCKERFILE" >&2
+    return 1
+  fi
+
+  # The pinned digest must still BE the pinned digest when the comparison runs.
+  # Assigning ${sha256} from the downloaded file turns the verification into a
+  # comparison of the download with itself, which any well-formed archive passes.
+  assigns=$(grep -cE '^[[:space:]]*[^#]*\bsha256=' "$DOCKERFILE")
+  pinned=$(grep -cE '^[[:space:]]+[a-z0-9]+\)[[:space:]]+sha256="[0-9a-f]{64}"' "$DOCKERFILE")
+  if [ "$assigns" != "$pinned" ]; then
+    echo "sha256 is assigned $assigns times but only $pinned of those are the" >&2
+    echo "per-architecture pins. Anything else reassigns the digest before the" >&2
+    echo "comparison, which then checks the download against itself." >&2
+    grep -nE 'sha256=' "$DOCKERFILE" >&2
+    return 1
+  fi
+
+  # The uid the init container runs as is decided in three places: the pod
+  # securityContext, the container securityContext and the image's own USER.
+  # The first two are asserted in packages/system/multus/tests/multus_test.yaml;
+  # this is the third. A non-root USER in the final stage makes every write fail
+  # while both Kubernetes levels still read as unset, and the script then
+  # reports the failures, exits 0 and leaves the pod Ready with nothing staged.
+  final_user=$(printf '%s' "$final_stage" | grep -E '^USER[[:space:]]' || true)
+  case "$final_user" in
+    "") ;;
+    *"USER root"*|*"USER 0"*) ;;
+    *)
+      echo "the final stage sets a non-root USER:" >&2
+      printf '%s\n' "$final_user" >&2
+      echo "the init container writes into a hostPath and needs uid 0." >&2
+      return 1 ;;
+  esac
+
+  # Only the plugins may land in /cni-plugins. The init container installs every
+  # file it finds there and chmods it 0755, so anything else that arrives -- a
+  # licence, a README, a stray COPY -- is published into the host CNI directory
+  # as an executable. Measured: adding the licence to that directory makes the
+  # script install 15 files with LICENSE among them.
+  strays=$(grep -nE '^(COPY|ADD)[[:space:]].*[[:space:]]/cni-plugins(/|[[:space:]]*$)' "$DOCKERFILE" |
+    grep -v 'COPY --from=build /cni-plugins /cni-plugins' || true)
+  if [ -n "$strays" ]; then
+    echo "something other than the plugin directory itself is copied into" >&2
+    echo "/cni-plugins; the init container would install it on every node as" >&2
+    echo "an executable CNI plugin." >&2
+    printf '%s\n' "$strays" >&2
+    return 1
+  fi
+
+  # Apache-2.0 binaries are redistributed here, so the licence ships with them.
+  # Terminated on its own line for the same reason as the checksum: a command
+  # chained after the `;` runs inside the same RUN and can undo it.
+  grep -qE '^[[:space:]]*tar -xz -C /cni-plugins-licenses -f [^[:space:]]+ \./LICENSE;[[:space:]]*\\?[[:space:]]*$' "$DOCKERFILE"
+  printf '%s' "$final_stage" |
+    grep -qE '^COPY[[:space:]]+--from=build[[:space:]]+/cni-plugins-licenses[[:space:]]+/cni-plugins-licenses[[:space:]]*$'
+
+  # Matched inside the extract's own continued line, so a mention elsewhere in
+  # the file cannot satisfy it.
+  extract=$(sed -n '/tar -xz -C \/cni-plugins -f /,/;/p' "$DOCKERFILE" | tr '\n' ' ')
+  [ -n "$extract" ]
+  for plugin in loopback dhcp dummy tap; do
+    if extract_has "$extract" "$plugin"; then
+        echo "packages/system/multus/images/multus-cni/Dockerfile now extracts" >&2
+        echo "./$plugin, which this package deliberately does not stage, and" >&2
+        echo "which docs/vm-external-vlan.md names as left alone." >&2
+        if [ "$plugin" = loopback ]; then
+          echo "The init container would then replace the node's loopback plugin" >&2
+          echo "on every restart. The runtime calls loopback for every pod" >&2
+          echo "sandbox, not just those using a NAD, so a bad copy costs the" >&2
+          echo "whole node rather than one attachment -- and cilium and kube-ovn" >&2
+          echo "already install it, so staging adds a writer for no gain." >&2
+        elif [ "$plugin" = dhcp ]; then
+          echo "dhcp is not usable from the binary alone: it needs a" >&2
+          echo "long-running daemon and a socket on the host, which this" >&2
+          echo "package does not run." >&2
+        fi
+        echo "Update the guide in the same commit if this is deliberate." >&2
+        return 1
+    fi
+  done
+
+  # Nothing may take the failure away: tar returns non-zero when a requested
+  # member is absent from the archive, and `|| true` there ships an image
+  # missing that plugin with a successful build. The range ends at the first
+  # `;`, so a chain before it is inside what is checked.
+  if printf '%s' "$extract" | grep -qE '\|\||&&|\|'; then
+    echo "the plugin extraction is chained with another command, which takes" >&2
+    echo "its failure away: a release archive missing one requested member" >&2
+    echo "would then build a successful image without that plugin." >&2
+    printf '%s\n' "$extract" >&2
+    return 1
+  fi
+
+  # The staged set by NAME, not a count: a count is satisfied by one name
+  # appearing twice while another is missing.
+  staged=$(printf '%s' "$extract" | tr ' ' '\n' | sed -n 's|^\./||p' | tr -d ';' | sort)
+  expected=$(printf '%s\n' bandwidth bridge firewall host-device host-local ipvlan \
+    macvlan portmap ptp sbr static tuning vlan vrf | sort)
+  if [ "$staged" != "$expected" ]; then
+    echo "the set of plugins the Dockerfile stages has changed." >&2
+    echo "staged now:" >&2
+    printf '%s\n' "$staged" >&2
+    echo "expected these 14:" >&2
+    printf '%s\n' "$expected" >&2
+    echo "docs/vm-external-vlan.md tells operators the package installs 14 of" >&2
+    echo "the upstream reference plugins and names the four it leaves alone," >&2
+    echo "so that sentence is now wrong. Update it in the same commit." >&2
+    return 1
+  fi
+
+  for plugin in bridge macvlan ipvlan; do
+    if ! extract_has "$extract" "$plugin"; then
+        echo "packages/system/multus/images/multus-cni/Dockerfile no longer extracts" >&2
+        echo "./$plugin into /cni-plugins, but docs/vm-external-vlan.md tells operators" >&2
+        echo "the package stages it. The init container installs whatever is in that" >&2
+        echo "directory and skips silently when it is absent, so a NAD naming" >&2
+        echo "$plugin would go back to failing with" >&2
+        echo "\"failed to find plugin \\\"$plugin\\\" in path [/opt/cni/bin]\"" >&2
+        echo "on every node, with nothing else in this suite going red." >&2
+        return 1
+    fi
+  done
+}
+
+@test "the tarball checksum is present, pinned, and precedes extraction" {
+  # These are TEXT checks. hack/common-envs.mk builds amd64 and arm64 by
+  # default, so both per-arch digests below are live on a build without an
+  # explicit PLATFORM. CI pins linux/amd64, so there only the amd64 one is
+  # exercised.
+
+  # One whole line, and it must TERMINATE. The `;` is what closes the family:
+  # `|| true`, `&& :`, `| cat` (a pipeline's status is its last element and there
+  # is no pipefail in POSIX sh), and `|| true` moved to the next physical line,
+  # since an unterminated command must end in `\`. `${sha256}` in the comparison
+  # is what stops the tarball being checked against itself.
+  #
+  # sha256sum accepts "HASH  FILE" and "HASH *FILE"; both are allowed here.
+  # The file operand is taken from the curl line rather than left open: an
+  # unpinned operand is satisfied by any path, so a decoy file with a pinned
+  # digest passes the form while the downloaded tarball is extracted unchecked.
+  tarball=$(grep -oE '[[:space:]]-o[[:space:]]+[^[:space:]]+' "$DOCKERFILE" | head -1 | awk '{print $2}')
+  if [ -z "$tarball" ]; then
+    echo "no 'curl ... -o <file>' in the Dockerfile, so there is no download" >&2
+    echo "for the checksum to be about." >&2
+    return 1
+  fi
+  tarball_re=$(printf '%s' "$tarball" | sed 's/[].[^$*\\/]/\\&/g')
+
+  if ! grep -qE "^[[:space:]]*echo \"\\\$\\{sha256\\}([[:space:]]+|[[:space:]]\\*)${tarball_re}\" \\| sha256sum -c -;[[:space:]]*\\\\?[[:space:]]*$" "$DOCKERFILE"; then
+    echo "the verify line is not the expected form:" >&2
+    echo "  echo \"\${sha256}  ${tarball}\" | sha256sum -c -;" >&2
+    echo "It must compare the pinned digest against the file curl downloaded," >&2
+    echo "and must terminate on its own line -- anything chained after it, on" >&2
+    echo "this line or the next, takes the failure away and an unverified" >&2
+    echo "tarball is extracted." >&2
+    grep -nE 'sha256sum' "$DOCKERFILE" >&2
+    return 1
+  fi
+
+  # And the file that was verified must be the one unpacked.
+  if ! grep -qE "^[[:space:]]*tar -xz -C /cni-plugins -f ${tarball_re}([[:space:]]|$)" "$DOCKERFILE"; then
+    echo "the extraction does not unpack ${tarball}, the file the checksum" >&2
+    echo "above verified, so the verification decides nothing." >&2
+    grep -nE 'tar -xz' "$DOCKERFILE" >&2
+    return 1
+  fi
+
+  # `\` joins the physical lines before the shell sees them, so `set +e` on any
+  # continuation disables the checksum, curl --fail and tar together while
+  # `RUN set -eux` stays intact.
+  verify_run=$(awk '
+    /^RUN /            { block = $0; inblock = 1; next }
+    inblock            { block = block "\n" $0 }
+    inblock && !/\\$/  { if (block ~ /sha256sum -c -/) { print block; exit }; inblock = 0 }
+  ' "$DOCKERFILE")
+  if [ -z "$verify_run" ]; then
+    echo "could not find the RUN that verifies the tarball" >&2
+    return 1
+  fi
+  # Errexit IS checked, on the logical line the shell actually runs. Four earlier
+  # attempts to decide this by grepping physical lines failed, each in its own
+  # way: `set -ux` (absent), `set +e` later (revoked), `# set -e` (a comment,
+  # which under a continuation also silences the rest of the joined line), and
+  # `echo 'set -e'` (an argument, not a command). Joining the continuations and
+  # cutting every comment first removes all four: what remains is the text the
+  # shell sees, and errexit has to be its FIRST command.
+  #
+  # Both spellings of revocation are rejected: `set +e` and `set +o errexit`.
+  #
+  # Not covered, and not claimed to be: errexit reached through a variable or a
+  # conditional. Deciding that needs a shell, not a pattern.
+  run_start=$(awk '/^RUN /{r=NR} /sha256sum -c -/{print r; exit}' "$DOCKERFILE")
+  if [ -z "$run_start" ]; then
+    echo "no RUN instruction contains the checksum comparison" >&2
+    return 1
+  fi
+  joined=$(tail -n +"$run_start" "$DOCKERFILE" |
+    awk '{print} !/\\[[:space:]]*$/{exit}' |
+    sed 's/#.*//' | tr '\n' ' ' | tr -s ' ')
+  # The same joined line, as the shell parses it. Deleting `case ... in` or its
+  # `esac` leaves a syntax error the image build would catch -- in minutes, and
+  # only on a pull request that touches this package. `sh -n` catches it here in
+  # milliseconds. Continuations are stripped first: with the backslashes left in
+  # place the shell sees them as literals and even a correct RUN fails to parse.
+  if ! printf '%s' "$(tail -n +"$run_start" "$DOCKERFILE" |
+        awk '{print} !/\\[[:space:]]*$/{exit}' |
+        sed -e 's/^RUN[[:space:]]*//' -e 's/[[:space:]]*\\$//' | tr '\n' ' ')" | sh -n 2>/dev/null; then
+    echo "the RUN that verifies and extracts the plugins does not parse as a" >&2
+    echo "shell command once its continuations are joined." >&2
+    return 1
+  fi
+
+  first=$(printf '%s' "$joined" | sed 's/^RUN[[:space:]]*//' | cut -d';' -f1)
+  if ! printf '%s' "$first" | grep -qE '^[[:space:]]*set[[:space:]]+-[a-zA-Z]*e'; then
+    echo "the RUN that verifies the tarball does not begin by enabling errexit." >&2
+    echo "Its first command is: $first" >&2
+    echo "Without it a failed checksum is reported and the build continues to" >&2
+    echo "extract the archive it just rejected." >&2
+    return 1
+  fi
+  if printf '%s' "$joined" | grep -qE 'set[[:space:]]+(\+[a-zA-Z]*e|\+o[[:space:]]+errexit)'; then
+    echo "errexit is revoked later in the same RUN, which puts the checksum" >&2
+    echo "back to being advisory." >&2
+    printf '%s\n' "$joined" >&2
+    return 1
+  fi
+
+  # Both per-arch pins, each separately: an alternation is satisfied by whichever
+  # one survived.
+  for arch in amd64 arm64; do
+    if ! grep -qE "^[[:space:]]+$arch\)[[:space:]]+sha256=\"[0-9a-f]{64}\"" "$DOCKERFILE"; then
+      echo "no pinned 64-hex SHA-256 for $arch in the Dockerfile." >&2
+      echo "That arch would be extracted on the strength of its tag alone, and" >&2
+      echo "for arm64 no build exercises the path that would notice." >&2
+      grep -nE 'sha256=' "$DOCKERFILE" >&2
+      return 1
+    fi
+  done
+
+  # Verification must precede extraction. Located by the strict form above, not
+  # by the substring: an inert `: "sha256sum -c -";` earlier in the file would
+  # satisfy an ordering check anchored on a mention.
+  v=$(grep -nE '^[[:space:]]*echo "\$\{sha256\}([[:space:]]+|[[:space:]]\*)[^"]+" \| sha256sum -c -;[[:space:]]*\\?[[:space:]]*$' "$DOCKERFILE" | head -1 | cut -d: -f1)
+  t=$(grep -nE '^[[:space:]]*tar -xz -C /cni-plugins -f ' "$DOCKERFILE" | head -1 | cut -d: -f1)
+  if [ -z "$v" ] || [ -z "$t" ] || [ "$v" -ge "$t" ]; then
+    echo "the checksum no longer precedes the extraction (verify line $v, tar line $t)" >&2
+    return 1
+  fi
+}
+
+@test "the kube-ovn release the CNI plugin pin was checked against is the one vendored" {
+  # Each side non-empty first: two missing keys compare equal.
+  checked=$(sed -n 's|^# kube-ovn-cni-plugins-checked-against: *\([^ ]*\) *$|\1|p' "$DOCKERFILE")
+  [ -n "$checked" ]
+
+  vendored=$(yq -r '.global.images.kubeovn.tag' "$KUBEOVN_VALUES" | sed 's|@.*||')
+  [ -n "$vendored" ]
+  [ "$vendored" != "null" ]
+
+  if [ "$checked" != "$vendored" ]; then
+    echo "the multus CNI plugin pin was checked against kube-ovn $checked," >&2
+    echo "but packages/system/kubeovn/values.yaml now vendors $vendored." >&2
+    echo >&2
+    echo "Read CNI_PLUGINS_VERSION in kube-ovn $vendored's base image" >&2
+    echo "(dist/images/Dockerfile.base). If it still matches the" >&2
+    echo "CNI_PLUGINS_VERSION in packages/system/multus/images/multus-cni/" >&2
+    echo "Dockerfile, only move the marker there to $vendored. If it does not," >&2
+    echo "the shared portmap and macvlan would flap between the two daemonsets," >&2
+    echo "so bring the multus pin and its per-arch checksums across first." >&2
+    return 1
+  fi
+}
+
+@test "the rendered multus daemon config is valid JSON" {
+  # Every assertion on this document elsewhere is a pattern over its text, and a
+  # pattern is happy with trailing garbage: `"multusMasterCNI": "05-cilium.conflist" garbage,`
+  # keeps them all green while multus gets a config it cannot parse and comes up
+  # with no master CNI at all. Parsing is the only check that decides this, and
+  # helm-unittest cannot do it.
+  #
+  # It sits here rather than beside the other daemon-config assertions because
+  # those are helm-unittest cases in packages/system/multus/tests/multus_test.yaml
+  # and this one needs a parser. This file is where the multus checks that need
+  # something outside helm-unittest live, staging or not.
+  cfg=$(helm template packages/system/multus |
+    yq eval 'select(.kind == "ConfigMap") | .data["daemon-config.json"]' -)
+  [ -n "$cfg" ]
+  if ! printf '%s' "$cfg" | yq eval -p json '.' - >/dev/null 2>&1; then
+    echo "the rendered daemon-config.json does not parse as JSON:" >&2
+    printf '%s\n' "$cfg" >&2
+    return 1
+  fi
+  # And the key that decides which conflist multus treats as primary has to
+  # survive parsing, not merely appear in the text.
+  master=$(printf '%s' "$cfg" | yq eval -p json '.multusMasterCNI' -)
+  if [ "$master" != "05-cilium.conflist" ]; then
+    echo "the parsed multusMasterCNI is '$master', not 05-cilium.conflist" >&2
+    return 1
+  fi
+}
+
+@test "the Talos release the CNI plugin pin was checked against is the one shipped" {
+  # Each side non-empty first: two missing keys compare equal.
+  checked=$(sed -n 's|^# talos-cni-plugins-checked-against: *\([^ ]*\) *$|\1|p' "$DOCKERFILE")
+  [ -n "$checked" ]
+
+  shipped=$(awk '/^version:/ {print $2; exit}' packages/core/talos/images/talos/profiles/installer.yaml)
+  [ -n "$shipped" ]
+
+  if [ "$checked" != "$shipped" ]; then
+    echo "the multus CNI plugin pin was checked against Talos $checked," >&2
+    echo "but packages/core/talos now ships $shipped." >&2
+    echo >&2
+    echo "Read cni_version in siderolabs/pkgs' Pkgfile on the matching release" >&2
+    echo "branch. If it still equals CNI_PLUGINS_VERSION in this Dockerfile," >&2
+    echo "only move the marker to $shipped. If it does not, staging would" >&2
+    echo "replace the node image's bridge, firewall, host-local and portmap" >&2
+    echo "with a different version of the same plugins on every Talos node," >&2
+    echo "so decide which version wins before moving it." >&2
+    return 1
+  fi
+}
+
+@test "the VLAN guide's remediation quotes what the daemonset actually emits" {
+  # The guide names a log line and a container; both spellings live in the
+  # manifest.
+  grep -qF -- 'no /cni-plugins in this image; skipping staging' "$TEMPLATE"
+  grep -qF -- 'no /cni-plugins in this image; skipping staging' "$DOC"
+
+  grep -qF -- 'name: install-cni-plugins' "$TEMPLATE"
+  # Inside the command an operator is told to run, not anywhere in the file: a
+  # mention left in prose ("older notes may say ...") satisfies a bare match
+  # while the command itself names a different container.
+  grep -qE -- 'kubectl [^`]*logs [^`]*--container install-cni-plugins($|[^-[:alnum:]])' "$DOC"
+
+  # The count as a reader meets it. Only the staged count is quoted, never the
+  # upstream total: that is a property of a release this suite cannot read.
+  grep -qE -- '(^|[^0-9])14 of the upstream reference plugins' "$DOC"
+
+  # The half of that sentence naming the four, pinned separately: of the four
+  # only loopback arrives from anywhere else (cilium and kube-ovn install it).
+  grep -qF -- 'and leaves `loopback`, `dhcp`, `dummy` and `tap` alone' "$DOC"
+  if grep -qF -- '`tap` to the node image' "$DOC"; then
+    echo "the guide again attributes the unstaged plugins to the node image;" >&2
+    echo "staging exists because that image may not carry them" >&2
+    return 1
+  fi
+
+  if grep -qF -- 'immediately above' "$DOC"; then
+    echo "the guide again promises the cause sits immediately above the" >&2
+    echo "'failed to install:' summary. It does not when more than one plugin" >&2
+    echo "fails: the summary is printed once, after the loop." >&2
+    return 1
+  fi
+
+  grep -qE -- '(^|[^0-9])14 of the upstream reference plugins' "$PLATFORM_VALUES"
+  grep -qF -- 'loopback, dhcp, dummy and tap are left alone' "$PLATFORM_VALUES"
+
+  # Presence only: a grep cannot decide whether prose still MEANS what it says,
+  # and `do not set the opt-out before upgrading` contains this string. The
+  # reversal is guarded by name, which closes the spellings seen so far and not
+  # the general case -- that one stays open deliberately.
+  grep -qE -- '(^|[^[:alnum:]])set the opt-out before upgrading' "$DOC"
+  if grep -qiE -- '(do not|never|no need to|dont|don.t) set the opt-out' "$DOC"; then
+    echo "the guide now tells operators NOT to set the opt-out before" >&2
+    echo "upgrading. Declining afterwards does not restore a replaced plugin," >&2
+    echo "so the instruction has to stay as it is." >&2
+    return 1
+  fi
+}
+
+@test "every accepted spelling of stageCniPlugins renders the direction it names" {
+  # The chart holds the accepted spellings as TWO lists -- one deciding whether
+  # the value is readable, one deciding whether it means on -- and nothing else
+  # makes them agree, so each spelling is rendered rather than their union.
+  #
+  for v in true TRUE True yes YES on On 1; do
+    n=$(helm template --set-string stageCniPlugins="$v" packages/system/multus |
+          yq eval 'select(.kind == "DaemonSet") | .spec.template.spec.initContainers | length' - |
+          tail -1)
+    if [ "$n" != "2" ]; then
+      echo "stageCniPlugins=$v is documented as ON but rendered $n init" >&2
+      echo "containers (expected 2: install-multus-binary + install-cni-plugins)." >&2
+      return 1
+    fi
+  done
+  for v in false FALSE False no NO off Off 0; do
+    n=$(helm template --set-string stageCniPlugins="$v" packages/system/multus |
+          yq eval 'select(.kind == "DaemonSet") | .spec.template.spec.initContainers | length' - |
+          tail -1)
+    if [ "$n" != "1" ]; then
+      echo "stageCniPlugins=$v is documented as OFF but rendered $n init" >&2
+      echo "containers (expected 1: install-multus-binary alone)." >&2
+      return 1
+    fi
+  done
+  # And a spelling outside the documented set must stop the render rather than
+  # resolving to either direction.
+  if helm template --set-string stageCniPlugins=maybe packages/system/multus >/dev/null 2>&1; then
+    echo "stageCniPlugins=maybe rendered instead of failing the template" >&2
+    return 1
+  fi
+}
+
+@test "every line the patch owns still matches the committed template" {
+  # customize-deployment.patch is the SOURCE: `make update` does
+  # `rm -rf templates && wget && patch`, so anything present only in the template
+  # is discarded on the next run. Reverse-applying the whole patch proves every
+  # line the PATCH OWNS still matches; it says nothing about the rest of the file.
+  #
+  # --fuzz=0 because `patch` defaults to a fuzz factor of 2 and will drop context
+  # lines to make a hunk fit.
+  d=$(mktemp -d)
+  mkdir -p "$d/templates"
+  sed 's|^\( *\)image: .*multus-cni.*|\1image: ghcr.io/k8snetworkplumbingwg/multus-cni:snapshot-thick|' \
+    "$TEMPLATE" > "$d/templates/multus-daemonset-thick.yml"
+
+  # Non-empty, or a moved template turns this into a patch against nothing.
+  if [ ! -s "$d/templates/multus-daemonset-thick.yml" ]; then
+    echo "the template is empty or missing; nothing to compare the patch to" >&2
+    rm -rf "$d"
+    return 1
+  fi
+
+  # --fuzz=0 for the same reason: a dropped context line is an edit absorbed
+  # rather than reported.
+  if ! (cd "$d" && patch -R --dry-run --fuzz=0 -p4 --input="$PATCHFILE" >"$d/out" 2>&1); then
+    echo "customize-deployment.patch no longer describes the committed template." >&2
+    echo "The patch is the source: anything present only in the template is" >&2
+    echo "discarded by the next 'make update', and anything present only in the" >&2
+    echo "patch appears on every node at that point without ever being tested." >&2
+    cat "$d/out" >&2
+    rm -rf "$d"
+    return 1
+  fi
+  rm -rf "$d"
+}
+
+@test "every multus-cni reference in the manifest is the same string" {
+  # Every container that must run the multus image, found BY NAME. Selecting the
+  # image fields by what they already contain finds only those that still say
+  # multus-cni, so a container repointed at another image leaves the comparison
+  # instead of failing it.
+  rendered=$(helm template --set stageCniPlugins=true packages/system/multus)
+  for c in install-multus-binary install-cni-plugins kube-multus; do
+    img=$(printf '%s' "$rendered" | yq eval "select(.kind == \"DaemonSet\") | [.spec.template.spec.initContainers[], .spec.template.spec.containers[]] | .[] | select(.name == \"$c\") | .image" -)
+    case "$img" in
+      ghcr.io/cozystack/cozystack/multus-cni:*) ;;
+      *)
+        echo "container $c runs '$img', not the cozystack multus image." >&2
+        echo "All three run the same image by construction: the package's" >&2
+        echo "image: target rewrites every multus-cni line together." >&2
+        return 1 ;;
+    esac
+  done
+
+  # `make image` sed's the built reference over every multus-cni line, so they
+  # are one string by construction. Asserted as identity rather than per-index so
+  # a fourth container is covered without touching this test.
+  #
+  # `image:[[:space:]]+`, not a literal space: YAML permits any run, and a
+  # hard-coded one makes the pattern match nothing rather than match differently.
+  refs=$(grep -oE 'image:[[:space:]]+[^[:space:]]*multus-cni[^[:space:]]*' "$TEMPLATE" |
+           sed 's/^image:[[:space:]]*//' | sort -u)
+  count=$(printf '%s\n' "$refs" | grep -c . || true)
+
+  if [ "$count" = "0" ]; then
+    echo "no multus-cni image reference found in the template at all; if the" >&2
+    echo "image was renamed, this test and the package's image: target both" >&2
+    echo "need updating together." >&2
+    return 1
+  fi
+  if [ "$count" != "1" ]; then
+    echo "the manifest carries $count different multus-cni references:" >&2
+    printf '%s\n' "$refs" >&2
+    echo "They must be one string. make image writes all of them together, so a" >&2
+    echo "difference here means one was edited by hand." >&2
+    return 1
+  fi
+}
diff --git a/hack/codeowners-invariant.bats b/hack/codeowners-invariant.bats
new file mode 100644
index 0000000000..fd208e0d16
--- /dev/null
+++ b/hack/codeowners-invariant.bats
@@ -0,0 +1,44 @@
+#!/usr/bin/env bats
+# -----------------------------------------------------------------------------
+# Coverage invariant for .github/CODEOWNERS.
+#
+# CODEOWNERS applies only the LAST matching rule, and matching is not
+# additive: a scoped rule fully replaces the * catch-all instead of extending
+# it. The only way to keep the default owners able to review everything is to
+# repeat their handles in every scoped rule. A rule that omits one of them
+# silently carves its path out from under the catch-all, and since "Require
+# review from Code Owners" is enforced on main and stale reviews are dismissed
+# on push, that path then deadlocks whenever its remaining owners are away,
+# with no way around it short of an admin override.
+#
+# The invariant: every rule that lists owners must include every owner of the
+# * catch-all. Ownerless rules are the one exception, being generated files
+# whose review is waived on purpose.
+#
+# Changing the catch-all owners is a policy change; this test failing on such
+# a change is the point - adjust the expectation here in the same PR, with the
+# policy discussion linked.
+# -----------------------------------------------------------------------------
+
+load test_helper
+
+@test "every CODEOWNERS rule that lists owners repeats the catch-all owners" {
+  [ -f .github/CODEOWNERS ]
+
+  awk '
+    /^[[:space:]]*(#|$)/ { next }
+    $1 == "*" { for (i = 2; i <= NF; i++) defaults[$i]; ndef = NF - 1; next }
+    NF < 2 { next }
+    {
+      for (d in defaults) {
+        found = 0
+        for (i = 2; i <= NF; i++) if ($i == d) found = 1
+        if (!found) { printf "line %d: rule %s is missing default owner %s\n", FNR, $1, d; bad = 1 }
+      }
+    }
+    END {
+      if (ndef == 0) { print "no * catch-all rule with owners found"; exit 1 }
+      exit bad
+    }
+  ' .github/CODEOWNERS
+}
diff --git a/hack/collect-images.sh b/hack/collect-images.sh
index 817f1d06a3..5177906591 100755
--- a/hack/collect-images.sh
+++ b/hack/collect-images.sh
@@ -1,8 +1,27 @@
 #!/bin/sh
 
+# image-refs.txt is what the release's runtime multi-arch audit checks, so it
+# is written only when every node answered: a list missing a node would pass
+# the images only that node pulled.
+rm -f images.tmp image-refs.txt
+complete=1
 for node in 11 12 13; do
-  talosctl -n 192.168.123.${node} -e 192.168.123.${node} images ls >> images.tmp
-  talosctl -n 192.168.123.${node} -e 192.168.123.${node} images --namespace system ls >> images.tmp
+  talosctl -n 192.168.123.${node} -e 192.168.123.${node} images ls >> images.tmp || complete=0
+  talosctl -n 192.168.123.${node} -e 192.168.123.${node} images --namespace system ls >> images.tmp || complete=0
 done
 
 while read _ name sha _ ; do echo $sha $name ; done < images.tmp | sort -u > images.txt
+
+# <repo>@<digest>, the digest being what the node's pull resolved to: an index
+# for a multi-arch image. A name that is itself a digest is an image ID alias
+# and names no repository.
+if [ "$complete" != 1 ]; then
+  echo "collect-images: a node could not be read; image-refs.txt not written" >&2
+  exit 0
+fi
+awk '$3 ~ /^sha256:/ && $2 !~ /^sha256:/ {
+  name = $2
+  sub(/@.*/, "", name)
+  if (match(name, /:[^\/]*$/)) name = substr(name, 1, RSTART - 1)
+  print name "@" $3
+}' images.tmp | sort -u > image-refs.txt
diff --git a/hack/collect-images_test.bats b/hack/collect-images_test.bats
new file mode 100644
index 0000000000..35ecd66f73
--- /dev/null
+++ b/hack/collect-images_test.bats
@@ -0,0 +1,154 @@
+#!/usr/bin/env bats
+# Tests for hack/collect-images.sh, which lists the images the e2e sandbox's
+# Talos nodes hold. Its image-refs.txt feeds the runtime multi-arch audit, so
+# it must name every pulled image by the digest the node resolved, and must not
+# be written at all when a node could not be read.
+#
+# talosctl is a stub: it prints the `images ls` table held in
+# $MOCK_TALOS/<node>-<namespace>, or fails for a node listed in $MOCK_TALOS/down.
+#
+# Harness note: the unit lane runs this file under Bats. The bodies stay POSIX
+# sh (no `run`, no [[ ]]; each @test a shell function under `set -eu`), so
+# hack/cozytest.sh can still run it under dash by hand.
+#
+# Run with: bats hack/collect-images_test.bats
+
+load test_helper
+
+_stub_talos() {
+  MOCK_TALOS="$1"
+  export MOCK_TALOS
+  mkdir -p "$MOCK_TALOS/bin"
+  : >"$MOCK_TALOS/down"
+  cat >"$MOCK_TALOS/bin/talosctl" <<'EOF'
+#!/bin/sh
+set -eu
+node="$2"
+ns=cri
+[ "$6" = --namespace ] && ns="$7"
+if grep -qxF "$node" "$MOCK_TALOS/down"; then echo "rpc error: connection refused" >&2; exit 1; fi
+printf 'NODE IMAGE DIGEST SIZE LABELS CREATED\n'
+[ -f "$MOCK_TALOS/$node-$ns" ] && cat "$MOCK_TALOS/$node-$ns"
+exit 0
+EOF
+  chmod +x "$MOCK_TALOS/bin/talosctl"
+}
+
+D1="sha256:$(printf '1%.0s' $(seq 1 64))"
+D2="sha256:$(printf '2%.0s' $(seq 1 64))"
+D3="sha256:$(printf '3%.0s' $(seq 1 64))"
+
+@test "image-refs.txt names every image a node holds by the digest it resolved" {
+  tmp=$(mktemp -d)
+  _stub_talos "$tmp/talos"
+  n=192.168.123.11
+  {
+    printf '%s ghcr.io/cozy/api:v1 %s 1MB x now\n' "$n" "$D1"
+    printf '%s ghcr.io/cozy/api@%s %s 1MB x now\n' "$n" "$D1" "$D1"
+    printf '%s docker.io/library/busybox@%s %s 1MB x now\n' "$n" "$D2" "$D2"
+    # An image ID alias, not a pull: it names no repository.
+    printf '%s %s %s 1MB x now\n' "$n" "$D3" "$D3"
+  } >"$MOCK_TALOS/$n-cri"
+  printf '%s registry.example:5000/etcd:v3 %s 1MB x now\n' 192.168.123.12 "$D3" >"$MOCK_TALOS/192.168.123.12-system"
+  cp hack/collect-images.sh "$tmp/"
+  (cd "$tmp" && PATH="$MOCK_TALOS/bin:$PATH" sh ./collect-images.sh)
+  printf '%s\n' "docker.io/library/busybox@$D2" "ghcr.io/cozy/api@$D1" "registry.example:5000/etcd@$D3" | diff - "$tmp/image-refs.txt"
+  grep -q "^$D1 ghcr.io/cozy/api:v1\$" "$tmp/images.txt"
+  rm -rf "$tmp"
+}
+
+@test "a node that cannot be read leaves no image-refs.txt behind" {
+  tmp=$(mktemp -d)
+  _stub_talos "$tmp/talos"
+  printf '%s ghcr.io/cozy/api:v1 %s 1MB x now\n' 192.168.123.11 "$D1" >"$MOCK_TALOS/192.168.123.11-cri"
+  echo 192.168.123.13 >"$MOCK_TALOS/down"
+  cp hack/collect-images.sh "$tmp/"
+  # A partial list would audit only the nodes that answered.
+  echo stale >"$tmp/image-refs.txt"
+  (cd "$tmp" && PATH="$MOCK_TALOS/bin:$PATH" sh ./collect-images.sh) 2>"$tmp/err"
+  [ ! -e "$tmp/image-refs.txt" ]
+  grep -q 'image-refs.txt not written' "$tmp/err"
+  grep -q "ghcr.io/cozy/api:v1" "$tmp/images.txt"
+  rm -rf "$tmp"
+}
+
+@test "e2e-tag audits what the nodes pulled, fails only a pre-release, and tears down regardless" {
+  wf=.github/workflows/e2e-tag.yaml
+  names=$(yq -r '.jobs.e2e.steps[].name' "$wf")
+  c=$(echo "$names" | grep -nx 'Collect images list' | cut -d: -f1)
+  a=$(echo "$names" | grep -nx 'Audit pulled images are multi-arch' | cut -d: -f1)
+  t=$(echo "$names" | grep -nx 'Tear down sandbox' | cut -d: -f1)
+  [ -n "$c" ] && [ -n "$a" ] && [ -n "$t" ] && [ "$c" -lt "$a" ] && [ "$a" -lt "$t" ]
+  step='.jobs.e2e.steps[] | select(.name == "Audit pulled images are multi-arch")'
+  [ "$(yq -r "$step | .if" "$wf")" = 'always()' ]
+  run=$(yq -r "$step | .run" "$wf")
+  echo "$run" | grep -q 'hack/verify-multiarch.sh .*--refs-file'
+  # A stable tag's run reports; a pre-release's fails.
+  echo "$run" | grep -qF '*-*)'
+  [ "$(yq -r '.jobs.e2e.steps[] | select(.name == "Tear down sandbox") | .if' "$wf")" = 'always()' ]
+  yq -r '.jobs.e2e.steps[] | select(.name == "Upload image list") | .with.path' "$wf" | grep -q 'image-refs.txt'
+  yq -r '.jobs.e2e.steps[] | select(.name == "Upload image list") | .with.path' "$wf" | grep -q 'multiarch-audit.txt'
+}
+
+@test "e2e-tag refuses a tree that predates the container lane and names the ref to dispatch from" {
+  run=$(yq -r '.jobs.e2e.steps[] | select(.name == "Require a container-lane tree") | .run' .github/workflows/e2e-tag.yaml)
+  tmp=$(mktemp -d)
+  mkdir -p "$tmp/old" "$tmp/new/hack"
+  touch "$tmp/new/hack/e2e-compose.yaml"
+  printf '%s\n' "$run" >"$tmp/step.sh"
+  (cd "$tmp/new" && TAG=v1.7.0-alpha.3 bash -e "$tmp/step.sh")
+  rc=0
+  (cd "$tmp/old" && TAG=v1.6.3 bash -e "$tmp/step.sh") >"$tmp/out" 2>&1 || rc=$?
+  [ "$rc" -ne 0 ]
+  grep -qF '::error title=e2e-tag::v1.6.3 predates the container lane' "$tmp/out"
+  grep -qF -- '--ref v1.6.3' "$tmp/out"
+  rm -rf "$tmp"
+}
+
+@test "the e2e audit skips a tree that predates it and fails a pre-release tree that has it" {
+  # The step runs in the checkout of the tag under test. An rc cut before the
+  # audit existed has neither the script nor image-refs.txt, and failing its e2e
+  # for that would block re-validating it from main.
+  run=$(yq -r '.jobs.e2e.steps[] | select(.name == "Audit pulled images are multi-arch") | .run' .github/workflows/e2e-tag.yaml)
+  tmp=$(mktemp -d)
+  mkdir -p "$tmp/old" "$tmp/new/hack" "$tmp/new/_out" "$tmp/bin"
+  printf '%s\n' "$run" >"$tmp/step.sh"
+  # The step installs skopeo and jq when they are missing; neither case here
+  # reaches a registry, so stubs keep it off apt-get.
+  printf '#!/bin/sh\nexit 0\n' >"$tmp/bin/skopeo"
+  printf '#!/bin/sh\nexit 0\n' >"$tmp/bin/jq"
+  chmod +x "$tmp/bin/skopeo" "$tmp/bin/jq"
+  # cd "/tmp/$SANDBOX_NAME" must land in the fixture, wherever mktemp put it.
+  rc=0
+  PATH="$tmp/bin:$PATH" SANDBOX_NAME="..$tmp/old" TAG=v9.9.9-rc.1 bash -e "$tmp/step.sh" >"$tmp/out" 2>&1 || rc=$?
+  [ "$rc" -eq 0 ]
+  grep -q '::warning.*predates the multi-arch audit' "$tmp/out"
+
+  # A tree that has the audit but no image list: the collection failed.
+  cp hack/verify-multiarch.sh "$tmp/new/hack/"
+  cp hack/multiarch-allowlist "$tmp/new/hack/"
+  mkdir -p "$tmp/new/hack/lib" && cp hack/lib/image-refs.sh "$tmp/new/hack/lib/"
+  rc=0
+  PATH="$tmp/bin:$PATH" SANDBOX_NAME="..$tmp/new" TAG=v9.9.9-rc.1 bash -e "$tmp/step.sh" >"$tmp/out" 2>&1 || rc=$?
+  [ "$rc" -ne 0 ]
+  grep -q "refs file '_out/image-refs.txt' does not exist" "$tmp/out"
+  # A stable tag only warns, and says the audit did not run.
+  PATH="$tmp/bin:$PATH" SANDBOX_NAME="..$tmp/new" TAG=v9.9.9 bash -e "$tmp/step.sh" >"$tmp/out" 2>&1
+  grep -q '::warning title=multi-arch audit::the multi-arch audit did not run' "$tmp/out"
+
+  # A single-arch image: a pre-release fails, a stable tag warns that the
+  # images are not all indexes. Real jq reads the stub's manifest.
+  mkdir -p "$tmp/bin-single"
+  printf '#!/bin/sh\necho %s\n' "'{\"schemaVersion\":2,\"config\":{}}'" >"$tmp/bin-single/skopeo"
+  chmod +x "$tmp/bin-single/skopeo"
+  printf 'example.test/x@sha256:%s\n' "$(printf 'a%.0s' $(seq 1 64))" >"$tmp/new/_out/image-refs.txt"
+  rc=0
+  PATH="$tmp/bin-single:$PATH" SANDBOX_NAME="..$tmp/new" TAG=v9.9.9-rc.1 bash -e "$tmp/step.sh" >"$tmp/out" 2>&1 || rc=$?
+  [ "$rc" -ne 0 ]
+  grep -q 'example.test/x@sha256:a*: single-platform manifest' "$tmp/out"
+  rc=0
+  PATH="$tmp/bin-single:$PATH" SANDBOX_NAME="..$tmp/new" TAG=v9.9.9 bash -e "$tmp/step.sh" >"$tmp/out" 2>&1 || rc=$?
+  [ "$rc" -eq 0 ]
+  grep -q '::warning title=multi-arch audit::some images pulled by e2e are not amd64+arm64 indexes or could not be checked' "$tmp/out"
+  rm -rf "$tmp"
+}
diff --git a/hack/common-envs.mk b/hack/common-envs.mk
index 7a35fb082a..100e9de1df 100644
--- a/hack/common-envs.mk
+++ b/hack/common-envs.mk
@@ -7,11 +7,18 @@ endif
 
 REGISTRY ?= ghcr.io/cozystack/cozystack
 
+# CACHE_REGISTRY: registry holding the `:buildcache` mode=max cache images that
+# `--cache-from`/`--cache-to` read and write (see the cache-args macro below).
+# Defaults to $(REGISTRY) so the cache is co-located with the build registry —
+# in CI that is the per-CI registry the runners are closest to, keeping cache
+# transfers fast and egress-free.
+CACHE_REGISTRY ?= $(REGISTRY)
+
 # IMAGE_TAG: build-unique tag pushed for every image. Set by CI to a value
 # that does not collide between concurrent builds:
 #   * pull-requests.yaml -> pr-<N>-<sha>
 #   * tags.yaml          -> <ref_name>           (e.g. v1.5.0)
-#   * local              -> dev                  (with PUSH=0 by default)
+#   * local              -> dev                  (pushes unless PUSH=0; LOAD=1 defaults PUSH to 0)
 IMAGE_TAG ?= dev
 
 # Opt-in extra tags. Workflows set these explicitly; defaults are off so a
@@ -21,15 +28,53 @@ IMAGE_TAG ?= dev
 PUBLISH_VERSIONED ?= 0
 PUBLISH_FLOATING  ?= 0
 
-PUSH := 1
-LOAD := 0
+# WRITE_CACHE=1 enables `--cache-to` (mode=max) to CACHE_REGISTRY/<img>:buildcache.
+# Default off: only the serialized main/release cache-warming build writes the
+# shared cache ref. PR builds keep it 0 and read-only, so concurrent PR builds
+# never race on the cache manifest (the 409 collisions PR #2711 fixed for tags).
+WRITE_CACHE ?= 0
+
+# Environment and command line both override these, and an empty value from the
+# environment counts as unset. LOAD=1 loads into the local docker store, so PUSH
+# follows it to 0 unless PUSH is set too.
+LOAD := $(or $(strip $(LOAD)),0)
+PUSH := $(or $(strip $(PUSH)),$(if $(filter 1,$(LOAD)),0,1))
+
+# OCI_EXPORT_DIR: when set, build every image to a per-image OCI archive
+# (<dir>/<name>.oci.tar) instead of pushing or loading it. Fork PRs use this:
+# the unprivileged `pull_request` build carries no registry credentials, so it
+# exports the images as workflow artifacts and a privileged `workflow_run` later
+# pushes them to the registry BY DIGEST (see .github/workflows/e2e-fork.yaml).
+# The image digest is content-addressed and captured via --metadata-file
+# regardless of output type, so the values.yaml/.tag refs baked during this
+# build match exactly what the privileged run pushes. Setting it forces
+# PUSH/LOAD off so buildx emits only the archive — a `--push` alongside the OCI
+# --output would attempt an anonymous push and die with `denied` (#3257).
+OCI_EXPORT_DIR ?=
+ifneq ($(strip $(OCI_EXPORT_DIR)),)
+    PUSH := 0
+    LOAD := 0
+endif
+
 BUILDER ?=
-PLATFORM ?=
+# Published images are amd64+arm64 by default, so a build on either
+# architecture cannot publish an image the other one cannot run. LOAD=1 builds
+# the host architecture only: the classic docker image store cannot load a
+# multi-platform index. Set PLATFORM explicitly to build anything else.
+DEFAULT_PLATFORMS := linux/amd64,linux/arm64
+PLATFORM ?= $(if $(filter 1,$(LOAD)),,$(DEFAULT_PLATFORMS))
 BUILDX_EXTRA_ARGS ?=
 COZYSTACK_VERSION = $(patsubst v%,%,$(shell git describe --tags --match 'v*'))
 
+# SBOM=1 attaches a CycloneDX SBOM as a buildx build attestation (--sbom=true).
+# Requires the docker-container buildx driver and registry referrers/attestation
+# support. Kept OFF by default until an OCIR referrers/attestation probe confirms
+# support — otherwise the attestation push fails the build. See #2937.
+SBOM ?= 0
+
 BUILDX_ARGS := --provenance=false --push=$(PUSH) --load=$(LOAD) \
   --label org.opencontainers.image.source=https://github.com/cozystack/cozystack \
+  $(if $(filter 1,$(SBOM)),--sbom=true) \
   $(if $(strip $(BUILDER)),--builder=$(BUILDER)) \
   $(if $(strip $(PLATFORM)),--platform=$(PLATFORM)) \
   $(BUILDX_EXTRA_ARGS)
@@ -43,12 +88,73 @@ BUILDX_ARGS := --provenance=false --push=$(PUSH) --load=$(LOAD) \
 # Consumers reference images by digest, so the build-unique tag is enough
 # for cluster-side pulls; the versioned and floating tags exist for human
 # discoverability and downstream tooling on releases.
+# When OCI_EXPORT_DIR is set it also appends a per-image `--output type=oci`
+# (via the oci-output macro) so the build writes <dir>/<name>.oci.tar (the tag
+# becomes the archive's image name). Every package's buildx call routes its tags
+# through this macro, so this is the single point that turns the whole build into
+# an artifact-export build — except recipes that bypass image-tags, which must
+# call oci-output directly (see #3257).
+
+# comma emits a literal comma inside the lazily-expanded macros below
+# (oci-output, cache-args) without make mis-reading it as an $(if …)/$(call …)
+# argument separator. Defined here, above its first user, so it is unambiguously
+# in scope wherever those macros are $(call)ed from a recipe.
+comma := ,
+
+# oci-output <image-name> — when OCI_EXPORT_DIR is set, expands to a per-image
+# `--output type=oci,dest=<dir>/<name>.oci.tar`; empty otherwise. EVERY buildx
+# call reachable from a fork build must include this — via image-tags, or
+# directly for recipes that bypass image-tags (#3257). A missing archive is
+# caught loudly by the fork build's `if-no-files-found: error` upload.
+oci-output = $(if $(strip $(OCI_EXPORT_DIR)), --output type=oci$(comma)dest=$(OCI_EXPORT_DIR)/$(subst /,-,$(1)).oci.tar)
+
+# image-tags <image-name> [<versioned-tag>] — the --tag/--output flags for one
+# image. Under OCI_EXPORT_DIR the versioned/floating tags are suppressed: a
+# multi-`--tag` `--output type=oci` build writes every ref into the archive's
+# index.json, and `skopeo copy oci-archive:<f>` then refuses it ("more than one
+# image in oci"). PUBLISH_* are 0 on fork PRs (the only export case today), so
+# this is belt-and-suspenders for that trap.
+#
+# PUSHED_TAGS_LOG=<file> appends every pushed <repo>:<tag> to <file>, one per
+# line. hack/stitch-multiarch.sh moves exactly those tags onto the multi-arch
+# index; no ref in the tree names a versioned tag, so this is how it learns
+# one was pushed. The append happens when the recipe is expanded, `make -n`
+# included, and is skipped when the build pushes nothing (PUSH other than 1, or
+# OCI_EXPORT_DIR).
+image-tag-refs = $(REGISTRY)/$(1):$(IMAGE_TAG)$(if $(strip $(OCI_EXPORT_DIR)),,$(if $(filter 1,$(PUBLISH_VERSIONED)),$(if $(filter-out $(IMAGE_TAG),$(strip $(2))), $(REGISTRY)/$(1):$(strip $(2))))$(if $(filter 1,$(PUBLISH_FLOATING)), $(REGISTRY)/$(1):latest))
+
 define image-tags
---tag $(REGISTRY)/$(1):$(IMAGE_TAG)$(if $(filter 1,$(PUBLISH_VERSIONED)),$(if $(filter-out $(IMAGE_TAG),$(strip $(2))), --tag $(REGISTRY)/$(1):$(strip $(2))))$(if $(filter 1,$(PUBLISH_FLOATING)), --tag $(REGISTRY)/$(1):latest)
+$(foreach r,$(call image-tag-refs,$(1),$(2)),--tag $(r))$(call oci-output,$(1))$(if $(and $(strip $(PUSHED_TAGS_LOG)),$(filter 1,$(PUSH)),$(if $(strip $(OCI_EXPORT_DIR)),,1)),$(shell printf '%s\n' $(call image-tag-refs,$(1),$(2)) >>'$(PUSHED_TAGS_LOG)'))
 endef
 
+# cache-args <image-name>
+# Expands to buildx cache flags for one image:
+#   --cache-from is always emitted (a missing cache 404s harmlessly -> cold build)
+#   --cache-to is emitted only when WRITE_CACHE=1 (main/release), writing mode=max
+#     so ALL stages are cached -- including the multistage `builder` layers that
+#     `--cache-to type=inline` could never export. oci-mediatypes + image-manifest
+#     keep the cache manifest portable across registries (OCIR/ghcr/ECR).
+# CACHE_TAG lets a build for another platform keep a cache of its own
+# (buildcache-arm64) instead of overwriting the amd64 one with every write.
+# $(comma) (defined above) escapes the literal commas in the --cache-to value so
+# make does not mis-parse them as $(if ...) argument separators.
+CACHE_TAG ?= buildcache
+cache-args = --cache-from type=registry,ref=$(CACHE_REGISTRY)/$(1):$(CACHE_TAG)$(if $(filter 1,$(WRITE_CACHE)), --cache-to type=registry$(comma)ref=$(CACHE_REGISTRY)/$(1):$(CACHE_TAG)$(comma)mode=max$(comma)oci-mediatypes=true$(comma)image-manifest=true)
+
 ifeq ($(COZYSTACK_VERSION),)
     $(shell git remote add upstream https://github.com/cozystack/cozystack.git || true)
     $(shell git fetch upstream --tags)
     COZYSTACK_VERSION = $(patsubst v%,%,$(shell git describe --tags --match 'v*'))
 endif
+
+# Go module fetches in image builds. IMAGE_GOPROXY reaches every Go builder
+# stage as the GOPROXY build arg, which a stage sees only once it declares
+# `ARG GOPROXY`. The pipe falls back to direct on any proxy error; Go's default
+# comma does so only on a 404 or 410, so an HTTP/2 stream reset from
+# proxy.golang.org fails the build. A module hosted in git can only be fetched
+# directly where the stage has git, which the alpine golang images lack; there
+# the retry around `go mod download` is the only cover. The value is not read
+# from the host's GOPROXY: a mirror on localhost or a file:// proxy is
+# unreachable from inside buildkit.
+IMAGE_GOPROXY ?= https://proxy.golang.org|direct
+BUILDX_ARGS += --build-arg 'GOPROXY=$(IMAGE_GOPROXY)'
diff --git a/hack/common-envs_test.bats b/hack/common-envs_test.bats
new file mode 100644
index 0000000000..9eab7a47b4
--- /dev/null
+++ b/hack/common-envs_test.bats
@@ -0,0 +1,225 @@
+#!/usr/bin/env bats
+# Unit tests for the OCI_EXPORT_DIR export mode wired through hack/common-envs.mk
+# (#3257). A fork PR's unprivileged `pull_request` build carries no registry
+# credentials, so it must export every image to a per-image OCI archive instead
+# of pushing; a privileged workflow_run (e2e-fork.yaml) later pushes those
+# archives to OCIR by digest. A build unit that pushes anyway dies on a fork with
+# an anonymous-push `denied`, so these tests dry-run (`make -n`) a representative
+# set of the root `build:` units with OCI_EXPORT_DIR set and assert that every
+# image is exported as an archive and no (ungated) `docker://` push survives.
+#
+# Coverage includes the two units the fork split originally broke — talos (a
+# skopeo copy that bypasses the image-tags macro) and capi-providers-cpprovider
+# (a two-`--tag` buildx call that put two manifests in one OCI archive) — plus a
+# plain image-tags package (cozystack-controller) as the happy path.
+#
+# Run from the repo root through `make bats-unit-tests`; the relative
+# `make -C packages/...` calls resolve against that cwd. The file also remains
+# compatible with the legacy `hack/cozytest.sh` translator, so it avoids
+# run/$status/$output/setup() and uses plain $(...) capture plus grep and the
+# build-matrix_test.bats `if grep -q …; then echo FAIL; false; fi`
+# negation idiom (cozytest runs each @test under `set -e`, which suppresses a
+# bare `!`-negated pipeline, so a regression would silently pass a `! grep`).
+
+load test_helper
+
+@test "cozystack-controller exports one OCI archive and never pushes under OCI_EXPORT_DIR" {
+  out=$(make -n -C packages/system/cozystack-controller image OCI_EXPORT_DIR=/tmp/ocitest IMAGE_TAG=pr-1-abc BUILDER=b)
+  # Exactly one per-image OCI archive export for the single built image.
+  # `grep -o | wc -l` counts OCCURRENCES: the macro expands onto a single line,
+  # so `grep -c` would count that one line and report 1 however many flags survive.
+  n=$(echo "$out" | grep -o -- '--output type=oci,dest=' | wc -l)
+  [ "$n" -eq 1 ]
+  echo "$out" | grep -q -- '--output type=oci,dest=/tmp/ocitest/cozystack-controller.oci.tar'
+  # A plain image-tags package routes every tag through the macro, so under
+  # export there is no docker:// ref at all.
+  if echo "$out" | grep -q 'docker://'; then echo "FAIL: cozystack-controller must not push under OCI_EXPORT_DIR"; false; fi
+}
+
+@test "capi-providers-cpprovider exports one OCI archive with a single tag under OCI_EXPORT_DIR" {
+  out=$(make -n -C packages/system/capi-providers-cpprovider image OCI_EXPORT_DIR=/tmp/ocitest IMAGE_TAG=pr-1-abc BUILDER=b)
+  # Exactly one per-image OCI archive export.
+  n=$(echo "$out" | grep -o -- '--output type=oci,dest=' | wc -l)
+  [ "$n" -eq 1 ]
+  echo "$out" | grep -q -- '--output type=oci,dest=/tmp/ocitest/cluster-api-control-plane-provider-kamaji.oci.tar'
+  # The two-tag regression: under `--output type=oci` both --tag refs land in
+  # index.json → two manifests → `skopeo copy oci-archive:…` fails with "more
+  # than one image in oci". Exactly one --tag must survive under export.
+  tags=$(echo "$out" | grep -o -- '--tag' | wc -l)
+  [ "$tags" -eq 1 ]
+  if echo "$out" | grep -q 'docker://'; then echo "FAIL: capi-providers-cpprovider must not push under OCI_EXPORT_DIR"; false; fi
+}
+
+@test "talos exports matchbox + talos archives and never pushes an ungated image under OCI_EXPORT_DIR" {
+  out=$(make -n -C packages/core/talos image OCI_EXPORT_DIR=/tmp/ocitest IMAGE_TAG=pr-1-abc BUILDER=b)
+  # matchbox is a buildx call through image-tags → one --output type=oci archive.
+  echo "$out" | grep -q -- '--output type=oci,dest=/tmp/ocitest/matchbox.oci.tar'
+  # talos is a skopeo copy that bypasses image-tags; under export it must target
+  # an oci-archive whose basename is `talos` (the OCIR repo e2e-fork.yaml pushes
+  # to by basename), NOT a docker:// registry (an anonymous push on a fork dies
+  # with `denied` — #3257).
+  echo "$out" | grep -q 'oci-archive:/tmp/ocitest/talos.oci.tar'
+  # No push survives export except the PUBLISH_*=1-gated release copies, which
+  # are inert here: a fork build never sets PUBLISH_*, so the shell gate expands
+  # to `[ "0" = "1" ]`. Anything else pushing to docker:// is the regression.
+  pushes=$(echo "$out" | grep 'docker://' | grep -v '"0" = "1"' || true)
+  if [ -n "$pushes" ]; then echo "FAIL: talos pushes an ungated image under OCI_EXPORT_DIR: $pushes"; false; fi
+}
+
+@test "OCI_EXPORT_DIR suppresses release tags/pushes even with PUBLISH_*=1 (#3262 hardening)" {
+  # The B2-class trap is latent: PUBLISH_* are 0 on fork PRs (the only export
+  # case today), so force them on to prove the OCI_EXPORT_DIR gate holds anyway.
+  # image-tags package: only the pr IMAGE_TAG survives — a versioned + :latest
+  # multi-tag OCI archive holds >1 manifest and `skopeo copy oci-archive:` refuses it.
+  out=$(make -n -C packages/system/cozystack-controller image OCI_EXPORT_DIR=/tmp/ocitest PUBLISH_VERSIONED=1 PUBLISH_FLOATING=1 IMAGE_TAG=pr-1-abc COZYSTACK_VERSION=0 BUILDER=b)
+  tags=$(echo "$out" | grep -o -- '--tag' | wc -l)
+  [ "$tags" -eq 1 ]
+  if echo "$out" | grep -q -- ':latest'; then echo "FAIL: image-tags emits :latest under OCI_EXPORT_DIR"; false; fi
+  # talos: its versioned/floating skopeo copies are additionally gated on an
+  # empty OCI_EXPORT_DIR (`[ -z … ]`), so no ungated docker:// push survives export.
+  tout=$(make -n -C packages/core/talos image OCI_EXPORT_DIR=/tmp/ocitest PUBLISH_VERSIONED=1 PUBLISH_FLOATING=1 IMAGE_TAG=pr-1-abc COZYSTACK_VERSION=0 BUILDER=b)
+  pushes=$(echo "$tout" | grep 'docker://' | grep -vF '[ -z ' || true)
+  if [ -n "$pushes" ]; then echo "FAIL: talos pushes an ungated image under OCI_EXPORT_DIR with PUBLISH_*=1: $pushes"; false; fi
+}
+
+@test "default path (OCI_EXPORT_DIR unset) still pushes and keeps release tags (#3262)" {
+  # Every other test here sets OCI_EXPORT_DIR, so nothing covered the OFF path —
+  # the one every same-repo PR, main and release build still takes. Without this
+  # case a refactor of the export wiring could stop pushing altogether, or strip
+  # the release tags, and the suite would stay green.
+  out=$(make -n -C packages/system/cozystack-controller image PUBLISH_VERSIONED=1 PUBLISH_FLOATING=1 IMAGE_TAG=pr-1-abc COZYSTACK_VERSION=0 BUILDER=b)
+  # buildx pushes, and no per-image archive is written.
+  echo "$out" | grep -q -- '--push=1'
+  if echo "$out" | grep -q -- '--output type=oci'; then echo "FAIL: OCI archive export leaked into the default path"; false; fi
+  # image-tags expands all three release tags when not exporting: the
+  # build-unique IMAGE_TAG, the versioned tag and :latest.
+  tags=$(echo "$out" | grep -o -- '--tag' | wc -l)
+  [ "$tags" -eq 3 ]
+  echo "$out" | grep -q -- ':latest'
+  # talos bypasses image-tags. Its skopeo copies must target the registry, and
+  # the `[ -z "$(OCI_EXPORT_DIR)" ]` release gates must be INERT off-export
+  # (expanding to `[ -z "" ]`) so a release run still pushes versioned+floating.
+  tout=$(make -n -C packages/core/talos image PUBLISH_VERSIONED=1 PUBLISH_FLOATING=1 IMAGE_TAG=pr-1-abc COZYSTACK_VERSION=0 BUILDER=b)
+  echo "$tout" | grep -q 'docker://.*/talos:pr-1-abc'
+  echo "$tout" | grep -q 'docker://.*/talos:latest'
+  if echo "$tout" | grep -q 'oci-archive:'; then echo "FAIL: talos exports an archive without OCI_EXPORT_DIR"; false; fi
+}
+
+@test "a published image is built for amd64 and arm64 unless PLATFORM says otherwise" {
+  # A push with no PLATFORM builds both, so an arm64 workstation cannot publish
+  # an arm64-only digest that amd64 nodes then fail to pull.
+  out=$(make -n -C packages/system/cozystack-controller image IMAGE_TAG=pr-1-abc COZYSTACK_VERSION=0 BUILDER=b)
+  platforms=$(echo "$out" | grep -o -- '--platform=[^ ]*' | tr '\n' ' ')
+  [ "$platforms" = "--platform=linux/amd64,linux/arm64 " ]
+  # An explicit PLATFORM replaces the default rather than adding to it.
+  out=$(make -n -C packages/system/cozystack-controller image IMAGE_TAG=pr-1-abc COZYSTACK_VERSION=0 BUILDER=b PLATFORM=linux/arm64)
+  platforms=$(echo "$out" | grep -o -- '--platform=[^ ]*' | tr '\n' ' ')
+  [ "$platforms" = "--platform=linux/arm64 " ]
+}
+
+@test "LOAD=1 builds for the host only, since the docker image store cannot load an index" {
+  out=$(make -n -C packages/system/cozystack-controller image IMAGE_TAG=pr-1-abc COZYSTACK_VERSION=0 BUILDER=b LOAD=1 PUSH=0)
+  echo "$out" | grep -q -- '--load=1'
+  if echo "$out" | grep -q -- '--platform'; then echo "FAIL: LOAD=1 passes a platform, so buildx builds an index it cannot load"; false; fi
+}
+
+@test "LOAD and PUSH from the environment reach buildx, and LOAD=1 alone does not push" {
+  out=$(LOAD=1 PUSH=0 make -n -C packages/system/cozystack-controller image IMAGE_TAG=pr-1-abc COZYSTACK_VERSION=0 BUILDER=b)
+  echo "$out" | grep -q -- '--push=0 --load=1' || { echo "FAIL: environment LOAD=1 PUSH=0 ignored"; false; }
+  if echo "$out" | grep -q -- '--platform'; then echo "FAIL: environment LOAD=1 still builds a multi-arch index"; false; fi
+  out=$(LOAD=1 make -n -C packages/system/cozystack-controller image IMAGE_TAG=pr-1-abc COZYSTACK_VERSION=0 BUILDER=b)
+  echo "$out" | grep -q -- '--push=0 --load=1' || { echo "FAIL: LOAD=1 alone pushes"; false; }
+  # An explicit PUSH still wins over the LOAD-derived default.
+  out=$(LOAD=1 PUSH=1 make -n -C packages/system/cozystack-controller image IMAGE_TAG=pr-1-abc COZYSTACK_VERSION=0 BUILDER=b)
+  echo "$out" | grep -q -- '--push=1 --load=1'
+  # The fork export must keep beating an environment PUSH=1.
+  out=$(PUSH=1 make -n -C packages/system/cozystack-controller image IMAGE_TAG=pr-1-abc COZYSTACK_VERSION=0 BUILDER=b OCI_EXPORT_DIR=/tmp/ocitest)
+  echo "$out" | grep -q -- '--push=0 --load=0'
+}
+
+@test "an empty PUSH or LOAD in the environment falls back to the default" {
+  out=$(PUSH= LOAD= make -n -C packages/system/cozystack-controller image IMAGE_TAG=pr-1-abc COZYSTACK_VERSION=0 BUILDER=b)
+  echo "$out" | grep -q -- '--push=1 --load=0' || { echo "FAIL: empty PUSH/LOAD reach buildx as empty flags"; false; }
+  out=$(PUSH= LOAD=1 make -n -C packages/system/cozystack-controller image IMAGE_TAG=pr-1-abc COZYSTACK_VERSION=0 BUILDER=b)
+  echo "$out" | grep -q -- '--push=0 --load=1'
+}
+
+@test "talos publishes nothing to the registry with PUSH=0" {
+  out=$(make -n -B -C packages/core/talos image-talos PUSH=0 PUBLISH_VERSIONED=1 PUBLISH_FLOATING=1 IMAGE_TAG=pr-1-abc COZYSTACK_VERSION=0)
+  echo "$out" | grep -q 'docker://'
+  pushes=$(echo "$out" | grep 'docker://' | grep -vF '[ "0" = "1" ]' || true)
+  if [ -n "$pushes" ]; then echo "FAIL: talos pushes with PUSH=0: $pushes"; false; fi
+}
+
+@test "CACHE_TAG moves the cache ref of every image" {
+  # The arm64 leg writes its own mode=max cache. Sharing the amd64 ref would
+  # make every write from one leg evict the other's layers.
+  out=$(make -n -C packages/system/cozystack-controller image IMAGE_TAG=pr-1-abc COZYSTACK_VERSION=0 BUILDER=b WRITE_CACHE=1)
+  echo "$out" | grep -q -- '--cache-from type=registry,ref=[^ ]*/cozystack-controller:buildcache '
+  echo "$out" | grep -q -- '--cache-to type=registry,ref=[^ ]*/cozystack-controller:buildcache,'
+  out=$(make -n -C packages/system/cozystack-controller image IMAGE_TAG=pr-1-abc COZYSTACK_VERSION=0 BUILDER=b WRITE_CACHE=1 CACHE_TAG=buildcache-arm64)
+  echo "$out" | grep -q -- '--cache-from type=registry,ref=[^ ]*/cozystack-controller:buildcache-arm64 '
+  echo "$out" | grep -q -- '--cache-to type=registry,ref=[^ ]*/cozystack-controller:buildcache-arm64,'
+  # No per-call tag may bypass CACHE_TAG, or both legs write one cache ref.
+  tmp=$(mktemp -d)
+  printf 'include %s/hack/common-envs.mk\nprobe:\n\t@echo $(call cache-args,img,percall)\n' "$(pwd)" > "$tmp/Makefile"
+  out=$(make -s -C "$tmp" probe COZYSTACK_VERSION=0 WRITE_CACHE=1 CACHE_TAG=buildcache-arm64)
+  rm -rf "$tmp"
+  echo "$out" | grep -q -- '--cache-from type=registry,ref=[^ ]*/img:buildcache-arm64 '
+  echo "$out" | grep -q -- '--cache-to type=registry,ref=[^ ]*/img:buildcache-arm64,'
+}
+
+@test "the kamaji provider image is pushed under the build's IMAGE_TAG like every other image" {
+  # An IMAGE_TAG assigned in a package Makefile beats the value CI puts in the
+  # environment, so every PR, main and line build would push the same
+  # component-version tag and overwrite each other's.
+  pkg=packages/system/capi-providers-cpprovider
+  out=$(IMAGE_TAG=pr-1-abc make -n -C "$pkg" image COZYSTACK_VERSION=0 BUILDER=b)
+  tags=$(echo "$out" | grep -o -- '--tag [^ ]*' | sed 's/^--tag //')
+  [ "$(echo "$tags" | sed 's/.*://')" = pr-1-abc ] || { echo "FAIL: pushes $tags"; false; }
+  # The stamped refs keep the component version, the tag a release publishes.
+  echo "$out" | grep -qE 'IMG="[^"]*/cluster-api-control-plane-provider-kamaji:v[0-9][^"@]*-cozystack\.[0-9]+@'
+  # The component tag is published only when a release asks for versioned tags.
+  out=$(IMAGE_TAG=pr-1-abc PUBLISH_VERSIONED=1 make -n -C "$pkg" image COZYSTACK_VERSION=0 BUILDER=b)
+  tags=$(echo "$out" | grep -o -- '--tag [^ ]*' | sed 's/.*://')
+  [ "$(echo "$tags" | head -1)" = pr-1-abc ]
+  echo "$tags" | grep -qE '^v[0-9].*-cozystack\.[0-9]+$'
+  [ "$(echo "$tags" | wc -l | tr -d ' ')" -eq 2 ]
+  if echo "$tags" | grep -q -- '-$'; then echo "FAIL: a tag ends in '-': $tags"; false; fi
+}
+
+@test "image-tags records every tag it pushes in PUSHED_TAGS_LOG, and nothing when unset, exporting or not pushing" {
+  # The stitch moves exactly these tags onto the multi-arch index. A component
+  # version pushed under PUBLISH_VERSIONED=1 is named by no ref in the tree, so
+  # a tag missing here would stay on the amd64-only image.
+  tmp=$(mktemp -d)
+  out=$(make -n -C packages/system/cozystack-controller image IMAGE_TAG=v9.9.9-rc.1 PUBLISH_VERSIONED=1 BUILDER=b \
+    REGISTRY=reg.example/c PUSHED_TAGS_LOG="$tmp/log")
+  echo "$out" | grep -o -- '--tag [^ ]*' | awk '{ print $2 }' | sort >"$tmp/pushed"
+  [ "$(wc -l <"$tmp/pushed" | tr -d ' ')" -eq 2 ]
+  sort "$tmp/log" | diff "$tmp/pushed" -
+
+  make -n -C packages/system/cozystack-controller image IMAGE_TAG=v9.9.9-rc.1 PUBLISH_VERSIONED=1 BUILDER=b >/dev/null
+  make -n -C packages/system/cozystack-controller image IMAGE_TAG=pr-1-abc BUILDER=b \
+    OCI_EXPORT_DIR=/tmp/ocitest PUSHED_TAGS_LOG="$tmp/export-log" >/dev/null
+  [ ! -e "$tmp/export-log" ]
+  # A build that does not push must not hand its tags to the stitch.
+  LOAD=1 make -n -C packages/system/cozystack-controller image IMAGE_TAG=pr-1-abc BUILDER=b \
+    PUSHED_TAGS_LOG="$tmp/load-log" >/dev/null
+  if [ -s "$tmp/load-log" ]; then echo "FAIL: LOAD=1 logs tags it never pushed: $(cat "$tmp/load-log")"; false; fi
+  rm -rf "$tmp"
+}
+
+@test "talos pushes one installer index for PLATFORM and matchbox boots both arches" {
+  # -B prints every asset build whether or not a local _out/assets has it.
+  out=$(make -n -B -C packages/core/talos image IMAGE_TAG=pr-1-abc COZYSTACK_VERSION=0 BUILDER=b)
+  echo "$out" | grep -q 'for a in amd64 arm64; do skopeo copy'
+  echo "$out" | grep -q 'hack/installer-index.sh [^ ]* amd64 arm64;'
+  echo "$out" | grep -q 'skopeo copy --all "$SRC" docker://[^ ]*/talos:pr-1-abc'
+  # The installer follows PLATFORM, but matchbox serves machines of either arch
+  # wherever it runs, so it still needs the arm64 kernel and initramfs.
+  out=$(make -n -B -C packages/core/talos image IMAGE_TAG=pr-1-abc COZYSTACK_VERSION=0 BUILDER=b PLATFORM=linux/amd64)
+  if echo "$out" | grep -q 'installer-arm64'; then echo "FAIL: an amd64 build builds the arm64 installer"; false; fi
+  echo "$out" | grep -q 'profiles/kernel-arm64.yaml'
+  echo "$out" | grep -q 'profiles/initramfs-arm64.yaml'
+}
diff --git a/hack/computeplane-kcp-hold_test.bats b/hack/computeplane-kcp-hold_test.bats
new file mode 100644
index 0000000000..dd126f09b1
--- /dev/null
+++ b/hack/computeplane-kcp-hold_test.bats
@@ -0,0 +1,165 @@
+#!/usr/bin/env bats
+# -----------------------------------------------------------------------------
+# Unit tests for hack/e2e-chainsaw/computeplane/kcp-hold.sh, the finalizer the
+# computeplane teardown holds the KamajiControlPlane with. A release that
+# reports success without removing the entry leaves the control plane and its
+# tenant stuck in deletion for good, so every path that cannot prove the entry
+# is gone has to fail.
+#
+# kubectl is a stub on PATH: `get` prints $FIX/kcp.json when it exists (an
+# empty answer is --ignore-not-found on an absent object) and exits with
+# $FIX/get-rc, and `patch` records its JSON patch in $FIX/patch and exits with
+# $FIX/patch-rc.
+#
+# cozytest.sh runs the bodies under sh and puts `return 0` in front of every
+# bare `}`, so the helpers whose status matters close with `} # name`.
+#
+# Run with: hack/cozytest.sh hack/computeplane-kcp-hold_test.bats
+# -----------------------------------------------------------------------------
+
+load test_helper
+
+HACK_DIR="$(cd "$(dirname "${BATS_TEST_FILENAME:-$0}")" && pwd)"
+KH_LIB="$HACK_DIR/e2e-chainsaw/computeplane/kcp-hold.sh"
+export KH_LIB
+
+HOLD=e2e.cozystack.io/teardown-order
+
+kh() {
+  PATH="$FIX/bin:$PATH" sh -c '. "$KH_LIB"; "$@"' kh "$@"
+} # kh
+
+new_fixture() {
+  FIX=$(mktemp -d)
+  export FIX
+  mkdir -p "$FIX/bin"
+  cat >"$FIX/bin/kubectl" <<'EOF'
+#!/bin/sh
+case " $* " in
+  *" get "*)
+    [ ! -f "$FIX/kcp.json" ] || cat "$FIX/kcp.json"
+    exit "$(cat "$FIX/get-rc" 2>/dev/null || echo 0)" ;;
+  *" patch "*)
+    for a; do last=$a; done
+    printf '%s' "$last" >"$FIX/patch"
+    exit "$(cat "$FIX/patch-rc" 2>/dev/null || echo 0)" ;;
+esac
+echo "kubectl stub: unexpected call: $*" >&2
+exit 99
+EOF
+  chmod +x "$FIX/bin/kubectl"
+} # new_fixture
+
+# kcp_with FINALIZERS_JSON — the object the stub returns; "null" for none.
+kcp_with() {
+  printf '{"metadata":{"name":"computeplane-cluster","finalizers":%s}}' "$1" | jq 'del(.metadata.finalizers | select(. == null))' >"$FIX/kcp.json"
+} # kcp_with
+
+patch_is() {
+  [ -f "$FIX/patch" ] || { echo "no patch was sent" >&2; return 1; }
+  got=$(jq -cS . "$FIX/patch")
+  want=$(printf '%s' "$1" | jq -cS .)
+  [ "$got" = "$want" ] || { echo "patch: got $got, want $want" >&2; return 1; }
+} # patch_is
+
+@test "hold creates the finalizer list when the object has none" {
+  new_fixture
+  kcp_with null
+  kh kcp_hold
+  patch_is "[{\"op\":\"add\",\"path\":\"/metadata/finalizers\",\"value\":[\"$HOLD\"]}]"
+  rm -rf "$FIX"
+}
+
+@test "hold appends behind a test of the existing list" {
+  new_fixture
+  kcp_with '["a.example/x"]'
+  kh kcp_hold
+  patch_is "[{\"op\":\"test\",\"path\":\"/metadata/finalizers\",\"value\":[\"a.example/x\"]},{\"op\":\"add\",\"path\":\"/metadata/finalizers/-\",\"value\":\"$HOLD\"}]"
+  rm -rf "$FIX"
+}
+
+@test "hold returns 2 and patches nothing when the object is absent" {
+  new_fixture
+  rc=0
+  kh kcp_hold || rc=$?
+  [ "$rc" -eq 2 ] || { echo "rc=$rc, want 2" >&2; exit 1; }
+  [ ! -f "$FIX/patch" ] || { echo "patched an absent object" >&2; exit 1; }
+  rm -rf "$FIX"
+}
+
+@test "hold fails when the patch fails" {
+  new_fixture
+  kcp_with null
+  echo 1 >"$FIX/patch-rc"
+  if kh kcp_hold; then echo "hold succeeded on a failed patch" >&2; exit 1; fi
+  rm -rf "$FIX"
+}
+
+@test "hold fails without patching when the object cannot be read as JSON" {
+  new_fixture
+  echo 'not json' >"$FIX/kcp.json"
+  if kh kcp_hold; then echo "hold succeeded on unreadable input" >&2; exit 1; fi
+  [ ! -f "$FIX/patch" ] || { echo "patched with $(cat "$FIX/patch")" >&2; exit 1; }
+  rm -rf "$FIX"
+}
+
+@test "hold fails with 1, not the absent object's 2, when the read fails" {
+  new_fixture
+  echo 1 >"$FIX/get-rc"
+  rc=0
+  kh kcp_hold || rc=$?
+  [ "$rc" -eq 1 ] || { echo "rc=$rc, want 1" >&2; exit 1; }
+  [ ! -f "$FIX/patch" ] || { echo "patched after a failed read" >&2; exit 1; }
+  rm -rf "$FIX"
+}
+
+@test "release removes its own entry by index behind a test of that index" {
+  new_fixture
+  kcp_with "[\"a.example/x\",\"$HOLD\",\"b.example/y\"]"
+  out=$(kh kcp_release)
+  patch_is "[{\"op\":\"test\",\"path\":\"/metadata/finalizers/1\",\"value\":\"$HOLD\"},{\"op\":\"remove\",\"path\":\"/metadata/finalizers/1\"}]"
+  [ -n "$out" ] || { echo "release printed nothing" >&2; exit 1; }
+  rm -rf "$FIX"
+}
+
+@test "release succeeds without patching when the entry is not there" {
+  new_fixture
+  kcp_with '["a.example/x"]'
+  kh kcp_release
+  [ ! -f "$FIX/patch" ] || { echo "patched with $(cat "$FIX/patch")" >&2; exit 1; }
+  rm -rf "$FIX"
+}
+
+@test "release succeeds without patching when the object is gone" {
+  new_fixture
+  kh kcp_release
+  [ ! -f "$FIX/patch" ] || { echo "patched an absent object" >&2; exit 1; }
+  rm -rf "$FIX"
+}
+
+@test "release fails silently on stdout when the patch fails" {
+  new_fixture
+  kcp_with "[\"$HOLD\"]"
+  echo 1 >"$FIX/patch-rc"
+  rc=0
+  out=$(kh kcp_release) || rc=$?
+  [ "$rc" -eq 1 ] || { echo "rc=$rc, want 1" >&2; exit 1; }
+  [ -z "$out" ] || { echo "printed '$out' on a failed release" >&2; exit 1; }
+  rm -rf "$FIX"
+}
+
+@test "release fails when the object cannot be read as JSON" {
+  new_fixture
+  echo 'not json' >"$FIX/kcp.json"
+  if kh kcp_release; then echo "release reported the finalizer gone without reading the object" >&2; exit 1; fi
+  rm -rf "$FIX"
+}
+
+@test "release fails when the read fails" {
+  new_fixture
+  kcp_with "[\"$HOLD\"]"
+  echo 1 >"$FIX/get-rc"
+  if kh kcp_release; then echo "release reported the finalizer gone after a failed read" >&2; exit 1; fi
+  [ ! -f "$FIX/patch" ] || { echo "patched after a failed read" >&2; exit 1; }
+  rm -rf "$FIX"
+}
diff --git a/hack/console-nginx-header-buffers.bats b/hack/console-nginx-header-buffers.bats
new file mode 100644
index 0000000000..f8ce4d949e
--- /dev/null
+++ b/hack/console-nginx-header-buffers.bats
@@ -0,0 +1,76 @@
+#!/usr/bin/env bats
+# The console image bakes its nginx config into the Containerfile as an inline
+# heredoc, so no chart template and no helm-unittest case can see it. This pins
+# the header-buffer pair that image ships. The per-buffer size in
+# large_client_header_buffers is what bounds a single Cookie header: on the
+# default 4 8k an access token carrying many group claims does not fit one
+# buffer, and nginx answers 400 "request header or cookie too large" before the
+# request reaches the /apis, /api or /k8s/ upstream. client_header_buffer_size
+# is raised alongside it so such a request is read without escalating to a large
+# buffer at all. Either line is cheap to drop in an unrelated rewrite of that
+# config, and the loss is invisible until a user with a big token logs in.
+#
+# The check reads the heredoc body, not the whole Containerfile, so a directive
+# that moved out of the served config -- into a comment, or into a build stage
+# that ships nothing -- does not read as present.
+#
+# Paths resolve from the repo root. Direct assertions also keep this file
+# compatible with cozytest, which has no Bats run/setup helpers.
+# Run with: bats hack/console-nginx-header-buffers.bats
+
+load test_helper
+
+REPO_ROOT="$(cd "$(dirname "${BATS_TEST_FILENAME:-$0}")/.." && pwd)"
+CONSOLE_CONTAINERFILE="packages/system/dashboard/images/console/Containerfile"
+
+# Prints an nginx size in KiB, or -1 for a spelling this check cannot read.
+nginx_size_kib() {
+    printf '%s\n' "$1" | awk '
+        /^[0-9]+[kK]$/ { print int(substr($0, 1, length($0) - 1)); next }
+        /^[0-9]+[mM]$/ { print int(substr($0, 1, length($0) - 1)) * 1024; next }
+        /^[0-9]+$/     { print int($0 / 1024); next }
+        { print -1 }
+    '
+}
+
+@test "console nginx config reads client request headers into buffers larger than the nginx defaults" {
+    cd "$REPO_ROOT"
+
+    conf=$(awk '
+        /^COPY <<.EOF. \/etc\/nginx\/conf\.d\/default\.conf$/ { inblock = 1; next }
+        inblock && /^EOF$/ { inblock = 0; next }
+        inblock { print }
+    ' "$CONSOLE_CONTAINERFILE")
+    [ -n "$conf" ] || { echo "no /etc/nginx/conf.d/default.conf heredoc found in $CONSOLE_CONTAINERFILE" >&2; exit 1; }
+
+    # An extraction that silently grabbed the wrong slice would let every
+    # assertion below pass on an empty-ish config, so anchor on a line the
+    # served config is known to carry.
+    printf '%s\n' "$conf" | grep -q 'proxy_pass https://kubernetes.default.svc:443;' \
+        || { echo "extracted heredoc carries no apiserver proxy_pass; the extraction is wrong, not the config" >&2; exit 1; }
+
+    header_buffer=$(printf '%s\n' "$conf" | awk '$1 == "client_header_buffer_size" { sub(/;$/, "", $2); print $2 }')
+    [ -n "$header_buffer" ] || { echo "client_header_buffer_size is absent; the console ships it at 16k next to large_client_header_buffers" >&2; exit 1; }
+    header_buffer_kib=$(nginx_size_kib "$header_buffer")
+    [ "$header_buffer_kib" -ge 16 ] \
+        || { echo "client_header_buffer_size reads as $header_buffer, and this check wants at least 16k" >&2; exit 1; }
+
+    # Third field, because the directive is `large_client_header_buffers <number> <size>`
+    # and it is the per-buffer size that bounds one Cookie header.
+    large_buffer=$(printf '%s\n' "$conf" | awk '$1 == "large_client_header_buffers" { sub(/;$/, "", $3); print $3 }')
+    [ -n "$large_buffer" ] || { echo "large_client_header_buffers is absent: a Cookie header over 8k gets a 400 from the console nginx" >&2; exit 1; }
+    large_buffer_kib=$(nginx_size_kib "$large_buffer")
+    [ "$large_buffer_kib" -ge 16 ] \
+        || { echo "large_client_header_buffers reads as $large_buffer per buffer, and a large OIDC token needs at least 16k" >&2; exit 1; }
+
+    # Placement, not only presence. A header field read before the Host header
+    # has selected the virtual server is measured against the default server's
+    # buffers, so the same lines inside a server block cover that server only
+    # while it stays the default one. The shipped config puts them ahead of the
+    # first server block, and that is the shape checked here.
+    prelude=$(printf '%s\n' "$conf" | awk '/^server[[:space:]]*{/ { exit } { print }')
+    printf '%s\n' "$prelude" | grep -q '^client_header_buffer_size' \
+        || { echo "client_header_buffer_size does not stand at the top of the config, ahead of the first server block" >&2; exit 1; }
+    printf '%s\n' "$prelude" | grep -q '^large_client_header_buffers' \
+        || { echo "large_client_header_buffers does not stand at the top of the config, ahead of the first server block" >&2; exit 1; }
+}
diff --git a/hack/container-lane-capacity_test.bats b/hack/container-lane-capacity_test.bats
new file mode 100644
index 0000000000..318445cee7
--- /dev/null
+++ b/hack/container-lane-capacity_test.bats
@@ -0,0 +1,275 @@
+#!/usr/bin/env bats
+# Unit coverage for the scheduler-capacity correction required by Talos
+# container nodes. The live BATS suite checks the resulting Node status; this
+# file pins the arithmetic and the cross-process plumbing without a cluster.
+
+load test_helper
+
+HACK_DIR="$(cd "$(dirname "${BATS_TEST_FILENAME:-$0}")" && pwd)"
+CONTAINER_UP="$HACK_DIR/e2e-container-up.sh"
+E2E_CONTAINER_UP_LIB=true . "$CONTAINER_UP"
+
+@test "container reservations reduce host capacity to one node limit" {
+  reservations=$(calculate_node_reservations 32 131897116 8 24576 3)
+  expected=$(printf '%s\n' 24000m 106731292Ki)
+
+  if [ "$reservations" != "$expected" ]; then
+    echo "unexpected kubelet reservations: $reservations" >&2
+    return 1
+  fi
+}
+
+@test "container reservations require aggregate host headroom" {
+  if calculate_node_reservations 24 131897116 8 24576 3 >/dev/null 2>&1; then
+    echo "three 8-CPU nodes unexpectedly fit on exactly 24 host CPUs" >&2
+    return 1
+  fi
+  if calculate_node_reservations 32 75497472 8 24576 3 >/dev/null 2>&1; then
+    echo "three 24-GiB nodes unexpectedly fit in exactly 72 GiB host memory" >&2
+    return 1
+  fi
+}
+
+@test "container storage pools match the QEMU lane capacity" {
+  if ! grep -Fq 'ZPOOL_SIZE="${ZPOOL_SIZE:-200G}"' "$CONTAINER_UP"; then
+    echo "container ZFS pools do not provide the QEMU lane's 200G per node" >&2
+    return 1
+  fi
+}
+
+@test "Kubernetes canonical memory units normalize to KiB" {
+  for fixture in \
+    '25165824Ki:25165824' \
+    '24476Mi:25063424' \
+    '23Gi:24117248'; do
+    quantity=${fixture%%:*}
+    expected=${fixture#*:}
+    actual=$(kubernetes_memory_to_kib "$quantity")
+    if [ "$actual" != "$expected" ]; then
+      echo "$quantity normalized to $actual KiB, expected $expected KiB" >&2
+      return 1
+    fi
+  done
+
+  for invalid in 24476 24.0Gi garbage; do
+    if kubernetes_memory_to_kib "$invalid" >/dev/null 2>&1; then
+      echo "invalid quantity was accepted: $invalid" >&2
+      return 1
+    fi
+  done
+}
+
+@test "container capacity values cross host compose sandbox and live assertion" {
+  make_command=$(make -n -C packages/core/testing SANDBOX_NAME=test prepare-cluster-container)
+
+  for expected in \
+    'COZY_E2E_NODE_CPUS="8" COZY_E2E_NODE_MEMORY_MIB="24576"' \
+    '-e COZY_E2E_NODE_CPUS="8" -e COZY_E2E_NODE_MEMORY_MIB="24576"'; do
+    if ! printf '%s\n' "$make_command" | grep -Fq -- "$expected"; then
+      echo "testing Makefile does not forward container capacity: $expected" >&2
+      return 1
+    fi
+  done
+
+  if ! grep -Fq 'cpus: ${COZY_E2E_NODE_CPUS:-8}' hack/e2e-compose.yaml \
+    || ! grep -Fq 'mem_limit: ${COZY_E2E_NODE_MEMORY_MIB:-24576}m' hack/e2e-compose.yaml; then
+    echo "compose limits are not sourced from the shared capacity values" >&2
+    return 1
+  fi
+  if ! grep -Fq 'cpu: "${COZY_E2E_SYSTEM_RESERVED_CPU}"' "$CONTAINER_UP" \
+    || ! grep -Fq 'memory: "${COZY_E2E_SYSTEM_RESERVED_MEMORY}"' "$CONTAINER_UP"; then
+    echo "generated Talos config does not carry the calculated reservations" >&2
+    return 1
+  fi
+  if ! grep -Fq '@test "Node allocatable matches the container limits"' hack/e2e-prepare-cluster-container.bats; then
+    echo "container bring-up does not assert scheduler-visible capacity" >&2
+    return 1
+  fi
+}
+
+@test "container compose overrides reach both startup and teardown" {
+  compose_file=/tmp/cozy-custom-compose.yaml
+  make_command=$(make -n -C packages/core/testing \
+    SANDBOX_NAME=test \
+    COMPOSE_PROJECT=cozy-custom \
+    COMPOSE_FILE="$compose_file" \
+    ZPOOL_BACKING_DIR=/tmp/cozy-custom-zpools \
+    prepare-cluster-container \
+    delete-cluster-container)
+
+  if ! printf '%s\n' "$make_command" | grep -Fq \
+    "COMPOSE_PROJECT=\"cozy-custom\" COMPOSE_FILE=\"$compose_file\""; then
+    echo "container startup does not receive compose overrides" >&2
+    return 1
+  fi
+  if ! printf '%s\n' "$make_command" | grep -Fq \
+    "docker compose -p \"cozy-custom\" -f \"$compose_file\" down -v"; then
+    echo "container teardown does not reuse compose overrides" >&2
+    return 1
+  fi
+  if ! printf '%s\n' "$make_command" | grep -Fq \
+    'ZPOOL_BACKING_DIR="/tmp/cozy-custom-zpools"'; then
+    echo "container startup does not receive the backing-directory override" >&2
+    return 1
+  fi
+  for expected in \
+    'zpool destroy "data-srv${n}"' \
+    'rm -f "/tmp/cozy-custom-zpools/srv${n}.img"' \
+    'rmdir "/tmp/cozy-custom-zpools"'; do
+    if ! printf '%s\n' "$make_command" | grep -Fq "$expected"; then
+      echo "container teardown does not remove its host storage: $expected" >&2
+      return 1
+    fi
+  done
+  cleanup_line=$(printf '%s\n' "$make_command" | grep -n 'zpool destroy' | cut -d: -f1)
+  startup_line=$(printf '%s\n' "$make_command" | grep -n 'e2e-container-up.sh' | cut -d: -f1)
+  if [ -z "$cleanup_line" ] || [ -z "$startup_line" ] || [ "$cleanup_line" -ge "$startup_line" ]; then
+    echo "container storage cleanup does not run before startup" >&2
+    return 1
+  fi
+}
+
+@test "container teardown reports compose failure after reclaiming host storage" {
+  tmp=$(mktemp -d)
+  mkdir -p "$tmp/bin" "$tmp/zpools"
+  calls="$tmp/calls"
+  : >"$calls"
+  for n in 1 2 3; do
+    : >"$tmp/zpools/srv${n}.img"
+  done
+
+  printf '%s\n' \
+    '#!/bin/sh' \
+    'printf "docker:%s\n" "$*" >>"$CALLS"' \
+    'exit 23' >"$tmp/bin/docker"
+  printf '%s\n' \
+    '#!/bin/sh' \
+    'printf "zpool:%s\n" "$*" >>"$CALLS"' \
+    'exit 0' >"$tmp/bin/zpool"
+  printf '%s\n' \
+    '#!/bin/sh' \
+    'exec "$@"' >"$tmp/bin/sudo"
+  chmod +x "$tmp/bin/docker" "$tmp/bin/zpool" "$tmp/bin/sudo"
+
+  if PATH="$tmp/bin:$PATH" CALLS="$calls" make -s -C packages/core/testing \
+    COMPOSE_PROJECT=cozy-cleanup-test \
+    COMPOSE_FILE="$PWD/hack/e2e-compose.yaml" \
+    ZPOOL_BACKING_DIR="$tmp/zpools" \
+    delete-cluster-container >"$tmp/output" 2>&1; then
+    echo "container teardown hid the compose failure" >&2
+    return 1
+  fi
+
+  grep -Fq 'container compose teardown failed with exit 23' "$tmp/output"
+  for n in 1 2 3; do
+    grep -Fq "zpool:destroy data-srv${n}" "$calls"
+    if [ -e "$tmp/zpools/srv${n}.img" ]; then
+      echo "backing file srv${n}.img survived failed compose teardown" >&2
+      return 1
+    fi
+  done
+  if [ -d "$tmp/zpools" ]; then
+    echo "empty backing directory survived failed compose teardown" >&2
+    return 1
+  fi
+  rm -r "$tmp"
+}
+
+@test "privileged Talos container image is digest pinned" {
+  image=$(yq '.["x-node"].image' hack/e2e-compose.yaml)
+  if ! printf '%s\n' "$image" | grep -Eq '^ghcr\.io/siderolabs/talos:v1\.13\.5@sha256:[0-9a-f]{64}$'; then
+    echo "mutable or unexpected Talos container image: $image" >&2
+    return 1
+  fi
+}
+
+@test "container startup does not mask stale compose teardown failure" {
+  if grep -Eq 'docker compose .* down -v.*\|\| true' "$CONTAINER_UP"; then
+    echo "container startup can proceed after stale compose teardown fails" >&2
+    return 1
+  fi
+  grep -Fq 'die "failed to remove a stale ${COMPOSE_PROJECT} compose project before startup"' "$CONTAINER_UP"
+}
+
+@test "container teardown keeps backing file when zpool destroy fails" {
+  tmp=$(mktemp -d)
+  mkdir -p "$tmp/bin" "$tmp/zpools"
+  calls="$tmp/calls"
+  : >"$calls"
+  for n in 1 2 3; do
+    : >"$tmp/zpools/srv${n}.img"
+  done
+
+  printf '%s\n' '#!/bin/sh' 'exit 0' >"$tmp/bin/docker"
+  printf '%s\n' \
+    '#!/bin/sh' \
+    'printf "zpool:%s\n" "$*" >>"$CALLS"' \
+    'if [ "$1" = destroy ] && [ "$2" = data-srv2 ]; then exit 29; fi' \
+    'exit 0' >"$tmp/bin/zpool"
+  printf '%s\n' '#!/bin/sh' 'exec "$@"' >"$tmp/bin/sudo"
+  chmod +x "$tmp/bin/docker" "$tmp/bin/zpool" "$tmp/bin/sudo"
+
+  if PATH="$tmp/bin:$PATH" CALLS="$calls" make -s -C packages/core/testing \
+    COMPOSE_PROJECT=cozy-cleanup-test \
+    COMPOSE_FILE="$PWD/hack/e2e-compose.yaml" \
+    ZPOOL_BACKING_DIR="$tmp/zpools" \
+    delete-cluster-container >"$tmp/output" 2>&1; then
+    echo "container teardown hid the zpool destroy failure" >&2
+    return 1
+  fi
+
+  grep -Fq 'failed to destroy zpool data-srv2 (exit 29)' "$tmp/output"
+  grep -Fq 'keeping '"$tmp/zpools/srv2.img"' because data-srv2 is still imported' "$tmp/output"
+  if [ ! -e "$tmp/zpools/srv2.img" ]; then
+    echo "backing file was removed from the still-imported data-srv2 pool" >&2
+    return 1
+  fi
+  for n in 1 3; do
+    if [ -e "$tmp/zpools/srv${n}.img" ]; then
+      echo "cleanup stopped before removing srv${n}.img" >&2
+      return 1
+    fi
+  done
+  rm -r "$tmp"
+}
+
+@test "container teardown keeps backing files when zpool inventory is unreadable" {
+  tmp=$(mktemp -d)
+  mkdir -p "$tmp/bin" "$tmp/zpools"
+  calls="$tmp/calls"
+  : >"$calls"
+  for n in 1 2 3; do
+    : >"$tmp/zpools/srv${n}.img"
+  done
+
+  printf '%s\n' '#!/bin/sh' 'exit 0' >"$tmp/bin/docker"
+  printf '%s\n' \
+    '#!/bin/sh' \
+    'printf "zpool:%s\n" "$*" >>"$CALLS"' \
+    'if [ "$1" = list ]; then exit 31; fi' \
+    'exit 0' >"$tmp/bin/zpool"
+  printf '%s\n' '#!/bin/sh' 'exec "$@"' >"$tmp/bin/sudo"
+  chmod +x "$tmp/bin/docker" "$tmp/bin/zpool" "$tmp/bin/sudo"
+
+  if PATH="$tmp/bin:$PATH" CALLS="$calls" make -s -C packages/core/testing \
+    COMPOSE_PROJECT=cozy-cleanup-test \
+    COMPOSE_FILE="$PWD/hack/e2e-compose.yaml" \
+    ZPOOL_BACKING_DIR="$tmp/zpools" \
+    delete-cluster-container >"$tmp/output" 2>&1; then
+    echo "container teardown treated an unreadable zpool inventory as absence" >&2
+    return 1
+  fi
+
+  grep -Fq 'failed to inventory zpools after data-srv1 lookup returned exit 31 (inventory exit 31)' "$tmp/output"
+  if grep -Fq 'zpool:destroy ' "$calls"; then
+    echo "container teardown destroyed a pool without a readable inventory" >&2
+    return 1
+  fi
+  for n in 1 2 3; do
+    if [ ! -e "$tmp/zpools/srv${n}.img" ]; then
+      echo "backing file srv${n}.img was removed without proving its pool absent" >&2
+      return 1
+    fi
+  done
+  rm -r "$tmp"
+}
diff --git a/hack/cozyreport-summary.sh b/hack/cozyreport-summary.sh
index 6e66fadf1e..cd5a164fdd 100755
--- a/hack/cozyreport-summary.sh
+++ b/hack/cozyreport-summary.sh
@@ -2,68 +2,348 @@
 # Emit a human-readable summary of "what is broken" to a single file.
 # Reads the live cluster (not the report dir) so it can use kubectl JSONPath.
 # Usage: cozyreport-summary.sh > summary.txt
+#
+# Environment:
+#   COZY_REPORT_PODS_MAX  how many not-Ready pods this summary lists before it
+#                         reports the rest as an overflow (default 40, shared with
+#                         the collector so the two never start from different
+#                         numbers; the counts can still differ when the collector
+#                         stops on its time budget, and its
+#                         COLLECTION-TRUNCATED.txt explains that). A malformed value
+#                         falls back to the default and says so in the section.
+#                         Note it does not bound the HelmRelease listing, which has
+#                         its own cap at the same default.
+#   COZY_REPORT_PREFER_NS namespace prefix listed first (default `tenant-`; empty
+#                         disables the ordering). Reached through the selection
+#                         helpers sourced from hack/cozyreport.sh rather than read
+#                         by name here, so it appears nowhere in this file's CODE
+#                         (only in this block) -- which is exactly why it went
+#                         undocumented:
+#                         a knob arriving by `.` is invisible to a guard that greps
+#                         for its name. It changes which pods this summary lists
+#                         first, and the collector uses the same value, so the two
+#                         orderings stay in step.
 set -eu
 
+# Share the pod-selection helper with cozyreport.sh rather than restating it:
+# the summary and the collected evidence disagreeing about which pods are broken
+# is worse than either being wrong on its own. COZYREPORT_LIB makes the source
+# return before it starts a report of its own.
+SCRIPT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
+# shellcheck disable=SC2034  # read by the sourcing guard in cozyreport.sh
+COZYREPORT_LIB=1
+# shellcheck source=hack/cozyreport.sh
+. "$SCRIPT_DIR/cozyreport.sh"
+
+# The wall-clock wrapper, taken from cozyreport.sh rather than resolved again so
+# the two cannot hold different values. Empty when `timeout` is absent; the reads
+# then run unbounded and the header says so.
+BOUND=$COZYREPORT_BOUND
+
+# How many rows any one section lists before it reports the rest as an overflow.
+# Shares the collector's default so the two never START from different numbers.
+# The counts can still differ, and legitimately: the collector also stops on its
+# time budget, so it may hold fewer pods than this lists. Its own
+# COLLECTION-TRUNCATED.txt says so; see the note on the pod listing below.
+SUMMARY_CAP=$COZYREPORT_PODS_DEFAULT
+
+# summary_read <what> <kubectl args...>
+#
+# One bounded read into READ_OUT. On failure it prints why the section is empty,
+# because a killed read otherwise renders the section byte-identical to a healthy
+# cluster -- and an empty "## HelmReleases not Ready" is the most misleading line
+# this file can carry. CRD probes go through summary_crd, where a non-zero status
+# has two meanings.
+summary_read() {
+  _sr_what=$1
+  shift
+  # kubectl's own reason is kept rather than sent to /dev/null, for the reason the
+  # pod list below already keeps its own: "did not return (exit 1)" names a symptom
+  # and no cause, and the difference between an apiserver that is too slow and one
+  # answering "forbidden" is the whole finding. Discarding it here while the pod-list
+  # read below keeps its own would have two reads in one file answering the same
+  # question differently.
+  _sr_err=$(mktemp "${TMPDIR:-/tmp}/cozyreport-summary.XXXXXX" 2>/dev/null) || _sr_err=""
+  # The status is taken in an explicit `else`, not after the `if`: a compound `if`
+  # whose condition fails and which has no else leaves `$?` at 0, so reading it
+  # afterwards reports "exit 0" for every failure.
+  # shellcheck disable=SC2086  # empty BOUND must vanish, not become ""
+  if READ_OUT=$($BOUND "$@" 2>"${_sr_err:-/dev/null}"); then
+    [ -z "$_sr_err" ] || rm -f "$_sr_err"
+    return 0
+  else
+    _sr_rc=$?
+  fi
+  # The rows kubectl printed before it died are kept: they are the only ones it
+  # named, and before this refactor they flowed down the pipe and were processed.
+  # Discarding them turns a partial answer into no answer and then says nothing
+  # was readable, which is false in the most useful direction.
+  if [ -n "$READ_OUT" ]; then
+    echo "  the $_sr_what read did not return (exit $_sr_rc); the rows below are the ones it printed before it stopped, and there may be others it never reached"
+  else
+    echo "  the $_sr_what read did not return (exit $_sr_rc), so this section is empty because nothing could be read, NOT because there was nothing to report"
+  fi
+  # LAST line, not the first, matching the pod list: a failing read is preceded by
+  # one klog discovery-retry line per attempt and kubectl's own message comes after
+  # them. A read killed by its own timeout is killed before kubectl writes anything,
+  # so the file is empty and there is nothing to quote -- which is itself the
+  # difference between "too slow to answer" and "answered, and the answer was no".
+  if [ -n "$_sr_err" ] && [ -s "$_sr_err" ]; then
+    # printf, not echo: kubectl's text is untrusted and dash's echo expands
+    # backslash escapes, so a message carrying one could forge a line in a file a
+    # triager reads as fact.
+    printf '  kubectl said: %s\n' "$(tail -n 1 "$_sr_err" | cut -c1-200)"
+  fi
+  [ -z "$_sr_err" ] || rm -f "$_sr_err"
+  return 0
+}
+
+# summary_crd <crd>: true when the CRD is present, false otherwise. Absence is the
+# only outcome that answers false in silence; a killed read, a refusal with a
+# message, a refusal without one, and a message that could not be captured each
+# say which of them happened before answering false.
+#
+# `if $BOUND kubectl get crd X` collapses those last two into one, and a slow
+# aggregated discovery layer -- the state that made the bound necessary -- then
+# skips the whole section as though the CRD were not installed.
+summary_crd() {
+  # stderr kept for the same reason summary_read keeps it, but reported only on a
+  # killed read: a CRD that is simply absent also exits non-zero, with kubectl
+  # writing a NotFound to stderr, and quoting that would turn "this cluster does not
+  # run cert-manager" into a line that reads like a failure. The killed case is the
+  # one where the cause is not already implied by the outcome.
+  _sc_err=$(mktemp "${TMPDIR:-/tmp}/cozyreport-summary.XXXXXX" 2>/dev/null) || _sc_err=""
+  # shellcheck disable=SC2086
+  if $BOUND kubectl get crd "$1" >/dev/null 2>"${_sc_err:-/dev/null}"; then
+    [ -z "$_sc_err" ] || rm -f "$_sc_err"
+    return 0
+  else
+    _sc_rc=$?
+  fi
+  if cozyreport_timed_out "$_sc_rc"; then
+    echo "  the $1 presence check did not return (exit $_sc_rc), so this section was skipped without knowing whether the CRD is installed"
+  elif [ -z "$_sc_err" ]; then
+    # No scratch file means no writable temp dir here, so kubectl's message went to
+    # /dev/null and is gone. Silence at this point would be the report's own local
+    # condition rendered as a cluster fact, and rendered as the most common one:
+    # every section this gate opens simply disappears, exactly as it does on a
+    # cluster that does not run the operator behind the CRD.
+    echo "  the $1 presence check failed (exit $_sc_rc) and its message could not be captured (no writable temp dir on the machine producing this report), so this section was skipped without knowing whether the CRD is installed"
+  elif [ -s "$_sc_err" ]; then
+    # Not a timeout and not a plain NotFound: an RBAC refusal on the CRD read skips
+    # the section exactly like an absent CRD would, and only kubectl's message
+    # separates "not installed" from "not allowed to look".
+    if ! grep -qi 'not found' "$_sc_err"; then
+      printf '  the %s presence check failed, so this section was skipped without knowing whether the CRD is installed; kubectl said: %s\n' \
+        "$1" "$(tail -n 1 "$_sc_err" | cut -c1-200)"
+    fi
+  else
+    # Exited non-zero having said nothing. Not the same as NotFound, which kubectl
+    # is explicit about, so it cannot be filed under "the CRD is absent".
+    echo "  the $1 presence check failed (exit $_sc_rc) without a message, so this section was skipped without knowing whether the CRD is installed"
+  fi
+  [ -z "$_sc_err" ] || rm -f "$_sc_err"
+  return 1
+}
+
+# Printed before the first section, not inside one: every read in this file goes
+# through the same empty $BOUND, so a notice sitting under "## Pods not Ready"
+# leaves the reader of "## HelmReleases not Ready" -- which is above it and is the
+# first section anyone opens -- with no indication at all. The collector states the
+# same fact for its whole tree in COLLECTION-UNBOUNDED.txt rather than per section.
+if [ -z "$BOUND" ]; then
+  echo "(timeout is not on this host, so every read below is unbounded; this is a local dependency, not a cluster symptom)"
+  echo
+fi
+
 echo "# Cozystack E2E Diagnostic Summary"
 echo "Generated: $(date -Iseconds)"
 echo
 
 echo "## HelmReleases not Ready"
 echo
-if kubectl get crd helmreleases.helm.toolkit.fluxcd.io >/dev/null 2>&1; then
-  kubectl get hr -A --no-headers 2>/dev/null \
-    | awk '$4 != "True" {printf "  %s/%s — %s\n", $1, $2, $5}' \
-    | head -40
+if summary_crd helmreleases.helm.toolkit.fluxcd.io; then
+  summary_read "HelmRelease" kubectl get hr -A --no-headers
+  # The whole STATUS field, not $5. `kubectl get hr` prints NAMESPACE NAME AGE
+  # READY STATUS, and STATUS is the Ready condition's *message* -- see the printer
+  # columns on the CRD this repo ships, internal/fluxinstall/manifests/fluxcd.yaml
+  # ("jsonPath: .status.conditions[?(@.type==\"Ready\")].message"). It is a whole
+  # sentence, so $5 rendered every failed release as "Helm" or "Reconciliation",
+  # dropping the part that says what broke, in the first section of the first file
+  # a triager opens. Take everything from the fifth field on.
+  # Rebuilt field by field rather than with a `{4}` interval expression: mawk
+  # 1.3.4, the awk on the CI image, mis-applies an exact interval to a
+  # variable-width group and strips one repetition instead of four. `sub()` still
+  # returns 1, so there is no error and no signal -- the row simply arrives with
+  # most of itself still in the message. Verified on ubuntu:24.04; gawk,
+  # one-true-awk and busybox awk all handle it, which is how it would have reached
+  # CI unnoticed.
+  HR_ROWS=$(printf '%s\n' "$READ_OUT" | awk 'NF && $4 != "True" {
+    msg = ""
+    for (i = 5; i <= NF; i++) msg = msg (i > 5 ? " " : "") $i
+    printf "  %s/%s — %s\n", $1, $2, msg
+  }')
+  HR_TOTAL=$(printf '%s\n' "$HR_ROWS" | grep -c . || true)
+  if [ "$HR_TOTAL" -gt 0 ]; then
+    printf '%s\n' "$HR_ROWS" | head -n "$SUMMARY_CAP"
+  fi
+  # The cap is reported for the same reason the pod cap is: an install that fails
+  # early leaves well over 40 HelmReleases not Ready, and a listing that stops at 40
+  # without saying so reads as the complete set.
+  if [ "$HR_TOTAL" -gt "$SUMMARY_CAP" ]; then
+    echo "  ... $((HR_TOTAL - SUMMARY_CAP)) more not-Ready HelmRelease(s) not listed here; the full set is in the report's kubernetes/helmreleases.txt"
+  fi
 fi
 echo
 
-echo "## Pods not Running/Succeeded"
+echo "## Pods not Ready"
 echo
-kubectl get pod -A --no-headers 2>/dev/null \
-  | awk '$4 !~ /Running|Succeeded|Completed/ {printf "  %s/%s — %s (restarts=%s, age=%s)\n", $1, $2, $4, $5, $6}' \
-  | head -40
+# AGE is read as $NF, not $6: a pod that has restarted prints RESTARTS as
+# `7 (4m12s ago)`, three awk fields, which shifts every later column.
+# A restarted pod is the normal case in a failed run, so $6 printed `age=(4m12s`
+# for exactly the rows worth reading. AGE is last whichever form RESTARTS takes.
+#
+# The row cap is reported rather than applied in silence: this section is a
+# reader's first answer to "what is broken", and a cap that hides the rest reads
+# like there is no rest. The ordering is shared with the collector, so the rows
+# this cap keeps are the rows whose evidence the collector reached for first --
+# the same rows, not necessarily the same count, since the collector can also stop
+# on its time budget, and then it holds fewer pods than are listed here. Its own
+# COLLECTION-TRUNCATED.txt says so.
+#
+# The pod list is read on its own, keeping its exit status, before anything is
+# selected from it. Piping it straight into the selection discards that status,
+# and then a list the apiserver refused renders byte-identical to a cluster where
+# every pod is Ready -- in the file a triager opens first, and on exactly the run
+# where the summary must not be the thing that says nothing is wrong.
+POD_LIST_ERR=$(mktemp "${TMPDIR:-/tmp}/cozyreport-summary.XXXXXX" 2>/dev/null) || POD_LIST_ERR=""
+# Bounded like the collector's copy of this read. The summary runs immediately
+# before the tarball is written, so a hang here costs the whole artifact rather
+# than this one section, and `|| true` on the caller does not survive a hang.
+#
+# `timeout` is used when it is there and skipped when it is not, rather than being
+# required: without the fallback every read here exits 127 and this section would
+# report that the cluster did not answer, on a host where the only thing missing is
+# a local coreutils binary. That is the same false claim the collector's
+# COLLECTION-UNBOUNDED.txt exists to avoid, and the two must not disagree inside
+# one tarball. It also keeps working where the old unbounded pipeline did.
+# Unquoted on purpose: an empty BOUND must expand to no argument at all.
+# shellcheck disable=SC2086
+if POD_LIST=$($BOUND kubectl get pod -A --no-headers 2>"${POD_LIST_ERR:-/dev/null}"); then
+  POD_LIST_RC=0
+else
+  POD_LIST_RC=$?
+fi
+if [ "$POD_LIST_RC" -ne 0 ]; then
+  # Two different failures, and the sentence has to match which one happened. A
+  # read that produced nothing leaves an empty section; a read that printed rows
+  # and then failed leaves the rows, and calling that section "empty" while the
+  # rows are listed three lines below puts two contradictory statements about the
+  # same read in one file. The partial rows are kept, as everywhere else in this
+  # tree, because they are the only evidence there is -- they are just not all of
+  # it, and the difference has to be said rather than implied.
+  if [ -n "$POD_LIST" ]; then
+    echo "  the cluster-wide pod list did not return (kubectl exit $POD_LIST_RC); the pods listed below are the ones it printed before it stopped, and there may be others it never reached"
+  else
+    echo "  the cluster-wide pod list did not return (kubectl exit $POD_LIST_RC), so this section is empty because nothing could be read, NOT because every pod was Ready"
+  fi
+  if [ -n "$POD_LIST_ERR" ] && [ -s "$POD_LIST_ERR" ]; then
+    # Last line: a failing cluster-wide list is preceded by one klog discovery
+    # retry line per attempt and kubectl's own message comes after them.
+    printf '  kubectl said: %s\n' "$(tail -n 1 "$POD_LIST_ERR" | cut -c1-200)"
+  fi
+fi
+[ -z "$POD_LIST_ERR" ] || rm -f "$POD_LIST_ERR"
+POD_ROWS=$(printf '%s\n' "$POD_LIST" | cozyreport_pods_not_ready | cozyreport_pods_prioritize)
+POD_TOTAL=$(printf '%s\n' "$POD_ROWS" | grep -c . || true)
+POD_CAP=${COZY_REPORT_PODS_MAX:-$COZYREPORT_PODS_DEFAULT}
+if ! cozyreport_is_count "$POD_CAP"; then
+  echo "  (ignored a malformed COZY_REPORT_PODS_MAX='${COZY_REPORT_PODS_MAX:-}'; listing at most $COZYREPORT_PODS_DEFAULT)"
+  POD_CAP=$COZYREPORT_PODS_DEFAULT
+fi
+# `NF` guard: an empty selection arrives as one empty line, and an unguarded action
+# would print a row of blanks -- a nameless broken pod on every green run.
+POD_LISTING=$(printf '%s\n' "$POD_ROWS" \
+  | awk 'NF {printf "  %s/%s — %s ready=%s (restarts=%s, age=%s)\n", $1, $2, $4, $3, $5, $NF}')
+# A zero cap is branched on rather than written as `A && B || C`, which would send
+# `head -n 0` the value this guard keeps away from it (GNU head returns nothing,
+# BSD/macOS head errors out).
+if [ "$POD_CAP" -gt 0 ] && [ -n "$POD_LISTING" ]; then
+  printf '%s\n' "$POD_LISTING" | head -n "$POD_CAP"
+fi
+if [ "${POD_TOTAL:-0}" -gt "$POD_CAP" ]; then
+  echo "  ... $((POD_TOTAL - POD_CAP)) more not-Ready pod(s) not listed here; the full set is in kubernetes/pods.txt"
+fi
 echo
 
 echo "## ImagePullBackOff / ErrImagePull"
 echo
-kubectl get pod -A --no-headers 2>/dev/null \
-  | awk '$4 ~ /ImagePullBackOff|ErrImagePull/ {printf "  %s/%s — %s\n", $1, $2, $4}'
+# Reuses the list already read above rather than calling the apiserver a second
+# time for the same rows: one fewer cluster-wide read on the path that runs
+# immediately before the tarball is written, and the two sections cannot disagree
+# about what the cluster looked like.
+#
+# Which means it inherits that read's failure too. Without this guard the section
+# is byte-identical between a healthy cluster and one whose pod list was refused,
+# and a triager who jumps straight to this heading reads "nothing is failing to
+# pull" off a list that never arrived.
+if [ "$POD_LIST_RC" -ne 0 ]; then
+  echo "  not known: this section is derived from the cluster-wide pod list above, which did not return"
+else
+  printf '%s\n' "$POD_LIST" \
+    | awk 'NF && $4 ~ /ImagePullBackOff|ErrImagePull/ {printf "  %s/%s — %s\n", $1, $2, $4}'
+fi
 echo
 
 echo "## Recent OOMKilled events (last 20)"
 echo
-kubectl get events -A --field-selector reason=OOMKilling --sort-by=.lastTimestamp 2>/dev/null \
-  | tail -20
+summary_read "OOMKilling event" kubectl get events -A --field-selector reason=OOMKilling --sort-by=.lastTimestamp
+printf '%s\n' "$READ_OUT" | awk 'NF' | tail -20
 echo
 
-echo "## Recent Warning events (top 30)"
+echo "## Recent Warning events (last 30)"
 echo
-kubectl get events -A --field-selector type=Warning --sort-by=.lastTimestamp 2>/dev/null \
-  | tail -30
+summary_read "Warning event" kubectl get events -A --field-selector type=Warning --sort-by=.lastTimestamp
+printf '%s\n' "$READ_OUT" | awk 'NF' | tail -30
 echo
 
 echo "## cert-manager: Certificates not Ready"
 echo
-if kubectl get crd certificates.cert-manager.io >/dev/null 2>&1; then
-  kubectl get certificates.cert-manager.io -A --no-headers 2>/dev/null \
-    | awk '$3 != "True" {printf "  %s/%s — Ready=%s\n", $1, $2, $3}'
+if summary_crd certificates.cert-manager.io; then
+  summary_read "Certificate" kubectl get certificates.cert-manager.io -A --no-headers
+  printf '%s\n' "$READ_OUT" | awk 'NF && $3 != "True" {printf "  %s/%s — Ready=%s\n", $1, $2, $3}'
 fi
 echo
 
 echo "## Flux Sources not Ready"
 echo
 for kind in helmrepositories.source.toolkit.fluxcd.io ocirepositories.source.toolkit.fluxcd.io gitrepositories.source.toolkit.fluxcd.io externalartifacts.source.toolkit.fluxcd.io; do
-  kubectl get crd "$kind" >/dev/null 2>&1 || continue
+  summary_crd "$kind" || continue
   short=${kind%%.*}
-  kubectl get "$kind" -A -o jsonpath='{range .items[?(@.status.conditions[?(@.type=="Ready")].status!="True")]}  '"$short"' {.metadata.namespace}/{.metadata.name} — Ready={.status.conditions[?(@.type=="Ready")].status}{"\n"}{end}' 2>/dev/null
+  # custom-columns, not jsonpath. The jsonpath this replaces nested one filter
+  # inside another -- `.items[?(...conditions[?(@.type=="Ready")]...)]` -- which
+  # kubectl rejects outright with "unterminated filter", so this section printed
+  # nothing on every report ever taken and read as "all Flux sources are Ready".
+  # A form that sends stderr to /dev/null and drops the status hides that
+  # completely: the section renders empty and reads as "all sources Ready".
+  #
+  # Not the printer columns either: READY sits at a different index per kind, and
+  # STATUS carries spaces, so column counting is wrong for at least one of the four.
+  # custom-columns takes a single filter, the same shape the node section below uses.
+  summary_read "$short" kubectl get "$kind" -A --no-headers \
+    -o custom-columns='NS:.metadata.namespace,NAME:.metadata.name,READY:.status.conditions[?(@.type=="Ready")].status'
+  printf '%s\n' "$READ_OUT" | awk -v k="$short" 'NF && $3 != "True" {printf "  %s %s/%s — Ready=%s\n", k, $1, $2, $3}'
 done
 echo
 
 echo "## Storage: PVCs not Bound, PVs not Bound"
 echo
-kubectl get pvc -A --no-headers 2>/dev/null | awk '$3 != "Bound" {printf "  PVC %s/%s — %s\n", $1, $2, $3}'
-kubectl get pv --no-headers 2>/dev/null    | awk '$5 != "Bound" {printf "  PV %s — %s\n", $1, $5}'
+summary_read "PVC" kubectl get pvc -A --no-headers
+printf '%s\n' "$READ_OUT" | awk 'NF && $3 != "Bound" {printf "  PVC %s/%s — %s\n", $1, $2, $3}'
+summary_read "PV" kubectl get pv --no-headers
+printf '%s\n' "$READ_OUT" | awk 'NF && $5 != "Bound" {printf "  PV %s — %s\n", $1, $5}'
 echo
 
 echo "## Node Conditions"
-kubectl get nodes -o custom-columns=NAME:.metadata.name,READY:.status.conditions[?\(@.type==\"Ready\"\)].status,DISK:.status.conditions[?\(@.type==\"DiskPressure\"\)].status,MEM:.status.conditions[?\(@.type==\"MemoryPressure\"\)].status 2>/dev/null
+summary_read "node condition" kubectl get nodes -o 'custom-columns=NAME:.metadata.name,READY:.status.conditions[?(@.type=="Ready")].status,DISK:.status.conditions[?(@.type=="DiskPressure")].status,MEM:.status.conditions[?(@.type=="MemoryPressure")].status'
+[ -z "$READ_OUT" ] || printf '%s\n' "$READ_OUT"
diff --git a/hack/cozyreport-talos.bats b/hack/cozyreport-talos.bats
new file mode 100644
index 0000000000..dc60a1cfa7
--- /dev/null
+++ b/hack/cozyreport-talos.bats
@@ -0,0 +1,86 @@
+#!/usr/bin/env bats
+# Regression coverage for host-node Talos diagnostics in hack/cozyreport.sh.
+# The full report needs a cluster; this test sources only the focused helper and
+# replaces talosctl with a shell function that records the exact argument vector.
+
+load test_helper
+
+HACK_DIR="$(cd "$(dirname "${BATS_TEST_FILENAME:-$0}")" && pwd)"
+SCRIPT="$HACK_DIR/cozyreport.sh"
+
+COZYREPORT_LIB=1
+# shellcheck source=/dev/null
+. "$SCRIPT"
+
+# A PATH stub, not a shell function. These reads now go through the bounded
+# reader, which runs them under `timeout` -- an external binary that execs its
+# argument and therefore cannot see a function defined in this shell. A function
+# mock is not merely bypassed, it is bypassed SILENTLY: the real talosctl runs, and
+# what the test then reports is whatever the machine happens to have installed.
+#
+# cozytest.sh's parser ends an @test block at the first bare `}`, so the helper
+# stays at top level rather than nested inside a test.
+talos_stub_dir() {
+  _td=$1
+  mkdir -p "$_td/bin"
+  cat > "$_td/bin/talosctl" <<'STUB'
+#!/bin/sh
+printf '%s\n' "$*" >> "$TALOSCTL_CALLS"
+[ -z "${TALOSCTL_FAIL:-}" ] && exit 0
+echo 'error: rpc error: code = Unavailable desc = connection refused' >&2
+exit 1
+STUB
+  chmod +x "$_td/bin/talosctl"
+  # And a `timeout` that runs its command rather than timing it, so the assertions
+  # do not depend on the host having GNU coreutils.
+  printf '#!/bin/sh\n[ "$1" = "-k" ] && shift 2\nshift\nexec "$@"\n' > "$_td/bin/timeout"
+  chmod +x "$_td/bin/timeout"
+  COZYREPORT_BOUND="timeout -k 5 $COZYREPORT_READ_TIMEOUT"
+}
+
+@test "Talos host diagnostics pass an endpoint and use valid dmesg flags" {
+  # Cleanup at the end of the body, never a `trap ... EXIT`. An EXIT trap inside
+  # an @test replaces the one the bats binary installs for its own bookkeeping, and
+  # a test that then fails prints no TAP line at all -- it does not appear as
+  # `not ok`, it disappears, so a reader grepping the output sees a green suite.
+  # See docs/agents/e2e-testing.md. Both runners set `set -e`, so on a failure the
+  # cleanup line is never reached and the directory survives for inspection, which
+  # is what you want from a test that just failed.
+  tmp=$(mktemp -d)
+  talos_stub_dir "$tmp"
+  calls="$tmp/talosctl.calls"
+
+  TALOSCTL_CALLS="$calls" PATH="$tmp/bin:$PATH" \
+    cozyreport_collect_talos_node /workspace/talosconfig 192.0.2.11 "$tmp"
+
+  [ "$(sed -n '1p' "$calls")" = "--talosconfig /workspace/talosconfig -e 192.0.2.11 -n 192.0.2.11 dmesg" ]
+  [ "$(sed -n '2p' "$calls")" = "--talosconfig /workspace/talosconfig -e 192.0.2.11 -n 192.0.2.11 logs kubelet --tail=500" ]
+  [ "$(sed -n '3p' "$calls")" = "--talosconfig /workspace/talosconfig -e 192.0.2.11 -n 192.0.2.11 logs containerd --tail=500" ]
+  case "$(sed -n '1p' "$calls")" in *--tail*)
+    echo "dmesg must not receive the boolean --tail flag" >&2
+    false
+  esac
+
+  rm -rf "$tmp"
+}
+
+@test "a Talos node that refuses the connection leaves the reason in its files" {
+  tmp=$(mktemp -d)
+  talos_stub_dir "$tmp"
+  calls="$tmp/talosctl.calls"
+
+  TALOSCTL_FAIL=1 TALOSCTL_CALLS="$calls" PATH="$tmp/bin:$PATH" \
+    cozyreport_collect_talos_node /workspace/talosconfig 192.0.2.11 "$tmp"
+
+  # The reads are best-effort and must not abort the report, but "did not abort"
+  # and "produced nothing" are different outcomes and only one of them is about
+  # the node. Each read merges stderr into its own file, so a node that refused
+  # the connection says so where a reader looking for its dmesg will find it,
+  # rather than leaving three empty files that read like a quiet node.
+  for f in dmesg.txt kubelet.log containerd.log; do
+    t="$tmp/talos-192.0.2.11-$f"
+    [ -s "$t" ] || { echo "FAIL: $t is empty on a refused connection"; false; }
+    grep -q 'connection refused' "$t" || { echo "FAIL: $t does not carry the reason"; cat "$t"; false; }
+  done
+  rm -rf "$tmp"
+}
diff --git a/hack/cozyreport.bats b/hack/cozyreport.bats
new file mode 100644
index 0000000000..cc2668071b
--- /dev/null
+++ b/hack/cozyreport.bats
@@ -0,0 +1,5352 @@
+#!/usr/bin/env bats
+# -----------------------------------------------------------------------------
+# Unit tests for the pure selection helper in hack/cozyreport.sh that decides
+# which pods the report collects evidence for, and which ones
+# hack/cozyreport-summary.sh names as broken:
+#
+#   - cozyreport_pods_not_ready -- keep every pod that is neither finished nor
+#                                  fully ready by its READY column. That column
+#                                  counts ready containers, not the pod's Ready
+#                                  condition; the one case the two disagree on is
+#                                  pinned below rather than claimed away.
+#
+# The kubectl calls those two scripts wrap around this helper are not
+# unit-testable (they need a live cluster); the selection is, and it is the part
+# that decides whether the pod that caused a failure appears in the uploaded
+# report at all. The case that matters is a pod whose STATUS is Running while its
+# READY column is 0/1: a readiness probe that never passes blocks everything
+# downstream of it, and a STATUS-only filter drops it, so the artifact ends up
+# with no trace of the pod the run died on.
+#
+# Strategy: source hack/cozyreport.sh with COZYREPORT_LIB set, which its
+# sourcing guard honours by defining the helpers and returning before it starts a
+# report -- so no cluster is required. Each @test then feeds the helper the exact
+# text `kubectl get pod -A --no-headers` produces.
+#
+# Title syntax constraints (inherited from cozytest.sh's awk parser):
+#   - Titles delimited by ASCII double quotes; embedded quotes truncate.
+#   - Only [A-Za-z0-9] from the title survives into the function name, so keep
+#     titles distinctive in their alphanumeric run.
+#
+# Run from the repo root with `make bats-unit-tests`, or directly with
+# `bats hack/cozyreport.bats`. The legacy `hack/cozytest.sh` runner remains a
+# supported compatibility path.
+# -----------------------------------------------------------------------------
+
+load test_helper
+
+HACK_DIR="$(cd "$(dirname "${BATS_TEST_FILENAME:-$0}")" && pwd)"
+SCRIPT="$HACK_DIR/cozyreport.sh"
+
+COZYREPORT_LIB=1
+# shellcheck source=/dev/null
+. "$SCRIPT"
+
+# One realistic cluster snapshot reused across the tests below: a running-but-
+# unready replica, a healthy pod, a finished job, a multi-container pod that is
+# partially ready, and the phase-based cases that were already collected.
+SNAPSHOT="$(printf '%s\n' \
+  'cozy-keycloak  keycloak-db-2    0/1  Running            0  6m' \
+  'kube-system    coredns-abc      1/1  Running            0  2h' \
+  'tenant-test    migrate-job-x    0/1  Completed          0  1h' \
+  'tenant-test    backup-job-y     0/1  Succeeded          0  1h' \
+  'cozy-system    puller-z         0/1  ImagePullBackOff   0  4m' \
+  'cozy-system    unscheduled-w    0/1  Pending            0  4m' \
+  'cozy-linstor   satellite-v      2/3  Running            1  3h')"
+
+# Print a file with comment lines dropped and shell line continuations folded, so
+# a guard can match a COMMAND rather than a physical line. Every source-scanning
+# check below wants the former and, written the obvious way, gets the latter: a
+# pattern anchored to one line passes the moment the thing it looks for sits one
+# continuation down, which in shell is where it usually sits.
+#
+# Top level rather than inside a test, because cozytest.sh ends an @test at the
+# first bare `}`.
+# One spelling of "kubectl, however POSIX lets it be reached", shared by every
+# scanner below so widening it is a single edit rather than four. `command` and
+# `env` may prefix it, `env` may carry assignments, and any whitespace run
+# separates the parts.
+#
+# What this deliberately does NOT cover: an absolute path, a variable, `sudo`, or
+# a shell function wrapping the name. None appears in these files and a separate
+# check fails if one ever does, so the limit is enforced rather than assumed.
+KUBECTL_RE='(command[[:space:]]+|env[[:space:]]+([A-Za-z_][A-Za-z0-9_]*=[^[:space:]]*[[:space:]]+)*)*kubectl[[:space:]]'
+
+fold_source() {
+  grep -v '^[[:space:]]*#' "$1" \
+    | awk '{ line = line $0
+             if (line ~ /\\$/) { sub(/\\$/, " ", line); next }
+             print line; line = "" }
+           END { if (line != "") print line }'
+}
+
+@test "the kamaji and linstor modules are gated on their own deployments" {
+  # The kamaji module was gated on cozy-linstor's controller, byte-identical to the
+  # condition opening the linstor module below it, so on a cluster without LINSTOR
+  # the kamaji controller log and the TenantControlPlanes were absent with nothing
+  # saying why -- and a tenant-kubernetes suite that times out on control-plane
+  # bootstrap is exactly the run that needs them. A copy-pasted gate is invisible
+  # to a reader precisely because it looks like its neighbour.
+  # Matched as a namespace/name PAIR. `*kamaji*` alone is satisfied by the
+  # `-n cozy-kamaji` that any gate in this module carries, so a gate naming a
+  # deployment that does not exist in that namespace -- which would keep the module
+  # shut forever -- passed unnoticed.
+  # Matched as "the gate line", not as "a line starting with kubectl": the gates
+  # run through cozyreport_probe, so the read no longer begins the line and a
+  # pattern anchored on it finds nothing and fails on the empty result rather
+  # than on a wrong gate.
+  gate=$(awk '/^# -- kamaji module/,/^  echo "Collecting kamaji/' "$SCRIPT" | grep -E '^if .*kubectl get')
+  case "$gate" in
+    *"cozy-kamaji kamaji"*) ;;
+    *) echo "FAIL: the kamaji module is not gated on cozy-kamaji/kamaji: $gate"; false ;;
+  esac
+  gate=$(awk '/^# -- linstor module/,/^  echo "Collecting linstor/' "$SCRIPT" | grep -E '^if .*kubectl get')
+  case "$gate" in
+    *"cozy-linstor linstor-controller"*) ;;
+    *) echo "FAIL: the linstor module is not gated on cozy-linstor/linstor-controller: $gate"; false ;;
+  esac
+}
+
+@test "the cdi module keeps the controller log and every CDI-labelled pod whatever its phase" {
+  # A DataVolume PVC stuck in Terminating can be held by an importer pod that
+  # CDI failed to delete after a successful import. That pod is Completed, so the
+  # broken-pod walk skips it, and the only record of why the delete did not land
+  # is the cdi-deployment log.
+  block=$(awk '/^# -- cdi module/,/^echo "Collecting services/' "$SCRIPT" | fold_source /dev/stdin)
+  [ -n "$block" ] || { echo "FAIL: no cdi module in $SCRIPT"; false; }
+  printf '%s\n' "$block" | grep -qE 'kubectl logs -n cozy-kubevirt-cdi deploy/cdi-deployment --tail=20000$' ||
+    { echo "FAIL: the cdi module does not read the current cdi-deployment log"; false; }
+  printf '%s\n' "$block" | grep -qE 'kubectl logs -n cozy-kubevirt-cdi deploy/cdi-deployment --tail=20000 --previous$' ||
+    { echo "FAIL: the cdi module does not read the previous cdi-deployment log"; false; }
+  printf '%s\n' "$block" | grep -qE 'kubectl get pod -A -l app=containerized-data-importer -o yaml$' ||
+    { echo "FAIL: the cdi module does not read CDI-labelled pods across namespaces as YAML"; false; }
+  case "$block" in
+    *cozyreport_pods_not_ready*) echo "FAIL: a phase filter would drop the Completed importer pod"; false ;;
+  esac
+}
+
+@test "the cdi pods are read even when the cdi-deployment probe fails" {
+  # The importer pod is owned by its PVC, not by cdi-deployment, so it outlives a
+  # Deployment that is gone or a probe that got no answer. That pod is the
+  # evidence this module exists for, so only the log reads may sit behind the probe.
+  tmp=$(mktemp -d)
+  mkdir -p "$tmp/bin"
+  cat > "$tmp/bin/kubectl" <<'STUB'
+#!/bin/sh
+echo "kubectl $*" >> "$KUBECTL_CALL_LOG"
+case "$*" in
+  "get deploy "*) exit 1 ;;
+  *"app=containerized-data-importer"*) printf 'items:\n- metadata:\n    name: importer-prime-stuck\n' ;;
+esac
+exit 0
+STUB
+  chmod +x "$tmp/bin/kubectl"
+
+  body=$(awk '/^# -- cdi module/,/^echo "Collecting services/' "$SCRIPT" | sed '$d' | fold_source /dev/stdin)
+  [ -n "$body" ] || { echo "FAIL: could not locate the cdi module"; false; }
+
+  KUBECTL_CALL_LOG="$tmp/calls.txt"
+  : > "$KUBECTL_CALL_LOG"
+  REPORT_DIR="$tmp/report"
+  export KUBECTL_CALL_LOG REPORT_DIR
+  ( COZYREPORT_BOUND="" PATH="$tmp/bin:$PATH" eval "$body" ) >/dev/null
+
+  grep -q 'importer-prime-stuck' "$REPORT_DIR/cdi/pods.yaml" 2>/dev/null || {
+    echo "FAIL: a failed cdi-deployment probe dropped the CDI-labelled pods"
+    cat "$KUBECTL_CALL_LOG"
+    false
+  }
+  if grep -q '^kubectl logs' "$KUBECTL_CALL_LOG"; then
+    echo "FAIL: the cdi-deployment log was read although the probe failed"
+    false
+  fi
+  rm -rf "$tmp"
+}
+
+@test "CSR capture lists and reads every request on the host cluster and each tenant kubeconfig on disk" {
+  host=$(fold_source "$SCRIPT" | awk '/^echo "Collecting CertificateSigningRequests/,/^echo "Collecting tenant kubernetes CertificateSigningRequests/')
+  [ -n "$host" ] || { echo "FAIL: could not locate the host CSR walk"; false; }
+  printf '%s\n' "$host" | grep -q '^cozyreport_read_object "\$REPORT_DIR/kubernetes/csr.txt" kubectl get csr -o wide$' || {
+    echo "FAIL: the host CSR listing is not a bounded read of every request"; false; }
+  printf '%s\n' "$host" | grep -q '^cozyreport_select_objects "csr" kubectl get csr --no-headers |$' || {
+    echo "FAIL: the host CSR walk does not select through the bounded selector"; false; }
+  printf '%s\n' "$host" | grep -q '^    cozyreport_read_object "\$DIR/csr.yaml" kubectl get csr "\$NAME" -o yaml$' || {
+    echo "FAIL: the host CSR walk does not read each request's yaml through the bounded reader"; false; }
+
+  tenant=$(fold_source "$SCRIPT" | awk '/^echo "Collecting tenant kubernetes CertificateSigningRequests/,/^done$/')
+  [ -n "$tenant" ] || { echo "FAIL: could not locate the tenant CSR walk"; false; }
+  printf '%s\n' "$tenant" | grep -q '^for TENANT_KC in tenantkubeconfig-\*; do$' || {
+    echo "FAIL: the tenant CSR walk does not glob every leftover tenant kubeconfig"; false; }
+  printf '%s\n' "$tenant" | grep -q '^  \[ -f "\$TENANT_KC" \] || continue$' || {
+    echo "FAIL: the tenant CSR walk does not skip a glob match with no matching file"; false; }
+  printf '%s\n' "$tenant" | grep -q '^  cozyreport_read_object "\$DIR/csr.txt" kubectl --kubeconfig "\$TENANT_KC" get csr -o wide$' || {
+    echo "FAIL: the tenant CSR listing is not a bounded read of every request"; false; }
+  printf '%s\n' "$tenant" | grep -q '^  cozyreport_select_objects "tenant csr (\$TENANT_NAME)" kubectl --kubeconfig "\$TENANT_KC" get csr --no-headers |$' || {
+    echo "FAIL: the tenant CSR walk does not select through the bounded selector"; false; }
+  printf '%s\n' "$tenant" | grep -q '^      cozyreport_read_object "\$DIR/\$NAME.yaml" kubectl --kubeconfig "\$TENANT_KC" get csr "\$NAME" -o yaml$' || {
+    echo "FAIL: the tenant CSR walk does not read each request's yaml through the bounded reader"; false; }
+}
+
+@test "no tenant kubeconfig on disk means no tenant CSR read is attempted" {
+  # tenantkubeconfig-<test> only exists while a kubernetes-* Chainsaw test is
+  # running or failed before its own cleanup (hack/e2e-chainsaw/_lib/run-
+  # kubernetes.sh). Every other suite, and a kubernetes suite that passed,
+  # leaves cwd with no such file, and the glob must not turn that absence into
+  # a literal `--kubeconfig tenantkubeconfig-*` read.
+  tmp=$(mktemp -d)
+  mkdir -p "$tmp/bin" "$tmp/work"
+  cat > "$tmp/bin/kubectl" <<'STUB'
+#!/bin/sh
+echo "kubectl $*" >> "$KUBECTL_CALL_LOG"
+exit 0
+STUB
+  chmod +x "$tmp/bin/kubectl"
+
+  body=$(fold_source "$SCRIPT" | awk '/^for TENANT_KC in tenantkubeconfig-\*; do$/,/^done$/')
+  [ -n "$body" ] || { echo "FAIL: could not locate the tenant CSR walk"; false; }
+
+  KUBECTL_CALL_LOG="$tmp/calls.txt"
+  : > "$KUBECTL_CALL_LOG"
+  REPORT_DIR="$tmp/report"
+  export KUBECTL_CALL_LOG REPORT_DIR
+  ( cd "$tmp/work" && PATH="$tmp/bin:$PATH" eval "$body" )
+
+  [ ! -s "$KUBECTL_CALL_LOG" ] || {
+    echo "FAIL: kubectl was invoked with no tenant kubeconfig present on disk"
+    cat "$KUBECTL_CALL_LOG"
+    false
+  }
+  [ ! -e "$REPORT_DIR" ] || {
+    echo "FAIL: a report directory was created with nothing to walk"
+    false
+  }
+  rm -rf "$tmp"
+}
+
+@test "every Deployment this script names by hand is one somebody chose to name" {
+  # Pinning the two gates above only guards the two lines that were looked at.
+  # The same defect sat in the cozystack module the whole time: the image read
+  # asked for `cozy-system/cozystack`, a Deployment the installer stopped shipping
+  # when it moved to cozystack-operator, so `cozystack/image.txt` -- the first file
+  # of the report, the one naming the build that produced everything after it --
+  # held `deployments.apps "cozystack" not found` on every run. The line below it
+  # already asked for the right name, which is what makes this class invisible in
+  # review: the wrong name looks exactly like its correct neighbour.
+  #
+  # Frozen as a LIST rather than checked against the repo's manifests, because
+  # most of these Deployments come from upstream subcharts and exist nowhere in
+  # this tree as a literal. What the list buys is that renaming or adding one has
+  # to be typed here too, by someone who then has a reason to check it resolves.
+  #
+  # Literal names only. The flux and per-object loops build a name from the
+  # cluster's own output at runtime; there is nothing to pin and nothing to get
+  # stale.
+  # A trailing `;` is stripped from every name. The gates used to end in
+  # `>/dev/null 2>&1; then`, which put the shell separator on a field of its own;
+  # through cozyreport_probe the deployment name is the last word before it, so
+  # without this the same name appears twice, once as itself and once with the
+  # semicolon attached, and the guard reports a set that changed when nothing did.
+  found=$(awk '
+    /kubectl/ {
+      ns = ""
+      for (i = 1; i < NF; i++) if ($i == "-n") { ns = $(i + 1); break }
+      if (ns == "") next
+      for (i = 1; i <= NF; i++) {
+        if ($i ~ /^deploy\//) { n = $i; sub(/^deploy\//, "", n); sub(/;$/, "", n); print ns "/" n }
+        else if ($i == "deploy" && i < NF && $(i + 1) == "-n" && i + 2 < NF && $(i + 3) !~ /^-/) {
+          n = $(i + 3); sub(/;$/, "", n); print ns "/" n
+        }
+      }
+    }
+  ' "$SCRIPT" | grep -v '\$' | LC_ALL=C sort -u | tr '\n' ' ')
+
+  expected='cozy-cert-manager/cert-manager cozy-cert-manager/cert-manager-webhook cozy-kamaji/kamaji cozy-kubevirt-cdi/cdi-deployment cozy-linstor/linstor-controller cozy-objectstorage-controller/container-object-storage-controller cozy-system/cozystack-operator '
+
+  if [ "$found" != "$expected" ]; then
+    echo "FAIL: the set of Deployments this script names changed."
+    echo "A name that exists on no cluster does not fail loudly -- it writes"
+    echo "kubectl's NotFound into the file that was supposed to hold evidence,"
+    echo "or holds a module shut for the whole run."
+    echo "expected: $expected"
+    echo "found:    $found"
+    false
+  fi
+}
+
+@test "every Kubernetes kind these scripts name by hand is one somebody chose it" {
+  # A gate naming something that is not a CRD does not fail loudly, and neither
+  # does a mistyped kind in a list. The cozystack-apps section gated on `kubectl get crd
+  # applications.apps.cozystack.io`. apps.cozystack.io is an aggregated
+  # APIService, not a CRD, so the probe answered NotFound on every cluster and the
+  # section never ran once; the group serves one resource per ApplicationDefinition
+  # discovered from the cozyrds, so `applications` was not a resource in it under
+  # any gate, and the real ApplicationDefinition CRD is in group cozystack.io and
+  # cluster-scoped. Three wrong facts in one loop, none of which failed loudly --
+  # the section was simply skipped, for years, exactly like a cluster that has no
+  # such objects. It is deleted rather than repaired: collecting the cozyrd-derived
+  # kinds means enumerating the API group at runtime, which is a feature and not a
+  # correction.
+  #
+  # Frozen as a list for the same reason the Deployment names are: cert-manager's
+  # and COSI's CRDs come from upstream charts and appear nowhere in this tree, so
+  # checking against the manifests would be false-red for them and false-green for
+  # anything typed wrong. What the list buys is that adding a gate has to be typed
+  # here too, by someone who then has a reason to check the kind exists and is
+  # served as a CRD at all.
+  # Every spelling, not just the gates. `summary_crd "$kind"` inside a
+  # `for kind in ...` loop passes four Flux CRDs that a grep for literal arguments
+  # never sees, and the COSI block iterates five more. A typo anywhere in those
+  # lists is as quiet as a wrong gate -- the kind is simply never found and the
+  # tree beneath it is never written -- so the union is what gets frozen.
+  # Comments stripped first. Prose names these kinds too -- this very test's
+  # rationale does -- and a guard that reads them is answering "where is this
+  # string mentioned" while reading as "what does this script ask the cluster for".
+  code=$(mktemp)
+  { fold_source "$SCRIPT"; fold_source "$HACK_DIR/cozyreport-summary.sh"; } > "$code"
+  found=$(
+    {
+      # Whitespace matched as a RUN, not as one space: folding a continuation
+      # leaves several spaces where the backslash was, and a pattern demanding
+      # exactly one is evaded by the very construct the folding exists to expose.
+      grep -oE 'get crd[[:space:]]+[a-z][a-z0-9.-]+' "$code" | sed 's/^get crd[[:space:]]*//'
+      grep -oE 'summary_crd[[:space:]]+[a-z][a-z0-9.-]+' "$code" | sed 's/^summary_crd[[:space:]]*//'
+      grep -E '^[[:space:]]*for kind in ' "$code" |
+        sed -e 's/^[[:space:]]*for kind in //' -e 's/;.*//' | tr ' ' '\n'
+      # And the kinds read directly, with no gate at all: a fully-qualified name
+      # is exactly as silent when mistyped, and dropping the gate is now one of
+      # the deliberate choices here rather than an oversight.
+      grep -oE 'kubectl get[[:space:]]+[a-z][a-z0-9-]*\.[a-z0-9.-]+' "$code" | sed 's/^kubectl get[[:space:]]*//'
+    } | grep -E '^[a-z][a-z0-9-]*\.[a-z0-9.-]+$' | LC_ALL=C sort -u | tr '\n' ' '
+  )
+  rm -f "$code"
+  expected='applicationdefinitions.cozystack.io bucketaccessclasses.objectstorage.k8s.io bucketaccesses.objectstorage.k8s.io bucketclaims.objectstorage.k8s.io bucketclasses.objectstorage.k8s.io buckets.objectstorage.k8s.io certificaterequests.cert-manager.io certificates.cert-manager.io challenges.acme.cert-manager.io externalartifacts.source.toolkit.fluxcd.io gitrepositories.source.toolkit.fluxcd.io helmreleases.helm.toolkit.fluxcd.io helmrepositories.source.toolkit.fluxcd.io kamajicontrolplanes.controlplane.cluster.x-k8s.io ocirepositories.source.toolkit.fluxcd.io orders.acme.cert-manager.io tenantcontrolplanes.kamaji.clastix.io tenants.apps.cozystack.io '
+
+  if [ "$found" != "$expected" ]; then
+    echo "FAIL: the set of CRDs these scripts gate on changed."
+    echo "A gate naming something that is not a CRD does not fail loudly --"
+    echo "it holds its section shut and reads as a cluster with no such objects."
+    echo "expected: $expected"
+    echo "found:    $found"
+    false
+  fi
+}
+
+@test "no explanation in these files stops in the middle of its sentence" {
+  # A comment that ends mid-sentence is what an edit leaves behind when it cuts
+  # prose out of a block without rereading the seam: "Same guard, same reason, as"
+  # followed by a blank line, or a clause with its own middle removed. In files
+  # whose subject is that an explanation has to be trustworthy, a half-written
+  # explanation in the source is the same defect one level up, and it is the kind
+  # a person skims straight past.
+  #
+  # Checks the LAST line of each comment block only: a conjunction mid-block is
+  # just a wrapped sentence.
+  bad=$(for f in cozyreport.sh cozyreport-summary.sh e2e-capture-previous-logs.sh \
+                 cozyreport.bats capture-previous-logs.bats cozyreport-talos.bats; do
+    awk -v f="$f" '
+      function flush(   x) {
+        if (prev != "" && prev ~ /([ \t](as|and|the|of|for|to|a|an|is|was|by|with|that|than|because|rather|same|but|or|in|on|at|from|its|it)|,)$/)
+          printf "%s:%d: %s\n", f, prevn, prev
+        prev = ""
+      }
+      {
+        line = $0
+        sub(/^[[:space:]]*/, "", line)
+        if (line ~ /^#/) {
+          sub(/^#+[[:space:]]*/, "", line)
+          if (line != "") { prev = line; prevn = NR; next }
+        }
+        flush()
+      }
+      END { flush() }
+    ' "$HACK_DIR/$f"
+  done)
+
+  if [ -n "$bad" ]; then
+    echo "FAIL: a comment block ends mid-sentence:"
+    printf '%s\n' "$bad"
+    false
+  fi
+}
+
+@test "every knob a script reads is named in that script's Environment block" {
+  # Same shape as the marker-parity guard above, for the other thing that drifts:
+  # behaviour gets added to a knob and its header block stays as it was. That is
+  # how COZY_PREVLOG_TAIL ended up validated, given a special -1 meaning and a
+  # per-log note while its documentation still read "lines per container
+  # (default 200)" -- and a knob whose only description is its default is one an
+  # operator will set to something the script now rejects.
+  #
+  # Read from the script rather than listed here: a hand-kept list is the thing
+  # that goes stale, which is the defect being guarded against.
+  # All three scripts, not the two that happened to have a block already: the
+  # test's name says "a script", and a guard whose file list is narrower than its
+  # claim is the same defect as a marker regex that enumerates known prefixes.
+  # cozyreport-summary.sh reads COZY_REPORT_PODS_MAX and had no block at all.
+  for f in cozyreport.sh cozyreport-summary.sh e2e-capture-previous-logs.sh; do
+    block=$(awk '/^# Environment:/,/^[^#]/' "$HACK_DIR/$f")
+    [ -n "$block" ] || { echo "FAIL: $f has no Environment block"; false; }
+    # Knobs reached through a sourced helper count too. Grepping only the file's
+    # own text answers "every knob whose name appears here", not "every knob this
+    # script reads" -- the claim in this test's name. COZY_REPORT_PREFER_NS
+    # reordered the summary's pod listing while appearing nowhere in that file,
+    # and this guard could not see it. Same defect the marker guard had: the check
+    # was narrower than the sentence describing it.
+    #
+    # Only the LIBRARY portion of the sourced file counts -- everything above the
+    # COZYREPORT_LIB guard, which is where the `.` returns. Scanning the whole
+    # file would attribute knobs the sourcing script never reaches: cozyreport.sh
+    # reads COZY_REPORT_DIR in its report body, far below that return, and the
+    # summary never executes it. A guard that over-reports is retired as noise
+    # just as fast as one that under-reports.
+    #
+    # Comments stripped before matching: every one of these files documents its
+    # knobs in prose right above the code, so scanning raw text finds the name in
+    # the Environment block and reports the knob as "read" by a file that only
+    # describes it. Three guards in this file need the same strip for the same
+    # reason: prose that explains a rule names the thing the rule forbids.
+    knobs=$(grep -Ev '^[[:space:]]*#' "$HACK_DIR/$f" | grep -oE 'COZY_[A-Z_]+' || true)
+    if grep -q '^\. "\$SCRIPT_DIR/cozyreport.sh"' "$HACK_DIR/$f"; then
+      # Only the knobs read by helpers this file actually CALLS. Sourcing makes
+      # every helper available, but availability is not use: the summary sources
+      # cozyreport_pod_tail and never invokes it, so attributing COZY_REPORT_POD_TAIL
+      # to it would demand documentation for a knob that changes nothing here. A
+      # guard that over-reports gets retired as noise exactly as fast as one that
+      # under-reports, so this walks call sites rather than the whole library.
+      for fn in $(grep -oE 'cozyreport_[a-z_]+' "$HACK_DIR/$f" | sort -u); do
+        body=$(awk -v fn="$fn" '$0 ~ "^"fn"\\(\\) \\{" {inb=1} inb {print} inb && /^}$/ {exit}' "$HACK_DIR/cozyreport.sh" | grep -Ev '^[[:space:]]*#')
+        knobs="$knobs
+$(printf '%s\n' "$body" | grep -oE 'COZY_[A-Z_]+' || true)"
+      done
+    fi
+    for v in $(printf '%s\n' "$knobs" | sort -u); do
+      if ! printf '%s\n' "$block" | grep -q "$v"; then
+        echo "FAIL: $f reads $v but its Environment block never names it"
+        false
+      fi
+    done
+  done
+}
+
+@test "an exec is bounded through its own reader and classified by neither" {
+  # The cut-off classification rests on 124 meaning the deadline expired. That
+  # holds only because `timeout` passes a command's own status through and no
+  # command given to the wrapper returns 124: `get`, `logs` and `describe` do not.
+  # `kubectl exec` does whatever the remote command did, 124 included, and would
+  # turn a container's own exit status into "this read was cut off by its own 30s
+  # timeout" -- a sentence about the report's machine describing something that
+  # happened inside a pod.
+  #
+  # Three assertions, because the earlier one-line form was satisfied by leaving
+  # every exec unbounded, and that is the state this file was in: the sharpest
+  # reads in it -- a shell inside a pod, streaming a tarball -- had no ceiling of
+  # any kind, and the guard read as though that were the safe arrangement.
+  # Bounding them without the middle assertion is worse than leaving them alone,
+  # because a 124 would then be classified as this script's own deadline.
+  #
+  # Line continuations are folded first. Every form below routinely puts the argv
+  # on the next physical line, so matching per line asks whether the word `exec`
+  # shares a line with the call rather than whether it is in its arguments -- and
+  # passes while the exec sits one line down, which is where it would actually be.
+  code=$(fold_source "$SCRIPT")
+
+  # 1. No exec reaches the readers whose 124 means "our deadline fired".
+  # Every reader that reaches cozyreport_cutoff_desc, not just the two that were
+  # thought of first: cozyreport_probe and cozyreport_select_objects call it too,
+  # so an exec routed through either would be misclassified AND invisible here.
+  # The guard's reach has to equal the helper's, or it reports a clean sweep of
+  # the half it happens to look at.
+  bounded=$(printf '%s\n' "$code" | grep -E '\$COZYREPORT_BOUND[[:space:]]|cozyreport_(read_object|probe|select_objects)[[:space:]]' || true)
+  [ -n "$bounded" ] || { echo "FAIL: found no bounded reads at all"; false; }
+  if printf '%s\n' "$bounded" | grep -qE "[[:space:]]exec[[:space:]]"; then
+    echo "FAIL: a bounded read is an exec, whose exit status is the remote command's"
+    printf '%s\n' "$bounded" | grep -E "[[:space:]]exec[[:space:]]"
+    false
+  fi
+
+  # 2. And every exec IS bounded, through the reader written for one. Matched on
+  # the verb as a field rather than on the string `kubectl exec`: half of these
+  # calls spell it `kubectl -n cozy-linstor exec`, which that string never sees,
+  # and a guard blind to half its subject reports a clean sweep of the other half.
+  #
+  # The reader's own body is cut out first. It is the one place in this file
+  # whose subject IS the exec -- in its code and in the sentence it writes into
+  # the report -- so scanning it answers "where is an exec mentioned" while
+  # reading as "which reads are execs", and every future edit to that sentence
+  # fails this guard for a reason unrelated to it. Its boundedness is asserted
+  # on its own terms below instead of inferred from the scan.
+  sites=$(printf '%s\n' "$code" |
+    awk '/^cozyreport_read_exec\(\) \{/ {inb=1} !inb {print} inb && /^}$/ {inb=0}')
+  execs=$(printf '%s\n' "$sites" | grep -E "$KUBECTL_RE" | grep -E "[[:space:]]exec[[:space:]]" || true)
+  [ -n "$execs" ] || { echo "FAIL: found no exec reads at all, so this proves nothing"; false; }
+  unbounded=$(printf '%s\n' "$execs" | grep -v 'cozyreport_read_exec' || true)
+  if [ -n "$unbounded" ]; then
+    echo "FAIL: an exec read runs with no ceiling; a wedged pod holds it open forever"
+    printf '%s\n' "$unbounded"
+    false
+  fi
+
+  # 3. That reader states the ambiguity rather than resolving it. Reaching the
+  # shared describer from in there is the whole defect wearing a different call
+  # site: the sentence it returns names this script's timeout as the cause.
+  body=$(awk '/^cozyreport_read_exec\(\) \{/ {inb=1} inb {print} inb && /^}$/ {exit}' "$SCRIPT" |
+    grep -Ev '^[[:space:]]*#')
+  [ -n "$body" ] || { echo "FAIL: could not locate cozyreport_read_exec"; false; }
+  # Cutting its body out of the scan above costs the one assertion that scan
+  # would have made about it, so make that one here: the reader every exec now
+  # routes through has to be the thing that applies the ceiling.
+  printf '%s\n' "$body" | grep -q '\$COZYREPORT_BOUND' || {
+    echo "FAIL: the exec reader does not apply the wall-clock bound"
+    false
+  }
+  if printf '%s\n' "$body" | grep -q 'cozyreport_cutoff_desc'; then
+    echo "FAIL: the exec reader describes its cutoff with the helper written for reads whose 124 is unambiguous"
+    false
+  fi
+}
+
+# Stub PATH for the exec reader: a `kubectl` whose behaviour is chosen by
+# STUB_EXEC_MODE and a `timeout` that runs its command rather than timing it, so
+# the assertions do not depend on the host having GNU coreutils.
+exec_stub_dir() {
+  _sd=$1
+  mkdir -p "$_sd/bin" "$_sd/out"
+  cat > "$_sd/bin/kubectl" <<'STUB'
+#!/bin/sh
+case "${STUB_EXEC_MODE:-}" in
+  # Killed mid-stream: the last line has no terminating newline, which is what a
+  # stream cut short actually leaves behind.
+  cut)     printf 'Node | ONLINE\nsrv1 | partial ro'; exit 124 ;;
+  # Killed before the command inside the pod wrote a byte -- the wedged controller
+  # the ticket is about. No stdout AND no stderr, because there was nothing to say
+  # it with.
+  silentcut) exit 124 ;;
+  # Rows out, then a failure on the command's own terms rather than on the clock.
+  # A wedged controller does not have to produce 124.
+  partialfail) printf 'Node | Ready\nsrv1 | Yes\nsrv2 | Ye'
+               echo 'error: rpc failed' >&2; exit 1 ;;
+  refused) echo 'error: unable to upgrade connection: container not found' >&2; exit 1 ;;
+  # What `kubectl exec` really leaves behind when the remote command fails: the
+  # cause first, and its own `command terminated` line appended LAST.
+  linstor) echo 'ERROR: unable to connect to linstor://localhost:3370' >&2
+           echo 'command terminated with exit code 10' >&2; exit 10 ;;
+  *)       echo 'Defaulted container "linstor-controller" out of: linstor-controller, init' >&2
+           printf 'Node | ONLINE\nsrv1 | Yes\n' ;;
+esac
+STUB
+  chmod +x "$_sd/bin/kubectl"
+  cat > "$_sd/bin/timeout" <<'STUB'
+#!/bin/sh
+[ "$1" = "-k" ] && shift 2
+shift
+exec "$@"
+STUB
+  chmod +x "$_sd/bin/timeout"
+  COZYREPORT_BOUND="timeout -k 5 $COZYREPORT_READ_TIMEOUT"
+}
+
+@test "an exec cut off short says what its status cannot tell apart" {
+  tmp=$(mktemp -d)
+  exec_stub_dir "$tmp"
+
+  STUB_EXEC_MODE=cut PATH="$tmp/bin:$PATH" \
+    cozyreport_read_exec "$tmp/out/nodes.txt" kubectl exec -n ns deploy/c -- linstor n l
+
+  # The partial output is kept, never discarded: it is the only copy of what the
+  # read managed to get out of the pod.
+  grep -q 'partial ro' "$tmp/out/nodes.txt"
+  # And the table says so about ITSELF, like every other .txt in the tarball. A
+  # short node list with the explanation one directory up reads as a small
+  # cluster, and that walk is the one a triager does not make.
+  grep -q '^# \[cozyreport\] TRUNCATED' "$tmp/out/nodes.txt" || {
+    echo "FAIL: a cut-off table carries no marker of its own, or not in the shared form"
+    cat "$tmp/out/nodes.txt"
+    false
+  }
+  [ -f "$tmp/out/COLLECTION-FAILED.txt" ] || {
+    echo "FAIL: a cut-off exec left no note at all"; false; }
+  grep -q 'nodes.txt' "$tmp/out/COLLECTION-FAILED.txt"
+  grep -q 'passes the remote command' "$tmp/out/COLLECTION-FAILED.txt"
+  # And it does NOT borrow the sentence written for reads whose 124 is this
+  # script's own clock. That sentence is the false claim this path exists to
+  # avoid, so its absence is the assertion, not a nicety.
+  if grep -q "its own ${COZYREPORT_READ_TIMEOUT}s timeout" "$tmp/out/COLLECTION-FAILED.txt"; then
+    echo "FAIL: the note names a mechanism the status does not establish"
+    cat "$tmp/out/COLLECTION-FAILED.txt"
+    false
+  fi
+
+  # A refusal is a different fact and gets a different sentence. Pasting the
+  # ambiguity onto every failure would make the wording noise a reader skips,
+  # which costs exactly the case it was written for.
+  STUB_EXEC_MODE=refused PATH="$tmp/bin:$PATH" \
+    cozyreport_read_exec "$tmp/out/pools.txt" kubectl exec -n ns deploy/c -- linstor sp l
+  grep -q 'container not found' "$tmp/out/COLLECTION-FAILED.txt"
+  [ "$(grep -c 'passes the remote command' "$tmp/out/COLLECTION-FAILED.txt")" -eq 1 ]
+
+  # A refusal is what the LISTING has to say for itself, so it goes in the file
+  # too. Sent only beside it, `pools.txt` is zero bytes -- the "did it return
+  # nothing, or never run" question this collector exists to answer, and the shape
+  # the object reader argues against for exactly the same reason.
+  [ -s "$tmp/out/pools.txt" ] || {
+    echo "FAIL: a refused listing was left as a zero-byte file"; false; }
+  grep -q 'container not found' "$tmp/out/pools.txt"
+
+  # And the WHOLE message survives, not its last line. `kubectl exec` appends
+  # `command terminated with exit code N` after whatever the remote command said,
+  # so on this path the last line is the one line that never carries the cause --
+  # the opposite of the `kubectl get` klog preamble this file quotes tail -n 1 for.
+  STUB_EXEC_MODE=linstor PATH="$tmp/bin:$PATH" \
+    cozyreport_read_exec "$tmp/out/res.txt" kubectl exec -n ns deploy/c -- linstor r l
+  grep -q 'unable to connect to linstor' "$tmp/out/COLLECTION-FAILED.txt" || {
+    echo "FAIL: only kubectl's own trailer survived; the cause was dropped"
+    grep 'res.txt' -A3 "$tmp/out/COLLECTION-FAILED.txt"
+    false
+  }
+  grep -q 'unable to connect to linstor' "$tmp/out/res.txt"
+
+  # The archive sentence belongs only to the two reads that stream one. A cut-off
+  # .txt that carried it would be told about a mechanism its read never went
+  # through -- the same fault as naming a timeout that did not fire.
+  STUB_EXEC_MODE=cut PATH="$tmp/bin:$PATH" \
+    cozyreport_read_exec "$tmp/out/idx.txt" kubectl exec -n ns deploy/c -- linstor error-reports list
+  if grep -q 'idx.txt' "$tmp/out/COLLECTION-FAILED.txt" &&
+     grep -A2 'idx.txt' "$tmp/out/COLLECTION-FAILED.txt" | grep -q 'EITHER beside it'; then
+    echo "FAIL: a cut-off listing was described as an archive"
+    false
+  fi
+  rm -rf "$tmp"
+}
+
+@test "both readers mark the same file type in the same greppable form" {
+  # Nothing held this and the two readers had drifted: the object reader wrote
+  # `# [cozyreport]` into a .txt and the exec reader wrote it bare. A triager greps
+  # `^# [cozyreport]` over the unpacked tarball, gets part of it, and has no way to
+  # know the rest exists.
+  #
+  # BOTH outcomes, because the first version of this test checked only the path
+  # where the command produced output -- and the three zero-output branches drifted
+  # underneath it, in the same commit that stated the rule. Zero output is the
+  # ticket's own case: a wedged controller killed before it writes a byte.
+  tmp=$(mktemp -d)
+  exec_stub_dir "$tmp"
+  printf '#!/bin/sh\nprintf "row one\\nrow tw"\nexit 1\n' > "$tmp/objstub"
+  chmod +x "$tmp/objstub"
+
+  STUB_EXEC_MODE=cut PATH="$tmp/bin:$PATH" \
+    cozyreport_read_exec "$tmp/out/exec-partial.txt" kubectl exec -n ns deploy/c -- linstor n l
+  STUB_EXEC_MODE=silentcut PATH="$tmp/bin:$PATH" \
+    cozyreport_read_exec "$tmp/out/exec-empty.txt" kubectl exec -n ns deploy/c -- linstor n l
+  COZYREPORT_BOUND="" cozyreport_read_object "$tmp/out/object-partial.txt" "$tmp/objstub"
+
+  for f in exec-partial.txt exec-empty.txt object-partial.txt; do
+    [ -s "$tmp/out/$f" ] || { echo "FAIL: $f is empty"; false; }
+    grep -q '^# \[cozyreport\]' "$tmp/out/$f" || {
+      echo "FAIL: $f does not carry the shared marker form"
+      tail -n 2 "$tmp/out/$f"
+      false
+    }
+  done
+  # And no `[cozyreport]` line anywhere in them escapes the form.
+  for f in exec-partial.txt exec-empty.txt object-partial.txt; do
+    if grep -q '^\[cozyreport\]' "$tmp/out/$f"; then
+      echo "FAIL: $f carries an unprefixed [cozyreport] line"
+      grep -n '^\[cozyreport\]' "$tmp/out/$f"
+      false
+    fi
+  done
+  rm -rf "$tmp"
+}
+
+@test "the satellite walk points the selector at its own directory" {
+  # The behaviour is parameterised and the parameterisation is tested -- but the
+  # CALL SITE that sets it was held by nothing: deleting the assignment left every
+  # test green while satellite notes went back to the shared kubernetes file. That
+  # is the gap two other guards in this file exist for, and neither can see this
+  # one, because what is missing is a variable rather than a function.
+  body=$(fold_source "$SCRIPT" | awk '/^  DIR=\$REPORT_DIR\/linstor\/error-reports$/,/^  rmdir /')
+  [ -n "$body" ] || { echo "FAIL: could not locate the satellite walk"; false; }
+  printf '%s\n' "$body" | grep -q '^  COZYREPORT_SELECT_NOTE_DIR=\$DIR$' || {
+    echo "FAIL: the satellite walk does not point the selector at its own directory"
+    printf '%s\n' "$body" | head -5
+    false
+  }
+  printf '%s\n' "$body" | grep -q '^  COZYREPORT_SELECT_NOTE_DIR=""$' || {
+    echo "FAIL: the satellite walk leaves the note directory set for the next caller"
+    false
+  }
+}
+
+@test "a table that died part way through says so in the table itself" {
+  # Not every wedged controller produces 124. One that streams three rows and then
+  # exits 1 leaves a file that reads as a complete three-node listing, and the note
+  # a directory up is the walk a triager does not make -- the same argument the
+  # timeout branch already acts on, and the same one the object reader acts on for
+  # this exact shape.
+  tmp=$(mktemp -d)
+  exec_stub_dir "$tmp"
+
+  STUB_EXEC_MODE=partialfail PATH="$tmp/bin:$PATH" \
+    cozyreport_read_exec "$tmp/out/nodes.txt" kubectl exec -n ns deploy/c -- linstor n l
+
+  grep -q 'srv2 | Ye' "$tmp/out/nodes.txt"
+  grep -q '^# \[cozyreport\] EXIT 1 after this output' "$tmp/out/nodes.txt" || {
+    echo "FAIL: a partial table that failed on its own terms carries no marker, or not in the shared form"
+    cat "$tmp/out/nodes.txt"
+    false
+  }
+  # Nor does it claim a cut. kubectl exec passes the remote status through, and a
+  # command that lists everything it can and then exits 1 is complete; the status
+  # alone cannot separate that from a stream that broke.
+  if grep -q 'TRUNCATED' "$tmp/out/nodes.txt"; then
+    echo "FAIL: a non-zero exit after output is asserted to be a cut"; false; fi
+  if grep -q 'only what was streamed before' "$tmp/out/COLLECTION-FAILED.txt"; then
+    echo "FAIL: the note beside the table asserts a cut"; false; fi
+  # And it does not borrow the timeout branch's wording, which names a clock that
+  # did not fire.
+  if grep -q 'killed at exit' "$tmp/out/nodes.txt"; then
+    echo "FAIL: a non-timeout failure is described as a kill"; false; fi
+  rm -rf "$tmp"
+}
+
+@test "a table that got nothing still says why instead of shipping empty" {
+  # The sharpest case in the ticket: a wedged controller holds the stream open and
+  # the read is killed before the command writes a byte, so there is no stdout to
+  # mark and no stderr to copy. Left alone, `linstor/nodes.txt` ships at zero
+  # length and reads as a cluster with no nodes -- and unlike the two archive
+  # reads, the tables have no call-site emptiness check to remove it.
+  tmp=$(mktemp -d)
+  exec_stub_dir "$tmp"
+
+  STUB_EXEC_MODE=silentcut PATH="$tmp/bin:$PATH" \
+    cozyreport_read_exec "$tmp/out/nodes.txt" kubectl exec -n ns deploy/c -- linstor n l
+
+  [ -s "$tmp/out/nodes.txt" ] || {
+    echo "FAIL: a killed table shipped as a zero-byte file"; false; }
+  grep -q 'killed at exit 124 before the command inside the pod wrote anything' "$tmp/out/nodes.txt"
+
+  # And it must say what the emptiness is ABOUT. "This file is empty" is a fact
+  # about the file; without the contrast a reader supplies the other subject and
+  # concludes the command found nothing.
+  grep -q 'not because the command' "$tmp/out/nodes.txt" || {
+    echo "FAIL: the placeholder does not separate an empty file from an empty result"
+    cat "$tmp/out/nodes.txt"
+    false
+  }
+  rm -rf "$tmp"
+}
+
+@test "an exec read with nowhere to write stderr does not claim it was silent" {
+  # `mktemp` fails on a machine with no writable temp dir, so stderr goes to
+  # /dev/null and the reader cannot know whether the command spoke. Every other
+  # reader in this file carries that distinction; this one did not, and the merge
+  # base put the message in the file unconditionally through `2>&1`, so losing it
+  # here is a narrow regression rather than a gap.
+  tmp=$(mktemp -d)
+  exec_stub_dir "$tmp"
+  ro="$tmp/readonly"; mkdir -p "$ro"; chmod 500 "$ro"
+
+  STUB_EXEC_MODE=refused TMPDIR="$ro" PATH="$tmp/bin:$PATH" \
+    cozyreport_read_exec "$tmp/out/pools.txt" kubectl exec -n ns deploy/c -- linstor sp l
+
+  chmod 700 "$ro"
+  [ -s "$tmp/out/pools.txt" ] || {
+    echo "FAIL: the read left nothing at all behind"; false; }
+  grep -q 'could not be captured' "$tmp/out/pools.txt" || {
+    echo "FAIL: a lost message is reported as the command having said nothing"
+    cat "$tmp/out/pools.txt"
+    false
+  }
+  rm -rf "$tmp"
+}
+
+@test "a cut-off bundle note says both of the two things that can happen to it" {
+  # The note used to assert one outcome and was wrong both times it tried. A
+  # stream that got members across is kept and truncated; a stream killed before
+  # its first byte leaves zero bytes and the call site's emptiness check removes
+  # it. This path runs before that check, so it cannot know which -- and the
+  # wedged controller the ticket is about is the second case, the one the
+  # confident wording denied.
+  tmp=$(mktemp -d)
+  exec_stub_dir "$tmp"
+
+  STUB_EXEC_MODE=cut PATH="$tmp/bin:$PATH" \
+    cozyreport_read_exec "$tmp/out/bundle.tgz" kubectl exec -n ns deploy/c -- sh -c 'true'
+
+  note="$tmp/out/COLLECTION-FAILED.txt"
+  # The archive gets NO in-file marker: a line of prose inside a gzip stream is a
+  # file nothing can open, which is the whole reason this reader writes beside.
+  if tr -d '\0' < "$tmp/out/bundle.tgz" 2>/dev/null | grep -q 'cozyreport'; then
+    echo "FAIL: prose was appended into an archive"
+    false
+  fi
+  grep -q 'EITHER beside it and truncated' "$note" || {
+    echo "FAIL: the note does not offer the kept-and-truncated outcome"; cat "$note"; false; }
+  grep -q 'OR gone' "$note" || {
+    echo "FAIL: the note does not offer the removed-because-empty outcome"; cat "$note"; false; }
+  rm -rf "$tmp"
+}
+
+@test "a read that is not kubectl is not reported as kubectl in its own marker" {
+  # This reader served kubectl alone until the sweep gave it talosctl and the four
+  # host commands. Its markers named kubectl and called every non-YAML target an
+  # object, so a `df` that hit a stale mount produced "kubectl exited 1 ... not
+  # because the object ended" -- two false statements in one line, in an artifact
+  # whose whole premise is that its notes can be believed.
+  tmp=$(mktemp -d)
+  mkdir -p "$tmp/bin" "$tmp/out"
+  cat > "$tmp/bin/df" <<'STUB'
+#!/bin/sh
+printf 'Filesystem Size\n/dev/disk1 100G\n'
+echo 'df: cannot read table of mounted file systems' >&2
+exit 1
+STUB
+  chmod +x "$tmp/bin/df"
+
+  COZYREPORT_BOUND="" PATH="$tmp/bin:$PATH" \
+    cozyreport_read_object "$tmp/out/df.txt" df -h
+
+  marker=$(tail -n 1 "$tmp/out/df.txt")
+  case "$marker" in
+    *kubectl*) echo "FAIL: a df read is reported as kubectl: $marker"; false ;;
+  esac
+  case "$marker" in
+    *"the object ended"*) echo "FAIL: a df listing is called an object: $marker"; false ;;
+  esac
+  printf '%s\n' "$marker" | grep -q 'df exited 1'
+  rm -rf "$tmp"
+}
+
+@test "a probe cut off is not left looking like a component that is absent" {
+  tmp=$(mktemp -d)
+  exec_stub_dir "$tmp"
+  REPORT_DIR="$tmp/report"
+  mkdir -p "$REPORT_DIR/kubernetes"
+
+  # The gate keeps its meaning: a probe that did not answer is not a probe that
+  # answered "no", so the caller still skips the module.
+  rc=0
+  STUB_EXEC_MODE=cut PATH="$tmp/bin:$PATH" \
+    cozyreport_probe "linstor" kubectl get deploy -n cozy-linstor linstor-controller || rc=$?
+  [ "$rc" -ne 0 ] || { echo "FAIL: a cut-off probe reported the module as present"; false; }
+
+  # And the skip is recorded, because the tree it leaves behind is the tree a
+  # cluster without LINSTOR leaves: no directory, no marker, nothing to read.
+  [ -f "$REPORT_DIR/kubernetes/COLLECTION-FAILED.txt" ] || {
+    echo "FAIL: a cut-off probe skipped its section in silence"; false; }
+  grep -q 'linstor' "$REPORT_DIR/kubernetes/COLLECTION-FAILED.txt"
+  grep -q 'NOT a statement that the component is absent' "$REPORT_DIR/kubernetes/COLLECTION-FAILED.txt"
+  rm -rf "$tmp"
+}
+
+@test "a probe answering plainly leaves nothing behind either way" {
+  tmp=$(mktemp -d)
+  exec_stub_dir "$tmp"
+  REPORT_DIR="$tmp/report"
+  mkdir -p "$REPORT_DIR/kubernetes"
+
+  PATH="$tmp/bin:$PATH" cozyreport_probe "kamaji" kubectl get deploy -n cozy-kamaji kamaji
+
+  # A component that IS installed writes no note, and neither does one that is
+  # not: "this cluster does not run that" is the cluster answering correctly, and
+  # a marker that fires on every install without KubeVirt or without LINSTOR is
+  # one a triager learns to skip -- which costs the runs where it names something
+  # real. Only the read that never came back is worth a line.
+  rc=0
+  STUB_EXEC_MODE=refused PATH="$tmp/bin:$PATH" \
+    cozyreport_probe "cert-manager" kubectl get crd certificates.cert-manager.io || rc=$?
+  [ "$rc" -ne 0 ] || { echo "FAIL: an absent component was reported as present"; false; }
+  if [ -f "$REPORT_DIR/kubernetes/COLLECTION-FAILED.txt" ]; then
+    echo "FAIL: an ordinary probe filed a collection failure"
+    cat "$REPORT_DIR/kubernetes/COLLECTION-FAILED.txt"
+    false
+  fi
+  rm -rf "$tmp"
+}
+
+@test "an exec that finished leaves no failure note and no prose in its output" {
+  tmp=$(mktemp -d)
+  exec_stub_dir "$tmp"
+
+  PATH="$tmp/bin:$PATH" \
+    cozyreport_read_exec "$tmp/out/nodes.txt" kubectl exec -n ns deploy/c -- linstor n l
+
+  grep -q 'srv1 | Yes' "$tmp/out/nodes.txt"
+  if [ -f "$tmp/out/COLLECTION-FAILED.txt" ]; then
+    echo "FAIL: a read that finished was filed as a failure"
+    cat "$tmp/out/COLLECTION-FAILED.txt"
+    false
+  fi
+  # kubectl announces the container it defaulted to on every exec against a
+  # Deployment. Merged into the output it is a line at the top of a table a
+  # person reads, and in the two calls that stream a tarball it is a corrupt
+  # archive, so it goes beside the file the same way a warning on any other
+  # successful read does.
+  if grep -q 'Defaulted container' "$tmp/out/nodes.txt"; then
+    echo "FAIL: kubectl's own line was merged into the output it describes"
+    false
+  fi
+  grep -q 'Defaulted container' "$tmp/out/READ-WARNINGS.txt"
+  rm -rf "$tmp"
+}
+
+@test "no read in the report body is taken without a wall clock ceiling" {
+  # This replaces a guard that froze WHICH sections were bounded, and a second one
+  # that froze how many unbounded reads each of the others had. Both were lists,
+  # and a list is the wrong shape for this claim: the header named four sections
+  # while the file had ten, and the counts went stale inside the commit that was
+  # relying on them. The claim worth holding is universal -- no read here runs
+  # without a ceiling -- and a universal claim is checked by finding a
+  # counterexample, not by matching a table.
+  #
+  # Scoped to the report BODY, below the library guard. Above it the same words
+  # appear in the sentences these readers write into the artifact, so a scan of
+  # the whole file answers "where is kubectl mentioned" rather than "what does
+  # this script run"; the readers themselves are asserted elsewhere, one by one.
+  guard=$(grep -n 'COZYREPORT_LIB:-' "$SCRIPT" | head -1 | cut -d: -f1)
+  [ -n "$guard" ] || { echo "FAIL: could not find the library guard"; false; }
+  body=$(awk -v g="$guard" 'NR>g' "$SCRIPT" | grep -v '^[[:space:]]*#' |
+    awk '{ line = line $0
+           if (line ~ /\\$/) { sub(/\\$/, " ", line); next }
+           print line; line = "" }
+         END { if (line != "") print line }')
+
+  # `command -V kubectl` is the dependency check, not a read: it never contacts a
+  # cluster and cannot hang on one.
+  #
+  # The four host commands are in the pattern too, anchored at command position so
+  # the words cannot match prose. They talk to no cluster, which is exactly why
+  # they were missed: `df` blocks forever on a stale mount and takes the tarball
+  # with it, and a scan that only knows about kubectl reports a clean sweep while
+  # the header's claim -- EVERY read -- is false about four lines of the file.
+  reads=$(printf '%s\n' "$body" |
+    grep -E '(kubectl|talosctl)[[:space:]]|^[[:space:]]*(df|free|ps|dmesg)[[:space:]]' |
+    grep -v 'command -V' || true)
+  # A scan that suddenly matches nothing is a broken scan, not a clean file, and
+  # it would report the strongest possible result while checking nothing at all.
+  n=$(printf '%s\n' "$reads" | grep -c . || true)
+  # A FLOOR against a scan that stopped matching, not a count of the reads: the
+  # body has around ninety, so a pattern that broke would fall far below this
+  # rather than just under it. It was set at 40 while the real figure was 94, which
+  # left room for a dozen reads to go invisible without the floor noticing -- the
+  # number is now close enough to the truth to be worth something, and deliberately
+  # not exact, because an exact one is a frozen count and this file has spent the
+  # whole change removing those.
+  [ "$n" -ge 80 ] || {
+    echo "FAIL: the scan found only $n reads in the report body, which is far fewer than this file has;"
+    echo "the pattern has stopped matching rather than the reads having gone away."
+    false
+  }
+
+  # Bounded means: through one of the four readers, through the collector that
+  # uses them, or through the bare wrapper at the sites where the reader cannot own
+  # the redirect -- a value captured into a variable, or a pipeline that transforms
+  # the output before anything lands. Described rather than counted: the header
+  # carried "three" of those while the file had five.
+  offenders=$(printf '%s\n' "$reads" |
+    grep -vE 'cozyreport_(read_object|read_exec|select_objects|probe|collect_pod|collect_broken_pods|collect_talos_node)|\$COZYREPORT_BOUND' || true)
+  if [ -n "$offenders" ]; then
+    echo "FAIL: a read in the report body runs with no wall-clock ceiling:"
+    printf '%s\n' "$offenders"
+    echo "The tarball is written on this script's last line, so a read that never"
+    echo "returns loses the whole artifact rather than truncating one file."
+    false
+  fi
+
+  # What this cannot see, said out loud rather than left to be found: a folded
+  # line carrying two commands satisfies it if either one is bounded. Nothing in
+  # this file is written that way, and the gates below hold the other spellings.
+  #
+  # And the header makes the same claim in words, beside the code that keeps it.
+  # A guard on the code alone leaves the sentence free to drift, which is the
+  # failure the list-shaped version of this test kept having.
+  head -n 60 "$SCRIPT" | grep -q '^# EVERY read below carries a wall-clock ceiling' || {
+    echo "FAIL: the header no longer claims that every read is bounded"
+    false
+  }
+}
+
+@test "the step that runs this collector has a ceiling of its own everywhere" {
+  # Every bound inside the script protects one read. None of them protects the
+  # STEP: the tarball is written on the collector's last line, the upload is the
+  # next step in the job, and a step with no ceiling of its own inherits only the
+  # job's -- so a read that never returns spends the rest of the job budget, the
+  # job is cancelled, and the upload never runs. That loses the artifact instead
+  # of truncating it, on the run where it is the only evidence left.
+  #
+  # All three workflows that run the collector, not the one that was looked at:
+  # the same step is copied into each, and a ceiling added to one of them leaves
+  # the other two with the defect while the fix looks done.
+  for wf in pull-requests nightly e2e-tag; do
+    f="$HACK_DIR/../.github/workflows/$wf.yaml"
+    [ -f "$f" ] || { echo "FAIL: .github/workflows/$wf.yaml is missing"; false; }
+    # The job's own cap is the last one seen above the step, told apart from the
+    # step's by indentation: job keys sit at four spaces, step keys at eight.
+    # Comparing against it is what makes the step's number mean something -- a
+    # ceiling at or above the job's is the same as no ceiling at all.
+    caps=$(awk '
+      /^    timeout-minutes: [0-9]+$/  { job = $2 }
+      /^      - name: Collect report$/ { inb = 1; next }
+      inb && /^      - name: /         { inb = 0 }
+      inb && /^        timeout-minutes: [0-9]+$/ { step = $2; cap = job }
+      inb && /^        continue-on-error: true$/ { tol = "yes" }
+      END { print cap "/" step "/" tol }' "$f")
+    cap=${caps%%/*}
+    rest=${caps#*/}
+    step=${rest%/*}
+    tol=${rest#*/}
+    if [ -z "$step" ]; then
+      echo "FAIL: the Collect report step in $wf.yaml carries no timeout-minutes"
+      echo "Without one it inherits the job's, and a hung read costs the upload"
+      echo "that follows it rather than costing this step."
+      false
+    fi
+    [ -n "$cap" ] || { echo "FAIL: could not find the job cap in $wf.yaml"; false; }
+    if [ "$step" -ge "$cap" ]; then
+      echo "FAIL: the Collect report step in $wf.yaml is capped at $step minutes,"
+      echo "which the job's own $cap does not leave room under."
+      false
+    fi
+    # And the ceiling must not change what the job REPORTS. `|| true` on the make
+    # call is this step's standing statement that collecting diagnostics is never
+    # fatal; a step killed at its ceiling never reaches that `|| true`, because the
+    # runner ends the process rather than the shell. Without continue-on-error a
+    # passing E2E run whose collection ran long is published as a failed one, and
+    # every later `failure()` in the job starts meaning "the tests failed OR the
+    # report was slow" -- a ceiling added for diagnostics would then be deciding
+    # merges.
+    if [ "$tol" != "yes" ]; then
+      echo "FAIL: the Collect report step in $wf.yaml has a ceiling but no continue-on-error,"
+      echo "so hitting that ceiling turns a passing run red on a diagnostics overrun."
+      false
+    fi
+    # And the overrun stays visible. `continue-on-error` keeps a fired ceiling out
+    # of the job's result, which also keeps it out of everyone's view: the step
+    # renders green and the only trace is in the raw log. This collector's whole
+    # standard is that a bound which fires is recorded, and the outer bound is not
+    # exempt from it -- so the step is addressable by id and a later step turns its
+    # outcome into a warning annotation.
+    grep -q '^        id: collect_report$' "$f" || {
+      echo "FAIL: the Collect report step in $wf.yaml has no id, so nothing can key on its outcome"
+      false
+    }
+    grep -q "steps.collect_report.outcome == 'failure'" "$f" || {
+      echo "FAIL: nothing in $wf.yaml surfaces a Collect report overrun;"
+      echo "continue-on-error renders it green and the ceiling fires in silence."
+      false
+    }
+  done
+}
+
+@test "every helper these scripts define is wired to at least one call site" {
+  # Written as a shape rather than as a list of "these two calls must appear in
+  # those three loops", because that shape of guard is blind to the helper added
+  # next -- which is exactly how it failed here: cozyreport_objects_deadline_passed
+  # had its own passing test while one loop had stopped calling it, and the
+  # wiring assertion named other functions.
+  #
+  # A helper with no call site is the general form of that gap: the behaviour is
+  # covered, the wiring is not, and both tests stay green. Definition and use are
+  # counted separately so the definition line cannot satisfy the check.
+  orphans=""
+  for f in cozyreport.sh e2e-capture-previous-logs.sh; do
+    for h in $(grep -oE '^[a-z_][a-z0-9_]*\(\)' "$HACK_DIR/$f" | tr -d '()'); do
+      case "$h" in
+        # `log` in the capture script is called from every branch of the walk,
+        # but the name is too short for a word-boundary grep to separate it from
+        # ordinary prose. Its wiring is covered by the tests that assert on the
+        # lines it emits.
+        log) continue ;;
+      esac
+      uses=$(fold_source "$HACK_DIR/$f" \
+        | grep -vE "^[a-z_][a-z0-9_]*\(\)" \
+        | grep -cE "(^|[^a-zA-Z0-9_])$h([^a-zA-Z0-9_]|$)" || true)
+      # cozyreport.sh's helpers may legitimately be called only from the summary,
+      # which sources them.
+      if [ "$uses" -eq 0 ] && [ "$f" = cozyreport.sh ]; then
+        uses=$(fold_source "$HACK_DIR/cozyreport-summary.sh" \
+          | grep -cE "(^|[^a-zA-Z0-9_])$h([^a-zA-Z0-9_]|$)" || true)
+      fi
+      [ "$uses" -gt 0 ] || orphans="$orphans $f:$h"
+    done
+  done
+
+  if [ -n "$orphans" ]; then
+    echo "FAIL: helper defined but never called:$orphans"
+    echo "A helper with no call site is behaviour that is tested and not reached."
+    false
+  fi
+}
+
+@test "the pod and kubevirt per-object reads all go through the bounded reader" {
+  # The header scopes the bound by naming sections. Sharing one READY selector widened the pod and VMI sections and
+  # NARROWED the VM one: VM already selected on READY through a fixed $5, and $NF
+  # only drops the short rows where that $5 was spuriously empty. Only the
+  # pod section had been bounded, and
+  # nothing asserted the boundedness of the other two, so the selector change
+  # passed without touching a single assertion about ceilings. A VMI at
+  # Phase=Running whose guest agent never connected is the normal shape of a failed
+  # tenant-kubernetes run, so the new fan-out lands exactly where a degraded
+  # apiserver is most likely to hang a read.
+  # The pod section first: it is the change's primary behaviour, and its call site
+  # was the last unpinned seam -- replacing this line with a no-op left every test
+  # green, because the collector function is covered from every angle and nothing
+  # asserted that the report invokes it.
+  pods=$(awk '/^echo "Collecting pods/,/^echo "Collecting virtualmachines/' "$SCRIPT")
+  [ -n "$pods" ] || { echo "FAIL: could not locate the pod section"; false; }
+  printf '%s\n' "$pods" | grep -q '^cozyreport_collect_broken_pods "' || {
+    echo "FAIL: the pod section does not call the collector"
+    printf '%s\n' "$pods"
+    false
+  }
+  if printf '%s\n' "$pods" | grep -qE '^kubectl get pod .*\| *awk '; then
+    echo "FAIL: the pod section still selects inline"
+    false
+  fi
+
+  for section in vm vmi; do
+    # Comments stripped first: the selector helper's docstring quotes the same
+    # `kubectl get vm -A --no-headers` line it documents, and an unstripped range
+    # starts there and swallows everything down to the next `done`.
+    body=$(fold_source "$SCRIPT" | awk "/kubectl get $section -A --no-headers/,/^  done/")
+    [ -n "$body" ] || { echo "FAIL: could not locate the $section loop"; false; }
+    # Every kubectl in the loop goes through the bounded reader rather than a bare
+    # call, which is also what attaches a truncation marker when a read is cut off.
+    if printf '%s\n' "$body" | grep -qE "^[[:space:]]+$KUBECTL_RE"; then
+      echo "FAIL: the $section loop still has an unbounded kubectl read"
+      printf '%s\n' "$body" | grep -nE "^[[:space:]]+$KUBECTL_RE"
+      false
+    fi
+    printf '%s\n' "$body" | grep -q 'cozyreport_read_object' || {
+      echo "FAIL: the $section loop does not use the bounded reader"
+      false
+    }
+    # And the SELECTOR is wired in, not just the reader. Reverting either call site
+    # to its pre-change filter -- `awk '$4 != "Running"'` for vmi, `awk '$5 !=
+    # "True"'` for vm -- left every test green: the helper was covered, the wiring
+    # was not, and "the VMI section moved off a phase filter" is one of this
+    # change's three headline behaviours.
+    printf '%s\n' "$body" | grep -q 'cozyreport_kubevirt_not_ready' || {
+      echo "FAIL: the $section selection does not go through the shared helper"
+      printf '%s\n' "$body" | head -3
+      false
+    }
+    if printf '%s\n' "$body" | grep -qE "^kubectl get $section .*\| *awk "; then
+      echo "FAIL: the $section selection still filters inline"
+      false
+    fi
+  done
+
+  # Both object bounds are WIRED, not merely defined. The helpers have their own
+  # tests; a loop that stopped calling them would keep those green while losing
+  # the bound entirely, which is the same gap the selector call sites had.
+  for section in 'kubectl get vm -A --no-headers' 'kubectl get vmi -A --no-headers' 'kubectl get svc -A --no-headers'; do
+    loop=$(fold_source "$SCRIPT" | awk -v s="$section" 'index($0, s) > 0, /^  done/')
+    [ -n "$loop" ] || { echo "FAIL: could not locate the loop for $section"; false; }
+    printf '%s\n' "$loop" | grep -q 'cozyreport_admit_objects' || {
+      echo "FAIL: $section is not capped"; false
+    }
+    # The exact form, not just the name: `if ! cozyreport_objects_deadline_passed`
+    # satisfies a name check while inverting the bound -- a live budget would stop
+    # the walk on its first object and an expired one would let it run on.
+    printf '%s\n' "$loop" | grep -qE 'if[[:space:]]+cozyreport_objects_deadline_passed;[[:space:]]*then' || {
+      echo "FAIL: $section does not check the object budget in the expected form"
+      printf '%s\n' "$loop" | grep -n 'deadline_passed' || true
+      false
+    }
+    printf '%s\n' "$loop" | grep -q 'cozyreport_objects_budget_note' || {
+      echo "FAIL: $section breaks on the budget without recording that it did"; false
+    }
+    # And the SELECTOR read is bounded. The budget only starts counting once rows
+    # arrive, so an apiserver that hangs on the cluster-wide list spends the whole
+    # collection step without the deadline ever being consulted. Bounding the
+    # per-object reads and leaving the read that feeds them unbounded protects the
+    # cheap half of the loop and not the expensive one.
+    # Bounded AND status-keeping. A pipeline in dash has no pipefail, so a
+    # selector piped straight in loses its exit code: a read killed at 124 leaves
+    # no rows, no error and no marker, which is byte-identical to a cluster with
+    # nothing to select. cozyreport_select_objects does the read, keeps the
+    # status, and records the failure.
+    printf '%s\n' "$loop" | head -1 | grep -q 'cozyreport_select_objects' || {
+      echo "FAIL: the $section selector read does not keep its exit status"
+      printf '%s\n' "$loop" | head -1
+      false
+    }
+  done
+
+  # The services loop, on the same footing as vm/vmi: correcting its selector is
+  # what made the body reachable, so it is also what made a hang inside it
+  # possible. A section that never ran cannot have been bounded by accident.
+  svcloop=$(fold_source "$SCRIPT" | awk '/kubectl get svc -A --no-headers/,/^  done/')
+  [ -n "$svcloop" ] || { echo "FAIL: could not locate the services loop"; false; }
+  if printf '%s\n' "$svcloop" | grep -qE "^[[:space:]]+$KUBECTL_RE"; then
+    echo "FAIL: the services loop still has an unbounded kubectl read"
+    printf '%s\n' "$svcloop" | grep -nE "^[[:space:]]+$KUBECTL_RE"
+    false
+  fi
+  printf '%s\n' "$svcloop" | grep -q 'cozyreport_read_object' || {
+    echo "FAIL: the services loop does not use the bounded reader"
+    false
+  }
+
+  # The cozystack apps section, whose every read was gated on a CRD that does not
+  # exist. Two separate assertions, because the two kinds are reached two
+  # different ways and the old loop got both wrong the same way.
+  apps=$(fold_source "$SCRIPT" | awk '/^echo "Collecting cozystack apps/,/^echo "Collecting pods/')
+  [ -n "$apps" ] || { echo "FAIL: could not locate the cozystack apps section"; false; }
+  if printf '%s\n' "$apps" | grep -q 'get crd'; then
+    echo "FAIL: a cozystack apps read is gated on a CRD again"
+    printf '%s\n' "$apps" | grep -n 'get crd'
+    false
+  fi
+  # Tenants come from an aggregated APIService: a down API must arrive as
+  # kubectl's refusal in the file, which is what the bounded reader guarantees,
+  # rather than as an absent file that reads as a cluster with no tenants.
+  printf '%s\n' "$apps" | grep -q 'cozyreport_read_object "$DIR/tenants.txt"' || {
+    echo "FAIL: the tenant listing does not go through the bounded reader"
+    false
+  }
+  # ApplicationDefinition is cluster-scoped. `-A` there is the other half of the
+  # old loop's mistake, and it is silent: the namespace column prints <none>.
+  if printf '%s\n' "$apps" | grep -q 'applicationdefinitions.*-A'; then
+    echo "FAIL: a cluster-scoped kind is read with --all-namespaces"
+    false
+  fi
+
+  # Same wiring assertion for the services section, whose inline selector read the
+  # wrong column for its whole life. An inline `awk '$N == ...'` is unreachable
+  # from a test, so every one of them is a column index nobody has ever run
+  # against a real row -- which is how `$4 == "<pending>"` survived.
+  svc=$(fold_source "$SCRIPT" | awk '/kubectl get svc -A --no-headers/,/^  done/')
+  [ -n "$svc" ] || { echo "FAIL: could not locate the services loop"; false; }
+  printf '%s\n' "$svc" | grep -q 'cozyreport_svc_pending' || {
+    echo "FAIL: the services selection does not go through the shared helper"
+    printf '%s\n' "$svc" | head -3
+    false
+  }
+  if printf '%s\n' "$svc" | grep -qE '^kubectl get svc .*\| *awk '; then
+    echo "FAIL: the services selection still filters inline"
+    false
+  fi
+
+  # Asserting the two loops by name only guards the two that exist. The defect was
+  # that a section without a boundedness test drifted silently, and a section added
+  # next month would drift the same way -- so freeze the inventory of reads that do
+  # NOT go through the bounded reader. The file deliberately leaves those alone
+  # (its header says which sections are in scope and why), but the number must not
+  # grow without someone deciding to let it: a new unbounded section moves this
+  # count and fails here at the moment it is written, rather than when a degraded
+  # apiserver hangs it in production.
+  # Frozen as a per-section LIST, not as a total. A total does not distinguish the
+  # cases it is counted for: bounding one read in section A while adding an
+  # unbounded one to section B leaves the sum unchanged, so the guard stays silent
+  # while precisely the thing it exists to catch -- a new section reading straight
+  # into the tree -- ships. A swap of that shape leaves the total unmoved and the
+  # test green.
+  #
+  # Keyed by section rather than by line number: line numbers move with any edit
+  # above them, which would make this a standing false red that somebody deletes
+  # within a week. The list is also its own documentation -- it names which
+  # sections still read unbounded, so the follow-up that bounds them has its scope
+  # written down here rather than in a comment holding a third copy of the number.
+  #
+  # LC_ALL=C on the sort: without it the order depends on the caller's collation,
+  # so this guard passed on one machine and failed on another with an identical
+  # tree. A check whose verdict depends on the environment it runs in is not a
+  # check.
+  # Section header matched at ANY indentation, redirect matched by SHAPE.
+  #
+  # Both of those were wrong, and each blinded the guard to one of the two cases
+  # the comment above claims it catches. The header pattern was anchored at column
+  # zero, so the four sections that sit inside an `if` -- cert-manager,
+  # objectstorage, kamaji, linstor -- had their reads credited to whatever
+  # top-level section came last; that is why the frozen list said `pvcs=17` when
+  # the pvcs section has two. And the redirect pattern was an allowlist of three
+  # variable names, so the cert-manager loop writing into `$cdir` was invisible
+  # entirely. A new read added in that loop's own style moved nothing, and a swap
+  # between two sections sharing a bucket moved nothing either -- the exact swap
+  # the comment says per-section keying eliminated. It was verified once, between
+  # two sections that happened not to share a bucket.
+  #
+  # An allowlist of names is the same defect as the marker regex that enumerated
+  # known prefixes: it can only see the cases somebody already thought of.
+  # Folded before counting, and the redirect matched in both variable spellings:
+  # a read whose `>` sits one continuation down, or which writes to `${DIR}/x`
+  # rather than `$DIR/x`, is the same unbounded read and was invisible to a
+  # pattern that assumed one line and one form.
+  # The per-section inventory of unbounded reads that used to sit here is gone,
+  # and its replacement is the guard above: every read in the body is bounded, so
+  # the counts it froze are all zero and a table of zeroes says less than the
+  # sentence does. It was also blind by construction -- it matched a redirect to
+  # `$VAR/`, which no gate, selector or command substitution has -- so its numbers
+  # were "how many of a section's unbounded reads this pattern can see", and they
+  # were quoted as though they were all of them.
+  #
+  # What stays here is the BOUNDARY every one of these scans rests on. They all
+  # look for the bare name, so kubectl invoked by path, through a variable, or
+  # under sudo is invisible to them -- and an invisible read is reported as no
+  # read at all, which is the strongest possible result and the wrong one. Fail
+  # here instead, in the same commit that introduces the spelling.
+  offbeat=$(fold_source "$SCRIPT" \
+    | grep -nE '(^|[[:space:]|(])(/[A-Za-z0-9_/.-]*kubectl|sudo[[:space:]]+kubectl|\$\{?KUBECTL)' || true)
+  if [ -n "$offbeat" ]; then
+    echo "FAIL: kubectl is invoked in a form these scans cannot see:"
+    printf '%s\n' "$offbeat"
+    echo "Either keep invoking it by bare name, or widen the scans in the same commit."
+    false
+  fi
+}
+
+@test "a failed mktemp refuses to write the report to the filesystem root" {
+  tmp=$(mktemp -d)
+  bin="$tmp/bin"; mkdir -p "$bin"
+  for b in sh dash grep sed awk cat rm mkdir tail head cut ls date printf tar dirname basename; do
+    p=$(command -v "$b" 2>/dev/null) && ln -sf "$p" "$bin/$b"
+  done
+  printf '#!/bin/sh\nexit 1\n' > "$bin/mktemp"; chmod +x "$bin/mktemp"
+  printf '#!/bin/sh\nexit 0\n' > "$bin/kubectl"; chmod +x "$bin/kubectl"
+
+  # This file sets no errexit, so a failing `mktemp -d` leaves REPORT_PDIR empty
+  # and every path below becomes absolute from `/`. With no errexit a refused
+  # `mkdir -p` stops nothing: an unprivileged user gets an empty tree, but
+  # root in a container -- how CI runs this -- gets directories created at the
+  # filesystem root and a report written into the host's `/`.
+  out=$(cd "$tmp" && PATH="$bin" sh "$SCRIPT" 2>&1 || true)
+
+  printf '%s\n' "$out" | grep -q 'refusing to write a report to the filesystem root'
+  # And it stopped there: no section header from the body may appear.
+  if printf '%s\n' "$out" | grep -q 'Collecting Cozystack information'; then
+    echo "FAIL: the script carried on past an empty report directory"
+    printf '%s\n' "$out"
+    false
+  fi
+  rm -rf "$tmp"
+}
+
+@test "no live jsonpath nests one filter inside another" {
+  # kubectl rejects `[?( ... [?( ... )] ... )]` outright with "unterminated filter",
+  # client-side, before the read reaches the apiserver: its parser breaks on the
+  # FIRST `)` outside a quoted string and never tracks nesting. With stderr sent to
+  # /dev/null the caller sees an empty result, which is indistinguishable from a
+  # healthy cluster -- so the section renders as "everything is Ready" forever, and
+  # nothing in the artifact says otherwise.
+  #
+  # Two sites had this. One was found and fixed; the other sat in this same file
+  # and was found only because someone grepped the tree for the PATTERN rather than
+  # re-reading the fix. That is what this test is: the grep, kept.
+  #
+  # Comments are stripped first, because both files legitimately quote the broken
+  # form while explaining it -- the same false positive the EXIT-trap guard hit.
+  offenders=""
+  for f in cozyreport.sh cozyreport-summary.sh e2e-capture-previous-logs.sh; do
+    # Folded: the two halves of a nested filter can sit either side of a line
+    # continuation and concatenate into the forbidden form at runtime, which no
+    # per-line pattern sees.
+    if fold_source "$HACK_DIR/$f" | grep -qoE '\[\?\([^]]*\[\?\('; then
+      offenders="$offenders $f"
+    fi
+  done
+  if [ -n "$offenders" ]; then
+    echo "FAIL: jsonpath with a filter nested inside a filter in:$offenders"
+    echo "kubectl refuses to parse it; use --output=custom-columns, which takes one filter per column."
+    false
+  fi
+}
+
+@test "the budget overshoot the header states is the one the container loop takes" {
+  # The header and e2e-testing.md both put a number on how far past
+  # COZY_REPORT_PODS_BUDGET a run can go, and that number is a count of reads
+  # taken after the last deadline check -- not something either file can derive
+  # for itself. It has already been wrong twice: first stated per POD, which grows
+  # without bound as the container count grows, then per container LOG, when each
+  # container is read twice, current and previous, with no check between them.
+  #
+  # So pin the two counts the sentence rests on. Changing either -- adding a third
+  # read, or moving the check between the two logs -- fails here, next to the
+  # prose that has to change with it, rather than in a report whose ceiling
+  # quietly stopped matching its own documentation.
+  loop=$(awk '/^  for _ccp_c in \$_ccp_containers; do/,/^  done/' "$SCRIPT")
+  [ -n "$loop" ] || { echo "FAIL: could not locate the container loop"; false; }
+
+  reads=$(printf '%s\n' "$loop" | grep -c 'cozyreport_read_container_log ')
+  [ "$reads" -eq 2 ] || {
+    echo "FAIL: the container loop takes $reads bounded reads, the docs assume 2"
+    false
+  }
+  # Counted by the clock read, not by the knob's name: the name also appears in
+  # the comment above the check and in the `-n` test guarding it, so counting it
+  # answers "how often is the knob mentioned" while reading as "how often is the
+  # deadline checked". Every check reads the clock exactly once, and nothing else
+  # in this loop reads it at all.
+  checks=$(printf '%s\n' "$loop" | grep -c 'date +%s')
+  [ "$checks" -eq 1 ] || {
+    echo "FAIL: the container loop checks the deadline $checks times, the docs assume 1"
+    false
+  }
+
+  # And both files say so in the same terms. A guard on the code alone leaves the
+  # sentence free to drift, which is the failure being prevented.
+  grep -q "current AND previous log reads" "$SCRIPT" || {
+    echo "FAIL: the header no longer states the overshoot in terms of both reads"
+    false
+  }
+  grep -q "both log reads of one container" "$HACK_DIR/../docs/agents/e2e-testing.md" || {
+    echo "FAIL: e2e-testing.md no longer states the overshoot in terms of both reads"
+    false
+  }
+}
+
+@test "every marker file the docs promise is one the script can write" {
+  # The doc bullet is how a reader learns which filenames to look for in the
+  # tarball. A marker the script writes but the docs never name leaves whoever
+  # finds it with nothing explaining it; a marker the docs promise but the script
+  # never writes sends them grepping for a file that cannot exist, and they
+  # conclude the case did not arise. Tests pin the code side, so without this
+  # nothing holds the doc side to it.
+  doc="$HACK_DIR/../docs/agents/e2e-testing.md"
+  [ -f "$doc" ]
+  # Matched on the SHAPE of a marker name, not on a list of the suffixes anybody
+  # has used so far. Two earlier spellings enumerated: first the prefixes
+  # `(COLLECTION|CONTAINER-LOGS)-`, which was blind to logs-UNAVAILABLE.txt, then
+  # the suffixes `(UNAVAILABLE|TRUNCATED|FAILED|UNBOUNDED|NOTES)`, which was blind
+  # to CONTAINER-LOGS-BOUND.txt the moment it was added -- by the same commit that
+  # was relying on this guard to notice. An enumeration cannot report the case
+  # nobody thought of, and each fix to it only moves which case that is.
+  #
+  # Markers in this tree are SHOUTING names: capitals and hyphens, ending .txt.
+  # Nothing else in either file matches that shape, so the guard now asks what a
+  # marker looks like rather than what markers exist.
+  pat='[A-Z][A-Z-]+\.txt'
+  doc_names=$(grep -oE "$pat" "$doc" | sort -u)
+  code_names=$(grep -oE "$pat" "$SCRIPT" | sort -u)
+  [ -n "$doc_names" ] && [ -n "$code_names" ]
+  for n in $doc_names; do
+    if ! grep -q -- "$n" "$SCRIPT"; then
+      echo "FAIL: docs/agents/e2e-testing.md promises $n but hack/cozyreport.sh never writes it"
+      false
+    fi
+  done
+  # And the other direction: a marker the script
+  # writes and the docs never name leaves a reader who finds it in the tarball
+  # with nothing telling them what it means.
+  for n in $code_names; do
+    if ! grep -q -- "$n" "$doc"; then
+      echo "FAIL: hack/cozyreport.sh writes $n but docs/agents/e2e-testing.md never names it"
+      false
+    fi
+  done
+}
+
+@test "pods not ready keeps a running pod whose readiness probe never passed" {
+  out="$(printf '%s\n' "$SNAPSHOT" | cozyreport_pods_not_ready)"
+
+  printf '%s\n' "$out" | grep -q 'keycloak-db-2'
+}
+
+@test "pods not ready keeps a partially ready multi container pod" {
+  out="$(printf '%s\n' "$SNAPSHOT" | cozyreport_pods_not_ready)"
+
+  printf '%s\n' "$out" | grep -q 'satellite-v'
+}
+
+@test "pods not ready still keeps the non running phases collected before" {
+  out="$(printf '%s\n' "$SNAPSHOT" | cozyreport_pods_not_ready)"
+
+  printf '%s\n' "$out" | grep -q 'puller-z'
+  printf '%s\n' "$out" | grep -q 'unscheduled-w'
+}
+
+@test "pods not ready drops a fully ready running pod" {
+  out="$(printf '%s\n' "$SNAPSHOT" | cozyreport_pods_not_ready)"
+
+  # `! cmd` is vacuous under cozytest's `set -e` (errexit is suppressed for
+  # any command whose status is inverted with `!`), so a regression that let
+  # this row through would not fail the test. Assert the absence via
+  # `if cmd; then ...; false`.
+  if printf '%s\n' "$out" | grep -q 'coredns-abc'; then echo "FAIL: a ready pod must not be collected"; false; fi
+}
+
+@test "a pod held unready by a readiness gate is outside what the column can see" {
+  # The known gap, pinned rather than claimed away. READY counts ready CONTAINERS;
+  # the pod's Ready condition is a different fact, and `spec.readinessGates` is
+  # where they part: every container passes its probe, the column prints 1/1, and
+  # `status.conditions[type=Ready]` is still False because a gate the kubelet does
+  # not evaluate has not been satisfied. Such a pod gets no per-pod evidence.
+  #
+  # This is a deliberate trade, not an oversight -- the alternative is a
+  # structured read per pod in place of one cluster-wide list, on the report of a
+  # cluster that is already failing -- and it is here so that changing the trade
+  # has to start by changing this test, and so that a reader chasing a missing pod
+  # directory finds the reason instead of an empty tree.
+  gated='tenant-a  gated-0  1/1  Running  0  4m'
+
+  if [ -n "$(printf '%s\n' "$gated" | cozyreport_pods_not_ready)" ]; then
+    echo "FAIL: the selection now sees something this column does not carry"
+    false
+  fi
+}
+
+@test "pods not ready drops finished pods that legitimately end unready" {
+  out="$(printf '%s\n' "$SNAPSHOT" | cozyreport_pods_not_ready)"
+
+  # A Completed/Succeeded pod sits at READY=0/1 forever. Selecting it would bury
+  # the real failures under every job the suite ever ran.
+  if printf '%s\n' "$out" | grep -q 'migrate-job-x'; then echo "FAIL: a Completed pod must not be collected"; false; fi
+  if printf '%s\n' "$out" | grep -q 'backup-job-y'; then echo "FAIL: a Succeeded pod must not be collected"; false; fi
+}
+
+@test "pods not ready selects exactly the four broken rows of the snapshot" {
+  out="$(printf '%s\n' "$SNAPSHOT" | cozyreport_pods_not_ready)"
+
+  # Pins the count as well as the membership, so a widened predicate that starts
+  # dragging healthy pods into the report fails here rather than quietly
+  # doubling the size of every artifact.
+  [ "$(printf '%s\n' "$out" | grep -c .)" -eq 4 ]
+}
+
+@test "kubevirt not ready keeps a running vmi whose guest never became ready" {
+  # KubeVirt prints NAMESPACE NAME AGE PHASE IP NODENAME READY. A VMI at
+  # Phase=Running with Ready=False is a guest that never booted or a guest-agent
+  # that never connected, and a PHASE filter drops exactly that -- the same blind
+  # spot a STATUS-only pod filter has, in the same script.
+  rows="$(printf '%s\n' \
+    'tenant-test  vm-booted     13h  Running  10.244.0.5  node0  True' \
+    'tenant-test  vm-no-agent   13h  Running  10.244.0.6  node1  False' \
+    'tenant-test  vm-pending    5m   Pending  False' \
+    'tenant-test  vm-no-ip      13h  Running  node2  True')"
+
+  out="$(printf '%s\n' "$rows" | cozyreport_kubevirt_not_ready)"
+
+  printf '%s\n' "$out" | grep -q 'vm-no-agent'
+  # The Pending row has no IP and no node, so it prints five fields where a Running
+  # one prints seven.
+  printf '%s\n' "$out" | grep -q 'vm-pending'
+  if printf '%s\n' "$out" | grep -q 'vm-booted'; then echo "FAIL: collected a ready VMI"; false; fi
+  # Six fields: node assigned, IP not reported yet, and Ready=True. This is the row
+  # that makes $NF load-bearing -- a fixed $7 is empty here and would drag a ready
+  # VMI into the report.
+  if printf '%s\n' "$out" | grep -q 'vm-no-ip'; then echo "FAIL: read READY from a fixed column"; false; fi
+  [ "$(printf '%s\n' "$out" | grep -c .)" -eq 2 ]
+}
+
+@test "the vm selector narrows rather than widens on a short row" {
+  # The header's scoping argument names which sections changed and how. VM was
+  # already READY-based on main (`$5 != "True"`), so reading $NF NARROWS it: on a
+  # row whose STATUS is nil the fixed $5 is empty, empty is not "True", and a
+  # healthy VM was collected as broken. New is a strict subset of old here, unlike
+  # pods and VMIs which were genuinely widened. The header claimed all three were
+  # widened; this pins the distinction so the claim cannot drift back.
+  # Narrowing is only safe if it drops exactly the healthy rows. A selector that
+  # dropped every short row would trade a false positive for a MISS, and a miss is
+  # dearer in a collector: an over-collected object the operator sees and discards,
+  # a skipped one does not exist. So both short-row cases are pinned, not just the
+  # healthy one.
+  healthy_short='tenant-test  vm-c  5m  True'
+  broken_short='tenant-test  vm-d  5m  False'
+
+  [ -n "$(printf '%s\n' "$healthy_short" | awk '$5 != "True"')" ] ||
+    { echo "FAIL: fixture no longer models the over-collection"; false; }
+  if [ -n "$(printf '%s\n' "$healthy_short" | cozyreport_kubevirt_not_ready)" ]; then
+    echo "FAIL: the new selector still collects a healthy VM on a short row"
+    false
+  fi
+  # The other half: a short row that is genuinely not Ready must survive. $NF is
+  # positional, but it is fail-safe by construction -- anything whose last field is
+  # not literally "True" is collected, so an absent READY column over-collects
+  # rather than skipping.
+  if [ -z "$(printf '%s\n' "$broken_short" | cozyreport_kubevirt_not_ready)" ]; then
+    echo "FAIL: a not-Ready VM on a short row was skipped"
+    false
+  fi
+  # The other section's direction, so "which one widened" has an executable
+  # counterpart rather than only prose: a VMI at Phase=Running with Ready=False is
+  # what the old `$4 != "Running"` filter dropped and the shared selector keeps.
+  vmi_widened='tenant-test  worker-0  12m  Running  10.244.1.5  node1  False'
+  [ -z "$(printf '%s\n' "$vmi_widened" | awk '$4 != "Running"')" ] ||
+    { echo "FAIL: fixture no longer models the VMI blind spot"; false; }
+  if [ -z "$(printf '%s\n' "$vmi_widened" | cozyreport_kubevirt_not_ready)" ]; then
+    echo "FAIL: a Running VMI whose guest never became ready is still dropped"
+    false
+  fi
+
+  # And an absent READY column entirely: unknown readiness is collected, not
+  # assumed healthy.
+  for unknown in 'tenant-test  vm-e  5m  Running' 'tenant-test  vm-f  5m'; do
+    if [ -z "$(printf '%s\n' "$unknown" | cozyreport_kubevirt_not_ready)" ]; then
+      echo "FAIL: a VM with no READY column was treated as Ready: $unknown"
+      false
+    fi
+  done
+}
+
+@test "kubevirt not ready reads the vm layout by the same last column" {
+  # The VM section shares this helper with the VMI section above, and its rows have
+  # a different shape: NAMESPACE NAME AGE STATUS READY, five fields against seven.
+  # Reading READY as $NF is what lets one predicate serve both, so both layouts are
+  # pinned here -- otherwise the VM half is a behaviour nobody can regress-test,
+  # which is how its selector drifted from its twin in the first place.
+  rows="$(printf '%s\n' \
+    'tenant-test  vm-up       13h  Running       True' \
+    'tenant-test  vm-stopped  13h  Stopped       False' \
+    'tenant-test  vm-fresh    3s   True' \
+    'tenant-test  vm-prov     40s  Provisioning  False')"
+
+  out="$(printf '%s\n' "$rows" | cozyreport_kubevirt_not_ready)"
+
+  printf '%s\n' "$out" | grep -q 'vm-stopped'
+  printf '%s\n' "$out" | grep -q 'vm-prov'
+  if printf '%s\n' "$out" | grep -q 'vm-up'; then echo "FAIL: collected a ready VM"; false; fi
+  # The row that makes $NF load-bearing on this layout: `.status.printableStatus`
+  # is nil on a freshly created VM, so STATUS is absent and the row collapses to
+  # four fields. A fixed $5 reads empty here, and empty is not "True", so the old
+  # selector dragged this healthy VM into the report -- fail-safe in direction, but
+  # still a healthy VM reported as broken, on every cluster with a VM being created.
+  if printf '%s\n' "$out" | grep -q 'vm-fresh'; then echo "FAIL: read READY from a fixed column"; false; fi
+  [ "$(printf '%s\n' "$out" | grep -c .)" -eq 2 ]
+}
+
+@test "pods prioritize matches the namespace field and not a row substring" {
+  # Mirror of the sibling test in hack/capture-previous-logs.bats, which that
+  # file's comment says this helper follows. The claim was never checked here:
+  # swapping index($1, p) for index($0, p) left all 102 tests green.
+  #
+  # The fixture that bites is a pod NAMED like the prefix but living elsewhere --
+  # routine, since controllers are often named after what they manage. Matching the
+  # whole row promotes it ahead of the genuine tenant pod and spends the cap on it.
+  rows="$(printf '%s\n' \
+    'cozy-system   tenant-controller-abc  0/1  Running  0  5m' \
+    'tenant-test   real-one               0/1  Running  0  5m' \
+    'kube-system   other                  0/1  Running  0  5m')"
+
+  out="$(printf '%s\n' "$rows" | COZY_REPORT_PREFER_NS=tenant- cozyreport_pods_prioritize)"
+
+  first=$(printf '%s\n' "$out" | sed -n '1p' | awk '{print $2}')
+  if [ "$first" != "real-one" ]; then
+    echo "FAIL: expected the tenant-namespace pod first, got '$first' (matched the whole row)"
+    printf '%s\n' "$out"
+    false
+  fi
+  # Reordering never drops.
+  [ "$(printf '%s\n' "$out" | grep -c .)" -eq 3 ]
+}
+
+@test "kubevirt not ready drops the blank line an empty selection arrives as" {
+  # An unguarded predicate emits a blank row straight back: `$NF` on an empty line
+  # is `$0`, which is "" and therefore not "True". The caller's
+  # `while read NAMESPACE NAME` then runs once with both empty and makes a
+  # directory named for nothing.
+  #
+  # Counted with `wc -l` and not `grep -c .`, and deliberately not routed through
+  # `$(...)` first: a blank line is exactly what both of those erase. `grep -c .`
+  # counts non-empty lines, and command substitution strips the trailing newline,
+  # so the obvious spelling of this assertion passes whether or not the guard is
+  # there: that spelling passes with the guard removed.
+  count=$(printf '\n' | cozyreport_kubevirt_not_ready | wc -l | tr -d ' ')
+
+  [ "$count" -eq 0 ]
+}
+
+# One `kubectl get svc -A --no-headers` snapshot, covering every shape the
+# EXTERNAL-IP column takes: a LoadBalancer waiting for an address, one that got
+# it, a ClusterIP, and a headless service whose CLUSTER-IP is `None`.
+svc_rows="$(printf '%s\n' \
+  'default       kubernetes   ClusterIP     10.96.0.1      <none>          443/TCP    30d' \
+  'tenant-a      ingress      LoadBalancer  10.96.14.7     <pending>       80:31000/TCP,443:31001/TCP  4m' \
+  'tenant-b      ingress      LoadBalancer  10.96.14.9     198.51.100.10   80:31002/TCP  6d' \
+  'cozy-system   etcd         ClusterIP     None           <none>          2379/TCP   30d')"
+
+@test "the object loops admit at most their cap and name what they left out" {
+  rows=""
+  i=1
+  while [ "$i" -le 30 ]; do
+    rows="$rows
+tenant-a  obj-$i  <pending>"
+    i=$((i + 1))
+  done
+
+  tmp=$(mktemp -d)
+  REPORT_DIR="$tmp" mkdir -p "$tmp/kubernetes"
+  out=$(printf '%s\n' "$rows" | REPORT_DIR="$tmp" cozyreport_admit_objects "services")
+
+  # Thirty selected, the cap admits its own number, and the overflow is named in
+  # the artifact rather than dropped. The pod walk has had both bounds since this
+  # change; the object loops had only a per-read ceiling, which bounds one read
+  # and not their number -- and correcting the services selector is what made a
+  # large selection reachable in the first place.
+  [ "$(printf '%s\n' "$out" | grep -c .)" -eq "$COZYREPORT_OBJECTS_DEFAULT" ]
+  # "admitted", not "collected". This helper runs before the loop reads anything,
+  # so it can only report what the cap let through; on an expired budget the walk
+  # then collects none of them, and a note saying "25 collected" would name
+  # twenty-five directories that do not exist.
+  grep -q "services: 30 selected, $COZYREPORT_OBJECTS_DEFAULT admitted by the cap" \
+    "$tmp/kubernetes/COLLECTION-TRUNCATED.txt"
+  if grep -q "$COZYREPORT_OBJECTS_DEFAULT collected" "$tmp/kubernetes/COLLECTION-TRUNCATED.txt"; then
+    echo "FAIL: the cap note claims objects were collected before the walk ran"
+    cat "$tmp/kubernetes/COLLECTION-TRUNCATED.txt"
+    false
+  fi
+  rm -rf "$tmp"
+}
+
+@test "a pod walk keeps the pods a dying list managed to name" {
+  tmp=$(mktemp -d)
+  collect_stub_dir "$tmp"
+  export STUB_ARGV="$tmp/argv"
+  rows="$(printf '%s\n' 'tenant-a  broken-0  0/1  CrashLoopBackOff  7  4m' \
+                        'tenant-a  broken-1  0/1  CrashLoopBackOff  5  4m')"
+
+  PATH="$tmp:$PATH" STUB_PODLIST_FAIL=partial STUB_POD_ROWS="$rows" \
+    cozyreport_collect_broken_pods "$tmp/pods"
+
+  # Before the read was moved into a variable, these rows flowed down the pipe and
+  # were collected. Keeping the exit status is the point of that move; throwing
+  # the rows away was not, and the note then said nothing was ever looked at while
+  # kubectl had just named two crash-looping tenants.
+  [ -d "$tmp/pods/tenant-a/broken-0" ] || {
+    echo "FAIL: a pod the list named before dying was not collected"
+    find "$tmp/pods" -maxdepth 3 | head
+    false
+  }
+  grep -q 'before it stopped, and there may be others' "$tmp/pods/COLLECTION-FAILED.txt" || {
+    echo "FAIL: a partial list is not described as partial"
+    cat "$tmp/pods/COLLECTION-FAILED.txt"
+    false
+  }
+  if grep -q 'nothing was ever looked at' "$tmp/pods/COLLECTION-FAILED.txt"; then
+    echo "FAIL: a partial list claims nothing was looked at"
+    false
+  fi
+  rm -rf "$tmp"
+}
+
+@test "a selector keeps the objects a dying read managed to name" {
+  tmp=$(mktemp -d); mkdir -p "$tmp/kubernetes"
+  fake="$tmp/fakectl"
+  printf '#!/bin/sh\nprintf "tenant-a  ingress  <pending>\\n"\necho "error: unexpected EOF" >&2\nexit 1\n' > "$fake"
+  chmod +x "$fake"
+
+  out=$(REPORT_DIR="$tmp" COZYREPORT_BOUND="" cozyreport_select_objects "services" "$fake")
+
+  printf '%s\n' "$out" | grep -q 'ingress' || {
+    echo "FAIL: the row the read named before dying was dropped"; false
+  }
+  grep -q 'before it stopped, and there may be others' "$tmp/kubernetes/COLLECTION-FAILED.txt" || {
+    echo "FAIL: the partial selection is described as empty"
+    cat "$tmp/kubernetes/COLLECTION-FAILED.txt"
+    false
+  }
+  rm -rf "$tmp"
+}
+
+@test "a summary read keeps the rows a dying read managed to print" {
+  tmp=$(mktemp -d)
+  summary_stub_dir "$tmp"
+  rows="$(printf '%s\n' 'tenant-a  hr-1  4m  False  install failed one' \
+                        'tenant-a  hr-2  4m  False  install failed two')"
+
+  out="$(PATH="$tmp:$PATH" STUB_CRD_PRESENT=1 STUB_HR_ROWS="$rows" STUB_HR_FAIL=partial \
+    sh "$HACK_DIR/cozyreport-summary.sh" 2>/dev/null)"
+
+  # The first section of the first file a triager opens, and `kubectl get hr -A`
+  # on a broken cluster is the read most likely to be cut off at the 30s ceiling.
+  printf '%s\n' "$out" | grep -q 'hr-1' || {
+    echo "FAIL: rows printed before the failure were discarded"; printf '%s\n' "$out"; false
+  }
+  printf '%s\n' "$out" | grep -q 'before it stopped, and there may be others' || {
+    echo "FAIL: a partial read is described as an empty section"
+    printf '%s\n' "$out"
+    false
+  }
+  rm -rf "$tmp"
+}
+
+@test "a selector read that never returned is not rendered as an empty cluster" {
+  tmp=$(mktemp -d); mkdir -p "$tmp/kubernetes"
+  fake="$tmp/fakectl"; printf '#!/bin/sh\nexit 124\n' > "$fake"; chmod +x "$fake"
+
+  out=$(REPORT_DIR="$tmp" COZYREPORT_BOUND="" cozyreport_select_objects "services" "$fake")
+
+  # A pipeline in dash has no pipefail, so piping the selector straight into the
+  # filter throws its exit code away: a read killed at its own deadline produces
+  # no rows, no error and no marker, and the section renders exactly like a
+  # cluster that has nothing pending. That is the same ambiguity the pod list is
+  # read separately to avoid.
+  [ -z "$out" ] || { echo "FAIL: a failed selector produced rows"; false; }
+  grep -q 'services: the selection read did not return (exit 124)' \
+    "$tmp/kubernetes/COLLECTION-FAILED.txt"
+  rm -rf "$tmp"
+}
+
+@test "a selector failing before its marker directory exists still records it" {
+  # Every note this function writes goes under $REPORT_DIR/kubernetes, and that
+  # directory is created part way down the report -- after the cozystack and
+  # cert-manager sections, both of which now select through here. A redirect into
+  # a directory that does not exist fails, `|| true` swallows the failure, and the
+  # marker is gone: the function whose whole job is that a failed selection cannot
+  # pass for an empty cluster would have failed silently in exactly the sections
+  # that run first.
+  #
+  # The directory is deliberately NOT created here, which is the whole test.
+  tmp=$(mktemp -d)
+  fake="$tmp/fakectl"; printf '#!/bin/sh\nexit 124\n' > "$fake"; chmod +x "$fake"
+
+  REPORT_DIR="$tmp" COZYREPORT_BOUND="" cozyreport_select_objects "cozystack configmaps" "$fake" >/dev/null
+
+  [ -f "$tmp/kubernetes/COLLECTION-FAILED.txt" ] || {
+    echo "FAIL: the marker was lost because its directory did not exist yet"
+    ls -R "$tmp"
+    false
+  }
+  grep -q 'cozystack configmaps' "$tmp/kubernetes/COLLECTION-FAILED.txt"
+  rm -rf "$tmp"
+}
+
+@test "an empty listing says so in the file instead of arriving as zero bytes" {
+  # `kubectl get` writes `No resources found` to STDERR and exits 0
+  # (kubernetes/kubectl#1667), so an empty list reaches the reader as "succeeded,
+  # wrote nothing, and said something". Routed beside the file, that leaves a
+  # zero-byte `orders.txt` -- the exact "returned nothing, or never ran" question
+  # this collector exists to answer -- plus a READ-WARNINGS.txt on every healthy
+  # run, because `orders` and `challenges` are empty on any install with no ACME
+  # issuer. Before these listings moved onto the bounded reader their `2>&1` put
+  # the sentence in the file, where a person finds it.
+  tmp=$(mktemp -d)
+  fake="$tmp/fakectl"
+  printf '#!/bin/sh\necho "No resources found in cozy-system namespace." >&2\nexit 0\n' > "$fake"
+  chmod +x "$fake"
+
+  COZYREPORT_BOUND="" cozyreport_read_object "$tmp/orders.txt" "$fake"
+
+  [ -s "$tmp/orders.txt" ] || { echo "FAIL: an empty listing arrived as a zero-byte file"; false; }
+  grep -q 'No resources found' "$tmp/orders.txt"
+  if [ -f "$tmp/READ-WARNINGS.txt" ]; then
+    echo "FAIL: an ordinary empty list filed a warnings marker on a healthy run"
+    cat "$tmp/READ-WARNINGS.txt"
+    false
+  fi
+
+  # The YAML side keeps the opposite rule, and for its own reason: an unprefixed
+  # kubectl line in a document a parser reads costs the whole document. Fixing the
+  # listing by loosening this would trade one unreadable file for another.
+  COZYREPORT_BOUND="" cozyreport_read_object "$tmp/pod.yaml" "$fake"
+  if grep -q '^No resources found' "$tmp/pod.yaml" 2>/dev/null; then
+    echo "FAIL: a bare kubectl line landed in a YAML document"
+    cat "$tmp/pod.yaml"
+    false
+  fi
+  grep -q 'No resources found' "$tmp/READ-WARNINGS.txt"
+  rm -rf "$tmp"
+}
+
+@test "a truncated controller log is marked the way a log is, not the way an object is" {
+  # The bounded reader used to write objects, describes and section listings only.
+  # It now also writes thirteen controller logs, and its marker was shaped for the
+  # first set: a `#` prefix, which is a YAML comment and nothing at all in a log,
+  # and the words "not because the object ended" about a file that is not an
+  # object. The platform's controllers log JSON per line, so the prefix is the
+  # part that matters -- `# [cozyreport] ...` is a line no reader of that file can
+  # take.
+  #
+  # The marker still goes INSIDE the log, which is the other half of this test.
+  # cozyreport_read_container_log appends its own TRUNCATED line into a partial
+  # log, so moving this one beside the file would have two readers in one tarball
+  # answering the same question two ways -- worse than either answer on its own.
+  tmp=$(mktemp -d)
+  exec_stub_dir "$tmp"
+
+  STUB_EXEC_MODE=cut PATH="$tmp/bin:$PATH" \
+    cozyreport_read_object "$tmp/out/controller.log" kubectl logs deploy/x --tail=2000
+
+  grep -q 'TRUNCATED' "$tmp/out/controller.log"
+  if grep -q '^# \[cozyreport\]' "$tmp/out/controller.log"; then
+    echo "FAIL: a log carries the YAML-comment marker, which is not a comment in a log"
+    tail -n 1 "$tmp/out/controller.log"
+    false
+  fi
+  if grep -q 'because the object ended' "$tmp/out/controller.log"; then
+    echo "FAIL: the marker on a log calls it an object"
+    tail -n 1 "$tmp/out/controller.log"
+    false
+  fi
+
+  # And the object side is unchanged: a YAML target still gets the prefix, or the
+  # fix would have traded one unparseable file for another.
+  STUB_EXEC_MODE=cut PATH="$tmp/bin:$PATH" \
+    cozyreport_read_object "$tmp/out/pod.yaml" kubectl get pod -o yaml
+  grep -q '^# \[cozyreport\] TRUNCATED' "$tmp/out/pod.yaml" || {
+    echo "FAIL: an object lost the comment prefix its parser needs"
+    tail -n 1 "$tmp/out/pod.yaml"
+    false
+  }
+  rm -rf "$tmp"
+}
+
+@test "an empty selection does not run the loop body once with an empty name" {
+  # `printf '%s\n' ""` emits a blank LINE, not nothing, so a selector that
+  # succeeded with no rows used to hand its caller one empty row. Every loop that
+  # existed before filtered with `NF &&` and dropped it; the loops that moved onto
+  # this selector filter on a named column instead -- `$2 != "Ready"` and friends
+  # -- and a blank line satisfies every one of them, because an absent field is
+  # not the string it is compared against.
+  #
+  # The cost is not a wasted iteration. The body runs with an empty name, reads
+  # `kubectl get node "" -o yaml`, and the refusal lands in the file the reader
+  # opens: a `nodes/node.yaml` holding "resource name may not be empty" reads as a
+  # failed read of a real node. Before the selector was wired in, kubectl printed
+  # nothing on an empty list and the loop simply never ran.
+  #
+  # Fixed once in the selector rather than seven times in its callers: every one
+  # of them routes through it, and the next loop to be added would need the guard
+  # again.
+  tmp=$(mktemp -d)
+  fake="$tmp/fakectl"; printf '#!/bin/sh\nexit 0\n' > "$fake"; chmod +x "$fake"
+
+  # The caller's exact shape, filter included, since the filter is half the defect.
+  ran=$(REPORT_DIR="$tmp" COZYREPORT_BOUND="" cozyreport_select_objects "nodes" "$fake" |
+    awk '$2 != "Ready"' |
+    while read NAME _; do printf 'RAN[%s]\n' "$NAME"; done)
+
+  [ -z "$ran" ] || {
+    echo "FAIL: an empty selection still ran the loop body: $ran"
+    false
+  }
+  rm -rf "$tmp"
+}
+
+@test "a selector note lands beside the walk it describes, not in a shared file" {
+  # Twelve callers read a Kubernetes listing and their notes belong under
+  # kubernetes/. The LINSTOR satellite walk does not: its bundles land under
+  # linstor/error-reports/, and a note there saying the pod list came back short is
+  # the difference between "three bundles because three satellites" and "three
+  # because the list was cut off". Filed in the shared kubernetes file it is in a
+  # directory that reader has no reason to open.
+  tmp=$(mktemp -d)
+  fake="$tmp/fakectl"; printf '#!/bin/sh\nexit 124\n' > "$fake"; chmod +x "$fake"
+
+  COZYREPORT_SELECT_NOTE_DIR="$tmp/linstor/error-reports" \
+    REPORT_DIR="$tmp" COZYREPORT_BOUND="" \
+    cozyreport_select_objects "linstor satellites" "$fake" >/dev/null
+
+  [ -f "$tmp/linstor/error-reports/COLLECTION-FAILED.txt" ] || {
+    echo "FAIL: the note did not land beside the walk"; ls -R "$tmp"; false; }
+  if [ -f "$tmp/kubernetes/COLLECTION-FAILED.txt" ]; then
+    echo "FAIL: the note also went to the shared kubernetes file"; false; fi
+
+  # And the default is unchanged for every other caller.
+  COZYREPORT_SELECT_NOTE_DIR="" REPORT_DIR="$tmp" COZYREPORT_BOUND="" \
+    cozyreport_select_objects "nodes" "$fake" >/dev/null
+  grep -q 'nodes' "$tmp/kubernetes/COLLECTION-FAILED.txt"
+  rm -rf "$tmp"
+}
+
+@test "a selector that succeeds leaves no marker directory behind it" {
+  # The other half: creating the directory on every call would put an empty
+  # kubernetes/ into reports that never needed one, and an empty directory in this
+  # tree is a thing a reader interprets.
+  tmp=$(mktemp -d)
+  fake="$tmp/fakectl"; printf '#!/bin/sh\nprintf "ns name\\n"\n' > "$fake"; chmod +x "$fake"
+
+  out=$(REPORT_DIR="$tmp" COZYREPORT_BOUND="" cozyreport_select_objects "nodes" "$fake")
+
+  [ "$out" = "ns name" ]
+  if [ -d "$tmp/kubernetes" ]; then
+    echo "FAIL: a clean selection created the failure-marker directory anyway"
+    false
+  fi
+  rm -rf "$tmp"
+}
+
+@test "a refused selector carries kubectl's reason, not only its exit code" {
+  tmp=$(mktemp -d); mkdir -p "$tmp/kubernetes"
+  fake="$tmp/fakectl"
+  # An RBAC refusal, deliberately NOT the "no such resource type" wording. Both
+  # exit 1, and "the selection read did not return (exit 1)" names a symptom with
+  # no cause -- but they are opposite findings: one is the cluster correctly saying
+  # it does not run KubeVirt, the other is this report being unable to look. The
+  # not-served case has its own test and lands in COLLECTION-NOTES.txt; this one is
+  # a real collection failure and has to keep both the marker and the message.
+  printf '#!/bin/sh\necho "Error from server (Forbidden): virtualmachines.kubevirt.io is forbidden: User \\"system:serviceaccount:cozy-system:reporter\\" cannot list resource \\"virtualmachines\\" in API group \\"kubevirt.io\\" at the cluster scope" >&2\nexit 1\n' > "$fake"
+  chmod +x "$fake"
+
+  REPORT_DIR="$tmp" COZYREPORT_BOUND="" cozyreport_select_objects "virtualmachines" "$fake" >/dev/null
+
+  grep -q "is forbidden" "$tmp/kubernetes/COLLECTION-FAILED.txt" || {
+    echo "FAIL: the refusal reached the artifact without its reason"
+    cat "$tmp/kubernetes/COLLECTION-FAILED.txt" 2>/dev/null || echo "(no COLLECTION-FAILED.txt at all)"
+    false
+  }
+  # And it must NOT be filed as an ordinary absence: a refusal this report cannot
+  # see past is exactly what the FAILED marker exists to name.
+  if [ -f "$tmp/kubernetes/COLLECTION-NOTES.txt" ]; then
+    echo "FAIL: an RBAC refusal was recorded as a resource type the cluster does not serve"
+    cat "$tmp/kubernetes/COLLECTION-NOTES.txt"
+    false
+  fi
+  rm -rf "$tmp"
+}
+
+@test "a selector killed by its own bound names the cutoff, not a refusal" {
+  tmp=$(mktemp -d); mkdir -p "$tmp/kubernetes"
+  fake="$tmp/fakectl"; printf '#!/bin/sh\nexit 124\n' > "$fake"; chmod +x "$fake"
+
+  REPORT_DIR="$tmp" cozyreport_select_objects "services" "$fake" >/dev/null
+
+  # Timeout branch first, as everywhere else: a read killed before kubectl wrote
+  # anything has an empty stderr by construction, so leading with "without a
+  # message" would report the accident rather than the cause.
+  grep -q 'cut off by' "$tmp/kubernetes/COLLECTION-FAILED.txt" || {
+    echo "FAIL: a killed selector is not described as cut off"
+    cat "$tmp/kubernetes/COLLECTION-FAILED.txt"
+    false
+  }
+  if grep -q 'without a message' "$tmp/kubernetes/COLLECTION-FAILED.txt"; then
+    echo "FAIL: a killed selector is reported as a silent refusal"
+    false
+  fi
+  rm -rf "$tmp"
+}
+
+@test "a kind this cluster does not serve is a note, not a collection failure" {
+  tmp=$(mktemp -d); mkdir -p "$tmp/kubernetes"
+  fake="$tmp/fakectl"
+  # What kubectl says on an install without KubeVirt. `kubectl get vm -A` exits 1
+  # there, and that is the cluster answering correctly, not a read that failed.
+  printf '#!/bin/sh\necho %s >&2\nexit 1\n' \
+    "'error: the server doesn'\\''t have a resource type \"vm\"'" > "$fake"
+  chmod +x "$fake"
+
+  REPORT_DIR="$tmp" COZYREPORT_BOUND="" cozyreport_select_objects "virtualmachines" "$fake" >/dev/null
+
+  # COLLECTION-FAILED.txt is the filename a triager scans the tree for. Filing an
+  # ordinary absence under it makes the name cry wolf on every install without
+  # KubeVirt, and a marker that fires on healthy clusters is one a reader learns
+  # to skip -- which costs the runs where it names something real.
+  if [ -f "$tmp/kubernetes/COLLECTION-FAILED.txt" ]; then
+    echo "FAIL: a resource type this cluster does not serve was recorded as a failed read"
+    cat "$tmp/kubernetes/COLLECTION-FAILED.txt"
+    false
+  fi
+  grep -q 'does not serve that resource type' "$tmp/kubernetes/KIND-NOT-SERVED.txt" || {
+    echo "FAIL: the absence was not recorded anywhere at all"
+    ls -la "$tmp/kubernetes"
+    false
+  }
+  # kubectl's own words are kept: "absent" and "RBAC refused the list" both reach
+  # this branch only through what kubectl said, so the sentence has to carry it.
+  grep -q "resource type" "$tmp/kubernetes/KIND-NOT-SERVED.txt"
+  # And NOT under COLLECTION-NOTES.txt, which one directory down already means
+  # "a knob value the collector could not use". Two subjects behind one filename
+  # is a collision the marker guard cannot see, because it matches basenames and
+  # the doc names that file for the other meaning.
+  if [ -f "$tmp/kubernetes/COLLECTION-NOTES.txt" ]; then
+    echo "FAIL: reused the knob-note filename for a statement about the cluster"
+    cat "$tmp/kubernetes/COLLECTION-NOTES.txt"
+    false
+  fi
+  rm -rf "$tmp"
+}
+
+@test "a selector that returned nothing says nothing at all" {
+  tmp=$(mktemp -d); mkdir -p "$tmp/kubernetes"
+  fake="$tmp/fakectl"; printf '#!/bin/sh\nexit 0\n' > "$fake"; chmod +x "$fake"
+
+  REPORT_DIR="$tmp" COZYREPORT_BOUND="" cozyreport_select_objects "services" "$fake" >/dev/null
+
+  # The converse: a healthy cluster with no pending LoadBalancer must not leave a
+  # failure marker. Reporting every empty selection as a failure would make the
+  # marker meaningless, which is the same defect in the other direction.
+  if [ -f "$tmp/kubernetes/COLLECTION-FAILED.txt" ]; then
+    echo "FAIL: an empty selection was recorded as a failed read"
+    cat "$tmp/kubernetes/COLLECTION-FAILED.txt"
+    false
+  fi
+  rm -rf "$tmp"
+}
+
+@test "a log cut short at both ends names both bounds, not just the visible one" {
+  tmp=$(mktemp -d)
+  collect_stub_dir "$tmp"
+  export STUB_ARGV="$tmp/argv"
+
+  PATH="$tmp:$PATH" STUB_LOG_MODE=partial cozyreport_collect_pod ns hung-0 "$tmp/out"
+
+  # Two bounds applied to this file: `--tail` dropped its oldest lines and the cut
+  # dropped its newest. The end-truncation marker was recorded and the tail bound
+  # was not, because the tail note sat in the branch reached only after a clean
+  # read. Naming one while the other stays silent is worse than naming neither: it
+  # tells the reader the file begins where the container did.
+  grep -q '^\[cozyreport\] TRUNCATED' "$tmp/out/logs-app.txt"
+  grep -q 'holds at most the last 2000 lines' "$tmp/out/CONTAINER-LOGS-BOUND.txt" || {
+    echo "FAIL: a partial log does not record the tail bound it was read under"
+    ls "$tmp/out"
+    false
+  }
+  rm -rf "$tmp"
+}
+
+@test "a walk stopped by the object budget says so instead of vanishing" {
+  tmp=$(mktemp -d); mkdir -p "$tmp/kubernetes"
+
+  REPORT_DIR="$tmp" cozyreport_objects_budget_note "services"
+
+  # The cap has a note and the budget did not, so objects removed by the clock
+  # disappeared with nothing recording it -- and when both bounds were in play the
+  # cap's note took the blame for omissions the clock caused. Every other bound in
+  # this tree names itself; this one was silent.
+  grep -q 'services: the .*s object budget elapsed' "$tmp/kubernetes/COLLECTION-TRUNCATED.txt"
+  rm -rf "$tmp"
+}
+
+@test "an object loop under its cap reports no overflow at all" {
+  tmp=$(mktemp -d)
+  mkdir -p "$tmp/kubernetes"
+  out=$(printf 'tenant-a  only-one  <pending>\n' | REPORT_DIR="$tmp" cozyreport_admit_objects "services")
+
+  [ "$(printf '%s\n' "$out" | grep -c .)" -eq 1 ]
+  if [ -f "$tmp/kubernetes/COLLECTION-TRUNCATED.txt" ]; then
+    echo "FAIL: claimed an overflow that did not happen"
+    cat "$tmp/kubernetes/COLLECTION-TRUNCATED.txt"
+    false
+  fi
+  rm -rf "$tmp"
+}
+
+@test "the object walk stops on its budget instead of the job's outer limit" {
+  # The deadline is checked between objects, never inside one, so a file that
+  # exists is a file that was read whole. Past the deadline the loop admits
+  # nothing further.
+  COZYREPORT_OBJECTS_DEADLINE=$(( $(date +%s) - 1 ))
+  cozyreport_objects_deadline_passed || { echo "FAIL: an expired budget is not seen as expired"; false; }
+
+  COZYREPORT_OBJECTS_DEADLINE=$(( $(date +%s) + 600 ))
+  if cozyreport_objects_deadline_passed; then
+    echo "FAIL: a live budget is reported as spent"
+    false
+  fi
+
+  # And with no deadline set at all -- a caller driving the helpers directly --
+  # the walk is not silently stopped on its first object.
+  unset COZYREPORT_OBJECTS_DEADLINE
+  if cozyreport_objects_deadline_passed; then
+    echo "FAIL: an unset budget stops the walk"
+    false
+  fi
+}
+
+@test "a LoadBalancer waiting for an address is selected by its external column" {
+  out="$(printf '%s\n' "$svc_rows" | cozyreport_svc_pending)"
+
+  # `<pending>` is printed only for EXTERNAL-IP, which is $5. The selection read
+  # $4 -- CLUSTER-IP, which holds an address, `None` or `<none>` and never
+  # `<pending>` -- so it matched nothing on any cluster and the services directory
+  # has been empty since the section was written, which a reader takes to mean no
+  # LoadBalancer is stuck. A tenant whose ingress never gets an address is exactly
+  # the failure this section is for.
+  [ "$(printf '%s\n' "$out" | wc -l | tr -d ' ')" -eq 1 ]
+  case "$out" in
+    "tenant-a      ingress"*) ;;
+    *) echo "FAIL: selected the wrong row: $out"; false ;;
+  esac
+}
+
+@test "a service that already has an address or never wanted one is left alone" {
+  # The converse of the test above: widening the column is only correct if it does
+  # not also start collecting every healthy service. `None` and `<none>` are the
+  # two spellings that would match a sloppier test for "no address yet".
+  for row in \
+    'default       kubernetes   ClusterIP     10.96.0.1      <none>         443/TCP   30d' \
+    'tenant-b      ingress      LoadBalancer  10.96.14.9     198.51.100.10  80:31002/TCP  6d' \
+    'cozy-system   etcd         ClusterIP     None           <none>         2379/TCP  30d'
+  do
+    if [ -n "$(printf '%s\n' "$row" | cozyreport_svc_pending)" ]; then
+      echo "FAIL: collected a service that is not waiting: $row"
+      false
+    fi
+  done
+}
+
+@test "a service merely named like the pending marker is not collected" {
+  # Field-scoped, not an unanchored match on the row. A name cannot literally be
+  # `<pending>` on a cluster, but the reason this selection is written as a column
+  # test rather than a substring test is the same reason the pod prioritiser is
+  # field-scoped, and a whole-row match would pass every other test in this file.
+  row='tenant-a      <pending>    ClusterIP     10.96.14.7     <none>    80/TCP   4m'
+
+  if [ -n "$(printf '%s\n' "$row" | cozyreport_svc_pending)" ]; then
+    echo "FAIL: matched the name column"
+    false
+  fi
+}
+
+# --------------------------------------------------------------------------- #
+# cozyreport_read_object -- the bounded whole-object read behind pod.yaml,       #
+# vm.yaml, vmi.yaml and the describes beside them. Three of those four are read  #
+# by a parser rather than by a person, which is what decides where stderr goes.  #
+#                                                                               #
+# cozytest.sh ends an @test at the first bare `}`, so the stub builder lives at  #
+# top level.                                                                     #
+# --------------------------------------------------------------------------- #
+
+# A stand-in for kubectl that writes a chosen mix of stdout, stderr and exit
+# status. read_object runs whatever argv it is handed, so nothing here has to be
+# named kubectl.
+object_stub() {
+  cat > "$1" <<'STUB'
+#!/bin/sh
+[ -z "$STUB_OUT" ] || printf '%s\n' "$STUB_OUT"
+[ -z "$STUB_ERR" ] || printf '%s\n' "$STUB_ERR" >&2
+exit "${STUB_RC:-0}"
+STUB
+  chmod +x "$1"
+}
+
+@test "a warning on a read that succeeded stays out of the object it belongs to" {
+  tmp=$(mktemp -d)
+  object_stub "$tmp/fakectl"
+
+  COZYREPORT_BOUND="" \
+  STUB_OUT="apiVersion: v1
+kind: Pod" \
+  STUB_ERR="Warning: v1 Pod is deprecated in this build" \
+  STUB_RC=0 \
+    cozyreport_read_object "$tmp/pod.yaml" "$tmp/fakectl"
+
+  # `2>&1` put the warning on line 1 and turned a complete object into a file no
+  # parser accepts -- and pod.yaml, vm.yaml and vmi.yaml are read by yq, not by
+  # eye. The same rule already applied two functions over in the log reader and in
+  # the summary's own read; this one was the exception, in the place where merging
+  # costs the most.
+  head -n 1 "$tmp/pod.yaml" | grep -q '^apiVersion:'
+  if grep -q 'Warning:' "$tmp/pod.yaml"; then
+    echo "FAIL: the warning landed in the object file"
+    cat "$tmp/pod.yaml"
+    false
+  fi
+  rm -rf "$tmp"
+}
+
+@test "a refusal with no object to show is still what the file holds" {
+  tmp=$(mktemp -d)
+  object_stub "$tmp/fakectl"
+
+  COZYREPORT_BOUND="" \
+  STUB_OUT="" \
+  STUB_ERR='Error from server (NotFound): pods "gone-0" not found' \
+  STUB_RC=1 \
+    cozyreport_read_object "$tmp/pod.yaml" "$tmp/fakectl"
+
+  # The converse of the test above, and the reason stderr is diverted rather than
+  # discarded: with no object to keep, kubectl's reason IS the evidence, and an
+  # empty pod.yaml says nothing about why. Keeping only the successful case would
+  # have traded one silent file for another.
+  grep -q 'pods "gone-0" not found' "$tmp/pod.yaml"
+  rm -rf "$tmp"
+}
+
+@test "an object read that died part way through says so instead of looking whole" {
+  tmp=$(mktemp -d)
+  object_stub "$tmp/fakectl"
+
+  COZYREPORT_BOUND="" \
+  STUB_OUT="apiVersion: v1
+kind: Pod
+metadata:" \
+  STUB_ERR='error: unexpected EOF' \
+  STUB_RC=1 \
+    cozyreport_read_object "$tmp/pod.yaml" "$tmp/fakectl"
+
+  # Diverting stderr opens a third outcome that the merged version could not have:
+  # kubectl wrote part of the object and then failed on its own terms. Without a
+  # marker the file is a valid-looking prefix and nothing says the rest was never
+  # read -- exactly the ambiguity the timeout marker exists to remove, arrived at
+  # by a different route. The reason rides on the marker line, not in the body,
+  # because the body is what gets parsed.
+  head -n 1 "$tmp/pod.yaml" | grep -q '^apiVersion:'
+  # Not anchored on the tool's name: the marker names whatever was run, which a
+  # test of its own pins. What matters here is that a partial object says so.
+  grep -q '^# \[cozyreport\] TRUNCATED.*exited 1 part way through' "$tmp/pod.yaml"
+  grep -q 'unexpected EOF' "$tmp/pod.yaml"
+  rm -rf "$tmp"
+}
+
+@test "a read that returned neither an object nor a message still says so" {
+  tmp=$(mktemp -d)
+  object_stub "$tmp/fakectl"
+
+  # The fourth outcome, and the one that was missing: kubectl died on a signal
+  # that is not 124 or 137 -- a teardown SIGTERM -- writing neither an object nor
+  # a word about why. Every other classification site in these scripts covers it;
+  # this one left pod.yaml and describe.txt at zero bytes with nothing in them,
+  # in a directory whose emptiness e2e-testing.md reads as a claim about the pod.
+  COZYREPORT_BOUND="" STUB_OUT="" STUB_ERR="" STUB_RC=143 \
+    cozyreport_read_object "$tmp/pod.yaml" "$tmp/fakectl"
+
+  [ -s "$tmp/pod.yaml" ] || { echo "FAIL: the file is empty and explains nothing"; false; }
+  grep -q '^# \[cozyreport\] [a-z]* *exited 143' "$tmp/pod.yaml"
+  rm -rf "$tmp"
+}
+
+@test "a lost stderr file is not turned into a claim that kubectl was silent" {
+  tmp=$(mktemp -d)
+  object_stub "$tmp/fakectl"
+
+  # The other way into that branch, and it is not about the cluster at all: with
+  # no writable temp dir the scratch file was never created, so stderr went to
+  # /dev/null. "kubectl said nothing" would then be a statement about the machine
+  # writing the report, dressed as one about the machine being reported on.
+  COZYREPORT_BOUND="" TMPDIR="$tmp/nonexistent" STUB_OUT="" \
+  STUB_ERR='Error from server (Forbidden): pods is forbidden' STUB_RC=1 \
+    cozyreport_read_object "$tmp/pod.yaml" "$tmp/fakectl" 2>/dev/null
+
+  grep -q 'could not be captured' "$tmp/pod.yaml"
+  if grep -q 'without a message' "$tmp/pod.yaml"; then
+    echo "FAIL: a lost message is reported as no message"
+    cat "$tmp/pod.yaml"
+    false
+  fi
+  rm -rf "$tmp"
+}
+
+@test "a warning on a successful read is kept beside the object, not dropped" {
+  tmp=$(mktemp -d)
+  object_stub "$tmp/fakectl"
+
+  COZYREPORT_BOUND="" \
+  STUB_OUT="apiVersion: v1
+kind: Pod" \
+  STUB_ERR="Warning: v1 Pod is deprecated in this build" \
+  STUB_RC=0 \
+    cozyreport_read_object "$tmp/pod.yaml" "$tmp/fakectl"
+
+  # Diverting stderr keeps the object parseable, which is the point. But "not in
+  # the object" and "not in the report" are different outcomes, and the second is
+  # a silent loss of evidence in a tree whose entire claim is that there are none.
+  # `2>&1` keeps the warning, at the cost of the object; a scratch file keeps both.
+  if grep -q 'Warning:' "$tmp/pod.yaml"; then
+    echo "FAIL: the warning is back inside the object"; false
+  fi
+  grep -q 'Warning: v1 Pod is deprecated' "$tmp/READ-WARNINGS.txt" || {
+    echo "FAIL: the warning was dropped from the report entirely"
+    ls "$tmp"
+    false
+  }
+  rm -rf "$tmp"
+}
+
+@test "every warning on a successful read is kept, not just the last one" {
+  tmp=$(mktemp -d)
+  object_stub "$tmp/fakectl"
+
+  COZYREPORT_BOUND="" \
+  STUB_OUT="apiVersion: v1" \
+  STUB_ERR="Warning: v1 Pod is deprecated in this build
+Warning: results are partial, 3 of 7 shards answered" \
+  STUB_RC=0 \
+    cozyreport_read_object "$tmp/pod.yaml" "$tmp/fakectl"
+
+  # `tail -n 1` is the right reduction for a FAILING read, where klog retry lines
+  # bury the cause and one line has to be chosen. A successful read has no
+  # preamble: every line is its own warning, and keeping the last one silently
+  # discards the rest. Two warnings on one read is ordinary -- a deprecation plus
+  # a partial-result notice is exactly what a degraded apiserver produces.
+  grep -q 'v1 Pod is deprecated' "$tmp/READ-WARNINGS.txt" || {
+    echo "FAIL: the first warning was dropped"; cat "$tmp/READ-WARNINGS.txt"; false
+  }
+  grep -q 'results are partial' "$tmp/READ-WARNINGS.txt" || {
+    echo "FAIL: the second warning was dropped"; cat "$tmp/READ-WARNINGS.txt"; false
+  }
+  rm -rf "$tmp"
+}
+
+@test "a partial container log keeps every line kubectl said, not just the last" {
+  tmp=$(mktemp -d)
+  collect_stub_dir "$tmp"
+  export STUB_ARGV="$tmp/argv"
+
+  PATH="$tmp:$PATH" COZYREPORT_BOUND="" STUB_LOG_MODE=partial_rc1_multi \
+    cozyreport_read_container_log "$tmp/logs-app.txt" current ns pod-1 app
+
+  # A PARTIAL read is where kubectl has the most to say -- the reset, the refusal
+  # that stopped it mid-stream -- and it was the one case that kept only the last
+  # line, inside the marker, dropping every other line. The sibling capture in
+  # hack/e2e-capture-previous-logs.sh already copies stderr whole regardless of
+  # how the read ended; two collectors in one tarball answering the same question
+  # two ways is worse than either answer on its own.
+  grep -q 'results are partial' "$tmp/READ-WARNINGS.txt" || {
+    echo "FAIL: a partial read dropped every stderr line but the last"
+    [ -f "$tmp/READ-WARNINGS.txt" ] && cat "$tmp/READ-WARNINGS.txt" || echo "(no READ-WARNINGS.txt at all)"
+    false
+  }
+  grep -q 'unexpected EOF' "$tmp/READ-WARNINGS.txt"
+  # The exit status is named, so the file does not read as a clean read that
+  # merely carried a warning.
+  grep -q 'exited 1 part way through' "$tmp/READ-WARNINGS.txt"
+  # The log itself stays machine-readable: the warnings live beside it, and the
+  # partial log keeps its own TRUNCATED marker.
+  if grep -q 'results are partial' "$tmp/logs-app.txt"; then
+    echo "FAIL: a warning line landed inside the log a parser reads"
+    cat "$tmp/logs-app.txt"
+    false
+  fi
+  grep -q 'the decisive line' "$tmp/logs-app.txt"
+  rm -rf "$tmp"
+}
+
+@test "a clean read that returned no object keeps the warning out of it" {
+  tmp=$(mktemp -d)
+  object_stub "$tmp/fakectl"
+
+  COZYREPORT_BOUND="" STUB_OUT="" STUB_ERR="Warning: some deprecation notice" STUB_RC=0 \
+    cozyreport_read_object "$tmp/pod.yaml" "$tmp/fakectl"
+
+  # rc 0, no object, and kubectl still spoke. Copying stderr into the file on the
+  # strength of "no stdout" alone writes an unprefixed `Warning:` line where an
+  # object belongs -- unparseable, and unexplained, because the emptiness checks
+  # further down see a non-empty file and stay quiet. The refusal path is the one
+  # that earns a copy into the file; a warning on a successful read is not it.
+  if grep -q 'deprecation notice' "$tmp/pod.yaml" 2>/dev/null; then
+    echo "FAIL: a warning landed inside the object, with no marker to explain it"
+    cat "$tmp/pod.yaml"
+    false
+  fi
+  grep -q 'deprecation notice' "$tmp/READ-WARNINGS.txt" || {
+    echo "FAIL: the warning was dropped instead of kept beside the object"
+    [ -f "$tmp/READ-WARNINGS.txt" ] && cat "$tmp/READ-WARNINGS.txt" || echo "(no READ-WARNINGS.txt)"
+    false
+  }
+  grep -q 'returned no object' "$tmp/READ-WARNINGS.txt"
+  rm -rf "$tmp"
+}
+
+@test "a cut-off container read is not attributed to kubectl in the warnings file" {
+  tmp=$(mktemp -d)
+  collect_stub_dir "$tmp"
+  export STUB_ARGV="$tmp/argv"
+
+  PATH="$tmp:$PATH" COZYREPORT_BOUND="" STUB_LOG_MODE=partial_rc1_multi_124 \
+    cozyreport_read_container_log "$tmp/logs-app.txt" current ns pod-1 app
+
+  # 124 is this script's own clock, not a decision kubectl made. The TRUNCATED
+  # marker inside the log names the timeout; the warnings file beside it described
+  # the same read as "kubectl exited 124 part way through". Two files in one pod
+  # directory, one read, two mechanisms -- and only one of them was observed.
+  grep -q 'cut off by' "$tmp/READ-WARNINGS.txt" || {
+    echo "FAIL: a timeout is reported as a kubectl exit in the warnings file"
+    cat "$tmp/READ-WARNINGS.txt"
+    false
+  }
+  if grep -q 'kubectl exited 124' "$tmp/READ-WARNINGS.txt"; then
+    echo "FAIL: the warnings file contradicts the marker inside the log"
+    cat "$tmp/READ-WARNINGS.txt"
+    false
+  fi
+  grep -q 'cut off by' "$tmp/logs-app.txt"
+  rm -rf "$tmp"
+}
+
+@test "a clean container read with no log keeps the warning beside it, not in it" {
+  tmp=$(mktemp -d)
+  collect_stub_dir "$tmp"
+  export STUB_ARGV="$tmp/argv"
+
+  PATH="$tmp:$PATH" COZYREPORT_BOUND="" STUB_LOG_MODE=warned_empty \
+    cozyreport_read_container_log "$tmp/logs-app.txt" current ns pod-1 app
+
+  # Same shape one function down. An unprefixed kubectl line inside a container log
+  # is indistinguishable from a line the container wrote, which is precisely the
+  # fabricated cluster fact this tree exists to prevent.
+  if grep -q 'results are partial' "$tmp/logs-app.txt"; then
+    echo "FAIL: a warning landed inside the container log"
+    cat "$tmp/logs-app.txt"
+    false
+  fi
+  grep -q 'results are partial' "$tmp/READ-WARNINGS.txt" || {
+    echo "FAIL: the warning was dropped"
+    [ -f "$tmp/READ-WARNINGS.txt" ] && cat "$tmp/READ-WARNINGS.txt" || echo "(none)"
+    false
+  }
+  # The WORDING, not just the routing. "returned this log" about a read that
+  # returned none contradicts the placeholder written into the log file for the
+  # same read, and this is the file a triager opens first because it names the
+  # other one. The object reader's twin above asserts its own third-case wording
+  # for exactly this reason.
+  grep -q 'returned no log, exited 0' "$tmp/READ-WARNINGS.txt" || {
+    echo "FAIL: a read that returned nothing is described as having returned the log"
+    cat "$tmp/READ-WARNINGS.txt"
+    false
+  }
+  # The placeholder must not claim kubectl exited "without error" when it spoke.
+  if grep -q 'without output or error' "$tmp/logs-app.txt"; then
+    echo "FAIL: claimed a silent exit in the same run that recorded a message"
+    cat "$tmp/logs-app.txt"
+    false
+  fi
+  grep -q 'READ-WARNINGS.txt' "$tmp/logs-app.txt"
+  rm -rf "$tmp"
+}
+
+@test "a read with nothing on stderr leaves no warnings file at all" {
+  tmp=$(mktemp -d)
+  object_stub "$tmp/fakectl"
+
+  COZYREPORT_BOUND="" STUB_OUT="apiVersion: v1" STUB_ERR="" STUB_RC=0 \
+    cozyreport_read_object "$tmp/pod.yaml" "$tmp/fakectl"
+
+  # The converse: an empty warnings file beside every clean read would train the
+  # reader to ignore the name, which costs exactly as much as not writing it.
+  if [ -f "$tmp/READ-WARNINGS.txt" ]; then
+    echo "FAIL: a clean read left a warnings file"
+    cat "$tmp/READ-WARNINGS.txt"
+    false
+  fi
+  rm -rf "$tmp"
+}
+
+@test "a truncation marker on an object file does not cost the parser the object" {
+  tmp=$(mktemp -d)
+  object_stub "$tmp/fakectl"
+
+  # kubectl can finish writing a whole object and still exit non-zero. The marker
+  # then lands after a complete mapping, and a BARE line there is a second
+  # top-level node, not a note: the file stops parsing. That is the same defect
+  # diverting stderr was meant to remove, reintroduced by the fix for it -- so the
+  # marker is written as a YAML comment. It stays visible to a person and invisible
+  # to yq, which is what reads these three files.
+  # Held in a variable rather than only in the call's environment: the comparison
+  # below needs the same bytes, and an env prefix on a function call does not
+  # outlive it.
+  obj='apiVersion: v1
+kind: Pod
+metadata:
+  name: broken-0'
+
+  COZYREPORT_BOUND="" \
+  STUB_OUT="$obj" \
+  STUB_ERR='error: unexpected EOF' \
+  STUB_RC=1 \
+    cozyreport_read_object "$tmp/pod.yaml" "$tmp/fakectl"
+
+  grep -q '^# \[cozyreport\] TRUNCATED' "$tmp/pod.yaml"
+
+  # The property, stated without a parser: strip the comment lines and what is
+  # left must be byte-for-byte the object kubectl wrote. That IS the proof, not a
+  # weaker stand-in for one: the fixture is a valid YAML document, comments are
+  # the one construct YAML defines as ignorable, and a file differing from a valid
+  # document only by added comment lines is therefore valid too. Any change to the
+  # body -- including a marker glued onto a partial final line -- breaks the
+  # comparison. A bare marker survives
+  # that strip and the comparison fails, which is exactly the regression. Written
+  # this way rather than by loading the file, because a check that runs only when
+  # the host happens to ship a YAML parser is not a check on the hosts that do
+  # not -- it silently degrades to "the line starts with a hash", which is the
+  # weaker half and passes even when the object is unloadable.
+  printf '%s\n' "$obj" > "$tmp/expected.yaml"
+  grep -v '^#' "$tmp/pod.yaml" > "$tmp/stripped.yaml"
+  if ! cmp -s "$tmp/expected.yaml" "$tmp/stripped.yaml"; then
+    echo "FAIL: the marker changed what a parser would see"
+    echo "--- expected ---"; cat "$tmp/expected.yaml"
+    echo "--- actual, comments stripped ---"; cat "$tmp/stripped.yaml"
+    false
+  fi
+
+  # And when a parser is available, load it for real. This is the belt to the
+  # braces above, not the assertion the test rests on.
+  if command -v yq >/dev/null 2>&1; then
+    yq --exit-status '.metadata.name == "broken-0"' "$tmp/pod.yaml" >/dev/null 2>&1 || {
+      echo "FAIL: the marked object no longer parses"
+      cat "$tmp/pod.yaml"
+      false
+    }
+  fi
+  rm -rf "$tmp"
+}
+
+# --------------------------------------------------------------------------- #
+# cozyreport_collect_pod -- everything the report keeps about one broken pod.    #
+# Driven against a stub kubectl (and a stub `timeout` that records its argv), so #
+# the artifact these tests assert on is the one a reader of a failed run gets.   #
+# The placeholder text is the ONLY evidence for a pod that logged nothing, and   #
+# the --tail/timeout bounds are what stop a widened pod selection from costing   #
+# the whole report, so both are pinned here rather than left to review.          #
+#                                                                               #
+# cozytest.sh ends an @test at the first bare `}`, so the stub builder lives at  #
+# top level rather than nested inside a test.                                    #
+# --------------------------------------------------------------------------- #
+
+collect_stub_dir() {
+  _sd="$1"
+  cat > "$_sd/kubectl" <<'STUB'
+#!/bin/sh
+for a in "$@"; do
+  case "$a" in
+    jsonpath*)
+      case "${STUB_JSONPATH_FAIL:-}" in
+        # Killed by its wrapper before writing: no stderr, exit 124.
+        timeout) exit 124 ;;
+        # Refused without saying why: not a timeout, and nothing to quote.
+        silent) exit 1 ;;
+        # Named some containers and then failed: the list is a prefix of the
+        # pod's containers, not the pod's containers.
+        partial)
+          printf 'app'
+          echo 'error: unexpected EOF' >&2
+          exit 1 ;;
+        '') ;;
+        noisy)
+          # Discovery is cold, so kubectl retries the API group list and prefixes
+          # the reason with one klog line per attempt. A single-pod read goes
+          # through the same discovery path as the cluster-wide one.
+          i=1
+          while [ "$i" -le 3 ]; do
+            echo 'E0728 11:51:48.306797   82827 memcache.go:265] "Unhandled Error" err="couldn'"'"'t get current server API group list: Get \"https://192.0.2.1:6443/api?timeout=32s\": dial tcp: lookup timed out after some considerable number of characters"' >&2
+            i=$((i + 1))
+          done
+          echo 'Error from server (NotFound): pods "gone-0" not found' >&2
+          exit 1 ;;
+        *)
+          echo 'Error from server (NotFound): pods "gone-0" not found' >&2
+          exit 1 ;;
+      esac
+      printf '%s' "${STUB_CONTAINERS-app}"
+      exit 0 ;;
+  esac
+done
+case "$*" in
+  *"get pod -A --no-headers"*)
+    case "${STUB_PODLIST_FAIL:-}" in
+      # Killed by its own wrapper before it could write: no stderr, exit 124.
+      timeout) exit 124 ;;
+      # Refused with nothing on stderr: the case that must NOT be described in
+      # terms of the read timeout.
+      silent) exit 1 ;;
+      # Named some pods and then died: a partial list, not an absent one.
+      partial)
+        printf '%s\n' "${STUB_POD_ROWS:-}"
+        echo 'error: unexpected EOF' >&2
+        exit 1 ;;
+      '') ;;
+      # A failing cluster-wide list is preceded by one klog discovery-retry line
+      # per attempt, each long enough to survive trimming and bury the cause.
+      *)
+        i=1
+        while [ "$i" -le 3 ]; do
+          echo 'E0728 11:51:48.306797   82827 memcache.go:265] "Unhandled Error" err="couldn'"'"'t get current server API group list: Get \"https://192.0.2.1:6443/api?timeout=32s\": dial tcp: lookup timed out after some considerable number of characters"' >&2
+          i=$((i + 1))
+        done
+        echo 'Error from server (Forbidden): pods is forbidden' >&2
+        exit 1 ;;
+    esac
+    printf '%s\n' "${STUB_POD_ROWS:-}"
+    exit 0 ;;
+esac
+case "$1" in
+  logs)
+    printf '%s\n' "$*" >> "$STUB_ARGV"
+    case "${STUB_LOG_MODE:-text}" in
+      empty) exit 0 ;;
+      error) echo 'Error from server (BadRequest): container "app" is waiting to start: ImagePullBackOff' >&2; exit 1 ;;
+      # Exits 0, writes NO log, and still warns. The combination none of the other
+      # modes produce, and the one all three had_stdout branches got wrong.
+      warned_empty) echo 'Warning: results are partial, 3 of 7 shards answered' >&2; exit 0 ;;
+      # Partial stream, a warning, and OUR OWN clock firing: the combination where
+      # the status must not be attributed to kubectl.
+      partial_rc1_multi_124)
+        printf 'startup line\nthe decisive line\n'
+        echo 'Warning: results are partial, 3 of 7 shards answered' >&2
+        exit 124 ;;
+      # Slow enough for the collection budget to run out mid-pod.
+      slow) sleep "${STUB_LOG_SLEEP:-2}"; printf 'the decisive line\n' ;;
+      # Killed by its wrapper: exit 124, nothing written.
+      killed) exit 124 ;;
+      # Exits non-zero having written neither a log nor a word about why. Distinct
+      # from `error`, which writes a reason, and from `empty`, which exits 0.
+      silent) exit 1 ;;
+      # Ignored SIGTERM and got SIGKILL from `timeout -k`: 137, nothing written.
+      killed9) exit 137 ;;
+      # Killed after writing part of the stream: exit 124, output kept.
+      partial) printf 'the decisive line\n'; exit 124 ;;
+      # Part of the stream, then kubectl failing on its own terms -- a reset to
+      # the kubelet mid-read. No clock fired, so this must not be described as a
+      # timeout, but the file is still a partial log and not a refusal.
+      partial_rc1)
+        printf 'startup line\nthe decisive line\n'
+        echo 'error: unexpected EOF' >&2
+        exit 1 ;;
+      # The same partial read, but kubectl says more than one thing on the way
+      # out. Two lines, because "copied whole" and "reduced to the last line" are
+      # indistinguishable when there is only one.
+      partial_rc1_multi)
+        printf 'startup line\nthe decisive line\n'
+        echo 'Warning: results are partial, 3 of 7 shards answered' >&2
+        echo 'error: unexpected EOF' >&2
+        exit 1 ;;
+      # A refusal with no stdout at all. The commonest shape in the tree: the
+      # --previous read of a container that never restarted.
+      norestart)
+        echo 'Error from server (BadRequest): previous terminated container "app" in pod "db-2" not found' >&2
+        exit 1 ;;
+      # Our timeout firing against cold discovery: klog retries on stderr, no
+      # stdout, exit 124.
+      timeout_noisy)
+        i=1
+        while [ "$i" -le 3 ]; do
+          echo 'E0728 11:51:48.306797   82827 memcache.go:265] "Unhandled Error" err="couldn'"'"'t get current server API group list: dial tcp: lookup timed out"' >&2
+          i=$((i + 1))
+        done
+        exit 124 ;;
+      # Killed mid-line, which is the normal shape of a SIGKILLed stream: the last
+      # line has no terminating newline.
+      partial_noeol) printf 'first line\nthe decisive partial line'; exit 124 ;;
+      # Same, but via the kill-after path.
+      partial9) printf 'the decisive line\n'; exit 137 ;;
+      *)     printf 'the decisive line\n' ;;
+    esac ;;
+  # STUB_OBJ_MODE drives the two whole-object reads. `partial` is a read killed
+  # after writing a plausible prefix: describe.txt that stops before its Events
+  # section reads exactly like a pod that had no events, and pod.yaml that stops
+  # after metadata reads like an object with no status.
+  describe)
+    case "${STUB_OBJ_MODE:-}" in
+      partial)  printf 'Name: pod-1\nStatus: Running\n'; exit 124 ;;
+      partial9) printf 'Name: pod-1\nStatus: Running\n'; exit 137 ;;
+      *) printf 'Events:\n  Warning  Unhealthy  readiness probe failed\n' ;;
+    esac ;;
+  get)
+    case "${STUB_OBJ_MODE:-}" in
+      partial) printf 'apiVersion: v1\nkind: Pod\nmetadata:\n  name: pod-1\n'; exit 124 ;;
+      # Same cut, delivered as SIGKILL rather than as an expired deadline.
+      partial9) printf 'apiVersion: v1\nkind: Pod\nmetadata:\n  name: pod-1\n'; exit 137 ;;
+      # Cut off before the first byte: the file never starts.
+      killed) exit 124 ;;
+      *) printf 'apiVersion: v1\nkind: Pod\n' ;;
+    esac ;;
+esac
+exit 0
+STUB
+  chmod +x "$_sd/kubectl"
+  # Records that the read really went through `timeout`, then runs the rest.
+  # `-k <grace>` is skipped so the recorded line stays the effective duration:
+  # the assertions are about the budget, not about how the kill is delivered.
+  cat > "$_sd/timeout" <<'STUB'
+#!/bin/sh
+if [ "$1" = "-k" ]; then
+  printf 'kill-after %s\n' "$2" >> "$STUB_ARGV"
+  shift 2
+fi
+printf 'timeout %s\n' "$1" >> "$STUB_ARGV"
+shift
+exec "$@"
+STUB
+  chmod +x "$_sd/timeout"
+  # And point the bound at that stub. COZYREPORT_BOUND is resolved once, when this
+  # file sources cozyreport.sh, which happens before any test has a stub PATH -- so
+  # on a host with no `timeout` of its own it is empty here, and every assertion
+  # about a bounded read fails for a reason that has nothing to do with the code
+  # under test. Eight tests did exactly that. A suite whose verdict depends on what
+  # the host happens to have installed is not a suite; the same defect was fixed a
+  # commit earlier for sha256sum, and this is its other half.
+  COZYREPORT_BOUND="timeout -k 5 $COZYREPORT_READ_TIMEOUT"
+}
+
+@test "collect pod writes a placeholder when kubectl returns no output at all" {
+  tmp=$(mktemp -d)
+  collect_stub_dir "$tmp"
+  export STUB_ARGV="$tmp/argv"
+
+  PATH="$tmp:$PATH" STUB_LOG_MODE=empty cozyreport_collect_pod ns unready-0 "$tmp/out"
+
+  # A zero-byte log file is indistinguishable from a container that started and
+  # stayed quiet, which is the ambiguity this collector exists to remove.
+  [ -s "$tmp/out/logs-app.txt" ]
+  grep -q 'exited without output or error' "$tmp/out/logs-app.txt"
+  grep -q 'exited without output or error' "$tmp/out/logs-app-previous.txt"
+  rm -rf "$tmp"
+}
+
+@test "collect pod does not report a timed out log read as a clean empty one" {
+  tmp=$(mktemp -d)
+  collect_stub_dir "$tmp"
+  export STUB_ARGV="$tmp/argv"
+
+  PATH="$tmp:$PATH" STUB_LOG_MODE=killed cozyreport_collect_pod ns hung-0 "$tmp/out"
+
+  # The read was killed by its own wrapper. "kubectl exited without output or
+  # error: it never started, or it started and logged nothing" is a claim about
+  # the cluster that nothing observed, on the likeliest path there is: a degraded
+  # apiserver is the state a failed run is in and the reason the timeout exists.
+  grep -q 'cut off by its own 30s timeout' "$tmp/out/logs-app.txt"
+  if grep -q 'exited without output or error' "$tmp/out/logs-app.txt"; then echo "FAIL: a killed read reported as a clean empty one"; false; fi
+  rm -rf "$tmp"
+}
+
+@test "collect pod treats a kill after timeout the same as a plain one" {
+  tmp=$(mktemp -d)
+  collect_stub_dir "$tmp"
+  export STUB_ARGV="$tmp/argv"
+
+  PATH="$tmp:$PATH" STUB_LOG_MODE=killed9 cozyreport_collect_pod ns hung-0 "$tmp/out"
+
+  # `timeout -k` reports 137, not 124, when the command ignored SIGTERM and had to
+  # be killed. Recognising only 124 sends the more stubborn of the two cases into
+  # the branch that describes a clean exit.
+  grep -q 'cut off by' "$tmp/out/logs-app.txt"
+  if grep -q 'exited without output or error' "$tmp/out/logs-app.txt"; then echo "FAIL: a killed read reported as a clean empty one"; false; fi
+  rm -rf "$tmp"
+}
+
+@test "a kill is not asserted to be this script's own deadline firing" {
+  tmp=$(mktemp -d)
+  collect_stub_dir "$tmp"
+  export STUB_ARGV="$tmp/argv"
+
+  PATH="$tmp:$PATH" STUB_LOG_MODE=killed9 cozyreport_collect_pod ns hung-0 "$tmp/out"
+
+  # 124 comes from `timeout` and from nothing else. 137 is 128+SIGKILL, which our
+  # own `-k` grace produces and so does anything else that kills the read -- the
+  # OOM killer on a loaded runner, a teardown signalling the process group. The
+  # cut-off branch is right for both, since either way the file ends before the
+  # log did; the attribution is not. Reported flatly as "its own 30s timeout", a
+  # read killed at second two reads as one that waited the full thirty, and the
+  # triager goes looking at apiserver latency.
+  grep -q 'SIGKILL' "$tmp/out/logs-app.txt"
+  grep -q 'does not tell apart' "$tmp/out/logs-app.txt"
+  rm -rf "$tmp"
+}
+
+@test "a deadline that plainly expired is stated without a disjunction" {
+  tmp=$(mktemp -d)
+  collect_stub_dir "$tmp"
+  export STUB_ARGV="$tmp/argv"
+
+  PATH="$tmp:$PATH" STUB_LOG_MODE=killed cozyreport_collect_pod ns hung-0 "$tmp/out"
+
+  # The converse, and the reason the hedge is spelled per status rather than
+  # applied to both: 124 IS unambiguous, and hedging it too would trade one false
+  # note for a uselessly vague one everywhere.
+  grep -q "cut off by its own ${COZYREPORT_READ_TIMEOUT}s timeout" "$tmp/out/logs-app.txt"
+  if grep -q 'SIGKILL' "$tmp/out/logs-app.txt"; then
+    echo "FAIL: hedged a 124, which only timeout produces"
+    cat "$tmp/out/logs-app.txt"
+    false
+  fi
+  rm -rf "$tmp"
+}
+
+@test "collect pod marks a partial log cut short by the kill after bound" {
+  tmp=$(mktemp -d)
+  collect_stub_dir "$tmp"
+  export STUB_ARGV="$tmp/argv"
+
+  PATH="$tmp:$PATH" STUB_LOG_MODE=partial9 cozyreport_collect_pod ns hung-0 "$tmp/out"
+
+  # Unmarked, this file reads as a complete log that simply ends there.
+  grep -q 'the decisive line' "$tmp/out/logs-app.txt"
+  grep -q 'TRUNCATED' "$tmp/out/logs-app.txt"
+  rm -rf "$tmp"
+}
+
+@test "collect pod does not name a read timeout it never applied" {
+  tmp=$(mktemp -d)
+  collect_stub_dir "$tmp"
+  export STUB_ARGV="$tmp/argv"
+
+  # No bound was applied, so a 137 came from something else -- runner teardown, an
+  # OOM kill. Quoting "its own 30s timeout" there states a mechanism that was not
+  # in play, in the file whose job is to be believed.
+  PATH="$tmp:$PATH" COZYREPORT_BOUND="" STUB_LOG_MODE=killed9 \
+    cozyreport_collect_pod ns hung-0 "$tmp/out"
+
+  if grep -q '30s timeout' "$tmp/out/logs-app.txt"; then
+    echo "FAIL: named a 30s timeout on a read that had no bound"
+    cat "$tmp/out/logs-app.txt"
+    false
+  fi
+  grep -q 'unbounded' "$tmp/out/logs-app.txt"
+  rm -rf "$tmp"
+}
+
+@test "collect pod starts its marker on a line of its own after a killed stream" {
+  tmp=$(mktemp -d)
+  collect_stub_dir "$tmp"
+  export STUB_ARGV="$tmp/argv"
+
+  PATH="$tmp:$PATH" STUB_LOG_MODE=partial_noeol cozyreport_collect_pod ns hung-0 "$tmp/out"
+
+  # A killed read is SIGKILLed mid-stream, so an unterminated last line is the
+  # normal shape here. Appending blind glues the marker onto it: the obvious grep
+  # for the marker misses it, the decisive last line is corrupted, and in reverse a
+  # container whose own text ends mid-sentence looks like it emitted the marker.
+  grep -q '^\[cozyreport\] TRUNCATED' "$tmp/out/logs-app.txt"
+  grep -q '^the decisive partial line$' "$tmp/out/logs-app.txt"
+  rm -rf "$tmp"
+}
+
+@test "collect pod keeps a partial log and marks it truncated" {
+  tmp=$(mktemp -d)
+  collect_stub_dir "$tmp"
+  export STUB_ARGV="$tmp/argv"
+
+  PATH="$tmp:$PATH" STUB_LOG_MODE=partial cozyreport_collect_pod ns hung-0 "$tmp/out"
+
+  # Whatever landed before the cut is still the evidence, and for a previous
+  # instance it is the only copy of something already gone from the cluster. Kept,
+  # and marked -- unmarked, the reader believes they hold the whole tail.
+  grep -q 'the decisive line' "$tmp/out/logs-app.txt"
+  grep -q '^\[cozyreport\] TRUNCATED' "$tmp/out/logs-app.txt"
+  rm -rf "$tmp"
+}
+
+@test "collect pod distinguishes the two instances when both came back empty" {
+  tmp=$(mktemp -d)
+  collect_stub_dir "$tmp"
+  export STUB_ARGV="$tmp/argv"
+
+  PATH="$tmp:$PATH" STUB_LOG_MODE=empty cozyreport_collect_pod ns unready-0 "$tmp/out"
+
+  # A clean exit with no bytes is ambiguous, and the readings differ per instance:
+  # for the previous one, the first reading is that there was never a previous one.
+  grep -q 'it never started, or it started and logged nothing' "$tmp/out/logs-app.txt"
+  grep -q 'it never restarted, or the previous instance logged nothing' "$tmp/out/logs-app-previous.txt"
+  rm -rf "$tmp"
+}
+
+@test "collect pod keeps the whole reason when the container list read is noisy" {
+  tmp=$(mktemp -d)
+  collect_stub_dir "$tmp"
+  export STUB_ARGV="$tmp/argv"
+
+  PATH="$tmp:$PATH" STUB_JSONPATH_FAIL=noisy cozyreport_collect_pod ns gone-0 "$tmp/out"
+
+  # This is a file of its own, not a log line with neighbours to bury, so there is
+  # nothing to gain by picking one line -- and picking is where it goes wrong: a
+  # cold discovery cache, which a multi-hour failed run produces, puts a klog retry
+  # line in front of the reason and each is long enough to survive trimming.
+  grep -q 'pods "gone-0" not found' "$tmp/out/logs-UNAVAILABLE.txt"
+  rm -rf "$tmp"
+}
+
+@test "collect pod names the timeout when the container list read was killed" {
+  tmp=$(mktemp -d)
+  collect_stub_dir "$tmp"
+  export STUB_ARGV="$tmp/argv"
+
+  PATH="$tmp:$PATH" STUB_JSONPATH_FAIL=timeout cozyreport_collect_pod ns hung-0 "$tmp/out"
+
+  # A killed read writes no stderr, so quoting it yields a bare "kubectl said:"
+  # that names nothing. Same guard the pod-list path carries.
+  grep -q 'cut off by its own 30s timeout' "$tmp/out/logs-UNAVAILABLE.txt"
+  if grep -q 'kubectl said: *$' "$tmp/out/logs-UNAVAILABLE.txt"; then echo "FAIL: quoted an empty reason"; false; fi
+  rm -rf "$tmp"
+}
+
+@test "collect pod says which tail bound each log was written under" {
+  tmp=$(mktemp -d)
+  collect_stub_dir "$tmp"
+  export STUB_ARGV="$tmp/argv"
+
+  PATH="$tmp:$PATH" cozyreport_collect_pod ns chatty-0 "$tmp/out"
+
+  # `--tail` drops the OLDEST lines, so a bounded read starts mid-stream.
+  # A file that now begins mid-stream looks exactly like a complete one, and for a
+  # pod that never came up the startup lines are the decisive part.
+  grep -q 'at most the last 2000 lines' "$tmp/out/CONTAINER-LOGS-BOUND.txt"
+  # One note per directory covers both instances: the bound is the same for the
+  # current log and the previous one, and repeating it in each file was what put
+  # prose into a machine-readable artifact in the first place.
+  [ "$(grep -c 'at most the last 2000 lines' "$tmp/out/CONTAINER-LOGS-BOUND.txt")" -eq 1 ]
+  rm -rf "$tmp"
+}
+
+@test "collect pod claims no tail bound when the complete log was requested" {
+  tmp=$(mktemp -d)
+  collect_stub_dir "$tmp"
+  export STUB_ARGV="$tmp/argv"
+
+  PATH="$tmp:$PATH" COZY_REPORT_POD_TAIL=-1 cozyreport_collect_pod ns chatty-0 "$tmp/out"
+
+  grep -q -- '--tail=-1' "$tmp/argv"
+  if grep -q 'at most the last' "$tmp/out/logs-app.txt"; then echo "FAIL: claimed a bound that was not applied"; false; fi
+  rm -rf "$tmp"
+}
+
+@test "collect pod refuses a zero tail that would empty every log" {
+  tmp=$(mktemp -d)
+  collect_stub_dir "$tmp"
+  export STUB_ARGV="$tmp/argv"
+
+  PATH="$tmp:$PATH" COZY_REPORT_POD_TAIL=0 cozyreport_collect_pod ns chatty-0 "$tmp/out"
+
+  # `--tail=0` returns no lines, which this script would then describe as a
+  # container that never started or stayed quiet: a statement about the cluster
+  # produced entirely by a typo.
+  grep -q -- '--tail=2000' "$tmp/argv"
+  if grep -q -- '--tail=0' "$tmp/argv"; then echo "FAIL: asked kubectl for nothing"; false; fi
+  rm -rf "$tmp"
+}
+
+@test "a log cut short by kubectl itself is marked, without blaming the timeout" {
+  tmp=$(mktemp -d)
+  collect_stub_dir "$tmp"
+  export STUB_ARGV="$tmp/argv"
+
+  PATH="$tmp:$PATH" STUB_LOG_MODE=partial_rc1 cozyreport_collect_pod ns reset-0 "$tmp/out"
+
+  # Three outcomes exist, not two: our timeout fired, kubectl failed on its own,
+  # or the read completed. Only the first and third were handled, so a log cut
+  # short by a connection reset carried no marker at all -- while the notes in the
+  # same tarball state that a read cut short says so on its last line.
+  file="$tmp/out/logs-app.txt"
+  grep -q 'the decisive line' "$file"
+  if ! grep -q '^\[cozyreport\] TRUNCATED' "$file"; then
+    echo "FAIL: a partial log left by a non-timeout failure carries no marker"
+    cat "$file"
+    false
+  fi
+  # It must not name our timeout, because no timeout fired.
+  if grep -qE 'cut off by its own|timeout' "$file"; then
+    echo "FAIL: blamed the read timeout for a failure that was not one"
+    cat "$file"
+    false
+  fi
+  # kubectl's own reason survives into the file.
+  grep -q 'unexpected EOF' "$file"
+  # And it is not described as a clean tail window.
+  if grep -q 'at most the last' "$file"; then
+    echo "FAIL: a truncated log claims to be a complete tail window"
+    false
+  fi
+  rm -rf "$tmp"
+}
+
+@test "collect pod keeps the kubectl refusal instead of overwriting it" {
+  tmp=$(mktemp -d)
+  collect_stub_dir "$tmp"
+  export STUB_ARGV="$tmp/argv"
+
+  PATH="$tmp:$PATH" STUB_LOG_MODE=error cozyreport_collect_pod ns puller-0 "$tmp/out"
+
+  # kubectl's reason IS the finding; the placeholder must not replace it.
+  grep -q 'waiting to start: ImagePullBackOff' "$tmp/out/logs-app.txt"
+  if grep -q 'exited without output' "$tmp/out/logs-app.txt"; then echo "FAIL: placeholder overwrote kubectl's reason"; false; fi
+  # This file holds a refusal, not a log, so a line about how many lines of log it
+  # holds would describe something that is not in it.
+  if grep -q 'at most the last' "$tmp/out/logs-app.txt"; then echo "FAIL: described a refusal as a truncated log"; false; fi
+  # Nor was anything cut off: nothing was ever produced to cut. This assertion is
+  # the one that was missing -- the test drove this path already and checked only
+  # the tail note, so a refusal wrongly marked TRUNCATED passed here unnoticed.
+  if grep -q 'TRUNCATED' "$tmp/out/logs-app.txt"; then
+    echo "FAIL: a refusal is reported as a log that was cut off part way through"
+    cat "$tmp/out/logs-app.txt"
+    false
+  fi
+  rm -rf "$tmp"
+}
+
+@test "an uncapturable stderr is not reported as kubectl having said nothing" {
+  tmp=$(mktemp -d)
+  collect_stub_dir "$tmp"
+  export STUB_ARGV="$tmp/argv"
+
+  # TMPDIR at a path that does not exist, so mktemp fails and the stderr scratch
+  # file is never created. The read still runs -- that fallback is deliberate --
+  # but nothing captured what kubectl said. "Said nothing" is then a claim about
+  # the cluster manufactured by a local filesystem condition, which is the defect
+  # this collector is written against.
+  PATH="$tmp:$PATH" TMPDIR=/nonexistent-cozyreport-probe STUB_LOG_MODE=error \
+    cozyreport_collect_pod ns puller-0 "$tmp/out"
+
+  f="$tmp/out/logs-app.txt"
+  if grep -q 'without a message' "$f"; then
+    echo "FAIL: an uncapturable message is reported as kubectl having been silent"
+    cat "$f"
+    false
+  fi
+  grep -q 'could not be captured' "$f"
+  grep -q 'unknown' "$f"
+  rm -rf "$tmp"
+}
+
+@test "a killed pod list names the cutoff even when its stderr could not be captured" {
+  tmp=$(mktemp -d)
+  collect_stub_dir "$tmp"
+  export STUB_ARGV="$tmp/argv"
+
+  # Both conditions at once: the read is killed at 124 AND mktemp has nowhere to
+  # write the scratch file. Each is modelled separately elsewhere in this suite;
+  # they were never combined, and that overlap is the only place the branch order
+  # is observable. With the no-temp-dir branch first this file said the message
+  # could not be captured, while the two sibling sites -- given the same pair --
+  # named the cutoff. One tarball, two answers, about a mechanism the script had
+  # in hand: a read cut off at 124 is killed before kubectl writes anything, so an
+  # empty stderr there is a consequence of the timeout, not a separate fact.
+  PATH="$tmp:$PATH" TMPDIR=/nonexistent-cozyreport-probe STUB_PODLIST_FAIL=timeout \
+    cozyreport_collect_broken_pods "$tmp/out"
+
+  f="$tmp/out/COLLECTION-FAILED.txt"
+  grep -q 'the read was cut off by' "$f"
+  if grep -q 'could not be captured' "$f"; then
+    echo "FAIL: led with the missing temp dir for a read the script knew was killed"
+    cat "$f"
+    false
+  fi
+  rm -rf "$tmp"
+}
+
+@test "the per-pod collector answers that pair the same way" {
+  tmp=$(mktemp -d)
+  collect_stub_dir "$tmp"
+  export STUB_ARGV="$tmp/argv"
+
+  # The mirror of the test above, so the two cannot drift apart from the other
+  # side either. Same pair of conditions, same expected leading cause.
+  PATH="$tmp:$PATH" TMPDIR=/nonexistent-cozyreport-probe STUB_JSONPATH_FAIL=timeout \
+    cozyreport_collect_pod ns slow-0 "$tmp/out"
+
+  f="$tmp/out/logs-UNAVAILABLE.txt"
+  [ -f "$f" ] || { echo "FAIL: no container-list failure note written"; ls "$tmp/out"; false; }
+  grep -q 'cut off by' "$f"
+  if grep -q 'could not be captured' "$f"; then
+    echo "FAIL: the two sites answer the same pair differently"
+    cat "$f"
+    false
+  fi
+  rm -rf "$tmp"
+}
+
+@test "a pod list whose stderr could not be captured says so, not that it was silent" {
+  tmp=$(mktemp -d)
+  collect_stub_dir "$tmp"
+  export STUB_ARGV="$tmp/argv"
+
+  PATH="$tmp:$PATH" TMPDIR=/nonexistent-cozyreport-probe STUB_PODLIST_FAIL=1 \
+    cozyreport_collect_broken_pods "$tmp/out"
+
+  f="$tmp/out/COLLECTION-FAILED.txt"
+  if grep -q 'kubectl said nothing' "$f"; then
+    echo "FAIL: claimed silence when the message was never captured"
+    cat "$f"
+    false
+  fi
+  grep -q 'could not be captured' "$f"
+  # The section still refuses to read as a healthy cluster.
+  grep -q 'NOT a report that every pod was Ready' "$f"
+  rm -rf "$tmp"
+}
+
+@test "a previous-instance refusal is not dressed up as a truncated log" {
+  tmp=$(mktemp -d)
+  collect_stub_dir "$tmp"
+  export STUB_ARGV="$tmp/argv"
+
+  # The commonest file in the whole pod tree: --previous against a container that
+  # simply never restarted. kubectl refuses, stdout is empty, and the refusal IS
+  # the finding. Marking it "cut off part way through" is false on one file per
+  # container of every collected pod, which retires the marker as a signal.
+  PATH="$tmp:$PATH" STUB_LOG_MODE=norestart cozyreport_collect_pod ns db-2 "$tmp/out"
+
+  file="$tmp/out/logs-app-previous.txt"
+  grep -q 'previous terminated container' "$file"
+  if grep -q 'TRUNCATED' "$file"; then
+    echo "FAIL: a container that never restarted is reported as a truncated log"
+    cat "$file"
+    false
+  fi
+  if grep -q 'at most the last' "$file"; then
+    echo "FAIL: described a refusal as a bounded log"
+    false
+  fi
+  rm -rf "$tmp"
+}
+
+@test "a timeout before kubectl wrote anything says so, and keeps the preamble" {
+  tmp=$(mktemp -d)
+  collect_stub_dir "$tmp"
+  export STUB_ARGV="$tmp/argv"
+
+  # Our timeout fires with cold discovery: exit 124, no stdout, klog retry lines on
+  # stderr. The accurate message for this case must survive, and the preamble that
+  # explains the apiserver state must not be overwritten by it.
+  PATH="$tmp:$PATH" STUB_LOG_MODE=timeout_noisy cozyreport_collect_pod ns slow-0 "$tmp/out"
+
+  file="$tmp/out/logs-app.txt"
+  grep -q 'before kubectl wrote anything' "$file"
+  grep -q "couldn't get current server API group list" "$file"
+  # It must not claim the container stopped writing: nothing was read at all.
+  if grep -q 'not because the container stopped writing' "$file"; then
+    echo "FAIL: claimed a log ended early when none was produced"
+    cat "$file"
+    false
+  fi
+  rm -rf "$tmp"
+}
+
+@test "collect pod names why the container list was unavailable" {
+  tmp=$(mktemp -d)
+  collect_stub_dir "$tmp"
+  export STUB_ARGV="$tmp/argv"
+
+  PATH="$tmp:$PATH" STUB_JSONPATH_FAIL=1 cozyreport_collect_pod ns gone-0 "$tmp/out"
+
+  # Without this the pod directory carries a yaml and a describe and no hint
+  # that per-container logs were ever attempted.
+  [ -f "$tmp/out/logs-UNAVAILABLE.txt" ]
+  grep -q 'container list came back empty' "$tmp/out/logs-UNAVAILABLE.txt"
+  grep -q 'pods "gone-0" not found' "$tmp/out/logs-UNAVAILABLE.txt"
+  # The scratch stderr file must not ship in the artifact.
+  if [ -f "$tmp/out/.err" ]; then echo "FAIL: scratch stderr file left in the report tree"; false; fi
+  rm -rf "$tmp"
+}
+
+@test "collect pod bounds every kubectl read with a wall clock timeout" {
+  tmp=$(mktemp -d)
+  collect_stub_dir "$tmp"
+  export STUB_ARGV="$tmp/argv"
+
+  PATH="$tmp:$PATH" cozyreport_collect_pod ns chatty-0 "$tmp/out"
+
+  # The tarball is written only at the end of the run, so anything hanging
+  # against a degraded apiserver costs the whole report rather than one file.
+  # All five reads for a single-container pod: get -o yaml, describe, the
+  # container list, and the current + previous log. Each carries the kill-after
+  # bound too: plain `timeout` sends TERM and then waits forever on a process that
+  # ignores it, which is the hang the budget exists to prevent.
+  [ "$(grep -c '^timeout 30$' "$tmp/argv")" -eq 5 ]
+  [ "$(grep -c '^kill-after 5$' "$tmp/argv")" -eq 5 ]
+  # Size is bounded too, on the two reads that can be unboundedly large. The
+  # widened selection reaches long-lived containers, which is exactly the class
+  # a readiness failure produces.
+  [ "$(grep -c -- '--tail=2000' "$tmp/argv")" -eq 2 ]
+  rm -rf "$tmp"
+}
+
+@test "collect pod captures the current log of a container that never restarted" {
+  tmp=$(mktemp -d)
+  collect_stub_dir "$tmp"
+  export STUB_ARGV="$tmp/argv"
+
+  PATH="$tmp:$PATH" cozyreport_collect_pod ns unready-0 "$tmp/out"
+
+  grep -q 'the decisive line' "$tmp/out/logs-app.txt"
+  [ -f "$tmp/out/pod.yaml" ]
+  [ -f "$tmp/out/describe.txt" ]
+  rm -rf "$tmp"
+}
+
+# --------------------------------------------------------------------------- #
+# hack/cozyreport-summary.sh, end to end against a stub kubectl. summary.txt is  #
+# the first thing a triager opens, so a row that misreports itself there costs   #
+# more than the same mistake buried in the per-pod tree.                        #
+# --------------------------------------------------------------------------- #
+
+summary_stub_dir() {
+  _ss="$1"
+  cat > "$_ss/kubectl" <<'STUB'
+#!/bin/sh
+# Only the pod list matters here; every other section is asked to be empty, and
+# `get crd` fails so the CRD-gated sections skip.
+# Every read killed by its own wrapper: the state a bounded read can reach and an
+# unbounded one cannot, since an unbounded read can only hang.
+[ -n "${STUB_ALL_TIMEOUT:-}" ] && exit 124
+case "$*" in
+  *"get pod -A --no-headers"*)
+    case "${STUB_PODLIST_FAIL:-}" in
+      '') ;;
+      # Rows first, then a failure: a cluster-wide list can be answered in part
+      # and then cut off, which is not the same event as a refusal.
+      partial)
+        printf '%s\n' "${STUB_POD_ROWS:-}"
+        echo 'Error from server: unexpected EOF' >&2
+        exit 1 ;;
+      *) echo 'Error from server (Forbidden): pods is forbidden' >&2; exit 1 ;;
+    esac
+    printf '%s\n' "${STUB_POD_ROWS:-}" ;;
+  *"get crd"*)
+    # Three outcomes, not two: present, absent, and refused. The last exits
+    # non-zero exactly like the absent one and only kubectl's message separates
+    # them, which is the whole point of the case below.
+    [ -n "${STUB_CRD_FORBIDDEN:-}" ] && { echo 'Error from server (Forbidden): customresourcedefinitions.apiextensions.k8s.io is forbidden' >&2; exit 1; }
+    [ -n "${STUB_CRD_PRESENT:-}" ] && exit 0
+    # Exits non-zero having said nothing. Not a shortcut for "absent": kubectl is
+    # explicit about NotFound, so silence here is a fourth outcome and the one a
+    # caller must not file under absence.
+    [ -n "${STUB_CRD_SILENT:-}" ] && exit 1
+    # Absence as kubectl actually reports it. The stub used to exit non-zero in
+    # silence, which no real cluster does, and a fixture that cannot produce the
+    # message is a fixture that cannot tell absence from anything else.
+    echo 'Error from server (NotFound): customresourcedefinitions.apiextensions.k8s.io "'"$4"'" not found' >&2
+    exit 1 ;;
+  *"get hr -A"*)
+    # Succeeds AND writes to stderr. kubectl does this for deprecation notices and
+    # for partial-result warnings, so "wrote to stderr" and "failed" are not the
+    # same event and the reader must not conflate them.
+    [ -n "${STUB_HR_WARN:-}" ] && echo 'Warning: v1beta1 HelmRelease is deprecated in v2.1+, use v2' >&2
+    case "${STUB_HR_FAIL:-}" in
+      '') ;;
+      # Rows first, then a failure: the read was answered in part.
+      partial)
+        printf '%s\n' "${STUB_HR_ROWS:-}"
+        echo 'error: unexpected EOF' >&2
+        exit 1 ;;
+      # Two lines, and the actionable one LAST: a failing read is preceded by a
+      # klog discovery-retry line per attempt, so a helper that quotes the first
+      # line names the retry instead of the cause.
+      *) echo 'E0728 22:14:03.112233 1 memcache.go:265] couldn'"'"'t get current server API group list: the server is currently unable to handle the request' >&2
+         echo 'Error from server (Forbidden): helmreleases.helm.toolkit.fluxcd.io is forbidden' >&2
+         exit 1 ;;
+    esac
+    printf '%s\n' "${STUB_HR_ROWS:-}" ;;
+  # A real kubectl rejects a filter nested INSIDE another filter, which is what
+  # `{range .items[?(...conditions[?(...)]...)]}` is. Matched on that prefix rather
+  # than by counting `conditions[?(`, because several separate filters in one
+  # --output=custom-columns are legal and kubectl accepts them -- the node section
+  # below uses three.
+  *"range .items[?("*) echo 'error: error parsing jsonpath, unterminated filter' >&2; exit 1 ;;
+  *source.toolkit.fluxcd.io*) printf '%s\n' "${STUB_FLUX_ROWS:-}" ;;
+  *"get pvc -A"*)   printf '%s\n' "${STUB_PVC_ROWS:-}" ;;
+  *"get pv "*|*"get pv"*)
+    printf '%s\n' "${STUB_PV_ROWS:-}" ;;
+  *"get certificates"*)
+    printf '%s\n' "${STUB_CERT_ROWS:-}" ;;
+  *"get events"*)
+    printf '%s\n' "${STUB_EVENT_ROWS:-}" ;;
+  *"get nodes"*) printf '%s\n' "${STUB_NODE_ROWS:-}" ;;
+esac
+exit 0
+STUB
+  chmod +x "$_ss/kubectl"
+}
+
+@test "a leading-zero knob is refused rather than read as octal" {
+  # `$(( ))` reads a leading zero as octal; `[` reads the same string as decimal.
+  # So 010 is 8 to the deadline arithmetic and 10 to every comparison beside it,
+  # and 008 is not valid octal at all -- under dash, which is /bin/sh on the CI
+  # image, that aborts the script with "Illegal number: 008" at the deadline
+  # calculation, before the tarball is written. Losing the whole artifact to a
+  # typo in a knob is the one outcome every bound in this file exists to avoid.
+  for bad in 008 09 010 00; do
+    if cozyreport_is_count "$bad"; then
+      echo "FAIL: accepted '$bad', which arithmetic will read as octal or reject"
+      false
+    fi
+  done
+  # Plain zero still passes: a cap of zero is a supported request (collect nothing,
+  # and say so), and it is not ambiguous between the two bases.
+  cozyreport_is_count 0
+  cozyreport_is_count 40
+  cozyreport_is_count 600
+}
+
+@test "a leading-zero budget falls back to the default instead of killing the run" {
+  tmp=$(mktemp -d)
+  collect_stub_dir "$tmp"
+  export STUB_ARGV="$tmp/argv"
+
+  # Run through `/bin/sh`, unconditionally and by that name, because `/bin/sh` is
+  # what the collector is invoked as and what the claim is about. Selecting `dash`
+  # when the host happens to ship it and falling back to `sh` otherwise made the
+  # shell under test a property of the machine: the assertion still ran, but not
+  # necessarily against the semantics it names.
+  #
+  # What is proven here is shell-independent and that is the point: a value the
+  # validator rejects never reaches arithmetic, so nothing aborts and the walk
+  # completes. The stakes are not shell-independent, which is why the value is
+  # `008`: dash makes a rejected expansion fatal, so on the CI image this is the
+  # difference between a fallback and losing the tarball. `010` is worse still and
+  # not an error anywhere -- both shells read it as octal 8 while `[` reads the
+  # same string as decimal 10.
+  run_out=$(cd "$HACK_DIR" && PATH="$tmp:$PATH" STUB_POD_ROWS='ns  p-0  0/1  Running  0  5m' \
+    /bin/sh -c 'COZYREPORT_LIB=1 . ./cozyreport.sh; COZY_REPORT_PODS_BUDGET=008 cozyreport_collect_broken_pods "$1"/out; echo "rc=$?"' _ "$tmp" 2>&1)
+
+  if printf '%s\n' "$run_out" | grep -q 'Illegal number'; then
+    echo "FAIL: a malformed knob aborted the collection instead of falling back"
+    printf '%s\n' "$run_out"
+    false
+  fi
+  printf '%s\n' "$run_out" | grep -q 'rc=0'
+  # And the fallback is not silent: the operator who set it is told it was ignored.
+  grep -rq 'COZY_REPORT_PODS_BUDGET' "$tmp/out/COLLECTION-NOTES.txt"
+  rm -rf "$tmp"
+}
+
+@test "container logs name the container with -c, the documented form" {
+  tmp=$(mktemp -d)
+  collect_stub_dir "$tmp"
+  export STUB_ARGV="$tmp/argv"
+  export STUB_CONTAINERS='app'
+
+  PATH="$tmp:$PATH" cozyreport_collect_pod ns pod-1 "$tmp/out"
+
+  # kubectl accepts `logs POD CONTAINER`, but documents `(POD|TYPE/NAME) [-c NAME]`.
+  # The undocumented form working today is not a promise about tomorrow.
+  if ! grep -q -- '-c app' "$tmp/argv"; then
+    echo "FAIL: container passed positionally instead of with -c"
+    cat "$tmp/argv"
+    false
+  fi
+  # Both instances, not just the current one.
+  [ "$(grep -c -- '-c app' "$tmp/argv")" -eq 2 ]
+  grep -q -- '--previous' "$tmp/argv"
+  rm -rf "$tmp"
+}
+
+@test "the docs name the file the tail bound actually lands in" {
+  # The note moved out of the logs and into a file beside them; the doc sentence
+  # and the script header stayed behind saying "inside the log itself". A reader
+  # told to look inside opens a file that looks complete, finds no marker, and
+  # concludes the log is whole -- which is the exact failure this collector is
+  # written against, produced by its own documentation.
+  doc="$HACK_DIR/../docs/agents/e2e-testing.md"
+
+  # A fixed window rather than "up to the next period": the destination filename
+  # contains one, so a sentence-terminated match stops inside the very word the
+  # assertion is looking for.
+  sentence=$(grep -o 'the tail bound each kept log was written under.\{0,160\}' "$doc" | head -1)
+  [ -n "$sentence" ] || { echo "FAIL: the doc no longer describes the tail bound"; false; }
+  case "$sentence" in
+    *"inside the log"*) echo "FAIL: the doc still says the bound is inside the log"; false ;;
+  esac
+  printf '%s\n' "$sentence" | grep -q 'capture-notes.txt' || {
+    echo "FAIL: the doc does not name the file the bound lands in"
+    printf '  %s\n' "$sentence"
+    false
+  }
+
+  # And the script's own header, which a reader of the script hits first.
+  hdr=$(sed -n '1,60p' "$HACK_DIR/e2e-capture-previous-logs.sh")
+  case "$hdr" in
+    *"names the bound it was written under"*)
+      echo "FAIL: the capture script's header still claims the bound is in the log"; false ;;
+  esac
+  printf '%s\n' "$hdr" | grep -q 'capture-notes.txt' || {
+    echo "FAIL: the capture script's header does not name capture-notes.txt"; false
+  }
+}
+
+@test "the docs name the file a discarded knob note actually lands in" {
+  tmp=$(mktemp -d)
+  collect_stub_dir "$tmp"
+  export STUB_ARGV="$tmp/argv"
+
+  PATH="$tmp:$PATH" STUB_PODLIST_FAIL=1 COZY_REPORT_PODS_MAX=10m \
+    cozyreport_collect_broken_pods "$tmp/out"
+
+  # Which file the note lands in, read from the tree rather than assumed.
+  landed=""
+  for f in "$tmp/out"/COLLECTION-*.txt; do
+    [ -f "$f" ] || continue
+    grep -q "COZY_REPORT_PODS_MAX='10m'" "$f" && landed=$(basename "$f")
+  done
+  [ -n "$landed" ] || { echo "FAIL: the knob note landed nowhere"; ls "$tmp/out"; false; }
+
+  # The doc promised two destinations and the note uses a third on this path. A
+  # reader who mistyped a knob AND hit an unreachable apiserver follows the doc to
+  # COLLECTION-NOTES.txt, finds nothing, and concludes the knob was accepted.
+  # The marker-parity guard cannot catch this: it checks that each filename is
+  # named somewhere in both doc and code, never which file a given note goes to.
+  # Scoped to the SENTENCE about knob-note destinations, not the whole document.
+  # COLLECTION-FAILED.txt is named elsewhere in the doc for an unrelated reason, so
+  # a document-wide grep passes whether or not it is listed as a destination -- the
+  # same weakness a document-wide match has anywhere.
+  sentence=$(sed -n 's/.*a knob value the collector could not use is named too\(.*\)/\1/p' \
+    "$HACK_DIR/../docs/agents/e2e-testing.md" | head -1)
+  [ -n "$sentence" ] || { echo "FAIL: could not locate the knob-note sentence in the docs"; false; }
+  if ! printf '%s\n' "$sentence" | grep -q "$landed"; then
+    echo "FAIL: the note landed in $landed, which that sentence never names as a destination"
+    printf '  sentence: %s\n' "$sentence"
+    false
+  fi
+  rm -rf "$tmp"
+}
+
+@test "a pod list refusal is not attributed to a timeout that did not fire" {
+  tmp=$(mktemp -d)
+  collect_stub_dir "$tmp"
+  export STUB_ARGV="$tmp/argv"
+
+  # Exit 1, no stderr: kubectl refused and said nothing. The old wording offered
+  # "at 124 or 137 the read was cut off by its own 30s timeout" to a reader who had
+  # just read "exited 1" -- a mechanism that was not in play, plus a conditional
+  # the code had already evaluated. Every other classification site in these three
+  # scripts branches instead.
+  PATH="$tmp:$PATH" STUB_PODLIST_FAIL=silent cozyreport_collect_broken_pods "$tmp/out"
+
+  f="$tmp/out/COLLECTION-FAILED.txt"
+  grep -q 'exited 1' "$f"
+  if grep -qE 'at 124 or 137|cut off by' "$f"; then
+    echo "FAIL: a plain refusal is described in terms of the read timeout"
+    cat "$f"
+    false
+  fi
+  rm -rf "$tmp"
+}
+
+@test "a pod list killed by the timeout says so without a disjunction" {
+  tmp=$(mktemp -d)
+  collect_stub_dir "$tmp"
+  export STUB_ARGV="$tmp/argv"
+
+  PATH="$tmp:$PATH" STUB_PODLIST_FAIL=timeout cozyreport_collect_broken_pods "$tmp/out"
+
+  f="$tmp/out/COLLECTION-FAILED.txt"
+  grep -q 'the read was cut off by' "$f"
+  # The reader is told which mechanism applied, not asked to evaluate a condition.
+  if grep -q 'at 124 or 137' "$f"; then
+    echo "FAIL: made the reader evaluate the exit code the script already knew"
+    cat "$f"
+    false
+  fi
+  rm -rf "$tmp"
+}
+
+@test "a discarded knob is reported even when the pod list never returned" {
+  tmp=$(mktemp -d)
+  collect_stub_dir "$tmp"
+  export STUB_ARGV="$tmp/argv"
+
+  # The failed-list branch returns before the note block at the end of the
+  # function, so an operator who both mistyped a bound and hit an unreachable
+  # apiserver was told about the second and never about the first -- while the
+  # comment on that block promises the value is named whether or not either bound
+  # fired. Low damage, but the comment is the contract the rest of the file is
+  # written against.
+  PATH="$tmp:$PATH" STUB_PODLIST_FAIL=1 COZY_REPORT_PODS_MAX=10m \
+    cozyreport_collect_broken_pods "$tmp/out"
+
+  [ -f "$tmp/out/COLLECTION-FAILED.txt" ]
+  if ! grep -q "COZY_REPORT_PODS_MAX='10m'" "$tmp/out/COLLECTION-FAILED.txt"; then
+    echo "FAIL: the discarded knob left no trace when the pod list failed"
+    cat "$tmp/out/COLLECTION-FAILED.txt"
+    false
+  fi
+  rm -rf "$tmp"
+}
+
+@test "the shared cap fixes the starting number, not the resulting counts" {
+  tmp=$(mktemp -d)
+  collect_stub_dir "$tmp"
+  export STUB_ARGV="$tmp/argv"
+  rows="$(i=1; while [ "$i" -le 3 ]; do printf 'ns-%s  pod-%s  0/1  Running  0  5m\n' "$i" "$i"; i=$((i + 1)); done)"
+
+  # Two Environment blocks said the shared default means the listing and the
+  # evidence tree "cannot disagree" about how much was kept. They can: the
+  # collector also stops on its time budget, so it holds fewer pods than the
+  # summary lists, and that is a legitimate outcome rather than a contradiction.
+  # What the shared constant actually prevents is the two STARTING from different
+  # numbers. This pins the difference the header used to deny.
+  PATH="$tmp:$PATH" STUB_POD_ROWS="$rows" COZY_REPORT_PODS_BUDGET=0 \
+    cozyreport_collect_broken_pods "$tmp/out"
+
+  collected=$(find "$tmp/out" -mindepth 2 -maxdepth 2 -type d 2>/dev/null | wc -l | tr -d ' ')
+  # The budget stopped the walk before any pod, while all three remain listed in
+  # the summary's source. Counts differ, and the artifact explains why.
+  [ "$collected" -lt 3 ]
+  grep -q 'collection budget elapsed' "$tmp/out/COLLECTION-TRUNCATED.txt"
+  rm -rf "$tmp"
+}
+
+@test "the unbounded note does not claim completeness the caps contradict" {
+  tmp=$(mktemp -d)
+  collect_stub_dir "$tmp"
+  export STUB_ARGV="$tmp/argv"
+  rows="$(printf '%s\n' \
+    'ns-1  p-1  0/1  Running  0  5m' \
+    'ns-2  p-2  0/1  Running  0  5m' \
+    'ns-3  p-3  0/1  Running  0  5m')"
+
+  # Both notes in one directory. A missing `timeout` removes only the wall-clock
+  # ceiling; the pod cap, the collection budget and --tail all still apply, so
+  # "the evidence here is complete" was false whenever any of them fired. The
+  # existing UNBOUNDED test feeds a single pod, so the cap never overflows and the
+  # two files never meet -- the claim was unfalsifiable rather than checked.
+  PATH="$tmp:$PATH" COZYREPORT_BOUND="" STUB_POD_ROWS="$rows" COZY_REPORT_PODS_MAX=1 \
+    cozyreport_collect_broken_pods "$tmp/out"
+
+  [ -f "$tmp/out/COLLECTION-UNBOUNDED.txt" ]
+  [ -f "$tmp/out/COLLECTION-TRUNCATED.txt" ]
+  grep -q 'collected 1 of 3' "$tmp/out/COLLECTION-TRUNCATED.txt"
+  for note in "$tmp/out"/COLLECTION-*.txt; do
+    if grep -qE 'evidence here is complete|is complete,' "$note"; then
+      echo "FAIL: $(basename "$note") claims completeness while a cap was reported beside it"
+      cat "$note"
+      false
+    fi
+  done
+  rm -rf "$tmp"
+}
+
+@test "no truncation note claims completeness while a truncated file sits beside it" {
+  # Budget expires part way through a pod whose logs were ALSO being cut off by their own read timeout. That combination is not
+  # exotic -- the budget runs out because reads are slow, and the ordinary way for
+  # a read to be slow is to hit its ceiling -- so the two notes land in the same
+  # directory and must not contradict each other.
+  tmp=$(mktemp -d)
+  collect_stub_dir "$tmp"
+  export STUB_ARGV="$tmp/argv"
+  export STUB_CONTAINERS='app sidecar'
+
+  # Both halves have to be true at once for this to test anything: the note must
+  # be written AND a file beside it must be truncated. An expired deadline writes
+  # the note (and stops the walk before any container), while STUB_OBJ_MODE cuts
+  # off the two object reads that happen before the loop. With only STUB_LOG_MODE
+  # and no deadline, no note is written at all and the loop below iterates over
+  # nothing, which is green regardless of the wording.
+  PATH="$tmp:$PATH" STUB_OBJ_MODE=partial COZYREPORT_COLLECT_DEADLINE=1 \
+    cozyreport_collect_pod ns wide-0 "$tmp/out"
+
+  [ -f "$tmp/out/CONTAINER-LOGS-TRUNCATED.txt" ]
+  grep -q '^# \[cozyreport\] TRUNCATED' "$tmp/out/pod.yaml"
+  grep -q '^# \[cozyreport\] TRUNCATED' "$tmp/out/describe.txt"
+
+  # Neither note may assert its neighbours are whole while those neighbours say
+  # otherwise on their own last line.
+  for note in "$tmp/out"/*TRUNCATED.txt "$tmp/out"/COLLECTION-*.txt; do
+    [ -f "$note" ] || continue
+    if grep -qE 'read in full|is complete|both of which were collected' "$note"; then
+      echo "FAIL: $(basename "$note") claims completeness next to a truncated file"
+      cat "$note"
+      false
+    fi
+  done
+  rm -rf "$tmp"
+}
+
+@test "collect pod marks pod.yaml and describe.txt when their read was cut off" {
+  tmp=$(mktemp -d)
+  collect_stub_dir "$tmp"
+  export STUB_ARGV="$tmp/argv"
+
+  PATH="$tmp:$PATH" STUB_OBJ_MODE=partial cozyreport_collect_pod ns pod-1 "$tmp/out"
+
+  # Both are killed at the same ceiling as every other read, so a half-written
+  # file is an outcome they can produce. A describe.txt that stops before its Events section is
+  # byte-indistinguishable from a pod that had no events, and that reading is the
+  # exact one this collector exists to prevent.
+  for f in describe.txt pod.yaml; do
+    if ! grep -q '^# \[cozyreport\] TRUNCATED' "$tmp/out/$f"; then
+      echo "FAIL: $f was cut off mid-read and says nothing about it"
+      cat "$tmp/out/$f"
+      false
+    fi
+  done
+  # What did land is kept, not discarded: a partial describe still names the pod.
+  grep -q 'Status: Running' "$tmp/out/describe.txt"
+  rm -rf "$tmp"
+}
+
+@test "collect pod leaves no truncation marker on a read that completed" {
+  tmp=$(mktemp -d)
+  collect_stub_dir "$tmp"
+  export STUB_ARGV="$tmp/argv"
+
+  PATH="$tmp:$PATH" cozyreport_collect_pod ns pod-1 "$tmp/out"
+
+  # The other half of the contract. A marker on every file would be as useless as
+  # a marker on none: the reader could not tell which reads actually stopped short.
+  for f in describe.txt pod.yaml; do
+    if grep -q 'TRUNCATED' "$tmp/out/$f"; then
+      echo "FAIL: $f completed but claims it was truncated"
+      false
+    fi
+  done
+  grep -q 'Events:' "$tmp/out/describe.txt"
+  rm -rf "$tmp"
+}
+
+@test "collect pod stops reading containers once the collection deadline passed" {
+  tmp=$(mktemp -d)
+  collect_stub_dir "$tmp"
+  export STUB_ARGV="$tmp/argv"
+  export STUB_CONTAINERS='app sidecar exporter'
+
+  PATH="$tmp:$PATH" COZYREPORT_COLLECT_DEADLINE=1 cozyreport_collect_pod ns wide-0 "$tmp/out"
+
+  # Without this the overshoot past the collection budget grows with the pod's
+  # container count, so a ceiling stated in terms of one container is not one.
+  [ -f "$tmp/out/CONTAINER-LOGS-TRUNCATED.txt" ]
+  # The note says what was ATTEMPTED and points at each file's own last line for
+  # whether that read finished. It must not claim the files beside it are whole:
+  # this note is written because reads were slow, and the ordinary way to be slow
+  # is to hit the per-read ceiling, so a neighbouring log carrying its own
+  # TRUNCATED marker is the likely case, and a test pinning "read in full" would
+  # hold that false claim in place.
+  grep -q 'were attempted' "$tmp/out/CONTAINER-LOGS-TRUNCATED.txt"
+  if grep -qE 'read in full|is complete' "$tmp/out/CONTAINER-LOGS-TRUNCATED.txt"; then
+    echo "FAIL: the truncation note claims neighbouring files are complete"
+    cat "$tmp/out/CONTAINER-LOGS-TRUNCATED.txt"
+    false
+  fi
+  if [ -f "$tmp/out/logs-app.txt" ]; then echo "FAIL: read a container past the deadline"; false; fi
+  # The two reads that are not per-container still happened: they are what makes
+  # the note above answerable, since they name the containers that were skipped.
+  [ -f "$tmp/out/pod.yaml" ]
+  [ -f "$tmp/out/describe.txt" ]
+  rm -rf "$tmp"
+}
+
+@test "collect pod reads every container when no deadline was handed to it" {
+  tmp=$(mktemp -d)
+  collect_stub_dir "$tmp"
+  export STUB_ARGV="$tmp/argv"
+  export STUB_CONTAINERS='app sidecar exporter'
+
+  PATH="$tmp:$PATH" cozyreport_collect_pod ns wide-0 "$tmp/out"
+
+  # A guard that fires when the caller set no budget would silently gut the
+  # report for every direct caller of this helper.
+  [ -f "$tmp/out/logs-app.txt" ]
+  [ -f "$tmp/out/logs-sidecar.txt" ]
+  [ -f "$tmp/out/logs-exporter.txt" ]
+  if [ -f "$tmp/out/CONTAINER-LOGS-TRUNCATED.txt" ]; then echo "FAIL: claimed a truncation with no budget set"; false; fi
+  rm -rf "$tmp"
+}
+
+@test "collect broken pods walks the selection into one directory per pod" {
+  tmp=$(mktemp -d)
+  collect_stub_dir "$tmp"
+  export STUB_ARGV="$tmp/argv"
+  export STUB_POD_ROWS="$(printf '%s\n' \
+    'cozy-keycloak  keycloak-db-2  0/1  Running  0  6m' \
+    'kube-system    coredns-abc    1/1  Running  0  2h' \
+    'cozy-system    puller-z       0/1  ImagePullBackOff  0  4m')"
+
+  PATH="$tmp:$PATH" cozyreport_collect_broken_pods "$tmp/pods"
+
+  # Selection and collection are each pinned above; this pins the wiring, where
+  # a `read` eating the wrong field would leave a report quietly holding fewer
+  # pods than the cluster had, with no other symptom.
+  [ -f "$tmp/pods/cozy-keycloak/keycloak-db-2/pod.yaml" ]
+  [ -f "$tmp/pods/cozy-system/puller-z/pod.yaml" ]
+  if [ -d "$tmp/pods/kube-system/coredns-abc" ]; then echo "FAIL: collected a healthy pod"; false; fi
+  rm -rf "$tmp"
+}
+
+@test "collect broken pods spends its cap on the tenant namespaces first" {
+  tmp=$(mktemp -d)
+  collect_stub_dir "$tmp"
+  export STUB_ARGV="$tmp/argv"
+  # kubectl emits namespace-alphabetical rows, so cozy-* arrives first and the pod
+  # the suite died on arrives last. The cap only bites on a broadly degraded
+  # cluster, which is exactly when the platform contributes those cozy-* rows.
+  export STUB_POD_ROWS="$(printf '%s\n' \
+    'cozy-a  pod-a  0/1  Running  0  5m' \
+    'cozy-b  pod-b  0/1  Running  0  5m' \
+    'cozy-c  pod-c  0/1  Running  0  5m' \
+    'tenant-test  the-pod-the-run-died-on  0/1  Running  0  5m')"
+
+  PATH="$tmp:$PATH" COZY_REPORT_PODS_MAX=1 cozyreport_collect_broken_pods "$tmp/pods"
+
+  [ -f "$tmp/pods/tenant-test/the-pod-the-run-died-on/pod.yaml" ]
+  if [ -d "$tmp/pods/cozy-a" ]; then echo "FAIL: spent the cap on an unrelated namespace"; false; fi
+  rm -rf "$tmp"
+}
+
+@test "collect broken pods collects a zero cap without aborting the report" {
+  tmp=$(mktemp -d)
+  collect_stub_dir "$tmp"
+  export STUB_ARGV="$tmp/argv"
+  export STUB_POD_ROWS='ns-1  pod-1  0/1  Running  0  5m'
+
+  PATH="$tmp:$PATH" COZY_REPORT_PODS_MAX=0 cozyreport_collect_broken_pods "$tmp/pods"
+
+  # GNU head takes `-n 0` as an empty result; BSD/macOS head rejects it with
+  # "illegal line count -- 0", which under a local run aborts the collection. The
+  # drop still has to be visible.
+  [ "$(find "$tmp/pods" -name pod.yaml | grep -c . || true)" -eq 0 ]
+  grep -q 'collected 0 of 1' "$tmp/pods/COLLECTION-TRUNCATED.txt"
+  rm -rf "$tmp"
+}
+
+@test "collect broken pods reports a malformed cap instead of applying it silently" {
+  tmp=$(mktemp -d)
+  collect_stub_dir "$tmp"
+  export STUB_ARGV="$tmp/argv"
+  export STUB_POD_ROWS='ns-1  pod-1  0/1  Running  0  5m'
+
+  PATH="$tmp:$PATH" COZY_REPORT_PODS_MAX=abc cozyreport_collect_broken_pods "$tmp/pods"
+
+  # An operator who wrote a value and got the default with no trace reads the
+  # result as the bound they asked for. Reported even though nothing was truncated:
+  # the discarded value is the finding, not the truncation.
+  grep -q "COZY_REPORT_PODS_MAX='abc'" "$tmp/pods/COLLECTION-NOTES.txt"
+  grep -q 'used 40' "$tmp/pods/COLLECTION-NOTES.txt"
+  rm -rf "$tmp"
+}
+
+@test "collect broken pods reports a malformed budget the same way" {
+  tmp=$(mktemp -d)
+  collect_stub_dir "$tmp"
+  export STUB_ARGV="$tmp/argv"
+  export STUB_POD_ROWS='ns-1  pod-1  0/1  Running  0  5m'
+
+  PATH="$tmp:$PATH" COZY_REPORT_PODS_BUDGET=10m cozyreport_collect_broken_pods "$tmp/pods"
+
+  grep -q "COZY_REPORT_PODS_BUDGET='10m'" "$tmp/pods/COLLECTION-NOTES.txt"
+  grep -q 'used 600' "$tmp/pods/COLLECTION-NOTES.txt"
+  rm -rf "$tmp"
+}
+
+@test "collect broken pods rejects a number too large for the shell to compute with" {
+  tmp=$(mktemp -d)
+  collect_stub_dir "$tmp"
+  export STUB_ARGV="$tmp/argv"
+  export STUB_POD_ROWS='ns-1  pod-1  0/1  Running  0  5m'
+
+  PATH="$tmp:$PATH" COZY_REPORT_PODS_BUDGET=999999999999999999999999 \
+    cozyreport_collect_broken_pods "$tmp/pods"
+
+  # All-digits is not the same test as "this shell can compute with it".
+  # `$(( now + 999999999999999999999999 ))` is fatal in dash, which is /bin/sh on
+  # the CI image, so the report would end at the deadline calculation and never
+  # reach the tarball -- the one outcome every bound here exists to avoid.
+  grep -q "COZY_REPORT_PODS_BUDGET='999999999999999999999999'" "$tmp/pods/COLLECTION-NOTES.txt"
+  [ -f "$tmp/pods/ns-1/pod-1/pod.yaml" ]
+  rm -rf "$tmp"
+}
+
+@test "pod tail rejects a number too large for the shell as well" {
+  [ "$(COZY_REPORT_POD_TAIL=999999999999999999999999 cozyreport_pod_tail)" = "2000" ]
+  [ -n "$(COZY_REPORT_POD_TAIL=999999999999999999999999 cozyreport_pod_tail_note)" ]
+}
+
+@test "collect broken pods appends a knob note to a truncation it also reported" {
+  tmp=$(mktemp -d)
+  collect_stub_dir "$tmp"
+  export STUB_ARGV="$tmp/argv"
+  export STUB_POD_ROWS="$(i=1; while [ "$i" -le 5 ]; do printf 'ns-%s  pod-%s  0/1  Running  0  5m\n' "$i" "$i"; i=$((i + 1)); done)"
+
+  PATH="$tmp:$PATH" COZY_REPORT_PODS_MAX=2 COZY_REPORT_POD_TAIL=abc \
+    cozyreport_collect_broken_pods "$tmp/pods"
+
+  # Only the standalone COLLECTION-NOTES.txt branch was covered; this is the other
+  # one, where a truncation note already exists and the knob note has to join it
+  # rather than land in a second file nobody reads.
+  grep -q 'collected 2 of 5' "$tmp/pods/COLLECTION-TRUNCATED.txt"
+  grep -q "COZY_REPORT_POD_TAIL='abc'" "$tmp/pods/COLLECTION-TRUNCATED.txt"
+  if [ -f "$tmp/pods/COLLECTION-NOTES.txt" ]; then echo "FAIL: split the note across two files"; false; fi
+  rm -rf "$tmp"
+}
+
+@test "collect broken pods says nothing extra when both knobs are well formed" {
+  tmp=$(mktemp -d)
+  collect_stub_dir "$tmp"
+  export STUB_ARGV="$tmp/argv"
+  export STUB_POD_ROWS='ns-1  pod-1  0/1  Running  0  5m'
+
+  PATH="$tmp:$PATH" COZY_REPORT_PODS_MAX=5 COZY_REPORT_PODS_BUDGET=300 cozyreport_collect_broken_pods "$tmp/pods"
+
+  if [ -f "$tmp/pods/COLLECTION-NOTES.txt" ]; then echo "FAIL: invented a note about a value it accepted"; false; fi
+  rm -rf "$tmp"
+}
+
+@test "collect broken pods reports a malformed tail alongside the other knobs" {
+  tmp=$(mktemp -d)
+  collect_stub_dir "$tmp"
+  export STUB_ARGV="$tmp/argv"
+  export STUB_POD_ROWS='ns-1  pod-1  0/1  Running  0  5m'
+
+  PATH="$tmp:$PATH" COZY_REPORT_POD_TAIL=1O00 cozyreport_collect_broken_pods "$tmp/pods"
+
+  # The header claims every numeric knob reports its fallback. Two of the three
+  # doing it is the documentation being wrong about the third.
+  grep -q "COZY_REPORT_POD_TAIL='1O00'" "$tmp/pods/COLLECTION-NOTES.txt"
+  rm -rf "$tmp"
+}
+
+@test "pod tail value and the note about it never disagree" {
+  # Two `case` patterns written to mean the same thing drift: `00` is all-digits
+  # and non-zero as a string, so a split validator applies `--tail=00` (which is
+  # --tail=0, no lines at all, then described as a container that never logged)
+  # while the note claims the value was ignored. `10m` is the mirror image.
+  for v in '' 2000 -1 0 00 007 10m 1O00 2000x abc; do
+    value=$(COZY_REPORT_POD_TAIL="$v" cozyreport_pod_tail)
+    note=$(COZY_REPORT_POD_TAIL="$v" cozyreport_pod_tail_note)
+    if [ "$value" = "2000" ] && [ "$v" != "2000" ] && [ -n "$v" ] && [ -z "$note" ]; then
+      echo "FAIL: COZY_REPORT_POD_TAIL='$v' fell back to 2000 with no note"
+      false
+    fi
+    if [ "$value" != "2000" ] && [ -n "$note" ]; then
+      echo "FAIL: COZY_REPORT_POD_TAIL='$v' was applied as '$value' while the note called it malformed"
+      false
+    fi
+  done
+}
+
+@test "pod tail refuses a padded zero the same as a plain one" {
+  # `--tail=00` reaches kubectl as 0 and returns nothing, which this script would
+  # then report as a container that never started or stayed quiet.
+  [ "$(COZY_REPORT_POD_TAIL=00 cozyreport_pod_tail)" = "2000" ]
+  [ "$(COZY_REPORT_POD_TAIL=0 cozyreport_pod_tail)" = "2000" ]
+}
+
+@test "collect broken pods survives a read only temp dir without blaming the cluster" {
+  tmp=$(mktemp -d)
+  collect_stub_dir "$tmp"
+  export STUB_ARGV="$tmp/argv"
+  export STUB_POD_ROWS='ns-1  pod-1  0/1  Running  0  5m'
+  # A path that does not exist, not one that is unwritable: root holds
+  # CAP_DAC_OVERRIDE, so mktemp succeeds inside a 0500 directory and the test would
+  # exercise the happy path and pass without ever entering the fallback it exists to
+  # pin. The e2e sandbox runs as root. ENOENT is refused for everyone.
+  PATH="$tmp:$PATH" TMPDIR="$tmp/gone" cozyreport_collect_broken_pods "$tmp/pods"
+
+  # With no fallback for the scratch file the redirect itself fails, the command
+  # substitution returns non-zero, and the report states that the pod list did not
+  # return: a false claim about the cluster caused by the local filesystem.
+  if [ -f "$tmp/pods/COLLECTION-FAILED.txt" ]; then
+    echo "FAIL: blamed the cluster for an unwritable TMPDIR"
+    cat "$tmp/pods/COLLECTION-FAILED.txt"
+    false
+  fi
+  [ -f "$tmp/pods/ns-1/pod-1/pod.yaml" ]
+  rm -rf "$tmp"
+}
+
+@test "collect broken pods still collects when timeout is missing and says so" {
+  tmp=$(mktemp -d)
+  collect_stub_dir "$tmp"
+  export STUB_ARGV="$tmp/argv"
+  export STUB_POD_ROWS='ns-1  pod-1  0/1  Running  0  5m'
+
+  # An empty bound is what sourcing this script on a host without `timeout`
+  # produces, since the question is answered once at file scope. Note and proceed,
+  # not refuse: an unbounded read still collects the tree, so refusing would turn a
+  # missing local binary into a lost section.
+  PATH="$tmp:$PATH" COZYREPORT_BOUND="" cozyreport_collect_broken_pods "$tmp/pods"
+
+  grep -q 'timeout is not on PATH' "$tmp/pods/COLLECTION-UNBOUNDED.txt"
+  grep -q 'not a statement about the cluster' "$tmp/pods/COLLECTION-UNBOUNDED.txt"
+  [ -f "$tmp/pods/ns-1/pod-1/pod.yaml" ]
+  [ -f "$tmp/pods/ns-1/pod-1/logs-app.txt" ]
+  rm -rf "$tmp"
+}
+
+@test "the tail note states the bound applied, not the one that was asked for" {
+  tmp=$(mktemp -d)
+  collect_stub_dir "$tmp"
+  export STUB_ARGV="$tmp/argv"
+
+  # A value the script cannot use falls back to 2000. The note inside each log
+  # used to render that as `COZY_REPORT_POD_TAIL=2000`, which is a statement about
+  # the environment and was false: the variable held the rejected value. Two files
+  # in the same tarball then disagreed about what one variable was set to, and the
+  # one a reader is most likely to open was the wrong one.
+  PATH="$tmp:$PATH" COZY_REPORT_POD_TAIL=10m cozyreport_collect_pod ns chatty-0 "$tmp/out"
+
+  grep -q 'holds at most the last 2000 lines' "$tmp/out/CONTAINER-LOGS-BOUND.txt"
+  # And the log itself is left alone: it was read in full, so it is a complete
+  # artifact and a trailing prose line would break every parser that could read
+  # it before. Same reason pod.yaml carries its marker as a YAML comment; a log
+  # format has no comment, so the note lives beside the file instead.
+  if grep -q 'holds at most the last' "$tmp/out/logs-app.txt"; then
+    echo "FAIL: the bound note is inside a successfully read log"
+    false
+  fi
+  if grep -q 'COZY_REPORT_POD_TAIL=2000' "$tmp/out/CONTAINER-LOGS-BOUND.txt"; then
+    echo "FAIL: the note claims the environment holds a value it does not"
+    grep 'COZY_REPORT_POD_TAIL' "$tmp/out/CONTAINER-LOGS-BOUND.txt"
+    false
+  fi
+  rm -rf "$tmp"
+}
+
+@test "a container log refused without a message is not filed as silence" {
+  tmp=$(mktemp -d)
+  collect_stub_dir "$tmp"
+  export STUB_ARGV="$tmp/argv"
+
+  PATH="$tmp:$PATH" STUB_LOG_MODE=silent cozyreport_collect_pod ns quiet-0 "$tmp/out"
+
+  # Exit non-zero, no log, and a scratch file that exists and is empty. kubectl
+  # refused and said nothing, which is not the same fact as a container that ran
+  # and logged nothing, and only one of the two is about the cluster.
+  grep -q 'without a message' "$tmp/out/logs-app.txt"
+  if grep -q 'started and logged nothing' "$tmp/out/logs-app.txt"; then
+    echo "FAIL: a refusal is reported as a silent container"
+    cat "$tmp/out/logs-app.txt"
+    false
+  fi
+  rm -rf "$tmp"
+}
+
+@test "a container list that stopped part way says the rest is unaccounted for" {
+  tmp=$(mktemp -d)
+  collect_stub_dir "$tmp"
+  export STUB_ARGV="$tmp/argv"
+
+  PATH="$tmp:$PATH" STUB_JSONPATH_FAIL=partial cozyreport_collect_pod ns half-0 "$tmp/out"
+
+  # Names arrived and the read still failed, so the list is a prefix. The
+  # empty-list branch never fires -- the list is not empty, it is incomplete --
+  # and without a marker the directory holds logs for the containers kubectl got
+  # to and nothing for the rest, which a reader counts as the whole pod.
+  grep -q 'INCOMPLETE' "$tmp/out/CONTAINER-LIST-INCOMPLETE.txt" || {
+    echo "FAIL: a partial container list is not marked"
+    ls "$tmp/out"
+    false
+  }
+  grep -q 'unexpected EOF' "$tmp/out/CONTAINER-LIST-INCOMPLETE.txt"
+  # And the containers it did name are still collected: partial evidence is kept.
+  [ -f "$tmp/out/logs-app.txt" ] || { echo "FAIL: the named container was not read"; false; }
+  rm -rf "$tmp"
+}
+
+@test "a complete container list leaves no incompleteness marker" {
+  tmp=$(mktemp -d)
+  collect_stub_dir "$tmp"
+  export STUB_ARGV="$tmp/argv"
+
+  PATH="$tmp:$PATH" cozyreport_collect_pod ns whole-0 "$tmp/out"
+
+  if [ -f "$tmp/out/CONTAINER-LIST-INCOMPLETE.txt" ]; then
+    echo "FAIL: a clean container list was marked incomplete"
+    cat "$tmp/out/CONTAINER-LIST-INCOMPLETE.txt"
+    false
+  fi
+  rm -rf "$tmp"
+}
+
+@test "an empty container list refused without a message says which happened" {
+  tmp=$(mktemp -d)
+  collect_stub_dir "$tmp"
+  export STUB_ARGV="$tmp/argv"
+
+  PATH="$tmp:$PATH" STUB_JSONPATH_FAIL=silent cozyreport_collect_pod ns gone-0 "$tmp/out"
+
+  # Four ways the container list comes back empty, and this is the one with
+  # nothing to quote and no clock involved. Reported as its own outcome rather
+  # than folded into the timeout branch above it or the no-temp-dir branch below.
+  grep -q 'said nothing and exited 1' "$tmp/out/logs-UNAVAILABLE.txt"
+  rm -rf "$tmp"
+}
+
+@test "an empty container list with nowhere to write its reason says that instead" {
+  tmp=$(mktemp -d)
+  collect_stub_dir "$tmp"
+  export STUB_ARGV="$tmp/argv"
+
+  # A refusal that is NOT a timeout, with no writable temp dir: the branch the
+  # sibling test could not reach, because it paired an unwritable TMPDIR with a
+  # timeout and the timeout branch is checked first.
+  PATH="$tmp:$PATH" TMPDIR=/nonexistent-cozyreport-probe STUB_JSONPATH_FAIL=silent \
+    cozyreport_collect_pod ns gone-0 "$tmp/out"
+
+  grep -q 'could not be captured' "$tmp/out/logs-UNAVAILABLE.txt"
+  if grep -q 'said nothing and exited' "$tmp/out/logs-UNAVAILABLE.txt"; then
+    echo "FAIL: a lost message is reported as kubectl having been silent"
+    cat "$tmp/out/logs-UNAVAILABLE.txt"
+    false
+  fi
+  rm -rf "$tmp"
+}
+
+@test "a container list that names nothing is blank, not empty, and still reports" {
+  tmp=$(mktemp -d)
+  collect_stub_dir "$tmp"
+  export STUB_ARGV="$tmp/argv"
+
+  # The shape real kubectl produces, which the other tests in this group do not:
+  # the jsonpath holds two expressions with a literal space between them, and that
+  # space is emitted whatever the fields contain. A pod that names no container
+  # therefore comes back as " ", never as "". Command substitution strips trailing
+  # NEWLINES and not spaces, so a check written as `[ -z ]` is FALSE here and the
+  # read falls through every branch meant to catch it: no logs-UNAVAILABLE.txt, no
+  # CONTAINER-LIST-INCOMPLETE.txt, and a pod directory carrying pod.yaml and
+  # describe.txt with no log file and nothing saying why -- which reads as a pod
+  # whose containers were silent, the exact confusion this tree exists to remove.
+  #
+  # Exits 0 deliberately. A failing read writes no stdout, so it lands in the
+  # branch correctly even with the bug; only a SUCCESSFUL read that names nothing
+  # reaches this, which is why it survived the other tests here.
+  PATH="$tmp:$PATH" STUB_CONTAINERS=' ' cozyreport_collect_pod ns quiet-0 "$tmp/out"
+
+  if [ ! -f "$tmp/out/logs-UNAVAILABLE.txt" ]; then
+    echo "FAIL: a blank container list left the pod directory with no logs and no explanation"
+    ls -la "$tmp/out"
+    false
+  fi
+  grep -q 'container list came back empty' "$tmp/out/logs-UNAVAILABLE.txt"
+  # Not the prefix branch: nothing was named, so claiming kubectl named some
+  # containers and stopped would invent a partial read that never happened.
+  if [ -f "$tmp/out/CONTAINER-LIST-INCOMPLETE.txt" ]; then
+    echo "FAIL: a blank list reported as a truncated one"
+    cat "$tmp/out/CONTAINER-LIST-INCOMPLETE.txt"
+    false
+  fi
+  rm -rf "$tmp"
+}
+
+@test "an object cut off by a signal does not name the deadline as the cause" {
+  tmp=$(mktemp -d)
+  collect_stub_dir "$tmp"
+  export STUB_ARGV="$tmp/argv"
+
+  PATH="$tmp:$PATH" STUB_OBJ_MODE=partial9 cozyreport_collect_pod ns hung-0 "$tmp/out"
+
+  # 137 reaches the object files by the same path it reaches the logs, and has to
+  # hedge there too: the kill grace produces it and so does anything else that
+  # SIGKILLs the read. Proven for logs already; the object reader shares the
+  # helper but not the test, and a helper shared by two callers is only covered
+  # where it is called.
+  grep -q 'SIGKILL' "$tmp/out/pod.yaml"
+  grep -q 'does not tell apart' "$tmp/out/pod.yaml"
+  rm -rf "$tmp"
+}
+
+@test "an object read killed before its first byte does not claim the object ended" {
+  tmp=$(mktemp -d)
+  collect_stub_dir "$tmp"
+  export STUB_ARGV="$tmp/argv"
+
+  PATH="$tmp:$PATH" STUB_OBJ_MODE=killed cozyreport_collect_pod ns hung-0 "$tmp/out"
+
+  # The file never started, so "ends here" is the whole content. It still has to
+  # say the read was cut off rather than leave a zero-byte pod.yaml, which is what
+  # a pod that genuinely has no object would also leave.
+  [ -s "$tmp/out/pod.yaml" ] || { echo "FAIL: nothing written for a killed object read"; false; }
+  grep -q '^# \[cozyreport\] TRUNCATED' "$tmp/out/pod.yaml"
+  rm -rf "$tmp"
+}
+
+@test "the read bound is resolved from the host at load time" {
+  tmp=$(mktemp -d)
+  # Only the binaries sourcing the script needs, and deliberately no `timeout`.
+  for b in sh dirname; do
+    for d in /bin /usr/bin; do
+      [ -x "$d/$b" ] && { ln -sf "$d/$b" "$tmp/$b"; break; }
+    done
+  done
+
+  # Resolved once at file scope so a caller that drives cozyreport_collect_pod
+  # directly gets the same answer as the walk does. Defaulting to the bounded form
+  # and correcting it inside the walk would hand such a caller five reads that exit
+  # 127, and every log file would then blame the cluster for a missing binary.
+  bound=$(PATH="$tmp" sh -c 'COZYREPORT_LIB=1; . "$1"; printf "%s" "$COZYREPORT_BOUND"' _ "$SCRIPT")
+  if [ -n "$bound" ]; then echo "FAIL: claimed a bound of '$bound' with no timeout on PATH"; false; fi
+
+  # The other direction, and it supplies its own `timeout` rather than asking the
+  # host for one. Reading the ambient PATH here would make the verdict depend on
+  # what the machine happens to have installed, which is the same defect this pair
+  # of assertions exists to describe.
+  printf '#!/bin/sh\nshift 2\nexec "$@"\n' > "$tmp/timeout"
+  chmod +x "$tmp/timeout"
+  bound=$(PATH="$tmp" sh -c 'COZYREPORT_LIB=1; . "$1"; printf "%s" "$COZYREPORT_BOUND"' _ "$SCRIPT")
+  if [ -z "$bound" ]; then echo "FAIL: no bound with a timeout on PATH"; false; fi
+  case "$bound" in
+    timeout*) ;;
+    *) echo "FAIL: the bound does not start with timeout: $bound"; false ;;
+  esac
+  rm -rf "$tmp"
+}
+
+@test "the cap never evicts a pod the uncapped collector always kept" {
+  # The regression this ordering exists to prevent. A selector of
+  # `$4 !~ /Running|Succeeded|Completed/` with no cap collects a CrashLoopBackOff
+  # pod always. Widening it to include `0/1 Running` and capping the walk by count
+  # are safe apart and only safe together if the wide class cannot displace the
+  # narrow one.
+  #
+  # Fixture is the shape a failed install actually produces: more not-Ready pods
+  # than the cap, nearly all of them newly-in-scope tenant pods, and one crash loop
+  # in a platform namespace. Namespace-first ranking puts that crash loop after
+  # every tenant row and the cap then drops it -- which is why the split is by
+  # evidence class first.
+  rows=$(i=1; while [ "$i" -le 60 ]; do
+    printf 'tenant-test  unready-%02d  0/1  Running  0  5m\n' "$i"
+    i=$((i + 1))
+  done
+  printf 'cozy-system  the-crashing-one  0/1  CrashLoopBackOff  7  9m\n')
+
+  out=$(printf '%s\n' "$rows" | COZY_REPORT_PREFER_NS=tenant- cozyreport_pods_prioritize)
+
+  # First, not merely present: the cap is a `head -n`, so surviving it means being
+  # ordered ahead of the rows that would fill it.
+  first=$(printf '%s\n' "$out" | sed -n '1p' | awk '{print $2}')
+  if [ "$first" != "the-crashing-one" ]; then
+    echo "FAIL: a crash-looping pod ranked behind newly-in-scope unready pods, so any cap drops it"
+    printf '%s\n' "$out" | head -n 3
+    false
+  fi
+  # It really would have been dropped: the competing rows outnumber the default cap.
+  [ "$(printf '%s\n' "$out" | grep -c .)" -eq 61 ]
+  # Tenant-first still holds WITHIN the newly-in-scope class -- the preference is
+  # narrowed to its own class, not abandoned.
+  after=$(printf '%s\n' "$out" | sed -n '2p' | awk '{print $1}')
+  [ "$after" = "tenant-test" ]
+  # No cleanup line here, deliberately: this test creates no directory. An
+  # `rm -rf "$tmp"` added out of habit does NOT no-op -- `tmp` is hack/cozytest.sh's
+  # OWN variable for the per-test scratch dir holding the captured log, and it is in
+  # scope inside the test body. Removing it takes the runner's log with it, and the
+  # test then fails after every assertion in it has already passed.
+}
+
+@test "an empty prefix disables the namespace order but not the class order" {
+  rows="$(printf '%s\n' \
+    'cozy-a  pod-a  0/1  Running  0  5m' \
+    'tenant-test  pod-t  0/1  Running  0  5m')"
+
+  out="$(printf '%s\n' "$rows" | COZY_REPORT_PREFER_NS='' cozyreport_pods_prioritize)"
+
+  # The documented disable switch, within one evidence class: input order is kept
+  # and no row is dropped. Without the guard the empty prefix matches every row in
+  # the first emission and nothing in the second, which happens to look right here
+  # and stops looking right the moment a caller relies on input order.
+  [ "$(printf '%s\n' "$out" | grep -c .)" -eq 2 ]
+  [ "$(printf '%s\n' "$out" | head -n 1 | awk '{print $2}')" = "pod-a" ]
+}
+
+@test "an empty prefix does not switch off the eviction guard" {
+  # The switch is documented as disabling the ordering, and a reader setting it is
+  # asking not to prefer a namespace. They are not asking for a crash-looping pod
+  # to lose its container logs to a cluster full of unready ones -- but if the
+  # class split sits behind the same guard as the namespace preference, that is
+  # what one env value quietly buys.
+  rows=$(i=1; while [ "$i" -le 60 ]; do
+    printf 'aaa-ns  unready-%02d  0/1  Running  0  5m\n' "$i"
+    i=$((i + 1))
+  done
+  printf 'zzz-system  the-crashing-one  0/1  CrashLoopBackOff  7  9m\n')
+
+  out=$(printf '%s\n' "$rows" | COZY_REPORT_PREFER_NS='' cozyreport_pods_prioritize)
+
+  # Namespace order is off, so `aaa-ns` would win any alphabetical or input-order
+  # ranking; the crash loop is first only because the class split still applies.
+  first=$(printf '%s\n' "$out" | sed -n '1p' | awk '{print $2}')
+  if [ "$first" != "the-crashing-one" ]; then
+    echo "FAIL: the empty prefix switched off the class ordering, so the cap drops the crash loop"
+    printf '%s\n' "$out" | head -n 3
+    false
+  fi
+  [ "$(printf '%s\n' "$out" | grep -c .)" -eq 61 ]
+}
+
+@test "prioritize treats the prefix as text and not as a pattern" {
+  # `tenantXtest` sorts first and matches `tenant.test` only if the prefix is read
+  # as a regular expression. The namespace the operator actually named is the one
+  # that must come first.
+  rows="$(printf '%s\n' \
+    'tenantXtest    pod-regex    0/1  Running  0  5m' \
+    'tenant.test-a  pod-literal  0/1  Running  0  5m' \
+    'cozy-a         pod-a        0/1  Running  0  5m')"
+
+  out="$(printf '%s\n' "$rows" | COZY_REPORT_PREFER_NS='tenant.test' cozyreport_pods_prioritize)"
+
+  first=$(printf '%s\n' "$out" | head -n 1 | awk '{print $2}')
+  if [ "$first" != "pod-literal" ]; then
+    echo "FAIL: expected pod-literal first, got '$first' (prefix matched as a pattern)"
+    false
+  fi
+}
+
+@test "collect broken pods leaves no deadline behind for the next caller" {
+  tmp=$(mktemp -d)
+  collect_stub_dir "$tmp"
+  export STUB_ARGV="$tmp/argv"
+  export STUB_POD_ROWS='ns-1  pod-1  0/1  Running  0  5m'
+  unset COZYREPORT_COLLECT_DEADLINE
+
+  PATH="$tmp:$PATH" COZY_REPORT_PODS_BUDGET=900 cozyreport_collect_broken_pods "$tmp/pods"
+
+  # Left set, it would silently bound whatever a later caller collects, against a
+  # deadline computed for a walk that has already finished. That the deadline is
+  # handed down in the first place is pinned by the budget-truncation test above,
+  # which can only pass if the per-container check was in effect.
+  if [ -n "${COZYREPORT_COLLECT_DEADLINE:-}" ]; then
+    echo "FAIL: left COZYREPORT_COLLECT_DEADLINE='$COZYREPORT_COLLECT_DEADLINE' in the caller's environment"
+    false
+  fi
+  rm -rf "$tmp"
+}
+
+@test "collect broken pods records that it stopped at the pod cap" {
+  tmp=$(mktemp -d)
+  collect_stub_dir "$tmp"
+  export STUB_ARGV="$tmp/argv"
+  export STUB_POD_ROWS="$(i=1; while [ "$i" -le 5 ]; do printf 'ns-%s  pod-%s  0/1  Running  0  5m\n' "$i" "$i"; i=$((i + 1)); done)"
+
+  PATH="$tmp:$PATH" COZY_REPORT_PODS_MAX=2 cozyreport_collect_broken_pods "$tmp/pods"
+
+  [ "$(find "$tmp/pods" -name pod.yaml | grep -c .)" -eq 2 ]
+  grep -q 'collected 2 of 5 not-Ready pods' "$tmp/pods/COLLECTION-TRUNCATED.txt"
+  rm -rf "$tmp"
+}
+
+@test "collect broken pods leaves no truncation marker when everything fits" {
+  tmp=$(mktemp -d)
+  collect_stub_dir "$tmp"
+  export STUB_ARGV="$tmp/argv"
+  export STUB_POD_ROWS='ns-1  pod-1  0/1  Running  0  5m'
+
+  PATH="$tmp:$PATH" cozyreport_collect_broken_pods "$tmp/pods"
+
+  if [ -f "$tmp/pods/COLLECTION-TRUNCATED.txt" ]; then echo "FAIL: claimed a truncation that did not happen"; false; fi
+  rm -rf "$tmp"
+}
+
+@test "collect broken pods records that it ran out of collection budget" {
+  tmp=$(mktemp -d)
+  collect_stub_dir "$tmp"
+  export STUB_ARGV="$tmp/argv"
+  export STUB_POD_ROWS="$(i=1; while [ "$i" -le 5 ]; do printf 'ns-%s  pod-%s  0/1  Running  0  5m\n' "$i" "$i"; i=$((i + 1)); done)"
+
+  PATH="$tmp:$PATH" COZY_REPORT_PODS_MAX=4 COZY_REPORT_PODS_BUDGET=0 cozyreport_collect_broken_pods "$tmp/pods"
+
+  # The per-read timeouts are individually bounded but accumulate, so the pod cap
+  # alone does not bound the walk. An overrun here is not a truncated pod section:
+  # the tarball is written after this, so the job's own limit takes the entire
+  # artifact, including everything collected before this point.
+  grep -q 'collection budget elapsed' "$tmp/pods/COLLECTION-TRUNCATED.txt"
+  # Denominator is what the walk could have reached (the cap already removed the
+  # fifth pod before the loop began), not the full selection. "0 of 5" claimed a
+  # reach the collector never had -- and this test pinned that claim, which is how
+  # it survived. The full total is still reported, on the cap line below.
+  grep -q 'stopped after 0 of 4 not-Ready pods it could reach' "$tmp/pods/COLLECTION-TRUNCATED.txt"
+  # Both bounds applied, so both are named. An operator who reads only the budget
+  # line and raises the budget gets 4 pods and no explanation for the fifth --
+  # a bound hiding its own effect, which is what these markers exist to stop.
+  grep -q 'COZY_REPORT_PODS_MAX=4 also applied' "$tmp/pods/COLLECTION-TRUNCATED.txt"
+  grep -q 'only 4 of 5 not-Ready pods were eligible' "$tmp/pods/COLLECTION-TRUNCATED.txt"
+  # The budget note still leads: it is the more proximate cause of stopping, and
+  # "reached the cap" alone would send a reader looking for pods never attempted.
+  head -n 1 "$tmp/pods/COLLECTION-TRUNCATED.txt" | grep -q 'collection budget elapsed'
+  rm -rf "$tmp"
+}
+
+@test "the cap is not named when it did not apply" {
+  tmp=$(mktemp -d)
+  collect_stub_dir "$tmp"
+  export STUB_ARGV="$tmp/argv"
+  export STUB_POD_ROWS="$(i=1; while [ "$i" -le 3 ]; do printf 'ns-%s  pod-%s  0/1  Running  0  5m\n' "$i" "$i"; i=$((i + 1)); done)"
+
+  # Cap above the selection, so only the budget bounded this walk. Naming a bound
+  # that did not fire is the same defect in the other direction: it sends an
+  # operator to raise a limit that was never reached.
+  PATH="$tmp:$PATH" COZY_REPORT_PODS_MAX=40 COZY_REPORT_PODS_BUDGET=0 cozyreport_collect_broken_pods "$tmp/pods"
+
+  grep -q 'stopped after 0 of 3 not-Ready pods it could reach' "$tmp/pods/COLLECTION-TRUNCATED.txt"
+  if grep -q 'also applied' "$tmp/pods/COLLECTION-TRUNCATED.txt"; then
+    echo "FAIL: named the pod cap although it never bit"
+    cat "$tmp/pods/COLLECTION-TRUNCATED.txt"
+    false
+  fi
+  rm -rf "$tmp"
+}
+
+@test "collect broken pods names the budget when it ran out inside the last pod" {
+  tmp=$(mktemp -d)
+  collect_stub_dir "$tmp"
+  export STUB_ARGV="$tmp/argv"
+  export STUB_POD_ROWS="$(i=1; while [ "$i" -le 5 ]; do printf 'ns-%s  pod-%s  0/1  Running  0  5m\n' "$i" "$i"; i=$((i + 1)); done)"
+
+  # Two containers, and the first read outlasts the budget, so the second is
+  # skipped and the pod really is short a log. The budget has headroom over the
+  # per-pod setup on purpose: `date +%s` is whole-second, so a budget of 1 leaves
+  # somewhere between 0 and 1 second for an mkdir plus three reads, and under load
+  # the deadline fires before any container is read. Then this test passes for the
+  # wrong reason and its sibling below fails on a loaded machine. The cap ends the loop, so no later
+  # iteration notices: a cap-only note would date the stop to the wrong bound and
+  # call that pod collected.
+  export STUB_CONTAINERS='app sidecar'
+  PATH="$tmp:$PATH" COZY_REPORT_PODS_MAX=1 COZY_REPORT_PODS_BUDGET=3 \
+    STUB_LOG_MODE=slow STUB_LOG_SLEEP=4 cozyreport_collect_broken_pods "$tmp/pods"
+
+  [ -f "$tmp/pods/ns-1/pod-1/CONTAINER-LOGS-TRUNCATED.txt" ]
+  grep -q 'COZY_REPORT_PODS_MAX=1' "$tmp/pods/COLLECTION-TRUNCATED.txt"
+  grep -q 'collection budget' "$tmp/pods/COLLECTION-TRUNCATED.txt"
+  rm -rf "$tmp"
+}
+
+@test "collect broken pods claims no budget truncation when nothing was skipped" {
+  tmp=$(mktemp -d)
+  collect_stub_dir "$tmp"
+  export STUB_ARGV="$tmp/argv"
+  export STUB_POD_ROWS="$(i=1; while [ "$i" -le 5 ]; do printf 'ns-%s  pod-%s  0/1  Running  0  5m\n' "$i" "$i"; i=$((i + 1)); done)"
+
+  # One container and a budget large enough that nothing is ever skipped. The point
+  # is that "the clock is past the deadline" and "collection was cut short" are
+  # different questions: answering the first files a truncation that did not happen,
+  # pointing at a marker that does not exist. Driven without a sleep, so the
+  # assertion does not rest on a whole-second clock beating a stub.
+  export STUB_CONTAINERS='app'
+  PATH="$tmp:$PATH" COZY_REPORT_PODS_MAX=1 COZY_REPORT_PODS_BUDGET=600 \
+    cozyreport_collect_broken_pods "$tmp/pods"
+
+  grep -q 'COZY_REPORT_PODS_MAX=1' "$tmp/pods/COLLECTION-TRUNCATED.txt"
+  if grep -q 'collection budget' "$tmp/pods/COLLECTION-TRUNCATED.txt"; then
+    echo "FAIL: reported a budget truncation with nothing skipped"
+    cat "$tmp/pods/COLLECTION-TRUNCATED.txt"
+    false
+  fi
+  rm -rf "$tmp"
+}
+
+@test "collect broken pods files no truncation for a healthy cluster on a spent budget" {
+  tmp=$(mktemp -d)
+  collect_stub_dir "$tmp"
+  export STUB_ARGV="$tmp/argv"
+  export STUB_POD_ROWS='kube-system  coredns-abc  1/1  Running  0  2h'
+
+  PATH="$tmp:$PATH" COZY_REPORT_PODS_BUDGET=0 cozyreport_collect_broken_pods "$tmp/pods"
+
+  # Nothing was selected, so nothing was skipped, however long the clock says the
+  # run has been going.
+  if [ -d "$tmp/pods" ]; then
+    echo "FAIL: filed a truncation for a collection that had nothing to collect"
+    ls -la "$tmp/pods"
+    false
+  fi
+  rm -rf "$tmp"
+}
+
+@test "collect broken pods says so when the pod list never returned" {
+  tmp=$(mktemp -d)
+  collect_stub_dir "$tmp"
+  export STUB_ARGV="$tmp/argv"
+
+  PATH="$tmp:$PATH" STUB_PODLIST_FAIL=refuse cozyreport_collect_broken_pods "$tmp/pods"
+
+  # A failed list and a healthy cluster both end with no pod directories. Without
+  # this file the artifact cannot tell them apart, which is the same defect one
+  # level up from the pod tree's own.
+  [ -f "$tmp/pods/COLLECTION-FAILED.txt" ]
+  grep -q 'NOT a report that every pod was Ready' "$tmp/pods/COLLECTION-FAILED.txt"
+  # kubectl's actionable line comes last, after one discovery-retry line per
+  # attempt. Quoting the first one and trimming it to 200 characters ships a
+  # truncated klog message whose cause has been cut off the end.
+  grep -q 'pods is forbidden' "$tmp/pods/COLLECTION-FAILED.txt"
+  if grep -q 'Unhandled Error' "$tmp/pods/COLLECTION-FAILED.txt"; then echo "FAIL: quoted the discovery noise instead of the reason"; false; fi
+  rm -rf "$tmp"
+}
+
+@test "collect broken pods tells a timed out pod list from a refused one" {
+  tmp=$(mktemp -d)
+  collect_stub_dir "$tmp"
+  export STUB_ARGV="$tmp/argv"
+
+  PATH="$tmp:$PATH" STUB_PODLIST_FAIL=timeout cozyreport_collect_broken_pods "$tmp/pods"
+
+  # A read killed by its own timeout never got to write a reason, so quoting its
+  # empty stderr yields a bare `kubectl said:` that names nothing. An apiserver
+  # too slow to answer and one answering "forbidden" are different problems.
+  #
+  # The timeout branch names the mechanism rather than the exit code: this test
+  # asserted `exited 124` while the message combined both cases in one sentence,
+  # and that spelling survived the defect the sibling test now covers.
+  grep -q 'the read was cut off by' "$tmp/pods/COLLECTION-FAILED.txt"
+  if grep -q 'kubectl said: *$' "$tmp/pods/COLLECTION-FAILED.txt"; then echo "FAIL: quoted an empty reason"; false; fi
+  rm -rf "$tmp"
+}
+
+@test "collect broken pods writes nothing at all when every pod is healthy" {
+  tmp=$(mktemp -d)
+  collect_stub_dir "$tmp"
+  export STUB_ARGV="$tmp/argv"
+  export STUB_POD_ROWS='kube-system  coredns-abc  1/1  Running  0  2h'
+
+  PATH="$tmp:$PATH" cozyreport_collect_broken_pods "$tmp/pods"
+
+  # An empty selection reaches the walk as a single blank line; a pod directory
+  # named after nothing would be a broken pod that does not exist.
+  if [ -d "$tmp/pods" ]; then echo "FAIL: created a pod tree for a healthy cluster"; false; fi
+  # No pod was collected, so the only read that happened is the pod list, and it
+  # is bounded like the per-pod ones. It is the read that decides whether the
+  # report has a pod section at all, and it runs against the apiserver the run
+  # has just finished degrading.
+  [ "$(grep -c '^timeout 30$' "$tmp/argv")" -eq 1 ]
+  rm -rf "$tmp"
+}
+
+@test "summary reads the age column correctly for a pod that has restarted" {
+  tmp=$(mktemp -d)
+  summary_stub_dir "$tmp"
+  # kubectl prints RESTARTS as `7 (4m12s ago)` on a restarted pod -- three awk
+  # fields --
+  # which shifts AGE off $6. A restarted pod is the normal case in a failed run.
+  rows='cozy-keycloak  keycloak-db-2  0/1  Running  7 (4m12s ago)  6m'
+
+  out="$(PATH="$tmp:$PATH" STUB_POD_ROWS="$rows" sh "$HACK_DIR/cozyreport-summary.sh" 2>/dev/null)"
+
+  printf '%s\n' "$out" | grep -q 'age=6m)'
+  if printf '%s\n' "$out" | grep -q 'age=(4m12s'; then echo "FAIL: age read from the shifted column"; false; fi
+  rm -rf "$tmp"
+}
+
+@test "summary still reads the age column for a pod that never restarted" {
+  tmp=$(mktemp -d)
+  summary_stub_dir "$tmp"
+  rows='cozy-system  puller-z  0/1  ImagePullBackOff  0  4m'
+
+  out="$(PATH="$tmp:$PATH" STUB_POD_ROWS="$rows" sh "$HACK_DIR/cozyreport-summary.sh" 2>/dev/null)"
+
+  printf '%s\n' "$out" | grep -q 'restarts=0, age=4m)'
+  rm -rf "$tmp"
+}
+
+@test "summary says how many not ready pods its listing left out" {
+  tmp=$(mktemp -d)
+  summary_stub_dir "$tmp"
+  rows="$(i=1; while [ "$i" -le 45 ]; do printf 'ns-%s  pod-%s  0/1  Running  0  5m\n' "$i" "$i"; i=$((i + 1)); done)"
+
+  out="$(PATH="$tmp:$PATH" STUB_POD_ROWS="$rows" sh "$HACK_DIR/cozyreport-summary.sh" 2>/dev/null)"
+
+  # 45 broken pods, 40 listed. A cap that hides the rest reads like there is no
+  # rest -- the same defect the per-pod capture reports rather than swallows.
+  printf '%s\n' "$out" | grep -q '5 more not-Ready pod(s) not listed'
+  rm -rf "$tmp"
+}
+
+@test "summary says so in every section whose read was killed" {
+  tmp=$(mktemp -d)
+  summary_stub_dir "$tmp"
+
+  out="$(PATH="$tmp:$PATH" STUB_ALL_TIMEOUT=1 sh "$HACK_DIR/cozyreport-summary.sh" 2>/dev/null)"
+
+  # Wrapping these reads in a timeout without keeping the status is worse than
+  # leaving them unbounded: an unbounded read that hangs loses the tarball loudly,
+  # a bounded one killed at 30s renders the section byte-identical to a healthy
+  # cluster. An empty "HelmReleases not Ready" is the most misleading line this
+  # file can carry, and it is the first file a triager opens.
+  for section in 'HelmReleases not Ready' 'Recent OOMKilled' 'Recent Warning' 'Storage' 'Node Conditions'; do
+    if ! printf '%s\n' "$out" | sed -n "/## $section/,/^## /p" | grep -q 'did not return'; then
+      echo "FAIL: section '$section' rendered as a healthy cluster on a killed read"
+      printf '%s\n' "$out" | sed -n "/## $section/,/^## /p"
+      false
+    fi
+  done
+  # And the status it names is the read's, not 0. A compound `if` whose condition
+  # fails and which has no `else` leaves `$?` at 0, so a status read after the `if`
+  # reports "exit 0" for every failure -- a line that says the read did not return
+  # and then names a clean exit.
+  if printf '%s\n' "$out" | grep -q 'did not return (exit 0)'; then
+    echo "FAIL: reported a failed read as exit 0"
+    false
+  fi
+  printf '%s\n' "$out" | grep -q 'did not return (exit 124)'
+  rm -rf "$tmp"
+}
+
+@test "summary names kubectl's reason when a section read is refused" {
+  tmp=$(mktemp -d)
+  summary_stub_dir "$tmp"
+
+  out="$(PATH="$tmp:$PATH" STUB_CRD_PRESENT=1 STUB_HR_FAIL=1 sh "$HACK_DIR/cozyreport-summary.sh" 2>/dev/null)"
+
+  section="$(printf '%s\n' "$out" | sed -n '/## HelmReleases not Ready/,/^## /p')"
+  # "did not return (exit 1)" names a symptom and no cause. An apiserver too slow
+  # to answer and one answering "forbidden" are different problems with different
+  # fixes, and this is the first file a triager opens.
+  printf '%s\n' "$section" | grep -q 'did not return'
+  if ! printf '%s\n' "$section" | grep -qi 'forbidden'; then
+    echo "FAIL: dropped kubectl's reason for a refused read"
+    printf '%s\n' "$section"
+    false
+  fi
+  # The LAST stderr line, not the first: the stub emits a klog discovery-retry
+  # line ahead of the real message, which is what a failing cluster-wide read
+  # actually looks like. Quoting the first line names the retry, not the cause.
+  if printf '%s\n' "$section" | grep -q "couldn't get current server API group list"; then
+    echo "FAIL: quoted the klog retry line instead of kubectl's message"
+    false
+  fi
+  rm -rf "$tmp"
+}
+
+@test "summary keeps a warning off a read that succeeded" {
+  tmp=$(mktemp -d)
+  summary_stub_dir "$tmp"
+
+  out="$(PATH="$tmp:$PATH" STUB_CRD_PRESENT=1 STUB_HR_WARN=1 \
+    STUB_HR_ROWS='tenant-a  app-1  5m  False  upgrade retries exhausted' \
+    sh "$HACK_DIR/cozyreport-summary.sh" 2>/dev/null)"
+
+  section="$(printf '%s\n' "$out" | sed -n '/## HelmReleases not Ready/,/^## /p')"
+  # kubectl writes deprecation and partial-result warnings to stderr while exiting
+  # 0. Capturing the read as `2>&1` would fold those into READ_OUT, and the awk
+  # below would then parse the warning as a HelmRelease row -- a broken release
+  # invented out of a notice, in the section a triager reads first. The reason is
+  # captured to a file and read only on the failure path, so this must stay clean.
+  if printf '%s\n' "$section" | grep -qi 'deprecated'; then
+    echo "FAIL: a stderr warning leaked into the section body"
+    printf '%s\n' "$section"
+    false
+  fi
+  # And the read still succeeded, so its rows are there and no failure is claimed.
+  printf '%s\n' "$section" | grep -q 'upgrade retries exhausted'
+  if printf '%s\n' "$section" | grep -q 'did not return'; then
+    echo "FAIL: reported a successful read as failed because it warned"
+    false
+  fi
+  rm -rf "$tmp"
+}
+
+@test "a CRD probe whose message was lost is not filed as an absent CRD" {
+  tmp=$(mktemp -d)
+  summary_stub_dir "$tmp"
+  # mktemp fails, so the scratch file is never created and kubectl's stderr goes
+  # to /dev/null. The gate then has a non-zero status and nothing else.
+  printf '#!/bin/sh\nexit 1\n' > "$tmp/mktemp"; chmod +x "$tmp/mktemp"
+
+  out="$(PATH="$tmp:$PATH" STUB_CRD_FORBIDDEN=1 sh "$HACK_DIR/cozyreport-summary.sh" 2>/dev/null)"
+
+  # Without a branch for this, the gate falls off the end of its if/elif and
+  # returns silently, which is byte-identical to the CRD being absent. Every
+  # section behind the gate then disappears from the summary, starting with
+  # "## HelmReleases not Ready", on a report whose only real problem is that the
+  # machine writing it had nowhere to put a temp file.
+  printf '%s\n' "$out" | grep -q 'could not be captured' || {
+    echo "FAIL: a lost message is rendered as an absent CRD"
+    printf '%s\n' "$out"
+    false
+  }
+  rm -rf "$tmp"
+}
+
+@test "a CRD probe that failed without saying anything says that much" {
+  tmp=$(mktemp -d)
+  summary_stub_dir "$tmp"
+
+  out="$(PATH="$tmp:$PATH" STUB_CRD_SILENT=1 sh "$HACK_DIR/cozyreport-summary.sh" 2>/dev/null)"
+
+  # kubectl is explicit about NotFound, so a non-zero exit with no message is not
+  # absence. Filing it as absence is the same error in the other direction from
+  # the test above: there, a local condition became a cluster fact; here, an
+  # unexplained refusal would.
+  printf '%s\n' "$out" | grep -q 'without a message' || {
+    echo "FAIL: an unexplained refusal is rendered as an absent CRD"
+    printf '%s\n' "$out"
+    false
+  }
+  rm -rf "$tmp"
+}
+
+@test "summary names an OOMKilled event rather than leaving the heading bare" {
+  tmp=$(mktemp -d)
+  summary_stub_dir "$tmp"
+  rows="$(printf '%s\n' \
+    'tenant-a  3m  Normal  OOMKilling  Node/worker-1  Memory cgroup out of memory: Killed process 4711 (postgres)')"
+
+  out="$(PATH="$tmp:$PATH" STUB_EVENT_ROWS="$rows" sh "$HACK_DIR/cozyreport-summary.sh" 2>/dev/null)"
+
+  # The heading is printed unconditionally, so an empty section and a section
+  # nobody could read look the same from outside. Nothing exercised the listing at
+  # all, which is how a section stays empty for years without anyone noticing.
+  section="$(printf '%s\n' "$out" | awk '/^## Recent OOMKilled/{f=1;next} f&&/^## /{exit} f')"
+  printf '%s\n' "$section" | grep -q 'Killed process 4711' || {
+    echo "FAIL: an OOMKilling event is not carried into the summary"
+    printf '%s\n' "$out"
+    false
+  }
+  rm -rf "$tmp"
+}
+
+@test "summary falls back on a malformed pod cap and says which value it used" {
+  tmp=$(mktemp -d)
+  summary_stub_dir "$tmp"
+  rows='tenant-a  broken-0  0/1  Running  0  5m'
+
+  out="$(PATH="$tmp:$PATH" STUB_POD_ROWS="$rows" COZY_REPORT_PODS_MAX=abc \
+    sh "$HACK_DIR/cozyreport-summary.sh" 2>/dev/null)"
+
+  # The collector reports a rejected knob and the summary has the same branch, but
+  # only the collector's was covered. An operator who set the value is entitled to
+  # know it was not the bound that applied, in whichever of the two files they are
+  # reading.
+  printf '%s\n' "$out" | grep -q "ignored a malformed COZY_REPORT_PODS_MAX" || {
+    echo "FAIL: a malformed cap is discarded in silence"
+    printf '%s\n' "$out"
+    false
+  }
+  printf '%s\n' "$out" | grep -q 'broken-0' || {
+    echo "FAIL: the fallback did not list anything"
+    false
+  }
+  rm -rf "$tmp"
+}
+
+@test "a zero pod cap lists nothing and still reports what it left out" {
+  tmp=$(mktemp -d)
+  summary_stub_dir "$tmp"
+  rows="$(printf '%s\n' \
+    'tenant-a  broken-0  0/1  Running  0  5m' \
+    'tenant-a  broken-1  0/1  Running  0  6m')"
+
+  out="$(PATH="$tmp:$PATH" STUB_POD_ROWS="$rows" COZY_REPORT_PODS_MAX=0 \
+    sh "$HACK_DIR/cozyreport-summary.sh" 2>/dev/null)"
+
+  # Zero is a supported request, not a malformed one, and it is branched on rather
+  # than passed to `head -n 0`, which GNU treats as empty and BSD rejects outright.
+  # What must not happen is a silent zero: the overflow line is the only thing
+  # standing between "asked for nothing" and "found nothing".
+  if printf '%s\n' "$out" | grep -q 'broken-0'; then
+    echo "FAIL: a zero cap still listed a pod"; false
+  fi
+  printf '%s\n' "$out" | grep -q '2 more not-Ready pod(s) not listed' || {
+    echo "FAIL: a zero cap dropped two pods without saying so"
+    printf '%s\n' "$out"
+    false
+  }
+  rm -rf "$tmp"
+}
+
+@test "summary leaves a Ready HelmRelease out of the not-Ready listing" {
+  tmp=$(mktemp -d)
+  summary_stub_dir "$tmp"
+  rows="$(printf '%s\n' \
+    'tenant-a  broken   4m  False  Helm install failed for release tenant-a/broken' \
+    'tenant-a  settled  9d  True   Release reconciliation succeeded')"
+
+  out="$(PATH="$tmp:$PATH" STUB_CRD_PRESENT=1 STUB_HR_ROWS="$rows" \
+    sh "$HACK_DIR/cozyreport-summary.sh" 2>/dev/null)"
+
+  # Every HelmRelease fixture in this file was already not-Ready, so the selection
+  # was only ever exercised in the direction that keeps rows. A section heading
+  # that says "not Ready" and lists everything is the same defect as one that
+  # lists nothing, and neither shows up without a row of the other kind.
+  printf '%s\n' "$out" | grep -q 'tenant-a/broken' || { echo "FAIL: a failed release is not listed"; false; }
+  if printf '%s\n' "$out" | grep -q 'tenant-a/settled'; then
+    echo "FAIL: a Ready release is listed as not Ready"
+    printf '%s\n' "$out"
+    false
+  fi
+  rm -rf "$tmp"
+}
+
+@test "the pod cap does not silently bound the HelmRelease listing beside it" {
+  tmp=$(mktemp -d)
+  summary_stub_dir "$tmp"
+  rows="$(printf '%s\n' \
+    'tenant-a  hr-1  4m  False  Helm install failed one' \
+    'tenant-a  hr-2  4m  False  Helm install failed two' \
+    'tenant-a  hr-3  4m  False  Helm install failed three')"
+
+  out="$(PATH="$tmp:$PATH" STUB_CRD_PRESENT=1 STUB_HR_ROWS="$rows" COZY_REPORT_PODS_MAX=1 \
+    sh "$HACK_DIR/cozyreport-summary.sh" 2>/dev/null)"
+
+  # The header says this knob does not move the HelmRelease cap, which has its own
+  # at the same default. Sharing a default is not sharing a bound, and nothing
+  # checked that the two had not been wired together.
+  for hr in hr-1 hr-2 hr-3; do
+    printf '%s\n' "$out" | grep -q "tenant-a/$hr" || {
+      echo "FAIL: $hr was dropped by the pod cap"
+      printf '%s\n' "$out"
+      false
+    }
+  done
+  rm -rf "$tmp"
+}
+
+@test "a pod list cut off part way through is not called an empty section" {
+  tmp=$(mktemp -d)
+  summary_stub_dir "$tmp"
+
+  out="$(PATH="$tmp:$PATH" STUB_PODLIST_FAIL=partial \
+    STUB_POD_ROWS='tenant-a  broken-0  0/1  Running  0  5m' \
+    sh "$HACK_DIR/cozyreport-summary.sh" 2>/dev/null)"
+
+  # kubectl printed a row and then failed. The rows are kept, as everywhere else
+  # here, because partial evidence is the only evidence there is -- but the
+  # sentence above them said the section was empty because nothing could be read,
+  # while the row sat three lines below it. One read, two contradictory statements,
+  # in the file a triager opens first.
+  printf '%s\n' "$out" | grep -q 'broken-0' || {
+    echo "FAIL: the rows that did arrive were discarded"; printf '%s\n' "$out"; false
+  }
+  printf '%s\n' "$out" | grep -q 'before it stopped, and there may be others' || {
+    echo "FAIL: a partial list is not described as partial"
+    printf '%s\n' "$out"
+    false
+  }
+  if printf '%s\n' "$out" | grep -q 'this section is empty because nothing could be read'; then
+    echo "FAIL: a section holding rows is called empty"
+    false
+  fi
+  rm -rf "$tmp"
+}
+
+@test "summary lists a PVC that is not Bound and leaves the bound ones out" {
+  tmp=$(mktemp -d)
+  summary_stub_dir "$tmp"
+  rows="$(printf '%s\n' \
+    'tenant-a  data-0    Pending  ''  ''  ''  standard  4m' \
+    'tenant-a  data-1    Bound    pvc-aaa  10Gi  RWO  standard  9d')"
+
+  out="$(PATH="$tmp:$PATH" STUB_PVC_ROWS="$rows" sh "$HACK_DIR/cozyreport-summary.sh" 2>/dev/null)"
+
+  # STATUS is the third column of `kubectl get pvc -A`. An index picked by eye and
+  # never run against a row is how the services selector matched nothing for its
+  # whole life; this section has the same shape and had no fixture at all.
+  printf '%s\n' "$out" | grep -q 'PVC tenant-a/data-0' || {
+    echo "FAIL: an unbound PVC is not listed"; printf '%s\n' "$out"; false
+  }
+  if printf '%s\n' "$out" | grep -q 'data-1'; then
+    echo "FAIL: a Bound PVC is listed as a problem"; false
+  fi
+  rm -rf "$tmp"
+}
+
+@test "summary lists a PV that is not Bound and leaves the bound ones out" {
+  tmp=$(mktemp -d)
+  summary_stub_dir "$tmp"
+  # `kubectl get pv` has no NAMESPACE column, so STATUS lands at $5 rather than
+  # $3. Two sections, two different indexes, one line apart in the source.
+  rows="$(printf '%s\n' \
+    'pvc-aaa  10Gi  RWO  Delete  Released  tenant-a/data-9  standard  3d' \
+    'pvc-bbb  10Gi  RWO  Delete  Bound     tenant-a/data-1  standard  9d')"
+
+  out="$(PATH="$tmp:$PATH" STUB_PV_ROWS="$rows" sh "$HACK_DIR/cozyreport-summary.sh" 2>/dev/null)"
+
+  printf '%s\n' "$out" | grep -q 'PV pvc-aaa' || {
+    echo "FAIL: a released PV is not listed"; printf '%s\n' "$out"; false
+  }
+  if printf '%s\n' "$out" | grep -q 'PV pvc-bbb'; then
+    echo "FAIL: a Bound PV is listed as a problem"; false
+  fi
+  rm -rf "$tmp"
+}
+
+@test "summary lists a Certificate that is not Ready and leaves ready ones out" {
+  tmp=$(mktemp -d)
+  summary_stub_dir "$tmp"
+  rows="$(printf '%s\n' \
+    'tenant-a  wildcard  False  wildcard-tls  12m' \
+    'tenant-a  api       True   api-tls       6d')"
+
+  out="$(PATH="$tmp:$PATH" STUB_CRD_PRESENT=1 STUB_CERT_ROWS="$rows" \
+    sh "$HACK_DIR/cozyreport-summary.sh" 2>/dev/null)"
+
+  printf '%s\n' "$out" | grep -q 'tenant-a/wildcard' || {
+    echo "FAIL: a Certificate that is not Ready is not listed"; printf '%s\n' "$out"; false
+  }
+  if printf '%s\n' "$out" | grep -q 'tenant-a/api'; then
+    echo "FAIL: a Ready Certificate is listed as a problem"; false
+  fi
+  rm -rf "$tmp"
+}
+
+@test "summary names a pod that cannot pull its image and skips the healthy ones" {
+  tmp=$(mktemp -d)
+  summary_stub_dir "$tmp"
+  rows="$(printf '%s\n' \
+    'tenant-a  puller-0  0/1  ImagePullBackOff  0  4m' \
+    'tenant-a  puller-1  0/1  ErrImagePull      0  4m' \
+    'tenant-a  fine-0    1/1  Running           0  4m')"
+
+  out="$(PATH="$tmp:$PATH" STUB_POD_ROWS="$rows" sh "$HACK_DIR/cozyreport-summary.sh" 2>/dev/null)"
+
+  # Scoped to the section, not to the whole document. Both of these pods are also
+  # not-Ready, so they appear under the pod listing above regardless, and an
+  # unscoped grep passes with this section deleted entirely.
+  section="$(printf '%s\n' "$out" | awk '/^## ImagePullBackOff/{f=1;next} f&&/^## /{exit} f')"
+
+  # Both spellings, because the section matches an alternation and dropping either
+  # half leaves the other passing. ErrImagePull is the one a cluster shows first.
+  printf '%s\n' "$section" | grep -q 'puller-0' || { echo "FAIL: ImagePullBackOff not named"; printf '%s\n' "$section"; false; }
+  printf '%s\n' "$section" | grep -q 'puller-1' || { echo "FAIL: ErrImagePull not named"; printf '%s\n' "$section"; false; }
+  if printf '%s\n' "$section" | grep -q 'fine-0'; then
+    echo "FAIL: a running pod appears under the image-pull heading"; false
+  fi
+  rm -rf "$tmp"
+}
+
+@test "summary separates a CRD it may not read from one that is absent" {
+  tmp=$(mktemp -d)
+  summary_stub_dir "$tmp"
+
+  absent="$(PATH="$tmp:$PATH" sh "$HACK_DIR/cozyreport-summary.sh" 2>/dev/null)"
+  refused="$(PATH="$tmp:$PATH" STUB_CRD_FORBIDDEN=1 sh "$HACK_DIR/cozyreport-summary.sh" 2>/dev/null)"
+
+  # An absent CRD is not a finding: most clusters do not run every optional
+  # component, and a line about each one would be noise that trains the reader to
+  # skip the section.
+  if printf '%s\n' "$absent" | grep -q 'presence check failed'; then
+    echo "FAIL: reported an absent CRD as a failure"
+    false
+  fi
+  # A refusal skips the section identically, and only kubectl's message separates
+  # "not installed" from "not allowed to look" -- the difference between a cluster
+  # without cert-manager and a report taken with a token that cannot see it.
+  if ! printf '%s\n' "$refused" | grep -q 'presence check failed'; then
+    echo "FAIL: a refused CRD probe was indistinguishable from an absent CRD"
+    false
+  fi
+  printf '%s\n' "$refused" | grep -qi 'forbidden'
+  rm -rf "$tmp"
+}
+
+@test "summary keeps the whole helmrelease failure message" {
+  tmp=$(mktemp -d)
+  summary_stub_dir "$tmp"
+  export STUB_CRD_PRESENT=1
+  # Padded to kubectl's own column widths. With single spaces the row survives an
+  # awk that mishandles the field skip, so the fixture has to look like real output.
+  export STUB_HR_ROWS='cozy-keycloak   keycloak                 9d    False  Helm upgrade failed for release cozy-keycloak/keycloak: timeout waiting for the condition'
+
+  out="$(PATH="$tmp:$PATH" sh "$HACK_DIR/cozyreport-summary.sh" 2>/dev/null)"
+
+  # STATUS is the Ready condition's message, a whole sentence -- see the printer
+  # columns on the CRD this repo ships. Taking one field renders every failed
+  # release as "Helm" and drops the part that says what broke, in the first section
+  # of the first file a triager opens.
+  #
+  # The whole rendered line is pinned, not just a substring of the message: an awk
+  # that skips the wrong number of fields leaves the namespace and name in the
+  # message too, and every substring assertion still passes in that state.
+  rendered=$(printf '%s\n' "$out" | grep -F 'cozy-keycloak/keycloak —')
+  [ "$rendered" = "  cozy-keycloak/keycloak — Helm upgrade failed for release cozy-keycloak/keycloak: timeout waiting for the condition" ] || {
+    echo "FAIL: rendered line is not the namespace, name and message alone:"
+    printf '%s\n' "[$rendered]"
+    false
+  }
+  rm -rf "$tmp"
+}
+
+@test "summary ends with a newline" {
+  tmp=$(mktemp -d)
+  summary_stub_dir "$tmp"
+
+  # The node section is the last thing the file prints, so it has to produce output
+  # for this to mean anything.
+  export STUB_NODE_ROWS='node0   True    False   False'
+
+  PATH="$tmp:$PATH" sh "$HACK_DIR/cozyreport-summary.sh" > "$tmp/summary.txt" 2>/dev/null
+
+  grep -q 'node0' "$tmp/summary.txt"
+
+  # Command substitution strips the trailing newline, so a section that prints
+  # $READ_OUT with a bare %s leaves the file ending mid-line.
+  [ -z "$(tail -c 1 "$tmp/summary.txt")" ]
+  rm -rf "$tmp"
+}
+
+@test "summary says how many not ready helmreleases its listing left out" {
+  tmp=$(mktemp -d)
+  summary_stub_dir "$tmp"
+  export STUB_CRD_PRESENT=1
+  export STUB_HR_ROWS="$(i=1; while [ "$i" -le 45 ]; do printf 'ns-%s  hr-%s  1  False  Helm upgrade failed for release ns-%s/hr-%s: timeout waiting for the condition\n' "$i" "$i" "$i" "$i"; i=$((i + 1)); done)"
+
+  out="$(PATH="$tmp:$PATH" sh "$HACK_DIR/cozyreport-summary.sh" 2>/dev/null)"
+
+  # An install that fails early leaves well over 40 HelmReleases not Ready, and a
+  # listing that stops at 40 in silence reads as the complete set. Same defect the
+  # pod section one heading below was already fixed for.
+  printf '%s\n' "$out" | grep -q '5 more not-Ready HelmRelease(s) not listed'
+  rm -rf "$tmp"
+}
+
+@test "summary distinguishes an absent crd from a check that was killed" {
+  tmp=$(mktemp -d)
+  summary_stub_dir "$tmp"
+
+  absent="$(PATH="$tmp:$PATH" sh "$HACK_DIR/cozyreport-summary.sh" 2>/dev/null)"
+  killed="$(PATH="$tmp:$PATH" STUB_ALL_TIMEOUT=1 sh "$HACK_DIR/cozyreport-summary.sh" 2>/dev/null)"
+
+  # `if $BOUND kubectl get crd X` collapses "not installed" and "could not ask"
+  # into one skip, and a slow aggregated discovery layer -- the state that made the
+  # bound necessary -- then hides the section as though the CRD were absent.
+  if printf '%s\n' "$absent" | grep -q 'presence check did not return'; then
+    echo "FAIL: called an absent CRD a failed check"
+    false
+  fi
+  printf '%s\n' "$killed" | grep -q 'presence check did not return'
+  rm -rf "$tmp"
+}
+
+@test "summary lists a flux source that is not ready" {
+  tmp=$(mktemp -d)
+  summary_stub_dir "$tmp"
+  export STUB_CRD_PRESENT=1
+  export STUB_FLUX_ROWS="$(printf '%s\n' \
+    'cozy-system  cozystack-packages  True' \
+    'cozy-system  broken-repo         False')"
+
+  out="$(PATH="$tmp:$PATH" sh "$HACK_DIR/cozyreport-summary.sh" 2>/dev/null)"
+
+  # This section printed nothing on every report ever taken: its jsonpath nested a
+  # filter inside a filter, which kubectl rejects with "unterminated filter", and
+  # discarding stderr and the exit status hides it completely. An empty section
+  # reads as "all Flux sources are Ready", inside the file whose job is to say what
+  # is broken.
+  printf '%s\n' "$out" | sed -n '/## Flux Sources/,/^## /p' | grep -q 'broken-repo'
+  if printf '%s\n' "$out" | sed -n '/## Flux Sources/,/^## /p' | grep -q 'cozystack-packages'; then
+    echo "FAIL: listed a Ready source"
+    false
+  fi
+  rm -rf "$tmp"
+}
+
+@test "summary says the pod list failed rather than showing an empty section" {
+  tmp=$(mktemp -d)
+  summary_stub_dir "$tmp"
+
+  out="$(PATH="$tmp:$PATH" STUB_PODLIST_FAIL=refuse sh "$HACK_DIR/cozyreport-summary.sh" 2>/dev/null)"
+
+  # summary.txt is the file a triager opens first. A refused pod list renders
+  # byte-identical to a healthy cluster there, which is the one run on which this
+  # section must not be the thing that says nothing is wrong.
+  printf '%s\n' "$out" | grep -q 'NOT because every pod was Ready'
+  printf '%s\n' "$out" | grep -q 'pods is forbidden'
+  # Every section derived from that same read has to inherit its failure. The
+  # ImagePullBackOff section is byte-identical between a healthy cluster and a
+  # refused list otherwise, and it is a heading a triager jumps straight to.
+  printf '%s\n' "$out" | sed -n '/## ImagePullBackOff/,/^## /p' | grep -q 'did not return'
+  rm -rf "$tmp"
+}
+
+@test "summary lists the tenant pods before the platform ones" {
+  tmp=$(mktemp -d)
+  summary_stub_dir "$tmp"
+  rows="$(printf '%s\n' \
+    'cozy-a  pod-a  0/1  Running  0  5m' \
+    'tenant-test  the-pod-the-run-died-on  0/1  Running  0  5m')"
+
+  out="$(PATH="$tmp:$PATH" STUB_POD_ROWS="$rows" sh "$HACK_DIR/cozyreport-summary.sh" 2>/dev/null)"
+
+  # Shares the collector's ordering, so the rows the summary's cap keeps are the
+  # rows whose evidence was actually collected.
+  # Both line numbers are captured before they are compared: a missing row makes
+  # `grep -n` empty, and `[ "" -lt "" ]` aborts the test body rather than failing
+  # it, which bats reports as a test that never ran instead of one that broke. A
+  # guard whose failure mode is to disappear is the same silent green this whole
+  # change is about.
+  pos_tenant=$(printf '%s\n' "$out" | grep -n 'the-pod-the-run-died-on' | head -n 1 | cut -d: -f1)
+  pos_cozy=$(printf '%s\n' "$out" | grep -n 'pod-a' | head -n 1 | cut -d: -f1)
+  if [ -z "$pos_tenant" ] || [ -z "$pos_cozy" ]; then
+    echo "FAIL: expected both rows listed, got tenant='$pos_tenant' cozy='$pos_cozy'"
+    false
+  fi
+  [ "$pos_tenant" -lt "$pos_cozy" ]
+  rm -rf "$tmp"
+}
+
+@test "summary works without timeout and does not call that a cluster failure" {
+  tmp=$(mktemp -d)
+  summary_stub_dir "$tmp"
+  # Only the binaries the summary genuinely needs, and deliberately no `timeout`.
+  # Resolved from absolute candidates rather than through `command -v`, which in an
+  # interactive shell can answer with a function name and leave a broken symlink.
+  for b in sh date awk grep head sed tail cut mktemp rm cat dirname; do
+    for d in /bin /usr/bin; do
+      [ -x "$d/$b" ] && { ln -sf "$d/$b" "$tmp/$b"; break; }
+    done
+  done
+  if [ -e "$tmp/timeout" ]; then echo "FAIL: the stub PATH must not provide timeout"; false; fi
+
+  out="$(PATH="$tmp" STUB_POD_ROWS='cozy-system  broken-0  0/1  Running  0  5m' sh "$HACK_DIR/cozyreport-summary.sh" 2>/dev/null)"
+
+  # Every read exits 127 without the fallback, and the section then reports that
+  # the cluster did not answer on a host whose only problem is a missing local
+  # binary. The collector says COLLECTION-UNBOUNDED.txt for that case, and the
+  # two must not contradict each other inside one tarball.
+  printf '%s\n' "$out" | grep -q 'broken-0'
+  if printf '%s\n' "$out" | grep -q 'NOT because every pod was Ready'; then echo "FAIL: blamed the cluster for a missing local timeout"; false; fi
+  rm -rf "$tmp"
+}
+
+@test "summary lists no pod at all when nothing is broken" {
+  tmp=$(mktemp -d)
+  summary_stub_dir "$tmp"
+
+  out="$(PATH="$tmp:$PATH" STUB_POD_ROWS='' sh "$HACK_DIR/cozyreport-summary.sh" 2>/dev/null)"
+
+  # An empty selection still reaches awk as one blank line. Printing it yields a
+  # nameless broken pod — on every green run, and on the run where the pod list
+  # itself failed, which is exactly when the summary must not invent findings.
+  if printf '%s\n' "$out" | grep -q '^  / —'; then echo "FAIL: invented a nameless not-Ready pod"; false; fi
+  if printf '%s\n' "$out" | grep -q 'ready= '; then echo "FAIL: printed a row of blank fields"; false; fi
+  rm -rf "$tmp"
+}
+
+@test "summary prints no overflow line when everything fits" {
+  tmp=$(mktemp -d)
+  summary_stub_dir "$tmp"
+  rows='cozy-system  puller-z  0/1  ImagePullBackOff  0  4m'
+
+  out="$(PATH="$tmp:$PATH" STUB_POD_ROWS="$rows" sh "$HACK_DIR/cozyreport-summary.sh" 2>/dev/null)"
+
+  if printf '%s\n' "$out" | grep -q 'more not-Ready pod(s) not listed'; then echo "FAIL: claimed an overflow that did not happen"; false; fi
+  rm -rf "$tmp"
+}
+
+@test "pods not ready reads readiness from the ready column not the status text" {
+  # The split has to read $3. Proving that needs rows the split actually reaches,
+  # which means STATUS=Running: anything else is selected by the phase rule above
+  # it and never gets there, so a fixture like `Init:0/2` pins nothing at all no
+  # matter what its other columns say.
+  #
+  # `1/1 Running` with a slash-bearing STATUS is the row that decides it. Point
+  # the split at $4 and `Running` has no slash, so `split()` returns 1, the
+  # condition is false, and a healthy pod is dropped -- which is what the first
+  # assertion catches. The `0/1 Running` row on its own would survive that swap.
+  ready='tenant-test  settled-0  1/1  Running  0  9m'
+  unready='tenant-test  probing-0  0/1  Running  0  3m'
+
+  out="$(printf '%s\n' "$unready" | cozyreport_pods_not_ready)"
+  printf '%s\n' "$out" | grep -q 'probing-0' || {
+    echo "FAIL: a pod whose readiness probe never passed was dropped"
+    false
+  }
+
+  out="$(printf '%s\n' "$ready" | cozyreport_pods_not_ready)"
+  if printf '%s\n' "$out" | grep -q 'settled-0'; then
+    echo "FAIL: a fully ready running pod was selected"
+    false
+  fi
+}
+
+# Stub PATH for the linstor module: `kubectl exec` runs the command after `--` on
+# this machine, where `linstor`, `zpool` and `zfs` are stubs that print what they
+# were asked, and the real `jq` reads the stub's storage-pool JSON. That runs the
+# shells the controller and satellite execs actually send, rather than matching
+# their text.
+linstor_module_stub_dir() {
+  _ld=$1
+  mkdir -p "$_ld/bin"
+  cat > "$_ld/bin/kubectl" <<'STUB'
+#!/bin/sh
+case "$*" in
+  "get deploy -n cozy-linstor linstor-controller") exit 0 ;;
+  *"get pods -l app.kubernetes.io/component=linstor-satellite -o name") echo pod/linstor-satellite-a; exit 0 ;;
+  *"get pod/linstor-satellite-a -o jsonpath="*) [ -z "${STUB_NODENAME_FAIL:-}" ] || exit 1; printf 'srv1'; exit 0 ;;
+esac
+while [ $# -gt 0 ] && [ "$1" != "--" ]; do shift; done
+[ $# -gt 0 ] || exit 1
+shift
+exec "$@"
+STUB
+  cat > "$_ld/bin/linstor" <<'STUB'
+#!/bin/sh
+case "$*" in
+  "--machine-readable sp l")
+    [ -z "${STUB_SP_FAIL:-}" ] || { echo 'ERROR: unable to connect to linstor://localhost:3370' >&2; exit 10; }
+    printf '%s\n' "$STUB_SP_JSON" ;;
+  *) echo "linstor $*" ;;
+esac
+STUB
+  cat > "$_ld/bin/zpool" <<'STUB'
+#!/bin/sh
+echo "zpool $*"
+for a; do :; done; echo "zpool last argument: <$a>"
+for a; do [ "$a" != "${STUB_MISSING:-}" ] || { echo "cannot open '$a': no such pool" >&2; exit 1; }; done
+STUB
+  cat > "$_ld/bin/zfs" <<'STUB'
+#!/bin/sh
+[ -z "${STUB_ZFS_FAIL:-}" ] || { echo 'cannot open dataset: permission denied' >&2; exit 1; }
+echo "zfs $*"
+for a; do :; done; echo "zfs last argument: <$a>"
+[ -z "${STUB_MISSING:-}" ] || for a; do
+  case $a in "$STUB_MISSING"|"$STUB_MISSING"/*) echo "cannot open '$a': dataset does not exist" >&2; exit 1 ;; esac
+done
+STUB
+  chmod +x "$_ld/bin/kubectl" "$_ld/bin/linstor" "$_ld/bin/zpool" "$_ld/bin/zfs"
+}
+
+# The storage pools one cluster reports: a thick ZFS pool on srv1, a thin one
+# backed by a dataset inside a zpool rather than a whole zpool, a diskless pool,
+# an LVM pool whose backing name zpool and zfs must never see, and srv2's own
+# pool, which srv1's listing must not carry. The backing name is under
+# StorDriver/StorPoolName, the one key the controller keeps: its REST layer
+# renames StorDriver/ZPool and StorDriver/ZPoolThin to it on create.
+LINSTOR_SP_JSON='[[
+ {"storage_pool_name":"DfltDisklessStorPool","node_name":"srv1","provider_kind":"DISKLESS","props":{}},
+ {"storage_pool_name":"data","node_name":"srv1","provider_kind":"ZFS","props":{"StorDriver/StorPoolName":"data-srv1"}},
+ {"storage_pool_name":"thin","node_name":"srv1","provider_kind":"ZFS_THIN","props":{"StorDriver/StorPoolName":"tank/thin"}},
+ {"storage_pool_name":"lvm","node_name":"srv1","provider_kind":"LVM_THIN","props":{"StorDriver/StorPoolName":"vg/thin"}},
+ {"storage_pool_name":"data","node_name":"srv2","provider_kind":"ZFS","props":{"StorDriver/StorPoolName":"data-srv2"}}
+]]'
+
+@test "the linstor module lists the datasets of the zfs pools linstor uses on each node" {
+  # Only the dataset list names what holds a pool's space. Exact bytes and
+  # `avail`, so the sizes of leftover datasets can be summed against the pool
+  # root's `avail`; a rounded size hides a sub-GiB difference on a 100 GiB pool.
+  # It is taken on green jobs too, so a red one has a listing to compare.
+  tmp=$(mktemp -d)
+  linstor_module_stub_dir "$tmp"
+  body=$(awk '/^# -- linstor module/,/^# -- sandbox-host module/' "$SCRIPT" | sed '$d' | fold_source /dev/stdin)
+  [ -n "$body" ] || { echo "FAIL: could not locate the linstor module"; false; }
+
+  REPORT_DIR="$tmp/report"
+  export REPORT_DIR
+  ( export STUB_SP_JSON="$LINSTOR_SP_JSON" COZYREPORT_BOUND="" PATH="$tmp/bin:$PATH"; eval "$body" ) >/dev/null 2>&1
+
+  grep -qx 'linstor --no-color v l' "$REPORT_DIR/linstor/volumes.txt" 2>/dev/null || {
+    echo "FAIL: the LINSTOR volume list was not recorded"; false; }
+  out="$REPORT_DIR/linstor/zfs/srv1.txt"
+  grep -qx 'zpool get -p freeing,leaked,allocated,free data-srv1 tank' "$out" 2>/dev/null || {
+    echo "FAIL: the pool totals and pending frees of srv1's pools were not read exactly"
+    cat "$out" 2>/dev/null
+    false
+  }
+  grep -qx 'zfs list -p -t all -o name,used,avail,refer,origin,creation -r data-srv1 tank/thin' "$out" || {
+    echo "FAIL: srv1's pools were not listed in exact bytes with every dataset type and avail"
+    cat "$out"
+    false
+  }
+  rm -rf "$tmp"
+}
+
+@test "a pool name with a space reaches zpool and zfs as one argument" {
+  # ZFS allows a space in pool and dataset names, so such a pool must be read,
+  # and its name must not be split on the way to the satellite.
+  tmp=$(mktemp -d)
+  linstor_module_stub_dir "$tmp"
+  body=$(awk '/^# -- linstor module/,/^# -- sandbox-host module/' "$SCRIPT" | sed '$d' | fold_source /dev/stdin)
+  REPORT_DIR="$tmp/report"
+  export REPORT_DIR
+  spaced='[[{"storage_pool_name":"data","node_name":"srv1","provider_kind":"ZFS","props":{"StorDriver/StorPoolName":"tank data/thin"}}]]'
+  ( export STUB_SP_JSON="$spaced" COZYREPORT_BOUND="" PATH="$tmp/bin:$PATH"; eval "$body" ) >/dev/null 2>&1
+
+  out="$REPORT_DIR/linstor/zfs/srv1.txt"
+  grep -qx 'zpool last argument: <tank data>' "$out" 2>/dev/null || {
+    echo "FAIL: zpool did not get the spaced pool as one argument"
+    cat "$out" 2>/dev/null
+    false
+  }
+  grep -qx 'zfs last argument: <tank data/thin>' "$out" || {
+    echo "FAIL: zfs did not get the spaced dataset as one argument"
+    cat "$out"
+    false
+  }
+  rm -rf "$tmp"
+}
+
+@test "a node linstor names no zfs pool for gets a note and no zfs read" {
+  # `zfs list -r` with no pool argument lists every pool on the machine, so a
+  # node with nothing to scope it to must not reach zfs at all.
+  tmp=$(mktemp -d)
+  linstor_module_stub_dir "$tmp"
+  body=$(awk '/^# -- linstor module/,/^# -- sandbox-host module/' "$SCRIPT" | sed '$d' | fold_source /dev/stdin)
+  REPORT_DIR="$tmp/report"
+  export REPORT_DIR
+  # srv1's ZFS rows carry no backing name, an empty one or a blank one, and
+  # none may become a blank pool argument.
+  only_srv2='[[{"storage_pool_name":"odd","node_name":"srv1","provider_kind":"ZFS","props":{}},
+ {"storage_pool_name":"empty","node_name":"srv1","provider_kind":"ZFS","props":{"StorDriver/StorPoolName":""}},
+ {"storage_pool_name":"space","node_name":"srv1","provider_kind":"ZFS","props":{"StorDriver/StorPoolName":" "}},
+ {"storage_pool_name":"tab","node_name":"srv1","provider_kind":"ZFS","props":{"StorDriver/StorPoolName":"\t"}},
+ {"storage_pool_name":"data","node_name":"srv2","provider_kind":"ZFS","props":{"StorDriver/StorPoolName":"data-srv2"}}]]'
+  ( export STUB_SP_JSON="$only_srv2" COZYREPORT_BOUND="" PATH="$tmp/bin:$PATH"; eval "$body" ) >/dev/null 2>&1
+
+  out="$REPORT_DIR/linstor/zfs/srv1.txt"
+  grep -q 'names no ZFS pool for node srv1' "$out" 2>/dev/null || {
+    echo "FAIL: a node without a ZFS pool in LINSTOR did not say so"
+    cat "$out" 2>/dev/null
+    false
+  }
+  if grep -q '^zfs \|^zpool ' "$out"; then
+    echo "FAIL: zfs or zpool ran with no pool to scope it"; false
+  fi
+
+  # The storage-pool read itself failing leaves the same note, and its own
+  # file carries LINSTOR's message rather than an empty table.
+  rm -rf "$REPORT_DIR"
+  ( export STUB_SP_FAIL=1 COZYREPORT_BOUND="" PATH="$tmp/bin:$PATH"; eval "$body" ) >/dev/null 2>&1
+  grep -q 'unable to connect to linstor' "$REPORT_DIR/linstor/zfs-pools.txt" 2>/dev/null || {
+    echo "FAIL: a failed storage-pool read left no message in its file"
+    cat "$REPORT_DIR/linstor/zfs-pools.txt" 2>/dev/null
+    false
+  }
+  grep -q 'names no ZFS pool for node srv1' "$REPORT_DIR/linstor/zfs/srv1.txt" 2>/dev/null || {
+    echo "FAIL: a failed storage-pool read left the node without a note"; false; }
+
+  # Output that is not JSON fails the read with jq's status, rather than
+  # passing as an empty table.
+  rm -rf "$REPORT_DIR"
+  ( export STUB_SP_JSON='not json' COZYREPORT_BOUND="" PATH="$tmp/bin:$PATH"; eval "$body" ) >/dev/null 2>&1
+  grep -q 'zfs-pools.txt' "$REPORT_DIR/linstor/COLLECTION-FAILED.txt" 2>/dev/null || {
+    echo "FAIL: a storage-pool listing jq could not parse was not recorded as a failed read"
+    cat "$REPORT_DIR/linstor/COLLECTION-FAILED.txt" 2>/dev/null
+    false
+  }
+  grep -q 'names no ZFS pool for node srv1' "$REPORT_DIR/linstor/zfs/srv1.txt" 2>/dev/null || {
+    echo "FAIL: an unparsable storage-pool listing left the node without a note"; false; }
+  rm -rf "$tmp"
+}
+
+@test "a satellite whose node name cannot be read says so instead of blaming the pool map" {
+  # The fallback key is the pod name, which never matches a LINSTOR node, so the
+  # note must name the unread spec.nodeName rather than send the reader to a
+  # zfs-pools.txt that does list the node. The module does not run under set -e,
+  # so neither does this.
+  tmp=$(mktemp -d)
+  linstor_module_stub_dir "$tmp"
+  body=$(awk '/^# -- linstor module/,/^# -- sandbox-host module/' "$SCRIPT" | sed '$d' | fold_source /dev/stdin)
+  REPORT_DIR="$tmp/report"
+  export REPORT_DIR
+  ( set +e; export STUB_SP_JSON="$LINSTOR_SP_JSON" STUB_NODENAME_FAIL=1 COZYREPORT_BOUND="" PATH="$tmp/bin:$PATH"; eval "$body" ) >/dev/null 2>&1
+
+  out="$REPORT_DIR/linstor/zfs/linstor-satellite-a.txt"
+  grep -q 'spec.nodeName of pod/linstor-satellite-a could not be read' "$out" 2>/dev/null || {
+    echo "FAIL: an unread node name was not named as the reason for the missing listing"
+    cat "$out" 2>/dev/null
+    false
+  }
+  if grep -q 'names no ZFS pool' "$out"; then
+    echo "FAIL: an unread node name was blamed on zfs-pools.txt"; false
+  fi
+  rm -rf "$tmp"
+}
+
+@test "a pool that cannot be opened costs neither the other pools' listing nor a cut-short marker" {
+  # zpool and zfs both go on past a pool they cannot open, list the rest and exit
+  # 1. That is about the satellite, not about which pools LINSTOR uses, and the
+  # listing of the pools that are fine is complete.
+  tmp=$(mktemp -d)
+  linstor_module_stub_dir "$tmp"
+  body=$(awk '/^# -- linstor module/,/^# -- sandbox-host module/' "$SCRIPT" | sed '$d' | fold_source /dev/stdin)
+  REPORT_DIR="$tmp/report"
+  export REPORT_DIR
+  ( export STUB_SP_JSON="$LINSTOR_SP_JSON" STUB_MISSING=tank COZYREPORT_BOUND="" PATH="$tmp/bin:$PATH"; eval "$body" ) >/dev/null 2>&1
+
+  out="$REPORT_DIR/linstor/zfs/srv1.txt"
+  if grep -q 'names no ZFS pool' "$out" 2>/dev/null; then
+    echo "FAIL: a failing zpool was reported as a node without a pool"
+    cat "$out"
+    false
+  fi
+  grep -q "cannot open 'tank': no such pool" "$out" 2>/dev/null || {
+    echo "FAIL: the failing zpool's message was not recorded in the listing"
+    cat "$out"
+    false
+  }
+  grep -qx 'zfs list -p -t all -o name,used,avail,refer,origin,creation -r data-srv1 tank/thin' "$out" || {
+    echo "FAIL: a failing zpool get dropped the dataset listing"
+    cat "$out"
+    false
+  }
+  if grep -q 'TRUNCATED' "$out"; then
+    echo "FAIL: a whole listing was marked as cut short because one pool could not be opened"
+    cat "$out"
+    false
+  fi
+  grep -q '^# \[cozyreport\] EXIT 1 after this output' "$out" || {
+    echo "FAIL: zfs list's non-zero exit was not marked in the listing"
+    cat "$out"
+    false
+  }
+  grep -q '^# \[cozyreport\] zpool get exited 1' "$out" || {
+    echo "FAIL: zpool get's status was not recorded in the listing"
+    cat "$out"
+    false
+  }
+  grep -q "cannot open 'tank/thin': dataset does not exist" "$REPORT_DIR/linstor/zfs/COLLECTION-FAILED.txt" 2>/dev/null || {
+    echo "FAIL: the dataset zfs list could not open was not recorded beside the listing"
+    cat "$REPORT_DIR/linstor/zfs/COLLECTION-FAILED.txt" 2>/dev/null
+    false
+  }
+  rm -rf "$tmp"
+}
+
+@test "a zfs list that fails is recorded as a failed read" {
+  tmp=$(mktemp -d)
+  linstor_module_stub_dir "$tmp"
+  body=$(awk '/^# -- linstor module/,/^# -- sandbox-host module/' "$SCRIPT" | sed '$d' | fold_source /dev/stdin)
+  REPORT_DIR="$tmp/report"
+  export REPORT_DIR
+  ( export STUB_SP_JSON="$LINSTOR_SP_JSON" STUB_ZFS_FAIL=1 COZYREPORT_BOUND="" PATH="$tmp/bin:$PATH"; eval "$body" ) >/dev/null 2>&1
+  grep -q 'cannot open dataset: permission denied' "$REPORT_DIR/linstor/zfs/COLLECTION-FAILED.txt" 2>/dev/null || {
+    echo "FAIL: a failing zfs list was not recorded as a failed read"
+    cat "$REPORT_DIR/linstor/zfs/COLLECTION-FAILED.txt" 2>/dev/null
+    false
+  }
+  rm -rf "$tmp"
+}
+
diff --git a/hack/cozyreport.sh b/hack/cozyreport.sh
index 3d0f51b9eb..0f20b1261b 100755
--- a/hack/cozyreport.sh
+++ b/hack/cozyreport.sh
@@ -1,66 +1,1722 @@
 #!/bin/sh
+#
+# Environment:
+#   COZY_REPORT_PODS_MAX     max not-Ready pods to collect per-pod evidence for
+#                            (default 40). The overflow is named in
+#                            COLLECTION-TRUNCATED.txt, never dropped in silence.
+#   COZY_REPORT_PODS_BUDGET  wall-clock seconds for that walk (default 600). A
+#                            deadline for starting a read, not for finishing the
+#                            walk, and rechecked between containers, so the ceiling
+#                            is this plus one pod's object reads plus one
+#                            container's current AND previous log reads -- a fixed
+#                            overshoot, not one that grows with the container
+#                            count. The two log reads are consecutive, with no
+#                            deadline check between them.
+#   COZY_REPORT_POD_TAIL     --tail for the per-pod container logs (default 2000;
+#                            -1 for kubectl's own default of the complete log).
+#   COZY_REPORT_DIR          where the snapshot tree this report folds in lives
+#                            (default `_out/cozyreport`). Shared with
+#                            hack/cozytest.sh and hack/e2e-chainsaw/.chainsaw.yaml,
+#                            which write the per-test snapshots this script then
+#                            picks up; changing it in one place only means the
+#                            report collects an empty snapshots directory.
+#   COZY_REPORT_PREFER_NS    namespace prefix collected first, so the pod cap is
+#                            not spent on unrelated platform namespaces (default
+#                            `tenant-`; empty disables the ordering).
+#   COZY_RUNNER_IDENTITY_FILE  the record hack/e2e-runner-identity.sh left on the
+#                            runner VM, carried into this container with the tree
+#                            (default `_out/runner-identity.txt`, which is where
+#                            packages/core/testing/Makefile writes it and, inside
+#                            the container, sits under /workspace). Copied into
+#                            the report rather than re-read here: it describes the
+#                            machine a layer above this container, whose metadata
+#                            service this container has no guaranteed route to.
+# A malformed value in any numeric knob falls back to its default and says so in
+# the report.
+#
+# EVERY read below carries a wall-clock ceiling, and a ceiling that fires is
+# recorded in the artifact rather than in the job log alone. A test derives that
+# from the code, so this sentence is checked rather than maintained -- which the
+# list it replaced was not: it named four sections while the file had ten.
+#
+# Which reader a new read belongs to:
+#   cozyreport_read_object     its output IS a file; the marker goes in.
+#   cozyreport_select_objects  it feeds a loop, and dash pipelines lose the status.
+#   cozyreport_probe           it is a gate deciding whether a module runs.
+#   cozyreport_read_exec       it runs a command INSIDE a pod, so its 124 is
+#                              ambiguous and its marker is placed by output format.
+# The bare wrapper is for reads whose output is not the reader's to write -- a
+# variable, or a pipeline that transforms it before anything lands -- so there is
+# no point at which a marker could attach. Each says so where it sits.
+#
+# A ceiling per read is NOT a ceiling on the report. The pod, VM, VMI and services
+# walks carry a count cap and a time budget; the other loops carry neither, so
+# their cost grows with the cluster. A per-read bound removes the single read that
+# never returns; what bounds the rest is the step's own ceiling, below.
+# The pod cap and collection budget apply to the pod section only. The fixed
+# --tail=2000 reads elsewhere in this file do not name their bound.
+#
+# THE TOTAL, which no individual section states and which is the number that
+# decides whether the tarball survives at all. Each bounded section names its own
+# ceiling; nothing sums them, and a reader checking one section reasonably
+# concludes the report is bounded by that figure.
+#
+# Written as the COMPOSITION rather than as one figure, because the figure is what
+# goes stale: every term below is a number this file sets, so an editor who changes
+# one recomputes instead of trusting a total that silently stopped matching. A
+# single figure here is easy to get wrong in the quiet direction: omit the kill
+# grace and one class of overshoot and it reads seven minutes short, with nothing
+# in the file disagreeing.
+#
+#   ONE READ            = COZYREPORT_READ_TIMEOUT + the `-k` grace = 30 + 5 = 35s.
+#                         The grace counts: `timeout -k 5 30` sends TERM at 30s and
+#                         KILLs at 35s, so a read that ignores TERM costs 35s, not
+#                         30. hack/e2e-capture-previous-logs.sh states the same rule
+#                         for its own pair and budgets 18 + 2 = 20 against it.
+#   BUDGETS             = 600s (pods) + 3 x 240s (VM, VMI, services)      = 1320s
+#   OVERSHOOT, pods     = a budget gates when a read may START, so the last pod
+#                         admitted still runs 4 reads: pod.yaml, describe.txt, and
+#                         both log reads of one container.        4 x 35 =  140s
+#   OVERSHOOT, objects  = same rule, and the deadline is checked once per iteration
+#                         with two reads after it, in each of three walks.
+#                                                             3 x 2 x 35 =  210s
+#   UNBUDGETED LISTINGS = pods.txt, vms.txt, vmis.txt, services.txt,
+#                         applicationdefinitions.txt, tenants.txt. Each is bounded
+#                         per read but sits outside every budget window -- the three
+#                         object deadlines are set AFTER their own listing read.
+#                                                                 6 x 35 =  210s
+#   LINSTOR EXEC READS  = the four listings, the ZFS pool map, the error-report
+#                         index, the controller bundle, and UP TO TWO PER SATELLITE
+#                         (its dataset listing and its bundle). Bounded
+#                         per read, in no budget window, and the only reads here
+#                         whose duration is a workload's rather than the
+#                         apiserver's. Written with its n rather than with a
+#                         cluster's worth folded in, because this is the term that
+#                         grows with the storage nodes.
+#                                                       (7 + 2n) x 35 = 245 + 70n
+#   EVERY OTHER READ    = literally the rest of the file -- the listings, the
+#                         gates, the sandbox-host commands, and every per-object walk
+#                         EXCEPT the four capped ones above. Written as "the rest"
+#                         so that a read added later is inside this term without
+#                         anyone having to notice. Each
+#                         read is bounded, none of those walks sits inside a cap or
+#                         a budget, and they take two to four reads per selected
+#                         object, so this term is the cluster's to set and not this
+#                         file's. Named as "the ones outside the caps" rather than
+#                         listed: a list of them is exactly what this file stopped
+#                         keeping, because it drifts and reads as complete while it
+#                         does so. A failed install with a hundred not-Ready
+#                         HelmReleases takes four reads per release and spends
+#                         400 x 35 = 14000s in that one walk.
+#                                                          not a constant: see above
+#                                                                          ------
+#                                              2125s + 70n + whatever the walks cost
+#
+# No total is stated, and no partial sum either. Three attempts at a summarising
+# figure here were each wrong on arrival -- the terms are arithmetic over five
+# constants this file sets elsewhere, nothing binds a figure to them, and a
+# sentence that adds some of them up is a fourth thing to keep in step. The
+# relation that matters is stated once, below, where the step's own ceiling is:
+# it sits UNDER this composition deliberately. Add the terms yourself if you need
+# the number; do not expect to find it written here.
+#
+# TWO ceilings sit outside it, and they fail differently. The job is capped at
+# `timeout-minutes: 215`, and reaching that cancels every step still to come --
+# the artifact upload among them. The step running this script is capped at 30 of
+# its own, and reaching THAT ends only this step: the uploads after it still run,
+# and `continue-on-error` on that step keeps the overrun out of the job's result,
+# so a passing run whose collection was slow is still reported as passing.
+# Neither ceiling saves this report: the tarball is written on the last line of
+# this file, so an overrun of either loses it rather than truncating it. What the
+# step ceiling buys is the rest of the job.
+#
+# The step's 30 minutes is deliberately UNDER the sum above rather than over it.
+# The sum is what a run costs when essentially every read hits its ceiling, and
+# the measured collection takes well under a minute; sizing the step for the
+# pathological case would spend a sixth of the job budget waiting for a report
+# that is already worthless. Anyone raising a budget here should check this sum
+# against that 30 minutes, not against the section they are editing.
+#
+# Default pod cap, shared with hack/cozyreport-summary.sh so the two start from
+# the same number. Their resulting counts can still differ: the collector also
+# stops on its time budget and says so in COLLECTION-TRUNCATED.txt.
+COZYREPORT_PODS_DEFAULT=40
+
+# The same two bounds for the object loops that read one YAML and one describe per
+# selected object: VMs, VMIs and pending-address services. Constants rather than
+# knobs, because nobody has asked to tune them and a setting added on spec cannot
+# be withdrawn once somebody sets it.
+#
+# They exist for the same reason the pod bounds do, and became necessary for a
+# sharper one: the services selector read a column that never carries the value it
+# filtered for, so that loop had never executed. Correcting it is what makes a
+# large selection possible, and the platform ships LoadBalancer services in
+# quantity, so an install with no LB provider selects all of them at once. At two
+# reads per object and a 30s ceiling each, an unbounded loop clears the step's own
+# 30-minute ceiling long before it finishes; the tarball is written on this file's
+# last line, so the overrun does not truncate it, it loses it.
+COZYREPORT_OBJECTS_DEFAULT=25
+COZYREPORT_OBJECTS_BUDGET_DEFAULT=240
+
+# The wall-clock wrapper for the bounded reads, resolved once so a caller driving
+# cozyreport_collect_pod directly gets the same answer. Empty when `timeout` is
+# absent: the reads then run unbounded and the section says so, rather than every
+# read exiting 127 and blaming the cluster for a missing local binary.
+COZYREPORT_READ_TIMEOUT=30
+if command -v timeout >/dev/null 2>&1; then
+  COZYREPORT_BOUND="timeout -k 5 $COZYREPORT_READ_TIMEOUT"
+else
+  COZYREPORT_BOUND=""
+fi
+
+# cozyreport_cutoff_desc <exit-status>: how a 124/137 should be described, derived
+# from the bound at the moment of writing rather than fixed alongside it.
+#
+# Two variables set in one if/else agree until something sets one of them on its
+# own -- and the collector already keys on an empty COZYREPORT_BOUND, so "was there
+# a bound" has to be asked of the bound. Otherwise a read with no ceiling reports a
+# kill by runner teardown or the OOM killer as this script's own timeout, which is a
+# mechanism that was not in play.
+#
+# The status matters for the same reason, one level down. 124 is the deadline
+# expiring. It is not literally unique -- `timeout` passes a command's own exit
+# status through, so a command that itself exits 124 is indistinguishable -- but
+# every command handed to this wrapper is a kubectl `get`, `logs` or `describe`, a
+# talosctl `dmesg` or `logs`, or one of the host commands the sandbox-host
+# section reads, and none of those returns 124. Described rather than counted,
+# because a number here is a second thing to keep in step with a list that
+# grows. talosctl and the host commands are
+# named because this file only started routing them through the bounded reader; a
+# cobra CLI exits 0 or 1 and `df`/`free`/`ps` exit 0, 1 or 2, so the conclusion is
+# unchanged -- but an enumeration that stops listing what reaches it stops being
+# something a reader can check. The one construct that would break that is
+# `kubectl exec`, which propagates the remote command's status. The LINSTOR reads
+# of a pod ARE execs, so the invariant is narrower than "no bounded read is an
+# exec": none of them is described by THIS helper. They go through
+# cozyreport_read_exec, which states the ambiguity rather than resolving it and
+# never calls in here, and a test holds both halves. 137 is 128+SIGKILL,
+# which our own `-k` grace produces and so does anything else that SIGKILLs the
+# read -- the OOM killer on a loaded runner, a teardown that signals the process
+# group. Both belong in the cut-off branch, since either way the file ends before
+# the object did; but naming our timeout for a 137 states a cause the script never
+# observed, and a read killed at second two would be reported as one that ran the
+# full 30.
+cozyreport_cutoff_desc() {
+  if [ -z "$COZYREPORT_BOUND" ]; then
+    printf '%s' "a signal from outside this script, which ran its reads unbounded"
+  elif [ "${1:-}" = "137" ]; then
+    printf '%s' "a SIGKILL -- the kill grace of its own ${COZYREPORT_READ_TIMEOUT}s timeout, or something else killing the read, which 137 does not tell apart"
+  else
+    printf '%s' "its own ${COZYREPORT_READ_TIMEOUT}s timeout"
+  fi
+}
+
+# cozyreport_admit_objects <section>: stdin = selected rows, stdout = at most
+# COZYREPORT_OBJECTS_DEFAULT of them, with the overflow named rather than dropped.
+#
+# The count bound. The time bound is COZYREPORT_OBJECTS_DEADLINE, set beside the
+# call and checked between objects by the loops themselves, so a slow apiserver
+# stops the walk instead of the job's outer limit stopping the whole report.
+cozyreport_admit_objects() {
+  _cao_rows=$(cat)
+  _cao_total=$(printf '%s\n' "$_cao_rows" | grep -c . || true)
+  printf '%s\n' "$_cao_rows" | awk 'NF' | head -n "$COZYREPORT_OBJECTS_DEFAULT"
+  if [ "$_cao_total" -gt "$COZYREPORT_OBJECTS_DEFAULT" ]; then
+    # "admitted", not "collected": this runs BEFORE the loop reads anything, so
+    # the number is how many the cap let through, not how many ended up in the
+    # tree. The two differ whenever the time budget stops the walk early, and on
+    # an already-expired budget they differ by all of them -- the note would
+    # otherwise claim twenty-five directories that do not exist.
+    printf '%s\n' "[cozyreport] $1: $_cao_total selected, $COZYREPORT_OBJECTS_DEFAULT admitted by the cap; the rest are listed in the section's own .txt above and were not read individually. Fewer may have been collected than admitted if the object budget also elapsed, which is recorded separately" \
+      >> "$REPORT_DIR/kubernetes/COLLECTION-TRUNCATED.txt" || true
+  fi
+}
+
+# cozyreport_objects_deadline_passed: true once the object walk has spent its
+# budget. Checked between objects, never inside one, so every file present is a
+# file that was read whole.
+cozyreport_objects_deadline_passed() {
+  [ -n "${COZYREPORT_OBJECTS_DEADLINE:-}" ] &&
+    [ "$(date +%s)" -ge "$COZYREPORT_OBJECTS_DEADLINE" ]
+}
+
+# cozyreport_select_objects <section> <kubectl-args...>: the selector read, with
+# its exit status kept.
+#
+# A pipeline in dash has no pipefail, so `timeout kubectl get ... | filter | while`
+# returns the status of `while` and a read killed at 124 is indistinguishable from
+# a cluster that genuinely has nothing to select: no rows, no error, no marker. The
+# pod list is read this way for the same reason; these three sections were still
+# piping the read straight in.
+cozyreport_select_objects() {
+  _cso_section=$1
+  shift
+  # Where this walk's notes belong. Defaults to the kubernetes directory, which is
+  # right for the twelve callers that read a Kubernetes listing; the LINSTOR
+  # satellite walk sets it, because its bundles land under linstor/ and a note
+  # about a pod list that came back short is no use in a directory the reader has
+  # no reason to open.
+  _cso_dir=${COZYREPORT_SELECT_NOTE_DIR:-$REPORT_DIR/kubernetes}
+  # shellcheck disable=SC2086  # empty COZYREPORT_BOUND must vanish, not become ""
+  # kubectl's reason is kept, like every other read in this file. Discarding it
+  # leaves "the selection read did not return (exit 1)", which is a symptom with
+  # no cause: on an install without KubeVirt `kubectl get vm -A` exits 1, and the
+  # report cannot then say whether the CRD is absent, RBAC refused, or the
+  # apiserver never answered. This was the one reader added here that threw it away.
+  _cso_err=$(mktemp "${TMPDIR:-/tmp}/cozyreport-select.XXXXXX" 2>/dev/null) || _cso_err=""
+  # Status taken in an explicit `else`. A compound `if` whose condition fails and
+  # which has no else leaves `$?` at 0, so reading it after `fi` reports a clean
+  # exit for every failure -- the same trap this file documents two functions up.
+  # It is easy to reintroduce here, because the `if` reads as though the status
+  # survives it.
+  # shellcheck disable=SC2086  # empty COZYREPORT_BOUND must vanish, not become ""
+  if _cso_rows=$($COZYREPORT_BOUND "$@" 2>"${_cso_err:-/dev/null}"); then
+    [ -z "$_cso_err" ] || rm -f "$_cso_err"
+    # An empty selection emits NOTHING, not a blank line. `printf '%s\n' ""`
+    # writes one, and a blank line is a row to every caller downstream: the
+    # filters that select on a named column -- `$2 != "Ready"`, `$3 != "Bound"`
+    # -- all pass it, because an absent field is not the string it is compared
+    # against, and the loop then runs once with an empty name. That reads
+    # `kubectl get node ""`, whose refusal lands in `nodes/node.yaml` and looks
+    # exactly like a failed read of a real node.
+    #
+    # Guarded here rather than in each loop. The three callers that predate this
+    # were immune only because their filters happen to start with `NF &&`, which
+    # is a property of what they select on and not a decision anyone made about
+    # empty selections; the next loop added would need to know that too.
+    if [ -n "$_cso_rows" ]; then
+      printf '%s\n' "$_cso_rows"
+    fi
+    return 0
+  else
+    _cso_rc=$?
+  fi
+
+  # Every note below is appended into $REPORT_DIR/kubernetes, and this function is
+  # no longer called only from sections that run after that directory is created.
+  # A redirect into a directory that does not exist fails, the `|| true` swallows
+  # it, and the marker is lost -- in the one function whose entire purpose is that
+  # a failed selection cannot pass for an empty cluster. Created here rather than
+  # at each append, and only on the failure path, so a healthy run still leaves no
+  # empty directory behind.
+  mkdir -p "$_cso_dir" 2>/dev/null || true
+
+  # Rows arrived before the failure: that is a partial list, and the rows are the
+  # only ones the read named. Emitted, and the note says partial rather than
+  # empty -- the same rule the pod walk and the summary already follow.
+  if [ -n "$_cso_rows" ]; then
+    printf '%s\n' "$_cso_rows"
+    printf '%s\n' "[cozyreport] $_cso_section: the selection read did not return (exit $_cso_rc); the objects below are the ones it named before it stopped, and there may be others it never reached" \
+      >> "$_cso_dir/COLLECTION-FAILED.txt" || true
+    [ -z "$_cso_err" ] || rm -f "$_cso_err"
+    return 0
+  fi
+
+  # A kind this cluster does not serve is not a failure to collect -- it is the
+  # cluster, correctly described. `kubectl get vm -A` exits 1 on every install
+  # without KubeVirt, and filing that under COLLECTION-FAILED.txt puts an alarming
+  # filename in the tree of a report where nothing went wrong. The body did carry
+  # kubectl's reason, so the note was never misleading once opened; the problem is
+  # that the filename is what a triager scans for, and a file that cries wolf on
+  # ordinary installs is one a reader learns to skip -- which costs the runs where
+  # it names something real.
+  #
+  # Checked before the timeout branch, not after: this is decided by what kubectl
+  # SAID, and the branches below are ordered by how the read ended. A read that
+  # was cut off has no message at all, so the two cannot both match.
+  #
+  # CONSTRAINT ON CALLERS, not a general truth. `the server could not find the
+  # requested resource` is also what an aggregated APIService that is DOWN
+  # produces, and that is a failed read wearing the words of an absent one. Safe
+  # at every call site today because each of them reads a core kind or a CRD --
+  # `packages` and `packagesources` are real CRDs, installed from
+  # internal/crdinstall/manifests/ -- and neither can be served by an aggregated
+  # API. Stated as the PROPERTY every caller has to have rather than as a count of
+  # the callers, because the count is what goes stale: it read "today's three call
+  # sites" while there were thirteen, and a reader checking the constraint against
+  # an audited set of three has no way to know the other ten were never audited.
+  # Route an aggregated kind
+  # through this selector -- `tenants.apps.cozystack.io` is one, and this file
+  # already reads it, through cozyreport_read_object rather than here -- and an
+  # apiserver outage on exactly the failed install this tool exists for gets filed
+  # as "nothing to collect", with COLLECTION-FAILED.txt suppressed.
+  if [ -n "$_cso_err" ] && [ -s "$_cso_err" ] &&
+     grep -qE "doesn't have a resource type|the server could not find the requested resource|could not find the requested resource" "$_cso_err"; then
+    # Its own filename, not COLLECTION-NOTES.txt. That name is already taken, one
+    # directory down, by "a knob value the collector could not use" -- a different
+    # statement with a different subject, and the doc bullet describes only that
+    # one. Two meanings behind one name means whichever the reader has met before
+    # is the one they assume, and the marker guard cannot catch the collision: it
+    # matches basenames, so the doc's mention of the other file satisfies it.
+    printf '%s\n' "[cozyreport] $_cso_section: this cluster does not serve that resource type, so there is nothing to collect. This is a statement about the cluster, not a failed read: $(tail -n 1 "$_cso_err" | cut -c1-200)" \
+      >> "$_cso_dir/KIND-NOT-SERVED.txt" || true
+    [ -z "$_cso_err" ] || rm -f "$_cso_err"
+    return 0
+  fi
+
+  # Timeout first, matching every other classification site here: a read killed
+  # before kubectl wrote anything has an empty stderr by construction, so leading
+  # with "no message" would name the accident instead of the cause.
+  if cozyreport_timed_out "$_cso_rc"; then
+    _cso_why="the read was cut off by $(cozyreport_cutoff_desc "$_cso_rc")"
+  elif [ -z "$_cso_err" ]; then
+    _cso_why="kubectl exited $_cso_rc; its message could not be captured (no writable temp dir on the machine producing this report), so whether it said anything is unknown"
+  elif [ -s "$_cso_err" ]; then
+    _cso_why="kubectl said: $(tail -n 1 "$_cso_err" | cut -c1-200)"
+  else
+    _cso_why="kubectl exited $_cso_rc without a message"
+  fi
+  [ -z "$_cso_err" ] || rm -f "$_cso_err"
+
+  # printf, not echo: kubectl's text is untrusted and dash's echo expands
+  # backslash escapes, so a message carrying one could forge a line in a file a
+  # triager reads as fact.
+  printf '%s\n' "[cozyreport] $_cso_section: the selection read did not return (exit $_cso_rc), so this section is empty because nothing could be listed, NOT because nothing matched; $_cso_why" \
+    >> "$_cso_dir/COLLECTION-FAILED.txt" || true
+  return 0
+}
+
+# cozyreport_probe <section> <kubectl-args...>: the bounded form of the `if
+# kubectl get ... >/dev/null` gates that decide whether a module runs at all.
+#
+# A gate is a read, and an unbounded one costs more than any read it guards: the
+# module below it never starts. Bounded, its non-zero status is indistinguishable
+# from "this cluster does not run that component", so the module is skipped and
+# leaves the same empty tree.
+#
+# So the cut-off is recorded and the status is still returned: the caller keeps
+# its `if`, and the report carries the difference between a component that is not
+# installed and a probe that TIMED OUT. Only that one. A probe refused for another
+# reason -- RBAC, an apiserver 503 -- still skips its module and still looks like
+# a component that was never installed, because telling those apart means reading
+# kubectl's message, and filing every non-zero probe would put a note in every
+# report on every install that legitimately lacks a component. Named here rather
+# than implied away: this function narrows the silence, it does not end it.
+cozyreport_probe() {
+  _cpr_section=$1
+  shift
+  # Status taken in an explicit `else`, like every other reader here. A compound
+  # `if` whose condition fails and which has no else leaves `$?` at 0, so reading
+  # it after `fi` reports a clean probe for every failure -- and a probe is the
+  # one place where that turns straight into "this module is present", which then
+  # runs the whole section against a cluster that never answered.
+  # shellcheck disable=SC2086  # empty COZYREPORT_BOUND must vanish, not become ""
+  if $COZYREPORT_BOUND "$@" >/dev/null 2>&1; then
+    return 0
+  else
+    _cpr_rc=$?
+  fi
+  cozyreport_timed_out "$_cpr_rc" || return "$_cpr_rc"
+  mkdir -p "$REPORT_DIR/kubernetes" 2>/dev/null || true
+  printf '%s\n' "[cozyreport] $_cpr_section: the probe that decides whether this section is collected was cut off by $(cozyreport_cutoff_desc "$_cpr_rc"), so the section was skipped. That is NOT a statement that the component is absent -- nothing was ever looked at, and a cluster running it produces the same empty tree here" \
+    >> "$REPORT_DIR/kubernetes/COLLECTION-FAILED.txt" || true
+  return "$_cpr_rc"
+}
+
+# cozyreport_objects_budget_note <section>: record that the walk stopped on time
+# rather than on count. Written once per section, because the loop breaks once.
+#
+# Without it the objects still in the selection simply vanish: a reader sees three
+# service directories where the listing beside them names nine, with nothing
+# saying which bound removed the other six -- or, worse, sees the cap's note and
+# reads every omission as the cap when the clock is what stopped the walk.
+cozyreport_objects_budget_note() {
+  printf '%s\n' "[cozyreport] $1: the ${COZYREPORT_OBJECTS_BUDGET_DEFAULT}s object budget elapsed before the walk finished; the objects not collected here are listed in the section's own .txt above and were not read individually" \
+    >> "$REPORT_DIR/kubernetes/COLLECTION-TRUNCATED.txt" || true
+}
+
+# cozyreport_collect_talos_node <talosconfig> <node> <output-dir>
+#
+# The e2e talosconfig intentionally carries no endpoints, so both -e and -n are
+# required. Each node's InternalIP is itself a Talos API endpoint. `dmesg
+# --tail` is a boolean follow-mode flag (unlike `logs --tail`, which is an
+# integer), so request the complete kernel ring buffer and retain bounded tails
+# only for kubelet/containerd service logs.
+cozyreport_collect_talos_node() {
+  _crt_config=$1
+  _crt_node=$2
+  _crt_dir=$3
+
+  # Bounded like every other read here, and for a sharper reason: these do not
+  # go to the apiserver at all. A node whose Talos API is up but wedged, or one
+  # answering slowly enough that three reads each outlast the step, is the same
+  # lost tarball with none of the kubectl-side bounds in the path.
+  cozyreport_read_object "$_crt_dir/talos-$_crt_node-dmesg.txt" \
+    talosctl --talosconfig "$_crt_config" -e "$_crt_node" -n "$_crt_node" dmesg
+  cozyreport_read_object "$_crt_dir/talos-$_crt_node-kubelet.log" \
+    talosctl --talosconfig "$_crt_config" -e "$_crt_node" -n "$_crt_node" \
+    logs kubelet --tail=500
+  cozyreport_read_object "$_crt_dir/talos-$_crt_node-containerd.log" \
+    talosctl --talosconfig "$_crt_config" -e "$_crt_node" -n "$_crt_node" \
+    logs containerd --tail=500
+}
+
+# cozyreport_pods_not_ready: stdin = `kubectl get pod -A --no-headers` rows
+# (NAMESPACE NAME READY STATUS RESTARTS AGE), stdout = the subset worth collecting.
+#
+# Compares the two halves of the READY column rather than filtering on STATUS: a
+# pod whose container runs while its readiness probe never passes reports
+# STATUS=Running READY=0/1, and a STATUS-only filter drops exactly that. Terminal
+# phases are excluded first, since Succeeded/Completed legitimately end at 0/1.
+#
+# READY counts ready CONTAINERS, which is not the pod's Ready condition: a pod
+# held back by an unsatisfied `spec.readinessGates` prints 1/1 while its Ready
+# condition is False, and this drops it. Reading the condition instead means a
+# structured read per pod where this is one cluster-wide list, on the report of a
+# cluster that is already failing -- so the column stays, and the gap is pinned by
+# a test rather than left for a reader to discover from an empty directory.
+cozyreport_pods_not_ready() {
+  awk '
+    !NF                            { next }
+    $4 ~ /^(Succeeded|Completed)$/ { next }
+    $4 != "Running"                { print; next }
+    { if (split($3, ready, "/") == 2 && ready[1] != ready[2]) print }
+  '
+}
+
+# cozyreport_kubevirt_not_ready: stdin = `kubectl get vm -A --no-headers` or
+# `kubectl get vmi -A --no-headers` rows, stdout = the ones worth collecting.
+#
+# READY is the LAST column in both layouts, and its INDEX differs between the two
+# kinds, so it is read as $NF rather than by number:
+#   vmi   NAMESPACE NAME AGE PHASE IP NODENAME READY
+#   vm    NAMESPACE NAME AGE STATUS READY
+# One helper serves both, and $NF is what lets it, without either index appearing
+# anywhere.
+#
+# Anything whose last field is not literally "True" is selected, so a missing
+# READY column over-collects rather than skipping. `NF` drops the blank line an
+# empty selection arrives as.
+cozyreport_kubevirt_not_ready() {
+  awk 'NF && $NF != "True"'
+}
+
+# cozyreport_svc_pending: stdin = `kubectl get svc -A --no-headers` rows, stdout =
+# the LoadBalancers still waiting for an address.
+#
+#   NAMESPACE NAME TYPE CLUSTER-IP EXTERNAL-IP PORT(S) AGE
+#
+# EXTERNAL-IP is $5, and it is the only column that ever prints `<pending>`. The
+# selection read $4 -- CLUSTER-IP, which holds an address, `None`, or `<none>` and
+# never `<pending>` -- so it matched nothing on any cluster and the section has
+# been empty since it was written, which reads as "no LoadBalancer is stuck". Not
+# $NF and not an unanchored match: unlike the vm/vmi layouts this one has a fixed
+# column count, and a service NAMED `<pending>` is not a row about a pending
+# address.
+cozyreport_svc_pending() {
+  awk 'NF && $5 == "<pending>"'
+}
+
+# cozyreport_pods_prioritize: stdin = selected rows, stdout = the same rows with
+# the COZY_REPORT_PREFER_NS namespaces first, each group keeping its input order.
+# `kubectl get pod -A` emits namespace-alphabetical rows, so without this the cap
+# is spent on cozy-* before the tenant pod the run died on. Empty prefix is a
+# passthrough.
+#
+# awk with index() rather than grep: the prefix is user-supplied and would
+# otherwise be a basic regular expression. Field-scoped, not line-anchored.
+#
+# Narrowed, not closed: `awk -v` expands backslash escapes in the value it assigns,
+# so a prefix containing `\t` arrives as a real tab. COZY_REPORT_PREFER_NS holds a
+# namespace prefix and namespaces are DNS labels, so it cannot bite -- said here
+# because the sentence above otherwise reads as a guarantee. Same note sits on the
+# sibling helper in hack/e2e-capture-previous-logs.sh.
+cozyreport_pods_prioritize() {
+  _cpp_ns=${COZY_REPORT_PREFER_NS-tenant-}
+  # Explicit rather than relying on the awk below to fall through, which it does
+  # only because `index(s, "")` returns 0 rather than 1. That is the behaviour of
+  # every awk this runs on today and it is not something the documented disable
+  # switch should rest on. Deleting this branch does not change any test, which is
+  # the point: the contract is the passthrough, not the arithmetic underneath it.
+  _cpp_rows=$(cat)
+  # The disable switch turns off the NAMESPACE preference only. The evidence-class
+  # ordering below is not a preference and is not optional: it is what keeps the
+  # count cap from dropping a pod that the previous, uncapped collector always
+  # kept. Letting `COZY_REPORT_PREFER_NS=` collapse both would mean one documented
+  # env value silently removes a guarantee about which evidence reaches the
+  # tarball, which is not what "disables the ordering" leads anyone to expect.
+  if [ -z "$_cpp_ns" ]; then
+    printf '%s\n' "$_cpp_rows" | awk 'NF && $4 != "Running"' || true
+    printf '%s\n' "$_cpp_rows" | awk 'NF && $4 == "Running"' || true
+    return 0
+  fi
+  # Emit four times: stdin is consumable only once and every pass needs the same
+  # rows, which is why they are buffered above.
+  #
+  # FOUR groups, and the outer split is by EVIDENCE CLASS rather than by namespace.
+  # Two selections exist here. The narrow one -- not `Running` at all: crash loops,
+  # `Pending`, `Error` -- is collected unconditionally by design. The wide one adds
+  # pods that are `Running` with an unready container, which a readiness probe that
+  # never passes produces and which are easy to have many of. Since the walk is
+  # capped by count, ordering the narrow class ahead of the wide one is what stops a
+  # cluster full of unready tenant pods from filling the cap and leaving a crash
+  # loop in a platform namespace with no describe and no container logs.
+  #
+  # Ranking by namespace first and evidence class second does NOT achieve that:
+  # a cap's worth of Running-unready pods inside the preferred namespace still
+  # pushes every crash loop outside it past the cap.
+  #
+  # What this guarantees, stated exactly: the WIDE class can never displace the
+  # narrow one. It does not promise the narrow class always fits -- more crash
+  # loops than COZY_REPORT_PODS_MAX still lose the excess, and that is the declared
+  # cap doing its job, named in COLLECTION-TRUNCATED.txt.
+  #
+  # The cost is that COZY_REPORT_PREFER_NS orders WITHIN each class instead of
+  # across the whole selection, so a platform crash loop precedes a tenant pod that
+  # is merely unready. That is the right way round: the namespace preference is a
+  # heuristic about where the interesting pod usually lives, while collecting the
+  # pod that is crashing is the thing this section exists to do.
+  #
+  # Terminal phases never reach here -- cozyreport_pods_not_ready drops
+  # Succeeded/Completed -- so `$4 != "Running"` IS the narrow class, exactly.
+  printf '%s\n' "$_cpp_rows" | awk -v p="$_cpp_ns" 'NF && $4 != "Running" && index($1, p) == 1' || true
+  printf '%s\n' "$_cpp_rows" | awk -v p="$_cpp_ns" 'NF && $4 != "Running" && index($1, p) != 1' || true
+  printf '%s\n' "$_cpp_rows" | awk -v p="$_cpp_ns" 'NF && $4 == "Running" && index($1, p) == 1' || true
+  printf '%s\n' "$_cpp_rows" | awk -v p="$_cpp_ns" 'NF && $4 == "Running" && index($1, p) != 1' || true
+}
+
+# cozyreport_timed_out <exit-status>: true when that status means "our own read
+# timeout fired", false otherwise.
+#
+# Two statuses, not one. `timeout` reports 124 when the command is still running
+# when the clock runs out, but with `-k` a command that ignores SIGTERM is killed
+# afterwards and the status becomes 137. Checking only 124 puts the more stubborn
+# of the two cases -- the one that had to be killed -- into the branch that
+# describes a clean exit, so a partial log would pass as whole and an empty one
+# would be blamed on the container.
+cozyreport_timed_out() {
+  case "$1" in
+    124 | 137) return 0 ;;
+    *) return 1 ;;
+  esac
+}
+
+# cozyreport_append_note <file> <text>
+#
+# Append a `[cozyreport]` line, starting a new line first when the file does not
+# already end in one. A read killed mid-stream leaves a partial final line, so
+# appending blind would corrupt the decisive last line and hide the marker from a
+# start-of-line grep.
+cozyreport_append_note() {
+  _can_file=$1
+  _can_text=$2
+  if [ -s "$_can_file" ] && [ -n "$(tail -c 1 "$_can_file" 2>/dev/null)" ]; then
+    printf '\n' >> "$_can_file" || true
+  fi
+  printf '%s\n' "$_can_text" >> "$_can_file" || true
+}
+
+# cozyreport_read_object <output-file> <kubectl-args...>
+#
+# One bounded read of a whole object, with a marker appended when the read was cut
+# off rather than finished. kubectl's refusal is the finding and belongs next to
+# the evidence it replaces -- but only when it IS the evidence: `pod.yaml`,
+# `vm.yaml` and `vmi.yaml` each hold one YAML document and nothing else, and a
+# `Warning:` line on a read that otherwise succeeded turns a whole object into a
+# file no parser will load. So stderr
+# goes to a scratch file and is copied in only when kubectl wrote no object,
+# which is the same rule cozyreport_read_container_log and summary_read follow.
+#
+# For the same reason the markers below are `#`-prefixed, unlike the ones in the
+# log files: a bare marker line after a mapping is a second top-level node, so
+# appending it to an object that kubectl finished writing before failing turns a
+# parseable file into an unparseable one -- the exact defect diverting stderr was
+# meant to remove, reintroduced by the fix for it. As a YAML comment the marker is
+# still there for a person and invisible to the parser. describe.txt is not YAML
+# and gets the same prefix, because one reader, one rule.
+#
+# One exception, and it is the format's rather than the reader's. This function
+# now also writes the controller LOGS, which it never did before, and a log is
+# neither YAML nor prose: the platform's controllers log JSON per line, `#` is not
+# a comment in that, and "the object ended" is not a sentence about a log. So the
+# marker for a `.log` target drops the prefix and speaks about output rather than
+# about an object -- which is exactly the marker cozyreport_read_container_log
+# already writes into a partial log. That reader appends into the log too, so the
+# note stays IN the file rather than moving beside it: two readers in one tarball
+# answering "where does a truncation marker for a log go" two different ways is
+# worse than either answer.
+cozyreport_read_object() {
+  _cro_file=$1
+  shift
+  # Chosen from the target, once, so the branches below cannot disagree.
+  #
+  # _cro_prose says whether kubectl's own line may be written INTO this file. Only
+  # YAML says no, and for the reason the block above gives: a bare `Warning:` or
+  # `No resources found` line is a second top-level node and costs a parser the
+  # whole document. Everything else here is read by a person.
+  #
+  # It matters because `kubectl get` writes `No resources found` to STDERR and
+  # exits 0 (kubernetes/kubectl#1667): sent beside the file, an empty listing is
+  # zero bytes and a READ-WARNINGS.txt lands on every healthy run.
+  case "$_cro_file" in
+    *.yaml) _cro_mark="# " ; _cro_ends="the object ended" ; _cro_prose=0 ;;
+    *.log)  _cro_mark=""   ; _cro_ends="the output ended" ; _cro_prose=1 ;;
+    *)      _cro_mark="# " ; _cro_ends="the object ended" ; _cro_prose=1 ;;
+  esac
+  # And the TOOL, from the argv rather than from what this reader used to serve.
+  # It read only kubectl once; it now also runs talosctl and the four host
+  # commands, and a marker saying "kubectl exited 1" on a `df` that hit a stale
+  # mount is a false statement in an artifact whose whole premise is that its
+  # notes can be believed. Same for the noun: `df.txt` did not stop because an
+  # object ended.
+  _cro_tool=$(basename "$1" 2>/dev/null) || _cro_tool=$1
+  case "$_cro_file" in
+    *.yaml) ;;
+    *) [ "$_cro_tool" = "kubectl" ] || _cro_ends="the output ended" ;;
+  esac
+  _cro_err=$(mktemp "${TMPDIR:-/tmp}/cozyreport-obj.XXXXXX" 2>/dev/null) || _cro_err=""
+  # Status taken in an explicit `else`, not after the `if`: a compound `if` whose
+  # condition fails and which has no else leaves `$?` at 0. `|| true` on the read
+  # itself would discard it entirely, which is what it used to do.
+  # shellcheck disable=SC2086  # empty COZYREPORT_BOUND must vanish, not become ""
+  if $COZYREPORT_BOUND "$@" > "$_cro_file" 2>"${_cro_err:-/dev/null}"; then
+    _cro_rc=0
+  else
+    _cro_rc=$?
+  fi
+  # Recorded before anything else is written into the file, for the same reason
+  # the log reader does it: the refusal is copied into that same file below, after
+  # which `[ -s ]` answers "did kubectl say anything at all" while still reading
+  # as "did kubectl return an object".
+  _cro_had_stdout=0
+  [ -s "$_cro_file" ] && _cro_had_stdout=1
+  _cro_reason=""
+  if [ -n "$_cro_err" ] && [ -s "$_cro_err" ]; then
+    _cro_reason=$(tail -n 1 "$_cro_err" | cut -c1-200)
+    if [ "$_cro_had_stdout" -eq 1 ]; then
+      # kubectl wrote the object AND said something -- a deprecation notice, a
+      # partial-result warning. Keeping it out of the file is the point of this
+      # function; dropping it from the report is not. `2>&1` would put it in the
+      # object, which costs the parser; leaving it nowhere costs the evidence, and
+      # this file's whole claim is that nothing is lost in silence.
+      #
+      # Copied WHOLE, not reduced to its last line. `tail -n 1` is right where a
+      # failing read buries its cause under klog retry preambles and one line has
+      # to be chosen; a successful read has no preamble, so every line is a
+      # warning in its own right and picking one drops the others. Two warnings
+      # on one read is the ordinary case, not the exotic one.
+      {
+        printf '%s\n' "[cozyreport] $(basename "$_cro_file"): $_cro_tool wrote this and also said:"
+        cat "$_cro_err"
+      } >> "$(dirname "$_cro_file")/READ-WARNINGS.txt" || true
+    elif [ "$_cro_rc" -ne 0 ]; then
+      cat "$_cro_err" > "$_cro_file" 2>/dev/null || true
+    elif [ "$_cro_prose" -eq 0 ]; then
+      # Exited 0, wrote no object, and still said something, into a file a parser
+      # reads. Copying it in would put an unprefixed kubectl line where an object
+      # belongs -- a `Warning:` no parser can take and no marker explains, since
+      # the emptiness check below sees a non-empty file and stays quiet. Beside it,
+      # like every other warning on a successful read.
+      {
+        printf '%s\n' "[cozyreport] $(basename "$_cro_file"): $_cro_tool returned no object, exited 0, and said:"
+        cat "$_cro_err"
+      } >> "$(dirname "$_cro_file")/READ-WARNINGS.txt" || true
+    else
+      # The same case into a file a person reads, and here the message IS the
+      # file. `No resources found` is what an empty listing has to say for itself;
+      # sent beside it, the listing is zero bytes and says nothing at all -- and
+      # that is the ordinary outcome on any install without an ACME issuer, so the
+      # warnings file would then arrive on every healthy run. Prefixed, because
+      # this is the script speaking about the read and not kubectl's own output.
+      {
+        printf '%s' "${_cro_mark}[cozyreport] $_cro_tool returned no rows and exited 0, saying: "
+        cat "$_cro_err"
+      } > "$_cro_file" || true
+    fi
+  fi
+  [ -z "$_cro_err" ] || rm -f "$_cro_err"
+
+  if cozyreport_timed_out "$_cro_rc"; then
+    cozyreport_append_note "$_cro_file" \
+      "${_cro_mark}[cozyreport] TRUNCATED: this file ends here because the read was cut off by $(cozyreport_cutoff_desc "$_cro_rc"), not because $_cro_ends -- anything absent below may exist on the cluster and simply was not read"
+  elif [ "$_cro_rc" -ne 0 ] && [ "$_cro_had_stdout" -eq 1 ]; then
+    # Failed part way through. Without this the file is a valid-looking prefix of
+    # an object and nothing says the rest was never read -- the ambiguity the
+    # TRUNCATED marker exists to remove, arrived at by kubectl's own exit rather
+    # than by our timeout. The reason is not left in the file body, because the
+    # body is what yq parses.
+    cozyreport_append_note "$_cro_file" \
+      "${_cro_mark}[cozyreport] TRUNCATED: this file ends here because $_cro_tool exited $_cro_rc part way through, not because $_cro_ends${_cro_reason:+: $_cro_reason}"
+  elif [ "$_cro_rc" -ne 0 ] && [ ! -s "$_cro_file" ]; then
+    # Failed with neither an object nor a message. Two ways to get here: a signal
+    # that is not 124 or 137 -- SIGTERM from a teardown, say -- and a `mktemp`
+    # that failed, which sent stderr to /dev/null. Without this branch the file is
+    # zero bytes and says nothing, in a directory whose emptiness the doc reads as
+    # a statement about the pod. Every other classification site in these scripts
+    # has this branch; this was the one that did not.
+    if [ -z "$_cro_err" ]; then
+      cozyreport_append_note "$_cro_file" \
+        "${_cro_mark}[cozyreport] $_cro_tool exited $_cro_rc and this file is empty; its message could not be captured (no writable temp dir on the machine producing this report), so whether it said anything is unknown"
+    else
+      cozyreport_append_note "$_cro_file" \
+        "${_cro_mark}[cozyreport] $_cro_tool exited $_cro_rc without a message and wrote nothing"
+    fi
+  fi
+  return 0
+}
+
+# cozyreport_read_exec <output-file> <kubectl-exec-args...>
+#
+# One bounded read whose command runs INSIDE a pod. Everything above reads the
+# apiserver; these read a workload, so their duration is set by whatever is
+# happening in the container rather than by how fast the apiserver answers, and a
+# wedged pod holds the stream open with nothing on either end to close it.
+#
+# Kept apart from cozyreport_read_object for one reason, and it is the reason the
+# comment on cozyreport_cutoff_desc already gives: `kubectl exec` passes the
+# REMOTE command's exit status through. A 124 here is either this script's
+# deadline expiring or a command that itself exited 124, and the status does not
+# tell them apart -- so describing it as "its own 30s timeout", which is what
+# that helper does and is correct for every `get`, `logs` and `describe`, would
+# state a mechanism about the machine writing the report for something that may
+# have happened inside a pod. This path states the ambiguity instead of resolving
+# it, and never reaches that helper; a test holds both halves.
+#
+# The note goes BESIDE the output, and kubectl's own message goes with it. A
+# table also gets a one-line marker inside; an archive never does, because two of
+# the calls here stream a gzipped tarball, and a line of prose appended to one is
+# an archive no reader can open.
+#
+# A cut-off bundle is EITHER kept and truncated (the call site's check asks for a
+# first member, which a truncated gzip still lists) OR removed as zero bytes when
+# the stream never started. This path runs before that check, so it names both.
+#
+# The TEXT reads keep the remote command's message in the .txt itself, whole.
+# `tail -n 1` is right where a failing read buries its cause under klog preambles;
+# on an exec it is backwards, because `kubectl exec` appends `command terminated
+# with exit code N` last.
+cozyreport_read_exec() {
+  _cre_file=$1
+  shift
+  # Before the redirect below, not after it. The same guard the selector and the
+  # probe carry, and it protects the OUTPUT as well as the note -- placed under the
+  # read it is meant to precede, it could not fire for either. The per-satellite
+  # ZFS listings rely on it for linstor/zfs/.
+  mkdir -p "$(dirname "$_cre_file")" 2>/dev/null || true
+  _cre_err=$(mktemp "${TMPDIR:-/tmp}/cozyreport-exec.XXXXXX" 2>/dev/null) || _cre_err=""
+  # Status taken in an explicit `else`, for the reason the readers above spell
+  # out: a compound `if` whose condition fails and which has no else leaves `$?`
+  # at 0, so reading it after `fi` reports a clean exit for every failure.
+  # shellcheck disable=SC2086  # empty COZYREPORT_BOUND must vanish, not become ""
+  if $COZYREPORT_BOUND "$@" > "$_cre_file" 2>"${_cre_err:-/dev/null}"; then
+    _cre_rc=0
+  else
+    _cre_rc=$?
+  fi
+  _cre_said=0
+  [ -n "$_cre_err" ] && [ -s "$_cre_err" ] && _cre_said=1
+  _cre_had_stdout=0
+  [ -s "$_cre_file" ] && _cre_had_stdout=1
+  # Whether this output can carry the message at all. Only the two archive
+  # streams cannot; the rest are tables a person reads, and a zero-byte one is
+  # the "did it return nothing, or never run" question this collector exists to
+  # answer.
+  case "$_cre_file" in
+    *.tgz) _cre_prose=0 ;;
+    *)     _cre_prose=1 ;;
+  esac
+  if [ "$_cre_prose" -eq 1 ] && [ "$_cre_had_stdout" -eq 0 ] && [ "$_cre_rc" -ne 0 ]; then
+    # A table that got nothing must not ship as zero bytes: `linstor/nodes.txt` at
+    # zero length reads as a cluster with no nodes, which is the one reading this
+    # collector exists to prevent. Three ways to get here and each says which.
+    if [ "$_cre_said" -eq 1 ]; then
+      # The refusal IS the finding, and it belongs where the table would have been.
+      cat "$_cre_err" > "$_cre_file" 2>/dev/null || true
+    elif cozyreport_timed_out "$_cre_rc"; then
+      # The wedged pod of the ticket: killed before the command wrote a byte, so
+      # there is no stderr either. Without this the sharpest failure this reader
+      # was written for is the one that leaves nothing behind.
+      printf '%s\n' "# [cozyreport] the read was killed at exit $_cre_rc before the command inside the pod wrote anything, so this file is empty for that reason and not because the command had nothing to say; COLLECTION-FAILED.txt beside it says what that status does and does not establish" \
+        > "$_cre_file" || true
+    elif [ -z "$_cre_err" ]; then
+      # No writable temp dir, so stderr went to /dev/null. "Said nothing" and "we
+      # could not hear it" are different facts and only the first is about the
+      # cluster -- the same branch the other four readers here carry.
+      printf '%s\n' "# [cozyreport] the read exited $_cre_rc and this file is empty; its message could not be captured (no writable temp dir on the machine producing this report), so whether it said anything is unknown" \
+        > "$_cre_file" || true
+    else
+      printf '%s\n' "# [cozyreport] the read exited $_cre_rc without a message and wrote nothing" \
+        > "$_cre_file" || true
+    fi
+  fi
+  # printf, not echo: the remote command's text is untrusted and dash's echo
+  # expands backslash escapes, so a message carrying one could forge a line in a
+  # file a triager reads as fact.
+  if cozyreport_timed_out "$_cre_rc"; then
+    # The tables get the marker IN the file as well, like every other .txt in
+    # the tarball. A `nodes.txt` cut at the ceiling is a short node list that reads
+    # as a small cluster, and "the note is one directory up" is exactly the walk a
+    # triager does not make. Only the two archives cannot take it -- a line of
+    # prose inside a gzip stream is not a file anyone can open -- which is what
+    # _cre_prose already decides for the two branches above.
+    if [ "$_cre_prose" -eq 1 ] && [ "$_cre_had_stdout" -eq 1 ]; then
+      cozyreport_append_note "$_cre_file" \
+        "# [cozyreport] TRUNCATED: this output ends here because the read was killed at exit $_cre_rc, not because the command finished -- see COLLECTION-FAILED.txt beside this file for what that status does and does not establish"
+    fi
+    {
+      printf '%s\n' "[cozyreport] $(basename "$_cre_file"): this read runs a command inside a pod and ended at exit $_cre_rc, so whatever it produced stops where the stream stopped and not where the command's output did. What $_cre_rc means here is genuinely open: kubectl exec passes the remote command's own status through, so it is either the ${COZYREPORT_READ_TIMEOUT}s bound on this read firing or the command itself exiting $_cre_rc, and nothing in the status separates the two."
+      # Only for the two reads whose output is an archive. Printing it beside a
+      # cut-off .txt would describe a mechanism that read never went through,
+      # which is the same fault as naming a timeout that did not fire.
+      if [ "$_cre_prose" -eq 0 ]; then
+        printf '%s\n' "The file this note names is EITHER beside it and truncated -- it lists and extracts the members that crossed before the cut -- OR gone, because a read killed before the remote command wrote its first byte leaves zero bytes and the emptiness check at the call site removes it. This note cannot tell you which; the directory can."
+      fi
+      if [ "$_cre_said" -eq 1 ]; then
+        printf '%s\n' "It also said:"
+        cat "$_cre_err"
+      fi
+    } >> "$(dirname "$_cre_file")/COLLECTION-FAILED.txt" || true
+  elif [ "$_cre_rc" -ne 0 ]; then
+    # `# ` like every other in-file marker on a .txt: the object reader has given
+    # this prefix to every non-YAML target since before this reader existed, and
+    # two readers marking the same file type two ways means a triager grepping
+    # `^# [cozyreport]` across the tarball gets half of it and cannot tell.
+    # Output followed by a failure off the clock gets an in-file marker too: a
+    # `linstor n l` that streams three rows and exits 1 is a three-node listing to
+    # anyone who opens it. It does not say TRUNCATED, which the object reader can:
+    # kubectl exec passes the remote status through, and a command that lists
+    # what it can and exits 1 for what it could not -- `zfs list` over one pool it
+    # cannot open -- wrote a complete listing.
+    if [ "$_cre_prose" -eq 1 ] && [ "$_cre_had_stdout" -eq 1 ]; then
+      cozyreport_append_note "$_cre_file" \
+        "# [cozyreport] EXIT $_cre_rc after this output: the status does not say whether the command finished with an error or was cut short -- see COLLECTION-FAILED.txt beside this file"
+    fi
+    {
+      printf '%s\n' "[cozyreport] $(basename "$_cre_file"): the read exited $_cre_rc; the status does not say whether the command finished with an error or its output was cut short."
+      if [ "$_cre_said" -eq 1 ]; then
+        # WHOLE, not the last line. `kubectl exec` appends `command terminated
+        # with exit code N` after whatever the remote command said, so the last
+        # line here is the one line that never carries the cause.
+        printf '%s\n' "It said:"
+        cat "$_cre_err"
+      fi
+    } >> "$(dirname "$_cre_file")/COLLECTION-FAILED.txt" || true
+  elif [ "$_cre_said" -eq 1 ]; then
+    # Succeeded and still wrote to stderr. Beside the output rather than merged
+    # into it, the same rule the object reader follows: one of these outputs is a
+    # tarball and the others are tables a person reads, and a stray line is noise
+    # in the first case and a corrupt file in the second.
+    {
+      printf '%s\n' "[cozyreport] $(basename "$_cre_file"): the read succeeded and also said:"
+      cat "$_cre_err"
+    } >> "$(dirname "$_cre_file")/READ-WARNINGS.txt" || true
+  fi
+  [ -z "$_cre_err" ] || rm -f "$_cre_err"
+  return 0
+}
+
+# cozyreport_read_container_log <output-file> <instance> <ns> <pod> <container> [args...]
+#
+# One bounded container log read. Three outcomes, distinguished because they mean
+# different things: our timeout fired, kubectl failed part way through on its own
+# terms, or the read completed. The exit status is kept rather than swallowed --
+# a killed read, a refusal, and a container that genuinely logged nothing all leave
+# a file that looks the same from outside, and only one is about the cluster.
+#
+# A partial read is kept and marked, never discarded.
+cozyreport_read_container_log() {
+  _crl_file=$1
+  _crl_instance=$2
+  _crl_ns=$3
+  _crl_pod=$4
+  _crl_c=$5
+  shift 5
+
+  _crl_tail=$(cozyreport_pod_tail)
+  # -k: plain `timeout` sends TERM and waits forever on a process that ignores it.
+  # `-c NAME` is the documented spelling; the bare second positional also works but
+  # is undocumented.
+  #
+  # stderr goes to a scratch file, not `2>&1`: merged, "wrote part of a log then
+  # failed" and "only refused" are byte-indistinguishable, and the three-way
+  # outcome below depends on telling them apart.
+  _crl_err=$(mktemp "${TMPDIR:-/tmp}/cozyreport-log.XXXXXX" 2>/dev/null) || _crl_err=""
+  # shellcheck disable=SC2086  # empty COZYREPORT_BOUND must vanish, not become ""
+  if $COZYREPORT_BOUND kubectl logs -n "$_crl_ns" "$_crl_pod" -c "$_crl_c" \
+      --tail="$_crl_tail" "$@" > "$_crl_file" 2>"${_crl_err:-/dev/null}"; then
+    _crl_rc=0
+  else
+    _crl_rc=$?
+  fi
+  # Whether kubectl produced any LOG is recorded here, before anything is written
+  # into the file, and every later branch keys off this flag rather than off the
+  # file's size. Asking `[ -s "$_crl_file" ]` afterwards answers a different
+  # question than it appears to: the refusal is copied into that same file below,
+  # so the check silently becomes "did kubectl say anything at all" and every
+  # refusal is then classified as a partial log. That is not hypothetical -- it
+  # made the commonest file in the tree, the `--previous` read of a container that
+  # never restarted, carry a fabricated "cut off part way through" line.
+  _crl_had_stdout=0
+  [ -s "$_crl_file" ] && _crl_had_stdout=1
+  # The refusal belongs in the log file, as before: it is the finding when there is
+  # no log, and it is the reason when the log stops early.
+  _crl_reason=""
+  # Recorded before the scratch file is removed below: the classification branches
+  # still need to know whether kubectl spoke, and by then there is nothing to ask.
+  # Testing `-s "$_crl_err"` after the `rm` silently answers "no" for every read.
+  _crl_said=""
+  if [ -n "$_crl_err" ] && [ -s "$_crl_err" ]; then _crl_said=1; fi
+  if [ -n "$_crl_err" ] && [ -s "$_crl_err" ]; then
+    _crl_reason=$(tail -n 1 "$_crl_err" | cut -c1-200)
+    if [ "$_crl_had_stdout" -eq 0 ] && [ "$_crl_rc" -ne 0 ]; then
+      # A REFUSAL with no log: the message IS the finding, so it goes in the file.
+      # Gated on the status as well as on the emptiness, because a read that exited
+      # 0 with no output and a warning is not a refusal -- copying that in writes an
+      # unprefixed kubectl line into a file read as container output, and the
+      # placeholder below is then suppressed by its own `[ ! -s ]` guard, so nothing
+      # says where the line came from.
+      cat "$_crl_err" > "$_crl_file" 2>/dev/null || true
+    else
+      # kubectl wrote log lines AND said something. It does not belong in the log,
+      # which is machine-read, but it does belong in the report: dropping it is a
+      # silent loss in a tree whose claim is that there are none. Copied whole for
+      # the same reason as the object reader above: nothing here needs picking one
+      # line out of a preamble, so picking one only loses the rest.
+      #
+      # Whatever the exit status, not only on a clean one. A PARTIAL read is where
+      # kubectl has the most to say -- the reset, the refusal that stopped it mid
+      # stream -- and gating this on `rc == 0` kept only `tail -n 1` of it in the
+      # marker line and dropped every other line on the floor. That is the one case
+      # this file is written against, losing evidence exactly where there is most
+      # of it, and it is what the sibling capture in e2e-capture-previous-logs.sh
+      # already does correctly: it copies stderr whole regardless of how the read
+      # ended. Two collectors in one tarball answering the same question two ways
+      # is worse than either answer.
+      # THREE cases, not two. A clean read that returned nothing is not "returned
+      # this log": the placeholder written into the log file for that same read says
+      # kubectl wrote no output, and the two files would then contradict each other
+      # about one read -- with this one read first, because it is the one that names
+      # the file. Both siblings already spell the third case out.
+      {
+        if cozyreport_timed_out "$_crl_rc"; then
+          # The cutoff, not the raw status. The TRUNCATED marker inside the log
+          # names this read's own timeout; rendering the same read as "kubectl
+          # exited 124" here would have the two files disagree about what happened,
+          # and 124 is this script's clock rather than anything kubectl decided.
+          printf '%s\n' "[cozyreport] $(basename "$_crl_file"): the read was cut off by $(cozyreport_cutoff_desc "$_crl_rc") part way through this log, and kubectl also said:"
+        elif [ "$_crl_rc" -ne 0 ]; then
+          printf '%s\n' "[cozyreport] $(basename "$_crl_file"): kubectl exited $_crl_rc part way through this log and said:"
+        elif [ "$_crl_had_stdout" -eq 0 ]; then
+          printf '%s\n' "[cozyreport] $(basename "$_crl_file"): kubectl returned no log, exited 0, and said:"
+        else
+          printf '%s\n' "[cozyreport] $(basename "$_crl_file"): kubectl returned this log and also said:"
+        fi
+        cat "$_crl_err"
+      } >> "$(dirname "$_crl_file")/READ-WARNINGS.txt" || true
+    fi
+  fi
+  [ -z "$_crl_err" ] || rm -f "$_crl_err"
+
+  # printf, not echo: kubectl's message is untrusted text and dash's echo expands
+  # backslash escapes, so a message carrying one could forge a line in a file whose
+  # whole job is to be believed.
+  #
+  # Keyed on the flag, not on the file: by this point the file may hold kubectl's
+  # refusal, copied in above, and testing its size here would answer "did kubectl
+  # say anything" while reading as "was there a log".
+  if [ "$_crl_had_stdout" -eq 0 ]; then
+    if cozyreport_timed_out "$_crl_rc"; then
+      cozyreport_append_note "$_crl_file" \
+        "[cozyreport] the read of the $_crl_instance instance of $_crl_c was cut off by $(cozyreport_cutoff_desc "$_crl_rc") before kubectl wrote anything: this says the apiserver did not answer in time, and says nothing about whether the container logged"
+    elif [ "$_crl_rc" -ne 0 ]; then
+      # Only when stderr was empty too. When it was not, the refusal is already in
+      # the file and IS the finding; overwriting it with "without a message" would
+      # destroy the one thing worth reading.
+      #
+      # "Said nothing" and "we could not capture what it said" are different facts,
+      # and only the first is about the cluster. With no writable temp dir the
+      # stderr file was never created, so claiming silence turns a local filesystem
+      # condition into a statement about kubectl.
+      #
+      # cozyreport-summary.sh avoids the false claim by printing no quote at all,
+      # which is weaker than this: it is silent about which of the two happened.
+      # Naming it is better where there is a file to name it in, and that is the
+      # difference between the two scripts rather than a rule one of them already
+      # follows.
+      if [ ! -s "$_crl_file" ]; then
+        if [ -z "$_crl_err" ]; then
+          printf '%s\n' "kubectl exited $_crl_rc for the $_crl_instance instance of $_crl_c; its message could not be captured (no writable temp dir on the machine producing this report), so whether it said anything is unknown" \
+            > "$_crl_file" || true
+        else
+          printf '%s\n' "kubectl exited $_crl_rc without a message for the $_crl_instance instance of $_crl_c" \
+            > "$_crl_file" || true
+        fi
+      fi
+    else
+      # A clean exit with no bytes is genuinely ambiguous, and the two readings
+      # differ per instance: a current instance that never started leaves this,
+      # and so does one that started and stayed quiet; for a previous instance the
+      # first reading is that there was never a previous one at all.
+      case "$_crl_instance" in
+        previous) _crl_why="it never restarted, or the previous instance logged nothing" ;;
+        *)        _crl_why="it never started, or it started and logged nothing" ;;
+      esac
+      if [ ! -s "$_crl_file" ]; then
+        # "without error" only when there was none. A clean exit that still wrote a
+        # deprecation or partial-result notice is a different fact, and the notice
+        # itself is beside the log in READ-WARNINGS.txt rather than in here.
+        if [ -n "$_crl_said" ]; then
+          printf '%s\n' "kubectl exited 0 and wrote no output for the $_crl_instance instance of $_crl_c: $_crl_why. It did write to stderr; that message is in READ-WARNINGS.txt beside this file" \
+            > "$_crl_file" || true
+        else
+          printf '%s\n' "kubectl exited without output or error for the $_crl_instance instance of $_crl_c: $_crl_why" \
+            > "$_crl_file" || true
+        fi
+      fi
+    fi
+    return 0
+  fi
+  if cozyreport_timed_out "$_crl_rc"; then
+    cozyreport_append_note "$_crl_file" \
+      "[cozyreport] TRUNCATED: this log ends here because the read was cut off by $(cozyreport_cutoff_desc "$_crl_rc"), not because the container stopped writing"
+  elif [ "$_crl_rc" -ne 0 ]; then
+    # kubectl wrote log lines and then failed on its own terms -- a connection
+    # reset to the kubelet mid-stream, not our clock. Reaching here at all means
+    # stdout was non-empty, so this is a partial log and not a bare refusal, and
+    # without a marker it reads as a complete one. The timeout is not named,
+    # because no timeout fired.
+    cozyreport_append_note "$_crl_file" \
+      "[cozyreport] TRUNCATED: this log ends here because kubectl exited $_crl_rc part way through, not because the container stopped writing${_crl_reason:+: $_crl_reason}"
+  fi
+
+  if [ "$_crl_tail" != "-1" ]; then
+    # Recorded whatever the read's outcome was, not only when it succeeded. A log
+    # that was cut short at its END still lost its OLDEST lines to `--tail`, and
+    # naming only the end leaves the reader believing the file starts where the
+    # container did. Two bounds applied; both have to be named, or the one that is
+    # named implies the other did not fire.
+    #
+    # The bound still has to be recorded -- `--tail` drops the OLDEST lines and
+    # nothing in the output says so, and for a pod that never came up the startup
+    # lines are the decisive part -- but it goes BESIDE the log, not into it.
+    #
+    # A log that was read successfully is a complete artifact of its own, and the
+    # platform's controllers log JSON per line, so a trailing prose line is the
+    # same defect this file avoids for pod.yaml one function up: a parser that can
+    # read the file without the line stops reading it with one. YAML could take a `#`;
+    # a log format cannot, so the note moves out instead.
+    #
+    # One file per pod directory rather than one per log: the bound is the same
+    # for every container of the pod, and a reader who opens the directory finds
+    # it once instead of at the foot of each file.
+    printf '%s\n' \
+      "[cozyreport] every log in this directory holds at most the last $_crl_tail lines; anything earlier was never requested. That is the bound that was APPLIED, which is not always the one COZY_REPORT_POD_TAIL was set to -- a value this script could not use is reported in the collection notes" \
+      > "$(dirname "$_crl_file")/CONTAINER-LOGS-BOUND.txt" || true
+  fi
+  return 0
+}
+
+# cozyreport_is_count <value>: true for a non-negative integer this shell can
+# actually compute with.
+#
+# All-digits is not the same test. `$(( now + 999999999999999999999999 ))` is a
+# fatal error in dash -- "Illegal number", and dash is /bin/sh on the CI image --
+# so an oversized budget would end the whole script at the deadline calculation,
+# before the tarball is written, which is the one outcome every bound in this file
+# exists to avoid. `[ n -gt 0 ]` and `head -n n` reject the same values on their
+# own terms. Nine digits is orders of magnitude above any real cap or budget, and
+# `date +%s` plus a value that size still fits the 64-bit arithmetic dash, bash and
+# busybox ash all use (it would not fit a 32-bit one, which is why the bound is on
+# the input rather than on the sum).
+cozyreport_is_count() {
+  case "$1" in
+    '' | *[!0-9]*) return 1 ;;
+    # A leading zero makes the value octal to `$(( ))` and decimal to `[`, so one
+    # string means two different numbers inside this one script. Both readings are
+    # wrong in their own way: COZY_REPORT_PODS_BUDGET=008 is not a valid octal
+    # literal at all and dash aborts the whole script with "Illegal number: 008" at
+    # the deadline calculation -- before the tarball is written, which is the single
+    # outcome every bound in this file exists to avoid -- while 010 is valid octal
+    # and silently means 8. The second is the worse of the two: an operator who
+    # writes 010 gets a bound of 8 and a truncation note quoting the bound that was
+    # applied, with nothing anywhere saying it was not the bound they asked for.
+    # Rejected here so both land in the malformed-value path, which falls back to
+    # the default and says so.
+    0?*) return 1 ;;
+  esac
+  [ "${#1}" -le 9 ]
+}
+
+# One predicate, consulted by both the value and the sentence about it. Two `case`
+# patterns written to mean the same thing do not: `00` and `01` are all-digits and
+# non-zero as strings, so a split validator applies them while reporting them
+# ignored (and `--tail=00` is `--tail=0`, which returns no lines and is then
+# described as a container that never logged). `10m` is the mirror image: a glob
+# like [1-9][0-9]* matches it, so the value quietly becomes the default while
+# nothing says so. Compare against the resolved value instead of re-parsing.
+cozyreport_pod_tail_ok() {
+  [ "$1" = "-1" ] && return 0
+  cozyreport_is_count "$1" || return 1
+  # In range here, so a leading zero and a plain zero are both caught by the
+  # numeric comparison rather than by another pattern that has to agree with this
+  # one. `--tail=0` asks kubectl for nothing at all.
+  [ "$1" -gt 0 ]
+}
+
+# cozyreport_pod_tail: the --tail value for the per-pod log reads.
+#
+# A line tail rather than --limit-bytes: for these pods the decisive lines are at
+# the END, and --limit-bytes cuts mid-line and mid-UTF-8. COZY_REPORT_POD_TAIL=-1
+# restores the whole log. A malformed value and 0 both fall back to the default
+# (--tail=0 returns nothing, which this script would then describe as a container
+# that never logged); cozyreport_pod_tail_note reports either case.
+cozyreport_pod_tail() {
+  _cpt=${COZY_REPORT_POD_TAIL:-2000}
+  cozyreport_pod_tail_ok "$_cpt" || _cpt=2000
+  printf '%s' "$_cpt"
+}
+
+# cozyreport_pod_tail_note: empty when the knob was usable, otherwise the sentence
+# the report should carry about it. Shares cozyreport_pod_tail_ok with the resolver
+# so the value and the claim about it cannot disagree.
+cozyreport_pod_tail_note() {
+  cozyreport_pod_tail_ok "${COZY_REPORT_POD_TAIL:-2000}" && return 0
+  printf '%s' "ignored a malformed COZY_REPORT_POD_TAIL='${COZY_REPORT_POD_TAIL:-}' and used 2000."
+}
+
+# cozyreport_collect_pod <namespace> <pod> <output-dir>
+#
+# Everything the report keeps about one broken pod. Every call is `|| true` and the
+# function always returns 0: collecting evidence about a broken pod fails routinely,
+# and none of it may abort the caller. Every read is bounded, `describe` included,
+# since the tarball is written at the very end of the run.
+cozyreport_collect_pod() {
+  _ccp_ns=$1
+  _ccp_pod=$2
+  _ccp_dir=$3
+
+  # Not probed for writability the way the previous-logs capture probes its own
+  # output directory, and the difference is where the path comes from. That one
+  # takes it from its caller, so it can be a file, or missing, or someone else's;
+  # this one lives under the `mktemp -d` the top of this script refuses to run
+  # without. Under a root that exists and is writable, this `mkdir` fails only
+  # when the filesystem does -- and that is the case where the note explaining it
+  # has nowhere to go either.
+  mkdir -p "$_ccp_dir" || true
+  cozyreport_read_object "$_ccp_dir/pod.yaml" \
+    kubectl get pod -n "$_ccp_ns" "$_ccp_pod" -o yaml
+  cozyreport_read_object "$_ccp_dir/describe.txt" \
+    kubectl describe pod -n "$_ccp_ns" "$_ccp_pod"
+
+  # kubectl's own reason for not answering is the finding, so keep its stderr
+  # instead of letting it escape to the console and reporting a bare "could not
+  # list containers" that names no cause. The scratch file is mktemp'd outside the
+  # report tree: a predictable name under /tmp is a symlink an unprivileged
+  # process can plant ahead of the redirect, and a run killed between writing and
+  # removing it inside the tree would ship a stray dotfile in the artifact.
+  _ccp_err=$(mktemp "${TMPDIR:-/tmp}/cozyreport-stderr.XXXXXX" 2>/dev/null) || _ccp_err=""
+  # shellcheck disable=SC2086
+  if _ccp_containers=$($COZYREPORT_BOUND kubectl get pod -n "$_ccp_ns" "$_ccp_pod" \
+      -o jsonpath='{.spec.containers[*].name} {.spec.initContainers[*].name}' \
+      2>"${_ccp_err:-/dev/null}"); then
+    _ccp_rc=0
+  else
+    _ccp_rc=$?
+  fi
+  # Blank, not empty. The template above holds two expressions with a literal
+  # space between them, and kubectl emits that space whatever the fields contain,
+  # so a read that names no container arrives as " " and not as "". Command
+  # substitution strips trailing NEWLINES, not spaces, so `[ -z ]` is false for it
+  # -- the read falls through to the `elif`, which reports "kubectl named 0
+  # container(s) and then exited", and on a clean exit falls past both, leaving a
+  # pod directory holding pod.yaml and describe.txt and no logs at all. That is
+  # exactly the "reads as containers that were silent" shape the rest of this file
+  # exists to remove, reintroduced by the one branch meant to catch it.
+  #
+  # `case`, not `tr -d '[:space:]'`: same answer without forking twice per pod, and
+  # the bracket-class form behaves identically under dash, bash and BSD sh.
+  case "$_ccp_containers" in
+    *[![:space:]]*) _ccp_named=1 ;;
+    *)              _ccp_named=0 ;;
+  esac
+  if [ "$_ccp_named" -eq 0 ]; then
+    # printf, not echo: kubectl's message is untrusted text, and under dash
+    # (/bin/sh on the CI image) echo expands backslash escapes, so a message
+    # carrying one could forge extra lines in a file whose whole job is to be
+    # believed.
+    #
+    # kubectl's stderr is copied whole rather than reduced to a chosen line. This
+    # is a file of its own, not a log line with neighbours to bury, so there is
+    # nothing to be gained by picking -- and picking is where it goes wrong: the
+    # cluster-wide read below prefixes its reason with one klog discovery-retry
+    # line per attempt, and the same pod read gets the same preamble whenever
+    # discovery is cold, which a multi-hour failed run will produce.
+    {
+      printf '%s\n' "no per-container logs were collected for $_ccp_ns/$_ccp_pod: its container list came back empty"
+      if [ -n "$_ccp_err" ] && [ -s "$_ccp_err" ]; then
+        printf '%s\n' "kubectl said:"
+        cat "$_ccp_err"
+      elif cozyreport_timed_out "$_ccp_rc"; then
+        printf '%s\n' "kubectl said nothing: the read was cut off by $(cozyreport_cutoff_desc "$_ccp_rc")"
+      elif [ -z "$_ccp_err" ]; then
+        printf '%s\n' "kubectl exited $_ccp_rc; its message could not be captured (no writable temp dir here), so whether it said anything is unknown"
+      else
+        printf '%s\n' "kubectl said nothing and exited $_ccp_rc"
+      fi
+    } > "$_ccp_dir/logs-UNAVAILABLE.txt" || true
+  elif [ "$_ccp_rc" -ne 0 ]; then
+    # Names arrived AND the read failed: the list is a prefix, not the pod's
+    # containers. Without this the pod directory holds logs for the containers
+    # kubectl managed to name and nothing at all for the rest -- no file, no
+    # marker, and a reader counts the log files and believes that is the pod.
+    # The empty-list branch above is not reached, because the list is not empty;
+    # it is just not all of it.
+    {
+      printf '%s\n' "the container list for $_ccp_ns/$_ccp_pod is INCOMPLETE: kubectl named $(printf '%s' "$_ccp_containers" | wc -w | tr -d ' ') container(s) and then exited $_ccp_rc, so containers it never named have no log file here and their absence says nothing about them"
+      if [ -n "$_ccp_err" ] && [ -s "$_ccp_err" ]; then
+        printf '%s\n' "kubectl said:"
+        cat "$_ccp_err"
+      fi
+    } > "$_ccp_dir/CONTAINER-LIST-INCOMPLETE.txt" || true
+  fi
+  [ -z "$_ccp_err" ] || rm -f "$_ccp_err"
+
+  # Every container is asked, including on a pod that never started one: kubectl's
+  # refusal is itself the finding. An empty result is ambiguous -- against an
+  # unscheduled pod kubectl can exit 0 having printed nothing -- so the placeholder
+  # reports what was observed and leaves the cause open.
+  for _ccp_c in $_ccp_containers; do
+    # COZYREPORT_COLLECT_DEADLINE, when the caller set one, bounds this loop as
+    # well as the walk above it. Without it a single pod's overshoot past the
+    # collection budget would grow with its container count -- 60s more per
+    # container against a degraded apiserver -- and a pod with a dozen of them
+    # would blow a ceiling stated in terms of one. Checked between containers,
+    # never inside one, so each log file present is a whole log file.
+    if [ -n "${COZYREPORT_COLLECT_DEADLINE:-}" ] &&
+       [ "$(date +%s)" -ge "$COZYREPORT_COLLECT_DEADLINE" ]; then
+      # Says which containers were ATTEMPTED, not which were read whole. The
+      # budget runs out because reads are slow, and the ordinary way for a read to
+      # be slow is to hit its own 30s ceiling -- so a log file in this directory
+      # carrying its own TRUNCATED marker is the likely case, not the exotic one,
+      # and "were read in full" would be false about the file lying next to this
+      # one. Same for pod.yaml and describe.txt: they are attempted before any
+      # container, but describe is the most expensive read here and can be cut off
+      # like anything else. Every bounded file states its own bound on its last
+      # line, so point there rather than making a claim this function cannot check.
+      printf '%s\n' \
+        "the collection budget elapsed part way through this pod: the containers with a log file here were attempted, and the ones with no log file were not" \
+        "whether each of those reads finished is stated on the last line of the file itself: a read cut short carries a [cozyreport] TRUNCATED line" \
+        "pod.yaml and describe.txt were attempted before any container log, and carry the same marker if they were cut short" \
+        > "$_ccp_dir/CONTAINER-LOGS-TRUNCATED.txt" || true
+      break
+    fi
+    cozyreport_read_container_log "$_ccp_dir/logs-$_ccp_c.txt" current \
+      "$_ccp_ns" "$_ccp_pod" "$_ccp_c"
+    cozyreport_read_container_log "$_ccp_dir/logs-$_ccp_c-previous.txt" previous \
+      "$_ccp_ns" "$_ccp_pod" "$_ccp_c" --previous
+  done
+  return 0
+}
+
+# cozyreport_collect_broken_pods <report-dir>
+#
+# Join the selection to the collection: select not-Ready pods, order tenant
+# namespaces first, and collect per-pod evidence for at most COZY_REPORT_PODS_MAX
+# of them within COZY_REPORT_PODS_BUDGET seconds.
+#
+# The budget is a deadline for STARTING a read, checked between pods and between a
+# pod's containers, so the budget itself never cuts a read in progress and the
+# overshoot is bounded by the reads already in flight rather than by the pod's
+# container count. A file can still end early -- its own per-read bound, or kubectl
+# failing mid-stream -- and when it does it says so on its last line; what the
+# deadline never does is leave a file short with nothing recording why.
+#
+# Neither bound is silent: whichever fired says so in COLLECTION-TRUNCATED.txt, and
+# a pod list that never returned leaves COLLECTION-FAILED.txt rather than the empty
+# tree a healthy cluster produces.
+cozyreport_collect_broken_pods() {
+  _cbp_root=$1
+  # Without `timeout` every bounded read would exit 127, so the reads run unbounded
+  # instead and the report says so. Refusing to collect would have been the other
+  # option, and it is the wrong one twice over: an unbounded read still collects
+  # the tree, so refusing turns a missing local binary into a lost section, and
+  # notes-and-proceeds for the same dependency -- two halves of one tarball
+  # answering the same question differently is worse than either answer.
+  if [ -z "$COZYREPORT_BOUND" ]; then
+    mkdir -p "$_cbp_root" || true
+    printf '%s\n' \
+      "timeout is not on PATH, so every read in this report ran unbounded -- not only the ones behind this directory" \
+      "this is a missing dependency on the machine that produced the report, not a statement about the cluster: no read anywhere in this tarball was cut off by a wall-clock timeout, because there was none to fire" \
+      "the note sits here because this is the section that always exists; it is a statement about the run. That is the only bound it is about. The pod cap, the collection budget and the per-log --tail all still applied, and each says so in its own file where it fired" \
+      > "$_cbp_root/COLLECTION-UNBOUNDED.txt" || true
+  fi
+  # Both knobs fall back to their default on a malformed value, and both say so
+  # rather than swallowing it. An operator who wrote COZY_REPORT_PODS_BUDGET=10m
+  # and got 600 with no trace would read the resulting truncation note as the
+  # bound they asked for; a bound that hides its own effect is the defect this
+  # whole change is about. The note names the value that was applied, never the
+  # typo, so the two cannot be confused.
+  _cbp_notes=""
+  _cbp_max=${COZY_REPORT_PODS_MAX:-$COZYREPORT_PODS_DEFAULT}
+  if ! cozyreport_is_count "$_cbp_max"; then
+    _cbp_notes="ignored a malformed COZY_REPORT_PODS_MAX='${COZY_REPORT_PODS_MAX:-}' and used $COZYREPORT_PODS_DEFAULT."
+    _cbp_max=$COZYREPORT_PODS_DEFAULT
+  fi
+  _cbp_budget=${COZY_REPORT_PODS_BUDGET:-600}
+  if ! cozyreport_is_count "$_cbp_budget"; then
+    _cbp_notes="${_cbp_notes:+$_cbp_notes }ignored a malformed COZY_REPORT_PODS_BUDGET='${COZY_REPORT_PODS_BUDGET:-}' and used 600."
+    _cbp_budget=600
+  fi
+  # The third knob is resolved per read rather than here, so its note is fetched
+  # rather than produced: one source for the value, one for the sentence about it.
+  _cbp_tail_note=$(cozyreport_pod_tail_note)
+  _cbp_notes="${_cbp_notes:+$_cbp_notes }${_cbp_tail_note}"
+  # Trim the separator a leading empty half leaves behind.
+  _cbp_notes=${_cbp_notes# }
+  _cbp_notes=${_cbp_notes% }
+
+  # The pod list is read on its own, keeping its exit status: piping it into the
+  # selection discards that status, and then a refused list renders identically to
+  # a cluster where every pod is Ready.
+  #
+  # mktemp rather than a `$$` name: a predictable path under a world-writable
+  # directory is a symlink an unprivileged process can plant ahead of the redirect.
+  _cbp_err=$(mktemp "${TMPDIR:-/tmp}/cozyreport-podlist.XXXXXX" 2>/dev/null) || _cbp_err=""
+  # The `if` rather than a bare assignment plus `$?`: a caller that sourced these
+  # helpers under `set -e` would abort on the failing assignment before the branch
+  # that reports it ever ran.
+  # shellcheck disable=SC2086
+  if _cbp_all=$($COZYREPORT_BOUND kubectl get pod -A --no-headers 2>"${_cbp_err:-/dev/null}"); then
+    _cbp_rc=0
+  else
+    _cbp_rc=$?
+  fi
+  # A failed read that printed rows first is a PARTIAL list, not an absent one.
+  # Discarding those rows loses the only pods the read managed to name, and the
+  # note below would then say nothing was ever looked at while kubectl had just
+  # named two crash-looping tenants. Kept and marked, the same way a partial log
+  # is kept and marked -- and the summary's own pod list already does this, so
+  # discarding here would have one tarball answering the same question two ways.
+  if [ "$_cbp_rc" -ne 0 ] && [ -n "$_cbp_all" ]; then
+    mkdir -p "$_cbp_root" || true
+    printf '%s\n' "[cozyreport] the cluster-wide pod list did not return (kubectl exit $_cbp_rc); the pods collected here are the ones it named before it stopped, and there may be others it never reached" \
+      >> "$_cbp_root/COLLECTION-FAILED.txt" || true
+    if [ -n "$_cbp_err" ] && [ -s "$_cbp_err" ]; then
+      printf 'kubectl said: %s\n' "$( { tail -n 1 "$_cbp_err" | cut -c1-200; } || true )" \
+        >> "$_cbp_root/COLLECTION-FAILED.txt" || true
+    fi
+    [ -z "$_cbp_err" ] || rm -f "$_cbp_err"
+  elif [ "$_cbp_rc" -ne 0 ]; then
+    mkdir -p "$_cbp_root" || true
+    # A read cut off by its own timeout is killed before kubectl writes anything,
+    # so its stderr is empty; a refusal comes with the reason. Reporting the two
+    # apart matters because they are different problems -- an apiserver too slow
+    # to answer versus one answering "forbidden" -- and a bare "kubectl said:"
+    # with nothing after it names neither.
+    # LAST line, not the first: a failing cluster-wide list is preceded by one
+    # klog "couldn't get current server API group list" line per discovery retry,
+    # each long enough that trimming it to 200 characters cuts off the cause it
+    # ends with. kubectl's own error handler writes the actionable message last.
+    # `|| true`, because `$([ -n "$v" ] && cmd)` exits 1 when the guard is false
+    # and hack/cozyreport-summary.sh sources these helpers under `set -eu`.
+    _cbp_said=$( { [ -n "$_cbp_err" ] && tail -n 1 "$_cbp_err" 2>/dev/null | cut -c1-200; } || true )
+    # printf, not echo: kubectl's text is untrusted and dash's echo expands
+    # backslash escapes, so a message carrying one could forge a second line in a
+    # file whose whole job is to be believed.
+    {
+      printf '%s\n' "no pod evidence was collected: the cluster-wide pod list did not return"
+      printf '%s\n' "this is NOT a report that every pod was Ready -- nothing was ever looked at"
+      if [ -n "$_cbp_said" ]; then
+        printf 'kubectl said: %s\n' "$_cbp_said"
+      elif cozyreport_timed_out "$_cbp_rc"; then
+        # Branched, not a disjunction: "exited 1: at 124 or 137 the read was cut
+        # off by its own 30s timeout" hands the reader a mechanism that was not in
+        # play and asks them to evaluate a condition the code already evaluated.
+        #
+        # And the timeout branch comes FIRST, matching the three sibling sites.
+        # The two conditions overlap whenever a killed read also had nowhere to
+        # write its stderr, and the comment thirty lines up settles which answer is
+        # better there: a read cut off at 124 is killed before kubectl writes
+        # anything, so its stderr is empty by construction and "we could not
+        # capture the message" leads with the accident rather than the cause. With
+        # the orders reversed one tarball answered "why did this read produce
+        # nothing" two ways, in three files, about a mechanism it had observed.
+        printf '%s\n' "kubectl said nothing: the read was cut off by $(cozyreport_cutoff_desc "$_cbp_rc")"
+      elif [ -z "$_cbp_err" ]; then
+        printf '%s\n' "kubectl exited $_cbp_rc; its message could not be captured (no writable temp dir here), so whether it said anything is unknown"
+      else
+        printf '%s\n' "kubectl said nothing and exited $_cbp_rc"
+      fi
+    } > "$_cbp_root/COLLECTION-FAILED.txt" || true
+    # A knob the operator set and this run could not use is reported here too. The
+    # note block at the end of this function is unreachable from this branch, so
+    # without this an operator who mistyped a bound AND hit an unreachable
+    # apiserver would be told about the second and never about the first -- while
+    # the comment on that block promises the value is named whether or not either
+    # bound fired.
+    if [ -n "$_cbp_notes" ]; then
+      printf '%s\n' "This run $_cbp_notes" >> "$_cbp_root/COLLECTION-FAILED.txt" || true
+    fi
+    [ -z "$_cbp_err" ] || rm -f "$_cbp_err"
+    return 0
+  fi
+  [ -z "$_cbp_err" ] || rm -f "$_cbp_err"
+  _cbp_rows=$(printf '%s\n' "$_cbp_all" | cozyreport_pods_not_ready | cozyreport_pods_prioritize) || true
+
+  _cbp_total=$(printf '%s\n' "$_cbp_rows" | grep -c . || true)
+  case "$_cbp_total" in '' | *[!0-9]*) _cbp_total=0 ;; esac
+
+  _cbp_deadline=$(( $(date +%s) + _cbp_budget ))
+  # Handed to the per-pod collection as well, so the overshoot past the budget is
+  # one container's reads rather than one pod's however-many. Cleared before this
+  # function returns: leaving it set would silently bound whatever a later caller
+  # collects, with a deadline computed for a walk that has already finished.
+  COZYREPORT_COLLECT_DEADLINE=$_cbp_deadline
+  _cbp_done=0
+  # A zero cap is handled here rather than left to `head -n 0`: GNU head treats
+  # that as an empty result, BSD/macOS head rejects it ("illegal line count -- 0")
+  # and would abort a local run. The overflow is still reported below, so a cap of
+  # zero collects nothing visibly rather than silently.
+  if [ "$_cbp_max" -eq 0 ]; then
+    _cbp_admitted=""
+  else
+    _cbp_admitted=$(printf '%s\n' "$_cbp_rows" | head -n "$_cbp_max")
+  fi
+  _cbp_admitted_n=$(printf '%s\n' "$_cbp_admitted" | grep -c . || true)
+  case "$_cbp_admitted_n" in '' | *[!0-9]*) _cbp_admitted_n=0 ;; esac
+  printf '%s\n' "$_cbp_admitted" |
+    while read -r _cbp_ns _cbp_pod _; do
+      # An empty selection still arrives as one blank line. Skipping it here
+      # rather than short-circuiting above keeps one guard for the case instead
+      # of two, so the one that remains is the one under test.
+      [ -n "$_cbp_ns" ] && [ -n "$_cbp_pod" ] || continue
+      # Checked before the pod rather than inside it: this is the only point at
+      # which stopping leaves a complete pod behind and a note explaining the
+      # stop, which is why the budget bounds when a pod may start rather than
+      # when the walk must end. The loop body runs in a subshell, so the note is
+      # written from in here instead of counted up and reported after the pipe.
+      if [ "$(date +%s)" -ge "$_cbp_deadline" ]; then
+        mkdir -p "$_cbp_root" || true
+        # Denominator is what the walk could have reached, not the whole
+        # selection: the cap already removed everything past $_cbp_max before the
+        # loop began, so "$_cbp_done of $_cbp_total" offers a reach the collector
+        # never had. Both bounds are named when both applied -- an operator who
+        # reads only the budget line and raises the budget would get $_cbp_max
+        # pods and no explanation, which is the bound-hiding-its-own-effect defect
+        # this file argues against elsewhere.
+        printf '%s\n' \
+          "stopped after $_cbp_done of $_cbp_admitted_n not-Ready pods it could reach: the ${_cbp_budget}s collection budget elapsed (COZY_REPORT_PODS_BUDGET=$_cbp_budget)." \
+          "If a pod here holds a CONTAINER-LOGS-TRUNCATED.txt then the budget expired part way through that one. For every other pod here each read was attempted; whether it finished is on the last line of each file, since a read cut short by its own timeout says so there." \
+          "The rest are still listed in the report's kubernetes/pods.txt (one level up from this directory)." \
+          > "$_cbp_root/COLLECTION-TRUNCATED.txt" || true
+        if [ "$_cbp_total" -gt "$_cbp_max" ]; then
+          printf '%s\n' \
+            "COZY_REPORT_PODS_MAX=$_cbp_max also applied: only $_cbp_max of $_cbp_total not-Ready pods were eligible before the budget ran out, so raising the budget alone will not collect the rest." \
+            >> "$_cbp_root/COLLECTION-TRUNCATED.txt" || true
+        fi
+        break
+      fi
+      cozyreport_collect_pod "$_cbp_ns" "$_cbp_pod" "$_cbp_root/$_cbp_ns/$_cbp_pod"
+      _cbp_done=$((_cbp_done + 1))
+    done
+
+  # The budget can also run out DURING the last pod the cap admitted, and then
+  # there is no next iteration to notice it: the loop ends because the cap ended
+  # it, and a cap-only note would date the stop to the wrong bound while calling
+  # a pod complete that holds fewer container logs than it has containers.
+  #
+  # The signal is the marker the per-pod collection leaves when it actually skips
+  # containers, not the clock. "The deadline has passed by now" is a different
+  # question and answering it here would report a truncation that never happened:
+  # a final pod whose reads were slow but all completed skipped nothing, and a
+  # zero-second budget on a healthy cluster would file a truncation note for a
+  # collection that had nothing to collect.
+  _cbp_cut=$(find "$_cbp_root" -type f -name CONTAINER-LOGS-TRUNCATED.txt 2>/dev/null | head -n 1)
+  if [ -n "$_cbp_cut" ]; then
+    _cbp_expired=1
+  else
+    _cbp_expired=0
+  fi
+
+  # The budget note the loop writes when it stops BETWEEN pods is the more
+  # proximate truth and is not overwritten here: a walk that ran out of time
+  # stopped short of the cap as well, and saying "reached the cap" of a walk that
+  # never got there would send a reader looking for pods never attempted.
+  if [ ! -f "$_cbp_root/COLLECTION-TRUNCATED.txt" ] &&
+     { [ "$_cbp_total" -gt "$_cbp_max" ] || [ "$_cbp_expired" -eq 1 ]; }; then
+    mkdir -p "$_cbp_root" || true
+    {
+      if [ "$_cbp_total" -gt "$_cbp_max" ]; then
+        printf '%s\n' \
+          "collected $_cbp_max of $_cbp_total not-Ready pods (COZY_REPORT_PODS_MAX=$_cbp_max)." \
+          "The $((_cbp_total - _cbp_max)) not collected here are still listed in the report's kubernetes/pods.txt (one level up from this directory)."
+      fi
+      if [ "$_cbp_expired" -eq 1 ]; then
+        printf '%s\n' \
+          "the ${_cbp_budget}s collection budget (COZY_REPORT_PODS_BUDGET=$_cbp_budget) ran out part way through a pod collected here, so it holds fewer container logs than that pod has containers." \
+          "The CONTAINER-LOGS-TRUNCATED.txt beside them names it. For every other pod here each read was attempted; a read cut short by its own timeout says so on the last line of its own file."
+      fi
+    } > "$_cbp_root/COLLECTION-TRUNCATED.txt" || true
+  fi
+
+  COZYREPORT_COLLECT_DEADLINE=""
+
+  # A discarded knob value is reported whether or not either bound fired: the
+  # operator who set it is entitled to know it was not the bound that applied, and
+  # a run that then completed inside the default would otherwise carry no trace of
+  # the value it ignored.
+  if [ -n "$_cbp_notes" ]; then
+    mkdir -p "$_cbp_root" || true
+    if [ -f "$_cbp_root/COLLECTION-TRUNCATED.txt" ]; then
+      printf '%s\n' "This run also $_cbp_notes" >> "$_cbp_root/COLLECTION-TRUNCATED.txt" || true
+    else
+      printf '%s\n' "This run $_cbp_notes" > "$_cbp_root/COLLECTION-NOTES.txt" || true
+    fi
+  fi
+  return 0
+}
+
+# cozyreport_collect_runner_identity <dir>: the runner VM's own identity, read on
+# that machine by hack/e2e-runner-identity.sh before this container existed and
+# carried in with the tree.
+#
+# Copied rather than re-read: it describes the machine a layer above this
+# container, whose link-local metadata service this container has no guaranteed
+# route to, so an attempt from in here would answer "unreachable" about a machine
+# that is fine.
+#
+# One filename either way, holding either the record or the reason there is none.
+# A marker file beside an absent one would carry the same words and be found by
+# nobody, because the absence is where a reader stops.
+#
+# A function rather than four lines in the module below, so both arms are
+# reachable from the unit suite. The module itself needs a cluster, and this is the
+# one part of it whose behaviour is decided entirely by a local file.
+cozyreport_collect_runner_identity() {
+  _cri_dir=$1
+  _cri_file=${COZY_RUNNER_IDENTITY_FILE:-_out/runner-identity.txt}
+  # `-s` rather than `-f`: a write cut off by a full disk leaves the file there and
+  # empty, and copying that through would put a zero-byte runner-identity.txt in
+  # the report -- holding neither the record nor a reason, which is the one outcome
+  # the promise below rules out.
+  if [ -s "$_cri_file" ]; then
+    # Through the same bounded reader as the host commands in the module below,
+    # for the uniformity rather than for the risk: it is a local file of a few
+    # hundred bytes, and the reader is what gives it the same TRUNCATED and
+    # READ-WARNINGS treatment as its neighbours.
+    cozyreport_read_object "$_cri_dir/runner-identity.txt" cat "$_cri_file"
+    return 0
+  fi
+  # Three causes, not one. The capture that writes this record is taken on the
+  # runner VM before this container exists (hack/e2e-runner-identity.sh, from
+  # packages/core/testing/Makefile) and it never fails the run, so a missing file
+  # says the step did not run, OR that it ran and could not write -- in which case
+  # the record is in that step's own log and only the artifact copy is missing.
+  # Naming one of them would be this collector asserting a cause it did not
+  # observe, in a file whose whole premise is that its notes can be believed.
+  printf '%s\n' "# [cozyreport] no runner identity record at $_cri_file (absent, or present and empty), so this report says nothing about the machine the sandbox ran on. Three things produce this: the capture step did not run, a sandbox was created by hand, or the capture ran and could not write its file -- and in that last case the record is in the log of the step that took it, which exits 0 either way. It is NOT a statement that the runner was an ordinary one: an unidentified runner and an unremarkable one leave the same absence here." \
+    > "$_cri_dir/runner-identity.txt" || true
+  return 0
+}
+
+# Let a focused BATS test, or hack/cozyreport-summary.sh, source the helpers
+# above without running the full cluster report. Nothing below this point runs
+# for such a caller.
+if [ -n "${COZYREPORT_LIB:-}" ]; then
+  return 0 2>/dev/null
+fi
+
 SCRIPT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
 REPORT_DATE=$(date +%Y-%m-%d_%H-%M-%S)
 REPORT_NAME=${1:-cozyreport-$REPORT_DATE}
 REPORT_PDIR=$(mktemp -d)
+# Fail here rather than carry an empty prefix forward. This file sets no errexit,
+# so a failing `mktemp -d` leaves REPORT_PDIR empty and the script runs on: every
+# path below becomes absolute from the filesystem root. Nothing stops the run
+# there: with no errexit a refused `mkdir -p` is just a non-zero status nobody
+# reads, and the six that carry `|| true` do not even leave that. As an
+# unprivileged user that is a permission
+# error and an empty tree; as root in a container -- which is how CI runs this --
+# it is directory creation at `/` and a report written into the host's root, with
+# the tarball then assembled from nothing.
+#
+# `${VAR:?}` exits a non-interactive shell on its own, which is what makes this
+# work without errexit; the two `|| exit` dependency checks below rely on the same
+# property of `||` rather than on a shell option.
+: "${REPORT_PDIR:?mktemp -d failed, refusing to write a report to the filesystem root}"
 REPORT_DIR=$REPORT_PDIR/$REPORT_NAME
 
 # -- check dependencies
 command -V kubectl >/dev/null || exit $?
 command -V tar >/dev/null || exit $?
+# `timeout` is what bounds every read in this file. Without it they run with no
+# ceiling instead, which is what this collector did throughout before the bounds
+# existed and is strictly better than refusing to collect, so this is a warning
+# rather than an exit: the caller wraps this script in `|| true`, and exiting here
+# would trade the whole tarball -- Talos, LINSTOR, Flux, COSI, all of it -- for one
+# dependency. COLLECTION-UNBOUNDED.txt says so in the artifact, and the step's own
+# ceiling is then the only thing left between a hung read and a lost tarball.
+if [ -z "$COZYREPORT_BOUND" ]; then
+  echo "WARNING: timeout is not on PATH; every read will be taken with no ceiling, and the report will say so"
+fi
 
 # -- cozystack module
 echo "Collecting Cozystack information..."
 mkdir -p $REPORT_DIR/cozystack
-kubectl get deploy -n cozy-system cozystack -o jsonpath='{.spec.template.spec.containers[0].image}' > $REPORT_DIR/cozystack/image.txt 2>&1
-if kubectl get deploy -n cozy-system cozystack-operator >/dev/null 2>&1; then
-  kubectl logs -n cozy-system deploy/cozystack-operator --tail=2000 > $REPORT_DIR/cozystack/operator.log 2>&1
-  kubectl logs -n cozy-system deploy/cozystack-operator --tail=2000 --previous > $REPORT_DIR/cozystack/operator-previous.log 2>&1 || true
+# cozy-system/cozystack-operator, the same Deployment the log reads below name.
+# This line asked for `cozystack`, which the installer stopped shipping when it
+# moved to the operator, so the first file of the report -- the one that says
+# which build produced everything after it -- carried `deployments.apps
+# "cozystack" not found` on every run. Same defect as the copy-pasted kamaji gate
+# below: a name that exists nowhere fails quietly and looks like evidence.
+cozyreport_read_object "$REPORT_DIR/cozystack/image.txt" \
+  kubectl get deploy -n cozy-system cozystack-operator -o jsonpath='{.spec.template.spec.containers[0].image}'
+if cozyreport_probe "cozystack operator logs" kubectl get deploy -n cozy-system cozystack-operator; then
+  cozyreport_read_object "$REPORT_DIR/cozystack/operator.log" \
+    kubectl logs -n cozy-system deploy/cozystack-operator --tail=2000
+  cozyreport_read_object "$REPORT_DIR/cozystack/operator-previous.log" \
+    kubectl logs -n cozy-system deploy/cozystack-operator --tail=2000 --previous
 fi
-kubectl get cm -n cozy-system --no-headers | awk '$1 ~ /^cozystack/' |
+cozyreport_select_objects "cozystack configmaps" kubectl get cm -n cozy-system --no-headers | awk '$1 ~ /^cozystack/' |
   while read NAME _; do
     DIR=$REPORT_DIR/cozystack/configs
     mkdir -p $DIR
-    kubectl get cm -n cozy-system $NAME -o yaml > $DIR/$NAME.yaml 2>&1
+    cozyreport_read_object "$DIR/$NAME.yaml" kubectl get cm -n cozy-system "$NAME" -o yaml
   done
 
 # -- flux module
 echo "Collecting Flux controller state..."
 mkdir -p $REPORT_DIR/flux
 for ctrl in helm-controller source-controller notification-controller kustomize-controller; do
-  if kubectl get deploy -n cozy-fluxcd $ctrl >/dev/null 2>&1; then
-    kubectl logs -n cozy-fluxcd deploy/$ctrl --tail=2000 > $REPORT_DIR/flux/$ctrl.log 2>&1
-    kubectl logs -n cozy-fluxcd deploy/$ctrl --tail=2000 --previous > $REPORT_DIR/flux/$ctrl-previous.log 2>&1 || true
+  if cozyreport_probe "flux $ctrl logs" kubectl get deploy -n cozy-fluxcd "$ctrl"; then
+    cozyreport_read_object "$REPORT_DIR/flux/$ctrl.log" \
+      kubectl logs -n cozy-fluxcd "deploy/$ctrl" --tail=2000
+    cozyreport_read_object "$REPORT_DIR/flux/$ctrl-previous.log" \
+      kubectl logs -n cozy-fluxcd "deploy/$ctrl" --tail=2000 --previous
   fi
 done
 
 echo "Collecting Flux sources..."
 for kind in helmrepositories.source.toolkit.fluxcd.io ocirepositories.source.toolkit.fluxcd.io gitrepositories.source.toolkit.fluxcd.io externalartifacts.source.toolkit.fluxcd.io; do
   short=${kind%%.*}
-  kubectl get $kind -A > $REPORT_DIR/flux/$short.txt 2>&1
-  kubectl get $kind -A -o yaml > $REPORT_DIR/flux/$short.yaml 2>&1
+  cozyreport_read_object "$REPORT_DIR/flux/$short.txt" kubectl get "$kind" -A
+  cozyreport_read_object "$REPORT_DIR/flux/$short.yaml" kubectl get "$kind" -A -o yaml
 done
 
 # -- cert-manager module
-if kubectl get crd certificates.cert-manager.io >/dev/null 2>&1; then
+if cozyreport_probe "cert-manager" kubectl get crd certificates.cert-manager.io; then
   echo "Collecting cert-manager state..."
   DIR=$REPORT_DIR/cert-manager
   mkdir -p $DIR
-  kubectl get certificates.cert-manager.io -A > $DIR/certificates.txt 2>&1
-  kubectl get certificaterequests.cert-manager.io -A > $DIR/certificaterequests.txt 2>&1
-  kubectl get orders.acme.cert-manager.io -A > $DIR/orders.txt 2>&1
-  kubectl get challenges.acme.cert-manager.io -A > $DIR/challenges.txt 2>&1
+  cozyreport_read_object "$DIR/certificates.txt" kubectl get certificates.cert-manager.io -A
+  cozyreport_read_object "$DIR/certificaterequests.txt" kubectl get certificaterequests.cert-manager.io -A
+  cozyreport_read_object "$DIR/orders.txt" kubectl get orders.acme.cert-manager.io -A
+  cozyreport_read_object "$DIR/challenges.txt" kubectl get challenges.acme.cert-manager.io -A
   # Per non-Ready cert: full yaml + describe
-  kubectl get certificates.cert-manager.io -A --no-headers 2>/dev/null | awk '$3 != "True"' | \
+  cozyreport_select_objects "certificates" kubectl get certificates.cert-manager.io -A --no-headers | awk '$3 != "True"' | \
     while read NAMESPACE NAME _; do
       cdir=$DIR/certificates/$NAMESPACE/$NAME
       mkdir -p $cdir
-      kubectl get certificates.cert-manager.io -n $NAMESPACE $NAME -o yaml > $cdir/cert.yaml 2>&1
-      kubectl describe certificates.cert-manager.io -n $NAMESPACE $NAME > $cdir/describe.txt 2>&1
+      cozyreport_read_object "$cdir/cert.yaml" \
+        kubectl get certificates.cert-manager.io -n "$NAMESPACE" "$NAME" -o yaml
+      cozyreport_read_object "$cdir/describe.txt" \
+        kubectl describe certificates.cert-manager.io -n "$NAMESPACE" "$NAME"
     done
-  if kubectl get deploy -n cozy-cert-manager cert-manager >/dev/null 2>&1; then
-    kubectl logs -n cozy-cert-manager deploy/cert-manager --tail=2000 > $DIR/cert-manager.log 2>&1
-    kubectl logs -n cozy-cert-manager deploy/cert-manager-webhook --tail=2000 > $DIR/cert-manager-webhook.log 2>&1
+  if cozyreport_probe "cert-manager logs" kubectl get deploy -n cozy-cert-manager cert-manager; then
+    cozyreport_read_object "$DIR/cert-manager.log" \
+      kubectl logs -n cozy-cert-manager deploy/cert-manager --tail=2000
+    cozyreport_read_object "$DIR/cert-manager-webhook.log" \
+      kubectl logs -n cozy-cert-manager deploy/cert-manager-webhook --tail=2000
   fi
 fi
 
@@ -68,169 +1724,469 @@ fi
 
 echo "Collecting Kubernetes information..."
 mkdir -p $REPORT_DIR/kubernetes
-kubectl version > $REPORT_DIR/kubernetes/version.txt 2>&1
+cozyreport_read_object "$REPORT_DIR/kubernetes/version.txt" kubectl version
 
 echo "Collecting nodes..."
-kubectl get nodes -o wide > $REPORT_DIR/kubernetes/nodes.txt 2>&1
-kubectl get nodes --no-headers | awk '$2 != "Ready"' |
+cozyreport_read_object "$REPORT_DIR/kubernetes/nodes.txt" kubectl get nodes -o wide
+cozyreport_select_objects "nodes" kubectl get nodes --no-headers | awk '$2 != "Ready"' |
   while read NAME _; do
     DIR=$REPORT_DIR/kubernetes/nodes/$NAME
     mkdir -p $DIR
-    kubectl get node $NAME -o yaml > $DIR/node.yaml 2>&1
-    kubectl describe node $NAME > $DIR/describe.txt 2>&1
+    cozyreport_read_object "$DIR/node.yaml" kubectl get node "$NAME" -o yaml
+    cozyreport_read_object "$DIR/describe.txt" kubectl describe node "$NAME"
+  done
+
+echo "Collecting CertificateSigningRequests..."
+# Node bootstrap goes through this on the HOST cluster too: a Node stuck
+# before Ready with a Pending or missing CSR here is blocked on approval
+# rather than on kubelet startup, which the walk above already covers.
+cozyreport_read_object "$REPORT_DIR/kubernetes/csr.txt" kubectl get csr -o wide
+cozyreport_select_objects "csr" kubectl get csr --no-headers |
+  while read NAME _; do
+    DIR=$REPORT_DIR/kubernetes/csr/$NAME
+    mkdir -p $DIR
+    cozyreport_read_object "$DIR/csr.yaml" kubectl get csr "$NAME" -o yaml
   done
 
+echo "Collecting tenant kubernetes CertificateSigningRequests..."
+# A Kamaji-fronted tenant cluster is a second apiserver this script has no
+# route to except through the kubeconfig hack/e2e-chainsaw/_lib/run-
+# kubernetes.sh leaves at tenantkubeconfig-<test> when a kubernetes-* test
+# fails before reaching its own success-path cleanup; no file, nothing to walk.
+for TENANT_KC in tenantkubeconfig-*; do
+  [ -f "$TENANT_KC" ] || continue
+  TENANT_NAME=${TENANT_KC#tenantkubeconfig-}
+  DIR=$REPORT_DIR/kubernetes/tenant-csr/$TENANT_NAME
+  mkdir -p $DIR
+  cozyreport_read_object "$DIR/csr.txt" kubectl --kubeconfig "$TENANT_KC" get csr -o wide
+  cozyreport_select_objects "tenant csr ($TENANT_NAME)" kubectl --kubeconfig "$TENANT_KC" get csr --no-headers |
+    while read NAME _; do
+      cozyreport_read_object "$DIR/$NAME.yaml" kubectl --kubeconfig "$TENANT_KC" get csr "$NAME" -o yaml
+    done
+done
+
 echo "Collecting namespaces..."
-kubectl get ns -o wide > $REPORT_DIR/kubernetes/namespaces.txt 2>&1
-kubectl get ns --no-headers | awk '$2 != "Active"' |
+cozyreport_read_object "$REPORT_DIR/kubernetes/namespaces.txt" kubectl get ns -o wide
+cozyreport_select_objects "namespaces" kubectl get ns --no-headers | awk '$2 != "Active"' |
   while read NAME _; do
     DIR=$REPORT_DIR/kubernetes/namespaces/$NAME
     mkdir -p $DIR
-    kubectl get ns $NAME -o yaml > $DIR/namespace.yaml 2>&1
-    kubectl describe ns $NAME > $DIR/describe.txt 2>&1
+    cozyreport_read_object "$DIR/namespace.yaml" kubectl get ns "$NAME" -o yaml
+    cozyreport_read_object "$DIR/describe.txt" kubectl describe ns "$NAME"
   done
 
 echo "Collecting events..."
-kubectl get events -A --sort-by=.lastTimestamp > $REPORT_DIR/kubernetes/events.txt 2>&1
+# The read most likely to hit the 30s ceiling in this whole file, and worth knowing
+# before `events.txt` is read as a complete picture. `--sort-by` sorts CLIENT-side,
+# so kubectl pulls every event in the cluster and orders them locally, against the
+# degraded apiserver this tool exists for -- and it does that under the same flat
+# ceiling as a single-object describe. A truncated events.txt says so on its last
+# line; an events.txt that is merely SHORT is the ordinary case for a large cluster.
+cozyreport_read_object "$REPORT_DIR/kubernetes/events.txt" \
+  kubectl get events -A --sort-by=.lastTimestamp
 # Filter to warning-class and recent for quick triage
-kubectl get events -A --sort-by=.lastTimestamp \
-  -o jsonpath='{range .items[?(@.type!="Normal")]}{.lastTimestamp}{"\t"}{.involvedObject.namespace}/{.involvedObject.kind}/{.involvedObject.name}{"\t"}{.reason}{"\t"}{.message}{"\n"}{end}' \
-  > $REPORT_DIR/kubernetes/events-warnings.txt 2>&1
+cozyreport_read_object "$REPORT_DIR/kubernetes/events-warnings.txt" \
+  kubectl get events -A --sort-by=.lastTimestamp \
+  -o jsonpath='{range .items[?(@.type!="Normal")]}{.lastTimestamp}{"\t"}{.involvedObject.namespace}/{.involvedObject.kind}/{.involvedObject.name}{"\t"}{.reason}{"\t"}{.message}{"\n"}{end}'
 
 echo "Collecting helmreleases..."
-kubectl get hr -A > $REPORT_DIR/kubernetes/helmreleases.txt 2>&1
-kubectl get hr -A --no-headers | awk '$4 != "True"' | \
+cozyreport_read_object "$REPORT_DIR/kubernetes/helmreleases.txt" kubectl get hr -A
+cozyreport_select_objects "helmreleases" kubectl get hr -A --no-headers | awk '$4 != "True"' | \
   while read NAMESPACE NAME _; do
     DIR=$REPORT_DIR/kubernetes/helmreleases/$NAMESPACE/$NAME
     mkdir -p $DIR
-    kubectl get hr -n $NAMESPACE $NAME -o yaml > $DIR/hr.yaml 2>&1
-    kubectl describe hr -n $NAMESPACE $NAME > $DIR/describe.txt 2>&1
-    # Helm storage secrets: latest revision per release.
-    kubectl get secret -n $NAMESPACE -l owner=helm,name=$NAME --sort-by='.metadata.creationTimestamp' --no-headers 2>/dev/null | \
+    cozyreport_read_object "$DIR/hr.yaml" kubectl get hr -n "$NAMESPACE" "$NAME" -o yaml
+    cozyreport_read_object "$DIR/describe.txt" kubectl describe hr -n "$NAMESPACE" "$NAME"
+    # Helm storage secrets: latest revision per release. Bounded with the bare
+    # wrapper rather than through a reader: both of these feed a pipeline whose
+    # output is decoded rather than kept, so there is no file for a marker to go
+    # on, and a note per HelmRelease would put one line per release into
+    # COLLECTION-FAILED.txt on a cluster whose apiserver is refusing -- which is
+    # the state a report is taken in. The release's own hr.yaml and describe.txt
+    # are beside this and carry their own markers.
+    # shellcheck disable=SC2086  # empty COZYREPORT_BOUND must vanish, not become ""
+    $COZYREPORT_BOUND kubectl get secret -n $NAMESPACE -l owner=helm,name=$NAME --sort-by='.metadata.creationTimestamp' --no-headers 2>/dev/null | \
       tail -1 | awk '{print $1}' | while read SECRET; do
         [ -z "$SECRET" ] && continue
-        kubectl get secret -n $NAMESPACE $SECRET -o jsonpath='{.data.release}' 2>/dev/null \
+        # shellcheck disable=SC2086
+        $COZYREPORT_BOUND kubectl get secret -n $NAMESPACE $SECRET -o jsonpath='{.data.release}' 2>/dev/null \
           | base64 -d | base64 -d | gzip -d > $DIR/helm-release.json 2>&1 || true
       done
   done
 
 echo "Collecting packages..."
-kubectl get packages > $REPORT_DIR/kubernetes/packages.txt 2>&1
-kubectl get packages --no-headers | awk '$3 != "True"' | \
+cozyreport_read_object "$REPORT_DIR/kubernetes/packages.txt" kubectl get packages
+cozyreport_select_objects "packages" kubectl get packages --no-headers | awk '$3 != "True"' | \
   while read NAME _; do
     DIR=$REPORT_DIR/kubernetes/packages/$NAME
     mkdir -p $DIR
-    kubectl get package $NAME -o yaml > $DIR/package.yaml 2>&1
-    kubectl describe package $NAME > $DIR/describe.txt 2>&1
+    cozyreport_read_object "$DIR/package.yaml" kubectl get package "$NAME" -o yaml
+    cozyreport_read_object "$DIR/describe.txt" kubectl describe package "$NAME"
   done
 
 echo "Collecting packagesources..."
-kubectl get packagesources > $REPORT_DIR/kubernetes/packagesources.txt 2>&1
-kubectl get packagesources --no-headers | awk '$3 != "True"' | \
+cozyreport_read_object "$REPORT_DIR/kubernetes/packagesources.txt" kubectl get packagesources
+cozyreport_select_objects "packagesources" kubectl get packagesources --no-headers | awk '$3 != "True"' | \
   while read NAME _; do
     DIR=$REPORT_DIR/kubernetes/packagesources/$NAME
     mkdir -p $DIR
-    kubectl get packagesource $NAME -o yaml > $DIR/packagesource.yaml 2>&1
-    kubectl describe packagesource $NAME > $DIR/describe.txt 2>&1
+    cozyreport_read_object "$DIR/packagesource.yaml" kubectl get packagesource "$NAME" -o yaml
+    cozyreport_read_object "$DIR/describe.txt" kubectl describe packagesource "$NAME"
   done
 
 echo "Collecting cozystack apps..."
 DIR=$REPORT_DIR/cozystack-apps
 mkdir -p $DIR
-for kind in applications.apps.cozystack.io applicationdefinitions.apps.cozystack.io tenants.apps.cozystack.io; do
-  short=${kind%%.*}
-  if kubectl get crd $kind >/dev/null 2>&1; then
-    kubectl get $kind -A > $DIR/$short.txt 2>&1
-    kubectl get $kind -A -o jsonpath='{range .items[?(@.status.conditions[?(@.type=="Ready")].status!="True")]}{.metadata.namespace}{" "}{.metadata.name}{"\n"}{end}' 2>/dev/null | \
-      while read NAMESPACE NAME; do
-        [ -z "$NAMESPACE" ] && continue
-        d=$DIR/$short/$NAMESPACE/$NAME
-        mkdir -p $d
-        kubectl get $kind -n $NAMESPACE $NAME -o yaml > $d/$short.yaml 2>&1
-        kubectl describe $kind -n $NAMESPACE $NAME > $d/describe.txt 2>&1
-      done
-  fi
-done
+# Two kinds, reached two different ways, and the old loop got both wrong while
+# looking like it had them right. It gated all three of its kinds on
+# `kubectl get crd <kind>.apps.cozystack.io`, so the section never ran once.
+#
+# ApplicationDefinition is a real CRD, but in group cozystack.io and cluster-
+# scoped -- hence no `-A`, which the old walk passed and which would have put
+# `<none>` where a namespace goes.
+cozyreport_read_object "$DIR/applicationdefinitions.txt" \
+  kubectl get applicationdefinitions.cozystack.io
+# Tenants come from the aggregated apps.cozystack.io APIService served by
+# cozystack-api, so there is no CRD to ask about; asking is what kept the section
+# shut. Read through the bounded reader rather than gated: an aggregated API that
+# is down is the state a failed install is in, and it must arrive as kubectl's
+# refusal instead of rendering as a cluster with no tenants.
+#
+# The third kind the old loop named, `applications.apps.cozystack.io`, is not
+# collected: that group serves one resource per ApplicationDefinition, discovered
+# from the cozyrds, so there is no `applications` resource to read and listing the
+# real ones means enumerating the group at runtime.
+cozyreport_read_object "$DIR/tenants.txt" \
+  kubectl get tenants.apps.cozystack.io -A
 
 echo "Collecting pods..."
-kubectl get pod -A -o wide > $REPORT_DIR/kubernetes/pods.txt 2>&1
-kubectl get pod -A --no-headers | awk '$4 !~ /Running|Succeeded|Completed/' |
-  while read NAMESPACE NAME _ STATE _; do
-    DIR=$REPORT_DIR/kubernetes/pods/$NAMESPACE/$NAME
-    mkdir -p $DIR
-    CONTAINERS=$(kubectl get pod -o jsonpath='{.spec.containers[*].name} {.spec.initContainers[*].name}' -n $NAMESPACE $NAME)
-    kubectl get pod -n $NAMESPACE $NAME -o yaml > $DIR/pod.yaml 2>&1
-    kubectl describe pod -n $NAMESPACE $NAME > $DIR/describe.txt 2>&1
-    if [ "$STATE" != "Pending" ]; then
-      for CONTAINER in $CONTAINERS; do
-        kubectl logs -n $NAMESPACE $NAME $CONTAINER > $DIR/logs-$CONTAINER.txt 2>&1
-        kubectl logs -n $NAMESPACE $NAME $CONTAINER --previous > $DIR/logs-$CONTAINER-previous.txt 2>&1
-      done
-    fi
-  done
+cozyreport_read_object "$REPORT_DIR/kubernetes/pods.txt" kubectl get pod -A -o wide
+cozyreport_collect_broken_pods "$REPORT_DIR/kubernetes/pods"
 
 echo "Collecting virtualmachines..."
-kubectl get vm -A > $REPORT_DIR/kubernetes/vms.txt 2>&1
-kubectl get vm -A --no-headers | awk '$5 != "True"' |
+cozyreport_read_object "$REPORT_DIR/kubernetes/vms.txt" kubectl get vm -A
+COZYREPORT_OBJECTS_DEADLINE=$(( $(date +%s) + COZYREPORT_OBJECTS_BUDGET_DEFAULT ))
+# The selector read is bounded too. The budget below only starts mattering once
+# rows arrive, so an apiserver that hangs on the cluster-wide list spends the
+# whole collection step without the deadline ever being consulted -- the one
+# shape of failure these bounds exist to stop.
+# shellcheck disable=SC2086  # empty COZYREPORT_BOUND must vanish, not become ""
+cozyreport_select_objects "virtualmachines" kubectl get vm -A --no-headers | cozyreport_kubevirt_not_ready | cozyreport_admit_objects "virtualmachines" |
   while read NAMESPACE NAME _; do
+    if cozyreport_objects_deadline_passed; then
+      cozyreport_objects_budget_note "virtualmachines"
+      break
+    fi
     DIR=$REPORT_DIR/kubernetes/vm/$NAMESPACE/$NAME
     mkdir -p $DIR
-    kubectl get vm -n $NAMESPACE $NAME -o yaml > $DIR/vm.yaml 2>&1
-    kubectl describe vm -n $NAMESPACE $NAME > $DIR/describe.txt 2>&1
+    cozyreport_read_object "$DIR/vm.yaml" kubectl get vm -n "$NAMESPACE" "$NAME" -o yaml
+    cozyreport_read_object "$DIR/describe.txt" kubectl describe vm -n "$NAMESPACE" "$NAME"
   done
 
 echo "Collecting virtualmachine instances..."
-kubectl get vmi -A > $REPORT_DIR/kubernetes/vmis.txt 2>&1
-kubectl get vmi -A --no-headers | awk '$4 != "Running"' |
+cozyreport_read_object "$REPORT_DIR/kubernetes/vmis.txt" kubectl get vmi -A
+COZYREPORT_OBJECTS_DEADLINE=$(( $(date +%s) + COZYREPORT_OBJECTS_BUDGET_DEFAULT ))
+# The selector read is bounded too. The budget below only starts mattering once
+# rows arrive, so an apiserver that hangs on the cluster-wide list spends the
+# whole collection step without the deadline ever being consulted -- the one
+# shape of failure these bounds exist to stop.
+# shellcheck disable=SC2086  # empty COZYREPORT_BOUND must vanish, not become ""
+cozyreport_select_objects "virtualmachine instances" kubectl get vmi -A --no-headers | cozyreport_kubevirt_not_ready | cozyreport_admit_objects "virtualmachine instances" |
   while read NAMESPACE NAME _; do
+    if cozyreport_objects_deadline_passed; then
+      cozyreport_objects_budget_note "virtualmachine instances"
+      break
+    fi
     DIR=$REPORT_DIR/kubernetes/vmi/$NAMESPACE/$NAME
     mkdir -p $DIR
-    kubectl get vmi -n $NAMESPACE $NAME -o yaml > $DIR/vmi.yaml 2>&1
-    kubectl describe vmi -n $NAMESPACE $NAME > $DIR/describe.txt 2>&1
+    cozyreport_read_object "$DIR/vmi.yaml" kubectl get vmi -n "$NAMESPACE" "$NAME" -o yaml
+    cozyreport_read_object "$DIR/describe.txt" kubectl describe vmi -n "$NAMESPACE" "$NAME"
   done
 
+# -- cdi module
+#
+# CDI deletes an importer pod once, right after marking its PVC Succeeded, and
+# never retries that delete. If that delete fails, the Completed pod keeps
+# pvc-protection on the PVC and a later DataVolume delete hangs. The broken-pod
+# walk skips Completed pods, so every pod carrying CDI's own label is read here,
+# whatever its phase and namespace, next to the controller log where a failed
+# delete is reported. The controller runs at -v=1 and logs every reconcile, and
+# the failed delete can be an hour older than the report, so this log keeps ten
+# times the tail the other controller logs get.
+#
+# Only the log reads sit behind the probe. An importer pod is owned by its PVC,
+# not by cdi-deployment, so it outlives a Deployment that is gone or a probe that
+# got no answer, and it is the evidence this module exists for.
+echo "Collecting CDI state..."
+DIR=$REPORT_DIR/cdi
+mkdir -p "$DIR"
+cozyreport_read_object "$DIR/pods.yaml" \
+  kubectl get pod -A -l app=containerized-data-importer -o yaml
+if cozyreport_probe "cdi logs" kubectl get deploy -n cozy-kubevirt-cdi cdi-deployment; then
+  cozyreport_read_object "$DIR/cdi-deployment.log" \
+    kubectl logs -n cozy-kubevirt-cdi deploy/cdi-deployment --tail=20000
+  cozyreport_read_object "$DIR/cdi-deployment-previous.log" \
+    kubectl logs -n cozy-kubevirt-cdi deploy/cdi-deployment --tail=20000 --previous
+fi
+
 echo "Collecting services..."
-kubectl get svc -A > $REPORT_DIR/kubernetes/services.txt 2>&1
-kubectl get svc -A --no-headers | awk '$4 == "<pending>"' |
+cozyreport_read_object "$REPORT_DIR/kubernetes/services.txt" kubectl get svc -A
+COZYREPORT_OBJECTS_DEADLINE=$(( $(date +%s) + COZYREPORT_OBJECTS_BUDGET_DEFAULT ))
+# The selector read is bounded too. The budget below only starts mattering once
+# rows arrive, so an apiserver that hangs on the cluster-wide list spends the
+# whole collection step without the deadline ever being consulted -- the one
+# shape of failure these bounds exist to stop.
+# shellcheck disable=SC2086  # empty COZYREPORT_BOUND must vanish, not become ""
+cozyreport_select_objects "services" kubectl get svc -A --no-headers | cozyreport_svc_pending | cozyreport_admit_objects "services" |
   while read NAMESPACE NAME _; do
+    if cozyreport_objects_deadline_passed; then
+      cozyreport_objects_budget_note "services"
+      break
+    fi
     DIR=$REPORT_DIR/kubernetes/services/$NAMESPACE/$NAME
     mkdir -p $DIR
-    kubectl get svc -n $NAMESPACE $NAME -o yaml > $DIR/service.yaml 2>&1
-    kubectl describe svc -n $NAMESPACE $NAME > $DIR/describe.txt 2>&1
+    # Bounded, like the vm/vmi loops and for a sharper reason: this loop had never
+    # executed before the selector above was corrected, because it filtered a
+    # column that never carries the value it looked for. Correcting the selector
+    # is what makes a hang here possible at all, and the platform ships several
+    # LoadBalancer services, so a failed install with no LB provider selects all
+    # of them at once. The tarball is written on this file's last line, so a read
+    # that never returns costs the whole report rather than this section: the
+    # step's outer ceiling ends the step, and there is nothing written yet to
+    # upload.
+    cozyreport_read_object "$DIR/service.yaml" kubectl get svc -n "$NAMESPACE" "$NAME" -o yaml
+    cozyreport_read_object "$DIR/describe.txt" kubectl describe svc -n "$NAMESPACE" "$NAME"
   done
 
 echo "Collecting pvcs..."
-kubectl get pvc -A > $REPORT_DIR/kubernetes/pvcs.txt 2>&1
-kubectl get pvc -A --no-headers | awk '$3 != "Bound"'  |
+cozyreport_read_object "$REPORT_DIR/kubernetes/pvcs.txt" kubectl get pvc -A
+cozyreport_select_objects "pvcs" kubectl get pvc -A --no-headers | awk '$3 != "Bound"'  |
   while read NAMESPACE NAME _; do
     DIR=$REPORT_DIR/kubernetes/pvc/$NAMESPACE/$NAME
     mkdir -p $DIR
-    kubectl get pvc -n $NAMESPACE $NAME -o yaml > $DIR/pvc.yaml 2>&1
-    kubectl describe pvc -n $NAMESPACE $NAME > $DIR/describe.txt 2>&1
+    cozyreport_read_object "$DIR/pvc.yaml" kubectl get pvc -n "$NAMESPACE" "$NAME" -o yaml
+    cozyreport_read_object "$DIR/describe.txt" kubectl describe pvc -n "$NAMESPACE" "$NAME"
   done
 
-# -- kamaji module
+# -- objectstorage (COSI) module
 
-if kubectl get deploy -n cozy-linstor linstor-controller >/dev/null 2>&1; then
+if cozyreport_probe "objectstorage (COSI)" kubectl get crd bucketclaims.objectstorage.k8s.io; then
+  echo "Collecting objectstorage (COSI) state..."
+  DIR=$REPORT_DIR/objectstorage
+  mkdir -p $DIR
+  # The COSI CRDs ship no printer columns, so plain `kubectl get` shows
+  # only NAME/AGE — pull the readiness fields explicitly.
+  cozyreport_read_object "$DIR/bucketclaims.txt" \
+    kubectl get bucketclaims.objectstorage.k8s.io -A \
+    -o custom-columns='NAMESPACE:.metadata.namespace,NAME:.metadata.name,READY:.status.bucketReady,BUCKET:.status.bucketName,CLASS:.spec.bucketClassName'
+  cozyreport_read_object "$DIR/bucketaccesses.txt" \
+    kubectl get bucketaccesses.objectstorage.k8s.io -A \
+    -o custom-columns='NAMESPACE:.metadata.namespace,NAME:.metadata.name,GRANTED:.status.accessGranted,ACCOUNT:.status.accountID,CLAIM:.spec.bucketClaimName'
+  cozyreport_read_object "$DIR/buckets.txt" \
+    kubectl get buckets.objectstorage.k8s.io \
+    -o custom-columns='NAME:.metadata.name,READY:.status.bucketReady,ID:.status.bucketID,CLAIMNS:.spec.bucketClaim.namespace,CLAIM:.spec.bucketClaim.name'
+  for kind in bucketclaims.objectstorage.k8s.io bucketaccesses.objectstorage.k8s.io; do
+    short=${kind%%.*}
+    cozyreport_read_object "$DIR/$short.yaml" kubectl get "$kind" -A -o yaml
+  done
+  for kind in buckets.objectstorage.k8s.io bucketclasses.objectstorage.k8s.io bucketaccessclasses.objectstorage.k8s.io; do
+    short=${kind%%.*}
+    cozyreport_read_object "$DIR/$short.yaml" kubectl get "$kind" -o yaml
+  done
+  if cozyreport_probe "objectstorage controller logs" kubectl get deploy -n cozy-objectstorage-controller container-object-storage-controller; then
+    cozyreport_read_object "$DIR/objectstorage-controller.log" \
+      kubectl logs -n cozy-objectstorage-controller deploy/container-object-storage-controller --tail=2000
+    cozyreport_read_object "$DIR/objectstorage-controller-previous.log" \
+      kubectl logs -n cozy-objectstorage-controller deploy/container-object-storage-controller --tail=2000 --previous
+  fi
+  # seaweedfs COSI provisioners run per seaweedfs instance, one per namespace
+  cozyreport_select_objects "objectstorage provisioners" kubectl get deploy -A --no-headers | awk '$2 ~ /objectstorage-provisioner$/ {print $1" "$2}' |
+    while read NAMESPACE NAME; do
+      cozyreport_read_object "$DIR/provisioner-$NAMESPACE.log" \
+        kubectl logs -n "$NAMESPACE" "deploy/$NAME" --all-containers --tail=2000
+      cozyreport_read_object "$DIR/provisioner-$NAMESPACE-previous.log" \
+        kubectl logs -n "$NAMESPACE" "deploy/$NAME" --all-containers --tail=2000 --previous
+    done
+fi
+
+# -- kamaji module
+#
+# Gated on kamaji's own deployment, NOT on cozy-linstor's linstor-controller. The
+# condition opening the linstor block below is one copy-paste away and looks right
+# here; with it, a cluster without LINSTOR -- a failed install where it never got
+# created, or a config with no storage -- gets no kamaji controller log, no
+# KamajiControlPlanes and no TenantControlPlanes, with nothing saying why. A
+# tenant-kubernetes suite that times out on control-plane bootstrap is exactly the
+# run that needs them.
+if cozyreport_probe "kamaji" kubectl get deploy -n cozy-kamaji kamaji; then
   echo "Collecting kamaji resources..."
   DIR=$REPORT_DIR/kamaji
   mkdir -p $DIR
-  kubectl logs -n cozy-kamaji deployment/kamaji > $DIR/kamaji-controller.log 2>&1
-  kubectl get kamajicontrolplanes.controlplane.cluster.x-k8s.io -A > $DIR/kamajicontrolplanes.txt 2>&1
-  kubectl get kamajicontrolplanes.controlplane.cluster.x-k8s.io -A -o yaml > $DIR/kamajicontrolplanes.yaml 2>&1
-  kubectl get tenantcontrolplanes.kamaji.clastix.io -A > $DIR/tenantcontrolplanes.txt 2>&1
-  kubectl get tenantcontrolplanes.kamaji.clastix.io -A -o yaml > $DIR/tenantcontrolplanes.yaml 2>&1
+  # `--tail`, like every other controller log here. Without it this is the only
+  # unbounded-in-SIZE log in the file, which under a wall-clock ceiling makes it
+  # the one most likely to be cut off part way -- and a kamaji log cut off part way
+  # loses its END, which is where a control-plane bootstrap failure is.
+  cozyreport_read_object "$DIR/kamaji-controller.log" \
+    kubectl logs -n cozy-kamaji deployment/kamaji --tail=2000
+  cozyreport_read_object "$DIR/kamajicontrolplanes.txt" \
+    kubectl get kamajicontrolplanes.controlplane.cluster.x-k8s.io -A
+  cozyreport_read_object "$DIR/kamajicontrolplanes.yaml" \
+    kubectl get kamajicontrolplanes.controlplane.cluster.x-k8s.io -A -o yaml
+  cozyreport_read_object "$DIR/tenantcontrolplanes.txt" \
+    kubectl get tenantcontrolplanes.kamaji.clastix.io -A
+  cozyreport_read_object "$DIR/tenantcontrolplanes.yaml" \
+    kubectl get tenantcontrolplanes.kamaji.clastix.io -A -o yaml
 fi
 
 # -- linstor module
 
-if kubectl get deploy -n cozy-linstor linstor-controller >/dev/null 2>&1; then
+if cozyreport_probe "linstor" kubectl get deploy -n cozy-linstor linstor-controller; then
   echo "Collecting linstor resources..."
   DIR=$REPORT_DIR/linstor
   mkdir -p $DIR
-  kubectl exec -n cozy-linstor deploy/linstor-controller -- linstor --no-color n l > $DIR/nodes.txt 2>&1
-  kubectl exec -n cozy-linstor deploy/linstor-controller -- linstor --no-color sp l > $DIR/storage-pools.txt 2>&1
-  kubectl exec -n cozy-linstor deploy/linstor-controller -- linstor --no-color r l > $DIR/resources.txt 2>&1
+  # `--container` named explicitly, like the two bundle reads below. Without it
+  # kubectl announces which container it defaulted to, on stderr, on every call --
+  # so a healthy cluster would leave a READ-WARNINGS.txt here on every single run,
+  # and this file argues at length that a marker firing on healthy installs is one
+  # a reader learns to skip. Removed at the source rather than filtered afterwards.
+  cozyreport_read_exec "$DIR/nodes.txt" \
+    kubectl exec -n cozy-linstor deploy/linstor-controller --container=linstor-controller \
+    -- linstor --no-color n l
+  cozyreport_read_exec "$DIR/storage-pools.txt" \
+    kubectl exec -n cozy-linstor deploy/linstor-controller --container=linstor-controller \
+    -- linstor --no-color sp l
+  cozyreport_read_exec "$DIR/resources.txt" \
+    kubectl exec -n cozy-linstor deploy/linstor-controller --container=linstor-controller \
+    -- linstor --no-color r l
+  cozyreport_read_exec "$DIR/volumes.txt" \
+    kubectl exec -n cozy-linstor deploy/linstor-controller --container=linstor-controller \
+    -- linstor --no-color v l
+  # The zpool behind each ZFS storage pool, one `<node>\t<zpool>` per line, so the
+  # dataset listings below read exactly the pools LINSTOR uses rather than names
+  # guessed from how the lanes happen to create them. StorDriver/StorPoolName is
+  # the only key that carries it: the controller's REST layer renames
+  # StorDriver/ZPool and StorDriver/ZPoolThin to it on create. The listing is
+  # taken first and its status kept: piped straight into jq, a refused read is a
+  # clean empty table.
+  # shellcheck disable=SC2016  # expanded by the controller's shell, not this one
+  cozyreport_read_exec "$DIR/zfs-pools.txt" \
+    kubectl exec -n cozy-linstor deploy/linstor-controller --container=linstor-controller -- sh -c '
+    sp=$(linstor --machine-readable sp l) || exit $?
+    printf "%s\n" "$sp" | jq -r "first | .[] | select(.provider_kind | test(\"^ZFS\")) | \"\(.node_name)\t\(.props[\"StorDriver/StorPoolName\"] // \"\")\""
+  '
+  # Cluster-wide ErrorReport index (IDs + timestamps + node + category)
+  # for fast triage before diving into the per-satellite bundles below.
+  cozyreport_read_exec "$DIR/error-reports-index.txt" \
+    kubectl exec -n cozy-linstor deploy/linstor-controller --container=linstor-controller \
+    -- linstor --no-color error-reports list
+
+  # Controller-side ErrorReports live on the controller pod at
+  # /var/log/linstor-controller/ and cover autoplace decisions, RPC
+  # errors, and controller-JVM exceptions the index above only
+  # references by ID. Bundle them the same way as the satellite ones
+  # below so both ends of the storage stack are recoverable offline.
+  cozyreport_read_exec "$DIR/controller-error-reports.tgz" \
+    kubectl -n cozy-linstor exec deploy/linstor-controller --container=linstor-controller -- sh -c '
+    cd /var/log/linstor-controller 2>/dev/null || exit 0
+    tar -czf - ErrorReport-*.log 2>/dev/null || true
+  '
+  # Drop the bundle if empty. `tar -czf - <no-match>` produces a valid
+  # 45-byte gzipped empty archive (extracts cleanly, `tar -tzf` exits
+  # 0), so a plain readability check keeps that stub in the tree.
+  # Require the archive to contain at least one member to keep it.
+  if [ ! -s "$DIR/controller-error-reports.tgz" ] || [ -z "$(tar -tzf "$DIR/controller-error-reports.tgz" 2>/dev/null | head -n 1)" ]; then
+    rm -f "$DIR/controller-error-reports.tgz"
+  fi
+
+  # LINSTOR satellite ErrorReports carry the actual storage-driver error
+  # text (the linstor-Satellite log only references them by ID:
+  # `ERROR ... Failed to create zfsvolume [Report number 6A4A394E-...]`).
+  # crust-gather ships only pod stdout, so without this capture the
+  # report body stays on the satellite ephemeral filesystem and is lost
+  # when the sandbox is torn down. Copy them off every satellite pod so
+  # post-mortem of a `CreateVolume ResourceExhausted` or
+  # `Failed to create zfsvolume` retry loop has the concrete cause
+  # (out-of-space, dataset conflict, kernel error) instead of just the
+  # driver-level symptom.
+  DIR=$REPORT_DIR/linstor/error-reports
+  mkdir -p "$DIR"
+  COZYREPORT_SELECT_NOTE_DIR=$DIR
+  for pod in $(cozyreport_select_objects "linstor satellites" kubectl -n cozy-linstor get pods -l app.kubernetes.io/component=linstor-satellite -o name); do
+    # Read the node name directly off the pod spec so the tarball key
+    # is stable across piraeus DaemonSet regenerations. Fallback to the
+    # pod name if .spec.nodeName is not readable for any reason (last
+    # resort; collisions between DS pod generations are theoretically
+    # possible but the bundle would still land in a distinct file).
+    # Bounded with the bare wrapper: the value is read into a variable, not into
+    # a file, so there is nothing for a marker to be attached to, and the fallback
+    # below is what covers a read that does not answer.
+    # shellcheck disable=SC2086  # empty COZYREPORT_BOUND must vanish, not become ""
+    node=$($COZYREPORT_BOUND kubectl -n cozy-linstor get "$pod" -o jsonpath='{.spec.nodeName}' 2>/dev/null)
+    # Every dataset of this node's LINSTOR pools, snapshots included, on green
+    # runs as well as red: only a dataset listing names what holds a pool's
+    # space, and a red listing needs a green one to be read against. Exact bytes
+    # and `avail`, so the sizes of leftover datasets can be summed against the
+    # pool root's `avail`; the rounded form loses a sub-GiB difference on a pool
+    # of 100 GiB or more. `linstor sp l` can legitimately disagree with that
+    # `avail`: on a node with only thick pools the controller serves the free
+    # capacity cached at the satellite's last report. `freeing` is the backlog
+    # of an asynchronous destroy, read rather than inferred. LINSTOR may name a
+    # dataset inside a pool, so `zpool` gets the pool part of each name and
+    # `zfs` the whole name. `zpool get` goes on past a pool it cannot open and
+    # only sets its status, so its message and status go into the listing and
+    # `zfs list` runs either way; the read's own status is left to `zfs list`,
+    # which also lists the rest past a dataset it cannot open and exits 1. A
+    # node with no pool gets a note and no read: `zfs list -r` with no pool
+    # argument lists every pool on the machine.
+    if [ -z "$node" ]; then
+      node=$(basename "$pod")
+      pools=""
+      why="spec.nodeName of $pod could not be read, so it was not matched to a LINSTOR node and no dataset was listed"
+    else
+      # Tab-separated because a ZFS name may contain a space; a missing, empty or
+      # blank name is the one thing dropped.
+      pools=$(awk -F '\t' -v n="$node" '$1 == n && $2 ~ /[^[:space:]]/ { print $2 }' "$REPORT_DIR/linstor/zfs-pools.txt" 2>/dev/null)
+      why="linstor/zfs-pools.txt names no ZFS pool for node $node, so no dataset was listed; that file says whether LINSTOR answered"
+    fi
+    if [ -z "$pools" ]; then
+      mkdir -p "$REPORT_DIR/linstor/zfs"
+      printf '%s\n' "# [cozyreport] $why" > "$REPORT_DIR/linstor/zfs/$node.txt" || true
+    else
+      # The pool names go in as one newline-separated argument, never into the
+      # script text, and are split on newlines only: a ZFS name cannot hold one.
+      # shellcheck disable=SC2016,SC2086  # expanded by the satellite's shell; $1 splits into arguments on purpose
+      cozyreport_read_exec "$REPORT_DIR/linstor/zfs/$node.txt" \
+        kubectl -n cozy-linstor exec "$pod" --container=linstor-satellite -- sh -c '
+        IFS="
+"
+        set -f
+        set -- $1
+        zpools() { for d in "$@"; do set -- "$@" "${d%%/*}"; shift; done; zpool get -p freeing,leaked,allocated,free "$@"; }
+        zpools "$@" 2>&1 ||
+          echo "# [cozyreport] zpool get exited $?; the zfs list below ran regardless"
+        exec zfs list -p -t all -o name,used,avail,refer,origin,creation -r "$@"
+      ' sh "$pools"
+    fi
+    # Tar the ErrorReport-*.log files into a per-satellite bundle so a
+    # burst of retry-loop reports (dozens per incident) does not explode
+    # the artefact tree, and a missing directory or empty set never
+    # fails the whole cozyreport run.
+    cozyreport_read_exec "$DIR/$node.tgz" \
+      kubectl -n cozy-linstor exec "$pod" --container=linstor-satellite -- sh -c '
+      cd /var/log/linstor-satellite 2>/dev/null || exit 0
+      tar -czf - ErrorReport-*.log 2>/dev/null || true
+    '
+    # Drop the bundle if empty. `tar -czf - <no-match>` yields a valid
+    # 45-byte gzipped empty archive that would otherwise slip past a
+    # readability check. Require at least one member to keep it. A
+    # satellite with zero ErrorReports (healthy case) leaves nothing.
+    if [ ! -s "$DIR/$node.tgz" ] || [ -z "$(tar -tzf "$DIR/$node.tgz" 2>/dev/null | head -n 1)" ]; then
+      rm -f "$DIR/$node.tgz"
+    fi
+  done
+  COZYREPORT_SELECT_NOTE_DIR=""
+  # Drop the empty parent directory when no satellite had reports.
+  rmdir "$DIR" 2>/dev/null || true
 fi
 
 # -- sandbox-host module
@@ -238,17 +2194,32 @@ fi
 echo "Collecting sandbox host context..."
 DIR=$REPORT_DIR/sandbox-host
 mkdir -p $DIR
-df -h > $DIR/df.txt 2>&1
-free -m > $DIR/free.txt 2>&1
-ps auxww > $DIR/ps.txt 2>&1
-dmesg | tail -200 > $DIR/dmesg.txt 2>&1 || true
+# Bounded although they touch no cluster: `df` blocks indefinitely on a stale NFS
+# or wedged fuse mount, and this script writes its archive on its last line.
+cozyreport_read_object "$DIR/df.txt" df -h
+cozyreport_read_object "$DIR/free.txt" free -m
+cozyreport_read_object "$DIR/ps.txt" ps auxww
+# Which machine this container is running on. Everything else in this directory
+# describes that same host, but describes it as it is now; this says which host it
+# is -- which shape, which region, which processor -- and that is the one fact the
+# run cannot recover afterwards, because the runner is ephemeral.
+cozyreport_collect_runner_identity "$DIR"
+# A pipeline, so the bare wrapper rather than the reader: the reader owns the
+# redirect and `dmesg | tail` needs its own. dash has no pipefail, so the status
+# belongs to `tail` and a cut-off dmesg leaves no marker -- said here rather than
+# left to be found, and the 200-line tail is the bound that shapes this file
+# anyway.
+# shellcheck disable=SC2086  # empty COZYREPORT_BOUND must vanish, not become ""
+$COZYREPORT_BOUND dmesg 2>&1 | tail -200 > $DIR/dmesg.txt 2>&1 || true
 if [ -f /workspace/talosconfig ]; then
-  NODES=$(kubectl get nodes -o jsonpath='{range .items[*]}{.status.addresses[?(@.type=="InternalIP")].address}{"\n"}{end}' 2>/dev/null)
+  # Bare wrapper for the same reason as the satellite node name above: this is
+  # read into a variable and the documented fallback below covers a read that
+  # never answers.
+  # shellcheck disable=SC2086  # empty COZYREPORT_BOUND must vanish, not become ""
+  NODES=$($COZYREPORT_BOUND kubectl get nodes -o jsonpath='{range .items[*]}{.status.addresses[?(@.type=="InternalIP")].address}{"\n"}{end}' 2>/dev/null)
   for node in ${NODES:-192.168.123.11 192.168.123.12 192.168.123.13}; do
     [ -z "$node" ] && continue
-    talosctl --talosconfig /workspace/talosconfig -n "$node" dmesg --tail=200 > "$DIR/talos-$node-dmesg.txt" 2>&1 || true
-    talosctl --talosconfig /workspace/talosconfig -n "$node" logs kubelet --tail=500 > "$DIR/talos-$node-kubelet.log" 2>&1 || true
-    talosctl --talosconfig /workspace/talosconfig -n "$node" logs containerd --tail=500 > "$DIR/talos-$node-containerd.log" 2>&1 || true
+    cozyreport_collect_talos_node /workspace/talosconfig "$node" "$DIR"
   done
 fi
 
@@ -257,6 +2228,12 @@ fi
 echo "Generating summary..."
 "$SCRIPT_DIR/cozyreport-summary.sh" > "$REPORT_DIR/summary.txt" 2>&1 || true
 
+# Fold in the per-test crust-gather snapshots cozytest.sh captured on failure
+# (host + each nested tenant cluster) so the uploaded artifact carries an
+# inspectable, `crust-gather serve`-able state for every failed test.
+SNAP_DIR="${COZY_REPORT_DIR:-_out/cozyreport}/snapshots"
+[ -d "$SNAP_DIR" ] && cp -a "$SNAP_DIR" "$REPORT_DIR/snapshots" 2>/dev/null || true
+
 echo "Creating archive..."
 tar -czf $REPORT_NAME.tgz -C $REPORT_PDIR .
 echo "Report created: $REPORT_NAME.tgz"
diff --git a/hack/cozystack-controller-secret-rbac.bats b/hack/cozystack-controller-secret-rbac.bats
new file mode 100644
index 0000000000..9d7ccf913d
--- /dev/null
+++ b/hack/cozystack-controller-secret-rbac.bats
@@ -0,0 +1,121 @@
+#!/usr/bin/env bats
+# -----------------------------------------------------------------------------
+# Semantic guard on what packages/system/cozystack-controller grants over core
+# Secrets.
+#
+# The union is over every ClusterRole and Role the chart renders; bindings are
+# never consulted. Today that is the same question as "what does the controller's
+# own ServiceAccount hold", because the chart's ClusterRoleBinding and RoleBinding
+# both name the cozystack-controller ServiceAccount and nothing else. A role added
+# here for some other subject would fold into the union too, which errs toward
+# refusing a grant rather than missing one.
+#
+# Two reconcilers share one Secret write grant: WildcardSecretReconciler
+# replicates the operator wildcard TLS Secret into each tenant namespace, and
+# CACertReconciler writes -- and withdraws -- the key-free "<release>.tenant-ca"
+# projection. The controller is cluster-scoped, so any verb it holds on Secrets
+# it holds on every Secret in every tenant namespace. That is why the set is
+# pinned rather than merely bounded from above: a widening reaches all tenants,
+# and a narrowing breaks both reconcilers.
+#
+# The check reads effective permission off the rendered manifests, not manifest
+# text. A rule reaches core Secrets when its apiGroups admit "" and its
+# resources admit "secrets" -- by name or via "*" on either axis -- and a "*" in
+# its verbs expands to the verb set the API server defines for a namespaced
+# resource. The union over every ClusterRole and Role the chart renders must
+# equal the declared set exactly.
+#
+# Expansion is what makes the guard hold on the chart as it stands: the chart
+# ends with a blanket `apiGroups: ['*'] resources: ['*'] verbs: [get,list,watch]`
+# read rule, which does reach Secrets and whose verbs are already inside the
+# declared set. A guard written as "no wildcard anywhere near secrets" would be
+# red on an unmodified tree.
+#
+# The union is over the chart's default rendering: `helm template` is invoked
+# with no --values, so a rule that appeared only under some values file would go
+# unseen. templates/rbac.yaml carries no templating at all today, so nothing is
+# gated behind a value; render the variants here too if that changes.
+#
+# The check lives here rather than beside the chart's helm-unittest suite because
+# helm-unittest compares every field it is handed by value equality. `any: true`
+# changes which fields are compared, not how they are compared, so neither the
+# whole-rule form nor the `any: true` one can bound what a verbs list may hold --
+# `verbs: ["get", "*"]` slips past both. That primitive is the right one for
+# pinning a rule as written, which tests/rbac_test.yaml does, and it cannot
+# express an upper bound: a wildcard in resources, a wildcard in apiGroups, a "*"
+# appended to the declared verb list, an extra field beside the verbs, and a
+# wider grant added as a separate rule while the declared one stays untouched all
+# pass it.
+#
+# resourceNames is deliberately ignored. A rule scoped to named Secrets that
+# grants "*" on them is still a wildcard verb grant, so the union counts it.
+#
+# An aggregated ClusterRole is the one widening this cannot see: it renders with
+# no `rules` of its own, so whatever the aggregation confers stays outside the
+# union. This chart declares no aggregationRule; a rule set assembled that way
+# would need its own check.
+#
+# The assertion is an equality against a non-empty expected set, so a chart that
+# fails to render, or a yq/jq breakage that yields nothing, fails the test
+# rather than passing it vacuously.
+#
+# Requires: helm, yq (mikefarah v4+), jq -- the same three
+# hack/admin-kubeconfig-invariant.bats needs to render and inspect a chart.
+#
+# Run with: bats hack/cozystack-controller-secret-rbac.bats
+# -----------------------------------------------------------------------------
+
+load test_helper
+
+# What "*" in a rule's verbs means for a namespaced resource such as Secret.
+VERB_UNIVERSE='["create","delete","deletecollection","get","list","patch","update","watch"]'
+
+# The grant the chart declares, as a sorted set: read for both reconcilers plus
+# the writes the two of them need. Sorted because the comparison below is on
+# `unique`d jq output, which is sorted.
+DECLARED_SECRET_VERBS="create,delete,get,list,patch,update,watch"
+
+@test "cozystack-controller grants exactly the declared verb set on core Secrets in any spelling" {
+  chart="packages/system/cozystack-controller"
+  [ -d "$chart" ]
+
+  tmp=$(mktemp -d)
+
+  # helm's stderr is left alone: this chart renders silently, so there is nothing
+  # to suppress, and a chart that stops rendering should say why in the log
+  # rather than fail this line mutely.
+  helm template cozystack-controller "$chart" \
+    --namespace cozy-system \
+    > "$tmp/rendered.yaml"
+
+  # yq streams one JSON object per rendered document; jq -s slurps the stream so
+  # the rules of every ClusterRole and Role are one collection.
+  yq --output-format=json eval-all '.' "$tmp/rendered.yaml" \
+    | jq -s '
+        map(select(.kind == "ClusterRole" or .kind == "Role"))
+        | map(.rules // []) | add // []
+        | map(select(
+            ((.apiGroups // []) | any(. == "" or . == "*")) and
+            ((.resources // []) | any(. == "secrets" or . == "*"))
+          ))
+      ' > "$tmp/secret-rules.json"
+
+  effective=$(
+    jq --raw-output --argjson universe "$VERB_UNIVERSE" '
+      map(if ((.verbs // []) | any(. == "*")) then $universe else (.verbs // []) end)
+      | add // [] | unique | join(",")
+    ' "$tmp/secret-rules.json"
+  )
+
+  if [ "$effective" != "$DECLARED_SECRET_VERBS" ]; then
+    echo "Effective verb set on core Secrets is not the declared one." >&2
+    echo "  declared: $DECLARED_SECRET_VERBS" >&2
+    echo "  rendered: $effective" >&2
+    echo "Rules reaching core Secrets:" >&2
+    cat "$tmp/secret-rules.json" >&2
+    exit 1
+  fi
+
+  echo "Effective verbs on core Secrets: $effective"
+  rm -rf "$tmp"
+}
diff --git a/hack/cozystack-version-stamp.bats b/hack/cozystack-version-stamp.bats
new file mode 100644
index 0000000000..f128f37e85
--- /dev/null
+++ b/hack/cozystack-version-stamp.bats
@@ -0,0 +1,146 @@
+#!/usr/bin/env bats
+# -----------------------------------------------------------------------------
+# Unit tests for
+# packages/core/platform/images/migrations/migrations/lib/cozystack-version.sh
+#
+# render_cozystack_version_manifest <version> emits the cozystack-version
+# ConfigMap manifest on stdout, always carrying the
+# platform.cozystack.io/no-delete=true label that the
+# cozystack-no-delete-guardrail ValidatingAdmissionPolicy keys on. Migrations
+# apply it under the default kubectl field manager; a label-less apply by that
+# same manager would strip the label, so the manifest is centralized here and
+# every migration sources it instead of copy-pasting a heredoc.
+#
+# CI runs this file under Bats through `make bats-unit-tests`. It also remains
+# compatible with the legacy `hack/cozytest.sh` translator, whose awk parser
+# recognizes only @test blocks and a bare `}` on its own line. The tests avoid
+# `run` and `$status` for that compatibility path and use direct shell
+# assertions. Each test runs in its own process, so NAMESPACE does not leak.
+#
+# Run with: bats hack/cozystack-version-stamp.bats
+# -----------------------------------------------------------------------------
+
+load test_helper
+
+@test "renders parseable YAML for a version" {
+    . packages/core/platform/images/migrations/migrations/lib/cozystack-version.sh
+    render_cozystack_version_manifest 45 | yq . >/dev/null
+}
+
+@test "carries the no-delete label set to true" {
+    . packages/core/platform/images/migrations/migrations/lib/cozystack-version.sh
+    val=$(render_cozystack_version_manifest 45 \
+      | yq -r '.metadata.labels."platform.cozystack.io/no-delete"')
+    [ "$val" = "true" ]
+}
+
+@test "names the ConfigMap cozystack-version" {
+    . packages/core/platform/images/migrations/migrations/lib/cozystack-version.sh
+    name=$(render_cozystack_version_manifest 45 | yq -r '.metadata.name')
+    [ "$name" = "cozystack-version" ]
+}
+
+@test "stamps the requested version as a quoted string" {
+    # The version MUST render as a quoted YAML string; an unquoted numeric
+    # scalar (version: 45) would change the ConfigMap data type the rest of
+    # the platform reads as a string.
+    . packages/core/platform/images/migrations/migrations/lib/cozystack-version.sh
+    out=$(render_cozystack_version_manifest 45)
+    printf '%s\n' "$out" | grep -qx '  version: "45"'
+    v=$(printf '%s\n' "$out" | yq -r '.data.version')
+    [ "$v" = "45" ]
+}
+
+@test "defaults namespace to cozy-system when NAMESPACE is unset" {
+    unset NAMESPACE
+    . packages/core/platform/images/migrations/migrations/lib/cozystack-version.sh
+    ns=$(render_cozystack_version_manifest 45 | yq -r '.metadata.namespace')
+    [ "$ns" = "cozy-system" ]
+}
+
+@test "honors a NAMESPACE override" {
+    . packages/core/platform/images/migrations/migrations/lib/cozystack-version.sh
+    out=$(export NAMESPACE=cozy-other; render_cozystack_version_manifest 45)
+    ns=$(printf '%s\n' "$out" | yq -r '.metadata.namespace')
+    [ "$ns" = "cozy-other" ]
+}
+
+@test "requires a version argument" {
+    . packages/core/platform/images/migrations/migrations/lib/cozystack-version.sh
+    if ( render_cozystack_version_manifest ) 2>/dev/null; then
+        echo "expected non-zero exit when version arg is missing" >&2
+        exit 1
+    fi
+}
+
+@test "stamp_cozystack_version requires a version argument" {
+    # The guard fires before the kubectl pipe, so this needs no cluster: a
+    # missing version must abort rather than apply empty input to kubectl.
+    . packages/core/platform/images/migrations/migrations/lib/cozystack-version.sh
+    if ( stamp_cozystack_version ) 2>/dev/null; then
+        echo "expected non-zero exit when version arg is missing" >&2
+        exit 1
+    fi
+}
+
+@test "render output matches the canonical labeled manifest" {
+    # Golden test: pins the exact bytes migrations 42/43/44 apply today, so the
+    # refactor that routes them through this helper is provably manifest-stable.
+    unset NAMESPACE
+    . packages/core/platform/images/migrations/migrations/lib/cozystack-version.sh
+    expected=$(cat <<'EOF'
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: cozystack-version
+  namespace: cozy-system
+  labels:
+    platform.cozystack.io/no-delete: "true"
+data:
+  version: "45"
+EOF
+)
+    actual=$(render_cozystack_version_manifest 45)
+    if [ "$actual" != "$expected" ]; then
+        printf 'expected:\n%s\n---\nactual:\n%s\n' "$expected" "$actual" >&2
+        exit 1
+    fi
+}
+
+@test "no go-forward stamp bypasses the helper (migrations >= 42 and run-migrations.sh)" {
+    # The helper exists so go-forward stamps cannot drift back to a label-less
+    # apply that drops the no-delete label. Migrations 1-41 are frozen and
+    # backfilled by 42, so they are exempt; migration 42 onward and the
+    # bootstrap path must each source the helper, call its API, and never stamp
+    # cozystack-version directly with kubectl. Blocking only the historical
+    # 'kubectl create configmap' shape is too weak — an inline 'kubectl apply'
+    # of a hand-rolled label-less manifest would slip past it.
+    mig_dir=packages/core/platform/images/migrations/migrations
+    files=""
+    for f in "$mig_dir"/*; do
+        n=$(basename "$f")
+        case "$n" in *[!0-9]*) continue ;; esac   # skip lib/ and other non-numeric
+        [ "$n" -ge 42 ] || continue
+        files="$files $f"
+    done
+    files="$files packages/core/platform/images/migrations/run-migrations.sh"
+
+    for f in $files; do
+        if ! grep -Eq 'cozystack-version\.sh' "$f"; then
+            echo "$f does not source the cozystack-version helper" >&2
+            exit 1
+        fi
+        if ! grep -Eq '(render_cozystack_version_manifest|stamp_cozystack_version)' "$f"; then
+            echo "$f does not call the cozystack-version helper API" >&2
+            exit 1
+        fi
+        # Strip full-comment lines first: a comment that explains why a stamp
+        # routes through the helper must not read as a direct stamp itself. A
+        # real bypass command never starts with '#', so the guard keeps its
+        # strength against actual direct stamping.
+        if grep -v '^[[:space:]]*#' "$f" | grep -Eq 'kubectl[[:space:]].*(create[[:space:]]+configmap|apply).*cozystack-version'; then
+            echo "$f stamps cozystack-version directly instead of via the helper" >&2
+            exit 1
+        fi
+    done
+}
diff --git a/hack/cozytest-capture-gate.bats b/hack/cozytest-capture-gate.bats
new file mode 100644
index 0000000000..208902caf3
--- /dev/null
+++ b/hack/cozytest-capture-gate.bats
@@ -0,0 +1,205 @@
+#!/usr/bin/env bats
+# -----------------------------------------------------------------------------
+# Behavioural tests for the cluster-capture gate in hack/cozytest.sh.
+#
+# The runner arms its on-failure cluster captures from an EXIT trap. Those
+# captures belong to the e2e suites, which run against a live cluster; a unit
+# suite has no cluster to snapshot, so arming them there buys an empty capture
+# and pays the capture's timeouts for it. The gate therefore keys on which kind
+# of suite is running rather than on whether a kubectl binary happens to be
+# installed, because a unit runner has the binary and no cluster.
+#
+# Both directions are asserted, and they share one fixture generator that
+# differs only in the fixture's filename. That pairing is the point: the
+# unit-side assertion is a negative one, and a negative assertion passes just as
+# well when the harness is broken and nothing ran at all. The e2e-side test is
+# the positive control for exactly that failure, and the unit-side test
+# additionally pins that the run did fail, so "no captures" cannot be satisfied
+# by "no test".
+#
+# The stub kubectl is what makes this a real test of the gate: with no kubectl
+# on PATH every capture leg is skipped for a second reason and both directions
+# would agree for the wrong cause.
+#
+# awk-transform constraint (hack/cozytest.sh rewrites this file before sourcing
+# it): it turns any line beginning `@test "` into a function header, and any
+# line that is exactly `}` into `return 0` plus the brace. Neither rule knows
+# what a heredoc is. So a fixture written as a heredoc here has its own `@test`
+# line harvested into THIS suite: the runner registers a phantom extra test,
+# runs it first, and the fixture's `false` ends the run before any real test
+# executes. Checked by building that variant rather than reasoned about -- it
+# fails loudly rather than silently, but it fails the wrong thing, and the gate
+# is then covered by nothing. The fixtures are built with printf, which puts the
+# `@test` text inside a format string where no rule matches it.
+#
+# Title syntax constraints (also inherited from that parser):
+#   - Titles delimited by ASCII double quotes; embedded quotes truncate.
+#   - Only [A-Za-z0-9] from the title survives into the function name, so keep
+#     titles distinctive in their alphanumeric run.
+#
+# Run with: bats hack/cozytest-capture-gate.bats
+# -----------------------------------------------------------------------------
+
+load test_helper
+
+HACK_DIR="$(cd "$(dirname "${BATS_TEST_FILENAME:-$0}")" && pwd)"
+RUNNER="$HACK_DIR/cozytest.sh"
+
+# Marker printed by the runner's data-plane capture leg. Chosen as one probe
+# because the runner echoes it before invoking the capture, so the assertion
+# reads the gate's decision rather than the capture's outcome.
+DATAPLANE_MARKER='capturing host->pod data-plane'
+
+# The gate covers three legs, and each leaves a distinct artefact under the
+# snapshot directory. Pinning all three from the report tree is what keeps any
+# one of them from being ungated without a test noticing: the echo above covers
+# only the data-plane leg, and the crust-gather leg is the one whose cost is
+# worst, since it needs no reachable cluster to fire, only an ambient
+# KUBECONFIG.
+assert_legs_armed() {
+  _rdir=$1 _name=$2
+  [ -f "$_rdir/snapshots/$_name/crust-gather.log" ]
+  [ -d "$_rdir/snapshots/$_name/dataplane" ]
+  [ -f "$_rdir/snapshots/$_name/previous-logs/capture-notes.txt" ]
+}
+
+assert_legs_disarmed() {
+  _rdir=$1 _name=$2
+  for _leg in crust-gather.log dataplane previous-logs; do
+    if [ -e "$_rdir/snapshots/$_name/$_leg" ]; then
+      echo "cluster capture leg $_leg fired for a unit suite"
+      exit 1
+    fi
+  done
+}
+
+# Build a scratch dir holding stub cluster tools and a single-test fixture whose
+# test fails. $1 is the fixture's path relative to the scratch dir, which is the
+# only thing that differs between the directions under test.
+#
+# Both kubectl and crust-gather are stubbed, and crust-gather is not optional:
+# the runner invokes it directly rather than through a script that needs
+# kubectl output first, so a kubectl-only stub leaves that leg reaching for the
+# real binary against the ambient KUBECONFIG. On a machine that has both -- a
+# maintainer's laptop, the e2e sandbox image -- `make unit-tests` would then
+# snapshot whatever cluster happens to be current, for up to the leg's 390s.
+# That is the same bill this change exists to stop paying.
+make_fixture_dir() {
+  _dir=$(mktemp -d)
+  mkdir -p "$_dir/bin" "$_dir/$(dirname "$1")"
+  for _tool in kubectl crust-gather; do
+    printf '#!/bin/sh\nexit 0\n' >"$_dir/bin/$_tool"
+    chmod +x "$_dir/bin/$_tool"
+  done
+  printf '@test "fixture fails on purpose" {\n  false\n}\n' >"$_dir/$1"
+  printf '%s' "$_dir"
+}
+
+# Run the runner against a fixture with the stub kubectl first on PATH and the
+# report directory redirected into the scratch dir, so a capture that does fire
+# writes there instead of into the worktree. The output goes to a file rather
+# than a variable on purpose: these suites run under `set -x`, and a variable
+# holding the fixture's output gets expanded into the trace of whatever command
+# reads it, printing the fixture's deliberate "Test failed" line into the job
+# log where it reads as a real failure.
+run_fixture() {
+  _fdir=$1 _fname=$2
+  PATH="$_fdir/bin:$PATH" COZY_REPORT_DIR="$_fdir/report" \
+    "$RUNNER" "$_fdir/$_fname" >"$_fdir/out" 2>&1 || true
+}
+
+@test "an e2e suite failing still arms the cluster captures" {
+  dir=$(make_fixture_dir e2e-gate-fixture.bats)
+  run_fixture "$dir" e2e-gate-fixture.bats
+  # Positive control for the negative assertion in the last test: same fixture,
+  # same stubs, e2e filename.
+  grep -qF "$DATAPLANE_MARKER" "$dir/out"
+  # The capture ran to its own end here -- the stub kubectl answers instantly --
+  # so the incompleteness line the next test pins must NOT appear. Without this
+  # the same line would satisfy that test whether it tracked the leg's status or
+  # was printed unconditionally.
+  if grep -qF 'data-plane capture INCOMPLETE' "$dir/out"; then
+    echo "a capture that finished was reported as cut short:"
+    cat "$dir/out"
+    exit 1
+  fi
+  assert_legs_armed "$dir/report" e2e-gate-fixture
+  rm -rf "$dir"
+}
+
+@test "a data-plane capture cut short by its backstop says so" {
+  # The collector names every read of its own that could not finish, which
+  # leaves the outer backstop here as the one way its leg can still die without
+  # a word -- and a truncated dataplane/ then reads exactly like a complete one
+  # that found little. The sibling previous-logs leg has reported this since it
+  # was added; this is the same discipline at the third leg.
+  #
+  # The backstop is simulated with a `timeout` on PATH that exits 124 rather
+  # than by making the collector overrun a real 600s bound. The call site
+  # cannot tell the difference: it sees a non-zero status from `timeout` and
+  # whatever had been written before the kill, which is the whole input to the
+  # behaviour under test.
+  dir=$(make_fixture_dir e2e-backstop-fixture.bats)
+  printf '#!/bin/sh\nexit 124\n' >"$dir/bin/timeout"
+  chmod +x "$dir/bin/timeout"
+  run_fixture "$dir" e2e-backstop-fixture.bats
+  # Positive control: the leg was armed and reached, so the assertion below is
+  # about what the leg said and not about the gate having skipped it.
+  grep -qF "$DATAPLANE_MARKER" "$dir/out"
+  grep -qF 'data-plane capture INCOMPLETE (exit 124)' "$dir/out"
+  rm -rf "$dir"
+}
+
+@test "a data-plane collector that is not there is not reported as a capture" {
+  # This leg is gated on kubectl alone, while the previous-logs leg beside it
+  # requires its collector to be executable and so does the Chainsaw caller.
+  # The asymmetry cost nothing while the status was discarded; now that a
+  # non-zero status prints "kept what landed in <dir>", a tree without the
+  # collector claims a partial capture in a directory nothing ever created.
+  dir=$(make_fixture_dir e2e-nocollector-fixture.bats)
+  # The runner resolves both collectors relative to its own path, so copying it
+  # somewhere without its siblings is what makes them absent -- nothing in the
+  # worktree is touched.
+  mkdir -p "$dir/hack"
+  cp "$RUNNER" "$dir/hack/cozytest.sh"
+  PATH="$dir/bin:$PATH" COZY_REPORT_DIR="$dir/report" \
+    "$dir/hack/cozytest.sh" "$dir/e2e-nocollector-fixture.bats" >"$dir/out" 2>&1 || true
+  # Positive controls: the fixture failed, so the handler ran, and the gate
+  # armed -- otherwise the absence below would be satisfied by nothing running.
+  grep -qF 'Test failed' "$dir/out"
+  [ -f "$dir/report/snapshots/e2e-nocollector-fixture/crust-gather.log" ]
+  if grep -qF 'data-plane capture INCOMPLETE' "$dir/out"; then
+    echo "a collector that was never there was reported as a capture cut short:"
+    cat "$dir/out"
+    exit 1
+  fi
+  rm -rf "$dir"
+}
+
+@test "a live cluster suite under an e2e directory keeps its captures" {
+  # The pre-Chainsaw suites under hack/e2e-apps/ used plain filenames. This
+  # fixture pins the directory-based guard so that layout retains captures if it
+  # returns, even though no live suite currently uses it.
+  dir=$(make_fixture_dir e2e-apps/plain-named-suite.bats)
+  run_fixture "$dir" e2e-apps/plain-named-suite.bats
+  grep -qF "$DATAPLANE_MARKER" "$dir/out"
+  assert_legs_armed "$dir/report" plain-named-suite
+  rm -rf "$dir"
+}
+
+@test "a unit suite failing does not arm the cluster captures" {
+  dir=$(make_fixture_dir plain-gate-fixture.bats)
+  run_fixture "$dir" plain-gate-fixture.bats
+  # The run must have failed, or "no captures" would be satisfied by "no test".
+  grep -qF 'Test failed' "$dir/out"
+  # Spelled as an if rather than `! grep ...`: `set -e` is specified to ignore a
+  # command whose status is inverted with `!`, so the negated form would report
+  # success even when the marker is present, which is the whole thing this test
+  # exists to catch.
+  if grep -qF "$DATAPLANE_MARKER" "$dir/out"; then
+    echo "cluster captures were armed for a unit suite"
+    exit 1
+  fi
+  assert_legs_disarmed "$dir/report" plain-gate-fixture
+  rm -rf "$dir"
+}
diff --git a/hack/cozytest-nonascii-title.bats b/hack/cozytest-nonascii-title.bats
new file mode 100644
index 0000000000..389d379438
--- /dev/null
+++ b/hack/cozytest-nonascii-title.bats
@@ -0,0 +1,60 @@
+#!/usr/bin/env bats
+# Guards that hack/cozytest.sh parses a @test title that is not ASCII.
+#
+# The runner reconstructs each test's function name by walking its title one
+# character at a time with awk's substr(). BSD awk aborts that walk on the first
+# multibyte byte ("towc: multibyte conversion failure") rather than returning it,
+# so a file carrying a non-ASCII @test title is never parsed and not one of its
+# tests runs -- silently, because the suite only reports that the runner errored.
+# Four hack/*.bats files carry such a title today; the byte scan is correct only
+# when the runner pins a single-byte (C) ctype for the parse.
+#
+# This is BSD-specific: GNU awk returns the byte and never aborts, so on the
+# Linux CI runner this guard passes whether or not the fix is present. It earns
+# its keep on a developer's macOS box, where the default UTF-8 locale is exactly
+# what triggers the abort -- the environment `make unit-tests` is meant to be
+# green in. The fixture is therefore run under an explicit UTF-8 ctype so the
+# byte scan is exercised the way that box exercises it; under a C ctype the scan
+# cannot abort and the guard would pass without proving anything.
+#
+# The outer tests run under Bats; their fixtures exercise cozytest itself.
+#
+# Run with: bats hack/cozytest-nonascii-title.bats
+
+load test_helper
+
+@test "cozytest.sh runs a test whose title contains a multibyte character" {
+  tmp=$(mktemp -d)
+
+  # Build the multibyte bytes at runtime so this file stays pure ASCII on disk:
+  # the runner parsing THIS file must not itself meet a byte the bug chokes on.
+  # U+2014 EM DASH (e2 80 94) plus U+00E9 (c3 a9), the same shapes the four
+  # real offenders carry.
+  emdash=$(printf '\342\200\224')
+  eacute=$(printf '\303\251')
+  title="promote body carries a caf${eacute} status line ${emdash} multibyte"
+
+  fixture="$tmp/nonascii.bats"
+  {
+    printf '@test "%s" {\n' "$title"
+    printf '  :\n'
+    printf '}\n'
+  } > "$fixture"
+
+  # A UTF-8 ctype makes BSD awk's per-character scan abort on the title unless the
+  # runner pins C for the parse. en_US.UTF-8 is present on macOS and typical CI;
+  # where no UTF-8 locale exists libc falls back to C, and there the bug cannot
+  # occur, so a pass is the correct answer rather than a false negative.
+  out=$(LC_ALL=en_US.UTF-8 COZYTEST_TRACE=0 hack/cozytest.sh "$fixture" 2>&1) || true
+
+  case "$out" in
+    *"Test OK: $title"*) ;;
+    *)
+      echo "cozytest.sh did not run the multibyte-titled test; its output was:" >&2
+      printf '%s\n' "$out" >&2
+      rm -rf "$tmp"
+      return 1
+      ;;
+  esac
+  rm -rf "$tmp"
+}
diff --git a/hack/cozytest-trace-switch.bats b/hack/cozytest-trace-switch.bats
new file mode 100644
index 0000000000..dfe797898c
--- /dev/null
+++ b/hack/cozytest-trace-switch.bats
@@ -0,0 +1,190 @@
+#!/usr/bin/env bats
+# -----------------------------------------------------------------------------
+# Behavioural tests for the COZYTEST_TRACE switch in hack/cozytest.sh.
+#
+# The runner streams every @test body's xtrace live. Across the unit suites that
+# was 233,444 of 238,794 lines in one job log, with the single failing assertion
+# at line 238,573, so `make unit-tests` now runs with the stream off. What makes
+# that safe is a single invariant: run_one tees the raw stream to $log and the
+# fail handler prints all of it for whichever test fails, so quiet mode drops
+# the output of PASSING tests only.
+#
+# That invariant fails SILENTLY. It is only exercised when a test fails, so a
+# green CI run proves nothing about it: a refactor of run_one's reader loop that
+# also broke the dump would ship, and would be discovered by whoever next needed
+# a red unit run diagnosed -- with no trace, having already lost the run. Hence
+# a suite whose fixtures fail on purpose.
+#
+# Both directions are pinned, and the verbose one is the positive control for
+# the quiet one: "no trace lines" is satisfied just as well by a harness where
+# nothing ran at all.
+#
+# awk-transform constraint (hack/cozytest.sh rewrites this file before sourcing
+# it, see the longer note in hack/cozytest-capture-gate.bats): a line beginning
+# `@test "` becomes a function header wherever it appears, heredocs included, so
+# a fixture written as a heredoc gets its own @test harvested into THIS suite.
+# The fixtures below are built with printf, which puts that text inside a format
+# string where no rule matches it. Titles must also stay distinctive in their
+# [A-Za-z0-9] run, which is all that survives into the function name.
+#
+# Run with: hack/cozytest.sh hack/cozytest-trace-switch.bats
+# -----------------------------------------------------------------------------
+
+load test_helper
+
+HACK_DIR="$(cd "$(dirname "${BATS_TEST_FILENAME:-$0}")" && pwd)"
+RUNNER="$HACK_DIR/cozytest.sh"
+REPO_ROOT="$(cd "$HACK_DIR/.." && pwd)"
+
+# Printed by the fixture from inside the test body. It reaches the job log by
+# exactly two routes, the live stream and the fail handler's dump, which is what
+# lets the quiet-mode test below tell those routes apart.
+MARKER='cozytest-trace-switch-fixture-marker'
+
+# $1 = `pass` or `fail`. The failing fixture exercises the dump path under test.
+#
+# Named without an e2e- prefix on purpose. That prefix is what arms the runner's
+# cluster captures (hack/cozytest-capture-gate.bats owns that gate), and a
+# fixture that tripped them would spend the capture timeouts on every test here.
+make_fixture() {
+  _dir=$(mktemp -d)
+  if [ "$1" = pass ]; then
+    printf '@test "fixture that passes and prints the marker" {\n  echo %s\n}\n' \
+      "$MARKER" >"$_dir/trace-fixture.bats"
+  else
+    printf '@test "fixture that prints the marker then fails" {\n  echo %s\n  false\n}\n' \
+      "$MARKER" >"$_dir/trace-fixture.bats"
+  fi
+  printf '%s' "$_dir"
+}
+
+# Output goes to a file rather than a variable, for the reason spelled out in
+# hack/cozytest-capture-gate.bats: these suites can run under `set -x`, and a
+# variable holding a fixture's output is expanded into the trace of whatever
+# reads it, printing the fixture's deliberate failure into the job log where it
+# reads as a real one.
+#
+# `env -u COZYTEST_TRACE` when $2 is empty, because the Makefile passes the
+# variable as a command prefix and that EXPORTS it: a nested runner started from
+# a suite that `make unit-tests` is itself running would inherit 0 and the
+# default would never be under test. Verified: `sh -c 'COZYTEST_TRACE=0 sh -c
+# printenv'` shows it in the grandchild.
+run_fixture() {
+  _fdir=$1 _mode=$2
+  if [ -z "$_mode" ]; then
+    env -u COZYTEST_TRACE "$RUNNER" "$_fdir/trace-fixture.bats" >"$_fdir/out" 2>&1 || true
+  else
+    COZYTEST_TRACE="$_mode" "$RUNNER" "$_fdir/trace-fixture.bats" >"$_fdir/out" 2>&1 || true
+  fi
+}
+
+count_streamed_marker_lines() {
+  # A live line has a [mm:ss] timestamp; the failure dump has the same marker
+  # without one. Keep the pattern ASCII-only so tracing this assertion does not
+  # put the runner's decorative UTF-8 prefix into its own raw log.
+  grep -cE '[[][0-9][0-9]:[0-9][0-9][]].*cozytest-trace-switch-fixture-marker' "$1" || true
+}
+
+@test "quiet mode streams no trace for a suite whose tests pass" {
+  dir=$(make_fixture pass)
+  run_fixture "$dir" 0
+  # Positive control first: the test has to have run, or the absence below is
+  # satisfied by an empty output.
+  grep -qF 'Test OK' "$dir/out"
+  n=$(count_streamed_marker_lines "$dir/out")
+  # Spelled as an if rather than `! grep`: `set -e` is specified to ignore a
+  # command whose status is inverted with `!`, which would make the assertion
+  # vacuous -- the exact shape this suite exists to catch elsewhere.
+  if [ "$n" -ne 0 ]; then
+    echo "quiet mode still streamed $n trace line(s)"
+    cat "$dir/out"
+    exit 1
+  fi
+  rm -rf "$dir"
+}
+
+@test "the unset default stays verbose so the e2e call sites keep their stream" {
+  # The positive control for the test above, and a guard in its own right: the
+  # e2e suites in packages/core/testing/Makefile invoke the runner without the
+  # variable, and for a long suite that stream is the only progress signal, and
+  # the only record at all when a step timeout kills the job before the fail
+  # handler can run. Flipping the default silently takes that away.
+  dir=$(make_fixture pass)
+  run_fixture "$dir" ''
+  grep -qF 'Test OK' "$dir/out"
+  n=$(count_streamed_marker_lines "$dir/out")
+  if [ "$n" -eq 0 ]; then
+    echo "the default is no longer verbose; e2e lost its live stream"
+    cat "$dir/out"
+    exit 1
+  fi
+  rm -rf "$dir"
+}
+
+@test "a failing test still dumps its whole trace when the stream is quiet" {
+  # The load-bearing invariant. Quiet mode is only defensible because this dump
+  # survives it, and nothing else in the tree exercises the failure path.
+  dir=$(make_fixture fail)
+  run_fixture "$dir" 0
+  grep -qF 'Test failed' "$dir/out"
+  grep -qF 'captured output' "$dir/out"
+  # The marker reaches the log by two routes and quiet mode closes one of them,
+  # so with no streamed copy present its appearance can only have come from the
+  # dump. That pairing is the assertion; either half alone is weaker.
+  n=$(count_streamed_marker_lines "$dir/out")
+  if [ "$n" -ne 0 ]; then
+    echo "expected no live trace in quiet mode, got $n line(s)"
+    exit 1
+  fi
+  grep -qF "$MARKER" "$dir/out"
+  # The xtrace itself, not just the echoed output: the dump is worth having
+  # because it carries the commands, and `+ false` is the failing one.
+  grep -qF '+ false' "$dir/out"
+  rm -rf "$dir"
+}
+
+@test "quiet mode still fails the run when a test fails" {
+  dir=$(make_fixture fail)
+  COZYTEST_TRACE=0 "$RUNNER" "$dir/trace-fixture.bats" >"$dir/out" 2>&1 && rc=0 || rc=$?
+  if [ "$rc" -eq 0 ]; then
+    echo "a failing suite exited 0 under quiet mode, so CI would go green on red"
+    exit 1
+  fi
+  rm -rf "$dir"
+}
+
+@test "quiet mode keeps the per test markers so a stuck test is still visible" {
+  # With the stream off these two lines are the only evidence of which test is
+  # in flight, which is what makes a hang diagnosable: a start with no matching
+  # end names the test that never returned.
+  dir=$(make_fixture pass)
+  run_fixture "$dir" 0
+  grep -qF 'Run test:' "$dir/out"
+  grep -qF 'Test OK:' "$dir/out"
+  rm -rf "$dir"
+}
+
+@test "the POSIX compatibility lane asks for the quiet runner" {
+  # Without this the 31MB job log comes back the first time somebody tidies the
+  # recipe, and every test above keeps passing while it happens.
+  grep -qE '^COZYTEST_TRACE \?= 0' "$REPO_ROOT/Makefile"
+  grep -qF 'COZYTEST_TRACE=$(COZYTEST_TRACE) "$(BATS_POSIX_SHELL)" hack/cozytest.sh' "$REPO_ROOT/Makefile"
+}
+
+@test "the e2e recipes do not silence their runner" {
+  # The other half of the design, and the half a well-meaning cleanup would
+  # break by making the two lanes consistent with each other.
+  # Matches an ASSIGNMENT, not any mention: documenting this design in a comment
+  # over there is expected and must not turn the guard red. The recipes are
+  # `docker exec ... sh -c '...'`, which does not carry host env either, so the
+  # variable structurally cannot reach those suites today -- this pins the
+  # recipe text so a future rewrite that does export it is caught.
+  e2e_mk="$REPO_ROOT/packages/core/testing/Makefile"
+  if grep -nE '^[^#]*COZYTEST_TRACE[[:space:]]*[:?+]?=' "$e2e_mk"; then
+    echo "an e2e recipe now sets COZYTEST_TRACE; those suites need the live stream"
+    exit 1
+  fi
+  # Positive control: the file does invoke the runner, so the absence above is
+  # about the variable and not about a moved call site.
+  grep -qF 'hack/cozytest.sh hack/e2e-' "$e2e_mk"
+}
diff --git a/hack/cozytest.sh b/hack/cozytest.sh
index a3955fd100..02a40f3834 100755
--- a/hack/cozytest.sh
+++ b/hack/cozytest.sh
@@ -9,6 +9,45 @@ TEST_FILE=${1:?Usage: ./cozytest.sh <file.bats> [pattern]}
 PATTERN=${2:-*}
 LINE='----------------------------------------------------------------'
 
+# Live per-line streaming of each test's xtrace and command output, prefixed
+# with a timestamp. Default on, because for a long e2e suite that stream is the
+# only progress signal, and the only record at all when a step timeout or a dead
+# runner kills the job before the fail handler below can dump anything.
+#
+# Set COZYTEST_TRACE=0 to keep only the per-test start/end lines. For a test that
+# RETURNS, nothing diagnostic is lost: run_one tees the raw stream to $log and
+# the fail handler prints all of it, so quiet mode drops the output of passing
+# tests only -- which by definition did not establish the result. On the unit
+# lane that is a ~40x cut (1338 tests: 239k lines/15M of which 98% was trace),
+# and it is why the Makefile's bats-posix-compat-tests target sets it.
+#
+# One exception, stated because it is the whole exposure quiet mode adds: the
+# fail handler runs only after the pipeline returns, and there is no INT/TERM
+# trap here, so a test killed rather than failed -- a hang reaped by the job's
+# timeout-minutes, a SIGKILLed process group -- never dumps $log at all. The
+# A start line with no matching end still names which test was in flight, but
+# under quiet mode its trace is gone rather than already printed.
+#
+# An INT/TERM trap that flushed the tail of $log is the obvious repair and it
+# does not work -- built, measured, reverted. POSIX sh defers a trap until the
+# current foreground command returns, so installing one stops the runner from
+# dying on the signal at all: a suite hung on `sleep 30` took 30s to exit with
+# the trap versus 2s under the default disposition. GitHub's cancellation
+# escalates INT, TERM, then KILL, so the deferred handler would be SIGKILLed
+# before it ever ran -- no dump, and the grace period spent waiting. Making it
+# work means running the test pipeline in the background and `wait`ing on it,
+# since `wait` is the interruptible one; that is surgery on the path every
+# suite in the repo takes, for a partial trace in a rare case.
+#
+# So the escape hatch stands instead: re-run that suite with COZYTEST_TRACE=1,
+# which for the unit lane costs 48s and needs no cluster. That asymmetry is
+# also why e2e keeps the stream on by default -- there, re-running is an hour
+# and a live cluster, so the record has to be written as it goes.
+#
+# Anything other than the literal 0 leaves the stream on, so a typo fails
+# open to the verbose behaviour rather than silently swallowing a suite.
+COZYTEST_TRACE=${COZYTEST_TRACE:-1}
+
 cols() { stty size 2>/dev/null | awk '{print $2}' || echo 80; }
 if [ -t 1 ]; then
   MAXW=$(( $(cols) - 12 )); [ "$MAXW" -lt 40 ] && MAXW=70
@@ -38,6 +77,7 @@ run_one() {
     )
     printf '__RC__%s\n' "$?"
   } 2>&1 | tee "$log" | while IFS= read -r line; do
+        if [ "$COZYTEST_TRACE" = 0 ]; then continue; fi
         case "$line" in
           '__RC__'*) : ;;
           '+ '*)   cmd=${line#'+ '}
@@ -53,7 +93,10 @@ run_one() {
         printf '┊[%02d:%02d] %s\n' $((now/60)) $((now%60)) "$out"
   done
 
-  rc=$(awk '/^__RC__/ {print substr($0,7)}' "$log" | tail -n1)
+  # LC_ALL=C so BSD awk scans the captured log byte-wise: a test whose trace or
+  # output carries a multibyte character would otherwise abort this scan ("towc:
+  # multibyte conversion failure") and leave the exit code unread.
+  rc=$(LC_ALL=C awk '/^__RC__/ {print substr($0,7)}' "$log" | tail -n1)
   [ -z "$rc" ] && rc=1
   now=$(( $(date +%s) - START ))
 
@@ -76,8 +119,179 @@ run_one() {
 # convert .bats -> shell-functions                                            #
 ###############################################################################
 TMP_SH=$(mktemp) || { echo "Failed to create temp file" >&2; exit 1; }
-trap 'rm -f "$TMP_SH"' EXIT
-awk '
+
+# Per-file lifecycle hook. cozytest.sh runs each .bats as a single invocation
+# and exit()s on the first failing @test, so this EXIT trap is the one place to:
+#   1. on failure, snapshot the HOST cluster with crust-gather BEFORE any cleanup,
+#      so each failed test keeps its own inspectable state instead of one
+#      end-of-suite dump;
+#   2. ALWAYS run the file's cozy_cleanup() if it defines one, so a test never
+#      leaks resources into the shared tenant-test namespace (left-behind PVCs
+#      otherwise exhaust the tenant quota and cascade-fail every later app).
+# cozy_cleanup is a plain shell function a .bats file may define — there are no
+# bats setup/teardown directives here, this runner only knows @test + bash.
+# NOTE: nested tenant clusters are NOT captured here. This trap runs in the
+# parent shell after the failing test subshell has exited and reaped its
+# port-forward, and crust-gather can only reach a tenant via that localhost
+# forward — so a test that creates tenant clusters (run-kubernetes.sh) captures
+# them from its OWN in-subshell EXIT trap, while the forward is still alive.
+COZY_REPORT_DIR="${COZY_REPORT_DIR:-_out/cozyreport}"
+# Which suites get the cluster captures below. They read cluster state, so they
+# belong to the e2e suites and to nothing else. `command -v kubectl` does not
+# tell the two apart: a unit runner has the binary and no cluster, so a red unit
+# test used to walk into the legs below on its way out.
+#
+# What that costs depends on how kubectl fails. Against an endpoint that refuses
+# immediately it is a second; against one that hangs -- an unreachable address, a
+# context left pointing at a torn-down cluster -- it was measured at ~28s for the
+# previous-logs leg, which self-bounds its pod list and so never reaches the 300s
+# ceiling set below it. The data-plane leg bounds its own reads as well, 28s for
+# a list and 20s for a single read, so it returns in tens of seconds rather than
+# holding its 600s ceiling. Dead waiting inside a job budget either way, for a
+# failure that should cost seconds.
+#
+# Where crust-gather is installed as well the bill stops being empty and starts
+# being wrong: that leg does not need a reachable cluster to be pointless, it
+# needs an ambient KUBECONFIG, and it can hold the trap for 390s -- its 360s
+# deadline plus the -k 30 kill grace -- snapshotting whatever cluster the
+# current context happens to name.
+#
+# The discriminator is the e2e- prefix, on the suite's own name or on the
+# directory holding it. At the top level the prefix is what the project already
+# sorts on: the Makefile builds BATS_UNIT_FILES as
+# $(filter-out hack/e2e-%.bats,$(wildcard hack/*.bats)), so a top-level e2e-*
+# suite is precisely one `make unit-tests` refuses to run and
+# packages/core/testing/Makefile runs against a live cluster instead.
+#
+# That wildcard is not recursive, so it says nothing about subdirectories, and
+# hack/e2e-apps/ historically held live-cluster suites whose own filenames
+# carried no prefix. Keep matching the directory so captures stay armed if that
+# layout returns; matching only the basename would silently disarm them. Neither
+# test claims every future live-cluster suite will be named this way -- these are
+# the only signals the runner has, and a suite outside both shapes gets no
+# captures.
+#
+# Deliberately not a reachability probe. Gating on "can I talk to an apiserver"
+# would disarm the captures in the case they exist for: a failing e2e run is
+# often one whose apiserver is degraded, and a probe answering "no" there would
+# skip the snapshot precisely when it is the evidence.
+case "$(basename "$TEST_FILE")" in
+  e2e-*) _cozy_cluster_captures=1 ;;
+  *)
+    case "$(basename "$(dirname "$TEST_FILE")")" in
+      e2e-*) _cozy_cluster_captures=1 ;;
+      *)     _cozy_cluster_captures=0 ;;
+    esac
+    ;;
+esac
+_cozy_on_exit() {
+  _rc=$?
+  if [ "$_rc" -ne 0 ]; then
+    _snap="$COZY_REPORT_DIR/snapshots/$(basename "$TEST_FILE" .bats)"
+    mkdir -p "$_snap" 2>/dev/null || true
+    # Previous-instance container logs for anything that crash-looped. `kubectl
+    # logs` shows only the current instance, so for a crash-looping pod the
+    # decisive evidence — the immediately preceding run — is reachable only via
+    # `--previous` and is lost once the kubelet garbage-collects that container.
+    # FIRST, ahead of both captures below: it is the cheapest leg and the only
+    # one whose subject is perishable. The kubelet retains one dead container
+    # per pod by default, so each further restart of a still-looping pod drops
+    # the instance we are here to read — and the snapshot leg alone can hold the
+    # trap for 390s. The other two captures read state that keeps.
+    if [ "$_cozy_cluster_captures" -eq 1 ] && command -v kubectl >/dev/null 2>&1 && [ -x "$(dirname "$0")/e2e-capture-previous-logs.sh" ]; then
+      _prev_rc=0
+      timeout -k 30 300 "$(dirname "$0")/e2e-capture-previous-logs.sh" \
+        "$_snap/previous-logs" "${COZY_TEST_NAMESPACE:-tenant-test}" 2>&1 || _prev_rc=$?
+      # A backstop that fires must say so, matching the crust-gather leg below.
+      # 300s sits above the ~270s worst case inside (a ~30s pod list plus up to
+      # 12 × 20s log reads), so it should not fire; if it does, a silently cut
+      # capture would read as a complete one listing fewer crash-loops than
+      # actually occurred. This handler's whole worst case is ~1350s (330 + 390
+      # + 630, each leg including its 30s kill grace) against a job capped at
+      # 215 minutes with no per-step timeout —
+      # deliberate, for the same reason recorded in hack/e2e-chainsaw/.chainsaw.yaml:
+      # a bounded, honest wait beats a kill that collects nothing.
+      if [ "$_prev_rc" -ne 0 ]; then
+        echo "» previous-instance capture INCOMPLETE (exit $_prev_rc); kept what landed in $_snap/previous-logs"
+      fi
+    fi
+    if [ "$_cozy_cluster_captures" -eq 1 ] && command -v crust-gather >/dev/null 2>&1; then
+      echo "» capturing crust-gather snapshot of failed $(basename "$TEST_FILE") -> $_snap"
+      # Bound with a timeout: crust-gather collect has hung indefinitely on a
+      # contended/degraded cluster (e.g. streaming logs from a crashlooping pod),
+      # wedging the whole test step for hours until the job-level cancel. 5 min is
+      # ample for a host snapshot; a partial capture (timeout exits 124, swallowed
+      # by `|| true`) still beats a multi-hour hang. -k 30 hard-kills if a blocked
+      # collect ignores the SIGTERM.
+      # --duration is crust-gather's own budget for the collection phase and
+      # defaults to 60s, which silently truncates a snapshot of a cluster this
+      # size: on elapse it abandons the collection and skips its finish step,
+      # leaving a partial tree with no indication that the rest is missing. Set
+      # it explicitly. The outer wall-clock must exceed it because crust-gather
+      # runs API discovery BEFORE that timer starts and that phase is unbounded
+      # — with an unhealthy aggregated APIService (the state a failed run is
+      # usually in) discovery alone can eat the whole budget before a single
+      # object is written.
+      # Output goes to a log inside the snapshot instead of /dev/null so
+      # "is this snapshot complete or truncated?" is answerable from the
+      # uploaded artifact rather than guessed, matching the Chainsaw catch.
+      _cg_rc=0
+      # --disable-additional-logs: the host-log leg spawns a privileged debug pod per
+      # node, which baseline PodSecurity rejects (403); its retry loop then burns the
+      # whole --duration and crust-gather exits 1. Skip it — it collects nothing here.
+      timeout -k 30 360 crust-gather collect --disable-additional-logs --duration 180s \
+        --exclude-kind Secret -f "$_snap/host" >"$_snap/crust-gather.log" 2>&1 || _cg_rc=$?
+      case "$_cg_rc" in
+        0) echo "» crust-gather host snapshot complete" ;;
+        124 | 137) echo "» crust-gather host snapshot TRUNCATED (wall-clock $_cg_rc); partial state kept, see $_snap/crust-gather.log" ;;
+        *) echo "» crust-gather host snapshot FAILED (exit $_cg_rc); see $_snap/crust-gather.log" ;;
+      esac
+    fi
+    # Diagnostic-only: capture the host->pod CNI data-plane state for any
+    # NotReady pod so the recurrent host->local-pod "connection refused"
+    # transient (rooted in our cilium+kube-ovn chaining:
+    # enable-host-legacy-routing + CNI InstallEndpointRoute:false, which
+    # delegates host->local-pod routing to kube-ovn/ovn0) can be root-caused
+    # from the uploaded artifact. crust-gather captures object state but not the
+    # node's L3 forwarding state. This NEVER affects the test outcome: every
+    # capture inside is time-boxed and `|| true`, the whole run is wrapped in a
+    # wall-clock backstop so it cannot stall the job, and the backstop's own
+    # status is read only to print a line. It no-ops when there are no affected
+    # pods or when kubectl/the tooling is absent.
+    # The `-x` check matches the previous-logs leg above and the Chainsaw
+    # caller, and it stopped being cosmetic once the status below is printed: a
+    # tree without the collector would otherwise report "INCOMPLETE (exit 127);
+    # kept what landed" about a directory nothing ever created.
+    if [ "$_cozy_cluster_captures" -eq 1 ] && command -v kubectl >/dev/null 2>&1 && [ -x "$(dirname "$0")/e2e-capture-dataplane.sh" ]; then
+      echo "» capturing host->pod data-plane for NotReady pods -> $_snap/dataplane"
+      _dp_rc=0
+      COZY_DATAPLANE_BUDGET=570 timeout -k 30 600 "$(dirname "$0")/e2e-capture-dataplane.sh" "$_snap/dataplane" 2>&1 || _dp_rc=$?
+      # Read, not propagated: the status still cannot change the job's outcome,
+      # it only gets a line. The collector names every read of its own that it
+      # could not finish, which leaves this backstop as the one remaining way
+      # for that leg to die silently -- and a truncated dataplane/ is otherwise
+      # indistinguishable from a complete one that found little. Same discipline
+      # as the previous-logs leg above, whose comment carries the arithmetic.
+      if [ "$_dp_rc" -ne 0 ]; then
+        echo "» data-plane capture INCOMPLETE (exit $_dp_rc); kept what landed in $_snap/dataplane"
+      fi
+    fi
+  fi
+  if command -v cozy_cleanup >/dev/null 2>&1; then
+    echo "» cozy_cleanup $(basename "$TEST_FILE" .bats)"
+    cozy_cleanup || true
+  fi
+  rm -f "$TMP_SH"
+}
+trap '_cozy_on_exit' EXIT
+# LC_ALL=C pins a single-byte ctype for the title scan below. It walks each title
+# one character at a time with substr(), and BSD awk aborts that walk on the first
+# multibyte byte ("towc: multibyte conversion failure") instead of returning it,
+# so a file with a non-ASCII @test title never parses and none of its tests run.
+# Under C every byte is its own character, which is all the scan needs: the title
+# is preserved verbatim for display and only the derived function name is mangled.
+# The run-selection pass below is pinned the same way so the two agree on names.
+LC_ALL=C awk '
   /^@test[[:space:]]+"/ {
     line  = substr($0, index($0, "\"") + 1)
     title = substr(line, 1, index(line, "\"") - 1)
@@ -100,13 +314,23 @@ awk '
 ' "$TEST_FILE" > "$TMP_SH"
 
 [ -f "$TMP_SH" ] || { echo "Failed to generate test functions" >&2; exit 1; }
+
+# Compatibility with unit files shared with Bats. Only adjacent .bash helpers
+# are supported; cozytest already enables nounset when it runs a test body.
+load() {
+  _lib="$(dirname "$TEST_FILE")/$1.bash"
+  [ -f "$_lib" ] || { echo "load: no such helper: $_lib" >&2; return 1; }
+  # shellcheck disable=SC1090
+  . "$_lib"
+}
+
 # shellcheck disable=SC1090
 . "$TMP_SH"
 
 ###############################################################################
 # run selected tests                                                          #
 ###############################################################################
-awk -v pat="$PATTERN" '
+LC_ALL=C awk -v pat="$PATTERN" '
   /^### / {
     title = substr($0, 5)
     name = "test_"
diff --git a/hack/downstream-trigger-map.bats b/hack/downstream-trigger-map.bats
new file mode 100644
index 0000000000..c5ebf6af3c
--- /dev/null
+++ b/hack/downstream-trigger-map.bats
@@ -0,0 +1,154 @@
+#!/usr/bin/env bats
+# Guards the "Downstream Repositories" trigger map in docs/agents/contributing.md.
+#
+# The map tells a contributor which change in this repo forces a follow-up in a
+# satellite repository. Each trigger names a file on this side: hack/update-crd.sh,
+# packages/core/platform/values.yaml, and so on. Rename one of those and the map
+# keeps confidently pointing at a path that no longer exists, from inside the PR
+# template, to every reader. The repository list is deliberately not restated here
+# — it would be one more copy to drift; the map and the PR template are the two
+# sources, and the tests below hold them to each other.
+#
+# The three tests pin, in order: every in-repo path the map cites to a file that
+# exists; the workflow guarantee that Bats contracts run on every docs-only PR;
+# and the map and the PR-template checklist to the same repository list, so a
+# repository cannot be listed in one and forgotten in the other.
+#
+# WHAT THIS DOES NOT CHECK, so nobody mistakes a green tick for a correct map:
+#
+#   * Whether a trigger is TRUE. "Change X here and Y breaks over there" is a
+#     claim about a satellite repo. Verifying it needs that repo checked out at
+#     a known ref, which this suite deliberately does not do: a unit test must
+#     not depend on the network or on six sibling clones. A trigger can cite a
+#     path that exists here and still describe a coupling that is nonsense.
+#   * Anything on the satellite side. A file named there (its Makefile, its
+#     scripts/, its playbooks) is not reachable from this repo and is not
+#     validated. Those names are exactly where the map is most likely to rot.
+#   * Whether the map is COMPLETE. Deleting a whole trigger, or a whole block of
+#     them, passes: the repository-list test compares section headings, not bodies.
+#   * A path written without backticks. Extraction keys off `code spans`, which
+#     is the section's convention; a lone unquoted path slips through. Stripping
+#     the backticks wholesale does fail, via the anti-vacuum guard below.
+#
+# In short: this catches a rename on THIS side, which is the cheap half. The
+# expensive half — is the coupling real, and is it still real over there — stays
+# a human's job, and reviewers should not assume CI did it for them.
+#
+# A docs-only PR skips builds and E2E, but the `checks` job still runs the Bats
+# lane. Otherwise editing this map, or another document audited by a unit
+# contract, would exempt the changed input from its own guard.
+
+load test_helper
+
+REPO_ROOT="$(cd "$(dirname "${BATS_TEST_FILENAME:-$0}")/.." && pwd)"
+MAP_FILE="$REPO_ROOT/docs/agents/contributing.md"
+TEMPLATE_FILE="$REPO_ROOT/.github/PULL_REQUEST_TEMPLATE.md"
+
+# Body of the "## Downstream Repositories" section, up to the next h2.
+map_section() {
+  awk '/^## Downstream Repositories$/ { inside = 1; next }
+       /^## / { inside = 0 }
+       inside' "$MAP_FILE"
+}
+
+@test "every in-repo path cited by the downstream trigger map exists" {
+  [ -f "$MAP_FILE" ] || { echo "missing $MAP_FILE" >&2; exit 1; }
+
+  section="$(map_section)"
+  [ -n "$section" ] || { echo "Could not locate the '## Downstream Repositories' section in $MAP_FILE" >&2; exit 1; }
+
+  # Backticked tokens rooted at a top-level directory of THIS repo. Satellite
+  # paths cited by the map (scripts/package.mk, content/en/docs/...) do not match
+  # these roots and so fall out. Note this is a heuristic, not a guarantee: a
+  # satellite repo has its own packages/ tree, so a backticked path from over
+  # there that happens to share a root would be checked against this tree.
+  # A trailing slash is prose, not a distinct path: `packages/apps/` and
+  # `packages/apps` are the same anchor and would otherwise both inflate the count.
+  paths="$(printf '%s\n' "$section" \
+    | grep -o '`[^`]*`' \
+    | tr -d '`' \
+    | grep -E '^(hack|packages|cmd|api|internal|pkg|\.github)/' \
+    | sed 's#/$##' \
+    | sort -u)"
+
+  # Guard against a vacuous pass: if the extraction breaks, or the section is
+  # reworded so it no longer cites paths, this test must fail loudly rather than
+  # silently verify nothing. The floor sits well under the real count (28 as of
+  # writing) because the map legitimately shrinks too, and a red build should not
+  # send the reader hunting for a bug that is really a deleted section.
+  count="$(printf '%s\n' "$paths" | grep -c . || true)"
+  [ "$count" -ge 20 ] || {
+    echo "Extracted only $count in-repo path(s) from the trigger map; expected at least 20." >&2
+    echo "Either the extraction broke and this test is verifying nothing, or the map genuinely" >&2
+    echo "shrank - if a downstream repository went away, lower this floor deliberately." >&2
+    exit 1
+  }
+
+  missing=""
+  for path in $paths; do
+    # A placeholder segment (<name>) stands for any package, so match it as a glob.
+    pattern="$(printf '%s' "$path" | sed 's/<[^>]*>/*/g')"
+    # Unquoted on purpose: the shell must expand the glob. No match => ls fails.
+    if ! (cd "$REPO_ROOT" && ls -d $pattern) >/dev/null 2>&1; then
+      missing="$missing $path"
+    fi
+  done
+
+  if [ -n "$missing" ]; then
+    echo "The downstream trigger map in docs/agents/contributing.md cites paths that do not exist:" >&2
+    for path in $missing; do echo "  - $path" >&2; done
+    echo "Fix: update the map to the new path, or drop the trigger if it no longer applies." >&2
+    echo "The map is read by contributors from inside the PR template; a stale path there sends them to a dead end." >&2
+    exit 1
+  fi
+
+  echo "All $count in-repo path(s) cited by the trigger map exist"
+}
+
+@test "the workflow runs Bats contracts for docs-only changes" {
+  WORKFLOW="$REPO_ROOT/.github/workflows/pull-requests.yaml"
+  [ -f "$WORKFLOW" ] || { echo "missing $WORKFLOW" >&2; exit 1; }
+
+  job_if=$(yq -r '.jobs.checks.if' "$WORKFLOW")
+  code_if=$(yq -r '.jobs.checks.steps[] | select(.name == "Run unit and controller tests") | .if' "$WORKFLOW")
+  docs_if=$(yq -r '.jobs.checks.steps[] | select(.name == "Run Bats unit tests for docs-only changes") | .if' "$WORKFLOW")
+  docs_run=$(yq -r '.jobs.checks.steps[] | select(.name == "Run Bats unit tests for docs-only changes") | .run' "$WORKFLOW")
+  code_run=$(yq -r '.jobs.checks.steps[] | select(.name == "Run unit and controller tests") | .run' "$WORKFLOW")
+
+  [ "$job_if" = "!contains(github.event.pull_request.labels.*.name, 'release')" ]
+  [ "$code_if" = "needs.plan.outputs.code == 'true'" ]
+  [ "$docs_if" = "needs.plan.outputs.code == 'false'" ]
+  [ "$docs_run" = 'make bats-unit-tests' ]
+  [ "$code_run" = 'make unit-tests test-controllers test-controllers-envtest -j4 -k --output-sync=target' ]
+}
+
+@test "the trigger map and the PR-template checklist list the same repositories" {
+  [ -f "$TEMPLATE_FILE" ] || { echo "missing $TEMPLATE_FILE" >&2; exit 1; }
+
+  # Checklist lines look like: - [ ] [cozystack/website](https://...) - follow-up:
+  template_repos="$(grep -oE '^- \[ \] \[cozystack/[a-z0-9.-]+\]' "$TEMPLATE_FILE" \
+    | grep -oE 'cozystack/[a-z0-9.-]+' \
+    | sort -u)"
+
+  # Map headings look like: ### cozystack/website
+  map_repos="$(map_section \
+    | grep -oE '^### cozystack/[a-z0-9.-]+' \
+    | grep -oE 'cozystack/[a-z0-9.-]+' \
+    | sort -u)"
+
+  template_count="$(printf '%s\n' "$template_repos" | grep -c . || true)"
+  [ "$template_count" -ge 1 ] || { echo "Found no cozystack/* checklist entries in $TEMPLATE_FILE - extraction is broken" >&2; exit 1; }
+
+  if [ "$template_repos" != "$map_repos" ]; then
+    echo "The PR-template checklist and the trigger map disagree on which repositories are downstream." >&2
+    echo "In the checklist (.github/PULL_REQUEST_TEMPLATE.md):" >&2
+    printf '%s\n' "$template_repos" | sed 's/^/  /' >&2
+    echo "In the map (docs/agents/contributing.md, '### cozystack/<repo>' headings):" >&2
+    printf '%s\n' "$map_repos" | sed 's/^/  /' >&2
+    echo "Fix: add the repository to both, or remove it from both." >&2
+    echo "A repository listed in only one of them gets ticked with no guidance, or documented with no box to tick." >&2
+    exit 1
+  fi
+
+  echo "Checklist and trigger map agree on $template_count repositories"
+}
diff --git a/hack/e2e-apps/backup.bats.disabled b/hack/e2e-apps/backup.bats.disabled
deleted file mode 100755
index 0a5c13d963..0000000000
--- a/hack/e2e-apps/backup.bats.disabled
+++ /dev/null
@@ -1,226 +0,0 @@
-#!/usr/bin/env bats
-
-# Test variables - stored for teardown
-TEST_NAMESPACE='tenant-test'
-TEST_BUCKET_NAME='test-backup-bucket'
-TEST_VM_NAME='test-backup-vm'
-TEST_BACKUPJOB_NAME='test-backup-job'
-
-teardown() {
-  # Clean up resources (runs even if test fails)
-  namespace="${TEST_NAMESPACE}"
-  bucket_name="${TEST_BUCKET_NAME}"
-  vm_name="${TEST_VM_NAME}"
-  backupjob_name="${TEST_BACKUPJOB_NAME}"
-  
-  # Clean up port-forward if still running
-  pkill -f "kubectl.*port-forward.*seaweedfs-s3" 2>/dev/null || true
-  
-  # Clean up Velero resources in cozy-velero namespace
-  # Find Velero backup by pattern matching namespace-backupjob
-  for backup in $(kubectl -n cozy-velero get backups.velero.io -o jsonpath='{.items[*].metadata.name}' 2>/dev/null || true); do
-    if echo "$backup" | grep -q "^${namespace}-${backupjob_name}-"; then
-      kubectl -n cozy-velero delete backups.velero.io ${backup} --wait=false 2>/dev/null || true
-    fi
-  done
-  
-  # Clean up BackupStorageLocation and VolumeSnapshotLocation (named: namespace-backupjob)
-  BSL_NAME="${namespace}-${backupjob_name}"
-  kubectl -n cozy-velero delete backupstoragelocations.velero.io ${BSL_NAME} --wait=false 2>/dev/null || true
-  kubectl -n cozy-velero delete volumesnapshotlocations.velero.io ${BSL_NAME} --wait=false 2>/dev/null || true
-  
-  # Clean up Velero credentials secret
-  SECRET_NAME="backup-${namespace}-${backupjob_name}-s3-credentials"
-  kubectl -n cozy-velero delete secret ${SECRET_NAME} --wait=false 2>/dev/null || true
-  
-  # Clean up BackupJob
-  kubectl -n ${namespace} delete backupjob ${backupjob_name} --wait=false 2>/dev/null || true
-  
-  # Clean up Virtual Machine
-  kubectl -n ${namespace} delete virtualmachines.apps.cozystack.io ${vm_name} --wait=false 2>/dev/null || true
-  
-  # Clean up Bucket
-  kubectl -n ${namespace} delete bucket.apps.cozystack.io ${bucket_name} --wait=false 2>/dev/null || true
-
-  # Clean up temporary files
-  rm -f /tmp/bucket-backup-credentials.json
-}
-
-print_log() {
-  echo "# $1" >&3
-}
-
-@test "Create Backup for Virtual Machine" {
-  # Test variables
-  bucket_name="${TEST_BUCKET_NAME}"
-  vm_name="${TEST_VM_NAME}"
-  backupjob_name="${TEST_BACKUPJOB_NAME}"
-  namespace="${TEST_NAMESPACE}"
-
-  print_log "Step 0:Ensure BackupJob and Velero strategy CRDs are installed"
-  kubectl apply -f packages/system/backup-controller/definitions/backups.cozystack.io_backupjobs.yaml
-  kubectl apply -f packages/system/backupstrategy-controller/definitions/strategy.backups.cozystack.io_veleroes.yaml
-  # Wait for CRDs to be ready
-  kubectl wait --for condition=established --timeout=30s crd backupjobs.backups.cozystack.io
-  kubectl wait --for condition=established --timeout=30s crd veleroes.strategy.backups.cozystack.io
-  
-  # Ensure velero-strategy-default resource exists
-  kubectl apply -f packages/system/backup-controller/templates/strategy.yaml
-
-  print_log "Step 1: Create the bucket resource"
-  kubectl apply -f - <<EOF
-apiVersion: apps.cozystack.io/v1alpha1
-kind: Bucket
-metadata:
-  name: ${bucket_name}
-  namespace: ${namespace}
-spec: {}
-EOF
-
-  print_log "Wait for the bucket to be ready"
-  kubectl -n ${namespace} wait hr bucket-${bucket_name} --timeout=100s --for=condition=ready
-  kubectl -n ${namespace} wait bucketclaims.objectstorage.k8s.io bucket-${bucket_name} --timeout=300s --for=jsonpath='{.status.bucketReady}'=true
-  kubectl -n ${namespace} wait bucketaccesses.objectstorage.k8s.io bucket-${bucket_name} --timeout=300s --for=jsonpath='{.status.accessGranted}'=true
-
-  # Get bucket credentials for later S3 verification
-  kubectl -n ${namespace} get secret bucket-${bucket_name} -ojsonpath='{.data.BucketInfo}' | base64 -d > /tmp/bucket-backup-credentials.json
-  ACCESS_KEY=$(jq -r '.spec.secretS3.accessKeyID' /tmp/bucket-backup-credentials.json)
-  SECRET_KEY=$(jq -r '.spec.secretS3.accessSecretKey' /tmp/bucket-backup-credentials.json)
-  BUCKET_NAME=$(jq -r '.spec.bucketName' /tmp/bucket-backup-credentials.json)
-
-  print_log "Step 2: Create the Virtual Machine"
-  kubectl apply -f - <<EOF
-apiVersion: apps.cozystack.io/v1alpha1
-kind: VirtualMachine
-metadata:
-  name: ${vm_name}
-  namespace: ${namespace}
-spec:
-  external: false
-  externalMethod: PortList
-  externalPorts:
-  - 22
-  instanceType: "u1.medium"
-  instanceProfile: ubuntu
-  systemDisk:
-    image: ubuntu
-    storage: 5Gi
-    storageClass: replicated
-  gpus: []
-  resources: {}
-  sshKeys:
-  - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPht0dPk5qQ+54g1hSX7A6AUxXJW5T6n/3d7Ga2F8gTF
-    test@test
-  cloudInit: |
-    #cloud-config
-    users:
-      - name: test
-        shell: /bin/bash
-        sudo: ['ALL=(ALL) NOPASSWD: ALL']
-        groups: sudo
-        ssh_authorized_keys:
-          - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPht0dPk5qQ+54g1hSX7A6AUxXJW5T6n/3d7Ga2F8gTF test@test
-  cloudInitSeed: ""
-EOF
-
-  print_log "Wait for VM to be ready"
-  sleep 5
-  kubectl -n ${namespace} wait hr virtual-machine-${vm_name} --timeout=10s --for=condition=ready
-  kubectl -n ${namespace} wait dv virtual-machine-${vm_name} --timeout=150s --for=condition=ready
-  kubectl -n ${namespace} wait pvc virtual-machine-${vm_name} --timeout=100s --for=jsonpath='{.status.phase}'=Bound
-  kubectl -n ${namespace} wait vm virtual-machine-${vm_name} --timeout=100s --for=condition=ready
-
-  print_log "Step 3: Create BackupJob"
-  kubectl apply -f - <<EOF
-apiVersion: backups.cozystack.io/v1alpha1
-kind: BackupJob
-metadata:
-  name: ${backupjob_name}
-  namespace: ${namespace}
-  labels:
-    backups.cozystack.io/triggered-by: e2e-test
-spec:
-  applicationRef:
-    apiGroup: apps.cozystack.io
-    kind: VirtualMachine
-    name: ${vm_name}
-  storageRef:
-    apiGroup: apps.cozystack.io
-    kind: Bucket
-    name: ${bucket_name}
-  strategyRef:
-    apiGroup: strategy.backups.cozystack.io
-    kind: Velero
-    name: velero-strategy-default
-EOF
-
-  print_log "Wait for BackupJob to start"
-  kubectl -n ${namespace} wait backupjob ${backupjob_name} --timeout=60s --for=jsonpath='{.status.phase}'=Running
-
-  print_log "Wait for BackupJob to complete"
-  kubectl -n ${namespace} wait backupjob ${backupjob_name} --timeout=300s --for=jsonpath='{.status.phase}'=Succeeded
-
-  print_log "Verify BackupJob status"
-  PHASE=$(kubectl -n ${namespace} get backupjob ${backupjob_name} -o jsonpath='{.status.phase}')
-  [ "$PHASE" = "Succeeded" ]
-
-  # Verify BackupJob has a backupRef
-  BACKUP_REF=$(kubectl -n ${namespace} get backupjob ${backupjob_name} -o jsonpath='{.status.backupRef.name}')
-  [ -n "$BACKUP_REF" ]
-
-  # Find the Velero backup by searching for backups matching the namespace-backupjob pattern
-  # Format: namespace-backupjob-timestamp
-  VELERO_BACKUP_NAME=""
-  VELERO_BACKUP_PHASE=""
-  
-  print_log "Wait a bit for the backup to be created and appear in the API"
-  sleep 30
-  
-  # Find backup by pattern matching namespace-backupjob
-  for backup in $(kubectl -n cozy-velero get backups.velero.io -o jsonpath='{.items[*].metadata.name}' 2>/dev/null); do
-    if echo "$backup" | grep -q "^${namespace}-${backupjob_name}-"; then
-      VELERO_BACKUP_NAME=$backup
-      VELERO_BACKUP_PHASE=$(kubectl -n cozy-velero get backups.velero.io $backup -o jsonpath='{.status.phase}' 2>/dev/null || echo "")
-      break
-    fi
-  done
-
-  print_log "Verify Velero Backup was found"
-  [ -n "$VELERO_BACKUP_NAME" ]
-  
-  echo '# Wait for Velero Backup to complete' >&3
-  until kubectl -n cozy-velero get backups.velero.io ${VELERO_BACKUP_NAME} -o jsonpath='{.status.phase}' | grep -q 'Completed\|Failed'; do
-    sleep 5
-  done
-
-  print_log "Verify Velero Backup is Completed"
-  timeout 90 sh -ec "until [ \"\$(kubectl -n cozy-velero get backups.velero.io ${VELERO_BACKUP_NAME} -o jsonpath='{.status.phase}' 2>/dev/null)\" = \"Completed\" ]; do sleep 30; done"
-  
-  # Final verification
-  VELERO_BACKUP_PHASE=$(kubectl -n cozy-velero get backups.velero.io ${VELERO_BACKUP_NAME} -o jsonpath='{.status.phase}' 2>/dev/null || echo "")
-  [ "$VELERO_BACKUP_PHASE" = "Completed" ]
-
-  print_log "Step 4: Verify S3 has backup data"
-  # Start port-forwarding to S3 service (with timeout to keep it alive)
-  bash -c 'timeout 100s kubectl port-forward service/seaweedfs-s3 -n tenant-root 8333:8333 > /dev/null 2>&1 &'
-
-  # Wait for port-forward to be ready
-  timeout 30 sh -ec "until nc -z localhost 8333; do sleep 1; done"
-
-  # Wait a bit for backup data to be written to S3
-  sleep 30
-  
-  # Set up MinIO client with insecure flag (use environment variable for all commands)
-  export MC_INSECURE=1
-  mc alias set local https://localhost:8333 $ACCESS_KEY $SECRET_KEY
-
-  # Verify backup directory exists in S3
-  BACKUP_PATH="${BUCKET_NAME}/backups/${VELERO_BACKUP_NAME}"
-  mc ls local/${BACKUP_PATH}/ 2>/dev/null
-  [ $? -eq 0 ]
-  
-  # Verify backup files exist (at least metadata files)
-  BACKUP_FILES=$(mc ls local/${BACKUP_PATH}/ 2>/dev/null | wc -l || echo "0")
-  [ "$BACKUP_FILES" -gt "0" ]
-}
-
diff --git a/hack/e2e-apps/bucket.bats b/hack/e2e-apps/bucket.bats
deleted file mode 100644
index 9fd127ee9f..0000000000
--- a/hack/e2e-apps/bucket.bats
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/usr/bin/env bats
-
-@test "Create and Verify Seeweedfs Bucket" {
-  # Create the bucket resource with readwrite and readonly users
-  name='test'
-  kubectl -n tenant-test delete bucket.apps.cozystack.io $name --ignore-not-found --timeout=2m || true
-  pkill -f "port-forward.*8333:" 2>/dev/null || true
-  kubectl apply -f - <<EOF
-apiVersion: apps.cozystack.io/v1alpha1
-kind: Bucket
-metadata:
-  name: ${name}
-  namespace: tenant-test
-spec:
-  users:
-    admin: {}
-    viewer:
-      readonly: true
-EOF
-
-  # Wait for the bucket to be ready
-  kubectl -n tenant-test wait hr bucket-${name} --timeout=5m --for=condition=ready
-  timeout 60 sh -ec "until kubectl -n tenant-test get bucketclaims.objectstorage.k8s.io bucket-${name} >/dev/null 2>&1; do sleep 2; done"
-  kubectl -n tenant-test wait bucketclaims.objectstorage.k8s.io bucket-${name} --timeout=300s --for=jsonpath='{.status.bucketReady}'
-  timeout 60 sh -ec "until kubectl -n tenant-test get bucketaccesses.objectstorage.k8s.io bucket-${name}-admin >/dev/null 2>&1; do sleep 2; done"
-  kubectl -n tenant-test wait bucketaccesses.objectstorage.k8s.io bucket-${name}-admin --timeout=300s --for=jsonpath='{.status.accessGranted}'
-  timeout 60 sh -ec "until kubectl -n tenant-test get bucketaccesses.objectstorage.k8s.io bucket-${name}-viewer >/dev/null 2>&1; do sleep 2; done"
-  kubectl -n tenant-test wait bucketaccesses.objectstorage.k8s.io bucket-${name}-viewer --timeout=300s --for=jsonpath='{.status.accessGranted}'
-
-  # Get admin (readwrite) credentials
-  kubectl -n tenant-test get secret bucket-${name}-admin -ojsonpath='{.data.BucketInfo}' | base64 -d > bucket-admin-credentials.json
-  ADMIN_ACCESS_KEY=$(jq -r '.spec.secretS3.accessKeyID' bucket-admin-credentials.json)
-  ADMIN_SECRET_KEY=$(jq -r '.spec.secretS3.accessSecretKey' bucket-admin-credentials.json)
-  BUCKET_NAME=$(jq -r '.spec.bucketName' bucket-admin-credentials.json)
-
-  # Get viewer (readonly) credentials
-  kubectl -n tenant-test get secret bucket-${name}-viewer -ojsonpath='{.data.BucketInfo}' | base64 -d > bucket-viewer-credentials.json
-  VIEWER_ACCESS_KEY=$(jq -r '.spec.secretS3.accessKeyID' bucket-viewer-credentials.json)
-  VIEWER_SECRET_KEY=$(jq -r '.spec.secretS3.accessSecretKey' bucket-viewer-credentials.json)
-
-  # Start port-forwarding
-  bash -c 'timeout 100s kubectl port-forward service/seaweedfs-s3 -n tenant-root 8333:8333 > /dev/null 2>&1 &'
-
-  # Wait for port-forward to be ready
-  timeout 30 sh -ec 'until nc -z localhost 8333; do sleep 1; done'
-
-  # --- Test readwrite user (admin) ---
-  mc alias set rw-user https://localhost:8333 $ADMIN_ACCESS_KEY $ADMIN_SECRET_KEY --insecure
-
-  # Admin can upload
-  echo "readwrite test" > /tmp/rw-test.txt
-  mc cp --insecure /tmp/rw-test.txt rw-user/$BUCKET_NAME/rw-test.txt
-
-  # Admin can list
-  mc ls --insecure rw-user/$BUCKET_NAME/rw-test.txt
-
-  # Admin can download
-  mc cp --insecure rw-user/$BUCKET_NAME/rw-test.txt /tmp/rw-test-download.txt
-
-  # --- Test readonly user (viewer) ---
-  mc alias set ro-user https://localhost:8333 $VIEWER_ACCESS_KEY $VIEWER_SECRET_KEY --insecure
-
-  # Viewer can list
-  mc ls --insecure ro-user/$BUCKET_NAME/rw-test.txt
-
-  # Viewer can download
-  mc cp --insecure ro-user/$BUCKET_NAME/rw-test.txt /tmp/ro-test-download.txt
-
-  # Viewer cannot upload (must fail with Access Denied)
-  echo "readonly test" > /tmp/ro-test.txt
-  ! mc cp --insecure /tmp/ro-test.txt ro-user/$BUCKET_NAME/ro-test.txt
-
-  # --- Cleanup ---
-  mc rm --insecure rw-user/$BUCKET_NAME/rw-test.txt
-  kubectl -n tenant-test delete bucket.apps.cozystack.io ${name}
-}
diff --git a/hack/e2e-apps/clickhouse.bats b/hack/e2e-apps/clickhouse.bats
deleted file mode 100644
index 72400867ad..0000000000
--- a/hack/e2e-apps/clickhouse.bats
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/usr/bin/env bats
-
-@test "Create DB ClickHouse" {
-  name='test'
-  kubectl -n tenant-test delete clickhouse.apps.cozystack.io $name --ignore-not-found --timeout=2m || true
-  kubectl apply -f- <<EOF
-apiVersion: apps.cozystack.io/v1alpha1
-kind: ClickHouse
-metadata:
-  name: $name
-  namespace: tenant-test
-spec:
-  size: 10Gi
-  logStorageSize: 2Gi
-  shards: 1
-  replicas: 2
-  storageClass: ""
-  logTTL: 15
-  users:
-    testuser:
-      password: xai7Wepo
-  backup:
-    enabled: false
-    s3Region: us-east-1
-    s3Bucket: s3.example.org/clickhouse-backups
-    schedule: "0 2 * * *"
-    cleanupStrategy: "--keep-last=3 --keep-daily=3 --keep-within-weekly=1m"
-    s3AccessKey: oobaiRus9pah8PhohL1ThaeTa4UVa7gu
-    s3SecretKey: ju3eum4dekeich9ahM1te8waeGai0oog
-    resticPassword: ChaXoveekoh6eigh4siesheeda2quai0
-  clickhouseKeeper:
-    enabled: true
-    resourcesPreset: "micro"
-    size: "1Gi"
-  resources: {}
-  resourcesPreset: "nano"
-EOF
-  # Wait for the operator to materialise the HelmRelease before kubectl wait
-  # kicks in (kubectl wait errors immediately if the object does not exist yet).
-  timeout 60 sh -ec "until kubectl -n tenant-test get hr clickhouse-$name >/dev/null 2>&1; do sleep 2; done"
-  kubectl -n tenant-test wait hr clickhouse-$name --timeout=5m --for=condition=ready
-  timeout 180 sh -ec "until kubectl -n tenant-test get svc chendpoint-clickhouse-$name -o jsonpath='{.spec.ports[*].port}' | grep -q '8123 9000'; do sleep 10; done"
-  timeout 60 sh -ec "until kubectl -n tenant-test get statefulset.apps/chi-clickhouse-$name-clickhouse-0-0 >/dev/null 2>&1; do sleep 2; done"
-  kubectl -n tenant-test wait statefulset.apps/chi-clickhouse-$name-clickhouse-0-0 --timeout=120s --for=jsonpath='{.status.replicas}'=1
-  timeout 80 sh -ec "until kubectl -n tenant-test get endpoints chi-clickhouse-$name-clickhouse-0-0 -o jsonpath='{.subsets[*].addresses[*].ip}' | grep -q '[0-9]'; do sleep 10; done"
-  timeout 100 sh -ec "until kubectl -n tenant-test get svc chi-clickhouse-$name-clickhouse-0-0 -o jsonpath='{.spec.ports[*].port}' | grep -q '9000 8123 9009'; do sleep 10; done"
-  timeout 80 sh -ec "until kubectl -n tenant-test get sts chi-clickhouse-$name-clickhouse-0-1 ; do sleep 10; done"
-  kubectl -n tenant-test wait statefulset.apps/chi-clickhouse-$name-clickhouse-0-1 --timeout=140s --for=jsonpath='{.status.replicas}'=1
-  kubectl -n tenant-test delete clickhouse $name
-}
diff --git a/hack/e2e-apps/etcd.bats b/hack/e2e-apps/etcd.bats
deleted file mode 100644
index 7dcfd73fac..0000000000
--- a/hack/e2e-apps/etcd.bats
+++ /dev/null
@@ -1,113 +0,0 @@
-#!/usr/bin/env bats
-
-# The etcd chart pins the Helm release name to 'etcd' via
-# packages/extra/etcd/templates/check-release-name.yaml, so every test
-# must apply its Etcd with metadata.name: etcd. setup() clears any
-# prior run so tests remain independent despite the singleton name.
-
-setup() {
-  kubectl -n tenant-test delete etcd.apps.cozystack.io --all --ignore-not-found --timeout=2m
-  # HelmRelease teardown is async relative to the CR deletion above; wait for
-  # downstream resources so the next test starts from a clean state.
-  kubectl -n tenant-test wait hr/etcd --for=delete --timeout=2m --ignore-not-found
-  kubectl -n tenant-test wait secret/etcd-s3-creds --for=delete --timeout=1m --ignore-not-found
-  kubectl -n tenant-test wait etcdbackupschedule.etcd.aenix.io/etcd --for=delete --timeout=1m --ignore-not-found
-}
-
-dump_diagnostics() {
-  echo "# --- diagnostics ---" >&3
-  kubectl -n tenant-test get etcdcluster,etcdbackupschedule,cronjob -o wide >&3 2>&1 || true
-  kubectl -n tenant-test describe etcdbackupschedule etcd >&3 2>&1 || true
-  kubectl -n cozy-etcd-operator logs -l app.kubernetes.io/name=etcd-operator --tail=100 >&3 2>&1 || true
-}
-
-# Wait until the etcd HelmRelease is reconciled by Flux and its
-# condition=ready is set. kubectl wait fails immediately on a missing
-# resource, so poll for existence first.
-wait_etcd_hr_ready() {
-  timeout 60 sh -ec 'until kubectl -n tenant-test get hr/etcd >/dev/null 2>&1; do sleep 2; done'
-  kubectl -n tenant-test wait hr/etcd --timeout=5m --for=condition=ready
-}
-
-@test "Create Etcd" {
-  kubectl apply -f- <<EOF
-apiVersion: apps.cozystack.io/v1alpha1
-kind: Etcd
-metadata:
-  name: etcd
-  namespace: tenant-test
-spec:
-  size: 1Gi
-  replicas: 3
-  storageClass: ""
-  resources:
-    cpu: 100m
-    memory: 128Mi
-EOF
-  wait_etcd_hr_ready || { dump_diagnostics; false; }
-  kubectl -n tenant-test wait etcdcluster.etcd.aenix.io etcd --timeout=180s --for=jsonpath='{.status.conditions[?(@.type=="Ready")].status}'=True || { dump_diagnostics; false; }
-}
-
-@test "Create Etcd with empty backup block (disabled by default)" {
-  kubectl apply -f- <<EOF
-apiVersion: apps.cozystack.io/v1alpha1
-kind: Etcd
-metadata:
-  name: etcd
-  namespace: tenant-test
-spec:
-  size: 1Gi
-  replicas: 3
-  storageClass: ""
-  resources:
-    cpu: 100m
-    memory: 128Mi
-  backup: {}
-EOF
-  wait_etcd_hr_ready || { dump_diagnostics; false; }
-  # With backup disabled, neither the schedule nor the secret should be created.
-  ! kubectl -n tenant-test get etcdbackupschedule.etcd.aenix.io etcd 2>/dev/null
-  ! kubectl -n tenant-test get secret etcd-s3-creds 2>/dev/null
-}
-
-@test "Create Etcd with backup schedule" {
-  kubectl apply -f- <<EOF
-apiVersion: apps.cozystack.io/v1alpha1
-kind: Etcd
-metadata:
-  name: etcd
-  namespace: tenant-test
-spec:
-  size: 1Gi
-  replicas: 3
-  storageClass: ""
-  resources:
-    cpu: 100m
-    memory: 128Mi
-  backup:
-    enabled: true
-    # Schedule is chosen far in the future so no Jobs fire during the
-    # ~6-minute test window; this test only checks that the chart renders
-    # EtcdBackupSchedule/Secret and that the etcd-operator materializes a
-    # CronJob — it does NOT verify that backups reach S3. The endpoint
-    # below intentionally resolves nowhere to keep the test self-contained.
-    schedule: "0 0 1 1 *"
-    destinationPath: "s3://test-bucket/etcd-backups/"
-    endpointURL: "http://no-such-endpoint.invalid:9000"
-    region: "us-east-1"
-    forcePathStyle: true
-    s3AccessKey: "e2e-access-key"
-    s3SecretKey: "e2e-secret-key"
-    successfulJobsHistoryLimit: 1
-    failedJobsHistoryLimit: 1
-EOF
-  wait_etcd_hr_ready || { dump_diagnostics; false; }
-  kubectl -n tenant-test wait etcdcluster.etcd.aenix.io etcd --timeout=180s --for=jsonpath='{.status.conditions[?(@.type=="Ready")].status}'=True || { dump_diagnostics; false; }
-  kubectl -n tenant-test get etcdbackupschedule.etcd.aenix.io etcd || { dump_diagnostics; false; }
-  # Verify the region field propagated to the EtcdBackupSchedule.
-  REGION=$(kubectl -n tenant-test get etcdbackupschedule.etcd.aenix.io etcd -o jsonpath='{.spec.destination.s3.region}')
-  [ "$REGION" = "us-east-1" ]
-  kubectl -n tenant-test get secret etcd-s3-creds -o jsonpath='{.data.AWS_ACCESS_KEY_ID}' | base64 -d | grep -q '^e2e-access-key$'
-  # The etcd-operator generates a CronJob from the EtcdBackupSchedule. Wait for it.
-  timeout 120 sh -ec "until [ \"\$(kubectl -n tenant-test get cronjob -l etcd.aenix.io/etcdbackupschedule-name=etcd -o jsonpath='{.items[*].metadata.name}' 2>/dev/null)\" != '' ]; do sleep 5; done" || { dump_diagnostics; false; }
-}
diff --git a/hack/e2e-apps/external-dns.bats b/hack/e2e-apps/external-dns.bats
deleted file mode 100644
index 23b3e8cf69..0000000000
--- a/hack/e2e-apps/external-dns.bats
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/usr/bin/env bats
-
-teardown() {
-  kubectl -n tenant-test delete externaldns.apps.cozystack.io --all --ignore-not-found 2>/dev/null || true
-}
-
-@test "Create and Verify ExternalDNS with inmemory provider" {
-  name='test'
-  kubectl apply -f - <<EOF
-apiVersion: apps.cozystack.io/v1alpha1
-kind: ExternalDNS
-metadata:
-  name: ${name}
-  namespace: tenant-test
-spec:
-  provider: inmemory
-  domainFilters:
-    - example.com
-EOF
-
-  # Wait for the operator to materialise the HelmRelease before kubectl wait
-  # kicks in (kubectl wait errors immediately if the object does not exist yet).
-  timeout 60 sh -ec "until kubectl -n tenant-test get hr ${name} >/dev/null 2>&1; do sleep 2; done"
-  kubectl -n tenant-test wait hr ${name} --timeout=5m --for=condition=ready
-  timeout 60 sh -ec "until kubectl -n tenant-test get hr ${name}-system >/dev/null 2>&1; do sleep 2; done"
-  kubectl -n tenant-test wait hr ${name}-system --timeout=5m --for=condition=ready
-  timeout 60 sh -ec "until kubectl -n tenant-test get deploy -l app.kubernetes.io/instance=${name}-system -o jsonpath='{.items[0].status.readyReplicas}' | grep -q '1'; do sleep 5; done"
-
-  kubectl -n tenant-test delete externaldns.apps.cozystack.io ${name}
-}
-
-@test "Create and Verify ExternalDNS with custom annotationPrefix" {
-  name='test-prefix'
-  kubectl apply -f - <<EOF
-apiVersion: apps.cozystack.io/v1alpha1
-kind: ExternalDNS
-metadata:
-  name: ${name}
-  namespace: tenant-test
-spec:
-  provider: inmemory
-  annotationPrefix: custom-dns/
-  domainFilters:
-    - example.org
-EOF
-
-  # Wait for the operator to materialise the HelmRelease before kubectl wait
-  # kicks in (kubectl wait errors immediately if the object does not exist yet).
-  timeout 60 sh -ec "until kubectl -n tenant-test get hr ${name} >/dev/null 2>&1; do sleep 2; done"
-  kubectl -n tenant-test wait hr ${name} --timeout=5m --for=condition=ready
-  timeout 60 sh -ec "until kubectl -n tenant-test get hr ${name}-system >/dev/null 2>&1; do sleep 2; done"
-  kubectl -n tenant-test wait hr ${name}-system --timeout=5m --for=condition=ready
-  timeout 60 sh -ec "until kubectl -n tenant-test get deploy -l app.kubernetes.io/instance=${name}-system -o jsonpath='{.items[0].status.readyReplicas}' | grep -q '1'; do sleep 5; done"
-
-  kubectl -n tenant-test delete externaldns.apps.cozystack.io ${name}
-}
diff --git a/hack/e2e-apps/foundationdb.bats b/hack/e2e-apps/foundationdb.bats
deleted file mode 100644
index accfd8e1de..0000000000
--- a/hack/e2e-apps/foundationdb.bats
+++ /dev/null
@@ -1,124 +0,0 @@
-#!/usr/bin/env bats
-
-@test "Create DB FoundationDB" {
-  name='test'
-  kubectl -n tenant-test delete foundationdb.apps.cozystack.io $name --ignore-not-found --timeout=2m || true
-  kubectl apply -f - <<EOF
-apiVersion: apps.cozystack.io/v1alpha1
-kind: FoundationDB
-metadata:
-  name: $name
-  namespace: tenant-test
-spec:
-  cluster:
-    version: "7.3.63"
-    processCounts:
-      storage: 3
-      stateless: -1
-      cluster_controller: 1
-    redundancyMode: "double"
-    storageEngine: "ssd-2"
-    faultDomain:
-      key: "foundationdb.org/none"
-      valueFrom: "\$FDB_ZONE_ID"
-  storage:
-    size: "1Gi"
-    storageClass: ""
-  resourcesPreset: "small"
-  backup:
-    enabled: false
-    s3:
-      bucket: ""
-      endpoint: ""
-      region: ""
-      credentials:
-        accessKeyId: ""
-        secretAccessKey: ""
-    retentionPolicy: "7d"
-  monitoring:
-    enabled: true
-  customParameters:
-    - "knob_disable_posix_kernel_aio=1"
-  imageType: "unified"
-  automaticReplacements: true
-EOF
-  # Wait for the operator to materialise the HelmRelease before kubectl wait
-  # kicks in (kubectl wait errors immediately if the object does not exist yet).
-  timeout 60 sh -ec "until kubectl -n tenant-test get hr foundationdb-$name >/dev/null 2>&1; do sleep 2; done"
-
-  # Wait for HelmRelease to be ready
-  kubectl -n tenant-test wait hr foundationdb-$name --timeout=300s --for=condition=ready
-
-  # Wait for FoundationDBCluster to be created (name has foundationdb- prefix)
-  timeout 300 sh -ec "until kubectl -n tenant-test get foundationdbclusters.apps.foundationdb.org foundationdb-$name; do sleep 15; done"
-
-  # Wait for cluster to become available (initial reconciliation takes time - allow 5 minutes)
-  timeout 300 sh -ec "until kubectl -n tenant-test get foundationdbclusters.apps.foundationdb.org foundationdb-$name -o jsonpath='{.status.databaseConfiguration.usable_regions}' | grep -q '1'; do sleep 30; done"
-
-  # Check that storage processes are running
-  timeout 300 sh -ec "until [ \$(kubectl -n tenant-test get pods -l foundationdb.org/fdb-cluster-name=foundationdb-$name,foundationdb.org/fdb-process-class=storage --field-selector=status.phase=Running --no-headers | wc -l) -eq 3 ]; do sleep 15; done"
-
-  # Check that log processes are running (these are the stateless processes)
-  timeout 300 sh -ec "until [ \$(kubectl -n tenant-test get pods -l foundationdb.org/fdb-cluster-name=foundationdb-$name,foundationdb.org/fdb-process-class=log --field-selector=status.phase=Running --no-headers | wc -l) -ge 1 ]; do sleep 15; done"
-
-  # Check that cluster controller is running
-  timeout 300 sh -ec "until [ \$(kubectl -n tenant-test get pods -l foundationdb.org/fdb-cluster-name=foundationdb-$name,foundationdb.org/fdb-process-class=cluster_controller --field-selector=status.phase=Running --no-headers | wc -l) -eq 1 ]; do sleep 15; done"
-
-  # Check WorkloadMonitor is created and configured
-  timeout 120 sh -ec "until kubectl -n tenant-test get workloadmonitor foundationdb-$name; do sleep 10; done"
-  timeout 60 sh -ec "until kubectl -n tenant-test get workloadmonitor foundationdb-$name -o jsonpath='{.spec.replicas}' | grep -q '3'; do sleep 5; done"
-
-  # Check dashboard resource map is created
-  kubectl -n tenant-test get configmap foundationdb-$name-resourcemap
-
-  # Verify cluster is healthy (check cluster status) - allow extra time for initial setup
-  timeout 300 sh -ec "until kubectl -n tenant-test get foundationdbclusters.apps.foundationdb.org foundationdb-$name -o jsonpath='{.status.health.available}' | grep -q 'true'; do sleep 20; done"
-
-  # Validate status.configured field
-  timeout 60 sh -ec "until kubectl -n tenant-test get foundationdbclusters.apps.foundationdb.org foundationdb-$name -o jsonpath='{.status.configured}' | grep -q 'true'; do sleep 10; done"
-
-  # Validate status.connectionString field exists and contains expected format
-  timeout 60 sh -ec "until kubectl -n tenant-test get foundationdbclusters.apps.foundationdb.org foundationdb-$name -o jsonpath='{.status.connectionString}' | grep -q '@.*\.svc\.cozy\.local'; do sleep 10; done"
-
-  # Validate comprehensive status.databaseConfiguration fields
-  timeout 60 sh -ec "until kubectl -n tenant-test get foundationdbclusters.apps.foundationdb.org foundationdb-$name -o jsonpath='{.status.databaseConfiguration.logs}' | grep -q '3'; do sleep 10; done"
-  timeout 60 sh -ec "until kubectl -n tenant-test get foundationdbclusters.apps.foundationdb.org foundationdb-$name -o jsonpath='{.status.databaseConfiguration.proxies}' | grep -q '3'; do sleep 10; done"
-  timeout 60 sh -ec "until kubectl -n tenant-test get foundationdbclusters.apps.foundationdb.org foundationdb-$name -o jsonpath='{.status.databaseConfiguration.redundancy_mode}' | grep -q 'double'; do sleep 10; done"
-  timeout 60 sh -ec "until kubectl -n tenant-test get foundationdbclusters.apps.foundationdb.org foundationdb-$name -o jsonpath='{.status.databaseConfiguration.resolvers}' | grep -q '1'; do sleep 10; done"
-  timeout 60 sh -ec "until kubectl -n tenant-test get foundationdbclusters.apps.foundationdb.org foundationdb-$name -o jsonpath='{.status.databaseConfiguration.storage_engine}' | grep -q 'ssd-2'; do sleep 10; done"
-  timeout 60 sh -ec "until kubectl -n tenant-test get foundationdbclusters.apps.foundationdb.org foundationdb-$name -o jsonpath='{.status.databaseConfiguration.usable_regions}' | grep -q '1'; do sleep 10; done"
-
-  # Validate status.desiredProcessGroups field
-  timeout 60 sh -ec "until kubectl -n tenant-test get foundationdbclusters.apps.foundationdb.org foundationdb-$name -o jsonpath='{.status.desiredProcessGroups}' | grep -q '^[0-9][0-9]*$'; do sleep 10; done"
-
-  # Validate status.generations.reconciled field
-  timeout 60 sh -ec "until kubectl -n tenant-test get foundationdbclusters.apps.foundationdb.org foundationdb-$name -o jsonpath='{.status.generations.reconciled}' | grep -q '^[0-9][0-9]*$'; do sleep 10; done"
-
-  # Validate status.hasListenIPsForAllPods field
-  timeout 60 sh -ec "until kubectl -n tenant-test get foundationdbclusters.apps.foundationdb.org foundationdb-$name -o jsonpath='{.status.hasListenIPsForAllPods}' | grep -q 'true'; do sleep 10; done"
-
-  # Validate comprehensive status.health fields
-  timeout 60 sh -ec "until kubectl -n tenant-test get foundationdbclusters.apps.foundationdb.org foundationdb-$name -o jsonpath='{.status.health.fullReplication}' | grep -q 'true'; do sleep 10; done"
-  timeout 60 sh -ec "until kubectl -n tenant-test get foundationdbclusters.apps.foundationdb.org foundationdb-$name -o jsonpath='{.status.health.healthy}' | grep -q 'true'; do sleep 10; done"
-
-  # Verify security context is applied correctly (non-root user)
-  storage_pod=$(kubectl -n tenant-test get pods -l foundationdb.org/fdb-cluster-name=foundationdb-$name,foundationdb.org/fdb-process-class=storage --no-headers | head -n1 | awk '{print $1}')
-  kubectl -n tenant-test get pod "$storage_pod" -o jsonpath='{.spec.containers[0].securityContext.runAsUser}' | grep -q '4059'
-  kubectl -n tenant-test get pod "$storage_pod" -o jsonpath='{.spec.containers[0].securityContext.runAsGroup}' | grep -q '4059'
-
-  # Verify volumeClaimTemplate is properly configured in FoundationDBCluster CRD
-  timeout 60 sh -ec "until kubectl -n tenant-test get foundationdbclusters.apps.foundationdb.org foundationdb-$name -o jsonpath='{.spec.processes.general.volumeClaimTemplate.spec.resources.requests.storage}' | grep -q '1Gi'; do sleep 10; done"
-
-  # Verify PVCs are created with correct storage size (1Gi as specified in test)
-  timeout 120 sh -ec "until [ \$(kubectl -n tenant-test get pvc -l foundationdb.org/fdb-cluster-name=foundationdb-$name --no-headers | wc -l) -ge 3 ]; do sleep 10; done"
-  kubectl -n tenant-test get pvc -l foundationdb.org/fdb-cluster-name=foundationdb-$name -o jsonpath='{.items[*].spec.resources.requests.storage}' | grep -q '1Gi'
-
-  # Verify actual PVC storage capacity matches requested size
-  kubectl -n tenant-test get pvc -l foundationdb.org/fdb-cluster-name=foundationdb-$name -o jsonpath='{.items[*].status.capacity.storage}' | grep -q '1Gi'
-
-  # Clean up
-  kubectl -n tenant-test delete foundationdb $name
-
-  # Wait for cleanup to complete
-  timeout 120 sh -ec "while kubectl -n tenant-test get foundationdbclusters.apps.foundationdb.org foundationdb-$name 2>/dev/null; do sleep 10; done"
-}
\ No newline at end of file
diff --git a/hack/e2e-apps/gateway.bats b/hack/e2e-apps/gateway.bats
deleted file mode 100644
index 144b663bec..0000000000
--- a/hack/e2e-apps/gateway.bats
+++ /dev/null
@@ -1,666 +0,0 @@
-#!/usr/bin/env bats
-
-@test "Gateway API CRDs are installed and the cilium GatewayClass is Accepted" {
-  # Gateway API CRDs must exist — installed by packages/system/gateway-api-crds
-  kubectl wait crd/gatewayclasses.gateway.networking.k8s.io --for=condition=Established --timeout=60s
-  kubectl wait crd/gateways.gateway.networking.k8s.io --for=condition=Established --timeout=60s
-  kubectl wait crd/httproutes.gateway.networking.k8s.io --for=condition=Established --timeout=60s
-
-  # Cilium must have registered its built-in GatewayClass once gatewayAPI.enabled
-  # is true in the cilium values. This verifies the flip in
-  # packages/system/cilium/values.yaml propagated end-to-end.
-  timeout 120 sh -ec 'until kubectl get gatewayclass cilium >/dev/null 2>&1; do sleep 2; done'
-  kubectl wait gatewayclass/cilium --for=condition=Accepted --timeout=3m
-}
-
-@test "Cilium Gateway API controller reconciles a minimal Gateway to Programmed" {
-  # Use the pre-existing tenant-test namespace created by e2e-install-cozystack.bats.
-  kubectl apply -f - <<'EOF'
-apiVersion: gateway.networking.k8s.io/v1
-kind: Gateway
-metadata:
-  name: gateway-e2e-probe
-  namespace: tenant-test
-spec:
-  gatewayClassName: cilium
-  listeners:
-  - name: http
-    protocol: HTTP
-    port: 80
-    allowedRoutes:
-      namespaces:
-        from: Same
-EOF
-
-  # The controller must accept and program the Gateway.
-  kubectl -n tenant-test wait gateway/gateway-e2e-probe --for=condition=Accepted --timeout=2m
-  kubectl -n tenant-test wait gateway/gateway-e2e-probe --for=condition=Programmed --timeout=3m
-
-  # Cilium materialises a LoadBalancer Service named cilium-gateway-<gateway-name>
-  # for each programmed Gateway. Its existence is the observable proof that the
-  # full data-plane wiring kicked in.
-  kubectl -n tenant-test get svc cilium-gateway-gateway-e2e-probe
-
-  # Cleanup
-  kubectl -n tenant-test delete gateway/gateway-e2e-probe --ignore-not-found --timeout=1m
-}
-
-@test "cozystack-gateway-hostname-policy VAP and binding are installed" {
-  # Diagnose the hostname-policy enforcement path from the ground up.
-  # If these resources are missing, admission cannot reject anything.
-  kubectl get validatingadmissionpolicy cozystack-gateway-hostname-policy -o yaml
-  kubectl get validatingadmissionpolicybinding cozystack-gateway-hostname-policy -o yaml
-  # Binding MUST have validationActions: [Deny] — [Audit] / [] would let requests through silently.
-  actions=$(kubectl get validatingadmissionpolicybinding cozystack-gateway-hostname-policy -o jsonpath='{.spec.validationActions}')
-  echo "binding.validationActions=$actions"
-  case "$actions" in
-    *Deny*) ;;
-    *) echo "SETUP FAILURE: binding.validationActions lacks Deny (got '$actions')" >&2; return 1 ;;
-  esac
-}
-
-@test "tenant-test namespace carries namespace.cozystack.io/host label from tenant chart" {
-  # Diagnostic: the whole hostname-policy VAP keys off this label. If it is
-  # missing or empty, the VAP's matchCondition returns false, VAP skips, and
-  # EVERY Gateway in the namespace is admitted regardless of listener hostname.
-  # Make that bug loud instead of letting it fall through as a silent pass.
-  host_label=$(kubectl get namespace tenant-test -o jsonpath='{.metadata.labels.namespace\.cozystack\.io/host}')
-  if [ -z "$host_label" ]; then
-    echo "SETUP FAILURE: tenant-test namespace lacks namespace.cozystack.io/host label" >&2
-    kubectl get namespace tenant-test -o yaml >&2
-    return 1
-  fi
-  if [ "$host_label" != "test.example.org" ]; then
-    echo "SETUP FAILURE: tenant-test host label is '$host_label', expected 'test.example.org'" >&2
-    kubectl get namespace tenant-test -o yaml >&2
-    return 1
-  fi
-}
-
-@test "ValidatingAdmissionPolicy rejects Gateway with foreign hostname" {
-  # tenant-test namespace should only be allowed to publish its own
-  # domain suffix ('.test.example.org'); a listener hostname from the
-  # root tenant's apex must be denied by cozystack-gateway-hostname-policy.
-  # hack/cozytest.sh is /bin/sh (dash) with set -e — a failing command
-  # substitution propagates its exit status through variable assignment and
-  # kills the test. We specifically EXPECT admission to reject the apply, so
-  # use `if !` — set -e is disabled inside the if-condition, the exit status
-  # is captured, and $output is filled either way for the follow-up greps.
-  if ! output=$(kubectl apply -f - 2>&1 <<'EOF'
-apiVersion: gateway.networking.k8s.io/v1
-kind: Gateway
-metadata:
-  name: hostname-hijack-probe
-  namespace: tenant-test
-spec:
-  gatewayClassName: cilium
-  listeners:
-  - name: https
-    protocol: HTTPS
-    port: 443
-    hostname: "dashboard.example.org"
-    tls:
-      mode: Terminate
-      certificateRefs:
-      - name: noop
-    allowedRoutes:
-      namespaces:
-        from: Same
-EOF
-); then
-    # Happy path: admission rejected the Gateway. Verify the rejection came
-    # from our VAP and names the expected tenant host.
-    echo "$output" | grep -qi "ValidatingAdmissionPolicy"
-    echo "$output" | grep -q "must equal test.example.org"
-  else
-    echo "BUG: admission accepted cross-tenant hostname — Gateway 'hostname-hijack-probe' was created in tenant-test" >&2
-    echo "$output" >&2
-    return 1
-  fi
-}
-
-@test "Package admission accepts gateway.attachedNamespaces with tenant-* entries" {
-  # Regression guard: the previous shape rejected `tenant-*` entries in
-  # publishing.gateway.attachedNamespaces (both a render-time fail in
-  # cozystack-basics and a dedicated VAP). Under inheritance the attach
-  # surface is governed by the namespace.cozystack.io/gateway label
-  # selector, not by entries in attachedNamespaces — Layers 4/5/7
-  # (Tenant.spec.host, namespace label, HTTPRoute hostname VAPs) defend
-  # against hostname hijack independently. Adding a tenant-* entry must
-  # no longer be blocked at admission. A future refactor that re-adds
-  # the gate would silently break inheritance for every cluster that
-  # has set attachedNamespaces explicitly.
-  kubectl apply -f - <<'EOF'
-apiVersion: cozystack.io/v1alpha1
-kind: Package
-metadata:
-  name: vap-accept-probe
-spec:
-  variant: isp-full
-  components:
-    platform:
-      values:
-        gateway:
-          attachedNamespaces:
-          - tenant-alice
-EOF
-  # Apply succeeded → admission accepted the tenant-* entry. Clean up
-  # immediately; this Package was just a probe and is not consumed by
-  # the platform.
-  kubectl delete package vap-accept-probe --ignore-not-found
-}
-
-@test "cozystack-tenant-host-policy blocks non-trusted callers from setting tenant.spec.host" {
-  # Impersonate a tenant-scoped ServiceAccount that is NOT in the trustedCaller
-  # group list. First grant RBAC to create Tenants — authorization runs BEFORE
-  # admission, so without this grant the apiserver returns a plain RBAC
-  # Forbidden and the test would fail grep-ing for 'ValidatingAdmissionPolicy'
-  # even though the VAP itself is fine.
-  kubectl apply -f - <<'EOF'
-apiVersion: rbac.authorization.k8s.io/v1
-kind: Role
-metadata:
-  name: vap-probe-tenant-create
-  namespace: tenant-test
-rules:
-- apiGroups: ["apps.cozystack.io"]
-  resources: ["tenants"]
-  verbs: ["create","get","list","watch","update","patch","delete"]
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
-  name: vap-probe-tenant-create
-  namespace: tenant-test
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: Role
-  name: vap-probe-tenant-create
-subjects:
-- kind: ServiceAccount
-  name: default
-  namespace: tenant-test
-EOF
-  if ! output=$(kubectl --as=system:serviceaccount:tenant-test:default \
-                        --as-group=system:serviceaccounts \
-                        --as-group=system:serviceaccounts:tenant-test \
-    apply -f - 2>&1 <<'EOF'
-apiVersion: apps.cozystack.io/v1alpha1
-kind: Tenant
-metadata:
-  name: vaphostprobe
-  namespace: tenant-test
-spec:
-  host: foreign.example.org
-EOF
-); then
-    kubectl -n tenant-test delete rolebinding vap-probe-tenant-create --ignore-not-found
-    kubectl -n tenant-test delete role vap-probe-tenant-create --ignore-not-found
-    echo "$output" | grep -qi "ValidatingAdmissionPolicy"
-    echo "$output" | grep -q "spec.host can only be set"
-  else
-    kubectl -n tenant-test delete tenants.apps.cozystack.io vaphostprobe --ignore-not-found
-    kubectl -n tenant-test delete rolebinding vap-probe-tenant-create --ignore-not-found
-    kubectl -n tenant-test delete role vap-probe-tenant-create --ignore-not-found
-    echo "BUG: admission accepted tenant.spec.host from untrusted SA — Tenant 'vaphostprobe' was created" >&2
-    echo "$output" >&2
-    return 1
-  fi
-}
-
-@test "cozystack-namespace-host-label-policy blocks non-trusted callers from changing the host label" {
-  # tenant-test namespace already has namespace.cozystack.io/host set by the
-  # cozystack tenant chart. Grant patch on namespaces cluster-wide to the
-  # impersonated SA — namespaces is a cluster-scoped resource so this needs a
-  # ClusterRole. Authorization runs before admission, so without this grant
-  # the test would fail with plain RBAC Forbidden rather than a VAP rejection.
-  kubectl apply -f - <<'EOF'
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  name: vap-probe-namespace-patch
-rules:
-- apiGroups: [""]
-  resources: ["namespaces"]
-  verbs: ["get","list","watch","update","patch"]
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  name: vap-probe-namespace-patch
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: vap-probe-namespace-patch
-subjects:
-- kind: ServiceAccount
-  name: default
-  namespace: tenant-test
-EOF
-  if ! output=$(kubectl --as=system:serviceaccount:tenant-test:default \
-                        --as-group=system:serviceaccounts \
-                        --as-group=system:serviceaccounts:tenant-test \
-    label namespace tenant-test \
-      namespace.cozystack.io/host=foreign.example.org --overwrite 2>&1); then
-    kubectl delete clusterrolebinding vap-probe-namespace-patch --ignore-not-found
-    kubectl delete clusterrole vap-probe-namespace-patch --ignore-not-found
-    echo "$output" | grep -qi "ValidatingAdmissionPolicy"
-    echo "$output" | grep -q "immutable"
-  else
-    # Revert label if apiserver somehow accepted the overwrite.
-    kubectl label namespace tenant-test namespace.cozystack.io/host=test.example.org --overwrite
-    kubectl delete clusterrolebinding vap-probe-namespace-patch --ignore-not-found
-    kubectl delete clusterrole vap-probe-namespace-patch --ignore-not-found
-    echo "BUG: admission accepted host label change from untrusted SA" >&2
-    echo "$output" >&2
-    return 1
-  fi
-}
-
-@test "cozystack-namespace-host-label-policy blocks non-trusted callers from setting the host label at CREATE" {
-  # Defense-in-depth: a non-trusted caller must not be able to stamp
-  # namespace.cozystack.io/host=X on a brand-new namespace either — only
-  # cozystack/Flux SAs may write the label. Authorization runs before
-  # admission, so grant cluster-wide namespace create to the impersonated SA
-  # first, otherwise the test would fail with plain RBAC Forbidden.
-  kubectl apply -f - <<'EOF'
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  name: vap-probe-namespace-create
-rules:
-- apiGroups: [""]
-  resources: ["namespaces"]
-  verbs: ["create","get","list","delete"]
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  name: vap-probe-namespace-create
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: vap-probe-namespace-create
-subjects:
-- kind: ServiceAccount
-  name: default
-  namespace: tenant-test
-EOF
-  if ! output=$(kubectl --as=system:serviceaccount:tenant-test:default \
-                        --as-group=system:serviceaccounts \
-                        --as-group=system:serviceaccounts:tenant-test \
-    apply -f - 2>&1 <<'EOF'
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: vap-host-label-probe
-  labels:
-    namespace.cozystack.io/host: foreign.example.org
-EOF
-); then
-    kubectl delete clusterrolebinding vap-probe-namespace-create --ignore-not-found
-    kubectl delete clusterrole vap-probe-namespace-create --ignore-not-found
-    echo "$output" | grep -qi "ValidatingAdmissionPolicy"
-    echo "$output" | grep -q "immutable"
-  else
-    kubectl delete namespace vap-host-label-probe --ignore-not-found --wait=false
-    kubectl delete clusterrolebinding vap-probe-namespace-create --ignore-not-found
-    kubectl delete clusterrole vap-probe-namespace-create --ignore-not-found
-    echo "BUG: admission accepted first-time host label write from untrusted SA at CREATE — Namespace 'vap-host-label-probe' was created" >&2
-    echo "$output" >&2
-    return 1
-  fi
-}
-
-@test "TenantGateway CRD is installed (gateway.cozystack.io/v1alpha1)" {
-  # Shipped via packages/system/cozystack-controller/definitions; the
-  # controller cannot reconcile anything without it being Established.
-  kubectl wait crd/tenantgateways.gateway.cozystack.io --for=condition=Established --timeout=60s
-}
-
-@test "TenantGatewayReconciler materialises Gateway + Issuer from a TenantGateway CR" {
-  # Create the CR directly (the chart renders one of these per tenant
-  # with tenant.spec.gateway=true; this test exercises the controller
-  # in isolation without going through the full tenant flow).
-  kubectl apply -f - <<'EOF'
-apiVersion: gateway.cozystack.io/v1alpha1
-kind: TenantGateway
-metadata:
-  name: tg-e2e-probe
-  namespace: tenant-test
-spec:
-  apex: test.example.org
-  certMode: http01
-  gatewayClassName: cilium
-EOF
-
-  # Controller creates the Gateway (same name, same namespace).
-  timeout 120 sh -ec 'until kubectl -n tenant-test get gateway tg-e2e-probe >/dev/null 2>&1; do sleep 2; done'
-  kubectl -n tenant-test get gateway tg-e2e-probe -o yaml
-
-  # And the per-tenant ACME Issuer.
-  timeout 120 sh -ec 'until kubectl -n tenant-test get issuer.cert-manager.io tg-e2e-probe-gateway >/dev/null 2>&1; do sleep 2; done'
-
-  # Status is reported back: ObservedGeneration tracks .metadata.generation,
-  # Ready=True after a clean reconcile.
-  timeout 120 sh -ec 'until kubectl -n tenant-test get tenantgateways.gateway.cozystack.io tg-e2e-probe -o jsonpath="{.status.conditions[?(@.type==\"Ready\")].status}" 2>/dev/null | grep -q True; do sleep 2; done'
-
-  # Cleanup. Cascade-delete relies on OwnerReferences set by the reconciler.
-  kubectl -n tenant-test delete tenantgateways.gateway.cozystack.io tg-e2e-probe --ignore-not-found --timeout=1m
-}
-
-@test "cozystack-route-hostname-policy VAP rejects HTTPRoute claiming a foreign apex" {
-  # tenant-test's namespace.cozystack.io/host label is test.example.org.
-  # An HTTPRoute claiming attacker.com (or any hostname not under
-  # test.example.org) must be denied by Layer 7 of the security model.
-  if ! output=$(kubectl apply -f - 2>&1 <<'EOF'
-apiVersion: gateway.networking.k8s.io/v1
-kind: HTTPRoute
-metadata:
-  name: route-hostname-hijack-probe
-  namespace: tenant-test
-spec:
-  hostnames:
-  - "attacker.com"
-  rules:
-  - backendRefs:
-    - name: kubernetes
-      namespace: default
-      port: 443
-EOF
-); then
-    echo "$output" | grep -qi "ValidatingAdmissionPolicy"
-    echo "$output" | grep -qi "hostnames must equal"
-  else
-    kubectl -n tenant-test delete httproute route-hostname-hijack-probe --ignore-not-found
-    echo "BUG: admission accepted cross-apex HTTPRoute hostname — route was created" >&2
-    echo "$output" >&2
-    return 1
-  fi
-}
-
-@test "cozystack-route-hostname-policy VAP allows HTTPRoute under the namespace's apex" {
-  # Sanity check the inverse: a route with a hostname under
-  # test.example.org must NOT be rejected by the VAP.
-  kubectl apply -f - <<'EOF'
-apiVersion: gateway.networking.k8s.io/v1
-kind: HTTPRoute
-metadata:
-  name: route-hostname-allow-probe
-  namespace: tenant-test
-spec:
-  hostnames:
-  - "harbor.test.example.org"
-  rules:
-  - backendRefs:
-    - name: kubernetes
-      namespace: default
-      port: 443
-EOF
-
-  kubectl -n tenant-test delete httproute route-hostname-allow-probe --ignore-not-found
-}
-
-@test "HTTPRoute with a matching parentRef reaches Accepted status" {
-  # Put a Gateway and a route in the same namespace so allowedRoutes: Same accepts them.
-  kubectl apply -f - <<'EOF'
-apiVersion: gateway.networking.k8s.io/v1
-kind: Gateway
-metadata:
-  name: gateway-route-probe
-  namespace: tenant-test
-spec:
-  gatewayClassName: cilium
-  listeners:
-  - name: http
-    protocol: HTTP
-    port: 80
-    allowedRoutes:
-      namespaces:
-        from: Same
----
-apiVersion: gateway.networking.k8s.io/v1
-kind: HTTPRoute
-metadata:
-  name: httproute-probe
-  namespace: tenant-test
-spec:
-  parentRefs:
-  - name: gateway-route-probe
-    sectionName: http
-  rules:
-  - matches:
-    - path:
-        type: PathPrefix
-        value: /
-    backendRefs:
-    - name: kubernetes
-      namespace: default
-      port: 443
-EOF
-
-  kubectl -n tenant-test wait gateway/gateway-route-probe --for=condition=Programmed --timeout=3m
-  timeout 120 sh -ec 'until kubectl -n tenant-test get httproute httproute-probe -o jsonpath="{.status.parents[0].conditions[?(@.type==\"Accepted\")].status}" 2>/dev/null | grep -q True; do sleep 2; done'
-
-  kubectl -n tenant-test delete httproute/httproute-probe --ignore-not-found
-  kubectl -n tenant-test delete gateway/gateway-route-probe --ignore-not-found
-}
-
-@test "tenant chart writes namespace.cozystack.io/gateway label and _namespace.gateway in lockstep with tenant.gatewayEffective" {
-  # Pins the contract that namespace.yaml, gateway.yaml, and any other
-  # tenant-chart consumer of the gateway flag resolve through the same
-  # tenant.gatewayEffective helper. If they diverge — opt-in Tenant
-  # rendering Gateway HelmRelease but namespace.yaml leaving
-  # _namespace.gateway empty — child apps (harbor, bucket) silently
-  # fall back to Ingress while the Gateway resource sits unused.
-  #
-  # Uses explicit opt-in (tenant.spec.gateway=true) so the test is
-  # self-contained and does not require platform-level
-  # gateway.enabled=true in the e2e setup. The derived-apex
-  # auto-default path through _cluster.gateway-enabled is covered by
-  # helm-unittest fixtures in packages/apps/tenant/tests/
-  # gateway_default_test.yaml; both paths converge in the same helper,
-  # so e2e only needs to exercise one to guard the lockstep contract.
-  #
-  # Provisions a child tenant under tenant-test with explicit
-  # gateway=true and asserts:
-  # - the child Namespace carries namespace.cozystack.io/gateway=<self>
-  # - the cozystack-values Secret in the child namespace has
-  #   _namespace.gateway: "<self>" matching tenant.gatewayEffective
-  kubectl apply -f - <<'EOF'
-apiVersion: apps.cozystack.io/v1alpha1
-kind: Tenant
-metadata:
-  name: gwprop
-  namespace: tenant-test
-spec:
-  gateway: true
-EOF
-  timeout 180 sh -ec 'until kubectl get ns tenant-test-gwprop >/dev/null 2>&1; do sleep 3; done'
-  timeout 60 sh -ec 'until kubectl -n tenant-test-gwprop get secret cozystack-values >/dev/null 2>&1; do sleep 2; done'
-
-  ns_label=$(kubectl get ns tenant-test-gwprop -o jsonpath='{.metadata.labels.namespace\.cozystack\.io/gateway}')
-  [ "$ns_label" = "tenant-test-gwprop" ]
-
-  cozyvalues=$(kubectl -n tenant-test-gwprop get secret cozystack-values -o jsonpath='{.data.values\.yaml}' | base64 -d)
-  echo "$cozyvalues" | grep -E '^\s*gateway:\s*"tenant-test-gwprop"\s*$' >/dev/null
-
-  kubectl -n tenant-test delete tenant gwprop --ignore-not-found
-}
-
-@test "child tenant without explicit gateway inherits _namespace.gateway from a Gateway-owning parent" {
-  # Pins the inheritance flow: when a parent tenant owns its Gateway
-  # (gateway=true), a child tenant under that parent with the gateway
-  # field unset receives _namespace.gateway = <parent-tenant-name> in
-  # its cozystack-values Secret AND the same value on the
-  # namespace.cozystack.io/gateway label of the child namespace.
-  #
-  # Without this lockstep, the parent's Gateway label-selector
-  # allowedRoutes does not match the child namespace at runtime, and
-  # the child's HTTPRoutes silently fail to attach.
-  #
-  # tenant-test in the e2e fixture has no Gateway of its own, so the
-  # test sets up its own parent (gwparent) under tenant-test with
-  # explicit gateway=true. The child (gwchild) under that parent is
-  # the inheritance-under-test.
-  kubectl apply -f - <<'EOF'
-apiVersion: apps.cozystack.io/v1alpha1
-kind: Tenant
-metadata:
-  name: gwparent
-  namespace: tenant-test
-spec:
-  gateway: true
-EOF
-  timeout 180 sh -ec 'until kubectl get ns tenant-test-gwparent >/dev/null 2>&1; do sleep 3; done'
-  timeout 60 sh -ec 'until kubectl -n tenant-test-gwparent get secret cozystack-values >/dev/null 2>&1; do sleep 2; done'
-  parent_label=$(kubectl get ns tenant-test-gwparent -o jsonpath='{.metadata.labels.namespace\.cozystack\.io/gateway}')
-  [ "$parent_label" = "tenant-test-gwparent" ]
-
-  kubectl apply -f - <<'EOF'
-apiVersion: apps.cozystack.io/v1alpha1
-kind: Tenant
-metadata:
-  name: gwchild
-  namespace: tenant-test-gwparent
-spec: {}
-EOF
-  timeout 180 sh -ec 'until kubectl get ns tenant-test-gwparent-gwchild >/dev/null 2>&1; do sleep 3; done'
-  timeout 60 sh -ec 'until kubectl -n tenant-test-gwparent-gwchild get secret cozystack-values >/dev/null 2>&1; do sleep 2; done'
-
-  child_label=$(kubectl get ns tenant-test-gwparent-gwchild -o jsonpath='{.metadata.labels.namespace\.cozystack\.io/gateway}')
-  [ "$child_label" = "tenant-test-gwparent" ]
-
-  cozyvalues=$(kubectl -n tenant-test-gwparent-gwchild get secret cozystack-values -o jsonpath='{.data.values\.yaml}' | base64 -d)
-  echo "$cozyvalues" | grep -E '^\s*gateway:\s*"tenant-test-gwparent"\s*$' >/dev/null
-
-  # The child must NOT have its own gateway HelmRelease — inheritance
-  # means no separate Gateway resource for the child tenant.
-  ! kubectl -n tenant-test-gwparent-gwchild get helmrelease gateway 2>/dev/null
-
-  kubectl -n tenant-test-gwparent delete tenant gwchild --ignore-not-found
-  kubectl -n tenant-test delete tenant gwparent --ignore-not-found
-}
-
-@test "child tenant's HTTPRoute drives the parent Gateway's listener set via inheritance label" {
-  # End-to-end cross-namespace attach for the inheritance flow:
-  # parent owns the Gateway, child inherits via the
-  # namespace.cozystack.io/gateway label, and an HTTPRoute in the
-  # child namespace causes the parent Gateway to grow a per-listener
-  # HTTPS entry for the route's hostname plus a per-listener
-  # Certificate object. Both writes are cozystack-controller's
-  # responsibility — they happen only if collectHostnameClaims sees
-  # the route across the inheritance label.
-  #
-  # The Cilium-side `HTTPRoute.status.parents[].conditions[Accepted]`
-  # flip is NOT checked here. In the e2e cluster the ACME server
-  # (LE prod) refuses to issue any certificate for `.example.org`
-  # (forbidden by policy), so a fresh per-listener cert never goes
-  # Ready, which Cilium ties to listener readiness, which blocks
-  # Accepted on the route. Every cluster cert visible in cozyreport
-  # (alerta, grafana, dashboard, seaweedfs-s3) shows the same
-  # `rejectedIdentifier` for the same reason — bootstrap-time certs
-  # survive on stale issuance, fresh ones can't be issued. Asserting
-  # Accepted=True against that environment is environmental noise,
-  # not a contract on the inheritance code path.
-  #
-  # The route's hostname is constructed under the child's derived
-  # apex (<child-name>.<parent-apex>) so Layer 7
-  # (cozystack-route-hostname-policy) admits it.
-  kubectl apply -f - <<'EOF'
-apiVersion: apps.cozystack.io/v1alpha1
-kind: Tenant
-metadata:
-  name: rparent
-  namespace: tenant-test
-spec:
-  gateway: true
-EOF
-  timeout 180 sh -ec 'until kubectl get ns tenant-test-rparent >/dev/null 2>&1; do sleep 3; done'
-  # Wait for the cozystack-controller to materialise the parent's
-  # Gateway resource. Programmed status requires Cilium dataplane
-  # provisioning which depends on the LB allocator; for this test
-  # we only need the Gateway object to exist + carry the
-  # label-selector allowedRoutes.
-  timeout 120 sh -ec 'until kubectl -n tenant-test-rparent get gateway cozystack >/dev/null 2>&1; do sleep 3; done'
-
-  parent_apex=$(kubectl get ns tenant-test-rparent -o jsonpath='{.metadata.labels.namespace\.cozystack\.io/host}')
-  [ -n "$parent_apex" ]
-
-  kubectl apply -f - <<EOF
-apiVersion: apps.cozystack.io/v1alpha1
-kind: Tenant
-metadata:
-  name: rchild
-  namespace: tenant-test-rparent
-spec: {}
-EOF
-  timeout 180 sh -ec 'until kubectl get ns tenant-test-rparent-rchild >/dev/null 2>&1; do sleep 3; done'
-
-  # Verify the inheritance label propagated to the child namespace —
-  # this is the read side of the contract collectHostnameClaims
-  # exercises.
-  child_gateway_label=$(kubectl get ns tenant-test-rparent-rchild -o jsonpath='{.metadata.labels.namespace\.cozystack\.io/gateway}')
-  [ "$child_gateway_label" = "tenant-test-rparent" ]
-
-  child_apex=$(kubectl get ns tenant-test-rparent-rchild -o jsonpath='{.metadata.labels.namespace\.cozystack\.io/host}')
-  [ -n "$child_apex" ]
-
-  route_host="harbor.${child_apex}"
-
-  kubectl apply -f - <<EOF
-apiVersion: gateway.networking.k8s.io/v1
-kind: HTTPRoute
-metadata:
-  name: inherit-probe
-  namespace: tenant-test-rparent-rchild
-spec:
-  parentRefs:
-  - group: gateway.networking.k8s.io
-    kind: Gateway
-    name: cozystack
-    namespace: tenant-test-rparent
-  hostnames:
-  - "${route_host}"
-  rules:
-  - matches:
-    - path:
-        type: PathPrefix
-        value: /
-    backendRefs:
-    - name: kubernetes
-      namespace: default
-      port: 443
-EOF
-
-  # cozystack-controller's watch on HTTPRoute fires, collectHostnameClaims
-  # picks up the route through the inheritance label (the contract this
-  # test pins), reconcileGateway adds the per-listener HTTPS entry for
-  # the child route's hostname.
-  timeout 120 sh -ec '
-    want="'"$route_host"'"
-    until kubectl -n tenant-test-rparent get gateway cozystack \
-      -o jsonpath="{range .spec.listeners[?(@.protocol==\"HTTPS\")]}{.hostname}{\"\n\"}{end}" 2>/dev/null \
-      | grep -qx "$want"; do
-      sleep 3
-    done
-  '
-
-  # reconcilePerListenerCertificates runs from the same dynHostnames
-  # slice — a missing Certificate here would mean the controller
-  # rendered the listener but not its cert ref, which would silently
-  # leak listeners with broken TLS refs.
-  timeout 60 sh -ec '
-    want="'"$route_host"'"
-    until kubectl -n tenant-test-rparent get certificate \
-      -l cozystack.io/per-listener-cert=true \
-      -o jsonpath="{range .items[*]}{.spec.dnsNames[0]}{\"\n\"}{end}" 2>/dev/null \
-      | grep -qx "$want"; do
-      sleep 3
-    done
-  '
-
-  kubectl -n tenant-test-rparent-rchild delete httproute inherit-probe --ignore-not-found
-  kubectl -n tenant-test-rparent delete tenant rchild --ignore-not-found
-  kubectl -n tenant-test delete tenant rparent --ignore-not-found
-}
diff --git a/hack/e2e-apps/harbor.bats b/hack/e2e-apps/harbor.bats
deleted file mode 100644
index 10ad3c95c3..0000000000
--- a/hack/e2e-apps/harbor.bats
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/usr/bin/env bats
-
-@test "Create Harbor" {
-  name='test'
-  release="harbor-$name"
-
-  # Clean up stale resources from previous failed runs
-  kubectl -n tenant-test delete harbor.apps.cozystack.io $name 2>/dev/null || true
-  kubectl -n tenant-test wait hr $release --timeout=60s --for=delete 2>/dev/null || true
-
-  kubectl apply -f- <<EOF
-apiVersion: apps.cozystack.io/v1alpha1
-kind: Harbor
-metadata:
-  name: $name
-  namespace: tenant-test
-spec:
-  host: ""
-  storageClass: ""
-  core:
-    resources: {}
-    resourcesPreset: "nano"
-  registry:
-    resources: {}
-    resourcesPreset: "nano"
-  jobservice:
-    resources: {}
-    resourcesPreset: "nano"
-  trivy:
-    enabled: false
-    size: 2Gi
-    resources: {}
-    resourcesPreset: "nano"
-  database:
-    size: 2Gi
-    replicas: 1
-  redis:
-    size: 1Gi
-    replicas: 1
-EOF
-  # Wait for the operator to materialise the HelmRelease before kubectl wait
-  # kicks in (kubectl wait errors immediately if the object does not exist yet).
-  timeout 60 sh -ec "until kubectl -n tenant-test get hr $release >/dev/null 2>&1; do sleep 2; done"
-  kubectl -n tenant-test wait hr $release --timeout=5m --for=condition=ready
-
-  # Wait for COSI to provision bucket
-  timeout 60 sh -ec "until kubectl -n tenant-test get bucketclaims.objectstorage.k8s.io $release-registry >/dev/null 2>&1; do sleep 2; done"
-  kubectl -n tenant-test wait bucketclaims.objectstorage.k8s.io $release-registry \
-    --timeout=300s --for=jsonpath='{.status.bucketReady}'=true
-  timeout 60 sh -ec "until kubectl -n tenant-test get bucketaccesses.objectstorage.k8s.io $release-registry >/dev/null 2>&1; do sleep 2; done"
-  kubectl -n tenant-test wait bucketaccesses.objectstorage.k8s.io $release-registry \
-    --timeout=60s --for=jsonpath='{.status.accessGranted}'=true
-
-  kubectl -n tenant-test wait hr $release-system --timeout=600s --for=condition=ready || {
-    echo "=== HelmRelease status ==="
-    kubectl -n tenant-test get hr $release-system -o yaml 2>&1 || true
-    echo "=== Pods ==="
-    kubectl -n tenant-test get pods 2>&1 || true
-    echo "=== Events ==="
-    kubectl -n tenant-test get events --sort-by='.lastTimestamp' 2>&1 | tail -30 || true
-    echo "=== ExternalArtifact ==="
-    kubectl -n cozy-system get externalartifact cozystack-harbor-application-default-harbor-system -o yaml 2>&1 || true
-    echo "=== BucketClaim status ==="
-    kubectl -n tenant-test get bucketclaims.objectstorage.k8s.io $release-registry -o yaml 2>&1 || true
-    echo "=== BucketAccess status ==="
-    kubectl -n tenant-test get bucketaccesses.objectstorage.k8s.io $release-registry -o yaml 2>&1 || true
-    echo "=== BucketAccess Secret ==="
-    kubectl -n tenant-test get secret $release-registry-bucket -o jsonpath='{.data.BucketInfo}' 2>&1 | base64 -d 2>&1 || true
-    false
-  }
-  timeout 60 sh -ec "until kubectl -n tenant-test get deploy $release-core >/dev/null 2>&1; do sleep 2; done"
-  kubectl -n tenant-test wait deploy $release-core --timeout=120s --for=condition=available
-  timeout 60 sh -ec "until kubectl -n tenant-test get deploy $release-registry >/dev/null 2>&1; do sleep 2; done"
-  kubectl -n tenant-test wait deploy $release-registry --timeout=120s --for=condition=available
-  timeout 60 sh -ec "until kubectl -n tenant-test get deploy $release-portal >/dev/null 2>&1; do sleep 2; done"
-  kubectl -n tenant-test wait deploy $release-portal --timeout=120s --for=condition=available
-  kubectl -n tenant-test get secret $release-credentials -o jsonpath='{.data.admin-password}' | base64 --decode | grep -q '.'
-  kubectl -n tenant-test get secret $release-credentials -o jsonpath='{.data.url}' | base64 --decode | grep -q 'https://'
-  kubectl -n tenant-test get svc $release -o jsonpath='{.spec.ports[0].port}' | grep -q '80'
-  kubectl -n tenant-test delete harbor.apps.cozystack.io $name
-}
diff --git a/hack/e2e-apps/kafka.bats b/hack/e2e-apps/kafka.bats
deleted file mode 100644
index d0a8266b98..0000000000
--- a/hack/e2e-apps/kafka.bats
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/usr/bin/env bats
-
-@test "Create Kafka" {
-  name='test'
-  kubectl -n tenant-test delete kafka.apps.cozystack.io $name --ignore-not-found --timeout=2m || true
-  kubectl -n tenant-test wait kafka.apps.cozystack.io $name --for=delete --timeout=2m 2>/dev/null || true
-  kubectl apply -f- <<EOF
-apiVersion: apps.cozystack.io/v1alpha1
-kind: Kafka
-metadata:
-  name: $name
-  namespace: tenant-test
-spec:
-  external: false
-  kafka:
-    size: 10Gi
-    replicas: 2
-    storageClass: ""
-    resources: {}
-    resourcesPreset: "nano"
-  zookeeper:
-    size: 5Gi
-    replicas: 2
-    storageClass: ""
-    resources:
-    resourcesPreset: "nano"
-  topics:
-    - name: testResults
-      partitions: 1
-      replicas: 2
-      config:
-        min.insync.replicas: 2
-    - name: testOrders
-      config:
-        cleanup.policy: compact
-        segment.ms: 3600000
-        max.compaction.lag.ms: 5400000
-        min.insync.replicas: 2
-      partitions: 1
-      replicas: 2
-EOF
-  # Wait for the operator to materialise the HelmRelease before kubectl wait
-  # kicks in (kubectl wait errors immediately if the object does not exist yet).
-  timeout 60 sh -ec "until kubectl -n tenant-test get hr kafka-$name >/dev/null 2>&1; do sleep 2; done"
-  kubectl -n tenant-test wait hr kafka-$name --timeout=5m --for=condition=ready
-  timeout 60 sh -ec "until kubectl -n tenant-test get kafkas $name >/dev/null 2>&1; do sleep 2; done"
-  kubectl wait kafkas -n tenant-test $name --timeout=300s --for=condition=ready
-  timeout 60 sh -ec "until kubectl -n tenant-test get pvc data-kafka-$name-zookeeper-0; do sleep 10; done"
-  kubectl -n tenant-test wait pvc data-kafka-$name-zookeeper-0 --timeout=50s --for=jsonpath='{.status.phase}'=Bound
-  timeout 60 sh -ec "until kubectl -n tenant-test get pvc data-kafka-$name-zookeeper-1 >/dev/null 2>&1; do sleep 2; done"
-  kubectl -n tenant-test wait pvc data-kafka-$name-zookeeper-1 --timeout=50s --for=jsonpath='{.status.phase}'=Bound
-  timeout 40 sh -ec "until kubectl -n tenant-test get svc kafka-$name-zookeeper-client -o jsonpath='{.spec.ports[0].port}' | grep -q '2181'; do sleep 10; done"
-  timeout 40 sh -ec "until kubectl -n tenant-test get svc kafka-$name-zookeeper-nodes -o jsonpath='{.spec.ports[*].port}' | grep -q '2181 2888 3888'; do sleep 10; done"
-  timeout 80 sh -ec "until kubectl -n tenant-test get endpoints kafka-$name-zookeeper-nodes -o jsonpath='{.subsets[*].addresses[0].ip}' | grep -q '[0-9]'; do sleep 10; done"
-  kubectl -n tenant-test delete kafka.apps.cozystack.io $name --timeout=2m
-  # Strimzi reclaims ZooKeeper PVCs automatically when deleteClaim is true on
-  # the persistent-claim storage. Verify they disappear instead of issuing a
-  # manual kubectl delete, which would mask a regression in the operator.
-  timeout 60 sh -ec "while kubectl -n tenant-test get pvc data-kafka-$name-zookeeper-0 >/dev/null 2>&1; do sleep 2; done"
-  timeout 60 sh -ec "while kubectl -n tenant-test get pvc data-kafka-$name-zookeeper-1 >/dev/null 2>&1; do sleep 2; done"
-}
diff --git a/hack/e2e-apps/kubernetes-latest.bats b/hack/e2e-apps/kubernetes-latest.bats
deleted file mode 100644
index f9b5e67268..0000000000
--- a/hack/e2e-apps/kubernetes-latest.bats
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env bats
-
-@test "Create a tenant Kubernetes control plane with latest version" {
-  . hack/e2e-apps/run-kubernetes.sh
-  # 4th arg = enable_ouroboros: folds the standalone ouroboros.bats's
-  # hairpin-NAT reconciliation assertions onto this cluster instead of
-  # spinning up a second ~25m Kamaji bringup.
-  run_kubernetes_test 'keys | sort_by(.) | .[-1]' 'test-latest-version' '59991' 'true'
-}
diff --git a/hack/e2e-apps/kubernetes-previous.bats b/hack/e2e-apps/kubernetes-previous.bats
deleted file mode 100644
index f4d40a59e2..0000000000
--- a/hack/e2e-apps/kubernetes-previous.bats
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bats
-
-@test "Create a tenant Kubernetes control plane with previous version" {
-  . hack/e2e-apps/run-kubernetes.sh
-  run_kubernetes_test 'keys | sort_by(.) | .[-2]' 'test-previous-version' '59992'
-}
diff --git a/hack/e2e-apps/kuberture.bats b/hack/e2e-apps/kuberture.bats
deleted file mode 100644
index 04e2aaaece..0000000000
--- a/hack/e2e-apps/kuberture.bats
+++ /dev/null
@@ -1,251 +0,0 @@
-#!/usr/bin/env bats
-
-# Smoke-test the kuberture system addon: a Package CR for cozystack.kuberture
-# with config.outputs configured must materialise an HR in cozy-kuberture,
-# the controller Deployment must roll out, and the controller must create the
-# configured headless Services with the right external-dns annotations
-# (hostname/target/ttl) reflecting the IPs from default/kubernetes
-# EndpointSlice. Two outputs with different annotationPrefix values exercise
-# the cozystack-relevant property: a single kuberture instance can address
-# multiple external-dns instances from one platform-level package.
-#
-# cozytest.sh is plain POSIX shell — no `[[ ... ]]`, no bats `run` helper,
-# no FD 3, and `teardown()` is never auto-invoked. Cleanup is inlined at the
-# end of the @test body and runs on the success path only; the e2e Makefile's
-# sandbox teardown handles the failure case.
-
-# Shared cleanup so the inline success-path call at the end of the @test
-# body and the teardown hook (alive only under upstream bats) cannot
-# drift apart.
-_cleanup() {
-  # Probe Pods and their RBAC live outside the chart and need explicit
-  # teardown — the Package delete cascade does not own them. The
-  # ClusterRole/ClusterRoleBinding are cluster-scoped and would otherwise
-  # leak across e2e re-runs on the same sandbox cluster.
-  kubectl delete --namespace cozy-kuberture --ignore-not-found pod/kuberture-e2e-edns-public pod/kuberture-e2e-edns-internal 2>/dev/null || true
-  kubectl delete --namespace cozy-kuberture --ignore-not-found sa/kuberture-e2e-edns-probe 2>/dev/null || true
-  kubectl delete --ignore-not-found clusterrolebinding/kuberture-e2e-edns-probe clusterrole/kuberture-e2e-edns-probe 2>/dev/null || true
-  kubectl delete package.cozystack.io cozystack.kuberture --ignore-not-found --wait=true --timeout=180s 2>/dev/null || true
-}
-
-teardown() {
-  # Dead code under cozytest.sh — the runner never invokes it. Kept so
-  # the file still works under upstream bats (e.g. for local debugging
-  # via `bats hack/e2e-apps/kuberture.bats`).
-  _cleanup
-}
-
-@test "Platform-level kuberture publishes default/kubernetes EndpointSlice as annotated headless Services for multiple external-dns instances" {
-  pub_host=kuberture-e2e-public.cozystack.test
-  int_host=kuberture-e2e-internal.cozystack.test
-  pub_prefix=external-dns.alpha.kubernetes.io/
-  int_prefix=kuberture-e2e-internal-dns.io/
-
-  kubectl apply --filename - <<EOF
-apiVersion: cozystack.io/v1alpha1
-kind: Package
-metadata:
-  name: cozystack.kuberture
-spec:
-  variant: default
-  components:
-    kuberture:
-      values:
-        kuberture:
-          config:
-            outputs:
-              - name: public
-                hostname:
-                  - ${pub_host}
-                annotationPrefix: ${pub_prefix}
-                serviceName: kuberture-e2e-public
-                addressSource: endpointslice
-                recordTTL: 60
-              - name: internal
-                hostname:
-                  - ${int_host}
-                annotationPrefix: ${int_prefix}
-                serviceName: kuberture-e2e-internal
-                addressSource: endpointslice
-                recordTTL: 300
-EOF
-
-  # The cozystack operator materialises the namespace + HR from the Package;
-  # kubectl wait errors immediately if the object is not present yet, so loop
-  # until it appears before waiting on its condition.
-  timeout 180 sh -ec 'until kubectl get namespace cozy-kuberture >/dev/null 2>&1; do sleep 2; done'
-  timeout 180 sh -ec 'until kubectl --namespace cozy-kuberture get hr kuberture >/dev/null 2>&1; do sleep 2; done'
-  kubectl --namespace cozy-kuberture wait hr kuberture --timeout=300s --for=condition=ready
-
-  # Controller rollout. Use kubectl wait so the readiness check is anchored on
-  # the Available condition and not on a substring match of the replica count.
-  kubectl --namespace cozy-kuberture wait deployment kuberture --for=condition=available --timeout=180s
-
-  # The output Services are created reactively after the controller observes
-  # default/kubernetes EndpointSlice. Wait for both to appear.
-  for svc in kuberture-e2e-public kuberture-e2e-internal; do
-    timeout 120 sh -ec "until kubectl --namespace cozy-kuberture get service ${svc} >/dev/null 2>&1; do sleep 3; done"
-  done
-
-  # Both Services must be headless and carry external-dns annotations under
-  # their configured prefix. The `target` annotation must be non-empty —
-  # the actual IPs come from default/kubernetes EndpointSlice and depend on
-  # the cluster, so we only assert presence.
-  pub_json=$(kubectl --namespace cozy-kuberture get service kuberture-e2e-public --output json)
-  int_json=$(kubectl --namespace cozy-kuberture get service kuberture-e2e-internal --output json)
-
-  test "$(echo "${pub_json}" | jq --raw-output '.spec.clusterIP')" = "None"
-  test "$(echo "${int_json}" | jq --raw-output '.spec.clusterIP')" = "None"
-
-  test "$(echo "${pub_json}" | jq --raw-output --arg k "${pub_prefix}hostname" '.metadata.annotations[$k]')" = "${pub_host}"
-  test "$(echo "${int_json}" | jq --raw-output --arg k "${int_prefix}hostname" '.metadata.annotations[$k]')" = "${int_host}"
-
-  pub_target=$(echo "${pub_json}" | jq --raw-output --arg k "${pub_prefix}target" '.metadata.annotations[$k] // ""')
-  int_target=$(echo "${int_json}" | jq --raw-output --arg k "${int_prefix}target" '.metadata.annotations[$k] // ""')
-  test -n "${pub_target}"
-  test -n "${int_target}"
-
-  test "$(echo "${pub_json}" | jq --raw-output --arg k "${pub_prefix}ttl" '.metadata.annotations[$k]')" = "60"
-  test "$(echo "${int_json}" | jq --raw-output --arg k "${int_prefix}ttl" '.metadata.annotations[$k]')" = "300"
-
-  # The cross-prefix assertion proves the per-output isolation: the public
-  # Service must NOT carry the internal prefix's annotation, and vice versa.
-  test "$(echo "${pub_json}" | jq --raw-output --arg k "${int_prefix}hostname" '.metadata.annotations[$k] // "absent"')" = "absent"
-  test "$(echo "${int_json}" | jq --raw-output --arg k "${pub_prefix}hostname" '.metadata.annotations[$k] // "absent"')" = "absent"
-
-  # Routing proof: run two short-lived external-dns probes, each with a
-  # distinct --annotation-prefix, and verify each one picks up exactly its
-  # matching Service. This is the upstream Split Horizon DNS pattern from
-  # kubernetes-sigs/external-dns docs/advanced/split-horizon. inmemory
-  # provider + noop registry + --once means each probe runs one sync cycle
-  # against the live Services in cozy-kuberture, logs what it would publish,
-  # and exits — the logs are the assertion surface.
-  # external-dns 0.20 needs cluster-wide read on services/endpoints/nodes/
-  # namespaces even when `--namespace` narrows the source scope (informer
-  # cache initialisation reads cluster-wide before applying the filter).
-  # A namespace-scoped Role surfaces as a Pod crash without an obvious
-  # error in the bats log, so use ClusterRole + ClusterRoleBinding here.
-  kubectl apply --filename - <<EOF
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: kuberture-e2e-edns-probe
-  namespace: cozy-kuberture
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  name: kuberture-e2e-edns-probe
-rules:
-  - apiGroups: [""]
-    resources: ["services", "endpoints", "pods", "nodes", "namespaces"]
-    verbs: ["get", "list", "watch"]
-  - apiGroups: ["discovery.k8s.io"]
-    resources: ["endpointslices"]
-    verbs: ["get", "list", "watch"]
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  name: kuberture-e2e-edns-probe
-subjects:
-  - kind: ServiceAccount
-    name: kuberture-e2e-edns-probe
-    namespace: cozy-kuberture
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: kuberture-e2e-edns-probe
-EOF
-
-  # One Pod per probe — explicit instead of eval-indirection. cozytest.sh runs
-  # the body under a POSIX `sh` (not bash) and `${probe}_prefix` indirection
-  # via eval is brittle (a name mismatch produces "parameter not set" with no
-  # useful diagnostic). Two near-identical blocks read more clearly here.
-  kubectl apply --filename - <<EOF
-apiVersion: v1
-kind: Pod
-metadata:
-  name: kuberture-e2e-edns-public
-  namespace: cozy-kuberture
-spec:
-  serviceAccountName: kuberture-e2e-edns-probe
-  restartPolicy: Never
-  containers:
-    - name: edns
-      image: registry.k8s.io/external-dns/external-dns:v0.20.0
-      args:
-        - --source=service
-        - --namespace=cozy-kuberture
-        - --provider=inmemory
-        - --inmemory-zone=cozystack.test
-        - --registry=noop
-        - --once
-        - --interval=10s
-        - --annotation-prefix=${pub_prefix}
-        - --domain-filter=cozystack.test
-        - --log-level=info
-        - --log-format=text
----
-apiVersion: v1
-kind: Pod
-metadata:
-  name: kuberture-e2e-edns-internal
-  namespace: cozy-kuberture
-spec:
-  serviceAccountName: kuberture-e2e-edns-probe
-  restartPolicy: Never
-  containers:
-    - name: edns
-      image: registry.k8s.io/external-dns/external-dns:v0.20.0
-      args:
-        - --source=service
-        - --namespace=cozy-kuberture
-        - --provider=inmemory
-        - --inmemory-zone=cozystack.test
-        - --registry=noop
-        - --once
-        - --interval=10s
-        - --annotation-prefix=${int_prefix}
-        - --domain-filter=cozystack.test
-        - --log-level=info
-        - --log-format=text
-EOF
-
-  for probe in public internal; do
-    timeout 180 sh -ec "until kubectl --namespace cozy-kuberture get pod kuberture-e2e-edns-${probe} -o jsonpath='{.status.phase}' 2>/dev/null | grep -E '^(Succeeded|Failed)$' >/dev/null; do sleep 3; done"
-    phase=$(kubectl --namespace cozy-kuberture get pod kuberture-e2e-edns-${probe} -o jsonpath='{.status.phase}')
-    if [ "${phase}" != "Succeeded" ]; then
-      # Dump enough context to diagnose the failure from the bats log alone
-      # (the e2e sandbox is destroyed before the run artefacts ship, so
-      # post-mortem kubectl access on the cluster is not available).
-      echo "==== probe ${probe} failed: phase=${phase}; describe ===="
-      kubectl --namespace cozy-kuberture describe pod kuberture-e2e-edns-${probe} || true
-      echo "==== probe ${probe} logs (current container) ===="
-      kubectl --namespace cozy-kuberture logs pod/kuberture-e2e-edns-${probe} || true
-      echo "==== probe ${probe} logs (previous container, if any) ===="
-      kubectl --namespace cozy-kuberture logs pod/kuberture-e2e-edns-${probe} --previous || true
-      exit 1
-    fi
-  done
-
-  pub_logs=$(kubectl --namespace cozy-kuberture logs pod/kuberture-e2e-edns-public)
-  int_logs=$(kubectl --namespace cozy-kuberture logs pod/kuberture-e2e-edns-internal)
-
-  # The probe that reads the default external-dns prefix must see
-  # kuberture-e2e-public.cozystack.test (kuberture-e2e-public Service carries
-  # external-dns.alpha.kubernetes.io/hostname=...) and must NOT see the
-  # internal hostname (kuberture-e2e-internal carries only the internal prefix).
-  echo "${pub_logs}" | grep -F "${pub_host}" >/dev/null
-  ! echo "${pub_logs}" | grep -F "${int_host}" >/dev/null
-
-  # And the inverse for the internal-prefix probe.
-  echo "${int_logs}" | grep -F "${int_host}" >/dev/null
-  ! echo "${int_logs}" | grep -F "${pub_host}" >/dev/null
-
-  # _cleanup deletes the probe Pods, their SA, the ClusterRole+ClusterRoleBinding,
-  # and finally the Package CR. Inlined here for the success path so a re-run
-  # within the same e2e session starts clean; failure path is covered by the
-  # sandbox teardown.
-  _cleanup
-}
diff --git a/hack/e2e-apps/mariadb.bats b/hack/e2e-apps/mariadb.bats
deleted file mode 100644
index 0c1e3a5e86..0000000000
--- a/hack/e2e-apps/mariadb.bats
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/usr/bin/env bats
-
-@test "Create DB MariaDB" {
-  name='test'
-  kubectl -n tenant-test delete mariadbs.apps.cozystack.io $name --ignore-not-found --timeout=2m || true
-  kubectl apply -f- <<EOF
-apiVersion: apps.cozystack.io/v1alpha1
-kind: MariaDB
-metadata:
-  name: $name
-  namespace: tenant-test
-spec:
-  external: false
-  size: 10Gi
-  replicas: 2
-  storageClass: ""
-  users:
-    testuser:
-      maxUserConnections: 1000
-      password: xai7Wepo
-  databases:
-    testdb:
-      roles:
-        admin:
-        - testuser
-  backup:
-    enabled: false
-    s3Region: us-east-1
-    s3Bucket: s3.example.org/mariadb-backups
-    schedule: "0 2 * * *"
-    cleanupStrategy: "--keep-last=3 --keep-daily=3 --keep-within-weekly=1m"
-    s3AccessKey: oobaiRus9pah8PhohL1ThaeTa4UVa7gu
-    s3SecretKey: ju3eum4dekeich9ahM1te8waeGai0oog
-    resticPassword: ChaXoveekoh6eigh4siesheeda2quai0
-  resources: {}
-  resourcesPreset: "nano"
-EOF
-  # Wait for the operator to materialise the HelmRelease before kubectl wait
-  # kicks in (kubectl wait errors immediately if the object does not exist yet).
-  timeout 60 sh -ec "until kubectl -n tenant-test get hr mariadb-$name >/dev/null 2>&1; do sleep 2; done"
-  kubectl -n tenant-test wait hr mariadb-$name --timeout=5m --for=condition=ready
-  timeout 80 sh -ec "until kubectl -n tenant-test get svc mariadb-$name -o jsonpath='{.spec.ports[0].port}' | grep -q '3306'; do sleep 10; done"
-  timeout 80 sh -ec "until kubectl -n tenant-test get endpoints mariadb-$name -o jsonpath='{.subsets[*].addresses[*].ip}' | grep -q '[0-9]'; do sleep 10; done"
-  timeout 60 sh -ec "until kubectl -n tenant-test get statefulset.apps/mariadb-$name >/dev/null 2>&1; do sleep 2; done"
-  kubectl -n tenant-test wait statefulset.apps/mariadb-$name --timeout=110s --for=jsonpath='{.status.replicas}'=2
-  timeout 80 sh -ec "until kubectl -n tenant-test get svc mariadb-$name-metrics -o jsonpath='{.spec.ports[0].port}' | grep -q '9104'; do sleep 10; done"
-  timeout 40 sh -ec "until kubectl -n tenant-test get endpoints mariadb-$name-metrics -o jsonpath='{.subsets[*].addresses[*].ip}' | grep -q '[0-9]'; do sleep 10; done"
-  timeout 60 sh -ec "until kubectl -n tenant-test get deployment.apps/mariadb-$name-metrics >/dev/null 2>&1; do sleep 2; done"
-  kubectl -n tenant-test wait deployment.apps/mariadb-$name-metrics --timeout=90s --for=jsonpath='{.status.replicas}'=1
-  kubectl -n tenant-test delete mariadbs.apps.cozystack.io $name
-}
diff --git a/hack/e2e-apps/mongodb.bats b/hack/e2e-apps/mongodb.bats
deleted file mode 100644
index 0750e4317b..0000000000
--- a/hack/e2e-apps/mongodb.bats
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/usr/bin/env bats
-
-@test "Create DB MongoDB" {
-  name='test'
-  kubectl -n tenant-test delete mongodbs.apps.cozystack.io $name --ignore-not-found --timeout=2m || true
-  kubectl apply -f - <<EOF
-apiVersion: apps.cozystack.io/v1alpha1
-kind: MongoDB
-metadata:
-  name: $name
-  namespace: tenant-test
-spec:
-  external: false
-  size: 10Gi
-  replicas: 1
-  storageClass: ""
-  resourcesPreset: "small"
-  users:
-    testuser:
-      password: xai7Wepo
-  databases:
-    testdb:
-      roles:
-        admin:
-        - testuser
-  backup:
-    enabled: false
-EOF
-  # Wait for the operator to materialise the HelmRelease before kubectl wait
-  # kicks in (kubectl wait errors immediately if the object does not exist yet).
-  timeout 60 sh -ec "until kubectl -n tenant-test get hr mongodb-$name >/dev/null 2>&1; do sleep 2; done"
-  # Wait for HelmRelease
-  kubectl -n tenant-test wait hr mongodb-$name --timeout=5m --for=condition=ready
-  # Wait for MongoDB service (port 27017)
-  timeout 120 sh -ec "until kubectl -n tenant-test get svc mongodb-$name-rs0 -o jsonpath='{.spec.ports[0].port}' | grep -q '27017'; do sleep 10; done"
-  # Wait for endpoints
-  timeout 180 sh -ec "until kubectl -n tenant-test get endpoints mongodb-$name-rs0 -o jsonpath='{.subsets[*].addresses[*].ip}' | grep -q '[0-9]'; do sleep 10; done"
-  # Wait for StatefulSet replicas
-  timeout 60 sh -ec "until kubectl -n tenant-test get statefulset.apps/mongodb-$name-rs0 >/dev/null 2>&1; do sleep 2; done"
-  kubectl -n tenant-test wait statefulset.apps/mongodb-$name-rs0 --timeout=300s --for=jsonpath='{.status.replicas}'=1
-  # Cleanup
-  kubectl -n tenant-test delete mongodbs.apps.cozystack.io $name
-}
diff --git a/hack/e2e-apps/openbao.bats b/hack/e2e-apps/openbao.bats
deleted file mode 100644
index 81ca42b3e6..0000000000
--- a/hack/e2e-apps/openbao.bats
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/usr/bin/env bats
-
-@test "Create OpenBAO (standalone)" {
-  name='test'
-  kubectl -n tenant-test delete openbao.apps.cozystack.io $name --ignore-not-found --timeout=2m || true
-  kubectl apply -f- <<EOF
-apiVersion: apps.cozystack.io/v1alpha1
-kind: OpenBAO
-metadata:
-  name: $name
-  namespace: tenant-test
-spec:
-  replicas: 1
-  size: 10Gi
-  storageClass: ""
-  resourcesPreset: "small"
-  resources: {}
-  external: false
-  ui: true
-EOF
-  # Wait for the operator to materialise the HelmRelease before kubectl wait
-  # kicks in (kubectl wait errors immediately if the object does not exist yet).
-  timeout 60 sh -ec "until kubectl -n tenant-test get hr openbao-$name >/dev/null 2>&1; do sleep 2; done"
-  kubectl -n tenant-test wait hr openbao-$name --timeout=5m --for=condition=ready
-  kubectl -n tenant-test wait hr openbao-$name-system --timeout=5m --for=condition=ready
-
-  # Wait for container to be started (pod Running does not guarantee container is ready for exec on slow CI)
-  if ! timeout 120 sh -ec "until kubectl -n tenant-test get pod openbao-$name-0 --output jsonpath='{.status.containerStatuses[0].started}' 2>/dev/null | grep -q true; do sleep 5; done"; then
-    echo "=== DEBUG: Container did not start in time ===" >&2
-    kubectl -n tenant-test describe pod openbao-$name-0 >&2 || true
-    kubectl -n tenant-test logs openbao-$name-0 --previous >&2 || true
-    kubectl -n tenant-test logs openbao-$name-0 >&2 || true
-    return 1
-  fi
-
-  # Wait for OpenBAO API to accept connections
-  # bao status exit codes: 0 = unsealed, 1 = error/not ready, 2 = sealed but responsive
-  if ! timeout 60 sh -ec "until kubectl -n tenant-test exec openbao-$name-0 -- bao status >/dev/null 2>&1; rc=\$?; test \$rc -eq 0 -o \$rc -eq 2; do sleep 3; done"; then
-    echo "=== DEBUG: OpenBAO API did not become responsive ===" >&2
-    kubectl -n tenant-test describe pod openbao-$name-0 >&2 || true
-    kubectl -n tenant-test logs openbao-$name-0 --previous >&2 || true
-    kubectl -n tenant-test logs openbao-$name-0 >&2 || true
-    return 1
-  fi
-
-  # Initialize OpenBAO (single key share for testing simplicity)
-  init_output=$(kubectl -n tenant-test exec openbao-$name-0 -- bao operator init -key-shares=1 -key-threshold=1 -format=json)
-  unseal_key=$(echo "$init_output" | jq -r '.unseal_keys_b64[0]')
-  if [ -z "$unseal_key" ] || [ "$unseal_key" = "null" ]; then
-    echo "Failed to extract unseal key. Init output: $init_output" >&2
-    return 1
-  fi
-
-  # Unseal OpenBAO
-  kubectl -n tenant-test exec openbao-$name-0 -- bao operator unseal "$unseal_key"
-
-  # Now wait for pod to become ready (readiness probe checks seal status)
-  timeout 60 sh -ec "until kubectl -n tenant-test get sts openbao-$name >/dev/null 2>&1; do sleep 2; done"
-  kubectl -n tenant-test wait sts openbao-$name --timeout=90s --for=jsonpath='{.status.readyReplicas}'=1
-  timeout 60 sh -ec "until kubectl -n tenant-test get pvc data-openbao-$name-0 >/dev/null 2>&1; do sleep 2; done"
-  kubectl -n tenant-test wait pvc data-openbao-$name-0 --timeout=50s --for=jsonpath='{.status.phase}'=Bound
-  kubectl -n tenant-test delete openbao.apps.cozystack.io $name
-  kubectl -n tenant-test delete pvc data-openbao-$name-0 --ignore-not-found
-}
diff --git a/hack/e2e-apps/postgres.bats b/hack/e2e-apps/postgres.bats
deleted file mode 100644
index 44c0c5bd77..0000000000
--- a/hack/e2e-apps/postgres.bats
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/usr/bin/env bats
-
-@test "Create DB PostgreSQL" {
-  name='test'
-  kubectl -n tenant-test delete postgreses.apps.cozystack.io $name --ignore-not-found --timeout=2m || true
-  kubectl apply -f - <<EOF
-apiVersion: apps.cozystack.io/v1alpha1
-kind: Postgres
-metadata:
-  name: $name
-  namespace: tenant-test
-spec:
-  external: false
-  size: 10Gi
-  replicas: 2
-  storageClass: ""
-  postgresql:
-    parameters:
-      max_connections: "100"
-  quorum:
-    minSyncReplicas: 0
-    maxSyncReplicas: 0
-  users:
-    testuser:
-      password: xai7Wepo
-  databases:
-    testdb:
-      roles:
-        admin:
-        - testuser
-  backup:
-    enabled: false
-    s3Region: us-east-1
-    s3Bucket: s3.example.org/postgres-backups
-    schedule: "0 2 * * *"
-    cleanupStrategy: "--keep-last=3 --keep-daily=3 --keep-within-weekly=1m"
-    s3AccessKey: oobaiRus9pah8PhohL1ThaeTa4UVa7gu
-    s3SecretKey: ju3eum4dekeich9ahM1te8waeGai0oog
-    resticPassword: ChaXoveekoh6eigh4siesheeda2quai0
-  resources: {}
-  resourcesPreset: "nano"
-EOF
-  # Wait for the operator to materialise the HelmRelease before kubectl wait
-  # kicks in (kubectl wait errors immediately if the object does not exist yet).
-  timeout 60 sh -ec "until kubectl -n tenant-test get hr postgres-$name >/dev/null 2>&1; do sleep 2; done"
-  kubectl -n tenant-test wait hr postgres-$name --timeout=5m --for=condition=ready
-  timeout 60 sh -ec "until kubectl -n tenant-test get job.batch postgres-$name-init-job >/dev/null 2>&1; do sleep 2; done"
-  kubectl -n tenant-test wait job.batch postgres-$name-init-job --timeout=50s --for=condition=Complete
-  timeout 40 sh -ec "until kubectl -n tenant-test get svc postgres-$name-r -o jsonpath='{.spec.ports[0].port}' | grep -q '5432'; do sleep 10; done"
-  timeout 40 sh -ec "until kubectl -n tenant-test get svc postgres-$name-ro -o jsonpath='{.spec.ports[0].port}' | grep -q '5432'; do sleep 10; done"
-  timeout 40 sh -ec "until kubectl -n tenant-test get svc postgres-$name-rw -o jsonpath='{.spec.ports[0].port}' | grep -q '5432'; do sleep 10; done"
-  timeout 120 sh -ec "until kubectl -n tenant-test get endpoints postgres-$name-r -o jsonpath='{.subsets[*].addresses[*].ip}' | grep -q '[0-9]'; do sleep 10; done"
-  # for some reason it takes longer for the read-only endpoint to be ready
-  #timeout 120 sh -ec "until kubectl -n tenant-test get endpoints postgres-$name-ro -o jsonpath='{.subsets[*].addresses[*].ip}' | grep -q '[0-9]'; do sleep 10; done"
-  timeout 120 sh -ec "until kubectl -n tenant-test get endpoints postgres-$name-rw -o jsonpath='{.subsets[*].addresses[*].ip}' | grep -q '[0-9]'; do sleep 10; done"
-  kubectl -n tenant-test delete postgreses.apps.cozystack.io $name
-  kubectl -n tenant-test delete job.batch/postgres-$name-init-job
-}
diff --git a/hack/e2e-apps/qdrant.bats b/hack/e2e-apps/qdrant.bats
deleted file mode 100755
index 7d031a1d7d..0000000000
--- a/hack/e2e-apps/qdrant.bats
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/usr/bin/env bats
-
-@test "Create Qdrant" {
-  name='test'
-  kubectl -n tenant-test delete qdrant.apps.cozystack.io $name --ignore-not-found --timeout=2m || true
-  kubectl apply -f- <<EOF
-apiVersion: apps.cozystack.io/v1alpha1
-kind: Qdrant
-metadata:
-  name: $name
-  namespace: tenant-test
-spec:
-  replicas: 1
-  size: 10Gi
-  storageClass: ""
-  resourcesPreset: "nano"
-  resources: {}
-  external: false
-EOF
-  # Wait for the operator to materialise the HelmRelease before kubectl wait
-  # kicks in (kubectl wait errors immediately if the object does not exist yet).
-  timeout 60 sh -ec "until kubectl -n tenant-test get hr qdrant-$name >/dev/null 2>&1; do sleep 2; done"
-  kubectl -n tenant-test wait hr qdrant-$name --timeout=5m --for=condition=ready
-  kubectl -n tenant-test wait hr qdrant-$name-system --timeout=5m --for=condition=ready
-  timeout 60 sh -ec "until kubectl -n tenant-test get sts qdrant-$name >/dev/null 2>&1; do sleep 2; done"
-  kubectl -n tenant-test wait sts qdrant-$name --timeout=90s --for=jsonpath='{.status.readyReplicas}'=1
-  timeout 60 sh -ec "until kubectl -n tenant-test get pvc qdrant-storage-qdrant-$name-0 >/dev/null 2>&1; do sleep 2; done"
-  kubectl -n tenant-test wait pvc qdrant-storage-qdrant-$name-0 --timeout=50s --for=jsonpath='{.status.phase}'=Bound
-  kubectl -n tenant-test delete qdrant.apps.cozystack.io $name
-}
diff --git a/hack/e2e-apps/redis.bats b/hack/e2e-apps/redis.bats
deleted file mode 100644
index 98eb4595e9..0000000000
--- a/hack/e2e-apps/redis.bats
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/usr/bin/env bats
-
-@test "Create Redis" {
-  name='test'
-  kubectl -n tenant-test delete redis.apps.cozystack.io $name --ignore-not-found --timeout=2m || true
-  kubectl apply -f- <<EOF
-apiVersion: apps.cozystack.io/v1alpha1
-kind: Redis
-metadata:
-  name: $name
-  namespace: tenant-test
-spec:
-  external: false
-  size: 1Gi
-  replicas: 2
-  storageClass: ""
-  authEnabled: true
-  resources: {}
-  resourcesPreset: "nano"
-EOF
-  # Wait for the operator to materialise the HelmRelease before kubectl wait
-  # kicks in (kubectl wait errors immediately if the object does not exist yet).
-  timeout 60 sh -ec "until kubectl -n tenant-test get hr redis-$name >/dev/null 2>&1; do sleep 2; done"
-  kubectl -n tenant-test wait hr redis-$name --timeout=5m --for=condition=ready
-  timeout 60 sh -ec "until kubectl -n tenant-test get pvc redisfailover-persistent-data-rfr-redis-$name-0 >/dev/null 2>&1; do sleep 2; done"
-  kubectl -n tenant-test wait pvc redisfailover-persistent-data-rfr-redis-$name-0 --timeout=50s --for=jsonpath='{.status.phase}'=Bound
-  timeout 60 sh -ec "until kubectl -n tenant-test get deploy rfs-redis-$name >/dev/null 2>&1; do sleep 2; done"
-  kubectl -n tenant-test wait deploy rfs-redis-$name --timeout=90s --for=condition=available
-  timeout 60 sh -ec "until kubectl -n tenant-test get sts rfr-redis-$name >/dev/null 2>&1; do sleep 2; done"
-  kubectl -n tenant-test wait sts rfr-redis-$name --timeout=90s --for=jsonpath='{.status.replicas}'=2
-  kubectl -n tenant-test delete redis.apps.cozystack.io $name
-}
diff --git a/hack/e2e-apps/remediation-guard.sh b/hack/e2e-apps/remediation-guard.sh
deleted file mode 100644
index b45561b933..0000000000
--- a/hack/e2e-apps/remediation-guard.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-# Helpers for asserting that a Flux HelmRelease did not fall into an
-# install/upgrade remediation cycle during an e2e run.
-#
-# Background: Flux helm-controller's ClearFailures() zeroes
-# .status.installFailures / .status.upgradeFailures on every successful
-# reconciliation (see the upstream ClearFailures method on
-# HelmReleaseStatus). That makes those counters useless for a guard that
-# runs after the HelmRelease has reached Ready - the values are always 0.
-#
-# What survives a successful reconciliation is .status.history, a bounded
-# list of release Snapshots. Each Snapshot carries a status field that
-# tracks the Helm release state: deployed, superseded, failed, uninstalled,
-# and so on. A remediation cycle leaves the footprint behind: a snapshot
-# with status "uninstalled" (from install/upgrade remediation) or "failed"
-# (Helm release failure that remediation then uninstalled). Those stay in
-# history even after a subsequent successful reinstall.
-#
-# helmrelease_has_remediation_cycle takes a newline-delimited list of
-# snapshot statuses (whatever the caller extracted via kubectl -o jsonpath
-# or equivalent) and returns 0 (detected) when any entry is "failed" or
-# "uninstalled", 1 otherwise. Empty input is treated as "no history yet,
-# no cycle observed".
-
-helmrelease_has_remediation_cycle() {
-    statuses="$1"
-    if [ -z "${statuses}" ]; then
-        return 1
-    fi
-    # printf + grep over the pipe, rather than a heredoc plus while read.
-    # printf %s treats the status string as a literal payload, so any stray
-    # $ in a future caller's input does not trigger shell expansion. grep
-    # returns 0 iff at least one line matches the allowlist, which is
-    # exactly the contract the caller wants, so we can return its exit
-    # status directly.
-    if printf '%s\n' "${statuses}" | grep --extended-regexp --quiet '^(failed|uninstalled)$'; then
-        return 0
-    fi
-    return 1
-}
diff --git a/hack/e2e-apps/run-kubernetes.sh b/hack/e2e-apps/run-kubernetes.sh
deleted file mode 100644
index 10a959ac67..0000000000
--- a/hack/e2e-apps/run-kubernetes.sh
+++ /dev/null
@@ -1,523 +0,0 @@
-. hack/e2e-apps/remediation-guard.sh
-
-run_kubernetes_test() {
-    local version_expr="$1"
-    local test_name="$2"
-    local port="$3"
-    # Optional: when "true", enable the ouroboros addon on the Kubernetes CR
-    # and run the hairpin-NAT reconciliation assertions after the cluster is
-    # Ready. Folded in here so we don't pay a second ~25m Kamaji bringup just
-    # to flip one addon flag — kubernetes-latest passes "true", kubernetes-
-    # previous leaves it empty.
-    local enable_ouroboros="${4:-}"
-    local k8s_version
-    k8s_version=$(yq "$version_expr" packages/apps/kubernetes/files/versions.yaml)
-
-  # Clean up stale resources from a previous failed retry
-  kubectl -n tenant-test delete kuberneteses.apps.cozystack.io "${test_name}" --ignore-not-found --wait=false 2>/dev/null || true
-  kubectl -n tenant-test wait kuberneteses.apps.cozystack.io "${test_name}" --for=delete --timeout=2m 2>/dev/null || true
-
-  # Compose the optional ouroboros addon block. Indentation matches the
-  # surrounding addons map (4 spaces).
-  local ouroboros_addon=""
-  if [ "${enable_ouroboros}" = "true" ]; then
-    ouroboros_addon=$(cat <<'YAML'
-    ouroboros:
-      enabled: true
-      # logLevel=debug surfaces controller informer events for failure
-      # diagnosis; scoped to the e2e fixture only, production tenants stay
-      # on the upstream chart default (info).
-      valuesOverride:
-        ouroboros:
-          controller:
-            logLevel: debug
-YAML
-)
-  fi
-
-  kubectl apply -f - <<EOF
-apiVersion: apps.cozystack.io/v1alpha1
-kind: Kubernetes
-metadata:
-  name: "${test_name}"
-  namespace: tenant-test
-spec:
-  addons:
-    certManager:
-      enabled: false
-      valuesOverride: {}
-    cilium:
-      valuesOverride: {}
-    fluxcd:
-      enabled: false
-      valuesOverride: {}
-    gatewayAPI:
-      enabled: false
-    gpuOperator:
-      enabled: false
-      valuesOverride: {}
-    ingressNginx:
-      enabled: true
-      hosts: []
-      valuesOverride: {}
-    monitoringAgents:
-      enabled: false
-      valuesOverride: {}
-${ouroboros_addon}
-    verticalPodAutoscaler:
-      valuesOverride: {}
-  controlPlane:
-    apiServer:
-      resources: {}
-      resourcesPreset: small
-    controllerManager:
-      resources: {}
-      resourcesPreset: micro
-    konnectivity:
-      server:
-        resources: {}
-        resourcesPreset: micro
-    replicas: 2
-    scheduler:
-      resources: {}
-      resourcesPreset: micro
-  host: ""
-  nodeGroups:
-    md0:
-      diskSize: 20Gi
-      gpus: []
-      instanceType: u1.medium
-      maxReplicas: 10
-      minReplicas: 2
-      roles:
-      - ingress-nginx
-  storageClass: replicated
-  version: "${k8s_version}"
-EOF
-  # Wait for the tenant-test namespace to be active
-  kubectl wait namespace tenant-test --timeout=20s --for=jsonpath='{.status.phase}'=Active
-
-  # Wait for the Kamaji control plane to be created. Under Flux v2.8
-  # kstatus-based health checks helm-controller can take 20-30s to dispatch
-  # the new Kubernetes HR before it renders the KamajiControlPlane CR; the
-  # old 10s budget was tight on v2.7 and consistently fails on v2.8.
-  timeout 2m sh -ec 'until kubectl get kamajicontrolplane -n tenant-test kubernetes-'"${test_name}"'; do sleep 1; done'
-
-  # Wait for the tenant control plane to be fully created (timeout after 4 minutes)
-  kubectl wait --for=condition=TenantControlPlaneCreated kamajicontrolplane -n tenant-test kubernetes-${test_name} --timeout=4m
-
-  # Wait for Kubernetes resources to be ready (timeout after 2 minutes)
-  kubectl wait tcp -n tenant-test kubernetes-${test_name} --timeout=5m --for=jsonpath='{.status.kubernetesResources.version.status}'=Ready
-
-  # Wait for all required deployments to be available (timeout after 4 minutes)
-  kubectl wait deploy --timeout=4m --for=condition=available -n tenant-test kubernetes-${test_name} kubernetes-${test_name}-cluster-autoscaler kubernetes-${test_name}-kccm kubernetes-${test_name}-kcsi-controller
-
-  # Wait for the machine deployment to scale to 2 replicas (timeout after 1 minute)
-  kubectl wait machinedeployment kubernetes-${test_name}-md0 -n tenant-test --timeout=1m --for=jsonpath='{.status.replicas}'=2
-  # Get the admin kubeconfig and save it to a file
-  kubectl get secret kubernetes-${test_name}-admin-kubeconfig -ojsonpath='{.data.super-admin\.conf}' -n tenant-test | base64 -d > "tenantkubeconfig-${test_name}"
-
-  # Update the kubeconfig to use localhost for the API server
-  yq -i ".clusters[0].cluster.server = \"https://localhost:${port}\"" "tenantkubeconfig-${test_name}"
-
-
-  # Kill any stale port-forward on this port from a previous retry
-  pkill -f "port-forward.*${port}:" 2>/dev/null || true
-  sleep 1
-
-  # Set up port forwarding to the Kubernetes API server
-  # No timeout — process is killed at end of test or by job-level timeout-minutes
-  kubectl port-forward service/kubernetes-"${test_name}" -n tenant-test "${port}":6443 > /dev/null 2>&1 &
-  # Wait for port-forward to be ready before using it
-  timeout 15 sh -ec 'until curl -sk https://localhost:'"${port}"' >/dev/null 2>&1; do sleep 1; done'
-  # Verify the Kubernetes version matches what we expect (retry for up to 20 seconds)
-  timeout 20 sh -ec 'until kubectl --kubeconfig tenantkubeconfig-'"${test_name}"' version 2>/dev/null | grep -Fq "Server Version: ${k8s_version}"; do sleep 1; done'
-
-  # Wait for at least 2 nodes to join (timeout after 8 minutes)
-  timeout 8m bash -c '
-    until [ "$(kubectl --kubeconfig tenantkubeconfig-'"${test_name}"' get nodes -o jsonpath="{.items[*].metadata.name}" | wc -w)" -ge 2 ]; do
-      sleep 2
-    done
-  '
-  # Verify the nodes are ready
-  if ! kubectl --kubeconfig "tenantkubeconfig-${test_name}" wait node --all --timeout=3m --for=condition=Ready; then
-    # Dump debug info and fail fast — no point running LB/NFS tests without Ready nodes
-    kubectl --kubeconfig "tenantkubeconfig-${test_name}" describe nodes
-    kubectl -n tenant-test get hr
-    exit 1
-  fi
-  kubectl --kubeconfig "tenantkubeconfig-${test_name}" get nodes -o wide
-
-  # Verify the kubelet version matches what we expect
-  versions=$(kubectl --kubeconfig "tenantkubeconfig-${test_name}" \
-    get nodes -o jsonpath='{.items[*].status.nodeInfo.kubeletVersion}')
-
-  node_ok=true
-
-  for v in $versions; do
-    case "$v" in
-      "${k8s_version}" | "${k8s_version}".* | "${k8s_version}"-*)
-        # acceptable
-        ;;
-      *)
-        node_ok=false
-        break
-        ;;
-    esac
-  done
-
-  if [ "$node_ok" != true ]; then
-    echo "Kubelet versions did not match expected ${k8s_version}" >&2
-    exit 1
-  fi
-
-
-  kubectl --kubeconfig "tenantkubeconfig-${test_name}" apply -f - <<EOF
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: tenant-test
-EOF
-
-  # Clean up backend resources from any previous failed attempt
-  kubectl delete deployment --kubeconfig "tenantkubeconfig-${test_name}" "${test_name}-backend" \
-    -n tenant-test --ignore-not-found --timeout=60s || true
-  kubectl delete service --kubeconfig "tenantkubeconfig-${test_name}" "${test_name}-backend" \
-    -n tenant-test --ignore-not-found --timeout=60s || true
-
-  # Backend 1
-  kubectl apply --kubeconfig "tenantkubeconfig-${test_name}" -f- <<EOF
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: "${test_name}-backend"
-  namespace: tenant-test
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: backend
-      backend: "${test_name}-backend"
-  template:
-    metadata:
-      labels:
-        app: backend
-        backend: "${test_name}-backend"
-    spec:
-      containers:
-      - name: nginx
-        image: nginx:alpine
-        ports:
-        - containerPort: 80
-        readinessProbe:
-          httpGet:
-            path: /
-            port: 80
-          initialDelaySeconds: 2
-          periodSeconds: 2
-EOF
-
-  # LoadBalancer Service
-  kubectl apply --kubeconfig "tenantkubeconfig-${test_name}" -f- <<EOF
-apiVersion: v1
-kind: Service
-metadata:
-  name: "${test_name}-backend"
-  namespace: tenant-test
-spec:
-  type: LoadBalancer
-  selector:
-    app: backend
-    backend: "${test_name}-backend"
-  ports:
-  - port: 80
-    targetPort: 80
-EOF
-
-  # Wait for pods readiness
-  kubectl wait deployment --kubeconfig "tenantkubeconfig-${test_name}" "${test_name}-backend" -n tenant-test --for=condition=Available --timeout=300s
-
-  # Wait for LoadBalancer to be provisioned (IP or hostname)
-  timeout 90 sh -ec "
-    until kubectl get svc ${test_name}-backend --kubeconfig tenantkubeconfig-${test_name} -n tenant-test \
-      -o jsonpath='{.status.loadBalancer.ingress[0]}' | grep -q .; do
-      sleep 5
-    done
-  "
-
-  LB_ADDR=$(
-    kubectl get svc --kubeconfig "tenantkubeconfig-${test_name}" "${test_name}-backend" \
-      -n tenant-test \
-      -o jsonpath='{.status.loadBalancer.ingress[0].ip}{.status.loadBalancer.ingress[0].hostname}'
-  )
-
-  if [ -z "$LB_ADDR" ]; then
-    echo "LoadBalancer address is empty" >&2
-    exit 1
-  fi
-
-  # TODO(e2e-replace-fixed-timeouts): genuine retry loop. This validates an
-  # external HTTP path (MetalLB-advertised LB IP -> in-tenant ingress ->
-  # backend pod) which is not visible to the Kubernetes API as a single
-  # condition, so kubectl wait cannot replace it. The 20x3s = 60s budget is
-  # capped with `lb_ok=false` then asserted below.
-  lb_ok=false
-  for i in $(seq 1 20); do
-    echo "Attempt $i"
-    if curl --silent --fail "http://${LB_ADDR}"; then
-      lb_ok=true
-      break
-    fi
-    sleep 3
-  done
-
-  if [ "$lb_ok" != true ]; then
-    echo "LoadBalancer not reachable" >&2
-    exit 1
-  fi
-
-  # Cleanup
-  kubectl delete deployment --kubeconfig "tenantkubeconfig-${test_name}" "${test_name}-backend" -n tenant-test
-  kubectl delete service --kubeconfig "tenantkubeconfig-${test_name}" "${test_name}-backend" -n tenant-test
-
-  # Block until csi.kubevirt.io is registered on the tenant worker CSINode.
-  # Otherwise the NFS pod schedules while kubevirt-csi-node DaemonSet is
-  # still rolling out, eats ~1m on FailedAttachVolume retries, and trips
-  # the 5m pod-Succeeded budget when containerd's CreateContainer stalls.
-  kubectl wait hr -n tenant-test "kubernetes-${test_name}-csi" --timeout=10m --for=condition=ready
-
-  # Clean up NFS test resources from any previous failed attempt
-  kubectl --kubeconfig "tenantkubeconfig-${test_name}" delete pod nfs-test-pod \
-    -n tenant-test --ignore-not-found --timeout=60s || true
-  kubectl --kubeconfig "tenantkubeconfig-${test_name}" delete pvc nfs-test-pvc \
-    -n tenant-test --ignore-not-found --timeout=60s || true
-
-  # Test RWX NFS mount in tenant cluster (uses kubevirt CSI driver with RWX support)
-  kubectl --kubeconfig "tenantkubeconfig-${test_name}" apply -f - <<EOF
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: nfs-test-pvc
-  namespace: tenant-test
-spec:
-  accessModes:
-  - ReadWriteMany
-  storageClassName: kubevirt
-  resources:
-    requests:
-      storage: 1Gi
-EOF
-
-  # Wait for PVC to be bound (RWX via kubevirt CSI provisions an NFS server pod, needs time)
-  kubectl --kubeconfig "tenantkubeconfig-${test_name}" wait pvc nfs-test-pvc -n tenant-test --timeout=3m --for=jsonpath='{.status.phase}'=Bound
-
-  # Create Pod that writes and reads data from NFS volume
-  kubectl --kubeconfig "tenantkubeconfig-${test_name}" apply -f - <<EOF
-apiVersion: v1
-kind: Pod
-metadata:
-  name: nfs-test-pod
-  namespace: tenant-test
-spec:
-  containers:
-  - name: test
-    image: busybox
-    command: ["sh", "-c", "echo 'nfs-mount-ok' > /data/test.txt && cat /data/test.txt"]
-    volumeMounts:
-    - name: nfs-vol
-      mountPath: /data
-  volumes:
-  - name: nfs-vol
-    persistentVolumeClaim:
-      claimName: nfs-test-pvc
-  restartPolicy: Never
-EOF
-
-  # 10m, not 5m: host CDI prime PVC + tenant CSI mount + busybox pull worst-case bursts past 5m.
-  if ! kubectl --kubeconfig "tenantkubeconfig-${test_name}" wait pod nfs-test-pod -n tenant-test --timeout=10m --for=jsonpath='{.status.phase}'=Succeeded; then
-    echo "=== NFS test pod did not complete ===" >&2
-    kubectl --kubeconfig "tenantkubeconfig-${test_name}" describe pod nfs-test-pod -n tenant-test >&2 || true
-    kubectl --kubeconfig "tenantkubeconfig-${test_name}" get events -n tenant-test --sort-by='.lastTimestamp' >&2 || true
-    exit 1
-  fi
-
-  # Verify NFS data integrity
-  nfs_result=$(kubectl --kubeconfig "tenantkubeconfig-${test_name}" logs nfs-test-pod -n tenant-test)
-  if [ "$nfs_result" != "nfs-mount-ok" ]; then
-    echo "NFS mount test failed: expected 'nfs-mount-ok', got '$nfs_result'" >&2
-    kubectl --kubeconfig "tenantkubeconfig-${test_name}" delete pod nfs-test-pod -n tenant-test --wait=false 2>/dev/null || true
-    kubectl --kubeconfig "tenantkubeconfig-${test_name}" delete pvc nfs-test-pvc -n tenant-test --wait=false 2>/dev/null || true
-    exit 1
-  fi
-
-  # Cleanup NFS test resources in tenant cluster
-  kubectl --kubeconfig "tenantkubeconfig-${test_name}" delete pod nfs-test-pod -n tenant-test --wait
-  kubectl --kubeconfig "tenantkubeconfig-${test_name}" delete pvc nfs-test-pvc -n tenant-test
-
-  # Wait for all machine deployment replicas to be ready (timeout after 10 minutes)
-  kubectl wait machinedeployment kubernetes-${test_name}-md0 -n tenant-test --timeout=10m --for=jsonpath='{.status.v1beta2.readyReplicas}'=2
-
-  for component in cilium coredns csi vsnap-crd; do
-      kubectl wait hr "kubernetes-${test_name}-${component}" -n tenant-test --timeout=5m --for=condition=ready
-    done
-    kubectl wait hr "kubernetes-${test_name}-ingress-nginx" -n tenant-test --timeout=5m --for=condition=ready
-
-  # Optional ouroboros addon assertions. Folded in from the standalone
-  # ouroboros.bats so the test reuses this cluster instead of spinning up a
-  # second ~25m Kamaji bringup. The assertions cover: HR Ready, controller
-  # pod Running, Ingress->coredns-custom rewrite line injection, and the
-  # end-to-end DNS resolution proof from inside the tenant cluster.
-  if [ "${enable_ouroboros}" = "true" ]; then
-    kubectl wait hr "kubernetes-${test_name}-ouroboros" -n tenant-test \
-      --timeout=10m --for=condition=ready
-
-    # cozystack coredns wrapper renders an empty coredns-custom ConfigMap in
-    # kube-system; the ouroboros controller writes the rewrite snippet into
-    # its ouroboros.override key.
-    kubectl --kubeconfig "tenantkubeconfig-${test_name}" -n kube-system \
-      get configmap coredns-custom
-
-    # Upstream chart ships no readiness probe — wait covers pod Running only;
-    # the rewrite-snippet check below is the real reconciliation assertion.
-    kubectl --kubeconfig "tenantkubeconfig-${test_name}" -n cozy-ouroboros \
-      wait pod --selector=app.kubernetes.io/component=controller \
-      --timeout=5m --for=condition=ready
-
-    local hairpin_host=hairpin-cozystack-e2e.example.invalid
-    kubectl --kubeconfig "tenantkubeconfig-${test_name}" -n default apply -f - <<EOF
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: hairpin-probe
-spec:
-  ingressClassName: nginx
-  tls:
-    - hosts:
-        - ${hairpin_host}
-      secretName: hairpin-probe-tls
-  rules:
-    - host: ${hairpin_host}
-      http:
-        paths:
-          - path: /
-            pathType: Prefix
-            backend:
-              service:
-                name: hairpin-probe
-                port:
-                  number: 80
-EOF
-
-    # Poll the import ConfigMap for the rewrite line. Dump-the-whole-map
-    # form avoids the silent-empty kubectl jsonpath bracket-notation trap
-    # on ConfigMap keys with dots (e.g. ouroboros.override).
-    local deadline=$(( $(date +%s) + 300 ))
-    local snippet=
-    while [ "$(date +%s)" -lt "${deadline}" ]; do
-      snippet=$(kubectl --kubeconfig "tenantkubeconfig-${test_name}" -n kube-system \
-        get configmap coredns coredns-custom \
-        -o 'jsonpath={range .items[*]}{.metadata.name}{"\n"}{.data}{"\n---\n"}{end}' \
-        2>/dev/null || true)
-      if echo "${snippet}" | grep -q "rewrite name ${hairpin_host}"; then break; fi
-      sleep 5
-    done
-    if ! echo "${snippet}" | grep -q "rewrite name ${hairpin_host}"; then
-      echo "ouroboros rewrite snippet for ${hairpin_host} not written to coredns-custom within 5m" >&2
-      kubectl --kubeconfig "tenantkubeconfig-${test_name}" -n cozy-ouroboros \
-        logs --selector=app.kubernetes.io/component=controller --tail=200 --all-containers || true
-      exit 1
-    fi
-
-    # End-to-end proof: resolve the hairpin host from inside the tenant.
-    # CoreDNS reload-period default is 30s, so the in-pod loop is needed.
-    local proxy_ip
-    proxy_ip=$(kubectl --kubeconfig "tenantkubeconfig-${test_name}" -n cozy-ouroboros \
-      get service ouroboros-proxy -o jsonpath='{.spec.clusterIP}' 2>/dev/null || true)
-    if [ -z "${proxy_ip}" ]; then
-      echo "ouroboros-proxy Service has no ClusterIP" >&2
-      exit 1
-    fi
-    kubectl --kubeconfig "tenantkubeconfig-${test_name}" -n default \
-      delete pod dnscheck --ignore-not-found 2>/dev/null || true
-    kubectl --kubeconfig "tenantkubeconfig-${test_name}" -n default \
-      run dnscheck --image=nicolaka/netshoot:v0.13 --restart=Never \
-      --command -- sh -c "
-        deadline=\$(( \$(date +%s) + 120 ))
-        while [ \"\$(date +%s)\" -lt \"\${deadline}\" ]; do
-          addr=\$(dig +short +tries=2 +time=5 ${hairpin_host} | head -n 1)
-          echo \"resolved: \${addr:-<empty>}\"
-          if [ \"\${addr}\" = \"${proxy_ip}\" ]; then
-            exit 0
-          fi
-          sleep 5
-        done
-        echo \"timed out waiting for ${hairpin_host} to resolve to ${proxy_ip}\"
-        exit 1
-      "
-    local dns_deadline=$(( $(date +%s) + 180 ))
-    local phase=
-    while [ "$(date +%s)" -lt "${dns_deadline}" ]; do
-      phase=$(kubectl --kubeconfig "tenantkubeconfig-${test_name}" -n default \
-        get pod dnscheck -o jsonpath='{.status.phase}' 2>/dev/null || true)
-      case "${phase}" in
-        Succeeded|Failed) break ;;
-      esac
-      sleep 3
-    done
-    kubectl --kubeconfig "tenantkubeconfig-${test_name}" -n default \
-      logs dnscheck 2>&1 | sed 's/^/  dnscheck: /' || true
-    if [ "${phase:-}" != "Succeeded" ]; then
-      echo "dnscheck pod did not reach Succeeded phase (last seen: ${phase:-<empty>})" >&2
-      exit 1
-    fi
-
-    kubectl --kubeconfig "tenantkubeconfig-${test_name}" -n default \
-      delete pod dnscheck --ignore-not-found 2>/dev/null || true
-    kubectl --kubeconfig "tenantkubeconfig-${test_name}" -n default \
-      delete ingress hairpin-probe --ignore-not-found 2>/dev/null || true
-  fi
-
-  # Wait for the parent kubernetes-${test_name} HR to be Ready before the
-  # remediation guard runs. The guard reads `.status.history`, which is empty
-  # until the helm install action completes — under Flux v2.8 kstatus the
-  # parent's helm install can still be "Running 'install'" after every child
-  # HR (cilium, coredns, csi, vsnap-crd, ingress-nginx) is already Ready,
-  # because kstatus walks all applied resources before flipping the parent
-  # Ready.
-  kubectl wait hr -n tenant-test "kubernetes-${test_name}" --timeout=5m --for=condition=ready
-
-  # Guard: parent HelmRelease must not have entered an install/upgrade remediation cycle.
-  # A non-zero installFailures/upgradeFailures indicates the helm-wait budget expired while
-  # admin-kubeconfig was still being provisioned, which would trigger uninstall remediation
-  # and churn the Cluster CR.
-  # Flux helm-controller v2 retains per-revision release Snapshots in
-  # .status.history; each Snapshot's .status reflects the Helm release
-  # state (deployed/superseded/failed/uninstalled). A remediation cycle
-  # leaves a "failed" or "uninstalled" entry behind that survives a later
-  # successful reinstall, unlike the installFailures/upgradeFailures
-  # counters (which ClearFailures zeroes on every successful reconcile).
-  # The shape is pinned by hack/remediation-guard.bats; the upstream
-  # types are github.com/fluxcd/helm-controller/api v2 Snapshot.
-  history_statuses=$(kubectl get hr -n tenant-test "kubernetes-${test_name}" \
-    -ojsonpath='{range .status.history[*]}{.status}{"\n"}{end}')
-  # Always emit the raw value so a silent future-Flux field rename shows
-  # up as "empty history on a Ready HR" in CI logs rather than vanishing.
-  echo "Parent HelmRelease history statuses:"
-  printf '%s\n' "${history_statuses:-<empty>}"
-  if [ -z "${history_statuses}" ]; then
-    echo "Unexpected empty .status.history on a Ready HelmRelease - Flux API shape may have changed." >&2
-    kubectl -n tenant-test describe hr "kubernetes-${test_name}" >&2
-    exit 1
-  fi
-  if helmrelease_has_remediation_cycle "${history_statuses}"; then
-    echo "Parent HelmRelease entered remediation cycle." >&2
-    kubectl -n tenant-test describe hr "kubernetes-${test_name}" >&2
-    exit 1
-  fi
-
-  # Clean up
-  pkill -f "port-forward.*${port}:" 2>/dev/null || true
-  rm -f "tenantkubeconfig-${test_name}"
-  kubectl -n tenant-test delete kuberneteses.apps.cozystack.io "${test_name}" --ignore-not-found --wait=false 2>/dev/null || true
-
-}
diff --git a/hack/e2e-apps/vminstance.bats b/hack/e2e-apps/vminstance.bats
deleted file mode 100644
index 79b0ef6b9e..0000000000
--- a/hack/e2e-apps/vminstance.bats
+++ /dev/null
@@ -1,117 +0,0 @@
-#!/usr/bin/env bats
-
-@test "Create a VM Disk" {
-  name='test'
-  # Delete any leftover from a previous run and BLOCK until removal completes.
-  # `kubectl apply` on a resource still in finalizer-drain silently no-ops
-  # ("Detected changes to resource ... which is currently being deleted"),
-  # which then races a NotFound on the downstream HR wait. The previous
-  # `|| true` swallowed timeout errors here and let the test continue with
-  # the old VMDisk still draining. Bumped timeout to 3m and removed `|| true`
-  # so a true delete failure surfaces immediately.
-  kubectl -n tenant-test delete vminstances.apps.cozystack.io $name --ignore-not-found --timeout=3m
-  kubectl -n tenant-test delete vmdisks.apps.cozystack.io $name --ignore-not-found --timeout=3m
-  kubectl apply -f - <<EOF
-apiVersion: apps.cozystack.io/v1alpha1
-kind: VMDisk
-metadata:
-  name: $name
-  namespace: tenant-test
-spec:
-  source:
-    http:
-      url: https://cloud-images.ubuntu.com/noble/current/noble-server-cloudimg-amd64.img
-  optical: false
-  storage: 5Gi
-  storageClass: replicated
-EOF
-  # Wait for the operator to materialise the HelmRelease before kubectl wait
-  # kicks in (kubectl wait errors immediately if the object does not exist yet).
-  timeout 60 sh -ec "until kubectl -n tenant-test get hr vm-disk-$name >/dev/null 2>&1; do sleep 2; done"
-  kubectl -n tenant-test wait hr vm-disk-$name --timeout=5m --for=condition=ready
-  kubectl -n tenant-test wait dv vm-disk-$name --timeout=250s --for=condition=ready
-  kubectl -n tenant-test wait pvc vm-disk-$name --timeout=200s --for=jsonpath='{.status.phase}'=Bound
-  # Drop the VMDisk so the next test starts from a clean slate. Each test
-  # owns its own resources; "Create a VM Instance" creates its own VMDisk
-  # inline rather than depending on this one.
-  kubectl -n tenant-test delete vmdisks.apps.cozystack.io $name --ignore-not-found --timeout=3m
-}
-
-@test "Create a VM Instance" {
-  # Use a distinct disk name from "Create a VM Disk" so a flaky finalizer
-  # drain on the prior disk's PV/PVC cannot collide with this test's apply.
-  diskName='vmi-test'
-  name='test'
-  # Pre-clean any leftover VMInstance from a prior run. The VMDisk is
-  # created by this test (decoupled from "Create a VM Disk" above), so no
-  # predelete here — the prior test already cleaned up its own VMDisk.
-  kubectl -n tenant-test delete vminstances.apps.cozystack.io $name --ignore-not-found --timeout=3m
-  # Create the VMDisk this test depends on. Same wait-for-HR pattern as the
-  # first test, so this block is self-contained.
-  kubectl apply -f - <<EOF
-apiVersion: apps.cozystack.io/v1alpha1
-kind: VMDisk
-metadata:
-  name: $diskName
-  namespace: tenant-test
-spec:
-  source:
-    http:
-      url: https://cloud-images.ubuntu.com/noble/current/noble-server-cloudimg-amd64.img
-  optical: false
-  storage: 5Gi
-  storageClass: replicated
-EOF
-  timeout 60 sh -ec "until kubectl -n tenant-test get hr vm-disk-$diskName >/dev/null 2>&1; do sleep 2; done"
-  kubectl -n tenant-test wait hr vm-disk-$diskName --timeout=5m --for=condition=ready
-  kubectl -n tenant-test wait dv vm-disk-$diskName --timeout=250s --for=condition=ready
-  kubectl -n tenant-test wait pvc vm-disk-$diskName --timeout=200s --for=jsonpath='{.status.phase}'=Bound
-  kubectl apply -f - <<EOF
-apiVersion: apps.cozystack.io/v1alpha1
-kind: VMInstance
-metadata:
-  name: $name
-  namespace: tenant-test
-spec:
-  external: false
-  externalMethod: PortList
-  externalPorts:
-  - 22
-  running: true
-  instanceType: "u1.medium"
-  instanceProfile: ubuntu
-  disks:
-    - name: $diskName
-  gpus: []
-  sshKeys:
-  - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPht0dPk5qQ+54g1hSX7A6AUxXJW5T6n/3d7Ga2F8gTF
-    test@test
-  cloudInit: |
-    #cloud-config
-    users:
-      - name: test
-        shell: /bin/bash
-        sudo: ['ALL=(ALL) NOPASSWD: ALL']
-        groups: sudo
-        ssh_authorized_keys:
-          - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPht0dPk5qQ+54g1hSX7A6AUxXJW5T6n/3d7Ga2F8gTF test@test
-  cloudInitSeed: ""
-EOF
-  # Wait for the operator to materialise the HelmRelease before downstream
-  # waits proceed (kubectl wait errors immediately if the HR does not exist).
-  timeout 60 sh -ec "until kubectl -n tenant-test get hr vm-instance-$name >/dev/null 2>&1; do sleep 2; done"
-  # Wait for the parent HR Ready before polling for the VMI. Under Flux v2.8
-  # kstatus the helm install can be still dispatching when the previous
-  # ordering assumed it had already applied the VirtualMachine CR — without
-  # this the next poll for `vmi vm-instance-$name` returned NotFound for
-  # its entire 120s budget because kubevirt hadn't seen the VM yet.
-  kubectl -n tenant-test wait hr vm-instance-$name --timeout=5m --for=condition=ready
-  # Nested KubeVirt VM startup (virt-launcher + libvirt + cloud-init DHCP)
-  # routinely takes 30-60s under runner load. 5m is a comfortable upper
-  # bound for nested virt + slow runner I/O after the HR-Ready gate.
-  timeout 5m sh -ec "until kubectl -n tenant-test get vmi vm-instance-$name -o jsonpath='{.status.interfaces[0].ipAddress}' | grep -q '[0-9]'; do sleep 2; done"
-  # VM ready follows IP assignment closely; 60s gives buffer for the qemu-guest-agent.
-  kubectl -n tenant-test wait vm vm-instance-$name --timeout=5m --for=condition=ready
-  kubectl -n tenant-test delete vminstances.apps.cozystack.io $name --ignore-not-found --timeout=3m
-  kubectl -n tenant-test delete vmdisks.apps.cozystack.io $diskName --ignore-not-found --timeout=3m
-}
diff --git a/hack/e2e-capture-dataplane.sh b/hack/e2e-capture-dataplane.sh
new file mode 100755
index 0000000000..9e48d31200
--- /dev/null
+++ b/hack/e2e-capture-dataplane.sh
@@ -0,0 +1,1784 @@
+#!/bin/sh
+# e2e-capture-dataplane.sh - capture host->pod data-plane state for NotReady pods.
+#
+# DIAGNOSTIC ONLY. This script collects extra evidence on an already-failed
+# test; it never mutates the cluster and never changes the test's pass/fail
+# outcome. Two callers invoke it, each from its own on-failure path and each
+# AFTER the crust-gather snapshot: the cozytest.sh EXIT trap and the Chainsaw
+# global catch in hack/e2e-chainsaw/.chainsaw.yaml. Both write into the same
+# snapshot dir so the output lands in the uploaded cozyreport artifact, and both
+# wrap this script in a wall-clock backstop -- but not the same one (600s and
+# 300s respectively). The script therefore keeps its own wall-clock budget,
+# sized under each caller's backstop: see DP_BUDGET below.
+#
+# Why this exists: a recurrent install failure is a CNI host->local-pod
+# data-plane transient -- kubelet on a node reaches a *local* pod's
+# readiness/startup probe with "connection refused" for several minutes while
+# overlay (pod->pod) traffic works, then it self-heals. This is rooted in the
+# cozystack cilium+kube-ovn chaining config (forced enable-host-legacy-routing,
+# CNI InstallEndpointRoute:false -> host->local-pod routing is delegated to
+# kube-ovn/ovn0). The standard crust-gather snapshot captures Kubernetes object
+# state but NOT the L3 forwarding state on the node, so the mechanism cannot be
+# root-caused after the fact. This collects exactly that state from the pod's
+# node so the next recurrence is dispositive.
+#
+# What it captures, per affected pod (NotReady and scheduled; podIP may still
+# be empty while CNI endpoint allocation is the thing that is stuck):
+#   - cilium-agent on the node:  cilium-dbg endpoint list; the whole
+#     `cilium-dbg bpf lb list` service map, ClusterIP included; bpf ct entries for
+#     the podIP; a short bounded `cilium-dbg monitor --type drop`; hubble
+#     dropped-verdict observations (if the hubble CLI is present in the agent).
+#     NOTE: under enable-host-legacy-routing the host->local-pod path traverses
+#     the KERNEL netfilter stack, not cilium BPF, so the cilium CT/monitor view
+#     is complementary -- the authoritative conntrack table for this path is the
+#     kernel one captured below. Both are kept: cilium's view still covers
+#     pod->pod and confirms the path is NOT in BPF, which is itself evidence.
+#   - host netns on the node (via the kube-ovn cni-server, which is
+#     hostNetwork+NET_ADMIN): `ip route get <podIP>`, `ip neigh`, `ip rule`,
+#     `ip addr show ovn0`, and the KERNEL conntrack entries for the podIP
+#     (`conntrack -L`, falling back to /proc/net/nf_conntrack). These reveal a
+#     kernel-path misforward / missing route / wrong rule / unresolved neighbor
+#     -- the actual mechanism behind host->local-pod "connection refused" on the
+#     legacy-routing path (the crux of the transient).
+#   - Address attribution for a podIP that turns out to be a LOCAL address of
+#     the host netns instead of reachable via ovn0 (a route to nowhere-in-
+#     particular is not enough to name the owner): the same host netns above
+#     also gets `ip -o addr show` (every interface) and `ip route show table
+#     local`, and one Ready, Running, non-hostNetwork pod on the same node that
+#     has an address gets the route and conntrack half of the per-pod capture
+#     below as an in-run healthy-pod control, since this collector otherwise
+#     inspects NotReady pods only and had no same-window baseline. hostNetwork
+#     is excluded because its podIP IS the node's own address, so it would show
+#     the same local-route fingerprint as the fault for an unrelated reason.
+#   - OVS/OVN on the node: `ovs-ofctl dump-flows br-int`, and the OVN
+#     Port_Binding / Logical_Switch_Port for the pod (LSP name = <pod>.<ns> in
+#     kube-ovn) plus a bounded `ovn-sbctl lflow-list`.
+#   - OVN flow-programming timing on the node (ovs-ovn pod, app=ovs -- its
+#     openvswitch container also runs ovn-controller): the tail of
+#     /var/log/ovn/ovn-controller.log plus a grep for the decisive lines
+#     (physical_flow_output, if_status_mgr, "took <N>ms", recompute,
+#     "Unreasonably long ... poll interval"); the per-interface ovn-installed
+#     flag + ovn-installed-ts on the pod's OVS interface; and the ovs-ovn
+#     container's cgroup cpu.stat (nr_throttled / throttled_usec). Why: the
+#     host->local-pod transient is consistent with OVN incremental-processing
+#     lag -- ovn-installed=true (the kubelet/CNI "port ready" barrier) is set by
+#     if_status_mgr BEFORE physical_flow_output installs the LSP's local-delivery
+#     OpenFlow under burst, aggravated when ovn-controller is CPU-throttled (it
+#     shares the ovs-ovn CPU limit with vswitchd). A `physical_flow_output ...
+#     took <N>ms` line spanning the failure window, an ovn-installed-ts that
+#     predates that flow, and non-zero cpu.stat throttling together make a
+#     recurrence dispositive.
+#
+# What it ALSO captures (added section) -- an UNREACHABLE LoadBalancer datapath:
+#   The NotReady-pod trigger above misses a second, equally-recurrent flake. A
+#   tenant `Service type=LoadBalancer` IP goes unreachable while its backend
+#   pod/VMI stays Ready+Running -- so there is NO NotReady pod, the capture above
+#   no-ops, and the host->cross-node->bridged-worker-VMI->tenant-nodePort
+#   datapath (the suspected failing path) is never characterised. This section
+#   closes that gap. It is gated by a LIVE reachability probe so it only does the
+#   heavy capture for an LB that is actually broken; reachable LBs are enumerated
+#   and explicitly recorded as "reachable, skipped", and an LB no probe could be
+#   run against is recorded as unprobed rather than as either of those.
+#     - Enumerate every Service type=LoadBalancer that has a status ingress IP.
+#       For each, derive: the EndpointSlice backend (endpoint IP + node +
+#       targetPort), the Service nodePort + externalTrafficPolicy, and the
+#       ANNOUNCER node from the MetalLB speaker logs (the hostNetwork speaker is
+#       the L2 owner; the node of its most recent serviceAnnounced for the IP is
+#       the announcer).
+#     - Probe the LB IP:port a few times from a host netns (the kube-ovn
+#       cni-server, so the probe traverses the same host-sourced datapath the
+#       flake breaks). Only an LB whose every probe FAILS gets the heavy capture
+#       below, and that same probe is the traffic the tcpdumps observe.
+#     - For a FAILING LB, on BOTH the announcer node and the endpoint node
+#       (reusing pod_on_node), labelled by node + role (ANNOUNCER vs ENDPOINT):
+#         * `cilium-dbg bpf lb list` grepped for the LB IP + nodePort -- did the
+#           HOST cilium program the LB->backend translation? This is the first
+#           fork: host-cilium-not-programming vs kube-ovn-delivery-failure.
+#         * kernel `conntrack -L -d <LB IP>` + `ip neigh` (LB IP, endpoint IP)
+#           via the cni-server host netns.
+#         * `ovs-ofctl dump-flows br-int` filtered to the nodePort / endpoint IP.
+#         * a bounded `tcpdump` on the announcer node's geneve tunnel iface and
+#           the endpoint node's backend OVS/tap iface, run WHILE the probe is
+#           replayed, to show whether the packet crosses announcer->endpoint and
+#           reaches the backend's host-side interface.
+#         * the ovn-controller.log decisive lines for the window.
+#     In-guest capture INSIDE the worker VMI (tenant `cilium-dbg bpf lb list` /
+#     `tcpdump eth0`) is the one hop this cannot reach from the host; it is left
+#     as a documented stretch at the call site (it needs a tenant
+#     kubeconfig/virtctl that neither caller of this diagnostic has). The
+#     host-side ANNOUNCER/ENDPOINT split is the deliverable and already
+#     localises the failing hop to host-cilium vs kube-ovn delivery.
+#
+# Robustness contract (matches docs/agents/e2e-testing.md): pure diagnostics,
+# no retries, no behavior change, no traps. Every live capture is time-boxed
+# by dp_run, and no command can fail or stall the job: most are `|| true`, and
+# the few whose status is read take it into a variable and use it only to say
+# why a read produced nothing. A wall-clock backstop wraps the whole run at each
+# call site. It no-ops cleanly when there are no affected pods.
+#
+# Why a read produced nothing is written to capture-notes.txt beside the
+# capture, not only to the job log: the reader who has the uploaded report and
+# not the run is the one who cannot otherwise tell a capture that found nothing
+# from one that never ran.
+set -u
+
+# --------------------------------------------------------------------------- #
+# Pure, side-effect-free helpers for the LoadBalancer-datapath section below.  #
+# Each takes text on stdin / in args and emits text -- no kubectl, no globals  #
+# -- so hack/capture-dataplane.bats can source this file (with                 #
+# E2E_CAPTURE_DATAPLANE_LIB set, see the guard below) and unit-test the        #
+# enumeration parsing, announcer-node detection, and capture-or-skip decision  #
+# against mock input without a cluster. Keep them above the guard and free of  #
+# any runtime state.                                                           #
+# --------------------------------------------------------------------------- #
+
+# lb_filter_services: stdin = `ns|name|type|lbip|port|nodePort|extPolicy` rows
+# (one Service per line, as emitted by the kubectl jsonpath in main). Emits only
+# the rows that are type=LoadBalancer AND carry a status ingress IP -- i.e. the
+# Services that actually have an external datapath to characterise.
+#
+# NF == 7 first, because a truncated list is exactly what a bounded or
+# interrupted read leaves behind and a fragment passes a value-only test: an IP
+# cut mid-octet still looks like an IP, and the row it sits in would be probed
+# and written up as a Service that has no such address. The jsonpath emits a
+# fixed seven fields per record, so anything shorter is a cut rather than a
+# Service. Dropping it loses nothing a reader needs -- the read's own note
+# already says the list did not finish.
+#
+# What a field count cannot catch on its own: a cut inside the LAST field
+# still delivers every separator, so `...|30080|Clus` counts seven and passes,
+# and nothing in-band separates a truncated final value from a short one. Here
+# the last column is display-only, so it costs nothing.
+# `lb_first_ready_endpoint` decides on its own last column (`ready`) as a
+# deny-list against the single value `false`, so a truncated value matches
+# nothing it excludes and the row is kept -- over-capturing rather than
+# dropping evidence, the safe direction for a diagnostic.
+#
+# The two pod filters do not rely on that reasoning at all. Their jsonpath
+# ends in a constant `eol` column, and both require it present and intact, so
+# a cut anywhere in a row either drops the field count or corrupts the
+# sentinel. That matters for `pod_first_ready` specifically: it decides on
+# `hostNetwork`, and a cut landing exactly on the preceding separator leaves
+# that column EMPTY, which is byte-identical to the omitempty-false the filter
+# must accept. No test of the value itself can tell those apart -- only a
+# marker after it can. Either way the read's own cut-off note is what tells
+# the reader the list ended early.
+lb_filter_services() {
+  awk -F'|' 'NF == 7 && $3 == "LoadBalancer" && $4 != "" { print }'
+}
+
+# lb_first_ready_endpoint: stdin = `ip|node|targetNs|targetName|ready` rows (one
+# EndpointSlice endpoint per line). Emits `ip|node|targetNs|targetName` for the
+# first endpoint that has an address and is not explicitly NotReady, then stops.
+# A blank `ready` (slice without conditions) counts as ready; only "false" is
+# excluded. This is the backend the LB IP is supposed to reach.
+#
+# NF == 5 for the reason the two row filters carry their own counts, and it
+# matters more here: this one stops at the first row it accepts, so a fragment
+# at the head of the list is not one bad row among many -- it is the backend,
+# and its half-parsed node is the node every endpoint-side capture below aims
+# at. Five fields per endpoint is what the jsonpath emits.
+lb_first_ready_endpoint() {
+  awk -F'|' 'NF == 5 && $1 != "" && $5 != "false" { print $1 "|" $2 "|" $3 "|" $4; exit }'
+}
+
+# lb_announcer_node <lbip>: stdin = MetalLB speaker logs, each line prefixed with
+# the emitting speaker pod's node and a TAB (`<node>\t<logline>`). The speaker is
+# hostNetwork and only the elected L2 owner currently announces the IP. Reports a
+# node ONLY IF that node's LAST own IP-event for this exact IP is an announce: per
+# node we track its most recent announce/withdraw line for the IP, so a node that
+# announced then withdrew (last event = withdraw) is excluded and a node that is
+# still announcing (last event = announce) qualifies. This is robust to the
+# per-pod (not globally time-sorted) concat order of the speaker logs and to L2
+# failover. If more than one node still qualifies (should not happen for an L2
+# announce), the one whose last announce appears latest in the input wins.
+# The IP is matched as a whole token (not a substring), so a query for
+# `192.0.2.5` does NOT match a `192.0.2.50` line. Emits the announcer node, or
+# nothing when no node currently announces the IP.
+lb_announcer_node() {
+  awk -F'\t' -v ip="$1" '
+    BEGIN {
+      # Match the IP as a maximal IP-literal token: not flanked by another
+      # IP char (digit / dot / hex / colon), so `192.0.2.5` != `192.0.2.50`.
+      # `[.]` escapes each dot portably (no gsub-replacement backslash games).
+      ipre = ip
+      gsub(/\./, "[.]", ipre)
+      re = "(^|[^0-9A-Fa-f:.])" ipre "([^0-9A-Fa-f:.]|$)"
+    }
+    $0 ~ re {
+      if      ($0 ~ /[Ww]ithdraw/) ev = "withdraw"
+      else if ($0 ~ /[Aa]nnounc/)  ev = "announce"
+      else                         next
+      last_ev[$1]   = ev
+      last_line[$1] = NR
+    }
+    END {
+      best = ""; bestline = -1
+      for (n in last_ev) {
+        if (last_ev[n] == "announce" && last_line[n] > bestline) {
+          bestline = last_line[n]
+          best = n
+        }
+      }
+      if (best != "") print best
+    }'
+}
+
+# lb_capture_decision: stdin = one probe outcome token per line ("ok" / "fail" /
+# "unknown" / "spent"; the last two mean the probe reached no verdict, and
+# "spent" that the wall-clock budget stopped it, so both weigh the same here).
+# Emits the gate decision for the heavy per-node capture:
+#   - "capture" when at least one probe ran, none succeeded, and at least one
+#     genuinely failed (the LB IP is unreachable -- the symptom we want
+#     characterised). A failure alongside an unrun probe still counts: the
+#     failures are evidence, and the unrun one adds no reason to doubt them;
+#   - "skip" when any probe succeeded, i.e. the LB is reachable and only the
+#     cheap metadata is worth keeping;
+#   - "unknown" when nothing was ever attempted -- no outcome at all (no
+#     HTTP/TCP client in the host netns, or an exec that could not run), or
+#     every outcome unknown because the lookups behind the probe did not
+#     answer. Collapsing either into skip would put a verdict about the address
+#     into the artifact without a single probe behind it.
+lb_capture_decision() {
+  awk '
+    { if ($0 == "") next; n++; if ($0 == "ok") ok++; if ($0 == "unknown" || $0 == "spent") unk++ }
+    END {
+      if (n == 0) { print "unknown"; exit }
+      # Only a wholly unknown set is unknown. One unrun probe beside real
+      # failures must not erase them: the failures are the evidence this
+      # capture exists to characterise, and merge-base behaviour for that mix
+      # was to capture.
+      if (unk > 0 && unk == n) { print "unknown"; exit }
+      if (ok > 0) { print "skip"; exit }
+      print "capture"
+    }'
+}
+
+# lb_budget_ok <captured-so-far> <max>: gate for the heavy per-LB capture budget.
+# Emits "yes" while fewer than <max> LBs have been CAPTURED, "no" once the cap is
+# reached. The cap bounds LBs actually captured -- the caller increments only on
+# the capture branch, so reachable/skipped LBs never consume it and a broken LB
+# enumerated after many reachable ones is still characterised. The cap bounds
+# WORK, not wall-clock; the wall-clock bound is DP_BUDGET, enforced per call by
+# dp_run.
+lb_budget_ok() {
+  if [ "$1" -lt "$2" ]; then echo yes; else echo no; fi
+}
+
+# pod_filter_affected: stdin =
+# `namespace|name|podIP|nodeName|ready|phase|hostNetwork` rows. Keep scheduled,
+# non-terminal pods whose Ready condition is not True. podIP is deliberately
+# NOT a gate: the cilium endpointManager leak this collector diagnoses can
+# strand a pod before an IP is assigned, and the node-global Cilium/OVN state
+# plus pod events remain useful in that state. IP-specific commands are gated
+# later at their call sites.
+#
+# NF == 8 for the reason lb_filter_services carries its own count, though the
+# counts differ because the jsonpaths do. A list cut mid-record leaves a
+# fragment whose remaining columns still read as values, and a cut landing
+# inside the nodeName column produces a half-parsed node this capture would then
+# open a node-<name>.txt for. Eight fields per record is what the jsonpath
+# emits: six this filter reads, then hostNetwork for the baseline filter below,
+# then a constant `eol` whose only job is to be the thing a truncation destroys.
+# Both are checked here even though neither is read, because that is what makes
+# a cut anywhere in the row detectable.
+pod_filter_affected() {
+  awk -F'|' 'NF == 8 && $8 == "eol" && $4 != "" && $5 != "True" && $6 != "Succeeded" && $6 != "Failed"'
+}
+
+# pod_first_ready <node>: stdin = the cluster-wide
+# `namespace|name|podIP|nodeName|ready|phase|hostNetwork` rows, unfiltered.
+# Emits `namespace|name|podIP` for the first pod ON <node> that is Ready=True,
+# Running, addressed and NOT hostNetwork -- the healthy-pod baseline for that
+# node -- then stops, or nothing when the node has no eligible pod.
+#
+# It scopes itself rather than being handed a per-node list, and that is the
+# design rather than a convenience. The rows are the same snapshot the affected
+# set was computed from, so an affected pod cannot be selected here:
+# pod_filter_affected keeps rows whose $5 is not True, this one requires $5 to
+# be True, and a row cannot be both. Reading the node separately would need an
+# exclusion list instead, because a pod that recovered between the two reads
+# reports Ready in the later one and could be offered as the baseline for its
+# own failure.
+#
+# hostNetwork is excluded because such a pod's podIP IS the node's own address,
+# and cilium-agent / kube-ovn-cni / ovs-ovn run hostNetwork on every node. A
+# baseline picked from those would resolve `ip route get <ip>` to `local <ip>
+# dev lo table local` for an entirely ordinary reason -- the exact fingerprint
+# the address-attribution capture above exists to recognise -- so the
+# comparison would defeat itself. A blank hostNetwork column counts as NOT
+# hostNetwork, since the API omits the field when it is false.
+#
+# The test is written as an allow-list -- empty or the literal "false" -- rather
+# than as `!= "true"`, which rejects a value cut mid-token: `tru` carries every
+# field and passes every other gate, and because this filter stops at the row it
+# takes, a deny-list would seat a hostNetwork pod as the baseline. That alone
+# is not enough, though: a cut landing on the separator BEFORE hostNetwork
+# leaves the column empty and indistinguishable from a genuine false. That case
+# is caught by the constant `eol` column instead -- the row loses the sentinel
+# with its tail. The two guards cover different cuts and neither replaces the
+# other.
+#
+# An addressless pod is skipped for the same `exit`-at-first-match reason: a
+# Ready pod that has no podIP yet would become the baseline and then carry none
+# of the route or conntrack evidence the comparison exists for.
+#
+# NF == 8 and an intact `eol` for the reason the filters above carry their own
+# counts: a list cut mid-record leaves a fragment whose remaining columns still
+# read as values, and a fragment here would name a pod that does not exist as
+# the baseline every reading of the affected pod gets compared against.
+pod_first_ready() {
+  awk -F'|' -v node="$1" 'NF == 8 && $8 == "eol" && $4 == node && $3 != "" && $5 == "True" && $6 == "Running" && ($7 == "" || $7 == "false") { print $1 "|" $2 "|" $3; exit }'
+}
+
+# How a cutoff should be described, mirroring prevlog_cutoff_desc in the sibling
+# script: 137 cannot tell its own kill grace apart from something else killing
+# the read, and an empty bound means the read was never bounded here at all.
+dp_cutoff_desc() {
+  if [ -z "$3" ]; then
+    printf '%s' "a signal from outside this script, which ran this read unbounded"
+  elif [ "${1:-}" = "137" ]; then
+    printf '%s' "a SIGKILL -- the kill grace of its own ${2}s timeout, or something else killing the read, which 137 does not tell apart"
+  else
+    printf '%s' "its own ${2}s timeout"
+  fi
+}
+
+
+# dp_read_outcome <rc> <seconds> <bound> [errfile] -> phrase describing why a
+# read produced nothing.
+#
+# 124 and 137 are the only statuses a bound produces, so they are the only ones
+# allowed to name the timeout. Everything else is kubectl answering -- a refused
+# connection, an RBAC denial, a kind the cluster does not serve -- and calling
+# that a cutoff would put a cause in the artifact that was never observed. The
+# sibling capture gates every one of its notes the same way, and this script's
+# notes claim to follow it.
+#
+# The status dp_run returns for a read it refused to start is a third case, and
+# it is not a cutoff either: nothing was asked, so nothing was cut.
+DP_RC_SPENT=75
+# dp_run's status for a call the deadline cut off, in place of the 124 or 137
+# its shortened bound produced, so a reader of the status names the budget
+# rather than a timeout the call never reached. It is decided by dp_budget_cut
+# as the call returns, not when the status is read later, since other work may
+# spend the budget in between.
+DP_RC_BUDGET_CUT=76
+dp_read_outcome() {
+  if [ "${1:-}" = "$DP_RC_SPENT" ]; then
+    printf '%s' "was not started: the wall-clock budget of its section was already spent"
+  elif [ "${1:-}" = "$DP_RC_BUDGET_CUT" ]; then
+    printf '%s' "was cut off at the deadline: the wall-clock budget of its section ran out"
+  elif [ "${1:-}" = "124" ] || [ "${1:-}" = "137" ]; then
+    printf '%s' "was cut off by $(dp_cutoff_desc "$1" "$2" "$3")"
+  elif [ -n "${4:-}" ] && [ -s "${4:-}" ]; then
+    printf 'failed: kubectl exited %s: %s' "$1" "$(tr '\n\r' '  ' <"$4" | cut -c1-300 | sed 's/[[:space:]]*$//')"
+  else
+    printf 'failed: kubectl exited %s' "$1"
+  fi
+}
+
+# Kept above the sourcing guard with the other pure helpers, per the note at
+# the top of this section: their branches carry the difference between a
+# deadline, a kill and a read that had no ceiling, and the unit suite asserts
+# them directly rather than inferring them from a capture.
+
+# Sourcing guard: hack/capture-dataplane.bats sets E2E_CAPTURE_DATAPLANE_LIB and
+# sources this file purely to reach the helpers above; return before touching $1
+# or running any capture so the unit test never needs a cluster. Neither
+# executing caller sets it -- not the cozytest.sh EXIT trap, not the Chainsaw
+# global catch -- so the guard is a no-op for both.
+if [ -n "${E2E_CAPTURE_DATAPLANE_LIB:-}" ]; then
+  return 0 2>/dev/null
+fi
+
+OUT="${1:?Usage: e2e-capture-dataplane.sh <output-dir>}"
+
+CILIUM_NS="${COZY_CILIUM_NS:-cozy-cilium}"
+KUBEOVN_NS="${COZY_KUBEOVN_NS:-cozy-kubeovn}"
+# Cap how many pods we inspect so a fully-wedged cluster cannot explode the
+# runtime. Node-global captures are deduped per node, and so is the healthy-pod
+# baseline, so the work is (#affected-pods) per-pod captures plus
+# (#affected-nodes) baselines and node-global captures -- not two per pod. This
+# bounds work; DP_BUDGET below bounds time.
+MAX_PODS="${COZY_DATAPLANE_MAX_PODS:-12}"
+
+# LoadBalancer-datapath section tunables (see the header block and the
+# capture_lb_datapath function near the end of this file). The speaker selector
+# and geneve iface match the cozystack metallb/cilium+kube-ovn defaults but stay
+# overridable so a renamed component cannot silently blank the capture.
+METALLB_NS="${COZY_METALLB_NS:-cozy-metallb}"
+SPEAKER_SELECTOR="${COZY_METALLB_SPEAKER_SELECTOR:-app.kubernetes.io/component=speaker}"
+GENEVE_IFACE="${COZY_GENEVE_IFACE:-genev_sys_6081}"
+# Cap how many UNREACHABLE LBs get the heavy datapath capture; reachable/skipped
+# LBs never count toward it (see the captured-budget gate in capture_lb_datapath).
+# Like MAX_PODS, this bounds work and DP_BUDGET bounds time.
+MAX_LBS="${COZY_DATAPLANE_MAX_LBS:-6}"
+
+# Per-read wall-clock bounds for the plain `kubectl get` reads below, and
+# overridable so a test does not have to wait out the real ones. The list bound
+# is larger because that call asks about every namespace at once, where the
+# others ask about one object. A per-read bound buys forward progress -- one
+# hung apiserver call cannot consume the whole run before anything is written.
+DP_READ_TIMEOUT="${COZY_DATAPLANE_READ_TIMEOUT:-20}"
+DP_LIST_TIMEOUT="${COZY_DATAPLANE_LIST_TIMEOUT:-28}"
+DP_READ_GRACE=2
+# Validated like the budget knobs below, and stricter: zero is refused too,
+# since a zero bound makes dp_run refuse every read as if the budget were
+# spent. A value `timeout` cannot parse would fail every read with 125, which
+# the notes would report as kubectl failing although kubectl never ran.
+DP_READ_BAD=""
+DP_LIST_BAD=""
+case "$DP_READ_TIMEOUT" in '' | *[!0-9]*) DP_READ_BAD=bad ;; *[1-9]*) ;; *) DP_READ_BAD=bad ;; esac
+case "$DP_LIST_TIMEOUT" in '' | *[!0-9]*) DP_LIST_BAD=bad ;; *[1-9]*) ;; *) DP_LIST_BAD=bad ;; esac
+if [ -n "$DP_READ_BAD" ]; then DP_READ_BAD=$DP_READ_TIMEOUT; DP_READ_TIMEOUT=20; fi
+if [ -n "$DP_LIST_BAD" ]; then DP_LIST_BAD=$DP_LIST_TIMEOUT; DP_LIST_TIMEOUT=28; fi
+DP_READ_TIMEOUT=$(printf '%s' "$DP_READ_TIMEOUT" | sed 's/^0*\([0-9]\)/\1/')
+DP_LIST_TIMEOUT=$(printf '%s' "$DP_LIST_TIMEOUT" | sed 's/^0*\([0-9]\)/\1/')
+
+# Wall-clock budget for the whole run, in seconds, and the part of it kept back
+# for the LoadBalancer section. The caps above count pods and LBs while both
+# callers' backstops count seconds, and a single affected pod's worst case
+# already ran past the 300s Chainsaw one, so no count could be made to fit.
+# dp_run cuts every call's bound down to what is left of the budget instead
+# and starts nothing once it is spent, so no call ends later than the budget
+# plus one kill grace, whatever the cluster looks like. 270s leaves that grace and
+# the script's own bookkeeping inside the 300s backstop; hack/cozytest.sh,
+# whose backstop is 600s, passes a budget of its own to match.
+#
+# The reserve exists because the pod section runs first: without it a
+# degraded cluster spends the whole budget there, and the LB capture -- which
+# exists for a failure that has no NotReady pod at all -- never starts. The
+# price is that a run with no broken LB leaves the reserve unspent.
+#
+# The budget bounds when a call may START and how long it may run, not the
+# time between calls; that gap is a handful of awk and printf invocations.
+DP_BUDGET="${COZY_DATAPLANE_BUDGET:-270}"
+DP_LB_RESERVE="${COZY_DATAPLANE_LB_RESERVE:-90}"
+case "$DP_BUDGET" in '' | *[!0-9]*) DP_BUDGET_BAD=$DP_BUDGET; DP_BUDGET=270 ;; *) DP_BUDGET_BAD="" ;; esac
+case "$DP_LB_RESERVE" in '' | *[!0-9]*) DP_RESERVE_BAD=$DP_LB_RESERVE; DP_LB_RESERVE=90 ;; *) DP_RESERVE_BAD="" ;; esac
+# Shell arithmetic reads a leading zero as octal, so 08 would abort the run and
+# 010 would mean 8; both knobs are decimal seconds.
+DP_BUDGET=$(printf '%s' "$DP_BUDGET" | sed 's/^0*\([0-9]\)/\1/')
+DP_LB_RESERVE=$(printf '%s' "$DP_LB_RESERVE" | sed 's/^0*\([0-9]\)/\1/')
+DP_T0=$(date +%s)
+DP_DEADLINE=$((DP_T0 + DP_BUDGET))
+DP_SECTION="run"
+
+# Resolved once. Empty when `timeout` is absent: dp_run then runs each call
+# unbounded rather than every call exiting 127 with its output swallowed, which
+# would report that kubectl failed when kubectl never ran. The budget still
+# decides whether a call starts; it cannot stop one that has. Every read that
+# carries a note says which of the two happened.
+DP_TIMEOUT=""
+if command -v timeout >/dev/null 2>&1; then
+  DP_TIMEOUT=timeout
+fi
+
+# dp_clip <secs> -> <secs>, or what is left before DP_DEADLINE if that is less
+# (zero or below once it has passed). A read that reports a cutoff clips first
+# and quotes the result, so the note names the bound the read actually ran
+# under rather than the one it was configured with.
+dp_clip() {
+  _dc_left=$((DP_DEADLINE - $(date +%s)))
+  if [ "$_dc_left" -lt "$1" ]; then printf '%s' "$_dc_left"; else printf '%s' "$1"; fi
+}
+
+# dp_budget_cut <status> <bound> <left> -- true when a call that returned
+# <status> under <bound>, started with <left> seconds before the deadline, was
+# stopped by the deadline rather than by itself. All three have to hold: a
+# cutoff status, a bound that reached the deadline, and a deadline that has
+# now passed. The bound alone misses a call killed early -- an OOM-killed
+# remote process comes back as 137 -- and the clock alone misses a call whose
+# own bound fired just past a deadline it never reached. Without `timeout`
+# no bound ever fires, so a 124 or 137 then is never the budget's.
+dp_budget_cut() {
+  [ -n "$DP_TIMEOUT" ] || return 1
+  case "$1" in 124 | 137) ;; *) return 1 ;; esac
+  [ "$2" -ge "$3" ] && [ "$(dp_clip 1)" -le 0 ]
+}
+
+# dp_run <secs> <cmd...> -- the one way this script runs kubectl. <secs> is
+# already clipped (callers pass "$(dp_clip N)"); a bound of zero or less means
+# the budget is spent, and the call is not started. The guard in
+# hack/capture-dataplane.bats fails on any kubectl call that does not go
+# through here.
+#
+# A refusal is not silent. It goes to stderr, which the exec blocks send into
+# their own section of the artifact, so a block that keeps only its header says
+# why; the reads that capture stderr say it through dp_read_outcome instead.
+# The two OVS interface lookups discard stderr and read the status themselves
+# instead; the LB probe discards it too and reports a refusal through its
+# "spent" outcome.
+#
+# capture-notes.txt gets one line per section and run, matched on the section
+# name and the run's start time, since the budget can run out inside a capture
+# the loops never decline. It is written on the first call the deadline cuts
+# as well as on the first one it refuses: when the cut call is the section's
+# last, nothing is refused after it. The line names the section because the
+# pod section's deadline is not the run's: the LoadBalancer section still
+# starts calls after it.
+dp_spent_note() {
+  printf '%s' "[capture-dataplane] the ${DP_SECTION} ran out of its share of the ${DP_BUDGET}s wall-clock budget (run started at epoch ${DP_T0}); a call running then, if any, was cut at the deadline, its calls after that were not started, and each block they left empty says so"
+}
+dp_note_spent() {
+  _dns_note=$(dp_spent_note)
+  if ! grep -qxF "$_dns_note" "$NOTES" 2>/dev/null; then
+    printf '%s\n' "$_dns_note" >> "$NOTES" 2>/dev/null || true
+  fi
+}
+
+# dp_walk_end <verdict> -- the word a walk closes on. A walk that ended on its
+# own is still not complete when the budget cut a call inside it: the section
+# note for this run says so, and its text is the evidence, since the clock read
+# after the loop can pass the deadline without any call having been cut. The
+# pointer names the file: the closing line reaches the job log too, and the
+# section note does not, since dp_run writes it from inside captured output.
+dp_walk_end() {
+  if [ "$1" = complete ] && grep -qxF "$(dp_spent_note)" "$NOTES" 2>/dev/null; then
+    printf '%s' "cut short by the budget -- see capture-notes.txt"
+  else
+    printf '%s' "$1"
+  fi
+}
+
+dp_run() {
+  _dr_s=$1
+  shift
+  if [ "$_dr_s" -le 0 ]; then
+    printf '%s\n' "(not started: the ${DP_SECTION} ran out of its share of the ${DP_BUDGET}s wall-clock budget)" >&2
+    dp_note_spent
+    return "$DP_RC_SPENT"
+  fi
+  _dr_left=$((DP_DEADLINE - $(date +%s)))
+  if [ -n "$DP_TIMEOUT" ]; then
+    timeout -k "$DP_READ_GRACE" "$_dr_s" "$@"
+  else
+    "$@"
+  fi
+  _dr_rc=$?
+  # A cutoff is marked where the call's output went, as a refusal is: an exec
+  # block keeps whatever it printed before its bound fired, and a partial table
+  # reads as a complete one. The reads that capture stderr into DP_ERR name the
+  # cutoff through dp_read_outcome, which does not read that file for one.
+  if dp_budget_cut "$_dr_rc" "$_dr_s" "$_dr_left"; then
+    printf '%s\n' "(cut off at the deadline: the ${DP_SECTION} ran out of its share of the ${DP_BUDGET}s wall-clock budget)" >&2
+    dp_note_spent
+    return "$DP_RC_BUDGET_CUT"
+  elif [ "$_dr_rc" -eq 124 ] || [ "$_dr_rc" -eq 137 ]; then
+    # The same reading the notes give a read: kubectl exec passes a remote
+    # command's own 124 through unchanged, so that one cannot be told from
+    # this bound firing, and dp_cutoff_desc says so for a 137.
+    printf '%s\n' "(cut off by $(dp_cutoff_desc "$_dr_rc" "$_dr_s" "$DP_TIMEOUT"))" >&2
+  fi
+  return "$_dr_rc"
+}
+
+command -v kubectl >/dev/null 2>&1 || exit 0
+mkdir -p "$OUT" 2>/dev/null || exit 0
+# Every note below explains why this capture is smaller than the cluster, so it
+# ships beside the capture rather than only in the job log: a reader who has the
+# uploaded report and not the run cannot otherwise tell a capture that found
+# nothing from one that never ran. The sibling collector and the report writer
+# both hold this contract, and docs/agents/e2e-testing.md states it for them.
+#
+# Appended, not truncated, with a separator: a caller may aim two runs at one
+# directory, and the earlier run's reasons are as load-bearing as the later
+# one's.
+NOTES="$OUT/capture-notes.txt"
+
+# dp_new_run <file> -- the separator the per-pod, per-node, per-LB and tcpdump
+# files carry between runs, written only when the file already holds an
+# earlier one. Those files are appended to rather than truncated, for the
+# reason the notes are.
+dp_new_run() {
+  if [ -s "$1" ]; then
+    printf -- '--- new capture run ---\n' >> "$1" 2>/dev/null || true
+  fi
+}
+
+# Created here rather than beside the helpers above, and the position is the
+# point: everything before the sourcing guard runs in every unit test that
+# sources this file, so a temp file made up there is one leaked per test, and
+# the two early exits would leave one behind on every host without kubectl.
+# Below the guard and below those exits, the cleanup at the end is genuinely
+# the only path that can be reached once this exists.
+#
+# Empty if mktemp fails; the notes then omit kubectl's message rather than
+# inventing one.
+DP_ERR=$(mktemp "${TMPDIR:-/tmp}/dataplane-read.XXXXXX" 2>/dev/null) || DP_ERR=""
+# Where a read that writes into its own block sends stderr: the scratch file
+# when there is one, the block itself when there is not. The reads open it for
+# append and empty the scratch file first themselves: a truncating open of
+# /dev/stdout reopens the block's file on Linux and would cut it to nothing.
+DP_BLOCK_ERR=${DP_ERR:-/dev/stdout}
+if [ -s "$NOTES" ]; then
+  printf -- '--- new capture run ---\n' >> "$NOTES" 2>/dev/null || true
+fi
+
+# printf, not echo: under /bin/sh (dash on the CI image) echo expands backslash
+# escapes, and this logger now carries kubectl's own stderr. A message holding a
+# literal \n could then break the note in two and print a second
+# "[capture-dataplane] ..." line that reads as this script's own verdict. No
+# malice needed -- the jsonpath in these reads contains {"\n"}, and kubectl
+# quotes the expression back when it fails to parse it. The tr in
+# dp_read_outcome flattens the message on the way in; echo would undo that here,
+# on the way out.
+log() {
+  printf '%s\n' "[capture-dataplane] $*"
+  printf '%s\n' "[capture-dataplane] $*" >> "$NOTES" 2>/dev/null || true
+}
+
+# A knob value that could not be used is named, so the bound in effect is not
+# mistaken for the one that was asked for.
+if [ -n "$DP_BUDGET_BAD" ]; then
+  log "COZY_DATAPLANE_BUDGET='$DP_BUDGET_BAD' is not a whole number of seconds; using ${DP_BUDGET}s"
+fi
+if [ -n "$DP_RESERVE_BAD" ]; then
+  log "COZY_DATAPLANE_LB_RESERVE='$DP_RESERVE_BAD' is not a whole number of seconds; using ${DP_LB_RESERVE}s"
+fi
+if [ -n "$DP_READ_BAD" ]; then
+  log "COZY_DATAPLANE_READ_TIMEOUT='$DP_READ_BAD' is not a whole number of seconds above zero; using ${DP_READ_TIMEOUT}s"
+fi
+if [ -n "$DP_LIST_BAD" ]; then
+  log "COZY_DATAPLANE_LIST_TIMEOUT='$DP_LIST_BAD' is not a whole number of seconds above zero; using ${DP_LIST_TIMEOUT}s"
+fi
+if [ "$DP_LB_RESERVE" -ge "$DP_BUDGET" ]; then
+  log "COZY_DATAPLANE_LB_RESERVE=${DP_LB_RESERVE}s leaves nothing of the ${DP_BUDGET}s budget for the pod section: it starts no call, which is not the same as nothing being affected"
+fi
+if [ -z "$DP_TIMEOUT" ]; then
+  log "no timeout binary on PATH: calls run unbounded, and the ${DP_BUDGET}s budget only decides whether each one starts"
+fi
+
+# The pod section stops starting calls DP_LB_RESERVE seconds before the end of
+# the budget, so the LoadBalancer section after it always has that much left.
+DP_DEADLINE=$((DP_T0 + DP_BUDGET - DP_LB_RESERVE))
+DP_SECTION="pod section"
+
+# Affected = scheduled (has nodeName), Ready!=True, and not already terminal.
+# A podIP is intentionally optional: a CNI endpoint leak can strand the pod
+# before allocation. Running pods with an IP cover the host->pod probe failure;
+# Pending pods without one cover the endpoint-allocation failure. Succeeded/
+# Failed pods (completed Jobs, hook pods) are Ready!=True too but are not either
+# symptom, so they are excluded to keep the MAX_PODS budget on actual wedges.
+# jsonpath keeps this dependency-free (no jq / go-template reassignment).
+#
+# hostNetwork rides along on this one read even though only the healthy-pod
+# baseline consults it, and only for nodes that turn out to have an affected
+# pod. Asking per node instead would be a second read of the same objects, and
+# the two answers could then disagree: a pod that recovered in between reports
+# Ready in the later one and could be offered as the baseline for its own
+# failure. One snapshot makes that impossible rather than guarded -- the
+# affected set and the baseline candidates are the same rows -- and the extra
+# column costs one boolean per pod on a list this script already takes.
+_pods_b=$(dp_clip "$DP_LIST_TIMEOUT")
+_pods_raw=$(dp_run "$_pods_b" kubectl get pods -A \
+  -o jsonpath='{range .items[*]}{.metadata.namespace}{"|"}{.metadata.name}{"|"}{.status.podIP}{"|"}{.spec.nodeName}{"|"}{.status.conditions[?(@.type=="Ready")].status}{"|"}{.status.phase}{"|"}{.spec.hostNetwork}{"|eol"}{"\n"}{end}' \
+  2>"${DP_ERR:-/dev/null}")
+_pods_rc=$?
+if [ "$_pods_rc" -ne 0 ]; then
+  log "listing pods $(dp_read_outcome "$_pods_rc" "$_pods_b" "$DP_TIMEOUT" "$DP_ERR"); whatever it did not name is missing from the capture below, which is not the same as nothing being affected"
+fi
+affected=$(printf '%s' "$_pods_raw" | pod_filter_affected)
+
+# Set even when the pod path is empty; the per-pod capture references it, while
+# the independent LoadBalancer path below does not.
+central=""
+
+# pod_on_node <ns> <label> <node> -> first matching pod name (empty if none).
+pod_on_node() {
+  _pon_key="$1/$2/$3"
+  if _pon_hit=$(pod_memo_get "$_pon_key"); then
+    printf '%s' "${_pon_hit%%	*}"
+    return "${_pon_hit#*	}"
+  fi
+  # items[*], not items[0]: client-go's evalArray has no allowMissingKeys escape
+  # (evalField does), so indexing [0] into an empty list is a hard error and
+  # kubectl exits 1. "No such pod on this node" is the ordinary answer here --
+  # a node without a cilium-agent is exactly what this capture is called for --
+  # and with a note attached to a non-zero status that answer would be reported
+  # as a failed read. [*] yields nothing and exits 0, so a non-zero status again
+  # means something actually went wrong.
+  _pon_b=$(dp_clip "$DP_READ_TIMEOUT")
+  _pon=$(dp_run "$_pon_b" kubectl get pod -n "$1" -l "$2" --field-selector "spec.nodeName=$3" \
+    -o jsonpath='{.items[*].metadata.name}' 2>"${DP_ERR:-/dev/null}")
+  _pon_rc=$?
+  # The note goes to stderr because this function's stdout is captured by its
+  # callers, so a log line on stdout would be read as part of the pod name.
+  if [ "$_pon_rc" -ne 0 ]; then
+    # No consequence named: this helper serves five call sites with three
+    # different ones -- a node-global capture skipped, an LB probe not run, an
+    # announcer left to the fallback -- so any clause here is wrong for someone.
+    # The status goes back with the value instead, and the two callers that
+    # write an absence into the artifact use it to say "unknown" rather than
+    # "none"; the ones that only skip have nothing to record.
+    log "looking up the pod matching $2 on node $3 $(dp_read_outcome "$_pon_rc" "$_pon_b" "$DP_TIMEOUT" "$DP_ERR")" >&2
+  fi
+  # [*] can name several pods; the callers want one. The status goes back to the
+  # caller as well: an empty answer means "no such pod" only when the read
+  # actually answered, and the callers write that difference into the artifact.
+  case "$_pon_rc" in
+    0) pod_memo_put "$_pon_key" "${_pon%% *}" 0 ;;
+    124 | 137)
+      if [ "$_pon_b" -ge "$DP_READ_TIMEOUT" ]; then
+        pod_memo_put "$_pon_key" "${_pon%% *}" 1
+      fi ;;
+  esac
+  printf '%s' "${_pon%% *}"
+  return "$_pon_rc"
+}
+
+# Per-node captures are node-global (every pod on a node shares one cilium-agent
+# / ovs / cni-server), so run them once per node and reuse across that node's
+# pods. POSIX-sh membership test over a space-delimited string.
+_SEEN_NODES=" "
+node_seen() { case "$_SEEN_NODES" in *" $1 "*) return 0 ;; esac; return 1; }
+mark_node() { _SEEN_NODES="$_SEEN_NODES$1 "; }
+
+# Memo for pod_on_node. The same (namespace, label, node) is asked up to three
+# times per affected pod across the sections below, and each repeat now costs
+# its own timeout against an apiserver that hangs: the bounds turned a free
+# repetition into one that spends the caller's envelope on re-asking rather than
+# on more pods. An empty answer is memoised too, since "there is no
+# cilium-agent on this node" is exactly the lookup worth not repeating.
+#
+# A read that failed is stored only when a bound cut it off. An instant failure
+# -- refused, denied -- costs nothing to ask again, and caching it would make
+# one transient permanent for the run: the LB section would take the hit, report
+# the component unknown, and skip the capture this file's header calls the first
+# fork of an LB diagnosis. A cutoff is the opposite, since asking again spends
+# another full bound, which is the budget this memo exists to protect -- but
+# only a cutoff under the full bound. One the pod section's deadline shortened
+# says nothing about how the full bound would have gone, and caching it would
+# hand the LoadBalancer section an unknown component its reserve could still
+# ask about.
+#
+# Unlike the node memo above, which is a space-delimited string matched with a
+# case glob, this one is a tab-separated file compared field by field, so the
+# key needs no quoting and the '=' inside a label selector is ordinary payload.
+# The invariant it does rest on is that none of namespace, label selector or
+# node name may contain a tab, which Kubernetes object names and label
+# selectors cannot.
+# Backed by a file rather than a variable on purpose: the walk over affected
+# pods runs on the right-hand side of a pipeline, which is a subshell, so a
+# variable memo would be discarded at the end of it and the same lookups would
+# be paid for again in the sections that follow. Empty when mktemp fails, which
+# only costs the memo.
+_POD_MEMO=$(mktemp "${TMPDIR:-/tmp}/dataplane-podmemo.XXXXXX" 2>/dev/null) || _POD_MEMO=""
+# Cache for the per-node healthy-pod baseline, one file per node, for the same
+# reason and with the same subshell constraint as the memo above. Empty when
+# mktemp fails, which costs the saving and not the evidence: the baseline is
+# then captured per pod, the way it was before the cache existed.
+_REF_CACHE=$(mktemp -d "${TMPDIR:-/tmp}/dataplane-refcache.XXXXXX" 2>/dev/null) || _REF_CACHE=""
+# The stored row carries the read's status beside its value. A hit that dropped
+# it would hand a later caller an empty answer with no way to tell "there is no
+# such pod" from "the read never said", which is the distinction the callers
+# below are built on.
+#
+# The status leaves through stdout, packed with the value, because every caller
+# reads this through a command substitution and a variable set in there dies
+# with the subshell -- the same property that makes the memo itself a file.
+pod_memo_get() {
+  [ -n "$_POD_MEMO" ] || return 1
+  awk -F'\t' -v k="$1" '$1 == k { printf "%s\t%s", $2, $3; found = 1; exit } END { exit !found }' \
+    "$_POD_MEMO" 2>/dev/null
+}
+pod_memo_put() {
+  [ -n "$_POD_MEMO" ] || return 0
+  printf '%s\t%s\t%s\n' "$1" "$2" "$3" >>"$_POD_MEMO" 2>/dev/null || true
+}
+
+capture_node() {
+  _cn_node=$1
+  node_seen "$_cn_node" && return 0
+  mark_node "$_cn_node"
+  _cn_nf="$OUT/node-$_cn_node.txt"
+  dp_new_run "$_cn_nf"
+
+  _cn_agent=$(pod_on_node "$CILIUM_NS" k8s-app=cilium "$_cn_node"); _cn_agent_ok=$?
+  _cn_ovs=$(pod_on_node "$KUBEOVN_NS" app=ovs "$_cn_node"); _cn_ovs_ok=$?
+  {
+    echo "################################################################"
+    _cn_agent_shown=${_cn_agent:-$([ "$_cn_agent_ok" -eq 0 ] && echo '<none>' || echo '<unknown>')}
+    _cn_ovs_shown=${_cn_ovs:-$([ "$_cn_ovs_ok" -eq 0 ] && echo '<none>' || echo '<unknown>')}
+    echo "# NODE $_cn_node  (cilium-agent=$_cn_agent_shown ovs=$_cn_ovs_shown)"
+    echo "################################################################"
+
+    if [ -n "$_cn_agent" ]; then
+      echo
+      echo "=== cilium-dbg endpoint list ==="
+      dp_run "$(dp_clip 25)" kubectl exec -n "$CILIUM_NS" "$_cn_agent" -c cilium-agent -- \
+        cilium-dbg endpoint list 2>&1 || true
+
+      echo
+      echo "=== cilium-dbg bpf lb list (service map, every Service type) ==="
+      # Unfiltered and on every affected node, not only on the LoadBalancer
+      # path: which backend a ClusterIP resolved to, and whether a backend that
+      # stopped answering is still in the map, is answered here and nowhere
+      # else in the bundle.
+      dp_run "$(dp_clip 25)" kubectl exec -n "$CILIUM_NS" "$_cn_agent" -c cilium-agent -- \
+        cilium-dbg bpf lb list 2>&1 || true
+
+      echo
+      echo "=== cilium-dbg monitor --type drop (bounded ~8s) ==="
+      # Two nested bounds: an inner `timeout 8` so the capture self-terminates
+      # if the agent ships coreutils, and an outer `timeout 12` on the exec as
+      # the hard backstop if it does not. Either way it cannot hang.
+      dp_run "$(dp_clip 12)" kubectl exec -n "$CILIUM_NS" "$_cn_agent" -c cilium-agent -- \
+        sh -c 'timeout 8 cilium-dbg monitor --type drop 2>&1 || true' 2>&1 || true
+
+      echo
+      echo "=== hubble observe --verdict DROPPED --last 200 (if hubble present) ==="
+      dp_run "$(dp_clip 25)" kubectl exec -n "$CILIUM_NS" "$_cn_agent" -c cilium-agent -- \
+        sh -c 'command -v hubble >/dev/null 2>&1 && hubble observe --verdict DROPPED --last 200 2>&1 || echo "hubble CLI not present in agent"' 2>&1 || true
+    else
+      echo
+      if [ "$_cn_agent_ok" -eq 0 ]; then
+        echo "(no cilium-agent pod found on node $_cn_node)"
+      elif [ "$_cn_agent_ok" -eq "$DP_RC_BUDGET_CUT" ]; then
+        echo "(whether a cilium-agent runs on node $_cn_node is unknown: the lookup was cut when the ${DP_SECTION} ran out of its share of the ${DP_BUDGET}s wall-clock budget)"
+      elif [ "$_cn_agent_ok" -eq "$DP_RC_SPENT" ]; then
+        echo "(whether a cilium-agent runs on node $_cn_node was not asked: the ${DP_SECTION} ran out of its share of the ${DP_BUDGET}s wall-clock budget)"
+      else
+        echo "(could not determine whether a cilium-agent runs on node $_cn_node -- the lookup did not answer)"
+      fi
+    fi
+
+    if [ -n "$_cn_ovs" ]; then
+      echo
+      echo "=== ovs-ofctl dump-flows br-int ==="
+      dp_run "$(dp_clip 25)" kubectl exec -n "$KUBEOVN_NS" "$_cn_ovs" -c openvswitch -- \
+        ovs-ofctl dump-flows br-int 2>&1 || true
+
+      echo
+      echo "=== ovn-controller.log decisive lines (flow-programming / I-P timing) ==="
+      # ovn-controller runs inside this ovs-ovn (app=ovs) pod's openvswitch
+      # container and logs to /var/log/ovn/ovn-controller.log. Grep the lines
+      # that pin OVN incremental-processing lag: physical_flow_output (installs
+      # the LSP local-delivery OpenFlow), if_status_mgr (sets ovn-installed --
+      # the CNI "port ready" barrier), and "took <N>ms" / recompute /
+      # "Unreasonably long ... poll interval" (ovn-controller stalls). A
+      # physical_flow_output "took <N>ms" spanning the failure window is proof.
+      dp_run "$(dp_clip 25)" kubectl exec -n "$KUBEOVN_NS" "$_cn_ovs" -c openvswitch -- \
+        sh -c 'grep -E "physical_flow_output|if_status_mgr|took [0-9]+ ?ms|recompute|Unreasonably long" /var/log/ovn/ovn-controller.log 2>/dev/null | tail -n 400 || echo "no matching lines in /var/log/ovn/ovn-controller.log"' 2>&1 || true
+
+      echo
+      echo "=== ovn-controller.log tail (bounded) ==="
+      dp_run "$(dp_clip 20)" kubectl exec -n "$KUBEOVN_NS" "$_cn_ovs" -c openvswitch -- \
+        sh -c 'tail -n 2000 /var/log/ovn/ovn-controller.log 2>/dev/null || echo "no /var/log/ovn/ovn-controller.log"' 2>&1 || true
+
+      echo
+      echo "=== ovs-ovn cgroup cpu.stat (ovn-controller/vswitchd CPU throttling) ==="
+      # ovs-ovn caps CPU (shared between ovn-controller and vswitchd); non-zero
+      # nr_throttled / throttled_usec means ovn-controller was CPU-starved, which
+      # aggravates the flow-programming lag above. cgroup v2 path first, v1
+      # fallback.
+      dp_run "$(dp_clip 15)" kubectl exec -n "$KUBEOVN_NS" "$_cn_ovs" -c openvswitch -- \
+        sh -c 'cat /sys/fs/cgroup/cpu.stat 2>/dev/null || cat /sys/fs/cgroup/cpu/cpu.stat 2>/dev/null || echo "no cpu.stat at /sys/fs/cgroup/cpu.stat (v2) or /sys/fs/cgroup/cpu/cpu.stat (v1)"' 2>&1 || true
+    else
+      echo
+      if [ "$_cn_ovs_ok" -eq 0 ]; then
+        echo "(no ovs pod found on node $_cn_node)"
+      elif [ "$_cn_ovs_ok" -eq "$DP_RC_BUDGET_CUT" ]; then
+        echo "(whether an ovs pod runs on node $_cn_node is unknown: the lookup was cut when the ${DP_SECTION} ran out of its share of the ${DP_BUDGET}s wall-clock budget)"
+      elif [ "$_cn_ovs_ok" -eq "$DP_RC_SPENT" ]; then
+        echo "(whether an ovs pod runs on node $_cn_node was not asked: the ${DP_SECTION} ran out of its share of the ${DP_BUDGET}s wall-clock budget)"
+      else
+        echo "(could not determine whether an ovs pod runs on node $_cn_node -- the lookup did not answer)"
+      fi
+    fi
+
+    _cn_cni=$(pod_on_node "$KUBEOVN_NS" app=kube-ovn-cni "$_cn_node"); _cn_cni_ok=$?
+    if [ -n "$_cn_cni" ]; then
+      echo
+      echo "=== host netns: ip neigh (via kube-ovn cni-server, hostNetwork) ==="
+      dp_run "$(dp_clip 15)" kubectl exec -n "$KUBEOVN_NS" "$_cn_cni" -c cni-server -- \
+        ip neigh 2>&1 || true
+
+      echo
+      echo "=== host netns: ip rule ==="
+      dp_run "$(dp_clip 15)" kubectl exec -n "$KUBEOVN_NS" "$_cn_cni" -c cni-server -- \
+        ip rule 2>&1 || true
+
+      echo
+      echo "=== host netns: ip addr show ovn0 ==="
+      dp_run "$(dp_clip 15)" kubectl exec -n "$KUBEOVN_NS" "$_cn_cni" -c cni-server -- \
+        ip addr show ovn0 2>&1 || true
+
+      echo
+      echo "=== host netns: ip -o addr show, all interfaces (address attribution) ==="
+      # ovn0 alone cannot name the owner when a podIP turns out to be a LOCAL
+      # address instead: the interface actually holding it might be anything on
+      # the host (see the header block). This is the same info scoped to every
+      # interface, not just ovn0.
+      dp_run "$(dp_clip 15)" kubectl exec -n "$KUBEOVN_NS" "$_cn_cni" -c cni-server -- \
+        ip -o addr show 2>&1 || true
+
+      echo
+      echo "=== host netns: ip route show table local (address attribution) ==="
+      # A podIP resolving to `local <ip> dev lo table local` here is the
+      # fingerprint from the header block: it wins over the ovn0 route in
+      # `main` because table local is consulted first (see `ip rule` above).
+      dp_run "$(dp_clip 15)" kubectl exec -n "$KUBEOVN_NS" "$_cn_cni" -c cni-server -- \
+        ip route show table local 2>&1 || true
+    else
+      echo
+      if [ "$_cn_cni_ok" -eq 0 ]; then
+        echo "(no kube-ovn-cni pod found on node $_cn_node -- host netns capture skipped)"
+      elif [ "$_cn_cni_ok" -eq "$DP_RC_BUDGET_CUT" ]; then
+        echo "(whether a kube-ovn-cni pod runs on node $_cn_node is unknown: the lookup was cut when the ${DP_SECTION} ran out of its share of the ${DP_BUDGET}s wall-clock budget; host netns capture skipped)"
+      elif [ "$_cn_cni_ok" -eq "$DP_RC_SPENT" ]; then
+        echo "(whether a kube-ovn-cni pod runs on node $_cn_node was not asked: the ${DP_SECTION} ran out of its share of the ${DP_BUDGET}s wall-clock budget; host netns capture skipped)"
+      else
+        echo "(could not determine whether a kube-ovn-cni pod runs on node $_cn_node -- the lookup did not answer; host netns capture skipped)"
+      fi
+    fi
+  } >> "$_cn_nf" 2>&1 || true
+}
+
+# dp_block_outcome <status> <what> <secs> -- what a read writing into a shared
+# block adds after its output, from its stderr in DP_ERR. kubectl's own stderr
+# goes into the block as it came, whole: a degraded apiserver throttles
+# clients, and the error that matters can follow lines of throttling notices.
+# The two reads of the Ready block share it, so a failure then gets one line
+# that names the read. dp_run's own marker sits in DP_ERR too, unnamed, and is
+# left out, so a cut is reported once.
+#
+# Without a scratch file the reads send stderr into the block instead
+# (DP_BLOCK_ERR), so kubectl's words survive; dp_run's marker then sits
+# beside the named line, which is the cost of having nowhere else to put it.
+dp_block_outcome() {
+  if [ -n "$DP_ERR" ] && [ -s "$DP_ERR" ]; then
+    grep -v -e '^(cut off ' -e '^(not started: ' "$DP_ERR" 2>/dev/null || true
+  fi
+  if [ "$1" -ne 0 ]; then
+    echo "($2 $(dp_read_outcome "$1" "$3" "$DP_TIMEOUT"))"
+  fi
+  return 0
+}
+
+# capture_pod_dataplane <ns> <pod> <podip> <node> <label> [scope] -- the
+# pod-specific captures for ONE pod on <node>.
+#
+# scope is `full` (default) or `route-only`. Full takes everything: Ready
+# conditions and events, cilium CT, the host route, kernel conntrack, the OVN
+# port binding and the OVS ovn-installed flag. route-only takes the route and
+# the conntrack and nothing else, and the healthy-pod baseline asks for it.
+# Three of the four blocks it drops -- cilium CT, the OVN port binding, the OVS
+# ovn-installed flag -- describe how a pod was PROGRAMMED, and a pod chosen for
+# being healthy is correctly programmed by definition; they compare nothing and
+# cost 105s of the 135s of exec bounds, on the leg most likely to be cut. The
+# fourth is the Ready-conditions and events pair, which a pod selected for
+# reporting Ready=True and Running has already answered, and dropping it is what
+# leaves the baseline with no read of its own, only the route and conntrack
+# execs. What a baseline is read for is the route and the conntrack beside the
+# wedged pod's own. <label> is stamped in the section header and says which
+# role the pod plays: the affected
+# pod under investigation, or the Ready pod captured beside it as a baseline.
+# Writes to stdout; the caller redirects into the pod's output file. $central
+# (the ovn-central pod, or empty) is read from the caller's scope rather than
+# threaded as a parameter, matching how the rest of this script shares
+# node-global lookups.
+capture_pod_dataplane() {
+  _cpd_ns=$1; _cpd_pod=$2; _cpd_ip=$3; _cpd_node=$4; _cpd_label=$5; _cpd_scope=${6:-full}
+
+  # Banner first, then the lookups: pod_on_node writes its failure note to
+  # stderr, and this whole function is redirected into the pod's file, so a
+  # lookup resolved above the banner puts that note on line 1 and pushes the
+  # header down. The note still reaches capture-notes.txt either way.
+  echo "################################################################"
+  echo "# POD $_cpd_ns/$_cpd_pod  podIP=${_cpd_ip:-<none>}  node=$_cpd_node  ($_cpd_label)"
+  echo "# node-global captures are in node-$_cpd_node.txt"
+  echo "################################################################"
+
+  # Only the cni-server is needed at route-only scope; resolving the other two
+  # there would cost a live lookup each whenever the memo is unavailable, for
+  # blocks that scope does not take.
+  _cpd_cni=$(pod_on_node "$KUBEOVN_NS" app=kube-ovn-cni "$_cpd_node")
+  _cpd_agent=""
+  _cpd_ovs=""
+  if [ "$_cpd_scope" = full ]; then
+    _cpd_agent=$(pod_on_node "$CILIUM_NS" k8s-app=cilium "$_cpd_node")
+    _cpd_ovs=$(pod_on_node "$KUBEOVN_NS" app=ovs "$_cpd_node")
+  else
+    echo
+    echo "=== scope: route and conntrack only ==="
+    echo "This is a reference pod, so the cilium CT, OVN Port_Binding and OVS"
+    echo "ovn-installed blocks are deliberately NOT taken: they describe how a"
+    echo "pod was programmed, and this one was chosen for being healthy. Its"
+    echo "Ready conditions and events go for the same reason: reporting Ready"
+    echo "and Running is what selected it."
+    echo "Their absence below is a decision, not a lookup that came back empty."
+  fi
+
+  if [ "$_cpd_scope" = full ]; then
+    echo
+    echo "=== pod Ready conditions + recent probe events ==="
+    _cpd_b=$(dp_clip "$DP_READ_TIMEOUT")
+    [ -z "$DP_ERR" ] || : > "$DP_ERR"
+    dp_run "$_cpd_b" kubectl get pod -n "$_cpd_ns" "$_cpd_pod" \
+      -o jsonpath='{range .status.conditions[*]}{.type}={.status} reason={.reason}: {.message}{"\n"}{end}' 2>>"$DP_BLOCK_ERR"
+    dp_block_outcome "$?" "reading this pod's Ready conditions" "$_cpd_b"
+    _cpd_b=$(dp_clip "$DP_READ_TIMEOUT")
+    [ -z "$DP_ERR" ] || : > "$DP_ERR"
+    dp_run "$_cpd_b" kubectl get events -n "$_cpd_ns" --field-selector "involvedObject.name=$_cpd_pod" \
+      -o jsonpath='{range .items[*]}{.lastTimestamp}{" "}{.reason}{": "}{.message}{"\n"}{end}' 2>>"$DP_BLOCK_ERR"
+    dp_block_outcome "$?" "reading this pod's events" "$_cpd_b"
+  fi
+
+  if [ -z "$_cpd_ip" ]; then
+    echo
+    echo "=== pod has no podIP; IP-specific route/conntrack capture skipped ==="
+    echo "Node-global Cilium/OVN state and pod allocation events remain captured."
+  fi
+
+  if [ "$_cpd_scope" = full ] && [ -n "$_cpd_ip" ] && [ -n "$_cpd_agent" ]; then
+    echo
+    echo "=== cilium-dbg bpf ct list global | grep $_cpd_ip (node=$_cpd_node agent=$_cpd_agent) ==="
+    dp_run "$(dp_clip 25)" kubectl exec -n "$CILIUM_NS" "$_cpd_agent" -c cilium-agent -- \
+      sh -c "cilium-dbg bpf ct list global 2>/dev/null | grep -F '$_cpd_ip' || echo 'no CT entries for $_cpd_ip'" 2>&1 || true
+  fi
+
+  if [ -n "$_cpd_ip" ] && [ -n "$_cpd_cni" ]; then
+    echo
+    echo "=== host netns: ip route get $_cpd_ip (via kube-ovn cni-server) ==="
+    dp_run "$(dp_clip 15)" kubectl exec -n "$KUBEOVN_NS" "$_cpd_cni" -c cni-server -- \
+      ip route get "$_cpd_ip" 2>&1 || true
+
+    echo
+    echo "=== host netns: kernel conntrack for $_cpd_ip ==="
+    # Under enable-host-legacy-routing the host->local-pod path is in the
+    # kernel netfilter conntrack table, NOT cilium BPF -- this is the
+    # authoritative table for the transient. Prefer the conntrack CLI; fall
+    # back to /proc/net/nf_conntrack when it is absent from the image.
+    dp_run "$(dp_clip 15)" kubectl exec -n "$KUBEOVN_NS" "$_cpd_cni" -c cni-server -- \
+      sh -c "if command -v conntrack >/dev/null 2>&1; then conntrack -L 2>/dev/null | grep -F '$_cpd_ip' || echo 'no conntrack entries for $_cpd_ip'; else grep -F '$_cpd_ip' /proc/net/nf_conntrack 2>/dev/null || echo 'no conntrack CLI; no /proc/net/nf_conntrack match for $_cpd_ip'; fi" 2>&1 || true
+  fi
+
+  if [ "$_cpd_scope" = full ] && [ -n "$central" ]; then
+    echo
+    echo "=== OVN Port_Binding / Logical_Switch_Port for $_cpd_pod.$_cpd_ns ==="
+    # kube-ovn names the OVN logical port <pod>.<namespace>.
+    dp_run "$(dp_clip 20)" kubectl exec -n "$KUBEOVN_NS" "$central" -c ovn-central -- \
+      ovn-sbctl --no-leader-only find port_binding "logical_port=$_cpd_pod.$_cpd_ns" 2>&1 || true
+    dp_run "$(dp_clip 20)" kubectl exec -n "$KUBEOVN_NS" "$central" -c ovn-central -- \
+      ovn-nbctl --no-leader-only find logical_switch_port "name=$_cpd_pod.$_cpd_ns" 2>&1 || true
+  fi
+
+  if [ "$_cpd_scope" = full ] && [ -n "$_cpd_ovs" ]; then
+    echo
+    echo "=== OVS interface ovn-installed flag + ts for iface-id=$_cpd_pod.$_cpd_ns (ovs pod $_cpd_ovs) ==="
+    # kube-ovn stamps external_ids:ovn-installed (+ -ts) on the pod's OVS
+    # interface once ovn-controller reports the port programmed -- this is
+    # the barrier the CNI waits on. The OVS interface name is opaque, so
+    # look it up by iface-id (<pod>.<ns>), then read the flag + timestamp.
+    # An ovn-installed-ts set early (before physical_flow_output installed
+    # the local-delivery flow, see node-$node.txt) is the I-P-lag signature.
+    # The status is kept: "no such interface" is only what a lookup that ran
+    # and answered can say, not one that was cut off or never started.
+    _cpd_ovsif=$(dp_run "$(dp_clip 20)" kubectl exec -n "$KUBEOVN_NS" "$_cpd_ovs" -c openvswitch -- \
+      ovs-vsctl --no-heading --columns=name find interface "external_ids:iface-id=$_cpd_pod.$_cpd_ns" 2>/dev/null)
+    _cpd_ovsif_rc=$?
+    _cpd_ovsif=$(printf '%s\n' "$_cpd_ovsif" | head -n 1 | tr -d '" ')
+    if [ -n "$_cpd_ovsif" ]; then
+      echo "ovs interface = $_cpd_ovsif"
+      dp_run "$(dp_clip 20)" kubectl exec -n "$KUBEOVN_NS" "$_cpd_ovs" -c openvswitch -- \
+        ovs-vsctl get interface "$_cpd_ovsif" external_ids:ovn-installed external_ids:ovn-installed-ts 2>&1 || true
+    elif [ "$_cpd_ovsif_rc" -eq "$DP_RC_BUDGET_CUT" ]; then
+      echo "(the OVS interface lookup for iface-id=$_cpd_pod.$_cpd_ns was cut off at the deadline: the ${DP_SECTION} ran out of its share of the ${DP_BUDGET}s wall-clock budget)"
+    elif [ "$_cpd_ovsif_rc" -eq "$DP_RC_SPENT" ]; then
+      echo "(not started: the ${DP_SECTION} ran out of its share of the ${DP_BUDGET}s wall-clock budget)"
+    elif [ "$_cpd_ovsif_rc" -ne 0 ]; then
+      echo "(could not look up the OVS interface for iface-id=$_cpd_pod.$_cpd_ns -- the lookup exited $_cpd_ovsif_rc)"
+    else
+      echo "no OVS interface with external_ids:iface-id=$_cpd_pod.$_cpd_ns"
+    fi
+  fi
+}
+
+# capture_pod_reference <node> <outfile> -- the healthy-pod baseline for a
+# NODE, appended to <outfile>. This collector otherwise inspects NotReady pods
+# only, so a run has nothing to compare a suspicious route or conntrack state
+# against from the same node in the same window. Picks one Ready, Running,
+# non-hostNetwork pod on <node> that this run is not already investigating, and
+# runs the route-only half of the per-pod capture against it -- the route and
+# the conntrack, which is what a baseline is read for.
+#
+# The baseline belongs to the node, not to any one affected pod, and nothing
+# about it depends on which pod asked: the candidates are the rows of the one
+# snapshot, and pod_first_ready keeps only the Ready=True ones, which every
+# affected pod fails by definition. That is what keeps the answer a function of
+# the node alone, and that is the precondition for the cache below. Had
+# eligibility been decided by excluding the asking pod instead, one node would
+# yield a different baseline for each caller, and a shared cache would then hand
+# one pod's answer to another -- including to the pod the answer names. Hence
+# the signature: a node, and a file to append to.
+#
+# The absence is recorded rather than left silent, and so is the difference
+# between the two ways of having none: a node with no eligible pod is not a
+# read that never answered, and the artifact says which one happened.
+capture_pod_reference() {
+  _cpr_node=$1; _cpr_of=$2
+
+  # Captured once per NODE, then folded into every affected pod's file from a
+  # cache. The pod is a function of the node and nothing else, so several
+  # affected pods on one node -- the ordinary shape of a wedged host->local-pod
+  # datapath rather than an edge -- would otherwise each pay for a second full
+  # per-pod capture of the same healthy pod. The cache is about that capture,
+  # not about any read: the candidates come from the cluster-wide pod list this
+  # script has already taken.
+  _cpr_cache="${_REF_CACHE:+$_REF_CACHE/$_cpr_node}"
+  if [ -n "$_cpr_cache" ] && [ -f "$_cpr_cache" ]; then
+    cat "$_cpr_cache" >> "$_cpr_of" 2>/dev/null || true
+    return 0
+  fi
+  # With no cache directory the capture still happens, once per pod as before.
+  _cpr_sink="${_cpr_cache:-$_cpr_of}"
+
+  # Picked out of the SAME snapshot the affected set came from, which is what
+  # makes an affected pod ineligible by construction rather than by exclusion:
+  # pod_filter_affected keeps rows whose Ready is not True, pod_first_ready
+  # requires Ready True, and one row cannot satisfy both. A second read would
+  # reopen that -- a pod recovering between the two reports Ready in the later
+  # one, and could be offered as the baseline for its own failure.
+  _cpr_ref=$(printf '%s\n' "$_pods_raw" | pod_first_ready "$_cpr_node")
+
+  if [ -z "$_cpr_ref" ]; then
+    {
+      echo
+      echo "################################################################"
+      if [ "$_pods_rc" -eq 0 ]; then
+        echo "# REFERENCE (Ready) pod on node=$_cpr_node: none found -- no baseline available"
+      else
+        echo "# REFERENCE (Ready) pod on node=$_cpr_node: unknown -- the pod list did not finish, so whether a baseline exists was never established"
+      fi
+      echo "################################################################"
+    } >> "$_cpr_sink" 2>&1 || true
+    if [ -n "$_cpr_cache" ]; then
+      cat "$_cpr_cache" >> "$_cpr_of" 2>/dev/null || true
+    fi
+    return 0
+  fi
+
+  _cpr_refns=$(printf '%s' "$_cpr_ref" | cut -d'|' -f1)
+  _cpr_refpod=$(printf '%s' "$_cpr_ref" | cut -d'|' -f2)
+  _cpr_refip=$(printf '%s' "$_cpr_ref" | cut -d'|' -f3)
+  {
+    echo
+    capture_pod_dataplane "$_cpr_refns" "$_cpr_refpod" "$_cpr_refip" "$_cpr_node" "REFERENCE (Ready) on node=$_cpr_node" route-only
+  } >> "$_cpr_sink" 2>&1 || true
+  if [ -n "$_cpr_cache" ]; then
+    cat "$_cpr_cache" >> "$_cpr_of" 2>/dev/null || true
+  fi
+}
+
+if [ -z "$affected" ] && [ "$_pods_rc" -ne 0 ]; then
+  # Says what is unknown rather than what the read did. The list can answer in
+  # part and name only healthy pods, which lands here too, so a line asserting
+  # that it never answered would be wrong in exactly the case the note above
+  # already describes. The other two branches of this kind are worded the same
+  # way for the same reason.
+  log "whether any pod is affected is unknown -- checking LoadBalancers independently"
+elif [ -z "$affected" ]; then
+  log "no scheduled NotReady pods -- skipping host->pod capture; checking LoadBalancers independently"
+else
+  ncount=$(printf '%s\n' "$affected" | wc -l | tr -d ' ')
+  log "capturing host->pod data-plane for up to $MAX_PODS of $ncount affected pod(s) -> $OUT"
+
+  # OVN southbound logical-flow dump is cluster-global, so capture it once
+  # rather than per pod. ovn-central is a Deployment (not per-node); any replica
+  # answers. --no-leader-only lets a read land on a raft follower instead of
+  # erroring.
+  # items[*] for the same reason as pod_on_node: an absent ovn-central is a
+  # cluster without kube-ovn, not a read that failed.
+  _central_b=$(dp_clip "$DP_READ_TIMEOUT")
+  central=$(dp_run "$_central_b" kubectl get pod -n "$KUBEOVN_NS" -l app=ovn-central \
+    -o jsonpath='{.items[*].metadata.name}' 2>"${DP_ERR:-/dev/null}")
+  _central_rc=$?
+  central=${central%% *}
+  if [ "$_central_rc" -ne 0 ]; then
+    # No consequence named here: the lookup can fail after naming a replica, in
+    # which case the dump below runs on what it named. The branch that actually
+    # skips says so itself.
+    log "looking up an ovn-central replica $(dp_read_outcome "$_central_rc" "$_central_b" "$DP_TIMEOUT" "$DP_ERR")"
+  fi
+  if [ -n "$central" ]; then
+    {
+      echo "=== ovn-sbctl lflow-list (cluster-global, pod=$central) ==="
+      dp_run "$(dp_clip 30)" kubectl exec -n "$KUBEOVN_NS" "$central" -c ovn-central -- \
+        ovn-sbctl --no-leader-only lflow-list 2>&1 || true
+    } > "$OUT/ovn-lflows.txt" 2>&1 || true
+  elif [ "$_central_rc" -ne 0 ]; then
+    # Same distinction the pod list makes above: a lookup that never answered is
+    # not a cluster without ovn-central. Saying otherwise here would contradict
+    # the note printed a few lines up.
+    log "whether $KUBEOVN_NS runs ovn-central is unknown -- skipping OVN logical-flow dump"
+  else
+    log "no ovn-central pod in $KUBEOVN_NS -- skipping OVN logical-flow dump"
+  fi
+
+  i=0
+  printf '%s\n' "$affected" | {
+  _walk_end=complete
+  while IFS='|' read -r ns pod podip node _ready _phase _hostnet _eol; do
+    [ -n "$ns" ] && [ -n "$pod" ] && [ -n "$node" ] || continue
+    i=$((i + 1))
+    if [ "$i" -gt "$MAX_PODS" ]; then
+      log "reached MAX_PODS=$MAX_PODS cap; $((ncount - MAX_PODS)) more affected pod(s) NOT captured"
+      _walk_end="stopped early -- see the line above"
+      break
+    fi
+    # Declined out loud rather than walked: past the deadline every call below
+    # would refuse to start, leaving pod files that look captured and hold
+    # nothing.
+    if [ "$(dp_clip 1)" -le 0 ]; then
+      log "the pod section's share of the ${DP_BUDGET}s budget is spent; $((ncount - i + 1)) affected pod(s) NOT captured"
+      _walk_end="stopped early -- see the line above"
+      break
+    fi
+
+    # Node-global state (cilium endpoints, monitor, hubble, ovs flows, ip neigh,
+    # ip rule, ovn0 addr) -- captured once per node.
+    capture_node "$node"
+
+    # Pod-specific state, plus a healthy pod on the same node as a baseline.
+    # `_` joins the two because neither a namespace (a DNS label) nor a pod name
+    # (a DNS subdomain) can contain one; a hyphen made a-b/c and a/b-c one file.
+    pf="$OUT/pod-${ns}_${pod}.txt"
+    # Appended with the separator capture-notes.txt uses, so a second run into
+    # this directory keeps the evidence the first run's notes describe.
+    dp_new_run "$pf"
+    capture_pod_dataplane "$ns" "$pod" "$podip" "$node" "NotReady, Ready=$_ready" >> "$pf" 2>&1 || true
+    capture_pod_reference "$node" "$pf"
+  done
+  log "host->pod data-plane capture $(dp_walk_end "$_walk_end")"
+  }
+fi
+
+# ============================================================================ #
+# LoadBalancer-datapath capture (see the header block for the full rationale).  #
+# Independent of the NotReady-pod path above: it fires for a Service            #
+# type=LoadBalancer whose external IP is unreachable even though its backend is #
+# Ready, which the pod path cannot see. Everything below is bounded + best-     #
+# effort and never changes the job outcome.                                     #
+# ============================================================================ #
+
+# host_http_probe <node> <lbip> <port> -- one bounded reachability probe of the
+# LB IP from <node>'s host netns (via the hostNetwork kube-ovn cni-server, so the
+# probe traverses the same host->cross-node->backend datapath the flake breaks).
+# Echoes "ok" / "fail" per the result, "unknown" when the cni-server lookup did
+# not answer so no probe could be attempted, "spent" when the budget stopped
+# the probe (see below), or nothing when the lookup answered
+# that the node has no cni-server pod, when the image ships no probe client, or
+# when the exec itself could not run (the decision helper reads an empty set as
+# unknown too, and the caller tells the two shapes apart). Prefers a pure
+# TCP connect (nc -z) so a non-HTTP backend is not misread as unreachable; the
+# curl/wget fallbacks send HTTP and so fail-toward-capture on a non-HTTP port,
+# the safe direction (capture is cheap; a missed broken LB is not). Doubles as
+# the traffic generator for the tcpdumps.
+host_http_probe() {
+  _hp_node=$1; _hp_ip=$2; _hp_port=$3
+  _hp_cni=$(pod_on_node "$KUBEOVN_NS" app=kube-ovn-cni "$_hp_node"); _hp_rc=$?
+  # A lookup that never answered is not a node without a cni-server, and the
+  # two have to leave different traces. This emits an explicit unknown; the
+  # "no such pod" answer below emits nothing, as do a missing probe client and
+  # a failed exec. The caller reads exactly that difference: an outcome set
+  # that is present but wholly unknown names the lookup, an empty one names the
+  # three ways a probe can fail after the lookup answered.
+  #
+  # The decision helper reaches the same verdict from either shape -- an
+  # all-unknown set and an empty set both come back unknown -- so for
+  # capture-or-skip this token changes nothing. It exists for the caller's
+  # reason line, which is the only place the distinction reaches a reader.
+  #
+  # A third token, "spent", marks a probe the wall-clock budget stopped: dp_run
+  # refused the lookup or the exec, or cut one of them at the deadline. Neither
+  # the lookup nor the node is the cause then, and the caller says so.
+  if [ "$_hp_rc" -eq "$DP_RC_SPENT" ] || [ "$_hp_rc" -eq "$DP_RC_BUDGET_CUT" ]; then
+    echo spent
+    return 0
+  fi
+  if [ "$_hp_rc" -ne 0 ]; then
+    echo unknown
+    return 0
+  fi
+  [ -n "$_hp_cni" ] || return 0
+  _hp_b=$(dp_clip 12)
+  # The LB IP/port are embedded as inner single-quoted literals (same idiom as
+  # the pod-path captures above) so the inner shell never re-splits them.
+  _hp_out=$(dp_run "$_hp_b" kubectl exec -n "$KUBEOVN_NS" "$_hp_cni" -c cni-server -- \
+    sh -c "
+      if command -v nc >/dev/null 2>&1; then
+        nc -z -w 5 '$_hp_ip' '$_hp_port' >/dev/null 2>&1 && echo ok || echo fail
+      elif command -v curl >/dev/null 2>&1; then
+        curl -sS -o /dev/null --max-time 6 --connect-timeout 5 'http://$_hp_ip:$_hp_port/' >/dev/null 2>&1 && echo ok || echo fail
+      elif command -v wget >/dev/null 2>&1; then
+        wget -q -T 6 -O /dev/null 'http://$_hp_ip:$_hp_port/' >/dev/null 2>&1 && echo ok || echo fail
+      fi
+    " 2>/dev/null)
+  _hp_xrc=$?
+  if [ -z "$_hp_out" ] && { [ "$_hp_xrc" -eq "$DP_RC_SPENT" ] || [ "$_hp_xrc" -eq "$DP_RC_BUDGET_CUT" ]; }; then
+    echo spent
+    return 0
+  fi
+  [ -z "$_hp_out" ] || printf '%s\n' "$_hp_out"
+}
+
+# ovs_iface_for <node> <iface-id> <outfile> -- the OVS interface name on <node>
+# whose external_ids:iface-id matches (kube-ovn stamps <pod>.<ns>); empty if
+# none. Used to point the endpoint-node tcpdump at the backend's host-side tap.
+#
+# An empty answer means the tcpdump falls back to the geneve interface, and the
+# reason is appended to <outfile>, the LB capture. There are two lookups behind
+# it, the ovs pod and then the interface inside it, and the note names the one
+# that stopped: each has its own status, and reporting one as the other puts a
+# status in the artifact that no read returned.
+ovs_iface_for() {
+  _oi_fallback="the endpoint tcpdump uses $GENEVE_IFACE instead"
+  _oi_ovs=$(pod_on_node "$KUBEOVN_NS" app=ovs "$1")
+  _oi_rc=$?
+  if [ -z "$_oi_ovs" ]; then
+    if [ "$_oi_rc" -eq 0 ]; then
+      echo "(no ovs pod found on node $1; $_oi_fallback)" >> "$3" 2>/dev/null || true
+    elif [ "$_oi_rc" -eq "$DP_RC_BUDGET_CUT" ]; then
+      echo "(whether an ovs pod runs on node $1 is unknown: the lookup was cut when the ${DP_SECTION} ran out of its share of the ${DP_BUDGET}s wall-clock budget; $_oi_fallback)" >> "$3" 2>/dev/null || true
+    elif [ "$_oi_rc" -eq "$DP_RC_SPENT" ]; then
+      echo "(whether an ovs pod runs on node $1 was not asked: the ${DP_SECTION} ran out of its share of the ${DP_BUDGET}s wall-clock budget; $_oi_fallback)" >> "$3" 2>/dev/null || true
+    else
+      echo "(could not determine whether an ovs pod runs on node $1 -- the lookup did not answer; $_oi_fallback)" >> "$3" 2>/dev/null || true
+    fi
+    return 0
+  fi
+  _oi_out=$(dp_run "$(dp_clip 20)" kubectl exec -n "$KUBEOVN_NS" "$_oi_ovs" -c openvswitch -- \
+    ovs-vsctl --no-heading --columns=name find interface "external_ids:iface-id=$2" 2>/dev/null)
+  _oi_rc=$?
+  _oi_name=$(printf '%s\n' "$_oi_out" | head -n 1 | tr -d '" ')
+  if [ -n "$_oi_name" ]; then
+    printf '%s\n' "$_oi_name"
+  elif [ "$_oi_rc" -eq 0 ]; then
+    echo "(no OVS interface with iface-id=$2 on node $1; $_oi_fallback)" >> "$3" 2>/dev/null || true
+  elif [ "$_oi_rc" -eq "$DP_RC_BUDGET_CUT" ]; then
+    echo "(the OVS interface lookup for iface-id=$2 on node $1 was cut off at the deadline: the ${DP_SECTION} ran out of its share of the ${DP_BUDGET}s wall-clock budget; $_oi_fallback)" >> "$3" 2>/dev/null || true
+  elif [ "$_oi_rc" -eq "$DP_RC_SPENT" ]; then
+    echo "(the OVS interface for iface-id=$2 on node $1 was not looked up: the ${DP_SECTION} ran out of its share of the ${DP_BUDGET}s wall-clock budget; $_oi_fallback)" >> "$3" 2>/dev/null || true
+  else
+    echo "(could not look up the OVS interface for iface-id=$2 on node $1 -- the lookup exited $_oi_rc; $_oi_fallback)" >> "$3" 2>/dev/null || true
+  fi
+}
+
+# capture_lb_node <node> <role> <lbip> <nodeport> <endpointip> <outfile>
+# -- the static (non-tcpdump) host-side captures on one node for a failing LB.
+# role is ANNOUNCER or ENDPOINT and is stamped on every block so the two halves
+# of the path are unambiguous in the artifact.
+capture_lb_node() {
+  _cln_n=$1; _cln_role=$2; _cln_lbip=$3; _cln_np=$4; _cln_epip=$5; _cln_of=$6
+  _cln_agent=$(pod_on_node "$CILIUM_NS" k8s-app=cilium "$_cln_n"); _cln_agent_ok=$?
+  _cln_ovs=$(pod_on_node "$KUBEOVN_NS" app=ovs "$_cln_n"); _cln_ovs_ok=$?
+  _cln_cni=$(pod_on_node "$KUBEOVN_NS" app=kube-ovn-cni "$_cln_n"); _cln_cni_ok=$?
+  _cln_a=${_cln_agent:-$([ "$_cln_agent_ok" -eq 0 ] && echo '<none>' || echo '<unknown>')}
+  _cln_o=${_cln_ovs:-$([ "$_cln_ovs_ok" -eq 0 ] && echo '<none>' || echo '<unknown>')}
+  _cln_c=${_cln_cni:-$([ "$_cln_cni_ok" -eq 0 ] && echo '<none>' || echo '<unknown>')}
+  {
+    echo
+    echo "---------------- $_cln_role node=$_cln_n (cilium=$_cln_a ovs=$_cln_o cni=$_cln_c) ----------------"
+
+    if [ -n "$_cln_agent" ]; then
+      echo
+      echo "=== [$_cln_role $_cln_n] cilium-dbg bpf lb list | grep LB IP / nodePort -- host cilium LB->backend programming ==="
+      # Answers the first fork: if the host cilium has NO LB map entry for the
+      # LB IP or the nodePort, the fault is host-cilium-not-programming; if it
+      # does, suspicion shifts to kube-ovn delivery (the captures below).
+      dp_run "$(dp_clip 25)" kubectl exec -n "$CILIUM_NS" "$_cln_agent" -c cilium-agent -- \
+        sh -c "cilium-dbg bpf lb list 2>/dev/null | grep -E '$_cln_lbip|:$_cln_np' || echo 'no bpf lb entry for $_cln_lbip or nodePort $_cln_np'" 2>&1 || true
+    fi
+
+    if [ -n "$_cln_cni" ]; then
+      echo
+      echo "=== [$_cln_role $_cln_n] host netns: kernel conntrack -d $_cln_lbip (via cni-server) ==="
+      dp_run "$(dp_clip 15)" kubectl exec -n "$KUBEOVN_NS" "$_cln_cni" -c cni-server -- \
+        sh -c "if command -v conntrack >/dev/null 2>&1; then conntrack -L -d '$_cln_lbip' 2>/dev/null || echo 'no conntrack entries for $_cln_lbip'; else grep -F '$_cln_lbip' /proc/net/nf_conntrack 2>/dev/null || echo 'no conntrack CLI; no /proc/net/nf_conntrack match for $_cln_lbip'; fi" 2>&1 || true
+
+      echo
+      echo "=== [$_cln_role $_cln_n] host netns: ip neigh (LB IP $_cln_lbip, endpoint IP $_cln_epip) ==="
+      dp_run "$(dp_clip 15)" kubectl exec -n "$KUBEOVN_NS" "$_cln_cni" -c cni-server -- \
+        sh -c "ip neigh 2>/dev/null | grep -E '$_cln_lbip|$_cln_epip' || echo 'no neigh entry for $_cln_lbip or $_cln_epip'" 2>&1 || true
+    fi
+
+    if [ -n "$_cln_ovs" ]; then
+      echo
+      echo "=== [$_cln_role $_cln_n] ovs-ofctl dump-flows br-int | grep nodePort $_cln_np / endpoint $_cln_epip ==="
+      dp_run "$(dp_clip 25)" kubectl exec -n "$KUBEOVN_NS" "$_cln_ovs" -c openvswitch -- \
+        sh -c "ovs-ofctl dump-flows br-int 2>/dev/null | grep -E '$_cln_np|$_cln_epip' || echo 'no br-int flow matching nodePort $_cln_np or endpoint $_cln_epip'" 2>&1 || true
+
+      echo
+      echo "=== [$_cln_role $_cln_n] ovn-controller.log decisive lines ==="
+      dp_run "$(dp_clip 20)" kubectl exec -n "$KUBEOVN_NS" "$_cln_ovs" -c openvswitch -- \
+        sh -c 'grep -E "physical_flow_output|if_status_mgr|took [0-9]+ ?ms|recompute|Unreasonably long" /var/log/ovn/ovn-controller.log 2>/dev/null | tail -n 200 || echo "no matching lines in /var/log/ovn/ovn-controller.log"' 2>&1 || true
+    fi
+  } >> "$_cln_of" 2>&1 || true
+}
+
+# capture_lb_datapath: enumerate LBs, gate on a live probe, and characterise the
+# announcer/endpoint datapath for any LB whose every probe fails. Wraps the whole
+# per-LB body in `|| true`-guarded, time-boxed captures so it is always best-
+# effort and self-limiting (MAX_LBS cap + dp_run's per-call bounds and budget).
+capture_lb_datapath() {
+  _raw_b=$(dp_clip "$DP_LIST_TIMEOUT")
+  _raw=$(dp_run "$_raw_b" kubectl get svc -A \
+    -o jsonpath='{range .items[*]}{.metadata.namespace}{"|"}{.metadata.name}{"|"}{.spec.type}{"|"}{.status.loadBalancer.ingress[0].ip}{"|"}{.spec.ports[0].port}{"|"}{.spec.ports[0].nodePort}{"|"}{.spec.externalTrafficPolicy}{"\n"}{end}' \
+    2>"${DP_ERR:-/dev/null}")
+  _raw_rc=$?
+  # Unconditional, like every other read's note: a list can fail AFTER emitting
+  # rows -- a bound firing mid-stream leaves output on stdout and 124 in $? --
+  # and gating this on emptiness would let a partial inventory be captured as a
+  # complete one. The pod list splits the same way, an unconditional note here
+  # and the empty-versus-unanswered distinction below.
+  if [ "$_raw_rc" -ne 0 ]; then
+    log "listing services $(dp_read_outcome "$_raw_rc" "$_raw_b" "$DP_TIMEOUT" "$DP_ERR"); any LoadBalancer it did not name is missing from the capture below"
+  fi
+  _lbs=$(printf '%s\n' "$_raw" | lb_filter_services)
+  if [ -z "$_lbs" ] && [ "$_raw_rc" -ne 0 ]; then
+    # A Service list that never answered is not a cluster without
+    # LoadBalancers, the same distinction the pod list and the ovn-central
+    # lookup make.
+    log "whether any LoadBalancer needs capturing is unknown -- skipping LB-datapath capture"
+    return 0
+  fi
+  if [ -z "$_lbs" ]; then
+    log "no Service type=LoadBalancer with an ingress IP -- skipping LB-datapath capture"
+    return 0
+  fi
+
+  _lbcount=$(printf '%s\n' "$_lbs" | wc -l | tr -d ' ')
+  log "probing $_lbcount LoadBalancer service(s); heavy-capturing up to $MAX_LBS unreachable one(s) -> $OUT/lb-*.txt"
+
+  # MetalLB speaker logs once, prefixed with each speaker's node (hostNetwork, so
+  # .spec.nodeName IS the announcing node). Kept as an artifact file that
+  # lb_announcer_node greps per LB. A blank file is fine -- the announcer just
+  # reports <unknown> and the probe falls back to the endpoint node.
+  _speakerlog="$OUT/lb-speaker-logs.txt"
+  : > "$_speakerlog" 2>/dev/null || _speakerlog=""
+  _speakers_b=$(dp_clip "$DP_READ_TIMEOUT")
+  _speakers=$(dp_run "$_speakers_b" kubectl get pod -n "$METALLB_NS" -l "$SPEAKER_SELECTOR" \
+    -o jsonpath='{range .items[*]}{.metadata.name}{"|"}{.spec.nodeName}{"\n"}{end}' 2>"${DP_ERR:-/dev/null}")
+  _speakers_rc=$?
+  if [ "$_speakers_rc" -ne 0 ]; then
+    # Same reason: a list that failed after naming speakers still resolves an
+    # announcer from the ones it named, so the note says what is missing rather
+    # than what was given up on.
+    log "listing metallb speakers $(dp_read_outcome "$_speakers_rc" "$_speakers_b" "$DP_TIMEOUT" "$DP_ERR"); any speaker it did not name is missing from the announcer lookup"
+  fi
+  if [ -n "$_speakers" ] && [ -n "$_speakerlog" ]; then
+    # No field-count check here, unlike the three record filters above, and the
+    # absence is the answer rather than an oversight. These records carry two
+    # fields. A cut in the first leaves no separator at all, so the emptiness
+    # test below already rejects it. A cut in the second delivers every
+    # separator, so a count sees a whole record: `speaker-1|nod` and
+    # `speaker-1|nodeA` are the same shape, and nothing in-band tells a
+    # truncated node name from a short one. The test below is therefore as far
+    # as any check here can reach -- adding NF == 2 would reject no input it
+    # accepts, while reading as a closed gap.
+    printf '%s\n' "$_speakers" | while IFS='|' read -r _sp _spnode; do
+      [ -n "$_sp" ] && [ -n "$_spnode" ] || continue
+      # Read into a variable so the status survives: the announcer comes from
+      # these lines, and a read that failed would otherwise look exactly like a
+      # speaker that never announced the address.
+      _sp_b=$(dp_clip 15)
+      _sp_logs=$(dp_run "$_sp_b" kubectl logs -n "$METALLB_NS" "$_sp" -c speaker --tail=2000 2>"${DP_ERR:-/dev/null}")
+      _sp_rc=$?
+      if [ "$_sp_rc" -ne 0 ]; then
+        log "reading the logs of speaker $_sp on $_spnode $(dp_read_outcome "$_sp_rc" "$_sp_b" "$DP_TIMEOUT" "$DP_ERR"); an announce it did not return is missing from the announcer lookup"
+      fi
+      if [ -n "$_sp_logs" ]; then
+        printf '%s\n' "$_sp_logs" | awk -v n="$_spnode" '{ print n "\t" $0 }' >> "$_speakerlog" 2>/dev/null || true
+      fi
+    done
+  fi
+
+  # Counts LBs actually CAPTURED (heavy capture performed), not enumerated, so the
+  # MAX_LBS cap only bounds failing LBs -- reachable/skipped ones below never
+  # increment it and a broken LB enumerated after many reachable ones still gets
+  # captured. The gate lives on the capture branch (lb_budget_ok), not here.
+  _captured=0
+  printf '%s\n' "$_lbs" | {
+    _lb_walk_end=complete
+    while IFS='|' read -r _ns _name _type _lbip _port _np _etp; do
+      [ -n "$_lbip" ] || continue
+      # Past the deadline every lookup below refuses to start, and an LB whose
+      # probe never ran would be written up as if its lookups had not answered.
+      if [ "$(dp_clip 1)" -le 0 ]; then
+        log "the ${DP_BUDGET}s budget is spent; $_ns/$_name and any LoadBalancer after it NOT probed"
+        _lb_walk_end="stopped early -- see the line above"
+        break
+      fi
+      _lbport="${_port:-0}"
+
+      # EndpointSlice backend for this Service (first ready, addressed endpoint).
+      # The status is kept beside the value, as the per-node pod lookups do:
+      # these two reads are interpreted by emptiness alone, and without the
+      # status a read that never answered writes the same `<none>` into the
+      # artifact as a Service that genuinely has no endpoint. The reader who has
+      # the uploaded report and not the run cannot then tell the two apart.
+      #
+      # Neither note asserts a consequence a partial read can falsify. A bound
+      # firing mid-stream leaves output on stdout and 124 in $?, so a read that
+      # failed can still have named the backend printed below, and a note
+      # claiming the value went in as unknown would contradict the block two
+      # lines above it.
+      #
+      # The two say it differently because the reads fail differently. The row
+      # read names what is MISSING: a record it never finished is dropped by the
+      # filter, so it is genuinely absent from the block. The scalar read cannot
+      # borrow that wording -- a number cut mid-token still prints, and `80` cut
+      # from `8080` is indistinguishable from a real 80 -- so its note names
+      # where the printed value came from instead. The service and pod lists are
+      # worded like the first; pod_on_node names no consequence at all.
+      _eps_b=$(dp_clip "$DP_READ_TIMEOUT")
+      _eps=$(dp_run "$_eps_b" kubectl get endpointslices -n "$_ns" \
+        -l "kubernetes.io/service-name=$_name" \
+        -o jsonpath='{range .items[*]}{range .endpoints[*]}{.addresses[0]}{"|"}{.nodeName}{"|"}{.targetRef.namespace}{"|"}{.targetRef.name}{"|"}{.conditions.ready}{"\n"}{end}{end}' \
+        2>"${DP_ERR:-/dev/null}")
+      _eps_rc=$?
+      if [ "$_eps_rc" -ne 0 ]; then
+        log "listing the endpointslices of $_ns/$_name $(dp_read_outcome "$_eps_rc" "$_eps_b" "$DP_TIMEOUT" "$DP_ERR"); any endpoint it did not name is missing from the backend line below"
+      fi
+      _backend=$(printf '%s\n' "$_eps" | lb_first_ready_endpoint)
+      _epip=$(printf '%s' "$_backend" | cut -d'|' -f1)
+      _epnode=$(printf '%s' "$_backend" | cut -d'|' -f2)
+      _eptns=$(printf '%s' "$_backend" | cut -d'|' -f3)
+      _eptname=$(printf '%s' "$_backend" | cut -d'|' -f4)
+      # items[*]/ports[*], not items[0]/ports[0], for the reason pod_on_node
+      # spells out: client-go's evalArray has no allowMissingKeys escape, so
+      # indexing [0] into an empty list is a hard error and kubectl exits 1. A
+      # Service without endpointslices is an ordinary answer here, and now that
+      # the status is reported it would otherwise arrive as a failed read. The
+      # wildcard yields nothing and exits 0; several ports collapse to the first,
+      # the same way the pod lookups take the first name.
+      _eptport_b=$(dp_clip "$DP_READ_TIMEOUT")
+      _eptport=$(dp_run "$_eptport_b" kubectl get endpointslices -n "$_ns" \
+        -l "kubernetes.io/service-name=$_name" \
+        -o jsonpath='{.items[*].ports[*].port}' 2>"${DP_ERR:-/dev/null}")
+      _eptport_rc=$?
+      _eptport=${_eptport%% *}
+      if [ "$_eptport_rc" -ne 0 ]; then
+        log "reading the target port of $_ns/$_name $(dp_read_outcome "$_eptport_rc" "$_eptport_b" "$DP_TIMEOUT" "$DP_ERR"); the port below is what arrived before it stopped, which may be nothing at all or a value cut short"
+      fi
+      # Absent versus never-read, once per value, in the vocabulary the per-node
+      # captures already use.
+      _ep_absent=$([ "$_eps_rc" -eq 0 ] && echo '<none>' || echo '<unknown>')
+      _eptport_absent=$([ "$_eptport_rc" -eq 0 ] && echo '<none>' || echo '<unknown>')
+
+      # Announcer node = node of the most recent serviceAnnounced for the IP.
+      _annode=$(lb_announcer_node "$_lbip" < "${_speakerlog:-/dev/null}")
+
+      # Named and appended the way the per-pod files are, for the same two
+      # reasons: `_` fits in neither a namespace nor a Service name, and a
+      # second run into this directory keeps the first run's capture.
+      _of="$OUT/lb-${_ns}_${_name}.txt"
+      dp_new_run "$_of"
+      {
+        echo "################################################################"
+        echo "# LB $_ns/$_name  ip=$_lbip port=$_lbport nodePort=${_np:-<none>} etp=${_etp:-<default>}"
+        echo "# backend: ip=${_epip:-$_ep_absent} node=${_epnode:-$_ep_absent} pod=${_eptns:-$_ep_absent}/${_eptname:-$_ep_absent} targetPort=${_eptport:-$_eptport_absent}"
+        echo "# announcer node: ${_annode:-<unknown>}"
+        echo "################################################################"
+      } >> "$_of" 2>&1 || true
+
+      # Gate: probe the LB IP from the announcer node's host netns (fall back to
+      # the endpoint node if the announcer is unknown). Reachable -> record and
+      # skip the heavy capture; unreachable -> characterise both hops; nothing
+      # probed -> say that, and say which of the ways it happened.
+      #
+      # Every path that runs zero probes ends on the unknown outcome, carrying
+      # the reason that path can actually support. Five of them used to arrive
+      # at the "reachable, skipped" line: no node to probe from, a Service with
+      # no port, a probe node the lookup says runs no kube-ovn-cni pod, a host
+      # netns with no TCP/HTTP client, and an exec that could not run at all. A
+      # sixth, the lookup itself not answering, already reported unknown and
+      # still does. None of the five observed the address. Inferring reachability from an
+      # unattempted probe is what this section must never write down -- an image
+      # without nc/curl/wget alone would stamp every LB in the cluster reachable
+      # and skip the entire heavy capture, which reads as a healthy datapath.
+      _probenode="${_annode:-$_epnode}"
+      _decision=unknown
+      if [ -z "$_probenode" ]; then
+        _why="nowhere to probe from -- neither an announcer nor an endpoint node is known"
+      elif [ "$_lbport" = "0" ]; then
+        _why="the Service names no port to probe"
+      else
+        # Held in a variable rather than piped straight in, because the SHAPE of
+        # the outcome set is the only place the two routes to an unknown verdict
+        # stay apart, and the reason line has to name a cause that was actually
+        # observed. host_http_probe emits an explicit unknown only when the
+        # cni-server lookup did not answer, and "spent" only when the budget
+        # stopped the probe; everything else that stops a probe emits nothing.
+        _outcomes=$( { host_http_probe "$_probenode" "$_lbip" "$_lbport"
+                       host_http_probe "$_probenode" "$_lbip" "$_lbport"
+                       host_http_probe "$_probenode" "$_lbip" "$_lbport"; } )
+        _decision=$(printf '%s\n' "$_outcomes" | lb_capture_decision)
+        if printf '%s\n' "$_outcomes" | grep -qx spent; then
+          # Read only when the verdict is unknown, so no probe produced an
+          # outcome, and the budget refused at least one of them. The wording
+          # stays with what is known: a probe before the refused one may have
+          # started and been cut at the deadline, and another may have found its
+          # lookup unanswered.
+          _why="no probe completed from $_probenode -- the ${DP_SECTION}'s share of the budget ran out, cutting a probe at the deadline or refusing it"
+          if printf '%s\n' "$_outcomes" | grep -qx unknown; then
+            _why="$_why, and for another the cni-server lookup did not answer"
+          fi
+        elif [ -z "$_outcomes" ]; then
+          # Three ways in, and this script genuinely cannot tell them apart: the
+          # lookup answered that the node runs no kube-ovn-cni pod, its host
+          # netns ships no nc/curl/wget, or the exec could not run or finish
+          # (exec denied, the pod gone mid-probe, its own full bound). The
+          # exec's status is swallowed by design -- this collector never fails a
+          # job -- so they are reported as the set they are rather than guessed
+          # apart. What is NOT said here is that the lookup went unanswered: it
+          # answered, and pod_on_node keeps that distinction for its callers.
+          _why="no probe outcome from $_probenode -- no kube-ovn-cni pod there, or no TCP/HTTP client in its host netns, or the exec into it could not run or finish"
+        else
+          # Outcomes exist and the verdict is still unknown, which the decision
+          # helper only returns when every one of them is unknown -- and that
+          # token has exactly one source.
+          _why="no probe could be attempted from $_probenode -- the cni-server lookup did not answer"
+        fi
+      fi
+
+      if [ "$_decision" = "unknown" ]; then
+        echo "probe: whether the LB is reachable is unknown -- $_why (no heavy capture)" >> "$_of" 2>&1 || true
+        log "LB $_ns/$_name ($_lbip) not probed -- $_why"
+        continue
+      fi
+
+      if [ "$_decision" != "capture" ]; then
+        echo "probe: at least one probe from $_probenode succeeded -- reachable, skipped (no heavy capture)" >> "$_of" 2>&1 || true
+        log "LB $_ns/$_name ($_lbip) reachable -- skipped"
+        continue
+      fi
+
+      # Heavy-capture budget: only failing LBs consume MAX_LBS (reachable ones
+      # skipped above without counting). Stop once the cap's worth of broken LBs
+      # have been captured.
+      if [ "$(lb_budget_ok "$_captured" "$MAX_LBS")" != "yes" ]; then
+        echo "probe: LB IP unreachable from node $_probenode but MAX_LBS=$MAX_LBS captured cap reached -- NOT characterised" >> "$_of" 2>&1 || true
+        log "reached MAX_LBS=$MAX_LBS captured cap; further unreachable LB(s) NOT characterised"
+        _lb_walk_end="stopped early -- see the line above"
+        break
+      fi
+      _captured=$((_captured + 1))
+
+      log "LB $_ns/$_name ($_lbip) UNREACHABLE -- capturing announcer/endpoint datapath"
+      {
+        echo
+        echo "probe: LB IP unreachable from node $_probenode (no probe succeeded and at least one failed) -- heavy capture follows"
+      } >> "$_of" 2>&1 || true
+
+      # Static host-side captures on each hop.
+      if [ -n "$_annode" ]; then
+        capture_lb_node "$_annode" ANNOUNCER "$_lbip" "${_np:-0}" "${_epip:-0.0.0.0}" "$_of"
+      fi
+      if [ -n "$_epnode" ] && [ "$_epnode" != "$_annode" ]; then
+        capture_lb_node "$_epnode" ENDPOINT "$_lbip" "${_np:-0}" "${_epip:-0.0.0.0}" "$_of"
+      elif [ -n "$_epnode" ] && [ "$_epnode" = "$_annode" ]; then
+        echo "(endpoint node == announcer node $_annode -- single-node path, no cross-node hop)" >> "$_of" 2>&1 || true
+      fi
+
+      # Live tcpdump on both hops WHILE the probe is replayed: announcer geneve
+      # tunnel egress + endpoint backend tap ingress. Shows whether the packet
+      # crosses announcer->endpoint and reaches the backend's host-side iface.
+      # Guarded like the announcer capture above, and for a reason the empty
+      # string hides: pod_on_node turns its third argument into
+      # `--field-selector spec.nodeName=<node>`, so an empty node asks for pods
+      # whose nodeName is EMPTY -- the unscheduled ones. An unknown announcer
+      # would then hand the first pending kube-ovn-cni pod to a tcpdump stamped
+      # ANNOUNCER, pointing the reader away from the actual problem at the one
+      # moment this leg matters: the announcer is unknown exactly when MetalLB
+      # is misbehaving.
+      _an_cni=""
+      if [ -n "$_annode" ]; then
+        _an_cni=$(pod_on_node "$KUBEOVN_NS" app=kube-ovn-cni "$_annode")
+      else
+        echo "(announcer node unknown -- announcer-side tcpdump skipped)" >> "$_of" 2>&1 || true
+      fi
+      # Same guard on the endpoint side, and it is not the rarer case: a Service
+      # with no ready endpoint is the ordinary shape of an LB outage, and both
+      # lookups here -- the cni-server pod and the backend's OVS interface --
+      # reach pod_on_node with the node in hand.
+      _en_cni=""
+      _en_iface="$GENEVE_IFACE"
+      if [ -n "$_epnode" ]; then
+        _en_cni=$(pod_on_node "$KUBEOVN_NS" app=kube-ovn-cni "$_epnode")
+        if [ -n "$_eptname" ] && [ -n "$_eptns" ]; then
+          _cand=$(ovs_iface_for "$_epnode" "$_eptname.$_eptns" "$_of")
+          [ -n "$_cand" ] && _en_iface="$_cand"
+        fi
+      else
+        echo "(endpoint node unknown -- endpoint-side tcpdump skipped)" >> "$_of" 2>&1 || true
+      fi
+
+      _an_pcap="$OUT/lb-${_ns}_${_name}.tcpdump-announcer.txt"
+      _en_pcap="$OUT/lb-${_ns}_${_name}.tcpdump-endpoint.txt"
+      _an_td=""
+      _en_td=""
+      dp_new_run "$_an_pcap"
+      dp_new_run "$_en_pcap"
+      if [ -n "$_an_cni" ]; then
+        {
+          echo "# ANNOUNCER tcpdump node=${_annode:-<none>} iface=$GENEVE_IFACE filter='host $_lbip or host ${_epip:-0.0.0.0}'"
+          dp_run "$(dp_clip 15)" kubectl exec -n "$KUBEOVN_NS" "$_an_cni" -c cni-server -- \
+            sh -c "timeout 10 tcpdump -n -i '$GENEVE_IFACE' -c 60 'host $_lbip or host ${_epip:-0.0.0.0}' 2>&1 || true"
+        } >> "$_an_pcap" 2>&1 &
+        _an_td=$!
+      fi
+      if [ -n "$_en_cni" ]; then
+        {
+          echo "# ENDPOINT tcpdump node=${_epnode:-<none>} iface=$_en_iface filter='host $_lbip or host ${_epip:-0.0.0.0} or port ${_np:-0}'"
+          dp_run "$(dp_clip 15)" kubectl exec -n "$KUBEOVN_NS" "$_en_cni" -c cni-server -- \
+            sh -c "timeout 10 tcpdump -n -i '$_en_iface' -c 60 'host $_lbip or host ${_epip:-0.0.0.0} or port ${_np:-0}' 2>&1 || true"
+        } >> "$_en_pcap" 2>&1 &
+        _en_td=$!
+      fi
+
+      # Give the captures a moment to attach, then drive the probe traffic and
+      # collect. Bounded by the inner tcpdump timeout/-c and the exec timeout.
+      if [ -n "$_an_td" ] || [ -n "$_en_td" ]; then
+        sleep 2
+        host_http_probe "$_probenode" "$_lbip" "$_lbport" >/dev/null 2>&1 || true
+        host_http_probe "$_probenode" "$_lbip" "$_lbport" >/dev/null 2>&1 || true
+        [ -n "$_an_td" ] && { wait "$_an_td" 2>/dev/null || true; }
+        [ -n "$_en_td" ] && { wait "$_en_td" 2>/dev/null || true; }
+      fi
+
+      # STRETCH / TODO (deferred -- needs tenant-cluster access, not host-side):
+      #   The one hop this cannot reach is INSIDE the worker VMI. To finish the
+      #   chain, exec/console into the tenant cluster (virtctl console / SSH to
+      #   the worker VMI) and capture, in-guest:
+      #     - `cilium-dbg bpf lb list | grep <tenant-nodePort>` -- did the TENANT
+      #       cilium program the nodePort->pod translation? (separates a
+      #       tenant-side miss from a host-side delivery miss);
+      #     - `tcpdump -ni eth0 port <tenant-nodePort>` -- did the packet even
+      #       arrive on the VMI's NIC?
+      #   Deferred because it needs a tenant kubeconfig/virtctl that neither
+      #   caller of this diagnostic has; the host-side ANNOUNCER/ENDPOINT split
+      #   already localises the failing hop to host-cilium vs kube-ovn delivery.
+    done
+    log "LoadBalancer-datapath capture $(dp_walk_end "$_lb_walk_end")"
+  }
+}
+
+# The LoadBalancer section gets the rest of the budget, the reserve included.
+DP_DEADLINE=$((DP_T0 + DP_BUDGET))
+DP_SECTION="LoadBalancer section"
+capture_lb_datapath
+
+# The stderr sink is scratch, not evidence: everything worth keeping from it is
+# already quoted into a note above. Removed here rather than from an EXIT trap,
+# which this repo's suites ban. This is the only exit reachable once the sink
+# exists -- the two earlier ones run before it is created -- so the file leaks
+# only when the call-site backstop kills the script mid-run, into the runner's
+# TMPDIR.
+[ -n "$DP_ERR" ] && rm -f "$DP_ERR"
+[ -n "$_POD_MEMO" ] && rm -f "$_POD_MEMO"
+[ -n "$_REF_CACHE" ] && rm -rf "$_REF_CACHE"
+
+exit 0
diff --git a/hack/e2e-capture-previous-logs.sh b/hack/e2e-capture-previous-logs.sh
new file mode 100755
index 0000000000..42c087f95a
--- /dev/null
+++ b/hack/e2e-capture-previous-logs.sh
@@ -0,0 +1,703 @@
+#!/bin/sh
+# e2e-capture-previous-logs.sh - dump the PREVIOUS container instance's logs for
+# every container that has restarted.
+#
+# DIAGNOSTIC ONLY. This runs on an already-failed test, never mutates the
+# cluster, and never changes the test's pass/fail outcome. Every failure is
+# swallowed, and every kubectl call is individually time-boxed when `timeout` is
+# on PATH -- when it is not, the reads run unbounded rather than not at all, a
+# line says so, and the caller's outer backstop is what bounds them.
+#
+# Why this exists: when a pod crash-loops, the decisive evidence is almost
+# always in the immediately preceding terminated instance -- the interrupted
+# bootstrap, the assertion that killed the process, the config error that made
+# the entrypoint exit. `kubectl logs <pod> -c <container>` only ever shows the
+# CURRENT instance, which for a crash-looping container is the Nth restart: a
+# fresh, uninformative replay of the same startup path. That instance is
+# reachable only via `--previous`, and once the kubelet garbage-collects that
+# dead container the evidence is gone for good.
+#
+# The Chainsaw suites capture current logs through the built-in `podLogs`
+# collector, which has no `previous` option in chainsaw v0.2.15, so this
+# closes that gap for every suite at once
+# from the global catch rather than per-suite. The crust-gather snapshot does
+# collect previous.log per container, but that is a whole archive to download
+# and `crust-gather serve`; this puts the decisive lines directly in the failed
+# job's log, and keeps them even when the snapshot is truncated.
+#
+# Selection is discovered at runtime, never hardcoded: any container (including
+# init containers -- an interrupted bootstrap lives there) whose restartCount is
+# greater than zero. Containers that never restarted are skipped, so the common
+# healthy case costs one line saying nothing restarted, rather than a page of
+# "previous terminated container not found" noise. That one line is written, not
+# omitted: an absent capture-notes.txt is indistinguishable from a capture that
+# never ran.
+#
+# Ordering, where the cap binds: the failing test's namespace first, and within
+# each namespace group the most recent restart first (prevlog_sort_recent). The
+# restarts alive on a cluster at any moment span days, and install-time restarts
+# have a head start on every app suite that runs afterwards, so without a time
+# key the cap was routinely spent on containers that had already stopped
+# restarting before the failing test began. Nothing is dropped for being old --
+# an install-time restart is the explanation when the install is what broke.
+#
+# Usage: e2e-capture-previous-logs.sh <output-dir> [preferred-namespace]
+#
+# Environment:
+#   COZY_PREVLOG_MAX   max containers to dump (default 12); the overflow count
+#                      goes to the job log and to <output-dir>/capture-notes.txt,
+#                      never silently dropped. Raising it past ~13
+#                      trades one bounded report for another: the callers wrap
+#                      this script in a 300s backstop and the worst case is
+#                      ~30s for the pod list plus 20s per container, so beyond
+#                      that the backstop starts cutting the capture instead of
+#                      the cap reporting it. Widen the callers' backstop too.
+#   COZY_PREVLOG_TAIL  lines per container (default 200). The bound each capture
+#                      was written under is named in capture-notes.txt beside the
+#                      logs, not inside them: --tail drops the OLDEST lines and
+#                      nothing in the output says so, but a log read in full is a
+#                      complete artifact and a trailing prose line breaks every
+#                      parser that could read it before. -1 asks for
+#                      the whole log and suppresses that note, since no bound was
+#                      applied. A malformed value, a zero, or a leading zero falls
+#                      back to 200 and says so in capture-notes.txt: --tail=0 asks
+#                      kubectl for nothing, which this script would otherwise
+#                      report as the container having logged nothing, and a leading
+#                      zero is octal to `$(( ))` and decimal to `[`.
+
+# --------------------------------------------------------------------------- #
+# Pure, side-effect-free helpers.                                             #
+# Each takes text on stdin / in args and emits text -- no kubectl, no globals  #
+# -- so hack/capture-previous-logs.bats can source this file (with            #
+# E2E_CAPTURE_PREVLOGS_LIB set, see the guard below) and unit-test the         #
+# restart filtering, namespace prioritisation, recency ordering and capping     #
+# against mock input                                                           #
+# without a cluster. Keep them above the guard and free of any runtime state.  #
+# --------------------------------------------------------------------------- #
+
+# prevlog_filter_restarted: stdin = `ns|pod|container|kind|restartCount|finishedAt`
+# rows (one container per line, as emitted by the kubectl go-template in main).
+# finishedAt is when the PREVIOUS instance terminated, and may be empty -- see
+# prevlog_sort_recent.
+# Emits only the rows whose restartCount parses as an integer greater than
+# zero -- i.e. the containers that actually HAVE a previous instance to read.
+# A row whose count is empty, non-numeric or zero is dropped: asking for
+# `--previous` there is guaranteed to fail and would only add noise.
+prevlog_filter_restarted() {
+  while IFS='|' read -r ns pod container kind restarts finished; do
+    [ -n "$ns" ] && [ -n "$pod" ] && [ -n "$container" ] || continue
+    # Reject anything that is not a bare non-negative integer before comparing.
+    # This is not load-bearing for control flow -- `[ "<none>" -gt 0 ]` exits 2,
+    # so the `|| continue` below would drop the row regardless. What it buys is
+    # silence: without it every malformed row also prints an "Illegal number"
+    # line to stderr, straight into the failing job's log.
+    case "$restarts" in
+      '' | *[!0-9]*) continue ;;
+    esac
+    [ "$restarts" -gt 0 ] || continue
+    printf '%s|%s|%s|%s|%s|%s\n' "$ns" "$pod" "$container" "$kind" "$restarts" "$finished"
+  done
+}
+
+# prevlog_sort_recent: stdin = rows, stdout = the same rows, newest previous
+# instance first, rows carrying no timestamp last, ties left in input order.
+#
+# Why this exists. prevlog_prioritize below keeps the cap from being spent on
+# containers unrelated to the failing test, and until now "unrelated" meant only
+# "in another namespace". Time was not part of it, so a container that restarted
+# once during cluster bring-up competed on equal footing with one that
+# crash-looped during the test -- and won whenever the list happened to reach it
+# first. Measured on a live stand, the restarts present at any moment span days
+# (a nine-day spread, measured on a development cluster), and in CI the
+# install-time restarts have that head start: they exist before the first app
+# suite runs, so every failed test afterwards pays for them. A restart that
+# finished before the test began cannot explain the test's failure.
+#
+# Ordering, not filtering, and deliberately so: an install-time restart IS the
+# explanation when the install is what broke, and this capture has no reference
+# point for "when the test began" that would make a cutoff honest. Sorting costs
+# nothing when the cap does not bind and picks the right dozen when it does.
+#
+# Lexicographic sort over RFC3339 UTC is chronological: kubectl renders these as
+# fixed-width Z-suffixed strings, so no date parsing is needed. Reverse puts the
+# newest first and, because the empty string sorts below every timestamp, leaves
+# the rows whose lastState has already been dropped by the kubelet at the end.
+# -s keeps equal timestamps in input order, which a node reboot produces in
+# bulk; without it the order of a dozen simultaneous restarts would vary between
+# runs. Rows with no timestamp at all therefore pass through untouched, which is
+# also what keeps this a no-op for callers that pass 5-field rows.
+prevlog_sort_recent() {
+  # LC_ALL=C because the key is a fixed-format ASCII timestamp: collation buys
+  # nothing here and a locale that reorders punctuation could only surprise.
+  #
+  # Falls back to the input order rather than to nothing. The caller compares
+  # row counts to report the cap, so a sort that died would otherwise be
+  # indistinguishable from a cap overflow -- it would report "0 of N captured,
+  # N more not captured" and send the reader looking for a cap that never
+  # fired. Ordering is an optimisation over which dozen rows to keep; losing it
+  # must not lose the rows. `sort -s` and the per-key `r` are both extensions
+  # (GNU, BSD and busybox all carry them, which is why this is a fallback and
+  # not a reimplementation), so this is the branch a stricter POSIX sort takes.
+  # Anything in the timestamp column that is not shaped like one is treated as
+  # undated. Two reasons, and the second is why this is not redundant with the
+  # template guard above it: `<no value>` sorts ABOVE every digit, so a single
+  # such row would take the front of the queue from the newest real restart;
+  # and the header prints this field verbatim, so a non-timestamp there becomes
+  # a claim about a time nothing observed. Normalising to empty puts the row
+  # last and prints nothing, which are both already handled paths.
+  #
+  # Only when the field exists: setting $6 on a five-field row would append a
+  # separator and change its shape. The pattern is spelled out character by
+  # character rather than with an interval like {4}, which older mawk does not
+  # support and Ubuntu's default awk is mawk.
+  _psr_rows=$(awk -F'|' -v OFS='|' \
+    '{ if (NF >= 6 && $6 !~ /^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]T/) $6 = ""; print }')
+  [ -n "$_psr_rows" ] || return 0
+  if _psr_out=$(printf '%s\n' "$_psr_rows" | LC_ALL=C sort -s -t'|' -k6,6r 2>/dev/null); then
+    printf '%s\n' "$_psr_out"
+  else
+    echo "[capture-previous-logs] sort unavailable for recency ordering; keeping discovery order" >&2
+    printf '%s\n' "$_psr_rows"
+  fi
+}
+
+# prevlog_prioritize: stdin = filtered rows, $1 = the failing test's namespace.
+# Emits the rows whose namespace matches $1 first, then everything else, each
+# group ordered newest-restart-first by prevlog_sort_recent. On a broadly
+# degraded cluster the container cap below would otherwise be spent on unrelated
+# cozy-* restarts while the pod the test actually failed on -- the whole reason
+# we are here -- falls off the end. Namespace stays the primary key and recency
+# only breaks ties within a group: a stale restart in the failing test's own
+# namespace is still likelier to be relevant than a fresh one three namespaces
+# away. An empty $1 orders the whole input by recency.
+prevlog_prioritize() {
+  _pp_ns="$1"
+  if [ -z "$_pp_ns" ]; then
+    prevlog_sort_recent
+    return 0
+  fi
+  # Buffer once, emit twice: stdin is consumable only once, and the two passes
+  # need the same rows.
+  # Compared, not matched: the namespace arrives from the caller and would otherwise
+  # be a basic regular expression, so a `.` in it would match namespaces it does not
+  # name. Field-scoped, so a pod merely named like the prefix is not promoted.
+  #
+  # Smaller residual, not none: `awk -v` expands backslash escapes in the value it
+  # assigns, so a namespace containing `\t` would arrive as a real tab. Namespaces
+  # are DNS labels, so it cannot happen here -- but the class is narrowed rather
+  # than closed, and a comment claiming otherwise is the kind of thing a later
+  # reader trusts instead of rechecking.
+  _pp_rows=$(cat)
+  printf '%s\n' "$_pp_rows" | awk -F'|' -v p="$_pp_ns" '$1 == p' | prevlog_sort_recent || true
+  printf '%s\n' "$_pp_rows" | awk -F'|' -v p="$_pp_ns" 'NF && $1 != p' | prevlog_sort_recent || true
+}
+
+# prevlog_cap: stdin = prioritised rows, $1 = max rows to keep. Emits at most $1
+# rows. The caller compares the input and output counts to report the overflow;
+# this helper stays pure so it can be tested without a cluster.
+prevlog_cap() {
+  _pc_max="$1"
+  case "$_pc_max" in
+    '' | *[!0-9]*) _pc_max=12 ;;
+  esac
+  # A zero cap emits nothing; the caller still reports the full overflow count,
+  # so the drop stays visible. Handle it explicitly rather than via `head -n 0`:
+  # GNU head treats that as an empty result, but BSD/macOS head rejects it
+  # ("illegal line count -- 0"), which would abort a local run.
+  if [ "$_pc_max" -eq 0 ]; then
+    cat >/dev/null
+  else
+    head -n "$_pc_max"
+  fi
+}
+
+# prevlog_append_note <file> <text>
+#
+# Append a `[capture-previous-logs]` line, starting a new line first when the file
+# does not already end in one. Mirrors cozyreport_append_note in hack/cozyreport.sh,
+# and for the same reason: these reads are `timeout -k`-killable mid-stream, so a
+# partial final line is the normal shape of a truncated capture, not an edge case.
+# Appending blind glues the marker onto that line -- the last log line, which is
+# the decisive one for a truncated read, is corrupted, a grep for the marker at
+# start-of-line misses it, and in reverse a container whose own final write ended
+# mid-sentence produces a line that reads as if the container emitted the marker
+# itself.
+prevlog_append_note() {
+  _pan_file=$1
+  _pan_text=$2
+  if [ -s "$_pan_file" ] && [ -n "$(tail -c 1 "$_pan_file" 2>/dev/null)" ]; then
+    printf '\n' >> "$_pan_file" || true
+  fi
+  printf '%s\n' "$_pan_text" >> "$_pan_file" || true
+}
+
+# prevlog_logfile_name: build the per-container artifact filename for a row's
+# fields. Namespaces, pod names and container names are all DNS labels, so the
+# only separator that needs normalising is the `|` we introduced.
+prevlog_logfile_name() {
+  printf '%s_%s_%s.log\n' "$1" "$2" "$3"
+}
+
+# Sourcing guard: hack/capture-previous-logs.bats sets E2E_CAPTURE_PREVLOGS_LIB
+# and sources this file purely to reach the helpers above; return before
+# touching $1 or running any capture so the unit test never needs a cluster.
+# The executing callers (the cozytest.sh failure hook and the Chainsaw global
+# catch) never set it, so the guard is a no-op there.
+if [ -n "${E2E_CAPTURE_PREVLOGS_LIB:-}" ]; then
+  return 0 2>/dev/null
+fi
+
+OUT="${1:?Usage: e2e-capture-previous-logs.sh <output-dir> [preferred-namespace]}"
+PREFER_NS="${2:-}"
+
+MAX="${COZY_PREVLOG_MAX:-12}"
+TAIL="${COZY_PREVLOG_TAIL:-200}"
+
+# The per-read budget, named once so the message that reports a timeout cannot
+# quote a number the read never used. The grace counts towards the ceiling, so
+# 18 + 2 is the 20s the worst-case arithmetic in the header, hack/cozytest.sh and
+# .chainsaw.yaml is written against.
+PREVLOG_READ_TIMEOUT=18
+# The cluster-wide list gets its own, larger bound: one call against every
+# namespace, where the per-container reads below are one container each.
+PREVLOG_LIST_TIMEOUT=28
+PREVLOG_READ_GRACE=2
+
+# The wall-clock wrapper, resolved once. Empty when `timeout` is absent: the reads
+# then run unbounded and a note says so, rather than every call exiting 127 and the
+# run reporting that kubectl failed when kubectl never ran.
+if command -v timeout >/dev/null 2>&1; then
+  PREVLOG_BOUND="timeout -k $PREVLOG_READ_GRACE"
+  PREVLOG_LIST_BOUND="timeout -k $PREVLOG_READ_GRACE $PREVLOG_LIST_TIMEOUT"
+else
+  PREVLOG_BOUND=""
+  PREVLOG_LIST_BOUND=""
+fi
+
+# prevlog_cutoff_desc <exit-status> <seconds> <bound>: how a 124/137 should be
+# described. The bound is passed in rather than read from PREVLOG_BOUND: the list
+# read is wrapped by a different one, and two variables set in a single if/else
+# agree only until something sets one of them alone.
+#
+# 124 is `timeout` and only `timeout`: the deadline passed and nothing else
+# produces it. 137 is 128+SIGKILL, which our own `-k` grace produces and so does
+# anything else that SIGKILLs the read -- the OOM killer on a loaded runner, a
+# teardown signalling the process group. Both belong in the cut-off branch, since
+# either way the capture ends before the log did; but "timed out after 30s" on a
+# 137 states a cause this script never observed, and a read killed at second two
+# reads as one that ran the full thirty. Same distinction cozyreport.sh draws, and
+# for the same reason: these files are read by someone deciding what to look at
+# next.
+prevlog_cutoff_desc() {
+  if [ -z "$3" ]; then
+    printf '%s' "a signal from outside this script, which ran its reads unbounded"
+  elif [ "${1:-}" = "137" ]; then
+    printf '%s' "a SIGKILL -- the kill grace of its own ${2}s timeout, or something else killing the read, which 137 does not tell apart"
+  else
+    printf '%s' "its own ${2}s timeout"
+  fi
+}
+
+# Create the output directory before the first log line, not just before the
+# first capture: every line below explains why the capture is smaller than the
+# cluster, and until the directory exists there is nowhere to write it.
+mkdir -p "$OUT" 2>/dev/null || true
+NOTES="$OUT/capture-notes.txt"
+# Appended, not truncated: a caller may aim two runs at one directory, and the
+# earlier run's reasons are as load-bearing as the later one's. Separate them, or
+# a "no container has restarted" from attempt one sits next to a "reached the
+# cap" from attempt two and the file stops being able to explain anything.
+if [ -s "$NOTES" ]; then
+  printf -- '--- new capture run ---\n' >> "$NOTES" 2>/dev/null || true
+fi
+
+# printf, not echo: under /bin/sh (dash on the CI image) echo expands backslash
+# escapes, so a kubectl message containing a literal \n would split across lines
+# and could forge a second "[capture-previous-logs]" verdict line.
+#
+# Every line goes to the artifact as well as to the job log. The job log is
+# where a triager looking at a red run is already standing, but it is also the
+# thing that expires, gets truncated by the runner, and is unreachable to anyone
+# reading the uploaded report weeks later. That reader sees N dumps in a
+# directory and no way to tell N from "all of them" -- the cap that dropped 21
+# containers, the pod list that never returned, the container whose previous
+# instance the kubelet had already collected, all invisible. Absent data that
+# looks like absent problems is the failure mode this capture exists to prevent,
+# so the reasons ship next to the logs they explain.
+log() {
+  printf '%s\n' "[capture-previous-logs] $*"
+  printf '%s\n' "[capture-previous-logs] $*" >> "$NOTES" 2>/dev/null || true
+}
+
+# The output directory arrives as an argument, so it can be unusable for reasons
+# that have nothing to do with the cluster: a parent that is a file, a path that
+# does not exist and cannot be created, a directory this process may not write.
+# Probed once here rather than left to each `> "$file"`, because a redirection
+# that cannot open its target fails BEFORE kubectl runs and hands the shell's own
+# status to the branch below -- which then reports "no previous instance
+# retrieved (kubectl exit 2)", once per container: a local condition stated as a
+# fact about the cluster, which is the mistake this script exists to stop making.
+#
+# Tested with `-d`/`-w` rather than by creating a probe file: a run killed between
+# writing that file and removing it would ship a stray dotfile inside the
+# uploaded artifact. A full filesystem slips through this check, but that is the
+# case where the note explaining it could not be written either.
+if [ ! -d "$OUT" ] || [ ! -w "$OUT" ]; then
+  log "cannot write to $OUT, so no previous-instance log can be kept; this is a condition of the machine writing the report and says nothing about whether anything crash-looped"
+  exit 0
+fi
+
+# Sanitise the cap here as well as in prevlog_cap, so the overflow line below
+# names the limit that was actually applied rather than echoing back a typo.
+# The nine-digit bound matters as much as the digits-only one, and for the reason
+# the sibling's cozyreport_is_count spells out: a value `test` and `head` cannot
+# compute with is not merely useless, it takes the rows with it. Under dash a
+# 30-digit cap makes `[ "$_pc_max" -eq 0 ]` fail with "Illegal number" and `head`
+# reject the count, so prevlog_cap emits nothing -- and the caller then reports
+# that zero containers were kept because the cap was reached. The cap that broke
+# collection gets named as the reason collection found nothing, which is a
+# statement about the cluster produced by a typo.
+case "$MAX" in
+  '' | *[!0-9]*)
+    log "ignoring malformed COZY_PREVLOG_MAX='$MAX'; using 12"
+    MAX=12
+    ;;
+  *)
+    if [ "${#MAX}" -gt 9 ]; then
+      log "ignoring COZY_PREVLOG_MAX='$MAX' (too large for this shell to compute with); using 12"
+      MAX=12
+    fi
+    ;;
+esac
+
+# Same treatment for the tail, and 0 is the value that makes it necessary rather
+# than tidy. `--tail=0` returns no lines at all, kubectl still exits 0, and the
+# empty-output branch below then deletes the capture and logs "previous instance
+# ... produced no output" -- a positive claim about the cluster manufactured
+# entirely by a typo, which also throws away the only remaining copy of a log the
+# kubelet has already collected. A leading zero is rejected because `$(( ))`
+# reads it as octal while `[` reads it as decimal, so one string means two
+# numbers. -1 is kept: that is the documented
+# spelling for "the whole log", and kubectl takes it.
+case "$TAIL" in
+  -1) ;;
+  '' | *[!0-9]*)
+    log "ignoring malformed COZY_PREVLOG_TAIL='$TAIL'; using 200"
+    TAIL=200
+    ;;
+  0 | 0*)
+    log "ignoring COZY_PREVLOG_TAIL='$TAIL' (a zero or leading-zero tail requests nothing, or is read as octal); using 200"
+    TAIL=200
+    ;;
+  *)
+    # Same nine-digit bound as the cap above. kubectl rejects an oversized --tail
+    # outright, which would turn every capture into a refusal attributed to the
+    # cluster rather than to the value.
+    if [ "${#TAIL}" -gt 9 ]; then
+      log "ignoring COZY_PREVLOG_TAIL='$TAIL' (too large for this shell to compute with); using 200"
+      TAIL=200
+    fi
+    ;;
+esac
+
+if [ -z "$PREVLOG_BOUND" ]; then
+  log "timeout is not on PATH, so the reads below ran with no wall-clock ceiling; this is a missing dependency on the machine producing the report, not a statement about the cluster"
+fi
+
+if ! command -v kubectl >/dev/null 2>&1; then
+  # Leaving silently would put an empty directory in the artifact, which is the
+  # one thing this script's notes exist to prevent: it reads as "looked, found
+  # no crash-loops" rather than "never looked". One caller pre-gates on kubectl,
+  # the other does not.
+  log "kubectl is not on PATH; no previous-instance logs were captured"
+  exit 0
+fi
+
+# The finishedAt guard is three deep, and the innermost one is the load-bearing
+# one: `finishedAt` is a metav1.Time behind `json:",omitempty"`, which cannot
+# omit a struct, and its zero value marshals to `null`. The kubelet does
+# synthesize a terminated state with no time -- ContainerStatusUnknown on a pod
+# deleted mid-run, which also bumps restartCount and so clears the filter above.
+# kubectl renders that leaf as the literal string `<no value>`, and `<` sorts
+# ABOVE every digit, so under the reverse sort that row would land FIRST and
+# displace the most recent real restart: the exact inversion this ordering
+# exists to prevent. It would also print `previous instance ended <no value>`,
+# a claim about a time nothing observed. Guarding the leaf collapses both
+# shapes -- null, and the key absent -- into the empty-timestamp path that
+# sorts last. Covered by the `<no value>` cases in hack/capture-previous-logs.bats.
+#
+# One cluster-wide list call. Both initContainerStatuses and containerStatuses
+# are walked: an interrupted bootstrap that leaves the datadir half-written
+# lives in an init container, and that is exactly the instance whose log gets
+# overwritten by the retry. `range` over an absent field yields nothing on
+# kubectl's unstructured objects, so a pod with no statuses yet is skipped
+# rather than erroring the template.
+# kubectl's own reason for not answering is the finding, so it is captured rather
+# than sent to /dev/null: "could not list pods (kubectl exit 1)" names no cause,
+# and this is the read every later line depends on.
+LIST_ERR=$(mktemp "${TMPDIR:-/tmp}/prevlog-list.XXXXXX" 2>/dev/null) || LIST_ERR=""
+# shellcheck disable=SC2016  # Go template syntax; $ns/$pod must not be expanded by the shell.
+# shellcheck disable=SC2086  # empty PREVLOG_LIST_BOUND must vanish, not become ""
+if ROWS=$($PREVLOG_LIST_BOUND kubectl get pods --all-namespaces -o go-template='
+{{- range .items -}}
+{{- $ns := .metadata.namespace -}}
+{{- $pod := .metadata.name -}}
+{{- range .status.initContainerStatuses -}}
+{{ $ns }}|{{ $pod }}|{{ .name }}|init|{{ .restartCount }}|{{ if .lastState }}{{ if .lastState.terminated }}{{ if .lastState.terminated.finishedAt }}{{ .lastState.terminated.finishedAt }}{{ end }}{{ end }}{{ end }}
+{{ end -}}
+{{- range .status.containerStatuses -}}
+{{ $ns }}|{{ $pod }}|{{ .name }}|container|{{ .restartCount }}|{{ if .lastState }}{{ if .lastState.terminated }}{{ if .lastState.terminated.finishedAt }}{{ .lastState.terminated.finishedAt }}{{ end }}{{ end }}{{ end }}
+{{ end -}}
+{{- end -}}' 2>"${LIST_ERR:-/dev/null}"); then
+  LIST_RC=0
+else
+  LIST_RC=$?
+  ROWS=''
+fi
+# Last line, not the first: a failing cluster-wide list is preceded by one klog
+# discovery-retry line per attempt, each long enough that trimming it to 200
+# characters would cut off the cause it ends with.
+LIST_REASON=$([ -n "${LIST_ERR:-}" ] && tail -n 1 "$LIST_ERR" 2>/dev/null | cut -c1-200)
+[ -z "${LIST_ERR:-}" ] || rm -f "$LIST_ERR"
+
+# An unreachable or degraded API is the state a failed e2e is usually in, and it
+# yields exactly the same empty ROWS as a healthy cluster where nothing
+# restarted. Distinguish them: reporting "no container has restarted" off a list
+# call that never returned asserts a cluster fact this script never observed,
+# and would talk a triager out of the crash-loop hypothesis.
+if [ "$LIST_RC" -ne 0 ]; then
+  if [ "$LIST_RC" -eq 124 ] || [ "$LIST_RC" -eq 137 ]; then
+    log "could not list pods: the read was cut off by $(prevlog_cutoff_desc "$LIST_RC" "$PREVLOG_LIST_TIMEOUT" "$PREVLOG_LIST_BOUND"); cannot determine whether anything crash-looped"
+  else
+    if [ -z "${LIST_ERR:-}" ]; then
+      log "could not list pods (kubectl exit $LIST_RC): its message could not be captured (no writable temp dir here), so whether it said anything is unknown; cannot determine whether anything crash-looped"
+    else
+      log "could not list pods (kubectl exit $LIST_RC): ${LIST_REASON:-no message from kubectl}; cannot determine whether anything crash-looped"
+    fi
+  fi
+  exit 0
+fi
+
+RESTARTED=$(printf '%s\n' "$ROWS" | prevlog_filter_restarted)
+TOTAL=$(printf '%s\n' "$RESTARTED" | grep -c . || true)
+
+if [ "${TOTAL:-0}" -eq 0 ]; then
+  # Nothing restarted anywhere: the failure is not a crash-loop, so there is no
+  # previous instance to read. Say so once instead of emitting an empty section
+  # that reads like a broken capture.
+  log "no container has restarted; no previous-instance logs to capture"
+  exit 0
+fi
+
+SELECTED=$(printf '%s\n' "$RESTARTED" | prevlog_prioritize "$PREFER_NS" | prevlog_cap "$MAX")
+KEPT=$(printf '%s\n' "$SELECTED" | grep -c . || true)
+
+log "capturing previous-instance logs for $KEPT of $TOTAL restarted container(s) -> $OUT"
+if [ "$KEPT" -lt "$TOTAL" ]; then
+  # Never truncate silently: a reader who sees 12 dumps must know whether that
+  # was all of them. Raise COZY_PREVLOG_MAX to widen.
+  log "reached COZY_PREVLOG_MAX=$MAX cap; $((TOTAL - KEPT)) more restarted container(s) NOT captured"
+fi
+
+# Once per run, not once per container. The bound is the same for every log this
+# capture writes, so repeating it per file put up to COZY_PREVLOG_MAX copies of one
+# sentence into capture-notes.txt -- the file a reader holding only the artifact
+# opens first, and the one place where the lines that explain a short capture have
+# to be findable. Burying them under twelve identical tail notes is a cost paid by
+# the reader for information they already had after the first. The sibling in
+# hack/cozyreport.sh states the same fact once per pod directory for the same
+# reason.
+#
+# Stated before the loop rather than after it: the loop body runs in a subshell, so
+# nothing it sets survives, and a capture killed by the outer backstop mid-walk
+# would lose an after-the-loop note entirely -- on exactly the run where knowing
+# the logs are tail-bounded matters most.
+#
+# Suppressed on -1, which asks kubectl for the whole log: "holds at most the last
+# -1 lines" describes a bound that was never applied.
+if [ "$KEPT" -gt 0 ] && [ "$TAIL" != "-1" ]; then
+  log "every previous-instance log in this directory holds at most the last $TAIL lines (COZY_PREVLOG_TAIL=$TAIL); anything earlier was never requested"
+fi
+
+printf '%s\n' "$SELECTED" | while IFS='|' read -r ns pod container kind restarts finished; do
+  [ -n "$ns" ] || continue
+  file="$OUT/$(prevlog_logfile_name "$ns" "$pod" "$container")"
+  # --timestamps so these lines can be interleaved with the events and the
+  # current-instance logs the suite's own podLogs collector emits.
+  # kubectl's stderr is the ONLY thing that separates the ways this call can
+  # come up empty, so it is captured and then quoted into the log line rather
+  # than discarded. It goes to a scratch path outside $OUT: the outer backstop
+  # can SIGKILL this script mid-read, and a stray .err file left in the snapshot
+  # tree would ship as zero-byte noise in the uploaded artifact.
+  # mktemp, not "$$": a predictable name under a world-writable directory is a
+  # symlink an unprivileged process can plant ahead of the redirect, and if the
+  # redirect itself fails the read never runs and gets reported below as kubectl
+  # refusing -- a claim about the cluster caused by the local filesystem.
+  err=$(mktemp "${TMPDIR:-/tmp}/prevlog-stderr.XXXXXX" 2>/dev/null) || err=""
+  # -k: plain `timeout` sends TERM and then waits forever on a process that
+  # ignores it, so the 20s here would not actually bound anything and the outer
+  # backstop would SIGKILL the whole script instead -- and that backstop's line
+  # reaches the job log only, so capture-notes.txt would end silently short on
+  # exactly the run these notes were added for.
+  #
+  # 18 + 2 rather than 20 + 5: the grace counts towards the ceiling, and the worst
+  # case this script is allowed is fixed by the callers' 300s backstop. Keeping the
+  # pair at 20s keeps the 30 + 12 x 20 = 270s arithmetic the header, hack/cozytest.sh
+  # and .chainsaw.yaml all state, instead of quietly moving it to 330 and getting
+  # the whole script SIGKILLed on the run that needed it.
+  # shellcheck disable=SC2086  # empty PREVLOG_BOUND must vanish, not become ""
+  $PREVLOG_BOUND ${PREVLOG_BOUND:+$PREVLOG_READ_TIMEOUT} kubectl logs -n "$ns" "$pod" -c "$container" --previous \
+      --timestamps --tail="$TAIL" >"$file" 2>"${err:-/dev/null}"
+  rc=$?
+  # LAST line, trimmed. A read against a cold discovery cache is preceded by one
+  # klog "couldn't get current server API group list" line per retry, and kubectl's
+  # own actionable message comes after them -- so the first line names the retry,
+  # not the cause. Single-pod reads are not exempt: the fixture in
+  # hack/cozyreport.bats models exactly that shape for one pod, and a multi-hour
+  # failed run produces cold discovery routinely. This matters more since this
+  # value now reaches the artifact, both in the in-file marker and in
+  # capture-notes.txt, rather than only the job log. Every other stderr quote in
+  # these three scripts already takes the last line.
+  reason=$([ -n "$err" ] && tail -n 1 "$err" 2>/dev/null | cut -c1-200)
+  # kubectl said something and still returned a log: a deprecation notice, a
+  # partial-result warning. It has no place in the log file, which is read by
+  # machine, but dropping it loses evidence -- and the whole point of this script
+  # is that nothing is lost in silence. Copied whole, not reduced: with no klog
+  # preamble to skip, every line here is a warning of its own.
+  # NOT gated on the log being non-empty. A read that exits 0, writes nothing and
+  # still emits a warning is the one shape where dropping the message costs most:
+  # the branch below then reports "produced no output", which is a positive claim
+  # about the container made while kubectl was speaking. The refusal path keeps its
+  # own handling further down; this copy is about preserving what was said, whatever
+  # the read returned.
+  if [ -n "$err" ] && [ -s "$err" ] && { [ -s "$file" ] || [ "$rc" -eq 0 ]; }; then
+    if [ -s "$file" ]; then
+      log "$(basename "$file"): kubectl returned this log and also said:"
+    else
+      log "$(basename "$file"): kubectl returned no log, exited 0, and said:"
+    fi
+    while IFS= read -r _warn_line; do log "  $_warn_line"; done < "$err"
+  fi
+  # Remembered before the scratch file is removed: the branches below still need to
+  # know whether kubectl spoke, and by then there is nothing left to ask.
+  err_had_output=""
+  if [ -n "$err" ] && [ -s "$err" ]; then err_had_output=1; fi
+  [ -z "$err" ] || rm -f "$err"
+  if [ "$rc" -ne 0 ] && [ ! -s "$file" ]; then
+    # Nothing landed. Report WHY instead of assuming one cause: exit 124 is our
+    # own read timeout (a slow or degraded apiserver), while any other non-zero
+    # is kubectl's own refusal. kubectl exits 1 for the kubelet having
+    # garbage-collected the dead container, for an RBAC denial and for an
+    # unreachable node alike, so the exit code alone separates nothing -- the
+    # message is what distinguishes them, and a blanket "kubelet GC" line would
+    # send a triager after the wrong problem. One line either way: this must
+    # never fail the catch, and the restartCount gate keeps it bounded to
+    # containers that really did restart.
+    rm -f "$file"
+    # 124 and 137 both mean the read hit its own timeout: `timeout -k` reports 137
+    # when the command ignored SIGTERM and had to be killed afterwards.
+    if [ "$rc" -eq 124 ] || [ "$rc" -eq 137 ]; then
+      log "reading the previous instance for $ns/$pod [$container] was cut off by $(prevlog_cutoff_desc "$rc" "$PREVLOG_READ_TIMEOUT" "$PREVLOG_BOUND")"
+    else
+      if [ -z "$err" ]; then
+        log "no previous instance retrieved for $ns/$pod [$container] (kubectl exit $rc): its message could not be captured (no writable temp dir here), so whether it said anything is unknown"
+      else
+        log "no previous instance retrieved for $ns/$pod [$container] (kubectl exit $rc): ${reason:-no message from kubectl}"
+      fi
+    fi
+    continue
+  fi
+  if [ ! -s "$file" ]; then
+    # kubectl succeeded but the previous instance wrote nothing. That is itself a
+    # finding -- a container OOM-killed or failing exec before its first write
+    # looks exactly like this -- so name it rather than leaving a silent gap that
+    # reads as "never attempted".
+    rm -f "$file"
+    # "Produced no output" is a claim about the container, so it may only be made
+    # when kubectl itself said nothing. When it did speak, the message is already
+    # in capture-notes.txt above and the two lines have to agree rather than one
+    # asserting silence the other just contradicted.
+    if [ -n "$err_had_output" ]; then
+      log "previous instance for $ns/$pod [$container] returned no log, though kubectl exited 0 and wrote the message above"
+    else
+      log "previous instance for $ns/$pod [$container] produced no output"
+    fi
+    continue
+  fi
+  if [ "$rc" -ne 0 ]; then
+    # The read was cut short, but whatever landed before the cut is still the
+    # evidence we came for. Keep it and mark it truncated; deleting a partial
+    # capture would throw away the only copy of a log that is already gone from
+    # the cluster.
+    # Same three-way split as the in-file marker below, not a bare exit status.
+    # 124 and 137 are this script's own clock; anything else is kubectl failing on
+    # its own terms. Reporting "kubectl exit 124" here while the marker inside the
+    # file names the timeout puts two sentences about ONE read in two files that
+    # disagree, and this is the one a reader meets first.
+    if [ "$rc" -eq 124 ] || [ "$rc" -eq 137 ]; then
+      log "previous-instance log for $ns/$pod [$container] is TRUNCATED: the read was cut off by $(prevlog_cutoff_desc "$rc" "$PREVLOG_READ_TIMEOUT" "$PREVLOG_BOUND")"
+    else
+      log "previous-instance log for $ns/$pod [$container] is TRUNCATED: kubectl exited $rc part way through${reason:+: $reason}"
+    fi
+  fi
+  # Why this file is not the whole log, stated inside it. Which reason applies
+  # depends on how the read ended: `--tail` drops the OLDEST lines, a killed read
+  # drops the NEWEST, and a file missing its end is a different object from one
+  # missing its beginning.
+  if [ "$rc" -ne 0 ]; then
+    # 124 and 137 are our own timeout firing; anything else is kubectl failing on
+    # its own terms, and it can also leave partial output -- a connection reset
+    # mid-stream writes some lines and then exits non-zero without any clock having
+    # run out. Naming the timeout for both would put a cause in the artifact that
+    # was never observed, which is the same defect as the tail note claiming a
+    # clean window: a confident explanation that happens to be false. The adjacent
+    # log() line above draws the same distinction, and both have to: they describe
+    # one read in two places a reader compares.
+    if [ "$rc" -eq 124 ] || [ "$rc" -eq 137 ]; then
+      prevlog_append_note "$file" \
+        "[capture-previous-logs] TRUNCATED: this log ends here because the read was cut off by $(prevlog_cutoff_desc "$rc" "$PREVLOG_READ_TIMEOUT" "$PREVLOG_BOUND"), not because the container stopped writing"
+    else
+      prevlog_append_note "$file" \
+        "[capture-previous-logs] TRUNCATED: this log ends here because kubectl exited $rc part way through, not because the container stopped writing${reason:+: $reason}"
+    fi
+  fi
+
+  # The `--tail` bound applies to this file as it does to every other one here,
+  # and it is stated ONCE for the whole capture above the loop rather than once per
+  # container. It still has to be stated for a capture cut short at its END, since
+  # such a file lost its OLDEST lines to `--tail` as well and naming only the end
+  # would tell the reader the file starts where the container did -- but that is
+  # what the run-level line covers, and it covers it without putting twelve copies
+  # of one sentence into the file a reader opens first.
+  #
+  # Recorded beside the log rather than inside it, wherever it is recorded: a log
+  # read in full is a complete artifact, these platforms log JSON per line, and a
+  # trailing prose line breaks every parser that could read the file before.
+  # Echo as well as archive. The archive is for later; the failing job's log is
+  # where whoever is triaging the red run is already looking.
+  #
+  # When the previous instance ended is in the header because it is the first
+  # thing that decides whether this dump is worth reading: an instance that
+  # ended during cluster bring-up cannot explain a test that started afterwards,
+  # and until a reader knows that they have to read 200 lines to find out. It is
+  # also what prevlog_sort_recent ordered on, so the header shows the ordering
+  # rather than leaving it implicit. Omitted rather than guessed when the kubelet
+  # has already dropped the lastState -- "ended unknown" and "ended at 00:00"
+  # are not the same claim.
+  #
+  # "last -1 lines" would be nonsense; -1 means the whole log was requested.
+  if [ -n "$finished" ]; then
+    _ended=", previous instance ended $finished"
+  else
+    _ended=""
+  fi
+  if [ "$TAIL" = "-1" ]; then
+    echo "----- previous logs: $ns/$pod [$kind $container] (restarts=$restarts$_ended, whole log) -----"
+  else
+    echo "----- previous logs: $ns/$pod [$kind $container] (restarts=$restarts$_ended, last $TAIL lines) -----"
+  fi
+  cat "$file"
+  echo "----- end $ns/$pod [$container] -----"
+done
+
+exit 0
diff --git a/hack/e2e-chainsaw-run.sh b/hack/e2e-chainsaw-run.sh
new file mode 100755
index 0000000000..cf13623b68
--- /dev/null
+++ b/hack/e2e-chainsaw-run.sh
@@ -0,0 +1,83 @@
+#!/usr/bin/env bash
+# Runs the Chainsaw app suite one suite directory at a time and, after each,
+# fails the suite whose pods outlived its own cleanup (hack/e2e-chainsaw/_lib/
+# leak-guard.sh says how a pod is charged to a suite, and why).
+#
+# Usage, from hack/e2e-chainsaw/ (where .chainsaw.yaml is):
+#   ../e2e-chainsaw-run.sh [--set-string KEY=VALUE]... [SUITE...]
+#
+# One invocation per suite rather than one for the lot because Chainsaw v0.2.15
+# has no hook that runs after a test's cleanup: its Configuration carries a
+# global `error.catch`, which runs only on failure, and nothing else per test.
+# Between two invocations is the one point where every test in a suite has
+# finished its teardown and nothing from the next suite exists yet.
+#
+# The suites run are the ones a single `chainsaw test [SUITE...]` would run:
+# the named directories when there are any; otherwise every directory directly
+# under this one, each handed to chainsaw, whose own discovery decides what in
+# it is a test (a directory holding none, like _lib, runs nothing). That split
+# is exact only while no test sits at the top level itself, so one there stops
+# the run instead of being skipped.
+#
+# The per-suite JUnit reports are merged into chainsaw-report.xml, the file and
+# shape the workflows already collect. The run goes on past a red suite, as a
+# single invocation did, and exits non-zero when any suite failed or leaked.
+set -u
+
+here=$(cd "$(dirname "$0")" && pwd)
+# shellcheck source=hack/e2e-chainsaw/_lib/leak-guard.sh
+. "$here/e2e-chainsaw/_lib/leak-guard.sh"
+allowlist=${COZY_LEAK_ALLOWLIST:-$here/e2e-chainsaw/_lib/leak-allowlist.txt}
+
+flags=()
+suites=()
+while [ $# -gt 0 ]; do
+    case $1 in
+        --set-string)
+            [ $# -ge 2 ] || { echo "e2e-chainsaw-run: --set-string needs a value" >&2; exit 2; }
+            flags+=("$1" "$2"); shift 2 ;;
+        --set-string=*) flags+=("$1"); shift ;;
+        -*) echo "e2e-chainsaw-run: unsupported option $1" >&2; exit 2 ;;
+        *) suites+=("${1%/}"); shift ;;
+    esac
+done
+
+if [ "${#suites[@]}" -eq 0 ]; then
+    if compgen -G 'chainsaw-test.y*ml' >/dev/null || compgen -G '[0-9]*-*.y*ml' >/dev/null; then
+        echo "e2e-chainsaw-run: a test at the top level of $PWD would not belong to any suite" >&2
+        exit 2
+    fi
+    while IFS= read -r d; do
+        suites+=("${d#./}")
+    done < <(find . -mindepth 1 -maxdepth 1 -type d | LC_ALL=C sort)
+fi
+
+lg_allowlist_validate "$allowlist" "$PWD" || exit 2
+
+reports=$(mktemp -d)
+rc=0
+for suite in "${suites[@]}"; do
+    key=${suite//\//_}
+    echo "=== suite $suite"
+    if ! start=$(lg_apiserver_now) || ! baseline=$(lg_baseline); then
+        echo "::error title=leak-guard::suite=$suite could not take the pre-suite reading; suite not run"
+        lg_synthetic_suite "$suite" "$suite" "the leak guard could not take the pre-suite reading; chainsaw did not run" >"$reports/$key.xml"
+        rc=1
+        continue
+    fi
+    # The extension is spelled out: chainsaw appends .xml only to a name that
+    # has none (getFile in pkg/report/report.go, v0.2.15), so a suite directory
+    # with a dot in its name would otherwise write a file the merge never finds.
+    chainsaw test ${flags[@]+"${flags[@]}"} --report-path "$reports" --report-name "$key.xml" "$suite"
+    crc=$?
+    [ "$crc" -eq 0 ] || rc=1
+    lg_check_suite "$suite" "$start" "$baseline" "$crc" "$allowlist"
+    case $? in
+        0) ;;
+        2) : >"$reports/$key.unchecked"; rc=1 ;;
+        *) : >"$reports/$key.leaked"; rc=1 ;;
+    esac
+done
+
+lg_merge_reports "$reports" "${suites[@]}" >chainsaw-report.xml
+exit "$rc"
diff --git a/hack/e2e-chainsaw/.chainsaw.yaml b/hack/e2e-chainsaw/.chainsaw.yaml
new file mode 100644
index 0000000000..87aa95619c
--- /dev/null
+++ b/hack/e2e-chainsaw/.chainsaw.yaml
@@ -0,0 +1,231 @@
+apiVersion: chainsaw.kyverno.io/v1alpha2
+kind: Configuration
+metadata:
+  name: cozystack-e2e
+spec:
+  # Default namespace for app tests: the pre-existing tenant-test (created by
+  # hack/e2e-install-cozystack.bats), matching the BATS suite. Chainsaw only
+  # deletes namespaces it created itself, so tenant-test is safe.
+  #
+  # A Test whose S3 client runs inside the tenant sets `namespace: tenant-root`
+  # itself, overriding this: the e2e tenant-test tenant is created isolated, so
+  # its Cilium egress allowlist blocks its Pods from reaching tenant-root's
+  # seaweedfs.
+  namespace:
+    name: tenant-test
+  # Run tests sequentially, matching the current BATS behavior. The bucket
+  # suite uses a fixed local port-forward port in both of its cases, so
+  # parallelism is unsafe until ports are made dynamic.
+  execution:
+    parallel: 1
+  timeouts:
+    apply: 1m
+    assert: 5m
+    # delete/cleanup are generous: finalizer-draining CRs (VMDisk, FoundationDB,
+    # Tenant child namespaces) can take minutes to fully reclaim their backing
+    # resources, and Chainsaw waits for the delete to complete during cleanup.
+    delete: 5m
+    cleanup: 5m
+    error: 5m
+    exec: 5m
+  cleanup:
+    skipDelete: false
+  # Global failure handler: on any test error, capture a crust-gather snapshot of
+  # the HOST cluster BEFORE Chainsaw's cleanup deletes the test's resources. This
+  # is the Chainsaw analog of the per-failed-test EXIT-trap host snapshot in
+  # hack/cozytest.sh (which covers the BATS prepare-cluster, install and openapi
+  # tests) — without it the Chainsaw app suite uploads a cozyreport.tgz with zero
+  # per-test snapshots. Combines additively with the per-test events/describe
+  # catches in each suite; the nested-tenant snapshot for the kubernetes-* tests
+  # is captured separately by hack/e2e-chainsaw/_lib/run-kubernetes.sh while its
+  # LB is alive. The snapshot lands under the _out/cozyreport/snapshots/<test>/
+  # tree that hack/cozyreport.sh folds into the uploaded artifact, so each failed
+  # test keeps its own `crust-gather serve`-able cluster state.
+  #
+  # Every catch script below carries an explicit `timeout:`. A Chainsaw script
+  # op is bounded by `timeouts.exec` (5m above) unless it overrides it, and the
+  # inner wall-clock budgets here sum well past that — so without the override
+  # the op ceiling fires and the catch reports `SCRIPT | ERROR | signal: killed`
+  # having collected little. That kill is strictly worse than an inner `timeout`
+  # firing, and worse in a way the process tree makes precise: the ceiling
+  # SIGKILLs the shell process alone — Chainsaw runs it under exec.CommandContext
+  # whose default cancel is Process.Kill() on the shell PID, not a process-group
+  # kill — so every later step in the script is skipped, but any collector the
+  # shell already spawned is orphaned rather than killed and keeps running. It
+  # also keeps the script's stdout/stderr pipe open, and cmd.Wait() does not
+  # return until that pipe closes, so the op does not even come back at its
+  # ceiling until the orphan exits on its own (#4268). An inner `timeout` instead
+  # kills that read at a known budget, exits 124, leaves a partial capture on
+  # disk and lets the remaining steps run — which is why every read below is
+  # itself wrapped in `timeout`, not left to the op ceiling. Keep each op's
+  # `timeout:` above the sum of the inner budgets it contains.
+  #
+  # Accepted tradeoff, so the arithmetic does not have to be rediscovered: this
+  # raises the worst-case catch to ~19m per failed test. The old design had no
+  # inner caps and leaned on the op ceiling, which does not reliably cut a busy
+  # script: it SIGKILLs the shell alone, orphaned children hold the pipe open,
+  # and the op overruns (#4268 measured 606s under a 300s ceiling), so the
+  # nominal ~5m was a figure a busy catch could exceed, not a cap. Tests run
+  # sequentially, and the E2E job is capped at 215 timeout-minutes. A cascade
+  # reddening many suites can therefore spend a large share of the job in
+  # diagnostics. That is deliberate — the old ceiling
+  # bought its speed by collecting nothing at all — and it is bounded: both legs
+  # only approach their ceilings on a genuinely degraded cluster, a systemic
+  # failure usually reds the install gate and skips the E2E step entirely, and
+  # the report-upload steps are `if: always()`. That last point does NOT extend
+  # to a job timeout: a 215-minute cap ends the job `cancelled`, and the ~4m48s
+  # grace window is consumed by the earlier `Collect report` step, so both
+  # cozyreport.tgz and the job log are lost (measured on runs 29557003429 and
+  # 29568562337). If this ever does start truncating runs, bound the number of
+  # snapshotted tests rather than shrinking these timeouts back down: the op
+  # ceiling firing does not cleanly cut a busy script (it SIGKILLs the shell
+  # alone and orphaned children hold the pipe open, so the op overruns), so a
+  # smaller timeout does not guarantee a kill.
+  error:
+    catch:
+    # Ordered cheapest-and-most-decisive first: if anything downstream overruns,
+    # the previous-instance logs are already in the job output.
+    - description: previous-instance container logs on failure
+      script:
+        # ~30s for the cluster-wide pod list plus 12 × 20s worst case for the
+        # per-container log reads = 270s, which the 300s inner backstop clears;
+        # 300 + the 30s kill grace = 330s, which 6m clears in turn. Sized so the
+        # rule above holds end-to-end for this op as well: the per-read timeouts
+        # are what fire, then the inner backstop, and the op timeout never does.
+        timeout: 6m
+        env:
+        - name: TEST_NAME
+          value: ($test.metadata.name)
+        content: |
+          set -u
+          name="${TEST_NAME:-unknown-test}"
+          snap="${COZY_REPORT_DIR:-/workspace/_out/cozyreport}/snapshots/${name}"
+          # The global catch fires once per failed operation; capture once per
+          # test. The directory is created here, before the helper runs, so the
+          # `-d` check below is decided by whether this block already ran rather
+          # than by what the helper found.
+          if [ -d "${snap}/previous-logs" ]; then exit 0; fi
+          mkdir -p "${snap}/previous-logs" 2>/dev/null || true
+          # `kubectl logs` shows only the CURRENT container instance, so for a
+          # crash-looping pod the suite's own `podLogs` collector captures the
+          # Nth restart — a fresh replay of the same startup path — while the
+          # evidence that explains the failure sits in the immediately preceding
+          # instance, reachable only via `--previous`. Chainsaw v0.2.15's podLogs
+          # collector has no `previous` option, so this closes the gap once for
+          # every suite here instead of per-suite. crust-gather does archive a previous.log per
+          # container, but that is a whole archive to fetch and serve; this puts
+          # the decisive lines straight into the failed job's log, and keeps
+          # them even when the snapshot below is truncated.
+          #
+          # The preferred-namespace argument only orders the capture (the test's
+          # own pods first, so a broadly degraded cluster cannot spend the cap on
+          # unrelated cozy-* restarts); it never restricts it. tenant-test is the
+          # namespace every app suite runs in, declared under `namespace.name`
+          # above. Within each namespace group the helper orders by how recently
+          # the previous instance ended, so the install-time restarts that exist
+          # before any app suite runs no longer displace one that happened during
+          # the failing test. Also ordering only -- an install-time restart is
+          # the explanation when the install is what broke.
+          if [ -x ../../e2e-capture-previous-logs.sh ]; then
+            timeout -k 30 300 ../../e2e-capture-previous-logs.sh \
+              "${snap}/previous-logs" "${COZY_TEST_NAMESPACE:-tenant-test}" 2>&1
+            rc=$?
+            # Same rule the snapshot op below follows: a backstop that fires has
+            # to say so. 300s sits above the ~270s worst case inside, so this
+            # should not fire — but if a read stalls past it, a capture cut short
+            # without a line would read as a complete one listing fewer
+            # crash-loops than actually occurred.
+            if [ "${rc}" -ne 0 ]; then
+              echo "» previous-instance capture INCOMPLETE (exit ${rc}); kept what landed in ${snap}/previous-logs"
+            fi
+          fi
+          # Diagnostics must never turn a failed assertion into a failed catch:
+          # the test's own error is the thing worth reading.
+          exit 0
+    - description: crust-gather host snapshot on failure
+      script:
+        # 390s worst case for the snapshot leg (360s + the 30s kill grace) plus
+        # 330s for the data-plane leg = 720s; 13m leaves 60s of slack. Only ever
+        # paid on an already-failed test.
+        timeout: 13m
+        # $test.metadata.name is the individual Test name (e.g. etcd-basic), so
+        # cases sharing a suite dir get distinct snapshots.
+        env:
+        - name: TEST_NAME
+          value: ($test.metadata.name)
+        # COZY_REPORT_DIR mirrors hack/cozytest.sh. A Chainsaw catch script's cwd
+        # is the failing test's suite dir (not the repo root), so default to the
+        # sandbox-invariant absolute path where cozyreport.sh collects from.
+        content: |
+          set -u
+          command -v crust-gather >/dev/null 2>&1 || exit 0
+          name="${TEST_NAME:-unknown-test}"
+          snap="${COZY_REPORT_DIR:-/workspace/_out/cozyreport}/snapshots/${name}"
+          # The global catch can fire once per failed operation in a test; one
+          # host snapshot per test is enough, so skip if it already exists.
+          if [ -d "${snap}/host" ]; then exit 0; fi
+          mkdir -p "${snap}" 2>/dev/null || true
+          echo "» capturing crust-gather host snapshot of failed ${name} -> ${snap}/host"
+          # --duration is crust-gather's OWN budget for the collection phase and
+          # it defaults to 60s, which silently truncates a snapshot of a cluster
+          # this size: on elapse it aborts the collection and skips its finish
+          # step, leaving whatever had been written so far and no indication that
+          # the rest is missing. Set it explicitly to 180s so the collection is
+          # actually allowed to complete.
+          #
+          # The outer wall-clock has to cover more than that budget, because
+          # crust-gather runs API discovery BEFORE the timer starts and that
+          # phase is unbounded — on a cluster with an unhealthy aggregated
+          # APIService (exactly the state a failed e2e is in) aggregated
+          # discovery times out and the fallback re-walks every group, which is
+          # where the old 300s went before a single object was written. 360s
+          # gives ~180s of discovery headroom on top of the 180s collection; if
+          # it still elapses, timeout exits 124, the verdict below records it
+          # rather than propagating it, and the
+          # partially-written snapshot stays on disk and remains servable.
+          # -k 30 hard-kills a collect that ignores the SIGTERM.
+          #
+          # Output goes to a log inside the snapshot instead of /dev/null so
+          # "is this snapshot complete or truncated?" is answerable from the
+          # uploaded artifact rather than a guess.
+          # --disable-additional-logs: the host-log leg spawns a privileged debug pod per
+          # node, which baseline PodSecurity rejects (403); its retry loop then burns the
+          # whole --duration and crust-gather exits 1. Skip it — it collects nothing here.
+          timeout -k 30 360 crust-gather collect --disable-additional-logs --duration 180s \
+            --exclude-kind Secret -f "${snap}/host" >"${snap}/crust-gather.log" 2>&1
+          rc=$?
+          case "${rc}" in
+            0)   echo "» crust-gather host snapshot complete" ;;
+            124|137) echo "» crust-gather host snapshot TRUNCATED (wall-clock ${rc}); partial state kept, see ${snap}/crust-gather.log" ;;
+            *)   echo "» crust-gather host snapshot FAILED (exit ${rc}); see ${snap}/crust-gather.log" ;;
+          esac
+          # Host->pod data-plane capture for NotReady pods — parity with the
+          # equivalent block in hack/cozytest.sh's fail handler. The catch
+          # script's cwd is the failing test's suite dir, so ../../ is hack/.
+          # 300s rather than the 600s used from cozytest.sh: this call site sits
+          # inside a Chainsaw op alongside the snapshot leg above and has to
+          # share that envelope, and the script keeps its own 270s wall-clock
+          # budget (COZY_DATAPLANE_BUDGET) under it. cozytest.sh has no
+          # containing op, so it passes a wider budget to match its 600s
+          # backstop.
+          if [ -x ../../e2e-capture-dataplane.sh ]; then
+            echo "» capturing host->pod data-plane for NotReady pods -> ${snap}/dataplane"
+            timeout -k 30 300 ../../e2e-capture-dataplane.sh "${snap}/dataplane" 2>&1
+            dp_rc=$?
+            # Read, not propagated: the `exit 0` below still stands. The
+            # collector names every read of its own it could not finish, so this
+            # backstop is the last way its leg can die without a word, and a
+            # truncated dataplane/ then reads exactly like a complete one that
+            # found little. The collector's own budget ends inside this
+            # backstop, so it fires only when that budget fails to hold, and the
+            # previous-logs leg above already reports its own.
+            if [ "${dp_rc}" -ne 0 ]; then
+              echo "» data-plane capture INCOMPLETE (exit ${dp_rc}); kept what landed in ${snap}/dataplane"
+            fi
+          fi
+          # A non-zero collector must not fail the catch and bury the test's own
+          # error, which is the thing worth reading.
+          exit 0
+  report:
+    format: XML
+    name: chainsaw-report
diff --git a/hack/e2e-chainsaw/.gitignore b/hack/e2e-chainsaw/.gitignore
new file mode 100644
index 0000000000..45e36c6256
--- /dev/null
+++ b/hack/e2e-chainsaw/.gitignore
@@ -0,0 +1,4 @@
+# Chainsaw JUnit report artifacts (written into the run directory; CI uploads
+# them via docker cp, they are never committed).
+*.xml
+chainsaw-report*.xml
diff --git a/hack/e2e-chainsaw/README.md b/hack/e2e-chainsaw/README.md
new file mode 100644
index 0000000000..c3e662e3fa
--- /dev/null
+++ b/hack/e2e-chainsaw/README.md
@@ -0,0 +1,76 @@
+# Chainsaw E2E tests
+
+The Cozystack E2E app suite, written for [Kyverno Chainsaw](https://github.com/kyverno/chainsaw) — a declarative, Kubernetes-native E2E test framework (CNCF, part of the Kyverno project; successor to KUTTL).
+
+This directory replaces the per-app BATS suite that used to live in `hack/e2e-apps/*.bats`. The CI `e2e` job runs every suite under `hack/e2e-chainsaw/` through `hack/e2e-chainsaw-run.sh` after `make install-cozystack`; cluster bootstrap (`hack/e2e-prepare-cluster-container.bats`, `hack/e2e-install-cozystack.bats`) and the OpenAPI checks (`hack/e2e-test-openapi.bats`) remain BATS.
+
+## Layout
+
+```
+hack/e2e-chainsaw/
+├── .chainsaw.yaml          # global Configuration (namespace, timeouts, JUnit report)
+├── _lib/                   # shell reused by the script-heavy suites
+│   ├── run-kubernetes.sh   #   tenant Kubernetes bringup + LB/NFS/ouroboros checks
+│   └── remediation-guard.sh
+├── <app>/
+│   ├── chainsaw-test.yaml  # one or more Test definitions
+│   └── <app>.yaml          # the manifests the test applies
+└── ...
+```
+
+Suites: `postgres`, `bucket`, `mariadb`, `mongodb`, `redis`, `valkey`, `qdrant`, `clickhouse`, `kafka`, `kafka-metadata`, `rabbitmq`, `etcd`, `openbao`, `harbor`, `foundationdb`, `external-dns`, `kuberture`, `vminstance`, `gateway`, `opensearch`, `monitoring`, `kubernetes-latest`, `kubernetes-previous`, `securitygroup`, `seaweedfs`, `computeplane`.
+
+## What Chainsaw buys over the BATS suite
+
+- **Readable tests** — a list of resources and expected states, not shell control flow. The `timeout N sh -ec "until kubectl get ..."` + `kubectl wait` pair that appeared ~100 times collapses into a single `assert` that polls existence and state together.
+- **Distinguishable failure modes** — "object never created", "created but never ready", and "wrong status" all surface as a structured diff instead of an opaque shell timeout.
+- **Automatic diagnostics** — `catch` blocks dump events, `describe`, and pod logs on any failure (the BATS suite only did this in `harbor.bats`, by hand).
+- **Automatic cleanup** — resources Chainsaw applied are deleted (and waited on) in reverse order; `finally` covers operator-created leftovers.
+- **CI-ready output** — a JUnit `chainsaw-report.xml` is emitted for the test summary.
+
+## Test anatomy
+
+Each suite is a directory with a `chainsaw-test.yaml` (one or more `Test` docs) plus the manifests it applies. A step has `try` (operations: `apply`, `assert`, `error`, `script`, `delete`, …), optional `catch` (diagnostics on failure), and optional `finally` (teardown regardless of outcome).
+
+Declarative suites assert on `status.conditions` and concrete fields. Inherently imperative suites keep their logic in `script` steps:
+
+- **openbao** — `bao operator init`/`unseal` via `kubectl exec`.
+- **kuberture** — `jq` on Service annotations + external-dns split-horizon log assertions.
+- **vminstance** — a server-side dry-run eviction of the VM's launcher pod, checked against the VMI's `LiveMigratable` condition.
+- **gateway** — admission-rejection cases that need `kubectl --as` impersonation or error-message greps; the tenant apex is read from the namespace `namespace.cozystack.io/host` label at runtime so they pass on any host.
+- **kubernetes-latest/previous** — wrap `_lib/run-kubernetes.sh` (Kamaji bringup, port-forward, LB/NFS/ouroboros). The script `cd`s to the repo root (the test dir is `hack/e2e-chainsaw/<suite>`, so repo root is `../../..`).
+
+## Conventions / gotchas (Chainsaw v0.2.15)
+
+- Condition asserts use the **filter-as-list** form, not the documented `[0]` index:
+  ```yaml
+  status:
+    (conditions[?type == 'Ready']):
+    - status: "True"
+  ```
+  The `(conditions[?type == 'Ready'])[0]: {status: "True"}` idiom fails with "field not found in the input object".
+- A reading of a failure diff: the **"actual" side is a projection onto the expected fields** — `status: {}` means the JMESPath expression failed, not that status is empty. Read the error line above the diff first.
+- `error` with a bare resource ref (name only) asserts the resource **does not exist** (used for "PVC reclaimed", "no backup schedule", "child has no Gateway HR").
+- `script` runs in the **test directory** with `$NAMESPACE` set to the config namespace (`tenant-test`).
+
+## Running locally
+
+Requires a cluster with Cozystack installed and a `tenant-test` namespace (the environment `hack/e2e-install-cozystack.bats` produces). `bucket` and `seaweedfs` additionally need `mc`, `nc`, and `jq` on the host; `kuberture`/`openbao`/`foundationdb`/`securitygroup`/`computeplane`/`kubernetes-latest`/`kubernetes-previous`/`vminstance` need `jq`.
+
+```bash
+# install chainsaw
+go install github.com/kyverno/chainsaw@latest   # or: brew install kyverno/chainsaw/chainsaw
+
+# run all suites (config picked up from .chainsaw.yaml)
+cd hack/e2e-chainsaw
+chainsaw test
+
+# run a single suite
+chainsaw test postgres/
+```
+
+`kubernetes-latest`/`kubernetes-previous` each bring up a full tenant Kubernetes cluster (~25 min, real worker nodes) and `vminstance` boots a nested VM — expect a long run for the full set.
+
+## CI integration
+
+The `e2e` job in `.github/workflows/pull-requests.yaml` runs `make -C packages/core/testing test-chainsaw` (which execs `hack/e2e-chainsaw-run.sh` inside the e2e sandbox) and uploads `chainsaw-report.xml`. The runner calls `chainsaw test` once per suite directory, fails a suite whose pods outlive its cleanup by more than the default `timeouts.cleanup` (`LEAKED-PODS suite=<dir>` in the log; see `docs/agents/e2e-testing.md` §8 and `_lib/leak-allowlist.txt` for known, filed leaks), and merges the per-suite reports into that one file. A local `chainsaw test` as shown above runs the same tests without the leak check. The sandbox image (`packages/core/testing/images/e2e-sandbox/Dockerfile`) ships the `chainsaw` binary alongside `kubectl`/`helm`/`mc`/`jq`/`nc`, built from source with a patch that keeps an assert polling through transient API errors such as an etcd leader change; a released `chainsaw` run locally fails the assert on the first such error instead.
diff --git a/hack/e2e-chainsaw/_lib/backup-access-preflight.sh b/hack/e2e-chainsaw/_lib/backup-access-preflight.sh
new file mode 100644
index 0000000000..4a8ac3f8a6
--- /dev/null
+++ b/hack/e2e-chainsaw/_lib/backup-access-preflight.sh
@@ -0,0 +1,152 @@
+#!/bin/sh
+# E2E-only proof that a freshly granted COSI BucketAccess is already usable by
+# the S3 server. accessGranted describes the COSI object state; it does not
+# prove that the backing server has reloaded the new IAM identity.
+
+cozy_backup_access_preflight() (
+  set -eu
+
+  namespace="$1"
+  access_name="$2"
+  timeout_seconds="${3:-90}"
+  s3_namespace="${COZY_E2E_S3_NAMESPACE:-tenant-root}"
+  s3_service="${COZY_E2E_S3_SERVICE:-seaweedfs-s3}"
+  local_port="${COZY_E2E_S3_PREFLIGHT_PORT:-18333}"
+  workdir=''
+  pf_pid=''
+  uploaded=false
+  access_key=''
+  secret_key=''
+  bucket=''
+  deadline=''
+  attempt=''
+  stage=''
+  put_rc=''
+  rm_rc=''
+  object=''
+
+  case "${timeout_seconds}:${local_port}" in
+    *[!0-9:]*)
+      echo "backup access preflight timeout and local port must be integers" >&2
+      return 1
+      ;;
+  esac
+
+  if ! workdir=$(mktemp -d); then
+    echo "could not create backup access preflight work directory" >&2
+    return 1
+  fi
+  # Invoked indirectly by the exit trap below.
+  # shellcheck disable=SC2329
+  cleanup() {
+    rc=$?
+    trap - 0
+    # Before the port-forward goes: the delete travels through it.
+    if [ "${uploaded}" = true ]; then
+      rm_rc=0
+      timeout 15 mc rm --insecure "backup-preflight/${bucket}/${object}" >"${workdir}/cleanup.log" 2>&1 || rm_rc=$?
+      if [ "${rm_rc}" -ne 0 ]; then
+        # A delete killed by its bound usually wrote nothing to say why.
+        [ "${rm_rc}" -ne 124 ] || echo "mc rm timed out after 15s" >>"${workdir}/cleanup.log"
+        echo "WARNING: could not remove failed S3 preflight object ${bucket}/${object}:" >&2
+        sed 's/^/  s3-cleanup: /' "${workdir}/cleanup.log" >&2
+      fi
+    fi
+    if [ -n "${pf_pid}" ] && kill -0 "${pf_pid}" 2>/dev/null; then
+      if ! kill "${pf_pid}" 2>/dev/null; then
+        echo "WARNING: could not stop S3 preflight port-forward process ${pf_pid}" >&2
+      fi
+      # wait reports the SIGTERM used above as a non-zero child status. That is
+      # the expected port-forward shutdown, not a preflight failure.
+      if ! wait "${pf_pid}" 2>/dev/null; then
+        :
+      fi
+    fi
+    rm -rf -- "${workdir}"
+    exit "${rc}"
+  }
+  trap cleanup 0
+
+  # Keep the producer and decoder as separate commands. This helper is sourced
+  # by cozytest.sh under /bin/sh, where pipefail is unavailable; a pipeline
+  # would otherwise let a failed Secret read look successful when base64 exits
+  # zero on empty input.
+  if ! kubectl -n "${namespace}" get secret "${access_name}" \
+      -o jsonpath='{.data.BucketInfo}' > "${workdir}/bucket-info.b64"; then
+    echo "failed to read BucketInfo Secret ${namespace}/${access_name}" >&2
+    return 1
+  fi
+  if ! base64 -d < "${workdir}/bucket-info.b64" > "${workdir}/bucket-info.json"; then
+    echo "BucketInfo Secret ${namespace}/${access_name} is not valid base64" >&2
+    return 1
+  fi
+  access_key=$(jq -r '.spec.secretS3.accessKeyID // ""' "${workdir}/bucket-info.json")
+  secret_key=$(jq -r '.spec.secretS3.accessSecretKey // ""' "${workdir}/bucket-info.json")
+  bucket=$(jq -r '.spec.bucketName // ""' "${workdir}/bucket-info.json")
+  if [ -z "${access_key}" ] || [ -z "${secret_key}" ] || [ -z "${bucket}" ]; then
+    echo "BucketInfo Secret ${namespace}/${access_name} lacks access key, secret key, or bucket name" >&2
+    return 1
+  fi
+
+  echo "Checking that BucketAccess ${namespace}/${access_name} is live in S3 before provisioning the backup workload..."
+  kubectl -n "${s3_namespace}" port-forward \
+    "service/${s3_service}" "${local_port}:8333" >"${workdir}/port-forward.log" 2>&1 &
+  pf_pid=$!
+  if ! timeout 30 sh -ec "until nc -z 127.0.0.1 ${local_port}; do sleep 1; done"; then
+    echo "S3 preflight port-forward did not become ready" >&2
+    sed 's/^/  port-forward: /' "${workdir}/port-forward.log" >&2
+    return 1
+  fi
+
+  export MC_CONFIG_DIR="${workdir}/mc"
+  if ! mc alias set backup-preflight "https://127.0.0.1:${local_port}" \
+      "${access_key}" "${secret_key}" --insecure >/dev/null; then
+    echo "failed to configure S3 client for BucketAccess ${namespace}/${access_name}" >&2
+    sed 's/^/  port-forward: /' "${workdir}/port-forward.log" >&2
+    return 1
+  fi
+
+  object=".cozystack-e2e-preflight/${access_name}-$(date +%s)-$$"
+  printf 'cozystack backup access preflight: %s\n' "${access_name}" > "${workdir}/source"
+  deadline=$(( $(date +%s) + timeout_seconds ))
+  attempt=0
+  while :; do
+    attempt=$(( attempt + 1 ))
+    stage=PUT
+    put_rc=0
+    timeout 15 mc cp --insecure "${workdir}/source" \
+      "backup-preflight/${bucket}/${object}" >>"${workdir}/mc.log" 2>&1 || put_rc=$?
+    # A PUT cut off by its time bound (124) may have landed all the same. One
+    # the server refused did not, and deleting it would only fail again.
+    if [ "${put_rc}" -eq 0 ] || [ "${put_rc}" -eq 124 ]; then
+      uploaded=true
+    fi
+    if [ "${put_rc}" -eq 0 ]; then
+      stage=GET
+      if timeout 15 mc cp --insecure "backup-preflight/${bucket}/${object}" \
+          "${workdir}/download" >>"${workdir}/mc.log" 2>&1; then
+        stage=compare
+        if cmp "${workdir}/source" "${workdir}/download" >>"${workdir}/mc.log" 2>&1; then
+          stage=DELETE
+          if timeout 15 mc rm --insecure "backup-preflight/${bucket}/${object}" \
+              >>"${workdir}/mc.log" 2>&1; then
+            uploaded=false
+            echo "BucketAccess ${namespace}/${access_name} passed PUT, GET, compare, and DELETE on attempt ${attempt}."
+            return 0
+          fi
+        fi
+      fi
+    fi
+    # One log carries every attempt, so this line is all that tells a failed
+    # upload from a failed download.
+    printf 'attempt %s failed at %s\n' "${attempt}" "${stage}" >>"${workdir}/mc.log"
+
+    if [ "$(date +%s)" -ge "${deadline}" ]; then
+      echo "BucketAccess ${namespace}/${access_name} was granted but did not pass S3 PUT/GET/DELETE within ${timeout_seconds}s" >&2
+      sed 's/^/  port-forward: /' "${workdir}/port-forward.log" >&2
+      sed 's/^/  s3-preflight: /' "${workdir}/mc.log" >&2
+      return 1
+    fi
+    sleep 5
+  done
+)
diff --git a/hack/e2e-chainsaw/_lib/etcd-cleanup.sh b/hack/e2e-chainsaw/_lib/etcd-cleanup.sh
new file mode 100644
index 0000000000..144e6da403
--- /dev/null
+++ b/hack/e2e-chainsaw/_lib/etcd-cleanup.sh
@@ -0,0 +1,89 @@
+# shellcheck shell=bash
+# Sourced by the chainsaw etcd Tests after `cd` to the repo root. Provides:
+#   etcd_cleanup        — drain of the singleton etcd release (details below)
+#   etcd_backup_cleanup — teardown of the S3 backup round-trip's resources
+# Both are used to pre-clean a scenario and as its guaranteed `finally`
+# teardown (clean-after-each), so the singleton-named etcd release never leaks
+# across scenarios — see hack/e2e-chainsaw/etcd/chainsaw-test.yaml.
+#
+# The etcd chart pins the Helm release name to 'etcd'
+# (packages/extra/etcd/templates/check-release-name.yaml) and provisions a
+# cluster-scoped DataStore/<namespace> for Kamaji. On teardown Kamaji leaks its
+# kamaji.clastix.io/TenantControlPlane finalizer (the reconcile that would drop
+# it needs the now-gone etcd), wedging the DataStore in Terminating and hanging
+# the etcd HelmRelease uninstall — which is what errored every etcd case when
+# Chainsaw auto-cleanup waited on it. No TenantControlPlane uses this
+# per-namespace test DataStore, so clear the finalizer each pass until the HR
+# and DataStore are both gone.
+#
+# The EtcdCluster's data-etcd-* PVCs are retained on uninstall (they are not
+# owned by the Etcd CR). They MUST be deleted too: a later scenario reuses the
+# same-named PVCs, the new etcd pods boot the previous scenario's data dir and
+# member identity, and the cluster never forms a fresh first quorum — it sticks
+# at EtcdCluster `WaitingForFirstQuorum` and the chart's helm --wait times out
+# (InstallFailed). That is why the first etcd scenario passes and every later
+# one failed until this drain reclaimed the volumes. Verified from the failed
+# run's crust-gather snapshot: data-etcd-{0,1,2} shared one set of PV UIDs and a
+# single creationTimestamp across all three scenarios.
+#
+# Requires $NAMESPACE (set by Chainsaw script steps). Returns non-zero (failing
+# the step, per e2e-testing.md §4) if teardown does not settle within 4m.
+etcd_cleanup() {
+  etcd_pvc_selector='app.kubernetes.io/name=etcd,app.kubernetes.io/managed-by=etcd-operator'
+  kubectl -n "$NAMESPACE" delete etcd.apps.cozystack.io etcd \
+    --ignore-not-found --wait=false >/dev/null 2>&1 || true
+  # Queue the retained data PVCs for deletion now; kubernetes.io/pvc-protection
+  # holds them until the HR uninstall removes the member pods, after which
+  # they actually go. The loop below waits for that.
+  kubectl -n "$NAMESPACE" delete pvc -l "$etcd_pvc_selector" \
+    --ignore-not-found --wait=false >/dev/null 2>&1 || true
+  # Wait until the Etcd CR, its HelmRelease, the cluster-scoped Kamaji
+  # DataStore/<namespace>, and the data PVCs are ALL gone. The Etcd CR is
+  # included because it can linger Terminating after the HR is gone and then
+  # block the next apply of the singleton name. Each remnant is probed by
+  # name: an absent object gives empty output and exit 0, but a transient API
+  # error gives a non-zero exit, which sets an "err" sentinel so a blip is
+  # never mistaken for "deleted". The per-delete `|| true` is deliberate — the
+  # deletes are fire-and-forget (--wait=false, re-issued each pass); the teeth
+  # are this deadline-bounded poll, which returns non-zero (failing the step)
+  # if anything is still present after 4m. A blocking `delete --wait` would
+  # instead hang on the leaked DataStore finalizer rather than fail.
+  deadline=$(( $(date +%s) + 240 ))
+  while :; do
+    o_etcd=$(kubectl -n "$NAMESPACE" get etcd.apps.cozystack.io/etcd --ignore-not-found -o name 2>/dev/null) || o_etcd=err
+    o_hr=$(kubectl -n "$NAMESPACE" get hr/etcd --ignore-not-found -o name 2>/dev/null) || o_hr=err
+    o_ds=$(kubectl get "datastore.kamaji.clastix.io/$NAMESPACE" --ignore-not-found -o name 2>/dev/null) || o_ds=err
+    o_pvc=$(kubectl -n "$NAMESPACE" get pvc -l "$etcd_pvc_selector" -o name 2>/dev/null) || o_pvc=err
+    if [ -z "$o_etcd$o_hr$o_ds$o_pvc" ]; then break; fi
+    kubectl patch datastore.kamaji.clastix.io "$NAMESPACE" \
+      --type=merge -p '{"metadata":{"finalizers":[]}}' >/dev/null 2>&1 || true
+    # Re-issue the PVC delete each pass: the first call can race ahead of the
+    # operator recreating them, and it is a no-op once they are gone.
+    kubectl -n "$NAMESPACE" delete pvc -l "$etcd_pvc_selector" \
+      --ignore-not-found --wait=false >/dev/null 2>&1 || true
+    if [ "$(date +%s)" -ge "$deadline" ]; then
+      echo "etcd/DataStore/PVC teardown did not settle within 4m" >&2
+      kubectl -n "$NAMESPACE" get hr,etcd.apps.cozystack.io,pvc -l "$etcd_pvc_selector" >&2 2>&1 || true
+      kubectl get datastore.kamaji.clastix.io "$NAMESPACE" -o yaml >&2 2>&1 || true
+      return 1
+    fi
+    sleep 5
+  done
+}
+
+# Teardown of the backup round-trip's resources (bucket, BackupJob/Backup,
+# RestoreJob, etcdctl pod, creds Secret, BackupClass, strategy). cleanup.sh
+# resumes the source Etcd HelmRelease first, so a round-trip aborted
+# mid-restore does not strand the app suspended. Idempotent and safe even when
+# the round-trip test never ran (deletes nothing else owns).
+#
+# Has teeth, mirroring etcd_cleanup: cleanup.sh is `set -e` with
+# --ignore-not-found on every delete, so it exits 0 on a clean namespace and
+# non-zero only on a real failure (stuck finalizer, RBAC error, wait timeout).
+# Deliberately NOT `|| true`d here — inside a Chainsaw `finally` a stuck
+# cleanup must fail the step rather than leak a wedged bucket/BackupClass into
+# the next app test.
+etcd_backup_cleanup() {
+  [ -x examples/backups/etcd/cleanup.sh ] || return 0
+  NAMESPACE="$NAMESPACE" examples/backups/etcd/cleanup.sh 2>&1
+}
diff --git a/hack/e2e-chainsaw/_lib/etcd-probe.sh b/hack/e2e-chainsaw/_lib/etcd-probe.sh
new file mode 100644
index 0000000000..49c02a4495
--- /dev/null
+++ b/hack/e2e-chainsaw/_lib/etcd-probe.sh
@@ -0,0 +1,65 @@
+# shellcheck shell=bash
+# Sourced by the chainsaw etcd Tests after `cd` to the repo root. Provides:
+#   etcd_probe_resolve — recover a throwaway probe Pod's result marker when
+#                        `kubectl run --attach` lost the container's stream
+# Sourcing has no side effects: it defines a function and nothing else. The
+# function itself assigns two `_probe_`-prefixed variables without `local`,
+# which is not POSIX and so unavailable to the `sh` Chainsaw runs these steps
+# under; the prefix is what keeps them from colliding with a caller's names.
+#
+# Why this exists. The metrics contract in
+# hack/e2e-chainsaw/etcd/chainsaw-test.yaml proves the member Pods serve
+# Prometheus metrics over plaintext http by running a one-shot curl Pod and
+# reading a `code=<status>` marker off its output. `kubectl run --attach`
+# establishes the attach connection only after the Pod reaches Running, and a
+# container that exits before that connection is up writes its stdout into the
+# void — the caller gets kubectl's own chatter ("If you don't see a command
+# prompt, try pressing enter.") and no marker. curl against a Pod IP completes
+# in milliseconds, so losing the race is routine, not exotic.
+#
+# The failure that follows is a false negative: the step reports the metrics
+# endpoint as broken on a cluster that was serving 200 throughout. It is also
+# non-deterministic in the way that reads as a flake — whether attach wins
+# depends on Pod startup timing (CNI interface setup and image pull have each
+# been observed adding seconds), so the same suite passes on the next run
+# against identical code.
+#
+# The recovery is that the container's stdout is not actually gone: kubelet
+# wrote it to the Pod's log. So a lost stream is re-read rather than believed.
+# hack/e2e-chainsaw/_lib/talos-image-cache.sh solves the same race inline for
+# the image-cache probe (root cause from the same class of bug); that inline
+# copy is what identified this call site as still carrying the race. This is
+# the extracted, unit-tested form — see hack/etcd-probe_test.bats. It is not
+# yet shared: talos-image-cache.sh still carries its own copy, and folding it
+# onto this helper would need a name that is not etcd-specific.
+#
+# Three conditions make the re-read safe rather than a way to mask real
+# failures. The marker encodes the outcome, so a `code=503` recovered from the
+# log stays a failure. An attach stream that already carried a marker is never
+# second-guessed. And the caller must delete any previous Pod of the same name
+# *and wait for it to be gone* before running the probe, then not pass `--rm`:
+# without the blocking pre-delete the re-read could find a previous
+# incarnation's marker, and `--rm` would destroy the log this recovery reads.
+#
+# Usage:
+#   out=$(etcd_probe_resolve "$attach_output" kubectl -n "$ns" logs "$pod")
+#
+# Returns the attach output when it carries a marker; otherwise the log re-read
+# when that carries one; otherwise the attach output unchanged, so whatever
+# kubectl said about the failure survives into the caller's error message. A
+# failing re-read (evicted or already-collected Pod) is tolerated rather than
+# propagated, so it cannot kill a `set -e` caller before it reports the result.
+etcd_probe_resolve() {
+  _probe_attach_out="$1"
+  shift
+  if printf '%s' "$_probe_attach_out" | grep -q 'code='; then
+    printf '%s' "$_probe_attach_out"
+    return 0
+  fi
+  _probe_log_out="$("$@" 2>/dev/null || true)"
+  if printf '%s' "$_probe_log_out" | grep -q 'code='; then
+    printf '%s' "$_probe_log_out"
+    return 0
+  fi
+  printf '%s' "$_probe_attach_out"
+}
diff --git a/hack/e2e-chainsaw/_lib/leak-allowlist.txt b/hack/e2e-chainsaw/_lib/leak-allowlist.txt
new file mode 100644
index 0000000000..67a1fc1e27
--- /dev/null
+++ b/hack/e2e-chainsaw/_lib/leak-allowlist.txt
@@ -0,0 +1,15 @@
+# Suites whose leaked pods hack/e2e-chainsaw-run.sh reports as a warning
+# instead of failing the suite. One line per suite directory:
+#
+#   <suite-dir> <issue-ref>
+#
+# Every entry has to name an existing suite directory, or the run stops before
+# the first suite. An entry exempts the whole suite, so any new leak in it is
+# hidden too until the line goes: the PR that fixes the issue deletes the line.
+#
+# A TenantControlPlane can sit on its finalizer after the Kubernetes application
+# is deleted, holding its apiserver pods. Both suites create one through
+# hack/e2e-chainsaw/_lib/run-kubernetes.sh; the stuck finalizer was seen in
+# kubernetes-latest only, but nothing in the defect is specific to that suite.
+kubernetes-latest cozystack/cozystack#4489
+kubernetes-previous cozystack/cozystack#4489
diff --git a/hack/e2e-chainsaw/_lib/leak-guard.sh b/hack/e2e-chainsaw/_lib/leak-guard.sh
new file mode 100644
index 0000000000..d63cd944e7
--- /dev/null
+++ b/hack/e2e-chainsaw/_lib/leak-guard.sh
@@ -0,0 +1,373 @@
+# shellcheck shell=bash
+# Sourced by hack/e2e-chainsaw-run.sh, which runs one `chainsaw test` per suite
+# directory and calls lg_check_suite after each. Defines functions only.
+#
+# Why this exists. A suite can pass while the workloads it created outlive it.
+# Nothing then fails until a later suite cannot schedule, hours after the cause
+# and under the wrong name (a harbor `Insufficient memory` whose memory was held
+# by brokers of four Kafka releases from suites that had already passed). This
+# fails the suite that leaked, and names what it left behind.
+#
+# Attribution. A pod is charged to a suite when all three hold after the suite's
+# own cleanup:
+#   - it is not terminal (phase is neither Succeeded nor Failed), so it still
+#     holds its requests on a node;
+#   - its UID was not in the pod list taken before the suite started;
+#   - the root of its ownerReferences chain was created at or after the suite
+#     started, read on the apiserver's clock.
+# A platform pod fails the third condition even when a rollout, an eviction or
+# a crash replaced it mid-suite, because its root (the Deployment, DaemonSet,
+# StatefulSet or operator CR the install created) is older than the suite. The
+# second condition covers what the third cannot: a pre-existing pod adopted by
+# a controller recreated mid-suite has a new root, but it is not the suite's
+# pod. A leak is charged once, to its own suite: the next suite sees an old
+# root.
+#
+# The start instant comes from an apiserver rather than from this machine. With
+# several control-plane nodes the reading and a root's creationTimestamp may be
+# stamped by different apiservers, so the comparison is across node clocks.
+# No skew margin is added; the rule assumes those clocks agree more closely
+# than the gap between the reading and the suite's first object, which is at
+# least a chainsaw process start plus an API round trip. A node whose clock ran
+# behind the reading's by more than that would make a suite's first objects
+# look older than the suite and clear their pods; one running ahead only errs
+# toward charging.
+#
+# The reading is the creationTimestamp on a server-side dry-run create: the
+# generic registry's Store.create stamps it through
+# rest.FillObjectMetaSystemFields before it hands the object to
+# DryRunnableStorage.Create, which on a dry run copies it back without
+# persisting anything (staging/src/k8s.io/apiserver/pkg/registry/generic/
+# registry/store.go and dryrun.go, Kubernetes v1.33.0).
+# creationTimestamp has one-second resolution; the comparison is `>=`, so an
+# object created in the second the suite started counts as the suite's, which
+# is the direction that errs toward reporting.
+
+# How far the ownerReferences walk may go; the cap exists so an odd or cyclic
+# chain costs a bounded number of reads. The longest chains here belong to
+# tenant Kubernetes clusters. A tenant's apiserver pods run Pod -> ReplicaSet ->
+# Deployment -> TenantControlPlane -> KamajiControlPlane -> Cluster, five links
+# as the providers set them, which six walks whole. A worker VM's virt-launcher
+# pod climbs through the Cluster API Machine objects and can run past six;
+# there the walk stops at a MachineDeployment from a release the suite created,
+# which gives the same verdict as the Cluster. A walk that hits the cap stops at
+# the object it reached and says `depth-cap`. An owner normally exists before
+# what it owns, so that object is usually no older than the real root, and a
+# cut walk errs toward charging a pod rather than clearing it.
+LG_DEPTH_CAP=${LG_DEPTH_CAP:-6}
+
+# How long after a suite's chainsaw run returns its pods may still exist: the
+# default `timeouts.cleanup` in hack/e2e-chainsaw/.chainsaw.yaml, five minutes
+# (hack/chainsaw-leak-guard_test.bats keeps the two equal). A suite that
+# overrides its own cleanup timeout (kafka sets 8m) is covered all the same:
+# the runner calls the check only after `chainsaw test` has returned, and that
+# happens once every cleanup in the suite has finished under whatever timeout
+# it had, so the budget starts after the override has been spent rather than
+# competing with it. What remains after chainsaw's own cleanup is the tail it does
+# not wait for: garbage collection of the workloads under the deleted release,
+# then each pod's termination grace. The leaks this exists for sat about 110
+# minutes (Kafka brokers) and 30 minutes and more (a TenantControlPlane on its
+# finalizer) past the end of their suites, so the budget is not what separates
+# them from a slow teardown. The clear time of every suite is logged, so later
+# runs can check the number against measurements.
+LG_BUDGET=${COZY_LEAK_BUDGET:-300}
+
+# lg_apiserver_now — the apiserver's current time as RFC 3339, second resolution.
+lg_apiserver_now() {
+    local ts
+    ts=$(kubectl create configmap cozy-leak-guard-clock --namespace default \
+        --dry-run=server --output 'jsonpath={.metadata.creationTimestamp}') || return 1
+    [ -n "$ts" ] || { echo "leak-guard: the apiserver returned no creationTimestamp" >&2; return 1; }
+    printf '%s\n' "$ts"
+}
+
+# lg_pods — every pod in the cluster as JSON. A failed read is an error, never
+# an empty list: an empty list would read as a clean suite.
+lg_pods() {
+    kubectl get pods --all-namespaces --output json
+}
+
+# lg_baseline — the UIDs of every pod now, as a JSON array.
+lg_baseline() {
+    local pods
+    pods=$(lg_pods) || return 1
+    jq -c '[.items[].metadata.uid]' <<<"$pods"
+}
+
+# lg_resource APIVERSION KIND — the kubectl resource argument for an owner.
+lg_resource() {
+    case $1 in
+        */*) printf '%s.%s.%s\n' "$2" "${1#*/}" "${1%%/*}" ;;
+        *) printf '%s\n' "$2" ;;
+    esac
+}
+
+# lg_root NAMESPACE OBJECT_JSON — prints "<creationTimestamp> <Kind>/<ns>/<name>"
+# of the root of OBJECT's ownerReferences chain, with a note when the walk
+# stopped early. The controller reference is followed when there is one, the
+# first reference otherwise. An owner the apiserver reports NotFound ends the
+# walk there; any other failed read is an error, because treating it as a
+# missing owner would charge a platform pod whose lookup merely timed out.
+#
+# The owner is named as Kind.version.group, which kubectl resolves by kind:
+# cli-runtime's Builder.mappingFor (staging/src/k8s.io/cli-runtime/pkg/resource/
+# builder.go, Kubernetes v1.33.0) falls back from a resource name to
+# schema.ParseKindArg and RESTMapping when no resource matches.
+lg_root() {
+    local ns=$1 obj=$2 depth=0 note="" ref api kind name next errf
+    while :; do
+        ref=$(jq -r '[.metadata.ownerReferences[]?] | ((map(select(.controller == true)) + .)[0]) // empty
+            | "\(.apiVersion) \(.kind) \(.name)"' <<<"$obj")
+        [ -n "$ref" ] || break
+        if [ "$depth" -ge "$LG_DEPTH_CAP" ]; then
+            note=" (depth-cap)"
+            break
+        fi
+        read -r api kind name <<<"$ref"
+        errf=$(mktemp)
+        if ! next=$(kubectl get "$(lg_resource "$api" "$kind")" --namespace "$ns" "$name" --output json 2>"$errf"); then
+            if grep -q '(NotFound)' "$errf"; then
+                rm -f "$errf"
+                note=" (owner $kind/$name missing)"
+                break
+            fi
+            echo "leak-guard: could not read owner $kind/$name in $ns: $(cat "$errf")" >&2
+            rm -f "$errf"
+            return 1
+        fi
+        rm -f "$errf"
+        obj=$next
+        depth=$((depth + 1))
+    done
+    jq -r --arg note "$note" \
+        '"\(.metadata.creationTimestamp) \(.kind)/\(.metadata.namespace // "-")/\(.metadata.name)\($note)"' <<<"$obj"
+}
+
+# lg_leaks START BASELINE_JSON — prints one line per pod charged to the suite
+# that started at START. Returns 1 when the pod list or an owner cannot be read.
+lg_leaks() {
+    local start=$1 baseline=$2 pods cands pod ns root root_ts
+    pods=$(lg_pods) || { echo "leak-guard: could not list pods" >&2; return 1; }
+    # Filtered into a variable rather than piped into the loop, so a pod list
+    # jq cannot parse is an error here instead of an empty loop that reads as
+    # a clean suite.
+    cands=$(jq -c --argjson base "$baseline" '
+        ($base | map({(.): true}) | add // {}) as $seen
+        | .items[]
+        | select(.status.phase != "Succeeded" and .status.phase != "Failed")
+        | select($seen[.metadata.uid] | not)' <<<"$pods") || {
+        echo "leak-guard: the pod list could not be parsed" >&2
+        return 1
+    }
+    while IFS= read -r pod; do
+        [ -n "$pod" ] || continue
+        ns=$(jq -r '.metadata.namespace' <<<"$pod")
+        root=$(lg_root "$ns" "$pod") || return 1
+        root_ts=${root%% *}
+        [[ ! "$root_ts" < "$start" ]] || continue
+        jq -r --arg root "${root#* }" --arg rts "$root_ts" \
+            '"  \(.metadata.namespace)/\(.metadata.name) phase=\(.status.phase) deleting=\(.metadata.deletionTimestamp // "no") root=\($root) rootCreated=\($rts) instance=\(.metadata.labels["app.kubernetes.io/instance"] // "-")"' <<<"$pod"
+    done <<<"$cands"
+}
+
+# lg_allowlisted SUITE ALLOWLIST — prints the issue ref when SUITE is listed.
+lg_allowlisted() {
+    awk -v s="$1" '$1 !~ /^#/ && $1 == s { print $2; exit }' "$2"
+}
+
+# lg_allowlist_validate ALLOWLIST ROOT — every entry must name an existing suite
+# directory under ROOT and carry an issue ref, so a renamed or removed suite
+# cannot keep an exemption nobody reads.
+lg_allowlist_validate() {
+    local list=$1 root=$2 bad=0 suite ref rest
+    # `|| [ -n "$suite" ]` keeps a last line with no newline, which `read`
+    # drops and lg_allowlisted's awk does not: without it that entry would
+    # exempt its suite without ever being validated.
+    while read -r suite ref rest || [ -n "$suite" ]; do
+        case $suite in ''|'#'*) continue ;; esac
+        if [ -z "$ref" ] || [ -n "$rest" ]; then
+            echo "leak-guard: allowlist line for '$suite' must be '<suite-dir> <issue-ref>'" >&2
+            bad=1
+        fi
+        if [ ! -f "$root/$suite/chainsaw-test.yaml" ] && [ ! -f "$root/$suite/chainsaw-test.yml" ]; then
+            echo "leak-guard: allowlist names '$suite', which is not a suite directory under $root" >&2
+            bad=1
+        fi
+    done <"$list"
+    return "$bad"
+}
+
+# lg_check_suite SUITE START BASELINE_JSON CHAINSAW_RC ALLOWLIST
+#
+# Returns 1 when SUITE leaked and is not allowlisted, and 2 when the first
+# reading after the suite could not be taken. That one fails loudly rather than
+# going inconclusive: without it nothing about the suite was checked at all,
+# whereas a read failing later in the wait follows a reading that did succeed.
+# A suite whose chainsaw run failed is checked once without the wait and its
+# leftovers are reported as a warning: it is red already, and its cleanup may be
+# what failed.
+lg_check_suite() {
+    local suite=$1 start=$2 baseline=$3 crc=$4 allow=$5 ref leaks relist t0 deadline remaining line target out began werr="" timedout=0
+    ref=$(lg_allowlisted "$suite" "$allow")
+    t0=$(date +%s)
+    deadline=$((t0 + LG_BUDGET))
+    leaks=$(lg_leaks "$start" "$baseline") || {
+        echo "::error title=leak-guard::suite=$suite the leak check could not read the cluster"
+        return 2
+    }
+    # One wait per pod inside what is left of the budget, then a fresh list.
+    # A pod that is already gone returns at once: kubectl's delete condition
+    # reports done on NotFound, and a wait that runs out while watching reports
+    # wait.ErrWaitTimeout, "timed out waiting for the condition"
+    # (staging/src/k8s.io/kubectl/pkg/cmd/wait/delete.go and
+    # staging/src/k8s.io/apimachinery/pkg/util/wait/error.go, Kubernetes
+    # v1.33.0). That text is not the only way a timeout ends: RunWait puts the
+    # whole --timeout on one context (wait.go, ContextWithOptionalTimeout), and
+    # only the watch in IsDeleted maps its expiry to ErrWaitTimeout. If the
+    # deadline passes during the resource lookup or the initial GET, which is
+    # likeliest when little of the budget is left, kubectl reports the client's
+    # "context deadline exceeded" instead. So a wait that fails after running
+    # for its whole --timeout counts as a timeout whatever it printed; one that
+    # fails sooner is an error. --timeout=0 would mean "check once, do not
+    # wait" and fail with "condition not met", which is why a spent budget is
+    # caught before calling kubectl rather than passed to it.
+    # Three outcomes, nothing retried:
+    #   - a timeout or a spent budget: the pod outlived the budget, and the last
+    #     good list is the verdict, including when the re-list after it fails;
+    #   - any other failure of a wait or of the re-list, before the budget is
+    #     spent and before any timeout: the apiserver or the connection rather
+    #     than the pod, so waiting stops and the result is inconclusive, because
+    #     charging a leak on it would make the guard a source of the flaky reds
+    #     it exists to attribute;
+    #   - a failed first reading after the suite is handled above: unchecked,
+    #     and the suite fails.
+    if [ -n "$leaks" ] && [ -z "$ref" ] && [ "$crc" -eq 0 ]; then
+        while [ -n "$leaks" ] && [ "$timedout" -eq 0 ] && [ -z "$werr" ]; do
+            while IFS= read -r line; do
+                target=${line#  }
+                target=${target%% *}
+                remaining=$((deadline - $(date +%s)))
+                if [ "$remaining" -le 0 ]; then
+                    timedout=1
+                    break
+                fi
+                began=$(date +%s)
+                if out=$(kubectl wait --for=delete "pod/${target#*/}" --namespace "${target%%/*}" \
+                    --timeout="${remaining}s" 2>&1); then
+                    continue
+                fi
+                if grep -q 'timed out waiting for the condition' <<<"$out" \
+                    || [ $(($(date +%s) - began)) -ge "$remaining" ]; then
+                    timedout=1
+                else
+                    # kubectl prints warnings ahead of the error on the same
+                    # streams; the error is the last line that is not one.
+                    werr=$(grep -v '^Warning:' <<<"$out" | tail -n 1)
+                    [ -n "$werr" ] || werr="kubectl wait failed without a message"
+                fi
+                break
+            done <<<"$leaks"
+            [ -z "$werr" ] || break
+            if relist=$(lg_leaks "$start" "$baseline"); then
+                leaks=$relist
+            elif [ "$timedout" -eq 0 ]; then
+                werr="the re-list after the waits failed: the pod list or an owner could not be read"
+            fi
+        done
+    fi
+    if [ -z "$leaks" ]; then
+        echo "leak-guard: suite=$suite clear after $(($(date +%s) - t0))s"
+        return 0
+    fi
+    local count
+    count=$(grep -c . <<<"$leaks")
+    if [ -n "$ref" ]; then
+        echo "::warning title=leaked-pods (allowlisted $ref)::suite=$suite count=$count, exempt by hack/e2e-chainsaw/_lib/leak-allowlist.txt"
+        echo "LEAKED-PODS suite=$suite count=$count allowlisted=$ref"
+        printf '%s\n' "$leaks"
+        return 0
+    fi
+    # Waiting stopped on a failed read, so whether these pods would have gone
+    # inside the budget is unknown. Report it, do not charge it. The error goes
+    # last and quoted, since it carries spaces.
+    if [ -n "$werr" ]; then
+        echo "::warning title=leaked-pods (inconclusive)::suite=$suite count=$count stopped waiting on a failed read: $werr"
+        echo "LEAKED-PODS suite=$suite count=$count inconclusive=\"$werr\""
+        printf '%s\n' "$leaks"
+        return 0
+    fi
+    # Checked once with no wait, so these pods may still be tearing down; the
+    # suite is red on its own failure and this adds evidence, not a verdict.
+    if [ "$crc" -ne 0 ]; then
+        echo "::warning title=leaked-pods (suite already failed)::suite=$suite count=$count pods of this failed suite were present right after its cleanup; checked once, without the ${LG_BUDGET}s wait"
+        echo "LEAKED-PODS suite=$suite checked-once=chainsaw-failed count=$count"
+        printf '%s\n' "$leaks"
+        return 0
+    fi
+    echo "::error title=leaked-pods::suite=$suite count=$count pods created by this suite outlived its cleanup by more than ${LG_BUDGET}s"
+    echo "LEAKED-PODS suite=$suite budget=${LG_BUDGET}s count=$count"
+    printf '%s\n' "$leaks"
+    return 1
+}
+
+# lg_merge_reports DIR SUITE... — one JUnit document from the per-suite reports
+# in DIR, in the shape chainsaw writes for a single run: a <testsuites> root
+# carrying the summed counts, one <testsuite> per suite directory. A suite with
+# no report of its own (chainsaw exited before writing one) and a suite that
+# leaked each get a failed test case, so the report says what the job log says.
+lg_merge_reports() {
+    local dir=$1 suite key
+    local -a files=()
+    shift
+    for suite in "$@"; do
+        key=${suite//\//_}
+        if [ ! -f "$dir/$key.xml" ]; then
+            lg_synthetic_suite "$suite" "$suite" "chainsaw wrote no report for this suite" >"$dir/$key.xml"
+        fi
+        files+=("$dir/$key.xml")
+        if [ -f "$dir/$key.unchecked" ]; then
+            lg_synthetic_suite "$suite" leak-guard \
+                "the leak guard could not read the cluster after this suite; see the leak-guard annotation for suite=$suite in the job log" >"$dir/$key.unchecked.xml"
+            files+=("$dir/$key.unchecked.xml")
+        fi
+        if [ -f "$dir/$key.leaked" ]; then
+            lg_synthetic_suite "$suite" leak-guard \
+                "the leak guard failed this suite; see the leaked-pods lines for suite=$suite in the job log" >"$dir/$key.leaked.xml"
+            files+=("$dir/$key.leaked.xml")
+        fi
+    done
+    [ "${#files[@]}" -gt 0 ] || files=(/dev/null)
+    # The root line is read for its counts and replaced by one summed root;
+    # everything between it and the closing tag is carried through verbatim.
+    awk '
+        function attr(s, k) {
+            if (match(s, " " k "=\"[^\"]*\"")) return substr(s, RSTART + length(k) + 3, RLENGTH - length(k) - 4)
+            return 0
+        }
+        FNR == 1 {
+            tests += attr($0, "tests"); errors += attr($0, "errors"); failures += attr($0, "failures")
+            skipped += attr($0, "skipped"); time += attr($0, "time")
+            next
+        }
+        /^<\/testsuites>$/ { next }
+        { body = body $0 "\n" }
+        END {
+            printf "<testsuites name=\"chainsaw-report\" time=\"%.6f\"", time
+            if (tests) printf " tests=\"%d\"", tests
+            if (errors) printf " errors=\"%d\"", errors
+            if (failures) printf " failures=\"%d\"", failures
+            if (skipped) printf " skipped=\"%d\"", skipped
+            printf ">\n%s</testsuites>\n", body
+        }' "${files[@]}"
+}
+
+# lg_synthetic_suite SUITE CASE MESSAGE — a one-case failed report in chainsaw's shape.
+lg_synthetic_suite() {
+    printf '<testsuites name="chainsaw-report" time="0" tests="1" failures="1">\n'
+    printf '  <testsuite name="%s" tests="1" failures="1" errors="0" id="0" time="">\n' "$1"
+    printf '    <testcase name="%s" classname="" time="">\n' "$2"
+    printf '      <failure message="%s"></failure>\n' "$3"
+    printf '    </testcase>\n'
+    printf '  </testsuite>\n'
+    printf '</testsuites>\n'
+}
diff --git a/hack/e2e-chainsaw/_lib/pod-label-census.sh b/hack/e2e-chainsaw/_lib/pod-label-census.sh
new file mode 100644
index 0000000000..17cf29630f
--- /dev/null
+++ b/hack/e2e-chainsaw/_lib/pod-label-census.sh
@@ -0,0 +1,109 @@
+# shellcheck shell=sh
+# Sourced by the chainsaw app Tests after `cd` to the repo root. Provides:
+#   lookup_report           — tell a diagnostic lookup's three outcomes apart,
+#                             with the wording left to the caller; no cluster
+#   pod_label_census_report — lookup_report with the census wording
+#   pod_label_census        — print app.kubernetes.io/instance for every pod in
+#                             a namespace, keeping the outcomes apart
+# Sourcing has no side effects: it defines three functions and nothing else.
+# None uses `local`, which is not POSIX and so unavailable to the `sh` that
+# Chainsaw runs these steps under; the `_plc_` prefix is what keeps the
+# variables from colliding with a caller's names.
+#
+# Why this exists. A `podLogs` collector selects on a label, and it cannot
+# report that it matched nothing — an empty capture and a selector that has
+# gone stale look identical in the artifact. This prints the values that
+# actually exist, so a reader can see whether the selector above it can match.
+# Deliberately no selector is repeated here: a copy would only prove itself
+# right, and would keep matching after the collector's own selector drifted.
+#
+# The three outcomes are kept apart because each means something different and
+# two of them are easy to misread as the third:
+#
+#   - the lookup did not run          — NOT the same as "no pods"; saying so
+#                                       would report an unreachable apiserver
+#                                       as a healthy empty namespace
+#   - it ran and matched nothing      — a real, informative answer
+#   - it ran and returned rows        — the census proper
+#
+# stderr is kept apart from the captured value rather than folded in with
+# `2>&1`, and that is the load-bearing part. kubectl exits 0 while logging a
+# klog line about an API group it could not reach, and an aggregated APIService
+# in that state is what a failed run usually looks like (see
+# docs/agents/e2e-testing.md). Folded into the value, that line makes the
+# "no pods" branch unreachable and prints under the census heading as though it
+# were a pod. Separated, it becomes what it is: a caveat that the census may be
+# partial, printed alongside the answer rather than instead of it.
+#
+# `--request-timeout` bounds each attempt because on a degraded cluster kubectl
+# otherwise retries discovery until something kills the script. Measured
+# against an unreachable apiserver, a bounded call costs about five times the
+# flag, since kubectl retries discovery five times before it gives up; the
+# caller's op timeout is sized above that.
+#
+# The report half is separated from the kubectl call precisely so it can be
+# tested without a cluster — see hack/pod-label-census_test.bats, matching how
+# hack/e2e-chainsaw/_lib/etcd-probe.sh is covered.
+
+# lookup_report RC STDOUT STDERR FAILED_MSG EMPTY_MSG ROWS_HEADING
+#
+# The outcome logic, with the wording left to the caller. Every diagnostic
+# lookup in a `catch` has the same three answers to keep apart and the same two
+# ways of confusing them, so they share one implementation and one set of tests
+# rather than a copy per call site.
+#
+# Always returns 0: this runs inside a `catch`, where a non-zero exit would mask
+# the test's own error.
+lookup_report() {
+    _plc_rc=$1
+    _plc_out=$2
+    _plc_err=$3
+    _plc_failed=$4
+    _plc_empty=$5
+    _plc_heading=$6
+
+    if [ "$_plc_rc" -ne 0 ]; then
+        echo "$_plc_failed"
+        [ -n "$_plc_err" ] && echo "$_plc_err"
+        return 0
+    fi
+
+    if [ -z "$_plc_out" ]; then
+        echo "$_plc_empty"
+    else
+        echo "$_plc_heading"
+        echo "$_plc_out"
+    fi
+
+    if [ -n "$_plc_err" ]; then
+        echo "the lookup also logged this, so the result above may be partial:"
+        echo "$_plc_err"
+    fi
+    return 0
+}
+
+# pod_label_census_report RC STDOUT STDERR NAMESPACE
+pod_label_census_report() {
+    lookup_report "$1" "$2" "$3" \
+        "pod label census FAILED (the lookup did not run; this is not 'no pods'):" \
+        "pod label census: no pods in $4" \
+        "pod label census, app.kubernetes.io/instance per pod:"
+}
+
+# pod_label_census NAMESPACE
+pod_label_census() {
+    _plc_ns=$1
+    _plc_errfile=$(mktemp)
+
+    if _plc_stdout=$(kubectl -n "$_plc_ns" --request-timeout=15s get pods \
+            -o 'custom-columns=POD:.metadata.name,INSTANCE:.metadata.labels.app\.kubernetes\.io/instance' \
+            --no-headers 2>"$_plc_errfile"); then
+        _plc_status=0
+    else
+        _plc_status=1
+    fi
+
+    pod_label_census_report "$_plc_status" "$_plc_stdout" "$(cat "$_plc_errfile")" "$_plc_ns"
+    rm -f "$_plc_errfile"
+    return 0
+}
diff --git a/hack/e2e-chainsaw/_lib/remediation-guard.sh b/hack/e2e-chainsaw/_lib/remediation-guard.sh
new file mode 100644
index 0000000000..5ae3b7f176
--- /dev/null
+++ b/hack/e2e-chainsaw/_lib/remediation-guard.sh
@@ -0,0 +1,67 @@
+# shellcheck shell=bash
+# Helpers for asserting that a Flux HelmRelease did not fall into an
+# install/upgrade remediation cycle during an e2e run.
+#
+# Background: Flux helm-controller's ClearFailures() zeroes
+# .status.installFailures / .status.upgradeFailures on every successful
+# reconciliation (see the upstream ClearFailures method on
+# HelmReleaseStatus). That makes those counters useless for a guard that
+# runs after the HelmRelease has reached Ready - the values are always 0.
+#
+# What survives a successful reconciliation is .status.history, a bounded
+# list of release Snapshots. Each Snapshot carries a status field that
+# tracks the Helm release state: deployed, superseded, failed, uninstalled,
+# and so on. A remediation cycle leaves the footprint behind: a snapshot
+# with status "uninstalled" (from install/upgrade remediation) or "failed"
+# (a Helm action that failed). Those stay in history after a subsequent
+# successful reinstall or retry, with one exception: a failed install that
+# the next upgrade recovers is marked superseded by Helm, so its Snapshot
+# no longer reads "failed" and nothing here can see it.
+#
+# "Bounded" is literal. The controller truncates history on every in-sync
+# reconcile, and again before it retries or remediates a failed release:
+# on a release whose strategy is a retry it keeps the newest
+# five Snapshots, and on any other it keeps those down to the previous
+# deployed or superseded one, falling back to that same five when history
+# holds no such Snapshot to cut at. A footprint therefore outlives the
+# reconcile that follows it, not an arbitrary number of them. Reading
+# history right after the actions that wrote it, which is what an e2e run
+# does, sees it; reading it after the release has moved on may not.
+#
+# helmrelease_has_remediation_cycle takes a newline-delimited list of
+# snapshot statuses (whatever the caller extracted via kubectl -o jsonpath
+# or equivalent) and returns 0 (detected) when any entry is "failed" or
+# "uninstalled", 1 otherwise. Empty input is treated as "no history yet,
+# no cycle observed". Whether a detected footprint fails a run is the
+# caller's decision, because it depends on the release's own strategy:
+# see cozy_guard_helmrelease in run-kubernetes.sh.
+
+# The jsonpath a caller hands to kubectl to read those statuses, one per
+# line. It lives here rather than inline at the call site so that it is a
+# named assignment in a library that sources cleanly on its own, which is
+# what lets internal/fluxcontract source this file and run the resulting
+# value against the upstream Flux type: renaming a field upstream fails that
+# test instead of turning the read into a silent empty string. How this
+# assignment may be written is pinned there rather than restated here.
+# Locally that test runs under `make test-controllers` rather than
+# `make unit-tests`; in CI both are steps of one job.
+# shellcheck disable=SC2034  # used by callers that source this file
+HELMRELEASE_HISTORY_JSONPATH='{range .status.history[*]}{.status}{"\n"}{end}'
+
+helmrelease_has_remediation_cycle() {
+    local statuses
+    statuses="$1"
+    if [ -z "${statuses}" ]; then
+        return 1
+    fi
+    # printf + grep over the pipe, rather than a heredoc plus while read.
+    # printf %s treats the status string as a literal payload, so any stray
+    # $ in a future caller's input does not trigger shell expansion. grep
+    # returns 0 iff at least one line matches the allowlist, which is
+    # exactly the contract the caller wants, so we can return its exit
+    # status directly.
+    if printf '%s\n' "${statuses}" | grep --extended-regexp --quiet '^(failed|uninstalled)$'; then
+        return 0
+    fi
+    return 1
+}
diff --git a/hack/e2e-chainsaw/_lib/run-kubernetes.sh b/hack/e2e-chainsaw/_lib/run-kubernetes.sh
new file mode 100644
index 0000000000..e75990010e
--- /dev/null
+++ b/hack/e2e-chainsaw/_lib/run-kubernetes.sh
@@ -0,0 +1,6825 @@
+# shellcheck shell=bash
+# Sourced by the chainsaw kubernetes-latest/previous Tests after cd to repo root.
+. hack/e2e-chainsaw/_lib/remediation-guard.sh
+. hack/e2e-chainsaw/_lib/talos-image-cache.sh
+
+# The QEMU sandbox, which no CI lane boots, exercises replicated DRBD storage.
+# The container lane cannot represent three DRBD nodes on one shared kernel, so
+# its otherwise-identical suites use the production local class instead. Keep
+# the accepted values narrow because this result is interpolated into
+# Kubernetes YAML below.
+cozy_e2e_storage_class() {
+  case "${COZY_E2E_STORAGE_CLASS:-replicated}" in
+    local | replicated) printf '%s\n' "${COZY_E2E_STORAGE_CLASS:-replicated}" ;;
+    *)
+      echo "COZY_E2E_STORAGE_CLASS must be local or replicated, got '${COZY_E2E_STORAGE_CLASS}'" >&2
+      return 1
+      ;;
+  esac
+}
+
+# talos_spec_block: emit the tenant Kubernetes CR `spec.talos` block with the Talos
+# OS image cache (imageFactoryURL) when the in-sandbox cache is up. Prints nothing
+# when it falls back to the public default, so the chart default applies.
+# Indented for insertion directly under `spec:` in the heredoc below.
+#
+# No trailing newline, unlike the single-key helper this replaced: the caller reads
+# it through `$(...)`, which strips one anyway, and `${talos_block}` sits on a line
+# of its own in the heredoc, which supplies the break before the next `spec` key.
+# An empty result therefore leaves a blank line, which is valid YAML.
+talos_spec_block() {
+  local url
+  url=$(resolve_talos_image_factory_url)
+  [ -n "$url" ] || return 0
+  printf '  talos:\n'
+  printf '    imageFactoryURL: %s\n' "$url"
+  return 0
+}
+
+# kubectl_wait_retry: wraps `kubectl wait` with retries against transient
+# management-cluster apiserver/etcd errors.
+#
+# The e2e sandbox is a 3-node kind cluster on Talos VMs; the 3-instance
+# etcd HA cluster can shed a leader under the accumulated CDI+DRBD IO +
+# multiple back-to-back Kamaji tenant control-plane bringups this suite
+# stacks. kubectl's watch-based `wait` exits non-zero on the FIRST server
+# error it sees on the channel, even when the target is on the cusp of
+# becoming Ready. Concretely, we have seen:
+#   Error from server: etcdserver: leader changed
+# fire mid-wait for `kubernetes-<test>-{cluster-autoscaler,kccm,kcsi-controller,base}`
+# with 3 of 4 deployments already `condition met` and the 4th ~200ms
+# from Ready. The snapshot-on-fail collector then showed all four at
+# `readyReplicas: 2` — the wait exited early, not the target's fault.
+#
+# This wrapper retries a small number of times against a curated allowlist
+# of transient server-side signatures. It does NOT swallow legitimate
+# timeouts (`--timeout=... expired`) or NotFound; those still surface.
+#
+# The capture guards the assignment with `|| _rc=$?`: the chainsaw scripts run
+# under `set -eu`, where a bare `_out=$(kubectl wait ...)` on a failing wait
+# aborts the WHOLE sourcing script right there -- before the retry loop, before
+# anything prints (stderr is captured into _out and dies with the shell). That
+# exact shape killed the kubernetes-latest suite silently the moment a wait
+# failed, with the transient-retry machinery never once reachable.
+kubectl_wait_retry() {
+  local _attempts=3
+  local _i _out _rc
+  for _i in $(seq 1 "${_attempts}"); do
+    _rc=0
+    _out=$(kubectl wait "$@" 2>&1) || _rc=$?
+    if [ "${_rc}" = 0 ]; then
+      printf '%s\n' "${_out}"
+      return 0
+    fi
+    # Transient server-side signatures: etcd leader flap, etcd request
+    # timeout, or apiserver watch channel closed without a clear reason.
+    # Anything else (target NotFound, --timeout expired, permission
+    # denied, etc.) is a real failure.
+    if printf '%s' "${_out}" | grep --quiet --extended-regexp "etcdserver: leader changed|etcdserver: request timed out|the server was unable to return a response in the time allotted"; then
+      printf 'kubectl_wait_retry: attempt %d/%d hit transient server error, retrying in 5s: %s\n' "${_i}" "${_attempts}" "${_out}" >&2
+      sleep 5
+      continue
+    fi
+    printf '%s\n' "${_out}"
+    return "${_rc}"
+  done
+  printf 'kubectl_wait_retry: exhausted %d attempts on transient errors\n' "${_attempts}" >&2
+  return 1
+}
+
+# Wait for a HelmRelease upgrade that has not started yet at the call site.
+# `kubectl wait --for=condition=Ready` alone is unsafe here: the old Ready=True
+# condition remains visible until helm-controller observes the changed spec, so
+# it can return before the upgrade even begins. Require a newer generation and
+# require status.observedGeneration to catch up to it before accepting Ready.
+# A terminal Stalled condition fails immediately instead of burning the whole
+# timeout on work Flux has already declared impossible.
+cozy_wait_helmrelease_upgrade() {
+  local namespace="$1"
+  local name="$2"
+  local previous_generation="$3"
+  local timeout_seconds="${4:-600}"
+  local deadline=$(( $(date +%s) + timeout_seconds ))
+  local state generation observed ready stalled
+
+  while [ "$(date +%s)" -lt "${deadline}" ]; do
+    state=$(kubectl -n "${namespace}" get helmrelease "${name}" \
+      -o 'jsonpath={.metadata.generation}{"|"}{.status.observedGeneration}{"|"}{.status.conditions[?(@.type=="Ready")].status}{"|"}{.status.conditions[?(@.type=="Stalled")].status}' \
+      2>/dev/null) || state=
+    IFS='|' read -r generation observed ready stalled <<EOF
+${state}
+EOF
+
+    if [ "${stalled}" = True ]; then
+      echo "HelmRelease ${namespace}/${name} stalled while applying generation ${generation:-<unknown>}" >&2
+      if ! kubectl -n "${namespace}" describe helmrelease "${name}" >&2; then
+        echo "The HelmRelease failure diagnostic could not be collected" >&2
+      fi
+      return 1
+    fi
+    case "${generation}:${observed}" in
+      *[!0-9:]* | :* | *:) ;;
+      *)
+        if [ "${generation}" -gt "${previous_generation}" ] \
+          && [ "${observed}" -eq "${generation}" ] \
+          && [ "${ready}" = True ]; then
+          echo "HelmRelease ${namespace}/${name} reconciled generation ${generation}"
+          return 0
+        fi
+        ;;
+    esac
+    sleep 5
+  done
+
+  echo "HelmRelease ${namespace}/${name} did not reconcile a generation newer than ${previous_generation} within ${timeout_seconds}s" >&2
+  if ! kubectl -n "${namespace}" describe helmrelease "${name}" >&2; then
+    echo "The HelmRelease timeout diagnostic could not be collected" >&2
+  fi
+  return 1
+}
+
+cozy_oidc_bindings() {
+  local test_name="$1"
+  local bindings
+  bindings=$(kubectl --kubeconfig "tenantkubeconfig-${test_name}" get clusterrolebindings \
+    --selector="app.kubernetes.io/managed-by=cozystack-oidc,app.kubernetes.io/instance=kubernetes-${test_name}" \
+    -o 'jsonpath={range .items[*]}{.subjects[0].name}{"\t"}{.roleRef.name}{"\n"}{end}') || return 1
+  printf '%s' "${bindings}" | sort
+}
+
+cozy_assert_oidc_apiserver_flags() {
+  local release="$1"
+  local extra_args
+
+  # Captured because a pipeline is single-use: a second grep on it reads nothing.
+  extra_args=$(kubectl -n tenant-test get kamajicontrolplane "${release}" \
+    -o jsonpath='{.spec.apiServer.extraArgs}')
+  printf '%s\n' "${extra_args}" |
+    grep -qF -- '--authentication-config=/etc/kubernetes/authentication-config/config.yaml'
+  printf '%s\n' "${extra_args}" |
+    grep -qF -- '--requestheader-uid-headers=X-Remote-Uid'
+}
+
+cozy_assert_oidc_system() {
+  local test_name="$1"
+  local release="kubernetes-${test_name}"
+  local audience="tenant-test-${release}"
+  local authn_config oidc_kubeconfig bindings
+
+  kubectl -n tenant-test wait job "${release}-oidc-bootstrap" \
+    --for=condition=complete --timeout=1m
+
+  cozy_assert_oidc_apiserver_flags "${release}"
+
+  authn_config=$(kubectl -n tenant-test get secret "${release}-oidc-authn-config" \
+    -o jsonpath='{.data.config\.yaml}' | base64 -d)
+  printf '%s\n' "${authn_config}" | grep -qE 'url: https://keycloak\.[^/]+/realms/cozy'
+  printf '%s\n' "${authn_config}" | grep -qF -- "- ${audience}"
+  printf '%s\n' "${authn_config}" | grep -qF -- 'claim: sub'
+
+  [ "$(kubectl -n tenant-test get keycloakclient.v1.edp.epam.com "${audience}" \
+    -o jsonpath='{.spec.public}')" = true ]
+  [ "$(kubectl -n tenant-test get keycloakclientscope.v1.edp.epam.com "${audience}-audience" \
+    -o jsonpath='{.spec.protocolMappers[0].protocolMapper}')" = oidc-audience-mapper ]
+
+  oidc_kubeconfig=$(kubectl -n tenant-test get secret "${release}-oidc-kubeconfig" \
+    -o jsonpath='{.data.kubeconfig}' | base64 -d)
+  printf '%s\n' "${oidc_kubeconfig}" | grep -qF -- '- oidc-login'
+  printf '%s\n' "${oidc_kubeconfig}" | grep -qF -- "--oidc-client-id=${audience}"
+
+  bindings=$(cozy_oidc_bindings "${test_name}")
+  [ "${bindings}" = "$(printf 'e2e-admin@example.test\tcluster-admin\ne2e-viewer@example.test\tview\n' | sort)" ]
+}
+
+cozy_switch_and_assert_oidc_custom_config() {
+  local test_name="$1"
+  local probe=
+  local release="kubernetes-${test_name}"
+  local audience="cozystack-byo-${test_name}"
+  local previous_generation authn_config bindings
+
+  previous_generation=$(kubectl -n tenant-test get helmrelease "${release}" \
+    -o jsonpath='{.metadata.generation}')
+  kubectl -n tenant-test patch kuberneteses.apps.cozystack.io "${test_name}" \
+    --type=merge --patch "$(printf '%s' '{
+      "spec": {
+        "oidc": {
+          "mode": "CustomConfig",
+          "customConfig": {
+            "config": "apiVersion: apiserver.config.k8s.io/v1beta1\nkind: AuthenticationConfiguration\njwt:\n- issuer:\n    url: https://idp.byo.example.test\n    audiences:\n    - '"${audience}"'\n  claimMappings:\n    username:\n      claim: preferred_username\n      prefix: \"\"\n    groups:\n      claim: groups\n      prefix: \"\"\n"
+          },
+          "users": [
+            {"email": "byo-admin@example.test", "role": "admin"}
+          ]
+        }
+      }
+    }')"
+
+  cozy_wait_helmrelease_upgrade tenant-test "${release}" \
+    "${previous_generation}" 600
+  kubectl -n tenant-test wait job "${release}-oidc-bootstrap" \
+    --for=condition=complete --timeout=1m
+
+  cozy_assert_oidc_apiserver_flags "${release}"
+
+  authn_config=$(kubectl -n tenant-test get secret "${release}-oidc-authn-config" \
+    -o jsonpath='{.data.config\.yaml}' | base64 -d)
+  printf '%s\n' "${authn_config}" | grep -qF 'url: https://idp.byo.example.test'
+  printf '%s\n' "${authn_config}" | grep -qF -- "- ${audience}"
+  if printf '%s\n' "${authn_config}" | grep -qE 'url: https://keycloak\.[^/]+/realms/cozy'; then
+    echo "CustomConfig AuthenticationConfiguration still carries the System issuer" >&2
+    return 1
+  fi
+
+  bindings=$(cozy_oidc_bindings "${test_name}")
+  [ "${bindings}" = "$(printf 'byo-admin@example.test\tcluster-admin')" ]
+
+  # `--ignore-not-found` is what separates "the object is gone" from "could not
+  # ask": absent is exit 0 with empty output, while an RBAC denial, a timeout or
+  # a missing CRD is still non-zero. A bare `if kubectl get ... >/dev/null 2>&1`
+  # reads all of those as gone, so the teardown assertions used to report
+  # success for never having observed anything.
+  if ! probe=$(kubectl -n tenant-test get keycloakclient.v1.edp.epam.com "tenant-test-${release}" \
+    --ignore-not-found -o name); then
+    echo "could not determine whether the System-mode KeycloakClient is gone" >&2
+    return 1
+  fi
+  if [ -n "${probe}" ]; then
+    echo "System-mode KeycloakClient survived the CustomConfig upgrade" >&2
+    return 1
+  fi
+  if ! probe=$(kubectl -n tenant-test get keycloakclientscope.v1.edp.epam.com "tenant-test-${release}-audience" \
+    --ignore-not-found -o name); then
+    echo "could not determine whether the System-mode KeycloakClientScope is gone" >&2
+    return 1
+  fi
+  if [ -n "${probe}" ]; then
+    echo "System-mode KeycloakClientScope survived the CustomConfig upgrade" >&2
+    return 1
+  fi
+  if ! probe=$(kubectl -n tenant-test get secret "${release}-oidc-kubeconfig" \
+    --ignore-not-found -o name); then
+    echo "could not determine whether the System-mode OIDC kubeconfig is gone" >&2
+    return 1
+  fi
+  if [ -n "${probe}" ]; then
+    echo "System-mode OIDC kubeconfig survived the CustomConfig upgrade" >&2
+    return 1
+  fi
+}
+
+# Pure exit-condition for the inter-test drain loop (cozy_wait_tenant_drained).
+# Each argument is one resource-probe capture: the stdout of a
+# `kubectl get -o name` (empty once the resource is gone) or the literal "err"
+# the loop substitutes when a probe itself fails. Returns 0 (drained) only when
+# every capture holds nothing but whitespace; any capture with a non-whitespace
+# character -- a resource name, or the "err" sentinel the loop injects on a
+# probe failure -- yields non-zero, so a transient API blip is never misread as
+# "the tenant has drained" (same guard as etcd_drain). Pure text logic,
+# unit-tested in hack/run-kubernetes-drain_test.bats.
+cozy_tenant_drained() {
+  for _capture in "$@"; do
+    case "$_capture" in
+      *[![:space:]]*) return 1 ;;
+    esac
+  done
+  return 0
+}
+
+# Keep only PVC resource names that belong to one Kubernetes worker pool. The
+# worker-disk PVCs carry no cluster label, but CDI preserves the owning
+# MachineDeployment name inside every one of their generated names.
+cozy_filter_cluster_pvcs() {
+  local test_name="$1"
+  local capture="$2"
+  printf '%s\n' "${capture}" |
+    awk -v cluster="kubernetes-${test_name}-md0" 'index($0, cluster) != 0'
+}
+
+# Block until one tenant cluster's KubeVirt compute and storage are actually
+# released, not merely triggered for deletion. Deleting the Kubernetes CR
+# returns as soon as its finalizers clear, but that only TRIGGERS teardown of
+# the CAPK worker VMs and their DataVolume-backed disk PVCs. The virt-launcher
+# pods keep their guest RAM reserved until the VMIs are gone, so without this
+# barrier the next tenant test's worker VMs begin scheduling against a sandbox
+# the previous tenant has not yet vacated -> memory starvation -> a worker VM
+# misses the node-join budget and the test flakes on worker-node-join.
+#
+# Bounded and authoritative: this returns non-zero on timeout, so a stuck
+# teardown cannot be mistaken for a clean sandbox. Other suites use the same
+# tenant-test namespace and can legitimately leave their own PVCs there while
+# this cleanup runs; VM/VMI probes therefore select the CAPI cluster label, and
+# the unlabeled worker-disk PVCs are filtered by their MachineDeployment name
+# component.
+cozy_wait_tenant_drained() {
+  local _test_name="$1"
+  local _ns=tenant-test
+  local _timeout="${2:-300}"
+  local _deadline=$(( $(date +%s) + _timeout ))
+  local _cluster="kubernetes-${_test_name}"
+  local _vm _vmi _pvc _pvc_all
+  while :; do
+    _vm=$(kubectl -n "$_ns" get virtualmachines.kubevirt.io \
+      -l "cluster.x-k8s.io/cluster-name=${_cluster}" -o name 2>/dev/null) || _vm=err
+    _vmi=$(kubectl -n "$_ns" get virtualmachineinstances.kubevirt.io \
+      -l "cluster.x-k8s.io/cluster-name=${_cluster}" -o name 2>/dev/null) || _vmi=err
+    if _pvc_all=$(kubectl -n "$_ns" get pvc -o name 2>/dev/null); then
+      _pvc=$(cozy_filter_cluster_pvcs "$_test_name" "$_pvc_all")
+    else
+      _pvc=err
+    fi
+    if cozy_tenant_drained "$_vm" "$_vmi" "$_pvc"; then
+      echo "» ${_cluster} VMs/VMIs/PVCs drained from $_ns"
+      return 0
+    fi
+    if [ "$(date +%s)" -ge "$_deadline" ]; then
+      echo "» ERROR: ${_cluster} teardown did not drain within ${_timeout}s; the next test would face memory/storage pressure" >&2
+      printf '%s\n' "$_vm" "$_vmi" "$_pvc" |
+        awk 'NF { print "  drain-leftover: " $0 }' >&2
+      return 1
+    fi
+    sleep 5
+  done
+}
+
+# Pure predicate for ONE node row of the capture cozy_has_schedulable_node
+# scans. Encodes the scheduler's own admission rule for a Pod that tolerates
+# nothing: the NodeUnschedulable plugin rejects a node whose
+# .spec.unschedulable is set (what `kubectl get nodes` renders as
+# SchedulingDisabled), and the TaintToleration plugin rejects one carrying any
+# taint with effect NoSchedule or NoExecute. PreferNoSchedule only lowers the
+# node's score, so it is deliberately not treated as blocking. Ready is checked
+# explicitly rather than left to the not-ready taint, so the gate does not
+# depend on how promptly the node-lifecycle controller applies that taint.
+#
+# The backend Pod is not literally toleration-free: DefaultTolerationSeconds
+# admission gives every Pod a 300s NoExecute toleration for
+# node.kubernetes.io/not-ready and node.kubernetes.io/unreachable. So for those
+# two taints this predicate is stricter than the scheduler and would keep
+# waiting where the Pod could in fact be placed. That errs toward waiting,
+# never toward releasing the gate early, and requiring Ready makes the case
+# nearly unreachable anyway.
+cozy_node_accepts_pods() {
+  # $1 Ready condition status, $2 .spec.unschedulable, $3 taint effects
+  if [ "$1" != True ]; then
+    return 1
+  fi
+  case "$2" in
+    true | True) return 1 ;;
+  esac
+  case ",$3," in
+    *,NoSchedule,* | *,NoExecute,*) return 1 ;;
+  esac
+  return 0
+}
+
+# Pure exit-condition for the tenant scheduling gate
+# (cozy_wait_schedulable_node). The single argument is the capture of a
+# `kubectl get nodes --no-headers -o custom-columns=NAME,READY,UNSCHEDULABLE,TAINTS`,
+# one whitespace-separated row per node. custom-columns renders an absent field
+# as the literal "<none>" and joins several taint effects with a comma, so both
+# are matched as text. Returns 0 as soon as one row describes a node that would
+# accept a Pod that tolerates nothing. A failed probe leaves the capture empty,
+# which reports not-schedulable rather than schedulable, so an API blip can
+# never release the gate (same guard as cozy_tenant_drained). The scan runs in
+# the subshell on the right of the pipeline, so its `exit` ends that subshell
+# and becomes the function's status -- it never leaves the caller. Pure text
+# logic, unit-tested in hack/run-kubernetes-schedulable_test.bats.
+cozy_has_schedulable_node() {
+  printf '%s\n' "$1" | {
+    while read -r _name _ready _unschedulable _taints _rest; do
+      if [ -z "$_name" ]; then
+        continue
+      fi
+      if cozy_node_accepts_pods "$_ready" "$_unschedulable" "$_taints"; then
+        exit 0
+      fi
+    done
+    exit 1
+  }
+}
+
+# Block until the tenant cluster has at least one node that actually accepts a
+# Pod, then print the node table it decided on (the same table the failure path
+# prints, so the two outcomes are read the same way). The node-join gate in
+# run_kubernetes_test establishes that two nodes are Ready, which is a weaker
+# guarantee: a Ready node still carries `node.cilium.io/agent-not-ready` until
+# the tenant's cilium agent claims it, and a node the bringup has not finished
+# with is Ready,SchedulingDisabled.
+# Scheduling against such a set is not stuck, only slow, and the time it takes
+# is variable -- so it belongs in a budget of its own rather than inside the
+# workload's readiness budget, where it is indistinguishable from a slow image
+# pull or a failing probe.
+cozy_wait_schedulable_node() {
+  _kc="$1"
+  _timeout="${2:-300}"
+  _deadline=$(( $(date +%s) + _timeout ))
+  while :; do
+    _nodes=$(kubectl --kubeconfig "$_kc" get nodes --no-headers -o custom-columns='NAME:.metadata.name,READY:.status.conditions[?(@.type=="Ready")].status,UNSCHEDULABLE:.spec.unschedulable,TAINTS:.spec.taints[*].effect' 2>/dev/null) || _nodes=""
+    if cozy_has_schedulable_node "$_nodes"; then
+      echo "» tenant has a node that accepts Pods:"
+      printf '%s\n' "$_nodes" | sed 's/^/  node: /'
+      return 0
+    fi
+    if [ "$(date +%s)" -ge "$_deadline" ]; then
+      echo "» no tenant node became schedulable (Ready, not cordoned, no NoSchedule/NoExecute taint) within ${_timeout}s" >&2
+      printf '%s\n' "${_nodes:-<the node probe returned nothing>}" | sed 's/^/  node: /' >&2
+      return 1
+    fi
+    sleep 5
+  done
+}
+
+# Block until every ZFS storage pool on every LINSTOR satellite reports at
+# least _min_free_gib of FreeCapacity. Motivation is proven from a
+# cozyreport artefact captured by hack/cozyreport.sh (see PR #3044 run
+# 28751310913, LINSTOR satellite ErrorReport 6A4AADFD-349B2-000000):
+# tearing down a tenant Kubernetes worker with a `replicated` (autoPlace=3,
+# DRBD) 20 GiB root disk removes the PVC from the API within seconds, but
+# the ZFS `zvol destroy` on each satellite lags behind by tens of seconds
+# as DRBD adjusts, unref counts drain and ZFS batch-destroys the datasets.
+# cozy_wait_tenant_drained above only waits on the API-level PVC delete,
+# not on the physical satellite space return; if the next tenant test
+# starts inside that window it hits `zfs create -V ...` failing with
+# `cannot create '...': out of space`, LINSTOR-CSI then retries autoplace,
+# each retry racing the still-being-torn-down previous placement and
+# stretching worker-Machine bringup past the MHC nodeStartupTimeout.
+#
+# Two 20 GiB replicated worker targets (60 GiB total per satellite, since
+# autoPlace=3 places one replica per node) plus two 21 GiB CDI scratch
+# PVCs (worst case both landing on the same node via the local
+# storageClass) yields a ~82 GiB per-satellite peak footprint; 90 GiB
+# default threshold covers that with margin. That makes it a precondition of
+# the replicated suite rather than a cleanup criterion: volumes earlier suites
+# legitimately keep can hold a node below it after this suite reclaimed
+# everything it used, which only the pre-suite baseline can tell apart. It reads
+# the free capacity LINSTOR caches for thick pools (see
+# _cozy_linstor_pool_datasets), so it can understate a pool whose last destroy
+# was still freeing blocks when the satellite reported.
+cozy_wait_linstor_pool_free() {
+  _min_free_gib="${1:-90}"
+  _timeout="${2:-300}"
+  _min_free_kib=$(( _min_free_gib * 1024 * 1024 ))
+  _deadline=$(( $(date +%s) + _timeout ))
+  while :; do
+    # jq lives inside the controller pod (Debian-bookworm base, `sh` is
+    # dash — keep the heredoc POSIX-safe). LINSTOR's `--machine-readable`
+    # output for `sp l` on LINSTOR 1.33.x is a one-element outer array
+    # whose sole element is a flat array of storage-pool objects; each
+    # pool object exposes free_capacity at the top level in KiB. Filter
+    # to ZFS variants (both `ZFS` and `ZFS_THIN`) so DISKLESS
+    # placeholders (whose free_capacity is a Long.MAX_VALUE sentinel)
+    # and any future non-ZFS driver are skipped. Also guard against
+    # OFFLINE satellites, whose pool objects omit free_capacity entirely
+    # (StoragePool schema marks it optional) — without the null guard
+    # `sort -n` would rank the string "null" ahead of real numbers and
+    # the loop would silently poll to timeout. Emit
+    # `<free_capacity_kib>:<node>` lines so a single sort yields the
+    # smallest pool and its owner in one round-trip.
+    _min_line=$(kubectl -n cozy-linstor exec deploy/linstor-controller -- sh -c '
+      linstor --machine-readable sp l 2>/dev/null |
+      jq -r "first | .[] | select((.provider_kind | test(\"^ZFS\")) and .free_capacity != null) | \"\(.free_capacity):\(.node_name)\"" |
+      sort -n | head -n 1
+    ' 2>/dev/null) || _min_line=""
+    _min_kib="${_min_line%%:*}"
+    _min_node="${_min_line#*:}"
+    if [ -n "$_min_kib" ] && [ "$_min_kib" -ge "$_min_free_kib" ] 2>/dev/null; then
+      echo "» LINSTOR ZFS pool free: smallest satellite ${_min_node} has $(( _min_kib / 1024 / 1024 )) GiB (>= ${_min_free_gib} GiB threshold)"
+      return 0
+    fi
+    if [ "$(date +%s)" -ge "$_deadline" ]; then
+      echo "» ERROR: LINSTOR ZFS pool free did not reach ${_min_free_gib} GiB on every satellite within ${_timeout}s (smallest observed: ${_min_kib:-unknown} KiB on ${_min_node:-unknown})" >&2
+      _pool_diag_rc=0
+      _pool_diag=$(kubectl -n cozy-linstor exec deploy/linstor-controller -- linstor --no-color sp l 2>&1) || _pool_diag_rc=$?
+      if [ "$_pool_diag_rc" -ne 0 ]; then
+        echo "  linstor-pool: diagnostic read failed with exit $_pool_diag_rc" >&2
+      fi
+      printf '%s\n' "$_pool_diag" | sed 's/^/  linstor-pool: /' >&2
+      return 1
+    fi
+    sleep 5
+  done
+}
+
+_cozy_linstor_pool_baseline_file() {
+  printf '%s\n' "${COZY_LINSTOR_POOL_BASELINE_FILE:-_out/e2e-kubernetes-linstor-pool-baseline}"
+}
+
+# Print every ZFS dataset under each node's LINSTOR storage pool as
+# `node dataset` rows, the pool's own root included, so a node whose pool holds
+# no volume still shows up as read. The names come from `zfs list` on the
+# satellite rather than from LINSTOR's free capacity: on a node with only thick
+# pools `linstor sp l` serves the figure cached at the satellite's last report,
+# which can be taken while `zfs destroy` is still freeing blocks in the
+# background, so a pool can read hundreds of MiB short of its baseline until
+# some later report with nothing left on it. A destroyed dataset's name is gone
+# by the time `zfs destroy` returns. The zpool is read off the pool's
+# `StorDriver/StorPoolName` property, under which LINSTOR stores the zpool of
+# both ZFS drivers, because it differs by lane: `data` on QEMU nodes,
+# `data-srvN` in container mode, where every node's pool is imported into one
+# shared kernel. Every read carries its own ceiling, so a wedged controller or
+# satellite fails the poll within 35s instead of holding the caller for good.
+_cozy_linstor_pool_datasets() {
+  _pools=$(timeout -k 5 30 kubectl -n cozy-linstor exec deploy/linstor-controller -- sh -c '
+    linstor --machine-readable sp l 2>/dev/null |
+    jq -r "first | .[] | select(.provider_kind | test(\"^ZFS\")) | \"\(.node_name) \(.props[\"StorDriver/StorPoolName\"] // \"\")\""
+  ' 2>/dev/null) || return 1
+  [ -n "$_pools" ] || return 1
+  _satellites=$(timeout -k 5 30 kubectl -n cozy-linstor get pods -l app.kubernetes.io/component=linstor-satellite \
+    -o jsonpath='{range .items[*]}{.spec.nodeName} {.metadata.name}{"\n"}{end}' 2>/dev/null) || return 1
+  while read -r _node _zpool; do
+    [ -n "$_node" ] && [ -n "$_zpool" ] || return 1
+    _pod=$(printf '%s\n' "$_satellites" | awk -v node="$_node" '$1 == node { print $2; exit }')
+    [ -n "$_pod" ] || return 1
+    _datasets=$(timeout -k 5 30 kubectl -n cozy-linstor exec "$_pod" --container=linstor-satellite -- \
+      zfs list -H -o name -t filesystem,volume,snapshot -r "$_zpool" </dev/null 2>/dev/null) || return 1
+    [ -n "$_datasets" ] || return 1
+    printf '%s\n' "$_datasets" | awk -v node="$_node" '{ print node " " $0 }'
+  done <<EOF
+$_pools
+EOF
+}
+
+# Capture the per-node dataset baseline after stale tenant cleanup and before
+# creating this suite's workers. Chainsaw executes `try` and `finally` in
+# separate shells, so the small state file is the hand-off between them.
+cozy_capture_linstor_pool_baseline() {
+  _baseline_file=$(_cozy_linstor_pool_baseline_file)
+  _baseline_dir=${_baseline_file%/*}
+  [ "$_baseline_dir" != "$_baseline_file" ] || _baseline_dir=.
+  mkdir -p "$_baseline_dir"
+  : >"$_baseline_file"
+
+  _baseline=$(_cozy_linstor_pool_datasets) || _baseline=""
+  if [ -z "$_baseline" ]; then
+    echo "» ERROR: could not record the LINSTOR pool baseline; reclamation of this suite's volumes would be unverifiable" >&2
+    return 1
+  fi
+  _baseline_nodes=$(printf '%s\n' "$_baseline" | awk '{ print $1 }' | sort -u | tr '\n' ' ')
+  if [ "$_baseline_nodes" != "srv1 srv2 srv3 " ] \
+      || printf '%s\n' "$_baseline" | awk 'NF != 2 { bad = 1 } END { exit !bad }'; then
+    echo "» ERROR: LINSTOR pool baseline is incomplete or malformed (expected 'node dataset' rows for srv1, srv2 and srv3): ${_baseline}" >&2
+    return 1
+  fi
+  printf '%s\n' "$_baseline" >"$_baseline_file"
+  echo "» LINSTOR pool baseline recorded:"
+  printf '%s\n' "$_baseline" | sed 's/^/  baseline-dataset: /'
+}
+
+# Pure comparison of two `node dataset` listings. Prints `new <node> <dataset>`
+# for each dataset the current listing has and the baseline does not, and
+# `unread <node>` for each baseline node the current listing lacks, and fails
+# when it printed anything. A baseline dataset that is gone is not a finding:
+# the suite may have reclaimed something an earlier one left.
+cozy_linstor_pool_new_datasets() {
+  [ -n "$1" ] && [ -n "$2" ] || return 1
+  {
+    printf '%s\n' "$1"
+    printf '%s\n' '--'
+    printf '%s\n' "$2"
+  } | awk '
+    !current && $0 == "--" { current = 1; next }
+    !current { seen[$0] = 1; base[$1] = 1; next }
+    { read_nodes[$1] = 1; if (!($0 in seen)) { print "new " $0; bad = 1 } }
+    END {
+      for (node in base) if (!(node in read_nodes)) { print "unread " node; bad = 1 }
+      exit bad
+    }'
+}
+
+cozy_wait_linstor_pool_baseline() {
+  _timeout="${1:-300}"
+  _baseline_file=$(_cozy_linstor_pool_baseline_file)
+  # Returns 2 here and 1 on a timeout, so the caller can tell an unchecked
+  # reclamation from a failed one.
+  if [ ! -s "$_baseline_file" ]; then
+    echo "» ERROR: no LINSTOR pool baseline was recorded for this suite, so it stopped before creating its tenant; reclamation was not checked" >&2
+    return 2
+  fi
+  _baseline=$(cat "$_baseline_file")
+  _deadline=$(( $(date +%s) + _timeout ))
+  _current=""
+  _residue=""
+  while :; do
+    _current=$(_cozy_linstor_pool_datasets) || _current=""
+    if [ -n "$_current" ] && _residue=$(cozy_linstor_pool_new_datasets "$_baseline" "$_current"); then
+      echo "» LINSTOR pools hold no dataset beyond their pre-suite baseline"
+      return 0
+    fi
+    if [ "$(date +%s)" -ge "$_deadline" ]; then
+      echo "» ERROR: LINSTOR pools did not return to their pre-suite baseline within ${_timeout}s; a worker or CDI scratch volume may still occupy ZFS space" >&2
+      if [ -z "$_current" ]; then
+        echo "  linstor-pool: the dataset probe returned nothing" >&2
+      else
+        printf '%s\n' "$_residue" | sed 's/^/  linstor-pool: /' >&2
+      fi
+      return 1
+    fi
+    sleep 5
+  done
+}
+
+# Unconditional cleanup hook, invoked from the kubernetes-* tests' Chainsaw
+# `finally` block (which always runs, after any crust-gather `catch`). The tenant
+# Kubernetes CR is applied imperatively (kubectl) inside run_kubernetes_test, so
+# Chainsaw's auto-cleanup does not track it — `finally` is where it gets
+# reclaimed. A failed run otherwise leaves the tenant cluster's worker-VM PVCs
+# (tens of GiB) in tenant-test, exhausting the shared tenant-quota and
+# cascade-failing every storage-heavy suite that runs afterwards. Cleanup
+# failures are accumulated so every safe reclamation attempt still runs, then
+# returned to Chainsaw: a passing workload on a dirty sandbox is not a pass.
+cozy_cleanup() {
+  local test_name="${1:-}"
+  local cleanup_failed=0
+  # Delete any test-scoped tenant API LoadBalancer Services left by a failed run
+  # so they don't leak MetalLB IPs from the shared host pool. Labeled by the
+  # test so a single selector reaps them all.
+  if ! kubectl -n tenant-test delete service -l cozystack-e2e.io/tenant-api-lb --ignore-not-found --wait=false 2>/dev/null; then
+    echo "» ERROR: failed to delete tenant API LoadBalancer Services" >&2
+    cleanup_failed=1
+  fi
+  # A failed node-join capture creates a short-lived reader Certificate and a
+  # hardened helper Pod. They are labelled separately from the tenant API LB:
+  # the Secret contains a Talos client key and must be reaped even if the
+  # diagnostic collector itself returned early.
+  if ! kubectl -n tenant-test delete certificates.cert-manager.io -l cozystack-e2e.io/tenant-talos-diagnostics --ignore-not-found --wait=true --timeout=30s 2>/dev/null; then
+    echo "» ERROR: failed to delete tenant Talos diagnostic Certificates" >&2
+    cleanup_failed=1
+  fi
+  if ! kubectl -n tenant-test delete pod,secret -l cozystack-e2e.io/tenant-talos-diagnostics --ignore-not-found --wait=false 2>/dev/null; then
+    echo "» ERROR: failed to delete tenant Talos diagnostic Pod/Secret" >&2
+    cleanup_failed=1
+  fi
+  # Delete worker node pools (KubernetesNodes) before the parent Kubernetes CR:
+  # the pool owns the workers and its pre-delete hook unpins the adopted objects
+  # so uninstall is clean. Chainsaw does not track this imperatively applied CR,
+  # so cozy_cleanup must reap it too.
+  local child_drained=0
+  if ! kubectl -n tenant-test delete kubernetesnodeses.apps.cozystack.io --all --ignore-not-found --wait=true --timeout=5m 2>/dev/null; then
+    echo "» ERROR: tenant KubernetesNodes did not delete within 5m" >&2
+    cleanup_failed=1
+  else
+    child_drained=1
+  fi
+  if [ "$child_drained" -eq 1 ]; then
+    if ! kubectl -n tenant-test delete kuberneteses.apps.cozystack.io --all --ignore-not-found --wait=true --timeout=5m 2>/dev/null; then
+      echo "» ERROR: tenant Kubernetes resources did not delete within 5m" >&2
+      cleanup_failed=1
+    fi
+  else
+    echo "» ERROR: refusing to delete parent Kubernetes resources while KubernetesNodes remain" >&2
+  fi
+  # The CR delete above finalizes once the Kubernetes CR is gone, which only
+  # TRIGGERS KubeVirt VM teardown + PVC release. Block until the worker VMs,
+  # VMIs (guest RAM) and disk PVCs are actually gone so the next tenant test
+  # starts on a freed sandbox -- the root cause of the node-join flake.
+  if [ -n "${test_name}" ]; then
+    if ! cozy_wait_tenant_drained "${test_name}" 300; then
+      echo "» ERROR: scoped tenant resources did not drain" >&2
+      cleanup_failed=1
+    fi
+  else
+    echo "» ERROR: cleanup has no test name; scoped tenant drain cannot be verified" >&2
+    cleanup_failed=1
+  fi
+  # Wait for this suite's saved per-node baseline: that catches a volume LINSTOR
+  # has not destroyed yet, or never will, without requiring volumes the suite
+  # did not create to vanish. Blocks a destroy is still freeing do not count.
+  local pool_rc=0
+  cozy_wait_linstor_pool_baseline 300 || pool_rc=$?
+  if [ "$pool_rc" -eq 1 ]; then
+    echo "» ERROR: LINSTOR pools did not return to the pre-suite level" >&2
+  fi
+  [ "$pool_rc" -eq 0 ] || cleanup_failed=1
+  return "$cleanup_failed"
+}
+
+# Where a suite's captures land, spelled once, so a handler that writes beside
+# the snapshot cannot drift from where the snapshot actually goes.
+_cozy_suite_snapshot_dir() {
+  printf '%s\n' "${COZY_REPORT_DIR:-/workspace/_out/cozyreport}/snapshots/${COZY_SNAPSHOT_NAME:-kubernetes}"
+}
+
+# Snapshot the tenant cluster (its cilium/CSI/coredns internals) on a failed run.
+# Reached from _tenant_failure_on_exit, which run_kubernetes_test installs as an
+# EXIT trap, so it fires during THIS test subshell's exit, before the success
+# path (or cozy_cleanup) deletes the tenant API LoadBalancer. crust-gather
+# reaches the tenant only through the kubeconfig's server URL (it connects
+# directly — no host-proxy mode — and the in-cluster URL is unreachable from the
+# runner), which is the LB IP and stays routable until teardown.
+# CURRENT_TENANT_KC is a global so the handler can read it regardless of
+# function scope at EXIT-trap time.
+#
+# Takes the failing exit status as $1 rather than reading $? itself, because the
+# handler that calls it runs a collector first and $? at entry would be that
+# collector's status.
+_tenant_snapshot_on_fail() {
+  local _rc="$1"
+  [ "$_rc" -eq 0 ] && return 0
+  command -v crust-gather >/dev/null 2>&1 || return 0
+  [ -n "${CURRENT_TENANT_KC:-}" ] && [ -f "${CURRENT_TENANT_KC}" ] || return 0
+  # COZY_SNAPSHOT_NAME is the Chainsaw test name (set in the kubernetes-* test's
+  # script env), so the tenant snapshot co-locates with the host snapshot the
+  # global .chainsaw.yaml catch writes under snapshots/<test>/. Falls back to a
+  # generic name if sourced outside the Chainsaw harness.
+  _snap=$(_cozy_suite_snapshot_dir)
+  mkdir -p "$_snap" 2>/dev/null || true
+  echo "» capturing tenant crust-gather snapshot (${CURRENT_TENANT_KC}) before teardown"
+  # Bounded with a timeout for the same reason as the host snapshot in
+  # cozytest.sh: an unbounded collect can hang for hours and wedge the job.
+  # --duration is crust-gather's own collection budget (default 60s, which
+  # silently truncates and skips its finish step on elapse); the outer
+  # wall-clock has to exceed it because the API discovery that runs first is
+  # not covered by that budget at all.
+  # (timeout's own -k 30 / 360 are distinct from crust-gather's -k kubeconfig.)
+  # Output goes to a log beside the snapshot instead of /dev/null so "complete
+  # or truncated?" is answerable from the artifact, as for the host snapshot.
+  _cg_rc=0
+  # --disable-additional-logs: the host-log leg spawns a privileged debug pod per
+  # node, which baseline PodSecurity rejects (403); its retry loop then burns the
+  # whole --duration and crust-gather exits 1. Skip it — it collects nothing here.
+  timeout -k 30 360 crust-gather collect -k "${CURRENT_TENANT_KC}" --disable-additional-logs --duration 180s \
+    --exclude-kind Secret -f "$_snap/${CURRENT_TENANT_KC}" \
+    >"$_snap/crust-gather-${CURRENT_TENANT_KC}.log" 2>&1 || _cg_rc=$?
+  case "$_cg_rc" in
+    0) echo "» tenant crust-gather snapshot complete (${CURRENT_TENANT_KC})" ;;
+    124 | 137) echo "» tenant crust-gather snapshot TRUNCATED (wall-clock $_cg_rc); partial state kept, see $_snap/crust-gather-${CURRENT_TENANT_KC}.log" ;;
+    *) echo "» tenant crust-gather snapshot FAILED (exit $_cg_rc); see $_snap/crust-gather-${CURRENT_TENANT_KC}.log" ;;
+  esac
+}
+
+# The EXIT handler run_kubernetes_test arms at the Kubernetes CR apply, which is
+# earlier than either collector needs the tenant: the parent HelmRelease exists
+# from that point and the classification reads the management cluster, while the
+# snapshot half stays a no-op until CURRENT_TENANT_KC is assigned. Two
+# collectors, in this order and for the reason the diagnostics conventions give
+# for it: the classification is a handful of bounded reads against the
+# management cluster and it discriminates between failure modes, while the
+# snapshot costs minutes. Run the other way round, a snapshot that spends its
+# wall clock would take the classification with it.
+#
+# The classification also sits ahead of the two guards below it, because neither
+# is about it: a runner without crust-gather, or a run whose tenant kubeconfig
+# never materialised, says nothing about the HelmReleases, which live on the
+# management cluster and are readable either way.
+#
+# Neither collector may fail the handler. The status the suite exits with is the
+# one that was in effect when the trap was entered, and it is what the Chainsaw
+# step reports.
+_tenant_failure_on_exit() {
+  local _exit_rc=$?
+  [ "$_exit_rc" -eq 0 ] && return 0
+  cozy_report_helmrelease_remediation tenant-test "${CURRENT_TENANT_PARENT_HR:-}" || true
+  _tenant_snapshot_on_fail "$_exit_rc" || true
+}
+
+# Render name|IP rows for worker VMIs from a `kubectl get ... -o json` document.
+# Kept pure so an absent default interface is represented by an empty IP instead
+# of silently dropping the VMI from the diagnostic report.
+cozy_tenant_worker_vmi_rows() {
+  jq -r '.items[] | [.metadata.name, ([.status.interfaces[]? | select(.name == "default") | .ipAddress][0] // "")] | join("|")'
+}
+
+# Ask cert-manager for a short-lived, read-only Talos client certificate. The
+# tenant chart deliberately uses TalosConfigTemplate generateType=none, so CABPT
+# creates no client talosconfig for this worker-only Kamaji topology. Reusing the
+# existing Talos CA Issuer avoids materialising an os:admin credential or copying
+# the CA private key out of Kubernetes.
+cozy_apply_tenant_talos_reader_certificate() {
+  local test_name="$1"
+  local release="kubernetes-${test_name}"
+  local certificate="${release}-e2e-talos-reader"
+
+  kubectl apply --request-timeout=30s -f - <<EOF
+apiVersion: cert-manager.io/v1
+kind: Certificate
+metadata:
+  name: ${certificate}
+  namespace: tenant-test
+  labels:
+    cozystack-e2e.io/tenant-talos-diagnostics: "${test_name}"
+spec:
+  duration: 1h
+  renewBefore: 10m
+  commonName: ${certificate}
+  secretName: ${certificate}
+  secretTemplate:
+    labels:
+      cozystack-e2e.io/tenant-talos-diagnostics: "${test_name}"
+  subject:
+    organizations:
+    - os:reader
+  privateKey:
+    algorithm: Ed25519
+    rotationPolicy: Always
+  usages:
+  - digital signature
+  - client auth
+  issuerRef:
+    name: ${release}-talos-ca
+    kind: Issuer
+    group: cert-manager.io
+EOF
+}
+
+# Build a local talosconfig from the reader Certificate. All private material
+# stays below workdir, which the caller creates with mode 0700 and removes from
+# a contained subshell EXIT trap; none of it is copied into cozyreport.
+cozy_prepare_tenant_talosconfig() (
+  local test_name="$1"
+  local workdir="$2"
+  local release="kubernetes-${test_name}"
+  local certificate="${release}-e2e-talos-reader"
+
+  umask 077
+  # An interrupted prior run may have left a reader Secret signed by the old
+  # tenant CA. Remove the Certificate first so cert-manager cannot recreate that
+  # Secret between deletion and the new request, then wait for both objects to
+  # disappear before waiting for issuance below.
+  kubectl -n tenant-test delete certificate "${certificate}" \
+    --ignore-not-found --wait=true --timeout=10s >/dev/null 2>&1 || return 1
+  kubectl -n tenant-test delete secret "${certificate}" \
+    --ignore-not-found --wait=true --timeout=10s >/dev/null 2>&1 || return 1
+  cozy_apply_tenant_talos_reader_certificate "${test_name}" || return 1
+
+  # cert-manager issuance is asynchronous. Wait on its actual Ready condition;
+  # on expiry, preserve Certificate diagnostics without ever printing the
+  # generated Secret.
+  if ! kubectl_wait_retry -n tenant-test certificate "${certificate}" \
+    --for=condition=Ready --timeout=30s; then
+    echo "tenant Talos reader Certificate was not issued within 30s" >&2
+    kubectl -n tenant-test describe certificate "${certificate}" --request-timeout=30s >&2 || true
+    kubectl -n tenant-test get certificaterequests.cert-manager.io \
+      -l cert-manager.io/certificate-name="${certificate}" -o wide --request-timeout=30s >&2 || true
+    return 1
+  fi
+
+  kubectl -n tenant-test get secret "${release}-talos-ca" \
+    -o go-template='{{index .data "tls.crt" | base64decode}}' --request-timeout=30s >"${workdir}/ca.crt" || return 1
+  kubectl -n tenant-test get secret "${certificate}" \
+    -o go-template='{{index .data "tls.crt" | base64decode}}' --request-timeout=30s >"${workdir}/client.crt" || return 1
+  kubectl -n tenant-test get secret "${certificate}" \
+    -o go-template='{{index .data "tls.key" | base64decode}}' --request-timeout=30s >"${workdir}/client.key" || return 1
+
+  talosctl --talosconfig "${workdir}/talosconfig" config add "${release}" \
+    --ca "${workdir}/ca.crt" --crt "${workdir}/client.crt" \
+    --key "${workdir}/client.key" || return 1
+  talosctl --talosconfig "${workdir}/talosconfig" config context "${release}" || return 1
+  chmod 600 "${workdir}/talosconfig"
+)
+
+# Apply the helper Pod separately from its readiness/copy steps so its security
+# invariants have focused unit coverage. The Pod runs on the management cluster
+# in the same namespace as bridge-networked worker VMIs, which lets talosctl use
+# each real VMI IP as both endpoint and node and keeps server-TLS verification
+# valid. A MetalLB or localhost port-forward address would not be in the Talos
+# serving certificate SANs.
+cozy_apply_tenant_talos_diagnostics_pod() {
+  local test_name="$1"
+  local pod_name="kubernetes-${test_name}-talos-diagnostics"
+
+  kubectl apply --request-timeout=30s -f - <<EOF
+apiVersion: v1
+kind: Pod
+metadata:
+  name: ${pod_name}
+  namespace: tenant-test
+  labels:
+    cozystack-e2e.io/tenant-talos-diagnostics: "${test_name}"
+spec:
+  activeDeadlineSeconds: 900
+  automountServiceAccountToken: false
+  enableServiceLinks: false
+  restartPolicy: Never
+  terminationGracePeriodSeconds: 1
+  securityContext:
+    runAsNonRoot: true
+    runAsUser: 1000
+    runAsGroup: 1000
+    fsGroup: 1000
+    seccompProfile:
+      type: RuntimeDefault
+  containers:
+  - name: diagnostics
+    # The E2E sandbox ships the statically linked upstream talosctl release, so
+    # reuse the digest-pinned Alpine helper already pulled by the test setup.
+    image: docker.io/alpine/k8s:1.36.2@sha256:44ef4942e171939b9c665a4a84beb80e2dcdb9a24330d4651cfdfd2e9deecc47
+    imagePullPolicy: IfNotPresent
+    command: ["sh", "-c", "sleep 900"]
+    securityContext:
+      allowPrivilegeEscalation: false
+      capabilities:
+        drop:
+        - ALL
+      readOnlyRootFilesystem: true
+    resources:
+      requests:
+        cpu: 10m
+        memory: 16Mi
+      limits:
+        cpu: 200m
+        memory: 256Mi
+    volumeMounts:
+    - name: tmp
+      mountPath: /tmp
+  volumes:
+  - name: tmp
+    emptyDir: {}
+EOF
+}
+
+# Start the helper Pod and stream talosctl plus the reader talosconfig into its
+# emptyDir. Streaming avoids a Secret volume and keeps the Pod independent of
+# kubectl-cp/tar behavior. The final cleanup selector remains the authoritative
+# backstop if any preparation step fails.
+cozy_prepare_tenant_talos_diagnostics_pod() {
+  local test_name="$1"
+  local talosconfig="$2"
+  local pod_name="kubernetes-${test_name}-talos-diagnostics"
+  local talosctl_bin
+
+  talosctl_bin=$(command -v talosctl) || return 1
+  kubectl -n tenant-test delete pod "${pod_name}" --ignore-not-found \
+    --wait=true --timeout=10s >/dev/null 2>&1 || return 1
+  cozy_apply_tenant_talos_diagnostics_pod "${test_name}" || return 1
+
+  if ! kubectl -n tenant-test wait pod "${pod_name}" \
+    --for=condition=Ready --timeout=60s; then
+    kubectl -n tenant-test describe pod "${pod_name}" --request-timeout=30s >&2 || true
+    kubectl -n tenant-test get events \
+      --field-selector involvedObject.name="${pod_name}" \
+      --sort-by=.lastTimestamp --request-timeout=30s >&2 || true
+    return 1
+  fi
+
+  if ! timeout -k 5 60 kubectl -n tenant-test exec -i "${pod_name}" \
+    -c diagnostics -- sh -ec 'cat > /tmp/talosctl && chmod 500 /tmp/talosctl' \
+    <"${talosctl_bin}"; then
+    echo "failed to stream talosctl into tenant diagnostics Pod" >&2
+    return 1
+  fi
+  if ! timeout -k 5 20 kubectl -n tenant-test exec -i "${pod_name}" \
+    -c diagnostics -- sh -ec 'umask 077; cat > /tmp/talosconfig; chmod 600 /tmp/talosconfig' \
+    <"${talosconfig}"; then
+    echo "failed to stream tenant talosconfig into diagnostics Pod" >&2
+    return 1
+  fi
+}
+
+# Capture one bounded Talos command through the helper Pod and retain the exit
+# status alongside partial output. A timeout or unreachable pre-apid worker is
+# itself useful evidence and must not erase captures from the other worker.
+#
+# The bound is the caller's rather than a constant here because the reads differ
+# in kind: two of them stream (a kernel ring buffer, five hundred lines of
+# service log) and two are single tabular RPCs that a reachable apid answers at
+# once. The whole walk sits inside the collector the diagnostics phase budget is
+# sized against, so a second spent here is a second the collectors gated after
+# it do not get -- and a bound picked for the streams, applied to the tabular
+# reads, buys nothing and costs that.
+cozy_capture_tenant_talos_command() {
+  local pod_name="$1"
+  local node_ip="$2"
+  local output="$3"
+  local bound="$4"
+  shift 4
+  local rc=0
+
+  timeout -k 5 "${bound}" kubectl -n tenant-test exec "${pod_name}" -c diagnostics -- \
+    /tmp/talosctl --talosconfig /tmp/talosconfig \
+    -e "${node_ip}" -n "${node_ip}" "$@" >"${output}" 2>&1 || rc=$?
+  printf '\n[capture exit code: %s]\n' "${rc}" >>"${output}"
+  return "${rc}"
+}
+
+cozy_capture_tenant_talos_node() {
+  local pod_name="$1"
+  local node_ip="$2"
+  local output_dir="$3"
+  local answered=0
+
+  mkdir -p "${output_dir}"
+  printf 'endpoint: %s\nnode: %s\n' "${node_ip}" "${node_ip}" >"${output_dir}/target.txt"
+  cozy_capture_tenant_talos_command "${pod_name}" "${node_ip}" \
+    "${output_dir}/dmesg.log" 20 dmesg && answered=$((answered + 1))
+  cozy_capture_tenant_talos_command "${pod_name}" "${node_ip}" \
+    "${output_dir}/kubelet.log" 20 logs kubelet --tail=500 && answered=$((answered + 1))
+  # The service state machine, which answers what the kubelet log cannot when
+  # there is no kubelet log to read. Talos creates a service's log buffer when
+  # its runner opens the log writer, which the runner does as it starts the
+  # process -- so a kubelet still Waiting on its volumes, on time sync, or on
+  # the container runtime reporting healthy has never reached its runner, has no
+  # buffer, and `logs kubelet` fails with `log "kubelet" was not registered`.
+  # That is a true statement about the log and says nothing about the service,
+  # while the state and the condition being waited on are the finding. One call
+  # covers every service, so the runtime the kubelet is waiting for arrives in
+  # the same file.
+  cozy_capture_tenant_talos_command "${pod_name}" "${node_ip}" \
+    "${output_dir}/services.log" 10 services && answered=$((answered + 1))
+  # Read as yaml because MTU lives in the LinkStatus spec and not among the
+  # resource's print columns, so the default table omits the one field this is
+  # read for: a guest at 1500 over an encapsulated fabric drops the large
+  # segments and passes the small ones, which is the signature a stalled
+  # transfer beside a healthy probe presents.
+  cozy_capture_tenant_talos_command "${pod_name}" "${node_ip}" \
+    "${output_dir}/links.yaml.log" 10 get links -o yaml && answered=$((answered + 1))
+  # Stated for the worker rather than per read, because per read it is already
+  # stated and still invisible: with apid refusing the connection each log holds
+  # its own rpc error and an exit code, accurate one file at a time and adding
+  # up to a directory that looks like a worker with little to report. Written
+  # only when nothing completed, so a worker that answered one read of the four
+  # is not written up as unreachable.
+  #
+  # `answered` counts reads that COMPLETED, and the wording below is bounded by
+  # that rather than claiming more. A read killed at its bound has already
+  # written what it managed to read, so the directory can hold real evidence
+  # while nothing in it exited zero -- which is the slow-apid worker, the shape
+  # this capture is most often reached on. A marker saying nothing was observed
+  # would be the collector making exactly the unsupported claim the arms above
+  # exist to prevent, one directory up.
+  if [ "${answered}" -eq 0 ]; then
+    # `|| true` on the write, not only `return 0` below: under a live errexit a
+    # failing redirect aborts AT the redirect, so a trailing return never runs
+    # and cannot be what carries the guarantee. A full scratch directory on the
+    # runner is how this fails.
+    printf '%s\n' \
+      'no Talos read completed for this worker: all four failed or were cut short, so this directory holds no whole capture -- what is here is whatever arrived before a read was killed, or the error a read returned, and each log carries its own reason and exit code' \
+      >"${output_dir}/CAPTURE-FAILED.txt" || true
+  fi
+  # Defensive rather than load-bearing today, and worth saying which: the one
+  # call site reaches this through `cozy_capture_tenant_talos ... || true`, and
+  # that suppression covers the whole subshell and everything it calls, so no
+  # status returned from here can end the worker walk. What this pair buys is
+  # that the guarantee survives a caller that drops the `|| true` -- the walk
+  # continues to the next worker because nothing in here fails, rather than
+  # because of how the call happens to be written.
+  return 0
+}
+
+# Name the console experiment's own failure before the noise starts. Enabling
+# logSerialConsole punches through the platform's cluster-wide disable, and if
+# kubevirt/kubevirt#15989 still bites, guest-console-log wedges virt-launcher
+# in Init: the workers never boot, no Node registers, and the suite reports
+# "fewer than 2 tenant nodes Ready within 29m" -- byte-identical to the failure
+# this instrumentation was added to study. A triager reading that line files it
+# as the known flake and the experiment's answer is lost at the bottom of
+# POD-STATE.txt. A diagnostic whose own worst case is disguised as the bug it
+# investigates is worth less than none, so it says so itself, and says it
+# first.
+#
+# The bit it reads is `ready` on the init container. This sidecar is built with
+# no probes at all, and kubelet's UpdatePodStatus sets `ready = !exists` for a
+# container with no readiness worker once it is running -- liveness is not an
+# input to readiness anywhere. So the bit is exactly "the container is
+# running", and false means not running: never-started, waiting between
+# restarts, or already-terminated. Running-but-not-ready is not a shape this
+# container can hold, which is why the taxonomy below does not claim it.
+# Those are not one finding: the hang starts the container and then fails it,
+# so with restartPolicy Always it settles into CrashLoopBackOff and passes
+# through Error, while a superseded virt-launcher from a VM restart exits
+# cleanly and terminates Completed. ContainerState is a union, so a waiting
+# reason alone leaves the terminated case blank and cannot tell the two apart.
+# Both reasons are carried so each shape arrives labelled.
+#
+# Even so this line points rather than concludes, and it says so out loud: the
+# bit cannot separate every shape, the describe that follows can, and a
+# headline that asserts more than the bit carries is the same mislabel this
+# function exists to prevent, merely pointing the other way.
+cozy_report_guest_console_wedge() {
+  local rows read_rc=0
+  local read_err
+
+  if ! read_err=$(mktemp); then
+    # Same rule as the read-failure branch below: saying nothing here would
+    # read as "the console container is fine" when nothing was checked.
+    echo "=== could not allocate a scratch file to read virt-launcher Pod state; whether guest-console-log started is unknown, not fine ==="
+    return 0
+  fi
+  rows=$(timeout -k 5 30 kubectl -n tenant-test get pods \
+    -l kubevirt.io=virt-launcher \
+    -o jsonpath='{range .items[*]}{range .status.initContainerStatuses[?(@.name=="guest-console-log")]}{.ready}{" "}{.state.waiting.reason}{.state.terminated.reason}{" "}{end}{.metadata.name}{"\n"}{end}' \
+    --request-timeout=30s 2>"${read_err}") || read_rc=$?
+  if [ "${read_rc}" -ne 0 ]; then
+    # Silence here would be the same mislabel inverted: the reader would take
+    # the absent headline as "the console container is fine" when nothing was
+    # actually checked.
+    echo "=== could not read virt-launcher Pod state (exit ${read_rc}); whether guest-console-log started is unknown, not fine ==="
+    cat "${read_err}" || true
+    rm -f "${read_err}"
+    return 0
+  fi
+  rm -f "${read_err}"
+
+  case "${rows}" in
+    *"false "*) ;;
+    *) return 0 ;;
+  esac
+
+  echo "=== guest-console-log is not running on the workers below; if these are current Pods this is the console experiment failing rather than the node-join failure it instruments (kubevirt/kubevirt#15989) ==="
+  echo "=== a reason of CrashLoopBackOff or Error below is the wedge shape (kubevirt/kubevirt#15989); Completed is a superseded Pod and not this bug; any other reason, or none, is not covered by either and the describe that follows settles it ==="
+  echo "=== if it is the wedge: the cluster-wide disableSerialConsoleLog in packages/system/kubevirt exists for this, and dropping logSerialConsole from the e2e node group returns the suite to its prior behaviour ==="
+  printf '%s\n' "${rows}" | grep '^false ' || true
+}
+
+# Check that KubeVirt actually attached the guest console container, on the
+# path where the workers did boot. The capture below runs only when node-join
+# fails, so without this the suite would first learn that the node group's
+# logSerialConsole never took effect in the run that needed the console, when
+# it can no longer be recovered. The platform disables console logging
+# cluster-wide (see packages/system/kubevirt), so what this asks is whether
+# the per-VM override beat that on the KubeVirt version actually shipping.
+#
+# The read's own status is kept separate from the answer it returns, and the
+# two get different exit codes, because they are different claims. Piping
+# kubectl into grep would collapse them: a read that failed produces no output,
+# grep finds nothing, and an API blip would be reported as "the override did
+# not take effect" -- a cause that was never established, sending the next
+# reader at KubeVirt config instead of at the apiserver. A selector that
+# matched no Pod at all is the same trap one step further on, and is kept
+# apart from a Pod that matched and carries nothing -- the second is the
+# finding, the first is not a statement about any Pod.
+#
+# What it establishes is that SOME virt-launcher Pod in the namespace carries
+# the container, not that every one does. That is the direction worth erring
+# in for a check whose only job is to catch an inert setting: it can miss, but
+# it cannot fail a run over a Pod that is not this test's. The match runs over
+# the whole name=containers line, so a Pod named after the container would
+# satisfy it -- these names come from the Machine name, so that cannot happen
+# here, but a reader changing the format should know the glob spans both.
+#
+#   0  a Pod carries the container
+#   1  the read did not answer, or matched no Pod; not evidence either way
+#   2  Pods matched and none carries the container
+cozy_assert_guest_console_attached() {
+  local init_names read_rc=0
+  local attached total
+
+  # The Pod name is in the output for a reason that is not cosmetic: without
+  # it, a Pod whose initContainers list is absent emits a bare newline, command
+  # substitution strips it, and "Pods matched, none carries the container" is
+  # byte-identical to "no Pod matched". Those two must not collapse -- the
+  # first is the finding this whole check exists for, and on these workers it
+  # is also the only shape it can take, since guest-console-log is the only
+  # init container a DataVolume-booted virt-launcher Pod ever has.
+  init_names=$(timeout -k 5 30 kubectl -n tenant-test get pods \
+    -l kubevirt.io=virt-launcher \
+    -o jsonpath='{range .items[*]}{.metadata.name}{"="}{.spec.initContainers[*].name}{" "}{.spec.containers[*].name}{"\n"}{end}' \
+    --request-timeout=30s) || read_rc=$?
+  if [ "${read_rc}" -ne 0 ]; then
+    echo "could not read tenant virt-launcher Pods to verify the guest console container (exit ${read_rc})" >&2
+    echo "this says nothing about logSerialConsole either way; continuing" >&2
+    return 1
+  fi
+
+  if [ -z "${init_names}" ]; then
+    echo "no tenant virt-launcher Pod matched; nothing to verify about the guest console container" >&2
+    echo "this says nothing about logSerialConsole either way; continuing" >&2
+    return 1
+  fi
+
+  case "${init_names}" in
+    *guest-console-log*)
+      # The positive outcome goes on the record too. This run doubles as the
+      # revalidation of a platform-wide workaround, and a check that returns
+      # 0 in silence leaves "the override worked" to be inferred from the
+      # absence of a complaint -- the inference this collector refuses to
+      # make everywhere else. Counted rather than asserted for every Pod: the
+      # check is deliberately "some Pod carries it", so the ratio is the
+      # honest way to say what was seen.
+      attached=$(printf '%s\n' "${init_names}" | grep -c 'guest-console-log' || true)
+      total=$(printf '%s\n' "${init_names}" | grep -c '=' || true)
+      echo "» guest-console-log attached on ${attached} of ${total} virt-launcher Pods"
+      return 0
+      ;;
+  esac
+
+  echo "tenant worker virt-launcher Pods carry no guest-console-log container" >&2
+  echo "the node group asked for logSerialConsole, so either the cluster-wide" >&2
+  echo "disableSerialConsoleLog won the override or the field never reached the VM" >&2
+  # Bounded like the read above, and for the same reason: these run on a path
+  # that ends in exit 1, and a hang here would take the step's whole deadline
+  # with it -- losing the tenant snapshot that the exit is supposed to reach.
+  timeout -k 5 30 kubectl -n tenant-test get pods -l kubevirt.io=virt-launcher \
+    -o jsonpath='{range .items[*]}{.metadata.name}{": "}{.spec.initContainers[*].name}{"\n"}{end}' \
+    --request-timeout=30s || true
+  timeout -k 5 30 kubectl -n tenant-test get virtualmachineinstances.kubevirt.io \
+    -o jsonpath='{range .items[*]}{.metadata.name}{": logSerialConsole="}{.spec.domain.devices.logSerialConsole}{"\n"}{end}' \
+    --request-timeout=30s || true
+  return 2
+}
+
+# Summarise the kubelet-image leg from one already-captured guest console. Talos
+# does not print a separate "pull complete" line: the next kubelet milestone is
+# Creating service runner, after the image has been fetched and unpacked. Keep
+# that distinction in the label. The source is explicit because e2e deliberately
+# leaves the chart's registryMirrors empty and exercises the public GHCR path.
+_cozy_guest_kubelet_image_timing() {
+  local pod="$1"
+  local console_log="$2"
+  awk -v pod="$pod" '
+    function guest_seconds(line, value) {
+      value = line
+      sub(/^\[[[:space:]]*/, "", value)
+      sub(/\].*$/, "", value)
+      return value + 0
+    }
+    /pulling image ghcr\.io\/siderolabs\/kubelet:/ && !have_start {
+      have_start = 1
+      started = guest_seconds($0)
+      image = $0
+      sub(/^.*pulling image /, "", image)
+      sub(/: starting\.\.\..*$/, "", image)
+      next
+    }
+    have_start && !have_runner && /service\[kubelet\]\(Preparing\): Creating service runner/ {
+      have_runner = 1
+      runner = guest_seconds($0)
+    }
+    have_start && !have_healthy && /service\[kubelet\]\(Running\): Health check successful/ {
+      have_healthy = 1
+      healthy = guest_seconds($0)
+    }
+    END {
+      if (!have_start) {
+        exit
+      }
+      printf "» tenant worker %s guest timing: kubelet image %s", pod, image
+      if (have_runner) {
+        printf " fetch+unpack %.3fs (guest %.3fs -> %.3fs)", runner - started, started, runner
+      } else {
+        printf " fetch+unpack incomplete (started at guest %.3fs)", started
+      }
+      if (have_healthy) {
+        printf "; kubelet healthy at guest %.3fs", healthy
+      }
+      printf "; source=ghcr.io (no e2e registry mirror)"
+      printf "\n"
+    }
+  ' "$console_log"
+}
+
+# Capture each tenant worker's guest serial console from the management
+# cluster. When a node group sets logSerialConsole, KubeVirt streams the
+# console into a guest-console-log container beside virt-launcher, and reading
+# it needs nothing from inside the guest: no talosctl, no client certificate,
+# no helper Pod, no reachable apid. That is the whole reason it exists. The
+# talosctl capture below can only describe a worker whose apid already answers,
+# so a worker that stalls earlier -- the case where no Node registers and no
+# certificate request is ever made -- is invisible to it by construction, and
+# the console is the only remaining surface.
+#
+# Reads start at the beginning of the stream rather than tailing it, because a
+# guest that repaints its console would push the boot output out of any tail
+# window while --limit-bytes truncates from the far end instead. That covers
+# only what kubectl returns: whatever the kubelet has already rotated out of
+# the container log (containerLogMaxSize, 10Mi x 5 by default) is gone before
+# the capture runs, and no read option recovers it.
+#
+# An absent guest-console-log container is the finding, not a gap: it says
+# console logging did not take effect on this run, which is a different fact
+# from a guest that printed nothing. kubectl's refusal is kept beside the
+# capture rather than inside it so the two stay distinguishable, and the
+# capture file says which of them happened.
+#
+# The Pod list is namespace-wide rather than scoped to one release. The two
+# virt-launcher captures immediately above the call site already select that
+# way, and suites run one at a time. Below the cap a Pod that does not belong
+# to this test costs one extra file named after itself and nothing else; at
+# the cap it can displace one of this suite's own, since kubectl returns the
+# list name-sorted. COLLECTION-TRUNCATED.txt is what keeps that visible.
+#
+# Takes the context it was called in, because it is called from both paths and
+# both write here. On the failure path the console is the evidence; on the
+# passing path it is the baseline that evidence is read against, and the two are
+# the same files in the same directory. Which one a tarball holds is otherwise
+# recoverable only from the run's verdict somewhere else entirely, so the
+# capture states it.
+cozy_capture_tenant_serial_console() {
+  local context="$1"
+  # How many Pods the walk may cover, taken from the caller because the two
+  # paths have different room. The failure path runs inside a phase whose budget
+  # is derived against the whole op, so it can afford the pool at its maximum.
+  # The passing path has no phase and no budget of its own: it runs inside the
+  # same operation whose ceiling the suite has already spent most of, and a
+  # diagnostic that turns a suite green-then-red for running long would be worse
+  # than the missing baseline it exists to collect. So that caller asks for the
+  # pool's minimum, which is what a boot baseline needs -- two workers booting
+  # is the same measurement as ten -- and the cap that fires records what it
+  # dropped either way.
+  local max_pods="$2"
+  local report_dir="${COZY_REPORT_DIR:-/workspace/_out/cozyreport}/snapshots/${COZY_SNAPSHOT_NAME:-kubernetes}/tenant-serial-console"
+  local pods pod rc
+  local list_rc=0
+  local seen=0
+  local walked=0
+  local silent=0
+  local cut_short=0
+  local pod_err read_at read_done
+  local timeline timeline_err timeline_why timeline_rc=0 timeline_err_kept=0
+  local err_log="${report_dir}/setup-error.log"
+  local warn_log="${report_dir}/READ-WARNINGS.txt"
+
+  mkdir -p "${report_dir}"
+  # Written before the first read, not after the walk: the outcome this most
+  # needs to be legible in is the one where nothing was captured, and every
+  # early return below leaves the directory holding a note alone.
+  printf '%s\n' "${context}" >"${report_dir}/CAPTURE-CONTEXT.txt"
+  # stderr goes to its own file rather than being folded into the captured
+  # stdout: a warning kubectl prints on an otherwise successful call would
+  # otherwise be read back as a Pod name. Which file it goes to is decided by
+  # the exit status, not by the fact that something was written: an apiserver
+  # Warning header or a deprecation notice arrives on stderr with a zero exit,
+  # so a warning beside a healthy read belongs in READ-WARNINGS.txt as
+  # elsewhere in this tree, while the stderr of a call that actually failed IS
+  # the diagnosis and belongs in setup-error.log. The list is wrapped in
+  # timeout for the same reason every read below it is: --request-timeout
+  # bounds the HTTP request, not a client retrying against a wedged
+  # apiserver, and a hang here would cost the whole
+  # section rather than one Pod.
+  pods=$(timeout -k 5 30 kubectl -n tenant-test get pods -l kubevirt.io=virt-launcher \
+    -o jsonpath='{range .items[*]}{.metadata.name}{"\n"}{end}' \
+    --request-timeout=30s 2>"${warn_log}") || list_rc=$?
+  if [ "${list_rc}" -ne 0 ]; then
+    echo "failed to list tenant virt-launcher Pods for serial console capture" >&2
+    mv "${warn_log}" "${err_log}" 2>/dev/null || true
+    printf '%s\n' \
+      "failed to list tenant virt-launcher Pods for serial console capture (exit ${list_rc})" \
+      >>"${err_log}"
+    return 1
+  fi
+  [ -s "${warn_log}" ] || rm -f "${warn_log}"
+  if [ -z "${pods}" ]; then
+    echo "no virt-launcher Pod found for serial console capture" >&2
+    printf '%s\n' 'no virt-launcher Pod found in namespace tenant-test' \
+      >"${err_log}"
+    return 1
+  fi
+
+  # Cap the walk, at the number the caller asked for. Every read here is bounded,
+  # but the pool can reach maxReplicas, so
+  # an uncapped loop is a term whose size the cluster sets rather than this file --
+  # inside a failure path that has to reach the tenant snapshot at the end of it.
+  # The phase budget beside COZY_DIAG_PHASE_BUDGET is what stops the collectors as a
+  # group from spending the time that snapshot needs; this cap is what stops this
+  # walk from being the collector that spends it. A cap that fired is recorded with both
+  # counts rather than leaving the shortfall implicit, since a short listing
+  # otherwise reads as a small pool rather than a truncated walk.
+  for pod in ${pods}; do
+    seen=$((seen + 1))
+    if [ "${seen}" -gt "${max_pods}" ]; then
+      echo "--- guest serial console capture stopped at ${max_pods} Pods ---"
+      printf 'capture stopped after %s Pods; %s matched in total\n' \
+        "${max_pods}" "$(printf '%s\n' ${pods} | wc -l | tr -d ' ')" \
+        >"${report_dir}/COLLECTION-TRUNCATED.txt"
+      break
+    fi
+    # Counted after the cap test, not from it. `seen` is incremented before that
+    # test so it can fire on the Pod past the cap, which leaves it one higher
+    # than the number of Pods read whenever the walk truncates. Reporting a
+    # count of silent consoles against it would state a denominator that is
+    # neither what was read nor what matched -- and the truncation marker beside
+    # the capture prints both correctly, so the job log and the artifact would
+    # disagree on a run nobody opens the artifact for.
+    walked=$((walked + 1))
+    echo "--- capturing guest serial console: ${pod} ---"
+    rc=0
+    # stderr goes beside the capture, not into it. Folded in, kubectl's own
+    # "container guest-console-log is not valid for pod ..." would make the
+    # file non-empty and the console would look like it had said something.
+    # That error is the headline case here -- it is what a container wedged in
+    # Init looks like -- so it has to stay separable from console bytes. Which
+    # name it lands under is decided by the exit status, the same way the list
+    # read above decides it: kubectl writes warnings on stderr with a zero
+    # status too, and a warning beside a healthy capture is not an error.
+    pod_err="${report_dir}/${pod}.read-error.log"
+    read_at=$(date +%s)
+    timeout -k 5 30 kubectl -n tenant-test logs "${pod}" \
+      -c guest-console-log --limit-bytes=1048576 \
+      >"${report_dir}/${pod}.log" 2>"${pod_err}" || rc=$?
+    read_done=$(date +%s)
+    if [ ! -s "${pod_err}" ]; then
+      rm -f "${pod_err}"
+      pod_err=
+    elif [ "${rc}" -eq 0 ]; then
+      mv "${pod_err}" "${report_dir}/${pod}.READ-WARNINGS.txt" 2>/dev/null || true
+      pod_err=
+    fi
+    # Tested before the exit-code line is appended, or nothing is ever empty.
+    # Three outcomes, three labels, because only one of them is a statement
+    # about what the guest did.
+    if [ ! -s "${report_dir}/${pod}.log" ] && [ "${rc}" -ne 0 ]; then
+      silent=$((silent + 1))
+      # timeout kills the child without a word, so a read can fail having
+      # written nothing to either stream. Naming a file that was never created
+      # sends the reader looking for evidence that does not exist.
+      if [ -n "${pod_err}" ]; then
+        printf '%s\n' \
+          'the read returned no console at all; see read-error.log and POD-STATE.txt' \
+          >>"${report_dir}/${pod}.log"
+      else
+        printf '%s\n' \
+          'the read failed silently and returned no console at all; see POD-STATE.txt' \
+          >>"${report_dir}/${pod}.log"
+      fi
+    elif [ ! -s "${report_dir}/${pod}.log" ]; then
+      silent=$((silent + 1))
+      printf '%s\n' \
+        'the read succeeded and returned nothing; see POD-STATE.txt for whether the container started' \
+        >>"${report_dir}/${pod}.log"
+    elif [ "${rc}" -ne 0 ]; then
+      silent=$((silent + 1))
+      # Counted apart as well as together. `silent` gates the Pod-state read
+      # below, and a console cut off part way needs that read as much as an
+      # empty one does; but it is not silence, and the summary line these feed
+      # would otherwise report bytes that arrived as bytes that never did.
+      cut_short=$((cut_short + 1))
+      if [ -n "${pod_err}" ]; then
+        printf '%s\n' \
+          'console output is truncated; see read-error.log and POD-STATE.txt' \
+          >>"${report_dir}/${pod}.log"
+      else
+        printf '%s\n' \
+          'console output is truncated; see POD-STATE.txt for the Pod state' \
+          >>"${report_dir}/${pod}.log"
+      fi
+    fi
+    # Reuse the console bytes just read rather than paying for another API/log
+    # call in the successful timing report. Best-effort: a guest that has not
+    # reached the pull yet is already described by the full capture itself.
+    _cozy_guest_kubelet_image_timing "${pod}" "${report_dir}/${pod}.log" || true
+    # The wall clock the log's own stamps have to be read against. Every line a
+    # guest prints is stamped in seconds since that guest's kernel started, so
+    # the file says how far the guest had got and nothing about when that was.
+    # Paired with the compute container's start in CAPTURE-TIMELINE.txt beside
+    # it, this turns the two questions a short console raises -- a guest that
+    # started too late to reach a milestone, or one that reached it and then
+    # went quiet -- into one subtraction. The read instant is otherwise nowhere
+    # in the file: it survives as the artifact's mtime, which is metadata rather
+    # than content, so a reader who opens the log sees nothing and anything that
+    # regenerates or rewrites the file loses it.
+    # Same bracket form the cAdvisor captures use, and for the same
+    # reason: the stream is drained somewhere between the two instants, so an
+    # age computed against either end is exact to the width of the bracket.
+    printf '\n[console read started at %s and returned at %s epoch seconds]\n' \
+      "${read_at}" "${read_done}" >>"${report_dir}/${pod}.log"
+    printf '[capture exit code: %s]\n' "${rc}" >>"${report_dir}/${pod}.log"
+  done
+
+  # When each guest started, read once for the whole selector rather than per
+  # Pod, like the Pod-state read below and for the same reason: several workers
+  # are one finding and paying per Pod would put back the unbounded term the cap
+  # removed. Unlike that read this one is unconditional, because the question it
+  # answers is raised by a console that arrived intact just as much as by one
+  # that did not -- a full log ending mid-boot is the shape this failure keeps
+  # producing, and it is the shape that says nothing on its own.
+  #
+  # Both container starts, not just compute's: the guest's clock begins with
+  # compute, and the console container starting later or restarting would mean
+  # the stream missed a stretch the guest did print, which reads identically to
+  # a guest that was quiet.
+  #
+  # The console container is asked for in both status lists, the way the attach
+  # check asks for it in both spec lists. KubeVirt runs it as an init container
+  # today, so its runtime state is under initContainerStatuses and reading only
+  # containerStatuses returns empty for a container that started fine, which
+  # costs the field its meaning. Missing keys are not an error for a jsonpath
+  # template, so naming both costs an empty string on whichever list does not
+  # hold it.
+  #
+  # Both fields read the RUNNING instance, so a container that has since
+  # terminated reads empty here even though it ran. The legend says so rather
+  # than the query chasing lastState as well: what this pairs with is a console
+  # that was read from a live Pod, and a second start time for an instance whose
+  # console is not the one in the file beside it would be read as the same
+  # quantity.
+  timeline="${report_dir}/CAPTURE-TIMELINE.txt"
+  timeline_err="${report_dir}/CAPTURE-TIMELINE-warnings.txt"
+  {
+    printf '=== when each tenant worker guest started, against the reads above ===\n'
+    printf '%s\n' \
+      'each console log carries the instant its own read returned, in epoch seconds; the times below are RFC 3339, so convert before subtracting rather than comparing the two as printed. computeStartedAt subtracted from that instant is how long the guest had been alive when it was read; compare the result against the last [ ss.ssssss] stamp in the log, which counts from the same start. Close together means the guest was still printing when the read ran, so the log ends because the guest had not got further. Far apart means the console stopped growing for the difference, which is the guest going quiet or the stream no longer carrying it; consoleStartedAt is what separates those, since a console container that started late or restarted missed whatever the guest printed before it. Read that against CAPTURE-CONTEXT.txt before calling it a finding: on a capture taken after a suite passed, the guest finished booting long before the read and a large difference is what a healthy worker looks like, so what is worth comparing there is the guest seconds each milestone landed at rather than the size of the gap. These are the running instances only: a Pod whose compute has no start time has no compute container running now, which is not the same as never having had one, and phase beside it is what says which'
+  } >"${timeline}"
+  # Bounded like every read here, and its stderr kept out of the file for the
+  # same reason the reads above keep theirs out: the success probe below matches
+  # on the row prefix, and a warning kubectl writes beside a healthy read would
+  # otherwise be sitting inside the rows it is supposed to be distinguished
+  # from.
+  timeout -k 5 30 kubectl -n tenant-test get pods -l kubevirt.io=virt-launcher \
+    -o jsonpath='{range .items[*]}{"name="}{.metadata.name}{" phase="}{.status.phase}{" podStartTime="}{.status.startTime}{" computeStartedAt="}{.status.containerStatuses[?(@.name=="compute")].state.running.startedAt}{" consoleStartedAt="}{.status.initContainerStatuses[?(@.name=="guest-console-log")].state.running.startedAt}{.status.containerStatuses[?(@.name=="guest-console-log")].state.running.startedAt}{"\n"}{end}' \
+    --request-timeout=30s >>"${timeline}" 2>>"${timeline_err}" || timeline_rc=$?
+  timeline_err_kept=0
+  if [ ! -s "${timeline_err}" ]; then
+    rm -f "${timeline_err}"
+  elif [ "${timeline_rc}" -ne 0 ]; then
+    if mv "${timeline_err}" "${report_dir}/CAPTURE-TIMELINE-error.log" 2>/dev/null; then
+      timeline_err_kept=1
+    fi
+  fi
+  # Three outcomes, three labels, because only one of them says anything about
+  # the guests. A read that failed is a statement about this machine's view of
+  # the cluster; a read that answered with nothing is a statement about the
+  # namespace; and neither may be left as an absent file, which reads as a
+  # capture that had no reason to write one. The failed arm is tested for rows
+  # as well, because a read cut off part way leaves both -- and a note saying
+  # nothing was observed, sitting under rows that plainly were, is a file that
+  # contradicts itself.
+  # The error file is named only when there is one. `timeout` kills the child
+  # without a word, so this read can fail having written to neither stream, and
+  # a note pointing at a file that was never created sends the reader looking
+  # for evidence that does not exist -- the same trap the per-Pod notes above
+  # avoid the same way.
+  if [ "${timeline_err_kept}" -eq 1 ]; then
+    timeline_why='; the reason it gave is in CAPTURE-TIMELINE-error.log'
+  else
+    timeline_why='; it gave no reason on either stream'
+  fi
+  if [ "${timeline_rc}" -ne 0 ] && grep -q '^name=' "${timeline}"; then
+    printf '%s\n' \
+      "the start-time read was cut off (exit ${timeline_rc}); the rows above are a prefix and the Pods missing from them were not observed${timeline_why}" \
+      >>"${timeline}"
+  elif [ "${timeline_rc}" -ne 0 ]; then
+    printf '%s\n' \
+      "the start-time read failed (exit ${timeline_rc}); when these guests started was not observed, which is not the same as their having no start time${timeline_why}" \
+      >>"${timeline}"
+  elif ! grep -q '^name=' "${timeline}"; then
+    printf '%s\n' \
+      'the start-time read succeeded and returned no rows; the walk above read consoles from Pods this selector no longer matches' \
+      >>"${timeline}"
+  fi
+
+  # An empty console log has two causes that are indistinguishable in the log
+  # itself: the guest printed nothing, or the container never started and there
+  # was no stream to read. The second is what kubevirt/kubevirt#15989 produces,
+  # and it is the reading that would otherwise be filed as a quiet guest --
+  # silence reported as a result is the failure this collector exists to
+  # prevent, so it is not allowed to produce one. The Pod's own state and its
+  # events are what separate the two, and they are read once for the whole
+  # selector rather than per Pod: several silent workers are one finding, and
+  # paying per Pod would put back the unbounded term the cap removed.
+  if [ "${silent}" -gt 0 ]; then
+    # Said on stdout as well as in the report, because the two callers read
+    # different things. On the failure path the report is opened either way; on
+    # the passing path it is not opened at all, and a baseline that came back
+    # empty there would otherwise be visible only to whoever downloads a green
+    # run's artifact -- which is nobody. The count is not a failure: on the
+    # failure path a guest that printed nothing is itself a finding.
+    echo "» of the ${walked} guest consoles read, $((silent - cut_short)) came back empty and ${cut_short} were cut short; see POD-STATE.txt beside the capture"
+    {
+      printf '=== describe pods -l kubevirt.io=virt-launcher ===\n'
+      timeout -k 5 30 kubectl -n tenant-test describe pods \
+        -l kubevirt.io=virt-launcher --request-timeout=30s 2>&1 || true
+      printf '\n=== Pod events in tenant-test (not filtered to virt-launcher) ===\n'
+      timeout -k 5 30 kubectl -n tenant-test get events \
+        --field-selector involvedObject.kind=Pod \
+        --sort-by=.lastTimestamp --request-timeout=30s 2>&1 || true
+    } >"${report_dir}/POD-STATE.txt"
+  fi
+}
+
+# One bounded read of a node's cAdvisor stream, shared by every worker counter
+# capture and deliberately subject-agnostic: it fetches and reports a status,
+# and says nothing about which series the caller is after. The reasoning about
+# what each capture reads, and why from the kubelet rather than from inside the
+# container, belongs to the captures and is written above each of them.
+_cozy_cadvisor_node_stream() {
+  local node="$1"
+  local stream="$2"
+  local node_err="$3"
+  local rc=0
+
+  # One read per capture, so a node's stream is fetched once per subject rather
+  # than once in total, and once per SAMPLE where a subject is read twice. That
+  # is a real cost -- bounded by the read bound and the node cap at up to 100s
+  # per invocation, a ceiling those numbers impose rather than a measured
+  # duration -- and it is declined for a reason that outlives any particular way
+  # of sharing the read.
+  #
+  # Sharing it means the captures of one node becoming one walk, and that is not
+  # done here for scope rather than for merit: one walk behind the earliest of
+  # their gates would be cheaper AND collect more. The gate is a deadline checked
+  # with date, not a per-collector allowance, so a run yields all of them, a
+  # prefix of them, or none -- and a merged walk admitted at the earliest gate
+  # turns every prefix into all of them while leaving none unchanged. Anyone
+  # weighing this should read that as an argument for merging, not against it.
+  #
+  # A cross-phase cache avoids the merge and was tried; it is not what stands
+  # here, and the reason is not the cost above but that a cache publishes a
+  # local write failure as a statement about the cluster -- the one thing this
+  # collector may not do.
+  #
+  # The timeout-absent fallback is the sibling collectors': bounding with a
+  # binary that is not there turns every read into an exit 127 and every note
+  # into "the kubelet refused".
+  if command -v timeout >/dev/null 2>&1; then
+    timeout -k "${COZY_DIAG_READ_GRACE}" "${COZY_DIAG_READ_TIMEOUT}" \
+      kubectl get --raw "/api/v1/nodes/${node}/proxy/metrics/cadvisor" \
+      "--request-timeout=${COZY_DIAG_READ_TIMEOUT}s" \
+      >"${stream}" 2>"${node_err}" || rc=$?
+  else
+    kubectl get --raw "/api/v1/nodes/${node}/proxy/metrics/cadvisor" \
+      "--request-timeout=${COZY_DIAG_READ_TIMEOUT}s" \
+      >"${stream}" 2>"${node_err}" || rc=$?
+  fi
+  printf '%s\n' "${rc}"
+}
+
+# _cozy_capture_worker_cadvisor <subdir> <label> <subject> <series> <tmp-prefix> <tail-hook> <metric-re>
+#
+# The body every worker counter capture shares. It was two near-identical copies
+# differing in a report subdirectory, a regex, a subject phrase and a trailing
+# note, and the copies cost more than duplication normally does: the block-level
+# bound audit pins each collector by something only it produces, and two
+# collectors issuing identical reads left neither with anything of its own, so
+# stubbing one out of the audit went unnoticed. One body removes that. It does
+# not remove the second fetch -- each capture still reads the node itself, at
+# the price the budget comment states -- and why that saving is declined is
+# given where the read is.
+#
+# <subject> is the clause every "unknown" note opens with, and <series> the word
+# naming what the kubelet did or did not report. Splitting them is what keeps
+# each note a sentence about this collector's question rather than a generic one
+# -- a note that says only "no series" leaves the reader to guess which.
+_cozy_capture_worker_cadvisor() {
+  local subdir="$1"
+  local label="$2"
+  local subject="$3"
+  local series="$4"
+  local tmp_prefix="$5"
+  local tail_hook="$6"
+  local metric_re="$7"
+  # The label reads "<noun> capture" at both call sites, and three sentences
+  # want the two halves differently: "failed to list ... for <label>" wants the
+  # whole thing, while "capturing worker <noun>" and "worker <noun> capture
+  # stopped" want the noun alone. Splitting it here keeps all three grammatical
+  # without an eighth parameter that would have to agree with the seventh.
+  local subject_noun="${label% capture}"
+  local report_dir="${COZY_REPORT_DIR:-/workspace/_out/cozyreport}/snapshots/${COZY_SNAPSHOT_NAME:-kubernetes}/${subdir}"
+  local nodes node rc
+  local seen=0
+  local node_err raw stream matched filter_err filter_rc tenant_seen had_series read_at read_done
+  # The counters are per container but the endpoint is per node, so the walk is
+  # over nodes and not over Pods: one read covers every worker the node hosts.
+  # Three is the sandbox's management node count, so this cap is the whole
+  # cluster rather than a sample of it.
+  #
+  # A literal and not a knob, unlike the time bound, and the difference is what
+  # lowering would mean. Lowering a time bound costs detail inside a read that
+  # still happened; lowering this one drops nodes silently, and the capture then
+  # answers for part of the cluster while reading like it answered for all of it.
+  local max_nodes=3
+
+  mkdir -p "${report_dir}"
+  # Re-validated here rather than trusted, for the reason cozy_diag_read gives
+  # for doing the same: a value assigned after this file is sourced -- which is
+  # how both a caller and a test set it -- would otherwise reach `timeout`
+  # unchecked, and zero there disables the bound outright.
+  COZY_DIAG_READ_TIMEOUT=$(_cozy_diag_seconds "${COZY_DIAG_READ_TIMEOUT-}" "$COZY_DIAG_READ_TIMEOUT_DEFAULT" COZY_DIAG_READ_TIMEOUT positive)
+  COZY_DIAG_READ_GRACE=$(_cozy_diag_seconds "${COZY_DIAG_READ_GRACE-}" "$COZY_DIAG_READ_GRACE_DEFAULT" COZY_DIAG_READ_GRACE)
+
+  nodes=$(_cozy_virt_launcher_listing "${report_dir}" "${label}" \
+    '{range .items[*]}{.spec.nodeName}{"\n"}{end}' \
+    'no virt-launcher Pod with a node assigned in namespace tenant-test; an unscheduled Pod has no kubelet to ask') || return 1
+
+  for node in ${nodes}; do
+    seen=$((seen + 1))
+    if [ "${seen}" -gt "${max_nodes}" ]; then
+      echo "--- worker ${subject_noun} capture stopped at ${max_nodes} nodes ---"
+      printf 'capture stopped after %s nodes; %s carried a worker in total\n' \
+        "${max_nodes}" "$(printf '%s\n' "${nodes}" | wc -l | tr -d ' ')" \
+        >"${report_dir}/COLLECTION-TRUNCATED.txt"
+      break
+    fi
+    echo "--- capturing worker ${subject_noun}: ${node} ---"
+    node_err="${report_dir}/${node}.read-error.log"
+    raw="${report_dir}/${node}.txt"
+    # Outside report_dir on purpose. `rm -f` below clears it on every path this
+    # function controls, but a hard kill during the read does not run it, and a
+    # node's full cAdvisor dump is megabytes; left inside the report it would be
+    # uploaded as though it were a capture. A scratch directory is the runner's,
+    # not the artifact tree's, so a kill there costs nothing anyone reads.
+    #
+    # The template is explicit rather than a bare `mktemp`, and that is not
+    # style: BSD mktemp with no template ignores TMPDIR outright and always
+    # lands in the system directory, while GNU honours it. Given a template both
+    # put the file where the template says, so this is the only spelling whose
+    # location is the same on a developer's machine and on the runner.
+    stream=$(mktemp "${TMPDIR:-/tmp}/${tmp_prefix}.XXXXXX") \
+      || stream="${report_dir}/${node}.stream.tmp"
+    matched=$(mktemp "${TMPDIR:-/tmp}/${tmp_prefix}-m.XXXXXX") \
+      || matched="${report_dir}/${node}.matched.tmp"
+    filter_err="${report_dir}/${node}.filter-error.log"
+    # Captured whole and filtered afterwards. Piped straight into grep the
+    # status would be grep's, `timeout`'s 124 could never reach this variable,
+    # and a kubelet that never answered would arrive looking like a node with no
+    # tenant container on it.
+    #
+    # A missing RBAC grant on nodes/proxy arrives as a non-zero exit with the
+    # 403 on stderr, so it lands in the same branch as an unreachable kubelet,
+    # and the error log is what says which of them happened.
+    # Defaulted because the status now arrives through a command substitution
+    # rather than from a local set ahead of the read: a subshell killed outright
+    # returns nothing, and an empty rc turns every `[ "${rc}" -ne 0 ]` below into
+    # a shell error instead of a branch.
+    #
+    # Defaulted to 137 rather than 0, and the direction is the whole point. The
+    # case this covers is a read that was killed, and 0 is the one value that
+    # means "the kubelet answered" -- so a zero default would take the single
+    # outcome this collector may never manufacture and manufacture it. 137 is
+    # what a kill produces anyway, and the note it selects says the read did not
+    # finish, which is what was observed.
+    # Stamped on both sides of the read, and this is what makes a pair of
+    # captures subtractable. One stamp would leave the sampling instant
+    # somewhere inside a read whose duration is exactly what goes wrong on the
+    # run this collector exists for: a bound-length read stamped at its start
+    # and one stamped at its end differ by that bound, and the error lands in
+    # the interval a rate divides by. Two stamps make the uncertainty visible
+    # rather than absent, and on a healthy read they are the same second.
+    #
+    # The knob names how long this collector WAITS between its two passes,
+    # which is not the interval between two readings of
+    # the same node: each pass also walks its nodes and the pass of the other
+    # subject runs in between, so the real gap is the wait plus whatever those
+    # cost -- seconds on a healthy run and up to the read bound per read on the
+    # run this collector exists for, which is exactly the run where a rate
+    # computed from the advertised number would be wrong. Reading it off the
+    # captures needs no assumption about either.
+    read_at=$(date -u +%s)
+    rc=$(_cozy_cadvisor_node_stream "${node}" "${stream}" "${node_err}")
+    read_done=$(date -u +%s)
+    rc=${rc:-137}
+    # The filter's own failure is kept apart from "matched nothing". grep exits
+    # 1 when nothing matched and 2 when it could not read -- a full TMPDIR on
+    # the runner reaches the second -- and folded together they land in the arm
+    # that says the kubelet answered and carried no series, which is the one
+    # conflation this collector exists to prevent.
+    #
+    # All three stages are run apart rather than piped for the same reason the
+    # read above is: a pipeline carries only its LAST command's status, so a
+    # stage that could not read its input hands an empty stream to the next one,
+    # which then exits 1 for having matched nothing.
+    filter_rc=0
+    grep -E "${metric_re}" "${stream}" >"${matched}" 2>"${filter_err}" || filter_rc=$?
+    if [ "${filter_rc}" -lt 2 ]; then
+      grep 'namespace="tenant-test"' "${matched}" >"${stream}" 2>>"${filter_err}" || filter_rc=$?
+    fi
+    if [ "${filter_rc}" -lt 2 ]; then
+      grep 'pod="virt-launcher-' "${stream}" >"${raw}" 2>>"${filter_err}" || filter_rc=$?
+    fi
+    rm -f "${matched}"
+    # Read before the sink is removed, because an empty capture has two causes
+    # here and only stage 2's output separates them: a node carrying nothing of
+    # this namespace, and a namespace whose containers are none of them workers.
+    tenant_seen=0
+    if [ -s "${stream}" ]; then
+      tenant_seen=1
+    fi
+    rm -f "${stream}"
+    [ -s "${filter_err}" ] || rm -f "${filter_err}"
+    if [ ! -s "${node_err}" ]; then
+      rm -f "${node_err}"
+      node_err=
+    elif [ "${rc}" -eq 0 ]; then
+      mv "${node_err}" "${report_dir}/${node}.READ-WARNINGS.txt" 2>/dev/null || true
+      node_err=
+    fi
+    # Tested before anything is appended, or nothing is ever empty. An empty
+    # capture here is the dangerous outcome rather than a neutral one: zero
+    # bytes reads as a healthy worker, which is the very conclusion this
+    # collector was added to stop a reader reaching by default.
+    #
+    # Which arm fires is decided by the STATUS, never by whether anything landed
+    # on stderr. `timeout` kills its child without a word and kubectl dies on
+    # SIGTERM the same way, so the dominant failure here -- a wedged kubelet --
+    # arrives non-zero with an empty error log; keyed on stderr it would fall
+    # through to the arm that says the kubelet answered, and the artifact would
+    # state the opposite of what happened.
+    had_series=0
+    if [ -s "${raw}" ]; then
+      had_series=1
+    fi
+    if [ ! -s "${raw}" ] && [ "${rc}" -ne 0 ]; then
+      if [ -n "${node_err}" ]; then
+        printf '%s\n' \
+          "${subject} is unknown: the kubelet was not read; see read-error.log" \
+          >>"${raw}"
+      else
+        printf '%s\n' \
+          "${subject} is unknown: the kubelet was not read, and the read died without a word on either stream" \
+          >>"${raw}"
+      fi
+    elif [ ! -s "${raw}" ] && [ "${filter_rc}" -ge 2 ]; then
+      # Between the two kubelet rungs on purpose. The read may well have
+      # succeeded -- this says nothing about it either way, because the failure
+      # is local to this runner: grep could not read back the stream it was
+      # given. Folded into the rung below, it would assert that the kubelet
+      # answered and carried no series.
+      if [ -s "${filter_err}" ]; then
+        printf '%s\n' \
+          "${subject} is unknown: the metric stream could not be read back on this runner; see filter-error.log" \
+          >>"${raw}"
+      else
+        printf '%s\n' \
+          "${subject} is unknown: the metric stream could not be read back on this runner, and the filter said nothing about why" \
+          >>"${raw}"
+      fi
+    elif [ ! -s "${raw}" ] && [ "${tenant_seen}" -eq 1 ]; then
+      # The namespace was there and the worker Pods were not, which is what an
+      # upstream rename of the virt-launcher prefix looks like from inside. The
+      # rung below is the scheduling reading instead, and the two are fixed by
+      # looking in different places.
+      printf '%s\n' \
+        "${subject} is unknown: the kubelet answered and reported ${series} series for this namespace, none of them from a worker Pod named virt-launcher-*" \
+        >>"${raw}"
+    elif [ ! -s "${raw}" ]; then
+      printf '%s\n' \
+        "${subject} is unknown: the kubelet answered and reported no ${series} series for a tenant-test worker on this node" \
+        >>"${raw}"
+    elif [ "${rc}" -ne 0 ]; then
+      if [ -n "${node_err}" ]; then
+        printf '%s\n' \
+          'these counters are incomplete: the read was cut short part way through the metric stream; see read-error.log' \
+          >>"${raw}"
+      else
+        printf '%s\n' \
+          'these counters are incomplete: the read was cut short part way through the metric stream, without a word on either stream' \
+          >>"${raw}"
+      fi
+    elif [ "${filter_rc}" -ge 2 ]; then
+      # The same truncation one layer down: series arrived, the read was fine,
+      # and a filter stage stopped part way. A write error is where that happens
+      # -- grep emits what it had flushed and exits 2, which is how a full disk
+      # arrives. Reached only with something already in the file.
+      if [ -s "${filter_err}" ]; then
+        printf '%s\n' \
+          'these counters are incomplete: the metric stream could not be read back past this point on this runner; see filter-error.log' \
+          >>"${raw}"
+      else
+        printf '%s\n' \
+          'these counters are incomplete: the metric stream could not be read back past this point on this runner, and the filter said nothing about why' \
+          >>"${raw}"
+      fi
+    fi
+    # kubectl exits 1 for a refused connection as readily as for a 403 or a
+    # NotFound node, so the status alone names none of them and the error log is
+    # the only thing that can.
+    if [ "${rc}" -eq 124 ]; then
+      printf '%s\n' \
+        '[exit 124: this collector timing out and the read exiting 124 on its own cannot be told apart]' \
+        >>"${raw}"
+    fi
+    # 128+SIGKILL. The grace signal produces it, and so does anything else that
+    # kills the read -- an OOM killer on a loaded runner, a teardown signalling
+    # the process group -- so the note says what the status establishes and
+    # stops there. cozy_diag_read refuses the same wording for the same reason.
+    if [ "${rc}" -eq 137 ]; then
+      printf '%s\n' \
+        '[exit 137: the read was killed rather than stopping on its own; the status does not say what killed it]' \
+        >>"${raw}"
+    fi
+    # `|| true` because the hook is called bare inside the walk: a hook whose
+    # last statement is a false test returns non-zero, and under a live errexit
+    # that ends the walk part way through a node rather than at a boundary. The
+    # hooks today end on an `if` that returns 0 when its condition is false, so
+    # this changes nothing now and removes the requirement that they always will.
+    "${tail_hook}" "${raw}" "${rc}" "${filter_rc}" "${had_series}" || true
+    # Sample-agnostic on purpose. This body is shared, and only one of its
+    # callers takes a second sample: telling the reader of a caller that does not
+    # to subtract a sibling would name a file that does not exist and contradict
+    # that capture's own tail note in the line above it. What is true for every
+    # caller is when the read happened, so that is what this says, and the
+    # instruction to pair it belongs to the capture that has a pair.
+    # The bracket only, with no claim about what was sampled inside it. When the
+    # read was attempted is true on every arm, including the ones that just said
+    # nothing was read; that counters exist between the two instants is not, and
+    # the arms above are what decide that. The note that does make the claim
+    # sits behind the same clean-read gate as the pairing note.
+    printf '[read attempted from %s to %s epoch seconds]\n' \
+      "${read_at}" "${read_done}" >>"${raw}"
+    printf '\n[capture exit code: %s]\n' "${rc}" >>"${raw}"
+  done
+}
+
+# The virt-launcher listing, shared by the captures as code and issued fresh by
+# each of them: they ask the same question of the same apiserver, and the answer
+# is deliberately not carried between them, for the reason given at the read.
+# Echoes the projected field and returns non-zero when there is no walk to make,
+# with the reason written where the reader of that capture will look for it.
+#
+# The whole query is a parameter, not just the field inside it, because what a
+# caller walks is not always what it reads: a capture that talks to a kubelet
+# needs the node a worker landed on, one that talks to the container needs the
+# Pod, and one that has to reach into a container needs to skip the Pods there
+# is nothing to reach into. The sentence for an answer that named nothing
+# travels with it, since an empty listing means something different under each
+# query and a shared wording would be wrong for one of them.
+_cozy_virt_launcher_listing() {
+  local report_dir="$1"
+  local label="$2"
+  local jsonpath="$3"
+  local empty_msg="$4"
+  local err_log="${report_dir}/COLLECTION-FAILED.txt"
+  local warn_log="${report_dir}/READ-WARNINGS.txt"
+  local raw_values values
+  local list_rc=0
+
+  # stderr is kept out of the captured stdout so a warning on an otherwise
+  # healthy call is never read back as a node name, and which file it lands in
+  # is decided by the exit status rather than by something having been written:
+  # kubectl writes deprecation and partial-result warnings with a zero exit.
+  # Read first, filter after. A pipeline reports its LAST command's status, so
+  # folding the sort into this assignment would hand list_rc to `sort` and make
+  # a listing that never answered indistinguishable from a namespace with no
+  # workers in it -- the one conflation these collectors must not make.
+  if command -v timeout >/dev/null 2>&1; then
+    raw_values=$(timeout -k "${COZY_DIAG_READ_GRACE}" "${COZY_DIAG_READ_TIMEOUT}" \
+      kubectl -n tenant-test get pods -l kubevirt.io=virt-launcher \
+      -o "jsonpath=${jsonpath}" \
+      "--request-timeout=${COZY_DIAG_READ_TIMEOUT}s" 2>"${warn_log}") || list_rc=$?
+  else
+    raw_values=$(kubectl -n tenant-test get pods -l kubevirt.io=virt-launcher \
+      -o "jsonpath=${jsonpath}" \
+      "--request-timeout=${COZY_DIAG_READ_TIMEOUT}s" 2>"${warn_log}") || list_rc=$?
+  fi
+  if [ "${list_rc}" -ne 0 ]; then
+    echo "failed to list tenant virt-launcher Pods for ${label}" >&2
+    mv "${warn_log}" "${err_log}" 2>/dev/null || true
+    printf '%s\n' \
+      "failed to list tenant virt-launcher Pods for ${label} (exit ${list_rc})" \
+      >>"${err_log}"
+    return 1
+  fi
+  [ -s "${warn_log}" ] || rm -f "${warn_log}"
+  values=$(printf '%s\n' "${raw_values}" | sort -u | grep -v '^$' || true)
+  if [ -z "${values}" ]; then
+    echo "${empty_msg} (${label})" >&2
+    printf '%s\n' "${empty_msg}" >"${err_log}"
+    return 1
+  fi
+  printf '%s\n' "${values}"
+}
+
+# The one answer here that is not a failure, and until it is written down the
+# only one a reader has to derive. A capture carrying no quota, at a clean exit,
+# is a container with no CPU limit -- but it is also the shape a truncated read
+# leaves, and every other outcome gets a sentence precisely so
+# that this one is not read as that one. Keyed on the quota's absence rather
+# than on a line count, because that absence is the condition cAdvisor itself
+# gates the whole capped set on. Tested for exactly 1, which is grep's "read it,
+# no match": a bare `!` would also accept 2, and the artifact would then claim a
+# ceiling that a failed local read had merely not found.
+#
+# Decided over the whole node file rather than per container, and the file holds
+# every container of every worker Pod on that node. One quota line anywhere in
+# it suppresses the note. That is deliberately the conservative direction: the
+# note is only ever printed when nothing in the file is capped, so it cannot
+# claim "uncapped" over a file that shows a ceiling.
+_cozy_cpu_throttle_tail_note() {
+  local raw="$1" rc="$2" filter_rc="$3" had_series="$4"
+  local quota_rc=0
+
+  grep -q '^container_spec_cpu_quota{' "${raw}" || quota_rc=$?
+  if [ "${had_series}" -eq 1 ] && [ "${rc}" -eq 0 ] && [ "${filter_rc}" -lt 2 ] \
+    && [ "${quota_rc}" -eq 1 ]; then
+    printf '%s\n' \
+      'these workers are running uncapped: cAdvisor publishes the quota and the CFS counters only for a container whose quota is non-zero, so a period without them beside it is a container with no CPU limit rather than a short read' \
+      >>"${raw}"
+  fi
+  # Said here rather than in the shared walk, because this is the capture that
+  # has a sibling to subtract from. Every family above is cumulative from the
+  # container starting, so one file is an average over an uptime; the stamp on
+  # the line below and the same node's file under the other sample directory are
+  # what turn the pair into a rate.
+  # Withheld from a read that did not finish, the way the sandbox capture
+  # withholds its column legend from one. An instruction to subtract two files
+  # is a statement that both hold a whole reading, and a capture already marked
+  # incomplete does not; the two captures in this pair answer that question the
+  # same way rather than each on its own terms.
+  if [ "${had_series}" -eq 1 ] && [ "${rc}" -eq 0 ] && [ "${filter_rc}" -lt 2 ]; then
+    printf '%s\n' \
+      'these counters are cumulative since the container started: subtract this node file from its sibling under the other sample directory, and the stamps below from each other, to get a rate. The counters were sampled somewhere inside each read, so that interval is exact to the width of the two brackets' \
+      >>"${raw}"
+  fi
+}
+
+# Said in the file because the number invites the one reading it cannot support.
+# Every family here is cumulative from the Pod's sandbox starting, so a drop
+# count says nothing about the window the node-join deadline covered: a link
+# that dropped nothing while the pull stalled and one that dropped throughout
+# carry the same total whenever the earlier traffic matched. A rate needs a
+# second capture of the same stream to subtract from, and the sample time each
+# row carries as its third field is what makes two captures pairable.
+_cozy_network_counters_tail_note() {
+  local raw="$1" had_series="$4"
+
+  if [ "${had_series}" -eq 1 ]; then
+    printf '%s\n' \
+      'these counters are cumulative since the Pod sandbox started, not a rate over the failure: a second capture of the same stream is what turns them into one' \
+      >>"${raw}"
+  fi
+}
+
+# Read each tenant worker's CPU throttling counters and its CFS ceiling from
+# the kubelet's cAdvisor endpoint on the node the worker runs on.
+#
+# This exists because two different failures produce identical evidence from
+# outside the Pod. A worker that misses the node-Ready deadline while the
+# sandbox node it runs on sits at half its capacity, with a clean node dmesg,
+# is either being held at its own CFS ceiling or losing host CPU it was
+# entitled to. The ceiling itself is already in the artifact -- (a) dumps
+# `describe pods -l kubevirt.io=virt-launcher`, which prints each container's
+# Limits, and an absent Limits line is the uncapped case. What no other read
+# here answers is whether the container ever REACHED that ceiling and for how
+# long: node-level utilisation shows what the node used, and a limit shows what
+# the container was allowed, but neither says whether the two ever met. The
+# throttled counters are the only place that is recorded, and nothing else in
+# this tree collects them for the tenant workers.
+#
+# The quota and period are captured beside the counters anyway, in cgroup units
+# rather than Kubernetes ones, because a throttled-period count is unreadable
+# without the ceiling it was measured against, and a reader should not have to
+# carry a figure back from an earlier section to divide by it.
+#
+# Six families carry the answer, and cAdvisor publishes them ready to read, so
+# no arithmetic is done here and none is needed:
+#
+#   container_cpu_usage_seconds_total          CPU time the group actually got
+#   container_cpu_cfs_periods_total            periods the group was scheduled
+#   container_cpu_cfs_throttled_periods_total  of those, periods it was stopped
+#   container_cpu_cfs_throttled_seconds_total  how long it was stopped for
+#   container_spec_cpu_period                  the ceiling's period
+#   container_spec_cpu_quota                   the ceiling itself
+#
+# The throttled counters alone say a container hit some ceiling, not which one,
+# and a VM capped at one core and a VM capped at eight are the same number
+# without the quota beside them. Nor do they say what the container got: being
+# stopped at a ceiling and never being scheduled onto a physical CPU are
+# different failures that both leave throttled periods behind, and the usage
+# counter is the only one of the six that separates them. It costs a wider
+# filter rather than another read, since cAdvisor puts it on the stream this
+# capture already fetches.
+#
+# Four of the six are gated, and on the same condition. cAdvisor emits the
+# quota series and all three CFS counters only for a container whose quota is
+# non-zero; container_spec_cpu_period and container_cpu_usage_seconds_total are
+# the two it emits for any container with a CPU spec at all. So a container
+# that reports anything puts two shapes on the wire and no third: all six when
+# it is capped, the period and the usage when it is not. (A container cAdvisor
+# knows nothing about contributes none of them, and reaches this capture as the
+# same silence as a node with no worker on it.) The second is a reading rather
+# than a gap -- it is the question this collector was added to answer, and it
+# arrives without being computed.
+#
+# Worth stating because a short capture is also what a truncated read looks
+# like, and this function spends its whole length making that difference legible.
+# A reader who expected six families and found two would reach for the wrong
+# conclusion with the artifact agreeing.
+#
+# Read from the kubelet rather than from inside the container on purpose. A
+# reader that runs inside the container shares the cgroup it is measuring, so
+# it slows down exactly when the answer matters and needs a budget sized for
+# the pathological case; the kubelet is outside that cgroup and is not subject
+# to it. It also removes any dependency on what the container image happens to
+# ship and on how the host lays cgroups out, since cAdvisor reports the same
+# series under either cgroup version.
+#
+# The in-container reading does exist in this tree -- hack/e2e-capture-dataplane.sh
+# reads cpu.stat straight out of the ovs-ovn container -- and the size difference
+# between the two is the two paragraphs above, not the reading itself. That one
+# has a container it may assume (its own image, one namespace, one workload) and
+# a caller that already knows the Pod. This one is handed a node and has to find
+# the workers, tell a kubelet that never answered from a node carrying none, and
+# survive a filter that fails half way, because the whole point is to be believed
+# when it reports nothing.
+#
+# Takes the sample number it is writing, because it is called twice: the
+# counters are cumulative since the container started, so one reading gives an
+# average over the whole uptime and no reading of the failure window. Two
+# readings a fixed interval apart give a rate, and a rate is what the burst
+# profile needs -- a guest that freezes for tens of seconds and then runs at its
+# ceiling produces a low average and a high instantaneous figure, and only the
+# second of those distinguishes it from a guest that is simply capped.
+cozy_capture_tenant_worker_cpu_throttle() {
+  local sample="$1"
+  # Anchored on the metric names so a series whose name merely contains one of
+  # them cannot pass. The namespace alone is NOT a worker filter and must not be
+  # used as one: tenant-test also carries the Kamaji control plane, whose
+  # apiserver and etcd have CPU limits of their own and can be genuinely
+  # throttled, plus the CDI importer Pods. Under a heading that says "worker", a
+  # throttled apiserver answers the question with the wrong subject, so the Pod
+  # name carries the second half of the filter.
+  #
+  # Note the asymmetry, since it is the one soft spot here: the listing selects
+  # Pods by the authoritative label kubevirt.io=virt-launcher, while this matches
+  # a name prefix, because cAdvisor publishes no such label and the name is all
+  # the series carries. KubeVirt derives that prefix from the Pod it creates, so
+  # it holds today; a rename upstream would silently empty this capture rather
+  # than break it loudly.
+  _cozy_capture_worker_cadvisor \
+    "tenant-cpu-throttle/sample-${sample}" \
+    'CPU throttling counters capture' \
+    'what these workers got and whether they were throttled' \
+    CPU \
+    cozy-cpu-throttle \
+    _cozy_cpu_throttle_tail_note \
+    '^container_(cpu_(usage_seconds_total|cfs_(periods_total|throttled_periods_total|throttled_seconds_total))|spec_cpu_(period|quota))\{'
+}
+
+# Read each sandbox node's own CPU accounting, straight from its kernel.
+#
+# The captures above are about the tenant worker's cgroup: what it was allowed
+# and what it got. Neither can see the layer under the sandbox. A worker whose
+# vCPU thread is runnable and simply not scheduled looks, from the cgroup, like
+# a worker that asked for nothing -- and the two candidate explanations for that
+# are a sandbox node oversubscribed from inside and a sandbox node not given its
+# own turn by the machine running the runner. Only the second leaves a trace,
+# and it leaves it here: `steal` counts the time this kernel was runnable while
+# the hypervisor beneath it ran somebody else.
+#
+# There is no kubelet or cAdvisor route to it. The kubelet's cAdvisor and
+# summary endpoints publish container and node utilisation and neither carries a
+# steal column, which cost one measurement window already; the node's own
+# /proc/stat is the only surface with the number. crust-gather's node-shell Pod
+# is refused by PodSecurity in this cluster, so the Talos API is what remains,
+# and it is already how the report reaches these nodes for dmesg.
+#
+# Captured verbatim rather than reduced to a percentage, and the column legend
+# is written beside it rather than folded into arithmetic here. In /proc/stat's
+# cpu rows the eighth number after the label is steal and the ninth is guest,
+# guest is enormous on a node running VMs and is already counted inside user,
+# and reading the ninth as the eighth turns a fraction of a percent into
+# twenty-odd. The legend states which is which where the numbers are, so the
+# next reader does not repeat that.
+cozy_capture_sandbox_node_cpu_time() {
+  local sample="$1"
+  local report_dir="${COZY_REPORT_DIR:-/workspace/_out/cozyreport}/snapshots/${COZY_SNAPSHOT_NAME:-kubernetes}/sandbox-host-cpu-time/sample-${sample}"
+  local err_log="${report_dir}/COLLECTION-FAILED.txt"
+  local warn_log="${report_dir}/READ-WARNINGS.txt"
+  # The sandbox container carries TALOSCONFIG in its environment, so this is the
+  # path talosctl would have used on its own; naming it is what lets an absent
+  # config be reported as an absent config rather than as a node that refused.
+  local talosconfig="${TALOSCONFIG:-talosconfig}"
+  local rows node addr rc node_err raw read_at read_done
+  local list_rc=0
+  local seen=0
+  # Three is the sandbox's node count, so this cap is the whole cluster rather
+  # than a sample of it -- the same literal and the same reasoning as the walk
+  # over worker-carrying nodes above.
+  local max_nodes=3
+
+  mkdir -p "${report_dir}"
+  # Re-validated here for the reason every collector re-validates them: a value
+  # assigned after this file is sourced never passed the assignment-time check,
+  # and zero reaches `timeout` as no bound at all.
+  COZY_DIAG_READ_TIMEOUT=$(_cozy_diag_seconds "${COZY_DIAG_READ_TIMEOUT-}" "$COZY_DIAG_READ_TIMEOUT_DEFAULT" COZY_DIAG_READ_TIMEOUT positive)
+  COZY_DIAG_READ_GRACE=$(_cozy_diag_seconds "${COZY_DIAG_READ_GRACE-}" "$COZY_DIAG_READ_GRACE_DEFAULT" COZY_DIAG_READ_GRACE)
+
+  # Both preconditions are reported rather than returned into silence. An empty
+  # directory here would read as a sandbox that lost no time to its hypervisor,
+  # which is a statement about the cluster this collector never made.
+  if ! command -v talosctl >/dev/null 2>&1; then
+    echo "talosctl is not on PATH, so the sandbox nodes' CPU time was not read" >&2
+    printf '%s\n' \
+      'talosctl is not on PATH on the machine running this suite; the sandbox nodes were never asked, which is not a reading that they lost no time' \
+      >"${err_log}"
+    return 1
+  fi
+  if [ ! -f "${talosconfig}" ]; then
+    echo "no sandbox talosconfig at ${talosconfig}, so the sandbox nodes' CPU time was not read" >&2
+    printf '%s\n' \
+      "no sandbox talosconfig at ${talosconfig}; the sandbox nodes were never asked, which is not a reading that they lost no time" \
+      >"${err_log}"
+    return 1
+  fi
+
+  # Name and address in one row: the address is what the Talos API is reached
+  # on, and the name is what pairs this file with the worker captures above.
+  # stderr is kept out of the captured stdout so a warning is never read back as
+  # an address, and which file it lands in is decided by the exit status, since
+  # kubectl writes warnings with a zero exit.
+  if command -v timeout >/dev/null 2>&1; then
+    rows=$(timeout -k "${COZY_DIAG_READ_GRACE}" "${COZY_DIAG_READ_TIMEOUT}" \
+      kubectl get nodes \
+      -o jsonpath='{range .items[*]}{.metadata.name}{"|"}{.status.addresses[?(@.type=="InternalIP")].address}{"\n"}{end}' \
+      "--request-timeout=${COZY_DIAG_READ_TIMEOUT}s" 2>"${warn_log}") || list_rc=$?
+  else
+    rows=$(kubectl get nodes \
+      -o jsonpath='{range .items[*]}{.metadata.name}{"|"}{.status.addresses[?(@.type=="InternalIP")].address}{"\n"}{end}' \
+      "--request-timeout=${COZY_DIAG_READ_TIMEOUT}s" 2>"${warn_log}") || list_rc=$?
+  fi
+  if [ "${list_rc}" -ne 0 ]; then
+    echo "failed to list sandbox nodes for the CPU time capture" >&2
+    mv "${warn_log}" "${err_log}" 2>/dev/null || true
+    printf '%s\n' \
+      "failed to list sandbox nodes for the CPU time capture (exit ${list_rc})" \
+      >>"${err_log}"
+    return 1
+  fi
+  [ -s "${warn_log}" ] || rm -f "${warn_log}"
+  if [ -z "${rows}" ]; then
+    echo "the sandbox node listing answered and named no node" >&2
+    printf '%s\n' \
+      'the node listing answered and named no node at all, so nothing was asked; a cluster with nodes cannot produce this' \
+      >"${err_log}"
+    return 1
+  fi
+
+  # Split on the separator rather than on whitespace. A node with more than one
+  # InternalIP -- a dual-stack cluster -- puts both addresses in the same field,
+  # space separated, and a whitespace walk would turn the second one into a row
+  # of its own: a bogus per-node file, counted against the cap, displacing a real
+  # node. The first address is the one used, and it is taken explicitly.
+  while IFS='|' read -r node addr; do
+    [ -n "${node}" ] || continue
+    addr="${addr%% *}"
+    seen=$((seen + 1))
+    if [ "${seen}" -gt "${max_nodes}" ]; then
+      echo "--- sandbox node CPU time capture stopped at ${max_nodes} nodes ---"
+      # Counted over lines, with the expansion quoted, for the same reason the
+      # walk above strips all but the first address: one row is one node, and a
+      # dual-stack node carries two addresses in it. Unquoted this counts
+      # addresses, so the marker that exists to say "truncated, not small"
+      # would overstate the pool it truncated.
+      printf 'capture stopped after %s nodes; %s were listed in total\n' \
+        "${max_nodes}" "$(printf '%s\n' "${rows}" | grep -c . || true)" \
+        >"${report_dir}/COLLECTION-TRUNCATED.txt"
+      break
+    fi
+    raw="${report_dir}/${node}.txt"
+    # A node with no InternalIP is a finding rather than a node to skip: the
+    # Talos API is reached on that address, so its absence is why this node was
+    # not read, and an absent file would say nothing at all.
+    if [ -z "${addr}" ]; then
+      printf '%s\n' \
+        'this node reports no InternalIP, and the Talos API is reached on that address, so it was not asked' \
+        >"${raw}"
+      continue
+    fi
+    echo "--- capturing sandbox node CPU time: ${node} (${addr}) ---"
+    node_err="${report_dir}/${node}.read-error.log"
+    rc=0
+    # Stamped before the read for the reason the sibling capture states at its
+    # own stamp, and here it is the only timing there is: a cAdvisor row carries
+    # its own sample time and a /proc/stat row carries none, so without this the
+    # gap between two readings of this node is unrecoverable from the artifact.
+    read_at=$(date -u +%s)
+    # The endpoint and the node are both the address: the e2e talosconfig
+    # carries no endpoints, which is why the report's own Talos reads pass -e
+    # and -n together, and one without the other reaches nothing.
+    if command -v timeout >/dev/null 2>&1; then
+      # stdin closed explicitly: this walk is driven by a heredoc, so anything
+      # here that read stdin would eat the remaining rows and the walk would
+      # stop after one node with no truncation marker -- answering for part of
+      # the cluster while reading like it answered for all of it, which is the
+      # outcome the cap above exists to make impossible. talosctl does not read
+      # stdin today; this costs nothing and does not depend on that staying true.
+      timeout -k "${COZY_DIAG_READ_GRACE}" "${COZY_DIAG_READ_TIMEOUT}" \
+        talosctl --talosconfig "${talosconfig}" -e "${addr}" -n "${addr}" \
+        read /proc/stat >"${raw}" 2>"${node_err}" </dev/null || rc=$?
+    else
+      talosctl --talosconfig "${talosconfig}" -e "${addr}" -n "${addr}" \
+        read /proc/stat >"${raw}" 2>"${node_err}" </dev/null || rc=$?
+    fi
+    read_done=$(date -u +%s)
+    if [ ! -s "${node_err}" ]; then
+      rm -f "${node_err}"
+      node_err=
+    elif [ "${rc}" -eq 0 ]; then
+      mv "${node_err}" "${report_dir}/${node}.READ-WARNINGS.txt" 2>/dev/null || true
+      node_err=
+    fi
+    # Tested before anything is appended, or nothing is ever empty. Which arm
+    # fires is decided by the status and not by whether stderr holds anything:
+    # `timeout` kills its child without a word, so the dominant failure arrives
+    # non-zero with an empty error log, and keyed on stderr it would land in the
+    # arm that says the node answered.
+    if [ ! -s "${raw}" ] && [ "${rc}" -ne 0 ]; then
+      if [ -n "${node_err}" ]; then
+        printf '%s\n' \
+          'this node CPU time is unknown: the Talos API was not read; see the read-error.log beside this file, named for the same node' \
+          >>"${raw}"
+      else
+        printf '%s\n' \
+          'this node CPU time is unknown: the Talos API was not read, and the read died without a word on either stream' \
+          >>"${raw}"
+      fi
+    elif [ ! -s "${raw}" ]; then
+      printf '%s\n' \
+        'this node CPU time is unknown: the read succeeded and returned nothing, which /proc/stat on a running kernel cannot produce' \
+        >>"${raw}"
+    elif [ "${rc}" -ne 0 ]; then
+      printf '%s\n' \
+        'these counters are incomplete: the read was cut short part way through /proc/stat' \
+        >>"${raw}"
+    else
+      printf '%s\n' \
+        '[the cpu rows above are, after the label: user nice system idle iowait irq softirq steal guest guest_nice, in USER_HZ. The eighth number is steal and the ninth is guest; guest is large on a node running VMs and is already counted inside user, so reading the ninth as the eighth turns a fraction of a percent of steal into twenty-odd. A steal of zero here means this node was given every turn it asked for, not that the column is unavailable: the sandbox VMs are started with accel=kvm and -cpu host by hack/e2e-prepare-cluster.bats, where KVM exposes steal-time accounting to the guest]' \
+        >>"${raw}"
+      # Only here, beside the legend, and for the reason the legend is only
+      # here. Telling a reader to subtract two files asserts that both hold a
+      # whole reading. On the arm above it the file holds a prefix, and the
+      # difference understates the counter by whatever the read did not return;
+      # on the arms above that it holds no counters at all, and the difference
+      # is the sibling's entire cumulative value read as a delta -- a steal
+      # figure inflated to the node's whole uptime, which is the finding this
+      # collector exists to look for. The cpu-throttle side withholds its own
+      # pairing note on the same condition.
+      printf '%s\n' \
+        'subtracting this node file from its sibling under the other sample directory, and the stamps below from each other, gives a rate. The counters were sampled somewhere inside each read, so that interval is exact to the width of the two brackets' \
+        >>"${raw}"
+    fi
+    printf '[read attempted from %s to %s epoch seconds]\n' \
+      "${read_at}" "${read_done}" >>"${raw}"
+    printf '\n[capture exit code: %s]\n' "${rc}" >>"${raw}"
+  done <<EOF
+${rows}
+EOF
+}
+
+# The walk over a mounted debugfs that turns the kernel's KVM counters into
+# lines, taking the mount point as its first argument.
+#
+# A function emitting a program rather than a literal at the call site, for the
+# reason the thread walk beside it is written the same way: staging a subject
+# worth reading needs a hypervisor, and the outcomes this has to get right --
+# counters present, kvm directory absent, directory present and empty -- are
+# reachable against a tree of files and against nothing else.
+#
+# Nothing is computed here. Each counter goes out under the level it was read
+# at, because debugfs publishes the same names twice: once summed over every VM
+# the kernel hosts and once per VM. Folded together they answer neither
+# question.
+_cozy_kvm_stats_probe() {
+  cat <<'PROBE'
+kvm_root="${1}/kvm"
+globals=0
+vm_lines=0
+vms=0
+skipped=0
+if [ ! -d "${kvm_root}" ]; then
+  printf '%s\n' "NO-KVM-DIR: debugfs is mounted and holds no kvm directory, so this kernel has no KVM in use. The sandbox VMs are started with accel=kvm by hack/e2e-prepare-cluster.bats, so this is a statement about how they are being run rather than a capture that came up short"
+  exit 4
+fi
+printf '%s\n' '[counters follow, one per line, as: level name value; a file under these directories that is not a counter is named on a skipped line instead]'
+# A counter is one integer and nothing else, and that shape is what decides
+# whether a file here ends up in the numbers. It cannot decide whether the file
+# gets read, which is a separate job done by name above, because for a seq_file
+# the reading is the cost.
+#
+# `read` returning non-zero is not what decides whether a line arrived: it does
+# that on a last line with no newline while still setting the variable. The
+# kernel's own stat files do carry the newline, since it formats them through
+# "%llu\n", but this walks whatever the directory holds rather than a list of
+# names it was given.
+# The files that must not be OPENED, as opposed to the ones that must not be
+# emitted. Those are two different jobs and only one of them a shape test can
+# do: mmu_rmaps_stat is registered with single_open() and seq_read, so the walk
+# over every rmap head under the VM slots_lock and MMU write lock runs on the
+# first read() rather than at open, and a reader that opens the file to find out
+# what shape it is has already paid for it. Hence a name, checked before
+# anything is opened, even though a name is a property of the kernel version
+# where a shape is a property of the class. The shape test below stays as the
+# general net: it keeps an unknown non-counter out of the artifact, which is all
+# it can do, and this list keeps the one known expensive read from happening.
+is_known_non_counter() {
+  case "$1" in
+    mmu_rmaps_stat) return 0 ;;
+  esac
+  return 1
+}
+read_counter() {
+  counter_value=
+  # Status 2 keeps "could not be read" apart from "read, wrong shape", and one
+  # command carries both ways the first can happen: the open is refused in the
+  # instant a VM's debugfs entry is being removed, and a file that did open
+  # keeps refusing the read for the whole teardown once its entry is detached.
+  # A file that fails either way may well be a counter whose VM is going away,
+  # and saying "not a counter" about it would send the reader away from exactly
+  # the per-VM files the legend tells them to consult when a guest disappears.
+  _content=$(cat "$1" 2>/dev/null) || return 2
+  case "${_content}" in
+    '' | *[!0-9]*) return 1 ;;
+  esac
+  counter_value=${_content}
+}
+for stat_file in "${kvm_root}"/*; do
+  [ -f "${stat_file}" ] || continue
+  stat_name=${stat_file##*/}
+  if is_known_non_counter "${stat_name}"; then
+    skipped=$((skipped + 1))
+    printf '[skipped global] %s: not opened, it is a known non-counter and reading it costs the guest\n' "${stat_name}"
+  elif read_counter "${stat_file}"; then
+    globals=$((globals + 1))
+    printf '[global] %s %s\n' "${stat_name}" "${counter_value}"
+  else
+    case "$?" in
+      2) skip_why='could not be read, so nothing about its shape is known' ;;
+      *) skip_why='not a single integer, so not a counter' ;;
+    esac
+    skipped=$((skipped + 1))
+    printf '[skipped global] %s: %s\n' "${stat_name}" "${skip_why}"
+  fi
+done 2>/dev/null
+# On the loop as well as inside read_counter's own silencing: a counter that
+# disappears between the glob and the read is routine -- a VM directory goes
+# when its VM does -- and this probe's stderr is the collector's warning
+# artifact, which must not name something that did not affect the reading.
+for vm_dir in "${kvm_root}"/*/; do
+  [ -d "${vm_dir}" ] || continue
+  vm_name=${vm_dir%/}
+  vm_name=${vm_name##*/}
+  vms=$((vms + 1))
+  for stat_file in "${vm_dir}"*; do
+    [ -f "${stat_file}" ] || continue
+    stat_name=${stat_file##*/}
+    if is_known_non_counter "${stat_name}"; then
+      skipped=$((skipped + 1))
+      printf '[skipped vm %s] %s: not opened, it is a known non-counter and reading it costs the guest\n' "${vm_name}" "${stat_name}"
+    elif read_counter "${stat_file}"; then
+      vm_lines=$((vm_lines + 1))
+      printf '[vm %s] %s %s\n' "${vm_name}" "${stat_name}" "${counter_value}"
+    else
+      case "$?" in
+        2) skip_why='could not be read, so nothing about its shape is known' ;;
+        *) skip_why='not a single integer, so not a counter' ;;
+      esac
+      skipped=$((skipped + 1))
+      printf '[skipped vm %s] %s: %s\n' "${vm_name}" "${stat_name}" "${skip_why}"
+    fi
+  done
+done 2>/dev/null
+printf '[counters read: %s kernel-wide and %s per-VM, across %s per-VM director(ies); %s file(s) skipped, each with its reason beside it above]\n' \
+  "${globals}" "${vm_lines}" "${vms}" "${skipped}"
+# On counters rather than on directories. A VM that goes away under the walk
+# leaves a directory whose files cannot be read, which is indistinguishable on
+# disk from a VM that reported nothing -- and counted as a directory it would
+# satisfy this test while the capture holds no number at all, then carry the
+# legend telling a reader to difference it against its sibling.
+if [ "${globals}" -eq 0 ] && [ "${vm_lines}" -eq 0 ]; then
+  # A kvm directory that could be opened and held nothing readable. Without
+  # this the probe exits clean carrying only a heading, a heading is enough to
+  # make the capture non-empty, and the collector would pin a legend about
+  # taking differences onto a file with nothing to difference.
+  printf '%s\n' 'NO-COUNTER-FILES: the kvm directory was opened and not one counter under it could be read, so this says nothing about what the kernel paid'
+  exit 5
+fi
+PROBE
+}
+
+# The KVM exit counters of the kernel the sandbox VMs run on.
+#
+# This exists because every other CPU reading in this tree measures a subject
+# inside the sandbox and none of them can price a tick. The cgroup captures say
+# what a tenant worker was allowed and what it consumed; the per-thread split
+# says which QEMU thread consumed it; the node's own /proc/stat says whether the
+# sandbox node was given its turn. All of them can be healthy at once -- quota
+# untouched, steal at zero, the vCPU thread at its ceiling -- while the guest
+# does six to ten times less work per core than the same image does on a run
+# that passes. Ticks handed out and work not done is not a quantity any counter
+# inside the sandbox holds.
+#
+# It is held one layer down. A tenant worker is a guest of a sandbox node, which
+# is itself a guest of the runner, and the arrangement's cost is paid by the
+# runner's kernel: every exit a sandbox node takes, every nested page fault, and
+# every TLB flush that servicing its own guest provokes. That kernel publishes
+# the totals in debugfs, and the suite runs in a container sharing it, so this
+# is a local read rather than a walk over nodes -- which is also why it can be
+# afforded at all. The reading it does NOT give is the other half: a tenant
+# worker's exits into its sandbox node are counted by that node's kernel, and
+# reaching those costs a bounded read per node per sample, which the phase
+# budget in hack/run-kubernetes-node-join_test.bats does not have.
+#
+# Mounted in a mount namespace of this call's own rather than in the sandbox's.
+# The suite keeps running for the length of a node-join wait after this returns,
+# and a mount left behind would be a diagnostic editing the environment the rest
+# of the run measures. The namespace also removes the unmount: there is nothing
+# to clean up after a read the wrapper killed, which is the arm where a
+# collector that unmounts itself would leak.
+#
+# Takes the sample number it is writing, because it is called twice and the two
+# calls sit on either side of the node-join wait rather than inside one block.
+# A counter here accumulates over the life of the VM it belongs to, so a single
+# reading is an average over that life rather than a rate over anything; the
+# pair spans the window the guest was failing to boot in, and the stamps in each
+# file are what say how wide that window was. What the kernel-wide files add on
+# top of that is stated in the legend they ship with rather than here, because
+# it changes what a difference means rather than how wide the window is.
+cozy_capture_sandbox_kvm_exits() {
+  local sample="$1"
+  local report_dir="${COZY_REPORT_DIR:-/workspace/_out/cozyreport}/snapshots/${COZY_SNAPSHOT_NAME:-kubernetes}/sandbox-kvm-exits/sample-${sample}"
+  local raw="${report_dir}/kvm-stats.txt"
+  local err_log="${report_dir}/COLLECTION-FAILED.txt"
+  local read_log="${report_dir}/read-error.log"
+  local rc=0
+  local counters_present=0
+  local program read_at read_done
+  # The mount point, and the seam that lets the walk above be exercised against
+  # a tree of files instead of against a kernel. Production never sets it: the
+  # path is where debugfs belongs, and mounting there inside a private namespace
+  # is invisible outside this call.
+  local mount_point="${COZY_DIAG_KVM_DEBUGFS:-/sys/kernel/debug}"
+
+  # Checked, unlike its neighbours, because this is the one failure the markers
+  # below cannot describe: with no directory every write under it fails, the
+  # collector becomes a silent no-op, and the artifact carries the empty space
+  # this capture exists to refuse -- with nowhere to put a marker saying so.
+  if ! mkdir -p "${report_dir}"; then
+    echo "the report directory for the sandbox KVM counters could not be created, so nothing was read and nothing could be written to say so" >&2
+    return 1
+  fi
+  # Re-validated here for the reason every collector re-validates them: a value
+  # assigned after this file is sourced never passed the assignment-time check,
+  # and zero reaches `timeout` as no bound at all.
+  COZY_DIAG_READ_TIMEOUT=$(_cozy_diag_seconds "${COZY_DIAG_READ_TIMEOUT-}" "$COZY_DIAG_READ_TIMEOUT_DEFAULT" COZY_DIAG_READ_TIMEOUT positive)
+  COZY_DIAG_READ_GRACE=$(_cozy_diag_seconds "${COZY_DIAG_READ_GRACE-}" "$COZY_DIAG_READ_GRACE_DEFAULT" COZY_DIAG_READ_GRACE)
+
+  # Both preconditions are reported rather than returned into silence, and both
+  # say the same thing in their own words: nothing was asked, which is not a
+  # reading that the arrangement cost the kernel nothing.
+  if ! command -v unshare >/dev/null 2>&1; then
+    echo "unshare is not on PATH, so the sandbox kernel's KVM counters were not read" >&2
+    printf '%s\n' \
+      'unshare is not on PATH, so debugfs could not be mounted in a namespace of this capture own and the counters were never asked for; that is not a reading that nesting cost it nothing' \
+      >"${err_log}"
+    return 1
+  fi
+  if ! command -v mount >/dev/null 2>&1; then
+    echo "mount is not on PATH, so the sandbox kernel's KVM counters were not read" >&2
+    printf '%s\n' \
+      'mount is not on PATH, so debugfs was never mounted and the counters were never asked for; that is not a reading that nesting cost it nothing' \
+      >"${err_log}"
+    return 1
+  fi
+
+  program="if ! mount -t debugfs none \"\${1}\"; then exit 3; fi
+$(_cozy_kvm_stats_probe)"
+
+  echo "--- capturing the sandbox kernel's KVM exit counters (sample ${sample}) ---"
+  # Stamped around the read rather than inside it, and here the stamps are the
+  # only timing there is: a debugfs counter carries no sample time, and the two
+  # readings of this pair are separated by the node-join wait rather than by a
+  # knob, so without these the interval the pair spans is unrecoverable from the
+  # artifact.
+  read_at=$(date -u +%s)
+  # stdin closed explicitly for the reason the node walk above states: nothing
+  # here reads it today, and a program that started to would consume whatever
+  # the caller was iterating.
+  if command -v timeout >/dev/null 2>&1; then
+    timeout -k "${COZY_DIAG_READ_GRACE}" "${COZY_DIAG_READ_TIMEOUT}" \
+      unshare --mount --propagation private \
+      sh -c "${program}" cozy-kvm-exits "${mount_point}" \
+      >"${raw}" 2>"${read_log}" </dev/null || rc=$?
+  else
+    unshare --mount --propagation private \
+      sh -c "${program}" cozy-kvm-exits "${mount_point}" \
+      >"${raw}" 2>"${read_log}" </dev/null || rc=$?
+    # Said in the capture and not only in the phase log: the warning that
+    # names unbounded collectors fires inside the diagnostics phase, and two
+    # of the three readings this pair takes run outside it.
+    printf '%s\n' '[bounds] timeout is not on PATH here, so the reads this capture takes ran with no ceiling]' >>"${raw}" 2>/dev/null || true
+  fi
+  read_done=$(date -u +%s)
+
+  # Emptied rather than only removed, because the arms below decide what to tell
+  # the reader by whether there is an error log to send them to, and a variable
+  # still holding the path of a file that is gone points at nothing.
+  if [ ! -s "${read_log}" ]; then
+    rm -f "${read_log}"
+    read_log=
+  elif [ "${rc}" -eq 0 ] || [ "${rc}" -eq 4 ] || [ "${rc}" -eq 5 ]; then
+    # mount writes hints to stderr and exits zero, the way kubectl and talosctl
+    # do beside it. Which file the complaint lands in is decided by the status,
+    # not by whether stderr holds anything, so a healthy capture keeps its
+    # warning instead of shipping a failure marker next to a reading.
+    mv "${read_log}" "${report_dir}/READ-WARNINGS.txt" 2>/dev/null || true
+    read_log=
+  fi
+
+  # Whether a counter reached the file, which is a different question from
+  # whether the file has bytes in it. The probe writes its heading before it
+  # reads anything, so a walk killed on its first blocked read leaves a file
+  # that is not empty and holds no number; keyed on size, the arms below would
+  # call that a partial reading, and the caller would be told a pair was
+  # collected. Same distinction the probe makes one level down when it counts
+  # counters rather than the directories they sit in.
+  if grep -q -e '^\[global\] ' -e '^\[vm ' "${raw}" 2>/dev/null; then
+    counters_present=1
+  fi
+
+  # How to read the numbers goes on every capture that holds numbers, which is a
+  # wider set than the captures holding a whole reading. The naming trap and the
+  # anonymity of the per-VM split do not depend on the walk having finished, and
+  # a capture cut short is exactly where a reader needs them. Only the
+  # instruction to difference two files asserts completeness, and that one stays
+  # on the arm below that has it.
+  if [ "${counters_present}" -ne 0 ]; then
+    printf '%s\n' \
+      '[these counters belong to the kernel that hosts the sandbox VMs and not what runs inside them: this suite runs in a container sharing the runner kernel, which is the hypervisor for the Talos nodes hack/e2e-prepare-cluster.bats starts with accel=kvm. An exit counted here is a sandbox node leaving its guest mode, so the cost of running a tenant worker inside that node is paid here too -- while the worker own exits into its sandbox node are counted by that node kernel, which this file does not read]' \
+      '[what a difference between the two samples means depends on the level. A per-VM file is cumulative since that VM was created. A kernel-wide file is not an accumulator at all: the kernel answers it by summing the same counter over the VMs alive at the moment of the read, so a VM that went away between the samples takes its whole contribution with it. What the survivors accumulated in the meantime competes with that loss, so the difference is understated by a whole VM life while its sign proves nothing when positive. When it does come out negative, that is a finding about the sandbox -- a guest disappeared, since no per-vCPU counter ever decreases -- and not a rate; read the per-VM files beside it to see which one went]' \
+      '[and several of these are not counts at all, sitting in the same directory under the same kind of name: guest_mode and blocking are per-vCPU booleans that every file here sums, so a reading is the number of vCPUs in that state at that instant -- bounded by the vCPU count, not by 1 -- while pages_4k, pages_2m, pages_1g, mmu_unsync and nx_lpage_splits are instantaneous, and max_mmu_rmap_size and max_mmu_page_hash_collisions are running maxima. A difference of any of those is a number with no meaning. Which kind a counter is comes from the kernel own descriptor tables in arch/x86/kvm/x86.c and include/linux/kvm_host.h and from nothing visible here, so read this as the names present when it was written rather than as a closed set]' \
+      '[not every file in these directories is a counter, and the ones that are not are named on a skipped line above. Two different reasons appear there. mmu_rmaps_stat, which the kernel puts in every per-VM directory, is skipped by name and is never opened: it is a seq_file whose contents are computed on the first read, under that VM slots_lock and its MMU write lock, walking every rmap head -- so a reader that opened it to see what shape it was would already have stalled the guest page faults of the VM this capture exists to observe. Anything else that turns out not to hold exactly one integer is skipped after being read, which keeps it out of the numbers but cannot make its read free]' \
+      '[there is no ept_violation counter here to look for. The nested-paging faults are counted as pf_taken and pf_fixed, under those names on both vendors, so a reader who searches for the Intel spelling concludes the capture is missing what it holds]' \
+      '[a per-VM directory is named <pid>-<fd> with the pid in the kernel initial namespace, which this container cannot map to its own processes: /proc/<pid>/sched and NSpid both answer with the container-local number. So the split is per-VM and anonymous -- it says how evenly the sandbox VMs paid, not which sandbox node paid what]' \
+      >>"${raw}"
+  fi
+
+  case "${rc}" in
+    0)
+      # The pairing instruction is the one line that stays on this arm, for the
+      # reason the node CPU time capture withholds its own: telling a reader to
+      # subtract two files asserts that both hold a whole reading.
+      #
+      # Unconditional on this arm, and deliberately not also gated on
+      # counters_present. A zero status means the probe read counters, because
+      # the probe exits 4 or 5 when it did not -- so the second test would be
+      # unreachable, and an unreachable guard here is not free: it would absorb
+      # those exit codes, leaving nothing that notices if the probe ever stopped
+      # honouring them. The codes are pinned directly instead, by the two tests
+      # that read them out of the capture.
+      printf '%s\n' \
+        '[subtracting this file from its sibling under the other sample directory, and the stamps below from each other, gives a rate. The two readings are taken on either side of the node-join wait, so the interval is that window rather than a fixed knob, and it is exact to the width of the two brackets]' \
+        >>"${raw}"
+      ;;
+    3)
+      echo "debugfs could not be mounted, so the sandbox kernel's KVM counters were not read" >&2
+      # Branched on whether there is a message, because the sentence below
+      # points at one. mount almost always writes a reason and exits non-zero,
+      # but a refusal that says nothing leaves this marker holding a single line
+      # telling the reader to look above it at an empty file -- the same shape
+      # of promise-without-a-referent that the arms further down avoid.
+      if [ -n "${read_log}" ]; then
+        mv "${read_log}" "${err_log}" 2>/dev/null || true
+        read_log=
+        printf '%s\n' \
+          'debugfs could not be mounted, so the counters were never reached; the message above is what mount said. This is not a kernel that was asked and had nothing to report' \
+          >>"${err_log}"
+      else
+        printf '%s\n' \
+          'debugfs could not be mounted, so the counters were never reached, and mount refused without a word on either stream. This is not a kernel that was asked and had nothing to report' \
+          >>"${err_log}"
+      fi
+      printf '%s\n' \
+        'these counters are unavailable: debugfs could not be mounted, and the failure is recorded beside this file' \
+        >>"${raw}"
+      ;;
+    4 | 5) : ;;
+    *)
+      # Four arms rather than two, and the pair of questions they answer are
+      # independent: whether a counter reached the file, and whether the read
+      # left a message anywhere. Told only the first, a reader goes looking for
+      # an explanation in the job log of a run that may be days old; told only
+      # the second, they cannot tell a capture worth differencing from one that
+      # holds nothing.
+      if [ "${counters_present}" -ne 0 ] && [ -n "${read_log}" ]; then
+        printf '%s\n' \
+          'these counters are incomplete: the walk was cut short part way through the kvm directory, so a difference against the sibling sample understates every counter it did not reach; what the read said before it stopped is in the read-error.log beside this file' \
+          >>"${raw}"
+      elif [ "${counters_present}" -ne 0 ]; then
+        printf '%s\n' \
+          'these counters are incomplete: the walk was cut short part way through the kvm directory, so a difference against the sibling sample understates every counter it did not reach, and it stopped without a word on either stream' \
+          >>"${raw}"
+      elif [ -n "${read_log}" ]; then
+        printf '%s\n' \
+          'these counters are unavailable: the read produced no counter at all; what it said before it stopped is in the read-error.log beside this file' \
+          >>"${raw}"
+      else
+        printf '%s\n' \
+          'these counters are unavailable: the read produced no counter at all and stopped without a word on either stream, so what the kernel paid is not recorded here either way' \
+          >>"${raw}"
+      fi
+      ;;
+  esac
+  printf '[read attempted from %s to %s epoch seconds]\n' \
+    "${read_at}" "${read_done}" >>"${raw}"
+  printf '\n[capture exit code: %s]\n' "${rc}" >>"${raw}"
+  # Non-zero when the capture holds no counter, and only then -- whether that is
+  # a read that failed or a kernel that answered and had none. Both callers ask
+  # this function whether it collected something to pair with, and one of them
+  # runs on the passing path where the report is the artifact nobody downloads,
+  # so a capture holding no number has to answer out loud or the warning saying
+  # the pair is broken never prints. That covers the two findings as well by
+  # design: a kernel with no kvm directory at all is the most consequential
+  # thing this instrument can report, and reaching only the report would be the
+  # quietest possible place to put it. A capture cut short after it wrote
+  # counters is the case this does NOT cover: it left a usable reading, marked
+  # as partial, and telling the caller nothing was collected would contradict
+  # the file sitting beside it.
+  if [ "${rc}" -eq 3 ] || [ "${counters_present}" -eq 0 ]; then
+    return 1
+  fi
+}
+
+# The CPU time of the kernel one layer ABOVE the sandbox nodes.
+#
+# Every other CPU reading in this file has a subject inside the sandbox: a
+# cgroup, a thread, a sandbox node's own /proc/stat. None of them can price the
+# layers above, and that is where this suite's own tax is paid -- the sandbox
+# nodes' guest time is charged to the runner kernel as user time, and whatever
+# the runner VM loses to the machine hosting IT is charged to nobody the sandbox
+# can see.
+#
+# /proc/stat is not namespaced, so a container reading it reads the kernel it
+# runs on. The suite runs in a container on the runner VM, so this is a local
+# read of the runner VM's own kernel and costs one open.
+#
+# What it answers that nothing else here does is steal. A sandbox node reporting
+# steal 0 says the runner kernel gave it every turn it asked for, and says
+# nothing about whether the runner VM itself was given every turn: that number
+# exists only here, and it is the one that separates "this suite is slow" from
+# "this machine was sharing a core with somebody else".
+cozy_capture_runner_kernel_cpu_time() {
+  local sample="$1"
+  local report_dir="${COZY_REPORT_DIR:-/workspace/_out/cozyreport}/snapshots/${COZY_SNAPSHOT_NAME:-kubernetes}/runner-kernel-cpu-time/sample-${sample}"
+  local raw="${report_dir}/proc-stat.txt"
+  local err_log="${report_dir}/COLLECTION-FAILED.txt"
+  local read_log="${report_dir}/read-error.log"
+  local rc=0
+  local rows_present=0
+  local read_at read_done
+  # The file to read, and the seam that lets the arms below be exercised against
+  # a staged file instead of against a kernel. Production never sets it.
+  local stat_file="${COZY_DIAG_RUNNER_PROC_STAT:-/proc/stat}"
+
+  # Checked, unlike its neighbours, because this is the one failure the markers
+  # below cannot describe: with no directory every write under it fails, the
+  # collector becomes a silent no-op, and the artifact carries the empty space
+  # this capture exists to refuse -- with nowhere to put a marker saying so.
+  if ! mkdir -p "${report_dir}"; then
+    echo "the report directory for the runner kernel CPU time could not be created, so nothing was read and nothing could be written to say so" >&2
+    return 1
+  fi
+  # Re-validated here for the reason every collector re-validates them: a value
+  # assigned after this file is sourced never passed the assignment-time check,
+  # and zero reaches `timeout` as no bound at all.
+  COZY_DIAG_READ_TIMEOUT=$(_cozy_diag_seconds "${COZY_DIAG_READ_TIMEOUT-}" "$COZY_DIAG_READ_TIMEOUT_DEFAULT" COZY_DIAG_READ_TIMEOUT positive)
+  COZY_DIAG_READ_GRACE=$(_cozy_diag_seconds "${COZY_DIAG_READ_GRACE-}" "$COZY_DIAG_READ_GRACE_DEFAULT" COZY_DIAG_READ_GRACE)
+
+  echo "--- capturing the runner kernel's CPU time (sample ${sample}) ---"
+  # Stamped around the read, and here the stamps are the only timing there is: a
+  # /proc/stat row carries no sample time, and the two readings of this pair are
+  # separated by the node-join wait rather than by a knob, so without these the
+  # interval the pair spans is unrecoverable from the artifact.
+  read_at=$(date -u +%s)
+  # stdin closed explicitly for the reason the walks above state: nothing here
+  # reads it today, and a program that started to would consume whatever the
+  # caller was iterating.
+  if command -v timeout >/dev/null 2>&1; then
+    timeout -k "${COZY_DIAG_READ_GRACE}" "${COZY_DIAG_READ_TIMEOUT}" \
+      cat "${stat_file}" >"${raw}" 2>"${read_log}" </dev/null || rc=$?
+  else
+    cat "${stat_file}" >"${raw}" 2>"${read_log}" </dev/null || rc=$?
+    # Said in the capture and not only in the phase log: the warning that
+    # names unbounded collectors fires inside the diagnostics phase, and two
+    # of the three readings this pair takes run outside it.
+    printf '%s\n' '[bounds] timeout is not on PATH here, so the reads this capture takes ran with no ceiling]' >>"${raw}" 2>/dev/null || true
+  fi
+  read_done=$(date -u +%s)
+
+  # Emptied rather than only removed, because the arms below decide what to tell
+  # the reader by whether there is an error log to send them to, and a variable
+  # still holding the path of a file that is gone points at nothing.
+  if [ ! -s "${read_log}" ]; then
+    rm -f "${read_log}"
+    read_log=
+  elif [ "${rc}" -eq 0 ]; then
+    # A read that succeeded and still said something keeps its message beside the
+    # capture rather than inside it, the way every other reader here does.
+    mv "${read_log}" "${report_dir}/READ-WARNINGS.txt" 2>/dev/null || true
+    read_log=
+  fi
+
+  # Whether a CPU row reached the file, which is a different question from
+  # whether the file has bytes in it: /proc/stat carries intr, ctxt and btime
+  # rows as well, and a read cut off after those holds numbers and no CPU time
+  # at all. Keyed on size, the arms below would call that a reading.
+  if grep -q '^cpu' "${raw}" 2>/dev/null; then
+    rows_present=1
+  fi
+
+  # How to read the numbers goes on every capture that holds numbers, which is a
+  # wider set than the captures holding a whole reading: the column trap and the
+  # layer these rows belong to do not depend on the read having finished, and a
+  # capture cut short is exactly where a reader needs them.
+  if [ "${rows_present}" -ne 0 ]; then
+    printf '%s\n' \
+      '[these rows belong to the RUNNER VM kernel, one layer above the sandbox nodes: /proc/stat is not namespaced, so this container reads the kernel it runs on, which is the hypervisor hack/e2e-prepare-cluster.bats starts the three Talos nodes on with accel=kvm. The sandbox nodes report their own /proc/stat one layer down, under sandbox-host-cpu-time, and no capture in this report reads /proc/stat inside a tenant worker at all -- what sits under tenant-cpu-throttle and tenant-thread-cpu is cgroup and per-thread accounting, not this file. Reading these rows as a sandbox node compares a hypervisor against its guest]' \
+      '[the cpu rows above are, after the label: user nice system idle iowait irq softirq steal guest guest_nice, in USER_HZ. The eighth number is steal and the ninth is guest. guest is already counted inside user, here as everywhere, so adding the two double-counts whatever the guests spent. How much of the user time on this kernel is guest time is not something these rows are read against anything to establish -- the runner also runs the CI process tree, containerd and this suite -- so take the ninth column as the guest share and the eighth as what was taken away, and neither as a proportion of the other]' \
+      '[steal on THIS layer is the number that exists nowhere else in this report. It is time the machine hosting this runner VM gave to somebody else. A sandbox node reporting steal 0 while this row climbs points the wait one layer up -- and read the two as directions rather than rates, because the sandbox rows under sandbox-host-cpu-time are a pair seconds apart inside the diagnostics block while this pair spans the whole join window]' \
+      '[read that column in ONE direction only. A steal that climbs is proof this runner VM was preempted. A steal of zero is not proof of the opposite: the column is filled only where the hypervisor exposes a paravirt steal clock, and where it does not the guest kernel prints zero forever. Nothing in this capture observes which of the two it is, and unlike the sandbox nodes one layer down -- started with accel=kvm by hack/e2e-prepare-cluster.bats, where KVM exposes the accounting -- nobody in this repository launches the runner VM, so the answer for this lane is unknown until somebody reads a non-zero here]' \
+      '[the first row is the sum over every CPU and the cpuN rows below it are per-CPU, one per ONLINE CPU -- the kernel sums the first row over every possible CPU, so an offline one is inside the total and absent below it. What the row count is not is a core count: a cpuN row is a CPU as this kernel sees it, which is a hardware thread wherever SMT is exposed to the guest. This capture reads no topology, so it cannot say which this lane is; /sys/devices/system/cpu/cpuN/topology/thread_siblings_list is where that answer lives, and it is not in this artifact]' \
+      >>"${raw}"
+  fi
+
+  case "${rc}" in
+    0)
+      # Gated on a row having arrived, unlike the KVM capture beside this one,
+      # and the difference is in what the read can promise. That probe exits 4 or
+      # 5 when it found no counter, so a zero there already means counters were
+      # read; `cat` exits zero for any file it could open, including one holding
+      # only the intr and ctxt rows that /proc/stat carries after the CPU time.
+      # Ungated, the pairing instruction would ride on a file with nothing to
+      # difference, and following it turns the sibling's whole cumulative total
+      # into a rate over the window -- the largest number this artifact could
+      # produce, arrived at by doing what it says.
+      if [ "${rows_present}" -ne 0 ]; then
+        printf '%s\n' \
+          '[subtracting this file from its sibling under the other sample directory, and the stamps below from each other, gives a rate. The two readings are taken on either side of the node-join wait, so the interval is that window plus the sibling readings taken between each sample and the wait, every one bounded by its own ceiling; the stamps below, not the window, are the exact divisor]' \
+          >>"${raw}"
+      else
+        # Opened, read to the end, and carrying no CPU time. That is a statement
+        # about the file rather than about the read, and it has to be said in the
+        # file: an empty-looking capture with a clean exit code otherwise reads
+        # as a kernel that was idle.
+        printf '%s\n' \
+          'this reading is unavailable: the read completed and returned no cpu row at all, so this file holds whatever else /proc/stat carried and no CPU time. That is not a reading that the runner kernel was idle' \
+          >>"${raw}"
+      fi
+      ;;
+    *)
+      # Four arms, and the pair of questions they answer are independent:
+      # whether a CPU row reached the file, and whether the read left a message
+      # anywhere. Told only the first, a reader goes looking for an explanation
+      # in the job log of a run that may be days old; told only the second, they
+      # cannot tell a capture worth differencing from one that holds nothing.
+      if [ "${rows_present}" -ne 0 ] && [ -n "${read_log}" ]; then
+        printf '%s\n' \
+          'this reading is incomplete: the read was cut short part way through the file, so a difference against the sibling sample understates every row it did not reach; what the read said before it stopped is in the read-error.log beside this file' \
+          >>"${raw}"
+      elif [ "${rows_present}" -ne 0 ]; then
+        printf '%s\n' \
+          'this reading is incomplete: the read was cut short part way through the file, so a difference against the sibling sample understates every row it did not reach, and it stopped without a word on either stream' \
+          >>"${raw}"
+      elif [ -n "${read_log}" ]; then
+        mv "${read_log}" "${err_log}" 2>/dev/null || true
+        read_log=
+        printf '%s\n' \
+          'this reading is unavailable: the read returned no cpu row at all; what it said is in the COLLECTION-FAILED.txt beside this file. That is not a reading that the runner kernel was idle' \
+          >>"${raw}"
+      else
+        printf '%s\n' \
+          'this reading is unavailable: the read returned no cpu row at all and said nothing on either stream, so what this kernel spent is not recorded here either way. That is not a reading that it was idle' \
+          >>"${raw}"
+      fi
+      ;;
+  esac
+  printf '[read attempted from %s to %s epoch seconds]\n' \
+    "${read_at}" "${read_done}" >>"${raw}"
+  printf '\n[capture exit code: %s]\n' "${rc}" >>"${raw}"
+  # Non-zero when the capture holds no row, and only then. Both callers ask this
+  # function whether it collected something to pair with, and one of them runs on
+  # the passing path where the report is the artifact nobody downloads, so a
+  # capture holding no number has to answer out loud or the warning saying the
+  # pair is broken never prints. A capture cut short AFTER it wrote rows is the
+  # case this does not cover: it left a usable reading, marked as partial, and
+  # telling the caller nothing was collected would contradict the file beside it.
+  if [ "${rows_present}" -eq 0 ]; then
+    return 1
+  fi
+}
+
+# The sandbox VMs' own QEMU threads, from the namespace they run in.
+#
+# The three Talos nodes are QEMU processes started by hack/e2e-prepare-cluster.bats
+# inside this container, so they share its PID namespace with the shell running
+# this suite: the same probe the tenant worker capture runs through `kubectl exec`
+# runs here as a local read, against this container's own /proc.
+#
+# What it answers is where the runner kernel's user time went. The row above says
+# this kernel spent it; this says which sandbox vCPU thread spent it, and whether
+# the three nodes spent it evenly. A node-join failure in which one node's vCPU
+# threads are pinned while the other two idle is a different fault from one in
+# which all twenty-four are busy -- three nodes at `-smp 8`.
+#
+# What is NOT the claim here, because the obvious version of it is false:
+# `cozy_capture_sandbox_node_cpu_time` reads each sandbox node's own /proc/stat
+# through talosctl and names the node, so that collector does tell an uneven split
+# from an even one. What no reading in this report does is price the split ON THE
+# NODE-JOIN WINDOW: that one is sampled twice across a twelve-second interval
+# inside the diagnostics block, after the join has already failed. This pair
+# brackets the wait instead. What it adds beyond the window is the host-side
+# accounting of each vCPU thread -- what the runner actually granted it, which
+# no counter inside the guest can report, and nothing in this report samples
+# the guest's own view on the same window to compare it against -- and QEMU's
+# non-vCPU IO and worker threads, which no in-guest counter sees at all.
+cozy_capture_sandbox_qemu_thread_cpu() {
+  local sample="$1"
+  local report_dir="${COZY_REPORT_DIR:-/workspace/_out/cozyreport}/snapshots/${COZY_SNAPSHOT_NAME:-kubernetes}/sandbox-qemu-thread-cpu/sample-${sample}"
+  local raw="${report_dir}/qemu-threads.txt"
+  local read_log="${report_dir}/read-error.log"
+  local rc=0
+  local threads_present=0
+  local probe read_at read_done
+  local pid_map=
+  local srv pid_file pid
+  # The proc mount to walk, and the seam that lets the arms below be exercised
+  # against a staged tree instead of against a hypervisor. Production never sets
+  # it: the probe defaults to the real one and the default is what runs.
+  local proc_root="${COZY_DIAG_SANDBOX_PROC:-/proc}"
+  # Where hack/e2e-prepare-cluster.bats leaves each guest's pid file. It writes
+  # `srv<N>/qemu.pid` relative to /workspace in this same container, and the
+  # kubernetes suites `cd ../../..` to /workspace before sourcing this library, so
+  # the default is that directory rather than a path assembled from the cwd of
+  # whoever called.
+  local sandbox_root="${COZY_DIAG_SANDBOX_VM_ROOT:-/workspace}"
+
+  if ! mkdir -p "${report_dir}"; then
+    echo "the report directory for the sandbox QEMU thread CPU time could not be created, so nothing was read and nothing could be written to say so" >&2
+    return 1
+  fi
+  COZY_DIAG_READ_TIMEOUT=$(_cozy_diag_seconds "${COZY_DIAG_READ_TIMEOUT-}" "$COZY_DIAG_READ_TIMEOUT_DEFAULT" COZY_DIAG_READ_TIMEOUT positive)
+  COZY_DIAG_READ_GRACE=$(_cozy_diag_seconds "${COZY_DIAG_READ_GRACE-}" "$COZY_DIAG_READ_GRACE_DEFAULT" COZY_DIAG_READ_GRACE)
+
+  # The same probe the tenant worker capture runs, and deliberately the same one
+  # rather than a copy: it already answers the two outcomes that matter here --
+  # "found QEMU" and "QEMU is gone" -- and it already names the three ways it can
+  # come up short. A second copy would drift from this one exactly where the
+  # failure paths are, which is where nobody looks until it matters.
+  probe=$(_cozy_thread_cpu_probe)
+
+  # Which pid is which node, read from the files the bringup already wrote. The
+  # probe names processes by their container pid, and a pid identifies nothing to
+  # a reader: the question this capture exists to answer is whether the
+  # control-plane node or a worker-carrying one is starving, because the tenant
+  # workers sit on specific sandbox nodes. Three tiny local reads buy that.
+  #
+  # Through a bounded external cat, never the shell's own redirect: `[ -r ]`
+  # passes on a FIFO and the redirect open then blocks forever, outside anything
+  # a wrapper can cover. Three tiny spawns buy the same ceiling every other read
+  # here carries; where `timeout` is absent they run unbounded like the rest,
+  # which the capture's own bounds note declares. The whole map is optional:
+  # when it cannot be built the capture says so and stays anonymous, which is
+  # what its KVM sibling does about a mapping that is genuinely unavailable.
+  for srv in 1 2 3; do
+    pid_file="${sandbox_root}/srv${srv}/qemu.pid"
+    pid=
+    if command -v timeout >/dev/null 2>&1; then
+      pid=$(timeout -k "${COZY_DIAG_READ_GRACE}" "${COZY_DIAG_READ_TIMEOUT}" cat "${pid_file}" 2>/dev/null) || continue
+    else
+      pid=$(cat "${pid_file}" 2>/dev/null) || continue
+    fi
+    case "${pid}" in
+      '' | *[!0-9]*) continue ;;
+    esac
+    pid_map="${pid_map}${pid} srv${srv}
+"
+  done
+
+  echo "--- capturing the sandbox VMs' QEMU thread CPU time (sample ${sample}) ---"
+  read_at=$(date -u +%s)
+  if command -v timeout >/dev/null 2>&1; then
+    timeout -k "${COZY_DIAG_READ_GRACE}" "${COZY_DIAG_READ_TIMEOUT}" \
+      sh -c "${probe}" cozy-sandbox-qemu-threads "${proc_root}" \
+      >"${raw}" 2>"${read_log}" </dev/null || rc=$?
+  else
+    sh -c "${probe}" cozy-sandbox-qemu-threads "${proc_root}" \
+      >"${raw}" 2>"${read_log}" </dev/null || rc=$?
+    # Said in the capture and not only in the phase log: the warning that
+    # names unbounded collectors fires inside the diagnostics phase, and two
+    # of the three readings this pair takes run outside it.
+    printf '%s\n' '[bounds] timeout is not on PATH here, so the reads this capture takes ran with no ceiling]' >>"${raw}" 2>/dev/null || true
+  fi
+  read_done=$(date -u +%s)
+
+  if [ ! -s "${read_log}" ]; then
+    rm -f "${read_log}"
+    read_log=
+  elif [ "${rc}" -eq 0 ]; then
+    mv "${read_log}" "${report_dir}/READ-WARNINGS.txt" 2>/dev/null || true
+    read_log=
+  fi
+
+  # Whether a thread line reached the file, which is a different question from
+  # whether the file has bytes in it: the probe writes a clock-tick heading and
+  # a `process` line before any thread, and it writes its own findings when it
+  # has none. Keyed on size, a capture holding only a finding would be labelled
+  # a reading and a legend about columns would be pinned to a file with none.
+  if grep -q '^[0-9]' "${raw}" 2>/dev/null; then
+    threads_present=1
+  fi
+
+  if [ "${threads_present}" -ne 0 ]; then
+    printf '%s\n' \
+      '[these threads belong to the SANDBOX VMs: the three Talos nodes hack/e2e-prepare-cluster.bats starts as QEMU processes inside this container, which shares its PID namespace with them. They are the guests of the runner kernel whose /proc/stat sits under runner-kernel-cpu-time, and the hosts of the tenant workers whose own QEMU threads sit under tenant-thread-cpu. Reading these as a tenant worker inverts the layer]' \
+      '[each line above beginning with a number is /proc/<pid>/task/<tid>/stat verbatim: the first field is the thread id, the second is the thread name in parentheses, utime is the 14th field and stime the 15th]' \
+      '[counting those fields over whitespace reads the wrong column for exactly the threads this capture exists to identify: a KVM vCPU thread is named CPU 0/KVM, that space sits inside the parentheses, and every field after it shifts by one. Parse from the last ) in the line instead, after which the state is the first field, utime the 12th and stime the 13th]' \
+      "[the names: CPU N/KVM is that sandbox node's vCPU N, the thread whose id equals the process id is QEMU's main thread and its emulator thread, and the rest are QEMU's own IO and worker threads, which carry the process name unless QEMU renamed them. The vCPU names exist because hack/e2e-prepare-cluster.bats starts every sandbox QEMU with -name debug-threads=on; a QEMU started without it shows the bare process name on every thread, and the split below is then by thread id only]" \
+      '[utime and stime are clock ticks, at the rate the first line above reports, and both are cumulative since the thread started]' \
+      '[a node with its eight vCPU threads busy and its siblings idle is a different failure from three nodes evenly loaded, and the runner kernel row one layer up cannot tell them apart: it sums all three]' \
+      >>"${raw}"
+  fi
+  # Which pid is which node, or a statement that this capture does not know.
+  # Written on every path, not only under thread lines: on the walk that found
+  # a QEMU and could not read its tasks, which nodes still had usable pid files
+  # is exactly the question, and gating this on threads would blank the answer
+  # there. The KVM capture beside it discloses its own anonymity the same way.
+  if [ -n "${pid_map}" ]; then
+    printf '%s\n' \
+      '[which sandbox node each QEMU process id belongs to, read from the pid files hack/e2e-prepare-cluster.bats wrote when it started them -- stated on every path, since a walk that met a QEMU it could not read leaves no thread lines while the node behind that pid is exactly the question. A mapping says which node the file names, not that the process still runs: a QEMU that died keeps its pid file. A thread line belongs to the process heading above it -- the stat line carries the thread id, so the position under its heading is the whole link. A node absent from this list had no usable pid file at the moment of this reading -- absent, unreadable, cut off by the read ceiling, empty or not one process id -- which for a node-join failure is itself worth knowing]' \
+      >>"${raw}"
+    printf '%s' "${pid_map}" | while read -r _pm_pid _pm_srv; do
+      [ -n "${_pm_pid}" ] || continue
+      printf '[process %s is %s]\n' "${_pm_pid}" "${_pm_srv}" >>"${raw}"
+    done
+  else
+    printf '%s\n' \
+      "[this capture is anonymous by node: no usable pid file under ${sandbox_root}/srv{1,2,3}/qemu.pid, so a process id above identifies a QEMU and not which sandbox node it is. The split is still per-VM -- it says how evenly the three paid, not which of them paid what]" \
+      >>"${raw}"
+  fi
+
+  case "${rc}" in
+    0)
+      # The pairing instruction waits for this arm, for the reason the KVM
+      # capture states beside it: telling a reader to subtract two files
+      # asserts that both hold a whole reading, and a walk cut off after the
+      # first node would have the other two read as having spent nothing
+      # across the window.
+      if [ "${threads_present}" -ne 0 ]; then
+        printf '%s\n' \
+          '[subtracting this file from its sibling under the other sample directory, and the stamps below from each other, gives a rate per thread. The two readings are taken on either side of the node-join wait, so the interval is that window plus the sibling readings taken between each sample and the wait, every one bounded by its own ceiling; the stamps below, not the window, are the exact divisor]' \
+          >>"${raw}"
+      else
+        # Walked to the end and found nothing to read. The probe has already
+        # said which of the three shapes it met, in its own words; what it
+        # cannot say is that this is a finding rather than a collector that
+        # came up short, and a `[capture exit code: 0]` under it otherwise
+        # reads as a healthy capture of an idle machine. The closing sentence
+        # follows the probe's own marker: one phrase over all three would call
+        # a sandbox with three named QEMUs "a sandbox running no QEMU" two
+        # lines under the list of them.
+        if grep -q '^NO-QEMU-PROCESS:' "${raw}" 2>/dev/null; then
+          printf '%s\n' \
+            'these thread readings are unavailable: the walk completed and produced no thread line at all, for the reason it states above. That is not a reading that the sandbox VMs used no CPU -- a sandbox running no QEMU is a finding about this run rather than a shortfall of this capture' \
+            >>"${raw}"
+        elif grep -q '^NO-THREAD-LINES:' "${raw}" 2>/dev/null; then
+          printf '%s\n' \
+            'these thread readings are unavailable: the walk completed and produced no thread line at all, for the reason it states above. That is not a reading that the sandbox VMs used no CPU -- a QEMU that was named while its task files could not be read is a guest going away under the walk, which for a node-join failure is itself a finding' \
+            >>"${raw}"
+        else
+          printf '%s\n' \
+            'these thread readings are unavailable: the walk completed and produced no thread line at all, for the reason it states above. That is not a reading that the sandbox VMs used no CPU, and it says nothing about what the container was running' \
+            >>"${raw}"
+        fi
+      fi
+      ;;
+    *)
+      if [ "${threads_present}" -ne 0 ] && [ -n "${read_log}" ]; then
+        printf '%s\n' \
+          'these thread readings are incomplete: the walk was cut short part way through, so a difference against the sibling sample is missing whichever threads it did not reach; what the read said before it stopped is in the read-error.log beside this file' \
+          >>"${raw}"
+      elif [ "${threads_present}" -ne 0 ]; then
+        printf '%s\n' \
+          'these thread readings are incomplete: the walk was cut short part way through, so a difference against the sibling sample is missing whichever threads it did not reach, and it stopped without a word on either stream' \
+          >>"${raw}"
+      elif [ -n "${read_log}" ]; then
+        # Into COLLECTION-FAILED.txt, the name this report gives the
+        # artifact-level marker for a read that never returned, and the name
+        # its sibling collector writes for this same shape. A reader sweeping
+        # the tarball for failure markers would otherwise miss this walk.
+        mv "${read_log}" "${report_dir}/COLLECTION-FAILED.txt" 2>/dev/null || true
+        read_log=
+        printf '%s\n' \
+          'these thread readings are unavailable: the walk produced no thread line at all; what it said is in the COLLECTION-FAILED.txt beside this file. That is not a reading that the sandbox VMs used no CPU' \
+          >>"${raw}"
+      else
+        printf '%s\n' \
+          'these thread readings are unavailable: the walk produced no thread line at all and said nothing on either stream, so what the sandbox VMs spent is not recorded here either way. That is not a reading that they used none' \
+          >>"${raw}"
+      fi
+      ;;
+  esac
+  printf '[read attempted from %s to %s epoch seconds]\n' \
+    "${read_at}" "${read_done}" >>"${raw}"
+  printf '\n[capture exit code: %s]\n' "${rc}" >>"${raw}"
+  # Non-zero when the capture holds no thread line, and only then -- whether that
+  # is a walk that failed or a container that had no QEMU to read. The second is
+  # the more consequential of the two on this failure path: the sandbox VMs are
+  # what the whole run stands on, and a container reporting none of them is a
+  # finding rather than a shortfall of this collector. The probe says which of
+  # the three shapes it met in its own words, inside the file.
+  if [ "${threads_present}" -eq 0 ]; then
+    return 1
+  fi
+}
+
+# How much work one canary arm does, and how long it may take doing it.
+#
+# Constants rather than knobs, and assigned unconditionally so they stay that
+# way: the legend states an expected duration against exactly these figures, so
+# a run that quietly used other ones would publish a range that was never true
+# of it.
+#
+# Sized so each arm takes about a second on a fast core: short enough that the
+# pair costs a few seconds of one core there, long enough that the 10ms clock
+# below is about a percent of the figure. Slower cores take proportionally
+# longer, up to the ceiling below, and the expected ranges the legend states are
+# where that is written down.
+COZY_CANARY_CPU_ITERATIONS=30000000
+# Declared in MiB and passed to dd in bytes. A suffix would be read differently
+# by the dd of the machine that happens to run this -- the sandbox image ships
+# the GNU one, where M is 1048576 while MB is a million, and dds elsewhere
+# disagree about which spellings they accept at all -- so the multiplication
+# happens here, where the unit the rate is reported in is the unit the constant
+# is written in.
+COZY_CANARY_MEM_BLOCK_MIB=64
+COZY_CANARY_MEM_BLOCKS=128
+# The rate below which an arm is pathological rather than merely slow, in the
+# unit that arm's rate is printed in. The legend prints both figures from these
+# two constants, so the number a reader is given is the number the collector
+# compares against. The sentences around them describe how each floor sits
+# against its band in words, and those are written rather than derived, so they
+# are the part that can go stale when a constant moves.
+#
+# Both sit under the healthy band rather than at its edge, and how far under is
+# what the ceiling limits. A floor an arm cannot reach before the ceiling stops
+# it never fires: the arm is cut off before its rate can fall that far, so every
+# alert arrives as the ceiling and carries a bound instead of the slowdown the
+# floor was meant to name. The memory arm crosses 500 MiB/s at 16.4s against the
+# 20s ceiling, under that band's own bottom of 8192 MiB in about eight seconds
+# rather than at it, so a core sitting at the bottom reads slow and raises
+# nothing where a floor placed at the bottom would have called that core
+# pathological on a green run. The compute arm has room for the full decade: a
+# tenth of a healthy mawk needs 10s, which is half the ceiling. Both
+# floors are set downwards on purpose -- the rate is printed in the capture
+# either way, so an alert this collector fails to raise costs less than one it
+# manufactures on a healthy machine. hack/run-kubernetes-runner-canary_test.bats
+# derives both crossings from these constants and fails when either leaves that
+# window.
+COZY_CANARY_CPU_MIN_RATE=3000000
+COZY_CANARY_MEM_MIN_RATE=500
+# The canary is work rather than a read, so it takes a ceiling of its own
+# instead of COZY_DIAG_READ_TIMEOUT. That bound is sized for an apiserver that
+# answers in under a second and lowering it is what the knob is for, which would
+# kill a canary meant to take seconds -- and unlike a read, a slow run here is
+# the finding rather than a lost one. This number is therefore the largest
+# slowdown the capture can still put a figure on: at the sizes above it stops an
+# arm an order of magnitude or more past the expected duration, past the factor
+# being hunted and short of spending the diagnostics budget on it.
+COZY_CANARY_RUN_BOUND_DEFAULT=20
+
+# The canary clock: /proc/uptime, in centiseconds, into _COZY_CANARY_CS.
+#
+# A global rather than a printed value, because the alternative is a command
+# substitution and that is a fork inside the interval being measured, at both
+# ends of every arm.
+#
+# /proc/uptime rather than `date`, and not for portability: the field is a
+# monotonic count no clock adjustment moves, and `read` is a builtin, so taking
+# the stamp costs no process. What it costs is resolution -- the kernel prints
+# hundredths -- which is why every duration here is quantised to 10ms and why
+# the legend says so.
+_cozy_canary_stamp() {
+  local raw='' rest='' secs='' frac=''
+
+  # The suppression goes ahead of the redirect rather than after it: applied in
+  # order, a missing file would otherwise put the shell error on the real stderr
+  # before the suppression took effect, and this function reports its own
+  # failures by returning rather than by printing.
+  read -r raw rest 2>/dev/null <"${COZY_DIAG_RUNNER_PROC_UPTIME:-/proc/uptime}" || return 1
+  # Refused unless the shape is exactly the one the arithmetic below is written
+  # for. A field with no decimal point is what this catches, and the only shape
+  # it catches: `${raw#*.}` hands back the whole string when there is no `.`, so
+  # a two-digit whole-second uptime passes the hundredths guard below as its own
+  # hundredths and ten seconds reads as 1010 centiseconds -- a duration off by a
+  # percent, manufactured by the one clock every figure here divides by. A field
+  # carrying three decimals never reaches the arithmetic at all: it is refused
+  # by that hundredths guard rather than by this one.
+  case "${raw}" in
+    *.*) ;;
+    *) return 1 ;;
+  esac
+  secs="${raw%%.*}"
+  frac="${raw#*.}"
+  case "${secs}" in
+    0 | [1-9]*) ;;
+    *) return 1 ;;
+  esac
+  case "${secs}" in
+    *[!0-9]*) return 1 ;;
+  esac
+  case "${frac}" in
+    [0-9][0-9]) ;;
+    *) return 1 ;;
+  esac
+  # A leading zero is octal to `$(( ))`, and 09 is not a number there at all, so
+  # the hundredths lose theirs before they are added.
+  frac="${frac#0}"
+  _COZY_CANARY_CS=$(( secs * 100 + frac ))
+}
+
+# One arm: run a fixed amount of work under a wall-clock ceiling and time it.
+#
+# The ceiling and its kill grace are read from the globals the collector
+# re-validates, the way the shared cAdvisor stream reads the pair its own caller
+# validates. Both also take a pass at source time, so this function finds them
+# set however it is reached; what the collector's pass adds is a value assigned
+# after sourcing, which is how a test sets one.
+#
+# Sets _COZY_CANARY_MS to the elapsed milliseconds and _COZY_CANARY_RC to the
+# status the shell waited on: the work's own whenever the work ended by itself,
+# which is what a healthy run does under a ceiling as much as without one, and
+# timeout's when the ceiling ended it instead. Which of the two a number came
+# from is not readable from the number, which is why the clock decides it below.
+# Returns 1 when the clock could not be read at both ends and 2 when it read but
+# went backwards, which the caller reports as different things -- neither is a
+# duration, but the first is silence about this machine and the second is a
+# broken instrument. Both are different again from work that failed, which is a
+# statement about the machine.
+_cozy_canary_run_arm() {
+  local capture="$1"
+  shift
+  local start=0 end=0
+
+  _COZY_CANARY_CS=0
+  _COZY_CANARY_MS=0
+  _COZY_CANARY_RC=0
+  # Whether a ceiling was in play at all, for the reporter to read beside the
+  # exit status: 124 and 137 are what the ceiling produces, and they are also
+  # what a work command exiting on its own or an outside SIGKILL produces, so
+  # the status alone cannot say the ceiling fired.
+  _COZY_CANARY_BOUNDED=0
+
+  _cozy_canary_stamp || return 1
+  start="${_COZY_CANARY_CS}"
+  # stdin closed for the reason every walk in this file closes it: nothing here
+  # reads it, and a program that started to would consume whatever the caller
+  # was iterating. stdout is discarded because an arm exists for its duration
+  # and its exit status already says whether the work ran to the end; stderr is
+  # kept, since that is where dd reports and where timeout names a command it
+  # could not start. A ceiling that fires says nothing there -- without
+  # --verbose, which this call does not pass, timeout is silent about it -- and
+  # that silence is why the status below is read against the clock rather than
+  # on its own.
+  if command -v timeout >/dev/null 2>&1; then
+    _COZY_CANARY_BOUNDED=1
+    timeout -k "${COZY_DIAG_READ_GRACE}" "${COZY_CANARY_RUN_BOUND}" \
+      "$@" >/dev/null 2>>"${capture}" </dev/null || _COZY_CANARY_RC=$?
+  else
+    "$@" >/dev/null 2>>"${capture}" </dev/null || _COZY_CANARY_RC=$?
+  fi
+  _cozy_canary_stamp || return 1
+  end="${_COZY_CANARY_CS}"
+
+  # A clock that went backwards is refused rather than published as a negative
+  # duration. Every figure this capture prints is derived from it, and a wrong
+  # duration produces a rate that reads exactly like a real one.
+  [ "${end}" -ge "${start}" ] || return 2
+  _COZY_CANARY_MS=$(( (end - start) * 10 ))
+}
+
+# One arm reported into the capture: what it ran, whatever it said on stderr,
+# how long it took, and what that divides to. <quantity> is the work expressed
+# in <unit>s, so the rate is <unit>s per second, and <floor> is the rate in that
+# unit below which the legend calls the machine pathological rather than slow.
+#
+# Returns non-zero when the arm could not be measured at all, so the caller can
+# tell a capture worth reading from one that holds nothing. An arm that finished
+# inside one tick was measured: it carries the note instead of a rate and still
+# returns zero. Sets _COZY_CANARY_ALERT when the figure it did produce is below
+# <floor> or was cut off by the ceiling. The status cannot carry that: an arm
+# that measured a starved machine produced a reading and returns zero like any
+# arm that finished.
+_cozy_canary_report_arm() {
+  local capture="$1" label="$2" quantity="$3" unit="$4" floor="$5"
+  shift 5
+  local timed=0 ms=0 rate=0 bound_rate=0
+
+  printf '\n=== arm: %s ===\n' "${label}" >>"${capture}"
+  printf 'command: %s\n' "$*" >>"${capture}"
+  # The work this arm was asked for, written down before it is divided by
+  # anything. Every other figure here is derived, so a reader who doubts one of
+  # them has the two inputs in front of them rather than in the source of the
+  # release that produced the artifact.
+  printf 'work: %s %s\n' "${quantity}" "${unit}" >>"${capture}"
+  _cozy_canary_run_arm "${capture}" "$@" || timed=$?
+  if [ "${timed}" -eq 2 ]; then
+    printf '%s\n' \
+      'this arm produced no reading: the canary clock read at both ends and the second stamp was the earlier one, so the instrument is wrong rather than the machine slow. Nothing is derived from it here' \
+      >>"${capture}"
+    return 1
+  fi
+  if [ "${timed}" -ne 0 ]; then
+    printf '%s\n' \
+      'this arm produced no reading: the canary clock could not be read at both ends, so how long the work took is not recorded here. That is silence about this machine rather than a finding about it' \
+      >>"${capture}"
+    return 1
+  fi
+  ms="${_COZY_CANARY_MS}"
+  printf 'elapsed: %s ms\n' "${ms}" >>"${capture}"
+
+  # Whether 124 or 137 means the ceiling is decided by the clock rather than by
+  # the status: timeout exits 124 when its term signal ends the work and the
+  # work exits 137 when a kill does, and an outside kill -- the OOM killer
+  # taking the 64 MiB buffer dd allocates is the realistic one -- produces the
+  # same 137 with the ceiling never involved. An arm that ended in either status
+  # before the ceiling could have fired was ended by something else, and
+  # reporting that as the ceiling manufactures the too-slow-to-finish finding
+  # this collector exists to detect. No tolerance is given for the truncation,
+  # because a ceiling that fired cannot read short: both stamps truncate
+  # hundredths off the one clock and the bound is a whole number of seconds, so
+  # the difference of the two floors is at least the bound whatever fraction the
+  # first stamp landed on. A duration under it was produced by something else.
+  local at_ceiling=0 ceiling_note=''
+  case "${_COZY_CANARY_RC}" in
+    124 | 137)
+      if [ "${_COZY_CANARY_BOUNDED}" -eq 1 ] && [ "${ms}" -ge $(( COZY_CANARY_RUN_BOUND * 1000 )) ]; then
+        at_ceiling=1
+      fi
+      ;;
+  esac
+  # Named apart the way the sibling collectors name a kill apart from a
+  # deadline: 137 says a kill ended the arm where 124 says the term signal did,
+  # and that is a different observation even though the status does not say
+  # whose kill it was. Timeout's own follow-up and a kill from outside are the
+  # same 137 here, the way they are before the ceiling above.
+  if [ "${at_ceiling}" -eq 1 ] && [ "${_COZY_CANARY_RC}" -eq 137 ]; then
+    ceiling_note=', on a status that says a kill ended the arm without saying whose'
+  fi
+  # The work's own failure is settled before its duration is, and the order is
+  # the whole of it: a command this machine does not have fails in well under
+  # one tick, so a duration-first reading would report the one arm that never
+  # ran as the one arm too fast to measure.
+  case "${_COZY_CANARY_RC}" in
+    0) ;;
+    124 | 137)
+      if [ "${at_ceiling}" -ne 1 ]; then
+        if [ "${_COZY_CANARY_BOUNDED}" -eq 1 ]; then
+          printf 'this arm produced no reading: the work ended with status %s after %s ms, before the %ss ceiling could have fired, so something other than the canary bound ended it and the duration above is how long it survived rather than how long the work takes here\n' \
+            "${_COZY_CANARY_RC}" "${ms}" "${COZY_CANARY_RUN_BOUND}" >>"${capture}"
+        else
+          printf 'this arm produced no reading: the work ended with status %s with no ceiling in play, so something on this machine ended it and the duration above is how long it survived rather than how long the work takes here\n' \
+            "${_COZY_CANARY_RC}" >>"${capture}"
+        fi
+        return 1
+      fi
+      ;;
+    *)
+      # The exit status goes in the line rather than only in the stderr above
+      # it: a 127 is a binary missing from this machine and a non-zero from the
+      # work itself is something else, and the number is what tells them apart.
+      printf 'this arm produced no reading: it ended %s, so the duration above is how long it took to fail rather than how long the work takes here\n' \
+        "${_COZY_CANARY_RC}" >>"${capture}"
+      return 1
+      ;;
+  esac
+  # And a zero duration before anything divides by it. It is not a fast machine
+  # reported badly, it is a duration this clock cannot express, and dividing by
+  # it ends the shell. Only a finished arm can reach this with a zero: the
+  # ceiling needs the whole bound on the clock, and a kill ahead of the ceiling
+  # was returned above.
+  if [ "${ms}" -eq 0 ]; then
+    printf '%s\n' \
+      'no rate: the arm finished inside one tick of the 10ms clock, so its duration is under the resolution rather than measured. At the sizes this canary runs, that is itself unexpected' \
+      >>"${capture}"
+    return 0
+  fi
+  # Integer division, so a rate under one unit per second lands on zero -- and a
+  # capture saying `rate: 0` reads as a machine that did nothing rather than as
+  # arithmetic that ran out of places.
+  rate=$(( quantity * 1000 / ms ))
+  # The figure the ceiling sentence prints is rounded up where the rate line is
+  # truncated, because the two are different kinds of number: a rate is measured
+  # and rounds toward what was seen, while this is an upper bound on work that
+  # never finished, and truncating a bound downwards prints a strict inequality
+  # the arm itself can sit inside.
+  bound_rate=$(( (quantity * 1000 + ms - 1) / ms ))
+  # The alert every call site turns into a job-log line: the two outside the
+  # diagnostics block and the one inside it. Raised here because this is the one
+  # place the figure and the floor it is read against are both in scope. An arm
+  # the ceiling stopped and an arm that finished under the floor are the same
+  # answer to the question this collector exists to ask -- the machine is not
+  # getting the work done -- and what differs is whether the figure is labelled a
+  # bound or a reading. An arm that finished inside one tick returned above and
+  # raises nothing: too fast to measure is not slow.
+  if [ "${at_ceiling}" -eq 1 ] || [ "${rate}" -lt "${floor}" ]; then
+    _COZY_CANARY_ALERT=1
+  fi
+  if [ "${at_ceiling}" -eq 1 ]; then
+    # The ceiling firing is the strongest reading this arm can produce, so it
+    # is recorded as a bound rather than dropped: the work did not finish in
+    # that many seconds, which is already a multiple of what it should take.
+    # Not recorded as a rate, because a rate would average over work that did
+    # not all happen. One sentence rather than two: rounding up makes the bound
+    # at least one in the printed unit for any quantity of at least one, and the
+    # sizes declared above are never zero, so there is no zero case left for a
+    # second sentence to carry.
+    printf 'this arm did not finish: it was stopped at the %ss ceiling%s, so its rate is BELOW %s %s per second and that figure is a bound rather than a reading\n' \
+      "${COZY_CANARY_RUN_BOUND}" "${ceiling_note}" "${bound_rate}" "${unit}" >>"${capture}"
+  else
+    if [ "${rate}" -eq 0 ]; then
+      printf 'rate: under one %s per second, which the work and elapsed lines above give exactly\n' \
+        "${unit}" >>"${capture}"
+    else
+      printf 'rate: %s %s per second\n' "${rate}" "${unit}" >>"${capture}"
+    fi
+  fi
+}
+
+# The runner layer fixed-work canary.
+#
+# The counters this report already carries are read in whatever unit their
+# source publishes -- time in the /proc/stat rows and the per-thread ticks,
+# events in the KVM exits, throttled periods beside throttled seconds in the
+# cgroup rows, and instantaneous values and running maxima in the files sitting
+# beside those exits -- and none of them is a fixed quantity of work.
+# So a machine that spent every tick and got a fraction of the work done reads
+# as healthy in all of them. That is the shape the node-join failures on this
+# lane have: the counters at every layer look normal while the work does not
+# get done. This collector carries its own unit of work instead, which gives its
+# reading a scale of its own and makes the pathology visible in a single red run
+# with no green one beside it.
+#
+# Two arms, because the candidates the time counters cannot separate act on
+# different resources: interference on the shared cache and the memory
+# controller from whatever else the host is running, and a core doing less per
+# cycle. The two arms differ in how much of each they feel rather than in being
+# deaf to one: the compute arm's working set is small enough that pressure on
+# the shared cache and the memory controller moves it little, while the memory
+# arm is dominated by it. A large asymmetric shift between them therefore points
+# at one of the two, to the factor of ten these figures resolve and no finer.
+#
+# What this is NOT is a measurement of the tenant workers. It runs at the runner
+# layer, where the sandbox nodes are hosted. Two layers down, the same
+# fixed-work question is already answered by how long the tenant workers take to
+# unpack their initramfs, which the serial console capture records. One layer
+# down no capture times it: the QEMU line that boots the sandbox nodes passes no
+# serial backend (hack/e2e-prepare-cluster.bats), so nothing carries their
+# console anywhere for a capture to read. What those nodes do put in this report
+# is their kernel ring buffer, which hack/cozyreport.sh pulls over the Talos API
+# into sandbox-host/talos-<node>-dmesg.txt -- read there for what their kernels
+# said, and a canary here would still be measuring the layer above them.
+cozy_capture_runner_canary() {
+  local sample="$1"
+  local report_dir="${COZY_REPORT_DIR:-/workspace/_out/cozyreport}/snapshots/${COZY_SNAPSHOT_NAME:-kubernetes}/runner-canary/sample-${sample}"
+  local capture="${report_dir}/fixed-work.txt"
+  local readings=0 mem_mib=0 cpu_program='' read_at='' read_done=''
+
+  # Cleared before anything below can return, so a call site reads it after
+  # every exit from here rather than only after the ones that reached an arm.
+  _COZY_CANARY_ALERT=0
+  # Checked, unlike most of what follows: with no directory every write below
+  # fails, the collector becomes a silent no-op, and the artifact carries the
+  # empty space this capture exists to refuse -- with nowhere to put a marker
+  # saying so.
+  if ! mkdir -p "${report_dir}"; then
+    echo "the report directory for the runner canary could not be created, so nothing was measured and nothing could be written to say so" >&2
+    return 1
+  fi
+  # Truncated once here and appended to from then on, the way every raw file
+  # beside this one is written: the arms and the legend are written in pieces,
+  # and a file left over from an earlier call would otherwise carry two runs of
+  # one sample with nothing between them to say where the first ended. Opened
+  # with `true` rather than `:` and checked: `:` is a POSIX special built-in,
+  # so a redirection that fails on it exits a non-interactive shell -- dash,
+  # which is /bin/sh in the sandbox image, honours that -- and on the failure
+  # path that exit ends the whole diagnostics block, straight past the call
+  # site's `|| true`. The tenant snapshot survives it -- it is an EXIT trap,
+  # armed before this block runs -- so what the exit costs is the rest of the
+  # diagnostics, not the snapshot behind them. A capture that cannot be opened
+  # is the mkdir case again: nothing can be measured, and the report has nowhere
+  # to say so.
+  if ! true >"${capture}"; then
+    echo "the capture file for the runner canary could not be opened for writing, so nothing was measured and nothing could be written to say so" >&2
+    return 1
+  fi
+  # Re-validated here for the reason every collector re-validates: a value
+  # assigned after this file is sourced never passed the assignment-time check,
+  # and zero reaches `timeout` as no bound at all.
+  COZY_CANARY_RUN_BOUND=$(_cozy_diag_seconds "${COZY_CANARY_RUN_BOUND-}" "$COZY_CANARY_RUN_BOUND_DEFAULT" COZY_CANARY_RUN_BOUND positive "zero is no ceiling at all, and an arm that never returns costs the phase whatever is gated behind it")
+  COZY_DIAG_READ_GRACE=$(_cozy_diag_seconds "${COZY_DIAG_READ_GRACE-}" "$COZY_DIAG_READ_GRACE_DEFAULT" COZY_DIAG_READ_GRACE)
+
+  mem_mib=$(( COZY_CANARY_MEM_BLOCK_MIB * COZY_CANARY_MEM_BLOCKS ))
+  # `print s` is kept and its output discarded: the sum is not wanted, but an
+  # awk able to see that the loop has no effect would be free to skip it, and a
+  # canary optimised away reports a healthy machine at any speed.
+  cpu_program="BEGIN { s = 0; for (i = 0; i < ${COZY_CANARY_CPU_ITERATIONS}; i++) s = (s + i) % 1000003; print s }"
+
+  echo "--- running the runner fixed-work canary (sample ${sample}) ---"
+  # Stamped around the pair for the reason the readings beside this one are
+  # stamped: the capture carries no sample time of its own, and the two samples
+  # are separated by the node-join wait rather than by a knob.
+  read_at=$(date -u +%s)
+  if _cozy_canary_report_arm "${capture}" \
+    "compute, a loop over a handful of integer-valued scalars" \
+    "${COZY_CANARY_CPU_ITERATIONS}" iterations "${COZY_CANARY_CPU_MIN_RATE}" \
+    awk "${cpu_program}"; then
+    readings=$(( readings + 1 ))
+  fi
+  if _cozy_canary_report_arm "${capture}" \
+    "memory, a store stream over blocks sized against one core's cache" \
+    "${mem_mib}" MiB "${COZY_CANARY_MEM_MIN_RATE}" \
+    dd if=/dev/zero of=/dev/null "bs=$(( COZY_CANARY_MEM_BLOCK_MIB * 1048576 ))" "count=${COZY_CANARY_MEM_BLOCKS}"; then
+    readings=$(( readings + 1 ))
+  fi
+  read_done=$(date -u +%s)
+
+  if ! command -v timeout >/dev/null 2>&1; then
+    # Said in the capture and not only in the phase log, for the reason the
+    # readings beside this one say it there: the warning naming the unbounded
+    # collectors fires inside the diagnostics phase, and one of this pair of
+    # samples is taken outside that phase on every run.
+    printf '\n%s\n' '[bounds] timeout is not on PATH here, so the arms above ran with no ceiling; each of them terminates on its own, so what was lost is the ceiling rather than the reading -- but on the slow machine this canary exists to catch, fixed work with no ceiling can take minutes rather than seconds, and everything that prices this collector at two bounded arms no longer holds]' \
+      >>"${capture}"
+  fi
+
+  printf '\n' >>"${capture}"
+  printf '%s\n' \
+    '[this canary runs on the RUNNER VM, inside the sandbox container: one layer above the three Talos nodes and two above the tenant workers. It is the only reading in this report that carries its own unit of work at this layer; two layers down the serial console capture records the tenant workers unpacking their initramfs, and one layer down no capture times it, because the QEMU line that boots the sandbox nodes passes no serial backend for a capture to read; what those nodes put here instead is their kernel ring buffer, under sandbox-host/talos-<node>-dmesg.txt. The counters beside it are read in the units their sources publish -- time in the CPU rows, events in the KVM exits, instantaneous values and running maxima in the files beside those -- and a counter with no unit of work in it cannot see a machine that spent its ticks and got less done with them, which is the shape this lane keeps failing in]' \
+    >>"${capture}"
+  printf '[two arms, and what makes them answer the same interference differently is the working set, not the amount of work each does. The compute arm loops over a handful of scalars, which live in registers and the nearest cache, so pressure on the shared cache or the memory controller moves it little rather than not at all. The memory arm streams blocks: a read of /dev/zero zeroes the buffer the caller supplied and a write to /dev/null never looks at it, so each block is one pass of stores over the whole block. The block size is both the working set and the reuse distance -- %s MiB here, against the 32 MiB of last-level cache an EPYC core can allocate into on the parts this lane has run on -- and a block that exceeds that cache leaves no byte still cached by the time it is written again, so the traffic lands on the memory controller. Which part this run got is recorded in sandbox-host/runner-identity.txt at the root of this report, and that is what tells a reader of this artifact which case it is looking at: on a part whose per-core cache exceeds the block size this arm stops being memory-bound and reads high. On a machine in front of you the dd line above can be rerun with a block size that fits the cache, and the figure rises several times over]\n' \
+    "${COZY_CANARY_MEM_BLOCK_MIB}" >>"${capture}"
+  printf '[expected ranges, and what they are worth. These are what the construction can do on a healthy server core, not figures measured on this lane, and they are stated to the precision they have: a factor of ten is what they resolve and a factor of two is not. Memory arm: one core sustains single-digit to low-double-digit GB per second of streaming stores, because the ceiling is how many misses one core keeps outstanding rather than how many memory channels the socket has, so the %s MiB it writes land in about a second on a fast core and in about eight at the bottom of that band, while anything under %s in the MiB-per-second unit the rate lines above are printed in, about half a gigabyte a second, is pathological rather than merely slow. Compute arm: the rate depends on the awk implementation as much as on the core, and that implementation is a property of the sandbox image rather than of the run, pinned by digest in packages/core/testing/images/e2e-sandbox/Dockerfile, so on the mawk that image ships a simple loop over integer-valued scalars runs at tens of millions of iterations a second and the %s of them here land in about a second, so anything under %s iterations a second, one factor of ten below that, is pathological rather than merely slow]\n' \
+    "${mem_mib}" "${COZY_CANARY_MEM_MIN_RATE}" "${COZY_CANARY_CPU_ITERATIONS}" "${COZY_CANARY_CPU_MIN_RATE}" >>"${capture}"
+  printf '%s\n' \
+    '[what this canary does NOT separate. It reads wall clock only, so an arm that took ten times as long could be a core doing less per cycle or a container that was not on a core at all. Where to look for the second is runner-kernel-cpu-time beside this capture and sandbox-host-cpu-time one layer down, and their steal columns do not read the same way. On the runner row a climb is proof this VM was preempted and a zero proves nothing, because nobody here launches that VM and the column is filled only where the hypervisor exposes the clock. One layer down the sandbox nodes are started with accel=kvm, which hands the guest that accounting, so a zero there means the node got every turn it asked for. Which is what makes the pair worth reading together: a sandbox zero under a climbing runner row puts the wait a layer above them. Read those first when an arm here is slow, and read each for what it covers: the runner-kernel rows are a pair bracketing the node-join wait, so they describe the whole join window next to these seconds rather than these seconds themselves, while the sandbox-host rows are a pair seconds apart inside the on-failure diagnostics block, taken minutes after the wait already failed and absent from a green run altogether]' \
+    '[the two samples. Sample 1 is taken before the node-join wait and sample 2 after it, on the failing and the passing path alike, on the same binaries in the same container. A difference between them puts the change inside the interval the pair brackets, which is the wait together with the readings taken on either side of it; two equally slow samples say it was already there going into that interval, which is the case the expected ranges above are the only instrument for -- the pair speaks for the interval between its own readings and for nothing before them]' \
+    '[this collector perturbs what it measures, which is why it is placed where it is. It occupies one core for the duration of each arm, twice per run. Sample 1 runs before the first reading of all three pairs that bracket the node-join wait, and sample 2 after the last of their second readings, so neither burn falls inside any interval those pairs divide by]' \
+    '[durations here are read from /proc/uptime, which the kernel prints in hundredths of a second, so every figure is quantised to 10ms. Against arms sized to take about a second that is about a percent, and it is why an arm finishing inside one tick is reported as being under the resolution rather than as a rate]' \
+    >>"${capture}"
+  printf '[read attempted from %s to %s epoch seconds]\n' \
+    "${read_at}" "${read_done}" >>"${capture}"
+
+  # Non-zero when no arm reported at all, and only then. An arm that finished
+  # inside one tick counts as having reported, so a capture holding that note
+  # instead of a rate still returns zero. Both call sites outside the
+  # diagnostics block consume this status to put a shortfall in the job log, and
+  # both of them run on the passing path, where the report is the artifact
+  # nobody downloads.
+  if [ "${readings}" -eq 0 ]; then
+    return 1
+  fi
+}
+
+# The shell run inside a worker's compute container to list QEMU's threads.
+#
+# A function rather than a literal at the call site so it can be run against a
+# tree of files instead of against a container: it takes the /proc to walk as
+# its first argument and defaults to the real one, which is the only argument
+# the caller passes. That seam is the whole reason the branches below can be
+# exercised at all -- staging a process whose threads are worth reading needs a
+# hypervisor, and the two outcomes this has to get right are "found QEMU" and
+# "QEMU is gone", the second of which is a routine result on this failure path.
+#
+# Written for the container's shell rather than for the runner's: virt-launcher
+# ships no bash, and every construct here is POSIX. It also shells out to
+# nothing except `getconf`, whose absence it names: `read` is a builtin, and a
+# probe that needed `cat` would report a container missing coreutils as a
+# container whose QEMU had exited -- which is one of the two readings this
+# collector exists to tell apart, manufactured rather than observed.
+#
+# For the same reason the walk counts what it managed to read. Having read no
+# process at all and having read them all without finding QEMU are different
+# findings, and only the second is about the guest.
+_cozy_thread_cpu_probe() {
+  cat <<'PROBE'
+proc_root=${1:-/proc}
+found=0
+seen=0
+lines=0
+printf 'clock ticks per second: %s\n' "$(getconf CLK_TCK 2>/dev/null || echo unavailable)"
+for comm_file in "${proc_root}"/[0-9]*/comm; do
+  comm=
+  read -r comm <"${comm_file}"
+  [ -n "${comm}" ] || continue
+  seen=$((seen + 1))
+  case "${comm}" in
+    qemu-*) ;;
+    *) continue ;;
+  esac
+  pid_dir=${comm_file%/comm}
+  found=1
+  printf 'process %s comm %s\n' "${pid_dir##*/}" "${comm}"
+  # One line per file, because that is all /proc/<pid>/task/<tid>/stat is, and
+  # `read` returns non-zero on a last line with no newline while still setting
+  # the variable -- so the status is not what decides whether anything arrived.
+  for stat_file in "${pid_dir}"/task/*/stat; do
+    stat_line=
+    read -r stat_line <"${stat_file}"
+    [ -n "${stat_line}" ] || continue
+    lines=$((lines + 1))
+    printf '%s\n' "${stat_line}"
+  done
+# On the loop rather than on either read, and that is not a style choice.
+# Redirections are applied left to right, so a `2>/dev/null` written after the
+# input redirect is not in place yet when opening the input fails -- and `read`
+# is a builtin, so the complaint is the shell's own and there is no child whose
+# stderr was ever covered. A thread that exits between the glob and the read is
+# routine here, this probe's stderr is the collector's error artifact, and a
+# healthy capture must not ship a warnings file naming something that did not
+# affect the reading. On the loop the redirect is in place before the body runs,
+# which is also the only spelling that holds in every shell.
+done 2>/dev/null
+if [ "${seen}" -eq 0 ]; then
+  printf '%s\n' 'NO-PROC-READ: not one process could be read under the proc mount, so this says nothing about what the container was running'
+elif [ "${found}" -eq 0 ]; then
+  printf '%s\n' "NO-QEMU-PROCESS: ${seen} process(es) were read and none is named qemu-*, so this container had no QEMU threads to read"
+elif [ "${lines}" -eq 0 ]; then
+  # QEMU was named and then gone: its comm was read and not one of its task
+  # stat files could be. Without this the probe exits clean carrying only a
+  # heading, and a heading is enough to make the capture non-empty, so the
+  # collector would pin a legend about columns onto a file that has none.
+  printf '%s\n' 'NO-THREAD-LINES: a qemu-* process was named and not one of its task stat files could be read, so it exited between the two reads'
+fi
+PROBE
+}
+
+# Split the compute container's CPU time across QEMU's threads, from inside it.
+#
+# This exists because the collector beside it measures the wrong subject for the
+# question it is usually read for. The throttling capture reads the compute
+# container's cgroup, and that cgroup holds every thread QEMU runs: the guest's
+# vCPUs, QEMU's main thread, and its IO and worker threads. So a container
+# burning most of its quota while the guest reports no progress at all is two
+# incompatible findings wearing one number -- a guest computing at its ceiling,
+# and a guest standing still while something beside it spends the quota -- and
+# no container-level counter can separate them. The per-thread split is the only
+# reading that can, and nothing else in this tree collects it.
+#
+# Read from inside the container rather than from the kubelet, which is the
+# opposite of what the throttling capture does and for a reason that does not
+# apply here: cAdvisor publishes per-container series and no per-thread ones, so
+# there is no outside surface carrying this at all. The cost of going inside is
+# the one that capture's comment names -- a reader that shares the cgroup it
+# measures slows down exactly when the answer matters -- which is why the read
+# is bounded and why a container that never answers gets a sentence rather than
+# an empty file. hack/e2e-capture-dataplane.sh reads a container's own cpu.stat
+# the same way, and the exec here carries no --request-timeout for the same
+# reason its execs do not: the flag bounds a request, and this is a streamed
+# connection whose bound is the wall-clock wrapper.
+#
+# Nothing is computed here. The stat lines go into the artifact verbatim and the
+# legend beside them says how to read the two fields that matter, because the
+# field positions are a trap that produces a wrong answer rather than an error:
+# the thread this capture exists to identify is the one whose name contains a
+# space.
+#
+# Takes the sample number it is writing, because it is called twice, and it is
+# called from the loop the other two subjects already share rather than from one
+# of its own: every counter here is cumulative since the thread started, so a
+# rate needs two readings, and the wait between them is the one already being
+# paid.
+cozy_capture_tenant_worker_thread_cpu() {
+  local sample="$1"
+  local report_dir="${COZY_REPORT_DIR:-/workspace/_out/cozyreport}/snapshots/${COZY_SNAPSHOT_NAME:-kubernetes}/tenant-thread-cpu/sample-${sample}"
+  local pods pod rc raw pod_err probe read_at read_done
+  local seen=0
+  # The pool's declared minimum is two workers, and the listing below counts
+  # only the Running ones, so this covers that pool scaled once over rather than
+  # a sample of it. Raising it is not free, and at today's knobs it is not
+  # possible: this walk is taken twice, the budget derivation in
+  # hack/run-kubernetes-node-join_test.bats holds the whole sampling group
+  # against the room the tenant snapshot needs behind it, and the next value up
+  # fails that guard. Read the current margin off the guard, which computes both
+  # sides, rather than off a number written here.
+  local max_pods=4
+
+  mkdir -p "${report_dir}"
+  # Re-validated here for the reason every collector re-validates them: a value
+  # assigned after this file is sourced never passed the assignment-time check,
+  # and zero reaches `timeout` as no bound at all.
+  COZY_DIAG_READ_TIMEOUT=$(_cozy_diag_seconds "${COZY_DIAG_READ_TIMEOUT-}" "$COZY_DIAG_READ_TIMEOUT_DEFAULT" COZY_DIAG_READ_TIMEOUT positive)
+  COZY_DIAG_READ_GRACE=$(_cozy_diag_seconds "${COZY_DIAG_READ_GRACE-}" "$COZY_DIAG_READ_GRACE_DEFAULT" COZY_DIAG_READ_GRACE)
+
+  # Running only, which the sibling caller does not ask for and does not need:
+  # it reduces its answer to node names, so a launcher left over from an earlier
+  # attempt costs it nothing. Here each Pod costs a bounded exec and a slot under
+  # the cap, and a Pod that is not Running has no container to exec into at all,
+  # so three dead launchers could push a live worker out of the walk and spend
+  # the budget on tombstones. Filtered in the query rather than after it: a Pod
+  # dropped here was never counted.
+  pods=$(_cozy_virt_launcher_listing "${report_dir}" 'per-thread CPU time capture' \
+    '{range .items[?(@.status.phase=="Running")]}{.metadata.name}{"\n"}{end}' \
+    'no Running virt-launcher Pod in namespace tenant-test; a Pod that is not Running has no compute container to read threads from, and that it is not Running is itself a finding about this failure') || return 1
+
+  probe=$(_cozy_thread_cpu_probe)
+
+  for pod in ${pods}; do
+    seen=$((seen + 1))
+    if [ "${seen}" -gt "${max_pods}" ]; then
+      echo "--- worker per-thread CPU capture stopped at ${max_pods} Pods ---"
+      printf 'capture stopped after %s Pods; %s matched in total\n' \
+        "${max_pods}" "$(printf '%s\n' "${pods}" | wc -l | tr -d ' ')" \
+        >"${report_dir}/COLLECTION-TRUNCATED.txt"
+      break
+    fi
+    echo "--- capturing worker per-thread CPU time: ${pod} ---"
+    raw="${report_dir}/${pod}.txt"
+    pod_err="${report_dir}/${pod}.exec-error.log"
+    rc=0
+    # Stamped on both sides of the read, which is what makes a pair of captures
+    # subtractable. One stamp would leave the sampling instant somewhere inside
+    # a read whose duration is exactly what goes wrong on the run this collector
+    # exists for; on a healthy read the two are the same second.
+    read_at=$(date -u +%s)
+    # Guarded the way the other collectors in this pair guard it: without the
+    # guard a runner with no `timeout` would exit 127 here and leave an empty
+    # directory, which is the one outcome this collector may not produce.
+    # stdin closed explicitly: `sh -c` inherits it, and this walk shares its
+    # stdin with the caller.
+    if command -v timeout >/dev/null 2>&1; then
+      timeout -k "${COZY_DIAG_READ_GRACE}" "${COZY_DIAG_READ_TIMEOUT}" \
+        kubectl -n tenant-test exec "${pod}" -c compute -- \
+        sh -c "${probe}" >"${raw}" 2>"${pod_err}" </dev/null || rc=$?
+    else
+      kubectl -n tenant-test exec "${pod}" -c compute -- \
+        sh -c "${probe}" >"${raw}" 2>"${pod_err}" </dev/null || rc=$?
+    fi
+    read_done=$(date -u +%s)
+    if [ ! -s "${pod_err}" ]; then
+      rm -f "${pod_err}"
+      pod_err=
+    elif [ "${rc}" -eq 0 ]; then
+      mv "${pod_err}" "${report_dir}/${pod}.READ-WARNINGS.txt" 2>/dev/null || true
+      pod_err=
+    fi
+    # Tested before anything is appended, or nothing is ever empty. Which arm
+    # fires is decided by the STATUS and never by whether anything landed on
+    # stderr: `timeout` kills its child without a word and kubectl dies on
+    # SIGTERM the same way, so the dominant failure here -- a container on a
+    # wedged node -- arrives non-zero with an empty error log, and keyed on
+    # stderr the artifact would state the opposite of what happened.
+    #
+    # An empty file is the dangerous outcome rather than a neutral one. Every
+    # thread of a stalled guest still accumulates a stat line, so zero bytes
+    # here reads as a guest whose threads were all idle -- which is one of the
+    # two readings this collector was added to tell apart, arrived at by
+    # default.
+    if [ ! -s "${raw}" ] && [ "${rc}" -ne 0 ]; then
+      if [ -n "${pod_err}" ]; then
+        printf '%s\n' \
+          'the thread split is unknown: the compute container was not reached; see the exec-error.log beside this file, named for the same Pod' \
+          >>"${raw}"
+      else
+        printf '%s\n' \
+          'the thread split is unknown: the compute container was not reached, and the read died without a word on either stream' \
+          >>"${raw}"
+      fi
+    elif [ ! -s "${raw}" ]; then
+      printf '%s\n' \
+        'the thread split is unknown: the compute container answered and returned nothing, which a shell that ran cannot produce -- the probe prints a line before it looks for a process' \
+        >>"${raw}"
+    elif [ "${rc}" -ne 0 ]; then
+      printf '%s\n' \
+        'these thread counters are incomplete: the read was cut short part way through the thread list, so the threads missing from it are the ones listed last rather than an arbitrary subset' \
+        >>"${raw}"
+    elif grep -q '^NO-QEMU-PROCESS:' "${raw}"; then
+      # A clean read that found nothing to read, which on this path is a
+      # finding: the guest's QEMU has already exited. Kept apart from the legend
+      # below because that legend describes stat lines, and this file holds
+      # none -- an explanation of a column layout over a file without columns is
+      # the same overclaim as a pairing instruction over a partial read.
+      printf '%s\n' \
+        'there is nothing to split: the container answered and carried no QEMU process, so this Pod contributes no thread counters to the pair' \
+        >>"${raw}"
+    elif grep -q '^NO-THREAD-LINES:' "${raw}"; then
+      # A heading and nothing under it. The file is not empty, so none of the
+      # arms above fire, and the legend below would explain a column layout the
+      # capture does not carry -- which is why the probe says this rather than
+      # leaving it to be inferred from a line count nobody takes.
+      printf '%s\n' \
+        'the thread split is unknown: QEMU was still named when the probe looked and its threads were gone before they could be read, so this Pod contributes no thread counters to the pair' \
+        >>"${raw}"
+    elif grep -q '^NO-PROC-READ:' "${raw}"; then
+      # Not the arm above, and the difference is the whole point of the probe
+      # counting what it read. That one is a statement about the guest; this one
+      # is a statement about the probe, and reading it as the guest's would put
+      # "QEMU had already exited" in the artifact on the strength of a proc
+      # mount nobody could open.
+      printf '%s\n' \
+        'the thread split is unknown: the shell ran and could not read a single process, so nothing here is a reading about what the guest was doing' \
+        >>"${raw}"
+    else
+      printf '%s\n' \
+        '[each line above beginning with a number is /proc/<pid>/task/<tid>/stat verbatim: the first field is the thread id, the second is the thread name in parentheses, utime is the 14th field and stime the 15th]' \
+        '[counting those fields over whitespace reads the wrong column for exactly the threads this capture exists to identify: a KVM vCPU thread is named CPU 0/KVM, that space sits inside the parentheses, and every field after it shifts by one. Parse from the last ) in the line instead, after which the state is the first field, utime the 12th and stime the 13th]' \
+        "[the names: CPU N/KVM is the guest's vCPU N, the thread whose id equals the process id is QEMU's main thread and its emulator thread, and the rest are QEMU's own IO and worker threads, which carry the process name unless QEMU renamed them]" \
+        '[utime and stime are clock ticks, at the rate the first line above reports, and both are cumulative since the thread started: subtract this Pod file from its sibling under the other sample directory, and the stamps below from each other, to get a rate per thread]' \
+        >>"${raw}"
+    fi
+    # kubectl exits 1 for a refused connection as readily as for a container
+    # that is gone, so the status alone names none of them and the error log is
+    # the only thing that can.
+    if [ "${rc}" -eq 124 ]; then
+      printf '%s\n' \
+        '[exit 124: this collector timing out and the read exiting 124 on its own cannot be told apart]' \
+        >>"${raw}"
+    fi
+    # 128+SIGKILL. The grace signal produces it, and so does anything else that
+    # kills the read, so the note says what the status establishes and stops
+    # there.
+    if [ "${rc}" -eq 137 ]; then
+      printf '%s\n' \
+        '[exit 137: the read was killed rather than stopping on its own; the status does not say what killed it]' \
+        >>"${raw}"
+    fi
+    printf '[read attempted from %s to %s epoch seconds]\n' \
+      "${read_at}" "${read_done}" >>"${raw}"
+    printf '\n[capture exit code: %s]\n' "${rc}" >>"${raw}"
+  done
+}
+
+# Two properties of the network family are invisible to anyone writing this
+# filter from the metric documentation, and both fail by capturing nothing:
+#
+#   - The dropped-packet families are spelled packets_dropped. There is no
+#     *_drops_total, which is the spelling the shorter name suggests.
+#   - Every row carries container="", including the per-Pod ones. cAdvisor
+#     publishes network counters on the Pod's sandbox cgroup, so the Pod is
+#     named by `pod` and the container label is empty on the whole family. A
+#     filter borrowed from the CPU capture above, whose rows do carry a
+#     container name, therefore matches nothing at all -- and nothing at all
+#     reads as a worker that moved no bytes.
+#
+# The node's own interfaces arrive in these same families with pod="" and
+# namespace="", which the namespace stage already excludes; worth knowing before
+# that stage looks redundant next to the Pod-name one.
+cozy_capture_tenant_worker_network_counters() {
+  _cozy_capture_worker_cadvisor \
+    tenant-network-counters \
+    'network counters capture' \
+    'how many bytes reached these workers' \
+    network \
+    cozy-net-counters \
+    _cozy_network_counters_tail_note \
+    '^container_network_(receive|transmit)_(bytes|packets|packets_dropped|errors)_total\{'
+}
+
+# How to read the device label, which is the one sentence here that holds on a
+# partial file as well as on a whole one. A function because more than one arm of
+# the note below prints it and a second copy is a scheduled divergence.
+_cozy_block_io_device_legend() {
+  printf '%s\n' \
+    '[the device labels here name HOST devices, and which of them backs the guest system disk is decided by the major rather than by the name: the kernel registers block major 147 for DRBD, so a container_blkio_device_usage_total row at that major with operation="Read" is the replicated volume the guest reads its image from]' \
+    >>"$1"
+}
+
+# Said in the file because which families arrive is decided by the kernel
+# interface under them, and a family's absence is not a reading about the disk.
+_cozy_block_io_tail_note() {
+  local raw="$1" rc="$2" filter_rc="$3" had_series="$4"
+  local start_rc=0 counter_rc=0
+
+  [ "${had_series}" -eq 1 ] || return 0
+  # Every sentence that reads the file AS A WHOLE reading is withheld from a read
+  # that did not finish, the way the CPU note withholds its pairing sentence and
+  # the sandbox capture withholds its column legend. On a truncated capture what
+  # is here is a prefix: a total over the container's age understates it by
+  # whatever never arrived, and a family missing from a prefix says nothing about
+  # the kernel interface that would explain its absence.
+  #
+  # The device legend is not one of those and stays: it explains how to read a
+  # label on the rows that did arrive, which is as true of a prefix as of a whole
+  # file, and a reader is most in need of it exactly when the file is short.
+  if [ "${rc}" -ne 0 ] || [ "${filter_rc}" -ge 2 ]; then
+    printf '%s\n' \
+      'these counters are cumulative since the container started, and this capture is marked incomplete above, so what is here may be a prefix of what the kubelet had: no averaging instruction and no reading of a missing family follows, because both would treat a prefix as the whole' \
+      >>"${raw}"
+    _cozy_block_io_device_legend "${raw}"
+    return 0
+  fi
+  # The divisor family is not a counter, and keeping it in the filter costs this
+  # sentence: the shared walk decides "the kubelet reported nothing for this
+  # subject" from whether ANY row survived, so a container cAdvisor knows about
+  # puts its start time in the file whether or not a single disk row arrived, and
+  # the walk's own "no series" arm can no longer fire. Without this the file would
+  # carry a start time, an instruction for dividing counters, and no counters --
+  # which is the reading this capture exists to make impossible. Decided on the
+  # subject families rather than on the row count, and on grep's exact status for
+  # the reason the arms below are.
+  grep -qE '^container_(blkio_device_usage_total|fs_|pressure_io_)' "${raw}" || counter_rc=$?
+  if [ "${counter_rc}" -eq 1 ]; then
+    printf '%s\n' \
+      'no block IO counter reached this file: what is above is a container start time, which cAdvisor publishes for any container it knows and which this capture keeps as the divisor for counters that did arrive. So the kubelet answered and reported no block IO for a tenant-test worker on this node -- not a worker that touched no disk' \
+      >>"${raw}"
+    return 0
+  fi
+  if [ "${counter_rc}" -ne 0 ]; then
+    printf '%s\n' \
+      'whether any block IO counter reached this file could not be checked: the search for the subject families failed on this runner rather than answering, so read the rows above before taking any sentence here as a statement about the disk' \
+      >>"${raw}"
+    _cozy_block_io_device_legend "${raw}"
+    return 0
+  fi
+  # Totals, and the note says so rather than calling them an average: an average
+  # needs a divisor, and the only reason this file can offer one is that the
+  # start-time row is kept in the filter.
+  #
+  # Two arms rather than the three the checks above take, because the check above
+  # already read this file: reaching here means grep returned 0 or 1 on it, so a
+  # third arm for "could not read it" would be unreachable by construction.
+  grep -q '^container_start_time_seconds{' "${raw}" || start_rc=$?
+  if [ "${start_rc}" -eq 0 ]; then
+    printf '%s\n' \
+      "these counters are cumulative since the container started and this is one reading of them, so what is above are totals and not a rate. container_start_time_seconds above is the divisor, one row per container rather than one per node, so take the row whose container and pod labels match the counters being divided: a worker Pod's container starts with the guest it carries and KubeVirt gives that Pod restartPolicy Never, so the container is never restarted under the guest, the read stamp below minus that start is the guest's own life, and a total over that span is the average across exactly the window the node-join deadline covers. A rate INSIDE that window needs a second capture of the same stream, which this collector does not take" \
+      >>"${raw}"
+  else
+    printf '%s\n' \
+      'these counters are cumulative since the container started and this is one reading of them, so what is above are totals and not a rate. The divisor is missing from this file: container_start_time_seconds carries it and no row of it survived here, so the container Started line in the virt-launcher describe dump is where the age has to come from' \
+      >>"${raw}"
+  fi
+  printf '%s\n' \
+    "[container_pressure_io_stalled_seconds_total and container_pressure_io_waiting_seconds_total, where they appear, answer this collector's question directly, since they count the time the group spent stalled on IO rather than the bytes it moved. Their absence is a setting rather than a quiet disk: cAdvisor publishes these families only when the kubelet turns its pressure metrics on, which sits behind a feature gate. The kernel is not the missing half on these nodes, since the sandbox kernel ships pressure accounting enabled]" \
+    >>"${raw}"
+  _cozy_block_io_device_legend "${raw}"
+  printf '%s\n' \
+    '[a missing service time or queue depth here is the kernel interface and not an idle disk: under cgroup v2 io.stat publishes transferred bytes and completed operations only, so container_fs_io_current and container_fs_io_time_seconds_total are either absent or carry the node filesystem counters cAdvisor falls back to, which are not this Pod]' \
+    >>"${raw}"
+}
+
+# Read how much each tenant worker moved through its block devices, from the
+# kubelet's cAdvisor endpoint on the node the worker runs on.
+#
+# This exists because a worker burning its whole vCPU while making no progress
+# has two mechanisms behind one appearance. It is computing and getting nowhere,
+# or it is waiting on blocks -- and a vCPU thread spinning in a wait on a nested
+# guest with no idle exit looks like a busy vCPU either way, at a quota with room
+# to spare and with the node under it half free. Nothing else in this tree counts
+# the worker's IO: the CPU counters beside it measure what the group was allowed
+# and what it got, the network counters measure what crossed into the Pod, and
+# both are blind to blocks by construction.
+#
+# The guest's own /proc/diskstats would answer it from inside, and cannot be
+# reached: the diagnostics credential minted for the guest carries the os:reader
+# role, which Talos does not allow to read file contents at all, and Talos
+# publishes no resource carrying disk statistics. The Pod's cgroup is the nearest
+# surface that exists, and it sits outside the guest, so a wedged guest does not
+# slow the reading down.
+#
+# Read once rather than twice, unlike its neighbours in the sampling loop, and
+# the counter's own origin is why: it accumulates from the container starting,
+# which for a worker Pod is when the guest was created. A single reading is
+# therefore an average over the guest's whole life, and the guest's whole life IS
+# the window the deadline covers on this failure. What one reading cannot give is
+# a rate inside that window, which is what would separate a guest reading slowly
+# throughout from one that read its image and then burned CPU; the file says so
+# where the rows are.
+cozy_capture_tenant_worker_block_io() {
+  # Anchored on the metric names, and the namespace is not a worker filter: the
+  # tenant-test namespace also carries the Kamaji control plane, whose apiserver
+  # and etcd have disks of their own, so the Pod name carries the second half of
+  # the filter as it does for the sibling captures.
+  #
+  # container_blkio_device_usage_total is the row that survives cgroup v2 with an
+  # operation and a device major on it, so it is the one that attributes reads to
+  # a volume; the fs_* families are kept beside it because a node that publishes
+  # the service-time ones must not produce an artifact identical to a node that
+  # cannot.
+  #
+  # container_start_time_seconds is in the filter for a different reason from
+  # every other family here: it is not a counter but the divisor these counters
+  # need. cAdvisor publishes it for any container it knows, outside the disk
+  # group, and keeping it is what lets one reading of a cumulative total be read
+  # as an average without leaving the file for a Started line in a describe dump.
+  #
+  # It costs two things, both paid rather than left implicit. The subject word
+  # below names it, because the shared walk builds its "reported no <subject>
+  # series" sentences from that word and a sentence naming only block IO would be
+  # false about a file holding a start time. And the tail note decides "no
+  # counter arrived" on the subject families rather than on the walk's row count,
+  # which this family would otherwise make always true.
+  _cozy_capture_worker_cadvisor \
+    tenant-block-io \
+    'block IO counters capture' \
+    'how much these workers moved through their disks' \
+    'block IO or container start-time' \
+    cozy-block-io \
+    _cozy_block_io_tail_note \
+    '^container_(blkio_device_usage_total|start_time_seconds|fs_((reads|writes)(_bytes)?_total|(read|write)_seconds_total|io_(current|time_seconds_total|time_weighted_seconds_total))|pressure_io_(stalled|waiting)_seconds_total)\{'
+}
+
+# Collect the guest-side evidence requested by issue #3513. This runs only after
+# the 18-minute Ready deadline has already failed. VMIs without a reported IP
+# are recorded before any Certificate or Pod is created; when at least one IP is
+# available, setup and each Talos command remain bounded. It runs before slower
+# cache diagnostics so the requested guest evidence lands first.
+cozy_capture_tenant_talos() (
+  local test_name="$1"
+  local report_dir="${COZY_REPORT_DIR:-/workspace/_out/cozyreport}/snapshots/${COZY_SNAPSHOT_NAME:-kubernetes}/tenant-talos"
+  local selector="cluster.x-k8s.io/cluster-name=kubernetes-${test_name},cluster.x-k8s.io/role=worker"
+  local pod_name="kubernetes-${test_name}-talos-diagnostics"
+  local workdir vmi_name node_ip
+  local has_node_ip=false
+
+  umask 077
+  workdir=$(mktemp -d) || return 1
+  chmod 700 "${workdir}"
+  trap 'rm -rf "${workdir}"' EXIT
+  mkdir -p "${report_dir}"
+
+  if ! kubectl -n tenant-test get virtualmachineinstances.kubevirt.io \
+    -l "${selector}" -o json --request-timeout=30s >"${report_dir}/vmis.json" \
+    2>"${report_dir}/vmis-error.log"; then
+    echo "failed to list tenant worker VMIs for Talos diagnostics" >&2
+    return 1
+  fi
+  cozy_tenant_worker_vmi_rows <"${report_dir}/vmis.json" >"${workdir}/vmis.rows"
+  if [ ! -s "${workdir}/vmis.rows" ]; then
+    echo "no tenant worker VMIs found for Talos diagnostics" >&2
+    printf 'no tenant worker VMIs matched selector %s\n' "${selector}" \
+      >"${report_dir}/setup-error.log"
+    return 1
+  fi
+
+  # Record missing addresses before spending time on Certificate issuance or a
+  # helper Pod. If no worker booted far enough for KubeVirt to report an IP,
+  # guest-side Talos is unreachable and setup cannot produce more evidence.
+  while IFS='|' read -r vmi_name node_ip; do
+    if [ -z "${node_ip}" ]; then
+      mkdir -p "${report_dir}/${vmi_name}"
+      printf '%s\n' 'default VMI interface has no reported IP address' \
+        >"${report_dir}/${vmi_name}/capture-error.log"
+      continue
+    fi
+    has_node_ip=true
+  done <"${workdir}/vmis.rows"
+  if [ "${has_node_ip}" != true ]; then
+    echo "no tenant worker VMI has a reported IP for Talos diagnostics" >&2
+    printf '%s\n' 'no tenant worker VMI has a reported IP for Talos diagnostics' \
+      >"${report_dir}/setup-error.log"
+    return 1
+  fi
+
+  if ! cozy_prepare_tenant_talosconfig "${test_name}" "${workdir}"; then
+    echo "failed to create short-lived tenant Talos reader config" >&2
+    printf '%s\n' 'failed to create short-lived tenant Talos reader config' \
+      >"${report_dir}/setup-error.log"
+    return 1
+  fi
+  if ! cozy_prepare_tenant_talos_diagnostics_pod \
+    "${test_name}" "${workdir}/talosconfig"; then
+    echo "failed to prepare tenant Talos diagnostics Pod" >&2
+    printf '%s\n' 'failed to prepare tenant Talos diagnostics Pod' \
+      >"${report_dir}/setup-error.log"
+    return 1
+  fi
+
+  while IFS='|' read -r vmi_name node_ip; do
+    [ -n "${node_ip}" ] || continue
+    echo "--- capturing tenant Talos dmesg/kubelet/services/links: ${vmi_name} (${node_ip}) ---"
+    cozy_capture_tenant_talos_node "${pod_name}" "${node_ip}" \
+      "${report_dir}/${vmi_name}"
+  done <"${workdir}/vmis.rows"
+)
+
+# _cozy_diag_seconds <value> <default> <name>: echo <value> when it is a bare
+# non-negative integer, else echo <default> and say on stderr that the value was
+# rejected.
+#
+# The rejection names no unit, because three of its four callers are seconds and the
+# fourth is a Pod count: telling someone their importer cap must be "integer seconds"
+# describes the wrong quantity, and the whole point of these notes is that they say
+# something true about what was seen.
+#
+# Every knob below is pasted somewhere that accepts digits and nothing else, and
+# each fails differently and quietly:
+#
+#   COZY_DIAG_PHASE_BUDGET=8m  -- goes into $(( )) inside cozy_diag_phase_start,
+#     which is the FIRST statement of the diagnostics block. The arithmetic error
+#     unwinds the whole function before its own headline, so the failing run
+#     produces no diagnostics at all, only the shell's complaint. The worst
+#     outcome on this path, arrived at through a knob.
+#   COZY_DIAG_READ_TIMEOUT=2m  -- becomes --request-timeout=2ms and every read
+#     fails instantly, so every note blames the cluster for a value.
+#   COZY_DIAG_MAX_IMPORTERS=3s -- `[ n -gt 3s ]` exits 2, the `if` reads false and
+#     the cap silently stops existing, which is the term this block capped on
+#     purpose.
+#
+# A leading zero is rejected along with a suffix, and it is the arm that is easy to
+# leave out. `0480` is all digits, so a digits-only check passes it through, and
+# then `$(( ))` reads it as octal and fails exactly as `8m` does -- same total loss
+# of the block, one character less obvious. For the read bound the same value is
+# quieter and worse: `timeout -k 5 0480` is 480 seconds, so the per-call bound this
+# whole change exists to add would be 24 times wider than the number says.
+#
+# Rejecting and naming the fallback is what the rest of this tree does with its own
+# knobs, including this arm: hack/e2e-capture-previous-logs.sh rejects a zero or
+# leading-zero COZY_PREVLOG_TAIL for the same octal reason, and
+# docs/agents/e2e-testing.md records that contract.
+# A fourth argument, any non-empty value, rejects zero as well; it is a flag rather
+# than a bound, and the call site spells it `positive`. Zero is all digits and
+# passes every check above, and `timeout -k 5 0` disables the timeout outright while
+# `--request-timeout=0s` means "no timeout" to kubectl -- the defect this change
+# exists to remove, reachable through the knob it adds. The phase budget must keep
+# accepting zero: the suite uses it to mean "already spent".
+#
+# A fifth argument replaces the parenthetical that says why zero is refused, and it
+# exists because the flag now has more than one caller and they refuse zero for
+# different reasons. For a bound, zero removes the ceiling. For the sampling
+# interval it removes nothing and leaves two readings taken at the same instant --
+# a pair that looks collected and divides to nothing. One sentence covering both
+# would have to say neither.
+_cozy_diag_seconds() {
+  if [ -n "${4:-}" ] && [ "${1}" = 0 ]; then
+    echo "» WARNING: ignoring ${3}='${1}' (${5:-zero disables the bound instead of tightening it}); using ${2}" >&2
+    printf '%s\n' "${2}"
+    return 0
+  fi
+  case "${1}" in
+    '' | *[!0-9]*)
+      echo "» WARNING: ignoring ${3}='${1}' (a bare integer, no unit suffix); using ${2}" >&2
+      printf '%s\n' "${2}"
+      ;;
+    0?*)
+      echo "» WARNING: ignoring ${3}='${1}' (a leading zero is read as octal in arithmetic and as decimal elsewhere); using ${2}" >&2
+      printf '%s\n' "${2}"
+      ;;
+    *) printf '%s\n' "${1}" ;;
+  esac
+}
+
+# Per-read wall-clock bound for the on-failure diagnostics in
+# run_kubernetes_test, and the kill grace that follows it. Named once so a note
+# reporting a cut-off cannot quote a number the read never used, and overridable
+# so a test does not have to wait out the real one.
+#
+# Lower than the bound most of the collectors in this file use, and the difference is
+# count rather than confidence: those bound a single read or a short walk, while the
+# block below issues a dozen back to back, so the same per-read bound would put the
+# block's own ceiling ahead of the tenant crust-gather snapshot it exists to reach.
+# The worker counter captures are the exception and deliberately so: they
+# share one body that is a short walk by that measure, and it still takes this
+# knob rather than a higher literal, because a bound that does not follow the
+# knob is a bound nobody can lower. Read the sentence above as describing the
+# collectors that predate the knob, not as a rule for new ones.
+# Every read here is one get/describe/logs against a small tenant or a handful of
+# cluster-scoped objects, which an apiserver that answers at all answers in under a
+# second.
+#
+# Integer seconds, no unit suffix. `timeout` would accept `2m`, but the same value
+# is pasted into `--request-timeout=${...}s`, where `2m` becomes `2ms` and every
+# read fails instantly -- a note about the cluster manufactured by a knob.
+# Each default is named once. Passed as a literal at every call site instead, a
+# changed default would leave the re-checks below still falling back to the old
+# number -- and only on the error path, where it is hardest to notice.
+COZY_DIAG_READ_TIMEOUT_DEFAULT=20
+COZY_DIAG_READ_GRACE_DEFAULT=5
+COZY_DIAG_MAX_IMPORTERS_DEFAULT=3
+# The wait between the two passes over the counters that only mean something as
+# a pair. Every counter those two collectors read is cumulative, so a single
+# reading divides out to an average over the container's whole uptime and says
+# nothing about the window the deadline covered; the difference between two
+# readings does.
+#
+# It is the WAIT and not the interval those readings span: each pass also walks
+# its nodes, and the other subject's pass falls between a subject's two
+# readings. The captures stamp themselves for that reason, and a rate is
+# computed from the stamps rather than from this number.
+#
+# Short on purpose, and this is the one number here chosen for what it measures
+# rather than for what it costs. The profile being separated is a guest that
+# freezes for tens of seconds and then runs flat out, and a window long enough
+# to contain both halves averages them back into the figure that could not tell
+# them apart in the first place. A window of this size lands inside one half or
+# the other, which is what makes the pair a discriminator rather than a second
+# copy of the average.
+#
+# It is also the whole wall-clock cost this pair adds to a failing run, since
+# the two collectors share it: both take their first reading, the interval
+# passes once, and both take their second.
+COZY_DIAG_RATE_INTERVAL_DEFAULT=12
+# What the diagnostics phase may spend. A whole number of minutes, because the
+# guard in hack/run-kubernetes-node-join_test.bats holds it against the figure
+# both kubernetes-*/chainsaw-test.yaml state in minutes, and a budget that is
+# not one leaves that statement rounded rather than true.
+#
+# Two bounds fix it, and both are held in that file rather than here.
+#
+# From below: the collectors gated ahead of the serial console must not be able
+# to spend the whole phase between them at their own ceilings. What sits ahead
+# of the console bounds what the console can lose, and a budget under their sum
+# turns "cut short" into "never started" for the one surface that survives a
+# worker which never reached apid.
+#
+# From above: this budget, one overshoot by the heaviest collector, and the
+# tenant crust-gather snapshot all have to fit in what the operation has left
+# once the bringup ahead of them is spent. That is the inequality the number
+# answers to, and raising the budget without raising the operation moves the
+# snapshot past the end of the window.
+#
+# What a budget of this size gives up first is what is gated last -- the
+# talos_image_cache_diagnose re-probe. It has no substitute, but it is also the
+# heaviest late collector because it creates a Pod and waits on curl retries.
+#
+# Only part of what runs ahead of the console is held mechanically, and the
+# boundary is worth naming rather than leaving a reader to trust the whole of
+# it: the guard walks the collectors gated ahead of the console -- the ones
+# called as `cozy_… || true` -- and fails on any it has no cost arm for, so a
+# walk added there is priced before the suite goes green. A bounded read added
+# ahead of the console, as (a3) is, is not in that enumeration and its 25s are
+# not summed there. That gap is recorded where the other budget residuals are
+# rather than fixed here.
+#
+# What is deliberately NOT ahead of the console is the two-sample CPU pair,
+# whose own ceiling is several times this one; the ordering argument at the pair
+# says the rest.
+COZY_DIAG_PHASE_BUDGET_DEFAULT=480
+
+# The operation both kubernetes-*/chainsaw-test.yaml give the script, and the
+# room the passing-path console baseline needs inside it. Constants rather than
+# knobs: neither is a budget a caller tunes, they are a restatement of a ceiling
+# that lives in the suite files, and the guard in
+# hack/run-kubernetes-serial-console_test.bats reads both sides so a suite that
+# changes its `timeout:` fails there rather than silently leaving the reserve
+# measured against a ceiling that moved.
+#
+# The reserve is the capture's own cost at the cap that caller asks for -- a
+# listing, two console reads, the two Pod-state reads a silent console triggers
+# and the start-time read, six at the 30s bound and 5s kill grace, so 210s --
+# plus a minute. It buys one thing: a run that is already near the ceiling
+# declines the baseline instead of being killed while collecting it, because a
+# suite that proved everything it exists to prove must not go red over a
+# debugging aid.
+#
+# The extra minute is slack, not a bound on what follows. The teardown between
+# this capture and the end of the function carries no wall-clock ceiling of its
+# own -- `--wait=false` bounds what the deletes wait for, not how long the
+# request itself may hang -- so no finite reserve makes the tail of a run fit by
+# arithmetic. That is pre-existing and tracked in cozystack/cozystack#3666; what
+# the reserve bounds is this capture's own contribution to the ceiling, which is
+# the part this file added.
+COZY_OP_CEILING=4020
+COZY_GREEN_CAPTURE_RESERVE=270
+# Zero until run_kubernetes_test stamps it. Declared here so the arithmetic in
+# cozy_green_capture_has_room cannot meet an unbound name: under the `set -eu`
+# the chainsaw script runs with, that aborts the whole function, which is the
+# very outcome -- a passing run ending red -- the reserve exists to prevent. A
+# zero left in place fails closed rather than quietly: the elapsed time it
+# implies is the whole epoch, so the capture is declined and says so.
+_COZY_RUN_STARTED_AT=0
+COZY_DIAG_READ_TIMEOUT=$(_cozy_diag_seconds "${COZY_DIAG_READ_TIMEOUT:-$COZY_DIAG_READ_TIMEOUT_DEFAULT}" "$COZY_DIAG_READ_TIMEOUT_DEFAULT" COZY_DIAG_READ_TIMEOUT positive)
+# Validated too, though a suffix is not what breaks it: `timeout -k abc 20` exits 125
+# before running the command at all, so a non-numeric grace makes every read in the
+# block report exit 125 and collects nothing -- the same total loss the other knobs
+# were validated against. Zero is allowed here: `-k 0` only skips the follow-up
+# SIGKILL, which a TERM-respecting child like kubectl does not need.
+COZY_DIAG_READ_GRACE=$(_cozy_diag_seconds "${COZY_DIAG_READ_GRACE:-$COZY_DIAG_READ_GRACE_DEFAULT}" "$COZY_DIAG_READ_GRACE_DEFAULT" COZY_DIAG_READ_GRACE)
+# How many CDI importer Pods get their logs walked. Each costs two reads, so an
+# uncapped walk is a term the cluster sizes rather than this file, inside a block
+# that has to finish. The default covers the pool at its minimum with room to spare,
+# and a walk that hits the cap says so with both counts rather than leaving the
+# shortfall implicit.
+COZY_DIAG_MAX_IMPORTERS=$(_cozy_diag_seconds "${COZY_DIAG_MAX_IMPORTERS:-$COZY_DIAG_MAX_IMPORTERS_DEFAULT}" "$COZY_DIAG_MAX_IMPORTERS_DEFAULT" COZY_DIAG_MAX_IMPORTERS)
+# Rejected as `positive` for a reason the other bounds do not have: zero here is
+# not a disabled bound but two readings taken at the same instant, which divide
+# to nothing and leave a pair that looks collected and answers no question.
+COZY_DIAG_RATE_INTERVAL=$(_cozy_diag_seconds "${COZY_DIAG_RATE_INTERVAL:-$COZY_DIAG_RATE_INTERVAL_DEFAULT}" "$COZY_DIAG_RATE_INTERVAL_DEFAULT" COZY_DIAG_RATE_INTERVAL positive "zero puts both readings at the same instant, so the pair divides to nothing")
+# The canary ceiling takes the same source-time pass as its neighbours, and not
+# only for symmetry: the collector re-validates with `${COZY_CANARY_RUN_BOUND-}`,
+# so without this line a run that never set the knob hands the validator an
+# empty string, and the job log opens with a warning about ignoring a value
+# nobody supplied. Rejected as `positive` because zero reaches `timeout` as no
+# bound at all.
+COZY_CANARY_RUN_BOUND=$(_cozy_diag_seconds "${COZY_CANARY_RUN_BOUND:-$COZY_CANARY_RUN_BOUND_DEFAULT}" "$COZY_CANARY_RUN_BOUND_DEFAULT" COZY_CANARY_RUN_BOUND positive "zero is no ceiling at all, and an arm that never returns costs the phase whatever is gated behind it")
+
+# Wall-clock budget for the on-failure diagnostics phase as a whole, on top of the
+# per-read bounds above, because the two buy different things. A per-read bound
+# buys forward progress: one hung call can no longer eat the step. It does not buy
+# an end to the phase, and the collectors on this path can together spend more than
+# what is left of the op by the time it runs. Bounding every read and stopping
+# there would have made the arithmetic in kubernetes-*/chainsaw-test.yaml legible
+# and still false.
+#
+# So the phase is bounded as a phase. Once the budget is spent, the collectors that
+# have not started are declined out loud instead of attempted, which keeps the one
+# artifact that must survive reachable: the tenant crust-gather snapshot the
+# caller's `exit 1` triggers.
+#
+# The budget is derived rather than chosen, from
+#
+#   budget + largest overshoot + snapshot <= op - bringup
+#
+# Every term but the budget belongs to something else: the op ceiling lives in both
+# kubernetes-*/chainsaw-test.yaml, the snapshot's bound is on the crust-gather call
+# above, and bringup is an observed figure rather than a ceiling. The overshoot
+# term exists because admission gates when a collector may START, not when it ends,
+# so one admitted a moment before the deadline still runs its whole cost. The
+# default below is the largest whole minute under the bound that inequality gives.
+# hack/run-kubernetes-node-join_test.bats holds the inequality against the code, so
+# a later change cannot raise the budget past what the collectors leave room for.
+#
+# `largest` is a literal in that guard, taken from the heaviest collector at the
+# pool's MINIMUM size, which makes it a floor and not a ceiling: the guest-Talos
+# walk carries no cap, so a bigger pool makes that collector cost more than the
+# figure the budget was derived against. Nor does it cover the collectors with no
+# wall-clock bound at all. On the guest-Talos path the applies, waits and deletes
+# carry `--request-timeout`/`--timeout`, which bounds one HTTP request rather than
+# a client retrying against a wedged apiserver, and the image-cache re-probe makes
+# unbounded calls of its own. Both are tracked in cozystack/cozystack#3666. So no
+# worst case is claimed here, and none can be stated while that holds.
+#
+# What the budget buys, exactly and only, is that no collector is STARTED once it
+# is spent, so the snapshot is never queued behind work begun past the deadline.
+# That is how the snapshot was being lost.
+#
+# Admission is "the budget is not spent yet" rather than "this collector fits in
+# what is left", and that is a choice. Sizing admission per collector would hold
+# the phase to its budget exactly, and would also decline the guest-Talos capture
+# on a merely slow run, throwing away the only in-guest evidence to protect a
+# snapshot that was not yet in danger. Start-gating leaves that to the cheap-first
+# order below, and the image-cache diagnosis is the collector this budget gives up
+# first, which is worth knowing before its dumps are relied on.
+COZY_DIAG_PHASE_BUDGET=$(_cozy_diag_seconds "${COZY_DIAG_PHASE_BUDGET:-$COZY_DIAG_PHASE_BUDGET_DEFAULT}" "$COZY_DIAG_PHASE_BUDGET_DEFAULT" COZY_DIAG_PHASE_BUDGET)
+# Zero until a phase opens, which is how the scheduling-gate branch -- two reads,
+# no phase -- stays ungated.
+_COZY_DIAG_PHASE_DEADLINE=0
+
+# cozy_diag_phase_start: open the diagnostics phase and stamp its deadline.
+#
+# There is no closing counterpart, because both callers end in `exit 1` a few
+# lines later and a function that only ever runs before an exit does not need
+# one. A future caller that opens a phase and then carries on would gate every
+# later read on a spent deadline, and would need to clear it.
+cozy_diag_phase_start() {
+  # Said once, here, rather than letting a dozen notes imply it, and said narrowly
+  # because the phase is not uniform. The reads that go through cozy_diag_read, the
+  # importer listing and the image-cache helper fall back to running unbounded, since
+  # bounding with a binary that is not there would turn each of them into an exit 127
+  # and each note into "read failed" -- a missing local dependency reported as the
+  # cluster refusing. Unbounded is what this path had before any of this, so a partial
+  # capture beats none, and what it costs is the guarantee.
+  #
+  # The collectors that call `timeout` directly -- the wedge check below, the
+  # serial-console family and the guest-Talos capture -- have no such fallback and do
+  # exit 127, collecting nothing. That is pre-existing and tracked in
+  # cozystack/cozystack#3666; the warning names both halves rather than promising the
+  # better one for all of them.
+  #
+  # A third group belongs to neither half: those collectors call `timeout`
+  # directly AND carry the same fallback, so on a runner without the binary they
+  # run unbounded rather than exiting 127. That is the opposite failure from the
+  # one the sentence above would lead a reader to, and it is the half with the
+  # snapshot behind it, so the warning below names them one at a time. Only
+  # there: that list is derived from the source by
+  # hack/run-kubernetes-node-join_test.bats, and a second copy up here would be
+  # an unchecked list sitting beside a checked one, drifting from it at whatever
+  # rate collectors are added.
+  command -v timeout >/dev/null 2>&1 || \
+    echo "» WARNING: timeout is not on PATH; the bounded reads below run UNBOUNDED, so one that hangs can still take the op and the tenant snapshot with it, and the collectors that call timeout directly (wedge check, serial console, guest Talos) exit 127 and collect nothing; the ones that guard the call with command -v -- the worker CPU throttling, worker network counter, worker block IO counter, sandbox node CPU time, sandbox kernel KVM counters, runner kernel CPU time, sandbox QEMU per-thread CPU time, runner fixed-work canary, worker per-thread CPU time and talos-image-cache capture -- keep collecting instead, unbounded" >&2
+  # Re-checked here, not only at assignment: a value set after this file is sourced
+  # -- which is how a test sets it -- would otherwise reach the arithmetic below
+  # unvalidated, and that is the one failure that costs the whole block.
+  COZY_DIAG_PHASE_BUDGET=$(_cozy_diag_seconds "${COZY_DIAG_PHASE_BUDGET-}" "$COZY_DIAG_PHASE_BUDGET_DEFAULT" COZY_DIAG_PHASE_BUDGET)
+  _COZY_DIAG_PHASE_DEADLINE=$(( $(date +%s) + COZY_DIAG_PHASE_BUDGET ))
+}
+
+# cozy_diag_phase_has_time <what>: 0 while the phase can still afford <what>, 1
+# once it cannot -- and on 1 it says which collector was declined and why.
+#
+# Declining out loud is the whole point. A collector that silently stops running
+# leaves a bundle that looks like one where nothing was wrong, which is the
+# reading this failure path exists to prevent; and what is missing here is
+# missing from the log, not from the cluster.
+#
+# The note goes to stderr for the same reason cozy_diag_read's do, and it is
+# called from inside that function, so it inherits the trap exactly: two of its
+# call sites pipe stdout through grep, and a note on stdout is dropped by the
+# filter at precisely the reads that were declined.
+cozy_diag_phase_has_time() {
+  [ "${_COZY_DIAG_PHASE_DEADLINE}" -ne 0 ] || return 0
+  [ "$(date +%s)" -ge "${_COZY_DIAG_PHASE_DEADLINE}" ] || return 0
+  echo "=== ${1}: not collected — the diagnostics phase spent its ${COZY_DIAG_PHASE_BUDGET}s budget and the tenant crust-gather snapshot after it needs the rest of the op; nothing here was observed either way ===" >&2
+  return 1
+}
+
+# cozy_green_capture_has_room <what>: 0 while the operation can still afford
+# <what> on the PASSING path, 1 once it cannot -- and on 1 it says which
+# collector was declined and why.
+#
+# The failure path's counterpart above bounds a phase against a budget of its
+# own. This one has no phase to bound: it runs after everything the suite
+# proves, inside an operation whose ceiling the bringup ahead of it has already
+# spent an unknown share of. So the quantity is what is LEFT of that ceiling,
+# and the only way to know it is the stamp taken when the function began.
+#
+# A function rather than two lines at the call site, because the direction of
+# the comparison is the whole safety property and a predicate is something a
+# test can drive both ways. Inlined, the only coverage available is a grep for
+# the line, which passes just as well when the comparison is inverted -- and an
+# inverted one runs the capture on exactly the runs that cannot afford it.
+cozy_green_capture_has_room() {
+  local elapsed=$(( $(date +%s) - _COZY_RUN_STARTED_AT ))
+
+  [ "$(( COZY_OP_CEILING - elapsed ))" -lt "${COZY_GREEN_CAPTURE_RESERVE}" ] || return 0
+  # States the room asked for rather than the cost, because those are different
+  # numbers and the gate compares against the first: the reserve is the capture's
+  # own worst case plus slack, so reporting it as what the capture costs would
+  # overstate the collector by the slack every time this fires.
+  echo "» ${1}: not collected — ${elapsed}s of the ${COZY_OP_CEILING}s operation are spent and this needs ${COZY_GREEN_CAPTURE_RESERVE}s of room to start; nothing here was observed either way" >&2
+  return 1
+}
+
+# cozy_diag_read <label> <command...>: run one diagnostic read under a wall-clock
+# bound, and name the outcome when it does not finish. Used by both on-failure
+# blocks in run_kubernetes_test, which end in the same `exit 1` and so depend on
+# the same snapshot staying reachable.
+#
+# Notes go to stderr rather than stdout because two call sites pipe the read's
+# stdout through grep to keep the log readable, and a note on stdout would be
+# filtered out by exactly the runs that need it.
+#
+# The note says what was observed and stops there. This helper is shared by every
+# bounded read here and cannot know what any one of them was asking, so "the read
+# did not finish" is the whole claim; the branch that owns a question is the only
+# place a consequence could be drawn from it. That distinction is the point: a
+# read that was cut off is silence about the cluster, not a finding about it, and
+# an empty node table reported as a finding sends the next reader after a cluster
+# that was never looked at.
+#
+# Always returns 0. Every call site sits on a path that ends in the caller's
+# `exit 1`, and a non-zero return here would replace that exit under `set -e` —
+# handing the suite's exit status, and the snapshot that hangs off it, to a
+# collector.
+cozy_diag_read() {
+  local label="$1"
+  shift
+  local rc=0
+
+  # Checked here rather than only at the section boundaries so the guarantee is
+  # total: whatever order a future edit puts these reads in, none of them can be
+  # issued after the phase is out of budget.
+  cozy_diag_phase_has_time "${label}" || return 0
+  # Re-checked here rather than only at assignment, and here rather than in
+  # cozy_diag_phase_start, because the scheduling-gate branch calls this without
+  # opening a phase. The value that makes it necessary is zero: `timeout -k 5 0`
+  # disables the timeout and `--request-timeout=0s` means no timeout to kubectl, so
+  # a zero assigned after sourcing -- which is how a caller adjusts this -- restores
+  # the unbounded read on the wedged-apiserver path with no warning and no note. The
+  # corrected value is written back so the warning is not repeated per read. That
+  # write-back is discarded at the two call sites whose stdout is piped through
+  # grep, since a pipeline runs its left side in a subshell, and it does not show:
+  # both blocks validate the knob before composing the per-request string, so the
+  # value is already corrected before any read here runs. A caller that reaches
+  # this function with a bad value and no such validation would warn per read.
+  # The node-join block validates it once more before composing its
+  # `--request-timeout` string; this check is what covers the scheduling-gate branch,
+  # which calls straight in here without opening a phase.
+  COZY_DIAG_READ_TIMEOUT=$(_cozy_diag_seconds "${COZY_DIAG_READ_TIMEOUT-}" "$COZY_DIAG_READ_TIMEOUT_DEFAULT" COZY_DIAG_READ_TIMEOUT positive)
+  COZY_DIAG_READ_GRACE=$(_cozy_diag_seconds "${COZY_DIAG_READ_GRACE-}" "$COZY_DIAG_READ_GRACE_DEFAULT" COZY_DIAG_READ_GRACE)
+  # Unbounded when `timeout` is absent, rather than bounded-into-exit-127. Running
+  # the read is what this path did before any of this, and a partial capture beats
+  # eleven notes blaming the cluster for a missing local binary. Same shape the
+  # previous-logs collector uses, and cozy_diag_phase_start says it once out loud.
+  # `command -v` is a builtin, so asking per read costs nothing and keeps this
+  # correct when a caller adjusts PATH mid-run.
+  if command -v timeout >/dev/null 2>&1; then
+    timeout -k "${COZY_DIAG_READ_GRACE}" "${COZY_DIAG_READ_TIMEOUT}" "$@" || rc=$?
+  else
+    "$@" || rc=$?
+  fi
+  case "${rc}" in
+    0) ;;
+    124)
+      # "did not finish", not "did not answer": a `logs` or `describe` read can
+      # print most of its output and still be cut off, so the claim is about the
+      # read ending early rather than about it saying nothing.
+      echo "=== ${label}: read did not finish within ${COZY_DIAG_READ_TIMEOUT}s and was cut off; whatever it had not printed is absent from this log, not absent from the cluster ===" >&2
+      ;;
+    137)
+      # 128+SIGKILL. The -k grace above produces this, and so does anything else
+      # that kills the read — a loaded runner's OOM killer, a teardown
+      # signalling the process group. "timed out after 20s" would state a cause
+      # this never observed, and a read killed at second two is not one that ran
+      # the full twenty.
+      echo "=== ${label}: read was killed before it finished (SIGKILL); whatever it had not printed is absent from this log, not absent from the cluster ===" >&2
+      ;;
+    *)
+      echo "=== ${label}: read failed (exit ${rc}); what it would have shown was not observed ===" >&2
+      ;;
+  esac
+  return 0
+}
+
+# Diagnostics for the node-join failure at the call site in run_kubernetes_test:
+# fewer than 2 tenant nodes became Ready inside its 29m deadline.
+#
+# The tenant's cilium-operator HR reports "InProgress" here purely because zero
+# worker Nodes joined, so the HelmRelease condition alone cannot tell apart
+# (2a) the worker VM never booted (virt-launcher Pending/OOMKilled) from (2b) the
+# VM booted fine but its kubelet never registered a Node (Talos/CSR/DNS/routing).
+# The captures below make that distinction legible; (2b) is the failure mode a
+# follow-up fix has to target, and it cannot be designed without this artifact.
+#
+# Every read is bounded and the one walk is capped, for the reason that makes
+# this block worth having in the first place: it runs when the cluster is
+# misbehaving, and its first read goes through the tenant kubeconfig to the
+# tenant apiserver — the component least likely to answer in a node-join
+# failure. An unbounded read here does not lose only itself. It holds the
+# Chainsaw op until the op is killed, and everything scheduled after it is then
+# lost rather than truncated, the tenant crust-gather snapshot above all, which
+# is the largest artifact this whole path exists to produce.
+#
+# No capture is allowed to fail the function either, for the same reason the
+# reads are bounded: the caller chooses the exit this returns into, and that
+# choice is what the tenant snapshot keys on. A collector returning non-zero
+# here would take the choice over under `set -e`.
+cozy_report_node_join_failure() {
+  local test_name="$1"
+  local tenant_kc="tenantkubeconfig-${test_name}"
+  # Validated before the per-request bound is built from it, not only inside
+  # cozy_diag_read: that one corrects the wall clock, and this string is composed
+  # once for every read below. Left to the later check, a zero assigned after
+  # sourcing would give `timeout -k 5 20` paired with `--request-timeout=0s` -- the
+  # two halves disagreeing, which is what the single value exists to prevent.
+  COZY_DIAG_READ_TIMEOUT=$(_cozy_diag_seconds "${COZY_DIAG_READ_TIMEOUT-}" "$COZY_DIAG_READ_TIMEOUT_DEFAULT" COZY_DIAG_READ_TIMEOUT positive)
+  local request_timeout="--request-timeout=${COZY_DIAG_READ_TIMEOUT}s"
+  # importer_list is initialised, not just declared: the assignment below sits
+  # inside the phase gate, and bash under `set -u` aborts on the read that
+  # follows when the gate declined it.
+  local importer_list='' importer_names importer_rc=0 importer_seen=0 importer_total=0
+  local importer_listed=0 _p _sample
+
+  cozy_diag_phase_start
+
+  # The headline stays here rather than at the call site so it keeps its place
+  # ahead of the wedge check: that check exists to name the console experiment's
+  # own failure before this line's wording -- which is byte-identical to the bug
+  # the instrumentation studies -- sends a triager to the known flake.
+  echo "=== node-join failed: fewer than 2 tenant nodes Ready within 29m — diagnostics follow ==="
+  cozy_report_guest_console_wedge || true
+  # The second KVM counter reading, pairing with the one taken before the wait.
+  # Ungated for the reason the wedge check above is, and for one of its own:
+  # the phase gate decides what may START, and a collector it declines loses
+  # only itself -- except this one, which would also retire a reading taken
+  # a 29m node-join wait earlier and leave it an orphan. Its cost is a single
+  # bounded read of a file on this machine, so it cannot meaningfully bound what
+  # comes after it.
+  cozy_capture_sandbox_kvm_exits 2 || true
+  # The second half of the other two pairs, here for the same reason and with the
+  # same standing: the phase gate decides what may START, and a collector it
+  # declines loses only itself -- except these, which would also retire a reading
+  # taken a 29m node-join wait earlier and leave it an orphan.
+  #
+  # What they cost, stated rather than waved at: each runs under one ceiling of
+  # its own, so the pair adds two of those to whatever runs before the console.
+  # The first is one file read; the second is a walk over this container's /proc,
+  # bounded by the same ceiling but not by a single open. The guard in
+  # hack/run-kubernetes-node-join_test.bats prices both at that ceiling and holds
+  # the sum against the phase budget.
+  cozy_capture_runner_kernel_cpu_time 2 || true
+  cozy_capture_sandbox_qemu_thread_cpu 2 || true
+  # The canary's second sample, last of the four that bracket the wait. Last
+  # rather than beside them because it is the only one of the four that costs a
+  # core rather than a read -- ahead of them, its burn would sit inside the
+  # interval each of those pairs divides by.
+  #
+  # Here rather than further down the block, and ungated, for a reason of its
+  # own: unlike the three beside it this sample is an absolute reading
+  # and would still be a reading taken minutes later. What it would stop being
+  # is comparable. The passing path takes its own sample within seconds of the
+  # wait returning, and the whole use of the expected ranges is that a red
+  # figure and a green figure describe the same moment in the run; a red sample
+  # that drifted behind the diagnostics reads a machine several minutes past the
+  # failure it is meant to characterise.
+  #
+  # What it costs, stated rather than waved at: two arms, each under a ceiling
+  # of its own. The guard in hack/run-kubernetes-node-join_test.bats prices both
+  # at that ceiling and holds the sum against the phase budget.
+  cozy_capture_runner_canary 2 || true
+  # The alert reaches the job log here as well, and for a sharper version of the
+  # reason the two samples outside this block report theirs: this is the run a
+  # triager opens, the tail of it is where they start, and sample 1's warning is
+  # a 29m node-join wait and thousands of lines above.
+  if [ "${_COZY_CANARY_ALERT:-0}" -eq 1 ]; then
+    echo "» WARNING: the runner fixed-work canary did not read inside the range its own legend calls healthy on the failing run, so what follows was collected on a machine that was not getting the work done; which arm it was and what figure it gave is written into the capture" >&2
+  fi
+  cozy_diag_read 'tenant node table' \
+    kubectl --kubeconfig "${tenant_kc}" describe nodes "${request_timeout}"
+  cozy_diag_read 'tenant HelmReleases' \
+    kubectl -n tenant-test get hr "${request_timeout}"
+
+  # (a) Worker VM / VMI / virt-launcher state on the MANAGEMENT cluster. A VMI
+  # stuck Pending or a virt-launcher pod OOMKilled/Pending is mode 2a; a
+  # Running+Ready VMI with a healthy virt-launcher is mode 2b. This is the key
+  # split. Full resource names (not the `vm` alias) to avoid short-name
+  # ambiguity, matching cozy_wait_tenant_drained above.
+  echo "=== (a) tenant worker VM/VMI/virt-launcher state (management cluster, ns tenant-test) ==="
+  cozy_diag_read 'worker VM/VMI list' \
+    kubectl -n tenant-test get virtualmachines.kubevirt.io,virtualmachineinstances.kubevirt.io -o wide "${request_timeout}"
+  cozy_diag_read 'worker VMI detail' \
+    kubectl -n tenant-test describe virtualmachineinstances.kubevirt.io "${request_timeout}"
+  cozy_diag_read 'virt-launcher Pod list' \
+    kubectl -n tenant-test get pods -l kubevirt.io=virt-launcher -o wide "${request_timeout}"
+  cozy_diag_read 'virt-launcher Pod detail' \
+    kubectl -n tenant-test describe pods -l kubevirt.io=virt-launcher "${request_timeout}"
+
+  # (a2) Worker DataVolume IMPORT stage. A VM stuck "Provisioning" whose
+  # DataVolume is ImportInProgress at N/A progress with the importer pod
+  # looping on an HTTP error is a distinct sub-mode of 2a that the VM/VMI
+  # state alone does not show: the OS image never finishes importing, so the
+  # VM never boots. This is what took out PR #2826's CI — the CDI importer
+  # could not reach the talos-image-cache ClusterIP (`dial tcp <svc>:80: i/o
+  # timeout`) even though the cache pod was healthy. Show the DataVolume/PVC
+  # phases and the importer pod logs here; the cache ClusterIP re-probe that tells
+  # "cache path went dead mid-run" apart from "upstream factory slow/flaky" belongs
+  # to this section too, but it creates a Pod and waits on curl, so it sits with
+  # the other minute-scale collectors further down rather than here.
+  echo "=== (a2) tenant worker DataVolume import stage (management cluster, ns tenant-test) ==="
+  # The two greps keep these dumps readable. kubectl's stderr is no longer folded
+  # into them: `2>&1 | grep` sent a refusal into the filter, which dropped it for
+  # not matching, so a read that never happened looked the same as one that found
+  # nothing. It goes to the log unfiltered instead, beside cozy_diag_read's note.
+  cozy_diag_read 'worker DataVolume/PVC phases' \
+    kubectl -n tenant-test get datavolume,pvc -o wide "${request_timeout}" \
+    | grep -E 'NAME|md0|disk' || true
+  cozy_diag_read 'worker DataVolume detail' \
+    kubectl -n tenant-test describe datavolume "${request_timeout}" \
+    | grep -Ei 'Name:|Phase:|Progress:|Restart|Reason:|Message:|Running Condition|Bound Condition' || true
+
+  # The listing is read on its own rather than inline in the `for`, so a listing
+  # that never answered stays distinguishable from a namespace with no importer
+  # Pod in it. Folded together, a failed read produces no names, the walk skips,
+  # and the log carries nothing at all — which reads as "no importer ran", the
+  # opposite conclusion on the sub-mode this whole section is about.
+  #
+  # Reading it on its own is also why the phase gate is spelled out here: this is
+  # the one read in the block that does not go through cozy_diag_read, so it is
+  # the one that does not inherit the gate.
+  #
+  # kubectl's stderr is not discarded, for the reason the two grep-piped reads
+  # above stopped discarding theirs: the note below can only quote an exit status,
+  # and Unauthorized, a refused connection and an unrecognised kind are all exit 1.
+  # Only stdout is captured here, so the reason lands in the log beside the note.
+  if cozy_diag_phase_has_time 'CDI importer Pod listing'; then
+    importer_listed=1
+    if command -v timeout >/dev/null 2>&1; then
+      importer_list=$(timeout -k "${COZY_DIAG_READ_GRACE}" "${COZY_DIAG_READ_TIMEOUT}" \
+        kubectl -n tenant-test get pods -o name "${request_timeout}") || importer_rc=$?
+    else
+      importer_list=$(kubectl -n tenant-test get pods -o name "${request_timeout}") || importer_rc=$?
+    fi
+    if [ "${importer_rc}" -ne 0 ]; then
+      echo "=== could not list Pods to find the CDI importers (exit ${importer_rc}); whether any importer Pod exists is unknown, not none ==="
+      importer_list=
+    fi
+  fi
+  importer_names=$(printf '%s\n' "${importer_list}" | grep -E '^pod/importer-' || true)
+  # `|| true`: grep -c exits 1 on a count of zero, which under set -e would end
+  # the collector on the ordinary "no importer Pod" case.
+  importer_total=$(printf '%s\n' "${importer_names}" | grep -c . || true)
+  # Re-checked here for the reason every one of these knobs is re-checked where it is
+  # used: a value set after this file was sourced never passed the assignment-time
+  # check. This one fails silently -- `[ n -gt 3s ]` exits 2, the comparison below
+  # reads false, and the cap simply stops existing.
+  COZY_DIAG_MAX_IMPORTERS=$(_cozy_diag_seconds "${COZY_DIAG_MAX_IMPORTERS-}" "$COZY_DIAG_MAX_IMPORTERS_DEFAULT" COZY_DIAG_MAX_IMPORTERS)
+  # Three states, not two, and the third is why importer_listed exists. A listing
+  # that answered and matched nothing is a real finding about the import stage and
+  # is said out loud. A listing that failed said so above. A listing the phase
+  # declined never ran, and reporting that as "matched none" would put the
+  # conclusion this section exists to test -- no importer, so no import -- on the
+  # record from a read that was never issued, one line under the note saying it was
+  # not collected.
+  if [ "${importer_listed}" -eq 1 ] && [ "${importer_rc}" -eq 0 ] \
+    && [ "${importer_total}" -eq 0 ]; then
+    echo "=== no CDI importer Pod in tenant-test; the listing answered and matched none ==="
+  fi
+  for _p in ${importer_names}; do
+    importer_seen=$((importer_seen + 1))
+    if [ "${importer_seen}" -gt "${COZY_DIAG_MAX_IMPORTERS}" ]; then
+      echo "=== importer log walk stopped after ${COZY_DIAG_MAX_IMPORTERS} Pods; ${importer_total} matched in total ==="
+      break
+    fi
+    echo "--- logs ${_p} (current) ---"
+    # No --request-timeout on the log reads: it bounds an API request, and these
+    # are a log stream. The wall-clock bound is what covers them.
+    cozy_diag_read "importer log ${_p} (current)" \
+      kubectl -n tenant-test logs "${_p}" --tail=40
+    # An importer that never restarted has no previous instance and kubectl exits
+    # 1, which cozy_diag_read reports as a read that failed -- true, but the same
+    # shape as a refused call, and the ordinary outcome here. kubectl's own
+    # "previous terminated container not found" lands in the log beside the note;
+    # this line says so up front so the pair reads as one answer rather than two.
+    echo "--- logs ${_p} (previous; exit 1 here is usually the container never having restarted, and kubectl's own message below says which) ---"
+    cozy_diag_read "importer log ${_p} (previous)" \
+      kubectl -n tenant-test logs "${_p}" --previous --tail=40
+  done
+  # (c) Tenant kubelet CSRs + the talos-csr-signer sidecar log. A mode-2b node
+  # boots but blocks on a kubelet-serving/-client CSR that is never submitted
+  # or never approved; the pending CSR list (tenant cluster) plus the signer
+  # sidecar log (in the Kamaji apiserver pod on the management cluster) show
+  # which side stalled.
+  echo "=== (c) tenant CSRs + talos-csr-signer sidecar log ==="
+  cozy_diag_read 'tenant CSR list' \
+    kubectl --kubeconfig "${tenant_kc}" get csr "${request_timeout}"
+  cozy_diag_read 'talos-csr-signer sidecar log' \
+    kubectl -n tenant-test logs -l kamaji.clastix.io/name="kubernetes-${test_name}" \
+    -c talos-csr-signer --tail=200 --prefix
+
+  # (a3) State of the replicated volumes behind the worker disks. Numbered with
+  # the import stage it belongs to and placed here instead, because position in
+  # this block is cost order rather than subject: it is one read, and moving it up
+  # would push the two reads at (c) a read further from the start of the budget.
+  #
+  # What it answers is a state rather than a rate, which is why one read settles
+  # it. A worker reads its system disk over DRBD, and a replica that is
+  # SyncTarget, Inconsistent or Diskless serves those reads from a peer over the
+  # network instead of locally, which is slow in a way no counter in this block
+  # attributes to storage. The state also disappears with the volume: the report
+  # collects the same tables after the suite, by which time cleanup has usually
+  # deleted the worker's volumes, so a red run leaves nothing about them there.
+  #
+  # Which rows are the worker's is decided through the PV name, which the (a2)
+  # dump above prints beside each PVC; resource names here are those PV names.
+  #
+  # No --request-timeout: this is an exec stream rather than an API request, so
+  # the wall clock around it is the whole bound. A controller that is absent and
+  # one that is wedged both arrive as a failed read, and kubectl's own message
+  # beside the note is what separates them.
+  echo "=== (a3) replicated volume state behind the worker disks (management cluster) ==="
+  cozy_diag_read 'LINSTOR resource state' \
+    kubectl -n cozy-linstor exec deploy/linstor-controller \
+    --container=linstor-controller -- linstor --no-color r l
+
+  # Order below is load-bearing and the phase budget is why. The budget declines
+  # whatever has not started when it runs out, so what runs last is what gets
+  # declined -- and (c) is the discriminator for mode 2b, the failure this whole
+  # artifact exists to let someone fix. Cheap reads first, then the collectors
+  # that cost minutes. Everything ahead of this line is bounded reads and a capped
+  # walk, which together fit inside the budget with room left, while the gated
+  # collectors below can exhaust it between them on a slow run. Putting the
+  # heavy ones first, as this block used to, spends the budget on them and
+  # declines the two 25s reads that answer the question. The same rule decides
+  # the order among the gated collectors themselves: each one's ceiling bounds
+  # what everything after it can lose, so a collector goes above the console
+  # only if its ceiling is small enough to be worth risking the console for.
+  #
+  # (d2) Worker network counters, first of the gated collectors and cheapest of
+  # them: one listing and one read per node, four bounded reads against the
+  # minutes every collector below can spend between them. Its answer also has no
+  # other source in this artifact. What it settles is which side of the worker's image
+  # pull is slow. The guest reports its own progress and cannot see the bytes
+  # that never became progress, so a pull that keeps restarting and one that
+  # crawls look identical from in there. The host side counts both, and the gap
+  # between it and the guest's progress is the discriminator.
+  #
+  # WHICH ROW answers that is not obvious and getting it wrong inverts the
+  # reading, so it is written here rather than left to the reader. cAdvisor
+  # publishes one row per interface in the Pod's network namespace, and a
+  # bridge-bound worker has four of them:
+  #
+  #   eth0      a DUMMY holding the Pod IP so the kubelet's check still passes.
+  #             It carries no traffic, so its counters sit at zero -- and it is
+  #             the row a reader reaches for first, by name, where zero reads as
+  #             a worker that received nothing.
+  #   eth0-nic  the Pod's real NIC, renamed and enslaved to the bridge. Its
+  #             RECEIVE is what arrived from the cluster network, and that is
+  #             the number this capture exists to produce.
+  #   k6t-eth0  the bridge; the same bytes again as they cross it.
+  #   tap0      the host side of the tap to the guest, whose counters are named
+  #             from the host's end, so traffic toward the guest is its
+  #             transmit rather than its receive.
+  #
+  # The filter deliberately carries no interface predicate: all four rows reach
+  # the artifact so the reader can tell them apart, and dropping three of them
+  # here would decide the question in the collector on the strength of names
+  # that KubeVirt, not this file, chooses.
+  # Placed after the guest captures it would be the first thing declined on
+  # exactly the slow runs this failure comes from.
+  if cozy_diag_phase_has_time '(d2) tenant worker network counters'; then
+    echo "=== (d2) tenant worker network counters (management cluster, ns tenant-test) ==="
+    cozy_capture_tenant_worker_network_counters || true
+  fi
+
+  # (d3) Worker block IO, and it sits here for the reason (d2) does: one listing
+  # and one read per node, read once, against the minutes the collectors below can
+  # spend between them. What it settles has no other answer in this artifact
+  # either. A worker whose vCPU thread runs at its physical maximum while nothing
+  # progresses is either computing without result or waiting on blocks, and every
+  # other counter here is blind to the second: the CPU families say what the group
+  # was allowed and what it got, (d2) says what crossed the network, and neither
+  # counts a read. Placed below the guest captures it would be declined on exactly
+  # the slow runs this failure comes from.
+  if cozy_diag_phase_has_time '(d3) tenant worker block IO counters'; then
+    echo "=== (d3) tenant worker block IO counters (management cluster, ns tenant-test) ==="
+    cozy_capture_tenant_worker_block_io || true
+  fi
+
+  # (b1) Guest serial console, read from the management cluster. First of the
+  # in-guest captures because it is the only one that survives a worker which
+  # never reached apid — the dominant shape of this failure, where no Node
+  # registers and no certificate request is ever made. (b) below needs that
+  # same apid to answer, so it cannot describe this class at all.
+  # Two shapes of empty result are worth telling apart from a silent guest.
+  # A virt-launcher Pod still Pending has no containers at all yet, which is
+  # the ordinary shape of a worker that never booted. A Pod wedged in Init on
+  # guest-console-log is the opposite reading: the console container is what
+  # stopped it booting, and then neither a console nor an apid exists to
+  # explain anything else. The container being absent from a Running Pod is
+  # the rarest of the three, since the per-VM field outranks the cluster-wide
+  # disable by design and the green path asserts it attached.
+  if cozy_diag_phase_has_time '(b1) tenant worker guest serial console'; then
+    echo "=== (b1) tenant worker guest serial console (management cluster, ns tenant-test) ==="
+    cozy_capture_tenant_serial_console 'node-join failed: captured after fewer than 2 tenant nodes became Ready inside the deadline' 6 || true
+  fi
+
+  # (e) What the tenant HelmReleases did to themselves. The table printed at the
+  # top of this block says which of them are Ready; this says whether one failed
+  # an action or was remediated on the way here, which is the same question the
+  # guard asks after the assertions and cannot ask from there, because this
+  # block ends in the exit that keeps it from ever running. A tenant CNI or CSI
+  # stuck in a failed action shows up as exactly this failure -- no node ever
+  # turns Ready -- and without this the history behind it is named nowhere in
+  # the run.
+  #
+  # Below the console rather than above it, and the ordering rule is the
+  # evidence, not the price. The console is the only artefact that survives a
+  # worker which never reached apid: nothing else in this block describes that
+  # worker at all. This classification is cheap and it discriminates, but what
+  # it reads lives on the management cluster and outlives the run, so a walk the
+  # budget declines here can be answered afterwards from the objects themselves.
+  # An irreplaceable artefact is collected before a replaceable one, whichever
+  # is cheaper.
+  #
+  # Its own wall clock still applies, so a namespace whose apiserver answers
+  # slowly costs a stated number of seconds rather than however many releases
+  # happen to be in it. A decline is announced rather than silent, because a
+  # missing section reads like a namespace that had nothing to report.
+  cozy_report_helmrelease_remediation tenant-test "kubernetes-${test_name}" "(e) " || true
+
+  # (d) What the workers got, what they were denied, and what the sandbox nodes
+  # under them lost to their own hypervisor. Its question has no other answer
+  # here: the ceiling is already carried by (a), but whether the guest ever met
+  # it, and whether it was ever scheduled at all, are recorded nowhere else,
+  # while (b1) above and (b) below describe a guest that at least reports
+  # something on its own. (a) shows a Running VMI on a healthy virt-launcher,
+  # which is where mode 2a stops being the answer and the question becomes why a
+  # healthy VM made no progress -- a node sitting at half its capacity does not
+  # settle that, and these counters do.
+  #
+  # It sits BELOW the console, and its ceiling rather than its worth is the
+  # reason. Each collector spends a listing plus one read per subject it walks,
+  # twice, and at the read bound and today's caps that ceiling is well past the
+  # whole phase budget rather than a share of it. In practice it costs the
+  # interval plus a handful of reads that an apiserver or an apid answering at
+  # all answers in under a second -- but the run where
+  # those reads DO approach their bound is a wedged kubelet, which is the
+  # failure this whole block is written for. So the ceiling is not a remote
+  # case here, and a collector carrying one that large must not sit ahead of the
+  # single capture that survives a worker which never reached apid: ahead of the
+  # console it could take the console with it, and below it the worst it can
+  # spend is its own time and the legs after it. The gate's promise is the same
+  # either way and is worth stating, since it reads like a fit check and is not
+  # one: it admits a collector whose start is inside the budget, so one admitted
+  # late still runs to completion and overruns.
+  #
+  # That overrun is already budgeted for, and the number is worth putting here
+  # because it is the first question this pair invites. The phase budget is
+  # derived as budget + largest overshoot + snapshot <= op - bringup, where the
+  # overshoot term is exactly "one collector admitted a moment before the
+  # deadline runs its whole cost". This group's ceiling is the sum of its walks
+  # plus the interval; the term is the guest-Talos walk, which is still larger,
+  # though no longer by much. So a group admitted at the last second finishes
+  # inside the room already left for the tenant crust-gather snapshot rather
+  # than pushing it past the op.
+  # hack/run-kubernetes-node-join_test.bats holds that against both numbers, so
+  # a later change to a cap, the read bound or the interval cannot quietly make
+  # this group the binding term. The margin is not uniform across those knobs
+  # and is not restated here: every walk enters the sum multiplied by its cap
+  # and by two samples, while the interval enters it once, so a cap and the
+  # interval are nowhere near equally expensive. The guard computes both sides
+  # from the source, so it is where a reader finds out which knob has room, and
+  # where the failure surfaces rather than in a timed-out run.
+  #
+  # Each collector is read twice with one wait between the passes, and the wait
+  # is shared: every counter here is cumulative, so one reading of any of them
+  # is an average over an uptime rather than a rate over the failure. Taking the
+  # first reading of each, waiting once, and taking the second of each costs the
+  # wait once rather than once per subject.
+  #
+  # What the knob does NOT give is the interval a subject's counters span. Each
+  # subject's two readings are separated by the wait plus the other subjects'
+  # passes, and on the run this exists for those passes are the slow part rather
+  # than the wait. So each capture stamps the moment it was read and the reader
+  # subtracts stamps rather than assuming the knob. The subjects' windows
+  # overlap and are offset from one another; they are not identical, and
+  # treating them as identical is the error the stamps remove.
+  #
+  # This `sleep` is not the fixed-timeout kind the e2e conventions rule out.
+  # Those stand in for a condition nobody wrote a wait for; this one is the
+  # measurement interval, and there is no event to wait for instead of it. The
+  # doc carves it out by name rather than leaving the reader to judge.
+  #
+  # Re-validated here rather than trusted from the assignment, like every other
+  # knob in this block, because a value set after this file is sourced never
+  # passed that check -- and zero, the value the flag rejects, would put both
+  # readings at the same instant and leave a pair that divides to nothing.
+  COZY_DIAG_RATE_INTERVAL=$(_cozy_diag_seconds "${COZY_DIAG_RATE_INTERVAL-}" "$COZY_DIAG_RATE_INTERVAL_DEFAULT" COZY_DIAG_RATE_INTERVAL positive "zero puts both readings at the same instant, so the pair divides to nothing")
+  # The label names all three subjects because the phase reuses it verbatim in
+  # the decline line, the way the (b) gate below does and for the same reason: a
+  # decline that names two of them reports the third as lost to nobody.
+  if cozy_diag_phase_has_time '(d) tenant worker CPU counters, sandbox node CPU time and worker per-thread CPU time'; then
+    echo "=== (d) tenant worker CPU counters + sandbox node CPU time + worker per-thread CPU time, two samples with a ${COZY_DIAG_RATE_INTERVAL}s wait between the passes; each capture carries the time it was read ==="
+    for _sample in 1 2; do
+      # Guarded like every other external here, and for a sharper reason than
+      # the reads: this call is not wrapped in `|| true`, and the block runs
+      # under `set -eu` inside the chainsaw script, so `sleep: command not
+      # found` exits 127 and takes everything after it -- including two of the
+      # five collectors the phase's own missing-timeout warning promises keep
+      # collecting. Degrading to back-to-back readings is honest rather than
+      # lossy: the interval a rate divides by is read off the two stamps in each
+      # capture, not off this knob, so a wait that did not happen yields a
+      # tighter window rather than an unreadable pair.
+      if [ "${_sample}" != 1 ] && command -v sleep >/dev/null 2>&1; then
+        sleep "${COZY_DIAG_RATE_INTERVAL}"
+      elif [ "${_sample}" != 1 ]; then
+        echo "» WARNING: sleep is not on PATH; the two readings are taken back to back, so the pair spans only what the first pass took -- the stamps inside each capture say how much" >&2
+      fi
+      cozy_capture_tenant_worker_cpu_throttle "${_sample}" || true
+      cozy_capture_sandbox_node_cpu_time "${_sample}" || true
+      cozy_capture_tenant_worker_thread_cpu "${_sample}" || true
+    done
+  fi
+
+  # (b) In-guest Talos kernel and kubelet logs. The tenant chart intentionally
+  # has no admin talosconfig, so mint a one-hour os:reader client from its
+  # existing cert-manager Issuer and run talosctl from a hardened Pod that can
+  # reach the bridge-networked VMI IPs without weakening TLS verification.
+  # A worker that has not reached apid yet will produce a bounded connection
+  # error while a later-stage worker remains capturable; both outcomes are
+  # retained in cozyreport.
+  # The label names all four reads because the phase reuses it verbatim in the
+  # decline line, and a decline that names two of them reports the other two as
+  # lost to nobody: the service states are the finding on the shape of this
+  # failure where no kubelet log exists to read at all, so a note that does not
+  # mention them loses them silently rather than out loud.
+  if cozy_diag_phase_has_time '(b) in-guest Talos dmesg + kubelet logs + service states + links'; then
+    echo "=== (b) in-guest Talos dmesg + kubelet logs + service states + links ==="
+    cozy_capture_tenant_talos "${test_name}" || true
+  fi
+
+  # Last, and gated on the phase as well as bounded per read, because it is the
+  # collector that most needs both: its reachability re-probe creates a Pod, waits
+  # on curl retries, and makes seven unbounded management-cluster calls of its own,
+  # so it has no ceiling here at all.
+  if cozy_diag_phase_has_time 're-probe talos-image-cache ClusterIP + cacher debug bundle'; then
+    echo "--- re-probe talos-image-cache ClusterIP + cacher debug bundle ---"
+    talos_image_cache_diagnose || true
+  fi
+}
+
+# Whether a non-zero from the node-join wait is the deadline expiring.
+#
+# Why 29m and not some other figure, since this is the number the answer is
+# about. It is this test's own budget and only that. The clock starts where the
+# wait starts, which is after the machinedeployment wait, the LoadBalancer
+# assignment and the healthz probe, each with a ceiling of its own; the
+# product's timers start elsewhere and are already running by then. The
+# autoscaler's `maxNodeProvisionTime` runs from the Machine's creation, and the
+# MachineHealthCheck's `nodeStartupTimeout` from the later of creation and
+# InfrastructureReady, restarting at that transition. So the offset between this
+# deadline and either of those is not fixed, and no ordering against them is
+# claimed here.
+#
+# What the two figures do give is a scale to pick against. The chart ships 20m
+# for `nodeStartupTimeout` and 30m for `maxNodeProvisionTime`, and the e2e
+# tenant overrides neither. A budget over the first is wide enough for a
+# remediation cycle to fit inside it; whether one does on a given run is not
+# something this deadline decides, and a run that spends the window on a single
+# worker that never comes back is as much a red as one that watched a
+# replacement fail.
+#
+# That width has a price and it is paid in evidence: when the health check does
+# replace a worker inside the window, the guest serial console of the first one
+# goes with its virt-launcher Pod. What survives is the console of its
+# replacement and, through Chainsaw's catch, the host snapshot carrying the
+# Machine history that shows the replacement happened at all.
+#
+# 124 is what `timeout` returns when it fired, and it is the only status that
+# means the workers were slow. The wrapper's other failures arrive in the same
+# non-zero shape and mean something else entirely: 125 is `timeout` failing, 126
+# and 127 are the shell it was asked to run being unusable or absent, and 128+n
+# is that shell killed by a signal, the OOM killer on a loaded runner among
+# them. Reporting any of those as an expired deadline sends a reader looking at
+# the cluster for a broken harness.
+#
+# No `-k` is given to that `timeout`, so a 137 here is a kill from outside the
+# wait rather than its own escalation.
+cozy_node_join_deadline_expired() {
+  [ "$1" -eq 124 ]
+}
+
+# Announce the expired node-join deadline as a GitHub annotation, so the reason
+# the suite went red is legible from the run summary without opening the log.
+#
+# The `::warning` has to start the line: an indented workflow command still
+# registers, but anything else before the `::` -- a prefix, a timestamp --
+# silently turns the annotation into a log line nobody sees.
+#
+# Nothing in here may fail the caller. It runs on a path that ends in exit 1,
+# and that exit is what gets the diagnostics collected.
+cozy_note_node_join_deadline() {
+  local test_name="$1"
+
+  echo "::warning title=node-join::${COZY_SNAPSHOT_NAME:-kubernetes}: fewer than 2 tenant nodes Ready within 29m for ${test_name} — the suite fails here and its diagnostics follow below"
+  return 0
+}
+
+# Print the successful worker lifecycle in the job log while all of its objects
+# and Events still exist. The top-level durations distinguish time spent before
+# the Ready poll from the poll itself. The event timeline then exposes PVC
+# placement, CDI scratch provisioning, importer/virt-launcher image pulls, the
+# Talos disk import, VM start and CAPI NodeRef assignment without adding waits to
+# the product path. Finally, the cache log reports how long serving the compressed
+# OS image bytes took; DataVolume ImportInProgress -> Completed includes the
+# separate decompression and block-write work and must not be called pull time.
+cozy_report_node_join_timing() {
+  local test_name="$1"
+  local tenant_kubeconfig="$2"
+  local worker_requested_at="$3"
+  local wait_started_at="$4"
+  local wait_finished_at="$5"
+  local suite_started_at="$6"
+  local prefix="kubernetes-${test_name}-md0"
+  local event_rows event_rc=0 node_rows node_rc=0 cache_rows cache_rc=0
+
+  echo "=== successful tenant worker join timing: ${test_name} ==="
+  printf 'worker-pool request -> Ready wait: %ss\n' "$(( wait_started_at - worker_requested_at ))"
+  printf 'two-node Ready wait: %ss\n' "$(( wait_finished_at - wait_started_at ))"
+  printf 'worker-pool request -> two nodes Ready: %ss\n' "$(( wait_finished_at - worker_requested_at ))"
+
+  if command -v timeout >/dev/null 2>&1; then
+    event_rows=$(timeout -k 5 25 kubectl -n tenant-test get events.events.k8s.io \
+      --request-timeout=20s \
+      -o jsonpath='{range .items[*]}{.eventTime}{"\t"}{.series.lastObservedTime}{"\t"}{.deprecatedLastTimestamp}{"\t"}{.metadata.creationTimestamp}{"\t"}{.regarding.kind}{"\t"}{.regarding.name}{"\t"}{.reason}{"\t"}{.note}{"\n"}{end}' 2>&1) || event_rc=$?
+  else
+    event_rows=$(kubectl -n tenant-test get events.events.k8s.io \
+      --request-timeout=20s \
+      -o jsonpath='{range .items[*]}{.eventTime}{"\t"}{.series.lastObservedTime}{"\t"}{.deprecatedLastTimestamp}{"\t"}{.metadata.creationTimestamp}{"\t"}{.regarding.kind}{"\t"}{.regarding.name}{"\t"}{.reason}{"\t"}{.note}{"\n"}{end}' 2>&1) || event_rc=$?
+  fi
+  echo "worker provisioning milestones (UTC; image-pull durations are kubelet-reported):"
+  if [ "$event_rc" -eq 0 ]; then
+    printf '%s\n' "$event_rows" | awk -F '\t' -v prefix="$prefix" '
+      BEGIN { OFS = FS }
+      {
+        timestamp = $1
+        if (timestamp == "") timestamp = $2
+        if (timestamp == "") timestamp = $3
+        if (timestamp == "") timestamp = $4
+      }
+      index($6, prefix) && $7 ~ /^(SuccessfulCreate|WaitForFirstConsumer|ProvisioningSucceeded|ImportTargetInUse|Scheduled|Pulling|Pulled|ImportScheduled|Unschedulable|ImportInProgress|Completed|ImportSucceeded|Created|Started|SuccessfulSetNodeRef)$/ {
+        print timestamp, $5, $6, $7, $8
+      }
+    ' | sort | sed 's/^/  /'
+  else
+    echo "  not collected: management-cluster Event read exited ${event_rc}"
+    printf '%s\n' "$event_rows" | sed 's/^/  event-read: /'
+  fi
+
+  if command -v timeout >/dev/null 2>&1; then
+    node_rows=$(timeout -k 5 25 kubectl --kubeconfig "$tenant_kubeconfig" get nodes \
+      --request-timeout=20s \
+      -o jsonpath='{range .items[*]}{.metadata.name}{"\tcreated="}{.metadata.creationTimestamp}{"\tReady="}{.status.conditions[?(@.type=="Ready")].lastTransitionTime}{"\n"}{end}' 2>&1) || node_rc=$?
+  else
+    node_rows=$(kubectl --kubeconfig "$tenant_kubeconfig" get nodes \
+      --request-timeout=20s \
+      -o jsonpath='{range .items[*]}{.metadata.name}{"\tcreated="}{.metadata.creationTimestamp}{"\tReady="}{.status.conditions[?(@.type=="Ready")].lastTransitionTime}{"\n"}{end}' 2>&1) || node_rc=$?
+  fi
+  echo "tenant Node timestamps (UTC):"
+  if [ "$node_rc" -eq 0 ]; then
+    printf '%s\n' "$node_rows" | sort | sed 's/^/  /'
+  else
+    echo "  not collected: tenant Node read exited ${node_rc}"
+    printf '%s\n' "$node_rows" | sed 's/^/  node-read: /'
+  fi
+
+  if command -v timeout >/dev/null 2>&1; then
+    cache_rows=$(timeout -k 5 25 kubectl -n kube-system logs deploy/talos-image-cache \
+      -c serve --since-time="$suite_started_at" --timestamps=true \
+      --request-timeout=20s 2>&1) || cache_rc=$?
+  else
+    cache_rows=$(kubectl -n kube-system logs deploy/talos-image-cache \
+      -c serve --since-time="$suite_started_at" --timestamps=true \
+      --request-timeout=20s 2>&1) || cache_rc=$?
+  fi
+  echo "Talos OS cache transfers since suite start (compressed-byte service time, not CDI decompression/write time):"
+  if [ "$cache_rc" -ne 0 ]; then
+    echo "  not collected: talos-image-cache log read exited ${cache_rc}"
+    printf '%s\n' "$cache_rows" | sed 's/^/  cache-log-read: /'
+  elif printf '%s\n' "$cache_rows" | grep -F 'transfer-finished' | grep -Fq 'openstack-amd64.raw.xz'; then
+    printf '%s\n' "$cache_rows" | grep -F 'transfer-finished' | grep -F 'openstack-amd64.raw.xz' | sed 's/^/  /'
+  else
+    echo "  no openstack-amd64.raw.xz transfer outcome was logged (mirror fallback or a pre-instrumentation cache pod)"
+  fi
+  return 0
+}
+
+# Correct the two knobs _cozy_guard_kubectl reads, once per function that is
+# about to issue reads.
+#
+# Re-checked here rather than only where they are assigned, for the reason every
+# knob in this file is: a value set after this file was sourced -- which is how
+# a test lowers it -- never passed the assignment-time check. The value that
+# costs the most is zero, because `timeout -k 5 0` disables the timeout and
+# --request-timeout=0s means no timeout to kubectl, so a zero restores the
+# unbounded read with no warning and no note.
+#
+# Not done inside _cozy_guard_kubectl, because every call site that captures a
+# value runs it in a command substitution: a correction written back there dies
+# with the subshell, and the warning would then repeat on every read rather than
+# once per function.
+#
+# Hoisting moves the write-back one frame out and no further.
+# cozy_addon_helmrelease_names is itself called in a command substitution, so its
+# correction does not outlive the call either -- it covers the read that function
+# issues, which is all it is here for, and the globals a later caller sees are
+# the ones cozy_guard_helmrelease corrected in its own frame.
+_cozy_guard_read_bounds() {
+  COZY_DIAG_READ_TIMEOUT=$(_cozy_diag_seconds "${COZY_DIAG_READ_TIMEOUT-}" "$COZY_DIAG_READ_TIMEOUT_DEFAULT" COZY_DIAG_READ_TIMEOUT positive)
+  COZY_DIAG_READ_GRACE=$(_cozy_diag_seconds "${COZY_DIAG_READ_GRACE-}" "$COZY_DIAG_READ_GRACE_DEFAULT" COZY_DIAG_READ_GRACE)
+}
+
+# Name why a guard read failed, given its exit status. The bound below produces
+# two statuses that print nothing at all: a wall-clock kill takes the process
+# before kubectl writes anything, so "kubectl's error is above" would send the
+# reader to an empty screen at exactly the failure the bound exists to cause.
+# cozy_diag_read draws the same distinction for the same reason.
+_cozy_guard_read_failure() {
+  case "$1" in
+    124)
+      echo "the read did not finish within ${COZY_DIAG_READ_TIMEOUT}s and was cut off, so kubectl printed no error"
+      ;;
+    137)
+      # 128+SIGKILL: the -k grace produces it, and so does anything else that
+      # kills the read. Says what happened, not what caused it.
+      echo "the read was killed before it finished, so kubectl printed no error"
+      ;;
+    *)
+      echo "kubectl's error is above"
+      ;;
+  esac
+}
+
+# Every kubectl call the guard makes goes through here, bounded.
+#
+# The guard runs late - after the whole bringup on the passing path, and on the
+# failure paths inside a diagnostics phase that the tenant crust-gather
+# snapshot has to outlive. An unbounded read against a wedged apiserver does not
+# lose only itself: it holds the Chainsaw op until the op is killed, and the
+# snapshot the caller's exit was going to trigger is then lost rather than
+# truncated. Both bounds are needed and neither substitutes for the other:
+# --request-timeout bounds one HTTP request, while a client retrying against an
+# apiserver that keeps answering slowly stays inside it indefinitely, which is
+# what the wall clock catches.
+#
+# This is a bound, not a retry: the read is issued once and a read that did not
+# finish stays a failed read, which the callers report and fail on. A cut-off
+# read reported as "no history" is exactly the conflation the guard exists to
+# refuse.
+#
+# Unbounded when `timeout` is absent rather than bounded-into-exit-127, the same
+# fallback cozy_diag_read takes and for the same reason: a missing local binary
+# would otherwise be reported as the cluster refusing every read.
+_cozy_guard_kubectl() {
+  if command -v timeout >/dev/null 2>&1; then
+    timeout -k "${COZY_DIAG_READ_GRACE}" "${COZY_DIAG_READ_TIMEOUT}" \
+      kubectl --request-timeout="${COZY_DIAG_READ_TIMEOUT}s" "$@"
+  else
+    kubectl --request-timeout="${COZY_DIAG_READ_TIMEOUT}s" "$@"
+  fi
+}
+
+# Assert that one HelmRelease did not fail an action it is configured to retry
+# in place. $1 is the namespace, $2 the release name, $3 non-empty on a release
+# whose install strategy the cluster is known to set. Returns non-zero on such a
+# footprint or on a read that failed, so the caller's errexit fails the run.
+#
+# One rule decides the verdict: a "failed" or "uninstalled" Snapshot fails the
+# run on a release whose install strategy is RetryOnFailure, and is reported on
+# any other. The releases in that shape are the parent, which the aggregated
+# apiserver stamps RetryOnFailure on install and upgrade alike, as it does every
+# Application HelmRelease (pkg/registry/apps/application/rest.go), and the
+# tenant cilium and csi, whose templates set it on both actions. Under that
+# strategy the controller never remediates: a failed action is retried as an
+# upgrade with its manifests left in place, so what it leaves behind is a
+# "failed" Snapshot, and that Snapshot is the only record the release keeps of
+# an attempt that went wrong. The release may be Ready again by the time this
+# reads it, and the run still fails, as long as the Snapshot is still "failed".
+#
+# It is not, after a failed install that the very next attempt recovers. With
+# no deployed release to upgrade from, Helm upgrades from the failed one and
+# marks it superseded on success (pkg/action/upgrade.go in Helm v4.1.1), and
+# helm-controller rewrites that Snapshot in place (recordOnObject in
+# internal/reconcile/release.go). The history then reads deployed, superseded,
+# the shape of an ordinary upgrade, and this guard passes. A failed upgrade
+# keeps its Snapshot, because Helm supersedes the last deployed release rather
+# than the failed one, and so does a failed install followed by a second
+# failure.
+#
+# Every other addon of this chart takes the default strategy with
+# remediation.retries: -1, a configuration that declares uninstall-and-reinstall
+# its recovery path. The run has no measurement of how often those releases take
+# it, and failing a whole bringup on a release doing what it is configured to do
+# is how a guard ends up switched off. Whether that configuration is itself
+# a defect is not this guard's to assert; for the CRD addons it is tracked in
+# cozystack/cozystack#3555. Their footprint is printed as a note instead.
+#
+# Both probes keep their exit status. A failed read and a field the object does
+# not carry both print nothing, so folding them together (`|| true` on the whole
+# substitution) would let an API timeout or an RBAC error pass for a release with
+# no history - the same misreading cozy_tenant_drained guards against with its
+# "err" sentinel. `|| _read_rc=$?` keeps the non-zero status from tripping the
+# errexit the caller runs under.
+#
+# kubectl's stderr is deliberately NOT folded into the values either. kubectl
+# writes warnings there while exiting 0 - a deprecation notice, or the discovery
+# noise a degraded aggregated APIService produces - and such a line landing in
+# the history capture makes an empty history look populated, which skips the
+# readiness branch below, while in the strategy-and-readiness capture it stops
+# the value matching RetryOnFailure and silently downgrades a failure to a note.
+# Left unredirected, those lines go to the script's own stderr, which is where a
+# reader wants them anyway.
+#
+# Unit-tested in hack/run-kubernetes-remediation_test.bats.
+cozy_guard_helmrelease() {
+  local _ns="$1"
+  local _hr="$2"
+  # Non-empty on a release whose install strategy the cluster is known to set,
+  # which is the parent Application HelmRelease and nothing else here. See the
+  # branch that reads it for why the check cannot be applied to the addons.
+  local _strategy_required="${3:-}"
+  local _probe _strategy _history _ready _read_rc
+  _cozy_guard_read_bounds
+  # Readiness rides in the same get as the strategy, and both are read before
+  # the history, because the opposite order observes the two in the order that
+  # makes a still-installing release look like a broken API. The controller
+  # writes the Snapshot and flips Ready in one status patch, so a release is
+  # never Ready before its first Snapshot exists; read the history first and an
+  # addon that completes its install in the round-trip between the two reads
+  # presents as Ready with an empty history, which the branch below fails the
+  # run on as a Flux status shape the guard can no longer read. Some of these
+  # releases are never waited on, so that window is open on every run. Read this
+  # way round, truncation cannot produce the misreading: Ready implies a
+  # Snapshot, and neither truncation variant in helm-controller/api empties a
+  # non-empty history - Truncate returns early below two Snapshots,
+  # TruncateIgnoringPreviousSnapshots cuts only above five.
+  #
+  # Truncation is not the only thing that shortens history, which is why the
+  # claim above is about truncation and not about the read order being safe.
+  # HelmReleaseStatus.ClearHistory() drops it outright, and where the controller
+  # calls it is in a module this tree does not carry. Landing between these two
+  # reads it would present as Ready with an empty history, which the branch
+  # below fails the run on with the wrong explanation. One round-trip wide, and
+  # nothing here can close it - what the order buys is the truncation half.
+  _read_rc=0
+  _probe=$(_cozy_guard_kubectl get hr -n "$_ns" "${_hr}" \
+    -o jsonpath='{.spec.install.strategy.name}@{.status.conditions[?(@.type=="Ready")].status}') || _read_rc=$?
+  if [ "${_read_rc}" -ne 0 ]; then
+    echo "Reading .spec.install.strategy.name and the Ready condition of ${_hr} failed - $(_cozy_guard_read_failure "${_read_rc}")." >&2
+    return 1
+  fi
+  _strategy=${_probe%%@*}
+  _ready=${_probe#*@}
+  # The history jsonpath is the one remediation-guard.sh names, because that is
+  # the value internal/fluxcontract runs against the upstream Flux type; a
+  # literal written out here would not be covered by it.
+  _read_rc=0
+  _history=$(_cozy_guard_kubectl get hr -n "$_ns" "${_hr}" \
+    -o"jsonpath=${HELMRELEASE_HISTORY_JSONPATH}") || _read_rc=$?
+  if [ "${_read_rc}" -ne 0 ]; then
+    echo "Reading .status.history of ${_hr} failed - $(_cozy_guard_read_failure "${_read_rc}")." >&2
+    return 1
+  fi
+  # Always emit the raw values, so a silent future-Flux field rename shows up in
+  # the CI log as an empty history on a Ready release rather than vanishing.
+  echo "HelmRelease ${_hr} (install strategy ${_strategy:-<unset>}) history statuses:"
+  printf '%s\n' "${_history:-<empty>}"
+  # The field that arms the fatal branch below is read with kubectl -o jsonpath,
+  # which prints nothing and exits 0 for a path that stops resolving - the read
+  # fails soft, into the lenient reading. Rename spec.install.strategy in a
+  # future helm-controller and every footprint on the parent, cilium and csi
+  # becomes the NOTE below on a green run, with the unit tests still passing
+  # because they feed the value from a fixture rather than through the jsonpath.
+  # An empty value is not by itself evidence of that: most addon releases of
+  # this chart set no strategy and take the default one, which is why only a
+  # release whose strategy the cluster is known to set can carry the check. The
+  # parent is that release, so it is the one asked for it, and it is enough: the
+  # same rename empties the field on every release at once.
+  if [ -n "${_strategy_required}" ] && [ -z "${_strategy}" ]; then
+    echo "spec.install.strategy.name of ${_hr} came back empty, and this release always carries one: the aggregated apiserver stamps RetryOnFailure on the HelmRelease of every Application it serves. An empty value is therefore the read rather than the object, and it is the lenient reading - every footprint below would be reported as a note instead of failing the run. Check the field against the helm-controller version in go.mod before looking at the release." >&2
+    _cozy_guard_kubectl -n "$_ns" describe hr "${_hr}" >&2
+    return 1
+  fi
+  # A value that is not empty but not RetryOnFailure is the other way into the
+  # lenient reading: on the default strategy an uninstall-and-reinstall cycle
+  # is a NOTE, and on the parent that cycle is what this guard exists to fail.
+  if [ -n "${_strategy_required}" ] && [ "${_strategy}" != "RetryOnFailure" ]; then
+    echo "spec.install.strategy.name of ${_hr} is ${_strategy}, and this release always carries RetryOnFailure: the aggregated apiserver stamps it on the HelmRelease of every Application it serves. Any other strategy means the stamp is gone, and every footprint below would be reported as a note instead of failing the run." >&2
+    _cozy_guard_kubectl -n "$_ns" describe hr "${_hr}" >&2
+    return 1
+  fi
+  # An empty history is read against this release's own readiness. A Ready
+  # HelmRelease has a completed helm action behind it and the controller keeps a
+  # Snapshot of every one, so Ready with no history is the Flux status shape
+  # having moved under the guard - skipping that would leave the release
+  # unchecked while the run stayed green, which is the failure mode this guard
+  # exists to remove rather than reproduce. A release that is not Ready may
+  # simply never have completed an action: it has nothing to find yet, and
+  # failing on it would be a red run blamed on a Flux API change for a release
+  # that is still installing.
+  if [ -z "${_history}" ]; then
+    if [ "${_ready}" = "True" ]; then
+      echo "Unexpected empty .status.history on Ready HelmRelease ${_hr} - Flux API shape may have changed." >&2
+      _cozy_guard_kubectl -n "$_ns" describe hr "${_hr}" >&2
+      return 1
+    fi
+    echo "» ${_hr} is not Ready and has no release history - no completed helm action to judge, not inspected"
+    return 0
+  fi
+  helmrelease_has_remediation_cycle "${_history}" || return 0
+  # The fatal verdict is gated on the release still carrying RetryOnFailure, so
+  # the field that makes a failed Snapshot the only signal is also the field that
+  # switches the guard off. Take RetryOnFailure away from the tenant cilium or
+  # csi and their footprint stops failing the run and starts printing the NOTE
+  # below, with nothing here changed. What holds that field is not this guard
+  # but two chart tests,
+  # packages/apps/kubernetes/tests/cilium_install_retry_test.yaml and
+  # csi_install_retry_test.yaml, which pin strategy.name on both actions. They
+  # are load-bearing for this guard and not only for the chart. The csi they
+  # pin is helmreleases/csi.yaml, the KubeVirt driver this suite runs; on the
+  # Proxmox substrate the same release comes from csi-proxmox.yaml, which sets
+  # the strategy too and has no such pin.
+  if [ "${_strategy}" = "RetryOnFailure" ]; then
+    echo "HelmRelease ${_hr} carries a failed or uninstalled Snapshot, and its install strategy is RetryOnFailure, which retries a failed action in place instead of remediating it. An action on this release failed during the run; the release may have recovered on a retry since, and the failure is still the finding. On the tenant cilium the cause can sit outside the chart: its operator Deployment cannot schedule before a worker registers, so workers arriving more than two 10m install timeouts after the install started leave this Snapshot while still inside the node-join deadline. Compare the Snapshot times below with when the first node turned Ready before looking at the release." >&2
+    _cozy_guard_kubectl -n "$_ns" describe hr "${_hr}" >&2
+    return 1
+  fi
+  # Readiness decides the tense: a release that is not Ready carries its
+  # footprint without having recovered from it yet, and a note claiming a
+  # recovery would send a reader looking for a second cause at the point where
+  # the first one is still live.
+  if [ "${_ready}" = "True" ]; then
+    echo "» NOTE: ${_hr} carries a failed or uninstalled Snapshot under the default strategy, which remediates between the retry attempts its budget allows - it was remediated and recovered. Not failing the run; read this as the cause if something downstream did fail."
+  else
+    echo "» NOTE: ${_hr} carries a failed or uninstalled Snapshot under the default strategy and is not Ready - it was remediated and has not completed an action since. Not failing the run; read this as the cause if something downstream did fail."
+  fi
+  return 0
+}
+
+# Print the addon HelmRelease names $2 selects in namespace $1, one per line.
+#
+# Extracted from the guard because the failure-path report walks the same
+# releases and must not walk a second, hand-kept copy of the selection: a
+# release the chart adds later has to appear in both readings or in neither.
+# Returns non-zero, having said why, when the listing failed or when the prefix
+# matched nothing - two outcomes that produce the same empty stdout and that
+# only the exit status tells apart.
+cozy_addon_helmrelease_names() {
+  local _ns="$1"
+  local _prefix="$2"
+  local _all_hrs _addon_hrs _read_rc
+  _cozy_guard_read_bounds
+  _read_rc=0
+  _all_hrs=$(_cozy_guard_kubectl get hr -n "$_ns" \
+    -o jsonpath='{range .items[*]}{.metadata.name}{"\n"}{end}') || _read_rc=$?
+  if [ "${_read_rc}" -ne 0 ]; then
+    echo "Listing HelmReleases in ${_ns} failed - $(_cozy_guard_read_failure "${_read_rc}")." >&2
+    return 1
+  fi
+  # index()==1 rather than a ^-anchored grep: the prefix is a release name, and
+  # a HelmRelease name is a DNS-1123 subdomain, so it may legally carry a dot.
+  # As a regex that dot would match any character and silently widen the
+  # selection past this parent's addons. awk exits 0 on no match, which the
+  # empty-selection check below reports.
+  _addon_hrs=$(printf '%s\n' "${_all_hrs}" | awk -v p="${_prefix}" 'index($0, p) == 1')
+  if [ -z "${_addon_hrs}" ]; then
+    echo "No addon HelmReleases matched ${_prefix}* in ${_ns}. Either the parent has not created them yet, which is what this means on a failure path that ran before it was Ready, or this prefix no longer selects them, or the chart stopped rendering them - they are gated on _namespace.etcd and on their own addons.<name>.enabled in packages/apps/kubernetes/templates/helmreleases/." >&2
+    printf '%s\n' "${_all_hrs}" >&2
+    return 1
+  fi
+  printf '%s\n' "${_addon_hrs}"
+}
+
+# Run that guard over the tenant addon HelmReleases a parent release installs.
+# $1 is the namespace, $2 the name prefix the addons share ("kubernetes-<test>-").
+#
+# The parent's own .status.history says nothing about its children, so a
+# remediation cycle on one of them surfaces only as whatever downstream deadline
+# it eventually breaks -- a node that never turns Ready, a PVC that never binds
+# -- with nothing in the run naming the failed action that preceded it. The CNI
+# and CSI releases are the sharp cases, because they carry a cluster-wide
+# precondition rather than one component.
+#
+# The addons are read from the cluster rather than listed here, so a release the
+# chart adds later is covered without touching this script.
+#
+# Adds no wait, and does not assume one happened. The parent HelmRelease carries
+# DisableWait on both actions (the Kubernetes ApplicationDefinition sets
+# release.cozystack.io/helm-install-disable-wait, deliberately, because its addon
+# releases cannot go Ready before worker nodes exist), so the parent reaching
+# Ready says nothing about them; and the suite waits on some of them by name
+# while never naming others, metrics-server and prometheus-operator-crds among
+# them. That is why each release is judged on what its own object says, readiness
+# included.
+cozy_guard_addon_helmreleases() {
+  local _ns="$1"
+  local _prefix="$2"
+  local _addon_hrs _addon_hr _failed
+  _addon_hrs=$(cozy_addon_helmrelease_names "$_ns" "${_prefix}") || return 1
+  # Every addon is inspected even after one of them fails. The notes the others
+  # print - a remediation the default strategy performed on one of them -
+  # are the context that explains the failure, and stopping at the first one
+  # hides exactly the releases a reader would compare it against.
+  _failed=0
+  for _addon_hr in ${_addon_hrs}; do
+    cozy_guard_helmrelease "$_ns" "${_addon_hr}" || _failed=1
+  done
+  return "${_failed}"
+}
+
+# Judge a parent release and the addons it installs, and report both verdicts.
+# $1 is the namespace, $2 the parent release name.
+#
+# Neither call may suppress the other, which is why the run does not simply
+# issue them back to back: the caller runs under errexit, so a non-zero parent
+# verdict would end the script before any addon was read. The run would still go
+# red, so nothing is lost about WHETHER it failed - what is lost is the addon
+# output that explains it, which is the same context the loop above preserves
+# among the addons themselves and for the same reason. The case that costs most
+# is a change in the Flux status shape, because it reaches every release alike:
+# the parent trips on it first and no addon is ever looked at. Collecting also
+# keeps the parent's own verdict, which an early return past the addons would
+# drop.
+#
+# The addon prefix is derived here rather than passed in, so the parent name and
+# the prefix that selects its children cannot drift apart.
+cozy_guard_all_helmreleases() {
+  local _ns="$1"
+  local _parent="$2"
+  local _failed=0
+  # The parent is asked to prove its install strategy read back non-empty; the
+  # addons are not, because most of them legitimately set none. See the branch
+  # in cozy_guard_helmrelease that reads this argument.
+  cozy_guard_helmrelease "$_ns" "${_parent}" required || _failed=1
+  cozy_guard_addon_helmreleases "$_ns" "${_parent}-" || _failed=1
+  # These releases are now classified, and the same flag the failure-path report
+  # uses records it. The two are not alternatives: this call runs before the
+  # snapshot trap is disarmed, deliberately, so a non-zero verdict here ends the
+  # script with the trap still armed and the handler runs the report over the
+  # releases just judged. Every line would be identical, which reads as two
+  # observations of one release, and the second pass would spend its budget in
+  # front of the snapshot on the one run where the snapshot matters most.
+  _COZY_GUARD_REPORT_DONE=1
+  return "${_failed}"
+}
+
+# How long the failure-path classification below may spend reading HelmReleases
+# before it stops and says which releases it did not reach. Its own budget in
+# addition to the diagnostics phase's, because it is called from paths that
+# never open a phase as well as from one that does, and on those the phase
+# check has nothing to say no with.
+COZY_GUARD_REPORT_BUDGET_DEFAULT=90
+# Assigned here as well as re-checked at use, like every other knob in this
+# file: left unassigned, the re-check would see an empty value on every run and
+# warn about a knob nobody set.
+COZY_GUARD_REPORT_BUDGET=$(_cozy_diag_seconds "${COZY_GUARD_REPORT_BUDGET:-$COZY_GUARD_REPORT_BUDGET_DEFAULT}" "$COZY_GUARD_REPORT_BUDGET_DEFAULT" COZY_GUARD_REPORT_BUDGET positive)
+# Cleared per run. Three call sites can reach the classification of one run --
+# the node-join collector, the exit handler after it, and the guard itself,
+# whose verdict on the passing path exits the script with that handler still
+# armed -- and printing the same verdicts twice would read as two separate
+# observations of one release.
+_COZY_GUARD_REPORT_DONE=0
+
+# Classify the same releases the guard judges, print the verdicts, and fail
+# nothing. $1 is the namespace, $2 the parent release name, $3 an optional
+# section label for a caller whose log is organised in lettered sections. The
+# exit handler passes none, because from there a lone "(e)" labels a position in
+# a list the reader never sees.
+#
+# This is the reading for the paths where the guard cannot run at all. The guard
+# sits after the assertions, and every deadline whose breach it exists to
+# explain -- a node that never turns Ready, a HelmRelease wait that expires, a
+# PVC that never binds -- ends the script under errexit well before it. So on
+# the runs where a failed action on the tenant CNI or CSI is the cause, the
+# guard had nothing to say, and the failure surfaced as the downstream deadline
+# with the history behind it unnamed. The verdict is not what those runs are
+# missing, the run is already red; the classification is.
+#
+# Which is why nothing here fails: returning non-zero from a collector on a
+# failing path would replace the caller's own exit status, and the tenant
+# crust-gather snapshot hangs off that exit.
+#
+# Bounded on its own clock, checked before the listing and before each release.
+# What comes after this on the exit path is the tenant snapshot, which needs the
+# rest of the op, so a namespace whose apiserver answers slowly must cost a
+# bounded number of seconds here rather than however many releases happen to be
+# in it. A release the budget cut off is named, not dropped in silence.
+#
+# The budget decides whether the next release may be STARTED, so it is not a
+# worst case and must not be written as one, the same way the diagnostics phase
+# budget is not. The ceiling is the budget plus the parent's reads, which are
+# issued before the first check because the deadline is stamped one line above
+# them, plus the reads of the one release the last check admitted -- at the
+# default per-read bound, up to three bounded reads each. Checking inside
+# cozy_guard_helmrelease would tighten it further and is deliberately not done:
+# that function is the guard, its verdict is what the passing path runs on, and
+# a deadline reaching into it would let a collector's clock decide which
+# releases the gate inspects.
+cozy_report_helmrelease_remediation() {
+  local _ns="$1"
+  local _parent="$2"
+  local _label="${3:-}"
+  local _addon_hrs _hr _deadline _budget
+  [ "${_COZY_GUARD_REPORT_DONE}" -eq 0 ] || return 0
+  # An empty parent name means the run failed before the release was created, so
+  # there is no history anywhere to read yet.
+  [ -n "${_parent}" ] || return 0
+  # Set below the two returns above, so a call with nothing to classify does not
+  # spend the one classification this run is allowed. Deliberately still above
+  # the phase gate below, which is the third way out: a spent phase declines
+  # every caller alike, so leaving the slot open there would buy a second
+  # decline note rather than a second reading.
+  _COZY_GUARD_REPORT_DONE=1
+  _budget=$(_cozy_diag_seconds "${COZY_GUARD_REPORT_BUDGET-}" "$COZY_GUARD_REPORT_BUDGET_DEFAULT" COZY_GUARD_REPORT_BUDGET positive)
+  _deadline=$(( $(date +%s) + _budget ))
+  # Two clocks, and both have to allow a read before it is issued. The phase
+  # budget is the caller's, and where one is open it is binding on every
+  # collector alike: what runs after this on that path is the tenant
+  # crust-gather snapshot, and a read begun past the phase deadline is taken out
+  # of the snapshot's time. The budget above is this collector's own, and it is
+  # what bounds the walk on the paths that open no phase at all -- where
+  # cozy_diag_phase_has_time returns "yes" because there is nothing to say no.
+  #
+  # The header is printed behind the first gate rather than ahead of it, so a
+  # declined run leaves the note and not a section header with nothing under it.
+  cozy_diag_phase_has_time "HelmRelease remediation footprint of ${_parent}" || return 0
+  echo "=== ${_label}tenant HelmRelease remediation footprint (management cluster, ns ${_ns}) — classification only, this does not decide the run ==="
+  cozy_guard_helmrelease "$_ns" "${_parent}" required || true
+  cozy_diag_phase_has_time "the addon HelmRelease listing of ${_parent}" || return 0
+  if [ "$(date +%s)" -ge "${_deadline}" ]; then
+    echo "=== HelmRelease remediation footprint: stopped after ${_budget}s; the addon releases of ${_parent} were not listed, so nothing was observed about any of them ===" >&2
+    return 0
+  fi
+  _addon_hrs=$(cozy_addon_helmrelease_names "$_ns" "${_parent}-") || return 0
+  for _hr in ${_addon_hrs}; do
+    cozy_diag_phase_has_time "HelmRelease remediation footprint of ${_hr}" || return 0
+    if [ "$(date +%s)" -ge "${_deadline}" ]; then
+      echo "=== HelmRelease remediation footprint: stopped after ${_budget}s; ${_hr} and every release after it were not read, and nothing was observed about them either way ===" >&2
+      break
+    fi
+    cozy_guard_helmrelease "$_ns" "${_hr}" || true
+  done
+  return 0
+}
+
+run_kubernetes_test() {
+    local version_expr="$1"
+    local test_name="$2"
+    local port="$3"
+    # Optional: when "true", enable the ouroboros addon on the Kubernetes CR
+    # and run the hairpin-NAT reconciliation assertions after the cluster is
+    # Ready. Folded in here so we don't pay a second ~25m Kamaji bringup just
+    # to flip one addon flag — kubernetes-latest passes "true", kubernetes-
+    # previous leaves it empty.
+    local enable_ouroboros="${4:-}"
+    # Optional: exercise both OIDC modes on the already-running latest cluster.
+    # The previous-version suite leaves it empty because OIDC is feature
+    # coverage, not a compatibility matrix that justifies another upgrade.
+    local enable_oidc="${5:-}"
+    # The previous suite's baseline must not survive into this suite's cleanup
+    # when this run fails before recording its own.
+    rm -f -- "$(_cozy_linstor_pool_baseline_file)" || return 1
+    local storage_class
+    storage_class=$(cozy_e2e_storage_class) || return 1
+    local k8s_version
+    k8s_version=$(yq "$version_expr" packages/apps/kubernetes/files/versions.yaml)
+
+  # Stamped here because the passing path below spends wall clock on a
+  # diagnostic after everything the suite proves has already passed, and the
+  # operation it runs inside has a fixed ceiling. What that costs is bounded;
+  # what is LEFT of the ceiling by then is not, so the only way the capture can
+  # be prevented from turning a green run red is to know how long this has been
+  # running. Nothing else reads it.
+  _COZY_RUN_STARTED_AT=$(date +%s)
+  local _cozy_run_started_rfc3339
+  _cozy_run_started_rfc3339=$(date -u '+%Y-%m-%dT%H:%M:%SZ')
+
+  # Per run rather than per source: the flag keeps one run's failure path from
+  # printing the classification twice, and a second run in the same shell is a
+  # second thing to classify rather than the same one again.
+  _COZY_GUARD_REPORT_DONE=0
+
+  # Clean up stale resources from a previous failed run. Delete the worker pool
+  # (KubernetesNodes) before the parent Kubernetes CR so a rerun re-creates the
+  # MachineDeployment instead of no-op'ing on a surviving child HelmRelease.
+  # These are blocking deletes because recording a baseline while old workers
+  # still own their disks would bless the leftover capacity as the new normal.
+  if ! kubectl -n tenant-test delete kubernetesnodeses.apps.cozystack.io "${test_name}-md0" --ignore-not-found --wait=true --timeout=2m; then
+    echo "failed to delete stale KubernetesNodes ${test_name}-md0" >&2
+    return 1
+  fi
+  if ! kubectl -n tenant-test delete kuberneteses.apps.cozystack.io "${test_name}" --ignore-not-found --wait=true --timeout=2m; then
+    echo "failed to delete stale Kubernetes ${test_name}" >&2
+    return 1
+  fi
+  if ! cozy_wait_tenant_drained "${test_name}" 300; then
+    echo "stale tenant compute or storage remains for ${test_name}" >&2
+    return 1
+  fi
+
+  # The replicated suite needs the absolute floor free before it starts (see
+  # cozy_wait_linstor_pool_free); the local lane's platform volumes already put
+  # one pool below it, so it has no such precondition.
+  if [ "$storage_class" = replicated ] && ! cozy_wait_linstor_pool_free 90 300; then
+    echo "» ERROR: ${test_name} has created nothing yet and its LINSTOR pool precondition failed: either a pool is below the 90 GiB this suite needs, held by earlier suites or the platform, or the pools could not be read. Either way it is an environment failure rather than this suite's" >&2
+    return 1
+  fi
+  # Save the post-stale-cleanup state for the separate Chainsaw `finally` shell;
+  # cleanup later verifies that this suite left no dataset outside this listing.
+  if ! cozy_capture_linstor_pool_baseline; then
+    echo "cannot verify LINSTOR reclamation without a complete baseline" >&2
+    return 1
+  fi
+
+  # Compose the optional ouroboros addon block. Indentation matches the
+  # surrounding addons map (4 spaces).
+  local ouroboros_addon=""
+  if [ "${enable_ouroboros}" = "true" ]; then
+    ouroboros_addon=$(cat <<'YAML'
+    ouroboros:
+      enabled: true
+      # logLevel=debug surfaces controller informer events for failure
+      # diagnosis; scoped to the e2e fixture only, production tenants stay
+      # on the upstream chart default (info).
+      valuesOverride:
+        ouroboros:
+          controller:
+            logLevel: debug
+YAML
+)
+  fi
+
+  local oidc_block=""
+  if [ "${enable_oidc}" = "true" ]; then
+    oidc_block=$(cat <<'YAML'
+  oidc:
+    mode: System
+    users:
+    - email: e2e-admin@example.test
+      role: admin
+    - email: e2e-viewer@example.test
+      role: view
+YAML
+)
+  fi
+
+  # Point worker DataVolume imports at the in-sandbox Talos OS image cache when it
+  # is up, falling back to the public factory otherwise. Worker image pulls use
+  # the chart's public-registry default. Emitted right under spec: as
+  # `talos: { imageFactoryURL: ... }`, or nothing when the default applies.
+  local talos_block
+  talos_block=$(talos_spec_block)
+
+  kubectl apply -f - <<EOF
+apiVersion: apps.cozystack.io/v1alpha1
+kind: Kubernetes
+metadata:
+  name: "${test_name}"
+  namespace: tenant-test
+spec:
+${talos_block}
+${oidc_block}
+  addons:
+    certManager:
+      enabled: false
+      valuesOverride: {}
+    cilium:
+      valuesOverride: {}
+    gatewayAPI:
+      enabled: false
+    gpuOperator:
+      enabled: false
+      valuesOverride: {}
+    ingressNginx:
+      enabled: true
+      hosts: []
+      valuesOverride: {}
+    monitoringAgents:
+      enabled: false
+      valuesOverride: {}
+${ouroboros_addon}
+    verticalPodAutoscaler:
+      valuesOverride: {}
+  controlPlane:
+    apiServer:
+      resources: {}
+      # Chart default (2 CPU / 2Gi), not a smaller override. The legacy "small"
+      # preset caps the tenant apiserver at 512Mi, and a two-node tenant cluster
+      # running the full addon set (cilium, coredns, metrics-server, csi,
+      # ingress-nginx, VPA) opens enough watches to exceed that: the apiserver
+      # is OOMKilled once the workers join, and every in-flight tenant
+      # HelmRelease that is waiting on a DaemonSet rollout burns its whole
+      # timeout while the control plane is restarting.
+      resourcesPreset: c1.medium
+    controllerManager:
+      resources: {}
+      resourcesPreset: micro
+    konnectivity:
+      server:
+        resources: {}
+        resourcesPreset: micro
+    replicas: 2
+    scheduler:
+      resources: {}
+      resourcesPreset: micro
+  host: ""
+  storageClass: "${storage_class}"
+  version: "${k8s_version}"
+EOF
+
+  # Worker node pool is a separate KubernetesNodes resource since the Phase 2
+  # split. Named "<cluster>-md0" so it produces MachineDeployment
+  # kubernetes-${test_name}-md0 — the same object the pre-split
+  # spec.nodeGroups.md0 produced, which the waits below still key on. Carries
+  # roles: [ingress-nginx] so the ingress-nginx addon has a node to schedule on.
+  local _worker_pool_requested_at
+  _worker_pool_requested_at=$(date +%s)
+  kubectl apply -f - <<EOF
+apiVersion: apps.cozystack.io/v1alpha1
+kind: KubernetesNodes
+metadata:
+  name: "${test_name}-md0"
+  namespace: tenant-test
+spec:
+  cluster: "${test_name}"
+${talos_block}
+  diskSize: 20Gi
+  gpus: []
+  # Sizing comes from resources below; this is here because the values
+  # schema requires the field, and the chart drops the instancetype from
+  # the VM whenever a pool sets both resources.cpu and resources.memory.
+  instanceType: u1.medium
+  # The failure this suite keeps hitting is a worker that stalls in the guest
+  # before Talos apid answers, which leaves nothing to read on the management
+  # side and nothing for talosctl to connect to. Turning this on attaches
+  # KubeVirt's guest-console-log container, the only artifact that covers that
+  # window.
+  logSerialConsole: true
+  maxReplicas: 10
+  minReplicas: 2
+  # Headroom above the vCPU count, where KubeVirt would otherwise put the
+  # ceiling. Workers failing to join (cozystack/cozystack#3513) have been
+  # measured burning their vCPU threads flat out at a ceiling equal to their
+  # vCPU count while the guest kernel made no progress, which is what a vCPU
+  # spinning on a lock looks like. Spare quota above the pair did not change
+  # it: under a ceiling of 3 the pair kept burning the same 1.4 to 1.8 cores
+  # with no progress, so the spin is not a quota artefact. A single vCPU
+  # cannot spin on its sibling, which is what this shape is here to answer,
+  # and the ceiling above the vCPU count keeps the emulator and IO threads
+  # from eating into the one core the guest computes with. The request is
+  # what keeps scheduling where it was: setDefaultResourceRequests, in
+  # KubeVirt's VMI mutating webhook, copies a declared CPU limit into an
+  # undeclared CPU request, so the limit alone would have every worker ask
+  # the scheduler for its whole ceiling and sit Pending on Insufficient cpu.
+  # Its value is the one KubeVirt derived for these workers before, from the
+  # vCPU count and the cluster CPU allocation ratio.
+  podCpuLimit: 2
+  podCpuRequest: 100m
+  # One vCPU at the memory the workers had before. Sized by resources
+  # rather than by instanceType, which cannot carry the pod CPU pair above.
+  resources:
+    cpu: 1
+    memory: 4Gi
+  roles:
+  - ingress-nginx
+  storageClass: "${storage_class}"
+  version: "${k8s_version}"
+EOF
+  # Armed here, at the apply, rather than once the tenant answers. The parent
+  # HelmRelease exists from this point on -- the aggregated apiserver renders it
+  # from the CR above -- and everything between here and the tenant LB is a
+  # management-cluster wait on that release or on what it installs: the
+  # KamajiControlPlane, the control-plane Deployments, the MachineDeployment,
+  # the admin-kubeconfig Secret. That window is the one the guard was written
+  # for. An install action that times out while admin-kubeconfig is still being
+  # provisioned leaves the failed Snapshot this reads, and every one of those
+  # waits exits under errexit with no reading at all if the handler is armed
+  # after them.
+  #
+  # Arming this early costs the snapshot nothing: _tenant_snapshot_on_fail
+  # returns on an unset CURRENT_TENANT_KC, which is assigned where the
+  # kubeconfig becomes usable, so it no-ops until then.
+  CURRENT_TENANT_PARENT_HR="kubernetes-${test_name}"
+  trap '_tenant_failure_on_exit' EXIT
+  # Wait for the tenant-test namespace to be active
+  kubectl wait namespace tenant-test --timeout=20s --for=jsonpath='{.status.phase}'=Active
+
+  # Wait for the Kamaji control plane to be created. Under Flux v2.8
+  # kstatus-based health checks helm-controller can take 20-30s to dispatch
+  # the new Kubernetes HR before it renders the KamajiControlPlane CR; the
+  # old 10s budget was tight on v2.7 and consistently fails on v2.8.
+  timeout 2m sh -ec 'until kubectl get kamajicontrolplane -n tenant-test kubernetes-'"${test_name}"'; do sleep 1; done'
+
+  # Wait for the tenant control plane to be fully created. Pre-Talos this
+  # only spun up Kamaji core; after PR #2610 the apiserver pod also pulls
+  # and starts the talos-csr-signer sidecar and cert-manager has to issue
+  # the Talos PKI Certificates that gate the wait-for-kubeconfig init
+  # container, so cold-start times in a fresh sandbox crossed the original
+  # 4m budget. The 10m wait below sits well inside the
+  # helm-install-timeout: 20m annotation that cozystack-api copies from
+  # cozyrds onto the HR.
+  kubectl_wait_retry --for=condition=TenantControlPlaneCreated kamajicontrolplane -n tenant-test kubernetes-${test_name} --timeout=10m
+
+  # Wait for Kubernetes resources to be ready. Same rationale as the
+  # TenantControlPlaneCreated wait above — Talos PKI issuing + sidecar
+  # readiness probes shift the steady-state Ready point.
+  kubectl_wait_retry tcp -n tenant-test kubernetes-${test_name} --timeout=10m --for=jsonpath='{.status.kubernetesResources.version.status}'=Ready
+
+  # Wait for all required deployments to be available (timeout after 4 minutes)
+  kubectl_wait_retry deploy --timeout=4m --for=condition=available -n tenant-test kubernetes-${test_name} kubernetes-${test_name}-cluster-autoscaler kubernetes-${test_name}-kccm kubernetes-${test_name}-kcsi-controller
+
+  # Since the Phase 2 split the MachineDeployment is rendered by the CHILD
+  # kubernetes-nodes-<cluster>-md0 HelmRelease -- a separately-dispatched
+  # reconcile with its own 20-30s helm-controller latency (same figure as the
+  # KCP note above), not by the parent install that produced the deployments
+  # just waited on. A fast parent bringup therefore reaches this point BEFORE
+  # the child HR has applied anything, and `kubectl wait` on an absent object
+  # exits NotFound immediately instead of polling. Event-driven existence
+  # backstop first, same sanctioned pattern as the kamajicontrolplane loop
+  # above; the faster the parent, the more certain the race is lost without it.
+  timeout 3m sh -ec 'until kubectl get machinedeployment -n tenant-test kubernetes-'"${test_name}"'-md0; do sleep 2; done'
+
+  # Wait for the machine deployment to scale to 2 replicas. Pre-Talos this
+  # was effectively instant because KubeadmConfigTemplate had no async
+  # dependencies and CAPI/CAPK could create Machine + KubevirtMachine
+  # immediately. Post-Talos the MD bootstrap.configRef gates on the
+  # TalosConfigTemplate, which only renders once the lookup-gated Talos PKI
+  # Secrets (talos-secrets, talos-ca, k8s ca, apiserver Service ClusterIP)
+  # all exist; cold-start in a fresh CI sandbox pushes the time to first
+  # MachineSet scale-up past the old 1m budget.
+  kubectl_wait_retry machinedeployment kubernetes-${test_name}-md0 -n tenant-test --timeout=5m --for=jsonpath='{.status.replicas}'=2
+  # Get the admin kubeconfig and save it to a file
+  kubectl get secret kubernetes-${test_name}-admin-kubeconfig -ojsonpath='{.data.super-admin\.conf}' -n tenant-test | base64 -d > "tenantkubeconfig-${test_name}"
+
+  # Expose the tenant Kubernetes API via a test-scoped LoadBalancer instead of
+  # `kubectl port-forward`. The host cluster runs MetalLB on the same /24 as the
+  # sandbox nodes (pool 192.168.123.200-250), so an LB IP is directly routable
+  # from the test — the in-tenant LB test below already curls such an address.
+  # Crucially, a LoadBalancer Service load-balances across ALL ready apiserver
+  # endpoints (both Kamaji control-plane pods), so a single apiserver pod restart
+  # is routed around transparently. `kubectl port-forward` instead pins to one
+  # pod and dies when that pod blips: a lone kube-apiserver restart was observed
+  # leaving localhost refusing connections for the whole node-Ready wait while
+  # the cluster was in fact healthy (CAPI NodeHealthy=True on both nodes),
+  # failing the test on a dead tunnel. The LB endpoint is also stable until
+  # teardown, so the failure snapshot can still reach the tenant. Test-scoped and
+  # additive — no change to the product Kamaji/Kubernetes chart.
+  #
+  # Clean up a stale LB from a previous failed retry of this same test first.
+  kubectl -n tenant-test delete service "kubernetes-${test_name}-e2e-lb" \
+    --ignore-not-found --wait=true --timeout=60s
+  kubectl apply -n tenant-test -f - <<EOF
+apiVersion: v1
+kind: Service
+metadata:
+  name: kubernetes-${test_name}-e2e-lb
+  labels:
+    cozystack-e2e.io/tenant-api-lb: "${test_name}"
+spec:
+  type: LoadBalancer
+  selector:
+    kamaji.clastix.io/name: kubernetes-${test_name}
+  ports:
+  - name: kube-apiserver
+    port: 6443
+    targetPort: 6443
+EOF
+  # Wait for MetalLB to assign an external IP.
+  timeout 90 sh -ec 'until [ -n "$(kubectl get svc -n tenant-test kubernetes-'"${test_name}"'-e2e-lb -o jsonpath="{.status.loadBalancer.ingress[0].ip}" 2>/dev/null)" ]; do sleep 2; done'
+  TENANT_API_LB_IP=$(kubectl get svc -n tenant-test "kubernetes-${test_name}-e2e-lb" -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
+  if [ -z "${TENANT_API_LB_IP}" ]; then
+    echo "tenant API LoadBalancer did not receive an IP" >&2
+    exit 1
+  fi
+
+  # Point the kubeconfig at the LB IP. The MetalLB IP is not in the apiserver
+  # serving-cert SANs, so skip TLS verification (e2e only — we functionally test
+  # the cluster, not its serving identity) and drop the now-mismatched CA data
+  # (kubectl rejects insecure-skip-tls-verify alongside certificate-authority).
+  yq -i ".clusters[0].cluster.server = \"https://${TENANT_API_LB_IP}:6443\" | .clusters[0].cluster.\"insecure-skip-tls-verify\" = true | del(.clusters[0].cluster.\"certificate-authority-data\")" "tenantkubeconfig-${test_name}"
+
+  # Wait for the API to answer through the LB before using it.
+  timeout 60 sh -ec 'until kubectl --kubeconfig tenantkubeconfig-'"${test_name}"' get --raw /healthz >/dev/null 2>&1; do sleep 2; done'
+  # The kubeconfig + LB are live now. Hand the handler armed above the tenant
+  # cluster as well: it returns on an unset name, so until this line its
+  # snapshot half has been a no-op and only the HelmRelease classification ran.
+  # From here a failure captures the tenant cluster too (the LB endpoint stays
+  # up until teardown, so crust-gather can reach it). Cleared on the success
+  # path below. A global for the reason the parent release name is one: the
+  # handler reads it at EXIT-trap time, where a local of this function is not
+  # something to rely on.
+  CURRENT_TENANT_KC="tenantkubeconfig-${test_name}"
+  # Verify the Kubernetes version matches what we expect (retry for up to 20 seconds)
+  timeout 20 sh -ec 'until kubectl --kubeconfig tenantkubeconfig-'"${test_name}"' version 2>/dev/null | grep -Fq "Server Version: ${k8s_version}"; do sleep 1; done'
+
+  # The canary goes first, outside the three counter pairs below rather than
+  # among them, and it is a different kind of instrument from all three: it does
+  # not read a running total twice, it runs a fixed amount of work and times it,
+  # so each sample stands on its own and there is no interval for anything to
+  # widen. What it does have is a cost, since it occupies a core for a couple of
+  # seconds. That is why it sits out here. Taken between any of those first
+  # readings and the wait, its burn would land inside the interval that pair
+  # divides by: runner-kernel CPU time the pair would then charge to the join
+  # window, and for the two counting the guests, a core taken away from what
+  # they count; ahead of all three, it lands on neither side of any of them, and
+  # the second sample sits behind all three second readings for the same reason.
+  #
+  # Both outcomes reach the job log rather than only the capture, and the second
+  # for the same reason as the first: a run that took a reading the legend calls
+  # pathological is the loudest thing this collector can say, and on the passing
+  # path the report holding it is the artifact nobody downloads.
+  if ! cozy_capture_runner_canary 1; then
+    echo "» WARNING: the runner fixed-work canary produced no reading before the node-join wait, so this run has no measure of what one core got done at this layer going into it; if a capture was written it says whether the clock could not be read or the work itself failed, and if it could not be written the line above this one says so" >&2
+  elif [ "${_COZY_CANARY_ALERT:-0}" -eq 1 ]; then
+    echo "» WARNING: the runner fixed-work canary did not read inside the range its own legend calls healthy before the node-join wait, so this run went into the wait on a machine that was already not getting the work done; which arm it was and what figure it gave is written into the capture" >&2
+  fi
+  # The first readings of the three pairs that bracket the wait, taken here
+  # rather than inside the failure block and taken on every run rather than on
+  # the failing ones. All three read running totals, so one reading is an
+  # average over a whole life and a rate needs two -- and the interval worth
+  # measuring is the window the guest is failing to boot in, which is the wait
+  # below. A pair taken a few seconds apart after the deadline has already
+  # expired would price the tail instead of the fault.
+  #
+  # The KVM reading goes LAST here and FIRST after the wait, mirrored on
+  # purpose: nothing then runs between its two samples except the wait itself,
+  # which is what lets its legend call the interval the window and mean it
+  # exactly. The other two name the sibling readings inside their intervals.
+  #
+  # Ungated and not fatal. Each is a bounded local read against a wait measured
+  # in minutes, and a run that could not take them must still be allowed to go
+  # on and fail for its own reasons.
+  if ! cozy_capture_sandbox_qemu_thread_cpu 1; then
+    echo "» WARNING: the sandbox VMs' QEMU threads yielded no reading before the node-join wait, so the reading taken after it will have nothing to pair with; whether the walk failed or this container had no QEMU process to read is written into the capture itself" >&2
+  fi
+  if ! cozy_capture_runner_kernel_cpu_time 1; then
+    echo "» WARNING: the runner kernel's CPU time yielded no reading before the node-join wait, so the reading taken after it will have nothing to pair with; whether the read failed or returned no cpu row is written into the capture itself" >&2
+  fi
+  if ! cozy_capture_sandbox_kvm_exits 1; then
+    echo "» WARNING: the sandbox kernel's KVM counters yielded no reading before the node-join wait, so the reading taken after it will have nothing to pair with; whether the read failed or the kernel had no counters to give is written into the capture itself, and any message the read left is in the log beside it" >&2
+  fi
+  # The status is kept rather than tested in place, because what this branch
+  # does next depends on which non-zero it was and `if !` throws that away.
+  local _join_rc=0
+  local _join_wait_started_at _join_wait_finished_at
+  _join_wait_started_at=$(date +%s)
+  timeout 29m bash -c '
+    until [ "$(kubectl --kubeconfig "tenantkubeconfig-'"${test_name}"'" get nodes --no-headers 2>/dev/null | grep -cw Ready)" -ge 2 ]; do
+      sleep 5
+    done
+  ' || _join_rc=$?
+  _join_wait_finished_at=$(date +%s)
+  if [ "${_join_rc}" -ne 0 ]; then
+    # Node-join failed: fewer than 2 tenant nodes became Ready inside the 29m
+    # deadline, or the wait itself could not run. Record which of the two it was,
+    # dump scoped diagnostics that split the failure sub-modes, then fail — the
+    # checks below need Ready nodes and would report their absence as their own
+    # failure.
+    #
+    # Both cases exit 1: the suite stays red, so Chainsaw runs its whole catch
+    # and the report says a test failed. What differs is only which of the two
+    # the log names, because "the workers were slow" and "the wait never ran"
+    # send a reader to different places.
+    if cozy_node_join_deadline_expired "${_join_rc}"; then
+      cozy_note_node_join_deadline "${test_name}"
+    else
+      echo "the node-join wait did not run to its deadline (exit ${_join_rc}); this is the wait failing rather than the nodes" >&2
+    fi
+    cozy_report_node_join_failure "${test_name}"
+    exit 1
+  fi
+  # The second KVM counter reading on the path where the join succeeded, and it
+  # belongs here rather than beside the console baseline at the end of the run.
+  # The pair is only a measurement of the join window if both readings bracket
+  # it, and the tail below this point is another ten to fifteen minutes of a
+  # tenant cluster doing storage and LoadBalancer work: a sample taken after it
+  # would price a different window over a different workload while the legend in
+  # the capture says it priced the join. That would corrupt exactly the
+  # comparison these counters exist for, since the green run is what the red
+  # ones are read against. Placing it here also removes an orphan: a failure
+  # between the wait and the end of the suite would otherwise leave the first
+  # reading alone in the report, carrying an instruction to difference it
+  # against a sibling that was never written.
+  if ! cozy_capture_sandbox_kvm_exits 2; then
+    echo "» WARNING: the sandbox kernel's KVM counters yielded no reading after the node-join wait, so this report carries no green baseline for the exit rate; whether the read failed or the kernel had no counters to give is written into the capture itself, and any message the read left is in the log beside it" >&2
+  fi
+  # The second half of each pair on the path where the join succeeded, beside the
+  # KVM reading and for its reason: the pair is a measurement of the join window
+  # only if both readings bracket it, and the tail below this point is another
+  # ten to fifteen minutes of storage and LoadBalancer work. A sample taken after
+  # that would price a different window over a different workload while the
+  # legend in the capture says it priced the join -- which would corrupt exactly
+  # the comparison these readings exist for, since the green run is what the red
+  # ones are read against.
+  if ! cozy_capture_runner_kernel_cpu_time 2; then
+    echo "» WARNING: the runner kernel's CPU time yielded no reading after the node-join wait, so this report carries no green baseline for what the layer above the sandbox spent; whether the read failed or returned no cpu row is written into the capture itself" >&2
+  fi
+  if ! cozy_capture_sandbox_qemu_thread_cpu 2; then
+    echo "» WARNING: the sandbox VMs' QEMU threads yielded no reading after the node-join wait, so this report carries no green baseline for how that time split across the three nodes; whether the walk failed or this container had no QEMU process to read is written into the capture itself" >&2
+  fi
+  # The canary's second sample, last on this path as it was first before the
+  # wait. Behind all three second readings deliberately: it burns a core, and
+  # taken ahead of any of them that burn would sit inside the interval the pair
+  # divides by. It is also the half of the pair with the green figure in it --
+  # the expected ranges the capture states are what a red run is read against
+  # when there is no green run to compare it with, and a green run that records
+  # its own numbers is what says whether those ranges describe this lane.
+  #
+  # Ungated, unlike the console capture further down this path, and the reason is
+  # not that the rule there does not apply. That rule is for a collector costing
+  # minutes; both arms here sit under one ceiling apiece and the pair is seconds.
+  if ! cozy_capture_runner_canary 2; then
+    echo "» WARNING: the runner fixed-work canary produced no reading after the node-join wait, so this report carries no green figure for what one core gets done at this layer; if a capture was written it says whether the clock could not be read or the work itself failed, and if it could not be written the line above this one says so" >&2
+  elif [ "${_COZY_CANARY_ALERT:-0}" -eq 1 ]; then
+    echo "» WARNING: the runner fixed-work canary did not read inside the range its own legend calls healthy after the node-join wait, so this run passed on a machine that was not getting the work done at this layer; which arm it was and what figure it gave is written into the capture" >&2
+  fi
+  kubectl --kubeconfig "tenantkubeconfig-${test_name}" get nodes -o wide
+  cozy_report_node_join_timing \
+    "$test_name" \
+    "tenantkubeconfig-${test_name}" \
+    "$_worker_pool_requested_at" \
+    "$_join_wait_started_at" \
+    "$_join_wait_finished_at" \
+    "$_cozy_run_started_rfc3339" || true
+
+  # Verify the kubelet version matches what we expect
+  versions=$(kubectl --kubeconfig "tenantkubeconfig-${test_name}" \
+    get nodes -o jsonpath='{.items[*].status.nodeInfo.kubeletVersion}')
+
+  node_ok=true
+
+  for v in $versions; do
+    case "$v" in
+      "${k8s_version}" | "${k8s_version}".* | "${k8s_version}"-*)
+        # acceptable
+        ;;
+      *)
+        node_ok=false
+        break
+        ;;
+    esac
+  done
+
+  if [ "$node_ok" != true ]; then
+    echo "Kubelet versions did not match expected ${k8s_version}" >&2
+    exit 1
+  fi
+
+
+  kubectl --kubeconfig "tenantkubeconfig-${test_name}" apply -f - <<EOF
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: tenant-test
+EOF
+
+  # Clean up backend resources from any previous failed attempt
+  kubectl delete deployment --kubeconfig "tenantkubeconfig-${test_name}" "${test_name}-backend" \
+    -n tenant-test --ignore-not-found --timeout=60s
+  kubectl delete service --kubeconfig "tenantkubeconfig-${test_name}" "${test_name}-backend" \
+    -n tenant-test --ignore-not-found --timeout=60s
+
+  # Start the workload's clock from a node that accepts Pods, not from a node
+  # that is merely Ready. Both instances of run 31020254620 spent 2m18s and
+  # 1m57s of the 300s readiness budget below on FailedScheduling, against nodes
+  # that were Ready but carried `node.cilium.io/agent-not-ready` or were
+  # SchedulingDisabled, and then ran out while the image was still being
+  # pulled. This gate is not extra waiting on the happy path: it spends the
+  # seconds the Pod would otherwise spend Pending (plus at most one 5s poll
+  # interval) and moves them out of a budget that has a different job. 300s is
+  # more than twice the longest scheduling delay observed, and the gate prints
+  # the node table on both outcomes so a timeout names the taint that held it.
+  # The two budgets do stack on a failing run: one that spends the full 300s
+  # here and then overruns the readiness wait gives up at ~600s where it used
+  # to give up at 300s. That sits inside the enclosing 40m Chainsaw script op,
+  # which the kubernetes-* suites document as a ~25m bringup.
+  if ! cozy_wait_schedulable_node "tenantkubeconfig-${test_name}" 300; then
+    echo "=== tenant scheduling gate failed: no node became schedulable within 300s — diagnostics follow ==="
+    # Bounded like the node-join reads, and for the same reason: this branch also
+    # ends in the `exit 1` that triggers the tenant snapshot, and the node table
+    # is read through the tenant kubeconfig — a nodes-Ready-but-unschedulable
+    # tenant is one whose apiserver may or may not answer.
+    #
+    # Validated here for the same reason cozy_report_node_join_failure validates
+    # before composing its own string: the `--request-timeout` below is interpolated
+    # when these arguments are expanded, which is before cozy_diag_read gets to
+    # re-check the global. A post-source `8m` would otherwise send
+    # `--request-timeout=8ms` and lose the node table -- the one thing this branch
+    # exists to print -- while the note blamed the cluster.
+    COZY_DIAG_READ_TIMEOUT=$(_cozy_diag_seconds "${COZY_DIAG_READ_TIMEOUT-}" "$COZY_DIAG_READ_TIMEOUT_DEFAULT" COZY_DIAG_READ_TIMEOUT positive)
+    cozy_diag_read 'tenant node table' \
+      kubectl --kubeconfig "tenantkubeconfig-${test_name}" describe nodes \
+      "--request-timeout=${COZY_DIAG_READ_TIMEOUT}s"
+    cozy_diag_read 'tenant HelmReleases' \
+      kubectl -n tenant-test get hr "--request-timeout=${COZY_DIAG_READ_TIMEOUT}s"
+    exit 1
+  fi
+
+  # Backend 1
+  #
+  # nginx is pinned by digest. The tenant workers reach no registry mirror --
+  # hack/e2e-talos-image-cache.yaml serves the Talos worker OS disk image over
+  # HTTP and is not one, and nothing else in the tree mirrors container images
+  # for a tenant -- so this is pulled from Docker Hub on every run either way.
+  # The digest does not remove that pull, it fixes what the pull returns: a
+  # floating `nginx:alpine` silently changes size and layer count under the
+  # readiness budget below, and supplies whatever content the tag points at on
+  # the day. The digest is the OCI index, not a per-architecture manifest, so
+  # the kubelet still selects the image for the worker's own architecture.
+  # Nothing will bump it: renovate's enabledManagers are gomod, dockerfile,
+  # github-actions and custom.regex, and both custom managers match packages/
+  # paths only, so no manager reads this file. That is the intent rather than an
+  # oversight -- the point of the pin is that the bytes stay the same run to
+  # run, and this is a throwaway test workload, not an image the platform ships.
+  kubectl apply --kubeconfig "tenantkubeconfig-${test_name}" -f- <<EOF
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: "${test_name}-backend"
+  namespace: tenant-test
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: backend
+      backend: "${test_name}-backend"
+  template:
+    metadata:
+      labels:
+        app: backend
+        backend: "${test_name}-backend"
+    spec:
+      containers:
+      - name: nginx
+        image: nginx:1.31.3-alpine@sha256:4a73073bd557c65b759505da037898b61f1be6cbcc3c2c3aeac22d2a470c1752
+        ports:
+        - containerPort: 80
+        readinessProbe:
+          httpGet:
+            path: /
+            port: 80
+          initialDelaySeconds: 2
+          periodSeconds: 2
+EOF
+
+  # LoadBalancer Service
+  kubectl apply --kubeconfig "tenantkubeconfig-${test_name}" -f- <<EOF
+apiVersion: v1
+kind: Service
+metadata:
+  name: "${test_name}-backend"
+  namespace: tenant-test
+spec:
+  type: LoadBalancer
+  selector:
+    app: backend
+    backend: "${test_name}-backend"
+  ports:
+  - port: 80
+    targetPort: 80
+EOF
+
+  # Wait for pods readiness. With scheduling gated above, these 300s start from
+  # a node that accepts Pods, so they cover placement, sandbox setup, the image
+  # pull and the probe -- and no longer the wait for a node to stop rejecting
+  # the Pod, which now has a budget and a message of its own. The events in the
+  # diagnostics below tell the remaining consumers apart. The number is
+  # unchanged from when it also had to absorb scheduling; the pull alone
+  # measured 1m42s in run 31020254620.
+  if ! kubectl wait deployment --kubeconfig "tenantkubeconfig-${test_name}" "${test_name}-backend" -n tenant-test --for=condition=Available --timeout=300s; then
+    echo "=== backend readiness failed: the Pod was schedulable but did not become Available within 300s — diagnostics follow ==="
+    kubectl --kubeconfig "tenantkubeconfig-${test_name}" -n tenant-test describe deployment "${test_name}-backend" || true
+    kubectl --kubeconfig "tenantkubeconfig-${test_name}" -n tenant-test describe pods -l "backend=${test_name}-backend" || true
+    kubectl --kubeconfig "tenantkubeconfig-${test_name}" -n tenant-test get events --sort-by=.lastTimestamp || true
+    exit 1
+  fi
+
+  # Wait for LoadBalancer to be provisioned (IP or hostname)
+  timeout 90 sh -ec "
+    until kubectl get svc ${test_name}-backend --kubeconfig tenantkubeconfig-${test_name} -n tenant-test \
+      -o jsonpath='{.status.loadBalancer.ingress[0]}' | grep -q .; do
+      sleep 5
+    done
+  "
+
+  LB_ADDR=$(
+    kubectl get svc --kubeconfig "tenantkubeconfig-${test_name}" "${test_name}-backend" \
+      -n tenant-test \
+      -o jsonpath='{.status.loadBalancer.ingress[0].ip}{.status.loadBalancer.ingress[0].hostname}'
+  )
+
+  if [ -z "$LB_ADDR" ]; then
+    echo "LoadBalancer address is empty" >&2
+    exit 1
+  fi
+
+  # TODO(e2e-replace-fixed-timeouts): genuine retry loop. This validates an
+  # external HTTP path (MetalLB-advertised LB IP -> in-tenant ingress ->
+  # backend pod) which is not visible to the Kubernetes API as a single
+  # condition, so kubectl wait cannot replace it. The 20x3s = 60s budget is
+  # capped with `lb_ok=false` then asserted below.
+  lb_ok=false
+  for i in $(seq 1 20); do
+    echo "Attempt $i"
+    if curl --silent --fail "http://${LB_ADDR}"; then
+      lb_ok=true
+      break
+    fi
+    sleep 3
+  done
+
+  if [ "$lb_ok" != true ]; then
+    echo "LoadBalancer not reachable" >&2
+    exit 1
+  fi
+
+  # Cleanup
+  kubectl delete deployment --kubeconfig "tenantkubeconfig-${test_name}" "${test_name}-backend" -n tenant-test
+  kubectl delete service --kubeconfig "tenantkubeconfig-${test_name}" "${test_name}-backend" -n tenant-test
+
+  # Block until csi.kubevirt.io is registered on the tenant worker CSINode.
+  # Otherwise the NFS pod schedules while kubevirt-csi-node DaemonSet is
+  # still rolling out, eats ~1m on FailedAttachVolume retries, and trips
+  # the 5m pod-Succeeded budget when containerd's CreateContainer stalls.
+  kubectl wait hr -n tenant-test "kubernetes-${test_name}-csi" --timeout=10m --for=condition=ready
+
+  if [ "$storage_class" = local ]; then
+    echo "Skipping remote StorageClass propagation and RWX NFS assertions for local-only E2E storage"
+  else
+  # ----------------------------------------------------------------------
+  # StorageClass propagation (issue #2094). Remote-accessible LINSTOR infra
+  # classes propagate to the tenant under the same name; node-local classes
+  # ("local", allowRemoteVolumeAccess=false) are filtered out; the legacy
+  # "kubevirt" alias is retained for backward compatibility. The e2e infra
+  # cluster ships both "replicated" (remote) and "local" (node-local).
+  # ----------------------------------------------------------------------
+  echo "Verifying StorageClass propagation to tenant..."
+  timeout 2m bash -c '
+    until kubectl --kubeconfig tenantkubeconfig-'"${test_name}"' get sc replicated >/dev/null 2>&1; do
+      sleep 5
+    done
+  '
+
+  rep_prov=$(kubectl --kubeconfig "tenantkubeconfig-${test_name}" get sc replicated -o jsonpath='{.provisioner}')
+  rep_infra=$(kubectl --kubeconfig "tenantkubeconfig-${test_name}" get sc replicated -o jsonpath='{.parameters.infraStorageClassName}')
+  if [ "$rep_prov" != "csi.kubevirt.io" ] || [ "$rep_infra" != "replicated" ]; then
+    echo "replicated SC misconfigured: provisioner=$rep_prov infraStorageClassName=$rep_infra" >&2
+    kubectl --kubeconfig "tenantkubeconfig-${test_name}" get sc >&2
+    exit 1
+  fi
+
+  # Legacy kubevirt alias must still exist (existing PVCs depend on it).
+  if ! kubectl --kubeconfig "tenantkubeconfig-${test_name}" get sc kubevirt >/dev/null 2>&1; then
+    echo "legacy kubevirt StorageClass alias is missing" >&2
+    exit 1
+  fi
+
+  # Node-local "local" class must NOT be propagated (allowRemoteVolumeAccess=false).
+  if kubectl --kubeconfig "tenantkubeconfig-${test_name}" get sc local >/dev/null 2>&1; then
+    echo "node-local StorageClass 'local' should not be propagated to the tenant" >&2
+    exit 1
+  fi
+
+  # Exactly one default StorageClass, and it must be "replicated".
+  default_scs=$(kubectl --kubeconfig "tenantkubeconfig-${test_name}" get sc \
+    -o jsonpath='{range .items[?(@.metadata.annotations.storageclass\.kubernetes\.io/is-default-class=="true")]}{.metadata.name}{"\n"}{end}')
+  default_count=$(printf '%s' "$default_scs" | grep -c .)
+  if [ "$default_count" -ne 1 ] || [ "$default_scs" != "replicated" ]; then
+    echo "expected exactly one default StorageClass 'replicated', got: ${default_scs:-<none>} (count=$default_count)" >&2
+    exit 1
+  fi
+  echo "StorageClass propagation OK (replicated default, kubevirt alias present, local filtered)"
+
+  # Clean up NFS test resources from any previous failed attempt
+  kubectl --kubeconfig "tenantkubeconfig-${test_name}" delete pod nfs-test-pod \
+    -n tenant-test --ignore-not-found --timeout=60s
+  kubectl --kubeconfig "tenantkubeconfig-${test_name}" delete pvc nfs-test-pvc \
+    -n tenant-test --ignore-not-found --timeout=60s
+
+  # Test RWX NFS mount in tenant cluster (uses kubevirt CSI driver with RWX support)
+  kubectl --kubeconfig "tenantkubeconfig-${test_name}" apply -f - <<EOF
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: nfs-test-pvc
+  namespace: tenant-test
+spec:
+  accessModes:
+  - ReadWriteMany
+  storageClassName: kubevirt
+  resources:
+    requests:
+      storage: 1Gi
+EOF
+
+  # Wait for PVC to be bound (RWX via kubevirt CSI provisions an NFS server pod, needs time)
+  kubectl --kubeconfig "tenantkubeconfig-${test_name}" wait pvc nfs-test-pvc -n tenant-test --timeout=3m --for=jsonpath='{.status.phase}'=Bound
+
+  # Create Pod that writes and reads data from NFS volume
+  kubectl --kubeconfig "tenantkubeconfig-${test_name}" apply -f - <<EOF
+apiVersion: v1
+kind: Pod
+metadata:
+  name: nfs-test-pod
+  namespace: tenant-test
+spec:
+  containers:
+  - name: test
+    image: busybox
+    command: ["sh", "-c", "echo 'nfs-mount-ok' > /data/test.txt && cat /data/test.txt"]
+    volumeMounts:
+    - name: nfs-vol
+      mountPath: /data
+  volumes:
+  - name: nfs-vol
+    persistentVolumeClaim:
+      claimName: nfs-test-pvc
+  restartPolicy: Never
+EOF
+
+  # 10m, not 5m: host CDI prime PVC + tenant CSI mount + busybox pull worst-case bursts past 5m.
+  if ! kubectl --kubeconfig "tenantkubeconfig-${test_name}" wait pod nfs-test-pod -n tenant-test --timeout=10m --for=jsonpath='{.status.phase}'=Succeeded; then
+    echo "=== NFS test pod did not complete ===" >&2
+    kubectl --kubeconfig "tenantkubeconfig-${test_name}" describe pod nfs-test-pod -n tenant-test >&2 || true
+    kubectl --kubeconfig "tenantkubeconfig-${test_name}" get events -n tenant-test --sort-by='.lastTimestamp' >&2 || true
+    exit 1
+  fi
+
+  # Verify NFS data integrity
+  nfs_result=$(kubectl --kubeconfig "tenantkubeconfig-${test_name}" logs nfs-test-pod -n tenant-test)
+  if [ "$nfs_result" != "nfs-mount-ok" ]; then
+    echo "NFS mount test failed: expected 'nfs-mount-ok', got '$nfs_result'" >&2
+    if ! kubectl --kubeconfig "tenantkubeconfig-${test_name}" delete pod nfs-test-pod -n tenant-test --wait=false 2>/dev/null; then
+      echo "failed to start NFS test Pod cleanup after the data-integrity failure" >&2
+    fi
+    if ! kubectl --kubeconfig "tenantkubeconfig-${test_name}" delete pvc nfs-test-pvc -n tenant-test --wait=false 2>/dev/null; then
+      echo "failed to start NFS test PVC cleanup after the data-integrity failure" >&2
+    fi
+    exit 1
+  fi
+
+  # Cleanup NFS test resources in tenant cluster
+  kubectl --kubeconfig "tenantkubeconfig-${test_name}" delete pod nfs-test-pod -n tenant-test --wait
+  kubectl --kubeconfig "tenantkubeconfig-${test_name}" delete pvc nfs-test-pvc -n tenant-test
+  fi
+
+  # Wait for all machine deployment replicas to be ready (timeout after 10 minutes)
+  kubectl wait machinedeployment kubernetes-${test_name}-md0 -n tenant-test --timeout=10m --for=jsonpath='{.status.v1beta2.readyReplicas}'=2
+
+  for component in cilium coredns csi vsnap-crd; do
+      kubectl wait hr "kubernetes-${test_name}-${component}" -n tenant-test --timeout=5m --for=condition=ready
+    done
+    kubectl wait hr "kubernetes-${test_name}-ingress-nginx" -n tenant-test --timeout=5m --for=condition=ready
+
+  # Optional ouroboros addon assertions. Folded in from the standalone
+  # ouroboros.bats so the test reuses this cluster instead of spinning up a
+  # second ~25m Kamaji bringup. The assertions cover: HR Ready, controller
+  # pod Running, Ingress->coredns-custom rewrite line injection, and the
+  # end-to-end DNS resolution proof from inside the tenant cluster.
+  if [ "${enable_ouroboros}" = "true" ]; then
+    kubectl wait hr "kubernetes-${test_name}-ouroboros" -n tenant-test \
+      --timeout=10m --for=condition=ready
+
+    # cozystack coredns wrapper renders an empty coredns-custom ConfigMap in
+    # kube-system; the ouroboros controller writes the rewrite snippet into
+    # its ouroboros.override key.
+    kubectl --kubeconfig "tenantkubeconfig-${test_name}" -n kube-system \
+      get configmap coredns-custom
+
+    # Upstream chart ships no readiness probe — wait covers pod Running only;
+    # the rewrite-snippet check below is the real reconciliation assertion.
+    kubectl --kubeconfig "tenantkubeconfig-${test_name}" -n cozy-ouroboros \
+      wait pod --selector=app.kubernetes.io/component=controller \
+      --timeout=5m --for=condition=ready
+
+    local hairpin_host=hairpin-cozystack-e2e.example.invalid
+    kubectl --kubeconfig "tenantkubeconfig-${test_name}" -n default apply -f - <<EOF
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: hairpin-probe
+spec:
+  ingressClassName: nginx
+  tls:
+    - hosts:
+        - ${hairpin_host}
+      secretName: hairpin-probe-tls
+  rules:
+    - host: ${hairpin_host}
+      http:
+        paths:
+          - path: /
+            pathType: Prefix
+            backend:
+              service:
+                name: hairpin-probe
+                port:
+                  number: 80
+EOF
+
+    # Poll the import ConfigMap for the rewrite line. Dump-the-whole-map
+    # form avoids the silent-empty kubectl jsonpath bracket-notation trap
+    # on ConfigMap keys with dots (e.g. ouroboros.override).
+    local deadline=$(( $(date +%s) + 300 ))
+    local snippet=
+    while [ "$(date +%s)" -lt "${deadline}" ]; do
+      snippet=$(kubectl --kubeconfig "tenantkubeconfig-${test_name}" -n kube-system \
+        get configmap coredns coredns-custom \
+        -o 'jsonpath={range .items[*]}{.metadata.name}{"\n"}{.data}{"\n---\n"}{end}' \
+        2>/dev/null || true)
+      if echo "${snippet}" | grep -q "rewrite name ${hairpin_host}"; then break; fi
+      sleep 5
+    done
+    if ! echo "${snippet}" | grep -q "rewrite name ${hairpin_host}"; then
+      echo "ouroboros rewrite snippet for ${hairpin_host} not written to coredns-custom within 5m" >&2
+      kubectl --kubeconfig "tenantkubeconfig-${test_name}" -n cozy-ouroboros \
+        logs --selector=app.kubernetes.io/component=controller --tail=200 --all-containers || true
+      exit 1
+    fi
+
+    # End-to-end proof: resolve the hairpin host from inside the tenant.
+    # CoreDNS reload-period default is 30s, so the in-pod loop is needed.
+    local proxy_ip
+    proxy_ip=$(kubectl --kubeconfig "tenantkubeconfig-${test_name}" -n cozy-ouroboros \
+      get service ouroboros-proxy -o jsonpath='{.spec.clusterIP}' 2>/dev/null || true)
+    if [ -z "${proxy_ip}" ]; then
+      echo "ouroboros-proxy Service has no ClusterIP" >&2
+      exit 1
+    fi
+    # The DNS resolution itself is asserted EXACTLY ONCE and fail-fast, per the
+    # e2e no-retry rule (docs/agents/e2e-testing.md #1: never retry a step that
+    # carries product/test logic): a probe that runs to phase Failed means the
+    # in-Pod dig loop (120s, with its own retries -- the right place for CoreDNS
+    # eventual-consistency tolerance) never resolved the hairpin host to the
+    # proxy, i.e. the reconciliation regression this assertion exists to catch,
+    # and it fails the test immediately.
+    #
+    # The one thing recreated is the *vehicle*, and only for the pure-infra event
+    # the same rule carves out (worker-VM boot/recycle). On the single-node
+    # sandbox a tenant worker node can lose its kubelet heartbeat, and the CAPI
+    # MachineHealthCheck deletes its Machine/KubeVirt-VM/Node after 30s and
+    # provisions a replacement. A `--restart=Never` probe bound to that node is
+    # removed by the node controller and, being a bare Pod, never recreated -- so
+    # its verdict is destroyed by infrastructure before it is produced (typically
+    # while its image is still pulling and it has never left Pending). A single-
+    # shot probe reported that as a DNS failure ("last seen: <empty>"), which is
+    # the observed flake (it hits PRs that don't touch virt at all). Recreate the
+    # probe only when it vanished AND the node it was on is confirmed recycled
+    # (gone or no longer Ready). A probe that disappears while its node is still
+    # Ready is NOT infra churn -- it is an unexpected deletion -- and fails loud
+    # rather than being retried, so no pod-churn regression is masked.
+    local hairpin_deadline=$(( $(date +%s) + 420 ))
+    local phase=
+    local probe_node=
+    local attempt=0
+    local exists=
+    local raw=
+    local node=
+    local node_ready=
+    while [ "$(date +%s)" -lt "${hairpin_deadline}" ]; do
+      attempt=$(( attempt + 1 ))
+      # delete defaults to --wait=true, so it returns only once any stale Pod is
+      # fully gone; the subsequent run cannot race an AlreadyExists.
+      kubectl --kubeconfig "tenantkubeconfig-${test_name}" -n default \
+        delete pod dnscheck --ignore-not-found --timeout=60s
+      kubectl --kubeconfig "tenantkubeconfig-${test_name}" -n default \
+        run dnscheck --image=nicolaka/netshoot:v0.13 --restart=Never \
+        --command -- sh -c "
+          deadline=\$(( \$(date +%s) + 120 ))
+          while [ \"\$(date +%s)\" -lt \"\${deadline}\" ]; do
+            addr=\$(dig +short +tries=2 +time=5 ${hairpin_host} | head -n 1)
+            echo \"resolved: \${addr:-<empty>}\"
+            if [ \"\${addr}\" = \"${proxy_ip}\" ]; then
+              exit 0
+            fi
+            sleep 5
+          done
+          echo \"timed out waiting for ${hairpin_host} to resolve to ${proxy_ip}\"
+          exit 1
+        "
+      # Wait for THIS Pod to reach a terminal phase or vanish, remembering the
+      # node it landed on so a later disappearance can be attributed (or not) to
+      # that node being recycled. One get returns both fields; on NotFound it
+      # errors and yields an empty phase.
+      phase=
+      probe_node=
+      while [ "$(date +%s)" -lt "${hairpin_deadline}" ]; do
+        raw=$(kubectl --kubeconfig "tenantkubeconfig-${test_name}" -n default \
+          get pod dnscheck -o jsonpath='{.status.phase}@{.spec.nodeName}' 2>/dev/null || true)
+        phase=${raw%%@*}
+        node=${raw##*@}
+        [ -n "${node}" ] && probe_node=${node}
+        case "${phase}" in
+          Succeeded|Failed) break ;;
+        esac
+        # Empty phase: either the Pod is gone or the tenant API had a transient
+        # error. Only a clean query that definitively reports no such Pod (rc 0
+        # under --ignore-not-found, empty output) is a candidate node recycle; a
+        # transient API error exits nonzero and must NOT be read as a deleted
+        # Pod, so keep polling. The `if var=$(...)` form keeps the nonzero rc
+        # from tripping errexit (the whole test runs under `set -eu`).
+        if [ -z "${phase}" ] \
+          && exists=$(kubectl --kubeconfig "tenantkubeconfig-${test_name}" -n default \
+               get pod dnscheck --ignore-not-found -o name 2>/dev/null) \
+          && [ -z "${exists}" ]; then
+          phase=Gone
+          break
+        fi
+        sleep 3
+      done
+
+      case "${phase}" in
+        Succeeded)
+          break
+          ;;
+        Failed)
+          # The Pod ran and its dig loop exhausted 120s without resolving the
+          # hairpin host to the proxy: a genuine DNS/reconciliation failure.
+          echo "dnscheck ran but ${hairpin_host} never resolved to ${proxy_ip} (attempt ${attempt})" >&2
+          kubectl --kubeconfig "tenantkubeconfig-${test_name}" -n default \
+            logs dnscheck 2>&1 | sed 's/^/  dnscheck: /' || true
+          exit 1
+          ;;
+        Gone)
+          # The probe vanished before producing a verdict. Recreate it only if
+          # this was the pure-infra node recycle: its node must be gone or no
+          # longer Ready. `get node` erroring (node deleted) short-circuits the
+          # && so we fall through to retry; a still-Ready node means an
+          # unexpected deletion, which fails loud rather than being retried.
+          if [ -z "${probe_node}" ]; then
+            echo "dnscheck vanished before it was scheduled to any node -- not a node recycle" >&2
+            exit 1
+          fi
+          if node_ready=$(kubectl --kubeconfig "tenantkubeconfig-${test_name}" \
+               get node "${probe_node}" \
+               -o jsonpath='{.status.conditions[?(@.type=="Ready")].status}' 2>/dev/null) \
+             && [ "${node_ready}" = "True" ]; then
+            echo "dnscheck disappeared while its node ${probe_node} was still Ready -- unexpected pod deletion, not a node recycle" >&2
+            exit 1
+          fi
+          echo "» dnscheck attempt ${attempt}: node ${probe_node} was recycled (gone/NotReady) before the probe completed -- retrying on a surviving node" >&2
+          ;;
+        *)
+          # Deadline reached with the Pod still Pending (never ran, never gone):
+          # the outer loop exits; the post-loop check reports it.
+          :
+          ;;
+      esac
+    done
+    if [ "${phase}" != "Succeeded" ]; then
+      echo "dnscheck did not resolve ${hairpin_host} to ${proxy_ip} within the deadline (last phase: ${phase:-<empty>}, attempts: ${attempt})" >&2
+      kubectl --kubeconfig "tenantkubeconfig-${test_name}" -n default \
+        logs dnscheck 2>&1 | sed 's/^/  dnscheck: /' || true
+      exit 1
+    fi
+
+    kubectl --kubeconfig "tenantkubeconfig-${test_name}" -n default \
+      delete pod dnscheck --ignore-not-found --timeout=60s
+    kubectl --kubeconfig "tenantkubeconfig-${test_name}" -n default \
+      delete ingress hairpin-probe --ignore-not-found --timeout=60s
+  fi
+
+  # Wait for the parent kubernetes-${test_name} HR to be Ready before the
+  # remediation guard runs. The guard reads `.status.history`, which is empty
+  # until the helm install action completes, and the parent's install can still
+  # be "Running 'install'" after every child HR (cilium, coredns, csi,
+  # vsnap-crd, ingress-nginx) is already Ready. Not because it waits for them:
+  # this release carries DisableWait on both actions, from the
+  # release.cozystack.io/helm-install-disable-wait annotation on its
+  # ApplicationDefinition, so Helm skips the wait on the manifests it applied.
+  # It still waits on the chart's post-install hook Job, and that hook is what
+  # holds the install open, which is why the wait is here rather than inferred
+  # from the children.
+  #
+  # On elapse the script exits here under errexit, and the exit handler armed at
+  # the CR apply classifies the HelmReleases on the way out, so the history the
+  # guard below would have read is printed anyway.
+  kubectl wait hr -n tenant-test "kubernetes-${test_name}" --timeout=5m --for=condition=ready
+
+  # The two old OIDC suites created control-plane-only clusters whose useful
+  # assertions took seconds and whose pre-delete hooks then spent two full
+  # 120s waits trying to uninstall child releases without a worker. Reuse the
+  # real latest-version cluster instead: prove System mode after its bootstrap
+  # hook has reached the tenant API, then exercise an actual System ->
+  # CustomConfig upgrade and prove the System-only objects are reaped.
+  if [ "${enable_oidc}" = "true" ]; then
+    echo "Verifying OIDC System mode on the running tenant cluster..."
+    cozy_assert_oidc_system "${test_name}"
+    echo "Switching the running tenant cluster to OIDC CustomConfig mode..."
+    cozy_switch_and_assert_oidc_custom_config "${test_name}"
+  fi
+
+  # Guard: neither the parent HelmRelease nor the addon releases it installs that
+  # retry in place may have failed an action during the run. A non-zero
+  # installFailures/upgradeFailures would say so only until the next successful
+  # reconcile, because ClearFailures zeroes them, so reading them after the
+  # release is Ready is vacuous; a "failed" Snapshot in .status.history
+  # survives it, with the one exception cozy_guard_helmrelease describes.
+  #
+  # The call runs before the EXIT trap is disarmed, so a failure it finds still
+  # captures the tenant snapshot. That ordering is pinned by
+  # hack/run-kubernetes-remediation_test.bats, along with the call itself.
+  cozy_guard_all_helmreleases tenant-test "kubernetes-${test_name}"
+
+  # Last, after everything the suite exists to prove. This checks a debugging
+  # aid, not the product: a worker boots and serves either way, so letting it
+  # run first would let a KubeVirt-side change to a diagnostic preempt the
+  # assertions that actually cover the tenant cluster. It still runs on the
+  # passing path rather than beside the collector, because the collector only
+  # runs when node-join fails and would learn the setting was inert in the one
+  # run where the console can no longer be recovered. Exit 2 alone fails the
+  # suite; see cozy_assert_guest_console_attached for why its three outcomes
+  # are not interchangeable.
+  echo "» verifying the tenant worker guest console container attached"
+  attach_rc=0
+  cozy_assert_guest_console_attached || attach_rc=$?
+  if [ "${attach_rc}" -eq 2 ]; then
+    exit 1
+  fi
+
+  # The same capture the failure path takes, on the run that succeeded. Every
+  # console this tree has collected came from a failure, so what a healthy
+  # worker's boot looks like -- which stages it goes through and how long each
+  # takes -- has never been measured, and "slower than usual" is the claim the
+  # node-join failure keeps resting on. This is where the value it is compared
+  # against comes from, and it exists only until the tenant below is deleted:
+  # the container holding the stream goes with the Pod, and no read recovers it
+  # afterwards.
+  #
+  # Not gated by the diagnostics phase budget, which covers the failure path and
+  # the snapshot behind it. Every read here is bounded individually and none of
+  # them as a group, so the honest ceiling is the listing, one read per Pod at
+  # the cap this caller asks for, the two Pod-state reads a silent console
+  # triggers and the start-time read -- six reads at the 30s bound and 5s kill
+  # grace, so 210s, against a run that has finished everything it exists to
+  # prove and typically has minutes of its operation left. The wedge check is
+  # not in that count: it belongs to the failure path, and this caller reaches
+  # here only after the attach check above has already answered the question it
+  # asks. Asking for the pool's minimum rather than the pool is what keeps that
+  # number small.
+  #
+  # It is still declined rather than attempted when the operation no longer has
+  # room for it, which is what keeps "must not fail the suite" true of a
+  # collector whose cost is real: everything above has passed by here, so a run
+  # killed at the op ceiling while collecting a debugging aid would report the
+  # suite as broken on the strength of the aid. Where the reserve comes from is
+  # written beside the constant rather than repeated here.
+  if cozy_green_capture_has_room 'the tenant worker guest console baseline'; then
+    echo "» capturing the tenant worker guest console before teardown"
+    if ! cozy_capture_tenant_serial_console 'the suite passed: captured after the last assertion and before tenant teardown' 2; then
+      # Said in the job log rather than only in the report, because a green run
+      # is the one nobody opens the report for. This branch covers the two setup
+      # failures the capture returns non-zero for, the Pod listing failing and
+      # no virt-launcher Pod matching; a walk that ran and came back with empty
+      # consoles returns zero and is reported by the capture's own line about
+      # how many said nothing. It does not fail the suite: this captures a
+      # debugging aid, and everything the suite exists to prove has already
+      # passed by here.
+      echo "» WARNING: the guest console capture failed on a passing run; the boot baseline is missing from this report, see the notes beside the capture" >&2
+    fi
+  fi
+
+  # Success: disarm the failure handler -- the HelmRelease report and the tenant
+  # snapshot -- so neither fires on the clean exit.
+  trap - EXIT
+  # Clean up: delete the test-scoped tenant API LoadBalancer (frees its MetalLB
+  # IP) and the local kubeconfig.
+  kubectl -n tenant-test delete service "kubernetes-${test_name}-e2e-lb" --ignore-not-found --wait=false
+  rm -f "tenantkubeconfig-${test_name}"
+  # The Chainsaw finally block owns the authoritative child -> parent teardown
+  # and the physical-storage barrier. Keeping it in one place prevents an
+  # asynchronous success-path delete from hiding which stage failed.
+
+}
+
+# B1 regression coverage (PR #2872 review). The tenant's default StorageClass
+# must be chosen among the *propagated* classes and must never be the legacy
+# "kubevirt" alias -- even when the management cluster exposes only remote
+# LINSTOR classes whose names sort alphabetically after "kubevirt" and none is
+# named the configured storageClass (default "replicated"). That is the
+# feature's own multi-tier target configuration. A regressed `sortAlpha | first`
+# over a candidate set that still contained the inserted "kubevirt" alias would
+# pick it, pointing the tenant default at an infra class absent on the
+# management cluster -> default PVCs stay Pending with no error surfaced.
+#
+# helm-unittest cannot reach this branch: with no live cluster Helm `lookup`
+# returns empty, so the storageClasses map always collapses to the "replicated"
+# fallback (see packages/apps/kubernetes/tests/csi_test.yaml). It is therefore
+# exercised here against the live management cluster with a single server-side
+# dry-run render (helm v4 executes `lookup` against the API): add two remote
+# LINSTOR classes that sort after "kubevirt", remove "replicated" for the one
+# render, restore it immediately, then assert on the rendered -csi HelmRelease's
+# storageClasses map.
+verify_storageclass_fallback_default() {
+  echo "Verifying tenant default StorageClass selection with no 'replicated' class (PR #2872 B1 regression)..."
+
+  local storage_class
+  storage_class=$(cozy_e2e_storage_class) || return 1
+
+  # Pre-cleanup: drop probe classes leaked by a previous failed run.
+  kubectl delete sc nvme ssd --ignore-not-found
+
+  # Two remote-accessible LINSTOR classes whose names sort AFTER "kubevirt".
+  kubectl apply -f - <<'EOF'
+apiVersion: storage.k8s.io/v1
+kind: StorageClass
+metadata:
+  name: nvme
+provisioner: linstor.csi.linbit.com
+parameters:
+  linstor.csi.linbit.com/storagePool: "data"
+  linstor.csi.linbit.com/allowRemoteVolumeAccess: "true"
+volumeBindingMode: Immediate
+allowVolumeExpansion: true
+---
+apiVersion: storage.k8s.io/v1
+kind: StorageClass
+metadata:
+  name: ssd
+provisioner: linstor.csi.linbit.com
+parameters:
+  linstor.csi.linbit.com/storagePool: "data"
+  linstor.csi.linbit.com/allowRemoteVolumeAccess: "true"
+volumeBindingMode: Immediate
+allowVolumeExpansion: true
+EOF
+
+  # Remove "replicated" only for the duration of the render below, so that
+  # neither the configured storageClass (default "replicated") nor "replicated"
+  # is in the propagated set -- forcing the `sortAlpha | first` selection branch.
+  kubectl delete sc replicated --ignore-not-found
+
+  # Server-side dry-run executes Helm `lookup` against the live cluster and
+  # renders the real storageClasses map. rc is captured separately (no pipe) so
+  # the management-cluster state is always restored before any assertion exits.
+  # The release namespace must be a valid tenant identifier (the chart's
+  # dashboard-resourcemap template enforces this), so render under tenant-test.
+  #
+  # `|| rc=$?` rather than a bare assignment followed by `rc=$?`: the caller runs
+  # under `set -e`, so a failed render would exit the function on the assignment
+  # itself -- before rc is read and before the restore below puts `replicated`
+  # back, leaving the management cluster with no default StorageClass for every
+  # later suite. That is the opposite of what the restore comment promises.
+  local raw rc=0
+  raw=$(timeout 120 helm install scprobe packages/apps/kubernetes \
+    --dry-run=server -n tenant-test \
+    -f packages/apps/kubernetes/tests/values/common.yaml -o json 2>/tmp/sc-fallback-render.err) || rc=$?
+
+  # Restore the QEMU lane's management-cluster StorageClass inline before any
+  # assertion exit. The local-only container lane had no replicated class to
+  # restore. No EXIT/RETURN trap is used (docs/agents/e2e-testing.md), and the
+  # manifest mirrors hack/e2e-post-install-prep.sh.
+  if [ "$storage_class" = replicated ]; then
+    kubectl apply -f - <<'EOF'
+apiVersion: storage.k8s.io/v1
+kind: StorageClass
+metadata:
+  name: replicated
+provisioner: linstor.csi.linbit.com
+parameters:
+  linstor.csi.linbit.com/storagePool: "data"
+  linstor.csi.linbit.com/autoPlace: "3"
+  linstor.csi.linbit.com/layerList: "drbd storage"
+  linstor.csi.linbit.com/allowRemoteVolumeAccess: "true"
+  property.linstor.csi.linbit.com/DrbdOptions/auto-quorum: suspend-io
+  property.linstor.csi.linbit.com/DrbdOptions/Resource/on-no-data-accessible: suspend-io
+  property.linstor.csi.linbit.com/DrbdOptions/Resource/on-suspended-primary-outdated: force-secondary
+  property.linstor.csi.linbit.com/DrbdOptions/Net/rr-conflict: retry-connect
+volumeBindingMode: Immediate
+allowVolumeExpansion: true
+EOF
+  fi
+  kubectl delete sc nvme ssd --ignore-not-found
+
+  if [ "$rc" -ne 0 ] || [ -z "$raw" ]; then
+    echo "server-side dry-run render of the kubernetes chart failed (rc=$rc)" >&2
+    cat /tmp/sc-fallback-render.err >&2 || true
+    exit 1
+  fi
+
+  # Isolate the rendered -csi HelmRelease's storageClasses map.
+  local sc
+  sc=$(printf '%s' "$raw" | yq -p=json '.manifest' \
+    | yq 'select(.kind == "HelmRelease" and .metadata.name == "scprobe-csi") | .spec.values.storageClasses')
+  if [ -z "$sc" ] || [ "$sc" = "null" ]; then
+    echo "rendered scprobe-csi HelmRelease carries no storageClasses map" >&2
+    printf '%s' "$raw" | yq -p=json '.manifest' >&2
+    exit 1
+  fi
+
+  local default_count default_key kubevirt_present kubevirt_default
+  default_count=$(printf '%s' "$sc" | yq '[to_entries | .[] | select(.value.default == true)] | length')
+  default_key=$(printf '%s' "$sc" | yq 'to_entries | map(select(.value.default == true)) | .[0].key')
+  kubevirt_present=$(printf '%s' "$sc" | yq 'has("kubevirt")')
+  kubevirt_default=$(printf '%s' "$sc" | yq '.kubevirt.default')
+
+  # 1. Exactly one default. 2. The default is a propagated class (nvme/ssd),
+  # never the kubevirt alias. 3. The kubevirt alias still exists, non-default.
+  if [ "$default_count" != "1" ] \
+    || { [ "$default_key" != "nvme" ] && [ "$default_key" != "ssd" ]; } \
+    || [ "$kubevirt_present" != "true" ] \
+    || [ "$kubevirt_default" != "false" ]; then
+    echo "tenant default StorageClass selection regressed (PR #2872 B1):" >&2
+    echo "  default_count=$default_count default_key=$default_key kubevirt_present=$kubevirt_present kubevirt_default=$kubevirt_default" >&2
+    echo "  expected exactly one default among {nvme,ssd}; kubevirt present and non-default" >&2
+    printf 'rendered storageClasses:\n%s\n' "$sc" >&2
+    exit 1
+  fi
+  echo "StorageClass fallback-default OK (default='$default_key' among propagated classes; kubevirt alias non-default)"
+}
diff --git a/hack/e2e-chainsaw/_lib/run-proxmox.sh b/hack/e2e-chainsaw/_lib/run-proxmox.sh
new file mode 100755
index 0000000000..742b695705
--- /dev/null
+++ b/hack/e2e-chainsaw/_lib/run-proxmox.sh
@@ -0,0 +1,238 @@
+#!/bin/sh
+# Imperative half of the kubernetes-proxmox suite.
+#
+# Chainsaw's declarative asserts cover everything that is a Kubernetes object in
+# THIS cluster, and the suite uses them for exactly that. What is left needs a
+# shell: the hypervisor is reached over SSH and answers in `qm` output, and the
+# tenant cluster is reached with a kubeconfig that only exists once its control
+# plane is up. Those are the two things below.
+#
+# Deliberately not a port of _lib/run-kubernetes.sh. That script's diagnostic
+# half is virt-launcher Pods, VirtualMachineInstances and guest consoles —
+# objects with no counterpart on an external hypervisor — so sharing it would
+# mean carrying a thousand lines that can never fire here.
+#
+# Every subcommand exits non-zero on failure and says which check failed. There
+# is no `|| echo` anywhere in this file on purpose: the pattern turns a failed
+# command into a green run, and this repository has been bitten by it.
+set -eu
+
+NS="${COZY_PROXMOX_NS:-tenant-e2eproxmox}"
+CLUSTER="${COZY_PROXMOX_CLUSTER:-k8s-e2e}"
+PVE_SSH="${COZY_PVE_SSH:?COZY_PVE_SSH is required: the ssh destination of the Proxmox host, user@host}"
+PVE_SSH_KEY="${COZY_PVE_SSH_KEY:-$HOME/.ssh/id_ed25519}"
+STORAGE="${COZY_PROXMOX_STORAGE:?COZY_PROXMOX_STORAGE is required, the PVE storage id for the PVC probe}"
+TENANT_KUBECONFIG="${TMPDIR:-/tmp}/proxmox-e2e-tenant.kubeconfig"
+FIXTURE="$(cd "$(dirname "$0")/.." && pwd)/kubernetes-proxmox/tenant.yaml"
+
+log() { printf '[%s] %s\n' "$(date -u +%H:%M:%S)" "$*"; }
+die() { printf '[%s] FAILED: %s\n' "$(date -u +%H:%M:%S)" "$*" >&2; exit 1; }
+
+pve() { ssh -o BatchMode=yes -o StrictHostKeyChecking=accept-new -i "$PVE_SSH_KEY" "$PVE_SSH" "$@"; }
+
+# The Machine carries the VM id in the ProxmoxMachine it references. Reading it
+# from the cluster rather than guessing keeps this working when a replacement
+# lands on a different id.
+vmid_of_machine() {
+  kubectl -n "$NS" get proxmoxmachine -o jsonpath='{.items[0].spec.virtualMachineID}'
+}
+
+# --- checks -----------------------------------------------------------------
+
+# A full clone is a copy of the template's disk; a linked clone references it and
+# stores only the increment. Nothing fails when this is wrong — the pool comes
+# up either way — so the only place it can be caught is here, by the shape of the
+# volume name: a linked clone points at `base-<template>-disk-N/`.
+check_linked_clone() {
+  vmid=$(vmid_of_machine)
+  [ -n "$vmid" ] || die "no ProxmoxMachine with a virtualMachineID in $NS"
+  log "VM $vmid: checking the boot disk is a linked clone"
+
+  bootdisk=$(pve "qm config $vmid" | sed -n 's/^scsi0: *//p')
+  [ -n "$bootdisk" ] || die "VM $vmid has no scsi0"
+
+  case "$bootdisk" in
+    *:base-*-disk-*/*) log "linked clone confirmed: $bootdisk" ;;
+    *) die "VM $vmid boot disk is a full copy, not a linked clone: $bootdisk" ;;
+  esac
+}
+
+# The fixture is stand-agnostic through ${COZY_PVE_*} variables. GNU envsubst
+# expands ${VAR} and nothing else — a ${VAR:-default} stays in the text as it
+# is, set or not — so the defaults live here, the variable list is explicit so
+# nothing else in the file is touched, and a fixture with a variable left in it
+# is refused rather than applied.
+render_tenant() {
+  : "${COZY_PVE_ADDRESSES:=10.0.0.180-10.0.0.185}"
+  : "${COZY_PVE_GATEWAY:=10.0.0.1}"
+  : "${COZY_PVE_PREFIX:=24}"
+  : "${COZY_PVE_BRIDGE:=vmbr50}"
+  : "${COZY_PVE_POOL:=}"
+  export COZY_PVE_ADDRESSES COZY_PVE_GATEWAY COZY_PVE_PREFIX COZY_PVE_BRIDGE COZY_PVE_POOL COZY_PROXMOX_STORAGE
+  rendered=$(envsubst '$COZY_PVE_ADDRESSES $COZY_PVE_GATEWAY $COZY_PVE_PREFIX $COZY_PVE_BRIDGE $COZY_PVE_POOL $COZY_PROXMOX_STORAGE' < "$FIXTURE")
+  case "$rendered" in
+    *'${'*) die "tenant.yaml still carries an unexpanded variable after envsubst" ;;
+  esac
+  printf '%s\n' "$rendered"
+}
+
+apply_tenant() {
+  render_tenant | kubectl apply -f -
+}
+
+# The tenant kubeconfig exists only after Kamaji has issued it. Fetching it is
+# also the first proof that the control plane came up at all. The .conf key
+# carries the address a runner outside the management cluster can reach; .svc
+# is the in-cluster Service the management-side controllers use.
+fetch_tenant_kubeconfig() {
+  kubectl -n "$NS" get secret "kubernetes-${CLUSTER}-admin-kubeconfig" \
+    -o jsonpath='{.data.super-admin\.conf}' | base64 -d > "$TENANT_KUBECONFIG"
+  [ -s "$TENANT_KUBECONFIG" ] || die "tenant kubeconfig is empty — did the control plane come up?"
+}
+
+# providerID and the topology labels are applied by the cloud-controller-manager,
+# and the CSI node plugin refuses to start without the labels. Asserting them
+# here is what separates "the node joined" from "the node is usable".
+check_tenant_node() {
+  fetch_tenant_kubeconfig
+  log "checking the tenant node is Ready and initialised by the CCM"
+
+  node=$(KUBECONFIG="$TENANT_KUBECONFIG" kubectl get nodes -o jsonpath='{.items[0].metadata.name}')
+  [ -n "$node" ] || die "tenant cluster has no nodes"
+
+  provider=$(KUBECONFIG="$TENANT_KUBECONFIG" kubectl get node "$node" -o jsonpath='{.spec.providerID}')
+  region=$(KUBECONFIG="$TENANT_KUBECONFIG" kubectl get node "$node" \
+    -o jsonpath='{.metadata.labels.topology\.kubernetes\.io/region}')
+
+  [ -n "$provider" ] || die "node $node has no providerID — the CCM did not initialise it"
+  [ -n "$region" ] || die "node $node has no topology region label — the CSI node plugin cannot start"
+  log "node $node: providerID=$provider region=$region"
+}
+
+# Bound is not proof: a StorageClass can bind a volume that never becomes a disk.
+# The disk on the hypervisor is the proof, so the check reads `qm config`, then
+# removes what it created and reads the storage again: a deleted claim whose disk
+# is still there is the leak the pre-delete hook's Step 1b exists to prevent.
+check_pvc_round_trip() {
+  fetch_tenant_kubeconfig
+  vmid=$(vmid_of_machine)
+  log "binding a PVC and looking for its disk on VM $vmid"
+
+  KUBECONFIG="$TENANT_KUBECONFIG" kubectl apply -f - <<'EOF'
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: e2e-csi-probe
+spec:
+  accessModes: [ReadWriteOnce]
+  storageClassName: proxmox
+  resources:
+    requests:
+      storage: 1Gi
+---
+apiVersion: v1
+kind: Pod
+metadata:
+  name: e2e-csi-probe
+spec:
+  containers:
+  - name: c
+    image: busybox:1.36
+    command: ["sh", "-c", "sleep 600"]
+    volumeMounts:
+    - name: v
+      mountPath: /data
+  volumes:
+  - name: v
+    persistentVolumeClaim:
+      claimName: e2e-csi-probe
+EOF
+
+  KUBECONFIG="$TENANT_KUBECONFIG" kubectl wait --for=condition=Ready pod/e2e-csi-probe --timeout=5m \
+    || die "the probe Pod never became Ready — the volume did not attach"
+
+  disk=$(pve "qm config $vmid" | sed -n "s/^scsi[1-9]: *\($STORAGE:[^,]*\),.*/\1/p" | head -1)
+  if [ -z "$disk" ]; then
+    pve "qm config $vmid" | sed 's/^/  qm-config: /' >&2
+    die "PVC bound but no disk is attached to VM $vmid on storage $STORAGE"
+  fi
+  log "disk attached on the hypervisor: $disk"
+
+  KUBECONFIG="$TENANT_KUBECONFIG" kubectl delete pod e2e-csi-probe --wait=true
+  KUBECONFIG="$TENANT_KUBECONFIG" kubectl delete pvc e2e-csi-probe --wait=true
+
+  wait_disk_freed "$disk"
+}
+
+# The disk counts as freed only when a listing that succeeded no longer shows
+# it. A listing that fails — ssh down, pvesm erroring — proves nothing, so it
+# fails the check instead of reading as an empty storage.
+wait_disk_freed() {
+  disk=$1
+  volid=${disk#*:}
+  deadline=$(( $(date +%s) + 180 ))
+  while :; do
+    listing=$(pve "pvesm list $STORAGE") \
+      || die "cannot list $STORAGE on the hypervisor, so cannot tell whether $disk was freed"
+    printf '%s\n' "$listing" | grep -qF "$volid" || break
+    [ "$(date +%s)" -lt "$deadline" ] || die "PVC deleted but $disk is still on $STORAGE: the driver did not free it"
+    sleep 5
+  done
+  log "disk $disk is gone from $STORAGE"
+}
+
+# A replaced Machine has to converge without an operator: the departed Node must
+# be removed by the cloud-controller-manager and the replacement must register
+# in its place. "Without intervention" is the whole assertion, so nothing here
+# touches the cluster beyond the initial delete.
+check_replacement_converges() {
+  deadline=$(( $(date +%s) + 900 ))
+  old=$(kubectl -n "$NS" get machine -o jsonpath='{.items[0].metadata.name}')
+  [ -n "$old" ] || die "no Machine to replace in $NS"
+  log "deleting Machine $old and waiting for an unattended replacement"
+
+  kubectl -n "$NS" delete machine "$old" --wait=false
+
+  while [ "$(date +%s)" -lt "$deadline" ]; do
+    name=$(kubectl -n "$NS" get machine -o jsonpath='{.items[0].metadata.name}' 2>/dev/null || true)
+    phase=$(kubectl -n "$NS" get machine -o jsonpath='{.items[0].status.phase}' 2>/dev/null || true)
+    noderef=$(kubectl -n "$NS" get machine -o jsonpath='{.items[0].status.nodeRef.name}' 2>/dev/null || true)
+    if [ -n "$name" ] && [ "$name" != "$old" ] && [ "$phase" = "Running" ] && [ -n "$noderef" ]; then
+      log "replacement $name reached Running with nodeRef $noderef"
+      return 0
+    fi
+    sleep 15
+  done
+
+  kubectl -n "$NS" get machine,machinedeployment -o wide >&2 || true
+  die "no replacement reached Running with a nodeRef within 15m: the departed Node was not removed, or the replacement never registered"
+}
+
+# Runs from the suite's catch. Cheap reads first, so a truncated dump still
+# carries the ones that discriminate between failure modes.
+dump_diagnostics() {
+  log "=== Machines and their infrastructure ==="
+  kubectl -n "$NS" get machine,proxmoxmachine,machinedeployment,proxmoxcluster -o wide || true
+  log "=== capmox controller ==="
+  kubectl -n cozy-cluster-api logs -l control-plane=controller-manager --tail=80 \
+    --selector=cluster.x-k8s.io/provider=infrastructure-proxmox || true
+  log "=== VMs on the hypervisor ==="
+  pve "qm list" || true
+  if [ -s "$TENANT_KUBECONFIG" ]; then
+    log "=== tenant nodes and pods ==="
+    KUBECONFIG="$TENANT_KUBECONFIG" kubectl get nodes -o wide || true
+    KUBECONFIG="$TENANT_KUBECONFIG" kubectl get pods -A -o wide || true
+  fi
+}
+
+case "${1:-}" in
+  render-tenant)  render_tenant ;;
+  apply-tenant)   apply_tenant ;;
+  linked-clone)   check_linked_clone ;;
+  tenant-node)    check_tenant_node ;;
+  pvc-round-trip) check_pvc_round_trip ;;
+  disk-freed)     wait_disk_freed "${2:?disk-freed needs <storage>:<volume>}" ;;
+  replacement)    check_replacement_converges ;;
+  diagnostics)    dump_diagnostics ;;
+  *) die "usage: $0 {render-tenant|apply-tenant|linked-clone|tenant-node|pvc-round-trip|disk-freed <storage>:<volume>|replacement|diagnostics}" ;;
+esac
diff --git a/hack/e2e-chainsaw/_lib/talos-image-cache.sh b/hack/e2e-chainsaw/_lib/talos-image-cache.sh
new file mode 100644
index 0000000000..7841f5ad9e
--- /dev/null
+++ b/hack/e2e-chainsaw/_lib/talos-image-cache.sh
@@ -0,0 +1,493 @@
+# shellcheck shell=bash
+# Shared helper: choose the Talos Image Factory base URL for tenant Kubernetes
+# e2e CRs.
+#
+# Prefer the in-sandbox caching mirror (hack/e2e-talos-image-cache.yaml, deployed
+# by hack/e2e-install-cozystack.bats) when a worker's CDI importer can actually
+# reach it, otherwise fall back to the chart default (the public factory.talos.dev)
+# by emitting nothing. The mirror rides out the public factory's flaky/range-less
+# egress that otherwise stalls worker DataVolume imports past the 12-minute
+# node-join deadline — see cozystack/cozystack#3231. Falling back to the default
+# means the mirror can only help, never make CI worse.
+#
+# Reachability is not assumed. Tenant namespaces run under a default-deny Cilium
+# egress installed by the tenant chart: a worker's importer may reach the `world`
+# entity (hence the public factory) and the tenant's own tree, but not an
+# arbitrary kube-system Service. Without an explicit allow, the importer resolves
+# talos-image-cache.kube-system.svc yet its TCP connect to the ClusterIP is
+# silently dropped and the disk import never starts. This helper installs that
+# allow (the CiliumClusterwideNetworkPolicy shipped in the mirror manifest) and
+# then verifies the path end to end from a Pod that faces the exact same egress
+# rules as a real importer, so the mirror is used only when it genuinely works.
+#
+# Root cause + fix are from cozystack/cozystack#3254 (@lexfrei), ported here to
+# the Chainsaw layout (hack/e2e-chainsaw/_lib/).
+
+TALOS_IMAGE_CACHE_SVC_URL="${TALOS_IMAGE_CACHE_SVC_URL:-http://talos-image-cache.kube-system.svc}"
+_TALOS_IMAGE_FACTORY_DECISION_FILE="${_TALOS_IMAGE_FACTORY_DECISION_FILE:-/tmp/e2e-talos-image-factory-url}"
+TALOS_IMAGE_CACHE_MANIFEST="${TALOS_IMAGE_CACHE_MANIFEST:-hack/e2e-talos-image-cache.yaml}"
+# Tenant namespace the kubernetes-* CRs are created in (run-kubernetes.sh and the
+# oidc suites all target tenant-test); the reachability probe runs here so it
+# inherits that namespace's default-deny egress, exactly as a worker importer does.
+TALOS_IMAGE_CACHE_PROBE_NS="${TALOS_IMAGE_CACHE_PROBE_NS:-tenant-test}"
+TALOS_IMAGE_CACHE_PROBE_POD="${TALOS_IMAGE_CACHE_PROBE_POD:-talos-image-cache-probe}"
+
+# _apply_talos_image_cache_egress_policy: install the CiliumClusterwideNetworkPolicy
+# that lets tenant CDI importer Pods egress to the mirror. It lives in the mirror
+# manifest but is applied here, not in hack/e2e-install-cozystack.bats, because that
+# manifest is applied before Cozystack (and thus before Cilium's CRDs) exists.
+# Idempotent; best-effort — a failure just leaves the probe below to fall back.
+_apply_talos_image_cache_egress_policy() {
+  command -v yq >/dev/null 2>&1 || return 1
+  yq 'select(.kind == "CiliumClusterwideNetworkPolicy")' "$TALOS_IMAGE_CACHE_MANIFEST" 2>/dev/null \
+    | kubectl apply -f - >/dev/null 2>&1
+}
+
+# _talos_image_cache_probe_overrides: emit the kubectl --overrides JSON for the
+# probe Pod. $1 is the container image, $2 the shell command it runs. The single
+# container replaces the one `kubectl run` generates (merge patch semantics), and
+# the security context satisfies the tenant namespace's restricted PSA.
+#
+# Pure string builder, kept separate so it can be unit-tested: an edit that
+# unbalances a quote here would emit invalid JSON, every probe would fail, and CI
+# would silently fall back to the public factory instead of erroring.
+_talos_image_cache_probe_overrides() {
+  printf '{"spec":{"securityContext":{"runAsNonRoot":true,"runAsUser":1000,"seccompProfile":{"type":"RuntimeDefault"}},"containers":[{"name":"c","image":"%s","command":["sh","-ec","%s"],"securityContext":{"allowPrivilegeEscalation":false,"capabilities":{"drop":["ALL"]}}}]}}' \
+    "$1" "$2"
+}
+
+# _talos_image_cache_probe_succeeded: succeed iff the probe output ($1) carries the
+# strict 206 marker.
+#
+# Gate strictly on 206. The old localhost check kept a reachable-but-range-less
+# mirror and only warned; here any non-206 — unreachable (code=000) or a plain 200 —
+# falls back to the public factory instead. serve.py always answers a valid range
+# with 206, so the 200 case is unreachable in practice; the strict gate keeps the
+# "use the mirror only when it is fully working" rule simple.
+#
+# Pure predicate, kept separate so it can be unit-tested: this single comparison is
+# what decides whether tenant workers are pointed at the mirror at all.
+_talos_image_cache_probe_succeeded() {
+  printf '%s' "$1" | grep -q 'code=206'
+}
+
+# _talos_image_cache_reachable_from_tenant: succeed iff a Pod that faces the exact
+# same tenant egress restrictions and network path as a worker's CDI importer can
+# reach the mirror Service ClusterIP with a byte-range (206) response.
+#
+# This is the load-bearing gate: a green result guarantees a real importer will
+# reach the mirror. It runs a throwaway Pod in the tenant namespace, labelled
+# cdi.kubevirt.io=importer (so the tenant egress default-deny plus the allow
+# policy above apply to it just as they do to a real importer), and has it curl
+# the ClusterIP Service for the seeded image with a Range header — exercising DNS,
+# the egress policy, ClusterIP translation, and range support together, not merely
+# that the server answers on localhost.
+#
+# cdi.kubevirt.io=importer is CDI's own importer-pod label. The probe and the
+# egress policy's endpointSelector must both use it; if a future CDI renames it,
+# they would still agree with each other but no longer with reality, and the probe
+# would pass while real importers stayed blocked. It is correct as of the CDI
+# version this platform ships (packages/system/kubevirt-cdi-operator).
+_talos_image_cache_reachable_from_tenant() {
+  local pod rel img curl_cmd overrides out
+  pod=$(kubectl -n kube-system get pod \
+    -l app.kubernetes.io/name=talos-image-cache \
+    --field-selector=status.phase=Running \
+    -o jsonpath='{.items[0].metadata.name}' 2>/dev/null) || return 1
+  [ -n "$pod" ] || return 1
+  # Discover the seeded file (its presence also confirms the seed finished) and
+  # probe that exact path, so the probe requests what a worker actually requests.
+  rel=$(kubectl -n kube-system exec "$pod" -c serve -- sh -ec \
+    'f=$(find /data -name "*.raw.xz" 2>/dev/null | head -n1); [ -n "$f" ] || exit 1; printf "%s" "${f#/data/}"' \
+    2>/dev/null) || return 1
+  [ -n "$rel" ] || return 1
+  # Reuse the mirror's own digest-pinned image for the probe Pod. It is the same
+  # image many CI hooks share, so by this late stage of the suite it is usually
+  # already cached on whatever node the probe lands on and no pull is needed; if
+  # the probe does land on a node without it, the pull is bounded by the Pod's
+  # --pod-running-timeout below and a timeout just falls back to the public factory.
+  img=$(kubectl -n kube-system get deploy talos-image-cache \
+    -o jsonpath='{.spec.template.spec.containers[0].image}' 2>/dev/null) || return 1
+  [ -n "$img" ] || return 1
+
+  # --retry rides out the seconds Cilium needs to program the freshly-applied allow
+  # policy; a persistently unreachable ClusterIP still fails fast per attempt
+  # (connect-timeout) and returns a non-206, falling back to the public factory.
+  # The total budget is deliberately generous: this decision is cached once for the
+  # whole suite, so a single slow policy-programming window must not permanently
+  # disable the mirror. --max-time still bounds a hung attempt (a genuinely
+  # unreachable ClusterIP resolves well within it and falls back).
+  curl_cmd="curl -s -o /dev/null -w code=%{http_code} --retry 8 --retry-all-errors --retry-delay 5 --connect-timeout 5 --max-time 45 -r 0-0 ${TALOS_IMAGE_CACHE_SVC_URL}/${rel}"
+  overrides=$(_talos_image_cache_probe_overrides "$img" "$curl_cmd")
+
+  kubectl -n "$TALOS_IMAGE_CACHE_PROBE_NS" delete pod "$TALOS_IMAGE_CACHE_PROBE_POD" \
+    --ignore-not-found >/dev/null 2>&1
+  # No --rm: with --rm the Pod is gone the instant it exits, and --attach can lose
+  # the tail of a fast-completing Pod's stream, leaving $out empty — a false negative
+  # that would fall back to the flaky public factory this mirror exists to avoid.
+  # Keep the Pod so its logs can be re-read if the attach stream was lost, then
+  # delete it explicitly below.
+  out=$(kubectl -n "$TALOS_IMAGE_CACHE_PROBE_NS" run "$TALOS_IMAGE_CACHE_PROBE_POD" \
+    --restart=Never --attach --pod-running-timeout=90s \
+    --image="$img" --labels='cdi.kubevirt.io=importer' \
+    --overrides="$overrides" 2>&1) || true
+  # --attach returns only after the container exits, so its logs are ready now;
+  # fall back to them when the attach stream carried no result marker.
+  if ! printf '%s' "$out" | grep -q 'code='; then
+    out=$(kubectl -n "$TALOS_IMAGE_CACHE_PROBE_NS" logs "$TALOS_IMAGE_CACHE_PROBE_POD" 2>/dev/null || true)
+  fi
+  # Fire-and-forget: the result is already captured in $out, so nothing depends on
+  # the Pod actually being gone. The pre-run delete above must NOT do this — there,
+  # `kubectl run` would race a still-terminating Pod of the same name.
+  kubectl -n "$TALOS_IMAGE_CACHE_PROBE_NS" delete pod "$TALOS_IMAGE_CACHE_PROBE_POD" \
+    --ignore-not-found --wait=false >/dev/null 2>&1
+  _talos_image_cache_probe_succeeded "$out"
+}
+
+# _talos_image_cache_deploy_state: answer "is the mirror Deployment there?" as
+# exactly one of present, absent or unknown.
+#
+# --ignore-not-found is what makes a three-way answer possible: a genuine absence
+# becomes exit 0 with no output, which leaves a non-zero exit meaning only "the
+# question was never answered" — connection refused, Unauthorized, timed out.
+# A plain `get` collapses those two into one exit code, and the caller below then
+# reads a blip as an absence, caches it, and sends every tenant worker in the
+# suite to the public factory over the live egress the mirror exists to avoid.
+# Same idiom as the teardown poll in hack/e2e-chainsaw/_lib/etcd-cleanup.sh.
+#
+# talos_image_cache_diagnose asks the same question and answers it its own way,
+# and the two are separate on purpose. That one runs on the node-join failure
+# path under a phase budget, where re-asking spends what the crust-gather
+# snapshot after it needs, and it gives up after one attempt. This one runs on
+# the happy path, where a re-ask costs a suite nothing and buys it the mirror.
+#
+# The re-ask is small, and each attempt has to be bounded twice over for the
+# re-ask to be worth anything. kubectl's --request-timeout defaults to 0 — no
+# deadline on the request at all — and the case this loop exists for is a
+# connection that establishes and then stalls, which client-go's dial timeout
+# does not bound. The flag on its own is still not a wall-clock bound: against
+# an unreachable apiserver kubectl retries discovery several times before it
+# gives up, so a call carrying only the flag costs a multiple of it, which
+# hack/e2e-chainsaw/_lib/pod-label-census.sh measured and sized its caller's op
+# timeout around. Asking three times would inherit that multiple, inside a
+# Chainsaw op the rest of the tenant test has to fit in. So each attempt takes
+# both bounds, the pairing the reads in run-kubernetes.sh use and explain beside
+# its pod list: --request-timeout bounds the HTTP request, timeout bounds the
+# client retrying against a wedged apiserver. A kill by timeout exits non-zero
+# and is simply another attempt that did not answer. Past that, an apiserver
+# that is down does not become reachable by asking longer, and a run whose
+# apiserver is down has bigger problems than which factory it pulls from. A
+# real absence answers on the first try and waits for nothing.
+#
+# The wrapper is skipped rather than depended on when `timeout` is not installed,
+# for the reason _talos_image_cache_bounded_read gives below and one more that is
+# specific to a loop: its exit 127 would otherwise count as an attempt that did
+# not answer, three times over, and a missing local binary would pin the whole
+# suite to the public factory while every message blamed the apiserver.
+#
+# The outer bound sits ABOVE the inner one rather than level with it, and that
+# gap is the whole reason kubectl ever gets to explain itself. Measured against a
+# stub apiserver, the three ways this call fails are not alike. A refused port
+# answers in under a second and names the refusal. One that completes TCP but
+# stalls in TLS gets kubectl's own handshake deadline, which is shorter than
+# either bound and fires twice inside the window, so there is text even though
+# the wrapper ends up killing the call. A blackholed address — SYN dropped, no
+# RST, which is what a wedged node or a netpol looks like — produces nothing at
+# all until some deadline expires, and with the two bounds equal the expiry that
+# arrives is the wall-clock kill, at the same instant as the request deadline it
+# beats to it. `--request-timeout` then cannot fire in any of the three, which
+# makes it decoration. Ten seconds of headroom hands that case back to kubectl:
+# the request deadline ends the attempt and says why, and the wrapper stays as
+# the backstop for a client that overruns its own deadline. The cost is ten more
+# seconds per attempt on a path where the apiserver is already unreachable,
+# against a 67m op.
+#
+# kubectl's stderr is therefore deliberately not swallowed: it is the only thing
+# that separates refused from unauthorized from stalled, and suppressing it would
+# replace one silent failure with another. It is still not guaranteed — a kill
+# can always land before the client has said anything — so the last attempt's
+# exit status is named too, in the vocabulary the diagnostic reads below use for
+# 124 and 137. Between the two the caller's warning always has something real to
+# point at.
+_TALOS_IMAGE_CACHE_QUERY_TRIES="${_TALOS_IMAGE_CACHE_QUERY_TRIES:-3}"
+_TALOS_IMAGE_CACHE_QUERY_DELAY="${_TALOS_IMAGE_CACHE_QUERY_DELAY:-5}"
+_talos_image_cache_deploy_state() {
+  local out rc try=1
+  while :; do
+    rc=0
+    if command -v timeout >/dev/null 2>&1; then
+      out=$(timeout -k 5 40 kubectl -n kube-system get deploy talos-image-cache \
+        --request-timeout=30s --ignore-not-found -o name) || rc=$?
+    else
+      out=$(kubectl -n kube-system get deploy talos-image-cache \
+        --request-timeout=30s --ignore-not-found -o name) || rc=$?
+    fi
+    if [ "$rc" -eq 0 ]; then
+      if [ -n "$out" ]; then
+        printf 'present'
+      else
+        printf 'absent'
+      fi
+      return 0
+    fi
+    if [ "$try" -ge "$_TALOS_IMAGE_CACHE_QUERY_TRIES" ]; then
+      echo "WARNING: the talos-image-cache lookup gave up after ${_TALOS_IMAGE_CACHE_QUERY_TRIES} attempts; the last one exited ${rc} (124 = cut off at the wall-clock bound, 137 = SIGKILL after it, and both of those print nothing of their own; any other status is kubectl's, and its message is above)" >&2
+      printf 'unknown'
+      return 0
+    fi
+    try=$((try + 1))
+    sleep "$_TALOS_IMAGE_CACHE_QUERY_DELAY"
+  done
+}
+
+# resolve_talos_image_factory_url: print the imageFactoryURL to use, or an empty
+# string to signal "use the chart default". A decision that was actually reached
+# — the mirror is there, or it demonstrably is not — is taken once (with a
+# bounded wait for the mirror to finish seeding) and cached in a /tmp file that
+# persists across bats files (they all exec in the same sandbox container), so
+# only the first tenant Kubernetes test pays the readiness wait. A lookup that
+# never got an answer decides nothing and caches nothing; the next tenant test
+# asks again.
+resolve_talos_image_factory_url() {
+  if [ -f "$_TALOS_IMAGE_FACTORY_DECISION_FILE" ]; then
+    cat "$_TALOS_IMAGE_FACTORY_DECISION_FILE"
+    return 0
+  fi
+  local url="" state
+  state=$(_talos_image_cache_deploy_state)
+  if [ "$state" = unknown ]; then
+    # Nothing was established, so nothing is cached: this caller falls back for
+    # itself and the next tenant test asks again.
+    echo "WARNING: could not determine whether the talos-image-cache mirror is deployed (the lookup's own account of why is above) — this test falls back to public factory.talos.dev; nothing is cached, so the next tenant test asks again" >&2
+    return 0
+  fi
+  if [ "$state" = present ]; then
+    # Available only after the seed initContainer has fully fetched the image, so
+    # this is the signal that the mirror is warm.
+    if kubectl -n kube-system rollout status deploy/talos-image-cache --timeout=12m >/dev/null 2>&1; then
+      # Available proves only that the seed finished and the server answers on
+      # localhost — NOT that a worker's importer, penned in by the tenant egress
+      # default-deny, can reach the ClusterIP. Install the allow policy (Cilium is
+      # up by now, unlike at seed-deploy time) and verify the whole importer path
+      # end to end. Point tenants at the mirror only when that check passes;
+      # otherwise fall back to the public factory so the mirror can only help,
+      # never point workers at an unreachable ClusterIP and make CI worse.
+      _apply_talos_image_cache_egress_policy || true
+      if _talos_image_cache_reachable_from_tenant; then
+        url="$TALOS_IMAGE_CACHE_SVC_URL"
+        echo "talos-image-cache mirror reachable from tenant namespace (byte-range 206 verified) — tenant workers import from ${url}" >&2
+      else
+        echo "WARNING: talos-image-cache is Available but a tenant-scoped probe could not reach its ClusterIP with a 206 — tenant workers fall back to public factory.talos.dev" >&2
+      fi
+    else
+      echo "WARNING: talos-image-cache mirror not Available in time — tenant workers fall back to public factory.talos.dev" >&2
+    fi
+  else
+    echo "talos-image-cache mirror not deployed — tenant workers use public factory.talos.dev" >&2
+  fi
+  printf '%s' "$url" > "$_TALOS_IMAGE_FACTORY_DECISION_FILE"
+  printf '%s' "$url"
+}
+
+# One value, so the wall-clock bound and the per-request bound cannot drift apart
+# into a pair where the inner one outlasts the outer. Overridable for the same
+# reason the caller's bounds are: a test that turns the caller's budgets down and
+# leaves these at the real twenty seconds waits out a bound it thought it had
+# lowered. Not read from the caller's COZY_DIAG_* -- this file is sourced before
+# those exist and is also used on its own.
+#
+# Spelled out at each call site rather than precomputed into one prefix string,
+# because a prefix built here is frozen at source time while the paired
+# `--request-timeout` beside it expands at call time. Overriding the knob after
+# sourcing -- which is the only moment a test can do it, and how the caller's own
+# bounds are overridden -- would then move the inner bound and leave the outer at
+# twenty seconds: exactly the drift the single value exists to prevent, arriving
+# through the mechanism meant to make it adjustable.
+#
+# _talos_image_cache_seconds <value> <default> <name> [positive]: echo <value> when
+# it is bare integer seconds, else echo <default> and say why on stderr, naming the
+# knob the caller passed. `positive` additionally rejects zero.
+#
+# The name and the flag are parameters rather than constants because this validates
+# two knobs with different rules, and the first version hardcoded one knob's name
+# into all three messages -- so a bad grace was reported as a bad timeout, with the
+# grace's default quoted beside the timeout's name. A note that sends the reader to
+# the wrong knob is the same defect class this file exists to remove.
+#
+# Its own copy of the check rather than a call to run-kubernetes.sh's: that file
+# sources this one, so nothing of its is defined yet here, and this file is also used
+# on its own. A suffix would reach `--request-timeout=${...}s` as `2ms` and make every
+# dump fail instantly; a leading zero is all digits and reads as octal in arithmetic
+# and decimal elsewhere; and zero disables `timeout` outright while
+# `--request-timeout=0s` means no timeout to kubectl, which is the unbounded read this
+# file just stopped having.
+_talos_image_cache_seconds() {
+  if [ -n "${4:-}" ] && [ "${1}" = 0 ]; then
+    echo "» WARNING: ignoring ${3}='${1}' (zero disables the bound instead of tightening it); using ${2}" >&2
+    printf '%s\n' "${2}"
+    return 0
+  fi
+  case "${1}" in
+    '' | *[!0-9]*)
+      echo "» WARNING: ignoring ${3}='${1}' (a bare integer, no unit suffix); using ${2}" >&2
+      printf '%s\n' "${2}"
+      ;;
+    0?*)
+      echo "» WARNING: ignoring ${3}='${1}' (a leading zero reads as octal in arithmetic and as decimal elsewhere); using ${2}" >&2
+      printf '%s\n' "${2}"
+      ;;
+    *) printf '%s\n' "${1}" ;;
+  esac
+}
+# Named once, for the reason its twin's are: a default passed as a literal at every
+# call site leaves the re-checks falling back to a stale number when it changes, and
+# only on the error path.
+_TALOS_IMAGE_CACHE_READ_TIMEOUT_DEFAULT=20
+_TALOS_IMAGE_CACHE_READ_GRACE_DEFAULT=5
+_TALOS_IMAGE_CACHE_READ_TIMEOUT=$(_talos_image_cache_seconds "${_TALOS_IMAGE_CACHE_READ_TIMEOUT:-$_TALOS_IMAGE_CACHE_READ_TIMEOUT_DEFAULT}" "$_TALOS_IMAGE_CACHE_READ_TIMEOUT_DEFAULT" _TALOS_IMAGE_CACHE_READ_TIMEOUT positive)
+
+# Validated too. A suffix really is legal for `timeout -k`, but that was never the
+# hazard: `timeout -k abc 20` exits 125 before running the command, so a non-numeric
+# grace makes every dump report 125 and collects nothing. Zero stays legal -- it only
+# skips the follow-up SIGKILL, which kubectl does not need.
+_TALOS_IMAGE_CACHE_READ_GRACE=$(_talos_image_cache_seconds "${_TALOS_IMAGE_CACHE_READ_GRACE:-$_TALOS_IMAGE_CACHE_READ_GRACE_DEFAULT}" "$_TALOS_IMAGE_CACHE_READ_GRACE_DEFAULT" _TALOS_IMAGE_CACHE_READ_GRACE)
+
+# _talos_image_cache_bounded_read <label> <command...>: one bounded diagnostic
+# dump, with the outcome named whenever it does not finish.
+#
+# A local twin of run-kubernetes.sh's cozy_diag_read rather than a call to it,
+# for the reason given above: this file is sourced from the top of that one, about
+# a thousand lines before COZY_DIAG_* exists, and it is also used on its own.
+#
+# The note is what makes bounding these dumps safe rather than a new way to
+# mislead. `timeout` prints nothing when it fires, so a cut-off dump would leave a
+# bare section header and nothing else -- and an empty
+# `get deploy,pod,svc,endpointslice` section reads as a cache with no Pod, no
+# Service and no EndpointSlice. That is a finding a triager acts on, drawn from a
+# read that never reached the apiserver, which is the same mistake the gate above
+# was rewritten to stop making. Callers run inside a `{ … } >&2` group, so a plain
+# echo lands beside the dump it describes.
+#
+# Always returns 0: this whole function is best-effort and never fails its caller.
+_talos_image_cache_bounded_read() {
+  local label="$1"
+  shift
+  local rc=0
+
+  # Unbounded when `timeout` is absent rather than bounded into exit 127, which
+  # would drop every dump and blame the cluster for a missing local binary. The
+  # caller says so once; see cozy_diag_read for the same shape and reason.
+  # Re-checked here as well as at assignment: a value set after this file was sourced
+  # -- which is how a test lowers it -- never passed that check, and zero there would
+  # hand `timeout` a duration that disables it.
+  _TALOS_IMAGE_CACHE_READ_TIMEOUT=$(_talos_image_cache_seconds "${_TALOS_IMAGE_CACHE_READ_TIMEOUT-}" "$_TALOS_IMAGE_CACHE_READ_TIMEOUT_DEFAULT" _TALOS_IMAGE_CACHE_READ_TIMEOUT positive)
+  _TALOS_IMAGE_CACHE_READ_GRACE=$(_talos_image_cache_seconds "${_TALOS_IMAGE_CACHE_READ_GRACE-}" "$_TALOS_IMAGE_CACHE_READ_GRACE_DEFAULT" _TALOS_IMAGE_CACHE_READ_GRACE)
+  if command -v timeout >/dev/null 2>&1; then
+    timeout -k "$_TALOS_IMAGE_CACHE_READ_GRACE" "$_TALOS_IMAGE_CACHE_READ_TIMEOUT" "$@" || rc=$?
+  else
+    "$@" || rc=$?
+  fi
+  case "$rc" in
+    0) ;;
+    124)
+      echo "=== ${label}: read did not finish within ${_TALOS_IMAGE_CACHE_READ_TIMEOUT}s and was cut off; whatever it had not printed is absent from this log, not absent from the cluster ==="
+      ;;
+    137)
+      echo "=== ${label}: read was killed before it finished (SIGKILL); whatever it had not printed is absent from this log, not absent from the cluster ==="
+      ;;
+    *)
+      echo "=== ${label}: read failed (exit ${rc}); what it would have shown was not observed ==="
+      ;;
+  esac
+  return 0
+}
+
+# talos_image_cache_diagnose: on-demand diagnostic for the node-join failure path
+# in run-kubernetes.sh (Chainsaw-branch addition, not in #3254). Re-probes the
+# mirror from the tenant namespace — the same path a real importer faces — and
+# dumps the cacher + egress-policy state, so an operator can tell "the egress
+# allow / ClusterIP path is broken" apart from "the upstream factory was slow".
+# All output to stderr; never fails the caller.
+#
+# Its own reads are bounded because its only caller is the node-join failure path
+# in run-kubernetes.sh, which ends in the `exit 1` that triggers the tenant
+# crust-gather snapshot: a read that hangs here holds the Chainsaw op until the
+# op is killed and the snapshot after it is lost rather than truncated.
+#
+# The reachability re-probe is the exception, and the exception is wider than the
+# curl budget it is easy to mistake it for. _talos_image_cache_reachable_from_tenant
+# issues seven unbounded management-cluster calls around that curl -- the Running-pod
+# jsonpath get, the `exec` that finds the seeded file, the deploy-image jsonpath
+# get, the pre-run `delete pod` that waits for deletion, the `run --attach` whose
+# --pod-running-timeout bounds the wait for Running and not the attach stream, and
+# the `logs` re-read and the fire-and-forget `delete pod` after it, whose
+# --wait=false drops the wait for deletion and not the DELETE request -- and any one of them can hang on a wedged apiserver exactly
+# as the reads below could before they were bounded.
+#
+# They are left alone here rather than bounded, and the reason is not that they
+# are safe. That function also runs on the happy path from
+# resolve_talos_image_factory_url, where its non-zero return disables the mirror
+# for the whole suite, so changing when it gives up is a decision about which
+# image factory tenant workers use and does not belong in a diagnostic's commit.
+# What covers them meanwhile is the caller's phase budget, and only partly: the
+# gate stops the re-probe from being STARTED once the phase is out of budget, and
+# nothing stops it running long once started. Closing that surface is its own
+# change, tracked in cozystack/cozystack#3666.
+talos_image_cache_diagnose() {
+  # The gate is bounded like everything under it, and its outcomes are three
+  # rather than two: deployed, absent, and a read that did not answer.
+  #
+  # --ignore-not-found is what separates the last two. Without it "absent" and
+  # "the call failed" are the same non-zero status -- `kubectl get` exits 1 for a
+  # refused connection, for Unauthorized and for an unrecognised kind exactly as
+  # it does for NotFound -- so a read that never reached the apiserver was
+  # announced as "not deployed", a claim about the cluster drawn from a call that
+  # failed to make one, and it retired the cache hypothesis on the one path that
+  # exists to test it. With the flag, absent is exit 0 with empty output and
+  # every other non-zero is unknown.
+  # Validated once here, before the first read composes a `--request-timeout` string
+  # from it. The re-check inside _talos_image_cache_bounded_read corrects the wall
+  # clock, but each call site interpolates the value itself, so the first dump would
+  # otherwise pair a corrected `timeout` with a stale `--request-timeout=0s`.
+  _TALOS_IMAGE_CACHE_READ_TIMEOUT=$(_talos_image_cache_seconds "${_TALOS_IMAGE_CACHE_READ_TIMEOUT-}" "$_TALOS_IMAGE_CACHE_READ_TIMEOUT_DEFAULT" _TALOS_IMAGE_CACHE_READ_TIMEOUT positive)
+  _TALOS_IMAGE_CACHE_READ_GRACE=$(_talos_image_cache_seconds "${_TALOS_IMAGE_CACHE_READ_GRACE-}" "$_TALOS_IMAGE_CACHE_READ_GRACE_DEFAULT" _TALOS_IMAGE_CACHE_READ_GRACE)
+  local gate_rc=0 gate_out
+  if command -v timeout >/dev/null 2>&1; then
+    gate_out=$(timeout -k "$_TALOS_IMAGE_CACHE_READ_GRACE" "$_TALOS_IMAGE_CACHE_READ_TIMEOUT" kubectl -n kube-system get deploy talos-image-cache \
+      --ignore-not-found -o name \
+      "--request-timeout=${_TALOS_IMAGE_CACHE_READ_TIMEOUT}s") || gate_rc=$?
+  else
+    gate_out=$(kubectl -n kube-system get deploy talos-image-cache --ignore-not-found -o name \
+      "--request-timeout=${_TALOS_IMAGE_CACHE_READ_TIMEOUT}s") || gate_rc=$?
+  fi
+  if [ "$gate_rc" -ne 0 ]; then
+    echo "could not read whether talos-image-cache is deployed (exit $gate_rc); whether the mirror was in play is unknown, not no" >&2
+    return 0
+  fi
+  if [ -z "$gate_out" ]; then
+    echo "talos-image-cache not deployed — tenant workers used the public factory; nothing to diagnose" >&2
+    return 0
+  fi
+  # The whole block goes to stderr, which is also where the notes belong, so the
+  # reads below need no redirect of their own: fd1 is already stderr in here and
+  # kubectl's own stderr is inherited to the same place.
+  {
+    if _talos_image_cache_reachable_from_tenant; then
+      echo "talos-image-cache reachable from ${TALOS_IMAGE_CACHE_PROBE_NS} at diagnose time (byte-range 206)"
+    else
+      echo "talos-image-cache NOT reachable from ${TALOS_IMAGE_CACHE_PROBE_NS} at diagnose time (tenant egress allow missing/unprogrammed, or cache down)"
+    fi
+    echo "--- cache deploy/pod/svc/endpointslice ---"
+    _talos_image_cache_bounded_read 'cache deploy/pod/svc/endpointslice' \
+      kubectl -n kube-system get deploy,pod,svc,endpointslice \
+      -l app.kubernetes.io/name=talos-image-cache -o wide "--request-timeout=${_TALOS_IMAGE_CACHE_READ_TIMEOUT}s"
+    echo "--- importer egress allow policy ---"
+    _talos_image_cache_bounded_read 'importer egress allow policy' \
+      kubectl get ciliumclusterwidenetworkpolicy \
+      e2e-talos-image-cache-importer-egress -o wide "--request-timeout=${_TALOS_IMAGE_CACHE_READ_TIMEOUT}s"
+    echo "--- serve container log (tail) ---"
+    _talos_image_cache_bounded_read 'serve container log' \
+      kubectl -n kube-system logs \
+      -l app.kubernetes.io/name=talos-image-cache -c serve --tail=50 --prefix
+  } >&2
+}
diff --git a/hack/e2e-chainsaw/bucket/bucket.yaml b/hack/e2e-chainsaw/bucket/bucket.yaml
new file mode 100644
index 0000000000..b4794d2937
--- /dev/null
+++ b/hack/e2e-chainsaw/bucket/bucket.yaml
@@ -0,0 +1,9 @@
+apiVersion: apps.cozystack.io/v1alpha1
+kind: Bucket
+metadata:
+  name: test
+spec:
+  users:
+    admin: {}
+    viewer:
+      readonly: true
diff --git a/hack/e2e-chainsaw/bucket/buckets-capacity.yaml b/hack/e2e-chainsaw/bucket/buckets-capacity.yaml
new file mode 100644
index 0000000000..7a91b7ba67
--- /dev/null
+++ b/hack/e2e-chainsaw/bucket/buckets-capacity.yaml
@@ -0,0 +1,23 @@
+apiVersion: apps.cozystack.io/v1alpha1
+kind: Bucket
+metadata:
+  name: cap1
+spec:
+  users:
+    admin: {}
+---
+apiVersion: apps.cozystack.io/v1alpha1
+kind: Bucket
+metadata:
+  name: cap2
+spec:
+  users:
+    admin: {}
+---
+apiVersion: apps.cozystack.io/v1alpha1
+kind: Bucket
+metadata:
+  name: cap3
+spec:
+  users:
+    admin: {}
diff --git a/hack/e2e-chainsaw/bucket/chainsaw-test.yaml b/hack/e2e-chainsaw/bucket/chainsaw-test.yaml
new file mode 100644
index 0000000000..d55f66a8ef
--- /dev/null
+++ b/hack/e2e-chainsaw/bucket/chainsaw-test.yaml
@@ -0,0 +1,464 @@
+# Chainsaw port of hack/e2e-apps/bucket.bats ("Create and Verify Seeweedfs Bucket").
+#
+# The declarative half (resource readiness) becomes assert operations; the
+# imperative half (S3 access checks with mc through a port-forward) stays a
+# single script step, since a port-forward cannot span chainsaw operations.
+apiVersion: chainsaw.kyverno.io/v1alpha1
+kind: Test
+metadata:
+  name: bucket
+spec:
+  catch:
+  - events: {}
+  - describe:
+      apiVersion: helm.toolkit.fluxcd.io/v2
+      kind: HelmRelease
+      name: bucket-test
+  - describe:
+      apiVersion: objectstorage.k8s.io/v1alpha1
+      kind: BucketClaim
+      name: bucket-test
+  # The backend view: cluster-scoped Buckets plus the COSI controller pods,
+  # where a frozen-claim readiness propagation failure actually surfaces.
+  - get:
+      apiVersion: objectstorage.k8s.io/v1alpha1
+      kind: Bucket
+      format: yaml
+  - script:
+      # Bound the read the same way the step above documents: a catch script
+      # inherits timeouts.exec (5m), and a kubectl left holding the op's
+      # stdout/stderr pipe keeps the op alive to that ceiling (#4268). The inner
+      # cap cuts it at a known budget; the op timeout is the backstop above it.
+      timeout: 1m
+      content: timeout 30 kubectl -n cozy-objectstorage-controller get pods
+  steps:
+  - name: create-bucket
+    try:
+    - apply:
+        file: bucket.yaml
+
+  - name: wait-bucket-ready
+    try:
+    # 11m: above the 600s install timeout cozystack-api gives this release;
+    # see "Sizing an HR-Ready budget" in docs/agents/e2e-testing.md.
+    - assert:
+        timeout: 11m
+        resource:
+          apiVersion: helm.toolkit.fluxcd.io/v2
+          kind: HelmRelease
+          metadata:
+            name: bucket-test
+          status:
+            (conditions[?type == 'Ready']):
+            - status: "True"
+    # Replaces `until kubectl get ...` + `kubectl wait --for=jsonpath=...`
+    # pairs: one assert handles both existence and the status field.
+    # 2m, not the default 5m: the objectstorage-controller requeues the
+    # BucketClaim until the backend Bucket is ready, so readiness converges
+    # within tens of seconds; a claim still not ready after 2m is frozen
+    # (readiness-propagation regression), and the tight bound surfaces that
+    # instead of masking it (mirrors the bats 120s budget from 63d14e748).
+    - assert:
+        timeout: 2m
+        resource:
+          apiVersion: objectstorage.k8s.io/v1alpha1
+          kind: BucketClaim
+          metadata:
+            name: bucket-test
+          status:
+            bucketReady: true
+    - assert:
+        resource:
+          apiVersion: objectstorage.k8s.io/v1alpha1
+          kind: BucketAccess
+          metadata:
+            name: bucket-test-admin
+          status:
+            accessGranted: true
+    - assert:
+        resource:
+          apiVersion: objectstorage.k8s.io/v1alpha1
+          kind: BucketAccess
+          metadata:
+            name: bucket-test-viewer
+          status:
+            accessGranted: true
+
+  - name: verify-s3-access
+    try:
+    - script:
+        timeout: 8m
+        content: |
+          set -eu
+          workdir=$(mktemp -d)
+          trap '[ -n "${pf_pid:-}" ] && kill "$pf_pid" 2>/dev/null || true; rm -rf "$workdir"' EXIT
+
+          # Cap every S3 and apiserver call at its own deadline. A chainsaw
+          # `script` op runs the shell under exec.CommandContext with stdout and
+          # stderr wired to in-process buffers
+          # (pkg/engine/operations/script/operation.go): when the op `timeout`
+          # fires it SIGKILLs the shell alone — not its descendants — and
+          # cmd.Wait() does not return until every process that inherited those
+          # pipe fds has closed them. An mc left retrying a slow S3 call after
+          # the shell is gone keeps that pipe open, so the op runs past its
+          # declared ceiling instead of being cut at it. In #4268 a sibling
+          # script step of exactly this shape — `verify-every-bucket-takes-a-write`
+          # in the `bucket-1-capacity` Test further down this file — ran
+          # 606s under a 300s ceiling for this reason; this step is capped because
+          # it shares that shape, not because it produced that number. Per-command
+          # caps stop any single call outliving its budget, so a hang fails fast
+          # and legibly and the op `timeout` stays a backstop whose inner budgets
+          # sit under its 8m ceiling: 2×30 for the two `k` reads + 2×45 for the
+          # two `mc cp` PUTs + 2×77 for the two `await_key` probes + at most 5×15
+          # for the other `mc` calls (six other call sites, but the two cleanup
+          # `mc rm` are mutually exclusive) + the 30s port-forward readiness
+          # wait = at most 409s. mc and kubectl both
+          # exit on SIGTERM. The 30s `k` cap matches the redis suite's own `k`
+          # wrapper (`redis/chainsaw-test.yaml:298`), a terminal cap like this
+          # one; the 45s PUT cap matches the one terminal `mc cp` in the tree,
+          # in `verify-every-bucket-takes-a-write` further down this file, which
+          # sizes it for a volume grow. The 15s cap on the `mc` reads has no
+          # terminal precedent: `_lib/backup-access-preflight.sh:107` caps `mc`
+          # at 15s too, but inside a `while :;` retry loop where a 124 costs one
+          # attempt rather than the step, so it is not one. timeout execs its
+          # argument directly, so these wrappers do not recurse.
+          k()  { timeout 30 kubectl "$@"; }
+          mc() { timeout 15 mc "$@"; }  # reads/list/rm; the two PUTs call `timeout 45 mc` directly
+
+          # Extract credentials for both users. Land the encoded value in a file
+          # before decoding it: piping `k … | base64 -d` (no pipefail here) would
+          # take base64's exit status and mask a timed-out `k` (exit 124), which
+          # would then surface three lines down as an empty-credential `mc alias
+          # set` instead of at the read. As two statements, `set -e` stops on the
+          # `k` read itself.
+          k -n "$NAMESPACE" get secret bucket-test-admin \
+            -o jsonpath='{.data.BucketInfo}' > "$workdir/admin.b64"
+          base64 -d "$workdir/admin.b64" > "$workdir/admin.json"
+          k -n "$NAMESPACE" get secret bucket-test-viewer \
+            -o jsonpath='{.data.BucketInfo}' > "$workdir/viewer.b64"
+          base64 -d "$workdir/viewer.b64" > "$workdir/viewer.json"
+          ADMIN_ACCESS_KEY=$(jq -r '.spec.secretS3.accessKeyID' "$workdir/admin.json")
+          ADMIN_SECRET_KEY=$(jq -r '.spec.secretS3.accessSecretKey' "$workdir/admin.json")
+          VIEWER_ACCESS_KEY=$(jq -r '.spec.secretS3.accessKeyID' "$workdir/viewer.json")
+          VIEWER_SECRET_KEY=$(jq -r '.spec.secretS3.accessSecretKey' "$workdir/viewer.json")
+          BUCKET_NAME=$(jq -r '.spec.bucketName' "$workdir/admin.json")
+
+          # Port-forward to the S3 endpoint; cleaned up by the trap. This 30s is
+          # a readiness deadline for the forward coming up (distinct from the 30s
+          # apiserver-read cap in k()); if it never listens, timeout exits 124 and
+          # `set -e` fails the step.
+          kubectl port-forward service/seaweedfs-s3 -n tenant-root 8333:8333 >/dev/null 2>&1 &
+          pf_pid=$!
+          timeout 30 sh -ec 'until nc -z localhost 8333; do sleep 1; done'
+
+          # accessGranted is not "usable". The COSI driver grants access by
+          # rewriting the IAM file on the filer and returns; the S3 gateway
+          # loads that file later, from a filer metadata subscription, and the
+          # change may reach the filer it follows only after the other filer
+          # replica has passed it on. So wait here for the gateway behind this
+          # port-forward to accept the key. Only SeaweedFS's InvalidAccessKeyId
+          # text means "not loaded yet"; any other error, or an attempt cut off
+          # at its 15s cap (124), fails at once, and a key still unknown after
+          # the 60s window fails under its own name. At most 60 + 2 + 15 = 77s.
+          await_key() {  # alias access-key secret-key bucketaccess-name
+            deadline=$(( $(date +%s) + 60 ))
+            while :; do
+              rc=0
+              timeout 15 mc alias set "$1" https://localhost:8333 "$2" "$3" --insecure \
+                > "$workdir/alias.log" 2>&1 || rc=$?
+              if [ "$rc" -eq 0 ]; then
+                cat "$workdir/alias.log"
+                return 0
+              fi
+              cat "$workdir/alias.log" >&2
+              if [ "$rc" -eq 124 ] || ! grep -q 'does not exist in our records' "$workdir/alias.log"; then
+                echo "FAIL: mc alias set for BucketAccess $4 failed (exit $rc) with an error other than the key not being loaded yet" >&2
+                return 1
+              fi
+              if [ "$(date +%s)" -ge "$deadline" ]; then
+                echo "FAIL: S3 gateway still rejects the key of BucketAccess $4 after 60s of probing (the gateway never loaded it, or the driver never wrote it)" >&2
+                return 1
+              fi
+              sleep 2
+            done
+          }
+
+          await_key rw-user "$ADMIN_ACCESS_KEY" "$ADMIN_SECRET_KEY" bucket-test-admin
+          await_key ro-user "$VIEWER_ACCESS_KEY" "$VIEWER_SECRET_KEY" bucket-test-viewer
+
+          # Admin (readwrite) can upload, list, download
+          echo "readwrite test" > "$workdir/rw-test.txt"
+          # The PUT takes 45s, not the 15s mc() wrapper: this is the first write
+          # into a bucket created a few steps earlier, and a working PUT can wait
+          # up to ~10s while the master grows a volume for it — the same budget
+          # `verify-every-bucket-takes-a-write` gives its write for that reason.
+          timeout 45 mc cp --insecure "$workdir/rw-test.txt" "rw-user/$BUCKET_NAME/rw-test.txt"
+          mc ls --insecure "rw-user/$BUCKET_NAME/rw-test.txt"
+          mc cp --insecure "rw-user/$BUCKET_NAME/rw-test.txt" "$workdir/rw-test-download.txt"
+
+          # Viewer (readonly) can list and download
+          mc ls --insecure "ro-user/$BUCKET_NAME/rw-test.txt"
+          mc cp --insecure "ro-user/$BUCKET_NAME/rw-test.txt" "$workdir/ro-test-download.txt"
+
+          # Viewer (readonly) upload must be DENIED. accessPolicy=readonly
+          # enforcement landed with seaweedfs-cosi-driver v0.3.1 (#1921,
+          # eab9b034f), so a successful upload is a regression, not a known
+          # gap — fail hard.
+          # Capture the status rather than branching on `mc` directly: an `if`
+          # suspends `set -e`, so a `timeout` firing here (exit 124) would be
+          # indistinguishable from the access-denied non-zero this probe expects,
+          # and a 45s hang on the deny path would read as a passed check. This is
+          # the first `ro-user` write in the step — no earlier call exercised it —
+          # so its health is not established elsewhere. Success (exit 0) is the
+          # readonly regression; 124 is a timed-out probe; both fail. Any other
+          # non-zero is the expected denial.
+          echo "readonly test" > "$workdir/ro-test.txt"
+          ro_status=0
+          # Same 45s write budget as the readwrite PUT above, bypassing the 15s
+          # mc() wrapper; a 124 here is still a timed-out probe (handled below).
+          timeout 45 mc cp --insecure "$workdir/ro-test.txt" "ro-user/$BUCKET_NAME/ro-test.txt" || ro_status=$?
+          if [ "$ro_status" -eq 0 ]; then
+            echo "FAIL: read-only user must NOT be able to upload (accessPolicy=readonly regression; enforced since cosi-driver v0.3.1, #1921)" >&2
+            # Drop the object the viewer should not have been able to create
+            # (via the admin user, which is unambiguously allowed to delete).
+            mc rm --insecure "rw-user/$BUCKET_NAME/ro-test.txt" || true
+            exit 1
+          fi
+          if [ "$ro_status" -eq 124 ]; then
+            echo "FAIL: read-only upload probe timed out at its 45s cap; the deny path is not proven healthy, so it cannot pass" >&2
+            exit 1
+          fi
+
+          # Remove the test object so bucket cleanup is not blocked
+          mc rm --insecure "rw-user/$BUCKET_NAME/rw-test.txt"
+        check:
+          ($error == null): true
+# The Bucket CR was applied by chainsaw and is deleted automatically during
+# cleanup — no explicit teardown step needed.
+---
+# Slot exhaustion leaves every COSI object green and fails only the write, so
+# readiness alone cannot see it: the master answers `assign` with a grow that
+# returns no volume, and the S3 gateway times the PUT out. Each bucket here
+# therefore has to take an object, not just report ready.
+#
+# Three buckets, because the count has to exceed what a 10Gi volume serves at
+# a 1000 MB size limit and six volumes per grow, nine slots per server,
+# whether or not the platform's cozy-backups collection and the unnamed
+# default one have grown yet, and this suite can observe neither. With either
+# of them grown, the second bucket is already refused. With neither, the first
+# bucket takes six slots and the second the remaining three, since a grow keeps
+# what it gets, so the third is refused.
+apiVersion: chainsaw.kyverno.io/v1alpha1
+kind: Test
+metadata:
+  name: bucket-1-capacity
+spec:
+  catch:
+  - events: {}
+  - get:
+      apiVersion: objectstorage.k8s.io/v1alpha1
+      kind: Bucket
+      format: yaml
+  - podLogs:
+      namespace: tenant-root
+      selector: app.kubernetes.io/component=master
+      tail: 200
+  # The master logs a grow failure without the slot accounting behind it, so a
+  # log alone reads the same whether the shipped limit is too coarse for the
+  # PVC or an earlier collection in this run is still holding the budget. Max
+  # against Volumes per server separates those two.
+  # Read from inside the master rather than through a port-forward: the image
+  # ships curl, so this needs nothing on the host and adds no second fixed
+  # port to the reason this suite cannot run in parallel.
+  - description: master slot accounting
+    script:
+      timeout: 2m
+      content: |
+        set -u
+        echo "» master /dir/status (Max is the slot count per server, Volumes what is held):"
+        timeout 60 kubectl -n tenant-root exec statefulset/seaweedfs-master -- \
+          curl -s --max-time 20 http://localhost:9333/dir/status \
+          || echo "» /dir/status read failed"
+        echo
+        exit 0
+  steps:
+  - name: create-buckets
+    try:
+    - apply:
+        file: buckets-capacity.yaml
+
+  - name: wait-buckets-ready
+    try:
+    # 11m each: above the 600s install timeout cozystack-api gives these
+    # releases; see "Sizing an HR-Ready budget" in docs/agents/e2e-testing.md.
+    - assert:
+        timeout: 11m
+        resource:
+          apiVersion: helm.toolkit.fluxcd.io/v2
+          kind: HelmRelease
+          metadata:
+            name: bucket-cap1
+          status:
+            (conditions[?type == 'Ready']):
+            - status: "True"
+    - assert:
+        timeout: 11m
+        resource:
+          apiVersion: helm.toolkit.fluxcd.io/v2
+          kind: HelmRelease
+          metadata:
+            name: bucket-cap2
+          status:
+            (conditions[?type == 'Ready']):
+            - status: "True"
+    - assert:
+        timeout: 11m
+        resource:
+          apiVersion: helm.toolkit.fluxcd.io/v2
+          kind: HelmRelease
+          metadata:
+            name: bucket-cap3
+          status:
+            (conditions[?type == 'Ready']):
+            - status: "True"
+    - assert:
+        timeout: 2m
+        resource:
+          apiVersion: objectstorage.k8s.io/v1alpha1
+          kind: BucketClaim
+          metadata:
+            name: bucket-cap1
+          status:
+            bucketReady: true
+    - assert:
+        timeout: 2m
+        resource:
+          apiVersion: objectstorage.k8s.io/v1alpha1
+          kind: BucketClaim
+          metadata:
+            name: bucket-cap2
+          status:
+            bucketReady: true
+    - assert:
+        timeout: 2m
+        resource:
+          apiVersion: objectstorage.k8s.io/v1alpha1
+          kind: BucketClaim
+          metadata:
+            name: bucket-cap3
+          status:
+            bucketReady: true
+    # BucketAccess reconciles separately from the claim, and the write step
+    # reads the Secret it produces. Without these the step can fail on a
+    # missing Secret rather than on the capacity it is here to measure.
+    - assert:
+        resource:
+          apiVersion: objectstorage.k8s.io/v1alpha1
+          kind: BucketAccess
+          metadata:
+            name: bucket-cap1-admin
+          status:
+            accessGranted: true
+    - assert:
+        resource:
+          apiVersion: objectstorage.k8s.io/v1alpha1
+          kind: BucketAccess
+          metadata:
+            name: bucket-cap2-admin
+          status:
+            accessGranted: true
+    - assert:
+        resource:
+          apiVersion: objectstorage.k8s.io/v1alpha1
+          kind: BucketAccess
+          metadata:
+            name: bucket-cap3-admin
+          status:
+            accessGranted: true
+
+  - name: verify-every-bucket-takes-a-write
+    try:
+    - script:
+        timeout: 8m
+        content: |
+          set -eu
+          workdir=$(mktemp -d)
+          trap '[ -n "${pf_pid:-}" ] && kill "$pf_pid" 2>/dev/null || true; rm -rf "$workdir"' EXIT
+
+          kubectl port-forward service/seaweedfs-s3 -n tenant-root 8333:8333 >/dev/null 2>&1 &
+          pf_pid=$!
+          timeout 30 sh -ec 'until nc -z localhost 8333; do sleep 1; done'
+
+          echo "capacity probe" > "$workdir/probe.txt"
+
+          # accessGranted is not "usable". The COSI driver grants access by
+          # rewriting the IAM file on the filer and returns; the S3 gateway
+          # loads that file later, from a filer metadata subscription, and the
+          # change may reach the filer it follows only after the other filer
+          # replica has passed it on. So wait here for the gateway behind this
+          # port-forward to accept the key. Only SeaweedFS's InvalidAccessKeyId
+          # text means "not loaded yet"; any other error, or an attempt cut off
+          # at its 15s cap (124), fails at once, and a key still unknown after
+          # the 60s window fails under its own name. At most 60 + 2 + 15 = 77s.
+          await_key() {  # alias access-key secret-key bucketaccess-name
+            deadline=$(( $(date +%s) + 60 ))
+            while :; do
+              rc=0
+              timeout 15 mc alias set "$1" https://localhost:8333 "$2" "$3" --insecure \
+                > "$workdir/alias.log" 2>&1 || rc=$?
+              if [ "$rc" -eq 0 ]; then
+                cat "$workdir/alias.log"
+                return 0
+              fi
+              cat "$workdir/alias.log" >&2
+              if [ "$rc" -eq 124 ] || ! grep -q 'does not exist in our records' "$workdir/alias.log"; then
+                echo "FAIL: mc alias set for BucketAccess $4 failed (exit $rc) with an error other than the key not being loaded yet" >&2
+                return 1
+              fi
+              if [ "$(date +%s)" -ge "$deadline" ]; then
+                echo "FAIL: S3 gateway still rejects the key of BucketAccess $4 after 60s of probing (the gateway never loaded it, or the driver never wrote it)" >&2
+                return 1
+              fi
+              sleep 2
+            done
+          }
+
+          for name in cap1 cap2 cap3; do
+            # Keep the read and the decode as separate commands. This runs under
+            # /bin/sh, where pipefail is unavailable, and a pipeline would let a
+            # failed Secret read look successful when base64 exits zero on empty
+            # input — surfacing at mc as the credentials error this case exists
+            # to rule out.
+            if ! kubectl -n "$NAMESPACE" get secret "bucket-${name}-admin" \
+                -o jsonpath='{.data.BucketInfo}' > "$workdir/${name}.b64"; then
+              echo "failed to read BucketInfo Secret $NAMESPACE/bucket-${name}-admin" >&2
+              exit 1
+            fi
+            if ! base64 -d < "$workdir/${name}.b64" > "$workdir/${name}.json"; then
+              echo "BucketInfo Secret $NAMESPACE/bucket-${name}-admin is not valid base64" >&2
+              exit 1
+            fi
+            ACCESS_KEY=$(jq -r '.spec.secretS3.accessKeyID // ""' "$workdir/${name}.json")
+            SECRET_KEY=$(jq -r '.spec.secretS3.accessSecretKey // ""' "$workdir/${name}.json")
+            BUCKET_NAME=$(jq -r '.spec.bucketName // ""' "$workdir/${name}.json")
+            if [ -z "$ACCESS_KEY" ] || [ -z "$SECRET_KEY" ] || [ -z "$BUCKET_NAME" ]; then
+              echo "BucketInfo Secret $NAMESPACE/bucket-${name}-admin lacks access key, secret key, or bucket name" >&2
+              exit 1
+            fi
+
+            # Each mc call carries its own limit, because the step timeout only
+            # kills this shell and a hung PUT, the failure this case exists for,
+            # would keep the step waiting on mc's pipes. That PUT never fails on
+            # its own: the gateway answers 5xx and mc retries without a word, so
+            # the limit is what ends it and the catch block is what shows why.
+            # The PUT gets the longest because a working one can still wait up
+            # to ten seconds while the master grows a volume for the bucket.
+            # Per bucket that is 77 for the probe + 45 + 15, so with the 30s
+            # port-forward wait the mc and port-forward budgets sum to 441s,
+            # under the step's eight minutes.
+            await_key "$name" "$ACCESS_KEY" "$SECRET_KEY" "bucket-${name}-admin"
+            timeout 45 mc cp --insecure "$workdir/probe.txt" "$name/$BUCKET_NAME/probe.txt"
+            timeout 15 mc rm --insecure "$name/$BUCKET_NAME/probe.txt"
+          done
+        check:
+          ($error == null): true
diff --git a/hack/e2e-chainsaw/clickhouse/chainsaw-test.yaml b/hack/e2e-chainsaw/clickhouse/chainsaw-test.yaml
new file mode 100644
index 0000000000..939e8f69ab
--- /dev/null
+++ b/hack/e2e-chainsaw/clickhouse/chainsaw-test.yaml
@@ -0,0 +1,379 @@
+# Chainsaw port of hack/e2e-apps/clickhouse.bats ("Create DB ClickHouse").
+#
+# The BATS test asserted service ports via a grep on the jsonpath port list.
+# Here the asserts compare the full ports[*].port projection to the expected
+# list; chainsaw v0.2.15 mis-evaluates JMESPath number-literal port filters.
+apiVersion: chainsaw.kyverno.io/v1alpha1
+kind: Test
+metadata:
+  name: clickhouse
+spec:
+  catch:
+  - events: {}
+  - describe:
+      apiVersion: helm.toolkit.fluxcd.io/v2
+      kind: HelmRelease
+      name: clickhouse-test
+  - podLogs:
+      selector: app.kubernetes.io/instance=clickhouse-test
+      tail: 50
+  steps:
+  - name: create-clickhouse
+    try:
+    - apply:
+        file: clickhouse.yaml
+
+  - name: wait-helmrelease-ready
+    try:
+    # 11m: above the 600s install timeout cozystack-api gives this release;
+    # see "Sizing an HR-Ready budget" in docs/agents/e2e-testing.md.
+    - assert:
+        timeout: 11m
+        resource:
+          apiVersion: helm.toolkit.fluxcd.io/v2
+          kind: HelmRelease
+          metadata:
+            name: clickhouse-test
+          status:
+            (conditions[?type == 'Ready']):
+            - status: "True"
+
+  - name: verify-endpoint-service
+    try:
+    - assert:
+        timeout: 3m
+        resource:
+          apiVersion: v1
+          kind: Service
+          metadata:
+            name: chendpoint-clickhouse-test
+          spec:
+            (ports[*].port): [8123, 9000]
+
+  - name: verify-replica-0
+    try:
+    - assert:
+        timeout: 2m
+        resource:
+          apiVersion: apps/v1
+          kind: StatefulSet
+          metadata:
+            name: chi-clickhouse-test-clickhouse-0-0
+          status:
+            replicas: 1
+    - assert:
+        timeout: 2m
+        resource:
+          apiVersion: v1
+          kind: Endpoints
+          metadata:
+            name: chi-clickhouse-test-clickhouse-0-0
+          (subsets[0].addresses[0].ip != null): true
+    - assert:
+        timeout: 2m
+        resource:
+          apiVersion: v1
+          kind: Service
+          metadata:
+            name: chi-clickhouse-test-clickhouse-0-0
+          spec:
+            (ports[*].port): [9000, 8123, 9009]
+
+  - name: verify-replica-1
+    try:
+    - assert:
+        timeout: 3m
+        resource:
+          apiVersion: apps/v1
+          kind: StatefulSet
+          metadata:
+            name: chi-clickhouse-test-clickhouse-0-1
+          status:
+            replicas: 1
+---
+# ClickHouse Altinity backup/restore E2E — the two backup Tests below sit in
+# this suite alongside the plain `clickhouse` Test above. Chainsaw port of the
+# intended hack/e2e-apps/backup-clickhouse.bats (cozystack#2600), shaped like the
+# etcd/mariadb/postgres suites:
+#
+#   clickhouse-1-backup-contracts  — deploy a backup-enabled ClickHouse and
+#                                    assert the chart<->Altinity-strategy
+#                                    contract (the :7171 clickhouse-backup
+#                                    sidecar + the backup-api-auth Secret the
+#                                    strategy Pod authenticates with). Runs in
+#                                    CI; needs no reachable object store.
+#   clickhouse-2-backup-roundtrip  — the full Bucket -> BackupJob -> Backup ->
+#                                    in-place + to-copy RestoreJob round-trip,
+#                                    driving the validated example scripts
+#                                    (examples/backups/clickhouse). Also runs in
+#                                    CI, in tenant-root.
+#
+# Why the split: the two Tests answer different questions at different cost. The
+# contracts Test needs no object store, so it stays in the default tenant-test
+# namespace next to the other app suites and is the seconds-long guard on the
+# chart wiring the Altinity strategy depends on — the sidecar container/port and
+# the backup-api-auth Secret it authenticates with, each a silent break if a
+# chart bump renames it. The round-trip Test moves real data through S3, so it
+# must run in tenant-root (see its own header) and costs minutes.
+apiVersion: chainsaw.kyverno.io/v1alpha1
+kind: Test
+metadata:
+  name: clickhouse-1-backup-contracts
+spec:
+  catch:
+  - events: {}
+  - describe:
+      apiVersion: helm.toolkit.fluxcd.io/v2
+      kind: HelmRelease
+      name: clickhouse-test-backup
+  - podLogs:
+      selector: app.kubernetes.io/instance=clickhouse-test-backup
+      tail: 50
+  steps:
+  - name: create-clickhouse
+    try:
+    - apply:
+        file: clickhouse-backup.yaml
+
+  - name: wait-helmrelease-ready
+    try:
+    # Same 11m as clickhouse-test above.
+    - assert:
+        timeout: 11m
+        resource:
+          apiVersion: helm.toolkit.fluxcd.io/v2
+          kind: HelmRelease
+          metadata:
+            name: clickhouse-test-backup
+          status:
+            (conditions[?type == 'Ready']):
+            - status: "True"
+
+  # The ClickHouseInstallation Pod carries the clickhouse-backup sidecar. Gate
+  # on the StatefulSet actually reporting a ready replica (not just the HR
+  # condition) before inspecting the Pod.
+  - name: wait-statefulset-ready
+    try:
+    - assert:
+        timeout: 5m
+        resource:
+          apiVersion: apps/v1
+          kind: StatefulSet
+          metadata:
+            name: chi-clickhouse-test-backup-clickhouse-0-0
+          status:
+            readyReplicas: 1
+
+  # The chart<->strategy contract, asserted against the running Pod (not the
+  # chart templates): the cozy-default-altinity strategy Pod reaches the
+  # clickhouse-backup HTTP API on the container port named ch-backup-api
+  # (:7171). If a chart bump renames the container or moves the port, every
+  # ClickHouse BackupJob breaks silently — this catches it.
+  - name: verify-backup-sidecar
+    try:
+    - assert:
+        timeout: 3m
+        resource:
+          apiVersion: v1
+          kind: Pod
+          metadata:
+            labels:
+              app.kubernetes.io/instance: clickhouse-test-backup
+          status:
+            phase: Running
+          # Filter to the sidecar container, take it, project its named port:
+          # exactly one ch-backup-api port on :7171/TCP. String-literal filters
+          # (not numeric) sidestep the chainsaw v0.2.15 JMESPath number-literal
+          # bug; 7171 here is an expected value, not a filter literal.
+          (spec.containers[?name == 'clickhouse-backup'] | [0].ports[?name == 'ch-backup-api']):
+          - containerPort: 7171
+            protocol: TCP
+          # And that the sidecar actually authenticates from that Secret: the
+          # API_USERNAME/API_PASSWORD env must resolve valueFrom the
+          # backup-api-auth Secret's username/password keys. A chart change that
+          # kept both the Secret and the port but repointed or dropped these
+          # secretKeyRefs would otherwise slip through and surface only as 401s
+          # at BackupJob time — the exact silent break this suite guards.
+          (spec.containers[?name == 'clickhouse-backup'] | [0].env[?name == 'API_USERNAME']):
+          - valueFrom:
+              secretKeyRef:
+                name: clickhouse-test-backup-backup-api-auth
+                key: username
+          (spec.containers[?name == 'clickhouse-backup'] | [0].env[?name == 'API_PASSWORD']):
+          - valueFrom:
+              secretKeyRef:
+                name: clickhouse-test-backup-backup-api-auth
+                key: password
+
+  # The strategy Pod authenticates to the sidecar with the credentials in the
+  # chart-emitted <release>-backup-api-auth Secret (env API_USERNAME /
+  # API_PASSWORD on both sides). Assert it exists and carries both keys — a
+  # rename of the Secret or a dropped key surfaces only as 401s (or a Pod that
+  # never starts) at BackupJob time otherwise.
+  - name: verify-backup-api-auth-secret
+    try:
+    - assert:
+        resource:
+          apiVersion: v1
+          kind: Secret
+          metadata:
+            name: clickhouse-test-backup-backup-api-auth
+          (data.username != null): true
+          (data.password != null): true
+---
+# Full ClickHouse Altinity round-trip: Bucket -> Altinity strategy + BackupClass
+# -> backup-enabled source ClickHouse (+ sentinel write) -> BackupJob (waits
+# Succeeded, emits a Backup) -> in-place RestoreJob -> to-copy RestoreJob into a
+# second ClickHouse. It drives examples/backups/clickhouse/run-all.sh as the
+# harness so the test and the documented flow can never drift — the same reason
+# the etcd/mariadb/postgres round-trips drive their examples.
+#
+# Runs in CI, unlike the etcd round-trip, and the difference is the chart's
+# backup.endpointCA. This mirrors mariadb-2-backup-roundtrip and
+# postgres-2-backup-roundtrip, whose three preconditions all now hold here:
+#   - runs in tenant-root, not the default tenant-test: the S3 client is the
+#     clickhouse-backup sidecar INSIDE the tenant, and the e2e tenant is created
+#     isolated (hack/e2e-install-cozystack.bats) — its Cilium egress allowlist
+#     blocks a tenant-test Pod from reaching tenant-root's seaweedfs, while a
+#     tenant-root Pod reaches it over same-tenant egress;
+#   - targets the in-cluster endpoint (S3_ENDPOINT below) instead of the
+#     BucketInfo external ingress URL, which in CI is the unroutable
+#     s3.example.org placeholder;
+#   - trusts that endpoint's self-signed cert by copying the seaweedfs CA secret
+#     (seaweedfs-ca-cert, auto-discovered from the cert-manager Certificate)
+#     into a per-release Secret referenced by backup.endpointCA, which the chart
+#     mounts into the sidecar and exposes through SSL_CERT_DIR.
+# Before backup.endpointCA existed the sidecar had no CA surface at all, which is
+# why this suite previously skipped the round-trip behind an env gate.
+#
+# Scope, stated plainly: this exercises the strategy the EXAMPLE installs, not
+# the shipped cozy-default-altinity. The two now share a client image (step 01
+# reads it off cozy-default-altinity) but the script body and the BackupClass
+# wiring are the example's own, so a regression in the platform strategy's own
+# script would not be caught here. Same limitation as the mariadb and postgres
+# round-trips, which drive their examples the same way.
+apiVersion: chainsaw.kyverno.io/v1alpha1
+kind: Test
+metadata:
+  name: clickhouse-2-backup-roundtrip
+spec:
+  namespace: tenant-root
+  # The round-trip creates its resources through the example scripts, not
+  # Chainsaw `apply`, and also produces controller-owned artifacts (the Backup
+  # CR, the cluster-scoped Altinity strategy + BackupClass). Chainsaw has
+  # nothing of its own to auto-delete, so teardown is the run step's finally
+  # (cleanup.sh), which is idempotent.
+  skipDelete: true
+  catch:
+  - events: {}
+  # Name the HelmReleases. tenant-root is the root tenant of a live e2e cluster,
+  # so an unnamed describe here dumps every HelmRelease on it and buries the two
+  # that matter (mariadb-2-backup-roundtrip names its release for the same
+  # reason). BackupJob/RestoreJob/Altinity stay unnamed — there are only ever a
+  # couple, and the names are the harness's to choose.
+  - describe:
+      apiVersion: helm.toolkit.fluxcd.io/v2
+      kind: HelmRelease
+      name: clickhouse-clickhouse-test
+  - describe:
+      apiVersion: helm.toolkit.fluxcd.io/v2
+      kind: HelmRelease
+      name: clickhouse-clickhouse-restore
+  - describe:
+      apiVersion: backups.cozystack.io/v1alpha1
+      kind: BackupJob
+  - describe:
+      apiVersion: backups.cozystack.io/v1alpha1
+      kind: RestoreJob
+  - describe:
+      apiVersion: strategy.backups.cozystack.io/v1alpha1
+      kind: Altinity
+  # tail 200, not 100: the sidecar logs each backup/restore action, so an S3
+  # error can sit well back from the tail by the time the step fails.
+  - podLogs:
+      selector: app.kubernetes.io/instance=clickhouse-clickhouse-test
+      tail: 200
+  # The to-copy leg (step 07) restores into a second release; capture its Pod
+  # logs too so a failure isolated to that leg keeps its diagnostics.
+  - podLogs:
+      selector: app.kubernetes.io/instance=clickhouse-clickhouse-restore
+      tail: 200
+  # Keeper Pods carry a different label shape (chkeeper.yaml labels them
+  # app: <release>-keeper, not app.kubernetes.io/instance), so the selectors
+  # above miss them entirely. A source ClickHouse that never reaches a ready
+  # replica is usually Keeper failing to form a quorum, and that explains itself
+  # only here.
+  - podLogs:
+      selector: app=clickhouse-clickhouse-test-keeper
+      tail: 100
+  - podLogs:
+      selector: app=clickhouse-clickhouse-restore-keeper
+      tail: 100
+  steps:
+  - name: run
+    try:
+    # Pre-clean: tenant-root is a shared, persistent namespace with fixed
+    # resource names, so a run killed before the finally below leaves stale
+    # state behind. A leftover BackupJob still carrying status.phase=Succeeded
+    # from a prior run would satisfy the harness's Succeeded wait instantly and
+    # pass without a real backup ever running. cleanup.sh is idempotent
+    # (--ignore-not-found), so this is a no-op on a clean namespace.
+    - script:
+        # cleanup.sh now waits for the two ClickHouse releases and the Bucket to
+        # actually go (3 x 180s = 540s), so the step budget has to clear that sum
+        # for the same reason the run step does: an inner wait names the resource
+        # that would not delete, a SIGKILL at the op timeout names nothing.
+        timeout: 12m
+        content: |
+          set -eu
+          cd ../../..
+          NAMESPACE="$NAMESPACE" examples/backups/clickhouse/cleanup.sh
+        check:
+          ($error == null): true
+    # Budget: the op timeout must be strictly ABOVE the sum of the inner waits,
+    # per docs/agents/e2e-testing.md — let an inner wait be what fires, because
+    # it names the resource that stalled, whereas hitting the op timeout means
+    # Chainsaw SIGKILLs the script and the failure arrives with no diagnostics
+    # at all (.chainsaw.yaml calls that "strictly worse").
+    #
+    # Inner budgets, sized against what CI actually takes rather than guessed
+    # generously — the whole bucket suite completes in ~37s and a backup-enabled
+    # ClickHouse plus Keeper reaches Ready in ~98s (measured on run 30353894332):
+    #   03 1110s = 660 bucket HR + 180 claim + 180 access + 90 S3 preflight
+    #   04  960s = 660 HR + 300 StatefulSet
+    #   05  480s = BackupJob to Succeeded
+    #   06  480s = in-place RestoreJob
+    #   07 1440s = 660 HR + 300 StatefulSet + 480 to-copy RestoreJob
+    #        sum = 4470s (74m30s)
+    # 78m therefore leaves ~3m30s of headroom for the kubectl apply / exec SQL
+    # calls interleaved between those waits (convention 6: justified in-line).
+    # The 660s HR waits are sized in "Sizing an HR-Ready budget",
+    # docs/agents/e2e-testing.md.
+    #
+    # Reaching the ceiling at all takes a pathological hang: every wait fails
+    # fast on a terminal state — wait_for_field bails on phase=Failed and
+    # wait_hr_ready on Stalled=True — so a genuinely broken backup reports in
+    # seconds. The happy path is minutes.
+    - script:
+        timeout: 78m
+        content: |
+          set -eu
+          cd ../../..
+          [ -x examples/backups/clickhouse/run-all.sh ] || { echo "clickhouse backup example scripts not found at examples/backups/clickhouse" >&2; exit 1; }
+          COZY_E2E_BACKUP_PREFLIGHT=1 NAMESPACE="$NAMESPACE" S3_ENDPOINT="https://seaweedfs-s3.tenant-root:8333" \
+            examples/backups/clickhouse/run-all.sh
+        check:
+          ($error == null): true
+    finally:
+    # Removes every resource the harness created (chainsaw did not apply them,
+    # so they are not part of automatic cleanup), including the copied CA Secret
+    # and the cluster-scoped Altinity strategy + BackupClass.
+    - description: backup-flow cleanup
+      script:
+        # 12m for the same arithmetic as the pre-clean above (540s of deletion
+        # waits inside cleanup.sh).
+        timeout: 12m
+        content: |
+          set -eu
+          cd ../../..
+          NAMESPACE="$NAMESPACE" examples/backups/clickhouse/cleanup.sh
diff --git a/hack/e2e-chainsaw/clickhouse/clickhouse-backup.yaml b/hack/e2e-chainsaw/clickhouse/clickhouse-backup.yaml
new file mode 100644
index 0000000000..b88e7dd6de
--- /dev/null
+++ b/hack/e2e-chainsaw/clickhouse/clickhouse-backup.yaml
@@ -0,0 +1,45 @@
+# Backup-enabled ClickHouse for the clickhouse-1-backup-contracts Test.
+#
+# A single shard / single replica keeps CI cost close to the plain
+# `clickhouse` suite while still rendering the `clickhouse-backup` sidecar
+# and its `:7171` HTTP API — the chart surface the Altinity backup strategy
+# depends on and the subject of this suite.
+#
+# backup.enabled=true with placeholder S3 coordinates is deliberate: the
+# sidecar runs `clickhouse-backup server`, which starts its HTTP API without
+# validating S3 (ALLOW_EMPTY_BACKUPS=true, lazy connect — the same reason the
+# platform useSystemBucket flow marks the S3 secret keys optional so the Pod
+# starts before any bucket is projected). So the Pod becomes Ready and the
+# chart<->strategy contract is assertable with no reachable object store. The
+# real S3 backup/restore round-trip lives in clickhouse-2-backup-roundtrip,
+# which runs in tenant-root against the in-cluster SeaweedFS.
+#
+# backup.endpointCA is deliberately left unset: this Test never reaches S3, and
+# leaving it empty keeps it covering the default rendering (no CA volume, no
+# SSL_CERT_DIR) that every release without a private-CA endpoint gets.
+apiVersion: apps.cozystack.io/v1alpha1
+kind: ClickHouse
+metadata:
+  name: test-backup
+spec:
+  size: 5Gi
+  logStorageSize: 1Gi
+  shards: 1
+  replicas: 1
+  resourcesPreset: nano
+  resources: {}
+  users:
+    testuser:
+      password: xai7Wepo
+  backup:
+    enabled: true
+    useSystemBucket: false
+    s3Region: us-east-1
+    s3Bucket: s3.example.org/clickhouse-backups
+    s3AccessKey: placeholder-access-key
+    s3SecretKey: placeholder-secret-key
+  clickhouseKeeper:
+    enabled: true
+    replicas: 1
+    size: 1Gi
+    resourcesPreset: micro
diff --git a/hack/e2e-chainsaw/clickhouse/clickhouse.yaml b/hack/e2e-chainsaw/clickhouse/clickhouse.yaml
new file mode 100644
index 0000000000..86b9b4e018
--- /dev/null
+++ b/hack/e2e-chainsaw/clickhouse/clickhouse.yaml
@@ -0,0 +1,29 @@
+apiVersion: apps.cozystack.io/v1alpha1
+kind: ClickHouse
+metadata:
+  name: test
+spec:
+  size: 10Gi
+  logStorageSize: 2Gi
+  shards: 1
+  replicas: 2
+  storageClass: ""
+  logTTL: 15
+  users:
+    testuser:
+      password: xai7Wepo
+  backup:
+    enabled: false
+    s3Region: us-east-1
+    s3Bucket: s3.example.org/clickhouse-backups
+    schedule: "0 2 * * *"
+    cleanupStrategy: "--keep-last=3 --keep-daily=3 --keep-within-weekly=1m"
+    s3AccessKey: oobaiRus9pah8PhohL1ThaeTa4UVa7gu
+    s3SecretKey: ju3eum4dekeich9ahM1te8waeGai0oog
+    resticPassword: ChaXoveekoh6eigh4siesheeda2quai0
+  clickhouseKeeper:
+    enabled: true
+    resourcesPreset: "micro"
+    size: "1Gi"
+  resources: {}
+  resourcesPreset: "nano"
diff --git a/hack/e2e-chainsaw/computeplane/chainsaw-test.yaml b/hack/e2e-chainsaw/computeplane/chainsaw-test.yaml
new file mode 100644
index 0000000000..2a02dc06e0
--- /dev/null
+++ b/hack/e2e-chainsaw/computeplane/chainsaw-test.yaml
@@ -0,0 +1,520 @@
+# The ComputePlane tenant module, run on a cluster.
+#
+# packages/extra/computeplane/tests pins what the module renders. What only a
+# cluster shows is whether that rendering turns into a working cluster: the
+# tenant toggle installs the module, the module installs a Kamaji control plane
+# and a worker pool, Kamaji writes the admin kubeconfig the tenant must not
+# see, the pinned cert-manager and ingress-nginx addons come up inside the
+# cluster, and turning the toggle off takes all of it down again.
+#
+# The module runs in its own tenant, tenant-cplane, so turning it on and off
+# never touches the tenant-test that the other suites share. It is a child of
+# tenant-root rather than of tenant-test because a tenant two levels down cannot
+# reach the etcd it inherits from tenant-root (#4726).
+#
+# The suite supplies its own worker pool. The default md0 the module renders
+# for an empty nodeGroups puts its disk on the `replicated` StorageClass, which
+# the container lane does not have, so that path is left to the render tests.
+# The pool shape copies the kubernetes suites' worker sizing (see
+# run_kubernetes_test in _lib/run-kubernetes.sh for why each field is there),
+# two workers included. On one single-vCPU worker the tenant addons' CPU
+# requests take nearly all it can allocate, so cert-manager's startupapicheck
+# hook Job can find no room and stay Pending, which fails the cert-manager
+# install.
+#
+# Budget: the try ops' ceilings add up to 147m, this suite's own catch to 12m
+# (the events and describe collectors take timeouts.exec, 5m each, and the
+# script 2m) and the teardown to 58m plus 2m for the hold release, before
+# the global error.catch in .chainsaw.yaml.
+# Every kubectl in the try scripts runs under `timeout -k 5 30`, and each
+# script op's ceiling clears the sum of those bounds, so a hung apiserver
+# fails the script before its ceiling fires; the ceiling alone would not
+# hold, for the reason .chainsaw.yaml gives above its catch scripts.
+# The try figure is reached only if every op passes just under its own
+# ceiling; a red run ends at the first op that expires, then pays the catches
+# and the teardown. This is the third suite in a full run that brings up a
+# tenant cluster, next to kubernetes-latest and kubernetes-previous. A failure
+# that stalls worker join everywhere reddens all three, and their red paths
+# together can exceed the E2E job's 215-minute cap, which cancels the job and
+# loses its log and report. The cap is sized for the red path of the
+# kubernetes pair only; this suite is not counted in it, and that is an
+# accepted risk.
+apiVersion: chainsaw.kyverno.io/v1alpha1
+kind: Test
+metadata:
+  name: computeplane
+spec:
+  steps:
+  - name: computeplane-lifecycle
+    try:
+    # Taken before anything of the suite's exists, so the teardown compares
+    # against a sandbox this suite has not touched yet.
+    - script:
+        timeout: 4m
+        content: |
+          set -eu
+          cd ../../..
+          . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+          COZY_LINSTOR_POOL_BASELINE_FILE=_out/e2e-computeplane-linstor-pool-baseline \
+            cozy_capture_linstor_pool_baseline
+        check:
+          ($error == null): true
+
+    - apply:
+        resource:
+          apiVersion: apps.cozystack.io/v1alpha1
+          kind: Tenant
+          metadata:
+            name: cplane
+            namespace: tenant-root
+          spec:
+            computeplane: true
+
+    # tenant-rd sets helm-install-timeout 15m on the generated release.
+    - assert:
+        timeout: 17m
+        resource:
+          apiVersion: helm.toolkit.fluxcd.io/v2
+          kind: HelmRelease
+          metadata:
+            name: tenant-cplane
+            namespace: tenant-root
+          status:
+            (conditions[?type == 'Ready']):
+            - status: "True"
+
+    - assert:
+        timeout: 3m
+        resource:
+          apiVersion: helm.toolkit.fluxcd.io/v2
+          kind: HelmRelease
+          metadata:
+            name: computeplane
+            namespace: tenant-cplane
+            labels:
+              internal.cozystack.io/tenantmodule: "true"
+              apps.cozystack.io/application.kind: ComputePlane
+
+    # The ComputePlane object exists only once the tenant chart has rendered
+    # its HelmRelease, so the pool is set right after the assert above. The
+    # first install renders the default md0 at minReplicas 0, which creates no
+    # VM; the upgrade below replaces its values before anything scales it.
+    #
+    # nameOverride is outside the module's per-pool allowlist. The ComputePlane
+    # schema accepts it, so it reaches the module and the pool check below can
+    # see whether the module dropped it.
+    - script:
+        timeout: 3m
+        content: |
+          set -eu
+          cd ../../..
+          . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+          sc=$(cozy_e2e_storage_class)
+          timeout -k 5 30 kubectl -n tenant-cplane patch computeplanes.apps.cozystack.io computeplane \
+            --type merge --patch-file /dev/stdin <<EOF
+          spec:
+            nodeGroups:
+              md0:
+                diskSize: 20Gi
+                instanceType: u1.medium
+                logSerialConsole: true
+                minReplicas: 2
+                maxReplicas: 2
+                podCpuLimit: 2
+                podCpuRequest: 100m
+                resources:
+                  cpu: 1
+                  memory: 4Gi
+                nameOverride: e2e-must-not-pass
+                roles:
+                - ingress-nginx
+                storageClass: "${sc}"
+          EOF
+          kept=$(timeout -k 5 30 kubectl -n tenant-cplane get computeplanes.apps.cozystack.io computeplane -o jsonpath='{.spec.nodeGroups.md0.nameOverride}')
+          if [ "$kept" != e2e-must-not-pass ]; then
+            echo "the ComputePlane API did not keep nameOverride (got '${kept}'); the allowlist check below would prove nothing" >&2
+            exit 1
+          fi
+        check:
+          ($error == null): true
+
+    # The module release sets timeout 10m and waits on what it renders.
+    # Matching generations keep a Ready left over from the install before the
+    # pool patch from passing this.
+    - assert:
+        timeout: 12m
+        resource:
+          apiVersion: helm.toolkit.fluxcd.io/v2
+          kind: HelmRelease
+          metadata:
+            name: computeplane
+            namespace: tenant-cplane
+          (status.observedGeneration == metadata.generation): true
+          status:
+            (conditions[?type == 'Ready']):
+            - status: "True"
+
+    - assert:
+        resource:
+          apiVersion: helm.toolkit.fluxcd.io/v2
+          kind: HelmRelease
+          metadata:
+            name: computeplane-cluster
+            namespace: tenant-cplane
+            labels:
+              internal.cozystack.io/computeplane: "true"
+          spec:
+            chartRef:
+              kind: ExternalArtifact
+              name: cozystack-computeplane-application-kubevirt-kubernetes
+            values:
+              addons:
+                certManager:
+                  enabled: true
+                ingressNginx:
+                  enabled: true
+                  exposeMethod: Proxied
+
+    # The pool takes the patched shape, and the nameOverride the patch sent
+    # does not reach it, nor does any other key outside the allowlist.
+    - script:
+        timeout: 1m
+        content: |
+          set -eu
+          cd ../../..
+          . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+          sc=$(cozy_e2e_storage_class)
+          values=$(timeout -k 5 30 kubectl -n tenant-cplane get helmrelease kubernetes-nodes-computeplane-cluster-md0 -o json | jq -c '.spec.values')
+          echo "pool values: $values"
+          echo "$values" | jq -e --arg sc "$sc" '.storageClass == $sc and .minReplicas == 2 and .cluster == "computeplane-cluster" and .clusterReleaseName == "computeplane-cluster"'
+          extra=$(echo "$values" | jq -r 'keys - ["cluster","clusterReleaseName","minReplicas","maxReplicas","instanceType","diskSize","storageClass","roles","resources","gpus","kubelet","logSerialConsole","maxUnhealthy","nodeStartupTimeout","readyUnknownTimeout","readyFalseTimeout","podCpuLimit","podCpuRequest","maxNodeProvisionTime"] | .[]')
+          if [ -n "$extra" ]; then
+            echo "pool HelmRelease carries keys outside the module allowlist: $extra" >&2
+            exit 1
+          fi
+        check:
+          ($error == null): true
+
+    # Kamaji writes it once the control plane is up; the kubernetes suites
+    # give that bringup 2m + 10m.
+    - assert:
+        timeout: 13m
+        resource:
+          apiVersion: v1
+          kind: Secret
+          metadata:
+            name: computeplane-cluster-admin-kubeconfig
+            namespace: tenant-cplane
+          (contains(keys(data), 'super-admin.svc')): true
+
+    # Withheld from the tenant: computeplane-rd allowlists no secrets, so the
+    # Secret is not labelled tenantresource=true (the lineage webhook writes
+    # "false" on everything it withholds), the tenantsecrets API does not
+    # list it to the tenant's own super-admin group, and that group cannot
+    # read it directly either. The last one is the check that matters: the
+    # wrapped kubernetes chart's dashboard Role granted tenant groups get on
+    # this Secret until #4722.
+    - script:
+        timeout: 2m
+        content: |
+          set -eu
+          ns=tenant-cplane
+          secret=computeplane-cluster-admin-kubeconfig
+          as="--as=e2e-computeplane-probe --as-group=system:authenticated --as-group=${ns}-super-admin"
+          label=$(timeout -k 5 30 kubectl -n "$ns" get secret "$secret" -o jsonpath='{.metadata.labels.internal\.cozystack\.io/tenantresource}')
+          if [ "$label" = true ]; then
+            echo "$secret is labelled tenantresource=$label" >&2
+            exit 1
+          fi
+          # The list must succeed, so an empty answer is the API's and not a
+          # refused request.
+          listed=$(timeout -k 5 30 kubectl -n "$ns" get tenantsecrets.core.cozystack.io $as -o name)
+          echo "tenantsecrets visible to ${ns}-super-admin:"
+          printf '%s\n' "${listed:-<none>}"
+          if printf '%s\n' "$listed" | grep -Fqx "tenantsecret.core.cozystack.io/$secret"; then
+            echo "$secret is visible through tenantsecrets" >&2
+            exit 1
+          fi
+          # can-i exits 1 when it answers no, so the answer is read from its
+          # output; anything but a plain "no" fails, an error included.
+          answer=$(timeout -k 5 30 kubectl -n "$ns" auth can-i get "secret/$secret" $as 2>&1) || true
+          echo "can-i get secret/$secret as ${ns}-super-admin: $answer"
+          if [ "$answer" != no ]; then
+            echo "the tenant super-admin group can read $secret, or can-i did not answer: $answer" >&2
+            exit 1
+          fi
+        check:
+          ($error == null): true
+
+    # ingress-nginx needs a joined worker, so it is waited for first: 29m for
+    # the worker, the kubernetes suites' node-join deadline, plus room for the
+    # install that follows it. cert-manager also waits on the tenant cilium, so
+    # the worker join is not time it has had; its own budget clears its 10m
+    # install timeout.
+    - assert:
+        timeout: 35m
+        resource:
+          apiVersion: helm.toolkit.fluxcd.io/v2
+          kind: HelmRelease
+          metadata:
+            name: computeplane-cluster-ingress-nginx
+            namespace: tenant-cplane
+          status:
+            (conditions[?type == 'Ready']):
+            - status: "True"
+    - assert:
+        timeout: 12m
+        resource:
+          apiVersion: helm.toolkit.fluxcd.io/v2
+          kind: HelmRelease
+          metadata:
+            name: computeplane-cluster-cert-manager
+            namespace: tenant-cplane
+          status:
+            (conditions[?type == 'Ready']):
+            - status: "True"
+
+    # The Proxied Service selects the virt-launcher pod of a worker carrying
+    # the ingress-nginx role, so a ready endpoint says such a worker is running
+    # behind it. That the controller itself is up is the addon assert above.
+    # A script rather than an assert: matching "at least one ready endpoint"
+    # needs a JMESPath length or numeric literal, which v0.2.15 mis-evaluates.
+    - script:
+        timeout: 5m
+        content: |
+          set -eu
+          ns=tenant-cplane
+          timeout -k 5 30 kubectl -n "$ns" get service computeplane-cluster-ingress-nginx
+          deadline=$(( $(date +%s) + 180 ))
+          until [ -n "$(timeout -k 5 30 kubectl -n "$ns" get endpointslices -l kubernetes.io/service-name=computeplane-cluster-ingress-nginx -o jsonpath='{.items[*].endpoints[?(@.conditions.ready==true)].addresses[0]}')" ]; do
+            if [ "$(date +%s)" -ge "$deadline" ]; then
+              echo "computeplane-cluster-ingress-nginx has no ready endpoint" >&2
+              timeout -k 5 30 kubectl -n "$ns" get endpointslices -l kubernetes.io/service-name=computeplane-cluster-ingress-nginx -o yaml >&2
+              exit 1
+            fi
+            sleep 5
+          done
+        check:
+          ($error == null): true
+
+    # The cluster release sets timeout 30m, which is the floor here. On a
+    # passing run it is Ready long before this point.
+    - assert:
+        timeout: 32m
+        resource:
+          apiVersion: helm.toolkit.fluxcd.io/v2
+          kind: HelmRelease
+          metadata:
+            name: computeplane-cluster
+            namespace: tenant-cplane
+          status:
+            (conditions[?type == 'Ready']):
+            - status: "True"
+
+    - script:
+        timeout: 2m
+        content: |
+          set -eu
+          cd ../../..
+          . hack/e2e-chainsaw/_lib/remediation-guard.sh
+          for hr in computeplane computeplane-cluster; do
+            statuses=$(timeout -k 5 30 kubectl -n tenant-cplane get helmrelease "$hr" -o jsonpath="$HELMRELEASE_HISTORY_JSONPATH")
+            echo "$hr history statuses:"
+            printf '%s\n' "${statuses:-<empty>}"
+            if [ -z "$statuses" ]; then
+              echo "empty .status.history on a Ready HelmRelease $hr" >&2
+              exit 1
+            fi
+            if helmrelease_has_remediation_cycle "$statuses"; then
+              echo "$hr remediated during install" >&2
+              exit 1
+            fi
+          done
+        check:
+          ($error == null): true
+
+    catch:
+    - events:
+        namespace: tenant-cplane
+    - describe:
+        apiVersion: helm.toolkit.fluxcd.io/v2
+        kind: HelmRelease
+        namespace: tenant-cplane
+    - script:
+        timeout: 2m
+        content: |
+          set -u
+          ns=tenant-cplane
+          echo "If this failure is the worker join or an addon HelmRelease timing out:"
+          echo "the computeplane pool allowlist drops talos, so the worker cannot use the"
+          echo "in-sandbox Talos image cache and imports its disk from the public Image"
+          echo "Factory (cozystack/cozystack#4700). Worker image source:"
+          timeout 30 kubectl -n "$ns" get kubevirtmachinetemplates,datavolumes.cdi.kubevirt.io \
+            -o jsonpath='{range .items[*]}{.kind}/{.metadata.name}: {..http.url}{"\n"}{end}' 2>&1
+          timeout 30 kubectl -n "$ns" get datavolumes.cdi.kubevirt.io,machines.cluster.x-k8s.io,virtualmachineinstances.kubevirt.io -o wide 2>&1
+          timeout 30 kubectl -n "$ns" get helmrelease kubernetes-nodes-computeplane-cluster-md0 -o jsonpath='{.spec.values}{"\n"}' 2>&1
+          exit 0
+
+    # Turning the module off is the teardown under test: the module release
+    # goes, and its uninstall removes the cluster and pool releases together.
+    # The cluster's pre-delete hook deletes the in-cluster addon releases
+    # (step 2 of packages/apps/kubernetes/templates/delete.yaml) before it
+    # deletes the KamajiControlPlane (step 3), and that order is checked: no
+    # addon release may remain once the KamajiControlPlane is being deleted.
+    # Nothing in Kamaji or CAPI puts a finalizer on that object, so it is gone
+    # in the same call that deletes it and no poll could see the moment. The
+    # suite holds it with a finalizer of its own while the module goes, reads
+    # the addons once it is marked for deletion, and lets it go.
+    # The pool's workers go at the same time as the hook runs, so no order is
+    # checked for them, only that nothing is left. Chainsaw then deletes the
+    # Tenant.
+    finally:
+    - script:
+        # Inner bounds, in order: Tenant read 1m, hold 1m, patch 1m, order loop
+        # 12m plus up to 1m for the read in flight at its deadline, release 1m,
+        # module 10m, cluster 5m, pool 2m, addon list 30s, addons 2m, control
+        # plane 2m, Secret 1m, each of those six waits plus 15s, drain 5m plus
+        # 1m, LINSTOR about 8m (a 5m deadline for starting a probe, and up to
+        # five reads of 35s each in the probe in flight), and the release again
+        # on exit 1m = about 56m.
+        timeout: 58m
+        content: |
+          set -eu
+          cd ../../..
+          . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+          ns=tenant-cplane
+          failed=0
+          if ! tenant=$(timeout 60 kubectl -n tenant-root get tenants.apps.cozystack.io cplane --ignore-not-found -o name); then
+            echo "» ERROR: could not read Tenant cplane" >&2
+            exit 1
+          fi
+          if [ -z "$tenant" ]; then
+            echo "» Tenant cplane was never created; nothing to tear down"
+            exit 0
+          fi
+          . hack/e2e-chainsaw/computeplane/kcp-hold.sh
+          hold=$kcp_hold_finalizer
+          # A held KamajiControlPlane would wedge the rest of the teardown. The
+          # trap releases it on every exit this shell sees; the operation after
+          # this one releases it when the shell was killed instead.
+          trap 'kcp_release || echo "» ERROR: could not release the $hold finalizer on $kcp_ref" >&2' EXIT
+          held=0
+          if kcp_hold; then
+            held=1
+          else
+            case $? in
+              2) echo "» no KamajiControlPlane when teardown started; teardown order not observed" ;;
+              *) echo "» ERROR: could not hold the KamajiControlPlane; teardown order unchecked" >&2
+                 failed=1 ;;
+            esac
+          fi
+          if ! timeout 60 kubectl -n tenant-root patch tenants.apps.cozystack.io cplane \
+              --type merge --patch '{"spec":{"computeplane":false}}'; then
+            echo "» ERROR: could not turn the computeplane module off" >&2
+            exit 1
+          fi
+          # kubectl's --timeout bounds only the wait itself, not the requests
+          # before it, so the outer timeout is what holds against a hung
+          # apiserver.
+          gone() { # <seconds> <args...>
+            _t=$1; shift
+            if ! timeout -k 5 $(( _t + 10 )) kubectl -n "$ns" wait --for=delete "$@" --timeout="${_t}s"; then
+              echo "» ERROR: $* not confirmed gone within ${_t}s" >&2
+              failed=1
+            fi
+          }
+          addons_listed() {
+            timeout 30 kubectl -n "$ns" get helmrelease -l cozystack.io/target-cluster-name=computeplane-cluster -o name
+          }
+          if [ "$held" = 1 ]; then
+            deadline=$(( $(date +%s) + 720 ))
+            while :; do
+              if ! deleting=$(timeout 30 kubectl -n "$ns" get "$kcp_ref" -o jsonpath='{.metadata.deletionTimestamp}'); then
+                echo "» ERROR: could not read the held KamajiControlPlane; teardown order unchecked" >&2
+                failed=1
+                break
+              fi
+              if [ -n "$deleting" ]; then
+                # Marked for deletion: the hook is past step 2.
+                if ! left=$(addons_listed); then
+                  echo "» ERROR: could not list the in-cluster addon releases; teardown order unchecked" >&2
+                  failed=1
+                elif [ -n "$left" ]; then
+                  echo "» ERROR: the KamajiControlPlane is being deleted while in-cluster addon releases remain:" >&2
+                  printf '%s\n' "$left" >&2
+                  failed=1
+                else
+                  echo "» in-cluster addon releases were gone before the KamajiControlPlane was deleted"
+                fi
+                break
+              fi
+              if [ "$(date +%s)" -ge "$deadline" ]; then
+                echo "» ERROR: the KamajiControlPlane was not deleted within 720s of turning the module off" >&2
+                failed=1
+                break
+              fi
+              sleep 2
+            done
+            if ! kcp_release; then
+              echo "» ERROR: could not release the $hold finalizer on $kcp_ref" >&2
+              failed=1
+            fi
+          fi
+          gone 600 helmrelease/computeplane
+          gone 300 helmrelease/computeplane-cluster
+          gone 120 helmrelease/kubernetes-nodes-computeplane-cluster-md0
+          if addons=$(addons_listed); then
+            if [ -n "$addons" ]; then gone 120 $addons; fi
+          else
+            echo "» ERROR: could not list the in-cluster addon releases" >&2
+            failed=1
+          fi
+          gone 120 kamajicontrolplanes.controlplane.cluster.x-k8s.io/computeplane-cluster
+          # Owned by the TenantControlPlane, so a control plane stuck on its
+          # finalizer (#4489) keeps it too. An admin kubeconfig that outlives
+          # teardown is a leak in its own right, so this stays red then.
+          gone 60 secret/computeplane-cluster-admin-kubeconfig
+          deadline=$(( $(date +%s) + 300 ))
+          while :; do
+            left=$( {
+              timeout 30 kubectl -n "$ns" get virtualmachines.kubevirt.io,virtualmachineinstances.kubevirt.io \
+                -l cluster.x-k8s.io/cluster-name=computeplane-cluster -o name ||
+                echo "could not list the worker VMs and VMIs"
+              if pvcs=$(timeout 30 kubectl -n "$ns" get pvc -o name); then
+                printf '%s\n' "$pvcs" | grep -F computeplane-cluster-md0 || true
+              else
+                echo "could not list the PVCs"
+              fi
+            } 2>&1 )
+            [ -z "$left" ] && break
+            if [ "$(date +%s)" -ge "$deadline" ]; then
+              echo "» ERROR: worker compute or storage did not drain within 300s:" >&2
+              printf '%s\n' "$left" >&2
+              failed=1
+              break
+            fi
+            sleep 5
+          done
+          # The baseline is the first op of try, and the Tenant is applied
+          # only after it, so a run that reaches this point has one.
+          if ! COZY_LINSTOR_POOL_BASELINE_FILE=_out/e2e-computeplane-linstor-pool-baseline \
+              cozy_wait_linstor_pool_baseline 300; then
+            failed=1
+          fi
+          exit "$failed"
+    # The op above can be SIGKILLed at its ceiling (chainsaw cancels a script
+    # with Process.Kill, so its EXIT trap never runs) while it still holds
+    # the KamajiControlPlane. Releasing it here, in an operation of its own,
+    # keeps that from leaving the object and the tenant namespace stuck.
+    - script:
+        timeout: 2m
+        content: |
+          set -eu
+          cd ../../..
+          . hack/e2e-chainsaw/computeplane/kcp-hold.sh
+          if kcp_release; then
+            echo "» $kcp_hold_finalizer is not on $kcp_ref"
+          else
+            echo "» ERROR: could not release the $kcp_hold_finalizer finalizer on $kcp_ref" >&2
+            exit 1
+          fi
diff --git a/hack/e2e-chainsaw/computeplane/kcp-hold.sh b/hack/e2e-chainsaw/computeplane/kcp-hold.sh
new file mode 100644
index 0000000000..690d7517c3
--- /dev/null
+++ b/hack/e2e-chainsaw/computeplane/kcp-hold.sh
@@ -0,0 +1,39 @@
+# shellcheck shell=sh
+# The finalizer the computeplane teardown holds the KamajiControlPlane with,
+# sourced by the teardown script that takes it and by the separate operation
+# that releases it.
+#
+# The release tests that the entry it removes is still this suite's. The hold
+# tests the finalizer list it extends when there is one; with none it creates
+# the list untested, on an object that nothing else puts finalizers on.
+
+kcp_ns=tenant-cplane
+kcp_ref=kamajicontrolplanes.controlplane.cluster.x-k8s.io/computeplane-cluster
+kcp_hold_finalizer=e2e.cozystack.io/teardown-order
+
+# Returns 2 when there is no KamajiControlPlane to hold.
+kcp_hold() {
+  _cur=$(timeout 30 kubectl -n "$kcp_ns" get "$kcp_ref" --ignore-not-found -o json) || return 1
+  [ -n "$_cur" ] || return 2
+  _patch=$(printf '%s' "$_cur" | jq -c --arg h "$kcp_hold_finalizer" '
+    if .metadata.finalizers == null
+    then [{"op":"add","path":"/metadata/finalizers","value":[$h]}]
+    else [{"op":"test","path":"/metadata/finalizers","value":.metadata.finalizers},
+          {"op":"add","path":"/metadata/finalizers/-","value":$h}] end') || return 1
+  timeout 30 kubectl -n "$kcp_ns" patch "$kcp_ref" --type json --patch "$_patch" >/dev/null
+}
+
+# Succeeds when the finalizer is gone afterwards, which includes the object
+# being gone and the finalizer never having been there.
+kcp_release() {
+  _cur=$(timeout 30 kubectl -n "$kcp_ns" get "$kcp_ref" --ignore-not-found -o json) || return 1
+  [ -n "$_cur" ] || return 0
+  _patch=$(printf '%s' "$_cur" | jq -c --arg h "$kcp_hold_finalizer" '
+    ((.metadata.finalizers // []) | index($h)) as $i
+    | if $i == null then empty
+      else [{"op":"test","path":"/metadata/finalizers/\($i)","value":$h},
+            {"op":"remove","path":"/metadata/finalizers/\($i)"}] end') || return 1
+  [ -n "$_patch" ] || return 0
+  timeout 30 kubectl -n "$kcp_ns" patch "$kcp_ref" --type json --patch "$_patch" >/dev/null || return 1
+  echo "» released $kcp_hold_finalizer on $kcp_ref"
+}
diff --git a/hack/e2e-chainsaw/etcd/chainsaw-test.yaml b/hack/e2e-chainsaw/etcd/chainsaw-test.yaml
new file mode 100644
index 0000000000..2a3f23f913
--- /dev/null
+++ b/hack/e2e-chainsaw/etcd/chainsaw-test.yaml
@@ -0,0 +1,339 @@
+# Chainsaw port of hack/e2e-apps/etcd.bats (v1alpha2 etcd-operator era).
+# Two scenarios as separate Tests:
+#   etcd-1-contracts       — install + the operator runtime contracts the chart
+#                            depends on but the operator owns
+#   etcd-2-backup-roundtrip — S3 backup/restore round-trip, gated out of CI
+#                            (opt in with ETCD_E2E_S3_ROUNDTRIP=1)
+#
+# The etcd chart pins the Helm release name to 'etcd'
+# (packages/extra/etcd/templates/check-release-name.yaml), so every scenario
+# applies an Etcd with metadata.name: etcd and they share the cluster-scoped
+# DataStore/<namespace> the chart provisions for Kamaji. They therefore cannot
+# coexist and must run one fully-drained scenario at a time.
+#
+# Teardown is explicit (skipDelete: true), not Chainsaw auto-cleanup, because
+# the etcd chart's DataStore leaks a Kamaji finalizer on uninstall: once the
+# backing etcd is gone, the reconcile that would drop
+# kamaji.clastix.io/TenantControlPlane can't complete, so the DataStore wedges
+# in Terminating and the HelmRelease uninstall hangs. Letting Chainsaw wait on
+# that during cleanup is what errored every etcd case in CI.
+#
+# Each scenario is self-contained (clean-after-each): a single `run` step
+# pre-cleans any leftover etcd + backup artifacts, installs, asserts, and then
+# drains in a `finally` that always runs (the step is always reached, so
+# teardown fires on success and on failure alike). This is deliberate: with
+# skipDelete: true opting out of Chainsaw's auto-cleanup and `finally` having no
+# test-level form in v0.2.15, nothing reclaims a scenario unless the scenario
+# reclaims itself. That is true of whichever Test runs last as much as the
+# first, so the teardown does not depend on the order Chainsaw runs them in.
+# The shared drain lives in _lib/etcd-cleanup.sh.
+apiVersion: chainsaw.kyverno.io/v1alpha1
+kind: Test
+metadata:
+  name: etcd-1-contracts
+spec:
+  # Teardown is the `run` step's finally (see file header), not auto-cleanup.
+  skipDelete: true
+  catch:
+  - events: {}
+  - describe:
+      apiVersion: helm.toolkit.fluxcd.io/v2
+      kind: HelmRelease
+      name: etcd
+  - describe:
+      apiVersion: etcd-operator.cozystack.io/v1alpha2
+      kind: EtcdCluster
+      name: etcd
+  - describe:
+      apiVersion: etcd-operator.cozystack.io/v1alpha2
+      kind: EtcdMember
+  - podLogs:
+      namespace: cozy-etcd-operator
+      selector: app.kubernetes.io/name=etcd-operator
+      tail: 100
+  steps:
+  - name: run
+    try:
+    # Pre-clean: isolate this scenario from any etcd (or aborted backup
+    # round-trip) a prior failed run left behind — the release name 'etcd' is
+    # a singleton and cleanup.sh resumes a suspended HR before deleting.
+    - script:
+        timeout: 6m
+        content: |
+          set -eu
+          cd ../../..
+          . hack/e2e-chainsaw/_lib/etcd-cleanup.sh
+          etcd_backup_cleanup
+          etcd_cleanup
+        check:
+          ($error == null): true
+    - apply:
+        file: etcd-basic.yaml
+    # 11m: above the 600s install timeout cozystack-api gives this release;
+    # see "Sizing an HR-Ready budget" in docs/agents/e2e-testing.md.
+    - assert:
+        timeout: 11m
+        resource:
+          apiVersion: helm.toolkit.fluxcd.io/v2
+          kind: HelmRelease
+          metadata:
+            name: etcd
+          status:
+            (conditions[?type == 'Ready']):
+            - status: "True"
+    # Gate on FULL rollout, not mere discovery. The v1alpha2 operator flips
+    # Available=True early (reason ClusterDiscovered) the instant the single
+    # seed member forms the cluster, then scales the remaining members up one
+    # at a time. Gating on Available=True therefore races the replica-count
+    # contracts below and sees only 1/3 Pods. status.readyMembers counts the
+    # members whose EtcdMember Ready condition is True (and feeds the /scale
+    # subresource), so it only reaches 3 once every member Pod is Running and
+    # serving — the correct precondition for every contract asserted below.
+    - assert:
+        timeout: 5m
+        resource:
+          apiVersion: etcd-operator.cozystack.io/v1alpha2
+          kind: EtcdCluster
+          metadata:
+            name: etcd
+          status:
+            readyMembers: 3
+    # --- Runtime contracts the chart depends on but the operator owns. Each
+    # is a silent failure if a future operator bump changes it, so assert
+    # against the LIVE cluster (not the manifests). ---
+    #
+    # podscrape.yaml + the WorkloadMonitor in etcd-cluster.yaml select member
+    # Pods by app.kubernetes.io/{name=etcd,instance=etcd,managed-by=etcd-operator};
+    # vpa.yaml pins containerPolicies[].containerName=etcd; the VMPodScrape
+    # scrapes the container port named 'metrics'. If the operator labels or
+    # names anything differently, metrics scraping, the VPA bounds and the
+    # dashboard replica count silently break. The member COUNT is carried by
+    # readyMembers=3 above plus the WorkloadMonitor availableReplicas=3 below
+    # (same selector); this assert pins the member Pod shape.
+    - assert:
+        timeout: 3m
+        resource:
+          apiVersion: v1
+          kind: Pod
+          metadata:
+            labels:
+              app.kubernetes.io/name: etcd
+              app.kubernetes.io/instance: etcd
+              app.kubernetes.io/managed-by: etcd-operator
+          spec:
+            (containers[0].name): etcd
+            # Filter-as-list: exactly one container port named 'metrics'.
+            (containers[0].ports[?name == 'metrics']):
+            - protocol: TCP
+          status:
+            phase: Running
+    # The WorkloadMonitor (etcd-cluster.yaml) selects member Pods by the same
+    # operator-set labels and drives the app's dashboard health indicator.
+    # Assert the controller actually matched them and flipped operational — a
+    # label mismatch leaves it operational=false / wrong replica count.
+    - assert:
+        timeout: 3m
+        resource:
+          apiVersion: cozystack.io/v1alpha1
+          kind: WorkloadMonitor
+          metadata:
+            name: etcd
+          status:
+            operational: true
+            availableReplicas: 3
+    # vpa.yaml drives the EtcdCluster through its scale subresource; if the
+    # CRD stops exposing /scale the VPA target silently fails to resolve.
+    # Subresources are not assertable declaratively, hence the script.
+    - script:
+        timeout: 1m
+        content: |
+          set -eu
+          r=$(kubectl -n "$NAMESPACE" get etcdcluster.etcd-operator.cozystack.io etcd \
+            --subresource=scale -o jsonpath='{.spec.replicas}')
+          [ "$r" = "3" ] || { echo "/scale reported replicas='$r' (want 3)" >&2; exit 1; }
+        check:
+          ($error == null): true
+    # podscrape.yaml (VMPodScrape) scrapes the port named 'metrics' over http
+    # on the member Pods. Assert it actually serves metrics on plaintext http
+    # (etcd 3.6 can be made to serve metrics on the TLS client port, which
+    # would silently yield empty dashboards). Probe the Pod IP directly — the
+    # scrape targets Pods, and the client Service is headless and does not
+    # publish the metrics port.
+    - script:
+        timeout: 3m
+        content: |
+          set -eu
+          cd ../../..
+          . hack/e2e-chainsaw/_lib/etcd-probe.sh
+          sel='app.kubernetes.io/name=etcd,app.kubernetes.io/instance=etcd,app.kubernetes.io/managed-by=etcd-operator'
+          mport=$(kubectl -n "$NAMESPACE" get pods -l "$sel" \
+            --field-selector=status.phase=Running \
+            -o jsonpath='{.items[0].spec.containers[0].ports[?(@.name=="metrics")].containerPort}')
+          pod_ip=$(kubectl -n "$NAMESPACE" get pods -l "$sel" \
+            --field-selector=status.phase=Running \
+            -o jsonpath='{.items[0].status.podIP}')
+          [ -n "$mport" ] || { echo "no container port named 'metrics' on member Pod (VMPodScrape would scrape nothing)" >&2; exit 1; }
+          [ -n "$pod_ip" ] || { echo "no running member Pod IP found for metrics probe" >&2; exit 1; }
+          # This delete must wait for the Pod to be gone, for two reasons:
+          # `kubectl run` below would otherwise race a still-terminating Pod of
+          # the same name, and the log re-read would have a previous
+          # incarnation's marker to find. Do not give this one --wait=false.
+          kubectl -n "$NAMESPACE" delete pod etcd-metrics-probe --ignore-not-found >/dev/null 2>&1
+          # No --rm: it deletes the Pod the instant the container exits, taking
+          # with it the log that etcd_probe_resolve re-reads when --attach loses
+          # the stream of a container that finished before the attach connection
+          # was up. Deleted explicitly below once the result is in hand.
+          #
+          # --pod-running-timeout is set rather than left at kubectl's 1m default
+          # because curlimages/curl is not otherwise used on these nodes, so the
+          # probe pays a cold pull; a pull that outruns the budget yields no
+          # marker and fails the step exactly as a broken endpoint would.
+          attach_out=$(kubectl -n "$NAMESPACE" run etcd-metrics-probe --restart=Never --attach \
+            --pod-running-timeout=90s \
+            --image=curlimages/curl:8.10.1 \
+            --overrides="{\"spec\":{\"securityContext\":{\"runAsNonRoot\":true,\"runAsUser\":1000,\"seccompProfile\":{\"type\":\"RuntimeDefault\"}},\"containers\":[{\"name\":\"c\",\"image\":\"curlimages/curl:8.10.1\",\"command\":[\"sh\",\"-c\",\"curl -fsS -o /dev/null -w code=%{http_code} http://${pod_ip}:${mport}/metrics\"],\"securityContext\":{\"allowPrivilegeEscalation\":false,\"capabilities\":{\"drop\":[\"ALL\"]}}}]}}" 2>&1) || true
+          probe_out=$(etcd_probe_resolve "$attach_out" \
+            kubectl -n "$NAMESPACE" logs etcd-metrics-probe)
+          # Fire-and-forget: the result is already captured, so nothing depends
+          # on the Pod actually being gone before the check below runs. `|| true`
+          # because the step does depend on this command's exit status otherwise
+          # -- under `set -e` a transient API error here would abort with the
+          # result in hand but unreported, and with stderr already suppressed.
+          kubectl -n "$NAMESPACE" delete pod etcd-metrics-probe \
+            --ignore-not-found --wait=false >/dev/null 2>&1 || true
+          echo "$probe_out" | grep -q "code=200" || { echo "metrics endpoint did not return 200 over http on the 'metrics' port; got: $probe_out" >&2; exit 1; }
+        check:
+          ($error == null): true
+    # etcd-defrag.yaml's hourly CronJob targets the client Service
+    # https://etcd.<ns>.svc:2379 with --cluster + the etcd-client-tls cert.
+    # Run it on demand: a clean completion proves the Service name resolves to
+    # every member and the client cert authenticates (the whole defrag
+    # contract). It fails forever and silently if the operator names the
+    # Service differently.
+    - script:
+        timeout: 1m
+        content: |
+          set -eu
+          kubectl -n "$NAMESPACE" delete job etcd-defrag-e2e --ignore-not-found
+          kubectl -n "$NAMESPACE" create job etcd-defrag-e2e --from=cronjob/etcd-defrag
+        check:
+          ($error == null): true
+    - assert:
+        timeout: 3m
+        resource:
+          apiVersion: batch/v1
+          kind: Job
+          metadata:
+            name: etcd-defrag-e2e
+          status:
+            (conditions[?type == 'Complete']):
+            - status: "True"
+    - delete:
+        ref:
+          apiVersion: batch/v1
+          kind: Job
+          name: etcd-defrag-e2e
+    finally:
+    - description: drain etcd + leaked Kamaji DataStore finalizer (clean-after-each)
+      script:
+        timeout: 5m
+        content: |
+          set -eu
+          cd ../../..
+          . hack/e2e-chainsaw/_lib/etcd-cleanup.sh
+          etcd_cleanup
+---
+# Full backup -> EtcdSnapshot -> in-place RestoreJob round-trip against the
+# v1alpha2 operator, driving the validated example scripts
+# (examples/backups/etcd) as the harness so the test and the documented flow
+# can never drift. The scripts run 01 strategy -> 02 bucket+BackupClass ->
+# 03 source Etcd + sentinel write -> 04 BackupJob (waits Succeeded) ->
+# 05 mutate sentinel + RestoreJob (waits Succeeded) and assert the sentinel
+# reverts to its pre-mutation value — the in-cluster witness that the snapshot
+# round-tripped through S3.
+#
+# GATED OUT OF CI (opt in with ETCD_E2E_S3_ROUNDTRIP=1). The etcd S3 backup
+# path cannot succeed in the kind e2e environment with etcd-operator v0.5.2:
+#   - step 02 bakes the bucket's EXTERNAL ingress endpoint into the
+#     BackupClass; in CI that is the s3.example.org placeholder, which the
+#     in-cluster snapshot Job can neither route to nor TLS-validate;
+#   - the in-cluster seaweedfs-s3.<ns>.svc:8333 endpoint serves HTTPS with a
+#     self-signed cert, and the operator's snapshot agent (AWS SDK v2)
+#     verifies against the image's system trust store — the EtcdSnapshot CRD
+#     exposes no InsecureSkipVerify / CA-mount surface, and there is no
+#     plaintext-http S3 port — so it cannot trust that cert;
+#   - the strategy driver intentionally forbids a PVC destination
+#     (api/backups/strategy/v1alpha1/etcd_types.go, CEL has(self.s3)), so
+#     there is no in-cluster no-TLS fallback either.
+# The round-trip therefore only works against a publicly-trusted S3 endpoint
+# (a real cluster). Chainsaw v0.2.15 has no conditional Test-level skip, so
+# the gate is a plain in-script conditional that exits 0 in CI with the skip
+# reason in the log — the same file runs un-gated on a real cluster with just
+# the env var set.
+apiVersion: chainsaw.kyverno.io/v1alpha1
+kind: Test
+metadata:
+  name: etcd-2-backup-roundtrip
+spec:
+  skipDelete: true
+  catch:
+  - events: {}
+  - describe:
+      apiVersion: helm.toolkit.fluxcd.io/v2
+      kind: HelmRelease
+      name: etcd
+  - describe:
+      apiVersion: etcd-operator.cozystack.io/v1alpha2
+      kind: EtcdCluster
+      name: etcd
+  - describe:
+      apiVersion: backups.cozystack.io/v1alpha1
+      kind: BackupJob
+  - describe:
+      apiVersion: etcd-operator.cozystack.io/v1alpha2
+      kind: EtcdSnapshot
+  # The snapshot agent runs in its OWN Job Pod (the operator labels it with
+  # etcd-operator.cozystack.io/cluster=<cluster>); a wedged etcd read or S3
+  # upload leaves its error ONLY in that Pod's log and the statuses above.
+  - podLogs:
+      selector: etcd-operator.cozystack.io/cluster=etcd
+      tail: 200
+  - podLogs:
+      namespace: cozy-etcd-operator
+      selector: app.kubernetes.io/name=etcd-operator
+      tail: 100
+  steps:
+  - name: run
+    try:
+    # 03 re-applies the singleton Etcd 'etcd' in place, reusing (or recreating
+    # after the contracts drain) the cluster; run-all.sh is `set -e` so any
+    # step failing fails the test. NAMESPACE is the e2e tenant namespace.
+    - script:
+        timeout: 20m
+        content: |
+          set -eu
+          if [ "${ETCD_E2E_S3_ROUNDTRIP:-0}" != "1" ]; then
+            echo "# S3 backup/restore round-trip gated out of CI: no publicly-trusted"
+            echo "# S3 endpoint in kind (see comment in this file). Set"
+            echo "# ETCD_E2E_S3_ROUNDTRIP=1 on a real cluster to run it."
+            exit 0
+          fi
+          cd ../../..
+          [ -x examples/backups/etcd/run-all.sh ] || { echo "etcd backup example scripts not found at examples/backups/etcd" >&2; exit 1; }
+          NAMESPACE="$NAMESPACE" examples/backups/etcd/run-all.sh
+        check:
+          ($error == null): true
+    finally:
+    # Clean up the backup-flow resources (idempotent — a no-op when the
+    # round-trip was gated out), then drain etcd, its retained data PVCs and
+    # the Kamaji DataStore. Both have teeth: a teardown that does not settle
+    # fails the step instead of leaking into later app tests.
+    - description: backup cleanup + drain (clean-after-each)
+      script:
+        timeout: 8m
+        content: |
+          set -eu
+          cd ../../..
+          . hack/e2e-chainsaw/_lib/etcd-cleanup.sh
+          etcd_backup_cleanup
+          etcd_cleanup
diff --git a/hack/e2e-chainsaw/etcd/etcd-basic.yaml b/hack/e2e-chainsaw/etcd/etcd-basic.yaml
new file mode 100644
index 0000000000..99cf0a9058
--- /dev/null
+++ b/hack/e2e-chainsaw/etcd/etcd-basic.yaml
@@ -0,0 +1,11 @@
+apiVersion: apps.cozystack.io/v1alpha1
+kind: Etcd
+metadata:
+  name: etcd
+spec:
+  size: 1Gi
+  replicas: 3
+  storageClass: ""
+  resources:
+    cpu: 100m
+    memory: 128Mi
diff --git a/hack/e2e-chainsaw/external-dns/chainsaw-test.yaml b/hack/e2e-chainsaw/external-dns/chainsaw-test.yaml
new file mode 100644
index 0000000000..c3b04f7f26
--- /dev/null
+++ b/hack/e2e-chainsaw/external-dns/chainsaw-test.yaml
@@ -0,0 +1,114 @@
+# Chainsaw port of hack/e2e-apps/external-dns.bats. Two scenarios, each a
+# separate Test: the inmemory provider, and a custom annotationPrefix. The
+# externaldns chart names its HelmReleases after the CR directly (<name> and
+# <name>-system), not with an app-type prefix.
+apiVersion: chainsaw.kyverno.io/v1alpha1
+kind: Test
+metadata:
+  name: external-dns-inmemory
+spec:
+  catch:
+  - events: {}
+  - describe:
+      apiVersion: helm.toolkit.fluxcd.io/v2
+      kind: HelmRelease
+      name: test-system
+  - podLogs:
+      selector: app.kubernetes.io/instance=test-system
+      tail: 50
+  steps:
+  - name: create-externaldns
+    try:
+    - apply:
+        file: externaldns-inmemory.yaml
+  - name: wait-ready
+    try:
+    # 11m: above the 600s install timeout cozystack-api gives this release;
+    # see "Sizing an HR-Ready budget" in docs/agents/e2e-testing.md.
+    - assert:
+        timeout: 11m
+        resource:
+          apiVersion: helm.toolkit.fluxcd.io/v2
+          kind: HelmRelease
+          metadata:
+            name: test
+          status:
+            (conditions[?type == 'Ready']):
+            - status: "True"
+    # 11m: above the 10m spec.timeout that
+    # packages/extra/external-dns/templates/external-dns.yaml gives this release;
+    # see "Sizing an HR-Ready budget" in docs/agents/e2e-testing.md.
+    - assert:
+        timeout: 11m
+        resource:
+          apiVersion: helm.toolkit.fluxcd.io/v2
+          kind: HelmRelease
+          metadata:
+            name: test-system
+          status:
+            (conditions[?type == 'Ready']):
+            - status: "True"
+    - assert:
+        timeout: 2m
+        resource:
+          apiVersion: apps/v1
+          kind: Deployment
+          # Readiness is covered by the test-system HelmRelease above, so this only
+          # checks the Deployment carries the nested release's instance label.
+          metadata:
+            labels:
+              app.kubernetes.io/instance: test-system
+---
+apiVersion: chainsaw.kyverno.io/v1alpha1
+kind: Test
+metadata:
+  name: external-dns-prefix
+spec:
+  catch:
+  - events: {}
+  - describe:
+      apiVersion: helm.toolkit.fluxcd.io/v2
+      kind: HelmRelease
+      name: test-prefix-system
+  - podLogs:
+      selector: app.kubernetes.io/instance=test-prefix-system
+      tail: 50
+  steps:
+  - name: create-externaldns
+    try:
+    - apply:
+        file: externaldns-prefix.yaml
+  - name: wait-ready
+    try:
+    # Same 11m as `test` above.
+    - assert:
+        timeout: 11m
+        resource:
+          apiVersion: helm.toolkit.fluxcd.io/v2
+          kind: HelmRelease
+          metadata:
+            name: test-prefix
+          status:
+            (conditions[?type == 'Ready']):
+            - status: "True"
+    # Same 11m as `test-system` above.
+    - assert:
+        timeout: 11m
+        resource:
+          apiVersion: helm.toolkit.fluxcd.io/v2
+          kind: HelmRelease
+          metadata:
+            name: test-prefix-system
+          status:
+            (conditions[?type == 'Ready']):
+            - status: "True"
+    - assert:
+        timeout: 2m
+        resource:
+          apiVersion: apps/v1
+          kind: Deployment
+          # Readiness is covered by the test-prefix-system HelmRelease above, so this
+          # only checks the Deployment carries the nested release's instance label.
+          metadata:
+            labels:
+              app.kubernetes.io/instance: test-prefix-system
diff --git a/hack/e2e-chainsaw/external-dns/externaldns-inmemory.yaml b/hack/e2e-chainsaw/external-dns/externaldns-inmemory.yaml
new file mode 100644
index 0000000000..7ab4e3752b
--- /dev/null
+++ b/hack/e2e-chainsaw/external-dns/externaldns-inmemory.yaml
@@ -0,0 +1,8 @@
+apiVersion: apps.cozystack.io/v1alpha1
+kind: ExternalDNS
+metadata:
+  name: test
+spec:
+  provider: inmemory
+  domainFilters:
+    - example.com
diff --git a/hack/e2e-chainsaw/external-dns/externaldns-prefix.yaml b/hack/e2e-chainsaw/external-dns/externaldns-prefix.yaml
new file mode 100644
index 0000000000..f86699cc8b
--- /dev/null
+++ b/hack/e2e-chainsaw/external-dns/externaldns-prefix.yaml
@@ -0,0 +1,9 @@
+apiVersion: apps.cozystack.io/v1alpha1
+kind: ExternalDNS
+metadata:
+  name: test-prefix
+spec:
+  provider: inmemory
+  annotationPrefix: custom-dns/
+  domainFilters:
+    - example.org
diff --git a/hack/e2e-chainsaw/foundationdb/chainsaw-test.yaml b/hack/e2e-chainsaw/foundationdb/chainsaw-test.yaml
new file mode 100644
index 0000000000..3902d1632a
--- /dev/null
+++ b/hack/e2e-chainsaw/foundationdb/chainsaw-test.yaml
@@ -0,0 +1,234 @@
+# Chainsaw port of hack/e2e-apps/foundationdb.bats ("Create DB FoundationDB").
+#
+# The dense block of `until kubectl get ... jsonpath | grep` status probes
+# collapses into one assert on the FoundationDBCluster status tree. Pod-count
+# (by process class + phase) and PVC-size checks stay as polling scripts —
+# they count List results, which an assert cannot express.
+apiVersion: chainsaw.kyverno.io/v1alpha1
+kind: Test
+metadata:
+  name: foundationdb
+spec:
+  catch:
+  - events: {}
+  - describe:
+      apiVersion: helm.toolkit.fluxcd.io/v2
+      kind: HelmRelease
+      name: foundationdb-test
+  - describe:
+      apiVersion: apps.foundationdb.org/v1beta2
+      kind: FoundationDBCluster
+      name: foundationdb-test
+  - podLogs:
+      selector: foundationdb.org/fdb-cluster-name=foundationdb-test
+      tail: 50
+  steps:
+  - name: create-foundationdb
+    try:
+    - apply:
+        file: foundationdb.yaml
+
+  - name: wait-helmrelease-ready
+    try:
+    # 11m: above the 600s install timeout cozystack-api gives this release;
+    # see "Sizing an HR-Ready budget" in docs/agents/e2e-testing.md.
+    - assert:
+        timeout: 11m
+        resource:
+          apiVersion: helm.toolkit.fluxcd.io/v2
+          kind: HelmRelease
+          metadata:
+            name: foundationdb-test
+          status:
+            (conditions[?type == 'Ready']):
+            - status: "True"
+
+  - name: assert-cluster-status
+    try:
+    - assert:
+        timeout: 5m
+        resource:
+          apiVersion: apps.foundationdb.org/v1beta2
+          kind: FoundationDBCluster
+          metadata:
+            name: foundationdb-test
+          status:
+            configured: true
+            hasListenIPsForAllPods: true
+            databaseConfiguration:
+              logs: 3
+              proxies: 3
+              redundancy_mode: double
+              resolvers: 1
+              storage_engine: ssd-2
+              usable_regions: 1
+            health:
+              available: true
+              fullReplication: true
+    # volumeClaimTemplate size is pinned on the CR spec.
+    - assert:
+        resource:
+          apiVersion: apps.foundationdb.org/v1beta2
+          kind: FoundationDBCluster
+          metadata:
+            name: foundationdb-test
+          spec:
+            processes:
+              general:
+                volumeClaimTemplate:
+                  spec:
+                    resources:
+                      requests:
+                        storage: 1Gi
+
+  - name: verify-processes-and-security-context
+    try:
+    - script:
+        # Three sequential inner deadlines -- 240s for the process counts, then
+        # 120s for connectionString and 120s for generations.reconciled -- sum to
+        # 480s. Pre-existing overrun, found by applying the same .chainsaw.yaml
+        # rule to the step next door: at 5m the op fired first and took the whole
+        # script out by SIGKILL, so a slow-but-recovering cluster reported
+        # `signal: killed` instead of naming the stage that was still waiting.
+        timeout: 9m
+        content: |
+          set -eu
+          ns="$NAMESPACE"
+          cl=foundationdb-test
+          sel="foundationdb.org/fdb-cluster-name=$cl"
+          count_running() {
+            kubectl -n "$ns" get pods -l "$sel,foundationdb.org/fdb-process-class=$1" \
+              --field-selector=status.phase=Running --no-headers 2>/dev/null | wc -l
+          }
+          deadline=$(( $(date +%s) + 240 ))
+          while [ "$(date +%s)" -lt "$deadline" ]; do
+            s=$(count_running storage); l=$(count_running log); c=$(count_running cluster_controller)
+            echo "storage=$s log=$l cluster_controller=$c"
+            if [ "$s" -eq 3 ] && [ "$l" -ge 1 ] && [ "$c" -eq 1 ]; then break; fi
+            sleep 10
+          done
+          test "$(count_running storage)" -eq 3
+          test "$(count_running log)" -ge 1
+          test "$(count_running cluster_controller)" -eq 1
+          # securityContext: storage pod must run as the non-root 4059 uid/gid.
+          pod=$(kubectl -n "$ns" get pods -l "$sel,foundationdb.org/fdb-process-class=storage" \
+            --no-headers | head -n1 | awk '{print $1}')
+          kubectl -n "$ns" get pod "$pod" -o jsonpath='{.spec.containers[0].securityContext.runAsUser}' | grep -qx 4059
+          kubectl -n "$ns" get pod "$pod" -o jsonpath='{.spec.containers[0].securityContext.runAsGroup}' | grep -qx 4059
+          # Status fields that are nil early on (so they live here, not in the
+          # assert, where contains()/numeric-compare on nil hard-errors).
+          fdb() { kubectl -n "$ns" get foundationdbclusters.apps.foundationdb.org "$cl" -o jsonpath="$1"; }
+          deadline=$(( $(date +%s) + 120 ))
+          until fdb '{.status.connectionString}' | grep -qE '@.*\.svc\.cozy\.local'; do
+            [ "$(date +%s)" -ge "$deadline" ] && { echo "connectionString not set" >&2; fdb '{.status.connectionString}' >&2; exit 1; }
+            sleep 5
+          done
+          fdb '{.status.desiredProcessGroups}' | grep -qE '^[0-9]+$'
+          # generations.reconciled is stamped by the operator after the
+          # post-bounce uptime gate and can trail the fdbcli-derived health
+          # fields the previous assert converged on; retry briefly instead of
+          # a one-shot read (mirrors main's widened budgets, a79f8009f).
+          deadline=$(( $(date +%s) + 120 ))
+          until fdb '{.status.generations.reconciled}' | grep -qE '^[0-9]+$'; do
+            [ "$(date +%s)" -ge "$deadline" ] && { echo "generations.reconciled not stamped" >&2; fdb '{.status.generations}' >&2; exit 1; }
+            sleep 5
+          done
+        check:
+          ($error == null): true
+
+  - name: refresh-and-assert-full-health
+    try:
+    - script:
+        # 270s poll deadline + one 25s in-loop read that may start just under it
+        # + one 25s diagnostic read on the failure branch = 320s of inner bounds.
+        # Keep the op above that sum, per .chainsaw.yaml: at 5m Chainsaw SIGKILLs
+        # the script instead, and the diagnostic that the failure branch exists
+        # to print is exactly what gets lost.
+        timeout: 6m
+        content: |
+          set -eu
+          ns="$NAMESPACE"
+          cl=foundationdb-test
+          pod=$(kubectl -n "$ns" get pods \
+            -l "foundationdb.org/fdb-cluster-name=$cl,foundationdb.org/fdb-process-class=storage" \
+            -o jsonpath='{.items[0].metadata.name}')
+          status_json() {
+            timeout -k 5 20 kubectl -n "$ns" exec "$pod" -c foundationdb -- \
+              fdbcli -C /var/fdb/data/fdb.cluster --exec 'status json' 2>/dev/null
+          }
+          database_healthy() {
+            status_json | jq -e '.client.database_status.healthy == true' >/dev/null
+          }
+          # The v2.30 operator can finish its initial reconciliation from a
+          # transient status_incomplete response, then never requeue solely to
+          # refresh health. Wait on the authoritative machine-readable status
+          # before asking the operator for exactly one fresh read.
+          deadline=$(( $(date +%s) + 270 ))
+          until database_healthy; do
+            if [ "$(date +%s)" -ge "$deadline" ]; then
+              echo "FoundationDB machine status did not become fully healthy" >&2
+              status_json | jq '{databaseStatus: .client.database_status, messages: .cluster.messages}' >&2 || true
+              exit 1
+            fi
+            # TODO(e2e-replace-fixed-timeouts): fdbcli health has no watchable
+            # Kubernetes object; replace this poll when the operator exposes one.
+            sleep 5
+          done
+          kubectl -n "$ns" annotate foundationdbclusters.apps.foundationdb.org "$cl" \
+            "e2e.cozystack.io/health-refresh=$(date +%s)" --overwrite >/dev/null
+        check:
+          ($error == null): true
+    - assert:
+        timeout: 3m
+        resource:
+          apiVersion: apps.foundationdb.org/v1beta2
+          kind: FoundationDBCluster
+          metadata:
+            name: foundationdb-test
+          status:
+            health:
+              healthy: true
+
+  - name: verify-monitoring-and-storage
+    try:
+    # Dashboard resource map ConfigMap is created by the controller.
+    - assert:
+        timeout: 2m
+        resource:
+          apiVersion: v1
+          kind: ConfigMap
+          metadata:
+            name: foundationdb-test-resourcemap
+    - script:
+        timeout: 2m
+        content: |
+          set -eu
+          ns="$NAMESPACE"
+          cl=foundationdb-test
+          # WorkloadMonitor is created and configured with replicas=3.
+          kubectl -n "$ns" get workloadmonitor "$cl"
+          kubectl -n "$ns" get workloadmonitor "$cl" -o jsonpath='{.spec.replicas}' | grep -qx 3
+          # PVCs: at least 3, all requesting and reporting 1Gi.
+          count=$(kubectl -n "$ns" get pvc -l "foundationdb.org/fdb-cluster-name=$cl" --no-headers | wc -l)
+          test "$count" -ge 3
+          kubectl -n "$ns" get pvc -l "foundationdb.org/fdb-cluster-name=$cl" \
+            -o jsonpath='{.items[*].spec.resources.requests.storage}' | grep -q '1Gi'
+          kubectl -n "$ns" get pvc -l "foundationdb.org/fdb-cluster-name=$cl" \
+            -o jsonpath='{.items[*].status.capacity.storage}' | grep -q '1Gi'
+        check:
+          ($error == null): true
+
+  - name: verify-cleanup
+    try:
+    - delete:
+        ref:
+          apiVersion: apps.cozystack.io/v1alpha1
+          kind: FoundationDB
+          name: test
+    - error:
+        timeout: 2m
+        resource:
+          apiVersion: apps.foundationdb.org/v1beta2
+          kind: FoundationDBCluster
+          metadata:
+            name: foundationdb-test
diff --git a/hack/e2e-chainsaw/foundationdb/foundationdb.yaml b/hack/e2e-chainsaw/foundationdb/foundationdb.yaml
new file mode 100644
index 0000000000..78061a6df5
--- /dev/null
+++ b/hack/e2e-chainsaw/foundationdb/foundationdb.yaml
@@ -0,0 +1,36 @@
+apiVersion: apps.cozystack.io/v1alpha1
+kind: FoundationDB
+metadata:
+  name: test
+spec:
+  cluster:
+    version: "7.3.63"
+    processCounts:
+      storage: 3
+      stateless: -1
+      cluster_controller: 1
+    redundancyMode: "double"
+    storageEngine: "ssd-2"
+    faultDomain:
+      key: "foundationdb.org/none"
+      valueFrom: "$FDB_ZONE_ID"
+  storage:
+    size: "1Gi"
+    storageClass: ""
+  resourcesPreset: "small"
+  backup:
+    enabled: false
+    s3:
+      bucket: ""
+      endpoint: ""
+      region: ""
+      credentials:
+        accessKeyId: ""
+        secretAccessKey: ""
+    retentionPolicy: "7d"
+  monitoring:
+    enabled: true
+  customParameters:
+    - "knob_disable_posix_kernel_aio=1"
+  imageType: "unified"
+  automaticReplacements: true
diff --git a/hack/e2e-chainsaw/gateway/chainsaw-test.yaml b/hack/e2e-chainsaw/gateway/chainsaw-test.yaml
new file mode 100644
index 0000000000..40d80ca235
--- /dev/null
+++ b/hack/e2e-chainsaw/gateway/chainsaw-test.yaml
@@ -0,0 +1,2388 @@
+# Chainsaw port of hack/e2e-apps/gateway.bats (29 cases).
+#
+# Declarative cases (CRD/GatewayClass/Gateway/HTTPRoute/TenantGateway status,
+# VAP existence) use asserts. Admission-rejection cases need kubectl
+# impersonation or error-message greps that Chainsaw `apply` can't express, so
+# they stay scripts. The tenant apex is read at runtime from the tenant-test
+# namespace's namespace.cozystack.io/host label, so these tests pass both in CI
+# (test.example.org) and on a dev cluster with a different host.
+apiVersion: chainsaw.kyverno.io/v1alpha1
+kind: Test
+metadata:
+  name: gateway-api-crds
+spec:
+  steps:
+  - name: crds-established-and-gatewayclass-accepted
+    try:
+    - assert:
+        timeout: 1m
+        resource:
+          apiVersion: apiextensions.k8s.io/v1
+          kind: CustomResourceDefinition
+          metadata:
+            name: gatewayclasses.gateway.networking.k8s.io
+          status:
+            (conditions[?type == 'Established']):
+            - status: "True"
+    - assert:
+        timeout: 1m
+        resource:
+          apiVersion: apiextensions.k8s.io/v1
+          kind: CustomResourceDefinition
+          metadata:
+            name: gateways.gateway.networking.k8s.io
+          status:
+            (conditions[?type == 'Established']):
+            - status: "True"
+    - assert:
+        timeout: 1m
+        resource:
+          apiVersion: apiextensions.k8s.io/v1
+          kind: CustomResourceDefinition
+          metadata:
+            name: httproutes.gateway.networking.k8s.io
+          status:
+            (conditions[?type == 'Established']):
+            - status: "True"
+    - assert:
+        timeout: 3m
+        resource:
+          apiVersion: gateway.networking.k8s.io/v1
+          kind: GatewayClass
+          metadata:
+            name: cilium
+          status:
+            (conditions[?type == 'Accepted']):
+            - status: "True"
+---
+apiVersion: chainsaw.kyverno.io/v1alpha1
+kind: Test
+metadata:
+  name: gateway-minimal-programmed
+spec:
+  catch:
+  - events: {}
+  - describe:
+      apiVersion: gateway.networking.k8s.io/v1
+      kind: Gateway
+      name: gateway-e2e-probe
+  steps:
+  - name: create-minimal-gateway
+    try:
+    - apply:
+        file: gw-minimal.yaml
+  - name: assert-accepted-programmed
+    try:
+    - assert:
+        timeout: 2m
+        resource:
+          apiVersion: gateway.networking.k8s.io/v1
+          kind: Gateway
+          metadata:
+            name: gateway-e2e-probe
+          status:
+            (conditions[?type == 'Accepted']):
+            - status: "True"
+            (conditions[?type == 'Programmed']):
+            - status: "True"
+    # Cilium materialises a LoadBalancer Service per programmed Gateway.
+    - assert:
+        timeout: 1m
+        resource:
+          apiVersion: v1
+          kind: Service
+          metadata:
+            name: cilium-gateway-gateway-e2e-probe
+---
+apiVersion: chainsaw.kyverno.io/v1alpha1
+kind: Test
+metadata:
+  name: gateway-hostname-policy-installed
+spec:
+  steps:
+  - name: vap-and-binding-and-host-label
+    try:
+    - assert:
+        resource:
+          apiVersion: admissionregistration.k8s.io/v1
+          kind: ValidatingAdmissionPolicy
+          metadata:
+            name: cozystack-gateway-hostname-policy
+    - assert:
+        resource:
+          apiVersion: admissionregistration.k8s.io/v1
+          kind: ValidatingAdmissionPolicyBinding
+          metadata:
+            name: cozystack-gateway-hostname-policy
+          # Binding must Deny — [Audit]/[] would let requests through silently.
+          (contains(spec.validationActions, 'Deny')): true
+    # The whole hostname policy keys off this label; assert it is set
+    # (script, not an assert: numeric/length compares on labels are unreliable).
+    - script:
+        content: |
+          set -eu
+          kubectl get namespace "$NAMESPACE" \
+            -o jsonpath='{.metadata.labels.namespace\.cozystack\.io/host}' | grep -q .
+        check:
+          ($error == null): true
+---
+apiVersion: chainsaw.kyverno.io/v1alpha1
+kind: Test
+metadata:
+  name: gateway-foreign-hostname-rejected
+spec:
+  steps:
+  # No mixed-case-apex counterpart here, unlike the Route and Ingress suites.
+  # Deliberate: this policy applies the same rule as the Route one — own apex
+  # or a dot-bounded subdomain of it, with no outside-root branch — so a
+  # Gateway probe would re-exercise the same two comparisons that
+  # route-hostname-policy already drives against a mixed-case apex at runtime,
+  # in both directions. The two differ only in how the apex reaches the
+  # comparison: a `variables.tenantHost` binding here, the label inlined there.
+  # Because that binding is what this suite does NOT cover, both of its
+  # comparisons are pinned operand-by-operand in
+  # tests/gateway-hostname-policy_test.yaml instead.
+  - name: foreign-listener-hostname-denied
+    try:
+    - script:
+        content: |
+          set -eu
+          out=$(kubectl apply -n "$NAMESPACE" -f - 2>&1 <<'EOF'
+          apiVersion: gateway.networking.k8s.io/v1
+          kind: Gateway
+          metadata:
+            name: hostname-hijack-probe
+          spec:
+            gatewayClassName: cilium
+            listeners:
+            - name: https
+              protocol: HTTPS
+              port: 443
+              hostname: "dashboard.example.org"
+              tls:
+                mode: Terminate
+                certificateRefs:
+                - name: noop
+              allowedRoutes:
+                namespaces:
+                  from: Same
+          EOF
+          ) && rc=0 || rc=$?
+          echo "rc=$rc out=$out"
+          if [ "$rc" -eq 0 ]; then
+            kubectl -n "$NAMESPACE" delete gateway hostname-hijack-probe --ignore-not-found
+            echo "BUG: admission accepted cross-tenant hostname" >&2
+            exit 1
+          fi
+          echo "$out" | grep -qi "ValidatingAdmissionPolicy"
+          echo "$out" | grep -q "must equal"
+        check:
+          ($error == null): true
+---
+apiVersion: chainsaw.kyverno.io/v1alpha1
+kind: Test
+metadata:
+  name: package-attachednamespaces-accept
+spec:
+  steps:
+  # Admission must accept a tenant-* entry in gateway.attachedNamespaces; a
+  # successful apply (and Chainsaw auto-cleanup of the Package) is the proof.
+  - name: apply-package-probe
+    try:
+    - apply:
+        file: package-attach-probe.yaml
+---
+apiVersion: chainsaw.kyverno.io/v1alpha1
+kind: Test
+metadata:
+  name: tenant-host-policy
+spec:
+  steps:
+  - name: untrusted-sa-cannot-set-tenant-host
+    try:
+    - script:
+        content: |
+          set -eu
+          ns="$NAMESPACE"
+          # Authorization runs before admission; grant the SA RBAC to create
+          # Tenants so the apply reaches the VAP rather than failing on RBAC.
+          kubectl apply -f - <<EOF
+          apiVersion: rbac.authorization.k8s.io/v1
+          kind: Role
+          metadata:
+            name: vap-probe-tenant-create
+            namespace: ${ns}
+          rules:
+          - apiGroups: ["apps.cozystack.io"]
+            resources: ["tenants"]
+            verbs: ["create","get","list","watch","update","patch","delete"]
+          ---
+          apiVersion: rbac.authorization.k8s.io/v1
+          kind: RoleBinding
+          metadata:
+            name: vap-probe-tenant-create
+            namespace: ${ns}
+          roleRef:
+            apiGroup: rbac.authorization.k8s.io
+            kind: Role
+            name: vap-probe-tenant-create
+          subjects:
+          - kind: ServiceAccount
+            name: default
+            namespace: ${ns}
+          EOF
+          cleanup() {
+            # || true each delete: the trap runs under set -eu, and one
+            # transient delete failure must not skip the remaining cleanup.
+            kubectl -n "$ns" delete rolebinding vap-probe-tenant-create --ignore-not-found || true
+            kubectl -n "$ns" delete role vap-probe-tenant-create --ignore-not-found || true
+            kubectl -n "$ns" delete tenants.apps.cozystack.io vaphostprobe --ignore-not-found || true
+          }
+          trap cleanup EXIT
+          out=$(kubectl --as="system:serviceaccount:${ns}:default" \
+                        --as-group=system:serviceaccounts \
+                        --as-group="system:serviceaccounts:${ns}" \
+            apply -n "$ns" -f - 2>&1 <<EOF
+          apiVersion: apps.cozystack.io/v1alpha1
+          kind: Tenant
+          metadata:
+            name: vaphostprobe
+            namespace: ${ns}
+          spec:
+            host: foreign.example.org
+          EOF
+          ) && rc=0 || rc=$?
+          echo "rc=$rc out=$out"
+          [ "$rc" -ne 0 ]
+          echo "$out" | grep -qi "ValidatingAdmissionPolicy"
+          echo "$out" | grep -q "spec.host can only be set"
+        check:
+          ($error == null): true
+---
+apiVersion: chainsaw.kyverno.io/v1alpha1
+kind: Test
+metadata:
+  name: namespace-host-label-policy
+spec:
+  steps:
+  - name: untrusted-sa-cannot-change-host-label
+    try:
+    - script:
+        content: |
+          set -eu
+          ns="$NAMESPACE"
+          host=$(kubectl get namespace "$ns" -o jsonpath='{.metadata.labels.namespace\.cozystack\.io/host}')
+          kubectl apply -f - <<EOF
+          apiVersion: rbac.authorization.k8s.io/v1
+          kind: ClusterRole
+          metadata:
+            name: vap-probe-namespace-patch
+          rules:
+          - apiGroups: [""]
+            resources: ["namespaces"]
+            verbs: ["get","list","watch","update","patch"]
+          ---
+          apiVersion: rbac.authorization.k8s.io/v1
+          kind: ClusterRoleBinding
+          metadata:
+            name: vap-probe-namespace-patch
+          roleRef:
+            apiGroup: rbac.authorization.k8s.io
+            kind: ClusterRole
+            name: vap-probe-namespace-patch
+          subjects:
+          - kind: ServiceAccount
+            name: default
+            namespace: ${ns}
+          EOF
+          cleanup() {
+            # Restore the original host label in case admission let it through.
+            # || true each command: the trap runs under set -eu, and one
+            # transient failure must not skip the remaining cleanup.
+            kubectl label namespace "$ns" "namespace.cozystack.io/host=${host}" --overwrite >/dev/null 2>&1 || true
+            kubectl delete clusterrolebinding vap-probe-namespace-patch --ignore-not-found || true
+            kubectl delete clusterrole vap-probe-namespace-patch --ignore-not-found || true
+          }
+          trap cleanup EXIT
+          out=$(kubectl --as="system:serviceaccount:${ns}:default" \
+                        --as-group=system:serviceaccounts \
+                        --as-group="system:serviceaccounts:${ns}" \
+            label namespace "$ns" namespace.cozystack.io/host=foreign.example.org --overwrite 2>&1) && rc=0 || rc=$?
+          echo "rc=$rc out=$out"
+          [ "$rc" -ne 0 ]
+          echo "$out" | grep -qi "ValidatingAdmissionPolicy"
+          echo "$out" | grep -q "immutable"
+        check:
+          ($error == null): true
+  - name: untrusted-sa-cannot-set-host-label-at-create
+    try:
+    - script:
+        content: |
+          set -eu
+          ns="$NAMESPACE"
+          kubectl apply -f - <<EOF
+          apiVersion: rbac.authorization.k8s.io/v1
+          kind: ClusterRole
+          metadata:
+            name: vap-probe-namespace-create
+          rules:
+          - apiGroups: [""]
+            resources: ["namespaces"]
+            verbs: ["create","get","list","delete"]
+          ---
+          apiVersion: rbac.authorization.k8s.io/v1
+          kind: ClusterRoleBinding
+          metadata:
+            name: vap-probe-namespace-create
+          roleRef:
+            apiGroup: rbac.authorization.k8s.io
+            kind: ClusterRole
+            name: vap-probe-namespace-create
+          subjects:
+          - kind: ServiceAccount
+            name: default
+            namespace: ${ns}
+          EOF
+          cleanup() {
+            # || true each delete: the trap runs under set -eu, and one
+            # transient delete failure must not skip the remaining cleanup.
+            kubectl delete namespace vap-host-label-probe --ignore-not-found --wait=false || true
+            kubectl delete clusterrolebinding vap-probe-namespace-create --ignore-not-found || true
+            kubectl delete clusterrole vap-probe-namespace-create --ignore-not-found || true
+          }
+          trap cleanup EXIT
+          out=$(kubectl --as="system:serviceaccount:${ns}:default" \
+                        --as-group=system:serviceaccounts \
+                        --as-group="system:serviceaccounts:${ns}" \
+            apply -f - 2>&1 <<EOF
+          apiVersion: v1
+          kind: Namespace
+          metadata:
+            name: vap-host-label-probe
+            labels:
+              namespace.cozystack.io/host: foreign.example.org
+          EOF
+          ) && rc=0 || rc=$?
+          echo "rc=$rc out=$out"
+          [ "$rc" -ne 0 ]
+          echo "$out" | grep -qi "ValidatingAdmissionPolicy"
+          echo "$out" | grep -q "immutable"
+        check:
+          ($error == null): true
+---
+apiVersion: chainsaw.kyverno.io/v1alpha1
+kind: Test
+metadata:
+  name: tenantgateway-crd
+spec:
+  steps:
+  - name: crd-established
+    try:
+    - assert:
+        timeout: 1m
+        resource:
+          apiVersion: apiextensions.k8s.io/v1
+          kind: CustomResourceDefinition
+          metadata:
+            name: tenantgateways.gateway.cozystack.io
+          status:
+            (conditions[?type == 'Established']):
+            - status: "True"
+---
+apiVersion: chainsaw.kyverno.io/v1alpha1
+kind: Test
+metadata:
+  name: tenantgateway-reconciler
+spec:
+  catch:
+  - events: {}
+  - describe:
+      apiVersion: gateway.cozystack.io/v1alpha1
+      kind: TenantGateway
+      name: tg-e2e-probe
+  steps:
+  - name: create-tenantgateway
+    try:
+    # apex is read from the namespace host label so the CR is valid on any host.
+    - script:
+        content: |
+          set -eu
+          ns="$NAMESPACE"
+          apex=$(kubectl get namespace "$ns" -o jsonpath='{.metadata.labels.namespace\.cozystack\.io/host}')
+          kubectl apply -n "$ns" -f - <<EOF
+          apiVersion: gateway.cozystack.io/v1alpha1
+          kind: TenantGateway
+          metadata:
+            name: tg-e2e-probe
+          spec:
+            apex: ${apex}
+            certMode: http01
+            gatewayClassName: cilium
+          EOF
+        check:
+          ($error == null): true
+  - name: assert-gateway-issuer-status
+    try:
+    - assert:
+        timeout: 2m
+        resource:
+          apiVersion: gateway.networking.k8s.io/v1
+          kind: Gateway
+          metadata:
+            name: tg-e2e-probe
+    - assert:
+        timeout: 2m
+        resource:
+          apiVersion: cert-manager.io/v1
+          kind: Issuer
+          metadata:
+            name: tg-e2e-probe-gateway
+    - assert:
+        timeout: 2m
+        resource:
+          apiVersion: gateway.cozystack.io/v1alpha1
+          kind: TenantGateway
+          metadata:
+            name: tg-e2e-probe
+          status:
+            (conditions[?type == 'Ready']):
+            - status: "True"
+    finally:
+    - delete:
+        ref:
+          apiVersion: gateway.cozystack.io/v1alpha1
+          kind: TenantGateway
+          name: tg-e2e-probe
+---
+apiVersion: chainsaw.kyverno.io/v1alpha1
+kind: Test
+metadata:
+  name: route-hostname-policy
+spec:
+  steps:
+  - name: foreign-apex-route-denied
+    try:
+    - script:
+        content: |
+          set -eu
+          out=$(kubectl apply -n "$NAMESPACE" -f - 2>&1 <<'EOF'
+          apiVersion: gateway.networking.k8s.io/v1
+          kind: HTTPRoute
+          metadata:
+            name: route-hostname-hijack-probe
+          spec:
+            hostnames:
+            - "attacker.com"
+            rules:
+            - backendRefs:
+              - name: kubernetes
+                namespace: default
+                port: 443
+          EOF
+          ) && rc=0 || rc=$?
+          echo "rc=$rc out=$out"
+          if [ "$rc" -eq 0 ]; then
+            kubectl -n "$NAMESPACE" delete httproute route-hostname-hijack-probe --ignore-not-found
+            echo "BUG: admission accepted cross-apex HTTPRoute hostname" >&2
+            exit 1
+          fi
+          echo "$out" | grep -qi "ValidatingAdmissionPolicy"
+          # Matches the apex-comparison half of the message, which is common to
+          # every denial this policy issues. Pinning the leading words instead
+          # would break whenever the message grows a clause for another shape.
+          echo "$out" | grep -qi "must equal the namespace"
+        check:
+          ($error == null): true
+  # A route that declares no hostname at all is the one shape the expression
+  # used to skip: it opened with `!has(object.spec.hostnames) ||`, so such a
+  # route satisfied the first operand and was admitted without a single
+  # hostname being compared. That route is not inert — under Gateway API it
+  # inherits the hostnames of the listener it attaches to, and parentRefs may
+  # name a Gateway in another namespace, so it ends up covering whatever that
+  # listener covers.
+  #
+  # Both empty shapes are probed because they reach the hole by different
+  # routes and one guard does not imply the other: the field being absent is
+  # caught by has(), while an explicitly empty list satisfies has() and then
+  # passes because all() over an empty list is vacuously true. Dropping either
+  # term from the CEL re-admits the whole shape, and the unit suite can only
+  # pin that the terms are present in the expression — this step is what proves
+  # the apiserver acts on them.
+  #
+  # HTTPRoute carries both cases. The TLSRoute probe is applied at v1alpha2
+  # because v1 and v1alpha3 mark spec.hostnames required with minItems: 1,
+  # leaving v1alpha2 the only version where a hostname-less TLSRoute reaches
+  # admission at all. It and the GRPCRoute probe carry the absent case only,
+  # and that is a coverage choice rather than a reachability fact: v1alpha2
+  # sets neither constraint, and the grpcroutes schema sets neither at any
+  # served version, so an explicitly empty list reaches admission on both
+  # just as an absent field does. All three policies render one
+  # byte-identical CEL string, so the HTTPRoute pair above already proves
+  # the empty-list term end to end.
+  # Scripted rather than an apply/expect pair so the grep can prove the VAP
+  # did the denying: a bare "the apply failed" assertion would be satisfied
+  # by a typo in the manifest.
+  - name: hostname-less-route-denied
+    try:
+    - script:
+        content: |
+          set -eu
+          # deny <case> <kind> <name> reads a manifest on stdin and expects the
+          # VAP to reject it, mirroring the deny() helper in the Ingress suite.
+          deny() {
+            kubectl -n "$NAMESPACE" delete "$2" "$3" --ignore-not-found >/dev/null
+            out=$(kubectl apply -n "$NAMESPACE" -f - 2>&1) && rc=0 || rc=$?
+            echo "case=$1 rc=$rc out=$out"
+            if [ "$rc" -eq 0 ]; then
+              kubectl -n "$NAMESPACE" delete "$2" "$3" --ignore-not-found
+              echo "BUG: admission accepted $1" >&2
+              exit 1
+            fi
+            echo "$out" | grep -qi "ValidatingAdmissionPolicy"
+            echo "$out" | grep -qi "must declare spec.hostnames"
+          }
+          deny httproute-hostnames-absent httproute route-nohost-probe <<'EOF'
+          apiVersion: gateway.networking.k8s.io/v1
+          kind: HTTPRoute
+          metadata:
+            name: route-nohost-probe
+          spec:
+            rules:
+            - backendRefs:
+              - name: kubernetes
+                namespace: default
+                port: 443
+          EOF
+          deny httproute-hostnames-empty httproute route-emptyhost-probe <<'EOF'
+          apiVersion: gateway.networking.k8s.io/v1
+          kind: HTTPRoute
+          metadata:
+            name: route-emptyhost-probe
+          spec:
+            hostnames: []
+            rules:
+            - backendRefs:
+              - name: kubernetes
+                namespace: default
+                port: 443
+          EOF
+          deny tlsroute-hostnames-absent tlsroute route-tls-nohost-probe <<'EOF'
+          apiVersion: gateway.networking.k8s.io/v1alpha2
+          kind: TLSRoute
+          metadata:
+            name: route-tls-nohost-probe
+          spec:
+            rules:
+            - backendRefs:
+              - name: kubernetes
+                namespace: default
+                port: 443
+          EOF
+          deny grpcroute-hostnames-absent grpcroute route-grpc-nohost-probe <<'EOF'
+          apiVersion: gateway.networking.k8s.io/v1
+          kind: GRPCRoute
+          metadata:
+            name: route-grpc-nohost-probe
+          spec:
+            rules:
+            - backendRefs:
+              - name: kubernetes
+                namespace: default
+                port: 443
+          EOF
+        check:
+          ($error == null): true
+  - name: own-apex-route-allowed
+    try:
+    - script:
+        content: |
+          set -eu
+          ns="$NAMESPACE"
+          apex=$(kubectl get namespace "$ns" -o jsonpath='{.metadata.labels.namespace\.cozystack\.io/host}')
+          kubectl apply -n "$ns" -f - <<EOF
+          apiVersion: gateway.networking.k8s.io/v1
+          kind: HTTPRoute
+          metadata:
+            name: route-hostname-allow-probe
+          spec:
+            hostnames:
+            - "harbor.${apex}"
+            rules:
+            - backendRefs:
+              - name: kubernetes
+                namespace: default
+                port: 443
+          EOF
+          kubectl -n "$ns" delete httproute route-hostname-allow-probe --ignore-not-found
+        check:
+          ($error == null): true
+  # Case-insensitivity. The route hostname is always lowercase — the CRD's
+  # hostname pattern permits only lowercase, so an uppercase hostname is rejected
+  # before the VAP runs — but the apex operand is the namespace.cozystack.io/host
+  # label VALUE, and Kubernetes permits uppercase in a label value. Under a
+  # mixed-case apex a lowercase in-apex route must still be admitted, so the VAP
+  # normalizes both operands with .lowerAscii(). Pre-fix it compares
+  # "probe.case-probe.route.invalid" against "Case-Probe.route.invalid", misses,
+  # and denies a legitimate route — this step is red pre-fix, green post-fix.
+  # A mixed-case apex is the only runtime shape that exercises the
+  # normalization.
+  #
+  # The apex here does not need to sit under the platform root: unlike the
+  # Ingress policy this VAP compares against the tenant apex only and has no
+  # outside-root branch, so a reserved .invalid apex (RFC 2606) keeps the case
+  # host-independent and unable to collide with a dev cluster's real apex.
+  #
+  # The mixed-case apex goes on a throwaway tenant-* namespace rather than on
+  # tenant-test: relabelling the shared namespace would leave it mixed-case for
+  # every later test if a restore were missed. The tenant-* prefix is what makes
+  # the VAP's matchCondition fire, and the runner is a trusted caller for the
+  # host-label immutability VAP, so the labelled CREATE is admitted (see
+  # untrusted-sa-cannot-set-host-label-at-create above). Applied declaratively:
+  # an admission denial fails the apply, and Chainsaw auto-cleanup deletes the
+  # route and the namespace.
+  - name: mixed-case-apex-route-allowed
+    try:
+    # Pre-clean a namespace left by an interrupted prior run: a leftover
+    # tenant-case-probe stuck in Terminating fails the apply below, and because
+    # the label here is a fixed literal a surviving namespace would otherwise be
+    # silently reused rather than rebuilt.
+    - script:
+        content: |
+          set -eu
+          kubectl delete namespace tenant-case-probe --ignore-not-found --wait=true --timeout=60s
+        check:
+          ($error == null): true
+    - apply:
+        resource:
+          apiVersion: v1
+          kind: Namespace
+          metadata:
+            name: tenant-case-probe
+            labels:
+              namespace.cozystack.io/host: Case-Probe.route.invalid
+    # Guard against a vacuous pass: re-read the persisted label. Had anything
+    # normalized it to lowercase, the route below would be admitted with or
+    # without the fix and the step would stop proving case-insensitivity.
+    - assert:
+        resource:
+          apiVersion: v1
+          kind: Namespace
+          metadata:
+            name: tenant-case-probe
+            labels:
+              namespace.cozystack.io/host: Case-Probe.route.invalid
+    - apply:
+        resource:
+          apiVersion: gateway.networking.k8s.io/v1
+          kind: HTTPRoute
+          metadata:
+            name: route-hostname-case-probe
+            namespace: tenant-case-probe
+          spec:
+            hostnames:
+            - "probe.case-probe.route.invalid"
+            rules:
+            - backendRefs:
+              - name: kubernetes
+                namespace: default
+                port: 443
+  # The deny half of the mixed-case apex, pairing with the step above the way
+  # foreign-apex-route-denied pairs with own-apex-route-allowed. The allow half
+  # alone only proves the normalized match does not UNDER-admit; over-admission
+  # is the direction that hijacks a hostname, and normalizing both operands is
+  # exactly the edit that can widen a match by accident. Reuses the namespace
+  # the previous step created — Chainsaw cleans up at test scope, not step
+  # scope. Scripted rather than an apply/expect pair because the grep for
+  # "ValidatingAdmissionPolicy" is what proves the VAP did the denying: a bare
+  # "the apply failed" assertion would be satisfied by a typo in the manifest.
+  - name: mixed-case-apex-route-denied
+    try:
+    - script:
+        content: |
+          set -eu
+          # deny <case> <name> reads a manifest on stdin and expects the VAP to
+          # reject it, mirroring the deny() helper in the Ingress suite below.
+          deny() {
+            kubectl -n tenant-case-probe delete httproute "$2" --ignore-not-found >/dev/null
+            out=$(kubectl apply -n tenant-case-probe -f - 2>&1) && rc=0 || rc=$?
+            echo "case=$1 rc=$rc"
+            if [ "$rc" -eq 0 ]; then
+              kubectl -n tenant-case-probe delete httproute "$2" --ignore-not-found
+              echo "BUG: admission accepted $1: $out" >&2
+              exit 1
+            fi
+            echo "$out" | grep -qi "ValidatingAdmissionPolicy"
+          }
+          # A wholly foreign apex stays denied once both operands are lowercased.
+          deny foreign-apex route-case-foreign-probe <<'EOF'
+          apiVersion: gateway.networking.k8s.io/v1
+          kind: HTTPRoute
+          metadata:
+            name: route-case-foreign-probe
+          spec:
+            hostnames:
+            - "evil.other.invalid"
+            rules:
+            - backendRefs:
+              - name: kubernetes
+                namespace: default
+                port: 443
+          EOF
+          # Dot-boundary guard under the mixed-case apex: "evilcase-probe.route.invalid"
+          # ends with the lowercased apex "case-probe.route.invalid" but is NOT a
+          # subdomain of it. The CEL only denies it because the suffix test is
+          # endsWith("." + apex); drop that leading dot and this hostname is
+          # admitted and hijacks the apex. This is the only case in this suite
+          # that would notice.
+          deny prefix-adjacent route-case-adjacent-probe <<'EOF'
+          apiVersion: gateway.networking.k8s.io/v1
+          kind: HTTPRoute
+          metadata:
+            name: route-case-adjacent-probe
+          spec:
+            hostnames:
+            - "evilcase-probe.route.invalid"
+            rules:
+            - backendRefs:
+              - name: kubernetes
+                namespace: default
+                port: 443
+          EOF
+        check:
+          ($error == null): true
+---
+apiVersion: chainsaw.kyverno.io/v1alpha1
+kind: Test
+metadata:
+  name: httproute-parentref-accepted
+spec:
+  catch:
+  - events: {}
+  - describe:
+      apiVersion: gateway.networking.k8s.io/v1
+      kind: HTTPRoute
+      name: httproute-probe
+  steps:
+  - name: create-gateway-and-route
+    try:
+    - apply:
+        file: gw-route-probe.yaml
+    # The route is scripted rather than declared in gw-route-probe.yaml
+    # because it needs the tenant apex interpolated. This suite runs in
+    # tenant-test, which cozystack-route-hostname-policy matches, so a
+    # route naming no hostname is denied; the apex is read from the
+    # namespace label rather than hardcoded so the suite still passes on
+    # a dev cluster whose host differs from CI's. Same reason and same
+    # shape as own-apex-route-allowed above.
+    - script:
+        content: |
+          set -eu
+          ns="$NAMESPACE"
+          apex=$(kubectl get namespace "$ns" -o jsonpath='{.metadata.labels.namespace\.cozystack\.io/host}')
+          [ -n "$apex" ] || { echo "SETUP FAILURE: $ns lacks the namespace.cozystack.io/host label" >&2; exit 1; }
+          kubectl apply -n "$ns" -f - <<EOF
+          apiVersion: gateway.networking.k8s.io/v1
+          kind: HTTPRoute
+          metadata:
+            name: httproute-probe
+          spec:
+            hostnames:
+            - "parentref-probe.${apex}"
+            parentRefs:
+            - name: gateway-route-probe
+              sectionName: http
+            rules:
+            - matches:
+              - path:
+                  type: PathPrefix
+                  value: /
+              backendRefs:
+              - name: kubernetes
+                namespace: default
+                port: 443
+          EOF
+        check:
+          ($error == null): true
+    - assert:
+        timeout: 3m
+        resource:
+          apiVersion: gateway.networking.k8s.io/v1
+          kind: Gateway
+          metadata:
+            name: gateway-route-probe
+          status:
+            (conditions[?type == 'Programmed']):
+            - status: "True"
+    - assert:
+        timeout: 2m
+        resource:
+          apiVersion: gateway.networking.k8s.io/v1
+          kind: HTTPRoute
+          metadata:
+            name: httproute-probe
+          (status.parents[0].conditions[?type == 'Accepted']):
+          - status: "True"
+    # Creation and assertions share one step so this reclaim covers both.
+    # It is needed because chainsaw reclaims what it applied from a file
+    # but not what a script created, and the suite runs in one long-lived
+    # namespace. finally runs at the end of its own step, so splitting
+    # the assertions into a later step would delete the route before they
+    # ran, and hanging the reclaim off that later step would leak the
+    # route whenever this one failed after the apply.
+    finally:
+    - delete:
+        ref:
+          apiVersion: gateway.networking.k8s.io/v1
+          kind: HTTPRoute
+          name: httproute-probe
+---
+apiVersion: chainsaw.kyverno.io/v1alpha1
+kind: Test
+metadata:
+  name: tenant-gateway-label-lockstep
+spec:
+  catch:
+  - events: {}
+  steps:
+  - name: create-child-tenant-with-gateway
+    try:
+    - apply:
+        resource:
+          apiVersion: apps.cozystack.io/v1alpha1
+          kind: Tenant
+          metadata:
+            name: gwprop
+          spec:
+            gateway: true
+  - name: assert-label-and-values
+    try:
+    - assert:
+        timeout: 3m
+        resource:
+          apiVersion: v1
+          kind: Namespace
+          metadata:
+            name: tenant-test-gwprop
+            labels:
+              namespace.cozystack.io/gateway: tenant-test-gwprop
+    - script:
+        timeout: 2m
+        content: |
+          set -eu
+          deadline=$(( $(date +%s) + 60 ))
+          until kubectl -n tenant-test-gwprop get secret cozystack-values >/dev/null 2>&1; do
+            [ "$(date +%s)" -ge "$deadline" ] && { echo "cozystack-values not created" >&2; exit 1; }
+            sleep 2
+          done
+          v=$(kubectl -n tenant-test-gwprop get secret cozystack-values -o jsonpath='{.data.values\.yaml}' | base64 -d)
+          echo "$v" | grep -E '^\s*gateway:\s*"tenant-test-gwprop"\s*$'
+        check:
+          ($error == null): true
+    finally:
+    - delete:
+        ref:
+          apiVersion: apps.cozystack.io/v1alpha1
+          kind: Tenant
+          name: gwprop
+---
+apiVersion: chainsaw.kyverno.io/v1alpha1
+kind: Test
+metadata:
+  name: tenant-gateway-inheritance
+spec:
+  catch:
+  - events: {}
+  steps:
+  - name: create-parent-tenant
+    try:
+    - apply:
+        resource:
+          apiVersion: apps.cozystack.io/v1alpha1
+          kind: Tenant
+          metadata:
+            name: gwparent
+          spec:
+            gateway: true
+    - assert:
+        timeout: 3m
+        resource:
+          apiVersion: v1
+          kind: Namespace
+          metadata:
+            name: tenant-test-gwparent
+            labels:
+              namespace.cozystack.io/gateway: tenant-test-gwparent
+  - name: create-child-tenant
+    try:
+    - apply:
+        resource:
+          apiVersion: apps.cozystack.io/v1alpha1
+          kind: Tenant
+          metadata:
+            name: gwchild
+            namespace: tenant-test-gwparent
+          spec: {}
+    - assert:
+        timeout: 3m
+        resource:
+          apiVersion: v1
+          kind: Namespace
+          metadata:
+            name: tenant-test-gwparent-gwchild
+            labels:
+              namespace.cozystack.io/gateway: tenant-test-gwparent
+  - name: assert-inheritance-values
+    try:
+    - script:
+        timeout: 2m
+        content: |
+          set -eu
+          deadline=$(( $(date +%s) + 60 ))
+          until kubectl -n tenant-test-gwparent-gwchild get secret cozystack-values >/dev/null 2>&1; do
+            [ "$(date +%s)" -ge "$deadline" ] && { echo "child cozystack-values not created" >&2; exit 1; }
+            sleep 2
+          done
+          v=$(kubectl -n tenant-test-gwparent-gwchild get secret cozystack-values -o jsonpath='{.data.values\.yaml}' | base64 -d)
+          echo "$v" | grep -E '^\s*gateway:\s*"tenant-test-gwparent"\s*$'
+        check:
+          ($error == null): true
+    # The child must NOT own a gateway HelmRelease — inheritance, not its own.
+    - error:
+        resource:
+          apiVersion: helm.toolkit.fluxcd.io/v2
+          kind: HelmRelease
+          metadata:
+            name: gateway
+            namespace: tenant-test-gwparent-gwchild
+    finally:
+    - delete:
+        ref:
+          apiVersion: apps.cozystack.io/v1alpha1
+          kind: Tenant
+          name: gwchild
+          namespace: tenant-test-gwparent
+    - delete:
+        ref:
+          apiVersion: apps.cozystack.io/v1alpha1
+          kind: Tenant
+          name: gwparent
+---
+apiVersion: chainsaw.kyverno.io/v1alpha1
+kind: Test
+metadata:
+  name: tenant-gateway-route-listener
+spec:
+  catch:
+  - events: {}
+  steps:
+  - name: parent-child-and-route-drive-listener-set
+    try:
+    # Above the 660s of polls plus the 675s the trap's deletes may take with
+    # their kill grace, so a poll or a delete is what fires and the trap still
+    # runs: a kill at the op ceiling would skip cleanup and leave both tenants
+    # behind for every later suite. hack/chainsaw-op-budgets.bats holds the op
+    # to that sum.
+    - script:
+        timeout: 24m
+        content: |
+          set -eu
+          ns="$NAMESPACE"
+
+          # Each delete waits, child before parent, because a parent deleted
+          # while its child is still uninstalling wedges the parent's cleanup.
+          # Each delete is bounded as a whole by an outer timeout, because the
+          # trap runs inside the op ceiling and kubectl's --timeout covers only
+          # the wait after the request, not discovery or a stalled request. A
+          # tenant delete gets the 5m that .chainsaw.yaml gives a delete op,
+          # because its child namespaces take minutes to drain. A child still
+          # uninstalling at its bound leaves the parent in place: a leaked
+          # tenant rather than a wedged one. A failed tenant delete fails the
+          # step with kubectl's own error and exit status (124 is the bound),
+          # so the leak is reported here rather than in whichever suite trips
+          # on it.
+          cleanup() {
+            timeout -k 5 60 kubectl -n tenant-test-rparent-rchild delete httproute inherit-probe --ignore-not-found >/dev/null 2>&1 || true
+            if timeout -k 5 300 kubectl -n tenant-test-rparent delete tenant rchild --ignore-not-found >/dev/null; then
+              timeout -k 5 300 kubectl -n "$ns" delete tenant rparent --ignore-not-found >/dev/null || {
+                echo "the tenant rparent delete exited $?, so tenant rparent is left in $ns" >&2
+                exit 1
+              }
+            else
+              echo "the tenant rchild delete exited $?, so tenant rparent is left in $ns" >&2
+              exit 1
+            fi
+          }
+          trap cleanup EXIT
+
+          # Parent tenant owns the Gateway.
+          kubectl apply -n "$ns" -f - <<EOF
+          apiVersion: apps.cozystack.io/v1alpha1
+          kind: Tenant
+          metadata:
+            name: rparent
+          spec:
+            gateway: true
+          EOF
+          timeout 180 sh -ec 'until kubectl get ns tenant-test-rparent >/dev/null 2>&1; do sleep 3; done'
+          timeout 120 sh -ec 'until kubectl -n tenant-test-rparent get gateway cozystack >/dev/null 2>&1; do sleep 3; done'
+
+          # Child tenant inherits the parent Gateway.
+          kubectl apply -n tenant-test-rparent -f - <<EOF
+          apiVersion: apps.cozystack.io/v1alpha1
+          kind: Tenant
+          metadata:
+            name: rchild
+          spec: {}
+          EOF
+          timeout 180 sh -ec 'until kubectl get ns tenant-test-rparent-rchild >/dev/null 2>&1; do sleep 3; done'
+
+          child_apex=$(kubectl get ns tenant-test-rparent-rchild -o jsonpath='{.metadata.labels.namespace\.cozystack\.io/host}')
+          [ -n "$child_apex" ]
+          route_host="harbor.${child_apex}"
+
+          # An HTTPRoute in the child, attached to the parent Gateway.
+          kubectl apply -n tenant-test-rparent-rchild -f - <<EOF
+          apiVersion: gateway.networking.k8s.io/v1
+          kind: HTTPRoute
+          metadata:
+            name: inherit-probe
+          spec:
+            parentRefs:
+            - group: gateway.networking.k8s.io
+              kind: Gateway
+              name: cozystack
+              namespace: tenant-test-rparent
+            hostnames:
+            - "${route_host}"
+            rules:
+            - matches:
+              - path:
+                  type: PathPrefix
+                  value: /
+              backendRefs:
+              - name: kubernetes
+                namespace: default
+                port: 443
+          EOF
+
+          # cozystack-controller collects the route across the inheritance label
+          # and grows a per-listener HTTPS entry on the parent Gateway.
+          timeout 120 sh -ec '
+            until kubectl -n tenant-test-rparent get gateway cozystack \
+              -o jsonpath="{range .spec.listeners[?(@.protocol==\"HTTPS\")]}{.hostname}{\"\n\"}{end}" 2>/dev/null \
+              | grep -qx "'"$route_host"'"; do sleep 3; done'
+
+          # ...and a matching per-listener Certificate.
+          timeout 60 sh -ec '
+            until kubectl -n tenant-test-rparent get certificate \
+              -l cozystack.io/per-listener-cert=true \
+              -o jsonpath="{range .items[*]}{.spec.dnsNames[0]}{\"\n\"}{end}" 2>/dev/null \
+              | grep -qx "'"$route_host"'"; do sleep 3; done'
+        check:
+          ($error == null): true
+---
+# What a passthrough listener costs an HTTPRoute that publishes its name,
+# measured on the objects rather than on the renderer. The chart renders
+# passthrough listeners only on the publishing tenant and only with
+# gateway.enabled, which CI leaves off, so the test declares tls-api on 443
+# itself through the TenantGateway spec. The name is reserved by the
+# declaration alone, so the route claiming it gets no terminate listener
+# and no certificate with no TLSRoute anywhere.
+#
+# Readiness is measured before the test declares any HTTPRoute. The
+# reservation is an http01 behaviour, and an http01 terminate listener
+# waits for a Let's Encrypt certificate that is never issued for a test
+# hostname, so once the control route below has its listener the tenant is
+# not Ready, correctly.
+#
+# Absence proves nothing on its own, since a reconcile that has not run yet
+# looks the same. A second route on a free name is the control: the
+# controller renders the Gateway and the Certificates before it writes route
+# status in the same pass, it never runs two passes over one TenantGateway
+# at once, and a route its cache has seen stays there until it is deleted.
+# So once both routes carry the verdicts asserted below, one read of the
+# Gateway reflects a pass that saw both, whichever route came first.
+apiVersion: chainsaw.kyverno.io/v1alpha1
+kind: Test
+metadata:
+  name: tenant-gateway-passthrough-reservation
+spec:
+  catch:
+  - events: {}
+  steps:
+  - name: create-tenant
+    try:
+    - apply:
+        resource:
+          apiVersion: apps.cozystack.io/v1alpha1
+          kind: Tenant
+          metadata:
+            name: pw
+          spec:
+            gateway: true
+    - assert:
+        timeout: 3m
+        resource:
+          apiVersion: gateway.networking.k8s.io/v1
+          kind: Gateway
+          metadata:
+            name: cozystack
+            namespace: tenant-test-pw
+          spec:
+            (listeners[?name == 'http']):
+            - protocol: HTTP
+    # The premise of the merge patches below, not a measurement of the
+    # chart's scoping: with gateway.enabled off no tenant renders these, so
+    # in CI this holds whether or not the chart keeps them to the publishing
+    # tenant. packages/extra/gateway/tests/tenantgateway_test.yaml pins that.
+    # One render carries every listener of the spec, so the Gateway that
+    # answered the assert above is the whole render of the chart's spec.
+    - script:
+        timeout: 1m
+        content: |
+          set -eu
+          tls_names=$(kubectl -n tenant-test-pw get gateway cozystack -o 'jsonpath={range .spec.listeners[?(@.protocol=="TLS")]}{.name}{"\n"}{end}')
+          if [ -n "$tls_names" ]; then
+            echo "child tenant Gateway renders passthrough listeners: $tls_names" >&2
+            exit 1
+          fi
+        check:
+          ($error == null): true
+  # Two listeners with no TLSRoute behind them, one on 443 and one on a
+  # native port. The package README rests a claim on that shape: Cilium
+  # judges a listener on its protocol, its allowed kinds and its
+  # certificate refs and never on its route set, so a routeless passthrough
+  # listener is Accepted and Programmed and tenant readiness is untouched.
+  # The unit tests run against a fake client and cannot measure that; only
+  # a cluster can.
+  - name: routeless-listeners-keep-the-tenant-ready
+    try:
+    - script:
+        timeout: 2m
+        content: |
+          set -eu
+          tenant_ns=tenant-test-pw
+          apex=$(kubectl get ns "$tenant_ns" -o jsonpath='{.metadata.labels.namespace\.cozystack\.io/host}')
+          [ -n "$apex" ]
+
+          # Merged rather than applied: the chart renders neither field
+          # here, and a key it renders in neither manifest is left alone
+          # by the next helm upgrade.
+          kubectl -n "$tenant_ns" patch tenantgateway cozystack --type=merge \
+            -p "$(printf '{"spec":{"tlsPassthroughServices":["api"],"tlsPassthroughListeners":[{"name":"pgprobe","port":5432,"hostname":"pgprobe.%s"}]}}' "$apex")"
+        check:
+          ($error == null): true
+    # The per-listener entries are the measurement, asserted together with
+    # the aggregate because the TenantGateway may already be Ready when
+    # this step starts: Ready alone would be answered by the state that
+    # preceded the patch. The entries do not exist until the controller has
+    # judged the new listeners, each flag folds its listener's Accepted and
+    # Programmed, and one status write carries them with Ready.
+    - assert:
+        timeout: 2m
+        resource:
+          apiVersion: gateway.cozystack.io/v1alpha1
+          kind: TenantGateway
+          metadata:
+            name: cozystack
+            namespace: tenant-test-pw
+          status:
+            (listeners[?name == 'tls-api']):
+            - ready: true
+            (listeners[?name == 'tls-pgprobe']):
+            - ready: true
+            (conditions[?type == 'Ready']):
+            - status: "True"
+  # The hostnames are built from the apex, which is known only once a script
+  # reads it off the tenant namespace's label, so the routes are written
+  # here. They live in the tenant namespace and go with the Tenant Chainsaw
+  # applied above.
+  - name: declare-the-routes
+    try:
+    - script:
+        timeout: 2m
+        content: |
+          set -eu
+          tenant_ns=tenant-test-pw
+          apex=$(kubectl get ns "$tenant_ns" -o jsonpath='{.metadata.labels.namespace\.cozystack\.io/host}')
+          [ -n "$apex" ]
+          kubectl apply -n "$tenant_ns" -f - <<EOF
+          apiVersion: gateway.networking.k8s.io/v1
+          kind: HTTPRoute
+          metadata:
+            name: app-probe
+          spec:
+            parentRefs:
+            - group: gateway.networking.k8s.io
+              kind: Gateway
+              name: cozystack
+              namespace: ${tenant_ns}
+            hostnames:
+            - "app-probe.${apex}"
+            rules:
+            - backendRefs:
+              - name: kubernetes
+                namespace: default
+                port: 443
+          ---
+          apiVersion: gateway.networking.k8s.io/v1
+          kind: HTTPRoute
+          metadata:
+            name: api-probe
+          spec:
+            parentRefs:
+            - group: gateway.networking.k8s.io
+              kind: Gateway
+              name: cozystack
+              namespace: ${tenant_ns}
+            hostnames:
+            - "api.${apex}"
+            rules:
+            - backendRefs:
+              - name: kubernetes
+                namespace: default
+                port: 443
+          EOF
+        check:
+          ($error == null): true
+  - name: reserved-name-gets-no-terminate-listener
+    try:
+    - assert:
+        timeout: 2m
+        resource:
+          apiVersion: gateway.networking.k8s.io/v1
+          kind: HTTPRoute
+          metadata:
+            name: app-probe
+            namespace: tenant-test-pw
+          status:
+            (parents[?controllerName == 'gateway.cozystack.io/tenantgateway-controller']):
+            - (conditions[?type == 'Accepted']):
+              - status: "True"
+    - assert:
+        timeout: 2m
+        resource:
+          apiVersion: gateway.networking.k8s.io/v1
+          kind: HTTPRoute
+          metadata:
+            name: api-probe
+            namespace: tenant-test-pw
+          status:
+            (parents[?controllerName == 'gateway.cozystack.io/tenantgateway-controller']):
+            - (conditions[?type == 'Accepted']):
+              - status: "False"
+                reason: NoMatchingListenerHostname
+    # Single reads, not polls: the verdicts above were written after the
+    # Gateway and the Certificates of the pass that reached them.
+    - script:
+        timeout: 1m
+        content: |
+          set -eu
+          tenant_ns=tenant-test-pw
+          apex=$(kubectl get ns "$tenant_ns" -o jsonpath='{.metadata.labels.namespace\.cozystack\.io/host}')
+          [ -n "$apex" ]
+          https_hosts=$(kubectl -n "$tenant_ns" get gateway cozystack -o 'jsonpath={range .spec.listeners[?(@.protocol=="HTTPS")]}{.hostname}{"\n"}{end}')
+          tls_names=$(kubectl -n "$tenant_ns" get gateway cozystack -o 'jsonpath={range .spec.listeners[?(@.protocol=="TLS")]}{.name}{"\n"}{end}')
+          cert_hosts=$(kubectl -n "$tenant_ns" get certificate -l cozystack.io/per-listener-cert=true -o 'jsonpath={range .items[*]}{.spec.dnsNames[0]}{"\n"}{end}')
+          printf '%s\n' "$https_hosts" | grep -qxF "app-probe.${apex}"
+          printf '%s\n' "$cert_hosts" | grep -qxF "app-probe.${apex}"
+          printf '%s\n' "$tls_names" | grep -qxF tls-api
+          if printf '%s\n' "$https_hosts" | grep -qxF "api.${apex}"; then
+            echo "terminate listener rendered for reserved api.${apex}" >&2
+            exit 1
+          fi
+          if printf '%s\n' "$cert_hosts" | grep -qxF "api.${apex}"; then
+            echo "Certificate ordered for reserved api.${apex}" >&2
+            exit 1
+          fi
+        check:
+          ($error == null): true
+---
+# Legacy-Ingress counterpart of the gateway/route hostname VAPs (bats: the 12
+# cozystack-ingress-hostname-policy cases). Gateway API is off by default, so
+# tenant apps publish through a legacy networking.k8s.io/Ingress; the VAP
+# constrains tenant Ingress hostnames on the shared ingress-nginx. The VAP
+# matches on the tenant-* namespace, not the caller, so plain applies as the
+# runner's identity exercise it — no impersonation needed. Hostnames are
+# derived at runtime: the tenant apex from this namespace's
+# namespace.cozystack.io/host label (as elsewhere in this suite) and the
+# platform ROOT apex from the same label on tenant-root, so the
+# under-root-but-outside-own-apex cases stay host-independent where the bats
+# hardcoded test.example.org / example.org.
+apiVersion: chainsaw.kyverno.io/v1alpha1
+kind: Test
+metadata:
+  name: ingress-hostname-policy
+spec:
+  catch:
+  - events: {}
+  steps:
+  # If these resources are missing, admission cannot constrain tenant Ingress
+  # hostnames — make that loud instead of letting it fall through as a silent
+  # pass.
+  - name: vap-and-binding-installed
+    try:
+    - assert:
+        resource:
+          apiVersion: admissionregistration.k8s.io/v1
+          kind: ValidatingAdmissionPolicy
+          metadata:
+            name: cozystack-ingress-hostname-policy
+    - assert:
+        resource:
+          apiVersion: admissionregistration.k8s.io/v1
+          kind: ValidatingAdmissionPolicyBinding
+          metadata:
+            name: cozystack-ingress-hostname-policy
+          spec:
+            (contains(validationActions, 'Deny')): true
+  # Apex-derived rejects:
+  #   foreign-apex-host    dashboard.<root> — under the platform root apex but
+  #                        outside the tenant's own apex
+  #   prefix-adjacent      evil<apex> — dot-boundary guard: a naive suffix
+  #                        check without the leading dot would match "<apex>"
+  #                        inside "evil<apex>"; the CEL uses endsWith("." + apex)
+  #   foreign-tls-host     in-apex rule host, but a spec.tls[].hosts[] entry
+  #                        under the root apex — the tls branch denies on its own
+  #   wildcard-matches-apex *.<root-parent> is "outside" the root apex by a
+  #                        plain string test, but at ingress-nginx it also
+  #                        matches the bare root apex; the outside-root path is
+  #                        gated on the host not being a wildcard
+  - name: foreign-and-adjacent-hosts-denied
+    try:
+    - script:
+        content: |
+          set -eu
+          ns="$NAMESPACE"
+          apex=$(kubectl get namespace "$ns" -o jsonpath='{.metadata.labels.namespace\.cozystack\.io/host}')
+          root=$(kubectl get namespace tenant-root -o jsonpath='{.metadata.labels.namespace\.cozystack\.io/host}')
+          [ -n "$apex" ] || { echo "SETUP FAILURE: $ns lacks the namespace.cozystack.io/host label" >&2; exit 1; }
+          [ -n "$root" ] || { echo "SETUP FAILURE: tenant-root lacks the namespace.cozystack.io/host label" >&2; exit 1; }
+          [ "$apex" != "$root" ] || { echo "SETUP FAILURE: tenant apex equals root apex; under-root-outside-own cases are undefined" >&2; exit 1; }
+          # deny <case> <ingress-name> <extra-grep|""> reads a manifest on
+          # stdin and expects admission to reject it with a VAP message.
+          deny() {
+            kubectl -n "$ns" delete ingress "$2" --ignore-not-found >/dev/null
+            out=$(kubectl apply -n "$ns" -f - 2>&1) && rc=0 || rc=$?
+            echo "case=$1 rc=$rc"
+            if [ "$rc" -eq 0 ]; then
+              kubectl -n "$ns" delete ingress "$2" --ignore-not-found
+              echo "BUG: admission accepted $1: $out" >&2
+              exit 1
+            fi
+            echo "$out" | grep -qi "ValidatingAdmissionPolicy"
+            [ -z "$3" ] || echo "$out" | grep -qi "$3"
+          }
+          deny foreign-apex-host ingress-out-of-apex-host-probe "must be within" <<EOF
+          apiVersion: networking.k8s.io/v1
+          kind: Ingress
+          metadata:
+            name: ingress-out-of-apex-host-probe
+          spec:
+            rules:
+            - host: "dashboard.${root}"
+              http:
+                paths:
+                - path: /
+                  pathType: Prefix
+                  backend:
+                    service:
+                      name: noop
+                      port:
+                        number: 80
+          EOF
+          deny prefix-adjacent ingress-prefix-adjacent-probe "" <<EOF
+          apiVersion: networking.k8s.io/v1
+          kind: Ingress
+          metadata:
+            name: ingress-prefix-adjacent-probe
+          spec:
+            rules:
+            - host: "evil${apex}"
+              http:
+                paths:
+                - path: /
+                  pathType: Prefix
+                  backend:
+                    service:
+                      name: noop
+                      port:
+                        number: 80
+          EOF
+          deny foreign-tls-host ingress-tls-out-of-apex-probe "must be within" <<EOF
+          apiVersion: networking.k8s.io/v1
+          kind: Ingress
+          metadata:
+            name: ingress-tls-out-of-apex-probe
+          spec:
+            tls:
+            - hosts:
+              - "harbor.${root}"
+              secretName: noop-tls
+            rules:
+            - host: "harbor.${apex}"
+              http:
+                paths:
+                - path: /
+                  pathType: Prefix
+                  backend:
+                    service:
+                      name: noop
+                      port:
+                        number: 80
+          EOF
+          case "$root" in
+            *.*) w="*.${root#*.}" ;;
+            *)   w="*.${root}" ;;
+          esac
+          deny wildcard-matches-apex ingress-wildcard-host-probe "" <<EOF
+          apiVersion: networking.k8s.io/v1
+          kind: Ingress
+          metadata:
+            name: ingress-wildcard-host-probe
+          spec:
+            rules:
+            - host: "${w}"
+              http:
+                paths:
+                - path: /
+                  pathType: Prefix
+                  backend:
+                    service:
+                      name: noop
+                      port:
+                        number: 80
+          EOF
+        check:
+          ($error == null): true
+  # Static rejects — catch-all shapes on the shared ingress-nginx:
+  #   hostless        a rule with no .host matches all inbound HTTP
+  #   empty-host      host: "" is the same catch-all; the CEL denies it via
+  #                   r.host != "" (or has(r.host) if the apiserver drops it)
+  #   defaultBackend  catch-all for otherwise-unmatched traffic
+  - name: catch-all-shapes-denied
+    try:
+    - script:
+        content: |
+          set -eu
+          ns="$NAMESPACE"
+          deny() {
+            kubectl -n "$ns" delete ingress "$2" --ignore-not-found >/dev/null
+            out=$(kubectl apply -n "$ns" -f - 2>&1) && rc=0 || rc=$?
+            echo "case=$1 rc=$rc"
+            if [ "$rc" -eq 0 ]; then
+              kubectl -n "$ns" delete ingress "$2" --ignore-not-found
+              echo "BUG: admission accepted $1: $out" >&2
+              exit 1
+            fi
+            echo "$out" | grep -qi "ValidatingAdmissionPolicy"
+          }
+          deny hostless-rule ingress-hostless-probe <<'EOF'
+          apiVersion: networking.k8s.io/v1
+          kind: Ingress
+          metadata:
+            name: ingress-hostless-probe
+          spec:
+            rules:
+            - http:
+                paths:
+                - path: /
+                  pathType: Prefix
+                  backend:
+                    service:
+                      name: noop
+                      port:
+                        number: 80
+          EOF
+          deny empty-host ingress-empty-host-probe <<'EOF'
+          apiVersion: networking.k8s.io/v1
+          kind: Ingress
+          metadata:
+            name: ingress-empty-host-probe
+          spec:
+            rules:
+            - host: ""
+              http:
+                paths:
+                - path: /
+                  pathType: Prefix
+                  backend:
+                    service:
+                      name: noop
+                      port:
+                        number: 80
+          EOF
+          deny default-backend ingress-defaultbackend-probe <<'EOF'
+          apiVersion: networking.k8s.io/v1
+          kind: Ingress
+          metadata:
+            name: ingress-defaultbackend-probe
+          spec:
+            defaultBackend:
+              service:
+                name: noop
+                port:
+                  number: 80
+          EOF
+        check:
+          ($error == null): true
+  # Inverse sanity checks under the tenant's own apex: an in-apex rule+tls
+  # Ingress and a wildcard under the own apex (*.<apex>) must NOT be rejected
+  # — the anti-wildcard gate applies only to the outside-root path. Created
+  # inside the script (they need ${apex} interpolation), so also deleted here.
+  - name: own-apex-allowed
+    try:
+    - script:
+        content: |
+          set -eu
+          ns="$NAMESPACE"
+          apex=$(kubectl get namespace "$ns" -o jsonpath='{.metadata.labels.namespace\.cozystack\.io/host}')
+          [ -n "$apex" ] || { echo "SETUP FAILURE: $ns lacks the namespace.cozystack.io/host label" >&2; exit 1; }
+          kubectl apply -n "$ns" -f - <<EOF
+          apiVersion: networking.k8s.io/v1
+          kind: Ingress
+          metadata:
+            name: ingress-hostname-allow-probe
+          spec:
+            tls:
+            - hosts:
+              - "harbor.${apex}"
+              secretName: noop-tls
+            rules:
+            - host: "harbor.${apex}"
+              http:
+                paths:
+                - path: /
+                  pathType: Prefix
+                  backend:
+                    service:
+                      name: noop
+                      port:
+                        number: 80
+          EOF
+          kubectl -n "$ns" delete ingress ingress-hostname-allow-probe --ignore-not-found
+          kubectl apply -n "$ns" -f - <<EOF
+          apiVersion: networking.k8s.io/v1
+          kind: Ingress
+          metadata:
+            name: ingress-ownapex-wildcard-probe
+          spec:
+            rules:
+            - host: "*.${apex}"
+              http:
+                paths:
+                - path: /
+                  pathType: Prefix
+                  backend:
+                    service:
+                      name: noop
+                      port:
+                        number: 80
+          EOF
+          kubectl -n "$ns" delete ingress ingress-ownapex-wildcard-probe --ignore-not-found
+        check:
+          ($error == null): true
+  # Case-insensitivity. spec.rules[].host and spec.tls[].hosts[] are always
+  # lowercase — the apiserver's host validation permits only lowercase, so an
+  # uppercase host is rejected before the VAP runs — but the apex operand is the
+  # namespace.cozystack.io/host label VALUE, and Kubernetes permits uppercase in
+  # a label value. Under a mixed-case apex a lowercase in-apex Ingress must
+  # still be admitted, so the VAP normalizes both operands with .lowerAscii().
+  # Ingress is the default publish path and carries the most complex CEL (a
+  # rule-host and a tls-host branch), so it gets its own runtime guard beside
+  # the route one; both branches are exercised at once because the tls branch
+  # denies on its own.
+  #
+  # The probe apex is derived as Case-Probe.<root> rather than hardcoded, and it
+  # has to sit UNDER the platform root to mean anything: the outside-root branch
+  # admits any non-wildcard host outside the root apex whatever the tenant apex
+  # says, so a probe on an unrelated domain would be admitted pre-fix and prove
+  # nothing. Under the root that escape is closed — pre-fix the own-apex branch
+  # misses on case and the outside-root branch is excluded, so admission denies
+  # and this step is red; post-fix the own-apex branch matches and it is green.
+  #
+  # The mixed-case apex goes on a throwaway tenant-* namespace rather than on
+  # tenant-test, for the same reason as the route case. Built in a script since
+  # it needs ${root} interpolation, so the namespace is torn down in finally
+  # rather than by Chainsaw auto-cleanup. That teardown is also why the allow and
+  # deny halves share ONE step here while the route case splits them in two:
+  # finally runs at step scope, so a second step would find the namespace gone.
+  # The route namespace is applied declaratively and reclaimed at test scope, so
+  # it survives into its own deny step.
+  - name: mixed-case-apex-allowed-and-denied
+    try:
+    - script:
+        content: |
+          set -eu
+          root=$(kubectl get namespace tenant-root -o jsonpath='{.metadata.labels.namespace\.cozystack\.io/host}')
+          [ -n "$root" ] || { echo "SETUP FAILURE: tenant-root lacks the namespace.cozystack.io/host label" >&2; exit 1; }
+          apex="Case-Probe.${root}"
+          host="probe.case-probe.${root}"
+          # Guard against a vacuous pass: the probe apex must really be
+          # mixed-case. An all-lowercase apex would admit the Ingress with or
+          # without the fix — this catches a later edit that lowercases the
+          # literal above, which the persisted-label check below cannot see.
+          [ "$apex" != "$(echo "$apex" | tr '[:upper:]' '[:lower:]')" ] || { echo "SETUP FAILURE: probe apex '$apex' is not mixed-case" >&2; exit 1; }
+          # Pre-clean a namespace left behind by an interrupted prior run.
+          kubectl delete namespace tenant-ingress-case-probe --ignore-not-found --wait=true --timeout=60s
+          kubectl apply -f - <<EOF
+          apiVersion: v1
+          kind: Namespace
+          metadata:
+            name: tenant-ingress-case-probe
+            labels:
+              namespace.cozystack.io/host: ${apex}
+          EOF
+          # Second vacuous-pass guard: re-read the persisted label, in case
+          # anything normalized the value on the way in.
+          got=$(kubectl get namespace tenant-ingress-case-probe -o jsonpath='{.metadata.labels.namespace\.cozystack\.io/host}')
+          [ "$got" = "$apex" ] || { echo "SETUP FAILURE: apex label persisted as '$got', want '$apex'" >&2; exit 1; }
+          kubectl apply -n tenant-ingress-case-probe -f - <<EOF
+          apiVersion: networking.k8s.io/v1
+          kind: Ingress
+          metadata:
+            name: ingress-hostname-case-probe
+          spec:
+            tls:
+            - hosts:
+              - "${host}"
+              secretName: noop-tls
+            rules:
+            - host: "${host}"
+              http:
+                paths:
+                - path: /
+                  pathType: Prefix
+                  backend:
+                    service:
+                      name: noop
+                      port:
+                        number: 80
+          EOF
+          # The deny half, pairing with the allow above the way
+          # foreign-and-adjacent-hosts-denied pairs with own-apex-allowed. The
+          # allow half alone only proves the normalized match does not
+          # UNDER-admit; over-admission is what hijacks a hostname, and
+          # normalizing both operands is exactly the edit that can widen a match
+          # by accident.
+          deny() {
+            kubectl -n tenant-ingress-case-probe delete ingress "$2" --ignore-not-found >/dev/null
+            out=$(kubectl apply -n tenant-ingress-case-probe -f - 2>&1) && rc=0 || rc=$?
+            echo "case=$1 rc=$rc"
+            if [ "$rc" -eq 0 ]; then
+              kubectl -n tenant-ingress-case-probe delete ingress "$2" --ignore-not-found
+              echo "BUG: admission accepted $1: $out" >&2
+              exit 1
+            fi
+            echo "$out" | grep -qi "ValidatingAdmissionPolicy"
+          }
+          # Under the platform root but outside the probe's own apex: the
+          # own-apex branch must miss on more than case, and the outside-root
+          # branch must stay closed under the root.
+          deny foreign-apex-host ingress-case-foreign-probe <<EOF
+          apiVersion: networking.k8s.io/v1
+          kind: Ingress
+          metadata:
+            name: ingress-case-foreign-probe
+          spec:
+            rules:
+            - host: "dashboard.${root}"
+              http:
+                paths:
+                - path: /
+                  pathType: Prefix
+                  backend:
+                    service:
+                      name: noop
+                      port:
+                        number: 80
+          EOF
+          # Dot-boundary guard on the normalized path: "evilcase-probe.<root>"
+          # ends with the lowercased apex "case-probe.<root>" without being a
+          # subdomain of it. Only endsWith("." + apex) denies it; drop that
+          # leading dot and the apex is hijackable.
+          deny prefix-adjacent ingress-case-adjacent-probe <<EOF
+          apiVersion: networking.k8s.io/v1
+          kind: Ingress
+          metadata:
+            name: ingress-case-adjacent-probe
+          spec:
+            rules:
+            - host: "evilcase-probe.${root}"
+              http:
+                paths:
+                - path: /
+                  pathType: Prefix
+                  backend:
+                    service:
+                      name: noop
+                      port:
+                        number: 80
+          EOF
+        check:
+          ($error == null): true
+    finally:
+    - delete:
+        ref:
+          apiVersion: v1
+          kind: Namespace
+          name: tenant-ingress-case-probe
+  # Static accepts — concrete external domains outside the platform root apex
+  # on both spec.rules[].host and spec.tls[].hosts. Declarative apply; Chainsaw
+  # auto-cleanup deletes the probes.
+  - name: external-domain-allowed
+    try:
+    - apply:
+        file: ingress-external-allow.yaml
+---
+# Regression for #3983, which reported fail-closed admission webhooks becoming
+# unreachable from the API server while an unrelated namespace was deleted. The
+# mechanism is NOT confirmed: the errno in that report cannot come from a policy
+# denial, and namespace deletion churns service backends as well as Cilium
+# identities. So this case asserts the property the issue is about -- both
+# webhooks still admit across a namespace deletion -- rather than claiming to
+# reproduce a cause. Both affected paths are exercised immediately after the
+# deletion, with no retry to hide a window.
+#
+# Every apply in this test passes through both fail-closed webhooks, so a
+# cluster whose webhooks were ALREADY down fails here in a way that reads
+# exactly like the outage under test. The first run of this case did precisely
+# that: the ingress-nginx controller was crash-looping, the admission Service
+# had no ready backend, and the setup apply died with "dial tcp ...: no route to
+# host" before any churn happened. So availability is asserted before the churn
+# as a precondition with its own message, and the churn verdict is only reached
+# once both webhooks are known to have been up to begin with.
+apiVersion: chainsaw.kyverno.io/v1alpha1
+kind: Test
+metadata:
+  name: admission-webhooks-survive-namespace-churn
+spec:
+  catch:
+  - events: {}
+  steps:
+  - name: ingress-and-pod-admission-remain-available-after-deletion
+    try:
+    - script:
+        # Above the sum of the inner budgets, per the rule in
+        # hack/e2e-chainsaw/.chainsaw.yaml: 2x90s of webhook preconditions, 60s
+        # of pre-clean delete, 90s waiting for the churn pod, 180s for the
+        # namespace delete = 510s, and timeouts.exec would otherwise cap the
+        # whole script at 5m and SIGKILL it with no verdict.
+        timeout: 12m
+        content: |
+          set -eu
+          ns="$NAMESPACE"
+          churn_ns=tenant-admission-churn-probe
+          apex=$(kubectl get namespace "$ns" -o jsonpath='{.metadata.labels.namespace\.cozystack\.io/host}')
+          [ -n "$apex" ] || { echo "SETUP FAILURE: $ns lacks the namespace.cozystack.io/host label" >&2; exit 1; }
+
+          # Coordinates come from the webhook registrations themselves, which is
+          # what the API server dials, rather than from a guessed release name or
+          # namespace. A webhook that is not registered at all is a setup
+          # failure: nothing below could then prove anything about it.
+          webhook_services() {
+            kubectl get "$1" \
+              -o jsonpath='{range .items[*]}{range .webhooks[*]}{.name}{" "}{.clientConfig.service.namespace}{" "}{.clientConfig.service.name}{"\n"}{end}{end}'
+          }
+
+          # Ready endpoint addresses behind a Service. Counted from
+          # EndpointSlice .endpoints[].conditions.ready rather than from pod
+          # readiness, because that is the state the API server routes on, and
+          # because a `kubectl wait --for=condition=Ready` is satisfied
+          # transiently by a pod that is flapping.
+          ready_backends() {
+            n=$(kubectl -n "$1" get endpointslice -l "kubernetes.io/service-name=$2" \
+              -o jsonpath='{range .items[*]}{range .endpoints[*]}{.conditions.ready}{"\n"}{end}{end}' \
+              2>/dev/null | grep -c '^true$' || true)
+            [ -n "$n" ] || n=0
+            echo "$n"
+          }
+
+          # Distinct variable names from require_webhook_up below, deliberately:
+          # POSIX shell functions share one scope, so reusing `label` here
+          # appended each iteration's suffix to the caller's own copy and the
+          # second registration reported itself as "(1/2) (2/2)".
+          require_service_up() {
+            svclabel="$1"; svcns="$2"; svcname="$3"; svcbudget="$4"
+            svcdeadline=$(( $(date +%s) + svcbudget ))
+            while :; do
+              n=$(ready_backends "$svcns" "$svcname")
+              if [ "$n" -gt 0 ]; then
+                echo "PRECONDITION OK  $svclabel ($svcns/$svcname) has $n ready backend(s)"
+                return 0
+              fi
+              [ "$(date +%s)" -lt "$svcdeadline" ] || break
+              sleep 5
+            done
+            echo "SETUP FAILURE: $svclabel ($svcns/$svcname) has no ready backend after ${svcbudget}s." >&2
+            echo "  This test cannot tell a churn-induced outage from a webhook that was" >&2
+            echo "  already down, and every apply below goes through it, so it stops here" >&2
+            echo "  rather than reporting the wrong cause." >&2
+            kubectl -n "$svcns" get endpointslice -l "kubernetes.io/service-name=$svcname" -o yaml >&2 2>&1 || true
+            kubectl -n "$svcns" get pods -o wide >&2 2>&1 || true
+            return 1
+          }
+
+          # EVERY registration of the named webhook, not just the first. All of
+          # them fire on the applies below, so one being down aborts the apply
+          # and the failure would be reported as a churn-induced outage. The
+          # loop indexes with sed rather than piping into `while read`, because
+          # a pipeline's body runs in a subshell under dash and a `return` from
+          # it would not reach this function.
+          require_webhook_up() {
+            label="$1"; kind="$2"; hook="$3"; budget="$4"
+            coords=$(webhook_services "$kind" | awk -v h="$hook" '$1 == h { print $2, $3 }')
+            [ -n "$coords" ] || {
+              echo "SETUP FAILURE: no $kind registers webhook $hook, so its availability cannot be asserted" >&2
+              return 1
+            }
+            total=$(printf '%s\n' "$coords" | grep -c . || true)
+            [ -n "$total" ] || total=0
+            i=0
+            while [ "$i" -lt "$total" ]; do
+              i=$(( i + 1 ))
+              line=$(printf '%s\n' "$coords" | sed -n "${i}p")
+              require_service_up "$label ($i/$total)" "${line% *}" "${line#* }" "$budget" || return 1
+            done
+            return 0
+          }
+
+          require_webhook_up "ingress admission" validatingwebhookconfigurations \
+            validate.nginx.ingress.kubernetes.io 90
+          require_webhook_up "pod admission" mutatingwebhookconfigurations \
+            kube-ovn-webhook.cozystack.io 90
+
+          # Reproduce the incident shape: an ordinary tenant namespace carrying
+          # an admitted Ingress AND a running pod, deleted synchronously, with
+          # the fail-closed webhooks invoked while Cilium processes the removal.
+          #
+          # The pod is what makes this a churn test rather than a smoke test. A
+          # Cilium identity is the set of an endpoint's identity-relevant
+          # labels, and k8s:io.kubernetes.pod.namespace is one of them, so a pod
+          # in a brand-new namespace allocates a NEW identity, and deleting the
+          # namespace releases it. An empty namespace has no endpoint, allocates
+          # no identity, and its deletion drives no identity churn at all, so
+          # without the pod this case would exercise nothing it names.
+          kubectl delete namespace "$churn_ns" --ignore-not-found --wait=true --timeout=60s
+          kubectl apply -f - <<EOF
+          apiVersion: v1
+          kind: Namespace
+          metadata:
+            name: ${churn_ns}
+            labels:
+              namespace.cozystack.io/host: churn.${apex}
+          EOF
+          kubectl apply -n "$churn_ns" -f - <<EOF
+          apiVersion: networking.k8s.io/v1
+          kind: Ingress
+          metadata:
+            name: admission-churn-source
+          spec:
+            rules:
+            - host: probe.churn.${apex}
+              http:
+                paths:
+                - path: /
+                  pathType: Prefix
+                  backend:
+                    service:
+                      name: noop
+                      port:
+                        number: 80
+          EOF
+          # busybox:musl is staged onto every node by hack/e2e-prepull-images.sh,
+          # so this adds no image pull. The securityContext satisfies the
+          # restricted PodSecurity profile, so it runs whatever level the tenant
+          # namespace enforces.
+          kubectl apply -n "$churn_ns" -f - <<'EOF'
+          apiVersion: v1
+          kind: Pod
+          metadata:
+            name: admission-churn-identity
+          spec:
+            restartPolicy: Never
+            automountServiceAccountToken: false
+            securityContext:
+              runAsNonRoot: true
+              runAsUser: 65534
+              runAsGroup: 65534
+              seccompProfile:
+                type: RuntimeDefault
+            containers:
+            - name: hold
+              image: busybox:musl
+              command: ["sleep", "600"]
+              securityContext:
+                allowPrivilegeEscalation: false
+                capabilities:
+                  drop: ["ALL"]
+          EOF
+          kubectl -n "$churn_ns" wait --for=condition=Ready pod/admission-churn-identity --timeout=90s || {
+            echo "SETUP FAILURE: the churn pod never became Ready, so deleting $churn_ns releases no Cilium identity and this test would assert nothing" >&2
+            kubectl -n "$churn_ns" describe pod admission-churn-identity >&2 2>&1 || true
+            exit 1
+          }
+
+          kubectl delete namespace "$churn_ns" --wait=true --timeout=180s
+
+          # No retry on either call: a retry would paper over exactly the window
+          # this test exists to catch.
+          #
+          # ingress-nginx validating admission
+          kubectl apply --dry-run=server -n "$ns" -o name -f - <<EOF
+          apiVersion: networking.k8s.io/v1
+          kind: Ingress
+          metadata:
+            name: admission-after-churn
+          spec:
+            rules:
+            - host: admission-after-churn.${apex}
+              http:
+                paths:
+                - path: /
+                  pathType: Prefix
+                  backend:
+                    service:
+                      name: noop
+                      port:
+                        number: 80
+          EOF
+
+          # kubeovn-webhook mutating admission. The securityContext is carried
+          # even though a server dry-run Pod is never scheduled: if the tenant
+          # namespace ever enforces restricted PodSecurity, a non-compliant Pod
+          # is rejected in the validating phase and `set -eu` would abort this
+          # check, which reads as the webhook being down.
+          kubectl apply --dry-run=server -n "$ns" -o name -f - <<'EOF'
+          apiVersion: v1
+          kind: Pod
+          metadata:
+            name: admission-after-churn
+          spec:
+            restartPolicy: Never
+            automountServiceAccountToken: false
+            securityContext:
+              runAsNonRoot: true
+              runAsUser: 65534
+              runAsGroup: 65534
+              seccompProfile:
+                type: RuntimeDefault
+            containers:
+            - name: pause
+              image: registry.k8s.io/pause:3.10
+              securityContext:
+                allowPrivilegeEscalation: false
+                capabilities:
+                  drop: ["ALL"]
+          EOF
+          echo "OK   both fail-closed webhooks admitted after $churn_ns was deleted"
+        check:
+          ($error == null): true
+    finally:
+    - delete:
+        ref:
+          apiVersion: v1
+          kind: Namespace
+          name: tenant-admission-churn-probe
+---
+# Companion to admission-webhooks-survive-namespace-churn above. That test
+# proves the webhooks stay AVAILABLE; this one proves they are still
+# UNREACHABLE from pods, which is the property the policies exist for, and that
+# the deny is scoped to the webhook port alone.
+#
+# The third assertion is the one that earns this test. The policies previously
+# expressed the Service-frontend deny with `toServices`, which Cilium resolves
+# only inside ALLOW rules -- leaving the deny rule with an empty L3 selector
+# that Cilium reads as a wildcard, so "deny this Service on 443" became "deny
+# EVERY destination on 443" for every selected pod. Every rendered-YAML
+# assertion in the package suites passed on that policy. Only a probe that
+# checks an unrelated 443 destination still works can tell the two apart, and
+# the ingress controller's own HTTPS port is exactly that: the same pods, the
+# same tenant egress allowances, a different port.
+#
+# Runs in tenant-root because that is where the host cluster's ingress-nginx
+# lives and where pods are permitted to reach it (allow-internal-communication),
+# so the deny is the only thing that can block the webhook port. From the
+# isolated tenant-test the probe would pass for the wrong reason.
+#
+# And "for the wrong reason" is the whole difficulty, because a refused connect
+# does not say why it was refused. "Denied by policy" and "no backend to route
+# to" are the same observation from inside the probe, so both deny assertions
+# would report success against a cluster with no policy installed at all, as
+# long as the backend was dead. That is what the first run of this case did:
+# the controller was crash-looping on a ~100s cycle, `kubectl wait` caught it
+# during a Ready window, the probe then measured a corpse, and the port-scoping
+# assertion reported a policy bug that did not exist.
+#
+# So the deny verdicts here are gated on the admission Service having ready
+# backends before the probe, on every sample while it runs, and after it
+# finishes, and on the controller pods not having restarted or been replaced
+# across that window. The probe itself only reports reachable/unreachable per
+# destination and always exits 0; this script attributes the cause, because it
+# is the half that holds the endpoint evidence. Anything that leaves the
+# question undecidable fails as a setup failure rather than as a verdict.
+apiVersion: chainsaw.kyverno.io/v1alpha1
+kind: Test
+metadata:
+  name: admission-webhook-deny-still-enforced
+spec:
+  namespace: tenant-root
+  catch:
+  - events: {}
+  steps:
+  - name: pods-cannot-reach-the-webhook-but-keep-unrelated-443-egress
+    try:
+    - script:
+        # Above the sum of the inner budgets, per the rule in
+        # hack/e2e-chainsaw/.chainsaw.yaml: 120s of endpoint precondition, 30s
+        # of stability sampling, 60s to clear a leftover probe and 180s of
+        # phase polling = 390s. The previous 6m sat BELOW its own sum, so a
+        # slow-but-healthy cluster was killed before the diagnostics ran.
+        timeout: 10m
+        content: |
+          set -eu
+          ns="$NAMESPACE"
+          probe=admission-deny-probe
+          sel=app.kubernetes.io/name=ingress-nginx,app.kubernetes.io/component=controller
+
+          svcs=$(kubectl -n "$ns" get svc -l "$sel" \
+            -o jsonpath='{range .items[*]}{.metadata.name}{"\n"}{end}')
+          adm_candidates=$(printf '%s\n' "$svcs" | grep -- '-admission$' || true)
+          # -metrics is excluded explicitly rather than relying on
+          # ingress-nginx-controller sorting before a metrics Service: the
+          # positive control has to be the one unambiguous controller Service.
+          ctl_candidates=$(printf '%s\n' "$svcs" | grep -v -- '-admission$' | grep -v -- '-metrics$' | grep . || true)
+          adm_count=$(printf '%s\n' "$adm_candidates" | grep -c . || true)
+          ctl_count=$(printf '%s\n' "$ctl_candidates" | grep -c . || true)
+          [ "$adm_count" -eq 1 ] || {
+            echo "SETUP FAILURE: expected one ingress-nginx admission Service in $ns, found $adm_count" >&2
+            printf '  candidates: %s\n' "${adm_candidates:-<none>}" >&2
+            exit 1
+          }
+          [ "$ctl_count" -eq 1 ] || {
+            echo "SETUP FAILURE: expected one ingress-nginx controller Service in $ns, found $ctl_count" >&2
+            printf '  candidates: %s\n' "${ctl_candidates:-<none>}" >&2
+            exit 1
+          }
+          adm=$adm_candidates
+          ctl=$ctl_candidates
+
+          service_port() {
+            kubectl -n "$ns" get svc "$1" -o json | jq -r --arg port_name "$2" '
+              [.spec.ports[]?
+               | select(.name == $port_name)
+               | select((.protocol // "TCP") == "TCP")
+               | .port
+               | select(type == "number")]
+              | if length == 1 then .[0] else empty end
+            '
+          }
+          adm_port=$(service_port "$adm" https-webhook)
+          ctl_port=$(service_port "$ctl" https)
+          adm_cluster_ip=$(kubectl -n "$ns" get svc "$adm" -o jsonpath='{.spec.clusterIP}')
+          [ -n "$adm_cluster_ip" ] && [ "$adm_cluster_ip" != None ] || {
+            echo "SETUP FAILURE: $adm must have a real ClusterIP, found ${adm_cluster_ip:-<empty>}" >&2
+            kubectl -n "$ns" get svc "$adm" -o yaml >&2 2>&1 || true
+            exit 1
+          }
+          [ -n "$adm_port" ] || {
+            echo "SETUP FAILURE: $adm must expose exactly one TCP https-webhook port" >&2
+            kubectl -n "$ns" get svc "$adm" -o yaml >&2 2>&1 || true
+            exit 1
+          }
+          [ -n "$ctl_port" ] || {
+            echo "SETUP FAILURE: $ctl must expose exactly one TCP https port" >&2
+            kubectl -n "$ns" get svc "$ctl" -o yaml >&2 2>&1 || true
+            exit 1
+          }
+
+          # Ready endpoint addresses behind a Service, from EndpointSlice rather
+          # than from pod readiness: this is the state the API server and the
+          # service load balancer route on.
+          ready_backends() {
+            n=$(kubectl -n "$ns" get endpointslice -l "kubernetes.io/service-name=$1" \
+              -o jsonpath='{range .items[*]}{range .endpoints[*]}{.conditions.ready}{"\n"}{end}{end}' \
+              2>/dev/null | grep -c '^true$' || true)
+            [ -n "$n" ] || n=0
+            echo "$n"
+          }
+
+          # Exact ready admission coordinates. The Pod identity, IP and backend
+          # port come from the same EndpointSlice as the ready condition;
+          # selecting them independently from .items[0] could probe an unready
+          # replica while a different replica kept aggregate readiness above
+          # zero.
+          ready_admission_backends() {
+            kubectl -n "$ns" get endpointslice -l "kubernetes.io/service-name=$adm" -o json | jq -r '
+              .items[]? as $slice
+              | $slice.ports[]? as $port
+              | select($port.name == "https-webhook")
+              | select(($port.protocol // "TCP") == "TCP")
+              | select(($port.port | type) == "number")
+              | $slice.endpoints[]?
+              | select(.conditions.ready == true)
+              | select(.targetRef.kind == "Pod")
+              | select((.targetRef.name // "") != "")
+              | select((.targetRef.uid // "") != "")
+              | .targetRef.name as $pod
+              | .targetRef.uid as $uid
+              | .addresses[]?
+              | select(type == "string" and length > 0)
+              | [$pod, $uid, ., ($port.port | tostring)]
+              | @tsv
+            ' | sort -u
+          }
+
+          # Pod identity, IP and every container restart count, as one string.
+          # Compared for equality across the probe window, so a restart AND a
+          # replacement both show up -- a crash-looping controller can satisfy
+          # a readiness check at both ends of a window it spent dying in the
+          # middle of.
+          controller_generation() {
+            generation=$(kubectl -n "$ns" get pod -l "$sel" \
+              -o jsonpath='{range .items[*]}{.metadata.name}/{.metadata.uid}/{.status.podIP}={range .status.containerStatuses[*]}{.name}:{.restartCount},{end}{"\n"}{end}') || {
+              echo "SETUP FAILURE: unable to read ingress-nginx controller generation" >&2
+              return 1
+            }
+            [ -n "$generation" ] || {
+              echo "SETUP FAILURE: ingress-nginx controller generation is empty" >&2
+              return 1
+            }
+            printf '%s\n' "$generation" | sort
+          }
+
+          # Precondition. Both Services are backed by the same controller pods,
+          # so requiring the admission Service to be live also establishes that
+          # the controller Service -- the positive control below -- has a
+          # backend to answer.
+          deadline=$(( $(date +%s) + 120 ))
+          while :; do
+            adm_ready=$(ready_admission_backends | grep -c . || true)
+            ctl_ready=$(ready_backends "$ctl")
+            if [ "$adm_ready" -gt 0 ] && [ "$ctl_ready" -gt 0 ]; then break; fi
+            [ "$(date +%s)" -lt "$deadline" ] || {
+              echo "SETUP FAILURE: no ready backend for $adm ($adm_ready) or $ctl ($ctl_ready) after 120s." >&2
+              echo "  A refused connect cannot be attributed to policy while the destination" >&2
+              echo "  has nothing listening, so this test stops instead of reporting a deny" >&2
+              echo "  it did not observe." >&2
+              kubectl -n "$ns" get endpointslice -l "kubernetes.io/service-name=$adm" -o yaml >&2 2>&1 || true
+              kubectl -n "$ns" get pod -l "$sel" -o wide >&2 2>&1 || true
+              exit 1
+            }
+            sleep 5
+          done
+
+          backend=$(ready_admission_backends | head -1)
+          [ -n "$backend" ] || { echo "SETUP FAILURE: $adm has no complete ready Pod/UID/IP/port coordinate" >&2; exit 1; }
+          tab=$(printf '\t')
+          backend_fields=$(printf '%s\n' "$backend" | awk -F "$tab" '{ print NF }')
+          [ "$backend_fields" -eq 4 ] || { echo "SETUP FAILURE: malformed ready backend coordinate: $backend" >&2; exit 1; }
+          pod_name=$(printf '%s\n' "$backend" | cut -f1)
+          pod_uid=$(printf '%s\n' "$backend" | cut -f2)
+          pod_ip=$(printf '%s\n' "$backend" | cut -f3)
+          hook_port=$(printf '%s\n' "$backend" | cut -f4)
+          [ -n "$pod_name" ] && [ -n "$pod_uid" ] && [ -n "$pod_ip" ] && [ -n "$hook_port" ] || {
+            echo "SETUP FAILURE: incomplete ready backend coordinate: $backend" >&2
+            exit 1
+          }
+
+          selected_backend_ready() {
+            ready_admission_backends | awk -F "$tab" \
+              -v pod="$pod_name" -v uid="$pod_uid" -v ip="$pod_ip" -v port="$hook_port" '
+                $1 == pod && $2 == uid && $3 == ip && $4 == port { found = 1 }
+                END { exit !found }
+              '
+          }
+
+          require_selected_backend() {
+            selected_backend_ready && return 0
+            echo "SETUP FAILURE: selected admission backend $pod_name/$pod_uid ($pod_ip:$hook_port) was not ready $1" >&2
+            kubectl -n "$ns" get endpointslice -l "kubernetes.io/service-name=$adm" -o yaml >&2 2>&1 || true
+            kubectl -n "$ns" get pod "$pod_name" -o wide >&2 2>&1 || true
+            exit 1
+          }
+
+          require_selected_backend "before the stability window"
+
+          # Stability: the same evidence held across a window, not at one
+          # instant. Six samples over 30s, all of which must be live and show no
+          # restart or replacement.
+          gen_before=$(controller_generation)
+          printf '%s\n' "$gen_before" | awk \
+            -v prefix="${pod_name}/${pod_uid}/${pod_ip}=" '
+              index($0, prefix) == 1 { found = 1 }
+              END { exit !found }
+            ' || {
+              echo "SETUP FAILURE: selected admission backend is not a current controller Pod: $backend" >&2
+              exit 1
+            }
+          i=0
+          while [ "$i" -lt 6 ]; do
+            sleep 5
+            i=$(( i + 1 ))
+            require_selected_backend "during the stability window (sample $i)"
+            n=$(ready_backends "$ctl")
+            [ "$n" -gt 0 ] || {
+              echo "SETUP FAILURE: $ctl lost its ready backend during the stability window (sample $i)" >&2
+              kubectl -n "$ns" get pod -l "$sel" -o wide >&2 2>&1 || true
+              exit 1
+            }
+          done
+          gen_stable=$(controller_generation)
+          [ "$gen_stable" = "$gen_before" ] || {
+            echo "SETUP FAILURE: the ingress-nginx controller restarted or was replaced during the stability window" >&2
+            echo "  before: $gen_before" >&2
+            echo "  after:  $gen_stable" >&2
+            kubectl -n "$ns" get pod -l "$sel" -o wide >&2 2>&1 || true
+            exit 1
+          }
+
+          echo "probing from $ns: expect reachable ${ctl}:${ctl_port}, denied ${adm}@${adm_cluster_ip}:${adm_port}, denied ${pod_name}/${pod_uid}@${pod_ip}:${hook_port}"
+
+          kubectl -n "$ns" delete pod "$probe" --ignore-not-found --wait=true --timeout=60s
+          # busybox:musl is staged onto every node by hack/e2e-prepull-images.sh,
+          # so this adds no image pull. The securityContext satisfies the
+          # restricted PodSecurity profile, so the probe runs in a tenant
+          # namespace whatever level is enforced there.
+          kubectl -n "$ns" apply -f - <<EOF
+          apiVersion: v1
+          kind: Pod
+          metadata:
+            name: ${probe}
+          spec:
+            restartPolicy: Never
+            automountServiceAccountToken: false
+            securityContext:
+              runAsNonRoot: true
+              runAsUser: 65534
+              runAsGroup: 65534
+              seccompProfile:
+                type: RuntimeDefault
+            containers:
+            - name: probe
+              image: busybox:musl
+              securityContext:
+                allowPrivilegeEscalation: false
+                capabilities:
+                  drop: ["ALL"]
+              env:
+              - name: CTL_HOST
+                value: "${ctl}.${ns}.svc"
+              - name: CTL_PORT
+                value: "${ctl_port}"
+              - name: ADM_HOST
+                value: "${adm_cluster_ip}"
+              - name: ADM_PORT
+                value: "${adm_port}"
+              - name: POD_IP
+                value: "${pod_ip}"
+              - name: HOOK_PORT
+                value: "${hook_port}"
+              command: ["sh", "-c"]
+              args:
+              # Measurement only, and always exit 0. The pod reports what it
+              # observed per destination; the script that started it holds the
+              # endpoint evidence and is the only place that can say why a
+              # connect was refused. Keeping the verdict out of here is also
+              # what stops "the probe could not run" from being read as "the
+              # assertion failed".
+              - |
+                set -u
+                reach() { nc -w 5 "\$1" "\$2" </dev/null >/dev/null 2>&1; }
+                report() {
+                  if reach "\$2" "\$3"; then
+                    echo "\$1 reachable \$2:\$3"
+                  else
+                    echo "\$1 unreachable \$2:\$3"
+                  fi
+                }
+                report CTL "\$CTL_HOST" "\$CTL_PORT"
+                report ADM "\$ADM_HOST" "\$ADM_PORT"
+                report HOOK "\$POD_IP" "\$HOOK_PORT"
+          EOF
+
+          # Wait for a terminal phase rather than a condition, and re-check the
+          # backend on every poll: a controller that dies mid-probe invalidates
+          # the deny verdicts, and this is the window it would die in.
+          deadline=$(( $(date +%s) + 180 ))
+          phase=""
+          while [ "$(date +%s)" -lt "$deadline" ]; do
+            require_selected_backend "while the probe was running"
+            n=$(ready_backends "$ctl")
+            [ "$n" -gt 0 ] || {
+              echo "SETUP FAILURE: $ctl lost its ready backend while the probe was running, so an unreachable positive control proves nothing" >&2
+              kubectl -n "$ns" get pod -l "$sel" -o wide >&2 2>&1 || true
+              kubectl -n "$ns" logs "$probe" >&2 2>&1 || true
+              exit 1
+            }
+            phase=$(kubectl -n "$ns" get pod "$probe" -o jsonpath='{.status.phase}' 2>/dev/null || true)
+            case "$phase" in Succeeded|Failed) break ;; esac
+            sleep 3
+          done
+
+          log=$(kubectl -n "$ns" logs "$probe" 2>&1 || true)
+          printf '%s\n' "$log"
+
+          # Postcondition, before the log is interpreted at all.
+          [ "$phase" = "Succeeded" ] || {
+            echo "SETUP FAILURE: the probe did not run to completion (phase=${phase:-unknown})" >&2
+            kubectl -n "$ns" describe pod "$probe" >&2 2>&1 || true
+            exit 1
+          }
+          gen_after=$(controller_generation)
+          [ "$gen_after" = "$gen_before" ] || {
+            echo "SETUP FAILURE: the ingress-nginx controller restarted or was replaced during the probe" >&2
+            echo "  before: $gen_before" >&2
+            echo "  after:  $gen_after" >&2
+            kubectl -n "$ns" get pod -l "$sel" -o wide >&2 2>&1 || true
+            exit 1
+          }
+          require_selected_backend "after the probe"
+          n=$(ready_backends "$ctl")
+          [ "$n" -gt 0 ] || {
+            echo "SETUP FAILURE: $ctl has no ready backend after the probe, so its unreachability proves nothing" >&2
+            exit 1
+          }
+
+          verdict() { printf '%s\n' "$log" | awk -v k="$1" '$1 == k { print $2; exit }'; }
+          ctl_seen=$(verdict CTL)
+          adm_seen=$(verdict ADM)
+          hook_seen=$(verdict HOOK)
+          for v in "$ctl_seen" "$adm_seen" "$hook_seen"; do
+            [ -n "$v" ] || {
+              echo "SETUP FAILURE: the probe did not report all three destinations" >&2
+              exit 1
+            }
+          done
+
+          # From here every branch is a real verdict: the exact direct
+          # destination stayed ready before, throughout and after, and the
+          # controller pods neither restarted nor were replaced.
+          rc=0
+          if [ "$ctl_seen" = reachable ]; then
+            echo "OK   unrelated 443 egress works (${ctl}:${ctl_port})"
+          else
+            echo "BUG  unrelated 443 egress DENIED to a live backend (${ctl}:${ctl_port}) -- the webhook deny is not scoped to the webhook port" >&2
+            rc=1
+          fi
+          if [ "$adm_seen" = unreachable ]; then
+            echo "OK   webhook denied through its Service ClusterIP"
+          else
+            echo "BUG  webhook reachable through its Service ClusterIP (${adm}:${adm_port})" >&2
+            rc=1
+          fi
+          if [ "$hook_seen" = unreachable ]; then
+            echo "OK   webhook denied on its backend port"
+          else
+            echo "BUG  webhook reachable directly on its backend port (${pod_ip}:${hook_port})" >&2
+            rc=1
+          fi
+          exit "$rc"
+        check:
+          ($error == null): true
+    finally:
+    - delete:
+        ref:
+          apiVersion: v1
+          kind: Pod
+          name: admission-deny-probe
diff --git a/hack/e2e-chainsaw/gateway/gw-minimal.yaml b/hack/e2e-chainsaw/gateway/gw-minimal.yaml
new file mode 100644
index 0000000000..4e89cc0a1c
--- /dev/null
+++ b/hack/e2e-chainsaw/gateway/gw-minimal.yaml
@@ -0,0 +1,13 @@
+apiVersion: gateway.networking.k8s.io/v1
+kind: Gateway
+metadata:
+  name: gateway-e2e-probe
+spec:
+  gatewayClassName: cilium
+  listeners:
+  - name: http
+    protocol: HTTP
+    port: 80
+    allowedRoutes:
+      namespaces:
+        from: Same
diff --git a/hack/e2e-chainsaw/gateway/gw-route-probe.yaml b/hack/e2e-chainsaw/gateway/gw-route-probe.yaml
new file mode 100644
index 0000000000..f391dcb035
--- /dev/null
+++ b/hack/e2e-chainsaw/gateway/gw-route-probe.yaml
@@ -0,0 +1,22 @@
+# Only the Gateway lives here. Its HTTPRoute is created by the
+# create-gateway-and-route step instead: the route sits in a tenant-*
+# namespace, so cozystack-route-hostname-policy requires it to name a
+# hostname inside the tenant apex, and that apex is read from the
+# namespace label at runtime so the suite works on any cluster. A
+# declarative file cannot interpolate it.
+apiVersion: gateway.networking.k8s.io/v1
+kind: Gateway
+metadata:
+  name: gateway-route-probe
+spec:
+  gatewayClassName: cilium
+  listeners:
+  # No hostname on the listener, so it matches whatever hostname the
+  # route declares. That is what keeps the Accepted and Programmed
+  # assertions independent of the cluster's apex.
+  - name: http
+    protocol: HTTP
+    port: 80
+    allowedRoutes:
+      namespaces:
+        from: Same
diff --git a/hack/e2e-chainsaw/gateway/ingress-external-allow.yaml b/hack/e2e-chainsaw/gateway/ingress-external-allow.yaml
new file mode 100644
index 0000000000..09eee56230
--- /dev/null
+++ b/hack/e2e-chainsaw/gateway/ingress-external-allow.yaml
@@ -0,0 +1,46 @@
+# Outside-root allowance probes (bats: "allows an Ingress host outside the
+# platform root apex" + "allows an external domain on spec.tls[].hosts").
+# This is the path the kubernetes app's Proxied exposeMethod uses —
+# addons.ingressNginx.hosts routes a user-supplied external domain to a
+# nested cluster — and it must be admitted.
+#
+# shop.external-probe.invalid uses the RFC 2606 reserved TLD, so unlike the
+# bats' shop.example.net it can never collide with a dev cluster's real root
+# apex. Applied declaratively: Chainsaw auto-cleanup deletes both probes.
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: ingress-external-host-probe
+spec:
+  rules:
+  - host: "shop.external-probe.invalid"
+    http:
+      paths:
+      - path: /
+        pathType: Prefix
+        backend:
+          service:
+            name: noop
+            port:
+              number: 80
+---
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: ingress-external-tls-probe
+spec:
+  tls:
+  - hosts:
+    - "shop.external-probe.invalid"
+    secretName: noop-tls
+  rules:
+  - host: "shop.external-probe.invalid"
+    http:
+      paths:
+      - path: /
+        pathType: Prefix
+        backend:
+          service:
+            name: noop
+            port:
+              number: 80
diff --git a/hack/e2e-chainsaw/gateway/package-attach-probe.yaml b/hack/e2e-chainsaw/gateway/package-attach-probe.yaml
new file mode 100644
index 0000000000..e08ab86ec0
--- /dev/null
+++ b/hack/e2e-chainsaw/gateway/package-attach-probe.yaml
@@ -0,0 +1,12 @@
+apiVersion: cozystack.io/v1alpha1
+kind: Package
+metadata:
+  name: vap-accept-probe
+spec:
+  variant: isp-full
+  components:
+    platform:
+      values:
+        gateway:
+          attachedNamespaces:
+          - tenant-alice
diff --git a/hack/e2e-chainsaw/harbor/chainsaw-test.yaml b/hack/e2e-chainsaw/harbor/chainsaw-test.yaml
new file mode 100644
index 0000000000..10edc792d1
--- /dev/null
+++ b/hack/e2e-chainsaw/harbor/chainsaw-test.yaml
@@ -0,0 +1,266 @@
+# Chainsaw port of hack/e2e-apps/harbor.bats ("Create Harbor").
+#
+# The BATS test hand-rolled a large diagnostic dump on the harbor-test-system
+# HelmRelease wait; here that becomes the test-wide catch block, which fires on
+# any step failure.
+apiVersion: chainsaw.kyverno.io/v1alpha1
+kind: Test
+metadata:
+  name: harbor
+spec:
+  catch:
+  - events: {}
+  - describe:
+      apiVersion: helm.toolkit.fluxcd.io/v2
+      kind: HelmRelease
+      name: harbor-test
+  - describe:
+      apiVersion: helm.toolkit.fluxcd.io/v2
+      kind: HelmRelease
+      name: harbor-test-system
+  - describe:
+      apiVersion: objectstorage.k8s.io/v1alpha1
+      kind: BucketClaim
+      name: harbor-test-registry
+  - describe:
+      apiVersion: objectstorage.k8s.io/v1alpha1
+      kind: BucketAccess
+      name: harbor-test-registry
+  # The backend view: cluster-scoped Buckets plus the COSI controller pods,
+  # where a frozen-claim readiness propagation failure actually surfaces.
+  - get:
+      apiVersion: objectstorage.k8s.io/v1alpha1
+      kind: Bucket
+      format: yaml
+  - script:
+      content: kubectl -n cozy-objectstorage-controller get pods
+  # The app chart wraps the workload in a nested HelmRelease named
+  # `<release>-system`, and the chart behind it stamps
+  # app.kubernetes.io/instance from its own release name. So the Harbor pods
+  # carry `harbor-test-system`, and the unsuffixed value this collector used to
+  # hold reached none of them, on every failed run.
+  #
+  # Coverage boundary, so the absence of a component here is not read as its
+  # health: this selector reaches the workload of the nested release — core,
+  # registry, portal, jobservice, nginx, exporter, and trivy when it is
+  # enabled (the manifest for this suite disables it). The Redis pods carry
+  # `harbor-test-redis`, so this selector misses them, but the script below
+  # collects their logs by `rf[rs]-` name prefix. The CNPG database is covered
+  # by the podLogs op below, on a different label.
+  #
+  # Nothing here collects the parent chart's post-delete cleanup Job, which
+  # labels its pod template with the unsuffixed parent release name. That is
+  # not an oversight: this suite has no `delete` op, so the parent release is
+  # uninstalled only in Chainsaw's cleanup phase, and catch cannot observe it
+  # -- catch is a defer inside the step, while the cleaner runs from t.Cleanup,
+  # after the test function has returned. A collector on the unsuffixed value
+  # would be a permanently-empty capture, the defect these selectors exist to
+  # avoid. The qdrant suite deletes inside a `try:`, so there the Job is at
+  # least in scope, and that suite carries the collector with its own note on
+  # when it captures anything.
+  - podLogs:
+      selector: app.kubernetes.io/instance=harbor-test-system
+      tail: 50
+  # harbor-test readiness gates on this database, so its logs are the evidence
+  # for a whole class of failed runs. Selected on `cnpg.io/cluster`, CNPG's own
+  # primary label, rather than on app.kubernetes.io/instance, which CNPG only
+  # derives from the Cluster name: the primary label has nothing to drift from,
+  # and it is what the postgres suite and the WorkloadMonitors already use.
+  - podLogs:
+      selector: cnpg.io/cluster=harbor-test-db
+      tail: 50
+  # podLogs cannot report that it matched nothing, so an empty capture above and
+  # a selector that has gone stale look identical. Print the instance label of
+  # every pod in the namespace instead. Deliberately no selector is repeated
+  # here: a copy would only prove itself right, and would keep matching after
+  # the collector's own selector drifted. The census shows the values that
+  # actually exist, so a reader can see whether the selector above can match.
+  #
+  # What is and is not guarded, so the next reader does not assume more:
+  # the `-system` value above is also pinned on a resource in a `steps:` assert
+  # below, so the chart renaming that label turns a step red -- that is the
+  # drift this pin exists to catch. It does NOT catch a wrong value typed into the
+  # selector here: the assert pins the label on the resource, this pins it in
+  # the collector, and they are two literals. It also catches nothing when the
+  # run fails before reaching that assert. The census below covers neither, and
+  # is not meant to -- it answers what the labels actually are.
+  # The `cnpg.io/cluster` selector has no pin at all; it rides on CNPG's
+  # primary label instead, which is the reason for choosing it.
+  - script:
+      # The helper bounds each kubectl attempt with --request-timeout, which on
+      # a degraded cluster costs about five times the flag; one call is ~75s at
+      # worst, and this op timeout sits above that so an inner budget is what
+      # fires. A SIGKILL at the op boundary would take the census out mid-write
+      # and yield nothing, where a kubectl that gives up leaves an error to
+      # print. The helper carries the rest of the rationale and is unit-tested
+      # in hack/pod-label-census_test.bats.
+      timeout: 2m
+      content: |
+        set -eu
+        cd ../../..
+        . hack/e2e-chainsaw/_lib/pod-label-census.sh
+        pod_label_census "$NAMESPACE"
+  # harbor-test readiness is gated by the inline RedisFailover
+  # harbor-test-redis: its three sentinels stay NotReady until the spotahome
+  # redis-operator elects a master and rewrites their monitored-master config.
+  # None of the collectors above see that path: the instance selector above
+  # matches neither the operator (namespace cozy-redis-operator) nor the
+  # rfr-/rfs- pods, which carry `harbor-test-redis`, and the RedisFailover CRD
+  # ships no status subresource, so there is nothing to assert on declaratively.
+  - describe:
+      apiVersion: databases.spotahome.com/v1
+      kind: RedisFailover
+      name: harbor-test-redis
+  - podLogs:
+      namespace: cozy-redis-operator
+      selector: app.kubernetes.io/name=redis-operator
+      tail: 200
+  - script:
+      # A script rather than more podLogs entries: the -o wide pod tables and
+      # the rfr-/rfs- name-prefix match (independent of the operator's
+      # pod-label scheme) are not expressible declaratively. Every command is
+      # best-effort (|| true) so diagnostics never mask the test's own error;
+      # no inner timeout wrappers, so the 2m op timeout is the only budget.
+      timeout: 2m
+      content: |
+        set -u
+        echo "== redis-operator pods (cozy-redis-operator) =="
+        kubectl -n cozy-redis-operator get pods -o wide || true
+        echo "== rfr-/rfs- pod states ($NAMESPACE) =="
+        kubectl -n "$NAMESPACE" get pods -o wide | grep -E 'rf[rs]-harbor-test-redis' || true
+        for p in $(kubectl -n "$NAMESPACE" get pods -o name | grep -E 'rf[rs]-harbor-test-redis'); do
+          echo "== logs $p =="
+          kubectl -n "$NAMESPACE" logs "$p" --all-containers --tail=100 --prefix || true
+        done
+  steps:
+  - name: create-harbor
+    try:
+    - apply:
+        file: harbor.yaml
+
+  - name: wait-helmrelease-ready
+    try:
+    # harbor-test readiness is gated by the inline RedisFailover, whose three
+    # sentinels only go Ready after the freshworks-oss redis-operator elects a
+    # master and rewrites their config; normal convergence is 2-3m, but on a
+    # CPU-committed runner the tail runs long (steal-induced probe misses,
+    # documented in pull-requests.yaml). 11m sits above the 600s install
+    # timeout cozystack-api gives this release, so a failed install has
+    # recorded its reason first; see "Sizing an HR-Ready budget" in
+    # docs/agents/e2e-testing.md. On a timeout, the catch block's
+    # redis-operator log shows which reconcile gate stalled.
+    - assert:
+        timeout: 11m
+        resource:
+          apiVersion: helm.toolkit.fluxcd.io/v2
+          kind: HelmRelease
+          metadata:
+            name: harbor-test
+          status:
+            (conditions[?type == 'Ready']):
+            - status: "True"
+
+  - name: wait-cosi-bucket
+    try:
+    # 2m, not the default 5m: the objectstorage-controller requeues the
+    # BucketClaim until the backend Bucket is ready, so readiness converges
+    # within tens of seconds; a claim still not ready after 2m is frozen
+    # (readiness-propagation regression), and the tight bound surfaces that
+    # instead of masking it (mirrors the bats 120s budget from 63d14e748).
+    - assert:
+        timeout: 2m
+        resource:
+          apiVersion: objectstorage.k8s.io/v1alpha1
+          kind: BucketClaim
+          metadata:
+            name: harbor-test-registry
+          status:
+            bucketReady: true
+    - assert:
+        timeout: 1m
+        resource:
+          apiVersion: objectstorage.k8s.io/v1alpha1
+          kind: BucketAccess
+          metadata:
+            name: harbor-test-registry
+          status:
+            accessGranted: true
+
+  - name: wait-system-and-deployments
+    try:
+    # 16m: this release is rendered by
+    # packages/apps/harbor/templates/harbor.yaml, whose spec.timeout of 15m is
+    # its install timeout; see "Sizing an HR-Ready budget" in
+    # docs/agents/e2e-testing.md.
+    - assert:
+        timeout: 16m
+        resource:
+          apiVersion: helm.toolkit.fluxcd.io/v2
+          kind: HelmRelease
+          metadata:
+            name: harbor-test-system
+          status:
+            (conditions[?type == 'Ready']):
+            - status: "True"
+    - assert:
+        timeout: 2m
+        resource:
+          apiVersion: apps/v1
+          kind: Deployment
+          metadata:
+            name: harbor-test-core
+          # Pins the label the catch collector selects on. Harbor's matchLabels
+          # carry only release+app, so pin the pod template, which is what
+          # podLogs actually matches. Asserts are subset matches, so this costs
+          # nothing and turns a silent drift of the instance label into a red
+          # step instead of an empty capture.
+          spec:
+            template:
+              metadata:
+                labels:
+                  app.kubernetes.io/instance: harbor-test-system
+          status:
+            (conditions[?type == 'Available']):
+            - status: "True"
+    - assert:
+        timeout: 2m
+        resource:
+          apiVersion: apps/v1
+          kind: Deployment
+          metadata:
+            name: harbor-test-registry
+          status:
+            (conditions[?type == 'Available']):
+            - status: "True"
+    - assert:
+        timeout: 2m
+        resource:
+          apiVersion: apps/v1
+          kind: Deployment
+          metadata:
+            name: harbor-test-portal
+          status:
+            (conditions[?type == 'Available']):
+            - status: "True"
+
+  - name: verify-credentials-and-service
+    try:
+    - assert:
+        resource:
+          apiVersion: v1
+          kind: Service
+          metadata:
+            name: harbor-test
+          spec:
+            (ports[0].port): 80
+    - script:
+        content: |
+          set -eu
+          pw=$(kubectl -n "$NAMESPACE" get secret harbor-test-credentials \
+            -o jsonpath='{.data.admin-password}' | base64 -d)
+          url=$(kubectl -n "$NAMESPACE" get secret harbor-test-credentials \
+            -o jsonpath='{.data.url}' | base64 -d)
+          test -n "$pw"
+          echo "$url" | grep -q 'https://'
+        check:
+          ($error == null): true
diff --git a/hack/e2e-chainsaw/harbor/harbor.yaml b/hack/e2e-chainsaw/harbor/harbor.yaml
new file mode 100644
index 0000000000..71e2fe0a16
--- /dev/null
+++ b/hack/e2e-chainsaw/harbor/harbor.yaml
@@ -0,0 +1,27 @@
+apiVersion: apps.cozystack.io/v1alpha1
+kind: Harbor
+metadata:
+  name: test
+spec:
+  host: ""
+  storageClass: ""
+  core:
+    resources: {}
+    resourcesPreset: "nano"
+  registry:
+    resources: {}
+    resourcesPreset: "nano"
+  jobservice:
+    resources: {}
+    resourcesPreset: "nano"
+  trivy:
+    enabled: false
+    size: 2Gi
+    resources: {}
+    resourcesPreset: "nano"
+  database:
+    size: 2Gi
+    replicas: 1
+  redis:
+    size: 1Gi
+    replicas: 1
diff --git a/hack/e2e-chainsaw/kafka-metadata/chainsaw-test.yaml b/hack/e2e-chainsaw/kafka-metadata/chainsaw-test.yaml
new file mode 100644
index 0000000000..c8b559e970
--- /dev/null
+++ b/hack/e2e-chainsaw/kafka-metadata/chainsaw-test.yaml
@@ -0,0 +1,159 @@
+# Full topic-metadata backup -> in-place + to-copy restore round-trip, driving
+# the validated example scripts (examples/backups/kafka-metadata) as the harness
+# so the test and the documented flow cannot drift. run-all.sh seeds topic
+# `orders` with a per-run retention.ms sentinel plus a colliding pair
+# (`audit.events` / `audit-events`, distinct partition counts), submits an ad-hoc
+# BackupJob against this demo's `kafka-metadata` BackupClass, derived from the
+# shipped `cozy-default-kafka` strategy (which exports topic metadata through the
+# Admin API to the system bucket), drops the topics and
+# restores them in place, then restores the metadata onto a fresh empty target —
+# asserting at each step that `orders` came back with the exact partitions and
+# retention sentinel, that each colliding topic kept its own partition count (so
+# the strategy treats --topic as a literal, not a regex), and that the source is
+# left intact. This proves the metadata (not just liveness) round-tripped through
+# object storage.
+#
+# Same harness-driving shape as mongodb-2-backup-roundtrip: a single run step
+# pre-cleans leftover state, drives run-all.sh, and drains in an always-reached
+# finally. Runs in tenant-root (the strategy's backup Job is an in-tenant S3
+# client, and the isolated e2e tenant-test cannot egress to tenant-root's
+# seaweedfs). run-all.sh derives a demo strategy from the shipped
+# cozy-default-kafka; the run step overrides S3_ENDPOINT to the in-cluster
+# seaweedfs .svc FQDN because the shipped strategy's advertised external ingress
+# is an unroutable placeholder in CI, and the .svc name is the one the seaweedfs
+# serving cert's SAN covers (curl verifies TLS against the copied CA).
+# KAFKA_IMAGE for the host-side seed/verify pods is resolved from the running
+# operator so it reuses the cached broker image; the backup/restore Jobs resolve
+# their own image from the target broker (the strategy's .ClientImage).
+apiVersion: chainsaw.kyverno.io/v1alpha1
+kind: Test
+metadata:
+  name: kafka-3-metadata-roundtrip
+spec:
+  namespace: tenant-root
+  skipDelete: true
+  catch:
+  - events: {}
+  - describe:
+      apiVersion: helm.toolkit.fluxcd.io/v2
+      kind: HelmRelease
+      name: kafka-kafka-meta-src
+  - describe:
+      apiVersion: kafka.strimzi.io/v1beta2
+      kind: Kafka
+      name: kafka-kafka-meta-src
+  - describe:
+      apiVersion: backups.cozystack.io/v1alpha1
+      kind: BackupJob
+  - describe:
+      apiVersion: backups.cozystack.io/v1alpha1
+      kind: RestoreJob
+  # The export/import runs in backupstrategy-controller-created Jobs; their pods
+  # carry the kafka.strategy.backups.cozystack.io/mode label.
+  - podLogs:
+      selector: kafka.strategy.backups.cozystack.io/mode
+      tail: 200
+  - podLogs:
+      selector: app.kubernetes.io/instance=kafka-kafka-meta-src
+      tail: 100
+  steps:
+  - name: run
+    try:
+    # Pre-clean: tenant-root is shared and persistent with fixed resource names,
+    # so a run killed before the finally leaves stale state. A leftover
+    # Succeeded BackupJob would satisfy the wait instantly and pass without a
+    # real backup. cleanup.sh is idempotent, so this is a no-op when clean.
+    - script:
+        timeout: 10m
+        content: |
+          set -eu
+          cd ../../..
+          NAMESPACE="$NAMESPACE" examples/backups/kafka-metadata/cleanup.sh
+        check:
+          ($error == null): true
+    # 40m budget: two single-broker Strimzi clusters (source + to-copy target,
+    # each boots ZooKeeper then the broker and passes readiness), the metadata
+    # backup, and the in-place + to-copy restores with their verifications.
+    # run-all.sh fails fast on terminal BackupJob/RestoreJob phases and stalled
+    # HelmReleases rather than polling out the budget.
+    - script:
+        timeout: 40m
+        content: |
+          set -eu
+          cd ../../..
+          [ -x examples/backups/kafka-metadata/run-all.sh ] || { echo "kafka-metadata example scripts not found" >&2; exit 1; }
+          KAFKA_IMAGE=$(kubectl -n cozy-kafka-operator get deploy strimzi-cluster-operator \
+            -o jsonpath='{.spec.template.spec.containers[0].env[?(@.name=="STRIMZI_KAFKA_IMAGES")].value}' \
+            | tr '[:space:]' '\n' | grep '=.*/kafka:' | sed 's/.*=//' | tail -n1)
+          [ -n "$KAFKA_IMAGE" ] || { echo "could not resolve Kafka image from strimzi-cluster-operator" >&2; exit 1; }
+          NAMESPACE="$NAMESPACE" KAFKA_IMAGE="$KAFKA_IMAGE" \
+            S3_ENDPOINT="https://seaweedfs-s3.tenant-root.svc:8333" \
+            examples/backups/kafka-metadata/run-all.sh
+        check:
+          ($error == null): true
+    finally:
+    - description: backup-flow cleanup
+      script:
+        timeout: 10m
+        content: |
+          set -eu
+          cd ../../..
+          NAMESPACE="$NAMESPACE" examples/backups/kafka-metadata/cleanup.sh
+
+  # cleanup.sh above deleted both Kafka apps; the node pools the migration hook
+  # created outside the release manifest must go with their uninstalls. The pod
+  # checks select on strimzi.io/cluster on purpose, so they cover every pod
+  # Strimzi runs for each cluster, not only the brokers.
+  #
+  # 12m per check, because cleanup.sh returns without waiting for the
+  # uninstalls. The pools are deleted inside each release's pre-delete Job,
+  # which activeDeadlineSeconds 270 plus terminationGracePeriodSeconds 10 bound
+  # at 280s; the pods then take Strimzi's default 30s termination grace period.
+  # If the two uninstalls run one after the other, 2 x 280 + 30 = 590s, and the
+  # remaining 130s cover helm-controller picking up each deletion and garbage
+  # collection. Every check carries the whole budget, since the order in which
+  # the two finish is not fixed; a passing run waits only as long as the
+  # uninstalls take.
+  - name: verify-uninstall-removes-node-pools
+    try:
+    - error:
+        timeout: 12m
+        resource:
+          apiVersion: kafka.strimzi.io/v1beta2
+          kind: KafkaNodePool
+          metadata:
+            labels:
+              strimzi.io/cluster: kafka-kafka-meta-src
+    - error:
+        timeout: 12m
+        resource:
+          apiVersion: kafka.strimzi.io/v1beta2
+          kind: KafkaNodePool
+          metadata:
+            labels:
+              strimzi.io/cluster: kafka-kafka-meta-target
+    - error:
+        timeout: 12m
+        resource:
+          apiVersion: v1
+          kind: Pod
+          metadata:
+            labels:
+              strimzi.io/cluster: kafka-kafka-meta-src
+    - error:
+        timeout: 12m
+        resource:
+          apiVersion: v1
+          kind: Pod
+          metadata:
+            labels:
+              strimzi.io/cluster: kafka-kafka-meta-target
+    catch:
+    # A failed error op already names each object still matching. This adds
+    # the StrimziPodSets between the pools and the pods, and the pods' phase.
+    - script:
+        timeout: 1m
+        content: |
+          kubectl -n "$NAMESPACE" --request-timeout=15s \
+            get kafkanodepools.kafka.strimzi.io,strimzipodsets.core.strimzi.io,pods \
+            -l 'strimzi.io/cluster in (kafka-kafka-meta-src,kafka-kafka-meta-target)' -o wide || true
diff --git a/hack/e2e-chainsaw/kafka/chainsaw-test.yaml b/hack/e2e-chainsaw/kafka/chainsaw-test.yaml
new file mode 100644
index 0000000000..dfeb9da2e6
--- /dev/null
+++ b/hack/e2e-chainsaw/kafka/chainsaw-test.yaml
@@ -0,0 +1,378 @@
+# Chainsaw port of hack/e2e-apps/kafka.bats ("Create Kafka"), KRaft edition.
+#
+# The chart deploys Kafka in KRaft mode (no ZooKeeper): a combined-free layout
+# of separate broker + controller KafkaNodePools. This test asserts the KRaft
+# topology renders and converges (both node pools present, the Strimzi Kafka CR
+# reaches kafkaMetadataState=KRaft) and that no ZooKeeper resources remain.
+# The last step deletes the app itself and checks that no node pool or Strimzi
+# pod of this cluster survives the uninstall.
+apiVersion: chainsaw.kyverno.io/v1alpha1
+kind: Test
+metadata:
+  name: kafka
+spec:
+  # A KRaft teardown (broker + controller pools, entity operator, their PVCs)
+  # has more to drain than the shared 5m cleanup default allows once a CI run
+  # is contended, so give this suite a wider cleanup budget — teardown latency,
+  # not the assertions, was deciding the verdict.
+  timeouts:
+    cleanup: 8m
+  catch:
+  - events: {}
+  - describe:
+      apiVersion: helm.toolkit.fluxcd.io/v2
+      kind: HelmRelease
+      name: kafka-test
+  - podLogs:
+      selector: app.kubernetes.io/instance=kafka-test
+      tail: 50
+  steps:
+  - name: create-kafka
+    try:
+    - apply:
+        file: kafka.yaml
+    # Both node pools set deleteClaim: false, so the volumes outlive the app
+    # and would hold their LINSTOR space for every later suite. Chainsaw runs
+    # a step's cleanup ops after this step's cleaner has deleted the app, on a
+    # failed run as well. A volume a terminating broker still mounts finishes
+    # deleting once that pod is gone, and the delete waits for that.
+    cleanup:
+    - delete:
+        ref:
+          apiVersion: v1
+          kind: PersistentVolumeClaim
+          labels:
+            strimzi.io/cluster: kafka-test
+
+  - name: wait-ready
+    try:
+    # Deliberately under the floor: kafka-rd sets a 7h install timeout, which
+    # no budget inside the E2E job's cap can clear, so a failed install here
+    # reports as a bare assert timeout and the catch block's describe of the
+    # HelmRelease is where its state is read.
+    - assert:
+        timeout: 6m
+        resource:
+          apiVersion: helm.toolkit.fluxcd.io/v2
+          kind: HelmRelease
+          metadata:
+            name: kafka-test
+          status:
+            (conditions[?type == 'Ready']):
+            - status: "True"
+    - assert:
+        timeout: 5m
+        resource:
+          apiVersion: apps.cozystack.io/v1alpha1
+          kind: Kafka
+          metadata:
+            name: test
+          status:
+            (conditions[?type == 'Ready']):
+            - status: "True"
+    - assert:
+        timeout: 5m
+        resource:
+          apiVersion: kafka.strimzi.io/v1beta2
+          kind: KafkaTopic
+          metadata:
+            name: kafka-test-test-results
+          spec:
+            topicName: testResults
+            (config == null): true
+          status:
+            (conditions[?type == 'Ready']):
+            - status: "True"
+
+  - name: verify-kraft
+    try:
+    # Fresh pools use short release-hashed names (b-<hash>/c-<hash>), so match by
+    # the cluster label + role rather than a hard-coded name.
+    - assert:
+        timeout: 2m
+        resource:
+          apiVersion: kafka.strimzi.io/v1beta2
+          kind: KafkaNodePool
+          metadata:
+            labels:
+              strimzi.io/cluster: kafka-test
+          spec:
+            roles:
+            - broker
+    - assert:
+        timeout: 2m
+        resource:
+          apiVersion: kafka.strimzi.io/v1beta2
+          kind: KafkaNodePool
+          metadata:
+            labels:
+              strimzi.io/cluster: kafka-test
+          spec:
+            roles:
+            - controller
+    - assert:
+        timeout: 5m
+        resource:
+          apiVersion: kafka.strimzi.io/v1beta2
+          kind: Kafka
+          metadata:
+            name: kafka-test
+            annotations:
+              strimzi.io/kraft: enabled
+              strimzi.io/node-pools: enabled
+          status:
+            kafkaMetadataState: KRaft
+    # KRaft mode ships no ZooKeeper: the client Service must never exist.
+    - error:
+        resource:
+          apiVersion: v1
+          kind: Service
+          metadata:
+            name: kafka-test-zookeeper-client
+    - assert:
+        timeout: 3m
+        resource:
+          apiVersion: v1
+          kind: Endpoints
+          metadata:
+            name: kafka-test-kafka-bootstrap
+          (subsets[0].addresses[0].ip != null): true
+
+  # The node pools are created by the migration hook, outside the release
+  # manifest, and each owns the StrimziPodSet running its brokers, so only the
+  # chart's pre-delete hook removes them. Deleting the app explicitly here,
+  # rather than leaving it to Chainsaw's cleanup, is what lets the test look at
+  # the namespace afterwards. The pod check selects on strimzi.io/cluster on
+  # purpose, so it covers every pod Strimzi runs for this cluster (brokers,
+  # controllers, entity operator), not only the brokers.
+  - name: verify-uninstall-removes-node-pools
+    try:
+    # Waits for the app, and so the HelmRelease uninstall behind it, to finish.
+    # 8m, the same budget and for the same reason as timeouts.cleanup above:
+    # this delete is the teardown that cleanup used to perform.
+    - delete:
+        timeout: 8m
+        ref:
+          apiVersion: apps.cozystack.io/v1alpha1
+          kind: Kafka
+          name: test
+    # The pre-delete hook deleted the pools before the delete above returned;
+    # the pods then go through garbage collection and their termination grace
+    # period, which the default error timeout covers.
+    - error:
+        resource:
+          apiVersion: kafka.strimzi.io/v1beta2
+          kind: KafkaNodePool
+          metadata:
+            labels:
+              strimzi.io/cluster: kafka-test
+    - error:
+        resource:
+          apiVersion: v1
+          kind: Pod
+          metadata:
+            labels:
+              strimzi.io/cluster: kafka-test
+    catch:
+    # A failed error op already names each object still matching. This adds
+    # the StrimziPodSets between the pools and the pods, and the pods' phase.
+    - script:
+        timeout: 1m
+        content: |
+          kubectl -n "$NAMESPACE" --request-timeout=15s \
+            get kafkanodepools.kafka.strimzi.io,strimzipodsets.core.strimzi.io,pods \
+            -l strimzi.io/cluster=kafka-test -o wide || true
+---
+# Logical topic-data backup -> in-place + to-copy RestoreJob round-trip,
+# driving the validated example scripts (examples/backups/kafka) as the harness
+# so the test and the documented flow can never drift. run-all.sh runs Bucket
+# -> two-broker source Kafka + a seeded 3-partition, 2-replica topic -> Job
+# strategy + BackupClass -> ad-hoc BackupJob (freeze-end-offset drain to S3,
+# waits Succeeded) -> in-place restore (deletes the topic, restores, asserts
+# count, content and replication factor, then a second RestoreJob into the
+# populated topic that must be refused) -> empty two-broker target Kafka +
+# to-copy RestoreJob (waits Succeeded) and asserts the records round-tripped
+# through S3 into the restored copy. It follows the same
+# harness-driving shape as mariadb-2-backup-roundtrip
+# (hack/e2e-chainsaw/mariadb/chainsaw-test.yaml): a single run step pre-cleans
+# any leftover state, drives run-all.sh, and drains in an always-reached
+# finally.
+#
+# Runs in tenant-root, not the suite default tenant-test: the S3 client here
+# is the generic Job strategy Pod INSIDE the tenant, and the e2e tenant is
+# created isolated (hack/e2e-install-cozystack.bats) — its Cilium egress
+# allowlist blocks a tenant-test Pod from reaching tenant-root's seaweedfs,
+# while a tenant-root Pod reaches it over same-tenant egress. The harness
+# targets the in-cluster endpoint (S3_ENDPOINT below) instead of the BucketInfo
+# external ingress URL, which in CI is an unroutable placeholder. The strategy's
+# curl verifies TLS against the seaweedfs CA the example copies into its S3
+# Secret; the S3 listener serves the chart's client certificate
+# (packages/system/seaweedfs), whose SANs cover '*.tenant-root',
+# '*.tenant-root.svc' and '*.tenant-root.svc.cluster.local', so the 2-label
+# name would verify too — .svc is simply the fully-qualified in-cluster form.
+# KAFKA_IMAGE is resolved from the running operator so the backup Pod reuses
+# the exact Kafka image already cached on the nodes (no extra pull, no version
+# skew).
+apiVersion: chainsaw.kyverno.io/v1alpha1
+kind: Test
+metadata:
+  name: kafka-2-backup-roundtrip
+spec:
+  namespace: tenant-root
+  skipDelete: true
+  catch:
+  - events: {}
+  - describe:
+      apiVersion: helm.toolkit.fluxcd.io/v2
+      kind: HelmRelease
+      name: kafka-kafka-test
+  - describe:
+      apiVersion: kafka.strimzi.io/v1beta2
+      kind: Kafka
+      name: kafka-kafka-test
+  - describe:
+      apiVersion: kafka.strimzi.io/v1beta2
+      kind: Kafka
+      name: kafka-kafka-restore
+  - describe:
+      apiVersion: backups.cozystack.io/v1alpha1
+      kind: BackupJob
+  - describe:
+      apiVersion: backups.cozystack.io/v1alpha1
+      kind: RestoreJob
+  # The drain/replay runs in backupstrategy-controller-created Job Pods; a
+  # failed S3 upload/connect or a SigV4 rejection prints there, not on the
+  # broker. Those Pods carry job.strategy.backups.cozystack.io/mode=backup|
+  # restore (never app.kubernetes.io/instance) and are not TTL-reaped, so they
+  # are still present at catch time - select on that label to capture the
+  # actual backup/restore error.
+  - podLogs:
+      selector: job.strategy.backups.cozystack.io/mode
+      tail: 200
+  # Broker Pods too, for the drain/replay's server side. The example uses its
+  # default app names (kafka-test source, kafka-restore to-copy target); the
+  # Cozystack chart prefixes the Strimzi cluster with "kafka-", so the source
+  # cluster is kafka-kafka-test and the to-copy target is kafka-kafka-restore.
+  - podLogs:
+      selector: app.kubernetes.io/instance=kafka-kafka-test
+      tail: 200
+  - podLogs:
+      selector: app.kubernetes.io/instance=kafka-kafka-restore
+      tail: 200
+  steps:
+  - name: run
+    try:
+    # Pre-clean: tenant-root is a shared, persistent namespace with fixed
+    # resource names, so a run killed before the finally below leaves stale
+    # state behind. A leftover BackupJob still carrying status.phase=Succeeded
+    # from a prior run would satisfy `wait_for_field ... Succeeded` instantly
+    # and pass without a real backup ever running. cleanup.sh is idempotent
+    # (--ignore-not-found), so this is a no-op on a clean namespace.
+    - script:
+        timeout: 10m
+        content: |
+          set -eu
+          cd ../../..
+          NAMESPACE="$NAMESPACE" examples/backups/kafka/cleanup.sh
+        check:
+          ($error == null): true
+    # The 46m budget is the whole documented flow: bucket provisioning, TWO
+    # two-broker Strimzi clusters (source + to-copy target, each pulls the
+    # Kafka image, boots its KRaft controllers and brokers, and passes
+    # readiness), the freeze-end-offset drain to S3, the in-place restore, the
+    # refused restore into the populated topic (three strategy Pod attempts,
+    # each stopping at the emptiness check), and the to-copy restore with its
+    # verification, sized with the 660s bucket HR wait in 03-create-bucket.sh.
+    # run-all.sh fails fast on terminal BackupJob/RestoreJob phases and stalled
+    # HelmReleases rather than polling out the budget.
+    - script:
+        timeout: 46m
+        content: |
+          set -eu
+          cd ../../..
+          [ -x examples/backups/kafka/run-all.sh ] || { echo "kafka backup example scripts not found at examples/backups/kafka" >&2; exit 1; }
+          # Reuse a Kafka image the operator already caches on the nodes, so the
+          # backup Pod hits a warm image cache. STRIMZI_KAFKA_IMAGES is a
+          # newline-separated "version=image" map (one entry per supported Kafka
+          # version), so split on whitespace, drop the "version=" prefix and take
+          # the last (newest) image rather than concatenating every line into one
+          # malformed reference. The reference is taken as-is, tag or digest.
+          KAFKA_IMAGE=$(kubectl -n cozy-kafka-operator get deploy strimzi-cluster-operator \
+            -o jsonpath='{.spec.template.spec.containers[0].env[?(@.name=="STRIMZI_KAFKA_IMAGES")].value}' \
+            | tr '[:space:]' '\n' | grep '=' | sed 's/^[^=]*=//' | tail -n1)
+          [ -n "$KAFKA_IMAGE" ] || { echo "could not resolve Kafka image from strimzi-cluster-operator" >&2; exit 1; }
+          COZY_E2E_BACKUP_PREFLIGHT=1 NAMESPACE="$NAMESPACE" KAFKA_IMAGE="$KAFKA_IMAGE" \
+            S3_ENDPOINT="https://seaweedfs-s3.tenant-root.svc:8333" \
+            examples/backups/kafka/run-all.sh
+        check:
+          ($error == null): true
+    finally:
+    # Removes every resource the harness created (chainsaw did not apply them,
+    # so they are not part of automatic cleanup).
+    - description: backup-flow cleanup
+      script:
+        timeout: 10m
+        content: |
+          set -eu
+          cd ../../..
+          NAMESPACE="$NAMESPACE" examples/backups/kafka/cleanup.sh
+    # cleanup.sh leaves the volumes, which deleteClaim: false keeps past each
+    # app's uninstall, so they go here, after both apps are gone.
+    - delete:
+        ref:
+          apiVersion: v1
+          kind: PersistentVolumeClaim
+          labels:
+            strimzi.io/cluster: kafka-kafka-test
+    - delete:
+        ref:
+          apiVersion: v1
+          kind: PersistentVolumeClaim
+          labels:
+            strimzi.io/cluster: kafka-kafka-restore
+
+  # cleanup.sh above deleted both Kafka apps and waited for them to go, so their
+  # uninstalls have run, and the node pools the migration hook created outside
+  # the release manifest must be gone with them. The pod checks select on
+  # strimzi.io/cluster on purpose, so they cover every pod Strimzi runs for each
+  # cluster, not only the brokers. What is left is garbage collection and the
+  # pods' termination grace period, which the default error timeout covers.
+  - name: verify-uninstall-removes-node-pools
+    try:
+    - error:
+        resource:
+          apiVersion: kafka.strimzi.io/v1beta2
+          kind: KafkaNodePool
+          metadata:
+            labels:
+              strimzi.io/cluster: kafka-kafka-test
+    - error:
+        resource:
+          apiVersion: kafka.strimzi.io/v1beta2
+          kind: KafkaNodePool
+          metadata:
+            labels:
+              strimzi.io/cluster: kafka-kafka-restore
+    - error:
+        resource:
+          apiVersion: v1
+          kind: Pod
+          metadata:
+            labels:
+              strimzi.io/cluster: kafka-kafka-test
+    - error:
+        resource:
+          apiVersion: v1
+          kind: Pod
+          metadata:
+            labels:
+              strimzi.io/cluster: kafka-kafka-restore
+    catch:
+    # A failed error op already names each object still matching. This adds
+    # the StrimziPodSets between the pools and the pods, and the pods' phase.
+    - script:
+        timeout: 1m
+        content: |
+          kubectl -n "$NAMESPACE" --request-timeout=15s \
+            get kafkanodepools.kafka.strimzi.io,strimzipodsets.core.strimzi.io,pods \
+            -l 'strimzi.io/cluster in (kafka-kafka-test,kafka-kafka-restore)' -o wide || true
diff --git a/hack/e2e-chainsaw/kafka/kafka.yaml b/hack/e2e-chainsaw/kafka/kafka.yaml
new file mode 100644
index 0000000000..9f1e25f14f
--- /dev/null
+++ b/hack/e2e-chainsaw/kafka/kafka.yaml
@@ -0,0 +1,25 @@
+apiVersion: apps.cozystack.io/v1alpha1
+kind: Kafka
+metadata:
+  name: test
+spec:
+  version: "v3.9"
+  external: false
+  kafka:
+    size: 10Gi
+    replicas: 2
+    storageClass: ""
+    resources: {}
+    resourcesPreset: "c1.small"
+  topics:
+    - name: testResults
+      partitions: 1
+      replicas: 2
+    - name: testOrders
+      config:
+        cleanup.policy: compact
+        segment.ms: 3600000
+        max.compaction.lag.ms: 5400000
+        min.insync.replicas: 2
+      partitions: 1
+      replicas: 2
diff --git a/hack/e2e-chainsaw/kubernetes-latest/chainsaw-test.yaml b/hack/e2e-chainsaw/kubernetes-latest/chainsaw-test.yaml
new file mode 100644
index 0000000000..75ee5a2fae
--- /dev/null
+++ b/hack/e2e-chainsaw/kubernetes-latest/chainsaw-test.yaml
@@ -0,0 +1,154 @@
+# Chainsaw port of hack/e2e-apps/kubernetes-latest.bats.
+#
+# Spinning up a tenant Kubernetes control plane (Kamaji) + worker nodes + the
+# LB/NFS/ouroboros checks is deeply imperative (port-forwards, a tenant
+# kubeconfig, curl probes), so the battle-tuned logic in
+# _lib/run-kubernetes.sh is reused verbatim from a single script step rather
+# than rewritten as asserts. The script cd's to the repo root (the test dir is
+# hack/e2e-chainsaw/kubernetes-latest, so repo root is ../../..) where the
+# helper's `helm template` and versions.yaml paths resolve.
+apiVersion: chainsaw.kyverno.io/v1alpha1
+kind: Test
+metadata:
+  name: kubernetes-latest
+spec:
+  catch:
+  - events: {}
+  steps:
+  - name: tenant-kubernetes-latest-version
+    try:
+    - script:
+        # ~25m Kamaji bringup + worker join + LB/NFS/ouroboros assertions on a
+        # passing run. The ceiling below is sized for the failing one instead,
+        # where the node-join wait spends its whole deadline and the diagnostics
+        # phase and the tenant snapshot still have to fit behind it.
+        # hack/run-kubernetes-node-join_test.bats holds that inequality: it reads
+        # the deadline off the wait and the operation off the constant that
+        # restates this `timeout:`.
+        #
+        # The on-failure diagnostics phase carries its own 8m wall-clock budget
+        # (COZY_DIAG_PHASE_BUDGET in _lib/run-kubernetes.sh): once it is spent, the
+        # collectors that have not started are declined out loud rather than
+        # attempted, so the in-process tenant crust-gather snapshot, the one the exit
+        # off the node-join path triggers and the largest artifact this path produces,
+        # still has its time. Why that budget and not another is derived beside it and
+        # not repeated here, because a number kept in two places is a number that
+        # drifts.
+        #
+        # What this ceiling covers, in the order the phase spends it, cheapest first
+        # so that a budget running out drops the collectors that cost minutes rather
+        # than the reads that discriminate between failure modes:
+        #   node-join diagnostics reads
+        #   worker network counters
+        #   worker block IO counters
+        #   serial-console family (~6m25s at worst, ~4m05s at the pool's minimum)
+        #   HelmRelease remediation footprint (a 90s budget of its own on starting reads, not a ceiling; below the console because the console alone covers a worker that never reached apid, while these releases stay readable after the run)
+        #   worker CPU usage and throttling counters, two samples
+        #   sandbox node CPU time, two samples
+        #   worker per-thread CPU time inside virt-launcher, two samples
+        #     (those alternate rather than run to completion in turn: each takes
+        #     its first reading, one wait passes, each takes its second)
+        #   guest Talos capture
+        #   talos-image-cache diagnosis
+        # The four collectors that bracket the node-join wait -- the sandbox
+        # kernel KVM counters, the runner kernel CPU time, the sandbox QEMU
+        # thread time and the runner fixed-work canary -- sit outside this order
+        # on purpose: each is ungated and taken before the wait and right after
+        # it on both paths, and their cost arms live in the budget guard rather
+        # than in this list. Three of the four are reads: the KVM counters and
+        # the runner kernel CPU time are one bounded read a side, and the QEMU
+        # thread time is a bounded probe walk plus a bounded read of each
+        # sandbox pid file. The canary is two arms of fixed work under a ceiling
+        # of its own apiece, and it is the one of the four that costs a core
+        # rather than a read, which is why it runs outside the brackets of the
+        # other three rather than among them.
+        # and then, after the phase rather than inside it, the in-process tenant
+        # crust-gather snapshot.
+        #
+        # Those do not fit what is left of this op once the bringup ahead of them and
+        # the snapshot behind them are counted, which is why the phase is bounded as a
+        # phase rather than this ceiling raised. None of it is a worst case and none is
+        # claimed: several of those collectors carry no wall-clock bound at all, and
+        # the bringup's own waits already exceed this op on ceilings before a single
+        # diagnostic runs, and the pre-wait halves of the four readings above spend
+        # inside that bringup rather than inside this phase. Those residuals are
+        # tracked in cozystack/cozystack#3666.
+        #
+        # The OIDC lifecycle folded onto this cluster by the 5th argument joins
+        # that list rather than being priced into the ceiling: it adds up to 1m
+        # of job wait, a 600s cozy_wait_helmrelease_upgrade and another 1m of job
+        # wait, all on the passing path. Raising the ceiling to cover them is not
+        # available -- the guard in hack/run-kubernetes-serial-console_test.bats
+        # holds COZY_OP_CEILING equal to BOTH suites' `timeout:`, and two suites
+        # at 79m plus their 22m teardowns exceed the job's own 215-minute cap.
+        # What is available is a measurement: on the green run of this branch
+        # (33724179053) the whole Test took 569.72s against this 4020s op, with
+        # kubernetes-previous, which carries no OIDC fold, at 470.19s. The
+        # ceilings only bind when something is already hung.
+        timeout: 67m
+        # Co-locate the tenant crust-gather snapshot (captured by
+        # run-kubernetes.sh on failure) under the same snapshots/<test>/ dir as
+        # the global .chainsaw.yaml catch's host snapshot.
+        env:
+        - name: COZY_SNAPSHOT_NAME
+          value: ($test.metadata.name)
+        content: |
+          set -eu
+          cd ../../..
+          . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+          # 4th arg folds the ouroboros hairpin-NAT assertions onto this cluster;
+          # the 5th folds the System -> CustomConfig OIDC lifecycle onto the same
+          # ready workers. Neither feature needs another tenant-cluster bringup.
+          run_kubernetes_test 'keys | sort_by(.) | .[-1]' 'test-latest-version' '59991' 'true' 'true'
+        check:
+          ($error == null): true
+    finally:
+    # Always runs after try/catch — i.e. after the crust-gather snapshots on a
+    # failed run. Reclaims the tenant Kubernetes cluster, which run_kubernetes_test
+    # applies imperatively (kubectl), so Chainsaw's auto-cleanup does not track it.
+    # This is the single authoritative child -> parent teardown on both success
+    # and failure, followed by the compute/storage reclamation barriers.
+    - description: tear down the tenant Kubernetes cluster
+      script:
+        # 30s diagnostic Certificate + 5m child + 5m parent + 5m compute/PVC
+        # drain + 5m LINSTOR reclamation = 20m30s of inner bounds. Keep the op
+        # above that sum so an inner timeout reports its stage instead of a
+        # Chainsaw SIGKILL hiding it; normal cleanup returns immediately.
+        timeout: 22m
+        content: |
+          set -eu
+          cd ../../..
+          . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+          cozy_cleanup test-latest-version
+---
+# Version-independent regression guard for PR #2872 B1 (runs once, here, not
+# in kubernetes-previous): with the `replicated` StorageClass absent on the
+# management cluster, the chart's fallback default must be a real management
+# SC (nvme/ssd probes) and never the `kubevirt` alias. A separate Test doc,
+# not a step of the bringup Test above, because it provisions no tenant
+# cluster and must run regardless of that heavy test's outcome (Chainsaw
+# skips a Test's remaining steps after a failure).
+#
+# The helper temporarily deletes the cluster-scoped `replicated` SC and
+# restores it inline before any assertion exit; safe only because the global
+# .chainsaw.yaml runs suites sequentially (execution.parallel: 1) — nothing
+# else can schedule against the mutated SC set mid-probe.
+apiVersion: chainsaw.kyverno.io/v1alpha1
+kind: Test
+metadata:
+  name: kubernetes-sc-fallback-default
+spec:
+  catch:
+  - events: {}
+  steps:
+  - name: fallback-default-storageclass
+    try:
+    - script:
+        timeout: 15m
+        content: |
+          set -eu
+          cd ../../..
+          . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+          verify_storageclass_fallback_default
+        check:
+          ($error == null): true
diff --git a/hack/e2e-chainsaw/kubernetes-previous/chainsaw-test.yaml b/hack/e2e-chainsaw/kubernetes-previous/chainsaw-test.yaml
new file mode 100644
index 0000000000..8a3ada8def
--- /dev/null
+++ b/hack/e2e-chainsaw/kubernetes-previous/chainsaw-test.yaml
@@ -0,0 +1,94 @@
+# Chainsaw port of hack/e2e-apps/kubernetes-previous.bats. See the sibling
+# kubernetes-latest test for why the logic stays a script wrapping
+# _lib/run-kubernetes.sh. This one targets the previous K8s version and skips
+# the ouroboros addon (no 4th arg).
+apiVersion: chainsaw.kyverno.io/v1alpha1
+kind: Test
+metadata:
+  name: kubernetes-previous
+spec:
+  catch:
+  - events: {}
+  steps:
+  - name: tenant-kubernetes-previous-version
+    try:
+    - script:
+        # The on-failure diagnostics phase carries its own 8m wall-clock budget
+        # (COZY_DIAG_PHASE_BUDGET in _lib/run-kubernetes.sh): once it is spent, the
+        # collectors that have not started are declined out loud rather than
+        # attempted, so the in-process tenant crust-gather snapshot, the one the exit
+        # off the node-join path triggers and the largest artifact this path produces,
+        # still has its time. Why that budget and not another is derived beside it and
+        # not repeated here, because a number kept in two places is a number that
+        # drifts.
+        #
+        # What this ceiling covers, in the order the phase spends it, cheapest first
+        # so that a budget running out drops the collectors that cost minutes rather
+        # than the reads that discriminate between failure modes:
+        #   node-join diagnostics reads
+        #   worker network counters
+        #   worker block IO counters
+        #   serial-console family (~6m25s at worst, ~4m05s at the pool's minimum)
+        #   HelmRelease remediation footprint (a 90s budget of its own on starting reads, not a ceiling; below the console because the console alone covers a worker that never reached apid, while these releases stay readable after the run)
+        #   worker CPU usage and throttling counters, two samples
+        #   sandbox node CPU time, two samples
+        #   worker per-thread CPU time inside virt-launcher, two samples
+        #     (those alternate rather than run to completion in turn: each takes
+        #     its first reading, one wait passes, each takes its second)
+        #   guest Talos capture
+        #   talos-image-cache diagnosis
+        # The four collectors that bracket the node-join wait -- the sandbox
+        # kernel KVM counters, the runner kernel CPU time, the sandbox QEMU
+        # thread time and the runner fixed-work canary -- sit outside this order
+        # on purpose: each is ungated and taken before the wait and right after
+        # it on both paths, and their cost arms live in the budget guard rather
+        # than in this list. Three of the four are reads: the KVM counters and
+        # the runner kernel CPU time are one bounded read a side, and the QEMU
+        # thread time is a bounded probe walk plus a bounded read of each
+        # sandbox pid file. The canary is two arms of fixed work under a ceiling
+        # of its own apiece, and it is the one of the four that costs a core
+        # rather than a read, which is why it runs outside the brackets of the
+        # other three rather than among them.
+        # and then, after the phase rather than inside it, the in-process tenant
+        # crust-gather snapshot.
+        #
+        # Those do not fit what is left of this op once the bringup ahead of them and
+        # the snapshot behind them are counted, which is why the phase is bounded as a
+        # phase rather than this ceiling raised. None of it is a worst case and none is
+        # claimed: several of those collectors carry no wall-clock bound at all, and
+        # the bringup's own waits already exceed this op on ceilings before a single
+        # diagnostic runs, and the pre-wait halves of the four readings above spend
+        # inside that bringup rather than inside this phase. Those residuals are
+        # tracked in cozystack/cozystack#3666.
+        timeout: 67m
+        # Co-locate the tenant crust-gather snapshot (captured by
+        # run-kubernetes.sh on failure) under the same snapshots/<test>/ dir as
+        # the global .chainsaw.yaml catch's host snapshot.
+        env:
+        - name: COZY_SNAPSHOT_NAME
+          value: ($test.metadata.name)
+        content: |
+          set -eu
+          cd ../../..
+          . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+          run_kubernetes_test 'keys | sort_by(.) | .[-2]' 'test-previous-version' '59992'
+        check:
+          ($error == null): true
+    finally:
+    # Always runs after try/catch — i.e. after the crust-gather snapshots on a
+    # failed run. Reclaims the tenant Kubernetes cluster, which run_kubernetes_test
+    # applies imperatively (kubectl), so Chainsaw's auto-cleanup does not track it.
+    # This is the single authoritative child -> parent teardown on both success
+    # and failure, followed by the compute/storage reclamation barriers.
+    - description: tear down the tenant Kubernetes cluster
+      script:
+        # 30s diagnostic Certificate + 5m child + 5m parent + 5m compute/PVC
+        # drain + 5m LINSTOR reclamation = 20m30s of inner bounds. Keep the op
+        # above that sum so an inner timeout reports its stage instead of a
+        # Chainsaw SIGKILL hiding it; normal cleanup returns immediately.
+        timeout: 22m
+        content: |
+          set -eu
+          cd ../../..
+          . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+          cozy_cleanup test-previous-version
diff --git a/hack/e2e-chainsaw/kubernetes-proxmox/chainsaw-test.yaml.disabled b/hack/e2e-chainsaw/kubernetes-proxmox/chainsaw-test.yaml.disabled
new file mode 100644
index 0000000000..d0e0fefce4
--- /dev/null
+++ b/hack/e2e-chainsaw/kubernetes-proxmox/chainsaw-test.yaml.disabled
@@ -0,0 +1,135 @@
+# End-to-end coverage for the Proxmox substrate.
+#
+# Parked as .disabled on purpose. Suites are discovered with
+#   find hack/e2e-chainsaw -mindepth 2 -maxdepth 2 -name chainsaw-test.yaml
+# so this one is registered nowhere and cannot be selected by the normal lanes.
+# That is the point: it needs a Proxmox hypervisor, and the runners those lanes
+# use will never have one. .github/workflows/e2e-proxmox.yaml drops the suffix
+# on a self-hosted runner that does.
+#
+# What this asserts is what NO other suite can, and every item is a bug this
+# integration actually hit rather than a shape someone imagined:
+#
+#   ProxmoxCluster Ready      — a missing IPAM provider, or the managed-by
+#                               annotation that stops CAPI setting an ownerRef
+#   linked-clone boot disk    — 8 KiB per worker against 10.2 GiB, and nothing
+#                               fails when it regresses
+#   Machine Running + nodeRef — capmox writes proxmox://<UUID>, the CCM's default
+#                               mode writes proxmox://<region>/<vmid>, and CAPI
+#                               pairs on an exact match
+#   node Ready + region label — the CSI node plugin exits fatally without it
+#   PVC bound AND on the host — Bound is not proof that a disk exists
+#   unattended replacement    — the controller that removes a departed Node
+#                               must not itself depend on that Node
+#
+# It does NOT install Cozystack. The upstream lanes build a sandbox per run;
+# this one runs against an existing cluster and an existing hypervisor, which is
+# a weaker guarantee and is stated rather than implied.
+apiVersion: chainsaw.kyverno.io/v1alpha1
+kind: Test
+metadata:
+  name: kubernetes-proxmox
+spec:
+  # Teardown is the finally below, which must run whether the suite passed or
+  # failed: a leaked tenant leaves VMs on the hypervisor.
+  skipDelete: true
+  catch:
+  - events: {}
+  - script:
+      content: cd ../../.. && hack/e2e-chainsaw/_lib/run-proxmox.sh diagnostics
+  steps:
+  - name: tenant-and-cluster
+    try:
+    # Rendered by run-proxmox.sh rather than applied as is: every stand-specific
+    # value in tenant.yaml is a ${COZY_PVE_*} variable, the script supplies the
+    # defaults and expands them, and it refuses a fixture with a variable left
+    # in it. Another stand sets variables instead of editing the file.
+    - script:
+        content: cd ../../.. && hack/e2e-chainsaw/_lib/run-proxmox.sh apply-tenant
+    # Declarative where the object lives in this cluster, per the conventions in
+    # docs/agents/e2e-testing.md — the assert polls to its own timeout and
+    # reports a structured diff rather than a generic non-zero exit.
+    # Both the name and the namespace matter here. The resource definition
+    # prefixes the release, so the Kubernetes CR named k8s-e2e produces
+    # ProxmoxCluster/kubernetes-k8s-e2e, and it lives in the tenant's own
+    # namespace rather than the suite's default one. Asserted with the wrong
+    # pair this step simply spends its 10m and fails on a healthy stand.
+    - assert:
+        timeout: 10m
+        resource:
+          apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
+          kind: ProxmoxCluster
+          metadata:
+            name: kubernetes-k8s-e2e
+            namespace: tenant-e2eproxmox
+          status:
+            ready: true
+    - assert:
+        timeout: 20m
+        resource:
+          apiVersion: cluster.x-k8s.io/v1beta1
+          kind: Machine
+          metadata:
+            namespace: tenant-e2eproxmox
+          status:
+            phase: Running
+    # The controller half of the CSI driver and the cloud-controller-manager
+    # run in THIS cluster, not in the tenant; that is the property the storage
+    # PR is about, so the suite asserts it rather than only the tenant side.
+    - assert:
+        timeout: 5m
+        resource:
+          apiVersion: apps/v1
+          kind: Deployment
+          metadata:
+            name: kubernetes-k8s-e2e-pcsi-controller
+            namespace: tenant-e2eproxmox
+          status:
+            readyReplicas: 1
+    - assert:
+        timeout: 5m
+        resource:
+          apiVersion: apps/v1
+          kind: Deployment
+          metadata:
+            name: kubernetes-k8s-e2e-pccm
+            namespace: tenant-e2eproxmox
+          status:
+            readyReplicas: 1
+
+  - name: vm-shape-on-the-hypervisor
+    try:
+    - script:
+        timeout: 3m
+        content: cd ../../.. && hack/e2e-chainsaw/_lib/run-proxmox.sh linked-clone
+
+  - name: tenant-node-usable
+    try:
+    - script:
+        timeout: 10m
+        content: cd ../../.. && hack/e2e-chainsaw/_lib/run-proxmox.sh tenant-node
+
+  - name: storage-round-trip
+    try:
+    - script:
+        timeout: 10m
+        content: cd ../../.. && hack/e2e-chainsaw/_lib/run-proxmox.sh pvc-round-trip
+
+  - name: replacement-converges-unattended
+    try:
+    - script:
+        timeout: 20m
+        content: cd ../../.. && hack/e2e-chainsaw/_lib/run-proxmox.sh replacement
+    finally:
+    - script:
+        content: |
+          set -eu
+          # keep_tenant is honoured here as well as in the workflow's own
+          # teardown, or the suite would delete what the operator asked to keep.
+          if [ "${COZY_KEEP_TENANT:-false}" = "true" ]; then
+            echo "COZY_KEEP_TENANT=true: leaving the tenant in place"
+            exit 0
+          fi
+          kubectl delete kubernetesnodes.apps.cozystack.io -n "${COZY_PROXMOX_NS:-tenant-e2eproxmox}" --all --ignore-not-found
+          kubectl delete kubernetes.apps.cozystack.io -n "${COZY_PROXMOX_NS:-tenant-e2eproxmox}" --all --ignore-not-found
+          kubectl delete tenant.apps.cozystack.io e2eproxmox -n tenant-root --ignore-not-found
diff --git a/hack/e2e-chainsaw/kubernetes-proxmox/tenant.yaml b/hack/e2e-chainsaw/kubernetes-proxmox/tenant.yaml
new file mode 100644
index 0000000000..4cb453e5ca
--- /dev/null
+++ b/hack/e2e-chainsaw/kubernetes-proxmox/tenant.yaml
@@ -0,0 +1,93 @@
+# The tenant this suite builds and tears down. Its own namespace rather than the
+# shared tenant-test: these objects create VMs on a hypervisor, and a leak is
+# visible in `qm list` rather than only in the API.
+#
+# etcd: true is not optional. KamajiControlPlane.spec.dataStoreName reads
+# _namespace.etcd, and the DataStore is created by the tenant's own etcd module
+# (packages/extra/etcd/templates/datastore.yaml) — without it the control plane
+# does not render at all.
+# Tenant names are validated as lowercase letters and digits only — no dashes —
+# so this is e2eproxmox rather than the e2e-proxmox the namespace would suggest.
+apiVersion: apps.cozystack.io/v1alpha1
+kind: Tenant
+metadata:
+  name: e2eproxmox
+  namespace: tenant-root
+spec:
+  etcd: true
+  host: ""
+  ingress: false
+  monitoring: false
+  seaweedfs: false
+  resourceQuotas: {}
+---
+apiVersion: apps.cozystack.io/v1alpha1
+kind: Kubernetes
+metadata:
+  name: k8s-e2e
+  namespace: tenant-e2eproxmox
+spec:
+  version: "v1.35"
+  substrate: proxmox
+  proxmox:
+    # The stand's Proxmox serves its self-signed certificate; the chart verifies
+    # by default, so the suite says so rather than relying on a default.
+    insecure: true
+    # Empty means any node in the Proxmox cluster; the suite must not hardcode a
+    # hostname it would then only pass on one stand.
+    allowedNodes: []
+    # An off-cluster worker cannot resolve through the management cluster's
+    # CoreDNS, so the resolvers are its own. The chart refuses to render without
+    # them rather than writing an address that cannot answer.
+    dnsServers: ["8.8.8.8", "1.1.1.1"]
+    ipv4Config:
+      # Must not overlap the DHCP range, the CAPI IPAM pool or the MetalLB pool
+      # on the same L2 — four owners hand out addresses there and a collision is
+      # silent. Substituted per stand: run-proxmox.sh render-tenant expands the
+      # COZY_PVE_* variables in this file with envsubst and supplies the defaults
+      # itself, because GNU envsubst leaves a shell-style default in the text
+      # exactly as it is. A variable it does not know stays put and is refused.
+      addresses: ["${COZY_PVE_ADDRESSES}"]
+      gateway: "${COZY_PVE_GATEWAY}"
+      prefix: ${COZY_PVE_PREFIX}
+    ccm:
+      credentialsSecretName: proxmox-credentials
+    csi:
+      enabled: true
+      credentialsSecretName: proxmox-credentials
+      storageClasses:
+      - name: proxmox
+        # The same storage the PVC probe looks on, so the two cannot drift apart.
+        storage: "${COZY_PROXMOX_STORAGE}"
+        fstype: ext4
+        reclaimPolicy: Delete
+---
+apiVersion: apps.cozystack.io/v1alpha1
+kind: KubernetesNodes
+metadata:
+  name: md0
+  namespace: tenant-e2eproxmox
+spec:
+  cluster: k8s-e2e
+  minReplicas: 1
+  maxReplicas: 1
+  instanceType: ""
+  resources:
+    cpu: 2
+    memory: 4Gi
+  substrate: proxmox
+  proxmox:
+    # capmox matches tags as a SET, not by containment: a template carrying four
+    # tags is not selected by naming one of them.
+    templateTags: [capmox-template, cozystack, talos, talos-v1.13.6]
+    # false is the default and the reason the suite asserts it on the hypervisor:
+    # a full clone costs the whole template disk per worker and breaks nothing.
+    # No `storage` with it: a linked clone lives on the template's storage, and
+    # the chart refuses the pair.
+    full: false
+    network:
+      bridge: "${COZY_PVE_BRIDGE}"
+    # The stand's resource pool, the one ACL path the tenant's tokens are
+    # scoped to; empty adds the workers to none.
+    pool: "${COZY_PVE_POOL}"
+    dnsServers: ["8.8.8.8", "1.1.1.1"]
diff --git a/hack/e2e-chainsaw/kuberture/chainsaw-test.yaml b/hack/e2e-chainsaw/kuberture/chainsaw-test.yaml
new file mode 100644
index 0000000000..02297c3e98
--- /dev/null
+++ b/hack/e2e-chainsaw/kuberture/chainsaw-test.yaml
@@ -0,0 +1,196 @@
+# Chainsaw port of hack/e2e-apps/kuberture.bats. The kuberture addon publishes
+# the default/kubernetes EndpointSlice as annotated headless Services for
+# multiple external-dns instances. Resource readiness is declarative; the
+# annotation-shape checks and the split-horizon log assertions stay scripts.
+#
+# Everything is applied by chainsaw (the cluster-scoped Package, the cluster
+# RBAC, the probe Jobs), so cleanup is automatic — no inlined teardown.
+apiVersion: chainsaw.kyverno.io/v1alpha1
+kind: Test
+metadata:
+  name: kuberture
+spec:
+  catch:
+  - events:
+      namespace: cozy-kuberture
+  - describe:
+      apiVersion: helm.toolkit.fluxcd.io/v2
+      kind: HelmRelease
+      name: kuberture
+      namespace: cozy-kuberture
+  - podLogs:
+      namespace: cozy-kuberture
+      selector: app.kubernetes.io/name=kuberture
+      tail: 100
+  # The split-horizon probe pods don't carry the kuberture addon label, so the
+  # selector above misses them; capture their stdout on failure too.
+  - podLogs:
+      namespace: cozy-kuberture
+      selector: app.kubernetes.io/name=kuberture-e2e-edns-probe
+      tail: 100
+  steps:
+  - name: create-package
+    try:
+    - apply:
+        file: package.yaml
+
+  - name: wait-kuberture-ready
+    try:
+    - assert:
+        timeout: 3m
+        resource:
+          apiVersion: v1
+          kind: Namespace
+          metadata:
+            name: cozy-kuberture
+    # 11m: above the 10m install timeout cozystack-operator gives the
+    # HelmRelease of a Package; see "Sizing an HR-Ready budget" in
+    # docs/agents/e2e-testing.md.
+    - assert:
+        timeout: 11m
+        resource:
+          apiVersion: helm.toolkit.fluxcd.io/v2
+          kind: HelmRelease
+          metadata:
+            name: kuberture
+            namespace: cozy-kuberture
+          status:
+            (conditions[?type == 'Ready']):
+            - status: "True"
+    - assert:
+        timeout: 3m
+        resource:
+          apiVersion: apps/v1
+          kind: Deployment
+          metadata:
+            name: kuberture
+            namespace: cozy-kuberture
+          status:
+            (conditions[?type == 'Available']):
+            - status: "True"
+
+  - name: wait-output-services
+    try:
+    - assert:
+        timeout: 2m
+        resource:
+          apiVersion: v1
+          kind: Service
+          metadata:
+            name: kuberture-e2e-public
+            namespace: cozy-kuberture
+    - assert:
+        timeout: 2m
+        resource:
+          apiVersion: v1
+          kind: Service
+          metadata:
+            name: kuberture-e2e-internal
+            namespace: cozy-kuberture
+
+  - name: assert-annotation-shape
+    try:
+    - script:
+        timeout: 2m
+        content: |
+          set -eu
+          pub_host=kuberture-e2e-public.cozystack.test
+          int_host=kuberture-e2e-internal.cozystack.test
+          pub_prefix=external-dns.alpha.kubernetes.io/
+          int_prefix=kuberture-e2e-internal-dns.io/
+
+          # The target annotation is copied off the EndpointSlice asynchronously,
+          # so it can lag the Service objects that wait-output-services gated on.
+          # Poll until both Services carry it before asserting the annotation
+          # shape, rather than failing one-shot under `set -e` on a slow cluster.
+          deadline=$(( $(date +%s) + 90 ))
+          until
+            pub_json=$(kubectl -n cozy-kuberture get service kuberture-e2e-public -o json) &&
+            int_json=$(kubectl -n cozy-kuberture get service kuberture-e2e-internal -o json) &&
+            [ -n "$(echo "$pub_json" | jq -r --arg k "${pub_prefix}target" '.metadata.annotations[$k] // ""')" ] &&
+            [ -n "$(echo "$int_json" | jq -r --arg k "${int_prefix}target" '.metadata.annotations[$k] // ""')" ]
+          do
+            if [ "$(date +%s)" -ge "$deadline" ]; then
+              echo "kuberture target annotation not populated within 90s" >&2
+              kubectl -n cozy-kuberture get service kuberture-e2e-public kuberture-e2e-internal -o yaml >&2 || true
+              exit 1
+            fi
+            sleep 3
+          done
+
+          # Both Services must be headless.
+          test "$(echo "$pub_json" | jq -r '.spec.clusterIP')" = "None"
+          test "$(echo "$int_json" | jq -r '.spec.clusterIP')" = "None"
+
+          # hostname/ttl carry the configured per-output values.
+          test "$(echo "$pub_json" | jq -r --arg k "${pub_prefix}hostname" '.metadata.annotations[$k]')" = "$pub_host"
+          test "$(echo "$int_json" | jq -r --arg k "${int_prefix}hostname" '.metadata.annotations[$k]')" = "$int_host"
+          test "$(echo "$pub_json" | jq -r --arg k "${pub_prefix}ttl" '.metadata.annotations[$k]')" = "60"
+          test "$(echo "$int_json" | jq -r --arg k "${int_prefix}ttl" '.metadata.annotations[$k]')" = "300"
+
+          # Per-output isolation: neither Service carries the other prefix.
+          test "$(echo "$pub_json" | jq -r --arg k "${int_prefix}hostname" '.metadata.annotations[$k] // "absent"')" = "absent"
+          test "$(echo "$int_json" | jq -r --arg k "${pub_prefix}hostname" '.metadata.annotations[$k] // "absent"')" = "absent"
+        check:
+          ($error == null): true
+
+  - name: split-horizon-routing-proof
+    try:
+    - apply:
+        file: probes.yaml
+    # Assert each single-shot probe Job reaches Complete rather than polling a
+    # fixed Pod name. The Job re-creates its pod on a fresh IP if the Cilium
+    # reserved:ingress race wedges one and the leak-healer deletes it, so the
+    # proof survives that infra flake instead of failing on a vanished Pod.
+    - assert:
+        timeout: 4m
+        resource:
+          apiVersion: batch/v1
+          kind: Job
+          metadata:
+            name: kuberture-e2e-edns-public
+            namespace: cozy-kuberture
+          status:
+            (conditions[?type == 'Complete']):
+            - status: "True"
+    - assert:
+        timeout: 4m
+        resource:
+          apiVersion: batch/v1
+          kind: Job
+          metadata:
+            name: kuberture-e2e-edns-internal
+            namespace: cozy-kuberture
+          status:
+            (conditions[?type == 'Complete']):
+            - status: "True"
+    - script:
+        timeout: 1m
+        content: |
+          set -eu
+          pub_host=kuberture-e2e-public.cozystack.test
+          int_host=kuberture-e2e-internal.cozystack.test
+
+          # Read each Job's succeeded pod by its job-name label. The healer may
+          # have deleted earlier wedged pods, but the Complete condition asserted
+          # above guarantees one succeeded pod remains to carry the logs.
+          pub_logs=$(kubectl -n cozy-kuberture logs --tail=-1 --max-log-requests=8 -l batch.kubernetes.io/job-name=kuberture-e2e-edns-public)
+          int_logs=$(kubectl -n cozy-kuberture logs --tail=-1 --max-log-requests=8 -l batch.kubernetes.io/job-name=kuberture-e2e-edns-internal)
+
+          # The default-prefix probe sees only the public hostname; the internal-
+          # prefix probe sees only the internal hostname.
+          echo "$pub_logs" | grep -Fq "$pub_host"
+          # Fail-loud negations: under `set -e` a pipeline beginning with `!`
+          # suppresses errexit, so `! ... | grep` silently passes when the
+          # leak occurs (the vacuous-negation bug 12fe3256f fixed in bats).
+          if echo "$pub_logs" | grep -Fq "$int_host"; then
+            echo "FAIL: public-prefix probe must NOT see the internal hostname $int_host" >&2
+            exit 1
+          fi
+          echo "$int_logs" | grep -Fq "$int_host"
+          if echo "$int_logs" | grep -Fq "$pub_host"; then
+            echo "FAIL: internal-prefix probe must NOT see the public hostname $pub_host" >&2
+            exit 1
+          fi
+        check:
+          ($error == null): true
diff --git a/hack/e2e-chainsaw/kuberture/package.yaml b/hack/e2e-chainsaw/kuberture/package.yaml
new file mode 100644
index 0000000000..719e725d96
--- /dev/null
+++ b/hack/e2e-chainsaw/kuberture/package.yaml
@@ -0,0 +1,26 @@
+apiVersion: cozystack.io/v1alpha1
+kind: Package
+metadata:
+  name: cozystack.kuberture
+spec:
+  variant: default
+  components:
+    kuberture:
+      values:
+        kuberture:
+          config:
+            outputs:
+              - name: public
+                hostname:
+                  - kuberture-e2e-public.cozystack.test
+                annotationPrefix: external-dns.alpha.kubernetes.io/
+                serviceName: kuberture-e2e-public
+                addressSource: endpointslice
+                recordTTL: 60
+              - name: internal
+                hostname:
+                  - kuberture-e2e-internal.cozystack.test
+                annotationPrefix: kuberture-e2e-internal-dns.io/
+                serviceName: kuberture-e2e-internal
+                addressSource: endpointslice
+                recordTTL: 300
diff --git a/hack/e2e-chainsaw/kuberture/probes.yaml b/hack/e2e-chainsaw/kuberture/probes.yaml
new file mode 100644
index 0000000000..a87e57abc7
--- /dev/null
+++ b/hack/e2e-chainsaw/kuberture/probes.yaml
@@ -0,0 +1,101 @@
+# external-dns probe SA/RBAC + two single-shot probe Jobs, each with a distinct
+# --annotation-prefix (the upstream Split Horizon DNS pattern). external-dns
+# 0.20 initialises its informer cache cluster-wide before applying --namespace,
+# so the probe needs a ClusterRole, not a namespaced Role.
+#
+# The probes are Jobs, not bare Pods, on purpose. When the Cilium host-scope
+# IPAM + Gateway API restore-window race hands a probe the per-node
+# reserved:ingress IP (cilium/cilium#46799), the sandbox is rejected with
+# "IP already in use" and the e2e leak-healer deletes the wedged pod, expecting
+# a controller to reschedule it onto a free IP. A bare Pod has no controller, so
+# that delete was terminal and the probe never returned; the Job re-creates it.
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: kuberture-e2e-edns-probe
+  namespace: cozy-kuberture
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: kuberture-e2e-edns-probe
+rules:
+  - apiGroups: [""]
+    resources: ["services", "endpoints", "pods", "nodes", "namespaces"]
+    verbs: ["get", "list", "watch"]
+  - apiGroups: ["discovery.k8s.io"]
+    resources: ["endpointslices"]
+    verbs: ["get", "list", "watch"]
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: kuberture-e2e-edns-probe
+subjects:
+  - kind: ServiceAccount
+    name: kuberture-e2e-edns-probe
+    namespace: cozy-kuberture
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: kuberture-e2e-edns-probe
+---
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: kuberture-e2e-edns-public
+  namespace: cozy-kuberture
+spec:
+  backoffLimit: 6
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/name: kuberture-e2e-edns-probe
+    spec:
+      serviceAccountName: kuberture-e2e-edns-probe
+      restartPolicy: Never
+      containers:
+        - name: edns
+          image: registry.k8s.io/external-dns/external-dns:v0.20.0
+          args:
+            - --source=service
+            - --namespace=cozy-kuberture
+            - --provider=inmemory
+            - --inmemory-zone=cozystack.test
+            - --registry=noop
+            - --once
+            - --interval=10s
+            - --annotation-prefix=external-dns.alpha.kubernetes.io/
+            - --domain-filter=cozystack.test
+            - --log-level=info
+            - --log-format=text
+---
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: kuberture-e2e-edns-internal
+  namespace: cozy-kuberture
+spec:
+  backoffLimit: 6
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/name: kuberture-e2e-edns-probe
+    spec:
+      serviceAccountName: kuberture-e2e-edns-probe
+      restartPolicy: Never
+      containers:
+        - name: edns
+          image: registry.k8s.io/external-dns/external-dns:v0.20.0
+          args:
+            - --source=service
+            - --namespace=cozy-kuberture
+            - --provider=inmemory
+            - --inmemory-zone=cozystack.test
+            - --registry=noop
+            - --once
+            - --interval=10s
+            - --annotation-prefix=kuberture-e2e-internal-dns.io/
+            - --domain-filter=cozystack.test
+            - --log-level=info
+            - --log-format=text
diff --git a/hack/e2e-chainsaw/mariadb/chainsaw-test.yaml b/hack/e2e-chainsaw/mariadb/chainsaw-test.yaml
new file mode 100644
index 0000000000..6846fc7814
--- /dev/null
+++ b/hack/e2e-chainsaw/mariadb/chainsaw-test.yaml
@@ -0,0 +1,519 @@
+# Chainsaw port of hack/e2e-apps/mariadb.bats
+# ("Create DB MariaDB" + "Create single-replica MariaDB").
+apiVersion: chainsaw.kyverno.io/v1alpha1
+kind: Test
+metadata:
+  name: mariadb
+spec:
+  catch:
+  - events: {}
+  - describe:
+      apiVersion: helm.toolkit.fluxcd.io/v2
+      kind: HelmRelease
+      name: mariadb-test
+  - podLogs:
+      selector: app.kubernetes.io/instance=mariadb-test
+      tail: 50
+  steps:
+  - name: create-mariadb
+    try:
+    - apply:
+        file: mariadb.yaml
+
+  - name: wait-helmrelease-ready
+    try:
+    # 11m, above the release's 600s install timeout; see "Sizing an HR-Ready
+    # budget" in docs/agents/e2e-testing.md. hack/mariadb-first-boot-waits.bats
+    # derives the floor.
+    - assert:
+        timeout: 11m
+        resource:
+          apiVersion: helm.toolkit.fluxcd.io/v2
+          kind: HelmRelease
+          metadata:
+            name: mariadb-test
+          status:
+            (conditions[?type == 'Ready']):
+            - status: "True"
+
+  - name: verify-service-and-statefulset
+    try:
+    - assert:
+        resource:
+          apiVersion: v1
+          kind: Service
+          metadata:
+            name: mariadb-test
+          spec:
+            (ports[0].port): 3306
+    # The HelmRelease can report Ready before the operator's first status write
+    # on the CR, which kstatus reads as current. An endpoint address needs a
+    # replica past its startup and readiness probes (310s of startup budget,
+    # see packages/apps/mariadb/templates/mariadb.yaml).
+    - assert:
+        timeout: 10m
+        resource:
+          apiVersion: v1
+          kind: Endpoints
+          metadata:
+            name: mariadb-test
+          (subsets[0].addresses[0].ip != null): true
+    - assert:
+        timeout: 2m
+        resource:
+          apiVersion: apps/v1
+          kind: StatefulSet
+          metadata:
+            name: mariadb-test
+          status:
+            replicas: 2
+
+  # The chart's my.cnf reaches the pod only if the operator mounts it under a
+  # name the server's !includedir picks up, which no render-time test can see.
+  # The buffer pool is the witness: the chart always sets it, and on this
+  # fixture's preset the derived 64M differs from the server's 128M default.
+  - name: verify-my-cnf-applied
+    try:
+    - assert:
+        timeout: 5m
+        resource:
+          apiVersion: v1
+          kind: Pod
+          metadata:
+            name: mariadb-test-0
+          status:
+            (conditions[?type == 'Ready']):
+            - status: "True"
+    - script:
+        content: |
+          set -eu
+          want_mib=$(kubectl -n "$NAMESPACE" get configmap mariadb-test-my-cnf \
+            -o go-template='{{index .data "my.cnf"}}' \
+            | sed -n 's/^innodb_buffer_pool_size=\([0-9]*\)M$/\1/p')
+          got_bytes=$(kubectl -n "$NAMESPACE" exec mariadb-test-0 -c mariadb -- \
+            sh -c 'mariadb -u root -p"${MARIADB_ROOT_PASSWORD}" -N -e "SELECT @@innodb_buffer_pool_size"')
+          echo "my.cnf innodb_buffer_pool_size=${want_mib}M, server reports ${got_bytes} bytes"
+          if [ -z "$want_mib" ] || [ "$got_bytes" != "$((want_mib * 1048576))" ]; then
+            echo "FAIL: the server is not running with the chart's my.cnf"
+            false
+          fi
+        check:
+          ($error == null): true
+
+  - name: verify-metrics
+    try:
+    - assert:
+        resource:
+          apiVersion: v1
+          kind: Service
+          metadata:
+            name: mariadb-test-metrics
+          spec:
+            (ports[0].port): 9104
+    - assert:
+        timeout: 1m
+        resource:
+          apiVersion: v1
+          kind: Endpoints
+          metadata:
+            name: mariadb-test-metrics
+          (subsets[0].addresses[0].ip != null): true
+    - assert:
+        timeout: 2m
+        resource:
+          apiVersion: apps/v1
+          kind: Deployment
+          metadata:
+            name: mariadb-test-metrics
+          status:
+            replicas: 1
+
+  # The trust anchor a client verifies against, read off the live operator
+  # rather than off this repo's beliefs about it. The unit suite pins what the
+  # chart renders — the sentinel, its source name and its key — from the same
+  # assumptions the chart encodes, so the two agree by construction and cannot
+  # catch each other being wrong. Only a real mariadb-operator can say whether
+  # <release>-ca-bundle is the right name and ca.crt the right key, and only a
+  # real apiserver can say whether the lineage webhook promotes the projection
+  # to something a tenant can read.
+  #
+  # This fixture sets no tls.issuer, and that is the interesting case rather
+  # than a gap: TLS is always served and tenant-projection.yaml is ungated, so
+  # the operator reconciles the source and the projection is expected here.
+  - name: verify-tenant-ca-projection
+    try:
+    # Positive control, and it must come first. Every negative below is
+    # satisfied by an ABSENT label, which is also exactly what you observe if
+    # the lineage webhook stamped nothing in this run at all — a renamed field,
+    # a kind that never reconciled. Without a witness that the mechanism is
+    # live, they would all pass while asserting nothing.
+    #
+    # The credentials Secret is the witness: the chart renders it, its lineage
+    # resolves to this instance, and the ApplicationDefinition grants it by
+    # name, so it MUST be stamped.
+    - assert:
+        timeout: 2m
+        resource:
+          apiVersion: v1
+          kind: Secret
+          metadata:
+            name: mariadb-test-credentials
+            labels:
+              internal.cozystack.io/tenantresource: "true"
+    # tenant-ca is stamped by the CA-extraction controller; tenantresource is
+    # the LINEAGE WEBHOOK's verdict, computed from the ApplicationDefinition's
+    # secrets.include matchLabels. It reads "true" only if the whole chain held:
+    # the sentinel converged, the controller lifted the certificate, the
+    # definition selected the label and the webhook admitted the object.
+    - assert:
+        timeout: 2m
+        resource:
+          apiVersion: v1
+          kind: Secret
+          metadata:
+            name: mariadb-test.tenant-ca
+            labels:
+              internal.cozystack.io/tenant-ca: "true"
+              internal.cozystack.io/tenantresource: "true"
+          type: Opaque
+    # Deterministic once the asserts above pass, so no retry.
+    - script:
+        content: |
+          set -eu
+
+          NS="$NAMESPACE"
+          PROJ=mariadb-test.tenant-ca
+          SRC=mariadb-test-ca-bundle
+
+          # Reads one key of a Secret. `index` takes the key as a string, so a
+          # key with dots in it needs no jsonpath escaping.
+          secret_value() {
+            kubectl -n "$NS" get secret "$1" \
+              -o go-template="{{if .data}}{{index .data \"$2\"}}{{end}}" | base64 -d
+          }
+          secret_keys() {
+            kubectl -n "$NS" get secret "$1" \
+              -o go-template='{{if .data}}{{range $k, $v := .data}}{{$k}}{{"\n"}}{{end}}{{end}}'
+          }
+          # True when any value in the Secret is PEM private key material.
+          # Key-agnostic on purpose: which key the operator stores it under is
+          # its business, and naming one here would go quietly vacuous the day
+          # it changes.
+          has_private_key() {
+            for k in $(secret_keys "$1"); do
+              if secret_value "$1" "$k" | grep -qi 'BEGIN .*PRIVATE KEY'; then
+                return 0
+              fi
+            done
+            return 1
+          }
+
+          # Exactly one key, and it is ca.crt. The sources this was lifted
+          # alongside carry private keys, so any second key is a leak in the
+          # making.
+          keys=$(secret_keys "$PROJ" | sort | tr '\n' ' ')
+          if [ "$keys" != "ca.crt " ]; then
+            echo "projection must hold exactly ca.crt, holds: $keys" >&2
+            exit 1
+          fi
+
+          # It lifted the right certificate. This is what pins the declared
+          # source to reality: if the operator renames the bundle or its key,
+          # the controller finds nothing and this fails.
+          #
+          # Compared by fingerprint rather than raw PEM — the controller
+          # re-encodes ca.crt from the DER it parsed, so a header or
+          # column-width change at the source would redden a byte comparison of
+          # a correct projection.
+          src=$(secret_value "$SRC" "ca.crt")
+          if [ -z "$src" ]; then
+            echo "$SRC has no ca.crt — the declared source name or key is wrong" >&2
+            exit 1
+          fi
+          proj=$(secret_value "$PROJ" "ca.crt")
+          src_fp=$(echo "$src" | openssl x509 -noout -fingerprint -sha256)
+          proj_fp=$(echo "$proj" | openssl x509 -noout -fingerprint -sha256)
+          if [ "$src_fp" != "$proj_fp" ]; then
+            echo "projection does not carry the operator's CA certificate" >&2
+            exit 1
+          fi
+
+          # The source is key-free by design, which is why it is the source. If
+          # the operator ever starts storing a key in it, the projection stops
+          # being a copy of something safe.
+          if has_private_key "$SRC"; then
+            echo "$SRC now carries private key material — it is no longer a safe source" >&2
+            exit 1
+          fi
+          if echo "$proj" | grep -qi 'BEGIN .*PRIVATE KEY'; then
+            echo "projection carries PEM private key material" >&2
+            exit 1
+          fi
+
+          # The delivery path the README tells a tenant to use, run as the
+          # command the README prints. Everything above reads raw Secrets, which
+          # only an admin can do, and so proves the projection's shape and
+          # nothing about whether a tenant can reach it.
+          anchor=$(kubectl -n "$NS" get tenantsecret "$PROJ" \
+            -o jsonpath='{.data.ca\.crt}' | base64 -d)
+          if ! echo "$anchor" | grep -q 'BEGIN CERTIFICATE'; then
+            echo "the trust anchor is not served through core.cozystack.io/tenantsecrets" >&2
+            exit 1
+          fi
+
+          # And the negative that gives the positive its meaning: the registry
+          # must not serve a Secret that holds a private key. Promotion is
+          # driven by a label selector with no name constraint, so any one of
+          # these acquiring the label leaks a key.
+          #
+          # The candidates are the names the ApplicationDefinition excludes, and
+          # each is checked for private key material before its absence from the
+          # registry is required. A name that does not exist under this fixture
+          # would otherwise 404 for the wrong reason and pass while proving
+          # nothing — which is most of this list, since the cert-manager leg
+          # renders no Secrets when tls.issuer is unset. Counting what was
+          # actually discriminated on, and failing when that is zero, is what
+          # keeps the whole block from going vacuous if the operator renames
+          # everything at once.
+          checked=0
+          for s in mariadb-test-ca mariadb-test-server-cert mariadb-test-client-cert \
+                   mariadb-test.ca-tls mariadb-test.tls; do
+            if ! kubectl -n "$NS" get secret "$s" >/dev/null 2>&1; then
+              echo "skip $s: no such Secret under this fixture"
+              continue
+            fi
+            if ! has_private_key "$s"; then
+              echo "skip $s: holds no private key material"
+              continue
+            fi
+            checked=$((checked + 1))
+            # NotFound is the only acceptable failure. An RBAC denial or an
+            # unavailable aggregated apiserver also makes the read fail, and
+            # reading that as "safely absent" is how this check would stop
+            # discriminating without going red.
+            if err=$(kubectl -n "$NS" get tenantsecret "$s" 2>&1 >/dev/null); then
+              echo "key-bearing $s is being served as a tenant secret" >&2
+              exit 1
+            fi
+            case "$err" in
+              *NotFound*) echo "ok $s: key-bearing and not served" ;;
+              *)
+                echo "tenantsecret $s did not answer NotFound, so this check proved nothing: $err" >&2
+                exit 1
+                ;;
+            esac
+          done
+          if [ "$checked" -eq 0 ]; then
+            echo "no key-bearing Secret was found to check, so the negative above is vacuous" >&2
+            exit 1
+          fi
+        check:
+          ($error == null): true
+---
+# Guard for the operator-webhook regression fixed in c7e8f4d97: replication is
+# guarded on replicas>1, so replicas=1 must render a CR the mariadb-operator's
+# validating webhook admits. With one replica the operator provisions the bare
+# <name> Service (no -primary/-secondary split).
+apiVersion: chainsaw.kyverno.io/v1alpha1
+kind: Test
+metadata:
+  name: mariadb-single
+spec:
+  catch:
+  - events: {}
+  - describe:
+      apiVersion: helm.toolkit.fluxcd.io/v2
+      kind: HelmRelease
+      name: mariadb-single
+  # The rendered operator CR makes a webhook rejection (the regression this
+  # guards against) legible in the log.
+  - describe:
+      apiVersion: k8s.mariadb.com/v1alpha1
+      kind: MariaDB
+      name: mariadb-single
+  - podLogs:
+      selector: app.kubernetes.io/instance=mariadb-single
+      tail: 50
+  steps:
+  - name: create-mariadb-single
+    try:
+    - apply:
+        file: mariadb-single.yaml
+
+  - name: wait-helmrelease-ready
+    try:
+    # Same 11m as the replicated suite above.
+    - assert:
+        timeout: 11m
+        resource:
+          apiVersion: helm.toolkit.fluxcd.io/v2
+          kind: HelmRelease
+          metadata:
+            name: mariadb-single
+          status:
+            (conditions[?type == 'Ready']):
+            - status: "True"
+
+  - name: verify-service-and-statefulset
+    try:
+    - assert:
+        resource:
+          apiVersion: v1
+          kind: Service
+          metadata:
+            name: mariadb-single
+          spec:
+            (ports[0].port): 3306
+    # Same gate as the replicated case above.
+    - assert:
+        timeout: 10m
+        resource:
+          apiVersion: v1
+          kind: Endpoints
+          metadata:
+            name: mariadb-single
+          (subsets[0].addresses[0].ip != null): true
+    - assert:
+        timeout: 2m
+        resource:
+          apiVersion: apps/v1
+          kind: StatefulSet
+          metadata:
+            name: mariadb-single
+          status:
+            replicas: 1
+
+  - name: verify-metrics
+    try:
+    - assert:
+        resource:
+          apiVersion: v1
+          kind: Service
+          metadata:
+            name: mariadb-single-metrics
+          spec:
+            (ports[0].port): 9104
+    - assert:
+        timeout: 1m
+        resource:
+          apiVersion: v1
+          kind: Endpoints
+          metadata:
+            name: mariadb-single-metrics
+          (subsets[0].addresses[0].ip != null): true
+    - assert:
+        timeout: 2m
+        resource:
+          apiVersion: apps/v1
+          kind: Deployment
+          metadata:
+            name: mariadb-single-metrics
+          status:
+            replicas: 1
+---
+# Full logical-dump backup -> to-copy RestoreJob round-trip, driving the
+# validated example scripts (examples/backups/mariadb) as the harness so the
+# test and the documented flow can never drift. run-all.sh runs Bucket ->
+# source MariaDB + sentinel row -> MariaDB strategy + BackupClass -> ad-hoc
+# BackupJob (waits Succeeded) -> empty target MariaDB + to-copy RestoreJob
+# (waits Succeeded) and asserts the sentinel round-tripped through S3 into the
+# restored copy while the source stays untouched — the in-cluster witness that
+# a mariadb-operator backup is both taken and restorable end to end. It follows
+# the same harness-driving shape as etcd-2-backup-roundtrip
+# (hack/e2e-chainsaw/etcd/chainsaw-test.yaml): a single run step pre-cleans any
+# leftover state, drives run-all.sh, and drains in an always-reached finally.
+#
+# Runs in tenant-root, not the default tenant-test: the S3 client here is the
+# mariadb-operator Backup/Restore Job INSIDE the tenant, and the e2e tenant is
+# created isolated (hack/e2e-install-cozystack.bats) — its Cilium egress
+# allowlist blocks a tenant-test Pod from reaching tenant-root's seaweedfs,
+# while a tenant-root Pod reaches it over same-tenant egress. The harness
+# targets the in-cluster endpoint (S3_ENDPOINT below) instead of the BucketInfo
+# external ingress URL, which in CI is an unroutable placeholder, and trusts
+# its self-signed cert by copying the seaweedfs CA secret (seaweedfs-ca-cert,
+# auto-discovered from the cert-manager Certificate) into the per-app CA
+# Secret. (The bucket suite's mc checks lean on the same tenant-root seaweedfs,
+# just from the test runner via port-forward.)
+apiVersion: chainsaw.kyverno.io/v1alpha1
+kind: Test
+metadata:
+  name: mariadb-2-backup-roundtrip
+spec:
+  namespace: tenant-root
+  skipDelete: true
+  catch:
+  - events: {}
+  - describe:
+      apiVersion: helm.toolkit.fluxcd.io/v2
+      kind: HelmRelease
+      name: mariadb-mariadb-src
+  - describe:
+      apiVersion: k8s.mariadb.com/v1alpha1
+      kind: MariaDB
+      name: mariadb-mariadb-src
+  - describe:
+      apiVersion: k8s.mariadb.com/v1alpha1
+      kind: Backup
+  - describe:
+      apiVersion: k8s.mariadb.com/v1alpha1
+      kind: Restore
+  - describe:
+      apiVersion: backups.cozystack.io/v1alpha1
+      kind: BackupJob
+  - describe:
+      apiVersion: backups.cozystack.io/v1alpha1
+      kind: RestoreJob
+  # The dump/import runs in mariadb-operator-created Jobs; a failed upload or
+  # TLS handshake leaves its error in those Pods' logs. Capture the source
+  # instance's Pods too (operator Jobs are short-lived and TTL-reaped).
+  - podLogs:
+      selector: app.kubernetes.io/instance=mariadb-mariadb-src
+      tail: 200
+  steps:
+  - name: run
+    try:
+    # Pre-clean: tenant-root is a shared, persistent namespace with fixed
+    # resource names, so a run killed before the finally below leaves stale
+    # state behind. A leftover BackupJob still carrying status.phase=Succeeded
+    # from a prior run would satisfy `wait_for_field ... Succeeded` instantly
+    # and pass without a real backup ever running. cleanup.sh is idempotent
+    # (--ignore-not-found), so this is a no-op on a clean namespace.
+    - script:
+        timeout: 8m
+        content: |
+          set -eu
+          cd ../../..
+          NAMESPACE="$NAMESPACE" examples/backups/mariadb/cleanup.sh
+        check:
+          ($error == null): true
+    # 48m runs the whole documented flow: bucket provisioning, a 2-replica
+    # source MariaDB, the logical dump to S3, an empty 2-replica target, and
+    # the to-copy restore + verify (convention 6: justified in-line).
+    #
+    # Sized so a failed install at any 660s HelmRelease wait in run-all.sh is
+    # reported by the script rather than cut off here, which SIGKILLs the
+    # process group and loses the script's error. hack/mariadb-first-boot-waits.bats
+    # holds this op against those waits, so raising a wait in run-all.sh means
+    # raising this op too. A bound on the whole flow needs a phase budget
+    # (docs/agents/e2e-testing.md), not a larger literal.
+    - script:
+        timeout: 48m
+        content: |
+          set -eu
+          cd ../../..
+          [ -x examples/backups/mariadb/run-all.sh ] || { echo "mariadb backup example scripts not found at examples/backups/mariadb" >&2; exit 1; }
+          COZY_E2E_BACKUP_PREFLIGHT=1 NAMESPACE="$NAMESPACE" S3_ENDPOINT="https://seaweedfs-s3.tenant-root:8333" \
+            examples/backups/mariadb/run-all.sh
+        check:
+          ($error == null): true
+    finally:
+    # Removes every resource the harness created (chainsaw did not apply them,
+    # so they are not part of automatic cleanup) — including the operator-side
+    # k8s.mariadb.com Backup/Restore CRs the Cozystack jobs own only by label.
+    - description: backup-flow cleanup
+      script:
+        timeout: 8m
+        content: |
+          set -eu
+          cd ../../..
+          NAMESPACE="$NAMESPACE" examples/backups/mariadb/cleanup.sh
diff --git a/hack/e2e-chainsaw/mariadb/mariadb-single.yaml b/hack/e2e-chainsaw/mariadb/mariadb-single.yaml
new file mode 100644
index 0000000000..f69088423a
--- /dev/null
+++ b/hack/e2e-chainsaw/mariadb/mariadb-single.yaml
@@ -0,0 +1,28 @@
+apiVersion: apps.cozystack.io/v1alpha1
+kind: MariaDB
+metadata:
+  name: single
+spec:
+  external: false
+  size: 10Gi
+  replicas: 1
+  storageClass: ""
+  users:
+    testuser:
+      maxUserConnections: 1000
+  databases:
+    testdb:
+      roles:
+        admin:
+        - testuser
+  backup:
+    enabled: false
+    s3Region: us-east-1
+    s3Bucket: s3.example.org/mariadb-backups
+    schedule: "0 2 * * *"
+    cleanupStrategy: "--keep-last=3 --keep-daily=3 --keep-within-weekly=1m"
+    s3AccessKey: oobaiRus9pah8PhohL1ThaeTa4UVa7gu
+    s3SecretKey: ju3eum4dekeich9ahM1te8waeGai0oog
+    resticPassword: ChaXoveekoh6eigh4siesheeda2quai0
+  resources: {}
+  resourcesPreset: "nano"
diff --git a/hack/e2e-chainsaw/mariadb/mariadb.yaml b/hack/e2e-chainsaw/mariadb/mariadb.yaml
new file mode 100644
index 0000000000..ed10edb2c2
--- /dev/null
+++ b/hack/e2e-chainsaw/mariadb/mariadb.yaml
@@ -0,0 +1,28 @@
+apiVersion: apps.cozystack.io/v1alpha1
+kind: MariaDB
+metadata:
+  name: test
+spec:
+  external: false
+  size: 10Gi
+  replicas: 2
+  storageClass: ""
+  users:
+    testuser:
+      maxUserConnections: 1000
+  databases:
+    testdb:
+      roles:
+        admin:
+        - testuser
+  backup:
+    enabled: false
+    s3Region: us-east-1
+    s3Bucket: s3.example.org/mariadb-backups
+    schedule: "0 2 * * *"
+    cleanupStrategy: "--keep-last=3 --keep-daily=3 --keep-within-weekly=1m"
+    s3AccessKey: oobaiRus9pah8PhohL1ThaeTa4UVa7gu
+    s3SecretKey: ju3eum4dekeich9ahM1te8waeGai0oog
+    resticPassword: ChaXoveekoh6eigh4siesheeda2quai0
+  resources: {}
+  resourcesPreset: "nano"
diff --git a/hack/e2e-chainsaw/mongodb/chainsaw-test.yaml b/hack/e2e-chainsaw/mongodb/chainsaw-test.yaml
new file mode 100644
index 0000000000..77fb02c4fd
--- /dev/null
+++ b/hack/e2e-chainsaw/mongodb/chainsaw-test.yaml
@@ -0,0 +1,462 @@
+# Chainsaw port of hack/e2e-apps/mongodb.bats ("Create DB MongoDB").
+apiVersion: chainsaw.kyverno.io/v1alpha1
+kind: Test
+metadata:
+  name: mongodb
+spec:
+  catch:
+  - events: {}
+  - describe:
+      apiVersion: helm.toolkit.fluxcd.io/v2
+      kind: HelmRelease
+      name: mongodb-test
+  # The controller writes its verdict into the sentinel's status conditions
+  # (SourceNotFound, SourceRejected, ProjectionCollision, ...). Without this a
+  # failed projection surfaces only as an absent Secret, with no reason.
+  - describe:
+      apiVersion: internal.cozystack.io/v1alpha1
+      kind: TenantProjection
+  - podLogs:
+      selector: app.kubernetes.io/instance=mongodb-test
+      tail: 50
+  steps:
+  - name: create-mongodb
+    try:
+    - apply:
+        file: mongodb.yaml
+
+  - name: wait-helmrelease-ready
+    try:
+    # 11m: above the 600s install timeout cozystack-api gives this release;
+    # see "Sizing an HR-Ready budget" in docs/agents/e2e-testing.md.
+    - assert:
+        timeout: 11m
+        resource:
+          apiVersion: helm.toolkit.fluxcd.io/v2
+          kind: HelmRelease
+          metadata:
+            name: mongodb-test
+          status:
+            (conditions[?type == 'Ready']):
+            - status: "True"
+
+  - name: verify-service-and-statefulset
+    try:
+    - assert:
+        timeout: 2m
+        resource:
+          apiVersion: v1
+          kind: Service
+          metadata:
+            name: mongodb-test-rs0
+          spec:
+            (ports[0].port): 27017
+    - assert:
+        timeout: 3m
+        resource:
+          apiVersion: v1
+          kind: Endpoints
+          metadata:
+            name: mongodb-test-rs0
+          (subsets[0].addresses[0].ip != null): true
+    - assert:
+        timeout: 5m
+        resource:
+          apiVersion: apps/v1
+          kind: StatefulSet
+          metadata:
+            name: mongodb-test-rs0
+          status:
+            readyReplicas: 1
+
+  # The TenantProjection declares the trust-anchor source by name
+  # (<release>-ssl, key ca.crt). Nothing else in the repo checks that this is
+  # what the operator actually produces: the sentinel and any unit fixture
+  # would encode the same assumption and so cannot catch each other being
+  # wrong. This step is the independent witness — a Percona change to either
+  # the Secret name or the key breaks it here rather than silently producing an
+  # empty trust anchor.
+  - name: verify-trust-anchor-source-shape
+    try:
+    - assert:
+        timeout: 5m
+        resource:
+          apiVersion: v1
+          kind: Secret
+          metadata:
+            name: mongodb-test-ssl
+          (data."ca.crt" != null): true
+
+  # The README tells operators no manual cleanup of the TLS Secrets is needed,
+  # which reverses the instruction it replaced. That promise rests entirely on
+  # an ownerReference: the operator's deletion finalizer enumerates only the
+  # users, internal-<release>, internal-<release>-users and encryption-key
+  # Secrets, so nothing else would reclaim these three.
+  #
+  # The reference is patched on at reconcile time rather than set at creation —
+  # cert-manager creates the Secret unowned and WaitForCerts adds the CR
+  # reference afterwards — so this asserts the outcome on the path a normal
+  # install takes, and goes red if Percona stops patching. Matched on the owner
+  # kind rather than on a non-empty list, because the Secret acquiring some
+  # other owner is the failure this is meant to catch, not a pass.
+  #
+  # Pinned to PerconaServerMongoDB specifically because the platform ships
+  # cert-manager with enableCertificateOwnerRef: false, which is the leg where
+  # the CR owns the Secret directly. Were that flag ever flipped, the owner
+  # becomes the Certificate and this step correctly goes red rather than
+  # quietly accepting a different ownership graph than the README describes.
+  - name: verify-tls-secrets-are-owned-by-the-cr
+    try:
+    - assert:
+        timeout: 5m
+        resource:
+          apiVersion: v1
+          kind: Secret
+          metadata:
+            name: mongodb-test-ca-cert
+          (length(metadata.ownerReferences[?kind == 'PerconaServerMongoDB'] || `[]`)): 1
+    - assert:
+        timeout: 5m
+        resource:
+          apiVersion: v1
+          kind: Secret
+          metadata:
+            name: mongodb-test-ssl
+          (length(metadata.ownerReferences[?kind == 'PerconaServerMongoDB'] || `[]`)): 1
+    - assert:
+        timeout: 5m
+        resource:
+          apiVersion: v1
+          kind: Secret
+          metadata:
+            name: mongodb-test-ssl-internal
+          (length(metadata.ownerReferences[?kind == 'PerconaServerMongoDB'] || `[]`)): 1
+
+  # The Secrets the operator creates for TLS all carry private key material and
+  # must never be reachable by a tenant. The chart tests pin this at render
+  # time; this pins the object that is actually deployed.
+  #
+  # Asserted as an exact list rather than as the absence of forbidden names,
+  # because a rule granting `secrets` with no resourceNames at all grants every
+  # Secret in the namespace while containing no forbidden name to match on.
+  #
+  # Two counts are asserted alongside it and neither is redundant. An
+  # ADDITIONAL rule naming secrets contributes no entries to the flattened name
+  # list, so the equality alone would still hold while every Secret became
+  # readable — the secrets-rule count catches that. An ADDED rule with resources
+  # ["*"] grants every Secret without containing the string "secrets" at all, so
+  # it is invisible to both — the total rule count catches that one. An existing
+  # rule MUTATED to ["*"] drops the secrets-rule count to zero and empties the
+  # flattened name list, so both assertions below fail on it as well.
+  - name: verify-tenant-role-grants-no-key-material
+    try:
+    - assert:
+        timeout: 2m
+        resource:
+          apiVersion: rbac.authorization.k8s.io/v1
+          kind: Role
+          metadata:
+            name: mongodb-test-dashboard-resources
+          (length(rules)): 3
+          (length(rules[?contains(resources, 'secrets')])): 1
+          (rules[?contains(resources, 'secrets')].resourceNames[]):
+          - mongodb-test-credentials
+          # The Role is read-only by intent; verbs is the fourth RBAC axis and
+          # widening it is the same class as widening the other three.
+          (length(rules[?verbs != ['get', 'list', 'watch']])): 0
+
+  # The Role above is only one of the two paths a Secret can reach a tenant by.
+  # The other is core.cozystack.io/tenantsecrets, which surfaces whatever the
+  # lineage webhook stamped internal.cozystack.io/tenantresource=true from this
+  # application's ApplicationDefinition selectors. That is the path the
+  # secrets.include selector drives, and it is the one that would leak the CA
+  # private key if the selector ever named the operator's Secrets instead of
+  # the projection. Assert the key-bearing Secrets are not promoted onto it.
+  #
+  # This negative holds today and does not depend on the CA-extraction
+  # controller: it asserts what must NOT be labelled, not that the projection
+  # exists. Written as != 'true' rather than == 'false' because the stamp is
+  # applied when the operator adds its ownerReference, so before that pass the
+  # label is absent rather than false — both states are correct here.
+  - name: verify-key-bearing-secrets-are-not-tenant-secrets
+    try:
+    # Positive control, and it must come first. The three negatives below are
+    # satisfied by an ABSENT label — which is also exactly what you observe if
+    # the lineage webhook never stamped anything in this run at all, because a
+    # field was renamed or the kind was not reconciled. Without a witness that
+    # the mechanism is live, all three would pass while asserting nothing about
+    # the CA private key.
+    #
+    # The credentials Secret is the right witness: the chart renders it, it
+    # traces to the MongoDB CR, and the ApplicationDefinition grants it by name
+    # — so it MUST be stamped. This also catches the regression the exclude
+    # list makes newly possible, since exclude is evaluated before include and
+    # would silently revoke the tenant's own connection string.
+    - assert:
+        timeout: 2m
+        resource:
+          apiVersion: v1
+          kind: Secret
+          metadata:
+            name: mongodb-test-credentials
+            labels:
+              internal.cozystack.io/tenantresource: "true"
+    - assert:
+        timeout: 2m
+        resource:
+          apiVersion: v1
+          kind: Secret
+          metadata:
+            name: mongodb-test-ca-cert
+          (metadata.labels."internal.cozystack.io/tenantresource" != 'true'): true
+    - assert:
+        timeout: 2m
+        resource:
+          apiVersion: v1
+          kind: Secret
+          metadata:
+            name: mongodb-test-ssl
+          (metadata.labels."internal.cozystack.io/tenantresource" != 'true'): true
+    # All three are enumerated deliberately. The promotion is driven by a label
+    # selector rather than by name, so any one of them acquiring the label
+    # leaks a key — witnessing two of the three would leave the third unguarded.
+    - assert:
+        timeout: 2m
+        resource:
+          apiVersion: v1
+          kind: Secret
+          metadata:
+            name: mongodb-test-ssl-internal
+          (metadata.labels."internal.cozystack.io/tenantresource" != 'true'): true
+
+  # The negatives above are all satisfied by an absent label, so they say
+  # nothing about the anchor a tenant is supposed to get. This is the positive:
+  # the sentinel converged, the controller lifted the right certificate, and
+  # the registry serves it.
+  #
+  # tenant-ca is stamped by the controller; tenantresource is the LINEAGE
+  # WEBHOOK's verdict, computed from the ApplicationDefinition's secrets.include
+  # selector. It is "true" only if the whole chain held, and nothing short of a
+  # live cluster proves that link.
+  - name: verify-tenant-ca-projection
+    try:
+    - assert:
+        timeout: 2m
+        resource:
+          apiVersion: v1
+          kind: Secret
+          metadata:
+            name: mongodb-test.tenant-ca
+            labels:
+              internal.cozystack.io/tenant-ca: "true"
+              internal.cozystack.io/tenantresource: "true"
+          type: Opaque
+    # Deterministic once the assert above passes, so no retry.
+    - script:
+        content: |
+          set -eu
+
+          # Exactly one key, and it is ca.crt. The source carries a private key,
+          # so any second key is a leak in the making.
+          keys=$(kubectl -n "$NAMESPACE" get secret mongodb-test.tenant-ca \
+            -o go-template='{{range $k, $v := .data}}{{$k}}{{"\n"}}{{end}}' | sort | tr '\n' ' ')
+          if [ "$keys" != "ca.crt " ]; then
+            echo "projection must hold exactly ca.crt, holds: $keys" >&2
+            exit 1
+          fi
+
+          # It lifted the right certificate. This is what pins the declared
+          # source to reality: if Percona renames the Secret or the key, the
+          # controller finds nothing and this fails.
+          #
+          # Compared by fingerprint, not raw PEM — the controller re-encodes
+          # ca.crt from the DER it parsed, so a header or column-width change at
+          # the source would redden a byte comparison of a correct projection.
+          src=$(kubectl -n "$NAMESPACE" get secret mongodb-test-ssl -o jsonpath='{.data.ca\.crt}' | base64 -d)
+          if [ -z "$src" ]; then
+            echo "mongodb-test-ssl has no ca.crt — the declared source name or key is wrong" >&2
+            exit 1
+          fi
+          proj=$(kubectl -n "$NAMESPACE" get secret mongodb-test.tenant-ca -o jsonpath='{.data.ca\.crt}' | base64 -d)
+          src_fp=$(echo "$src" | openssl x509 -noout -fingerprint -sha256)
+          proj_fp=$(echo "$proj" | openssl x509 -noout -fingerprint -sha256)
+          if [ "$src_fp" != "$proj_fp" ]; then
+            echo "projection does not carry the operator's CA certificate" >&2
+            exit 1
+          fi
+
+          # The point of the whole exercise: the source carries a private key,
+          # the projection must not. Asserting the source really does hold
+          # tls.key keeps this honest — if the operator ever stopped storing it
+          # there, the check below would pass while proving nothing.
+          if ! kubectl -n "$NAMESPACE" get secret mongodb-test-ssl \
+            -o go-template='{{if .data}}{{range $k, $v := .data}}{{$k}}{{"\n"}}{{end}}{{end}}' | grep -qx 'tls.key'; then
+            echo "mongodb-test-ssl no longer carries tls.key — this check has stopped proving anything" >&2
+            exit 1
+          fi
+          if kubectl -n "$NAMESPACE" get secret mongodb-test.tenant-ca \
+            -o jsonpath='{.data.ca\.crt}' | base64 -d | grep -qi 'BEGIN .*PRIVATE KEY'; then
+            echo "projection carries PEM private key material" >&2
+            exit 1
+          fi
+
+          # The delivery path the README tells a tenant to use, run as the
+          # command the README prints. Everything above reads the raw Secret,
+          # which only an admin can do.
+          anchor=$(kubectl -n "$NAMESPACE" get tenantsecret mongodb-test.tenant-ca \
+            -o jsonpath='{.data.ca\.crt}' | base64 -d)
+          if ! echo "$anchor" | grep -q 'BEGIN CERTIFICATE'; then
+            echo "the trust anchor is not served through core.cozystack.io/tenantsecrets" >&2
+            exit 1
+          fi
+
+          # And the negative that gives the positive its meaning: the registry
+          # must not serve the key-bearing Secrets. If either starts resolving,
+          # the label path has stopped gating on the platform's verdict.
+          for s in mongodb-test-ssl mongodb-test-ssl-internal mongodb-test-ca-cert; do
+            if kubectl -n "$NAMESPACE" get tenantsecret "$s" >/dev/null 2>&1; then
+              echo "key-bearing $s is being served as a tenant secret" >&2
+              exit 1
+            fi
+          done
+
+  # The -old snapshots are operator scratch state that the operator removes
+  # itself once the merged CA has landed, not residue needing manual cleanup.
+  # A settled install must therefore leave none behind. This is a weak witness
+  # on first install, where they are never created at all, but it pins the
+  # corrected claim and goes red if the operator stops cleaning up.
+  - name: verify-no-rotation-snapshots-remain
+    try:
+    - error:
+        # Short: a Secret that does not exist will not start existing while
+        # chainsaw waits, and this step is a weak witness on a first install.
+        timeout: 30s
+        resource:
+          apiVersion: v1
+          kind: Secret
+          metadata:
+            name: mongodb-test-ssl-old
+    - error:
+        timeout: 30s
+        resource:
+          apiVersion: v1
+          kind: Secret
+          metadata:
+            name: mongodb-test-ssl-internal-old
+---
+# Logical-dump backup half of the MongoDB backup flow, driving the validated
+# example scripts (examples/backups/mongodb) as the harness so the test and the
+# documented flow can never drift. run-all.sh runs Bucket -> source MongoDB
+# (backup.enabled) + sentinel document -> ad-hoc BackupJob against the
+# cozy-default BackupClass (waits Succeeded), and SKIP_RESTORE=1 stops it there
+# — the in-cluster witness that a psmdb-operator backup is actually taken.
+#
+# The to-copy restore half is deliberately uncovered. A to-copy restore replays
+# the source cluster's system users into the target, so the target's own
+# generated credentials stop authenticating and the harness cannot read the
+# sentinel back out of the restored copy (#3832). Returning full round-trip
+# coverage once that is fixed means dropping both SKIP_RESTORE below and the
+# marker check beside it: the complete flow never prints that line, so removing
+# only the variable trades this failure for a marker mismatch. The test keeps
+# its round-trip name for that return.
+#
+# Same harness-driving shape as mariadb-2-backup-roundtrip
+# (hack/e2e-chainsaw/mariadb/chainsaw-test.yaml): a single run step pre-cleans
+# any leftover state, drives run-all.sh, and drains in an always-reached finally.
+#
+# Runs in tenant-root, not the default tenant-test: the S3 client here is the
+# percona-backup-mongodb agent INSIDE the mongod pod, and the e2e tenant is
+# created isolated (hack/e2e-install-cozystack.bats) — its Cilium egress
+# allowlist blocks a tenant-test Pod from reaching tenant-root's seaweedfs,
+# while a tenant-root Pod reaches it over same-tenant egress. The harness
+# targets the in-cluster endpoint (S3_ENDPOINT below) instead of the BucketInfo
+# external ingress URL, which in CI is an unroutable placeholder, and tolerates
+# its self-signed cert via backup.insecureSkipTLSVerify=true on the app (the
+# psmdb s3 storage has no CA-bundle field, unlike the mariadb driver's tls
+# block).
+apiVersion: chainsaw.kyverno.io/v1alpha1
+kind: Test
+metadata:
+  name: mongodb-2-backup-roundtrip
+spec:
+  namespace: tenant-root
+  skipDelete: true
+  catch:
+  - events: {}
+  - describe:
+      apiVersion: helm.toolkit.fluxcd.io/v2
+      kind: HelmRelease
+      name: mongodb-mongodb-src
+  - describe:
+      apiVersion: psmdb.percona.com/v1
+      kind: PerconaServerMongoDB
+      name: mongodb-mongodb-src
+  - describe:
+      apiVersion: psmdb.percona.com/v1
+      kind: PerconaServerMongoDBBackup
+  - describe:
+      apiVersion: psmdb.percona.com/v1
+      kind: PerconaServerMongoDBRestore
+  - describe:
+      apiVersion: backups.cozystack.io/v1alpha1
+      kind: BackupJob
+  - describe:
+      apiVersion: backups.cozystack.io/v1alpha1
+      kind: RestoreJob
+  # The dump/restore runs in the pbm agent inside the mongod pods; a failed
+  # upload or TLS handshake leaves its error in those Pods' logs.
+  - podLogs:
+      selector: app.kubernetes.io/instance=mongodb-mongodb-src
+      tail: 200
+  steps:
+  - name: run
+    try:
+    # Pre-clean: tenant-root is a shared, persistent namespace with fixed
+    # resource names, so a run killed before the finally below leaves stale
+    # state behind. A leftover BackupJob still carrying status.phase=Succeeded
+    # from a prior run would satisfy `wait_for_field ... Succeeded` instantly
+    # and pass without a real backup ever running. cleanup.sh is idempotent
+    # (--ignore-not-found), so this is a no-op on a clean namespace.
+    - script:
+        timeout: 8m
+        content: |
+          set -eu
+          cd ../../..
+          NAMESPACE="$NAMESPACE" examples/backups/mongodb/cleanup.sh
+        check:
+          ($error == null): true
+    # The 42m budget covers what this step drives: bucket provisioning, a
+    # single-replica source MongoDB coming up (psmdb reconcile, PVC bind, image
+    # pull, pbm-agent sidecars) and the logical dump to S3 (convention 6:
+    # justified in-line). It is not lowered for the skipped restore because
+    # run-all.sh's own per-wait budgets up to the backup already exceed it, so
+    # this is the ceiling that fires either way. run-all.sh fails fast on a
+    # terminal BackupJob phase and stalled HelmReleases rather than polling out
+    # the budget. Sized with the 660s bucket and source HR waits in run-all.sh.
+    - script:
+        timeout: 42m
+        content: |
+          set -eu
+          cd ../../..
+          [ -x examples/backups/mongodb/run-all.sh ] || { echo "mongodb backup example scripts not found at examples/backups/mongodb" >&2; exit 1; }
+          COZY_E2E_BACKUP_PREFLIGHT=1 NAMESPACE="$NAMESPACE" S3_ENDPOINT="https://seaweedfs-s3.tenant-root:8333" \
+            SKIP_RESTORE=1 examples/backups/mongodb/run-all.sh
+        check:
+          ($error == null): true
+          # Exit zero alone is also what a completed round-trip returns, so the
+          # marker is what tells the skipped flow from the full one — and what
+          # fails the step if SKIP_RESTORE stops reaching the harness. run-all.sh
+          # logs through stderr. The phrase is the skip branch's own line, minus
+          # its colon, which YAML would read as a mapping separator in the key.
+          (contains($stderr, 'stopping after a successful backup')): true
+    finally:
+    # Removes every resource the harness created (chainsaw did not apply them,
+    # so they are not part of automatic cleanup) — including the operator-side
+    # psmdb.percona.com Backup/Restore CRs the Cozystack jobs own only by label.
+    - description: backup-flow cleanup
+      script:
+        timeout: 8m
+        content: |
+          set -eu
+          cd ../../..
+          NAMESPACE="$NAMESPACE" examples/backups/mongodb/cleanup.sh
diff --git a/hack/e2e-chainsaw/mongodb/mongodb.yaml b/hack/e2e-chainsaw/mongodb/mongodb.yaml
new file mode 100644
index 0000000000..8aabed3cdf
--- /dev/null
+++ b/hack/e2e-chainsaw/mongodb/mongodb.yaml
@@ -0,0 +1,20 @@
+apiVersion: apps.cozystack.io/v1alpha1
+kind: MongoDB
+metadata:
+  name: test
+spec:
+  external: false
+  size: 10Gi
+  replicas: 1
+  storageClass: ""
+  resourcesPreset: "small"
+  users:
+    testuser:
+      password: xai7Wepo
+  databases:
+    testdb:
+      roles:
+        admin:
+        - testuser
+  backup:
+    enabled: false
diff --git a/hack/e2e-chainsaw/monitoring/chainsaw-test.yaml b/hack/e2e-chainsaw/monitoring/chainsaw-test.yaml
new file mode 100644
index 0000000000..a1d5ff25d4
--- /dev/null
+++ b/hack/e2e-chainsaw/monitoring/chainsaw-test.yaml
@@ -0,0 +1,417 @@
+# Grafana OIDC on a tenant Monitoring release, driven through all three
+# shapes the chart supports on one release: System, then CustomConfig with an
+# inline config, then CustomConfig with a secretRef. The render of each shape
+# on a fresh install is pinned by packages/system/monitoring/tests/oidc_test.yaml;
+# what only a live cluster shows is admission by cozystack-api, the Deployment
+# the Grafana operator builds, and what an in-place upgrade leaves behind.
+# Chaining the modes on one release is what makes the last of those
+# observable, and pays for one stack bring-up instead of three. The Keycloak
+# objects are checked as the release wrote them, so creating the client in
+# Keycloak is not asserted; removing it is, because the operator's finalizer
+# holds the KeycloakClient until the client is gone from Keycloak.
+#
+# The release is created here, in tenant-test, and owns its whole stack; the
+# suite does not read the tenant-root monitoring instance. No browser login
+# through Keycloak is driven.
+#
+# The EDP Keycloak CRDs are required rather than probed for: the e2e install
+# turns platform OIDC on, so their absence is a broken install, and an `error:`
+# op against an unknown kind fails instead of asserting absence.
+apiVersion: chainsaw.kyverno.io/v1alpha1
+kind: Test
+metadata:
+  name: monitoring-oidc
+spec:
+  catch:
+  - events: {}
+  - describe:
+      apiVersion: helm.toolkit.fluxcd.io/v2
+      kind: HelmRelease
+      name: monitoring
+  - describe:
+      apiVersion: helm.toolkit.fluxcd.io/v2
+      kind: HelmRelease
+      name: monitoring-system
+  - describe:
+      apiVersion: grafana.integreatly.org/v1beta1
+      kind: Grafana
+      name: grafana
+  - podLogs:
+      selector: app.kubernetes.io/name=monitoring-oidc-users
+      tail: 100
+  - script:
+      # Same helper and budget as the harbor suite: one bounded kubectl call,
+      # ~75s worst case on a degraded cluster.
+      timeout: 2m
+      content: |
+        set -eu
+        cd ../../..
+        . hack/e2e-chainsaw/_lib/pod-label-census.sh
+        pod_label_census "$NAMESPACE"
+  steps:
+  - name: platform-oidc-ready
+    try:
+    - assert:
+        timeout: 1m
+        resource:
+          apiVersion: apiextensions.k8s.io/v1
+          kind: CustomResourceDefinition
+          metadata:
+            name: keycloakclients.v1.edp.epam.com
+    - assert:
+        timeout: 1m
+        resource:
+          apiVersion: apiextensions.k8s.io/v1
+          kind: CustomResourceDefinition
+          metadata:
+            name: keycloakclientscopes.v1.edp.epam.com
+    - assert:
+        timeout: 1m
+        resource:
+          apiVersion: apiextensions.k8s.io/v1
+          kind: CustomResourceDefinition
+          metadata:
+            name: keycloakrealmgroups.v1.edp.epam.com
+    # The outer release copies this Secret's _cluster into the inner
+    # release's values once, at render time, and a System-mode render fails
+    # without oidc-enabled. When this suite runs first, the tenant can still be
+    # carrying the values it was created with; an inner install started from
+    # those keeps failing on the stale copy until the outer install times out
+    # 15m later.
+    - assert:
+        resource:
+          apiVersion: v1
+          kind: Secret
+          metadata:
+            name: cozystack-values
+          "(contains(base64_decode(data.\"values.yaml\"), 'oidc-enabled: \"true\"'))": true
+
+  - name: system-mode-install
+    try:
+    - apply:
+        file: monitoring-system.yaml
+    # 16m: the outer release's install timeout is 15m (monitoring-rd) and the
+    # inner monitoring-system release's spec.timeout is 15m too, plus the 60s
+    # start margin; see "Sizing an HR-Ready budget" in
+    # docs/agents/e2e-testing.md. The outer install waits on the inner
+    # HelmRelease, so outer Ready covers both.
+    - assert:
+        timeout: 16m
+        resource:
+          apiVersion: helm.toolkit.fluxcd.io/v2
+          kind: HelmRelease
+          metadata:
+            name: monitoring
+          status:
+            (conditions[?type == 'Ready']):
+            - status: "True"
+    - assert:
+        resource:
+          apiVersion: helm.toolkit.fluxcd.io/v2
+          kind: HelmRelease
+          metadata:
+            name: monitoring-system
+          status:
+            (conditions[?type == 'Ready']):
+            - status: "True"
+
+  - name: system-mode-shape
+    try:
+    - assert:
+        resource:
+          apiVersion: grafana.integreatly.org/v1beta1
+          kind: Grafana
+          metadata:
+            name: grafana
+          spec:
+            config:
+              auth.generic_oauth:
+                enabled: "true"
+                client_id: tenant-test-monitoring-system
+                (ends_with(auth_url, '/realms/cozy/protocol/openid-connect/auth')): true
+                skip_org_role_sync: "true"
+                oauth_allow_insecure_email_lookup: "true"
+                # Present here so its absence after the swap below is a change.
+                (contains(keys(@), 'allowed_groups')): true
+                # Authorization is the users-Job's, not a claim mapping.
+                (contains(keys(@), 'role_attribute_path')): false
+    - assert:
+        resource:
+          apiVersion: v1.edp.epam.com/v1
+          kind: KeycloakClient
+          metadata:
+            name: tenant-test-monitoring-system
+          spec:
+            # Confidential client. Absent and false both mean that, and the
+            # chart's `false` has been seen not to survive on a live cluster,
+            # so either passes; only true fails.
+            (contains(keys(@), 'public') && public): false
+            secret: $monitoring-system-oidc-client:client-secret
+    - assert:
+        resource:
+          apiVersion: v1.edp.epam.com/v1
+          kind: KeycloakClientScope
+          metadata:
+            name: tenant-test-monitoring-system-audience
+          spec:
+            (protocolMappers[*].protocolMapper): [oidc-audience-mapper]
+            (protocolMappers[*].config."included.client.audience"): [tenant-test-monitoring-system]
+    # Group directory objects belong to the tenant chart, not to each
+    # Monitoring release. Checked after the KeycloakClient above is present, so
+    # the absence is a statement about a release that did render.
+    - error:
+        resource:
+          apiVersion: v1.edp.epam.com/v1
+          kind: KeycloakRealmGroup
+          metadata:
+            name: tenant-test-monitoring-system-admin
+    - error:
+        resource:
+          apiVersion: v1.edp.epam.com/v1
+          kind: KeycloakRealmGroup
+          metadata:
+            name: tenant-test-monitoring-system-editor
+    - error:
+        resource:
+          apiVersion: v1.edp.epam.com/v1
+          kind: KeycloakRealmGroup
+          metadata:
+            name: tenant-test-monitoring-system-viewer
+    - assert:
+        resource:
+          apiVersion: batch/v1
+          kind: Job
+          metadata:
+            name: monitoring-system-oidc-users
+          spec:
+            template:
+              spec:
+                (containers[?name == 'reconcile'].env[] | [?name == 'OIDC_MODE'].value): [System]
+                (containers[?name == 'reconcile'].env[] | [?name == 'DESIRED_USERS_JSON'].value): ['[{"email":"e2e-admin@example.com","role":"Admin"}]']
+    - assert:
+        resource:
+          apiVersion: apps/v1
+          kind: Deployment
+          metadata:
+            name: grafana-deployment
+          spec:
+            template:
+              spec:
+                (containers[?name == 'grafana'].env[] | [?name == 'GF_AUTH_GENERIC_OAUTH_CLIENT_SECRET'].valueFrom.secretKeyRef.name): [monitoring-system-oidc-client]
+    - assert:
+        resource:
+          apiVersion: v1
+          kind: Secret
+          metadata:
+            name: monitoring-system-oidc-client
+    # The value is generated once by the chart and kept across upgrades by a
+    # lookup; its shape is the part an assert cannot express.
+    - script:
+        timeout: 1m
+        content: |
+          set -eu
+          encoded=$(timeout 30 kubectl -n "$NAMESPACE" get secret monitoring-system-oidc-client \
+            -o jsonpath='{.data.client-secret}')
+          value=$(printf '%s' "$encoded" | base64 -d)
+          echo "client-secret length: ${#value}"
+          printf '%s\n' "$value" | grep -Eqx '[A-Za-z0-9]{32}'
+
+  - name: system-mode-did-not-remediate
+    try:
+    - script:
+        # The inner release carries `remediation.retries: -1` and the outer one,
+        # generated by cozystack-api, retries on failure, so either can go Ready
+        # after a failed install or upgrade. A failed install leaves a `failed`
+        # or `uninstalled` snapshot (e2e-testing.md §6), but helm-controller
+        # truncates .status.history after the previous deployed or superseded
+        # snapshot, so a failed upgrade that a rollback and a retry recovered
+        # leaves no such entry. Each mode change is one helm upgrade, so the
+        # revision count is what still shows it: a rollback or a retry adds
+        # revisions the test did not ask for.
+        timeout: 2m
+        env:
+        - name: EXPECTED_REVISION
+          value: "1"
+        content: &remediation-guard |
+          set -eu
+          cd ../../..
+          . hack/e2e-chainsaw/_lib/remediation-guard.sh
+          for hr in monitoring monitoring-system; do
+            statuses=$(timeout 30 kubectl -n "$NAMESPACE" get helmrelease "$hr" \
+              -o jsonpath="$HELMRELEASE_HISTORY_JSONPATH")
+            latest=$(timeout 30 kubectl -n "$NAMESPACE" get helmrelease "$hr" \
+              -o jsonpath='{.status.history[0].version}')
+            echo "HelmRelease $hr history statuses (latest revision ${latest:-<none>}):"
+            printf '%s\n' "${statuses:-<empty>}"
+            if [ -z "$statuses" ]; then
+              echo "empty .status.history on a Ready HelmRelease $hr - the Flux API shape may have changed" >&2
+              exit 1
+            fi
+            if helmrelease_has_remediation_cycle "$statuses"; then
+              echo "HelmRelease $hr went through a remediation cycle" >&2
+              exit 1
+            fi
+            if [ "$latest" != "$EXPECTED_REVISION" ]; then
+              echo "HelmRelease $hr is at revision $latest, expected $EXPECTED_REVISION: a failed action was rolled back or retried" >&2
+              exit 1
+            fi
+          done
+
+  - name: swap-to-customconfig-inline
+    try:
+    - apply:
+        file: monitoring-customconfig-inline.yaml
+    # The inner release applies the Grafana CR at the start of its upgrade, so
+    # this is the first sign the new values arrived, and it bumps the inner
+    # HelmRelease's generation before any Ready check below can read a stale
+    # one.
+    - assert:
+        resource:
+          apiVersion: grafana.integreatly.org/v1beta1
+          kind: Grafana
+          metadata:
+            name: grafana
+          spec:
+            config:
+              auth.generic_oauth:
+                client_id: byo-monitoring
+                client_secret: byo-secret
+                auth_url: https://idp.example.test/auth
+                token_url: https://idp.example.test/token
+                api_url: https://idp.example.test/userinfo
+                # Forced by the chart over the tenant's map for the users-Job.
+                skip_org_role_sync: "true"
+                oauth_allow_insecure_email_lookup: "true"
+                # A System-mode key surviving the upgrade would keep gating
+                # logins on cozy-realm groups this issuer never emits.
+                (contains(keys(@), 'allowed_groups')): false
+    # The post-upgrade hook replaces the Job only once the upgraded workloads
+    # are ready, so this carries the upgrade budget: the inner release's 15m
+    # spec.timeout plus the start margin.
+    - assert:
+        timeout: 16m
+        resource:
+          apiVersion: batch/v1
+          kind: Job
+          metadata:
+            name: monitoring-system-oidc-users
+          spec:
+            template:
+              spec:
+                (containers[?name == 'reconcile'].env[] | [?name == 'OIDC_MODE'].value): [CustomConfig]
+                (containers[?name == 'reconcile'].env[] | [?name == 'DESIRED_USERS_JSON'].value): ['[{"email":"e2e-byo@example.com","role":"Viewer"}]']
+    # The Job above appears when the hook starts, not when it ends, and the
+    # hook runs inside the same 15m upgrade, so this keeps the full upgrade
+    # budget rather than what is left of it.
+    - assert:
+        timeout: 16m
+        resource:
+          apiVersion: helm.toolkit.fluxcd.io/v2
+          kind: HelmRelease
+          metadata:
+            name: monitoring-system
+          (contains(status.conditions[?type == 'Ready' && status == 'True'].observedGeneration, metadata.generation)): true
+    - assert: &outer-ready-current
+        resource:
+          apiVersion: helm.toolkit.fluxcd.io/v2
+          kind: HelmRelease
+          metadata:
+            name: monitoring
+          (contains(status.conditions[?type == 'Ready' && status == 'True'].observedGeneration, metadata.generation)): true
+
+  - name: inline-upgrade-did-not-remediate
+    try:
+    - script:
+        timeout: 2m
+        env:
+        - name: EXPECTED_REVISION
+          value: "2"
+        content: *remediation-guard
+
+  # Leaving System mode has to take the cozy-realm objects with it. A client
+  # left behind keeps a live confidential client in the platform realm for a
+  # Grafana that no longer trusts it, and its Secret outlives the only consumer.
+  - name: customconfig-pruned-system-objects
+    try:
+    - error:
+        resource:
+          apiVersion: v1.edp.epam.com/v1
+          kind: KeycloakClient
+          metadata:
+            name: tenant-test-monitoring-system
+    - error:
+        resource:
+          apiVersion: v1.edp.epam.com/v1
+          kind: KeycloakClientScope
+          metadata:
+            name: tenant-test-monitoring-system-audience
+    - error:
+        resource:
+          apiVersion: v1
+          kind: Secret
+          metadata:
+            name: monitoring-system-oidc-client
+    - assert:
+        resource:
+          apiVersion: apps/v1
+          kind: Deployment
+          metadata:
+            name: grafana-deployment
+          spec:
+            template:
+              spec:
+                (containers[?name == 'grafana'].env[] | [?name == 'GF_AUTH_GENERIC_OAUTH_CLIENT_SECRET']): []
+
+  - name: swap-to-customconfig-secretref
+    try:
+    - apply:
+        file: monitoring-customconfig-secretref.yaml
+    # The upgrade-time failure this pins: the inline block surviving next to
+    # the mount, which keeps the previous issuer in force after the tenant
+    # moved to its own ini fragment.
+    - assert:
+        resource:
+          apiVersion: grafana.integreatly.org/v1beta1
+          kind: Grafana
+          metadata:
+            name: grafana
+          spec:
+            (contains(keys(config), 'auth.generic_oauth')): false
+            deployment:
+              spec:
+                template:
+                  spec:
+                    (volumes[?name == 'oidc-custom-ini'].secret.secretName): [mon-oidc-byo-oauth]
+                    (containers[?name == 'grafana'].volumeMounts[] | [?name == 'oidc-custom-ini'].mountPath): [/etc/grafana/oidc]
+    # No users-Job renders in this shape, so the inner release's own Ready at
+    # the current generation is what marks the end of the upgrade; same 16m
+    # upgrade budget as the Job assert above.
+    - assert:
+        timeout: 16m
+        resource:
+          apiVersion: helm.toolkit.fluxcd.io/v2
+          kind: HelmRelease
+          metadata:
+            name: monitoring-system
+          (contains(status.conditions[?type == 'Ready' && status == 'True'].observedGeneration, metadata.generation)): true
+    - assert: *outer-ready-current
+    - assert:
+        resource:
+          apiVersion: apps/v1
+          kind: Deployment
+          metadata:
+            name: grafana-deployment
+          spec:
+            template:
+              spec:
+                (volumes[?name == 'oidc-custom-ini'].secret.secretName): [mon-oidc-byo-oauth]
+                (containers[?name == 'grafana'].volumeMounts[] | [?name == 'oidc-custom-ini'].mountPath): [/etc/grafana/oidc]
+
+  - name: secretref-upgrade-did-not-remediate
+    try:
+    - script:
+        timeout: 2m
+        env:
+        - name: EXPECTED_REVISION
+          value: "3"
+        content: *remediation-guard
diff --git a/hack/e2e-chainsaw/monitoring/monitoring-customconfig-inline.yaml b/hack/e2e-chainsaw/monitoring/monitoring-customconfig-inline.yaml
new file mode 100644
index 0000000000..381ddcba1d
--- /dev/null
+++ b/hack/e2e-chainsaw/monitoring/monitoring-customconfig-inline.yaml
@@ -0,0 +1,33 @@
+apiVersion: apps.cozystack.io/v1alpha1
+kind: Monitoring
+metadata:
+  name: monitoring
+spec:
+  host: ""
+  metricsStorages:
+  - name: shortterm
+    retentionPeriod: "3d"
+    deduplicationInterval: "15s"
+    storage: 10Gi
+    storageClassName: ""
+  vmagent:
+    remoteWrite:
+      urls:
+      - http://vminsert-shortterm:8480/insert/0/prometheus
+  logsStorages:
+  - name: generic
+    retentionPeriod: "1"
+    storage: 10Gi
+    storageClassName: ""
+  oidc:
+    mode: CustomConfig
+    customConfig:
+      config:
+        client_id: byo-monitoring
+        client_secret: byo-secret
+        auth_url: https://idp.example.test/auth
+        token_url: https://idp.example.test/token
+        api_url: https://idp.example.test/userinfo
+    users:
+    - email: e2e-byo@example.com
+      role: Viewer
diff --git a/hack/e2e-chainsaw/monitoring/monitoring-customconfig-secretref.yaml b/hack/e2e-chainsaw/monitoring/monitoring-customconfig-secretref.yaml
new file mode 100644
index 0000000000..72ebd8df5b
--- /dev/null
+++ b/hack/e2e-chainsaw/monitoring/monitoring-customconfig-secretref.yaml
@@ -0,0 +1,46 @@
+# Chainsaw applies to an existing object as a JSON merge patch, so a key left
+# out of this file keeps the value the inline step gave it. The inline config
+# and the users list therefore have to be cleared explicitly: the chart fails
+# the render on config together with secretRef (assertCustomConfigXor), and on
+# users together with secretRef (assertCustomSecretRefUsersEmpty). null deletes
+# the map; an empty map would merge into it and change nothing.
+apiVersion: v1
+kind: Secret
+metadata:
+  name: mon-oidc-byo-oauth
+stringData:
+  auth.ini: |
+    [auth.generic_oauth]
+    enabled = true
+    name = ByoIdp
+    client_id = byo-monitoring
+    client_secret = byo-secret
+---
+apiVersion: apps.cozystack.io/v1alpha1
+kind: Monitoring
+metadata:
+  name: monitoring
+spec:
+  host: ""
+  metricsStorages:
+  - name: shortterm
+    retentionPeriod: "3d"
+    deduplicationInterval: "15s"
+    storage: 10Gi
+    storageClassName: ""
+  vmagent:
+    remoteWrite:
+      urls:
+      - http://vminsert-shortterm:8480/insert/0/prometheus
+  logsStorages:
+  - name: generic
+    retentionPeriod: "1"
+    storage: 10Gi
+    storageClassName: ""
+  oidc:
+    mode: CustomConfig
+    customConfig:
+      config: null
+      secretRef:
+        name: mon-oidc-byo-oauth
+    users: []
diff --git a/hack/e2e-chainsaw/monitoring/monitoring-system.yaml b/hack/e2e-chainsaw/monitoring/monitoring-system.yaml
new file mode 100644
index 0000000000..45c6b7c0ee
--- /dev/null
+++ b/hack/e2e-chainsaw/monitoring/monitoring-system.yaml
@@ -0,0 +1,33 @@
+# The extra/monitoring chart refuses any release name but `monitoring`
+# (templates/check-release-name.yaml), so this is a singleton per tenant and
+# every OIDC identifier the inner chart derives is built off the inner release
+# `monitoring-system`. storageClassName "" takes the cluster default: the
+# logs default is `replicated`, which the container lane does not have.
+apiVersion: apps.cozystack.io/v1alpha1
+kind: Monitoring
+metadata:
+  name: monitoring
+spec:
+  host: ""
+  metricsStorages:
+  - name: shortterm
+    retentionPeriod: "3d"
+    deduplicationInterval: "15s"
+    storage: 10Gi
+    storageClassName: ""
+  # Only the shortterm store exists here, so vmagent writes only there; its
+  # default list also names the longterm one.
+  vmagent:
+    remoteWrite:
+      urls:
+      - http://vminsert-shortterm:8480/insert/0/prometheus
+  logsStorages:
+  - name: generic
+    retentionPeriod: "1"
+    storage: 10Gi
+    storageClassName: ""
+  oidc:
+    mode: System
+    users:
+    - email: e2e-admin@example.com
+      role: Admin
diff --git a/hack/e2e-chainsaw/openbao/chainsaw-test.yaml b/hack/e2e-chainsaw/openbao/chainsaw-test.yaml
new file mode 100644
index 0000000000..bbbe83696c
--- /dev/null
+++ b/hack/e2e-chainsaw/openbao/chainsaw-test.yaml
@@ -0,0 +1,170 @@
+# Chainsaw port of hack/e2e-apps/openbao.bats ("Create OpenBAO (standalone)").
+#
+# The init/unseal sequence is inherently imperative (exec into the pod, parse
+# JSON, feed the key back), so it stays a script step. Everything around it —
+# HelmRelease readiness, container-started gate, StatefulSet/PVC state — is
+# declarative.
+apiVersion: chainsaw.kyverno.io/v1alpha1
+kind: Test
+metadata:
+  name: openbao
+spec:
+  catch:
+  - events: {}
+  - describe:
+      apiVersion: helm.toolkit.fluxcd.io/v2
+      kind: HelmRelease
+      name: openbao-test
+  # The app chart wraps the workload in a nested HelmRelease named
+  # `<release>-system`, and the chart behind it stamps
+  # app.kubernetes.io/instance from its own release name. So the pods carry
+  # `openbao-test-system`, not `openbao-test`; the latter matches nothing.
+  - podLogs:
+      selector: app.kubernetes.io/instance=openbao-test-system
+      tail: 100
+  # podLogs cannot report that it matched nothing, so an empty capture above and
+  # a selector that has gone stale look identical. Print the instance label of
+  # every pod in the namespace instead. Deliberately no selector is repeated
+  # here: a copy would only prove itself right, and would keep matching after
+  # the collector's own selector drifted.
+  #
+  # What is and is not guarded, so the next reader does not assume more:
+  # the `-system` value above is also pinned on a resource in a `steps:` assert
+  # below, so the chart renaming that label turns a step red -- that is the
+  # drift this pin exists to catch. It does NOT catch a wrong value typed into the
+  # selector here: the assert pins the label on the resource, this pins it in
+  # the collector, and they are two literals. It also catches nothing when the
+  # run fails before reaching that assert. The census below covers neither, and
+  # is not meant to -- it answers what the labels actually are.
+  - script:
+      # The helper bounds each kubectl attempt with --request-timeout, which on
+      # a degraded cluster costs about five times the flag; one call is ~75s at
+      # worst, and this op timeout sits above that so an inner budget is what
+      # fires. A SIGKILL at the op boundary would take the census out mid-write
+      # and yield nothing, where a kubectl that gives up leaves an error to
+      # print. The helper carries the rest of the rationale and is unit-tested
+      # in hack/pod-label-census_test.bats.
+      timeout: 2m
+      content: |
+        set -eu
+        cd ../../..
+        . hack/e2e-chainsaw/_lib/pod-label-census.sh
+        pod_label_census "$NAMESPACE"
+  steps:
+  - name: create-openbao
+    try:
+    - apply:
+        file: openbao.yaml
+
+  - name: wait-helmreleases-ready
+    try:
+    # 11m: above the 600s install timeout cozystack-api gives this release;
+    # see "Sizing an HR-Ready budget" in docs/agents/e2e-testing.md.
+    - assert:
+        timeout: 11m
+        resource:
+          apiVersion: helm.toolkit.fluxcd.io/v2
+          kind: HelmRelease
+          metadata:
+            name: openbao-test
+          status:
+            (conditions[?type == 'Ready']):
+            - status: "True"
+    # 11m: above the 10m spec.timeout that
+    # packages/apps/openbao/templates/openbao.yaml gives this release;
+    # see "Sizing an HR-Ready budget" in docs/agents/e2e-testing.md.
+    - assert:
+        timeout: 11m
+        resource:
+          apiVersion: helm.toolkit.fluxcd.io/v2
+          kind: HelmRelease
+          metadata:
+            name: openbao-test-system
+          status:
+            (conditions[?type == 'Ready']):
+            - status: "True"
+
+  - name: wait-container-started
+    try:
+    # Pod Running does not guarantee the container is ready for exec on slow CI;
+    # gate on containerStatuses[0].started like the BATS test did.
+    - assert:
+        timeout: 2m
+        resource:
+          apiVersion: v1
+          kind: Pod
+          metadata:
+            name: openbao-test-0
+            # Pins the label the catch collector selects on. Asserts are subset
+            # matches, so this costs nothing and turns a silent drift of the
+            # instance label into a red step instead of an empty capture.
+            labels:
+              app.kubernetes.io/instance: openbao-test-system
+          (status.containerStatuses[0].started): true
+
+  - name: init-and-unseal
+    try:
+    - script:
+        timeout: 3m
+        content: |
+          set -eu
+          ns="$NAMESPACE"
+          pod=openbao-test-0
+          # Wait for the API to accept connections. `bao status` exit codes:
+          # 0 = unsealed, 2 = sealed but responsive, 1 = error/not ready.
+          deadline=$(( $(date +%s) + 60 ))
+          until rc=0; kubectl -n "$ns" exec "$pod" -- bao status >/dev/null 2>&1 || rc=$?; \
+                [ "${rc:-0}" -eq 0 ] || [ "${rc:-0}" -eq 2 ]; do
+            [ "$(date +%s)" -ge "$deadline" ] && { echo "OpenBAO API not responsive" >&2; exit 1; }
+            sleep 3
+          done
+          # Single key share for test simplicity.
+          init_output=$(kubectl -n "$ns" exec "$pod" -- \
+            bao operator init -key-shares=1 -key-threshold=1 -format=json)
+          unseal_key=$(echo "$init_output" | jq -r '.unseal_keys_b64[0]')
+          if [ -z "$unseal_key" ] || [ "$unseal_key" = "null" ]; then
+            echo "Failed to extract unseal key. Init output: $init_output" >&2
+            exit 1
+          fi
+          kubectl -n "$ns" exec "$pod" -- bao operator unseal "$unseal_key"
+        check:
+          ($error == null): true
+
+  - name: verify-statefulset-and-storage
+    try:
+    - assert:
+        timeout: 2m
+        resource:
+          apiVersion: apps/v1
+          kind: StatefulSet
+          metadata:
+            name: openbao-test
+          status:
+            readyReplicas: 1
+    - assert:
+        timeout: 1m
+        resource:
+          apiVersion: v1
+          kind: PersistentVolumeClaim
+          metadata:
+            name: data-openbao-test-0
+          status:
+            phase: Bound
+    # Tear down the workload before the PVC. The PVC is StatefulSet-owned (not
+    # applied by chainsaw, so chainsaw's auto-cleanup never reclaims it) and is
+    # held by the running openbao-test-0 pod via kubernetes.io/pvc-protection.
+    # Deleting it first blocks for the full delete timeout (the pod still mounts
+    # it) and fails the test. Delete the OpenBAO CR first — it cascades to the
+    # HelmRelease, StatefulSet and pod — then remove the now-unmounted PVC,
+    # mirroring the BATS teardown order (delete openbao; delete pvc).
+    finally:
+    - delete:
+        ref:
+          apiVersion: apps.cozystack.io/v1alpha1
+          kind: OpenBAO
+          name: test
+    - delete:
+        ref:
+          apiVersion: v1
+          kind: PersistentVolumeClaim
+          name: data-openbao-test-0
diff --git a/hack/e2e-chainsaw/openbao/openbao.yaml b/hack/e2e-chainsaw/openbao/openbao.yaml
new file mode 100644
index 0000000000..8764c59d3f
--- /dev/null
+++ b/hack/e2e-chainsaw/openbao/openbao.yaml
@@ -0,0 +1,12 @@
+apiVersion: apps.cozystack.io/v1alpha1
+kind: OpenBAO
+metadata:
+  name: test
+spec:
+  replicas: 1
+  size: 10Gi
+  storageClass: ""
+  resourcesPreset: "small"
+  resources: {}
+  external: false
+  ui: true
diff --git a/hack/e2e-chainsaw/opensearch/chainsaw-test.yaml b/hack/e2e-chainsaw/opensearch/chainsaw-test.yaml
new file mode 100644
index 0000000000..1df56f0fe5
--- /dev/null
+++ b/hack/e2e-chainsaw/opensearch/chainsaw-test.yaml
@@ -0,0 +1,595 @@
+# The move onto the cert-manager HTTP issuer, run on a cluster.
+#
+# packages/apps/opensearch/tests/tls_upgrade_test.yaml pins that one set of
+# values renders the CR, the cert-manager chain and the tenant sentinel
+# together. Three things it cannot observe decide whether the move survives
+# contact with a running cluster: whether the CR converges when `generate` is
+# dropped from it, whether the operator re-mints the admin certificate once the
+# CA subject changes, and whether the nodePool StatefulSet finishes rolling as
+# the mount plan moves from one whole-secret volume to three subPath mounts
+# (opensearch-k8s-operator v2.8.0, pkg/reconcilers/tls.go handleHttp: one
+# whole-folder volume while the operator generates, three mount() calls carrying
+# SubPath once caSecret is set).
+#
+# The starting state is `tls.issuer: operator` rather than the previous chart
+# version, so the suite runs the move and not the chart bump. Removing the key
+# leaves exactly the values an upgraded release arrives with, and the resolution
+# of an absent key is settled by the render tests. The step that a chart bump
+# would add and this cannot is the one where the OLD chart wrote the CR; a suite
+# in this tree has no second chart version to install from.
+apiVersion: chainsaw.kyverno.io/v1alpha1
+kind: Test
+metadata:
+  name: opensearch
+spec:
+  catch:
+  - events: {}
+  - describe:
+      apiVersion: helm.toolkit.fluxcd.io/v2
+      kind: HelmRelease
+      name: opensearch-test
+  - describe:
+      apiVersion: opensearch.opster.io/v1
+      kind: OpenSearchCluster
+      name: opensearch-test
+  # The roll's own fields — updateRevision, currentRevision, generation,
+  # updatedReplicas — are what separate a template that was never rewritten from
+  # one the operator has not restarted the pod onto (#4259). The nodePool
+  # StatefulSet is OnDelete (opensearch-k8s-operator v2.8.0, builders/cluster.go
+  # sets UpdateStrategy.Type OnDelete), so the roll is the operator's
+  # rolling-restart reconciler's to drive — it deletes the pod itself — not the
+  # StatefulSet controller's. describe omits those fields, so the StatefulSet is
+  # captured both ways: get -o yaml carries the revisions and the rendered volume
+  # list, describe carries the pod template and the controller's events.
+  - get:
+      apiVersion: apps/v1
+      kind: StatefulSet
+      format: yaml
+  - describe:
+      apiVersion: apps/v1
+      kind: StatefulSet
+      name: opensearch-test-nodes
+  # cert-manager records a refusal to issue in the Certificate's conditions.
+  # Without this an unissued chain shows up only as an absent Secret, and the
+  # CR then names a Secret that is never going to appear.
+  - describe:
+      apiVersion: cert-manager.io/v1
+      kind: Certificate
+  # The controller writes its verdict into the sentinel's status conditions
+  # (SourceNotFound, SourceRejected, ProjectionCollision).
+  - describe:
+      apiVersion: internal.cozystack.io/v1alpha1
+      kind: TenantProjection
+  - podLogs:
+      selector: opster.io/opensearch-cluster=opensearch-test
+      tail: 100
+  # The restart is the operator's rolling-restart reconciler's to start (see the
+  # StatefulSet catch note above). It logs "Starting rolling restart of the
+  # StatefulSet" at rollingRestart.go:155 (opensearch-k8s-operator v2.8.0) once
+  # the early gates pass — cluster Initialized (:123), every replica ready (:94),
+  # an update actually pending (:150-154). Just before that line, at :138, it
+  # builds its OpenSearch client, which pings the cluster
+  # (NewOsClusterClientFromConfig, os_client.go:104-112) and returns the error
+  # from the reconcile at :139-141 when the cluster is unreachable. So the line's
+  # absence reads two ways, not one: an early gate held silently, or that client
+  # ping failed — loudly, as a reconcile error — before the line was reached. The
+  # line present and followed by "Couldn't proceed with rolling restart ...
+  # because <reason>" (:182) means the roll reached the health/pod-delete stage,
+  # where CheckClusterStatusForRestart (:177) holds it until cluster health is
+  # green: a yellow cluster no longer holds under an exception — it enables shard
+  # allocation, waits for every data node to join, waits for shard activity to
+  # settle, then proceeds — so only red reaches the health hold, and <reason>
+  # names it "waiting for health to be green" for the mount-plan incident.
+  # That "Couldn't proceed ... because" line is the health hold's signal, one per
+  # ~10s requeue and what the tail below is sized for, and
+  # CheckClusterStatusForRestart is not the last gate: PreparePodForDelete (:195)
+  # follows it. The verdict is in the operator, not the cluster pods above, and it
+  # runs in its own namespace.
+  - podLogs:
+      namespace: cozy-opensearch-operator
+      selector: control-plane=controller-manager
+      # tail spans the whole assert window. The manager logs ~4-5 lines per ~10s
+      # requeue, not one, so 100 lines reach back only about a third of a 12m roll
+      # and can lose a one-shot cause. 2000 is effectively everything the container
+      # has logged, not a sized window — on run 105251129282 it returned all 457
+      # lines since start.
+      tail: 2000
+  # The external Service is a LoadBalancer, so an address pool with nothing left
+  # in it holds the HelmRelease short of Ready with nothing in the HelmRelease
+  # itself naming the cause.
+  - get:
+      apiVersion: v1
+      kind: Service
+      format: yaml
+  # The operator logs that cluster health held a restart back, never what the
+  # health was or which shards kept it there, and neither is a Kubernetes object.
+  - script:
+      # Three reads of at most 30s each. The op timeout sits above their sum so
+      # that an inner budget is what fires and the later reads still run.
+      timeout: 2m
+      content: |
+        for path in '_cluster/health?level=indices&pretty' '_cat/shards?v' '_cluster/allocation/explain?pretty'; do
+          echo "== $path"
+          timeout 30 kubectl -n "$NAMESPACE" exec opensearch-test-nodes-0 -c opensearch -- /bin/bash -c '
+            curl -k --silent --show-error --max-time 20 \
+              -u "$(cat /mnt/admin-credentials/username):$(cat /mnt/admin-credentials/password)" \
+              "https://localhost:9200/$1"' os_api "$path" || true
+          echo
+        done
+  steps:
+  - name: create-opensearch
+    try:
+    - apply:
+        file: opensearch.yaml
+
+  - name: wait-helmrelease-ready
+    try:
+    # 11m: above the 600s install timeout cozystack-api gives this release;
+    # see "Sizing an HR-Ready budget" in docs/agents/e2e-testing.md.
+    - assert:
+        timeout: 11m
+        resource:
+          apiVersion: helm.toolkit.fluxcd.io/v2
+          kind: HelmRelease
+          metadata:
+            name: opensearch-test
+          status:
+            (conditions[?type == 'Ready']):
+            - status: "True"
+
+  - name: verify-operator-managed-listener
+    try:
+    - assert:
+        timeout: 2m
+        resource:
+          apiVersion: opensearch.opster.io/v1
+          kind: OpenSearchCluster
+          metadata:
+            name: opensearch-test
+          spec:
+            security:
+              tls:
+                http:
+                  generate: true
+    # The starting state has to be the one being moved off, or the whole suite
+    # asserts a chain that was there from the start. A Certificate that does not
+    # exist will not start existing while chainsaw waits, so these are short.
+    - error:
+        timeout: 30s
+        resource:
+          apiVersion: cert-manager.io/v1
+          kind: Certificate
+          metadata:
+            name: opensearch-test-http-ca
+    - error:
+        timeout: 30s
+        resource:
+          apiVersion: v1
+          kind: Secret
+          metadata:
+            name: opensearch-test.tenant-ca
+    # Longer than the waits around it, so justified in-line (e2e-testing.md
+    # reviewer checklist, item 6): this is a first boot, so it
+    # covers the OpenSearch image pull, the operator's bootstrap pod and the
+    # securityadmin job before the nodePool pod reports ready.
+    #
+    # The mount plan is the half that has to move, so it is pinned on both sides.
+    # Here the operator generated its own certificates and mounts the whole
+    # Secret it wrote them into (mountFolder, one volume). Projections rather
+    # than a volume list: the list is the operator's to order.
+    - assert:
+        timeout: 12m
+        resource:
+          apiVersion: apps/v1
+          kind: StatefulSet
+          metadata:
+            name: opensearch-test-nodes
+          (spec.template.spec.volumes[?name == 'http-cert'].secret.secretName):
+          - opensearch-test-http-cert
+          (length(spec.template.spec.volumes[?name == 'http-ca'])): 0
+          status:
+            readyReplicas: 1
+
+  # On one data node an index that asks for a replica leaves the cluster yellow
+  # for good, because the copy has no second node to land on, and the operator
+  # restarts a pod only once its health gate opens. A release gets there without
+  # anyone asking for it: the security audit log and any index a tenant creates
+  # with the default replica count both do it. Whether one exists by the time the
+  # listener moves is a matter of timing, so the suite creates one itself and the
+  # roll below always has to get through a yellow cluster.
+  - name: make-the-cluster-permanently-yellow
+    try:
+    # The bootstrap pod stays cluster-manager after the data node is Ready, and
+    # answers 503 until its own security config loads; once it is gone, the
+    # Ready data node is the manager. The handoff takes seconds; 3m leaves room
+    # for several 10s retire retries, a 30s requeue and the 30s grace period.
+    - error:
+        timeout: 3m
+        resource:
+          apiVersion: v1
+          kind: Pod
+          metadata:
+            name: opensearch-test-bootstrap-0
+    # The same Initialized flag also releases any restart that became pending
+    # during first boot, and on one replica it takes the only node down. 6m:
+    # the health steps requeue every 10s, then the pod restarts on an image the
+    # node already has.
+    - assert:
+        timeout: 6m
+        resource:
+          apiVersion: apps/v1
+          kind: StatefulSet
+          metadata:
+            name: opensearch-test-nodes
+          (status.observedGeneration == metadata.generation): true
+          status:
+            readyReplicas: 1
+            updatedReplicas: 1
+            (currentRevision == updateRevision): true
+    - script:
+        # Above the two in-pod budgets below, so one of them is what fires.
+        timeout: 3m
+        content: |
+          set -eu
+
+          # The credentials and the form of the operator's own readiness probe,
+          # so a pod that reports Ready answers this as well.
+          os_api() {
+            kubectl -n "$NAMESPACE" exec opensearch-test-nodes-0 -c opensearch -- /bin/bash -c '
+              curl -k --silent --show-error --max-time 75 \
+                -u "$(cat /mnt/admin-credentials/username):$(cat /mnt/admin-credentials/password)" \
+                -H "Content-Type: application/json" "$@"' os_api "$@"
+          }
+
+          os_api --fail -X PUT "https://localhost:9200/unassignable-replica" \
+            --data '{"settings":{"index":{"number_of_shards":1,"number_of_replicas":1}}}'
+
+          # wait_for_status is satisfied by green as well, so the answer is read
+          # rather than trusted: a fixture that stopped holding the cluster
+          # yellow would leave the roll below proving nothing about the gate.
+          # No --fail here: a wait that times out answers 408 with the health in
+          # its body, and that body is what the message below has to print.
+          health=$(os_api "https://localhost:9200/_cluster/health/unassignable-replica?wait_for_status=yellow&timeout=60s")
+          case "$health" in
+            *'"status":"yellow"'*) ;;
+            *)
+              echo "an index with an unassignable replica did not leave the cluster yellow" >&2
+              echo "$health" >&2
+              exit 1
+              ;;
+          esac
+
+  - name: move-onto-cert-manager-issuer
+    try:
+    # A JSON-patch remove rather than an apply of a second fixture: what an
+    # upgrade delivers is the absence of the key, and an apply that merely
+    # omitted it would leave the old value in place.
+    - script:
+        timeout: 1m
+        content: |
+          set -eu
+          kubectl -n "$NAMESPACE" patch opensearches.apps.cozystack.io test \
+            --type=json --patch '[{"op": "remove", "path": "/spec/tls/issuer"}]'
+
+  - name: verify-certmanager-chain-issued
+    try:
+    - assert:
+        timeout: 3m
+        resource:
+          apiVersion: cert-manager.io/v1
+          kind: Certificate
+          metadata:
+            name: opensearch-test-http-ca
+          status:
+            (conditions[?type == 'Ready']):
+            - status: "True"
+    - assert:
+        timeout: 3m
+        resource:
+          apiVersion: cert-manager.io/v1
+          kind: Certificate
+          metadata:
+            name: opensearch-test-http-server
+          status:
+            (conditions[?type == 'Ready']):
+            - status: "True"
+
+  # The first of the three things a render cannot reach: `generate` was written
+  # into a live CR by the previous reconcile and has to be gone from it, not
+  # merely absent from the new manifest.
+  - name: verify-cr-dropped-generate
+    try:
+    - assert:
+        timeout: 3m
+        resource:
+          apiVersion: opensearch.opster.io/v1
+          kind: OpenSearchCluster
+          metadata:
+            name: opensearch-test
+          (spec.security.tls.http.generate == null): true
+          spec:
+            security:
+              tls:
+                http:
+                  secret:
+                    name: opensearch-test-http-server
+                  caSecret:
+                    name: opensearch-test.http-ca
+
+  # The second: the operator decides whether to re-mint the admin certificate by
+  # comparing the DN bytes of its issuer against the CA subject
+  # (shouldCreateAdminCert -> IsSignedByCA). Once the CR names the chart's CA
+  # that comparison has to fail and the certificate has to be reissued under it,
+  # or securityadmin presents one signed by a CA the listener no longer trusts
+  # and the security configuration stops applying with a job timeout as the only
+  # sign. Nothing models this as a Kubernetes condition, so it is read out of the
+  # certificate itself.
+  - name: verify-admin-certificate-moved-to-the-chart-ca
+    try:
+    - script:
+        timeout: 5m
+        content: |
+          set -eu
+
+          # Both sides are printed with the same -nameopt, so they are
+          # comparable whatever the local openssl's default format is.
+          ca_subject=$(kubectl -n "$NAMESPACE" get secret opensearch-test.http-ca \
+            -o jsonpath='{.data.tls\.crt}' | base64 -d \
+            | openssl x509 -noout -subject -nameopt RFC2253)
+          ca_subject=${ca_subject#subject=}
+
+          # Polls rather than reads once: the re-mint and the StatefulSet update
+          # come out of the same reconcile and nothing orders them against each
+          # other, so a single read can land between the two.
+          deadline=$(( $(date +%s) + 240 ))
+          while :; do
+            issuer=$(kubectl -n "$NAMESPACE" get secret opensearch-test-admin-cert \
+              -o jsonpath='{.data.tls\.crt}' | base64 -d \
+              | openssl x509 -noout -issuer -nameopt RFC2253) || issuer=""
+            issuer=${issuer#issuer=}
+            if [ "$issuer" = "$ca_subject" ]; then
+              break
+            fi
+            if [ "$(date +%s)" -ge "$deadline" ]; then
+              echo "the admin certificate is still signed by the operator's own CA" >&2
+              echo "issuer:     $issuer" >&2
+              echo "chart CA:   $ca_subject" >&2
+              exit 1
+            fi
+            # TODO(e2e-replace-fixed-timeouts): the operator re-mints the admin
+            # certificate on its next reconcile and records no condition for it.
+            sleep 5
+          done
+
+  # The third: the mount plan moves from one whole-secret volume to three
+  # subPath mounts, and the StatefulSet has to finish rolling onto it. Equal
+  # revisions plus a ready updated replica is the roll completing; the volume
+  # projections are what it rolled onto. Same 12m as the first boot, for the
+  # same reason — the replacement pod pulls and starts OpenSearch from scratch.
+  - name: verify-statefulset-rolled-onto-the-new-mount-plan
+    try:
+    # Two asserts, not one, so a timeout names which half did not happen: the
+    # template rewrite and the roll onto it are separate outcomes with separate
+    # owners (#4259).
+    #
+    # First half: the operator rewrote the template onto the subPath mount plan.
+    # That is the operator's to do the moment the CR names the cert-manager
+    # Secrets, which verify-cr-dropped-generate and the certificate steps already
+    # waited for, so it lands within a reconcile or two rather than a pod
+    # lifetime. A shorter budget than the roll below, and a failure here is the
+    # operator not writing the volumes — not a pod that will not start.
+    - assert:
+        timeout: 6m
+        resource:
+          apiVersion: apps/v1
+          kind: StatefulSet
+          metadata:
+            name: opensearch-test-nodes
+          (spec.template.spec.volumes[?name == 'http-cert'].secret.secretName):
+          - opensearch-test-http-server
+          (spec.template.spec.volumes[?name == 'http-key'].secret.secretName):
+          - opensearch-test-http-server
+          (spec.template.spec.volumes[?name == 'http-ca'].secret.secretName):
+          - opensearch-test.http-ca
+    # Second half: the operator restarted the pod onto that template and the
+    # StatefulSet finished rolling. currentRevision only advances here once the
+    # operator's rolling-restart reconciler patches it (see the StatefulSet catch
+    # note above), so equal revisions plus a ready updated replica is that
+    # reconciler having run to the end. This half also asserts readyReplicas, so a
+    # failure with the assert above green is the roll not completing — either the
+    # operator never restarted the pod (the reconciler holds on the health gate,
+    # per the podLogs note) or a replacement was deleted but never came Ready — not
+    # a template that was never written.
+    #
+    # The three volume projections are carried in here too, so the roll is pinned
+    # to the template the first half checked and not to whatever revision happens
+    # to be current when the status converges. The CR moves only
+    # once in this suite, but the split otherwise lets a rewrite landing after the
+    # first assert satisfy this half on its own. observedGeneration == generation
+    # is compared at the resource root because a status-scoped expression cannot
+    # reach metadata from its own node.
+    - assert:
+        timeout: 12m
+        resource:
+          apiVersion: apps/v1
+          kind: StatefulSet
+          metadata:
+            name: opensearch-test-nodes
+          (status.observedGeneration == metadata.generation): true
+          (spec.template.spec.volumes[?name == 'http-cert'].secret.secretName):
+          - opensearch-test-http-server
+          (spec.template.spec.volumes[?name == 'http-key'].secret.secretName):
+          - opensearch-test-http-server
+          (spec.template.spec.volumes[?name == 'http-ca'].secret.secretName):
+          - opensearch-test.http-ca
+          status:
+            readyReplicas: 1
+            updatedReplicas: 1
+            (currentRevision == updateRevision): true
+
+  # The sentinel and the projection are Helm-owned and controller-written
+  # respectively, so this is the half of the move that has to appear rather than
+  # converge. tenantresource is the lineage webhook's verdict, computed from the
+  # ApplicationDefinition selector, and nothing short of a cluster proves it.
+  - name: verify-tenant-anchor-published
+    try:
+    - assert:
+        timeout: 3m
+        resource:
+          apiVersion: v1
+          kind: Secret
+          metadata:
+            name: opensearch-test.tenant-ca
+            labels:
+              internal.cozystack.io/tenant-ca: "true"
+              internal.cozystack.io/tenantresource: "true"
+          type: Opaque
+    # Deterministic once the assert above passes, so no retry.
+    - script:
+        timeout: 2m
+        content: |
+          set -eu
+
+          # Exactly one key, and it is ca.crt. The source Secret holds the CA
+          # private key under tls.key, so a second key here is that key leaving
+          # the namespace.
+          keys=$(kubectl -n "$NAMESPACE" get secret opensearch-test.tenant-ca \
+            -o go-template='{{range $k, $v := .data}}{{$k}}{{"\n"}}{{end}}' | sort | tr '\n' ' ')
+          if [ "$keys" != "ca.crt " ]; then
+            echo "projection must hold exactly ca.crt, holds: $keys" >&2
+            exit 1
+          fi
+
+          # Asserting the source really does carry tls.key keeps the check above
+          # honest: if cert-manager ever stopped storing it there, the check
+          # would keep passing while proving nothing.
+          if ! kubectl -n "$NAMESPACE" get secret opensearch-test.http-ca \
+            -o go-template='{{if .data}}{{range $k, $v := .data}}{{$k}}{{"\n"}}{{end}}{{end}}' | grep -qx 'tls.key'; then
+            echo "opensearch-test.http-ca no longer carries tls.key — this check has stopped proving anything" >&2
+            exit 1
+          fi
+
+          # The delivery path the README tells a tenant to use. Everything above
+          # reads the raw Secret, which only an admin can do.
+          anchor=$(kubectl -n "$NAMESPACE" get tenantsecret opensearch-test.tenant-ca \
+            -o jsonpath='{.data.ca\.crt}' | base64 -d)
+          if ! echo "$anchor" | grep -q 'BEGIN CERTIFICATE'; then
+            echo "the trust anchor is not served through core.cozystack.io/tenantsecrets" >&2
+            exit 1
+          fi
+
+          # And the negative that gives it meaning: the key-bearing Secrets must
+          # not be reachable the same way.
+          for s in opensearch-test.http-ca opensearch-test-http-server; do
+            if kubectl -n "$NAMESPACE" get tenantsecret "$s" >/dev/null 2>&1; then
+              echo "key-bearing $s is being served as a tenant secret" >&2
+              exit 1
+            fi
+          done
+
+  # The outcome the whole move is for, and the only check that reads what the
+  # pods are actually serving rather than what they were asked to serve. A roll
+  # that completed onto a stale mount passes every assert above and fails here.
+  - name: verify-endpoint-serves-the-chart-chain
+    try:
+    - script:
+        timeout: 4m
+        content: |
+          set -eu
+          workdir=$(mktemp -d)
+          trap '[ -n "${pf_pid:-}" ] && kill "$pf_pid" 2>/dev/null || true; rm -rf "$workdir"' EXIT
+
+          kubectl -n "$NAMESPACE" get secret opensearch-test.tenant-ca \
+            -o jsonpath='{.data.ca\.crt}' | base64 -d > "$workdir/ca.crt"
+          kubectl -n "$NAMESPACE" get secret opensearch-test-http-server \
+            -o jsonpath='{.data.tls\.crt}' | base64 -d > "$workdir/chart-leaf.crt"
+
+          # Through the chart's own external Service rather than the operator's,
+          # because that is the path a tenant takes. Its selector is untouched
+          # here: the selector this branch repairs belongs to the Dashboards
+          # Service, which the fixture leaves off, so no cluster step covers it.
+          kubectl -n "$NAMESPACE" port-forward service/opensearch-test-external 9200:9200 >/dev/null 2>&1 &
+          pf_pid=$!
+          # TODO(e2e-replace-fixed-timeouts): nothing models a port-forward
+          # becoming ready; the socket opening is the only signal.
+          timeout 30 sh -ec 'until nc -z localhost 9200; do sleep 1; done'
+
+          # -verify_return_error turns a chain that does not build into a
+          # non-zero exit. The anchor is the one the tenant is handed, so this
+          # is the tenant's own verification, not an admin's.
+          if ! openssl s_client -connect 127.0.0.1:9200 -servername opensearch-test \
+            -CAfile "$workdir/ca.crt" -verify_return_error </dev/null \
+            >"$workdir/handshake.log" 2>&1; then
+            echo "the HTTP listener does not verify against the anchor published to the tenant" >&2
+            cat "$workdir/handshake.log" >&2
+            exit 1
+          fi
+
+          # Verifying against the CA says the chain is the chart's. This says
+          # the pods picked up the leaf cert-manager minted, which is the half
+          # the subPath mount plan puts at risk.
+          sed -n '/BEGIN CERTIFICATE/,/END CERTIFICATE/p' "$workdir/handshake.log" > "$workdir/served.crt"
+          served_fp=$(openssl x509 -noout -fingerprint -sha256 -in "$workdir/served.crt")
+          chart_fp=$(openssl x509 -noout -fingerprint -sha256 -in "$workdir/chart-leaf.crt")
+          if [ "$served_fp" != "$chart_fp" ]; then
+            echo "the listener is not serving the certificate the chart minted" >&2
+            echo "served: $served_fp" >&2
+            echo "chart:  $chart_fp" >&2
+            exit 1
+          fi
+
+  # e2e-testing.md §6: the move is an upgrade of the parent HelmRelease, and the
+  # failure it is most likely to produce is Flux uninstalling the release and
+  # reinstalling it — which leaves the cluster Ready and every assert above
+  # green, having taken the tenant's search cluster down on the way.
+  - name: verify-helmrelease-did-not-remediate
+    try:
+    - script:
+        timeout: 2m
+        content: |
+          set -eu
+          cd ../../..
+          . hack/e2e-chainsaw/_lib/remediation-guard.sh
+          statuses=$(kubectl -n "$NAMESPACE" get helmrelease opensearch-test \
+            -o "jsonpath=${HELMRELEASE_HISTORY_JSONPATH}")
+          # Always emit the raw value so a silent future-Flux field rename shows
+          # up as "empty history on a Ready HR" in CI logs rather than vanishing.
+          # The helper reads empty input as "no cycle observed", so without this
+          # the guard passes on a rename, an empty answer or a broken jsonpath.
+          echo "HelmRelease history statuses:"
+          printf '%s\n' "${statuses:-<empty>}"
+          if [ -z "$statuses" ]; then
+            echo "Unexpected empty .status.history on a Ready HelmRelease - Flux API shape may have changed." >&2
+            kubectl -n "$NAMESPACE" describe helmrelease opensearch-test >&2
+            exit 1
+          fi
+          if helmrelease_has_remediation_cycle "$statuses"; then
+            echo "the HelmRelease remediated across the move; history:" >&2
+            echo "$statuses" >&2
+            exit 1
+          fi
+
+  # The nodePool claim is templated by the StatefulSet, so deleting the app is
+  # not enough to reclaim it: Kubernetes never garbage-collects a
+  # StatefulSet-templated PVC (#3059), this chart ships no cleanup hook the way
+  # qdrant, mariadb and clickhouse do, and the operator's own DeleteResources is
+  # empty at v2.8.0. e2e-testing.md §4 puts that on the test, so it is pruned here
+  # rather than left holding its storage for whatever suite runs next.
+  # Chainsaw's cleanup still deletes the app it applied; a second delete of an
+  # object that is already gone is a no-op.
+  - name: delete-and-prune-the-templated-claim
+    try:
+    - delete:
+        ref:
+          apiVersion: apps.cozystack.io/v1alpha1
+          kind: OpenSearch
+          name: test
+    - script:
+        timeout: 5m
+        content: |
+          set -eu
+          # --ignore-not-found covers a run where the claim was never bound; a
+          # delete that hangs still fails the step on the timeout below, which
+          # is the stuck teardown convention 4 exists to surface.
+          kubectl -n "$NAMESPACE" delete pvc data-opensearch-test-nodes-0 \
+            --ignore-not-found --wait=true --timeout=4m
diff --git a/hack/e2e-chainsaw/opensearch/opensearch.yaml b/hack/e2e-chainsaw/opensearch/opensearch.yaml
new file mode 100644
index 0000000000..2f157d38bc
--- /dev/null
+++ b/hack/e2e-chainsaw/opensearch/opensearch.yaml
@@ -0,0 +1,34 @@
+# Starts on the operator's HTTP listener, which is what every external release
+# created before this field existed is running: the release carried no tls key
+# and the operator generated the certificates.
+# `tls.issuer: operator` reproduces that state on the current chart, and the suite
+# removes the key so the tri-state resolves it from `external` — the values an
+# upgraded release arrives with, and the transition the suite exists to run.
+apiVersion: apps.cozystack.io/v1alpha1
+kind: OpenSearch
+metadata:
+  name: test
+spec:
+  replicas: 1
+  size: 2Gi
+  # Not the empty default: for a single replica the chart maps it to
+  # replicated, a class the PR lane never creates because it runs LINSTOR
+  # without DRBD. Each lane names the class it does create through
+  # --set-string storageClass, from COZY_E2E_STORAGE_CLASS.
+  storageClass: ($values.storageClass)
+  # OpenSearch refuses to start below 2Gi of heap-backing memory; c1.medium is
+  # the chart default and the smallest preset that clears it.
+  resourcesPreset: c1.medium
+  # The move only happens for an externally published release: with external
+  # false an unset tls.issuer resolves to operator and nothing changes.
+  external: true
+  version: v2
+  # Off. The Dashboards half is a second Deployment, a second certificate and a
+  # field prune of its own, and it mounts its leaf as a whole volume rather than
+  # through subPath, so this is a coverage choice rather than a redundancy: the
+  # render tests pin its shape, and what needs a cluster is the API half, where
+  # the mount plan changes and the admin certificate has to follow the CA.
+  dashboards:
+    enabled: false
+  tls:
+    issuer: operator
diff --git a/hack/e2e-chainsaw/postgres/chainsaw-test.yaml b/hack/e2e-chainsaw/postgres/chainsaw-test.yaml
new file mode 100644
index 0000000000..170c0ce36e
--- /dev/null
+++ b/hack/e2e-chainsaw/postgres/chainsaw-test.yaml
@@ -0,0 +1,349 @@
+# Chainsaw port of hack/e2e-apps/postgres.bats ("Create DB PostgreSQL").
+#
+# Every `timeout N sh -ec "until kubectl get ..."` + `kubectl wait` pair from
+# the BATS test collapses into a single assert: chainsaw polls until the
+# resource exists AND matches, or the timeout expires. Failure output is a
+# structured diff of the assertion tree against the live object.
+apiVersion: chainsaw.kyverno.io/v1alpha1
+kind: Test
+metadata:
+  name: postgres
+spec:
+  # Diagnostics collected automatically when any step fails. The BATS suite
+  # only does this in harbor.bats, by hand.
+  catch:
+  - events: {}
+  - describe:
+      apiVersion: helm.toolkit.fluxcd.io/v2
+      kind: HelmRelease
+      name: postgres-test
+  - podLogs:
+      selector: cnpg.io/cluster=postgres-test
+      tail: 50
+  steps:
+  - name: create-postgres
+    try:
+    - apply:
+        file: postgres.yaml
+
+  - name: wait-helmrelease-ready
+    try:
+    # 11m: above the 600s install timeout cozystack-api gives this release;
+    # see "Sizing an HR-Ready budget" in docs/agents/e2e-testing.md.
+    - assert:
+        timeout: 11m
+        resource:
+          apiVersion: helm.toolkit.fluxcd.io/v2
+          kind: HelmRelease
+          metadata:
+            name: postgres-test
+          status:
+            # JMESPath filter: condition order in the array does not matter
+            (conditions[?type == 'Ready']):
+            - status: "True"
+
+  - name: wait-init-job-complete
+    try:
+    - assert:
+        timeout: 2m
+        resource:
+          apiVersion: batch/v1
+          kind: Job
+          metadata:
+            name: postgres-test-init-job
+          status:
+            (conditions[?type == 'Complete']):
+            - status: "True"
+
+  - name: verify-services-and-endpoints
+    try:
+    # Replaces three `until kubectl get svc ... | grep -q 5432` loops
+    # TODO(chainsaw>0.2.15): the (ports[0].port) / (ports[*].port) projection form in
+    # these Service asserts is a v0.2.15 workaround for mis-evaluated number-literal
+    # filters (ports[?port==`5432`]); (ports[0]) also checks only the first port.
+    # Restore the filter form on a chainsaw bump. Same workaround lives in
+    # kafka/mariadb/harbor — see "Chainsaw v0.2.15 gotchas" in docs/agents/e2e-testing.md.
+    - assert:
+        resource:
+          apiVersion: v1
+          kind: Service
+          metadata:
+            name: postgres-test-r
+          spec:
+            (ports[0].port): 5432
+    - assert:
+        resource:
+          apiVersion: v1
+          kind: Service
+          metadata:
+            name: postgres-test-ro
+          spec:
+            (ports[0].port): 5432
+    - assert:
+        resource:
+          apiVersion: v1
+          kind: Service
+          metadata:
+            name: postgres-test-rw
+          spec:
+            (ports[0].port): 5432
+    # Replaces `until kubectl get endpoints ... | grep -q '[0-9]'` loops.
+    # The read-only endpoint is skipped, same as in the BATS test.
+    - assert:
+        timeout: 3m
+        resource:
+          apiVersion: v1
+          kind: Endpoints
+          metadata:
+            name: postgres-test-r
+          (subsets[0].addresses[0].ip != null): true
+    - assert:
+        timeout: 3m
+        resource:
+          apiVersion: v1
+          kind: Endpoints
+          metadata:
+            name: postgres-test-rw
+          (subsets[0].addresses[0].ip != null): true
+    # Functional probe — the BATS test never actually talks to the database.
+    - script:
+        timeout: 2m
+        content: |
+          set -eu
+          pod=$(kubectl -n "$NAMESPACE" get pod \
+            -l cnpg.io/cluster=postgres-test,cnpg.io/instanceRole=primary \
+            -o name | head -n1)
+          kubectl -n "$NAMESPACE" exec "$pod" -c postgres -- \
+            psql -U postgres -tAc 'SELECT 1'
+        check:
+          ($error == null): true
+          (contains($stdout, '1')): true
+    # The init-job is operator-created (not applied by chainsaw), so it is
+    # not part of automatic cleanup — delete it explicitly, as BATS does.
+    finally:
+    - delete:
+        ref:
+          apiVersion: batch/v1
+          kind: Job
+          name: postgres-test-init-job
+
+  # The trust anchor a client verifies against, checked against the live
+  # operator rather than against our own beliefs about it.
+  #
+  # This is the only independent witness the CA-extraction feature has. Its unit
+  # tests build CNPG's CA Secret from a fixture that encodes the same assumption
+  # the shipped ApplicationDefinition encodes ("{{ .release }}-ca", key ca.crt),
+  # so the two agree by construction and cannot catch each other being wrong.
+  # Only a real CNPG can say whether that name and key are right, and only a real
+  # apiserver can say whether the lineage webhook actually promotes the
+  # projection to a tenant-readable object.
+  - name: verify-tenant-ca-projection
+    try:
+    # Postgres never opts out of TLS: CNPG mints its CA regardless of the
+    # chart's tls flag, so the projection is expected on this plain fixture.
+    #
+    # The labels are the assertion that matters. tenant-ca is stamped by the
+    # controller; tenantresource is stamped by the LINEAGE WEBHOOK, computed
+    # from the ApplicationDefinition's spec.secrets — the new matchLabels
+    # include. It is "true" only if the whole chain held: definition selects the
+    # label, webhook admitted the object, verdict came out positive. Nothing
+    # short of a live cluster proves that link.
+    - assert:
+        timeout: 2m
+        resource:
+          apiVersion: v1
+          kind: Secret
+          metadata:
+            name: postgres-test.tenant-ca
+            labels:
+              internal.cozystack.io/tenant-ca: "true"
+              internal.cozystack.io/tenantresource: "true"
+          type: Opaque
+    # The projection must be the CA and ONLY the CA. Everything below is
+    # deterministic once the assert above has passed, so it runs without retry.
+    - script:
+        content: |
+          set -eu
+
+          # Exactly one key, and it is ca.crt. Any second key is a leak in the
+          # making: the source this was lifted from carries a private key.
+          keys=$(kubectl -n "$NAMESPACE" get secret postgres-test.tenant-ca \
+            -o go-template='{{range $k, $v := .data}}{{$k}}{{"\n"}}{{end}}' | sort | tr '\n' ' ')
+          if [ "$keys" != "ca.crt " ]; then
+            echo "projection must hold exactly ca.crt, holds: $keys" >&2
+            exit 1
+          fi
+
+          # It lifted the right certificate: the projection's ca.crt is CNPG's
+          # ca.crt. This is what pins "{{ .release }}-ca" to reality — if CNPG ever
+          # renames its CA Secret, the controller finds nothing and this fails.
+          #
+          # Compare the parsed certificates, not the raw PEM. The controller
+          # re-encodes ca.crt from the DER it parsed (certificateChainPEM), so a PEM
+          # header line or a column-width change at the source would redden a
+          # byte-for-byte comparison of a correct projection. The certificate
+          # fingerprint is identity-stable across any re-encoding.
+          src=$(kubectl -n "$NAMESPACE" get secret postgres-test-ca -o jsonpath='{.data.ca\.crt}' | base64 -d)
+          proj=$(kubectl -n "$NAMESPACE" get secret postgres-test.tenant-ca -o jsonpath='{.data.ca\.crt}' | base64 -d)
+          if [ -z "$src" ]; then
+            echo "CNPG's postgres-test-ca has no ca.crt — the declared source name or key is wrong" >&2
+            exit 1
+          fi
+          src_fp=$(echo "$src" | openssl x509 -noout -fingerprint -sha256)
+          proj_fp=$(echo "$proj" | openssl x509 -noout -fingerprint -sha256)
+          if [ "$src_fp" != "$proj_fp" ]; then
+            echo "projection does not carry CNPG's CA certificate" >&2
+            exit 1
+          fi
+
+          # And the point of the whole exercise: the source carries the CA
+          # PRIVATE KEY, the projection must not. Asserting the source really
+          # does hold ca.key keeps this honest — if CNPG ever stopped storing it
+          # there, this check would otherwise pass while proving nothing.
+          if ! kubectl -n "$NAMESPACE" get secret postgres-test-ca \
+            -o go-template='{{if .data}}{{range $k, $v := .data}}{{$k}}{{"\n"}}{{end}}{{end}}' | grep -qx 'ca.key'; then
+            echo "CNPG's CA Secret no longer carries ca.key — this check has stopped proving anything" >&2
+            exit 1
+          fi
+          if kubectl -n "$NAMESPACE" get secret postgres-test.tenant-ca \
+            -o go-template='{{if .data}}{{range $k, $v := .data}}{{$k}}{{"\n"}}{{end}}{{end}}' | grep -qx 'ca.key'; then
+            echo "projection leaked the CA private key" >&2
+            exit 1
+          fi
+
+          # Belt and braces on the bytes themselves: no PEM key header of any
+          # flavour survived into the tenant-readable object.
+          if kubectl -n "$NAMESPACE" get secret postgres-test.tenant-ca \
+            -o jsonpath='{.data.ca\.crt}' | base64 -d | grep -qi 'BEGIN .*PRIVATE KEY'; then
+            echo "projection carries PEM private key material" >&2
+            exit 1
+          fi
+
+          # The delivery path the README actually tells a tenant to use, run as
+          # the command the README prints. Everything above reads the raw Secret,
+          # which only an admin can do — it proves the projection's SHAPE and
+          # nothing about whether a tenant can reach it.
+          #
+          # core.cozystack.io/tenantsecrets serves only objects labelled
+          # tenantresource=true, and that label is the lineage webhook's verdict,
+          # computed from this app's ApplicationDefinition selectors. So this
+          # query 404s unless the whole chain held: the definition selects
+          # tenant-ca, the webhook admitted the projection, and the verdict came
+          # out positive. It is the one assertion that exercises the registry
+          # rather than inspecting its input.
+          anchor=$(kubectl -n "$NAMESPACE" get tenantsecret postgres-test.tenant-ca \
+            -o jsonpath='{.data.ca\.crt}' | base64 -d)
+          if ! echo "$anchor" | grep -q 'BEGIN CERTIFICATE'; then
+            echo "the trust anchor is not served through core.cozystack.io/tenantsecrets" >&2
+            exit 1
+          fi
+
+          # And the negative that gives the positive its meaning: the registry
+          # must NOT serve CNPG's key-bearing CA. It carries no tenant-ca label,
+          # so the definition does not select it and the webhook marks it
+          # tenantresource=false. If this ever starts resolving, the label path
+          # has stopped gating on the platform's verdict.
+          if kubectl -n "$NAMESPACE" get tenantsecret postgres-test-ca >/dev/null 2>&1; then
+            echo "CNPG's key-bearing CA is being served as a tenant secret" >&2
+            exit 1
+          fi
+        check:
+          ($error == null): true
+# The Postgres CR itself was applied by chainsaw and is deleted (and waited
+# on) automatically during cleanup — no explicit teardown step needed.
+---
+# Full barman-cloud backup -> restore round-trips, driving the validated
+# example scripts (examples/backups/postgres) as the harness so the test and
+# the documented flow can never drift. run-all.sh runs Bucket -> source
+# Postgres + sentinel row -> CNPG strategy + BackupClass -> ad-hoc BackupJob
+# (waits Succeeded) -> empty target Postgres + to-copy RestoreJob (waits
+# Succeeded, asserts the sentinel round-tripped through S3) -> a point-in-time
+# restore between two marker writes (step 45, asserts the pre-marker survived
+# and the post-marker did not) -> a negative unreachable-target restore
+# (step 46, asserts it terminates Failed with a message attributing it to the PITR
+# target rather than hanging or falsely succeeding; the reason-classification
+# itself is unit-tested, being best-effort against a still-archiving source). The
+# in-cluster witness that a barman-cloud
+# plugin backup is taken, restorable, point-in-time-recoverable, and that a
+# bad target is rejected quickly.
+#
+# Runs in tenant-root, not the default tenant-test: the S3 client here is the
+# barman-cloud sidecar INSIDE the Postgres Pod, and the e2e tenant is created
+# isolated (hack/e2e-install-cozystack.bats) — its Cilium egress allowlist
+# blocks a tenant-test Pod from reaching tenant-root's seaweedfs, while a
+# tenant-root Pod reaches it over same-tenant egress. The harness targets the
+# in-cluster endpoint (S3_ENDPOINT below) instead of the BucketInfo external
+# ingress URL, which in CI is an unroutable placeholder, and trusts its
+# self-signed cert by copying the seaweedfs CA secret (seaweedfs-ca-cert,
+# auto-discovered from the cert-manager Certificate) into the per-app
+# endpointCA Secret. (The bucket suite's mc checks lean on the same
+# tenant-root seaweedfs, just from the test runner via port-forward.)
+apiVersion: chainsaw.kyverno.io/v1alpha1
+kind: Test
+metadata:
+  name: postgres-2-backup-roundtrip
+spec:
+  namespace: tenant-root
+  skipDelete: true
+  catch:
+  - events: {}
+  - describe:
+      apiVersion: helm.toolkit.fluxcd.io/v2
+      kind: HelmRelease
+      name: postgres-pg-src
+  - describe:
+      apiVersion: postgresql.cnpg.io/v1
+      kind: Cluster
+      name: postgres-pg-src
+  - describe:
+      apiVersion: barmancloud.cnpg.io/v1
+      kind: ObjectStore
+  - describe:
+      apiVersion: backups.cozystack.io/v1alpha1
+      kind: BackupJob
+  - describe:
+      apiVersion: backups.cozystack.io/v1alpha1
+      kind: RestoreJob
+  # The barman-cloud backup/WAL work runs in the cnpg Cluster Pods' sidecar; a
+  # failed upload or TLS handshake leaves its error only in that Pod's log.
+  - podLogs:
+      selector: cnpg.io/cluster=postgres-pg-src
+      tail: 200
+  steps:
+  - name: run
+    try:
+    # The 66m budget is the whole documented flow: bucket provisioning, a
+    # 2-replica source Postgres, the plugin base backup to S3, an empty target
+    # app, and THREE sequential purge + re-bootstrap restores against it - the
+    # latest-point to-copy restore, the point-in-time restore (step 45), and
+    # the negative unreachable-target restore (step 46, which sets a short
+    # restoreTimeoutSeconds and must terminate Failed at that deadline, attributed
+    # to the PITR target), and the in-place restore (step 50, the
+    # regression guard for the archive-vs-recovery serverName collision)
+    # (convention 6: justified in-line). The old 25m budget predated the PITR
+    # phases; four restores plus the negative phase need the larger window,
+    # and the 660s bucket and Postgres HR waits in run-all.sh add 16m to it.
+    # run-all.sh fails fast on terminal BackupJob/RestoreJob phases and stalled
+    # HelmReleases rather than polling out the budget.
+    - script:
+        timeout: 66m
+        content: |
+          set -eu
+          cd ../../..
+          [ -x examples/backups/postgres/run-all.sh ] || { echo "postgres backup example scripts not found at examples/backups/postgres" >&2; exit 1; }
+          COZY_E2E_BACKUP_PREFLIGHT=1 NAMESPACE="$NAMESPACE" S3_ENDPOINT="https://seaweedfs-s3.tenant-root:8333" \
+            examples/backups/postgres/run-all.sh
+        check:
+          ($error == null): true
+    finally:
+    # Resumes the driver-suspended HelmReleases before deleting the RestoreJob
+    # so the apps are not stranded, then removes every resource the harness
+    # created (chainsaw did not apply them, so they are not part of automatic
+    # cleanup).
+    - description: backup-flow cleanup
+      script:
+        timeout: 8m
+        content: |
+          set -eu
+          cd ../../..
+          NAMESPACE="$NAMESPACE" examples/backups/postgres/cleanup.sh
diff --git a/hack/e2e-chainsaw/postgres/postgres.yaml b/hack/e2e-chainsaw/postgres/postgres.yaml
new file mode 100644
index 0000000000..3015f1350b
--- /dev/null
+++ b/hack/e2e-chainsaw/postgres/postgres.yaml
@@ -0,0 +1,32 @@
+apiVersion: apps.cozystack.io/v1alpha1
+kind: Postgres
+metadata:
+  name: test
+spec:
+  external: false
+  size: 10Gi
+  replicas: 2
+  storageClass: ""
+  postgresql:
+    parameters:
+      max_connections: "100"
+  quorum:
+    minSyncReplicas: 0
+    maxSyncReplicas: 0
+  users:
+    testuser: {}
+  databases:
+    testdb:
+      roles:
+        admin:
+        - testuser
+  backup:
+    enabled: false
+    destinationPath: s3://postgres-backups/pg/
+    endpointURL: https://s3.example.org
+    retentionPolicy: "30d"
+    schedule: "0 0 2 * * *"
+    s3AccessKey: oobaiRus9pah8PhohL1ThaeTa4UVa7gu
+    s3SecretKey: ju3eum4dekeich9ahM1te8waeGai0oog
+  resources: {}
+  resourcesPreset: "nano"
diff --git a/hack/e2e-chainsaw/qdrant/chainsaw-test.yaml b/hack/e2e-chainsaw/qdrant/chainsaw-test.yaml
new file mode 100644
index 0000000000..265b34cf05
--- /dev/null
+++ b/hack/e2e-chainsaw/qdrant/chainsaw-test.yaml
@@ -0,0 +1,396 @@
+# Chainsaw port of hack/e2e-apps/qdrant.bats ("Create Qdrant").
+apiVersion: chainsaw.kyverno.io/v1alpha1
+kind: Test
+metadata:
+  name: qdrant
+spec:
+  catch:
+  - events: {}
+  - describe:
+      apiVersion: helm.toolkit.fluxcd.io/v2
+      kind: HelmRelease
+      name: qdrant-test
+  # The app chart wraps the workload in a nested HelmRelease named
+  # `<release>-system`, and the chart behind it stamps
+  # app.kubernetes.io/instance from its own release name. So the Qdrant pods
+  # carry `qdrant-test-system`, which the unsuffixed value never matched.
+  - podLogs:
+      selector: app.kubernetes.io/instance=qdrant-test-system
+      tail: 50
+  # The unsuffixed value stays, as a second collector rather than as the one
+  # that was replaced: the parent chart's PVC-cleanup Job
+  # (templates/hooks/cleanup-pvc.yaml) labels its pod template with the PARENT
+  # release name, so it is the one thing the old selector did reach, and the
+  # delete below happens inside a `try:`, so the Job is in scope while the test
+  # is still running.
+  #
+  # What this reaches, and when, so the capture is read for what it is: the hook
+  # exits non-zero when a delete or a listing failed, and
+  # `hook-delete-policy: hook-succeeded` does not fire for a hook that failed --
+  # so on exactly the runs worth investigating the pod is still there, and this
+  # is the account of what the cleanup could not remove. It also reaches a hook
+  # that is still running, where the uninstall hangs and Helm is still waiting.
+  # On a clean uninstall the hook succeeds and its pod is collected away, so an
+  # empty capture here is the ordinary case rather than a stale selector -- the
+  # instance-label listing below is what tells those two apart. The
+  # `get jobs,pods` in the cleanup step below lists the objects but reads no log.
+  - podLogs:
+      selector: app.kubernetes.io/instance=qdrant-test
+      tail: 50
+  # podLogs cannot report that it matched nothing, so an empty capture above and
+  # a selector that has gone stale look identical. Print the instance label of
+  # every pod in the namespace instead. Deliberately no selector is repeated
+  # here: a copy would only prove itself right, and would keep matching after
+  # the collector's own selector drifted.
+  #
+  # What is and is not guarded, so the next reader does not assume more:
+  # the `-system` value above is also pinned on a resource in a `steps:` assert
+  # below, so the chart renaming that label turns a step red -- that is the
+  # drift this pin exists to catch. It does NOT catch a wrong value typed into the
+  # selector here: the assert pins the label on the resource, this pins it in
+  # the collector, and they are two literals. It also catches nothing when the
+  # run fails before reaching that assert. The census below covers neither, and
+  # is not meant to -- it answers what the labels actually are.
+  - script:
+      # The helper bounds each kubectl attempt with --request-timeout, which on
+      # a degraded cluster costs about five times the flag; one call is ~75s at
+      # worst, and this op timeout sits above that so an inner budget is what
+      # fires. A SIGKILL at the op boundary would take the census out mid-write
+      # and yield nothing, where a kubectl that gives up leaves an error to
+      # print. The helper carries the rest of the rationale and is unit-tested
+      # in hack/pod-label-census_test.bats.
+      timeout: 2m
+      content: |
+        set -eu
+        cd ../../..
+        . hack/e2e-chainsaw/_lib/pod-label-census.sh
+        pod_label_census "$NAMESPACE"
+  steps:
+  - name: create-qdrant
+    try:
+    - apply:
+        file: qdrant.yaml
+
+  - name: wait-helmreleases-ready
+    try:
+    # 11m: above the 600s install timeout cozystack-api gives this release;
+    # see "Sizing an HR-Ready budget" in docs/agents/e2e-testing.md.
+    - assert:
+        timeout: 11m
+        resource:
+          apiVersion: helm.toolkit.fluxcd.io/v2
+          kind: HelmRelease
+          metadata:
+            name: qdrant-test
+          status:
+            (conditions[?type == 'Ready']):
+            - status: "True"
+    # 11m: above the 10m spec.timeout that
+    # packages/apps/qdrant/templates/qdrant.yaml gives this release;
+    # see "Sizing an HR-Ready budget" in docs/agents/e2e-testing.md.
+    - assert:
+        timeout: 11m
+        resource:
+          apiVersion: helm.toolkit.fluxcd.io/v2
+          kind: HelmRelease
+          metadata:
+            name: qdrant-test-system
+          status:
+            (conditions[?type == 'Ready']):
+            - status: "True"
+
+  - name: verify-statefulset-and-storage
+    try:
+    - assert:
+        timeout: 2m
+        resource:
+          apiVersion: apps/v1
+          kind: StatefulSet
+          metadata:
+            name: qdrant-test
+          # Pins the label the catch collector selects on. Asserts are subset
+          # matches, so this costs nothing and turns a silent drift of the
+          # instance label into a red step instead of an empty capture. Readiness
+          # is covered by the qdrant-test-system HelmRelease above.
+          spec:
+            selector:
+              matchLabels:
+                app.kubernetes.io/instance: qdrant-test-system
+    # Stays: the reclaim step below only proves the PVC was reclaimed if it was
+    # seen here first, an `error` on a PVC that never existed passes as well.
+    - assert:
+        timeout: 2m
+        resource:
+          apiVersion: v1
+          kind: PersistentVolumeClaim
+          metadata:
+            name: qdrant-storage-qdrant-test-0
+          status:
+            phase: Bound
+
+  # The trust-anchor chain from the sentinel to the tenantsecrets read path:
+  # the chart renders a TenantProjection beside its cert-manager CA, the
+  # cacert controller lifts ca.crt into the key-free <release>.tenant-ca, and
+  # the lineage webhook marks it tenantresource=true because the
+  # ApplicationDefinition selects the tenant-ca label. That last verdict is
+  # computed from spec.secrets, and nothing short of a cluster proves it.
+  - name: verify-tenant-anchor-published
+    try:
+    - assert:
+        timeout: 2m
+        resource:
+          apiVersion: internal.cozystack.io/v1alpha1
+          kind: TenantProjection
+          metadata:
+            name: qdrant-test-ca
+          status:
+            (conditions[?type == 'Ready']):
+            - status: "True"
+              reason: Projected
+    - assert:
+        timeout: 2m
+        resource:
+          apiVersion: v1
+          kind: Secret
+          metadata:
+            name: qdrant-test.tenant-ca
+            labels:
+              internal.cozystack.io/tenant-ca: "true"
+              internal.cozystack.io/tenantresource: "true"
+          type: Opaque
+    # Deterministic once the asserts above pass, so no retry.
+    - script:
+        timeout: 2m
+        content: |
+          set -eu
+
+          secret_keys() {
+            kubectl -n "$NAMESPACE" get secret "$1" \
+              -o go-template='{{if .data}}{{range $k, $v := .data}}{{$k}}{{"\n"}}{{end}}{{end}}'
+          }
+
+          # Exactly one key, and it is ca.crt. The source holds the CA private
+          # key under tls.key, so a second key here is that key leaving.
+          keys=$(secret_keys qdrant-test.tenant-ca | sort | tr '\n' ' ')
+          if [ "$keys" != "ca.crt " ]; then
+            echo "projection must hold exactly ca.crt, holds: $keys" >&2
+            exit 1
+          fi
+
+          # It lifted the right certificate. Compared by fingerprint, because
+          # the controller re-encodes ca.crt from the DER it parsed.
+          src=$(kubectl -n "$NAMESPACE" get secret qdrant-test-ca -o jsonpath='{.data.ca\.crt}' | base64 -d)
+          proj=$(kubectl -n "$NAMESPACE" get secret qdrant-test.tenant-ca -o jsonpath='{.data.ca\.crt}' | base64 -d)
+          if [ -z "$src" ]; then
+            echo "qdrant-test-ca has no ca.crt — the declared source name or key is wrong" >&2
+            exit 1
+          fi
+          src_fp=$(echo "$src" | openssl x509 -noout -fingerprint -sha256)
+          proj_fp=$(echo "$proj" | openssl x509 -noout -fingerprint -sha256)
+          if [ "$src_fp" != "$proj_fp" ]; then
+            echo "projection does not carry the chart's CA certificate" >&2
+            exit 1
+          fi
+          if echo "$proj" | grep -qi 'BEGIN .*PRIVATE KEY'; then
+            echo "projection carries PEM private key material" >&2
+            exit 1
+          fi
+
+          # The delivery path a tenant uses. Everything above reads raw
+          # Secrets, which only an admin can do.
+          anchor=$(kubectl -n "$NAMESPACE" get tenantsecret qdrant-test.tenant-ca \
+            -o jsonpath='{.data.ca\.crt}' | base64 -d)
+          if ! echo "$anchor" | grep -q 'BEGIN CERTIFICATE'; then
+            echo "the trust anchor is not served through core.cozystack.io/tenantsecrets" >&2
+            exit 1
+          fi
+
+          # The negative that gives the positive its meaning: the key-bearing
+          # cert-manager Secrets must not be served the same way. Each must
+          # hold tls.key first, so a renamed or emptied Secret cannot 404 for
+          # the wrong reason and pass. NotFound is the only acceptable
+          # failure: an RBAC denial or an unavailable aggregated apiserver also
+          # fails the read, and that is not "safely absent".
+          for s in qdrant-test-ca qdrant-test-tls; do
+            if ! secret_keys "$s" | grep -qx 'tls.key'; then
+              echo "$s no longer carries tls.key — this check has stopped proving anything" >&2
+              exit 1
+            fi
+            if err=$(kubectl -n "$NAMESPACE" get tenantsecret "$s" 2>&1 >/dev/null); then
+              echo "key-bearing $s is being served as a tenant secret" >&2
+              exit 1
+            fi
+            case "$err" in
+              *NotFound*) echo "ok $s: key-bearing and not served" ;;
+              *)
+                echo "tenantsecret $s did not answer NotFound, so this check proved nothing: $err" >&2
+                exit 1
+                ;;
+            esac
+          done
+
+  # What the anchor is for: a client that trusts only what the tenant was
+  # handed reaches qdrant over TLS, and the same client fails closed when the
+  # anchor is wrong or missing, or when it falls back to plaintext.
+  - name: verify-endpoint-trusts-only-the-anchor
+    try:
+    - script:
+        # Inner budgets: the port-forward wait (30s) plus four handshakes and
+        # one plaintext request at 20s each, about 130s at worst, so an inner
+        # timeout fires before this ceiling does.
+        timeout: 3m
+        content: |
+          set -eu
+          workdir=$(mktemp -d)
+          trap '[ -n "${pf_pid:-}" ] && kill "$pf_pid" 2>/dev/null || true; rm -rf "$workdir"' EXIT
+
+          # Read through tenantsecrets, the tenant's own path, not the raw
+          # Secret an admin would read.
+          kubectl -n "$NAMESPACE" get tenantsecret qdrant-test.tenant-ca \
+            -o jsonpath='{.data.ca\.crt}' | base64 -d > "$workdir/anchor.crt"
+
+          # A wrong anchor with the real CA's subject and a different key, so
+          # a pass here cannot come from matching on the name.
+          openssl req -x509 -newkey ec -pkeyopt ec_paramgen_curve:P-256 -nodes \
+            -keyout "$workdir/wrong.key" -out "$workdir/wrong.crt" \
+            -subj /CN=qdrant-test-ca -days 1 >/dev/null 2>&1
+
+          kubectl -n "$NAMESPACE" port-forward service/qdrant-test 6333:6333 >/dev/null 2>&1 &
+          pf_pid=$!
+          # TODO(e2e-replace-fixed-timeouts): nothing models a port-forward
+          # becoming ready; the socket opening is the only signal.
+          timeout 30 sh -ec 'until nc -z localhost 6333; do sleep 1; done'
+
+          # -verify_return_error turns a chain that does not build into a
+          # non-zero exit, and -verify_hostname checks the SAN the chart
+          # issues for the in-cluster Service name.
+          handshake() {
+            timeout 20 openssl s_client -connect 127.0.0.1:6333 \
+              -servername qdrant-test -verify_hostname qdrant-test \
+              -verify_return_error "$@" </dev/null >"$workdir/handshake.log" 2>&1
+          }
+          # A negative counts only when verification is what failed. A refused
+          # connection or a hang also exits non-zero, and reading that as
+          # "rejected" would pass while proving nothing.
+          expect_verify_failure() {
+            what=$1
+            shift
+            if handshake "$@"; then
+              echo "qdrant verified against $what; the anchor is not what decides trust" >&2
+              cat "$workdir/handshake.log" >&2
+              exit 1
+            fi
+            if ! grep -q 'verify error' "$workdir/handshake.log"; then
+              echo "the handshake against $what failed, but not on verification:" >&2
+              cat "$workdir/handshake.log" >&2
+              exit 1
+            fi
+            echo "ok: $what is rejected"
+          }
+
+          if ! handshake -CAfile "$workdir/anchor.crt"; then
+            echo "qdrant does not verify against the anchor published to the tenant" >&2
+            cat "$workdir/handshake.log" >&2
+            exit 1
+          fi
+          echo "ok: the published anchor verifies qdrant-test:6333"
+
+          expect_verify_failure "a CA with the same subject and another key" -CAfile "$workdir/wrong.crt"
+          # No anchor at all: the runner's default trust store only.
+          expect_verify_failure "the default trust store"
+
+          # Last, because it is the one request that is not TLS: the listener
+          # must not answer plaintext HTTP, or a client without the anchor
+          # could skip verification entirely. 000 means no HTTP response, but
+          # curl also prints it when nothing is listening, so a refused
+          # connection (7) or a timeout (28) proves nothing and fails here.
+          rc=0
+          code=$(curl --silent --output /dev/null --write-out '%{http_code}' --max-time 20 \
+            http://127.0.0.1:6333/readyz) || rc=$?
+          case "$rc" in
+            7|28)
+              echo "plaintext request never reached qdrant (curl exit $rc), so this check proved nothing" >&2
+              exit 1
+              ;;
+          esac
+          if [ "$code" != "000" ]; then
+            echo "qdrant answered plaintext HTTP with status $code" >&2
+            exit 1
+          fi
+          # And the listener was still there to refuse it: the same forward
+          # still carries a verified handshake afterwards.
+          if ! handshake -CAfile "$workdir/anchor.crt"; then
+            echo "the port-forward died around the plaintext request, so its rejection proves nothing" >&2
+            cat "$workdir/handshake.log" >&2
+            exit 1
+          fi
+          echo "ok: plaintext HTTP gets no response (curl exit $rc)"
+
+  - name: verify-pvc-reclaim-on-delete
+    try:
+    # Issue #3059: Kubernetes never GCs StatefulSet-templated PVCs; the
+    # chart's post-delete cleanup hook Job must reclaim the data PVC
+    # asynchronously during uninstall (ordinal-anchored so a sibling's PVC is
+    # never deleted, 2587458bd/ae7c23240). The `error` op polls for absence
+    # and retries transient API errors internally, so a blip is never misread
+    # as "reclaimed" (2m mirrors the bats ~120s budget).
+    - delete:
+        ref:
+          apiVersion: apps.cozystack.io/v1alpha1
+          kind: Qdrant
+          name: test
+    - error:
+        timeout: 2m
+        resource:
+          apiVersion: v1
+          kind: PersistentVolumeClaim
+          metadata:
+            name: qdrant-storage-qdrant-test-0
+    catch:
+    - script:
+        # Same budgeting as the census in the test-wide catch, sized for this
+        # script: it makes up to three bounded calls, so ~240s at worst rather
+        # than the census's ~75s, and the op timeout is 5m rather than 2m to
+        # stay above that. Above the inner budgets either way, so an inner one
+        # is what fires instead of a SIGKILL that would yield nothing.
+        timeout: 5m
+        content: |
+          # `set -u` but NOT `set -e`: every lookup below is best-effort, the
+          # way the sibling redis script in the harbor suite already is. Under
+          # `-e` a failing `get pvc` would abort the script before the report
+          # runs, so the degraded cluster -- the only case this catch exists
+          # for -- is exactly the one that would produce no diagnosis at all.
+          set -u
+          cd ../../..
+          . hack/e2e-chainsaw/_lib/pod-label-census.sh
+          kubectl -n "$NAMESPACE" --request-timeout=15s get pvc -o wide || true
+          # `qdrant-test` here, unsuffixed. This runs after the parent Qdrant is
+          # deleted, and what it looks for is the parent chart's PVC-cleanup Job
+          # (templates/hooks/cleanup-pvc.yaml), which is labelled with the PARENT
+          # release name. The nested `-system` release owns the Qdrant workload,
+          # not this Job. The test-wide catch reads that Job's log on the same
+          # unsuffixed value; this reports whether the objects are there at all.
+          #
+          # The three outcomes are told apart by the shared helper rather than
+          # by a second copy of that branching: an empty `kubectl get -l` exits
+          # zero, so a stale selector here would print nothing and read as
+          # "cleanup finished", and kubectl also exits zero while logging to
+          # stderr, which folded into the value would print as a leftover
+          # object. One call feeds the report; the `-o wide` re-listing below is
+          # extra detail on objects already known to exist, not a second attempt
+          # at the question.
+          sel=app.kubernetes.io/instance=qdrant-test
+          errf=$(mktemp)
+          if found=$(kubectl -n "$NAMESPACE" --request-timeout=15s get jobs,pods -l "$sel" -o name 2>"$errf"); then
+            rc=0
+          else
+            rc=1
+          fi
+          lookup_report "$rc" "$found" "$(cat "$errf")" \
+            "cleanup lookup FAILED — it did not run, which is not the same as 'nothing left':" \
+            "cleanup selector '$sel' matched no objects: either cleanup completed, or the parent chart's label changed" \
+            "cleanup objects still present:"
+          if [ "$rc" -eq 0 ] && [ -n "$found" ]; then
+            kubectl -n "$NAMESPACE" --request-timeout=15s get jobs,pods -l "$sel" -o wide || true
+          fi
+          rm -f "$errf"
diff --git a/hack/e2e-chainsaw/qdrant/qdrant.yaml b/hack/e2e-chainsaw/qdrant/qdrant.yaml
new file mode 100644
index 0000000000..2d840d30a4
--- /dev/null
+++ b/hack/e2e-chainsaw/qdrant/qdrant.yaml
@@ -0,0 +1,16 @@
+apiVersion: apps.cozystack.io/v1alpha1
+kind: Qdrant
+metadata:
+  name: test
+spec:
+  replicas: 1
+  size: 10Gi
+  storageClass: ""
+  resourcesPreset: "nano"
+  resources: {}
+  external: false
+  # TLS is set explicitly rather than through `external`, which would also
+  # allocate a LoadBalancer. With TLS off the chart renders no CA and no
+  # TenantProjection, so the trust-anchor steps would have nothing to check.
+  tls:
+    enabled: true
diff --git a/hack/e2e-chainsaw/rabbitmq/chainsaw-test.yaml b/hack/e2e-chainsaw/rabbitmq/chainsaw-test.yaml
new file mode 100644
index 0000000000..24ac0f9a3b
--- /dev/null
+++ b/hack/e2e-chainsaw/rabbitmq/chainsaw-test.yaml
@@ -0,0 +1,175 @@
+apiVersion: chainsaw.kyverno.io/v1alpha1
+kind: Test
+metadata:
+  name: rabbitmq
+spec:
+  catch:
+  - events: {}
+  - describe:
+      apiVersion: helm.toolkit.fluxcd.io/v2
+      kind: HelmRelease
+      name: rabbitmq-test
+  - describe:
+      apiVersion: rabbitmq.com/v1beta1
+      kind: RabbitmqCluster
+      name: rabbitmq-test
+  - describe:
+      apiVersion: rabbitmq.com/v1beta1
+      kind: User
+      name: rabbitmq-test-app
+  - podLogs:
+      selector: app.kubernetes.io/instance=rabbitmq-test
+      tail: 50
+  - podLogs:
+      namespace: cozy-rabbitmq-operator
+      selector: app.kubernetes.io/name=messaging-topology-operator
+      tail: 100
+  steps:
+  - name: create-rabbitmq
+    try:
+    - apply:
+        file: rabbitmq.yaml
+  - name: wait-ready
+    try:
+    # 11m: above the 600s install timeout cozystack-api gives this release;
+    # see "Sizing an HR-Ready budget" in docs/agents/e2e-testing.md.
+    - assert:
+        timeout: 11m
+        resource:
+          apiVersion: helm.toolkit.fluxcd.io/v2
+          kind: HelmRelease
+          metadata:
+            name: rabbitmq-test
+          status:
+            (conditions[?type == 'Ready']):
+            - status: "True"
+    - assert:
+        timeout: 5m
+        resource:
+          apiVersion: apps.cozystack.io/v1alpha1
+          kind: RabbitMQ
+          metadata:
+            name: test
+          status:
+            (conditions[?type == 'Ready']):
+            - status: "True"
+    - assert:
+        timeout: 5m
+        resource:
+          apiVersion: rabbitmq.com/v1beta1
+          kind: RabbitmqCluster
+          metadata:
+            name: rabbitmq-test
+          status:
+            (conditions[?type == 'AllReplicasReady']):
+            - status: "True"
+  - name: verify-workload
+    try:
+    - assert:
+        timeout: 5m
+        resource:
+          apiVersion: apps/v1
+          kind: StatefulSet
+          metadata:
+            name: rabbitmq-test-server
+          status:
+            readyReplicas: 2
+    - assert:
+        resource:
+          apiVersion: v1
+          kind: Service
+          metadata:
+            name: rabbitmq-test
+  - name: verify-user
+    try:
+    # messaging-topology-operator >= 1.20 only sees credentials Secrets labelled
+    # rabbitmq.com/topology-operator=true: the User reaching Ready is what
+    # proves the chart's Secret passed the admission webhook and the cache.
+    - assert:
+        timeout: 3m
+        resource:
+          apiVersion: rabbitmq.com/v1beta1
+          kind: User
+          metadata:
+            name: rabbitmq-test-app
+          status:
+            (conditions[?type == 'Ready']):
+            - status: "True"
+---
+apiVersion: chainsaw.kyverno.io/v1alpha1
+kind: Test
+metadata:
+  name: rabbitmq-2-backup-roundtrip
+spec:
+  # tenant-root, not the suite default tenant-test: the backup Job pushes to the
+  # in-cluster seaweedfs in tenant-root, and the e2e tenant-test is Cilium
+  # egress-isolated from it. run-all.sh provisions its own Bucket + Rabbitmq
+  # strategy + BackupClass; the run step below overrides S3_ENDPOINT to the
+  # in-cluster seaweedfs because the Bucket's advertised external ingress URL is
+  # an unroutable placeholder in CI. The .svc FQDN is load-bearing: the driver's
+  # curl verifies TLS against the copied seaweedfs CA, and the filer serving
+  # cert's SANs are '*.tenant-root.svc' / '*.tenant-root.svc.cluster.local' — the
+  # 2-label 'seaweedfs-s3.tenant-root' matches neither, so it must be
+  # 'seaweedfs-s3.tenant-root.svc'. It still needs the platform backups stack
+  # (backupstrategy-controller + the shipped cozy-default-rabbitmq strategy,
+  # whose client image the demo reuses).
+  namespace: tenant-root
+  skipDelete: true
+  catch:
+  - events: {}
+  - describe:
+      apiVersion: helm.toolkit.fluxcd.io/v2
+      kind: HelmRelease
+      name: rabbitmq-rabbitmq-src
+  - describe:
+      apiVersion: rabbitmq.com/v1beta1
+      kind: RabbitmqCluster
+  - describe:
+      apiVersion: backups.cozystack.io/v1alpha1
+      kind: BackupJob
+  - describe:
+      apiVersion: backups.cozystack.io/v1alpha1
+      kind: RestoreJob
+  - describe:
+      apiVersion: strategy.backups.cozystack.io/v1alpha1
+      kind: Rabbitmq
+      name: rabbitmq-strategy-default
+  - podLogs:
+      selector: rabbitmq.strategy.backups.cozystack.io/mode
+      tail: 200
+  steps:
+  - name: run
+    try:
+    # Pre-clean so a stale Succeeded BackupJob from a prior run cannot satisfy
+    # the wait instantly. Idempotent; the catch cwd is the suite dir.
+    - script:
+        timeout: 8m
+        content: |
+          set -eu
+          cd ../../..
+          NAMESPACE="$NAMESPACE" examples/backups/rabbitmq/cleanup.sh
+        check:
+          ($error == null): true
+    # Honest round-trip: seed a sentinel definition, back it up through
+    # cozy-default, drop it, restore in place, then restore into a copy -
+    # asserting the sentinel survives object storage each time. 48m: sized
+    # with the 660s HR waits in run-all.sh (convention 6: justified in-line).
+    - script:
+        timeout: 48m
+        content: |
+          set -eu
+          cd ../../..
+          [ -x examples/backups/rabbitmq/run-all.sh ] || { echo "examples/backups/rabbitmq/run-all.sh not found or not executable" >&2; exit 1; }
+          NAMESPACE="$NAMESPACE" S3_ENDPOINT="https://seaweedfs-s3.tenant-root.svc:8333" \
+            examples/backups/rabbitmq/run-all.sh
+        check:
+          ($error == null): true
+          (contains($stderr, 'definitions round-tripped through object storage')): true
+    finally:
+    - description: backup-flow cleanup
+      script:
+        timeout: 8m
+        content: |
+          set -eu
+          cd ../../..
+          NAMESPACE="$NAMESPACE" examples/backups/rabbitmq/cleanup.sh
diff --git a/hack/e2e-chainsaw/rabbitmq/rabbitmq.yaml b/hack/e2e-chainsaw/rabbitmq/rabbitmq.yaml
new file mode 100644
index 0000000000..bc465ab2bf
--- /dev/null
+++ b/hack/e2e-chainsaw/rabbitmq/rabbitmq.yaml
@@ -0,0 +1,11 @@
+apiVersion: apps.cozystack.io/v1alpha1
+kind: RabbitMQ
+metadata:
+  name: test
+spec:
+  replicas: 2
+  size: 1Gi
+  resourcesPreset: c1.small
+  version: v4.2
+  users:
+    app: {}
diff --git a/hack/e2e-chainsaw/redis/chainsaw-test.yaml b/hack/e2e-chainsaw/redis/chainsaw-test.yaml
new file mode 100644
index 0000000000..6f6e9ba84d
--- /dev/null
+++ b/hack/e2e-chainsaw/redis/chainsaw-test.yaml
@@ -0,0 +1,755 @@
+# Chainsaw port of hack/e2e-apps/redis.bats ("Create Redis").
+apiVersion: chainsaw.kyverno.io/v1alpha1
+kind: Test
+metadata:
+  name: redis
+spec:
+  catch:
+  - events: {}
+  - describe:
+      apiVersion: helm.toolkit.fluxcd.io/v2
+      kind: HelmRelease
+      name: redis-test
+  - podLogs:
+      selector: app.kubernetes.io/instance=redis-test
+      tail: 50
+  steps:
+  - name: create-redis
+    try:
+    - apply:
+        file: redis.yaml
+
+  - name: wait-helmrelease-ready
+    try:
+    # 11m: above the 600s install timeout cozystack-api gives this release;
+    # see "Sizing an HR-Ready budget" in docs/agents/e2e-testing.md.
+    - assert:
+        timeout: 11m
+        resource:
+          apiVersion: helm.toolkit.fluxcd.io/v2
+          kind: HelmRelease
+          metadata:
+            name: redis-test
+          status:
+            (conditions[?type == 'Ready']):
+            - status: "True"
+
+  - name: verify-storage-and-workloads
+    try:
+    # replicas: 2 provisions two StatefulSet-templated PVCs — verify both.
+    - assert:
+        timeout: 2m
+        resource:
+          apiVersion: v1
+          kind: PersistentVolumeClaim
+          metadata:
+            name: redisfailover-persistent-data-rfr-redis-test-0
+          status:
+            phase: Bound
+    - assert:
+        timeout: 2m
+        resource:
+          apiVersion: v1
+          kind: PersistentVolumeClaim
+          metadata:
+            name: redisfailover-persistent-data-rfr-redis-test-1
+          status:
+            phase: Bound
+    - assert:
+        timeout: 2m
+        resource:
+          apiVersion: apps/v1
+          kind: Deployment
+          metadata:
+            name: rfs-redis-test
+          status:
+            (conditions[?type == 'Available']):
+            - status: "True"
+    - assert:
+        timeout: 2m
+        resource:
+          apiVersion: apps/v1
+          kind: StatefulSet
+          metadata:
+            name: rfr-redis-test
+          status:
+            readyReplicas: 2
+---
+# TLS on. Everything the unit tests can only render runs live here: the
+# rebuilt operator with the TLS patch, the CRD and ClusterRole patches on its
+# chart, cert-manager issuing the per-release chain, and the CA-extraction
+# controller lifting the trust anchor for the tenant. readyReplicas is the
+# handshake witness: the patched probes dial the pod's own listener with
+# --tls, so a pod that still answers plaintext, or serves a certificate the
+# CA did not sign, never becomes Ready.
+apiVersion: chainsaw.kyverno.io/v1alpha1
+kind: Test
+metadata:
+  name: redis-tls
+spec:
+  catch:
+  - events: {}
+  - describe:
+      apiVersion: helm.toolkit.fluxcd.io/v2
+      kind: HelmRelease
+      name: redis-secure
+  - describe:
+      apiVersion: cert-manager.io/v1
+      kind: Certificate
+      name: redis-secure-tls
+  - describe:
+      apiVersion: databases.spotahome.com/v1
+      kind: RedisFailover
+      name: redis-secure
+  - podLogs:
+      selector: app.kubernetes.io/instance=redis-secure
+      tail: 50
+  # A TLS dial that fails or a Secret write the ClusterRole refuses shows up
+  # in the operator's log and nowhere in the tenant namespace.
+  - podLogs:
+      namespace: cozy-redis-operator
+      selector: app.kubernetes.io/name=redis-operator
+      tail: 100
+  steps:
+  - name: create-redis-tls
+    try:
+    - apply:
+        file: redis-tls.yaml
+
+  - name: wait-helmrelease-ready
+    try:
+    # Same 11m as redis-test above.
+    - assert:
+        timeout: 11m
+        resource:
+          apiVersion: helm.toolkit.fluxcd.io/v2
+          kind: HelmRelease
+          metadata:
+            name: redis-secure
+          status:
+            (conditions[?type == 'Ready']):
+            - status: "True"
+
+  # cert-manager issued the chain the chart declares. Ready on the leaf means
+  # <release>.tls holds tls.crt, tls.key and ca.crt; without it the pods have
+  # nothing to serve and never start.
+  - name: verify-certificates-issued
+    try:
+    - assert:
+        timeout: 2m
+        resource:
+          apiVersion: cert-manager.io/v1
+          kind: Certificate
+          metadata:
+            name: redis-secure-ca
+          status:
+            (conditions[?type == 'Ready']):
+            - status: "True"
+    - assert:
+        timeout: 2m
+        resource:
+          apiVersion: cert-manager.io/v1
+          kind: Certificate
+          metadata:
+            name: redis-secure-tls
+          status:
+            (conditions[?type == 'Ready']):
+            - status: "True"
+
+  - name: verify-workloads-serve-tls
+    try:
+    - assert:
+        timeout: 5m
+        resource:
+          apiVersion: apps/v1
+          kind: StatefulSet
+          metadata:
+            name: rfr-redis-secure
+          status:
+            readyReplicas: 2
+    - assert:
+        timeout: 2m
+        resource:
+          apiVersion: apps/v1
+          kind: Deployment
+          metadata:
+            name: rfs-redis-secure
+          status:
+            (conditions[?type == 'Available']):
+            - status: "True"
+    # The operator's own witness that its ClusterRole patch is in force: the
+    # CA-only Secret it publishes needs create on Secrets, which upstream
+    # v3.3.5 does not grant. Whether it stays out of the tenant's reach is the
+    # next step's business.
+    - assert:
+        timeout: 2m
+        resource:
+          apiVersion: v1
+          kind: Secret
+          metadata:
+            name: redis-secure.ca-cert
+          type: Opaque
+
+  # Two paths carry a Secret to a tenant and both are asserted. The dashboard
+  # Role grants by name; core.cozystack.io/tenantsecrets serves whatever the
+  # lineage webhook stamped tenantresource=true from the ApplicationDefinition
+  # selectors, and that label-driven path is the one that would leak a
+  # private key if the selector ever named the cert-manager Secrets instead of
+  # the projection.
+  - name: verify-tenant-ca-projection
+    try:
+    # The name-granting path, on the deployed object rather than the render:
+    # the Role must reach exactly the auth Secret. The unit tests pin the same
+    # rule, but only against the template, so a Role that fails to apply or
+    # gets widened in the cluster is invisible to them.
+    - assert:
+        timeout: 2m
+        resource:
+          apiVersion: rbac.authorization.k8s.io/v1
+          kind: Role
+          metadata:
+            name: redis-secure-dashboard-resources
+          (length(rules[?contains(resources, 'secrets')])): 1
+          (rules[?contains(resources, 'secrets')].resourceNames[]):
+          - redis-secure-auth
+    # Positive control, and it comes first: the negatives below are satisfied
+    # by an ABSENT label, which is also what a webhook that stamped nothing
+    # this run looks like. The auth Secret is chart-rendered, traces to the
+    # Redis CR and is granted by name, so it MUST be stamped.
+    - assert:
+        timeout: 2m
+        resource:
+          apiVersion: v1
+          kind: Secret
+          metadata:
+            name: redis-secure-auth
+            labels:
+              internal.cozystack.io/tenantresource: "true"
+    # tenant-ca is stamped by the CA-extraction controller; tenantresource is
+    # the lineage webhook's verdict from the redis ApplicationDefinition's
+    # matchLabels include. Both true means the whole chain held.
+    - assert:
+        timeout: 2m
+        resource:
+          apiVersion: v1
+          kind: Secret
+          metadata:
+            name: redis-secure.tenant-ca
+            labels:
+              internal.cozystack.io/tenant-ca: "true"
+              internal.cozystack.io/tenantresource: "true"
+          type: Opaque
+    # All three enumerated: the promotion is label-driven, so any one of them
+    # acquiring the label leaks. != 'true' rather than == 'false' because the
+    # cert-manager Secrets carry no ownerReference (enableCertificateOwnerRef
+    # is off) and the webhook never stamps them at all.
+    - assert:
+        timeout: 2m
+        resource:
+          apiVersion: v1
+          kind: Secret
+          metadata:
+            name: redis-secure.ca-tls
+          (metadata.labels."internal.cozystack.io/tenantresource" != 'true'): true
+    - assert:
+        timeout: 2m
+        resource:
+          apiVersion: v1
+          kind: Secret
+          metadata:
+            name: redis-secure.tls
+          (metadata.labels."internal.cozystack.io/tenantresource" != 'true'): true
+    - assert:
+        timeout: 2m
+        resource:
+          apiVersion: v1
+          kind: Secret
+          metadata:
+            name: redis-secure.ca-cert
+          (metadata.labels."internal.cozystack.io/tenantresource" != 'true'): true
+    # No retry around this script. The replica link it reads is settled by
+    # none of the asserts above and carries its own bounded wait below. The
+    # whole step measured 3.0s on run 34711755303, so link_wait is wide
+    # against what it costs today. The reads' 30s caps sum past the 5m op,
+    # so they share step_budget instead: no read starts after it, one
+    # already running ends within its 5s kill grace of it, and the op sits
+    # above both, so a read or the budget is what fails and names itself
+    # rather than a ceiling that kills the shell and takes the script's own
+    # message with it. hack/chainsaw-op-budgets.bats holds the budget under
+    # the op.
+    #
+    # Every redis-cli below runs under the container's own `timeout`. That
+    # inner cap, not the op timeout, is what keeps a dial that never answers
+    # from taking the whole suite down: Chainsaw kills the shell when the op
+    # expires, but it captures stdout and stderr through pipes, and Go's exec
+    # waits for every holder of the write end to close it -- the orphaned
+    # kubectl is one, so the run goes silent until the job ceiling instead of
+    # failing. Sentinel and data pods run the same Debian-based engine image,
+    # whose coreutils /usr/bin/timeout reports 124 on expiry; that is not
+    # zero, which is all these checks read.
+    #
+    # bash for pipefail: base64 -d exits 0 on empty input, so without it a
+    # failed Secret read below takes the decoder's status and is reported as
+    # the emptiness it left behind. The sandbox's /bin/sh is dash, which
+    # rejects `set -o pipefail`; `shell:` is a Script field in the Chainsaw
+    # v0.2.15 the sandbox image installs.
+    - script:
+        timeout: 5m
+        shell: bash
+        content: |
+          set -euo pipefail
+
+          # Every kubectl below runs under a wall-clock bound. The inner
+          # `timeout` on a redis-cli cannot fire if the exec stream itself
+          # never establishes, and a kubectl still running holds this script's
+          # stdout open, which is what turns a stuck call into a silent run to
+          # the job ceiling instead of a failure. A call gets 30s at most and
+          # never more than step_budget has left.
+          step_budget=240
+          step_deadline=$(( $(date +%s) + step_budget ))
+          k() {
+            k_left=$(( step_deadline - $(date +%s) ))
+            if [ "$k_left" -le 0 ]; then
+              echo "the ${step_budget}s step budget is spent, so this read did not run: $*" >&2
+              return 124
+            fi
+            [ "$k_left" -le 30 ] || k_left=30
+            k_start=$(date +%s)
+            k_rc=0
+            timeout -k 5 "$k_left" kubectl "$@" || k_rc=$?
+            if [ "$k_rc" -ne 0 ] && [ $(( $(date +%s) - k_start )) -ge "$k_left" ]; then
+              echo "this read ran into its ${k_left}s bound: $*" >&2
+            fi
+            return "$k_rc"
+          }
+
+          # Exactly one key, and it is ca.crt. The source carries the CA
+          # private key, so any second key is a leak in the making.
+          keys=$(k -n "$NAMESPACE" get secret redis-secure.tenant-ca \
+            -o go-template='{{range $k, $v := .data}}{{$k}}{{"\n"}}{{end}}' | sort | tr '\n' ' ')
+          if [ "$keys" != "ca.crt " ]; then
+            echo "projection must hold exactly ca.crt, holds: $keys" >&2
+            exit 1
+          fi
+
+          # It lifted the right certificate: the CA cert-manager wrote to
+          # <release>.ca-tls, the source the chart's TenantProjection names.
+          # Compared by fingerprint, not raw PEM: the controller re-encodes
+          # ca.crt from the DER it parsed, so a header or column-width change
+          # at the source would redden a byte comparison of a correct copy.
+          src=$(k -n "$NAMESPACE" get secret redis-secure.ca-tls -o jsonpath='{.data.ca\.crt}' | base64 -d)
+          if [ -z "$src" ]; then
+            echo "redis-secure.ca-tls has no ca.crt: the declared source name or key is wrong" >&2
+            exit 1
+          fi
+          proj=$(k -n "$NAMESPACE" get secret redis-secure.tenant-ca -o jsonpath='{.data.ca\.crt}' | base64 -d)
+          if [ -z "$proj" ]; then
+            echo "redis-secure.tenant-ca has no ca.crt: the controller published an empty projection" >&2
+            exit 1
+          fi
+          src_fp=$(echo "$src" | openssl x509 -noout -fingerprint -sha256)
+          proj_fp=$(echo "$proj" | openssl x509 -noout -fingerprint -sha256)
+          if [ "$src_fp" != "$proj_fp" ]; then
+            echo "projection does not carry the release CA certificate" >&2
+            exit 1
+          fi
+
+          # The source really does hold the private key, or the leak check
+          # below would pass while proving nothing. grep reads to EOF here
+          # rather than quitting at the match under -q: with pipefail, a
+          # kubectl still writing would take SIGPIPE and fail the pipeline.
+          if ! k -n "$NAMESPACE" get secret redis-secure.ca-tls \
+            -o go-template='{{if .data}}{{range $k, $v := .data}}{{$k}}{{"\n"}}{{end}}{{end}}' | grep -x 'tls.key' >/dev/null; then
+            echo "redis-secure.ca-tls no longer carries tls.key: this check has stopped proving anything" >&2
+            exit 1
+          fi
+          if grep -qi 'BEGIN .*PRIVATE KEY' <<<"$proj"; then
+            echo "projection carries PEM private key material" >&2
+            exit 1
+          fi
+
+          # The operator's CA-only copy is key-free too; it is kept from the
+          # tenant for what it could become, not for what it holds today.
+          cacert_keys=$(k -n "$NAMESPACE" get secret redis-secure.ca-cert \
+            -o go-template='{{range $k, $v := .data}}{{$k}}{{"\n"}}{{end}}' | sort | tr '\n' ' ')
+          if [ "$cacert_keys" != "ca.crt " ]; then
+            echo "operator CA-only Secret must hold exactly ca.crt, holds: $cacert_keys" >&2
+            exit 1
+          fi
+
+          # The delivery path the README tells a tenant to use, run as the
+          # command the README prints. Everything above reads the raw Secret,
+          # which only an admin can do.
+          anchor=$(k -n "$NAMESPACE" get tenantsecret redis-secure.tenant-ca \
+            -o jsonpath='{.data.ca\.crt}' | base64 -d)
+          if ! echo "$anchor" | grep -q 'BEGIN CERTIFICATE'; then
+            echo "the trust anchor is not served through core.cozystack.io/tenantsecrets" >&2
+            exit 1
+          fi
+
+          # And the negative that gives the positive its meaning: the registry
+          # must not serve the key-bearing Secrets, nor the operator's copy.
+          # A per-object error is not absence, so the message has to say
+          # NotFound: a 403, a timeout or an unserved CRD would otherwise read
+          # as proof that the Secret is not served, which is the half of this
+          # pair the tenant's isolation rests on.
+          for s in redis-secure.ca-tls redis-secure.tls redis-secure.ca-cert; do
+            if out=$(k -n "$NAMESPACE" get tenantsecret "$s" 2>&1); then
+              echo "$s is being served as a tenant secret" >&2
+              exit 1
+            elif ! printf '%s' "$out" | grep -q 'NotFound'; then
+              echo "cannot determine whether $s is served: $out" >&2
+              exit 1
+            fi
+          done
+
+          # The anchor the tenant is handed verifies the live server. The pods
+          # mount the leaf Secret at /tls, whose ca.crt is the same CA; pin
+          # that by fingerprint, then complete a handshake through the
+          # service name with it. redis-cli verifies the chain and not the
+          # name, so this proves the chain and that the listener answers TLS
+          # on that name. It says nothing about the SAN list, which redis-cli
+          # never checks; the unit tests pin that.
+          pod_fp=$(k -n "$NAMESPACE" exec rfr-redis-secure-0 -c redis -- cat /tls/ca.crt \
+            | openssl x509 -noout -fingerprint -sha256)
+          if [ "$pod_fp" != "$proj_fp" ]; then
+            echo "the CA the pods mount is not the anchor the tenant is given" >&2
+            exit 1
+          fi
+          # pinger is an ACL user the operator writes into every redis.conf it
+          # generates, ping-only, and the credentials its own liveness probe
+          # uses. It is defined in the operator source, so grepping this tree
+          # for it finds nothing.
+          pong=$(k -n "$NAMESPACE" exec rfr-redis-secure-0 -c redis -- \
+            timeout 15 redis-cli --tls --cacert /tls/ca.crt -h "rfr-redis-secure.$NAMESPACE.svc" -p 6379 \
+            --user pinger --pass pingpass --no-auth-warning ping) \
+            || pong='(no reply: redis-cli failed or hit the 15s cap)'
+          if [ "$pong" != "PONG" ]; then
+            echo "TLS handshake through rfr-redis-secure.$NAMESPACE.svc did not answer PONG: $pong" >&2
+            exit 1
+          fi
+
+          # TLS replaces plaintext rather than joining it: the operator writes
+          # `port 0` beside the TLS port, and every check above would stay
+          # green if it stopped doing so. The mirror of the flip case: here the
+          # plaintext dial is the one that must not answer.
+          #
+          # The verdict is the listener's refusal, not the absence of PONG. A
+          # missing pod, a 403 on exec, a wrong container name and the k()
+          # cap firing print no PONG either, and a check that only looked for
+          # it would pass on every one of them. A TLS listener drops a
+          # plaintext client at the first bytes of AUTH, so redis-cli reports
+          # the AUTH reply as "I/O error", retries once, and exits 1, followed
+          # by "Error: Connection reset by peer". The I/O error line is the
+          # refusal. A
+          # refused connect is not, because nothing listening contradicts the
+          # TLS dial above. Nor is the cap expiring: the flip case reads
+          # expiry as its refusal because a plaintext listener holds a
+          # ClientHello in silence, whereas a TLS listener answers a plaintext
+          # dial at once, so silence here is a state this check did not read.
+          # Both fail as such, with what the dial printed.
+          rc=0
+          pong=$(k -n "$NAMESPACE" exec rfr-redis-secure-0 -c redis -- \
+            timeout 15 redis-cli -h "rfr-redis-secure.$NAMESPACE.svc" -p 6379 \
+            --user pinger --pass pingpass --no-auth-warning ping 2>&1) || rc=$?
+          case "$pong" in
+            *PONG*)
+              echo "the plaintext listener still answers on an instance with TLS on" >&2
+              exit 1 ;;
+            *"I/O error"*) ;;
+            *)
+              echo "cannot determine whether the plaintext listener is off (exit $rc): $pong" >&2
+              exit 1 ;;
+          esac
+
+          # readyReplicas above witnesses nothing about the link. Redis reports
+          # master_link_status:up only in REPL_STATE_CONNECTED, while the
+          # operator's readiness script passes a replica on two other
+          # predicates -- master_host off 127.0.0.1, and sync not in the
+          # transfer phase -- so the whole handshake between them is ready and
+          # unlinked, and a dropped link re-enters it. The topology is thus in
+          # motion here and one sampling would decide on it. Wait for it to
+          # settle, then assert the sentinels moved off the bootstrap address,
+          # which nothing above covers at all.
+          link_wait=60
+          started=$(date +%s)
+          deadline=$(( started + link_wait ))
+          while :; do
+            masters=0
+            linked=0
+            seen=
+            for i in 0 1; do
+              rc=0
+              info=$(k -n "$NAMESPACE" exec "rfr-redis-secure-$i" -c redis -- \
+                sh -c 'REDISCLI_AUTH="$REDIS_PASSWORD" timeout 15 redis-cli --tls --cacert /tls/ca.crt -h localhost -p 6379 info replication' 2>&1) || rc=$?
+              if [ "$rc" -ne 0 ]; then
+                echo "INFO replication on rfr-redis-secure-$i failed (exit $rc): $info" >&2
+                exit 1
+              fi
+              case "$info" in
+                *role:master*) masters=$((masters + 1)); state=master ;;
+                *role:slave*)
+                  case "$info" in
+                    *master_link_status:up*) linked=$((linked + 1)); state=linked ;;
+                    *) state=replicating-no-link ;;
+                  esac
+                  ;;
+                *) state=no-replication-role ;;
+              esac
+              seen="$seen rfr-redis-secure-$i=$state"
+            done
+            if [ "$masters" = "1" ] && [ "$linked" = "1" ]; then break; fi
+            if [ "$(date +%s)" -ge "$deadline" ]; then
+              echo "replication did not settle on one master and one linked replica after $(( $(date +%s) - started ))s:$seen" >&2
+              exit 1
+            fi
+            # TODO(e2e-replace-fixed-timeouts): nothing models the link -- the
+            # readiness probe does not read master_link_status, and the
+            # RedisFailover CRD defines no status at all, so there is no
+            # condition to assert on instead of this poll.
+            sleep 5
+          done
+
+          sentinel=$(k -n "$NAMESPACE" get pod \
+            -l app.kubernetes.io/component=sentinel,app.kubernetes.io/name=redis-secure \
+            -o jsonpath='{.items[0].metadata.name}')
+          rc=0
+          addr=$(k -n "$NAMESPACE" exec "$sentinel" -c sentinel -- \
+            timeout 15 redis-cli --tls --cacert /tls/ca.crt -h localhost -p 26379 \
+            sentinel get-master-addr-by-name mymaster) || rc=$?
+          # stderr stays out of $addr, whose first line is parsed below; what
+          # the exec wrote there is already in the log above this line.
+          if [ "$rc" -ne 0 ]; then
+            echo "get-master-addr-by-name on $sentinel failed (exit $rc): $addr" >&2
+            exit 1
+          fi
+          addr=$(echo "$addr" | head -n 1 | tr -d '\r')
+          case "$addr" in
+            ''|127.0.0.1) echo "sentinel still points at the bootstrap address: '$addr'" >&2; exit 1 ;;
+          esac
+        check:
+          ($error == null): true
+---
+# TLS is chosen at creation. A replica restarted onto the TLS listener cannot
+# replicate from a master still on plaintext, and Sentinels already on TLS
+# would fail over to a stale replica, so the operator's RedisFailover schema
+# rejects a change of tls.enabled. This is the live proof: the rejection
+# reaches the HelmRelease as a failed upgrade, and the running plaintext
+# instance is untouched by it.
+apiVersion: chainsaw.kyverno.io/v1alpha1
+kind: Test
+metadata:
+  name: redis-tls-flip-rejected
+spec:
+  catch:
+  - events: {}
+  - describe:
+      apiVersion: helm.toolkit.fluxcd.io/v2
+      kind: HelmRelease
+      name: redis-flip
+  - describe:
+      apiVersion: databases.spotahome.com/v1
+      kind: RedisFailover
+      name: redis-flip
+  - podLogs:
+      selector: app.kubernetes.io/instance=redis-flip
+      tail: 50
+  - podLogs:
+      namespace: cozy-redis-operator
+      selector: app.kubernetes.io/name=redis-operator
+      tail: 100
+  steps:
+  - name: create-redis-plaintext
+    try:
+    - apply:
+        file: redis-flip.yaml
+
+  - name: wait-plaintext-ready
+    try:
+    # Same 11m as redis-test above.
+    - assert:
+        timeout: 11m
+        resource:
+          apiVersion: helm.toolkit.fluxcd.io/v2
+          kind: HelmRelease
+          metadata:
+            name: redis-flip
+          status:
+            (conditions[?type == 'Ready']):
+            - status: "True"
+    # 5m, not 2m: this assert measured 98s of a 120s budget on run
+    # 33608673237, and it is the third RedisFailover the group brings up in
+    # one namespace, behind two teardowns. The TLS test's equivalent took 44s.
+    - assert:
+        timeout: 5m
+        resource:
+          apiVersion: apps/v1
+          kind: StatefulSet
+          metadata:
+            name: rfr-redis-flip
+          status:
+            readyReplicas: 2
+
+  # Same object with tls.enabled added: Chainsaw applies it as an update to
+  # the Redis it created, so cleanup still owns it.
+  - name: flip-tls-on
+    try:
+    # Helm applies the objects it can before the RedisFailover is refused, so a
+    # failed run shows this release with a cert-manager chain and a projection
+    # of its own next to the rejection. They are inert without the listener,
+    # and Chainsaw's cleanup removes them with the rest.
+    - apply:
+        file: redis-flip-tls.yaml
+
+  # The apiserver refuses the RedisFailover change with the schema's own
+  # message, Helm's upgrade fails on it, and Flux reports that on the release.
+  - name: verify-flip-rejected
+    try:
+    - assert:
+        timeout: 3m
+        resource:
+          apiVersion: helm.toolkit.fluxcd.io/v2
+          kind: HelmRelease
+          metadata:
+            name: redis-flip
+          status:
+            (conditions[?type == 'Ready']):
+            - status: "False"
+            (length(conditions[?type == 'Ready' && contains(message, 'cannot be enabled or disabled on an existing RedisFailover')])): 1
+    # Nothing rolled: the pods still run the revision the plaintext install
+    # created, and both listeners are what they were.
+    - assert:
+        timeout: 1m
+        resource:
+          apiVersion: apps/v1
+          kind: StatefulSet
+          metadata:
+            name: rfr-redis-flip
+          status:
+            readyReplicas: 2
+            (currentRevision == updateRevision): true
+    - script:
+        timeout: 2m
+        content: |
+          set -eu
+
+          # Every kubectl below runs under a wall-clock bound. The inner
+          # `timeout` on a redis-cli cannot fire if the exec stream itself
+          # never establishes, and a kubectl still running holds this script's
+          # stdout open, which is what turns a stuck call into a silent run to
+          # the job ceiling instead of a failure.
+          k() { timeout 30 kubectl "$@"; }
+          # pinger: the operator's own ping-only ACL user, as in the TLS case.
+          # Both dials run under the container's `timeout`, for the reason the
+          # redis-tls script records above -- and here the TLS one is the whole
+          # point: there is no listener to answer it, so without an inner cap
+          # it blocks forever and hangs the suite instead of failing it.
+          pong=$(k -n "$NAMESPACE" exec rfr-redis-flip-0 -c redis -- \
+            timeout 15 redis-cli -h "rfr-redis-flip.$NAMESPACE.svc" -p 6379 \
+            --user pinger --pass pingpass --no-auth-warning ping) \
+            || pong='(no reply: redis-cli failed or hit the 15s cap)'
+          if [ "$pong" != "PONG" ]; then
+            echo "plaintext instance stopped answering after the rejected flip: $pong" >&2
+            exit 1
+          fi
+          # Expiry of that cap IS the refusal being asserted, and its only
+          # shape. The ClientHello reaches a plaintext listener as an inline
+          # command, which redis scans for a newline with strchr, and the
+          # handshake header carries a NUL byte ahead of anything random, so
+          # the scan ends before any newline, the server waits for a line
+          # that never completes and sends nothing, and redis-cli waits with
+          # it until the cap kills it: silent, exit 124. kubectl reports that
+          # code in its own trailer,
+          # and the trailer is what separates the cap that fired inside the
+          # pod from the k() cap firing outside it, since an exec that never
+          # reached redis-cli leaves none. So the verdict is that trailer,
+          # not the absence of PONG, which a missing pod, a 403 on exec, a
+          # wrong container name or a name that does not resolve would
+          # produce just as well. Those fail as states this check did not
+          # read, with what the dial printed.
+          rc=0
+          pong=$(k -n "$NAMESPACE" exec rfr-redis-flip-0 -c redis -- \
+            timeout 15 redis-cli --tls --insecure -h "rfr-redis-flip.$NAMESPACE.svc" -p 6379 \
+            --user pinger --pass pingpass --no-auth-warning ping 2>&1) || rc=$?
+          case "$pong" in
+            *PONG*)
+              echo "a TLS listener appeared on an instance whose flip was rejected" >&2
+              exit 1 ;;
+            *"command terminated with exit code 124"*) ;;
+            *)
+              echo "cannot determine whether a TLS listener is up (exit $rc): $pong" >&2
+              exit 1 ;;
+          esac
+        check:
+          ($error == null): true
+---
+apiVersion: chainsaw.kyverno.io/v1alpha1
+kind: Test
+metadata:
+  name: redis-2-backup-roundtrip
+spec:
+  # tenant-root, not the suite default tenant-test: the backup Job pushes to the
+  # in-cluster seaweedfs in tenant-root, and the e2e tenant-test is Cilium
+  # egress-isolated from it. run-all.sh provisions its own Bucket + Redis
+  # strategy + BackupClass; the run step overrides S3_ENDPOINT to the in-cluster
+  # seaweedfs because the Bucket's advertised external ingress URL is an
+  # unroutable placeholder in CI. The .svc FQDN is load-bearing: the driver's
+  # curl verifies TLS against the copied seaweedfs CA, whose SANs cover
+  # '*.tenant-root.svc', so the 2-label 'seaweedfs-s3.tenant-root' would not
+  # match — it must be 'seaweedfs-s3.tenant-root.svc'. It still needs the
+  # platform backups stack (backupstrategy-controller + the shipped
+  # cozy-default-redis strategy, whose client image the demo reuses).
+  namespace: tenant-root
+  skipDelete: true
+  catch:
+  - events: {}
+  - describe:
+      apiVersion: backups.cozystack.io/v1alpha1
+      kind: BackupJob
+  - describe:
+      apiVersion: backups.cozystack.io/v1alpha1
+      kind: RestoreJob
+  - describe:
+      apiVersion: strategy.backups.cozystack.io/v1alpha1
+      kind: Redis
+      name: redis-strategy-default
+  - podLogs:
+      selector: redis.strategy.backups.cozystack.io/mode
+      tail: 200
+  steps:
+  - name: run
+    try:
+    # Pre-clean so a stale Succeeded BackupJob from a prior run cannot satisfy
+    # the wait instantly. Idempotent; the catch cwd is the suite dir.
+    - script:
+        timeout: 8m
+        content: |
+          set -eu
+          cd ../../..
+          NAMESPACE="$NAMESPACE" examples/backups/redis/cleanup.sh
+        check:
+          ($error == null): true
+    # Honest round-trip: seed a sentinel key, back it up through this demo's own
+    # Bucket, restore it in place, then restore into a copy - asserting the exact
+    # bytes survive object storage each time (04 prints the to-copy success).
+    # 36m: sized with the 660s bucket HR wait in run-all.sh (convention 6:
+    # justified in-line).
+    - script:
+        timeout: 36m
+        content: |
+          set -eu
+          cd ../../..
+          [ -x examples/backups/redis/run-all.sh ] || { echo "examples/backups/redis/run-all.sh not found or not executable" >&2; exit 1; }
+          NAMESPACE="$NAMESPACE" S3_ENDPOINT="https://seaweedfs-s3.tenant-root.svc:8333" \
+            examples/backups/redis/run-all.sh
+        check:
+          ($error == null): true
+          (contains($stderr, 'To-copy restore verified')): true
+    finally:
+    - description: backup-flow cleanup
+      script:
+        timeout: 8m
+        content: |
+          set -eu
+          cd ../../..
+          NAMESPACE="$NAMESPACE" examples/backups/redis/cleanup.sh
diff --git a/hack/e2e-chainsaw/redis/redis-flip-tls.yaml b/hack/e2e-chainsaw/redis/redis-flip-tls.yaml
new file mode 100644
index 0000000000..bc8dbe710b
--- /dev/null
+++ b/hack/e2e-chainsaw/redis/redis-flip-tls.yaml
@@ -0,0 +1,14 @@
+apiVersion: apps.cozystack.io/v1alpha1
+kind: Redis
+metadata:
+  name: flip
+spec:
+  external: false
+  size: 1Gi
+  replicas: 2
+  storageClass: ""
+  authEnabled: true
+  resources: {}
+  resourcesPreset: "nano"
+  tls:
+    enabled: true
diff --git a/hack/e2e-chainsaw/redis/redis-flip.yaml b/hack/e2e-chainsaw/redis/redis-flip.yaml
new file mode 100644
index 0000000000..72f3c5a410
--- /dev/null
+++ b/hack/e2e-chainsaw/redis/redis-flip.yaml
@@ -0,0 +1,12 @@
+apiVersion: apps.cozystack.io/v1alpha1
+kind: Redis
+metadata:
+  name: flip
+spec:
+  external: false
+  size: 1Gi
+  replicas: 2
+  storageClass: ""
+  authEnabled: true
+  resources: {}
+  resourcesPreset: "nano"
diff --git a/hack/e2e-chainsaw/redis/redis-tls.yaml b/hack/e2e-chainsaw/redis/redis-tls.yaml
new file mode 100644
index 0000000000..1afce54b36
--- /dev/null
+++ b/hack/e2e-chainsaw/redis/redis-tls.yaml
@@ -0,0 +1,14 @@
+apiVersion: apps.cozystack.io/v1alpha1
+kind: Redis
+metadata:
+  name: secure
+spec:
+  external: false
+  size: 1Gi
+  replicas: 2
+  storageClass: ""
+  authEnabled: true
+  resources: {}
+  resourcesPreset: "nano"
+  tls:
+    enabled: true
diff --git a/hack/e2e-chainsaw/redis/redis.yaml b/hack/e2e-chainsaw/redis/redis.yaml
new file mode 100644
index 0000000000..85cf34f94f
--- /dev/null
+++ b/hack/e2e-chainsaw/redis/redis.yaml
@@ -0,0 +1,12 @@
+apiVersion: apps.cozystack.io/v1alpha1
+kind: Redis
+metadata:
+  name: test
+spec:
+  external: false
+  size: 1Gi
+  replicas: 2
+  storageClass: ""
+  authEnabled: true
+  resources: {}
+  resourcesPreset: "nano"
diff --git a/hack/e2e-chainsaw/seaweedfs/bucket.yaml b/hack/e2e-chainsaw/seaweedfs/bucket.yaml
new file mode 100644
index 0000000000..6fa03b271c
--- /dev/null
+++ b/hack/e2e-chainsaw/seaweedfs/bucket.yaml
@@ -0,0 +1,22 @@
+# Raw COSI objects rather than a Bucket application: a Bucket goes to the
+# instance its tenant names, which for the test namespace is tenant-root's.
+# The class names are the instance's namespace, set by the app chart's
+# cosi.bucketClassName.
+apiVersion: objectstorage.k8s.io/v1alpha1
+kind: BucketClaim
+metadata:
+  name: seaweedfs-resize
+spec:
+  bucketClassName: tenant-test
+  protocols:
+  - s3
+---
+apiVersion: objectstorage.k8s.io/v1alpha1
+kind: BucketAccess
+metadata:
+  name: seaweedfs-resize
+spec:
+  bucketAccessClassName: tenant-test
+  bucketClaimName: seaweedfs-resize
+  credentialsSecretName: seaweedfs-resize
+  protocol: s3
diff --git a/hack/e2e-chainsaw/seaweedfs/chainsaw-test.yaml b/hack/e2e-chainsaw/seaweedfs/chainsaw-test.yaml
new file mode 100644
index 0000000000..a282546012
--- /dev/null
+++ b/hack/e2e-chainsaw/seaweedfs/chainsaw-test.yaml
@@ -0,0 +1,320 @@
+# Lowering master.volumeSizeLimitMB on a live instance. Every volume at or
+# above the new limit leaves the master's writable set, so a bucket whose
+# volumes have all crossed it takes its next write only after a grow. Readiness
+# stays green through all of it; the failure is a PUT that times out while the
+# disk still has room, so the test ends on a write.
+#
+# 200 -> 20 stands in for the shipped 1000 -> 400: what matters is that a
+# bucket can be filled into the band between them, and at these numbers that
+# costs about a hundred megabytes rather than gigabytes.
+#
+# The same run checks the hand-off between the two SeaweedFS charts on the live
+# merge: the value set on the SeaweedFS resource must start the master, before
+# and after the change, with the growth counts the data-plane chart carries
+# still in place. hack/seaweedfs-chart-seam.bats checks the same hand-off by
+# rendering, on every pull request.
+apiVersion: chainsaw.kyverno.io/v1alpha1
+kind: Test
+metadata:
+  name: seaweedfs-resize
+spec:
+  # Uninstalling the instance runs the chart's post-delete Job, which removes
+  # the volume claims and the CNPG cluster behind the filer, so the delete
+  # waits on that Job as well as on the workloads.
+  timeouts:
+    cleanup: 10m
+  catch:
+  - events: {}
+  - describe:
+      apiVersion: helm.toolkit.fluxcd.io/v2
+      kind: HelmRelease
+      name: seaweedfs
+  - describe:
+      apiVersion: helm.toolkit.fluxcd.io/v2
+      kind: HelmRelease
+      name: seaweedfs-system
+  - describe:
+      apiVersion: apps/v1
+      kind: StatefulSet
+      name: seaweedfs-master
+  - podLogs:
+      selector: app.kubernetes.io/component=master
+      tail: 200
+  - description: master volume map
+    script:
+      timeout: 2m
+      content: |
+        set -u
+        echo "» master /vol/status (per server: Id, Collection, Size, ReadOnly):"
+        timeout 60 kubectl -n "$NAMESPACE" exec statefulset/seaweedfs-master -c seaweedfs -- \
+          curl -s --max-time 20 http://localhost:9333/vol/status \
+          || echo "» /vol/status read failed"
+        echo
+        exit 0
+  steps:
+  - name: create-instance
+    try:
+    - apply:
+        file: seaweedfs.yaml
+
+  - name: wait-instance-ready
+    try:
+    # 11m: the generated release carries the 10m install timeout every
+    # ApplicationDefinition gets unless it overrides it, and seaweedfs-rd does
+    # not; the extra minute is the start margin. The parent's install waits on
+    # the seaweedfs-system and seaweedfs-db releases it renders.
+    - assert:
+        timeout: 11m
+        resource:
+          apiVersion: helm.toolkit.fluxcd.io/v2
+          kind: HelmRelease
+          metadata:
+            name: seaweedfs
+          status:
+            (conditions[?type == 'Ready']):
+            - status: "True"
+    - assert:
+        resource:
+          apiVersion: apps/v1
+          kind: StatefulSet
+          metadata:
+            name: seaweedfs-master
+          spec:
+            template:
+              spec:
+                (containers[?name == 'seaweedfs']):
+                - (contains(command[2], '-volumeSizeLimitMB=200 ')): true
+                  (env[?starts_with(name, 'WEED_MASTER_VOLUME_GROWTH_')]):
+                  - name: WEED_MASTER_VOLUME_GROWTH_COPY_1
+                    value: "7"
+                  - name: WEED_MASTER_VOLUME_GROWTH_COPY_2
+                    value: "3"
+                  - name: WEED_MASTER_VOLUME_GROWTH_COPY_3
+                    value: "3"
+                  - name: WEED_MASTER_VOLUME_GROWTH_COPY_OTHER
+                    value: "1"
+
+  - name: create-bucket
+    try:
+    - apply:
+        file: bucket.yaml
+    - assert:
+        timeout: 2m
+        resource:
+          apiVersion: objectstorage.k8s.io/v1alpha1
+          kind: BucketClaim
+          metadata:
+            name: seaweedfs-resize
+          status:
+            bucketReady: true
+    - assert:
+        resource:
+          apiVersion: objectstorage.k8s.io/v1alpha1
+          kind: BucketAccess
+          metadata:
+            name: seaweedfs-resize
+          status:
+            accessGranted: true
+
+  # Write until every volume of the bucket's collection sits between the two
+  # limits. Each write goes to a volume picked at random, so a fixed amount
+  # leaves one short volume often enough, and that one volume keeps the bucket
+  # writable after the change and nothing is tested. Below 180 MiB, rather than
+  # 200, keeps the master from growing more volumes at the old limit, which it
+  # does once no writable volume is under nine tenths of it.
+  - name: fill-bucket-between-the-limits
+    try:
+    - script:
+        timeout: 5m
+        content: |
+          set -eu
+          # The op timeout kills only this shell, and an mc it leaves behind
+          # holds the op open past it (#4268). Every call below carries its own
+          # cap, and no write starts after this deadline: the last one, a size
+          # read and the pause after it still end inside the 5m.
+          deadline=$(( $(date +%s) + 190 ))
+          workdir=$(mktemp -d)
+          trap '[ -n "${pf_pid:-}" ] && kill "$pf_pid" 2>/dev/null || true; rm -rf "$workdir"' EXIT
+
+          k() { timeout 30 kubectl "$@"; }
+          k -n "$NAMESPACE" get secret seaweedfs-resize -o jsonpath='{.data.BucketInfo}' > "$workdir/info.b64"
+          base64 -d "$workdir/info.b64" > "$workdir/info.json"
+          ACCESS_KEY=$(jq -r '.spec.secretS3.accessKeyID // ""' "$workdir/info.json")
+          SECRET_KEY=$(jq -r '.spec.secretS3.accessSecretKey // ""' "$workdir/info.json")
+          BUCKET=$(jq -r '.spec.bucketName // ""' "$workdir/info.json")
+          if [ -z "$ACCESS_KEY" ] || [ -z "$SECRET_KEY" ] || [ -z "$BUCKET" ]; then
+            echo "premise broken: BucketInfo lacks the access key, secret key or bucket name" >&2
+            exit 1
+          fi
+
+          # Volume sizes as the master last heard them, one line per replica:
+          # "<id> <bytes>". The filer stores a bucket in the collection named
+          # after it.
+          sizes() {
+            k -n "$NAMESPACE" exec statefulset/seaweedfs-master -c seaweedfs -- \
+              curl -sf --max-time 20 http://localhost:9333/vol/status > "$workdir/vol.json"
+            jq -r --arg c "$BUCKET" \
+              '.Volumes.DataCenters[][][] | .[]? | select(.Collection == $c) | "\(.Id) \(.Size)"' \
+              "$workdir/vol.json"
+          }
+
+          kubectl port-forward service/seaweedfs-s3 -n "$NAMESPACE" 8334:8333 >/dev/null 2>&1 &
+          pf_pid=$!
+          timeout 30 sh -ec 'until nc -z localhost 8334; do sleep 1; done'
+          timeout 15 mc alias set swfs https://localhost:8334 "$ACCESS_KEY" "$SECRET_KEY" --insecure
+
+          # Incompressible, so the bytes written are the bytes stored.
+          head -c 4194304 /dev/urandom > "$workdir/chunk.bin"
+          low=$((24 * 1048576))
+          high=$((180 * 1048576))
+          n=0
+          while :; do
+            for _ in 1 2 3 4 5; do
+              if [ "$(date +%s)" -ge "$deadline" ]; then
+                echo "premise broken: out of time after $n writes with a volume still under 24 MiB" >&2
+                exit 1
+              fi
+              n=$((n + 1))
+              # 45s: the first write into a new bucket waits for its grow.
+              timeout 45 mc cp --insecure "$workdir/chunk.bin" "swfs/$BUCKET/fill-$n.bin" >/dev/null
+            done
+            # The master learns sizes from heartbeats, a few seconds apart.
+            # TODO(e2e-replace-fixed-timeouts): nothing reports a heartbeat as
+            # received, so the read waits out one interval.
+            sleep 6
+            sizes > "$workdir/sizes"
+            echo "» after $n writes of 4 MiB:"
+            cat "$workdir/sizes"
+            if [ ! -s "$workdir/sizes" ]; then
+              echo "premise broken: collection $BUCKET has no volume after $n writes; collections present:" >&2
+              jq -r '[.Volumes.DataCenters[][][] | .[]? | .Collection] | unique | .[]' "$workdir/vol.json" >&2
+              exit 1
+            fi
+            if awk -v h="$high" '$2 >= h { found = 1 } END { exit !found }' "$workdir/sizes"; then
+              echo "premise broken: a volume reached 180 MiB before every volume passed 24 MiB" >&2
+              exit 1
+            fi
+            if awk -v l="$low" '$2 < l { found = 1 } END { exit found }' "$workdir/sizes"; then
+              echo "» every volume of $BUCKET is between the limits"
+              exit 0
+            fi
+          done
+        check:
+          ($error == null): true
+
+  - name: lower-the-limit
+    try:
+    - patch:
+        resource:
+          apiVersion: apps.cozystack.io/v1alpha1
+          kind: SeaweedFS
+          metadata:
+            name: seaweedfs
+          spec:
+            master:
+              volumeSizeLimitMB: 20
+    # The change reaches the master only through two Helm upgrades, the
+    # parent's and seaweedfs-system's, and then a rollout of the master.
+    - assert:
+        timeout: 6m
+        resource:
+          apiVersion: apps/v1
+          kind: StatefulSet
+          metadata:
+            name: seaweedfs-master
+          spec:
+            template:
+              spec:
+                (containers[?name == 'seaweedfs']):
+                - (contains(command[2], '-volumeSizeLimitMB=20 ')): true
+                  (env[?starts_with(name, 'WEED_MASTER_VOLUME_GROWTH_')]):
+                  - name: WEED_MASTER_VOLUME_GROWTH_COPY_1
+                    value: "7"
+                  - name: WEED_MASTER_VOLUME_GROWTH_COPY_2
+                    value: "3"
+                  - name: WEED_MASTER_VOLUME_GROWTH_COPY_3
+                    value: "3"
+                  - name: WEED_MASTER_VOLUME_GROWTH_COPY_OTHER
+                    value: "1"
+          # Without the generation, the status of the previous template matches
+          # before the controller has seen the new one.
+          (status.observedGeneration == metadata.generation): true
+          status:
+            readyReplicas: 1
+            updatedReplicas: 1
+            (currentRevision == updateRevision): true
+    # Both upgrades have to have finished, not only the rollout they started,
+    # or cleanup lands on a release still upgrading. 11m clears the 10m install
+    # and upgrade timeouts of either release by the start margin.
+    - assert:
+        timeout: 11m
+        resource:
+          apiVersion: helm.toolkit.fluxcd.io/v2
+          kind: HelmRelease
+          metadata:
+            name: seaweedfs
+          (status.observedGeneration == metadata.generation): true
+          status:
+            (conditions[?type == 'Ready']):
+            - status: "True"
+    - assert:
+        timeout: 11m
+        resource:
+          apiVersion: helm.toolkit.fluxcd.io/v2
+          kind: HelmRelease
+          metadata:
+            name: seaweedfs-system
+          (status.observedGeneration == metadata.generation): true
+          status:
+            (conditions[?type == 'Ready']):
+            - status: "True"
+
+  # Every volume of the bucket is now over the limit, so this write lands only
+  # in a volume grown after the change. A volume under 20 MiB in the
+  # collection is that grow: none was under 24 MiB before it.
+  - name: write-after-lowering
+    try:
+    - script:
+        timeout: 5m
+        content: |
+          set -eu
+          workdir=$(mktemp -d)
+          trap '[ -n "${pf_pid:-}" ] && kill "$pf_pid" 2>/dev/null || true; rm -rf "$workdir"' EXIT
+
+          k() { timeout 30 kubectl "$@"; }
+          k -n "$NAMESPACE" get secret seaweedfs-resize -o jsonpath='{.data.BucketInfo}' > "$workdir/info.b64"
+          base64 -d "$workdir/info.b64" > "$workdir/info.json"
+          ACCESS_KEY=$(jq -r '.spec.secretS3.accessKeyID // ""' "$workdir/info.json")
+          SECRET_KEY=$(jq -r '.spec.secretS3.accessSecretKey // ""' "$workdir/info.json")
+          BUCKET=$(jq -r '.spec.bucketName // ""' "$workdir/info.json")
+          if [ -z "$ACCESS_KEY" ] || [ -z "$SECRET_KEY" ] || [ -z "$BUCKET" ]; then
+            echo "premise broken: BucketInfo lacks the access key, secret key or bucket name" >&2
+            exit 1
+          fi
+
+          kubectl port-forward service/seaweedfs-s3 -n "$NAMESPACE" 8334:8333 >/dev/null 2>&1 &
+          pf_pid=$!
+          timeout 30 sh -ec 'until nc -z localhost 8334; do sleep 1; done'
+          timeout 15 mc alias set swfs https://localhost:8334 "$ACCESS_KEY" "$SECRET_KEY" --insecure
+
+          # 90s: the master was just replaced, so the volume servers have to
+          # register with it before the grow this write needs can be placed.
+          echo "after lowering" > "$workdir/probe.txt"
+          timeout 90 mc cp --insecure "$workdir/probe.txt" "swfs/$BUCKET/probe.txt"
+          timeout 15 mc cat --insecure "swfs/$BUCKET/probe.txt" | grep -qx "after lowering"
+
+          # TODO(e2e-replace-fixed-timeouts): the new volume reaches /vol/status
+          # with the next heartbeat, and nothing reports that.
+          sleep 6
+          k -n "$NAMESPACE" exec statefulset/seaweedfs-master -c seaweedfs -- \
+            curl -sf --max-time 20 http://localhost:9333/vol/status > "$workdir/vol.json"
+          jq -r --arg c "$BUCKET" \
+            '.Volumes.DataCenters[][][] | .[]? | select(.Collection == $c) | "\(.Id) \(.Size)"' \
+            "$workdir/vol.json" > "$workdir/sizes"
+          cat "$workdir/sizes"
+          if ! awk -v l=$((20 * 1048576)) '$2 < l { found = 1 } END { exit !found }' "$workdir/sizes"; then
+            echo "FAIL: the write landed but $BUCKET grew no volume, so the master is not applying the lowered limit" >&2
+            exit 1
+          fi
+        check:
+          ($error == null): true
diff --git a/hack/e2e-chainsaw/seaweedfs/seaweedfs.yaml b/hack/e2e-chainsaw/seaweedfs/seaweedfs.yaml
new file mode 100644
index 0000000000..ee017ee709
--- /dev/null
+++ b/hack/e2e-chainsaw/seaweedfs/seaweedfs.yaml
@@ -0,0 +1,28 @@
+# A second instance, in the test namespace rather than beside tenant-root's:
+# the data-plane chart pins its workload names to `seaweedfs`, so two instances
+# cannot share a namespace. It is created directly rather than through the
+# tenant module, whose HelmRelease takes no values of its own, so the size
+# limit can be moved here without racing a parent.
+#
+# Sized down from the defaults to what the test needs. replicationFactor stays
+# at 2 on two volume servers, because that is the shape whose growth count
+# (COPY_2) the platform ships.
+apiVersion: apps.cozystack.io/v1alpha1
+kind: SeaweedFS
+metadata:
+  name: seaweedfs
+spec:
+  replicationFactor: 2
+  db:
+    replicas: 1
+    size: 1Gi
+  master:
+    replicas: 1
+    volumeSizeLimitMB: 200
+  filer:
+    replicas: 1
+  volume:
+    replicas: 2
+    size: 2Gi
+  s3:
+    replicas: 1
diff --git a/hack/e2e-chainsaw/securitygroup/chainsaw-test.yaml b/hack/e2e-chainsaw/securitygroup/chainsaw-test.yaml
new file mode 100644
index 0000000000..da8f4abe60
--- /dev/null
+++ b/hack/e2e-chainsaw/securitygroup/chainsaw-test.yaml
@@ -0,0 +1,195 @@
+# Chainsaw port of hack/e2e-apps/securitygroup.bats.
+#
+# Exercises the SecurityGroup membership model against a live cluster. Two
+# things unit tests cannot prove: that the in-tree CiliumNetworkPolicy mirror
+# (membership endpointSelector, app/SG peer selectors, attachments annotation)
+# round-trips against the real cilium.io/v2 CRD, and that the
+# securitygroup-controller actually stamps the membership label onto an
+# attached application's pods.
+#
+# Everything both Tests create is chainsaw-applied, so auto-cleanup reclaims
+# it even on mid-test failure — strictly better than the bats, which had no
+# teardown hook and leaked its fixtures on failure. The one operator-created
+# object (the backing CNP) is the same storage object as the tracked
+# SecurityGroup, so no finally block is needed anywhere.
+apiVersion: chainsaw.kyverno.io/v1alpha1
+kind: Test
+metadata:
+  name: securitygroup-projection
+spec:
+  catch:
+  - events: {}
+  - describe:
+      apiVersion: cilium.io/v2
+      kind: CiliumNetworkPolicy
+      name: sg-e2e
+  steps:
+  - name: create-securitygroup
+    try:
+    - apply:
+        file: securitygroup.yaml
+
+  - name: assert-backing-cnp
+    try:
+    # The backing CNP must materialise with the marker label, the group's own
+    # membership label as endpointSelector (the EMPTY value must round-trip
+    # against the real cilium.io/v2 CRD), fromApp projected to the three
+    # lineage labels, fromSG to the peer group's membership label (index
+    # order fromApp-then-fromSG is code-guaranteed by projectIngress), and
+    # the rule list translated 1:1 (port is a string in the CRD).
+    - assert:
+        timeout: 1m
+        resource:
+          apiVersion: cilium.io/v2
+          kind: CiliumNetworkPolicy
+          metadata:
+            name: sg-e2e
+            labels:
+              sdn.cozystack.io/securitygroup: "true"
+          spec:
+            endpointSelector:
+              matchLabels:
+                securitygroup.sdn.cozystack.io/sg-e2e: ""
+            (ingress[0].fromEndpoints[0].matchLabels):
+              apps.cozystack.io/application.group: apps.cozystack.io
+              apps.cozystack.io/application.kind: Kubernetes
+              apps.cozystack.io/application.name: web
+            (ingress[0].fromEndpoints[1].matchLabels):
+              securitygroup.sdn.cozystack.io/sg-frontend-e2e: ""
+            (ingress[0].toPorts[0].ports[0].port): "5432"
+            (ingress[0].toPorts[0].ports[0].protocol): TCP
+    # The attachments annotation is a JSON *string* on the backing policy —
+    # parsed with jq, exactly like the bats (no reliance on JMESPath JSON
+    # parsing in chainsaw v0.2.15).
+    - script:
+        timeout: 1m
+        content: |
+          set -eu
+          att=$(kubectl -n "$NAMESPACE" get ciliumnetworkpolicy sg-e2e \
+            -o jsonpath='{.metadata.annotations.sdn\.cozystack\.io/attachments}')
+          echo "$att" | jq -e '.[0].kind == "Postgres" and .[0].name == "db"' >/dev/null
+        check:
+          ($error == null): true
+
+  - name: assert-securitygroup-view
+    try:
+    # The SecurityGroup view reconstructs attachments and peers, and HIDES the
+    # internal marker label + storage annotation.
+    - assert:
+        timeout: 1m
+        resource:
+          apiVersion: sdn.cozystack.io/v1alpha1
+          kind: SecurityGroup
+          metadata:
+            name: sg-e2e
+          spec:
+            (attachments[0].kind): Postgres
+            (attachments[0].name): db
+            (ingress[0].fromApp[0].name): web
+            (ingress[0].fromSG[0]): sg-frontend-e2e
+          (metadata.labels."sdn.cozystack.io/securitygroup" == null): true
+          (metadata.annotations."sdn.cozystack.io/attachments" == null): true
+
+  - name: unmarked-cnp-invisible
+    try:
+    - apply:
+        file: plain-cnp.yaml
+    # The aggregated API filters by the marker label synchronously, so
+    # non-existence of the view is deterministic.
+    - error:
+        timeout: 30s
+        resource:
+          apiVersion: sdn.cozystack.io/v1alpha1
+          kind: SecurityGroup
+          metadata:
+            name: plain-cnp-e2e
+
+  - name: delete-propagates
+    try:
+    # Deleting the SecurityGroup removes its backing policy (the delete op
+    # waits for full disappearance of the view); the unmarked CNP survives.
+    - delete:
+        timeout: 1m
+        ref:
+          apiVersion: sdn.cozystack.io/v1alpha1
+          kind: SecurityGroup
+          name: sg-e2e
+    - error:
+        timeout: 1m
+        resource:
+          apiVersion: cilium.io/v2
+          kind: CiliumNetworkPolicy
+          metadata:
+            name: sg-e2e
+    - assert:
+        timeout: 30s
+        resource:
+          apiVersion: cilium.io/v2
+          kind: CiliumNetworkPolicy
+          metadata:
+            name: plain-cnp-e2e
+---
+apiVersion: chainsaw.kyverno.io/v1alpha1
+kind: Test
+metadata:
+  name: securitygroup-membership
+spec:
+  catch:
+  - events: {}
+  - describe:
+      apiVersion: v1
+      kind: Pod
+      name: sg-member-pod-e2e
+  - podLogs:
+      namespace: cozy-securitygroup-controller
+      selector: app=securitygroup-controller
+      tail: 100
+  steps:
+  - name: create-member-pod-and-securitygroup
+    try:
+    - apply:
+        file: member-pod.yaml
+    - apply:
+        file: securitygroup-member.yaml
+
+  - name: membership-label-stamped
+    try:
+    # The controller must stamp the membership label onto the member pod;
+    # the value is the empty string (reconciler sets pod.Labels[key] = "").
+    - assert:
+        timeout: 2m
+        resource:
+          apiVersion: v1
+          kind: Pod
+          metadata:
+            name: sg-member-pod-e2e
+            labels:
+              securitygroup.sdn.cozystack.io/sg-member-e2e: ""
+
+  - name: delete-clears-membership
+    try:
+    # Deleting the SecurityGroup while a pod is still a member must strip the
+    # membership label off that pod (the controller's finalizer runs before
+    # the backing policy is garbage-collected), leaving no orphaned label.
+    # This is the delete-with-members path, distinct from detach.
+    - delete:
+        timeout: 2m
+        ref:
+          apiVersion: sdn.cozystack.io/v1alpha1
+          kind: SecurityGroup
+          name: sg-member-e2e
+    - error:
+        timeout: 1m
+        resource:
+          apiVersion: cilium.io/v2
+          kind: CiliumNetworkPolicy
+          metadata:
+            name: sg-member-e2e
+    - assert:
+        timeout: 1m
+        resource:
+          apiVersion: v1
+          kind: Pod
+          metadata:
+            name: sg-member-pod-e2e
+          (metadata.labels."securitygroup.sdn.cozystack.io/sg-member-e2e" == null): true
diff --git a/hack/e2e-chainsaw/securitygroup/member-pod.yaml b/hack/e2e-chainsaw/securitygroup/member-pod.yaml
new file mode 100644
index 0000000000..0a0bd56efc
--- /dev/null
+++ b/hack/e2e-chainsaw/securitygroup/member-pod.yaml
@@ -0,0 +1,27 @@
+# A pod carrying the lineage labels of a managed application. The lineage
+# webhook skips it (managed-by is already set), so these labels are exactly
+# what the securitygroup-controller resolves the attachment to. The full
+# restricted-profile securityContext is required by tenant-test PSA.
+apiVersion: v1
+kind: Pod
+metadata:
+  name: sg-member-pod-e2e
+  labels:
+    internal.cozystack.io/managed-by-cozystack: "true"
+    apps.cozystack.io/application.group: apps.cozystack.io
+    apps.cozystack.io/application.kind: Postgres
+    apps.cozystack.io/application.name: sg-member-app
+spec:
+  securityContext:
+    runAsNonRoot: true
+    runAsUser: 65532
+    seccompProfile:
+      type: RuntimeDefault
+  containers:
+  - name: pause
+    image: registry.k8s.io/pause:3.9
+    securityContext:
+      allowPrivilegeEscalation: false
+      readOnlyRootFilesystem: true
+      capabilities:
+        drop: ["ALL"]
diff --git a/hack/e2e-chainsaw/securitygroup/plain-cnp.yaml b/hack/e2e-chainsaw/securitygroup/plain-cnp.yaml
new file mode 100644
index 0000000000..8776614029
--- /dev/null
+++ b/hack/e2e-chainsaw/securitygroup/plain-cnp.yaml
@@ -0,0 +1,17 @@
+apiVersion: cilium.io/v2
+kind: CiliumNetworkPolicy
+metadata:
+  name: plain-cnp-e2e
+spec:
+  endpointSelector:
+    matchLabels:
+      app: untouched
+  # A rule is mandatory: the CiliumNetworkPolicy CRD requires at least one of
+  # ingress/ingressDeny/egress/egressDeny (spec anyOf), so a selector-only
+  # policy is rejected at apply time. This keeps the fixture a valid, applyable
+  # CNP while leaving it unmarked (no securitygroup label) — so it must stay
+  # invisible to the SecurityGroup API.
+  ingress:
+  - fromEndpoints:
+    - matchLabels:
+        app: peer
diff --git a/hack/e2e-chainsaw/securitygroup/securitygroup-member.yaml b/hack/e2e-chainsaw/securitygroup/securitygroup-member.yaml
new file mode 100644
index 0000000000..0131b346d7
--- /dev/null
+++ b/hack/e2e-chainsaw/securitygroup/securitygroup-member.yaml
@@ -0,0 +1,8 @@
+apiVersion: sdn.cozystack.io/v1alpha1
+kind: SecurityGroup
+metadata:
+  name: sg-member-e2e
+spec:
+  attachments:
+  - kind: Postgres
+    name: sg-member-app
diff --git a/hack/e2e-chainsaw/securitygroup/securitygroup.yaml b/hack/e2e-chainsaw/securitygroup/securitygroup.yaml
new file mode 100644
index 0000000000..2ece24dfce
--- /dev/null
+++ b/hack/e2e-chainsaw/securitygroup/securitygroup.yaml
@@ -0,0 +1,22 @@
+# SecurityGroup created through the aggregated API (storage-backed by the
+# CiliumNetworkPolicy itself). It attaches to a managed application; the
+# backing endpointSelector is the group's own membership label, and peers are
+# expressed as fromApp/fromSG.
+apiVersion: sdn.cozystack.io/v1alpha1
+kind: SecurityGroup
+metadata:
+  name: sg-e2e
+spec:
+  attachments:
+  - kind: Postgres
+    name: db
+  ingress:
+  - fromApp:
+    - kind: Kubernetes
+      name: web
+    fromSG:
+    - sg-frontend-e2e
+    toPorts:
+    - ports:
+      - port: "5432"
+        protocol: TCP
diff --git a/hack/e2e-chainsaw/valkey/chainsaw-test.yaml b/hack/e2e-chainsaw/valkey/chainsaw-test.yaml
new file mode 100644
index 0000000000..0a914d5b6a
--- /dev/null
+++ b/hack/e2e-chainsaw/valkey/chainsaw-test.yaml
@@ -0,0 +1,145 @@
+# Chainsaw test for the managed Valkey app (mirrors the redis suite).
+apiVersion: chainsaw.kyverno.io/v1alpha1
+kind: Test
+metadata:
+  name: valkey
+spec:
+  catch:
+  - events: {}
+  - describe:
+      apiVersion: helm.toolkit.fluxcd.io/v2
+      kind: HelmRelease
+      name: valkey-test
+  - podLogs:
+      selector: app.kubernetes.io/instance=valkey-test
+      tail: 50
+  steps:
+  - name: create-valkey
+    try:
+    - apply:
+        file: valkey.yaml
+
+  - name: wait-helmrelease-ready
+    try:
+    # 11m: above the 600s install timeout cozystack-api gives this release;
+    # see "Sizing an HR-Ready budget" in docs/agents/e2e-testing.md.
+    - assert:
+        timeout: 11m
+        resource:
+          apiVersion: helm.toolkit.fluxcd.io/v2
+          kind: HelmRelease
+          metadata:
+            name: valkey-test
+          status:
+            (conditions[?type == 'Ready']):
+            - status: "True"
+
+  - name: verify-storage-and-workloads
+    try:
+    # replicas: 2 provisions two StatefulSet-templated PVCs — verify both.
+    # The operator keeps the redisfailover-* resource naming regardless of the
+    # Valkey engine image, so these names match the redis suite.
+    - assert:
+        timeout: 2m
+        resource:
+          apiVersion: v1
+          kind: PersistentVolumeClaim
+          metadata:
+            name: redisfailover-persistent-data-rfr-valkey-test-0
+          status:
+            phase: Bound
+    - assert:
+        timeout: 2m
+        resource:
+          apiVersion: v1
+          kind: PersistentVolumeClaim
+          metadata:
+            name: redisfailover-persistent-data-rfr-valkey-test-1
+          status:
+            phase: Bound
+    - assert:
+        timeout: 2m
+        resource:
+          apiVersion: apps/v1
+          kind: Deployment
+          metadata:
+            name: rfs-valkey-test
+          status:
+            (conditions[?type == 'Available']):
+            - status: "True"
+    - assert:
+        timeout: 2m
+        resource:
+          apiVersion: apps/v1
+          kind: StatefulSet
+          metadata:
+            name: rfr-valkey-test
+          status:
+            readyReplicas: 2
+---
+apiVersion: chainsaw.kyverno.io/v1alpha1
+kind: Test
+metadata:
+  name: valkey-backup-roundtrip
+spec:
+  # The Redis backup round-trip (redis-2-backup-roundtrip) run against a Valkey
+  # app: Valkey shares the RedisFailover operator and the Redis strategy, so the
+  # same demo drives it with APP_KIND=Valkey. tenant-root and the .svc
+  # S3_ENDPOINT for the same reasons as there: tenant-test is egress-isolated
+  # from tenant-root's seaweedfs, and the seaweedfs serving cert's SANs cover
+  # 'seaweedfs-s3.tenant-root.svc'. The app names differ from the redis
+  # round-trip's so neither suite's leftovers can satisfy the other's waits.
+  namespace: tenant-root
+  skipDelete: true
+  catch:
+  - events: {}
+  - describe:
+      apiVersion: backups.cozystack.io/v1alpha1
+      kind: BackupJob
+  - describe:
+      apiVersion: backups.cozystack.io/v1alpha1
+      kind: RestoreJob
+  - describe:
+      apiVersion: strategy.backups.cozystack.io/v1alpha1
+      kind: Redis
+      name: redis-strategy-default
+  - podLogs:
+      selector: redis.strategy.backups.cozystack.io/mode
+      tail: 200
+  steps:
+  - name: run
+    try:
+    # Pre-clean so a stale Succeeded BackupJob from a prior run cannot satisfy
+    # the wait instantly. Idempotent; the catch cwd is the suite dir.
+    - script:
+        timeout: 8m
+        content: |
+          set -eu
+          cd ../../..
+          APP_KIND=Valkey REDIS_NAME=valkey-bkp REDIS_RESTORE_NAME=valkey-bkp-copy \
+            NAMESPACE="$NAMESPACE" examples/backups/redis/cleanup.sh
+        check:
+          ($error == null): true
+    # 36m: sized with the 660s bucket HR wait in run-all.sh, as in the redis
+    # round-trip.
+    - script:
+        timeout: 36m
+        content: |
+          set -eu
+          cd ../../..
+          [ -x examples/backups/redis/run-all.sh ] || { echo "examples/backups/redis/run-all.sh not found or not executable" >&2; exit 1; }
+          APP_KIND=Valkey REDIS_NAME=valkey-bkp REDIS_RESTORE_NAME=valkey-bkp-copy \
+            NAMESPACE="$NAMESPACE" S3_ENDPOINT="https://seaweedfs-s3.tenant-root.svc:8333" \
+            examples/backups/redis/run-all.sh
+        check:
+          ($error == null): true
+          (contains($stderr, 'To-copy restore verified')): true
+    finally:
+    - description: backup-flow cleanup
+      script:
+        timeout: 8m
+        content: |
+          set -eu
+          cd ../../..
+          APP_KIND=Valkey REDIS_NAME=valkey-bkp REDIS_RESTORE_NAME=valkey-bkp-copy \
+            NAMESPACE="$NAMESPACE" examples/backups/redis/cleanup.sh
diff --git a/hack/e2e-chainsaw/valkey/valkey.yaml b/hack/e2e-chainsaw/valkey/valkey.yaml
new file mode 100644
index 0000000000..c207341ac3
--- /dev/null
+++ b/hack/e2e-chainsaw/valkey/valkey.yaml
@@ -0,0 +1,12 @@
+apiVersion: apps.cozystack.io/v1alpha1
+kind: Valkey
+metadata:
+  name: test
+spec:
+  external: false
+  size: 1Gi
+  replicas: 2
+  storageClass: ""
+  authEnabled: true
+  resources: {}
+  resourcesPreset: "nano"
diff --git a/hack/e2e-chainsaw/vminstance/chainsaw-test.yaml b/hack/e2e-chainsaw/vminstance/chainsaw-test.yaml
new file mode 100644
index 0000000000..691d45302c
--- /dev/null
+++ b/hack/e2e-chainsaw/vminstance/chainsaw-test.yaml
@@ -0,0 +1,743 @@
+# Chainsaw port of hack/e2e-apps/vminstance.bats. Scenarios: a standalone
+# VMDisk, a VMDisk whose import can never finish, VMDisks cloned from a golden
+# image and from another disk, and a VMInstance booting from its own VMDisk. The
+# first and the last download the Ubuntu noble cloud image, so the readiness
+# timeouts are generous. Chainsaw deletes the CRs it applied at cleanup.
+apiVersion: chainsaw.kyverno.io/v1alpha1
+kind: Test
+metadata:
+  name: vmdisk
+spec:
+  catch:
+  - events: {}
+  - describe:
+      apiVersion: helm.toolkit.fluxcd.io/v2
+      kind: HelmRelease
+      name: vm-disk-test
+  steps:
+  - name: create-vmdisk
+    try:
+    - apply:
+        file: vmdisk.yaml
+  - name: wait-vmdisk-ready
+    try:
+    - assert:
+        timeout: 11m
+        resource:
+          apiVersion: cdi.kubevirt.io/v1beta1
+          kind: DataVolume
+          metadata:
+            name: vm-disk-test
+          status:
+            (conditions[?type == 'Ready']):
+            - status: "True"
+    - assert:
+        timeout: 2m
+        resource:
+          apiVersion: apps.cozystack.io/v1alpha1
+          kind: VMDisk
+          metadata:
+            name: test
+          status:
+            (conditions[?type == 'Ready']):
+            - status: "True"
+            (conditions[?type == 'WorkloadsReady']):
+            - status: "True"
+---
+apiVersion: chainsaw.kyverno.io/v1alpha1
+kind: Test
+metadata:
+  name: vmdisk-unreachable
+spec:
+  catch:
+  - events: {}
+  - describe:
+      apiVersion: cdi.kubevirt.io/v1beta1
+      kind: DataVolume
+      name: vm-disk-unreachable
+  steps:
+  - name: create-vmdisk
+    try:
+    - apply:
+        file: vmdisk-unreachable.yaml
+  # Checks that a disk whose import cannot complete has a Ready release and
+  # is reported not operational. A DataVolume that has not started yet is not
+  # operational either, so the VMDisk assert follows the importer's first
+  # failure: CDI reports it as Running=False with the terminated container's
+  # reason, Error.
+  - name: wait-workloads-not-ready
+    try:
+    - assert:
+        timeout: 6m
+        resource:
+          apiVersion: cdi.kubevirt.io/v1beta1
+          kind: DataVolume
+          metadata:
+            name: vm-disk-unreachable
+          status:
+            (conditions[?type == 'Running']):
+            - status: "False"
+              reason: Error
+    - assert:
+        timeout: 2m
+        resource:
+          apiVersion: apps.cozystack.io/v1alpha1
+          kind: VMDisk
+          metadata:
+            name: unreachable
+          status:
+            (conditions[?type == 'Ready']):
+            - status: "True"
+            (conditions[?type == 'WorkloadsReady']):
+            - status: "False"
+              reason: DataVolumeNotReady
+---
+# VMDisk clone paths: source.image clones a golden image from cozy-public, and
+# source.disk clones that disk in turn, so only the golden image downloads.
+apiVersion: chainsaw.kyverno.io/v1alpha1
+kind: Test
+metadata:
+  name: vmdisk-clone
+spec:
+  catch:
+  - events: {}
+  - events:
+      namespace: cozy-public
+  - describe:
+      apiVersion: cdi.kubevirt.io/v1beta1
+      kind: DataVolume
+  - describe:
+      apiVersion: cdi.kubevirt.io/v1beta1
+      kind: DataVolume
+      namespace: cozy-public
+      name: vm-default-images-e2e-alpine-3.21
+  - describe:
+      apiVersion: helm.toolkit.fluxcd.io/v2
+      kind: HelmRelease
+  steps:
+  - name: create-golden-image
+    try:
+    - apply:
+        file: golden-image.yaml
+    - assert:
+        timeout: 10m
+        resource:
+          apiVersion: cdi.kubevirt.io/v1beta1
+          kind: DataVolume
+          metadata:
+            name: vm-default-images-e2e-alpine-3.21
+            namespace: cozy-public
+          status:
+            (conditions[?type == 'Ready']):
+            - status: "True"
+  - name: clone-from-image
+    try:
+    - apply:
+        file: vmdisk-image-clone.yaml
+    # The vm-disk release goes Ready as soon as the DataVolume exists, so this
+    # assert is the one that waits for the clone itself.
+    - assert:
+        timeout: 10m
+        resource:
+          apiVersion: cdi.kubevirt.io/v1beta1
+          kind: DataVolume
+          metadata:
+            name: vm-disk-image-clone
+          spec:
+            source:
+              pvc:
+                name: vm-default-images-e2e-alpine-3.21
+                namespace: cozy-public
+          status:
+            (conditions[?type == 'Ready']):
+            - status: "True"
+    # CDI derives Ready from the DataVolume phase alone, and can reach
+    # Succeeded from the PVC's annotations before the claim itself binds.
+    - assert:
+        timeout: 2m
+        resource:
+          apiVersion: v1
+          kind: PersistentVolumeClaim
+          metadata:
+            name: vm-disk-image-clone
+          status:
+            phase: Bound
+    - assert:
+        timeout: 2m
+        resource:
+          apiVersion: apps.cozystack.io/v1alpha1
+          kind: VMDisk
+          metadata:
+            name: image-clone
+          status:
+            (conditions[?type == 'Ready']):
+            - status: "True"
+            (conditions[?type == 'WorkloadsReady']):
+            - status: "True"
+  - name: clone-from-disk
+    try:
+    - apply:
+        file: vmdisk-disk-clone.yaml
+    - assert:
+        timeout: 10m
+        resource:
+          apiVersion: cdi.kubevirt.io/v1beta1
+          kind: DataVolume
+          metadata:
+            name: vm-disk-disk-clone
+          spec:
+            source:
+              pvc:
+                name: vm-disk-image-clone
+                namespace: ($namespace)
+          status:
+            (conditions[?type == 'Ready']):
+            - status: "True"
+    - assert:
+        timeout: 2m
+        resource:
+          apiVersion: v1
+          kind: PersistentVolumeClaim
+          metadata:
+            name: vm-disk-disk-clone
+          status:
+            phase: Bound
+    - assert:
+        timeout: 2m
+        resource:
+          apiVersion: apps.cozystack.io/v1alpha1
+          kind: VMDisk
+          metadata:
+            name: disk-clone
+          status:
+            (conditions[?type == 'Ready']):
+            - status: "True"
+            (conditions[?type == 'WorkloadsReady']):
+            - status: "True"
+---
+apiVersion: chainsaw.kyverno.io/v1alpha1
+kind: Test
+metadata:
+  name: vminstance
+spec:
+  catch:
+  - events: {}
+  - describe:
+      apiVersion: helm.toolkit.fluxcd.io/v2
+      kind: HelmRelease
+      name: vm-instance-test
+  - describe:
+      apiVersion: kubevirt.io/v1
+      kind: VirtualMachineInstance
+      name: vm-instance-test
+  steps:
+  - name: create-vmdisk
+    try:
+    - apply:
+        file: vmdisk-vmi.yaml
+    - assert:
+        timeout: 11m
+        resource:
+          apiVersion: cdi.kubevirt.io/v1beta1
+          kind: DataVolume
+          metadata:
+            name: vm-disk-vmi-test
+          status:
+            (conditions[?type == 'Ready']):
+            - status: "True"
+    - assert:
+        timeout: 2m
+        resource:
+          apiVersion: apps.cozystack.io/v1alpha1
+          kind: VMDisk
+          metadata:
+            name: vmi-test
+          status:
+            (conditions[?type == 'Ready']):
+            - status: "True"
+            (conditions[?type == 'WorkloadsReady']):
+            - status: "True"
+  - name: create-vminstance
+    try:
+    - apply:
+        file: vminstance.yaml
+    # No install-timeout floor to clear: vm-instance-rd disables the install
+    # wait, so this release goes Ready once helm has applied.
+    - assert:
+        timeout: 6m
+        resource:
+          apiVersion: helm.toolkit.fluxcd.io/v2
+          kind: HelmRelease
+          metadata:
+            name: vm-instance-test
+          status:
+            (conditions[?type == 'Ready']):
+            - status: "True"
+  - name: wait-vm-running
+    try:
+    # Nested KubeVirt startup (virt-launcher + libvirt + cloud-init DHCP) takes
+    # 30-60s; allow a generous bound for the IP to appear, then VM Ready.
+    - assert:
+        timeout: 5m
+        resource:
+          apiVersion: kubevirt.io/v1
+          kind: VirtualMachineInstance
+          metadata:
+            name: vm-instance-test
+          (status.interfaces[0].ipAddress != null): true
+    - assert:
+        timeout: 5m
+        resource:
+          apiVersion: kubevirt.io/v1
+          kind: VirtualMachine
+          metadata:
+            name: vm-instance-test
+          status:
+            (conditions[?type == 'Ready']):
+            - status: "True"
+  - name: dry-run-evict-launcher
+    try:
+    # virt-api stamps the cluster evictionStrategy into the VMI spec at
+    # creation, and the eviction webhook reads it from there. virt-handler
+    # publishes LiveMigratable once it has synced the domain; under
+    # LiveMigrateIfPossible that condition is what splits the webhook's answer.
+    - assert:
+        resource:
+          apiVersion: kubevirt.io/v1
+          kind: VirtualMachineInstance
+          metadata:
+            name: vm-instance-test
+          spec:
+            evictionStrategy: LiveMigrateIfPossible
+          status:
+            (conditions[?type == 'LiveMigratable']):
+            - type: LiveMigratable
+    # dryRun=All still runs the eviction webhook (sideEffects NoneOnDryRun) and
+    # deletes nothing. Under LiveMigrateIfPossible a migratable VMI is refused
+    # with 429 and the webhook's evacuation message, which a drain retries while
+    # the VM migrates away; a non-migratable one is let through. On the PR
+    # lane post-install prep pins StorageProfile/local to RWO, so there the
+    # VMI is not migratable.
+    - script:
+        timeout: 1m
+        content: |
+          set -eu
+          vmi=vm-instance-test
+          vmi_json=$(kubectl -n "$NAMESPACE" get vmi "$vmi" -o json)
+          uid=$(printf '%s\n' "$vmi_json" | jq -r '.metadata.uid')
+          migratable=$(printf '%s\n' "$vmi_json" | jq -r '[.status.conditions[] | select(.type == "LiveMigratable") | .status] | if length == 1 then .[0] else "ambiguous" end')
+          pods=$(kubectl -n "$NAMESPACE" get pods -l "kubevirt.io=virt-launcher,kubevirt.io/created-by=$uid" --field-selector status.phase=Running -o json)
+          if [ "$(printf '%s\n' "$pods" | jq '.items | length')" != 1 ]; then
+            echo "FAIL: expected exactly one Running launcher pod for VMI $vmi" >&2
+            printf '%s\n' "$pods" | jq -r '.items[] | .metadata.name + " " + .status.phase' >&2
+            exit 1
+          fi
+          pod=$(printf '%s\n' "$pods" | jq -r '.items[0].metadata.name')
+          pod_uid=$(printf '%s\n' "$pods" | jq -r '.items[0].metadata.uid')
+
+          eviction=$(jq -cn --arg name "$pod" --arg ns "$NAMESPACE" \
+            '{apiVersion: "policy/v1", kind: "Eviction", metadata: {name: $name, namespace: $ns}}')
+          err_file=$(mktemp)
+          trap 'rm -f "$err_file"' EXIT
+          if out=$(printf '%s\n' "$eviction" | kubectl create --raw "/api/v1/namespaces/$NAMESPACE/pods/$pod/eviction?dryRun=All" -f - 2>"$err_file"); then
+            allowed=true
+          else
+            allowed=false
+          fi
+          err=$(cat "$err_file")
+          echo "LiveMigratable=$migratable eviction-allowed=$allowed"
+          printf '%s\n' "response: $out"
+          printf '%s\n' "stderr: $err"
+
+          case "$migratable" in
+          True)
+            if [ "$allowed" = true ]; then
+              echo "FAIL: dry-run eviction of migratable VMI $vmi was allowed; the webhook should refuse it and start an evacuation" >&2
+              exit 1
+            fi
+            if ! printf '%s\n' "$err" | grep -Fq "Eviction triggered evacuation of VMI \"$NAMESPACE/$vmi\""; then
+              echo "FAIL: the refusal did not come from the KubeVirt evacuation path" >&2
+              exit 1
+            fi
+            ;;
+          False)
+            if [ "$allowed" != true ]; then
+              echo "FAIL: dry-run eviction of non-migratable VMI $vmi was refused; LiveMigrateIfPossible should let it through" >&2
+              exit 1
+            fi
+            if ! printf '%s\n' "$out" | jq -e '.kind == "Status" and .status == "Success"' >/dev/null 2>&1; then
+              echo "FAIL: the eviction returned without a Success status" >&2
+              exit 1
+            fi
+            ;;
+          *)
+            echo "FAIL: VMI $vmi LiveMigratable condition is '$migratable', expected True or False" >&2
+            exit 1
+            ;;
+          esac
+
+          if ! kubectl -n "$NAMESPACE" get pod "$pod" -o json |
+            jq -e --arg uid "$pod_uid" '.metadata.uid == $uid and .metadata.deletionTimestamp == null' >/dev/null; then
+            echo "FAIL: launcher pod $pod was deleted or replaced by a dry-run eviction" >&2
+            exit 1
+          fi
+          if ! kubectl -n "$NAMESPACE" get vmi "$vmi" -o json |
+            jq -e '(.status.evacuationNodeName // "") == ""' >/dev/null; then
+            echo "FAIL: a dry-run eviction recorded an evacuation on VMI $vmi" >&2
+            exit 1
+          fi
+---
+# vminstance-2-backup-roundtrip — REAL Velero backup/restore round-trip for a
+# booted VMInstance, run un-gated in CI on a deliberately tiny VM.
+#
+# This is the in-CI proof of the cozy-default-velero-vminstance path: a running
+# VM's disk is CSI-snapshotted, moved to S3 by Velero's data mover (kopia), and
+# restored in place — after which the VM boots again. Booting does not tell a
+# restored disk from a blank one; the proof is on the disk PVC: a new uid,
+# Velero's restore-name label and the -orig- PVC the rename leaves behind.
+# It drives the validated example (examples/backups/vmi/run-all.sh) so the demo
+# and the test can never drift.
+#
+# Kept light enough for kind: a cirros guest (~20MB image, instanceProfile
+# cirros) on the smallest instance type (u1.nano = 1 vCPU / 512Mi) with a 2Gi
+# disk, and SKIP_RESTORE_TO_COPY=1 so only the in-place restore runs (the
+# cross-namespace to-copy restore stands up a second full VM — too heavy for CI
+# and redundant for proving the round-trip). cirros has no qemu-guest-agent, so
+# Velero takes a crash-consistent snapshot without a filesystem freeze, which is
+# fine for exercising the mechanics.
+#
+# S3 target: like vmdisk-2-backup-roundtrip, the harness stands up a throwaway
+# BSL cozy-e2e-vmi at the IN-CLUSTER seaweedfs endpoint (the platform
+# cozy-default BSL derives the external ingress endpoint, unroutable in kind)
+# with insecureSkipTLSVerify + checksumAlgorithm="" (the cozystack#3236 fixes),
+# reusing the platform bucket + cozy-backups-creds. Runs in tenant-root so the
+# data-mover DataUpload Pods reach seaweedfs over same-tenant egress.
+#
+# Teardown is explicit (skipDelete: true): cleanup.sh prunes the cluster-scoped
+# BackupClass/strategies and the cozy-velero Velero Backup/Restore, and the
+# harness deletes the throwaway BSL.
+apiVersion: chainsaw.kyverno.io/v1alpha1
+kind: Test
+metadata:
+  name: vminstance-2-backup-roundtrip
+spec:
+  namespace: tenant-root
+  skipDelete: true
+  catch:
+  - events: {}
+  - describe:
+      apiVersion: helm.toolkit.fluxcd.io/v2
+      kind: HelmRelease
+      name: vm-instance-test
+  - describe:
+      apiVersion: kubevirt.io/v1
+      kind: VirtualMachineInstance
+      name: vm-instance-test
+  - describe:
+      apiVersion: backups.cozystack.io/v1alpha1
+      kind: BackupJob
+  - describe:
+      apiVersion: backups.cozystack.io/v1alpha1
+      kind: RestoreJob
+  - describe:
+      apiVersion: backups.cozystack.io/v1alpha1
+      kind: Backup
+  - describe:
+      apiVersion: velero.io/v1
+      kind: Restore
+      namespace: cozy-velero
+  - describe:
+      apiVersion: velero.io/v2alpha1
+      kind: DataDownload
+      namespace: cozy-velero
+  - describe:
+      apiVersion: velero.io/v2alpha1
+      kind: DataUpload
+      namespace: cozy-velero
+  # Velero server + node-agent (the CSI data mover) run in cozy-velero; a failed
+  # upload or a TLS handshake against seaweedfs leaves its error only there.
+  - podLogs:
+      namespace: cozy-velero
+      selector: app.kubernetes.io/name=velero
+      tail: 200
+  steps:
+  - name: run
+    try:
+    # 40m budget: build the in-cluster BSL, import the tiny cirros image + boot
+    # the VM, a CSI-snapshot data-mover backup to S3, and an in-place restore
+    # with a second boot — all fast on a 2Gi cirros guest (realistic ~15m). BSL
+    # setup is in this step (not a separate one) so the finally below always tears
+    # the BSL down, even if setup fails. run-all.sh is `set -e` and fails fast on
+    # a terminal BackupJob/RestoreJob phase. The script waits are bounded (the
+    # IMPORT/BOOT/BACKUP/RESTORE_WAIT values below plus fixed ones in the example
+    # scripts) so their worst-case sum stays under this op timeout, and a hung
+    # wait trips the script's own named "Timeout waiting for ..." rather than a
+    # bare `signal: killed` (docs/agents/e2e-testing.md). Sized small on purpose:
+    # this suite is execution.parallel:1 and shares the job's 215m cap with every
+    # other Test in it and their finally blocks — an oversized op timeout lets the
+    # job cap fire first and lose the report before any op timeout can.
+    - script:
+        timeout: 40m
+        content: |
+          set -eu
+          # Build the in-cluster BSL the example will target (reuse the platform
+          # bucket read off cozy-default + cozy-backups-creds).
+          echo "Waiting for the platform cozy-default BSL to expose its bucket name..."
+          timeout 180 sh -ec 'until kubectl -n cozy-velero get bsl cozy-default -o jsonpath="{.spec.objectStorage.bucket}" 2>/dev/null | grep -q .; do sleep 5; done'
+          BUCKET=$(kubectl -n cozy-velero get bsl cozy-default -o jsonpath='{.spec.objectStorage.bucket}')
+          REGION=$(kubectl -n cozy-velero get bsl cozy-default -o jsonpath='{.spec.config.region}')
+          [ -n "$REGION" ] || REGION=us-east-1
+          echo "Platform bucket: $BUCKET (region $REGION)"
+          kubectl apply -f - <<YAML
+          apiVersion: velero.io/v1
+          kind: BackupStorageLocation
+          metadata:
+            name: cozy-e2e-vmi
+            namespace: cozy-velero
+            labels:
+              cozystack.io/e2e: vminstance-backup
+          spec:
+            provider: aws
+            default: false
+            objectStorage:
+              bucket: "$BUCKET"
+              prefix: velero-e2e-vmi
+            credential:
+              name: cozy-backups-creds
+              key: cloud
+            config:
+              region: "$REGION"
+              s3ForcePathStyle: "true"
+              s3Url: https://seaweedfs-s3.tenant-root.svc.cozy.local:8333
+              insecureSkipTLSVerify: "true"
+              checksumAlgorithm: ""
+          YAML
+          echo "Waiting for BSL cozy-e2e-vmi to validate Available..."
+          timeout 180 sh -ec 'until [ "$(kubectl -n cozy-velero get bsl cozy-e2e-vmi -o jsonpath="{.status.phase}" 2>/dev/null)" = "Available" ]; do sleep 5; done'
+          kubectl -n cozy-velero get bsl cozy-e2e-vmi
+
+          cd ../../..
+          [ -x examples/backups/vmi/run-all.sh ] || { echo "vmi backup example scripts not found at examples/backups/vmi" >&2; exit 1; }
+          # Tiny VM: cirros guest on u1.nano with a 2Gi disk; in-place restore only.
+          # storageClass tracks the lane (COZY_E2E_STORAGE_CLASS, 'local' on the
+          # DRBD-off PR gate); 'replicated' is unrenderable there and never binds.
+          # Waits bounded well under the 40m op timeout above so a hung wait trips
+          # the script's named fail-fast, not Chainsaw's killer.
+          NAMESPACE="$NAMESPACE" BACKUP_STORAGE_LOCATION=cozy-e2e-vmi \
+            VMI_DISK_STORAGE_CLASS="${COZY_E2E_STORAGE_CLASS:-replicated}" \
+            VMI_IMAGE_URL=https://download.cirros-cloud.net/0.6.2/cirros-0.6.2-x86_64-disk.img \
+            VMI_DISK_STORAGE=2Gi VMI_INSTANCE_PROFILE=cirros VMI_INSTANCE_TYPE=u1.nano \
+            SKIP_RESTORE_TO_COPY=1 \
+            IMPORT_WAIT=240 VMI_BOOT_WAIT=180 BACKUP_WAIT=300 RESTORE_WAIT=240 \
+            examples/backups/vmi/run-all.sh
+        check:
+          ($error == null): true
+    finally:
+    # Prune everything the harness created — the example cleanup (cluster-scoped
+    # BackupClass/strategies, namespaced BackupJob/RestoreJob/Backup which cascade
+    # to the Velero Backup/Restore in cozy-velero, the VMInstance/VMDisk), then
+    # the throwaway BSL. Has teeth — a teardown that does not settle fails the step.
+    - description: vmi backup-flow cleanup
+      script:
+        timeout: 15m
+        content: |
+          set -eu
+          cd ../../..
+          # Always tear down the harness-owned BSL, but keep a cleanup.sh failure
+          # fatal (convention 4): capture its rc, then tear down, then re-raise.
+          rc=0
+          NAMESPACE="$NAMESPACE" examples/backups/vmi/cleanup.sh || rc=$?
+          # cleanup.sh deletes the cozystack Backup, whose finalizer asks Velero to
+          # delete the Velero Backup asynchronously. Deleting the BSL before that
+          # finishes makes Velero fail the DeleteBackupRequest ("backup storage
+          # location not found") and orphan the Velero Backup and its S3 objects.
+          # Drain the Velero Backups on this BSL first, then delete it. Branch on
+          # kubectl's exit status, not on empty stdout: a 403/timeout also yields
+          # no lines and must not read as "drained" (that would delete the BSL
+          # under the finalizer and orphan the objects this exists to protect).
+          timeout 180 sh -ec '
+            while out=$(kubectl -n cozy-velero get backups.velero.io \
+                -o custom-columns=BSL:.spec.storageLocation --no-headers); do
+              printf "%s\n" "$out" | grep -qx cozy-e2e-vmi || exit 0
+              sleep 5
+            done
+            exit 3' && drain_rc=0 || drain_rc=$?
+          if [ "$drain_rc" != 0 ]; then
+            echo "error: Velero backups on cozy-e2e-vmi not confirmed drained (rc=$drain_rc); keeping the BSL so they are not orphaned" >&2
+            exit 1
+          fi
+          kubectl -n cozy-velero delete bsl cozy-e2e-vmi --ignore-not-found
+          exit "$rc"
+---
+# vmdisk-2-backup-roundtrip — REAL Velero backup/restore round-trip for a
+# standalone VMDisk, run un-gated in CI. This is the in-CI proof that the
+# cozy-default-velero-vmdisk path works end to end: a CSI VolumeSnapshot of the
+# LINSTOR block disk (the lane's storage class, 'local' on the DRBD-off PR gate),
+# moved to S3 by Velero's data mover (kopia), then restored back to a Bound disk.
+#
+# This is the disk-only companion to vminstance-2-backup-roundtrip above: same
+# Velero + CSI-data-mover + S3 machinery, but it captures only HelmRelease + PVC
+# (+ configmaps) with no VM at all — no nested boot, no guest-agent freeze — so
+# it isolates the block-volume backup path from anything VM-specific. Both run
+# un-gated in CI now.
+#
+# S3 target: the platform cozy-default BSL derives the EXTERNAL S3 ingress
+# endpoint, which is an unroutable placeholder inside kind (the same reason the
+# postgres round-trip targets the in-cluster endpoint). So the harness stands up
+# a throwaway BSL `cozy-e2e-vmdisk` pointing at the IN-CLUSTER seaweedfs endpoint
+# with insecureSkipTLSVerify (kind cannot trust the self-signed SeaweedFS CA) and
+# checksumAlgorithm="" (the velero-plugin-for-aws v1.14/AWS-SDK-v2 vs SeaweedFS
+# incompatibility) — i.e. the cozystack/cozystack#3236 fixes applied at the BSL.
+# It reuses the platform bucket + cozy-backups-creds (a distinct prefix isolates
+# the objects). The example scripts stay generic — they just consume
+# BACKUP_STORAGE_LOCATION.
+#
+# Runs in tenant-root: Velero's data-mover DataUpload Pods run in the source
+# namespace and reach tenant-root's seaweedfs over same-tenant egress. Teardown
+# is explicit (skipDelete: true) — cleanup.sh prunes the cluster-scoped
+# BackupClass/strategy and the cozy-velero Velero Backup/Restore, and the harness
+# deletes the throwaway BSL.
+apiVersion: chainsaw.kyverno.io/v1alpha1
+kind: Test
+metadata:
+  name: vmdisk-2-backup-roundtrip
+spec:
+  namespace: tenant-root
+  skipDelete: true
+  catch:
+  - events: {}
+  - describe:
+      apiVersion: helm.toolkit.fluxcd.io/v2
+      kind: HelmRelease
+      name: vm-disk-backup-src
+  - describe:
+      apiVersion: backups.cozystack.io/v1alpha1
+      kind: BackupJob
+  - describe:
+      apiVersion: backups.cozystack.io/v1alpha1
+      kind: RestoreJob
+  - describe:
+      apiVersion: backups.cozystack.io/v1alpha1
+      kind: Backup
+  - describe:
+      apiVersion: velero.io/v1
+      kind: Restore
+      namespace: cozy-velero
+  - describe:
+      apiVersion: velero.io/v2alpha1
+      kind: DataDownload
+      namespace: cozy-velero
+  - describe:
+      apiVersion: velero.io/v2alpha1
+      kind: DataUpload
+      namespace: cozy-velero
+  # The CSI snapshot + data-mover work lands in these Velero CRs and the
+  # node-agent/velero Pod logs; dump them on failure.
+  - podLogs:
+      namespace: cozy-velero
+      selector: app.kubernetes.io/name=velero
+      tail: 200
+  steps:
+  - name: run
+    try:
+    # 40m budget: build the in-cluster BSL, import the Ubuntu image into a 5Gi
+    # disk (~150s proven by the vmdisk test above), a CSI-snapshot data-mover
+    # backup to S3, and a restore. run-all.sh is `set -e` and fails fast on a
+    # terminal BackupJob/RestoreJob phase rather than polling the budget out. As
+    # with the vminstance step above, the worst-case sum of the script waits
+    # (the BSL waits, IMPORT/BACKUP/RESTORE_WAIT below and the fixed ones in the
+    # example scripts, the consumer Pod delete included) is 38m, under this op
+    # timeout, so a hung wait trips the script's own named fail-fast, not
+    # Chainsaw's bare `signal: killed`; and
+    # it is sized small on purpose, since this suite (execution.parallel:1) shares
+    # the 215m job cap with the other Tests and the finally blocks — an oversized
+    # op timeout lets the cap fire first and lose the report. BSL setup is in this
+    # step (not a separate one) so the finally below always tears the BSL down.
+    - script:
+        timeout: 40m
+        content: |
+          set -eu
+          # Build the in-cluster BSL the example will target. Reuse the platform
+          # bucket (read its COSI-assigned name off cozy-default, created once
+          # the platform BucketClaim reconciles) + cozy-backups-creds.
+          echo "Waiting for the platform cozy-default BSL to expose its bucket name..."
+          timeout 180 sh -ec 'until kubectl -n cozy-velero get bsl cozy-default -o jsonpath="{.spec.objectStorage.bucket}" 2>/dev/null | grep -q .; do sleep 5; done'
+          BUCKET=$(kubectl -n cozy-velero get bsl cozy-default -o jsonpath='{.spec.objectStorage.bucket}')
+          REGION=$(kubectl -n cozy-velero get bsl cozy-default -o jsonpath='{.spec.config.region}')
+          [ -n "$REGION" ] || REGION=us-east-1
+          echo "Platform bucket: $BUCKET (region $REGION)"
+          kubectl apply -f - <<YAML
+          apiVersion: velero.io/v1
+          kind: BackupStorageLocation
+          metadata:
+            name: cozy-e2e-vmdisk
+            namespace: cozy-velero
+            labels:
+              cozystack.io/e2e: vmdisk-backup
+          spec:
+            provider: aws
+            default: false
+            objectStorage:
+              bucket: "$BUCKET"
+              prefix: velero-e2e-vmdisk
+            credential:
+              name: cozy-backups-creds
+              key: cloud
+            config:
+              region: "$REGION"
+              s3ForcePathStyle: "true"
+              s3Url: https://seaweedfs-s3.tenant-root.svc.cozy.local:8333
+              insecureSkipTLSVerify: "true"
+              checksumAlgorithm: ""
+          YAML
+          echo "Waiting for BSL cozy-e2e-vmdisk to validate Available..."
+          timeout 180 sh -ec '
+            until [ "$(kubectl -n cozy-velero get bsl cozy-e2e-vmdisk -o jsonpath="{.status.phase}" 2>/dev/null)" = "Available" ]; do
+              sleep 5
+            done'
+          kubectl -n cozy-velero get bsl cozy-e2e-vmdisk
+
+          cd ../../..
+          [ -x examples/backups/vmdisk/run-all.sh ] || { echo "vmdisk backup example scripts not found at examples/backups/vmdisk" >&2; exit 1; }
+          # storageClass tracks the lane (COZY_E2E_STORAGE_CLASS, 'local' on the
+          # DRBD-off PR gate); waits bounded under the 40m op timeout above.
+          NAMESPACE="$NAMESPACE" BACKUP_STORAGE_LOCATION=cozy-e2e-vmdisk \
+            VMI_DISK_STORAGE_CLASS="${COZY_E2E_STORAGE_CLASS:-replicated}" \
+            IMPORT_WAIT=240 BACKUP_WAIT=300 RESTORE_WAIT=300 \
+            examples/backups/vmdisk/run-all.sh
+        check:
+          ($error == null): true
+    finally:
+    # Prune the harness-created resources: the example cleanup (cluster-scoped
+    # BackupClass/strategy, namespaced BackupJob/RestoreJob/Backup which cascade
+    # to the Velero Backup/Restore in cozy-velero, the VMDisk and any renamed
+    # original PVC), then the throwaway BSL. Has teeth — a teardown that does not
+    # settle fails the step.
+    - description: vmdisk backup-flow cleanup
+      script:
+        timeout: 15m
+        content: |
+          set -eu
+          cd ../../..
+          # Always tear down the harness-owned BSL, but keep a cleanup.sh failure
+          # fatal (convention 4): capture its rc, then tear down, then re-raise.
+          rc=0
+          NAMESPACE="$NAMESPACE" examples/backups/vmdisk/cleanup.sh || rc=$?
+          # Drain the Velero Backups on this BSL before deleting it, or Velero
+          # fails the finalizer's DeleteBackupRequest ("backup storage location not
+          # found") and orphans the Velero Backup and its S3 objects. Branch on
+          # kubectl's exit status, not empty stdout (a 403/timeout must not read as
+          # "drained").
+          timeout 180 sh -ec '
+            while out=$(kubectl -n cozy-velero get backups.velero.io \
+                -o custom-columns=BSL:.spec.storageLocation --no-headers); do
+              printf "%s\n" "$out" | grep -qx cozy-e2e-vmdisk || exit 0
+              sleep 5
+            done
+            exit 3' && drain_rc=0 || drain_rc=$?
+          if [ "$drain_rc" != 0 ]; then
+            echo "error: Velero backups on cozy-e2e-vmdisk not confirmed drained (rc=$drain_rc); keeping the BSL so they are not orphaned" >&2
+            exit 1
+          fi
+          kubectl -n cozy-velero delete bsl cozy-e2e-vmdisk --ignore-not-found
+          exit "$rc"
diff --git a/hack/e2e-chainsaw/vminstance/golden-image.yaml b/hack/e2e-chainsaw/vminstance/golden-image.yaml
new file mode 100644
index 0000000000..72ba948eaf
--- /dev/null
+++ b/hack/e2e-chainsaw/vminstance/golden-image.yaml
@@ -0,0 +1,20 @@
+# vm-default-images is opt-in and not installed on the e2e cluster, so the suite
+# provides the golden image that VMDisk source.image clones from. The e2e prefix
+# keeps it clear of any image the package itself owns in cozy-public.
+apiVersion: cdi.kubevirt.io/v1beta1
+kind: DataVolume
+metadata:
+  name: vm-default-images-e2e-alpine-3.21
+  namespace: cozy-public
+  annotations:
+    cdi.kubevirt.io/storage.bind.immediate.requested: "true"
+spec:
+  contentType: kubevirt
+  source:
+    http:
+      url: https://dl-cdn.alpinelinux.org/alpine/v3.21/releases/cloud/nocloud_alpine-3.21.7-x86_64-bios-cloudinit-r0.qcow2
+  storage:
+    resources:
+      requests:
+        storage: 1Gi
+    storageClassName: ($values.storageClass)
diff --git a/hack/e2e-chainsaw/vminstance/vmdisk-disk-clone.yaml b/hack/e2e-chainsaw/vminstance/vmdisk-disk-clone.yaml
new file mode 100644
index 0000000000..302b755736
--- /dev/null
+++ b/hack/e2e-chainsaw/vminstance/vmdisk-disk-clone.yaml
@@ -0,0 +1,11 @@
+apiVersion: apps.cozystack.io/v1alpha1
+kind: VMDisk
+metadata:
+  name: disk-clone
+spec:
+  source:
+    disk:
+      name: image-clone
+  optical: false
+  storage: 1Gi
+  storageClass: ($values.storageClass)
diff --git a/hack/e2e-chainsaw/vminstance/vmdisk-image-clone.yaml b/hack/e2e-chainsaw/vminstance/vmdisk-image-clone.yaml
new file mode 100644
index 0000000000..78323c4172
--- /dev/null
+++ b/hack/e2e-chainsaw/vminstance/vmdisk-image-clone.yaml
@@ -0,0 +1,11 @@
+apiVersion: apps.cozystack.io/v1alpha1
+kind: VMDisk
+metadata:
+  name: image-clone
+spec:
+  source:
+    image:
+      name: e2e-alpine-3.21
+  optical: false
+  storage: 1Gi
+  storageClass: ($values.storageClass)
diff --git a/hack/e2e-chainsaw/vminstance/vmdisk-unreachable.yaml b/hack/e2e-chainsaw/vminstance/vmdisk-unreachable.yaml
new file mode 100644
index 0000000000..5dc13e616b
--- /dev/null
+++ b/hack/e2e-chainsaw/vminstance/vmdisk-unreachable.yaml
@@ -0,0 +1,11 @@
+apiVersion: apps.cozystack.io/v1alpha1
+kind: VMDisk
+metadata:
+  name: unreachable
+spec:
+  source:
+    http:
+      url: http://vm-disk-e2e.invalid/disk.img
+  optical: false
+  storage: 1Gi
+  storageClass: ($values.storageClass)
diff --git a/hack/e2e-chainsaw/vminstance/vmdisk-vmi.yaml b/hack/e2e-chainsaw/vminstance/vmdisk-vmi.yaml
new file mode 100644
index 0000000000..d734fd72c8
--- /dev/null
+++ b/hack/e2e-chainsaw/vminstance/vmdisk-vmi.yaml
@@ -0,0 +1,11 @@
+apiVersion: apps.cozystack.io/v1alpha1
+kind: VMDisk
+metadata:
+  name: vmi-test
+spec:
+  source:
+    http:
+      url: https://cloud-images.ubuntu.com/noble/current/noble-server-cloudimg-amd64.img
+  optical: false
+  storage: 5Gi
+  storageClass: ($values.storageClass)
diff --git a/hack/e2e-chainsaw/vminstance/vmdisk.yaml b/hack/e2e-chainsaw/vminstance/vmdisk.yaml
new file mode 100644
index 0000000000..b681dd10a0
--- /dev/null
+++ b/hack/e2e-chainsaw/vminstance/vmdisk.yaml
@@ -0,0 +1,11 @@
+apiVersion: apps.cozystack.io/v1alpha1
+kind: VMDisk
+metadata:
+  name: test
+spec:
+  source:
+    http:
+      url: https://cloud-images.ubuntu.com/noble/current/noble-server-cloudimg-amd64.img
+  optical: false
+  storage: 5Gi
+  storageClass: ($values.storageClass)
diff --git a/hack/e2e-chainsaw/vminstance/vminstance.yaml b/hack/e2e-chainsaw/vminstance/vminstance.yaml
new file mode 100644
index 0000000000..0130287449
--- /dev/null
+++ b/hack/e2e-chainsaw/vminstance/vminstance.yaml
@@ -0,0 +1,28 @@
+apiVersion: apps.cozystack.io/v1alpha1
+kind: VMInstance
+metadata:
+  name: test
+spec:
+  external: false
+  externalMethod: PortList
+  externalPorts:
+  - 22
+  running: true
+  instanceType: "u1.medium"
+  instanceProfile: ubuntu
+  disks:
+    - name: vmi-test
+  gpus: []
+  sshKeys:
+  - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPht0dPk5qQ+54g1hSX7A6AUxXJW5T6n/3d7Ga2F8gTF
+    test@test
+  cloudInit: |
+    #cloud-config
+    users:
+      - name: test
+        shell: /bin/bash
+        sudo: ['ALL=(ALL) NOPASSWD: ALL']
+        groups: sudo
+        ssh_authorized_keys:
+          - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPht0dPk5qQ+54g1hSX7A6AUxXJW5T6n/3d7Ga2F8gTF test@test
+  cloudInitSeed: ""
diff --git a/hack/e2e-cilium-endpoint-leak-healer.sh b/hack/e2e-cilium-endpoint-leak-healer.sh
new file mode 100755
index 0000000000..e4825503b9
--- /dev/null
+++ b/hack/e2e-cilium-endpoint-leak-healer.sh
@@ -0,0 +1,302 @@
+#!/bin/sh
+# Interim CI self-heal for the Cilium in-memory endpoint leak.
+#
+# This is the heal loop; it runs as an in-cluster Job (see
+# hack/e2e-cilium-leak-healer.yaml), deployed during e2e install and left
+# running for the whole cluster lifetime. That is deliberate: an earlier
+# version ran this as a background process started in the install bats
+# setup_file and killed in teardown_file, but bats *_file hooks fire per file,
+# so it died when the install file finished — before any app test ran — and the
+# leak recurred in the app phase (e.g. the tenant-Kubernetes CVMI importer)
+# unhealed. An in-cluster Job is bound to the cluster, not to one bats file, so
+# it covers install AND every app test.
+#
+# Symptom: on a churn-heavy run a pod sticks in ContainerCreating/Init because
+# the cilium-agent rejects its sandbox with
+#   [PUT /endpoint/{id}][400] putEndpointIdInvalid "IP ipv4:<X> is already in use"
+# repeated until the pod is deleted or the agent is restarted. The IP has no
+# live owner: IPAM and the ipcache released it, but the agent's in-memory
+# endpointManager still holds a stale Endpoint for it (the previous pod's CNI
+# DEL was skipped or raced, so unexpose()->removeReferencesLocked() never ran).
+# Neither the operator's CiliumEndpoint-CRD GC nor the agent's veth-based
+# endpoint GC reaps it, so it wedges the new pod and fails the run. Tracked
+# upstream at cilium/cilium#38313 (closed stale); no released or pre-release
+# Cilium fixes the leak and no flag disables it.
+#
+# This watchdog heals in two tiers, least-disruptive first:
+#
+#   Tier 1 (per-endpoint, default): evict only the orphaned endpoint via
+#     cilium-dbg endpoint disconnect ipv4:<X>
+#   which maps to DELETE /endpoint/{id} -> RemoveEndpoint -> unexpose ->
+#   removeReferencesLocked, clearing the stale IP-keyed entry; or, when a
+#   reserved/infra endpoint holds the IP, delete-reschedule the wedged pod onto
+#   a free address. Blast radius is one dead endpoint or one pod.
+#
+#   Tier 2 (per-node escalation): on some variants the leak lives in agent
+#   in-memory state that `endpoint disconnect` cannot reach — the IP is no longer
+#   in the queryable endpoint registry (so Tier 1 logs "no endpoint holds ip" and
+#   no-ops) yet the agent still rejects the sandbox, and IPAM keeps re-handing the
+#   SAME IP, so a delete-rescheduled pod just re-wedges on it: an inescapable
+#   loop. When the same (node,ip) survives ESCALATE_AFTER heal cycles of Tier 1,
+#   escalate to the only remedy that clears an in-memory leak — restart the node's
+#   cilium-agent (delete its pod; the DaemonSet recreates it, rebuilding from
+#   CRDs/IPAM without the stale entry). This is heavier — it drops the node's
+#   whole in-memory endpoint registry — and a production operator would avoid it,
+#   but for a test-only, install-phase healer it is the effective, acceptable
+#   remedy. It is bounded by a per-node cap (MAX_ESCALATIONS_PER_NODE) so it can
+#   never loop-restart agents, and every action is logged loudly with its reason.
+#
+#   Tier 2 skip: when the disputed IP is exactly the node's per-node Cilium
+#   ingress IP (CiliumNode.spec.ingress.ipv4), an agent restart cannot clear it
+#   (the agent re-derives the same ingress IP on boot) and can re-trigger the
+#   host-scope IPAM restore-window race, so the watchdog skips the restart,
+#   surfaces the case, and reschedules the wedged pod best-effort. Full mechanism
+#   is in the inline note at that gate.
+#
+# It is READ-ONLY until it has positively confirmed an orphan: an endpoint in
+# the owning node's registry holds the disputed IP, that endpoint does not back
+# a live Running pod with that IP, and a different pod is currently wedged
+# requesting the same IP. If anything is ambiguous it logs and does nothing —
+# it never disconnects a live endpoint. The Tier-2 escalation never fires for a
+# refused (genuine duplicate-IP) case: only repeated, confirmed leak candidates
+# count toward it, so an agent restart can never mask a real product bug.
+#
+# REMOVE this script, hack/e2e-cilium-leak-healer.yaml, and the setup_file/
+# teardown_file hooks in hack/e2e-install-cozystack.bats once a fixed Cilium
+# ships. This is a CI band-aid, not a product fix.
+set -u
+
+CILIUM_NS="${CILIUM_NS:-cozy-cilium}"
+POLL_INTERVAL="${CILIUM_HEALER_POLL_SEC:-15}"
+
+# Tier-2 escalation tuning (see header). ESCALATE_AFTER is how many consecutive
+# heal cycles the SAME (node,ip) must stay wedged under Tier-1 before the
+# cilium-agent on that node is restarted; the per-node cap bounds how many times
+# an agent may be restarted over the cluster lifetime so the watchdog can never
+# loop-restart agents.
+ESCALATE_AFTER="${CILIUM_HEALER_ESCALATE_AFTER:-3}"
+MAX_ESCALATIONS_PER_NODE="${CILIUM_HEALER_MAX_AGENT_RESTARTS:-2}"
+STATE_DIR="${CILIUM_HEALER_STATE_DIR:-/tmp/cilium-leak-healer}"
+
+log() { echo "[cilium-leak-healer $(date -u +%H:%M:%S)] $*"; }
+
+# cilium-agent pod running on a given node (DaemonSet selector k8s-app=cilium).
+agent_on_node() {
+  kubectl get pod -n "$CILIUM_NS" -l k8s-app=cilium \
+    --field-selector "spec.nodeName=$1" \
+    -o jsonpath='{.items[0].metadata.name}' 2>/dev/null
+}
+
+# Per-(node,ip) recurrence and per-node escalation counters, kept on the pod's
+# local filesystem. State is intentionally non-durable: if the watchdog crashes
+# and the Job restarts it, counters reset to zero, which only costs a few extra
+# heal cycles before re-escalating — never an unbounded restart loop, because the
+# per-node cap is re-derived from the (then-empty) state and the leak has either
+# cleared or recurs legibly.
+keyfrag() { printf '%s' "$1" | tr -c 'A-Za-z0-9._-' '_'; }
+node_dir() { printf '%s/%s' "$STATE_DIR" "$(keyfrag "$1")"; }
+read_count() { c=$(cat "$1" 2>/dev/null); case "$c" in ''|*[!0-9]*) printf '0' ;; *) printf '%s' "$c" ;; esac; }
+
+# bump_seen NODE IP -> increments and prints the (node,ip) recurrence count.
+bump_seen() {
+  d=$(node_dir "$1"); mkdir -p "$d" 2>/dev/null || true
+  f="$d/seen-$(keyfrag "$2")"; n=$(read_count "$f"); n=$((n + 1)); echo "$n" > "$f"; printf '%s' "$n"
+}
+# reset_node_seen NODE -> clears every (node,*) recurrence counter. One agent
+# restart clears the whole node's in-memory registry, so all its IPs get a fresh
+# grace window afterwards instead of immediately re-escalating.
+reset_node_seen() { rm -f "$(node_dir "$1")"/seen-* 2>/dev/null || true; }
+# escalations NODE -> prints how many agent restarts already issued for the node.
+escalations() { read_count "$(node_dir "$1")/escalations"; }
+# record_escalation NODE -> increments the node's agent-restart counter.
+record_escalation() {
+  d=$(node_dir "$1"); mkdir -p "$d" 2>/dev/null || true
+  f="$d/escalations"; n=$(read_count "$f"); n=$((n + 1)); echo "$n" > "$f"
+}
+
+# ip_is_node_ingress IP INGRESS_IP -> success (0) iff INGRESS_IP is non-empty
+# and exactly equals IP. A pure helper so the genuine-reserved:ingress decision
+# is unit-testable without a cluster. The non-empty guard is load-bearing: an
+# empty INGRESS_IP (CiliumNode absent, field unset, or RBAC denied) must NEVER
+# match, so an unconfirmed lookup can never suppress a Tier-2 restart that would
+# clear a real in-memory leak.
+ip_is_node_ingress() { [ -n "$2" ] && [ "$1" = "$2" ]; }
+
+# Sourcing guard: hack/cilium-leak-healer_test.bats sets CILIUM_LEAK_HEALER_LIB
+# and sources this file purely to reach the pure helpers above; return before
+# the heal loop so the unit test never needs a cluster. The only executing
+# caller (the in-cluster Job) never sets this, so the guard is a no-op there.
+if [ -n "${CILIUM_LEAK_HEALER_LIB:-}" ]; then
+  return 0 2>/dev/null
+fi
+
+mkdir -p "$STATE_DIR" 2>/dev/null || true
+log "started (ns=$CILIUM_NS poll=${POLL_INTERVAL}s, escalate-after=${ESCALATE_AFTER} cycles, max-agent-restarts/node=${MAX_ESCALATIONS_PER_NODE}, in-cluster, runs for the cluster lifetime)"
+
+# Endless loop: the pod is torn down with the ephemeral e2e cluster. Before
+# Cilium is serving (early install) the kubectl/exec calls simply fail and the
+# loop idles; once the CNI is up it begins healing. Host networking (see the
+# manifest) keeps this pod itself immune to the very leak it repairs.
+while true; do
+  # Collect every "is already in use" rejection still attached to a pod sandbox.
+  # The field-selector narrows to the relevant event reason; grep pins the exact
+  # agent signature so unrelated sandbox failures are ignored.
+  events=$(kubectl get events -A --field-selector reason=FailedCreatePodSandBox \
+      -o jsonpath='{range .items[*]}{.involvedObject.namespace}{"|"}{.involvedObject.name}{"|"}{.message}{"\n"}{end}' 2>/dev/null \
+    | grep -i "is already in use" | sort -u)
+
+  [ -n "$events" ] && while IFS='|' read -r ns pod msg; do
+    [ -n "$ns" ] && [ -n "$pod" ] || continue
+    ip=$(printf '%s' "$msg" | grep -oE 'ipv4:[0-9]{1,3}(\.[0-9]{1,3}){3}' | head -1 | cut -d: -f2)
+    [ -n "$ip" ] || continue
+
+    # Only act on a pod that is still wedged (re-checked here = freshness gate).
+    phase=$(kubectl get pod -n "$ns" "$pod" -o jsonpath='{.status.phase}' 2>/dev/null)
+    case "$phase" in Running|Succeeded|"") continue ;; esac
+
+    node=$(kubectl get pod -n "$ns" "$pod" -o jsonpath='{.spec.nodeName}' 2>/dev/null)
+    [ -n "$node" ] || continue
+    agent=$(agent_on_node "$node")
+    [ -n "$agent" ] || { log "no cilium-agent on node=$node for $ns/$pod ip=$ip"; continue; }
+
+    # Does an endpoint in this agent's registry hold the disputed IP at all?
+    # (The wedged pod itself was never registered — CreateEndpoint rejected it
+    # before exposing — so any endpoint holding the IP is the stale one.)
+    ep_json=$(kubectl exec -n "$CILIUM_NS" "$agent" -c cilium-agent -- \
+                cilium-dbg endpoint get "ipv4:$ip" -o json 2>/dev/null)
+    epid=""; epns=""; eppod=""
+    if [ -n "$ep_json" ] && [ "$ep_json" != "[]" ]; then
+      epid=$(printf '%s' "$ep_json" | jq -r '.[0].id // empty' 2>/dev/null)
+      epns=$(printf '%s' "$ep_json" | jq -r '.[0].status."external-identifiers"."k8s-namespace" // empty' 2>/dev/null)
+      eppod=$(printf '%s' "$ep_json" | jq -r '.[0].status."external-identifiers"."k8s-pod-name" // empty' 2>/dev/null)
+
+      # If that endpoint claims a pod that is alive on the cluster with this IP,
+      # it is a LIVE endpoint -> a genuine duplicate-IP, NOT the leak. Refuse and
+      # shout so the real problem is visible instead of silently broken. This
+      # path `continue`s WITHOUT bumping the recurrence counter, so a genuine
+      # duplicate never accrues toward the Tier-2 agent restart.
+      #
+      # Refuse for ANY non-terminal owner phase, not just Running: a Pending owner
+      # can already hold a live IPAM allocation (status.podIP is populated once the
+      # sandbox is created, before the pod goes Running), so disconnecting it would
+      # evict a legitimate endpoint mid-startup. Only a Succeeded/Failed owner is
+      # safely past needing its endpoint. (owner_ip == ip already gates on the pod
+      # still existing with that IP, so an empty phase from a vanished pod can't
+      # reach this branch.)
+      if [ -n "$epns" ] && [ -n "$eppod" ]; then
+        owner_ip=$(kubectl get pod -n "$epns" "$eppod" -o jsonpath='{.status.podIP}' 2>/dev/null)
+        owner_phase=$(kubectl get pod -n "$epns" "$eppod" -o jsonpath='{.status.phase}' 2>/dev/null)
+        if [ "$owner_ip" = "$ip" ] && [ "$owner_phase" != "Succeeded" ] && [ "$owner_phase" != "Failed" ]; then
+          log "REFUSE ip=$ip on node=$node: held by non-terminal pod $epns/$eppod (phase=$owner_phase; genuine duplicate IP, not the leak) — investigate"
+          continue
+        fi
+      fi
+    fi
+
+    # Genuine reserved:ingress double-allocation -> never escalate to a Tier-2
+    # agent restart. When the disputed IP is exactly THIS node's Cilium ingress
+    # IP (CiliumNode.spec.ingress.ipv4), the holder is the per-node
+    # reserved:ingress endpoint, carved from the node pod CIDR whenever Gateway
+    # API / Envoy is enabled. Restarting the agent cannot clear it (the agent
+    # re-derives the SAME ingress IP from the CiliumNode spec on every boot) and
+    # is actively harmful: the restart rebuilds the host-scope (kubernetes) IPAM
+    # bitmap empty, then re-reserves the ingress IP via a path decoupled from
+    # pod-endpoint restore, so a CNI ADD in that window can be handed the ingress
+    # IP again -- the same restore-window race that produced this wedge. (Upstream
+    # cilium host-scope IPAM + Gateway API restore-window race; no released fix
+    # known to address it.) So surface it and reschedule the wedged pod best-effort, but
+    # never count it toward or trigger the agent restart. Gated on an EXACT match
+    # (ip_is_node_ingress; an empty ingress IP never matches) so a false positive
+    # can never suppress a restart that would clear a real in-memory leak.
+    #
+    # In the sandbox this branch should now be unreachable: the Kubernetes
+    # cluster CIDR the ingress IP is carved from no longer overlaps the range
+    # kube-ovn allocates pod addresses out of, so no pod can be handed it
+    # (hack/sandbox-cidr-disjoint.bats pins that). The branch stays because the
+    # separation is a property of the sandbox configuration, not of cilium, and
+    # a cluster whose ranges do overlap still reaches it. A SURFACE line for an
+    # ingress IP appearing in the sandbox again means that separation broke.
+    ingress_ip=$(kubectl get ciliumnode "$node" -o jsonpath='{.spec.ingress.ipv4}' 2>/dev/null)
+    if ip_is_node_ingress "$ip" "$ingress_ip"; then
+      log "SURFACE node=$node ip=$ip wedged=$ns/$pod: IP is this node's Cilium ingress IP (CiliumNode.spec.ingress.ipv4), held by the reserved:ingress endpoint -- genuine infra/pod double-allocation from the upstream host-scope IPAM + Gateway API restore-window race. Agent restart cannot clear a re-derived reserved IP and can re-trigger the race, so Tier-2 is skipped; rescheduling the wedged pod best-effort."
+      out=$(kubectl delete pod -n "$ns" "$pod" --wait=false 2>&1)
+      log "  result: ${out:-<none>}"
+      continue
+    fi
+
+    # Past the REFUSE gate this is a genuine leak candidate: no endpoint holds the
+    # IP (the stale entry is outside the queryable registry; disconnect can't reach
+    # it), a reserved/infra endpoint holds it, or a stale pod endpoint holds it.
+    # The Tier-1 remedies below cannot clear a leak that lives purely in the
+    # agent's in-memory state when IPAM keeps re-handing the SAME IP — the
+    # recreated pod re-wedges on it, an inescapable loop. Track recurrence per
+    # (node,ip); once the same IP has survived ESCALATE_AFTER heal cycles,
+    # escalate (Tier 2) to the only remedy that clears an in-memory leak:
+    # restarting the node's cilium-agent. Bounded by a per-node cap so it can
+    # never loop-restart agents.
+    seen=$(bump_seen "$node" "$ip")
+    if [ "$seen" -ge "$ESCALATE_AFTER" ]; then
+      esc=$(escalations "$node")
+      if [ "$esc" -lt "$MAX_ESCALATIONS_PER_NODE" ]; then
+        log "ESCALATE node=$node agent=$agent ip=$ip wedged=$ns/$pod: leaked-IP reuse unhealed after $seen heal cycles of Tier-1 remedies (cilium/cilium#38313) -> restart cilium-agent (restart $((esc + 1))/$MAX_ESCALATIONS_PER_NODE for this node; drops its stale in-memory endpoint registry)"
+        out=$(kubectl delete pod -n "$CILIUM_NS" "$agent" --wait=false 2>&1)
+        log "  result: ${out:-<none>}"
+        record_escalation "$node"
+        # One restart clears every leaked IP on the node, so give the whole node a
+        # fresh grace window rather than immediately re-escalating each IP.
+        reset_node_seen "$node"
+      else
+        log "ESCALATION CAP reached node=$node (max=$MAX_ESCALATIONS_PER_NODE agent restarts): leaked ip=$ip for $ns/$pod still unhealed — surfacing the failure rather than restarting again (cilium/cilium#38313)"
+      fi
+      continue
+    fi
+
+    # Below the escalation threshold: apply the least-disruptive Tier-1 remedy.
+    #
+    # No endpoint holds the IP -> nothing for `endpoint disconnect` to act on (the
+    # leak, if any, is outside the queryable registry). Log and wait; if it keeps
+    # recurring on the same IP the Tier-2 escalation above takes over.
+    if [ -z "$epid" ]; then
+      log "no endpoint holds ip=$ip on node=$node (already cleared, or leak not in endpoint registry) for $ns/$pod [seen $seen/$ESCALATE_AFTER before agent restart]"
+      continue
+    fi
+
+    # An endpoint that holds the IP but backs no k8s pod (empty k8s identity) is
+    # a reserved/infra endpoint — e.g. reserved:ingress, the per-node Cilium
+    # Ingress endpoint — that legitimately owns the IP; the duplicate is an IPAM
+    # race that handed the same pod-CIDR IP to a pod. Such endpoints both cannot
+    # be disconnected ("endpoint may not be associated reserved labels") and must
+    # not be: evicting infra is wrong. The correct Tier-1 remedy is to reschedule
+    # the wedged pod onto a free IP by deleting it; its controller recreates it and
+    # the next CNI ADD picks a fresh IP (verified: the new pod lands on a clean
+    # address while the ingress endpoint keeps the disputed one).
+    if [ -z "$epns" ] || [ -z "$eppod" ]; then
+      log "HEAL node=$node ep=$epid ip=$ip held by reserved/infra endpoint (no k8s pod) -> delete wedged pod $ns/$pod [seen $seen/$ESCALATE_AFTER before agent restart]"
+      out=$(kubectl delete pod -n "$ns" "$pod" --wait=false 2>&1)
+      log "  result: ${out:-<none>}"
+      continue
+    fi
+
+    # Confirmed stale pod endpoint: endpoint $epid holds $ip, backs a pod that is
+    # no longer live, and pod $ns/$pod is wedged requesting the same IP. Evict
+    # only this endpoint.
+    log "HEAL node=$node agent=$agent ep=$epid ip=$ip wedged=$ns/$pod -> endpoint disconnect ipv4:$ip [seen $seen/$ESCALATE_AFTER before agent restart]"
+    out=$(kubectl exec -n "$CILIUM_NS" "$agent" -c cilium-agent -- \
+            cilium-dbg endpoint disconnect "ipv4:$ip" 2>&1)
+    log "  result: ${out:-<none>}"
+    # Disconnect can still be rejected (e.g. the endpoint carries reserved labels
+    # the identity probe above did not surface). Never leave the pod wedged: fall
+    # back to rescheduling it onto a free IP.
+    case "$out" in
+      *Error*|*error*|*invalid*)
+        log "  disconnect failed -> delete wedged pod $ns/$pod"
+        out=$(kubectl delete pod -n "$ns" "$pod" --wait=false 2>&1)
+        log "  result: ${out:-<none>}"
+        ;;
+    esac
+  done <<EOF
+$events
+EOF
+
+  sleep "$POLL_INTERVAL"
+done
diff --git a/hack/e2e-cilium-leak-healer.yaml b/hack/e2e-cilium-leak-healer.yaml
new file mode 100644
index 0000000000..78f66a039d
--- /dev/null
+++ b/hack/e2e-cilium-leak-healer.yaml
@@ -0,0 +1,111 @@
+# Interim in-cluster self-heal for the Cilium endpoint leak (cilium/cilium#38313
+# class). Applied during e2e install (hack/e2e-install-cozystack.bats) and left
+# running for the whole cluster lifetime, so it covers install AND every app
+# test. The heal logic lives in hack/e2e-cilium-endpoint-leak-healer.sh and is
+# shipped to the pod via a ConfigMap built from that file at apply time (single
+# source of truth). REMOVE this file, that script, and the bats wiring once a
+# fixed Cilium ships. CI band-aid, not a product fix.
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: cilium-leak-healer
+  namespace: kube-system
+  labels:
+    app.kubernetes.io/name: cilium-leak-healer
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: cilium-leak-healer
+  labels:
+    app.kubernetes.io/name: cilium-leak-healer
+rules:
+  # find FailedCreatePodSandBox "IP already in use" rejections, cluster-wide
+  - apiGroups: [""]
+    resources: ["events"]
+    verbs: ["get", "list", "watch"]
+  # inspect the wedged pod and the endpoint's claimed owner; delete the wedged
+  # pod to reschedule it onto a free IP (Tier 1, when the disputed IP is held by
+  # a reserved/infra endpoint or a disconnect otherwise fails); and delete the
+  # node's cilium-agent pod in cozy-cilium to restart it (Tier 2 escalation,
+  # which clears a stale in-memory endpoint leak the DaemonSet then rebuilds
+  # without). cluster-wide `delete` already covers cozy-cilium, so no extra verb.
+  - apiGroups: [""]
+    resources: ["pods"]
+    verbs: ["get", "list", "delete"]
+  # run `cilium-dbg endpoint ...` inside the owning node's cilium-agent
+  - apiGroups: [""]
+    resources: ["pods/exec"]
+    verbs: ["create"]
+  # read CiliumNode.spec.ingress.ipv4 to recognise the per-node reserved:ingress
+  # IP. When the disputed IP is exactly that, the Tier-2 agent restart is futile
+  # (the agent re-derives the same ingress IP on boot) and harmful (it can
+  # re-trigger the host-scope IPAM restore-window race), so the healer skips it.
+  - apiGroups: ["cilium.io"]
+    resources: ["ciliumnodes"]
+    verbs: ["get", "list"]
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: cilium-leak-healer
+  labels:
+    app.kubernetes.io/name: cilium-leak-healer
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: cilium-leak-healer
+subjects:
+  - kind: ServiceAccount
+    name: cilium-leak-healer
+    namespace: kube-system
+---
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: cilium-leak-healer
+  namespace: kube-system
+  labels:
+    app.kubernetes.io/name: cilium-leak-healer
+spec:
+  # The pod runs an endless heal loop and is torn down with the ephemeral e2e
+  # cluster, so it never completes on its own. backoffLimit only matters if the
+  # watchdog itself ever crashes — keep restarting it.
+  backoffLimit: 100
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/name: cilium-leak-healer
+    spec:
+      serviceAccountName: cilium-leak-healer
+      restartPolicy: OnFailure
+      # Immune to the very leak it heals: host networking needs no Cilium
+      # endpoint, so this pod can never be wedged by the leak and can reach the
+      # API server before pod networking is fully up. Broad tolerations let it
+      # schedule before nodes are Ready and stay put through later taints.
+      hostNetwork: true
+      dnsPolicy: ClusterFirstWithHostNet
+      tolerations:
+        - operator: Exists
+      containers:
+        - name: healer
+          # Reuse the in-tree, digest-pinned kubectl+jq image already shipped by
+          # the installer (packages/core/installer/templates/cozy-system-labels.yaml).
+          image: docker.io/alpine/k8s:1.36.2@sha256:44ef4942e171939b9c665a4a84beb80e2dcdb9a24330d4651cfdfd2e9deecc47
+          command: ["/bin/sh", "/opt/healer/heal.sh"]
+          env:
+            - name: CILIUM_NS
+              value: cozy-cilium
+          volumeMounts:
+            - name: script
+              mountPath: /opt/healer
+          resources:
+            requests:
+              cpu: 10m
+              memory: 32Mi
+            limits:
+              memory: 128Mi
+      volumes:
+        - name: script
+          configMap:
+            name: cilium-leak-healer
diff --git a/hack/e2e-compose.yaml b/hack/e2e-compose.yaml
new file mode 100644
index 0000000000..8ffc385109
--- /dev/null
+++ b/hack/e2e-compose.yaml
@@ -0,0 +1,143 @@
+# Talos nodes as containers, the L2 half of the e2e substrate experiment.
+#
+# Sits beside hack/e2e-prepare-cluster.bats' QEMU guests rather than replacing
+# them. Addressing, CPU and memory deliberately mirror that file so everything
+# downstream -- the MetalLB 192.168.123.200-250 pool, hack/e2e-post-install-prep.sh,
+# the chainsaw suites -- is unchanged between the two lanes.
+#
+# NOT `talosctl cluster create docker`: that wrapper forces a single control
+# plane (it has --workers but no --controlplanes), has no --disks, and hides the
+# container spec. Compose keeps three control planes, as today.
+#
+# The contract below comes from siderolabs/talos
+# pkg/provision/providers/docker/node.go: PLATFORM/TALOSSKU/USERDATA, privileged,
+# seccomp:unconfined, read_only, and the tmpfs + volume layout. Two mounts are
+# NOT part of that contract and are mandatory anyway -- see the per-mount notes.
+
+name: cozy-e2e
+
+networks:
+  talos:
+    driver: bridge
+    ipam:
+      config:
+        - subnet: 192.168.123.0/24
+          gateway: 192.168.123.1
+
+x-node: &node
+  image: ghcr.io/siderolabs/talos:v1.13.5@sha256:0535cf71b65c8c9fdb0b745e697be174bfe7394ecac7ccb2621caf4a606fc5a6
+  privileged: true
+  security_opt:
+    - seccomp:unconfined
+  read_only: true
+  stop_grace_period: 30s
+  # Matches the QEMU lane's `-smp 8 -m 24576` so neither lane is given more of
+  # the runner than the other. Talos reports host capacity in container mode;
+  # e2e-container-up.sh counterbalances that with dynamic kubelet reservations,
+  # and e2e-prepare-cluster-container.bats asserts the resulting allocatable.
+  cpus: ${COZY_E2E_NODE_CPUS:-8}
+  mem_limit: ${COZY_E2E_NODE_MEMORY_MIB:-24576}m
+  tmpfs:
+    - /run
+    - /system
+    - /tmp
+  environment: &node-env
+    PLATFORM: container
+    TALOSSKU: ${COZY_E2E_NODE_CPUS:-8}CPU-${COZY_E2E_NODE_MEMORY_MIB:-24576}RAM
+    USERDATA: ${USERDATA:?USERDATA must be set; hack/e2e-container-up.sh generates it}
+
+# The two host binds every node repeats below, and why each is mandatory:
+#
+#   /dev:/dev       Docker gives a privileged container its own 64 MB tmpfs /dev,
+#                   seeded ONCE at creation. /dev/kvm works because it exists at
+#                   start, but ZFS zvols created later never appear, and
+#                   linstor-csi then fails ControllerPublishVolume with "could
+#                   not determine device path". Binding the host devtmpfs fixes
+#                   it, and is why `talosctl cluster create docker` can never
+#                   support LINSTOR.
+#
+#   /run/udev       The LINSTOR satellite hostPath-mounts it. In a container /run
+#                   is tmpfs with no udev, so the pod hangs Init:0/1 on
+#                   "hostPath type check failed: /run/udev is not a directory".
+#
+# Written out per service rather than shared through a YAML anchor: compose
+# merges mappings but not sequences, so an anchored list nests instead of
+# flattening and is rejected as "volumes.0 must be a string".
+
+services:
+  srv1:
+    <<: *node
+    hostname: srv1
+    container_name: srv1
+    environment:
+      <<: *node-env
+    networks:
+      talos:
+        ipv4_address: 192.168.123.11
+    volumes:
+      - /dev:/dev
+      - /run/udev:/run/udev
+      - srv1-var:/var
+      - srv1-state:/system/state
+      - srv1-cni:/etc/cni
+      - srv1-k8s:/etc/kubernetes
+      - srv1-kubelet:/usr/libexec/kubernetes
+      - srv1-opt:/opt
+
+  srv2:
+    <<: *node
+    hostname: srv2
+    container_name: srv2
+    environment:
+      <<: *node-env
+    networks:
+      talos:
+        ipv4_address: 192.168.123.12
+    volumes:
+      - /dev:/dev
+      - /run/udev:/run/udev
+      - srv2-var:/var
+      - srv2-state:/system/state
+      - srv2-cni:/etc/cni
+      - srv2-k8s:/etc/kubernetes
+      - srv2-kubelet:/usr/libexec/kubernetes
+      - srv2-opt:/opt
+
+  srv3:
+    <<: *node
+    hostname: srv3
+    container_name: srv3
+    environment:
+      <<: *node-env
+    networks:
+      talos:
+        ipv4_address: 192.168.123.13
+    volumes:
+      - /dev:/dev
+      - /run/udev:/run/udev
+      - srv3-var:/var
+      - srv3-state:/system/state
+      - srv3-cni:/etc/cni
+      - srv3-k8s:/etc/kubernetes
+      - srv3-kubelet:/usr/libexec/kubernetes
+      - srv3-opt:/opt
+
+volumes:
+  srv1-var: {}
+  srv1-state: {}
+  srv1-cni: {}
+  srv1-k8s: {}
+  srv1-kubelet: {}
+  srv1-opt: {}
+  srv2-var: {}
+  srv2-state: {}
+  srv2-cni: {}
+  srv2-k8s: {}
+  srv2-kubelet: {}
+  srv2-opt: {}
+  srv3-var: {}
+  srv3-state: {}
+  srv3-cni: {}
+  srv3-k8s: {}
+  srv3-kubelet: {}
+  srv3-opt: {}
diff --git a/hack/e2e-container-up.sh b/hack/e2e-container-up.sh
new file mode 100755
index 0000000000..46b8a01e3b
--- /dev/null
+++ b/hack/e2e-container-up.sh
@@ -0,0 +1,307 @@
+#!/bin/sh
+# Bring up the container-lane substrate on the RUNNER HOST.
+#
+# The QEMU lane boots its guests inside the e2e sandbox. Containers cannot nest
+# that way for free, so the Talos nodes are started as SIBLINGS on the runner's
+# docker daemon and the sandbox is joined to their network. That keeps the host
+# bind mounts in hack/e2e-compose.yaml resolving against the real host devtmpfs,
+# which is the whole reason the lane can carry LINSTOR at all.
+#
+# Everything Talos-side (bootstrap, etcd, kubeconfig) stays in
+# hack/e2e-prepare-cluster-container.bats, which runs inside the sandbox exactly
+# as the QEMU lane's file does. This script owns only what must happen on the
+# host and before the containers exist.
+#
+# POSIX sh with grep/find on purpose: this runs on CI runners and contributor
+# machines, where rg/fd/bash-isms are not available.
+set -eu
+
+# kubernetes_memory_to_kib <quantity>
+#
+# Kubernetes canonicalizes binary memory quantities to the largest exact unit.
+# A Node that previously reported Ki can therefore switch to Mi when kubelet
+# reservations make the result an exact MiB value. Normalize the units used by
+# Node status so the live capacity assertion validates the value, not its
+# presentation.
+kubernetes_memory_to_kib() {
+  cozy_memory_quantity=$1
+  case "$cozy_memory_quantity" in
+    *Ki)
+      cozy_memory_value=${cozy_memory_quantity%Ki}
+      cozy_memory_multiplier=1
+      ;;
+    *Mi)
+      cozy_memory_value=${cozy_memory_quantity%Mi}
+      cozy_memory_multiplier=1024
+      ;;
+    *Gi)
+      cozy_memory_value=${cozy_memory_quantity%Gi}
+      cozy_memory_multiplier=$(( 1024 * 1024 ))
+      ;;
+    *)
+      echo "unsupported Kubernetes memory quantity: '$cozy_memory_quantity'" >&2
+      return 1
+      ;;
+  esac
+
+  case "$cozy_memory_value" in
+    '' | *[!0-9]*)
+      echo "invalid Kubernetes memory quantity: '$cozy_memory_quantity'" >&2
+      return 1
+      ;;
+  esac
+
+  printf '%s\n' "$(( cozy_memory_value * cozy_memory_multiplier ))"
+}
+
+# calculate_node_reservations <host-cpus> <host-memory-kib>
+#                             <node-cpus> <node-memory-mib> <node-count>
+#
+# Talos container nodes read capacity from the shared host kernel, not from
+# their Docker CPU/memory cgroups. Return the kubelet systemReserved quantities
+# that reduce each node's scheduler-visible capacity to its container limit.
+# Also reject a host that cannot hold all node limits with strict headroom,
+# matching the QEMU lane's runner contract instead of relying on cgroup OOMs.
+calculate_node_reservations() {
+  cozy_host_cpus=$1
+  cozy_host_memory_kib=$2
+  cozy_node_cpus=$3
+  cozy_node_memory_mib=$4
+  cozy_node_count=$5
+
+  for cozy_quantity in "$cozy_host_cpus" "$cozy_host_memory_kib" "$cozy_node_cpus" "$cozy_node_memory_mib" "$cozy_node_count"; do
+    case "$cozy_quantity" in
+      '' | *[!0-9]* | 0)
+        echo "all container capacity inputs must be positive integers, got '$cozy_quantity'" >&2
+        return 1
+        ;;
+    esac
+  done
+
+  cozy_required_cpus=$(( cozy_node_cpus * cozy_node_count ))
+  cozy_required_memory_kib=$(( cozy_node_memory_mib * 1024 * cozy_node_count ))
+  if [ "$cozy_host_cpus" -le "$cozy_required_cpus" ]; then
+    echo "container lane needs more than ${cozy_required_cpus} host CPUs, found ${cozy_host_cpus}" >&2
+    return 1
+  fi
+  if [ "$cozy_host_memory_kib" -le "$cozy_required_memory_kib" ]; then
+    echo "container lane needs more than ${cozy_required_memory_kib} KiB host memory, found ${cozy_host_memory_kib} KiB" >&2
+    return 1
+  fi
+
+  printf '%sm\n' "$(( (cozy_host_cpus - cozy_node_cpus) * 1000 ))"
+  printf '%sKi\n' "$(( cozy_host_memory_kib - cozy_node_memory_mib * 1024 ))"
+}
+
+# Unit tests and the live capacity assertion source only the helpers above.
+if [ "${E2E_CONTAINER_UP_LIB:-false}" = true ]; then
+  return 0 2>/dev/null || exit 0
+fi
+
+SANDBOX_NAME="${SANDBOX_NAME:?SANDBOX_NAME must be set (packages/core/testing/Makefile sets it)}"
+# Resolved from this script's own location, not the caller's cwd: the Makefile
+# target runs it from packages/core/testing, where a relative hack/ does not
+# exist, while a contributor runs it from the repo root, where it does. Deriving
+# the root here makes both work and keeps the compose project name, the file and
+# the teardown in packages/core/testing/Makefile referring to the same thing.
+SCRIPT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
+REPO_ROOT=$(CDPATH= cd -- "${SCRIPT_DIR}/.." && pwd)
+COMPOSE_FILE="${COMPOSE_FILE:-${REPO_ROOT}/hack/e2e-compose.yaml}"
+COMPOSE_PROJECT="${COMPOSE_PROJECT:-cozy-e2e}"
+# A smaller pool is not safe even when its sparse backing file fits physically:
+# root-tenant local PVCs can leave a satellite with less than the ~21 GiB needed
+# by CDI scratch. Once a worker's 20 GiB target PV is bound there, node affinity
+# forces the importer and scratch volume onto that same full satellite. Match the
+# QEMU lane's per-node 200 GB /dev/vdc so placement cannot turn node join into a
+# storage-capacity lottery.
+ZPOOL_SIZE="${ZPOOL_SIZE:-200G}"
+ZPOOL_BACKING_DIR="${ZPOOL_BACKING_DIR:-/var/lib/cozy-e2e-zpools}"
+KUBERNETES_VERSION="${KUBERNETES_VERSION:-v1.33.12}"
+COZY_E2E_NODE_CPUS="${COZY_E2E_NODE_CPUS:-8}"
+COZY_E2E_NODE_MEMORY_MIB="${COZY_E2E_NODE_MEMORY_MIB:-24576}"
+export COZY_E2E_NODE_CPUS COZY_E2E_NODE_MEMORY_MIB
+
+log() { echo "[e2e-container-up] $*"; }
+die() { echo "[e2e-container-up] FATAL: $*" >&2; exit 1; }
+
+# modprobe and zpool need root; docker does not, and must NOT be run through
+# sudo, or the compose project ends up owned by a different user than the
+# teardown in packages/core/testing/Makefile runs as. So escalate per command
+# rather than re-exec'ing the whole script. Empty when already root, which is
+# how this runs on a dev box; `sudo` on a CI runner, which runs as an
+# unprivileged user with passwordless sudo.
+SUDO=""
+if [ "$(id -u)" -ne 0 ]; then
+  command -v sudo >/dev/null 2>&1 \
+    || die "not root and no sudo available; this script needs to load kernel
+     modules and create zpools on the host."
+  SUDO="sudo"
+fi
+
+HOST_CPUS=$(getconf _NPROCESSORS_ONLN)
+HOST_MEMORY_KIB=$(awk '/^MemTotal:/ {print $2; exit}' /proc/meminfo)
+NODE_RESERVATIONS=$(calculate_node_reservations \
+  "$HOST_CPUS" "$HOST_MEMORY_KIB" \
+  "$COZY_E2E_NODE_CPUS" "$COZY_E2E_NODE_MEMORY_MIB" 3) \
+  || die "the runner cannot safely host three configured Talos containers"
+SYSTEM_RESERVED_CPU=$(printf '%s\n' "$NODE_RESERVATIONS" | sed -n '1p')
+SYSTEM_RESERVED_MEMORY=$(printf '%s\n' "$NODE_RESERVATIONS" | sed -n '2p')
+log "node limit ${COZY_E2E_NODE_CPUS} CPU/${COZY_E2E_NODE_MEMORY_MIB} MiB; kubelet systemReserved ${SYSTEM_RESERVED_CPU}/${SYSTEM_RESERVED_MEMORY} against host ${HOST_CPUS} CPU/${HOST_MEMORY_KIB} KiB"
+
+# ---------------------------------------------------------------------------
+# 1. Host kernel modules.
+#
+# machine.kernel.modules is a SILENT no-op in container mode --
+# internal/app/machined/pkg/controllers/runtime/kernel_module_spec.go returns
+# early on ModeContainer with no error and no event -- so a module the QEMU lane
+# declares in its machine config simply never loads here. Asserting it now makes
+# absence fail at provisioning instead of surfacing an hour later as a storage
+# or CNI error with no obvious cause.
+# ---------------------------------------------------------------------------
+for mod in openvswitch zfs; do
+  if ! $SUDO modprobe "$mod" 2>/dev/null; then
+    log "modprobe ${mod} returned non-zero; verifying the loaded-module state"
+  fi
+  if ! grep -q "^${mod} " /proc/modules; then
+    die "kernel module '${mod}' is not loaded on the host.
+     The container lane takes its kernel from the host and Talos cannot load
+     modules in container mode, so this must be loaded before the nodes start.
+     openvswitch ships with the distro kernel, so 'modprobe openvswitch' is
+     usually enough; zfs needs the OpenZFS packages first (on Ubuntu,
+     'apt-get install zfsutils-linux', then 'modprobe zfs')."
+  fi
+  log "host module ${mod}: loaded"
+done
+
+# ---------------------------------------------------------------------------
+# 2. Per-node ZFS pools.
+#
+# zpools are GLOBAL PER KERNEL, so every node sees every pool. They must be
+# node-distinct and each satellite pinned to its own; nothing enforces the
+# pinning. Acceptable for CI, not a production pattern.
+# ---------------------------------------------------------------------------
+$SUDO mkdir -p "$ZPOOL_BACKING_DIR"
+for n in 1 2 3; do
+  if $SUDO zpool list "data-srv${n}" >/dev/null 2>&1; then
+    log "zpool data-srv${n}: already present"
+    continue
+  fi
+  $SUDO truncate -s "$ZPOOL_SIZE" "${ZPOOL_BACKING_DIR}/srv${n}.img"
+  $SUDO zpool create -f "data-srv${n}" "${ZPOOL_BACKING_DIR}/srv${n}.img"
+  log "zpool data-srv${n}: created (${ZPOOL_SIZE})"
+done
+
+# ---------------------------------------------------------------------------
+# 3. Machine config, generated inside the sandbox so it uses the SAME pinned
+#    talosctl the QEMU lane does.
+#
+# Differences from the QEMU lane's patches, each forced by container mode:
+#   * no machine.kernel.modules  -- silent no-op, see above
+#   * no /etc/lvm/lvm.conf filter -- no LVM in play
+#   * no ARP VIP                 -- unavailable in container mode, so the
+#                                   apiServerEndpoint is a node IP
+# Everything else is deliberately identical.
+# ---------------------------------------------------------------------------
+docker exec \
+  -e COZY_E2E_SYSTEM_RESERVED_CPU="$SYSTEM_RESERVED_CPU" \
+  -e COZY_E2E_SYSTEM_RESERVED_MEMORY="$SYSTEM_RESERVED_MEMORY" \
+  "$SANDBOX_NAME" sh -ec '
+cd /workspace
+cat > container-patch.yaml <<PATCH
+machine:
+  kubelet:
+    nodeIP:
+      validSubnets:
+      - 192.168.123.0/24
+    extraConfig:
+      maxPods: 512
+      systemReserved:
+        cpu: "${COZY_E2E_SYSTEM_RESERVED_CPU}"
+        memory: "${COZY_E2E_SYSTEM_RESERVED_MEMORY}"
+  registries:
+    mirrors:
+      docker.io:
+        endpoints:
+        - https://mirror.gcr.io
+  files:
+  - content: |
+      [plugins]
+        [plugins."io.containerd.cri.v1.runtime"]
+          device_ownership_from_security_context = true
+    path: /etc/cri/conf.d/20-customization.part
+    op: create
+cluster:
+  apiServer:
+    extraArgs:
+      oidc-issuer-url: "https://keycloak.example.org/realms/cozy"
+      oidc-client-id: "kubernetes"
+      oidc-username-claim: "preferred_username"
+      oidc-groups-claim: "groups"
+  network:
+    cni:
+      name: none
+    dnsDomain: cozy.local
+    podSubnets:
+    - 100.65.0.0/16
+    serviceSubnets:
+    - 10.96.0.0/16
+PATCH
+cat > container-patch-controlplane.yaml <<PATCH
+machine:
+  nodeLabels:
+    node.kubernetes.io/exclude-from-external-load-balancers:
+      \$patch: delete
+cluster:
+  allowSchedulingOnControlPlanes: true
+  controllerManager:
+    extraArgs:
+      bind-address: 0.0.0.0
+  scheduler:
+    extraArgs:
+      bind-address: 0.0.0.0
+  apiServer:
+    certSANs:
+    - 127.0.0.1
+    - 192.168.123.11
+    - 192.168.123.12
+    - 192.168.123.13
+  proxy:
+    disabled: true
+  discovery:
+    enabled: false
+  etcd:
+    advertisedSubnets:
+    - 192.168.123.0/24
+PATCH
+[ -f secrets.yaml ] || talosctl gen secrets
+rm -f controlplane.yaml worker.yaml talosconfig kubeconfig
+talosctl gen config --with-secrets secrets.yaml cozystack https://192.168.123.11:6443 \
+  --kubernetes-version '"$KUBERNETES_VERSION"' \
+  --output-types controlplane,talosconfig -o . --force \
+  --config-patch @container-patch.yaml \
+  --config-patch-control-plane @container-patch-controlplane.yaml
+'
+log "machine config generated (kubernetes ${KUBERNETES_VERSION})"
+
+USERDATA=$(docker exec "$SANDBOX_NAME" base64 -w0 /workspace/controlplane.yaml)
+export USERDATA
+[ -n "$USERDATA" ] || die "USERDATA is empty; talosctl gen config produced nothing"
+
+# ---------------------------------------------------------------------------
+# 4. Start the nodes and put the sandbox on their network.
+# ---------------------------------------------------------------------------
+if ! docker compose -p "$COMPOSE_PROJECT" -f "$COMPOSE_FILE" down -v; then
+  die "failed to remove a stale ${COMPOSE_PROJECT} compose project before startup"
+fi
+docker compose -p "$COMPOSE_PROJECT" -f "$COMPOSE_FILE" up -d
+log "three Talos containers started"
+
+NETWORK="${COMPOSE_PROJECT}_talos"
+if docker network inspect "$NETWORK" -f '{{range $k,$v := .Containers}}{{$v.Name}} {{end}}' | grep -q "\b${SANDBOX_NAME}\b"; then
+  log "sandbox already attached to ${NETWORK}"
+else
+  docker network connect "$NETWORK" "$SANDBOX_NAME"
+  log "sandbox attached to ${NETWORK}"
+fi
+
+log "substrate up; hack/e2e-prepare-cluster-container.bats takes it from here"
diff --git a/hack/e2e-install-cozystack-hosted.bats b/hack/e2e-install-cozystack-hosted.bats
new file mode 100644
index 0000000000..4380b5b142
--- /dev/null
+++ b/hack/e2e-install-cozystack-hosted.bats
@@ -0,0 +1,88 @@
+#!/usr/bin/env bats
+# Install suite for the isp-hosted lane (.github/workflows/e2e-isp-hosted.yaml).
+#
+# The cluster is kind: its CNI, kube-proxy and default StorageClass belong to
+# the host, which is what the hosted installer variant and the isp-hosted
+# platform variant assume. The pass condition is the one the variant has never
+# had checked on a live cluster: every HelmRelease the platform creates goes
+# Ready, cozystack-platform and tenant-root included, with no Cilium CRDs, no
+# LINSTOR and no `replicated` StorageClass anywhere.
+#
+# What this does not cover, by design: tenant applications, ingress (kind has
+# no LoadBalancer implementation, so an ingress Service never gets an address),
+# and anything in the iaas bundle, which this variant refuses to render.
+
+@test "Install Cozystack with the hosted installer variant" {
+  helm upgrade installer packages/core/installer \
+    --install \
+    --namespace cozy-system \
+    --create-namespace \
+    --set cozystackOperator.variant=hosted \
+    --set cozystackOperator.helmReleaseInterval=30s \
+    --timeout 2m
+
+  # On hosted the labeler hook runs as an ordinary pod on the host CNI rather
+  # than on hostNetwork, so it is the path this lane exercises and no other does.
+  kubectl get ns cozy-system -o jsonpath='{.metadata.labels.pod-security\.kubernetes\.io/enforce}' | grep -qx privileged
+  kubectl get ns cozy-system -o jsonpath='{.metadata.labels.cozystack\.io/system}' | grep -qx true
+
+  # Rollout rather than condition=Available, for the reason given at the same
+  # step in hack/e2e-install-cozystack.bats.
+  kubectl rollout status deployment/cozystack-operator -n cozy-system --timeout=5m || {
+    kubectl describe pod -n cozy-system -l app=cozystack-operator 2>&1 || true
+    kubectl logs -n cozy-system -l app=cozystack-operator --all-containers --tail=50 2>&1 || true
+    kubectl logs -n cozy-system -l app=cozystack-operator --all-containers --previous --tail=50 2>&1 || true
+    false
+  }
+
+  timeout 120 sh -ec 'until kubectl wait crd/packages.cozystack.io --for=condition=Established --timeout=10s 2>/dev/null; do sleep 2; done'
+  timeout 120 sh -ec 'until kubectl wait crd/packagesources.cozystack.io --for=condition=Established --timeout=10s 2>/dev/null; do sleep 2; done'
+  timeout 120 sh -ec 'until kubectl get packagesource cozystack.cozystack-platform >/dev/null 2>&1; do sleep 2; done'
+
+  kubectl apply -f hack/e2e-isp-hosted-package.yaml
+
+  # 1800s against the 900s the isp-full lane allows: nothing is pre-pulled here,
+  # so one node pulls every platform image cold before its release can go Ready.
+  . hack/e2e-wait-helmreleases.sh
+  cozy_wait_all_helmreleases_ready 1800 11 5 2
+}
+
+@test "The platform and the root tenant are Ready" {
+  kubectl wait hr/cozystack-platform -n cozy-system --for=condition=ready --timeout=1m
+  kubectl wait hr/tenant-root -n tenant-root --for=condition=ready --timeout=1m
+}
+
+@test "The isp-hosted variant took effect" {
+  # The install gate above is equally green for any variant that converges, so
+  # this reads what the platform actually emitted, not what the lane asked for.
+  kubectl get package cozystack.networking -o jsonpath='{.spec.variant}' | grep -qx noop
+  for pkg in cozystack.linstor cozystack.metallb cozystack.multus cozystack.kubevirt; do
+    if kubectl get package "$pkg" >/dev/null 2>&1; then
+      echo "Package $pkg exists, but isp-hosted must not emit it" >&2
+      exit 1
+    fi
+  done
+}
+
+@test "The cluster carries none of what isp-hosted leaves to the host" {
+  # The variant's promise is that nothing in it needs Cilium or a
+  # Cozystack-provided StorageClass. A green install proves that only if those
+  # were really absent while it converged.
+  # Any CRD in the group counts, not only the policy kinds. The premise is a
+  # cluster with no Cilium at all, and a partial set breaks it even where the
+  # tenant guard, which needs both policy kinds, would still skip its policies.
+  # Read before counting, so a failed list fails the test instead of counting
+  # as zero.
+  crd_groups="$(kubectl get crd -o jsonpath='{range .items[*]}{.spec.group}{"\n"}{end}')"
+  cilium_crds="$(printf '%s\n' "$crd_groups" | grep -cx 'cilium\.io' || true)"
+  if [ "$cilium_crds" -ne 0 ]; then
+    echo "$cilium_crds cilium.io CRDs are installed; the lane no longer tests a cluster without them" >&2
+    exit 1
+  fi
+  for sc in replicated local; do
+    if kubectl get storageclass "$sc" >/dev/null 2>&1; then
+      echo "StorageClass $sc exists; the lane no longer tests a host-provided class alone" >&2
+      exit 1
+    fi
+  done
+}
diff --git a/hack/e2e-install-cozystack.bats b/hack/e2e-install-cozystack.bats
index ad915c944e..47315ac85b 100644
--- a/hack/e2e-install-cozystack.bats
+++ b/hack/e2e-install-cozystack.bats
@@ -1,5 +1,74 @@
 #!/usr/bin/env bats
 
+@test "Deploy cilium-leak-healer watchdog (best-effort)" {
+  # Interim mitigation for the Cilium in-memory endpoint leak (cilium/cilium#38313
+  # class): a deleted pod's endpoint is orphaned in the agent's registry, IPAM
+  # re-hands its IP to a new pod, and the agent then rejects the new sandbox with
+  # "IP <X> is already in use" until an agent restart. The watchdog runs as an
+  # in-cluster Job that first surgically evicts only the orphaned endpoint and,
+  # if the leaked IP keeps recurring (the leak is in agent in-memory state that
+  # endpoint-disconnect/delete-reschedule cannot reach), escalates to restarting
+  # that node's cilium-agent — bounded by a per-node cap. It covers install and
+  # (the Job outlives this file) the whole app suite.
+  #
+  # This is a real @test, NOT a bats setup_file hook: the e2e runner
+  # (hack/cozytest.sh) only executes @test functions — it never invokes
+  # setup_file/teardown_file — so a hook would silently never run. It is placed
+  # first so the watchdog is up before the install churn. Best-effort: the leak's
+  # primary trigger (VPA Auto eviction) is removed separately by the
+  # monitoring/etcd VPA->Initial fixes, so this is only the reactive net for
+  # residual churn and must never fail the suite. The heal logic stays in
+  # hack/e2e-cilium-endpoint-leak-healer.sh (single source of truth), shipped to
+  # the pod via a ConfigMap built here. Remove this test, that script, and
+  # hack/e2e-cilium-leak-healer.yaml once a fixed Cilium ships.
+  kubectl create configmap cilium-leak-healer -n kube-system \
+    --from-file=heal.sh=hack/e2e-cilium-endpoint-leak-healer.sh \
+    --dry-run=client -o yaml | kubectl apply -f - || true
+  kubectl apply -f hack/e2e-cilium-leak-healer.yaml || true
+  # Confirm it landed (visible in the cozytest.sh trace); never fail on a band-aid.
+  if kubectl -n kube-system get job cilium-leak-healer >/dev/null 2>&1; then
+    echo "cilium-leak-healer Job created"
+  else
+    echo "WARNING: cilium-leak-healer Job NOT created — watchdog inactive this run"
+  fi
+}
+
+@test "Deploy Talos image factory cache (best-effort e2e mirror)" {
+  # Tenant Kubernetes worker VMs boot from a Talos raw disk image that CDI
+  # streams over HTTP from the public Talos Image Factory. That endpoint has no
+  # byte-range support and intermittently stream-resets/stalls mid-transfer from
+  # the CI runner, so a worker DataVolume import can hang past the chart's
+  # 12-minute node-join deadline and fail (or merely make) the kubernetes-* tests
+  # (see cozystack/cozystack#3231). This Deployment fetches the image ONCE with a
+  # hard curl retry loop and serves it locally; tenant CRs then point
+  # spec.talos.imageFactoryURL at its Service. Deployed here (before the long
+  # install) so the seed download overlaps the install churn — readiness is gated
+  # at point-of-use in hack/e2e-chainsaw/_lib/talos-image-cache.sh, called from
+  # run-kubernetes.sh, which falls back to the public factory if the mirror never
+  # becomes Available, so this can only help.
+  # Best-effort: never fail the suite on the band-aid. Remove once tenant workers
+  # no longer bulk-pull the OS image from the public internet in CI.
+  local sid ver
+  sid=$(yq '.talos.schematicID' packages/apps/kubernetes/values.yaml 2>/dev/null)
+  ver=$(yq '.talos.version' packages/apps/kubernetes/values.yaml 2>/dev/null)
+  if [ -z "$sid" ] || [ "$sid" = "null" ] || [ -z "$ver" ] || [ "$ver" = "null" ]; then
+    echo "WARNING: could not read talos.schematicID/version from values.yaml — skipping mirror (fallback to public factory)"
+    return 0
+  fi
+  # The CiliumClusterwideNetworkPolicy in the manifest is intentionally NOT applied
+  # here: Cilium's CRDs do not exist until Cozystack is installed (below), so
+  # applying it now would error. It is applied at point-of-use by
+  # hack/e2e-chainsaw/_lib/talos-image-cache.sh once Cilium is up.
+  sed -e "s|__SCHEMATIC_ID__|${sid}|g" -e "s|__TALOS_VERSION__|${ver}|g" hack/e2e-talos-image-cache.yaml \
+    | yq 'select(.kind != "CiliumClusterwideNetworkPolicy")' \
+    | kubectl apply -f - || echo "WARNING: failed to apply talos-image-cache (fallback to public factory)"
+  if kubectl -n kube-system get deploy talos-image-cache >/dev/null 2>&1; then
+    echo "talos-image-cache Deployment created (seeding ${sid}/${ver} in background)"
+  else
+    echo "WARNING: talos-image-cache Deployment NOT created — tenant workers will use public factory.talos.dev"
+  fi
+}
+
 @test "Required installer chart exists" {
   if [ ! -f packages/core/installer/Chart.yaml ]; then
     echo "Missing: packages/core/installer/Chart.yaml" >&2
@@ -18,6 +87,13 @@
   # actually pulls (skips configmap fields and CRD examples that happen to
   # contain an `image:` key). Add a chart here when a new peer-sensitive
   # workload is found.
+  #
+  # `select(. != null)` drops container entries that carry no image. The pod
+  # templates embedded in a LinstorCluster CR are strategic-merge fragments,
+  # so one that overrides only `args` has no image of its own to pull.
+  # Without the filter yq emits a bare `null`, which reaches the prepull
+  # DaemonSet as a container with an empty image and fails apply with a
+  # message naming a container index rather than the chart behind it.
   # Stage each render AND the yq filter through tmp files instead of
   # piping. Two constraints stack here: `set -x` would expand any
   # `var=$(helm ...)` capture into the trace and balloon CI logs, and
@@ -35,9 +111,14 @@
   helm template packages/system/linstor > "$linstor_yaml"
   helm template packages/system/cert-manager > "$certmanager_yaml"
   yq -N '
-      (..|select(has("containers"))|.containers[]|.image),
-      (..|select(has("initContainers"))|.initContainers[]|.image)
+      (..|select(has("containers"))|.containers[]|.image|select(. != null)),
+      (..|select(has("initContainers"))|.initContainers[]|.image|select(. != null))
     ' "$kubeovn_yaml" "$linstor_yaml" "$certmanager_yaml" > "$images_list"
+  # The failure-only Talos diagnostics Pod can land on any node. The sandbox's
+  # upstream talosctl binary is static, so cache its pinned Alpine base on every
+  # node while the cluster is healthy instead of cold-pulling on a failure path.
+  printf '%s\n' 'docker.io/alpine/k8s:1.36.2@sha256:44ef4942e171939b9c665a4a84beb80e2dcdb9a24330d4651cfdfd2e9deecc47' \
+    >> "$images_list"
   hack/e2e-prepull-images.sh < "$images_list"
   rm -f "$kubeovn_yaml" "$linstor_yaml" "$certmanager_yaml" "$images_list"
 }
@@ -49,7 +130,6 @@
     --namespace cozy-system \
     --create-namespace \
     --set cozystackOperator.helmReleaseInterval=30s \
-    --wait \
     --timeout 2m
 
   # The pre-install hook (cozy-system-labeler) must have stamped the PSA and
@@ -59,8 +139,39 @@
   kubectl get ns cozy-system -o jsonpath='{.metadata.labels.pod-security\.kubernetes\.io/enforce}' | grep -qx privileged
   kubectl get ns cozy-system -o jsonpath='{.metadata.labels.cozystack\.io/system}' | grep -qx true
 
-  # Verify the operator deployment is available
-  kubectl wait deployment/cozystack-operator -n cozy-system --timeout=1m --for=condition=Available
+  # Wait for the ROLLOUT, not for condition=Available: once maxUnavailable
+  # reaches replicas the minimum available replica count is 0, so Available
+  # reports True with no pod running and a broken operator image passes in
+  # milliseconds, surfacing minutes later as a CRD timeout that blames the wrong
+  # component. `rollout status` reads updated and available replicas directly,
+  # and stays correct whatever strategy the chart carries.
+  #
+  # It still only proves a container started, not that the operator is healthy:
+  # there is no readiness probe, so one that starts and then dies mid-install
+  # passes here and is caught by the CRD waits below instead.
+  #
+  # This is the only readiness gate for the operator, since the helm step above
+  # drops --wait, so the timeout must cover scheduling and a cold pull of an
+  # image that is not in the prepull set.
+  kubectl rollout status deployment/cozystack-operator -n cozy-system --timeout=5m || {
+    echo "=== deployment/cozystack-operator rollout did not complete ==="
+    kubectl get deployment/cozystack-operator -n cozy-system -o yaml 2>&1 || true
+    echo "=== cozy-system pods ==="
+    kubectl get pods -n cozy-system -o wide 2>&1 || true
+    # The two shapes this gate exists to catch need different evidence, and
+    # neither is in `get pods -o wide`. ImagePullBackOff produces no logs at
+    # all, and CrashLoopBackOff puts the stack trace in the container that
+    # already died, so describe carries the first and --previous the second.
+    echo "=== cozystack-operator pod detail ==="
+    kubectl describe pod -n cozy-system -l app=cozystack-operator 2>&1 || true
+    echo "=== cozystack-operator logs ==="
+    kubectl logs -n cozy-system -l app=cozystack-operator --all-containers --tail=50 2>&1 || true
+    echo "=== cozystack-operator logs, previous container ==="
+    kubectl logs -n cozy-system -l app=cozystack-operator --all-containers --previous --tail=50 2>&1 || true
+    echo "=== cozy-system events ==="
+    kubectl get events -n cozy-system --sort-by=.lastTimestamp 2>&1 | tail -30 || true
+    false
+  }
 
   # Wait for operator to install CRDs (happens at startup before reconcile loop).
   # kubectl wait fails immediately if the CRD does not exist yet, so poll until it appears first.
@@ -70,60 +181,38 @@
   # Wait for operator to create the platform PackageSource
   timeout 120 sh -ec 'until kubectl get packagesource cozystack.cozystack-platform >/dev/null 2>&1; do sleep 2; done'
 
-  # Create platform Package with isp-full variant
-  kubectl apply -f - <<EOF
-apiVersion: cozystack.io/v1alpha1
-kind: Package
-metadata:
-  name: cozystack.cozystack-platform
-spec:
-  variant: isp-full
-  components:
-    platform:
-      values:
-        networking:
-          podCIDR: "10.244.0.0/16"
-          podGateway: "10.244.0.1"
-          serviceCIDR: "10.96.0.0/16"
-          joinCIDR: "100.64.0.0/16"
-        publishing:
-          host: "example.org"
-          apiServerEndpoint: "https://192.168.123.10:6443"
-        bundles:
-          enabledPackages:
-            - cozystack.external-dns-application
-EOF
-
-  # Launch storage + LB configuration in the background. It waits for its
-  # own prerequisites (linstor-controller deploy, MetalLB CRDs) and finishes
-  # while the parallel HR wait below is still running, so the cost overlaps
-  # with the platform reconcile instead of compounding it.
+  # Stage the generated manifest instead of piping it into kubectl: cozytest
+  # runs under /bin/sh without pipefail, so a generator failure in a pipeline
+  # could be hidden by kubectl successfully applying empty input.
+  local platform_packages
+  platform_packages=$(mktemp)
+  hack/e2e-platform-packages.sh > "$platform_packages"
+  kubectl apply -f "$platform_packages"
+  rm -f "$platform_packages"
+
+  # Launch storage + LB configuration in the background. It waits for its own
+  # prerequisites while the platform controllers reconcile HelmReleases, so
+  # the costs overlap even though the authoritative readiness gate starts only
+  # after prep has finished.
   hack/e2e-post-install-prep.sh > /tmp/post-install-prep.log 2>&1 &
   POST_PREP_PID=$!
 
-  # Wait until HelmReleases appear & reconcile them
-  timeout 180 sh -ec 'until [ $(kubectl get hr -A --no-headers 2>/dev/null | wc -l) -gt 10 ]; do sleep 1; done'
-  # TODO(e2e-replace-fixed-timeouts): genuine sleep. The threshold of 10 is a
-  # heuristic for "enough HRs visible to start waiting"; the snapshot below
-  # uses whatever HRs have appeared by then. There is no objective k8s API
-  # signal for "all platform HRs have been emitted" without hard-coding the
-  # expected list, so the 5s pad lets a few late-arrivals join the snapshot.
-  sleep 5
-  kubectl get hr -A | awk 'NR>1 {print "kubectl wait --timeout=15m --for=condition=ready -n "$1" hr/"$2" &"} END {print "wait"}' | sh -ex
-
   echo "Waiting for post-install-prep to complete"
-  if ! wait $POST_PREP_PID; then
+  if ! wait "$POST_PREP_PID"; then
     cat /tmp/post-install-prep.log >&2
     echo "post-install-prep failed" >&2
     exit 1
   fi
   cat /tmp/post-install-prep.log
 
-  # Fail the test if any HelmRelease is not Ready
-  if kubectl get hr -A | grep -v " True " | grep -v NAME; then
-    kubectl get hr -A
-    echo "Some HelmReleases failed to reconcile" >&2
-  fi
+  # One authoritative gate, on fresh lists. A bare `kubectl wait --all` takes
+  # one snapshot and can miss releases created a moment later; it also waits
+  # the full timeout after Flux has already declared Stalled=True. The helper
+  # re-lists, requires the all-Ready name set to stay stable for 5s, and fails
+  # immediately on Stalled. The 11-release floor preserves the old >10
+  # existence backstop without the masked pacing wait.
+  . hack/e2e-wait-helmreleases.sh
+  cozy_wait_all_helmreleases_ready 900 11 5 2
 }
 
 @test "Wait for Cluster‑API provider deployments" {
@@ -140,18 +229,69 @@ EOF
 @test "Configure Tenant and wait for applications" {
   # Patch root tenant and wait for its releases
 
-  kubectl patch tenants/root -n tenant-root --type merge -p '{"spec":{"host":"example.org","ingress":true,"monitoring":true,"etcd":true,"isolated":true, "seaweedfs": true}}'
-
-  timeout 60 sh -ec 'until kubectl get hr -n tenant-root etcd ingress monitoring seaweedfs tenant-root >/dev/null 2>&1; do sleep 1; done'
+  # cozystack-api can report its APIService Available while a freshly-rolled pod
+  # has not yet loaded the requestheader client-CA — it then drops the
+  # front-proxy identity and answers as system:anonymous (403). The Available
+  # wait in the previous test does not cover that. Prove an AUTHENTICATED
+  # request against the actual resource succeeds before the patch's own GET.
+  timeout 120 sh -ec 'until kubectl get tenants.apps.cozystack.io root -n tenant-root >/dev/null 2>&1; do sleep 2; done'
+  local storage_class
+  storage_class="${COZY_E2E_STORAGE_CLASS:-replicated}"
+  case "$storage_class" in
+    replicated) ;;
+    local)
+      # The Tenant patch below leaves root monitoring off, so VictoriaLogs does
+      # not render in this run; the override is here for a run that turns it
+      # on. VictoriaLogs is the only root-tenant workload that explicitly
+      # defaults to replicated instead of inheriting the cluster's default
+      # StorageClass, and the container lane has no DRBD and intentionally
+      # exposes only local. The override goes into the values Secret before the
+      # Tenant patch, so the monitoring HelmRelease's first render creates local
+      # claims. Patching that HelmRelease after creation races the operator: a
+      # replicated PVC can be created first, and storageClassName is immutable.
+      # Flux drift detection is disabled, so the owning cozystack-basics release
+      # does not rewrite this E2E-only live override on its ordinary interval.
+      local root_values_b64_file root_values_file root_values_patch_file
+      root_values_b64_file=$(mktemp)
+      root_values_file=$(mktemp)
+      root_values_patch_file=$(mktemp)
+      kubectl get secret cozystack-values -n tenant-root -o jsonpath='{.data.values\.yaml}' > "$root_values_b64_file"
+      base64 -d "$root_values_b64_file" > "$root_values_file"
+      COZY_E2E_STORAGE_CLASS="$storage_class" yq -i \
+        '.logsStorages = [{"name":"generic","retentionPeriod":"1","storage":"10Gi","storageClassName":strenv(COZY_E2E_STORAGE_CLASS)}]' \
+        "$root_values_file"
+      jq -Rs '{"stringData":{"values.yaml":.}}' < "$root_values_file" > "$root_values_patch_file"
+      kubectl patch secret cozystack-values -n tenant-root --type merge --patch-file "$root_values_patch_file"
+      rm -f "$root_values_b64_file" "$root_values_file" "$root_values_patch_file"
+      ;;
+    *)
+      echo "COZY_E2E_STORAGE_CLASS must be local or replicated, got '$storage_class'" >&2
+      return 1
+      ;;
+  esac
+
+  # Root monitoring stays off: no suite inspects the tenant-root instance, and
+  # its bring-up (VictoriaMetrics, VictoriaLogs, Grafana and its CNPG database)
+  # competes with the rest of the install for node capacity, so a slow start
+  # could fail a pull request that never touched monitoring. The monitoring
+  # package itself stays installed, because tenant-application declares
+  # dependsOn cozystack.monitoring-application. Turning it on also means
+  # flipping monitoring.rootEnabled in hack/e2e-platform-packages.sh.
+  kubectl patch tenants/root -n tenant-root --type merge -p '{"spec":{"host":"example.org","ingress":true,"monitoring":false,"etcd":true,"isolated":true, "seaweedfs": true}}'
+
+  timeout 60 sh -ec 'until kubectl get hr -n tenant-root etcd ingress seaweedfs tenant-root >/dev/null 2>&1; do sleep 1; done'
   # tenant-root parent HR only flips Ready after every child HR is Ready,
-  # so listing all four top-level children plus the parent gives precise
+  # so listing the children this patch enables plus the parent gives precise
   # failure messages without redundant separate waits. seaweedfs now
   # installs as a serial chain seaweedfs-db (CNPG bootstrap) ->
   # seaweedfs-system (master raft quorum) -> seaweedfs wrapper, which
-  # pushes the parent's Ready flip to ~5-6 min; tenant-root HR.spec.timeout
-  # is 15m and this 10m wait stays inside it.
-  kubectl wait hr/etcd hr/ingress hr/monitoring hr/seaweedfs hr/tenant-root \
-    -n tenant-root --timeout=10m --for=condition=ready
+  # pushes the parent's Ready flip to ~5-6 min on an idle runner. On a loaded
+  # runner the tenant stack only starts creating pods ~9-10 min in, so the
+  # parent's Ready can land past the HR's single 15m timeout window; the HR
+  # re-reconciles every 1m until it converges, so this wait is 20m to observe
+  # that eventual Ready rather than expiring first.
+  kubectl wait hr/etcd hr/ingress hr/seaweedfs hr/tenant-root \
+    -n tenant-root --timeout=20m --for=condition=ready
 
 
   # Expose Cozystack services through ingress
@@ -159,46 +299,74 @@ EOF
 
   # NGINX ingress controller
   timeout 60 sh -ec 'until kubectl get deploy root-ingress-controller -n tenant-root >/dev/null 2>&1; do sleep 1; done'
-  kubectl wait deploy/root-ingress-controller -n tenant-root --timeout=5m --for=condition=available
-
-  # etcd statefulset
-  timeout 60 sh -ec 'until kubectl get sts/etcd -n tenant-root >/dev/null 2>&1; do sleep 2; done'
-  kubectl wait sts/etcd -n tenant-root --for=jsonpath='{.status.readyReplicas}'=3 --timeout=5m
-
-  # VictoriaMetrics components
-  timeout 60 sh -ec 'until kubectl get vmalert/vmalert-shortterm -n tenant-root >/dev/null 2>&1; do sleep 2; done'
-  timeout 60 sh -ec 'until kubectl get vmalertmanager/alertmanager -n tenant-root >/dev/null 2>&1; do sleep 2; done'
-  kubectl wait vmalert/vmalert-shortterm vmalertmanager/alertmanager -n tenant-root --for=jsonpath='{.status.updateStatus}'=operational --timeout=15m
-  timeout 60 sh -ec 'until kubectl get vlclusters/generic -n tenant-root >/dev/null 2>&1; do sleep 2; done'
-  kubectl wait vlclusters/generic -n tenant-root --for=jsonpath='{.status.updateStatus}'=operational --timeout=5m
-  timeout 60 sh -ec 'until kubectl get vmcluster/shortterm vmcluster/longterm -n tenant-root >/dev/null 2>&1; do sleep 2; done'
-  kubectl wait vmcluster/shortterm vmcluster/longterm -n tenant-root --for=jsonpath='{.status.updateStatus}'=operational --timeout=5m
-
-  # Grafana
-  timeout 60 sh -ec 'until kubectl get clusters.postgresql.cnpg.io/grafana-db -n tenant-root >/dev/null 2>&1; do sleep 2; done'
-  kubectl wait clusters.postgresql.cnpg.io/grafana-db -n tenant-root --for=condition=ready --timeout=5m
-  timeout 60 sh -ec 'until kubectl get deploy/grafana-deployment -n tenant-root >/dev/null 2>&1; do sleep 2; done'
-  kubectl wait deploy/grafana-deployment -n tenant-root --for=condition=available --timeout=5m
-
-  # Verify Grafana via ingress
-  ingress_ip=$(kubectl get svc root-ingress-controller -n tenant-root -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
-  if ! curl -sS -k "https://${ingress_ip}" -H 'Host: grafana.example.org' --max-time 30 | grep -q Found; then
-    echo "Failed to access Grafana via ingress at ${ingress_ip}" >&2
-    exit 1
-  fi
+  kubectl wait deploy/root-ingress-controller -n tenant-root --timeout=10m --for=condition=available
+
+  # etcd cluster. The v1alpha2 operator manages member Pods directly and creates
+  # NO StatefulSet, so gate on the EtcdCluster readiness signal (mirrors
+  # hack/e2e-chainsaw/etcd and the examples) plus the member Pods themselves.
+  timeout 60 sh -ec 'until kubectl -n tenant-root get etcdcluster.etcd-operator.cozystack.io/etcd >/dev/null 2>&1; do sleep 2; done'
+  kubectl -n tenant-root wait etcdcluster.etcd-operator.cozystack.io/etcd \
+    --for=jsonpath='{.status.conditions[?(@.type=="Available")].status}'=True --timeout=10m
+  kubectl -n tenant-root wait pod \
+    -l app.kubernetes.io/name=etcd,app.kubernetes.io/instance=etcd,app.kubernetes.io/managed-by=etcd-operator \
+    --for=condition=ready --timeout=10m
 }
 
 @test "Keycloak OIDC stack is healthy" {
-  # keycloakInternalUrl makes oauth2-proxy skip OIDC discovery and route
-  # backend calls (token/jwks/userinfo/logout) through the in-cluster
-  # keycloak Service. Without it the dashboard gatekeeper crashloops on
-  # DNS lookup of keycloak.example.org -- the e2e host placeholder does
-  # not resolve, and under Flux v2.8 kstatus the gatekeeper Deployment
-  # then flips to Failed and stalls the dashboard HelmRelease.
-  kubectl patch package cozystack.cozystack-platform --type merge -p '{"spec":{"components":{"platform":{"values":{"authentication":{"oidc":{"enabled":true,"keycloakInternalUrl":"http://keycloak-http.cozy-keycloak.svc:8080/realms/cozy"}}}}}}}'
+  # Only oidc.enabled is set here: keycloakInternalUrl defaults to the in-cluster
+  # keycloak Service, which makes oauth2-proxy skip OIDC discovery and route the
+  # backend calls (token/jwks/userinfo/logout) through that Service.
+  kubectl patch package cozystack.cozystack-platform --type merge -p '{"spec":{"components":{"platform":{"values":{"authentication":{"oidc":{"enabled":true}}}}}}}'
 
   timeout 120 sh -ec 'until kubectl get hr -n cozy-keycloak keycloak keycloak-configure keycloak-operator >/dev/null 2>&1; do sleep 1; done'
-  kubectl wait hr/keycloak hr/keycloak-configure hr/keycloak-operator -n cozy-keycloak --timeout=10m --for=condition=ready
+  kubectl wait hr/keycloak hr/keycloak-configure hr/keycloak-operator -n cozy-keycloak --timeout=20m --for=condition=ready
+
+  # Enabling OIDC swaps the dashboard's token-proxy container for oauth2-proxy,
+  # so the dashboard is the consumer that proves the internal-URL default works.
+  # The install-time all-HelmRelease gate ran before this test flipped the flag
+  # and only ever saw the token-proxy shape, so nothing has re-checked the
+  # dashboard on the OIDC path.
+  #
+  # Waiting on hr/dashboard directly would be vacuous: it is still Ready=True
+  # from the token-proxy install, so `--for=condition=ready` returns instantly
+  # against the stale condition, before Flux has even consumed the patched
+  # values. Gate on an observable that exists ONLY on the OIDC path instead --
+  # the auth-proxy container appearing in the gatekeeper Deployment -- which is
+  # reached only after the new values are rendered.
+  timeout 600 sh -ec 'until kubectl get deploy/incloud-web-gatekeeper -n cozy-dashboard -o jsonpath="{.spec.template.spec.containers[*].name}" 2>/dev/null | grep -qw auth-proxy; do sleep 5; done' || {
+    echo "=== gatekeeper never re-rendered with the auth-proxy container after enabling OIDC ==="
+    echo "=== the patched values likely never reached the dashboard HelmRelease ==="
+    kubectl get package cozystack.cozystack-platform -o yaml 2>&1 || true
+    kubectl get hr/dashboard -n cozy-dashboard -o yaml 2>&1 || true
+    kubectl get deploy/incloud-web-gatekeeper -n cozy-dashboard -o yaml 2>&1 || true
+    false
+  }
+
+  # Then wait for the ROLLOUT, not for condition=available. The Deployment has
+  # replicas: 1 and maxUnavailable: 25%, which rounds down to 0, so Kubernetes
+  # keeps the old token-proxy pod up while the new one starts: Available stays
+  # True on the strength of the OLD ReplicaSet even as the new auth-proxy pod
+  # crashloops. `rollout status` is the check that only succeeds once the
+  # UPDATED pod is available.
+  #
+  # That is what gives this case teeth: were the default to regress to the
+  # external hostname, oauth2-proxy would do OIDC discovery against
+  # keycloak.example.org -- the e2e host placeholder does not resolve -- and
+  # crashloop, failing the rollout instead of shipping the regression.
+  kubectl rollout status deploy/incloud-web-gatekeeper -n cozy-dashboard --timeout=10m || {
+    echo "=== deploy/incloud-web-gatekeeper rollout did not complete after enabling OIDC ==="
+    kubectl get deploy/incloud-web-gatekeeper -n cozy-dashboard -o yaml 2>&1 || true
+    echo "=== cozy-dashboard pods ==="
+    kubectl get pods -n cozy-dashboard -o wide 2>&1 || true
+    echo "=== auth-proxy logs ==="
+    kubectl logs -n cozy-dashboard -l app.kubernetes.io/name=gatekeeper --all-containers --tail=50 2>&1 || true
+    false
+  }
+
+  # Not the vacuous wait described above: past the rollout gate the HelmRelease
+  # has necessarily been re-reconciled, so Ready here means the whole upgrade
+  # converged -- not just the one Deployment this test watched.
+  kubectl wait hr/dashboard -n cozy-dashboard --timeout=10m --for=condition=ready
 }
 
 @test "Aggregated API rejects Tenant name with dashes" {
@@ -244,8 +412,11 @@ EOF
   # generic DNS-1035 errors and from network/auth failures).
   echo "$output" | grep -q "tenant names must"
   # And assert kubectl did NOT report creation — if validation regressed
-  # into a "warn" variant, the server could still accept the object.
-  ! echo "$output" | grep -qi "created"
+  # into a "warn" variant, the server could still accept the object. A bare
+  # `! echo | grep` is vacuous under cozytest's `set -e` (suppressed for any
+  # command whose status is inverted with `!`), so the regression would slip
+  # through; assert via `if ...; false`.
+  if echo "$output" | grep -qi "created"; then echo "FAIL: kubectl reported the tenant as created — validation must reject it, not warn"; false; fi
 
   # Post-condition cleanup: even though we expect validation to reject the
   # create, removing foo-bar unconditionally keeps the cluster clean for
@@ -270,7 +441,17 @@ spec:
   resourceQuotas:
     cpu: "60"
     memory: "128Gi"
-    storage: "100Gi"
+    # 200Gi so back-to-back tenant Kubernetes tests
+    # (kubernetes-latest, kubernetes-previous) don't run into
+    # ResourceQuota during CDI's second-phase scratch PVC allocation.
+    # Each tenant provisions 2 worker VMs × 20Gi disk + 21Gi CDI scratch
+    # during import; when kubernetes-latest teardown's DRBD detach lags
+    # past cozy_wait_tenant_drained, the leftover 40Gi of latest's worker
+    # PVCs stays counted against tenant-quota while kubernetes-previous
+    # is already asking for its own 40Gi + ~21Gi scratch: the scratch
+    # PVC create call trips the 100Gi ceiling and the second worker's
+    # DataVolume stalls in ImportInProgress indefinitely.
+    storage: "200Gi"
   seaweedfs: false
 EOF
   timeout 60 sh -ec 'until kubectl get hr/tenant-test -n tenant-root >/dev/null 2>&1; do sleep 2; done'
@@ -281,7 +462,7 @@ EOF
   timeout 60 sh -ec 'until [ "$(kubectl get quota -n tenant-test --no-headers 2>/dev/null | wc -l)" -ge 1 ]; do sleep 1; done'
   kubectl get quota -n tenant-test \
     -o jsonpath='{range .items[*]}{.spec.hard.requests\.memory}{" "}{.spec.hard.requests\.storage}{"\n"}{end}' \
-    | grep -qx '137438953472 100Gi'
+    | grep -qx '137438953472 200Gi'
 
   # Assert LimitRange defaults for containers
   kubectl get limitrange -n tenant-test \
@@ -350,7 +531,18 @@ EOF
   version=$(kubectl get configmap cozystack-version -n cozy-system \
     -o jsonpath='{.data.version}')
   kubectl delete configmap cozystack-version -n cozy-system
-  ! kubectl get configmap cozystack-version -n cozy-system 2>/dev/null
+  # A bare `! kubectl get` is vacuous under cozytest's `set -e` (errexit is
+  # suppressed for any command whose status is inverted with `!`), so a
+  # delete that silently failed would not fail the test. Nor may the absence
+  # rest on the exit status alone: `kubectl get` exits 1 for a NotFound and 1
+  # for a connection, auth or discovery failure, so an api-server the test
+  # cannot reach would read as proof the delete worked. `--ignore-not-found`
+  # collapses the NotFound alone into success with empty output, leaving the
+  # status free to mean a failed read.
+  if ! still_there=$(kubectl get configmap cozystack-version -n cozy-system --ignore-not-found -o name); then
+    echo "FAIL: reading the cozystack-version configmap did not answer"; false
+  fi
+  if [ -n "$still_there" ]; then echo "FAIL: cozystack-version configmap must be gone after delete with the no-delete label removed"; false; fi
   # Reconstruct: declarative apply matches the chart template at
   # packages/core/platform/templates/cozystack-version.yaml — same label set
   # AND the helm.sh/resource-policy: keep annotation that pins the ConfigMap
diff --git a/hack/e2e-isp-hosted-kind.yaml b/hack/e2e-isp-hosted-kind.yaml
new file mode 100644
index 0000000000..db47e460a4
--- /dev/null
+++ b/hack/e2e-isp-hosted-kind.yaml
@@ -0,0 +1,25 @@
+# kind cluster for the isp-hosted lane. One node, kind's own CNI (kindnet),
+# kube-proxy and local-path StorageClass: the managed-cluster shape the variant
+# is for, with no Cilium, no LINSTOR and no `replicated` or `local` class.
+#
+# The DNS domain follows the platform's networking.clusterDomain, because some
+# system packages still carry that domain as a literal and would fail here for
+# a reason unrelated to the variant. hack/isp-hosted-lane_test.bats holds the
+# two in step.
+#
+# maxPods is raised from the kubelet default of 110 because every platform pod
+# lands on this one node; 110 was not measured to be too small, the headroom
+# keeps a pod count nobody tracks from becoming the reason a run goes red.
+kind: Cluster
+apiVersion: kind.x-k8s.io/v1alpha4
+kubeadmConfigPatches:
+- |
+  kind: ClusterConfiguration
+  networking:
+    dnsDomain: cozy.local
+- |
+  kind: KubeletConfiguration
+  clusterDomain: cozy.local
+  maxPods: 250
+nodes:
+- role: control-plane
diff --git a/hack/e2e-isp-hosted-package.yaml b/hack/e2e-isp-hosted-package.yaml
new file mode 100644
index 0000000000..189b0a901e
--- /dev/null
+++ b/hack/e2e-isp-hosted-package.yaml
@@ -0,0 +1,17 @@
+# Platform Package for the isp-hosted lane (.github/workflows/e2e-isp-hosted.yaml).
+# The cluster is kind, which brings its own CNI, kube-proxy and default
+# StorageClass, so nothing here configures networking or storage: providing
+# them is the host's job on this variant. The endpoint is the kind
+# control-plane container's name on the docker network the sandbox joins.
+apiVersion: cozystack.io/v1alpha1
+kind: Package
+metadata:
+  name: cozystack.cozystack-platform
+spec:
+  variant: isp-hosted
+  components:
+    platform:
+      values:
+        publishing:
+          host: "example.org"
+          apiServerEndpoint: "https://cozy-hosted-control-plane:6443"
diff --git a/hack/e2e-platform-packages.sh b/hack/e2e-platform-packages.sh
new file mode 100755
index 0000000000..06a9f16dbe
--- /dev/null
+++ b/hack/e2e-platform-packages.sh
@@ -0,0 +1,127 @@
+#!/bin/sh
+set -eu
+
+api_server_endpoint=${COZY_APISERVER_ENDPOINT:-https://192.168.123.10:6443}
+linstor_drbd_enabled=${COZY_LINSTOR_DRBD_ENABLED:-true}
+
+# Container-mode Talos shares the runner kernel and cannot load DRBD. Keep the
+# normal package graph for QEMU, and let that lane replace two Packages instead:
+# LINSTOR, otherwise identical with its logger sidecar disabled, and kubevirt-cdi,
+# which is NOT identical -- it raises the importer memory limit from CDI's 600M
+# to 4Gi and the request from 60M to 256Mi, for the reason stated above that
+# override below.
+#
+# The consequence is worth stating where it is made, and it applies to both:
+# the merge-gating lane exercises neither the shipped CDI default nor
+# `drbd.enabled: true`. Every e2e lane runs on containers, so whether a
+# tenant worker disk imports at 600M, and whether the DRBD path works at all,
+# is answered by no CI lane.
+case "$linstor_drbd_enabled" in
+  true|false) ;;
+  *)
+    echo "COZY_LINSTOR_DRBD_ENABLED must be true or false, got: $linstor_drbd_enabled" >&2
+    exit 2
+    ;;
+esac
+
+# Packages left out of this install. The container lane always drops the two it
+# replaces below; COZY_DISABLED_PACKAGES adds the complement computed by
+# hack/select-install.sh for the selected suites. Both land under one
+# disabledPackages key, so the list is merged here rather than emitted twice.
+disabled=""
+if [ "$linstor_drbd_enabled" = false ]; then
+  disabled="cozystack.linstor cozystack.kubevirt-cdi"
+fi
+for pkg in ${COZY_DISABLED_PACKAGES:-}; do
+  case "$pkg" in
+    cozystack.*[!a-z0-9.-]* | cozystack.)
+      echo "COZY_DISABLED_PACKAGES: invalid package name: $pkg" >&2
+      exit 2
+      ;;
+    cozystack.?*) ;;
+    *)
+      echo "COZY_DISABLED_PACKAGES: invalid package name: $pkg" >&2
+      exit 2
+      ;;
+  esac
+  case " $disabled " in
+    *" $pkg "*) ;;
+    *) disabled="${disabled:+$disabled }$pkg" ;;
+  esac
+done
+
+cat <<EOF
+apiVersion: cozystack.io/v1alpha1
+kind: Package
+metadata:
+  name: cozystack.cozystack-platform
+spec:
+  variant: isp-full
+  components:
+    platform:
+      values:
+        networking:
+          podCIDR: "10.244.0.0/16"
+          podGateway: "10.244.0.1"
+          serviceCIDR: "10.96.0.0/16"
+          joinCIDR: "100.64.0.0/16"
+        publishing:
+          host: "example.org"
+          apiServerEndpoint: "$api_server_endpoint"
+        # Must match Tenant/root spec.monitoring, which the install sets to
+        # false. Left true, cozystack-basics renders Services into
+        # cozy-monitoring, which a narrow suite selection never creates.
+        monitoring:
+          rootEnabled: false
+        bundles:
+          enabledPackages:
+            - cozystack.external-dns-application
+EOF
+
+if [ -n "$disabled" ]; then
+  echo "          disabledPackages:"
+  for pkg in $disabled; do
+    echo "            - $pkg"
+  done
+fi
+
+if [ "$linstor_drbd_enabled" = false ]; then
+  cat <<'EOF'
+---
+apiVersion: cozystack.io/v1alpha1
+kind: Package
+metadata:
+  name: cozystack.linstor
+spec:
+  variant: default
+  components:
+    linstor:
+      values:
+        drbd:
+          enabled: false
+---
+# CDI's own 600M ceiling was seen to OOM the decompress+convert of a tenant
+# worker disk near 100% on this lane, after which CDI retries from scratch and
+# the DataVolume cycles forever instead of failing. It is an override here and
+# not a chart default because the same import completes at 600M on a QEMU-node
+# cluster, so what has been shown to need the headroom is this substrate, not
+# the product. Move it into packages/system/kubevirt-cdi/values.yaml the day it
+# reproduces somewhere that is not a container lane.
+apiVersion: cozystack.io/v1alpha1
+kind: Package
+metadata:
+  name: cozystack.kubevirt-cdi
+spec:
+  variant: default
+  components:
+    kubevirt-cdi:
+      values:
+        importerResources:
+          requests:
+            cpu: 100m
+            memory: 256Mi
+          limits:
+            cpu: 750m
+            memory: 4Gi
+EOF
+fi
diff --git a/hack/e2e-post-install-prep.sh b/hack/e2e-post-install-prep.sh
index d1ec3070a0..34f50f8ac1 100755
--- a/hack/e2e-post-install-prep.sh
+++ b/hack/e2e-post-install-prep.sh
@@ -3,39 +3,84 @@
 # their respective prerequisites are reachable. Designed to run in the
 # background during the platform HR reconcile wait, so its wall-clock cost
 # overlaps with the wait instead of compounding it.
+#
+# Each LINSTOR prerequisite below sits at the end of a multi-hop reconcile
+# chain: cozystack-operator -> platform HR -> linstor HR -> piraeus-operator
+# -> cert-manager issues the controller TLS -> linstor-controller Deployment
+# -> controller pod -> DB migration. On a loaded CI runner that chain has been
+# observed to take 7-9 min end to end, and the operator alone needs ~70s just
+# to emit the linstor HR. The earlier per-step "object exists" budgets
+# (timeout 60 / timeout 300) were anchored to this script's start, so they
+# raced that reconcile latency; when one lost (linstor HR appeared at ~+70s
+# against a 60s budget) `set -e` aborted the whole script and the install
+# failed. So every wait below tolerates a not-yet-created object without
+# aborting, and each gets its own budget, started when the link before it
+# completed rather than when this script did -- the same shape the LINSTOR
+# node and MetalLB CRD waits further down already have.
+#
+# One budget shared by the whole chain instead fails the install whenever the
+# chain merely runs long, because the head of it eats the window and the tail
+# inherits the remainder. Both halves were observed inside a single 15m window
+# on one run: the linstor HR went Ready 452s in, and the Deployment needed a
+# further ~520s because the controller's DB migration lost its connection to
+# the apiserver and retried four times before succeeding. Neither figure is
+# anomalous and neither exceeds the budget on its own; only their sum did, and
+# the install failed naming the Deployment as though it were broken.
+#
+# What a per-link budget buys is not speed but a guarantee: every link gets its
+# whole allowance no matter what the links ahead of it spent, so the tail of the
+# chain can no longer be failed by the head merely being slow. Detecting a link
+# that is genuinely stuck does not get faster, and for the second link it gets
+# slower, because its budget starts when the first one finished: a Deployment
+# that never converges is reported later by however long the HelmRelease took.
+# A first link that never becomes Ready is reported at the same moment as
+# before, since its budget still starts with the script.
+#
+# The cost is the ceiling: two waits at LINK_BUDGET each put the worst case at
+# twice that figure rather than once, ahead of the 300s node wait, the 600s
+# StorageProfile wait in container mode and the 300s MetalLB wait below, plus
+# the bound on each call that does work, and still well inside the timeout the
+# job carries.
 set -eu
 
-echo "[post-install-prep] waiting for linstor HelmRelease object to exist"
-timeout 60 sh -ec 'until kubectl get hr/linstor -n cozy-linstor >/dev/null 2>&1; do sleep 2; done'
-
-echo "[post-install-prep] waiting for linstor HelmRelease to be Ready"
-kubectl wait helmrelease/linstor -n cozy-linstor --for=condition=Ready --timeout=15m
-
-echo "[post-install-prep] waiting for linstor-controller deployment to exist"
-timeout 300 sh -ec 'until kubectl get deploy/linstor-controller -n cozy-linstor >/dev/null 2>&1; do sleep 2; done'
-
-echo "[post-install-prep] waiting for linstor-controller to be Available"
-kubectl wait deployment/linstor-controller -n cozy-linstor --timeout=5m --for=condition=available
+# The QEMU lane gives every satellite a private /dev/vdc and lets LINSTOR
+# create the zpool. Container nodes share the runner kernel, where zpools are
+# global, so hack/e2e-container-up.sh creates one node-distinct pool ahead of
+# time and the satellite must register that existing pool instead.
+validate_linstor_storage_mode() {
+  case "${COZY_LINSTOR_DRBD_ENABLED:-true}" in
+    true | false) return 0 ;;
+    *)
+      echo "[post-install-prep] COZY_LINSTOR_DRBD_ENABLED must be true or false, got '${COZY_LINSTOR_DRBD_ENABLED}'" >&2
+      return 1
+      ;;
+  esac
+}
 
-echo "[post-install-prep] waiting for 3 LINSTOR nodes Online"
-timeout 60 sh -ec 'until [ $(kubectl exec -n cozy-linstor deploy/linstor-controller -- linstor node list | grep -c Online) -eq 3 ]; do sleep 1; done'
+# KUBECTL_BOUND prefixes the cluster calls in the helpers below with a wall-clock
+# bound. The main body sets it; it stays empty when unit tests source the
+# helpers, because `timeout` execs a binary and would bypass the kubectl shell
+# function those tests substitute, reaching whatever cluster the host points at.
+KUBECTL_BOUND=
 
-echo "[post-install-prep] creating LINSTOR storage pools (parallel across nodes)"
-created_pools=$(kubectl exec -n cozy-linstor deploy/linstor-controller -- linstor sp l -s data --pastable | awk '$2 == "data" {printf " " $4} END{printf " "}')
-pids=""
-for node in srv1 srv2 srv3; do
-  case $created_pools in
-    *" $node "*) echo "  pool 'data' already exists on $node"; continue;;
+create_linstor_storage_pool() {
+  e2e_linstor_node=$1
+  case "${COZY_LINSTOR_DRBD_ENABLED:-true}" in
+    true)
+      $KUBECTL_BOUND kubectl exec -n cozy-linstor deploy/linstor-controller -- \
+        linstor physical-storage create-device-pool zfs "$e2e_linstor_node" /dev/vdc \
+        --pool-name data --storage-pool data
+      ;;
+    false)
+      $KUBECTL_BOUND kubectl exec -n cozy-linstor deploy/linstor-controller -- \
+        linstor storage-pool create zfs "$e2e_linstor_node" data "data-$e2e_linstor_node"
+      ;;
+    *) return 2 ;;
   esac
-  kubectl exec -n cozy-linstor deploy/linstor-controller -- linstor ps cdp zfs ${node} /dev/vdc --pool-name data --storage-pool data &
-  pids="$pids $!"
-done
-for pid in $pids; do
-  wait "$pid"
-done
+}
 
-echo "[post-install-prep] applying StorageClasses"
-kubectl apply -f - <<'EOF'
+render_linstor_storageclasses() {
+  cat <<'EOF'
 ---
 apiVersion: storage.k8s.io/v1
 kind: StorageClass
@@ -50,6 +95,13 @@ parameters:
   linstor.csi.linbit.com/allowRemoteVolumeAccess: "false"
 volumeBindingMode: WaitForFirstConsumer
 allowVolumeExpansion: true
+EOF
+
+  if [ "${COZY_LINSTOR_DRBD_ENABLED:-true}" = false ]; then
+    return 0
+  fi
+
+  cat <<'EOF'
 ---
 apiVersion: storage.k8s.io/v1
 kind: StorageClass
@@ -68,12 +120,236 @@ parameters:
 volumeBindingMode: Immediate
 allowVolumeExpansion: true
 EOF
+}
+
+# CDI infers ReadWriteMany/Block first for the LINSTOR provisioner because it
+# assumes a DRBD-capable StorageClass. The container lane deliberately exposes
+# only LINSTOR's local storage layer, and linstor-csi rejects RWX without DRBD.
+# Pin the one class used by that lane to the RWO/Block combination phase-0
+# proved before any DataVolume can consume the inferred default.
+patch_local_cdi_storage_profile() {
+  $KUBECTL_BOUND kubectl patch storageprofile local --request-timeout=60s --type merge \
+    -p '{"spec":{"claimPropertySets":[{"accessModes":["ReadWriteOnce"],"volumeMode":"Block"}]}}'
+}
+
+# Unit tests source the pure helpers above without reaching a cluster.
+if [ "${E2E_POST_INSTALL_PREP_LIB:-false}" = true ]; then
+  return 0 2>/dev/null || exit 0
+fi
+
+if ! validate_linstor_storage_mode; then
+  exit 2
+fi
+
+# Every call that does work carries a bound, not only the waits: the caller
+# blocks in `wait` on this script, so one call that never returns holds the
+# install open until the job's own ceiling instead of failing the step. A
+# deadline checked between loop iterations does not cover the call inside the
+# iteration. Plain requests also carry a --request-timeout strictly inside the
+# outer bound, so kubectl gets to name the reason before the kill lands; exec
+# streams get the outer bound alone. When that bound fires, `timeout` prints
+# nothing and kubectl dies on the signal before it can, so the wrapper says
+# which call it was: otherwise the log ends on the step's announcement line.
+# Only 124 is named. 137 is also what `kubectl exec` returns when the remote
+# command is OOM-killed, so reading it as this bound would name the wrong cause.
+CALL_BOUND=300
+bounded() {
+  bounded_rc=0
+  timeout -k 5 "$CALL_BOUND" "$@" || bounded_rc=$?
+  if [ "$bounded_rc" -eq 124 ]; then
+    echo "[post-install-prep] killed after ${CALL_BOUND}s: $*" >&2
+  fi
+  return "$bounded_rc"
+}
+KUBECTL_BOUND=bounded
+
+# Per-link budget in seconds, applied by wait_for_linstor to each link separately.
+LINK_BUDGET=900
+
+# wait_for_linstor <description> <kubectl-wait-args...>
+# Polls `kubectl wait` until it succeeds or this link's budget elapses. The
+# name says linstor because the timeout diagnostics below read cozy-linstor
+# unconditionally: the wait itself is generic over its kubectl arguments, but
+# what it dumps on the way out is not, and a caller elsewhere would get the
+# wrong namespace's pods presented as evidence.
+# kubectl wait exits non-zero immediately when the object does not exist yet,
+# so the loop tolerates "not created yet" without the set -e cliff that a bare
+# `kubectl wait` would trigger on a NotFound. The per-attempt timeout shrinks
+# to the budget remaining, so the final attempt can consume the rest of it.
+# The outer `timeout` sits above that: --timeout covers only the watch, not the
+# GET that resolves the object first, which has no deadline of its own.
+# An expired credential or an RBAC denial exits the same way, and only the
+# text tells them apart, so stderr is kept and printed whenever it changes:
+# once for a NotFound repeated every poll, and again when the cause changes.
+# It is printed rather than matched to fail fast, because apiserver restarts
+# during install produce the same connection and auth errors transiently.
+wait_for_linstor() {
+  desc=$1
+  shift
+  echo "[post-install-prep] waiting for ${desc}"
+  deadline=$(( $(date +%s) + LINK_BUDGET ))
+  last_err=
+  while :; do
+    remaining=$(( deadline - $(date +%s) ))
+    if [ "$remaining" -le 0 ]; then
+      echo "[post-install-prep] timed out after ${LINK_BUDGET}s waiting for ${desc}; last kubectl error: ${last_err:-none}" >&2
+      # The description names the object waited on, not the link of the chain
+      # that held it up, and those differ: the same "Deployment not Available"
+      # has been reached with the controller pod crash-looping its migration
+      # init container and with that pod unschedulable because cert-manager had
+      # not issued its client TLS Secret yet. The pod list separates the two,
+      # and the namespace events carry the reason a volume or an image failed.
+      # `kubectl events` rather than `kubectl get events`: it orders by when an
+      # event was last seen, so a condition that has been repeating for minutes
+      # -- which is what a stuck mount looks like -- stays inside the window
+      # instead of being pushed out of it by newer one-off events. It also has
+      # no --sort-by, so it cannot fail the whole read the way a sort key does
+      # when it is absent from any single item; .lastTimestamp is unset on an
+      # Event written through events.k8s.io/v1, and that failure prints nothing
+      # at all. Every read here keeps its stderr, because a diagnostic that fails
+      # silently is indistinguishable from a namespace with nothing to report
+      # -- the very distinction being drawn here. Each is bounded, since the
+      # caller is blocked in `wait` and a wedged apiserver would otherwise hold
+      # the install open until the job's own timeout; the client budget is
+      # strictly the smaller of the two, so kubectl gets to name the reason
+      # before the outer kill takes it away.
+      # The release list comes first: a linstor HelmRelease that never goes
+      # Ready can be held by a dependency further up the chain rather than
+      # failing itself, and each release's Ready message names what it waits
+      # on, so the list points at the release that is actually stuck, which
+      # the cozy-linstor pods cannot.
+      timeout -k 5 30 kubectl get hr -A \
+        --request-timeout=10s 2>&1 | tail -n 300 >&2
+      timeout -k 5 30 kubectl get pods -n cozy-linstor -o wide \
+        --request-timeout=10s 2>&1 | tail -n 30 >&2
+      timeout -k 5 30 kubectl events -n cozy-linstor \
+        --request-timeout=10s 2>&1 | tail -n 30 >&2
+      return 1
+    fi
+    attempt_rc=0
+    { attempt_err=$(timeout -k 5 $(( remaining + 30 )) \
+      kubectl wait "$@" --timeout="${remaining}s" 2>&1 >&3); } 3>&1 || attempt_rc=$?
+    if [ "$attempt_rc" -eq 0 ]; then
+      return 0
+    fi
+    # A bound that fires leaves no text: `timeout` prints nothing and kubectl
+    # dies on the signal. Not a remote exit code here, so 137 is the -k kill.
+    case $attempt_rc in
+      124 | 137) attempt_err="attempt cut by its outer bound after $(( remaining + 30 ))s" ;;
+    esac
+    if [ -n "$attempt_err" ] && [ "$attempt_err" != "$last_err" ]; then
+      printf '%s\n' "$attempt_err" | sed 's/^/[post-install-prep] /' >&2
+      last_err=$attempt_err
+    fi
+    sleep 5
+  done
+}
+
+# controller_reachable: true only while the linstor-controller Service has at
+# least one *ready* endpoint. The linstor CLI below dials that Service
+# (linstor+ssl://linstor-controller:3371), and a ClusterIP is routable only once
+# its Service has a ready backend -- otherwise the dial fails with
+# "[Errno 113] No route to host" (EHOSTUNREACH). In the core Endpoints object the
+# ready set is .subsets[].addresses (peers not yet ready sit in
+# .subsets[].notReadyAddresses), so a non-empty addresses list is exactly
+# ">=1 ready backend". Missing object / API error -> empty -> not reachable.
+controller_reachable() {
+  [ -n "$(timeout -k 5 30 kubectl get endpoints linstor-controller -n cozy-linstor \
+    --request-timeout=10s -o jsonpath='{.subsets[*].addresses[*].ip}' 2>/dev/null)" ]
+}
+
+# wait_for_object <budget-seconds> <description> <kubectl-get-args...>
+# Polls until `kubectl get` finds the objects. NotFound is the ordinary state
+# while polling, so each attempt's stderr is dropped; on the way out the read
+# runs once more with stderr kept, so a timeout says which object is missing
+# instead of ending on the "waiting for" line.
+wait_for_object() {
+  budget=$1
+  desc=$2
+  shift 2
+  echo "[post-install-prep] waiting for ${desc}"
+  deadline=$(( $(date +%s) + budget ))
+  until timeout -k 5 30 kubectl get "$@" --request-timeout=10s >/dev/null 2>&1; do
+    if [ "$(date +%s)" -ge "$deadline" ]; then
+      echo "[post-install-prep] timed out after ${budget}s waiting for ${desc}" >&2
+      timeout -k 5 30 kubectl get "$@" --request-timeout=10s 2>&1 | tail -n 30 >&2
+      return 1
+    fi
+    sleep 2
+  done
+}
+
+wait_for_linstor "linstor HelmRelease to be Ready" \
+  helmrelease/linstor -n cozy-linstor --for=condition=Ready
+wait_for_linstor "linstor-controller Deployment to be Available" \
+  deployment/linstor-controller -n cozy-linstor --for=condition=available
+
+# Wait for 3 satellites to register Online, but gate every probe on a ready
+# controller Service endpoint. The "Deployment Available" check above is a
+# one-shot gate that goes stale: the controller carries
+# reloader.stakater.com/auto=true and mounts the cert-manager-issued API-TLS
+# Secret (see packages/system/linstor/templates/cluster.yaml). When cert-manager
+# (re)writes that Secret during bring-up, reloader rolls the single-replica
+# controller, dropping its Service to zero ready endpoints *after* Available
+# already passed. A blind CLI dial into that window is what surfaced as the
+# tolerated "[Errno 113] No route to host" churn. Probing only while the Service
+# is routable removes that churn at the root -- a mid-loop reload re-waits for
+# the endpoint instead of erroring -- while "Online == 3" stays the real
+# satellite-convergence assertion. The dedicated 300s budget is preserved from
+# the previous `timeout 300`; `set -e` is disabled inside an until-condition, so
+# a not-yet-reachable controller does not abort the script.
+echo "[post-install-prep] waiting for linstor-controller endpoint + 3 LINSTOR nodes Online"
+node_deadline=$(( $(date +%s) + 300 ))
+until controller_reachable \
+  && [ "$(timeout -k 5 30 kubectl exec -n cozy-linstor deploy/linstor-controller -- linstor node list 2>/dev/null | grep -c Online)" -eq 3 ]; do
+  if [ "$(date +%s)" -ge "$node_deadline" ]; then
+    echo "[post-install-prep] timed out waiting for linstor-controller endpoint + 3 LINSTOR nodes Online" >&2
+    timeout -k 5 30 kubectl get endpoints linstor-controller -n cozy-linstor -o wide \
+      --request-timeout=10s 2>&1 | tail -n 30 >&2
+    timeout -k 5 30 kubectl get pods -n cozy-linstor -o wide \
+      --request-timeout=10s 2>&1 | tail -n 30 >&2
+    exit 1
+  fi
+  sleep 2
+done
+
+echo "[post-install-prep] creating LINSTOR storage pools (parallel across nodes)"
+# Read on its own rather than piped into awk, which would hide its status: a
+# listing that failed or timed out reads as "no pools yet", and the creates it
+# triggers then fail on the pools that do exist, naming the wrong reason.
+pool_list=$($KUBECTL_BOUND kubectl exec -n cozy-linstor deploy/linstor-controller -- linstor sp l -s data --pastable)
+created_pools=$(printf '%s\n' "$pool_list" | awk '$2 == "data" {printf " " $4} END{printf " "}')
+pids=""
+for node in srv1 srv2 srv3; do
+  case $created_pools in
+    *" $node "*) echo "  pool 'data' already exists on $node"; continue;;
+  esac
+  create_linstor_storage_pool "$node" &
+  pids="$pids $!"
+done
+for pid in $pids; do
+  wait "$pid"
+done
+
+echo "[post-install-prep] applying StorageClasses"
+render_linstor_storageclasses | $KUBECTL_BOUND kubectl apply --request-timeout=60s -f -
+
+if [ "${COZY_LINSTOR_DRBD_ENABLED:-true}" = false ]; then
+  wait_for_object 600 "CDI StorageProfile/local" storageprofile local
+  echo "[post-install-prep] forcing CDI StorageProfile/local to RWO/Block"
+  patch_local_cdi_storage_profile
+fi
 
-echo "[post-install-prep] waiting for MetalLB CRDs"
-timeout 300 sh -ec 'until kubectl get crd ipaddresspools.metallb.io l2advertisements.metallb.io >/dev/null 2>&1; do sleep 2; done'
+# The CRDs come from the metallb release, so its state is what separates CRDs
+# that are late from an operator that never got as far as installing them.
+if ! wait_for_object 300 "MetalLB CRDs" crd ipaddresspools.metallb.io l2advertisements.metallb.io; then
+  timeout -k 5 30 kubectl get hr -n cozy-metallb \
+    --request-timeout=10s 2>&1 | tail -n 30 >&2
+  exit 1
+fi
 
 echo "[post-install-prep] applying MetalLB IPAddressPool"
-kubectl apply -f - <<'EOF'
+$KUBECTL_BOUND kubectl apply --request-timeout=60s -f - <<'EOF'
 ---
 apiVersion: metallb.io/v1beta1
 kind: L2Advertisement
diff --git a/hack/e2e-prepare-cluster-container.bats b/hack/e2e-prepare-cluster-container.bats
new file mode 100644
index 0000000000..a92f5bbae2
--- /dev/null
+++ b/hack/e2e-prepare-cluster-container.bats
@@ -0,0 +1,149 @@
+#!/usr/bin/env bats
+# -----------------------------------------------------------------------------
+# Cozystack E2E provisioning — CONTAINER lane
+#
+# The counterpart to hack/e2e-prepare-cluster.bats. That file boots three QEMU
+# guests; this one takes over after hack/e2e-container-up.sh has started three
+# Talos containers on the runner's docker daemon and attached this sandbox to
+# their network. Everything from bootstrap onward is deliberately the same shape
+# as the QEMU lane so the two stay comparable, and both hand off an identical
+# cluster to hack/e2e-install-cozystack.bats.
+#
+# Why the split: containers cannot nest inside the sandbox the way QEMU guests
+# do, so the nodes must be siblings on the host daemon for hack/e2e-compose.yaml's
+# /dev and /run/udev binds to resolve against the real host devtmpfs. Only the
+# host-side half needs a docker socket; this half needs only the network.
+#
+# Addressing, CPU and memory match the QEMU lane exactly, so the MetalLB
+# 192.168.123.200-250 pool and hack/e2e-post-install-prep.sh are unchanged.
+# The one deliberate difference is the API endpoint: container mode has no ARP
+# VIP, so .11 stands in for the QEMU lane's 192.168.123.10.
+# -----------------------------------------------------------------------------
+
+HACK_DIR="$(cd "$(dirname "${BATS_TEST_FILENAME:-$0}")" && pwd)"
+E2E_CONTAINER_UP_LIB=true . "$HACK_DIR/e2e-container-up.sh"
+
+@test "Talos API is reachable on all three container nodes" {
+  # e2e-container-up.sh has already started them; this is the handoff check, and
+  # it is a wait rather than a probe because container start is asynchronous.
+  if ! timeout 180 sh -ec 'until nc -nz 192.168.123.11 50000 && nc -nz 192.168.123.12 50000 && nc -nz 192.168.123.13 50000; do sleep 1; done'; then
+    echo "Talos API never came up on 192.168.123.11-13:50000." >&2
+    echo "The sandbox reaches the nodes over the compose network it was attached to;" >&2
+    echo "if this times out, check that hack/e2e-container-up.sh ran and that the" >&2
+    echo "sandbox is on the cozy-e2e_talos network." >&2
+    exit 1
+  fi
+}
+
+@test "Host kernel modules are usable from inside the nodes" {
+  # THE trap of this lane. machine.kernel.modules is a silent no-op in container
+  # mode -- kernel_module_spec.go returns early on ModeContainer with no error
+  # and no event -- so a lane that carried the QEMU patch over would look like it
+  # worked and fail much later as a CNI or storage error. e2e-container-up.sh
+  # loads these on the host; this asserts the nodes actually see them, which is
+  # the property that matters and is not implied by the host check alone.
+  for mod in openvswitch zfs; do
+    if ! talosctl read /proc/modules -n 192.168.123.11 -e 192.168.123.11 | grep -q "^${mod} "; then
+      echo "Kernel module '${mod}' is not visible from srv1." >&2
+      echo "Container nodes share the host kernel and Talos cannot load modules in" >&2
+      echo "container mode, so this must be loaded on the host before they start." >&2
+      exit 1
+    fi
+  done
+}
+
+@test "/dev/kvm is present inside the nodes" {
+  # KubeVirt's device plugin needs it, and its presence is what makes the tenant
+  # workers run under real KVM rather than TCG emulation.
+  if ! talosctl ls /dev/kvm -n 192.168.123.11 -e 192.168.123.11 >/dev/null 2>&1; then
+    echo "/dev/kvm is missing inside srv1 — KubeVirt cannot advertise devices.kubevirt.io/kvm." >&2
+    echo "hack/e2e-compose.yaml binds the host /dev; check the host exposes /dev/kvm." >&2
+    exit 1
+  fi
+}
+
+@test "Bootstrap Talos cluster" {
+  # Retry for up to 120s: talosctl bootstrap refuses with "time is not in sync
+  # yet" until NTP converges on a freshly started node. This is the same
+  # allowance the QEMU lane makes, and it is a genuine infrastructure wait, not
+  # a retry around product logic.
+  #
+  # If it never converges, the usual cause is that the nodes cannot reach the
+  # internet at all rather than slow NTP -- most often because docker sets
+  # `-P FORWARD DROP` and the compose bridge's traffic is being dropped.
+  if ! timeout 120 sh -ec 'until talosctl bootstrap -n 192.168.123.11 -e 192.168.123.11; do sleep 2; done'; then
+    echo "talosctl bootstrap never succeeded." >&2
+    echo "If the error was 'time is not in sync yet', the nodes likely have no egress:" >&2
+    echo "check 'iptables -S FORWARD' on the host for a DROP policy over the compose bridge." >&2
+    talosctl dmesg -n 192.168.123.11 -e 192.168.123.11 || true
+    exit 1
+  fi
+}
+
+@test "Wait until etcd is healthy" {
+  # Same 5m budget and the same reason as the QEMU lane: a 3-node etcd converges
+  # through Talos's serialized learner promotion, so the third member is only
+  # promoted once the second has caught up.
+  if ! timeout 300 sh -ec 'until talosctl etcd members -n 192.168.123.11,192.168.123.12,192.168.123.13 -e 192.168.123.11 >/dev/null 2>&1; do sleep 1; done'; then
+    talosctl dmesg -n 192.168.123.11,192.168.123.12,192.168.123.13 -e 192.168.123.11 || true
+    exit 1
+  fi
+  timeout 60 sh -ec 'while talosctl etcd members -n 192.168.123.11,192.168.123.12,192.168.123.13 -e 192.168.123.11 2>&1 | grep -q "rpc error"; do sleep 1; done'
+}
+
+@test "Retrieve kubeconfig and register all three nodes" {
+  rm -f kubeconfig
+  # No ARP VIP in container mode, so the endpoint is a node IP rather than the
+  # QEMU lane's 192.168.123.10.
+  talosctl kubeconfig kubeconfig -e 192.168.123.11 -n 192.168.123.11
+
+  if ! timeout 120 sh -ec 'until [ $(kubectl get node --no-headers | wc -l) -eq 3 ]; do sleep 1; done'; then
+    echo "Fewer than three nodes registered:" >&2
+    kubectl get nodes -o wide >&2 || true
+    exit 1
+  fi
+}
+
+@test "Node allocatable matches the container limits" {
+  # Container mode exposes host-wide capacity through /proc, so without the
+  # systemReserved values generated by e2e-container-up.sh every one of these
+  # nodes advertises the runner's full 32 CPU / ~125 GiB. That lets the
+  # scheduler pack far beyond each 8 CPU / 24 GiB cgroup and turns later OOMs
+  # into apparent workload flakes. Check the scheduler-visible result, not just
+  # the machine-config input.
+  local node cpu cpu_m memory memory_kib
+  local node_cpu_limit="${COZY_E2E_NODE_CPUS:-8}"
+  local node_memory_limit_mib="${COZY_E2E_NODE_MEMORY_MIB:-24576}"
+  local max_cpu_m=$(( node_cpu_limit * 1000 ))
+  local min_cpu_m=$(( max_cpu_m - 1000 ))
+  local max_memory_kib=$(( node_memory_limit_mib * 1024 ))
+  local min_memory_kib=$(( max_memory_kib - 1024 * 1024 ))
+
+  for node in srv1 srv2 srv3; do
+    cpu=$(kubectl get node "$node" -o jsonpath='{.status.allocatable.cpu}')
+    case "$cpu" in
+      *m) cpu_m=${cpu%m} ;;
+      *[!0-9]* | '')
+        echo "node $node reported an unreadable allocatable CPU quantity: '$cpu'" >&2
+        return 1
+        ;;
+      *) cpu_m=$(( cpu * 1000 )) ;;
+    esac
+
+    memory=$(kubectl get node "$node" -o jsonpath='{.status.allocatable.memory}')
+    if ! memory_kib=$(kubernetes_memory_to_kib "$memory"); then
+      echo "node $node reported an unreadable allocatable memory quantity: '$memory'" >&2
+      return 1
+    fi
+
+    if [ "$cpu_m" -lt "$min_cpu_m" ] || [ "$cpu_m" -gt "$max_cpu_m" ]; then
+      echo "node $node allocatable CPU $cpu is outside ${min_cpu_m}-${max_cpu_m}m" >&2
+      return 1
+    fi
+    if [ "$memory_kib" -lt "$min_memory_kib" ] || [ "$memory_kib" -gt "$max_memory_kib" ]; then
+      echo "node $node allocatable memory $memory is outside ${min_memory_kib}-${max_memory_kib}Ki" >&2
+      return 1
+    fi
+    echo "$node allocatable: ${cpu}/${memory}"
+  done
+}
diff --git a/hack/e2e-prepare-cluster.bats b/hack/e2e-prepare-cluster.bats
index 7c5e85ff15..1869ddb182 100644
--- a/hack/e2e-prepare-cluster.bats
+++ b/hack/e2e-prepare-cluster.bats
@@ -96,13 +96,25 @@ EOF
 }
 
 @test "Boot QEMU VMs" {
+  # cache=unsafe drops guest flush pass-through on these ephemeral CI disks.
+  # Otherwise every management-etcd Raft-commit fsync propagates to the
+  # host-backed raw files, and under the concurrent image/CDI I/O storm etcd
+  # stalls for seconds, the apiserver returns context-deadline-exceeded, and
+  # operators lose their leader-election leases together. The VMs are recreated
+  # per run, so the durability we trade away here is never needed.
   for i in 1 2 3; do
+    # `debug-threads=on` names the vCPU threads (`CPU N/KVM`) so the QEMU
+    # thread capture on the node-join failure path can tell a vCPU from an IO
+    # thread; without it every thread reports the bare process name. QEMU only
+    # renames threads when the flag is passed, so the capture's legend and its
+    # fixtures are pinned to this line carrying it.
     qemu-system-x86_64 -machine type=pc,accel=kvm -cpu host -smp 8 -m 24576 \
+      -name guest=srv${i},debug-threads=on \
       -device virtio-net,netdev=net0,mac=52:54:00:12:34:5${i} \
       -netdev tap,id=net0,ifname=cozy-srv${i},script=no,downscript=no \
-      -drive file=srv${i}/system.img,if=virtio,format=raw \
-      -drive file=srv${i}/seed.img,if=virtio,format=raw \
-      -drive file=srv${i}/data.img,if=virtio,format=raw \
+      -drive file=srv${i}/system.img,if=virtio,format=raw,cache=unsafe \
+      -drive file=srv${i}/seed.img,if=virtio,format=raw,cache=unsafe \
+      -drive file=srv${i}/data.img,if=virtio,format=raw,cache=unsafe \
       -display none -daemonize -pidfile srv${i}/qemu.pid
   done
 
@@ -130,6 +142,10 @@ machine:
     - name: drbd
       parameters:
         - usermode_helper=disabled
+    # Talos v1.14 kernels have an empty modprobe path
+    # (siderolabs/pkgs#1565), so DRBD's request_module() for its transport
+    # on the first new-peer no longer loads anything.
+    - name: drbd_transport_tcp
     - name: zfs
     - name: spl
   registries:
@@ -137,27 +153,6 @@ machine:
       docker.io:
         endpoints:
         - https://mirror.gcr.io
-      #docker.io:
-      #  endpoints:
-      #  - https://dockerio.nexus.aenix.org
-      #cr.fluentbit.io:
-      #  endpoints:
-      #  - https://fluentbit.nexus.aenix.org
-      #docker-registry3.mariadb.com:
-      #  endpoints:
-      #  - https://mariadb.nexus.aenix.org
-      #gcr.io:
-      #  endpoints:
-      #  - https://gcr.nexus.aenix.org
-      #ghcr.io:
-      #  endpoints:
-      #  - https://ghcr.nexus.aenix.org
-      #quay.io:
-      #  endpoints:
-      #  - https://quay.nexus.aenix.org
-      #registry.k8s.io:
-      #  endpoints:
-      #  - https://k8s.nexus.aenix.org
   files:
   - content: |
       [plugins]
@@ -165,6 +160,17 @@ machine:
           device_ownership_from_security_context = true
     path: /etc/cri/conf.d/20-customization.part
     op: create
+  - op: overwrite
+    path: /etc/lvm/lvm.conf
+    permissions: 0o644
+    content: |
+      backup {
+        backup = 0
+        archive = 0
+      }
+      devices {
+        global_filter = [ "r|^/dev/drbd.*|", "r|^/dev/dm-.*|", "r|^/dev/zd.*|", "r|^/dev/loop.*|" ]
+      }
 
 cluster:
   apiServer:
@@ -177,8 +183,18 @@ cluster:
     cni:
       name: none
     dnsDomain: cozy.local
+    # Deliberately NOT the kube-ovn POD_CIDR (10.244.0.0/16, set as
+    # networking.podCIDR by the install step). kube-ovn owns pod IPAM and
+    # allocates flat from POD_CIDR; cilium is chained behind it and allocates
+    # no pod addresses, but it still carves its own per-node router and
+    # Ingress IPs out of Node.spec.podCIDR, which kube-controller-manager
+    # slices from this value. Overlap and kube-ovn eventually hands a pod an
+    # address cilium already holds. hack/sandbox-cidr-disjoint.bats guards it.
+    # Picking a replacement: 100.64.0.0/16 is the kube-ovn join range and
+    # 100.66.0.0/16 is kilo's transit range, so the free slot in this corner of
+    # RFC 6598 is the one below.
     podSubnets:
-    - 10.244.0.0/16
+    - 100.65.0.0/16
     serviceSubnets:
     - 10.96.0.0/16
 EOF
@@ -220,7 +236,16 @@ EOF
   fi
 
   rm -f controlplane.yaml worker.yaml talosconfig kubeconfig
+  # Pin Kubernetes to v1.33.12. talosctl v1.13.5 now defaults to a much newer
+  # k8s (1.36.x) that is outside cozystack's supported range, so e2e pins back
+  # to the 1.33 line. v1.33.12 also carries the fix for the
+  # kube-controller-manager VAP status type-checker nil-pointer panic on
+  # `additionalProperties: true` schemas (kubernetes/kubernetes#135155,
+  # backported to release-1.33 in #136958, first released in v1.33.10); without
+  # it, cozystack-api's aggregated Tenant schema crash-loops KCM during install.
+  # See cozystack#2863.
   talosctl gen config --with-secrets secrets.yaml cozystack https://192.168.123.10:6443 \
+           --kubernetes-version v1.33.12 \
            --config-patch=@patch.yaml --config-patch-control-plane @patch-controlplane.yaml
 }
 
@@ -241,8 +266,15 @@ EOF
   # ephemeral runners can take several attempts of ~5s each.
   timeout 60 sh -ec 'until talosctl bootstrap -n 192.168.123.11 -e 192.168.123.11; do sleep 2; done'
 
-  # Wait until etcd is healthy
-  if ! timeout 180 sh -ec 'until talosctl etcd members -n 192.168.123.11,192.168.123.12,192.168.123.13 -e 192.168.123.10 >/dev/null 2>&1; do sleep 1; done'; then
+  # Wait until etcd is healthy.
+  # Budget is 5m, not 3m: a 3-node etcd converges via Talos's serialized
+  # learner promotion (etcd admits one learner at a time), so the third member
+  # is only promoted after the second is fully caught up. On a loaded ephemeral
+  # runner this deterministic path can legitimately approach ~3m wall clock —
+  # a 180s ceiling photo-finishes against it and times out a cluster that is
+  # actually healthy. The wait itself is already event-driven (poll until
+  # members respond); only the ceiling needed widening.
+  if ! timeout 300 sh -ec 'until talosctl etcd members -n 192.168.123.11,192.168.123.12,192.168.123.13 -e 192.168.123.10 >/dev/null 2>&1; do sleep 1; done'; then
     talosctl dmesg -n 192.168.123.11,192.168.123.12,192.168.123.13 -e 192.168.123.10 || true
     exit 1
   fi
diff --git a/hack/e2e-prepull-images.sh b/hack/e2e-prepull-images.sh
index 411c8d9f7f..bf6c56a76f 100755
--- a/hack/e2e-prepull-images.sh
+++ b/hack/e2e-prepull-images.sh
@@ -31,6 +31,21 @@ fi
 echo "Pre-pulling ${#images[@]} image(s):"
 printf '  %s\n' "${images[@]}"
 
+# A literal `null` means the caller's yq filter matched a container that has
+# no `image:` field -- typically a strategic-merge pod-template fragment
+# inside a CR, which overrides a few fields and pulls nothing. Catch it here:
+# passed through, it becomes a container with an empty image and `kubectl
+# apply` rejects the DaemonSet by container index, naming neither the filter
+# nor the chart that produced it.
+for image in "${images[@]}"; do
+  if [[ "$image" == "null" ]]; then
+    echo "e2e-prepull-images: refusing a literal 'null' image reference." >&2
+    echo "  Some container in the caller's yq filter has no 'image:' field." >&2
+    echo "  Drop nulls at the source (see hack/e2e-install-cozystack.bats)." >&2
+    exit 1
+  fi
+done
+
 containers=""
 i=0
 for image in "${images[@]}"; do
diff --git a/hack/e2e-runner-identity.sh b/hack/e2e-runner-identity.sh
new file mode 100755
index 0000000000..6145b86b42
--- /dev/null
+++ b/hack/e2e-runner-identity.sh
@@ -0,0 +1,754 @@
+#!/bin/sh
+#
+# e2e-runner-identity.sh -- record which machine an e2e run landed on.
+#
+# WHY THE RECORD IS NEEDED AT ALL
+#
+# The e2e lanes ask for a runner class, not for a machine. A flex shape is
+# filled from whatever capacity the pool has at the time, so the same lane can
+# be served by two processor generations; the region is a preference with a
+# fallback, so it can be served out of a second one. None of that reached the
+# report, which means a red run and a green one could not be compared by the
+# hardware they ran on -- the first question anyone asks about a flake that some
+# runs have and others do not. That comparison is the whole of what this file
+# exists to make possible.
+#
+# WHY IT RUNS A LAYER ABOVE EVERYTHING ELSE IN THE REPORT
+#
+# The metadata service answers on a link-local address. The sandbox container is
+# not guaranteed to have a route to it, and a capture that answered "unreachable"
+# from in there would be saying nothing about the machine while looking exactly
+# like a capture that had tried. So the read is taken on the runner VM, before
+# the container exists, and the record is written into the repository tree that
+# `packages/core/testing/Makefile`'s `apply` target then copies into the
+# container. hack/cozyreport.sh folds that file into the artifact from inside,
+# without going near the endpoint itself.
+#
+# That placement is also what makes the record unconditional. Every workflow that
+# runs the suite reaches the sandbox through `make prepare-env`, so a capture
+# wired into `apply` is taken once per run in each of them, on the green path and
+# the red one alike, with no per-workflow step to keep in step. Written without a
+# count of those workflows on purpose: the count is what goes stale, and the
+# funnel is the property worth stating.
+#
+# WHY ONE READ PER KEY RATHER THAN ONE READ OF THE DOCUMENT
+#
+# The root instance document is the obvious thing to fetch and the wrong thing to
+# fetch. It carries the instance and compartment OCIDs, the display name, the
+# hostname, the image OCID and the whole user-supplied metadata bag, which on a
+# real instance holds authorized keys -- and this record is published as a CI
+# artifact. Fetching it and then filtering makes the privacy property something a
+# reader has to trust a filter for; fetching the individual keys makes it
+# something the wire settles, because the values that must not be published are
+# never asked for.
+#
+# It also removes a guess. Oracle documents the shape sizing under its own
+# subpath, `shapeConfig`, and the root document it documents does not carry that
+# object at all -- so a reader hunting `shapeConfig` inside the root document
+# would have reported the size of every machine as unknown, forever, and blamed
+# the service for it.
+#
+# The cost is one round trip per key instead of one for all of them, over a
+# link-local address, and it is bounded twice: each read carries its own ceiling,
+# and the first read decides whether there is a service to talk to at all. On a
+# machine that is not an OCI instance nothing after that first read is attempted.
+#
+# NEVER FATAL, AND NEVER SLOW, ON ANY PATH
+#
+# This runs inside `Prepare environment`, which is the one retried step in the
+# job. A diagnostic that can fail that step would cost a whole run to say
+# something about the hardware, so every read here is allowed to fail and each
+# failure is written down in the record instead: a runner that is not an OCI
+# instance, or one whose metadata service does not answer, produces an `imds
+# unreachable` line and an exit status of 0. The script therefore sets no
+# errexit; `set -u` stays, since an unset variable here is a bug in this file
+# rather than a fact about the runner.
+#
+# Exiting zero is not enough on its own, because a read that never returns costs
+# the step its whole budget without ever reaching that exit. So every read here is
+# taken through a wall-clock ceiling, which is the same rule hack/cozyreport.sh
+# holds for the host commands it runs, and for the same reason: `lscpu` walks
+# sysfs, and a machine wedged enough to be worth identifying is one where that walk
+# can block. The metadata reads carry curl's own ceiling; the local ones are
+# wrapped in `timeout`.
+#
+# With one stated exception, taken from the same collector: where `timeout` is not
+# on PATH the local reads run unbounded rather than not at all, because a machine
+# with no `timeout` is a missing dependency here and not a fact about the runner,
+# and refusing to collect would trade the whole record for it. The record says so
+# in a `[bounds]` line, so a reader is never left to infer which of the two a
+# missing value was.
+#
+# Environment:
+#   COZY_RUNNER_IDENTITY_FILE   where the record is written (default
+#                               `_out/runner-identity.txt`, relative to the
+#                               caller's cwd). hack/cozyreport.sh reads the same
+#                               default from inside the sandbox container, where
+#                               the repository root is /workspace; changing it
+#                               here only means the report folds in nothing. On the
+#                               CI path packages/core/testing/Makefile SETS this
+#                               rather than deferring to an inherited value,
+#                               because the record has to land inside the tree that
+#                               is copied into the container: a path outside it
+#                               would be written and then never carried in. The
+#                               knob is for the report side and for tests.
+#   COZY_RUNNER_IMDS_TIMEOUT    curl's own ceiling on each metadata read, in
+#                               seconds (default 5). A malformed value falls back
+#                               to the default and the record says which value it
+#                               used. Zero is malformed for this knob rather than
+#                               meaning "no wait": `--max-time 0` removes the
+#                               ceiling outright, the same way a zero passed to
+#                               `timeout` disables it rather than firing at once.
+#   E2E_RUNNER_IDENTITY_LIB     set to define the helpers and return without
+#                               reading anything or writing anything, so the unit
+#                               suite can exercise them directly.
+
+set -u
+
+# Every label this script matches on is an English one, and `lscpu` translates
+# its own. Set once for the whole script rather than in front of the one read
+# that needs it, so a reader does not have to check which of them are locale
+# dependent.
+LC_ALL=C
+export LC_ALL
+
+COZY_RUNNER_IDENTITY_FILE=${COZY_RUNNER_IDENTITY_FILE:-_out/runner-identity.txt}
+COZY_RUNNER_IMDS_TIMEOUT_DEFAULT=5
+
+# The OCI instance metadata endpoint, v2. Held as a literal address rather than a
+# name, which is what makes curl's own `--max-time` a hard ceiling here: the one
+# phase that option does not cover is a blocking name lookup in a curl built
+# without an asynchronous resolver, and there is no name to look up.
+COZY_RUNNER_IMDS_BASE='http://169.254.169.254/opc/v2/instance/'
+
+# The keys this record keeps, in the order they are read and printed. `shape`
+# comes first because it doubles as the probe: if it does not answer, there is no
+# metadata service here and nothing below it is attempted.
+#
+# Both region keys, because they are not the same string: the root key is
+# shortened for some regions (`phx`) while the canonical one is always the full
+# identifier (`us-phoenix-1`), and a record carrying only the short form makes a
+# region fallback harder to read, not easier.
+COZY_RUNNER_IMDS_KEYS='shape region canonicalRegionName availabilityDomain faultDomain'
+
+# How long a metadata scalar may be, and which characters it may hold.
+#
+# What keeps the values that must not be published out of this record is that they
+# are never requested. This guard is narrower and worth describing as what it is: a
+# shape check that refuses an answer which is not ONE value. A service answering the
+# root document, an error page, a redirect target's page or a multi-line body to a
+# per-key request would otherwise have that printed into the record under a key
+# name, and every value this record does keep is drawn from a small alphabet
+# (`VM.Standard.E5.Flex`, `us-chicago-1`, `EMIr:PHX-AD-1`, `FAULT-DOMAIN-3`).
+#
+# What it does NOT do, said here so nobody reads more into it: an identifier or a
+# hostname is inside that alphabet and inside that length, so a service answering
+# one of those to a per-key request would pass this check. The reason that is not
+# a hole in the design is that no key returning one is ever asked for.
+COZY_RUNNER_SCALAR_MAX=128
+COZY_RUNNER_SCALAR_CLASS='A-Za-z0-9:._-'
+
+# The same bound on the key side of the sizing object. A key is printed into the
+# record exactly as a value is, so it is held to a shape and a length too; the
+# longest key this object has published is `networkingBandwidthInGbps`.
+COZY_RUNNER_KEY_MAX=64
+
+# The ceiling on each read of local machine state, and the wrapper that applies
+# it, resolved once so that every read gets the same answer.
+#
+# Empty when `timeout` is absent: the reads then run unbounded and the record says
+# so, rather than every one of them exiting 127 and this script reporting a
+# machine with no kernel, no CPUs and no processor. Five seconds because what goes
+# through here is two clock reads, a uname, a CPU count and one sysfs walk;
+# anything slower than that is the finding rather than the measurement.
+COZY_RUNNER_READ_TIMEOUT=5
+if command -v timeout >/dev/null 2>&1; then
+  COZY_RUNNER_BOUND="timeout -k 2 $COZY_RUNNER_READ_TIMEOUT"
+else
+  COZY_RUNNER_BOUND=""
+fi
+
+# runner_read <command> [args...]: one bounded read of local machine state.
+#
+# Leaves its output in RUNNER_READ_OUT and, when there is none, the reason in
+# RUNNER_READ_WHY; returns 0 only when something was read. Two globals rather
+# than stdout, because a caller taking this through `$( )` would run it in a
+# subshell and the reason would die there -- and the reason is the whole point:
+# a record that simply omits a line reads as a machine nobody asked about.
+runner_read() {
+  RUNNER_READ_OUT=''
+  RUNNER_READ_WHY=''
+  _rr_rc=0
+  # shellcheck disable=SC2086  # an empty COZY_RUNNER_BOUND must vanish, not become ""
+  RUNNER_READ_OUT=$($COZY_RUNNER_BOUND "$@" 2>/dev/null) || _rr_rc=$?
+  if [ -n "$RUNNER_READ_OUT" ]; then
+    # Output AND a non-zero status: the tool printed something and then failed, so
+    # what is in hand may be a prefix of the answer. Kept, because a partial
+    # kernel release still identifies the machine better than nothing, and
+    # reported, because "present but wrong" is the one shape this file's premise
+    # -- every shortfall named -- otherwise lets through.
+    [ "$_rr_rc" -eq 0 ] || RUNNER_READ_WHY="$1 exited $_rr_rc after printing this, so it may be a partial answer"
+    return 0
+  fi
+  case "$_rr_rc" in
+    124 | 137)
+      # 124 is the deadline expiring and 137 is 128+SIGKILL, which our own `-k`
+      # grace produces and so does anything else that kills the read. With no
+      # bound in place neither can be ours, and naming a ceiling that was never
+      # applied would be a mechanism this script did not observe.
+      if [ -z "$COZY_RUNNER_BOUND" ]; then
+        RUNNER_READ_WHY="$1 was killed from outside this script, which ran its reads with no ceiling"
+      else
+        RUNNER_READ_WHY="$1 was cut off by its ${COZY_RUNNER_READ_TIMEOUT}s ceiling (exit $_rr_rc)"
+      fi
+      ;;
+    127) RUNNER_READ_WHY="$1 is not on PATH" ;;
+    0) RUNNER_READ_WHY="$1 answered with nothing" ;;
+    *) RUNNER_READ_WHY="$1 exited $_rr_rc" ;;
+  esac
+  return 1
+}
+
+# runner_imds_timeout: the number to hand curl, and nothing else.
+#
+# Refused rather than passed through: a value that is not a plain run of digits,
+# a zero, a leading zero, or something long enough to be a mistake. Zero is the
+# consequential one -- `--max-time 0` means "no ceiling", the same way a zero
+# handed to `timeout` disables it rather than firing at once, so the malformed case
+# would silently remove the bound this whole function exists to place.
+#
+# The four-digit cap is this script's own judgement and not curl's: curl accepts
+# `--max-time 99999` without complaint and refuses only absurd magnitudes, so
+# nothing downstream would catch a mistyped ceiling. Anything past four digits is
+# more than two hours of waiting inside a step measured in minutes, which is a
+# typo rather than a setting.
+runner_imds_timeout() {
+  case ${COZY_RUNNER_IMDS_TIMEOUT-} in
+    '' | *[!0-9]* | 0* | ?????*) printf '%s' "$COZY_RUNNER_IMDS_TIMEOUT_DEFAULT" ;;
+    *) printf '%s' "$COZY_RUNNER_IMDS_TIMEOUT" ;;
+  esac
+}
+
+# runner_imds_scalar <value>: the value as this record will print it, or nothing
+# when what came back is not a scalar.
+#
+# Surrounding quotes are stripped first, because the service is documented to
+# serve these keys as subpaths and not documented to say whether the value
+# arrives bare or JSON-quoted. Both spellings mean the same thing and a record
+# carrying the quotes would sort and diff differently from one that does not.
+runner_imds_scalar() {
+  _ris_v=$1
+  case $_ris_v in
+    '"'*'"') _ris_v=${_ris_v#\"}; _ris_v=${_ris_v%\"} ;;
+  esac
+  [ -n "$_ris_v" ] || return 1
+  [ "${#_ris_v}" -le "$COZY_RUNNER_SCALAR_MAX" ] || return 1
+  case $_ris_v in
+    *[!$COZY_RUNNER_SCALAR_CLASS]*) return 1 ;;
+  esac
+  printf '%s' "$_ris_v"
+}
+
+# runner_imds_numbers <prefix>: stdin is one flat JSON object, stdout is one
+# `<prefix>.<key>: <value>` line per NUMERIC field in it, plus its own notes under
+# `<prefix>:`. The prefix is a parameter rather than something the caller sticks
+# on afterwards, so that the notes and the values are formatted by whatever knows
+# which of the two each line is.
+#
+# Numbers only, and that is the rule rather than a shortlist of key names. A
+# shortlist is the obvious way to write this and has a failure mode worth
+# avoiding: the sizing keys have been renamed upstream before, and a list that
+# stops matching reports the size of the machine as unknown on every run, quietly.
+# Reading whatever the object holds keeps that visible, and keeping only its
+# numbers is what stops the rule from being an argument about whatever Oracle may
+# add to this object later -- a size is a number, an identifier is a string.
+#
+# Read with awk rather than with jq, because jq is not part of the runner image
+# contract and a missing dependency here would report a machine of unknown size
+# while the service was answering fine.
+#
+# Walked character by character rather than matched by regex, at one object level.
+# A regex is shorter and gets two things wrong that a test in this suite pins: a
+# number inside a string value is not a number this object published, and a key one
+# level down is not a key of this object -- it would arrive in the record under the
+# sizing prefix as a measurement of something else.
+#
+# What the walk requires of its input, and what it does with the rest, because
+# neither is obvious from the code and both decide what a reader may believe:
+#
+#   * The answer must be ONE complete JSON object: `{` first, `}` last, and the
+#     braces balancing back to zero only at the last character. Anything else is
+#     refused whole rather than read in part, which covers a body cut off in
+#     transit, a top-level array, and two objects glued together -- in each case
+#     keys this object never published would otherwise arrive under the sizing
+#     prefix as though it had.
+#   * A KEY is kept only if it is shaped like a field name AND is short enough to
+#     be one. This object's keys are `ocpus`, `memoryInGBs` and their like; a
+#     service answering something else has its key text refused for the same reason
+#     a per-key scalar answer is, since a key is printed into the record just as a
+#     value is -- an identifier, a newline that would forge a line of its own, or a
+#     twenty-thousand-character run all arrive on the key side.
+#   * A repeated key prints once per occurrence. Nothing here dedupes, and the
+#     record showing a key twice is the service having sent it twice.
+runner_imds_numbers() {
+  # shellcheck disable=SC2086  # an empty COZY_RUNNER_BOUND must vanish, not become ""
+  # shellcheck disable=SC2016  # the single quotes are the point: awk owns these $
+  $COZY_RUNNER_BOUND awk -v prefix="${1:-object}" -v keymax="$COZY_RUNNER_KEY_MAX" '
+    { doc = doc $0 "\n" }
+
+    function jspace(c) {
+      return (c == " " || c == "\t" || c == "\r" || c == "\n")
+    }
+
+    # One sentence, three refusal sites: the endpoint check, a brace count that
+    # returns to zero early, and one that never returns at all. A second copy of
+    # the sentence would be a scheduled divergence.
+    function refuse_doc(prefix) {
+      printf "%s: unavailable (the answer was not one complete JSON object, so nothing was read from it)\n", prefix
+    }
+
+    # Walks a JSON string, leaving its contents in JSTR and returning the index
+    # just past its closing quote. Used for keys, for the string values that are
+    # then discarded, and inside a nested value.
+    #
+    # The escape branch is what stops a `\"` inside a value from being read as the
+    # end of that value, which would leave the walk treating the rest of the value
+    # as a key and lose the number after it. Nothing in this object carries an
+    # escape today, which is exactly why nothing else here would exercise it.
+    function jstring(s, i, n,   c, out) {
+      out = ""
+      i++
+      while (i <= n) {
+        c = substr(s, i, 1)
+        if (c == "\\") { out = out substr(s, i, 2); i += 2; continue }
+        if (c == "\"") { JSTR = out; return i + 1 }
+        out = out c
+        i++
+      }
+      JSTR = out
+      return i
+    }
+
+    # Steps over a nested object or array, returning the index just past its
+    # close, or 0 when it never closes. Zero rather than "the rest of the input",
+    # so that a document cut off mid-value cannot be read as a whole one.
+    function jskipnested(s, i, n,   c, depth) {
+      depth = 0
+      while (i <= n) {
+        c = substr(s, i, 1)
+        if (c == "\"") { i = jstring(s, i, n); continue }
+        if (c == "{" || c == "[") depth++
+        else if (c == "}" || c == "]") {
+          depth--
+          if (depth == 0) return i + 1
+        }
+        i++
+      }
+      return 0
+    }
+
+    END {
+      # One complete object, or nothing. Read in part, a truncated answer is
+      # indistinguishable in the record from a machine whose sizing simply has
+      # fewer fields -- and a top-level array would publish its nested keys under
+      # this prefix.
+      body = doc
+      sub(/^[ \t\r\n]+/, "", body)
+      sub(/[ \t\r\n]+$/, "", body)
+      if (substr(body, 1, 1) != "{" || substr(body, length(body), 1) != "}") {
+        refuse_doc(prefix)
+        exit
+      }
+      doc = body
+      n = length(doc)
+      # The endpoints are not enough: two objects glued together start with `{`
+      # and end with `}`, and the walk below is flat, so the keys of the second
+      # object would publish under this prefix as though the sizing object held
+      # them. Complete means the braces balance and first return to zero at the
+      # very last character, with strings walked so a brace inside one does not
+      # count.
+      depth = 0
+      j = 1
+      while (j <= n) {
+        cj = substr(doc, j, 1)
+        if (cj == "\"") { j = jstring(doc, j, n); continue }
+        if (cj == "{") depth++
+        if (cj == "}") {
+          depth--
+          if (depth == 0 && j < n) { refuse_doc(prefix); exit }
+        }
+        j++
+      }
+      if (depth != 0) { refuse_doc(prefix); exit }
+      i = 1
+      kept = 0
+      dropped = 0
+      while (i <= n) {
+        c = substr(doc, i, 1)
+        if (c != "\"") { i++; continue }
+        i = jstring(doc, i, n)
+        key = JSTR
+        while (i <= n && substr(doc, i, 1) != ":") {
+          if (substr(doc, i, 1) == "\"") break
+          i++
+        }
+        if (i > n || substr(doc, i, 1) != ":") continue
+        i++
+        while (i <= n && jspace(substr(doc, i, 1))) i++
+        if (i > n) break
+        c = substr(doc, i, 1)
+        if (c == "\"") {
+          i = jstring(doc, i, n)
+          dropped++
+        } else if (c == "{" || c == "[") {
+          e = jskipnested(doc, i, n)
+          if (e == 0) break
+          i = e
+          dropped++
+        } else {
+          val = ""
+          while (i <= n) {
+            c = substr(doc, i, 1)
+            # `]` is deliberately NOT a terminator here: inside an object it is
+            # a mismatched delimiter, so `{"ocpus":16]}` yields the token `16]`,
+            # fails the number test, and is counted as a field that was not kept.
+            # Treated as a terminator it would render as a clean `16` and the
+            # malformed answer would read like a healthy one.
+            if (c == "," || c == "}" || jspace(c)) break
+            val = val c
+            i++
+          }
+          # The key is printed into the record exactly as the value is, so it is
+          # held to the same standard: a field name, or nothing.
+          if (val ~ /^-?[0-9]+([.][0-9]+)?$/ &&
+              key ~ /^[A-Za-z][A-Za-z0-9_]*$/ && length(key) <= keymax) {
+            printf "%s.%s: %s\n", prefix, key, val
+            kept++
+          } else {
+            # `null`, `true` and `false` land here, and so does a number under a
+            # key that is not shaped like a field name. None of the first three is
+            # a measurement, and printing the word would read as a value the
+            # service published; the fourth is a service answering something this
+            # record has no business publishing under a key of its own.
+            dropped++
+          }
+        }
+      }
+      # Counted rather than listed: naming the keys would print the very strings
+      # the numeric rule exists to keep out, and a count is enough to say the
+      # object held more than this.
+      if (dropped > 0) {
+        printf "%s: %d further field(s) were not kept -- not a number, or under a key that is not a field name\n", prefix, dropped
+      }
+      if (kept == 0) {
+        printf "%s: unavailable (the object was fetched and held no numeric field)\n", prefix
+      }
+    }
+  '
+}
+
+# runner_cpu_model: the processor string, out of a processor table already read.
+#
+# It answers a different question from the shape: the shape says which class was
+# asked for, this says what the hypervisor is presenting as the model, and the two
+# disagree exactly when a lane is served by a generation it did not expect.
+#
+# Takes the table on stdin rather than running `lscpu` itself, so the bounded read
+# stays at the one call site that owns the ceiling and this stays a transform. The
+# value is taken from the whole line rather than by field, since a model string may
+# itself contain a colon.
+runner_cpu_model() {
+  sed -n 's/^Model name:[[:space:]]*//p' | sed -n '1p'
+}
+
+# runner_svm_features: the AMD SVM sub-features this VM's virtual CPU was given.
+#
+# Same shape as the model reader above and for the same reason: it transforms an
+# `lscpu` table handed to it on stdin, so the one bounded read stays at the one
+# call site that owns the ceiling.
+#
+# WHY THIS LINE IS WORTH A PLACE IN THE RECORD
+#
+# `svm` says a guest may run a hypervisor. The sub-features say what that costs.
+# The one that has mattered here is `vgif`: without it, a guest that is itself
+# running a hypervisor traps to the layer below on every CLGI and STGI, and those
+# bracket every world switch it performs. A guest that runs no hypervisor never
+# executes either instruction, so this is invisible until something nests two
+# deep -- which is exactly this suite, where the sandbox Talos nodes host the
+# tenant KubeVirt VMs. It explains a shape of failure no resource counter can:
+# the cycles are spent handling exits rather than running the guest, so the
+# runner reads mostly idle with near-zero steal while its nested guests freeze.
+#
+# Measured across the archived reports, no run whose kernel did not report
+# Virtual GIF has ever passed a tenant-Kubernetes suite, and the two hosts
+# compared directly differed in this one flag and nothing else -- same shape,
+# same processor model, same kernel. On a flex shape filled from shared capacity
+# that is not a property of the lane, so it belongs beside the shape and the
+# processor rather than in a reader's memory of a run that has since been
+# recycled.
+#
+# The whole SVM list is kept rather than that one flag, because which features a
+# host exposes has turned out to vary between hosts of the same shape, and a
+# record that answered only the question already asked would have to be extended
+# by whoever asks the next one.
+#
+# Names are the kernel's own from this leaf, matched whole so `svm` cannot be
+# taken from `svm_lock`; `-E` and `-x` are both POSIX. `grep` finding nothing is
+# a status this reads as an answer, so no branch here -- an Intel host, or a
+# guest given no sub-features, prints an empty list and the caller says so.
+runner_svm_features() {
+  _rsf_flags=$(sed -n 's/^Flags:[[:space:]]*//p' | sed -n '1p')
+  # Gated on `svm` itself, and not only for tidiness: `vnmi` is a flag name on
+  # Intel too, where it belongs to VMX, so an ungated list prints one SVM
+  # sub-feature on a machine that has no SVM at all. Sub-features of an absent
+  # feature are not a shorter answer, they are a wrong one. Padded case rather
+  # than a grep so `svm` cannot be taken from `svm_lock`.
+  case " $_rsf_flags " in
+    *' svm '*) ;;
+    *) return 0 ;;
+  esac
+  printf '%s\n' "$_rsf_flags" | tr ' ' '\n' |
+    grep -xE 'svm|svm_lock|npt|lbrv|nrip_save|tsc_scale|vmcb_clean|flushbyasid|decodeassists|pausefilter|pfthreshold|avic|x2avic|v_vmsave_vmload|vgif|vnmi|v_spec_ctrl|svme_addr_chk' |
+    tr '\n' ' ' | sed 's/[[:space:]]*$//'
+}
+
+if [ -n "${E2E_RUNNER_IDENTITY_LIB:-}" ]; then
+  return 0 2>/dev/null
+fi
+
+record='=== e2e runner identity ==='
+
+# Appends one line. The record is assembled in a variable rather than written as
+# it goes, because it has to reach two places -- the file and this job's log --
+# and a record half-written to a file that then could not be opened is the one
+# outcome that would leave neither.
+add() {
+  record="$record
+$1"
+}
+
+add '[layer] Every line below describes the RUNNER VM: the machine the e2e sandbox container is created on, read on that machine before the container existed. Everything else in cozyreport is read from inside that container, from the Talos guests under it, or from the tenant guests under those, so this is the only record of what hardware the run landed on.'
+add '[scope] The metadata keys below are fetched one at a time, by name. The root instance document is never requested, so the instance and compartment OCIDs, the image OCID, the display name, the hostname and the user-supplied metadata bag are not filtered out of this record -- they are never asked for. What a key IS asked for is printed as that key value, whatever the service answers, provided it is one short scalar; so this record is a statement about which keys were requested, not a promise about what a misbehaving service could put in one of them. From the shape sizing object only its numbers are kept, under keys shaped and sized like field names.'
+if [ -z "$COZY_RUNNER_BOUND" ]; then
+  # Said in the record rather than only in the log, because the reads still ran
+  # and a reader cannot otherwise tell a line that is missing because the machine
+  # said nothing from one missing because a read was never going to end.
+  add "[bounds] timeout is not on PATH here, so the local commands below ran with no ceiling; the metadata reads carried curl's own."
+fi
+
+# The absolute clock, in both forms and with the units named on each, because an
+# epoch integer and an RFC 3339 string subtract to nonsense if a reader takes
+# them as printed. It is the instant the machine was identified, which is the
+# start of the run rather than the moment of any failure in it.
+now_epoch=''
+now_iso=''
+clock_why=''
+if runner_read date +%s; then now_epoch=$RUNNER_READ_OUT; else clock_why=$RUNNER_READ_WHY; fi
+# `-u` rather than `--utc`: the long form is GNU-only, and while this script only
+# ever runs on a Linux runner, its unit suite runs it on developer machines too.
+if runner_read date -u +%Y-%m-%dT%H:%M:%SZ; then now_iso=$RUNNER_READ_OUT; else clock_why=$RUNNER_READ_WHY; fi
+if [ -n "$now_epoch" ] && [ -n "$now_iso" ]; then
+  add "read at: $now_epoch epoch seconds ($now_iso UTC)"
+else
+  add "read at: unavailable ($clock_why, so this record carries no clock)"
+fi
+
+imds_timeout=$(runner_imds_timeout)
+imds_timeout_note=''
+if [ -n "${COZY_RUNNER_IMDS_TIMEOUT-}" ] && [ "${COZY_RUNNER_IMDS_TIMEOUT-}" != "$imds_timeout" ]; then
+  # Folded and cut like the curl reason below: this is the one place an
+  # environment value is printed into the record, and a value carrying a
+  # newline would otherwise mint record lines of its own.
+  _it_shown=$(printf '%s' "${COZY_RUNNER_IMDS_TIMEOUT}" | tr '\n\r' '  ' | cut -c1-200)
+  imds_timeout_note=" (COZY_RUNNER_IMDS_TIMEOUT=${_it_shown} was not usable as a ceiling, so the default was applied instead)"
+fi
+
+# imds_read <key>: one bounded metadata read, leaving the body in IMDS_OUT and the
+# reason there is none in IMDS_WHY.
+#
+# `--noproxy '*'` because a runner image may export http_proxy, and a link-local
+# metadata request sent to a proxy is answered by the proxy: the read would fail,
+# or worse succeed against something else, and the record would describe neither
+# this machine nor the failure honestly.
+#
+# `--fail` so that a host with something else on this address -- another cloud's
+# metadata service, which refuses a request carrying no header of its own -- is
+# reported as unreachable rather than having its error page filed as a value.
+#
+# `--location` because Oracle's own examples for these subpaths pass it, and
+# `--fail` does not catch a 3xx: without it a redirect's own body would be the
+# answer read -- refused as not one metadata scalar -- while following it is what
+# yields the value the service meant.
+imds_read() {
+  IMDS_OUT=''
+  IMDS_WHY=''
+  _ir_err=$(mktemp "${TMPDIR:-/tmp}/runner-identity.XXXXXX" 2>/dev/null) || _ir_err=''
+  _ir_rc=0
+  IMDS_OUT=$(curl --silent --show-error --fail --location --noproxy '*' \
+    --max-time "$imds_timeout" \
+    --header 'Authorization: Bearer Oracle' \
+    "${COZY_RUNNER_IMDS_BASE}$1" 2>"${_ir_err:-/dev/null}") || _ir_rc=$?
+  _ir_reason=''
+  if [ -n "$_ir_err" ] && [ -s "$_ir_err" ]; then
+    # Folded to one line, because this becomes one `key: value` line and curl
+    # writes its reason with a trailing newline of its own.
+    _ir_reason=$(tr '\n' ' ' <"$_ir_err" | sed 's/[[:space:]]*$//' | cut -c1-200)
+  fi
+  [ -z "$_ir_err" ] || rm -f "$_ir_err"
+  if [ "$_ir_rc" -ne 0 ]; then
+    # curl's own words are kept. Without them the line is "curl exited 28",
+    # which does not separate a machine that is not an OCI instance from one
+    # whose metadata service was slow -- and those are opposite conclusions
+    # about the run.
+    IMDS_WHY="curl exited ${_ir_rc} under a ${imds_timeout}s ceiling${_ir_reason:+: $_ir_reason}"
+    return 1
+  fi
+  if [ -z "$IMDS_OUT" ]; then
+    IMDS_WHY="the metadata service exited 0 and returned nothing for this key"
+    return 1
+  fi
+  return 0
+}
+
+if ! command -v curl >/dev/null 2>&1; then
+  add 'imds unreachable: curl is not on PATH, so the metadata service was never asked'
+elif ! imds_read shape; then
+  # The first key doubles as the probe. One line rather than one per key, and
+  # nothing after it attempted: a machine that is not an OCI instance would
+  # otherwise pay the ceiling once per key to say the same thing six times.
+  add "imds unreachable: the probe read of ${COZY_RUNNER_IMDS_BASE}shape did not answer, so no further key was asked for${imds_timeout_note} -- ${IMDS_WHY}"
+elif ! runner_imds_scalar "$IMDS_OUT" >/dev/null; then
+  # Answered, and not like this service answers. A shape name is one short scalar;
+  # something else on this address -- another cloud's metadata service, a proxy
+  # error page, a redirect target -- answers a document, a sentence or a page.
+  #
+  # Filed as unreachable rather than as five unavailable keys, and this is the one
+  # place that word is used for a service that did answer. The reason is what the
+  # reader needs: THIS metadata service is not here. Reporting it per key instead
+  # would spend the ceiling five more times to say the same thing, and would leave
+  # a run on a non-OCI machine with no line to grep for.
+  add "imds unreachable: ${COZY_RUNNER_IMDS_BASE}shape answered ${#IMDS_OUT} bytes that are not one metadata scalar, so this is not an instance metadata service and no further key was asked for${imds_timeout_note}"
+else
+  add "imds: read one key at a time from ${COZY_RUNNER_IMDS_BASE} under a ${imds_timeout}s curl ceiling each${imds_timeout_note}"
+  # The probe already holds `shape`, so it is rendered from that read rather than
+  # asked for twice.
+  imds_first=1
+  for imds_key in $COZY_RUNNER_IMDS_KEYS; do
+    if [ "$imds_first" -eq 1 ]; then
+      imds_first=0
+    elif ! imds_read "$imds_key"; then
+      add "$imds_key: unavailable ($IMDS_WHY)"
+      continue
+    fi
+    if imds_value=$(runner_imds_scalar "$IMDS_OUT"); then
+      add "$imds_key: $imds_value"
+    else
+      # Reached, and answered with something that is not one metadata scalar.
+      # Printed as a shape rather than as a value, because the thing this arm
+      # exists for is a service answering a whole document to a per-key request,
+      # and rendering that under a key name is the leak the per-key design
+      # removes.
+      add "$imds_key: unavailable (the service answered ${#IMDS_OUT} bytes that are not one metadata scalar, so the value was not kept)"
+    fi
+  done
+  if imds_read shapeConfig; then
+    # ocpus against the vCPU count the lane advertises is the one arithmetic
+    # nothing else in the report can do.
+    imds_sizes=$(printf '%s\n' "$IMDS_OUT" | runner_imds_numbers shapeConfig 2>/dev/null) || imds_sizes=''
+    if [ -n "$imds_sizes" ]; then
+      add "$imds_sizes"
+    else
+      # The reader prints everything from its END block, so nothing at all means
+      # the reader itself did not run to the end: no awk on PATH, or the read
+      # ending early. Whether a ceiling could have ended it is decided by
+      # whether one was in place -- the same fork runner_read words, and without
+      # it this line would contradict the [bounds] line above on a machine with
+      # no `timeout`.
+      if [ -n "$COZY_RUNNER_BOUND" ]; then
+        add 'shapeConfig: unavailable (the object was fetched and the number reader emitted no line at all -- awk is not on PATH here, or it was cut off by its ceiling)'
+      else
+        add 'shapeConfig: unavailable (the object was fetched and the number reader emitted no line at all -- awk is not on PATH here, or it was killed from outside this script, which ran this read with no ceiling)'
+      fi
+    fi
+  else
+    add "shapeConfig: unavailable ($IMDS_WHY)"
+  fi
+fi
+
+if runner_read uname -r; then
+  add "kernel release: $RUNNER_READ_OUT${RUNNER_READ_WHY:+ ($RUNNER_READ_WHY)}"
+else
+  add "kernel release: unavailable ($RUNNER_READ_WHY)"
+fi
+
+if runner_read nproc; then
+  # Named `nproc` after the tool, because it is the count of online logical CPUs
+  # and reads against shapeConfig.ocpus rather than replacing it: the pair is
+  # what shows the lane's advertised vCPU count to be half that many cores.
+  add "nproc: $RUNNER_READ_OUT${RUNNER_READ_WHY:+ ($RUNNER_READ_WHY)}"
+else
+  add "nproc: unavailable ($RUNNER_READ_WHY)"
+fi
+
+if runner_read lscpu; then
+  cpu_model=$(printf '%s\n' "$RUNNER_READ_OUT" | runner_cpu_model)
+  if [ -n "$cpu_model" ]; then
+    add "cpu model: $cpu_model${RUNNER_READ_WHY:+ ($RUNNER_READ_WHY)}"
+  else
+    add 'cpu model: unavailable (lscpu answered, and no Model name line was taken from its table)'
+  fi
+  # Out of the same read as the model, so the two lines describe one reading of
+  # one machine rather than two that a slow first read could have separated.
+  svm_features=$(printf '%s\n' "$RUNNER_READ_OUT" | runner_svm_features)
+  if [ -n "$svm_features" ]; then
+    add "svm features: $svm_features${RUNNER_READ_WHY:+ ($RUNNER_READ_WHY)}"
+  else
+    # Distinguished from a missing line on purpose: an empty list is a fact about
+    # the machine -- no SVM sub-feature was exposed to it -- and a reader who
+    # cannot tell that from a read that never happened learns nothing from either.
+    add 'svm features: none (lscpu answered, and its flag list named no SVM sub-feature; an Intel host, or a guest given none)'
+  fi
+else
+  add "cpu model: unavailable ($RUNNER_READ_WHY)"
+  add "svm features: unavailable ($RUNNER_READ_WHY)"
+fi
+
+# The file first, the log second, and neither conditional on the other. The file
+# is what reaches the artifact and the log is what reaches a reader who never
+# downloads it, so a write that fails must still leave the record somewhere and
+# say that the artifact copy is missing.
+#
+# Bounded like the reads, and for the same reason one directory up: `_out` is a
+# path on a machine this script has just described as possibly wedged, and
+# hack/cozyreport.sh bounds `df` on that same host because a stale mount blocks
+# indefinitely. Through `tee` rather than a redirection, because a redirection is
+# the shell's and cannot be wrapped.
+identity_dir=$(dirname "$COZY_RUNNER_IDENTITY_FILE")
+# shellcheck disable=SC2086  # an empty COZY_RUNNER_BOUND must vanish, not become ""
+if $COZY_RUNNER_BOUND mkdir -p "$identity_dir" 2>/dev/null &&
+  printf '%s\n' "$record" | $COZY_RUNNER_BOUND tee "$COZY_RUNNER_IDENTITY_FILE" >/dev/null 2>&1; then
+  :
+else
+  # A bound that killed tee mid-write leaves a prefix on disk, which the
+  # fold-in cannot tell from a whole record; removing it is what makes the
+  # "missing from the artifact" claim below true rather than hopeful. Which
+  # warning to print is then decided by looking at the disk, not by rm's exit
+  # status: rm also fails where nothing was ever written -- a parent that is
+  # not a directory -- and "may remain" about a file that does not exist is a
+  # forged doubt. Both commands bounded like the write they follow.
+  # shellcheck disable=SC2086  # an empty COZY_RUNNER_BOUND must vanish, not become ""
+  $COZY_RUNNER_BOUND rm -f "$COZY_RUNNER_IDENTITY_FILE" 2>/dev/null || :
+  # shellcheck disable=SC2086
+  if $COZY_RUNNER_BOUND test -e "$COZY_RUNNER_IDENTITY_FILE" 2>/dev/null; then
+    echo "WARNING: could not write the runner identity record to $COZY_RUNNER_IDENTITY_FILE; it is in this log, and a partial copy of it may remain in cozyreport.tgz" >&2
+  else
+    echo "WARNING: could not write the runner identity record to $COZY_RUNNER_IDENTITY_FILE; it is in this log and will be missing from cozyreport.tgz" >&2
+  fi
+fi
+
+printf '%s\n' "$record"
+
+# Always. The contract of this script is that it describes the machine or says
+# why it could not, and a non-zero exit here fails `Prepare environment`, which
+# would trade a whole run for a diagnostic.
+exit 0
diff --git a/hack/e2e-talos-image-cache.yaml b/hack/e2e-talos-image-cache.yaml
new file mode 100644
index 0000000000..cac252d69f
--- /dev/null
+++ b/hack/e2e-talos-image-cache.yaml
@@ -0,0 +1,299 @@
+# In-sandbox caching mirror for the Talos Image Factory worker OS disk image.
+#
+# Why this exists: tenant Kubernetes worker VMs boot from a Talos raw disk image
+# that CDI streams over HTTP from the PUBLIC Talos Image Factory
+# (https://factory.talos.dev/image/<schematicID>/<version>/openstack-amd64.raw.xz).
+# That endpoint does not support byte-range requests (so CDI falls back to a full
+# sequential copy-to-scratch) and its egress is intermittently flaky from the CI
+# runner — a mid-transfer HTTP/2 stream reset or a stalled download makes the
+# worker DataVolume import never finish, the worker VM never boots, no tenant
+# node joins within the chart's 12-minute node-join deadline, and the
+# `kubernetes-*` e2e tests fail (and, even when they pass, take 18-22 minutes
+# each dominated by these downloads). See cozystack/cozystack#3231.
+#
+# This Deployment fetches the image ONCE at e2e-install time with an aggressive
+# curl retry loop (decoupling the one flaky external fetch from the many
+# per-worker imports), then serves it locally over plain HTTP with range support.
+# Tenant `Kubernetes` CRs point `spec.talos.imageFactoryURL` at this Service
+# (see hack/e2e-chainsaw/_lib/run-kubernetes.sh) so every worker imports from the
+# warm local copy instead of the public internet. Tenant namespaces run under a
+# default-deny Cilium egress installed by the tenant chart, whose allow rules cover
+# same-namespace endpoints, the tenant tree and the `world` entity (which is why the
+# public factory works) but NOT an arbitrary kube-system Service, so a worker's CDI
+# importer would resolve this Service yet have its TCP connect to the ClusterIP
+# silently dropped. The CiliumClusterwideNetworkPolicy at the end of this file punches a
+# single tightly-scoped hole for that path. The e2e harness only points tenants
+# here after a tenant-scoped probe confirms the importer path actually reaches the
+# ClusterIP with a 206; otherwise it falls back to the public factory, so the
+# mirror can only help, never make CI worse.
+#
+# The __SCHEMATIC_ID__ / __TALOS_VERSION__ placeholders are substituted at apply
+# time by hack/e2e-install-cozystack.bats from packages/apps/kubernetes/values.yaml.
+#
+# CI band-aid, not a product artifact. The durable fix is the overridable
+# `talos.imageFactoryURL` chart value this manifest exercises; a self-hosted
+# Talos Image Factory or an operator's own mirror is the production path.
+apiVersion: v1
+kind: Service
+metadata:
+  name: talos-image-cache
+  namespace: kube-system
+  labels:
+    app.kubernetes.io/name: talos-image-cache
+spec:
+  selector:
+    app.kubernetes.io/name: talos-image-cache
+  ports:
+    - name: http
+      port: 80
+      targetPort: http
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: talos-image-cache
+  namespace: kube-system
+  labels:
+    app.kubernetes.io/name: talos-image-cache
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: talos-image-cache
+  strategy:
+    type: Recreate
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/name: talos-image-cache
+    spec:
+      # The seed fetch and static serving use ordinary pod networking — the same
+      # egress path the CDI importer pods already use to reach factory.talos.dev.
+      initContainers:
+        # Fetch the compressed raw disk image ONCE, retrying hard against the
+        # flaky upstream. The Deployment only becomes Available after this
+        # succeeds, so "Available" is the e2e harness's signal that the mirror is
+        # warm and safe to point tenants at.
+        - name: seed
+          # Reuse the in-tree, digest-pinned image already shipped by the
+          # installer and pre-pulled for the cilium-leak-healer watchdog, so this
+          # pod does not add a fresh external image pull of its own.
+          image: docker.io/alpine/k8s:1.36.2@sha256:44ef4942e171939b9c665a4a84beb80e2dcdb9a24330d4651cfdfd2e9deecc47
+          command: [/bin/sh, -ec]
+          args:
+            - |
+              dest="/data/image/__SCHEMATIC_ID__/__TALOS_VERSION__/openstack-amd64.raw.xz"
+              url="https://factory.talos.dev/image/__SCHEMATIC_ID__/__TALOS_VERSION__/openstack-amd64.raw.xz"
+              mkdir -p "$(dirname "$dest")"
+              echo "seeding $dest from $url"
+              # --retry-all-errors + a long retry budget rides out the mid-transfer
+              # stream resets that break the CDI importer's single attempt.
+              # --speed-time/--speed-limit additionally abort a transfer that
+              # stalls below 1 KiB/s for 60s — a frozen (not reset) download is
+              # not an "error", so --retry-all-errors alone would let it hang out
+              # the whole rollout budget; the abort is then retried like any other
+              # failure.
+              curl --fail --location --show-error \
+                   --retry 30 --retry-all-errors --retry-delay 15 \
+                   --connect-timeout 30 --speed-time 60 --speed-limit 1024 \
+                   --output "$dest" \
+                   "$url"
+              ls -la "$dest"
+          volumeMounts:
+            - name: data
+              mountPath: /data
+      containers:
+        - name: serve
+          image: docker.io/alpine/k8s:1.36.2@sha256:44ef4942e171939b9c665a4a84beb80e2dcdb9a24330d4651cfdfd2e9deecc47
+          # Serve the seeded image over HTTP with byte-range (206) support so CDI
+          # can use its fast range import instead of the copy-to-scratch fallback
+          # the range-less public factory forces. The pinned image ships neither a
+          # `busybox httpd` applet nor a standalone httpd/nginx, and stock
+          # `python3 -m http.server` ignores Range headers (answers 200, not 206),
+          # so a tiny range-capable server (serve.py ConfigMap below) runs on the
+          # image's bundled python3 — no extra package pull that would reintroduce
+          # a flaky external dependency.
+          command: [python3, /serve/serve.py, /data, "8080"]
+          ports:
+            - name: http
+              containerPort: 8080
+          readinessProbe:
+            # httpGet (not tcpSocket) so readiness reflects the server actually
+            # answering HTTP, not merely the port being open.
+            httpGet:
+              path: /
+              port: http
+            initialDelaySeconds: 2
+            periodSeconds: 5
+          resources:
+            requests:
+              cpu: 20m
+              memory: 32Mi
+            limits:
+              memory: 128Mi
+          volumeMounts:
+            - name: data
+              mountPath: /data
+            - name: serve-script
+              mountPath: /serve
+      volumes:
+        - name: data
+          emptyDir: {}
+        - name: serve-script
+          configMap:
+            name: talos-image-cache-serve
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: talos-image-cache-serve
+  namespace: kube-system
+  labels:
+    app.kubernetes.io/name: talos-image-cache
+data:
+  # Minimal static file server with HTTP byte-range support. Stock
+  # `python3 -m http.server` answers Range requests with 200 + the full body;
+  # this adds the single-range 206 path (Content-Range + Accept-Ranges) CDI
+  # needs to skip its slow copy-to-scratch import.
+  serve.py: |
+    import http.server
+    import os
+    import sys
+    import time
+
+    ROOT = sys.argv[1] if len(sys.argv) > 1 else "/data"
+    PORT = int(sys.argv[2]) if len(sys.argv) > 2 else 8080
+
+
+    class RangeHandler(http.server.SimpleHTTPRequestHandler):
+        # HTTP/1.1 keep-alive lets CDI pull many ranges over one connection.
+        protocol_version = "HTTP/1.1"
+
+        def __init__(self, *args, **kwargs):
+            super().__init__(*args, directory=ROOT, **kwargs)
+
+        def send_head(self):
+            path = self.translate_path(self.path)
+            if os.path.isdir(path):
+                return super().send_head()
+            try:
+                f = open(path, "rb")
+            except OSError:
+                self.send_error(404)
+                return None
+            size = os.fstat(f.fileno()).st_size
+            ctype = self.guess_type(path)
+            rng = self.headers.get("Range", "")
+            if not rng.startswith("bytes="):
+                self._remaining = size
+                self._transfer_range = "full"
+                self.send_response(200)
+                self.send_header("Content-Type", ctype)
+                self.send_header("Content-Length", str(size))
+                self.send_header("Accept-Ranges", "bytes")
+                self.end_headers()
+                return f
+            start_s, _, end_s = rng[6:].split(",")[0].strip().partition("-")
+            start = int(start_s) if start_s else max(0, size - int(end_s))
+            end = int(end_s) if start_s and end_s else size - 1
+            if start >= size or start > end:
+                self.send_response(416)
+                self.send_header("Content-Range", "bytes */%d" % size)
+                self.send_header("Content-Length", "0")
+                self.end_headers()
+                f.close()
+                return None
+            end = min(end, size - 1)
+            f.seek(start)
+            self._remaining = end - start + 1
+            self._transfer_range = "%d-%d/%d" % (start, end, size)
+            self.send_response(206)
+            self.send_header("Content-Type", ctype)
+            self.send_header("Content-Range", "bytes %d-%d/%d" % (start, end, size))
+            self.send_header("Content-Length", str(self._remaining))
+            self.send_header("Accept-Ranges", "bytes")
+            self.end_headers()
+            return f
+
+        def copyfile(self, source, outputfile):
+            remaining = getattr(self, "_remaining", None)
+            if remaining is None:
+                super().copyfile(source, outputfile)
+                return
+            self._remaining = None
+            requested = remaining
+            sent = 0
+            started = time.monotonic()
+            try:
+                while remaining > 0:
+                    chunk = source.read(min(65536, remaining))
+                    if not chunk:
+                        break
+                    outputfile.write(chunk)
+                    sent += len(chunk)
+                    remaining -= len(chunk)
+            finally:
+                status = "complete" if sent == requested else "interrupted"
+                self.log_message(
+                    "transfer-finished status=%s path=%s range=%s requested=%d sent=%d duration=%.3fs",
+                    status,
+                    self.path,
+                    getattr(self, "_transfer_range", "unknown"),
+                    requested,
+                    sent,
+                    time.monotonic() - started,
+                )
+
+
+    with http.server.ThreadingHTTPServer(("0.0.0.0", PORT), RangeHandler) as httpd:
+        print("serving %s on :%d" % (ROOT, PORT), flush=True)
+        httpd.serve_forever()
+---
+# CI-only: allow the tenant CDI importer Pods to reach the mirror.
+#
+# Tenant namespaces run under a default-deny Cilium egress installed by the tenant
+# chart (allow-internal-communication, allow-external-communication and the
+# `<tenant>-egress` CiliumClusterwideNetworkPolicy). Their union allows egress to
+# same-namespace endpoints, the tenant tree and the `world` entity (so the public
+# factory works), but nothing permits egress to an arbitrary kube-system Service —
+# so a worker's CDI importer resolves talos-image-cache.kube-system.svc yet its TCP
+# connect to the Service ClusterIP is silently dropped (dial ... i/o timeout), the
+# disk import never starts, and the tenant node never joins. Cilium unions allow
+# rules across policies, so this adds one tightly-scoped allow: importer Pods in
+# tenant-test may egress to the mirror Pod in kube-system.
+#
+# Scoped to tenant-test (which the tenant chart already puts under default-deny
+# egress) so it only ever ADDS an allow — it never flips another namespace from
+# default-allow to default-deny. The mirror Pod is selected by no ingress policy
+# (default-allow ingress), so no ingress rule is needed; replies return on the
+# established conntrack entry.
+#
+# Applied at point-of-use by hack/e2e-chainsaw/_lib/talos-image-cache.sh, not with
+# the rest of this manifest in hack/e2e-install-cozystack.bats: that runs before
+# Cozystack (and thus before Cilium's CRDs) is installed, so this kind does not yet
+# exist when the manifest is first applied.
+apiVersion: cilium.io/v2
+kind: CiliumClusterwideNetworkPolicy
+metadata:
+  name: e2e-talos-image-cache-importer-egress
+  labels:
+    app.kubernetes.io/name: talos-image-cache
+spec:
+  endpointSelector:
+    matchLabels:
+      "k8s:cdi.kubevirt.io": importer
+      "k8s:io.kubernetes.pod.namespace": tenant-test
+  # No toPorts: the allow is already scoped to a single kube-system pod identity
+  # (CI-only, torn down with the sandbox), so an L4 port restriction adds no
+  # meaningful blast-radius reduction — only risk. With kube-proxy-less Cilium the
+  # importer's connection to the Service ClusterIP is translated to the backend
+  # pod port per packet in bpf_lxc.c (the chart forces bpf-lb-sock-hostns-only
+  # while Gateway API is on) BEFORE egress policy is evaluated, so a port literal here
+  # would have to track the container port (8080), not the Service port (80); a
+  # wrong guess silently drops the traffic and reintroduces the exact public-factory
+  # fallback this policy exists to prevent.
+  egress:
+    - toEndpoints:
+        - matchLabels:
+            "k8s:io.kubernetes.pod.namespace": kube-system
+            "k8s:app.kubernetes.io/name": talos-image-cache
diff --git a/hack/e2e-test-openapi.bats b/hack/e2e-test-openapi.bats
index 5fb5a2435d..490bc011d8 100644
--- a/hack/e2e-test-openapi.bats
+++ b/hack/e2e-test-openapi.bats
@@ -1,4 +1,12 @@
 #!/usr/bin/env bats
+# EXIT-TRAP DEBT: 1 -- see hack/bats-no-exit-trap.bats.
+# This one is NOT debt and must not be converted. The trap sits inside an
+# explicit subshell and kills a backgrounded `kubectl proxy`; a subshell trap
+# does not replace the one the bats binary installs, so a failure there still
+# prints its `not ok`. Moving the kill to the end of the body would leak the
+# proxy on failure -- it holds a fixed port, so the next run wedges. The count
+# is declared anyway because the ratchet is exact in both directions: it fails
+# if a real test-level trap is added here, and it fails if this one is removed.
 # -----------------------------------------------------------------------------
 # Test OpenAPI endpoints in a Kubernetes cluster
 # -----------------------------------------------------------------------------
diff --git a/hack/e2e-wait-helmreleases.sh b/hack/e2e-wait-helmreleases.sh
new file mode 100644
index 0000000000..d317e4d811
--- /dev/null
+++ b/hack/e2e-wait-helmreleases.sh
@@ -0,0 +1,103 @@
+#!/bin/bash
+# Readiness gate for the platform HelmReleases created during E2E install.
+
+cozy_wait_all_helmreleases_ready() {
+  local timeout_seconds="${1:-900}"
+  local minimum_count="${2:-11}"
+  local quiet_seconds="${3:-5}"
+  local poll_seconds="${4:-2}"
+  local deadline
+  local snapshot= count= stalled= not_ready= fingerprint=
+  local stable_fingerprint= stable_since=0 now
+
+  case "${timeout_seconds}:${minimum_count}:${quiet_seconds}:${poll_seconds}" in
+    *[!0-9:]*)
+      echo "HelmRelease readiness timing arguments must be integers" >&2
+      return 1
+      ;;
+  esac
+  if [ "${minimum_count}" -eq 0 ] || [ "${poll_seconds}" -eq 0 ]; then
+    echo "HelmRelease readiness minimum count and poll interval must be positive" >&2
+    return 1
+  fi
+  deadline=$(( $(date +%s) + timeout_seconds ))
+
+  echo "Waiting for at least ${minimum_count} HelmReleases to become Ready and remain a stable set for ${quiet_seconds}s..."
+  while :; do
+    # Bounded by kubectl's own request timeout rather than by a `timeout`
+    # wrapper: the unit suite substitutes a `kubectl` shell function, and
+    # `timeout` execs a binary, so a wrapper here would run the real client
+    # against whatever cluster the runner is pointed at. kubectl defaults to no
+    # request timeout at all, and this read sits above the deadline test at the
+    # bottom of the loop -- so unbounded, a wedged apiserver blocks here and
+    # ${timeout_seconds} stops being a ceiling.
+    if ! snapshot=$(kubectl get helmreleases.helm.toolkit.fluxcd.io -A --request-timeout=30s -o json); then
+      now=$(date +%s)
+      echo "HelmRelease readiness list failed; keeping the gate closed" >&2
+      stable_fingerprint=
+      stable_since=0
+    else
+      # Sampled after the read, not before it: a read that costs more than the
+      # poll interval would otherwise be priced at zero against the deadline and
+      # buy the loop another whole iteration past it.
+      now=$(date +%s)
+      if ! count=$(printf '%s\n' "${snapshot}" | jq -r '.items | length'); then
+        echo "Could not parse the HelmRelease readiness list" >&2
+        return 1
+      fi
+      stalled=$(printf '%s\n' "${snapshot}" | jq -r '
+        .items[] |
+        select((.status.observedGeneration // 0) == .metadata.generation) |
+        select([.status.conditions[]? | select(.type == "Stalled" and .status == "True")] | length > 0) |
+        "\(.metadata.namespace)/\(.metadata.name): " +
+        (([.status.conditions[]? | select(.type == "Stalled") | .message][0]) // "Stalled=True")
+      ')
+      if [ -n "${stalled}" ]; then
+        echo "HelmRelease reconciliation reached a terminal Stalled condition:" >&2
+        printf '%s\n' "${stalled}" | sed 's/^/  /' >&2
+        return 1
+      fi
+
+      not_ready=$(printf '%s\n' "${snapshot}" | jq -r '
+        .items[] |
+        (.status.observedGeneration // 0) as $observed |
+        .metadata.generation as $generation |
+        ([.status.conditions[]? | select(.type == "Ready" and .status == "True")] | length) as $ready |
+        select($observed != $generation or $ready == 0) |
+        "\(.metadata.namespace)/\(.metadata.name): " +
+        (if $observed != $generation then
+           "generation \($generation) not observed (status.observedGeneration=\($observed))"
+         else
+           (([.status.conditions[]? | select(.type == "Ready") | "\(.reason): \(.message)"][0]) // "Ready condition absent")
+         end)
+      ')
+      if [ "${count}" -ge "${minimum_count}" ] && [ -z "${not_ready}" ]; then
+        fingerprint=$(printf '%s\n' "${snapshot}" | jq -r '
+          .items | map("\(.metadata.namespace)/\(.metadata.name)") | sort | join("\n")
+        ')
+        if [ "${fingerprint}" != "${stable_fingerprint}" ]; then
+          stable_fingerprint="${fingerprint}"
+          stable_since="${now}"
+        elif [ $(( now - stable_since )) -ge "${quiet_seconds}" ]; then
+          echo "All ${count} HelmReleases are Ready; the release set stayed stable for ${quiet_seconds}s."
+          return 0
+        fi
+      else
+        stable_fingerprint=
+        stable_since=0
+      fi
+    fi
+
+    if [ "${now}" -ge "${deadline}" ]; then
+      echo "HelmReleases did not all become Ready within ${timeout_seconds}s" >&2
+      if [ -n "${not_ready}" ]; then
+        printf '%s\n' "${not_ready}" | sed 's/^/  /' >&2
+      fi
+      if ! kubectl get helmreleases.helm.toolkit.fluxcd.io -A --request-timeout=30s >&2; then
+        echo "The final HelmRelease diagnostic list also failed" >&2
+      fi
+      return 1
+    fi
+    sleep "${poll_seconds}"
+  done
+}
diff --git a/hack/etcd-probe_test.bats b/hack/etcd-probe_test.bats
new file mode 100644
index 0000000000..da0d34e179
--- /dev/null
+++ b/hack/etcd-probe_test.bats
@@ -0,0 +1,94 @@
+#!/usr/bin/env bats
+# -----------------------------------------------------------------------------
+# Unit tests for the probe-output resolver in
+# hack/e2e-chainsaw/_lib/etcd-probe.sh.
+#
+# The etcd suite proves the member Pods serve Prometheus metrics over plaintext
+# http by running a throwaway curl Pod and reading back a `code=<status>` marker.
+# `kubectl run --attach` is how that marker comes back, and it loses the stream
+# of a container that exits before the attach connection is established -- curl
+# against a Pod IP finishes in milliseconds, so the loss is routine rather than
+# exotic. When it happens the
+# caller sees only kubectl's own chatter ("If you don't see a command prompt,
+# try pressing enter."), reads no marker, and reports the metrics endpoint as
+# broken -- a false negative on a healthy cluster.
+#
+# etcd_probe_resolve is the recovery: the container's stdout is still on disk in
+# the Pod's log, so a lost attach stream is re-read rather than believed. These
+# tests pin that recovery, the pass-through when attach did carry the marker,
+# and the honest surfacing of a genuine non-200 (which must NOT be masked by the
+# fallback -- a real failure has to stay a failure).
+#
+# The resolver is separated from the kubectl orchestration precisely so it can
+# be tested without a cluster; the `kubectl run`/`kubectl logs` calls around it
+# need a live cluster and are covered by the e2e run, matching how the other
+# hack/ helpers are tested.
+#
+# CI runs this file under Bats through `make bats-unit-tests`. It also remains
+# compatible with the legacy `hack/cozytest.sh` translator, whose awk parser
+# recognizes only @test blocks and a bare `}` on its own line. The tests avoid
+# `run`, `$status`, setup(), and teardown() for that compatibility path and use
+# direct shell assertions. Titles remain distinguishable after stripping all
+# but [A-Za-z0-9], as required by the legacy translator.
+#
+# Run with: bats hack/etcd-probe_test.bats
+# -----------------------------------------------------------------------------
+
+load test_helper
+
+HACK_DIR="$(cd "$(dirname "${BATS_TEST_FILENAME:-$0}")" && pwd)"
+# shellcheck source=/dev/null
+. "$HACK_DIR/e2e-chainsaw/_lib/etcd-probe.sh"
+
+@test "resolver returns the attach output unchanged when it carries the marker" {
+    out="$(etcd_probe_resolve 'code=200' printf 'code=500')"
+    # The fallback must not run at all when attach already delivered a marker:
+    # re-reading the log would be a second source of truth for the same probe.
+    [ "$out" = "code=200" ]
+}
+
+@test "resolver rereads the pod log when the attach stream carried no marker" {
+    lost="If you don't see a command prompt, try pressing enter."
+    out="$(etcd_probe_resolve "$lost" printf 'code=200')"
+    # This is the regression under test: before the fallback existed the lost
+    # stream was reported verbatim as the probe result and failed the suite on a
+    # cluster whose metrics endpoint was serving 200 the whole time.
+    [ "$out" = "code=200" ]
+}
+
+@test "resolver rereads the pod log when the attach stream was entirely empty" {
+    out="$(etcd_probe_resolve '' printf 'code=200')"
+    [ "$out" = "code=200" ]
+}
+
+@test "resolver surfaces a genuine non200 from the attach stream" {
+    # A real failure must survive the resolver untouched. If this ever returns
+    # the fallback's value instead, the fallback has become a way to launder a
+    # broken metrics endpoint into a pass.
+    out="$(etcd_probe_resolve 'code=503' printf 'code=200')"
+    [ "$out" = "code=503" ]
+}
+
+@test "resolver surfaces a genuine non200 recovered from the pod log" {
+    lost="If you don't see a command prompt, try pressing enter."
+    out="$(etcd_probe_resolve "$lost" printf 'code=503')"
+    [ "$out" = "code=503" ]
+}
+
+@test "resolver keeps the lost attach output when the log reread also yields nothing" {
+    # Both sources empty means the probe genuinely produced no marker. Returning
+    # the attach text keeps whatever kubectl said about why in the failure
+    # message, instead of reporting an empty string the reader cannot act on.
+    lost="Error from server: pods etcd-metrics-probe not found"
+    out="$(etcd_probe_resolve "$lost" printf '')"
+    [ "$out" = "$lost" ]
+}
+
+@test "resolver tolerates a failing log reread without aborting the caller" {
+    # `kubectl logs` against an evicted or already-collected Pod exits non-zero.
+    # Under the suite's `set -e` that must not kill the step before it can
+    # report the probe result.
+    lost="If you don't see a command prompt, try pressing enter."
+    out="$(etcd_probe_resolve "$lost" false)"
+    [ "$out" = "$lost" ]
+}
diff --git a/hack/flux-plunger-fence-hook_test.bats b/hack/flux-plunger-fence-hook_test.bats
new file mode 100644
index 0000000000..14cd7f8355
--- /dev/null
+++ b/hack/flux-plunger-fence-hook_test.bats
@@ -0,0 +1,728 @@
+#!/usr/bin/env bats
+# Behavioural test for flux-plunger's pre-delete hook
+# (packages/system/flux-plunger/templates/uninstall-fence-cleanup.yaml), the
+# backstop that releases what flux-plunger's own shutdown drain could not.
+#
+# The script is extracted from the rendered chart and RUN against a fake kubectl
+# that keeps each HelmRelease's finalizers, suspension owner, resourceVersion,
+# generation and observed generation in files, and a fake clock. The fake answers
+# the hook's templates only when they ask the right question (the exact fence
+# literal, the f:suspend field of flux-plunger's Apply entry, the exact
+# "helm-controller has not handled it" predicate), lists a release once per fence
+# entry as the real template does unless the template collapses them, bumps a
+# release's generation when its suspension is lifted as the apiserver does, lifts
+# a suspension only as a JSON patch preconditioned on the resourceVersion and uid
+# it read and never one another manager also holds, refuses kubectl apply, and
+# applies a finalizer removal only when it is the guarded test-then-remove at an
+# index that holds the fence. The helm-unittest
+# suites in packages/system/flux-plunger/tests match the manifest text instead.
+#
+# CI runs this file under Bats through `make bats-unit-tests`. It also remains
+# compatible with the legacy `hack/cozytest.sh` translator, so each @test builds
+# its own fixture and removes it at the end of the body instead of using
+# setup()/teardown(). No EXIT trap: docs/agents/e2e-testing.md bans them in
+# hack/*.bats.
+#
+# Run with: bats hack/flux-plunger-fence-hook_test.bats
+
+load test_helper
+
+CHART=packages/system/flux-plunger
+JOB=flux-plunger-uninstall-fence-cleanup
+FENCE=flux-plunger.cozystack.io/uninstall-fence
+HELMFIN=finalizers.fluxcd.io
+
+# render_hook <out> [helm args]
+# Extract the hook Job's shell script and activeDeadlineSeconds, the script's pod
+# wait, retry window, selector and Deployment name, and the Deployment's grace
+# period, name and pod labels, and the hook Role's resourceNames. The non-empty
+# checks are early `return 1`s: hack/cozytest.sh rewrites every line matching ^}$
+# into `return 0` plus `}`, helpers included.
+render_hook() {
+  out=$1
+  shift
+  helm template flux-plunger "$CHART" --namespace cozy-fluxcd "$@" > "$out.all"
+  yq eval "select(.kind == \"Job\" and .metadata.name == \"$JOB\") | .spec.template.spec.containers[0].command[2]" "$out.all" > "$out"
+  [ -s "$out" ] || return 1
+  DEADLINE=$(yq eval "select(.kind == \"Job\" and .metadata.name == \"$JOB\") | .spec.activeDeadlineSeconds" "$out.all")
+  GRACE=$(yq eval 'select(.kind == "Deployment") | .spec.template.spec.terminationGracePeriodSeconds' "$out.all")
+  DEPLOY_NAME=$(yq eval 'select(.kind == "Deployment") | .metadata.name' "$out.all")
+  ROLE_DEPLOY=$(yq eval "select(.kind == \"Role\" and .metadata.name == \"$JOB\") | .rules[0].resourceNames[0]" "$out.all")
+  POD_LABELS=$(yq eval 'select(.kind == "Deployment") | .spec.template.metadata.labels | to_entries | map(.key + "=" + .value) | join(",")' "$out.all")
+  POD_WAIT=$(sed -n 's/^ *pod_wait=\([0-9][0-9]*\)$/\1/p' "$out")
+  WINDOW=$(sed -n 's/.*retry_until=\$(( \$(date +%s) + \([0-9][0-9]*\) )).*/\1/p' "$out")
+  SCRIPT_DEPLOY=$(sed -n 's/^ *deploy=\([a-z0-9-]*\)$/\1/p' "$out")
+  POD_SELECTOR=$(sed -n 's/.*--selector \([^ ]*\).*/\1/p' "$out" | sort -u)
+  for v in "$DEADLINE" "$GRACE" "$DEPLOY_NAME" "$ROLE_DEPLOY" "$POD_LABELS" "$POD_WAIT" "$WINDOW" "$SCRIPT_DEPLOY" "$POD_SELECTOR"; do
+    [ -n "$v" ] || return 1
+  done
+}
+
+# add_release <state> <ns> <name> <finalizer>...
+# One HelmRelease, its finalizers in order, one per line, at generation 1 and
+# observed, resourceVersion 1, suspended.
+add_release() {
+  st=$1 ns=$2 name=$3
+  shift 3
+  : > "$st/$ns@$name.fin"
+  for f in "$@"; do
+    echo "$f" >> "$st/$ns@$name.fin"
+  done
+  echo 1 > "$st/$ns@$name.gen"
+  echo 1 > "$st/$ns@$name.obs"
+  echo 1 > "$st/$ns@$name.rv"
+  touch "$st/$ns@$name.suspended"
+}
+
+# fences_left <state>: how many fence entries remain across all releases.
+fences_left() {
+  cat "$1"/*.fin 2>/dev/null | grep --count --line-regexp "$FENCE"
+}
+
+# write_fakes <dir>
+# A fake kubectl, sleep and date sharing one simulated clock in $CLOCK (seconds
+# since the hook started): sleep advances it, date +%s reads it. kubectl logs
+# every call to $KLOG and works on the release state in $STATE:
+#   * <ns>@<name>.fin        finalizers, in order;
+#   * <ns>@<name>.gen/.obs   metadata.generation and status.observedGeneration;
+#                            lifting a suspension bumps the generation;
+#   * <ns>@<name>.rv         resourceVersion, bumped by every write;
+#   * <ns>@<name>.suspended  spec.suspend is true;
+#   * <ns>@<name>.deleting   the release is being deleted;
+#   * <ns>@<name>.owned      flux-plunger's Apply entry owns spec.suspend,
+#                            holding what a correct ownership template prints;
+#   * <ns>@<name>.coowned    another manager also owns spec.suspend at true;
+#                            flux-plunger's own path leaves such a suspension;
+#   * <ns>@<name>.applyonly  flux-plunger has an Apply entry that does not own
+#                            spec.suspend;
+#   * <ns>@<name>.updateowned  flux-plunger owns spec.suspend through an Update
+#                            entry, as an earlier flux-plunger's merge patch left
+#                            it; the controller does not take that one as its own;
+#   * <ns>@<name>.vanish     the release is deleted the first time it is read
+#                            after the listing; reading it then is NotFound
+#                            unless --ignore-not-found is given;
+#   * <ns>@<name>.readd      something puts the fence back after every removal,
+#                            as a flux-plunger still running would;
+#   * <ns>@<name>.latefence  the release gains the fence right after the first
+#                            listing, as one a running flux-plunger fences would;
+#   * deploy.absent          the flux-plunger Deployment does not exist;
+#   * pods.stuck             flux-plunger's pod never goes: the wait runs to its
+#                            --timeout on the clock (a negative one, as kubectl
+#                            reads it, for a week) and fails, and the pod lists;
+#   * scale.slow             seconds a successful scale-down takes;
+#   * <key>.fail             a count of calls to fail first, for the Deployment
+#                            read (deploy), the scale-down (scale), the pod wait
+#                            for a reason other than pods (wait), the listing
+#                            (list), a listing after the first (relist), the
+#                            pod listing (pods), a release's ownership read
+#                            (<ns>@<name>.ownedread), unsuspend
+#                            (<ns>@<name>.apply), unsuspend racing another
+#                            write (<ns>@<name>.applyconflict) or finalizer patch
+#                            (<ns>@<name>.patch);
+#   * list.partial.fail      a count of listings that print what they have, then
+#                            fail, as kubectl does on a partial error.
+# Releases whose suspension was lifted are appended to $STATE/unsuspended.
+# No line below is a bare column-0 closing brace, so cozytest.sh leaves it intact.
+write_fakes() {
+  cat > "$1/kubectl" <<'KEOF'
+#!/bin/sh
+echo "$*" >> "$KLOG"
+FENCE=flux-plunger.cozystack.io/uninstall-fence
+HELMFIN=finalizers.fluxcd.io
+# The one predicate that tells a release helm-controller has not yet handled in
+# its unsuspended form: being deleted, no longer held by its finalizer, and its
+# latest generation not yet observed.
+UNHANDLED='{{if .metadata.deletionTimestamp}}{{$held := false}}{{range .metadata.finalizers}}{{if eq . "finalizers.fluxcd.io"}}{{$held = true}}{{end}}{{end}}{{if and (not $held) (ne (printf "%v" .status.observedGeneration) (printf "%v" .metadata.generation))}}'
+# In the hook's pod kubectl finds the API server only through the in-cluster
+# config, which client-go stops falling back to once a client override such as
+# --request-timeout is set: the call then goes to localhost:8080 and fails.
+case " $* " in
+  *" --request-timeout"*|*" --server="*|*" --server "*|*" --token"*)
+    echo "The connection to the server localhost:8080 was refused" >&2
+    exit 1 ;;
+esac
+take_fail() {
+  [ -s "$1.fail" ] || return 1
+  n=$(cat "$1.fail")
+  [ "$n" -gt 0 ] || return 1
+  echo $((n - 1)) > "$1.fail"
+  return 0
+  }
+bump_rv() {
+  echo $(( $(cat "$1.rv") + 1 )) > "$1.rv"
+  }
+ns="" name="" payload="" tmpl="" type="" fm="" all=no kind="" verb="" ignore=no timeout="" for="" ssa=no file=""
+while [ $# -gt 0 ]; do
+  case "$1" in
+    --namespace) ns=$2; shift ;;
+    --all-namespaces) all=yes ;;
+    --output) tmpl=$2; shift ;;
+    --type) type=$2; shift ;;
+    --patch) payload=$2; shift ;;
+    --field-manager) fm=$2; shift ;;
+    --filename) file=$2; shift ;;
+    --selector) shift ;;
+    --ignore-not-found) ignore=yes ;;
+    --server-side) ssa=yes ;;
+    --timeout=*) timeout=${1#--timeout=}; timeout=${timeout%s} ;;
+    --for=*) for=${1#--for=} ;;
+    --*) ;;
+    get|patch|scale|wait|apply) [ -n "$verb" ] || verb=$1 ;;
+    helmreleases.helm.toolkit.fluxcd.io) kind=hr ;;
+    deployment) kind=deployment ;;
+    pod) kind=pod ;;
+    *) if [ -n "$kind" ] && [ -z "$name" ]; then name=$1; fi ;;
+  esac
+  shift
+done
+case "$verb" in
+  scale)
+    if take_fail "$STATE/scale"; then echo "fake: the scale-down was rejected" >&2; exit 1; fi
+    if [ -s "$STATE/scale.slow" ]; then echo $(( $(cat "$CLOCK") + $(cat "$STATE/scale.slow") )) > "$CLOCK"; fi
+    echo "deployment.apps/$name scaled"
+    exit 0 ;;
+  wait)
+    if [ "$for" != delete ]; then echo "fake: waiting on '$for', not on the pods being gone" >&2; exit 64; fi
+    if take_fail "$STATE/wait"; then echo "error: watch closed before the condition was met" >&2; exit 1; fi
+    if [ -e "$STATE/pods.stuck" ]; then
+      now=$(cat "$CLOCK")
+      # kubectl wait: zero checks once, a negative timeout waits for a week.
+      [ "$timeout" -ge 0 ] || timeout=604800
+      echo $((now + timeout)) > "$CLOCK"
+      echo "error: timed out waiting for the condition on pods/flux-plunger-0" >&2
+      exit 1
+    fi
+    exit 0 ;;
+esac
+if [ "$kind" = pod ] && [ "$verb" = get ]; then
+  if take_fail "$STATE/pods"; then echo "fake: the pod listing timed out" >&2; exit 1; fi
+  [ -e "$STATE/pods.stuck" ] && echo "pod/flux-plunger-0"
+  exit 0
+fi
+if [ "$kind" = deployment ] && [ "$verb" = get ]; then
+  if take_fail "$STATE/deploy"; then echo "fake: the Deployment read timed out" >&2; exit 1; fi
+  [ -e "$STATE/deploy.absent" ] || echo "deployment.apps/$name"
+  exit 0
+fi
+if [ "$verb" = apply ]; then
+  # kubectl apply --server-side migrates every field kubectl-client-side-apply
+  # owns to the applying manager and then re-applies, so a minimal manifest strips
+  # those fields from a release created with a client-side kubectl apply.
+  echo "fake: kubectl apply takes over and strips client-side-apply fields" >&2
+  exit 64
+fi
+rel="$STATE/$ns@$name"
+if [ "$verb" = get ] && [ -z "$name" ]; then
+  if take_fail "$STATE/list"; then echo "fake: the listing was throttled" >&2; exit 1; fi
+  if [ -e "$STATE/listed" ] && take_fail "$STATE/relist"; then echo "fake: the second listing was throttled" >&2; exit 1; fi
+  partial=no
+  if take_fail "$STATE/list.partial"; then partial=yes; fi
+  case "$tmpl" in *"eq . \"$FENCE\""*) ;; *) exit 0 ;; esac
+  for f in "$STATE"/*@*.fin; do
+    [ -e "$f" ] || continue
+    r=$(basename "$f" .fin)
+    rns=${r%@*}
+    if [ "$all" = yes ] || [ "$rns" = "$ns" ]; then
+      case "$tmpl" in
+        *'{{if $fenced}}'*) grep -q -x "$FENCE" "$f" && printf '%s/%s\n' "$rns" "${r#*@}" ;;
+        *) grep -x "$FENCE" "$f" | while read -r _; do printf '%s/%s\n' "$rns" "${r#*@}"; done ;;
+      esac
+    fi
+  done
+  for l in "$STATE"/*@*.latefence; do
+    [ -e "$l" ] || continue
+    echo "$FENCE" >> "${l%.latefence}.fin"
+    rm -f "$l"
+  done
+  if [ "$partial" = yes ]; then echo "fake: an error occurred partway through the listing" >&2; exit 1; fi
+  touch "$STATE/listed"
+  exit 0
+fi
+if [ "$verb" = get ]; then
+  if [ -e "$rel.vanish" ]; then
+    rm -f "$rel.vanish" "$rel.fin"
+  fi
+  if [ ! -e "$rel.fin" ]; then
+    [ "$ignore" = yes ] && exit 0
+    echo "Error from server (NotFound): helmreleases.helm.toolkit.fluxcd.io \"$name\" not found" >&2
+    exit 1
+  fi
+  case "$tmpl" in
+    *managedFields*)
+      if take_fail "$rel.ownedread"; then
+        echo "Error executing template: an error blob on stdout"
+        exit 1
+      fi
+      case "$tmpl" in *'.metadata.resourceVersion}} {{.metadata.uid}}'*) printf '%s uid-%s ' "$(cat "$rel.rv")" "$name" ;; esac
+      case "$tmpl" in *'{{if .spec.suspend}}'*) [ -e "$rel.suspended" ] || exit 0 ;; esac
+      case "$tmpl" in *'eq .manager "flux-plunger"'*) ;; *) exit 0 ;; esac
+      [ -e "$rel.owned" ] && cat "$rel.owned"
+      case "$tmpl" in *'(eq .operation "Apply")'*) ;; *) [ -e "$rel.updateowned" ] && echo yes ;; esac
+      case "$tmpl" in *'"f:suspend"'*) ;; *) [ -e "$rel.applyonly" ] && echo yes ;; esac
+      # Another manager's entry also owning spec.suspend.
+      case "$tmpl" in *'ne .manager "flux-plunger"'*) [ -e "$rel.coowned" ] && echo other ;; esac
+      exit 0 ;;
+    *deletionTimestamp*)
+      case "$tmpl" in *"$UNHANDLED"*) ;; *) exit 0 ;; esac
+      [ -e "$rel.deleting" ] || exit 0
+      grep -q -x "$HELMFIN" "$rel.fin" && exit 0
+      [ "$(cat "$rel.gen")" = "$(cat "$rel.obs")" ] && exit 0
+      printf 'unhandled'
+      exit 0 ;;
+    *'range $i, $f'*)
+      case "$tmpl" in
+        *"eq \$f \"$FENCE\""*) grep -n -x "$FENCE" "$rel.fin" | cut -d: -f1 | awk '{ printf "%d ", $1 - 1 }' ;;
+      esac
+      exit 0 ;;
+  esac
+fi
+if [ "$verb" = patch ]; then
+  [ -e "$rel.fin" ] || { echo "fake: $ns/$name not found" >&2; exit 1; }
+  case "$type" in
+    json)
+      case "$payload" in
+        *'"path":"/spec/suspend"'*)
+          if take_fail "$rel.apply"; then echo "fake: the unsuspend was rejected" >&2; exit 1; fi
+          if take_fail "$rel.applyconflict"; then bump_rv "$rel"; fi
+          if [ "$fm" != flux-plunger ]; then echo "fake: unsuspend not written as flux-plunger" >&2; exit 64; fi
+          want="[{\"op\":\"test\",\"path\":\"/metadata/resourceVersion\",\"value\":\"$(cat "$rel.rv")\"},{\"op\":\"test\",\"path\":\"/metadata/uid\",\"value\":\"uid-$name\"},{\"op\":\"replace\",\"path\":\"/spec/suspend\",\"value\":false}]"
+          if [ "$payload" != "$want" ]; then echo "fake: testing value /metadata/resourceVersion failed or not a preconditioned unsuspend: $payload" >&2; exit 1; fi
+          if [ -e "$rel.coowned" ]; then echo "fake: cleared a suspension another manager also holds" >&2; exit 64; fi
+          rm -f "$rel.owned" "$rel.applyonly" "$rel.suspended"
+          echo $(( $(cat "$rel.gen") + 1 )) > "$rel.gen"
+          echo "$ns/$name" >> "$STATE/unsuspended"
+          bump_rv "$rel"
+          exit 0 ;;
+      esac
+      if take_fail "$rel.patch"; then echo "fake: the patch was rejected" >&2; exit 1; fi
+      i=$(printf '%s' "$payload" | sed -n 's#^\[{"op":"test","path":"/metadata/finalizers/\([0-9][0-9]*\)","value":"flux-plunger\.cozystack\.io/uninstall-fence"},{"op":"remove","path":"/metadata/finalizers/\1"}\]$#\1#p')
+      [ -n "$i" ] || { echo "fake: not a guarded fence removal: $payload" >&2; exit 1; }
+      [ "$(sed -n "$((i + 1))p" "$rel.fin")" = "$FENCE" ] || { echo "fake: testing value /metadata/finalizers/$i failed" >&2; exit 1; }
+      sed -i.bak "$((i + 1))d" "$rel.fin"
+      [ -e "$rel.readd" ] && echo "$FENCE" >> "$rel.fin"
+      bump_rv "$rel"
+      now=$(cat "$CLOCK")
+      echo $((now + 1)) > "$CLOCK"
+      exit 0 ;;
+  esac
+  echo "fake: a $type patch; spec.suspend is lifted only by the guarded JSON patch" >&2
+  exit 64
+fi
+echo "fake kubectl: unexpected call" >&2
+exit 64
+KEOF
+  cat > "$1/sleep" <<'SEOF'
+#!/bin/sh
+now=$(cat "$CLOCK")
+echo $((now + $1)) > "$CLOCK"
+SEOF
+  cat > "$1/date" <<'DEOF'
+#!/bin/sh
+cat "$CLOCK"
+DEOF
+  chmod 0755 "$1/kubectl" "$1/sleep" "$1/date"
+}
+
+# prepare <dir>: fakes, script, empty state, clock at zero.
+prepare() {
+  write_fakes "$1"
+  render_hook "$1/hook.sh" || return 1
+  mkdir "$1/state"
+  export KLOG="$1/calls" CLOCK="$1/clock" STATE="$1/state" NAMESPACE=cozy-fluxcd
+  echo 0 > "$CLOCK"
+  : > "$KLOG"
+}
+
+# run_hook <dir>: run the script, its output in <dir>/out, its status in $status.
+run_hook() {
+  status=0
+  PATH="$1:$PATH" sh "$1/hook.sh" > "$1/out" 2>&1 || status=$?
+  cat "$1/out"
+  echo "status=$status elapsed=$(cat "$CLOCK")s"
+}
+
+@test "the hook waits for flux-plunger's own drain, fits under helm's bound, and stops the Deployment the chart deploys" {
+  tmp=$(mktemp -d)
+  prepare "$tmp"
+  echo "deadline=${DEADLINE}s grace=${GRACE}s pod-wait=${POD_WAIT}s window=${WINDOW}s deploy=$SCRIPT_DEPLOY/$DEPLOY_NAME/$ROLE_DEPLOY selector=$POD_SELECTOR labels=$POD_LABELS"
+  # helm-controller runs the pre-delete hook under the release's uninstall
+  # timeout, 300s by default, and the operator sets none; that clock starts
+  # when the hook is created, so the Job's own deadline has to end first.
+  [ "$DEADLINE" -lt 300 ]
+  # Retries stop a minute before the Job is killed, the pod wait covers the
+  # pod's grace period, and fits inside the retry window.
+  [ $((DEADLINE - WINDOW)) -ge 60 ]
+  [ "$POD_WAIT" -gt "$GRACE" ]
+  [ "$POD_WAIT" -lt "$WINDOW" ]
+  # The wait must find flux-plunger's pod: kubectl wait --for=delete succeeds at
+  # once on a selector that matches nothing.
+  [ "$POD_SELECTOR" = "$POD_LABELS" ]
+  # A name the chart does not deploy reads as a Deployment already gone.
+  [ "$SCRIPT_DEPLOY" = "$DEPLOY_NAME" ]
+  [ "$ROLE_DEPLOY" = "$DEPLOY_NAME" ]
+  rm -rf "$tmp"
+}
+
+@test "at the largest grace period the chart accepts the hook still fits under helm's bound" {
+  tmp=$(mktemp -d)
+  render_hook "$tmp/hook.sh" --set shutdownGracePeriodSeconds=140
+  echo "deadline=$DEADLINE pod-wait=$POD_WAIT window=$WINDOW"
+  [ "$DEADLINE" -lt 300 ]
+  [ $((DEADLINE - WINDOW)) -ge 60 ]
+  [ "$POD_WAIT" -gt 140 ]
+  [ "$POD_WAIT" -lt "$WINDOW" ]
+  rm -rf "$tmp"
+}
+
+@test "the hook lifts only a suspension flux-plunger alone holds and removes only the fence, at the index it holds" {
+  tmp=$(mktemp -d)
+  prepare "$tmp"
+  add_release "$STATE" tenant-a app-a example.com/keep "$FENCE" "$HELMFIN"
+  echo yes > "$STATE/tenant-a@app-a.owned"
+  add_release "$STATE" tenant-b app-b "$FENCE"
+  # Two managedFields entries would print the ownership mark twice.
+  add_release "$STATE" tenant-c app-c example.com/one example.com/two "$FENCE"
+  echo yesyes > "$STATE/tenant-c@app-c.owned"
+  # Someone else removes this fence between the listing and the hook's next read.
+  add_release "$STATE" tenant-d app-d "$FENCE" example.com/keep
+  touch "$STATE/tenant-d@app-d.vanish"
+  # flux-plunger applied to this release, but its entry does not own spec.suspend.
+  add_release "$STATE" tenant-e app-e "$FENCE"
+  touch "$STATE/tenant-e@app-e.applyonly"
+  # A successful read that prints something other than the ownership mark.
+  add_release "$STATE" tenant-f app-f "$FENCE"
+  echo unrelated > "$STATE/tenant-f@app-f.owned"
+  # The apiserver accepts a finalizer listed twice; both copies go, and the
+  # release is counted once.
+  add_release "$STATE" tenant-g app-g "$FENCE" example.com/keep "$FENCE"
+  # Another manager also holds spec.suspend at true: its suspension stands, as
+  # the controller's relinquish leaves it.
+  add_release "$STATE" tenant-h app-h "$FENCE"
+  echo yes > "$STATE/tenant-h@app-h.owned"
+  touch "$STATE/tenant-h@app-h.coowned"
+  # flux-plunger owns spec.suspend at false, as after its own unsuspend: there is
+  # nothing to lift, and no write.
+  add_release "$STATE" tenant-i app-i "$FENCE"
+  echo yes > "$STATE/tenant-i@app-i.owned"
+  rm "$STATE/tenant-i@app-i.suspended"
+  # A suspension an earlier flux-plunger left through a merge patch is not one
+  # the controller takes as its own, so the hook leaves it too.
+  add_release "$STATE" tenant-j app-j "$FENCE"
+  touch "$STATE/tenant-j@app-j.updateowned"
+
+  run_hook "$tmp"
+
+  echo "unsuspended=$(tr '\n' ' ' < "$STATE/unsuspended" 2>/dev/null)"
+  [ "$status" -eq 0 ]
+  [ "$(fences_left "$STATE")" -eq 0 ]
+  [ "$(sort "$STATE/unsuspended" | tr '\n' ' ')" = "tenant-a/app-a tenant-c/app-c " ]
+  [ -e "$STATE/tenant-h@app-h.suspended" ]
+  [ -e "$STATE/tenant-j@app-j.suspended" ]
+  [ "$(tr '\n' ' ' < "$STATE/tenant-a@app-a.fin")" = "example.com/keep $HELMFIN " ]
+  [ "$(tr '\n' ' ' < "$STATE/tenant-c@app-c.fin")" = "example.com/one example.com/two " ]
+  [ "$(tr '\n' ' ' < "$STATE/tenant-g@app-g.fin")" = "example.com/keep " ]
+  grep -q -x 'released 10 of 10 fenced HelmReleases, 0 without an uninstall' "$tmp/out"
+  # Nothing the fake refused, and the pod wait asked the question it answers.
+  if grep -q -e '^fake:' -e 'the wait for flux-plunger pods to go failed' "$tmp/out"; then
+    echo "FAIL: the hook made a call the fake refused"
+    false
+  fi
+  rm -rf "$tmp"
+}
+
+@test "a release deleted before helm-controller handled it is released, and named as deleted without an uninstall" {
+  tmp=$(mktemp -d)
+  prepare "$tmp"
+  # helm-controller dropped its finalizer on the suspended delete; the fence is
+  # all that holds it, and flux-plunger's drain did not get it through. Lifting
+  # the suspension bumps the generation, which helm-controller has not observed.
+  add_release "$STATE" tenant-a app-a "$FENCE"
+  touch "$STATE/tenant-a@app-a.deleting"
+  echo yes > "$STATE/tenant-a@app-a.owned"
+  # Being deleted, but helm-controller's finalizer still holds it: helm-controller
+  # will run the uninstall once the fence is gone.
+  add_release "$STATE" tenant-b app-b "$HELMFIN" "$FENCE"
+  touch "$STATE/tenant-b@app-b.deleting"
+  echo yes > "$STATE/tenant-b@app-b.owned"
+  # Being deleted, helm-controller has handled its current generation.
+  add_release "$STATE" tenant-c app-c "$FENCE"
+  touch "$STATE/tenant-c@app-c.deleting"
+  # Its uninstall completes mid-sweep, and the release is gone when read.
+  add_release "$STATE" tenant-d app-d "$FENCE"
+  touch "$STATE/tenant-d@app-d.vanish"
+
+  run_hook "$tmp"
+
+  [ "$status" -eq 0 ]
+  [ "$(fences_left "$STATE")" -eq 0 ]
+  grep -q -x "released $FENCE from tenant-a/app-a without an uninstall: helm-controller had not handled it" "$tmp/out"
+  grep -q -x "released $FENCE from tenant-b/app-b" "$tmp/out"
+  grep -q -x "released $FENCE from tenant-c/app-c" "$tmp/out"
+  grep -q -x "released $FENCE from tenant-d/app-d" "$tmp/out"
+  grep -q -x 'released 4 of 4 fenced HelmReleases, 1 without an uninstall' "$tmp/out"
+  rm -rf "$tmp"
+}
+
+@test "transient API failures are retried, and a failed attempt's output is not taken as an answer" {
+  tmp=$(mktemp -d)
+  prepare "$tmp"
+  echo 2 > "$STATE/deploy.fail"
+  echo 2 > "$STATE/scale.fail"
+  echo 2 > "$STATE/list.fail"
+  # Two listings that print what they have and then fail: their output must
+  # not be added to the one that succeeds.
+  echo 2 > "$STATE/list.partial.fail"
+  add_release "$STATE" tenant-a app-a "$FENCE"
+  echo 2 > "$STATE/tenant-a@app-a.patch.fail"
+  # Not flux-plunger's suspension; a failed ownership read prints an error blob
+  # to stdout first.
+  add_release "$STATE" tenant-b app-b "$FENCE"
+  echo 2 > "$STATE/tenant-b@app-b.ownedread.fail"
+  add_release "$STATE" tenant-d app-d "$FENCE"
+  echo yes > "$STATE/tenant-d@app-d.owned"
+  echo 2 > "$STATE/tenant-d@app-d.apply.fail"
+  # A write lands between the ownership read and the unsuspend: the patch is
+  # rejected on its resourceVersion, and the decision is read again.
+  add_release "$STATE" tenant-e app-e "$FENCE"
+  echo yes > "$STATE/tenant-e@app-e.owned"
+  echo 1 > "$STATE/tenant-e@app-e.applyconflict.fail"
+
+  run_hook "$tmp"
+
+  [ "$status" -eq 0 ]
+  [ "$(fences_left "$STATE")" -eq 0 ]
+  [ "$(sort "$STATE/unsuspended" | tr '\n' ' ')" = "tenant-d/app-d tenant-e/app-e " ]
+  [ "$(grep --count "released $FENCE from" "$tmp/out")" -eq 4 ]
+  grep -q -x 'released 4 of 4 fenced HelmReleases, 0 without an uninstall' "$tmp/out"
+  rm -rf "$tmp"
+}
+
+@test "a release that cannot be read, unsuspended or unfenced fails the hook, keeps its fence and is named" {
+  tmp=$(mktemp -d)
+  prepare "$tmp"
+  add_release "$STATE" tenant-a app-a "$FENCE"
+  echo 9999 > "$STATE/tenant-a@app-a.patch.fail"
+  add_release "$STATE" tenant-b app-b "$FENCE"
+  echo 9999 > "$STATE/tenant-b@app-b.ownedread.fail"
+  # Its suspension is flux-plunger's and cannot be lifted: without the fence a
+  # deleted release that is still suspended is removed without an uninstall.
+  add_release "$STATE" tenant-c app-c "$FENCE"
+  echo yes > "$STATE/tenant-c@app-c.owned"
+  echo 9999 > "$STATE/tenant-c@app-c.apply.fail"
+  add_release "$STATE" tenant-d app-d "$FENCE"
+
+  run_hook "$tmp"
+
+  [ "$status" -ne 0 ]
+  grep -q '^NOT released tenant-a/app-a' "$tmp/out"
+  grep -q '^NOT released tenant-b/app-b' "$tmp/out"
+  grep -q '^NOT released tenant-c/app-c' "$tmp/out"
+  if grep -q "released $FENCE from tenant-[abc]/" "$tmp/out"; then
+    echo "FAIL: a release left fenced was reported released"
+    false
+  fi
+  grep -q -x 'released 1 of 4 fenced HelmReleases, 0 without an uninstall' "$tmp/out"
+  [ "$(fences_left "$STATE")" -eq 3 ]
+  [ -e "$STATE/tenant-c@app-c.owned" ]
+  [ "$(cat "$CLOCK")" -lt "$DEADLINE" ]
+  rm -rf "$tmp"
+}
+
+@test "a fence that keeps coming back fails the hook inside its deadline" {
+  tmp=$(mktemp -d)
+  prepare "$tmp"
+  add_release "$STATE" tenant-a app-a "$FENCE"
+  touch "$STATE/tenant-a@app-a.readd"
+
+  run_hook "$tmp"
+
+  [ "$status" -ne 0 ]
+  grep -q '^NOT released tenant-a/app-a' "$tmp/out"
+  [ "$(cat "$CLOCK")" -lt "$DEADLINE" ]
+  rm -rf "$tmp"
+}
+
+@test "a listing that never succeeds fails the hook instead of reading as no fences" {
+  tmp=$(mktemp -d)
+  prepare "$tmp"
+  echo 9999 > "$STATE/list.fail"
+  add_release "$STATE" tenant-a app-a "$FENCE"
+
+  run_hook "$tmp"
+
+  [ "$status" -ne 0 ]
+  grep -q 'could not list' "$tmp/out"
+  [ "$(fences_left "$STATE")" -eq 1 ]
+  [ "$(cat "$CLOCK")" -lt "$DEADLINE" ]
+  rm -rf "$tmp"
+}
+
+@test "a Deployment that cannot be read or scaled down fails the hook before any fence is touched" {
+  for knob in deploy scale; do
+    tmp=$(mktemp -d)
+    prepare "$tmp"
+    # flux-plunger may still be running and would fence behind a sweep, and a
+    # sweep that ran anyway would leave the retried uninstall nothing to
+    # converge on.
+    echo 9999 > "$STATE/$knob.fail"
+    add_release "$STATE" tenant-a app-a "$FENCE"
+    echo yes > "$STATE/tenant-a@app-a.owned"
+
+    run_hook "$tmp"
+
+    [ "$status" -ne 0 ]
+    grep -q 'no fence was touched' "$tmp/out"
+    [ "$(fences_left "$STATE")" -eq 1 ]
+    [ -e "$STATE/tenant-a@app-a.owned" ]
+    if grep -q 'helmreleases' "$KLOG"; then
+      echo "FAIL: the sweep ran with flux-plunger possibly still running"
+      false
+    fi
+    [ "$(cat "$CLOCK")" -lt "$DEADLINE" ]
+    rm -rf "$tmp"
+  done
+}
+
+@test "a flux-plunger Deployment that is already gone has nothing to stop, and says so" {
+  tmp=$(mktemp -d)
+  prepare "$tmp"
+  touch "$STATE/deploy.absent"
+  echo 9999 > "$STATE/scale.fail"
+  add_release "$STATE" tenant-a app-a "$FENCE"
+
+  run_hook "$tmp"
+
+  [ "$status" -eq 0 ]
+  grep -q 'no flux-plunger Deployment in cozy-fluxcd; nothing to stop' "$tmp/out"
+  [ "$(fences_left "$STATE")" -eq 0 ]
+  if grep -q ' scale ' "$KLOG"; then
+    echo "FAIL: scaled a Deployment that is not there"
+    false
+  fi
+  rm -rf "$tmp"
+}
+
+@test "a flux-plunger pod that does not go is named, and the sweep goes on" {
+  tmp=$(mktemp -d)
+  prepare "$tmp"
+  # A pod stuck Terminating on a NotReady node stays until the node returns or
+  # someone force-deletes it; failing on it would fail every retried uninstall.
+  touch "$STATE/pods.stuck"
+  add_release "$STATE" tenant-a app-a "$FENCE"
+  echo 2 > "$STATE/tenant-a@app-a.patch.fail"
+
+  run_hook "$tmp"
+
+  [ "$status" -eq 0 ]
+  grep -q 'pods are still running, sweeping anyway: pod/flux-plunger-0' "$tmp/out"
+  [ "$(fences_left "$STATE")" -eq 0 ]
+  grep -q -x 'released 1 of 1 fenced HelmReleases, 0 without an uninstall' "$tmp/out"
+  [ "$(cat "$CLOCK")" -lt "$DEADLINE" ]
+  rm -rf "$tmp"
+}
+
+@test "a release the still-running flux-plunger fences after the listing fails the hook and is named" {
+  tmp=$(mktemp -d)
+  prepare "$tmp"
+  # The stuck pod's container is alive: it never got SIGTERM, still holds the
+  # Lease, and fences one more release once the listing has returned. With the
+  # chart gone nothing would ever remove that fence.
+  touch "$STATE/pods.stuck"
+  add_release "$STATE" tenant-a app-a "$FENCE"
+  add_release "$STATE" tenant-z app-z example.com/keep
+  touch "$STATE/tenant-z@app-z.latefence"
+
+  run_hook "$tmp"
+
+  [ "$status" -ne 0 ]
+  grep -q '^NOT released tenant-z/app-z: fenced after the sweep' "$tmp/out"
+  [ "$(fences_left "$STATE")" -eq 1 ]
+  rm -rf "$tmp"
+}
+
+@test "a pod wait that fails for another reason is told apart from a pod that stays" {
+  tmp=$(mktemp -d)
+  prepare "$tmp"
+  echo 1 > "$STATE/wait.fail"
+  add_release "$STATE" tenant-a app-a "$FENCE"
+
+  run_hook "$tmp"
+
+  [ "$status" -eq 0 ]
+  grep -q 'the wait for flux-plunger pods to go failed, but none is left' "$tmp/out"
+  [ "$(fences_left "$STATE")" -eq 0 ]
+  # With the pods gone, nothing can have fenced behind the sweep.
+  [ "$(grep --count 'helmreleases.helm.toolkit.fluxcd.io --all-namespaces' "$KLOG")" -eq 1 ]
+  rm -rf "$tmp"
+}
+
+@test "a pod wait after a slow scale-down is cut to what is left of the retry window" {
+  tmp=$(mktemp -d)
+  prepare "$tmp"
+  # The scale-down is retried for most of the window, and the pod never goes:
+  # the wait must not run past the window, or the Job is killed before the
+  # sweep and its report.
+  echo 80 > "$STATE/scale.fail"
+  touch "$STATE/pods.stuck"
+  add_release "$STATE" tenant-a app-a "$FENCE"
+
+  run_hook "$tmp"
+
+  [ "$status" -eq 0 ]
+  grep -q -x 'released 1 of 1 fenced HelmReleases, 0 without an uninstall' "$tmp/out"
+  [ "$(cat "$CLOCK")" -lt "$DEADLINE" ]
+  rm -rf "$tmp"
+}
+
+@test "a pod listing that cannot be read after a failed wait is treated as a pod still running" {
+  tmp=$(mktemp -d)
+  prepare "$tmp"
+  echo 1 > "$STATE/wait.fail"
+  echo 9999 > "$STATE/pods.fail"
+  add_release "$STATE" tenant-a app-a "$FENCE"
+  add_release "$STATE" tenant-z app-z example.com/keep
+  touch "$STATE/tenant-z@app-z.latefence"
+
+  run_hook "$tmp"
+
+  [ "$status" -ne 0 ]
+  grep -q 'could not tell whether flux-plunger pods are still running; sweeping anyway' "$tmp/out"
+  grep -q '^NOT released tenant-z/app-z: fenced after the sweep' "$tmp/out"
+  [ "$(cat "$CLOCK")" -lt "$DEADLINE" ]
+  rm -rf "$tmp"
+}
+
+@test "a listing after the sweep that never succeeds fails the hook" {
+  tmp=$(mktemp -d)
+  prepare "$tmp"
+  # The pod is still there, so whether it fenced anything behind the sweep is
+  # unknown until a listing answers.
+  touch "$STATE/pods.stuck"
+  echo 9999 > "$STATE/relist.fail"
+  add_release "$STATE" tenant-a app-a "$FENCE"
+
+  run_hook "$tmp"
+
+  [ "$status" -ne 0 ]
+  grep -q 'could not list fenced HelmReleases again after the sweep' "$tmp/out"
+  [ "$(fences_left "$STATE")" -eq 0 ]
+  [ "$(cat "$CLOCK")" -lt "$DEADLINE" ]
+  rm -rf "$tmp"
+}
+
+@test "a scale-down that returns after the retry window still bounds the pod wait" {
+  tmp=$(mktemp -d)
+  prepare "$tmp"
+  # What is left of the window is then negative, which kubectl wait reads as a
+  # week: the Job would be killed before the sweep and its report.
+  echo $((WINDOW + 5)) > "$STATE/scale.slow"
+  touch "$STATE/pods.stuck"
+  add_release "$STATE" tenant-a app-a "$FENCE"
+
+  run_hook "$tmp"
+
+  [ "$status" -eq 0 ]
+  grep -q -x 'released 1 of 1 fenced HelmReleases, 0 without an uninstall' "$tmp/out"
+  [ "$(cat "$CLOCK")" -lt "$DEADLINE" ]
+  rm -rf "$tmp"
+}
diff --git a/hack/fork-new-images.bats b/hack/fork-new-images.bats
new file mode 100644
index 0000000000..ad4c13cf13
--- /dev/null
+++ b/hack/fork-new-images.bats
@@ -0,0 +1,85 @@
+#!/usr/bin/env bats
+# hack/fork-new-images.sh refuses a fork PR that adds an image the base tree
+# does not export, before the build. Its derivation has to stay the one
+# e2e-fork.yaml uses for the push allowlist, or the early check and the push
+# disagree about what counts as new.
+
+load test_helper
+
+ROOT="$(pwd)"
+SCRIPT="$ROOT/hack/fork-new-images.sh"
+FORK_WF="$ROOT/.github/workflows/e2e-fork.yaml"
+PR_WF="$ROOT/.github/workflows/pull-requests.yaml"
+
+# make_tree DIR NAME... — a git index holding one package per NAME whose image
+# target exports NAME.oci.tar, the way the real recipes do under OCI_EXPORT_DIR.
+make_tree() {
+  dir="$1"
+  shift
+  mkdir -p "$dir"
+  git -C "$dir" init --quiet
+  for name in "$@"; do
+    mkdir -p "$dir/packages/system/$name"
+    printf 'image:\n\tdocker buildx build --output type=oci,dest=$(OCI_EXPORT_DIR)/%s.oci.tar .\n' "$name" \
+      > "$dir/packages/system/$name/Makefile"
+  done
+  git -C "$dir" add --all
+}
+
+@test "an image only the head tree exports is refused and named" {
+  tmp="$(mktemp -d)"
+  make_tree "$tmp/base" alpha beta
+  make_tree "$tmp/head" alpha beta gamma delta
+  rc=0
+  "$SCRIPT" "$tmp/base" "$tmp/head" > "$tmp/out" 2>&1 || rc=$?
+  [ "$rc" -eq 1 ]
+  grep -q '^::error title=New image in a fork PR::' "$tmp/out"
+  grep -q 'does not build: delta gamma\.' "$tmp/out"
+  rm -rf "$tmp"
+}
+
+@test "the same image set, or a removed image, passes" {
+  tmp="$(mktemp -d)"
+  make_tree "$tmp/base" alpha beta
+  make_tree "$tmp/same" alpha beta
+  make_tree "$tmp/fewer" alpha
+  "$SCRIPT" "$tmp/base" "$tmp/same"
+  "$SCRIPT" "$tmp/base" "$tmp/fewer"
+  rm -rf "$tmp"
+}
+
+@test "a base tree that yields no names fails as a derivation error, not a new image" {
+  tmp="$(mktemp -d)"
+  make_tree "$tmp/base"
+  make_tree "$tmp/head" alpha
+  rc=0
+  "$SCRIPT" "$tmp/base" "$tmp/head" > "$tmp/out" 2>&1 || rc=$?
+  [ "$rc" -eq 1 ]
+  grep -q 'produced no names for the base tree' "$tmp/out"
+  if grep -q 'New image' "$tmp/out"; then echo "FAIL: blamed the PR for an empty base set"; false; fi
+  rm -rf "$tmp"
+}
+
+@test "the repository tree derives image names and passes against itself" {
+  "$SCRIPT" "$ROOT" "$ROOT"
+}
+
+@test "the derivation matches the e2e-fork.yaml push allowlist step" {
+  allow="$(yq '.jobs.publish.steps[] | select(.name == "Derive trusted image allowlist (base tree)").run' "$FORK_WF")"
+  [ -n "$allow" ]
+  for frag in \
+    "ls-files 'packages/*/*/Makefile'" \
+    "grep -qE '^image:'" \
+    "OCI_EXPORT_DIR=/oci REGISTRY=r COZYSTACK_VERSION=0 2>/dev/null || true" \
+    "grep -oE '(dest=/oci/|oci-archive:/oci/)[a-z0-9._-]+\.oci\.tar'" \
+    "sed -E 's#.*/##; s#\.oci\.tar\$##' | sort -u"; do
+    grep -qF -- "$frag" "$SCRIPT" || { echo "fragment missing from the script: $frag"; false; }
+    printf '%s\n' "$allow" | grep -qF -- "$frag" || { echo "fragment missing from e2e-fork.yaml: $frag"; false; }
+  done
+}
+
+@test "plan runs the check for fork PRs only" {
+  step="$(yq '.jobs.plan.steps[] | select(.run // "" | test("hack/fork-new-images\.sh"))' "$PR_WF")"
+  [ -n "$step" ]
+  [ "$(printf '%s\n' "$step" | yq '.if')" = '${{ github.event.pull_request.head.repo.fork }}' ]
+}
diff --git a/hack/fork-new-images.sh b/hack/fork-new-images.sh
new file mode 100755
index 0000000000..b762674924
--- /dev/null
+++ b/hack/fork-new-images.sh
@@ -0,0 +1,38 @@
+#!/usr/bin/env bash
+# Usage: hack/fork-new-images.sh BASE_TREE HEAD_TREE
+#
+# Fails, naming them, when HEAD_TREE exports image archives that BASE_TREE does
+# not. e2e-fork.yaml pushes a fork PR's archives only under names the base tree
+# exports, so such a PR would otherwise build everything and then be refused at
+# the push, with nothing the contributor can do about it.
+#
+# image_names mirrors the "Derive trusted image allowlist" step of
+# e2e-fork.yaml. That step cannot call this script, because it runs from the
+# default branch over an untrusted checkout; hack/fork-new-images.bats keeps the
+# two derivations in step.
+set -eu
+
+[ "$#" -eq 2 ] || { echo "usage: $0 BASE_TREE HEAD_TREE" >&2; exit 2; }
+
+image_names() {
+  git -C "$1" ls-files 'packages/*/*/Makefile' | while IFS= read -r mk; do
+    grep -qE '^image:' "$1/$mk" || continue
+    make -n -C "$1/$(dirname "$mk")" image \
+      OCI_EXPORT_DIR=/oci REGISTRY=r COZYSTACK_VERSION=0 2>/dev/null || true
+  done \
+    | grep -oE '(dest=/oci/|oci-archive:/oci/)[a-z0-9._-]+\.oci\.tar' \
+    | sed -E 's#.*/##; s#\.oci\.tar$##' | sort -u
+}
+
+base="$(image_names "$1")"
+head="$(image_names "$2")"
+# An empty base set would report every head image as new and blame the PR for
+# a derivation that broke on its own.
+[ -n "$base" ] || { echo "::error::image name derivation produced no names for the base tree" >&2; exit 1; }
+
+new="$(comm -13 <(printf '%s\n' "$base") <(printf '%s\n' "$head"))"
+[ -z "$new" ] && exit 0
+
+names="$(printf '%s' "$new" | tr '\n' ' ')"
+echo "::error title=New image in a fork PR::This PR adds images the base branch does not build: ${names% }. The fork e2e lane pushes only images whose names the base branch already exports, so it would refuse these after the whole build. A maintainer has to land the new image on the base branch first, or the change has to run from a branch in the upstream repository. See docs/agents/e2e-testing.md, section 10."
+exit 1
diff --git a/hack/fork-pr-checkout_test.bats b/hack/fork-pr-checkout_test.bats
new file mode 100644
index 0000000000..33bc4655e3
--- /dev/null
+++ b/hack/fork-pr-checkout_test.bats
@@ -0,0 +1,38 @@
+#!/usr/bin/env bats
+
+# actions/checkout v4.4.0 and later refuse to check out a fork's pull request
+# ref from a workflow_run workflow unless the step sets
+# allow-unsafe-pr-checkout. e2e-fork.yaml is such a workflow, so a checkout of
+# refs/pull/... there without the opt-in fails the publish job for every fork
+# PR, and the required "E2E Tests" status never turns green.
+
+load test_helper
+
+REPO_ROOT="$(cd "$(dirname "${BATS_TEST_FILENAME:-$0}")/.." && pwd)"
+FORK="$REPO_ROOT/.github/workflows/e2e-fork.yaml"
+
+# Prints one line per actions/checkout step: "<ref> <opt-in>", where <opt-in>
+# is the value of allow-unsafe-pr-checkout or "unset".
+checkout_steps() {
+  awk '
+    function flush() { if (in_step) print ref " " optin; in_step = 0 }
+    /^[[:space:]]*- (name|uses):/ { flush() }
+    /uses: actions\/checkout@/ { in_step = 1; ref = "default"; optin = "unset"; next }
+    in_step && /^[[:space:]]*ref:/ { ref = $2 }
+    in_step && /^[[:space:]]*allow-unsafe-pr-checkout:/ { optin = $2 }
+    END { flush() }
+  ' "$FORK"
+}
+
+@test "e2e-fork checks out at least one pull request ref" {
+  checkout_steps | grep -q '^refs/pull/'
+}
+
+@test "every pull request checkout in e2e-fork opts in to fork code" {
+  bad="$(checkout_steps | grep '^refs/pull/' | grep -v ' true$' || true)"
+  if [ -n "$bad" ]; then
+    echo "checkout of a pull request ref without allow-unsafe-pr-checkout: true:" >&2
+    echo "$bad" >&2
+    exit 1
+  fi
+}
diff --git a/hack/gate-concurrency-contract.bats b/hack/gate-concurrency-contract.bats
new file mode 100644
index 0000000000..5133a4cd86
--- /dev/null
+++ b/hack/gate-concurrency-contract.bats
@@ -0,0 +1,328 @@
+#!/usr/bin/env bats
+
+# Contract for the invariants that decide who owns, publishes and skips the
+# required "E2E Tests" commit status (see docs/agents/e2e-testing.md §10): the
+# concurrency keys, the publishing points, and the docs-only decision the two
+# lanes have to answer identically.
+#
+# The gate is a status, not a job, so a run that dies without posting leaves the
+# head SHA at "Expected" and blocks the merge forever. That makes the pairing
+# below load-bearing: `e2e-fork.yaml`'s `resolve` declines to post for a
+# triggering run that concluded `cancelled`/`skipped`, and the workflow's
+# concurrency key must put exactly those runs in a group of their own so a run
+# that posts nothing cannot cancel the run that does. The two lists live in
+# different languages in different halves of the file and can drift apart in a
+# way no reviewer diff makes obvious — a third discarded conclusion added to the
+# JS guard alone silently restores the wedge. These tests pin executable lines
+# only: a commented-out key must never satisfy the contract.
+#
+# Scope, so the pin is not read as covering more than it does: `resolve` has a
+# THIRD silent path, taken when the triggering run succeeded but its `Plan
+# build` job skipped, and the concurrency key does not represent it. That is
+# deliberate and currently unreachable — every job in pull-requests.yaml either
+# carries the discarded-label guard or reaches `plan` through its `needs`, some
+# of them only via another job's result rather than by reading plan's outputs
+# directly, so a skipped `plan` means a skipped run, which the conclusion check
+# already catches. Transitivity is the load-bearing part of that claim. It
+# stops being unreachable the moment a job is added that runs independently of
+# `plan`, and the extraction below, which matches on `CONCLUSION === '…'`,
+# will not notice. Whoever adds such a job owns that.
+
+load test_helper
+
+REPO_ROOT="$(cd "$(dirname "${BATS_TEST_FILENAME:-$0}")/.." && pwd)"
+FORK="$REPO_ROOT/.github/workflows/e2e-fork.yaml"
+PULL_REQUESTS="$REPO_ROOT/.github/workflows/pull-requests.yaml"
+
+# Drop YAML `#` and JavaScript `//` comment lines, so a commented-out key can
+# never satisfy a pin. grep exits 1 when it selects nothing, legitimate here,
+# and 2 on a real error; the `rc` check turns only the latter into a failure.
+# It does so under the bats binary and not under `hack/cozytest.sh`, whose
+# translator appends `return 0` to every line that is exactly `}`, file-level
+# helpers included, so a helper's last command never decides its status there.
+# Either way the tests fail closed: each one asserts its extraction is
+# non-empty before comparing, so a swallowed grep error surfaces as empty
+# input rather than as a pass.
+# Lines of one job's block, so an assertion can be scoped to the job it is
+# about instead of matching an identical line in a different one.
+job_block() {
+  awk -v job="  $1:" '
+    $0 == job { inside = 1; next }
+    /^  [a-zA-Z0-9_-]+:$/ { inside = 0 }
+    inside' "$2"
+}
+
+code_lines() {
+  local rc=0
+  grep -v '^[[:space:]]*#' | grep -v '^[[:space:]]*//' || rc=$?
+  [ "$rc" -le 1 ]
+}
+
+# Every job name in a workflow, so a per-job assertion covers the jobs that
+# exist rather than the ones whoever wrote the test remembered. Scoped to the
+# `jobs:` mapping: two-space bare keys also occur under `on:`, and one of those
+# would otherwise be treated as a job whose "block" runs to the first real one.
+job_names() {
+  awk '
+    /^jobs:$/ { inside = 1; next }
+    /^[a-zA-Z0-9_-]+:/ { inside = 0 }
+    inside && /^  [a-zA-Z0-9_-]+:$/ { sub(/:[[:space:]]*$/, ""); sub(/^  /, ""); print }
+  ' "$1"
+}
+
+# Conclusions the concurrency key routes into a per-run group.
+group_key_conclusions() {
+  code_lines < "$FORK" \
+    | grep '^  group: e2e-fork-' \
+    | grep -o "workflow_run\.conclusion == '[a-z_]*'" \
+    | sed "s/.*'\\(.*\\)'/\\1/" \
+    | sort -u
+}
+
+# The label names one guard tests for, as a set. `!=` reads the concurrency
+# key, whose exclusions are the labels kept OUT of the `-label` group; `==`
+# reads a job guard, whose matches are the labels that job runs for. Those two
+# sets have to be identical, so they are extracted by one function rather than
+# counted separately: a count is satisfied by the wrong labels and needs raising
+# by hand every time a publishing label is added, which is how it stops being
+# the invariant and becomes a number.
+label_names() {
+  grep -o "github\.event\.label\.name $1 '[a-z0-9-]*'" \
+    | sed "s/.*'\\(.*\\)'/\\1/" \
+    | sort -u
+}
+
+# Conclusions `resolve` treats as "not a verdict" and posts nothing for.
+resolve_silent_conclusions() {
+  code_lines < "$FORK" \
+    | grep '^ *if (CONCLUSION ===' \
+    | grep -o "CONCLUSION === '[a-z_]*'" \
+    | sed "s/.*'\\(.*\\)'/\\1/" \
+    | sort -u
+}
+
+@test "fork gate: a run that posts no status cannot cancel the run that does" {
+  group="$(group_key_conclusions)"
+  silent="$(resolve_silent_conclusions)"
+
+  # Guard the instrument: an empty side would make the comparison vacuous.
+  [ -n "$silent" ]
+  [ -n "$group" ]
+
+  [ "$group" = "$silent" ]
+}
+
+@test "fork gate: the per-run discriminator is the triggering run id" {
+  line="$(code_lines < "$FORK" | grep '^  group: e2e-fork-')"
+  [ -n "$line" ]
+
+  count="$(printf '%s\n' "$line" | grep -o 'github\.event\.workflow_run\.id' | wc -l | tr -d ' ')"
+  [ "${count:-0}" -eq 1 ]
+}
+
+@test "fork gate: real runs still supersede each other on fork repo + branch" {
+  line="$(code_lines < "$FORK" | grep '^  group: e2e-fork-')"
+  [ -n "$line" ]
+
+  count="$(printf '%s\n' "$line" | grep -o 'workflow_run\.head_repository\.full_name' | wc -l | tr -d ' ')"
+  [ "${count:-0}" -eq 1 ]
+
+  count="$(printf '%s\n' "$line" | grep -o 'workflow_run\.head_branch' | wc -l | tr -d ' ')"
+  [ "${count:-0}" -eq 1 ]
+
+  count="$(code_lines < "$FORK" | grep -c '^  cancel-in-progress: true$' || true)"
+  [ "${count:-0}" -eq 1 ]
+}
+
+@test "same-repo gate: only a label run that publishes nothing is moved aside" {
+  line="$(code_lines < "$PULL_REQUESTS" | grep '^  group: pr-')"
+  [ -n "$line" ]
+
+  count="$(printf '%s\n' "$line" | grep -o "github\.event\.action == 'labeled'" | wc -l | tr -d ' ')"
+  [ "${count:-0}" -eq 1 ]
+
+  # The group key must EXCLUDE the publishing labels, not every label: a run
+  # that posts `E2E Tests` has to stay in the main group and supersede the head
+  # run, or both publish the same context and the later narrower green erases
+  # the earlier full-suite failure. The pin is the SET, not its size — the key's
+  # condition is written as the exact complement of `plan`'s guard, so excluding
+  # a label `plan` skips for (or admitting one it runs for) is the drift that
+  # reintroduces the wedge, at any number of labels.
+  excluded="$(printf '%s\n' "$line" | label_names '!=')"
+  admitted="$(job_block plan "$PULL_REQUESTS" | code_lines | label_names '==')"
+  [ -n "$excluded" ]
+  [ -n "$admitted" ]
+  [ "$excluded" = "$admitted" ]
+
+  # One publishing label is same-repo only, so both halves carry a fork term as
+  # well — `release` on a fork PR is always a mislabel, and letting such a run
+  # into the main group makes e2e-fork.yaml post red on a suite that was never
+  # going to run. Complementary again: NOT(… OR (C AND NOT F)) keeps `OR F`.
+  # Dropping the term from one side alone is what re-opens the wedge this whole
+  # test is about, and neither side reads wrong on its own.
+  count="$(printf '%s\n' "$line" | grep -c 'github\.event\.pull_request\.head\.repo\.fork' || true)"
+  [ "${count:-0}" -eq 1 ]
+  # `plan`'s own guard, not its steps': one of those carries the same bare
+  # expression for an unrelated reason (see the opener assertion below).
+  count="$(job_block plan "$PULL_REQUESTS" | code_lines | grep '^    if:' \
+    | grep -c 'github\.event\.pull_request\.head\.repo\.fork' || true)"
+  [ "${count:-0}" -eq 1 ]
+
+  count="$(code_lines < "$PULL_REQUESTS" | grep -c '^  cancel-in-progress: true$' || true)"
+  [ "${count:-0}" -eq 1 ]
+}
+
+@test "both lanes open the status before they conclude it" {
+  # A commit status has no expiry: whatever was last written for (sha, context)
+  # stands until something overwrites it. So a run starting against a head SHA
+  # that already went green must claim the context up front, or the PR stays
+  # mergeable on the previous run's verdict for the whole of this one. Each
+  # lane therefore writes `E2E Tests` from two places — an opener and a
+  # terminal report — and dropping either half is invisible until someone
+  # merges during a re-run.
+  #
+  # Scope: this pins that each lane HAS an opener, not that the opener lands
+  # before the window opens. Only the same-repo one does, being `plan`'s first
+  # step. The fork opener sits in the privileged workflow, which starts only
+  # after the unprivileged build has finished, so on that lane the window is
+  # bounded by the build rather than closed. A grep cannot express the
+  # difference; read this test as "both openers exist" and §10 of
+  # docs/agents/e2e-testing.md for when each of them lands.
+  #
+  # Every assertion is scoped to the job that owns it. Counting writers per
+  # FILE does not work and looked like it did: on the fork lane the context
+  # string occurs in the shared `setStatus` helper and in `report`, so the
+  # opener — which calls that helper rather than naming the context itself —
+  # adds no occurrence, and deleting it left the count at two. A pin has to
+  # name the call it is protecting, not a string that happens to appear twice.
+
+  # Same-repo lane: `plan` opens, `e2e-report` concludes.
+  plan_block="$(job_block plan "$PULL_REQUESTS" | code_lines)"
+  [ -n "$plan_block" ]
+
+  # The opener must be pending, or it publishes a verdict it has not reached.
+  count="$(printf '%s\n' "$plan_block" | grep -c "state: 'pending'" || true)"
+  [ "${count:-0}" -eq 1 ]
+
+  # …and same-repo only: a fork's pull_request token cannot write a status, so
+  # an unguarded call would 403 and fail this job on every fork PR. Matched as
+  # the whole step guard, not on the identifier: the same bare guard sits on
+  # steps in several other jobs, and `plan`'s own `if:` now names the same
+  # expression too, so counting the identifier inside this block would be
+  # satisfied by that one with the step's guard deleted.
+  count="$(printf '%s\n' "$plan_block" \
+    | grep -cF 'if: ${{ !github.event.pull_request.head.repo.fork }}' || true)"
+  [ "${count:-0}" -eq 1 ]
+
+  block="$(job_block e2e-report "$PULL_REQUESTS" | code_lines)"
+  [ -n "$block" ]
+  count="$(printf '%s\n' "$block" | grep -c "context: 'E2E Tests'" || true)"
+  [ "${count:-0}" -eq 1 ]
+
+  # Fork lane: `resolve` opens, `report` concludes. The opener goes through the
+  # helper, so pin the call.
+  block="$(job_block resolve "$FORK" | code_lines)"
+  [ -n "$block" ]
+  count="$(printf '%s\n' "$block" | grep -c "setStatus('pending'" || true)"
+  [ "${count:-0}" -eq 1 ]
+
+  block="$(job_block report "$FORK" | code_lines)"
+  [ -n "$block" ]
+  count="$(printf '%s\n' "$block" | grep -c "context: 'E2E Tests'" || true)"
+  [ "${count:-0}" -eq 1 ]
+}
+
+@test "neither terminal reporter publishes from a cancelled run" {
+  # `always()` includes cancellation; `!cancelled()` does not. A cancelled run
+  # has been superseded, so the run that replaced it owns the head SHA, and a
+  # verdict posted from the dying one lands on a suite that never finished with
+  # nothing obliged to correct it. Both lanes had this wrong at different times,
+  # in the same shape, which is why it is pinned rather than described.
+  block="$(job_block e2e-report "$PULL_REQUESTS" | code_lines)"
+  [ -n "$block" ]
+  count="$(printf '%s\n' "$block" | grep -c '!cancelled()' || true)"
+  [ "${count:-0}" -eq 1 ]
+  count="$(printf '%s\n' "$block" | grep -c 'if: .*always()' || true)"
+  [ "${count:-0}" -eq 0 ]
+
+  # The fork reporter's guard only; `always()` is legitimate on cleanup steps in
+  # other jobs, which is why this is scoped to `report` and anchored on `if:`.
+  block="$(job_block report "$FORK" | code_lines)"
+  [ -n "$block" ]
+  count="$(printf '%s\n' "$block" | grep -c '^    if: .*!cancelled()' || true)"
+  [ "${count:-0}" -eq 1 ]
+  count="$(printf '%s\n' "$block" | grep -c '^    if: .*always()' || true)"
+  [ "${count:-0}" -eq 0 ]
+}
+
+@test "both lanes answer docs-only with both sides of a rename" {
+  # The two lanes decide docs-only from different sources — a git diff in
+  # `plan`, the PR file list in `resolve` — and they must agree. `git diff
+  # --name-only` reports a rename as its new path alone, so a code file moved
+  # into docs/ reads as docs-only there while the fork lane, which sees
+  # `previous_filename`, reads it as code. Disagreement is not a near-miss: the
+  # fork lane then requires an artifact the same-repo lane never built, and the
+  # PR is unfixably red. `plan` therefore reads the rename-blind list.
+  plan_block="$(job_block plan "$PULL_REQUESTS" | code_lines)"
+  [ -n "$plan_block" ]
+
+  count="$(printf '%s\n' "$plan_block" | grep -c "grep -qvE '\^docs/' /tmp/changed_norenames.txt" || true)"
+  [ "${count:-0}" -eq 1 ]
+
+  # The rename-detected list may still feed the build matrix, but never this.
+  count="$(printf '%s\n' "$plan_block" | grep -c "grep -qvE '\^docs/' /tmp/changed.txt" || true)"
+  [ "${count:-0}" -eq 0 ]
+
+  # The fork half of the same agreement: both sides of a rename are inspected.
+  # Pinned on the docs-only expression itself — `previous_filename` also appears
+  # in the TIA file list a few lines down, so counting the identifier would stay
+  # satisfied by that one with this check deleted.
+  block="$(job_block resolve "$FORK" | code_lines)"
+  [ -n "$block" ]
+  count="$(printf '%s\n' "$block" \
+    | grep -c 'f\.previous_filename && !isDocs(f\.previous_filename)' || true)"
+  [ "${count:-0}" -eq 1 ]
+}
+
+@test "same-repo gate: every publishing guard names the same label set" {
+  # `plan`, `verify-release-candidate`, `e2e-report` and the concurrency key
+  # each decide from the label name whether this run owns the status. Renaming
+  # a label in one of them, or teaching one about a label the others do not
+  # know, splits the decision without changing a line that reads load-bearing.
+  # `plan` is the reference: the key's condition is its exact complement, and
+  # the other two are required to run if and only if it does.
+  expected="$(job_block plan "$PULL_REQUESTS" | code_lines | label_names '==')"
+  [ -n "$expected" ]
+
+  # Agreement among the guards that exist is not the same as the guard being
+  # present, and the two jobs fail in opposite directions. Deleting
+  # `e2e-report`'s copy leaves the rest agreeing with each other while a
+  # discarded label event starts publishing again and clobbers the verdict of
+  # the run that actually tested the SHA. Narrowing `verify-release-candidate`'s
+  # instead leaves it SKIPPED under an `e2e-report` that still runs, which reads
+  # the non-success candidate result and posts a red on a release PR nobody
+  # touched. Require the guard per job, not just consistency across the file.
+  for job in plan verify-release-candidate e2e-report; do
+    block="$(job_block "$job" "$PULL_REQUESTS" | code_lines)"
+    [ -n "$block" ]
+    names="$(printf '%s\n' "$block" | label_names '==')"
+    [ -n "$names" ]
+    [ "$names" = "$expected" ]
+  done
+
+  # …and every OTHER job that decides from a label name decides from the same
+  # set. Enumerated from the file rather than listed here, because the list is
+  # what went wrong: `release` was added to `plan`, `e2e-report` and the key,
+  # and `resolve_assets` — which sits on `e2e`'s release arm — was missed. A
+  # named-job loop cannot notice a job nobody thought to name. A job with NO
+  # label guard is not a violation: most of the file legitimately has none, and
+  # requiring one everywhere would pin an unrelated design decision.
+  for job in $(job_names "$PULL_REQUESTS"); do
+    names="$(job_block "$job" "$PULL_REQUESTS" | code_lines | label_names '==')"
+    [ -z "$names" ] || [ "$names" = "$expected" ]
+  done
+
+  # Nothing outside a job block may introduce a name none of them know.
+  all="$(code_lines < "$PULL_REQUESTS" | label_names '==')"
+  [ "$all" = "$expected" ]
+}
diff --git a/hack/go-mod-download.sh b/hack/go-mod-download.sh
new file mode 100755
index 0000000000..672d930353
--- /dev/null
+++ b/hack/go-mod-download.sh
@@ -0,0 +1,29 @@
+#!/bin/sh
+# `go mod download` with a bounded retry. proxy.golang.org now and then resets
+# an HTTP/2 stream mid-download ("stream error ... INTERNAL_ERROR"), and one
+# reset otherwise fails the whole job. A retry is safe: the module cache keeps
+# whatever finished, and a module whose checksum does not match go.sum fails
+# every attempt the same way.
+#
+# Runner jobs call it; Dockerfiles carry the same loop inline, as
+# hack/go-module-fetch-contract.bats explains.
+set -eu
+
+attempts=3
+backoff="${GO_MOD_DOWNLOAD_BACKOFF:-10}"
+case "$backoff" in
+  '' | *[!0-9]*)
+    echo "go mod download: GO_MOD_DOWNLOAD_BACKOFF must be a whole number of seconds, got '$backoff'" >&2
+    exit 2
+    ;;
+esac
+attempt=1
+until go mod download "$@"; do
+  if [ "$attempt" -ge "$attempts" ]; then
+    echo "go mod download: giving up after $attempt attempts" >&2
+    exit 1
+  fi
+  echo "go mod download: attempt $attempt of $attempts failed, retrying in $((attempt * backoff))s" >&2
+  sleep $((attempt * backoff))
+  attempt=$((attempt + 1))
+done
diff --git a/hack/go-module-fetch-contract.bats b/hack/go-module-fetch-contract.bats
new file mode 100644
index 0000000000..0ffafbad79
--- /dev/null
+++ b/hack/go-module-fetch-contract.bats
@@ -0,0 +1,331 @@
+#!/usr/bin/env bats
+# Contract for surviving a transient proxy.golang.org failure (an HTTP/2
+# stream reset, "stream error ... INTERNAL_ERROR"), which otherwise fails an
+# image build or the unit test job outright. Three measures, each pinned here:
+#
+# 1. GOPROXY ends in "|direct", not Go's default ",direct": after a comma Go
+#    falls back to direct only on a 404 or 410, after a pipe on any error. Image
+#    builds get it as a build arg from hack/common-envs.mk, and a build arg
+#    reaches a stage only when that stage declares it, so every Go builder
+#    stage must say `ARG GOPROXY`. Direct fetching needs git, which the alpine
+#    golang images lack, so there the retry below is the only cover. Runner
+#    jobs that run Go get it as env.
+# 2. Every explicit `go mod download` is retried a bounded number of times.
+#    Runner jobs call hack/go-mod-download.sh. Dockerfiles carry the loop
+#    inline, in the one form RETRY_LOOP below pins: their build contexts
+#    differ, so no single script can be copied in, and a named build context
+#    passed through the shared BUILDX_ARGS makes buildx refuse every Dockerfile
+#    pinned to a frontend older than dockerfile:1.4.
+# 3. The unit test job restores the module cache, and the main-branch warmer
+#    writes it under the same key, so a PR's first run starts warm.
+#
+# Written for POSIX sh: hack/cozytest.sh sources this file into /bin/sh.
+#
+# Requires: awk, make, sed.
+
+load test_helper
+
+REPO_ROOT="$(cd "$(dirname "${BATS_TEST_FILENAME:-$0}")/.." && pwd)"
+RETRY="$REPO_ROOT/hack/go-mod-download.sh"
+WORKFLOWS="$REPO_ROOT/.github/workflows"
+GOPROXY_ENV='GOPROXY: "https://proxy.golang.org|direct"'
+RETRY_LOOP='^RUN for attempt in 1 2 3; do ([A-Z_]+=[^ ]+ )*go mod download && break; \[ "\$attempt" = 3 \] && exit 1; sleep \$\(\(attempt \* 10\)\); done$'
+
+# Runner jobs that run Go without a module cache by decision: release jobs,
+# run a handful of times per release, get GOPROXY only.
+NO_CACHE="tags.yaml:build-amd64
+promote-rc.yaml:promote"
+
+dockerfiles() {
+  find "$REPO_ROOT"/packages -path '*/charts' -prune -o \( -name Dockerfile -o -name Containerfile \) -type f -print | sort
+}
+
+# One line per Go builder stage: "<declares ARG GOPROXY 0|1> <FROM line>". A
+# stage is a Go builder when its base is a golang image, an ARG defaulting to
+# one, or an earlier Go builder stage.
+go_stages() {
+  awk '
+    function flush() { if (from != "" && gostage) printf "%d %s\n", declared, from }
+    /^ARG[[:space:]]+[A-Za-z_][A-Za-z0-9_]*=/ && from == "" {
+      kv = $2; eq = index(kv, "="); argdefault[substr(kv, 1, eq - 1)] = substr(kv, eq + 1)
+    }
+    /^FROM[[:space:]]/ {
+      flush(); from = $0; declared = 0; gostage = 0; name = ""; base = ""
+      for (i = 2; i <= NF; i++) {
+        if ($i !~ /^--/ && base == "") base = $i
+        else if (tolower($i) == "as" && i < NF) name = $(i + 1)
+      }
+      ref = base; gsub(/^\$\{?|\}$/, "", ref)
+      if (base ~ /^\$/ && ref in argdefault) base = argdefault[ref]
+      if (base ~ /(^|\/)golang[:@]/ || base in gonames) gostage = 1
+      if (gostage && name != "") gonames[name] = 1
+      next
+    }
+    /^ARG[[:space:]]+GOPROXY([[:space:]]|$)/ { declared = 1 }
+    END { flush() }
+  ' "$1"
+}
+
+# One line per alpine golang stage that runs `go build` or `go install` with
+# neither git nor a prior `go mod download`: the `|direct` fallback needs git,
+# so such a stage has no cover at all when the proxy drops a stream mid-build.
+# `go install pkg@version` resolves outside the stage's module, so a download
+# does not cover it and only git does.
+uncovered_alpine_builds() {
+  sed -e ':a' -e '/\\$/N; s/\\\n//; ta' "$1" | awk '
+    function flush() { if (alpine && !git && ((build && !download) || install)) print from }
+    /^FROM[[:space:]]/ { flush(); from = $0; alpine = ($0 ~ /golang:[^ ]*-alpine/); build = 0; install = 0; git = 0; download = 0; next }
+    /^RUN[[:space:]]/ && /apk add[^&;]*[[:space:]]git([[:space:]]|$)/ { git = 1 }
+    /^RUN[[:space:]]/ && /go mod download/ { download = 1 }
+    /^RUN[[:space:]]/ && /go install[^&;|]*@/ { install = 1 }
+    /^RUN[[:space:]]/ && /go (build|install)/ && !download { build = 1 }
+    END { flush() }
+  '
+}
+
+# RUN instructions with continuation lines joined, one per line.
+run_lines() {
+  sed -e ':a' -e '/\\$/N; s/\\\n//; ta' "$1" | grep '^RUN[[:space:]]' || true
+}
+
+# Lines of one job's block, comment lines dropped so a commented-out step never
+# satisfies a pin.
+job_block() {
+  awk -v job="  $1:" '
+    $0 == job { inside = 1; next }
+    /^  [a-zA-Z0-9_-]+:$/ { inside = 0 }
+    inside' "$2" | grep -v '^[[:space:]]*#' || true
+}
+
+job_names() {
+  awk '/^jobs:$/ { j = 1; next } j && /^[^ ]/ { j = 0 } j && /^  [a-zA-Z0-9_-]+:$/ { sub(/:$/, ""); sub(/^  /, ""); print }' "$1"
+}
+
+# A job runs Go on the runner when it sets Go up, calls the go tool, or runs a
+# root make target that does. A pattern rather than a helper function:
+# hack/cozytest.sh appends `return 0` to every line that is exactly `}`, so a
+# helper's exit status never reaches the caller there.
+GO_JOB_RE='actions/setup-go@|(^|[^A-Za-z0-9_-])go (build|test|run|mod|generate|install)[[:space:]]|(^|[^A-Za-z0-9_-])make[^#]*[[:space:]](unit-tests|test-controllers|assets|assets-cozypkg|openapi-json|generate)([[:space:]]|$)'
+
+@test "every Go builder stage declares ARG GOPROXY" {
+  failed=""
+  checked=0
+  stagelist="$(mktemp)"
+  for f in $(dockerfiles); do
+    go_stages "$f" >"$stagelist"
+    while read -r declared from; do
+      checked=$((checked + 1))
+      [ "$declared" = 1 ] || failed="$failed
+  ${f#"$REPO_ROOT"/}: $from"
+    done <"$stagelist"
+  done
+  rm -f "$stagelist"
+  [ "$checked" -gt 0 ]
+  if [ -n "$failed" ]; then
+    echo "Go builder stages that never receive the GOPROXY build arg:$failed" >&2
+    exit 1
+  fi
+}
+
+@test "a Go stage built FROM an ARG or an earlier Go stage is still a Go stage" {
+  fixture="$(mktemp)"
+  printf '%s\n' 'ARG builder_image=docker.io/library/golang:1.27' 'FROM ${builder_image} AS a' 'ARG GOPROXY' 'FROM a AS b' 'FROM alpine' >"$fixture"
+  out="$(go_stages "$fixture")"
+  rm -f "$fixture"
+  [ "$out" = '1 FROM ${builder_image} AS a
+0 FROM a AS b' ]
+}
+
+@test "image builds pass the pipe GOPROXY through BUILDX_ARGS" {
+  out="$(make --no-print-directory -s -n -C "$REPO_ROOT/packages/system/cozystack-controller" image COZYSTACK_VERSION=0.0.0)"
+  echo "$out" | grep -qF -- "--build-arg 'GOPROXY=https://proxy.golang.org|direct'"
+}
+
+@test "a host GOPROXY does not reach image builds, IMAGE_GOPROXY does" {
+  # A host mirror on localhost or a file:// proxy is unreachable from inside
+  # buildkit, so the host's GOPROXY must not leak into the build.
+  dir="$REPO_ROOT/packages/system/cozystack-controller"
+  out="$(GOPROXY=http://localhost:3000 make --no-print-directory -s -n -C "$dir" image COZYSTACK_VERSION=0.0.0)"
+  echo "$out" | grep -qF -- "--build-arg 'GOPROXY=https://proxy.golang.org|direct'"
+  out="$(IMAGE_GOPROXY=https://mirror.example.com make --no-print-directory -s -n -C "$dir" image COZYSTACK_VERSION=0.0.0)"
+  echo "$out" | grep -qF -- "--build-arg 'GOPROXY=https://mirror.example.com'"
+}
+
+@test "the shared buildx args carry no named build context" {
+  # metallb is one of the images pinned to dockerfile:1.2, which buildx refuses
+  # to build at all once --build-context is on the command line.
+  out="$(make --no-print-directory -s -n -C "$REPO_ROOT/packages/system/metallb" image COZYSTACK_VERSION=0.0.0)"
+  echo "$out" | grep -q 'docker buildx build'
+  if echo "$out" | grep -q -- '--build-context'; then
+    echo "BUILDX_ARGS reaches dockerfile:1.2 images with a named build context" >&2
+    false
+  fi
+}
+
+@test "every go mod download in a Dockerfile runs inside the bounded retry loop" {
+  failed=""
+  checked=0
+  runlist="$(mktemp)"
+  for f in $(dockerfiles); do
+    run_lines "$f" | grep 'go mod download' >"$runlist" || true
+    while IFS= read -r line; do
+      checked=$((checked + 1))
+      printf '%s\n' "$line" | grep -qE -- "$RETRY_LOOP" || failed="$failed
+  ${f#"$REPO_ROOT"/}: $line"
+    done <"$runlist"
+  done
+  rm -f "$runlist"
+  [ "$checked" -gt 0 ]
+  if [ -n "$failed" ]; then
+    echo "go mod download outside the bounded retry loop:$failed" >&2
+    exit 1
+  fi
+}
+
+@test "every alpine golang stage downloads its modules before go build" {
+  failed=""
+  for f in $(dockerfiles); do
+    out="$(uncovered_alpine_builds "$f")"
+    [ -z "$out" ] || failed="$failed
+  ${f#"$REPO_ROOT"/}: $out"
+  done
+  if [ -n "$failed" ]; then
+    echo "alpine stages where a proxy error mid-build has neither fallback nor retry:$failed" >&2
+    exit 1
+  fi
+}
+
+@test "an alpine stage is covered by git or by a download before the build" {
+  fixture="$(mktemp)"
+  printf '%s\n' 'FROM golang:1.27-alpine AS a' 'RUN go build .' \
+    'FROM golang:1.27-alpine AS b' 'RUN apk add --no-cache make git' 'RUN go build .' \
+    'FROM golang:1.27-alpine AS c' 'RUN go mod download' 'RUN go build .' \
+    'FROM golang:1.27 AS d' 'RUN go build .' \
+    'FROM golang:1.27-alpine AS e' 'RUN go mod download' 'RUN go install example.com/tool@v1.0.0' \
+    'FROM golang:1.27-alpine AS f' 'RUN apk add --no-cache git' 'RUN go install example.com/tool@v1.0.0' \
+    'FROM golang:1.27-alpine AS g' 'RUN go install ./cmd/tool' \
+    'FROM golang:1.27-alpine AS h' 'RUN go mod download' 'RUN go install ./cmd/tool' >"$fixture"
+  out="$(uncovered_alpine_builds "$fixture")"
+  rm -f "$fixture"
+  [ "$out" = 'FROM golang:1.27-alpine AS a
+FROM golang:1.27-alpine AS e
+FROM golang:1.27-alpine AS g' ]
+}
+
+@test "the retry loop pattern accepts the loop and rejects a bare or unbounded download" {
+  printf '%s\n' 'RUN for attempt in 1 2 3; do GOOS=$TARGETOS go mod download && break; [ "$attempt" = 3 ] && exit 1; sleep $((attempt * 10)); done' | grep -qE -- "$RETRY_LOOP"
+  for bad in 'RUN go mod download' \
+    'RUN for attempt in 1 2 3; do go mod download && break; sleep $((attempt * 10)); done' \
+    'RUN for attempt in 1 2 3; do go mod download && break; [ "$attempt" = 3 ] && exit 1; sleep $((attempt * 10)); done && go mod download'; do
+    if printf '%s\n' "$bad" | grep -qE -- "$RETRY_LOOP"; then
+      echo "pattern accepts: $bad" >&2
+      false
+    fi
+  done
+}
+
+@test "the retry script succeeds once go mod download does, within its attempts" {
+  work="$(mktemp -d)"
+  printf '%s\n' '#!/bin/sh' 'n=$(cat "$CALLS" 2>/dev/null || echo 0); n=$((n + 1)); echo "$n" >"$CALLS"' '[ "$n" -ge "$SUCCEED_ON" ]' >"$work/go"
+  chmod +x "$work/go"
+  rc=0
+  PATH="$work:$PATH" CALLS="$work/calls" SUCCEED_ON=3 GO_MOD_DOWNLOAD_BACKOFF=0 sh "$RETRY" >/dev/null 2>&1 || rc=$?
+  calls="$(cat "$work/calls")"
+  rm -rf "$work"
+  [ "$rc" -eq 0 ]
+  [ "$calls" -eq 3 ]
+}
+
+@test "the retry script gives up after its attempts and fails" {
+  work="$(mktemp -d)"
+  printf '%s\n' '#!/bin/sh' 'n=$(cat "$CALLS" 2>/dev/null || echo 0); echo $((n + 1)) >"$CALLS"' 'exit 1' >"$work/go"
+  chmod +x "$work/go"
+  rc=0
+  PATH="$work:$PATH" CALLS="$work/calls" GO_MOD_DOWNLOAD_BACKOFF=0 sh "$RETRY" >/dev/null 2>&1 || rc=$?
+  calls="$(cat "$work/calls")"
+  rm -rf "$work"
+  [ "$rc" -ne 0 ]
+  [ "$calls" -eq 3 ]
+}
+
+@test "the retry script refuses a non-numeric backoff instead of looping on it" {
+  work="$(mktemp -d)"
+  printf '%s\n' '#!/bin/sh' 'echo x >>"$CALLS"' 'exit 1' >"$work/go"
+  chmod +x "$work/go"
+  rc=0
+  PATH="$work:$PATH" CALLS="$work/calls" GO_MOD_DOWNLOAD_BACKOFF=soon sh "$RETRY" >/dev/null 2>&1 || rc=$?
+  called=0
+  [ -f "$work/calls" ] && called=1
+  rm -rf "$work"
+  [ "$rc" -ne 0 ]
+  [ "$called" -eq 0 ]
+}
+
+@test "every runner job that runs Go sets the pipe GOPROXY" {
+  failed=""
+  checked=0
+  for wf in "$WORKFLOWS"/*.yaml "$WORKFLOWS"/*.yml; do
+    for job in $(job_names "$wf"); do
+      block="$(job_block "$job" "$wf")"
+      echo "$block" | grep -qE -- "$GO_JOB_RE" || continue
+      checked=$((checked + 1))
+      echo "$block" | grep -qF -- "$GOPROXY_ENV" || failed="$failed $(basename "$wf"):$job"
+    done
+  done
+  [ "$checked" -gt 0 ]
+  if [ -n "$failed" ]; then
+    echo "jobs running Go without GOPROXY=https://proxy.golang.org|direct:$failed" >&2
+    exit 1
+  fi
+}
+
+@test "every runner job that runs Go without setup-go restores the module cache" {
+  failed=""
+  checked=0
+  for wf in "$WORKFLOWS"/*.yaml "$WORKFLOWS"/*.yml; do
+    for job in $(job_names "$wf"); do
+      block="$(job_block "$job" "$wf")"
+      echo "$block" | grep -qE -- "$GO_JOB_RE" || continue
+      echo "$block" | grep -q 'actions/setup-go@' && continue
+      case "
+$NO_CACHE
+" in *"
+$(basename "$wf"):$job
+"*) continue ;; esac
+      checked=$((checked + 1))
+      echo "$block" | grep -q 'uses: actions/cache@' || failed="$failed $(basename "$wf"):$job"
+    done
+  done
+  [ "$checked" -gt 0 ]
+  if [ -n "$failed" ]; then
+    echo "jobs running Go with neither setup-go nor a module cache:$failed" >&2
+    exit 1
+  fi
+}
+
+# The distinct go-mod cache keys one job uses, so a restore and a save that
+# disagree show up as two lines.
+go_mod_key() {
+  job_block "$1" "$WORKFLOWS/$2" | grep -E '^[[:space:]]+key: go-mod-' | sed -e 's/^[[:space:]]*key: //' | sort -u
+}
+
+@test "the unit test job and the main warmer share one module cache key over every go.sum" {
+  checks="$(go_mod_key checks pull-requests.yaml)"
+  warm="$(go_mod_key warm-cache build-main.yaml)"
+  [ -n "$checks" ]
+  [ "$checks" = "go-mod-\${{ runner.os }}-\${{ hashFiles('**/go.sum') }}" ]
+  [ "$warm" = "$checks" ]
+}
+
+@test "the main warmer saves the module cache and both jobs prefetch every module through the retry" {
+  job_block warm-cache "$WORKFLOWS/build-main.yaml" | grep -q 'uses: actions/cache/save@'
+  if job_block warm-cache "$WORKFLOWS/build-main.yaml" | grep -q 'restore-keys:'; then
+    echo "the warmer must not seed a new key from a partial match" >&2
+    false
+  fi
+  for pair in pull-requests.yaml:checks build-main.yaml:warm-cache; do
+    block="$(job_block "${pair#*:}" "$WORKFLOWS/${pair%%:*}")"
+    echo "$block" | grep -qF "git ls-files go.mod '*/go.mod'"
+    echo "$block" | grep -qF 'hack/go-mod-download.sh'
+  done
+}
diff --git a/hack/helm-unit-tests.bats b/hack/helm-unit-tests.bats
new file mode 100644
index 0000000000..107b1e72af
--- /dev/null
+++ b/hack/helm-unit-tests.bats
@@ -0,0 +1,432 @@
+#!/usr/bin/env bats
+# -----------------------------------------------------------------------------
+# Unit tests for hack/helm-unit-tests.sh, which decides per package directory
+# whether to run `make test` and turns the results into one exit code.
+#
+# The script judges a package by that exit code alone, and exit 0 has two very
+# different meanings. helm-unittest is fail-closed on a suite it cannot parse
+# and on a suite declaring `tests: []`, but fail-open on suites that are not
+# there at all: it prints "Test Suites: 0 passed, 0 total" and exits 0. So a
+# chart whose suites were deleted, moved, or renamed past the `tests/*_test.yaml`
+# glob reports success having asserted nothing. The other way in is the
+# discovery gate: `make -C dir -n test` succeeds for a file-backed target too, so
+# a path named `test` beside a package Makefile whose `test:` rule is not phony
+# makes both the gate and the run exit 0 without the recipe firing.
+#
+# Every one of those checks runs INSIDE a directory the sweep already reached,
+# so a package that never enters the loop escapes all of them at once. That is a
+# separate failure, and the tests naming packages/tests are the ones covering it.
+#
+# The fixtures below stub `make` output rather than invoking helm, so the tests
+# stay hermetic and need no plugin installed. What they exercise is the script's
+# own reaction to each shape of output. The sweep resolves its package
+# directories relative to the working directory, so each test runs it from a
+# synthetic tree holding nothing but the packages it is about. That keeps the
+# assertions exact and keeps the real repo's suites, which take minutes, out of
+# a unit test.
+#
+# CI runs this file under Bats through `make bats-unit-tests`. It also remains
+# compatible with the legacy `hack/cozytest.sh` translator, whose awk parser
+# recognizes only @test blocks and a bare `}` at column 0. The tests therefore
+# capture statuses directly and manage their own scratch dirs rather than use
+# `run`, `$status`, setup(), teardown(), or a
+# `trap ... EXIT`: that trap replaces the one the bats binary installs for its
+# own bookkeeping, and a test failing under it can print no TAP line at all.
+#
+# Run with: bats hack/helm-unit-tests.bats
+# -----------------------------------------------------------------------------
+
+load test_helper
+
+# Build a throwaway tree with one package whose `make test` prints $1 and exits
+# $2. Echoes the tree root.
+_tree() {
+    _t=$(mktemp -d)
+    mkdir -p "$_t/packages/apps/sample"
+    printf 'test:\n\t@printf "%%s\\n" "%s"\n\t@exit %s\n' "$1" "$2" \
+        > "$_t/packages/apps/sample/Makefile"
+    printf '%s' "$_t"
+}
+
+# A package at an arbitrary path whose `test` target announces itself, so "the
+# sweep reached this directory" and "the recipe actually ran" stay two separate
+# observations. It also emits the line a real helm-unittest run emits, because
+# the script refuses a package that reports no suite: without that line the
+# fixture would be rejected for a reason unrelated to the claim under test.
+make_package() {
+    mkdir -p "$1"
+    printf 'test:\n\t@echo %s\n\t@printf "%%s\\n" "Test Suites: 1 passed, 1 total"\n' \
+        "$2" > "$1/Makefile"
+}
+
+@test "a chart reporting zero test suites fails instead of passing silently" {
+    repo=$(pwd)
+    t=$(_tree "Test Suites: 0 passed, 0 total" 0)
+
+    rc=0
+    out=$(cd "$t" && sh "$repo/hack/helm-unit-tests.sh" 2>&1) || rc=$?
+
+    if [ "$rc" -eq 0 ]; then
+        echo "helm-unit-tests.sh exited 0 for a chart that ran no suites:" >&2
+        echo "$out" >&2
+        echo "a chart whose suite files vanished would report success" >&2
+        rm -rf "$t"
+        exit 1
+    fi
+
+    # Assert on this check's own wording, so the test cannot stay green on a
+    # refusal that came from somewhere else.
+    case "$out" in
+        *"ran no test suites"*) ;;
+        *)
+            echo "refused, but not by the zero-suite check:" >&2
+            echo "$out" >&2
+            rm -rf "$t"
+            exit 1
+            ;;
+    esac
+
+    rm -rf "$t"
+}
+
+@test "a shadowed test target is refused before it can no-op" {
+    # `make -n test` succeeds against a file-backed target, so the discovery
+    # gate cannot tell a real recipe from one make will skip. The script has to
+    # notice the colliding path itself.
+    repo=$(pwd)
+    t=$(_tree "Test Suites: 1 passed, 1 total" 0)
+    touch "$t/packages/apps/sample/test"
+
+    rc=0
+    out=$(cd "$t" && sh "$repo/hack/helm-unit-tests.sh" 2>&1) || rc=$?
+
+    if [ "$rc" -eq 0 ]; then
+        echo "helm-unit-tests.sh exited 0 with a path named 'test' beside the Makefile:" >&2
+        echo "$out" >&2
+        echo "make would report the target up to date and skip the recipe" >&2
+        rm -rf "$t"
+        exit 1
+    fi
+
+    case "$out" in
+        *"reported up to date"*) ;;
+        *)
+            echo "refused, but not by the shadowed-target check:" >&2
+            echo "$out" >&2
+            rm -rf "$t"
+            exit 1
+            ;;
+    esac
+
+    rm -rf "$t"
+}
+
+@test "a colliding path is tolerated when the target is declared phony" {
+    # The check has to key on what make reports, not on the path existing: a
+    # package declaring `.PHONY: test` runs its recipe regardless of what sits
+    # beside the Makefile, so rejecting it would be a false failure — and would
+    # contradict the remedy the other check names.
+    repo=$(pwd)
+    t=$(mktemp -d)
+    mkdir -p "$t/packages/apps/sample"
+    printf '.PHONY: test\ntest:\n\t@printf "%%s\\n" "Test Suites: 1 passed, 1 total"\n' \
+        > "$t/packages/apps/sample/Makefile"
+    touch "$t/packages/apps/sample/test"
+
+    rc=0
+    out=$(cd "$t" && sh "$repo/hack/helm-unit-tests.sh" 2>&1) || rc=$?
+
+    if [ "$rc" -ne 0 ]; then
+        echo "helm-unit-tests.sh rejected a phony target whose recipe does run:" >&2
+        echo "$out" >&2
+        rm -rf "$t"
+        exit 1
+    fi
+
+    # Tolerating a package means it was reached and not refused. The exit status
+    # alone cannot tell that from never having been reached, because the early
+    # exit above the failure summary also returns 0. Written out here rather
+    # than shared through a helper: cozytest.sh rewrites a function's closing
+    # brace into `return 0`, so an assertion returning a status would pass
+    # unconditionally under that runner.
+    case "$out" in
+        *"All Helm unit tests passed"*) ;;
+        *)
+            echo "the run never reached its summary, so nothing was evaluated:" >&2
+            echo "$out" >&2
+            rm -rf "$t"
+            exit 1
+            ;;
+    esac
+
+    rm -rf "$t"
+}
+
+@test "a sub-make reporting another target up to date is not mistaken for ours" {
+    # The shadowed-target check keys on make's wording, so it has to distinguish
+    # our target from any other whose name merely ends in "test". A package that
+    # delegates to a sub-make can legitimately print such a line while its own
+    # suites run.
+    repo=$(pwd)
+    t=$(mktemp -d)
+    mkdir -p "$t/packages/apps/sample"
+    {
+        printf 'test:\n'
+        printf '\t@printf "%%s\\n" "make[1]: '"'"'unittest'"'"' is up to date."\n'
+        printf '\t@printf "%%s\\n" "Test Suites: 2 passed, 2 total"\n'
+    } > "$t/packages/apps/sample/Makefile"
+
+    rc=0
+    out=$(cd "$t" && sh "$repo/hack/helm-unit-tests.sh" 2>&1) || rc=$?
+
+    if [ "$rc" -ne 0 ]; then
+        echo "helm-unit-tests.sh refused a package over an unrelated target:" >&2
+        echo "$out" >&2
+        rm -rf "$t"
+        exit 1
+    fi
+
+    # As above: prove the package was reached, or a run that evaluated nothing
+    # satisfies this test too.
+    case "$out" in
+        *"All Helm unit tests passed"*) ;;
+        *)
+            echo "the run never reached its summary, so nothing was evaluated:" >&2
+            echo "$out" >&2
+            rm -rf "$t"
+            exit 1
+            ;;
+    esac
+
+    rm -rf "$t"
+}
+
+@test "a chart that runs suites still passes" {
+    # Guards against the two checks above being satisfied by refusing everything.
+    repo=$(pwd)
+    t=$(_tree "Test Suites: 3 passed, 3 total" 0)
+
+    rc=0
+    out=$(cd "$t" && sh "$repo/hack/helm-unit-tests.sh" 2>&1) || rc=$?
+
+    if [ "$rc" -ne 0 ]; then
+        echo "helm-unit-tests.sh rejected a chart that ran three suites:" >&2
+        echo "$out" >&2
+        rm -rf "$t"
+        exit 1
+    fi
+
+    # As above: this is the test that stops the three refusals being satisfied
+    # by rejecting everything, so it has to prove the chart was reached rather
+    # than merely that the run returned 0.
+    case "$out" in
+        *"All Helm unit tests passed"*) ;;
+        *)
+            echo "the run never reached its summary, so nothing was evaluated:" >&2
+            echo "$out" >&2
+            rm -rf "$t"
+            exit 1
+            ;;
+    esac
+
+    rm -rf "$t"
+}
+
+@test "a recipe that runs no suites at all is refused" {
+    # The shape neither marker can catch. A `test:` rule whose recipe never
+    # invokes helm-unittest, or that make finds nothing to do for, prints no
+    # marker of any kind and exits 0, which is why the script asks for the line
+    # a real run emits instead of enumerating the ways of emitting nothing.
+    repo=$(pwd)
+    t=$(mktemp -d)
+    mkdir -p "$t/packages/apps/sample"
+    printf 'test:\n\t@true\n' > "$t/packages/apps/sample/Makefile"
+
+    rc=0
+    out=$(cd "$t" && sh "$repo/hack/helm-unit-tests.sh" 2>&1) || rc=$?
+
+    if [ "$rc" -eq 0 ]; then
+        echo "helm-unit-tests.sh exited 0 for a recipe that ran nothing:" >&2
+        echo "$out" >&2
+        rm -rf "$t"
+        exit 1
+    fi
+
+    case "$out" in
+        *"reported no test suite that ran"*) ;;
+        *)
+            echo "refused, but not by the positive-evidence check:" >&2
+            echo "$out" >&2
+            rm -rf "$t"
+            exit 1
+            ;;
+    esac
+
+    rm -rf "$t"
+}
+
+@test "a package whose tests fail is still reported" {
+    # Pins the exit-status branch specifically, which needs a fixture whose run
+    # both exits non-zero AND prints a passing suite marker. Without the marker
+    # the positive-evidence check refuses the package first, the exit status is
+    # never what decided the outcome, and deleting the branch leaves this green.
+    # Not a hypothetical shape: a `test` target that runs helm-unittest and then
+    # a second step — a render-parity script, a vendored-version guard, go tests
+    # — prints the marker and still fails, and the exit status is the only thing
+    # that catches it.
+    repo=$(pwd)
+    t=$(_tree "Test Suites: 5 passed, 5 total" 1)
+
+    rc=0
+    out=$(cd "$t" && sh "$repo/hack/helm-unit-tests.sh" 2>&1) || rc=$?
+
+    if [ "$rc" -eq 0 ]; then
+        echo "helm-unit-tests.sh exited 0 for a package whose tests failed:" >&2
+        echo "$out" >&2
+        rm -rf "$t"
+        exit 1
+    fi
+
+    # Anchored on the summary's "  - " prefix, not the bare path: the script
+    # announces "Running tests in $dir" before it runs anything, so the bare
+    # path is in the output whatever the summary later does or omits.
+    case "$out" in
+        *"- packages/apps/sample"*) ;;
+        *)
+            echo "the failing package was not named in the summary:" >&2
+            echo "$out" >&2
+            rm -rf "$t"
+            exit 1
+            ;;
+    esac
+
+    rm -rf "$t"
+}
+
+@test "a package with no test target is skipped, not failed" {
+    # The script must stay silent about the many packages that define no `test`
+    # rule at all, or every run turns red on packages that never had suites.
+    #
+    # The tree carries a second package that does run a suite, and that is what
+    # gives this test the ability to fail at all. With only the target-less
+    # package present, `tests_found` stays 0 and the script takes its early exit
+    # above the failure summary, so the run returns 0 whether or not the package
+    # was recorded as failed: green for a reason that has nothing to do with the
+    # claim in the title.
+    repo=$(pwd)
+    t=$(_tree "Test Suites: 1 passed, 1 total" 0)
+    mkdir -p "$t/packages/apps/notests"
+    printf 'build:\n\t@echo nothing\n' > "$t/packages/apps/notests/Makefile"
+
+    rc=0
+    out=$(cd "$t" && sh "$repo/hack/helm-unit-tests.sh" 2>&1) || rc=$?
+
+    if [ "$rc" -ne 0 ]; then
+        echo "helm-unit-tests.sh failed on a package that defines no test target:" >&2
+        echo "$out" >&2
+        rm -rf "$t"
+        exit 1
+    fi
+
+    # Reaching the summary is the part that proves the early exit was not taken.
+    # Asserting only on the exit status would pass on a run that evaluated
+    # nothing at all, which is how this test was vacuous before.
+    case "$out" in
+        *"All Helm unit tests passed"*) ;;
+        *)
+            echo "the run never reached its summary, so nothing was evaluated:" >&2
+            echo "$out" >&2
+            rm -rf "$t"
+            exit 1
+            ;;
+    esac
+
+    rm -rf "$t"
+}
+
+@test "the sweep runs the suites under packages/tests" {
+    # packages/tests holds cozy-lib-tests, the whole test suite for the helper
+    # library that 34 charts consume by symlink. The sweep did not visit the
+    # directory: the suite ran only because packages/library/cozy-lib/Makefile
+    # carries a line delegating its own `test` target to it. Deleting that one
+    # line took the library's coverage to zero with the sweep still green and
+    # still printing "All Helm unit tests passed", because the no-suites
+    # backstop was satisfied by the other package directories.
+    #
+    # Nothing else in the sweep could have caught it. Every check it makes — the
+    # Makefile test, the `make -n test` probe, the per-package suite checks, the
+    # failure collection — runs inside a directory it already visited, so a
+    # package that drops out of the loop takes all of them with it and leaves
+    # only the backstop, which counts suites across the whole run rather than
+    # per package.
+    repo=$(pwd)
+    tmp=$(mktemp -d)
+    make_package "$tmp/packages/tests/cozy-lib-tests" SWEEP_REACHED_TESTS
+
+    rc=0
+    out=$(cd "$tmp" && sh "$repo/hack/helm-unit-tests.sh" 2>&1) || rc=$?
+
+    if [ "$rc" -ne 0 ]; then
+        echo "the sweep refused a package under packages/tests that ran a suite:" >&2
+        echo "$out" >&2
+        rm -rf "$tmp"
+        exit 1
+    fi
+
+    case "$out" in
+        *"Running tests in packages/tests/cozy-lib-tests"*) ;;
+        *)
+            echo "the sweep never visited packages/tests; it printed:" >&2
+            echo "$out" >&2
+            rm -rf "$tmp"
+            exit 1
+            ;;
+    esac
+
+    # Reaching the directory and running the recipe are separate claims, so the
+    # marker is asserted on its own rather than folded into the line above.
+    case "$out" in
+        *SWEEP_REACHED_TESTS*) ;;
+        *)
+            echo "the sweep announced packages/tests but never ran the recipe:" >&2
+            echo "$out" >&2
+            rm -rf "$tmp"
+            exit 1
+            ;;
+    esac
+
+    rm -rf "$tmp"
+}
+
+@test "a suite failing under packages/tests fails the sweep" {
+    # Visiting the directory is worth nothing if a red suite there is swallowed:
+    # the delegation line the sweep is replacing propagated the failure, and the
+    # replacement has to as well.
+    repo=$(pwd)
+    tmp=$(mktemp -d)
+    mkdir -p "$tmp/packages/tests/cozy-lib-tests"
+    printf 'test:\n\t@exit 1\n' > "$tmp/packages/tests/cozy-lib-tests/Makefile"
+
+    rc=0
+    out=$(cd "$tmp" && sh "$repo/hack/helm-unit-tests.sh" 2>&1) || rc=$?
+
+    if [ "$rc" -eq 0 ]; then
+        echo "a failing suite under packages/tests left the sweep green" >&2
+        echo "$out" >&2
+        rm -rf "$tmp"
+        exit 1
+    fi
+
+    # Anchored on the summary's "  - " prefix, for the reason given above.
+    case "$out" in
+        *"- packages/tests/cozy-lib-tests"*) ;;
+        *)
+            echo "the failing package was not named in the summary:" >&2
+            echo "$out" >&2
+            rm -rf "$tmp"
+            exit 1
+            ;;
+    esac
+
+    rm -rf "$tmp"
+}
diff --git a/hack/helm-unit-tests.sh b/hack/helm-unit-tests.sh
index 915f13a862..c902a821d7 100755
--- a/hack/helm-unit-tests.sh
+++ b/hack/helm-unit-tests.sh
@@ -2,12 +2,30 @@
 set -eu
 
 # Script to run unit tests for all Helm charts.
-# It iterates through directories in packages/apps, packages/extra,
-# packages/system, and packages/library and runs the 'test' Makefile
-# target if it exists.
+# It iterates through directories in packages/apps, packages/core,
+# packages/extra, packages/system, packages/library and packages/tests and runs
+# the 'test' Makefile target if it exists. Keep this list in step with the loop
+# below: packages/core carries suites of its own, so dropping it to match a
+# stale comment would silently stop running them.
+#
+# packages/tests is on the list because every check below runs INSIDE a
+# directory the loop already reached — the Makefile test, the `make -n test`
+# probe, the per-package suite checks, the failure collection. A package that
+# never enters the loop takes all of them with it and leaves only tests_found,
+# which counts suites across the whole run rather than per package, so it stays
+# satisfied by the other directories. That is what happened here, silently:
+# packages/tests/cozy-lib-tests ran only via a delegating 'test' target in
+# packages/library/cozy-lib/Makefile, and deleting that line dropped the
+# library's entire coverage while this sweep stayed green and still reported
+# success. The delegation can stay for `make -C packages/library/cozy-lib test`
+# ergonomics; it is no longer the only thing running the suite. The cost of
+# keeping it is that a full sweep executes cozy-lib-tests twice, once through
+# each route — 0.1s to 0.3s over six runs — so the duplicate pair of
+# `Running tests in ...` lines in the log is expected rather than a bug.
 
 FAILED_DIRS_FILE="$(mktemp)"
-trap 'rm -f "$FAILED_DIRS_FILE"' EXIT
+OUTPUT_FILE="$(mktemp)"
+trap 'rm -f "$FAILED_DIRS_FILE" "$OUTPUT_FILE"' EXIT
 
 tests_found=0
 
@@ -22,7 +40,81 @@ check_and_run_test() {
     if make -C "$dir" -n test >/dev/null 2>&1; then
         echo "Running tests in $dir"
         tests_found=$((tests_found + 1))
-        if ! make -C "$dir" test; then
+
+        # LC_ALL=C because all three checks below match English wording, one on
+        # make's and two on helm-unittest's, and a localized make would disarm
+        # the first of them silently, which is the failure mode this whole guard
+        # exists to remove. It reaches every package's recipe, not just make, so
+        # the recipes run under a fixed locale too; that is the determinism-safe
+        # direction and the tree is green under it.
+        #
+        # Capturing to a file rather than streaming is deliberate: the checks
+        # below have to read the whole output, and a pipeline's exit status in
+        # POSIX sh reports the last command rather than make. The cost is that a
+        # package killed mid-run prints nothing, where a stream would have shown
+        # the partial run, and that make's stderr is folded into stdout.
+        rc=0
+        LC_ALL=C make -C "$dir" test > "$OUTPUT_FILE" 2>&1 || rc=$?
+        cat "$OUTPUT_FILE"
+
+        if [ "$rc" -ne 0 ]; then
+            printf '%s\n' "$dir" >> "$FAILED_DIRS_FILE"
+            return 1
+        fi
+
+        # The discovery gate above succeeds against a file-backed target too, so
+        # it cannot tell a real recipe from one make will skip. Match what make
+        # actually reports rather than looking for a colliding path, because a
+        # package that declares the target phony runs its recipe regardless of
+        # what sits next to the Makefile. The quoting around the target name
+        # differs between make 3.x and 4.x, so accept either opening quote;
+        # anchoring on the trailing quote alone would also match a sub-make
+        # reporting some other target whose name ends in "test".
+        if grep -qE "[\`']test' is up to date" "$OUTPUT_FILE"; then
+            echo "ERROR: a 'test' target was reported up to date while testing" >&2
+            echo "       $dir, so its recipe was skipped. The target is shadowed by" >&2
+            echo "       a file or directory of that name, here or in a sub-make" >&2
+            echo "       this package invokes. Remove the path, or declare the" >&2
+            echo "       target phony in the Makefile that defines it." >&2
+            printf '%s\n' "$dir" >> "$FAILED_DIRS_FILE"
+            return 1
+        fi
+
+        # helm-unittest is fail-closed on a suite it cannot parse and on one
+        # declaring `tests: []`, but fail-open on suites that are absent: it
+        # reports zero of them and exits 0. Charts whose suites were deleted,
+        # moved, or renamed past the tests/*_test.yaml glob land here.
+        if grep -qE 'Test Suites:[[:space:]]+0 passed,[[:space:]]+0 total' "$OUTPUT_FILE"; then
+            echo "ERROR: $dir ran no test suites. Its Makefile declares a 'test'" >&2
+            echo "       target, so suite files are expected under tests/ matching" >&2
+            echo "       *_test.yaml; helm-unittest exits 0 when it finds none." >&2
+            printf '%s\n' "$dir" >> "$FAILED_DIRS_FILE"
+            return 1
+        fi
+
+        # Then require positive evidence, because the two checks above match
+        # shapes of running nothing and there is no reason to believe that list
+        # is complete. A recipe that never invokes helm-unittest, and a `test:`
+        # rule make finds nothing to do for, both print no marker at all, so no
+        # further match could catch them. Asking instead for the line a real run
+        # always emits turns the question round: every way of asserting nothing
+        # exits 0, so the run has to say what it asserted. Kept after the two
+        # specific checks, which name a cause and a remedy where they apply,
+        # rather than replacing them.
+        #
+        # The tradeoff is that a `test` target which legitimately runs no
+        # helm-unittest would have to be renamed or given an opt-out. That is
+        # the same bargain the zero-suite check already strikes, and no package
+        # is in that position today.
+        if ! grep -qE 'Test Suites:[[:space:]]+[1-9][0-9]* passed' "$OUTPUT_FILE"; then
+            echo "ERROR: $dir reported no test suite that ran. Its Makefile" >&2
+            echo "       declares a 'test' target, so its recipe is expected to" >&2
+            echo "       run helm-unittest over suites under tests/ matching" >&2
+            echo "       *_test.yaml. A recipe that runs something else, and a" >&2
+            echo "       rule make had nothing to do for, both exit 0 in silence." >&2
+            echo "       If every package fails this way at once, suspect the" >&2
+            echo "       summary wording instead: this matches helm-unittest's" >&2
+            echo "       own, and a plugin upgrade can change it." >&2
             printf '%s\n' "$dir" >> "$FAILED_DIRS_FILE"
             return 1
         fi
@@ -31,7 +123,7 @@ check_and_run_test() {
     return 0
 }
 
-for package_dir in packages/apps packages/core packages/extra packages/system packages/library; do
+for package_dir in packages/apps packages/core packages/extra packages/system packages/library packages/tests; do
     if [ ! -d "$package_dir" ]; then
         echo "Warning: Directory $package_dir does not exist, skipping..." >&2
         continue
diff --git a/hack/helmrelease-readiness.bats b/hack/helmrelease-readiness.bats
new file mode 100644
index 0000000000..8da2926e68
--- /dev/null
+++ b/hack/helmrelease-readiness.bats
@@ -0,0 +1,220 @@
+#!/usr/bin/env bats
+# Unit coverage for the single post-install HelmRelease readiness gate.
+
+load test_helper
+
+helmrelease_snapshot() {
+    count="$1"
+    not_ready="${2:-0}"
+    stalled="${3:-0}"
+    stale="${4:-0}"
+    jq -nc --argjson count "$count" --argjson notReady "$not_ready" --argjson stalled "$stalled" --argjson stale "$stale" '
+      {items: [range(1; $count + 1) as $i |
+        {metadata: {namespace: "ns", name: ("hr-" + ($i | tostring)), generation: 2},
+         status: {observedGeneration: (if $i == $stale then 1 else 2 end), conditions:
+           ([{type: "Ready", status: (if $i == $notReady then "False" else "True" end), reason: "Progressing", message: "working"}]
+            + (if $i == $stalled then [{type: "Stalled", status: "True", message: "terminal failure"}] else [] end))}}
+      ]}
+    '
+}
+
+@test "stale Ready stays closed until the current generation is observed" {
+    . hack/e2e-wait-helmreleases.sh
+    clock=$(mktemp)
+    printf '0\n' > "$clock"
+    date() { sed -n '1p' "$clock"; }
+    sleep() {
+        now=$(sed -n '1p' "$clock")
+        printf '%s\n' "$(( now + $1 ))" > "$clock"
+    }
+    kubectl() {
+        now=$(sed -n '1p' "$clock")
+        if [ "$now" -lt 4 ]; then
+            helmrelease_snapshot 11 0 0 3
+        else
+            helmrelease_snapshot 11
+        fi
+    }
+
+    cozy_wait_all_helmreleases_ready 30 11 4 2 >/dev/null
+    [ "$(sed -n '1p' "$clock")" -ge 8 ] || {
+        echo "the gate accepted Ready=True from an unobserved generation" >&2
+        exit 1
+    }
+}
+
+@test "a late HelmRelease resets stability and is included before success" {
+    . hack/e2e-wait-helmreleases.sh
+    clock=$(mktemp)
+    calls=$(mktemp)
+    printf '0\n' > "$clock"
+    date() { sed -n '1p' "$clock"; }
+    sleep() {
+        now=$(sed -n '1p' "$clock")
+        printf '%s\n' "$(( now + $1 ))" > "$clock"
+    }
+    kubectl() {
+        printf '%s\n' "$*" >> "$calls"
+        now=$(sed -n '1p' "$clock")
+        if [ "$now" -lt 2 ]; then
+            helmrelease_snapshot 11
+        elif [ "$now" -lt 4 ]; then
+            helmrelease_snapshot 12 12
+        else
+            helmrelease_snapshot 12
+        fi
+    }
+
+    cozy_wait_all_helmreleases_ready 30 11 5 2 >/dev/null
+    [ "$(sed -n '1p' "$clock")" -ge 10 ] || {
+        echo "the gate returned before the late release became Ready and stabilized" >&2
+        exit 1
+    }
+    [ "$(grep -c -- '-o json' "$calls")" -ge 6 ]
+}
+
+@test "Stalled HelmRelease fails immediately without sleeping to timeout" {
+    . hack/e2e-wait-helmreleases.sh
+    calls=$(mktemp)
+    date() { printf '100\n'; }
+    sleep() { echo "sleep must not run after Stalled=True" >&2; return 1; }
+    kubectl() {
+        printf '%s\n' "$*" >> "$calls"
+        helmrelease_snapshot 11 3 3
+    }
+
+    if cozy_wait_all_helmreleases_ready 900 11 5 2 >/dev/null 2>&1; then
+        echo "a terminal Stalled HelmRelease passed readiness" >&2
+        exit 1
+    fi
+    [ "$(wc -l < "$calls")" -eq 1 ] || {
+        echo "the Stalled path kept polling instead of failing immediately" >&2
+        exit 1
+    }
+}
+
+@test "a transient list error keeps the gate closed" {
+    . hack/e2e-wait-helmreleases.sh
+    clock=$(mktemp)
+    calls=$(mktemp)
+    printf '0\n' > "$clock"
+    date() { sed -n '1p' "$clock"; }
+    sleep() {
+        now=$(sed -n '1p' "$clock")
+        printf '%s\n' "$(( now + $1 ))" > "$clock"
+    }
+    kubectl() {
+        count=$(wc -l < "$calls")
+        printf '%s\n' "$*" >> "$calls"
+        if [ "$count" -eq 0 ]; then
+            echo 'temporary apiserver error' >&2
+            return 1
+        fi
+        helmrelease_snapshot 11
+    }
+
+    cozy_wait_all_helmreleases_ready 30 11 4 2 >/dev/null 2>&1
+    [ "$(sed -n '1p' "$clock")" -ge 6 ] || {
+        echo "the list error was mistaken for an all-Ready snapshot" >&2
+        exit 1
+    }
+}
+
+@test "a Ready but short release set keeps the gate closed" {
+    # The minimum-count half of the gate is what replaced the `wc -l` existence
+    # backstop removed from hack/e2e-install-cozystack.bats, and it is the only
+    # thing separating "everything is Ready" from "almost nothing got created":
+    # an install that produced three HelmReleases and stopped has every one of
+    # them Ready. Every other case here passes 11 or 12 items against a minimum
+    # of 11, so without this one the condition can be deleted outright and the
+    # suite stays green.
+    . hack/e2e-wait-helmreleases.sh
+    clock=$(mktemp)
+    printf '0\n' > "$clock"
+    date() { sed -n '1p' "$clock"; }
+    sleep() {
+        now=$(sed -n '1p' "$clock")
+        printf '%s\n' "$(( now + $1 ))" > "$clock"
+    }
+    kubectl() { helmrelease_snapshot 3; }
+
+    if cozy_wait_all_helmreleases_ready 30 11 4 2 >/dev/null 2>&1; then
+        echo "the gate opened on 3 Ready HelmReleases against a minimum of 11" >&2
+        exit 1
+    fi
+}
+
+@test "a failed read invalidates a stability window already in progress" {
+    # The list-error branch resets stable_fingerprint and stable_since, and the
+    # "transient list error" case above does not pin that: its read fails on the
+    # first call, when there is no window to invalidate. Reverting the reset left
+    # the suite green. Here the failure lands mid-window, so a gate that kept
+    # counting through it returns at the original start plus quiet_seconds
+    # instead of restarting the clock -- which would accept a set that was never
+    # observed stable across the gap.
+    . hack/e2e-wait-helmreleases.sh
+    clock=$(mktemp)
+    calls=$(mktemp)
+    printf '0\n' > "$clock"
+    date() { sed -n '1p' "$clock"; }
+    sleep() {
+        now=$(sed -n '1p' "$clock")
+        printf '%s\n' "$(( now + $1 ))" > "$clock"
+    }
+    kubectl() {
+        count=$(wc -l < "$calls")
+        printf 'call\n' >> "$calls"
+        # Ready on the first read, unreadable on the second, Ready again after:
+        # the window opens at t=0, is broken at t=2, and may only complete a
+        # full quiet period measured from the read that reopened it.
+        if [ "$count" -eq 1 ]; then
+            echo 'temporary apiserver error' >&2
+            return 1
+        fi
+        helmrelease_snapshot 11
+    }
+
+    cozy_wait_all_helmreleases_ready 60 11 6 2 >/dev/null 2>&1
+    if [ "$(sed -n '1p' "$clock")" -lt 10 ]; then
+        echo "the gate counted the broken read as part of the stability window" >&2
+        exit 1
+    fi
+}
+
+@test "a read slower than the poll interval is charged against the deadline" {
+    # `now` is sampled after the list read, not before it. Sampled before, a read
+    # that costs more than the poll interval is priced at zero and the loop buys
+    # another full iteration past the deadline -- so the ceiling the caller asked
+    # for is not one. Counted in kubectl calls: one snapshot plus the final
+    # diagnostic read is the whole run; a third call means a second poll happened
+    # after the deadline had already passed.
+    . hack/e2e-wait-helmreleases.sh
+    clock=$(mktemp)
+    calls=$(mktemp)
+    printf '0\n' > "$clock"
+    date() { sed -n '1p' "$clock"; }
+    sleep() {
+        now=$(sed -n '1p' "$clock")
+        printf '%s\n' "$(( now + $1 ))" > "$clock"
+    }
+    kubectl() {
+        printf 'call\n' >> "$calls"
+        now=$(sed -n '1p' "$clock")
+        printf '%s\n' "$(( now + 40 ))" > "$clock"
+        helmrelease_snapshot 11 1
+    }
+
+    cozy_wait_all_helmreleases_ready 30 11 4 2 >/dev/null 2>&1 || true
+    if [ "$(wc -l < "$calls")" -ne 2 ]; then
+        echo "expected one snapshot read and one diagnostic read, got $(wc -l < "$calls")" >&2
+        exit 1
+    fi
+}
+
+@test "install suite has one unmasked HelmRelease gate" {
+    [ "$(grep -c 'cozy_wait_all_helmreleases_ready 900 11 5 2' hack/e2e-install-cozystack.bats)" -eq 1 ]
+    if grep -q 'kubectl wait hr --all -A.*|| true' hack/e2e-install-cozystack.bats; then
+        echo "the old masked HelmRelease wait survived" >&2
+        exit 1
+    fi
+}
diff --git a/hack/image-builders-cross-compile.bats b/hack/image-builders-cross-compile.bats
new file mode 100644
index 0000000000..a21027a7a1
--- /dev/null
+++ b/hack/image-builders-cross-compile.bats
@@ -0,0 +1,141 @@
+#!/usr/bin/env bats
+# A builder stage that compiles something for the image must run on the build
+# platform. `FROM --platform=$BUILDPLATFORM` keeps the toolchain native under a
+# multi-platform build; without it the compiler itself runs under QEMU, which
+# is slow and, for Go, unreliable (the migration-controller Dockerfile records
+# a "found bad pointer in Go heap" crash from exactly that). A native builder
+# must then be told which architecture to produce: a `go build` with no GOARCH
+# silently emits a binary for the build host, and nothing fails until a node
+# of the other architecture pulls it.
+#
+# A stage compiles when one of its RUN commands is go build/test/install, make,
+# gradle, dpkg-buildpackage, a node package manager or a script whose file name
+# contains "build" and ends in .sh, at command position (after RUN and its
+# --flag options, `&&`, `;` or `||`, past any VAR=value prefixes). Such a stage
+# must run on the build platform (see stages() below) and use TARGETARCH or
+# TARGETPLATFORM on a RUN or ENV line, unless its output carries no
+# architecture at all (ARCH_NEUTRAL below). A bare
+# `ARG TARGETARCH` does not count: it declares the variable, and a `go build`
+# that never reads it still builds for the host. The check is per stage, not
+# per command: a stage with `RUN echo $TARGETARCH` and a bare `go build` would
+# pass.
+#
+# Requires: awk, sed.
+
+load test_helper
+
+REPO_ROOT="$(cd "$(dirname "${BATS_TEST_FILENAME:-$0}")/.." && pwd)"
+
+# Outputs with no architecture, one entry per line: a whole file, or
+# "<file>:<stage>" when only that stage is neutral and the file's other
+# stages still have to target TARGETARCH. The console, the Harbor portal and
+# shadowbox's webpack stage build static JS; piraeus-server builds Java .debs
+# that linstor-server's debian/control declares `Architecture: all`.
+ARCH_NEUTRAL="packages/apps/vpn/images/shadowbox/Dockerfile:app
+packages/system/dashboard/images/console/Containerfile
+packages/system/harbor/images/harbor-portal/Dockerfile
+packages/system/linstor/images/piraeus-server/Dockerfile"
+
+# is_neutral <file> <stage> <list>: 1 when the list names the file or that stage of it.
+is_neutral() {
+  printf '%s\n' "$3" | awk -v f="$1" -v s="$1:$2" '$0 == f || $0 == s { hit = 1 } END { print hit + 0 }'
+}
+
+# One line per stage: "<compiles 0|1> <targets 0|1> <native 0|1> <name> <FROM line>".
+# A stage is native when its FROM carries --platform=$BUILDPLATFORM, or when it
+# builds FROM an earlier native stage: a stage inherits the platform of the
+# stage it starts from. An unnamed stage is reported as "-".
+# Continuation lines are joined first so a command after `&& \` is seen at
+# command position.
+stages() {
+  sed -e ':a' -e '/\\$/N; s/\\\n//; ta' "$1" | awk '
+    function flush() { if (from != "") printf "%d %d %d %s %s\n", compiles, targets, native, name, from }
+    /^FROM[[:space:]]/ {
+      flush(); from = $0; compiles = 0; targets = 0; native = 0; name = "-"; base = ""
+      for (i = 2; i <= NF; i++) {
+        if ($i ~ /^--platform=(\$BUILDPLATFORM|\$\{BUILDPLATFORM\})$/) native = 1
+        else if ($i !~ /^--/ && base == "") base = $i
+        else if (tolower($i) == "as" && i < NF) name = $(i + 1)
+      }
+      if (base in nativestage) native = 1
+      if (native && name != "-") nativestage[name] = 1
+      next
+    }
+    /^RUN[[:space:]]/ && /(^RUN([[:space:]]+--[^[:space:]]+)*|&&|;|[|][|])[[:space:]]+([A-Za-z_][A-Za-z0-9_]*=[^[:space:]]*[[:space:]]+)*(go[[:space:]]+(build|test|install)|make|gradle|[.]\/gradlew|dpkg-buildpackage|pnpm|npm|yarn|[^[:space:]]*build[^[:space:]\/]*[.]sh)([[:space:]]|$)/ { compiles = 1 }
+    /^(RUN|ENV)[[:space:]]/ && /TARGETARCH|TARGETPLATFORM/ { targets = 1 }
+    END { flush() }
+  '
+}
+
+@test "every compiling builder stage runs on BUILDPLATFORM and targets TARGETARCH" {
+  failed=""
+  checked=0
+  stagelist="$(mktemp)"
+  # Package paths carry no whitespace (the same assumption hack/build-matrix.sh
+  # makes), so word-splitting find's output is safe.
+  for f in $(find "$REPO_ROOT"/packages -path '*/charts' -prune -o \( -name Dockerfile -o -name Containerfile \) -type f -print | sort); do
+    rel="${f#"$REPO_ROOT"/}"
+    stages "$f" >"$stagelist"
+    while read -r compiles targets native name from; do
+      [ "$compiles" = 1 ] || continue
+      checked=$((checked + 1))
+      if [ "$native" = 0 ]; then
+        failed="$failed
+  $rel: $from (not on BUILDPLATFORM)"
+        continue
+      fi
+      if [ "$targets" = 0 ] && [ "$(is_neutral "$rel" "$name" "$ARCH_NEUTRAL")" != 1 ]; then
+        failed="$failed
+  $rel: $from (compiles without TARGETARCH)"
+      fi
+    done <"$stagelist"
+  done
+  rm -f "$stagelist"
+
+  [ "$checked" -gt 0 ] # the find must reach compiling stages at all
+  if [ -n "$failed" ]; then
+    echo "builder stages that would compile under emulation or for the wrong arch:$failed" >&2
+    exit 1
+  fi
+}
+
+@test "a compile after RUN options still counts as a compile" {
+  fixture="$(mktemp)"
+  printf '%s\n' 'FROM golang AS builder' 'RUN --mount=type=cache,target=/root/.cache go build .' >"$fixture"
+  out="$(stages "$fixture")"
+  rm -f "$fixture"
+  [ "$out" = "1 0 0 builder FROM golang AS builder" ]
+}
+
+@test "a build script with a suffix after build still counts as a compile" {
+  fixture="$(mktemp)"
+  printf '%s\n' 'FROM --platform=$BUILDPLATFORM golang AS build' 'RUN ./hack/build-go.sh' >"$fixture"
+  out="$(stages "$fixture")"
+  rm -f "$fixture"
+  [ "$out" = '1 0 1 build FROM --platform=$BUILDPLATFORM golang AS build' ]
+}
+
+@test "a script under a build/ directory is not a build script" {
+  fixture="$(mktemp)"
+  printf '%s\n' 'FROM golang AS x' 'RUN ./build/install.sh' >"$fixture"
+  out="$(stages "$fixture")"
+  rm -f "$fixture"
+  [ "$out" = "0 0 0 x FROM golang AS x" ]
+}
+
+@test "a stage built FROM an earlier BUILDPLATFORM stage runs on the build platform too" {
+  fixture="$(mktemp)"
+  printf '%s\n' 'FROM --platform=$BUILDPLATFORM node AS source' 'RUN true' 'FROM source AS app' 'RUN npm ci' 'FROM node AS emulated' 'RUN npm ci' 'FROM emulated AS child' 'RUN go build .' >"$fixture"
+  out="$(stages "$fixture")"
+  rm -f "$fixture"
+  [ "$(printf '%s\n' "$out" | sed -n 2p)" = "1 0 1 app FROM source AS app" ]
+  [ "$(printf '%s\n' "$out" | sed -n 3p)" = "1 0 0 emulated FROM node AS emulated" ]
+  # A stage built from an emulated stage stays emulated.
+  [ "$(printf '%s\n' "$out" | sed -n 4p)" = "1 0 0 child FROM emulated AS child" ]
+}
+
+@test "an arch-neutral stage entry excuses only that stage" {
+  [ "$(is_neutral packages/x/Dockerfile app 'packages/x/Dockerfile:app')" = 1 ]
+  [ "$(is_neutral packages/x/Dockerfile ss 'packages/x/Dockerfile:app')" = 0 ]
+  [ "$(is_neutral packages/y/Dockerfile any 'packages/y/Dockerfile')" = 1 ]
+}
diff --git a/hack/image-pin-consistency.bats b/hack/image-pin-consistency.bats
new file mode 100644
index 0000000000..ac5be652a1
--- /dev/null
+++ b/hack/image-pin-consistency.bats
@@ -0,0 +1,69 @@
+#!/usr/bin/env bats
+# Asserts that no first-party image repository is pinned at more than one
+# digest across the committed tree.
+#
+# Promotion retags by digest: hack/promote-retag.sh copies every collected
+# <repo>@<digest> to <repo>:<stable-version>. Two different digests under one
+# repository therefore produce two copies competing for the same destination
+# tag. The first wins, the second hits the write-once guard, and the promotion
+# fails — on release day, in a workflow that runs once per release.
+#
+# This is not hypothetical. platform-migrations was once pinned twice, the
+# second copy by a key that had no producer: it froze at v1.4.0-rc.2 while the
+# other advanced to v1.5.0, and v1.6.0, the first release cut through the
+# promote path, would have been the first to hit it. A chart that renders one
+# image under several keys (backupstrategy-controller's backup client) must
+# have them stamped together.
+#
+# Harness compatibility note: CI runs this file under Bats through
+# `make bats-unit-tests`. It also remains compatible with the narrower legacy
+# `hack/cozytest.sh` translator, so it avoids `run`, `$status`, `$output`,
+# `skip`, and setup()/teardown(). Paths stay repo-root-relative for both
+# runners.
+#
+# Run with: bats hack/image-pin-consistency.bats
+
+load test_helper
+
+@test "no image repository is pinned at more than one digest" {
+  tmp=$(mktemp -d)
+
+  # Drive the real promotion selector rather than a reimplementation of it, so
+  # this tracks whatever set promotion actually acts on. `env -u REGISTRY`:
+  # the CI workflow exports REGISTRY=<OCIR build registry> for every job, but
+  # the committed tree vendors its digests under the script's default
+  # ghcr.io/cozystack/cozystack — inheriting the ambient value would filter for
+  # the wrong registry and match nothing.
+  rc=0
+  env -u REGISTRY hack/promote-retag.sh v9.9.9 --dry-run \
+    >"$tmp/out" 2>"$tmp/err" || rc=$?
+  if [ "$rc" -ne 0 ]; then
+    echo "promote-retag.sh exited $rc" >&2
+    cat "$tmp/err" >&2
+    rm -rf "$tmp"
+    return "$rc"
+  fi
+
+  # Every planned copy ends in docker://<repo>:v9.9.9. A repository appearing
+  # twice means two source digests aimed at one destination tag.
+  sed -n 's|.*docker://\(.*\):v9\.9\.9$|\1|p' "$tmp/out" | sort > "$tmp/dests"
+  dupes=$(uniq -d < "$tmp/dests")
+
+  if [ -n "$dupes" ]; then
+    echo "these repositories are pinned at more than one digest, so promotion" >&2
+    echo "would try to retag several digests to the same stable tag and fail:" >&2
+    printf '%s\n' "$dupes" >&2
+    echo >&2
+    echo "Offending pins:" >&2
+    for repo in $dupes; do
+      grep -rn --include='*.yaml' --include='*.tag' --exclude-dir=charts \
+        -- "${repo#ghcr.io/cozystack/cozystack/}" packages/ >&2 || true
+    done
+    echo >&2
+    echo "Give the duplicate key a producer that stamps the same ref, or drop" >&2
+    echo "the duplicate pin." >&2
+    rm -rf "$tmp"
+    return 1
+  fi
+  rm -rf "$tmp"
+}
diff --git a/hack/image-targets-pass-buildx-args.bats b/hack/image-targets-pass-buildx-args.bats
new file mode 100644
index 0000000000..0d5f547a81
--- /dev/null
+++ b/hack/image-targets-pass-buildx-args.bats
@@ -0,0 +1,66 @@
+#!/usr/bin/env bats
+# Every package image target builds through $(BUILDX_ARGS) from
+# hack/common-envs.mk, so PLATFORM, BUILDER, SBOM and BUILDX_EXTRA_ARGS reach
+# each `docker buildx build`. A target that spells its flags out instead builds
+# for the host architecture when PLATFORM is set: on an arm64 workstation that
+# is an arm64 image, which fails on amd64 nodes with "exec format error" while
+# CI, running on amd64, never shows it.
+#
+# The check is a dry run of `make image` with a platform no target hardcodes
+# and a marker passed through BUILDX_EXTRA_ARGS. Every buildx invocation it
+# prints must carry the marker, which only $(BUILDX_ARGS) forwards, and that
+# platform and no other, since a second hardcoded --platform turns the build
+# into a multi-platform one.
+#
+# The packages in AMD64_ONLY pin `override PLATFORM := linux/amd64` because
+# what they build is amd64 by nature; they must yield exactly that platform
+# whatever the command line says.
+#
+# Requires: make.
+
+load test_helper
+
+REPO_ROOT="$(cd "$(dirname "${BATS_TEST_FILENAME:-$0}")/.." && pwd)"
+PROBE_PLATFORM="linux/riscv64"
+PROBE_MARKER="--build-arg=BUILDX_ARGS_PROBE=1"
+AMD64_ONLY="packages/core/testing"
+
+@test "every package image target passes BUILDX_ARGS and PLATFORM to docker buildx" {
+  command -v make >/dev/null || { echo "make is required" >&2; exit 1; }
+
+  failed=""
+  checked=0
+  errlog="$(mktemp)"
+  cmdlist="$(mktemp)"
+  for makefile in "$REPO_ROOT"/packages/*/*/Makefile; do
+    grep -q 'docker buildx build' "$makefile" || continue
+    dir="$(dirname "$makefile")"
+    # COZYSTACK_VERSION is set so common-envs.mk does not shell out to git.
+    commands="$(make --no-print-directory -s -n -C "$dir" image \
+      PLATFORM="$PROBE_PLATFORM" BUILDX_EXTRA_ARGS="$PROBE_MARKER" COZYSTACK_VERSION=0.0.0 2>"$errlog" \
+      | sed -e ':a' -e '/\\$/N; s/\\\n//; ta' | grep 'docker buildx build')" || true
+    if [ -z "$commands" ]; then
+      failed="$failed ${dir#"$REPO_ROOT"/} (no buildx command: $(tr '\n' ' ' <"$errlog"))"
+      continue
+    fi
+    want="$PROBE_PLATFORM"
+    case " $AMD64_ONLY " in *" ${dir#"$REPO_ROOT"/} "*) want="linux/amd64" ;; esac
+    printf '%s\n' "$commands" >"$cmdlist"
+    while IFS= read -r cmd; do
+      checked=$((checked + 1))
+      case "$cmd" in
+        *"$PROBE_MARKER"*) ;;
+        *) failed="$failed ${dir#"$REPO_ROOT"/} (no \$(BUILDX_ARGS))"; continue ;;
+      esac
+      platforms="$(printf '%s\n' "$cmd" | grep -oE -- '--platform[= ][^ ]+' | tr '\n' ' ')"
+      [ "$platforms" = "--platform=$want " ] || failed="$failed ${dir#"$REPO_ROOT"/} ($platforms)"
+    done <"$cmdlist"
+  done
+  rm -f "$errlog" "$cmdlist"
+
+  [ "$checked" -gt 0 ] # the glob must find image targets at all
+  if [ -n "$failed" ]; then
+    echo "image targets not building through BUILDX_ARGS for exactly PLATFORM:$failed" >&2
+    exit 1
+  fi
+}
diff --git a/hack/installer-image-packages-push_test.bats b/hack/installer-image-packages-push_test.bats
new file mode 100644
index 0000000000..7666f38e54
--- /dev/null
+++ b/hack/installer-image-packages-push_test.bats
@@ -0,0 +1,28 @@
+#!/usr/bin/env bats
+# `make image-packages` in packages/core/installer publishes the packages
+# artifact with `flux push artifact` and then stamps the pushed digest into
+# values.yaml as platformSourceRef. The operator hands that ref to Flux, which
+# pulls the artifact by digest from the registry, so a build that pushes nothing
+# must leave the committed ref alone rather than stamp one that resolves nowhere.
+#
+# Run with: bats hack/installer-image-packages-push_test.bats. The bodies avoid
+# run/$status/$output so the legacy hack/cozytest.sh translator can still run
+# them, and a `!`-negated pipeline is suppressed under set -e, so negative checks
+# use the `if grep -q ...; then ...; false; fi` idiom.
+
+load test_helper
+
+REPO_ROOT="$(cd "$(dirname "${BATS_TEST_FILENAME:-$0}")/.." && pwd)"
+
+@test "image-packages pushes nothing and stamps nothing with PUSH=0" {
+  out=$(env -u PUSH -u LOAD make --dry-run -C "$REPO_ROOT/packages/core/installer" image-packages PUSH=0)
+  if echo "$out" | grep -q 'flux push artifact'; then echo "FAIL: PUSH=0 still pushes the packages artifact"; false; fi
+  if echo "$out" | grep -q 'platformSourceRef = '; then echo "FAIL: PUSH=0 still stamps platformSourceRef"; false; fi
+}
+
+@test "image-packages pushes and stamps the digest when PUSH is left at its default" {
+  out=$(env -u PUSH -u LOAD make --dry-run -C "$REPO_ROOT/packages/core/installer" image-packages)
+  echo "$out" | grep -q 'flux push artifact'
+  echo "$out" | grep -q "platformSourceUrl = strenv(REPO)"
+  echo "$out" | grep -q 'platformSourceRef = "digest=" + strenv(DIGEST)'
+}
diff --git a/hack/isp-hosted-lane_test.bats b/hack/isp-hosted-lane_test.bats
new file mode 100644
index 0000000000..35724ba3af
--- /dev/null
+++ b/hack/isp-hosted-lane_test.bats
@@ -0,0 +1,118 @@
+#!/usr/bin/env bats
+
+# The isp-hosted lane (.github/workflows/e2e-isp-hosted.yaml) is the only CI
+# coverage the isp-hosted platform variant and the hosted installer variant
+# have. It runs once a day after merge, so a wiring mistake here goes unseen
+# until a scheduled run: a Package naming another variant, or an install
+# without the hosted installer variant, would leave the lane testing something
+# other than its name says. These checks pin the wiring that makes the run mean
+# "isp-hosted converged on a cluster that provides its own CNI and storage".
+
+load test_helper
+
+REPO_ROOT="$(cd "$(dirname "${BATS_TEST_FILENAME:-$0}")/.." && pwd)"
+WORKFLOW="$REPO_ROOT/.github/workflows/e2e-isp-hosted.yaml"
+PACKAGE="$REPO_ROOT/hack/e2e-isp-hosted-package.yaml"
+KIND_CONFIG="$REPO_ROOT/hack/e2e-isp-hosted-kind.yaml"
+INSTALL="$REPO_ROOT/hack/e2e-install-cozystack-hosted.bats"
+TESTING_MAKEFILE="$REPO_ROOT/packages/core/testing/Makefile"
+
+@test "the lane's platform Package selects the isp-hosted variant" {
+  name="$(yq -r '.metadata.name' "$PACKAGE")"
+  variant="$(yq -r '.spec.variant' "$PACKAGE")"
+  if [ "$name" != "cozystack.cozystack-platform" ] || [ "$variant" != "isp-hosted" ]; then
+    echo "expected cozystack.cozystack-platform with variant isp-hosted, got $name / $variant" >&2
+    exit 1
+  fi
+}
+
+@test "the operator registers isp-hosted with its own values file" {
+  grep -Fq '{"isp-hosted", []string{"values.yaml", "values-isp-hosted.yaml"}}' \
+    "$REPO_ROOT/cmd/cozystack-operator/main.go"
+  [ -f "$REPO_ROOT/packages/core/platform/values-isp-hosted.yaml" ]
+}
+
+@test "the install suite uses the hosted installer variant and the lane's Package" {
+  grep -Eq -- '--set cozystackOperator\.variant=hosted([[:space:]]|$)' "$INSTALL"
+  grep -Fq 'hack/e2e-isp-hosted-package.yaml' "$INSTALL"
+}
+
+@test "the install suite is reachable through the testing Makefile" {
+  grep -Eq "^install-cozystack-hosted:" "$TESTING_MAKEFILE"
+  grep -Fq 'hack/cozytest.sh hack/e2e-install-cozystack-hosted.bats' "$TESTING_MAKEFILE"
+}
+
+# The platform renders service addresses from networking.clusterDomain, and
+# several system packages still carry the domain as a literal, so a kind
+# cluster on its own default (cluster.local) would fail for a reason that has
+# nothing to do with the variant.
+@test "the kind cluster DNS domain matches the platform cluster domain" {
+  want="$(yq -r '.spec.components.platform.values.networking.clusterDomain // ""' "$PACKAGE")"
+  if [ -z "$want" ]; then
+    want="$(yq -r '.networking.clusterDomain' "$REPO_ROOT/packages/core/platform/values.yaml")"
+  fi
+  dns="$(yq -r '.kubeadmConfigPatches[] | from_yaml | select(.kind == "ClusterConfiguration") | .networking.dnsDomain' "$KIND_CONFIG")"
+  kubelet="$(yq -r '.kubeadmConfigPatches[] | from_yaml | select(.kind == "KubeletConfiguration") | .clusterDomain' "$KIND_CONFIG")"
+  if [ "$dns" != "$want" ] || [ "$kubelet" != "$want" ]; then
+    echo "platform clusterDomain=$want, kind dnsDomain=$dns, kubelet clusterDomain=$kubelet" >&2
+    exit 1
+  fi
+}
+
+@test "the workflow creates the cluster from the lane's kind config and runs the hosted install" {
+  grep -Fq 'hack/e2e-isp-hosted-kind.yaml' "$WORKFLOW"
+  grep -Fq 'install-cozystack-hosted' "$WORKFLOW"
+}
+
+@test "the workflow pins the kind binary by checksum and the node image by digest" {
+  grep -Eq '^[[:space:]]+KIND_SHA256: "?[0-9a-f]{64}"?$' "$WORKFLOW"
+  grep -Eq '^[[:space:]]+KIND_NODE_IMAGE: "?kindest/node:v[0-9.]+@sha256:[0-9a-f]{64}"?$' "$WORKFLOW"
+  grep -Fq 'sha256sum --check' "$WORKFLOW"
+}
+
+# Runs the install suite's no-Cilium check against a stubbed kubectl. The copy
+# drops the e2e- prefix so hack/cozytest.sh arms no cluster captures, which
+# would otherwise run the stub as if it were a cluster.
+@test "the suite's no-Cilium check fails on any cilium.io CRD, not only CiliumNetworkPolicy" {
+  tmp="$(mktemp -d)"
+  mkdir -p "$tmp/bin"
+  cp "$INSTALL" "$tmp/hosted.bats"
+  printf '%s\n' \
+    '#!/bin/sh' \
+    '[ "$1 $2" = "get storageclass" ] && exit 1' \
+    '[ "$1 $2" = "get crd" ] || exit 2' \
+    'shift 2' \
+    '[ -n "$FAKE_LIST_FAILS" ] && exit 1' \
+    'case "$*" in' \
+    '  -o\ jsonpath=*) for n in $FAKE_CRDS; do echo "${n#*.}"; done ;;' \
+    '  -*) exit 2 ;;' \
+    '  *) for n in $FAKE_CRDS; do [ "$n" = "$1" ] && exit 0; done; exit 1 ;;' \
+    'esac' > "$tmp/bin/kubectl"
+  chmod +x "$tmp/bin/kubectl"
+
+  rc=0
+  PATH="$tmp/bin:$PATH" FAKE_CRDS="packages.cozystack.io ciliumendpoints.cilium.io" COZY_REPORT_DIR="$tmp/report" COZYTEST_TRACE=0 \
+    "$REPO_ROOT/hack/cozytest.sh" "$tmp/hosted.bats" "The cluster carries none" > "$tmp/partial.log" 2>&1 || rc=$?
+  if [ "$rc" -eq 0 ]; then
+    echo "the check passed with ciliumendpoints.cilium.io installed" >&2
+    exit 1
+  fi
+
+  rc=0
+  PATH="$tmp/bin:$PATH" FAKE_CRDS="" FAKE_LIST_FAILS=1 COZY_REPORT_DIR="$tmp/report" COZYTEST_TRACE=0 \
+    "$REPO_ROOT/hack/cozytest.sh" "$tmp/hosted.bats" "The cluster carries none" > "$tmp/unreadable.log" 2>&1 || rc=$?
+  if [ "$rc" -eq 0 ]; then
+    echo "the check passed although the CRD list could not be read" >&2
+    exit 1
+  fi
+
+  rc=0
+  PATH="$tmp/bin:$PATH" FAKE_CRDS="packages.cozystack.io" COZY_REPORT_DIR="$tmp/report" COZYTEST_TRACE=0 \
+    "$REPO_ROOT/hack/cozytest.sh" "$tmp/hosted.bats" "The cluster carries none" > "$tmp/clean.log" 2>&1 || rc=$?
+  if [ "$rc" -ne 0 ] || ! grep -q "Test OK" "$tmp/clean.log"; then
+    echo "the check did not pass on a cluster with no cilium.io CRD:" >&2
+    cat "$tmp/clean.log" >&2
+    exit 1
+  fi
+  rm -rf "$tmp"
+}
diff --git a/hack/issue-triage-contract.bats b/hack/issue-triage-contract.bats
new file mode 100644
index 0000000000..054b12db9a
--- /dev/null
+++ b/hack/issue-triage-contract.bats
@@ -0,0 +1,433 @@
+#!/usr/bin/env bats
+
+# Contract for the issue triage labeler. Like promote-gate-contract.bats and
+# release-freeze-contract.bats, these tests pin executable/structural workflow
+# lines rather than prose: a guard demoted to a comment must never satisfy the
+# contract. The workflow's own comments name every API and constant asserted
+# below, so the JS block is filtered on `//` as well as `#`.
+#
+# No PR lane can exercise this workflow. It runs on `issues`, on a daily cron
+# and on workflow_dispatch, so the first real execution is a sweep over every
+# open issue in the repository, writing a label to each. The lines pinned here
+# are the ones that bound that blast radius: the skip that keeps pull requests
+# out of it, the skip that keeps an already-triaged issue out of it, the pacing
+# and the per-run cap that keep the sweep inside GitHub's secondary rate limits,
+# the pinned action, and the token scopes. Each is a single deletion away from a
+# repository-wide mess that nothing reports — drop the pull-request skip and
+# every open PR is told it needs triage; drop the pacing and the sweep is
+# throttled and dies half done.
+#
+# The rate-limit tests assert the invariant (stay under GitHub's published
+# ceilings) rather than today's constants, so tuning the pacing within the safe
+# band does not need a test edit, while leaving it does go red.
+#
+# Known ceiling of the approach: these are structural greps, so they prove a
+# guard is present and executable, not that it is reachable. Wrapping the block
+# around a guard in `if (false)` satisfies every pin here, because each matches
+# the guard's own line and nothing above it; editing the pinned line itself does
+# not, so `if (false && issue.pull_request)` goes red. Behavioural coverage of the script
+# would need a JS runtime, and `checks` runs where none is guaranteed, so a
+# harness would go silently green wherever node is missing.
+
+load test_helper
+
+REPO_ROOT="$(cd "$(dirname "${BATS_TEST_FILENAME:-$0}")/.." && pwd)"
+WF="$REPO_ROOT/.github/workflows/issue-triage.yaml"
+STALE="$REPO_ROOT/.github/workflows/stale.yaml"
+LABELS="$REPO_ROOT/.github/labels.yml"
+
+# GitHub's documented secondary rate limits for content-generating requests.
+# https://docs.github.com/en/rest/using-the-rest-api/rate-limits-for-the-rest-api
+WRITES_PER_MINUTE=80
+WRITES_PER_HOUR=500
+
+# Strip YAML comments. POSIX `grep` only: the unit-test runner has no ripgrep.
+# grep exits 1 when nothing is selected (legitimate for an all-comment block)
+# and 2 on a real error. Do not read the `rc` check below as what catches that,
+# here or in script_lines: neither helper is ever the last stage of a pipeline
+# in this file, so ordinary (non-pipefail) pipe semantics discard whatever it
+# returns, and `hack/cozytest.sh`'s translator appends `return 0` to every line
+# that is exactly `}`, both helpers' closing braces included. What catches a
+# real grep error is the OUTPUT, and only for one class of pin: the error
+# empties the stream, so a pin requiring something to be present in it fails on
+# that. A pin demanding an absence stays blind, because an emptied stream
+# produces the same count of zero the pin was written to assert. The
+# `[ -n "$block" ]` guard at the top of a test is not that check either: it
+# runs on the raw awk extraction, upstream of both helpers, and cannot see
+# either of them fail.
+code_lines() {
+  local rc=0
+  grep -v '^[[:space:]]*#' || rc=$?
+  [ "$rc" -le 1 ]
+}
+
+# Strip JavaScript comments. The labeling logic lives in a github-script
+# `script: |` block whose comments discuss the pull_request skip, the cap and
+# the pacing by name, so filtering on `#` alone would let a comment satisfy a
+# pin.
+script_lines() {
+  local rc=0
+  grep -v '^[[:space:]]*//' || rc=$?
+  [ "$rc" -le 1 ]
+}
+
+# Body of one job, up to the next top-level job key.
+job_block() {
+  awk -v job="  $1:" '
+    $0 == job { inside = 1; next }
+    /^  [a-z0-9_-]+:$/ { inside = 0 }
+    inside' "$2"
+}
+
+# Integer on the right of the first `=` on the first matching line. Callers
+# assert the plain-literal form first, because this strips non-digits rather
+# than evaluating: `= 60 * 1000;` would read as 601000 and quietly satisfy a
+# bound it never computed.
+number_after_eq() {
+  awk -F'=' 'NR == 1 { gsub(/[^0-9]/, "", $2); print $2 }'
+}
+
+# The declaration this file can read: one integer literal, no arithmetic.
+literal_const() { # <name> <block>
+  printf '%s\n' "$2" | script_lines | grep -qE "const $1 = [0-9]+;[[:space:]]*$"
+}
+
+# The accepted-signal list, one label per line.
+signal_labels() {
+  script_lines < "$WF" |
+    awk '/const ACCEPTED_SIGNAL_LABELS = \[/ { inside = 1; next } /\];/ { inside = 0 } inside' |
+    sed -n "s/^[[:space:]]*'\([^']*\)'.*/\1/p"
+}
+
+# Minutes past midnight for a 5-field cron, from its first two fields.
+cron_minutes() {
+  sed "s/^[^']*'//; s/'.*$//" | awk 'NR == 1 { print $2 * 60 + $1 }'
+}
+
+@test "the workflow under contract exists" {
+  [ -f "$WF" ]
+}
+
+# ── what the sweep must not touch ────────────────────────────────────────────
+# listForRepo returns pull requests alongside issues, and the sweep re-reads
+# every open issue every day. Both skips below are the difference between a
+# no-op pass and a repository-wide mislabeling that no run reports as an error.
+
+@test "pull requests are skipped by the classifier" {
+  block="$(job_block triage "$WF")"
+  [ -n "$block" ]
+
+  # Losing this tells every open pull request it needs triage, on the first
+  # sweep, with a green job.
+  printf '%s\n' "$block" | script_lines | grep -qF 'if (issue.pull_request) return null'
+}
+
+@test "an issue that already carries a triage label is left alone" {
+  block="$(job_block triage "$WF")"
+  [ -n "$block" ]
+
+  # The sweep is additive and never removes a label, so without this skip a
+  # daily pass re-adds a second, contradictory triage/* label to issues a
+  # maintainer has already classified.
+  printf '%s\n' "$block" | script_lines | grep -qF "labels.some((n) => n.startsWith('triage/'))"
+}
+
+# ── staying inside GitHub's secondary rate limits ────────────────────────────
+# The sweep is the only bulk writer in the tree. The action's client carries no
+# throttling plugin, its retry default is off, and a throttled write answers
+# 403, which is exempt from retry anyway: an unpaced sweep does not slow down
+# when it is throttled, it fails the job partway and leaves the backlog half
+# labeled.
+
+@test "writes are paced under the per-minute ceiling" {
+  block="$(job_block triage "$WF")"
+  [ -n "$block" ]
+
+  # The wait has to be executed, not merely declared.
+  printf '%s\n' "$block" | script_lines | grep -qF 'await sleep(WRITE_INTERVAL_MS)'
+
+  literal_const WRITE_INTERVAL_MS "$block"
+  interval="$(printf '%s\n' "$block" | script_lines | grep -F 'const WRITE_INTERVAL_MS' | number_after_eq)"
+  [ -n "$interval" ]
+  [ "$interval" -gt 0 ]
+
+  # 60000 / interval is the resulting writes-per-minute. Strictly under, for
+  # the same reason the hourly cap below is: the event-driven writes share this
+  # ceiling, so a sweep sized exactly to it leaves them nothing.
+  rate="$(awk -v i="$interval" 'BEGIN { print int(60000 / i) }')"
+  [ "$rate" -lt "$WRITES_PER_MINUTE" ]
+}
+
+@test "a single run cannot exceed the hourly ceiling" {
+  block="$(job_block triage "$WF")"
+  [ -n "$block" ]
+
+  # The cap has to gate the loop, not just exist as a constant.
+  printf '%s\n' "$block" | script_lines | grep -qF 'if (writes >= MAX_WRITES_PER_RUN)'
+
+  literal_const MAX_WRITES_PER_RUN "$block"
+  cap="$(printf '%s\n' "$block" | script_lines | grep -F 'const MAX_WRITES_PER_RUN' | number_after_eq)"
+  [ -n "$cap" ]
+  [ "$cap" -gt 0 ]
+  # Strictly under: a run sized exactly to the ceiling leaves no room for the
+  # event-driven writes that share the same hourly budget.
+  [ "$cap" -lt "$WRITES_PER_HOUR" ]
+}
+
+@test "a hung run cannot hold the queue for the default six hours" {
+  block="$(job_block triage "$WF")"
+  [ -n "$block" ]
+
+  # Every run of this workflow shares one concurrency group, so a call that
+  # hangs blocks each issue filed behind it until the job times out. A capped
+  # run paces roughly seven minutes, so the bound is generous and still far
+  # under the 360-minute default.
+  minutes="$(printf '%s\n' "$block" | code_lines | grep -F 'timeout-minutes:' | awk -F: 'NR == 1 { gsub(/[^0-9]/, "", $2); print $2 }')"
+  [ -n "$minutes" ]
+  [ "$minutes" -gt 0 ]
+  [ "$minutes" -lt 60 ]
+}
+
+@test "the manual entry point defaults to dry-run" {
+  # Bounded by indentation: nothing below the input is a key at this level, so
+  # a stop condition matching the next sibling key would run to end of file and
+  # call the rest of the workflow part of the block.
+  block="$(code_lines < "$WF" | awk '
+    /^      dry_run:$/ { inside = 1; next }
+    inside && !/^        / { exit }
+    inside')"
+  [ -n "$block" ]
+
+  # workflow_dispatch is the only way a human starts a repository-wide write,
+  # and this is the whole of what stands between clicking Run and one. Every
+  # other guard of that class is pinned above; this one is a single word away
+  # from writing to every open issue on the first click, which is exactly the
+  # shape the rest of this file exists to catch.
+  default="$(printf '%s\n' "$block" | awk '/^[[:space:]]*default:/ { print $2; exit }')"
+  [ "$default" = "true" ]
+
+  # The declared default is what the form shows. It is deliberately not what
+  # makes this safe: the derivation keys on the event and treats an absent or
+  # unrecognised input as a dry run, which is why it is pinned separately.
+  # Pinning only the default would leave `const dryRun = false;` green.
+  wf="$(job_block triage "$WF")"
+  printf '%s\n' "$wf" | script_lines | grep -qF "context.eventName !== 'schedule' &&"
+  printf '%s\n' "$wf" | script_lines | grep -qF "String(context.payload.inputs?.dry_run ?? 'true') !== 'false'"
+}
+
+@test "a failed write neither aborts the sweep nor passes unnoticed" {
+  block="$(job_block triage "$WF")"
+  [ -n "$block" ]
+
+  # Without the catch, one issue transferred or deleted mid-sweep costs the run
+  # the rest of the backlog and its summary line with it.
+  printf '%s\n' "$block" | script_lines | grep -qF 'catch (err)'
+
+  # A refusal is the other kind of failure and wants the opposite reaction: 403
+  # is what both a lost `issues: write` and the secondary rate limit answer, 429
+  # is the other throttle shape. The status is what separates them from the
+  # benign 404 of a vanished issue, so the discrimination has to be on status.
+  printf '%s\n' "$block" | script_lines | grep -qE "err\.status === 403.*err\.status === 429|err\.status === 429.*err\.status === 403"
+
+  # And one refusal has to be enough to go red. Counting instead would make the
+  # alarm dead in the regime the sweep lives in once the backlog is drained,
+  # where a whole run writes to only a handful of issues.
+  printf '%s\n' "$block" | script_lines | grep -qF 'if (refused > 0)'
+  printf '%s\n' "$block" | script_lines | grep -qF 'core.setFailed'
+
+  # And the run has to stop at the first refusal rather than carry on. A
+  # refusal applies to every write left, so continuing repeats a rejected
+  # request up to the cap, which is what gets an integration banned and what
+  # burns the repository's hourly budget on a permission regression.
+  # -A10 rather than -A5: the warning between the two is prose and gains a
+  # line whenever it is reworded, which would fail this on a no-op edit.
+  printf '%s\n' "$block" | script_lines | grep -A10 -F 'refused += 1;' | grep -qF 'break;'
+}
+
+@test "the sweep reports what it did in a job summary" {
+  block="$(job_block triage "$WF")"
+  [ -n "$block" ]
+
+  # A sweep over the backlog logs a line per issue, so the summary is the only
+  # place a reader gets the outcome without paging through it. `write()` is
+  # async: unawaited, the promise can go unflushed and the step ends green with
+  # an empty panel, which is indistinguishable from a run that did nothing.
+  printf '%s\n' "$block" | script_lines | grep -qF 'await core.summary'
+  printf '%s\n' "$block" | script_lines | grep -qF '.write();'
+
+  # Every outcome a run can end on has to reach it, at zero as much as at ten:
+  # reporting the writes and dropping the rest is what makes a run that stopped
+  # early read as one that got to the end. The refusal itself is pinned by the
+  # failure test above; what is pinned here is that the table accounts for it,
+  # because otherwise the rows silently fail to sum to the listing.
+  printf '%s\n' "$block" | script_lines | grep -qF '${deferred}'
+  printf '%s\n' "$block" | script_lines | grep -qF '${unexamined}'
+  printf '%s\n' "$block" | script_lines | grep -qF '${refused}'
+}
+
+# ── supply chain and token scope ─────────────────────────────────────────────
+
+@test "every action is pinned to a digest" {
+  # zizmor gates this tree-wide, but this file is the one that fails on the
+  # workflow that has issues: write, so it pins its own.
+  # Asserted as "every `uses:` is a digest" rather than "no tag matches a
+  # tag-shaped pattern", because every such pattern has a gap: `@main` is
+  # neither `@v7` nor `@1.2.3`, and a branch is the most mutable of the three.
+  # Counting digests rather than naming the one action keeps a second, properly
+  # pinned step from going red for no reason. A repo-local `./.github/actions/`
+  # step would need an exemption here; it is not the same class of risk.
+  total="$(code_lines < "$WF" | grep -cE '^[[:space:]]*(-[[:space:]]*)?uses:' || true)"
+  pinned="$(code_lines < "$WF" | grep -cE '^[[:space:]]*(-[[:space:]]*)?uses:.*@[0-9a-f]{40}([[:space:]]|$)' || true)"
+  [ "${total:-0}" -gt 0 ]
+  [ "${total:-0}" -eq "${pinned:-0}" ]
+}
+
+@test "the token is read-only except for one job that writes issues" {
+  # A job-level block replaces the top-level one rather than extending it, so
+  # the two assertions below are the whole permission surface.
+  code_lines < "$WF" | grep -qF 'contents: read'
+
+  # Anchored to the YAML key, not matched as a substring. `code_lines` strips
+  # `#` comments only, and `issues: write` also appears inside the script block
+  # in a `//` comment and in a `core.setFailed` string, so a substring match is
+  # satisfied by prose and stays green when the job's one scope is swapped for
+  # `contents: write`. The count below does not catch that either: the swapped
+  # line is still exactly one `write`.
+  printf '%s\n' "$(job_block triage "$WF")" | code_lines |
+    grep -qE '^[[:space:]]+issues:[[:space:]]*write[[:space:]]*(#.*)?$'
+
+  # Nothing else is writable. This is what keeps a labeling workflow from
+  # quietly acquiring contents: write or pull-requests: write later. The
+  # trailing-comment form is matched too, because a permission gets added
+  # with its justification on the same line, which is exactly the shape an
+  # assertion anchored at `write$` would wave through.
+  count="$(code_lines < "$WF" | grep -cE '^[[:space:]]+[a-z-]+:[[:space:]]*write[[:space:]]*(#.*)?$' || true)"
+  [ "${count:-0}" -eq 1 ]
+}
+
+# ── interaction with the rest of the tree ────────────────────────────────────
+
+@test "runs are serialised and never cancelled" {
+  # A sweep works from a listing taken when it started. Letting a second run
+  # overlap it lets the two read the same issue differently and leave it
+  # holding two contradictory labels; cancelling one mid-sweep leaves the
+  # backlog half labeled with a green-looking cancelled run.
+  block="$(code_lines < "$WF" | awk '/^concurrency:/ { inside = 1; next } /^[a-z]/ { inside = 0 } inside')"
+  [ -n "$block" ]
+  printf '%s\n' "$block" | grep -qF 'cancel-in-progress: false'
+}
+
+@test "no accepted-signal label widens the stale exemption set" {
+  [ -f "$STALE" ]
+
+  # `triage/accepted` is itself on exempt-issue-labels, so awarding it for a
+  # label that is NOT on that list quietly grants a permanent reprieve the
+  # stale policy withheld — which is what treating every `priority/*` tier as
+  # a signal did, `priority/backlog` being the tier stale.yaml leaves reapable.
+  # An assignee is deliberately not covered here: it is not a label, and its
+  # exemption is the one the workflow argues for out loud.
+  exempt="$(awk '
+    /^[[:space:]]*exempt-issue-labels:/ { inside = 1; next }
+    /^[[:space:]]*[a-z-]+:/ { inside = 0 }
+    inside' "$STALE")"
+  [ -n "$exempt" ]
+
+  # One entry per line, so the containment check below can be exact. The value
+  # is a folded scalar: comma-separated entries wrapped across several indented
+  # lines, each line carrying a trailing comma. Matching a signal label as a
+  # substring of that block would pass one that is merely a prefix of an exempt
+  # entry — `priority/important` against `priority/important-soon` — and that
+  # prefix is a label the stale policy never exempted.
+  exempt_labels="$(printf '%s\n' "$exempt" | tr ',' '\n' |
+    sed 's/^[[:space:]]*//; s/[[:space:]]*$//' | grep -v '^$')"
+  [ -n "$exempt_labels" ]
+
+  signals="$(signal_labels)"
+
+  # Non-vacuous: an empty list, or a classifier that stopped reading it, must
+  # not let this pass by having nothing to check. One, not a higher floor —
+  # a floor above the stated purpose fails on a legitimate removal that keeps
+  # the list non-empty, which is a test edit with no contract behind it. This
+  # branch shortened the list once already.
+  count="$(printf '%s\n' "$signals" | grep -c . || true)"
+  [ "${count:-0}" -ge 1 ]
+  printf '%s\n' "$(job_block triage "$WF")" | script_lines | grep -qF 'ACCEPTED_SIGNAL_LABELS.includes(n)'
+
+  for label in $signals; do
+    printf '%s\n' "$exempt_labels" | grep -qxF "$label"
+  done
+}
+
+@test "no lifecycle label sits in the accepted-signal list" {
+  # Membership of stale.yaml's exempt list is necessary for a signal but not
+  # sufficient, and the test above can only check the necessary half. A
+  # `lifecycle/*` label states what the stale bot may do with an issue and
+  # nothing about whether anybody reviewed it, so `lifecycle/frozen` is exempt
+  # and still not a signal: freezing an untriaged issue to keep the bot off it
+  # is exactly the case where reading it as accepted is false.
+  #
+  # `priority/backlog` is excluded for a different reason and needs no assertion
+  # of its own, because it is not on the exempt list and the test above already
+  # rejects it. That is a coincidence of the stale policy rather than a decision
+  # taken here, and it stops covering the tier the moment somebody exempts it.
+  signals="$(signal_labels)"
+
+  # Guards the assertion below against passing on an empty list, which is what
+  # a broken extraction and a compliant workflow would otherwise look like.
+  [ -n "$signals" ]
+
+  # Capture grep's status instead of writing `! grep -q ...`, which cannot fail
+  # a test here. Two mechanisms, and the second is the one that carries this
+  # case: `set -e` ignores a pipeline led by `!`, so such an assertion mid-body
+  # never aborts, and `hack/cozytest.sh`'s translator appends `return 0` to
+  # every line that is exactly `}`, so one written as the body's last statement
+  # does not decide the status either. Under real bats the trailing form does
+  # go red, which is the only position where the two runners differ at all: a
+  # negated assertion with anything after it is green under both. So the rule
+  # is not "bats is the honest runner", it is that no position is safe. Every
+  # negative assertion in this file takes this shape, and a mutation ladder
+  # proving otherwise has to run the runner CI uses.
+  rc=0
+  printf '%s\n' "$signals" | grep -q '^lifecycle/' || rc=$?
+  [ "$rc" -ne 0 ]
+}
+
+@test "the sweep runs after the stale bot, not before it" {
+  [ -f "$STALE" ]
+
+  # Labeling bumps updated_at, which the stale bot reads as activity. Running
+  # first would hand every issue it is about to label a fresh clock in the same
+  # morning, so the sweep goes second and lets that day's stale pass complete
+  # on the state it was scheduled against.
+  # `-e`, because the pattern opens with a dash and grep would read it as one.
+  sweep="$(code_lines < "$WF" | grep -F -e '- cron:' | cron_minutes)"
+  stale="$(code_lines < "$STALE" | grep -F -e '- cron:' | cron_minutes)"
+  [ -n "$sweep" ] && [ -n "$stale" ]
+  [ "$sweep" -gt "$stale" ]
+}
+
+@test "both labels the workflow applies are declared in the repository" {
+  [ -f "$LABELS" ]
+
+  # addLabels creates a label that does not exist, with a default colour and no
+  # description, so a typo here is invisible until someone notices two triage
+  # labels with almost the same name.
+  #
+  # Whole-line match, for the same reason the exempt-list check above splits its
+  # block one entry per line: a substring match accepts a truncation, and a
+  # truncation is exactly what a typo looks like. `name: triage/needs-triag`
+  # occurs inside `- name: triage/needs-triage`, so `grep -F` alone reports the
+  # misspelled label as declared and the sweep then creates it on first write.
+  # `-e`, because the whole-line pattern opens with the list dash and grep would
+  # otherwise read it as an option, the same reason the cron check above needs it.
+  #
+  # The trailing comment is stripped before the match rather than allowed by the
+  # pattern, so the check stays a fixed-string one: the label is interpolated,
+  # and a regex would give whatever it contains meaning it does not have. A
+  # declaration carrying its justification inline is the shape the permission
+  # count above already tolerates, and there is no contract against it here.
+  for label in $(script_lines < "$WF" | grep -E "const (NEEDS_TRIAGE|ACCEPTED) = " | sed "s/^[^']*'//; s/'.*$//"); do
+    code_lines < "$LABELS" | sed 's/[[:space:]]*#.*$//; s/[[:space:]]*$//' |
+      grep -qxF -e "- name: $label"
+  done
+}
diff --git a/hack/kafka-backup-script.bats b/hack/kafka-backup-script.bats
new file mode 100644
index 0000000000..dff94c2a96
--- /dev/null
+++ b/hack/kafka-backup-script.bats
@@ -0,0 +1,420 @@
+#!/usr/bin/env bats
+# Behavioural unit test for the Kafka topic-metadata strategy driver script
+# (packages/system/backupstrategy-controller/files/kafka-backup.sh), the shell
+# embedded verbatim into strategy-kafka-default.yaml.
+#
+# The chart's helm-unittest suite can only assert the rendered Strategy CR's
+# shape (kind, name, artifactURITemplate); the driver script that does the
+# actual backup/restore/cleanup work is otherwise unpinned, so a regression in
+# it (a stripped \Q, a reinstated -k, a fail-open --list) passes the chart suite
+# untouched. This test closes that gap the way the contract is really defined:
+# it EXECUTES the script against stubbed kafka-topics.sh / kafka-configs.sh (BIN
+# override) and a stubbed curl (on PATH), and asserts what the script does. It
+# is not a template grep — a comment cannot satisfy it.
+#
+# Runner note: the repo's bats runner is hack/cozytest.sh, which knows only
+# @test + bash — no setup()/teardown() and no run/$status/$output. So each test
+# calls init_stubs itself, and assertions use plain command exit codes and
+# $(...) capture (set -e makes a failed command fail the test).
+#
+# Each named guard below corresponds to a mutation the script must not survive:
+# \Q literal-match on describe and alter, the --connect-to port workaround with
+# no -k (keyed off the request host in both addressing modes), the fail-closed
+# --list, the comma-value bracket grouping, the replication-factor divergence
+# guard, and the cleanup delete's HTTP handling.
+
+load test_helper
+
+SCRIPT="$(cd "$(dirname "${BATS_TEST_FILENAME:-$0}")/.." && pwd)/packages/system/backupstrategy-controller/files/kafka-backup.sh"
+
+# init_stubs builds a fresh workspace with stub kafka CLIs (the script's $BIN)
+# and a stub curl (first on PATH), and exports the common env. It sets STATE,
+# BINDIR, PATHDIR in the caller's shell — each @test runs in its own subshell,
+# so calling it first gives that test an isolated sandbox.
+init_stubs() {
+  STATE="$(mktemp -d)"
+  BINDIR="$STATE/bin"
+  PATHDIR="$STATE/path"
+  mkdir -p "$BINDIR" "$PATHDIR"
+  # Per-test metadata scratch file so a run cannot read back records a prior
+  # test left in the script's default /tmp/kafka-metadata.txt.
+  export METADATA_FILE="$STATE/metadata.txt"
+
+  cat > "$BINDIR/kafka-topics.sh" <<STUB
+#!/usr/bin/env bash
+set -eu
+mode=""; topic=""; parts=""; excl=""
+while [ \$# -gt 0 ]; do
+  case "\$1" in
+    --list) mode=list ;;
+    --describe) mode=describe ;;
+    --create) mode=create ;;
+    --alter) mode=alter ;;
+    --exclude-internal) excl=1 ;;
+    --topic) topic="\$2"; shift ;;
+    --partitions) parts="\$2"; shift ;;
+  esac
+  shift
+done
+if [ "\$mode" = list ]; then
+  [ -n "\${LIST_FAIL:-}" ] && exit 3
+  if [ -n "\$excl" ]; then
+    grep -v '^__' "$STATE/topics" 2>/dev/null || true
+  else
+    cat "$STATE/topics" 2>/dev/null || true
+  fi
+  exit 0
+fi
+if [ "\$mode" = describe ]; then
+  echo "\$topic" >> "$STATE/describe_args"
+  name="\${topic#'\\Q'}"; name="\${name%'\\E'}"
+  if [ "\$name" = "\$topic" ]; then
+    # No \\Q...\\E wrapping: --topic is a Java regex, so emit every stored topic
+    # whose name matches it as an ERE (the collision a stripped \\Q reintroduces).
+    hit=0
+    for f in "$STATE"/desc.*; do
+      [ -e "\$f" ] || continue
+      n="\${f##*/desc.}"
+      if printf '%s\n' "\$n" | grep -qE "^\${name}\$"; then cat "\$f"; hit=1; fi
+    done
+    [ "\$hit" = 1 ] || exit 1
+    exit 0
+  fi
+  [ -f "$STATE/desc.\$name" ] || exit 1
+  cat "$STATE/desc.\$name"
+  exit 0
+fi
+if [ "\$mode" = create ]; then echo "create \$topic \$parts" >> "$STATE/actions"; exit 0; fi
+if [ "\$mode" = alter ]; then echo "alter \$topic \$parts" >> "$STATE/actions"; exit 0; fi
+exit 0
+STUB
+
+  cat > "$BINDIR/kafka-configs.sh" <<STUB
+#!/usr/bin/env bash
+set -eu
+mode=""; name=""; add=""
+while [ \$# -gt 0 ]; do
+  case "\$1" in
+    --describe) mode=describe ;;
+    --alter) mode=alter ;;
+    --entity-name) name="\$2"; shift ;;
+    --add-config) add="\$2"; shift ;;
+  esac
+  shift
+done
+if [ "\$mode" = describe ]; then
+  [ -n "\${CFG_FAIL:-}" ] && exit 3
+  cat "$STATE/cfg.\$name" 2>/dev/null || true; exit 0
+fi
+if [ "\$mode" = alter ]; then echo "\$name \$add" >> "$STATE/configs_applied"; exit 0; fi
+exit 0
+STUB
+
+  # curl stub: records argv, simulates a tiny S3 (PUT stores the body, GET serves
+  # it back), and prints an HTTP code for the -w cleanup DELETE.
+  cat > "$PATHDIR/curl" <<STUB
+#!/usr/bin/env bash
+set -eu
+printf '%s\n' "\$*" >> "$STATE/curl_args"
+up=""; out=""; wfmt=""; prev=""; hasf=""
+for a in "\$@"; do
+  case "\$prev" in --upload-file) up="\$a" ;; -o) out="\$a" ;; -w) wfmt="\$a" ;; esac
+  case "\$a" in -fsS|-f) hasf=1 ;; esac
+  prev="\$a"
+done
+if [ -n "\$wfmt" ]; then echo "\${DELETE_CODE:-204}"; exit 0; fi
+if [ -n "\$up" ]; then
+  # PUT_FAIL simulates a 403 on upload: with -f curl errors (exit 22) and stores
+  # nothing; without -f it would exit 0 and a bad backup would report success.
+  if [ -n "\${PUT_FAIL:-}" ]; then
+    [ -n "\$hasf" ] && exit 22
+    exit 0
+  fi
+  cp "\$up" "$STATE/s3_object"; exit 0
+fi
+if [ -n "\$out" ]; then
+  [ -f "$STATE/s3_object" ] || exit 22
+  cp "$STATE/s3_object" "\$out"; exit 0
+fi
+exit 0
+STUB
+  chmod +x "$BINDIR"/*.sh "$PATHDIR/curl"
+
+  export BIN="$BINDIR"
+  export PATH="$PATHDIR:$PATH"
+  export BOOTSTRAP="kafka-x-kafka-bootstrap.tenant-root.svc:9092"
+  export S3_REGION="us-east-1"
+  export S3_FORCE_PATH_STYLE="true"
+  export AWS_ACCESS_KEY_ID="k"
+  export AWS_SECRET_ACCESS_KEY="s"
+  export ARTIFACT_URI="s3://bkt/ns/app/run/kafka-metadata.txt"
+}
+
+seed_three() {
+  printf 'orders\naudit.events\naudit-events\n' > "$STATE/topics"
+  printf 'Topic: orders\tPartitionCount: 3\tReplicationFactor: 1\n' > "$STATE/desc.orders"
+  printf 'Topic: audit.events\tPartitionCount: 2\tReplicationFactor: 1\n' > "$STATE/desc.audit.events"
+  printf 'Topic: audit-events\tPartitionCount: 5\tReplicationFactor: 1\n' > "$STATE/desc.audit-events"
+  printf '  retention.ms=1234567890000 sensitive=false\n' > "$STATE/cfg.orders"
+}
+
+# expect_fail <env-prefixed command...>: succeeds when the command exits non-zero.
+expect_fail() {
+  if "$@" >/dev/null 2>&1; then
+    echo "expected a non-zero exit, got success" >&2; return 1
+  fi
+  return 0
+}
+
+# ---- backup ---------------------------------------------------------------
+
+@test "backup records each colliding topic's own partition count (literal Q match)" {
+  init_stubs; seed_three
+  MODE=backup S3_ENDPOINT="https://s3.example.org" bash "$SCRIPT"
+  # The uploaded object must carry each topic's true partition count. A stripped
+  # \Q makes the describe of audit.events match audit-events too, taking the
+  # wrong first line — this assertion goes red then.
+  grep -qxF "$(printf 'T\torders\t3\t1')" "$STATE/s3_object"
+  grep -qxF "$(printf 'T\taudit.events\t2\t1')" "$STATE/s3_object"
+  grep -qxF "$(printf 'T\taudit-events\t5\t1')" "$STATE/s3_object"
+  # And the describe was invoked with the literal \Q...\E wrapper.
+  grep -qxF '\Qaudit.events\E' "$STATE/describe_args"
+}
+
+@test "backup fails closed when --list errors (no empty backup as success)" {
+  init_stubs; seed_three
+  expect_fail env MODE=backup LIST_FAIL=1 S3_ENDPOINT="https://s3.example.org" bash "$SCRIPT"
+  [ ! -f "$STATE/s3_object" ]
+}
+
+@test "backup stores a comma-valued config in its own tab field" {
+  init_stubs
+  printf 'orders\n' > "$STATE/topics"
+  printf 'Topic: orders\tPartitionCount: 1\tReplicationFactor: 1\n' > "$STATE/desc.orders"
+  printf '  cleanup.policy=compact,delete sensitive=false\n' > "$STATE/cfg.orders"
+  MODE=backup S3_ENDPOINT="https://s3.example.org" bash "$SCRIPT"
+  grep -qxF "$(printf 'C\torders\tcleanup.policy\tcompact,delete')" "$STATE/s3_object"
+}
+
+# ---- S3 signing (curl 7.76.1 port workaround, no -k) -----------------------
+
+@test "ported endpoint signs with --connect-to and never -k" {
+  init_stubs; seed_three
+  MODE=backup S3_ENDPOINT="https://s3.example.org:8333" bash "$SCRIPT"
+  grep -qF -- '--connect-to s3.example.org:443:s3.example.org:8333' "$STATE/curl_args"
+  # Positive form, not `! grep`: hack/cozytest.sh wraps each @test in `set -e`
+  # + a trailing `return 0`, and bash exempts a `!`-negated command from errexit,
+  # so a `! grep` guard can never fail under the runner CI uses (only real bats).
+  if grep -qE -- '(^| )-k( |$)' "$STATE/curl_args"; then
+    echo "regression: -k (insecure TLS) in curl argv: $(cat "$STATE/curl_args")" >&2; return 1
+  fi
+}
+
+@test "default-port endpoint needs no --connect-to" {
+  init_stubs; seed_three
+  MODE=backup S3_ENDPOINT="https://s3.example.org" bash "$SCRIPT"
+  # Positive form (see the -k note above): a `! grep` is vacuous under cozytest.
+  if grep -qF -- '--connect-to' "$STATE/curl_args"; then
+    echo "unexpected --connect-to on a default-port endpoint: $(cat "$STATE/curl_args")" >&2; return 1
+  fi
+}
+
+@test "virtual-hosted ported endpoint keys --connect-to off the bucket host" {
+  init_stubs; seed_three
+  MODE=backup S3_FORCE_PATH_STYLE=false S3_ENDPOINT="https://s3.example.org:8333" bash "$SCRIPT"
+  # HOST1 must be the request host (bkt.s3.example.org), else curl never
+  # redirects and the request hits the wrong port.
+  grep -qF -- '--connect-to bkt.s3.example.org:443:s3.example.org:8333' "$STATE/curl_args"
+  grep -qF 'https://bkt.s3.example.org/ns/app/run/kafka-metadata.txt' "$STATE/curl_args"
+}
+
+# ---- restore --------------------------------------------------------------
+
+write_backup_object() {
+  printf 'T\torders\t3\t1\nC\torders\tcleanup.policy\tcompact,delete\n' > "$STATE/s3_object"
+}
+
+@test "restore of an absent topic creates it and brackets a comma-valued config" {
+  init_stubs; write_backup_object
+  : > "$STATE/topics"   # nothing live -> create path
+  MODE=restore S3_ENDPOINT="https://s3.example.org" bash "$SCRIPT"
+  grep -qxF "create orders 3" "$STATE/actions"
+  # comma value must be bracket-grouped so kafka-configs does not split it.
+  grep -qxF "orders cleanup.policy=[compact,delete]" "$STATE/configs_applied"
+}
+
+@test "restore fails loudly on a replication-factor mismatch" {
+  init_stubs
+  printf 'T\torders\t3\t2\n' > "$STATE/s3_object"   # backup wants RF 2
+  printf 'orders\n' > "$STATE/topics"               # live exists
+  printf 'Topic: orders\tPartitionCount: 3\tReplicationFactor: 1\n' > "$STATE/desc.orders"
+  out=""
+  if out=$(MODE=restore S3_ENDPOINT="https://s3.example.org" bash "$SCRIPT" 2>&1); then
+    echo "restore unexpectedly succeeded: $out" >&2; return 1
+  fi
+  printf '%s\n' "$out" | grep -q "replication factor differs"
+}
+
+@test "restore aborts when the broker is unreachable (fail-closed --list)" {
+  init_stubs; write_backup_object
+  expect_fail env MODE=restore LIST_FAIL=1 S3_ENDPOINT="https://s3.example.org" bash "$SCRIPT"
+  # Must not have routed the unreachable broker into --create.
+  [ ! -f "$STATE/actions" ]
+}
+
+@test "restore of an existing under-partitioned topic alters it with the literal-Q wrapper" {
+  init_stubs
+  printf 'T\tpay.events\t7\t1\n' > "$STATE/s3_object"   # backup wants 7 partitions
+  printf 'pay.events\npay-events\n' > "$STATE/topics"    # both live -> the collision
+  printf 'Topic: pay.events\tPartitionCount: 2\tReplicationFactor: 1\n' > "$STATE/desc.pay.events"
+  # The colliding sibling is given a distinct, larger partition count so the two
+  # describe/alter \Q guards are pinned independently: a stripped \Q on the
+  # restore --describe (line 166) matches this sibling first (glob-order
+  # `desc.pay-events` precedes `desc.pay.events`), reads 9 > the backup's 7, and
+  # aborts with "cannot decrease partitions" — no alter is recorded, so the
+  # assertion below reddens.
+  printf 'Topic: pay-events\tPartitionCount: 9\tReplicationFactor: 1\n' > "$STATE/desc.pay-events"
+  MODE=restore S3_ENDPOINT="https://s3.example.org" bash "$SCRIPT"
+  # The alter must target the literal topic (\Q...\E). A stripped wrapper on the
+  # --describe misroutes to the sibling (above); a stripped wrapper on the --alter
+  # sends a regex that re-partitions the colliding sibling permanently — the
+  # destructive bug this guards. Dropping \Q on either call reddens here.
+  grep -qxF 'alter \Qpay.events\E 7' "$STATE/actions"
+}
+
+@test "restore refuses to shrink partitions" {
+  init_stubs
+  printf 'T\torders\t2\t1\n' > "$STATE/s3_object"   # backup wants 2
+  printf 'orders\n' > "$STATE/topics"
+  printf 'Topic: orders\tPartitionCount: 5\tReplicationFactor: 1\n' > "$STATE/desc.orders"  # live 5 > 2
+  out=""
+  if out=$(MODE=restore S3_ENDPOINT="https://s3.example.org" bash "$SCRIPT" 2>&1); then
+    echo "restore unexpectedly succeeded: $out" >&2; return 1
+  fi
+  printf '%s\n' "$out" | grep -q 'Kafka cannot decrease partitions'
+}
+
+@test "backup fails closed when the S3 upload is rejected (curl -f)" {
+  init_stubs; seed_three
+  # PUT_FAIL simulates a 403; -fsS must turn that into a non-zero exit so the
+  # backup does not report success against an object that never landed.
+  expect_fail env MODE=backup PUT_FAIL=1 S3_ENDPOINT="https://s3.example.org" bash "$SCRIPT"
+  [ ! -f "$STATE/s3_object" ]
+}
+
+@test "backup excludes Kafka internal topics" {
+  init_stubs
+  printf 'orders\n__consumer_offsets\n' > "$STATE/topics"
+  printf 'Topic: orders\tPartitionCount: 3\tReplicationFactor: 1\n' > "$STATE/desc.orders"
+  # No desc.__consumer_offsets on purpose: with --exclude-internal it is filtered
+  # from --list; drop the flag and the backup instead tries to describe it and
+  # fails — either way it must never land in the object.
+  MODE=backup S3_ENDPOINT="https://s3.example.org" bash "$SCRIPT"
+  grep -qxF "$(printf 'T\torders\t3\t1')" "$STATE/s3_object"
+  if grep -qF '__consumer_offsets' "$STATE/s3_object"; then echo "internal topic captured" >&2; return 1; fi
+}
+
+# ---- cleanup --------------------------------------------------------------
+
+@test "cleanup treats 204 as success" {
+  init_stubs
+  MODE=cleanup DELETE_CODE=204 S3_ENDPOINT="https://s3.example.org" bash "$SCRIPT"
+}
+
+@test "cleanup treats a 500 as a retryable failure" {
+  init_stubs
+  expect_fail env MODE=cleanup DELETE_CODE=500 S3_ENDPOINT="https://s3.example.org" bash "$SCRIPT"
+}
+
+@test "cleanup treats a 404 as success (idempotent delete)" {
+  init_stubs
+  # Dropping 404 from the success case routes it to the `*)` failure arm; this
+  # would then requeue the delete forever against an already-gone object.
+  MODE=cleanup DELETE_CODE=404 S3_ENDPOINT="https://s3.example.org" bash "$SCRIPT"
+}
+
+# ---- fail-closed guards (each reddens when its guard is removed) -----------
+
+@test "unknown MODE fails closed instead of running the restore branch" {
+  init_stubs; write_backup_object
+  : > "$STATE/topics"
+  # internal/template returns a leaf unchanged when its render fails, so an
+  # unrendered {{ .Mode }} reaches the pod literally; without the MODE case the
+  # bare `else` would run the (mutating) restore branch during a backup. With a
+  # valid object seeded, dropping the guard makes the script exit 0 here.
+  expect_fail env MODE='{{ .Mode }}' S3_ENDPOINT="https://s3.example.org" bash "$SCRIPT"
+  [ ! -f "$STATE/actions" ]
+}
+
+@test "non-s3 ARTIFACT_URI fails closed" {
+  init_stubs; seed_three
+  # Without the s3:// prefix guard the `${ARTIFACT_URI#s3://}` split produces a
+  # garbage bucket/key and the backup uploads to the wrong place, exiting 0.
+  expect_fail env MODE=backup ARTIFACT_URI="https://bkt/ns/app/run/x.txt" S3_ENDPOINT="https://s3.example.org" bash "$SCRIPT"
+}
+
+@test "backup fails closed on an unparsable topic describe" {
+  init_stubs
+  printf 'orders\n' > "$STATE/topics"
+  printf 'Topic: orders no-partition-count-here\n' > "$STATE/desc.orders"
+  # Empty parts/rf must abort, not write the record `T\torders\t\t` that a later
+  # restore feeds to `--partitions ""`.
+  expect_fail env MODE=backup S3_ENDPOINT="https://s3.example.org" bash "$SCRIPT"
+  [ ! -f "$STATE/s3_object" ]
+}
+
+@test "backup fails closed when kafka-configs --describe errors" {
+  init_stubs
+  printf 'orders\n' > "$STATE/topics"
+  printf 'Topic: orders\tPartitionCount: 1\tReplicationFactor: 1\n' > "$STATE/desc.orders"
+  # A configs describe that errors (not "no non-default configs") must abort, not
+  # silently drop the topic's configs and report success.
+  expect_fail env MODE=backup CFG_FAIL=1 S3_ENDPOINT="https://s3.example.org" bash "$SCRIPT"
+  [ ! -f "$STATE/s3_object" ]
+}
+
+@test "restore fails closed on an unparsable live describe" {
+  init_stubs
+  printf 'T\torders\t3\t1\n' > "$STATE/s3_object"   # backup wants 3 partitions, RF 1
+  printf 'orders\n' > "$STATE/topics"               # live exists
+  printf 'Topic: orders\tReplicationFactor: 1\n' > "$STATE/desc.orders"  # RF matches, no PartitionCount
+  # An unparsable live describe must abort the restore, not report the topic
+  # restored without altering it. (set -euo pipefail already aborts at the
+  # `lp=$(describe_field ...)` assignment; the explicit guard is belt-and-braces.)
+  expect_fail env MODE=restore S3_ENDPOINT="https://s3.example.org" bash "$SCRIPT"
+  [ ! -f "$STATE/actions" ]
+}
+
+@test "restore fails closed on a non-numeric recorded partition count" {
+  init_stubs
+  printf 'T\torders\tabc\t1\n' > "$STATE/s3_object"   # recorded parts is not a number
+  printf 'orders\n' > "$STATE/topics"                 # live exists at 3 partitions
+  printf 'Topic: orders\tPartitionCount: 3\tReplicationFactor: 1\n' > "$STATE/desc.orders"
+  # `[ 3 -lt abc ]` / `[ 3 -gt abc ]` exit 2 and an `if` condition is exempt from
+  # errexit, so without the recorded-shape guard the topic is skipped yet the
+  # script prints its success line and exits 0.
+  expect_fail env MODE=restore S3_ENDPOINT="https://s3.example.org" bash "$SCRIPT"
+  [ ! -f "$STATE/actions" ]
+}
+
+@test "restore fails closed on a non-numeric recorded replication factor" {
+  init_stubs
+  printf 'T\torders\t3\tabc\n' > "$STATE/s3_object"   # recorded rf is not a number
+  : > "$STATE/topics"                                 # topic absent -> restore takes the --create path
+  # Recorded partitions are valid, so the parts guard passes and the create path
+  # hands rf straight to `--replication-factor`. Without the recorded-rf guard a
+  # non-numeric rf reaches kafka-topics --create and the topic is (mis)created
+  # rather than the restore failing loudly on a wrong-content object.
+  expect_fail env MODE=restore S3_ENDPOINT="https://s3.example.org" bash "$SCRIPT"
+  [ ! -f "$STATE/actions" ]
+}
+
+@test "restore fails closed on an unrecognised record kind" {
+  init_stubs
+  printf 'X\torders\t3\t1\n' > "$STATE/s3_object"   # neither T nor C
+  : > "$STATE/topics"
+  # A well-formed but wrong-content object (curl -f catches transport errors, not
+  # a wrong-content 200) must not restore a subset and report success.
+  expect_fail env MODE=restore S3_ENDPOINT="https://s3.example.org" bash "$SCRIPT"
+  [ ! -f "$STATE/actions" ]
+}
diff --git a/hack/kafka-metadata-backup-demo-helpers.bats b/hack/kafka-metadata-backup-demo-helpers.bats
new file mode 100644
index 0000000000..55e1342c22
--- /dev/null
+++ b/hack/kafka-metadata-backup-demo-helpers.bats
@@ -0,0 +1,173 @@
+#!/usr/bin/env bats
+# Unit tests for kafka_run in examples/backups/kafka-metadata/00-helpers.sh, the
+# helper the kafka-3-metadata-roundtrip suite seeds and verifies topics through.
+#
+# kubectl and the Kafka CLI are stub executables on PATH. The kubectl stub
+# answers the calls kafka_run makes -- get the CLI Pod's phase, owner label and
+# runAsNonRoot, create it when absent or started without the restricted profile
+# (recording the overrides it is given), wait for it, and `exec` into it -- and
+# runs the exec'd snippet locally against the kafka-topics.sh stub. STUB_PHASE /
+# STUB_OWNER / STUB_NONROOT drive the reuse guard, and STUB_EXEC_ERROR makes the
+# exec fail so the "a failed read says why" claim is pinned rather than asserted
+# in prose.
+#
+# cozytest.sh's awk runner recognizes only @test blocks and a bare `}`; there is
+# no bats `run` or `$status`, and no setup/teardown, so each case calls
+# make_stubs itself and asserts with direct shell tests that exit non-zero. The
+# helper functions close on an indented brace because the runner rewrites a
+# column-0 `}` into `return 0`, which would mask run_topic_meta's exit status.
+
+load test_helper
+
+make_stubs() {
+    stub=$(mktemp -d)
+    cat > "$stub/kubectl" <<'EOF'
+#!/bin/bash
+printf '%s\n' "$*" >> "$STUB_DIR/kubectl.argv"
+case "$1 $2 $3" in
+"-n tenant-root get")
+    [ -n "${STUB_GET_ERROR:-}" ] && { echo "Unable to connect to the server: i/o timeout" >&2; exit 1; }
+    case "$*" in
+    *"jsonpath={.status.phase}"*)          printf '%s' "${STUB_PHASE-Running}" ;;
+    *"jsonpath={.metadata.labels"*)         printf '%s' "${STUB_OWNER-kafka-metadata}" ;;
+    *"jsonpath={.spec.securityContext.runAsNonRoot}"*) printf '%s' "${STUB_NONROOT-true}" ;;
+    esac
+    exit 0 ;;
+"-n tenant-root delete")
+    exit 0 ;;
+"-n tenant-root run")
+    for a in "$@"; do
+        case "$a" in
+        --overrides=*)     printf '%s' "${a#--overrides=}" > "$STUB_DIR/overrides.json" ;;
+        --override-type=*) printf '%s' "${a#--override-type=}" > "$STUB_DIR/override-type" ;;
+        esac
+    done
+    # Reachable only when the Pod is absent or predates the restricted
+    # profile; a reuse that starts a Pod is a bug.
+    { [ -z "${STUB_PHASE-Running}" ] || [ -z "${STUB_NONROOT-true}" ]; } && exit 0
+    echo "kafka_run started a Pod though a Ready one it owns exists" >&2; exit 95 ;;
+"-n tenant-root wait")
+    exit 0 ;;
+"-n tenant-root exec")
+    [ -n "${STUB_EXEC_ERROR:-}" ] && { echo "error: unable to upgrade connection: container not found" >&2; exit 1; }
+    shift 6   # drop: -n tenant-root exec -i <pod> --
+    if [ "$1" != "bash" ] || [ "$2" != "-c" ]; then
+        echo "unexpected exec payload: $*" >&2; exit 96
+    fi
+    shift 2
+    exec bash -c "$1" ;;
+*)
+    echo "unexpected kubectl call: $*" >&2; exit 97 ;;
+esac
+EOF
+    cat > "$stub/kafka-topics.sh" <<'EOF'
+#!/bin/sh
+# Minimal --describe stub: one line carrying PartitionCount and retention.ms so
+# topic_meta has a realistic line to parse.
+printf 'Topic: orders\tPartitionCount: 3\tReplicationFactor: 1\tConfigs: retention.ms=123456\n'
+EOF
+    chmod +x "$stub/kubectl" "$stub/kafka-topics.sh"
+    : > "$stub/kubectl.argv"
+    }
+
+run_topic_meta() {
+    STUB_DIR=$stub STUB_PHASE="${STUB_PHASE-Running}" STUB_OWNER="${STUB_OWNER-kafka-metadata}" STUB_NONROOT="${STUB_NONROOT-true}" \
+        STUB_EXEC_ERROR="${STUB_EXEC_ERROR:-}" STUB_GET_ERROR="${STUB_GET_ERROR:-}" PATH="$stub:$PATH" NAMESPACE=tenant-root \
+        KAFKA_BIN=$stub TOPIC=orders bash -c '
+        set -euo pipefail
+        . examples/backups/kafka-metadata/00-helpers.sh
+        # Read the way the numbered scripts read it: inside a command
+        # substitution, where bash does not apply errexit.
+        got=$(topic_meta demo)
+        printf "%s\n" "$got"
+    '
+    }
+
+@test "kafka_run reuses a Ready Pod it owns and reads the reply by exec" {
+    make_stubs
+    out=$(run_topic_meta)
+    [ "$out" = "3 123456" ]
+    grep -q 'exec -i kafka-cli -- bash -c' "$stub/kubectl.argv"
+}
+
+@test "kafka_run creates the CLI Pod when it is absent, then execs into it" {
+    make_stubs
+    export STUB_PHASE=
+    out=$(run_topic_meta)
+    [ "$out" = "3 123456" ]
+    grep -q 'run kafka-cli --image=' "$stub/kubectl.argv"
+    grep -q 'labels=cozystack.io/backup-demo=kafka-metadata' "$stub/kubectl.argv"
+    grep -q 'exec -i kafka-cli -- bash -c' "$stub/kubectl.argv"
+}
+
+@test "kafka_run starts the CLI Pod under the restricted Pod Security profile" {
+    make_stubs
+    export STUB_PHASE=
+    run_topic_meta >/dev/null
+    # The overrides are a JSON patch, which kubectl applies only with
+    # --override-type=json; under the default merge type the array is rejected.
+    [ "$(cat "$stub/override-type")" = "json" ]
+    jq --exit-status '
+        (map(select(.op == "add" and .path == "/spec/securityContext")) | .[0].value) as $pod
+        | (map(select(.op == "add" and .path == "/spec/containers/0/securityContext")) | .[0].value) as $ctr
+        | $pod.runAsNonRoot == true
+          and $pod.seccompProfile.type == "RuntimeDefault"
+          and $ctr.allowPrivilegeEscalation == false
+          and $ctr.capabilities.drop == ["ALL"]
+    ' "$stub/overrides.json"
+}
+
+@test "kafka_run replaces a Pod it owns that predates the restricted profile" {
+    make_stubs
+    export STUB_NONROOT=
+    out=$(run_topic_meta)
+    [ "$out" = "3 123456" ]
+    grep -q 'delete pod kafka-cli' "$stub/kubectl.argv"
+    grep -q 'run kafka-cli --image=' "$stub/kubectl.argv"
+    [ "$(cat "$stub/override-type")" = "json" ]
+}
+
+@test "kafka_run refuses a same-named Pod the demo does not own" {
+    make_stubs
+    export STUB_OWNER=someone-else
+    err=$(mktemp)
+    if run_topic_meta 2>"$err"; then
+        echo "kafka_run used a Pod it does not own" >&2
+        exit 1
+    fi
+    grep -q 'does not own it' "$err"
+    if grep -q ' exec ' "$stub/kubectl.argv"; then
+        echo "kafka_run exec'd into a Pod it refused to use" >&2
+        exit 1
+    fi
+}
+
+@test "kafka_run touches no Pod when it cannot read the CLI Pod's state" {
+    make_stubs
+    export STUB_GET_ERROR=1
+    err=$(mktemp)
+    if run_topic_meta 2>"$err"; then
+        echo "a failed Pod lookup read as a successful reply" >&2
+        exit 1
+    fi
+    grep -q 'Unable to connect to the server' "$err"
+    if grep -qE ' (delete|run|exec) ' "$stub/kubectl.argv"; then
+        echo "kafka_cli_pod acted on a Pod whose owner it could not read:" >&2
+        cat "$stub/kubectl.argv" >&2
+        exit 1
+    fi
+}
+
+@test "kafka_run fails with kubectl's own error when the exec fails" {
+    make_stubs
+    # A flag, not the message: the runner traces the command that passes
+    # STUB_EXEC_ERROR on, into the same stderr the grep below reads, so a
+    # message carried in it would match with the helper's stderr dropped.
+    export STUB_EXEC_ERROR=1
+    err=$(mktemp)
+    if run_topic_meta 2>"$err"; then
+        echo "a failed exec read as a successful empty reply" >&2
+        exit 1
+    fi
+    grep -q 'unable to upgrade connection: container not found' "$err"
+}
diff --git a/hack/kafka-migration-hook.bats b/hack/kafka-migration-hook.bats
new file mode 100644
index 0000000000..65925385f4
--- /dev/null
+++ b/hack/kafka-migration-hook.bats
@@ -0,0 +1,433 @@
+#!/usr/bin/env bats
+# Behavioural tests for the ZooKeeper->KRaft migration hook of
+# packages/apps/kafka. The shell script is extracted from the rendered Job and
+# executed against a stub kubectl, so the fail-closed reads, the atomic
+# namespace-collision guard, the node-pool creation, the finalize guard and the
+# "free the kafka name" drain are exercised for real. The helm-unittest cases in
+# packages/apps/kafka/tests/migration-hook_test.yaml only match the script's
+# source TEXT; they cannot say whether a stuck migration refuses to stamp
+# kraft=enabled, or whether the drain drives the rebalance to completion before
+# deleting the pool.
+#
+# The hook manages the node pools itself (no regular KafkaNodePool manifest), so
+# it runs on install AND upgrade. `helm template` (no live lookup) resolves the
+# broker pool to the fresh "b-<hash>" name; tests that must exercise the
+# migration "kafka" pool (collision guard, create-CAS, name-freeing) force the
+# resolved value with force_kafka_pool.
+#
+# Run from the repo root with make bats-unit-tests. Direct assertions and
+# inline cleanup retain compatibility with cozytest. Its translator rewrites
+# lone closing braces even inside heredocs, so the stub avoids shell functions
+# and helper closing braces stay indented.
+
+load test_helper
+
+CHART=packages/apps/kafka
+
+render_script() {
+  helm template test-kafka "$CHART" \
+    --namespace tenant-test \
+    --show-only templates/migration-hook.yaml 2>"$1.err" |
+    yq 'select(.kind == "Job") | .spec.template.spec.containers[0].args[0]' - > "$1"
+  if [ ! -s "$1" ]; then
+    echo "FAIL: the chart rendered no migration Job script" >&2
+    grep -v 'found symbolic link in path' "$1.err" >&2 || true
+    return 1
+  fi
+  }
+
+# Force the render-resolved broker pool from "b-<hash>" to "kafka", so the
+# collision / create-CAS / name-freeing branches (gated on brokerPool == "kafka")
+# run. `helm template` cannot seed the live lookup that resolves it.
+force_kafka_pool() {
+  sed 's/brokerPool="b-[0-9a-f]\{8\}"/brokerPool="kafka"/' "$1" > "$1.k" && mv "$1.k" "$1"
+  }
+
+make_bin() {
+  mkdir -p "$1"
+  printf '#!/bin/sh\nexit 0\n' > "$1/sleep"
+  chmod 0755 "$1/sleep"
+  cat > "$1/kubectl" <<'STUB'
+#!/bin/sh
+args="$*"
+echo "$args" >> "${KUBECTL_LOG:-/dev/null}"
+
+# Order matters: match the more specific jsonpath reads before the generic
+# owner/kraft/found reads that share substrings.
+case "$args" in
+  *"create -f -"*)
+    cat >> "${KUBECTL_LOG:-/dev/null}"
+    [ -n "${STUB_CREATE_FAIL:-}" ] && { echo "AlreadyExists" >&2; exit 1; }
+    exit 0
+    ;;
+  *"apply "*"-f -"*)
+    cat >> "${KUBECTL_LOG:-/dev/null}"
+    exit 0
+    ;;
+  *"range .items"*)
+    # kafkas list for the "other ZooKeeper clusters remain" count.
+    [ -n "${STUB_OTHERS_LIST_FAIL:-}" ] && { echo "apiserver error" >&2; exit 1; }
+    printf '%s\n' "${STUB_OTHERS_LIST:-}"
+    exit 0
+    ;;
+  *nodeIds*)
+    printf '%s' "${STUB_KAFKA_IDS:-}"
+    exit 0
+    ;;
+  *].reason*)
+    # KafkaRebalance NotReady reason (retriable vs terminal).
+    printf '%s' "${STUB_REBALANCE_REASON:-}"
+    exit 0
+    ;;
+  *conditions*)
+    # KafkaRebalance status.conditions[*].type, advanced via STUB_REBALANCE.
+    i=$(cat "${REBALANCE_COUNTER}" 2>/dev/null)
+    [ -n "$i" ] || i=0
+    i=$((i + 1))
+    echo "$i" > "${REBALANCE_COUNTER}"
+    printf '%s\n' "${STUB_REBALANCE:-}" | awk -v n="$i" '{a[NR]=$0} END{print (n<=NR)?a[n]:a[NR]}'
+    exit 0
+    ;;
+  *kafkaMetadataState*)
+    [ -n "${STUB_STATE_FAIL:-}" ] && { echo "apiserver error" >&2; exit 1; }
+    i=$(cat "${STATE_COUNTER}" 2>/dev/null)
+    [ -n "$i" ] || i=0
+    i=$((i + 1))
+    echo "$i" > "${STATE_COUNTER}"
+    printf '%s\n' "${STUB_STATES:-}" | awk -v n="$i" '{a[NR]=$0} END{print (n<=NR)?a[n]:a[NR]}'
+    exit 0
+    ;;
+  *cluster}*)
+    [ -n "${STUB_OWNER_FAIL:-}" ] && { echo "apiserver error" >&2; exit 1; }
+    printf '%s\n' "${STUB_OWNER:-}"
+    exit 0
+    ;;
+  *kraft}*)
+    [ -n "${STUB_KRAFT_FAIL:-}" ] && { echo "apiserver error" >&2; exit 1; }
+    printf '%s\n' "${STUB_KRAFT:-}"
+    exit 0
+    ;;
+  *--ignore-not-found*)
+    [ -n "${STUB_FOUND_FAIL:-}" ] && { echo "apiserver error" >&2; exit 1; }
+    printf '%s' "${STUB_FOUND:-}"
+    [ -n "${STUB_FOUND:-}" ] && echo
+    exit 0
+    ;;
+esac
+exit 0
+STUB
+  chmod 0755 "$1/kubectl"
+  }
+
+setup_case() {
+  tmp=$(mktemp -d) || return 1
+  render_script "$tmp/s.sh" || return 1
+  make_bin "$tmp/bin" || return 1
+  }
+
+run_hook() {
+  rc=0
+  : > "$tmp/kubectl.log"
+  : > "$tmp/state.counter"
+  : > "$tmp/rebalance.counter"
+  KUBECONFIG=/dev/null \
+  KUBECTL_LOG="$tmp/kubectl.log" \
+  STATE_COUNTER="$tmp/state.counter" \
+  REBALANCE_COUNTER="$tmp/rebalance.counter" \
+  STUB_FOUND="${STUB_FOUND:-}" \
+  STUB_FOUND_FAIL="${STUB_FOUND_FAIL:-}" \
+  STUB_KRAFT="${STUB_KRAFT:-}" \
+  STUB_STATES="${STUB_STATES:-}" \
+  STUB_OWNER="${STUB_OWNER:-}" \
+  STUB_OWNER_FAIL="${STUB_OWNER_FAIL:-}" \
+  STUB_KRAFT_FAIL="${STUB_KRAFT_FAIL:-}" \
+  STUB_STATE_FAIL="${STUB_STATE_FAIL:-}" \
+  STUB_CREATE_FAIL="${STUB_CREATE_FAIL:-}" \
+  STUB_OTHERS_LIST="${STUB_OTHERS_LIST:-}" \
+  STUB_OTHERS_LIST_FAIL="${STUB_OTHERS_LIST_FAIL:-}" \
+  STUB_KAFKA_IDS="${STUB_KAFKA_IDS:-}" \
+  STUB_REBALANCE="${STUB_REBALANCE:-}" \
+  STUB_REBALANCE_REASON="${STUB_REBALANCE_REASON:-}" \
+  PATH="$tmp/bin:$PATH" sh "$tmp/s.sh" > "$tmp/out" 2>&1 || rc=$?
+  [ -s "$tmp/kubectl.log" ] || return 1
+  }
+
+@test "a NotFound Kafka CR is a fresh install: pools ensured, no migration" {
+  setup_case
+  STUB_FOUND="" run_hook
+
+  [ "$rc" = 0 ]
+  grep -qF 'fresh install' "$tmp/out"
+  if grep -qE 'kraft=(migration|enabled)|node-pools=enabled' "$tmp/kubectl.log"; then
+    echo "FAIL: the fresh-install path drove the migration state machine"
+    cat "$tmp/kubectl.log"
+    return 1
+  fi
+
+  rm -rf "$tmp"
+}
+
+@test "a read error reading the Kafka CR fails closed, never mistaken for fresh" {
+  setup_case
+  STUB_FOUND_FAIL=1 run_hook
+
+  [ "$rc" != 0 ]
+  grep -qF 'reading Kafka CR failed' "$tmp/out"
+  if grep -qF 'fresh install' "$tmp/out"; then
+    echo "FAIL: an apiserver error was read as a fresh install"
+    cat "$tmp/out"
+    return 1
+  fi
+
+  rm -rf "$tmp"
+}
+
+@test "an already-KRaft cluster on b-<hash> is a no-op with nothing to free" {
+  setup_case
+  STUB_FOUND="kafka.kafka.strimzi.io/test-kafka" STUB_KRAFT="enabled" run_hook
+
+  [ "$rc" = 0 ]
+  grep -qF 'already KRaft' "$tmp/out"
+  grep -qF 'nothing to free' "$tmp/out"
+  if grep -qE 'kraft=(migration|enabled)|node-pools=enabled' "$tmp/kubectl.log"; then
+    echo "FAIL: an already-KRaft cluster was driven through the state machine"
+    cat "$tmp/kubectl.log"
+    return 1
+  fi
+
+  rm -rf "$tmp"
+}
+
+@test "a kafka pool owned by another cluster fails fast before any mutation" {
+  setup_case
+  force_kafka_pool "$tmp/s.sh"
+  STUB_FOUND="kafka.kafka.strimzi.io/test-kafka" STUB_KRAFT="" \
+    STUB_STATES="ZooKeeper" STUB_OWNER="other-kafka" run_hook
+
+  [ "$rc" != 0 ]
+  grep -qF 'already belongs to cluster' "$tmp/out"
+  if grep -qE 'apply .*-f -|create -f -|kraft=|node-pools=' "$tmp/kubectl.log"; then
+    echo "FAIL: a foreign-owned kafka pool did not abort before mutating"
+    cat "$tmp/kubectl.log"
+    return 1
+  fi
+
+  rm -rf "$tmp"
+}
+
+@test "a failed read of the kafka pool owner fails closed" {
+  setup_case
+  force_kafka_pool "$tmp/s.sh"
+  STUB_FOUND="kafka.kafka.strimzi.io/test-kafka" STUB_KRAFT="" \
+    STUB_STATES="ZooKeeper" STUB_OWNER_FAIL=1 run_hook
+
+  [ "$rc" != 0 ]
+  grep -qF 'owner label failed' "$tmp/out"
+  if grep -qE 'apply .*-f -|create -f -|kraft=|node-pools=' "$tmp/kubectl.log"; then
+    echo "FAIL: proceeded to mutate the cluster after a failed owner read"
+    cat "$tmp/kubectl.log"
+    return 1
+  fi
+
+  rm -rf "$tmp"
+}
+
+@test "a failed read of the kraft annotation fails closed" {
+  setup_case
+  STUB_FOUND="kafka.kafka.strimzi.io/test-kafka" STUB_KRAFT_FAIL=1 run_hook
+
+  [ "$rc" != 0 ]
+  grep -qF 'strimzi.io/kraft annotation failed' "$tmp/out"
+  if grep -qE 'kraft=(migration|enabled)|node-pools=enabled' "$tmp/kubectl.log"; then
+    echo "FAIL: drove the migration after a failed kraft-annotation read"
+    cat "$tmp/kubectl.log"
+    return 1
+  fi
+
+  rm -rf "$tmp"
+}
+
+@test "a classic ZooKeeper cluster migrates and finalizes to KRaft" {
+  setup_case
+  STUB_FOUND="kafka.kafka.strimzi.io/test-kafka" STUB_KRAFT="" STUB_OWNER="" \
+    STUB_STATES="ZooKeeper
+KRaftPostMigration
+KRaft" run_hook
+
+  [ "$rc" = 0 ]
+  grep -qF 'Migration complete' "$tmp/out"
+  grep -qF 'node-pools=enabled' "$tmp/kubectl.log"
+  grep -qF 'kraft=migration' "$tmp/kubectl.log"
+  grep -qF 'kraft=enabled' "$tmp/kubectl.log"
+
+  rm -rf "$tmp"
+}
+
+@test "a migration stuck before KRaftPostMigration refuses to stamp kraft=enabled" {
+  setup_case
+  STUB_FOUND="kafka.kafka.strimzi.io/test-kafka" STUB_KRAFT="" STUB_OWNER="" \
+    STUB_STATES="ZooKeeper" run_hook
+
+  [ "$rc" != 0 ]
+  grep -qF 'Refusing to apply' "$tmp/out"
+  if grep -qF 'kraft=enabled' "$tmp/kubectl.log"; then
+    echo "FAIL: kraft=enabled was stamped while the cluster was still on ZooKeeper"
+    cat "$tmp/kubectl.log"
+    return 1
+  fi
+
+  rm -rf "$tmp"
+}
+
+@test "a retry already past the ZooKeeper phase does not re-issue kraft=migration" {
+  setup_case
+  STUB_FOUND="kafka.kafka.strimzi.io/test-kafka" STUB_KRAFT="" STUB_OWNER="" \
+    STUB_STATES="KRaftPostMigration
+KRaftPostMigration
+KRaft" run_hook
+
+  [ "$rc" = 0 ]
+  grep -qF 'not re-issuing kraft=migration' "$tmp/out"
+  grep -qF 'kraft=enabled' "$tmp/kubectl.log"
+  if grep -qF 'kraft=migration' "$tmp/kubectl.log"; then
+    echo "FAIL: kraft=migration was re-issued from a post-ZooKeeper state"
+    cat "$tmp/kubectl.log"
+    return 1
+  fi
+
+  rm -rf "$tmp"
+}
+
+# --- Name-freeing (multi Kafka per namespace) -------------------------------
+
+@test "the sole migrated cluster keeps the kafka pool, no drain" {
+  setup_case
+  force_kafka_pool "$tmp/s.sh"
+  # Already KRaft on kafka; no other ZooKeeper clusters in the namespace.
+  STUB_FOUND="kafka.kafka.strimzi.io/test-kafka" STUB_KRAFT="enabled" \
+    STUB_OTHERS_LIST="test-kafka=enabled" run_hook
+
+  [ "$rc" = 0 ]
+  grep -qF 'keeping the "kafka" pool' "$tmp/out"
+  # No drain: no rebalance, no cruiseControl, no pool deletion.
+  if grep -qE 'KafkaRebalance|cruiseControl|delete .*kafkanodepools' "$tmp/kubectl.log"; then
+    echo "FAIL: a sole cluster ran the name-freeing drain"
+    cat "$tmp/kubectl.log"
+    return 1
+  fi
+
+  rm -rf "$tmp"
+}
+
+@test "a failed read of the other-clusters list fails closed, not mistaken for none" {
+  setup_case
+  force_kafka_pool "$tmp/s.sh"
+  # Already KRaft on kafka; the list read that decides whether others wait errors.
+  STUB_FOUND="kafka.kafka.strimzi.io/test-kafka" STUB_KRAFT="enabled" \
+    STUB_OTHERS_LIST_FAIL=1 run_hook
+
+  [ "$rc" != 0 ]
+  grep -qF 'could not list Kafka CRs' "$tmp/out"
+  if grep -qF 'keeping the "kafka" pool' "$tmp/out"; then
+    echo "FAIL: a failed list read was mistaken for 'no other clusters' and kept the pool"
+    cat "$tmp/out"
+    return 1
+  fi
+
+  rm -rf "$tmp"
+}
+
+@test "a migrated cluster with others waiting drains and frees the kafka name" {
+  setup_case
+  force_kafka_pool "$tmp/s.sh"
+  # Already KRaft on kafka; one other cluster still on ZooKeeper.
+  STUB_FOUND="kafka.kafka.strimzi.io/test-kafka" STUB_KRAFT="enabled" \
+    STUB_OTHERS_LIST="test-kafka=enabled
+other-zk=" \
+    STUB_KAFKA_IDS="[0,1,2]" \
+    STUB_REBALANCE="PendingProposal
+ProposalReady
+Ready" run_hook
+
+  [ "$rc" = 0 ]
+  grep -qF 'freeing the "kafka" pool name' "$tmp/out"
+  grep -qF 'Freed the "kafka" pool name' "$tmp/out"
+  # Full drain sequence, in order: target pool, Cruise Control, rebalance,
+  # approval, delete kafka pool + PVCs.
+  grep -qF '1000-1099' "$tmp/kubectl.log"   # applied the b-<hash> target pool
+  grep -qF 'cruiseControl' "$tmp/kubectl.log"
+  grep -qF 'rebalance=approve' "$tmp/kubectl.log"
+  grep -qF 'delete kafkanodepools.kafka.strimzi.io kafka' "$tmp/kubectl.log"
+  grep -qF 'delete pvc data-0-test-kafka-kafka-0' "$tmp/kubectl.log"
+  grep -qF 'delete pvc data-0-test-kafka-kafka-2' "$tmp/kubectl.log"
+
+  rm -rf "$tmp"
+}
+
+@test "the drain refuses to delete the kafka pool if the rebalance never completes" {
+  setup_case
+  force_kafka_pool "$tmp/s.sh"
+  STUB_FOUND="kafka.kafka.strimzi.io/test-kafka" STUB_KRAFT="enabled" \
+    STUB_OTHERS_LIST="test-kafka=enabled
+other-zk=" \
+    STUB_KAFKA_IDS="[0,1,2]" \
+    STUB_REBALANCE="PendingProposal" run_hook
+
+  [ "$rc" != 0 ]
+  grep -qF 'will resume on the next retry' "$tmp/out"
+  # Must NOT delete the pool (which still holds all the data) before the drain.
+  if grep -qF 'delete kafkanodepools.kafka.strimzi.io kafka' "$tmp/kubectl.log"; then
+    echo "FAIL: deleted the kafka pool before the rebalance finished — data loss"
+    cat "$tmp/kubectl.log"
+    return 1
+  fi
+
+  rm -rf "$tmp"
+}
+
+# Cruise Control rejects proposals transiently while it settles — the pod/cert
+# are still coming up (retriable connect), or the capacity model over-estimates
+# load from noisy samples and trips a goal. The drain must refresh the proposal
+# and keep polling, never treat a NotReady as terminal. Covers both reasons.
+@test "the drain refreshes a transient-connection NotReady and proceeds" {
+  setup_case
+  force_kafka_pool "$tmp/s.sh"
+  STUB_FOUND="kafka.kafka.strimzi.io/test-kafka" STUB_KRAFT="enabled" \
+    STUB_OTHERS_LIST="test-kafka=enabled
+other-zk=" \
+    STUB_KAFKA_IDS="[0,1,2]" \
+    STUB_REBALANCE_REASON="CruiseControlRetriableConnectionException" \
+    STUB_REBALANCE="PendingProposal
+NotReady
+ProposalReady
+Ready" run_hook
+
+  [ "$rc" = 0 ]
+  grep -qF 'refreshing the proposal' "$tmp/out"
+  grep -qF 'rebalance=refresh' "$tmp/kubectl.log"
+  grep -qF 'Freed the "kafka" pool name' "$tmp/out"
+  grep -qF 'delete kafkanodepools.kafka.strimzi.io kafka' "$tmp/kubectl.log"
+
+  rm -rf "$tmp"
+}
+
+@test "the drain refreshes and recovers from a capacity-goal NotReady" {
+  setup_case
+  force_kafka_pool "$tmp/s.sh"
+  STUB_FOUND="kafka.kafka.strimzi.io/test-kafka" STUB_KRAFT="enabled" \
+    STUB_OTHERS_LIST="test-kafka=enabled
+other-zk=" \
+    STUB_KAFKA_IDS="[0,1,2]" \
+    STUB_REBALANCE_REASON="OptimizationFailureException" \
+    STUB_REBALANCE="PendingProposal
+NotReady
+ProposalReady
+Ready" run_hook
+
+  [ "$rc" = 0 ]
+  grep -qF 'refreshing the proposal' "$tmp/out"
+  grep -qF 'rebalance=refresh' "$tmp/kubectl.log"
+  grep -qF 'Freed the "kafka" pool name' "$tmp/out"
+
+  rm -rf "$tmp"
+}
diff --git a/hack/kafka-pre-delete-hook.bats b/hack/kafka-pre-delete-hook.bats
new file mode 100644
index 0000000000..0ab4082947
--- /dev/null
+++ b/hack/kafka-pre-delete-hook.bats
@@ -0,0 +1,344 @@
+#!/usr/bin/env bats
+# Behavioural tests for the Kafka pre-delete hook:
+#
+#   packages/apps/kafka/templates/hooks/delete.yaml
+#
+# The script is extracted from the rendered chart and RUN against a fake
+# kubectl, because every property worth pinning here is an EXIT CODE and no
+# amount of matching against the manifest text establishes one. The
+# helm-unittest suite in packages/apps/kafka/tests/delete_test.yaml matches the
+# source text instead, and stayed green through a mutation that put the timeout
+# branch back to `exit 1` — which is the whole subject of this file.
+#
+# Why the exit code carries so much: a non-zero hook returns from Uninstall.Run
+# before any release resource goes, so Helm leaves the topic operator running
+# and helm-controller retries. That is the difference between "the uninstall
+# waits" and "the topic operator is gone while topics still hold
+# strimzi.io/topic-operator", which is issue #3793.
+#
+# What is pinned here:
+#   * a delete that succeeds exits 0;
+#   * a CRD that is absent is not a failure: the release may never have created
+#     a topic, and the uninstall must not wedge on that;
+#   * a wait that timed out exits 0 DELIBERATELY, so the uninstall can finish,
+#     and says so on stderr. This is the branch 2b47c5a5 added; reverting it
+#     must turn this file red;
+#   * any OTHER kubectl failure exits non-zero, so a Forbidden or an apiserver
+#     error cannot be mistaken for the timeout case and silently proceed;
+#   * the selector names this release only;
+#   * the release's KafkaNodePools are deleted after the topics, including on
+#     the timeout branch. The migration hook creates them outside the release
+#     manifest, and each owns the StrimziPodSet running its brokers, so a pool
+#     the hook skips keeps its brokers running after the release is gone;
+#   * a KafkaNodePool CRD that is absent exits 0, and any other failure of
+#     that delete exits non-zero, so the uninstall is retried rather than
+#     finishing with the pools still in place.
+#
+# Run from the repo root with make bats-unit-tests. Direct status checks
+# retain compatibility with cozytest, which has no Bats run/setup helpers.
+# Inline cleanup preserves Bats' TAP handler on failed assertions.
+
+load test_helper
+
+KAFKA_CHART=packages/apps/kafka
+
+# render_hook <chart> <release> <namespace> <job-name> <out>
+# Extract the named Job's shell script from the rendered chart into <out>. The
+# non-empty check must be an early `return 1`: hack/cozytest.sh rewrites every
+# line matching ^}$ into `return 0` plus `}`, helpers included, so a check left
+# in last-command position has its status discarded.
+render_hook() {
+  chart=$1 release=$2 namespace=$3 job=$4 out=$5
+  helm template "$release" "$chart" --namespace "$namespace" \
+    | yq eval "select(.kind == \"Job\" and .metadata.name == \"$job\") | .spec.template.spec.containers[0].command[2]" - > "$out"
+  [ -s "$out" ] || return 1
+}
+
+# write_fake_kubectl <dir>
+# Emit a fake `kubectl` that logs its call to $KLOG and replays whatever
+# $DELETE_OUT holds, exiting with $DELETE_RC. The hook reads kubectl's combined
+# output and branches on its text, so the fixture is that text verbatim: the
+# timeout string is what kubectl v1.32 prints from the wait path, and the
+# CRD-absent strings are the two RESTMapper wordings.
+# DELETE_RC deliberately has NO default: an unset value would make every
+# failure-path test exit 0 and assert nothing. Each test sets it.
+# The KafkaNodePool delete answers from POOL_OUT / POOL_RC instead, so a test
+# can fail one call without failing the other. POOL_RC defaults to a clean
+# delete, because the topic-path tests above are about the topic call; every
+# pool-path test sets it explicitly.
+# No line below is a bare column-0 `}`, so cozytest.sh's parser leaves it alone.
+write_fake_kubectl() {
+  cat > "$1/kubectl" <<'KEOF'
+#!/bin/sh
+echo "$*" >> "$KLOG"
+case "$*" in
+  *kafkanodepools*)
+    printf '%s\n' "${POOL_OUT:-kafkanodepool.kafka.strimzi.io \"b-0\" deleted}"
+    exit "${POOL_RC:-0}" ;;
+esac
+if [ -z "${DELETE_RC:-}" ]; then
+  echo "fake kubectl: DELETE_RC unset; the test would assert nothing" >&2
+  exit 64
+fi
+printf '%s\n' "${DELETE_OUT:-kafkatopic.kafka.strimzi.io \"t\" deleted}"
+exit "$DELETE_RC"
+KEOF
+  chmod +x "$1/kubectl"
+}
+
+@test "a render that produces no script fails instead of passing as a no-op" {
+  # Guards the guard: every test below runs whatever render_hook produced, so an
+  # empty render would satisfy the exit-0 assertions without executing a line of
+  # the hook.
+  tmp=$(mktemp -d)
+  if render_hook "$KAFKA_CHART" kafka-test tenant-test no-such-job "$tmp/hook.sh"; then
+    echo "FAIL: render_hook reported success for a Job name the chart never emits"
+    false
+  fi
+  rm -rf "$tmp"
+}
+
+@test "kafka pre-delete hook exits 0 and deletes this release's topics only" {
+  tmp=$(mktemp -d)
+  write_fake_kubectl "$tmp"
+  render_hook "$KAFKA_CHART" kafka-test tenant-test kafka-test-pre-delete "$tmp/hook.sh"
+
+  export KLOG="$tmp/calls"
+  export DELETE_RC=0
+  rc=0
+  PATH="$tmp:$PATH" sh "$tmp/hook.sh" > "$tmp/out" 2> "$tmp/err" || rc=$?
+  if [ "$rc" -ne 0 ]; then
+    echo "FAIL: hook exited $rc on a clean delete"
+    cat "$tmp/out" "$tmp/err"
+    false
+  fi
+  # Anchored on both sides. Bare "strimzi.io/cluster=kafka-test" is a prefix of
+  # the sibling release kafka-test2 and of kafka-test-topics, so a selector
+  # widened to either stays green against it: verified by rendering the hook
+  # with {{ .Release.Name }}2 and watching this test pass. The leading "-l " and
+  # the trailing space are what make it name this release and no other.
+  if ! grep -q -- "-l strimzi.io/cluster=kafka-test " "$tmp/calls"; then
+    echo "FAIL: the delete was not scoped to this release"
+    cat "$tmp/calls"
+    false
+  fi
+  if ! grep -q -- "--ignore-not-found=true" "$tmp/calls"; then
+    echo "FAIL: --ignore-not-found is gone, so an already-deleted topic fails the hook"
+    cat "$tmp/calls"
+    false
+  fi
+  rm -rf "$tmp"
+}
+
+@test "kafka pre-delete hook exits 0 when the KafkaTopic CRD is absent" {
+  # A release that never created a topic, or a cluster where Strimzi is already
+  # gone. Failing here would wedge the uninstall over nothing to clean up. Both
+  # RESTMapper wordings are covered because kubectl picks between them.
+  for msg in 'error: the server doesn'"'"'t have a resource type "kafkatopics"' \
+             'error: no matches for kind "KafkaTopic" in version "kafka.strimzi.io/v1beta2"'; do
+    tmp=$(mktemp -d)
+    write_fake_kubectl "$tmp"
+    render_hook "$KAFKA_CHART" kafka-test tenant-test kafka-test-pre-delete "$tmp/hook.sh"
+
+    export KLOG="$tmp/calls"
+    export DELETE_RC=1
+    export DELETE_OUT="$msg"
+    rc=0
+    PATH="$tmp:$PATH" sh "$tmp/hook.sh" > "$tmp/out" 2> "$tmp/err" || rc=$?
+    if [ "$rc" -ne 0 ]; then
+      echo "FAIL: hook exited $rc on an absent CRD, wedging the uninstall"
+      cat "$tmp/out" "$tmp/err"
+      false
+    fi
+    if ! grep -q 'CRD absent' "$tmp/out"; then
+      echo "FAIL: the absent CRD was not reported as such"
+      cat "$tmp/out"
+      false
+    fi
+    rm -rf "$tmp"
+  done
+}
+
+@test "kafka pre-delete hook exits 0 on a wait timeout and says the finalizer is still held" {
+  # The branch 2b47c5a5 added. Exiting non-zero here wedges the uninstall
+  # forever, because helm-controller retries it; exiting 0 lets the uninstall
+  # finish and leaves the topics for a human. Reverting that branch to `exit 1`
+  # turns this test red, which is the point: the helm-unittest suite does not
+  # notice.
+  tmp=$(mktemp -d)
+  write_fake_kubectl "$tmp"
+  render_hook "$KAFKA_CHART" kafka-test tenant-test kafka-test-pre-delete "$tmp/hook.sh"
+
+  export KLOG="$tmp/calls"
+  export DELETE_RC=1
+  export DELETE_OUT='error: timed out waiting for the condition on kafkatopics/kafka-test-orders'
+  rc=0
+  PATH="$tmp:$PATH" sh "$tmp/hook.sh" > "$tmp/out" 2> "$tmp/err" || rc=$?
+  if [ "$rc" -ne 0 ]; then
+    echo "FAIL: hook exited $rc on a wait timeout, which wedges the uninstall"
+    cat "$tmp/out" "$tmp/err"
+    false
+  fi
+  if ! grep -q 'still hold the strimzi.io/topic-operator finalizer' "$tmp/err"; then
+    echo "FAIL: the degraded path said nothing about the finalizer"
+    cat "$tmp/err"
+    false
+  fi
+  if ! grep -q 'clear the finalizer by hand' "$tmp/err"; then
+    echo "FAIL: the degraded path did not say what to do about it"
+    cat "$tmp/err"
+    false
+  fi
+  rm -rf "$tmp"
+}
+
+@test "kafka pre-delete hook exits non-zero on any other kubectl failure" {
+  # A Forbidden, an unreachable apiserver or a webhook rejection must NOT be
+  # read as the timeout case. Here the non-zero exit is the safety net: Helm
+  # stops before deleting the topic operator, so the topics keep something that
+  # can clear their finalizer.
+  tmp=$(mktemp -d)
+  write_fake_kubectl "$tmp"
+  render_hook "$KAFKA_CHART" kafka-test tenant-test kafka-test-pre-delete "$tmp/hook.sh"
+
+  export KLOG="$tmp/calls"
+  export DELETE_RC=1
+  export DELETE_OUT='Error from server (Forbidden): kafkatopics.kafka.strimzi.io is forbidden'
+  rc=0
+  PATH="$tmp:$PATH" sh "$tmp/hook.sh" > "$tmp/out" 2> "$tmp/err" || rc=$?
+  if [ "$rc" -eq 0 ]; then
+    echo "FAIL: hook exited 0 on a Forbidden, so Helm would remove the topic operator"
+    cat "$tmp/out" "$tmp/err"
+    false
+  fi
+  if ! grep -q '^ERROR: deleting KafkaTopics failed' "$tmp/err"; then
+    echo "FAIL: the failure was not reported as an error"
+    cat "$tmp/err"
+    false
+  fi
+  rm -rf "$tmp"
+}
+
+@test "kafka pre-delete hook deletes this release's node pools after its topics" {
+  tmp=$(mktemp -d)
+  write_fake_kubectl "$tmp"
+  render_hook "$KAFKA_CHART" kafka-test tenant-test kafka-test-pre-delete "$tmp/hook.sh"
+
+  export KLOG="$tmp/calls"
+  export DELETE_RC=0
+  export DELETE_OUT='kafkatopic.kafka.strimzi.io "t" deleted'
+  export POOL_RC=0
+  export POOL_OUT='kafkanodepool.kafka.strimzi.io "b-0" deleted'
+  rc=0
+  PATH="$tmp:$PATH" sh "$tmp/hook.sh" > "$tmp/out" 2> "$tmp/err" || rc=$?
+  if [ "$rc" -ne 0 ]; then
+    echo "FAIL: hook exited $rc on a clean delete"
+    cat "$tmp/out" "$tmp/err"
+    false
+  fi
+  # Anchored like the topic selector above: the trailing space keeps the
+  # sibling release kafka-test2 out.
+  pool_line=$(grep -n -- "delete kafkanodepools.kafka.strimzi.io -l strimzi.io/cluster=kafka-test " "$tmp/calls" | cut -d: -f1)
+  topic_line=$(grep -n -- "delete kafkatopics.kafka.strimzi.io -l strimzi.io/cluster=kafka-test " "$tmp/calls" | cut -d: -f1)
+  if [ -z "$pool_line" ] || [ -z "$topic_line" ]; then
+    echo "FAIL: expected one release-scoped delete of each kind"
+    cat "$tmp/calls"
+    false
+  fi
+  # The topic operator clears topic finalizers through the brokers, so the
+  # brokers have to outlive the topic delete.
+  if [ "$pool_line" -le "$topic_line" ]; then
+    echo "FAIL: the node pools were deleted before the topics"
+    cat "$tmp/calls"
+    false
+  fi
+  if ! grep -q -- "kafkanodepools.* --wait=false" "$tmp/calls"; then
+    echo "FAIL: the node pool delete waits, which spends the Job's deadline"
+    cat "$tmp/calls"
+    false
+  fi
+  rm -rf "$tmp"
+}
+
+@test "kafka pre-delete hook still deletes the node pools after a topic wait timeout" {
+  # The timeout branch lets the uninstall finish. Skipping the pools there
+  # would leave the brokers running with nothing left to remove them.
+  tmp=$(mktemp -d)
+  write_fake_kubectl "$tmp"
+  render_hook "$KAFKA_CHART" kafka-test tenant-test kafka-test-pre-delete "$tmp/hook.sh"
+
+  export KLOG="$tmp/calls"
+  export DELETE_RC=1
+  export DELETE_OUT='error: timed out waiting for the condition on kafkatopics/kafka-test-orders'
+  export POOL_RC=0
+  export POOL_OUT='kafkanodepool.kafka.strimzi.io "b-0" deleted'
+  rc=0
+  PATH="$tmp:$PATH" sh "$tmp/hook.sh" > "$tmp/out" 2> "$tmp/err" || rc=$?
+  if [ "$rc" -ne 0 ]; then
+    echo "FAIL: hook exited $rc on a wait timeout"
+    cat "$tmp/out" "$tmp/err"
+    false
+  fi
+  if ! grep -q -- "delete kafkanodepools.kafka.strimzi.io -l strimzi.io/cluster=kafka-test " "$tmp/calls"; then
+    echo "FAIL: the node pools were skipped after the topic wait timed out"
+    cat "$tmp/calls"
+    false
+  fi
+  rm -rf "$tmp"
+}
+
+@test "kafka pre-delete hook exits 0 when the KafkaNodePool CRD is absent" {
+  for msg in 'error: the server doesn'"'"'t have a resource type "kafkanodepools"' \
+             'error: no matches for kind "KafkaNodePool" in version "kafka.strimzi.io/v1beta2"'; do
+    tmp=$(mktemp -d)
+    write_fake_kubectl "$tmp"
+    render_hook "$KAFKA_CHART" kafka-test tenant-test kafka-test-pre-delete "$tmp/hook.sh"
+
+    export KLOG="$tmp/calls"
+    export DELETE_RC=0
+    export DELETE_OUT='kafkatopic.kafka.strimzi.io "t" deleted'
+    export POOL_RC=1
+    export POOL_OUT="$msg"
+    rc=0
+    PATH="$tmp:$PATH" sh "$tmp/hook.sh" > "$tmp/out" 2> "$tmp/err" || rc=$?
+    if [ "$rc" -ne 0 ]; then
+      echo "FAIL: hook exited $rc on an absent KafkaNodePool CRD, wedging the uninstall"
+      cat "$tmp/out" "$tmp/err"
+      false
+    fi
+    if ! grep -q 'KafkaNodePool CRD absent' "$tmp/out"; then
+      echo "FAIL: the absent CRD was not reported as such"
+      cat "$tmp/out"
+      false
+    fi
+    rm -rf "$tmp"
+  done
+}
+
+@test "kafka pre-delete hook exits non-zero when the node pool delete fails" {
+  # Once the uninstall finishes, Helm never runs this hook for the release
+  # again, so a pool left here is left for good. A non-zero exit stops the
+  # uninstall before it deletes anything, and helm-controller retries it.
+  tmp=$(mktemp -d)
+  write_fake_kubectl "$tmp"
+  render_hook "$KAFKA_CHART" kafka-test tenant-test kafka-test-pre-delete "$tmp/hook.sh"
+
+  export KLOG="$tmp/calls"
+  export DELETE_RC=0
+  export DELETE_OUT='kafkatopic.kafka.strimzi.io "t" deleted'
+  export POOL_RC=1
+  export POOL_OUT='Error from server (Forbidden): kafkanodepools.kafka.strimzi.io is forbidden'
+  rc=0
+  PATH="$tmp:$PATH" sh "$tmp/hook.sh" > "$tmp/out" 2> "$tmp/err" || rc=$?
+  if [ "$rc" -eq 0 ]; then
+    echo "FAIL: hook exited 0 on a Forbidden, so the uninstall would finish and leave the pools"
+    cat "$tmp/out" "$tmp/err"
+    false
+  fi
+  if ! grep -q '^ERROR: deleting KafkaNodePools failed' "$tmp/err"; then
+    echo "FAIL: the failure was not reported as an error"
+    cat "$tmp/err"
+    false
+  fi
+  rm -rf "$tmp"
+}
diff --git a/hack/kafka-suite-pvc-cleanup_test.bats b/hack/kafka-suite-pvc-cleanup_test.bats
new file mode 100644
index 0000000000..8329c3110a
--- /dev/null
+++ b/hack/kafka-suite-pvc-cleanup_test.bats
@@ -0,0 +1,50 @@
+#!/usr/bin/env bats
+# The kafka chart sets deleteClaim: false on both node pools, so deleting a
+# Kafka app leaves its broker and controller PVCs behind on purpose. The e2e
+# suite has to delete them itself, after the app is gone (a mounted PVC cannot
+# finish deleting), or every later suite in the sandbox runs short of LINSTOR
+# space. These tests read hack/e2e-chainsaw/kafka/chainsaw-test.yaml, because
+# running it needs a cluster.
+
+load test_helper
+
+SUITE=hack/e2e-chainsaw/kafka/chainsaw-test.yaml
+
+@test "kafka test deletes its PVCs in the cleanup of the step that applies the app" {
+  # Chainsaw runs a step's cleanup ops after that step's own cleaner has
+  # deleted what the step applied, on a passing and a failing run alike.
+  clusters=$(yq 'select(.metadata.name == "kafka") | .spec.steps[]
+    | select([.try[]? | select(.apply.file == "kafka.yaml")] | length > 0)
+    | .cleanup[]?.delete.ref | select(.apiVersion == "v1" and .kind == "PersistentVolumeClaim")
+    | .labels."strimzi.io/cluster"' "$SUITE")
+
+  if ! printf '%s\n' "$clusters" | grep -qx kafka-test; then
+    echo "kafka test does not delete the PVCs of cluster kafka-test after deleting the app" >&2
+    return 1
+  fi
+}
+
+@test "kafka backup round-trip deletes each cluster's PVCs after its app cleanup" {
+  # examples/backups/kafka creates two apps, kafka-test and kafka-restore; the
+  # chart names their Strimzi clusters with a kafka- prefix.
+  # One line per finally op, in source order, which is the order they run in.
+  # yq emits the facts and awk names the op, because if/then/else only reached
+  # yq in v4.54.1 and older ones reject the expression. The test document is
+  # cut out first: in a multi-document file yq also evaluates the array literal
+  # against the documents the select drops, and prints a line for each.
+  sequence=$(yq 'select(.metadata.name == "kafka-2-backup-roundtrip")' "$SUITE" \
+    | yq '.spec.steps[].finally[]?
+      | [((.script.content // "") | test("examples/backups/kafka/cleanup.sh") | tostring),
+         ((.delete.ref.apiVersion // "") + "/" + (.delete.ref.kind // "")),
+         (.delete.ref.labels."strimzi.io/cluster" // "")] | join(" ")' \
+    | awk '$1 == "true" { print "app-cleanup"; next }
+      $2 == "v1/PersistentVolumeClaim" { print "pvc:" $3; next }
+      { print "other" }')
+
+  for cluster in kafka-kafka-test kafka-kafka-restore; do
+    if ! printf '%s\n' "$sequence" | awk 'seen; /^app-cleanup$/ { seen = 1 }' | grep -qx "pvc:${cluster}"; then
+      echo "kafka-2-backup-roundtrip does not delete the PVCs of cluster ${cluster} after cleanup.sh: ${sequence}" >&2
+      return 1
+    fi
+  done
+}
diff --git a/hack/kafka-topic-backup-demo-helpers.bats b/hack/kafka-topic-backup-demo-helpers.bats
new file mode 100644
index 0000000000..17c1e08f08
--- /dev/null
+++ b/hack/kafka-topic-backup-demo-helpers.bats
@@ -0,0 +1,155 @@
+#!/usr/bin/env bats
+# Unit tests for kafka_run in examples/backups/kafka/00-helpers.sh, the helper
+# the kafka topic-data round trip seeds and verifies topics through.
+#
+# kubectl and the Kafka CLI are stub executables on PATH. The kubectl stub
+# answers the calls kafka_run makes -- get the CLI Pod's phase and owner label,
+# create it when absent, wait for it, and `exec` into it -- and runs the exec'd
+# snippet locally against the kafka-topics.sh stub. Any other kubectl call, a
+# throwaway `kubectl run -i` Pod among them, fails the test.
+#
+# cozytest.sh's runner recognizes only @test blocks and a bare `}`, and rewrites
+# a column-0 `}` into `return 0`, so the helpers below close on an indented
+# brace to keep run_replication_factor's exit status.
+
+load test_helper
+
+make_stubs() {
+    stub=$(mktemp -d)
+    cat > "$stub/kubectl" <<'EOF'
+#!/bin/bash
+printf '%s\n' "$*" >> "$STUB_DIR/kubectl.argv"
+case "$1 $2 $3" in
+"-n tenant-root get")
+    [ -n "${STUB_GET_ERROR:-}" ] && { echo "Unable to connect to the server: i/o timeout" >&2; exit 1; }
+    case "$*" in
+    *"jsonpath={.status.phase}"*)   printf '%s' "${STUB_PHASE-Running}" ;;
+    *"jsonpath={.metadata.labels"*) printf '%s' "${STUB_OWNER-kafka}" ;;
+    *) echo "unexpected kubectl get: $*" >&2; exit 98 ;;
+    esac
+    exit 0 ;;
+"-n tenant-root delete")
+    exit 0 ;;
+"-n tenant-root run")
+    case "$*" in
+    *" --rm"*|*" -i "*) echo "kafka_run read through a throwaway attached Pod: $*" >&2; exit 94 ;;
+    esac
+    [ -z "${STUB_PHASE-Running}" ] && exit 0
+    echo "kafka_run started a Pod though a Ready one it owns exists" >&2; exit 95 ;;
+"-n tenant-root wait")
+    exit 0 ;;
+"-n tenant-root exec")
+    [ -n "${STUB_EXEC_ERROR:-}" ] && { echo "error: unable to upgrade connection: container not found" >&2; exit 1; }
+    shift 6   # drop: -n tenant-root exec -i <pod> --
+    if [ "$1" != "bash" ] || [ "$2" != "-c" ]; then
+        echo "unexpected exec payload: $*" >&2; exit 96
+    fi
+    shift 2
+    exec bash -c "$1" ;;
+*)
+    echo "unexpected kubectl call: $*" >&2; exit 97 ;;
+esac
+EOF
+    cat > "$stub/kafka-topics.sh" <<'EOF'
+#!/bin/sh
+printf 'Topic: orders\tTopicId: x\tPartitionCount: 3\tReplicationFactor: 2\tConfigs: \n'
+EOF
+    chmod +x "$stub/kubectl" "$stub/kafka-topics.sh"
+    : > "$stub/kubectl.argv"
+    }
+
+run_replication_factor() {
+    STUB_DIR=$stub STUB_PHASE="${STUB_PHASE-Running}" STUB_OWNER="${STUB_OWNER-kafka}" \
+        STUB_EXEC_ERROR="${STUB_EXEC_ERROR:-}" STUB_GET_ERROR="${STUB_GET_ERROR:-}" \
+        PATH="$stub:$PATH" NAMESPACE=tenant-root \
+        KAFKA_IMAGE=example.test/kafka:unit KAFKA_BIN=$stub TOPIC=orders bash -c '
+        set -euo pipefail
+        . examples/backups/kafka/00-helpers.sh
+        # Read the way the numbered scripts read it: inside a command
+        # substitution, where bash does not apply errexit, so a helper that
+        # only fails under -e would carry on here.
+        rf=$(topic_replication_factor demo)
+        printf "%s\n" "$rf"
+    '
+    }
+
+@test "kafka topic demo reuses a Ready CLI Pod it owns and reads the reply by exec" {
+    make_stubs
+    out=$(run_replication_factor)
+    [ "$out" = "2" ]
+    grep -q 'exec -i kafka-topic-cli -- bash -c' "$stub/kubectl.argv"
+    if grep -q ' run ' "$stub/kubectl.argv"; then
+        echo "a Ready CLI Pod was not reused:" >&2
+        cat "$stub/kubectl.argv" >&2
+        exit 1
+    fi
+}
+
+@test "kafka topic demo creates a restricted CLI Pod when it is absent, then execs into it" {
+    make_stubs
+    export STUB_PHASE=
+    out=$(run_replication_factor)
+    [ "$out" = "2" ]
+    grep -q 'run kafka-topic-cli --image=example.test/kafka:unit' "$stub/kubectl.argv"
+    grep -q 'labels=cozystack.io/backup-demo=kafka' "$stub/kubectl.argv"
+    grep -q '"runAsNonRoot":true' "$stub/kubectl.argv"
+    grep -q '"drop":\["ALL"\]' "$stub/kubectl.argv"
+    grep -q 'exec -i kafka-topic-cli -- bash -c' "$stub/kubectl.argv"
+}
+
+@test "kafka topic demo refuses a same-named Pod it does not own" {
+    make_stubs
+    export STUB_OWNER=kafka-metadata
+    err=$(mktemp)
+    if run_replication_factor 2>"$err"; then
+        echo "kafka_run used a Pod it does not own" >&2
+        exit 1
+    fi
+    grep -q 'does not own it' "$err"
+    if grep -q ' exec ' "$stub/kubectl.argv"; then
+        echo "kafka_run exec'd into a Pod it refused to use" >&2
+        exit 1
+    fi
+}
+
+@test "kafka topic demo touches no Pod when it cannot read the CLI Pod's state" {
+    make_stubs
+    export STUB_GET_ERROR=1
+    err=$(mktemp)
+    if run_replication_factor 2>"$err"; then
+        echo "a failed Pod lookup read as a successful reply" >&2
+        exit 1
+    fi
+    grep -q 'Unable to connect to the server' "$err"
+    if grep -qE ' (delete|run|exec) ' "$stub/kubectl.argv"; then
+        echo "kafka_cli_pod acted on a Pod whose owner it could not read:" >&2
+        cat "$stub/kubectl.argv" >&2
+        exit 1
+    fi
+}
+
+@test "kafka topic demo fails with kubectl's own error when the exec fails" {
+    make_stubs
+    # A flag, not the message: the runner traces the command that passes
+    # STUB_EXEC_ERROR on, into the same stderr the grep below reads, so a
+    # message carried in it would match with the helper's stderr dropped.
+    export STUB_EXEC_ERROR=1
+    err=$(mktemp)
+    if run_replication_factor 2>"$err"; then
+        echo "a failed exec read as a successful empty reply" >&2
+        exit 1
+    fi
+    grep -q 'unable to upgrade connection: container not found' "$err"
+}
+
+@test "kafka topic demo keeps its own CLI Pod when the kafka-metadata demo's name is set" {
+    make_stubs
+    export KAFKA_CLI_POD=kafka-cli
+    out=$(run_replication_factor)
+    [ "$out" = "2" ]
+    grep -q 'exec -i kafka-topic-cli -- bash -c' "$stub/kubectl.argv" || {
+        echo "the kafka-metadata demo's KAFKA_CLI_POD moved the topic demo's Pod:" >&2
+        cat "$stub/kubectl.argv" >&2
+        exit 1
+    }
+}
diff --git a/hack/kafka-topic-backup-strategy.bats b/hack/kafka-topic-backup-strategy.bats
new file mode 100644
index 0000000000..ce233e0d82
--- /dev/null
+++ b/hack/kafka-topic-backup-strategy.bats
@@ -0,0 +1,424 @@
+#!/usr/bin/env bats
+# Behavioural unit test for the Kafka topic-data Job strategy script: the bash
+# body embedded in examples/backups/kafka/01-create-strategy.sh. Its only other
+# coverage is chainsaw/kafka-2-backup-roundtrip, a cluster test that drives the
+# happy path plus one refusal, so the script's fail-closed guards were unpinned:
+# any one of them could be deleted and nothing in the tree would go red. This
+# test EXECUTES the script exactly as step 01 renders it, against stubbed
+# kafka-*.sh (BIN override), a stubbed curl (on PATH) and a directory standing in
+# for S3, with fault injection for the broker behaviours the guards exist for.
+# Same shape as hack/kafka-backup-script.bats.
+#
+# Runner note: hack/cozytest.sh knows only @test + bash - no setup()/teardown(),
+# no run/$status/$output, and a `!`-negated command is exempt from its set -e -
+# so each test calls init_stubs itself, and negative assertions go through
+# expect_fail or an explicit if/return 1.
+
+load test_helper
+
+REPO="$(cd "$(dirname "${BATS_TEST_FILENAME:-$0}")/.." && pwd)"
+EXAMPLE="$REPO/examples/backups/kafka"
+
+# init_stubs renders the strategy through a kubectl stub, lifts the container
+# body out of it, and builds the stub CLIs. Sets STATE, BINDIR, PATHDIR, S3DIR.
+init_stubs() {
+  STATE="$(mktemp -d)"
+  BINDIR="$STATE/bin"; PATHDIR="$STATE/path"; S3DIR="$STATE/s3"
+  mkdir -p "$BINDIR" "$PATHDIR" "$S3DIR" "$STATE/scratch"
+
+  cat > "$PATHDIR/kubectl" <<STUB
+#!/usr/bin/env bash
+cat > "$STATE/rendered.yaml"
+STUB
+  chmod +x "$PATHDIR/kubectl"
+  PATH="$PATHDIR:$PATH" KAFKA_IMAGE=stub/kafka:test bash "$EXAMPLE/01-create-strategy.sh" >/dev/null 2>&1
+  yq '.spec.template.spec.containers[0].args[0]' "$STATE/rendered.yaml" > "$STATE/strategy.sh"
+  grep -q 'kafka-console-producer' "$STATE/strategy.sh"
+
+  # Fake broker: $BROKER/<topic>/rf, one file per partition (p<N>, one record
+  # per line) and an optional begin<N> offset. Set at run time by run_strategy.
+  cat > "$BINDIR/kafka-topics.sh" <<'STUB'
+#!/usr/bin/env bash
+set -eu
+mode=""; topic=""; parts=""; rf=""
+while [ $# -gt 0 ]; do
+  case "$1" in
+    --list) mode=list ;;
+    --describe) mode=describe ;;
+    --create) mode=create ;;
+    --delete) mode=delete ;;
+    --topic) topic="$2"; shift ;;
+    --partitions) parts="$2"; shift ;;
+    --replication-factor) rf="$2"; shift ;;
+    --bootstrap-server) shift ;;
+  esac
+  shift
+done
+# --topic is a Java regex for list/describe/delete; \Q..\E pins a literal.
+# (Closing brace indented on purpose: hack/cozytest.sh rewrites every
+# column-0 "}" line of the .bats file, heredoc bodies included.)
+match() {
+  case "$topic" in
+    '\Q'*'\E') lit="${topic#\\Q}"; lit="${lit%\\E}"; [ "$1" = "$lit" ] ;;
+    *) printf '%s' "$1" | grep -Eqx -- "$topic" ;;
+  esac
+  }
+case "$mode" in
+  list) ls "$BROKER" ;;
+  describe)
+    for d in "$BROKER"/*/; do t="${d%/}"; t="${t##*/}"; match "$t" || continue
+      pc=$(ls "$BROKER/$t" | grep -c '^p[0-9]*$')
+      printf 'Topic: %s\tTopicId: stub\tPartitionCount: %s\tReplicationFactor: %s\tConfigs: \n' "$t" "$pc" "$(cat "$BROKER/$t/rf")"
+    done ;;
+  create)
+    [ -d "$BROKER/$topic" ] && exit 0
+    if [ "$rf" -gt "${BROKERS:-3}" ]; then
+      echo "Error: Replication factor: $rf larger than available brokers: ${BROKERS:-3}." >&2; exit 1
+    fi
+    mkdir -p "$BROKER/$topic"; echo "$rf" > "$BROKER/$topic/rf"
+    i=0; while [ "$i" -lt "$parts" ]; do : > "$BROKER/$topic/p$i"; i=$((i + 1)); done ;;
+  delete) for d in "$BROKER"/*/; do t="${d%/}"; t="${t##*/}"; match "$t" && rm -rf "$BROKER/$t"; done ;;
+esac
+exit 0
+STUB
+
+  # FAULT_SKIP_PARTITION=<topic>:<p> reproduces a partition lost to a leader
+  # election: GetOffsetShell prints the others, logs the skip and exits 0.
+  cat > "$BINDIR/kafka-get-offsets.sh" <<'STUB'
+#!/usr/bin/env bash
+set -eu
+topic=""; when=""
+while [ $# -gt 0 ]; do
+  case "$1" in --topic) topic="$2"; shift ;; --time) when="$2"; shift ;; --bootstrap-server) shift ;; esac
+  shift
+done
+case "$topic" in '\Q'*'\E') lit="${topic#\\Q}"; lit="${lit%\\E}" ;; *) lit="" ;; esac
+for d in "$BROKER"/*/; do t="${d%/}"; t="${t##*/}"
+  if [ -n "$lit" ]; then [ "$t" = "$lit" ] || continue
+  else printf '%s' "$t" | grep -Eqx -- "$topic" || continue; fi
+  for f in "$BROKER/$t"/p*; do p="${f##*/p}"
+    if [ "${FAULT_SKIP_PARTITION:-}" = "$t:$p" ]; then
+      echo "Skip getting offsets for topic-partition $t-$p due to error: leader not available" >&2; continue
+    fi
+    begin=0; [ -f "$BROKER/$t/begin$p" ] && begin=$(cat "$BROKER/$t/begin$p")
+    end=$((begin + $(wc -l < "$f")))
+    if [ "$when" = -1 ]; then echo "$t:$p:$end"; else echo "$t:$p:$begin"; fi
+  done
+done
+STUB
+
+  # FAULT_SHORT_READ=<n> caps every drain at n lines, the way a --timeout-ms
+  # expiry does, and still exits 0.
+  cat > "$BINDIR/kafka-console-consumer.sh" <<'STUB'
+#!/usr/bin/env bash
+set -eu
+topic=""; p=""; off=0; max=0
+while [ $# -gt 0 ]; do
+  case "$1" in
+    --topic) topic="$2"; shift ;; --partition) p="$2"; shift ;; --offset) off="$2"; shift ;;
+    --max-messages) max="$2"; shift ;; --bootstrap-server|--timeout-ms|--property) shift ;;
+  esac
+  shift
+done
+begin=0; [ -f "$BROKER/$topic/begin$p" ] && begin=$(cat "$BROKER/$topic/begin$p")
+tail -n +$((off - begin + 1)) "$BROKER/$topic/p$p" | head -n "${FAULT_SHORT_READ:-$max}"
+STUB
+
+  # FAULT_DROP_WRITES=1 is a broker rejecting every acks=all write: the
+  # console producer logs each one and exits 0 regardless.
+  cat > "$BINDIR/kafka-console-producer.sh" <<'STUB'
+#!/usr/bin/env bash
+set -eu
+topic=""
+while [ $# -gt 0 ]; do
+  case "$1" in --topic) topic="$2"; shift ;; --bootstrap-server|--property) shift ;; esac
+  shift
+done
+[ -d "$BROKER/$topic" ] || { echo "no such topic $topic" >&2; exit 1; }
+pc=$(ls "$BROKER/$topic" | grep -c '^p[0-9]*$')
+while IFS= read -r line; do
+  if [ "${FAULT_DROP_WRITES:-0}" = 1 ]; then
+    echo "ERROR Error when sending message to topic $topic: NOT_ENOUGH_REPLICAS" >&2; continue
+  fi
+  key="${line%%	*}"
+  h=$(printf '%s' "$key" | cksum | cut -d' ' -f1)
+  printf '%s\n' "$line" >> "$BROKER/$topic/p$((h % pc))"
+done
+exit 0
+STUB
+
+  # MISR=<n> is the broker-level min.insync.replicas the effective topic
+  # config reports through --describe --all.
+  cat > "$BINDIR/kafka-configs.sh" <<'STUB'
+#!/usr/bin/env bash
+set -eu
+printf '  min.insync.replicas=%s sensitive=false synonyms={DEFAULT_CONFIG:min.insync.replicas=%s}\n' "${MISR:-1}" "${MISR:-1}"
+STUB
+
+  # curl stub: records argv, PUT stores the body under the object key, GET
+  # serves it back.
+  cat > "$PATHDIR/curl" <<'STUB'
+#!/usr/bin/env bash
+set -eu
+printf '%s\n' "$*" >> "$STATE/curl_args"
+up=""; out=""; url=""; prev=""
+for a in "$@"; do
+  case "$prev" in --upload-file) up="$a" ;; -o) out="$a" ;; esac
+  case "$a" in http://*|https://*) url="$a" ;; esac
+  prev="$a"
+done
+[ -n "$url" ] || { echo "curl stub: no url" >&2; exit 2; }
+key="${url#*://}"; key="${key#*/}"
+mkdir -p "$S3DIR/$(dirname "$key")"
+if [ -n "$up" ]; then cp "$up" "$S3DIR/$key"; exit 0; fi
+[ -f "$S3DIR/$key" ] || { echo "curl: (22) The requested URL returned error: 404" >&2; exit 22; }
+cp "$S3DIR/$key" "$out"
+STUB
+  chmod +x "$BINDIR"/*.sh "$PATHDIR/curl"
+}
+
+# run_strategy <mode> [VAR=value ...]: runs the rendered script against the
+# broker at $BROKER (default $STATE/broker); its output lands in $STATE/log.
+# The explicit return keeps the script's exit code: hack/cozytest.sh appends a
+# `return 0` to every function in this file.
+run_strategy() {
+  local mode="$1"; shift
+  env STATE="$STATE" BROKER="${BROKER:-$STATE/broker}" S3DIR="$S3DIR" \
+      BIN="$BINDIR" SCRATCH="$STATE/scratch" CA_FILE="$STATE/ca.crt" PATH="$PATHDIR:$PATH" \
+      MODE="$mode" BOOTSTRAP="kafka-x-kafka-bootstrap.tenant-root.svc:9092" \
+      S3_ENDPOINT="seaweedfs-s3.tenant-root.svc:8333" S3_REGION="us-east-1" S3_BUCKET="bkt" \
+      AWS_ACCESS_KEY_ID="k" AWS_SECRET_ACCESS_KEY="s" \
+      SRC_BACKUP="kafka-test" SRC_RESTORE="kafka-test" SRC_NAMESPACE="tenant-root" \
+      TOPICS="${TOPICS-orders.v1}" REPLICATION_FACTOR="${REPLICATION_FACTOR-}" "$@" \
+      bash "$STATE/strategy.sh" > "$STATE/log" 2>&1 || return $?
+}
+
+# seed_broker <dir>: orders.v1 with 3 partitions, rf=2 and 30 keyed records,
+# plus the decoy orders-v1 (1 partition, rf=2, 5 records) that "orders.v1"
+# matches as a regex and not as a literal.
+seed_broker() {
+  rm -rf "$1"; mkdir -p "$1/orders.v1" "$1/orders-v1"
+  echo 2 > "$1/orders.v1/rf"; echo 2 > "$1/orders-v1/rf"
+  : > "$1/orders.v1/p0"; : > "$1/orders.v1/p1"; : > "$1/orders.v1/p2"
+  local i
+  for i in $(seq 1 30); do printf 'k-%s\torder-%s\n' "$i" "$i" >> "$1/orders.v1/p$((i % 3))"; done
+  for i in $(seq 1 5); do printf 'd-%s\tdecoy-%s\n' "$i" "$i"; done > "$1/orders-v1/p0"
+}
+
+# records <broker-dir> <topic>: record count over the topic's partitions.
+records() {
+  cat "$1/$2"/p* | wc -l | tr -d ' '
+}
+
+# backup_then_target: seeds a source, takes a backup into the fake S3, and
+# leaves an empty target broker at $STATE/tgt for the restore under test.
+backup_then_target() {
+  seed_broker "$STATE/src"
+  BROKER="$STATE/src" run_strategy backup
+  rm -rf "$STATE/tgt"; mkdir -p "$STATE/tgt"
+}
+
+expect_fail() {
+  if "$@"; then
+    echo "expected a non-zero exit, got success; log:" >&2; cat "$STATE/log" >&2; return 1
+  fi
+  return 0
+}
+
+expect_log() {
+  grep -qF -- "$1" "$STATE/log" || { echo "log lacks: $1" >&2; cat "$STATE/log" >&2; return 1; }
+}
+
+expect_no_log() {
+  if grep -qF -- "$1" "$STATE/log"; then echo "log unexpectedly has: $1" >&2; cat "$STATE/log" >&2; return 1; fi
+  return 0
+}
+
+# ---- backup ---------------------------------------------------------------
+
+@test "backup records each topic's partition count and replication factor and leaves the regex sibling alone" {
+  init_stubs; seed_broker "$STATE/broker"
+  run_strategy backup
+  expect_log "orders.v1: 3 partition(s), replication factor 2"
+  mkdir -p "$STATE/x"; tar -C "$STATE/x" -xf "$S3DIR/bkt/tenant-root/kafka-test/kafka-topics.tar"
+  [ "$(wc -l < "$STATE/x/manifest.txt" | tr -d ' ')" = 3 ]
+  grep -qE '^orders\.v1 0 0 [0-9]+ 2$' "$STATE/x/manifest.txt"
+  [ "$(cat "$STATE/x"/data-orders.v1-*.tsv | wc -l | tr -d ' ')" = 30 ]
+  # A stripped \Q pins "orders.v1" to its regex meaning and pulls orders-v1 in.
+  [ ! -e "$STATE/x/data-orders-v1-0.tsv" ]
+  expect_no_log "orders-v1"
+}
+
+@test "backup refuses an offset listing short of the partition count and uploads nothing" {
+  init_stubs; seed_broker "$STATE/broker"
+  expect_fail run_strategy backup FAULT_SKIP_PARTITION=orders.v1:1
+  expect_log "offset listing returned 2 of 3 partition(s) for orders.v1; refusing to upload an incomplete backup"
+  [ ! -e "$S3DIR/bkt/tenant-root/kafka-test/kafka-topics.tar" ]
+}
+
+@test "backup refuses a partial drain and uploads nothing" {
+  init_stubs; seed_broker "$STATE/broker"
+  expect_fail run_strategy backup FAULT_SHORT_READ=1
+  expect_log "partial drain on orders.v1:"
+  [ ! -e "$S3DIR/bkt/tenant-root/kafka-test/kafka-topics.tar" ]
+}
+
+@test "backup refuses a duplicate, a glob and an illegal topic name" {
+  init_stubs; seed_broker "$STATE/broker"
+  expect_fail run_strategy backup TOPICS="orders.v1, orders.v1"
+  expect_log "topic orders.v1 is listed more than once"
+  # With globbing on, "*" would expand against the working directory and the
+  # refusal would name whatever file it found instead of the parameter.
+  expect_fail run_strategy backup TOPICS='*'
+  expect_log "topic name '*' carries a character outside Kafka's"
+  expect_fail run_strategy backup TOPICS='orders.v1 a;b'
+  expect_log "topic name 'a;b' carries a character outside Kafka's"
+  [ ! -e "$S3DIR/bkt/tenant-root/kafka-test/kafka-topics.tar" ]
+}
+
+@test "all-topics backup skips double-underscore internals and keeps single-underscore user topics" {
+  init_stubs; seed_broker "$STATE/broker"
+  mkdir -p "$STATE/broker/__consumer_offsets" "$STATE/broker/_schemas"
+  echo 3 > "$STATE/broker/__consumer_offsets/rf"; : > "$STATE/broker/__consumer_offsets/p0"
+  echo 2 > "$STATE/broker/_schemas/rf"; printf 's-1\tschema-1\n' > "$STATE/broker/_schemas/p0"
+  run_strategy backup TOPICS=
+  expect_log "backing up topics [ _schemas orders-v1 orders.v1]"
+  mkdir -p "$STATE/x"; tar -C "$STATE/x" -xf "$S3DIR/bkt/tenant-root/kafka-test/kafka-topics.tar"
+  [ -e "$STATE/x/data-_schemas-0.tsv" ]
+  [ -e "$STATE/x/data-orders-v1-0.tsv" ]
+  [ ! -e "$STATE/x/data-__consumer_offsets-0.tsv" ]
+}
+
+# ---- restore --------------------------------------------------------------
+
+@test "restore recreates the topic with the captured replication factor and replays every record" {
+  init_stubs; backup_then_target
+  BROKER="$STATE/tgt" run_strategy restore MISR=2
+  expect_log "replaying orders.v1"
+  expect_log "orders.v1: restored 30 record(s)"
+  expect_log "restore complete"
+  [ "$(cat "$STATE/tgt/orders.v1/rf")" = 2 ]
+  [ "$(records "$STATE/tgt" orders.v1)" = 30 ]
+  # The replay re-partitions by key, so compare the record sets, not the files.
+  cat "$STATE/src/orders.v1"/p* | sort > "$STATE/src.sorted"
+  cat "$STATE/tgt/orders.v1"/p* | sort > "$STATE/tgt.sorted"
+  diff "$STATE/src.sorted" "$STATE/tgt.sorted"
+}
+
+@test "replicationFactor overrides the captured value, and one the target cannot host fails at create" {
+  init_stubs; backup_then_target
+  BROKER="$STATE/tgt" run_strategy restore REPLICATION_FACTOR=1 BROKERS=1
+  expect_log "restore complete"
+  [ "$(cat "$STATE/tgt/orders.v1/rf")" = 1 ]
+  rm -rf "$STATE/tgt"; mkdir -p "$STATE/tgt"
+  BROKER="$STATE/tgt" expect_fail run_strategy restore BROKERS=1
+  expect_log "larger than available brokers"
+  expect_no_log "replaying"
+}
+
+@test "restore refuses a populated target before replaying anything" {
+  init_stubs; backup_then_target
+  BROKER="$STATE/tgt" run_strategy restore MISR=2
+  [ "$(records "$STATE/tgt" orders.v1)" = 30 ]
+  BROKER="$STATE/tgt" expect_fail run_strategy restore MISR=2
+  expect_log "topic orders.v1 already holds 30 record(s)"
+  expect_no_log "replaying"
+  [ "$(records "$STATE/tgt" orders.v1)" = 30 ]
+}
+
+@test "restore refuses a pre-replay listing short of the partition count instead of reading it as empty" {
+  init_stubs; backup_then_target
+  # A live topic whose records sit in one partition: with that partition
+  # dropped from the listing, the surviving partitions sum to zero and only
+  # the count guard stands between the replay and a second copy.
+  mkdir -p "$STATE/tgt/orders.v1"; echo 2 > "$STATE/tgt/orders.v1/rf"
+  : > "$STATE/tgt/orders.v1/p1"; : > "$STATE/tgt/orders.v1/p2"
+  printf 'live-1\tx\nlive-2\tx\nlive-3\tx\n' > "$STATE/tgt/orders.v1/p0"
+  BROKER="$STATE/tgt" expect_fail run_strategy restore MISR=2 FAULT_SKIP_PARTITION=orders.v1:0
+  expect_log "offset listing returned 2 of 3 partition(s) for orders.v1; refusing to act on an incomplete listing"
+  expect_no_log "replaying"
+  [ "$(records "$STATE/tgt" orders.v1)" = 3 ]
+}
+
+@test "restore refuses a pre-existing topic with a different partition count or replication factor" {
+  init_stubs; backup_then_target
+  mkdir -p "$STATE/tgt/orders.v1"; echo 2 > "$STATE/tgt/orders.v1/rf"
+  : > "$STATE/tgt/orders.v1/p0"; : > "$STATE/tgt/orders.v1/p1"
+  BROKER="$STATE/tgt" expect_fail run_strategy restore MISR=2
+  expect_log "topic orders.v1 has 2 partition(s), backup recorded 3"
+  rm -rf "$STATE/tgt"; mkdir -p "$STATE/tgt/orders.v1"; echo 1 > "$STATE/tgt/orders.v1/rf"
+  : > "$STATE/tgt/orders.v1/p0"; : > "$STATE/tgt/orders.v1/p1"; : > "$STATE/tgt/orders.v1/p2"
+  BROKER="$STATE/tgt" expect_fail run_strategy restore MISR=2
+  expect_log "topic orders.v1 has replication factor 1, restore expects 2"
+  expect_no_log "replaying"
+}
+
+@test "restore refuses a replication factor below the broker's min.insync.replicas before replaying" {
+  init_stubs; backup_then_target
+  # A single-broker source's rf=1 backup restored into a two-broker target,
+  # whose chart-level min.insync.replicas is 2.
+  BROKER="$STATE/tgt" expect_fail run_strategy restore REPLICATION_FACTOR=1 MISR=2
+  expect_log "topic orders.v1 has replication factor 1 but the broker requires min.insync.replicas=2"
+  expect_log "Set replicationFactor to at least 2"
+  expect_no_log "replaying"
+  [ "$(records "$STATE/tgt" orders.v1)" = 0 ]
+}
+
+@test "restore fails on writes the broker rejected" {
+  init_stubs; backup_then_target
+  BROKER="$STATE/tgt" expect_fail run_strategy restore MISR=2 FAULT_DROP_WRITES=1
+  expect_log "restore verification failed for orders.v1: topic holds 0 record(s), backup recorded 30"
+}
+
+# repack <edit-command>: unpacks the uploaded tarball, runs the edit inside it,
+# packs it back, and resets the target - the untrusted-tarball cases.
+repack() {
+  rm -rf "$STATE/x"; mkdir -p "$STATE/x"
+  tar -C "$STATE/x" -xf "$S3DIR/bkt/tenant-root/kafka-test/kafka-topics.tar"
+  (cd "$STATE/x" && eval "$1")
+  tar -C "$STATE/x" -cf "$S3DIR/bkt/tenant-root/kafka-test/kafka-topics.tar" .
+  rm -rf "$STATE/tgt"; mkdir -p "$STATE/tgt"
+}
+
+@test "restore refuses a tarball whose manifest and data files disagree, before touching the target" {
+  init_stubs; backup_then_target
+  repack 'cp data-orders.v1-0.tsv data-orders.v1-9.tsv'
+  BROKER="$STATE/tgt" expect_fail run_strategy restore MISR=2
+  expect_log "data file data-orders.v1-9.tsv, which the manifest does not list"
+  repack 'rm data-orders.v1-9.tsv data-orders.v1-1.tsv'
+  BROKER="$STATE/tgt" expect_fail run_strategy restore MISR=2
+  expect_log "but carries no data file for it"
+  [ ! -d "$STATE/tgt/orders.v1" ]
+  repack 'printf "orders.v1 0 0 10\n" > manifest.txt'
+  BROKER="$STATE/tgt" expect_fail run_strategy restore MISR=2
+  expect_log "non-numeric field ''"
+  # Lists exactly the data files left by the previous repack (partitions 0
+  # and 2), so the replication-factor disagreement is what fires.
+  repack 'printf "orders.v1 0 0 10 2\norders.v1 2 0 10 1\n" > manifest.txt'
+  BROKER="$STATE/tgt" expect_fail run_strategy restore MISR=2
+  expect_log "manifest lists orders.v1 with replication factors 2 and 1"
+  repack ': > manifest.txt'
+  BROKER="$STATE/tgt" expect_fail run_strategy restore MISR=2
+  expect_log "manifest is empty"
+  # A topic name that is a glob would otherwise iterate the working directory.
+  repack 'printf "* 0 0 0 1\n" > manifest.txt; rm -f data-*.tsv'
+  BROKER="$STATE/tgt" expect_fail run_strategy restore MISR=2
+  expect_log "topic name '*' carries a character outside Kafka's"
+  expect_no_log "replaying"
+  [ -z "$(ls "$STATE/tgt")" ]
+}
+
+# ---- S3 transport -----------------------------------------------------------
+
+@test "S3 calls verify against the projected CA when present and never pass -k" {
+  init_stubs; seed_broker "$STATE/broker"
+  printf 'STUB PEM\n' > "$STATE/ca.crt"
+  run_strategy backup
+  grep -qF -- "--cacert $STATE/ca.crt --connect-to seaweedfs-s3.tenant-root.svc:443:seaweedfs-s3.tenant-root.svc:8333 --aws-sigv4" "$STATE/curl_args"
+  rm -f "$STATE/ca.crt" "$STATE/curl_args"
+  run_strategy backup
+  grep -qF -- "-fsS --connect-to seaweedfs-s3.tenant-root.svc:443" "$STATE/curl_args"
+  if grep -qE -- '(^| )-k( |$)|--cacert' "$STATE/curl_args"; then
+    echo "unexpected TLS flags without a CA file: $(cat "$STATE/curl_args")" >&2; return 1
+  fi
+}
diff --git a/hack/kamaji-crds-schema.bats b/hack/kamaji-crds-schema.bats
new file mode 100644
index 0000000000..afcc909a13
--- /dev/null
+++ b/hack/kamaji-crds-schema.bats
@@ -0,0 +1,25 @@
+#!/usr/bin/env bats
+# The kamaji package ships its CRDs from charts/kamaji-crds/templates/, which
+# read their schema with .Files.Get from charts/kamaji-crds/hack/. Helm skips
+# .helmignore when it reads a chart out of an archive and honours it when it
+# reads one out of a directory, so a pattern matching that hack/ directory
+# leaves the cluster with full schemas and every local render, lint and package
+# with a CRD whose spec is empty. That split hides schema defects from every
+# check that runs before a cluster sees the chart, which is all of ours.
+#
+# The package path is relative because both runners invoke these from the
+# repository root, as the neighbouring render tests assume too.
+
+load test_helper
+
+@test "kamaji CRD templates render their schema" {
+  rendered=$(helm template kamaji packages/system/kamaji --namespace cozy-kamaji)
+
+  for crd in tenantcontrolplanes datastores kubeconfiggenerators; do
+    versions=$(printf '%s\n' "$rendered" | yq -r "select(.metadata.name == \"$crd.kamaji.clastix.io\") | .spec.versions | length")
+    [ "$versions" -gt 0 ]
+  done
+
+  spec_props=$(printf '%s\n' "$rendered" | yq -r 'select(.metadata.name == "tenantcontrolplanes.kamaji.clastix.io") | .spec.versions[0].schema.openAPIV3Schema.properties.spec.properties | length')
+  [ "$spec_props" -gt 0 ]
+}
diff --git a/hack/kubectl-wait-retry_test.bats b/hack/kubectl-wait-retry_test.bats
new file mode 100644
index 0000000000..fefe90a8bf
--- /dev/null
+++ b/hack/kubectl-wait-retry_test.bats
@@ -0,0 +1,65 @@
+#!/usr/bin/env bats
+# -----------------------------------------------------------------------------
+# Unit tests for kubectl_wait_retry in hack/e2e-chainsaw/_lib/run-kubernetes.sh
+#
+# The wrapper exists to retry `kubectl wait` against a curated allowlist of
+# transient server errors (etcd leader flap et al.) while letting real failures
+# (NotFound, --timeout expired) surface. The chainsaw scripts source the lib
+# under `set -eu`, where a bare `_out=$(kubectl wait ...)` on a failing wait
+# aborts the whole script before the retry loop runs -- silently, since stderr
+# is captured into the substitution. These tests execute the wrapper in a
+# `sh -eu` subshell, exactly as chainsaw runs it, against a fake kubectl.
+#
+# CI runs this file under Bats through `make bats-unit-tests`. It also remains
+# compatible with the legacy `hack/cozytest.sh` translator, whose awk parser
+# recognizes only @test blocks and a bare `}` on its own line. The tests avoid
+# `run` and `$status` for that compatibility path and use direct shell assertions.
+# Run with: bats hack/kubectl-wait-retry_test.bats
+# -----------------------------------------------------------------------------
+
+load test_helper
+
+FAKEBIN="$PWD/hack/testdata/kubectl-wait-retry"
+
+prep() {
+  chmod +x "$FAKEBIN/kubectl"
+  WORK=$(mktemp -d)
+  export FAKE_CMDLOG="$WORK/cmdlog"
+  : > "$FAKE_CMDLOG"
+}
+
+@test "a transient etcd error is retried under set -eu instead of silently killing the script" {
+  prep
+  export FAKE_MODE=transient-once
+  rc=0
+  out=$(PATH="$FAKEBIN:$PATH" sh -euc '
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    kubectl_wait_retry deploy x -n tenant-test --for=condition=available
+    echo SCRIPT-REACHED-END
+  ' 2>&1) || rc=$?
+  echo "$out"
+  # The wrapper retried past the transient error and the sourcing script lived.
+  [ "$rc" -eq 0 ]
+  echo "$out" | grep -q 'retrying'
+  echo "$out" | grep -q 'SCRIPT-REACHED-END'
+  [ "$(grep -c . "$FAKE_CMDLOG")" -eq 2 ]
+  rm -rf "$WORK"
+}
+
+@test "NotFound is not retried, fails the script, and its message is printed (fail-loud preserved)" {
+  prep
+  export FAKE_MODE=notfound
+  rc=0
+  out=$(PATH="$FAKEBIN:$PATH" sh -euc '
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    kubectl_wait_retry deploy x -n tenant-test --for=condition=available
+    echo SCRIPT-REACHED-END
+  ' 2>&1) || rc=$?
+  echo "$out"
+  # A real failure still aborts, is not retried, and the error is visible.
+  [ "$rc" -ne 0 ]
+  echo "$out" | grep -q 'NotFound'
+  if echo "$out" | grep -q 'SCRIPT-REACHED-END'; then echo "FAIL: the script must not have run on past a NotFound"; false; fi
+  [ "$(grep -c . "$FAKE_CMDLOG")" -eq 1 ]
+  rm -rf "$WORK"
+}
diff --git a/hack/kubernetes-md0-migration.bats b/hack/kubernetes-md0-migration.bats
new file mode 100644
index 0000000000..2393d346dc
--- /dev/null
+++ b/hack/kubernetes-md0-migration.bats
@@ -0,0 +1,157 @@
+#!/usr/bin/env bats
+# -----------------------------------------------------------------------------
+# Unit tests for the fail-closed contract of
+# packages/core/platform/images/migrations/migrations/47
+#
+# Migration 47 pins the implicit default `md0` node group on existing tenant
+# Kubernetes clusters before the kubernetes chart stops shipping a baked-in
+# md0. Its safety property is the ENTIRE reason it exists: if any per-object
+# read or patch fails, it must abort (exit 1) BEFORE stamping the
+# cozystack-version ConfigMap, so the pre-upgrade hook fails and Helm never
+# rolls the new chart against an un-pinned cluster (whose live md0
+# MachineDeployment would otherwise be pruned → CAPI Machine/node deletion).
+#
+# These tests pin that branch so it cannot silently regress to fail-open. We
+# put a fake `kubectl` on PATH and assert that:
+#   - a non-NotFound read failure aborts non-zero and never reaches the stamp;
+#   - a patch failure aborts non-zero and never reaches the stamp;
+#   - a clean run DOES reach the stamp (positive control, so "no stamp" above
+#     is a real signal and not a script that simply never called kubectl).
+# "The stamp ran" is detected by the version stamp's `kubectl apply` appearing
+# in the fake's call log — equivalently, CURRENT_VERSION was/was not advanced.
+#
+# CI runs this file under Bats through `make bats-unit-tests`. It also remains
+# compatible with the legacy `hack/cozytest.sh` translator, whose awk parser
+# recognizes only @test blocks and a bare `}` at column 0. The tests avoid
+# `run`, `$status`, setup(), and teardown() for that compatibility path. Their
+# assertions are direct shell tests, and the
+# fake-kubectl heredocs deliberately keep every `}` off column 0 so the parser
+# does not mistake one for the end of a test. Each @test runs in its own
+# subshell, and cleanup is inline (no EXIT/RETURN trap — see
+# docs/agents/e2e-testing.md §3).
+#
+# Run with: bats hack/kubernetes-md0-migration.bats
+# -----------------------------------------------------------------------------
+
+load test_helper
+
+HACK_DIR="$(cd "$(dirname "${BATS_TEST_FILENAME:-$0}")" && pwd)"
+REPO_ROOT="$(cd "$HACK_DIR/.." && pwd)"
+MIGRATION="$REPO_ROOT/packages/core/platform/images/migrations/migrations/47"
+
+# write_fake_kubectl <dir> <logfile>
+# Emits a fake `kubectl` that logs every call and behaves per $MOCK_FAIL:
+#   - the --all-namespaces list always returns one object (tenant-test/demo);
+#   - the per-object `get ... --output json` fails (MOCK_FAIL=read) or returns
+#     an object whose nodeGroups lacks md0 (so the migration tries to patch);
+#   - `patch` fails when MOCK_FAIL=patch, else succeeds;
+#   - `apply` (the version stamp) is a no-op that drains stdin.
+# No line below is a bare column-0 `}`, so cozytest.sh's parser leaves it intact.
+write_fake_kubectl() {
+  cat > "$1/kubectl" <<'KEOF'
+#!/bin/sh
+echo "$*" >> "$KLOG"
+case "$*" in
+  *--all-namespaces*)
+    printf 'tenant-test\tdemo\n'
+    exit 0
+    ;;
+  *"--output json"*)
+    if [ "${MOCK_FAIL:-}" = read ]; then
+      echo 'error: an error on the server ("timeout") has prevented the request from succeeding' >&2
+      exit 1
+    fi
+    printf '%s' '{"apiVersion":"apps.cozystack.io/v1alpha1","kind":"Kubernetes","metadata":{"namespace":"tenant-test","name":"demo"},"spec":{"nodeGroups":{"worker0":{"minReplicas":1,"maxReplicas":3}}}}'
+    exit 0
+    ;;
+  *patch*)
+    if [ "${MOCK_FAIL:-}" = patch ]; then
+      echo 'error: kubernetes.apps.cozystack.io "demo" could not be patched (simulated)' >&2
+      exit 1
+    fi
+    cat >/dev/null
+    echo 'kubernetes.apps.cozystack.io/demo patched'
+    exit 0
+    ;;
+  *apply*)
+    cat >/dev/null
+    exit 0
+    ;;
+  *)
+    exit 0
+    ;;
+esac
+KEOF
+  chmod +x "$1/kubectl"
+}
+
+@test "migration 47 aborts non-zero and skips the version stamp when a read fails" {
+  tmp=$(mktemp -d)
+  export KLOG="$tmp/kubectl.log"
+  : > "$KLOG"
+  write_fake_kubectl "$tmp" "$KLOG"
+
+  if KLOG="$KLOG" MOCK_FAIL=read PATH="$tmp:$PATH" "$MIGRATION" >"$tmp/out" 2>&1; then
+    echo "expected migration to exit non-zero on a non-NotFound read failure; output:" >&2
+    cat "$tmp/out" >&2
+    rm -rf "$tmp"
+    exit 1
+  fi
+
+  # The version stamp is `kubectl apply` of the cozystack-version ConfigMap.
+  # If it ran, the migration advanced CURRENT_VERSION despite a failure.
+  if grep -q apply "$KLOG"; then
+    echo "fail-open regression: version stamp (kubectl apply) ran despite a read failure" >&2
+    cat "$KLOG" >&2
+    rm -rf "$tmp"
+    exit 1
+  fi
+  rm -rf "$tmp"
+}
+
+@test "migration 47 aborts non-zero and skips the version stamp when a patch fails" {
+  tmp=$(mktemp -d)
+  export KLOG="$tmp/kubectl.log"
+  : > "$KLOG"
+  write_fake_kubectl "$tmp" "$KLOG"
+
+  if KLOG="$KLOG" MOCK_FAIL=patch PATH="$tmp:$PATH" "$MIGRATION" >"$tmp/out" 2>&1; then
+    echo "expected migration to exit non-zero on a patch failure; output:" >&2
+    cat "$tmp/out" >&2
+    rm -rf "$tmp"
+    exit 1
+  fi
+
+  if grep -q apply "$KLOG"; then
+    echo "fail-open regression: version stamp (kubectl apply) ran despite a patch failure" >&2
+    cat "$KLOG" >&2
+    rm -rf "$tmp"
+    exit 1
+  fi
+  rm -rf "$tmp"
+}
+
+@test "migration 47 stamps the version on a clean run (positive control)" {
+  tmp=$(mktemp -d)
+  export KLOG="$tmp/kubectl.log"
+  : > "$KLOG"
+  write_fake_kubectl "$tmp" "$KLOG"
+
+  # No MOCK_FAIL: read returns an md0-less object, patch succeeds, stamp runs.
+  if ! KLOG="$KLOG" MOCK_FAIL=none PATH="$tmp:$PATH" "$MIGRATION" >"$tmp/out" 2>&1; then
+    echo "expected a clean migration run to exit zero; output:" >&2
+    cat "$tmp/out" >&2
+    rm -rf "$tmp"
+    exit 1
+  fi
+
+  # Proves the stamp IS reachable here, so the two "no apply" assertions above
+  # are meaningful rather than vacuously true.
+  if ! grep -q apply "$KLOG"; then
+    echo "expected the version stamp (kubectl apply) to run on a clean migration" >&2
+    cat "$KLOG" >&2
+    rm -rf "$tmp"
+    exit 1
+  fi
+  rm -rf "$tmp"
+}
diff --git a/hack/kubernetes-nodes-unpin-hook.bats b/hack/kubernetes-nodes-unpin-hook.bats
new file mode 100644
index 0000000000..657d517de9
--- /dev/null
+++ b/hack/kubernetes-nodes-unpin-hook.bats
@@ -0,0 +1,157 @@
+#!/usr/bin/env bats
+# -----------------------------------------------------------------------------
+# Behavioral tests for the pre-delete unpin hook of the kubernetes-nodes chart
+# (packages/apps/kubernetes-nodes/templates/pre-delete-unpin.yaml).
+#
+# helm-unittest (tests/pre_delete_unpin_test.yaml) pins the hook's YAML shape;
+# this file tests the embedded shell script's BEHAVIOR: the rendered chart's Job
+# args are extracted and executed against a fake kubectl, because the script's
+# error classification cannot be asserted from the manifest. The contract under
+# test: absence (--ignore-not-found success + empty output) and "present but
+# unannotated" are the same no-op, ANY read or list failure fails the Job
+# (set -e, retried by backoffLimit) whatever its message says -- treating a
+# failure as absent would skip the unpin, report success, and leak the still
+# keep-annotated worker objects past the uninstall -- and stderr warnings on
+# successful reads never contaminate the annotation value.
+#
+# Requires helm (present in the unit-tests CI toolchain; the same job installs
+# the helm-unittest plugin).
+#
+# For compatibility with the legacy cozytest.sh translator, tests avoid
+# run/$status and file-local setup/teardown, and keep bare `}` lines out of test
+# bodies. Assertions are direct shell tests.
+# Run with: bats hack/kubernetes-nodes-unpin-hook.bats
+# -----------------------------------------------------------------------------
+
+load test_helper
+
+FAKEBIN="$PWD/hack/testdata/kubernetes-nodes-unpin"
+CHART="$PWD/packages/apps/kubernetes-nodes"
+
+# prep renders the chart for pool md0 of cluster myk8s and extracts the unpin
+# Job's script (the only `- |` block in the template) into $WORK/unpin.sh.
+prep() {
+  chmod +x "$FAKEBIN/kubectl"
+  WORK=$(mktemp -d)
+  export FAKE_CMDLOG="$WORK/cmdlog"
+  : > "$FAKE_CMDLOG"
+  # -s selects the output but the whole chart still renders, so the values must
+  # clear nodegroup.yaml's offline hurdles the same way the snapshot suite does:
+  # instanceType="" + explicit resources (lookup returns nil under `helm
+  # template`), and a _cluster block (injected from cozystack-values at runtime).
+  helm template kubernetes-nodes-myk8s-md0 "$CHART" --namespace tenant-test \
+    --set cluster=myk8s \
+    --set instanceType= --set resources.cpu=4 --set resources.memory=8Gi \
+    --set _cluster.cluster-domain=cozy.local \
+    -s templates/pre-delete-unpin.yaml > "$WORK/rendered.yaml" 2>"$WORK/helm-stderr"
+  sed -n '/- |/,/securityContext:/p' "$WORK/rendered.yaml" |
+    sed '1d;$d' | sed 's/^              //' > "$WORK/unpin.sh"
+  # Extraction sanity: a template refactor that moves the script must fail here,
+  # loudly, not silently test an empty file.
+  grep -q 'removing helm.sh/resource-policy' "$WORK/unpin.sh"
+  export PATH="$FAKEBIN:$PATH"
+}
+
+@test "unpin hook: absent objects are a no-op and the script succeeds (native pool preserved)" {
+  prep
+  export FAKE_MODE=absent
+  rc=0
+  sh "$WORK/unpin.sh" >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"
+  [ "$rc" -eq 0 ]
+  if grep -q 'annotate' "$FAKE_CMDLOG"; then echo "FAIL: no annotate must be issued when the objects are absent"; false; fi
+  rm -rf "$WORK"
+}
+
+@test "unpin hook: a transient error reading an object fails the Job, not silently skipping the unpin" {
+  prep
+  # With --ignore-not-found, absence is success+empty, so a non-zero get can
+  # only be a real failure; reading it as "absent" would skip the unpin,
+  # succeed, and the uninstall would leave the keep-annotated MachineDeployment
+  # (and its worker VMs) running unmanaged in the tenant namespace. The KMT
+  # list query succeeds in this mode, so a failure proves the NAMED-get path.
+  export FAKE_MODE=error-named
+  rc=0
+  sh "$WORK/unpin.sh" >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"
+  [ "$rc" -ne 0 ]
+  grep -q 'request timed out' "$WORK/out"
+  if grep -q 'annotate' "$FAKE_CMDLOG"; then echo "FAIL: no annotate must be issued after a read failure"; false; fi
+  rm -rf "$WORK"
+}
+
+@test "unpin hook: a read failure whose message contains 'not found' still fails the Job" {
+  prep
+  # A conversion-webhook outage fails a get with '... service
+  # "capi-webhook-service" not found'. That is a failure, not absence; a
+  # text-match on "not found" would classify it as absent and leak the pinned
+  # objects. Only --ignore-not-found's success+empty means absent.
+  export FAKE_MODE=error-named-notfoundish
+  rc=0
+  sh "$WORK/unpin.sh" >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"
+  [ "$rc" -ne 0 ]
+  if grep -q 'annotate' "$FAKE_CMDLOG"; then echo "FAIL: no annotate must be issued after a read failure"; false; fi
+  rm -rf "$WORK"
+}
+
+@test "unpin hook: a failed KMT listing fails the Job, not reading as zero templates" {
+  prep
+  # The named objects read clean (unpinned) so a failure proves the LIST path:
+  # a listing failure masked as empty would skip every KMT unpin, succeed, and
+  # leak the keep-annotated templates past the uninstall.
+  export FAKE_MODE=unpinned FAKE_LIST_FAIL=1
+  rc=0
+  sh "$WORK/unpin.sh" >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"
+  [ "$rc" -ne 0 ]
+  if grep -q 'annotate' "$FAKE_CMDLOG"; then echo "FAIL: no annotate must be issued after a failed KMT listing"; false; fi
+  unset FAKE_LIST_FAIL
+  rm -rf "$WORK"
+}
+
+@test "unpin hook: a kubectl warning on stderr does not fake a pinned state" {
+  prep
+  # kubectl warns on SUCCESSFUL reads (API deprecation -- deterministic for a
+  # deprecated GVK -- and client-side throttling). If the annotation read
+  # captured stderr into its value, an unannotated object would read as
+  # "pinned" and get a spurious annotate call.
+  export FAKE_MODE=unpinned FAKE_WARN_STDERR=1
+  rc=0
+  sh "$WORK/unpin.sh" >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"
+  [ "$rc" -eq 0 ]
+  if grep -q 'annotate' "$FAKE_CMDLOG"; then echo "FAIL: a warning on stderr must not be read as a pinned object"; false; fi
+  unset FAKE_WARN_STDERR
+  rm -rf "$WORK"
+}
+
+@test "unpin hook: keep-annotated objects are unpinned, hash-anchored to this pool's own KMTs" {
+  prep
+  export FAKE_MODE=pinned
+  FAKE_KMT_NAMES=$(printf '%s\n%s' kubernetes-myk8s-md0-abc123 kubernetes-myk8s-md0-large-def456)
+  export FAKE_KMT_NAMES
+  rc=0
+  sh "$WORK/unpin.sh" >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"
+  [ "$rc" -eq 0 ]
+  # All three named objects and the pool's own KMT get the annotation removed...
+  grep -q 'annotate .*machinedeployment.cluster.x-k8s.io/kubernetes-myk8s-md0 helm.sh/resource-policy-' "$FAKE_CMDLOG"
+  grep -q 'annotate .*machinehealthcheck.cluster.x-k8s.io/kubernetes-myk8s-md0 helm.sh/resource-policy-' "$FAKE_CMDLOG"
+  grep -q 'annotate .*workloadmonitor.cozystack.io/kubernetes-myk8s-md0 helm.sh/resource-policy-' "$FAKE_CMDLOG"
+  grep -q 'annotate .*kubevirtmachinetemplate.infrastructure.cluster.x-k8s.io/kubernetes-myk8s-md0-abc123 helm.sh/resource-policy-' "$FAKE_CMDLOG"
+  # ...but the sibling pool md0-large's KMT is left alone (6-hex anchor).
+  if grep -q 'md0-large-def456' "$FAKE_CMDLOG"; then echo "FAIL: the sibling pool's KubevirtMachineTemplate must not be unpinned"; false; fi
+  rm -rf "$WORK"
+}
+
+@test "unpin hook: an existing object without the keep annotation is left untouched" {
+  prep
+  export FAKE_MODE=unpinned
+  rc=0
+  sh "$WORK/unpin.sh" >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"
+  [ "$rc" -eq 0 ]
+  if grep -q 'annotate' "$FAKE_CMDLOG"; then echo "FAIL: an object without the keep annotation must not be unpinned"; false; fi
+  rm -rf "$WORK"
+}
diff --git a/hack/kubernetes-pre-delete-hook.bats b/hack/kubernetes-pre-delete-hook.bats
new file mode 100644
index 0000000000..5d6b177ae6
--- /dev/null
+++ b/hack/kubernetes-pre-delete-hook.bats
@@ -0,0 +1,429 @@
+#!/usr/bin/env bats
+# Behavioural tests for the pre-delete cleanup hook of packages/apps/kubernetes:
+# the script is extracted from the rendered Job and executed against a stub
+# kubectl. The helm-unittest cases in
+# packages/apps/kubernetes/tests/delete_hook_test.yaml match its source TEXT,
+# which cannot say whether the closing message is reachable once a backstop has
+# swallowed a failure.
+#
+# Run from the repo root through `make bats-unit-tests`; relative paths resolve
+# against that cwd. The file also remains compatible with the legacy
+# `hack/cozytest.sh` translator, so each @test builds and removes its fixture
+# inline instead of relying on setup()/teardown(). No EXIT
+# traps: a test that dies inside one prints neither `not ok` nor a reason, and
+# the suite reads green. The removal is therefore reached only on a passing run;
+# a failing one leaves its temp directory behind, which is what you want when
+# reading the rendered script and the captured output afterwards.
+
+load test_helper
+
+CHART=packages/apps/kubernetes
+
+# The stub is driven by two independent lists of globs, matched against the
+# joined arguments, and keeping them separate is the point: the script under
+# test distinguishes "this object is not there" from "I could not ask", so a
+# fixture that spelled both as one failing call could not tell whether an
+# assertion passed for the right reason.
+#
+#   $KUBECTL_FAIL    -- these invocations exit non-zero: the apiserver refused,
+#                       timed out, or was unreachable.
+#   $KUBECTL_PRESENT -- these `get ... -o name` invocations print an object.
+#                       Anything not listed exits 0 with no output, which is
+#                       what `--ignore-not-found` does for an absent object.
+
+# The ordinary end state after Step 4 waited: the TenantControlPlane is gone and
+# the datastore Secret is still there for Step 4b to clear.
+PRESENT_SECRET_ONLY='*get secret*'
+
+# Step 4's delete timed out with the TenantControlPlane still alive, so Step 4b
+# must decline to touch a finalizer Kamaji may still own.
+FAIL_TCP_DELETE='*delete tenantcontrolplanes*'
+PRESENT_TCP_AND_SECRET='*get tenantcontrolplanes*
+*get secret*'
+
+# The Secret is there, and the patch that would clear its finalizer is rejected.
+FAIL_SECRET_PATCH='*patch secret*'
+
+# Step 2's bounded delete times out, so the run takes the force-clear route --
+# and every force-clear then succeeds. A changed route is not residue: nothing
+# survives this run, so it must still be reported as a clean one.
+FAIL_HR_DELETE='*delete helmreleases*'
+
+# ... and the re-list driving that force-clear fails too. The loop body never
+# runs, so no patch is attempted and no per-object backstop can fire.
+FAIL_HR_DELETE_AND_LIST='*delete helmreleases*
+*get helmreleases*'
+
+# Each of Step 4b's two probes, failing on its own. Neither says the object is
+# absent -- they say the script could not find out, which is a third state.
+FAIL_TCP_PROBE='*get tenantcontrolplanes*'
+FAIL_SECRET_PROBE='*get secret*'
+
+# Every failure at once. The two HelmRelease globs are distinguished by the
+# patch body: Step 1 suspends (no "finalizers" in its payload) and must keep
+# working, because it is not backstopped and `set -e` would end the run there.
+FAIL_ALL='*delete helmreleases*
+*patch helmrelease*finalizers*
+*delete tenantcontrolplanes*
+*get tenantcontrolplanes*
+*patch secret*'
+
+# Extract the pre-delete Job's script from the rendered chart into $1. The
+# non-empty check must be an early `return 1`: hack/cozytest.sh rewrites every
+# line matching ^}$ into `return 0` plus `}`, helpers included, so a check left
+# in last position has its status discarded.
+#
+# helm's stderr is kept rather than discarded, because it carries the reason a
+# render failed and without it this returns 1 with nothing to read. Only the
+# per-render notice about the charts/cozy-lib symlink is dropped, and only when
+# there is a failure to report.
+render_script() {
+  helm template test-k8s "$CHART" \
+    --namespace tenant-test \
+    --values "$CHART/tests/values-ci.yaml" \
+    --show-only templates/delete.yaml 2>"$1.err" |
+    yq 'select(.kind == "Job") | .spec.template.spec.containers[0].command[2]' - > "$1"
+  if [ ! -s "$1" ]; then
+    echo "FAIL: the chart rendered no pre-delete Job script" >&2
+    grep -v 'found symbolic link in path' "$1.err" >&2 || true
+    return 1
+  fi
+}
+
+# A stub kubectl for $1/kubectl. `get ... -o name` answers for the three object
+# kinds the script probes; the HelmRelease list returns TWO children so that a
+# per-object failure in the force-clear loop hits the same backstop label twice
+# and the once-per-step property has something to be true about.
+#
+# The closing brace of the helper inside the heredoc is indented on purpose:
+# hack/cozytest.sh rewrites every line matching ^}$ anywhere in this file, the
+# heredoc included, and a `return 0` spliced into the stub would make every
+# injected failure disappear.
+make_kubectl() {
+  mkdir -p "$1"
+  cat > "$1/kubectl" <<'STUB'
+#!/bin/sh
+args="$*"
+echo "$args" >> "${KUBECTL_LOG:-/dev/null}"
+
+matches() {
+  [ -n "$1" ] || return 1
+  oldifs=$IFS
+  IFS='
+'
+  for pat in $1; do
+    case "$args" in
+      $pat) IFS=$oldifs; return 0 ;;
+    esac
+  done
+  IFS=$oldifs
+  return 1
+  }
+
+if matches "${KUBECTL_FAIL:-}"; then
+  echo "stub kubectl: injected failure: $args" >&2
+  exit 1
+fi
+
+case "$args" in
+  *"get helmreleases"*"-o name"*)
+    echo "helmrelease.helm.toolkit.fluxcd.io/cilium"
+    echo "helmrelease.helm.toolkit.fluxcd.io/coredns"
+    ;;
+  *"get tenantcontrolplanes"*"-o name"*)
+    matches "${KUBECTL_PRESENT:-}" && echo "tenantcontrolplane.kamaji.clastix.io/test-k8s"
+    ;;
+  *"get secret"*"-o name"*)
+    matches "${KUBECTL_PRESENT:-}" && echo "secret/test-k8s-datastore-config"
+    ;;
+esac
+exit 0
+STUB
+  chmod 0755 "$1/kubectl"
+}
+
+# Fixture: $tmp holds the rendered script and the stub kubectl.
+setup_case() {
+  tmp=$(mktemp -d) || return 1
+  render_script "$tmp/s.sh" || return 1
+  make_kubectl "$tmp/bin" || return 1
+}
+
+# Run the hook with the injected failures in $1 and the existing objects in $2,
+# leaving merged output in $tmp/out and the exit status in $rc. The status must
+# not abort the test: it is itself one of the things under test. KUBECONFIG is
+# neutered so that a stub that stopped being found on PATH cannot reach a real
+# cluster.
+run_hook() {
+  rc=0
+  # Truncated per call, not appended to: the "stub was reached" check below is
+  # vacuous on a second run against a log the first run already filled.
+  : > "$tmp/kubectl.log"
+  KUBECONFIG=/dev/null \
+  KUBECTL_LOG="$tmp/kubectl.log" \
+  KUBECTL_FAIL="$1" \
+  KUBECTL_PRESENT="$2" \
+  PATH="$tmp/bin:$PATH" sh "$tmp/s.sh" > "$tmp/out" 2>&1 || rc=$?
+  # The stub has to have been reached, or the assertions below measured
+  # something other than this script driving kubectl.
+  [ -s "$tmp/kubectl.log" ] || return 1
+}
+
+@test "claims success only when nothing was left behind" {
+  setup_case
+  run_hook "" "$PRESENT_SECRET_ONLY"
+
+  [ "$rc" = 0 ]
+  grep -qF 'Cleanup completed successfully' "$tmp/out"
+  # The clean run must exercise the Step 4b patch rather than skip it, or the
+  # success claim is about a script that did almost nothing.
+  grep -qF 'Removing finalizers from secret/test-k8s-datastore-config' "$tmp/out"
+  if grep -qF 'residue left by' "$tmp/out"; then
+    echo "FAIL: a clean run reported residue"
+    cat "$tmp/out"
+    return 1
+  fi
+  if grep -qF 'WARNING' "$tmp/out"; then
+    echo "FAIL: a clean run emitted a warning"
+    cat "$tmp/out"
+    return 1
+  fi
+
+  rm -rf "$tmp"
+}
+
+@test "a rejected finalizer patch withdraws the success claim and names the step" {
+  setup_case
+  run_hook "$FAIL_SECRET_PATCH" "$PRESENT_SECRET_ONLY"
+
+  [ "$rc" = 0 ]
+  # The defect this pins: the closing line used to assert success even here.
+  if grep -qF 'Cleanup completed successfully' "$tmp/out"; then
+    echo "FAIL: cleanup claimed success while the datastore-secret finalizer was left in place"
+    cat "$tmp/out"
+    return 1
+  fi
+  grep -qF 'Cleanup incomplete; residue left by: step 4b (datastore-secret finalizer)' "$tmp/out"
+  # And only that step: a summary that names every backstop unconditionally
+  # tells an operator no more than the old unconditional success line did.
+  if grep -qF 'step 2 (' "$tmp/out"; then
+    echo "FAIL: a step 2 backstop was reported without firing"
+    cat "$tmp/out"
+    return 1
+  fi
+
+  rm -rf "$tmp"
+}
+
+@test "a fallback route that succeeded is reported as a clean run" {
+  # Step 2's bounded delete times out and every force-clear that follows works,
+  # which is the ordinary outcome for a tenant with no working nodes -- the case
+  # the wait is bounded for in the first place. Nothing survives the run, so
+  # calling it incomplete would send an operator hunting for objects that are
+  # not there: the same class of untrue closing line this file exists to stop,
+  # only pointing the other way.
+  setup_case
+  run_hook "$FAIL_HR_DELETE" "$PRESENT_SECRET_ONLY"
+
+  [ "$rc" = 0 ]
+  # The route really was taken, or this passes for a run that never fell back.
+  grep -qF 'Force-clearing finalizers on helmrelease.helm.toolkit.fluxcd.io/cilium' "$tmp/out"
+  if grep -qF 'residue left by' "$tmp/out"; then
+    echo "FAIL: a fallback that left nothing behind was reported as incomplete"
+    cat "$tmp/out"
+    return 1
+  fi
+  grep -qF 'Cleanup completed successfully' "$tmp/out"
+
+  rm -rf "$tmp"
+}
+
+@test "an enumeration that failed is reported, not taken for an empty one" {
+  setup_case
+  run_hook "$FAIL_HR_DELETE_AND_LIST" "$PRESENT_SECRET_ONLY"
+
+  [ "$rc" = 0 ]
+  if grep -qF 'Cleanup completed successfully' "$tmp/out"; then
+    echo "FAIL: cleanup claimed success after it could not list what it had to force-clear"
+    cat "$tmp/out"
+    return 1
+  fi
+  grep -qF 'Cleanup incomplete; residue left by: step 2 (child HelmRelease enumeration)' "$tmp/out"
+  # And not the per-object label: that one means a patch was attempted and
+  # rejected. Here the loop never ran, so claiming it would invent a failure.
+  if grep -qF 'step 2 (child HelmRelease finalizers)' "$tmp/out"; then
+    echo "FAIL: a per-object patch failure was reported although the loop never ran"
+    cat "$tmp/out"
+    return 1
+  fi
+
+  rm -rf "$tmp"
+}
+
+@test "a TenantControlPlane outliving Step 4 is reported even though no command failed" {
+  # Step 4 times out with the TCP still alive, so Step 4b declines to strip a
+  # finalizer Kamaji may still own. Every kubectl call in Step 4b succeeds, so
+  # nothing is caught by a `||` -- and the namespace is still wedged. This is
+  # the one residue the script reports from a branch rather than from a failure.
+  setup_case
+  run_hook "$FAIL_TCP_DELETE" "$PRESENT_TCP_AND_SECRET"
+
+  [ "$rc" = 0 ]
+  if grep -qF 'Cleanup completed successfully' "$tmp/out"; then
+    echo "FAIL: cleanup claimed success with the datastore-secret finalizer left in place"
+    cat "$tmp/out"
+    return 1
+  fi
+  # The label names the TenantControlPlane, not the Secret. Both branches of
+  # Step 4b leave the finalizer in place, but only the other one wants it
+  # cleared by hand; here it is Kamaji's, and a summary pointing at the Secret
+  # would send the reader to strip a finalizer its owner is still using.
+  grep -qF 'Cleanup incomplete; residue left by: step 4b (TenantControlPlane still deleting)' "$tmp/out"
+  if grep -qF 'step 4b (datastore-secret finalizer)' "$tmp/out"; then
+    echo "FAIL: the summary blamed the Secret for a TenantControlPlane that is still deleting"
+    cat "$tmp/out"
+    return 1
+  fi
+  grep -qF 'is still present, so Kamaji may still own' "$tmp/out"
+
+  rm -rf "$tmp"
+}
+
+@test "a TenantControlPlane probe that failed is not read as absent" {
+  # The probe is the gate that stops the finalizer being stripped from an owner
+  # that still exists, so reading its failure as "confirmed gone" defeats it in
+  # the one direction that does damage. The script must neither strip nor claim
+  # the run was clean.
+  setup_case
+  run_hook "$FAIL_TCP_PROBE" ""
+
+  [ "$rc" = 0 ]
+  if grep -qF 'Cleanup completed successfully' "$tmp/out"; then
+    echo "FAIL: cleanup claimed success without establishing whether the TenantControlPlane was gone"
+    cat "$tmp/out"
+    return 1
+  fi
+  grep -qF 'Cleanup incomplete; residue left by: step 4b (datastore-secret state unknown)' "$tmp/out"
+  # And it must NOT have gone on to patch: that is the damage the gate prevents.
+  if grep -qF 'Removing finalizers from secret/' "$tmp/out"; then
+    echo "FAIL: the finalizer was stripped although the TenantControlPlane state was unknown"
+    cat "$tmp/out"
+    return 1
+  fi
+
+  rm -rf "$tmp"
+}
+
+@test "a Secret probe that failed is not read as absent" {
+  # The TCP is confirmed gone, so Step 4b is entitled to act -- but it cannot
+  # find out whether the Secret is there. "not present; nothing to do" would be
+  # an assertion the script never checked.
+  setup_case
+  run_hook "$FAIL_SECRET_PROBE" ""
+
+  [ "$rc" = 0 ]
+  if grep -qF 'Cleanup completed successfully' "$tmp/out"; then
+    echo "FAIL: cleanup claimed success without establishing whether the Secret was still there"
+    cat "$tmp/out"
+    return 1
+  fi
+  if grep -qF 'not present; nothing to do' "$tmp/out"; then
+    echo "FAIL: a failed probe was reported as the Secret being absent"
+    cat "$tmp/out"
+    return 1
+  fi
+  grep -qF 'Cleanup incomplete; residue left by: step 4b (datastore-secret state unknown)' "$tmp/out"
+
+  rm -rf "$tmp"
+}
+
+@test "every step that left residue is named in the closing message" {
+  setup_case
+  run_hook "$FAIL_ALL" ""
+
+  [ "$rc" = 0 ]
+  if grep -qF 'Cleanup completed successfully' "$tmp/out"; then
+    echo "FAIL: cleanup claimed success with every remedy having failed"
+    cat "$tmp/out"
+    return 1
+  fi
+  # Read the summary as one line: asserting the labels against the whole output
+  # would pass on the individual WARNINGs, which were already there. Two labels,
+  # not five: the timeouts that changed route left nothing of their own, and
+  # what survived them is what the per-object failures below record.
+  summary=$(grep -F 'residue left by:' "$tmp/out")
+  for label in \
+    'step 2 (child HelmRelease finalizers)' \
+    'step 4b (datastore-secret state unknown)'; do
+    case "$summary" in
+      *"$label"*) ;;
+      *)
+        echo "FAIL: the closing message did not name: $label"
+        echo "$summary"
+        return 1
+        ;;
+    esac
+  done
+  # Once each. The force-clear loop fails on both child HelmReleases, and a
+  # summary that listed its step twice would read as two separate failures.
+  dupes=$(printf '%s\n' "$summary" | tr ',' '\n' |
+    grep -cF 'step 2 (child HelmRelease finalizers)' || true)
+  if [ "$dupes" != 1 ]; then
+    echo "FAIL: the step 2 finalizer backstop is named $dupes times, expected once"
+    echo "$summary"
+    return 1
+  fi
+
+  rm -rf "$tmp"
+}
+
+@test "a step with no backstop ends the run instead of claiming success" {
+  # The closing message is honest only while the steps that are NOT backstopped
+  # still end the run under `set -e`. Nothing but `set -e` enforces that, so a
+  # `|| true` appended to one of them later would reinstate the exact defect
+  # this file pins: a cleanup that did not happen, reported as success. Step 3
+  # stands in for Steps 3, 5, 6, 7 and the patch inside Step 1. Step 1's
+  # enumeration is NOT among them: it carries `|| true` on purpose, because
+  # Step 2 deletes by label rather than from that list, so a failure there
+  # leaves nothing behind to report.
+  setup_case
+  run_hook '*delete kamajicontrolplanes*' "$PRESENT_SECRET_ONLY"
+
+  if [ "$rc" = 0 ]; then
+    echo "FAIL: a failed Step 3 did not end the run"
+    cat "$tmp/out"
+    return 1
+  fi
+  if grep -qF 'Cleanup completed successfully' "$tmp/out"; then
+    echo "FAIL: cleanup claimed success after Step 3 failed"
+    cat "$tmp/out"
+    return 1
+  fi
+
+  rm -rf "$tmp"
+}
+
+@test "exits 0 whether cleanup was clean or every remedy failed" {
+  # Pinned on its own because it is the constraint the honesty fix must not buy
+  # its honesty with. This is a pre-delete hook: a non-zero exit aborts the Helm
+  # uninstall before the release is removed, so the release stays in storage and
+  # the same teardown is retried forever. Reporting failure through the exit
+  # code is what the closing message exists to avoid.
+  setup_case
+
+  run_hook "" "$PRESENT_SECRET_ONLY"
+  if [ "$rc" != 0 ]; then
+    echo "FAIL: a clean run exited $rc"
+    cat "$tmp/out"
+    return 1
+  fi
+
+  run_hook "$FAIL_ALL" ""
+  if [ "$rc" != 0 ]; then
+    echo "FAIL: an all-failures run exited $rc, which would wedge the release"
+    cat "$tmp/out"
+    return 1
+  fi
+
+  rm -rf "$tmp"
+}
diff --git a/hack/label-workflows-contract.bats b/hack/label-workflows-contract.bats
new file mode 100644
index 0000000000..32454ffe45
--- /dev/null
+++ b/hack/label-workflows-contract.bats
@@ -0,0 +1,242 @@
+#!/usr/bin/env bats
+
+# Contract for the two label-writing workflows: pr-labeler.yaml (which labels
+# it may apply and from what input) and stale.yaml (which labels drive the
+# auto-close policy and who is exempt). Every label name either workflow can
+# write or match must resolve against .github/labels.yml — a mistyped name is
+# not an error at runtime, it is a rule that silently stops matching.
+#
+# These tests intentionally pin executable/structural lines, not prose: a
+# mapping demoted to a YAML `#` or JavaScript `//` comment must never satisfy
+# the contract. See hack/promote-gate-contract.bats for the pattern.
+
+load test_helper
+
+REPO_ROOT="$(cd "$(dirname "${BATS_TEST_FILENAME:-$0}")/.." && pwd)"
+PR_LABELER="$REPO_ROOT/.github/workflows/pr-labeler.yaml"
+STALE="$REPO_ROOT/.github/workflows/stale.yaml"
+LABELS="$REPO_ROOT/.github/labels.yml"
+DOCS="$REPO_ROOT/docs/agents/contributing.md"
+
+# Comment-stripping filters, one per language in these files. grep exits 1 on
+# an empty selection (legitimate for an empty block) and 2 on a real error, so
+# only the latter propagates.
+code_lines() {
+  local rc=0
+  grep -v '^[[:space:]]*#' || rc=$?
+  [ "$rc" -le 1 ]
+}
+
+script_lines() {
+  local rc=0
+  grep -v '^[[:space:]]*//' || rc=$?
+  [ "$rc" -le 1 ]
+}
+
+# Body of a `const <name> = {` ... `};` object literal inside the
+# github-script block. Comments are stripped BEFORE block detection so a
+# commented-out `// const typeToKind = {` can never open the block.
+js_object_block() {
+  script_lines < "$2" | awk -v name="const $1 = {" '
+    index($0, name) { inside = 1; next }
+    inside && /^[[:space:]]*};[[:space:]]*$/ { exit }
+    inside'
+}
+
+# The type -> kind/* table under "Type → `kind/*`" in docs/agents/contributing.md,
+# as "<type> <label>" lines. A row listing several types yields one line per
+# type; a "(no kind label)" row yields "-" as the label, so a type documented
+# as unmapped is distinguishable from one the table does not mention.
+doc_type_table() {
+  awk '
+    /^\*\*Type .*kind\/\*.*:\*\*/ { inside = 1; next }
+    inside && /^\|/ {
+      started = 1
+      if ($0 ~ /^\|[[:space:]]*type[[:space:]]*\|/ || $0 ~ /^\|[[:space:]-]*\|[[:space:]-]*\|/) next
+      line = $0
+      sub(/^\|[[:space:]]*/, "", line)
+      sub(/[[:space:]]*\|[[:space:]]*$/, "", line)
+      split(line, cell, /[[:space:]]*\|[[:space:]]*/)
+      label = cell[2]
+      if (label == "(no kind label)") label = "-"
+      n = split(cell[1], types, /[[:space:]]*,[[:space:]]*/)
+      for (i = 1; i <= n; i++) print types[i], label
+      next
+    }
+    inside && started { exit }
+  ' "$DOCS"
+}
+
+# The executable typeToKind mappings in pr-labeler.yaml, as "<type> <label>"
+# lines. Comment-stripped by js_object_block, so a mapping demoted to a
+# `//` comment is not listed.
+workflow_type_table() {
+  js_object_block typeToKind "$PR_LABELER" \
+    | sed -nE "s/^[[:space:]]*([A-Za-z]+):[[:space:]]*'([^']*)',?[[:space:]]*$/\1 \2/p"
+}
+
+# Every label defined in .github/labels.yml, one per line. Parses the value
+# after `- name: ` verbatim (labels may contain spaces, e.g. "help wanted"),
+# stripping optional quotes and trailing inline comments.
+defined_labels() {
+  code_lines < "$LABELS" | awk '/^- name: / {
+    sub(/^- name: /, "")
+    sub(/[[:space:]]+#.*$/, "")
+    sub(/[[:space:]]+$/, "")
+    gsub(/^"|"$/, "")
+    print
+  }'
+}
+
+# `key: value` inputs of the stale action; whole-line and trailing inline
+# comments are both stripped from the value.
+stale_input() {
+  code_lines < "$STALE" | awk -v key="          $1: " '
+    index($0, key) == 1 {
+      sub(key, "")
+      sub(/[[:space:]]+#.*$/, "")
+      sub(/[[:space:]]+$/, "")
+      print
+      exit
+    }'
+}
+
+# A `>-` folded list input of the stale action, flattened to one label per line.
+stale_exempt_list() {
+  code_lines < "$STALE" | awk -v key="          $1: >-" '
+    $0 == key { inside = 1; next }
+    inside && !/^            / { exit }
+    inside { print }' | tr -d ' ' | tr ',' '\n' | grep -v '^$'
+}
+
+assert_labels_defined() {
+  # $1: newline-separated label names. Fails naming the missing ones.
+  # No process substitution here: hack/cozytest.sh runs these files in plain
+  # sh, which lacks it. (`local` is fine — dash/ash/bash all support it, and
+  # the other contract files in hack/ already use it.)
+  local all missing
+  all="$(defined_labels)"
+  missing="$(printf '%s\n' "$1" | sort -u | while read -r l; do
+    [ -n "$l" ] || continue
+    printf '%s\n' "$all" | grep -qxF "$l" || printf '%s\n' "$l"
+  done)"
+  if [ -n "$missing" ]; then
+    echo "labels not defined in .github/labels.yml: $missing" >&2
+    return 1
+  fi
+}
+
+@test "every label pr-labeler can apply resolves against labels.yml" {
+  kind_labels="$(js_object_block typeToKind "$PR_LABELER" | grep -o "'kind/[^']*'" | tr -d "'")"
+  [ -n "$kind_labels" ]
+  assert_labels_defined "$kind_labels"
+
+  area_labels="$(js_object_block scopeToArea "$PR_LABELER" | grep -o "'area/[^']*'" | tr -d "'")"
+  [ -n "$area_labels" ]
+  assert_labels_defined "$area_labels"
+
+  # Labels added outside the two tables: backport prefix, breaking-change
+  # footer, and the no-area fallback.
+  literal_labels="$(code_lines < "$PR_LABELER" | script_lines \
+    | grep -o "toAdd.add('[^']*')" | sed "s/toAdd.add('//; s/')//" || true)"
+  for l in area/release kind/breaking-change area/uncategorized; do
+    printf '%s\n' "$literal_labels" | grep -qxF "$l"
+  done
+  assert_labels_defined "$literal_labels"
+}
+
+@test "pr-labeler's type mappings are the table in docs/agents/contributing.md" {
+  documented="$(doc_type_table)"
+  [ -n "$documented" ]
+  mapped="$(workflow_type_table)"
+  [ -n "$mapped" ]
+
+  # Mapped rows: the same set in both files, in both directions, so a row
+  # added, dropped, retyped or demoted to a `//` comment on either side fails.
+  expected="$(printf '%s\n' "$documented" | grep -v ' -$' | sort)"
+  actual="$(printf '%s\n' "$mapped" | sort)"
+  if [ "$expected" != "$actual" ]; then
+    printf 'docs table:\n%s\nworkflow typeToKind:\n%s\n' "$expected" "$actual" >&2
+    return 1
+  fi
+
+  # Rows the table documents as unmapped must have no key in typeToKind.
+  unmapped="$(printf '%s\n' "$documented" | awk '$2 == "-" { print $1 }')"
+  [ -n "$unmapped" ]
+  for t in $unmapped; do
+    count="$(printf '%s\n' "$actual" | grep -c "^$t " || true)"
+    [ "${count:-0}" -eq 0 ]
+  done
+}
+
+@test "pr-labeler subscribes to opened/reopened/synchronize and not edited" {
+  count="$(code_lines < "$PR_LABELER" | grep -cF '    types: [opened, reopened, synchronize]' || true)"
+  [ "${count:-0}" -eq 1 ]
+  # 'edited' is deliberately omitted (see the comment above the trigger); it
+  # must not creep back in as an executable line — in either the flow-sequence
+  # or block-sequence spelling. Scan the whole trigger section (before jobs:).
+  count="$(code_lines < "$PR_LABELER" | awk '/^jobs:/ { exit } { print }' | grep -cw 'edited' || true)"
+  [ "${count:-0}" -eq 0 ]
+}
+
+@test "pr-labeler is additive only and falls back to area/uncategorized" {
+  lines="$(code_lines < "$PR_LABELER" | script_lines)"
+
+  count="$(printf '%s\n' "$lines" | grep -cF "toAdd.add('area/uncategorized')" || true)"
+  [ "${count:-0}" -eq 1 ]
+
+  # Only labels not already present are sent, and only via addLabels: a
+  # labeler that starts removing or replacing labels is a different tool.
+  count="$(printf '%s\n' "$lines" | grep -cF '!existing.has(l)' || true)"
+  [ "${count:-0}" -eq 1 ]
+  count="$(printf '%s\n' "$lines" | grep -cF 'addLabels' || true)"
+  [ "${count:-0}" -eq 1 ]
+  count="$(printf '%s\n' "$lines" | grep -cE 'removeLabel|setLabels' || true)"
+  [ "${count:-0}" -eq 0 ]
+}
+
+@test "every label stale.yaml writes or matches resolves against labels.yml" {
+  for key in stale-issue-label stale-pr-label close-issue-label close-pr-label; do
+    value="$(stale_input "$key")"
+    [ -n "$value" ]
+    assert_labels_defined "$value"
+  done
+  assert_labels_defined "$(stale_exempt_list exempt-issue-labels)"
+  assert_labels_defined "$(stale_exempt_list exempt-pr-labels)"
+}
+
+@test "stale policy pins: label choices, exempt list sizes, day counts, write cap" {
+  [ "$(stale_input stale-issue-label)" = "lifecycle/stale" ]
+  [ "$(stale_input stale-pr-label)" = "lifecycle/stale" ]
+  [ "$(stale_input close-issue-label)" = "lifecycle/rotten" ]
+  [ "$(stale_input close-pr-label)" = "lifecycle/rotten" ]
+
+  count="$(stale_exempt_list exempt-issue-labels | wc -l | tr -d ' ')"
+  [ "$count" -eq 12 ]
+  count="$(stale_exempt_list exempt-pr-labels | wc -l | tr -d ' ')"
+  [ "$count" -eq 4 ]
+
+  # The renewal path: frozen exempts both; an accepted issue or a held PR is
+  # deliberate, not stale.
+  stale_exempt_list exempt-issue-labels | grep -qxF 'lifecycle/frozen'
+  stale_exempt_list exempt-issue-labels | grep -qxF 'triage/accepted'
+  stale_exempt_list exempt-pr-labels | grep -qxF 'lifecycle/frozen'
+  stale_exempt_list exempt-pr-labels | grep -qxF 'do-not-merge/hold'
+
+  [ "$(stale_input days-before-stale)" = "60" ]
+  [ "$(stale_input days-before-close)" = "14" ]
+  [ "$(stale_input operations-per-run)" = "100" ]
+  [ "$(stale_input remove-stale-when-updated)" = "true" ]
+}
+
+@test "stale runs only on a daily schedule and manual dispatch" {
+  triggers="$(code_lines < "$STALE" | awk '/^on:/ { inside = 1; next }
+    inside && /^[^[:space:]]/ { exit }
+    inside')"
+  [ -n "$triggers" ]
+  printf '%s\n' "$triggers" | grep -qF "    - cron: '37 4 * * *'"
+  printf '%s\n' "$triggers" | grep -qE '^  workflow_dispatch:'
+  # No event trigger may run the write policy on user activity.
+  count="$(printf '%s\n' "$triggers" | grep -cE '^  (push|pull_request|pull_request_target|issues|issue_comment):' || true)"
+  [ "${count:-0}" -eq 0 ]
+}
diff --git a/hack/lib/image-refs.sh b/hack/lib/image-refs.sh
new file mode 100644
index 0000000000..791067f05a
--- /dev/null
+++ b/hack/lib/image-refs.sh
@@ -0,0 +1,221 @@
+# shellcheck shell=sh
+# Shared enumeration of where cozystack vendors its image references.
+#
+# Sourced by hack/promote-rewrite-tags.sh, hack/promote-retag.sh,
+# hack/nightly-mirror.sh, hack/verify-promoted-packages.sh,
+# hack/stitch-multiarch.sh, hack/verify-multiarch.sh and
+# hack/retention-packages.sh. It exists because the
+# first three call sites each grew their own idea of where a ref can live, and
+# drifted: promote-retag and nightly-mirror scanned only the depth-2
+# values.yaml, while the promote workflow's tag rewrite scanned those plus
+# packages/apps/kubernetes/images/*.tag alone. Every ref stored in any OTHER
+# images/*.tag file was therefore invisible to all three — never retagged to
+# the stable version in the registry, never mirrored to GHCR for a nightly, and
+# left carrying the rc version string in a promoted release tree. The verifier
+# is a later consumer that has only ever read this enumeration: it compares the
+# stable candidate's refs against the rc artifact's to prove promotion moved no
+# container bytes, so a shape it could not see would be a proof that passed over
+# the images it skipped. See docs/agents/image-refs.md for the contract this
+# file implements; a new storage location must be added here and nowhere else.
+#
+# Three storage shapes exist, and all are first-class:
+#
+#   1. <root>/<group>/<pkg>/values.yaml     — the YAML sub-shapes listed below
+#   2. <root>/<group>/<pkg>/images/*.tag    — a plain file holding one ref
+#   3. an explicitly declared file (IMAGE_REF_EXTRA_FILES) whose producer sed's
+#      a ref straight into it because the package is not values-driven
+#
+# The .tag files are consumed by templates via .Files.Get rather than through
+# values, which is why they are easy to forget; they are otherwise ordinary
+# first-party refs and carry the cozystack version exactly like values.yaml.
+#
+# <root> is "packages" for the committed tree and the extracted artifact
+# directory for a baked tree; both use the same <group>/<pkg> layout below it.
+
+# Root-relative files that hold a first-party ref outside the two globs above.
+# Kept as an explicit list rather than a templates/** glob: that glob would
+# sweep in every vendored upstream chart template and every Helm-templated
+# `image:` line, where a blind rewrite corrupts a value `make update`
+# regenerates. An entry here is a deliberate statement that some package's
+# `image:` target sed's a ref into a file it vendors from upstream.
+#
+# system/multus is the only one today: its templates/ is the upstream
+# multus-daemonset-thick.yml fetched by `make update`, and multus's Makefile
+# `image:` target sed's the built ref into every `multus-cni` `image:` line
+# inside it.
+#
+# KNOWN GAP, deliberately not listed: system/capi-providers-cpprovider stamps
+# its kamaji ref into files/control-plane-components.yaml AND into the
+# files/components.gz built from it, and the chart ships the .gz
+# (templates/configmaps.yaml reads it with .Files.Get). Declaring only the
+# readable .yaml would rewrite the copy nothing consumes and leave it diverged
+# from the copy that does, which is worse than leaving both alone. Nothing is
+# currently owed to it: kamaji is component-versioned (v0.19.0-cozystack.N), so
+# no tag rewrite is due, and the image is still retagged and mirrored via
+# images/cluster-api-control-plane-provider-kamaji.tag, which carries the same
+# repo@digest. The residual is that a nightly's kamaji ConfigMap keeps the
+# private build-registry host, since the mirror's host rewrite cannot reach
+# inside a gzip. Fixing it means decompress/rewrite/recompress with `gzip -n`
+# to stay reproducible — see docs/agents/image-refs.md.
+# Assigned unconditionally rather than via ${VAR:-default}: this list is
+# safety-critical for the retag and the mirror, neither of which has a
+# postcondition that would notice it being wrong. An inherited environment
+# variable able to silently NARROW it is a hazard with no matching use case.
+# Word splitting is intended (the list is whitespace-separated), which also
+# means a path containing whitespace cannot be represented here.
+IMAGE_REF_EXTRA_FILES="system/multus/templates/multus-daemonset-thick.yml"
+
+# Emit every ref-bearing file under <root>, one per line.
+#
+# Both globs are depth-anchored rather than a `find`: a deeper values.yaml
+# belongs to a vendored upstream chart (packages/*/*/charts/**) whose images
+# the build neither pushes nor stamps, and rewriting one would corrupt a
+# vendored default that `make update` regenerates. No .tag file lives under a
+# charts/ subtree today, so the images/*.tag glob is exact rather than merely
+# conservative.
+image_ref_files() {
+  _ir_root="${1:?image_ref_files: <root> required}"
+  for _ir_f in "$_ir_root"/*/*/values.yaml; do
+    [ -f "$_ir_f" ] && printf '%s\n' "$_ir_f"
+  done
+  for _ir_f in "$_ir_root"/*/*/images/*.tag; do
+    [ -f "$_ir_f" ] && printf '%s\n' "$_ir_f"
+  done
+  for _ir_f in $IMAGE_REF_EXTRA_FILES; do
+    [ -f "$_ir_root/$_ir_f" ] && printf '%s\n' "$_ir_root/$_ir_f"
+  done
+  return 0
+}
+
+# Emit every "<repo>[:<tag>]@sha256:<digest>" ref found under <root>.
+#
+# The YAML shapes below are the ones present in the tree today, found by
+# auditing every @sha256: digest under the depth-2 values.yaml against this
+# selector's output — NOT a closed set the build is known to be limited to.
+# Charts are vendored from upstream and their values layout is theirs to
+# change, so treat the list as empirical and re-run that audit when a package
+# is added:
+#   1. single string  <repo>:<tag>@sha256:<digest>   (e.g. .cozystackAPI.image)
+#   2. split map      {[registry,] repository, tag, digest}   (e.g. .cilium.image)
+#   3. split map      {[registry,] repository, tag: <tag>@sha256:<digest>}
+#                     (e.g. .linstorCSI.image)
+#   4. chart-global   global.registry.address + global.images.<n>.{repository, tag}
+#                     (kube-ovn's wrapper chart)
+#   5. OCI artifact   {platformSourceUrl: oci://<repo>, platformSourceRef: digest=sha256:<digest>}
+#   6. split map      {[registry,] image, [tag,] digest}
+#                     (upstream ingress-nginx's layout, e.g. its .controller.image)
+#
+# The optional `registry` sibling in shapes 2/3/6 and the whole of shape 4 exist
+# because the host does not always live inside the repository key. When it does not,
+# the rule must rejoin it: a host-less ref reaches the caller's ownership
+# filter looking third-party and is dropped, which is the silent-skip failure
+# the shape-3 rule was added to fix.
+#
+# Shape 3 is the dominant one: most package Makefiles set `.image.tag` to
+# "$(IMAGE_TAG)@$(digest)" in a single yq call instead of maintaining a
+# separate `digest` key. It matches neither shape 2 (no `digest` key) nor,
+# usefully, shape 1 — that rule sees only the bare tag value, which carries no
+# repository, so a caller's ref_repo() reduces "<tag>@sha256:<digest>" to
+# "<tag>" and the ownership filter drops it.
+#
+# The `tag == "!!str"` guard is load-bearing: yq's test() aborts the expression
+# on a non-string tag ("cannot match with !!int"), and since these invocations
+# swallow stderr and status, that abort would silently drop every shape-3 ref
+# in the same file. `tag: 1.24` unquoted in a neighbouring third-party block is
+# enough. Rule 1 is immune — its select(tag == "!!str") precedes its test().
+#
+# `registry`, `repository` and `digest` are guarded the same way against a
+# different failure: they are string-concatenated rather than test()ed, and yq
+# coerces most scalars on `+`, so only a !!map aborts ("!!str () cannot be
+# added to a !!map") and takes the whole file's expression with it. Being a
+# select() rather than a test(), the guard drops just the offending map.
+# Emit every ref found in ONE file. Split out from collect_image_refs so a test
+# can apply the same shape knowledge to an independently discovered file list:
+# what drifted historically was which FILES each consumer looked at, not how a
+# ref is spelled inside one, so an oracle wants to vary the former and hold the
+# latter. Shape coverage is pinned separately by per-shape tests, which is why
+# sharing this half does not weaken the suite.
+#
+# YAML is parsed; anything else is scraped textually. A .tag file has no YAML
+# structure to speak of, and a declared extra file may be a manifest whose ref
+# yq would find anyway — running both on it would merely duplicate, and the
+# callers dedup.
+collect_refs_from_file() {
+  _ir_f="${1:?collect_refs_from_file: <file> required}"
+  [ -f "$_ir_f" ] || return 0
+
+  case "$_ir_f" in
+    *.yaml|*.yml)
+      _collect_yaml_shapes "$_ir_f"
+      ;;
+    *)
+      # Select on the digest rather than emitting whole lines so a blank line
+      # or a comment a future file may carry cannot reach the caller as a bogus
+      # ref. grep's no-match exit 1 is swallowed for the same reason the yq
+      # calls swallow theirs: an unmatched file is normal, not an error.
+      grep -Eo "[^[:space:]\"']+@sha256:[0-9a-f]{64}" "$_ir_f" 2>/dev/null || true
+      ;;
+  esac
+  return 0
+}
+
+collect_image_refs() {
+  _ir_root="${1:?collect_image_refs: <root> required}"
+  image_ref_files "$_ir_root" | while IFS= read -r _ir_each; do
+    collect_refs_from_file "$_ir_each"
+  done
+
+  # Declared extras additionally get the textual scrape, even though most are
+  # YAML and were already parsed above. Parsing ALONE would narrow what this
+  # shape means: an extra is a manifest vendored from upstream, so it can carry
+  # a ref inside a block scalar (a ConfigMap embedding a whole deployment, say),
+  # where yq returns the enclosing block rather than the ref and the caller's
+  # ownership filter then discards it — and it can stop parsing entirely, when
+  # `make update` pulls a version yq chokes on or when the package patches Helm
+  # syntax into the vendored file. Both are silent skips, which is the failure
+  # mode this library exists to remove. Running both and letting the callers'
+  # existing dedup absorb the overlap costs nothing.
+  #
+  # The multus entry is in the second state today: its staging init container is
+  # wrapped in Helm conditionals, so yq refuses the whole file and this scrape is
+  # not a backstop for it but the only leg that reports anything. One consequence
+  # is worth knowing when reading the tests: the completeness oracle in
+  # hack/promote-rewrite-tags_test.bats builds its expected side with
+  # collect_refs_from_file, so for this file that comparison is inert -- it can
+  # neither fail nor pass on it. What pins the multus entry against the real tree
+  # is `image_ref_files enumerates all three storage shapes` for the path and
+  # `collect_image_refs finds refs the depth-2 values.yaml glob misses` for the
+  # ref, both in that same file.
+  for _ir_f in $IMAGE_REF_EXTRA_FILES; do
+    [ -f "$_ir_root/$_ir_f" ] || continue
+    grep -Eo "[^[:space:]\"']+@sha256:[0-9a-f]{64}" "$_ir_root/$_ir_f" 2>/dev/null || true
+  done
+
+  return 0
+}
+
+_collect_yaml_shapes() {
+    _ir_f="$1"
+    # shape 1
+    yq -r '.. | select(tag == "!!str") | select(test("@sha256:[0-9a-f]{64}"))' "$_ir_f" 2>/dev/null || true
+    # shape 2. The sub("^/"; "") is what makes `registry` optional: absent, it
+    # alternates to "" and leaves a leading slash on the join, stripped back to
+    # the bare repository the rule emitted before registry was handled.
+    yq -r '.. | select(tag == "!!map") | select(has("repository") and has("digest")) | select(.repository | tag == "!!str") | select(.digest | tag == "!!str") | select((.registry // "") | tag == "!!str") | (((.registry // "") + "/" + .repository) | sub("^/"; "")) + "@" + .digest' "$_ir_f" 2>/dev/null || true
+    # shape 3
+    yq -r '.. | select(tag == "!!map") | select(has("repository") and has("tag")) | select(.tag | tag == "!!str") | select(.tag | test("@sha256:[0-9a-f]{64}")) | select(.repository | tag == "!!str") | select((.registry // "") | tag == "!!str") | (((.registry // "") + "/" + .repository) | sub("^/"; "")) + "@" + (.tag | sub(".*@"; ""))' "$_ir_f" 2>/dev/null || true
+    # shape 4. Scoped to global.images rather than a recursive descent: the
+    # host is a document-level key, so binding it to a map found anywhere in
+    # the file would attach kube-ovn's registry to unrelated repositories.
+    # $reg is a yq binding, not a shell variable — the single quotes are
+    # required, so SC2016's "expressions don't expand" is inverted here.
+    # shellcheck disable=SC2016
+    yq -r '(.global.registry.address // "") as $reg | select($reg != "") | select($reg | tag == "!!str") | .global.images[] | select(tag == "!!map") | select(has("repository") and has("tag")) | select(.tag | tag == "!!str") | select(.tag | test("@sha256:[0-9a-f]{64}")) | select(.repository | tag == "!!str") | $reg + "/" + .repository + "@" + (.tag | sub(".*@"; ""))' "$_ir_f" 2>/dev/null || true
+    # shape 5
+    yq -r '.. | select(tag == "!!map") | select(has("platformSourceUrl") and has("platformSourceRef")) | (.platformSourceUrl | sub("^oci://"; "")) + "@" + (.platformSourceRef | sub("^digest="; ""))' "$_ir_f" 2>/dev/null || true
+    # shape 6. Requiring a whole digest, not just the key, is what keeps
+    # upstream's unpinned default (`digest: ""`) from emitting "<image>@". The
+    # `!!str` guard on digest has to come before test(), as in shape 3.
+    yq -r '.. | select(tag == "!!map") | select(.image | tag == "!!str") | select(.digest | tag == "!!str") | select(.digest | test("^sha256:[0-9a-f]{64}$")) | select((.registry // "") | tag == "!!str") | (((.registry // "") + "/" + .image) | sub("^/"; "")) + "@" + .digest' "$_ir_f" 2>/dev/null || true
+    return 0
+}
diff --git a/hack/lib/promoted-packages.sh b/hack/lib/promoted-packages.sh
new file mode 100644
index 0000000000..e962eef761
--- /dev/null
+++ b/hack/lib/promoted-packages.sh
@@ -0,0 +1,25 @@
+# shellcheck shell=sh
+# Shared definitions for the stable-candidate packages artifact.
+#
+# Sourced by hack/promote-packages-artifact.sh, which publishes the candidate,
+# and hack/verify-promoted-packages.sh, which proves it. The publisher's whole
+# reason to inspect the pin at all is to make the verifier's refusal land at
+# dispatch time, before a registry write, two commits and a draft release exist
+# — so the two have to be testing the same thing. Copied constants would drift
+# apart silently and turn that dispatch-time refusal back into the late failure
+# it was added to remove; they live here instead.
+#
+# Not a general library: promotion is the only caller, and both halves run from
+# a `hack`-only sparse checkout of a trusted ref, so this file has to stay
+# inside hack/ next to them.
+
+# The one OCI repository a packages candidate may ever be published to or read
+# back from. Overridable only so the behavioural suites can point both halves
+# at a fixture registry; production never sets it.
+EXPECTED_PACKAGES_REPOSITORY="${EXPECTED_PACKAGES_REPOSITORY:-oci://ghcr.io/cozystack/cozystack/cozystack-packages}"
+
+# An immutable Flux OCI source pin, `digest=sha256:<64 lowercase hex>`. The
+# tag form Flux also accepts is exactly what promotion must neither publish nor
+# accept: a stable installer pinned by tag resolves to whatever that tag points
+# at later, which is how a stable install ends up serving rc content (#3477).
+PACKAGES_DIGEST_REF_PATTERN='^digest=sha256:[0-9a-f]{64}$'
diff --git a/hack/linstor-storage-mode_test.bats b/hack/linstor-storage-mode_test.bats
new file mode 100644
index 0000000000..510da4cd6c
--- /dev/null
+++ b/hack/linstor-storage-mode_test.bats
@@ -0,0 +1,705 @@
+#!/usr/bin/env bats
+# Unit coverage for the lane-specific E2E storage contract: LINSTOR pool
+# registration, management StorageClasses, and downstream Chainsaw fixtures.
+# The library guard keeps this suite cluster-free under hack/cozytest.sh.
+
+load test_helper
+
+HACK_DIR="$(cd "$(dirname "${BATS_TEST_FILENAME:-$0}")" && pwd)"
+POST_PREP="$HACK_DIR/e2e-post-install-prep.sh"
+# shellcheck source=/dev/null
+E2E_POST_INSTALL_PREP_LIB=true . "$POST_PREP"
+
+kubectl() { printf '%s\n' "$*"; }
+
+# The pool waits poll against a wall-clock deadline. Each `date` call moves this
+# clock a minute on, so a wait that cannot succeed runs out within a few polls.
+# The suite also runs kubectl through `timeout` and `sh -c`, which bypass the
+# shell function, so a kubectl that refuses to run goes first on PATH.
+fake_linstor_clock() {
+  clock_file="_out/tmp/linstor-clock-$$"
+  mkdir -p _out/tmp/linstor-bin
+  printf '#!/bin/sh\necho "unstubbed kubectl $*" >&2\nexit 97\n' >_out/tmp/linstor-bin/kubectl
+  chmod +x _out/tmp/linstor-bin/kubectl
+  PATH="$PWD/_out/tmp/linstor-bin:$PATH"
+  printf '0\n' >"$clock_file"
+  date() {
+    _now=$(cat "$clock_file")
+    printf '%s\n' "$((_now + 60))" >"$clock_file"
+    printf '%s\n' "$_now"
+  }
+  sleep() { :; }
+}
+
+# Three container-mode nodes, each with a satellite pod and a node-specific
+# zpool. `zfs list` answers from $pool_dir/datasets.<poll>, where every pool
+# listing moves <poll> on by one and the last file present keeps answering,
+# so a test can script what each cleanup poll sees. The free-capacity probe
+# keeps answering a short figure, which is what LINSTOR's cache serves for a
+# thick ZFS pool after a destroy, and what the dataset comparison must ignore.
+fake_linstor_pools() {
+  pool_dir="_out/tmp/linstor-pools-$$"
+  mkdir -p "$pool_dir/bin"
+  printf '0\n' >"$pool_dir/poll"
+  # Each node has its ZFS pool and LINSTOR's DISKLESS placeholder, which
+  # carries no zpool. $pool_dir/srv2-pool replaces srv2's ZFS pool object.
+  cat >"$pool_dir/bin/linstor" <<EOF_LINSTOR
+#!/bin/sh
+srv2_pool='{"storage_pool_name":"data","node_name":"srv2","provider_kind":"ZFS","props":{"StorDriver/StorPoolName":"data-srv2"}}'
+[ -e "$PWD/$pool_dir/srv2-pool" ] && srv2_pool=\$(cat "$PWD/$pool_dir/srv2-pool")
+printf '[[%s,%s,%s,%s]]\n' \\
+  '{"storage_pool_name":"data","node_name":"srv1","provider_kind":"ZFS","props":{"StorDriver/StorPoolName":"data-srv1"}}' \\
+  '{"storage_pool_name":"DfltDisklessStorPool","node_name":"srv1","provider_kind":"DISKLESS","props":{}}' \\
+  "\$srv2_pool" \\
+  '{"storage_pool_name":"data","node_name":"srv3","provider_kind":"ZFS","props":{"StorDriver/StorPoolName":"data-srv3"}}'
+EOF_LINSTOR
+  chmod +x "$pool_dir/bin/linstor"
+  kubectl() {
+    # A read made without a ceiling is one a hung pod would block for good;
+    # a stub cannot block, so it leaves this marker instead.
+    [ -n "${COZY_TEST_BOUNDED:-}" ] || : >"$pool_dir/unbounded-read"
+    case "$*" in
+      *free_capacity*) printf '87127923:srv2\n' ;;
+      *'sp l'*)
+        # Run the controller-side script for real against a machine-readable
+        # listing shaped like LINSTOR's, so the jq filter is what reads it.
+        printf '%s\n' "$(( $(cat "$pool_dir/poll") + 1 ))" >"$pool_dir/poll"
+        for _script; do :; done
+        PATH="$pool_dir/bin:$PATH" sh -c "$_script"
+        return
+        ;;
+      *'get pods'*)
+        [ -e "$pool_dir/no-satellite-srv2" ] || printf 'srv2 linstor-satellite.srv2-b\n'
+        printf 'srv1 linstor-satellite.srv1-a\nsrv3 linstor-satellite.srv3-c\n'
+        ;;
+      *'zfs list'*)
+        # kubectl refuses an exec without a pod name, as the real one does.
+        [ -n "$4" ] || return 1
+        # A satellite that never answers ends the read as timeout(1) ends it.
+        if [ -e "$pool_dir/hang-srv2" ] && [ "$4" = linstor-satellite.srv2-b ]; then
+          return 124
+        fi
+        for _zpool; do :; done
+        _poll=$(cat "$pool_dir/poll")
+        while [ "$_poll" -gt 0 ] && [ ! -e "$pool_dir/datasets.$_poll" ]; do _poll=$((_poll - 1)); done
+        awk -v pool="$_zpool" '$0 == pool || index($0, pool "/") == 1 { print; found = 1 } END { exit !found }' "$pool_dir/datasets.$_poll"
+        return
+        ;;
+    esac
+    return 0
+  }
+  # The probe's reads go through timeout(1), which would bypass the kubectl
+  # function above; this runs the command as the shell function instead, and
+  # only under the `-k <grace> <limit>` form.
+  timeout() {
+    [ "${1:-}" = -k ] && [ "${3:-0}" -gt 0 ] || return 97
+    shift 3
+    COZY_TEST_BOUNDED=1 "$@"
+  }
+}
+
+# The datasets of an idle sandbox: each pool root, and a platform volume that
+# predates the suite on srv2.
+idle_pool_datasets() {
+  printf '%s\n' data-srv1 data-srv2 data-srv2/pvc-0a1b2c3d-platform_00000 data-srv3
+}
+
+@test "QEMU mode creates data from the satellite block device" {
+  unset COZY_LINSTOR_DRBD_ENABLED
+  command=$(create_linstor_storage_pool srv2)
+  expected='exec -n cozy-linstor deploy/linstor-controller -- linstor physical-storage create-device-pool zfs srv2 /dev/vdc --pool-name data --storage-pool data'
+
+  if [ "$command" != "$expected" ]; then
+    echo "unexpected QEMU pool command: $command" >&2
+    return 1
+  fi
+}
+
+@test "container mode registers the node-specific pre-created zpool" {
+  COZY_LINSTOR_DRBD_ENABLED=false
+  command=$(create_linstor_storage_pool srv2)
+  expected='exec -n cozy-linstor deploy/linstor-controller -- linstor storage-pool create zfs srv2 data data-srv2'
+
+  if [ "$command" != "$expected" ]; then
+    echo "unexpected container pool command: $command" >&2
+    return 1
+  fi
+}
+
+@test "QEMU mode renders local and replicated StorageClasses" {
+  unset COZY_LINSTOR_DRBD_ENABLED
+  manifest=$(render_linstor_storageclasses)
+  names=$(printf '%s\n' "$manifest" | yq -N '.metadata.name')
+  expected_names=$(printf '%s\n' local replicated)
+  replicated_layers=$(printf '%s\n' "$manifest" | yq 'select(.metadata.name == "replicated") | .parameters."linstor.csi.linbit.com/layerList"')
+
+  if [ "$names" != "$expected_names" ]; then
+    echo "unexpected QEMU StorageClasses: $names" >&2
+    return 1
+  fi
+  if [ "$replicated_layers" != "drbd storage" ]; then
+    echo "replicated StorageClass lost its DRBD layer: $replicated_layers" >&2
+    return 1
+  fi
+}
+
+@test "container mode renders only the production local StorageClass" {
+  COZY_LINSTOR_DRBD_ENABLED=false
+  manifest=$(render_linstor_storageclasses)
+  names=$(printf '%s\n' "$manifest" | yq -N '.metadata.name')
+  local_layers=$(printf '%s\n' "$manifest" | yq '.parameters."linstor.csi.linbit.com/layerList"')
+  remote=$(printf '%s\n' "$manifest" | yq '.parameters."linstor.csi.linbit.com/allowRemoteVolumeAccess"')
+
+  if [ "$names" != "local" ]; then
+    echo "container mode emitted unexpected StorageClasses: $names" >&2
+    return 1
+  fi
+  if [ "$local_layers" != "storage" ] || [ "$remote" != "false" ]; then
+    echo "container local StorageClass has unexpected parameters: layerList=$local_layers allowRemoteVolumeAccess=$remote" >&2
+    return 1
+  fi
+}
+
+@test "container mode pins CDI local StorageProfile to RWO Block" {
+  command=$(patch_local_cdi_storage_profile)
+  expected='patch storageprofile local --request-timeout=60s --type merge -p {"spec":{"claimPropertySets":[{"accessModes":["ReadWriteOnce"],"volumeMode":"Block"}]}}'
+
+  if [ "$command" != "$expected" ]; then
+    echo "unexpected CDI StorageProfile patch: $command" >&2
+    return 1
+  fi
+}
+
+@test "invalid DRBD mode is rejected before cluster access" {
+  COZY_LINSTOR_DRBD_ENABLED=unsupported
+  if validate_linstor_storage_mode; then
+    echo "invalid DRBD mode unexpectedly passed validation" >&2
+    return 1
+  fi
+}
+
+@test "tenant Kubernetes storage defaults to replicated and accepts local only explicitly" {
+  # Sourcing inside the test keeps run-kubernetes.sh's live-cluster
+  # cozy_cleanup helper out of cozytest.sh's file-level cleanup discovery.
+  # shellcheck source=/dev/null
+  . "$HACK_DIR/e2e-chainsaw/_lib/run-kubernetes.sh"
+  unset COZY_E2E_STORAGE_CLASS
+  default_class=$(cozy_e2e_storage_class)
+  COZY_E2E_STORAGE_CLASS=local
+  container_class=$(cozy_e2e_storage_class)
+
+  if [ "$default_class" != replicated ] || [ "$container_class" != local ]; then
+    echo "unexpected tenant storage classes: default=$default_class container=$container_class" >&2
+    return 1
+  fi
+
+  COZY_E2E_STORAGE_CLASS=unsupported
+  if cozy_e2e_storage_class; then
+    echo "invalid tenant storage class unexpectedly passed validation" >&2
+    return 1
+  fi
+}
+
+@test "replicated cleanup holds LINSTOR pools to the pre-suite baseline, not to an absolute floor" {
+  # shellcheck source=/dev/null
+  . "$HACK_DIR/e2e-chainsaw/_lib/run-kubernetes.sh"
+  COZY_E2E_STORAGE_CLASS=replicated
+  COZY_LINSTOR_POOL_BASELINE_FILE="_out/tmp/linstor-baseline-$$"
+  mkdir -p _out/tmp
+  fake_linstor_pools
+  # srv2 reads 83 GiB free before and after the suite, below the 90 GiB that
+  # used to be demanded of every node, because earlier suites hold the space.
+  idle_pool_datasets >"$pool_dir/datasets.0"
+  idle_pool_datasets | sed 's/^data-\(srv[0-9]\)/\1 &/' >"$COZY_LINSTOR_POOL_BASELINE_FILE"
+  cozy_wait_tenant_drained() { return 0; }
+  fake_linstor_clock
+
+  rc=0
+  cozy_cleanup test-latest-version || rc=$?
+  rm -rf "$COZY_LINSTOR_POOL_BASELINE_FILE" "$clock_file" "$pool_dir"
+
+  if [ "$rc" -ne 0 ]; then
+    echo "replicated cleanup failed although every pool holds only its pre-suite datasets" >&2
+    return 1
+  fi
+}
+
+@test "pool baseline wait passes once a destroyed worker volume is gone, whatever the cached free capacity says" {
+  # The shape of a cleanup on a thick ZFS pool: the worker zvol is still
+  # listed on the first poll, gone on the next, and LINSTOR's free capacity
+  # stays short of the baseline because it was cached mid-destroy.
+  # shellcheck source=/dev/null
+  . "$HACK_DIR/e2e-chainsaw/_lib/run-kubernetes.sh"
+  COZY_LINSTOR_POOL_BASELINE_FILE="_out/tmp/linstor-baseline-$$"
+  mkdir -p _out/tmp
+  fake_linstor_pools
+  idle_pool_datasets | sed 's/^data-\(srv[0-9]\)/\1 &/' >"$COZY_LINSTOR_POOL_BASELINE_FILE"
+  { idle_pool_datasets; printf 'data-srv1/pvc-5e6f7a8b-worker_00000\n'; } >"$pool_dir/datasets.1"
+  idle_pool_datasets >"$pool_dir/datasets.2"
+  fake_linstor_clock
+
+  rc=0
+  output=$(cozy_wait_linstor_pool_baseline 300 2>&1) || rc=$?
+  polls=$(cat "$pool_dir/poll")
+  rm -rf "$COZY_LINSTOR_POOL_BASELINE_FILE" "$clock_file" "$pool_dir"
+
+  if [ "$rc" -ne 0 ]; then
+    echo "pool wait failed after the worker volume was destroyed: $output" >&2
+    return 1
+  fi
+  if [ "$polls" -ne 2 ]; then
+    echo "pool wait passed on poll $polls, expected it to wait out the in-flight destroy and pass on poll 2" >&2
+    return 1
+  fi
+}
+
+@test "pool baseline wait fails on a leaked volume and names it" {
+  # The shape of a leaked 21 GiB CDI scratch volume on srv3: one dataset the
+  # baseline does not have, still present at the deadline.
+  # shellcheck source=/dev/null
+  . "$HACK_DIR/e2e-chainsaw/_lib/run-kubernetes.sh"
+  COZY_LINSTOR_POOL_BASELINE_FILE="_out/tmp/linstor-baseline-$$"
+  mkdir -p _out/tmp
+  fake_linstor_pools
+  idle_pool_datasets | sed 's/^data-\(srv[0-9]\)/\1 &/' >"$COZY_LINSTOR_POOL_BASELINE_FILE"
+  { idle_pool_datasets; printf 'data-srv3/pvc-9c0d1e2f-scratch_00000\n'; } >"$pool_dir/datasets.0"
+  fake_linstor_clock
+
+  rc=0
+  output=$(cozy_wait_linstor_pool_baseline 300 2>&1) || rc=$?
+  rm -rf "$COZY_LINSTOR_POOL_BASELINE_FILE" "$clock_file" "$pool_dir"
+
+  if [ "$rc" -ne 1 ]; then
+    echo "pool wait returned $rc for a leaked scratch volume, expected 1: $output" >&2
+    return 1
+  fi
+  if ! printf '%s\n' "$output" | grep -Fxq '  linstor-pool: new srv3 data-srv3/pvc-9c0d1e2f-scratch_00000'; then
+    echo "the leak report does not name the leaked volume and its node: $output" >&2
+    return 1
+  fi
+}
+
+@test "pool baseline wait fails when a node's pool cannot be read" {
+  # shellcheck source=/dev/null
+  . "$HACK_DIR/e2e-chainsaw/_lib/run-kubernetes.sh"
+  COZY_LINSTOR_POOL_BASELINE_FILE="_out/tmp/linstor-baseline-$$"
+  mkdir -p _out/tmp
+  fake_linstor_pools
+  idle_pool_datasets | sed 's/^data-\(srv[0-9]\)/\1 &/' >"$COZY_LINSTOR_POOL_BASELINE_FILE"
+  idle_pool_datasets >"$pool_dir/datasets.0"
+  : >"$pool_dir/no-satellite-srv2"
+  fake_linstor_clock
+
+  rc=0
+  output=$(cozy_wait_linstor_pool_baseline 300 2>&1) || rc=$?
+  rm -rf "$COZY_LINSTOR_POOL_BASELINE_FILE" "$clock_file" "$pool_dir"
+
+  if [ "$rc" -ne 1 ]; then
+    echo "pool wait returned $rc with srv2's satellite missing, expected 1: $output" >&2
+    return 1
+  fi
+}
+
+@test "pool baseline wait ends at its deadline when a satellite read hangs" {
+  # shellcheck source=/dev/null
+  . "$HACK_DIR/e2e-chainsaw/_lib/run-kubernetes.sh"
+  COZY_LINSTOR_POOL_BASELINE_FILE="_out/tmp/linstor-baseline-$$"
+  mkdir -p _out/tmp
+  fake_linstor_pools
+  idle_pool_datasets | sed 's/^data-\(srv[0-9]\)/\1 &/' >"$COZY_LINSTOR_POOL_BASELINE_FILE"
+  idle_pool_datasets >"$pool_dir/datasets.0"
+  : >"$pool_dir/hang-srv2"
+  fake_linstor_clock
+
+  rc=0
+  output=$(cozy_wait_linstor_pool_baseline 300 2>&1) || rc=$?
+  unbounded=no
+  [ ! -e "$pool_dir/unbounded-read" ] || unbounded=yes
+  rm -rf "$COZY_LINSTOR_POOL_BASELINE_FILE" "$clock_file" "$pool_dir"
+
+  if [ "$unbounded" = yes ]; then
+    echo "the probe made a LINSTOR read without a ceiling, so a hung exec would hold the wait past its deadline" >&2
+    return 1
+  fi
+  if [ "$rc" -ne 1 ] || ! printf '%s\n' "$output" | grep -Fq 'did not return to their pre-suite baseline within 300s'; then
+    echo "a timed-out satellite read did not end the wait as a failure at its deadline: rc=$rc $output" >&2
+    return 1
+  fi
+}
+
+@test "pool baseline wait without a recorded baseline returns 2" {
+  # shellcheck source=/dev/null
+  . "$HACK_DIR/e2e-chainsaw/_lib/run-kubernetes.sh"
+  COZY_LINSTOR_POOL_BASELINE_FILE="_out/tmp/linstor-baseline-absent-$$"
+  rm -f "$COZY_LINSTOR_POOL_BASELINE_FILE"
+  fake_linstor_pools
+  fake_linstor_clock
+
+  rc=0
+  cozy_wait_linstor_pool_baseline 300 >/dev/null 2>&1 || rc=$?
+  rm -rf "$clock_file" "$pool_dir"
+
+  if [ "$rc" -ne 2 ]; then
+    echo "pool wait returned $rc without a baseline, expected 2" >&2
+    return 1
+  fi
+}
+
+@test "replicated Kubernetes suite records a LINSTOR baseline before creating the tenant" {
+  # shellcheck source=/dev/null
+  . "$HACK_DIR/e2e-chainsaw/_lib/run-kubernetes.sh"
+  COZY_E2E_STORAGE_CLASS=replicated
+  COZY_LINSTOR_POOL_BASELINE_FILE="_out/tmp/linstor-baseline-$$"
+  yq() { printf 'v1.33.12\n'; }
+  # The first apply creates the tenant. Exiting the command substitution there
+  # also keeps the run away from the `sh -c` loops further on, which would
+  # call the real kubectl.
+  kubectl() {
+    case "$*" in apply*) printf 'UNEXPECTED_TENANT_APPLY\n'; exit 99 ;; esac
+    return 0
+  }
+  cozy_wait_tenant_drained() { return 0; }
+  cozy_wait_linstor_pool_free() { return 0; }
+  cozy_capture_linstor_pool_baseline() { printf 'BASELINE_CAPTURED\n'; return 42; }
+  fake_linstor_clock
+
+  rc=0
+  output=$(run_kubernetes_test '.' test-latest-version 59991) || rc=$?
+  rm -f "$clock_file"
+
+  if ! printf '%s\n' "$output" | grep -Fq BASELINE_CAPTURED; then
+    echo "replicated suite went on without recording a pre-suite LINSTOR baseline" >&2
+    return 1
+  fi
+  if [ "$rc" -eq 0 ] || printf '%s\n' "$output" | grep -Fq UNEXPECTED_TENANT_APPLY; then
+    echo "replicated suite continued after the baseline capture failed" >&2
+    return 1
+  fi
+}
+
+@test "replicated suite starting below the LINSTOR pool floor stops early and blames the environment" {
+  # shellcheck source=/dev/null
+  . "$HACK_DIR/e2e-chainsaw/_lib/run-kubernetes.sh"
+  COZY_E2E_STORAGE_CLASS=replicated
+  COZY_LINSTOR_POOL_BASELINE_FILE="_out/tmp/linstor-baseline-$$"
+  yq() { printf 'v1.33.12\n'; }
+  kubectl() {
+    case "$*" in
+      *machine-readable*) printf '87127923:srv2\n' ;;
+      *'sp l'*) printf '| data | srv2 | ZFS | data | 83.09 GiB | 199 GiB |\n' ;;
+      apply*) printf 'UNEXPECTED_TENANT_APPLY\n'; exit 99 ;;
+    esac
+    return 0
+  }
+  cozy_wait_tenant_drained() { return 0; }
+  cozy_capture_linstor_pool_baseline() { return 0; }
+  fake_linstor_clock
+
+  rc=0
+  output=$(run_kubernetes_test '.' test-latest-version 59991 2>&1) || rc=$?
+  rm -f "$clock_file"
+
+  if [ "$rc" -eq 0 ] || printf '%s\n' "$output" | grep -Fq UNEXPECTED_TENANT_APPLY; then
+    echo "suite went on to create its tenant with srv2 below the pool floor" >&2
+    return 1
+  fi
+  if ! printf '%s\n' "$output" | grep -Fq 'earlier suites'; then
+    echo "the low-pool failure does not name the environment as its cause" >&2
+    return 1
+  fi
+  if ! printf '%s\n' "$output" | grep -Fq '83.09 GiB'; then
+    echo "the low-pool failure does not print the per-node pool table" >&2
+    return 1
+  fi
+}
+
+@test "local Kubernetes suite does not demand the replicated lane's pool floor" {
+  # shellcheck source=/dev/null
+  . "$HACK_DIR/e2e-chainsaw/_lib/run-kubernetes.sh"
+  COZY_E2E_STORAGE_CLASS=local
+  COZY_LINSTOR_POOL_BASELINE_FILE="_out/tmp/linstor-baseline-$$"
+  yq() { printf 'v1.33.12\n'; }
+  kubectl() {
+    case "$*" in apply*) printf 'TENANT_APPLY_REACHED\n'; exit 0 ;; esac
+    return 0
+  }
+  cozy_wait_tenant_drained() { return 0; }
+  cozy_wait_linstor_pool_free() { printf 'UNEXPECTED_FLOOR\n'; return 99; }
+  cozy_capture_linstor_pool_baseline() { return 0; }
+  fake_linstor_clock
+
+  output=$(run_kubernetes_test '.' test-latest-version 59991 2>&1) || true
+  rm -f "$clock_file"
+
+  if printf '%s\n' "$output" | grep -Fq UNEXPECTED_FLOOR; then
+    echo "local suite waited for the 90 GiB floor that its platform volumes keep one pool below" >&2
+    return 1
+  fi
+  if ! printf '%s\n' "$output" | grep -Fq TENANT_APPLY_REACHED; then
+    echo "local suite stopped before creating its tenant: $output" >&2
+    return 1
+  fi
+}
+
+@test "a suite that fails before recording its baseline cannot reuse the previous suite's" {
+  # shellcheck source=/dev/null
+  . "$HACK_DIR/e2e-chainsaw/_lib/run-kubernetes.sh"
+  COZY_LINSTOR_POOL_BASELINE_FILE="_out/tmp/linstor-baseline-$$"
+  mkdir -p _out/tmp
+  # The previous suite's baseline is valid and matches the pools, so only its
+  # removal keeps this suite's cleanup from passing against it.
+  idle_pool_datasets | sed 's/^data-\(srv[0-9]\)/\1 &/' >"$COZY_LINSTOR_POOL_BASELINE_FILE"
+  yq() { printf 'v1.33.12\n'; }
+  kubectl() { return 0; }
+  cozy_wait_tenant_drained() { return 1; }
+  run_kubernetes_test '.' test-latest-version 59991 >/dev/null 2>&1 || true
+  fake_linstor_pools
+  idle_pool_datasets >"$pool_dir/datasets.0"
+  fake_linstor_clock
+
+  rc=0
+  cozy_wait_linstor_pool_baseline 300 >/dev/null 2>&1 || rc=$?
+  rm -rf "$COZY_LINSTOR_POOL_BASELINE_FILE" "$clock_file" "$pool_dir"
+
+  if [ "$rc" -ne 2 ]; then
+    echo "cleanup returned $rc instead of reporting the baseline missing; it checked against the previous suite's" >&2
+    return 1
+  fi
+}
+
+@test "pool dataset probe fails on a ZFS pool that names no zpool" {
+  # shellcheck source=/dev/null
+  . "$HACK_DIR/e2e-chainsaw/_lib/run-kubernetes.sh"
+  fake_linstor_pools
+  idle_pool_datasets >"$pool_dir/datasets.0"
+
+  listing=$(_cozy_linstor_pool_datasets)
+  printf '%s\n' '{"storage_pool_name":"data","node_name":"srv2","provider_kind":"ZFS","props":{}}' >"$pool_dir/srv2-pool"
+  rc=0
+  _cozy_linstor_pool_datasets >/dev/null 2>&1 || rc=$?
+  rm -rf "$pool_dir"
+
+  if [ "$listing" != "$(printf 'srv1 data-srv1\nsrv2 data-srv2\nsrv2 data-srv2/pvc-0a1b2c3d-platform_00000\nsrv3 data-srv3')" ]; then
+    echo "the probe did not read each node's zpool off its LINSTOR pool: $listing" >&2
+    return 1
+  fi
+  if [ "$rc" -eq 0 ]; then
+    echo "the probe accepted a ZFS pool with no zpool name" >&2
+    return 1
+  fi
+}
+
+@test "pool dataset comparison reports only new datasets and unread nodes" {
+  # shellcheck source=/dev/null
+  . "$HACK_DIR/e2e-chainsaw/_lib/run-kubernetes.sh"
+  baseline=$(printf 'srv1 data\nsrv2 data\nsrv2 data/pvc-old_00000\nsrv3 data')
+  reclaimed_old=$(printf 'srv1 data\nsrv2 data\nsrv3 data')
+  same_name_other_node=$(printf 'srv1 data\nsrv1 data/pvc-old_00000\nsrv2 data\nsrv2 data/pvc-old_00000\nsrv3 data')
+  missing_node=$(printf 'srv1 data\nsrv3 data')
+
+  cozy_linstor_pool_new_datasets "$baseline" "$baseline"
+  cozy_linstor_pool_new_datasets "$baseline" "$reclaimed_old"
+  rc=0
+  output=$(cozy_linstor_pool_new_datasets "$baseline" "$same_name_other_node") || rc=$?
+  if [ "$rc" -eq 0 ] || [ "$output" != 'new srv1 data/pvc-old_00000' ]; then
+    echo "a volume on a node that did not have it before was not reported as new: rc=$rc $output" >&2
+    return 1
+  fi
+  rc=0
+  output=$(cozy_linstor_pool_new_datasets "$baseline" "$missing_node") || rc=$?
+  if [ "$rc" -eq 0 ] || [ "$output" != 'unread srv2' ]; then
+    echo "a node missing from the current listing was not reported: rc=$rc $output" >&2
+    return 1
+  fi
+}
+
+@test "pool baseline capture persists every node's datasets" {
+  # shellcheck source=/dev/null
+  . "$HACK_DIR/e2e-chainsaw/_lib/run-kubernetes.sh"
+  COZY_LINSTOR_POOL_BASELINE_FILE="_out/tmp/linstor-baseline-$$"
+  fake_linstor_pools
+  idle_pool_datasets >"$pool_dir/datasets.0"
+
+  output=$(cozy_capture_linstor_pool_baseline)
+  captured=$(cat "$COZY_LINSTOR_POOL_BASELINE_FILE")
+  printf '%s\n' '{"storage_pool_name":"DfltDisklessStorPool","node_name":"srv2","provider_kind":"DISKLESS","props":{}}' >"$pool_dir/srv2-pool"
+  rc=0
+  cozy_capture_linstor_pool_baseline >/dev/null 2>&1 || rc=$?
+  partial=$(cat "$COZY_LINSTOR_POOL_BASELINE_FILE")
+  rm -rf "$COZY_LINSTOR_POOL_BASELINE_FILE" "$pool_dir"
+
+  [ "$captured" = "$(printf 'srv1 data-srv1\nsrv2 data-srv2\nsrv2 data-srv2/pvc-0a1b2c3d-platform_00000\nsrv3 data-srv3')" ]
+  printf '%s\n' "$output" | grep -Fq 'LINSTOR pool baseline recorded'
+  if [ "$rc" -eq 0 ] || [ -n "$partial" ]; then
+    echo "baseline capture accepted a listing without srv2: rc=$rc $partial" >&2
+    return 1
+  fi
+}
+
+@test "Kubernetes cleanup fails when LINSTOR capacity is not reclaimed" {
+  # shellcheck source=/dev/null
+  . "$HACK_DIR/e2e-chainsaw/_lib/run-kubernetes.sh"
+  kubectl() { return 0; }
+  cozy_wait_tenant_drained() { return 0; }
+  cozy_wait_linstor_pool_baseline() { return 42; }
+
+  if cozy_cleanup test-latest-version; then
+    echo "cleanup hid the failed LINSTOR reclamation barrier" >&2
+    return 1
+  fi
+}
+
+@test "cleanup of a suite that never recorded a baseline does not report a leak" {
+  # shellcheck source=/dev/null
+  . "$HACK_DIR/e2e-chainsaw/_lib/run-kubernetes.sh"
+  COZY_LINSTOR_POOL_BASELINE_FILE="_out/tmp/linstor-baseline-absent-$$"
+  rm -f "$COZY_LINSTOR_POOL_BASELINE_FILE"
+  kubectl() { return 0; }
+  cozy_wait_tenant_drained() { return 0; }
+  fake_linstor_clock
+
+  rc=0
+  output=$(cozy_cleanup test-latest-version 2>&1) || rc=$?
+  rm -f "$clock_file"
+
+  if [ "$rc" -eq 0 ]; then
+    echo "cleanup passed with LINSTOR reclamation unchecked" >&2
+    return 1
+  fi
+  if printf '%s\n' "$output" | grep -Fq 'did not return to the pre-suite level'; then
+    echo "cleanup blamed the suite for a leak although it stopped before recording a baseline: $output" >&2
+    return 1
+  fi
+}
+
+@test "local Kubernetes suite cannot start without a LINSTOR baseline" {
+  # shellcheck source=/dev/null
+  . "$HACK_DIR/e2e-chainsaw/_lib/run-kubernetes.sh"
+  COZY_E2E_STORAGE_CLASS=local
+  COZY_LINSTOR_POOL_BASELINE_FILE="_out/tmp/linstor-baseline-$$"
+  yq() { printf 'v1.33.12\n'; }
+  kubectl() { return 0; }
+  cozy_wait_tenant_drained() { return 0; }
+  cozy_capture_linstor_pool_baseline() { return 42; }
+  helm() { printf 'UNEXPECTED_HELM_CALL\n'; return 99; }
+  fake_linstor_clock
+
+  rc=0
+  output=$(run_kubernetes_test '.' test-latest-version 59991) || rc=$?
+  rm -f "$clock_file"
+
+  if [ "$rc" -eq 0 ]; then
+    echo "suite accepted a failed local LINSTOR baseline capture" >&2
+    return 1
+  fi
+  if printf '%s\n' "$output" | grep -Fq UNEXPECTED_HELM_CALL; then
+    echo "suite continued into Helm after the baseline capture failed" >&2
+    return 1
+  fi
+}
+
+@test "Kubernetes cleanup operations outlive their bounded reclamation stages" {
+  for suite in latest previous; do
+    timeout=$(yq "select(.metadata.name == \"kubernetes-${suite}\") | .spec.steps[0].finally[0].script.timeout" "hack/e2e-chainsaw/kubernetes-${suite}/chainsaw-test.yaml")
+    if [ "$timeout" != 22m ]; then
+      echo "kubernetes-${suite} cleanup timeout is $timeout, expected 22m" >&2
+      return 1
+    fi
+  done
+}
+
+@test "both merge-gating lanes forward local storage through install and Chainsaw" {
+  # Checked in both workflows rather than one: pull-requests.yaml gates same-repo
+  # PRs and e2e-fork.yaml gates fork PRs, they carry the override separately, and
+  # a lane that installs on `local` while templating Chainsaw with `replicated`
+  # fails deep inside a suite rather than at the mismatch.
+  install_command=$(make -n -C packages/core/testing SANDBOX_NAME=test COZY_E2E_STORAGE_CLASS=local install-cozystack)
+  make_command=$(make -n -C packages/core/testing SANDBOX_NAME=test COZY_E2E_STORAGE_CLASS=local CHAINSAW_SUITES=vminstance test-chainsaw)
+
+  for wf in .github/workflows/pull-requests.yaml .github/workflows/e2e-fork.yaml; do
+    install_value=$(yq '.jobs.e2e.steps[] | select(.name == "Install Cozystack into sandbox") | .env.COZY_E2E_STORAGE_CLASS' "$wf")
+    run_value=$(yq '.jobs.e2e.steps[] | select(.name == "Run E2E tests") | .env.COZY_E2E_STORAGE_CLASS' "$wf")
+    if [ "$install_value" != local ] || [ "$run_value" != local ]; then
+      echo "unexpected storage modes in $wf: install=$install_value chainsaw=$run_value" >&2
+      return 1
+    fi
+  done
+  if ! printf '%s\n' "$install_command" | grep -Fq -- '-e COZY_E2E_STORAGE_CLASS="local"'; then
+    echo "testing Makefile does not forward COZY_E2E_STORAGE_CLASS into installation" >&2
+    return 1
+  fi
+  if ! printf '%s\n' "$make_command" | grep -Fq -- '-e COZY_E2E_STORAGE_CLASS="local"'; then
+    echo "testing Makefile does not forward COZY_E2E_STORAGE_CLASS into the sandbox" >&2
+    return 1
+  fi
+  if ! printf '%s\n' "$make_command" | grep -Fq -- '--set-string storageClass="${COZY_E2E_STORAGE_CLASS:-replicated}" vminstance'; then
+    echo "testing Makefile does not pass the lane storage class to Chainsaw values" >&2
+    return 1
+  fi
+}
+
+@test "container install supplies VictoriaLogs local storage before monitoring exists" {
+  install_suite=hack/e2e-install-cozystack.bats
+
+  if ! grep -Fq 'storage_class="${COZY_E2E_STORAGE_CLASS:-replicated}"' "$install_suite"; then
+    echo "install suite does not retain the replicated QEMU default" >&2
+    return 1
+  fi
+  if ! grep -Fq 'kubectl patch secret cozystack-values -n tenant-root --type merge --patch-file "$root_values_patch_file"' "$install_suite"; then
+    echo "install suite does not put the monitoring override in root values" >&2
+    return 1
+  fi
+  if grep -Fq 'kubectl patch hr/monitoring' "$install_suite"; then
+    echo "install suite still races monitoring reconciliation with a HelmRelease patch" >&2
+    return 1
+  fi
+  if ! grep -Fq '.logsStorages = [{"name":"generic","retentionPeriod":"1","storage":"10Gi","storageClassName":strenv(COZY_E2E_STORAGE_CLASS)}]' "$install_suite"; then
+    echo "monitoring override does not preserve the required VictoriaLogs values" >&2
+    return 1
+  fi
+
+  secret_patch_line=$(grep -nF 'kubectl patch secret cozystack-values' "$install_suite" | cut -d: -f1)
+  tenant_patch_line=$(grep -nF 'kubectl patch tenants/root' "$install_suite" | cut -d: -f1)
+  if [ -z "$secret_patch_line" ] || [ -z "$tenant_patch_line" ] || [ "$secret_patch_line" -ge "$tenant_patch_line" ]; then
+    echo "root values must be patched before monitoring is enabled: secret=$secret_patch_line tenant=$tenant_patch_line" >&2
+    return 1
+  fi
+
+  rendered=$(mktemp)
+  helm template monitoring packages/extra/monitoring --namespace tenant-root \
+    --set-string 'logsStorages[0].name=generic' \
+    --set-string 'logsStorages[0].retentionPeriod=1' \
+    --set-string 'logsStorages[0].storage=10Gi' \
+    --set-string 'logsStorages[0].storageClassName=local' > "$rendered"
+  rendered_class=$(yq 'select(.kind == "HelmRelease" and .metadata.name == "monitoring-system") | .spec.values.logsStorages[0].storageClassName' "$rendered")
+  rm -f "$rendered"
+  if [ "$rendered_class" != local ]; then
+    echo "monitoring chart did not carry the root values override into its child release: $rendered_class" >&2
+    return 1
+  fi
+}
+
+@test "DRBD-dependent fixtures and Kubernetes checks consume the lane storage mode" {
+  for manifest in hack/e2e-chainsaw/vminstance/vmdisk.yaml hack/e2e-chainsaw/vminstance/vmdisk-vmi.yaml; do
+    storage_class=$(yq '.spec.storageClass' "$manifest")
+    if [ "$storage_class" != '($values.storageClass)' ]; then
+      echo "$manifest does not consume the Chainsaw storageClass value: $storage_class" >&2
+      return 1
+    fi
+  done
+
+  kubernetes_script=hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  rendered_uses=$(grep -Fc 'storageClass: "${storage_class}"' "$kubernetes_script")
+  if [ "$rendered_uses" -ne 2 ]; then
+    echo "expected both tenant Kubernetes resources to consume storage_class, found $rendered_uses" >&2
+    return 1
+  fi
+  if ! grep -Fq 'if [ "$storage_class" = local ]; then' "$kubernetes_script"; then
+    echo "local-only Kubernetes suites do not omit DRBD/RWX assertions" >&2
+    return 1
+  fi
+  if ! grep -Fq 'if [ "$storage_class" = replicated ]; then' "$kubernetes_script"; then
+    echo "fallback regression does not limit replicated StorageClass restoration to QEMU" >&2
+    return 1
+  fi
+}
diff --git a/hack/mariadb-first-boot-waits.bats b/hack/mariadb-first-boot-waits.bats
new file mode 100644
index 0000000000..036cd4e574
--- /dev/null
+++ b/hack/mariadb-first-boot-waits.bats
@@ -0,0 +1,1463 @@
+#!/usr/bin/env bats
+# -----------------------------------------------------------------------------
+# Contract: nothing that waits for a database HelmRelease to become Ready may
+# allow less than that release can legitimately take. The backup walkthroughs
+# of the suites in MBW_SUITES carry such waits, and each suite is checked on
+# its own; for mariadb the chainsaw suite's HR-Ready asserts are checked too.
+# The other suites' HR-Ready asserts are not checked here.
+#
+# A wait has two floors and must beat the larger one by MBW_START_MARGIN. The
+# margin is a policy value, not a measurement: it stands for the time the
+# wait's clock runs before the install's -- the Application reconcile, the
+# chart artifact fetch and the helm-controller queue -- none of which the tree
+# bounds. It equals the headroom every wait held here already carries.
+#
+# The first floor is the chart's first-boot budget, computed only for a suite
+# whose MBW_SUITES row names a chart with a startupProbe; for the others only a
+# measurement could give it. For mariadb: helm-controller defaults
+# spec.waitStrategy to `poller`, kstatus has no rule for
+# k8s.mariadb.com/MariaDB and reads its Ready=False as InProgress, so the
+# install MAY span a first boot. "May", because a poll landing before the
+# operator's first status write reads a condition-less CR as Current, which is
+# why the suite keeps an endpoint assert after the HR-Ready one. The budget is
+# initialDelaySeconds + (failureThreshold - 1) * periodSeconds, with the
+# threshold from the chart and the operator's defaults of 20 and 10 (both
+# probe shapes, in mariadb-operator's pkg/builder/container_builder.go). It
+# is one boot, not one per replica, because the operator sets
+# PodManagementPolicy: Parallel. Were that wrong, two replicas would serialize
+# to 620s, the floor would bind there, and 660 would fall short of the margin
+# over it.
+#
+# The second floor is the install timeout cozystack-api stamps on the release
+# (pkg/cmd/server/start.go). A wait equal to it expires first, because its clock
+# starts when the step runs and the install's only after the Application is
+# reconciled and the chart fetched. Of the floors this file computes, it is
+# the one that binds today in every suite. Each suite's ApplicationDefinition
+# is held to not override it.
+#
+# What is not guarded, because each would make the numbers slack rather than
+# short: cozystack-api taking --helmrelease-install-timeout from a manifest
+# (only cozystack-operator is passed it today); a waitStrategy of `legacy` on
+# a suite's RD; the UseHelm3Defaults feature gate. healthCheckExprs alone
+# resolves to `poller`, so it is not a lever. Also unguarded: an operator bump
+# that moves the probe defaults; a timed non-HelmRelease assert placed ahead of
+# the HelmRelease one inside a wait-helmrelease-ready step, or an HR-Ready
+# assert in a step with another name, since the suite extractor selects by step
+# name and takes the first timeout in the step.
+#
+# The waits are also held against the Chainsaw op that runs the walkthrough,
+# because an op that runs out SIGKILLs the script and loses its error. Per
+# suite, the op minus the HelmRelease waits it reaches, bucket included, must
+# keep the remainder in MBW_SUITES; a wait the op never reaches, the mongodb
+# target behind the SKIP_RESTORE=1 its op passes, is not counted. For mariadb
+# the op minus the ceilings up to and including the source wait is held as well;
+# extending that past the source wait would sum ceilings the script reaches only
+# on the happy path. Every remainder sits at exactly its constant, so raising a
+# wait without raising the op reds.
+#
+# The errexit test reaches beyond the MBW_SUITES walkthrough waits:
+# wait_hr_ready is defined once, in examples/backups/_lib/wait-helpers.sh, for
+# every backup example, and that test runs its exit branches through the
+# helpers run-all.sh sources. hack/backup-examples-shared-helpers.bats holds it
+# to that one definition.
+#
+# cozytest.sh's awk parser recognizes only @test blocks and a bare `}` on its
+# own line; there is no bats `run` or `$status`, and no setup/teardown.
+# Assertions are direct shell tests that exit non-zero. A `}` at column zero
+# gets `return 0` inserted ahead of it, so the helpers below report through
+# stdout only and never through an exit status.
+#
+# Run with: hack/cozytest.sh hack/mariadb-first-boot-waits.bats
+# -----------------------------------------------------------------------------
+
+load test_helper
+
+MBW_SCRIPT="examples/backups/mariadb/run-all.sh"
+MBW_CHART="packages/apps/mariadb/templates/mariadb.yaml"
+MBW_SUITE="hack/e2e-chainsaw/mariadb/chainsaw-test.yaml"
+MBW_APISERVER="pkg/cmd/server/start.go"
+# Seconds the round-trip op must keep free after the ceilings up to and
+# including the source wait. A ratchet on today's figure, not a derived bound:
+# raise it deliberately, never let it fall.
+MBW_OP_REMAINDER=870
+# How many ceilings that prefix is made of: bucket release, two bucket fields,
+# S3 preflight, source wait. Pinned exactly, because both ways of losing one shrink the sum
+# and GROW the remainder, which is the loosening direction.
+MBW_PREFIX_CEILINGS=5
+# Seconds a wait must exceed its floor by. Policy, not measurement; the header
+# says what it stands for.
+MBW_START_MARGIN=60
+# One row per suite: name | the prefix the database waits' release argument
+# starts with | the chart whose startupProbe gives a first-boot floor, or - |
+# seconds the round-trip op must keep free once every HelmRelease wait it
+# reaches, the bucket one included, is paid. The suite, op script and RD
+# paths follow from the name, and the waits are read from every
+# examples/backups/<name>/*.sh rather than a listed subset, so a wait added in
+# a new file joins both the count and the sum. The last column is a
+# ratchet on each op's remainder from before its waits were raised to clear
+# the floor, which that raise kept: raise it deliberately, never let it fall.
+MBW_SUITES='mariadb|"mariadb-|packages/apps/mariadb/templates/mariadb.yaml|900
+mongodb|"$MONGODB_|-|1200
+rabbitmq|"$RABBITMQ_|-|900
+clickhouse|"clickhouse-|-|2700
+postgres|"postgres-|-|1980'
+
+# Print one "<release-arg> <timeout>" line per wait_hr_ready call in $1 whose
+# release argument starts with $2, compared as a literal string, or every call
+# when $2 is `*`. A call that
+# passes no timeout prints "default" for it, because the helper's own fallback
+# then applies and the call site says nothing about the budget it accepted.
+# With $3 = yes the read stops at the column-zero `if` that tests
+# SKIP_RESTORE, which is where a walkthrough run with SKIP_RESTORE=1 exits. Any
+# other mention -- a default assigned early, say -- must not stop it, or the
+# waits after it drop out of the sum and the remainder grows. Comment lines
+# need no filter: both patterns are anchored at column zero.
+mbw_db_waits() {
+  awk -v p="$2" -v stop="${3:-no}" '
+        stop == "yes" && /^if[[:space:]].*SKIP_RESTORE/ { exit }
+        /^wait_hr_ready[[:space:]]/ && (p == "*" || index($2, p) == 1) {
+          print $2, ($3 == "" ? "default" : $3)
+        }' "$1"
+}
+
+mbw_suite_row() {
+  printf '%s\n' "$MBW_SUITES" | awk -F'|' -v s="$1" '$1 == s'
+}
+
+# Print how many distinct releases the "<release-arg> <timeout>" lines on
+# stdin wait for. Two waits on the source and none on the target is still two
+# waits, so the count alone would pass a walkthrough that never gates its
+# restore target.
+mbw_distinct_releases() {
+  awk '{ print $1 }' | sort -u | grep -c . || true
+}
+
+# Print every release argument wait_hr_ready is called with in $1, mariadb or
+# not. Used to show the extractor above is selecting rather than matching
+# everything.
+mbw_all_waits() {
+  grep -v '^[[:space:]]*#' "$1" \
+    | awk '/^wait_hr_ready[[:space:]]/ { print $2 }'
+}
+
+# Print the timeout, in seconds, of the first assert in each
+# `wait-helmrelease-ready` step of the Chainsaw suite $1 -- each such step holds
+# exactly one, and it is the HelmRelease gate this contract is about. Chainsaw
+# takes a Go duration, so m and s suffixes are converted and anything else is
+# printed verbatim for the caller to reject. A step that states no timeout at
+# all prints "unset" rather than nothing, the same way the script-side extractor
+# reports "default": this repo sets timeouts.assert to 5m in
+# hack/e2e-chainsaw/.chainsaw.yaml, under every floor here, so silently
+# skipping such a step would drop the worst case.
+mbw_suite_hr_waits() {
+  awk '
+    # Close the previous step first, so an untimed one is reported wherever it
+    # sits. seen is per-step, not per-file: set per file, it would hide every
+    # untimed step after the first timed one.
+    /^[[:space:]]*-[[:space:]]+name:[[:space:]]*/ {
+      if (instep && !seen) print "unset"
+      instep = 0
+    }
+    /^[[:space:]]*-[[:space:]]+name:[[:space:]]*wait-helmrelease-ready[[:space:]]*$/ {
+      instep = 1; seen = 0; next
+    }
+    instep && !seen && /^[[:space:]]*timeout:[[:space:]]*[^[:space:]]+[[:space:]]*$/ {
+      sub(/^[[:space:]]*timeout:[[:space:]]*/, "")
+      sub(/[[:space:]]*$/, "")
+      if ($0 ~ /^[0-9]+m$/)      { sub(/m$/, ""); print $0 * 60 }
+      else if ($0 ~ /^[0-9]+s$/) { sub(/s$/, ""); print $0 + 0 }
+      else                       { print }
+      seen = 1
+    }
+    END { if (instep && !seen) print "unset" }
+  ' "$1"
+}
+
+# Print, in seconds, the Install.Timeout cozystack-api stamps on every
+# generated HelmRelease. A waiter that expires at the same moment gives up
+# exactly when the install records why it failed, so this is the second floor
+# every wait here has to beat.
+mbw_install_timeout() {
+  awk '/HelmReleaseInstallTimeout:[[:space:]]*"[0-9]+[ms]"/ {
+         match($0, /"[0-9]+[ms]"/)
+         v = substr($0, RSTART + 1, RLENGTH - 2)
+         if (v ~ /m$/) { sub(/m$/, "", v); print v * 60 } else { sub(/s$/, "", v); print v + 0 }
+         exit
+       }' "$1"
+}
+
+# Print "ok" when a wait of $1 seconds is at least MBW_START_MARGIN above a
+# floor of $2, "low" otherwise.
+# Echoes rather than returning a status, like every helper here: cozytest
+# injects `return 0` before a `}` at column zero, which would make an
+# exit-status verdict always succeed.
+#
+# Split out so the comparison itself can be pinned. Inline it is not
+# pinnable: every wait in the tree clears every floor, so a floor operand
+# replaced by 0 leaves the live values green while the guard accepts any
+# positive number. As a helper it takes fixtures.
+mbw_wait_clears_floor() {
+  if [ "$1" -ge $(( $2 + MBW_START_MARGIN )) ]; then printf 'ok\n'; else printf 'low\n'; fi
+}
+
+# Print the chart's first-boot startup budget for a failureThreshold of $1.
+# initialDelaySeconds=20 and periodSeconds=10 are the operator's probe defaults,
+# which the chart deliberately does not override; both probe shapes carry them,
+# so the arithmetic holds whichever the operator picks. Extracted because the
+# two call sites below would otherwise each carry their own copy of it, and a
+# budget that differs between them is worse than one that is wrong in both.
+mbw_startup_budget() {
+  printf '%s\n' "$(( 20 + ($1 - 1) * 10 ))"
+}
+
+# Print the seconds budget of every wait in $1 that runs up to and including the
+# first mariadb wait_hr_ready, one per line. These are the ceilings the Chainsaw
+# script op has to contain before the source instance can even fail: the bucket
+# release, the two bucket fields, the S3 preflight and the source wait itself.
+# Continuation lines are joined first, because two of the calls wrap.
+#
+# The waits are anchored at column zero: the flow of this script runs
+# unindented, while an indented wait sits inside a helper definition --
+# wait_app_grant_ready wraps one whose budget arrives in a variable, and reading
+# it as part of the flow would count a ceiling that never runs there. The S3
+# preflight is read at any indent, because it runs in the flow under the gate
+# the Chainsaw op sets and is defined in a library, not here.
+#
+# A call whose last field is not a bare integer prints `skip` rather than
+# nothing. Dropping it silently would shrink the sum, and a smaller sum makes
+# the remainder guard MORE permissive -- the one direction a ratchet must never
+# drift in. The caller treats any `skip` as a failure, so a wait that starts
+# taking its budget from a variable or a default stops the contract instead of
+# quietly loosening it.
+mbw_prefix_ceilings() {
+  grep -v '^[[:space:]]*#' "$1" \
+    | awk '{ if (sub(/\\$/, "")) { buf = buf $0 " "; next }
+             line = buf $0; buf = ""
+             # The split below names an explicit regex separator rather than
+             # using the default one, so trailing whitespace becomes an empty
+             # final field and a perfectly literal budget reads as absent. That
+             # is a false red on the kind of edit an editor makes by itself,
+             # and a false red is cheapest to green by deleting the guard.
+             sub(/[[:space:]]+$/, "", line)
+             if (line ~ /^wait_hr_ready|^wait_for_field|^[[:space:]]*cozy_backup_access_preflight[[:space:]]/) {
+               n = split(line, f, /[[:space:]]+/)
+               if (f[n] ~ /^[0-9]+$/) print f[n]; else print "skip"
+             }
+             if (line ~ /^wait_hr_ready[[:space:]]+"mariadb-/) exit
+           }'
+}
+
+# Print the seconds budget of the Chainsaw `- script:` op in $1 that runs the
+# round-trip script $2, identified by what it RUNS rather than by how big it is.
+# The mariadb suite has three ops with a minute timeout -- an 8m pre-clean,
+# this one, and an 8m cleanup -- and taking the largest looks equivalent while
+# the round-trip op is the largest. It is not: raising an unrelated op past it
+# silently moves the ratchet onto the wrong number, in the loosening direction,
+# and nothing reds.
+# Selecting on the script it invokes cannot drift that way, because the identity
+# does not depend on the values being compared.
+#
+# Comment lines are excluded from that match. The full path written into a
+# comment inside an EARLIER op would move the measurement onto that op, and the
+# ops ahead of each round-trip are far shorter than it, so the remainder
+# would collapse and the tests below would fail loudly: the exclusion
+# prevents a false red, not a silent pass.
+mbw_suite_script_op() {
+  awk -v s="$2" '
+       /^[[:space:]]*-[[:space:]]+script:[[:space:]]*$/ { inop = 1; t = ""; next }
+       inop && /^[[:space:]]*timeout:[[:space:]]*[0-9]+m[[:space:]]*$/ {
+         match($0, /[0-9]+/); t = substr($0, RSTART, RLENGTH) * 60; next
+       }
+       inop && !/^[[:space:]]*#/ && index($0, s) {
+         if (t != "") { print t; exit }
+       }
+       /^[[:space:]]*-[[:space:]]+[a-z]/ && !/script:/ { inop = 0 }
+      ' "$1"
+}
+
+# Print "yes" when the `- script:` op in $1 runs $2 with SKIP_RESTORE=1 on the
+# same command, continuation lines joined; "no" otherwise. Read from the op
+# rather than listed per suite, so an op that stops passing it counts the
+# waits past the skip again and its ratchet reds. Another command in the op
+# carrying it must not count: that would drop waits the script still runs.
+mbw_op_skips_restore() {
+  awk -v s="$2" '
+       function close_op() {
+         if (inop && hit) { print (skip ? "yes" : "no"); done = 1; exit }
+         inop = 0
+       }
+       /^[[:space:]]*-[[:space:]]+script:[[:space:]]*$/ { close_op(); inop = 1; hit = 0; skip = 0; next }
+       /^[[:space:]]*-[[:space:]]+[a-z]/ && !/script:/ { close_op() }
+       inop && !/^[[:space:]]*#/ {
+         if (sub(/\\[[:space:]]*$/, "")) { buf = buf $0 " "; next }
+         line = buf $0; buf = ""
+         if (index(line, s)) {
+           hit = 1
+           if (line ~ /(^|[^A-Za-z0-9_])SKIP_RESTORE=1([^0-9]|$)/) skip = 1
+         }
+       }
+       END { if (!done) { close_op(); if (!done) print "no" } }
+      ' "$1"
+}
+
+# Print the larger of the two floors a wait has to beat: $1 the chart's own
+# first-boot startup budget, $2 the install timeout the generated release
+# carries. Which of them binds is not fixed. Today the install timeout does, and
+# the startup budget would only take over if failureThreshold grew past it, so
+# neither may be assumed to be the operative one.
+mbw_compute_floor() {
+  if [ "$1" -ge "$2" ]; then printf '%s\n' "$1"; else printf '%s\n' "$2"; fi
+}
+
+# Print the failureThreshold the chart sets on the MariaDB CR's startupProbe.
+# Scoped to the startupProbe block by INDENTATION, so a threshold added to some
+# other probe later cannot be mistaken for this one. Closing the block on "the
+# next key that is not failureThreshold" would instead close it on a sibling:
+# adding periodSeconds under startupProbe is a legitimate chart edit, and it
+# would leave this returning nothing and the contract red for the wrong reason.
+mbw_failure_threshold() {
+  awk '
+    /^[[:space:]]*startupProbe:[[:space:]]*$/ {
+      match($0, /^[[:space:]]*/); blockindent = RLENGTH; inblock = 1; next
+    }
+    inblock && /[^[:space:]]/ {
+      match($0, /^[[:space:]]*/)
+      if (RLENGTH <= blockindent) { inblock = 0 }
+    }
+    inblock && /^[[:space:]]*failureThreshold:[[:space:]]*[0-9]+[[:space:]]*$/ {
+      sub(/^[[:space:]]*failureThreshold:[[:space:]]*/, "")
+      sub(/[[:space:]]*$/, "")
+      print
+      exit
+    }
+  ' "$1"
+}
+
+# Print the first-boot budget the chart's own comment says its threshold buys,
+# in seconds. The chart states it as "A threshold of 30 lifts the budget to
+# 310s", one sentence below a paragraph explaining that a shorter budget leaves
+# the datadir half-initialised and the pod crash-looping with no path back.
+# Reading the requirement out of the chart keeps it derived: raise the
+# threshold and update the sentence, and both sides move together.
+mbw_documented_budget() {
+  # Comment markers stripped and lines joined before matching, because the
+  # sentence is wrapped: "lifts the" ends one line and "budget to 310s" starts
+  # the next. A line-oriented read finds nothing and reports the chart as
+  # silent, which is the loudest possible way to be wrong about a file that
+  # does say it.
+  sed 's/^[[:space:]]*#[[:space:]]*//' "$1" \
+    | tr '\n' ' ' | tr -s ' ' \
+    | grep -o 'lifts the budget to [0-9][0-9]*s' \
+    | head -1 | tr -cd '0-9'
+}
+
+# Print, one per line, every reason the database waits of suite $1 fail the
+# floor contract; print nothing when they pass. The waits must be exactly two,
+# each a literal clearing the floor by MBW_START_MARGIN, and the suite's RD must
+# not move the floor off the server default. Every wait counts here, reached by
+# the op or not: a wait the op skips still runs in the walkthrough on its own.
+# $2 replaces examples/backups/$1 as the directory the waits are read from and
+# $3 the RD path, so a fixture can drive the whole check.
+mbw_suite_floor_errors() {
+  mbw_row=$(mbw_suite_row "$1")
+  [ -n "$mbw_row" ] || { printf 'no MBW_SUITES row for %s\n' "$1"; return 0; }
+  mbw_prefix=$(printf '%s\n' "$mbw_row" | cut -d'|' -f2)
+  mbw_chart=$(printf '%s\n' "$mbw_row" | cut -d'|' -f3)
+  mbw_rd=${3:-packages/system/$1-rd/cozyrds/$1.yaml}
+  # grep exits non-zero on a file it cannot open, so a moved RD would send both
+  # checks below down their false branch and pass having read nothing.
+  if [ ! -f "$mbw_rd" ]; then
+    printf '%s not found, so the floor cannot be checked against a per-application override\n' "$mbw_rd"
+  else
+    if grep -q "release.cozystack.io/helm-install-timeout" "$mbw_rd"; then
+      printf '%s sets a per-application install timeout; the floor here derives from the server default and must be taught to read the override\n' "$mbw_rd"
+    fi
+    # With waiting disabled the install no longer spans the app coming up, so
+    # the premise is gone rather than merely mis-numbered.
+    if grep -q "release.cozystack.io/helm-install-disable-wait" "$mbw_rd"; then
+      printf '%s disables the install wait; HelmRelease readiness no longer spans the app coming up and this contract no longer describes it\n' "$mbw_rd"
+    fi
+  fi
+  mbw_install=$(mbw_install_timeout "$MBW_APISERVER")
+  mbw_floor=$mbw_install
+  mbw_why="release install timeout ${mbw_install}s"
+  if [ "$mbw_chart" != "-" ]; then
+    mbw_budget=$(mbw_startup_budget "$(mbw_failure_threshold "$mbw_chart")")
+    mbw_floor=$(mbw_compute_floor "$mbw_budget" "$mbw_install")
+    mbw_why="startup budget ${mbw_budget}s from $mbw_chart, $mbw_why"
+  fi
+  mbw_waits=
+  for mbw_f in "${2:-examples/backups/$1}"/*.sh; do
+    mbw_waits="$mbw_waits$(mbw_db_waits "$mbw_f" "$mbw_prefix")
+"
+  done
+  mbw_n=$(printf '%s' "$mbw_waits" | grep -c . || true)
+  if [ "$mbw_n" -ne 2 ]; then
+    printf 'expected exactly 2 %s waits with a release argument starting %s in %s/*.sh, found %s:\n%s\n' \
+      "$1" "$mbw_prefix" "${2:-examples/backups/$1}" "$mbw_n" "$mbw_waits"
+  fi
+  mbw_nd=$(printf '%s' "$mbw_waits" | mbw_distinct_releases)
+  if [ "$mbw_nd" -ne 2 ]; then
+    printf 'the %s waits name %s distinct releases, expected 2 -- the source and the restore target each need their own:\n%s\n' \
+      "$1" "$mbw_nd" "$mbw_waits"
+  fi
+  mbw_ifs=$IFS
+  IFS='
+'
+  for mbw_line in $mbw_waits; do
+    IFS=$mbw_ifs
+    mbw_name=${mbw_line% *}
+    mbw_t=${mbw_line##* }
+    case "$mbw_t" in
+      ''|*[!0-9]*)
+        printf 'wait_hr_ready %s states no literal timeout (got %s); the budget must be at least %ss\n' \
+          "$mbw_name" "$mbw_t" "$(( mbw_floor + MBW_START_MARGIN ))"
+        continue
+        ;;
+    esac
+    if [ "$(mbw_wait_clears_floor "$mbw_t" "$mbw_floor")" != "ok" ]; then
+      printf 'wait_hr_ready %s allows %ss; the floor is %ss (%s) and a wait must exceed it by MBW_START_MARGIN=%ss\n' \
+        "$mbw_name" "$mbw_t" "$mbw_floor" "$mbw_why" "$MBW_START_MARGIN"
+    fi
+  done
+  IFS=$mbw_ifs
+}
+
+# Print every reason the round-trip op of suite $1 fails to keep its MBW_SUITES
+# remainder once the HelmRelease waits it reaches are paid; print nothing when
+# it keeps it. A wait past a SKIP_RESTORE exit the op takes is not reached. The
+# bucket wait counts: an op raised together with it must keep the remainder,
+# not gain the raise as slack. $2 and $3 replace the suite file and the
+# examples/backups/$1 directory, so a fixture can drive the whole check.
+mbw_suite_slack_errors() {
+  mbw_row=$(mbw_suite_row "$1")
+  [ -n "$mbw_row" ] || { printf 'no MBW_SUITES row for %s\n' "$1"; return 0; }
+  mbw_want=$(printf '%s\n' "$mbw_row" | cut -d'|' -f4)
+  mbw_suite=${2:-hack/e2e-chainsaw/$1/chainsaw-test.yaml}
+  mbw_sdir=${3:-examples/backups/$1}
+  mbw_script="$mbw_sdir/run-all.sh"
+  mbw_op=$(mbw_suite_script_op "$mbw_suite" "$mbw_script")
+  case "$mbw_op" in
+    ''|*[!0-9]*)
+      printf 'no timeout found on the op in %s that runs %s (got %s)\n' "$mbw_suite" "$mbw_script" "$mbw_op"
+      return 0
+      ;;
+  esac
+  mbw_skip=$(mbw_op_skips_restore "$mbw_suite" "$mbw_script")
+  mbw_waits=
+  for mbw_f in "$mbw_sdir"/*.sh; do
+    mbw_waits="$mbw_waits$(mbw_db_waits "$mbw_f" '*' "$mbw_skip")
+"
+  done
+  # A bucket wait that stops being read -- indented into an `if`, say --
+  # shrinks the sum and widens the slack in silence.
+  mbw_nb=$(printf '%s' "$mbw_waits" | grep -c '^"bucket-' || true)
+  if [ "$mbw_nb" -ne 1 ]; then
+    printf 'expected the %s op to reach exactly 1 bucket HelmRelease wait, found %s:\n%s\n' "$1" "$mbw_nb" "$mbw_waits"
+    return 0
+  fi
+  mbw_sum=0
+  mbw_list=
+  for mbw_t in $(printf '%s' "$mbw_waits" | awk '{ print $NF }'); do
+    case "$mbw_t" in
+      *[!0-9]*)
+        printf 'a %s wait the op reaches states no literal budget (%s); the sum would shrink, which loosens this guard\n' "$1" "$mbw_t"
+        return 0
+        ;;
+    esac
+    mbw_sum=$(( mbw_sum + mbw_t ))
+    mbw_list="$mbw_list $mbw_t"
+  done
+  mbw_slack=$(( mbw_op - mbw_sum ))
+  if [ "$mbw_slack" -lt "$mbw_want" ]; then
+    printf 'the %s round-trip op (%ss) leaves %ss once the HelmRelease waits it reaches (%s, SKIP_RESTORE=1 passed: %s) are paid\n' \
+      "$1" "$mbw_op" "$mbw_slack" "${mbw_list# }" "$mbw_skip"
+    printf 'that is below the %ss MBW_SUITES reserves for the rest of the flow; a wait was raised or the op was lowered\n' "$mbw_want"
+    printf 'the fix is the op in the same change -- not lowering the remainder -- or a late failure is SIGKILLed instead of reported\n'
+  fi
+}
+
+@test "the chart still declares the startup failure threshold the budget derives from" {
+    # Without this the budget below silently becomes 20 + (0-1)*10 = 10 and
+    # every wait passes it. The threshold is what the whole contract hangs on,
+    # so its absence has to be a failure and not a default.
+    mbw_threshold=$(mbw_failure_threshold "$MBW_CHART")
+    case "$mbw_threshold" in
+      ''|*[!0-9]*)
+        echo "no numeric startupProbe.failureThreshold found in $MBW_CHART (got '${mbw_threshold}')" >&2
+        exit 1
+        ;;
+    esac
+    # Not a bare lower bound: a threshold of 3 is positive, and the chart's own
+    # comment describes it as leaving the datadir half-initialised and the pod
+    # crash-looping permanently. The floor comparison cannot see that either,
+    # because max(40, 600) is still 600 and every wait clears it.
+    # The requirement comes from the chart rather than from a literal here.
+    mbw_want=$(mbw_documented_budget "$MBW_CHART")
+    case "$mbw_want" in
+      ''|*[!0-9]*)
+        echo "$MBW_CHART no longer states what budget its threshold buys" >&2
+        echo "expected a sentence of the form 'lifts the budget to <N>s'; without it this contract cannot tell a tuned threshold from a catastrophic one" >&2
+        exit 1
+        ;;
+    esac
+    mbw_budget=$(mbw_startup_budget "$mbw_threshold")
+    [ "$mbw_budget" -ge "$mbw_want" ] || {
+        echo "startupProbe.failureThreshold ${mbw_threshold} gives a ${mbw_budget}s first-boot budget, under the ${mbw_want}s the chart states it needs" >&2
+        echo "the chart's comment explains what a short budget costs: a datadir with system tables but no root grant, and a pod that crash-loops with no path back" >&2
+        exit 1
+    }
+}
+
+@test "the install-timeout extractor converts its unit rather than assuming minutes" {
+    # start.go carries "10m" today, so the seconds arm never runs against the
+    # tree. A default written as "600s" read as 600 minutes would raise the
+    # floor thirtyfold and red every wait; written the other way, a minutes
+    # value read as seconds would drop it to a number every wait clears. Neither
+    # is reachable from live values, so both are fixtures.
+    mbw_tmp=$(mktemp)
+    printf 'HelmReleaseInstallTimeout: "600s",\n' > "$mbw_tmp"
+    mbw_got=$(mbw_install_timeout "$mbw_tmp")
+    rm -f "$mbw_tmp"
+    [ "$mbw_got" = "600" ] || { echo "600s gave '${mbw_got}', expected 600" >&2; exit 1; }
+
+    mbw_tmp=$(mktemp)
+    printf 'HelmReleaseInstallTimeout: "10m",\n' > "$mbw_tmp"
+    mbw_got=$(mbw_install_timeout "$mbw_tmp")
+    rm -f "$mbw_tmp"
+    [ "$mbw_got" = "600" ] || { echo "10m gave '${mbw_got}', expected 600" >&2; exit 1; }
+}
+
+@test "the api server still declares the install timeout the floor derives from" {
+    # The second half of the floor. Absent or unreadable, max() below collapses
+    # to the startup budget alone and the contract silently stops pinning the
+    # reason both call sites give for their current values.
+    mbw_install=$(mbw_install_timeout "$MBW_APISERVER")
+    case "$mbw_install" in
+      ''|*[!0-9]*)
+        echo "no numeric HelmReleaseInstallTimeout default found in $MBW_APISERVER (got '${mbw_install}')" >&2
+        exit 1
+        ;;
+    esac
+    [ "$mbw_install" -ge 60 ] || {
+        echo "HelmReleaseInstallTimeout default parsed as ${mbw_install}s, which is too small to be the real default; the extractor is probably reading the wrong literal" >&2
+        exit 1
+    }
+}
+
+@test "a wait clears the floor only by the start margin" {
+    # The comparison the whole contract ends in. Every wait in the tree clears
+    # every floor, so this is another place where live values cannot tell a
+    # correct implementation from a broken one; fixtures can. The literals
+    # assume the 60s policy margin, so changing MBW_START_MARGIN means
+    # restating them here on purpose.
+    [ "$MBW_START_MARGIN" = "60" ] || { echo "MBW_START_MARGIN is '${MBW_START_MARGIN}', the fixtures below are written for 60" >&2; exit 1; }
+    mbw_got=$(mbw_wait_clears_floor 660 600)
+    [ "$mbw_got" = "ok" ] || { echo "660 vs 600 gave '${mbw_got}', expected ok: the margin is met exactly" >&2; exit 1; }
+    mbw_got=$(mbw_wait_clears_floor 659 600)
+    [ "$mbw_got" = "low" ] || { echo "659 vs 600 gave '${mbw_got}', expected low: one second short of the margin" >&2; exit 1; }
+    mbw_got=$(mbw_wait_clears_floor 601 600)
+    [ "$mbw_got" = "low" ] || { echo "601 vs 600 gave '${mbw_got}', expected low: a second over the floor is not the margin" >&2; exit 1; }
+    mbw_got=$(mbw_wait_clears_floor 600 600)
+    [ "$mbw_got" = "low" ] || { echo "600 vs 600 gave '${mbw_got}', expected low: equal is not enough" >&2; exit 1; }
+    mbw_got=$(mbw_wait_clears_floor 599 600)
+    [ "$mbw_got" = "low" ] || { echo "599 vs 600 gave '${mbw_got}', expected low" >&2; exit 1; }
+    mbw_got=$(mbw_wait_clears_floor 1 600)
+    [ "$mbw_got" = "low" ] || { echo "1 vs 600 gave '${mbw_got}', expected low; a floor operand replaced by 0 would say ok here" >&2; exit 1; }
+}
+
+@test "the startup budget is the probe arithmetic and not some other formula" {
+    # Fixtures for the same reason as the two below. With the live threshold of
+    # 30 the budget is 310, the floor is max(310, 600) = 600 either way, and
+    # both 660s waits clear it -- so `20 +` silently becoming `20 *` (580) or
+    # the -1 being dropped (320) leaves every test in this file green while the
+    # number the header explains is no longer the number computed.
+    mbw_got=$(mbw_startup_budget 30)
+    [ "$mbw_got" = "310" ] || { echo "budget(30) = ${mbw_got}, expected 310 = 20 + 29*10" >&2; exit 1; }
+    mbw_got=$(mbw_startup_budget 1)
+    [ "$mbw_got" = "20" ] || { echo "budget(1) = ${mbw_got}, expected 20: one failure allowed is initialDelaySeconds alone" >&2; exit 1; }
+    mbw_got=$(mbw_startup_budget 2)
+    [ "$mbw_got" = "30" ] || { echo "budget(2) = ${mbw_got}, expected 30; a dropped -1 would say 40 here" >&2; exit 1; }
+    mbw_got=$(mbw_startup_budget 100)
+    [ "$mbw_got" = "1010" ] || { echo "budget(100) = ${mbw_got}, expected 1010; this is the case where the budget half becomes the binding floor" >&2; exit 1; }
+}
+
+@test "the floor is the larger of the two bounds, whichever way they are ordered" {
+    # The only arithmetic the whole contract rests on, and the one nothing else
+    # exercises: with the real values 310 and 600 both waits clear either bound,
+    # so a max silently turned into a min would go unnoticed and the guard would
+    # start measuring from 310 instead of 600. Fixtures, because the tree cannot
+    # currently produce a case where the two disagree in the other direction.
+    mbw_got=$(mbw_compute_floor 310 600)
+    [ "$mbw_got" = "600" ] || { echo "floor(310,600) = ${mbw_got}, expected the larger 600" >&2; exit 1; }
+    mbw_got=$(mbw_compute_floor 600 310)
+    [ "$mbw_got" = "600" ] || { echo "floor(600,310) = ${mbw_got}, expected the larger 600" >&2; exit 1; }
+    mbw_got=$(mbw_compute_floor 910 600)
+    [ "$mbw_got" = "910" ] || { echo "floor(910,600) = ${mbw_got}, expected the larger 910; a startup budget past the install timeout must take over" >&2; exit 1; }
+    mbw_got=$(mbw_compute_floor 600 600)
+    [ "$mbw_got" = "600" ] || { echo "floor(600,600) = ${mbw_got}, expected 600" >&2; exit 1; }
+}
+
+@test "the startup threshold is read from the startupProbe block and no other" {
+    # Third helper in the same class as the two above. The chart carries exactly
+    # one failureThreshold today, so a first-match read returns the same 30 and
+    # every test that reads the TREE stays green with the indentation scoping
+    # deleted. The fixture below is what makes that loss red, which is the whole
+    # reason it is a fixture and not a tree read.
+    mbw_got=$(mbw_failure_threshold - <<'MBW_FIXTURE'
+        livenessProbe:
+          failureThreshold: 3
+        startupProbe:
+          failureThreshold: 30
+MBW_FIXTURE
+)
+    [ "$mbw_got" = "30" ] || { echo "a livenessProbe threshold ahead of the startupProbe gave '${mbw_got}', expected 30" >&2; exit 1; }
+
+    mbw_got=$(mbw_failure_threshold - <<'MBW_FIXTURE'
+        startupProbe:
+          periodSeconds: 10
+          failureThreshold: 30
+MBW_FIXTURE
+)
+    [ "$mbw_got" = "30" ] || { echo "a sibling key inside startupProbe gave '${mbw_got}', expected 30; closing the block on the next non-failureThreshold key would report nothing here" >&2; exit 1; }
+
+    mbw_got=$(mbw_failure_threshold - <<'MBW_FIXTURE'
+        startupProbe:
+          periodSeconds: 10
+        livenessProbe:
+          failureThreshold: 3
+MBW_FIXTURE
+)
+    [ -z "$mbw_got" ] || { echo "a startupProbe carrying no threshold gave '${mbw_got}', expected nothing so the guard above fires instead of a neighbouring probe's number being used" >&2; exit 1; }
+}
+
+@test "the prefix extractor reports a wait it cannot parse instead of dropping it" {
+    # The `skip` branch has no live trigger: every prefix call in the script
+    # states a literal today, so removing the branch leaves the whole file green.
+    # It guards a future state, and a guard against a future state can only be
+    # pinned by a fixture. The direction matters -- a dropped ceiling shrinks the
+    # sum and LOOSENS the remainder ratchet, so silence here is worse than a
+    # false red.
+    mbw_tmp=$(mktemp)
+    {
+        printf 'wait_hr_ready "bucket-x" 300\n'
+        printf 'wait_for_field foo bar baz qux "$NAMESPACE" "$some_variable"\n'
+        printf 'wait_hr_ready "mariadb-src" 660\n'
+    } > "$mbw_tmp"
+    mbw_out=$(mbw_prefix_ceilings "$mbw_tmp" | tr '\n' ' ')
+    rm -f "$mbw_tmp"
+    [ "$mbw_out" = "300 skip 660 " ] || {
+        echo "expected '300 skip 660 ', got: '${mbw_out}'" >&2
+        exit 1
+    }
+
+    # And an indented call belongs to a helper definition, not to the flow.
+    mbw_tmp=$(mktemp)
+    {
+        printf 'wait_app_grant_ready() {\n'
+        printf '    wait_for_field grants.k8s.mariadb.com "$cr" x y "$ns" "$timeout"\n'
+        printf '}\n'
+        printf 'wait_hr_ready "bucket-x" 300\n'
+        printf 'wait_hr_ready "mariadb-src" 660\n'
+    } > "$mbw_tmp"
+    mbw_out=$(mbw_prefix_ceilings "$mbw_tmp" | tr '\n' ' ')
+    rm -f "$mbw_tmp"
+    [ "$mbw_out" = "300 660 " ] || {
+        echo "an indented call inside a helper was read as flow: '${mbw_out}', expected '300 660 '" >&2
+        exit 1
+    }
+
+    # The S3 preflight is the exception: it runs in the flow, indented only
+    # because it sits under the COZY_E2E_BACKUP_PREFLIGHT gate the Chainsaw op
+    # sets, so its ceiling is part of what the op has to contain.
+    mbw_tmp=$(mktemp)
+    {
+        printf 'wait_hr_ready "bucket-x" 300
+'
+        printf 'if [[ "${COZY_E2E_BACKUP_PREFLIGHT:-0}" == "1" ]]; then
+'
+        printf '    cozy_backup_access_preflight "$NAMESPACE" "bucket-x-u" 90
+'
+        printf 'fi
+'
+        printf 'wait_hr_ready "mariadb-src" 660
+'
+    } > "$mbw_tmp"
+    mbw_out=$(mbw_prefix_ceilings "$mbw_tmp" | tr '\n' ' ')
+    rm -f "$mbw_tmp"
+    [ "$mbw_out" = "300 90 660 " ] || {
+        echo "the gated S3 preflight was dropped from the prefix: '${mbw_out}', expected '300 90 660 '" >&2
+        exit 1
+    }
+}
+
+@test "the op is identified by the script it runs, not by being the largest" {
+    # The live tree cannot separate the two rules: the round-trip op IS the
+    # largest today, so selecting on size and selecting on identity agree, and a
+    # fixture is the only thing that can tell them apart. The fixture puts a
+    # bigger unrelated op first, which is the only state in which selecting by
+    # size and selecting by identity disagree.
+    mbw_tmp=$(mktemp)
+    {
+        printf '  - script:\n      timeout: 60m\n      content: |\n        echo unrelated\n'
+        printf '  - script:\n      timeout: 42m\n      content: |\n        examples/backups/mariadb/run-all.sh\n'
+    } > "$mbw_tmp"
+    mbw_got=$(mbw_suite_script_op "$mbw_tmp" examples/backups/mariadb/run-all.sh)
+    rm -f "$mbw_tmp"
+    [ "$mbw_got" = "2520" ] || {
+        echo "with a larger unrelated op present the helper returned '${mbw_got}', expected 2520" >&2
+        exit 1
+    }
+
+    # And it must not return the unrelated op's budget when the round-trip op is
+    # absent: reporting a number for a suite that does not run the script would
+    # make the ratchet measure something with no relation to it at all.
+    mbw_tmp=$(mktemp)
+    printf '  - script:\n      timeout: 60m\n      content: |\n        echo unrelated\n' > "$mbw_tmp"
+    mbw_got=$(mbw_suite_script_op "$mbw_tmp" examples/backups/mariadb/run-all.sh)
+    rm -f "$mbw_tmp"
+    [ -z "$mbw_got" ] || {
+        echo "with no round-trip op the helper returned '${mbw_got}', expected nothing" >&2
+        exit 1
+    }
+
+    # The SKIP_RESTORE reading, one fixture per branch of the reader. Only
+    # mongodb passes it, on the same line as the script, so the live tree
+    # exercises none of the refusals.
+    mbw_tmp=$(mktemp)
+    mbw_fail=
+    mbw_sk() {
+        mbw_want=$1 mbw_why=$2; shift 2
+        printf '%s\n' "$@" > "$mbw_tmp"
+        mbw_got=$(mbw_op_skips_restore "$mbw_tmp" x/run-all.sh)
+        [ "$mbw_got" = "$mbw_want" ] || mbw_fail="$mbw_fail
+${mbw_why}: got '${mbw_got}', expected ${mbw_want}"
+    }
+    mbw_sk yes 'skip on the command that runs the script' \
+        '  - script:' '      content: |' '        SKIP_RESTORE=1 x/run-all.sh'
+    mbw_sk yes 'skip on a continued line of that command' \
+        '  - script:' '      content: |' '        SKIP_RESTORE=1 \' '          x/run-all.sh'
+    mbw_sk no 'skip on another command in the op' \
+        '  - script:' '      content: |' '        SKIP_RESTORE=1 other' '        x/run-all.sh'
+    mbw_sk no 'skip in a comment' \
+        '  - script:' '      content: |' '        # SKIP_RESTORE=1 x/run-all.sh' '        x/run-all.sh'
+    mbw_sk no 'a longer variable name ending in SKIP_RESTORE' \
+        '  - script:' '      content: |' '        MY_SKIP_RESTORE=1 x/run-all.sh'
+    mbw_sk no 'a value other than 1' \
+        '  - script:' '      content: |' '        SKIP_RESTORE=10 x/run-all.sh'
+    mbw_sk no 'skip only in a later op running the script' \
+        '  - script:' '      content: |' '        x/run-all.sh' \
+        '  - script:' '      content: |' '        SKIP_RESTORE=1 x/run-all.sh'
+    mbw_sk no 'skip only in a later non-script item' \
+        '  - script:' '      content: |' '        x/run-all.sh' \
+        '  - description: cleanup' '    content: |' '        SKIP_RESTORE=1 x/run-all.sh'
+    mbw_sk no 'no op runs the script' \
+        '  - script:' '      content: |' '        SKIP_RESTORE=1 other'
+    rm -f "$mbw_tmp"
+    [ -z "$mbw_fail" ] || { printf '%s\n' "$mbw_fail" >&2; exit 1; }
+}
+
+@test "the timeout dump survives the errexit its own caller sets" {
+    # The only behavioural test here, and it exists because a static check
+    # cannot see this class at all. wait_hr_ready's timeout branch reads the
+    # release into variables, and under the caller's `set -e` an assignment
+    # takes its command substitution's exit status, so a read that fails kills
+    # the script AT the assignment: no dump, no return, and the diagnostic dies
+    # in the case it was added for.
+    #
+    # Run in a subshell with the SAME options run-all.sh sets. A weaker set --
+    # `set -u` without errexit, say -- cannot observe this at all: the failing
+    # assignment is only fatal when errexit is live, so a check that omits it
+    # reports the branch working while production dies at that line.
+    #
+    # Each arm stubs kubectl for one of the answers the branch must tell apart,
+    # and discriminates on the QUERY rather than answering everything alike: a
+    # stub that returns the same string to every call makes the conditions dump
+    # emit it too, and an assertion on it would then pass with the branch it
+    # names deleted.
+    # Sourced the way run-all.sh sources it, so the shared body is reached
+    # through the walkthrough's own helpers rather than loaded directly.
+    for mbw_helper in examples/backups/mariadb/00-helpers.sh; do
+    # Run under bash EXPLICITLY, not under the runner's shell. run-all.sh and
+    # the helpers are #!/bin/bash; cozytest.sh is #!/bin/sh and sources this
+    # file, so on the CI runner the body would execute under dash, where
+    # `set -o pipefail` is an illegal option and the helper's `local x=()` is a
+    # parse error. On macOS /bin/sh is bash, so the wrong-interpreter version
+    # runs green locally and proves nothing -- which is the same defect this
+    # test exists to catch, one level up.
+    #
+    # First arm: kubectl cannot answer at all. Its own message has to reach the
+    # output, and the branch must not report the release as absent, because it
+    # does not know that.
+    mbw_out=$(bash -c '
+        set -euo pipefail
+        NAMESPACE=unit
+        # shellcheck disable=SC1090
+        . "$1"
+        kubectl() { echo "the server is currently unable to handle the request" >&2; return 1; }
+        wait_hr_ready "nosuch" 0 2>&1
+    ' _ "$mbw_helper") || true
+    case "$mbw_out" in
+      *"could not look up HelmRelease/nosuch"*"unable to handle the request"*) ;;
+      *)
+        echo "$mbw_helper: a kubectl that cannot answer is not reported as such, with its own message" >&2
+        printf '%s\n' "$mbw_out" >&2
+        exit 1
+        ;;
+    esac
+    case "$mbw_out" in
+      *"never appeared"*|*"(none recorded)"*)
+        echo "$mbw_helper: a kubectl that cannot answer is reported as a verdict about the release" >&2
+        printf '%s\n' "$mbw_out" >&2
+        exit 1
+        ;;
+    esac
+
+    # Second arm: kubectl answers, and the release is not there. The stub
+    # answers as kubectl does, NotFound and exit 1 unless --ignore-not-found is
+    # passed, so a lookup that drops the flag reads as a failed one here too,
+    # and prints a warning on stderr, which must not read as a release found.
+    mbw_out=$(bash -c '
+        set -euo pipefail
+        NAMESPACE=unit
+        # shellcheck disable=SC1090
+        . "$1"
+        kubectl() {
+            case "$*" in
+              *--ignore-not-found*) echo "Warning: a notice on stderr" >&2; return 0 ;;
+            esac
+            echo "Error from server (NotFound): helmreleases \"nosuch\" not found" >&2
+            return 1
+        }
+        wait_hr_ready "nosuch" 0 2>&1
+    ' _ "$mbw_helper") || true
+    case "$mbw_out" in
+      *"HelmRelease/nosuch never appeared in unit"*) ;;
+      *)
+        echo "$mbw_helper: an absent release is not reported as never having appeared" >&2
+        printf '%s\n' "$mbw_out" >&2
+        exit 1
+        ;;
+    esac
+
+    # Third arm: the release was there and is gone by the deadline, which is
+    # not "never appeared". The stub reads the helper's own `elapsed` through
+    # bash's dynamic scoping, because the lookup runs in a command substitution
+    # and a counter the stub kept for itself would not survive it.
+    mbw_out=$(bash -c '
+        set -euo pipefail
+        NAMESPACE=unit
+        # shellcheck disable=SC1090
+        . "$1"
+        sleep() { :; }
+        kubectl() {
+            case "$*" in
+              *"-o name"*) [ "$elapsed" -eq 0 ] && echo "helmrelease.helm.toolkit.fluxcd.io/nosuch" ;;
+            esac
+            return 0
+        }
+        wait_hr_ready "nosuch" 5 2>&1
+    ' _ "$mbw_helper") || true
+    case "$mbw_out" in
+      *"HelmRelease/nosuch was deleted from unit"*) ;;
+      *)
+        echo "$mbw_helper: a release deleted while waiting is not reported as deleted" >&2
+        printf '%s\n' "$mbw_out" >&2
+        exit 1
+        ;;
+    esac
+
+    # Fourth arm: the release was there all along and only the last lookup
+    # failed. That failure is reported, and the dump still runs, because it is
+    # what the release has to say.
+    mbw_out=$(bash -c '
+        set -euo pipefail
+        NAMESPACE=unit
+        # shellcheck disable=SC1090
+        . "$1"
+        sleep() { :; }
+        kubectl() {
+            case "$*" in
+              *"-o name"*)
+                if [ "$elapsed" -eq 0 ]; then echo "helmrelease.helm.toolkit.fluxcd.io/nosuch"; return 0; fi
+                echo "connection reset by peer" >&2; return 1 ;;
+              *.reason*) printf "  Ready=False (Progressing): install in progress\n" ;;
+            esac
+            return 0
+        }
+        wait_hr_ready "nosuch" 5 2>&1
+    ' _ "$mbw_helper") || true
+    case "$mbw_out" in
+      *"connection reset by peer"*"Ready=False (Progressing)"*) ;;
+      *)
+        echo "$mbw_helper: a failed last lookup on a release seen earlier skips the dump" >&2
+        printf '%s\n' "$mbw_out" >&2
+        exit 1
+        ;;
+    esac
+
+    # Fifth arm: the release exists and has no history yet. kubectl defaults
+    # --allow-missing-template-keys to true, so the history read prints nothing
+    # and exits 0, and the branch has to say so rather than print a blank.
+    mbw_out=$(bash -c '
+        set -euo pipefail
+        NAMESPACE=unit
+        # shellcheck disable=SC1090
+        . "$1"
+        kubectl() {
+            case "$*" in
+              *"-o name"*) echo "helmrelease.helm.toolkit.fluxcd.io/nosuch" ;;
+            esac
+            return 0
+        }
+        wait_hr_ready "nosuch" 0 2>&1
+    ' _ "$mbw_helper") || true
+    case "$mbw_out" in
+      *"(none recorded)"*) ;;
+      *)
+        echo "$mbw_helper: an existing release with empty history did not reach the history line" >&2
+        printf '%s\n' "$mbw_out" >&2
+        exit 1
+        ;;
+    esac
+
+    # Sixth arm: the release exists and the history read fails. That is not
+    # "none recorded", and kubectl's own message has to reach the output.
+    mbw_out=$(bash -c '
+        set -euo pipefail
+        NAMESPACE=unit
+        # shellcheck disable=SC1090
+        . "$1"
+        kubectl() {
+            case "$*" in
+              *"-o name"*) echo "helmrelease.helm.toolkit.fluxcd.io/nosuch" ;;
+              *status.history*) echo "history read refused" >&2; return 1 ;;
+            esac
+            return 0
+        }
+        wait_hr_ready "nosuch" 0 2>&1
+    ' _ "$mbw_helper") || true
+    case "$mbw_out" in
+      *"history read refused"*"history: kubectl could not read it"*) ;;
+      *)
+        echo "$mbw_helper: a failed history read is not reported as one, with kubectl's message" >&2
+        printf '%s\n' "$mbw_out" >&2
+        exit 1
+        ;;
+    esac
+
+    # Seventh arm: history PRESENT. Every arm above lands outside the printf that
+    # actually emits the history, so without this one the whole conditional
+    # could be replaced by the bare "(none recorded)" line with every test here
+    # still green.
+    mbw_out=$(bash -c '
+        set -euo pipefail
+        NAMESPACE=unit
+        # shellcheck disable=SC1090
+        . "$1"
+        kubectl() {
+            case "$*" in
+              *"-o name"*) echo "helmrelease.helm.toolkit.fluxcd.io/nosuch" ;;
+              *status.history*) printf "  history: deployed 1.2.3 2026-01-01T00:00:00Z\n" ;;
+              # Matched on `.reason`, which the every-condition query asks for
+              # and a single-Ready-message query does not, so reverting that
+              # jsonpath falls through to nothing and the assertion fails: a
+              # stub can be told to return anything, but it cannot be asked the
+              # old question and answer the new one.
+              *.reason*) printf "  Ready=False (Progressing): install in progress\n" ;;
+            esac
+            return 0
+        }
+        wait_hr_ready "nosuch" 0 2>&1
+    ' _ "$mbw_helper") || true
+    case "$mbw_out" in
+      *"history: deployed 1.2.3"*) ;;
+      *)
+        echo "$mbw_helper: a release WITH history did not reach the printf branch" >&2
+        printf '%s\n' "$mbw_out" >&2
+        exit 1
+        ;;
+    esac
+    case "$mbw_out" in
+      *"Ready=False (Progressing)"*) ;;
+      *)
+        echo "$mbw_helper: the timeout branch did not ask for every condition with its reason" >&2
+        echo "a single-Ready-message query loses the reason a failing install records" >&2
+        printf '%s\n' "$mbw_out" >&2
+        exit 1
+        ;;
+    esac
+
+    # Eighth arm: Stalled. The terminal exit takes the same dump as the
+    # timeout, since the Ready message alone may already describe a retry
+    # rather than the failure. A zero budget cannot tell this exit from the
+    # timeout one, so the budget here is large and `sleep` fails the run:
+    # only the Stalled exit can end the wait.
+    mbw_out=$(bash -c '
+        set -euo pipefail
+        NAMESPACE=unit
+        # shellcheck disable=SC1090
+        . "$1"
+        kubectl() {
+            case "$*" in
+              *"-o name"*) echo "helmrelease.helm.toolkit.fluxcd.io/nosuch" ;;
+              *Stalled*) printf "True" ;;
+              *status.history*) printf "  history: failed 1.2.3 2026-01-01T00:00:00Z\n" ;;
+              *.reason*) printf "  Stalled=True (RetriesExceeded): install failed\n" ;;
+              *) : ;;
+            esac
+            return 0
+        }
+        sleep() { echo "slept: the Stalled exit did not fire" >&2; exit 3; }
+        wait_hr_ready "nosuch" 3600 2>&1
+    ' _ "$mbw_helper") || true
+    case "$mbw_out" in
+      *"is Stalled (terminal)"*"Stalled=True (RetriesExceeded)"*"history: failed 1.2.3"*) ;;
+      *)
+        echo "$mbw_helper: a Stalled release did not get the conditions and history dump" >&2
+        printf '%s\n' "$mbw_out" >&2
+        exit 1
+        ;;
+    esac
+    done
+
+}
+
+@test "a trailing space does not turn a literal budget into skip" {
+    # The extractor splits on an explicit regex, so whitespace at end of line
+    # becomes an empty final field. Pinned against a fixture rather than the
+    # tree, because the tree has no such line -- and if one ever appears, this
+    # test is what says the contract still reads it rather than reporting a
+    # budget that is not there.
+    mbw_out=$(printf 'wait_hr_ready "bucket-x" 300   \nwait_hr_ready "mariadb-src" 660\n' | mbw_prefix_ceilings -)
+    mbw_want="300
+660"
+    [ "$mbw_out" = "$mbw_want" ] || {
+        echo "trailing whitespace changed the extraction:" >&2
+        printf 'got:\n%s\nwant:\n%s\n' "$mbw_out" "$mbw_want" >&2
+        exit 1
+    }
+    # The skip path still has to work: a budget that is genuinely not a literal
+    # must still stop the contract rather than be silently dropped.
+    mbw_out=$(printf 'wait_hr_ready "bucket-x" "$SOME_VAR"\nwait_hr_ready "mariadb-src" 660\n' | mbw_prefix_ceilings -)
+    case "$mbw_out" in
+      skip*) ;;
+      *) echo "a non-literal budget no longer reports skip; got: ${mbw_out}" >&2; exit 1 ;;
+    esac
+}
+
+@test "the round-trip op keeps its remainder over the ceilings up to the source wait" {
+    # The floor tests below can force a breach here: raise the api-server
+    # install-timeout default and the floor rises, those tests red, and the
+    # cheapest way to green them is to raise the two waits -- which the op then
+    # has to absorb, or a late failure is SIGKILLed instead of reported.
+    #
+    # What is pinned is the REMAINDER, not the sum. "The op exceeds the ceilings
+    # up to and including the source wait" is the obvious form and it is vacuous here: at
+    # 2880 against 2010 it holds, and it still holds after the source wait goes
+    # to 960s (2880 against 2310) -- which is exactly the case that must not
+    # pass. The remainder is what the flow spends on everything the ceilings do not name,
+    # and a raise paid out of it is precisely the silent breach.
+    #
+    # The slack is zero today: 2880 - 2010 is exactly MBW_OP_REMAINDER, so the
+    # next raise anywhere in the prefix reds this immediately. That is the
+    # intent, not an accident of the numbers.
+    #
+    # MBW_OP_REMAINDER is a ratchet on that stated figure, not a derived bound:
+    # nothing in the tree can compute what the applies and the secret
+    # materialisation need. It may be raised deliberately; it may not fall.
+    mbw_ceilings=$(mbw_prefix_ceilings "$MBW_SCRIPT")
+    case "$mbw_ceilings" in
+      '') echo "no wait ceilings found up to the source wait in $MBW_SCRIPT" >&2; exit 1 ;;
+    esac
+    case "$mbw_ceilings" in
+      *skip*)
+        echo "a wait up to and including the source wait states no literal budget:" >&2
+        printf '%s\n' "$mbw_ceilings" >&2
+        echo "the sum below would silently shrink, which loosens the ratchet" >&2
+        exit 1
+        ;;
+    esac
+    # The `skip` branch above closes one route to a shrunk sum, a budget that
+    # stops being a literal. This closes the other: the extractor anchors at
+    # column zero, so indenting a flow call -- wrapping it in an `if` or a retry
+    # loop -- drops its ceiling silently, shrinking the sum and growing the
+    # remainder, which the ratchet below would pass.
+    mbw_count=$(printf '%s\n' "$mbw_ceilings" | wc -l | tr -d ' ')
+    [ "$mbw_count" -eq "$MBW_PREFIX_CEILINGS" ] || {
+        echo "found ${mbw_count} prefix ceilings up to and including the source wait, expected ${MBW_PREFIX_CEILINGS}:" >&2
+        printf '%s\n' "$mbw_ceilings" >&2
+        echo "a lost ceiling shrinks the sum and loosens the remainder ratchet; a new one needs the remainder re-derived" >&2
+        exit 1
+    }
+    mbw_sum=0
+    for mbw_c in $mbw_ceilings; do mbw_sum=$(( mbw_sum + mbw_c )); done
+    [ "$mbw_sum" -ge 600 ] || {
+        echo "prefix ceilings sum to ${mbw_sum}s, too small to be the real set; the extractor is reading the wrong lines" >&2
+        exit 1
+    }
+    mbw_op=$(mbw_suite_script_op "$MBW_SUITE" "$MBW_SCRIPT")
+    case "$mbw_op" in
+      ''|*[!0-9]*)
+        echo "no script-op timeout found in $MBW_SUITE (got '${mbw_op}')" >&2
+        exit 1
+        ;;
+    esac
+    mbw_remainder=$(( mbw_op - mbw_sum ))
+    [ "$mbw_remainder" -ge "$MBW_OP_REMAINDER" ] || {
+        echo "the round-trip op leaves ${mbw_remainder}s after the ${mbw_sum}s of ceilings ahead of and including the source wait" >&2
+        echo "ceilings: $(printf '%s ' $mbw_ceilings)" >&2
+        echo "that is below the ${MBW_OP_REMAINDER}s this file reserves for the applies and the secret materialisation" >&2
+        echo "three edits reach this state: a ceiling up to and including the source wait was raised, one was added, or the op was lowered" >&2
+        echo "the fix is whichever of those you meant, plus the op in the same change -- not raising MBW_OP_REMAINDER" >&2
+        echo "a wait was raised without the op absorbing it, and a late failure is now SIGKILLed with the process group instead of reported" >&2
+        exit 1
+    }
+}
+
+@test "the per-suite floor check refuses each way a walkthrough falls short" {
+    # Every live wait sits at exactly 660 on two distinct releases, so each
+    # branch below could be disabled with the tree still green; fixtures fed
+    # through the directory override are what exercise them.
+    mbw_got=$(printf '"mariadb-${A}" 660\n"mariadb-${A}" 660\n' | mbw_distinct_releases)
+    [ "$mbw_got" = "1" ] || { echo "the same release twice gave '${mbw_got}', expected 1" >&2; exit 1; }
+    mbw_dir=$(mktemp -d)
+    mbw_fail=
+    # Passes clean, so every refusal below is the fixture's doing.
+    printf 'wait_hr_ready "mariadb-${SRC}" 660\nwait_hr_ready "mariadb-${DST}" 660\n' > "$mbw_dir/run-all.sh"
+    mbw_got=$(mbw_suite_floor_errors mariadb "$mbw_dir")
+    [ -z "$mbw_got" ] || mbw_fail="two distinct 660s waits were refused: ${mbw_got}"
+    printf 'wait_hr_ready "mariadb-${SRC}" 660\nwait_hr_ready "mariadb-${DST}" 659\n' > "$mbw_dir/run-all.sh"
+    mbw_got=$(mbw_suite_floor_errors mariadb "$mbw_dir")
+    case "$mbw_got" in *"allows 659s"*MBW_START_MARGIN*) ;; *) mbw_fail="$mbw_fail
+a 659s wait was not refused for the margin: '${mbw_got}'" ;; esac
+    printf 'wait_hr_ready "mariadb-${SRC}" 660\n' > "$mbw_dir/run-all.sh"
+    mbw_got=$(mbw_suite_floor_errors mariadb "$mbw_dir")
+    case "$mbw_got" in *"expected exactly 2"*) ;; *) mbw_fail="$mbw_fail
+a single wait was not refused: '${mbw_got}'" ;; esac
+    printf 'wait_hr_ready "mariadb-${SRC}" 660\nwait_hr_ready "mariadb-${DST}"\n' > "$mbw_dir/run-all.sh"
+    mbw_got=$(mbw_suite_floor_errors mariadb "$mbw_dir")
+    case "$mbw_got" in *"states no literal timeout"*) ;; *) mbw_fail="$mbw_fail
+a wait with no timeout was not refused: '${mbw_got}'" ;; esac
+    # Two waits on the source and none on the target is still two waits.
+    printf 'wait_hr_ready "mariadb-${SRC}" 660\nwait_hr_ready "mariadb-${SRC}" 660\n' > "$mbw_dir/run-all.sh"
+    mbw_got=$(mbw_suite_floor_errors mariadb "$mbw_dir")
+    case "$mbw_got" in *"1 distinct releases"*) ;; *) mbw_fail="$mbw_fail
+a doubled source wait was not refused: '${mbw_got}'" ;; esac
+    printf 'wait_hr_ready "mariadb-${SRC}" 660\nwait_hr_ready "mariadb-${DST}" 660\n' > "$mbw_dir/run-all.sh"
+    mbw_got=$(mbw_suite_floor_errors nosuch "$mbw_dir")
+    case "$mbw_got" in *"no MBW_SUITES row"*) ;; *) mbw_fail="$mbw_fail
+a suite with no row was not refused: '${mbw_got}'" ;; esac
+    mbw_got=$(mbw_suite_floor_errors mariadb "$mbw_dir" "$mbw_dir/no-rd.yaml")
+    case "$mbw_got" in *"not found"*) ;; *) mbw_fail="$mbw_fail
+a missing RD was not refused: '${mbw_got}'" ;; esac
+    printf 'release.cozystack.io/helm-install-timeout: 20m\n' > "$mbw_dir/rd.yaml"
+    mbw_got=$(mbw_suite_floor_errors mariadb "$mbw_dir" "$mbw_dir/rd.yaml")
+    case "$mbw_got" in *"sets a per-application install timeout"*) ;; *) mbw_fail="$mbw_fail
+an RD overriding the install timeout was not refused: '${mbw_got}'" ;; esac
+    printf 'release.cozystack.io/helm-install-disable-wait: "true"\n' > "$mbw_dir/rd.yaml"
+    mbw_got=$(mbw_suite_floor_errors mariadb "$mbw_dir" "$mbw_dir/rd.yaml")
+    case "$mbw_got" in *"disables the install wait"*) ;; *) mbw_fail="$mbw_fail
+an RD disabling the install wait was not refused: '${mbw_got}'" ;; esac
+    # The startup-budget half binds only past the install timeout, which no
+    # live chart reaches: a threshold of 100 buys 1010s and 660 falls short.
+    printf 'startupProbe:\n  failureThreshold: 100\n' > "$mbw_dir/chart.yaml"
+    MBW_SUITES="mariadb|\"mariadb-|$mbw_dir/chart.yaml|900"
+    mbw_got=$(mbw_suite_floor_errors mariadb "$mbw_dir")
+    case "$mbw_got" in *"the floor is 1010s"*) ;; *) mbw_fail="$mbw_fail
+a startup budget above the install timeout did not bind: '${mbw_got}'" ;; esac
+    rm -rf "$mbw_dir"
+    [ -z "$mbw_fail" ] || { printf '%s\n' "$mbw_fail" >&2; exit 1; }
+}
+
+@test "the per-suite op check refuses each way an op falls short" {
+    # Every live remainder sits at exactly its constant and only mongodb skips,
+    # so a threshold, a skip passed where none is, or an early SKIP_RESTORE
+    # mention stopping the read could each slip in with the tree green. The
+    # mariadb row wants 900s; the waits below total 1620s, or 960s when the
+    # read stops at the skip.
+    mbw_dir=$(mktemp -d)
+    mbw_fail=
+    printf '%s\n' 'wait_hr_ready "bucket-${B}" 300' 'SKIP_RESTORE="${SKIP_RESTORE:-0}"' \
+        'wait_hr_ready "mariadb-${SRC}" 660' 'if [[ "${SKIP_RESTORE:-0}" == "1" ]]; then' '    exit 0' 'fi' \
+        'wait_hr_ready "mariadb-${DST}" 660' > "$mbw_dir/run-all.sh"
+    mbw_mkop() { printf '  - script:\n      timeout: %s\n      content: |\n        %s%s/run-all.sh\n' "$1" "$2" "$mbw_dir" > "$mbw_dir/suite.yaml"; }
+    mbw_mkop 42m ''
+    mbw_got=$(mbw_suite_slack_errors mariadb "$mbw_dir/suite.yaml" "$mbw_dir")
+    [ -z "$mbw_got" ] || mbw_fail="an op leaving exactly 900s was refused: ${mbw_got}"
+    mbw_mkop 41m ''
+    mbw_got=$(mbw_suite_slack_errors mariadb "$mbw_dir/suite.yaml" "$mbw_dir")
+    case "$mbw_got" in *"leaves 840s"*) ;; *) mbw_fail="$mbw_fail
+an op 60s short, with no skip, was not refused: '${mbw_got}'" ;; esac
+    mbw_mkop 31m 'SKIP_RESTORE=1 '
+    mbw_got=$(mbw_suite_slack_errors mariadb "$mbw_dir/suite.yaml" "$mbw_dir")
+    [ -z "$mbw_got" ] || mbw_fail="$mbw_fail
+a skipping op leaving exactly 900s was refused: ${mbw_got}"
+    mbw_mkop 30m 'SKIP_RESTORE=1 '
+    mbw_got=$(mbw_suite_slack_errors mariadb "$mbw_dir/suite.yaml" "$mbw_dir")
+    case "$mbw_got" in *"leaves 840s"*) ;; *) mbw_fail="$mbw_fail
+a skipping op 60s short was not refused, or the read stopped before the source wait: '${mbw_got}'" ;; esac
+    # A bucket wait that is not read, or has no budget, would leave the sum
+    # 300s short with nothing else to notice: the floor check skips buckets.
+    mbw_mkop 42m ''
+    printf '%s\n' '    wait_hr_ready "bucket-${B}" 300' 'wait_hr_ready "mariadb-${SRC}" 660' \
+        'wait_hr_ready "mariadb-${DST}" 660' > "$mbw_dir/run-all.sh"
+    mbw_got=$(mbw_suite_slack_errors mariadb "$mbw_dir/suite.yaml" "$mbw_dir")
+    case "$mbw_got" in *"exactly 1 bucket"*) ;; *) mbw_fail="$mbw_fail
+an indented bucket wait was not refused: '${mbw_got}'" ;; esac
+    printf '%s\n' 'wait_hr_ready "bucket-${B}"' 'wait_hr_ready "mariadb-${SRC}" 660' \
+        'wait_hr_ready "mariadb-${DST}" 660' > "$mbw_dir/run-all.sh"
+    mbw_got=$(mbw_suite_slack_errors mariadb "$mbw_dir/suite.yaml" "$mbw_dir")
+    case "$mbw_got" in *"states no literal budget"*) ;; *) mbw_fail="$mbw_fail
+a bucket wait with no budget was not refused: '${mbw_got}'" ;; esac
+    mbw_got=$(mbw_suite_slack_errors nosuch "$mbw_dir/suite.yaml" "$mbw_dir")
+    case "$mbw_got" in *"no MBW_SUITES row"*) ;; *) mbw_fail="$mbw_fail
+a suite with no row was not refused: '${mbw_got}'" ;; esac
+    printf '  - script:\n      content: |\n        %s/run-all.sh\n' "$mbw_dir" > "$mbw_dir/suite.yaml"
+    mbw_got=$(mbw_suite_slack_errors mariadb "$mbw_dir/suite.yaml" "$mbw_dir")
+    case "$mbw_got" in *"no timeout found"*) ;; *) mbw_fail="$mbw_fail
+an op with no timeout was not refused: '${mbw_got}'" ;; esac
+    rm -rf "$mbw_dir"
+    [ -z "$mbw_fail" ] || { printf '%s\n' "$mbw_fail" >&2; exit 1; }
+}
+
+@test "the mariadb walkthrough's database waits clear the floor by the start margin" {
+    mbw_err=$(mbw_suite_floor_errors mariadb)
+    [ -z "$mbw_err" ] || { printf '%s\n' "$mbw_err" >&2; exit 1; }
+}
+
+@test "the mariadb round-trip op keeps its slack once the waits it reaches are paid" {
+    mbw_err=$(mbw_suite_slack_errors mariadb)
+    [ -z "$mbw_err" ] || { printf '%s\n' "$mbw_err" >&2; exit 1; }
+}
+
+@test "the mongodb walkthrough's database waits clear the floor by the start margin" {
+    mbw_err=$(mbw_suite_floor_errors mongodb)
+    [ -z "$mbw_err" ] || { printf '%s\n' "$mbw_err" >&2; exit 1; }
+}
+
+@test "the mongodb round-trip op keeps its slack once the waits it reaches are paid" {
+    mbw_err=$(mbw_suite_slack_errors mongodb)
+    [ -z "$mbw_err" ] || { printf '%s\n' "$mbw_err" >&2; exit 1; }
+}
+
+@test "the postgres walkthrough's database waits clear the floor by the start margin" {
+    mbw_err=$(mbw_suite_floor_errors postgres)
+    [ -z "$mbw_err" ] || { printf '%s\n' "$mbw_err" >&2; exit 1; }
+}
+
+@test "the postgres round-trip op keeps its slack once the waits it reaches are paid" {
+    mbw_err=$(mbw_suite_slack_errors postgres)
+    [ -z "$mbw_err" ] || { printf '%s\n' "$mbw_err" >&2; exit 1; }
+}
+
+@test "the rabbitmq walkthrough's database waits clear the floor by the start margin" {
+    mbw_err=$(mbw_suite_floor_errors rabbitmq)
+    [ -z "$mbw_err" ] || { printf '%s\n' "$mbw_err" >&2; exit 1; }
+}
+
+@test "the rabbitmq round-trip op keeps its slack once the waits it reaches are paid" {
+    mbw_err=$(mbw_suite_slack_errors rabbitmq)
+    [ -z "$mbw_err" ] || { printf '%s\n' "$mbw_err" >&2; exit 1; }
+}
+
+@test "the clickhouse walkthrough's database waits clear the floor by the start margin" {
+    mbw_err=$(mbw_suite_floor_errors clickhouse)
+    [ -z "$mbw_err" ] || { printf '%s\n' "$mbw_err" >&2; exit 1; }
+}
+
+@test "the clickhouse round-trip op keeps its slack once the waits it reaches are paid" {
+    mbw_err=$(mbw_suite_slack_errors clickhouse)
+    [ -z "$mbw_err" ] || { printf '%s\n' "$mbw_err" >&2; exit 1; }
+}
+
+@test "every table walkthrough's bucket wait clears the floor by the start margin" {
+    # The floor check above holds the database waits only, so a floor failure
+    # names one release. The bucket wait is held here instead, per suite, since
+    # an op check alone accepts a bucket wait that drops back: a lower wait only
+    # widens the slack. bucket-rd has to leave the floor at the server default.
+    mbw_rd=packages/system/bucket-rd/cozyrds/bucket.yaml
+    [ -f "$mbw_rd" ] || { echo "$mbw_rd not found, so the bucket floor cannot be checked against an override" >&2; exit 1; }
+    if grep -qE 'release.cozystack.io/helm-install-(timeout|disable-wait)' "$mbw_rd"; then
+        echo "$mbw_rd moves the install timeout or disables the wait; the bucket floor here assumes neither" >&2
+        exit 1
+    fi
+    mbw_install=$(mbw_install_timeout "$MBW_APISERVER")
+    mbw_fail=
+    for mbw_s in $(printf '%s\n' "$MBW_SUITES" | cut -d'|' -f1); do
+        mbw_b=
+        for mbw_f in "examples/backups/$mbw_s"/*.sh; do
+            mbw_b="$mbw_b$(mbw_db_waits "$mbw_f" '"bucket-')
+"
+        done
+        mbw_n=$(printf '%s' "$mbw_b" | grep -c . || true)
+        if [ "$mbw_n" -ne 1 ]; then
+            mbw_fail="$mbw_fail
+${mbw_s}: expected exactly 1 bucket HelmRelease wait, found ${mbw_n}"
+            continue
+        fi
+        mbw_t=$(printf '%s' "$mbw_b" | awk 'NF { print $NF }')
+        case "$mbw_t" in
+          ''|*[!0-9]*)
+            mbw_fail="$mbw_fail
+${mbw_s}: the bucket wait states no literal budget (got ${mbw_t})"
+            continue
+            ;;
+        esac
+        if [ "$(mbw_wait_clears_floor "$mbw_t" "$mbw_install")" != "ok" ]; then
+            mbw_fail="$mbw_fail
+${mbw_s}: the bucket wait allows ${mbw_t}s; the floor is the ${mbw_install}s release install timeout and a wait must exceed it by MBW_START_MARGIN=${MBW_START_MARGIN}s"
+        fi
+    done
+    [ -z "$mbw_fail" ] || { printf '%s\n' "$mbw_fail" >&2; exit 1; }
+}
+
+@test "the chainsaw suite's HelmRelease-ready asserts beat the same budget" {
+    # Same wait, same mechanism, different file. This assert is the first gate
+    # in each suite, so if it expires below a legal first boot the suite reds on
+    # a healthy instance -- the defect this contract exists to stop.
+    mbw_threshold=$(mbw_failure_threshold "$MBW_CHART")
+    mbw_budget=$(mbw_startup_budget "$mbw_threshold")
+    mbw_install=$(mbw_install_timeout "$MBW_APISERVER")
+    mbw_floor=$(mbw_compute_floor "$mbw_budget" "$mbw_install")
+    mbw_out=$(mbw_suite_hr_waits "$MBW_SUITE")
+    mbw_count=$(printf '%s\n' "$mbw_out" | grep -c '[0-9]' || true)
+    [ "$mbw_count" -ge 2 ] || {
+        echo "expected at least 2 wait-helmrelease-ready timeouts in $MBW_SUITE, found ${mbw_count}:" >&2
+        printf '%s\n' "$mbw_out" >&2
+        exit 1
+    }
+    # Split in the current shell rather than piped into `while`: a pipeline
+    # runs its loop in a subshell, where `exit 1` ends only the subshell and
+    # the test carries on green.
+    mbw_ifs=$IFS
+    IFS='
+'
+    for mbw_timeout in $mbw_out; do
+        IFS=$mbw_ifs
+        case "$mbw_timeout" in
+          *[!0-9]*)
+            echo "unparsed wait-helmrelease-ready timeout '${mbw_timeout}' in $MBW_SUITE" >&2
+            exit 1
+            ;;
+        esac
+        [ "$(mbw_wait_clears_floor "$mbw_timeout" "$mbw_floor")" = "ok" ] || {
+            echo "a wait-helmrelease-ready assert allows ${mbw_timeout}s; the floor is ${mbw_floor}s (startup budget ${mbw_budget}s, release install timeout ${mbw_install}s) and a wait must exceed it by MBW_START_MARGIN=${MBW_START_MARGIN}s" >&2
+            exit 1
+        }
+    done
+    IFS=$mbw_ifs
+}
+
+@test "the extractor rejects a mariadb wait that states no timeout" {
+    # The helper's own fallback is 300s, below any realistic budget, so a call
+    # site that omits the argument must not read as compliant. Checked against
+    # a fixture: the real script is expected to state its budgets, so this
+    # branch of the contract has no cover in the tree itself.
+    mbw_tmp=$(mktemp)
+    printf 'wait_hr_ready "mariadb-${MARIADB_SRC_NAME}"\n' > "$mbw_tmp"
+    mbw_out=$(mbw_db_waits "$mbw_tmp" '"mariadb-')
+    rm -f "$mbw_tmp"
+    [ "$mbw_out" = '"mariadb-${MARIADB_SRC_NAME}" default' ] || {
+        echo "expected the timeout to be reported as 'default', got: ${mbw_out}" >&2
+        exit 1
+    }
+}
+
+@test "the suite extractor reports a wait-helmrelease-ready step that states no timeout" {
+    # hack/e2e-chainsaw/.chainsaw.yaml sets timeouts.assert to 5m, under every
+    # floor this file computes, so a step that omits `timeout:` is the worst
+    # case and must not be skipped in silence. Fixtures, because the tree
+    # states every timeout.
+    mbw_tmp=$(mktemp)
+    {
+        printf '  - name: wait-helmrelease-ready\n    try:\n    - assert:\n        timeout: 11m\n        resource: {}\n'
+        printf '  - name: wait-helmrelease-ready\n    try:\n    - assert:\n        resource: {}\n'
+        printf '  - name: next-step\n'
+    } > "$mbw_tmp"
+    mbw_out=$(mbw_suite_hr_waits "$mbw_tmp" | tr '\n' ' ')
+    rm -f "$mbw_tmp"
+    # The timed step goes FIRST on purpose. With only an untimed step the
+    # fixture cannot tell "reports it" from "reports it only in first
+    # position", and an extractor that resets its state per step and one that
+    # never resets it both pass a single-element fixture.
+    [ "$mbw_out" = "660 unset " ] || {
+        echo "expected '660 unset ', got: '${mbw_out}'" >&2
+        exit 1
+    }
+    # Units other than minutes, and a unit the extractor does not know. Every
+    # timeout in the tree is written Nm, so the seconds arm and the verbatim
+    # fallback are both unreachable from live values -- the same argument this
+    # file makes for the arithmetic helpers, applied to the branch that decides
+    # what a number MEANS. A seconds budget silently read as minutes would be a
+    # sixtyfold error in the safe-looking direction.
+    mbw_tmp=$(mktemp)
+    {
+        printf '  - name: wait-helmrelease-ready\n    try:\n    - assert:\n        timeout: 90s\n        resource: {}\n'
+        printf '  - name: wait-helmrelease-ready\n    try:\n    - assert:\n        timeout: 2h\n        resource: {}\n'
+        printf '  - name: next-step\n'
+    } > "$mbw_tmp"
+    mbw_out=$(mbw_suite_hr_waits "$mbw_tmp" | tr '\n' ' ')
+    rm -f "$mbw_tmp"
+    [ "$mbw_out" = "90 2h " ] || {
+        echo "expected '90 2h ' (seconds converted, unknown unit passed through), got: '${mbw_out}'" >&2
+        exit 1
+    }
+
+    # Third fixture: the file ENDS inside an untimed wait step, so no `- name:`
+    # line ever closes it. That is the awk END rule, and the two fixtures above
+    # cannot reach it -- both end on `- name: next-step`, which closes the block
+    # first. Without this the END branch is the one unexercised path in an
+    # extractor every other branch of which is pinned.
+    mbw_tmp=$(mktemp)
+    {
+        printf '  - name: wait-helmrelease-ready\n    try:\n    - assert:\n        timeout: 11m\n        resource: {}\n'
+        printf '  - name: wait-helmrelease-ready\n    try:\n    - assert:\n        resource: {}\n'
+    } > "$mbw_tmp"
+    mbw_out=$(mbw_suite_hr_waits "$mbw_tmp" | tr '\n' ' ')
+    rm -f "$mbw_tmp"
+    [ "$mbw_out" = "660 unset " ] || {
+        echo "a file ending inside an untimed step gave: '${mbw_out}', expected '660 unset '" >&2
+        exit 1
+    }
+    mbw_tmp=$(mktemp)
+    {
+        printf '  - name: wait-helmrelease-ready\n    try:\n    - assert:\n        resource: {}\n'
+        printf '  - name: wait-helmrelease-ready\n    try:\n    - assert:\n        timeout: 6m\n        resource: {}\n'
+        printf '  - name: next-step\n'
+    } > "$mbw_tmp"
+    mbw_out=$(mbw_suite_hr_waits "$mbw_tmp" | tr '\n' ' ')
+    rm -f "$mbw_tmp"
+    # Two consecutive wait steps, the first untimed: the close-previous rule has
+    # to fire before the open-new one or the first is swallowed.
+    [ "$mbw_out" = "unset 360 " ] || {
+        echo "expected 'unset 360 ', got: '${mbw_out}'" >&2
+        exit 1
+    }
+}
+
+@test "the extractor selects mariadb waits and leaves the others alone" {
+    # The example also waits for the Bucket release, and the floor check is
+    # deliberately held to the database waits; the op checks do count the
+    # bucket wait, as a ceiling the op has to contain. The reason is scope, not
+    # the floor: packages/system/bucket-rd sets neither helm-install-timeout
+    # nor helm-install-disable-wait, so the bucket release carries the same
+    # 600s floor, and its wait clears it; a test of its own holds that, so a
+    # database floor failure keeps naming one cause.
+    mbw_all=$(mbw_all_waits "$MBW_SCRIPT")
+    printf '%s\n' "$mbw_all" | grep -q '^"bucket-' || {
+        echo "expected $MBW_SCRIPT to wait for a bucket release; the fixture this test reasons about is gone" >&2
+        printf '%s\n' "$mbw_all" >&2
+        exit 1
+    }
+    mbw_selected=$(mbw_db_waits "$MBW_SCRIPT" '"mariadb-')
+    # `if !` rather than `grep -q ... && { ... }`: the latter evaluates to the
+    # grep's own status when it does not match, which under set -e ends the test
+    # unless a trailing `exit 0` follows it -- and that terminator silently makes
+    # anything appended below it dead code.
+    if printf '%s\n' "$mbw_selected" | grep -q 'bucket-'; then
+        echo "the mariadb extractor picked up a non-mariadb release:" >&2
+        printf '%s\n' "$mbw_selected" >&2
+        exit 1
+    fi
+}
diff --git a/hack/md-no-hardwrap.bats b/hack/md-no-hardwrap.bats
new file mode 100644
index 0000000000..54ec7d92a9
--- /dev/null
+++ b/hack/md-no-hardwrap.bats
@@ -0,0 +1,669 @@
+#!/usr/bin/env bats
+# Unit test: the md-no-hardwrap agent hook.
+#
+# The hook is a PreToolUse guard for AI coding agents. It refuses two classes
+# of write:
+#
+#   1. Write/Edit/MultiEdit whose resulting markdown contains a prose
+#      paragraph, list item or blockquote spanning more than one line.
+#   2. Bash invocations of `gh` that publish such a body to GitHub.
+#
+# Markdown renderers collapse a soft line break into a space, so a paragraph
+# hardwrapped at ~80 columns gains nothing and loses on narrow viewports and
+# in diffs, where a one-word edit reflows the whole block. Everything that is
+# not prose -- code blocks, tables, headings, front matter, link reference
+# definitions, explicit hard breaks -- keeps its line breaks, because there a
+# break carries meaning.
+#
+# Two properties matter more than coverage of exotic markdown, and most of
+# the cases below defend them:
+#
+#   * A false positive is worse than a miss. A hook that blocks legitimate
+#     work gets switched off, and then it guards nothing.
+#   * The single most common wrap -- a bullet the agent broke across two
+#     lines -- must be caught. It is the whole reason the hook exists.
+#
+# The hook speaks the agent hook protocol: a JSON payload on stdin, exit 0 to
+# allow, exit 2 to block with an explanation on stderr.
+
+load test_helper
+
+REPO_ROOT="$(cd "$(dirname "${BATS_TEST_FILENAME:-$0}")/.." && pwd)"
+HOOK="$REPO_ROOT/.claude/hooks/md-no-hardwrap.py"
+
+# The hook is written in python3, and so is the payload builder below. Other
+# hack/*.bats deliberately avoid a python3 dependency; a test for a python3
+# hook cannot. Fail loudly when the interpreter is missing rather than passing
+# vacuously -- a green suite that ran nothing is worse than a red one.
+have_python3() {
+  command -v python3 >/dev/null 2>&1 && return 0
+  echo "python3 is required to exercise .claude/hooks/md-no-hardwrap.py" >&2
+  return 1
+}
+
+# Feed a JSON payload to the hook and echo its exit code. Never fails the
+# calling test on a non-zero exit -- the exit code IS the assertion subject.
+hook_rc() {
+  local rc=0
+  printf '%s' "$1" | python3 "$HOOK" >/dev/null 2>&1 || rc=$?
+  printf '%s' "$rc"
+}
+
+# Payload builders. python3 does the JSON encoding so that newlines, quotes
+# and backslashes survive the trip intact.
+write_payload() {
+  python3 -c 'import json,sys; print(json.dumps({"tool_name":"Write","tool_input":{"file_path":sys.argv[1],"content":sys.argv[2]}}))' "$1" "$2"
+}
+
+edit_payload() {
+  python3 -c 'import json,sys; print(json.dumps({"tool_name":"Edit","tool_input":{"file_path":sys.argv[1],"old_string":sys.argv[2],"new_string":sys.argv[3]}}))' "$1" "$2" "$3"
+}
+
+bash_payload() {
+  python3 -c 'import json,sys; print(json.dumps({"tool_name":"Bash","tool_input":{"command":sys.argv[1]}}))' "$1"
+}
+
+@test "hook is executable" {
+  [ -x "$HOOK" ]
+}
+
+###############################################################################
+# Markdown: what must be blocked                                              #
+###############################################################################
+
+@test "markdown: multi-line prose paragraph is blocked" {
+  have_python3
+  payload="$(write_payload /tmp/doc.md 'A paragraph that the agent
+hardwrapped at eighty columns because of a reflex.')"
+  [ "$(hook_rc "$payload")" = "2" ]
+}
+
+@test "markdown: bullet wrapped onto a second line is blocked" {
+  have_python3
+  # The commonest wrap of all, and the one the hook exists for. A lazy
+  # continuation line belongs to the bullet above it, not to a new paragraph.
+  payload="$(write_payload /tmp/doc.md '- a bullet the agent wrapped
+  at eighty columns
+- a bullet that stays on one line')"
+  [ "$(hook_rc "$payload")" = "2" ]
+}
+
+@test "markdown: ordered list item wrapped onto a second line is blocked" {
+  have_python3
+  payload="$(write_payload /tmp/doc.md '1. an ordered item the agent wrapped
+   onto a second line')"
+  [ "$(hook_rc "$payload")" = "2" ]
+}
+
+@test "markdown: wrapped blockquote is blocked" {
+  have_python3
+  payload="$(write_payload /tmp/doc.md '> a quoted paragraph the agent
+> wrapped across two lines')"
+  [ "$(hook_rc "$payload")" = "2" ]
+}
+
+###############################################################################
+# Markdown: what must NOT be blocked                                          #
+###############################################################################
+
+@test "markdown: single-line paragraphs pass" {
+  have_python3
+  payload="$(write_payload /tmp/doc.md '# Title
+
+One continuous line per paragraph, however long it happens to run.
+
+Another paragraph, also a single line.')"
+  [ "$(hook_rc "$payload")" = "0" ]
+}
+
+@test "markdown: fenced code block keeps its line breaks" {
+  have_python3
+  payload="$(write_payload /tmp/doc.md 'Intro line.
+
+```bash
+echo one
+echo two
+```')"
+  [ "$(hook_rc "$payload")" = "0" ]
+}
+
+@test "markdown: indented code block keeps its line breaks" {
+  have_python3
+  payload="$(write_payload /tmp/doc.md 'Intro line.
+
+    apiVersion: v1
+    kind: ConfigMap
+    metadata:
+      name: demo')"
+  [ "$(hook_rc "$payload")" = "0" ]
+}
+
+@test "markdown: explicit hard break with two trailing spaces is preserved" {
+  have_python3
+  # Two trailing spaces render as <br>. Reflowing that onto one line would
+  # change the rendered output, so it is a deliberate break, not a wrap.
+  payload="$(printf '%s' '{"tool_name":"Write","tool_input":{"file_path":"/tmp/doc.md","content":"Line one, ending in a hard break.  \nLine two, its own rendered line.\n"}}')"
+  [ "$(hook_rc "$payload")" = "0" ]
+}
+
+@test "markdown: explicit hard break with a trailing backslash is preserved" {
+  have_python3
+  payload="$(printf '%s' '{"tool_name":"Write","tool_input":{"file_path":"/tmp/doc.md","content":"Line one, ending in a backslash break.\\\\\nLine two, its own rendered line.\n"}}')"
+  [ "$(hook_rc "$payload")" = "0" ]
+}
+
+@test "markdown: adjacent link reference definitions keep one per line" {
+  have_python3
+  payload="$(write_payload /tmp/doc.md '[upstream]: https://example.com/upstream
+[downstream]: https://example.com/downstream')"
+  [ "$(hook_rc "$payload")" = "0" ]
+}
+
+@test "markdown: footnote definitions keep one per line" {
+  have_python3
+  payload="$(write_payload /tmp/doc.md '[^one]: The first footnote.
+[^two]: The second footnote.')"
+  [ "$(hook_rc "$payload")" = "0" ]
+}
+
+@test "markdown: lists and tables keep their line breaks" {
+  have_python3
+  payload="$(write_payload /tmp/doc.md '- first bullet
+- second bullet
+
+| a | b |
+| --- | --- |
+| 1 | 2 |')"
+  [ "$(hook_rc "$payload")" = "0" ]
+}
+
+@test "markdown: pipe-less table keeps its line breaks" {
+  have_python3
+  payload="$(write_payload /tmp/doc.md 'a | b
+--- | ---
+1 | 2')"
+  [ "$(hook_rc "$payload")" = "0" ]
+}
+
+@test "markdown: badge stack keeps one shield per line" {
+  have_python3
+  payload="$(write_payload /tmp/README.md '[![Build](https://example.com/b.svg)](https://example.com/build)
+[![License](https://example.com/l.svg)](https://example.com/license)')"
+  [ "$(hook_rc "$payload")" = "0" ]
+}
+
+@test "markdown: the repo's own README passes the hook" {
+  have_python3
+  # README.md uses a two-space hard break. A hook that cannot write the repo's
+  # front page is a hook that gets switched off.
+  payload="$(python3 -c 'import json,sys; p=sys.argv[1]; print(json.dumps({"tool_name":"Write","tool_input":{"file_path":p,"content":open(p,encoding="utf-8").read()}}))' "$REPO_ROOT/README.md")"
+  [ "$(hook_rc "$payload")" = "0" ]
+}
+
+@test "markdown: AGENTS.md passes the hook it documents" {
+  have_python3
+  payload="$(python3 -c 'import json,sys; p=sys.argv[1]; print(json.dumps({"tool_name":"Write","tool_input":{"file_path":p,"content":open(p,encoding="utf-8").read()}}))' "$REPO_ROOT/AGENTS.md")"
+  [ "$(hook_rc "$payload")" = "0" ]
+}
+
+###############################################################################
+# Markdown: Edit hunks are judged against the file, not in isolation          #
+###############################################################################
+
+@test "markdown: Edit hunk introducing a wrap is blocked" {
+  have_python3
+  tmp="$(mktemp -d)"
+  printf 'Existing single line.\n\nold\n' > "$tmp/doc.md"
+  payload="$(edit_payload "$tmp/doc.md" 'old' 'A fresh paragraph that got
+wrapped across two lines.')"
+  rc="$(hook_rc "$payload")"
+  rm -rf "$tmp"
+  [ "$rc" = "2" ]
+}
+
+@test "markdown: Edit hunk landing inside a code fence is allowed" {
+  have_python3
+  # The hunk alone looks like a wrapped paragraph. Only the surrounding file
+  # shows it is YAML inside a fence -- so the file is what must be judged.
+  tmp="$(mktemp -d)"
+  printf 'Intro line.\n\n```yaml\nPLACEHOLDER\n```\n' > "$tmp/doc.md"
+  payload="$(edit_payload "$tmp/doc.md" 'PLACEHOLDER' 'apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: demo')"
+  rc="$(hook_rc "$payload")"
+  rm -rf "$tmp"
+  [ "$rc" = "0" ]
+}
+
+@test "markdown: fixing a typo inside a legacy wrapped paragraph is allowed" {
+  have_python3
+  # The paragraph stays as wrapped as it was -- the edit adds no wrap. Keying
+  # violations by their text would see the changed wording as a brand-new
+  # violation and refuse a one-word fix.
+  tmp="$(mktemp -d)"
+  printf 'A legacy paragraph with teh typo\nwrapped long ago.\n' > "$tmp/doc.md"
+  payload="$(edit_payload "$tmp/doc.md" 'teh' 'the')"
+  rc="$(hook_rc "$payload")"
+  rm -rf "$tmp"
+  [ "$rc" = "0" ]
+}
+
+@test "markdown: adding a wrap to an already-wrapped file is still blocked" {
+  have_python3
+  tmp="$(mktemp -d)"
+  printf 'A legacy paragraph that was\nwrapped long ago.\n\nTARGET\n' > "$tmp/doc.md"
+  payload="$(edit_payload "$tmp/doc.md" 'TARGET' 'A brand new paragraph that the
+agent wrapped as well.')"
+  rc="$(hook_rc "$payload")"
+  rm -rf "$tmp"
+  [ "$rc" = "2" ]
+}
+
+@test "markdown: Edit preserving a pre-existing wrap elsewhere is allowed" {
+  have_python3
+  # Legacy files are full of wrapped paragraphs. Editing one word in such a
+  # file must not require reflowing the rest of it.
+  tmp="$(mktemp -d)"
+  printf 'A legacy paragraph that was\nwrapped long ago.\n\nTARGET\n' > "$tmp/doc.md"
+  payload="$(edit_payload "$tmp/doc.md" 'TARGET' 'A replacement on one line.')"
+  rc="$(hook_rc "$payload")"
+  rm -rf "$tmp"
+  [ "$rc" = "0" ]
+}
+
+###############################################################################
+# Markdown: paths the repo does not own                                       #
+###############################################################################
+
+@test "markdown: vendored upstream chart docs are out of scope" {
+  have_python3
+  # AGENTS.md forbids editing vendored charts; `make update` regenerates them
+  # verbatim from upstream. Flagging their wraps would demand a forbidden fix.
+  payload="$(write_payload "$REPO_ROOT/packages/system/cert-manager/charts/cert-manager/README.md" 'A vendored paragraph
+wrapped by its upstream author.')"
+  [ "$(hook_rc "$payload")" = "0" ]
+}
+
+@test "markdown: published changelogs are out of scope" {
+  have_python3
+  payload="$(write_payload "$REPO_ROOT/docs/changelogs/v1.5.0.md" 'A released changelog entry
+wrapped when it was published.')"
+  [ "$(hook_rc "$payload")" = "0" ]
+}
+
+@test "non-markdown files are none of the hook's business" {
+  have_python3
+  payload="$(write_payload /tmp/main.go 'package main
+
+// A Go comment wrapped at eighty columns, which is correct style
+// for Go and must not be blocked by a markdown rule.
+func main() {}')"
+  [ "$(hook_rc "$payload")" = "0" ]
+}
+
+###############################################################################
+# gh: bodies that must be blocked                                             #
+###############################################################################
+
+@test "gh: PR body with a wrapped paragraph is blocked" {
+  have_python3
+  payload="$(bash_payload 'gh pr create --title "fix(x): y" --body "This body was
+hardwrapped by the agent."')"
+  [ "$(hook_rc "$payload")" = "2" ]
+}
+
+@test "gh: --body= equals form is blocked" {
+  have_python3
+  payload="$(bash_payload 'gh issue comment 42 --body="A body that was
+wrapped across two lines."')"
+  [ "$(hook_rc "$payload")" = "2" ]
+}
+
+@test "gh: global flag before the subcommand does not hide the body" {
+  have_python3
+  # `gh -R owner/repo pr comment` puts the repo between `gh` and the
+  # subcommand. Reading the subcommand as "the first non-flag argument" picks
+  # up the repo instead, and the body sails through unchecked.
+  payload="$(bash_payload 'gh -R cozystack/cozystack pr comment 123 --body "First line of the body
+and its wrapped continuation."')"
+  [ "$(hook_rc "$payload")" = "2" ]
+}
+
+@test "gh: environment prefix does not hide the body" {
+  have_python3
+  payload="$(bash_payload 'GH_TOKEN=secret gh issue comment 1 --body "First line of the body
+and its wrapped continuation."')"
+  [ "$(hook_rc "$payload")" = "2" ]
+}
+
+@test "gh: subshell does not hide the body" {
+  have_python3
+  payload="$(bash_payload '(gh issue comment 1 --body "First line of the body
+and its wrapped continuation.")')"
+  [ "$(hook_rc "$payload")" = "2" ]
+}
+
+@test "gh: chained command after && is still inspected" {
+  have_python3
+  payload="$(bash_payload 'git push && gh pr create --title "t" --body "First line of the body
+and its wrapped continuation."')"
+  [ "$(hook_rc "$payload")" = "2" ]
+}
+
+@test "gh: chained command after a semicolon with no space is still inspected" {
+  have_python3
+  # `push;` is one shlex token unless the lexer treats `;` as punctuation, and
+  # then the gh segment that follows is never recognised as one.
+  payload="$(bash_payload 'git push; gh pr create --title "t" --body "First line of the body
+and its wrapped continuation."')"
+  [ "$(hook_rc "$payload")" = "2" ]
+}
+
+@test "gh: body survives a redirect on the same command" {
+  have_python3
+  payload="$(bash_payload 'gh pr create --title "t" --body "First line of the body
+and its wrapped continuation." > /dev/null')"
+  [ "$(hook_rc "$payload")" = "2" ]
+}
+
+@test "gh: heredoc body with a wrapped paragraph is blocked" {
+  have_python3
+  payload="$(bash_payload 'gh pr create --body-file - <<EOF
+A heredoc body that the agent
+wrapped across two lines.
+EOF')"
+  [ "$(hook_rc "$payload")" = "2" ]
+}
+
+@test "gh: --body-file pointing at a hardwrapped file is blocked" {
+  have_python3
+  tmp="$(mktemp -d)"
+  printf 'A body file paragraph split\nacross two lines.\n' > "$tmp/body.md"
+  payload="$(bash_payload "gh pr create --body-file $tmp/body.md")"
+  rc="$(hook_rc "$payload")"
+  rm -rf "$tmp"
+  [ "$rc" = "2" ]
+}
+
+@test "gh: api field body with a wrapped paragraph is blocked" {
+  have_python3
+  payload="$(bash_payload 'gh api --method POST /repos/o/r/issues/1/comments -f body="A review reply that was
+wrapped across two lines."')"
+  [ "$(hook_rc "$payload")" = "2" ]
+}
+
+@test "gh: api raw field body with a wrapped paragraph is blocked" {
+  have_python3
+  # For `gh api`, -F means --raw-field, not --body-file. Reading it as a file
+  # name drops the body on the floor and the wrap ships.
+  payload="$(bash_payload 'gh api --method POST /repos/o/r/issues/1/comments -F body="A review reply that was
+wrapped across two lines."')"
+  [ "$(hook_rc "$payload")" = "2" ]
+}
+
+###############################################################################
+# gh: bodies and commands that must NOT be blocked                            #
+###############################################################################
+
+@test "gh: single-line PR body passes" {
+  have_python3
+  payload="$(bash_payload 'gh pr create --title "fix(x): y" --body "One continuous line, as the renderer expects."')"
+  [ "$(hook_rc "$payload")" = "0" ]
+}
+
+@test "gh: read-only subcommands are never blocked" {
+  have_python3
+  payload="$(bash_payload 'gh pr view 42 --json body')"
+  [ "$(hook_rc "$payload")" = "0" ]
+}
+
+@test "gh: release notes from a published changelog are not blocked" {
+  have_python3
+  # hack/upload-releasenotes.sh publishes docs/changelogs/<version>.md, which
+  # is historical and wrapped. Blocking it would break the release process.
+  payload="$(bash_payload "gh release edit v1.5.0 --notes-file $REPO_ROOT/docs/changelogs/v1.5.0.md")"
+  [ "$(hook_rc "$payload")" = "0" ]
+}
+
+@test "gh: api JSON heredoc is not read as markdown" {
+  have_python3
+  # `gh api --input -` takes JSON, not markdown. Its braces and quoted keys
+  # are not a hardwrapped paragraph.
+  #
+  # The JSON is indented so that no line of it starts with `}`: cozytest.sh
+  # converts each @test into a shell function with awk, and a bare `}` in the
+  # first column ends that function early, silently truncating the test.
+  payload="$(bash_payload 'gh api --method POST /repos/o/r/pulls/1/reviews --input - <<EOF
+  {
+    "event": "COMMENT",
+    "body": "One continuous line."
+  }
+EOF')"
+  [ "$(hook_rc "$payload")" = "0" ]
+}
+
+@test "gh: api JSON heredoc with a wrapped body field is blocked" {
+  have_python3
+  # The wrap lives inside the JSON string as a \n escape. Only the decoded
+  # body is prose, and that is what must be checked.
+  payload="$(bash_payload 'gh api --method POST /repos/o/r/pulls/1/reviews --input - <<EOF
+  {
+    "event": "COMMENT",
+    "body": "A review body that was\nwrapped across two lines."
+  }
+EOF')"
+  [ "$(hook_rc "$payload")" = "2" ]
+}
+
+@test "gh: a heredoc belonging to another command is not adopted" {
+  have_python3
+  # A commit message body is wrapped at ~72 columns on purpose -- git and
+  # AGENTS.md both require it. The presence of a `gh` call further down the
+  # line must not drag that heredoc into the markdown rule.
+  payload="$(bash_payload 'git commit --file - <<EOF
+fix(hook): correct the thing
+
+The body of a commit message is wrapped at seventy-two columns,
+exactly as git and AGENTS.md require.
+EOF
+gh pr edit 1 --add-label area/ai')"
+  [ "$(hook_rc "$payload")" = "0" ]
+}
+
+@test "gh: a YAML heredoc for kubectl is not adopted" {
+  have_python3
+  payload="$(bash_payload 'kubectl apply -f - <<EOF
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: demo
+EOF
+gh issue comment 1 --body "One continuous line."')"
+  [ "$(hook_rc "$payload")" = "0" ]
+}
+
+@test "non-gh shell commands are never blocked" {
+  have_python3
+  payload="$(bash_payload 'printf "line one\nline two\n" > /tmp/notes.txt')"
+  [ "$(hook_rc "$payload")" = "0" ]
+}
+
+###############################################################################
+# Robustness: the hook must never hang, crash, or block what it cannot read   #
+###############################################################################
+
+@test "unparseable payload fails open" {
+  have_python3
+  rc=0
+  printf 'not json at all' | python3 "$HOOK" >/dev/null 2>&1 || rc=$?
+  [ "$rc" = "0" ]
+}
+
+@test "gh: --body-file on a fifo does not hang" {
+  have_python3
+  # An unopened fifo blocks forever on read. The hook must refuse to read
+  # anything that is not a regular file rather than stall the agent.
+  tmp="$(mktemp -d)"
+  mkfifo "$tmp/fifo"
+  payload="$(bash_payload "gh pr create --body-file $tmp/fifo")"
+  rc=0
+  printf '%s' "$payload" | python3 "$HOOK" >/dev/null 2>&1 || rc=$?
+  rm -rf "$tmp"
+  [ "$rc" = "0" ]
+}
+
+@test "gh: unbalanced quotes fail open" {
+  have_python3
+  payload="$(bash_payload 'gh pr create --body "unterminated')"
+  [ "$(hook_rc "$payload")" = "0" ]
+}
+
+@test "block message names the rule and the offending lines" {
+  have_python3
+  payload="$(write_payload /tmp/doc.md 'A paragraph that the agent
+hardwrapped at eighty columns.')"
+  msg="$(printf '%s' "$payload" | python3 "$HOOK" 2>&1 >/dev/null || true)"
+  printf '%s' "$msg" | grep -q 'one continuous line per paragraph'
+  printf '%s' "$msg" | grep -q '/tmp/doc.md'
+}
+
+###############################################################################
+# The question is always "did this edit ADD the line break", never "is there  #
+# a wrap somewhere in the file". These cases pin that distinction down.       #
+###############################################################################
+
+@test "markdown: rewriting a file as entirely wrapped prose is blocked" {
+  have_python3
+  # Ties the violation count of the legacy file, so any count-based test waves
+  # it through -- while every wrap in it is brand new.
+  tmp="$(mktemp -d)"
+  printf 'A legacy paragraph that was\nwrapped long ago.\n' > "$tmp/doc.md"
+  payload="$(write_payload "$tmp/doc.md" 'A completely new paragraph that the
+agent has just hardwrapped.')"
+  rc="$(hook_rc "$payload")"
+  rm -rf "$tmp"
+  [ "$rc" = "2" ]
+}
+
+@test "markdown: reflowing one paragraph while wrapping another is blocked" {
+  have_python3
+  tmp="$(mktemp -d)"
+  printf 'One wrapped paragraph\nfrom long ago.\n\nSECOND\n' > "$tmp/doc.md"
+  payload="$(edit_payload "$tmp/doc.md" 'SECOND' 'A second paragraph the agent
+has now wrapped as well.')"
+  rc="$(hook_rc "$payload")"
+  rm -rf "$tmp"
+  [ "$rc" = "2" ]
+}
+
+@test "markdown: rewriting a legacy file verbatim is allowed" {
+  have_python3
+  tmp="$(mktemp -d)"
+  printf 'A legacy paragraph that was\nwrapped long ago.\n' > "$tmp/doc.md"
+  payload="$(write_payload "$tmp/doc.md" 'A legacy paragraph that was
+wrapped long ago.')"
+  rc="$(hook_rc "$payload")"
+  rm -rf "$tmp"
+  [ "$rc" = "0" ]
+}
+
+@test "gh: a publishing command on the second line of a script is inspected" {
+  have_python3
+  # A newline is whitespace to shlex, so without explicit handling the gh call
+  # folds into the previous command's segment and is never seen.
+  payload="$(bash_payload 'git status
+gh pr create --title "t" --body "A body paragraph the agent
+hardwrapped across two lines."')"
+  [ "$(hook_rc "$payload")" = "2" ]
+}
+
+@test "gh: backslash-continued command with a heredoc body is inspected" {
+  have_python3
+  payload="$(bash_payload 'gh pr create \
+  --title "t" \
+  --body-file - <<EOF
+A body paragraph the agent
+hardwrapped across two lines.
+EOF')"
+  [ "$(hook_rc "$payload")" = "2" ]
+}
+
+@test "gh: a well-formed cat-heredoc body is allowed" {
+  have_python3
+  # The argument is shell syntax, not markdown. Reading `$(cat <<EOF` as a
+  # wrapped paragraph refuses a body the agent cannot possibly reflow.
+  payload="$(bash_payload 'gh pr create --title "t" --body "$(cat <<EOF
+One continuous line per paragraph, exactly as the rule requires.
+EOF
+)"')"
+  [ "$(hook_rc "$payload")" = "0" ]
+}
+
+@test "gh: a hardwrapped cat-heredoc body is blocked" {
+  have_python3
+  payload="$(bash_payload 'gh pr create --title "t" --body "$(cat <<EOF
+A body paragraph the agent
+hardwrapped across two lines.
+EOF
+)"')"
+  [ "$(hook_rc "$payload")" = "2" ]
+}
+
+@test "gh: an absolute path to gh is still inspected" {
+  have_python3
+  payload="$(bash_payload '/usr/bin/gh pr create --title "t" --body "A body paragraph the agent
+hardwrapped across two lines."')"
+  [ "$(hook_rc "$payload")" = "2" ]
+}
+
+@test "markdown: a details block keeps its line breaks" {
+  have_python3
+  payload="$(write_payload /tmp/doc.md '<details>
+<summary>Test output</summary>
+<pre>all green</pre>
+</details>')"
+  [ "$(hook_rc "$payload")" = "0" ]
+}
+
+@test "gh: a details block in a PR body is not blocked" {
+  have_python3
+  payload="$(bash_payload 'gh pr create --title "t" --body "<details>
+<summary>Test output</summary>
+<pre>all green</pre>
+</details>"')"
+  [ "$(hook_rc "$payload")" = "0" ]
+}
+
+@test "markdown: a leading horizontal rule does not swallow the document" {
+  have_python3
+  # `---` on line 1 opens front matter only if a closing delimiter follows.
+  payload="$(write_payload /tmp/doc.md '---
+
+A paragraph the agent
+hardwrapped after a horizontal rule.')"
+  [ "$(hook_rc "$payload")" = "2" ]
+}
+
+@test "gh: body redirected onto stdin from a file is inspected" {
+  have_python3
+  # `--body-file -` says the body arrives on stdin, and `< body.md` says where
+  # stdin comes from. Recording the first without following the second lets the
+  # body publish unread.
+  tmp="$(mktemp -d)"
+  printf 'A body paragraph the agent\nhardwrapped across two lines.\n' > "$tmp/body.md"
+  payload="$(bash_payload "gh pr create --title t --body-file - < $tmp/body.md")"
+  rc="$(hook_rc "$payload")"
+  rm -rf "$tmp"
+  [ "$rc" = "2" ]
+}
+
+@test "gh: api input redirected onto stdin from a file is inspected" {
+  have_python3
+  tmp="$(mktemp -d)"
+  printf '{"body": "A review body that was\\nwrapped across two lines."}\n' > "$tmp/review.json"
+  payload="$(bash_payload "gh api --method POST /repos/o/r/pulls/1/reviews --input - < $tmp/review.json")"
+  rc="$(hook_rc "$payload")"
+  rm -rf "$tmp"
+  [ "$rc" = "2" ]
+}
diff --git a/hack/migration-50-etcd-adopt.bats b/hack/migration-50-etcd-adopt.bats
new file mode 100644
index 0000000000..22422ea77d
--- /dev/null
+++ b/hack/migration-50-etcd-adopt.bats
@@ -0,0 +1,733 @@
+#!/usr/bin/env bats
+# -----------------------------------------------------------------------------
+# Unit tests for platform migration 50 (adopt legacy etcd.aenix.io/v1alpha1
+# clusters onto etcd-operator.cozystack.io/v1alpha2 via etcd-migrate).
+#
+# These drive the real migration script end-to-end against a fake kubectl and a
+# fake etcd-migrate (hack/testdata/migration-50/), mocking only the cluster
+# boundary — the same approach test/check-readiness uses. Every fake invocation
+# is logged so we can assert on the ordering and arguments of the destructive
+# steps, which is exactly the contract that cannot be checked by reading the
+# script.
+#
+# The behaviours pinned here are the review blockers:
+#   1. the safety snapshot is ALWAYS taken to the platform cozy-backups bucket —
+#      never skipped — and the script fails loudly if the target is unresolvable;
+#   2. the staged credentials Secret is tenant-invisible (managed-by set,
+#      tenantresource stripped); and
+#   3. the operator is scaled to 0 BEFORE etcd-migrate --apply, with --apply
+#      always carrying the S3 backup destination, and stays at 0 after a
+#      successful adoption. Only a failed adoption restores it to 1.
+#
+# CI runs this file under Bats through `make bats-unit-tests`. It also remains
+# compatible with the legacy `hack/cozytest.sh` translator, whose awk parser
+# recognizes only @test blocks and a bare `}` on its own line. The tests avoid
+# `run`, `$status`, and setup() for that compatibility path.
+#
+# Run with: bats hack/migration-50-etcd-adopt.bats
+# -----------------------------------------------------------------------------
+
+load test_helper
+
+FAKEBIN="$PWD/hack/testdata/migration-50"
+MIG="$PWD/packages/core/platform/images/migrations/migrations/50"
+
+# prep resets PATH/env to a clean scenario (one legacy cluster, a resolvable
+# platform target). Tests override the FAKE_* knobs afterwards.
+prep() {
+  chmod +x "$FAKEBIN/kubectl" "$FAKEBIN/etcd-migrate"
+  WORK=$(mktemp -d)
+  export FAKE_CMDLOG="$WORK/cmdlog"
+  export FAKE_STAGE_DIR="$WORK/staged"
+  mkdir -p "$FAKE_STAGE_DIR"
+  : > "$FAKE_CMDLOG"
+  export PATH="$FAKEBIN:$PATH"
+  export NAMESPACE=cozy-system
+  export ETCD_OPERATOR_NS=cozy-etcd-operator
+  export ETCD_OPERATOR_DEPLOY=etcd-operator-controller-manager
+  export DRY_RUN=0
+  export CLUSTER_DOMAIN=cozy.local
+  export PLATFORM_CREDS_NS=cozy-velero
+  export FAKE_LEGACY_CRD=1
+  export FAKE_CLUSTERS="tenant-foo etcd"
+  export FAKE_STRATEGY=1
+  export FAKE_CREDS=1
+  export FAKE_V2_CRD=0
+  export FAKE_CLAIM_CRD=1
+  # One healthy claim provisioned into the bucket the projected creds advertise:
+  # the COSI path. Tests override this to model external S3 / stale claims.
+  export FAKE_CLAIMS="tenant-root bucket-cozy-backups cozy-backups-7f3a -"
+  # The baked-CRD dir must exist for the script's `-d` guard; the fake kubectl
+  # logs the apply without reading it, so an empty dir is enough.
+  export ETCD_CRD_DIR="$WORK/etcd-operator-crds"
+  mkdir -p "$ETCD_CRD_DIR"
+  unset ETCD_MIGRATE_BACKUP_ARGS || true
+}
+
+# lineno echoes the 1-based line number of the first $FAKE_CMDLOG line that
+# contains the fixed string $1 (empty if absent).
+lineno() {
+  grep -nF -- "$1" "$FAKE_CMDLOG" | head -1 | cut -d: -f1
+}
+
+@test "platform path auto-derives the S3 snapshot args and stages tenant-safe creds before adopting" {
+  prep
+  rc=0
+  bash "$MIG" >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"
+  cat "$FAKE_CMDLOG"
+  [ "$rc" -eq 0 ]
+
+  # --apply carries the platform-derived S3 destination, NOT --skip-backup.
+  # The endpoint is derived from the projected Secret's bare host and forced to
+  # https, NOT taken from the Strategy CR — the CR is rendered by the version we
+  # are upgrading FROM and its plaintext in-cluster default cannot be reached.
+  apply=$(grep -F -- "ETCD-MIGRATE --apply" "$FAKE_CMDLOG")
+  echo "$apply" | grep -qF -- "--backup-s3-endpoint=https://s3.example.com"
+  if echo "$apply" | grep -qF -- "seaweedfs-s3.tenant-root.svc.cozy.local:8333"; then echo "FAIL: --apply must not carry the in-cluster S3 endpoint"; false; fi
+  # https is forced because a BucketClaim is provisioned into exactly the bucket
+  # the creds advertise, not because the projected endpoint happens to exist.
+  grep -qF -- "BUCKETCLAIM-LIST" "$FAKE_CMDLOG"
+  echo "$apply" | grep -qF -- "--backup-s3-bucket=cozy-backups-7f3a"
+  echo "$apply" | grep -qF -- "--backup-s3-credentials-secret=cozy-backups-creds"
+  echo "$apply" | grep -qF -- "--backup-s3-region=us-east-1"
+  echo "$apply" | grep -qF -- "--backup-s3-force-path-style"
+  # snapshots land under a system key prefix, not a tenant <ns>/<name>/ path.
+  echo "$apply" | grep -qF -- "--backup-s3-key=cozy-system/etcd-adoption/"
+  if echo "$apply" | grep -qF -- "--skip-backup"; then echo "FAIL: --apply must not carry --skip-backup"; false; fi
+  # --agent-image is explicit (the scaled-down Deployment is still the legacy operator).
+  echo "$apply" | grep -qF -- "--agent-image=ghcr.io/cozystack/etcd-operator:v0.5.2"
+
+  # The snapshot credentials are staged into the adopted namespace, and the
+  # staged Secret is tenant-invisible (managed-by set, tenantresource stripped)
+  # while still carrying the AWS_* keys etcd-migrate needs.
+  grep -qF -- "STAGE tenant-foo" "$FAKE_CMDLOG"
+  staged="$FAKE_STAGE_DIR/tenant-foo.json"
+  [ -s "$staged" ]
+  [ "$(jq -r '.metadata.labels["apps.cozystack.io/managed-by"]' "$staged")" = "cozystack-backups" ]
+  [ "$(jq -r '.metadata.labels["internal.cozystack.io/tenantresource"] // "absent"' "$staged")" = "absent" ]
+  [ "$(jq -r '.data.AWS_ACCESS_KEY_ID' "$staged")" = "QUtJQUVYQU1QTEU=" ]
+  [ "$(jq -r '.metadata.namespace // "absent"' "$staged")" = "absent" ]
+
+  # Steps run in this order, stage creds, scale the operator down, --apply, stamp.
+  s_stage=$(lineno "STAGE tenant-foo")
+  s_down=$(lineno "SCALE 0")
+  s_apply=$(lineno "ETCD-MIGRATE --apply")
+  s_stamp=$(lineno "STAMP")
+  [ -n "$s_stage" ] && [ -n "$s_down" ] && [ -n "$s_apply" ] && [ -n "$s_stamp" ]
+  [ "$s_stage" -lt "$s_down" ]
+  [ "$s_down" -lt "$s_apply" ]
+  [ "$s_apply" -lt "$s_stamp" ]
+  rm -rf "$WORK"
+}
+
+@test "successful adoption leaves the legacy operator at 0 for the v1alpha2 operator to replace" {
+  prep
+  rc=0
+  bash "$MIG" >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"
+  cat "$FAKE_CMDLOG"
+  [ "$rc" -eq 0 ]
+  # A legacy operator back at 1 takes etcd-headless away from the adopted
+  # members, see the success path of migration 50.
+  grep -qF -- "SCALE 0" "$FAKE_CMDLOG"
+  if grep -qF -- "SCALE 1" "$FAKE_CMDLOG"; then echo "FAIL: the legacy operator was scaled back up after a successful adoption"; false; fi
+  grep -qF -- "STAMP" "$FAKE_CMDLOG"
+  rm -rf "$WORK"
+}
+
+@test "applies the baked v1alpha2 CRDs before adopting when they are absent" {
+  prep
+  export FAKE_V2_CRD=0
+  rc=0
+  bash "$MIG" >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"
+  cat "$FAKE_CMDLOG"
+  [ "$rc" -eq 0 ]
+  # CRDs applied, and BEFORE etcd-migrate (which lists v1alpha2 clusters).
+  grep -qF -- "APPLY-CRDS" "$FAKE_CMDLOG"
+  s_crds=$(lineno "APPLY-CRDS")
+  s_apply=$(lineno "ETCD-MIGRATE --apply")
+  [ -n "$s_crds" ] && [ -n "$s_apply" ]
+  [ "$s_crds" -lt "$s_apply" ]
+}
+
+@test "does not re-apply v1alpha2 CRDs when already installed" {
+  prep
+  export FAKE_V2_CRD=1
+  rc=0
+  bash "$MIG" >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"
+  cat "$FAKE_CMDLOG"
+  [ "$rc" -eq 0 ]
+  if grep -qF -- "APPLY-CRDS" "$FAKE_CMDLOG"; then echo "FAIL: no CRDs must have been applied"; false; fi
+  # Adoption still proceeds.
+  grep -qF -- "ETCD-MIGRATE --apply" "$FAKE_CMDLOG"
+  rm -rf "$WORK"
+}
+
+@test "re-issues server and peer certs with the native wildcard SAN before adopting" {
+  prep
+  # Certificates exist but lack the operator's native wildcard (the legacy
+  # enumerated-SAN situation ensure_wildcard_sans exists to fix).
+  export FAKE_CERTS=1
+  rc=0
+  bash "$MIG" >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"
+  cat "$FAKE_CMDLOG"
+  [ "$rc" -eq 0 ]
+  # Both server and peer Certificates are patched...
+  grep -qF -- "PATCH-CERT etcd-server" "$FAKE_CMDLOG"
+  grep -qF -- "PATCH-CERT etcd-peer" "$FAKE_CMDLOG"
+  # ...and the patch payload carries the native wildcard SAN.
+  grep -F -- "patch certificate.cert-manager.io etcd-server" "$FAKE_CMDLOG" | grep -qF -- "*.etcd.tenant-foo.svc"
+  # The re-issue happens BEFORE adoption (so a replacement member never fails TLS).
+  s_patch=$(lineno "PATCH-CERT etcd-server")
+  s_apply=$(lineno "ETCD-MIGRATE --apply")
+  [ -n "$s_patch" ] && [ -n "$s_apply" ]
+  [ "$s_patch" -lt "$s_apply" ]
+  rm -rf "$WORK"
+}
+
+@test "failed adoption restores the operator to 1 replica (no stranded scale-to-0)" {
+  prep
+  export FAKE_MIGRATE_FAIL=1
+  rc=0
+  bash "$MIG" >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"
+  cat "$FAKE_CMDLOG"
+  # The migration must propagate the failure...
+  [ "$rc" -ne 0 ]
+  # ...but the EXIT trap must have scaled the cluster-wide operator back to 1
+  # AFTER the failed --apply, so reconciliation is not frozen platform-wide.
+  s_down=$(lineno "SCALE 0")
+  s_apply=$(lineno "ETCD-MIGRATE --apply")
+  s_up=$(lineno "SCALE 1")
+  [ -n "$s_down" ] && [ -n "$s_apply" ] && [ -n "$s_up" ]
+  [ "$s_down" -lt "$s_apply" ]
+  [ "$s_apply" -lt "$s_up" ]
+  # The version must NOT be stamped on a failed adoption (the Job retries).
+  if grep -qF -- "STAMP" "$FAKE_CMDLOG"; then echo "FAIL: no version must have been stamped"; false; fi
+  rm -rf "$WORK"
+}
+
+@test "no resolvable destination hard-fails without scaling or adopting" {
+  prep
+  # Neither source resolves the bucket: the projector dropped bucketName (its
+  # source Secret did not carry one) and the Strategy CR that would supply it
+  # never rendered.
+  export FAKE_STRATEGY=0
+  export FAKE_CREDS_COORDS=0
+  rc=0
+  bash "$MIG" >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"
+  cat "$FAKE_CMDLOG"
+  [ "$rc" -ne 0 ]
+  grep -qF -- "refusing to adopt" "$WORK/out"
+  # The refusal must tell the operator how to actually take the hatch. Naming
+  # ETCD_ADOPT_SKIP_BACKUP alone was unactionable advice for the entire life of
+  # this migration: nothing can set a var on a Helm-hook Job, so the message has
+  # to name the Package CR path that renders it.
+  grep -qF -- "package.cozystack.io cozystack.cozystack-platform" "$WORK/out"
+  grep -qF -- "etcdAdoptSkipBackup: true" "$WORK/out"
+  # Nothing destructive must have run: no scale-down, no --apply, no version stamp.
+  if grep -qF -- "SCALE 0" "$FAKE_CMDLOG"; then echo "FAIL: the operator must not have been scaled down"; false; fi
+  if grep -qF -- "ETCD-MIGRATE --apply" "$FAKE_CMDLOG"; then echo "FAIL: etcd-migrate --apply must not have run"; false; fi
+  if grep -qF -- "STAMP" "$FAKE_CMDLOG"; then echo "FAIL: no version must have been stamped"; false; fi
+  rm -rf "$WORK"
+}
+
+@test "absent Strategy CR still resolves from the projected coordinates" {
+  prep
+  # The v1.5.x shape where strategy-etcd-default.yaml never rendered: its
+  # `if $bucketName` guard lookup raced the BucketClaim the same chart creates,
+  # and helm lookup does not re-run on reconcile. Before deriving coordinates
+  # from the projected Secret this was a total upgrade block with no reachable
+  # escape (ETCD_ADOPT_SKIP_BACKUP is not plumbed through the migration hook).
+  export FAKE_STRATEGY=0
+  rc=0
+  bash "$MIG" >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"
+  cat "$FAKE_CMDLOG"
+  [ "$rc" -eq 0 ]
+  if grep -qF -- "refusing to adopt" "$WORK/out"; then echo "FAIL: adoption must not have been refused"; false; fi
+  apply=$(grep -F -- "ETCD-MIGRATE --apply" "$FAKE_CMDLOG")
+  echo "$apply" | grep -qF -- "--backup-s3-endpoint=https://s3.example.com"
+  echo "$apply" | grep -qF -- "--backup-s3-bucket=cozy-backups-7f3a"
+  echo "$apply" | grep -qF -- "--backup-s3-region=us-east-1"
+  echo "$apply" | grep -qF -- "--backup-s3-force-path-style"
+  if echo "$apply" | grep -qF -- "--skip-backup"; then echo "FAIL: --apply must not carry --skip-backup"; false; fi
+  grep -qF -- "STAMP" "$FAKE_CMDLOG"
+  rm -rf "$WORK"
+}
+
+@test "external S3 (no COSI at all) keeps the Strategy CR endpoint scheme verbatim" {
+  prep
+  # provisionBucket: false on a cluster with no SeaweedFS/COSI at all
+  # (docs/operations/backup-classes.md describes exactly this flip), so the
+  # BucketClaim CRD itself is absent and every claim query fails the way real
+  # kubectl fails on an unknown resource type. That must classify as external
+  # and must NOT abort the script under `set -euo pipefail`.
+  #
+  # The projector still writes a bare `endpoint` here (it always does), so the
+  # endpoint's PRESENCE cannot signal this case. The admin's
+  # .Values.backupStorage.endpoint is authoritative and may legitimately be
+  # plaintext against a private store, so its scheme must survive. Forcing https
+  # would be a total upgrade block: the snapshot is mandatory and
+  # ETCD_ADOPT_SKIP_BACKUP is not plumbed through templates/migration-hook.yaml,
+  # so the operator would have no escape.
+  export FAKE_CLAIM_CRD=0
+  export FAKE_CLAIMS=""
+  export FAKE_CREDS_ENDPOINT="minio.internal:9000"
+  # The healthy external shape: the admin's backupStorage.bucketName (which the
+  # CR renders) and their source Secret name the same bucket. The disagreeing
+  # shape is covered separately by the CR-wholesale test above.
+  export FAKE_CREDS_BUCKET="minio-bucket"
+  export FAKE_STRATEGY_BUCKET="minio-bucket"
+  export FAKE_STRATEGY_ENDPOINT="http://minio.internal:9000"
+  rc=0
+  bash "$MIG" >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"
+  cat "$FAKE_CMDLOG"
+  [ "$rc" -eq 0 ]
+  apply=$(grep -F -- "ETCD-MIGRATE --apply" "$FAKE_CMDLOG")
+  echo "$apply" | grep -qF -- "--backup-s3-endpoint=http://minio.internal:9000"
+  # The projected bare host must NOT be promoted to https.
+  if echo "$apply" | grep -qF -- "https://minio.internal:9000"; then echo "FAIL: the projected bare host must not be promoted to https"; false; fi
+  echo "$apply" | grep -qF -- "--backup-s3-bucket=minio-bucket"
+  # A missing CRD is answered, not retried: the list is never even attempted.
+  if grep -qF -- "BUCKETCLAIM-LIST" "$FAKE_CMDLOG"; then echo "FAIL: BucketClaims must not have been listed"; false; fi
+  rm -rf "$WORK"
+}
+
+@test "external S3 takes every coordinate from the CR, never a Secret/CR hybrid" {
+  prep
+  # The projector copies bucketName straight from the admin's source Secret and
+  # never from backupStorage.bucketName, so the two can disagree outright (a
+  # stale projection, or a Secret that simply names a different bucket). Taking
+  # the CR's endpoint while keeping the Secret's bucket/region would assemble a
+  # pairing nothing else in the system produces and could snapshot into a bucket
+  # the platform's own backups never touch. The CR renders backupStorage.* and
+  # already points at these same creds, so CR coordinates + these creds is what
+  # this cluster's real BackupJobs use — take all four from it.
+  export FAKE_CLAIM_CRD=0
+  export FAKE_CLAIMS=""
+  export FAKE_CREDS_ENDPOINT="minio.internal:9000"
+  export FAKE_CREDS_BUCKET="stale-secret-bucket"
+  export FAKE_CREDS_REGION="eu-west-9"
+  export FAKE_CREDS_FPS="false"
+  export FAKE_STRATEGY_ENDPOINT="http://minio.internal:9000"
+  export FAKE_STRATEGY_BUCKET="platform-bucket"
+  export FAKE_STRATEGY_REGION="us-east-1"
+  export FAKE_STRATEGY_FPS="true"
+  rc=0
+  bash "$MIG" >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"
+  [ "$rc" -eq 0 ]
+  apply=$(grep -F -- "ETCD-MIGRATE --apply" "$FAKE_CMDLOG")
+  echo "$apply" | grep -qF -- "--backup-s3-endpoint=http://minio.internal:9000"
+  echo "$apply" | grep -qF -- "--backup-s3-bucket=platform-bucket"
+  echo "$apply" | grep -qF -- "--backup-s3-region=us-east-1"
+  echo "$apply" | grep -qF -- "--backup-s3-force-path-style"
+  # Not one projected coordinate may leak into the external destination.
+  if echo "$apply" | grep -qF -- "stale-secret-bucket"; then echo "FAIL: --apply must not carry the stale bucket from the Secret"; false; fi
+  if echo "$apply" | grep -qF -- "eu-west-9"; then echo "FAIL: --apply must not carry the stale region from the Secret"; false; fi
+  rm -rf "$WORK"
+}
+
+@test "COSI keeps the projected bucket even when the Strategy CR names another" {
+  prep
+  # Guard, not a bite: the CR-wholesale rule above is scoped to external S3. On
+  # the COSI path the projected bucket is the COSI-assigned name, which the CR
+  # can only reproduce through a live BucketClaim lookup that may never have run
+  # (the very race this hook works around) — and bucketNameOverride immunity
+  # depends on preferring the Secret. A future "simplify both paths to the CR"
+  # must fail here.
+  export FAKE_STRATEGY_BUCKET="cr-bucket-should-lose"
+  rc=0
+  bash "$MIG" >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"
+  [ "$rc" -eq 0 ]
+  apply=$(grep -F -- "ETCD-MIGRATE --apply" "$FAKE_CMDLOG")
+  echo "$apply" | grep -qF -- "--backup-s3-bucket=cozy-backups-7f3a"
+  if echo "$apply" | grep -qF -- "cr-bucket-should-lose"; then echo "FAIL: --apply must not carry the bucket from the Strategy CR"; false; fi
+  rm -rf "$WORK"
+}
+
+@test "external S3 with a stale Terminating BucketClaim still keeps the CR scheme" {
+  prep
+  # The regression the name-keyed probe shipped: provisionBucket: false, but a
+  # leftover BucketClaim is wedged Terminating — its cosi bucketclaim-protection
+  # finalizer outlives the uninstalled COSI controller, so `kubectl get` on the
+  # NAME keeps returning 0 forever. An existence-keyed probe reads that as COSI
+  # and forces https on the admin's plaintext store, wedging the upgrade with no
+  # escape hatch. Matching on .status.bucketName instead: the stale claim names
+  # the OLD bucket, which cannot match the bucket the creds advertise.
+  export FAKE_CLAIMS="tenant-root bucket-cozy-backups bucket-0bb5096a-stale 2026-07-17T09:00:00Z"
+  export FAKE_CREDS_ENDPOINT="minio.internal:9000"
+  export FAKE_CREDS_BUCKET="minio-bucket"
+  export FAKE_STRATEGY_BUCKET="minio-bucket"
+  export FAKE_STRATEGY_ENDPOINT="http://minio.internal:9000"
+  rc=0
+  bash "$MIG" >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"
+  cat "$FAKE_CMDLOG"
+  [ "$rc" -eq 0 ]
+  apply=$(grep -F -- "ETCD-MIGRATE --apply" "$FAKE_CMDLOG")
+  echo "$apply" | grep -qF -- "--backup-s3-endpoint=http://minio.internal:9000"
+  if echo "$apply" | grep -qF -- "https://minio.internal:9000"; then echo "FAIL: the projected bare host must not be promoted to https"; false; fi
+  rm -rf "$WORK"
+}
+
+@test "COSI with overridden bucket coordinates is still detected (no hardcoded names)" {
+  prep
+  # backupStorage.namespace / .bucketName are supported Package-CR overrides
+  # (docs/operations/backup-classes.md), and this hook cannot see chart values —
+  # nothing plumbs them into the migration Job's env. So the claim may sit in any
+  # namespace under any name. Keying on the COSI-assigned .status.bucketName,
+  # which is what the projector republishes, makes the probe independent of both.
+  # A name-keyed probe would miss this claim, misclassify the cluster as
+  # external, and fall back to the v1.5.x plaintext CR — the original P0.
+  export FAKE_CLAIMS="tenant-custom bucket-my-backups cozy-backups-7f3a -"
+  rc=0
+  bash "$MIG" >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"
+  cat "$FAKE_CMDLOG"
+  [ "$rc" -eq 0 ]
+  apply=$(grep -F -- "ETCD-MIGRATE --apply" "$FAKE_CMDLOG")
+  echo "$apply" | grep -qF -- "--backup-s3-endpoint=https://s3.example.com"
+  if echo "$apply" | grep -qF -- "seaweedfs-s3.tenant-root.svc.cozy.local:8333"; then echo "FAIL: --apply must not carry the in-cluster S3 endpoint"; false; fi
+  rm -rf "$WORK"
+}
+
+@test "COSI is detected on a big multi-tenant cluster (match not last in the claim list)" {
+  prep
+  # Every other test runs with a single BucketClaim, which is exactly why a
+  # first-match-exit consumer looks green: it only misbehaves once the rendered
+  # list outgrows one pipe write (~8KB) AND the match is not the last line.
+  # `kubectl get -A` sorts by namespace, so tenant-root lands mid-list on a real
+  # cluster; this puts the match FIRST, the worst case.
+  #
+  # A `jq -r ... | grep -qxF` probe SIGPIPEs jq here (rc 141) and `set -o
+  # pipefail` surfaces that instead of grep's 0, so the match reads as "not
+  # COSI" -> external -> the v1.5.x plaintext :8333 CR endpoint -> the snapshot
+  # fails and the upgrade is blocked, on precisely the large clusters that can
+  # least afford it. Worse, it is a race: backoffLimit 3 can classify the same
+  # cluster differently on each retry.
+  export FAKE_CREDS_BUCKET="bucket-0bb5096a-956e-4630-91f4-e1d265de5f51"
+  export FAKE_CLAIMS="tenant-root bucket-cozy-backups bucket-0bb5096a-956e-4630-91f4-e1d265de5f51 -"
+  export FAKE_CLAIM_FILLER=300
+  rc=0
+  bash "$MIG" >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"
+  [ "$rc" -eq 0 ]
+  apply=$(grep -F -- "ETCD-MIGRATE --apply" "$FAKE_CMDLOG")
+  echo "$apply" | grep -qF -- "--backup-s3-endpoint=https://s3.example.com"
+  echo "$apply" | grep -qF -- "--backup-s3-bucket=bucket-0bb5096a-956e-4630-91f4-e1d265de5f51"
+  # The v1.5.x CR endpoint must never be what a large cluster falls back to.
+  if echo "$apply" | grep -qF -- "seaweedfs-s3.tenant-root.svc.cozy.local:8333"; then echo "FAIL: --apply must not carry the in-cluster S3 endpoint"; false; fi
+  rm -rf "$WORK"
+}
+
+@test "a TERMINATING claim on the matching bucket is ambiguous: refuse, do not guess" {
+  prep
+  # The state neither reading survives: an admin moved COSI -> external S3
+  # REUSING the bucket name (backup continuity), and the old claim is wedged
+  # Terminating because COSI is gone. Reading the corpse as ownership forces
+  # https on a plaintext store; reading it as "external" would, on a cluster
+  # that is still COSI with a mid-recreate claim, resurrect the plaintext-:8333
+  # P0. Both are wrong half the time and both fail as a confusing handshake
+  # error, so the guess buys nothing — refuse and name the ambiguity.
+  export FAKE_CLAIMS="tenant-root bucket-cozy-backups minio-bucket 2026-07-17T09:00:00Z"
+  export FAKE_CREDS_BUCKET="minio-bucket"
+  export FAKE_CREDS_ENDPOINT="minio.internal:9000"
+  export FAKE_STRATEGY_ENDPOINT="http://minio.internal:9000"
+  rc=0
+  bash "$MIG" >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"
+  cat "$FAKE_CMDLOG"
+  [ "$rc" -ne 0 ]
+  grep -qF -- "TERMINATING BucketClaim" "$WORK/out"
+  grep -qF -- "could not determine" "$WORK/out"
+  # It must not have silently taken either branch.
+  if grep -qF -- "treating as external S3" "$WORK/out"; then echo "FAIL: the endpoint must not have been treated as external S3"; false; fi
+  if grep -qF -- "forcing https" "$WORK/out"; then echo "FAIL: the endpoint scheme must not have been forced to https"; false; fi
+  # Nothing destructive ran.
+  if grep -qF -- "SCALE 0" "$FAKE_CMDLOG"; then echo "FAIL: the operator must not have been scaled down"; false; fi
+  if grep -qF -- "ETCD-MIGRATE --apply" "$FAKE_CMDLOG"; then echo "FAIL: etcd-migrate --apply must not have run"; false; fi
+  if grep -qF -- "STAMP" "$FAKE_CMDLOG"; then echo "FAIL: no version must have been stamped"; false; fi
+  rm -rf "$WORK"
+}
+
+@test "a LIVE claim wins over an unrelated Terminating one (ambiguity is not over-applied)" {
+  prep
+  # Guard, not a bite: the refusal above must fire ONLY when the match is
+  # exclusively Terminating. A healthy COSI cluster that also carries some dead
+  # claim must still resolve normally — an over-broad "any Terminating claim is
+  # ambiguous" rule would wedge ordinary upgrades.
+  export FAKE_CLAIMS="tenant-root bucket-cozy-backups cozy-backups-7f3a -
+tenant-old bucket-dead bucket-dead-uuid 2026-07-17T09:00:00Z"
+  rc=0
+  bash "$MIG" >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"
+  [ "$rc" -eq 0 ]
+  apply=$(grep -F -- "ETCD-MIGRATE --apply" "$FAKE_CMDLOG")
+  echo "$apply" | grep -qF -- "--backup-s3-endpoint=https://s3.example.com"
+  if grep -qF -- "TERMINATING BucketClaim" "$WORK/out"; then echo "FAIL: no terminating BucketClaim must have been reported"; false; fi
+  rm -rf "$WORK"
+}
+
+@test "an uninterpretable claim list fails loud rather than reading as external" {
+  prep
+  # No producer emits this — kubectl always renders a List with an items array —
+  # but without a shape gate every unexpected document reads as "no claim owns
+  # the bucket" = external = the plaintext-:8333 P0, silently. Refuse instead.
+  export FAKE_CLAIM_LIST_SHAPE=items-not-array
+  rc=0
+  bash "$MIG" >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"
+  [ "$rc" -ne 0 ]
+  grep -qF -- "unexpected BucketClaim list shape" "$WORK/out"
+  if grep -qF -- "treating as external S3" "$WORK/out"; then echo "FAIL: the endpoint must not have been treated as external S3"; false; fi
+  if grep -qF -- "ETCD-MIGRATE --apply" "$FAKE_CMDLOG"; then echo "FAIL: etcd-migrate --apply must not have run"; false; fi
+  if grep -qF -- "STAMP" "$FAKE_CMDLOG"; then echo "FAIL: no version must have been stamped"; false; fi
+  rm -rf "$WORK"
+}
+
+@test "an unreadable BucketClaim API fails loud instead of guessing external S3" {
+  prep
+  # A transient CRD read error is NOT the same answer as "the CRD is absent".
+  # Treating it as absent classifies a COSI cluster as external and snapshots to
+  # the unreachable v1.5 in-cluster endpoint — the original P0, resurrected by an
+  # apiserver blip. Refuse to classify instead: a loud failure is recoverable
+  # (the Job retries), a wrong classification is not.
+  export FAKE_CLAIM_CRD=error
+  rc=0
+  bash "$MIG" >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"
+  cat "$FAKE_CMDLOG"
+  [ "$rc" -ne 0 ]
+  grep -qF -- "could not determine" "$WORK/out"
+  grep -qF -- "refusing to adopt" "$WORK/out"
+  # It must NOT have silently taken the external path.
+  if grep -qF -- "treating as external S3" "$WORK/out"; then echo "FAIL: the endpoint must not have been treated as external S3"; false; fi
+  # Nothing destructive ran.
+  if grep -qF -- "SCALE 0" "$FAKE_CMDLOG"; then echo "FAIL: the operator must not have been scaled down"; false; fi
+  if grep -qF -- "ETCD-MIGRATE --apply" "$FAKE_CMDLOG"; then echo "FAIL: etcd-migrate --apply must not have run"; false; fi
+  if grep -qF -- "STAMP" "$FAKE_CMDLOG"; then echo "FAIL: no version must have been stamped"; false; fi
+  rm -rf "$WORK"
+}
+
+@test "an unreadable claim LIST fails loud rather than classifying as external" {
+  prep
+  # Same reasoning one level down: the CRD exists (COSI is installed), so a
+  # failing list read cannot mean "no COSI here".
+  export FAKE_CLAIM_LIST_ERR=1
+  rc=0
+  bash "$MIG" >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"
+  [ "$rc" -ne 0 ]
+  grep -qF -- "could not determine" "$WORK/out"
+  if grep -qF -- "ETCD-MIGRATE --apply" "$FAKE_CMDLOG"; then echo "FAIL: etcd-migrate --apply must not have run"; false; fi
+  if grep -qF -- "STAMP" "$FAKE_CMDLOG"; then echo "FAIL: no version must have been stamped"; false; fi
+  rm -rf "$WORK"
+}
+
+@test "COSI without a projected endpoint falls back to the CR, never a bare https://" {
+  prep
+  # Defensive: the projector cannot produce this (it fails
+  # ReasonSourceMalformed rather than omit the endpoint), but forcing the scheme
+  # onto an empty host yields the literal "https://", which is non-empty and so
+  # sails through the final resolution guard and reaches etcd-migrate as a
+  # destination. origin/main degraded to the CR here; so must this.
+  export FAKE_CREDS_ENDPOINT=""
+  rc=0
+  bash "$MIG" >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"
+  cat "$FAKE_CMDLOG"
+  [ "$rc" -eq 0 ]
+  apply=$(grep -F -- "ETCD-MIGRATE --apply" "$FAKE_CMDLOG")
+  # No scheme-only endpoint reaches etcd-migrate...
+  if echo "$apply" | grep -qE -- "--backup-s3-endpoint=https://( |$)"; then echo "FAIL: --apply must not carry an endpoint whose host is empty"; false; fi
+  # ...and the CR supplies the real one instead.
+  echo "$apply" | grep -qF -- "--backup-s3-endpoint=http://seaweedfs-s3.tenant-root.svc.cozy.local:8333"
+  rm -rf "$WORK"
+}
+
+@test "inbound --skip-backup is ignored: still snapshots to the platform bucket" {
+  prep
+  # There is no opt-out anymore. An operator setting --skip-backup must NOT be
+  # able to suppress the snapshot: the platform target is resolved regardless
+  # and --apply carries the S3 destination, never --skip-backup.
+  export ETCD_MIGRATE_BACKUP_ARGS="--skip-backup"
+  rc=0
+  bash "$MIG" >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"
+  cat "$FAKE_CMDLOG"
+  [ "$rc" -eq 0 ]
+  apply=$(grep -F -- "ETCD-MIGRATE --apply" "$FAKE_CMDLOG")
+  echo "$apply" | grep -qF -- "--backup-s3-bucket=cozy-backups-7f3a"
+  if echo "$apply" | grep -qF -- "--skip-backup"; then echo "FAIL: --apply must not carry --skip-backup"; false; fi
+  grep -qF -- "STAGE tenant-foo" "$FAKE_CMDLOG"
+  rm -rf "$WORK"
+}
+
+@test "ETCD_ADOPT_SKIP_BACKUP=1 adopts with --skip-backup and stages no creds" {
+  prep
+  # The supported escape hatch: an operator who accepts adopting without a
+  # snapshot sets ETCD_ADOPT_SKIP_BACKUP=1 (distinct from the inbound
+  # ETCD_MIGRATE_BACKUP_ARGS above, which cannot suppress the snapshot). --apply
+  # then carries --skip-backup, no creds are staged, but adoption still proceeds.
+  export ETCD_ADOPT_SKIP_BACKUP=1
+  rc=0
+  bash "$MIG" >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"
+  cat "$FAKE_CMDLOG"
+  [ "$rc" -eq 0 ]
+  apply=$(grep -F -- "ETCD-MIGRATE --apply" "$FAKE_CMDLOG")
+  echo "$apply" | grep -qF -- "--skip-backup"
+  if echo "$apply" | grep -qF -- "--backup-s3-endpoint"; then echo "FAIL: --apply must not carry a backup S3 endpoint"; false; fi
+  # No snapshot Job runs, so no credentials are staged.
+  if grep -qF -- "STAGE " "$FAKE_CMDLOG"; then echo "FAIL: no credentials must have been staged"; false; fi
+  # Adoption still runs and stamps: scale down -> --apply -> scale up -> stamp.
+  grep -qF -- "SCALE 0" "$FAKE_CMDLOG"
+  grep -qF -- "STAMP" "$FAKE_CMDLOG"
+  rm -rf "$WORK"
+}
+
+@test "ETCD_ADOPT_SKIP_BACKUP=true is honoured, not silently ignored" {
+  prep
+  # The platform renders this var through migrations.etcdAdoptSkipBackup and
+  # always emits "1", but an operator setting it by hand will reasonably type
+  # "true". An exact match on "1" would accept that, show it in the Job spec and
+  # do nothing — a safety valve that is set but silently ignored is worse than
+  # one that was never offered, because the operator believes they opted in.
+  export ETCD_ADOPT_SKIP_BACKUP=true
+  rc=0
+  bash "$MIG" >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"
+  [ "$rc" -eq 0 ]
+  apply=$(grep -F -- "ETCD-MIGRATE --apply" "$FAKE_CMDLOG")
+  echo "$apply" | grep -qF -- "--skip-backup"
+  if echo "$apply" | grep -qF -- "--backup-s3-endpoint"; then echo "FAIL: --apply must not carry a backup S3 endpoint"; false; fi
+  if grep -qF -- "STAGE " "$FAKE_CMDLOG"; then echo "FAIL: no credentials must have been staged"; false; fi
+  rm -rf "$WORK"
+}
+
+@test "an unrecognised ETCD_ADOPT_SKIP_BACKUP value does NOT skip the snapshot" {
+  prep
+  # Skipping the snapshot on live etcd must require an affirmative answer. A
+  # typo, a stray value, or a future template bug rendering something unexpected
+  # must fall back to the safe side and still take the snapshot.
+  export ETCD_ADOPT_SKIP_BACKUP=banana
+  rc=0
+  bash "$MIG" >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"
+  [ "$rc" -eq 0 ]
+  apply=$(grep -F -- "ETCD-MIGRATE --apply" "$FAKE_CMDLOG")
+  if echo "$apply" | grep -qF -- "--skip-backup"; then echo "FAIL: --apply must not carry --skip-backup"; false; fi
+  echo "$apply" | grep -qF -- "--backup-s3-endpoint=https://s3.example.com"
+  rm -rf "$WORK"
+}
+
+@test "ETCD_ADOPT_SKIP_BACKUP=1 unblocks adoption when no backup target resolves" {
+  prep
+  # The narrowing the reviewer asked for: a cluster with legacy etcd but no
+  # resolvable backup target (backups disabled / external S3 without staged
+  # creds / SeaweedFS not ready) is no longer a total upgrade block when the
+  # operator opts into skipping the snapshot. Resolution is not even attempted,
+  # so this passes regardless of why the target would be unresolvable.
+  export FAKE_STRATEGY=0
+  export FAKE_CREDS_COORDS=0
+  export ETCD_ADOPT_SKIP_BACKUP=1
+  rc=0
+  bash "$MIG" >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"
+  cat "$FAKE_CMDLOG"
+  [ "$rc" -eq 0 ]
+  if grep -qF -- "refusing to adopt" "$WORK/out"; then echo "FAIL: adoption must not have been refused"; false; fi
+  apply=$(grep -F -- "ETCD-MIGRATE --apply" "$FAKE_CMDLOG")
+  echo "$apply" | grep -qF -- "--skip-backup"
+  grep -qF -- "STAMP" "$FAKE_CMDLOG"
+  rm -rf "$WORK"
+}
+
+@test "idempotent re-run with zero remaining clusters stamps without adopting" {
+  prep
+  # CRD still present (a prior run adopted everything) but no legacy clusters left.
+  export FAKE_CLUSTERS=""
+  rc=0
+  bash "$MIG" >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"
+  cat "$FAKE_CMDLOG"
+  [ "$rc" -eq 0 ]
+  grep -qF -- "STAMP" "$FAKE_CMDLOG"
+  if grep -qF -- "SCALE 0" "$FAKE_CMDLOG"; then echo "FAIL: the operator must not have been scaled down"; false; fi
+  if grep -qF -- "ETCD-MIGRATE --apply" "$FAKE_CMDLOG"; then echo "FAIL: etcd-migrate --apply must not have run"; false; fi
+  if grep -qF -- "STAGE " "$FAKE_CMDLOG"; then echo "FAIL: no credentials must have been staged"; false; fi
+  rm -rf "$WORK"
+}
+
+@test "no legacy CRD stamps version 51 without adopting" {
+  prep
+  export FAKE_LEGACY_CRD=0
+  rc=0
+  bash "$MIG" >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"
+  cat "$FAKE_CMDLOG"
+  [ "$rc" -eq 0 ]
+  grep -qF -- "STAMP" "$FAKE_CMDLOG"
+  if grep -qF -- "SCALE 0" "$FAKE_CMDLOG"; then echo "FAIL: the operator must not have been scaled down"; false; fi
+  if grep -qF -- "ETCD-MIGRATE --apply" "$FAKE_CMDLOG"; then echo "FAIL: etcd-migrate --apply must not have run"; false; fi
+  rm -rf "$WORK"
+}
+
+@test "cert SAN check is exact: a superstring dnsName does not skip the re-issue patch" {
+  prep
+  # The Certificate's spec.dnsNames already carries *.etcd.<ns>.svc.cluster.local,
+  # which CONTAINS the native wildcard *.etcd.<ns>.svc as a substring but is not
+  # an exact match. A substring match (the bug) would treat the wildcard as
+  # already present and skip the patch; the exact match must still re-issue.
+  export FAKE_CERTS=1
+  export FAKE_CERT_SUPERSTRING=1
+  rc=0
+  bash "$MIG" >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"
+  cat "$FAKE_CMDLOG"
+  [ "$rc" -eq 0 ]
+  # Both Certificates are still patched despite the substring-only SAN.
+  grep -qF -- "PATCH-CERT etcd-server" "$FAKE_CMDLOG"
+  grep -qF -- "PATCH-CERT etcd-peer" "$FAKE_CMDLOG"
+  rm -rf "$WORK"
+}
+
+@test "etcd-migrate authenticates via a synthesized in-cluster kubeconfig at kubernetes.default.svc" {
+  prep
+  # etcd-migrate only reads a kubeconfig FILE (no in-cluster SA fallback), so the
+  # script synthesizes one from the mounted ServiceAccount. Point the SA dir at a
+  # fixture and capture the written kubeconfig.
+  sa="$WORK/sa"; mkdir -p "$sa"
+  printf 'faketoken'   > "$sa/token"
+  printf 'fakeca'      > "$sa/ca.crt"
+  printf 'cozy-system' > "$sa/namespace"
+  export ETCD_ADOPT_SA_DIR="$sa"
+  export ETCD_MIGRATE_KUBECONFIG="$WORK/in-cluster.kubeconfig"
+  # A bare IPv6 host that must NOT end up in the (unbracketed, invalid) server URL.
+  export KUBERNETES_SERVICE_HOST="fd00::1"
+  export KUBERNETES_SERVICE_PORT="443"
+  rc=0
+  bash "$MIG" >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"
+  cat "$FAKE_CMDLOG"
+  [ "$rc" -eq 0 ]
+  # Both the dry-run and --apply invocations carry --kubeconfig=<synthesized>.
+  [ "$(grep -cF -- "--kubeconfig=$WORK/in-cluster.kubeconfig" "$FAKE_CMDLOG")" -ge 2 ]
+  # The kubeconfig is IP-family-agnostic (DNS name, not the bare IPv6 host) and
+  # authenticates via the SA token file + CA.
+  [ -s "$ETCD_MIGRATE_KUBECONFIG" ]
+  grep -qF -- "server: https://kubernetes.default.svc" "$ETCD_MIGRATE_KUBECONFIG"
+  if grep -qF -- "fd00::1" "$ETCD_MIGRATE_KUBECONFIG"; then echo "FAIL: the synthesized kubeconfig must not name the bare IPv6 host"; false; fi
+  grep -qF -- "tokenFile: $sa/token" "$ETCD_MIGRATE_KUBECONFIG"
+  grep -qF -- "certificate-authority: $sa/ca.crt" "$ETCD_MIGRATE_KUBECONFIG"
+  rm -rf "$WORK"
+}
diff --git a/hack/migration-54-redis-adopt.bats b/hack/migration-54-redis-adopt.bats
new file mode 100644
index 0000000000..18fa8ce481
--- /dev/null
+++ b/hack/migration-54-redis-adopt.bats
@@ -0,0 +1,244 @@
+#!/usr/bin/env bats
+# -----------------------------------------------------------------------------
+# Unit tests for platform migration 54 --> 55 (adopt every existing
+# RedisFailover onto the freshworks-oss redis-operator's group filter AND pin
+# its engine, before the new operator starts).
+#
+# redis-operator v3.3.5 watches RedisFailovers through a server-side label
+# selector (redis-failover.freshworks.com/operator-group=cozystack); a CR
+# without that label never reaches the operator's informer. The same window is
+# dangerous for the engine version: v3.3.5's compiled-in default moved
+# 6.2.6 -> 7.2.4, which rewrites dump.rdb into a format 6.2.6 cannot load. So the
+# migration, in one pass ahead of the new operator, ALWAYS stamps the label and
+# pins spec.redis.image / spec.sentinel.image to redis:6.2.6-alpine ONLY where
+# that field is empty — leaving a preset image (apps/redis pins its data image
+# via versionMap) untouched.
+#
+# Three properties are pinned here:
+#
+#  1. FAIL CLOSED ON THE PROBE. `kubectl get crd ... --ignore-not-found -o name`
+#     separates a genuinely absent CRD (rc 0, empty -> nothing to adopt, stamp
+#     and exit) from a real apiserver error (rc != 0 -> abort under
+#     set -euo pipefail). A one-off blip read as "absent" would stamp the
+#     version and leave the whole fleet unlabelled and invisible to the new
+#     operator, permanently — the exact failure this migration exists to
+#     prevent.
+#
+#  2. LABEL ALWAYS, PIN ONLY WHERE EMPTY. Every adopted CR's patch carries the
+#     operator-group label. The engine pin is added only for a role whose image
+#     is empty: a both-empty CR (Harbor) gets both images pinned; a
+#     sentinel-only-empty CR (apps/redis, redis.image preset) gets ONLY the
+#     sentinel pinned and its preset redis.image is never overwritten; a
+#     fully-preset CR gets the label and no pin at all.
+#
+#  3. FAIL CLOSED ON THE PATCH. Migrations never re-run, so a swallowed patch
+#     error would stamp the version on a half-adopted fleet and never look back.
+#     A failed patch must abort BEFORE stamping so the Job retries.
+#
+# These drive the real migration script end-to-end against a fake kubectl
+# (hack/testdata/migration-54-redis/), mocking only the cluster boundary.
+#
+# SHELL. Production runs migration 54 under /bin/sh = busybox ash: the migrations
+# image is FROM alpine and run-migrations.sh execs `/migrations/<n>` BY PATH, so
+# the kernel honours the `#!/bin/sh` shebang. `set -euo pipefail` and its
+# errexit semantics differ from bash, and pipefail is load-bearing: the fleet
+# scan pipes `kubectl ... -o json` into jq. So run_migration() runs the script by
+# path inside the image's own pinned base rather than through a host shell — same
+# base image, same interpreter, same invocation form.
+#
+# jq. Migration 54 pipes through jq (fleet scan, per-CR image read, patch
+# construction). The raw alpine base ships without it while the built migrations
+# image installs it via `apk add`, so prep() bakes jq onto the pinned base once
+# (the only step that touches the network) and run_migration() uses that image,
+# still --network none.
+#
+# CI runs this file under Bats through `make bats-unit-tests`. It also remains
+# compatible with the legacy `hack/cozytest.sh` translator, whose awk parser
+# rewrites a bare `}` into `return 0` plus `}`. The tests avoid `run`, `$status`,
+# and setup() for that path. A helper whose status matters captures and returns
+# it before its closing brace so the injected return cannot mask it.
+#
+# Run with: bats hack/migration-54-redis-adopt.bats
+# -----------------------------------------------------------------------------
+
+load test_helper
+
+FAKEBIN="$PWD/hack/testdata/migration-54-redis"
+MIG_DIR="$PWD/packages/core/platform/images/migrations/migrations"
+
+# The production base image, read out of the migrations Dockerfile rather than
+# repeated here, so the interpreter under test cannot drift from the one the
+# migrations actually ship on when that pin is bumped.
+ALPINE=$(sed -n 's/^FROM \(alpine:[^ ]*\).*$/\1/p' \
+  "$PWD/packages/core/platform/images/migrations/Dockerfile" | head -1)
+
+# jq-enabled build of that base. The tag is derived from the pinned ref so a
+# digest bump rebuilds it instead of reusing a stale layer.
+TESTIMG="cozystack-migration54-test:$(printf '%s' "$ALPINE" | sed 's/[^a-zA-Z0-9]/-/g')"
+
+# run_migration <n> -- run migrations/<n> the way run-migrations.sh does.
+#
+# By path, not `sh <file>`: that is what makes the shebang, and therefore the
+# interpreter, part of what is under test. The fake kubectl goes on PATH inside
+# the container and $WORK is bind-mounted, so $FAKE_CMDLOG is the same file the
+# assertions read back on the host. --network none because nothing here may reach
+# a real cluster; --user keeps $WORK removable by the test afterwards.
+#
+# The explicit `return` is load-bearing: cozytest.sh's awk generator rewrites
+# every bare `}` in column 0 into `return 0` + `}`, so a helper that falls off
+# its own end returns 0 no matter what it ran, and every fail-closed assertion
+# below would pass vacuously. Capture the status and return it by hand.
+run_migration() {
+  _run_migration_rc=0
+  docker run --rm --network none \
+    --user "$(id -u):$(id -g)" \
+    -v "$MIG_DIR:/migrations:ro" \
+    -v "$FAKEBIN:/fakebin:ro" \
+    -v "$WORK:/work" \
+    -e PATH=/fakebin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin \
+    -e FAKE_CMDLOG=/work/cmdlog \
+    -e NAMESPACE="${NAMESPACE-}" \
+    -e FAKE_RFS="${FAKE_RFS-}" \
+    -e FAKE_CRD_ABSENT="${FAKE_CRD_ABSENT-}" \
+    -e FAKE_CRD_PROBE_FAIL="${FAKE_CRD_PROBE_FAIL-}" \
+    -e FAKE_LABEL_FAIL="${FAKE_LABEL_FAIL-}" \
+    "$TESTIMG" "/migrations/$1" || _run_migration_rc=$?
+  return "$_run_migration_rc"
+}
+
+# prep resets env to a clean scenario. Tests set FAKE_* afterwards.
+prep() {
+  # Fail here rather than at the first docker run, so the reason is legible.
+  docker info >/dev/null 2>&1 || {
+    echo "docker is required: these tests run migration 54 inside a jq-enabled" >&2
+    echo "build of $ALPINE (the migrations image's base), so that it exercises" >&2
+    echo "busybox ash — the interpreter run-migrations.sh actually gives it." >&2
+    return 1
+  }
+  # Bake jq onto the pinned base. Cached after the first run, so this is a no-op
+  # on every subsequent test; only the first build touches the network.
+  docker build -q -t "$TESTIMG" - >/dev/null <<DOCKERFILE
+FROM $ALPINE
+RUN apk add --no-cache jq
+DOCKERFILE
+  chmod +x "$FAKEBIN/kubectl"
+  WORK=$(mktemp -d)
+  export FAKE_CMDLOG="$WORK/cmdlog"
+  : > "$FAKE_CMDLOG"
+  export NAMESPACE=cozy-system
+  export FAKE_RFS=""
+  unset FAKE_CRD_ABSENT FAKE_CRD_PROBE_FAIL FAKE_LABEL_FAIL || true
+  return 0
+}
+
+# patch_for <ns> <name> -- the merge-patch payload the migration sent for that
+# CR (the JSON tail of its `PATCH <ns> <name> <json>` cmdlog line). Used only for
+# its stdout, so the awk-injected `return 0` is harmless.
+patch_for() {
+  grep -E "^PATCH $1 $2 " "$FAKE_CMDLOG" | head -1 | cut -d' ' -f4-
+}
+
+# --- 1. fail closed on the probe --------------------------------------------
+
+@test "absent CRD stamps 55 without patching anything" {
+  prep
+  export FAKE_CRD_ABSENT=1
+  rc=0
+  run_migration 54 >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"; cat "$FAKE_CMDLOG"
+  [ "$rc" -eq 0 ]
+  # Nothing to adopt: no patch was ever issued...
+  [ "$(grep -cE -- '^PATCH ' "$FAKE_CMDLOG")" -eq 0 ]
+  # ...but the version is stamped to 55 so the runner advances. Asserting the
+  # number, not a bare "STAMP": a wrong version would loop run-migrations.sh.
+  grep -qF -- "STAMP 55" "$FAKE_CMDLOG"
+  rm -rf "$WORK"
+}
+
+# A real apiserver error on the CRD probe is NOT "absent". The migration must
+# abort under set -euo pipefail before stamping, so the Job retries rather than
+# stamping past an un-probed, un-adopted fleet.
+@test "a failing CRD probe aborts before stamping" {
+  prep
+  export FAKE_CRD_PROBE_FAIL=1
+  rc=0
+  run_migration 54 >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"; cat "$FAKE_CMDLOG"
+  # Must propagate: a swallowed probe error would stamp past the whole fleet.
+  [ "$rc" -ne 0 ]
+  # Nothing was patched and nothing was stamped.
+  [ "$(grep -cE -- '^PATCH ' "$FAKE_CMDLOG")" -eq 0 ]
+  [ "$(grep -cF -- 'STAMP 55' "$FAKE_CMDLOG")" -eq 0 ]
+  rm -rf "$WORK"
+}
+
+# --- 2. label always, pin only where empty ----------------------------------
+
+@test "adopts every RedisFailover across namespaces: label always, engine pin only where empty" {
+  prep
+  # Three CRs in three namespaces exercising each image shape:
+  #   harbor      both images empty  (Harbor)      -> pin BOTH
+  #   my-redis    redis preset, sentinel empty     -> pin ONLY sentinel
+  #   full-redis  both images preset               -> label only, no pin
+  export FAKE_RFS="tenant-harbor harbor - -
+tenant-redis my-redis redis:8.4.0 -
+tenant-full full-redis redis:7.0.0 redis:7.2.0"
+  rc=0
+  run_migration 54 >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"; cat "$FAKE_CMDLOG"
+  [ "$rc" -eq 0 ]
+
+  # Exactly the three CRs were patched, no more.
+  [ "$(grep -cE '^PATCH ' "$FAKE_CMDLOG")" -eq 3 ]
+  # Every patch carries the operator-group label (adoption is unconditional).
+  # Scope the count to PATCH lines: the fake also logs a raw KUBECTL line per
+  # call, so the label string appears twice per patch across the whole cmdlog.
+  [ "$(grep -E '^PATCH ' "$FAKE_CMDLOG" | grep -cF -- '"redis-failover.freshworks.com/operator-group":"cozystack"')" -eq 3 ]
+
+  # Harbor: both images empty -> both pinned to redis:6.2.6-alpine, plus label.
+  ph=$(patch_for tenant-harbor harbor)
+  echo "$ph" | grep -qF -- '"redis-failover.freshworks.com/operator-group":"cozystack"'
+  echo "$ph" | grep -qF -- '"redis":{"image":"redis:6.2.6-alpine"}'
+  echo "$ph" | grep -qF -- '"sentinel":{"image":"redis:6.2.6-alpine"}'
+
+  # apps/redis: redis.image preset, sentinel empty -> ONLY sentinel pinned. The
+  # preset redis.image is neither overwritten nor even mentioned (a merge patch
+  # only carries what changes), so there is no redis node in the payload at all.
+  pr=$(patch_for tenant-redis my-redis)
+  echo "$pr" | grep -qF -- '"redis-failover.freshworks.com/operator-group":"cozystack"'
+  echo "$pr" | grep -qF -- '"sentinel":{"image":"redis:6.2.6-alpine"}'
+  [ "$(printf '%s' "$pr" | grep -cF -- '"redis":')" -eq 0 ]
+  [ "$(printf '%s' "$pr" | grep -cF -- 'redis:8.4.0')" -eq 0 ]
+
+  # Fully-preset: label only. Neither image is empty, so no engine pin and no
+  # spec node at all.
+  pf=$(patch_for tenant-full full-redis)
+  echo "$pf" | grep -qF -- '"redis-failover.freshworks.com/operator-group":"cozystack"'
+  [ "$(printf '%s' "$pf" | grep -cF -- 'redis:6.2.6-alpine')" -eq 0 ]
+  [ "$(printf '%s' "$pf" | grep -cF -- '"spec":')" -eq 0 ]
+
+  # Version stamped to 55 once, after adoption.
+  grep -qF -- "STAMP 55" "$FAKE_CMDLOG"
+  rm -rf "$WORK"
+}
+
+# --- 3. fail closed on the patch --------------------------------------------
+
+# The adoption patch fails. Applying the label/pin is the whole point of the
+# migration, so a failed patch must abort BEFORE stamping — recoverable on the
+# Job's next attempt, rather than a fleet stamped past adoption and left
+# invisible to the new operator forever.
+@test "a failed adoption patch aborts before stamping" {
+  prep
+  export FAKE_RFS="tenant-harbor harbor - -
+tenant-redis my-redis redis:8.4.0 -"
+  export FAKE_LABEL_FAIL=1
+  rc=0
+  run_migration 54 >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"; cat "$FAKE_CMDLOG"
+  # Must propagate: a swallowed patch error would stamp a half-adopted fleet.
+  [ "$rc" -ne 0 ]
+  # And it must not have stamped the version.
+  [ "$(grep -cF -- 'STAMP 55' "$FAKE_CMDLOG")" -eq 0 ]
+  rm -rf "$WORK"
+}
diff --git a/hack/migration-55-fluxcd-orphan.bats b/hack/migration-55-fluxcd-orphan.bats
new file mode 100644
index 0000000000..92dd8475cf
--- /dev/null
+++ b/hack/migration-55-fluxcd-orphan.bats
@@ -0,0 +1,260 @@
+#!/usr/bin/env bats
+# -----------------------------------------------------------------------------
+# Unit tests for platform migration 55 --> 56 (remove the tenant-cluster FluxCD
+# addon). PR #3379 drops packages/system/fluxcd{,-operator}, the last vendored
+# copyleft charts, which only backed the optional `addons.fluxcd` toggle of the
+# Kubernetes app. For any tenant that had it enabled, the addon's pair of
+# HelmReleases must be ORPHANED, not pruned: suspend reconciliation, drop the
+# Flux finalizer so the delete does not trigger a Helm uninstall inside the
+# tenant cluster, verify the finalizer is actually gone, and only then delete the
+# now-inert object from the management cluster. The tenant's own Flux keeps
+# running untouched.
+#
+# Two properties are pinned here:
+#
+#  1. ORDERING + SELECTION. Only the two fluxcd-addon HelmReleases (matched by
+#     .spec.chartRef.name) may be touched, and each must go through
+#     suspend -> finalizer-drop -> delete IN THAT ORDER. Deleting before the
+#     finalizer is gone would set a deletionTimestamp that makes helm-controller
+#     run the very uninstall this migration exists to avoid; touching an
+#     unrelated HelmRelease would orphan a release the migration has no business
+#     touching.
+#
+#  2. FAIL CLOSED. Removing the finalizer is the ONLY thing that keeps the delete
+#     inert. Migrations never re-run, so a swallowed error here would stamp the
+#     version on a half-orphaned fleet and never look back. If the finalizer
+#     survives the patch (webhook, RBAC, conflict, transient apiserver error) the
+#     migration must abort BEFORE deleting and BEFORE stamping — recoverable on
+#     the Job's next attempt, rather than a Helm uninstall that is not.
+#
+# These drive the real migration script end-to-end against a fake kubectl
+# (hack/testdata/migration-55-fluxcd/), mocking only the cluster boundary.
+#
+# SHELL. Production runs migration 55 under /bin/sh = busybox ash: the migrations
+# image is FROM alpine and run-migrations.sh execs `/migrations/<n>` BY PATH, so
+# the kernel honours the `#!/bin/sh` shebang. `set -euo pipefail` and its
+# errexit-in-function semantics differ from bash, and pipefail is load-bearing:
+# the fleet scan pipes `kubectl ... -o json` into jq, so without it a failed list
+# would not abort the pipeline and the loop would run against empty input. So,
+# exactly as hack/migration-seaweedfs-db-adopt.bats does, run_migration() runs the
+# script by path inside the image's own pinned base rather than through a host
+# shell — same base image, same interpreter, same invocation form.
+#
+# jq. Migration 55, unlike the seaweedfs migrations, pipes through jq. The raw
+# alpine base ships without it while the built migrations image installs it via
+# `apk add`, so prep() bakes jq onto the pinned base once (the only step that
+# touches the network) and run_migration() uses that image, still --network none.
+# Same base, same busybox ash, plus the one tool the script actually requires;
+# the selection logic under test is jq's own, run for real.
+#
+# CI runs this file under Bats through `make bats-unit-tests`. It also remains
+# compatible with the legacy `hack/cozytest.sh` translator, whose awk parser
+# rewrites a bare `}` into `return 0` plus `}`. The tests avoid `run`, `$status`,
+# and setup() for that path. A helper whose status matters captures and returns
+# it before its closing brace so the injected return cannot mask it.
+#
+# Run with: bats hack/migration-55-fluxcd-orphan.bats
+# -----------------------------------------------------------------------------
+
+load test_helper
+
+FAKEBIN="$PWD/hack/testdata/migration-55-fluxcd"
+MIG_DIR="$PWD/packages/core/platform/images/migrations/migrations"
+
+# The production base image, read out of the migrations Dockerfile rather than
+# repeated here, so the interpreter under test cannot drift from the one the
+# migrations actually ship on when that pin is bumped.
+ALPINE=$(sed -n 's/^FROM \(alpine:[^ ]*\).*$/\1/p' \
+  "$PWD/packages/core/platform/images/migrations/Dockerfile" | head -1)
+
+# jq-enabled build of that base. The tag is derived from the pinned ref so a
+# digest bump rebuilds it instead of reusing a stale layer.
+TESTIMG="cozystack-migration55-test:$(printf '%s' "$ALPINE" | sed 's/[^a-zA-Z0-9]/-/g')"
+
+# run_migration <n> -- run migrations/<n> the way run-migrations.sh does.
+#
+# By path, not `sh <file>`: that is what makes the shebang, and therefore the
+# interpreter, part of what is under test. The fake kubectl goes on PATH inside
+# the container and $WORK is bind-mounted, so $FAKE_CMDLOG is the same file the
+# assertions read back on the host. --network none because nothing here may reach
+# a real cluster; --user keeps $WORK removable by the test afterwards.
+#
+# The explicit `return` is load-bearing: cozytest.sh's awk generator rewrites
+# every bare `}` in column 0 into `return 0` + `}`, so a helper that falls off
+# its own end returns 0 no matter what it ran, and every fail-closed assertion
+# below would pass vacuously. Capture the status and return it by hand.
+run_migration() {
+  _run_migration_rc=0
+  docker run --rm --network none \
+    --user "$(id -u):$(id -g)" \
+    -v "$MIG_DIR:/migrations:ro" \
+    -v "$FAKEBIN:/fakebin:ro" \
+    -v "$WORK:/work" \
+    -e PATH=/fakebin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin \
+    -e FAKE_CMDLOG=/work/cmdlog \
+    -e NAMESPACE="${NAMESPACE-}" \
+    -e FAKE_HRS="${FAKE_HRS-}" \
+    -e FAKE_LIST_FAIL="${FAKE_LIST_FAIL-}" \
+    -e FAKE_PATCH_FAIL="${FAKE_PATCH_FAIL-}" \
+    -e FAKE_DELETE_FAIL="${FAKE_DELETE_FAIL-}" \
+    -e FAKE_FINALIZER_STICKS="${FAKE_FINALIZER_STICKS-}" \
+    -e FAKE_VERIFY_READ_FAIL="${FAKE_VERIFY_READ_FAIL-}" \
+    "$TESTIMG" "/migrations/$1" || _run_migration_rc=$?
+  return "$_run_migration_rc"
+}
+
+# prep resets env to a clean scenario. Tests set FAKE_* afterwards.
+prep() {
+  # Fail here rather than at the first docker run, so the reason is legible.
+  docker info >/dev/null 2>&1 || {
+    echo "docker is required: these tests run migration 55 inside a jq-enabled" >&2
+    echo "build of $ALPINE (the migrations image's base), so that it exercises" >&2
+    echo "busybox ash — the interpreter run-migrations.sh actually gives it." >&2
+    return 1
+  }
+  # Bake jq onto the pinned base. Cached after the first run, so this is a no-op
+  # on every subsequent test; only the first build touches the network.
+  docker build -q -t "$TESTIMG" - >/dev/null <<DOCKERFILE
+FROM $ALPINE
+RUN apk add --no-cache jq
+DOCKERFILE
+  chmod +x "$FAKEBIN/kubectl"
+  WORK=$(mktemp -d)
+  export FAKE_CMDLOG="$WORK/cmdlog"
+  : > "$FAKE_CMDLOG"
+  export NAMESPACE=cozy-system
+  export FAKE_HRS=""
+  unset FAKE_LIST_FAIL FAKE_PATCH_FAIL FAKE_DELETE_FAIL FAKE_FINALIZER_STICKS FAKE_VERIFY_READ_FAIL || true
+  return 0
+}
+
+# cmdlog_line <ere> -- 1-based line number of the first cmdlog line matching the
+# anchored extended regex, or empty if none. Used only for its stdout, so the
+# awk-injected `return 0` is harmless.
+cmdlog_line() {
+  grep -nE -- "$1" "$FAKE_CMDLOG" | head -1 | cut -d: -f1
+}
+
+# assert_order <ns> <name> -- the HelmRelease was suspended, then
+# finalizer-patched, then deleted, in that cmdlog order. Anchored with `$` so
+# `...-fluxcd` does not also match `...-fluxcd-operator`.
+assert_order() {
+  _s=$(cmdlog_line "^SUSPEND $1 $2$")
+  _f=$(cmdlog_line "^FINALIZER-PATCH $1 $2$")
+  _d=$(cmdlog_line "^DELETE $1 $2$")
+  [ -n "$_s" ] && [ -n "$_f" ] && [ -n "$_d" ] || { echo "missing step for $1/$2: suspend=$_s finalizer=$_f delete=$_d" >&2; return 1; }
+  [ "$_s" -lt "$_f" ] && [ "$_f" -lt "$_d" ] || { echo "out-of-order for $1/$2: suspend=$_s finalizer=$_f delete=$_d" >&2; return 1; }
+  return 0
+}
+
+# --- 1. ordering + selection ------------------------------------------------
+
+@test "orphans both addon HelmReleases in each namespace, in order, and ignores unrelated releases" {
+  prep
+  # Two tenants each carry the fluxcd + fluxcd-operator addon HelmReleases, plus
+  # one unrelated release (the base kubernetes app) that must be left alone.
+  export FAKE_HRS="tenant-a kubevirt-kubernetes-fluxcd cozystack-kubernetes-application-kubevirt-kubernetes-fluxcd
+tenant-a kubevirt-kubernetes-fluxcd-operator cozystack-kubernetes-application-kubevirt-kubernetes-fluxcd-operator
+tenant-b kubevirt-kubernetes-fluxcd cozystack-kubernetes-application-kubevirt-kubernetes-fluxcd
+tenant-b kubevirt-kubernetes-fluxcd-operator cozystack-kubernetes-application-kubevirt-kubernetes-fluxcd-operator
+tenant-a some-other-app cozystack-kubernetes-application-kubevirt-kubernetes"
+  rc=0
+  run_migration 55 >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"; cat "$FAKE_CMDLOG"
+  [ "$rc" -eq 0 ]
+
+  # Every matching HelmRelease went suspend -> finalizer-drop -> delete, in order.
+  assert_order tenant-a kubevirt-kubernetes-fluxcd
+  assert_order tenant-a kubevirt-kubernetes-fluxcd-operator
+  assert_order tenant-b kubevirt-kubernetes-fluxcd
+  assert_order tenant-b kubevirt-kubernetes-fluxcd-operator
+
+  # Exactly the four matching releases were acted on — no more.
+  [ "$(grep -cE '^SUSPEND ' "$FAKE_CMDLOG")" -eq 4 ]
+  [ "$(grep -cE '^FINALIZER-PATCH ' "$FAKE_CMDLOG")" -eq 4 ]
+  [ "$(grep -cE '^DELETE ' "$FAKE_CMDLOG")" -eq 4 ]
+
+  # The unrelated release never appears in any acted-on command.
+  if grep -q 'some-other-app' "$FAKE_CMDLOG"; then echo "unexpected some-other-app in cmdlog" >&2; return 1; fi
+
+  # Version stamped to 56 — asserting the number, not a bare "STAMP": a wrong
+  # version would loop run-migrations.sh forever.
+  grep -qF -- "STAMP 56" "$FAKE_CMDLOG"
+  rm -rf "$WORK"
+}
+
+# --- 2. fail closed ---------------------------------------------------------
+
+# The finalizer survives the patch. The migration must refuse to delete and must
+# not stamp: the Job retries rather than uninstalling the tenant's live Flux.
+@test "a finalizer surviving the patch aborts before delete and before stamping" {
+  prep
+  export FAKE_HRS="tenant-a kubevirt-kubernetes-fluxcd cozystack-kubernetes-application-kubevirt-kubernetes-fluxcd
+tenant-b kubevirt-kubernetes-fluxcd cozystack-kubernetes-application-kubevirt-kubernetes-fluxcd"
+  export FAKE_FINALIZER_STICKS=1
+  rc=0
+  run_migration 55 >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"; cat "$FAKE_CMDLOG"
+
+  # Must propagate: a swallowed error would stamp past a half-orphaned fleet.
+  [ "$rc" -ne 0 ]
+  # It got as far as suspend + finalizer-drop on the first release before the
+  # verify caught the still-present finalizer...
+  grep -qE -- "^SUSPEND tenant-a kubevirt-kubernetes-fluxcd$" "$FAKE_CMDLOG"
+  grep -qE -- "^FINALIZER-PATCH tenant-a kubevirt-kubernetes-fluxcd$" "$FAKE_CMDLOG"
+  grep -qF -- "refusing to delete" "$WORK/out"
+  # ...and it deleted nothing and stamped nothing.
+  if grep -qE -- "^DELETE " "$FAKE_CMDLOG"; then echo "unexpected DELETE after stuck finalizer" >&2; return 1; fi
+  if grep -qF -- "STAMP 56" "$FAKE_CMDLOG"; then echo "unexpected STAMP 56 after stuck finalizer" >&2; return 1; fi
+  rm -rf "$WORK"
+}
+
+# The verify READ that gates the delete errors out (RBAC, conflict, a transient
+# apiserver hiccup). The verify read uses `--ignore-not-found` rather than
+# `2>/dev/null || true`, so a failed read aborts under set -e instead of being
+# swallowed to an empty string that reads as "finalizer gone" — a failed read is
+# NOT proof the object is safe to delete. The suspend and finalizer patches
+# before it succeed; the migration must still refuse to delete and must not
+# stamp. Without FAKE_VERIFY_READ_FAIL this path is the one the fail-open bug hid
+# in.
+@test "a failing finalizer verify read aborts before delete and before stamping" {
+  prep
+  export FAKE_HRS="tenant-a kubevirt-kubernetes-fluxcd cozystack-kubernetes-application-kubevirt-kubernetes-fluxcd
+tenant-b kubevirt-kubernetes-fluxcd cozystack-kubernetes-application-kubevirt-kubernetes-fluxcd"
+  export FAKE_VERIFY_READ_FAIL="Error from server (Forbidden): helmreleases.helm.toolkit.fluxcd.io \"kubevirt-kubernetes-fluxcd\" is forbidden"
+  rc=0
+  run_migration 55 >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"; cat "$FAKE_CMDLOG"
+
+  # Must propagate: a swallowed read error would pass the gate on an object whose
+  # finalizer state was never actually read, then delete and stamp past it.
+  [ "$rc" -ne 0 ]
+  # It got as far as suspend + finalizer-drop on the first release before the
+  # verify read failed...
+  grep -qE -- "^SUSPEND tenant-a kubevirt-kubernetes-fluxcd$" "$FAKE_CMDLOG"
+  grep -qE -- "^FINALIZER-PATCH tenant-a kubevirt-kubernetes-fluxcd$" "$FAKE_CMDLOG"
+  # ...and it deleted nothing and stamped nothing.
+  if grep -qE -- "^DELETE " "$FAKE_CMDLOG"; then echo "unexpected DELETE after failed verify read" >&2; return 1; fi
+  if grep -qF -- "STAMP 56" "$FAKE_CMDLOG"; then echo "unexpected STAMP 56 after failed verify read" >&2; return 1; fi
+  rm -rf "$WORK"
+}
+
+# The fleet scan itself fails. Under `set -euo pipefail` the failing
+# `kubectl ... | jq` aborts the `hrs=$(...)` assignment instead of yielding an
+# empty list the loop would silently skip — the pipefail the header calls
+# load-bearing. Nothing is touched and, crucially, the version is not stamped
+# past a fleet that was never actually inspected.
+@test "a failing fleet scan aborts before stamping" {
+  prep
+  export FAKE_HRS="tenant-a kubevirt-kubernetes-fluxcd cozystack-kubernetes-application-kubevirt-kubernetes-fluxcd"
+  export FAKE_LIST_FAIL="Error from server (Timeout): the server was unable to return a response in the time allotted"
+  rc=0
+  run_migration 55 >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"; cat "$FAKE_CMDLOG"
+  # Must propagate: the Job retries rather than advancing the version.
+  [ "$rc" -ne 0 ]
+  if grep -q 'STAMP' "$FAKE_CMDLOG"; then echo "unexpected STAMP after failed fleet scan" >&2; return 1; fi
+  # The scan failed before the loop, so not even the first release was touched.
+  if grep -qE -- "^SUSPEND " "$FAKE_CMDLOG"; then echo "unexpected SUSPEND after failed fleet scan" >&2; return 1; fi
+  rm -rf "$WORK"
+}
diff --git a/hack/migration-56-adopt-path.bats b/hack/migration-56-adopt-path.bats
new file mode 100644
index 0000000000..1869266f15
--- /dev/null
+++ b/hack/migration-56-adopt-path.bats
@@ -0,0 +1,489 @@
+#!/usr/bin/env bats
+# -----------------------------------------------------------------------------
+# Unit tests for the ADOPTION path of platform migration 56.
+#
+# migration-56-adopt-values.bats pins the jq value-mapping; this file pins the
+# adopt_one branch that mutates ownership of running worker objects (annotate
+# helm.sh/resource-policy=keep + meta.helm.sh/release-name). The fake kubectl
+# serves worker objects via FAKE_OBJS ("<res> <name> <release-name>" lines) and
+# KubevirtMachineTemplate names via FAKE_KMT_NAMES, so the annotate, idempotency
+# and refusal branches and the 6-hex KMT anchor are exercised directly rather
+# than short-circuited on "absent". FAKE_GET_FAIL injects transient server
+# errors and FAKE_WARN_STDERR injects success-path stderr warnings, pinning the
+# read contract: absence (--ignore-not-found success + empty output) is
+# skipped, ANY read failure aborts the run before the version stamp, and
+# stderr never contaminates data.
+#
+# For compatibility with the legacy cozytest.sh translator, tests avoid
+# run/$status and file-local setup/teardown, and keep bare `}` lines out of test
+# bodies. Assertions are direct shell tests.
+# Run with: bats hack/migration-56-adopt-path.bats
+# -----------------------------------------------------------------------------
+
+load test_helper
+
+FAKEBIN="$PWD/hack/testdata/migration-56"
+MIG="$PWD/packages/core/platform/images/migrations/migrations/56"
+
+prep() {
+  chmod +x "$FAKEBIN/kubectl"
+  WORK=$(mktemp -d)
+  export FAKE_HR_LIST="$WORK/hrlist.json"
+  export FAKE_CHILD_HR="$WORK/child-hr.json"
+  export FAKE_CMDLOG="$WORK/cmdlog"
+  export FAKE_OBJS="$WORK/objs"
+  : > "$FAKE_CMDLOG"
+  export PATH="$FAKEBIN:$PATH"
+  export NAMESPACE=cozy-system
+  cat > "$FAKE_HR_LIST" <<'JSON'
+{"items":[{"metadata":{"namespace":"tenant-test","name":"kubernetes-test3"},"spec":{"values":{"nodeGroups":{"md0":{"minReplicas":1,"roles":["ingress-nginx"]}}}}}]}
+JSON
+}
+
+@test "adopt_one pins keep + child release-name on parent-owned worker objects, anchoring the KMT match" {
+  prep
+  # Worker objects currently owned by the parent release, plus a sibling pool's
+  # KMT (md0-large) the 6-hex anchor must NOT adopt while processing md0.
+  cat > "$FAKE_OBJS" <<'OBJS'
+machinedeployment.cluster.x-k8s.io kubernetes-test3-md0 kubernetes-test3
+machinehealthcheck.cluster.x-k8s.io kubernetes-test3-md0 kubernetes-test3
+workloadmonitor.cozystack.io kubernetes-test3-md0 kubernetes-test3
+kubevirtmachinetemplate.infrastructure.cluster.x-k8s.io kubernetes-test3-md0-abc123 kubernetes-test3
+kubevirtmachinetemplate.infrastructure.cluster.x-k8s.io kubernetes-test3-md0-large-def456 kubernetes-test3
+OBJS
+  FAKE_KMT_NAMES=$(printf '%s\n%s' kubernetes-test3-md0-abc123 kubernetes-test3-md0-large-def456)
+  export FAKE_KMT_NAMES
+  rc=0
+  bash "$MIG" >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"
+  [ "$rc" -eq 0 ]
+  # MD/MHC/WM adopted onto the child release with keep.
+  grep -qE 'annotate machinedeployment.* kubernetes-test3-md0 .*resource-policy=keep' "$FAKE_CMDLOG"
+  grep -qE 'annotate machinedeployment.* meta.helm.sh/release-name=kubernetes-nodes-test3-md0' "$FAKE_CMDLOG"
+  grep -qE 'annotate machinehealthcheck.* kubernetes-test3-md0 ' "$FAKE_CMDLOG"
+  grep -qE 'annotate workloadmonitor.* kubernetes-test3-md0 ' "$FAKE_CMDLOG"
+  # The pool's own KMT (6-hex suffix) is adopted...
+  grep -qE 'annotate kubevirtmachinetemplate.* kubernetes-test3-md0-abc123 ' "$FAKE_CMDLOG"
+  # ...but the sibling pool md0-large's KMT is NOT (anchor stops the mis-adopt).
+  if grep -qE 'kubernetes-test3-md0-large-def456' "$FAKE_CMDLOG"; then echo "FAIL: the sibling pool's KubevirtMachineTemplate must not be adopted"; false; fi
+  rm -rf "$WORK"
+}
+
+@test "adopt_one is idempotent: objects already on the child release are skipped" {
+  prep
+  cat > "$FAKE_OBJS" <<'OBJS'
+machinedeployment.cluster.x-k8s.io kubernetes-test3-md0 kubernetes-nodes-test3-md0
+machinehealthcheck.cluster.x-k8s.io kubernetes-test3-md0 kubernetes-nodes-test3-md0
+workloadmonitor.cozystack.io kubernetes-test3-md0 kubernetes-nodes-test3-md0
+OBJS
+  rc=0
+  bash "$MIG" >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"
+  [ "$rc" -eq 0 ]
+  # Already adopted -> no annotate issued at all.
+  if grep -qE 'annotate ' "$FAKE_CMDLOG"; then echo "FAIL: an already-adopted pool must not be annotated again"; false; fi
+  rm -rf "$WORK"
+}
+
+@test "adopt_one pins keep but does not adopt an object owned by an unexpected release (no prune, no deadlock)" {
+  prep
+  # A worker object whose meta.helm.sh/release-name was hand-edited to a third
+  # release (reachable via `kubectl annotate` on the tenant namespace) must NOT
+  # abort the whole pre-upgrade hook: exiting 1 under set -e would deadlock the
+  # platform upgrade for EVERY tenant on one tenant's corrupted annotation, the
+  # same fleet-wide deadlock the non-object / overflow / invalid-name branches
+  # were reshaped to avoid. But it must still be PINNED: the object is in the
+  # parent's old pre-split manifest, so the control-plane-only re-render prunes
+  # it unless resource-policy=keep is set -- Helm's prune gates on that
+  # annotation, not on the live release-name. Refuse to adopt THIS object
+  # (rewriting a foreign release-name could corrupt it), pin keep, warn, and let
+  # the run complete and stamp. The sibling parent-owned objects still adopt.
+  cat > "$FAKE_OBJS" <<'OBJS'
+machinedeployment.cluster.x-k8s.io kubernetes-test3-md0 some-other-release
+machinehealthcheck.cluster.x-k8s.io kubernetes-test3-md0 kubernetes-test3
+workloadmonitor.cozystack.io kubernetes-test3-md0 kubernetes-test3
+OBJS
+  rc=0
+  bash "$MIG" >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"
+  [ "$rc" -eq 0 ]
+  grep -qiE 'owned by unexpected release' "$WORK/out"
+  # The foreign-owned MD is pinned with keep so the parent cannot prune it...
+  grep -qE 'annotate machinedeployment.* kubernetes-test3-md0 .*resource-policy=keep' "$FAKE_CMDLOG"
+  # ...but it is never re-annotated onto the child release (ownership untouched).
+  if grep -qE 'annotate machinedeployment.* meta.helm.sh/release-name=kubernetes-nodes-test3-md0' "$FAKE_CMDLOG"; then echo "FAIL: a foreign-owned MachineDeployment must not be re-annotated onto the child release"; false; fi
+  # The sibling parent-owned MHC still adopts, and the run stamps.
+  grep -qE 'annotate machinehealthcheck.* meta.helm.sh/release-name=kubernetes-nodes-test3-md0' "$FAKE_CMDLOG"
+  grep -qF -- "STAMP" "$FAKE_CMDLOG"
+  # The foreign-owned object is a pinned-but-unadopted case too, so it must land
+  # in the durable unadopted record (not only the reaped Job log): the child HR
+  # can stay Failed on it and an operator needs to find it after the fact.
+  grep -qF -- "APPLY-UNADOPTED-CM" "$FAKE_CMDLOG"
+  grep -qiE 'pinned prune-proof but NOT adopted' "$WORK/out"
+  rm -rf "$WORK"
+}
+
+@test "an RFC-1123-invalid nodeGroup key is pinned and skipped, not applied (no upgrade deadlock)" {
+  prep
+  # The old nodeGroups map key was never schema-constrained, so a parent HR can
+  # carry a key like 'My_Pool' that yields the RFC-1123-invalid child HR name
+  # kubernetes-nodes-test3-My_Pool. Without the guard the create path reaches
+  # `kubectl apply`, the fake apiserver rejects the name, and the migration exits
+  # 1 -- deadlocking every tenant's platform pre-upgrade hook. The guard must
+  # warn, pin the (absent) pool objects as a no-op, skip adoption, and continue.
+  cat > "$FAKE_HR_LIST" <<'JSON'
+{"items":[{"metadata":{"namespace":"tenant-test","name":"kubernetes-test3"},"spec":{"values":{"nodeGroups":{"My_Pool":{"minReplicas":1,"roles":["ingress-nginx"]}}}}}]}
+JSON
+  rc=0
+  bash "$MIG" >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"
+  # Guard caught it: the run succeeds instead of deadlocking.
+  [ "$rc" -eq 0 ]
+  grep -qiE 'not a valid RFC-1123 label' "$WORK/out"
+  # The invalid child HelmRelease is never applied.
+  if grep -q 'APPLY-HR' "$FAKE_CMDLOG"; then echo "FAIL: no child HelmRelease must be applied for an invalid pool name"; false; fi
+  rm -rf "$WORK"
+}
+
+@test "a non-object nodeGroup value is pinned and skipped, not crashed on (no upgrade deadlock)" {
+  prep
+  # kubectl edit on the parent HR bypasses the aggregated API's schema, so a group
+  # value can be stored as a non-object (here a string). The value-mapping jq then
+  # runs `"oops" | has(...)`, which aborts with exit 5 under set -e and deadlocks the
+  # platform pre-upgrade hook for every tenant. The normalize-to-null guard must warn,
+  # pin the (absent) pool objects, skip adoption, and let the run complete.
+  cat > "$FAKE_HR_LIST" <<'JSON'
+{"items":[{"metadata":{"namespace":"tenant-test","name":"kubernetes-test3"},"spec":{"values":{"nodeGroups":{"md0":"oops"}}}}]}
+JSON
+  rc=0
+  bash "$MIG" >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"
+  [ "$rc" -eq 0 ]
+  grep -qiE 'non-object value' "$WORK/out"
+  if grep -q 'APPLY-HR' "$FAKE_CMDLOG"; then echo "FAIL: no child HelmRelease must be applied for a non-object value"; false; fi
+  rm -rf "$WORK"
+}
+
+@test "a non-object nodeGroups map is skipped per-cluster, not crashed on (no upgrade deadlock)" {
+  prep
+  # nodeGroups itself stored as a non-object (here an array). keys[] on an array
+  # yields indices, then .[$idx] fails with "Cannot index array with string", exiting
+  # 1 under set -e and deadlocking every tenant's pre-upgrade hook. The shape guard
+  # must warn and skip this cluster's pool adoption, letting the run complete.
+  cat > "$FAKE_HR_LIST" <<'JSON'
+{"items":[{"metadata":{"namespace":"tenant-test","name":"kubernetes-test3"},"spec":{"values":{"nodeGroups":["md0"]}}}]}
+JSON
+  rc=0
+  bash "$MIG" >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"
+  [ "$rc" -eq 0 ]
+  grep -qiE 'not an object' "$WORK/out"
+  if grep -q 'APPLY-HR' "$FAKE_CMDLOG"; then echo "FAIL: no child HelmRelease must be applied for a non-object nodeGroups"; false; fi
+  rm -rf "$WORK"
+}
+
+@test "a non-object nodeGroups map still pins the cluster's live worker pools before skipping (no prune)" {
+  prep
+  # nodeGroups mangled out-of-band to a non-object (array), but the cluster still
+  # has live worker objects from its last good render. The declared pool keys are
+  # unreadable, so the migration discovers the live pools from their KMTs and pins
+  # every worker object with resource-policy=keep -- otherwise the parent's
+  # control-plane-only re-render prunes the un-pinned VMs. No child HR is created
+  # (adoption is skipped), but the run completes and stamps. Two pools (md0, md1)
+  # prove discovery is not limited to the implicit md0.
+  cat > "$FAKE_HR_LIST" <<'JSON'
+{"items":[{"metadata":{"namespace":"tenant-test","name":"kubernetes-test3"},"spec":{"values":{"nodeGroups":["md0"]}}}]}
+JSON
+  cat > "$FAKE_OBJS" <<'OBJS'
+machinedeployment.cluster.x-k8s.io kubernetes-test3-md0 kubernetes-test3
+machinehealthcheck.cluster.x-k8s.io kubernetes-test3-md0 kubernetes-test3
+workloadmonitor.cozystack.io kubernetes-test3-md0 kubernetes-test3
+kubevirtmachinetemplate.infrastructure.cluster.x-k8s.io kubernetes-test3-md0-abc123 kubernetes-test3
+machinedeployment.cluster.x-k8s.io kubernetes-test3-md1 kubernetes-test3
+kubevirtmachinetemplate.infrastructure.cluster.x-k8s.io kubernetes-test3-md1-def456 kubernetes-test3
+OBJS
+  FAKE_KMT_NAMES=$(printf '%s\n%s' kubernetes-test3-md0-abc123 kubernetes-test3-md1-def456)
+  export FAKE_KMT_NAMES
+  rc=0
+  bash "$MIG" >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"
+  [ "$rc" -eq 0 ]
+  grep -qiE 'not an object' "$WORK/out"
+  # Both discovered pools pinned with keep, no ownership transfer (no release-name).
+  grep -qE 'annotate machinedeployment.* kubernetes-test3-md0 .*resource-policy=keep' "$FAKE_CMDLOG"
+  grep -qE 'annotate kubevirtmachinetemplate.* kubernetes-test3-md0-abc123 .*resource-policy=keep' "$FAKE_CMDLOG"
+  grep -qE 'annotate machinedeployment.* kubernetes-test3-md1 .*resource-policy=keep' "$FAKE_CMDLOG"
+  grep -qE 'annotate kubevirtmachinetemplate.* kubernetes-test3-md1-def456 .*resource-policy=keep' "$FAKE_CMDLOG"
+  if grep -qE 'meta.helm.sh/release-name' "$FAKE_CMDLOG"; then echo "FAIL: no ownership must be transferred"; false; fi
+  # Adoption skipped, run completes.
+  if grep -q 'APPLY-HR' "$FAKE_CMDLOG"; then echo "FAIL: no child HelmRelease must be applied"; false; fi
+  grep -qF -- "STAMP" "$FAKE_CMDLOG"
+  rm -rf "$WORK"
+}
+
+@test "a non-scalar value for a scalar nodeGroup field pins the live pool objects before skipping (no prune)" {
+  prep
+  # The group key and its map value are both well-formed, but a scalar field
+  # (here storageClass) is stored as an object -- reachable via kubectl edit,
+  # since the NodeGroup subfields were never fully schema-constrained. Copied
+  # verbatim into the child HR it would fail the KubernetesNodes schema and
+  # leave the child release stuck Failed, with the MD already re-annotated onto
+  # it. The bad-scalar guard must instead warn, pin the live pool objects with
+  # resource-policy=keep (so the parent's control-plane-only re-render cannot
+  # prune the running VMs), skip adoption (no child HR), and let the run stamp.
+  cat > "$FAKE_HR_LIST" <<'JSON'
+{"items":[{"metadata":{"namespace":"tenant-test","name":"kubernetes-test3"},"spec":{"values":{"nodeGroups":{"md0":{"minReplicas":1,"storageClass":{"name":"replicated"},"roles":["ingress-nginx"]}}}}}]}
+JSON
+  cat > "$FAKE_OBJS" <<'OBJS'
+machinedeployment.cluster.x-k8s.io kubernetes-test3-md0 kubernetes-test3
+machinehealthcheck.cluster.x-k8s.io kubernetes-test3-md0 kubernetes-test3
+workloadmonitor.cozystack.io kubernetes-test3-md0 kubernetes-test3
+kubevirtmachinetemplate.infrastructure.cluster.x-k8s.io kubernetes-test3-md0-abc123 kubernetes-test3
+OBJS
+  FAKE_KMT_NAMES=$(printf '%s' kubernetes-test3-md0-abc123)
+  export FAKE_KMT_NAMES
+  rc=0
+  bash "$MIG" >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"
+  [ "$rc" -eq 0 ]
+  grep -qiE 'non-scalar value' "$WORK/out"
+  # Live pool objects pinned with keep, no ownership transfer (no release-name).
+  grep -qE 'annotate machinedeployment.* kubernetes-test3-md0 .*resource-policy=keep' "$FAKE_CMDLOG"
+  grep -qE 'annotate machinehealthcheck.* kubernetes-test3-md0 .*resource-policy=keep' "$FAKE_CMDLOG"
+  grep -qE 'annotate workloadmonitor.* kubernetes-test3-md0 .*resource-policy=keep' "$FAKE_CMDLOG"
+  grep -qE 'annotate kubevirtmachinetemplate.* kubernetes-test3-md0-abc123 .*resource-policy=keep' "$FAKE_CMDLOG"
+  if grep -qE 'meta.helm.sh/release-name' "$FAKE_CMDLOG"; then echo "FAIL: no ownership must be transferred"; false; fi
+  # Adoption skipped, run completes and stamps.
+  if grep -q 'APPLY-HR' "$FAKE_CMDLOG"; then echo "FAIL: no child HelmRelease must be applied"; false; fi
+  grep -qF -- "STAMP" "$FAKE_CMDLOG"
+  rm -rf "$WORK"
+}
+
+@test "a child release name over 53 chars pins the live pool objects and skips, not deadlock on kubectl apply (no upgrade deadlock)" {
+  prep
+  # rest.go caps a cluster name at 42 chars, and the kubernetes-nodes- prefix
+  # (17 chars) plus a pool name can push the child HelmRelease name past Helm's
+  # 53-char limit. Here cluster 'production-eu-central-analytics01' (33) + pool
+  # 'md0' yields child name 'kubernetes-nodes-production-eu-central-analytics01-md0'
+  # (54 chars). Without the length guard the flow reaches `kubectl apply` of a
+  # >53-char HelmRelease name, the apiserver rejects it, and under set -e the
+  # run exits 1 before stamping -- deadlocking every tenant's platform upgrade.
+  # The overflow branch must instead warn, pin the live pool objects prune-proof,
+  # skip adoption (no child HR), and let the run complete and stamp.
+  cat > "$FAKE_HR_LIST" <<'JSON'
+{"items":[{"metadata":{"namespace":"tenant-test","name":"kubernetes-production-eu-central-analytics01"},"spec":{"values":{"nodeGroups":{"md0":{"minReplicas":1,"roles":["ingress-nginx"]}}}}}]}
+JSON
+  cat > "$FAKE_OBJS" <<'OBJS'
+machinedeployment.cluster.x-k8s.io kubernetes-production-eu-central-analytics01-md0 kubernetes-production-eu-central-analytics01
+machinehealthcheck.cluster.x-k8s.io kubernetes-production-eu-central-analytics01-md0 kubernetes-production-eu-central-analytics01
+workloadmonitor.cozystack.io kubernetes-production-eu-central-analytics01-md0 kubernetes-production-eu-central-analytics01
+kubevirtmachinetemplate.infrastructure.cluster.x-k8s.io kubernetes-production-eu-central-analytics01-md0-abc123 kubernetes-production-eu-central-analytics01
+OBJS
+  FAKE_KMT_NAMES=$(printf '%s' kubernetes-production-eu-central-analytics01-md0-abc123)
+  export FAKE_KMT_NAMES
+  rc=0
+  bash "$MIG" >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"
+  [ "$rc" -eq 0 ]
+  grep -qiE "exceeds Helm's 53-char limit" "$WORK/out"
+  # Live pool objects pinned with keep, no ownership transfer (no release-name).
+  grep -qE 'annotate machinedeployment.* kubernetes-production-eu-central-analytics01-md0 .*resource-policy=keep' "$FAKE_CMDLOG"
+  grep -qE 'annotate machinehealthcheck.* kubernetes-production-eu-central-analytics01-md0 .*resource-policy=keep' "$FAKE_CMDLOG"
+  grep -qE 'annotate workloadmonitor.* kubernetes-production-eu-central-analytics01-md0 .*resource-policy=keep' "$FAKE_CMDLOG"
+  grep -qE 'annotate kubevirtmachinetemplate.* kubernetes-production-eu-central-analytics01-md0-abc123 .*resource-policy=keep' "$FAKE_CMDLOG"
+  if grep -qE 'meta.helm.sh/release-name' "$FAKE_CMDLOG"; then echo "FAIL: no ownership must be transferred"; false; fi
+  # Adoption skipped (no child HR applied), run completes and stamps.
+  if grep -q 'APPLY-HR' "$FAKE_CMDLOG"; then echo "FAIL: no child HelmRelease must be applied"; false; fi
+  grep -qF -- "STAMP" "$FAKE_CMDLOG"
+  rm -rf "$WORK"
+}
+
+@test "an absent worker object is skipped and the run still completes and stamps" {
+  prep
+  # No FAKE_OBJS: every named get is absent -- under --ignore-not-found that is
+  # SUCCESS with empty output, the way real kubectl behaves. adopt_one must
+  # classify that as absent (skip) -- this pins the absent path so the
+  # fail-closed tests below prove classification, not blanket failure.
+  rc=0
+  bash "$MIG" >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"
+  [ "$rc" -eq 0 ]
+  grep -q 'absent in tenant-test, skipping' "$WORK/out"
+  grep -qF -- "STAMP" "$FAKE_CMDLOG"
+  rm -rf "$WORK"
+}
+
+@test "a transient error reading a worker object fails the run closed, before the version stamp" {
+  prep
+  # kubectl exits 1 for NotFound and for a transient server failure alike. If a
+  # timeout were classified as "absent", adoption would be skipped WITHOUT the
+  # keep pin, the migration would complete and stamp 57 (never re-running), and
+  # the parent's control-plane-only upgrade would prune the live pool's
+  # MachineDeployment -- deleting every running worker VM. The migration must
+  # instead exit non-zero with no stamp, so run-migrations.sh retries it.
+  export FAKE_GET_FAIL="machinedeployment"
+  rc=0
+  bash "$MIG" >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"
+  [ "$rc" -ne 0 ]
+  grep -q 'ERROR: reading machinedeployment' "$WORK/out"
+  if grep -qF -- "STAMP" "$FAKE_CMDLOG"; then echo "FAIL: the version must not be stamped after a read error"; false; fi
+  unset FAKE_GET_FAIL
+  rm -rf "$WORK"
+}
+
+@test "a transient error listing KubevirtMachineTemplates fails the run closed, before the version stamp" {
+  prep
+  # A failed KMT listing must not read as "no templates": zero KMTs would be
+  # adopted, the migration would stamp, and the parent upgrade would prune a
+  # preserved older-revision KMT still referenced by an in-flight MachineSet --
+  # permanently, since the child chart only re-emits KMTs already annotated with
+  # its own release name. MD/MHC/WM are present and adoptable so the run
+  # provably fails at the listing, not earlier.
+  cat > "$FAKE_OBJS" <<'OBJS'
+machinedeployment.cluster.x-k8s.io kubernetes-test3-md0 kubernetes-test3
+machinehealthcheck.cluster.x-k8s.io kubernetes-test3-md0 kubernetes-test3
+workloadmonitor.cozystack.io kubernetes-test3-md0 kubernetes-test3
+OBJS
+  export FAKE_GET_FAIL="kubevirtmachinetemplate"
+  rc=0
+  bash "$MIG" >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"
+  [ "$rc" -ne 0 ]
+  grep -q 'ERROR: listing KubevirtMachineTemplates' "$WORK/out"
+  if grep -qF -- "STAMP" "$FAKE_CMDLOG"; then echo "FAIL: the version must not be stamped after a listing error"; false; fi
+  unset FAKE_GET_FAIL
+  rm -rf "$WORK"
+}
+
+@test "a transient error on the pin path (unadoptable pool) fails the run closed, before the version stamp" {
+  prep
+  # pin_keep guards pools that cannot be adopted (invalid/overflowing name); a
+  # transient read error masked as "absent" there would leave the pool un-pinned
+  # for the parent's prune with no child release to notice. Same contract as
+  # adopt_one: read failures abort the run. The key is dotted -- label-invalid,
+  # so the pin path fires, yet a valid object name, so objects can exist and
+  # the pin path genuinely reads; a key that cannot name an object at all is
+  # skipped before any read (covered by the slash test above).
+  cat > "$FAKE_HR_LIST" <<'JSON'
+{"items":[{"metadata":{"namespace":"tenant-test","name":"kubernetes-test3"},"spec":{"values":{"nodeGroups":{"a.b":{"minReplicas":1}}}}}]}
+JSON
+  export FAKE_GET_FAIL="machinedeployment"
+  rc=0
+  bash "$MIG" >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"
+  [ "$rc" -ne 0 ]
+  grep -q 'ERROR: reading machinedeployment' "$WORK/out"
+  if grep -qF -- "STAMP" "$FAKE_CMDLOG"; then echo "FAIL: the version must not be stamped after a read error"; false; fi
+  unset FAKE_GET_FAIL
+  rm -rf "$WORK"
+}
+
+@test "a nodeGroup key containing a slash is skipped without a read, not deadlocked on kubectl's client-side rejection" {
+  prep
+  # A composed object name with a '/' is rejected by real kubectl client-side,
+  # deterministically, before any API call -- so if the pin path issued a read
+  # for it, the fail-closed classification would abort the run on every retry,
+  # deadlocking the upgrade over a pool that provably cannot exist (the old
+  # chart's apply of such a name would have been rejected by the apiserver).
+  # The pin path must skip such names statically: nothing to pin, no read made.
+  cat > "$FAKE_HR_LIST" <<'JSON'
+{"items":[{"metadata":{"namespace":"tenant-test","name":"kubernetes-test3"},"spec":{"values":{"nodeGroups":{"pool/a":{"minReplicas":1}}}}}]}
+JSON
+  rc=0
+  bash "$MIG" >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"
+  [ "$rc" -eq 0 ]
+  grep -qiE 'not a valid RFC-1123 label' "$WORK/out"
+  grep -qi 'nothing to pin' "$WORK/out"
+  if grep -q 'APPLY-HR' "$FAKE_CMDLOG"; then echo "FAIL: no child HelmRelease must be applied"; false; fi
+  grep -qF -- "STAMP" "$FAKE_CMDLOG"
+  rm -rf "$WORK"
+}
+
+@test "a kubectl warning on stderr does not contaminate the owner read or break adoption" {
+  prep
+  # kubectl writes warnings to stderr on SUCCESSFUL reads: apiserver deprecation
+  # headers (deterministic, printed on every get of a deprecated GVK -- CAPI
+  # v1beta1 qualifies) and client-side throttling notices. If the owner read
+  # captured stderr into its data (2>&1), the warning would glue onto the
+  # annotation value, the foreign-owner guard would see an unexpected "owner",
+  # refuse, and exit 1 -- permanently deadlocking the pre-upgrade hook for every
+  # tenant on a warning that never goes away. Adoption must proceed normally.
+  cat > "$FAKE_OBJS" <<'OBJS'
+machinedeployment.cluster.x-k8s.io kubernetes-test3-md0 kubernetes-test3
+machinehealthcheck.cluster.x-k8s.io kubernetes-test3-md0 kubernetes-test3
+workloadmonitor.cozystack.io kubernetes-test3-md0 kubernetes-test3
+OBJS
+  export FAKE_WARN_STDERR=1
+  rc=0
+  bash "$MIG" >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"
+  [ "$rc" -eq 0 ]
+  grep -qE 'annotate machinedeployment.* meta.helm.sh/release-name=kubernetes-nodes-test3-md0' "$FAKE_CMDLOG"
+  if grep -qi 'refusing' "$WORK/out"; then echo "FAIL: a warning on stderr must not make the owner guard refuse"; false; fi
+  grep -qF -- "STAMP" "$FAKE_CMDLOG"
+  unset FAKE_WARN_STDERR
+  rm -rf "$WORK"
+}
+
+@test "a transient error whose message contains 'not found' still fails the run closed" {
+  prep
+  # A conversion-webhook outage mid-upgrade fails a read with e.g.
+  # 'conversion webhook ... failed: service "capi-webhook-service" not found'.
+  # That is a transient failure, not absence: classifying it as absent would
+  # skip the keep pin, stamp 57, and let the parent upgrade prune the live
+  # pool. Only real absence (--ignore-not-found success + empty output) may be
+  # skipped; every read failure aborts, whatever its message says.
+  export FAKE_GET_FAIL="machinedeployment"
+  export FAKE_GET_FAIL_MSG='Error from server: conversion webhook for cluster.x-k8s.io/v1beta1, Kind=MachineDeployment failed: service "capi-webhook-service" not found'
+  rc=0
+  bash "$MIG" >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"
+  [ "$rc" -ne 0 ]
+  if grep -qF -- "STAMP" "$FAKE_CMDLOG"; then echo "FAIL: the version must not be stamped after a transient read failure"; false; fi
+  unset FAKE_GET_FAIL FAKE_GET_FAIL_MSG
+  rm -rf "$WORK"
+}
+
+@test "a whitespace nodeGroup key reaches the RFC-1123 guard intact, not word-split into bogus pools" {
+  prep
+  # The old nodeGroups map key was never schema-constrained. An unquoted
+  # `for group in $(... keys[])` word-splits a key like 'my pool' into 'my' and
+  # 'pool' BEFORE the RFC-1123 guard, each fragment individually valid, fabricating
+  # two garbage child HelmReleases for a pool that never existed. Newline-safe
+  # iteration keeps the key intact so the guard rejects the space and pins + skips.
+  cat > "$FAKE_HR_LIST" <<'JSON'
+{"items":[{"metadata":{"namespace":"tenant-test","name":"kubernetes-test3"},"spec":{"values":{"nodeGroups":{"my pool":{"minReplicas":1}}}}}]}
+JSON
+  rc=0
+  bash "$MIG" >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"
+  [ "$rc" -eq 0 ]
+  grep -qiE 'not a valid RFC-1123 label' "$WORK/out"
+  # Neither 'my' nor 'pool' is ever applied as a child release.
+  if grep -q 'APPLY-HR' "$FAKE_CMDLOG"; then echo "FAIL: no child HelmRelease must be applied"; false; fi
+  rm -rf "$WORK"
+}
+
+@test "a non-scalar scalar-field on a nodeGroup is pinned and skipped, not applied to a child that cannot validate" {
+  prep
+  # kubectl edit on the parent HR bypasses the aggregated API schema, so a field
+  # the child HR expects to be scalar (here storageClass) can be stored as an
+  # object. Copied verbatim into the child values it fails the KubernetesNodes
+  # schema on install, leaving the child release stuck Failed. The scalar-type
+  # guard must warn, pin the pool's (absent here) objects, skip adoption, and
+  # let the run complete and stamp instead of fabricating an unvalidatable child.
+  cat > "$FAKE_HR_LIST" <<'JSON'
+{"items":[{"metadata":{"namespace":"tenant-test","name":"kubernetes-test3"},"spec":{"values":{"nodeGroups":{"md0":{"minReplicas":1,"storageClass":{"nested":"oops"}}}}}}]}
+JSON
+  rc=0
+  bash "$MIG" >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"
+  [ "$rc" -eq 0 ]
+  grep -qiE 'non-scalar value' "$WORK/out"
+  grep -q 'storageClass' "$WORK/out"
+  # The pool is pinned+skipped, never applied as a child release.
+  if grep -q 'APPLY-HR' "$FAKE_CMDLOG"; then echo "FAIL: the pinned-and-skipped pool must not be applied as a child release"; false; fi
+  rm -rf "$WORK"
+}
diff --git a/hack/migration-56-adopt-values.bats b/hack/migration-56-adopt-values.bats
new file mode 100644
index 0000000000..21fd3960d7
--- /dev/null
+++ b/hack/migration-56-adopt-values.bats
@@ -0,0 +1,312 @@
+#!/usr/bin/env bats
+# -----------------------------------------------------------------------------
+# Unit tests for platform migration 56 (adopt pre-split worker pools into
+# per-pool kubernetes-nodes HelmReleases).
+#
+# These pin the value-mapping contract that guarantees "byte-identical child
+# re-render, zero worker-VM churn". The migration builds the child HelmRelease's
+# spec.values from the parent kubernetes HR values with a jq helper:
+#
+#     def pick($o; ks): reduce ks[] as $k ({}; if ($o | has($k)) ...);
+#     ... + pick(.; ["version","talos"])   # images is narrowed to {kubectl} separately
+#
+# A subtle regression is to write `def pick(o; ks)` with a filter-parameter:
+# inside `reduce ks[] as $k ({}; ...)` the `.` context is the accumulator, so
+# `o | has($k)` tests the accumulator (not the source object) and pick(.; ...)
+# returns {} for EVERY input. The child HR is then created WITHOUT the tenant's
+# talos/version, Helm renders the chart defaults, talos.version changes, the
+# content-hashed KubevirtMachineTemplate is renamed, and the MachineDeployment
+# rolls every live worker VM on upgrade — the exact churn this migration exists
+# to prevent. Static review missed it; only e2e on a real cluster caught it.
+#
+# The @test below drives the REAL migration script against a fake kubectl and
+# asserts the captured child HelmRelease carries the tenant's non-default
+# talos/version/images (plus the group fields and storageClass fallback). It
+# fails against the buggy `pick(o; ...)` and passes against `pick($o; ...)`.
+#
+# CI runs this file under Bats through `make bats-unit-tests`. It also remains
+# compatible with the legacy `hack/cozytest.sh` translator, whose awk parser
+# recognizes only @test blocks and a bare `}` on its own line. The tests avoid
+# `run`, `$status`, setup(), and teardown() for that compatibility path.
+#
+# Run with: bats hack/migration-56-adopt-values.bats
+# -----------------------------------------------------------------------------
+
+load test_helper
+
+FAKEBIN="$PWD/hack/testdata/migration-56"
+MIG="$PWD/packages/core/platform/images/migrations/migrations/56"
+
+# prep resets PATH/env to a clean scenario: one tenant Kubernetes HR (test3)
+# with a single pool md0 and NON-default talos/version/images so the assertions
+# distinguish "copied the tenant value" from "fell back to the chart default".
+prep() {
+  chmod +x "$FAKEBIN/kubectl"
+  WORK=$(mktemp -d)
+  export FAKE_HR_LIST="$WORK/hrlist.json"
+  export FAKE_CHILD_HR="$WORK/child-hr.json"
+  export FAKE_CMDLOG="$WORK/cmdlog"
+  : > "$FAKE_CMDLOG"
+  export PATH="$FAKEBIN:$PATH"
+  export NAMESPACE=cozy-system
+  cat > "$FAKE_HR_LIST" <<'JSON'
+{"items":[
+  {"metadata":{"namespace":"tenant-test","name":"kubernetes-test3"},
+   "spec":{"values":{
+     "nodeGroups":{"md0":{"minReplicas":1,"maxReplicas":3,"roles":["ingress-nginx"],"logSerialConsole":true}},
+     "talos":{"version":"v1.13.0","schematicID":"deadbeef","imageFactoryURL":"https://factory.talos.dev","installerRepository":"factory.talos.dev/installer"},
+     "version":"v1.32",
+     "storageClass":"replicated",
+     "images":{"kubectl":"example.io/kubectl:v1.32","waitForKubeconfig":"drop-me","talosCsrSigner":"drop-me"}}}}
+]}
+JSON
+}
+
+@test "child HR carries the tenant's talos/version/images (not chart defaults) so the KMT hash is preserved" {
+  prep
+  rc=0
+  bash "$MIG" >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"
+  [ "$rc" -eq 0 ]
+
+  # The create path ran and captured a child HelmRelease.
+  grep -qF -- "APPLY-HR" "$FAKE_CMDLOG"
+  [ -s "$FAKE_CHILD_HR" ]
+
+  # Shape sanity: it is the pool's child HR.
+  [ "$(jq -r '.kind' "$FAKE_CHILD_HR")" = "HelmRelease" ]
+  [ "$(jq -r '.metadata.name' "$FAKE_CHILD_HR")" = "kubernetes-nodes-test3-md0" ]
+  [ "$(jq -r '.spec.values.cluster' "$FAKE_CHILD_HR")" = "test3" ]
+
+  # THE REGRESSION: cluster-level inputs the worker templates consume must be
+  # copied from the tenant, NOT dropped (which would let the chart default win).
+  [ "$(jq -r '.spec.values.talos.version' "$FAKE_CHILD_HR")" = "v1.13.0" ]
+  [ "$(jq -r '.spec.values.talos.schematicID' "$FAKE_CHILD_HR")" = "deadbeef" ]
+  [ "$(jq -r '.spec.values.version' "$FAKE_CHILD_HR")" = "v1.32" ]
+  [ "$(jq -r '.spec.values.images.kubectl' "$FAKE_CHILD_HR")" = "example.io/kubectl:v1.32" ]
+  # images is narrowed to the declared kubectl key only — the parent's
+  # waitForKubeconfig/talosCsrSigner (undeclared in the KubernetesNodes schema)
+  # must NOT leak into the adopted pool values.
+  [ "$(jq -r '.spec.values.images | keys | join(",")' "$FAKE_CHILD_HR")" = "kubectl" ]
+
+  # Group fields and the storageClass cluster-level fallback carry through.
+  [ "$(jq -r '.spec.values.minReplicas' "$FAKE_CHILD_HR")" = "1" ]
+  [ "$(jq -r '.spec.values.roles[0]' "$FAKE_CHILD_HR")" = "ingress-nginx" ]
+  # logSerialConsole feeds the content-hashed KMT (nodegroup.yaml define), so
+  # dropping it on adoption would rename the KMT and roll every worker VM of the
+  # pool (and silently disable the setting); it must carry through.
+  [ "$(jq -r '.spec.values.logSerialConsole' "$FAKE_CHILD_HR")" = "true" ]
+  [ "$(jq -r '.spec.values.storageClass' "$FAKE_CHILD_HR")" = "replicated" ]
+  rm -rf "$WORK"
+}
+
+@test "positive control: a clean run reaches the version stamp" {
+  prep
+  rc=0
+  bash "$MIG" >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"
+  [ "$rc" -eq 0 ]
+  # The stamp ran (so "values present" above is a real signal, not a no-op run).
+  grep -qF -- "STAMP" "$FAKE_CMDLOG"
+  rm -rf "$WORK"
+}
+
+@test "implicit md0: an empty nodeGroups materialises the default ingress-nginx pool" {
+  prep
+  # A parent cluster whose spec.values carries no nodeGroups relied on the chart's
+  # implicit md0 default. Migration 56 must materialise DEFAULT_MD0 and create the
+  # child HR kubernetes-nodes-<cluster>-md0 with minReplicas 0 and the
+  # ingress-nginx role, so a cluster that never set nodeGroups keeps its pool.
+  cat > "$FAKE_HR_LIST" <<'JSON'
+{"items":[{"metadata":{"namespace":"tenant-test","name":"kubernetes-test3"},"spec":{"values":{}}}]}
+JSON
+  rc=0
+  bash "$MIG" >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"
+  [ "$rc" -eq 0 ]
+  grep -qF -- "materialising implicit md0 default" "$WORK/out"
+  grep -qF -- "APPLY-HR" "$FAKE_CMDLOG"
+  [ "$(jq -r '.metadata.name' "$FAKE_CHILD_HR")" = "kubernetes-nodes-test3-md0" ]
+  [ "$(jq -r '.spec.values.minReplicas' "$FAKE_CHILD_HR")" = "0" ]
+  [ "$(jq -r '.spec.values.roles[0]' "$FAKE_CHILD_HR")" = "ingress-nginx" ]
+  # DEFAULT_MD0 is the sole source of the implicit pool's shape, and the fields
+  # below feed the content-hashed KubevirtMachineTemplate (kubernetes-nodes
+  # nodegroup.yaml). An edit to any of them re-hashes the KMT and silently rolls
+  # every implicit-md0 pool in the fleet on the next upgrade; no other assertion
+  # here catches it (name/minReplicas/role do not enter the hash). Pin the
+  # pre-split md0 values so such an edit reds this case instead of shipping.
+  [ "$(jq -r '.spec.values.instanceType' "$FAKE_CHILD_HR")" = "u1.medium" ]
+  [ "$(jq -r '.spec.values.diskSize' "$FAKE_CHILD_HR")" = "20Gi" ]
+  [ "$(jq -c '.spec.values.resources' "$FAKE_CHILD_HR")" = "{}" ]
+  [ "$(jq -c '.spec.values.gpus' "$FAKE_CHILD_HR")" = "[]" ]
+  [ "$(jq -c '.spec.values.kubelet' "$FAKE_CHILD_HR")" = "{}" ]
+  # storageClass "" in DEFAULT_MD0 falls through to the (absent here) cluster-
+  # level value, so the child carries no storageClass key — the pre-split md0
+  # shape, where md0 rendered with the chart's empty-string default.
+  [ "$(jq -r '.spec.values.storageClass // "ABSENT"' "$FAKE_CHILD_HR")" = "ABSENT" ]
+  rm -rf "$WORK"
+}
+
+@test "adoption carries podCpuLimit/podCpuRequest and the cluster-wide MHC timeouts so a tuned pool is neither rolled nor reset" {
+  prep
+  # A pre-split parent that tuned worker sizing and MachineHealthCheck timeouts.
+  # podCpuLimit/podCpuRequest feed the content-hashed KubevirtMachineTemplate, so
+  # dropping them on adoption renames the KMT and rolls every worker VM of the
+  # pool. readyUnknownTimeout / readyFalseTimeout / maxNodeProvisionTime feed the
+  # pool's MachineHealthCheck and the autoscaler annotation, so dropping them
+  # silently resets the tuning to the chart default. All must survive the
+  # parent -> child value mapping (these fields arrived with the main merge that
+  # made the pool chart configurable; the pick list has to keep pace with it).
+  cat > "$FAKE_HR_LIST" <<'JSON'
+{"items":[{"metadata":{"namespace":"tenant-test","name":"kubernetes-test3"},"spec":{"values":{
+  "nodeGroups":{"md0":{"minReplicas":1,"maxReplicas":3,"resources":{"cpu":"4","memory":"8Gi"},"podCpuLimit":"3","podCpuRequest":"2"}},
+  "nodeHealthCheck":{"maxUnhealthy":"30%","nodeStartupTimeout":"25m","readyUnknownTimeout":"90s","readyFalseTimeout":"7m"},
+  "maxNodeProvisionTime":"45m",
+  "talos":{"version":"v1.13.0","schematicID":"deadbeef","imageFactoryURL":"https://factory.talos.dev","installerRepository":"factory.talos.dev/installer"},
+  "version":"v1.32"}}}]}
+JSON
+  rc=0
+  bash "$MIG" >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"
+  [ "$rc" -eq 0 ]
+  grep -qF -- "APPLY-HR" "$FAKE_CMDLOG"
+  [ "$(jq -r '.metadata.name' "$FAKE_CHILD_HR")" = "kubernetes-nodes-test3-md0" ]
+
+  # KMT-hash inputs: carried verbatim from the group, or the pool rolls on adoption.
+  [ "$(jq -r '.spec.values.podCpuLimit' "$FAKE_CHILD_HR")" = "3" ]
+  [ "$(jq -r '.spec.values.podCpuRequest' "$FAKE_CHILD_HR")" = "2" ]
+
+  # cluster-wide MHC / autoscaler tuning: flattened onto the pool, not reset.
+  [ "$(jq -r '.spec.values.maxUnhealthy' "$FAKE_CHILD_HR")" = "30%" ]
+  [ "$(jq -r '.spec.values.nodeStartupTimeout' "$FAKE_CHILD_HR")" = "25m" ]
+  [ "$(jq -r '.spec.values.readyUnknownTimeout' "$FAKE_CHILD_HR")" = "90s" ]
+  [ "$(jq -r '.spec.values.readyFalseTimeout' "$FAKE_CHILD_HR")" = "7m" ]
+  [ "$(jq -r '.spec.values.maxNodeProvisionTime' "$FAKE_CHILD_HR")" = "45m" ]
+  rm -rf "$WORK"
+}
+
+@test "an unlabelled parent HR (kubernetes chartRef, no application.kind label) is restamped before the sweep" {
+  prep
+  # A parent kubernetes HelmRelease predating the apps.cozystack.io/application.kind
+  # label (fdca49838, ~v1.2), or one restored/created by hand, is identified by its
+  # chartRef rather than the label. The migration must relabel it BEFORE the
+  # label-selected sweep, otherwise the sweep skips it, stamps, and the parent's
+  # control-plane-only re-render prunes its un-pinned workers. Fixture carries the
+  # parent chartRef and NO application labels; assert all three labels are written.
+  cat > "$FAKE_HR_LIST" <<'JSON'
+{"items":[{"metadata":{"namespace":"tenant-legacy","name":"kubernetes-old"},"spec":{"chartRef":{"name":"cozystack-kubernetes-application-kubevirt-kubernetes"},"values":{"nodeGroups":{"md0":{"minReplicas":0,"roles":["ingress-nginx"]}}}}}]}
+JSON
+  rc=0
+  bash "$MIG" >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"
+  [ "$rc" -eq 0 ]
+  grep -qF -- "restamping application labels on unlabelled parent tenant-legacy/kubernetes-old" "$WORK/out"
+  grep -qE 'label helmrelease kubernetes-old .*apps.cozystack.io/application.kind=Kubernetes' "$FAKE_CMDLOG"
+  grep -qE 'label helmrelease kubernetes-old .*apps.cozystack.io/application.group=apps.cozystack.io' "$FAKE_CMDLOG"
+  grep -qE 'label helmrelease kubernetes-old .*apps.cozystack.io/application.name=old' "$FAKE_CMDLOG"
+  rm -rf "$WORK"
+}
+
+@test "a labelled parent HR (chartRef + application.kind label) is NOT restamped (no redundant label write)" {
+  prep
+  # A parent that carries BOTH the kubernetes chartRef AND the application.kind
+  # label is already correctly labelled: the restamp's label-absence guard
+  # (select .kind != "Kubernetes") must exclude it so it is not re-labelled on
+  # every upgrade. A fixture WITHOUT the chartRef would be dropped by the chartRef
+  # filter regardless and leave this guard untested, so seed the chartRef too and
+  # exercise exactly the label guard. Assert no `label helmrelease` is issued
+  # (the sweep's own `label machinedeployment ... managed-by` does not match).
+  cat > "$FAKE_HR_LIST" <<'JSON'
+{"items":[{"metadata":{"namespace":"tenant-test","name":"kubernetes-test3","labels":{"apps.cozystack.io/application.kind":"Kubernetes"}},"spec":{"chartRef":{"name":"cozystack-kubernetes-application-kubevirt-kubernetes"},"values":{"nodeGroups":{"md0":{"minReplicas":1,"roles":["ingress-nginx"]}}}}}]}
+JSON
+  rc=0
+  bash "$MIG" >"$WORK/out" 2>&1 || rc=$?
+  [ "$rc" -eq 0 ]
+  if grep -qE 'label helmrelease' "$FAKE_CMDLOG"; then echo "FAIL: no HelmRelease must be labelled"; false; fi
+  rm -rf "$WORK"
+}
+
+@test "pinned-but-unadopted pools are published to the unadopted ConfigMap before the stamp" {
+  prep
+  # A pool the migration pins prune-proof but cannot adopt (here: child release
+  # name over 53 chars) must leave a durable record — the Job-log warnings are
+  # reaped by the next upgrade's before-hook-creation policy and migration 56 does
+  # not re-run. Assert the unadopted ConfigMap is applied AND the run still stamps.
+  cat > "$FAKE_HR_LIST" <<'JSON'
+{"items":[{"metadata":{"namespace":"tenant-test","name":"kubernetes-verylongclustername-thirty"},"spec":{"values":{"nodeGroups":{"poolnamethatislong":{"minReplicas":0,"roles":["ingress-nginx"]}}}}}]}
+JSON
+  rc=0
+  bash "$MIG" >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"
+  [ "$rc" -eq 0 ]
+  grep -qF -- "pinned prune-proof but NOT adopted" "$WORK/out"
+  grep -qF -- "APPLY-UNADOPTED-CM" "$FAKE_CMDLOG"
+  grep -qF -- "STAMP" "$FAKE_CMDLOG"
+  rm -rf "$WORK"
+}
+
+@test "a clean run writes NO unadopted ConfigMap (empty skip record)" {
+  prep
+  # The default fixture adopts cleanly (no skip branch), so no unadopted ConfigMap
+  # must be applied — only the version STAMP.
+  rc=0
+  bash "$MIG" >"$WORK/out" 2>&1 || rc=$?
+  [ "$rc" -eq 0 ]
+  if grep -qF -- "APPLY-UNADOPTED-CM" "$FAKE_CMDLOG"; then echo "FAIL: no unadopted ConfigMap must be applied"; false; fi
+  grep -qF -- "STAMP" "$FAKE_CMDLOG"
+  rm -rf "$WORK"
+}
+
+@test "a failed unadopted-ConfigMap publish does NOT abort the migration (best-effort record)" {
+  prep
+  # The record is a convenience artifact, not a safety mechanism: every skipped
+  # pool was already pinned prune-proof earlier in the sweep. A permanent publish
+  # failure (e.g. exceeding etcd's object-size limit) must NOT fail the migration
+  # closed and deadlock the fleet upgrade — it must warn and still stamp.
+  export FAKE_UNADOPTED_CM_FAIL=1
+  cat > "$FAKE_HR_LIST" <<'JSON'
+{"items":[{"metadata":{"namespace":"tenant-test","name":"kubernetes-verylongclustername-thirty"},"spec":{"values":{"nodeGroups":{"poolnamethatislong":{"minReplicas":0,"roles":["ingress-nginx"]}}}}}]}
+JSON
+  rc=0
+  bash "$MIG" >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"
+  [ "$rc" -eq 0 ]
+  grep -qF -- "could not publish the unadopted-pools record" "$WORK/out"
+  grep -qF -- "STAMP" "$FAKE_CMDLOG"
+  unset FAKE_UNADOPTED_CM_FAIL
+  rm -rf "$WORK"
+}
+
+@test "an unlabelled parent HR on the OLD inline spec.chart shape is restamped too" {
+  prep
+  # The application.kind label predates spec.chartRef, so the real unlabelled
+  # population is the pre-chartRef inline shape: spec.chart.spec.chart="kubernetes"
+  # from the cozystack-apps HelmRepository, no chartRef, no label. Matching only
+  # chartRef would miss every one of these and let their workers be pruned. Assert
+  # the restamp discovers the inline shape and writes the labels.
+  cat > "$FAKE_HR_LIST" <<'JSON'
+{"items":[{"metadata":{"namespace":"tenant-legacy","name":"kubernetes-old"},"spec":{"chart":{"spec":{"chart":"kubernetes","sourceRef":{"kind":"HelmRepository","name":"cozystack-apps"}}},"values":{"nodeGroups":{"md0":{"minReplicas":0,"roles":["ingress-nginx"]}}}}}]}
+JSON
+  rc=0
+  bash "$MIG" >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"
+  [ "$rc" -eq 0 ]
+  grep -qF -- "restamping application labels on unlabelled parent tenant-legacy/kubernetes-old" "$WORK/out"
+  grep -qE 'label helmrelease kubernetes-old .*apps.cozystack.io/application.kind=Kubernetes' "$FAKE_CMDLOG"
+  grep -qE 'label helmrelease kubernetes-old .*apps.cozystack.io/application.name=old' "$FAKE_CMDLOG"
+  rm -rf "$WORK"
+}
+
+@test "a non-kubernetes app on the inline shape is NOT restamped (chart-name exact match)" {
+  prep
+  # A different app on the old inline shape (chart != "kubernetes") must not be
+  # mislabelled as a Kubernetes application by the restamp.
+  cat > "$FAKE_HR_LIST" <<'JSON'
+{"items":[{"metadata":{"namespace":"tenant-legacy","name":"kubernetes-decoy"},"spec":{"chart":{"spec":{"chart":"postgres","sourceRef":{"kind":"HelmRepository","name":"cozystack-apps"}}},"values":{}}}]}
+JSON
+  rc=0
+  bash "$MIG" >"$WORK/out" 2>&1 || rc=$?
+  [ "$rc" -eq 0 ]
+  if grep -qE 'label helmrelease kubernetes-decoy' "$FAKE_CMDLOG"; then echo "FAIL: the decoy HelmRelease must not be labelled"; false; fi
+  rm -rf "$WORK"
+}
diff --git a/hack/migration-57-seaweedfs-size-limit.bats b/hack/migration-57-seaweedfs-size-limit.bats
new file mode 100644
index 0000000000..d2922def72
--- /dev/null
+++ b/hack/migration-57-seaweedfs-size-limit.bats
@@ -0,0 +1,390 @@
+#!/usr/bin/env bats
+# -----------------------------------------------------------------------------
+# Unit tests for platform migration 57 --> 58 (keep every existing SeaweedFS
+# instance at a master volume size limit of 1000 unless it already names one or
+# its master is not an object, before the app chart that defaults it to 400
+# reaches it).
+#
+# Five properties are pinned here:
+#
+#  1. THE RIGHT INSTANCES. The fleet list uses the selector cozystack-api finds
+#     SeaweedFS with, across all namespaces. The fake kubectl refuses any other
+#     list instead of answering it with nothing, because an empty fleet is a
+#     legitimate answer: a mistyped selector would otherwise stay green and
+#     leave every production instance unpinned.
+#
+#  2. ONLY WHERE NOT CHOSEN, AND EXACTLY THIS PATCH. A release with no
+#     spec.values (the tenant module's shape), one whose values lack master,
+#     one whose master lacks the key, and one holding a null, a string, a zero,
+#     a fraction or a number past 30000 are each patched, in their own
+#     namespace, with exactly
+#     {"spec":{"values":{"master":{"volumeSizeLimitMB":1000}}}}. The previous
+#     chart ignored every one of those and the new schema refuses the last
+#     four. A release naming a whole number from 1 to 30000 is left alone,
+#     edges included, and named in the Job log, since the value now takes
+#     effect, unless the number is 1000, which changes nothing and is what a
+#     retried Job finds on the releases it already pinned. A spec.values that
+#     is not an object is patched too, since helm-controller ignores it and the
+#     instance runs on the chart's defaults. A master that is not an object is
+#     not patched, and a valuesFrom beyond the cozystack-values Secret does not
+#     stop the patch. Each of the three is named in the Job log with what it
+#     holds, and the releases after it are still reached.
+#
+#  3. FAIL CLOSED ON THE LIST. A failed list aborts before the version stamp, so
+#     the platform upgrade stops before any instance can reach the new chart.
+#
+#  4. FAIL CLOSED ON THE PATCH. Migrations never re-run, so a swallowed patch
+#     error would stamp past an instance that then drops to 400.
+#
+#  5. THE RUNBOOK AGREES. The two steps of
+#     docs/operations/seaweedfs-lowering-the-volume-size-limit.md that restate
+#     this selection, the listing every variant runs before upgrading and the
+#     pinning the default variant runs instead of this migration, found by the
+#     HTML comment above each, pick the same releases on the same fleet, and
+#     the pinning step stops at a failed patch before its closing line.
+#
+# These drive the real migration script end-to-end against a fake kubectl
+# (hack/testdata/migration-57-seaweedfs-size-limit/), mocking only the cluster
+# boundary.
+#
+# SHELL. Production runs the migration under /bin/sh = busybox ash, by path, so
+# run_migration() runs it by path inside the migrations image's own pinned base
+# with jq added, --network none. See hack/migration-54-redis-adopt.bats for the
+# full reasoning; it applies unchanged.
+#
+# cozytest.sh's awk parser recognizes only @test blocks and a bare `}` on its own
+# line, rewriting the latter into `return 0` + `}`. A helper whose exit status
+# matters must capture it and `return` it by hand before its closing brace.
+#
+# Run with: hack/cozytest.sh hack/migration-57-seaweedfs-size-limit.bats
+# -----------------------------------------------------------------------------
+
+load test_helper
+
+FAKEBIN="$PWD/hack/testdata/migration-57-seaweedfs-size-limit"
+MIG_DIR="$PWD/packages/core/platform/images/migrations/migrations"
+RUNBOOK="$PWD/docs/operations/seaweedfs-lowering-the-volume-size-limit.md"
+SELECTOR='apps.cozystack.io/application.kind=SeaweedFS,apps.cozystack.io/application.group=apps.cozystack.io'
+PIN='{"spec":{"values":{"master":{"volumeSizeLimitMB":1000}}}}'
+
+ALPINE=$(sed -n 's/^FROM \(alpine:[^ ]*\).*$/\1/p' \
+  "$PWD/packages/core/platform/images/migrations/Dockerfile" | head -1)
+
+TESTIMG="cozystack-migration57-test:$(printf '%s' "$ALPINE" | sed 's/[^a-zA-Z0-9]/-/g')"
+
+# run_in_image <command...> -- run a command in the test image against the fake
+# kubectl, with $WORK mounted at /work.
+run_in_image() {
+  _run_in_image_rc=0
+  docker run --rm --network none \
+    --user "$(id -u):$(id -g)" \
+    -v "$MIG_DIR:/migrations:ro" \
+    -v "$FAKEBIN:/fakebin:ro" \
+    -v "$WORK:/work" \
+    -e PATH=/fakebin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin \
+    -e FAKE_CMDLOG=/work/cmdlog \
+    -e NAMESPACE="${NAMESPACE-}" \
+    -e FAKE_HRS="${FAKE_HRS-}" \
+    -e FAKE_LIST_FAIL="${FAKE_LIST_FAIL-}" \
+    -e FAKE_PATCH_FAIL="${FAKE_PATCH_FAIL-}" \
+    -e FAKE_VALUESFROM="${FAKE_VALUESFROM-}" \
+    "$TESTIMG" "$@" || _run_in_image_rc=$?
+  return "$_run_in_image_rc"
+}
+
+run_migration() {
+  run_in_image "/migrations/$1"
+  return $?
+}
+
+# runbook_step <marker> -- copy the sh block that follows <!-- <marker> --> in
+# the runbook to $WORK/<marker>.sh, failing if there is none.
+runbook_step() {
+  awk -v m="<!-- $1 -->" '$0 == m { f = 1; next } f && /^```sh$/ { b = 1; next } b && /^```$/ { exit } b' \
+    "$RUNBOOK" > "$WORK/$1.sh"
+  grep -q 'kubectl get helmreleases' "$WORK/$1.sh"
+  return $?
+}
+
+prep() {
+  docker info >/dev/null 2>&1 || {
+    echo "docker is required: these tests run migration 57 inside a jq-enabled" >&2
+    echo "build of $ALPINE, the migrations image's base." >&2
+    return 1
+  }
+  docker build -q -t "$TESTIMG" - >/dev/null <<DOCKERFILE
+FROM $ALPINE
+RUN apk add --no-cache jq
+DOCKERFILE
+  chmod +x "$FAKEBIN/kubectl"
+  WORK=$(mktemp -d)
+  export FAKE_CMDLOG="$WORK/cmdlog"
+  : > "$FAKE_CMDLOG"
+  export NAMESPACE=cozy-system
+  export FAKE_HRS=""
+  unset FAKE_LIST_FAIL FAKE_PATCH_FAIL FAKE_VALUESFROM || true
+  return 0
+}
+
+# patch_for <ns> <name> -- the merge-patch body sent for that release, from its
+# `PATCH <ns> <name> <json>` cmdlog line. Used only for its stdout.
+patch_for() {
+  grep -E "^PATCH $1 $2 " "$FAKE_CMDLOG" | head -1 | cut -d' ' -f4-
+}
+
+# listed_with_selector -- the fleet list was made once, with the exact selector.
+listed_with_selector() {
+  _n=$(grep -cxF -- "KUBECTL get helmreleases.helm.toolkit.fluxcd.io --all-namespaces -l $SELECTOR -o json" "$FAKE_CMDLOG")
+  [ "$_n" -eq 1 ]
+  return $?
+}
+
+# --- 1 and 2. the right instances, only where not chosen, exactly this patch -
+
+@test "pins every instance that has not chosen a limit and leaves the rest alone" {
+  prep
+  # One row per shape. The first eight have not chosen a limit the new chart
+  # accepts and must be pinned; the last six must not be touched.
+  export FAKE_HRS='tenant-root seaweedfs -
+tenant-api seaweedfs {"host":"s3.example.org"}
+tenant-rep seaweedfs {"master":{"replicas":3}}
+tenant-null seaweedfs {"master":{"volumeSizeLimitMB":null}}
+tenant-str seaweedfs {"master":{"volumeSizeLimitMB":"400"}}
+tenant-zero seaweedfs {"master":{"volumeSizeLimitMB":0}}
+tenant-frac seaweedfs {"master":{"volumeSizeLimitMB":400.5}}
+tenant-big seaweedfs {"master":{"volumeSizeLimitMB":30001}}
+tenant-1 seaweedfs {"master":{"volumeSizeLimitMB":1}}
+tenant-400 seaweedfs {"master":{"volumeSizeLimitMB":400}}
+tenant-30000 seaweedfs {"master":{"volumeSizeLimitMB":30000}}
+tenant-2000 seaweedfs {"master":{"volumeSizeLimitMB":2000}}
+tenant-1000 seaweedfs {"master":{"volumeSizeLimitMB":1000}}
+tenant-odd seaweedfs {"master":"unexpected"}'
+  rc=0
+  run_migration 57 >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"; cat "$FAKE_CMDLOG"
+  [ "$rc" -eq 0 ]
+  listed_with_selector
+
+  [ "$(grep -cE '^PATCH ' "$FAKE_CMDLOG")" -eq 8 ]
+  for ns in tenant-root tenant-api tenant-rep tenant-null tenant-str tenant-zero tenant-frac tenant-big; do
+    [ "$(patch_for "$ns" seaweedfs)" = "$PIN" ]
+  done
+  for ns in tenant-1 tenant-400 tenant-30000 tenant-2000 tenant-1000 tenant-odd; do
+    [ -z "$(patch_for "$ns" seaweedfs)" ]
+  done
+  # A patch sent without its namespace would land in the Job's own namespace.
+  [ "$(grep -cE '^PATCH <none> ' "$FAKE_CMDLOG")" -eq 0 ]
+
+  # Every kept value but 1000 is named in the Job log with the number it now
+  # applies, since the previous chart ignored it; nothing else is.
+  for kept in tenant-1:1 tenant-400:400 tenant-30000:30000 tenant-2000:2000; do
+    grep -qF -- "Keeping SeaweedFS ${kept%%:*}/seaweedfs at master.volumeSizeLimitMB=${kept#*:}:" "$WORK/out"
+  done
+  [ "$(grep -c '^Keeping SeaweedFS ' "$WORK/out")" -eq 4 ]
+
+  grep -qxF -- "STAMP 58" "$FAKE_CMDLOG"
+  rm -rf "$WORK"
+}
+
+@test "a release whose spec.values is not an object does not stop the fleet" {
+  prep
+  export FAKE_HRS='tenant-bad seaweedfs "oops"
+tenant-root seaweedfs -
+tenant-list seaweedfs ["a"]
+tenant-api seaweedfs {"host":"s3.example.org"}'
+  rc=0
+  run_migration 57 >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"; cat "$FAKE_CMDLOG"
+  [ "$rc" -eq 0 ]
+  listed_with_selector
+  for ns in tenant-root tenant-api; do
+    [ "$(patch_for "$ns" seaweedfs)" = "$PIN" ]
+  done
+  for ns in tenant-bad tenant-list; do
+    [ "$(patch_for "$ns" seaweedfs)" = "$PIN" ]
+  done
+  grep -qF -- 'WARNING: SeaweedFS tenant-bad/seaweedfs has a spec.values that is not an object' "$WORK/out"
+  grep -qF -- 'It held: "oops"' "$WORK/out"
+  grep -qF -- 'WARNING: SeaweedFS tenant-list/seaweedfs has a spec.values that is not an object' "$WORK/out"
+  grep -qF -- 'It held: ["a"]' "$WORK/out"
+  [ "$(grep -c '^WARNING: ' "$WORK/out")" -eq 2 ]
+  grep -qxF -- "STAMP 58" "$FAKE_CMDLOG"
+  rm -rf "$WORK"
+}
+
+@test "a master that is not an object is named and left unpinned" {
+  prep
+  export FAKE_HRS='tenant-odd seaweedfs {"master":"unexpected"}
+tenant-root seaweedfs -
+tenant-olist seaweedfs {"master":[400]}
+tenant-api seaweedfs {"host":"s3.example.org"}'
+  rc=0
+  run_migration 57 >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"; cat "$FAKE_CMDLOG"
+  [ "$rc" -eq 0 ]
+  for ns in tenant-root tenant-api; do
+    [ "$(patch_for "$ns" seaweedfs)" = "$PIN" ]
+  done
+  for ns in tenant-odd tenant-olist; do
+    [ -z "$(patch_for "$ns" seaweedfs)" ]
+  done
+  grep -qF -- 'WARNING: SeaweedFS tenant-odd/seaweedfs is not pinned: its master is not an object' "$WORK/out"
+  grep -qF -- 'master holds: "unexpected"' "$WORK/out"
+  grep -qF -- 'WARNING: SeaweedFS tenant-olist/seaweedfs is not pinned: its master is not an object' "$WORK/out"
+  grep -qF -- 'master holds: [400]' "$WORK/out"
+  [ "$(grep -c '^WARNING: ' "$WORK/out")" -eq 2 ]
+  grep -qxF -- "STAMP 58" "$FAKE_CMDLOG"
+  rm -rf "$WORK"
+}
+
+@test "a valuesFrom beyond the cozystack-values Secret is named and does not stop the pin" {
+  prep
+  export FAKE_HRS='tenant-vf seaweedfs -
+tenant-vfkeep seaweedfs {"master":{"volumeSizeLimitMB":400}}
+tenant-std seaweedfs -
+tenant-nofrom seaweedfs -'
+  export FAKE_VALUESFROM='tenant-vf [{"kind":"Secret","name":"cozystack-values"},{"kind":"ConfigMap","name":"limits","valuesKey":"limit","targetPath":"master.volumeSizeLimitMB"}]
+tenant-vfkeep [{"kind":"ConfigMap","name":"limits"}]
+tenant-nofrom -'
+  rc=0
+  run_migration 57 >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"; cat "$FAKE_CMDLOG"
+  [ "$rc" -eq 0 ]
+  for ns in tenant-vf tenant-std tenant-nofrom; do
+    [ "$(patch_for "$ns" seaweedfs)" = "$PIN" ]
+  done
+  [ -z "$(patch_for tenant-vfkeep seaweedfs)" ]
+  # Only the entries besides the platform's own Secret are listed.
+  grep -qxF -- 'WARNING: SeaweedFS tenant-vf/seaweedfs also takes values from [{"kind":"ConfigMap","name":"limits","valuesKey":"limit","targetPath":"master.volumeSizeLimitMB"}]. spec.values is merged over them, so a master.volumeSizeLimitMB set there without targetPath does not apply, and one set through targetPath can, depending on the entries before it' "$WORK/out"
+  grep -qF -- 'WARNING: SeaweedFS tenant-vfkeep/seaweedfs also takes values from [{"kind":"ConfigMap","name":"limits"}].' "$WORK/out"
+  [ "$(grep -c '^WARNING: ' "$WORK/out")" -eq 2 ]
+  grep -qxF -- "STAMP 58" "$FAKE_CMDLOG"
+  rm -rf "$WORK"
+}
+
+@test "an empty fleet stamps 58 without patching anything" {
+  prep
+  export FAKE_HRS=""
+  rc=0
+  run_migration 57 >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"; cat "$FAKE_CMDLOG"
+  [ "$rc" -eq 0 ]
+  # The list was really made, with the right selector: an empty answer to a
+  # list that never happened would look the same from here.
+  listed_with_selector
+  [ "$(grep -cE '^PATCH ' "$FAKE_CMDLOG")" -eq 0 ]
+  grep -qxF -- "STAMP 58" "$FAKE_CMDLOG"
+  rm -rf "$WORK"
+}
+
+# --- 3. fail closed on the list ----------------------------------------------
+
+@test "a failing fleet list aborts before stamping" {
+  prep
+  export FAKE_HRS='tenant-root seaweedfs -'
+  export FAKE_LIST_FAIL=1
+  rc=0
+  run_migration 57 >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"; cat "$FAKE_CMDLOG"
+  [ "$rc" -ne 0 ]
+  [ "$(grep -cE '^PATCH ' "$FAKE_CMDLOG")" -eq 0 ]
+  [ "$(grep -cE '^STAMP ' "$FAKE_CMDLOG")" -eq 0 ]
+  rm -rf "$WORK"
+}
+
+# --- 4. fail closed on the patch ---------------------------------------------
+
+@test "a failed patch aborts before stamping" {
+  prep
+  export FAKE_HRS='tenant-root seaweedfs -
+tenant-api seaweedfs {"host":"s3.example.org"}'
+  export FAKE_PATCH_FAIL=1
+  rc=0
+  run_migration 57 >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"; cat "$FAKE_CMDLOG"
+  [ "$rc" -ne 0 ]
+  # The abort is the patch's: it was attempted, and nothing after it was.
+  [ "$(grep -c ' patch helmreleases' "$FAKE_CMDLOG")" -eq 1 ]
+  grep -qF -- "KUBECTL -n tenant-root patch helmreleases.helm.toolkit.fluxcd.io seaweedfs " "$FAKE_CMDLOG"
+  [ "$(grep -cE '^STAMP ' "$FAKE_CMDLOG")" -eq 0 ]
+  rm -rf "$WORK"
+}
+
+# --- 5. the runbook agrees ----------------------------------------------------
+
+# One row per shape the selection tells apart.
+RUNBOOK_FLEET='tenant-root seaweedfs -
+tenant-bad seaweedfs "oops"
+tenant-list seaweedfs ["a"]
+tenant-api seaweedfs {"host":"s3.example.org"}
+tenant-null seaweedfs {"master":{"volumeSizeLimitMB":null}}
+tenant-str seaweedfs {"master":{"volumeSizeLimitMB":"400"}}
+tenant-frac seaweedfs {"master":{"volumeSizeLimitMB":400.5}}
+tenant-big seaweedfs {"master":{"volumeSizeLimitMB":30001}}
+tenant-400 seaweedfs {"master":{"volumeSizeLimitMB":400}}
+tenant-2000 seaweedfs {"master":{"volumeSizeLimitMB":2000}}
+tenant-1000 seaweedfs {"master":{"volumeSizeLimitMB":1000}}
+tenant-odd seaweedfs {"master":"unexpected"}
+tenant-vf seaweedfs -
+tenant-vfkeep seaweedfs {"master":{"volumeSizeLimitMB":400}}'
+RUNBOOK_VALUESFROM='tenant-vf [{"kind":"Secret","name":"cozystack-values"},{"kind":"ConfigMap","name":"limits"}]
+tenant-vfkeep [{"kind":"ConfigMap","name":"limits"}]'
+
+# releases_in <file> <sed-expression> -- the sorted "<ns> <name>" pairs the
+# expression prints from the file.
+releases_in() {
+  sed -n "$2" "$1" | sort
+}
+
+@test "the runbook's steps select the releases migration 57 does" {
+  prep
+  export FAKE_HRS="$RUNBOOK_FLEET" FAKE_VALUESFROM="$RUNBOOK_VALUESFROM"
+  runbook_step migration-57-listing
+  runbook_step migration-57-pin
+  run_migration 57 >"$WORK/mig.out" 2>&1
+  cp "$FAKE_CMDLOG" "$WORK/mig.log"; : > "$FAKE_CMDLOG"
+  # stdout only: the xtrace of this runner goes to stderr, and the closing line
+  # is checked by position.
+  run_in_image sh /work/migration-57-listing.sh >"$WORK/listing.out" 2>"$WORK/listing.err"
+  run_in_image sh /work/migration-57-pin.sh >"$WORK/pin.out" 2>"$WORK/pin.err"
+  cp "$FAKE_CMDLOG" "$WORK/pin.log"
+  cat "$WORK/mig.out" "$WORK/listing.out" "$WORK/pin.out"
+
+  releases_in "$WORK/mig.log" 's/^PATCH \([^ ]*\) \([^ ]*\) .*/\1 \2/p' > "$WORK/a"
+  releases_in "$WORK/pin.log" 's/^PATCH \([^ ]*\) \([^ ]*\) .*/\1 \2/p' > "$WORK/b"
+  [ "$(wc -l < "$WORK/a")" -eq 9 ]
+  cmp "$WORK/a" "$WORK/b"
+
+  releases_in "$WORK/mig.out" 's/^Keeping SeaweedFS \([^/]*\)\/\([^ ]*\) at master.volumeSizeLimitMB=\([0-9]*\):.*/\1 \2 \3/p' > "$WORK/a"
+  releases_in "$WORK/listing.out" 's/^changes //p' > "$WORK/b"
+  [ "$(wc -l < "$WORK/a")" -eq 3 ]
+  cmp "$WORK/a" "$WORK/b"
+
+  for what in unreadable:'has a spec.values' unrenderable:'is not pinned' valuesfrom:'also takes values'; do
+    releases_in "$WORK/mig.out" "s/^WARNING: SeaweedFS \\([^/]*\\)\\/\\([^ ]*\\) ${what#*:}.*/\\1 \\2/p" > "$WORK/a"
+    releases_in "$WORK/listing.out" "s/^${what%%:*} \\([^ ]*\\) \\([^ ]*\\) .*/\\1 \\2/p" > "$WORK/b"
+    releases_in "$WORK/pin.out" "s/^${what%%:*} \\([^ ]*\\) \\([^ ]*\\) .*/\\1 \\2/p" > "$WORK/c"
+    [ -s "$WORK/a" ]
+    cmp "$WORK/a" "$WORK/b"
+    cmp "$WORK/a" "$WORK/c"
+  done
+
+  for out in listing pin; do
+    [ "$(head -1 "$WORK/$out.out")" = "instances 14" ]
+    [ "$(tail -1 "$WORK/$out.out")" = "complete 14" ]
+  done
+  rm -rf "$WORK"
+}
+
+@test "the runbook's pinning step stops at a failed patch without its closing line" {
+  prep
+  export FAKE_HRS="$RUNBOOK_FLEET" FAKE_VALUESFROM="$RUNBOOK_VALUESFROM"
+  export FAKE_PATCH_FAIL=1
+  runbook_step migration-57-pin
+  run_in_image sh /work/migration-57-pin.sh >"$WORK/pin.out" 2>"$WORK/pin.err"
+  cat "$WORK/pin.out" "$FAKE_CMDLOG"
+  [ "$(grep -c ' patch helmreleases' "$FAKE_CMDLOG")" -eq 1 ]
+  grep -qxF -- "stopped: patching tenant-root/seaweedfs failed" "$WORK/pin.out"
+  [ "$(grep -c '^complete' "$WORK/pin.out")" -eq 0 ]
+  rm -rf "$WORK"
+}
diff --git a/hack/migration-58-http-cache-freeze.bats b/hack/migration-58-http-cache-freeze.bats
new file mode 100644
index 0000000000..6f07d3b83e
--- /dev/null
+++ b/hack/migration-58-http-cache-freeze.bats
@@ -0,0 +1,222 @@
+#!/usr/bin/env bats
+# -----------------------------------------------------------------------------
+# Unit tests for platform migration 58 --> 59 (freeze HTTPCache).
+#
+# The migration branches on whether an HTTPCache instance exists: it freezes the
+# application on a pinned source, or removes the platform side. See
+# packages/core/platform/images/migrations/migrations/58 for the mechanism.
+#
+# FAIL CLOSED is pinned for each path: a failed fleet scan, a failed read of the
+# source OCIRepository, a source with no digest to freeze on, a failed patch or a
+# failed delete must stop the migration before it stamps the version, because
+# migrations never re-run.
+#
+# The harness (docker, jq baked onto the migrations base image, the explicit
+# `return` in run_migration) is the one hack/migration-55-fluxcd-orphan.bats
+# describes; see there for why each piece is load-bearing.
+#
+# Run with: hack/cozytest.sh hack/migration-58-http-cache-freeze.bats
+# -----------------------------------------------------------------------------
+
+load test_helper
+
+FAKEBIN="$PWD/hack/testdata/migration-58-http-cache"
+MIG_DIR="$PWD/packages/core/platform/images/migrations/migrations"
+ALPINE=$(sed -n 's/^FROM \(alpine:[^ ]*\).*$/\1/p' \
+  "$PWD/packages/core/platform/images/migrations/Dockerfile" | head -1)
+TESTIMG="cozystack-migration58-test:$(printf '%s' "$ALPINE" | sed 's/[^a-zA-Z0-9]/-/g')"
+CHART=cozystack-http-cache-application-default-http-cache
+WORKROOT="${TMPDIR:-/tmp}/cozy-migration-58-$$"
+
+cozy_cleanup() {
+  rm -rf "$WORKROOT"
+  return 0
+}
+# What the fake's live source carries: a spec.ref.digest pin, and the manifest
+# digest its status.artifact.revision resolves a tag ref to.
+SPEC_DIGEST=sha256:1111111111111111111111111111111111111111111111111111111111111111
+RESOLVED_DIGEST=sha256:2222222222222222222222222222222222222222222222222222222222222222
+GRANT=cozy:tenant:admin:http-cache-frozen
+
+run_migration() {
+  _run_migration_rc=0
+  docker run --rm --network none \
+    --user "$(id -u):$(id -g)" \
+    -v "$MIG_DIR:/migrations:ro" \
+    -v "$FAKEBIN:/fakebin:ro" \
+    -v "$WORK:/work" \
+    -e PATH=/fakebin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin \
+    -e FAKE_CMDLOG=/work/cmdlog \
+    -e NAMESPACE="${NAMESPACE-}" \
+    -e FAKE_HRS="${FAKE_HRS-}" \
+    -e FAKE_LIST_FAIL="${FAKE_LIST_FAIL-}" \
+    -e FAKE_OCIREPO_REF="${FAKE_OCIREPO_REF-}" \
+    -e FAKE_OCIREPO_READ_FAIL="${FAKE_OCIREPO_READ_FAIL-}" \
+    -e FAKE_PATCH_FAIL="${FAKE_PATCH_FAIL-}" \
+    -e FAKE_DELETE_FAIL="${FAKE_DELETE_FAIL-}" \
+    "$TESTIMG" "/migrations/$1" || _run_migration_rc=$?
+  return "$_run_migration_rc"
+}
+
+prep() {
+  docker info >/dev/null 2>&1 || {
+    echo "docker is required: these tests run migration 58 inside a jq-enabled" >&2
+    echo "build of $ALPINE, the migrations image's base." >&2
+    return 1
+  }
+  docker build -q -t "$TESTIMG" - >/dev/null <<DOCKERFILE
+FROM $ALPINE
+RUN apk add --no-cache jq
+DOCKERFILE
+  chmod +x "$FAKEBIN/kubectl"
+  mkdir -p "$WORKROOT"
+  WORK=$(mktemp -d "$WORKROOT/XXXXXX")
+  export FAKE_CMDLOG="$WORK/cmdlog"
+  : > "$FAKE_CMDLOG"
+  export NAMESPACE=cozy-system
+  export FAKE_HRS=""
+  unset FAKE_LIST_FAIL FAKE_OCIREPO_REF FAKE_OCIREPO_READ_FAIL FAKE_PATCH_FAIL FAKE_DELETE_FAIL || true
+  return 0
+}
+
+cmdlog_line() {
+  grep -nE -- "$1" "$FAKE_CMDLOG" | head -1 | cut -d: -f1
+}
+
+@test "with instances it freezes the application on the live digest and deletes nothing" {
+  prep
+  export FAKE_HRS="tenant-a http-cache-web $CHART HTTPCache
+tenant-b http-cache-old some-old-chart HTTPCache
+tenant-a redis-cache cozystack-redis-application-default-redis Redis"
+  rc=0
+  run_migration 58 >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"; cat "$FAKE_CMDLOG"
+  [ "$rc" -eq 0 ]
+
+  # The frozen source is a copy: the url, the pull secret and the interval come
+  # from the live OCIRepository, the digest is the one it is pinned to, nothing
+  # owns it, and it carries the deletion guardrail the original has.
+  grep -qE "^APPLY-OCIREPO cozystack-packages-http-cache $SPEC_DIGEST oci://registry.example.org/cozystack/cozystack-packages registry-creds 5m verify=cosign owners=0 nodelete=1$" "$FAKE_CMDLOG"
+
+  # The application is repointed at it, kept from the prune and disowned. Both
+  # halves of the disown matter: the annotation null keeps Helm's prune off it,
+  # the managed-by null stops a later release adopting it.
+  grep -qE "^PATCH-PACKAGESOURCE keep=1 source=1 disown=1 managed=1$" "$FAKE_CMDLOG"
+  grep -qE "^PATCH-PACKAGE$" "$FAKE_CMDLOG"
+
+  # The chart no longer names httpcaches in cozy:tenant:admin:base, so without
+  # this grant the owner of a frozen instance could see it and not remove it.
+  grep -qE "^APPLY-CLUSTERROLE $GRANT aggregate=1 nodelete=1 resources=httpcaches verbs=create,update,patch,delete$" "$FAKE_CMDLOG"
+
+  # Freezing must not remove anything: the instances keep running off it.
+  if grep -qE "^DELETE-" "$FAKE_CMDLOG"; then echo "unexpected delete while freezing" >&2; return 1; fi
+  grep -qF "STAMP 59" "$FAKE_CMDLOG"
+  rm -rf "$WORK"
+}
+
+@test "with a tag ref it freezes on the digest the tag resolved to" {
+  prep
+  export FAKE_HRS="tenant-a http-cache-web $CHART HTTPCache"
+  export FAKE_OCIREPO_REF=tag
+  rc=0
+  run_migration 58 >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"; cat "$FAKE_CMDLOG"
+  [ "$rc" -eq 0 ]
+
+  # A tag can move under the frozen copy, so the pin is the manifest digest the
+  # tag resolved to, not the tag itself and not the tarball checksum.
+  grep -qE "^APPLY-OCIREPO cozystack-packages-http-cache $RESOLVED_DIGEST oci://registry.example.org/cozystack/cozystack-packages registry-creds 5m verify=cosign owners=0 nodelete=1$" "$FAKE_CMDLOG"
+  grep -qE "^PATCH-PACKAGESOURCE keep=1 source=1 disown=1 managed=1$" "$FAKE_CMDLOG"
+  grep -qF "STAMP 59" "$FAKE_CMDLOG"
+  rm -rf "$WORK"
+}
+
+@test "a source with no digest to freeze on aborts before repointing and before stamping" {
+  prep
+  export FAKE_HRS="tenant-a http-cache-web $CHART HTTPCache"
+  export FAKE_OCIREPO_REF=unresolved
+  rc=0
+  run_migration 58 >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"; cat "$FAKE_CMDLOG"
+  [ "$rc" -ne 0 ]
+  if grep -qE "^(APPLY-|PATCH-)" "$FAKE_CMDLOG"; then echo "unexpected action with nothing to freeze on" >&2; return 1; fi
+  if grep -qF "STAMP" "$FAKE_CMDLOG"; then echo "unexpected STAMP with nothing to freeze on" >&2; return 1; fi
+  rm -rf "$WORK"
+}
+
+@test "with no instances it removes the platform side, Package first, and freezes nothing" {
+  prep
+  export FAKE_HRS="tenant-a redis-cache cozystack-redis-application-default-redis Redis"
+  rc=0
+  run_migration 58 >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"; cat "$FAKE_CMDLOG"
+  [ "$rc" -eq 0 ]
+
+  # wait=1, not merely first in the log: the client has to block until the
+  # Package is gone, or an in-flight reconcile re-creates what follows it here.
+  _pkg=$(cmdlog_line "^DELETE-PACKAGE cozystack.http-cache-application wait=1$")
+  _rd=$(cmdlog_line "^DELETE-HR cozy-system http-cache-rd$")
+  _ad=$(cmdlog_line "^DELETE-APPDEF http-cache$")
+  _sec=$(cmdlog_line "^DELETE-SECRETS cozy-system owner=helm,name=http-cache-rd$")
+  [ -n "$_pkg" ] && [ -n "$_rd" ] && [ -n "$_ad" ] && [ -n "$_sec" ] || { echo "missing cleanup step: pkg=$_pkg rd=$_rd appdef=$_ad secrets=$_sec" >&2; return 1; }
+  [ "$_pkg" -lt "$_rd" ] || { echo "http-cache-rd deleted before its Package" >&2; return 1; }
+
+  # Nothing is pinned or granted on a cluster that never ran the application.
+  if grep -qE "^APPLY-OCIREPO" "$FAKE_CMDLOG"; then echo "unexpected frozen source with no instances" >&2; return 1; fi
+  if grep -qE "^APPLY-CLUSTERROLE" "$FAKE_CMDLOG"; then echo "unexpected tenant grant with no instances" >&2; return 1; fi
+  if grep -qE "^PATCH-" "$FAKE_CMDLOG"; then echo "unexpected patch with no instances" >&2; return 1; fi
+  grep -qF "STAMP 59" "$FAKE_CMDLOG"
+  rm -rf "$WORK"
+}
+
+@test "a failing fleet scan aborts before touching anything and before stamping" {
+  prep
+  export FAKE_HRS="tenant-a http-cache-web $CHART HTTPCache"
+  export FAKE_LIST_FAIL="Error from server (Timeout): the server was unable to return a response in the time allotted"
+  rc=0
+  run_migration 58 >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"; cat "$FAKE_CMDLOG"
+  [ "$rc" -ne 0 ]
+  if grep -qE "^(APPLY-|PATCH-|DELETE-)" "$FAKE_CMDLOG"; then echo "unexpected action after failed fleet scan" >&2; return 1; fi
+  if grep -qF "STAMP" "$FAKE_CMDLOG"; then echo "unexpected STAMP after failed fleet scan" >&2; return 1; fi
+  rm -rf "$WORK"
+}
+
+@test "a failing read of the source OCIRepository aborts before repointing and before stamping" {
+  prep
+  export FAKE_HRS="tenant-a http-cache-web $CHART HTTPCache"
+  export FAKE_OCIREPO_READ_FAIL="Error from server (Forbidden): ocirepositories.source.toolkit.fluxcd.io \"cozystack-packages\" is forbidden"
+  rc=0
+  run_migration 58 >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"; cat "$FAKE_CMDLOG"
+  # A swallowed read would publish a source pointing nowhere and repoint the
+  # application at it, which is worse than stopping.
+  [ "$rc" -ne 0 ]
+  if grep -qE "^(APPLY-|PATCH-)" "$FAKE_CMDLOG"; then echo "unexpected action after failed OCIRepository read" >&2; return 1; fi
+  if grep -qF "STAMP" "$FAKE_CMDLOG"; then echo "unexpected STAMP after failed OCIRepository read" >&2; return 1; fi
+  rm -rf "$WORK"
+}
+
+@test "a failing patch aborts before stamping" {
+  prep
+  export FAKE_HRS="tenant-a http-cache-web $CHART HTTPCache"
+  export FAKE_PATCH_FAIL="Error from server (Conflict): the object has been modified"
+  rc=0
+  run_migration 58 >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"; cat "$FAKE_CMDLOG"
+  [ "$rc" -ne 0 ]
+  if grep -qF "STAMP" "$FAKE_CMDLOG"; then echo "unexpected STAMP after failed patch" >&2; return 1; fi
+  rm -rf "$WORK"
+}
+
+@test "a failing cleanup delete aborts before stamping" {
+  prep
+  export FAKE_HRS=""
+  export FAKE_DELETE_FAIL="Error from server (InternalError): etcdserver: request timed out"
+  rc=0
+  run_migration 58 >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"; cat "$FAKE_CMDLOG"
+  [ "$rc" -ne 0 ]
+  if grep -qF "STAMP" "$FAKE_CMDLOG"; then echo "unexpected STAMP after failed delete" >&2; return 1; fi
+  rm -rf "$WORK"
+}
diff --git a/hack/migration-59-vmi-hotplug-volumes.bats b/hack/migration-59-vmi-hotplug-volumes.bats
new file mode 100644
index 0000000000..556061da24
--- /dev/null
+++ b/hack/migration-59-vmi-hotplug-volumes.bats
@@ -0,0 +1,175 @@
+#!/usr/bin/env bats
+# -----------------------------------------------------------------------------
+# Unit tests for platform migration 59 --> 60 (copy VMI-only hotplugged volumes
+# into the VM spec). See packages/core/platform/images/migrations/migrations/59
+# for the mechanism.
+#
+# The fake keeps the VMs in a state file and applies each JSON patch to it, so
+# a second run reads what the first one wrote.
+#
+# The harness (docker, jq baked onto the migrations base image, the explicit
+# `return` in run_migration) is the one hack/migration-55-fluxcd-orphan.bats
+# describes; see there for why each piece is load-bearing.
+#
+# Run with: hack/cozytest.sh hack/migration-59-vmi-hotplug-volumes.bats
+# -----------------------------------------------------------------------------
+
+load test_helper
+
+FIXTURES="$PWD/hack/testdata/migration-59-vmi-hotplug"
+MIG_DIR="$PWD/packages/core/platform/images/migrations/migrations"
+ALPINE=$(sed -n 's/^FROM \(alpine:[^ ]*\).*$/\1/p' \
+  "$PWD/packages/core/platform/images/migrations/Dockerfile" | head -1)
+TESTIMG="cozystack-migration59-test:$(printf '%s' "$ALPINE" | sed 's/[^a-zA-Z0-9]/-/g')"
+WORKROOT="${TMPDIR:-/tmp}/cozy-migration-59-$$"
+
+cozy_cleanup() {
+  rm -rf "$WORKROOT"
+  return 0
+}
+
+run_migration() {
+  _run_migration_rc=0
+  docker run --rm --network none \
+    --user "$(id -u):$(id -g)" \
+    -v "$MIG_DIR:/migrations:ro" \
+    -v "$FIXTURES:/fakebin:ro" \
+    -v "$WORK:/work" \
+    -e PATH=/fakebin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin \
+    -e FAKE_CMDLOG=/work/cmdlog \
+    -e FAKE_STATE=/work/state \
+    -e NAMESPACE="${NAMESPACE-}" \
+    -e FAKE_NO_KUBEVIRT="${FAKE_NO_KUBEVIRT-}" \
+    -e FAKE_CRD_FAIL="${FAKE_CRD_FAIL-}" \
+    -e FAKE_LIST_FAIL="${FAKE_LIST_FAIL-}" \
+    -e FAKE_VMI_LIST_FAIL="${FAKE_VMI_LIST_FAIL-}" \
+    -e FAKE_PATCH_FAIL="${FAKE_PATCH_FAIL-}" \
+    "$TESTIMG" "/migrations/$1" || _run_migration_rc=$?
+  return "$_run_migration_rc"
+}
+
+prep() {
+  docker info >/dev/null 2>&1 || {
+    echo "docker is required: these tests run migration 59 inside a jq-enabled" >&2
+    echo "build of $ALPINE, the migrations image's base." >&2
+    return 1
+  }
+  docker build -q -t "$TESTIMG" - >/dev/null <<DOCKERFILE
+FROM $ALPINE
+RUN apk add --no-cache jq
+DOCKERFILE
+  chmod +x "$FIXTURES/kubectl"
+  mkdir -p "$WORKROOT"
+  WORK=$(mktemp -d "$WORKROOT/XXXXXX")
+  mkdir -p "$WORK/state"
+  cp "$FIXTURES/vms.json" "$FIXTURES/vmis.json" "$WORK/state/"
+  FAKE_CMDLOG="$WORK/cmdlog"
+  : > "$FAKE_CMDLOG"
+  export NAMESPACE=cozy-system
+  unset FAKE_NO_KUBEVIRT FAKE_CRD_FAIL FAKE_LIST_FAIL FAKE_VMI_LIST_FAIL FAKE_PATCH_FAIL || true
+  return 0
+}
+
+vm_field() {
+  jq -r --arg ns "$1" --arg n "$2" \
+    ".items[] | select(.metadata.namespace == \$ns and .metadata.name == \$n) | $3" \
+    "$WORK/state/vms.json"
+}
+
+@test "copies VMI-only hotplugged volumes and their disks into the VM that needs them" {
+  prep
+  rc=0
+  run_migration 59 >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"; cat "$FAKE_CMDLOG"
+  [ "$rc" -eq 0 ]
+
+  # Both hotpluggable kinds are copied, the non-hotpluggable VMI volume is not,
+  # and the copied volume keeps the source it has on the VMI.
+  grep -qxF "PATCH-VM tenant-a/worker-old volumes=root,pvc-in-spec,pvc-vmi-only,pvc-claim-only disks=root,pvc-in-spec,pvc-vmi-only,pvc-claim-only" "$FAKE_CMDLOG"
+  [ "$(vm_field tenant-a worker-old '.spec.template.spec.volumes[] | select(.name == "pvc-claim-only") | .persistentVolumeClaim.hotpluggable')" = "true" ]
+  [ "$(vm_field tenant-a worker-old '.spec.template.spec.domain.devices.disks[] | select(.name == "pvc-vmi-only") | .serial')" = "vmi-only" ]
+
+  # A disk the VM already names is not added a second time.
+  grep -qxF "PATCH-VM tenant-d/worker-disk volumes=root,pvc-d disks=root,pvc-d" "$FAKE_CMDLOG"
+
+  # A VM whose spec already lists every hotplug volume is left alone, and so is
+  # a VMI no VM controls: an orphan, one whose VM reference is not the
+  # controller, or one whose controlling VM is already gone. VM-owned means a
+  # controller reference here, as in virt-api. A VMI that is not Running, or
+  # reports no phase yet, is left alone too: virt-controller reconciles only a
+  # running VMI, and the next start builds the VMI from the VM spec.
+  if grep -qE "^PATCH-VM tenant-(b|c|e|f|g|h)/" "$FAKE_CMDLOG"; then echo "unexpected patch" >&2; return 1; fi
+  grep -qF "tenant-a/worker-old: adding hotplugged volumes pvc-vmi-only,pvc-claim-only" "$WORK/out"
+  grep -qxF "STAMP 60" "$FAKE_CMDLOG"
+  rm -rf "$WORK"
+}
+
+@test "a second run finds nothing to change" {
+  prep
+  run_migration 59 >"$WORK/out" 2>&1
+  : > "$FAKE_CMDLOG"
+  rc=0
+  run_migration 59 >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"; cat "$FAKE_CMDLOG"
+  [ "$rc" -eq 0 ]
+  if grep -qF "PATCH-VM" "$FAKE_CMDLOG"; then echo "second run patched a VM" >&2; return 1; fi
+  grep -qF "nothing to update" "$WORK/out"
+  grep -qxF "STAMP 60" "$FAKE_CMDLOG"
+  rm -rf "$WORK"
+}
+
+@test "a cluster without KubeVirt only stamps the version" {
+  prep
+  export FAKE_NO_KUBEVIRT=1
+  rc=0
+  run_migration 59 >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"; cat "$FAKE_CMDLOG"
+  [ "$rc" -eq 0 ]
+  if grep -qE "get virtualmachine|PATCH-VM" "$FAKE_CMDLOG"; then echo "unexpected VM access" >&2; return 1; fi
+  grep -qxF "STAMP 60" "$FAKE_CMDLOG"
+  rm -rf "$WORK"
+}
+
+@test "a failing VM list aborts before stamping" {
+  prep
+  export FAKE_LIST_FAIL="Error from server (InternalError): etcdserver: request timed out"
+  rc=0
+  run_migration 59 >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"; cat "$FAKE_CMDLOG"
+  [ "$rc" -ne 0 ]
+  if grep -qF "STAMP" "$FAKE_CMDLOG"; then echo "unexpected STAMP after failed list" >&2; return 1; fi
+  rm -rf "$WORK"
+}
+
+@test "a failing CRD read aborts instead of treating KubeVirt as absent" {
+  prep
+  export FAKE_CRD_FAIL="Error from server (InternalError): etcdserver: request timed out"
+  rc=0
+  run_migration 59 >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"; cat "$FAKE_CMDLOG"
+  [ "$rc" -ne 0 ]
+  if grep -qF "STAMP" "$FAKE_CMDLOG"; then echo "unexpected STAMP after failed CRD read" >&2; return 1; fi
+  rm -rf "$WORK"
+}
+
+@test "a failing VMI list aborts before stamping" {
+  prep
+  export FAKE_VMI_LIST_FAIL="Error from server (InternalError): etcdserver: request timed out"
+  rc=0
+  run_migration 59 >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"; cat "$FAKE_CMDLOG"
+  [ "$rc" -ne 0 ]
+  if grep -qF "STAMP" "$FAKE_CMDLOG"; then echo "unexpected STAMP after failed VMI list" >&2; return 1; fi
+  rm -rf "$WORK"
+}
+
+@test "a failing patch aborts before stamping" {
+  prep
+  export FAKE_PATCH_FAIL="Error from server (Conflict): the object has been modified"
+  rc=0
+  run_migration 59 >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"; cat "$FAKE_CMDLOG"
+  [ "$rc" -ne 0 ]
+  if grep -qF "STAMP" "$FAKE_CMDLOG"; then echo "unexpected STAMP after failed patch" >&2; return 1; fi
+  rm -rf "$WORK"
+}
diff --git a/hack/migration-seaweedfs-db-adopt.bats b/hack/migration-seaweedfs-db-adopt.bats
new file mode 100644
index 0000000000..fd17d7e8b9
--- /dev/null
+++ b/hack/migration-seaweedfs-db-adopt.bats
@@ -0,0 +1,336 @@
+#!/usr/bin/env bats
+# -----------------------------------------------------------------------------
+# Unit tests for the SeaweedFS db-split hand-over shared by platform migrations
+# 43 (original) and 53 (repair) — lib/seaweedfs-db-adopt.sh.
+#
+# The 1.5.0 split (PR #2601) moved Cluster/seaweedfs-db out of the <name>-system
+# release into a new <name>-db release. The hand-over must, before <name>-system
+# next renders, re-own the Cluster to <name>-db AND stamp
+# helm.sh/resource-policy: keep — otherwise the <name>-system upgrade prunes the
+# Cluster as a removed resource, CNPG takes its PVC with it, and the tenant's
+# filer metadata (all of its S3) is gone.
+#
+# Three properties are pinned here, each of which shipped broken:
+#
+#  1. INSTANCE NAME. Migration 43 compared the owner against the literal
+#     "seaweedfs-system". `SeaweedFS` is user-creatable, so an instance named
+#     `foo` is owned by `foo-system` and was silently skipped. Observed live:
+#     four default-named tenants carry release-name=seaweedfs-db + keep and their
+#     Clusters survived; the one tenant running `foo` has no Cluster at all.
+#
+#  2. OWNERSHIP IS NOT SAFETY. A Cluster already owned by <name>-db can still
+#     need keep: where the hand-over was skipped, <name>-system prunes it and
+#     <name>-db RECREATES it under its own ownership with no keep, while
+#     <name>-system's prune baseline still lists it. Live proof that the shape is
+#     real: tenant-l and tenant-root are <name>-db-owned and their <name>-system
+#     deployed revision still contains the Cluster — only keep saves them.
+#
+#  3. FAIL CLOSED. Migrations never re-run, so a swallowed error permanently
+#     leaves at-risk tenants exposed. `for ns in $(kubectl ...)` does not trip
+#     errexit: on failure the loop runs zero times and the script stamps the
+#     version anyway. Only "the resource type is not served" (no CNPG at all) and
+#     "gone between scan and read" may be treated as empty.
+#
+# These drive the real migration scripts end-to-end against a fake kubectl
+# (hack/testdata/migration-seaweedfs-db/), mocking only the cluster boundary.
+#
+# SHELL. Production runs these under /bin/sh = busybox ash: the migrations image
+# is FROM alpine, and run-migrations.sh execs `/migrations/<n>` BY PATH, so the
+# kernel honours the `#!/bin/sh` shebang. `set -euo pipefail` and
+# errexit-in-function semantics differ from bash, and pipefail is load-bearing —
+# lib/cozystack-version.sh pipes the rendered manifest into `kubectl apply`, so
+# without it a failed render stamps the version from empty input. Asserting
+# fail-closed in a shell that never runs it would be asserting nothing.
+#
+# So these tests do not invoke the migrations through the runner's shell at all:
+# run_migration() executes them by path inside the image's own pinned base, read
+# from the migrations Dockerfile. Same base image, same interpreter, same
+# invocation form — production, rather than an approximation of it. This needs a
+# working docker; there is deliberately no host-shell fallback, because every
+# fallback available is a shell production never uses.
+#
+# What that replaced was `sh "$MIG_DIR/<n>"`, which is neither production nor
+# bash: on the GitHub ubuntu runner /bin/sh is dash, which has no `set -o
+# pipefail` and aborts on line 1 with "set: Illegal option -o pipefail" before
+# the script does any work, while on a developer box /bin/sh is often bash, which
+# runs green and proves nothing about ash.
+#
+# CI runs this file under Bats through `make bats-unit-tests`. It also remains
+# compatible with the legacy `hack/cozytest.sh` translator, whose awk parser
+# recognizes only @test blocks and a bare `}` on its own line. The tests avoid
+# `run`, `$status`, and setup() for that compatibility path.
+#
+# Run with: bats hack/migration-seaweedfs-db-adopt.bats
+# -----------------------------------------------------------------------------
+
+load test_helper
+
+FAKEBIN="$PWD/hack/testdata/migration-seaweedfs-db"
+MIG_DIR="$PWD/packages/core/platform/images/migrations/migrations"
+
+# The production base image, read out of the migrations Dockerfile rather than
+# repeated here, so the interpreter under test cannot drift from the one the
+# migrations actually ship on when that pin is bumped.
+ALPINE=$(sed -n 's/^FROM \(alpine:[^ ]*\).*$/\1/p' \
+  "$PWD/packages/core/platform/images/migrations/Dockerfile" | head -1)
+
+# run_migration <n> -- run migrations/<n> the way run-migrations.sh does.
+#
+# By path, not `sh <file>`: that is what makes the shebang, and therefore the
+# interpreter, part of what is under test. The fake kubectl goes on PATH inside
+# the container and $WORK is bind-mounted, so $FAKE_CMDLOG is the same file the
+# assertions read back on the host. --network none because nothing here may
+# reach a real cluster; --user keeps $WORK removable by the test afterwards.
+#
+# The explicit `return` is load-bearing: cozytest.sh's awk generator rewrites
+# every bare `}` in column 0 into `return 0` + `}`, so a helper that falls off
+# its own end returns 0 no matter what it ran, and every fail-closed assertion
+# below would pass vacuously. Capture the status and return it by hand.
+run_migration() {
+  _run_migration_rc=0
+  docker run --rm --network none \
+    --user "$(id -u):$(id -g)" \
+    -v "$MIG_DIR:/migrations:ro" \
+    -v "$FAKEBIN:/fakebin:ro" \
+    -v "$WORK:/work" \
+    -e PATH=/fakebin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin \
+    -e FAKE_CMDLOG=/work/cmdlog \
+    -e NAMESPACE="${NAMESPACE-}" \
+    -e FAKE_CLUSTERS="${FAKE_CLUSTERS-}" \
+    -e FAKE_LIST_FAIL="${FAKE_LIST_FAIL-}" \
+    -e FAKE_GET_FAIL="${FAKE_GET_FAIL-}" \
+    -e FAKE_ANNOTATE_FAIL="${FAKE_ANNOTATE_FAIL-}" \
+    "$ALPINE" "/migrations/$1" || _run_migration_rc=$?
+  return "$_run_migration_rc"
+}
+
+# prep resets env to a clean scenario. Tests set FAKE_* afterwards.
+prep() {
+  # Fail here rather than at the first docker run, so the reason is legible.
+  docker info >/dev/null 2>&1 || {
+    echo "docker is required: these tests run the migrations inside $ALPINE," >&2
+    echo "the base image of the migrations image, so that they exercise busybox" >&2
+    echo "ash — the interpreter run-migrations.sh actually gives them." >&2
+    return 1
+  }
+  chmod +x "$FAKEBIN/kubectl"
+  WORK=$(mktemp -d)
+  export FAKE_CMDLOG="$WORK/cmdlog"
+  : > "$FAKE_CMDLOG"
+  export NAMESPACE=cozy-system
+  export FAKE_CLUSTERS=""
+  unset FAKE_LIST_FAIL FAKE_GET_FAIL FAKE_ANNOTATE_FAIL || true
+}
+
+# --- 1. instance name -------------------------------------------------------
+
+@test "hands over a default-named instance (seaweedfs-system -> seaweedfs-db)" {
+  prep
+  export FAKE_CLUSTERS="tenant-root seaweedfs-system -"
+  rc=0
+  run_migration 43 >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"; cat "$FAKE_CMDLOG"
+  [ "$rc" -eq 0 ]
+  grep -qF -- "ANNOTATE tenant-root release-name=seaweedfs-db resource-policy=keep" "$FAKE_CMDLOG"
+  # Migration 43 stamps 44 — asserting the number, not a bare "STAMP": a wrong
+  # version would loop run-migrations.sh forever.
+  grep -qF -- "STAMP 44" "$FAKE_CMDLOG"
+  rm -rf "$WORK"
+}
+
+# THE original regression. Unfixed (owner compared against the literal
+# "seaweedfs-system") this namespace is skipped entirely: no ANNOTATE line, and
+# the Cluster is left with no keep for the foo-system upgrade to prune.
+@test "hands over a NON-default instance name (foo-system -> foo-db)" {
+  prep
+  export FAKE_CLUSTERS="tenant-named foo-system -"
+  rc=0
+  run_migration 43 >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"; cat "$FAKE_CMDLOG"
+  [ "$rc" -eq 0 ]
+  grep -qF -- "ANNOTATE tenant-named release-name=foo-db resource-policy=keep" "$FAKE_CMDLOG"
+  rm -rf "$WORK"
+}
+
+@test "migration 53 repairs a non-default instance the hardcoded 43 skipped, and stamps 54" {
+  prep
+  export FAKE_CLUSTERS="tenant-named foo-system -"
+  rc=0
+  run_migration 53 >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"; cat "$FAKE_CMDLOG"
+  [ "$rc" -eq 0 ]
+  grep -qF -- "ANNOTATE tenant-named release-name=foo-db resource-policy=keep" "$FAKE_CMDLOG"
+  grep -qF -- "STAMP 54" "$FAKE_CMDLOG"
+  rm -rf "$WORK"
+}
+
+@test "handles a mixed fleet: every -system owner is handed over, in its own namespace" {
+  prep
+  # The shape of the upgrade stand: default-named tenants plus one `foo`.
+  export FAKE_CLUSTERS="tenant-root seaweedfs-system -
+tenant-dsplit seaweedfs-system -
+tenant-l seaweedfs-system -
+tenant-named foo-system -"
+  rc=0
+  run_migration 53 >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"; cat "$FAKE_CMDLOG"
+  [ "$rc" -eq 0 ]
+  grep -qF -- "ANNOTATE tenant-root release-name=seaweedfs-db resource-policy=keep" "$FAKE_CMDLOG"
+  grep -qF -- "ANNOTATE tenant-dsplit release-name=seaweedfs-db resource-policy=keep" "$FAKE_CMDLOG"
+  grep -qF -- "ANNOTATE tenant-l release-name=seaweedfs-db resource-policy=keep" "$FAKE_CMDLOG"
+  grep -qF -- "ANNOTATE tenant-named release-name=foo-db resource-policy=keep" "$FAKE_CMDLOG"
+  [ "$(grep -c 'ANNOTATE' "$FAKE_CMDLOG")" -eq 4 ]
+  rm -rf "$WORK"
+}
+
+# --- 2. ownership is not safety --------------------------------------------
+
+# A <name>-db-owned Cluster WITHOUT keep is exposed, not done: <name>-system's
+# prune baseline may still list the Cluster (live on the stand for tenant-l and
+# tenant-root), in which case its next reconcile deletes it. Skipping on
+# ownership alone — the shape the previous revision of this helper shipped —
+# leaves the database to be pruned.
+@test "protects a <name>-db-owned Cluster that is still missing keep" {
+  prep
+  export FAKE_CLUSTERS="tenant-named foo-db -"
+  rc=0
+  run_migration 53 >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"; cat "$FAKE_CMDLOG"
+  [ "$rc" -eq 0 ]
+  grep -qF -- "ANNOTATE tenant-named release-name=<unset> resource-policy=keep" "$FAKE_CMDLOG"
+  rm -rf "$WORK"
+}
+
+@test "protects a default-named <name>-db-owned Cluster that is still missing keep" {
+  prep
+  export FAKE_CLUSTERS="tenant-fresh seaweedfs-db -"
+  rc=0
+  run_migration 53 >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"; cat "$FAKE_CMDLOG"
+  [ "$rc" -eq 0 ]
+  grep -qF -- "ANNOTATE tenant-fresh release-name=<unset> resource-policy=keep" "$FAKE_CMDLOG"
+  rm -rf "$WORK"
+}
+
+@test "idempotent: a Cluster already owned by <name>-db AND carrying keep is left alone" {
+  prep
+  export FAKE_CLUSTERS="tenant-root seaweedfs-db keep
+tenant-named foo-db keep"
+  rc=0
+  run_migration 53 >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"; cat "$FAKE_CMDLOG"
+  [ "$rc" -eq 0 ]
+  if grep -q 'ANNOTATE' "$FAKE_CMDLOG"; then echo "FAIL: no Cluster must have been re-annotated"; false; fi
+  grep -qF -- "STAMP 54" "$FAKE_CMDLOG"
+  rm -rf "$WORK"
+}
+
+@test "leaves a Cluster with no Helm owner annotation alone, but says so" {
+  prep
+  # Not Helm-managed. Guessing an owner would be worse than doing nothing, but
+  # an unowned SeaweedFS database must not pass silently.
+  export FAKE_CLUSTERS="tenant-manual - -"
+  rc=0
+  run_migration 53 >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"; cat "$FAKE_CMDLOG"
+  [ "$rc" -eq 0 ]
+  if grep -q 'ANNOTATE' "$FAKE_CMDLOG"; then echo "FAIL: no Cluster must have been re-annotated"; false; fi
+  grep -qF -- "carries no meta.helm.sh/release-name" "$WORK/out"
+  rm -rf "$WORK"
+}
+
+@test "leaves a Cluster owned by an unrelated release alone" {
+  prep
+  export FAKE_CLUSTERS="tenant-x some-other-release -"
+  rc=0
+  run_migration 53 >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"; cat "$FAKE_CMDLOG"
+  [ "$rc" -eq 0 ]
+  if grep -q 'ANNOTATE' "$FAKE_CMDLOG"; then echo "FAIL: no Cluster must have been re-annotated"; false; fi
+  grep -qF -- "owned by unrelated release" "$WORK/out"
+  rm -rf "$WORK"
+}
+
+@test "refuses a release literally named -system rather than annotating owner -db" {
+  prep
+  # "${current%-system}" would be empty, yielding release-name=-db, which no
+  # release will ever claim: the Cluster would be orphaned by the very step
+  # meant to protect it.
+  export FAKE_CLUSTERS="tenant-weird -system -"
+  rc=0
+  run_migration 53 >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"; cat "$FAKE_CMDLOG"
+  [ "$rc" -eq 0 ]
+  if grep -q 'ANNOTATE' "$FAKE_CMDLOG"; then echo "FAIL: no Cluster must have been re-annotated"; false; fi
+  grep -qF -- "no instance name" "$WORK/out"
+  rm -rf "$WORK"
+}
+
+# --- 3. fail closed ---------------------------------------------------------
+
+@test "a failing fleet scan aborts the migration instead of stamping past it" {
+  prep
+  export FAKE_CLUSTERS="tenant-named foo-system -"
+  export FAKE_LIST_FAIL="Error from server (Timeout): the server was unable to return a response in the time allotted"
+  rc=0
+  run_migration 53 >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"; cat "$FAKE_CMDLOG"
+  # Must propagate: the Job retries rather than advancing the version.
+  [ "$rc" -ne 0 ]
+  grep -qF -- "refusing to stamp past an unverified fleet" "$WORK/out"
+  if grep -q 'STAMP' "$FAKE_CMDLOG"; then echo "FAIL: no version must have been stamped"; false; fi
+  rm -rf "$WORK"
+}
+
+@test "an unreadable owner annotation aborts rather than being read as not-Helm-managed" {
+  prep
+  export FAKE_CLUSTERS="tenant-named foo-system -"
+  export FAKE_GET_FAIL="Error from server (Forbidden): clusters.postgresql.cnpg.io \"seaweedfs-db\" is forbidden"
+  rc=0
+  run_migration 53 >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"; cat "$FAKE_CMDLOG"
+  [ "$rc" -ne 0 ]
+  grep -qF -- "cannot read the Helm owner" "$WORK/out"
+  if grep -q 'STAMP' "$FAKE_CMDLOG"; then echo "FAIL: no version must have been stamped"; false; fi
+  rm -rf "$WORK"
+}
+
+@test "a failed hand-over aborts rather than stamping a half-migrated fleet" {
+  prep
+  export FAKE_CLUSTERS="tenant-named foo-system -"
+  export FAKE_ANNOTATE_FAIL="Error from server (Conflict): the object has been modified"
+  rc=0
+  run_migration 53 >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"; cat "$FAKE_CMDLOG"
+  [ "$rc" -ne 0 ]
+  if grep -q 'STAMP' "$FAKE_CMDLOG"; then echo "FAIL: no version must have been stamped"; false; fi
+  rm -rf "$WORK"
+}
+
+# The fail-open that IS load-bearing: a cluster with no CNPG at all must not be
+# blocked from upgrading. "The server doesn't have a resource type" is the only
+# list failure allowed to mean "nothing to do".
+@test "a cluster with no CNPG resource type stamps cleanly without annotating" {
+  prep
+  export FAKE_LIST_FAIL="error: the server doesn't have a resource type \"cluster\" in group \"postgresql.cnpg.io\""
+  rc=0
+  run_migration 53 >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"; cat "$FAKE_CMDLOG"
+  [ "$rc" -eq 0 ]
+  grep -qF -- "resource type is not served" "$WORK/out"
+  if grep -q 'ANNOTATE' "$FAKE_CMDLOG"; then echo "FAIL: no Cluster must have been re-annotated"; false; fi
+  grep -qF -- "STAMP 54" "$FAKE_CMDLOG"
+  rm -rf "$WORK"
+}
+
+@test "an empty fleet stamps without annotating" {
+  prep
+  export FAKE_CLUSTERS=""
+  rc=0
+  run_migration 53 >"$WORK/out" 2>&1 || rc=$?
+  cat "$WORK/out"; cat "$FAKE_CMDLOG"
+  [ "$rc" -eq 0 ]
+  if grep -q 'ANNOTATE' "$FAKE_CMDLOG"; then echo "FAIL: no Cluster must have been re-annotated"; false; fi
+  grep -qF -- "STAMP 54" "$FAKE_CMDLOG"
+  rm -rf "$WORK"
+}
diff --git a/hack/monitoring-pvc-backfill-migration.bats b/hack/monitoring-pvc-backfill-migration.bats
new file mode 100755
index 0000000000..147f7a6288
--- /dev/null
+++ b/hack/monitoring-pvc-backfill-migration.bats
@@ -0,0 +1,174 @@
+#!/usr/bin/env bats
+# -----------------------------------------------------------------------------
+# Unit tests for packages/core/platform/images/migrations/migrations/51
+#
+# Migration 51 backfills apps.cozystack.io/application.name onto the pre-existing
+# VictoriaMetrics/VictoriaLogs storage PVCs of the monitoring module so the
+# post-delete cleanup hook (PR #3094) can reclaim storage on already-deployed
+# clusters. Its correctness property is that it must relabel EXACTLY the
+# monitoring cluster's vmstorage/vmselect/vlstorage PVCs — never a user's own
+# VMCluster, never the CNPG db PVCs — and stamp the version on a clean run.
+# helm-unittest cannot check this (it inspects rendered manifests, not the
+# operator's runtime PVCs); a mis-scoped or no-op selector is exactly the class
+# of bug this PR iterated on, so these tests pin the runtime behaviour.
+#
+# We put a fake `kubectl` on PATH that logs every call and simulates one tenant
+# namespace holding: a monitoring VMCluster (shortterm) + VLCluster (generic)
+# whose spec.managedMetadata carries application.name=monitoring-system; a user's
+# own VMCluster (custom) with no such label; plus the operator storage PVCs and
+# the CNPG db PVCs. We assert the label log:
+#   - relabels the shortterm vmstorage/vmselect and generic vlstorage PVCs;
+#   - never touches the CNPG db PVCs (grafana-db/alerta-db);
+#   - never touches the user's `custom` VMCluster PVCs (no managedMetadata label);
+#   - stamps the version (kubectl apply) on a clean run;
+#   - is a safe no-op that still stamps when the CRDs are absent.
+#
+# For compatibility with the legacy cozytest.sh translator, assertions are
+# direct shell tests and the fake-kubectl heredoc keeps every `}` off column 0.
+# Each @test cleans up inline (no EXIT/RETURN trap — see
+# docs/agents/e2e-testing.md §3).
+#
+# Run with: bats hack/monitoring-pvc-backfill-migration.bats
+# -----------------------------------------------------------------------------
+
+load test_helper
+
+HACK_DIR="$(cd "$(dirname "${BATS_TEST_FILENAME:-$0}")" && pwd)"
+REPO_ROOT="$(cd "$HACK_DIR/.." && pwd)"
+MIGRATION="$REPO_ROOT/packages/core/platform/images/migrations/migrations/51"
+
+# write_fake_kubectl <dir>
+# Emits a fake `kubectl` that logs every call to $KLOG and, when $MOCK_ABSENT=1,
+# reports the VM/VL CRDs as absent. Ordering matters: the CR appname read is
+# matched by *managedMetadata* before the generic *vmclusters*/*vlclusters* list.
+# No line below is a bare column-0 `}`, so cozytest.sh's parser leaves it intact.
+write_fake_kubectl() {
+  cat > "$1/kubectl" <<'KEOF'
+#!/bin/sh
+echo "$*" >> "$KLOG"
+case "$*" in
+  *"get crd"*)
+    [ "${MOCK_ABSENT:-}" = 1 ] && exit 1
+    exit 0
+    ;;
+  *label*pvc*)
+    exit 0
+    ;;
+  *apply*)
+    cat >/dev/null
+    exit 0
+    ;;
+  *managedMetadata*)
+    case "$*" in
+      *shortterm*|*generic*) printf 'monitoring-system' ;;
+      *) : ;;
+    esac
+    exit 0
+    ;;
+  *vmclusters*)
+    printf 'tenant-test shortterm\ntenant-test custom\n'
+    exit 0
+    ;;
+  *vlclusters*)
+    printf 'tenant-test generic\n'
+    exit 0
+    ;;
+  *"get pvc"*"items[*]"*)
+    printf 'vmstorage-db-vmstorage-shortterm-0\n'
+    printf 'vmselect-cachedir-vmselect-shortterm-0\n'
+    printf 'vmstorage-db-vmstorage-custom-0\n'
+    printf 'vlstorage-db-vlstorage-generic-0\n'
+    printf 'grafana-db-1\n'
+    printf 'alerta-db-1\n'
+    exit 0
+    ;;
+  *"get pvc"*)
+    exit 0
+    ;;
+  *)
+    exit 0
+    ;;
+esac
+KEOF
+  chmod +x "$1/kubectl"
+}
+
+@test "migration 51 relabels only the monitoring VM/VL storage PVCs and stamps the version" {
+  tmp=$(mktemp -d)
+  export KLOG="$tmp/kubectl.log"
+  : > "$KLOG"
+  write_fake_kubectl "$tmp"
+
+  if ! KLOG="$KLOG" PATH="$tmp:$PATH" "$MIGRATION" >"$tmp/out" 2>&1; then
+    echo "expected a clean migration run to exit zero; output:" >&2
+    cat "$tmp/out" >&2
+    rm -rf "$tmp"
+    exit 1
+  fi
+
+  # The monitoring cluster's storage PVCs must be relabeled with the exact value.
+  for pvc in vmstorage-db-vmstorage-shortterm-0 vmselect-cachedir-vmselect-shortterm-0 vlstorage-db-vlstorage-generic-0; do
+    if ! grep -Eq "label pvc -n tenant-test $pvc apps.cozystack.io/application.name=monitoring-system --overwrite" "$KLOG"; then
+      echo "expected $pvc to be relabeled with application.name=monitoring-system" >&2
+      cat "$KLOG" >&2
+      rm -rf "$tmp"
+      exit 1
+    fi
+  done
+
+  # The CNPG db PVCs must never be touched (they are not monitoring storage).
+  if grep -Eq "label pvc.*(grafana-db|alerta-db)" "$KLOG"; then
+    echo "regression: cleanup relabeled a CNPG db PVC" >&2
+    cat "$KLOG" >&2
+    rm -rf "$tmp"
+    exit 1
+  fi
+
+  # A user's own VMCluster (no managedMetadata label) must be skipped entirely.
+  if grep -Eq "label pvc.*custom" "$KLOG"; then
+    echo "regression: relabeled a non-cozystack VMCluster's PVC" >&2
+    cat "$KLOG" >&2
+    rm -rf "$tmp"
+    exit 1
+  fi
+
+  # Positive control: the version stamp (kubectl apply) ran on a clean pass.
+  if ! grep -q apply "$KLOG"; then
+    echo "expected the version stamp (kubectl apply) to run on a clean migration" >&2
+    cat "$KLOG" >&2
+    rm -rf "$tmp"
+    exit 1
+  fi
+  rm -rf "$tmp"
+}
+
+@test "migration 51 is a safe no-op that still stamps when the VM/VL CRDs are absent" {
+  tmp=$(mktemp -d)
+  export KLOG="$tmp/kubectl.log"
+  : > "$KLOG"
+  write_fake_kubectl "$tmp"
+
+  if ! KLOG="$KLOG" MOCK_ABSENT=1 PATH="$tmp:$PATH" "$MIGRATION" >"$tmp/out" 2>&1; then
+    echo "expected the CRD-absent path to exit zero; output:" >&2
+    cat "$tmp/out" >&2
+    rm -rf "$tmp"
+    exit 1
+  fi
+
+  # No CRD -> no PVC is relabeled ...
+  if grep -q "label pvc" "$KLOG"; then
+    echo "expected no relabel when the VM/VL CRDs are absent" >&2
+    cat "$KLOG" >&2
+    rm -rf "$tmp"
+    exit 1
+  fi
+
+  # ... but the version stamp must still advance so the upgrade completes.
+  if ! grep -q apply "$KLOG"; then
+    echo "expected the version stamp to run even when the CRDs are absent" >&2
+    cat "$KLOG" >&2
+    rm -rf "$tmp"
+    exit 1
+  fi
+  rm -rf "$tmp"
+}
diff --git a/hack/multiarch-allowlist b/hack/multiarch-allowlist
new file mode 100644
index 0000000000..ddb9ab5b4c
--- /dev/null
+++ b/hack/multiarch-allowlist
@@ -0,0 +1,4 @@
+# Repositories hack/verify-multiarch.sh lets stay single-arch in a release.
+# One repository per line, no tag or digest, each with a `# reason`: why the
+# image cannot be built for both architectures, not that it has not been yet.
+ghcr.io/cozystack/cozystack/e2e-sandbox  # CI harness only, an x86 KVM sandbox (packages/core/testing pins linux/amd64); never runs on a user cluster
diff --git a/hack/multus-install-cni-plugins.bats b/hack/multus-install-cni-plugins.bats
new file mode 100644
index 0000000000..d5819ea201
--- /dev/null
+++ b/hack/multus-install-cni-plugins.bats
@@ -0,0 +1,379 @@
+#!/usr/bin/env bats
+# Behavioural tests for the multus install-cni-plugins init container script:
+# extracted from the rendered DaemonSet and run. The helm-unittest cases in
+# packages/system/multus/tests/multus_test.yaml match its source TEXT instead.
+#
+# Run from the repo root through `make bats-unit-tests`; relative paths resolve
+# against that cwd. The file also remains compatible with the legacy
+# `hack/cozytest.sh` translator, so each @test builds and removes its fixture
+# inline instead of relying on setup()/teardown().
+#
+# Test-level EXIT traps replace Bats' own handler and hide failing TAP results.
+# Cleanup follows aborting assertions; see docs/agents/e2e-testing.md.
+# Traps in the script under test run in a separate shell and remain in scope.
+
+load test_helper
+
+CHART=packages/system/multus
+
+# Extract the init container's script from the rendered chart into $1 and rebind
+# its two absolute paths ($2 = host cni bin, $3 = plugin source) so it can run
+# unprivileged. The non-empty check must be an early `return 1`: hack/cozytest.sh
+# rewrites every line matching ^}$ into `return 0` plus `}`, helpers included.
+render_script() {
+  out=$1
+  # The chart's own default is off -- the platform turns it on per bundle -- so
+  # the init container this file tests only exists when it is set here.
+  helm template --set stageCniPlugins=true "$CHART" \
+    | yq eval 'select(.kind == "DaemonSet") | .spec.template.spec.initContainers[] | select(.name == "install-cni-plugins") | .command[2]' - \
+    | sed -e "s|/host/opt/cni/bin|$2|g" -e "s|/cni-plugins|$3|g" \
+          -e "s|/dev/termination-log|${out}.termlog|g" > "$out"
+  [ -s "$out" ] || return 1
+
+  # Nothing may still point at a real /opt/cni/bin: the rebinding substitutes
+  # /host/opt/cni/bin literally, and these tests EXECUTE the script.
+  if grep -q '/opt/cni/bin' "$out"; then
+    echo "rendered script still references a real /opt/cni/bin after rebinding;" >&2
+    echo "refusing to execute it. Check that the manifest still writes through" >&2
+    echo "/host/opt/cni/bin, which is what this rebinding substitutes." >&2
+    return 1
+  fi
+}
+
+# The names the image actually stages, read from the Dockerfile rather than
+# repeated here: a script that skips a plugin by name is only exercised against
+# a fixture that contains that name.
+plugin_names() {
+  sed -n '/tar -xz -C \/cni-plugins -f /,/;/p' \
+    packages/system/multus/images/multus-cni/Dockerfile |
+    tr ' ' '\n' | sed -n 's|^\./||p' | tr -d ';' | sort
+}
+
+# A fake image payload: plugin binaries that report their own name when run.
+make_plugins() {
+  mkdir -p "$1"
+  for p in $(plugin_names); do
+    printf '#!/bin/sh\necho %s-NEW\n' "$p" > "$1/$p"
+    chmod 0755 "$1/$p"
+  done
+}
+
+# Put an `rm` in $1 that refuses any path containing $2, leaving it in place, and
+# delegates the rest. Injected rather than provoked with permissions: root's DAC
+# override unlinks through a forbidding parent, so a filesystem-shaped fixture
+# stops reproducing wherever the suite runs as root. $2 is narrow so staging can
+# still succeed around one bad path.
+stub_failing_rm() {
+  mkdir -p "$1"
+  sed -e "s|@MATCH@|$2|" > "$1/rm" <<'STUB'
+#!/bin/sh
+for a in "$@"; do
+  case $a in
+    *@MATCH@*)
+      echo "rm: $a: Read-only file system" >&2
+      exit 1
+      ;;
+  esac
+done
+exec /bin/rm "$@"
+STUB
+  chmod 0755 "$1/rm"
+}
+
+@test "a render that produces no script fails instead of passing as a no-op" {
+  tmp=$(mktemp -d)
+  mkdir -p "$tmp/dst"
+  # Guards the guard. Two tests below assert nothing landed in the destination,
+  # so an unrendered script satisfies them. This also fails if the check is
+  # moved into last-command position, where cozytest.sh's `return 0` rewrite
+  # swallows its status. Each @test runs in its own subshell, so reassigning
+  # CHART cannot leak.
+  CHART=$tmp/no-such-chart
+  if render_script "$tmp/s.sh" "$tmp/dst" "$tmp/src" 2>/dev/null; then
+    echo "FAIL: render_script reported success with no chart to render"
+    false
+  fi
+  rm -rf "$tmp"
+}
+
+@test "installs every staged plugin into the host cni bin dir, executable" {
+  tmp=$(mktemp -d)
+  make_plugins "$tmp/src"; mkdir -p "$tmp/dst"
+  render_script "$tmp/s.sh" "$tmp/dst" "$tmp/src"
+  sh "$tmp/s.sh"
+
+  names=$(plugin_names)
+  [ -n "$names" ]
+  [ "$(printf '%s\n' "$names" | grep -c .)" = "14" ]
+  [ "$(ls -1 "$tmp/dst" | wc -l | tr -d ' ')" = "14" ]
+  # Each by name: a count is satisfied by that many of anything, and one plugin
+  # landing unexecutable leaves the others to carry the assertion.
+  for p in $names; do
+    [ -f "$tmp/dst/$p" ]
+    [ -x "$tmp/dst/$p" ]
+    [ "$("$tmp/dst/$p")" = "$p-NEW" ]
+  done
+  rm -rf "$tmp"
+}
+
+@test "installs a plugin executable even when the staged copy is not" {
+  tmp=$(mktemp -d)
+  make_plugins "$tmp/src"; mkdir -p "$tmp/dst"
+  # cp reproduces the source mode, so the chmod is only load-bearing when a
+  # staged plugin is not already 0755.
+  chmod 0644 "$tmp/src/bridge"
+  render_script "$tmp/s.sh" "$tmp/dst" "$tmp/src"
+  sh "$tmp/s.sh"
+
+  # Two statements, not `[ -f X ] && [ -x X ]`: a failing command that is not the
+  # last in an AND-OR list is exempt from errexit, so the pair silently continues
+  # into cozytest.sh's appended `return 0` and the whole assertion is discarded.
+  # Measured in dash and bash -- the `-f` half of every such pair was dead.
+  [ -f "$tmp/dst/bridge" ]
+  [ -x "$tmp/dst/bridge" ]
+  rm -rf "$tmp"
+}
+
+@test "replaces a plugin by rename, not by writing onto the live path" {
+  tmp=$(mktemp -d)
+  make_plugins "$tmp/src"; mkdir -p "$tmp/dst"
+  # Stand in for a plugin another CNI already installed and the kubelet may exec.
+  printf '#!/bin/sh\necho portmap-OLD\n' > "$tmp/dst/portmap"
+  chmod 0755 "$tmp/dst/portmap"
+  before=$(ls -i "$tmp/dst/portmap" | awk '{print $1}')
+
+  render_script "$tmp/s.sh" "$tmp/dst" "$tmp/src"
+  sh "$tmp/s.sh"
+
+  after=$(ls -i "$tmp/dst/portmap" | awk '{print $1}')
+  [ "$("$tmp/dst/portmap")" = "portmap-NEW" ]
+  # A rename swaps in a new inode, so an exec holding the old one keeps a
+  # complete binary; a cp onto the live path truncates and rewrites in place.
+  if [ "$before" = "$after" ]; then echo "FAIL: portmap replaced in place (inode $before unchanged) — copy was not atomic"; false; fi
+  rm -rf "$tmp"
+}
+
+@test "leaves no temp files behind, and clears ones stranded by an earlier kill" {
+  tmp=$(mktemp -d)
+  make_plugins "$tmp/src"; mkdir -p "$tmp/dst"
+  # Named for a plugin this image does not stage, so no iteration renames it
+  # away -- only the cleanup can remove it.
+  echo stranded > "$tmp/dst/.tmp-cozystack-multus-plugin-from-an-older-image"
+
+  render_script "$tmp/s.sh" "$tmp/dst" "$tmp/src"
+  sh "$tmp/s.sh"
+
+  [ "$(ls -a1 "$tmp/dst" | grep -c '^\.tmp-cozystack-multus-' || true)" = "0" ]
+  rm -rf "$tmp"
+}
+
+@test "skips staging instead of failing when the image predates the plugins" {
+  tmp=$(mktemp -d)
+  mkdir -p "$tmp/dst"
+  # No source dir at all: the release-prep digest re-pin lags a Dockerfile
+  # change, so the pinned image can have no /cni-plugins.
+  render_script "$tmp/s.sh" "$tmp/dst" "$tmp/absent"
+  sh "$tmp/s.sh" 2>"$tmp/err"
+
+  [ "$(ls -1 "$tmp/dst" | wc -l | tr -d ' ')" = "0" ]
+  # The empty destination alone is satisfied by the guard being gone: the glob
+  # stays literal and `[ -e "$plugin" ]` skips it. Only this line separates them.
+  grep -q 'in this image; skipping staging' "$tmp/err"
+  # And nothing may be reported as failed: a skip is not a partial install.
+  if grep -q 'failed to install:' "$tmp/err"; then
+    echo "FAIL: an absent plugin directory was reported as failed installs"
+    cat "$tmp/err"
+    false
+  fi
+  rm -rf "$tmp"
+}
+
+@test "does not fail when the staged plugin directory is empty" {
+  tmp=$(mktemp -d)
+  mkdir -p "$tmp/src" "$tmp/dst"
+  render_script "$tmp/s.sh" "$tmp/dst" "$tmp/src"
+  # An unmatched glob stays literal in sh, so without the `[ -e ]` guard the loop
+  # runs once for a path that does not exist and reports a plugin named `*`.
+  sh "$tmp/s.sh" 2>"$tmp/err"
+
+  [ "$(ls -1 "$tmp/dst" | wc -l | tr -d ' ')" = "0" ]
+  # Asserted, because the empty destination alone is satisfied by the guard
+  # being gone.
+  if grep -q 'failed to install:' "$tmp/err"; then
+    echo "FAIL: an empty plugin directory was reported as failed installs"
+    cat "$tmp/err"
+    false
+  fi
+  rm -rf "$tmp"
+}
+
+@test "a leftover directory is cleared, and the plugin installs as a file" {
+  tmp=$(mktemp -d)
+  make_plugins "$tmp/src"; mkdir -p "$tmp/dst"
+  # The temp path as an ordinary directory `rm -rf` can clear: a previous run
+  # killed between the cp and the rename. Staging proceeds.
+  #
+  # The assertions check for a regular FILE: `-x` alone is true of a directory.
+  mkdir -p "$tmp/dst/.tmp-cozystack-multus-bridge"
+  render_script "$tmp/s.sh" "$tmp/dst" "$tmp/src"
+  sh "$tmp/s.sh"
+
+  [ -f "$tmp/dst/bridge" ]
+  [ -x "$tmp/dst/bridge" ]
+  [ "$("$tmp/dst/bridge")" = "bridge-NEW" ]
+  rm -rf "$tmp"
+}
+
+@test "a temp path that will not clear is refused, not published as a plugin" {
+  tmp=$(mktemp -d)
+  make_plugins "$tmp/src"; mkdir -p "$tmp/dst"
+  # A temp path that is still a directory when the copy runs: cp writes INTO it,
+  # chmod works on it, and mv publishes it as the plugin, because a rename onto
+  # a free name succeeds. The runtime cannot exec a directory.
+  mkdir -p "$tmp/dst/.tmp-cozystack-multus-bridge"
+  stub_failing_rm "$tmp/bin" ".tmp-cozystack-multus-bridge"
+  render_script "$tmp/s.sh" "$tmp/dst" "$tmp/src"
+
+  # Still must not fail the container. hostNetwork pods bypass CNI and would
+  # start either way; every other pod on the node would not.
+  if ! PATH="$tmp/bin:$PATH" sh "$tmp/s.sh" 2>"$tmp/err"; then
+    echo "FAIL: an unclearable temp path failed the container"
+    cat "$tmp/err"
+    false
+  fi
+  if [ -d "$tmp/dst/bridge" ]; then
+    echo "FAIL: a directory was published as the plugin"
+    ls -la "$tmp/dst/bridge"
+    false
+  fi
+  # Refused, so nothing is there at all -- not a half-installed something.
+  if [ -e "$tmp/dst/bridge" ]; then
+    echo "FAIL: expected bridge to be absent after a refusal"
+    false
+  fi
+  # The injection has to have happened: if PATH stopped being honoured, the real
+  # `rm` would clear the fixture and every assertion above would still pass.
+  if [ ! -d "$tmp/dst/.tmp-cozystack-multus-bridge" ]; then
+    echo "FAIL: the temp path was removed, so no failure was injected;"
+    echo "      this test proved nothing. Check that stub_failing_rm is on PATH"
+    echo "      and that the script still invokes rm by bare name."
+    false
+  fi
+  # And WHICH plugin: anchored at line start, matched as a whole token. The stub
+  # prints the bridge path itself, `.*bridge` would also accept `bridgeport`,
+  # and without `^` the contradictory `not failed to install:` passes too.
+  grep -qE '^failed to install:( [^ ]+)* bridge( |$)' "$tmp/err"
+  # The termination log is the channel the stub cannot write to, so assert there
+  # too -- it is also what `kubectl describe` shows.
+  grep -qE '^failed to install:( [^ ]+)* bridge( |$)' "$tmp/s.sh.termlog"
+  # The other plugins are unaffected: one bad temp path is not a stop signal.
+  [ -f "$tmp/dst/macvlan" ]
+  [ -x "$tmp/dst/macvlan" ]
+  [ "$("$tmp/dst/macvlan")" = "macvlan-NEW" ]
+  rm -rf "$tmp"
+}
+
+@test "refuses to nest a plugin inside a directory that already holds its name" {
+  tmp=$(mktemp -d)
+  make_plugins "$tmp/src"; mkdir -p "$tmp/dst"
+  # mv moves its source INTO an existing directory, under the SOURCE's basename
+  # -- the temp name, never <dst>/bridge/bridge. Assert the directory gained no
+  # entries: a temp file one level down is deeper than the trap's glob.
+  mkdir -p "$tmp/dst/bridge/occupied"
+  render_script "$tmp/s.sh" "$tmp/dst" "$tmp/src"
+  sh "$tmp/s.sh" 2>"$tmp/err"
+
+  nested=$(ls -A "$tmp/dst/bridge" | grep -v '^occupied$' || :)
+  if [ -n "$nested" ]; then
+    echo "FAIL: something was moved inside the existing directory: $nested"
+    false
+  fi
+  # One line, summary and name together: as two greps this passes when the
+  # summary names a different plugin and `mv` merely printed this one.
+  grep -qE '^failed to install:( [^ ]+)* bridge( |$)' "$tmp/err"
+  # And a CAUSE: this is the one branch that records a failure no command
+  # printed an error for, so without this line the summary is unexplained.
+  grep -q 'is a directory, not a plugin binary' "$tmp/err"
+  rm -rf "$tmp"
+}
+
+@test "survives a leftover it cannot clean up" {
+  tmp=$(mktemp -d)
+  make_plugins "$tmp/src"; mkdir -p "$tmp/dst"
+  # A leftover only the trap's glob reaches. Its `rm` is guarded because a
+  # command failing inside an EXIT trap sets the status even after `exit 0`.
+  mkdir -p "$tmp/dst/.tmp-cozystack-multus-stranded"
+  stub_failing_rm "$tmp/bin" "stranded"
+  render_script "$tmp/s.sh" "$tmp/dst" "$tmp/src"
+
+  if ! PATH="$tmp/bin:$PATH" sh "$tmp/s.sh" 2>"$tmp/err"; then
+    echo "FAIL: a leftover that could not be removed failed the container;"
+    echo "      every pod that needs CNI would then fail to start here"
+    cat "$tmp/err"
+    false
+  fi
+  # The leftover has to have SURVIVED: that is the only proof the failure was
+  # injected, since a real `rm -rf` would clear it and staging would succeed.
+  if [ ! -d "$tmp/dst/.tmp-cozystack-multus-stranded" ]; then
+    echo "FAIL: the stranded leftover was removed, so no failure was injected;"
+    echo "      this test proved nothing about the EXIT trap's guard."
+    false
+  fi
+  # And the staging still has to have happened.
+  [ -f "$tmp/dst/bridge" ]
+  [ -x "$tmp/dst/bridge" ]
+  [ "$("$tmp/dst/bridge")" = "bridge-NEW" ]
+  rm -rf "$tmp"
+}
+
+@test "reports a plugin it could not install, and still leaves the node usable" {
+  tmp=$(mktemp -d)
+  make_plugins "$tmp/src"; mkdir -p "$tmp/dst"
+  # An entry cp cannot copy, sorted ahead of the good plugins so a later
+  # iteration still runs.
+  mkdir -p "$tmp/src/aaa-uncopyable"
+  # Plus a leftover the trap cannot remove, so both failure paths run at once:
+  # unguarded, the script dies in the EXIT trap before the summary.
+  mkdir -p "$tmp/dst/.tmp-cozystack-multus-stranded"
+  stub_failing_rm "$tmp/bin" "stranded"
+  render_script "$tmp/s.sh" "$tmp/dst" "$tmp/src"
+
+  # Both halves: exit 0 alone would pass with the message dropped, and the log
+  # line is the only remaining signal.
+  if ! PATH="$tmp/bin:$PATH" sh "$tmp/s.sh" 2>"$tmp/err"; then
+    echo "FAIL: a plugin that could not be installed failed the container;"
+    echo "      every pod that needs CNI would then fail to start here"
+    false
+  fi
+  # The script's own wording AND the name, as one line: cp prints the path it
+  # could not copy, so either half alone passes with the report deleted.
+  if ! grep -qE '^failed to install:( [^ ]+)* aaa-uncopyable( |$)' "$tmp/err"; then
+    echo "FAIL: the script did not report the plugin it could not install"
+    cat "$tmp/err"
+    false
+  fi
+
+  # And into the termination log, which is what `kubectl describe` shows.
+  # invisible to anyone not reading that container's logs specifically.
+  if ! grep -q 'failed to install:.*aaa-uncopyable' "$tmp/s.sh.termlog" 2>/dev/null; then
+    echo "FAIL: the failure was not written to the termination log"
+    false
+  fi
+
+  # The stranded leftover has to have survived, or the injected failure never
+  # happened and the both-go-wrong path was not exercised.
+  if [ ! -d "$tmp/dst/.tmp-cozystack-multus-stranded" ]; then
+    echo "FAIL: the stranded leftover was removed, so no rm failure was injected"
+    false
+  fi
+
+  # The failure must not take the rest of the set with it.
+  [ -f "$tmp/dst/bridge" ]
+  [ -x "$tmp/dst/bridge" ]
+  [ "$("$tmp/dst/bridge")" = "bridge-NEW" ]
+  # And no temp FILE of its own. The planted directory is expected to survive:
+  # stub_failing_rm refuses that path, which is what makes the cleanup fail.
+  # Counting only regular files keeps the fixture from hiding a real leak.
+  [ "$(find "$tmp/dst" -maxdepth 1 -type f -name '.tmp-cozystack-multus-*' | wc -l | tr -d ' ')" = "0" ]
+  rm -rf "$tmp"
+}
diff --git a/hack/nats-backup-demo-helpers.bats b/hack/nats-backup-demo-helpers.bats
new file mode 100644
index 0000000000..07cc41c0e0
--- /dev/null
+++ b/hack/nats-backup-demo-helpers.bats
@@ -0,0 +1,147 @@
+#!/usr/bin/env bats
+# Unit tests for nats_cli in examples/backups/nats/00-helpers.sh, the helper the
+# nats roundtrip suite seeds and verifies JetStream streams through.
+#
+# kubectl and the `nats` CLI are stub executables on PATH. The kubectl stub
+# answers the calls nats_cli makes -- get the CLI Pod's phase and owner label,
+# create it when absent, wait for it, and `exec` into it -- and runs the exec'd
+# `nats` invocation locally against the nats stub. STUB_PHASE / STUB_OWNER drive
+# the reuse guard, and STUB_EXEC_ERROR makes the exec fail so the "a failed read
+# says why" claim is pinned. The password is piped on stdin, so it must not
+# appear in the recorded argv.
+#
+# cozytest.sh's awk runner recognizes only @test blocks and a bare `}`; there is
+# no bats `run` or `$status`, and no setup/teardown, so each case calls
+# make_stubs itself and asserts with direct shell tests that exit non-zero. The
+# helper functions close on an indented brace because the runner rewrites a
+# column-0 `}` into `return 0`, which would mask run_stream_count's exit status.
+
+load test_helper
+
+make_stubs() {
+    stub=$(mktemp -d)
+    cat > "$stub/kubectl" <<'EOF'
+#!/bin/bash
+printf '%s\n' "$*" >> "$STUB_DIR/kubectl.argv"
+case "$1 $2 $3" in
+"-n tenant-root get")
+    [ -n "${STUB_GET_ERROR:-}" ] && { echo "Unable to connect to the server: i/o timeout" >&2; exit 1; }
+    case "$*" in
+    *"jsonpath={.status.phase}"*)          printf '%s' "${STUB_PHASE-Running}" ;;
+    *"jsonpath={.metadata.labels"*)         printf '%s' "${STUB_OWNER-nats}" ;;
+    esac
+    exit 0 ;;
+"-n tenant-root delete")
+    exit 0 ;;
+"-n tenant-root run")
+    # Reachable only when the Pod is absent; a reuse that starts a Pod is a bug.
+    [ -z "${STUB_PHASE-Running}" ] && exit 0
+    echo "nats_cli started a Pod though a Ready one it owns exists" >&2; exit 95 ;;
+"-n tenant-root wait")
+    exit 0 ;;
+"-n tenant-root exec")
+    [ -n "${STUB_EXEC_ERROR:-}" ] && { echo "error: unable to upgrade connection: container not found" >&2; exit 1; }
+    shift 6   # drop: -n tenant-root exec -i <pod> --
+    exec "$@" ;;   # sh -c <script> sh <url> <args...>
+*)
+    echo "unexpected kubectl call: $*" >&2; exit 97 ;;
+esac
+EOF
+    cat > "$stub/nats" <<'EOF'
+#!/bin/sh
+# nats stub: only `stream info <name> --json` is exercised.
+case "$*" in
+*"stream info"*"--json"*)
+    printf '{"state":{"messages":42}}\n'; exit 0 ;;
+esac
+echo "unexpected nats call: $*" >&2; exit 90
+EOF
+    chmod +x "$stub/kubectl" "$stub/nats"
+    : > "$stub/kubectl.argv"
+    }
+
+run_stream_count() {
+    STUB_DIR=$stub STUB_PHASE="${STUB_PHASE-Running}" STUB_OWNER="${STUB_OWNER-nats}" \
+        STUB_EXEC_ERROR="${STUB_EXEC_ERROR:-}" STUB_GET_ERROR="${STUB_GET_ERROR:-}" PATH="$stub:$PATH" NAMESPACE=tenant-root \
+        NATS_USER=demo NATS_PASSWORD=s3cret bash -c '
+        set -euo pipefail
+        . examples/backups/nats/00-helpers.sh
+        # Read the way the numbered scripts read it: inside a command
+        # substitution, where bash does not apply errexit.
+        got=$(stream_message_count demo orders)
+        printf "%s\n" "$got"
+    '
+    }
+
+@test "nats_cli reuses a Ready Pod it owns and reads the reply by exec" {
+    make_stubs
+    out=$(run_stream_count)
+    [ "$out" = "42" ]
+    grep -q 'exec -i nats-cli -- sh -c' "$stub/kubectl.argv"
+}
+
+@test "nats_cli passes the password on stdin, keeping it out of the exec argv" {
+    make_stubs
+    out=$(run_stream_count)
+    [ "$out" = "42" ]
+    grep -q 'nats://demo@demo.tenant-root.svc:4222' "$stub/kubectl.argv"
+    if grep -q s3cret "$stub/kubectl.argv"; then
+        echo "the password reached kubectl's argv" >&2
+        exit 1
+    fi
+}
+
+@test "nats_cli creates the CLI Pod when it is absent, then execs into it" {
+    make_stubs
+    export STUB_PHASE=
+    out=$(run_stream_count)
+    [ "$out" = "42" ]
+    grep -q 'run nats-cli --image=' "$stub/kubectl.argv"
+    grep -q 'labels=cozystack.io/backup-demo=nats' "$stub/kubectl.argv"
+    grep -q 'exec -i nats-cli -- sh -c' "$stub/kubectl.argv"
+}
+
+@test "nats_cli refuses a same-named Pod the demo does not own" {
+    make_stubs
+    export STUB_OWNER=someone-else
+    err=$(mktemp)
+    if run_stream_count 2>"$err"; then
+        echo "nats_cli used a Pod it does not own" >&2
+        exit 1
+    fi
+    grep -q 'does not own it' "$err"
+    if grep -q ' exec ' "$stub/kubectl.argv"; then
+        echo "nats_cli exec'd into a Pod it refused to use" >&2
+        exit 1
+    fi
+}
+
+@test "nats_cli touches no Pod when it cannot read the CLI Pod's state" {
+    make_stubs
+    export STUB_GET_ERROR=1
+    err=$(mktemp)
+    if run_stream_count 2>"$err"; then
+        echo "a failed Pod lookup read as a successful reply" >&2
+        exit 1
+    fi
+    grep -q 'Unable to connect to the server' "$err"
+    if grep -qE ' (delete|run|exec) ' "$stub/kubectl.argv"; then
+        echo "nats_cli_pod acted on a Pod whose owner it could not read:" >&2
+        cat "$stub/kubectl.argv" >&2
+        exit 1
+    fi
+}
+
+@test "nats_cli fails with kubectl's own error when the exec fails" {
+    make_stubs
+    # A flag, not the message: the runner traces the command that passes
+    # STUB_EXEC_ERROR on, into the same stderr the grep below reads, so a
+    # message carried in it would match with the helper's stderr dropped.
+    export STUB_EXEC_ERROR=1
+    err=$(mktemp)
+    if run_stream_count 2>"$err"; then
+        echo "a failed exec read as a successful empty count" >&2
+        exit 1
+    fi
+    grep -q 'unable to upgrade connection: container not found' "$err"
+}
diff --git a/hack/nightly-mirror.sh b/hack/nightly-mirror.sh
new file mode 100755
index 0000000000..86ad95ed41
--- /dev/null
+++ b/hack/nightly-mirror.sh
@@ -0,0 +1,188 @@
+#!/bin/sh
+# Mirror the latest main-branch build's cozystack-owned component images from the
+# CI build registry (OCIR) to the public release registry (GHCR) BY DIGEST — no
+# rebuild — and rewrite the baked package tree so the GHCR install closure is
+# self-contained on GHCR.
+#
+# A nightly is a *renamed copy* of what main already built: every image cozystack
+# ships is content-addressed, so copying each `<repo>@<digest>` from the source
+# registry to the destination registry preserves the digest bit-for-bit. The
+# nightly that users install from GHCR is the exact image set built and cached on
+# the last push to main — nothing is rebuilt here.
+#
+# Usage: hack/nightly-mirror.sh <version> <baked-tree-dir> [--dry-run]
+#   <version>         dest tag, e.g. 0.0.0-nightly.20260626 (a floating tag is
+#                     also moved — see FLOATING)
+#   <baked-tree-dir>  the extracted cozystack-packages OCI artifact: a directory
+#                     whose layout is <dir>/<group>/<pkg>/values.yaml (apps/,
+#                     core/, system/, extra/). This is the digest-vendored tree
+#                     main's build baked but never committed.
+#   --dry-run         print the skopeo copies and the host rewrite without doing
+#                     them
+#
+# On success the baked tree's values.yaml files have every SRC_REGISTRY image
+# host rewritten to DST_REGISTRY (digests untouched). The caller (nightly.yaml)
+# then re-pushes that rewritten tree as the GHCR cozystack-packages artifact and
+# repackages the cozy-installer chart against it — this script deliberately does
+# NOT touch the cozystack-packages artifact itself (it is rebuilt downstream
+# from the rewritten content, so a copy here would just be overwritten).
+#
+# Requires: yq (mikefarah), skopeo, sha256sum, and a login to both registries already done.
+set -eu
+
+VERSION="${1:?usage: nightly-mirror.sh <version> <baked-tree-dir> [--dry-run]}"
+TREE="${2:?usage: nightly-mirror.sh <version> <baked-tree-dir> [--dry-run]}"
+DRY_RUN=0
+[ "${3:-}" = "--dry-run" ] && DRY_RUN=1
+
+# Source = the per-CI build registry main pushes to; dest = the public release
+# registry nightlies are served from. Defaults mirror hack/common-envs.mk
+# (REGISTRY) and the CI workflows; override either for a fork.
+SRC_REGISTRY="${SRC_REGISTRY:-iad.ocir.io/idyksih5sir9/cozystack}"
+DST_REGISTRY="${DST_REGISTRY:-ghcr.io/cozystack/cozystack}"
+# Floating tag moved to this nightly in addition to the pinned <version>.
+FLOATING="${FLOATING:-nightly}"
+
+[ -d "$TREE" ] || { echo "baked-tree-dir '$TREE' is not a directory" >&2; exit 1; }
+command -v yq >/dev/null     || { echo "yq (mikefarah) is required" >&2; exit 1; }
+yq --version 2>&1 | grep -q mikefarah || { echo "yq (mikefarah) is required" >&2; exit 1; }
+[ "$DRY_RUN" -eq 1 ] || command -v skopeo >/dev/null || { echo "skopeo is required" >&2; exit 1; }
+[ "$DRY_RUN" -eq 1 ] || command -v sha256sum >/dev/null || { echo "sha256sum is required" >&2; exit 1; }
+
+# Ref collection (which files are scanned, and the YAML shapes within them) is
+# shared with hack/promote-retag.sh and hack/promote-rewrite-tags.sh — see
+# hack/lib/image-refs.sh.
+#
+# Getting the file set right matters twice over here, and worse than it does
+# for the retag. A ref this does not collect is neither mirrored NOR host-
+# rewritten (the rewrite below walks the same file list), so the published
+# tree keeps pointing at the private CI registry — where a retag miss merely
+# leaves an image short of a tag, a mirror miss publishes a nightly whose refs
+# a user may not be able to pull at all. That is precisely what happened to
+# every ref living in an images/*.tag file or stamped into a template while
+# this scanned the depth-2 values.yaml alone.
+# shellcheck source=hack/lib/image-refs.sh
+. "$(dirname "$0")/lib/image-refs.sh"
+
+collect_refs() { collect_image_refs "$TREE"; }
+
+# Split a "<repo>[:<tag>]@sha256:<digest>" ref into repo and digest, stripping
+# the :tag from the LAST path component only so a host :port is preserved.
+ref_repo() {
+  r="${1%@*}"
+  img="${r##*/}"
+  if [ "$r" = "$img" ]; then
+    printf '%s' "${img%:*}"
+  else
+    printf '%s/%s' "${r%/*}" "${img%:*}"
+  fi
+}
+ref_digest() { printf '%s' "${1##*@}"; }
+
+copy() {
+  _src="$1"; _dst="$2"
+  if [ "$DRY_RUN" -eq 1 ]; then
+    echo "DRY-RUN skopeo copy --multi-arch all docker://$_src docker://$_dst"
+    return 0
+  fi
+  skopeo copy --multi-arch all "docker://$_src" "docker://$_dst"
+}
+
+# Normalize to canonical "<repo>@<digest>", keep only SRC_REGISTRY-owned refs
+# (third-party images live in registries this job cannot push to), and drop the
+# cozystack-packages artifact — the caller rebuilds it from the rewritten tree,
+# so copying it here would only be overwritten downstream. Dedup on real identity.
+refs=""
+for raw in $(collect_refs); do
+  [ -n "$raw" ] || continue
+  _repo="$(ref_repo "$raw")"
+  case "$_repo" in
+    "${SRC_REGISTRY}/cozystack-packages") continue ;;
+    "${SRC_REGISTRY}/"*) ;;
+    *) continue ;;
+  esac
+  refs="${refs}${_repo}@$(ref_digest "$raw")
+"
+done
+refs="$(printf '%s' "$refs" | sort -u)"
+[ -n "$refs" ] || { echo "No cozystack-owned digest-pinned image refs found under ${SRC_REGISTRY}/ in '${TREE}' — is this the baked main tree?" >&2; exit 1; }
+
+echo "$refs" | while IFS= read -r ref; do
+  [ -n "$ref" ] || continue
+  src_repo="${ref%@*}"
+  digest="${ref##*@}"
+  # Swap the source host prefix for the dest host; the path tail is identical.
+  dst_repo="${DST_REGISTRY}/${src_repo#"${SRC_REGISTRY}/"}"
+  echo "▸ ${src_repo}  ->  ${dst_repo}  ${digest}"
+  copy "${src_repo}@${digest}" "${dst_repo}:${VERSION}"
+  copy "${src_repo}@${digest}" "${dst_repo}:${FLOATING}"
+  # Verify the dest pinned tag resolves to the exact source digest. Hash the raw
+  # manifest: without --raw, skopeo resolves a multi-arch index to the host
+  # platform's child manifest and reports that digest, which never equals the
+  # index digest the tree pins. A failed inspect hashes the empty input and
+  # fails the comparison, so the pipe cannot fail open.
+  if [ "$DRY_RUN" -eq 0 ]; then
+    got="sha256:$(skopeo inspect --raw "docker://${dst_repo}:${VERSION}" 2>/dev/null | sha256sum | cut -d' ' -f1)"
+    if [ "$got" != "$digest" ]; then
+      echo "::error::${dst_repo}:${VERSION} resolved to '${got}', expected '${digest}'" >&2
+      exit 1
+    fi
+  fi
+done
+
+# Rewrite the image host SRC_REGISTRY -> DST_REGISTRY across the whole baked tree,
+# digests untouched. Only cozystack-owned refs carry the SRC_REGISTRY prefix, so a
+# literal substring replace cannot touch third-party image hosts. Escape the dots
+# so sed matches the literal host, not "any character". This also rewrites the
+# platformSourceUrl (oci://SRC/cozystack-packages -> oci://DST/cozystack-packages);
+# its digest (platformSourceRef) is reset by the caller after the GHCR re-push.
+SRC_ESC=$(printf '%s' "$SRC_REGISTRY" | sed -e 's/[].[^$*/\\]/\\&/g')
+if [ "$DRY_RUN" -eq 1 ]; then
+  # Name the rewrite by intent, not by the `sed -i` idiom the real path stopped
+  # using, and report both expressions it applies: the `<host>/` prefix and the
+  # bare-host scalar. Naming one expression understates what the run touches.
+  echo "DRY-RUN rewrite image host ${SRC_REGISTRY}/ -> ${DST_REGISTRY}/ (and a bare ${SRC_REGISTRY} host scalar -> ${DST_REGISTRY}) over $(image_ref_files "$TREE" | wc -l | tr -d ' ') ref-bearing files under ${TREE}"
+else
+  # Exactly the files collect_refs scanned, via the same enumeration: the set
+  # whose hosts are rewritten must equal the set scanned for images to mirror.
+  # Rewriting a file that was not scanned leaves a dangling ref to an image
+  # never pushed to DST_REGISTRY; scanning a file that is not rewritten leaves
+  # the published tree pointing at the private CI registry. A `find -name
+  # values.yaml` at any depth would do the former to vendored chart defaults.
+  # The second expression reaches one shape the first cannot: a host that is the
+  # *entire* scalar value, with the repository in a sibling key — kubeovn's
+  # `global.registry.address`, now that its image is built here rather than in
+  # cozystack/kubeovn-chart. There is no trailing slash for `<src>/` to match, so
+  # the host survived the rewrite while the image itself was mirrored, publishing
+  # a tree that points at the private CI registry. Anchoring on end-of-line means
+  # it only fires when SRC_REGISTRY is the complete value: a contiguous
+  # `<src>/<repo>@<digest>` ref continues past the host and is left to the first
+  # expression, so the two cannot both fire on one reference.
+  #
+  # Neither expression reaches a host split at any other boundary (`registry:
+  # iad.ocir.io` + `repository: idyksih5sir9/cozystack/<name>`), where no key
+  # holds SRC_REGISTRY as a whole, so no package may stamp that layout.
+  # In-place edit written portably: `sed -i` takes the next argument as the
+  # backup suffix on BSD but as a flag on GNU, so `sed -i -e` diverges between
+  # them. Route the output through a temp file and copy it back over the original
+  # (cat, not mv, keeps the file's inode and permissions). `cat` truncates before
+  # it writes, so an interrupt here can leave a half-written file where `mv` would
+  # not; that is the lesser evil against `mv` stamping mktemp's 0600 onto every
+  # rewritten file in the tree.
+  image_ref_files "$TREE" | while IFS= read -r f; do
+    # `\{0,1\}` rather than the `\?` optional-quantifier: `\?` is a GNU BRE
+    # extension that BSD sed reads as a literal `?`, turning each `["']\?` into
+    # "a quote followed by a literal ?". On macOS that makes the whole expression
+    # dead -- it matches neither a bare host nor a quoted one, not just the bare
+    # case. `\{0,1\}` is POSIX BRE and behaves the same on both.
+    tmp_f=$(mktemp)
+    sed \
+      -e "s|${SRC_ESC}/|${DST_REGISTRY}/|g" \
+      -e "s|\(:[[:space:]]*[\"']\{0,1\}\)${SRC_ESC}\([\"']\{0,1\}\)[[:space:]]*$|\1${DST_REGISTRY}\2|" \
+      "$f" > "$tmp_f"
+    cat "$tmp_f" > "$f"
+    rm -f "$tmp_f"
+  done
+fi
+
+echo "Mirrored cozystack-owned images to ${DST_REGISTRY} (:${VERSION} +:${FLOATING}) and rewrote tree hosts."
diff --git a/hack/nightly-mirror_test.bats b/hack/nightly-mirror_test.bats
new file mode 100644
index 0000000000..376f6b67e3
--- /dev/null
+++ b/hack/nightly-mirror_test.bats
@@ -0,0 +1,394 @@
+#!/usr/bin/env bats
+# Tests for hack/nightly-mirror.sh — the OCIR->GHCR nightly image-mirror selector.
+#
+# Guards the ref selection and host rewrite: only cozystack-owned component
+# images are copied (third-party images and bare upstream tags are skipped, as
+# they live in registries this job cannot push to), the cozystack-packages
+# artifact is deliberately excluded (it is rebuilt downstream from the rewritten
+# tree), and every copy targets the destination registry with the source digest
+# preserved.
+#
+# The compatibility pass uses cozytest's POSIX translator, so expected errors
+# are captured explicitly without Bats-only run/status helpers.
+# Test-level EXIT traps hide Bats' failing TAP results; cleanup follows assertions.
+#
+# Run with: bats hack/nightly-mirror_test.bats
+
+load test_helper
+
+# Build a synthetic baked tree exercising all four image-ref shapes plus the
+# refs that MUST be filtered (third-party host, cozystack-packages artifact).
+_make_tree() {
+  D="$(printf 'a%.0s' $(seq 1 64))"   # 64-hex fake digest body
+  t="$1"
+  mkdir -p "$t/system/foo" "$t/system/bar" "$t/system/split" "$t/system/third" \
+           "$t/system/splithost" "$t/system/digesthost" "$t/system/globalreg" \
+           "$t/system/guarded" "$t/core/installer" \
+           "$t/system/tagfile/images" "$t/system/multus/templates"
+  # storage shape 2: a plain images/*.tag file, read by templates via
+  # .Files.Get rather than through values. Invisible to the depth-2 values.yaml
+  # glob this script used to scan, so it was neither mirrored NOR host-rewritten
+  # — leaving the published nightly tree pointing at the private build registry.
+  printf 'iad.ocir.io/idyksih5sir9/cozystack/tagfile:main@sha256:%s\n' "$D" \
+    > "$t/system/tagfile/images/thing.tag"
+  # storage shape 3: a ref sed'd straight into a vendored upstream manifest.
+  # The path must match IMAGE_REF_EXTRA_FILES in hack/lib/image-refs.sh.
+  printf '          image: iad.ocir.io/idyksih5sir9/cozystack/multus-cni:main@sha256:%s\n' "$D" \
+    > "$t/system/multus/templates/multus-daemonset-thick.yml"
+  # shape 1: single string, cozystack-owned -> copied
+  printf 'image: iad.ocir.io/idyksih5sir9/cozystack/foo:main@sha256:%s\n' "$D" > "$t/system/foo/values.yaml"
+  # shape 2: split map, cozystack-owned -> copied
+  {
+    echo 'image:'
+    echo '  repository: iad.ocir.io/idyksih5sir9/cozystack/bar'
+    echo '  tag: main'
+    printf '  digest: sha256:%s\n' "$D"
+  } > "$t/system/bar/values.yaml"
+  # shape 3: split map with the digest embedded in `tag`, cozystack-owned -> copied.
+  # This is what most package Makefiles write (a single yq call setting .image.tag
+  # to "$(IMAGE_TAG)@$(digest)"), so it is the dominant real-world shape — linstor,
+  # kamaji, kilo, metallb and redis-operator all use it. It matches neither shape 1
+  # (rule 1 sees only the repository-less tag value, which ref_repo() reduces to the
+  # tag) nor shape 2 (no `digest` key), so until it was matched explicitly these
+  # images were silently never mirrored while the host rewrite still repointed them
+  # at the dest registry — a dangling ref that 404s at pull time.
+  {
+    echo 'image:'
+    echo '  repository: iad.ocir.io/idyksih5sir9/cozystack/split'
+    printf '  tag: main@sha256:%s\n' "$D"
+  } > "$t/system/split/values.yaml"
+  # third-party single string -> skipped, and a NUMERIC tag in the same file as a
+  # cozystack-owned shape-3 ref. `tag: 123` is ordinary YAML, but yq's test()
+  # aborts on a non-string ("cannot match with !!int"), and collect_refs swallows
+  # stderr and status — so without a type guard this abort discards the shape-3
+  # ref alongside it and `numeric` is silently never mirrored. Co-locating the two
+  # in one file is the point: the failure is per-file, not per-value.
+  {
+    printf 'image: docker.io/clastix/kubectl:1.0@sha256:%s\n' "$D"
+    echo 'vendored:'
+    echo '  image:'
+    echo '    repository: docker.io/vendor/thing'
+    echo '    tag: 123'
+    echo 'ours:'
+    echo '  image:'
+    echo '    repository: iad.ocir.io/idyksih5sir9/cozystack/numeric'
+    printf '    tag: main@sha256:%s\n' "$D"
+  } > "$t/system/third/values.yaml"
+  # shapes 2 and 3 with the host split into a sibling `registry` key instead of
+  # living inside `repository` — the layout keycloak-operator shipped. Rejoining
+  # the two is what keeps the ref recognisable: emitting the bare `repository`
+  # yields a host-less ref that the SRC_REGISTRY filter discards as third-party,
+  # the same silent drop shape 3 exists to fix. Worse here than in promote-retag,
+  # because the closing host rewrite matches the literal "$SRC_REGISTRY/" string
+  # and a split-out host does not contain it: the ref would be neither copied nor
+  # rewritten, publishing a tree that points at the private CI registry.
+  {
+    echo 'image:'
+    echo '  registry: iad.ocir.io'
+    echo '  repository: idyksih5sir9/cozystack/splithost'
+    printf '  tag: main@sha256:%s\n' "$D"
+  } > "$t/system/splithost/values.yaml"
+  {
+    echo 'image:'
+    echo '  registry: iad.ocir.io'
+    echo '  repository: idyksih5sir9/cozystack/digesthost'
+    echo '  tag: main'
+    printf '  digest: sha256:%s\n' "$D"
+  } > "$t/system/digesthost/values.yaml"
+  # shape 4: the host is a document-level key (global.registry.address) and the
+  # image map carries only a bare repository — kube-ovn's wrapper chart, whose
+  # own `make image` in cozystack/kubeovn-chart writes exactly this layout. The
+  # co-located `other` block is a chart-level image with no digest: it must not
+  # be emitted at all, proving the rule filters within global.images rather than
+  # blanket-prefixing every entry with the registry address.
+  {
+    echo 'global:'
+    echo '  registry:'
+    echo '    address: iad.ocir.io/idyksih5sir9/cozystack'
+    echo '  images:'
+    echo '    globalreg:'
+    echo '      repository: globalreg'
+    printf '      tag: v1.2.3@sha256:%s\n' "$D"
+    echo '    other:'
+    echo '      repository: other'
+    echo '      tag: v1.2.3'
+  } > "$t/system/globalreg/values.yaml"
+  # A map-typed `repository` co-located with an owned ref. This is the one
+  # non-string type that actually breaks the concat rules: yq coerces int, bool,
+  # null and seq on `+`, but a !!map raises "!!str () cannot be added to a
+  # !!map", and because collect_refs swallows stderr and status that abort would
+  # take every ref in this file with it. Same per-file blast radius as the
+  # numeric-tag case above, different trigger — so `survivor` must still be
+  # mirrored.
+  {
+    echo 'broken:'
+    echo '  image:'
+    echo '    repository:'
+    echo '      nested: oops'
+    printf '    tag: main@sha256:%s\n' "$D"
+    echo 'ours:'
+    echo '  image:'
+    echo '    repository: iad.ocir.io/idyksih5sir9/cozystack/survivor'
+    printf '    tag: main@sha256:%s\n' "$D"
+  } > "$t/system/guarded/values.yaml"
+  # shape 5: operator (cozystack-owned -> copied) + platformSource (cozystack-packages -> skipped)
+  {
+    echo 'cozystackOperator:'
+    printf '  image: iad.ocir.io/idyksih5sir9/cozystack/cozystack-operator:main@sha256:%s\n' "$D"
+    echo '  platformSourceUrl: oci://iad.ocir.io/idyksih5sir9/cozystack/cozystack-packages'
+    printf '  platformSourceRef: "digest=sha256:%s"\n' "$D"
+  } > "$t/core/installer/values.yaml"
+}
+
+# _stub_registry <bin-dir> — skopeo and sha256sum stubs for a registry whose
+# dest tags hold a multi-arch index. `inspect --raw` returns the index bytes
+# ($MOCK_RAW, default "index-manifest"), which sha256sum maps to $D, the digest
+# the tree pins. A plain `inspect` reports a different digest, the one skopeo
+# picks for the host platform's child manifest, so a verification that reads
+# it instead of hashing the raw index fails. Call after _make_tree sets $D.
+_stub_registry() {
+  mkdir -p "$1"
+  {
+    echo '#!/bin/sh'
+    echo 'case "$1" in'
+    echo '  inspect)'
+    echo '    for a in "$@"; do [ "$a" = --raw ] && { printf "%s" "${MOCK_RAW:-index-manifest}"; exit 0; }; done'
+    printf '    echo "sha256:%s" ;;\n' "$(printf 'b%.0s' $(seq 1 64))"
+    echo '  *) exit 0 ;;'
+    echo 'esac'
+  } > "$1/skopeo"
+  {
+    echo '#!/bin/sh'
+    printf '[ "$(cat)" = index-manifest ] && echo "%s  -" || echo "%s  -"\n' "$D" "$(printf 'c%.0s' $(seq 1 64))"
+  } > "$1/sha256sum"
+  chmod +x "$1/skopeo" "$1/sha256sum"
+}
+
+@test "dry-run mirrors only cozystack-owned component images to the dest registry" {
+  tmp=$(mktemp -d)
+  _make_tree "$tmp/tree"
+
+  rc=0
+  hack/nightly-mirror.sh 0.0.0-nightly.test "$tmp/tree" --dry-run \
+    >"$tmp/out" 2>"$tmp/err" || rc=$?
+  if [ "$rc" -ne 0 ]; then
+    echo "nightly-mirror.sh exited $rc; yq: $(yq --version 2>&1)" >&2
+    echo "--- stderr ---" >&2; cat "$tmp/err" >&2
+    echo "--- stdout ---" >&2; cat "$tmp/out" >&2
+    return "$rc"
+  fi
+
+  # The four cozystack-owned component images are each copied to GHCR by digest.
+  grep -q 'docker://iad.ocir.io/idyksih5sir9/cozystack/foo@sha256:.* docker://ghcr.io/cozystack/cozystack/foo:0.0.0-nightly.test' "$tmp/out"
+  grep -q 'docker://ghcr.io/cozystack/cozystack/bar:0.0.0-nightly.test' "$tmp/out"
+  grep -q 'docker://ghcr.io/cozystack/cozystack/cozystack-operator:0.0.0-nightly.test' "$tmp/out"
+  # shape 3 — the source ref must carry the REPOSITORY, not the bare tag: a rule
+  # that matched the tag alone would plan a copy from "main@sha256:..." and be
+  # dropped as non-SRC_REGISTRY, so assert the full source ref, not just the dest.
+  grep -q 'docker://iad.ocir.io/idyksih5sir9/cozystack/split@sha256:.* docker://ghcr.io/cozystack/cozystack/split:0.0.0-nightly.test' "$tmp/out"
+  # A shape-3 ref sharing a file with a non-string tag survives — see _make_tree.
+  grep -q 'docker://ghcr.io/cozystack/cozystack/numeric:0.0.0-nightly.test' "$tmp/out"
+  # Split-out host (`registry` sibling / global.registry.address). Assert the
+  # full source ref for the same reason shape 3 does: a rule that dropped the
+  # host would plan a copy from a host-less repository, which is filtered out
+  # rather than reported, so checking only the destination proves nothing.
+  grep -q 'docker://iad.ocir.io/idyksih5sir9/cozystack/splithost@sha256:.* docker://ghcr.io/cozystack/cozystack/splithost:0.0.0-nightly.test' "$tmp/out"
+  grep -q 'docker://iad.ocir.io/idyksih5sir9/cozystack/digesthost@sha256:.* docker://ghcr.io/cozystack/cozystack/digesthost:0.0.0-nightly.test' "$tmp/out"
+  grep -q 'docker://iad.ocir.io/idyksih5sir9/cozystack/globalreg@sha256:.* docker://ghcr.io/cozystack/cozystack/globalreg:0.0.0-nightly.test' "$tmp/out"
+  # The digest-less sibling under global.images is not invented into a ref.
+  if grep -q '/other' "$tmp/out"; then echo "FAIL: a digest-less entry must not be invented into a ref"; false; fi
+  # An owned ref sharing a file with a map-typed `repository` survives.
+  grep -q 'docker://ghcr.io/cozystack/cozystack/survivor:0.0.0-nightly.test' "$tmp/out"
+  # A floating tag is moved alongside the pinned version.
+  grep -q 'docker://ghcr.io/cozystack/cozystack/foo:nightly' "$tmp/out"
+
+  # Third-party images never appear in the copy plan.
+  if grep -q 'docker.io/clastix' "$tmp/out"; then echo "FAIL: a third-party image must not be mirrored"; false; fi
+  if grep -q 'docker.io/vendor' "$tmp/out"; then echo "FAIL: a third-party image must not be mirrored"; false; fi
+  # The cozystack-packages artifact is excluded — it is rebuilt downstream.
+  if grep -qE 'skopeo copy.*cozystack-packages' "$tmp/out"; then echo "FAIL: the packages artifact must not be mirrored"; false; fi
+
+  # The host rewrite is planned source->dest, reported by intent for both
+  # expressions the real path applies: the '<host>/' prefix and the bare-host
+  # scalar. The message must not name `sed -i` -- the path no longer uses it.
+  grep -Fq "rewrite image host iad.ocir.io/idyksih5sir9/cozystack/ -> ghcr.io/cozystack/cozystack/" "$tmp/out"
+  grep -Fq "bare iad.ocir.io/idyksih5sir9/cozystack host scalar -> ghcr.io/cozystack/cozystack" "$tmp/out"
+  if grep -q 'sed -i' "$tmp/out"; then
+    echo "FAIL: dry-run still names sed -i" >&2
+    false
+  fi
+  rm -rf "$tmp"
+}
+
+@test "empty selection (wrong source registry) exits non-zero with a diagnostic" {
+  tmp=$(mktemp -d)
+  _make_tree "$tmp/tree"
+
+  # No images live under example.com/nope, so nothing is selected and the script
+  # exits non-zero rather than silently mirroring an empty set.
+  rc=0
+  SRC_REGISTRY="example.com/nope" hack/nightly-mirror.sh 0.0.0-nightly.test "$tmp/tree" --dry-run \
+    >"$tmp/out" 2>"$tmp/err" || rc=$?
+
+  [ "$rc" -ne 0 ]
+  grep -q 'No cozystack-owned digest-pinned image refs found' "$tmp/err"
+  rm -rf "$tmp"
+}
+
+@test "mirrors refs stored in .tag files and declared templates" {
+  # A miss here is worse than the equivalent miss in promote-retag: the host
+  # rewrite walks the same file list as the collection, so an uncollected ref is
+  # also unrewritten and the published tree keeps pointing at the private build
+  # registry. Both shapes below were invisible while this scanned the depth-2
+  # values.yaml alone.
+  tmp=$(mktemp -d)
+  _make_tree "$tmp/tree"
+
+  hack/nightly-mirror.sh 0.0.0-nightly.test "$tmp/tree" --dry-run \
+    >"$tmp/out" 2>"$tmp/err"
+
+  grep -q 'docker://ghcr.io/cozystack/cozystack/tagfile:0.0.0-nightly.test' "$tmp/out"
+  grep -q 'docker://ghcr.io/cozystack/cozystack/multus-cni:0.0.0-nightly.test' "$tmp/out"
+  rm -rf "$tmp"
+}
+
+@test "the host rewrite and the mirror walk the same file list" {
+  # The two sets must be equal. A file rewritten but not mirrored leaves a
+  # dangling ref to an image never pushed to the dest registry; a file mirrored
+  # but not rewritten leaves the private host in the published tree. Both
+  # derive from image_ref_files now, so assert it reaches all three shapes.
+  #
+  # Scope, so the name does not overclaim: this pins WHICH FILES the rewrite
+  # visits, not that every ref inside them is successfully rewritten. The sed
+  # itself only runs outside --dry-run (it needs skopeo); the whole-value
+  # shape (kubeovn) and keycloak-operator's empty `registry` are covered by
+  # the dedicated tests below.
+  tmp=$(mktemp -d)
+  _make_tree "$tmp/tree"
+
+  . hack/lib/image-refs.sh
+  files=$(image_ref_files "$tmp/tree")
+
+  echo "$files" | grep -q '/system/foo/values.yaml$'
+  echo "$files" | grep -q '/system/tagfile/images/thing.tag$'
+  echo "$files" | grep -q '/system/multus/templates/multus-daemonset-thick.yml$'
+  rm -rf "$tmp"
+}
+
+@test "the host rewrite reaches a host that is the whole scalar value" {
+  # kubeovn keeps its host in global.registry.address with the repository in a
+  # sibling key, so there is no trailing slash for the literal "<src>/" replace
+  # to match. The image was mirrored, the host was not rewritten, and the
+  # published tree kept pointing at the private CI registry. Dormant while the
+  # image was built in cozystack/kubeovn-chart; live once it is built here.
+  #
+  # Needs a skopeo stub because the sed only runs outside --dry-run. Scope: this
+  # covers the whole-value shape only.
+  tmp=$(mktemp -d)
+  _make_tree "$tmp/tree"
+
+  # The script verifies every dest tag resolves to the source digest and aborts
+  # before the rewrite otherwise, so the registry stub has to answer with it.
+  _stub_registry "$tmp/bin"
+
+  PATH="$tmp/bin:$PATH" hack/nightly-mirror.sh 0.0.0-nightly.test "$tmp/tree"
+
+  # the whole-value host is rewritten, and the repository beside it is untouched
+  grep -q '^    address: ghcr.io/cozystack/cozystack$' "$tmp/tree/system/globalreg/values.yaml"
+  grep -q '^      repository: globalreg$' "$tmp/tree/system/globalreg/values.yaml"
+  if grep -q 'iad.ocir.io' "$tmp/tree/system/globalreg/values.yaml"; then echo "FAIL: the source registry host must not survive the rewrite"; false; fi
+
+  # a contiguous ref is still rewritten exactly once, not double-prefixed
+  grep -q '^image: ghcr.io/cozystack/cozystack/foo:main@sha256:' "$tmp/tree/system/foo/values.yaml"
+
+  # third-party hosts are left alone
+  grep -q 'docker.io/clastix/kubectl' "$tmp/tree/system/third/values.yaml"
+  rm -rf "$tmp"
+}
+
+@test "the dest tag is verified against the index digest, not the host platform's child" {
+  # Once main publishes multi-arch indexes, the tree pins index digests. Plain
+  # `skopeo inspect` reports the digest of the child manifest for the host
+  # platform, which never equals the index digest, so every mirror would fail
+  # its own verification. The stub reports that child digest for a plain inspect.
+  tmp=$(mktemp -d)
+  _make_tree "$tmp/tree"
+  _stub_registry "$tmp/bin"
+
+  PATH="$tmp/bin:$PATH" hack/nightly-mirror.sh 0.0.0-nightly.test "$tmp/tree"
+
+  # A dest tag holding different bytes still fails the verification.
+  _make_tree "$tmp/tree2"
+  rc=0
+  PATH="$tmp/bin:$PATH" MOCK_RAW=something-else hack/nightly-mirror.sh 0.0.0-nightly.test "$tmp/tree2" 2>"$tmp/err" || rc=$?
+  [ "$rc" -ne 0 ]
+  grep -q "expected 'sha256:$D'" "$tmp/err"
+  rm -rf "$tmp"
+}
+
+@test "the host rewrite reaches a host kept in repository beside an empty registry" {
+  # keycloak-operator's layout: the upstream chart joins `registry` and
+  # `repository`, so the package sets `registry: ""` and keeps the whole host in
+  # `repository`, where the literal "<src>/" replace can reach it. The image
+  # must be both mirrored and rewritten, or the published tree points at an
+  # image the dest registry does not have or at the private CI registry.
+  tmp=$(mktemp -d)
+  _make_tree "$tmp/tree"
+  mkdir -p "$tmp/tree/system/emptyreg"
+  {
+    echo 'image:'
+    echo '  registry: ""'
+    echo '  repository: iad.ocir.io/idyksih5sir9/cozystack/emptyreg'
+    printf '  tag: main@sha256:%s\n' "$D"
+  } > "$tmp/tree/system/emptyreg/values.yaml"
+
+  _stub_registry "$tmp/bin"
+
+  hack/nightly-mirror.sh 0.0.0-nightly.test "$tmp/tree" --dry-run >"$tmp/out"
+  grep -q 'docker://ghcr.io/cozystack/cozystack/emptyreg:0.0.0-nightly.test' "$tmp/out"
+
+  PATH="$tmp/bin:$PATH" hack/nightly-mirror.sh 0.0.0-nightly.test "$tmp/tree"
+  grep -q '^  repository: ghcr.io/cozystack/cozystack/emptyreg$' "$tmp/tree/system/emptyreg/values.yaml"
+  grep -q '^  registry: ""$' "$tmp/tree/system/emptyreg/values.yaml"
+  rm -rf "$tmp"
+}
+
+@test "keycloak-operator's stamped image reaches the nightly mirror and its host rewrite" {
+  # Runs the package's real `image:` recipe against the CI build registry and
+  # then the mirror over the result, so a regression in either the values
+  # layout or the Makefile stamp fails here. The chart joins `registry` and
+  # `repository`; if the host moves back into `registry`, or the recipe stops
+  # stamping `repository`, the stamped ref no longer carries the build host
+  # contiguously and is either never mirrored or left pointing at it.
+  D="$(printf 'c%.0s' $(seq 1 64))"
+  tmp=$(mktemp -d)
+  mkdir -p "$tmp/repo/packages/system" "$tmp/bin"
+  cp -R packages/system/keycloak-operator "$tmp/repo/packages/system/"
+  ln -s "$PWD/hack" "$tmp/repo/hack"
+
+  # docker stub: only writes the buildx metadata file the recipe reads.
+  {
+    echo '#!/bin/sh'
+    echo 'while [ $# -gt 0 ]; do'
+    echo '  if [ "$1" = --metadata-file ]; then'
+    printf '    printf %s > "$2"\n' "'{\"containerimage.digest\":\"sha256:$D\"}'"
+    echo '  fi'
+    echo '  shift'
+    echo 'done'
+  } > "$tmp/bin/docker"
+  chmod +x "$tmp/bin/docker"
+  _stub_registry "$tmp/bin"
+
+  PATH="$tmp/bin:$PATH" make --no-print-directory -s -C "$tmp/repo/packages/system/keycloak-operator" image \
+    REGISTRY=iad.ocir.io/idyksih5sir9/cozystack IMAGE_TAG=main COZYSTACK_VERSION=0.0.0 >/dev/null
+
+  hack/nightly-mirror.sh 0.0.0-nightly.test "$tmp/repo/packages" --dry-run >"$tmp/out"
+  grep -q 'docker://ghcr.io/cozystack/cozystack/keycloak-operator:0.0.0-nightly.test' "$tmp/out"
+
+  PATH="$tmp/bin:$PATH" hack/nightly-mirror.sh 0.0.0-nightly.test "$tmp/repo/packages"
+  if grep -q 'iad.ocir.io' "$tmp/repo/packages/system/keycloak-operator/values.yaml"; then
+    echo "the build registry host survived the nightly rewrite" >&2
+    false
+  fi
+  rm -rf "$tmp"
+}
diff --git a/hack/overlay-main-images.sh b/hack/overlay-main-images.sh
new file mode 100755
index 0000000000..2c13e34e15
--- /dev/null
+++ b/hack/overlay-main-images.sh
@@ -0,0 +1,198 @@
+#!/bin/sh
+# Overlay current-main image references onto packages a PR did NOT rebuild.
+#
+# Source of truth: the cozystack-packages:main OCI artifact build-main.yaml
+# already publishes (`make build` -> packages/core/installer image-packages does
+# `flux push artifact oci://$REGISTRY/cozystack-packages:main --path=packages`).
+# That artifact is the ENTIRE current-main packages tree with every image
+# reference digest-pinned to the images build-main just pushed.
+#
+# We walk EVERY ref-bearing file (values.yaml + images/*.tag) in that tree and
+# overlay the repo's copy when it differs only in image-reference lines. This is
+# deliberately driven by the artifact, NOT the per-package build matrix, so it
+# covers the WHOLE first-party tree — apps/, system/, core/, AND extra/,
+# library/, ... For any file build-main did not rebuild, the artifact copy is
+# byte-identical to the committed copy and is skipped; only files carrying a
+# rebuilt current-main digest differ and get overlaid. So a fix merged to ANY
+# first-party image (e.g. the objectstorage-sidecar ref under extra/seaweedfs)
+# takes effect in e2e and the installer artifact, instead of the frozen
+# last-release refs committed in the repo (e.g. v1.5.0).
+#
+# Skipped:
+#   - units the PR itself rebuilt (BUILT_JSON, the plan job's matrix): their
+#     pr-<N>-<sha> refs, already applied in finalize, are authoritative.
+#   - packages the PR EDITED (TOUCHED, the plan job's changed-package dirs): the
+#     PR's committed refs are its intent (e.g. an upstream image bump in a
+#     non-build-unit package), so they must win over the artifact — never overlay.
+#   - packages/core/talos and packages/core/installer: owned by dedicated jobs
+#     (the input-gated build-talos job / the finalize installer build), so their
+#     own files are never overlaid. A successful Talos job also adds its actual
+#     output package, packages/extra/bootbox, to BUILT_JSON at the call site.
+#   - vendored charts/ subtrees: upstream chart values we do not build.
+#
+# Surgical + self-validating: a file is overlaid only when every line that
+# differs from the current-main version is image-reference-bearing. The repo's
+# committed refs use the release registry (ghcr) while the artifact uses the CI
+# registry (OCIR), so refs differ in registry host / tag / digest — and charts
+# split those across separate lines (`repository:`, `tag:`, `digest:`), not all
+# of which carry '@sha256:'. So a changed line counts as image-related if it
+# carries '@sha256:', its key is image/repository/registry/tag/digest, its key
+# ends in `image`/`Image` and its value holds a repository path, or it is a
+# `--…-image=` arg (see the img_line comment for why each). A blank line is not
+# a change: `yq -i`, which every `make image` uses to stamp the ref, drops one.
+# If any OTHER line differs — the PR branched from a
+# main whose config for that file differs from the artifact's base — the file is
+# left on its committed ref (safe degradation, logged, never fatal). CI checks
+# out the pull_request merge commit (current main + PR), so for an unbuilt file
+# the config already matches current main and only ref lines differ.
+#
+# Usage: hack/overlay-main-images.sh <mainpkgs-dir> <built-matrix-json> [touched-pkg-dirs]
+#        <mainpkgs-dir>     = extracted cozystack-packages:main tree; its root holds
+#                             apps/ system/ core/ extra/ ... (the CONTENTS of
+#                             packages/).
+#        <built-matrix-json> = JSON array of package dirs the PR rebuilt (skipped).
+#        [touched-pkg-dirs]  = whitespace-separated package dirs the PR edited
+#                             (no trailing slash); their committed refs are kept.
+#        (run from the repo root)
+set -eu
+
+MAINPKGS="${1:?usage: overlay-main-images.sh <mainpkgs-dir> <built-matrix-json> [touched-pkg-dirs]}"
+MAINPKGS="${MAINPKGS%/}"
+BUILT_JSON="${2:-[]}"
+# Package dirs the PR itself EDITED (whitespace-separated, no trailing slash).
+# Their committed refs ARE the PR's intent — e.g. an upstream image bump in a
+# package that is NOT a build unit (keycloak, cert-manager, ingress-nginx, …) —
+# so they must win over the artifact. Without this, such an edit differs from the
+# artifact only on image-reference lines, the drift check passes, and the overlay
+# would silently revert the PR's bump (e2e then tests the stale image). The plan
+# job derives this from `git diff --name-only` and passes it via env, not from
+# untrusted PR input.
+TOUCHED="${3:-}"
+
+if [ ! -d "$MAINPKGS" ]; then
+  echo "No current-main packages tree at $MAINPKGS — unbuilt packages keep committed refs"
+  exit 0
+fi
+
+# Dirs whose files must never be overlaid: the two units owned by dedicated
+# jobs, every unit the PR rebuilt, and every package the PR edited (its committed
+# refs are the PR's intent). Space-wrapped for whole-token matching.
+skip=" packages/core/talos packages/core/installer $(echo "$BUILT_JSON" | tr -d '[]"' | tr ',' ' ') $TOUCHED "
+
+# A changed line is image-reference-bearing if it carries a full ref (@sha256:),
+# is a split ref key (image/repository/registry/tag/digest), a prefixed *Image
+# key holding a repository path, or a `--…-image=` arg.
+#
+# The prefixed-key branch exists because a chart that renders several images
+# names the extra ones after what they are for — chBackupClientImage,
+# rabbitmqBackupClientImage, redisBackupClientImage. Those used to pass only
+# through the `@sha256:` branch, so one pinned by tag alone read as a config
+# change and cost its WHOLE file the overlay: that is how
+# backupstrategy-controller kept serving a release image two months older than
+# the tree in every lane that did not rebuild it (#4257).
+#
+# Two things keep that branch narrow, and neither is the trailing `:`. The
+# `[A-Za-z]+` demands a letter BEFORE `image`, which a key that begins with it
+# has nothing to put there — that, not the colon, is why `imagePullPolicy:` and
+# `imagePullSecrets:` do not match, with the colon or without it. The colon
+# earns its place on the other side: it is where the value scan starts, so
+# `clientImage: "ghcr.io/…"` stops matching if it goes, which is what the test
+# named "a suffixed image key is a ref, not a config change" holds. And the value has to contain a `/`, which a repository path always
+# does and an operator-settable knob named after an image does not: `vddkImage: ""`
+# (core/platform, migration-controller) is configuration the build never
+# stamps, and taking it from the artifact in silence is the opposite of what
+# this script is for. The exact-key branch keeps no such requirement, because
+# `tag:` and `digest:` legitimately hold values with no slash in them.
+img_line='(@sha256:|^[[:space:]]*(- )?(image|repository|registry|tag|digest):|^[[:space:]]*(- )?[A-Za-z]+[Ii]mage:[[:space:]]*"?[^"[:space:]]*/|--[A-Za-z-]*image=)'
+
+# ...and, in an images/*.tag file only, a bare reference: a whole line that is
+# one ref with no YAML key around it, which is the entire format of that file
+# (hack/lib/image-refs.sh: "a plain file holding one ref"). Every branch above
+# needs either a key or an `@sha256:`, and a .tag file carries neither until a
+# build stamps it, so an unstamped one is classified as a non-ref change, the
+# drift guard keeps the committed ref, and the overlay never replaces the
+# placeholder it exists to replace. 17 of the 19 .tag files in the tree pass on
+# `@sha256:` alone, which is why this went unnoticed; the exception that proves
+# it is packages/extra/seaweedfs/images/seaweedfs-cosi-driver.tag, digest-less
+# but third-party, so build-main never rebuilds it, the artifact copy is
+# byte-identical and this test is never reached.
+#
+# Scoped to *.tag because only there is a whole line known to be a reference and
+# nothing else. An unkeyed line in a values.yaml is genuinely unclassifiable and
+# must keep counting as drift. hack/promote-rewrite-tags.sh carries a second
+# match branch for this same shape and for this same reason.
+bare_ref_line='^[^[:space:]#][^[:space:]]*/[^[:space:]]+$'
+
+overlaid=0
+same=0
+skipped=0
+drift=0
+drift_files=""
+failed=0
+# Walk the artifact's ref-bearing files, pruning vendored charts/ subtrees.
+# `for … in $(find)` (not a pipe) keeps the counters in this shell; package
+# paths and filenames carry no spaces (same assumption as hack/build-matrix.sh).
+for new in $(find "$MAINPKGS" -type d -name charts -prune -o \
+                  \( -name values.yaml -o -name '*.tag' \) -type f -print 2>/dev/null); do
+  # Artifact root == contents of packages/, so map back by re-adding the prefix.
+  cur="packages/${new#"$MAINPKGS"/}"
+
+  in_skip=0
+  for d in $skip; do
+    case "$cur" in "$d"/*) in_skip=1; break ;; esac
+  done
+  if [ "$in_skip" -eq 1 ]; then
+    skipped=$((skipped + 1))
+    continue
+  fi
+
+  [ -f "$cur" ] || continue           # not in the PR tree -> don't introduce it
+  cmp -s "$cur" "$new" && { same=$((same + 1)); continue; }
+
+  # Blank lines are dropped before the test. `yq -i` does not preserve them:
+  # stamping a digest re-emits the document, and a blank line separating two
+  # top-level keys does not come back. The stamp therefore changes a file the
+  # PR never touched, on a line carrying no configuration at all, and the whole
+  # file loses its overlay for it. That is not a corner case -- on the run
+  # behind #4265 it was the entire remaining drift list: core/platform,
+  # cozystack-api, dashboard, kubeovn-webhook and linstor-gui each differed
+  # from the artifact by one blank line and their own ref, nothing else.
+  line_pat="$img_line"
+  case "$cur" in *.tag) line_pat="($img_line)|($bare_ref_line)" ;; esac
+
+  if diff "$cur" "$new" | sed -n 's/^[<>] //p' \
+      | grep -vE '^[[:space:]]*$' | grep -qvE "$line_pat"; then
+    echo "drift (non-ref change) in $cur -> keeping committed ref"
+    drift=$((drift + 1))
+    # Name the PACKAGE, not the directory the file happens to sit in: an
+    # images/*.tag drift would otherwise read as "<pkg>/images", which is not
+    # something anyone can go and look at.
+    d=$(dirname "${cur#packages/}")
+    drift_files="$drift_files ${d%/images}"
+    continue
+  fi
+
+  if cp "$new" "$cur"; then
+    echo "overlay: $cur -> current-main"
+    overlaid=$((overlaid + 1))
+  else
+    echo "WARN: cp failed for $cur (keeping committed ref)"
+    failed=$((failed + 1))
+  fi
+done
+
+echo "Overlay current-main images: overlaid=$overlaid same=$same skipped(rebuilt/owned/edited)=$skipped drift=$drift failed=$failed"
+
+# Keeping the committed ref is the safe answer to a config that does not match
+# the artifact, but it is not a neutral one: that component then runs its last
+# RELEASE image in a lane whose job is to exercise the tree under review. Said
+# once per file among hundreds of overlay lines, it reads as bookkeeping. Said
+# once at the end, with the packages named, it is the first thing to check when
+# a suite fails on behaviour the diff plainly contains — which is what #4257
+# cost three unrelated PRs, one round each.
+if [ "$drift" -gt 0 ]; then
+  drift_pkgs=$(echo "$drift_files" | tr ' ' '\n' | grep -v '^$' | sort -u)
+  printf '::warning title=Image overlay drift::%s package(s) kept committed release refs, so they run release images in this lane rather than current main: %s\n' \
+    "$(printf '%s\n' "$drift_pkgs" | wc -l | tr -d ' ')" \
+    "$(printf '%s' "$drift_pkgs" | tr '\n' ' ' | sed 's/ $//')"
+fi
diff --git a/hack/overlay-main-images_test.bats b/hack/overlay-main-images_test.bats
new file mode 100644
index 0000000000..7cff2d8428
--- /dev/null
+++ b/hack/overlay-main-images_test.bats
@@ -0,0 +1,504 @@
+#!/usr/bin/env bats
+# Unit tests for hack/overlay-main-images.sh — the PR-finalize step that points
+# packages a PR did NOT rebuild at the current-main images from the
+# cozystack-packages:main artifact.
+#
+# Run from the repo root with `make bats-unit-tests`, or directly with
+# `bats hack/overlay-main-images_test.bats`. The legacy `hack/cozytest.sh`
+# runner remains a supported compatibility path.
+#
+# Each fixture test builds a throwaway tree: a `packages/` tree on release
+# (ghcr/v1.5.0) refs, and a `main/` dir standing in for the extracted
+# cozystack-packages:main artifact (root = contents of packages/) on current-main
+# (OCIR/:main) refs. $root is the real repo, captured before cd.
+#
+# Test-level EXIT traps replace Bats' own handler and hide failing TAP results.
+# Cleanup follows aborting assertions; see docs/agents/e2e-testing.md.
+# Leave the fixture directory before deleting it so the shell retains a cwd.
+
+load test_helper
+
+@test "overlays an unbuilt unit (.tag) to current-main and reports it" {
+  root=$(pwd)
+  w=$(mktemp -d)
+  mkdir -p "$w/packages/apps/foo/images" "$w/main/apps/foo/images"
+  echo 'ghcr.io/cozystack/cozystack/foo:v1.5.0@sha256:aaaa' > "$w/packages/apps/foo/images/foo.tag"
+  echo 'iad.ocir.io/x/cozystack/foo:main@sha256:bbbb'       > "$w/main/apps/foo/images/foo.tag"
+  cd "$w"
+  out=$("$root/hack/overlay-main-images.sh" main '[]')
+  grep -q 'foo:main@sha256:bbbb' packages/apps/foo/images/foo.tag
+  echo "$out" | grep -q 'overlaid=1'
+  cd "$root"
+  rm -rf "$w"
+}
+
+@test "overlays an UNSTAMPED .tag placeholder (bare ref, no key and no digest)" {
+  # The shape a newly onboarded first-party image is committed in, before any
+  # build has stamped it. Its one line carries no YAML key and no @sha256, so the
+  # generic classifier reads it as a non-ref change and the drift guard keeps it,
+  # leaving in the tree a reference no registry serves, for every later PR that
+  # does not rebuild that package. No EXIT trap here: see the cleanup note at the
+  # top of this file; on failure the scratch dir survives for inspection.
+  root=$(pwd)
+  w=$(mktemp -d)
+  mkdir -p "$w/packages/apps/newpkg/images" "$w/main/apps/newpkg/images"
+  echo 'ghcr.io/cozystack/cozystack/newpkg:v0.0.0'       > "$w/packages/apps/newpkg/images/newpkg.tag"
+  echo 'iad.ocir.io/x/cozystack/newpkg:main@sha256:bbbb' > "$w/main/apps/newpkg/images/newpkg.tag"
+  cd "$w"
+  out=$("$root/hack/overlay-main-images.sh" main '[]')
+  grep -q 'newpkg:main@sha256:bbbb' packages/apps/newpkg/images/newpkg.tag
+  echo "$out" | grep -q 'drift=0'
+  cd "$root"; rm -rf "$w"
+}
+
+@test "keeps a .tag whose NON-ref line differs (the bare-ref rule is scoped, not blanket)" {
+  # The bare-ref rule says a whole line that is one ref counts as a ref line in a
+  # .tag file. It must not become "every line in a .tag file is a ref": a line
+  # the classifier cannot read is still drift, there as anywhere else.
+  root=$(pwd)
+  w=$(mktemp -d)
+  mkdir -p "$w/packages/apps/noted/images" "$w/main/apps/noted/images"
+  printf '# pinned by hand, see #1234\nghcr.io/cozystack/cozystack/noted:v1.5.0@sha256:aaaa\n' > "$w/packages/apps/noted/images/noted.tag"
+  printf '# pinned by hand, see #5678\niad.ocir.io/x/cozystack/noted:main@sha256:bbbb\n'       > "$w/main/apps/noted/images/noted.tag"
+  cd "$w"
+  out=$("$root/hack/overlay-main-images.sh" main '[]')
+  grep -q 'noted:v1.5.0@sha256:aaaa' packages/apps/noted/images/noted.tag
+  echo "$out" | grep -q 'drift=1'
+  cd "$root"; rm -rf "$w"
+}
+
+@test "overlays a split-form ref (repository/tag/digest, no @sha256 on those lines)" {
+  root=$(pwd)
+  w=$(mktemp -d)
+  mkdir -p "$w/packages/system/split" "$w/main/system/split"
+  printf 'image:\n  repository: ghcr.io/cozystack/cozystack/split\n  tag: v1.5.0\n  digest: "sha256:aaaa"\n' > "$w/packages/system/split/values.yaml"
+  printf 'image:\n  repository: iad.ocir.io/x/cozystack/split\n  tag: main\n  digest: "sha256:bbbb"\n'      > "$w/main/system/split/values.yaml"
+  cd "$w"
+  "$root/hack/overlay-main-images.sh" main '[]'
+  grep -q 'repository: iad.ocir.io/x/cozystack/split' packages/system/split/values.yaml
+  grep -q 'tag: main' packages/system/split/values.yaml
+  grep -q 'sha256:bbbb' packages/system/split/values.yaml
+  cd "$root"
+  rm -rf "$w"
+}
+
+@test "overlays an extra/* unit (outside the per-package build matrix)" {
+  root=$(pwd)
+  w=$(mktemp -d)
+  mkdir -p "$w/packages/extra/seaweedfs/images" "$w/main/extra/seaweedfs/images"
+  echo 'ghcr.io/cozystack/cozystack/objectstorage-sidecar:v1.5.0@sha256:aaaa' > "$w/packages/extra/seaweedfs/images/objectstorage-sidecar.tag"
+  echo 'iad.ocir.io/x/cozystack/objectstorage-sidecar:main@sha256:bbbb'       > "$w/main/extra/seaweedfs/images/objectstorage-sidecar.tag"
+  cd "$w"
+  "$root/hack/overlay-main-images.sh" main '[]'
+  grep -q 'objectstorage-sidecar:main@sha256:bbbb' packages/extra/seaweedfs/images/objectstorage-sidecar.tag
+  cd "$root"
+  rm -rf "$w"
+}
+
+@test "skips a unit the PR rebuilt (its pr-<N>-<sha> ref wins)" {
+  root=$(pwd)
+  w=$(mktemp -d)
+  mkdir -p "$w/packages/apps/foo" "$w/main/apps/foo"
+  echo 'image: ghcr.io/cozystack/cozystack/foo:v1.5.0@sha256:aaaa' > "$w/packages/apps/foo/values.yaml"
+  echo 'image: iad.ocir.io/x/cozystack/foo:main@sha256:bbbb'       > "$w/main/apps/foo/values.yaml"
+  cd "$w"
+  "$root/hack/overlay-main-images.sh" main '["packages/apps/foo"]'
+  grep -q 'foo:v1.5.0@sha256:aaaa' packages/apps/foo/values.yaml
+  cd "$root"
+  rm -rf "$w"
+}
+
+@test "never overlays core/talos or core/installer (owned by dedicated jobs)" {
+  root=$(pwd)
+  w=$(mktemp -d)
+  mkdir -p "$w/packages/core/installer" "$w/main/core/installer" "$w/packages/core/talos" "$w/main/core/talos"
+  echo 'image: ghcr.io/cozystack/cozystack/cozystack-operator:v1.5.0@sha256:aaaa' > "$w/packages/core/installer/values.yaml"
+  echo 'image: iad.ocir.io/x/cozystack/cozystack-operator:main@sha256:bbbb'       > "$w/main/core/installer/values.yaml"
+  echo 'image: ghcr.io/cozystack/cozystack/talos:v1.5.0@sha256:cccc' > "$w/packages/core/talos/values.yaml"
+  echo 'image: iad.ocir.io/x/cozystack/talos:main@sha256:dddd'       > "$w/main/core/talos/values.yaml"
+  cd "$w"
+  "$root/hack/overlay-main-images.sh" main '[]'
+  grep -q 'cozystack-operator:v1.5.0@sha256:aaaa' packages/core/installer/values.yaml
+  grep -q 'talos:v1.5.0@sha256:cccc' packages/core/talos/values.yaml
+  cd "$root"
+  rm -rf "$w"
+}
+
+@test "does not descend into vendored charts/ subtrees" {
+  root=$(pwd)
+  w=$(mktemp -d)
+  mkdir -p "$w/packages/system/bar/charts/sub" "$w/main/system/bar/charts/sub"
+  echo 'image: ghcr.io/cozystack/cozystack/sub:v1.5.0@sha256:aaaa' > "$w/packages/system/bar/charts/sub/values.yaml"
+  echo 'image: iad.ocir.io/x/cozystack/sub:main@sha256:bbbb'       > "$w/main/system/bar/charts/sub/values.yaml"
+  cd "$w"
+  "$root/hack/overlay-main-images.sh" main '[]'
+  grep -q 'sub:v1.5.0@sha256:aaaa' packages/system/bar/charts/sub/values.yaml
+  cd "$root"
+  rm -rf "$w"
+}
+
+@test "keeps the committed ref when a non-ref line differs (drift)" {
+  root=$(pwd)
+  w=$(mktemp -d)
+  mkdir -p "$w/packages/system/drift" "$w/main/system/drift"
+  printf 'tuning: old\nimage: ghcr.io/cozystack/cozystack/drift:v1.5.0@sha256:aaaa\n' > "$w/packages/system/drift/values.yaml"
+  printf 'tuning: new\nimage: iad.ocir.io/x/cozystack/drift:main@sha256:bbbb\n'        > "$w/main/system/drift/values.yaml"
+  cd "$w"
+  "$root/hack/overlay-main-images.sh" main '[]'
+  grep -q 'drift:v1.5.0@sha256:aaaa' packages/system/drift/values.yaml
+  grep -q 'tuning: old' packages/system/drift/values.yaml
+  cd "$root"
+  rm -rf "$w"
+}
+
+@test "missing artifact directory is a no-op and exits 0" {
+  root=$(pwd)
+  w=$(mktemp -d)
+  mkdir -p "$w/packages/apps/foo"
+  echo 'image: ghcr.io/cozystack/cozystack/foo:v1.5.0@sha256:aaaa' > "$w/packages/apps/foo/values.yaml"
+  cd "$w"
+  "$root/hack/overlay-main-images.sh" does-not-exist '[]'
+  grep -q 'foo:v1.5.0@sha256:aaaa' packages/apps/foo/values.yaml
+  cd "$root"
+  rm -rf "$w"
+}
+
+@test "preserves a PR-edited non-rebuilt package ref (passed via the touched arg)" {
+  root=$(pwd)
+  w=$(mktemp -d)
+  mkdir -p "$w/packages/system/keycloak" "$w/main/system/keycloak"
+  # The PR bumps an upstream image in keycloak. keycloak is NOT a build unit, so
+  # it is absent from BUILD_MATRIX; only its image line differs from the artifact.
+  # Without the touched arg the overlay would silently revert the PR's bump.
+  echo 'image: quay.io/keycloak/keycloak:26.7.0' > "$w/packages/system/keycloak/values.yaml"
+  echo 'image: quay.io/keycloak/keycloak:26.6.3' > "$w/main/system/keycloak/values.yaml"
+  cd "$w"
+  out=$("$root/hack/overlay-main-images.sh" main '[]' 'packages/system/keycloak')
+  # The PR's edit wins; the overlay must not touch it.
+  grep -q 'keycloak:26.7.0' packages/system/keycloak/values.yaml
+  echo "$out" | grep -q 'overlaid=0'
+  cd "$root"
+  rm -rf "$w"
+}
+
+@test "recognizes a --…-image= arg line (no @sha256, no image key) as an image ref" {
+  root=$(pwd)
+  w=$(mktemp -d)
+  mkdir -p "$w/packages/system/argimg" "$w/main/system/argimg"
+  # The only differing line is a `--…-image=` arg with neither @sha256 nor an
+  # image/tag/repository key — it must still count as image-reference-bearing.
+  printf 'args:\n  - --provider-image=ghcr.io/cozystack/cozystack/x:v1.5.0\n' > "$w/packages/system/argimg/values.yaml"
+  printf 'args:\n  - --provider-image=iad.ocir.io/x/cozystack/x:main\n'       > "$w/main/system/argimg/values.yaml"
+  cd "$w"
+  "$root/hack/overlay-main-images.sh" main '[]'
+  grep -q 'x:main' packages/system/argimg/values.yaml
+  cd "$root"
+  rm -rf "$w"
+}
+
+@test "does not introduce a file present in the artifact but absent in the PR tree" {
+  root=$(pwd)
+  w=$(mktemp -d)
+  mkdir -p "$w/packages/apps/present/images" "$w/main/apps/present/images" "$w/main/apps/ghost/images"
+  echo 'ghcr.io/cozystack/cozystack/present:v1.5.0@sha256:aaaa' > "$w/packages/apps/present/images/present.tag"
+  echo 'iad.ocir.io/x/cozystack/present:main@sha256:bbbb'       > "$w/main/apps/present/images/present.tag"
+  # 'ghost' exists only in the artifact tree, never in the PR's packages/.
+  echo 'iad.ocir.io/x/cozystack/ghost:main@sha256:cccc'         > "$w/main/apps/ghost/images/ghost.tag"
+  cd "$w"
+  "$root/hack/overlay-main-images.sh" main '[]'
+  grep -q 'present:main@sha256:bbbb' packages/apps/present/images/present.tag
+  [ ! -e packages/apps/ghost/images/ghost.tag ]
+  cd "$root"
+  rm -rf "$w"
+}
+
+# ── workflow wiring ─────────────────────────────────────────────────────────
+# The script is only half the mechanism; WHICH artifact the workflow hands it
+# decides which generation of images a PR gets. A release-line PR must read its
+# own line's artifact — reading main's puts main's binaries against that line's
+# charts, which failed install deterministically (#3437).
+
+@test "the overlay reads the artifact for the PR's own base branch" {
+  root=$(pwd)
+  wf="$root/.github/workflows/pull-requests.yaml"
+  [ -f "$wf" ]
+
+  # Executable lines only: a comment mentioning the tag must not satisfy this.
+  code="$(grep -v '^[[:space:]]*#' "$wf")"
+
+  block="$(printf '%s\n' "$code" | awk '
+    $0 == "      - name: Pull base-branch packages tree" { inside = 1; next }
+    /^      - name: / { inside = 0 }
+    inside')"
+  [ -n "$block" ] || { echo "the base-branch packages pull step is missing from $wf" >&2; exit 1; }
+
+  # The artifact tag must be derived from the base branch, passed via env.
+  printf '%s\n' "$block" | grep -qF 'cozystack-packages:${ARTIFACT_REF}' || {
+    echo "the packages artifact tag is not derived from the PR's base branch. Reading" >&2
+    echo "a fixed tag (e.g. :main) hands a release-line PR another generation's images." >&2
+    exit 1; }
+  printf '%s\n' "$block" | grep -qF 'BASE_REF: ${{ github.base_ref }}' || {
+    echo "BASE_REF is not wired to github.base_ref in the pull step's env." >&2; exit 1; }
+
+  # A hardcoded :main anywhere in the two overlay steps defeats the point.
+  overlay="$(printf '%s\n' "$code" | awk '
+    $0 == "      - name: Overlay base-branch refs for unbuilt packages" { inside = 1; next }
+    /^      - name: / { inside = 0 }
+    inside')"
+  [ -n "$overlay" ] || { echo "the overlay step is missing from $wf" >&2; exit 1; }
+  printf '%s\n%s\n' "$block" "$overlay" | grep -qF 'cozystack-packages:main' && {
+    echo "an overlay step still pins cozystack-packages:main" >&2; exit 1; }
+  return 0
+}
+
+# A stacked PR's base is a feature branch: `fix/x` is not a valid OCI tag, and
+# no artifact is published for it anyway. Such a PR must read the artifact of
+# the line its stack grew from, not fall through to the committed release refs
+# (#4391), and not main's when the stack sits on a release line (#3437).
+@test "the pull step maps the base branch to a published artifact tag" {
+  root=$(pwd)
+  w="${BATS_TEST_TMPDIR:-$(mktemp -d)}"
+  git init --quiet --initial-branch=main "$w/repo"
+  cd "$w/repo"
+  git config user.email ci@example.invalid
+  git config user.name ci
+  git config commit.gpgsign false
+  c() { git commit --quiet --allow-empty --message "$1"; }
+  c m1
+  git checkout --quiet -b release-1.5; c q1
+  git checkout --quiet main; git checkout --quiet -b release-1.6; c r1
+  git checkout --quiet -b stack/x; c s1
+  git checkout --quiet release-1.6; git checkout --quiet -b release-1.6.1; c p1
+  git checkout --quiet main; c m2; c m3
+  # release-1.7 and fix/some-branch both grow from m3, so they tie: main must win.
+  git checkout --quiet -b release-1.7; c x1
+  git checkout --quiet main; git checkout --quiet -b fix/some-branch; c f1
+  for b in main release-1.5 release-1.6 release-1.7 stack/x release-1.6.1 fix/some-branch; do
+    git update-ref "refs/remotes/origin/$b" "$b"
+  done
+
+  script="$(awk '
+    $0 == "      - name: Pull base-branch packages tree" { step = 1; next }
+    step && /^      - name: / { exit }
+    step && $0 == "        run: |" { body = 1; next }
+    body && /^        [^ ]/ { exit }
+    body { sub(/^          /, ""); print }' "$root/.github/workflows/pull-requests.yaml")"
+  [ -n "$script" ] || { echo "cannot extract the pull step's script" >&2; exit 1; }
+
+  mkdir -p "$w/bin"
+  printf '#!/bin/sh\nprintf "%%s\\n" "$3" > "%s/pulled"\nexit 1\n' "$w" > "$w/bin/flux"
+  chmod +x "$w/bin/flux"
+  for pair in main=main release-1.6=release-1.6 fix/some-branch=main \
+              stack/x=release-1.6 release-1.6.1=release-1.6 gone/branch=main; do
+    rm -f "$w/pulled"
+    BASE_REF="${pair%%=*}" REGISTRY=r PATH="$w/bin:$PATH" bash -eo pipefail -c "$script" >/dev/null
+    [ "$(cat "$w/pulled")" = "oci://r/cozystack-packages:${pair#*=}" ] || {
+      echo "base ${pair%%=*}: pulled '$(cat "$w/pulled")', want tag ${pair#*=}" >&2; exit 1; }
+  done
+}
+
+@test "every maintained release line publishes its own packages artifact" {
+  root=$(pwd)
+  wf="$root/.github/workflows/build-release.yaml"
+  [ -f "$wf" ] || {
+    echo "build-release.yaml is missing: without a per-line artifact the overlay" >&2
+    echo "above degrades to a no-op on release branches, so their PRs test the" >&2
+    echo "line's last release rather than its tip." >&2
+    exit 1; }
+
+  code="$(grep -v '^[[:space:]]*#' "$wf")"
+
+  # Line branches only. The per-release and rc staging branches promote-rc.yaml
+  # and tags.yaml create (release-1.6.1, release-1.6.0-rc.4) must NOT trigger a
+  # full rebuild — their images come from the tag build.
+  printf '%s\n' "$code" | grep -qF "branches: ['release-[0-9]+.[0-9]+']" || {
+    echo "build-release.yaml does not restrict its trigger to release-<major>.<minor>" >&2; exit 1; }
+
+  # The artifact and image tag must be the branch, or the overlay cannot find it.
+  printf '%s\n' "$code" | grep -qF 'IMAGE_TAG: ${{ github.ref_name }}' || {
+    echo "build-release.yaml does not tag images/artifact with the branch name" >&2; exit 1; }
+
+  # It must not write the shared mode=max cache: that ref has exactly one
+  # serialized writer (build-main.yaml) so concurrent builds cannot race on the
+  # cache manifest. A line build can overlap a main build.
+  printf '%s\n' "$code" | grep -qF "WRITE_CACHE: '0'" || {
+    echo "build-release.yaml must set WRITE_CACHE: '0' — writing the shared" >&2
+    echo ":buildcache ref races build-main.yaml on the cache manifest." >&2
+    exit 1; }
+}
+
+# A drifted file keeps its committed release ref, which is the safe choice, but
+# it also means that component runs a release image in a lane meant to exercise
+# the tree under review. That used to be one line among hundreds, so three
+# separate PRs each spent a round establishing that a red backup suite was not
+# theirs (#4257).
+# A ref whose key merely ENDS in Image, and which carries no digest to fall back
+# on, used to read as a config change and cost its whole file the overlay. That
+# is how backupstrategy-controller ran a release image two months older than the
+# tree in every lane that did not rebuild it (#4257): one such line sat beside
+# digest-pinned siblings the classifier did recognise.
+@test "a suffixed image key is a ref, not a config change" {
+  root=$(pwd)
+  w=$(mktemp -d)
+  mkdir -p "$w/packages/system/gamma" "$w/main/system/gamma"
+  printf 'gamma:\n  image: "ghcr.io/cozystack/cozystack/gamma:v1.6.0@sha256:aaaa"\n  clientImage: "ghcr.io/cozystack/cozystack/client:v1.6.0"\n' > "$w/packages/system/gamma/values.yaml"
+  printf 'gamma:\n  image: "iad.ocir.io/x/cozystack/gamma:main@sha256:cccc"\n  clientImage: "iad.ocir.io/x/cozystack/client:main"\n' > "$w/main/system/gamma/values.yaml"
+  ( cd "$w" && "$root/hack/overlay-main-images.sh" main '[]' ) > "$w/out.txt"
+  grep -q 'overlay: packages/system/gamma/values.yaml' "$w/out.txt"
+  grep -q 'iad.ocir.io/x/cozystack/client:main' "$w/packages/system/gamma/values.yaml"
+  rm -rf "$w"
+}
+
+# A file differing on imagePullPolicy differs on CONFIG, so it must keep its
+# committed ref rather than be overlaid. What keeps both pull-policy keys out is
+# the letter the key branch demands BEFORE `image`, which a key beginning with
+# `image` has nothing to supply: neither matches with the trailing colon or
+# without it, even when the value carries a slash. The colon belongs to the
+# other side of the branch and is held by "a suffixed image key is a ref".
+@test "a key merely STARTING with image is config, not a ref" {
+  root=$(pwd)
+  w=$(mktemp -d)
+  mkdir -p "$w/packages/system/delta" "$w/main/system/delta"
+  printf 'delta:\n  image: "ghcr.io/cozystack/cozystack/delta:v1.6.0@sha256:aaaa"\n  imagePullPolicy: IfNotPresent\n' > "$w/packages/system/delta/values.yaml"
+  printf 'delta:\n  image: "ghcr.io/cozystack/cozystack/delta:v1.6.0@sha256:aaaa"\n  imagePullPolicy: Always\n' > "$w/main/system/delta/values.yaml"
+  ( cd "$w" && "$root/hack/overlay-main-images.sh" main '[]' ) > "$w/out.txt"
+  grep -q 'drift (non-ref change) in packages/system/delta/values.yaml' "$w/out.txt"
+  if grep -q 'overlay: packages/system/delta/values.yaml' "$w/out.txt"; then
+    echo "FAIL: a changed imagePullPolicy was read as a ref and the file overlaid" >&2
+    cat "$w/out.txt" >&2
+    exit 1
+  fi
+  grep -q 'imagePullPolicy: IfNotPresent' "$w/packages/system/delta/values.yaml"
+  rm -rf "$w"
+}
+
+# `yq -i` re-emits the document when the build stamps a digest, and a blank
+# line separating two top-level keys does not survive that. So the artifact copy
+# of a file the PR never touched differs from the committed one by a line
+# carrying no configuration, and treating that as a config change costs the file
+# its overlay. Five packages drifted on nothing else (#4265).
+@test "a blank line lost to yq is not a config change" {
+  root=$(pwd)
+  w=$(mktemp -d)
+  mkdir -p "$w/packages/system/epsilon" "$w/main/system/epsilon"
+  printf '_cluster: {}\n\nepsilon:\n  image: "ghcr.io/cozystack/cozystack/epsilon:v1.6.0@sha256:aaaa"\n' > "$w/packages/system/epsilon/values.yaml"
+  printf '_cluster: {}\nepsilon:\n  image: "iad.ocir.io/x/cozystack/epsilon:main@sha256:bbbb"\n' > "$w/main/system/epsilon/values.yaml"
+  ( cd "$w" && "$root/hack/overlay-main-images.sh" main '[]' ) > "$w/out.txt"
+  grep -q 'overlay: packages/system/epsilon/values.yaml' "$w/out.txt"
+  if grep -q 'drift (non-ref change)' "$w/out.txt"; then
+    echo "FAIL: a blank line lost to yq was counted as a config change" >&2
+    cat "$w/out.txt" >&2
+    exit 1
+  fi
+  grep -q 'iad.ocir.io/x/cozystack/epsilon:main' "$w/packages/system/epsilon/values.yaml"
+  rm -rf "$w"
+}
+
+# A blank line is discounted, a line with CONTENT is not: the guard that keeps
+# a real config difference from riding along with the ref lines is the same one,
+# so it needs its own case rather than trusting the blank-line test above.
+@test "a real config line still counts as drift alongside a blank line" {
+  root=$(pwd)
+  w=$(mktemp -d)
+  mkdir -p "$w/packages/system/zeta" "$w/main/system/zeta"
+  printf '_cluster: {}\n\nzeta:\n  image: "ghcr.io/cozystack/cozystack/zeta:v1.6.0@sha256:aaaa"\n  replicas: 2\n' > "$w/packages/system/zeta/values.yaml"
+  printf '_cluster: {}\nzeta:\n  image: "iad.ocir.io/x/cozystack/zeta:main@sha256:bbbb"\n  replicas: 3\n' > "$w/main/system/zeta/values.yaml"
+  ( cd "$w" && "$root/hack/overlay-main-images.sh" main '[]' ) > "$w/out.txt"
+  grep -q 'drift (non-ref change) in packages/system/zeta/values.yaml' "$w/out.txt"
+  grep -q 'replicas: 2' "$w/packages/system/zeta/values.yaml"
+  rm -rf "$w"
+}
+
+@test "drift is summarised as a GitHub annotation naming the packages" {
+  root=$(pwd)
+  w=$(mktemp -d)
+  mkdir -p "$w/packages/system/alpha" "$w/main/system/alpha"
+  mkdir -p "$w/packages/system/beta" "$w/main/system/beta"
+  printf 'tuning: old\nimage: ghcr.io/cozystack/cozystack/alpha:v1.5.0@sha256:aaaa\n' > "$w/packages/system/alpha/values.yaml"
+  printf 'tuning: new\nimage: iad.ocir.io/x/cozystack/alpha:main@sha256:bbbb\n'        > "$w/main/system/alpha/values.yaml"
+  printf 'tuning: old\nimage: ghcr.io/cozystack/cozystack/beta:v1.5.0@sha256:cccc\n'  > "$w/packages/system/beta/values.yaml"
+  printf 'tuning: new\nimage: iad.ocir.io/x/cozystack/beta:main@sha256:dddd\n'         > "$w/main/system/beta/values.yaml"
+  cd "$w"
+  "$root/hack/overlay-main-images.sh" main '[]' > out.txt
+  # Read the names out of the ANNOTATION line, not the whole log: every drifted
+  # file already prints its own path above, so grepping the log would pass even
+  # if the summary named nothing.
+  grep '::warning title=Image overlay drift' out.txt > ann.txt
+  grep -q 'system/alpha' ann.txt
+  grep -q 'system/beta' ann.txt
+  grep -q '2 package(s)' ann.txt
+  cd "$root"
+  rm -rf "$w"
+}
+
+@test "no annotation when nothing drifted" {
+  root=$(pwd)
+  w=$(mktemp -d)
+  mkdir -p "$w/packages/system/clean" "$w/main/system/clean"
+  printf 'image: ghcr.io/cozystack/cozystack/clean:v1.5.0@sha256:aaaa\n' > "$w/packages/system/clean/values.yaml"
+  printf 'image: iad.ocir.io/x/cozystack/clean:main@sha256:bbbb\n'       > "$w/main/system/clean/values.yaml"
+  cd "$w"
+  "$root/hack/overlay-main-images.sh" main '[]' > out.txt
+  if grep -q '::warning title=Image overlay drift' out.txt; then
+    echo "FAIL: the annotation was emitted on a clean run" >&2
+    cat out.txt >&2
+    exit 1
+  fi
+  cd "$root"
+  rm -rf "$w"
+}
+
+@test "two drifted files in one package are one package, named without /images" {
+  # The counter counts ref-bearing FILES; the annotation speaks of packages. A
+  # package whose values.yaml and images/*.tag both drift is still one package,
+  # and `<pkg>/images` is not something anyone can go and look at.
+  root=$(pwd)
+  w=$(mktemp -d)
+  mkdir -p "$w/packages/apps/omega/images" "$w/main/apps/omega/images"
+  printf 'image: ghcr.io/cozystack/cozystack/omega:v1.5.0@sha256:aaaa\nreplicas: 1\n' \
+    > "$w/packages/apps/omega/values.yaml"
+  printf 'image: iad.ocir.io/x/cozystack/omega:main@sha256:bbbb\nreplicas: 2\n' \
+    > "$w/main/apps/omega/values.yaml"
+  printf 'ghcr.io/cozystack/cozystack/t:v1.5.0@sha256:cccc\n' \
+    > "$w/packages/apps/omega/images/t.tag"
+  printf 'iad.ocir.io/x/cozystack/t:main@sha256:dddd\ntrailing\n' \
+    > "$w/main/apps/omega/images/t.tag"
+  cd "$w"
+  "$root/hack/overlay-main-images.sh" main '[]' > out.txt
+  ann=$(grep '::warning title=Image overlay drift' out.txt)
+  if ! printf '%s\n' "$ann" | grep -q '1 package(s)'; then
+    echo "FAIL: two files in one package were not counted as one package" >&2
+    printf '%s\n' "$ann" >&2
+    exit 1
+  fi
+  if printf '%s\n' "$ann" | grep -q 'omega/images'; then
+    echo "FAIL: the annotation named a directory instead of the package" >&2
+    printf '%s\n' "$ann" >&2
+    exit 1
+  fi
+  cd "$root"
+  rm -rf "$w"
+}
+
+@test "an *Image key holding operator config, not a path, is still a config change" {
+  # `vddkImage: ""` (core/platform, migration-controller) is named after an
+  # image but is an operator-supplied knob the build never stamps. The prefixed
+  # -key branch must not absorb it: taking it from the artifact in silence is
+  # the failure this script exists to make loud.
+  root=$(pwd)
+  w=$(mktemp -d)
+  mkdir -p "$w/packages/system/vm" "$w/main/system/vm"
+  printf 'image: ghcr.io/cozystack/cozystack/vm:v1.5.0@sha256:aaaa\nvddkImage: ""\n' \
+    > "$w/packages/system/vm/values.yaml"
+  printf 'image: iad.ocir.io/x/cozystack/vm:main@sha256:bbbb\nvddkImage: "someone/else"\n' \
+    > "$w/main/system/vm/values.yaml"
+  cd "$w"
+  "$root/hack/overlay-main-images.sh" main '[]' > out.txt
+  if ! grep -q 'drift (non-ref change) in packages/system/vm/values.yaml' out.txt; then
+    echo "FAIL: a changed vddkImage was taken from the artifact instead of drifting" >&2
+    cat out.txt >&2
+    exit 1
+  fi
+  cd "$root"
+  rm -rf "$w"
+}
diff --git a/hack/package-mk-phony.bats b/hack/package-mk-phony.bats
new file mode 100644
index 0000000000..51828cb2c7
--- /dev/null
+++ b/hack/package-mk-phony.bats
@@ -0,0 +1,332 @@
+#!/usr/bin/env bats
+# -----------------------------------------------------------------------------
+# Unit tests for the .PHONY declarations this tree depends on: the one in
+# hack/package.mk, which most package Makefiles under packages/ include, and the
+# root Makefile's, where one target is already shadowed by a real path.
+#
+# `.PHONY=a b c` assigns a variable; `.PHONY: a b c` declares targets. Only the
+# second does anything, and make reports neither. The declaration lists the nine
+# targets package.mk defines and stops there.
+#
+# `update` and `image` are deliberately absent: package.mk does not define them,
+# the including package Makefile does, and naming an undefined target in .PHONY
+# creates it as an empty target. That turns "No rule to make target" (exit 2)
+# into "Nothing to be done" (exit 0) wherever the rule is missing, including the
+# CI build matrix, which is parsed from the root Makefile `build:` target and
+# runs `make -C <pkg> image` per unit. The last two tests pin the exclusion.
+#
+# The first test and the control below deliberately read different lists — the
+# first the names on the `.PHONY:` line, the control the targets the file
+# defines — and merging them back into one is the tidy-up to resist. Which list
+# each takes is argued where it is taken.
+#
+# The first test is narrower than its name suggests, in two ways. It probes the
+# names on the `.PHONY:` line, so it cannot see a name dropped from that line;
+# the set-equality test is what guards every name's presence. And it decides by
+# matching make's "is up to date", which make prints only for a target that has
+# a recipe. A recipe-less alias never draws it: with no prerequisite both forms
+# print "Nothing to be done", and with a prerequisite that is itself out of
+# date, which every target here is for being phony, the working form prints that
+# prerequisite's recipe while the broken form prints "Nothing to be done". The
+# probe separates neither pair, so it would pass on such a name either way.
+# Every target package.mk defines has a recipe, so nothing is uncovered today.
+# The control test below does not close the gap either: an alias is a defined
+# target, so the control probes it and requires "is up to date" from it, which
+# turns the control red against the probe rather than against the alias.
+# Adding one means revisiting both.
+#
+# The decoy files all carry one fixed timestamp, and that is load-bearing rather
+# than tidy. Six of the nine targets take `check` as a prerequisite, and `apply`
+# and `delete` reach it through `suspend` as well. Touch the decoys in list order
+# and `check` lands newer than the targets that depend on it, so make rebuilds
+# them for that reason alone and prints a recipe whatever `.PHONY` says. The
+# probe then reports success against the broken form. Equal mtimes remove the
+# question: nothing is ever newer than its own prerequisite, in any list order,
+# so the recipe running means phony and nothing else. Measured on GNU Make 4.3,
+# which is what CI runs, list order hid the bug for up to six of the nine, and
+# which six moved with where the clock tick fell. On 3.81 the whole loop landed
+# inside one timestamp and hid nothing, so a local run could not see it.
+#
+# Constraints on anyone editing this file: every make invocation is pinned to
+# LC_ALL=C, because the assertions match English make wording; cozytest.sh
+# recognizes only @test blocks and a bare `}` at column 0, and injects `set -e`,
+# so exit statuses are captured explicitly rather than tested inline.
+#
+# Run with: bats hack/package-mk-phony.bats
+# -----------------------------------------------------------------------------
+
+load test_helper
+
+@test "every target hack/package.mk declares phony still runs when a file of that name exists" {
+    repo=$(pwd)
+    targets=$(sed -n 's/^\.PHONY:[[:space:]]*//p' "$repo/hack/package.mk")
+
+    # Without this guard the loop below is a vacuous pass against `.PHONY=`,
+    # which the sed no longer matches.
+    if [ -z "$targets" ]; then
+        echo "no '.PHONY:' declaration found in hack/package.mk" >&2
+        exit 1
+    fi
+
+    tmp=$(mktemp -d)
+    printf 'include %s/hack/package.mk\n' "$repo" > "$tmp/Makefile"
+
+    # One fixed timestamp for every decoy, so no target is ever newer than a
+    # target it depends on. See the header: list order silently disarms this
+    # probe for the targets that hang off `check`.
+    for t in $targets; do
+        touch -t 200101010000 "$tmp/$t"
+    done
+
+    for t in $targets; do
+        # cozytest.sh runs with `set -e`, so capture the exit status explicitly
+        # rather than letting a failing make abort before the diagnostics below.
+        rc=0
+        out=$(LC_ALL=C make --dry-run --directory "$tmp" "$t" 2>&1) || rc=$?
+        if [ "$rc" -ne 0 ]; then
+            echo "make $t exited $rc under --dry-run:" >&2
+            echo "$out" >&2
+            rm -rf "$tmp"
+            exit 1
+        fi
+        case "$out" in
+            *"is up to date"*)
+                echo "make $t no-oped with a file named $t present:" >&2
+                echo "$out" >&2
+                echo "hack/package.mk does not actually declare $t phony" >&2
+                rm -rf "$tmp"
+                exit 1
+                ;;
+        esac
+    done
+
+    rm -rf "$tmp"
+}
+
+@test "the probe reports up-to-date when .PHONY is written as an assignment" {
+    # Negative control: proves the probe can see a file-backed target at all.
+    # The list is the targets package.mk defines, not the names on its `.PHONY:`
+    # line, because "is up to date" is only a meaningful answer for a name that
+    # has a rule. A declared name the file does not define prints "Nothing to be
+    # done" in both forms, so probing it here fails against the probe instead of
+    # against the defect; the set-equality test is what catches that name, and
+    # it carries the message that says so. The list is read from the original
+    # file: the copy is the mutated one.
+    repo=$(pwd)
+    targets=$(grep -E '^[A-Za-z0-9][A-Za-z0-9_-]*([[:space:]]+[A-Za-z0-9][A-Za-z0-9_-]*)*:' \
+        "$repo/hack/package.mk" \
+        | grep -vE '^[^:]*:+=' | sed 's/:.*//' \
+        | tr ' ' '\n' | grep -v '^$' | sort -u)
+    if [ -z "$targets" ]; then
+        echo "no targets extracted from hack/package.mk — extraction broke" >&2
+        exit 1
+    fi
+
+    tmp=$(mktemp -d)
+
+    sed 's/^\.PHONY:/.PHONY=/' "$repo/hack/package.mk" > "$tmp/package.mk"
+    if ! grep -q '^\.PHONY=' "$tmp/package.mk"; then
+        echo "mutation to the assignment form did not apply to the copy" >&2
+        rm -rf "$tmp"
+        exit 1
+    fi
+
+    printf 'include %s/package.mk\n' "$tmp" > "$tmp/Makefile"
+
+    # Same fixed timestamp as the first test, for the same reason.
+    for t in $targets; do
+        touch -t 200101010000 "$tmp/$t"
+    done
+
+    for t in $targets; do
+        rc=0
+        out=$(LC_ALL=C make --dry-run --directory "$tmp" "$t" 2>&1) || rc=$?
+        if [ "$rc" -ne 0 ]; then
+            echo "make $t exited $rc under --dry-run:" >&2
+            echo "$out" >&2
+            rm -rf "$tmp"
+            exit 1
+        fi
+        case "$out" in
+            *"is up to date"*) ;;
+            *)
+                echo "probe failed to detect a file-backed $t:" >&2
+                echo "$out" >&2
+                rm -rf "$tmp"
+                exit 1
+                ;;
+        esac
+    done
+
+    rm -rf "$tmp"
+}
+
+@test "the .PHONY list and the targets package.mk defines are the same set" {
+    # The first test only probes names already on the list, so this is the sole
+    # guard on a name being dropped from it. The reverse direction catches a
+    # declared-but-undefined name, which make turns into an empty target.
+    # `%-update` is out of reach for both: .PHONY matches literally.
+    repo=$(pwd)
+    # Flattened because the `case` tests match on " name " and an embedded
+    # newline makes a name fail that check and get reported wrongly.
+    declared=$(sed -n 's/^\.PHONY:[[:space:]]*//p' "$repo/hack/package.mk" \
+        | tr '\n' ' ')
+    # A target name outside this pattern — leading underscore, dot, slash — is
+    # legal in make and skipped here in silence, so keep new names inside it.
+    # One rule may name several targets, so the pattern accepts a run of them
+    # and the `tr` splits the run apart again; anchoring the colon to a single
+    # name instead would drop every name on such a line, silently for a target
+    # nothing depends on. The second grep drops assignments by the `:=` itself
+    # rather than by whatever precedes it, `:+` covering `::=` and `:::=`, so
+    # `export FOO:=bar` goes too — matching the name in front instead would let
+    # that line through and report `export` and `FOO` as undeclared targets.
+    defined=$(grep -E '^[A-Za-z0-9][A-Za-z0-9_-]*([[:space:]]+[A-Za-z0-9][A-Za-z0-9_-]*)*:' \
+        "$repo/hack/package.mk" \
+        | grep -vE '^[^:]*:+=' | sed 's/:.*//' \
+        | tr ' ' '\n' | grep -v '^$' | sort -u | tr '\n' ' ')
+
+    if [ -z "$declared" ] || [ -z "$defined" ]; then
+        echo "could not extract targets from hack/package.mk — extraction broke" >&2
+        exit 1
+    fi
+
+    missing=""
+    for t in $defined; do
+        case " $declared " in
+            *" $t "*) ;;
+            *) missing="$missing $t" ;;
+        esac
+    done
+
+    if [ -n "$missing" ]; then
+        echo "hack/package.mk defines these targets but does not declare them phony:$missing" >&2
+        echo "a file of that name next to a package Makefile would silence the recipe" >&2
+        exit 1
+    fi
+
+    undefined=""
+    for t in $declared; do
+        case " $defined " in
+            *" $t "*) ;;
+            *) undefined="$undefined $t" ;;
+        esac
+    done
+
+    if [ -n "$undefined" ]; then
+        echo "hack/package.mk declares these targets phony but defines none of them:$undefined" >&2
+        echo "naming an undefined target in .PHONY creates it as an empty target, so the" >&2
+        echo "command reports success instead of failing with 'No rule to make target'" >&2
+        exit 1
+    fi
+}
+
+@test "update and image stay undeclared so a package without the rule fails loudly" {
+    # Pins the exclusion: a package with no `update:`/`image:` rule must still
+    # fail loudly. Declaring them centrally would make every such package report
+    # success having built nothing, CI included.
+    repo=$(pwd)
+    tmp=$(mktemp -d)
+
+    printf 'include %s/hack/package.mk\n' "$repo" > "$tmp/Makefile"
+
+    for t in update image; do
+        rc=0
+        out=$(LC_ALL=C make --directory "$tmp" "$t" 2>&1) || rc=$?
+        # Exit status and diagnostic are independent observables, so both are
+        # pinned. 2 is what make returns for a fatal error, and the number is
+        # what a caller branches on — a wrapper or a future make that kept the
+        # wording while returning something else would pass the case below.
+        if [ "$rc" -ne 2 ]; then
+            echo "expected 'make $t' to exit 2 in a package that defines no $t rule," >&2
+            echo "but it exited $rc — is $t named in the .PHONY list?" >&2
+            echo "$out" >&2
+            rm -rf "$tmp"
+            exit 1
+        fi
+        case "$out" in
+            *"No rule to make target"*) ;;
+            *)
+                echo "expected 'make $t' to report no rule to make target, got:" >&2
+                echo "$out" >&2
+                rm -rf "$tmp"
+                exit 1
+                ;;
+        esac
+    done
+
+    rm -rf "$tmp"
+}
+
+@test "adding update and image to the .PHONY list silences that failure" {
+    # Negative control. Test 4 passes vacuously if its Makefile never reads
+    # package.mk at all: a broken `include` path also exits non-zero with "No
+    # rule to make target", naming the missing file. This mutates a copy and
+    # greps that the mutation landed, so a wrong path fails here instead.
+    repo=$(pwd)
+    tmp=$(mktemp -d)
+
+    sed 's/^\(\.PHONY:.*\)$/\1 update image/' "$repo/hack/package.mk" > "$tmp/package.mk"
+    if ! grep -q '^\.PHONY:.* update image$' "$tmp/package.mk"; then
+        echo "mutation extending the declaration did not apply to the copy" >&2
+        rm -rf "$tmp"
+        exit 1
+    fi
+
+    printf 'include %s/package.mk\n' "$tmp" > "$tmp/Makefile"
+
+    for t in update image; do
+        rc=0
+        out=$(LC_ALL=C make --directory "$tmp" "$t" 2>&1) || rc=$?
+        if [ "$rc" -ne 0 ]; then
+            echo "mutation did not take effect: 'make $t' still failed with exit $rc" >&2
+            echo "$out" >&2
+            rm -rf "$tmp"
+            exit 1
+        fi
+        case "$out" in
+            *"Nothing to be done"*) ;;
+            *)
+                echo "expected the mutated copy to report nothing to be done for $t, got:" >&2
+                echo "$out" >&2
+                rm -rf "$tmp"
+                exit 1
+                ;;
+        esac
+    done
+
+    rm -rf "$tmp"
+}
+
+@test "the root Makefile declares test phony so the test directory cannot shadow it" {
+    # The one target in this tree that a real path already shadows. `test:` in
+    # the root Makefile produces no file, so make treats the existing test/
+    # directory as its product: undeclared, `make test` prints "is up to date"
+    # and the recipe never runs, while docs/agents/overview.md advertises the
+    # command as the way to run the full suite. Every other undeclared target
+    # in that file is unshadowed today, so this is the only live one.
+    #
+    # Probed with --dry-run because the recipe wants a live cluster. The path is
+    # what makes the probe mean anything, so its absence fails loudly rather
+    # than passing quietly.
+    repo=$(pwd)
+    if [ ! -e "$repo/test" ]; then
+        echo "no test/ path at the repo root: this probe no longer measures anything" >&2
+        exit 1
+    fi
+
+    rc=0
+    out=$(LC_ALL=C make --dry-run --directory "$repo" test 2>&1) || rc=$?
+    if [ "$rc" -ne 0 ]; then
+        echo "make test exited $rc under --dry-run:" >&2
+        echo "$out" >&2
+        exit 1
+    fi
+    case "$out" in
+        *"is up to date"*)
+            echo "make test no-oped with the test/ path present:" >&2
+            echo "$out" >&2
+            echo "the root Makefile does not declare test phony" >&2
+            exit 1
+            ;;
+    esac
+}
diff --git a/hack/package-test-target-coverage.bats b/hack/package-test-target-coverage.bats
new file mode 100644
index 0000000000..4a8d61bea5
--- /dev/null
+++ b/hack/package-test-target-coverage.bats
@@ -0,0 +1,161 @@
+#!/usr/bin/env bats
+# -----------------------------------------------------------------------------
+# Coverage invariant for the helm-unittest sweep: every package that ships a
+# suite must answer the probe the sweep opens with.
+#
+# hack/helm-unit-tests.sh decides whether to enter a package directory by asking
+# `make -C "$dir" -n test`, and a package that answers "No rule to make target"
+# is skipped without a word. Every other guard in that script — the shadowed
+# target check, the zero-suite check, the positive-evidence check — runs inside
+# a directory the sweep already reached, so a package missing the target escapes
+# all of them at once and the sweep still reports success. The suites under
+# tests/ then read as coverage to anyone opening the directory while nothing
+# executes them, which is worse than having no suite at all: a suite that has
+# never run is where a stale assertion hides. packages/system/gpu-operator sat
+# in exactly that state, with three passing test cases nothing ever ran.
+#
+# hack/helm-unit-tests.bats covers the script's own reactions against synthetic
+# trees. This file makes the complementary claim, about the real tree: every
+# package that ships a suite answers the probe the sweep opens with.
+#
+# That is narrower than "the sweep reaches every suite", and deliberately so.
+# Reach also depends on the hardcoded root list the sweep loops over, so
+# dropping packages/system from it would take every package under that root out
+# of the run while each one keeps its target and this file stays green. That is
+# the same shape as the packages/tests incident recorded in the sweep's own
+# header, and it wants its own guard rather than a looser predicate here.
+#
+# The predicate is "holds at least one tests/*_test.yaml", not "has a tests/
+# directory". That glob is helm-unittest's own default, so a package outside it
+# has nothing of its own for a `test:` target to run and the sweep would reject
+# it for reporting zero suites. packages/system/nfs-driver is the live case:
+# its tests/ holds a PersistentVolumeClaim and a StorageClass to apply by hand,
+# not a suite.
+#
+# "Of its own" is the load-bearing part. `--with-subchart` defaults to true, so
+# a package carrying no suite of its own would still run any that came down
+# with a vendored chart under charts/, and this predicate would not look for it.
+# Only ingress-nginx and reloader vendor such suites today and both ship their
+# own as well, so nothing is out of reach; a package that vendored suites and
+# wrote none itself would need this predicate widened.
+#
+# Probed with `make -n` rather than by grepping the Makefile for `test:`, so the
+# question asked here is the same one the sweep asks — a target reached through
+# an include counts, and so would a rule this file cannot parse. The sweep's
+# other precondition, that `$dir/Makefile` exists, is mirrored rather than left
+# to make, which is looser about the name and about there being a makefile at
+# all.
+#
+# The verdict comes from the sweep's command unchanged. Reading the diagnostic
+# needs `LC_ALL=C` and `--no-print-directory`, and both are visible to a
+# Makefile through `LC_ALL` and `MAKEFLAGS`, so a Makefile branching on either
+# would answer this file and the sweep differently. That is why the failing
+# package is probed a second time to explain rather than once to do both.
+#
+# Answering the probe is not the same as declaring a recipe: a path named `test`
+# beside the Makefile, or an implicit rule that can build one, satisfies it too,
+# and this file would report that package as covered. That is deliberate rather
+# than overlooked. It is the sweep's own gate, so a package passing here is a
+# package the sweep enters once it walks that package's root, which is the
+# whole claim and no more than it: the root list is the caveat above. From
+# inside, the sweep's positive-evidence check refuses whatever does not print
+# the line a helm-unittest run emits. A pattern rule written to run
+# helm-unittest would satisfy that check on its merits, which is the right
+# outcome rather than a hole: the suites would be running.
+#
+# Not the "is up to date" check, which is the near miss worth naming. A path
+# named `test` with no rule behind it makes make print "Nothing to be done for
+# 'test'." and exit 0, which that grep does not match; measured on 3.81 and
+# 4.4.1. "is up to date" is what make prints for the third case, a real recipe
+# shadowed by a file of that name -- the one `.PHONY: test` prevents.
+#
+# Runs under hack/cozytest.sh, which is POSIX /bin/sh: no arrays, no bats `run`,
+# no `$status`.
+# -----------------------------------------------------------------------------
+
+load test_helper
+
+REPO_ROOT="$(cd "$(dirname "${BATS_TEST_FILENAME:-$0}")/.." && pwd)"
+
+@test "every package shipping a helm-unittest suite answers the sweep probe" {
+    # An empty violation list means "no violations" only if the scan reached
+    # some packages. A renamed directory or a wrong root yields the same empty
+    # string, and the test would pass having read nothing.
+    scanned=0
+    # cozytest.sh injects `set -u`, so every variable the loop reads is seeded
+    # here rather than on first append.
+    seen=""
+    diagnostics=""
+
+    for suite in "$REPO_ROOT"/packages/*/*/tests/*_test.yaml; do
+        [ -f "$suite" ] || continue
+        pkg=$(dirname "$(dirname "$suite")")
+        # One package may ship several suites; count and probe it once.
+        case " $seen " in
+            *" $pkg "*) continue ;;
+        esac
+        seen="$seen $pkg"
+        scanned=$((scanned + 1))
+
+        # The sweep opens with `[ -f "$dir/Makefile" ]` and returns before it
+        # probes anything, so mirror that first. make would not: it also accepts
+        # GNUmakefile and makefile, and with no makefile at all it still answers
+        # 0 for a target a path of that name satisfies. Either shape would pass
+        # the probe below while the sweep skipped the package, which is the one
+        # thing this file claims cannot happen.
+        if [ ! -f "$pkg/Makefile" ]; then
+            diagnostics="$diagnostics
+  ${pkg#"$REPO_ROOT"/}: no Makefile, so the sweep returns before probing"
+            continue
+        fi
+
+        # The verdict is taken from the sweep's own command, byte for byte, so
+        # that no flag of this file's can separate the two answers. Deciding and
+        # explaining are split for that reason: anything added here to make the
+        # output readable is a variable a Makefile could branch on.
+        if ! make -C "$pkg" -n test >/dev/null 2>&1; then
+            # Only now, and only to explain. LC_ALL=C keeps make's wording in
+            # the language the remedy text below is written against.
+            #
+            # --no-print-directory because on modern GNU make `-C` auto-enables
+            # `-w`, and the fatal path prints the "Leaving directory" line after
+            # the error, so `tail -n 1` would report the directory trace and
+            # drop every diagnostic this block exists to surface: a missing rule
+            # and a broken include collapse to the same trace line. Measured on
+            # 4.4.1, where it happens, and on 3.81 -- still the /usr/bin/make on
+            # macOS -- where `-C` prints no trace at all, so a local run cannot
+            # see the difference. The version that draws the line was not
+            # measured.
+            #
+            # `|| true` because this re-run is expected to fail and cozytest.sh
+            # injects `set -e`; the verdict is already decided above.
+            probe=$(LC_ALL=C make --no-print-directory -C "$pkg" -n test 2>&1 || true)
+
+            # A missing rule is the expected cause, but an unparseable Makefile
+            # and a broken include fail the same probe and have a different
+            # remedy. Report what make said rather than asserting the cause.
+            diagnostics="$diagnostics
+  ${pkg#"$REPO_ROOT"/}: $(printf '%s' "$probe" | tail -n 1)"
+        fi
+    done
+
+    if [ "$scanned" -eq 0 ]; then
+        echo "no tests/*_test.yaml found under $REPO_ROOT/packages -- guard is blind." >&2
+        return 1
+    fi
+
+    if [ -n "$diagnostics" ]; then
+        echo "Packages shipping a helm-unittest suite the sweep cannot reach:" >&2
+        # Each entry is appended with a leading newline, so the accumulator
+        # opens with an empty one; drop it rather than the reader parsing a
+        # blank first line under pressure.
+        printf '%s\n' "$diagnostics" | sed '/^$/d' >&2
+        echo "hack/helm-unit-tests.sh probes 'make -C <pkg> -n test' to decide whether" >&2
+        echo "to enter a package, so these suites never run and the sweep stays green." >&2
+        echo "Where the reason is a missing rule, add to that Makefile:" >&2
+        echo "    .PHONY: test" >&2
+        echo "    test:" >&2
+        echo "    	helm unittest ." >&2
+        return 1
+    fi
+}
diff --git a/hack/package-update-templates.bats b/hack/package-update-templates.bats
new file mode 100644
index 0000000000..4e18065745
--- /dev/null
+++ b/hack/package-update-templates.bats
@@ -0,0 +1,443 @@
+#!/usr/bin/env bats
+# -----------------------------------------------------------------------------
+# Invariant for the package `update` recipes that clear templates/ wholesale.
+#
+# `update` refetches a package's vendored upstream manifests, and several
+# recipes open by deleting templates/ to guarantee a clean slate. That is safe
+# only while every file under templates/ comes back from the recipe.
+# templates/ is an ordinary chart directory, so a package can also keep
+# first-party manifests there, and the recipe knows nothing about them. The
+# wipe takes them and `make update` exits 0, so the deletion lands in the diff
+# with nothing marking it. Whether anything downstream notices depends on the
+# package carrying a helm-unittest suite that names the file, and where none
+# does the loss is silent all the way to a cluster. That is a property of the
+# package, not of the tree, so it is worth re-deriving rather than reading: at
+# the time of writing kubevirt-cdi has such a suite and a deletion there fails
+# `make test` as well, while some packages that clear their own templates/
+# declare no `test` target at all (#3631 tracks packages without one).
+#
+# The invariant: a recipe that clears templates/ must NAME every file tracked
+# under it. Both halves are approximations of the shell the recipe would run,
+# and each is argued at its helper below: the wipe is a text match over the
+# recipe's lines rather than a parse, and "names" means the file's basename
+# minus its extension appears somewhere in the Makefile -- a mention, not proof
+# of a write. What that catches is the shape kubevirt-cdi had, a file the
+# Makefile does not refer to at all: every recipe that clears its own
+# templates/ writes each path it puts back there, so a name appearing nowhere
+# in the file is a name nothing refetches. A recipe that unpacked an archive or
+# globbed a stream into templates/ would produce files it never names and break
+# that reading. cert-manager's `mv charts/.../crd-*.yaml` is that shape, and it
+# is out of range for the separate reason below: the directory it fills belongs
+# to another package.
+#
+# The tree is scanned rather than a list of packages pinned, so a package that
+# grows its first first-party manifest under a wiping recipe of its own is
+# caught by the commit that adds it, within the reach the next two paragraphs
+# mark out. The packages that clear their own templates/ today refetch all of
+# it, which is what keeps this green.
+#
+# What that leaves uncovered is a recipe clearing SOMEONE ELSE'S templates/, and
+# the tree has one: packages/system/cert-manager/Makefile runs
+# `rm -rf ../cert-manager-crds/templates/*` and moves the CRDs it pulled into
+# that directory, while cert-manager-crds declares no update target at all. A
+# first-party manifest added there is deleted by the next `make update` in
+# cert-manager and nothing below reports it. Covering that means resolving the
+# removal's target directory rather than reading the wiping package's own, which
+# is a second helper; the pattern below is deliberately not widened to accept a
+# path prefix, because that alone would fire on cert-manager and then list the
+# templates of a directory it does not have -- the removal names the sibling's
+# path, so the lookup has to follow it.
+#
+# Two more places are out of reach because the scan reads only the text of a
+# package's own `update:` recipe. One is a removal made elsewhere: in a
+# prerequisite target, behind an include, or behind a recursive make.
+# capi-operator, clustersecret-operator, openbao and reloader all write
+# `update: clean <name>-update` and take both of those recipes from
+# hack/package.mk, which removes nothing under templates/ today; a removal
+# added there would go unreported for all four. The other is a Makefile the
+# glob does not reach: it stops at packages/*/*/, and the two vendored kamaji
+# subcharts below that level declare no `update` target today.
+#
+# The scan alone would also be green against a detector that finds nothing, so
+# the control below runs the same two helpers over a fixture that does hold an
+# unrefetched file, and over that fixture with the removal taken out.
+#
+# Constraints from cozytest.sh: it rewrites the closing brace of every function
+# in this file into `return 0`, so a helper cannot report through its exit
+# status -- both report through stdout -- and it injects `set -e`, so statuses
+# are captured explicitly.
+#
+# Run with: hack/cozytest.sh hack/package-update-templates.bats
+# -----------------------------------------------------------------------------
+
+# Prints the recipe line that clears templates/ wholesale, for a package
+# Makefile whose `update` target has one. Silent otherwise, including for a
+# Makefile with no `update` target at all.
+#
+# The recipe is read the way make reads one: the run of tab-indented lines after
+# `update:`, with blank lines and comment lines passed over rather than treated
+# as its end, because make ignores them and carries on. A tab-indented comment
+# is skipped rather than searched, which matters more here than anywhere else in
+# the file: a recipe that deliberately does not clear templates/ is likely to
+# carry a line saying why, and without the skip
+# `# deliberately no rm -rf templates here` reads as a wipe and fails that very
+# package. Both helpers drop comments before searching, for mirror-image
+# reasons. The terminator class accepts a following space or `;` and nothing
+# else, because `templates &&` already matches through the space and
+# `templates&` is a shape nobody writes.
+#
+# The match accepts `rm -rf`, `rm -fr` and `rm -r` against `templates` and
+# `./templates`, bare, with a trailing slash, or with a `/*` glob -- the three
+# spellings that empty the directory. It deliberately does not accept
+# `rm -rf templates/one-file.yml`, which takes a single file the recipe goes on
+# to refetch (rabbitmq-operator), nor a narrower glob such as
+# `rm -rf templates/*.yaml`, which takes a subset the same way.
+#
+# It is a text match and not a shell parse, so a quoted `rm -rf "templates"`, a
+# removal reached through a variable, a `find -delete` and a `cd` into another
+# directory first are all invisible to it. So is `rm -rf templates&& mkdir`,
+# where the removal runs straight into `&&` with no space: legal shell, and
+# outside the terminator class. So is a path-prefixed target -- the
+# cert-manager case in the header is one, and the prefix is the only thing
+# keeping it out, since the `/*` it ends with is accepted. The enumeration is
+# only as complete as the last reader made it, so extend it in the same edit as
+# the pattern.
+#
+# A second `update:` can fool this in either direction: make runs the last
+# recipe, this reads whichever ones are adjacent. Nothing in the tree writes
+# one.
+load test_helper
+
+wipe_command() {
+    awk '/^update:/ { r = 1; next }
+         r && /^\t[[:space:]]*@?#/ { next }
+         r && /^\t/ { print; next }
+         r && /^[[:space:]]*$/ { next }
+         r && /^[[:space:]]*#/ { next }
+         r { exit }' "$1" |
+        grep -E 'rm[[:space:]]+-(rf|fr|r)[[:space:]]+(\./)?templates(/\*?)?([[:space:]]|;|$)' || true
+}
+
+# Prints every file tracked under a package's templates/ that its Makefile
+# never mentions, one path per line. Whether that matters is the caller's call:
+# it matters for a package whose recipe clears the directory, and for no other.
+#
+# The listing is the index, so only a tracked file is at stake -- it is the one
+# the next `make update` deletes out from under a reviewer who has no reason to
+# look. Reading the working tree instead would fail a package over the
+# developer's own litter: an untracked .orig from a hand-applied patch, a
+# half-written template, a .DS_Store. A guard that goes red on scratch files is
+# a guard that gets switched off.
+#
+# The extension is stripped before matching, because a recipe may assemble the
+# filename from a variable holding the bare stem -- etcd-operator-crds writes
+# templates/$$c.yaml from a CRDS list of names without one. A basename whose
+# only dot is its first character keeps the whole name instead: stripping there
+# leaves the empty string, which grep matches against every Makefile, and the
+# file would pass without being looked at. The search covers the whole Makefile
+# rather than the recipe alone for the same reason as the stem: the variable is
+# assigned above the target. Both make the match generous, so a stem that
+# appears for any other reason satisfies it. Two live examples in the tree
+# today. A sibling's name: gateway-api-crds clears templates/ and writes
+# templates/crds-experimental.yaml, so a templates/crds.yaml added beside it
+# passes because `crds` is inside that name. And a word used elsewhere in the
+# file: objectstorage-controller clears templates/ and writes only
+# templates/controller.yaml, yet a templates/sidecar.yaml would pass, since its
+# image targets say `sidecar` several times. This reports the files nothing in
+# the Makefile refers to, not every file the recipe fails to write.
+#
+# Comment lines are dropped before the search, so a filename written into one is
+# not a mention: a rationale comment above a recipe, naming the very file it is
+# about, would otherwise exempt that package from its own guard. Comments
+# naming a template are not rare in the tree, so this is the difference between
+# a package being read and a package being taken at its word.
+#
+# The NAME and NAMESPACE assignments go the same way. They are the package's
+# identity rather than a reference to any file, and a package called foo-bar
+# whose recipe writes templates/bar.yaml has that file's stem inside its own
+# name: left in, they let a package vouch for its own templates without any
+# recipe touching them. The match is on the variable name and not on the
+# assignment operator, because the hole does not care how it was spelled: the
+# `export` prefix is optional and so is whitespace either side. The cases below
+# pin the export prefix and the `:=` spelling, which with the bare `NAME=` are
+# every form the tree writes; the pattern is looser than that on purpose, and
+# the looseness beyond those forms is not something a case here checks.
+#
+# Two names are named rather than a `[A-Z_]+=` shape for the opposite reason:
+# a variable holding content is what the whole-file search is there to find,
+# and etcd-operator-crds names its templates through nothing but its CRDS
+# list, so a shape that broad would be one unspaced assignment away from
+# blinding the scan to five CRDs. That list is written spaced, which is why
+# the broader pattern would not reach it today and why no case below can pin
+# this choice; two names cannot reach it at any spacing. No package the scan
+# reaches is exempted this way today; the exclusion is for the first one that
+# would be.
+unnamed_templates() {
+    _mk=$1
+    _dir=$(dirname "$_mk")
+    _code=$(grep -vE '^([[:space:]]*@?#|(export[[:space:]]+)?(NAME|NAMESPACE)[[:space:]]*[:?+]*=)' "$_mk") || true
+    git -C "$_dir" ls-files -- templates | while IFS= read -r _f; do
+        _base=${_f##*/}
+        _stem=${_base%.*}
+        [ -n "$_stem" ] || _stem=$_base
+        printf '%s\n' "$_code" | grep -Fq -- "$_stem" || printf '%s\n' "$_dir/$_f"
+    done
+}
+
+@test "the scan reports a template file that a wiping recipe does not name" {
+    # Negative control, and it runs first on purpose: cozytest.sh exits at the
+    # first failing @test, so behind the tree scan a red tree would take this
+    # with it -- and "a package regressed" and "the helpers stopped measuring"
+    # would look identical at exactly the moment the difference matters. The
+    # scan below is green both on a tree with no offender and on a detector
+    # that cannot see one; this separates them by handing the same helpers a
+    # package broken exactly the way kubevirt-cdi was.
+    tmp=$(mktemp -d)
+    mkdir -p "$tmp/pkg/templates"
+    : > "$tmp/pkg/templates/fetched.yaml"
+    : > "$tmp/pkg/templates/local-extra.yaml"
+    # A tracked dotfile. Stripping its extension leaves nothing and an empty
+    # pattern matches every Makefile, so without the guard in the helper this
+    # file is skipped in silence rather than reported.
+    : > "$tmp/pkg/templates/.gitkeep"
+    # Two files whose stems sit inside the package's own identity, the shape
+    # every `foo-bar` package writing templates/bar.yaml has. One is covered by
+    # NAME and one by NAMESPACE, and the Makefile below writes the first as
+    # `export NAME=` and the second as `NAMESPACE := `, so between them the
+    # export prefix, the bare form, spacing around the operator and the `:=`
+    # spelling are all exercised. Left in the search, each of these matches
+    # with nothing writing it.
+    : > "$tmp/pkg/templates/name-echo.yaml"
+    : > "$tmp/pkg/templates/bare-echo.yaml"
+    # The comment names the file the recipe does not write, which is what a
+    # rationale comment above a real recipe looks like. It must not count as the
+    # recipe naming it.
+    printf 'export NAME=demo-name-echo\nNAMESPACE := cozy-bare-echo\n# local-extra.yaml is written by hand\nupdate:\n\trm -rf templates\n\tmkdir templates\n\twget -O templates/fetched.yaml https://example.invalid/f.yaml\n' \
+        > "$tmp/pkg/Makefile"
+    # An index is what the helper reads, so the fixture needs one. Staged rather
+    # than committed: nothing here needs a commit object, and a commit would want
+    # an identity and a signature from whoever runs the suite.
+    git -C "$tmp" init --quiet
+    git -C "$tmp" add --all
+
+    # Untracked litter, written after the staging so it stays untracked. Neither
+    # file is at stake and neither may be reported.
+    : > "$tmp/pkg/templates/scratch.yaml"
+    : > "$tmp/pkg/templates/.DS_Store"
+
+    if [ -z "$(wipe_command "$tmp/pkg/Makefile")" ]; then
+        echo "the matcher did not see 'rm -rf templates' in the fixture recipe" >&2
+        rm -rf "$tmp"
+        exit 1
+    fi
+
+    # Exactly the tracked files the recipe does not name. Reporting the fetched
+    # one too would fail every wiping package in the tree, reporting none of them
+    # would pass all of them, and reporting the litter would fail a package over
+    # a file nobody is going to miss.
+    expected=$(printf '%s\n%s\n%s\n%s' "$tmp/pkg/templates/.gitkeep" "$tmp/pkg/templates/bare-echo.yaml" "$tmp/pkg/templates/local-extra.yaml" "$tmp/pkg/templates/name-echo.yaml")
+    found=$(unnamed_templates "$tmp/pkg/Makefile")
+    if [ "$found" != "$expected" ]; then
+        echo "expected only the tracked unrefetched files to be reported:" >&2
+        printf '%s\n' "$expected" >&2
+        echo "got:" >&2
+        printf '%s\n' "$found" >&2
+        rm -rf "$tmp"
+        exit 1
+    fi
+
+    # The trailing-slash spelling removes exactly as much, so it has to be seen
+    # as well. Spelled with the leading ./ at the same time, which is the other
+    # optional half of the pattern; the fixture above carries neither.
+    printf 'update:\n\trm -rf ./templates/\n\twget -O templates/fetched.yaml https://example.invalid/f.yaml\n' \
+        > "$tmp/pkg/Makefile"
+    if [ -z "$(wipe_command "$tmp/pkg/Makefile")" ]; then
+        echo "the matcher missed 'rm -rf ./templates/', which clears the directory" >&2
+        rm -rf "$tmp"
+        exit 1
+    fi
+
+    # And the glob spelling, which empties the directory without naming it as
+    # the argument. It is what cert-manager's recipe writes, so it is the line a
+    # package copies when it wants to clear its own templates.
+    printf 'update:\n\trm -rf templates/*\n\twget -O templates/fetched.yaml https://example.invalid/f.yaml\n' \
+        > "$tmp/pkg/Makefile"
+    if [ -z "$(wipe_command "$tmp/pkg/Makefile")" ]; then
+        echo "the matcher missed 'rm -rf templates/*', which empties the directory" >&2
+        rm -rf "$tmp"
+        exit 1
+    fi
+
+    # A tab-indented comment inside the recipe is not shell. A recipe that
+    # deliberately does not clear templates/ tends to carry a line saying why,
+    # and searching that line would fail that very package. Both spellings
+    # are pinned because make accepts both and the tree writes both.
+    for lead in '#' '@#'; do
+        printf 'update:\n\tmkdir -p templates\n\t%s deliberately no rm -rf templates here: the upload-proxy files are ours\n' \
+            "$lead" > "$tmp/pkg/Makefile"
+        if [ -n "$(wipe_command "$tmp/pkg/Makefile")" ]; then
+            echo "the matcher read a '$lead' comment inside the recipe as a removal" >&2
+            rm -rf "$tmp"
+            exit 1
+        fi
+    done
+
+    # A comment at column zero is ignored by make the same way a blank line is,
+    # and the recipe continues past it: a recipe with one runs the commands
+    # that follow it.
+    printf 'update:\n\tmkdir -p templates\n# a comment at column zero\n\trm -rf templates\n' \
+        > "$tmp/pkg/Makefile"
+    if [ -z "$(wipe_command "$tmp/pkg/Makefile")" ]; then
+        echo "the matcher stopped at a column-zero comment and missed the removal after it" >&2
+        rm -rf "$tmp"
+        exit 1
+    fi
+
+    # make ignores a blank line inside a recipe and carries on, so the scan has
+    # to as well or everything after the blank is invisible to it.
+    printf 'update:\n\tmkdir -p templates\n\n\trm -rf templates\n' \
+        > "$tmp/pkg/Makefile"
+    if [ -z "$(wipe_command "$tmp/pkg/Makefile")" ]; then
+        echo "the matcher stopped at a blank line and missed the removal after it" >&2
+        rm -rf "$tmp"
+        exit 1
+    fi
+
+    # The `;` terminator is load-bearing, not decoration: etcd-operator-crds
+    # writes `rm -rf templates; mkdir templates; \` and is reached through this
+    # branch alone, so dropping it silently takes that package out of the scan.
+    printf 'update:\n\trm -rf templates; mkdir templates\n\twget -O templates/fetched.yaml https://example.invalid/f.yaml\n' \
+        > "$tmp/pkg/Makefile"
+    if [ -z "$(wipe_command "$tmp/pkg/Makefile")" ]; then
+        echo "the matcher missed 'rm -rf templates;', the shape etcd-operator-crds uses" >&2
+        rm -rf "$tmp"
+        exit 1
+    fi
+
+    # The two flag spellings the header claims to accept. Nothing in the tree
+    # writes either today, so without these cases that part of the header
+    # would go unchecked.
+    for flags in -fr -r; do
+        printf 'update:\n\trm %s templates\n\twget -O templates/fetched.yaml https://example.invalid/f.yaml\n' \
+            "$flags" > "$tmp/pkg/Makefile"
+        if [ -z "$(wipe_command "$tmp/pkg/Makefile")" ]; then
+            echo "the matcher missed 'rm $flags templates', which the header says it accepts" >&2
+            rm -rf "$tmp"
+            exit 1
+        fi
+    done
+
+    # Scoping. The helper claims to read only the `update` recipe, and to stay
+    # silent for a Makefile that has no `update` target at all. The tree cannot
+    # test either, because every wipe in it already sits inside `update`, so
+    # without these two a matcher that searched the whole file would look
+    # identical. The consequence of losing this is a false positive that never
+    # clears: a package growing `clean: rm -rf templates` reported forever.
+    printf 'clean:\n\trm -rf templates\nupdate:\n\tmkdir -p templates\n\twget -O templates/fetched.yaml https://example.invalid/f.yaml\n' \
+        > "$tmp/pkg/Makefile"
+    if [ -n "$(wipe_command "$tmp/pkg/Makefile")" ]; then
+        echo "the matcher read a removal from a target other than update" >&2
+        rm -rf "$tmp"
+        exit 1
+    fi
+
+    # The other order, and one the tree writes: a `test:` below the `update:`
+    # recipe. Above, `r` is still 0 and the gate does the work; here the recipe
+    # has already started and only the terminator can stop it, so without this
+    # case that half is unpinned.
+    printf 'update:\n\tmkdir -p templates\nclean:\n\trm -rf templates\n' \
+        > "$tmp/pkg/Makefile"
+    if [ -n "$(wipe_command "$tmp/pkg/Makefile")" ]; then
+        echo "the matcher ran past the end of the update recipe into a later target" >&2
+        rm -rf "$tmp"
+        exit 1
+    fi
+
+    printf 'clean:\n\trm -rf templates\n' > "$tmp/pkg/Makefile"
+    if [ -n "$(wipe_command "$tmp/pkg/Makefile")" ]; then
+        echo "the matcher reported on a Makefile with no update target" >&2
+        rm -rf "$tmp"
+        exit 1
+    fi
+
+    # The other side of that boundary: removing one file inside templates/ is
+    # rabbitmq-operator's shape, it takes only what the recipe refetches, and a
+    # pattern loose enough to call it a wipe would report that package forever.
+    printf 'update:\n\trm -rf templates/fetched.yaml\n\twget -O templates/fetched.yaml https://example.invalid/f.yaml\n' \
+        > "$tmp/pkg/Makefile"
+    if [ -n "$(wipe_command "$tmp/pkg/Makefile")" ]; then
+        echo "the matcher read a single-file removal as clearing the directory" >&2
+        rm -rf "$tmp"
+        exit 1
+    fi
+
+    # The narrower glob is the other rejection the header claims. It takes a
+    # subset the recipe refetches, so calling it a wipe would report the package forever -- and it
+    # discriminates: widening the tail to accept any glob, the obvious "also
+    # match globs" edit, slips past the single-file case above but not this one.
+    printf 'update:\n\trm -rf templates/*.yaml\n\twget -O templates/fetched.yaml https://example.invalid/f.yaml\n' \
+        > "$tmp/pkg/Makefile"
+    if [ -n "$(wipe_command "$tmp/pkg/Makefile")" ]; then
+        echo "the matcher read a narrower glob as clearing the directory" >&2
+        rm -rf "$tmp"
+        exit 1
+    fi
+
+    # And a recipe that only creates the directory switches the check off, so
+    # the scan is measuring the removal rather than the package.
+    printf 'update:\n\tmkdir -p templates\n\twget -O templates/fetched.yaml https://example.invalid/f.yaml\n' \
+        > "$tmp/pkg/Makefile"
+    if [ -n "$(wipe_command "$tmp/pkg/Makefile")" ]; then
+        echo "the matcher fired on a recipe that only creates the directory" >&2
+        rm -rf "$tmp"
+        exit 1
+    fi
+
+    rm -rf "$tmp"
+}
+
+@test "no package update recipe clears templates/ over a file it never refetches" {
+    examined=0
+    offenders=""
+
+    for mk in packages/*/*/Makefile; do
+        [ -f "$mk" ] || continue
+        examined=$((examined + 1))
+        [ -n "$(wipe_command "$mk")" ] || continue
+        found=$(unnamed_templates "$mk")
+        if [ -n "$found" ]; then
+            offenders="$offenders
+$mk clears templates/ but names none of:
+$found"
+        fi
+    done
+
+    # A glob that matched nothing -- packages/ moved, or the suite run from
+    # somewhere other than the repository root -- would otherwise report success
+    # having looked at no Makefile at all.
+    if [ "$examined" -eq 0 ]; then
+        echo "no packages/*/*/Makefile found: run this from the repository root" >&2
+        exit 1
+    fi
+
+    # The index is where the scan reads a package's templates from, so an answer
+    # of nothing here means it could not have reported anything either.
+    if [ -z "$(git ls-files -- packages | head -1)" ]; then
+        echo "git ls-files reported no tracked file under packages/: this test" >&2
+        echo "cannot see a template directory, so it measured nothing" >&2
+        exit 1
+    fi
+
+    if [ -n "$offenders" ]; then
+        echo "a package update recipe deletes templates/ over a file it does not refetch:" >&2
+        echo "$offenders" >&2
+        echo "" >&2
+        echo "templates/ holds first-party manifests alongside the vendored ones and" >&2
+        echo "'rm -rf templates' takes both, silently: the next 'make update' drops the" >&2
+        echo "first-party ones and still exits 0. Either keep 'mkdir -p templates'" >&2
+        echo "without the removal -- wget -O and kustomize > overwrite what they fetch" >&2
+        echo "anyway -- or write the local file from the recipe too, where the clean" >&2
+        echo "slate is load-bearing (etcd-operator-crds stages into a tmpdir first)." >&2
+        exit 1
+    fi
+}
diff --git a/hack/package.mk b/hack/package.mk
index cf0f5b72b4..f8b7c7a0ba 100644
--- a/hack/package.mk
+++ b/hack/package.mk
@@ -1,5 +1,7 @@
+# .DEFAULT_GOAL is a variable, so `=` is correct here. .PHONY is a target and
+# takes a colon; written as an assignment it declares nothing and make is silent.
 .DEFAULT_GOAL=help
-.PHONY=help show diff apply delete update image
+.PHONY: help show diff apply delete suspend resume check clean
 
 help: ## Show this help.
 	@awk 'BEGIN {FS = ":.*?## "} /^[a-zA-Z_-]+:.*?## / {sub("\\\\n",sprintf("\n%22c"," "), $$2);printf "\033[36m%-20s\033[0m %s\n", $$1, $$2}' $(MAKEFILE_LIST)
diff --git a/hack/packages-index/CODEOWNERS b/hack/packages-index/CODEOWNERS
new file mode 100644
index 0000000000..8728016b64
--- /dev/null
+++ b/hack/packages-index/CODEOWNERS
@@ -0,0 +1,8 @@
+# Every index entry requires maintainer review before merge (the auto-merge
+# lane in validate.yaml only fires for an owner version bump signed by the
+# entry's recorded identity; everything else lands here).
+/entries/  @cozystack/maintainers
+
+# The gate itself and the workflow are maintainer-owned.
+/scripts/            @cozystack/maintainers
+/github-workflows/   @cozystack/maintainers
diff --git a/hack/packages-index/README.md b/hack/packages-index/README.md
new file mode 100644
index 0000000000..835d09411f
--- /dev/null
+++ b/hack/packages-index/README.md
@@ -0,0 +1,45 @@
+# Cozystack community package index (template)
+
+This directory is a **template** for the standalone `cozystack/packages-index` repository. Copy its contents into that repository's root (moving `github-workflows/validate.yaml` to `.github/workflows/validate.yaml`) to stand up the community index and its publication gate.
+
+The index is metadata only: it records where community packages live and who owns them. Artifacts stay in ordinary OCI registries; nothing is hosted here.
+
+## Layout
+
+```text
+entries/<name>.yaml             # one metadata-only entry per package
+scripts/validate-entry.sh       # offline gate: cozypkg validate + mandatory cosign
+github-workflows/validate.yaml  # CI that runs the gate on every entry change
+```
+
+## Entry format
+
+Each file under `entries/` is a single record (see `entries/example.foo.yaml`):
+
+```yaml
+name: foo.bar
+ociRef: oci://ghcr.io/foo/bar
+version: v1.2.3
+description: A SQL database operator
+maintainer: Foo <foo@example.com>
+homepage: https://example.com/foo
+tags:
+  - database
+  - sql
+signing:
+  identity: https://github.com/foo/bar/.github/workflows/release.yaml@refs/heads/main
+  issuer: https://token.actions.githubusercontent.com
+```
+
+## Two-lane merge policy
+
+Following krew-index, submissions take one of two lanes:
+
+- **Owner version bump.** A change that only updates an existing entry's `version` or description, leaving `ociRef` and `signing` untouched, auto-merges once the new artifact validates and is signed by the entry's **recorded** cosign identity. This keeps the routine "new release of a listed package" path fast.
+- **New entry, or a change to `ociRef`, `maintainer`, or `signing`.** These are the security-relevant edits and require maintainer review before merge.
+
+Cosign verification is **mandatory** on the gate for both lanes: the trust anchor is the recorded signing identity, so a bump fails if the new artifact is not signed by the originally approved identity.
+
+## Trust model
+
+Signature verification happens here, at publication time, not at tap time. `cozypkg tap` and the dashboard connect flow validate an artifact's structure but do not verify its cosign signature: a cluster that taps a listed repository trusts that this index already verified it. The verification points are this CI gate (which pins each release to the entry's recorded identity) and, optionally, Flux `OCIRepository` verification at pull time. Tapping a third-party repository runs its charts in the management cluster, so operators should tap only sources they trust or that appear in a curated index like this one.
diff --git a/hack/packages-index/entries/example.foo.yaml b/hack/packages-index/entries/example.foo.yaml
new file mode 100644
index 0000000000..51f155b170
--- /dev/null
+++ b/hack/packages-index/entries/example.foo.yaml
@@ -0,0 +1,12 @@
+name: foo.bar
+ociRef: oci://ghcr.io/foo/bar
+version: v1.2.3
+description: A SQL database operator
+maintainer: Foo <foo@example.com>
+homepage: https://example.com/foo
+tags:
+  - database
+  - sql
+signing:
+  identity: https://github.com/foo/bar/.github/workflows/release.yaml@refs/heads/main
+  issuer: https://token.actions.githubusercontent.com
diff --git a/hack/packages-index/github-workflows/validate.yaml b/hack/packages-index/github-workflows/validate.yaml
new file mode 100644
index 0000000000..0e2b749557
--- /dev/null
+++ b/hack/packages-index/github-workflows/validate.yaml
@@ -0,0 +1,80 @@
+# Copy to .github/workflows/validate.yaml in the cozystack/packages-index repo.
+# Publication gate: validate every changed index entry and route it to the
+# auto-merge lane (owner version bump, signed by the recorded identity) or the
+# maintainer-review lane (new entry or a security-relevant edit).
+name: validate
+
+on:
+  pull_request:
+    paths:
+      - "entries/**"
+
+permissions:
+  contents: read
+  pull-requests: write
+
+jobs:
+  validate:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          # Full history so the gate can diff the entry against the base ref.
+          fetch-depth: 0
+
+      - uses: actions/setup-go@v5
+        with:
+          go-version: "1.26"
+
+      # Pin both tools: the gate decides auto-merge, so its toolchain must be
+      # reproducible and not shiftable by an upstream retag. Bump COZYPKG_VERSION
+      # to the released cozypkg tag this index targets.
+      - name: Install cozypkg
+        env:
+          COZYPKG_VERSION: v1.0.0
+        run: go install "github.com/cozystack/cozystack/cmd/cozypkg@${COZYPKG_VERSION}"
+
+      - name: Install yq
+        env:
+          YQ_VERSION: v4.44.6
+        run: |
+          sudo curl --fail --silent --show-error --location \
+            --output /usr/local/bin/yq \
+            "https://github.com/mikefarah/yq/releases/download/${YQ_VERSION}/yq_linux_amd64"
+          sudo chmod +x /usr/local/bin/yq
+
+      # Pin the verifier too: cosign is what the auto-merge decision rests on.
+      - uses: sigstore/cosign-installer@d58896d6a1865668819e1d91763c7751a165e159 # v3.9.2
+        with:
+          cosign-release: v2.4.3
+
+      # helm is needed for `cozypkg validate --helm-lint` in the gate.
+      - uses: azure/setup-helm@b9e51907a09c216f16ebe8536097933489208112 # v4.3.0
+        with:
+          version: v3.16.4
+
+      - name: Validate changed entries
+        id: gate
+        env:
+          BASE_REF: origin/${{ github.base_ref }}
+        run: bash scripts/validate-entry.sh
+
+      # NOTE: for a pull request from a fork (the common case for a community
+      # index), GITHUB_TOKEN is read-only regardless of the permissions above,
+      # so the two steps below fail with 403. Before enabling this in the real
+      # packages-index repo, move the merge/label actions into a separate
+      # `workflow_run` job that checks out no untrusted code (do NOT switch the
+      # validation job to pull_request_target, which would run the contributor's
+      # gate script with a write token). The validation job above is safe on
+      # pull_request as-is.
+      - name: Enable auto-merge (owner version bump, signed by recorded identity)
+        if: steps.gate.outputs.lane == 'auto'
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: gh pr merge --squash --auto "${{ github.event.pull_request.number }}"
+
+      - name: Route to maintainer review (new entry or security-relevant edit)
+        if: steps.gate.outputs.lane == 'review'
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: gh pr edit "${{ github.event.pull_request.number }}" --add-label needs-maintainer-review
diff --git a/hack/packages-index/scripts/validate-entry.sh b/hack/packages-index/scripts/validate-entry.sh
new file mode 100755
index 0000000000..8896404772
--- /dev/null
+++ b/hack/packages-index/scripts/validate-entry.sh
@@ -0,0 +1,87 @@
+#!/usr/bin/env bash
+# Publication gate for the community package index.
+#
+# Validates every changed entry with cozypkg, including MANDATORY keyless cosign
+# verification against the entry's recorded signing identity, then classifies
+# the change into the auto-merge lane or the maintainer-review lane. It fails
+# closed: any validation error, parse error, or signature failure blocks; a
+# security-relevant edit is routed to review, never auto-merged.
+set -euo pipefail
+
+BASE_REF="${BASE_REF:-origin/main}"
+ENTRIES_DIR="${ENTRIES_DIR:-entries}"
+
+fail() { echo "::error::$*" >&2; exit 1; }
+
+# field <yaml-file|-> <path>: extract a scalar, defaulting to empty. Reads stdin
+# when the file argument is "-". A yq parse error propagates (fails closed).
+field() {
+  local src="$1" path="$2"
+  if [ "$src" = "-" ]; then
+    yq -r "${path} // \"\""
+  else
+    yq -r "${path} // \"\"" "$src"
+  fi
+}
+
+# git diff failing (e.g. a bad base ref) must abort, not silently report "no
+# changes" and pass — so there is no "|| true" here. Renames (R) and copies (C)
+# are included: a renamed entry file is still a present entry that must be
+# validated, otherwise a rename could smuggle an unreviewed ociRef past the gate.
+changed="$(git diff --name-only --diff-filter=ACMR "${BASE_REF}...HEAD" -- "$ENTRIES_DIR")"
+if [ -z "$changed" ]; then
+  echo "no entry changes to validate"
+  echo "lane=none" >>"${GITHUB_OUTPUT:-/dev/null}"
+  exit 0
+fi
+
+lane="auto" # downgraded to "review" by any security-relevant change
+
+while IFS= read -r file; do
+  [ -n "$file" ] || continue
+  echo "== validating ${file} =="
+
+  name="$(field "$file" '.name')"
+  ociRef="$(field "$file" '.ociRef')"
+  version="$(field "$file" '.version')"
+  identity="$(field "$file" '.signing.identity')"
+  issuer="$(field "$file" '.signing.issuer')"
+
+  [ -n "$name" ] || fail "${file}: name is required"
+  [ -n "$ociRef" ] || fail "${file}: ociRef is required"
+  [ -n "$version" ] || fail "${file}: version is required"
+  { [ -n "$identity" ] && [ -n "$issuer" ]; } || fail "${file}: signing.identity and signing.issuer are required"
+
+  # Lane classification. A new entry, or any change to a security-relevant field
+  # (ociRef, maintainer, or signing identity/issuer), requires maintainer
+  # review. Only a pure version/description bump of an already-listed entry
+  # stays on the auto lane. An unreadable base revision errs toward review.
+  if git cat-file -e "${BASE_REF}:${file}" 2>/dev/null; then
+    base_ociRef="$(git show "${BASE_REF}:${file}" | field - '.ociRef')"
+    base_identity="$(git show "${BASE_REF}:${file}" | field - '.signing.identity')"
+    base_issuer="$(git show "${BASE_REF}:${file}" | field - '.signing.issuer')"
+    base_maintainer="$(git show "${BASE_REF}:${file}" | field - '.maintainer')"
+    maintainer="$(field "$file" '.maintainer')"
+    if [ "$ociRef" != "$base_ociRef" ] ||
+      [ "$identity" != "$base_identity" ] ||
+      [ "$issuer" != "$base_issuer" ] ||
+      [ "$maintainer" != "$base_maintainer" ]; then
+      echo "${file}: security-relevant field changed -> review lane"
+      lane="review"
+    fi
+  else
+    echo "${file}: new entry -> review lane"
+    lane="review"
+  fi
+
+  # Mandatory validation (including helm lint of every component chart) plus
+  # cosign verification against the RECORDED identity.
+  cozypkg validate "${ociRef}:${version}" \
+    --helm-lint \
+    --require-signature \
+    --certificate-identity "$identity" \
+    --certificate-oidc-issuer "$issuer"
+done <<<"$changed"
+
+echo "lane=${lane}" >>"${GITHUB_OUTPUT:-/dev/null}"
+echo "all changed entries validated; lane=${lane}"
diff --git a/hack/parse-rc-tag.sh b/hack/parse-rc-tag.sh
new file mode 100755
index 0000000000..e89e66b99b
--- /dev/null
+++ b/hack/parse-rc-tag.sh
@@ -0,0 +1,48 @@
+#!/bin/sh
+# Usage: parse-rc-tag.sh <rc_tag>
+#
+# Strictly parse a release-candidate tag and print the derived release
+# identifiers as `key=value` lines, ready to append to "$GITHUB_OUTPUT":
+#
+#   rc_tag=v1.6.0-rc.2
+#   stable_version=1.6.0
+#   rc_branch=release-1.6.0-rc.2
+#
+# Whitespace is REJECTED, never stripped. Stripping (`tr -d '[:space:]'`) would
+# silently "correct" a typo like 'v1. 6.0-rc.2' into a different, valid-looking
+# tag. Worse, a caller that keys its concurrency lane on the raw dispatch input
+# would then run two spellings of the same tag ('v1.6.0-rc.2' and
+# 'v1.6.0-rc.2 ') in different lanes, racing to push the same staging branch.
+# Rejecting outright makes the raw input a caller saw byte-identical to the tag
+# acted on here: one canonical spelling per tag, or a hard error.
+#
+# Exit 0 = valid; the three key=value lines on stdout, nothing on stderr.
+# Exit 1 = invalid; the reason on stderr, nothing on stdout.
+
+set -eu
+
+RC_TAG="${1?usage: parse-rc-tag.sh <rc_tag>}"
+
+fail() {
+  echo "$1" >&2
+  exit 1
+}
+
+# Reject any whitespace (leading, trailing, or internal) and the empty string
+# outright, before the pattern match — a stripped-then-matched value would let a
+# whitespace-bearing spelling through as if it were the canonical tag.
+case "$RC_TAG" in
+  '')            fail "rc_tag is empty" ;;
+  *[[:space:]]*) fail "rc_tag '$RC_TAG' must not contain whitespace" ;;
+esac
+
+printf '%s' "$RC_TAG" | grep -Eq '^v[0-9]+\.[0-9]+\.[0-9]+-rc\.[0-9]+$' \
+  || fail "rc_tag '$RC_TAG' must match 'vX.Y.Z-rc.N' (e.g. v1.6.0-rc.1)"
+
+rest="${RC_TAG#v}"       # 1.6.0-rc.2
+version="${rest%-rc.*}"  # 1.6.0
+n="${rest##*-rc.}"       # 2
+
+printf 'rc_tag=v%s-rc.%s\n' "$version" "$n"
+printf 'stable_version=%s\n' "$version"
+printf 'rc_branch=release-%s-rc.%s\n' "$version" "$n"
diff --git a/hack/platform-packages_test.bats b/hack/platform-packages_test.bats
new file mode 100644
index 0000000000..693f4d0563
--- /dev/null
+++ b/hack/platform-packages_test.bats
@@ -0,0 +1,203 @@
+#!/usr/bin/env bats
+# Unit coverage for the lane-specific Package manifest emitted by
+# hack/e2e-platform-packages.sh. This suite runs through hack/cozytest.sh, so it
+# uses direct shell assertions rather than bats' run/status helpers.
+
+load test_helper
+
+@test "QEMU defaults keep the platform-managed LINSTOR package" {
+  manifest=$(hack/e2e-platform-packages.sh)
+  names=$(printf '%s\n' "$manifest" | yq -N '.metadata.name')
+  endpoint=$(printf '%s\n' "$manifest" | yq '.spec.components.platform.values.publishing.apiServerEndpoint')
+
+  if [ "$names" != "cozystack.cozystack-platform" ]; then
+    echo "default manifest unexpectedly replaces a platform package: $names" >&2
+    return 1
+  fi
+  if [ "$endpoint" != "https://192.168.123.10:6443" ]; then
+    echo "unexpected default API endpoint: $endpoint" >&2
+    return 1
+  fi
+}
+
+@test "container mode replaces LINSTOR with DRBD disabled" {
+  manifest=$(COZY_APISERVER_ENDPOINT=https://192.168.123.11:6443 COZY_LINSTOR_DRBD_ENABLED=false hack/e2e-platform-packages.sh)
+  names=$(printf '%s\n' "$manifest" | yq -N '.metadata.name')
+  expected_names=$(printf '%s\n' cozystack.cozystack-platform cozystack.linstor cozystack.kubevirt-cdi)
+  endpoint=$(printf '%s\n' "$manifest" | yq 'select(.metadata.name == "cozystack.cozystack-platform") | .spec.components.platform.values.publishing.apiServerEndpoint')
+  disabled=$(printf '%s\n' "$manifest" | yq 'select(.metadata.name == "cozystack.cozystack-platform") | .spec.components.platform.values.bundles.disabledPackages | join(",")')
+  drbd=$(printf '%s\n' "$manifest" | yq 'select(.metadata.name == "cozystack.linstor") | .spec.components.linstor.values.drbd.enabled')
+
+  if [ "$names" != "$expected_names" ]; then
+    echo "container manifest has unexpected packages: $names" >&2
+    return 1
+  fi
+  if [ "$endpoint" != "https://192.168.123.11:6443" ]; then
+    echo "container API endpoint was not forwarded: $endpoint" >&2
+    return 1
+  fi
+  if [ "$disabled" != "cozystack.linstor,cozystack.kubevirt-cdi" ]; then
+    echo "platform-managed LINSTOR was not disabled: $disabled" >&2
+    return 1
+  fi
+  if [ "$drbd" != "false" ]; then
+    echo "replacement LINSTOR package did not disable DRBD: $drbd" >&2
+    return 1
+  fi
+}
+
+@test "container mode raises the CDI importer memory ceiling" {
+  manifest=$(COZY_APISERVER_ENDPOINT=https://192.168.123.11:6443 COZY_LINSTOR_DRBD_ENABLED=false hack/e2e-platform-packages.sh)
+  disabled=$(printf '%s\n' "$manifest" | yq 'select(.metadata.name == "cozystack.cozystack-platform") | .spec.components.platform.values.bundles.disabledPackages | join(",")')
+  mem=$(printf '%s\n' "$manifest" | yq 'select(.metadata.name == "cozystack.kubevirt-cdi") | .spec.components.kubevirt-cdi.values.importerResources.limits.memory')
+  cpu=$(printf '%s\n' "$manifest" | yq 'select(.metadata.name == "cozystack.kubevirt-cdi") | .spec.components.kubevirt-cdi.values.importerResources.limits.cpu')
+
+  if [ "$disabled" != "cozystack.linstor,cozystack.kubevirt-cdi" ]; then
+    echo "container mode did not replace both packages: $disabled" >&2
+    return 1
+  fi
+  if [ "$mem" != "4Gi" ]; then
+    echo "replacement CDI package did not raise the memory ceiling: $mem" >&2
+    return 1
+  fi
+  # The CPU ceiling deliberately stays at CDI's own default: the failure this
+  # override answers was memory, and widening CPU too would be an unmeasured
+  # second change riding along.
+  if [ "$cpu" != "750m" ]; then
+    echo "replacement CDI package moved the CPU ceiling off CDI's default: $cpu" >&2
+    return 1
+  fi
+}
+
+@test "the CDI chart default does not move production behaviour" {
+  # The override above is a lane concern. The chart itself must restate CDI's
+  # built-in requirements, so an install that sets nothing behaves as it did
+  # before importerResources existed.
+  defaults=$(helm template packages/system/kubevirt-cdi --set _cluster.root-host=example.org \
+    | yq -N 'select(.kind == "CDI") | .spec.config.podResourceRequirements | [.limits.cpu, .limits.memory, .requests.cpu, .requests.memory] | join(" ")' | grep .)
+
+  if [ "$defaults" != "750m 600M 100m 60M" ]; then
+    echo "kubevirt-cdi default podResourceRequirements drifted from CDI's own: $defaults" >&2
+    return 1
+  fi
+}
+
+@test "invalid DRBD mode fails before emitting YAML" {
+  if manifest=$(COZY_LINSTOR_DRBD_ENABLED=unsupported hack/e2e-platform-packages.sh); then
+    echo "invalid DRBD mode unexpectedly succeeded" >&2
+    return 1
+  fi
+  if [ -n "$manifest" ]; then
+    echo "invalid DRBD mode emitted a partial manifest" >&2
+    return 1
+  fi
+}
+
+@test "every e2e lane forwards the container-lane overrides into the sandbox" {
+  make_command=$(make -n -C packages/core/testing SANDBOX_NAME=test COZY_LINSTOR_DRBD_ENABLED=false install-cozystack)
+  if ! printf '%s\n' "$make_command" | grep -Fq -- '-e COZY_LINSTOR_DRBD_ENABLED="false"'; then
+    echo "testing Makefile does not forward COZY_LINSTOR_DRBD_ENABLED" >&2
+    return 1
+  fi
+
+  # Install and run must agree on the class: a mismatch fails deep inside a suite.
+  for wf in .github/workflows/pull-requests.yaml .github/workflows/e2e-fork.yaml .github/workflows/nightly.yaml .github/workflows/e2e-tag.yaml; do
+    install='.jobs.e2e.steps[] | select(.name == "Install Cozystack into sandbox")'
+    tests='.jobs.e2e.steps[] | select(.name | test("^Run E2E tests"))'
+    if [ "$(yq "$install | .env.COZY_LINSTOR_DRBD_ENABLED" "$wf")" != "false" ]; then
+      echo "$wf: install does not set COZY_LINSTOR_DRBD_ENABLED=false" >&2
+      return 1
+    fi
+    if [ "$(yq "$install | .env.COZY_E2E_STORAGE_CLASS" "$wf")" != "local" ]; then
+      echo "$wf: install does not set COZY_E2E_STORAGE_CLASS=local" >&2
+      return 1
+    fi
+    if [ "$(yq "$tests | .env.COZY_E2E_STORAGE_CLASS" "$wf")" != "local" ]; then
+      echo "$wf: the suite run does not set COZY_E2E_STORAGE_CLASS=local" >&2
+      return 1
+    fi
+  done
+}
+
+@test "a selector list is emitted under one disabledPackages key, merged with the container pair" {
+  manifest=$(COZY_LINSTOR_DRBD_ENABLED=false COZY_DISABLED_PACKAGES="cozystack.goldpinger cozystack.linstor cozystack.keda" hack/e2e-platform-packages.sh)
+  disabled=$(printf '%s\n' "$manifest" | yq 'select(.metadata.name == "cozystack.cozystack-platform") | .spec.components.platform.values.bundles.disabledPackages | join(",")')
+
+  if [ "$disabled" != "cozystack.linstor,cozystack.kubevirt-cdi,cozystack.goldpinger,cozystack.keda" ]; then
+    echo "selector list was not merged once with the container pair: $disabled" >&2
+    return 1
+  fi
+}
+
+@test "a selector list alone leaves the platform-managed packages in place" {
+  manifest=$(COZY_DISABLED_PACKAGES="cozystack.goldpinger cozystack.keda" hack/e2e-platform-packages.sh)
+  names=$(printf '%s\n' "$manifest" | yq -N '.metadata.name')
+  disabled=$(printf '%s\n' "$manifest" | yq '.spec.components.platform.values.bundles.disabledPackages | join(",")')
+
+  if [ "$names" != "cozystack.cozystack-platform" ]; then
+    echo "a selector list unexpectedly replaced a platform package: $names" >&2
+    return 1
+  fi
+  if [ "$disabled" != "cozystack.goldpinger,cozystack.keda" ]; then
+    echo "selector list was not emitted as given: $disabled" >&2
+    return 1
+  fi
+}
+
+@test "no selector list emits no disabledPackages key" {
+  manifest=$(hack/e2e-platform-packages.sh)
+  key=$(printf '%s\n' "$manifest" | yq '.spec.components.platform.values.bundles | has("disabledPackages")')
+
+  if [ "$key" != "false" ]; then
+    echo "default manifest carries disabledPackages: $key" >&2
+    return 1
+  fi
+}
+
+@test "root monitoring redirects stay off, including for a narrow suite selection" {
+  for disabled in "" "$(hack/select-install.sh --disabled vminstance)"; do
+    manifest=$(COZY_DISABLED_PACKAGES="$disabled" hack/e2e-platform-packages.sh)
+    root=$(printf '%s\n' "$manifest" | yq 'select(.metadata.name == "cozystack.cozystack-platform") | .spec.components.platform.values.monitoring.rootEnabled')
+
+    if [ "$root" != "false" ]; then
+      echo "monitoring.rootEnabled is '$root' with disabledPackages '$disabled', but Tenant/root monitoring is off" >&2
+      return 1
+    fi
+  done
+}
+
+@test "a malformed package name fails before emitting YAML" {
+  for bad in "goldpinger" "cozystack." "cozystack.Gold" "cozystack.a;b"; do
+    if manifest=$(COZY_DISABLED_PACKAGES="cozystack.keda $bad" hack/e2e-platform-packages.sh 2>/dev/null); then
+      echo "malformed package name '$bad' unexpectedly succeeded" >&2
+      return 1
+    fi
+    if [ -n "$manifest" ]; then
+      echo "malformed package name '$bad' emitted a partial manifest" >&2
+      return 1
+    fi
+  done
+}
+
+@test "both gating workflows select before installing and forward the list" {
+  make_command=$(make -n -C packages/core/testing SANDBOX_NAME=test COZY_DISABLED_PACKAGES="cozystack.keda" install-cozystack)
+  if ! printf '%s\n' "$make_command" | grep -Fq -- '-e COZY_DISABLED_PACKAGES="cozystack.keda"'; then
+    echo "testing Makefile does not forward COZY_DISABLED_PACKAGES" >&2
+    return 1
+  fi
+
+  for wf in .github/workflows/pull-requests.yaml .github/workflows/e2e-fork.yaml; do
+    select_at=$(yq '.jobs.e2e.steps | to_entries | .[] | select(.value.name == "Select E2E tests") | .key' "$wf")
+    install_at=$(yq '.jobs.e2e.steps | to_entries | .[] | select(.value.name == "Install Cozystack into sandbox") | .key' "$wf")
+    forwarded=$(yq '.jobs.e2e.steps[] | select(.name == "Install Cozystack into sandbox") | .env.COZY_DISABLED_PACKAGES' "$wf")
+
+    if [ -z "$select_at" ] || [ -z "$install_at" ] || [ "$select_at" -ge "$install_at" ]; then
+      echo "$wf: selection (step $select_at) does not precede the install (step $install_at)" >&2
+      return 1
+    fi
+    if [ "$forwarded" != '${{ steps.select.outputs.disabled }}' ]; then
+      echo "$wf: install does not take the selector list: $forwarded" >&2
+      return 1
+    fi
+  done
+}
diff --git a/hack/pod-label-census_test.bats b/hack/pod-label-census_test.bats
new file mode 100644
index 0000000000..465e3fef16
--- /dev/null
+++ b/hack/pod-label-census_test.bats
@@ -0,0 +1,151 @@
+#!/usr/bin/env bats
+# -----------------------------------------------------------------------------
+# Unit tests for the pod-label census in
+# hack/e2e-chainsaw/_lib/pod-label-census.sh.
+#
+# The census exists because a `podLogs` collector cannot report that its
+# selector matched nothing: an empty capture and a stale selector are the same
+# artifact. It prints the instance labels that actually exist, so a reader can
+# tell the two apart.
+#
+# What these tests pin is the discrimination between its three outcomes, which
+# is where the value is and where it is easy to lose. In particular the fourth
+# case below: kubectl exits 0 while logging a klog line about an API group it
+# could not reach, which is the normal shape of a degraded cluster and so the
+# normal shape of a run where this catch fires at all. An earlier form captured
+# with `2>&1`, and that klog line then made the value non-empty -- the "no pods"
+# branch became unreachable and the error printed under the census heading as
+# though it were a pod. Separating the streams is the fix; these tests are what
+# keeps it separated.
+#
+# The report half is a pure function of (rc, stdout, stderr, namespace), so it
+# needs no cluster. The last test drives the kubectl-calling half through a stub
+# on PATH, to prove the streams stay apart end to end rather than only in the
+# half that never touches kubectl.
+#
+# CI runs this file under Bats through `make bats-unit-tests`. It also remains
+# compatible with the legacy `hack/cozytest.sh` translator, whose awk parser
+# recognizes only @test blocks and a bare `}` on its own line. The tests avoid
+# `run`, `$status`, setup(), and teardown() for that compatibility path and use
+# direct shell assertions. Titles remain distinguishable after stripping all
+# but [A-Za-z0-9], as required by the legacy translator.
+#
+# Run with: bats hack/pod-label-census_test.bats
+# -----------------------------------------------------------------------------
+
+load test_helper
+
+HACK_DIR="$(cd "$(dirname "${BATS_TEST_FILENAME:-$0}")" && pwd)"
+# shellcheck source=/dev/null
+. "$HACK_DIR/e2e-chainsaw/_lib/pod-label-census.sh"
+
+@test "census prints the rows it was given under the census heading" {
+    out="$(pod_label_census_report 0 "pod-a  harbor-test-system" "" tenant-test)"
+    echo "$out" | grep -q 'app.kubernetes.io/instance per pod'
+    echo "$out" | grep -q 'pod-a  harbor-test-system'
+}
+
+@test "census names the namespace when the lookup ran and matched nothing" {
+    out="$(pod_label_census_report 0 "" "" tenant-test)"
+    echo "$out" | grep -q 'no pods in tenant-test'
+    # An empty result is an answer, not a failure: saying FAILED here would
+    # report a healthy empty namespace as an unreachable apiserver.
+    #
+    # Counted rather than written `! ... | grep -q`: POSIX exempts a command
+    # whose status is inverted with `!` from `set -e`, so that form cannot fail
+    # a test here -- it would pass whatever the output said.
+    [ "$(echo "$out" | grep -c 'FAILED')" -eq 0 ]
+}
+
+@test "census says the lookup did not run and does not call it no pods" {
+    out="$(pod_label_census_report 1 "" "Unable to connect to the server" tenant-test)"
+    echo "$out" | grep -q 'FAILED'
+    echo "$out" | grep -q 'Unable to connect to the server'
+    # The distinction this whole helper exists for: a lookup that never
+    # returned must not be reported as an empty namespace. Counted, not
+    # `! ... | grep -q`, for the reason given in the empty-result test above.
+    #
+    # Matched on the empty-result sentence rather than on "no pods": the FAILED
+    # line quotes that phrase itself, to say what it is not.
+    [ "$(echo "$out" | grep -c 'no pods in')" -eq 0 ]
+}
+
+@test "census keeps a zero exit with a klog line out of the rows" {
+    klog='E0805 memcache.go:265 Unhandled Error: couldnt get API group list'
+    out="$(pod_label_census_report 0 "" "$klog" tenant-test)"
+    # The regression: with the streams folded together this printed the klog
+    # line under the census heading, as if the API error were a pod.
+    echo "$out" | grep -q 'no pods in tenant-test'
+    echo "$out" | grep -q 'may be partial'
+    echo "$out" | grep -q 'memcache.go'
+}
+
+@test "census marks rows as possibly partial when kubectl also logged an error" {
+    klog='E0805 memcache.go:265 Unhandled Error: couldnt get API group list'
+    out="$(pod_label_census_report 0 "pod-a  harbor-test-system" "$klog" tenant-test)"
+    echo "$out" | grep -q 'pod-a  harbor-test-system'
+    echo "$out" | grep -q 'may be partial'
+}
+
+@test "shared report keeps the three outcomes apart for the cleanup wording too" {
+    # The qdrant cleanup catch feeds the same helper with its own messages, so
+    # the discrimination is tested once and used twice rather than living
+    # inline in YAML where nothing can pin it.
+    failed="cleanup lookup FAILED"
+    empty="matched no objects"
+    heading="cleanup objects still present:"
+
+    out="$(lookup_report 1 "" "Unable to connect to the server" "$failed" "$empty" "$heading")"
+    echo "$out" | grep -q 'cleanup lookup FAILED'
+    # A lookup that never ran must not read as "nothing left to clean up".
+    [ "$(echo "$out" | grep -c 'matched no objects')" -eq 0 ]
+
+    out="$(lookup_report 0 "" "" "$failed" "$empty" "$heading")"
+    echo "$out" | grep -q 'matched no objects'
+
+    out="$(lookup_report 0 "job.batch/qdrant-test-qdrant-cleanup" "" "$failed" "$empty" "$heading")"
+    echo "$out" | grep -q 'cleanup objects still present'
+    echo "$out" | grep -q 'job.batch/qdrant-test-qdrant-cleanup'
+}
+
+@test "shared report flags a zero exit with stderr as possibly partial for any wording" {
+    klog='E0805 memcache.go:265 Unhandled Error'
+    out="$(lookup_report 0 "" "$klog" "FAILED-MSG" "EMPTY-MSG" "ROWS-MSG")"
+    # Same regression as the census case: folded into the value this klog line
+    # would suppress the empty branch and print as though it were a result.
+    echo "$out" | grep -q 'EMPTY-MSG'
+    echo "$out" | grep -q 'may be partial'
+    [ "$(echo "$out" | grep -c 'ROWS-MSG')" -eq 0 ]
+}
+
+@test "census driven through a kubectl stub keeps stderr out of the value" {
+    stubdir="$(mktemp -d)"
+    printf '#!/bin/sh\necho "E0805 memcache.go:265 Unhandled Error" >&2\nexit 0\n' \
+        > "$stubdir/kubectl"
+    chmod +x "$stubdir/kubectl"
+    out="$(PATH="$stubdir:$PATH" pod_label_census tenant-test)"
+    rm -rf "$stubdir"
+    # End to end: kubectl exited 0 and wrote only to stderr, so the namespace
+    # really is empty and the klog line is a caveat, not a row.
+    echo "$out" | grep -q 'no pods in tenant-test'
+    echo "$out" | grep -q 'may be partial'
+}
+
+@test "census returns zero even when the lookup failed so a catch cannot mask the real error" {
+    stubdir="$(mktemp -d)"
+    printf '#!/bin/sh\necho "Unable to connect to the server" >&2\nexit 1\n' \
+        > "$stubdir/kubectl"
+    chmod +x "$stubdir/kubectl"
+    # The call goes in the `if` condition, not on a line of its own: these
+    # tests run under `set -e`, which exempts a condition but would abort the
+    # test before a following `rc=$?` could ever read a non-zero. Read after
+    # the fact, that assertion could only ever see 0 and would pass whatever
+    # the function returned.
+    if PATH="$stubdir:$PATH" pod_label_census tenant-test > /dev/null; then
+        rc=0
+    else
+        rc=1
+    fi
+    rm -rf "$stubdir"
+    [ "$rc" -eq 0 ]
+}
diff --git a/hack/post-install-prep.bats b/hack/post-install-prep.bats
new file mode 100644
index 0000000000..cc34a4a6b3
--- /dev/null
+++ b/hack/post-install-prep.bats
@@ -0,0 +1,518 @@
+#!/usr/bin/env bats
+# -----------------------------------------------------------------------------
+# Unit tests for the wait budgets in hack/e2e-post-install-prep.sh.
+#
+# The script drives a serial reconcile chain -- cozystack-operator -> platform
+# HR -> linstor HR -> piraeus-operator -> cert-manager issues the controller
+# TLS -> linstor-controller Deployment -- and every link of it is waited on in
+# order. What these tests pin is how the waits are budgeted: each link gets its
+# own window measured from the moment the link before it completed, so a long
+# but healthy head cannot starve the tail, while a link that never converges
+# still fails inside one window rather than running forever.
+#
+# Strategy: the script is run end to end against a stub PATH carrying a virtual
+# clock. `date` reads a counter file, `sleep` advances it, and `kubectl` decides
+# each wait from that same counter -- so a 15-minute budget elapses in a few
+# hundred forks and the timings are exact rather than wall-clock approximate.
+# The stub also records every kubectl invocation, which is how the timeout
+# diagnostics are asserted. Mock IPs use the RFC 5737 documentation range.
+#
+# The convergence times fed in are the ones measured on the two runs that
+# motivated this: the linstor HelmRelease went Ready 452s after the script
+# started, and the Deployment became Available a further ~520s later.
+#
+# Title syntax constraints (inherited from cozytest.sh's awk parser):
+#   - Titles delimited by ASCII double quotes; embedded quotes truncate.
+#   - Only [A-Za-z0-9] from the title survives into the function name, so keep
+#     titles distinctive in their alphanumeric run.
+#   - A line that is exactly `}` is rewritten, so stub bodies below use `case`
+#     rather than nested functions.
+#
+# Run with: bats hack/post-install-prep.bats
+# -----------------------------------------------------------------------------
+
+load test_helper
+
+HACK_DIR="$(cd "$(dirname "${BATS_TEST_FILENAME:-$0}")" && pwd)"
+SCRIPT="$HACK_DIR/e2e-post-install-prep.sh"
+
+# prep_sandbox <dir> -- lay down the stub PATH and the virtual clock.
+#
+# STUB_HR_READY_AT / STUB_DEPLOY_READY_AT are virtual-clock seconds at which
+# the corresponding `kubectl wait` starts succeeding, or the string `never`.
+# Every other kubectl call succeeds, so the script's post-LINSTOR tail (storage
+# pools, StorageClasses, MetalLB) runs through without a cluster.
+prep_sandbox() {
+  d=$1
+  mkdir -p "$d/bin"
+  echo 0 > "$d/clock"
+  : > "$d/calls"
+
+  cat > "$d/bin/date" <<'STUB'
+#!/bin/sh
+cat "$STUB_CLOCK"
+STUB
+
+  # Advancing the clock in `sleep` is what makes a 900s budget cost ~180 forks
+  # instead of 15 minutes. The ceiling is a runaway guard: if the script under
+  # test loses its deadline check entirely, the wait loop would otherwise spin
+  # forever, and a hung unit test is worse than a failing one. It has to stay
+  # low enough to trip in seconds -- a guard that itself takes minutes to fire
+  # is the hang it was meant to prevent -- and above every budget under test.
+  # A failing exit status alone does not stop a loop that runs where set -e is
+  # off, such as a function called under `if !`, so the guard also kills the
+  # shell that called it.
+  cat > "$d/bin/sleep" <<'STUB'
+#!/bin/sh
+now=$(cat "$STUB_CLOCK")
+now=$(( now + ${1%%.*} ))
+echo "$now" > "$STUB_CLOCK"
+if [ "$now" -ge 5000 ]; then
+  echo "STUB-RUNAWAY: virtual clock passed 5000s" >&2
+  kill -TERM "$PPID"
+  exit 1
+fi
+STUB
+
+  # Records the parsed bound and then runs the real command, so a wrapped call
+  # still reaches the kubectl stub and the existing call assertions hold. The
+  # duration is parsed here rather than in the test because `timeout [-k G] N`
+  # puts two numbers on the line and only the second one is the wall clock.
+  cat > "$d/bin/timeout" <<'STUB'
+#!/bin/sh
+grace=""
+dur=""
+while [ $# -gt 0 ]; do
+  case $1 in
+    -k) grace=$2; shift 2 ;;
+    [0-9]*) dur=$1; shift; break ;;
+    *) break ;;
+  esac
+done
+printf 'timeout dur=%s grace=%s -- %s\n' "$dur" "$grace" "$*" >> "$STUB_CALLS"
+export STUB_BOUNDED=1
+exec "$@"
+STUB
+
+  cat > "$d/bin/kubectl" <<'STUB'
+#!/bin/sh
+now=$(cat "$STUB_CLOCK")
+printf '%s\n' "$*" >> "$STUB_CALLS"
+# A call not run under `timeout`. `kubectl wait --timeout` does not count:
+# that timeout starts after the GET that resolves the object, which carries no
+# deadline of its own. Recorded on a line of its own so the assertions on the
+# plain call lines above keep matching.
+bounded=${STUB_BOUNDED:-}
+[ -n "$bounded" ] || printf 'UNBOUNDED %s\n' "$*" >> "$STUB_CALLS"
+case "$*" in
+  'wait helmrelease/linstor '*)
+    # The outer bound firing: `timeout` prints nothing and kubectl dies on the
+    # signal before it can, so the status is the only trace. 124 on TERM, 137
+    # when kubectl ignored it and the -k KILL landed.
+    if [ -n "${STUB_WAIT_KILLED:-}" ]; then exit "$STUB_WAIT_KILLED"; fi
+    if [ -n "${STUB_WAIT_ERR:-}" ]; then echo "$STUB_WAIT_ERR" >&2; fi
+    [ "$STUB_HR_READY_AT" != never ] && [ "$now" -ge "$STUB_HR_READY_AT" ] ;;
+  'wait deployment/linstor-controller '*)
+    [ "$STUB_DEPLOY_READY_AT" != never ] && [ "$now" -ge "$STUB_DEPLOY_READY_AT" ] ;;
+  'get endpoints '*) echo 192.0.2.11 ;;
+  'get crd '*)
+    if [ -n "${STUB_CRD_MISSING:-}" ]; then
+      echo 'Error from server (NotFound): customresourcedefinitions.apiextensions.k8s.io "l2advertisements.metallb.io" not found' >&2
+      exit 1
+    fi ;;
+  'get storageprofile local'*)
+    if [ -n "${STUB_SP_MISSING:-}" ]; then
+      echo 'Error from server (NotFound): storageprofiles.cdi.kubevirt.io "local" not found' >&2
+      exit 1
+    fi ;;
+  'get hr -n cozy-metallb'*) echo "STUB-METALLB-HR metallb False install retries exhausted" ;;
+  'get hr -A '*)
+    echo "cozy-linstor linstor False dependency 'cozy-system/piraeus-operator' is not ready"
+    echo "STUB-HR cozy-kubeovn kubeovn False install retries exhausted" ;;
+  'get pods '*)
+    if [ -n "${STUB_PODS_FAIL:-}" ]; then
+      echo "Error from server (Forbidden): pods is forbidden" >&2
+      exit 1
+    fi
+    echo "STUB-POD linstor-controller 0/1 Init:CrashLoopBackOff" ;;
+  'events '*|'get events '*)
+    # Model the failure the real sorter has: an Event written through
+    # events.k8s.io/v1 reaches the core API with .lastTimestamp unset, and
+    # kubectl fails the whole read rather than skipping that item. A
+    # diagnostic that dies this way prints nothing, which reads exactly like
+    # a namespace with no events -- so the assertion below is on the content
+    # arriving, not on the call being made.
+    case "$*" in
+      *--sort-by=.lastTimestamp*)
+        echo "error: couldn't find any field with path {.lastTimestamp}" >&2
+        exit 1 ;;
+    esac
+    # Any other reason the read can fail -- RBAC, a wedged apiserver, a
+    # renamed namespace. Kept separate from the sort-key case above so the
+    # cause and the consequence are pinned by different tests.
+    if [ -n "${STUB_EVENTS_FAIL:-}" ]; then
+      echo "Error from server (Forbidden): events is forbidden" >&2
+      exit 1
+    fi
+    echo "STUB-EVENT MountVolume.SetUp failed for volume client-tls" ;;
+  *'linstor sp l '*)
+    # What the outer bound firing looks like from here: `timeout` prints
+    # nothing and kubectl dies on the signal before it can, so the only
+    # trace is the status.
+    if [ -n "${STUB_SPL_KILLED:-}" ]; then
+      exit 124
+    fi
+    # A remote command killed inside the container, OOM for one: kubectl
+    # exec hands its status back, and 137 is also what `timeout -k` returns.
+    if [ -n "${STUB_SPL_REMOTE_KILLED:-}" ]; then
+      echo 'command terminated with exit code 137' >&2
+      exit 137
+    fi ;;
+  *'linstor node list')
+    i=0
+    while [ "$i" -lt "${STUB_ONLINE:-3}" ]; do echo Online; i=$((i + 1)); done ;;
+  *) exit 0 ;;
+esac
+STUB
+
+  chmod +x "$d/bin/date" "$d/bin/sleep" "$d/bin/kubectl" "$d/bin/timeout"
+}
+
+# run_prep <dir> <hr-ready-at> <deploy-ready-at> [events-fail] [pods-fail]
+# Runs the script under the stubs, capturing stdout, stderr and the exit status
+# without tripping set -e. The last two are non-empty to make the corresponding
+# diagnostic read fail; pass an empty string for the fourth to reach the fifth.
+run_prep() {
+  d=$1
+  STUB_CLOCK="$d/clock" STUB_CALLS="$d/calls" \
+  STUB_HR_READY_AT=$2 STUB_DEPLOY_READY_AT=$3 \
+  STUB_EVENTS_FAIL="${4:-}" STUB_PODS_FAIL="${5:-}" \
+  PATH="$d/bin:$PATH" \
+    "$SCRIPT" > "$d/out" 2> "$d/err" && echo 0 > "$d/rc" || echo $? > "$d/rc"
+}
+
+@test "the Deployment wait keeps its full budget after a slow HelmRelease wait" {
+  tmp=$(mktemp -d)
+  prep_sandbox "$tmp"
+
+  run_prep "$tmp" 452 972
+
+  cat "$tmp/err" >&2
+  [ "$(cat "$tmp/rc")" -eq 0 ]
+  grep -q '\[post-install-prep\] done' "$tmp/out"
+  # The Deployment converged past the point where a single chain-wide 15m
+  # window anchored at script start would already have expired.
+  [ "$(cat "$tmp/clock")" -ge 972 ]
+  rm -rf "$tmp"
+}
+
+@test "a Deployment that never becomes Available fails inside one budget" {
+  tmp=$(mktemp -d)
+  prep_sandbox "$tmp"
+
+  run_prep "$tmp" 0 never
+
+  [ "$(cat "$tmp/rc")" -ne 0 ]
+  # One budget, not two and not unbounded: the wait started at 0 and gave up
+  # at 900. The upper bound allows a single 5s poll interval beyond that and
+  # nothing more, so a second budget would fail it.
+  final=$(cat "$tmp/clock")
+  [ "$final" -ge 900 ]
+  [ "$final" -le 905 ]
+  rm -rf "$tmp"
+}
+
+@test "the Deployment timeout reports the linstor pods and events" {
+  tmp=$(mktemp -d)
+  prep_sandbox "$tmp"
+
+  run_prep "$tmp" 0 never
+
+  [ "$(cat "$tmp/rc")" -ne 0 ]
+  grep -q 'timed out' "$tmp/err"
+  grep -q 'linstor-controller Deployment to be Available' "$tmp/err"
+  # Which link was actually blocking -- a crash-looping init container versus a
+  # Secret cert-manager has not issued yet -- is only visible in the pods and
+  # the namespace events, so the timeout has to read both.
+  grep -q '^get pods -n cozy-linstor' "$tmp/calls"
+  grep -q '^events -n cozy-linstor' "$tmp/calls"
+  # And their content has to reach the log, not merely be asked for: a read
+  # that fails prints nothing, which is the same shape as a namespace with
+  # nothing wrong in it.
+  grep -q 'STUB-POD' "$tmp/err"
+  grep -q 'STUB-EVENT' "$tmp/err"
+  # Both reads carry a wall-clock bound, and the client budget inside each is
+  # strictly smaller than it. Equal values would put the outer kill first, so
+  # kubectl would never get to say why it could not read -- which is the whole
+  # point of reading at all on this path.
+  for what in 'get pods' 'events'; do
+    line=$(grep "^timeout dur=.* kubectl $what -n cozy-linstor" "$tmp/calls" | head -1)
+    [ -n "$line" ]
+    outer=${line#timeout dur=}
+    outer=${outer%% *}
+    inner=$(printf '%s' "$line" | sed -n 's/.*--request-timeout=\([0-9]*\)s.*/\1/p')
+    [ -n "$outer" ]
+    [ -n "$inner" ]
+    [ "$inner" -lt "$outer" ]
+  done
+  rm -rf "$tmp"
+}
+
+@test "an events read that fails names its reason instead of going quiet" {
+  tmp=$(mktemp -d)
+  prep_sandbox "$tmp"
+
+  run_prep "$tmp" 0 never fail-events
+
+  [ "$(cat "$tmp/rc")" -ne 0 ]
+  # Silence here would be read as "the namespace had nothing to say", which is
+  # the opposite of what happened. The reason has to survive to the log.
+  grep -q 'Forbidden' "$tmp/err"
+  rm -rf "$tmp"
+}
+
+@test "a leg that fails does not take the other leg down with it" {
+  tmp=$(mktemp -d)
+  prep_sandbox "$tmp"
+
+  # The pods read runs first, so failing it is the only way to ask whether the
+  # events read still happens. Failing the events read instead proves nothing:
+  # the pods output has already been emitted by then either way.
+  run_prep "$tmp" 0 never '' fail-pods
+
+  [ "$(cat "$tmp/rc")" -ne 0 ]
+  grep -q 'Forbidden' "$tmp/err"
+  grep -q 'STUB-EVENT' "$tmp/err"
+  rm -rf "$tmp"
+}
+
+@test "a HelmRelease that never goes Ready fails before the Deployment is waited on" {
+  tmp=$(mktemp -d)
+  prep_sandbox "$tmp"
+
+  run_prep "$tmp" never 0
+
+  [ "$(cat "$tmp/rc")" -ne 0 ]
+  grep -q 'linstor HelmRelease to be Ready' "$tmp/err"
+  final=$(cat "$tmp/clock")
+  [ "$final" -ge 900 ]
+  [ "$final" -le 905 ]
+  if grep -q '^wait deployment/linstor-controller' "$tmp/calls"; then
+    echo "the Deployment was waited on after the HelmRelease wait failed" >&2
+    return 1
+  fi
+  rm -rf "$tmp"
+}
+
+@test "every kubectl call on the success, container and every timeout path carries a bound" {
+  # The caller blocks in `wait` on this script, so a single call that never
+  # returns holds the install open until the job's own ceiling instead of
+  # failing a step. A deadline checked between iterations does not help: the
+  # check sits on the other side of the call that hangs. The timeout paths
+  # matter most: their reads run only once the cluster is already unhealthy.
+  for path in success container node-timeout hr-timeout metallb-timeout sp-timeout; do
+    tmp=$(mktemp -d)
+    prep_sandbox "$tmp"
+    hr_ready=0
+    case $path in
+      node-timeout) export STUB_ONLINE=2 ;;
+      # The only path that patches the CDI StorageProfile.
+      container) export COZY_LINSTOR_DRBD_ENABLED=false ;;
+      hr-timeout) hr_ready=never ;;
+      metallb-timeout) export STUB_CRD_MISSING=1 ;;
+      sp-timeout) export COZY_LINSTOR_DRBD_ENABLED=false STUB_SP_MISSING=1 ;;
+    esac
+
+    run_prep "$tmp" "$hr_ready" 0
+    unset STUB_ONLINE COZY_LINSTOR_DRBD_ENABLED STUB_CRD_MISSING STUB_SP_MISSING
+
+    case $path in
+      success|container) [ "$(cat "$tmp/rc")" -eq 0 ] ;;
+      *)
+        [ "$(cat "$tmp/rc")" -ne 0 ]
+        grep -q 'timed out' "$tmp/err" ;;
+    esac
+    if grep '^UNBOUNDED ' "$tmp/calls" >&2; then
+      echo "unbounded kubectl calls on the $path path" >&2
+      return 1
+    fi
+    # A plain request keeps a client budget strictly inside the wall clock one,
+    # so kubectl names why it could not finish before the kill lands.
+    grep '^timeout dur=.* -- kubectl \(get\|apply\|patch\|events\) ' "$tmp/calls" > "$tmp/reads" || true
+    [ -s "$tmp/reads" ]
+    while IFS= read -r line; do
+      outer=${line#timeout dur=}
+      outer=${outer%% *}
+      inner=$(printf '%s' "$line" | sed -n 's/.*--request-timeout=\([0-9]*\)s.*/\1/p')
+      if [ -z "$inner" ] || [ "$inner" -ge "$outer" ]; then
+        echo "client budget not inside the wall clock one: $line" >&2
+        return 1
+      fi
+    done < "$tmp/reads"
+    rm -rf "$tmp"
+  done
+}
+
+@test "a client error in the wait loop reaches the log instead of a bare timeout" {
+  tmp=$(mktemp -d)
+  prep_sandbox "$tmp"
+
+  # Exits non-zero at once, like NotFound, so by status alone the loop cannot
+  # tell it from an object that is not created yet. Without the text the
+  # timeout names the HelmRelease while the cause sits in the client.
+  export STUB_WAIT_ERR='error: You must be logged in to the server (Unauthorized)'
+  run_prep "$tmp" never 0
+  unset STUB_WAIT_ERR
+
+  [ "$(cat "$tmp/rc")" -ne 0 ]
+  grep -q 'linstor HelmRelease to be Ready' "$tmp/err"
+  grep -q 'Unauthorized' "$tmp/err"
+  rm -rf "$tmp"
+}
+
+@test "a NotFound repeated on every attempt is printed once, not every poll" {
+  tmp=$(mktemp -d)
+  prep_sandbox "$tmp"
+
+  export STUB_WAIT_ERR='Error from server (NotFound): helmreleases.helm.toolkit.fluxcd.io "linstor" not found'
+  run_prep "$tmp" never 0
+  unset STUB_WAIT_ERR
+
+  [ "$(cat "$tmp/rc")" -ne 0 ]
+  # The timeout line repeats the last error; outside it, one line in ~180
+  # attempts. Printing every attempt would bury the rest of the log.
+  n=$(grep -v 'timed out' "$tmp/err" | grep -c 'not found' || true)
+  [ "$n" -eq 1 ]
+  grep 'timed out' "$tmp/err" | grep -q 'not found'
+  # Printed on every green run too, since the release appears ~70s in, so it
+  # has to read as this script's progress rather than as a failure.
+  grep -v 'timed out' "$tmp/err" | grep 'not found' | grep -q '^\[post-install-prep\] '
+  rm -rf "$tmp"
+}
+
+@test "a wait attempt cut by its outer bound says so in the timeout line" {
+  for code in 124 137; do
+    tmp=$(mktemp -d)
+    prep_sandbox "$tmp"
+
+    export STUB_WAIT_KILLED=$code
+    run_prep "$tmp" never 0
+    unset STUB_WAIT_KILLED
+
+    [ "$(cat "$tmp/rc")" -ne 0 ]
+    # Without this the line reads "last kubectl error: none", which says the
+    # client had nothing to report, not that it was killed mid-request.
+    grep 'timed out' "$tmp/err" | grep -q 'cut by its outer bound'
+    rm -rf "$tmp"
+  done
+}
+
+@test "a linstor HelmRelease timeout names the upstream release that blocks it" {
+  tmp=$(mktemp -d)
+  prep_sandbox "$tmp"
+
+  run_prep "$tmp" never 0
+
+  [ "$(cat "$tmp/rc")" -ne 0 ]
+  grep -q 'linstor HelmRelease to be Ready' "$tmp/err"
+  # The linstor release is usually the victim of a dependency chain, not the
+  # cause, and the cozy-linstor pods say nothing about kubeovn. The release
+  # list carries every Ready message, so the blocking release is named in the
+  # same log that reports the timeout.
+  grep -q 'STUB-HR cozy-kubeovn kubeovn' "$tmp/err"
+  rm -rf "$tmp"
+}
+
+@test "a MetalLB CRD wait that runs out says so and shows which CRD is missing" {
+  tmp=$(mktemp -d)
+  prep_sandbox "$tmp"
+
+  export STUB_CRD_MISSING=1
+  run_prep "$tmp" 0 0
+  unset STUB_CRD_MISSING
+
+  [ "$(cat "$tmp/rc")" -ne 0 ]
+  # A silent exit here leaves the "waiting for" line as the last word, which
+  # cannot tell CRDs that are late from an operator that never got that far.
+  grep -q 'timed out after 300s waiting for MetalLB CRDs' "$tmp/err"
+  grep -q 'l2advertisements.metallb.io" not found' "$tmp/err"
+  grep -q 'STUB-METALLB-HR' "$tmp/err"
+  final=$(cat "$tmp/clock")
+  [ "$final" -ge 300 ]
+  [ "$final" -le 302 ]
+  rm -rf "$tmp"
+}
+
+@test "a CDI StorageProfile wait that runs out says so before any patch" {
+  tmp=$(mktemp -d)
+  prep_sandbox "$tmp"
+
+  export COZY_LINSTOR_DRBD_ENABLED=false STUB_SP_MISSING=1
+  run_prep "$tmp" 0 0
+  unset COZY_LINSTOR_DRBD_ENABLED STUB_SP_MISSING
+
+  [ "$(cat "$tmp/rc")" -ne 0 ]
+  grep -q 'timed out after 600s waiting for CDI StorageProfile/local' "$tmp/err"
+  grep -q 'storageprofiles.cdi.kubevirt.io "local" not found' "$tmp/err"
+  if grep -q '^patch storageprofile' "$tmp/calls"; then
+    echo "the StorageProfile was patched although it never appeared" >&2
+    return 1
+  fi
+  rm -rf "$tmp"
+}
+
+@test "container mode waits for the CDI StorageProfile before patching it" {
+  tmp=$(mktemp -d)
+  prep_sandbox "$tmp"
+
+  export COZY_LINSTOR_DRBD_ENABLED=false
+  run_prep "$tmp" 0 0
+  unset COZY_LINSTOR_DRBD_ENABLED
+
+  [ "$(cat "$tmp/rc")" -eq 0 ]
+  # CDI creates the profile asynchronously; a patch sent first fails on a
+  # profile that does not exist yet.
+  got=$(grep -n '^get storageprofile local' "$tmp/calls" | head -1 | cut -d: -f1)
+  patched=$(grep -n '^patch storageprofile local' "$tmp/calls" | head -1 | cut -d: -f1)
+  [ -n "$got" ]
+  [ -n "$patched" ]
+  [ "$got" -lt "$patched" ]
+  rm -rf "$tmp"
+}
+
+@test "a storage pool listing killed by its bound stops before any pool is created and says so" {
+  tmp=$(mktemp -d)
+  prep_sandbox "$tmp"
+
+  # Read as "no pools exist", a failed listing sends a create for every node,
+  # and the ones that do exist fail it with a reason that is not the cause.
+  export STUB_SPL_KILLED=1
+  run_prep "$tmp" 0 0
+  unset STUB_SPL_KILLED
+
+  [ "$(cat "$tmp/rc")" -ne 0 ]
+  # Nothing else in the log would say why the script stopped.
+  grep 'killed after 300s' "$tmp/err" | grep -q 'linstor sp l'
+  if grep -q 'create-device-pool' "$tmp/calls"; then
+    echo "pools were created after the listing failed" >&2
+    return 1
+  fi
+  rm -rf "$tmp"
+}
+
+@test "a listing whose remote command was killed is not reported as the bound firing" {
+  tmp=$(mktemp -d)
+  prep_sandbox "$tmp"
+
+  export STUB_SPL_REMOTE_KILLED=1
+  run_prep "$tmp" 0 0
+  unset STUB_SPL_REMOTE_KILLED
+
+  [ "$(cat "$tmp/rc")" -ne 0 ]
+  grep -q 'command terminated with exit code 137' "$tmp/err"
+  if grep -q 'killed after' "$tmp/err"; then
+    echo "a remote kill was blamed on the call bound" >&2
+    return 1
+  fi
+  rm -rf "$tmp"
+}
diff --git a/hack/postgres-backup-app-login_test.bats b/hack/postgres-backup-app-login_test.bats
new file mode 100644
index 0000000000..370775bf3a
--- /dev/null
+++ b/hack/postgres-backup-app-login_test.bats
@@ -0,0 +1,98 @@
+#!/usr/bin/env bats
+# Unit tests for the app-login helpers the postgres backup example uses to prove
+# the restored copy authenticates. The bug they pin: the credentials Secret is
+# named after the release (== the CNPG cluster, `postgres-<name>`), not the short
+# app name, so resolving it from anything but the cluster reads a Secret that
+# does not exist and the login can never pass. Others: a genuine failure names
+# the Secret on timeout; a login printing '1' is a success even with stderr
+# noise; and a username with a dot reads its password (jq, not jsonpath).
+#
+# The helper reads the Secret with `get secret ... -o json | jq`, so the kubectl
+# stub returns JSON. 00-helpers.sh is `#!/bin/bash` (it uses arrays), so it is
+# exercised in a bash subshell rather than sourced into this runner, which is
+# /bin/sh (dash in CI). It is sourced first, then the stubs override its
+# cluster-touching functions.
+
+load test_helper
+
+@test "psql_app_exec reads the credentials Secret named after the cluster, not the app name" {
+    calls=$(mktemp)
+    CALLS="$calls" bash -uc '
+        NAMESPACE=tenant-test
+        . examples/backups/postgres/00-helpers.sh
+        cnpg_primary_pod() { echo "${1}-1"; }
+        kubectl() {
+            printf "kubectl %s\n" "$*" >> "$CALLS"
+            case "$*" in
+                *"get secret postgres-pg-target-credentials -o json"*) printf "%s" "{\"data\":{\"app\":\"cGFzcw==\"}}" ;;
+                *"get secret "*) echo "WRONG secret queried: $*" >&2; return 1 ;;
+                *" exec "*) echo 1 ;;
+                *) return 0 ;;
+            esac
+        }
+        psql_app_exec postgres-pg-target app demo "SELECT 1;" >/dev/null
+    '
+    grep -q 'get secret postgres-pg-target-credentials -o json' "$calls"
+    if grep -q 'get secret pg-target-credentials ' "$calls"; then
+        echo "resolved the Secret from the app name, not the cluster" >&2
+        exit 1
+    fi
+}
+
+@test "wait_for_app_login names the failing Secret on timeout instead of swallowing it" {
+    out=$(mktemp)
+    bash -uc '
+        NAMESPACE=tenant-test
+        . examples/backups/postgres/00-helpers.sh
+        cnpg_primary_pod() { echo "${1}-1"; }
+        kubectl() {
+            case "$*" in
+                # Secret exists but has no password for app; the helper log_errors
+                # naming it, and the wait loop must surface that on timeout.
+                *"get secret postgres-pg-target-credentials -o json"*) printf "%s" "{\"data\":{}}" ;;
+                *) return 0 ;;
+            esac
+        }
+        wait_for_app_login postgres-pg-target app demo 0
+    ' >"$out" 2>&1 && { echo "wait_for_app_login unexpectedly passed with no password" >&2; exit 1; }
+    grep -q "no password for user 'app' in postgres-pg-target-credentials" "$out"
+}
+
+@test "psql_app_exec reads the password for a username containing a dot" {
+    calls=$(mktemp)
+    CALLS="$calls" bash -uc '
+        NAMESPACE=tenant-test
+        . examples/backups/postgres/00-helpers.sh
+        cnpg_primary_pod() { echo "${1}-1"; }
+        kubectl() {
+            printf "kubectl %s\n" "$*" >> "$CALLS"
+            case "$*" in
+                # A dotted key is why jsonpath fails and jq is used; return the
+                # Secret as JSON so jq can index the literal "app.user" key.
+                *"get secret postgres-pg-target-credentials -o json"*) printf "%s" "{\"data\":{\"app.user\":\"cGFzcw==\"}}" ;;
+                *" exec "*) echo 1 ;;
+                *) return 0 ;;
+            esac
+        }
+        psql_app_exec postgres-pg-target app.user demo "SELECT 1;" >/dev/null
+    '
+    grep -q 'get secret postgres-pg-target-credentials -o json' "$calls"
+}
+
+@test "wait_for_app_login treats a login that prints '1' as success even with stderr noise" {
+    bash -uc '
+        NAMESPACE=tenant-test
+        . examples/backups/postgres/00-helpers.sh
+        cnpg_primary_pod() { echo "${1}-1"; }
+        kubectl() {
+            case "$*" in
+                *"get secret postgres-pg-target-credentials -o json"*) printf "%s" "{\"data\":{\"app\":\"cGFzcw==\"}}" ;;
+                # A successful SELECT 1 prints 1 on stdout; a NOTICE on stderr
+                # must not be read as a failure (success is stdout-only).
+                *" exec "*) echo 1; echo "NOTICE: something" >&2 ;;
+                *) return 0 ;;
+            esac
+        }
+        wait_for_app_login postgres-pg-target app demo 5
+    ' >/dev/null 2>&1 || { echo "a successful login was misread as a failure because of stderr noise" >&2; exit 1; }
+}
diff --git a/hack/pr-labeler-contract.bats b/hack/pr-labeler-contract.bats
new file mode 100644
index 0000000000..2c2daa1400
--- /dev/null
+++ b/hack/pr-labeler-contract.bats
@@ -0,0 +1,201 @@
+#!/usr/bin/env bats
+# Contract for the PR title labeler in .github/workflows/pr-labeler.yaml.
+#
+# Every failure this guards is silent: the job either dies on a title it cannot
+# handle, applies a label that does not exist, or lands a PR in the wrong area
+# with no warning, and nobody reads the log of a labeler that did not label.
+#
+# The behavioural tests run the workflow's own github-script block under node,
+# extracted from the file rather than mirrored, with `context`, `core` and
+# `github` stubbed, so an edit to the script is what gets tested. node is
+# required, not optional: a suite that skips when the runtime is missing goes
+# green having run nothing.
+
+load test_helper
+
+REPO_ROOT="$(cd "$(dirname "${BATS_TEST_FILENAME:-$0}")/.." && pwd)"
+WF="$REPO_ROOT/.github/workflows/pr-labeler.yaml"
+LABELS="$REPO_ROOT/.github/labels.yml"
+
+need_node() {
+  command -v node >/dev/null 2>&1 && return 0
+  echo "node is required to run the pr-labeler script" >&2
+  return 1
+}
+
+# The `script: |` block, de-indented to plain JavaScript.
+extract_script() {
+  awk 'f { print substr($0, 13) } /^ +script: \|$/ { f = 1 }' "$WF" > "$1"
+  [ -s "$1" ]
+}
+
+# Runs the extracted script once per title read from stdin, all in one node
+# process, and prints one line per title: the title, a tab, then the applied
+# labels sorted and comma-joined, or THROW: and the error message.
+#
+# JavaScript closing braces below are indented on purpose: hack/cozytest.sh
+# rewrites any line that is exactly `}` into a shell `return 0`.
+run_labeler() {
+  tmp="$(mktemp -d)"
+  extract_script "$tmp/script.js"
+  cat > "$tmp/run.js" <<'JS'
+const fs = require('fs');
+const src = fs.readFileSync(process.argv[2], 'utf8');
+const AsyncFunction = (async () => {}).constructor;
+const fn = new AsyncFunction('context', 'core', 'github', src);
+(async () => {
+  const out = [];
+  const titles = fs.readFileSync(0, 'utf8').split('\n').filter(Boolean);
+  for (const title of titles) {
+    let applied = [];
+    const context = {
+      repo: { owner: 'o', repo: 'r' },
+      payload: { pull_request: { number: 1, title, body: '', labels: [] } },
+    };
+    const core = { warning() {}, info() {} };
+    const github = { rest: { issues: { addLabels: async (a) => { applied = a.labels; } } } };
+    try {
+      await fn(context, core, github);
+      out.push(title + '\t' + [...applied].sort().join(','));
+    } catch (e) {
+      out.push(title + '\tTHROW: ' + e.message);
+    }
+  }
+  fs.writeFileSync(1, out.join('\n') + '\n');
+})();
+JS
+  node "$tmp/run.js" "$tmp/script.js"
+  rm -rf "$tmp"
+}
+
+# Asserts the labeler's output for each `title<TAB>labels` line on stdin.
+expect_labels() {
+  want="$(cat)"
+  got="$(printf '%s\n' "$want" | cut -f1 | run_labeler)"
+  [ "$got" = "$want" ] || {
+    echo "labeler output mismatch." >&2
+    echo "want:" >&2; printf '%s\n' "$want" | sed 's/^/  /' >&2
+    echo "got:" >&2; printf '%s\n' "$got" | sed 's/^/  /' >&2
+    return 1
+  }
+}
+
+# The scopeToArea literal as JSON pairs, plus a count of the key lines in the
+# source, quoted either way or bare. A duplicate key collapses when the literal
+# is evaluated, so the two disagree when a key is written twice, as long as each
+# key sits on its own line.
+scope_map() { # json|keylines
+  tmp="$(mktemp -d)"
+  extract_script "$tmp/script.js"
+  cat > "$tmp/map.js" <<'JS'
+const fs = require('fs');
+const src = fs.readFileSync(process.argv[2], 'utf8');
+const m = src.match(/const scopeToArea = (\{[\s\S]*?\n\};)/);
+if (!m) { throw new Error('scopeToArea literal not found'); }
+const lines = m[1].split('\n').filter((l) => /^\s*(['"]?)[^'"\s:]+\1\s*:/.test(l));
+const map = new Function('return ' + m[1].replace(/;$/, ''))();
+if (process.argv[3] === 'keylines') {
+  fs.writeFileSync(1, lines.length + ' ' + Object.keys(map).length + '\n');
+} else {
+  fs.writeFileSync(1, Object.entries(map).map(([k, v]) => k + '\t' + v).join('\n') + '\n');
+  }
+JS
+  node "$tmp/map.js" "$tmp/script.js" "$1"
+  rm -rf "$tmp"
+}
+
+area_labels() {
+  sed -n 's/^- name: \(area\/[^[:space:]]*\)[[:space:]]*$/\1/p' "$LABELS"
+}
+
+@test "the workflow under contract exists" {
+  [ -f "$WF" ]
+  [ -f "$LABELS" ]
+}
+
+# A key inherited from Object.prototype resolves to a function, which is truthy,
+# lands in the label set, and then kills the job on `l.startsWith`.
+@test "a scope or type named after an Object.prototype member does not kill the job" {
+  need_node
+  expect_labels <<'EOF'
+fix(constructor): x	area/uncategorized,kind/bug
+fix(toString): x	area/uncategorized,kind/bug
+fix(hasOwnProperty): x	area/uncategorized,kind/bug
+fix(__proto__): x	area/uncategorized,kind/bug
+[constructor] x	area/uncategorized
+constructor: x	area/uncategorized
+EOF
+}
+
+# One stripped prefix left the second one to be parsed as a bracket scope, which
+# dropped the real scope and the kind, and the area/release from the first strip
+# suppressed the uncategorized signal.
+@test "every leading backport prefix is stripped before the title is parsed" {
+  need_node
+  expect_labels <<'EOF'
+[Backport release-1.3] fix(linstor): x	area/release,area/storage,kind/bug
+[Backport release-1.2] [Backport release-1.3] fix(linstor): x	area/release,area/storage,kind/bug
+[Backport release-1.2] [Backport release-1.3] [Backport release-1.4] feat(linstor): x	area/release,area/storage,kind/feature
+EOF
+}
+
+@test "an unmapped scope still falls back to area/uncategorized" {
+  need_node
+  expect_labels <<'EOF'
+fix(no-such-scope): x	area/uncategorized,kind/bug
+fix: x	area/uncategorized,kind/bug
+just a sentence	area/uncategorized
+EOF
+}
+
+@test "recurring scopes resolve to their area" {
+  need_node
+  expect_labels <<'EOF'
+fix(etcd-operator): x	area/database,kind/bug
+fix(opensearch): x	area/database,kind/bug
+fix(multus): x	area/networking,kind/bug
+fix(kubeovn): x	area/networking,kind/bug
+fix(kubevirt-operator): x	area/virtualization,kind/bug
+fix(keycloak-configure): x	area/keycloak,kind/bug
+docs(changelog): x	area/release,kind/documentation
+fix(lineage): x	area/platform,kind/bug
+fix(piraeus-operator): x	area/storage,kind/bug
+fix(monitoring-agents): x	area/monitoring,kind/bug
+ci(workflows): x	area/ci
+fix(hack): x	area/dx,kind/bug
+EOF
+}
+
+# Contributors reach for the subsystem name as often as for a package name, so
+# every area is reachable by its own name.
+@test "every area label is accepted as a scope that maps to itself" {
+  need_node
+  map="$(scope_map json)"
+  missing=""
+  for a in $(area_labels); do
+    [ "$a" = "area/uncategorized" ] && continue
+    printf '%s\n' "$map" | grep -qxF "${a#area/}	$a" || missing="$missing ${a#area/}"
+  done
+  [ -z "$missing" ] || { echo "scopes missing for their own area:$missing" >&2; return 1; }
+}
+
+# A target missing from labels.yml is a label the sync workflow never creates,
+# and nothing in a run of the labeler reports it.
+@test "every scopeToArea target is an area label defined in labels.yml" {
+  need_node
+  defined="$(area_labels)"
+  [ -n "$defined" ]
+  bad="$(scope_map json | cut -f2 | sort -u | grep -vxF "$defined" || true)"
+  [ -z "$bad" ] || { echo "targets not in labels.yml: $bad" >&2; return 1; }
+}
+
+# A repeated key silently overrides the earlier value and reads as an ordinary
+# added line in review.
+@test "no scope key appears twice in scopeToArea" {
+  need_node
+  read -r lines keys <<EOF
+$(scope_map keylines)
+EOF
+  [ "$lines" -gt 0 ]
+  [ "$lines" = "$keys" ] || { echo "$lines key lines but $keys distinct keys" >&2; return 1; }
+}
diff --git a/hack/pre-commit-generate-packages.sh b/hack/pre-commit-generate-packages.sh
new file mode 100755
index 0000000000..71f04e6c65
--- /dev/null
+++ b/hack/pre-commit-generate-packages.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -eu
+
+for makefile in ./packages/*/*/Makefile; do
+    [ -f "$makefile" ] || continue
+    if awk '/^generate[[:space:]]*:/ { found=1 } END { exit !found }' "$makefile"; then
+        dir=${makefile%/Makefile}
+        echo "Running make generate in $dir"
+        make generate -C "$dir"
+    fi
+done
diff --git a/hack/pre-commit-generate-packages_test.bats b/hack/pre-commit-generate-packages_test.bats
new file mode 100755
index 0000000000..20e6b57723
--- /dev/null
+++ b/hack/pre-commit-generate-packages_test.bats
@@ -0,0 +1,46 @@
+#!/usr/bin/env bats
+
+load test_helper
+
+add_generator() {
+    root="$1"
+    dir="$2"
+    mkdir -p "$root/$dir"
+    printf 'generate:\n\t@printf "%%s\\n" "%s" >> "$${GEN_LOG}"\n' "$dir" > "$root/$dir/Makefile"
+}
+
+@test "discovers package generators across categories" {
+    script="$PWD/hack/pre-commit-generate-packages.sh"
+    root=$(mktemp -d)
+    add_generator "$root" packages/apps/app
+    add_generator "$root" packages/extra/extra
+    add_generator "$root" packages/library/library
+    add_generator "$root" packages/system/system
+
+    mkdir -p "$root/packages/system/no-generator"
+    printf '# generate:\n.PHONY: generate\nall:\n\t@:\n' > "$root/packages/system/no-generator/Makefile"
+    mkdir -p "$root/packages/system/system/charts/vendor"
+    printf 'generate:\n\t@printf "vendored\\n" >> "$${GEN_LOG}"\n' > "$root/packages/system/system/charts/vendor/Makefile"
+
+    (cd "$root" && GEN_LOG="$root/generators.log" "$script")
+
+    expected=$(printf '%s\n' packages/apps/app packages/extra/extra packages/library/library packages/system/system)
+    actual=$(sort "$root/generators.log")
+    [ "$actual" = "$expected" ]
+    rm -rf "$root"
+}
+
+@test "stops after a package generator fails" {
+    script="$PWD/hack/pre-commit-generate-packages.sh"
+    root=$(mktemp -d)
+    mkdir -p "$root/packages/apps/failing" "$root/packages/system/later"
+    printf 'generate:\n\t@false\n' > "$root/packages/apps/failing/Makefile"
+    printf 'generate:\n\t@touch "$${LATER_MARKER}"\n' > "$root/packages/system/later/Makefile"
+
+    rc=0
+    (cd "$root" && LATER_MARKER="$root/later-ran" "$script") || rc=$?
+
+    [ "$rc" -ne 0 ]
+    [ ! -e "$root/later-ran" ]
+    rm -rf "$root"
+}
diff --git a/hack/promote-gate-contract.bats b/hack/promote-gate-contract.bats
new file mode 100644
index 0000000000..65b7916eb9
--- /dev/null
+++ b/hack/promote-gate-contract.bats
@@ -0,0 +1,297 @@
+#!/usr/bin/env bats
+
+# Contract for the rc-E2E promotion gate and the release-PR opt-in path.
+# These tests intentionally pin executable/structural workflow lines, not prose:
+# a commented-out gate, label, or body note must never satisfy the contract.
+
+load test_helper
+
+REPO_ROOT="$(cd "$(dirname "${BATS_TEST_FILENAME:-$0}")/.." && pwd)"
+PROMOTE="$REPO_ROOT/.github/workflows/promote-rc.yaml"
+PULL_REQUESTS="$REPO_ROOT/.github/workflows/pull-requests.yaml"
+TAGS="$REPO_ROOT/.github/workflows/tags.yaml"
+FINALIZE="$REPO_ROOT/.github/workflows/pull-requests-release.yaml"
+
+job_block() {
+  awk -v job="  $1:" '
+    $0 == job { inside = 1; next }
+    /^  [a-z0-9_-]+:$/ { inside = 0 }
+    inside' "$2"
+}
+
+job_header() {
+  job_block "$1" "$2" | awk '
+    /^    steps:$/ { exit }
+    { print }'
+}
+
+input_block() {
+  awk -v input="      $1:" '
+    $0 == input { inside = 1; print; next }
+    inside && /^      [a-zA-Z0-9_-]+:$/ { exit }
+    inside { print }' "$2"
+}
+
+# Comment-stripping filter for the pins below. POSIX `grep` only: the unit-test
+# runner has no ripgrep, and a missing filter used to be swallowed by `|| true`,
+# silently reducing every pin to "0 matches" instead of failing on the real
+# cause. grep exits 1 when nothing is selected (legitimate for an empty block)
+# and 2 on an actual error. Do not read the `rc` check below as what catches
+# that: code_lines is never the last stage of a pipeline in this file, so
+# ordinary (non-pipefail) pipe semantics discard whatever it itself returns,
+# and `hack/cozytest.sh`'s translator appends `return 0` to every line that is
+# exactly `}`, code_lines' closing brace included, making its own exit status
+# even less trustworthy as a signal. What catches a real grep error is the
+# OUTPUT, and only for one class of pin: the error empties code_lines' stream,
+# so a pin that requires something to be present in that stream fails on it. A
+# pin demanding an absence stays blind, because an exact count of zero is what
+# an emptied stream produces anyway, and what the pin was written to assert.
+# The `[ -n "$block" ]` guard at the top of a test is not that check: it runs
+# on the raw awk extraction, upstream of code_lines, and cannot see it fail.
+code_lines() {
+  local rc=0
+  grep -v '^[[:space:]]*#' || rc=$?
+  [ "$rc" -le 1 ]
+}
+
+@test "green rc E2E gate is in parse before promote and gates its DAG edge" {
+  parse_block="$(job_block parse "$PROMOTE")"
+  promote_block="$(job_block promote "$PROMOTE")"
+  [ -n "$parse_block" ]
+  [ -n "$promote_block" ]
+
+  count="$(printf '%s\n' "$parse_block" | code_lines | grep -cF '      - name: Verify green RC E2E' || true)"
+  [ "${count:-0}" -eq 1 ]
+
+  count="$(printf '%s\n' "$parse_block" | code_lines | grep -cF '      actions: read' || true)"
+  [ "${count:-0}" -eq 1 ]
+
+  count="$(printf '%s\n' "$promote_block" | code_lines | grep -cF '    needs: parse' || true)"
+  [ "${count:-0}" -eq 1 ]
+
+  parse_line="$(code_lines < "$PROMOTE" | grep -n '^  parse:$' | awk -F: 'NR == 1 { print $1 }')"
+  promote_line="$(code_lines < "$PROMOTE" | grep -n '^  promote:$' | awk -F: 'NR == 1 { print $1 }')"
+  [ -n "$parse_line" ]
+  [ -n "$promote_line" ]
+  [ "$parse_line" -lt "$promote_line" ]
+}
+
+@test "skip_e2e_gate is a boolean emergency override defaulting false" {
+  block="$(input_block skip_e2e_gate "$PROMOTE")"
+  [ -n "$block" ]
+
+  count="$(printf '%s\n' "$block" | code_lines | grep -cF '      skip_e2e_gate:' || true)"
+  [ "${count:-0}" -eq 1 ]
+
+  count="$(printf '%s\n' "$block" | code_lines | grep -cF '        default: false' || true)"
+  [ "${count:-0}" -eq 1 ]
+
+  count="$(printf '%s\n' "$block" | code_lines | grep -cF '        type: boolean' || true)"
+  [ "${count:-0}" -eq 1 ]
+
+  parse_block="$(job_block parse "$PROMOTE")"
+  count="$(printf '%s\n' "$parse_block" | code_lines | grep -cF '        if: ${{ !inputs.skip_e2e_gate }}' || true)"
+  [ "${count:-0}" -eq 1 ]
+  count="$(printf '%s\n' "$parse_block" | code_lines | grep -cF '        if: ${{ inputs.skip_e2e_gate }}' || true)"
+  [ "${count:-0}" -eq 1 ]
+}
+
+@test "promote PR keeps release label and does not auto-apply full-e2e" {
+  block="$(job_block open-pr "$PROMOTE")"
+  [ -n "$block" ]
+
+  count="$(printf '%s\n' "$block" | code_lines | grep -cF -- '--body "$BODY" --label release' || true)"
+  [ "${count:-0}" -eq 1 ]
+
+  count="$(printf '%s\n' "$block" | code_lines | grep -cF -- '--label full-e2e' || true)"
+  [ "${count:-0}" -eq 0 ]
+}
+
+@test "promote PR body carries verified and bypassed E2E status" {
+  promote_block="$(job_block promote "$PROMOTE")"
+  open_block="$(job_block open-pr "$PROMOTE")"
+
+  count="$(printf '%s\n' "$promote_block" | code_lines | grep -cF '      e2e_verification: ${{ needs.parse.outputs.e2e_verification }}' || true)"
+  [ "${count:-0}" -eq 1 ]
+
+  count="$(printf '%s\n' "$open_block" | code_lines | grep -cF '          E2E_VERIFICATION: ${{ needs.promote.outputs.e2e_verification }}' || true)"
+  [ "${count:-0}" -eq 1 ]
+
+  count="$(printf '%s\n' "$open_block" | code_lines | grep -cF '            E2E_NOTE="✅ RC full e2e was verified' || true)"
+  [ "${count:-0}" -eq 1 ]
+
+  count="$(printf '%s\n' "$open_block" | code_lines | grep -cF '            E2E_NOTE="⚠️ **RC e2e gate bypassed**' || true)"
+  [ "${count:-0}" -eq 1 ]
+
+  count="$(printf '%s\n' "$open_block" | code_lines | grep -cF '          ${E2E_NOTE}' || true)"
+  [ "${count:-0}" -eq 1 ]
+}
+
+@test "release PR E2E is a working manual full-e2e label opt-in" {
+  count="$(code_lines < "$PULL_REQUESTS" | grep -cF '    types: [opened, synchronize, reopened, labeled]' || true)"
+  [ "${count:-0}" -eq 1 ]
+
+  plan_header="$(job_header plan "$PULL_REQUESTS")"
+  count="$(printf '%s\n' "$plan_header" | code_lines | grep -cF "    if: github.event.action != 'labeled' || github.event.label.name == 'full-e2e'" || true)"
+  [ "${count:-0}" -eq 1 ]
+
+  resolve_header="$(job_header resolve_assets "$PULL_REQUESTS")"
+  count="$(printf '%s\n' "$resolve_header" | code_lines | grep -cF "github.event.label.name == 'full-e2e'" || true)"
+  [ "${count:-0}" -eq 1 ]
+
+  e2e_header="$(job_header e2e "$PULL_REQUESTS")"
+  count="$(printf '%s\n' "$e2e_header" | code_lines | grep -cF "needs.resolve_assets.result == 'success'" || true)"
+  [ "${count:-0}" -eq 1 ]
+  count="$(printf '%s\n' "$e2e_header" | code_lines | grep -cF "&& contains(github.event.pull_request.labels.*.name, 'full-e2e')" || true)"
+  [ "${count:-0}" -eq 1 ]
+}
+
+# ── promote-time website docs contract ──────────────────────────────────────
+# The website "update managed apps reference" PR is opened at PROMOTE time from
+# the staging branch (via FETCH_REF) instead of only at tag time. These pins are
+# executable/structural (code_lines strips comments) so a commented-out step,
+# guard, or body line can never satisfy them. The one deliberate exception is the
+# tags.yaml backstop-comment pin, which asserts a COMMENT is present.
+
+@test "promote-rc website-docs job depends on parse and promote" {
+  block="$(job_block website-docs "$PROMOTE")"
+  [ -n "$block" ]
+
+  count="$(printf '%s\n' "$block" | code_lines | grep -cF '    needs: [parse, promote]' || true)"
+  [ "${count:-0}" -eq 1 ]
+
+  # It must run after the staging branch exists — website-docs is ordered after
+  # promote in the file, and promote is what pushes release-X.Y.Z.
+  website_line="$(code_lines < "$PROMOTE" | grep -n '^  website-docs:$' | awk -F: 'NR == 1 { print $1 }')"
+  promote_line="$(code_lines < "$PROMOTE" | grep -n '^  promote:$' | awk -F: 'NR == 1 { print $1 }')"
+  [ -n "$website_line" ] && [ -n "$promote_line" ]
+  [ "$promote_line" -lt "$website_line" ]
+}
+
+@test "website-docs fetches docs from the staging branch via FETCH_REF, not the stable tag" {
+  block="$(job_block website-docs "$PROMOTE")"
+  [ -n "$block" ]
+
+  # The load-bearing invocation shape: update-all pinned to the staging branch.
+  count="$(printf '%s\n' "$block" | code_lines | grep -cF 'make update-all RELEASE_TAG="$TAG" FETCH_REF="$SRC_REF"' || true)"
+  [ "${count:-0}" -eq 1 ]
+
+  # SRC_REF must be the stable staging branch (which exists at promote time), never
+  # the stable tag (which finalize only creates post-merge).
+  count="$(printf '%s\n' "$block" | code_lines | grep -cF 'SRC_REF: ${{ needs.parse.outputs.stable_branch }}' || true)"
+  [ "${count:-0}" -ge 1 ]
+  count="$(printf '%s\n' "$block" | code_lines | grep -cF 'FETCH_REF="${{ needs.parse.outputs.stable_tag }}"' || true)"
+  [ "${count:-0}" -eq 0 ]
+}
+
+@test "website-docs guards against a website checkout that predates FETCH_REF" {
+  block="$(job_block website-docs "$PROMOTE")"
+  guard="$(printf '%s\n' "$block" | awk '
+    /^      - name: Require FETCH_REF support/ { inside = 1; next }
+    /^      - name: / { inside = 0 }
+    inside')"
+  [ -n "$guard" ]
+
+  # It detects support by probing the website Makefile, and fails loudly when
+  # absent — never warn-and-continue into stub-doc generation.
+  printf '%s\n' "$guard" | code_lines | grep -qF "grep -q '^FETCH_REF' Makefile"
+  printf '%s\n' "$guard" | code_lines | grep -qF 'exit 1'
+}
+
+@test "website-docs checkout does not persist credentials (app-token push, extraheader trap)" {
+  block="$(job_block website-docs "$PROMOTE")"
+  checkout="$(printf '%s\n' "$block" | awk '
+    /^      - name: Checkout website repo$/ { inside = 1; next }
+    /^      - name: / { inside = 0 }
+    inside')"
+  [ -n "$checkout" ]
+
+  count="$(printf '%s\n' "$checkout" | code_lines | grep -cF 'persist-credentials: false' || true)"
+  [ "${count:-0}" -eq 1 ]
+  count="$(printf '%s\n' "$checkout" | code_lines | grep -cF 'repository: cozystack/website' || true)"
+  [ "${count:-0}" -eq 1 ]
+}
+
+@test "website-docs PR body carries the DO-NOT-MERGE-until-finalize contract" {
+  block="$(job_block website-docs "$PROMOTE")"
+  # Explicit merge-timing wording in the body the job opens on cozystack/website.
+  printf '%s\n' "$block" | code_lines | grep -qF 'DO NOT MERGE until'
+}
+
+@test "promote PR body carries a website-docs ✅/⚠️ status line" {
+  block="$(job_block open-pr "$PROMOTE")"
+  [ -n "$block" ]
+
+  count="$(printf '%s\n' "$block" | code_lines | grep -cF 'WEBSITE_DOCS_RESULT: ${{ needs.website-docs.result }}' || true)"
+  [ "${count:-0}" -eq 1 ]
+  count="$(printf '%s\n' "$block" | code_lines | grep -cF '          ${WEBSITE_NOTE}' || true)"
+  [ "${count:-0}" -eq 1 ]
+  # Both outcomes must be expressible.
+  printf '%s\n' "$block" | code_lines | grep -qF 'WEBSITE_NOTE="✅'
+  printf '%s\n' "$block" | code_lines | grep -qF 'WEBSITE_NOTE="⚠️'
+}
+
+@test "tags.yaml update-website-docs documents that it is now the backstop" {
+  # Deliberately a COMMENT-presence pin (not code_lines): the backstop status is
+  # documented in a comment above the tag-time job so a maintainer reading it
+  # knows the promote flow opens the PR earlier.
+  grep -qF 'promote-rc.yaml::website-docs' "$TAGS"
+  grep -qiF 'backstop' "$TAGS"
+}
+
+@test "finalize checkout does not persist credentials so the app-token tag push triggers tags.yaml" {
+  block="$(job_block finalize "$FINALIZE")"
+  [ -n "$block" ]
+  checkout="$(printf '%s\n' "$block" | awk '
+    /^      - name: Checkout repo$/ { inside = 1; next }
+    /^      - name: / { inside = 0 }
+    inside')"
+  [ -n "$checkout" ]
+
+  # The one-line root-cause fix. Without persist-credentials:false the checkout
+  # persists GITHUB_TOKEN as http.extraheader, which silently defeats the app token
+  # each later `git remote set-url` injects onto the tag pushes — and a
+  # GITHUB_TOKEN-authenticated push creates no workflow run (anti-recursion), so
+  # tags.yaml's stable-tag backstops never fire (v1.6.0's tag never triggered it).
+  count="$(printf '%s\n' "$checkout" | code_lines | grep -cF 'persist-credentials: false' || true)"
+  [ "${count:-0}" -eq 1 ]
+}
+
+# ── rc-e2e's reusable-workflow permission ceiling ────────────────────────────
+# tags.yaml runs only on tag pushes, so no PR lane can ever exercise these two
+# facts together. They are pinned here because getting them wrong does not
+# degrade gracefully: a caller that grants less than the called workflow's jobs
+# declare fails GitHub's STATIC validation at run creation, taking down the whole
+# tags.yaml run — build, draft release and staging branch included — for every
+# tag push, rc or stable.
+
+@test "rc-e2e grants the ceiling e2e-tag.yaml's jobs declare" {
+  E2E_TAG="$REPO_ROOT/.github/workflows/e2e-tag.yaml"
+  [ -f "$E2E_TAG" ]
+
+  rc_e2e="$(job_block rc-e2e "$TAGS")"
+  [ -n "$rc_e2e" ]
+  printf '%s\n' "$rc_e2e" | code_lines | grep -qF 'uses: ./.github/workflows/e2e-tag.yaml'
+
+  # Every permission any job in the called workflow declares must be granted by
+  # the caller. Assert the pair explicitly, in both files, so removing either side
+  # surfaces here instead of at the next release.
+  e2e_job="$(job_block e2e "$E2E_TAG")"
+  [ -n "$e2e_job" ]
+  printf '%s\n' "$e2e_job" | code_lines | grep -qF 'checks: write'
+
+  printf '%s\n' "$rc_e2e" | code_lines | grep -qF 'contents: read'
+  printf '%s\n' "$rc_e2e" | code_lines | grep -qF 'checks: write'
+}
+
+@test "the promote gate's expected job name matches e2e-tag.yaml's job name" {
+  E2E_TAG="$REPO_ROOT/.github/workflows/e2e-tag.yaml"
+
+  # The gate correlates evidence by exact job name, which makes rc.1 vs rc.11
+  # unambiguous — and makes a rename on either side fail the gate closed, blocking
+  # promotion until someone notices. Cheap to pin, expensive to debug.
+  count="$(code_lines < "$PROMOTE" | grep -cF 'E2E ${rcTag} (full suite)' || true)"
+  [ "${count:-0}" -ge 1 ]
+  count="$(code_lines < "$E2E_TAG" | grep -cF 'E2E ${{ inputs.tag }} (full suite)' || true)"
+  [ "${count:-0}" -eq 1 ]
+}
diff --git a/hack/promote-packages-artifact.sh b/hack/promote-packages-artifact.sh
new file mode 100755
index 0000000000..bcc4ba6b4d
--- /dev/null
+++ b/hack/promote-packages-artifact.sh
@@ -0,0 +1,99 @@
+#!/bin/sh
+# Publish the tag-rewritten packages tree as a stable-candidate Flux OCI
+# artifact, then pin the installer values to the candidate's immutable digest.
+# Container images are not rebuilt here: their digests were baked by the rc and
+# remain unchanged. Only the declarative packages artifact is re-serialized so
+# the stable install consumes the stable tag strings committed by promotion.
+#
+# Usage: hack/promote-packages-artifact.sh <stable-version> <rc-tag> <source-sha> [root]
+#   <stable-version>  X.Y.Z (without a leading v)
+#   <rc-tag>          vX.Y.Z-rc.N
+#   <source-sha>      commit SHA containing the rewritten tree being published
+#   [root]            packages tree to publish; defaults to packages
+#
+# Environment:
+#   REGISTRY          destination registry; defaults to the release GHCR path
+#   SOURCE_URL        OCI source annotation; defaults to this repository
+#   PROMOTION_ID      unique GitHub run-id/run-attempt pair, e.g. 123456789-2
+#   EXPECTED_PACKAGES_REPOSITORY  exact trusted OCI repository the rc tree must
+#                                 already pin; defaults to the public Cozystack
+#                                 release repository
+set -eu
+
+STABLE_VERSION="${1:?usage: promote-packages-artifact.sh <stable-version> <rc-tag> <source-sha> [root]}"
+RC_TAG="${2:?usage: promote-packages-artifact.sh <stable-version> <rc-tag> <source-sha> [root]}"
+SOURCE_SHA="${3:?usage: promote-packages-artifact.sh <stable-version> <rc-tag> <source-sha> [root]}"
+ROOT="${4:-packages}"
+REGISTRY="${REGISTRY:-ghcr.io/cozystack/cozystack}"
+SOURCE_URL="${SOURCE_URL:-https://github.com/cozystack/cozystack}"
+PROMOTION_ID="${PROMOTION_ID:?PROMOTION_ID must be the GitHub run-id/run-attempt pair}"
+
+# EXPECTED_PACKAGES_REPOSITORY and PACKAGES_DIGEST_REF_PATTERN, shared with
+# hack/verify-promoted-packages.sh so the preflight below cannot drift from the
+# guard it is bringing forward.
+# shellcheck source=hack/lib/promoted-packages.sh
+. "$(dirname "$0")/lib/promoted-packages.sh"
+
+printf '%s\n' "$STABLE_VERSION" | grep -Eq '^[0-9]+\.[0-9]+\.[0-9]+$' \
+  || { echo "stable-version '$STABLE_VERSION' must match X.Y.Z" >&2; exit 1; }
+printf '%s\n' "$RC_TAG" | grep -Eq '^v[0-9]+\.[0-9]+\.[0-9]+-rc\.[0-9]+$' \
+  || { echo "rc-tag '$RC_TAG' must match v${STABLE_VERSION}-rc.N" >&2; exit 1; }
+[ "${RC_TAG%-rc.*}" = "v${STABLE_VERSION}" ] \
+  || { echo "rc-tag '$RC_TAG' must match v${STABLE_VERSION}-rc.N" >&2; exit 1; }
+printf '%s\n' "$SOURCE_SHA" | grep -Eq '^[0-9a-f]{40}$' \
+  || { echo "source-sha '$SOURCE_SHA' must be a 40-character lowercase hex SHA" >&2; exit 1; }
+printf '%s\n' "$PROMOTION_ID" | grep -Eq '^[0-9]+-[0-9]+$' \
+  || { echo "PROMOTION_ID '$PROMOTION_ID' must match <run-id>-<run-attempt>" >&2; exit 1; }
+[ -d "$ROOT" ] || { echo "root '$ROOT' is not a directory" >&2; exit 1; }
+VALUES="$ROOT/core/installer/values.yaml"
+[ -f "$VALUES" ] \
+  || { echo "root '$ROOT' has no core/installer/values.yaml" >&2; exit 1; }
+
+command -v flux >/dev/null || { echo "flux is required" >&2; exit 1; }
+command -v yq >/dev/null   || { echo "yq (mikefarah) is required" >&2; exit 1; }
+yq --version 2>&1 | grep -q mikefarah \
+  || { echo "yq (mikefarah) is required" >&2; exit 1; }
+
+# Preflight the rc tree's own pin against the checks the candidate will face.
+# The artifact is pushed BEFORE the rewrite at the bottom of this script, so it
+# carries this values.yaml verbatim and verify-promoted-packages.sh reads these
+# two fields back out of it as the candidate's rc baseline. Left unchecked, a
+# tag-form ref or an untrusted repository is therefore not caught at dispatch
+# but in the promote PR gate, once the artifact, the staging branch and the
+# draft release all exist. Refuse now, while nothing has been written.
+rc_source_url="$(yq -e -r '.cozystackOperator.platformSourceUrl' "$VALUES")"
+rc_source_ref="$(yq -e -r '.cozystackOperator.platformSourceRef' "$VALUES")"
+[ "$rc_source_url" = "$EXPECTED_PACKAGES_REPOSITORY" ] \
+  || { echo "rc tree's platformSourceUrl '$rc_source_url' must equal trusted repository '$EXPECTED_PACKAGES_REPOSITORY'" >&2; exit 1; }
+printf '%s\n' "$rc_source_ref" | grep -Eq "$PACKAGES_DIGEST_REF_PATTERN" \
+  || { echo "rc tree's platformSourceRef '$rc_source_ref' is not an immutable digest" >&2; exit 1; }
+
+REPOSITORY="oci://${REGISTRY}/cozystack-packages"
+CANDIDATE_TAG="promotion-v${STABLE_VERSION}-from-${RC_TAG}-run-${PROMOTION_ID}"
+REVISION="promotion-v${STABLE_VERSION}-from-${RC_TAG}@sha1:${SOURCE_SHA}"
+
+# Every workflow run/attempt gets a new tag, so a retry can never move a tag or
+# orphan the previous manifest. --reproducible and the source commit keep the
+# artifact's own metadata deterministic and point at a tree that actually
+# contains the rewritten packages content (before its impossible self-pin).
+result="$(flux push artifact "${REPOSITORY}:${CANDIDATE_TAG}" \
+  --path="$ROOT" \
+  --source="$SOURCE_URL" \
+  --revision="$REVISION" \
+  --reproducible \
+  --output json)"
+
+digest="$(printf '%s\n' "$result" | yq -e -r '.digest')"
+printf '%s\n' "$digest" | grep -Eq '^sha256:[0-9a-f]{64}$' \
+  || { echo "flux returned invalid artifact digest '$digest'" >&2; exit 1; }
+
+# The artifact cannot contain its own digest: writing the digest changes the
+# artifact and therefore creates another digest. The separately published
+# installer chart carries this pin; the embedded old pin is runtime-inert and
+# is the sole normalized difference accepted by verify-promoted-packages.sh.
+export REPOSITORY digest
+yq -i '.cozystackOperator.platformSourceUrl = strenv(REPOSITORY) |
+  .cozystackOperator.platformSourceRef = "digest=" + strenv(digest)' \
+  "$VALUES"
+
+echo "Published ${REPOSITORY}:${CANDIDATE_TAG}@${digest} and pinned installer values."
diff --git a/hack/promote-packages-artifact_test.bats b/hack/promote-packages-artifact_test.bats
new file mode 100644
index 0000000000..f885b62d89
--- /dev/null
+++ b/hack/promote-packages-artifact_test.bats
@@ -0,0 +1,213 @@
+#!/usr/bin/env bats
+# Behavioural tests for the stable-candidate packages artifact publisher.
+# Run with: bats hack/promote-packages-artifact_test.bats
+
+load test_helper
+
+_test_workspace() {
+  if [ -n "${BATS_TEST_TMPDIR:-}" ]; then
+    printf '%s\n' "$BATS_TEST_TMPDIR"
+  else
+    printf '%s\n' "${tmp:?cozytest workspace is missing}"
+  fi
+}
+
+@test "publishes a reproducible stable candidate and pins its digest" {
+  tmp="$(_test_workspace)/publisher"
+  mkdir -p "$tmp/bin" "$tmp/packages/core/installer"
+  cat > "$tmp/bin/flux" <<'EOF'
+#!/bin/sh
+set -eu
+printf '%s\n' "$@" > "$MOCK_FLUX_LOG"
+printf '%s\n' "$MOCK_FLUX_RESULT"
+EOF
+  chmod +x "$tmp/bin/flux"
+  # The rc tree pins the trusted repository by digest, which is what the
+  # preflight demands; REGISTRY sends the candidate somewhere else so the
+  # rewrite assertions below still have something to prove.
+  cat > "$tmp/packages/core/installer/values.yaml" <<'EOF'
+cozystackOperator:
+  platformSourceUrl: oci://ghcr.io/cozystack/cozystack/cozystack-packages
+  platformSourceRef: digest=sha256:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+EOF
+  digest='sha256:bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb'
+  sha='cccccccccccccccccccccccccccccccccccccccc'
+
+  rc=0
+  REGISTRY=example.com/cozystack SOURCE_URL=https://example.com/cozystack \
+    PROMOTION_ID=123456789-2 \
+    MOCK_FLUX_LOG="$tmp/flux.log" MOCK_FLUX_RESULT="{\"digest\":\"$digest\"}" \
+    PATH="$tmp/bin:$PATH" \
+    hack/promote-packages-artifact.sh 9.9.9 v9.9.9-rc.3 "$sha" "$tmp/packages" \
+    > "$tmp/out" 2> "$tmp/err" || rc=$?
+  if [ "$rc" -ne 0 ]; then
+    echo "publisher exited $rc" >&2
+    cat "$tmp/err" >&2
+    return "$rc"
+  fi
+
+  grep -qx 'oci://example.com/cozystack/cozystack-packages:promotion-v9.9.9-from-v9.9.9-rc.3-run-123456789-2' "$tmp/flux.log"
+  grep -qx -- '--reproducible' "$tmp/flux.log"
+  grep -qx -- '--output' "$tmp/flux.log"
+  grep -qx 'json' "$tmp/flux.log"
+  grep -qx -- '--revision=promotion-v9.9.9-from-v9.9.9-rc.3@sha1:'"$sha" "$tmp/flux.log"
+  grep -qx -- '--source=https://example.com/cozystack' "$tmp/flux.log"
+  [ "$(yq -r '.cozystackOperator.platformSourceUrl' "$tmp/packages/core/installer/values.yaml")" = 'oci://example.com/cozystack/cozystack-packages' ]
+  [ "$(yq -r '.cozystackOperator.platformSourceRef' "$tmp/packages/core/installer/values.yaml")" = "digest=$digest" ]
+  grep -q 'and pinned installer values' "$tmp/out"
+}
+
+@test "propagates a Flux push failure without changing installer values" {
+  tmp="$(_test_workspace)/publisher"
+  mkdir -p "$tmp/bin" "$tmp/packages/core/installer"
+  cat > "$tmp/bin/flux" <<'EOF'
+#!/bin/sh
+exit 42
+EOF
+  chmod +x "$tmp/bin/flux"
+  cat > "$tmp/packages/core/installer/values.yaml" <<'EOF'
+cozystackOperator:
+  platformSourceUrl: oci://ghcr.io/cozystack/cozystack/cozystack-packages
+  platformSourceRef: digest=sha256:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+EOF
+  cp "$tmp/packages/core/installer/values.yaml" "$tmp/before"
+  sha='ffffffffffffffffffffffffffffffffffffffff'
+
+  rc=0
+  PROMOTION_ID=123456789-3 PATH="$tmp/bin:$PATH" \
+    hack/promote-packages-artifact.sh 9.9.9 v9.9.9-rc.1 "$sha" "$tmp/packages" \
+    > "$tmp/out" 2> "$tmp/err" || rc=$?
+
+  [ "$rc" -eq 42 ]
+  cmp -s "$tmp/before" "$tmp/packages/core/installer/values.yaml"
+}
+
+@test "rejects an rc from a different stable version before publishing" {
+  tmp="$(_test_workspace)/publisher"
+  mkdir -p "$tmp/packages/core/installer"
+  : > "$tmp/packages/core/installer/values.yaml"
+  sha='dddddddddddddddddddddddddddddddddddddddd'
+
+  rc=0
+  PROMOTION_ID=123456789-4 \
+    hack/promote-packages-artifact.sh 9.9.9 v9.9.8-rc.1 "$sha" "$tmp/packages" \
+    > "$tmp/out" 2> "$tmp/err" || rc=$?
+
+  [ "$rc" -ne 0 ]
+  grep -q "must match v9.9.9-rc.N" "$tmp/err"
+}
+
+# A mock that records the fact it ran at all, for the preflights below: their
+# whole point is that nothing reaches the registry, and "the script exited
+# non-zero" does not say that on its own.
+_make_recording_flux() {
+  mkdir -p "$1/bin"
+  cat > "$1/bin/flux" <<'EOF'
+#!/bin/sh
+printf 'invoked\n' > "$MOCK_FLUX_LOG"
+printf '%s\n' '{"digest":"sha256:bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"}'
+EOF
+  chmod +x "$1/bin/flux"
+}
+
+# The candidate is pushed BEFORE the rewrite at the end of the script, so it
+# carries the rc tree's pin verbatim and verify-promoted-packages.sh reads it
+# back as the candidate's rc baseline. Both preflights below therefore bring a
+# verification failure forward: without them the artifact, the staging branch
+# and the draft release all exist by the time the same values are rejected.
+@test "rejects an rc tree pinned by tag before publishing" {
+  tmp="$(_test_workspace)/publisher"
+  mkdir -p "$tmp/packages/core/installer"
+  _make_recording_flux "$tmp"
+  cat > "$tmp/packages/core/installer/values.yaml" <<'EOF'
+cozystackOperator:
+  platformSourceUrl: oci://ghcr.io/cozystack/cozystack/cozystack-packages
+  platformSourceRef: tag=v9.9.9-rc.3
+EOF
+  sha='1111111111111111111111111111111111111111'
+
+  rc=0
+  PROMOTION_ID=123456789-6 MOCK_FLUX_LOG="$tmp/flux.log" PATH="$tmp/bin:$PATH" \
+    hack/promote-packages-artifact.sh 9.9.9 v9.9.9-rc.3 "$sha" "$tmp/packages" \
+    > "$tmp/out" 2> "$tmp/err" || rc=$?
+
+  [ "$rc" -ne 0 ]
+  grep -q "rc tree's platformSourceRef 'tag=v9.9.9-rc.3' is not an immutable digest" "$tmp/err"
+  [ ! -e "$tmp/flux.log" ]
+}
+
+@test "rejects an rc tree pinned outside the trusted repository before publishing" {
+  tmp="$(_test_workspace)/publisher"
+  mkdir -p "$tmp/packages/core/installer"
+  _make_recording_flux "$tmp"
+  cat > "$tmp/packages/core/installer/values.yaml" <<'EOF'
+cozystackOperator:
+  platformSourceUrl: oci://example.invalid/cozystack-packages
+  platformSourceRef: digest=sha256:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+EOF
+  sha='2222222222222222222222222222222222222222'
+
+  rc=0
+  PROMOTION_ID=123456789-7 MOCK_FLUX_LOG="$tmp/flux.log" PATH="$tmp/bin:$PATH" \
+    hack/promote-packages-artifact.sh 9.9.9 v9.9.9-rc.3 "$sha" "$tmp/packages" \
+    > "$tmp/out" 2> "$tmp/err" || rc=$?
+
+  [ "$rc" -ne 0 ]
+  grep -q "rc tree's platformSourceUrl 'oci://example.invalid/cozystack-packages' must equal trusted repository" "$tmp/err"
+  [ ! -e "$tmp/flux.log" ]
+}
+
+# PROMOTION_ID is not attacker-influenced — the workflow builds it from
+# github.run_id and github.run_attempt — but it is the run-uniqueness suffix of
+# the candidate tag, and retention.yaml only ever deletes a cozystack-packages
+# version whose every tag matches `promotion-v…-run-[0-9]+-[0-9]+`. A value
+# that fails that shape publishes a candidate no cleanup pass can ever collect,
+# so the two patterns are a contract and this refusal is the end of it that a
+# test can reach.
+@test "rejects a malformed PROMOTION_ID before publishing" {
+  tmp="$(_test_workspace)/publisher"
+  mkdir -p "$tmp/packages/core/installer"
+  _make_recording_flux "$tmp"
+  cat > "$tmp/packages/core/installer/values.yaml" <<'EOF'
+cozystackOperator:
+  platformSourceUrl: oci://ghcr.io/cozystack/cozystack/cozystack-packages
+  platformSourceRef: digest=sha256:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+EOF
+  sha='3333333333333333333333333333333333333333'
+
+  rc=0
+  PROMOTION_ID='123456789/2' MOCK_FLUX_LOG="$tmp/flux.log" PATH="$tmp/bin:$PATH" \
+    hack/promote-packages-artifact.sh 9.9.9 v9.9.9-rc.3 "$sha" "$tmp/packages" \
+    > "$tmp/out" 2> "$tmp/err" || rc=$?
+
+  [ "$rc" -ne 0 ]
+  grep -q "must match <run-id>-<run-attempt>" "$tmp/err"
+  [ ! -e "$tmp/flux.log" ]
+}
+
+@test "refuses an invalid digest without changing installer values" {
+  tmp="$(_test_workspace)/publisher"
+  mkdir -p "$tmp/bin" "$tmp/packages/core/installer"
+  cat > "$tmp/bin/flux" <<'EOF'
+#!/bin/sh
+set -eu
+printf '%s\n' '{"digest":"sha256:short"}'
+EOF
+  chmod +x "$tmp/bin/flux"
+  cat > "$tmp/packages/core/installer/values.yaml" <<'EOF'
+cozystackOperator:
+  platformSourceUrl: oci://ghcr.io/cozystack/cozystack/cozystack-packages
+  platformSourceRef: digest=sha256:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+EOF
+  cp "$tmp/packages/core/installer/values.yaml" "$tmp/before"
+  sha='eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee'
+
+  rc=0
+  PROMOTION_ID=123456789-5 PATH="$tmp/bin:$PATH" \
+    hack/promote-packages-artifact.sh 9.9.9 v9.9.9-rc.1 "$sha" "$tmp/packages" \
+    > "$tmp/out" 2> "$tmp/err" || rc=$?
+
+  [ "$rc" -ne 0 ]
+  grep -q 'invalid artifact digest' "$tmp/err"
+  cmp -s "$tmp/before" "$tmp/packages/core/installer/values.yaml"
+}
diff --git a/hack/promote-packages-contract.bats b/hack/promote-packages-contract.bats
new file mode 100644
index 0000000000..a30aa21a21
--- /dev/null
+++ b/hack/promote-packages-contract.bats
@@ -0,0 +1,177 @@
+#!/usr/bin/env bats
+# Structural contract for publishing and verifying stable-candidate packages.
+# The registry workflow cannot run in a PR lane, so ordering around the first
+# write-once stable tag is pinned here. Behaviour lives in the two *_test suites.
+
+load test_helper
+
+REPO_ROOT="$(cd "$(dirname "${BATS_TEST_FILENAME:-$0}")/.." && pwd)"
+PROMOTE="$REPO_ROOT/.github/workflows/promote-rc.yaml"
+FINALIZE="$REPO_ROOT/.github/workflows/pull-requests-release.yaml"
+PULL_REQUESTS="$REPO_ROOT/.github/workflows/pull-requests.yaml"
+
+code_lines() {
+  rc=0
+  grep -v '^[[:space:]]*#' || rc=$?
+  [ "$rc" -le 1 ]
+}
+
+job_block() {
+  awk -v job="  $1:" '
+    $0 == job { inside = 1; next }
+    /^  [a-z0-9_-]+:$/ { inside = 0 }
+    inside' "$2"
+}
+
+step_block() {
+  awk -v want="      - name: $1" '
+    $0 == want { inside = 1; next }
+    /^      - name: / { inside = 0 }
+    inside' "$2"
+}
+
+step_line() {
+  code_lines < "$2" | grep -nF "      - name: $1" | awk -F: 'NR == 1 { print $1 }'
+}
+
+@test "candidate publish and verification helpers exist and are executable" {
+  [ -x "$REPO_ROOT/hack/promote-packages-artifact.sh" ]
+  [ -x "$REPO_ROOT/hack/verify-promoted-packages.sh" ]
+}
+
+@test "promote commits the rewritten tree then publishes and commits its pin" {
+  block="$(step_block 'Prepare stable branch' "$PROMOTE")"
+  [ -n "$block" ]
+
+  rewrite="$(printf '%s\n' "$block" | code_lines | grep -nF '.release-tooling/hack/promote-rewrite-tags.sh' | awk -F: 'NR == 1 { print $1 }')"
+  publish="$(printf '%s\n' "$block" | code_lines | grep -nF '.release-tooling/hack/promote-packages-artifact.sh' | awk -F: 'NR == 1 { print $1 }')"
+  content_commit="$(printf '%s\n' "$block" | code_lines | grep -nF 'git commit -s -m "Prepare release' | awk -F: 'NR == 1 { print $1 }')"
+  pin_commit="$(printf '%s\n' "$block" | code_lines | grep -nF 'git commit -s -m "Pin promoted packages artifact' | awk -F: 'NR == 1 { print $1 }')"
+  [ -n "$rewrite" ] && [ -n "$content_commit" ] && [ -n "$publish" ] && [ -n "$pin_commit" ]
+  [ "$rewrite" -lt "$content_commit" ]
+  [ "$content_commit" -lt "$publish" ]
+  [ "$publish" -lt "$pin_commit" ]
+
+  # The helper comes from the dispatch ref's sparse tooling checkout, so the
+  # first release after this fix does not depend on the older rc tree carrying it.
+  printf '%s\n' "$block" | code_lines | grep -qF '.release-tooling/hack/promote-packages-artifact.sh'
+  printf '%s\n' "$block" | code_lines | grep -qF 'SOURCE_SHA="$(git rev-parse HEAD)"'
+  printf '%s\n' "$block" | code_lines | grep -qF 'PROMOTION_ID: ${{ github.run_id }}-${{ github.run_attempt }}'
+}
+
+@test "promote authenticates Flux with the same Docker config used by publish" {
+  job="$(job_block promote "$PROMOTE")"
+  login="$(step_block 'Login to registry (GHCR)' "$PROMOTE")"
+  prepare="$(step_block 'Prepare stable branch' "$PROMOTE")"
+
+  printf '%s\n' "$job" | code_lines | grep -qF '      packages: write'
+  printf '%s\n' "$job" | code_lines | grep -qF 'uses: fluxcd/flux2/action@'
+  printf '%s\n' "$login" | code_lines | grep -qF 'DOCKER_CONFIG: ${{ runner.temp }}/.docker'
+  printf '%s\n' "$prepare" | code_lines | grep -qF 'DOCKER_CONFIG: ${{ runner.temp }}/.docker'
+}
+
+@test "every promotion toolchain install pins its tools" {
+  # A release gate whose tooling comes from `releases/latest/download` is not a
+  # fixed input: the bytes that decide whether vX.Y.Z may be created, and the
+  # yq that rewrites the installer pin, change whenever upstream publishes.
+  # Pinned by version, and pinned to STAY pinned — an unpinned one-liner comes
+  # back by copy-paste rather than by anyone deciding to unpin a release step.
+  # flux is pinned by hack/ci-tool-installs-contract.bats across every workflow.
+  for step_and_file in \
+    "Set up toolchain (yq)|$PROMOTE" \
+    "Set up promotion toolchain (yq)|$PULL_REQUESTS" \
+    "Set up promotion toolchain (skopeo, yq, helm)|$FINALIZE"; do
+    block="$(step_block "${step_and_file%%|*}" "${step_and_file#*|}")"
+    [ -n "$block" ]
+    printf '%s\n' "$block" | code_lines | grep -qF 'YQ_VERSION: "'
+    count="$(printf '%s\n' "$block" | code_lines | grep -c 'releases/latest/download' || true)"
+    [ "${count:-0}" -eq 0 ]
+
+    # yq is pinned by content as well as by version: it is the one downloaded
+    # binary that WRITES what a release contains, stamping the candidate digest
+    # into installer values and platformVersion into the chart. A version
+    # variable authenticates nothing about the bytes it names.
+    printf '%s\n' "$block" | code_lines | grep -qF 'YQ_SHA256: "'
+    printf '%s\n' "$block" | code_lines | grep -qF 'sha256sum -c -'
+  done
+
+  # One version AND one checksum across all three, so the yq that writes the
+  # candidate's installer values is the yq that reads them back out of the
+  # artifact — and so bumping the version in one file without its checksum, or
+  # either without the other two, cannot pass.
+  for key in YQ_VERSION YQ_SHA256; do
+    values="$(cat "$PROMOTE" "$PULL_REQUESTS" "$FINALIZE" | code_lines \
+      | grep -o "$key: \"[0-9a-f.]*\"" | sort -u)"
+    [ -n "$values" ]
+    [ "$(printf '%s\n' "$values" | wc -l | tr -d ' ')" -eq 1 ]
+  done
+}
+
+@test "finalize verifies the pinned candidate before the first stable tag" {
+  verify="$(step_line 'Verify stable packages candidate' "$FINALIZE")"
+  create="$(step_line 'Create tag on merge commit (write-once)' "$FINALIZE")"
+  [ -n "$verify" ] && [ -n "$create" ]
+  [ "$verify" -lt "$create" ]
+
+  block="$(step_block 'Verify stable packages candidate' "$FINALIZE")"
+  printf '%s\n' "$block" | code_lines | grep -qF '.release-tooling/hack/verify-promoted-packages.sh "${TAG#v}"'
+
+  setup="$(step_block 'Set up flux' "$FINALIZE")"
+  printf '%s\n' "$setup" | code_lines | grep -qF 'uses: fluxcd/flux2/action@'
+}
+
+@test "promote rejects an old target base before publishing a candidate" {
+  validate="$(step_block 'Validate rc is promotable' "$PROMOTE")"
+  prepare_line="$(step_line 'Prepare stable branch' "$PROMOTE")"
+  validate_line="$(step_line 'Validate rc is promotable' "$PROMOTE")"
+  [ -n "$validate" ] && [ -n "$validate_line" ] && [ -n "$prepare_line" ]
+  [ "$validate_line" -lt "$prepare_line" ]
+
+  printf '%s\n' "$validate" | code_lines | grep -qF "['.github/workflows/pull-requests.yaml', 'verify-release-candidate:']"
+  printf '%s\n' "$validate" | code_lines | grep -qF "['.github/workflows/pull-requests-release.yaml', 'Verify stable packages candidate']"
+  printf '%s\n' "$validate" | code_lines | grep -qF "['hack/verify-promoted-packages.sh', 'EXPECTED_PACKAGES_REPOSITORY']"
+  # The verifier resolves its libraries relative to itself at run time, so a
+  # base carrying the script without them fails the gate it is meant to be.
+  # BOTH of them: the shared image-reference enumeration is sourced through the
+  # same `dirname $0` as the promoted-packages library, so a base missing it
+  # fails in the same place. Pinned per entry rather than only as a block —
+  # dropping any single pair used to leave every assertion here green.
+  printf '%s\n' "$validate" | code_lines | grep -qF "['hack/lib/image-refs.sh', 'collect_image_refs()']"
+  printf '%s\n' "$validate" | code_lines | grep -qF "['hack/lib/promoted-packages.sh', 'PACKAGES_DIGEST_REF_PATTERN']"
+  printf '%s\n' "$validate" | code_lines | grep -qF "core.setOutput('base_branch', baseBranch)"
+
+  open_pr="$(step_block 'Open promote (release) PR' "$PROMOTE")"
+  printf '%s\n' "$open_pr" | code_lines | grep -qF 'BASE_BRANCH: ${{ needs.promote.outputs.base_branch }}'
+  printf '%s\n' "$open_pr" | code_lines | grep -qF 'BASE="$BASE_BRANCH"'
+}
+
+@test "pull request gate verifies the prospective merge with trusted base tooling" {
+  job="$(job_block verify-release-candidate "$PULL_REQUESTS")"
+  [ -n "$job" ]
+
+  printf '%s\n' "$job" | code_lines | grep -qF "github.event.pull_request.user.login == 'cozystack-ci[bot]'"
+  printf '%s\n' "$job" | code_lines | grep -qF 'ref: ${{ github.event.pull_request.base.sha }}'
+  printf '%s\n' "$job" | code_lines | grep -qF '.release-tooling/hack/verify-promoted-packages.sh "$STABLE_VERSION"'
+  printf '%s\n' "$job" | code_lines | grep -qF 'uses: fluxcd/flux2/action@'
+
+  report="$(job_block e2e-report "$PULL_REQUESTS")"
+  printf '%s\n' "$report" | code_lines | grep -qF '"verify-release-candidate"'
+  printf '%s\n' "$report" | code_lines | grep -qF "IS_RELEASE === 'true' && CANDIDATE_RESULT !== 'success'"
+
+  # `e2e` is the other consumer, and the one that RUNS the suite. Reporting a
+  # red is a lesser guarantee than not running a full-e2e promotion suite
+  # against a candidate that did not verify, so pin both halves: the dependency
+  # and the clause on the release arm. Removing them together left every other
+  # assertion in this file green.
+  e2e="$(job_block e2e "$PULL_REQUESTS")"
+  [ -n "$e2e" ]
+  printf '%s\n' "$e2e" | code_lines | grep -qF '"verify-release-candidate"'
+  printf '%s\n' "$e2e" | code_lines | grep -qF 'needs.verify-release-candidate.result == '"'"'success'"'"''
+
+  # gh applies --label after opening a PR. The release label event must replace
+  # the initial run and publish a fresh status that includes candidate verify.
+  grep -qF "github.event.label.name != 'release'" "$PULL_REQUESTS"
+  plan="$(job_block plan "$PULL_REQUESTS")"
+  printf '%s\n' "$plan" | code_lines | grep -qF "github.event.label.name == 'release'"
+  printf '%s\n' "$report" | code_lines | grep -qF "github.event.label.name == 'release'"
+}
diff --git a/hack/promote-retag.sh b/hack/promote-retag.sh
new file mode 100755
index 0000000000..16a212bce8
--- /dev/null
+++ b/hack/promote-retag.sh
@@ -0,0 +1,208 @@
+#!/bin/sh
+# Promote a release-candidate to stable by RETAGGING its already-built images —
+# no rebuild. Every cluster artifact cozystack ships (component images, the
+# cozystack-packages OCI artifact) is content-addressed; this script reads the
+# digests the rc baked into the package values.yaml files and copies each, by
+# digest, to the stable tag. Because the copy source is the immutable digest,
+# the stable image is bit-for-bit the rc image that passed e2e — promotion
+# cannot diverge from what was tested.
+#
+# Usage: hack/promote-retag.sh <stable-version> [--dry-run]
+#   <stable-version>  e.g. v1.4.0  (the tag the rc is promoted to)
+#   --dry-run         print the skopeo copies without executing them
+#
+# Environment:
+#   MOVE_LATEST=1     also (re)point :latest at each promoted image. OFF by
+#                     default: :latest must move only when the version being
+#                     promoted is the newest published stable, otherwise a patch
+#                     on an older line (e.g. v1.4.6 while 1.5.x is current) would
+#                     drag :latest backwards. The caller (finalize) computes this
+#                     with the same max-semver test it uses for the release's
+#                     make_latest flag and sets MOVE_LATEST accordingly.
+#
+# Reads image refs from the CURRENT tree (see hack/lib/image-refs.sh for which
+# files that covers), which is expected to be the promoted stable
+# digest-vendored tree (the release-X.Y.Z branch, whose digests are the rc's —
+# only the cosmetic tag string differs).
+# Requires: yq (mikefarah), skopeo, sha256sum, and a registry login already done.
+#
+# The repo/tag split (ref_repo below) strips the :tag from the last path
+# component only, so registry hosts that carry a :port are preserved.
+set -eu
+
+STABLE="${1:?usage: promote-retag.sh <stable-version> [--dry-run]}"
+DRY_RUN=0
+[ "${2:-}" = "--dry-run" ] && DRY_RUN=1
+# :latest is repointed only when the caller asserts this is the newest stable.
+MOVE_LATEST="${MOVE_LATEST:-0}"
+
+# Only cozystack-owned images (those the build pushed to $REGISTRY) are
+# retagged. Everything else vendored by digest — third-party images and bare
+# upstream tags — lives in registries this job cannot push to. Override
+# REGISTRY to match a fork's build registry; the default mirrors
+# hack/common-envs.mk.
+REGISTRY="${REGISTRY:-ghcr.io/cozystack/cozystack}"
+
+command -v yq >/dev/null     || { echo "yq (mikefarah) is required" >&2; exit 1; }
+# The queries below use mikefarah syntax; reject python-yq and other variants
+# (mirrors the build-deps check in the Makefile).
+yq --version 2>&1 | grep -q mikefarah || { echo "yq (mikefarah) is required" >&2; exit 1; }
+# skopeo is only needed to actually copy; a --dry-run just prints the plan.
+[ "$DRY_RUN" -eq 1 ] || command -v skopeo >/dev/null || { echo "skopeo is required" >&2; exit 1; }
+[ "$DRY_RUN" -eq 1 ] || command -v sha256sum >/dev/null || { echo "sha256sum is required" >&2; exit 1; }
+
+# Ref collection (which files are scanned, and the YAML shapes within them) is
+# shared with hack/nightly-mirror.sh and hack/promote-rewrite-tags.sh — see
+# hack/lib/image-refs.sh. It was duplicated between the first two for as long
+# as both existed, and they drifted: this script and the mirror scanned only
+# the depth-2 values.yaml, so every ref stored in an images/*.tag file or
+# stamped into a template was silently skipped. That is the same failure mode
+# the shape-3 rule was added for — the promotion reports success while never
+# creating those images' :<version> tags. Because the retag happens within one
+# registry the digests still resolve and digest-pinned installs are unaffected,
+# but the release does not carry the tags it claims to. Keep the enumeration in
+# one place so a fix reaches every consumer at once.
+# shellcheck source=hack/lib/image-refs.sh
+. "$(dirname "$0")/lib/image-refs.sh"
+
+collect_refs() { collect_image_refs packages; }
+
+# Split a "<repo>[:<tag>]@sha256:<digest>" ref into repo and digest.
+# ref_repo strips the :tag from the LAST path component only, so a registry
+# host that carries a :port (e.g. localhost:5000/cozystack/operator, with no
+# tag) keeps its port instead of being truncated to the host.
+ref_repo() {
+  r="${1%@*}"            # strip @digest
+  img="${r##*/}"         # last path component (may carry :tag)
+  if [ "$r" = "$img" ]; then
+    printf '%s' "${img%:*}"
+  else
+    printf '%s/%s' "${r%/*}" "${img%:*}"
+  fi
+}
+ref_digest() { printf '%s' "${1##*@}"; }               # sha256:...
+
+# manifest_digest <ref> — the digest of <ref>'s raw manifest, or empty output if
+# the tag is PROVEN not to exist. Anything else is indeterminate and returns
+# non-zero, which under `set -e` aborts the promotion before it writes.
+#
+# The three states matter because the caller turns "empty" into "not published,
+# safe to copy over". Inferring that from a failure — or from a successful
+# response with no bytes — is how a rate-limit or a proxy hiccup gets read as
+# permission to overwrite released bytes. Absence has to be proven by the
+# registry saying so.
+manifest_digest() {
+  _ref="$1"
+  _manifest="$(mktemp)"
+  _mderr="$(mktemp)"
+  # Hash the raw bytes so this works for images and OCI artifacts alike. Files
+  # preserve inspect's status without relying on non-POSIX pipefail.
+  if skopeo inspect --raw "docker://$_ref" >"$_manifest" 2>"$_mderr"; then
+    if [ -s "$_manifest" ]; then
+      printf 'sha256:%s' "$(sha256sum "$_manifest" | cut -d' ' -f1)"
+      rm -f "$_manifest" "$_mderr"
+      return 0
+    fi
+    # Exit 0 with no bytes — a registry answering 200 with an empty body. Not a
+    # digest (hashing nothing yields sha256:e3b0c442…, which looks real and
+    # belongs to no manifest) and not proof of absence either, so refuse to
+    # decide rather than let the caller copy over whatever is really there.
+    echo "::error::skopeo inspect of ${_ref} succeeded but returned no manifest bytes; refusing to decide whether that tag exists" >&2
+    rm -f "$_manifest" "$_mderr"
+    return 1
+  fi
+  # Non-zero. Only a registry that says the manifest is unknown proves absence;
+  # 429/5xx/auth/network failures all also exit non-zero with no bytes, and
+  # reading those as "not published" is exactly the fail-open this guards.
+  if grep -qiE 'manifest unknown|manifest not known|manifest for [^ ]* not found|not found|404' "$_mderr"; then
+    rm -f "$_manifest" "$_mderr"
+    return 0
+  fi
+  echo "::error::skopeo inspect of ${_ref} failed and did not report the manifest as unknown, so it cannot be treated as unpublished: $(tr '\n' ' ' <"$_mderr")" >&2
+  rm -f "$_manifest" "$_mderr"
+  return 1
+}
+
+copy() {
+  _src="$1"; _dst="$2"
+  if [ "$DRY_RUN" -eq 1 ]; then
+    echo "DRY-RUN skopeo copy --multi-arch all docker://$_src docker://$_dst"
+    return 0
+  fi
+  # --multi-arch all copies the whole manifest list (every platform); it is
+  # mutually exclusive with the deprecated --all alias, do not combine them.
+  skopeo copy --multi-arch all "docker://$_src" "docker://$_dst"
+}
+
+# Normalize every collected ref to the canonical "<repo>@<digest>" form (drops
+# the cosmetic :tag from shape 1) so the dedup is on the real identity — the
+# same image vendored in two shapes is retagged once, not twice.
+refs=""
+for raw in $(collect_refs); do
+  [ -n "$raw" ] || continue
+  _repo="$(ref_repo "$raw")"
+  # Retag only cozystack-owned images: those the build pushes to $REGISTRY, so
+  # a skopeo copy can succeed. Everything else is vendored by digest from a
+  # registry this job cannot push to, and a copy there would fail and (under
+  # set -e) abort the whole promotion. What this drops today:
+  #   - third-party hosts: docker.io/clastix/kubectl,
+  #     ghcr.io/lexfrei/{kuberture,ouroboros} (deliberately not mirrored under
+  #     ghcr.io/cozystack — see those packages' values.yaml)
+  #   - ghcr.io/cozystack/ingress-nginx-with-protobuf-exporter/*, which is a
+  #     cozystack-org repo but sits outside $REGISTRY's path
+  #   - non-ref scalars, e.g. a "--migrate-image=..." arg string
+  # Note kilo, kube-ovn and keycloak-operator are NOT in that list: all three
+  # are built and pushed to $REGISTRY, and are selected by shapes 3 and 4. An
+  # earlier version of this comment named them as unpushed third parties, which
+  # is what let their missing release tags go unnoticed.
+  case "$_repo" in
+    "${REGISTRY}/"*) ;;
+    *) continue ;;
+  esac
+  refs="${refs}${_repo}@$(ref_digest "$raw")
+"
+done
+refs="$(printf '%s' "$refs" | sort -u)"
+[ -n "$refs" ] || { echo "No cozystack-owned digest-pinned image refs found under ${REGISTRY}/ — is this the rc's baked tree?" >&2; exit 1; }
+
+echo "$refs" | while IFS= read -r ref; do
+  [ -n "$ref" ] || continue
+  repo="${ref%@*}"
+  digest="${ref##*@}"
+  echo "▸ ${repo}  ${digest}"
+  # The stable tag is write-once at the image level: resolve the destination's
+  # raw manifest digest before copying. No-op if it already points at this rc
+  # digest (idempotent re-run), fail if it points elsewhere (a partial run or
+  # manual push already put different bytes there) rather than mutate released
+  # bytes. :latest is intentionally mutable and (re)pointed below only when
+  # MOVE_LATEST=1.
+  if [ "$DRY_RUN" -eq 0 ]; then
+    cur="$(manifest_digest "${repo}:${STABLE}")"
+    if [ -n "$cur" ] && [ "$cur" != "$digest" ]; then
+      echo "::error::${repo}:${STABLE} already exists at '${cur}'; refusing to move it to '${digest}' (stable image tags are write-once)" >&2
+      exit 1
+    fi
+    if [ "$cur" = "$digest" ]; then
+      echo "  = ${repo}:${STABLE} already at ${digest}; skipping stable copy"
+    else
+      copy "$ref" "${repo}:${STABLE}"
+    fi
+  else
+    copy "$ref" "${repo}:${STABLE}"
+  fi
+  [ "$MOVE_LATEST" = "1" ] && copy "$ref" "${repo}:latest"
+  # Verify the stable tag now resolves to the exact rc digest (skip in dry-run).
+  if [ "$DRY_RUN" -eq 0 ]; then
+    got="$(manifest_digest "${repo}:${STABLE}")"
+    if [ "$got" != "$digest" ]; then
+      echo "::error::${repo}:${STABLE} resolved to '${got}', expected '${digest}'" >&2
+      exit 1
+    fi
+  fi
+done
+
+if [ "$MOVE_LATEST" = "1" ]; then
+  echo "Retagged image refs to ${STABLE} (+latest)."
+else
+  echo "Retagged image refs to ${STABLE} (:latest left unmoved; MOVE_LATEST=0)."
+fi
diff --git a/hack/promote-retag_test.bats b/hack/promote-retag_test.bats
new file mode 100644
index 0000000000..61d8587775
--- /dev/null
+++ b/hack/promote-retag_test.bats
@@ -0,0 +1,386 @@
+#!/usr/bin/env bats
+# Tests for hack/promote-retag.sh — the rc->stable retag selector.
+#
+# Guards the regression where collect_refs scraped *every* @sha256 ref from the
+# package values.yaml — including third-party images (docker.io/clastix/kubectl,
+# ghcr.io/kvaps/...), bare upstream tags (kube-ovn/keycloak/kilo) and a
+# "--migrate-image=..." arg string — so the first skopeo copy to a registry CI
+# cannot push to aborted the whole promotion. The selector must emit only
+# cozystack-owned ($REGISTRY/...) refs.
+#
+# Harness compatibility note: CI runs this file under Bats through
+# `make bats-unit-tests`. It also remains compatible with the narrower legacy
+# `hack/cozytest.sh` translator, whose awk parser recognizes only @test blocks
+# and a bare `}` on its own line. The tests therefore avoid `run`, `$status`,
+# `$output`, `skip`, and setup()/teardown(), and capture expected non-zero exits
+# with `|| rc=$?`. mikefarah yq is assumed present (provided by the test
+# toolchain, like the other yq-using Bats files here).
+#
+# Run with: bats hack/promote-retag_test.bats
+
+load test_helper
+
+_make_registry_mocks() {
+  t="$1"
+  mkdir -p "$t/bin"
+  cat >"$t/bin/yq" <<'EOF'
+#!/bin/sh
+set -eu
+if [ "${1:-}" = "--version" ]; then
+  echo 'yq (https://github.com/mikefarah/yq/) version v4.45.1'
+else
+  printf '%s\n' "$MOCK_REF"
+fi
+EOF
+  cat >"$t/bin/skopeo" <<'EOF'
+#!/bin/sh
+set -eu
+printf '%s\n' "$*" >>"$MOCK_SKOPEO_LOG"
+case "$1" in
+  inspect)
+    [ "$2" = "--raw" ]
+    # An indeterminate failure: non-zero, no bytes, and the registry never says
+    # the manifest is unknown. Must NOT read as "tag absent".
+    if [ "${MOCK_TRANSIENT_ERROR:-0}" = "1" ]; then
+      echo "Error: reading manifest from docker://${3:-?}: received unexpected HTTP status: 429 Too Many Requests" >&2
+      exit 1
+    fi
+    if [ "$MOCK_MISSING_ONCE" = "1" ] && [ ! -f "$MOCK_STATE" ]; then
+      # Absence as a registry actually reports it — the script requires proof,
+      # not merely a non-zero exit.
+      echo "Error: reading manifest from docker://${3:-?}: manifest unknown" >&2
+      exit 1
+    fi
+    # A registry answering 200 with an empty body: exit 0, no bytes.
+    if [ "${MOCK_EMPTY_MANIFEST:-0}" = "1" ]; then
+      exit 0
+    fi
+    printf '%s' "$MOCK_MANIFEST"
+    ;;
+  copy)
+    : >"$MOCK_STATE"
+    ;;
+  *)
+    exit 2
+    ;;
+esac
+EOF
+  # sha256sum belongs in the stub for the same reason yq and skopeo do: the tests
+  # below pin PATH to "$tmp/bin:/usr/bin:/bin", and where the hashing utility
+  # lives is a property of the host, not of the thing under test. GNU coreutils
+  # puts sha256sum in /usr/bin, which is inside that PATH; macOS ships shasum
+  # there and sha256sum elsewhere, which is not -- so promote-retag.sh took its
+  # "sha256sum is required" exit and six of the eleven tests failed on the
+  # platform rather than on the code. They failed silently, too: each test
+  # cleaned up from an EXIT trap, which replaces the one the bats binary installs
+  # for its bookkeeping, so a failing test printed no TAP line at all and the run
+  # showed five passes and no failures.
+  #
+  # Resolved from absolute candidates rather than through `command -v`: this stub
+  # is first on PATH, so asking PATH for sha256sum finds this file and recurses.
+  cat >"$t/bin/sha256sum" <<'EOF'
+#!/bin/sh
+set -eu
+for _c in /usr/bin/sha256sum /bin/sha256sum /sbin/sha256sum /usr/local/bin/sha256sum; do
+  [ -x "$_c" ] && exec "$_c" "$@"
+done
+for _c in /usr/bin/shasum /bin/shasum; do
+  [ -x "$_c" ] && exec "$_c" -a 256 "$@"
+done
+echo "no sha256 implementation found outside the stub dir" >&2
+exit 127
+EOF
+  chmod +x "$t/bin/yq" "$t/bin/skopeo" "$t/bin/sha256sum"
+}
+
+@test "dry-run over the real tree retags only cozystack-owned refs" {
+  tmp=$(mktemp -d)
+
+  # `env -u REGISTRY`: the CI workflow exports REGISTRY=<OCIR build registry>
+  # for every job (.github/workflows/pull-requests.yaml), but the committed
+  # tree vendors its digests under the script's default ghcr.io/cozystack/
+  # cozystack. Inheriting the ambient REGISTRY makes the selector filter for the
+  # wrong registry, match nothing, and abort — so strip it and exercise the
+  # default, the registry the refs below actually live under.
+  #
+  # An exit-0 is the assertion; on any non-zero, surface the script's own
+  # stdout/stderr (collect_refs swallows yq errors, so its stderr is the only
+  # breadcrumb) and the yq build, so a CI failure is self-diagnosing.
+  rc=0
+  env -u REGISTRY hack/promote-retag.sh v9.9.9 --dry-run \
+    >"$tmp/out" 2>"$tmp/err" || rc=$?
+  if [ "$rc" -ne 0 ]; then
+    echo "promote-retag.sh exited $rc; yq: $(yq --version 2>&1)" >&2
+    echo "--- script stderr ---" >&2; cat "$tmp/err" >&2
+    echo "--- script stdout ---" >&2; cat "$tmp/out" >&2
+    return "$rc"
+  fi
+
+  # At least one cozystack-owned image is selected.
+  grep -q 'docker://ghcr.io/cozystack/cozystack/' "$tmp/out"
+
+  # Images whose digest is embedded in `tag` ({repository, tag: <t>@sha256:<d>})
+  # must be selected too. The "at least one owned ref" check above cannot catch
+  # their absence — it is satisfied by the shapes that already worked, which is
+  # why eight images across six packages were silently skipped while this suite
+  # stayed green. Naming concrete packages is deliberate: a count or a generic
+  # pattern would drift back to proving nothing. linstor-csi and piraeus-server
+  # are the two whose absence from GHCR broke the nightly e2e at image pre-pull.
+  for owned in linstor-csi piraeus-server kamaji redis-operator; do
+    grep -q "docker://ghcr.io/cozystack/cozystack/${owned}@sha256:" "$tmp/out"
+  done
+
+  # Both images are built and pushed to $REGISTRY by cozystack and carry the
+  # digest in `tag`, and neither has ever received a 1.x release tag (on GHCR
+  # keycloak-operator has only `latest`, and kubeovn's newest cozystack-versioned
+  # tag predates 1.0), so they get one only if the ownership filter counts them
+  # as ours. kubeovn keeps its host in global.registry.address, apart from
+  # `repository`.
+  for owned in keycloak-operator kubeovn; do
+    grep -q "docker://ghcr.io/cozystack/cozystack/${owned}@sha256:" "$tmp/out"
+  done
+
+  # Every docker:// ref in the copy plan is under the cozystack registry — no
+  # third-party repos and no malformed arg-string refs leak through.
+  bad=$(grep -oE 'docker://[^ ]+' "$tmp/out" | sed 's|docker://||' \
+        | grep -vE '^ghcr\.io/cozystack/cozystack/' || true)
+  [ -z "$bad" ]
+  rm -rf "$tmp"
+}
+
+@test "default leaves :latest unmoved" {
+  tmp=$(mktemp -d)
+
+  # :latest belongs to promotion, and only when the promoted version is the
+  # newest published stable. Without MOVE_LATEST the plan retags the stable tag
+  # but must NOT repoint :latest — otherwise a patch on an older line would drag
+  # :latest backwards.
+  rc=0
+  env -u REGISTRY hack/promote-retag.sh v9.9.9 --dry-run \
+    >"$tmp/out" 2>"$tmp/err" || rc=$?
+  if [ "$rc" -ne 0 ]; then
+    echo "promote-retag.sh exited $rc" >&2
+    echo "--- script stderr ---" >&2; cat "$tmp/err" >&2
+    return "$rc"
+  fi
+
+  # The stable tag is in the copy plan...
+  grep -qE 'docker://ghcr\.io/cozystack/cozystack/[^ ]*:v9\.9\.9' "$tmp/out"
+  # ...but nothing moves :latest.
+  if grep -qE 'docker://[^ ]+:latest' "$tmp/out"; then echo "FAIL: no :latest tag must have been planned"; false; fi
+  rm -rf "$tmp"
+}
+
+@test "MOVE_LATEST=1 also repoints :latest" {
+  tmp=$(mktemp -d)
+
+  rc=0
+  env -u REGISTRY MOVE_LATEST=1 hack/promote-retag.sh v9.9.9 --dry-run \
+    >"$tmp/out" 2>"$tmp/err" || rc=$?
+  if [ "$rc" -ne 0 ]; then
+    echo "promote-retag.sh exited $rc" >&2
+    echo "--- script stderr ---" >&2; cat "$tmp/err" >&2
+    return "$rc"
+  fi
+
+  # Every promoted repo also gets a :latest copy in the plan.
+  grep -qE 'docker://ghcr\.io/cozystack/cozystack/[^ ]*:latest' "$tmp/out"
+  rm -rf "$tmp"
+}
+
+@test "REGISTRY override scopes the selection" {
+  tmp=$(mktemp -d)
+
+  # No cozystack images live under example.com/nope, so the selector finds
+  # nothing and exits non-zero rather than silently promoting the wrong set.
+  # Capture the exit status without tripping the harness's `set -e`.
+  rc=0
+  REGISTRY="example.com/nope" hack/promote-retag.sh v9.9.9 --dry-run \
+    >"$tmp/out" 2>"$tmp/err" || rc=$?
+
+  [ "$rc" -ne 0 ]
+  # The diagnostic is written to stderr.
+  grep -q 'No cozystack-owned digest-pinned image refs found' "$tmp/err"
+  rm -rf "$tmp"
+}
+
+@test "retags images whose ref lives outside a values.yaml" {
+  # Until the file enumeration moved to hack/lib/image-refs.sh this scanned the
+  # depth-2 values.yaml alone, so every ref held in an images/*.tag file or
+  # stamped into a template was skipped — the promotion reported success while
+  # never creating those images' :<version> tags. Twelve images were affected
+  # (30 refs selected before, 42 after). Because the retag stays inside one
+  # registry the digests still resolved, so nothing failed at pull time and the
+  # gap went unnoticed until a release shipped reading as a release candidate.
+  tmp=$(mktemp -d)
+
+  rc=0
+  env -u REGISTRY hack/promote-retag.sh v9.9.9 --dry-run \
+    >"$tmp/out" 2>"$tmp/err" || rc=$?
+  if [ "$rc" -ne 0 ]; then
+    echo "promote-retag.sh exited $rc" >&2
+    echo "--- script stderr ---" >&2; cat "$tmp/err" >&2
+    return "$rc"
+  fi
+
+  # grafana-dashboards lives in
+  # packages/system/grafana-operator/images/grafana-dashboards.tag, and
+  # multus-cni is sed'd into packages/system/multus/templates/*.yml. Neither is
+  # reachable from any values.yaml.
+  grep -q 'cozystack/grafana-dashboards:v9.9.9' "$tmp/out"
+  grep -q 'cozystack/multus-cni:v9.9.9' "$tmp/out"
+  rm -rf "$tmp"
+}
+
+@test "raw manifest digest resolves for an OCI artifact" {
+  tmp=$(mktemp -d)
+  _make_registry_mocks "$tmp"
+
+  manifest='{"schemaVersion":2,"config":{"mediaType":"application/vnd.cncf.flux.config.v1+json","digest":"sha256:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"},"layers":[]}'
+  digest="sha256:$(printf '%s' "$manifest" | sha256sum | cut -d' ' -f1)"
+  ref="example.com/cozystack/cozystack-packages:v1.6.0-rc.1@${digest}"
+
+  rc=0
+  REGISTRY="example.com/cozystack" MOCK_REF="$ref" MOCK_MANIFEST="$manifest" \
+    MOCK_MISSING_ONCE=0 MOCK_STATE="$tmp/state" MOCK_SKOPEO_LOG="$tmp/skopeo.log" \
+    PATH="$tmp/bin:/usr/bin:/bin" hack/promote-retag.sh v1.6.0 \
+    >"$tmp/out" 2>"$tmp/err" || rc=$?
+  if [ "$rc" -ne 0 ]; then
+    echo "promote-retag.sh exited $rc" >&2
+    echo "--- stderr ---" >&2; cat "$tmp/err" >&2
+    return "$rc"
+  fi
+
+  grep -q "already at ${digest}; skipping stable copy" "$tmp/out"
+  [ "$(grep -c '^inspect --raw ' "$tmp/skopeo.log")" -eq 2 ]
+  if grep -q '^copy ' "$tmp/skopeo.log"; then echo "FAIL: no image must have been copied"; false; fi
+  rm -rf "$tmp"
+}
+
+@test "post-copy raw manifest digest mismatch fails verification" {
+  tmp=$(mktemp -d)
+  _make_registry_mocks "$tmp"
+
+  manifest='{"schemaVersion":2,"config":{"mediaType":"application/vnd.cncf.flux.config.v1+json","digest":"sha256:bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"},"layers":[]}'
+  expected_manifest='{"schemaVersion":2,"config":{"mediaType":"application/vnd.cncf.flux.config.v1+json","digest":"sha256:cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"},"layers":[]}'
+  actual="sha256:$(printf '%s' "$manifest" | sha256sum | cut -d' ' -f1)"
+  expected="sha256:$(printf '%s' "$expected_manifest" | sha256sum | cut -d' ' -f1)"
+  ref="example.com/cozystack/cozystack-packages:v1.6.0-rc.1@${expected}"
+
+  rc=0
+  REGISTRY="example.com/cozystack" MOCK_REF="$ref" MOCK_MANIFEST="$manifest" \
+    MOCK_MISSING_ONCE=1 MOCK_STATE="$tmp/state" MOCK_SKOPEO_LOG="$tmp/skopeo.log" \
+    PATH="$tmp/bin:/usr/bin:/bin" hack/promote-retag.sh v1.6.0 \
+    >"$tmp/out" 2>"$tmp/err" || rc=$?
+
+  [ "$rc" -ne 0 ]
+  grep -q "resolved to '${actual}', expected '${expected}'" "$tmp/err"
+  grep -q '^copy --multi-arch all ' "$tmp/skopeo.log"
+  [ "$(grep -c '^inspect --raw ' "$tmp/skopeo.log")" -eq 2 ]
+  rm -rf "$tmp"
+}
+
+@test "missing stable tag remains an empty digest and proceeds to copy" {
+  tmp=$(mktemp -d)
+  _make_registry_mocks "$tmp"
+
+  manifest='{"schemaVersion":2,"config":{"mediaType":"application/vnd.cncf.flux.config.v1+json","digest":"sha256:dddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd"},"layers":[]}'
+  digest="sha256:$(printf '%s' "$manifest" | sha256sum | cut -d' ' -f1)"
+  ref="example.com/cozystack/cozystack-packages:v1.6.0-rc.1@${digest}"
+
+  rc=0
+  REGISTRY="example.com/cozystack" MOCK_REF="$ref" MOCK_MANIFEST="$manifest" \
+    MOCK_MISSING_ONCE=1 MOCK_STATE="$tmp/state" MOCK_SKOPEO_LOG="$tmp/skopeo.log" \
+    PATH="$tmp/bin:/usr/bin:/bin" hack/promote-retag.sh v1.6.0 \
+    >"$tmp/out" 2>"$tmp/err" || rc=$?
+  if [ "$rc" -ne 0 ]; then
+    echo "promote-retag.sh exited $rc" >&2
+    echo "--- stderr ---" >&2; cat "$tmp/err" >&2
+    return "$rc"
+  fi
+
+  grep -q '^copy --multi-arch all ' "$tmp/skopeo.log"
+  [ "$(grep -c '^inspect --raw ' "$tmp/skopeo.log")" -eq 2 ]
+  grep -q 'Retagged image refs to v1.6.0' "$tmp/out"
+  rm -rf "$tmp"
+}
+
+@test "existing stable tag at a different digest is refused, not moved" {
+  tmp=$(mktemp -d)
+  _make_registry_mocks "$tmp"
+
+  # The stable tag already exists (MOCK_MISSING_ONCE=0) but resolves to a
+  # manifest other than the rc's: released bytes must never be overwritten.
+  published='{"schemaVersion":2,"config":{"mediaType":"application/vnd.oci.image.config.v1+json","digest":"sha256:1111111111111111111111111111111111111111111111111111111111111111"},"layers":[]}'
+  rc_manifest='{"schemaVersion":2,"config":{"mediaType":"application/vnd.oci.image.config.v1+json","digest":"sha256:2222222222222222222222222222222222222222222222222222222222222222"},"layers":[]}'
+  published_digest="sha256:$(printf '%s' "$published" | sha256sum | cut -d' ' -f1)"
+  rc_digest="sha256:$(printf '%s' "$rc_manifest" | sha256sum | cut -d' ' -f1)"
+  ref="example.com/cozystack/cozystack-packages:v1.6.0-rc.1@${rc_digest}"
+
+  rc=0
+  REGISTRY="example.com/cozystack" MOCK_REF="$ref" MOCK_MANIFEST="$published" \
+    MOCK_MISSING_ONCE=0 MOCK_STATE="$tmp/state" MOCK_SKOPEO_LOG="$tmp/skopeo.log" \
+    PATH="$tmp/bin:/usr/bin:/bin" hack/promote-retag.sh v1.6.0 \
+    >"$tmp/out" 2>"$tmp/err" || rc=$?
+
+  [ "$rc" -ne 0 ]
+  grep -q "already exists at '${published_digest}'; refusing to move it to '${rc_digest}'" "$tmp/err"
+  # The refusal must happen BEFORE any write.
+  if grep -q '^copy ' "$tmp/skopeo.log"; then echo "FAIL: no image must have been copied"; false; fi
+  [ "$(grep -c '^inspect --raw ' "$tmp/skopeo.log")" -eq 1 ]
+  rm -rf "$tmp"
+}
+
+@test "a zero-exit empty manifest refuses to decide and never writes" {
+  tmp=$(mktemp -d)
+  _make_registry_mocks "$tmp"
+
+  manifest='{"schemaVersion":2,"config":{"mediaType":"application/vnd.oci.image.config.v1+json","digest":"sha256:3333333333333333333333333333333333333333333333333333333333333333"},"layers":[]}'
+  digest="sha256:$(printf '%s' "$manifest" | sha256sum | cut -d' ' -f1)"
+  ref="example.com/cozystack/cozystack-packages:v1.6.0-rc.1@${digest}"
+
+  rc=0
+  REGISTRY="example.com/cozystack" MOCK_REF="$ref" MOCK_MANIFEST="$manifest" \
+    MOCK_EMPTY_MANIFEST=1 MOCK_MISSING_ONCE=0 MOCK_STATE="$tmp/state" \
+    MOCK_SKOPEO_LOG="$tmp/skopeo.log" \
+    PATH="$tmp/bin:/usr/bin:/bin" hack/promote-retag.sh v1.6.0 \
+    >"$tmp/out" 2>"$tmp/err" || rc=$?
+
+  # A 200 with an empty body proves nothing: the tag may hold released bytes this
+  # promotion must not overwrite. So the script must abort BEFORE any copy —
+  # reading "no bytes" as "not published" is what would turn a proxy hiccup into
+  # an overwrite of a published stable tag.
+  [ "$rc" -ne 0 ]
+  grep -q 'returned no manifest bytes' "$tmp/err"
+  if grep -q '^copy ' "$tmp/skopeo.log"; then echo "FAIL: no image must have been copied"; false; fi
+  [ "$(grep -c '^inspect --raw ' "$tmp/skopeo.log")" -eq 1 ]
+  # The empty-input hash must never appear: that is the guard being absent.
+  if grep -q 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855' "$tmp/err"; then echo "FAIL: the empty-manifest digest must not reach the diagnostic"; false; fi
+  rm -rf "$tmp"
+}
+
+@test "a transient registry failure is not read as an unpublished tag" {
+  tmp=$(mktemp -d)
+  _make_registry_mocks "$tmp"
+
+  manifest='{"schemaVersion":2,"config":{"mediaType":"application/vnd.oci.image.config.v1+json","digest":"sha256:4444444444444444444444444444444444444444444444444444444444444444"},"layers":[]}'
+  digest="sha256:$(printf '%s' "$manifest" | sha256sum | cut -d' ' -f1)"
+  ref="example.com/cozystack/cozystack-packages:v1.6.0-rc.1@${digest}"
+
+  # 429 during finalize: non-zero exit, no bytes, no "manifest unknown". The old
+  # shape of this helper made that indistinguishable from an absent tag and
+  # proceeded to copy over it; finalize retags ~42 refs with no retry wrapper, so
+  # a single rate-limit was enough to reach that path.
+  rc=0
+  REGISTRY="example.com/cozystack" MOCK_REF="$ref" MOCK_MANIFEST="$manifest" \
+    MOCK_TRANSIENT_ERROR=1 MOCK_MISSING_ONCE=0 MOCK_STATE="$tmp/state" \
+    MOCK_SKOPEO_LOG="$tmp/skopeo.log" \
+    PATH="$tmp/bin:/usr/bin:/bin" hack/promote-retag.sh v1.6.0 \
+    >"$tmp/out" 2>"$tmp/err" || rc=$?
+
+  [ "$rc" -ne 0 ]
+  grep -q 'cannot be treated as unpublished' "$tmp/err"
+  grep -q '429' "$tmp/err"
+  if grep -q '^copy ' "$tmp/skopeo.log"; then echo "FAIL: no image must have been copied"; false; fi
+  rm -rf "$tmp"
+}
diff --git a/hack/promote-rewrite-tags.sh b/hack/promote-rewrite-tags.sh
new file mode 100755
index 0000000000..786b63e370
--- /dev/null
+++ b/hack/promote-rewrite-tags.sh
@@ -0,0 +1,152 @@
+#!/bin/sh
+# Rewrite the rc version substring to the stable version in every vendored
+# first-party image reference. Promotion does not rebuild: the digests stay
+# exactly as the rc built them, and only the cosmetic tag string moves from
+# "1.6.0-rc.4" to "1.6.0" so the shipped tree reads as the release it is.
+#
+# Usage: hack/promote-rewrite-tags.sh <rc-version> <stable-version> [root]
+#   <rc-version>      e.g. 1.6.0-rc.4   (no leading v — the substring as it
+#                     appears inside an image tag)
+#   <stable-version>  e.g. 1.6.0
+#   [root]            tree to rewrite; defaults to "packages"
+#
+# This lived inline in .github/workflows/promote-rc.yaml until it shipped a
+# release whose tags were half-rewritten. Its glob covered the depth-2
+# values.yaml plus packages/apps/kubernetes/images/*.tag alone, on the premise
+# that the kubernetes app was the only one whose .tag files carry the cozystack
+# version — nine other .tag files and one stamped template do. Because the step
+# was workflow-inline there was nothing to unit test, so the miss was only
+# observable by cutting a release. It is a script so that
+# hack/promote-rewrite-tags_test.bats can round-trip it against the real tree.
+#
+# grep's -r/-I/--exclude/--exclude-dir are non-POSIX, but both GNU and BSD grep
+# implement them, so this runs unchanged on the CI runners, in the build image,
+# and on a macOS developer box. The edit is written through a temp file rather
+# than `sed -i`, whose argument handling differs between the two seds.
+set -eu
+
+RC_VERSION="${1:?usage: promote-rewrite-tags.sh <rc-version> <stable-version> [root]}"
+STABLE_VERSION="${2:?usage: promote-rewrite-tags.sh <rc-version> <stable-version> [root]}"
+ROOT="${3:-packages}"
+
+# Validate both versions before touching a file. RC_VERSION becomes a sed
+# pattern and STABLE_VERSION its replacement, so an unvalidated argument is
+# both a correctness and an injection concern: a stray "/" or "&" in the
+# replacement would corrupt every file this walks.
+echo "$RC_VERSION" | grep -Eq '^[0-9]+\.[0-9]+\.[0-9]+-rc\.[0-9]+$' \
+  || { echo "rc-version '$RC_VERSION' must match X.Y.Z-rc.N" >&2; exit 1; }
+echo "$STABLE_VERSION" | grep -Eq '^[0-9]+\.[0-9]+\.[0-9]+$' \
+  || { echo "stable-version '$STABLE_VERSION' must match X.Y.Z" >&2; exit 1; }
+[ -d "$ROOT" ] || { echo "root '$ROOT' is not a directory" >&2; exit 1; }
+
+# shellcheck source=hack/lib/image-refs.sh
+. "$(dirname "$0")/lib/image-refs.sh"
+
+# The dots are the only regex metacharacter a validated version can contain;
+# escaping them keeps sed matching the literal string rather than any char.
+RC_ESC=$(printf '%s' "$RC_VERSION" | sed -e 's/\./\\./g')
+
+# Materialize the file list rather than piping into the loop: a `while` on the
+# right of a pipe runs in a subshell, so it cannot carry a count out and cannot
+# abort the script from inside. Both matter here — the count is the operator's
+# only signal that the rewrite did anything, and an unreadable file must stop
+# the promotion rather than be skipped.
+files_list=$(mktemp)
+image_ref_files "$ROOT" > "$files_list"
+
+# Failures are recorded and acted on after the loop rather than exiting inside
+# it: the loop reads from $files_list, so removing that file in the same
+# construct is both a shellcheck SC2094 hit and needless subtlety (the open
+# descriptor would survive the unlink, but nobody should have to know that).
+rewritten=0
+failed_file=""
+failed_why=""
+while IFS= read -r f; do
+  # An unreadable file is NOT "a file with no match". Treating the two alike is
+  # how a ref goes unrewritten while the run still reports success — the same
+  # silent-skip shape as the enumeration bug this script exists to fix. Fail.
+  if [ ! -r "$f" ]; then
+    failed_file="$f"
+    failed_why="is not readable; refusing to promote a tree that cannot be fully scanned"
+    break
+  fi
+  if grep -q "$RC_ESC" "$f"; then
+    # Written through a temp file rather than `sed -i`: the in-place flag takes
+    # the substitution as its backup suffix on BSD and edits nothing, so the
+    # rewrite would silently no-op on a macOS `make unit-tests`. cat back over the
+    # original to keep its inode and permissions. `cat` truncates before it
+    # writes, so an interrupt can leave a half-written file where `mv` would not;
+    # that is the lesser evil against `mv` stamping mktemp's 0600 onto a file in
+    # the release tree.
+    tmp_f=$(mktemp)
+    sed "s/${RC_ESC}/${STABLE_VERSION}/g" "$f" > "$tmp_f"
+    cat "$tmp_f" > "$f"
+    rm -f "$tmp_f"
+    echo "  ~ $f"
+    rewritten=$((rewritten + 1))
+  else
+    # grep exits 1 for "no match" and >1 for a real error; only the former is
+    # an ordinary outcome.
+    grep_rc=$?
+    if [ "$grep_rc" -gt 1 ]; then
+      failed_file="$f"
+      failed_why="could not be scanned (grep exit ${grep_rc})"
+      break
+    fi
+  fi
+done < "$files_list"
+rm -f "$files_list"
+
+if [ -n "$failed_file" ]; then
+  echo "::error::${failed_file} ${failed_why}" >&2
+  exit 1
+fi
+
+# Postcondition: scan WIDER than the rewrite. The rewrite is deliberately
+# narrow — a blind walk of every file under $ROOT would rewrite vendored chart
+# defaults that `make update` regenerates — but a narrow rewrite is exactly
+# what shipped a half-promoted release, so the check that follows it must not
+# share its blind spot. Anything still carrying the rc string here is a ref in
+# a storage location the enumeration does not know about: fail the promotion
+# loudly rather than publish a release whose images claim to be a release
+# candidate.
+#
+# It must, however, only flag strings that could actually BE an image ref.
+# "X.Y.Z-rc.N" is an ordinary version string that other things legitimately
+# contain, and a false positive here fails a workflow that runs once per
+# release, on release day. Three live examples, each of which aborted the
+# promotion before this was shape-filtered:
+#   - packages/apps/kubernetes/images/kubevirt-csi-driver/go.sum pins
+#     github.com/golang/protobuf v1.4.0-rc.2 — and v1.4.0-rc.2 is a cozystack
+#     rc that was actually cut, so this was not hypothetical
+#   - packages/system/metallb/tests/metallb_test.yaml has a comment naming
+#     v1.5.0-rc.2 as an example of what release-prep stamps
+#   - the console's pnpm-lock.yaml carries rolldown@1.0.0-rc.15 and friends
+#
+# So match the version only where it appears in ref position: after an
+# image/repository/tag key (with no `#` in between, which excludes prose in a
+# trailing comment), or immediately before an @sha256 digest. The second branch
+# is what catches a bare .tag file, whose content has no YAML key at all. The
+# first is required for the split shape where the version and the digest live
+# under separate keys — packages/system/cilium/values.yaml has `tag: v1.5.0`
+# and `digest:` on the next line — so narrowing this to "${RC}@sha256:" alone
+# would silently stop covering it.
+#
+# charts/ is excluded because a vendored upstream chart may legitimately pin an
+# unrelated component whose own version happens to contain the substring, and
+# the build never stamps into one. Markdown is excluded because documentation
+# legitimately names release candidates — an upgrade note or a README example
+# citing the rc being promoted is correct prose, not an unrewritten ref.
+leftovers=$(grep -rIlE --exclude-dir=charts --exclude='*.md' \
+  -- "(image|repository|tag)[\"']?:[^#]*${RC_ESC}|${RC_ESC}@sha256:" "$ROOT" 2>/dev/null || true)
+if [ -n "$leftovers" ]; then
+  echo "::error::the following files still carry the rc version '${RC_VERSION}' in image-reference position after the rewrite:" >&2
+  printf '%s\n' "$leftovers" >&2
+  echo "Most likely each is a first-party image ref in a storage location hack/lib/image-refs.sh does not enumerate;" >&2
+  echo "if so, declare it in IMAGE_REF_EXTRA_FILES there — see docs/agents/image-refs.md." >&2
+  echo "If instead the match is an unrelated version string that merely looks like a ref, narrow the pattern above" >&2
+  echo "or add an --exclude for that file; do NOT declare a non-image file as a ref source." >&2
+  exit 1
+fi
+
+echo "Rewrote ${RC_VERSION} -> ${STABLE_VERSION} in ${rewritten} file(s) under ${ROOT}; no rc references remain in image-reference position."
diff --git a/hack/promote-rewrite-tags_test.bats b/hack/promote-rewrite-tags_test.bats
new file mode 100644
index 0000000000..7a1be6c749
--- /dev/null
+++ b/hack/promote-rewrite-tags_test.bats
@@ -0,0 +1,622 @@
+#!/usr/bin/env bats
+# Tests for hack/promote-rewrite-tags.sh — the rc->stable tag string rewrite.
+#
+# Guards the regression that shipped a half-promoted release: the rewrite lived
+# inline in .github/workflows/promote-rc.yaml and globbed the depth-2
+# values.yaml plus packages/apps/kubernetes/images/*.tag alone, on the premise
+# that the kubernetes app was the only one whose .tag files carry the cozystack
+# version. Nine other .tag files and one stamped template do, so v1.6.0 was
+# staged with 33 refs still reading v1.6.0-rc.4. Being workflow-inline, there
+# was nothing to unit test and the miss was only observable by cutting a
+# release.
+#
+# The central test therefore round-trips against the REAL tree and — crucially —
+# discovers ref-bearing files BY CONTENT rather than by asking the enumeration
+# under test where to look. A fixture built from image_ref_files() could only
+# ever confirm that the enumeration agrees with itself; grepping for the
+# registry prefix finds files it has never heard of, which is the whole failure
+# mode. Stamp wider than the rewrite, then assert the rewrite cleaned all of it.
+#
+# Harness compatibility note: CI runs this file under Bats through
+# `make bats-unit-tests`. It also remains compatible with the narrower legacy
+# `hack/cozytest.sh` translator, whose awk parser recognizes only @test blocks
+# and a bare `}` on its own line. The tests therefore avoid `run`, `$status`,
+# `$output`, `skip`, and setup()/teardown(), and capture expected non-zero exits
+# with `|| rc=$?`. Paths stay repo-root-relative for both runners.
+#
+# Run with: bats hack/promote-rewrite-tags_test.bats
+
+load test_helper
+
+@test "rewrite leaves no rc reference anywhere in the tree" {
+  tmp=$(mktemp -d)
+  RC=9.9.9-rc.9
+
+  # Build the fixture from files discovered by CONTENT, independent of
+  # hack/lib/image-refs.sh. Excluding charts/ mirrors the script's own scope:
+  # vendored upstream chart values are not stamped by the build.
+  # --exclude='*.md' keeps documentation examples (which carry placeholder or
+  # historical versions) out of the fixture, matching the postcondition.
+  # Match 'cozystack/cozystack' WITHOUT a host prefix or trailing slash. The
+  # host is not always contiguous with the repository: kubeovn puts it in
+  # `global.registry.address: ghcr.io/cozystack/cozystack` with `repository:
+  # kubeovn`. A 'ghcr\.io/cozystack/cozystack/' pattern silently skips such
+  # files, shrinking the fixture and under-testing the split shapes.
+  for f in $(grep -rIl --exclude-dir=charts --exclude='*.md' 'cozystack/cozystack' packages/); do
+    mkdir -p "$tmp/$(dirname "$f")"
+    cp "$f" "$tmp/$f"
+  done
+
+  # Stamp a synthetic rc version onto every VERSION-LINE ref, modelling what an
+  # rc build actually produces. The tag must be exactly vX.Y.Z immediately
+  # followed by @, which is the shape the build stamps; that anchor is what
+  # keeps the fixture faithful rather than merely aggressive:
+  #   - kamaji's v0.19.0-cozystack.0@ does not match (a '-' follows the patch),
+  #     and must not — it is component-versioned and no promotion rewrites it
+  #   - a ':<chart-version>' placeholder in a Dockerfile comment does not match
+  #     (no digest follows), and must not — nothing ever stamps a version there
+  # Stamping either would make the test demand a rewrite that would itself be a
+  # bug, and both were flagged by the postcondition when this sed was looser.
+  # Stamp both the combined form and the split form (a bare `tag:` key whose
+  # value is a version, as cilium and kubeovn write it), so the fixture
+  # exercises every shape the enumeration claims to cover rather than only the
+  # single-string one.
+  # `sed -i -E`: on BSD `-i` consumes the next argument as the backup suffix, so
+  # `-E` is eaten and never enables extended syntax — the `\1` backreferences
+  # then refer to groups plain BRE never captured. Route each edit through a temp
+  # file instead; `sed -E` (extended regex) is understood by both GNU and BSD.
+  for f in $(grep -rIl 'cozystack/cozystack' "$tmp/packages"); do
+    sed -E "s|(cozystack/cozystack/[A-Za-z0-9._-]+):v[0-9]+\.[0-9]+\.[0-9]+@|\1:v${RC}@|g" "$f" > "$f.tmp" && mv "$f.tmp" "$f"
+    sed -E "s|^([[:space:]]*tag:[[:space:]]*)v[0-9]+\.[0-9]+\.[0-9]+([[:space:]]*)$|\1v${RC}\2|" "$f" > "$f.tmp" && mv "$f.tmp" "$f"
+  done
+
+  # Sanity: the fixture must actually contain the rc string, otherwise the
+  # assertion below passes vacuously and the test guards nothing.
+  before=$(grep -rIl -- "$RC" "$tmp/packages" | wc -l | tr -d ' ')
+  [ "$before" -gt 0 ]
+
+  hack/promote-rewrite-tags.sh "$RC" 9.9.9 "$tmp/packages" >"$tmp/log" 2>&1 || {
+    echo "--- promote-rewrite-tags.sh output ---" >&2; cat "$tmp/log" >&2; rm -rf "$tmp"; return 1
+  }
+
+  after=$(grep -rIl -- "$RC" "$tmp/packages" | wc -l | tr -d ' ')
+  if [ "$after" -ne 0 ]; then
+    echo "files still carrying $RC after the rewrite:" >&2
+    grep -rIl -- "$RC" "$tmp/packages" >&2
+    rm -rf "$tmp"
+    return 1
+  fi
+  echo "stamped $before files, all rewritten"
+  rm -rf "$tmp"
+}
+
+@test "rewrite covers .tag files outside packages/apps/kubernetes" {
+  # The specific blind spot that shipped. Pinned as its own test so a future
+  # narrowing of the glob fails with a message naming the cause, rather than
+  # only tripping the broad round-trip above.
+  tmp=$(mktemp -d)
+  mkdir -p "$tmp/packages/system/monitoring/images"
+  echo 'ghcr.io/cozystack/cozystack/grafana:v9.9.9-rc.9@sha256:'"$(printf 'a%.0s' $(seq 64))" \
+    > "$tmp/packages/system/monitoring/images/grafana.tag"
+
+  hack/promote-rewrite-tags.sh 9.9.9-rc.9 9.9.9 "$tmp/packages" >/dev/null 2>&1 || {
+    rm -rf "$tmp"; return 1
+  }
+
+  got=$(cat "$tmp/packages/system/monitoring/images/grafana.tag")
+  case "$got" in
+    *:v9.9.9@sha256:*) ;;
+    *) echo "expected v9.9.9, got: $got" >&2; rm -rf "$tmp"; return 1 ;;
+  esac
+  rm -rf "$tmp"
+}
+
+@test "rewrite covers a ref stamped into a declared template" {
+  # Storage shape 3 (IMAGE_REF_EXTRA_FILES). multus sed's its ref into a
+  # vendored upstream manifest, so it is reachable by neither glob.
+  tmp=$(mktemp -d)
+  mkdir -p "$tmp/packages/system/multus/templates"
+  printf '          image: ghcr.io/cozystack/cozystack/multus-cni:v9.9.9-rc.9@sha256:%s\n' \
+    "$(printf 'b%.0s' $(seq 64))" > "$tmp/packages/system/multus/templates/multus-daemonset-thick.yml"
+
+  hack/promote-rewrite-tags.sh 9.9.9-rc.9 9.9.9 "$tmp/packages" >/dev/null 2>&1 || {
+    rm -rf "$tmp"; return 1
+  }
+
+  grep -q ':v9.9.9@sha256:' "$tmp/packages/system/multus/templates/multus-daemonset-thick.yml" || {
+    echo "multus template not rewritten" >&2; rm -rf "$tmp"; return 1
+  }
+  rm -rf "$tmp"
+}
+
+@test "component-versioned and third-party tags are left alone" {
+  # kamaji is versioned by its upstream component (v0.19.0-cozystack.N) and
+  # busybox is third-party; neither rides the cozystack version line, so a
+  # promotion must not touch either. Rewriting them would be a bug introduced
+  # by an over-eager fix to the one this file guards.
+  #
+  # The rc version is chosen to SHARE A PREFIX with kamaji's tag (0.19.0), so
+  # the test is not vacuous: an implementation matching loosely on the X.Y.Z
+  # part, or anchoring on anything short of the full "X.Y.Z-rc.N" string, would
+  # corrupt v0.19.0-cozystack.0 here and fail. An earlier revision used an rc
+  # version sharing no substring with either input, which made the assertion
+  # true by construction and tested nothing.
+  tmp=$(mktemp -d)
+  mkdir -p "$tmp/packages/system/capi/images" "$tmp/packages/apps/kubernetes/images"
+  kamaji='ghcr.io/cozystack/cozystack/cluster-api-control-plane-provider-kamaji:v0.19.0-cozystack.0@sha256:c'
+  busybox='docker.io/library/busybox:1.37.0@sha256:d'
+  echo "$kamaji" > "$tmp/packages/system/capi/images/kamaji.tag"
+  echo "$busybox" > "$tmp/packages/apps/kubernetes/images/busybox.tag"
+
+  hack/promote-rewrite-tags.sh 0.19.0-rc.1 0.19.0 "$tmp/packages" >/dev/null 2>&1 || {
+    rm -rf "$tmp"; return 1
+  }
+
+  [ "$(cat "$tmp/packages/system/capi/images/kamaji.tag")" = "$kamaji" ]
+  [ "$(cat "$tmp/packages/apps/kubernetes/images/busybox.tag")" = "$busybox" ]
+  rm -rf "$tmp"
+
+  # Known and accepted limitation, stated here so it is a decision rather than
+  # an oversight: the rewrite is a substring replace scoped to enumerated
+  # files, so a third-party or component-versioned tag carrying the EXACT
+  # cozystack rc string would also be rewritten. No such collision exists (a
+  # component tag is X.Y.Z-cozystack.N and third-party tags are upstream's),
+  # and making the rewrite ownership-aware is not possible with a substring
+  # pass while the host may live in a sibling `registry:` key.
+}
+
+@test "a legitimate rc mention outside image position does not fail promotion" {
+  # The fail-OPEN direction. Every other postcondition test asserts it fires;
+  # this asserts it does not fire on prose, lockfiles or dependency pins that
+  # merely contain an "X.Y.Z-rc.N" string.
+  #
+  # These are real: packages/apps/kubernetes/images/kubevirt-csi-driver/go.sum
+  # pins github.com/golang/protobuf v1.4.0-rc.2, and v1.4.0-rc.2 is a cozystack
+  # rc that was actually cut — an unfiltered postcondition would have aborted
+  # that promotion on a Go checksum line. metallb_test.yaml names v1.5.0-rc.2
+  # in a comment, and the console pnpm-lock.yaml carries rolldown@1.0.0-rc.15.
+  tmp=$(mktemp -d)
+
+  # A fresh copy per version. Reusing one tree would run iterations 2 and 3
+  # against a tree the previous rewrite already mutated, so each would be
+  # testing a slightly different input than the one it names.
+  for v in 1.4.0-rc.2 1.5.0-rc.2 1.4.0-rc.4; do
+    rm -rf "$tmp/packages"
+    cp -a packages "$tmp/packages"
+    rc=0
+    hack/promote-rewrite-tags.sh "$v" "${v%%-*}" "$tmp/packages" >"$tmp/log" 2>&1 || rc=$?
+    if [ "$rc" -ne 0 ]; then
+      echo "false positive: promotion of $v was aborted by the postcondition" >&2
+      cat "$tmp/log" >&2
+      rm -rf "$tmp"
+      return 1
+    fi
+  done
+  rm -rf "$tmp"
+}
+
+@test "an unreadable file fails the promotion rather than being skipped" {
+  # A read error is not "no match". Skipping it would leave a ref unrewritten
+  # while the run still reported success — the same silent-skip shape as the
+  # enumeration bug this script exists to fix.
+  tmp=$(mktemp -d)
+  mkdir -p "$tmp/packages/system/x/images"
+  echo 'ghcr.io/cozystack/cozystack/x:v9.9.9-rc.9@sha256:a' > "$tmp/packages/system/x/images/x.tag"
+  chmod 000 "$tmp/packages/system/x/images/x.tag"
+
+  rc=0
+  hack/promote-rewrite-tags.sh 9.9.9-rc.9 9.9.9 "$tmp/packages" >"$tmp/log" 2>&1 || rc=$?
+
+  # Restore the mode first so the cleanup and any harness diagnostics work.
+  chmod 644 "$tmp/packages/system/x/images/x.tag"
+  if [ "$rc" -eq 0 ]; then
+    echo "expected a non-zero exit for an unreadable file, got 0" >&2
+    rm -rf "$tmp"; return 1
+  fi
+  grep -q 'is not readable' "$tmp/log" || {
+    echo "expected the unreadable-file diagnostic; got:" >&2; cat "$tmp/log" >&2
+    rm -rf "$tmp"; return 1
+  }
+  rm -rf "$tmp"
+}
+
+@test "collect_image_refs emits every first-party ref present in the tree" {
+  # The completeness guard the collector lacked. The rewrite got "scan wider
+  # than you rewrite" via its postcondition; the retag and the mirror got a
+  # wider enumeration and nothing that would notice a NEW blind spot.
+  #
+  # Without this, a first-party ref added at an unenumerated path on a tag
+  # carrying no version string (flux-plunger and keycloak-operator are
+  # latest@-pinned today, so the profile exists) is never mirrored, and the
+  # published nightly points at the private build registry — which the
+  # contract calls the worst of the three failure modes.
+  #
+  # The oracle applies the SAME shape knowledge (collect_refs_from_file) to an
+  # INDEPENDENTLY discovered file list. That is the right axis: what drifted
+  # historically is which files each consumer visits, not how a ref is spelled
+  # inside one. Shape coverage is pinned separately by the per-shape test
+  # below, so DELETING a shape still fails something even though both sides of
+  # this comparison would move together.
+  #
+  # Deleting a shape, and also narrowing one: the per-shape test asserts the
+  # exact canonical repo@digest, so a shape that loses its `registry` rejoin
+  # (the very regression shape 3 was added for) fails there too. What this
+  # comparison itself contributes is only file coverage — for shape behaviour
+  # it is inert, since both sides share the parser.
+  #
+  # An earlier revision derived the expected set from a grep for a CONTIGUOUS
+  # 'ghcr.io/cozystack/cozystack/...@sha256:' string. That was blind to every
+  # split-host shape — cilium, keycloak-operator, kubeovn, the OCI artifact and
+  # seven others, 12 of 43 first-party refs — including keycloak-operator,
+  # which this test's own rationale names as the motivating profile.
+  . hack/lib/image-refs.sh
+  tmp=$(mktemp -d)
+
+  canon() { sed -E 's|^[^ ]*=||; s|:[^/@]*@|@|' | grep '^ghcr\.io/cozystack/cozystack/' | sort -u; }
+
+  collect_image_refs packages | canon > "$tmp/collected"
+  # Pre-filter to files that mention the registry at all before parsing them.
+  # Parsing every YAML under packages/ costs ~30s; this is the same file set
+  # for the purpose of finding FIRST-PARTY refs (canon discards everything
+  # else anyway) and runs in about a second. The marker covers the split forms
+  # too, so kubeovn is not filtered out.
+  grep -rIlE --exclude-dir=charts --exclude='*.md' \
+    -e 'cozystack/cozystack' packages/ \
+    | grep -E '\.(yaml|yml|tag)$' \
+    | while IFS= read -r f; do collect_refs_from_file "$f"; done | canon > "$tmp/present"
+
+  missed=$(comm -13 "$tmp/collected" "$tmp/present")
+  if [ -n "$missed" ]; then
+    echo "first-party refs present in the tree but NOT collected:" >&2
+    printf '%s\n' "$missed" >&2
+    echo "Declare their file in IMAGE_REF_EXTRA_FILES in hack/lib/image-refs.sh." >&2
+    rm -rf "$tmp"
+    return 1
+  fi
+  rm -rf "$tmp"
+}
+
+@test "every file carrying a first-party ref marker is enumerated or allowlisted" {
+  # File-level backstop for the class no YAML oracle can reach: a ref inside a
+  # file yq cannot parse. Helm templates are full of {{ }} and fail to parse
+  # entirely, so a first-party ref planted in one is invisible to the
+  # shape-based completeness check above — that is exactly how a reviewer's
+  # split-host fixture survived every test.
+  #
+  # The markers are keyed to the JOIN SEMANTICS _collect_yaml_shapes
+  # implements, not to the exact spellings that happen to be in the tree today.
+  # An earlier revision keyed them to the latter and was evaded three ways, each
+  # a shape the collector fully supports: `registry: ghcr.io/cozystack/cozystack`
+  # + `repository: <name>` (kubeovn's layout under the key name keycloak-operator
+  # and ingress-nginx use — marker 1 needed a trailing slash a complete-value
+  # host does not have), `registry: ghcr.io/cozystack` + `repository:
+  # cozystack/<name>` (a host+org split, live precedent at
+  # packages/system/fluxcd/values.yaml), and a single-quoted `repository:`
+  # (the old marker admitted only double quotes). All three carried a
+  # version-free `latest@sha256:` tag — the exact profile this check exists for
+  # — and passed the entire suite.
+  #
+  # Coverage is in fact exhaustive, not merely broad. The collector joins
+  # `registry + "/" + repository`, so a split can only fall on a path-separator
+  # boundary of the full ref, giving four possible splits — and markers 1-3
+  # cover all four. A split at any other point (say `registry: ghcr.io/cozy` +
+  # `repository: stack/cozystack/x`) does not need covering because it does not
+  # produce a first-party ref: it joins to ghcr.io/cozy/stack/cozystack/x,
+  # which every consumer's ownership filter discards anyway.
+  #
+  # Widening further would cost real precision for nothing: a bare
+  # `cozystack/cozystack` marker matches 65 files and would need 23 allowlist
+  # entries for Makefiles, Dockerfiles and helm-unittest fixtures.
+  . hack/lib/image-refs.sh
+  tmp=$(mktemp -d)
+
+  image_ref_files packages | sort > "$tmp/enumerated"
+  grep -rIlE --exclude-dir=charts --exclude='*.md' \
+    -e 'ghcr\.io/cozystack/cozystack/' \
+    -e "['\"]?(repository|image)['\"]?[[:space:]]*:[[:space:]]*['\"]?cozystack/" \
+    -e "['\"]?(registry|address)['\"]?[[:space:]]*:[[:space:]]*['\"]?ghcr\.io/cozystack" \
+    packages/ | sort > "$tmp/marked"
+
+  # Known carriers that are deliberately NOT enumerated. Each needs a reason;
+  # this list is the place a new exception has to be argued for, rather than
+  # discovered during a release.
+  #   - talos-csr-signer/Dockerfile: a ':<chart-version>' placeholder in build
+  #     instructions, not a runtime ref — nothing stamps a version there.
+  #   - capi-providers-cpprovider/files/control-plane-components.yaml: the
+  #     documented gzip gap. The chart ships files/components.gz built from it,
+  #     so rewriting only this copy would diverge the two. kamaji is
+  #     component-versioned, so no tag rewrite is owed.
+  cat > "$tmp/allow" <<'ALLOW'
+packages/apps/kubernetes/images/talos-csr-signer/Dockerfile
+packages/system/capi-providers-cpprovider/files/control-plane-components.yaml
+ALLOW
+  sort -o "$tmp/allow" "$tmp/allow"
+
+  unexplained=$(comm -13 "$tmp/enumerated" "$tmp/marked" | comm -13 "$tmp/allow" -)
+  if [ -n "$unexplained" ]; then
+    echo "files carry a first-party image ref but are neither enumerated nor allowlisted:" >&2
+    printf '%s\n' "$unexplained" >&2
+    echo "Declare each in IMAGE_REF_EXTRA_FILES (hack/lib/image-refs.sh), or add it to the" >&2
+    echo "allowlist in this test WITH A REASON if it is not a runtime image ref." >&2
+    rm -rf "$tmp"
+    return 1
+  fi
+  rm -rf "$tmp"
+}
+
+@test "collect_refs_from_file understands every YAML shape" {
+  # Pins shape coverage directly, so deleting a shape fails here even though
+  # the completeness oracle above shares this code and would move with it.
+  . hack/lib/image-refs.sh
+  tmp=$(mktemp -d)
+  D=$(printf 'a%.0s' $(seq 64))
+  # A second, distinct digest so a per-file (rather than per-map) digest
+  # binding is detectable.
+  D2=$(printf 'f%.0s' $(seq 64))
+
+  printf 'image: ghcr.io/cozystack/cozystack/one:v1@sha256:%s\n' "$D" > "$tmp/s1.yaml"
+  # Tagless: a digest-only pin is an ordinary Helm spelling. Narrowing shape 1
+  # to require a ':tag' before the digest was otherwise undetected.
+  printf 'image: ghcr.io/cozystack/cozystack/onebare@sha256:%s\n' "$D" > "$tmp/s1b.yaml"
+  # Shape 2 WITH a sibling registry: the previous fixture kept the host inside
+  # repository, so shape 2 losing its registry rejoin was invisible here and
+  # caught only by a single nightly-mirror fixture (no real package uses shape
+  # 2 with a split host, so promote-retag misses it too).
+  printf 'image:\n  registry: ghcr.io\n  repository: cozystack/cozystack/two\n  tag: v1\n  digest: "sha256:%s"\n' "$D" > "$tmp/s2.yaml"
+  # TWO shape-3 maps with DISTINCT digests in one file. With a single pair, a
+  # rule that binds one digest per file and reuses it for every repository
+  # passes — and on the real linstor values that hands piraeus-server's digest
+  # to linstor-csi, i.e. silently ships the wrong image under the right name.
+  # The per-map digest binding is the property worth pinning here.
+  printf 'image:\n  registry: ghcr.io\n  repository: cozystack/cozystack/three\n  tag: "v1@sha256:%s"\nsecond:\n  image:\n    registry: ghcr.io\n    repository: cozystack/cozystack/threeb\n    tag: "v1@sha256:%s"\n' "$D" "$D2" > "$tmp/s3.yaml"
+  # Shape 4 carries a digest-pinned sibling OUTSIDE global.images. The rule is
+  # deliberately scoped to .global.images[] because the host is a
+  # document-level key: binding it to any map in the file would staple
+  # kubeovn's registry onto unrelated repositories and manufacture owned refs
+  # that were never built. Broadening the rule to `..` otherwise passed every
+  # suite, because asserting only that the expected ref appears cannot see an
+  # unexpected one — hence the negative assertion below.
+  # Two digest-pinned decoys, deliberately at different depths: one INSIDE
+  # `global` but outside `global.images`, one outside `global` entirely.
+  # Narrowing the negative to the outer decoy alone is not enough — mutating
+  # the rule to `.global | ..` (rather than a document-wide `..`) then still
+  # passes, while happily stapling the registry onto the inner map.
+  printf 'global:\n  registry:\n    address: ghcr.io/cozystack/cozystack\n  images:\n    - repository: four\n      tag: "v1@sha256:%s"\n  sidecar:\n    repository: someone-elses/inner\n    tag: "v1@sha256:%s"\nunrelated:\n  image:\n    repository: someone-elses/thing\n    tag: "v1@sha256:%s"\n' "$D" "$D" "$D" > "$tmp/s4.yaml"
+  printf 'x:\n  platformSourceUrl: oci://ghcr.io/cozystack/cozystack/five\n  platformSourceRef: digest=sha256:%s\n' "$D" > "$tmp/s5.yaml"
+  printf 'ghcr.io/cozystack/cozystack/six:v1@sha256:%s\n' "$D" > "$tmp/s6.tag"
+  # The upstream ingress-nginx layout: the repository lives in `image`, not
+  # `repository`, and the digest has its own key without an `@`, so neither
+  # shape 1 nor shape 2 sees it. The non-string digest ahead of it would abort
+  # the rule's test() for the whole file without a type guard.
+  printf 'odd:\n  image: x\n  digest: 5\ncontroller:\n  image:\n    registry: ghcr.io\n    image: cozystack/cozystack/seven\n    tag: v1\n    digest: sha256:%s\n' "$D" > "$tmp/s7.yaml"
+
+  # Assert the EXACT canonical repo@digest, not a repository substring. A
+  # substring match leaves the digest untested, and since the completeness
+  # oracle shares this code, both sides of that comparison move together when
+  # the digest handling breaks: corrupting the last hex digit of every emitted
+  # digest previously left the rewrite, retag and mirror suites entirely green.
+  # The digest is the only part that decides which bytes get retagged, so it is
+  # the part most worth pinning.
+  for n in one onebare two three threeb four five six seven; do
+    want_d="$D"
+    case "$n" in one) f=s1.yaml ;; onebare) f=s1b.yaml ;; two) f=s2.yaml ;;
+                 three) f=s3.yaml ;; threeb) f=s3.yaml; want_d="$D2" ;;
+                 four) f=s4.yaml ;; five) f=s5.yaml ;;
+                 six) f=s6.tag ;; seven) f=s7.yaml ;; esac
+    want="ghcr.io/cozystack/cozystack/${n}@sha256:${want_d}"
+    # Canonicalize away the cosmetic :tag that fixtures s1 and s6 carry through.
+    got=$(collect_refs_from_file "$tmp/$f" | sed -E 's|:[^/@]*@|@|' | grep "cozystack/${n}@" || true)
+    if [ "$got" != "$want" ]; then
+      echo "shape for '$n' ($f):" >&2
+      echo "  want: $want" >&2
+      echo "  got:  ${got:-<nothing>}" >&2
+      rm -rf "$tmp"; return 1
+    fi
+  done
+
+  # Negative: the document-level host must not be stapled onto a map outside
+  # global.images. Asserting only that the expected ref appears cannot catch
+  # over-collection, and a manufactured "owned" ref would be retagged and
+  # mirrored to a destination nothing ever built.
+  if collect_refs_from_file "$tmp/s4.yaml" | grep -q 'cozystack/someone-elses'; then
+    echo "shape 4 stapled the global registry onto a map outside global.images:" >&2
+    collect_refs_from_file "$tmp/s4.yaml" >&2
+    rm -rf "$tmp"; return 1
+  fi
+
+  # Negative for the image/digest split map: an `image` key is not enough. A
+  # map with no digest, an empty digest (the upstream default for an unpinned
+  # image) or a digest but no `image` must yield nothing, or a bare
+  # "<image>@" or "@sha256:..." fragment reaches every consumer.
+  printf 'a:\n  registry: ghcr.io\n  image: cozystack/cozystack/nodigest\n  tag: v1\nb:\n  registry: ghcr.io\n  image: cozystack/cozystack/emptydigest\n  tag: v1\n  digest: ""\nc:\n  registry: ghcr.io\n  tag: v1\n  digest: sha256:%s\n' "$D" > "$tmp/near.yaml"
+  near=$(collect_refs_from_file "$tmp/near.yaml")
+  if [ -n "$near" ]; then
+    echo "the image/digest split-map rule matched a near-miss:" >&2
+    printf '%s\n' "$near" >&2
+    rm -rf "$tmp"; return 1
+  fi
+  rm -rf "$tmp"
+}
+
+@test "a declared extra file actually yields its ref, not just its filename" {
+  # image_ref_files listing a path proves only that the path is visited.
+  # Declaring an extra whose ref the parser cannot reach leaves it enumerated
+  # but uncollected, and both completeness checks pass — the marker check
+  # compares filenames, and the oracle shares the same parser. Assert the ref
+  # itself comes out.
+  #
+  # The fixture is an unparseable Helm template — the case parsing alone cannot
+  # reach — carrying a contiguous ref, single-quoted so the scrape's
+  # quote-tolerance is exercised too.
+  #
+  # Two things this test got wrong before, both of which made it pass while the
+  # thing it guards was broken. Its fixture was a SPLIT-host ref, which a
+  # textual scrape can never reconstruct: only the contiguous `tag` value is
+  # recoverable, so ref_repo() reduces it to `latest` and every consumer drops
+  # it at the ownership filter — enumerated-but-uncollected, exactly the
+  # conflation this test exists to catch. And it asserted `grep -q
+  # "@sha256:$D"`, which any token containing the digest satisfies. Gutting the
+  # scrape to emit a bare `@sha256:<digest>` with no repository left the whole
+  # suite green. Assert the exact canonical ref instead.
+  . hack/lib/image-refs.sh
+  tmp=$(mktemp -d)
+  D=$(printf 'b%.0s' $(seq 64))
+  mkdir -p "$tmp/system/awkward/templates"
+  {
+    echo '{{- if .Values.enabled }}'
+    echo 'spec:'
+    printf "  image: 'ghcr.io/cozystack/cozystack/awkward:latest@sha256:%s'\n" "$D"
+    echo '{{- end }}'
+  } > "$tmp/system/awkward/templates/thing.yaml"
+
+  IMAGE_REF_EXTRA_FILES="system/awkward/templates/thing.yaml"
+  image_ref_files "$tmp" | grep -q 'system/awkward/templates/thing.yaml' || {
+    echo "declared extra was not enumerated" >&2; rm -rf "$tmp"; return 1
+  }
+  if ! collect_image_refs "$tmp" | sed -E 's|:[^/@]*@|@|' \
+       | grep -qx "ghcr.io/cozystack/cozystack/awkward@sha256:${D}"; then
+    echo "declared extra was enumerated but yielded no usable ref:" >&2
+    collect_image_refs "$tmp" >&2
+    rm -rf "$tmp"; return 1
+  fi
+  rm -rf "$tmp"
+
+  # Recorded limitation, so the comment above does not overclaim: a SPLIT-host
+  # ref in an unparseable file is recoverable by neither route — parsing fails
+  # on the template, and a scrape cannot rejoin `registry` to `repository`. The
+  # file-level marker check is what covers that case, by refusing to let such a
+  # file go undeclared in the first place.
+}
+
+@test "the cozystack-packages OCI artifact is collected" {
+  # Shape 5 (platformSourceUrl/platformSourceRef). Deleting that rule left
+  # every suite green, so stable promotion could silently stop retagging the
+  # packages artifact — the one object the installer resolves to find
+  # everything else.
+  . hack/lib/image-refs.sh
+  collect_image_refs packages | grep -q 'cozystack-packages@sha256:[0-9a-f]\{64\}'
+}
+
+@test "digests are never altered by the rewrite" {
+  # Promotion retags by digest and must not rebuild; if the rewrite could touch
+  # a digest, the stable image would stop being bit-for-bit the tested rc.
+  tmp=$(mktemp -d)
+  mkdir -p "$tmp/packages/system/x/images"
+  d=$(printf 'e%.0s' $(seq 64))
+  echo "ghcr.io/cozystack/cozystack/x:v9.9.9-rc.9@sha256:$d" > "$tmp/packages/system/x/images/x.tag"
+
+  hack/promote-rewrite-tags.sh 9.9.9-rc.9 9.9.9 "$tmp/packages" >/dev/null 2>&1 || {
+    rm -rf "$tmp"; return 1
+  }
+
+  grep -q "@sha256:$d\$" "$tmp/packages/system/x/images/x.tag" || {
+    echo "digest changed: $(cat "$tmp/packages/system/x/images/x.tag")" >&2
+    rm -rf "$tmp"; return 1
+  }
+  rm -rf "$tmp"
+}
+
+@test "postcondition fails when a ref hides in an unenumerated location" {
+  # The guard that makes a future blind spot loud instead of silent. A ref in a
+  # location neither glob nor IMAGE_REF_EXTRA_FILES covers must abort the
+  # promotion, not sail through as it did for v1.6.0.
+  tmp=$(mktemp -d)
+  mkdir -p "$tmp/packages/system/surprise/deeply/nested"
+  echo 'image: ghcr.io/cozystack/cozystack/surprise:v9.9.9-rc.9@sha256:f' \
+    > "$tmp/packages/system/surprise/deeply/nested/manifest.yaml"
+
+  rc=0
+  hack/promote-rewrite-tags.sh 9.9.9-rc.9 9.9.9 "$tmp/packages" >"$tmp/log" 2>&1 || rc=$?
+  if [ "$rc" -eq 0 ]; then
+    echo "expected a non-zero exit for an unenumerated ref, got 0" >&2
+    rm -rf "$tmp"; return 1
+  fi
+  grep -q 'still carry the rc version' "$tmp/log" || {
+    echo "expected the postcondition's message; got:" >&2; cat "$tmp/log" >&2
+    rm -rf "$tmp"; return 1
+  }
+  rm -rf "$tmp"
+}
+
+@test "postcondition fires on a split tag/digest ref, not just an @sha256 one" {
+  # Covers the postcondition's key-position branch specifically. Replacing the
+  # whole pattern with the naive "${RC}@sha256:" — the narrowing that was
+  # explicitly rejected because cilium keeps `tag:` and `digest:` under
+  # separate keys — previously left every test green, so the branch that makes
+  # the split shape visible was asserted by nothing.
+  tmp=$(mktemp -d)
+  mkdir -p "$tmp/packages/system/surprise/files"
+  {
+    echo 'image:'
+    echo '  repository: ghcr.io/cozystack/cozystack/surprise'
+    echo '  tag: v9.9.9-rc.9'
+    printf '  digest: "sha256:%s"\n' "$(printf 'a%.0s' $(seq 64))"
+  } > "$tmp/packages/system/surprise/files/x.yaml"
+
+  rc=0
+  hack/promote-rewrite-tags.sh 9.9.9-rc.9 9.9.9 "$tmp/packages" >"$tmp/log" 2>&1 || rc=$?
+  if [ "$rc" -eq 0 ]; then
+    echo "expected a non-zero exit for a split tag/digest ref at an unenumerated path, got 0" >&2
+    cat "$tmp/log" >&2
+    rm -rf "$tmp"; return 1
+  fi
+  grep -q 'still carry the rc version' "$tmp/log" || {
+    echo "expected the postcondition diagnostic; got:" >&2; cat "$tmp/log" >&2
+    rm -rf "$tmp"; return 1
+  }
+  rm -rf "$tmp"
+}
+
+@test "malformed versions are rejected before any file is touched" {
+  # RC_VERSION becomes a sed pattern and STABLE_VERSION its replacement, so an
+  # unvalidated argument is an injection surface as well as a correctness one.
+  tmp=$(mktemp -d)
+  mkdir -p "$tmp/packages/system/x/images"
+  echo 'ghcr.io/cozystack/cozystack/x:v1.0.0@sha256:a' > "$tmp/packages/system/x/images/x.tag"
+  orig=$(cat "$tmp/packages/system/x/images/x.tag")
+
+  rc=0
+  hack/promote-rewrite-tags.sh 'not-a-version' 9.9.9 "$tmp/packages" >/dev/null 2>&1 || rc=$?
+  [ "$rc" -ne 0 ]
+
+  rc=0
+  hack/promote-rewrite-tags.sh 9.9.9-rc.9 'v9.9.9; rm -rf /' "$tmp/packages" >/dev/null 2>&1 || rc=$?
+  [ "$rc" -ne 0 ]
+
+  # Nothing was modified by either rejected invocation.
+  [ "$(cat "$tmp/packages/system/x/images/x.tag")" = "$orig" ]
+  rm -rf "$tmp"
+}
+
+@test "image_ref_files enumerates all three storage shapes" {
+  # Direct cover for the shared enumeration, so a regression there is
+  # attributed to the library rather than surfacing only through its consumers.
+  . hack/lib/image-refs.sh
+
+  files=$(image_ref_files packages)
+  echo "$files" | grep -q '^packages/system/objectstorage-controller/values.yaml$'
+  echo "$files" | grep -q '^packages/system/grafana-operator/images/grafana-dashboards.tag$'
+  echo "$files" | grep -q '^packages/system/multus/templates/multus-daemonset-thick.yml$'
+
+  # And it must not reach into vendored charts, whose values `make update`
+  # regenerates and whose images the build neither pushes nor stamps.
+  if echo "$files" | grep -q '/charts/'; then
+    echo "enumeration leaked into a vendored charts/ subtree:" >&2
+    echo "$files" | grep '/charts/' >&2
+    return 1
+  fi
+}
+
+@test "collect_image_refs finds refs the depth-2 values.yaml glob misses" {
+  # The mirror and the retag both filter on ownership, so a ref the collector
+  # never emits is silently skipped rather than failing. Assert the two shapes
+  # that were missing are present in the real tree's collection.
+  . hack/lib/image-refs.sh
+
+  refs=$(collect_image_refs packages)
+  echo "$refs" | grep -q 'cozystack/grafana-dashboards@sha256:\|cozystack/grafana-dashboards:[^ ]*@sha256:'
+  # The whole ref, not just the name: the completeness oracle above builds its
+  # expected side with collect_refs_from_file, which cannot parse this file at
+  # all, so this is where the multus entry is held to a real digest.
+  echo "$refs" | grep -qE 'multus-cni[^[:space:]]*@sha256:[0-9a-f]{64}'
+}
diff --git a/hack/promotion-retention-contract.bats b/hack/promotion-retention-contract.bats
new file mode 100644
index 0000000000..2555cafe60
--- /dev/null
+++ b/hack/promotion-retention-contract.bats
@@ -0,0 +1,264 @@
+#!/usr/bin/env bats
+# Structural contract for abandoned stable-candidate artifact retention.
+
+load test_helper
+
+REPO_ROOT="$(cd "$(dirname "${BATS_TEST_FILENAME:-$0}")/.." && pwd)"
+RETENTION="$REPO_ROOT/.github/workflows/retention.yaml"
+
+code_lines() {
+  rc=0
+  grep -v '^[[:space:]]*#' || rc=$?
+  [ "$rc" -le 1 ]
+}
+
+step_block() {
+  awk -v want="      - name: $1" '
+    $0 == want { inside = 1; next }
+    /^      - name: / { inside = 0 }
+    inside' "$2"
+}
+
+@test "retention deletes only old packages versions carrying temporary tags alone" {
+  block="$(step_block 'Prune' "$RETENTION")"
+  [ -n "$block" ]
+
+  printf '%s\n' "$block" | code_lines | grep -qF "pkg='cozystack/cozystack-packages'"
+  printf '%s\n' "$block" | code_lines | grep -qF 'select((.metadata.container.tags | length) > 0)'
+  printf '%s\n' "$block" | code_lines | grep -qF 'select(.metadata.container.tags | all(test("^promotion-v'
+  printf '%s\n' "$block" | code_lines | grep -qF -- '-run-[0-9]+-[0-9]+$'
+  printf '%s\n' "$block" | code_lines | grep -qF 'select(.updated_at < $cutoff)'
+  printf '%s\n' "$block" | code_lines | grep -qF 'index($digest)) == null'
+}
+
+@test "retention protects candidates pinned by open bot release PRs" {
+  block="$(step_block 'Prune' "$RETENTION")"
+  [ -n "$block" ]
+
+  printf '%s\n' "$block" | code_lines | grep -qF 'pulls?state=open&per_page=100'
+  printf '%s\n' "$block" | code_lines | grep -qF '.user.login == "cozystack-ci[bot]"'
+  printf '%s\n' "$block" | code_lines | grep -qF '.head.repo.full_name == $repo'
+  printf '%s\n' "$block" | code_lines | grep -qF 'any(.labels[]?; .name == "release")'
+  printf '%s\n' "$block" | code_lines | grep -qF '/^[\047"]|[\047"][[:space:]]*$/'
+  printf '%s\n' "$block" | code_lines | grep -qF "grep -Eq '^digest=sha256:[0-9a-f]{64}$'"
+  printf '%s\n' "$block" | code_lines | grep -qF 'refusing retention'
+}
+
+@test "retention also protects candidates pinned by a base-branch tip" {
+  # The open PR is not the whole danger window. A candidate stops being
+  # eligible only once finalize's retag puts a stable tag on its manifest, and
+  # finalize runs after the merge that closes the PR — so between those two
+  # points the branch tip is the only thing still naming the digest.
+  block="$(step_block 'Prune' "$RETENTION")"
+  [ -n "$block" ]
+
+  printf '%s\n' "$block" | code_lines | grep -qF 'branches?per_page=100'
+  printf '%s\n' "$block" | code_lines \
+    | grep -qF 'select(. == "main" or test("^release-[0-9]+\\.[0-9]+$"))'
+  printf '%s\n' "$block" | code_lines | grep -qF "grep -oE 'digest=sha256:[0-9a-f]{64}'"
+}
+
+@test "an unresolved pin stops the promotion sweep and nothing else" {
+  # Fail-closed for deletion is right; taking the unrelated nightly sweep down
+  # with it is not. A WIP commit adding a trailing comment to a pin on a
+  # release branch would otherwise silently stop GHCR nightly pruning.
+  block="$(step_block 'Prune' "$RETENTION")"
+  [ -n "$block" ]
+
+  printf '%s\n' "$block" | code_lines | grep -qF 'promotion_retention_blocked=1'
+  printf '%s\n' "$block" | code_lines | grep -qF 'skipping the promotion sweep'
+
+  # The guard has to sit between the nightly sweep and the promotion sweep:
+  # ahead of the nightly one it is the coupling it exists to remove, behind the
+  # promotion one it does not guard it.
+  nightly="$(printf '%s\n' "$block" | code_lines \
+    | grep -nF 'nightlies, keep ${KEEP}, drop' | awk -F: 'NR == 1 { print $1 }')"
+  guard="$(printf '%s\n' "$block" | code_lines \
+    | grep -nF 'skipping the promotion sweep' | awk -F: 'NR == 1 { print $1 }')"
+  sweep="$(printf '%s\n' "$block" | code_lines \
+    | grep -nF "pkg='cozystack/cozystack-packages'" | awk -F: 'NR == 1 { print $1 }')"
+  [ -n "$nightly" ] && [ -n "$guard" ] && [ -n "$sweep" ]
+  [ "$nightly" -lt "$guard" ]
+  [ "$guard" -lt "$sweep" ]
+}
+
+@test "a listing failure defers to that guard instead of aborting the job" {
+  # The deferred guard above is only worth having if nothing between it and the
+  # protection sources can exit first. Both sources open with a `gh api
+  # --paginate` listing that sits ABOVE the nightly sweep, and the step runs
+  # under `set -euo pipefail`: unhandled, a transient /pulls or /branches blip
+  # exits the step and takes unrelated GHCR nightly pruning down with it.
+  block="$(step_block 'Prune' "$RETENTION")"
+  [ -n "$block" ]
+
+  printf '%s\n' "$block" | code_lines | grep -qF 'set -euo pipefail'
+
+  # Each listing must carry its own handler, which has to do both things: raise
+  # the blocked flag, so deletion stays fail-closed, and empty the list, because
+  # a half-paginated list left in place is a smaller protected set and a smaller
+  # protected set is the one shape that can authorise a delete.
+  #
+  # Asserted within a short window after the listing rather than anywhere in the
+  # step, so a handler belonging to a different failure path cannot satisfy it.
+  # The window is why an edit that grows one of these jq filters has to move its
+  # handler along with it.
+  for pair in 'pulls?state=open&per_page=100|release_pr_shas' \
+              'branches?per_page=100|base_branches'; do
+    endpoint="${pair%%|*}"
+    var="${pair#*|}"
+    listing="$(printf '%s\n' "$block" | code_lines \
+      | grep -nF "$endpoint" | awk -F: 'NR == 1 { print $1 }')"
+    [ -n "$listing" ]
+    window="$(printf '%s\n' "$block" | code_lines \
+      | awk -v start="$listing" 'NR >= start && NR <= start + 11')"
+    printf '%s\n' "$window" | grep -qF 'promotion_retention_blocked=1'
+    printf '%s\n' "$window" | grep -qF "${var}=\"\""
+  done
+}
+
+@test "unresolved package names or unreadable versions cannot exit green" {
+  # The nightly sweep's package list used to come from an org listing whose
+  # failure arrived as an empty list, and the empty state exited 0 above the
+  # deferred guard, so a broken run could end green having swept nothing. The
+  # names now come from the published tree, and the same hazard has two shapes:
+  # an empty list that exits 0, and a versions read that `set -e` turns into an
+  # abort of the whole loop. Positions are read inside short windows so an
+  # exit or a flag belonging to another path cannot satisfy them.
+  block="$(step_block 'Prune' "$RETENTION")"
+  [ -n "$block" ]
+  code="$(printf '%s\n' "$block" | code_lines)"
+
+  # An empty list flags the run instead of exiting: the promotion sweep below
+  # needs no name from that list, and its safety rests on the protected set
+  # alone, so a broken name source must not stop it.
+  resolve="$(printf '%s\n' "$code" | grep -nF 'retention-packages.sh' | awk -F: 'NR == 1 { print $1 }')"
+  [ -n "$resolve" ]
+  branch="$(printf '%s\n' "$code" | awk -v start="$resolve" 'NR >= start && NR <= start + 8')"
+  printf '%s\n' "$branch" | grep -qF 'pkgs=""'
+  printf '%s\n' "$branch" | grep -qF '[ -z "$pkgs" ]'
+  printf '%s\n' "$branch" | grep -qF 'sweep_failed=1'
+  if printf '%s\n' "$branch" | grep -qE '(^|[^_])exit '; then
+    echo "FAIL: an empty package list exits before the promotion sweep"
+    false
+  fi
+
+  read_at="$(printf '%s\n' "$code" | grep -nF '/versions" 2>' | awk -F: 'NR == 1 { print $1 }')"
+  [ -n "$read_at" ]
+  [ "$read_at" -gt "$resolve" ]
+  handler="$(printf '%s\n' "$code" | awk -v start="$read_at" 'NR >= start && NR <= start + 8')"
+  printf '%s\n' "$handler" | grep -qF 'sweep_failed=1'
+  printf '%s\n' "$handler" | grep -qF 'continue'
+
+  # The flag is honoured after the promotion sweep, the last work the run does.
+  promotion_at="$(printf '%s\n' "$code" | grep -nF 'promotion_ids=' | awk -F: 'NR == 1 { print $1 }')"
+  check_at="$(printf '%s\n' "$code" | grep -nF '"$sweep_failed" -eq 1' | awk -F: 'NR == 1 { print $1 }')"
+  [ -n "$promotion_at" ] && [ -n "$check_at" ]
+  [ "$promotion_at" -lt "$check_at" ]
+  # The exit sits inside the flagged branch and nothing follows "Done.": an
+  # exit that fires unconditionally would turn every run red.
+  verdict="$(printf '%s\n' "$code" | awk -v s="$check_at" 'NR > s && NR <= s + 4 { sub(/^[[:space:]]+/, ""); print }')"
+  [ "$(printf '%s\n' "$verdict" | sed -n 1p | grep -cF 'echo "::error::')" -eq 1 ]
+  [ "$(printf '%s\n' "$verdict" | sed -n 2p)" = 'exit 1' ]
+  [ "$(printf '%s\n' "$verdict" | sed -n 3p)" = 'fi' ]
+  [ "$(printf '%s\n' "$verdict" | sed -n 4p)" = 'echo "Done."' ]
+  [ -z "$(printf '%s\n' "$code" | awk -v s="$check_at" 'NR > s + 4' | grep -v '^[[:space:]]*$')" ]
+}
+
+@test "an unreadable candidate listing fails the run without deleting anything" {
+  # Unhandled, `set -e` aborted the step on a bare gh error. Handled, the read
+  # must also leave no ids behind, because a partial page set is a list the
+  # protection filter never saw in full.
+  block="$(step_block 'Prune' "$RETENTION")"
+  [ -n "$block" ]
+  code="$(printf '%s\n' "$block" | code_lines)"
+
+  read_at="$(printf '%s\n' "$code" | grep -nF 'promotion_ids="$(gh api' | awk -F: 'NR == 1 { print $1 }')"
+  [ -n "$read_at" ]
+  handler="$(printf '%s\n' "$code" | awk -v start="$read_at" 'NR >= start && NR <= start + 14')"
+  printf '%s\n' "$handler" | grep -qF '::error::'
+  printf '%s\n' "$handler" | grep -qF 'sweep_failed=1'
+  printf '%s\n' "$handler" | grep -qF "promotion_ids='[]'"
+}
+
+@test "a refused delete flags the run instead of aborting the sweep" {
+  # Unflagged, a failed xargs would abort the step under `set -e`: still red,
+  # but the remaining packages and the promotion sweep would never run.
+  block="$(step_block 'Prune' "$RETENTION")"
+  [ -n "$block" ]
+  calls="$(printf '%s\n' "$block" | code_lines | grep -F 'retention-delete.sh' || true)"
+  [ "$(printf '%s\n' "$calls" | grep -c .)" -ge 2 ]
+  if printf '%s\n' "$calls" | grep -vqE '\|\| sweep_failed=1$'; then
+    echo "FAIL: a delete call does not flag the run: $calls"
+    false
+  fi
+}
+
+@test "deletes use the workflow token and skip packages linked elsewhere" {
+  # The app token lists versions but cannot delete them; GITHUB_TOKEN deleted a
+  # version of a package linked to this repository. A package linked elsewhere
+  # is not attempted, so it cannot turn every apply run red: it is skipped with
+  # a warning before its versions are read, while a failed linkage read still
+  # fails the run.
+  block="$(step_block 'Prune' "$RETENTION")"
+  [ -n "$block" ]
+  code="$(printf '%s\n' "$block" | code_lines)"
+
+  printf '%s\n' "$block" | grep -qF 'DELETE_TOKEN: ${{ secrets.GITHUB_TOKEN }}'
+
+  link_at="$(printf '%s\n' "$code" | grep -nF '/packages/container/${enc}" --jq' | awk -F: 'NR == 1 { print $1 }')"
+  read_at="$(printf '%s\n' "$code" | grep -nF '/versions" 2>' | awk -F: 'NR == 1 { print $1 }')"
+  [ -n "$link_at" ] && [ -n "$read_at" ]
+  [ "$link_at" -lt "$read_at" ]
+  window="$(printf '%s\n' "$code" | awk -v s="$link_at" -v e="$read_at" 'NR >= s && NR < e')"
+  printf '%s\n' "$window" | grep -qF '.repository.full_name'
+  printf '%s\n' "$window" | grep -qF 'sweep_failed=1'
+  printf '%s\n' "$window" | grep -qF '!= "$GITHUB_REPOSITORY"'
+  printf '%s\n' "$window" | grep -qF 'unlinked='
+  [ "$(printf '%s\n' "$window" | grep -cF 'continue')" -ge 2 ]
+  if printf '%s\n' "$window" | grep -qF 'retention-delete.sh'; then
+    echo "FAIL: a delete is reachable before the linkage check"
+    false
+  fi
+
+  warn_at="$(printf '%s\n' "$code" | grep -nF 'not linked to' | awk -F: 'NR == 1 { print $1 }')"
+  promotion_at="$(printf '%s\n' "$code" | grep -nF 'promotion_ids=' | awk -F: 'NR == 1 { print $1 }')"
+  [ -n "$warn_at" ] && [ "$warn_at" -lt "$promotion_at" ]
+  printf '%s\n' "$code" | sed -n "${warn_at}p" | grep -qF '::warning::'
+}
+
+@test "a sweep that finds no linked package cannot exit green" {
+  # Skipping one unlinked package is deliberate, but if every resolved package
+  # were skipped the nightly sweep would prune nothing and still end green,
+  # unlike an empty name list. Flagged rather than exited, so the promotion
+  # sweep still runs.
+  block="$(step_block 'Prune' "$RETENTION")"
+  [ -n "$block" ]
+  code="$(printf '%s\n' "$block" | code_lines)"
+
+  link_at="$(printf '%s\n' "$code" | grep -nF '!= "$GITHUB_REPOSITORY"' | awk -F: 'NR == 1 { print $1 }')"
+  read_at="$(printf '%s\n' "$code" | grep -nF '/versions" 2>' | awk -F: 'NR == 1 { print $1 }')"
+  [ -n "$link_at" ] && [ -n "$read_at" ]
+  # Counted from zero, set once ahead of the loop.
+  [ "$(printf '%s\n' "$code" | grep -cE '^[[:space:]]*linked_count=0$')" -eq 1 ]
+  [ "$(printf '%s\n' "$code" | grep -nE '^[[:space:]]*linked_count=0$' | cut -d: -f1)" -lt \
+    "$(printf '%s\n' "$code" | grep -nF 'while IFS= read -r pkg' | awk -F: 'NR == 1 { print $1 }')" ]
+  # The only increment, and only past the linkage check.
+  [ "$(printf '%s\n' "$code" | grep -cF 'linked_count=$((')" -eq 1 ]
+  printf '%s\n' "$code" | awk -v s="$link_at" -v e="$read_at" 'NR > s && NR < e' \
+    | grep -qF 'linked_count=$((linked_count + 1))'
+
+  loop_end="$(printf '%s\n' "$code" | grep -nF 'done <<< "$pkgs"' | awk -F: 'NR == 1 { print $1 }')"
+  check_at="$(printf '%s\n' "$code" | grep -nF '"$linked_count" -eq 0' | awk -F: 'NR == 1 { print $1 }')"
+  promotion_at="$(printf '%s\n' "$code" | grep -nF 'promotion_ids=' | awk -F: 'NR == 1 { print $1 }')"
+  [ -n "$loop_end" ] && [ -n "$check_at" ] && [ -n "$promotion_at" ]
+  [ "$loop_end" -lt "$check_at" ]
+  [ "$check_at" -lt "$promotion_at" ]
+  printf '%s\n' "$code" | sed -n "${check_at}p" | grep -qF '[ -n "$pkgs" ]'
+  branch="$(printf '%s\n' "$code" | awk -v s="$check_at" 'NR >= s && NR <= s + 4')"
+  printf '%s\n' "$branch" | grep -qF '::error::'
+  printf '%s\n' "$branch" | grep -qF 'sweep_failed=1'
+  if printf '%s\n' "$branch" | grep -qE '(^|[^_])exit '; then
+    echo "FAIL: an all-unlinked sweep exits before the promotion sweep"
+    false
+  fi
+}
diff --git a/hack/proxmox-e2e-fixture_test.bats b/hack/proxmox-e2e-fixture_test.bats
new file mode 100755
index 0000000000..0d2df3e5ac
--- /dev/null
+++ b/hack/proxmox-e2e-fixture_test.bats
@@ -0,0 +1,63 @@
+#!/usr/bin/env bats
+# The Proxmox e2e fixture is stand-agnostic through ${COZY_PVE_*} variables that
+# hack/e2e-chainsaw/_lib/run-proxmox.sh expands with envsubst. GNU envsubst
+# expands ${VAR} and nothing else: a ${VAR:-default} stays in the text as it is,
+# set or not, and reaches the apiserver as a string where the schema wants an
+# integer. So the defaults live in the script, the fixture carries bare
+# variables, and the render refuses to hand out a fixture with one left in it.
+
+load test_helper
+
+REPO_ROOT="$(cd "$(dirname "${BATS_TEST_FILENAME:-$0}")/.." && pwd)"
+FIXTURE="$REPO_ROOT/hack/e2e-chainsaw/kubernetes-proxmox/tenant.yaml"
+RUNNER="$REPO_ROOT/hack/e2e-chainsaw/_lib/run-proxmox.sh"
+
+@test "the fixture carries no shell-style default that envsubst would leave in place" {
+  if grep -qE '\$\{[A-Za-z_]+:[-=?+]' "$FIXTURE"; then echo "FAIL: the fixture must not carry a shell-style default envsubst leaves in place"; false; fi
+}
+
+@test "render-tenant expands every variable with the runner's defaults" {
+  out="$(COZY_PVE_SSH=x COZY_PROXMOX_STORAGE=teststore "$RUNNER" render-tenant)"
+  if printf '%s' "$out" | grep -q '\${'; then echo "FAIL: the rendered tenant must not keep an unexpanded variable"; false; fi
+  printf '%s' "$out" | grep -qE '^ +prefix: 24$'
+  printf '%s' "$out" | grep -qE '^ +storage: "teststore"$'
+  printf '%s' "$out" | grep -qE '^ +bridge: "vmbr50"$'
+}
+
+@test "render-tenant honours a stand's own values and keeps prefix an integer" {
+  out="$(COZY_PVE_SSH=x COZY_PROXMOX_STORAGE=s COZY_PVE_PREFIX=16 COZY_PVE_BRIDGE=vmbr1 "$RUNNER" render-tenant)"
+  printf '%s' "$out" | grep -qE '^ +prefix: 16$'
+  printf '%s' "$out" | grep -qE '^ +bridge: "vmbr1"$'
+}
+
+@test "render-tenant passes the stand's resource pool through, and none by default" {
+  out="$(COZY_PVE_SSH=x COZY_PROXMOX_STORAGE=s COZY_PVE_POOL=tenant-e2e "$RUNNER" render-tenant)"
+  printf '%s' "$out" | grep -qE '^ +pool: "tenant-e2e"$'
+  out="$(COZY_PVE_SSH=x COZY_PROXMOX_STORAGE=s "$RUNNER" render-tenant)"
+  printf '%s' "$out" | grep -qE '^ +pool: ""$'
+}
+
+# The PVC probe waits for the disk to leave the storage. A listing that fails
+# must fail the check: read as empty, it would report a leaked disk as freed.
+# (The bodies stay POSIX sh, so the legacy hack/cozytest.sh translator can still
+# run them: no `run`, no [[ ]].)
+@test "disk-freed fails when the storage cannot be listed, instead of calling the disk gone" {
+  stub="$(mktemp -d)"
+  printf '#!/bin/sh\necho "ssh: connect to host pve: Connection refused" >&2\nexit 255\n' > "$stub/ssh"
+  chmod +x "$stub/ssh"
+  rc=0
+  out="$(PATH="$stub:$PATH" COZY_PVE_SSH=root@pve COZY_PROXMOX_STORAGE=main-pool "$RUNNER" disk-freed main-pool:vm-1-pvc-x 2>&1)" || rc=$?
+  rm -rf "$stub"
+  [ "$rc" -ne 0 ]
+  case "$out" in *"cannot list main-pool"*) ;; *) echo "$out" >&2; exit 1 ;; esac
+  case "$out" in *"is gone"*) echo "$out" >&2; exit 1 ;; esac
+}
+
+@test "disk-freed reports the disk gone once a successful listing no longer shows it" {
+  stub="$(mktemp -d)"
+  printf '#!/bin/sh\necho "Volid Format Type Size VMID"\necho "main-pool:vm-2-pvc-y raw images 1073741824 2"\n' > "$stub/ssh"
+  chmod +x "$stub/ssh"
+  out="$(PATH="$stub:$PATH" COZY_PVE_SSH=root@pve COZY_PROXMOX_STORAGE=main-pool "$RUNNER" disk-freed main-pool:vm-1-pvc-x 2>&1)"
+  rm -rf "$stub"
+  case "$out" in *"is gone from main-pool"*) ;; *) echo "$out" >&2; exit 1 ;; esac
+}
diff --git a/hack/proxmox-step1b-pod-match_test.bats b/hack/proxmox-step1b-pod-match_test.bats
new file mode 100755
index 0000000000..d211fa58cc
--- /dev/null
+++ b/hack/proxmox-step1b-pod-match_test.bats
@@ -0,0 +1,117 @@
+#!/usr/bin/env bats
+# -----------------------------------------------------------------------------
+# Step 1b of the proxmox pre-delete hook deletes the Pods that hold each tenant
+# claim, so the claims' pvc-protection finalizer can clear and the CSI driver
+# frees the disks before Step 2 removes it. A render test cannot see how the
+# loop behaves, because it never runs kubectl. These tests do: they render the
+# hook, cut the Pod loop out of it, and run it against a stub kubectl whose
+# `get pods` answers with the listing the loop asks for.
+#
+# The case that matters is a namespace where one Pod mounts two claims. A
+# JSONPath filter on the claim name fails there for every claim in the
+# namespace ("can only compare one element at a time"), kubectl prints nothing,
+# and no Pod is deleted; the listing-plus-shell-match form does not.
+# -----------------------------------------------------------------------------
+
+load test_helper
+
+# The legacy hack/cozytest.sh translator runs @test bodies as POSIX sh functions
+# and knows no setup/teardown; the tests stay compatible with it, so each test
+# calls prepare_loop and removes $work itself.
+prepare_loop() {
+    work=$(mktemp -d)
+    cat > "$work/vals.yaml" <<'VALS'
+substrate: proxmox
+_namespace:
+  etcd: etcd-test
+proxmox:
+  dnsServers: ["8.8.8.8"]
+  ipv4Config:
+    addresses: ["10.0.0.160-10.0.0.170"]
+    gateway: "10.0.0.1"
+    prefix: 24
+  ccm:
+    credentialsSecretName: proxmox-ccm-creds
+  csi:
+    enabled: true
+    credentialsSecretName: proxmox-csi-creds
+VALS
+    helm template test-k8s packages/apps/kubernetes -n tenant-test \
+        -f packages/apps/kubernetes/tests/values-ci.yaml -f "$work/vals.yaml" \
+        --show-only templates/delete.yaml > "$work/hook.yaml"
+    # The Job's script, as the container receives it.
+    yq -r 'select(.kind == "Job") | .spec.template.spec.containers[0].command[2]' \
+        "$work/hook.yaml" > "$work/script.sh"
+    # The Pod loop alone: from the second `echo "$pvcs" | while` to the `done`
+    # that closes it at the same indentation.
+    awk '
+        /echo "\$pvcs" \| while read -r pns pname pv; do/ { n++; if (n == 2) { grab = 1; indent = match($0, /[^ ]/) } }
+        grab { print }
+        grab && /^[ ]*done[ ]*$/ && match($0, /[^ ]/) == indent { exit }
+    ' "$work/script.sh" > "$work/loop.sh"
+    [ -s "$work/loop.sh" ] || { echo "could not cut the Pod loop out of the hook" >&2; exit 1; }
+
+    mkdir -p "$work/bin"
+    # Stub kubectl, faithful to client-go's JSONPath for the two forms the loop
+    # can use. `get pods` with the per-Pod listing prints one line per Pod: its
+    # name, then the claims it mounts. `get pods` with a claim-name filter does
+    # what kubectl does: as soon as any Pod mounts more than one claim, the
+    # filter's left side has several values and the whole expression fails with
+    # "can only compare one element at a time", printing nothing. `delete pod`
+    # records the Pod. Nothing else may be called from this loop.
+    cat > "$work/bin/kubectl" <<'STUB'
+#!/bin/sh
+case " $* " in
+  *" get pods "*)
+    case "$*" in
+      *'[?(@.spec.volumes'*)
+        if awk 'NF > 2 { found = 1 } END { exit !found }' "$PODS"; then
+          echo "error: error executing jsonpath: can only compare one element at a time" >&2
+          exit 1
+        fi
+        claim=$(printf '%s' "$*" | sed -n "s/.*claimName=='\([^']*\)'.*/\1/p")
+        awk -v c="$claim" '$2 == c { print $1 }' "$PODS" ;;
+      *) cat "$PODS" ;;
+    esac ;;
+  *" delete pod "*) prev=; for a in "$@"; do [ "$prev" = pod ] && echo "$a" >> "$DELETED"; prev=$a; done ;;
+  *) echo "unexpected kubectl call: $*" >&2; exit 3 ;;
+esac
+STUB
+    chmod +x "$work/bin/kubectl"
+    export PATH="$work/bin:$PATH" PODS="$work/pods" DELETED="$work/deleted"
+    : > "$DELETED"
+    printf '%s\n' "db-0 data-b wal-b" "web-0 data-a" "cfg-0  " > "$PODS"
+}
+
+
+run_loop_for() {
+    sh -c 'kubeconfig=/dev/null; pvcs=$1; . "$2"' _ "$1" "$work/loop.sh"
+}
+
+@test "deletes the Pod that mounts two claims, for either claim" {
+    prepare_loop
+    run_loop_for "app wal-b pv-1"
+    got=$(cat "$DELETED"); rm -rf "$work"
+    [ "$got" = "db-0" ]
+}
+
+@test "deletes a one-claim Pod in a namespace where another Pod mounts two" {
+    prepare_loop
+    run_loop_for "app data-a pv-2"
+    got=$(cat "$DELETED"); rm -rf "$work"
+    [ "$got" = "web-0" ]
+}
+
+@test "matches whole claim names only" {
+    prepare_loop
+    run_loop_for "app data pv-3"
+    got=$(cat "$DELETED"); rm -rf "$work"
+    [ -z "$got" ]
+}
+
+@test "leaves a Pod that mounts no claim alone" {
+    prepare_loop
+    run_loop_for "app data-b pv-4"
+    got=$(cat "$DELETED"); rm -rf "$work"
+    [ "$got" = "db-0" ]
+}
diff --git a/hack/proxmox-talos-template.sh b/hack/proxmox-talos-template.sh
new file mode 100755
index 0000000000..28440b3475
--- /dev/null
+++ b/hack/proxmox-talos-template.sh
@@ -0,0 +1,196 @@
+#!/bin/sh
+# Builds the Proxmox VM template a `substrate: proxmox` kubernetes-nodes pool
+# clones its workers from.
+#
+# The chart takes no image on that substrate: capmox clones whichever template
+# carries the pool's proxmox.templateTags, and the pool's talos.* values reach
+# only the installer written into the worker machineconfig. Nothing compares the
+# two, so the template is built here from the same talos.version and
+# talos.schematicID the chart renders, read from its values.yaml.
+#
+# Two images that look right are not:
+# - the platform release's nocloud-amd64.raw.xz is the bare-metal node image.
+#   Its zfs extension starts a service that waits for /dev/zfs, which a VM never
+#   has, so the Talos boot sequence never completes and the guest is rebooted
+#   when the boot timeout runs out (about 70 minutes on v1.13), over and over.
+# - the openstack image the kubevirt substrate imports ignores the nocloud ISO
+#   capmox hands the bootstrap data over on, and the worker never joins.
+#
+# The chart's default schematic carries qemu-guest-agent, whose service waits
+# the same way for the agent's virtio port. Proxmox adds that port only to a VM
+# with the agent enabled, so the template is created with it on.
+#
+# Usage:
+#   hack/proxmox-talos-template.sh print  <vmid> <storage>
+#   hack/proxmox-talos-template.sh create <vmid> <storage>
+#
+# print writes the program that create runs, for review. create runs it over
+# ssh on COZY_PVE_SSH (user@host), or on this machine when that is unset, which
+# then has to be a Proxmox VE node. The template is created on that node.
+#
+# Optional overrides:
+#   COZY_TALOS_VERSION, COZY_TALOS_SCHEMATIC_ID, COZY_TALOS_FACTORY_URL
+#     default to talos.version, talos.schematicID and talos.imageFactoryURL of
+#     packages/apps/kubernetes-nodes/values.yaml. A pool that overrides those
+#     needs a template built with the same values.
+#   COZY_TEMPLATE_TAGS       comma-separated, default
+#                            cozystack,talos,talos-<version>,schematic-<8 chars>
+#   COZY_TEMPLATE_DISK_SIZE  default 20G. capmox clones the disk at the size the
+#                            template has, so this is every worker's system disk.
+#   COZY_TEMPLATE_CPU        default x86-64-v2-AES. Talos needs x86-64-v2, which
+#                            the Proxmox default kvm64 does not provide.
+#   COZY_PVE_SSH_KEY         default ~/.ssh/id_ed25519
+set -eu
+
+VALUES="$(cd "$(dirname "$0")/.." && pwd)/packages/apps/kubernetes-nodes/values.yaml"
+
+die() { printf 'proxmox-talos-template: %s\n' "$*" >&2; exit 1; }
+
+usage() {
+  die "usage: $0 print|create <vmid> <storage>"
+}
+
+# The talos block of values.yaml is flat, two-space indented and quoted, so awk
+# reads it without making yq a requirement of an operator's workstation.
+chart_talos() {
+  awk -v key="$1" '
+    /^talos:/ { in_block = 1; next }
+    in_block && /^[^ #]/ { exit }
+    in_block && $1 == key ":" { v = $2; gsub(/"/, "", v); print v; exit }
+  ' "$VALUES"
+}
+
+# grep -x matches line by line, so a value with a newline in it would pass on
+# any one of its lines and carry the rest into the program as commands of their
+# own. Such a value is refused before grep sees it.
+matches() {
+  case $1 in *'
+'*) return 1 ;; esac
+  printf '%s' "$1" | grep -Eqx "$2"
+}
+
+[ $# -eq 3 ] || usage
+MODE=$1
+VMID=$2
+STORAGE=$3
+case "$MODE" in print|create) ;; *) usage ;; esac
+
+VERSION=${COZY_TALOS_VERSION:-$(chart_talos version)}
+SCHEMATIC=${COZY_TALOS_SCHEMATIC_ID:-$(chart_talos schematicID)}
+FACTORY=${COZY_TALOS_FACTORY_URL:-$(chart_talos imageFactoryURL)}
+FACTORY=${FACTORY%/}
+DISK_SIZE=${COZY_TEMPLATE_DISK_SIZE:-20G}
+CPU=${COZY_TEMPLATE_CPU:-x86-64-v2-AES}
+TAGS=${COZY_TEMPLATE_TAGS:-cozystack,talos,talos-$VERSION,schematic-$(printf '%s' "$SCHEMATIC" | cut -c1-8)}
+
+# Every value below is pasted into a program that runs as root on the
+# hypervisor, so each is held to the shape it is expected to have.
+matches "$VMID" '[1-9][0-9]{2,8}' || die "vmid $VMID is not a Proxmox VM id (100-999999999)"
+matches "$STORAGE" '[A-Za-z][A-Za-z0-9_.-]*' || die "storage $STORAGE is not a Proxmox storage id"
+# The shape the chart's render accepts for talos.version, pre-releases included.
+matches "$VERSION" 'v[0-9]+\.[0-9]+\.[0-9]+(-[0-9a-z.]+)?' || die "Talos version '$VERSION' is not vMAJOR.MINOR.PATCH with an optional pre-release suffix"
+matches "$SCHEMATIC" '[0-9a-f]{64}' || die "schematic '$SCHEMATIC' is not an Image Factory schematic id"
+matches "$FACTORY" 'https?://[A-Za-z0-9.-]+(:[0-9]+)?(/[A-Za-z0-9._~/-]*)?' || die "factory URL '$FACTORY' is not a plain http(s) URL"
+matches "$DISK_SIZE" '[1-9][0-9]*G' || die "disk size $DISK_SIZE is not a whole number of gigabytes such as 20G"
+matches "$CPU" '[A-Za-z0-9_.+-]+' || die "cpu type $CPU is not a Proxmox CPU model name"
+
+# capmox lowercases the selector and compares it with the template's tags as a
+# set, so the tags are normalised the same way before they are checked and
+# written, and the selector printed at the end is exactly what will match. The
+# split is on commas only: a newline would split a tag the operator meant whole.
+case $TAGS in *'
+'*) die "template tags are comma-separated and may not contain a newline" ;; esac
+TAG_SET=$(printf '%s\n' "$TAGS" | tr ',' '\n' | tr '[:upper:]' '[:lower:]' | sed '/^$/d' | LC_ALL=C sort -u)
+[ -n "$TAG_SET" ] || die "the template needs at least one tag"
+bad=$(printf '%s\n' "$TAG_SET" | grep -Evx '[a-z0-9_][a-z0-9_+.-]*' || true)
+[ -z "$bad" ] || die "not a valid Proxmox tag: $(printf '%s' "$bad" | paste -sd ' ' -)"
+PVE_TAGS=$(printf '%s\n' "$TAG_SET" | paste -sd ';' -)
+
+URL="$FACTORY/image/$SCHEMATIC/$VERSION/nocloud-amd64.raw.xz"
+NAME="talos-$VERSION-$(printf '%s' "$SCHEMATIC" | cut -c1-8)"
+
+program() {
+  cat <<EOF
+set -eu
+VMID=$VMID
+STORAGE=$STORAGE
+URL='$URL'
+NAME='$NAME'
+TAGS='$PVE_TAGS'
+DISK_SIZE=$DISK_SIZE
+CPU='$CPU'
+EOF
+  cat <<'EOF'
+if ! command -v qm >/dev/null || ! command -v pvesh >/dev/null; then
+  echo "this is not a Proxmox VE node: qm and pvesh are missing" >&2
+  exit 1
+fi
+
+# nextid answers with the id only when no VM in the cluster holds it.
+pvesh get /cluster/nextid --vmid "$VMID" >/dev/null
+
+# capmox requires exactly one template with the selector's tag set across the
+# whole cluster and reports "found 2 VM templates" otherwise, so a second
+# template with the same set would stop every pool that selects it.
+same=$(pvesh get /cluster/resources --type vm --output-format json | perl -MJSON::PP -e '
+  my $want = shift;
+  local $/;
+  for my $vm (@{ JSON::PP->new->decode(<STDIN>) }) {
+    next unless $vm->{template} && defined $vm->{tags};
+    my %t = map { lc($_) => 1 } grep { length } split /;/, $vm->{tags};
+    print "$vm->{vmid} ($vm->{name}) on $vm->{node}\n" if join(";", sort keys %t) eq $want;
+  }' "$TAGS")
+if [ -n "$same" ]; then
+  echo "a template already carries the tags $TAGS: $same" >&2
+  exit 1
+fi
+
+work=$(mktemp -d "${TMPDIR:-/var/tmp}/talos-template.XXXXXX")
+trap 'rm -rf "$work"' EXIT
+curl -fL --retry 3 -o "$work/disk.raw.xz" "$URL"
+xz -d "$work/disk.raw.xz"
+
+# The layout of the templates the Proxmox substrate was verified on. No NIC:
+# capmox writes net0 from the pool's proxmox.network on every clone.
+qm create "$VMID" --name "$NAME" --tags "$TAGS" --ostype l26 \
+  --cpu "$CPU" --sockets 1 --cores 2 --memory 4096 \
+  --bios ovmf --efidisk0 "$STORAGE:1,efitype=4m,pre-enrolled-keys=0" \
+  --scsihw virtio-scsi-pci \
+  --scsi0 "$STORAGE:0,import-from=$work/disk.raw,cache=none,discard=on,ssd=1" \
+  --boot order=scsi0 --serial0 socket --vga std \
+  --agent enabled=1
+# A failure from here on leaves a VM holding the id, and the nextid check above
+# stops the next run until it is gone.
+qm disk resize "$VMID" scsi0 "$DISK_SIZE" && qm template "$VMID" || {
+  echo "VM $VMID was created but is not a template; remove it with: qm destroy $VMID" >&2
+  exit 1
+}
+qm config "$VMID"
+EOF
+}
+
+if [ "$MODE" = print ]; then
+  program
+  exit 0
+fi
+
+if [ -n "${COZY_PVE_SSH:-}" ]; then
+  program | ssh -o BatchMode=yes -o StrictHostKeyChecking=accept-new \
+    -i "${COZY_PVE_SSH_KEY:-$HOME/.ssh/id_ed25519}" "$COZY_PVE_SSH" sh -s
+else
+  program | sh -s
+fi
+
+cat <<EOF
+
+Template $VMID ($NAME) is ready. A pool clones it with:
+
+  talos:
+    version: "$VERSION"
+    schematicID: "$SCHEMATIC"
+  proxmox:
+    templateTags:
+EOF
+for tag in $TAG_SET; do
+  printf '      - "%s"\n' "$tag"
+done
diff --git a/hack/proxmox-talos-template_test.bats b/hack/proxmox-talos-template_test.bats
new file mode 100644
index 0000000000..8cf3540db2
--- /dev/null
+++ b/hack/proxmox-talos-template_test.bats
@@ -0,0 +1,161 @@
+#!/usr/bin/env bats
+# hack/proxmox-talos-template.sh builds the VM template a proxmox kubernetes-nodes
+# pool clones. Nothing at render time can see what the template carries, so what
+# the script writes is pinned here: the image is the chart's own talos.* in its
+# nocloud flavour, the agent the default schematic waits for is enabled, and the
+# tag set capmox selects on is checked before anything is downloaded.
+
+load test_helper
+
+REPO_ROOT="$(cd "$(dirname "${BATS_TEST_FILENAME:-$0}")/.." && pwd)"
+SCRIPT="$REPO_ROOT/hack/proxmox-talos-template.sh"
+VALUES="$REPO_ROOT/packages/apps/kubernetes-nodes/values.yaml"
+
+chart() { sed -n "/^talos:/,/^[^ #]/s/^  $1: \"\(.*\)\"$/\1/p" "$VALUES"; }
+
+# Stubs for the hypervisor side of the program. Each call to qm and curl is
+# logged, so a test can tell what ran and, as importantly, what did not.
+stub_pve() {
+  stub="$1"
+  printf '#!/bin/sh\necho "qm $*" >> "%s/calls"\n' "$stub" > "$stub/qm"
+  cat > "$stub/pvesh" <<EOF
+#!/bin/sh
+case "\$2" in
+  /cluster/nextid) echo "\$4" ;;
+  /cluster/resources) cat "$stub/resources.json" ;;
+esac
+EOF
+  cat > "$stub/curl" <<EOF
+#!/bin/sh
+echo "curl \$*" >> "$stub/calls"
+while [ \$# -gt 0 ]; do [ "\$1" = -o ] && : > "\$2"; shift; done
+EOF
+  printf '#!/bin/sh\nmv "$2" "${2%%.xz}"\n' > "$stub/xz"
+  chmod +x "$stub/qm" "$stub/pvesh" "$stub/curl" "$stub/xz"
+  : > "$stub/calls"
+}
+
+@test "the template image is the chart's talos schematic and version, in the nocloud flavour" {
+  out="$("$SCRIPT" print 9002 main-pool)"
+  url="$(chart imageFactoryURL)/image/$(chart schematicID)/$(chart version)/nocloud-amd64.raw.xz"
+  printf '%s' "$out" | grep -qxF "URL='$url'"
+  if printf '%s' "$out" | grep -q openstack; then echo "FAIL: the template must not be the openstack image"; false; fi
+}
+
+@test "the template enables the guest agent whose port the default schematic waits for" {
+  "$SCRIPT" print 9002 main-pool | grep -qE -- '--agent enabled=1$'
+}
+
+@test "the default tags name the version and the schematic, in the order Proxmox stores them" {
+  out="$("$SCRIPT" print 9002 main-pool)"
+  want="TAGS='cozystack;schematic-$(chart schematicID | cut -c1-8);talos;talos-$(chart version)'"
+  printf '%s' "$out" | grep -qxF "$want"
+}
+
+@test "given tags are lowercased, deduplicated and sorted the way capmox compares them" {
+  out="$(COZY_TEMPLATE_TAGS='Talos,cozystack,,talos,Pool-A' "$SCRIPT" print 9002 main-pool)"
+  printf '%s' "$out" | grep -qxF "TAGS='cozystack;pool-a;talos'"
+}
+
+@test "an override of the talos values reaches the image URL" {
+  sid=376567988ad370138ad8b2698212367b8edcb69b5fd68c80be1f2ec7d603b4ba
+  out="$(COZY_TALOS_VERSION=v1.14.2 COZY_TALOS_SCHEMATIC_ID=$sid COZY_TALOS_FACTORY_URL=https://factory.example:8080/ "$SCRIPT" print 9002 main-pool)"
+  printf '%s' "$out" | grep -qxF "URL='https://factory.example:8080/image/$sid/v1.14.2/nocloud-amd64.raw.xz'"
+}
+
+@test "values that would land in the root program unchecked are refused" {
+  nl='
+'
+  for pair in "9002;id|main-pool" "99|main-pool" "9002|main pool" "9002|main'pool" \
+    "9002${nl}id|main-pool" "9002|main-pool${nl}id"; do
+    vmid="${pair%%|*}"
+    storage="${pair#*|}"
+    rc=0
+    out="$("$SCRIPT" print "$vmid" "$storage" 2>&1)" || rc=$?
+    [ "$rc" -ne 0 ] || { echo "accepted: $pair" >&2; exit 1; }
+    case "$out" in *"set -eu"*) echo "printed a program for: $pair" >&2; exit 1 ;; esac
+  done
+  rc=0; COZY_TALOS_VERSION='v1.13.6;id' "$SCRIPT" print 9002 main-pool >/dev/null 2>&1 || rc=$?
+  [ "$rc" -ne 0 ]
+  rc=0; COZY_TALOS_SCHEMATIC_ID='ce4c9805' "$SCRIPT" print 9002 main-pool >/dev/null 2>&1 || rc=$?
+  [ "$rc" -ne 0 ]
+  rc=0; COZY_TEMPLATE_DISK_SIZE="20G${nl}id" "$SCRIPT" print 9002 main-pool >/dev/null 2>&1 || rc=$?
+  [ "$rc" -ne 0 ]
+  rc=0; COZY_TEMPLATE_TAGS="talos,it's" "$SCRIPT" print 9002 main-pool >/dev/null 2>&1 || rc=$?
+  [ "$rc" -ne 0 ]
+  rc=0; COZY_TEMPLATE_TAGS="talos-v1.${nl}13,cozystack" "$SCRIPT" print 9002 main-pool >/dev/null 2>&1 || rc=$?
+  [ "$rc" -ne 0 ]
+}
+
+@test "a pre-release Talos version the chart accepts gets a template" {
+  out="$(COZY_TALOS_VERSION=v1.13.6-beta.1 "$SCRIPT" print 9002 main-pool)"
+  printf '%s' "$out" | grep -qF "/v1.13.6-beta.1/nocloud-amd64.raw.xz'"
+  printf '%s' "$out" | grep -qxF "NAME='talos-v1.13.6-beta.1-$(chart schematicID | cut -c1-8)'"
+}
+
+@test "a template already carrying the same tag set stops the program before the download" {
+  stub="$(mktemp -d)"
+  stub_pve "$stub"
+  printf '[{"vmid":9000,"name":"old","node":"pve1","template":1,"tags":"talos-v1.13.6;Talos;schematic-%s;cozystack"}]' \
+    "$(chart schematicID | cut -c1-8)" > "$stub/resources.json"
+  rc=0
+  out="$("$SCRIPT" print 9002 main-pool | PATH="$stub:$PATH" TMPDIR="$stub" sh 2>&1)" || rc=$?
+  calls="$(cat "$stub/calls")"
+  [ "$rc" -ne 0 ]
+  case "$out" in *"already carries"*"9000 (old) on pve1"*) ;; *) echo "$out" >&2; exit 1 ;; esac
+  [ -z "$calls" ] || { echo "$calls" >&2; exit 1; }
+  rm -rf "$stub"
+}
+
+@test "a template whose tags are a superset does not count, and the template is built" {
+  stub="$(mktemp -d)"
+  stub_pve "$stub"
+  printf '[{"vmid":9000,"name":"old","node":"pve1","template":1,"tags":"cozystack;schematic-%s;talos;talos-v1.13.6;zfs"},{"vmid":101,"name":"vm","node":"pve1","template":0}]' \
+    "$(chart schematicID | cut -c1-8)" > "$stub/resources.json"
+  "$SCRIPT" print 9002 main-pool | PATH="$stub:$PATH" TMPDIR="$stub" sh >/dev/null
+  calls="$(cat "$stub/calls")"
+  printf '%s\n' "$calls" | grep -q '^curl .*/nocloud-amd64.raw.xz$'
+  printf '%s\n' "$calls" | grep -qE '^qm create 9002 .*--scsi0 main-pool:0,import-from=[^ ]*/disk.raw,'
+  printf '%s\n' "$calls" | grep -qx 'qm disk resize 9002 scsi0 20G'
+  printf '%s\n' "$calls" | grep -qx 'qm template 9002'
+  rm -rf "$stub"
+}
+
+@test "a VM left behind by a failed conversion is named with the command that removes it" {
+  stub="$(mktemp -d)"
+  stub_pve "$stub"
+  printf '#!/bin/sh\necho "qm $*" >> "%s/calls"\n[ "$1" != template ]\n' "$stub" > "$stub/qm"
+  echo '[]' > "$stub/resources.json"
+  rc=0
+  out="$("$SCRIPT" print 9002 main-pool | PATH="$stub:$PATH" TMPDIR="$stub" sh 2>&1)" || rc=$?
+  calls="$(cat "$stub/calls")"
+  [ "$rc" -ne 0 ]
+  printf '%s\n' "$calls" | grep -qx 'qm template 9002'
+  case "$out" in *"remove it with: qm destroy 9002"*) ;; *) echo "$out" >&2; exit 1 ;; esac
+  rm -rf "$stub"
+}
+
+@test "create runs the printed program on the hypervisor over ssh and prints the pool's selector" {
+  stub="$(mktemp -d)"
+  printf '#!/bin/sh\necho "$*" > "%s/args"\ncat > "%s/stdin"\n' "$stub" "$stub" > "$stub/ssh"
+  chmod +x "$stub/ssh"
+  out="$(PATH="$stub:$PATH" COZY_PVE_SSH=root@pve "$SCRIPT" create 9002 main-pool)"
+  args="$(cat "$stub/args")"
+  sent="$(cat "$stub/stdin")"
+  case "$args" in *"root@pve sh -s") ;; *) echo "$args" >&2; exit 1 ;; esac
+  [ "$sent" = "$("$SCRIPT" print 9002 main-pool)" ]
+  printf '%s' "$out" | grep -qxF '      - "talos-'"$(chart version)"'"'
+  printf '%s' "$out" | grep -qxF '    schematicID: "'"$(chart schematicID)"'"'
+  rm -rf "$stub"
+}
+
+@test "create fails when the hypervisor program fails, and prints no selector" {
+  stub="$(mktemp -d)"
+  printf '#!/bin/sh\ncat >/dev/null\necho "ssh: connect to host pve: Connection refused" >&2\nexit 255\n' > "$stub/ssh"
+  chmod +x "$stub/ssh"
+  rc=0
+  out="$(PATH="$stub:$PATH" COZY_PVE_SSH=root@pve "$SCRIPT" create 9002 main-pool 2>&1)" || rc=$?
+  [ "$rc" -ne 0 ]
+  case "$out" in *templateTags*) echo "$out" >&2; exit 1 ;; esac
+  rm -rf "$stub"
+}
diff --git a/hack/proxmox-teardown-contract.bats b/hack/proxmox-teardown-contract.bats
new file mode 100644
index 0000000000..0601ea76ce
--- /dev/null
+++ b/hack/proxmox-teardown-contract.bats
@@ -0,0 +1,111 @@
+#!/usr/bin/env bats
+
+# The Proxmox lane runs on a self-hosted runner that has credentials of its own,
+# and its Tear down deletes a tenant whose VMs live on a shared hypervisor. Two
+# ways it can go wrong silently: deleting through a kubeconfig that falls back
+# to the runner's own cluster, and exiting 0 while the tenant it should have
+# removed is still live. These tests run the Stage and Tear down scripts out of
+# the workflow against a stub kubectl, so they pin what the steps do rather than
+# how they are spelled.
+
+load test_helper
+
+REPO_ROOT="$(cd "$(dirname "${BATS_TEST_FILENAME:-$0}")/.." && pwd)"
+WORKFLOW="$REPO_ROOT/.github/workflows/e2e-proxmox.yaml"
+
+setup() {
+  strict_setup
+  export GITHUB_WORKSPACE="$BATS_TEST_TMPDIR/ws" RUNNER_TEMP="$BATS_TEST_TMPDIR/tmp"
+  mkdir -p "$GITHUB_WORKSPACE" "$RUNNER_TEMP" "$BATS_TEST_TMPDIR/bin"
+  export COZY_PROXMOX_NS=tenant-e2eproxmox COZY_PVE_SSH_KEY="$BATS_TEST_TMPDIR/ssh-key"
+  export KUBECTL_LOG="$BATS_TEST_TMPDIR/kubectl.log"
+  : > "$KUBECTL_LOG"
+  # `config view` prints $STUB_SERVER, or fails with $STUB_ERR on stderr when
+  # it is empty, the two shapes kubectl answers the guard with. A call matching
+  # $STUB_FAIL fails; every other call is only recorded.
+  cat > "$BATS_TEST_TMPDIR/bin/kubectl" <<'EOF'
+#!/usr/bin/env bash
+printf '%s\n' "$*" >> "$KUBECTL_LOG"
+if [ -n "${STUB_FAIL:-}" ] && [[ "$*" == *"$STUB_FAIL"* ]]; then exit 1; fi
+case "$*" in
+  *"config view"*)
+    if [ -n "${STUB_SERVER:-}" ]; then printf '%s' "$STUB_SERVER"; else echo "$STUB_ERR" >&2; exit 1; fi ;;
+esac
+EOF
+  chmod +x "$BATS_TEST_TMPDIR/bin/kubectl"
+  export PATH="$BATS_TEST_TMPDIR/bin:$PATH"
+  export STUB_SERVER="" STUB_ERR="error loading config file: did not find expected node content"
+}
+
+step_field() {
+  yq -r ".jobs.e2e.steps[] | select(.name == \"$1\") | $2" "$WORKFLOW"
+}
+
+run_step() {
+  local script
+  script="$(step_field "$1" .run)"
+  [ -n "$script" ]
+  run bash -c "$script"
+}
+
+@test "Tear down takes Stage's outcome from the Stage step itself" {
+  [ "$(step_field 'Stage credentials' .id)" = stage ]
+  [ "$(step_field 'Tear down' .env.STAGE_OUTCOME)" = '${{ steps.stage.outcome }}' ]
+}
+
+@test "the suite reaches the stand through the staged kubeconfig" {
+  [ "$(step_field 'Run the Proxmox suite' .env.KUBECONFIG)" = '${{ github.workspace }}/.kubeconfig' ]
+}
+
+@test "Tear down skips with exit 0 when Stage did not succeed" {
+  for outcome in failure skipped cancelled; do
+    STAGE_OUTCOME="$outcome" run_step "Tear down"
+    [ "$status" -eq 0 ]
+    [[ "$output" == *"::notice::Tear down skipped"* ]]
+  done
+  [ ! -s "$KUBECTL_LOG" ]
+}
+
+@test "Tear down fails and shows kubectl's error when Stage succeeded but the kubeconfig no longer resolves" {
+  STAGE_OUTCOME=success run_step "Tear down"
+  [ "$status" -eq 1 ]
+  [[ "$output" == *"::error::"* ]]
+  [[ "$output" == *"$STUB_ERR"* ]]
+  if grep -q ' delete ' "$KUBECTL_LOG"; then echo "FAIL: deleted without a resolvable kubeconfig"; false; fi
+}
+
+@test "Tear down deletes through the staged kubeconfig when it resolves" {
+  STUB_SERVER=https://192.0.2.10:6443 STAGE_OUTCOME=success run_step "Tear down"
+  [ "$status" -eq 0 ]
+  [ "$(grep -c ' delete ' "$KUBECTL_LOG")" -eq 3 ]
+  if grep -v -- "--kubeconfig $GITHUB_WORKSPACE/.kubeconfig " "$KUBECTL_LOG"; then
+    echo "FAIL: a kubectl call above does not name the staged kubeconfig"; false
+  fi
+}
+
+@test "Tear down runs every delete after one fails, and then fails" {
+  for target in " delete kubernetesnodes" " delete kubernetes.apps" " delete tenant"; do
+    : > "$KUBECTL_LOG"
+    STUB_FAIL="$target" STUB_SERVER=https://192.0.2.10:6443 STAGE_OUTCOME=success run_step "Tear down"
+    [ "$status" -eq 1 ]
+    [ "$(grep -c ' delete ' "$KUBECTL_LOG")" -eq 3 ]
+  done
+}
+
+@test "Stage refuses a kubeconfig that does not resolve and shows kubectl's error" {
+  export KUBECONFIG_B64="" PVE_SSH_KEY="" PVE_TOKEN_ID="" PVE_TOKEN_SECRET="" PVE_URL="" PVE_REGION=""
+  run_step "Stage credentials"
+  [ "$status" -eq 1 ]
+  [[ "$output" == *"$STUB_ERR"* ]]
+  if grep -qv 'config view' "$KUBECTL_LOG"; then echo "FAIL: Stage went past the guard"; false; fi
+}
+
+@test "Stage writes the stand's Secret through the staged kubeconfig when it resolves" {
+  export KUBECONFIG_B64="" PVE_SSH_KEY="" PVE_TOKEN_ID="" PVE_TOKEN_SECRET="" PVE_URL="" PVE_REGION=""
+  STUB_SERVER=https://192.0.2.10:6443 run_step "Stage credentials"
+  [ "$status" -eq 0 ]
+  [ "$(grep -c ' apply ' "$KUBECTL_LOG")" -eq 2 ]
+  if grep -v -- "--kubeconfig $GITHUB_WORKSPACE/.kubeconfig " "$KUBECTL_LOG"; then
+    echo "FAIL: a kubectl call above does not name the staged kubeconfig"; false
+  fi
+}
diff --git a/hack/redis-backup-demo-helpers.bats b/hack/redis-backup-demo-helpers.bats
new file mode 100644
index 0000000000..bbc9fdaa35
--- /dev/null
+++ b/hack/redis-backup-demo-helpers.bats
@@ -0,0 +1,103 @@
+#!/usr/bin/env bats
+# Unit tests for redis_cmd in examples/backups/redis/00-helpers.sh, the helper
+# the redis-2-backup-roundtrip suite reads and writes its marker key through.
+#
+# kubectl and redis-cli are stub executables on PATH. The kubectl stub accepts
+# exactly the calls the helper is expected to make and runs an exec'd script
+# locally with the redis-cli stub, so the in-Pod shell is exercised too. Any
+# other kubectl call, a throwaway `kubectl run` Pod among them, fails the test.
+#
+# The helpers are Bash and this runner is POSIX sh, so each case drives them
+# through `bash -c` under the same `set -euo pipefail` the demo scripts use.
+# The two helper functions close on an indented brace because the runner
+# rewrites a column-0 `}` into `return 0`, which would mask run_redis_cmd's
+# exit status.
+
+load test_helper
+
+make_stubs() {
+    stub=$(mktemp -d)
+    cat > "$stub/kubectl" <<'EOF'
+#!/bin/bash
+printf '%s\n' "$*" >> "$STUB_DIR/kubectl.argv"
+if [ "$*" = "-n tenant-root get secret redis-demo-auth --ignore-not-found -o jsonpath={.data.password}" ]; then
+    printf '%s' "${STUB_PW_B64:-}"
+    exit 0
+fi
+if [ "$1 $2 $3 $4 $5 $6 $7 $8 $9 ${10}" != "-n tenant-root exec -i deploy/rfs-redis-demo -c sentinel -- sh -c" ]; then
+    echo "unexpected kubectl call: $*" >&2
+    exit 97
+fi
+if [ -n "${STUB_EXEC_ERROR:-}" ]; then
+    echo "$STUB_EXEC_ERROR" >&2
+    exit 1
+fi
+shift 10
+script=$1
+shift
+exec sh -c "$script" "$@"
+EOF
+    cat > "$stub/redis-cli" <<'EOF'
+#!/bin/sh
+if [ "$*" = "-p 26379 sentinel get-master-addr-by-name mymaster" ]; then
+    [ -n "${STUB_NO_MASTER:-}" ] || printf '10.0.0.5\n6379\n'
+    exit 0
+fi
+printf '%s|%s\n' "${REDISCLI_AUTH-unset}" "$*" >> "$STUB_DIR/redis-cli.calls"
+printf 'reply-value\n'
+EOF
+    chmod +x "$stub/kubectl" "$stub/redis-cli"
+    : > "$stub/kubectl.argv"
+    : > "$stub/redis-cli.calls"
+    }
+
+run_redis_cmd() {
+    STUB_DIR=$stub PATH="$stub:$PATH" NAMESPACE=tenant-root bash -c '
+        set -euo pipefail
+        . examples/backups/redis/00-helpers.sh
+        redis_cmd demo "$@"
+    ' bash "$@"
+    }
+
+@test "redis_cmd reads the reply through exec and passes the password on stdin" {
+    make_stubs
+    export STUB_PW_B64
+    STUB_PW_B64=$(printf 's3cret' | base64)
+    out=$(run_redis_cmd GET sentinel:marker)
+    [ "$out" = "reply-value" ]
+    [ "$(cat "$stub/redis-cli.calls")" = "s3cret|-h 10.0.0.5 -p 6379 GET sentinel:marker" ]
+    if grep -q s3cret "$stub/kubectl.argv"; then
+        echo "the password reached kubectl's argv" >&2
+        exit 1
+    fi
+}
+
+@test "redis_cmd sends no AUTH when the app has no password Secret" {
+    make_stubs
+    out=$(run_redis_cmd SET sentinel:marker v1)
+    [ "$out" = "reply-value" ]
+    [ "$(cat "$stub/redis-cli.calls")" = "unset|-h 10.0.0.5 -p 6379 SET sentinel:marker v1" ]
+}
+
+@test "redis_cmd fails with kubectl's own error when the exec fails" {
+    make_stubs
+    err=$(mktemp)
+    export STUB_EXEC_ERROR="error: unable to upgrade connection: container not found"
+    if run_redis_cmd GET sentinel:marker 2>"$err"; then
+        echo "a failed exec read as a successful empty reply" >&2
+        exit 1
+    fi
+    grep -q 'unable to upgrade connection: container not found' "$err"
+}
+
+@test "redis_cmd fails when the sentinel names no master" {
+    make_stubs
+    err=$(mktemp)
+    export STUB_NO_MASTER=1
+    if run_redis_cmd GET sentinel:marker 2>"$err"; then
+        echo "a sentinel with no master read as a successful reply" >&2
+        exit 1
+    fi
+    grep -q 'sentinel knows no master for mymaster' "$err"
+    [ ! -s "$stub/redis-cli.calls" ]
+}
diff --git a/hack/redis-backup-strategy.bats b/hack/redis-backup-strategy.bats
new file mode 100644
index 0000000000..361d5d543a
--- /dev/null
+++ b/hack/redis-backup-strategy.bats
@@ -0,0 +1,164 @@
+#!/usr/bin/env bats
+# Behavioural tests for the shipped Redis backup/restore strategy script,
+# extracted from the rendered cozy-default-redis Strategy CR and EXECUTED with
+# stubbed redis-cli / curl. helm-unittest (tests/strategy_redis_test.yaml) pins
+# the chart's render-time decisions (volumes, env, deadline); the script's own
+# behaviour — which mode reaches which command — is a contract between the
+# running Pod, Redis and S3, so it is exercised here rather than string-matched.
+#
+# The load-bearing case is cleanup: a deleted Backup renders MODE=cleanup, and
+# it must delete the object and NEVER reach the restore path's FLUSHALL against
+# the live master. Blanking the object key or breaking the rfs-redis- sentinel
+# prefix is caught the same way — by what the stubs are actually called with.
+#
+# Run from the repo root with make bats-unit-tests. To retain compatibility
+# with cozytest, assertions precede inline cleanup: its translator would
+# replace a final assertion's status with return 0 at a lone closing brace.
+#
+# The rendered script is run with `bash`, not `sh`: it opens `set -euo
+# pipefail`, which the production image's busybox ash supports but the CI
+# runner's /bin/sh (dash) rejects at line 1. bash matches ash's pipefail
+# semantics; same reason hack/migration-50-etcd-adopt.bats runs its script
+# with bash.
+
+load test_helper
+
+CHART=packages/system/backupstrategy-controller
+
+# Render the shipped strategy's in-Pod script into $1, substitute the
+# controller-render placeholders (Mode, Release.Name, ObjectKey, Release.Prefix)
+# with the given values ($2 mode, $3 app, $4 object key, $6 chart prefix,
+# redis- by default), and rebind every absolute path it touches into $5 so it
+# runs unprivileged. An empty render is an early failure, as is a placeholder
+# left unsubstituted, and no real /etc or /tmp path may survive the rebinding —
+# these tests EXECUTE the script.
+render_script() {
+  out=$1; mode=$2; app=$3; key=$4; sandbox=$5; prefix=${6:-redis-}
+  mkdir -p "$sandbox/redis-ca" "$sandbox/s3-ca" "$sandbox/restore"
+  helm template t "$CHART" -n cozy-backup-controller \
+    --set backupStorage.bucketNameOverride=test-bucket 2>/dev/null \
+    | yq eval 'select(.kind == "Redis") | .spec.template.spec.containers[0].args[0]' - \
+    | sed -e "s#{{ .Mode }}#${mode}#g" \
+          -e "s#{{ .Release.Prefix | default \"redis-\" }}#${prefix}#g" \
+          -e "s#{{ .Release.Name }}#${app}#g" \
+          -e "s#{{ .ObjectKey }}#${key}#g" \
+          -e "s#/etc/redis-ca#${sandbox}/redis-ca#g" \
+          -e "s#/etc/s3-ca#${sandbox}/s3-ca#g" \
+          -e "s#/tmp/restore#${sandbox}/restore#g" \
+          -e "s#/tmp/dump.rdb#${sandbox}/dump.rdb#g" > "$out"
+  [ -s "$out" ] || return 1
+  if grep -q '{{' "$out"; then
+    echo "rendered script still holds a controller placeholder" >&2
+    return 1
+  fi
+  # The exact absolute paths the rebinding above replaces; a survivor means the
+  # script grew a new one and the test would touch the real filesystem. Matched
+  # literally (not a bare /tmp/, which the sandbox itself lives under in CI).
+  if grep -qE '/etc/redis-ca|/etc/s3-ca|/tmp/dump\.rdb|/tmp/restore' "$out"; then
+    echo "rendered script still references a real /etc or /tmp path after rebinding" >&2
+    return 1
+  fi
+}
+
+# redis-cli / curl stubs that log every invocation, put first on PATH. The
+# sentinel query answers with a master addr so backup/restore proceed; nothing
+# actually talks to Redis or S3.
+make_stubs() {
+  bin=$1; rclog=$2; curllog=$3
+  mkdir -p "$bin"
+  cat > "$bin/redis-cli" <<STUB
+#!/bin/sh
+echo "\$*" >> "$rclog"
+case "\$*" in
+  *"get-master-addr-by-name"*) printf '127.0.0.1\n6379\n' ;;
+  *"INFO persistence"*) printf 'aof_rewrite_in_progress:0\naof_last_bgrewrite_status:ok\n' ;;
+esac
+exit 0
+STUB
+  cat > "$bin/curl" <<STUB
+#!/bin/sh
+echo "\$*" >> "$curllog"
+# Cleanup asks for the HTTP status with -w; a 204 is a successful delete.
+case "\$*" in *"-w %{http_code}"*|*"-w"*) echo 204 ;; esac
+exit 0
+STUB
+  cat > "$bin/redis-server" <<'STUB'
+#!/bin/sh
+exit 0
+STUB
+  chmod 0755 "$bin/redis-cli" "$bin/curl" "$bin/redis-server"
+}
+
+s3_env() {
+  export S3_ENDPOINT=s3.example.com S3_BUCKET=bkt S3_REGION=us-east-1
+  export AWS_ACCESS_KEY_ID=ak AWS_SECRET_ACCESS_KEY=sk S3_INSECURE_SKIP_VERIFY=false
+}
+
+@test "an empty render fails the fixture instead of passing as a no-op" {
+  tmp=$(mktemp -d)
+  CHART=$tmp/no-such-chart
+  if render_script "$tmp/s.sh" cleanup app key "$tmp/sb" 2>/dev/null; then
+    echo "FAIL: render_script reported success with no chart"
+    false
+  fi
+}
+
+@test "cleanup deletes the object and never FLUSHALLs the live master" {
+  tmp=$(mktemp -d)
+  make_stubs "$tmp/bin" "$tmp/rc.log" "$tmp/curl.log"
+  render_script "$tmp/s.sh" cleanup myapp "tenant-x/myapp/bkp-42.rdb" "$tmp/sb"
+  s3_env
+  PATH="$tmp/bin:$PATH" bash "$tmp/s.sh"
+  # A DELETE against exactly this backup's object.
+  grep -q -- '-X DELETE' "$tmp/curl.log"
+  grep -q 'tenant-x/myapp/bkp-42.rdb' "$tmp/curl.log"
+  # The destructive branch must be unreachable in cleanup: no FLUSHALL, no
+  # --pipe, and in fact no Redis contact at all. This is the assertion the
+  # round's cleanup arm exists to hold.
+  if grep -qi 'FLUSHALL' "$tmp/rc.log"; then echo "FAIL: cleanup must not flush the master"; false; fi
+  if grep -q -- '--pipe' "$tmp/rc.log"; then echo "FAIL: cleanup must not pipe a restore into the master"; false; fi
+  [ ! -s "$tmp/rc.log" ]
+}
+
+@test "backup resolves rfs-redis-<app> and uploads under the recorded object key" {
+  tmp=$(mktemp -d)
+  make_stubs "$tmp/bin" "$tmp/rc.log" "$tmp/curl.log"
+  render_script "$tmp/s.sh" backup myapp "tenant-x/myapp/bkp-42.rdb" "$tmp/sb"
+  s3_env
+  PATH="$tmp/bin:$PATH" bash "$tmp/s.sh"
+  # Sentinel host carries the rfs-redis- prefix owned by the redis chart.
+  grep -q -- '-h rfs-redis-myapp -p 26379' "$tmp/rc.log"
+  grep -q 'get-master-addr-by-name mymaster' "$tmp/rc.log"
+  # The RDB is uploaded to exactly the recorded object key, so a Plan keeps one
+  # object per run.
+  grep -q -- '-X PUT' "$tmp/curl.log"
+  grep -q 'tenant-x/myapp/bkp-42.rdb' "$tmp/curl.log"
+  # Backup must never wipe the source.
+  if grep -qi 'FLUSHALL' "$tmp/rc.log"; then echo "FAIL: backup must not flush the source"; false; fi
+}
+
+@test "a Valkey backup resolves rfs-valkey-<app>, the valkey chart's sentinel" {
+  tmp=$(mktemp -d)
+  make_stubs "$tmp/bin" "$tmp/rc.log" "$tmp/curl.log"
+  render_script "$tmp/s.sh" backup myapp "tenant-x/myapp/bkp-42.rdb" "$tmp/sb" valkey-
+  s3_env
+  PATH="$tmp/bin:$PATH" bash "$tmp/s.sh"
+  grep -q -- '-h rfs-valkey-myapp -p 26379' "$tmp/rc.log"
+  grep -q -- '-X PUT' "$tmp/curl.log"
+  if grep -q 'rfs-redis-' "$tmp/rc.log"; then echo "FAIL: a Valkey backup must not query the redis sentinel"; false; fi
+}
+
+@test "an unrecognised mode exits non-zero without touching the master" {
+  tmp=$(mktemp -d)
+  make_stubs "$tmp/bin" "$tmp/rc.log" "$tmp/curl.log"
+  render_script "$tmp/s.sh" bogus myapp "tenant-x/myapp/bkp-42.rdb" "$tmp/sb"
+  s3_env
+  # No bats `run` helper under hack/cozytest.sh, so capture the status directly.
+  if PATH="$tmp/bin:$PATH" bash "$tmp/s.sh" 2>/dev/null; then
+    echo "FAIL: an unrecognised mode must exit non-zero"
+    false
+  fi
+  # The unknown mode must fail closed, never reaching the restore FLUSHALL.
+  if grep -qi 'FLUSHALL' "$tmp/rc.log"; then echo "FAIL: an unrecognised mode must not reach the restore flush"; false; fi
+  [ -f "$tmp/rc.log" ]
+}
diff --git a/hack/release-changelog-behaviour.bats b/hack/release-changelog-behaviour.bats
new file mode 100644
index 0000000000..cb2a22446d
--- /dev/null
+++ b/hack/release-changelog-behaviour.bats
@@ -0,0 +1,593 @@
+#!/usr/bin/env bats
+# EXECUTES the release-changelog logic instead of asserting about its YAML.
+#
+# Its companion, hack/release-changelog-contract.bats, greps the workflow files.
+# That catches a rename or a deleted `if:`, and nothing else: it cannot tell
+# whether the shell inside a `run:` block does what the step name claims, and it
+# stays green while the logic underneath is wrong. Everything here runs for real
+# against throwaway git repositories and asserts on outcomes.
+#
+# What is genuinely covered:
+#
+#   * hack/changelog-preserve.sh against real remotes — a branch that exists, one
+#     that does not, one with no changelog, one with an empty changelog, and the
+#     full force-push cycle promote actually performs.
+#   * hack/validate-changelog.sh against every current-era changelog in the tree
+#     plus hand-built truncated / wrong-version / whitespace inputs.
+#   * finalize's release-body selection, executed under node with the same inputs
+#     the workflow gives it.
+#   * The GitHub Actions `needs` + `if:` semantics the whole non-blocking design
+#     rests on, run under `act` when Docker is available (see
+#     hack/testdata/needs-semantics.yaml).
+#
+# Still NOT covered, and worth saying plainly:
+#
+#   * The AI generation step. Unobservable without Copilot and a paid run.
+#   * The real GitHub API calls — gh pr create/edit, updateRelease. Only their
+#     surrounding shell is exercised.
+#   * That the sparse tooling checkout resolves on GitHub's runners. actions/
+#     checkout is not runnable here; the contract suite pins its presence.
+#
+# Test-level EXIT traps replace Bats' own handler and hide failing TAP results.
+# Cleanup follows aborting assertions; see docs/agents/e2e-testing.md.
+
+load test_helper
+
+REPO_ROOT="$(cd "$(dirname "${BATS_TEST_FILENAME:-$0}")/.." && pwd)"
+PRESERVE="$REPO_ROOT/hack/changelog-preserve.sh"
+VALIDATE="$REPO_ROOT/hack/validate-changelog.sh"
+PARSE_RC="$REPO_ROOT/hack/parse-rc-tag.sh"
+SELECT="$REPO_ROOT/hack/select-changelog-source.sh"
+PROMOTE="$REPO_ROOT/.github/workflows/promote-rc.yaml"
+FINALIZE="$REPO_ROOT/.github/workflows/pull-requests-release.yaml"
+
+# Body of a top-level workflow job, so an assertion about one job cannot be
+# satisfied — or broken — by an unrelated one. Same shape as the contract suite's.
+job_block() {
+  awk -v job="  $1:" '
+    $0 == job { inside = 1; next }
+    /^  [a-z0-9_-]+:$/ { inside = 0 }
+    inside' "$2"
+}
+
+# One named step, for pins about a specific script rather than about a job. The
+# parse job is ~180 lines, most of them the e2e gate, so a job-scoped negative
+# pin still fires on string handling that has nothing to do with tag policy.
+step_block() {
+  awk -v name="      - name: $1" '
+    $0 == name { inside = 1; next }
+    /^      - name: / { inside = 0 }
+    inside' "$2"
+}
+
+# Executable lines only: a YAML comment mentioning the pinned pattern must not
+# satisfy — or break — a pin. Same helper the contract suite uses.
+code_lines() {
+  local rc=0
+  grep -v '^[[:space:]]*#' || rc=$?
+  [ "$rc" -le 1 ]
+}
+
+# A bare "remote" plus a working clone, wired the way promote-rc.yaml sees them.
+# Everything lives under one temp dir the caller removes.
+make_fixture() {
+  root="$1"
+  mkdir -p "$root/remote" "$root/work"
+  git init -q --bare "$root/remote"
+  git init -q "$root/work"
+  (
+    cd "$root/work"
+    git config user.email ci@example.invalid
+    git config user.name  CI
+    git config commit.gpgsign false
+    git remote add origin "$root/remote"
+    mkdir -p docs/changelogs
+    echo "seed" > README.md
+    git add -A
+    git commit -qm "seed"
+    git push -q origin HEAD:refs/heads/main
+  )
+}
+
+# A changelog that hack/validate-changelog.sh accepts, so fixtures exercise the
+# preserve path rather than tripping validation for unrelated reasons.
+write_changelog() {
+  dest="$1"; version="$2"
+  mkdir -p "$(dirname "$dest")"
+  cat > "$dest" <<EOF
+<!--
+https://github.com/cozystack/cozystack/releases/tag/v${version}
+-->
+
+# v${version} (2026-07-22)
+
+Fixture changelog.
+
+## Fixes
+
+* **Something**: description ([**@someone**](https://github.com/someone) in #1).
+
+**Full Changelog**: https://github.com/cozystack/cozystack/compare/v1.0.0...v${version}
+EOF
+}
+
+# A changelog that hack/validate-changelog.sh REJECTS: header + release-link
+# comment but no '## ' section and no compare link — the realistic shape of a
+# truncated AI run or a botched hand-commit.
+write_invalid_changelog() {
+  dest="$1"; version="$2"
+  mkdir -p "$(dirname "$dest")"
+  cat > "$dest" <<EOF
+<!--
+https://github.com/cozystack/cozystack/releases/tag/v${version}
+-->
+
+# v${version} (2026-07-24)
+
+Truncated fixture — no sections, no compare link.
+EOF
+}
+
+# The rc-tag parser is shared by changelog-rc.yaml and mirrored inline by the
+# reusable changelog-generate.yaml. It must REJECT whitespace outright, not strip
+# it: a stripped 'v1. 6.0-rc.2' silently becomes a different tag, and a caller
+# keying its concurrency lane on the raw input would race two spellings of the
+# same tag to push the same staging branch. Execute it on the adversarial inputs
+# from the review directly.
+@test "parse-rc-tag: accepts a canonical rc tag and rejects whitespace / malformed ones" {
+  [ -x "$PARSE_RC" ] || { echo "hack/parse-rc-tag.sh missing or not executable" >&2; exit 1; }
+
+  # Canonical tag: exactly the three reconstructed key=value lines.
+  out="$("$PARSE_RC" v1.6.0-rc.2)" || { echo "parse-rc-tag rejected a valid rc tag" >&2; exit 1; }
+  want="rc_tag=v1.6.0-rc.2
+stable_version=1.6.0
+rc_branch=release-1.6.0-rc.2"
+  [ "$out" = "$want" ] || {
+    echo "parse-rc-tag output is wrong for v1.6.0-rc.2." >&2
+    echo "want:" >&2; printf '%s\n' "$want" | sed 's/^/  /' >&2
+    echo "got:"  >&2; printf '%s\n' "$out"  | sed 's/^/  /' >&2
+    exit 1
+  }
+
+  # Every adversarial input must be REJECTED (exit non-zero) AND write nothing to
+  # stdout, so a caller's `>> "$GITHUB_OUTPUT"` never gets a stray line from a
+  # partially-accepted parse.
+  tab="$(printf '\t')"
+  for bad in \
+    'v1. 6.0-rc.2' \
+    ' v1.6.0-rc.2' \
+    'v1.6.0-rc.2 ' \
+    "v1.6.0-rc.2${tab}" \
+    'v1.6.0' \
+    'v1.6.0-rc' \
+    '1.6.0-rc.2' \
+    'v1.6.0-rc.2x' \
+    ''; do
+    if o="$("$PARSE_RC" "$bad" 2>/dev/null)"; then
+      echo "parse-rc-tag ACCEPTED an invalid input: '$bad'" >&2
+      exit 1
+    fi
+    [ -z "$o" ] || {
+      echo "parse-rc-tag rejected '$bad' but still wrote to stdout: '$o'" >&2
+      exit 1
+    }
+  done
+}
+
+@test "preserve: rescues a hand-written changelog from an existing staging branch" {
+  tmp="$(mktemp -d)"
+  make_fixture "$tmp"
+
+  # A maintainer commits a changelog onto release-1.6.0 — the documented recovery
+  # when generation fails.
+  (
+    cd "$tmp/work"
+    git checkout -qb release-1.6.0
+    write_changelog docs/changelogs/v1.6.0.md 1.6.0
+    echo "HAND-WRITTEN MARKER" >> docs/changelogs/v1.6.0.md
+    git add -A && git commit -qm "hand-written changelog"
+    git push -q origin HEAD:refs/heads/release-1.6.0
+    git checkout -q main
+    rm -f docs/changelogs/v1.6.0.md
+  )
+
+  out="$tmp/preserved.md"
+  ( cd "$tmp/work" && "$PRESERVE" release-1.6.0 1.6.0 "$out" ) || {
+    echo "preserve reported nothing to preserve, but the branch has a changelog" >&2
+    exit 1
+  }
+  [ -s "$out" ] || { echo "preserve exited 0 but wrote no file" >&2; exit 1; }
+  grep -q 'HAND-WRITTEN MARKER' "$out" || {
+    echo "preserved file is not the maintainer's version" >&2; exit 1; }
+  rm -rf "$tmp"
+}
+
+@test "preserve: survives promote's full force-push rebuild cycle" {
+  tmp="$(mktemp -d)"
+  make_fixture "$tmp"
+
+  (
+    cd "$tmp/work"
+    git checkout -qb release-1.6.0
+    write_changelog docs/changelogs/v1.6.0.md 1.6.0
+    echo "HAND-WRITTEN MARKER" >> docs/changelogs/v1.6.0.md
+    git add -A && git commit -qm "hand-written changelog"
+    git push -q origin HEAD:refs/heads/release-1.6.0
+    git checkout -q main
+    rm -f docs/changelogs/v1.6.0.md
+  )
+
+  # Replay the exact sequence from `Prepare stable branch`: preserve, reset the
+  # branch onto the rc tree (-B), restore, commit, force-push.
+  (
+    cd "$tmp/work"
+    PRESERVED="$(mktemp)"
+    if "$PRESERVE" release-1.6.0 1.6.0 "$PRESERVED"; then :; else PRESERVED=""; fi
+    git checkout -qB release-1.6.0 main
+    if [ -n "$PRESERVED" ]; then
+      mkdir -p docs/changelogs
+      cp "$PRESERVED" docs/changelogs/v1.6.0.md
+    fi
+    git add -A
+    git commit -qm "Prepare release v1.6.0" || true
+    git push -qf origin HEAD:refs/heads/release-1.6.0
+  )
+
+  # The maintainer's file must still be on the rebuilt remote branch.
+  content="$( cd "$tmp/work" && git fetch -q origin release-1.6.0 && git show FETCH_HEAD:docs/changelogs/v1.6.0.md )"
+  printf '%s\n' "$content" | grep -q 'HAND-WRITTEN MARKER' || {
+    echo "The force-push rebuild destroyed the hand-written changelog — the exact" >&2
+    echo "regression the preserve step exists to prevent." >&2
+    exit 1
+  }
+  rm -rf "$tmp"
+}
+
+@test "preserve: reports nothing to preserve for absent branch, absent file, empty file" {
+  tmp="$(mktemp -d)"
+  make_fixture "$tmp"
+
+  # No such branch — the ordinary first-promotion case.
+  ( cd "$tmp/work" && "$PRESERVE" release-9.9.9 9.9.9 "$tmp/a.md" ) && {
+    echo "preserve claimed success for a branch that does not exist" >&2; exit 1; }
+  [ ! -f "$tmp/a.md" ] || { echo "preserve wrote a file for a missing branch" >&2; exit 1; }
+
+  # Branch exists, carries no changelog.
+  (
+    cd "$tmp/work"
+    git checkout -qb release-1.7.0
+    echo x > other.txt && git add -A && git commit -qm "no changelog"
+    git push -q origin HEAD:refs/heads/release-1.7.0
+    git checkout -q main
+  )
+  ( cd "$tmp/work" && "$PRESERVE" release-1.7.0 1.7.0 "$tmp/b.md" ) && {
+    echo "preserve claimed success for a branch with no changelog" >&2; exit 1; }
+
+  # Branch exists, changelog is empty — must NOT be preserved, or it would
+  # suppress generation while being useless as release notes.
+  (
+    cd "$tmp/work"
+    git checkout -q release-1.7.0
+    mkdir -p docs/changelogs && : > docs/changelogs/v1.7.0.md
+    git add -A && git commit -qm "empty changelog"
+    git push -qf origin HEAD:refs/heads/release-1.7.0
+    git checkout -q main
+  )
+  ( cd "$tmp/work" && "$PRESERVE" release-1.7.0 1.7.0 "$tmp/c.md" ) && {
+    echo "preserve carried over an EMPTY changelog; it would suppress generation" >&2
+    echo "and then publish as blank release notes." >&2
+    exit 1
+  }
+  [ ! -f "$tmp/c.md" ] || { echo "preserve left an empty artefact behind" >&2; exit 1; }
+  rm -rf "$tmp"
+  return 0
+}
+
+@test "pickup: changelog-preserve.sh fetches an rc-time changelog from the rc staging branch" {
+  tmp="$(mktemp -d)"
+  make_fixture "$tmp"
+
+  # changelog-rc.yaml committed the changelog onto the rc staging branch
+  # release-1.6.0-rc.2 at rc time (docs/changelogs/vX.Y.Z.md — the stable name).
+  (
+    cd "$tmp/work"
+    git checkout -qb release-1.6.0-rc.2
+    write_changelog docs/changelogs/v1.6.0.md 1.6.0
+    echo "RC-TIME MARKER" >> docs/changelogs/v1.6.0.md
+    git add -A && git commit -qm "docs: add changelog for v1.6.0"
+    git push -q origin HEAD:refs/heads/release-1.6.0-rc.2
+    git checkout -q main
+    rm -f docs/changelogs/v1.6.0.md
+  )
+
+  # The generation core (changelog-generate.yaml) does exactly this to COPY the
+  # rc-time changelog into the deliverable path instead of regenerating it — it
+  # runs `mkdir -p docs/changelogs` first (git prunes the emptied dir on the
+  # `checkout main` above), so mirror that.
+  out="$tmp/work/docs/changelogs/v1.6.0.md"
+  ( cd "$tmp/work" && mkdir -p docs/changelogs && "$PRESERVE" release-1.6.0-rc.2 1.6.0 docs/changelogs/v1.6.0.md ) || {
+    echo "pickup reported nothing to fetch, but the rc staging branch has a changelog" >&2
+    exit 1
+  }
+  [ -s "$out" ] || { echo "pickup exited 0 but wrote no file" >&2; exit 1; }
+  grep -q 'RC-TIME MARKER' "$out" || {
+    echo "picked-up file is not the rc-time changelog" >&2; exit 1; }
+  # And it must be publishable — the generation core validates it next.
+  "$VALIDATE" "$out" 1.6.0 >/dev/null 2>&1 || {
+    echo "picked-up changelog does not pass the validator" >&2; exit 1; }
+  rm -rf "$tmp"
+}
+
+# hack/select-changelog-source.sh is the validate-then-fall-through the reusable
+# core delegates to. Execute it for real against the three cases that matter, so a
+# regression (e.g. dropping a validation, or letting an invalid source win) is
+# caught by outcome rather than by a grep that a dead block could satisfy.
+@test "select-source: a valid rc-tag-tree changelog wins over the staging branch" {
+  tmp="$(mktemp -d)"
+  make_fixture "$tmp"
+
+  # A DIFFERENT valid changelog on the rc staging branch, to prove the tag tree wins.
+  (
+    cd "$tmp/work"
+    git checkout -qb release-1.6.0-rc.2
+    write_changelog docs/changelogs/v1.6.0.md 1.6.0
+    echo "BRANCH MARKER" >> docs/changelogs/v1.6.0.md
+    git add -A && git commit -qm "branch changelog"
+    git push -q origin HEAD:refs/heads/release-1.6.0-rc.2
+    git checkout -q main
+    rm -f docs/changelogs/v1.6.0.md
+  )
+  # A valid changelog in the working tree (the rc tag tree).
+  ( cd "$tmp/work" && write_changelog docs/changelogs/v1.6.0.md 1.6.0 && echo "TAG-TREE MARKER" >> docs/changelogs/v1.6.0.md )
+
+  out="$( cd "$tmp/work" && "$SELECT" 1.6.0 release-1.6.0-rc.2 )" || { echo "select-source failed" >&2; exit 1; }
+  src="$(printf '%s\n' "$out" | sed -n 's/^source=//p' | tail -n1)"
+  [ "$src" = rc-tag ] || {
+    echo "expected source=rc-tag; got '$src'. Full output:" >&2; printf '%s\n' "$out" | sed 's/^/  /' >&2; exit 1; }
+  grep -q 'TAG-TREE MARKER' "$tmp/work/docs/changelogs/v1.6.0.md" || {
+    echo "the rc-tag-tree changelog was not the one selected" >&2; exit 1; }
+  rm -rf "$tmp"
+}
+
+@test "select-source: an invalid rc-tag-tree changelog falls through to a valid staging branch" {
+  tmp="$(mktemp -d)"
+  make_fixture "$tmp"
+
+  # A VALID changelog on the rc staging branch.
+  (
+    cd "$tmp/work"
+    git checkout -qb release-1.6.0-rc.2
+    write_changelog docs/changelogs/v1.6.0.md 1.6.0
+    echo "BRANCH MARKER" >> docs/changelogs/v1.6.0.md
+    git add -A && git commit -qm "branch changelog"
+    git push -q origin HEAD:refs/heads/release-1.6.0-rc.2
+    git checkout -q main
+    rm -f docs/changelogs/v1.6.0.md
+  )
+  # An INVALID changelog in the working tree — must be discarded, not win.
+  ( cd "$tmp/work" && write_invalid_changelog docs/changelogs/v1.6.0.md 1.6.0 )
+
+  out="$( cd "$tmp/work" && "$SELECT" 1.6.0 release-1.6.0-rc.2 )" || { echo "select-source failed" >&2; exit 1; }
+  src="$(printf '%s\n' "$out" | sed -n 's/^source=//p' | tail -n1)"
+  [ "$src" = rc-branch ] || {
+    echo "expected source=rc-branch (invalid tag tree must fall through); got '$src'." >&2
+    printf '%s\n' "$out" | sed 's/^/  /' >&2; exit 1; }
+  printf '%s\n' "$out" | grep -q '::warning::' || {
+    echo "no loud ::warning:: for the discarded invalid tag-tree changelog" >&2; exit 1; }
+  grep -q 'BRANCH MARKER' "$tmp/work/docs/changelogs/v1.6.0.md" || {
+    echo "the valid rc-staging-branch changelog was not copied into place" >&2; exit 1; }
+  rm -rf "$tmp"
+}
+
+@test "select-source: invalid in both the tag tree and the staging branch falls through to generate" {
+  tmp="$(mktemp -d)"
+  make_fixture "$tmp"
+
+  # An INVALID changelog on the rc staging branch.
+  (
+    cd "$tmp/work"
+    git checkout -qb release-1.6.0-rc.2
+    write_invalid_changelog docs/changelogs/v1.6.0.md 1.6.0
+    git add -A && git commit -qm "invalid branch changelog"
+    git push -q origin HEAD:refs/heads/release-1.6.0-rc.2
+    git checkout -q main
+    rm -f docs/changelogs/v1.6.0.md
+  )
+  # An INVALID changelog in the working tree too.
+  ( cd "$tmp/work" && write_invalid_changelog docs/changelogs/v1.6.0.md 1.6.0 )
+
+  out="$( cd "$tmp/work" && "$SELECT" 1.6.0 release-1.6.0-rc.2 )" || { echo "select-source failed" >&2; exit 1; }
+  src="$(printf '%s\n' "$out" | sed -n 's/^source=//p' | tail -n1)"
+  [ "$src" = none ] || {
+    echo "expected source=none (both invalid -> generate); got '$src'." >&2
+    printf '%s\n' "$out" | sed 's/^/  /' >&2; exit 1; }
+  # Both discards must be reported loudly.
+  [ "$(printf '%s\n' "$out" | grep -c '::warning::')" -eq 2 ] || {
+    echo "expected exactly two ::warning:: lines (one per discarded invalid source)." >&2
+    printf '%s\n' "$out" | sed 's/^/  /' >&2; exit 1; }
+  # The invalid file must not be left behind to poison a later step.
+  [ ! -f "$tmp/work/docs/changelogs/v1.6.0.md" ] || {
+    echo "an invalid changelog was left on disk instead of being discarded" >&2; exit 1; }
+  rm -rf "$tmp"
+}
+
+# promote-rc.yaml's rc-tag parse is github-script (JS), so mirror its exact policy
+# under node and run the adversarial inputs from the review through it: whitespace
+# is REJECTED, never trimmed-and-accepted. The greps keep the mirror honest.
+@test "promote-rc parse: rejects whitespace-bearing rc tags (mirrors the workflow's github-script)" {
+  command -v node >/dev/null || { echo "node unavailable; skipping"; return 0; }
+  tmp="$(mktemp -d)"
+
+  cat > "$tmp/parse.js" <<'JS'
+function parse(rc) {
+  if (/\s/.test(rc)) return 'reject:whitespace';
+  const m = rc.match(/^v(\d+)\.(\d+)\.(\d+)-rc\.(\d+)$/);
+  if (!m) return 'reject:format';
+  return 'accept:' + m[1] + '.' + m[2] + '.' + m[3];
+}
+const lines = process.argv.slice(2).map((a) => a + '=' + parse(a));
+require('fs').writeFileSync(1, lines.join('\n') + '\n');
+JS
+
+  tab="$(printf '\t')"
+  node "$tmp/parse.js" \
+    'v1.6.0-rc.2' \
+    ' v1.6.0-rc.2' \
+    'v1.6.0-rc.2 ' \
+    "v1.6.0-rc.2${tab}" \
+    'v1. 6.0-rc.2' \
+    'v1.6.0' > "$tmp/out.txt" 2>"$tmp/err.txt" || { echo "node failed:" >&2; cat "$tmp/err.txt" >&2; exit 1; }
+
+  want="v1.6.0-rc.2=accept:1.6.0
+ v1.6.0-rc.2=reject:whitespace
+v1.6.0-rc.2 =reject:whitespace
+v1.6.0-rc.2${tab}=reject:whitespace
+v1. 6.0-rc.2=reject:whitespace
+v1.6.0=reject:format"
+  got="$(cat "$tmp/out.txt")"
+  [ "$got" = "$want" ] || {
+    echo "promote parse policy mismatch." >&2
+    echo "want:" >&2; printf '%s\n' "$want" | sed 's/^/  /' >&2
+    echo "got:"  >&2; printf '%s\n' "$got"  | sed 's/^/  /' >&2
+    exit 1
+  }
+
+  # The mirror must match what promote-rc.yaml actually does: reject whitespace,
+  # and NOT trim-and-accept. Scoped to the parse STEP, not the parse job: the job
+  # also holds the e2e gate's github-script, whose own string handling would
+  # otherwise trip a negative pin about tag policy.
+  parse_step="$(step_block 'Parse and validate rc tag' "$PROMOTE")"
+  [ -n "$parse_step" ] || { echo "promote-rc.yaml has no 'Parse and validate rc tag' step." >&2; exit 1; }
+  printf '%s\n' "$parse_step" | code_lines | grep -qF '/\s/.test(rc)' || {
+    echo "promote-rc.yaml's parse no longer rejects whitespace with /\\s/.test(rc)." >&2; exit 1; }
+  printf '%s\n' "$parse_step" | code_lines | grep -qF '.trim()' && {
+    echo "promote-rc.yaml's parse still trims the rc tag; policy diverges from the changelog job." >&2; exit 1; }
+  rm -rf "$tmp"
+  return 0
+}
+
+@test "finalize: the release-body selection runs and picks the changelog" {
+  command -v node >/dev/null || { echo "node unavailable; skipping"; return 0; }
+
+  tmp="$(mktemp -d)"
+
+  # The same decision finalize makes, extracted verbatim in shape: read the file,
+  # refuse whitespace-only, otherwise use it as the body.
+  #
+  # All three cases run in ONE node invocation. Driving them from a shell loop
+  # produced an empty capture for the missing-file case under this repo's
+  # cozytest runner — reproducibly, with node exiting 0 and writing nothing, and
+  # not reproducible outside it. Rather than assert around a runner quirk (which
+  # would leave the assertion quietly meaningless), the decision table is
+  # computed in one process and compared as a whole.
+  cat > "$tmp/body.js" <<'JS'
+const fs = require('fs');
+
+// Verbatim in shape from pull-requests-release.yaml's Publish draft release step.
+function selectBody(changelogPath) {
+  let body;
+  let decision;
+  if (fs.existsSync(changelogPath)) {
+    const raw = fs.readFileSync(changelogPath, 'utf8');
+    if (raw.trim().length === 0) {
+      decision = 'refuse-whitespace';
+    } else {
+      body = raw;
+      decision = 'use-file';
+    }
+  } else {
+    decision = 'absent';
+  }
+  const payload = { draft: false, ...(body ? { body } : {}) };
+  return decision + ':' + Object.prototype.hasOwnProperty.call(payload, 'body');
+}
+
+const lines = process.argv.slice(2).map((p) => {
+  const label = p.replace(/^.*\//, '');
+  return label + '=' + selectBody(p);
+});
+fs.writeFileSync(1, lines.join('\n') + '\n');
+JS
+
+  write_changelog "$tmp/good.md" 1.6.0
+  printf '   \n\n \n' > "$tmp/ws.md"
+
+  node "$tmp/body.js" "$tmp/good.md" "$tmp/ws.md" "$tmp/nope.md" > "$tmp/out.txt" 2>"$tmp/err.txt" || {
+    echo "node failed:" >&2; cat "$tmp/err.txt" >&2; exit 1; }
+
+  want="good.md=use-file:true
+ws.md=refuse-whitespace:false
+nope.md=absent:false"
+  got="$(cat "$tmp/out.txt")"
+
+  [ "$got" = "$want" ] || {
+    echo "finalize's release-body decision table is wrong." >&2
+    echo "expected:" >&2; printf '%s\n' "$want" | sed 's/^/  /' >&2
+    echo "got:" >&2;      printf '%s\n' "$got"  | sed 's/^/  /' >&2
+    echo "A whitespace-only or absent changelog reaching the body would publish" >&2
+    echo "blank release notes instead of leaving the draft's text in place." >&2
+    exit 1
+  }
+
+  # And the shape asserted here must be the shape finalize actually uses.
+  grep -q 'raw.trim().length === 0' "$FINALIZE" || {
+    echo "finalize's whitespace guard changed shape; this test now proves nothing" >&2
+    echo "about the real workflow." >&2
+    exit 1
+  }
+  rm -rf "$tmp"
+}
+
+# The one assumption no amount of YAML reading can settle: that GitHub really
+# runs a job whose `needs` includes a FAILED job, when its `if:` gates only on a
+# different, successful one. The entire non-blocking design rests on it. `act`
+# executes the fixture workflow for real and the assertions below read its output.
+#
+# Docker-gated: no Docker, no verdict — and the test says so rather than passing
+# quietly, because a silent skip here is indistinguishable from a green result on
+# the one thing that most needs proving.
+@test "act: open-pr runs when the changelog job fails, and failed-job outputs are empty" {
+  if ! command -v act >/dev/null || ! docker info >/dev/null 2>&1; then
+    echo "act or Docker unavailable — GitHub needs/if semantics NOT verified in this run." >&2
+    return 0
+  fi
+
+  fixture="$REPO_ROOT/hack/testdata/needs-semantics.yaml"
+  [ -f "$fixture" ] || { echo "missing fixture $fixture" >&2; exit 1; }
+
+  image="debian:stable-slim"
+  docker image inspect "$image" >/dev/null 2>&1 || {
+    echo "$image not present locally and pulling is disabled — semantics NOT verified." >&2
+    return 0
+  }
+
+  out="$(cd "$REPO_ROOT" && act push -W "$fixture" -P "ubuntu-latest=$image" --pull=false 2>&1 || true)"
+
+  printf '%s\n' "$out" | grep -q 'OPEN_PR_RAN=yes' || {
+    echo "open-pr did NOT run after the changelog job failed. The non-blocking" >&2
+    echo "guarantee does not hold: a Copilot or npm outage would leave a pushed" >&2
+    echo "staging branch and a drafted release with no promote PR." >&2
+    printf '%s\n' "$out" | tail -40 >&2
+    exit 1
+  }
+
+  printf '%s\n' "$out" | grep -q 'changelog_result=failure' || {
+    echo "The fixture's changelog job did not actually fail; the test proved nothing." >&2
+    exit 1
+  }
+
+  # Outputs of a failed job come back empty. This is WHY open-pr re-establishes
+  # changelog presence from disk instead of trusting needs.changelog.outputs.
+  printf '%s\n' "$out" | grep -q 'changelog_present=\[\]' || {
+    echo "A failed job's outputs were expected to be empty. If they now propagate," >&2
+    echo "the on-disk re-check in open-pr may be masking a simpler design." >&2
+    exit 1
+  }
+
+  # And a successful job's outputs must still reach the dependent job.
+  printf '%s\n' "$out" | grep -q 'stable_version=\[1.6.0\]' || {
+    echo "promote's outputs did not reach open-pr; open-pr could not target the" >&2
+    echo "right branch or version." >&2
+    exit 1
+  }
+}
diff --git a/hack/release-changelog-contract.bats b/hack/release-changelog-contract.bats
new file mode 100644
index 0000000000..27596c0378
--- /dev/null
+++ b/hack/release-changelog-contract.bats
@@ -0,0 +1,899 @@
+#!/usr/bin/env bats
+# Guards the contract that makes a release publish WITH its changelog.
+#
+# The release body is no longer written by hand or synced after the fact: it is
+# docs/changelogs/vX.Y.Z.md, generated by the reusable changelog-generate.yaml,
+# landed on a staging branch, carried through the promote PR, and read back by
+# pull-requests-release.yaml finalize at publication. That chain now spans FIVE
+# workflow files and a docs contract:
+#
+#   * changelog-generate.yaml — reusable (workflow_call) generation core: detached
+#     rc-tag checkout, read-only token for the AI step, validator gate, artifact.
+#   * changelog-rc.yaml — the rc-time button: calls the reusable core, then commits
+#     the result onto the rc staging branch release-X.Y.Z-rc.N.
+#   * promote-rc.yaml — calls the reusable core at promote time (a thin `uses:`),
+#     and its open-pr job commits the changelog onto release-X.Y.Z before the PR.
+#   * pull-requests-release.yaml — finalize reads the file as the release body.
+#   * tags.yaml — the after-the-fact backstop for the degraded paths.
+#
+# Every link is a plain string — a job rename, a moved `if:`, or a reworded prompt
+# breaks it silently, and the failure only ever shows up as a published release
+# with empty notes. That is exactly the class of bug nobody notices until it is
+# public and irreversible.
+#
+# The tests below pin the links that are cheap to assert and expensive to lose:
+#
+#   1. open-pr survives a failed changelog job (the non-blocking guarantee).
+#   2. The AI step is the ONLY thing allowed to fail silently.
+#   3. finalize reads the changelog file as the release body.
+#   4. finalize refuses whitespace-only content rather than blanking the notes.
+#   5. The generator is pointed at a checkout state docs/agents/changelog.md
+#      actually permits.
+#   6. The tags.yaml backstop ports an existing changelog instead of regenerating.
+#   7. promote preserves a changelog across the staging-branch force-push.
+#   8. The finalize trigger has no paths filter that a docs-only promote PR would
+#      trip over.
+#   9-11. The validator accepts every changelog of the current era (both header
+#      conventions, including a 19-line patch release) and rejects unusable output.
+#   12. The workflow calls the validator script rather than reimplementing it.
+#   13. The agent instructions and the validator are overlaid from the dispatch
+#      ref, because the rc tag's copies predate this workflow.
+#   14. open-pr survives an artifact transfer failure and keys off the file on disk.
+#   15. A pre-existing changelog is validated, not merely non-empty.
+#   16. promote-rc parses the rc tag ONCE in a cheap `parse` job that rejects
+#      whitespace (not trims), and its changelog job is a thin `uses:` of the
+#      reusable core fed that validated tag — so promote and the changelog job
+#      cannot diverge on validity (which left a PR with no changelog).
+#   17. The reusable core exposes `present`, and open-pr still keys off it.
+#   18. The reusable core delegates source selection to select-changelog-source.sh
+#      (validate-then-fall-through, behaviour-tested), rc tag tree over rc staging
+#      branch over generate — an invalid source never suppresses a valid one.
+#   19. changelog-rc.yaml validates the rc tag via the shared strict parser
+#      (hack/parse-rc-tag.sh — rejects whitespace, not strips it).
+#   20. changelog-rc.yaml calls the same reusable core (no forked second copy).
+#   21. changelog-rc.yaml verifies the rc STAGING branch UP FRONT (in parse, which
+#      generate depends on), so a missing branch fails before generation runs.
+#   22. changelog-rc.yaml commits to the rc STAGING branch release-X.Y.Z-rc.N
+#      idempotently (compare-before-push) and validated, hard-failing on empty.
+#   23. The artifact name is identical across producer and both consumers.
+#
+# WHAT THIS DOES NOT CHECK, so a green tick is not mistaken for a working release:
+#
+#   * That the changelog is CORRECT, or that the AI produces anything at all.
+#     Generation quality is unobservable from here and is what review is for.
+#   * That GitHub's `needs` / `if:` / reusable-workflow semantics behave as
+#     assumed. These tests pin what the YAML SAYS; whether a skipped upstream job
+#     really propagates, or a called workflow really sees the caller's ref, is
+#     GitHub's contract, verifiable only by dispatching a real run.
+#   * Anything in cozystack/website. The docs job deliberately still runs at tag
+#     push (where RELEASE_TAG resolves to a tag that exists) — moving it earlier
+#     needs a change in that repo first, and nothing here would catch its absence.
+#   * Whether the release body ACTUALLY lands. That is one API call at publish
+#     time, on a path no unit test reaches.
+#
+# Test-level EXIT traps replace Bats' own handler and hide failing TAP results.
+# Cleanup follows aborting assertions; see docs/agents/e2e-testing.md.
+
+load test_helper
+
+REPO_ROOT="$(cd "$(dirname "${BATS_TEST_FILENAME:-$0}")/.." && pwd)"
+PROMOTE="$REPO_ROOT/.github/workflows/promote-rc.yaml"
+GENERATE="$REPO_ROOT/.github/workflows/changelog-generate.yaml"
+RC_WRAPPER="$REPO_ROOT/.github/workflows/changelog-rc.yaml"
+FINALIZE="$REPO_ROOT/.github/workflows/pull-requests-release.yaml"
+TAGS="$REPO_ROOT/.github/workflows/tags.yaml"
+CHANGELOG_DOC="$REPO_ROOT/docs/agents/changelog.md"
+
+# Body of a single top-level job block in a workflow file, from `  <name>:` up to
+# the next top-level job. Keyed on two-space indentation, which is the layout
+# every workflow in this repo uses.
+job_block() {
+  awk -v job="  $1:" '
+    $0 == job { inside = 1; next }
+    /^  [a-z0-9_-]+:$/ { inside = 0 }
+    inside' "$2"
+}
+
+# Executable/structural lines of a block: strip YAML- and shell-comment lines
+# (leading whitespace then '#') so a pin cannot be satisfied by a commented-out
+# line. Reads the block from stdin.
+code_lines() { grep -vE '^[[:space:]]*#'; }
+
+@test "all release workflow files exist" {
+  for f in "$PROMOTE" "$GENERATE" "$RC_WRAPPER" "$FINALIZE" "$TAGS" "$CHANGELOG_DOC"; do
+    [ -f "$f" ] || { echo "missing $f" >&2; exit 1; }
+  done
+}
+
+# 1. The non-blocking guarantee. `needs: [promote, changelog]` alone makes GitHub
+#    SKIP open-pr whenever changelog fails, which would leave the staging branch
+#    pushed and the release drafted but no promote PR at all — strictly worse than
+#    the old flow, where the PR was opened inside promote and nothing about
+#    changelog generation could block it. A Copilot or npm outage must degrade to
+#    "PR opens without a changelog", never to "no PR".
+@test "open-pr opens the promote PR even when the changelog job fails" {
+  block="$(job_block open-pr "$PROMOTE")"
+  [ -n "$block" ] || { echo "Could not locate the open-pr job in $PROMOTE" >&2; exit 1; }
+
+  # Tolerate extra needs (e.g. website-docs) appended to the list — the load-
+  # bearing part is that open-pr still depends on both promote and changelog.
+  printf '%s\n' "$block" | grep -qE 'needs: \[promote, changelog(,|\])' || {
+    echo "open-pr no longer declares 'needs: [promote, changelog...]'." >&2
+    exit 1
+  }
+
+  # Must not be gated on the changelog job's result.
+  printf '%s\n' "$block" | grep -qE '^\s*if:.*!cancelled\(\)' || {
+    echo "open-pr has no '!cancelled()' job-level if:. Without one, a failed" >&2
+    echo "changelog job SKIPS open-pr and no promote PR is ever opened." >&2
+    exit 1
+  }
+  printf '%s\n' "$block" | grep -qE "^\s*if:.*needs\.promote\.result == 'success'" || {
+    echo "open-pr's if: no longer gates on needs.promote.result == 'success'." >&2
+    exit 1
+  }
+  printf '%s\n' "$block" | grep -qE '^\s*if:.*needs\.changelog\.result' && {
+    echo "open-pr's job-level if: references needs.changelog.result. Gating the" >&2
+    echo "PR on the changelog job re-introduces the wedge this if: exists to prevent." >&2
+    exit 1
+  }
+  return 0
+}
+
+# 2. continue-on-error is a blast radius, not a convenience. It belongs on the AI
+#    invocation and nowhere else: on a verification or commit step it would let a
+#    broken changelog through as if it were fine. The generation steps now live in
+#    the reusable changelog-generate.yaml, so that is where this is pinned.
+@test "only the AI generation step is allowed to fail silently" {
+  block="$(job_block changelog "$GENERATE")"
+  [ -n "$block" ] || { echo "Could not locate the changelog job in $GENERATE" >&2; exit 1; }
+
+  # Only one step may legitimately fail without failing the job:
+  #
+  #   Generate changelog using AI            — the whole point of non-blocking.
+  #
+  # Anywhere else it would let an unvalidated or missing changelog through as if
+  # it were fine — in particular on Verify, which is the gate that decides whether
+  # a fragment becomes the release body.
+  allowed="Generate changelog using AI"
+
+  offenders="$(printf '%s\n' "$block" | awk -v allowed="$allowed" '
+    /^      - name: / {
+      name = $0
+      sub(/^      - name: /, "", name)
+      ok = (name ~ "^(" allowed ")$")
+      next
+    }
+    /^        continue-on-error: true$/ { if (!ok) print name }
+  ')"
+
+  [ -z "$offenders" ] || {
+    echo "These changelog-job steps carry continue-on-error but must not:" >&2
+    printf '  %s\n' "$offenders" >&2
+    echo "Allowing them to fail silently would let an unvalidated or absent changelog" >&2
+    echo "be advertised as valid and published as the release body." >&2
+    exit 1
+  }
+
+  # And the AI step must actually still have it, or generation is blocking again.
+  ai_step="$(printf '%s\n' "$block" | awk '
+    /^      - name: Generate changelog using AI$/ { inside = 1; next }
+    /^      - name: / { inside = 0 }
+    inside')"
+  [ -n "$ai_step" ] || { echo "Could not locate the 'Generate changelog using AI' step" >&2; exit 1; }
+  printf '%s\n' "$ai_step" | grep -q 'continue-on-error: true' || {
+    echo "'Generate changelog using AI' no longer carries continue-on-error —" >&2
+    echo "a Copilot outage would now block the release." >&2
+    exit 1
+  }
+}
+
+# 3. The load-bearing read. If finalize stops reading the file, releases publish
+#    with whatever the draft happened to carry ("Promoted from vX.Y.Z-rc.N.") and
+#    the whole point of generating the changelog before publication is lost.
+@test "finalize uses the changelog file as the published release body" {
+  grep -q 'docs/changelogs/\${tag}\.md' "$FINALIZE" || {
+    echo "finalize no longer references docs/changelogs/\${tag}.md." >&2
+    echo "The release body would fall back to the draft's placeholder text." >&2
+    exit 1
+  }
+  # The read must actually reach updateRelease.
+  grep -qE '\.\.\.\(body \? \{ body \} : \{\}\)' "$FINALIZE" || {
+    echo "finalize's updateRelease call no longer conditionally spreads { body }." >&2
+    exit 1
+  }
+}
+
+# 4. A whitespace-only file is worse than no file: it would blank the release
+#    notes more thoroughly than publishing the draft body would. The generation
+#    core validates structurally, but a changelog can also arrive by hand-commit,
+#    so finalize keeps its own last-line-of-defence check.
+@test "finalize refuses an empty or whitespace-only changelog as the body" {
+  grep -qE 'raw\.trim\(\)\.length === 0' "$FINALIZE" || {
+    echo "finalize no longer guards against a whitespace-only changelog." >&2
+    echo "Such a file would publish as blank release notes." >&2
+    exit 1
+  }
+}
+
+# 5. docs/agents/changelog.md section 2 is a hard gate: it enumerates the valid
+#    working-tree states and tells the agent to STOP otherwise. The generation
+#    core checks out the rc tag, so that state must be one the doc names —
+#    otherwise a COMPLIANT agent refuses to generate anything and the normal path
+#    produces no changelog at all, silently, forever.
+@test "the generation checkout state is one docs/agents/changelog.md permits" {
+  block="$(job_block changelog "$GENERATE")"
+  printf '%s\n' "$block" | grep -qE 'ref: \$\{\{ steps\.parse\.outputs\.rc_tag \}\}' || {
+    echo "The changelog job no longer checks out the rc TAG." >&2
+    echo "A staging-branch checkout is a state changelog.md section 2 rejects." >&2
+    exit 1
+  }
+  grep -qi 'release-candidate.* tag being promoted' "$CHANGELOG_DOC" || {
+    echo "docs/agents/changelog.md section 2 no longer documents the promotion" >&2
+    echo "configuration (detached at the rc tag). A compliant agent would stop." >&2
+    exit 1
+  }
+  # The checkout must never consume raw dispatch/caller input.
+  printf '%s\n' "$block" | grep -qE 'ref: \$\{\{ inputs\.rc_tag \}\}' && {
+    echo "The changelog job checks out raw inputs.rc_tag instead of the validated" >&2
+    echo "parse output — untrusted input reaching actions/checkout's ref." >&2
+    exit 1
+  }
+  return 0
+}
+
+# 6. A promote PR targets release-X.Y for EVERY release since the rc freeze, so
+#    the changelog never reaches main on its own and the backstop fires as the
+#    normal path rather than the patch-release corner case it was written for. It
+#    must PORT the reviewed file from the tag, not regenerate: a second AI pass
+#    would spend quota and then, once its PR merged, update-releasenotes.yaml
+#    would overwrite already-published release notes with text nobody approved.
+@test "the tags.yaml backstop ports an existing changelog instead of regenerating" {
+  block="$(job_block generate-changelog "$TAGS")"
+  [ -n "$block" ] || { echo "Could not locate generate-changelog in $TAGS" >&2; exit 1; }
+
+  printf '%s\n' "$block" | grep -q 'at_tag=true' || {
+    echo "The backstop no longer detects a changelog present at the tag commit." >&2
+    exit 1
+  }
+
+  # Every AI step must be gated on the file being absent at the tag.
+  for step in 'Setup Node.js' 'Install GitHub Copilot CLI' 'Generate changelog using AI'; do
+    step_block="$(printf '%s\n' "$block" | awk -v s="      - name: $step" '
+      $0 == s { inside = 1; next }
+      /^      - name: / { inside = 0 }
+      inside')"
+    [ -n "$step_block" ] || { echo "Could not locate backstop step '$step'" >&2; exit 1; }
+    printf '%s\n' "$step_block" | grep -qE "at_tag == 'false'" || {
+      echo "Backstop step '$step' is not gated on at_tag == 'false'." >&2
+      echo "It would regenerate a changelog that already exists at the tag, and the" >&2
+      echo "resulting PR would overwrite published release notes." >&2
+      exit 1
+    }
+  done
+}
+
+# 7. The staging branch is rebuilt from the rc tree and force-pushed on every
+#    re-dispatch. A changelog committed there by hand (the documented recovery
+#    when generation fails) or by an earlier dispatch must survive that, or a
+#    retry silently replaces human-edited release notes.
+@test "promote preserves an existing changelog across the staging-branch rebuild" {
+  block="$(job_block promote "$PROMOTE")"
+  [ -n "$block" ] || { echo "Could not locate the promote job in $PROMOTE" >&2; exit 1; }
+
+  printf '%s\n' "$block" | grep -q 'changelog-preserve.sh' || {
+    echo "The Prepare stable branch step no longer calls changelog-preserve.sh." >&2
+    echo "A re-dispatch would force-push away a hand-written changelog." >&2
+    exit 1
+  }
+  # It must run BEFORE the branch is reset, or there is nothing left to rescue.
+  pres_line="$(printf '%s\n' "$block" | grep -n 'changelog-preserve.sh' | head -1 | cut -d: -f1)"
+  reset_line="$(printf '%s\n' "$block" | grep -n 'git checkout -B' | head -1 | cut -d: -f1)"
+  [ -n "$pres_line" ] && [ -n "$reset_line" ] && [ "$pres_line" -lt "$reset_line" ] || {
+    echo "changelog-preserve.sh does not run before 'git checkout -B'; by then the" >&2
+    echo "working tree has already been reset and there is nothing to preserve." >&2
+    exit 1
+  }
+  # The script itself is behaviour-tested against real git remotes in
+  # hack/release-changelog-behaviour.bats; this only pins that it is still wired in.
+  [ -x "$REPO_ROOT/hack/changelog-preserve.sh" ] || {
+    echo "hack/changelog-preserve.sh is missing or not executable." >&2; exit 1; }
+
+  # And open-pr must not clobber what promote preserved.
+  open_block="$(job_block open-pr "$PROMOTE")"
+  printf '%s\n' "$open_block" | grep -qE "steps\.existing\.outputs\.present == 'false'" || {
+    echo "open-pr no longer checks for an existing changelog before downloading the" >&2
+    echo "generated artifact — it would overwrite preserved human edits." >&2
+    exit 1
+  }
+}
+
+# 8. The promote PR now carries docs/changelogs/vX.Y.Z.md, and Prepare stable
+#    branch tolerates producing no tag-string changes ("digests already stable").
+#    Together those can yield a docs-only promote PR. A `paths-ignore: docs/**`
+#    on the finalize trigger would drop it: no finalize run, so no tag, no
+#    release, and no error raised anywhere.
+@test "the finalize trigger has no paths filter that a docs-only promote PR would trip" {
+  trigger="$(awk '/^on:/ { inside = 1; next } /^[a-z]/ { inside = 0 } inside' "$FINALIZE")"
+  [ -n "$trigger" ] || { echo "Could not locate the on: block in $FINALIZE" >&2; exit 1; }
+
+  printf '%s\n' "$trigger" | grep -qE '^\s*(paths|paths-ignore):' && {
+    echo "The finalize trigger declares a paths filter. A promote PR whose only" >&2
+    echo "change is the changelog would be filtered out, and the release would" >&2
+    echo "never be tagged or published — silently. Filtering belongs in the job's" >&2
+    echo "if: gate (merged + release label + bot author), not the trigger." >&2
+    exit 1
+  }
+  return 0
+}
+
+# 9. The validator is a script, not inline YAML, precisely so these tests can run
+#    it. An earlier inline version asserted a `# Cozystack vX.Y.Z` header and a
+#    20-line floor — both of which reject every PATCH changelog in the tree, and
+#    the suite at the time was fully green while that shipped. Feed it the real
+#    files and let them be the specification.
+#
+#    Scope note: only v1.3.0+ is asserted. Changelogs before that predate the
+#    current documented process — v0.31 through v1.2.x carry no H1 at all — and
+#    the validator never sees them, since it only ever runs on freshly generated
+#    output. Holding it to a form the process no longer produces would be testing
+#    history, not behaviour.
+@test "the changelog validator accepts every changelog of the current era" {
+  [ -x "$REPO_ROOT/hack/validate-changelog.sh" ] || {
+    echo "hack/validate-changelog.sh missing or not executable" >&2; exit 1; }
+
+  checked=0
+  rejected=""
+  for f in "$REPO_ROOT"/docs/changelogs/v1.[3-9]*.md; do
+    [ -f "$f" ] || continue
+    base="$(basename "$f" .md)"
+    version="${base#v}"
+    checked=$((checked + 1))
+    if ! "$REPO_ROOT/hack/validate-changelog.sh" "$f" "$version" >/dev/null 2>&1; then
+      reason="$("$REPO_ROOT/hack/validate-changelog.sh" "$f" "$version" 2>&1 || true)"
+      rejected="$rejected
+  $base: $reason"
+    fi
+  done
+
+  # Anti-vacuum: a glob that matches nothing would pass silently.
+  [ "$checked" -ge 10 ] || {
+    echo "Only $checked changelog(s) checked; expected at least 10. The glob broke" >&2
+    echo "and this test is verifying nothing." >&2
+    exit 1
+  }
+
+  [ -z "$rejected" ] || {
+    echo "The validator rejects shipped changelogs — it would discard good AI output" >&2
+    echo "and mislabel the promote PR as a generation failure:$rejected" >&2
+    exit 1
+  }
+}
+
+# 10. Both header conventions are live: minors use `# Cozystack vX.Y.Z`, patches
+#     use `# vX.Y.Z (date)`. Pin one of each so a future tightening cannot drop
+#     the patch form, which is the more common release by roughly 5:1.
+@test "the validator accepts both the minor and patch header conventions" {
+  minor="$REPO_ROOT/docs/changelogs/v1.5.0.md"   # '# Cozystack v1.5.0'
+  patch="$REPO_ROOT/docs/changelogs/v1.5.1.md"   # '# v1.5.1 (2026-06-23)', 19 lines
+
+  for pair in "$minor:1.5.0" "$patch:1.5.1"; do
+    f="${pair%:*}"; v="${pair##*:}"
+    [ -f "$f" ] || { echo "fixture $f is gone; pick another of the same shape" >&2; exit 1; }
+    "$REPO_ROOT/hack/validate-changelog.sh" "$f" "$v" >/dev/null 2>&1 || {
+      echo "Validator rejected $(basename "$f") — a legitimate, shipped changelog." >&2
+      "$REPO_ROOT/hack/validate-changelog.sh" "$f" "$v" 2>&1 >/dev/null | sed 's/^/    /' >&2
+      exit 1
+    }
+  done
+
+  # v1.5.1 is 19 lines. Any line-count floor at 20 or above silently rejects it.
+  lines="$(wc -l < "$patch" | tr -d ' ')"
+  [ "$lines" -lt 25 ] || {
+    echo "v1.5.1 is now $lines lines — it was the short-patch fixture precisely" >&2
+    echo "because it is 19. Pick a genuinely short changelog instead." >&2
+    exit 1
+  }
+}
+
+# 11. The other half of the contract: what must be REJECTED. Without these the
+#     validator could degenerate to `exit 0` and tests 9 and 10 would still pass.
+@test "the changelog validator rejects unusable output" {
+  tmp="$(mktemp -d)"
+
+  printf '   \n\n  \n' > "$tmp/whitespace.md"
+  if "$REPO_ROOT/hack/validate-changelog.sh" "$tmp/whitespace.md" 1.6.0 >/dev/null 2>&1; then
+    echo "Validator accepted a whitespace-only file — it would publish as blank release notes." >&2
+    exit 1
+  fi
+
+  : > "$tmp/empty.md"
+  if "$REPO_ROOT/hack/validate-changelog.sh" "$tmp/empty.md" 1.6.0 >/dev/null 2>&1; then
+    echo "Validator accepted an empty file." >&2; exit 1; fi
+
+  if "$REPO_ROOT/hack/validate-changelog.sh" "$tmp/absent.md" 1.6.0 >/dev/null 2>&1; then
+    echo "Validator accepted a nonexistent file." >&2; exit 1; fi
+
+  # Truncated mid-stream: head intact, tail (the compare link) lost. This is the
+  # realistic AI failure — a timeout or quota cutoff partway through the write.
+  head -8 "$REPO_ROOT/docs/changelogs/v1.5.1.md" > "$tmp/truncated.md"
+  if "$REPO_ROOT/hack/validate-changelog.sh" "$tmp/truncated.md" 1.5.1 >/dev/null 2>&1; then
+    echo "Validator accepted a truncated changelog — a fragment would be published" >&2
+    echo "verbatim as the release body." >&2
+    exit 1
+  fi
+
+  # Right shape, wrong version: a stale file left by a previous promotion, or a
+  # changelog generated against the rc tag instead of the stable one.
+  if "$REPO_ROOT/hack/validate-changelog.sh" "$REPO_ROOT/docs/changelogs/v1.5.1.md" 1.6.0 >/dev/null 2>&1; then
+    echo "Validator accepted v1.5.1's changelog as v1.6.0's release body." >&2
+    exit 1
+  fi
+  rm -rf "$tmp"
+}
+
+# 12. The workflow must actually call the script. Keeping the predicates in a
+#     tested script helps nothing if the step quietly reverts to an inline check.
+#     Now in the reusable generation core.
+@test "the generation core calls the changelog validator script" {
+  block="$(job_block changelog "$GENERATE")"
+  printf '%s\n' "$block" | grep -q 'hack/validate-changelog.sh' || {
+    echo "The Verify changelog step no longer calls hack/validate-changelog.sh." >&2
+    echo "An inline reimplementation would not be covered by tests 9-11." >&2
+    exit 1
+  }
+  # And a rejected changelog must not fail the job — generation is non-blocking.
+  printf '%s\n' "$block" | grep -q "present=false" || {
+    echo "The Verify changelog step no longer has a present=false path; a rejected" >&2
+    echo "changelog would fail the job instead of degrading gracefully." >&2
+    exit 1
+  }
+}
+
+# 13. The agent reads docs/agents/changelog.md from the WORKING TREE, which is the
+#     rc tag — a commit that predates this workflow. Every rc cut before this
+#     change carries the old §2, which lists only two valid configurations and
+#     tells the agent to STOP on anything else; a detached rc-tag checkout is
+#     exactly that. Without the overlay a compliant agent declines to generate on
+#     every promotion of an existing rc, silently. hack/validate-changelog.sh is
+#     absent from those trees for the same reason, and the Verify step would then
+#     die on "command not found".
+#
+#     Asserting the doc's content on the current branch (test 5) is necessary but
+#     NOT sufficient — that copy is not the one the agent reads.
+@test "the generation core overlays the agent instructions and validator from the dispatch ref" {
+  block="$(job_block changelog "$GENERATE")"
+
+  overlay="$(printf '%s\n' "$block" | awk '
+    /^      - name: Refresh agent instructions$/ { inside = 1; next }
+    /^      - name: / { inside = 0 }
+    inside')"
+  [ -n "$overlay" ] || {
+    echo "The changelog job has no step refreshing docs/agents/changelog.md from the" >&2
+    echo "dispatch ref. Promoting any rc tagged before this change would present the" >&2
+    echo "agent with instructions that reject its own checkout state." >&2
+    exit 1
+  }
+
+  printf '%s\n' "$overlay" | grep -q 'cp .release-tooling/docs/agents/changelog.md' || {
+    echo "The refresh step no longer overlays docs/agents/changelog.md from the" >&2
+    echo "tooling checkout." >&2
+    exit 1
+  }
+
+  # Every job that runs release tooling against an older checkout must source it
+  # from the dispatch ref. A script fetched by a script that is itself missing
+  # solves nothing, so this is done by a second actions/checkout, not by shell.
+  # The generation core carries it; promote / open-pr (which run tooling against
+  # the rc tree) carry it; changelog-rc's commit job (which runs the validator
+  # against the rc staging branch) carries it.
+  for pair in "promote:$PROMOTE" "open-pr:$PROMOTE" "changelog:$GENERATE" "commit:$RC_WRAPPER"; do
+    job="${pair%%:*}"; file="${pair#*:}"
+    jb="$(job_block "$job" "$file")"
+    printf '%s\n' "$jb" | grep -q 'path: .release-tooling' || {
+      echo "Job '$job' in $(basename "$file") has no .release-tooling checkout, but runs" >&2
+      echo "tooling that the older checkout does not carry — it would fail with" >&2
+      echo "'command not found'." >&2
+      exit 1
+    }
+  done
+
+  # And that scratch path must never be committed: promote runs `git add -A`.
+  grep -qE '^\.release-tooling' "$REPO_ROOT/.gitignore" || {
+    echo ".release-tooling is not gitignored; promote's 'git add -A' would commit" >&2
+    echo "the entire tooling checkout onto the release branch." >&2
+    exit 1
+  }
+}
+
+# 14. The non-blocking guarantee has to survive the whole job, not just the
+#     job-level `if:`. A fatal artifact download would stop open-pr before the PR
+#     step — the same wedge, one step further down — and the PR-body/commit
+#     decisions must key off what is actually on disk rather than an upstream
+#     job's output, which says nothing about whether the transfer succeeded.
+@test "open-pr survives an artifact transfer failure and keys off the file on disk" {
+  block="$(job_block open-pr "$PROMOTE")"
+
+  dl="$(printf '%s\n' "$block" | awk '
+    /^      - name: Download changelog artifact$/ { inside = 1; next }
+    /^      - name: / { inside = 0 }
+    inside')"
+  [ -n "$dl" ] || { echo "Could not locate the Download changelog artifact step" >&2; exit 1; }
+  printf '%s\n' "$dl" | grep -q 'continue-on-error: true' || {
+    echo "The artifact download is fatal. A transient transfer failure would abort" >&2
+    echo "open-pr before the PR is created, leaving a pushed staging branch and a" >&2
+    echo "drafted release with no promote PR." >&2
+    exit 1
+  }
+
+  printf '%s\n' "$block" | grep -q 'Confirm changelog on disk' || {
+    echo "open-pr no longer re-establishes changelog presence from the filesystem" >&2
+    echo "after the download." >&2
+    exit 1
+  }
+
+  # The commit and the PR body must both read the on-disk result.
+  printf '%s\n' "$block" | grep -qE "steps\.usable\.outputs\.present == 'true'" || {
+    echo "The commit step no longer gates on steps.usable (the on-disk check)." >&2
+    exit 1
+  }
+  printf '%s\n' "$block" | grep -q 'steps.usable.outputs.present' || {
+    echo "The PR body no longer reflects the on-disk changelog state — it could" >&2
+    echo "claim ✅ for a changelog that never arrived." >&2
+    exit 1
+  }
+  printf '%s\n' "$block" | grep -qE "CHANGELOG_PRESENT:.*needs\.changelog\.outputs\.present" && {
+    echo "The PR body still keys off needs.changelog.outputs.present, which is true" >&2
+    echo "even when the artifact failed to transfer." >&2
+    exit 1
+  }
+  return 0
+}
+
+# 15. A pre-existing changelog reaches open-pr by routes that skip generation
+#     entirely — hand-written into the rc tree, or preserved by promote across the
+#     force-push — so nothing else has validated it. Accepting "non-empty" there
+#     would let a truncated hand-commit be advertised with ✅ and published
+#     verbatim as the release body, bypassing the validator completely.
+@test "a pre-existing changelog is validated, not merely non-empty" {
+  block="$(job_block open-pr "$PROMOTE")"
+  existing="$(printf '%s\n' "$block" | awk '
+    /^      - name: Check for an existing changelog on the branch$/ { inside = 1; next }
+    /^      - name: / { inside = 0 }
+    inside')"
+  [ -n "$existing" ] || { echo "Could not locate the existing-changelog check" >&2; exit 1; }
+  printf '%s\n' "$existing" | grep -q 'hack/validate-changelog.sh' || {
+    echo "The existing-changelog check accepts any non-empty file without validating" >&2
+    echo "it. A truncated hand-commit would be published as the release body." >&2
+    exit 1
+  }
+
+  # The backstop has the same exposure: it commits either a ported or a generated
+  # file, and update-releasenotes.yaml pushes whatever merges into the release body.
+  tags_block="$(job_block generate-changelog "$TAGS")"
+  printf '%s\n' "$tags_block" | grep -q 'hack/validate-changelog.sh' || {
+    echo "The tags.yaml backstop no longer validates the changelog before opening" >&2
+    echo "its PR." >&2
+    exit 1
+  }
+}
+
+# 16. promote-rc parses the rc tag ONCE, in a cheap `parse` job that REJECTS
+#     whitespace (not `.trim()`), and its changelog job is a thin `uses:` of the
+#     reusable core fed that validated tag. Before this, promote's parse trimmed-
+#     and-accepted a whitespace-bearing tag while the parallel changelog job (raw
+#     input, whitespace-rejecting) refused it — so promote pushed the stable
+#     branch and open-pr opened a PR with NO changelog. One parse, one policy.
+@test "promote-rc parses once (rejecting whitespace) and feeds the reusable core the validated tag" {
+  grep -qE '^on:' "$GENERATE" && grep -q 'workflow_call:' "$GENERATE" || {
+    echo "changelog-generate.yaml is not a workflow_call reusable workflow." >&2
+    exit 1
+  }
+
+  # A dedicated parse job that rejects whitespace outright (no trim-and-accept).
+  parse_block="$(job_block parse "$PROMOTE")"
+  [ -n "$parse_block" ] || { echo "promote-rc has no top-level parse job" >&2; exit 1; }
+  printf '%s\n' "$parse_block" | grep -qF '/\s/.test(rc)' || {
+    echo "promote-rc's parse no longer rejects whitespace in the rc tag. A trimmed-" >&2
+    echo "and-accepted tag would be pushed by promote while the changelog job rejects" >&2
+    echo "it — a promote PR with no changelog." >&2
+    exit 1
+  }
+  printf '%s\n' "$parse_block" | grep -qF '.trim()' && {
+    echo "promote-rc's parse still trims the rc tag (trim-and-accept). It must reject" >&2
+    echo "whitespace outright so its policy matches the changelog job's." >&2
+    exit 1
+  }
+
+  block="$(job_block changelog "$PROMOTE")"
+  [ -n "$block" ] || { echo "Could not locate the changelog job in $PROMOTE" >&2; exit 1; }
+  printf '%s\n' "$block" | grep -qE 'uses: \./\.github/workflows/changelog-generate\.yaml' || {
+    echo "promote-rc's changelog job no longer calls the reusable changelog-generate.yaml." >&2
+    echo "Re-inlining the steps drifts the promote-time and rc-time generation paths apart." >&2
+    exit 1
+  }
+  # The steps live in the reusable workflow now, not here.
+  printf '%s\n' "$block" | grep -qE '^\s*steps:' && {
+    echo "promote-rc's changelog job declares its own steps AND a uses: — invalid," >&2
+    echo "and a sign the extraction was only half done." >&2
+    exit 1
+  }
+  # It must depend on parse and be handed the VALIDATED tag, never raw input.
+  printf '%s\n' "$block" | code_lines | grep -qE '^\s+needs: parse$' || {
+    echo "promote-rc's changelog job does not declare 'needs: parse' — it would not" >&2
+    echo "receive the validated tag and would race promote's parse." >&2
+    exit 1
+  }
+  printf '%s\n' "$block" | grep -qE 'rc_tag: \$\{\{ needs\.parse\.outputs\.rc_tag \}\}' || {
+    echo "promote-rc's changelog job is not fed needs.parse.outputs.rc_tag." >&2
+    exit 1
+  }
+  printf '%s\n' "$block" | grep -qE 'rc_tag: \$\{\{ inputs\.rc_tag \}\}' && {
+    echo "promote-rc's changelog job still passes raw inputs.rc_tag to the reusable" >&2
+    echo "core instead of the validated parse output." >&2
+    exit 1
+  }
+  # promote must also depend on parse (so the whole promotion aborts on a bad tag).
+  printf '%s\n' "$(job_block promote "$PROMOTE")" | code_lines | grep -qE '^\s+needs: parse$' || {
+    echo "promote-rc's promote job does not declare 'needs: parse'." >&2
+    exit 1
+  }
+
+  # The AI secret pair (and the Copilot token) must be forwarded, or generation
+  # cannot mint its read-only token.
+  for s in COZYSTACK_CI_APP_ID COZYSTACK_CI_PRIVATE_KEY COPILOT_GITHUB_TOKEN; do
+    printf '%s\n' "$block" | grep -q "$s:" || {
+      echo "promote-rc's changelog job does not pass secret '$s' to the reusable core." >&2
+      exit 1
+    }
+  done
+
+  # The reusable core must actually declare those three secrets, or a caller that
+  # forgets one would fail only at the AI step rather than at parse time.
+  for s in COZYSTACK_CI_APP_ID COZYSTACK_CI_PRIVATE_KEY COPILOT_GITHUB_TOKEN; do
+    grep -q "$s:" "$GENERATE" || {
+      echo "changelog-generate.yaml does not declare secret '$s' in its workflow_call interface." >&2
+      exit 1
+    }
+  done
+}
+
+# 17. open-pr consumes the reusable core's `present` output through
+#     needs.changelog.outputs.present. If the reusable workflow stops exporting it,
+#     open-pr's download gate silently reads empty and never fetches the artifact.
+@test "the reusable core exposes present and open-pr still keys off it" {
+  # Declared as a workflow_call output mapped from the job.
+  grep -qE '^\s+present:' "$GENERATE" || {
+    echo "changelog-generate.yaml no longer declares a 'present' output." >&2
+    exit 1
+  }
+  grep -q 'value: ${{ jobs.changelog.outputs.present }}' "$GENERATE" || {
+    echo "changelog-generate.yaml's present output is not mapped from the job's output." >&2
+    exit 1
+  }
+
+  open_block="$(job_block open-pr "$PROMOTE")"
+  printf '%s\n' "$open_block" | grep -qE "needs\.changelog\.outputs\.present == 'true'" || {
+    echo "open-pr's Download step no longer gates on needs.changelog.outputs.present." >&2
+    echo "It would try to download the artifact even when none was produced." >&2
+    exit 1
+  }
+}
+
+# 18. The reusable core delegates changelog-source selection to the extracted,
+#     behaviour-tested hack/select-changelog-source.sh — validate-then-fall-
+#     through across rc tag tree -> rc staging branch -> generate. The LOGIC is
+#     proven by execution in hack/release-changelog-behaviour.bats; here we pin
+#     that the script exists, still embodies the fall-through in the right order,
+#     and is actually wired into the check step on an executable line (not a
+#     comment, and not reverted to a fragile inline copy).
+@test "the generation core delegates source selection to the extracted script" {
+  script="$REPO_ROOT/hack/select-changelog-source.sh"
+  [ -x "$script" ] || { echo "hack/select-changelog-source.sh missing or not executable" >&2; exit 1; }
+
+  grep -q 'changelog-preserve.sh' "$script" || {
+    echo "select-changelog-source.sh no longer fetches the rc staging branch." >&2; exit 1; }
+  grep -q 'validate-changelog.sh' "$script" || {
+    echo "select-changelog-source.sh no longer validates each source." >&2; exit 1; }
+  grep -q 'rm -f' "$script" || {
+    echo "select-changelog-source.sh no longer discards an invalid source — it could" >&2
+    echo "then suppress a valid lower-priority one." >&2; exit 1; }
+
+  # Priority: the rc-tag-tree check must precede the rc-staging-branch fetch. Key
+  # on the actual code — the `-s "$CL"` test and the `"$PRESERVE"` invocation —
+  # over comment-stripped lines, so the `changelog-preserve.sh` mention in the
+  # header/assignment does not skew the order.
+  tag_line="$(code_lines < "$script" | grep -n '\-s "\$CL"' | head -1 | cut -d: -f1)"
+  branch_line="$(code_lines < "$script" | grep -n '"\$PRESERVE"' | head -1 | cut -d: -f1)"
+  [ -n "$tag_line" ] && [ -n "$branch_line" ] && [ "$tag_line" -lt "$branch_line" ] || {
+    echo "select-changelog-source.sh does not check the rc tag tree before the rc" >&2
+    echo "staging branch — a stale branch file could mask a hand-written tag-tree one." >&2
+    exit 1
+  }
+
+  # The reusable core must actually call it, exactly once, on an executable line.
+  check="$(job_block changelog "$GENERATE" | awk '
+    /^      - name: Check if changelog already exists$/ { inside = 1; next }
+    /^      - name: / { inside = 0 }
+    inside')"
+  [ -n "$check" ] || { echo "Could not locate the skip-check step in the generation core" >&2; exit 1; }
+  [ "$(printf '%s\n' "$check" | code_lines | grep -cF 'select-changelog-source.sh')" -eq 1 ] || {
+    echo "The generation core's check step does not call select-changelog-source.sh" >&2
+    echo "exactly once on an executable line (a comment, or a reverted inline copy)." >&2
+    exit 1
+  }
+}
+
+# 19. The rc-time button is a maintainer-triggered entry point taking a free-form
+#     tag. It must validate against the strict rc pattern via the shared,
+#     behaviour-tested hack/parse-rc-tag.sh (which REJECTS whitespace rather than
+#     stripping it — see finding 2 / the behaviour suite) before anything mints a
+#     token, checks out a ref, or touches git.
+@test "changelog-rc validates the rc tag via the shared strict parser" {
+  script="$REPO_ROOT/hack/parse-rc-tag.sh"
+  [ -x "$script" ] || { echo "hack/parse-rc-tag.sh missing or not executable" >&2; exit 1; }
+
+  # The script is the strict gate: anchored rc regex + whitespace rejection.
+  grep -qE '\^v\[0-9\]\+\\\.\[0-9\]\+\\\.\[0-9\]\+-rc\\\.\[0-9\]\+\$' "$script" || {
+    echo "parse-rc-tag.sh no longer anchors the rc regex ^vX.Y.Z-rc.N\$." >&2
+    exit 1
+  }
+  grep -q 'must not contain whitespace' "$script" || {
+    echo "parse-rc-tag.sh no longer rejects whitespace outright — a stripped variant" >&2
+    echo "would land in a different concurrency lane racing to push the same branch." >&2
+    exit 1
+  }
+
+  # changelog-rc's parse job must actually call it.
+  parse_block="$(job_block parse "$RC_WRAPPER")"
+  printf '%s\n' "$parse_block" | grep -q 'parse-rc-tag.sh' || {
+    echo "changelog-rc's parse job no longer calls hack/parse-rc-tag.sh — a divergent" >&2
+    echo "inline copy would not be covered by the behaviour suite." >&2
+    exit 1
+  }
+
+  # The reusable core inlines the same rules (its parse runs before any checkout,
+  # so it cannot call the script) — pin that it too rejects whitespace.
+  gen_parse="$(job_block changelog "$GENERATE")"
+  printf '%s\n' "$gen_parse" | grep -q 'must not contain whitespace' || {
+    echo "The reusable core's parse no longer rejects whitespace (it must mirror" >&2
+    echo "parse-rc-tag.sh); a stripped tag could be silently rewritten." >&2
+    exit 1
+  }
+
+  # No consumer may check out or act on raw dispatch input.
+  commit_block="$(job_block commit "$RC_WRAPPER")"
+  printf '%s\n' "$commit_block" | grep -qE 'ref: \$\{\{ inputs\.rc_tag \}\}' && {
+    echo "changelog-rc's commit job checks out raw inputs.rc_tag rather than the" >&2
+    echo "reconstructed parse output." >&2
+    exit 1
+  }
+  return 0
+}
+
+# 20. The rc-time button must call the SAME reusable core promote-rc uses — a
+#     forked second copy of the generation steps would drift and defeat the whole
+#     point of the extraction.
+@test "changelog-rc calls the shared reusable generation core" {
+  gen_block="$(job_block generate "$RC_WRAPPER")"
+  [ -n "$gen_block" ] || { echo "Could not locate the generate job in $RC_WRAPPER" >&2; exit 1; }
+  printf '%s\n' "$gen_block" | grep -qE 'uses: \./\.github/workflows/changelog-generate\.yaml' || {
+    echo "changelog-rc.yaml does not call the reusable changelog-generate.yaml — it" >&2
+    echo "has forked the generation logic instead of sharing it with promote-rc." >&2
+    exit 1
+  }
+  for s in COZYSTACK_CI_APP_ID COZYSTACK_CI_PRIVATE_KEY COPILOT_GITHUB_TOKEN; do
+    printf '%s\n' "$gen_block" | grep -q "$s:" || {
+      echo "changelog-rc's generate job does not pass secret '$s' to the reusable core." >&2
+      exit 1
+    }
+  done
+}
+
+# 21. Finding 1: the rc staging branch existence is validated UP FRONT — in the
+#     parse job, which `generate` depends on — so a missing branch fails in
+#     seconds rather than after a 30-minute AI generation whose output has nowhere
+#     to land. The check must be structurally before generation, not merely
+#     present somewhere.
+@test "changelog-rc verifies the rc staging branch up front, before generation" {
+  # rc_branch is derived by the shared parser, and the branch check runs in parse.
+  grep -qE 'rc_branch=release-' "$REPO_ROOT/hack/parse-rc-tag.sh" || {
+    echo "hack/parse-rc-tag.sh no longer derives the rc staging branch release-X.Y.Z-rc.N." >&2
+    exit 1
+  }
+
+  parse_block="$(job_block parse "$RC_WRAPPER")"
+  [ -n "$parse_block" ] || { echo "Could not locate the parse job in $RC_WRAPPER" >&2; exit 1; }
+
+  # The clear, dedicated missing-branch failure lives in parse (not commit), on an
+  # executable line (code_lines strips comments) and probed with git ls-remote.
+  printf '%s\n' "$parse_block" | code_lines | grep -qi 'staging branch.* does not exist' || {
+    echo "changelog-rc's parse job has no clear 'rc staging branch does not exist'" >&2
+    echo "failure on an executable line — a missing branch would surface only as a" >&2
+    echo "generic checkout error, and only AFTER generation ran." >&2
+    exit 1
+  }
+  printf '%s\n' "$parse_block" | code_lines | grep -q 'git ls-remote' || {
+    echo "changelog-rc's parse job no longer probes the branch with git ls-remote." >&2
+    exit 1
+  }
+
+  # Structural order: generate DEPENDS on parse (executable line, exactly once),
+  # so the branch check (a parse step) is guaranteed to run — and pass — before
+  # generation ever starts. A comment or dead block cannot satisfy this.
+  gen_block="$(job_block generate "$RC_WRAPPER")"
+  [ "$(printf '%s\n' "$gen_block" | code_lines | grep -cE '^[[:space:]]+needs: parse$')" -eq 1 ] || {
+    echo "changelog-rc's generate job does not declare 'needs: parse' exactly once on an" >&2
+    echo "executable line. The up-front branch check would then not gate generation." >&2
+    exit 1
+  }
+  # And the branch check must NOT have regressed back into the commit job only.
+  commit_block="$(job_block commit "$RC_WRAPPER")"
+  printf '%s\n' "$commit_block" | code_lines | grep -qi 'staging branch.* does not exist' && {
+    echo "The missing-branch check is in the commit job — that runs AFTER generation," >&2
+    echo "reintroducing the late-validation defect. It belongs in parse." >&2
+    exit 1
+  }
+  return 0
+}
+
+# 22. The rc-time result is banked on the rc STAGING branch release-X.Y.Z-rc.N as
+#     docs/changelogs/vX.Y.Z.md — the stable name promote's pickup and finalize
+#     both expect. The commit must be idempotent (re-pressing the button must not
+#     pile up duplicate commits), validated, and hard-fail on an empty result.
+@test "changelog-rc commits to the rc staging branch idempotently and validated" {
+  commit_block="$(job_block commit "$RC_WRAPPER")"
+  [ -n "$commit_block" ] || { echo "Could not locate the commit job in $RC_WRAPPER" >&2; exit 1; }
+
+  # It pushes to the rc staging branch (release-*-rc.*), not the stable one —
+  # exactly once, on an executable line (a comment or dead `if false` block that
+  # merely contains the string cannot satisfy this).
+  [ "$(printf '%s\n' "$commit_block" | code_lines | grep -cF 'git push origin "HEAD:refs/heads/${RC_BRANCH}"')" -eq 1 ] || {
+    echo "changelog-rc's commit job no longer pushes to the rc staging branch exactly" >&2
+    echo "once on an executable line." >&2
+    exit 1
+  }
+
+  # Compare-before-push idempotency: an unchanged file must be a green no-op.
+  printf '%s\n' "$commit_block" | code_lines | grep -qF 'git diff --cached --quiet' || {
+    echo "changelog-rc's commit is not idempotent — re-pressing the button would pile" >&2
+    echo "up duplicate 'docs: add changelog' commits on the rc staging branch." >&2
+    exit 1
+  }
+
+  # It validates before committing (same gate as the reusable core / open-pr).
+  printf '%s\n' "$commit_block" | grep -q 'hack/validate-changelog.sh' || {
+    echo "changelog-rc commits without validating — a truncated file could be banked" >&2
+    echo "on the rc staging branch and later published verbatim." >&2
+    exit 1
+  }
+
+  # An empty generation result must fail LOUDLY here (unlike open-pr's silent
+  # degrade), because this is an explicit maintainer action.
+  printf '%s\n' "$commit_block" | grep -qE "PRESENT.*!= .true." || {
+    echo "changelog-rc's commit job does not hard-fail when generation produced no" >&2
+    echo "usable changelog — the maintainer would get a green run and no committed file." >&2
+    exit 1
+  }
+}
+
+# 23. The artifact is the hand-off between the generation core and BOTH consumers.
+#     A name mismatch means the download silently finds nothing and the changelog
+#     never lands. Pin that producer and both consumers use the identical name.
+@test "the changelog artifact name is identical across producer and both consumers" {
+  # Producer: the reusable core's upload step.
+  grep -q 'name: changelog-v${{ steps.parse.outputs.stable_version }}' "$GENERATE" || {
+    echo "changelog-generate.yaml no longer uploads the artifact as changelog-vX.Y.Z." >&2
+    exit 1
+  }
+  # Consumer 1: promote-rc's open-pr download.
+  grep -q 'name: changelog-v${{ needs.promote.outputs.stable_version }}' "$PROMOTE" || {
+    echo "promote-rc's open-pr no longer downloads the artifact by the changelog-vX.Y.Z name." >&2
+    exit 1
+  }
+  # Consumer 2: changelog-rc's commit download.
+  grep -q 'name: changelog-v${{ needs.parse.outputs.stable_version }}' "$RC_WRAPPER" || {
+    echo "changelog-rc's commit job no longer downloads the artifact by the changelog-vX.Y.Z name." >&2
+    exit 1
+  }
+}
diff --git a/hack/release-freeze-contract.bats b/hack/release-freeze-contract.bats
new file mode 100644
index 0000000000..30a6e20bbc
--- /dev/null
+++ b/hack/release-freeze-contract.bats
@@ -0,0 +1,630 @@
+#!/usr/bin/env bats
+
+# Contract for the rc freeze, the backport target resolution that depends on it,
+# the triggering and concurrency rules that decide whether a backport runs at
+# all, and the agreement between those rules and cmd/backport-audit, which
+# gates a cut by reproducing them. Like promote-gate-contract.bats, these tests pin executable/structural
+# workflow lines rather than prose: a commented-out gate or a guard demoted to a
+# comment must never satisfy the contract.
+#
+# Neither workflow can be exercised by a PR lane. cut-prerelease.yaml runs only
+# on workflow_dispatch from main or a release line, and its whole purpose is a
+# one-way, write-once side effect — the first vX.Y.0-rc.N freezes the line, and
+# there is no dry-run mode and no undo short of deleting the branch by hand.
+# backport.yaml runs only on a merged main-targeted PR. So every invariant below
+# is one that first reports a slip at a real release, on the one commit nobody
+# wants to be debugging: getting the freeze condition wrong re-opens a frozen
+# line silently, and getting the comparator wrong aims every backport at the
+# wrong branch. Cheap to pin here, expensive to discover there.
+
+load test_helper
+
+REPO_ROOT="$(cd "$(dirname "${BATS_TEST_FILENAME:-$0}")/.." && pwd)"
+CUT="$REPO_ROOT/.github/workflows/cut-prerelease.yaml"
+BACKPORT="$REPO_ROOT/.github/workflows/backport.yaml"
+AUDIT="$REPO_ROOT/cmd/backport-audit/main.go"
+
+# Strip YAML comments. POSIX `grep` only: the unit-test runner has no ripgrep.
+# grep exits 1 when nothing is selected (legitimate for an all-comment block)
+# and 2 on a real error. Do not read the `rc` check below as what catches
+# that: code_lines is never the last stage of a pipeline in this file, so
+# ordinary (non-pipefail) pipe semantics discard whatever it itself returns,
+# and `hack/cozytest.sh`'s translator appends `return 0` to every line that is
+# exactly `}`, code_lines' closing brace included, making its own exit status
+# even less trustworthy as a signal. What catches a real grep error is the
+# OUTPUT, and only for one class of pin: the error empties code_lines' stream,
+# so a pin that requires something to be present in that stream fails on it. A
+# pin demanding an absence stays blind, because an exact count of zero is what
+# an emptied stream produces anyway, and what the pin was written to assert.
+# The `[ -n "$block" ]` guard at the top of a test is not that check: it runs
+# on the raw awk extraction, upstream of code_lines, and cannot see it fail.
+code_lines() {
+  local rc=0
+  grep -v '^[[:space:]]*#' || rc=$?
+  [ "$rc" -le 1 ]
+}
+
+# Strip JavaScript comments. backport.yaml's logic lives in a github-script
+# `script: |` block, where comments start with `//` and survive code_lines
+# untouched — and that block's comments name the very APIs these tests assert
+# are gone, so filtering on `#` alone would let a comment satisfy a pin.
+script_lines() {
+  local rc=0
+  grep -v '^[[:space:]]*//' || rc=$?
+  [ "$rc" -le 1 ]
+}
+
+# Body of one job, up to the next top-level job key.
+job_block() {
+  awk -v job="  $1:" '
+    $0 == job { inside = 1; next }
+    /^  [a-z0-9_-]+:$/ { inside = 0 }
+    inside' "$2"
+}
+
+# Body of one `- name:` step, up to the next step at the same indent.
+step_block() {
+  awk -v want="      - name: $1" '
+    $0 == want { inside = 1; next }
+    /^      - name: / { inside = 0 }
+    inside' "$2"
+}
+
+# Line number of a step within the comment-stripped file, for ordering asserts.
+# Compared only against other stripped line numbers.
+step_line() {
+  code_lines < "$2" | grep -nF "      - name: $1" | awk -F: 'NR == 1 { print $1 }'
+}
+
+@test "workflows under contract exist" {
+  [ -f "$CUT" ]
+  [ -f "$BACKPORT" ]
+}
+
+# ── the freeze condition ─────────────────────────────────────────────────────
+# The freeze is create-only and one-way. Widening this condition is the single
+# change that re-opens a frozen line without any error surfacing: an alpha/beta
+# cut, or a patch-line rc, would branch or re-touch release-X.Y off a tree that
+# is not the one the line was frozen at.
+
+@test "freeze is gated to the first rc of a minor (kind rc, patch 0)" {
+  block="$(step_block 'Freeze the line (create release-X.Y)' "$CUT")"
+  [ -n "$block" ]
+
+  # Both halves, as one expression, on a live (non-comment) line, and INSIDE the
+  # freeze step. Dropping patch == '0' freezes on every patch-line rc; widening
+  # kind freezes on an alpha/beta cut from a still-open main. Scoped to the block
+  # rather than the file so that some other step carrying the same condition
+  # cannot keep this green after the freeze step loses its own guard.
+  count="$(printf '%s\n' "$block" | code_lines | grep -cF "        if: steps.parse.outputs.kind == 'rc' && steps.parse.outputs.patch == '0'" || true)"
+  [ "${count:-0}" -eq 1 ]
+
+  # The step id the artifact dispatch below gates on. Losing it makes that gate
+  # read an empty output, so it is permanently false and a newly frozen line
+  # silently never gets its packages artifact.
+  count="$(printf '%s\n' "$block" | code_lines | grep -cF '        id: freeze' || true)"
+  [ "${count:-0}" -eq 1 ]
+}
+
+@test "freeze creates the branch without force, and no-ops when it exists" {
+  block="$(step_block 'Freeze the line (create release-X.Y)' "$CUT")"
+  [ -n "$block" ]
+
+  # The create push, verbatim and non-forced. A force-push here would move an
+  # existing release-X.Y onto the new tip, dragging in everything merged since
+  # the freeze — the exact outcome the branch exists to prevent.
+  count="$(printf '%s\n' "$block" | code_lines | grep -cF 'if ! git push origin "HEAD:refs/heads/$BRANCH"; then' || true)"
+  [ "${count:-0}" -eq 1 ]
+
+  # No force in any shape: an explicit flag, or a refspec that opens with `+`,
+  # which forces that ref alone and needs no flag at all — `git push origin
+  # "+HEAD:refs/heads/$BRANCH"` force-moves the branch while reading as an
+  # ordinary push.
+  count="$(printf '%s\n' "$block" | code_lines | grep -cE 'git push[^|&;]*(--force|--force-with-lease|[[:space:]]-f[[:space:]])' || true)"
+  [ "${count:-0}" -eq 0 ]
+  count="$(printf '%s\n' "$block" | code_lines | grep -cE "git push[^|&;]*[[:space:]][\"']?[+]" || true)"
+  [ "${count:-0}" -eq 0 ]
+
+  # An existing branch is left alone rather than reused as a create target.
+  printf '%s\n' "$block" | code_lines | grep -qF 'leaving it untouched'
+}
+
+@test "the pre-release tag push is not forced either" {
+  block="$(step_block 'Cut and push the pre-release tag' "$CUT")"
+  [ -n "$block" ]
+
+  # Non-forced is what makes the tag write-once at the git layer, independently
+  # of the ls-remote guard above it.
+  count="$(printf '%s\n' "$block" | code_lines | grep -cF 'git push origin "HEAD:refs/tags/$TAG"' || true)"
+  [ "${count:-0}" -eq 1 ]
+  count="$(printf '%s\n' "$block" | code_lines | grep -cE 'git push[^|&;]*(--force|--force-with-lease|[[:space:]]-f[[:space:]])' || true)"
+  [ "${count:-0}" -eq 0 ]
+  # A leading `+` on the refspec forces the ref with no flag, which for a tag
+  # means overwriting a published pre-release in place.
+  count="$(printf '%s\n' "$block" | code_lines | grep -cE "git push[^|&;]*[[:space:]][\"']?[+]" || true)"
+  [ "${count:-0}" -eq 0 ]
+}
+
+# ── the refuse gate ──────────────────────────────────────────────────────────
+
+@test "refusing a frozen line is gated on a main dispatch" {
+  block="$(step_block 'Refuse to cut a frozen line from main' "$CUT")"
+  [ -n "$block" ]
+
+  # Only a main dispatch can smuggle main's tip into a frozen line; a dispatch
+  # from release-X.Y is already the frozen tree. Losing this guard lets rc.2 be
+  # cut from main again, which is the regression the freeze was built to fix.
+  # Scoped to this step: `github.ref_name == 'main'` is a plausible condition
+  # elsewhere in the file, and an unscoped count would accept it as this pin.
+  count="$(printf '%s\n' "$block" | code_lines | grep -cF "        if: github.ref_name == 'main'" || true)"
+  [ "${count:-0}" -eq 1 ]
+
+  # It must fail closed: an ls-remote that neither found the branch (2) nor
+  # succeeded (0) is a transport failure, not proof the line is unfrozen.
+  printf '%s\n' "$block" | code_lines | grep -qF 'refusing to proceed'
+}
+
+@test "the refuse gate runs before the tag push, and the freeze after it" {
+  refuse="$(step_line 'Refuse to cut a frozen line from main' "$CUT")"
+  push="$(step_line 'Cut and push the pre-release tag' "$CUT")"
+  freeze="$(step_line 'Freeze the line (create release-X.Y)' "$CUT")"
+  [ -n "$refuse" ] && [ -n "$push" ] && [ -n "$freeze" ]
+
+  # Refuse first: pre-release tag names are write-once, so a mistaken dispatch
+  # must fail before it burns one.
+  [ "$refuse" -lt "$push" ]
+
+  # Freeze last: the branch has to be created at the commit that was actually
+  # tagged, so it follows the push that proved the tip had not moved.
+  [ "$push" -lt "$freeze" ]
+}
+
+# ── the frozen line's packages artifact ──────────────────────────────────────
+
+@test "freezing a line dispatches its first build-release run" {
+  BUILD_RELEASE="$REPO_ROOT/.github/workflows/build-release.yaml"
+  [ -f "$BUILD_RELEASE" ]
+
+  # build-release.yaml publishes cozystack-packages:<line> on push to a line
+  # branch, but it carries a paths-ignore filter, and GitHub does not run a
+  # path-filtered workflow for a push that changes no files. The freeze push
+  # carries no new commits, so it cannot be what builds the new line — the
+  # dispatch below is. Keep the button that makes the dispatch possible.
+  count="$(code_lines < "$BUILD_RELEASE" | grep -cF '  workflow_dispatch:' || true)"
+  [ "${count:-0}" -eq 1 ]
+
+  block="$(step_block "Build the frozen line's packages artifact" "$CUT")"
+  [ -n "$block" ]
+  printf '%s\n' "$block" | code_lines | grep -qF 'gh workflow run build-release.yaml --ref "$BRANCH"'
+
+  # Only when this run actually created the branch. Re-dispatching for a line
+  # that was already frozen would rebuild it for no reason. Scoped to this step,
+  # so the pin follows the gate rather than the file.
+  count="$(printf '%s\n' "$block" | code_lines | grep -cF "        if: steps.freeze.outputs.created == 'true'" || true)"
+  [ "${count:-0}" -eq 1 ]
+}
+
+@test "build-release refuses a dispatch from anything but a line branch" {
+  BUILD_RELEASE="$REPO_ROOT/.github/workflows/build-release.yaml"
+  [ -f "$BUILD_RELEASE" ]
+
+  # The push trigger is filtered to release-X.Y, but workflow_dispatch takes any
+  # ref and the Run-workflow UI preselects the default branch — which is where
+  # this workflow's own recovery advice sends an operator. IMAGE_TAG is
+  # github.ref_name, so a dispatch from main spends two hours republishing
+  # cozystack-packages:main and every main image tag, racing build-main.yaml for
+  # the same tags: the 409 collision class #2711 fixed.
+  block="$(step_block 'Refuse a build for a non-line ref' "$BUILD_RELEASE")"
+  [ -n "$block" ]
+
+  # The pattern must be anchored at both ends. Unanchored, release-1.6.1 (a
+  # per-release staging branch) and release-1.6.0-rc.4 both match, and building
+  # those republishes a published release's tags from a staging tree.
+  printf '%s\n' "$block" | code_lines | grep -qF '^release-[0-9]+\.[0-9]+$'
+
+  # And the ref must be a BRANCH. A TAG named release-1.6 satisfies the pattern
+  # on its own, and building from one publishes cozystack-packages:release-1.6
+  # from whatever commit the tag froze rather than from the line's tip. Pinned as
+  # the comparison, not just the env wiring, so passing REF_TYPE in without
+  # testing it does not satisfy this.
+  printf '%s\n' "$block" | code_lines | grep -qF 'REF_TYPE: ${{ github.ref_type }}'
+  printf '%s\n' "$block" | code_lines | grep -qF '"$REF_TYPE" != "branch"'
+
+  # It has to fail, not skip: a job that quietly no-ops looks in the run list
+  # exactly like one that built the artifact the operator is waiting for.
+  printf '%s\n' "$block" | code_lines | grep -qF 'exit 1'
+
+  # And it has to run before the work: a guard placed after checkout and the
+  # OCIR login has already spent the credentials it exists to protect.
+  guard="$(step_line 'Refuse a build for a non-line ref' "$BUILD_RELEASE")"
+  checkout="$(step_line 'Checkout code' "$BUILD_RELEASE")"
+  [ -n "$guard" ] && [ -n "$checkout" ]
+  [ "$guard" -lt "$checkout" ]
+}
+
+# ── backport target resolution ───────────────────────────────────────────────
+# Both assertions below run over script_lines: this logic sits in a
+# github-script block whose comments discuss getLatestRelease and min-1 by name.
+
+@test "backport targets come from enumerated branches, not the latest release" {
+  block="$(job_block prepare "$BACKPORT")"
+  [ -n "$block" ]
+
+  # Enumerate real branches. getLatestRelease returns the newest published
+  # STABLE, which throughout a freeze window still names the PREVIOUS line — so
+  # a `backport` on a fix for the release being stabilised would land on the
+  # wrong branch and miss the release it was written for.
+  printf '%s\n' "$block" | script_lines | grep -qF 'github.paginate(github.rest.repos.listBranches'
+  count="$(printf '%s\n' "$block" | script_lines | grep -cF 'getLatestRelease' || true)"
+  [ "${count:-0}" -eq 0 ]
+
+  # Only branches matching release-<major>.<minor> qualify, so per-release
+  # staging branches (release-1.6.1) and rc branches never become targets.
+  printf '%s\n' "$block" | script_lines | grep -qF 'release-(\d+)\.(\d+)$'
+
+  # previous is the second-newest EXISTING line, never an arithmetic guess. The
+  # old min-1 derivation named a non-existent branch whenever a minor was
+  # skipped.
+  printf '%s\n' "$block" | script_lines | grep -qF 'lines.length > 1 ? lines[1].name'
+  count="$(printf '%s\n' "$block" | script_lines | grep -cE 'parseInt\(min\)[[:space:]]*-[[:space:]]*1|min[[:space:]]*-[[:space:]]*1' || true)"
+  [ "${count:-0}" -eq 0 ]
+
+  # Asking for a previous line when only one exists must fail, not silently
+  # backport nowhere.
+  printf '%s\n' "$block" | script_lines | grep -qF 'core.setFailed'
+}
+
+@test "release lines sort numerically descending so 1.10 outranks 1.9" {
+  block="$(job_block prepare "$BACKPORT")"
+  [ -n "$block" ]
+
+  # Numeric descending on major then minor is the ONLY reason release-1.10
+  # ranks above release-1.9. A slip to the default lexicographic sort compares
+  # the names as strings, puts "release-1.9" first, and aims every backport at
+  # a stale line — with nothing going red.
+  printf '%s\n' "$block" | script_lines | grep -qF '.sort((a, b) => (b.maj - a.maj) || (b.min - a.min))'
+
+  # The comparands must be numbers, not the captured strings.
+  printf '%s\n' "$block" | script_lines | grep -qF 'maj: Number(m[1]), min: Number(m[2])'
+
+  # And the head of that sort is what `backport` uses.
+  printf '%s\n' "$block" | script_lines | grep -qF 'lines[0].name'
+}
+
+# ── skip a target whose backport already merged ─────────────────────────────
+# A second label event on a PR whose first backport already merged (e.g.
+# backport-previous added after backport merged) re-enters this job for the
+# already-delivered target. The cherry-pick is then empty, which the action's
+# draft_commit_conflicts handling misreads as a real conflict and reports as a
+# failed backport on the original PR — this guard skips the re-run instead.
+
+@test "the guard checks merged, not just closed, PRs on the deterministic branch" {
+  block="$(job_block backport "$BACKPORT")"
+  [ -n "$block" ]
+
+  # The branch name the action itself would have used. Checking anything else
+  # answers a different question than "did THIS backport already land".
+  printf '%s\n' "$block" | script_lines | grep -qF 'backport-${context.payload.pull_request.number}-to-${targetBranch}'
+
+  # Closed alone is not enough: a closed-without-merge PR is a stale or
+  # abandoned attempt, not proof the change reached the target. Loosening this
+  # to any closed PR would skip a real retry after a conflict was closed
+  # unmerged.
+  printf '%s\n' "$block" | script_lines | grep -qF "state: 'closed'"
+  printf '%s\n' "$block" | script_lines | grep -qF 'p.merged_at !== null'
+}
+
+@test "both the checkout and the backport-action step are gated on the guard" {
+  block="$(job_block backport "$BACKPORT")"
+  [ -n "$block" ]
+
+  # Losing the gate on either step still runs the action against a target that
+  # already has the change, reproducing the false comment the guard exists to
+  # prevent.
+  count="$(printf '%s\n' "$block" | code_lines | grep -cF "steps.guard.outputs.already_merged != 'true'" || true)"
+  [ "${count:-0}" -eq 2 ]
+}
+
+@test "the guard runs before the checkout and the backport-action step" {
+  guard="$(step_line 'Check for existing merged backport' "$BACKPORT")"
+  checkout="$(step_line 'Checkout repository' "$BACKPORT")"
+  create="$(step_line 'Create back‑port PR' "$BACKPORT")"
+  [ -n "$guard" ] && [ -n "$checkout" ] && [ -n "$create" ]
+
+  [ "$guard" -lt "$checkout" ]
+  [ "$guard" -lt "$create" ]
+}
+
+# Mirrors release-changelog-behaviour.bats's convention for a github-script
+# snippet: extract the decision expression verbatim in shape and execute it
+# under node, because a grep for "merged_at" cannot tell an `.some()` from an
+# `.every()` or a flipped comparison. Two cases are the ones that matter and
+# are NOT interchangeable: the first-ever run (branch never existed, so the
+# API returns an empty list) and a real retry (someone closed a conflicting
+# backport PR without merging it). Both must NOT skip, or either the very
+# first backport attempt or a legitimate re-creation after a manual close
+# never runs.
+@test "the guard's merged decision is correct on empty, closed-unmerged and closed-merged lists" {
+  command -v node >/dev/null || { echo "node unavailable; skipping"; return 0; }
+  tmp="$(mktemp -d)"
+
+  cat > "$tmp/guard.js" <<'JS'
+function alreadyMerged(prs) {
+  return prs.some(p => p.merged_at !== null);
+}
+const cases = {
+  'first-run-empty': [],
+  'closed-unmerged': [{ merged_at: null }],
+  'closed-merged':   [{ merged_at: '2026-01-01T00:00:00Z' }],
+};
+const lines = Object.entries(cases).map(([name, prs]) => name + '=' + alreadyMerged(prs));
+require('fs').writeFileSync(1, lines.join('\n') + '\n');
+JS
+
+  node "$tmp/guard.js" > "$tmp/out.txt" 2>"$tmp/err.txt" || {
+    echo "node failed:" >&2; cat "$tmp/err.txt" >&2; exit 1; }
+
+  want="first-run-empty=false
+closed-unmerged=false
+closed-merged=true"
+  got="$(cat "$tmp/out.txt")"
+  [ "$got" = "$want" ] || {
+    echo "guard decision table is wrong." >&2
+    echo "want:" >&2; printf '%s\n' "$want" | sed 's/^/  /' >&2
+    echo "got:"  >&2; printf '%s\n' "$got"  | sed 's/^/  /' >&2
+    exit 1
+  }
+
+  # The mirror must match the real guard's exact decision expression, not just
+  # the presence of "merged_at" somewhere in the step. Wrapped like the other
+  # tests in this file's final assertion: a bare failing command here, under a
+  # trap-installed EXIT handler, has been observed to abort the whole bats run
+  # instead of just this test on macOS.
+  block="$(job_block backport "$BACKPORT")"
+  [ -n "$block" ]
+  printf '%s\n' "$block" | script_lines | grep -qF 'prs.some(p => p.merged_at !== null)' || {
+    echo "backport.yaml's guard no longer uses prs.some(p => p.merged_at !== null)." >&2; exit 1; }
+
+  rm -rf "$tmp"
+}
+
+# ── backport concurrency ─────────────────────────────────────────────────────
+# A run joins its concurrency group before `prepare`'s guard is evaluated, so
+# nothing in that guard can keep a label event from disturbing the run already
+# backporting the PR. The group key and `cancel-in-progress` close different
+# halves of that and are pinned separately: either one alone still leaves a
+# live failure, and neither reads load-bearing on its own.
+
+@test "the trigger surface the concurrency key is built for does not widen" {
+  # Both halves of the key are written against one trigger delivering `closed` or
+  # `labeled`, and neither degrades safely if anything else arrives. The group key
+  # routes only `labeled` aside, so a new event lands in the main group;
+  # `cancel-in-progress` is positive, so it does not cancel there; and `prepare`
+  # does not qualify it. The result occupies the single pending slot, evicts a
+  # genuine backport request, and delivers nothing.
+  #
+  # Pinned as the whole surface rather than just the types list, because a SIBLING
+  # trigger reaches the same harm without touching `types:` at all: anything
+  # carrying a `pull_request` payload resolves the PR number and so lands in the
+  # same per-PR group. `pull_request_review` is the realistic one.
+  #
+  # Deliberately strict: this also fails on a widening that would be harmless,
+  # `workflow_dispatch` for instance, whose payload carries no `pull_request` so
+  # the key degenerates to a shared group holding no genuine request. Separating
+  # the harmless case needs a list of which triggers carry that payload, and that
+  # list drifts. A red here means read the block above, not that the pin is wrong.
+  triggers="$(awk '/^on:/{inside=1;next} /^[a-z]/{inside=0} inside && /^  [a-z_]+:/{print $1}' "$BACKPORT")"
+  [ -n "$triggers" ]
+  [ "$(printf '%s\n' "$triggers" | wc -l | tr -d ' ')" -eq 1 ]
+  printf '%s\n' "$triggers" | grep -qF 'pull_request_target:'
+
+  printf '%s\n' "$(code_lines < "$BACKPORT")" | grep -qF 'types: [closed, labeled]'
+}
+
+@test "a label event that requests no backport gets its own concurrency group" {
+  line="$(code_lines < "$BACKPORT" | grep '^  group: backport-')"
+  [ -n "$line" ]
+
+  # The per-PR discriminator, first: without it every PR's backport shares one
+  # group, and since a merge still cancels in that group, merging one PR kills
+  # another's in-flight backport. The assertions below all describe how a label
+  # event is separated from a merge WITHIN one PR, and every one of them stays
+  # green with the PR number deleted, so the widest failure of the three is the
+  # one nothing else here would notice.
+  printf '%s\n' "$line" | grep -qF 'backport-${{ github.workflow }}-${{ github.event.pull_request.number }}${{'
+
+  count="$(printf '%s\n' "$line" | grep -o "github\.event\.action == 'labeled'" | wc -l | tr -d ' ')"
+  [ "${count:-0}" -eq 1 ]
+
+  # The split is on the label NAMES, not on the action alone. Routing EVERY label
+  # event aside would move `backport` and `backport-previous` out of the group
+  # holding the run they have to queue behind, and one request could then evict
+  # the other.
+  #
+  # Pinned as the literal names, not as a count of `label.name != '`. That count
+  # measures the operator and says nothing about the operands, so renaming one
+  # name here and not in `prepare` — the half-finished rename — left it at two
+  # and stayed green, while a real `backport-previous` event took the `-label`
+  # branch and became free to cherry-pick alongside the merge run.
+  # Including the conjunction that joins the action check to the name checks.
+  # `&&` binds tighter than `||` in GitHub expressions, so flipping this one
+  # operator reads as `action == 'labeled' || (name != … && name != …)`, and on a
+  # `closed` event `github.event.label` is absent, both name checks are true, and
+  # EVERY event takes the suffix. A constant suffix is exactly as vacuous as no
+  # split at all. Every operand here was pinned before this line existed; the
+  # operator joining them was not.
+  #
+  # TRANSITIONAL: four names, not the original pair, because backport.yaml
+  # accepts both spellings while the org-level dosubot still applies the legacy
+  # ones. The namespaced names are genuine backport requests, so they belong on
+  # this side of the split exactly as the legacy ones do — routing them aside
+  # would hand a `kind/backport` event its own group and let it cherry-pick
+  # alongside the merge run, which is the failure the pin above describes. When
+  # dosubot's PR labelling is switched off and backport.yaml drops its legacy
+  # arms, this literal and the count below go back to the pair.
+  printf '%s\n' "$line" | grep -qF "github.event.action == 'labeled' && github.event.label.name != 'backport' && github.event.label.name != 'backport-previous' && github.event.label.name != 'kind/backport' && github.event.label.name != 'kind/backport-previous'"
+
+  # And exactly four of them. The literal above is a substring check, so appending
+  # a fifth exclusion satisfies it unchanged — and a fifth exclusion is not
+  # cosmetic: the named label stops being routed aside, lands in the main group,
+  # takes its single pending slot, skips in `prepare`, and evicts a genuine
+  # backport request while delivering nothing. Same harm as widening `types:`.
+  # Presence and count answer different questions; this test needs both.
+  count="$(printf '%s\n' "$line" | grep -o "github\.event\.label\.name != '" | wc -l | tr -d ' ')"
+  [ "${count:-0}" -eq 4 ]
+
+  # The suffix the condition selects, not only the condition. Asserting the
+  # operands alone leaves the whole split deletable — collapsing the tail to
+  # `&& '' || ''` puts every label back in the main group with the condition
+  # still reading correctly above it. Inverting it to `&& '' || '-label'` is
+  # worse than deleting it, because that moves the two backport requests aside
+  # and leaves the irrelevant labels sharing the group with the run in flight,
+  # which is the arrangement this file exists to prevent. Both survive every
+  # other assertion here.
+  printf '%s\n' "$line" | grep -qF "&& '-label' || ''"
+}
+
+@test "a labeled event queues behind the backport in flight instead of cancelling it" {
+  # Labels set with the default GITHUB_TOKEN start no run, but labels set by
+  # third-party GitHub Apps do, and they arrive in bursts. Under a plain `true`
+  # each one killed the backport the merge had just started, leaving a cancelled
+  # run next to a green one and the work repeated by whichever label came last.
+  # With `prepare` now narrowed, no burst label requalifies to repeat it,
+  # so dropping this arm does not restore the old noisy delivery — it loses the
+  # backport. `cancel-in-progress: true` is the obvious thing for the next reader
+  # to normalise this back to, so pin its absence too.
+  count="$(code_lines < "$BACKPORT" | grep -cF "  cancel-in-progress: \${{ github.event.action == 'closed' }}" || true)"
+  [ "${count:-0}" -eq 1 ]
+
+  # Positively, not as `!= 'labeled'`. The two are equivalent only while `types:`
+  # holds exactly `closed` and `labeled`; the negative form hands cancellation to
+  # any third type added later, in the main group, which is the behaviour this
+  # arm removes.
+  count="$(code_lines < "$BACKPORT" | grep -c "cancel-in-progress:.*!= 'labeled'" || true)"
+  [ "${count:-0}" -eq 0 ]
+
+  count="$(code_lines < "$BACKPORT" | grep -c '^  cancel-in-progress: true$' || true)"
+  [ "${count:-0}" -eq 0 ]
+}
+
+@test "both backport jobs bound how long a queued request can wait" {
+  # These ceilings exist because of the queuing above, not for their own sake. A
+  # cancelling key disposed of a stuck run by killing it; queuing makes the next
+  # genuine request wait behind it instead, and an unbounded job on the 6-hour
+  # default turns one wedged job into a six-hour hole in the release line.
+  # Nothing else in this file makes them look load-bearing, so a tidy-up that
+  # drops them reads as harmless.
+  #
+  # Scope, since the test name says "how long a queued request can wait": what is
+  # bounded here is a stuck JOB. A run can wedge at the RUN level with every job
+  # already finished, and `timeout-minutes` is job-level with no run-level
+  # equivalent, so that state holds the group until the run is cancelled. These
+  # ceilings do not reach it and are not meant to.
+  # Asserted as a bound, not as presence. The hazard is the SIZE of the wait, so
+  # a pin that only checks the key exists is satisfied by `timeout-minutes: 355`,
+  # which restores the hole to within five minutes of the default it was written
+  # against.
+  #
+  # Bounded on BOTH sides, because both directions break it. Too high restores
+  # the hole; too low cancels a real backport that was only waiting for a runner,
+  # and an upper-bound-only assertion stays green at `timeout-minutes: 1`.
+  #
+  # The floor is judgement, not measurement, and says so. `timeout-minutes`
+  # bounds execution, and every execution measured on this workflow has been
+  # seconds, so no observation argues for any particular floor. No maximum is
+  # quoted deliberately: a superlative over a growing set goes stale on the next
+  # slower run. What the floor guards is a ceiling set low enough to cancel a
+  # cherry-pick much larger than anything seen yet; ten minutes is far above
+  # every leg measured. Per JOB, not per run, and not over the runner queue,
+  # which no `timeout-minutes` reaches.
+  for job in prepare backport; do
+    block="$(job_block "$job" "$BACKPORT" | code_lines)"
+    [ -n "$block" ]
+    minutes="$(printf '%s\n' "$block" | grep -o '^    timeout-minutes: [0-9][0-9]*' | grep -o '[0-9][0-9]*$')"
+    [ -n "$minutes" ]
+    [ "$minutes" -ge 10 ]
+    [ "$minutes" -le 30 ]
+  done
+}
+
+@test "each backport trigger reads only the labels it is entitled to" {
+  block="$(job_block prepare "$BACKPORT" | code_lines)"
+  [ -n "$block" ]
+
+  # The cumulative label set answers for the merge and for nothing else. Left
+  # ungated it re-enters this job on every later unrelated label — an automated
+  # size/* or kind/* — for a merged PR still carrying `backport`, redoing a
+  # backport that has already been delivered.
+  #
+  # TRANSITIONAL: four reads, not the original pair. backport.yaml accepts the
+  # namespaced and the legacy spelling of each label while the org-level dosubot
+  # still applies the legacy ones; when its PR labelling is switched off and the
+  # legacy arms are dropped, this literal and the count below go back to two.
+  printf '%s\n' "$block" | grep -qF "(github.event.action == 'closed' && (contains(github.event.pull_request.labels.*.name, 'backport') || contains(github.event.pull_request.labels.*.name, 'backport-previous') || contains(github.event.pull_request.labels.*.name, 'kind/backport') || contains(github.event.pull_request.labels.*.name, 'kind/backport-previous')))"
+
+  # And the guard reads that set exactly four times, all of them inside the gated
+  # disjunct above, so it cannot be joined by an ungated one that quietly
+  # restores the old behaviour while the assertion above stays green.
+  #
+  # Counted as OCCURRENCES, not lines. `grep -c` counts matching lines, and all
+  # four reads live on one line here, so it answers 1 and keeps answering 1 when a
+  # fifth read is appended to that same line — which is exactly the restoration
+  # this is meant to catch. Only an append on a NEW line would have moved it.
+  count="$(printf '%s\n' "$block" | grep -o 'contains(github\.event\.pull_request\.labels' | wc -l | tr -d ' ')"
+  [ "${count:-0}" -eq 4 ]
+
+  # A label event answers for the label it carries. Both spellings of each name,
+  # for the transitional reason given above.
+  printf '%s\n' "$block" | grep -qF "(github.event.action == 'labeled' && (github.event.label.name == 'backport' || github.event.label.name == 'backport-previous' || github.event.label.name == 'kind/backport' || github.event.label.name == 'kind/backport-previous'))"
+
+  # The two conjuncts the label logic hangs off, which the label assertions above
+  # would not miss. `base.ref == 'main'` is what stops the bot backporting its own
+  # output: its PRs target release-X.Y, so they cannot satisfy it however often a
+  # labeler re-applies `backport` to a `[Backport release-X.Y]` title. docs/release.md
+  # calls that architectural protection, which is only true while the line is here.
+  # With their trailing conjunctions, for the reason the group-key test spells
+  # out: flipping either `&&` to `||` turns the guard into a disjunction that
+  # fires on every merge to main and on labels applied to open PRs. That one does
+  # not produce a wrong backport, because the `backport` job re-checks both
+  # independently, but it runs the job when nothing asked for it.
+  # In BOTH jobs, because docs/release.md rests the architectural protection on
+  # both `if:` blocks. Losing either copy alone is survivable (the other still
+  # skips, and `backport` needs `prepare`), so this pins a duplicate rather than
+  # a hole — but an untested duplicate is how a duplicate stops being one.
+  for job in prepare backport; do
+    b="$(job_block "$job" "$BACKPORT" | code_lines)"
+    [ -n "$b" ]
+    printf '%s\n' "$b" | grep -qF "github.event.pull_request.base.ref == 'main' &&"
+    printf '%s\n' "$b" | grep -qF 'github.event.pull_request.merged == true &&'
+  done
+}
+
+@test "the audit accepts exactly the backport labels the bot acts on" {
+  # cmd/backport-audit answers "has everything labelled for this line landed on
+  # it" and exits non-zero while anything has not, so docs/release.md gates a
+  # patch cut on it. It reaches its candidates with `gh pr list --label`, which
+  # matches a label by exact name.
+  #
+  # Pin the two sets equal rather than pinning either one's contents: the
+  # audit must not miss a spelling the bot honours, and must not keep one the
+  # bot has retired. Both directions matter, because the legacy names are
+  # transitional and the two files have to drop them together.
+  [ -f "$AUDIT" ]
+
+  # Every name the bot tests for, from the label-detection script.
+  bot="$(grep -o "labels\.includes('[^']*')" "$BACKPORT" | sed "s/.*('//;s/')//" | sort -u)"
+  [ -n "$bot" ]
+
+  # Every backport label spelled as a Go string literal in the audit. Its own
+  # prose quotes these names with backticks, not double quotes, so a comment
+  # cannot satisfy this.
+  audit="$(grep -o '"\(kind/\)\{0,1\}backport\(-previous\)\{0,1\}"' "$AUDIT" | tr -d '"' | sort -u)"
+  [ -n "$audit" ]
+
+  [ "$bot" = "$audit" ]
+
+  # Both requests are represented, so the sets cannot agree by both having lost
+  # the same half.
+  printf '%s\n' "$audit" | grep -qx 'kind/backport'
+  printf '%s\n' "$audit" | grep -qx 'kind/backport-previous'
+}
diff --git a/hack/remediation-guard.bats b/hack/remediation-guard.bats
index 092fe06d93..c7a94569c9 100644
--- a/hack/remediation-guard.bats
+++ b/hack/remediation-guard.bats
@@ -1,6 +1,6 @@
 #!/usr/bin/env bats
 # -----------------------------------------------------------------------------
-# Unit tests for hack/e2e-apps/remediation-guard.sh
+# Unit tests for hack/e2e-chainsaw/_lib/remediation-guard.sh
 #
 # helmrelease_has_remediation_cycle takes a newline-delimited list of
 # HelmRelease history snapshot status values (deployed/superseded/failed/
@@ -12,15 +12,18 @@
 # are useless there because flux's ClearFailures zeroes them on successful
 # reconciliation; .status.history retains the snapshot trail.
 #
-# cozytest.sh's awk parser recognizes only @test blocks and a bare `}` on
-# its own line; there is no bats `run` or `$status`. Assertions are
-# expressed as direct shell tests that exit non-zero on failure.
+# CI runs this file under Bats through `make bats-unit-tests`. It also remains
+# compatible with the legacy `hack/cozytest.sh` translator, whose awk parser
+# recognizes only @test blocks and a bare `}` on its own line. The tests avoid
+# `run` and `$status` for that compatibility path and use direct shell assertions.
 #
-# Run with: hack/cozytest.sh hack/remediation-guard.bats
+# Run with: bats hack/remediation-guard.bats
 # -----------------------------------------------------------------------------
 
+load test_helper
+
 @test "empty history returns not-detected" {
-    . hack/e2e-apps/remediation-guard.sh
+    . hack/e2e-chainsaw/_lib/remediation-guard.sh
     if helmrelease_has_remediation_cycle ""; then
         echo "expected not-detected for empty history" >&2
         exit 1
@@ -28,7 +31,7 @@
 }
 
 @test "single deployed snapshot returns not-detected" {
-    . hack/e2e-apps/remediation-guard.sh
+    . hack/e2e-chainsaw/_lib/remediation-guard.sh
     if helmrelease_has_remediation_cycle "deployed"; then
         echo "expected not-detected for deployed-only history" >&2
         exit 1
@@ -36,7 +39,7 @@
 }
 
 @test "deployed then superseded returns not-detected" {
-    . hack/e2e-apps/remediation-guard.sh
+    . hack/e2e-chainsaw/_lib/remediation-guard.sh
     statuses=$(printf 'deployed\nsuperseded\n')
     if helmrelease_has_remediation_cycle "${statuses}"; then
         echo "expected not-detected for deployed+superseded history" >&2
@@ -45,7 +48,7 @@
 }
 
 @test "single failed snapshot returns detected" {
-    . hack/e2e-apps/remediation-guard.sh
+    . hack/e2e-chainsaw/_lib/remediation-guard.sh
     if ! helmrelease_has_remediation_cycle "failed"; then
         echo "expected detected when history contains failed snapshot" >&2
         exit 1
@@ -56,7 +59,7 @@
     # The exact signature of the install-remediation race: the first install
     # exceeded flux's wait budget, remediation uninstalled, the next retry
     # eventually succeeded. History still carries the uninstalled snapshot.
-    . hack/e2e-apps/remediation-guard.sh
+    . hack/e2e-chainsaw/_lib/remediation-guard.sh
     if ! helmrelease_has_remediation_cycle "uninstalled"; then
         echo "expected detected when history contains uninstalled snapshot" >&2
         exit 1
@@ -64,7 +67,7 @@
 }
 
 @test "uninstalled then deployed still returns detected" {
-    . hack/e2e-apps/remediation-guard.sh
+    . hack/e2e-chainsaw/_lib/remediation-guard.sh
     statuses=$(printf 'uninstalled\ndeployed\n')
     if ! helmrelease_has_remediation_cycle "${statuses}"; then
         echo "expected detected despite later successful deploy" >&2
@@ -73,7 +76,7 @@
 }
 
 @test "deployed then failed still returns detected" {
-    . hack/e2e-apps/remediation-guard.sh
+    . hack/e2e-chainsaw/_lib/remediation-guard.sh
     statuses=$(printf 'deployed\nfailed\n')
     if ! helmrelease_has_remediation_cycle "${statuses}"; then
         echo "expected detected when any entry is failed" >&2
@@ -81,47 +84,15 @@
     fi
 }
 
-@test "status.history extraction pins HR v2 status.history shape" {
-    # Pins the Flux HelmRelease v2 .status.history[].status shape that
-    # run-kubernetes.sh relies on. If a future flux release renames the
-    # field, the jsonpath returns nothing, the guard reports no cycle,
-    # and real remediation loops slip past the e2e assertion. This test
-    # uses yq to read the exact path used in the e2e script; the upstream
-    # Snapshot type lives at
-    # github.com/fluxcd/helm-controller/api/v2.Snapshot (via go.mod).
-    tmp=$(mktemp -d)
-    trap 'rm -rf "$tmp"' EXIT
-
-    cat > "$tmp/hr.yaml" <<'YAML'
-apiVersion: helm.toolkit.fluxcd.io/v2
-kind: HelmRelease
-metadata:
-  name: kubernetes-test
-  namespace: tenant-test
-status:
-  history:
-    - name: kubernetes-test
-      namespace: tenant-test
-      version: 1
-      status: uninstalled
-    - name: kubernetes-test
-      namespace: tenant-test
-      version: 2
-      status: deployed
-YAML
-
-    # Default yq output is yaml scalar format, which for string values emits
-    # bare unquoted tokens - matching what kubectl -o jsonpath produces in
-    # e2e. Do not switch to JSON output here; that would quote the values
-    # and break the loop in helmrelease_has_remediation_cycle.
-    statuses=$(yq '.status.history[].status' "$tmp/hr.yaml")
-
-    [ -n "$statuses" ]
-    echo "$statuses" | grep --quiet '^uninstalled$'
-
-    . hack/e2e-apps/remediation-guard.sh
-    if ! helmrelease_has_remediation_cycle "$statuses"; then
-        echo "expected detected for pinned HR snippet with uninstalled + deployed history" >&2
+@test "the predicate does not overwrite a caller variable named statuses" {
+    # This library is sourced rather than executed, and the helper assigns
+    # "statuses" internally, so without a local the argument lands in the
+    # caller's scope.
+    . hack/e2e-chainsaw/_lib/remediation-guard.sh
+    statuses=sentinel
+    helmrelease_has_remediation_cycle "failed"
+    if [ "${statuses}" != sentinel ]; then
+        echo "helmrelease_has_remediation_cycle replaced the caller's statuses with: ${statuses}" >&2
         exit 1
     fi
 }
diff --git a/hack/retention-delete.sh b/hack/retention-delete.sh
new file mode 100755
index 0000000000..b014891714
--- /dev/null
+++ b/hack/retention-delete.sh
@@ -0,0 +1,40 @@
+#!/bin/sh
+# Delete GHCR container-package versions for the retention workflow.
+#
+# Usage: APPLY=true|false ORG=<org> [DELETE_TOKEN=<token>] \
+#          retention-delete.sh <package> <label> <version-id>...
+#
+# Deletes with DELETE_TOKEN, required under APPLY=true, rather than the GH_TOKEN
+# that listed the versions: the app installation token can list org package
+# versions but has its DELETE answered with 404, while the workflow's
+# GITHUB_TOKEN deleted a version of a package linked to its repository.
+#
+# <label> names what is deleted in the log ("version", "promotion candidate
+# version"). Without APPLY=true it only reports. A refused delete is an error,
+# not a warning: the remaining ids are still tried, then the exit is non-zero,
+# so a token that cannot delete turns the run red instead of leaving it green
+# with nothing removed.
+set -eu
+
+PKG="${1:?usage: retention-delete.sh <package> <label> <version-id>...}"
+LABEL="${2:?usage: retention-delete.sh <package> <label> <version-id>...}"
+shift 2
+: "${ORG:?ORG is required}"
+if [ "${APPLY:-false}" = "true" ]; then
+  : "${DELETE_TOKEN:?DELETE_TOKEN is required to delete}"
+fi
+
+enc="$(printf '%s' "$PKG" | sed 's|/|%2F|g')"
+failed=0
+for id in "$@"; do
+  if [ "${APPLY:-false}" != "true" ]; then
+    echo "  • would delete ${PKG} ${LABEL} ${id}"
+    continue
+  fi
+  echo "  ✗ deleting ${PKG} ${LABEL} ${id}"
+  if ! err="$(GH_TOKEN="$DELETE_TOKEN" gh api -X DELETE "/orgs/${ORG}/packages/container/${enc}/versions/${id}" 2>&1 >/dev/null)"; then
+    echo "::error::failed to delete ${PKG} ${LABEL} ${id}: ${err}"
+    failed=1
+  fi
+done
+exit "$failed"
diff --git a/hack/retention-delete_test.bats b/hack/retention-delete_test.bats
new file mode 100644
index 0000000000..52de2a258c
--- /dev/null
+++ b/hack/retention-delete_test.bats
@@ -0,0 +1,82 @@
+#!/usr/bin/env bats
+# Tests for hack/retention-delete.sh — the delete half of the GHCR retention
+# workflow. A refused DELETE must fail the run: a sweep that only warns stays
+# green while deleting nothing, which is how retention went unnoticed before.
+#
+# Run with: bats hack/retention-delete_test.bats
+
+load test_helper
+
+SCRIPT="${BATS_TEST_DIRNAME}/retention-delete.sh"
+
+# gh stub: records every call, refuses version 2 the way the API does.
+_stub_gh() {
+  mkdir -p "$1"
+  cat > "$1/gh" <<'EOF'
+#!/bin/sh
+printf '%s token=%s\n' "$*" "${GH_TOKEN:-}" >> "$GH_CALLS"
+case "$*" in
+  */versions/2*) echo 'gh: Forbidden (HTTP 403)' >&2; exit 1 ;;
+esac
+EOF
+  chmod +x "$1/gh"
+}
+
+setup() {
+  strict_setup
+  _stub_gh "${BATS_TEST_TMPDIR}/bin"
+  export PATH="${BATS_TEST_TMPDIR}/bin:$PATH"
+  export GH_CALLS="${BATS_TEST_TMPDIR}/calls"
+  export ORG=cozystack
+  export GH_TOKEN=app-token
+  export DELETE_TOKEN=workflow-token
+  : > "$GH_CALLS"
+}
+
+@test "apply: a refused delete is an error naming the HTTP status, the rest still run, exit is non-zero" {
+  run env APPLY=true "$SCRIPT" cozystack/foo version 1 2 3
+  [ "$status" -ne 0 ]
+  [ "$(wc -l < "$GH_CALLS" | tr -d ' ')" -eq 3 ]
+  grep -q 'cozystack%2Ffoo/versions/3' "$GH_CALLS"
+  case "$output" in
+    *"::error::"*"version 2"*"HTTP 403"*) ;;
+    *) echo "FAIL: no error with the HTTP status: $output"; false ;;
+  esac
+}
+
+@test "apply: all deletes succeeding exits zero" {
+  run env APPLY=true "$SCRIPT" cozystack/foo version 1 3
+  [ "$status" -eq 0 ]
+  [ "$(wc -l < "$GH_CALLS" | tr -d ' ')" -eq 2 ]
+}
+
+@test "dry-run calls nothing and exits zero" {
+  run env APPLY=false "$SCRIPT" cozystack/foo version 1 2 3
+  [ "$status" -eq 0 ]
+  [ ! -s "$GH_CALLS" ]
+  case "$output" in
+    *"would delete cozystack/foo version 2"*) ;;
+    *) echo "FAIL: dry-run did not report: $output"; false ;;
+  esac
+}
+
+@test "apply: deletes with DELETE_TOKEN, not the token that listed the versions" {
+  run env APPLY=true "$SCRIPT" cozystack/foo version 1
+  [ "$status" -eq 0 ]
+  grep -q 'versions/1 token=workflow-token$' "$GH_CALLS"
+}
+
+@test "apply: no DELETE_TOKEN is refused before any call" {
+  run env -u DELETE_TOKEN APPLY=true "$SCRIPT" cozystack/foo version 1
+  [ "$status" -ne 0 ]
+  [ ! -s "$GH_CALLS" ]
+  case "$output" in
+    *"DELETE_TOKEN is required"*) ;;
+    *) echo "FAIL: refusal does not name DELETE_TOKEN: $output"; false ;;
+  esac
+}
+
+@test "dry-run needs no DELETE_TOKEN" {
+  run env -u DELETE_TOKEN APPLY=false "$SCRIPT" cozystack/foo version 1
+  [ "$status" -eq 0 ]
+}
diff --git a/hack/retention-packages.sh b/hack/retention-packages.sh
new file mode 100755
index 0000000000..9a433b62d6
--- /dev/null
+++ b/hack/retention-packages.sh
@@ -0,0 +1,52 @@
+#!/bin/sh
+# Print the GHCR container packages the retention workflow sweeps, one per line.
+#
+# Usage: retention-packages.sh <published-tree-dir>
+#
+# GET /orgs/{org}/packages?package_type=container answers "400 Invalid
+# argument" to the app installation token the workflow uses, while the
+# per-package versions endpoints accept it, so the org cannot be listed. The
+# names come instead from the published nightly packages tree: it is the tree
+# hack/nightly-mirror.sh copied images for, so it names every component image
+# that receives dated nightly tags. The committed tree is not a substitute — an
+# image whose ref is digest-pinned only by the build is mirrored nightly yet
+# invisible there.
+#
+# A wrong list fails quietly (a package left out is simply never pruned), so a
+# tree that does not even reference the packages artifact is refused rather than
+# read as "fewer packages". A component removed from the tree drops out too and
+# keeps whatever dated nightlies it had; it receives no new ones.
+set -eu
+
+TREE="${1:?usage: retention-packages.sh <published-tree-dir>}"
+DST_REGISTRY="ghcr.io/cozystack/cozystack"
+
+[ -d "$TREE" ] || { echo "retention-packages: '$TREE' is not a directory" >&2; exit 1; }
+yq --version 2>&1 | grep -q mikefarah || { echo "retention-packages: yq (mikefarah) is required" >&2; exit 1; }
+
+# shellcheck source=hack/lib/image-refs.sh
+. "$(dirname "$0")/lib/image-refs.sh"
+
+# Package names keep the namespace under the org: ghcr.io/cozystack/cozystack/x
+# is the package "cozystack/x".
+package_names() {
+  collect_image_refs "$TREE" | while IFS= read -r ref; do
+    repo="${ref%@*}"
+    case "$repo" in
+      "${DST_REGISTRY}/"*) ;;
+      *) continue ;;
+    esac
+    img="${repo##*/}"
+    repo="${repo%/*}/${img%:*}"
+    printf '%s\n' "${repo#"${DST_REGISTRY%/*}/"}"
+  done
+}
+names="$(package_names)"
+
+printf '%s\n' "$names" | grep -qx 'cozystack/cozystack-packages' || {
+  echo "retention-packages: '$TREE' does not reference ${DST_REGISTRY}/cozystack-packages; not a published tree" >&2
+  exit 1
+}
+
+# Published by the nightly workflow alongside the tree, never referenced by it.
+printf '%s\n%s\n%s\n' "$names" cozystack/cozy-installer cozystack/cozystack-nocloud | sort -u
diff --git a/hack/retention-packages_test.bats b/hack/retention-packages_test.bats
new file mode 100644
index 0000000000..a32ba98049
--- /dev/null
+++ b/hack/retention-packages_test.bats
@@ -0,0 +1,80 @@
+#!/usr/bin/env bats
+# Tests for hack/retention-packages.sh — the package-name source of the GHCR
+# retention workflow. GitHub refuses to list org container packages to an app
+# installation token, so the workflow sweeps exactly the packages this script
+# names. A name missing here is a package whose nightlies are never pruned, so
+# the tests pin what is included and that an unusable tree fails rather than
+# yielding a shorter list.
+#
+# Run with: bats hack/retention-packages_test.bats
+
+load test_helper
+
+SCRIPT="${BATS_TEST_DIRNAME}/retention-packages.sh"
+
+# A published nightly tree: refs already rewritten to the GHCR host.
+_make_tree() {
+  D="$(printf 'a%.0s' $(seq 1 64))"
+  t="$1"
+  mkdir -p "$t/core/installer" "$t/system/single" "$t/system/split" \
+           "$t/system/nested" "$t/system/third" "$t/system/leftover" \
+           "$t/system/tagfile/images" "$t/system/multus/templates"
+  {
+    echo 'cozystackOperator:'
+    echo '  platformSourceUrl: oci://ghcr.io/cozystack/cozystack/cozystack-packages'
+    printf '  platformSourceRef: digest=sha256:%s\n' "$D"
+  } > "$t/core/installer/values.yaml"
+  printf 'image: ghcr.io/cozystack/cozystack/single:v1.0.0@sha256:%s\n' "$D" \
+    > "$t/system/single/values.yaml"
+  {
+    echo 'image:'
+    echo '  repository: ghcr.io/cozystack/cozystack/split'
+    printf '  tag: v1.0.0@sha256:%s\n' "$D"
+  } > "$t/system/split/values.yaml"
+  printf 'image: ghcr.io/cozystack/cozystack/metallb/controller:v1@sha256:%s\n' "$D" \
+    > "$t/system/nested/values.yaml"
+  printf 'ghcr.io/cozystack/cozystack/tagfile:v1.0.0@sha256:%s\n' "$D" \
+    > "$t/system/tagfile/images/thing.tag"
+  printf '          image: ghcr.io/cozystack/cozystack/multus-cni:v1@sha256:%s\n' "$D" \
+    > "$t/system/multus/templates/multus-daemonset-thick.yml"
+  # Not ours to prune: a third-party image and a sibling GHCR namespace.
+  {
+    printf 'a: docker.io/library/busybox:1.37.0@sha256:%s\n' "$D"
+    printf 'b: ghcr.io/cozystack/ingress-nginx-with-protobuf-exporter/controller:v1@sha256:%s\n' "$D"
+  } > "$t/system/third/values.yaml"
+  # A ref the mirror failed to rewrite lives in the build registry, not GHCR.
+  printf 'image: iad.ocir.io/idyksih5sir9/cozystack/leftover:main@sha256:%s\n' "$D" \
+    > "$t/system/leftover/values.yaml"
+}
+
+@test "names every GHCR cozystack package in all storage shapes plus the published extras" {
+  tree="${BATS_TEST_TMPDIR}/tree"
+  _make_tree "$tree"
+  run "$SCRIPT" "$tree"
+  [ "$status" -eq 0 ]
+  expected="cozystack/cozy-installer
+cozystack/cozystack-nocloud
+cozystack/cozystack-packages
+cozystack/metallb/controller
+cozystack/multus-cni
+cozystack/single
+cozystack/split
+cozystack/tagfile"
+  [ "$output" = "$expected" ]
+}
+
+@test "fails on a missing tree" {
+  run "$SCRIPT" "${BATS_TEST_TMPDIR}/absent"
+  [ "$status" -ne 0 ]
+}
+
+@test "fails on a tree that does not reference the packages artifact" {
+  tree="${BATS_TEST_TMPDIR}/tree"
+  _make_tree "$tree"
+  rm "$tree/core/installer/values.yaml"
+  run "$SCRIPT" "$tree"
+  [ "$status" -ne 0 ]
+  case "$output" in
+    *cozystack/single*) echo "FAIL: names printed despite failure"; false ;;
+  esac
+}
diff --git a/hack/route-hostname-policy-version-coverage.bats b/hack/route-hostname-policy-version-coverage.bats
new file mode 100644
index 0000000000..736afb6d60
--- /dev/null
+++ b/hack/route-hostname-policy-version-coverage.bats
@@ -0,0 +1,204 @@
+#!/usr/bin/env bats
+# Asserts that the cozystack-basics admission policies name every API version
+# the vendored Gateway API CRD bundle actually serves for the kind they gate:
+# the three route hostname policies and the Gateway listener hostname policy.
+#
+# Why this needs a test rather than a comment. The policy lists API versions
+# literally in matchConstraints, but the version set it must cover lives in a
+# different package (packages/system/gateway-api-crds), is vendored from
+# upstream, and moves whenever someone runs `make update` there. Nothing
+# connects the two, so the list drifts silently in both directions.
+#
+# Both directions fail closed-looking and open-behaving. A version the bundle
+# serves but the policy does not name is unguarded unless matchPolicy rescues
+# it -- and matchPolicy (unset here, so Equivalent) only converts a request
+# into a version the rule already names, so that rescue lasts exactly as long
+# as at least one named version stays served. A version the policy names but
+# the bundle drops takes the rescue away with it: once no named version is
+# served the rule selects nothing at all, and failurePolicy: Fail does not
+# fire, because nothing failed -- there was simply no match. A fail-closed
+# tenant hostname control then stops applying with no error, no denial, and
+# no log line. Upstream marks versions deprecated well before removing them,
+# so the warning arrives in the bundle diff and nowhere else -- which is
+# precisely the diff nobody reads line by line.
+#
+# Drift here is not caused by a bundle bump: the tlsroutes rule had named a
+# single version since the policy was written, while the bundle served three
+# the whole time.
+#
+# The assertion is coverage, not equality: naming a version the bundle does
+# not serve is inert (an unmatched resourceRules entry is not an error), so
+# the policy may name more than is served, never fewer.
+#
+# The policy side is read from `helm template` output rather than the template
+# source, so what is checked is the object the apiserver would receive.
+#
+# Paths are repo-root-relative. Direct assertions retain compatibility with
+# cozytest, which does not provide Bats-specific helpers or directory variables.
+#
+# Requires: yq (mikefarah v4+), helm. Both are available on the project's CI
+# image and are already relied on by other hack/*.bats.
+#
+# Run with: bats hack/route-hostname-policy-version-coverage.bats
+
+load test_helper
+
+CRD_BUNDLE=packages/system/gateway-api-crds/templates/crds-experimental.yaml
+BASICS_CHART=packages/system/cozystack-basics
+
+served_versions() {
+  yq eval-all \
+    "select(.kind == \"CustomResourceDefinition\" and .metadata.name == \"$1\")
+     | .spec.versions[] | select(.served == true) | .name" \
+    "$CRD_BUNDLE" | sort -u
+}
+
+policy_versions() {
+  helm template cozystack-basics "$BASICS_CHART" \
+    --api-versions "admissionregistration.k8s.io/v1/ValidatingAdmissionPolicy" \
+    | yq eval-all \
+      "select(.kind == \"ValidatingAdmissionPolicy\" and .metadata.name == \"$1\")
+       | .spec.matchConstraints.resourceRules[]
+       | select(.resources[] | select(. == \"$2\")) | .apiVersions[]" - | sort -u
+}
+
+# Echoes, space-prefixed, each served version the policy does not name. The
+# comparison lives here rather than inline so the fixtures at the bottom can
+# drive it with synthetic input; neutering it turns them red.
+#
+# Membership by loop rather than comm(1) with process substitution: the
+# cozytest.sh harness rejects <(...) with a syntax error, which exits non-zero
+# and would read as a genuine failure.
+uncovered() {
+  u_served=$1
+  u_named=$2
+  out=
+  for version in $u_served; do
+    if ! echo "$u_named" | grep -qxF "$version"; then
+      out="$out $version"
+    fi
+  done
+  echo "$out"
+}
+
+# Fails on an empty set from either side: a yq expression that stops matching
+# (renamed policy, restructured CRD) would otherwise report full coverage of
+# nothing.
+assert_covers() {
+  crd_name=$1
+  policy_name=$2
+  resource=$3
+
+  served=$(served_versions "$crd_name")
+  named=$(policy_versions "$policy_name" "$resource")
+
+  if [ -z "$served" ]; then
+    echo "no served versions found for $crd_name in $CRD_BUNDLE" >&2
+    exit 1
+  fi
+  if [ -z "$named" ]; then
+    echo "no apiVersions found for $resource in $policy_name" >&2
+    exit 1
+  fi
+
+  missing=$(uncovered "$served" "$named")
+
+  if [ -n "$missing" ]; then
+    echo "$policy_name does not name every served version of $crd_name" >&2
+    echo "served:  $(echo "$served" | tr '\n' ' ')" >&2
+    echo "named:   $(echo "$named" | tr '\n' ' ')" >&2
+    echo "missing: $(echo "$missing" | tr '\n' ' ')" >&2
+    exit 1
+  fi
+}
+
+@test "TLSRoute hostname policy names every served tlsroutes version" {
+  assert_covers tlsroutes.gateway.networking.k8s.io \
+    cozystack-route-hostname-policy-tls tlsroutes
+}
+
+@test "HTTPRoute hostname policy names every served httproutes version" {
+  assert_covers httproutes.gateway.networking.k8s.io \
+    cozystack-route-hostname-policy httproutes
+}
+
+@test "GRPCRoute hostname policy names every served grpcroutes version" {
+  assert_covers grpcroutes.gateway.networking.k8s.io \
+    cozystack-route-hostname-policy-grpc grpcroutes
+}
+
+@test "Gateway hostname policy names every served gateways version" {
+  assert_covers gateways.gateway.networking.k8s.io \
+    cozystack-gateway-hostname-policy gateways
+}
+
+# The four cases above only ever see a tree that is already correct, so on
+# their own they cannot tell a working comparison from one that stopped
+# comparing.
+# These drive it with synthetic input, the way hack/bats-no-exit-trap.bats and
+# hack/md-no-hardwrap.bats feed their checkers a broken sample and require a
+# complaint.
+#
+# Both layers need their own fixture. Driving uncovered() alone leaves
+# assert_covers unprotected -- emptying it to a no-op keeps every other case in
+# this file green, because the live-tree cases are the only callers and the
+# tree they read is correct. So the cases below feed assert_covers itself, in a
+# subshell with the two readers redefined.
+#
+# Each requires the complaint it expects, not merely a non-zero exit. A renamed
+# helper exits 127 and an unbound variable under `set -u` exits 1, and either
+# would read as a successful rejection if only the status were checked -- red
+# for the wrong reason is the same false comfort as no fixture at all.
+assert_covers_rejects() {
+  expected=$1
+  rc=0
+  out=$(
+    served_versions() { printf '%s\n' "$FIXTURE_SERVED"; }
+    policy_versions() { printf '%s\n' "$FIXTURE_NAMED"; }
+    assert_covers fixture.crd fixture-policy fixtureroutes 2>&1
+  ) || rc=$?
+  [ "$rc" != "0" ]
+  case "$out" in
+    *"$expected"*) ;;
+    *) echo "rejected, but not for the expected reason" >&2
+       echo "wanted: $expected" >&2
+       echo "got:    $out" >&2
+       exit 1 ;;
+  esac
+}
+
+@test "assert_covers rejects a policy that omits a served version" {
+  FIXTURE_SERVED='v1
+v1alpha2'
+  FIXTURE_NAMED='v1alpha2'
+  export FIXTURE_SERVED FIXTURE_NAMED
+  assert_covers_rejects "does not name every served version"
+}
+
+@test "assert_covers rejects an empty served set rather than passing vacuously" {
+  FIXTURE_SERVED=''
+  FIXTURE_NAMED='v1'
+  export FIXTURE_SERVED FIXTURE_NAMED
+  assert_covers_rejects "no served versions found"
+}
+
+@test "assert_covers rejects an empty named set rather than passing vacuously" {
+  FIXTURE_SERVED='v1'
+  FIXTURE_NAMED=''
+  export FIXTURE_SERVED FIXTURE_NAMED
+  assert_covers_rejects "no apiVersions found"
+}
+
+@test "the coverage check names a served version the policy omits" {
+  missing=$(uncovered 'v1
+v1alpha2
+v1alpha3' 'v1alpha2')
+  [ "$missing" = " v1 v1alpha3" ]
+}
+
+@test "the coverage check stays silent when every served version is named" {
+  missing=$(uncovered 'v1
+v1beta1' 'v1
+v1beta1')
+  [ -z "$missing" ]
+}
diff --git a/hack/run-kubernetes-block-io_test.bats b/hack/run-kubernetes-block-io_test.bats
new file mode 100644
index 0000000000..b083f9e4fc
--- /dev/null
+++ b/hack/run-kubernetes-block-io_test.bats
@@ -0,0 +1,571 @@
+#!/usr/bin/env bats
+# Regression coverage for the tenant-worker block IO capture in
+# hack/e2e-chainsaw/_lib/run-kubernetes.sh. cozytest.sh ends an @test block at
+# the first bare closing brace, so command mocks stay at top level.
+#
+# What this capture answers, and why neither the guest nor the other collectors
+# can. A worker that burns its whole vCPU while making no progress is either
+# computing and getting nowhere or waiting on blocks, and from outside the Pod
+# the two look identical: a busy vCPU thread with a clean cgroup quota. The
+# guest's own /proc/diskstats would settle it, and the diagnostics credential
+# minted for the guest is os:reader, which Talos does not allow to read file
+# contents at all. The kubelet's view of the Pod's cgroup is what remains, and it
+# is outside the guest entirely.
+#
+# The families are the subject of two tests here, because what arrives depends on
+# the cgroup version and the artifact has to stay readable either way. Under
+# cgroup v2 the kernel's io.stat carries transferred bytes and completed
+# operations and nothing else, so the queue-depth and service-time families
+# cAdvisor declares for this group are either absent or filled from the node
+# filesystem's own counters, which are not this Pod's. A zero read as an idle
+# disk is the wrong conclusion this suite pins against.
+
+load test_helper
+
+kubectl_calls=/dev/null
+kubectl_node_names=
+kubectl_list_rc=0
+kubectl_list_stderr=
+kubectl_raw_rc=0
+kubectl_raw_stderr=
+
+# Row shapes and label sets are upstream cAdvisor's own golden exposition
+# (lib/metrics/testdata/prometheus_metrics) with the identifying labels rewritten
+# to a worker Pod's; the values are illustrative of direction rather than
+# measured. A virt-launcher Pod was not available to sample. Two properties are
+# load-bearing and both come from that golden file: the blkio family carries its
+# own operation label with Read as one value, and the device label on every one
+# of these families is a HOST device rather than anything the guest names.
+worker_pod='virt-launcher-kubernetes-test-latest-version-md0-abc12-xyz34'
+worker_labels='container="compute",device="/dev/drbd1000",id="/kubepods.slice/kubepods-burstable.slice/kubepods-burstable-pod0000000a_0000_0000_0000_00000000000b.slice/cri-containerd-0000000000000000000000000000000000000000000000000000000000000001.scope",image="quay.io/kubevirt/virt-launcher:v1.8.4",name="0000000000000000000000000000000000000000000000000000000000000001",namespace="tenant-test",pod="'"${worker_pod}"'"'
+kubectl_raw_output=
+
+# The divisor on its own, because it is also a shape the wire produces on its
+# own: cAdvisor publishes it for any container it knows, so a worker whose disk
+# counters never arrived still puts this row in the file.
+worker_start_time_row() {
+  printf 'container_start_time_seconds{%s} 1.786656e+09 1786657157281\n' "${worker_labels}"
+}
+
+# The two shapes a cgroup v2 node puts on the wire for one worker: the byte and
+# operation counters, plus the blkio family split by operation. The start-time row
+# rides along because it is the divisor the counters need, and cAdvisor publishes
+# it for any container it knows rather than as part of the disk group. Built rather
+# than pasted so a family cannot drift by a typo in one copy.
+worker_v2_series() {
+  local read_bytes=8.8080384e+07
+  worker_start_time_row
+  printf 'container_fs_reads_bytes_total{%s} %s 1786657157281\n' "${worker_labels}" "${read_bytes}"
+  printf 'container_fs_reads_total{%s} 2148 1786657157281\n' "${worker_labels}"
+  printf 'container_fs_writes_bytes_total{%s} 1.048576e+06 1786657157281\n' "${worker_labels}"
+  printf 'container_fs_writes_total{%s} 64 1786657157281\n' "${worker_labels}"
+  printf 'container_blkio_device_usage_total{container="compute",device="/dev/drbd1000",major="147",minor="1000",namespace="tenant-test",operation="Read",pod="%s"} %s 1786657157281\n' "${worker_pod}" "${read_bytes}"
+  printf 'container_blkio_device_usage_total{container="compute",device="/dev/drbd1000",major="147",minor="1000",namespace="tenant-test",operation="Write",pod="%s"} 1.048576e+06 1786657157281\n' "${worker_pod}"
+}
+
+# The service-time and queue-depth families as a cgroup v1 node would carry them.
+# Kept as a fixture of its own because their absence is what the note in the
+# artifact explains, and a suite that only ever stages them present would leave
+# that explanation unexercised.
+worker_v1_extra_series() {
+  printf 'container_fs_read_seconds_total{%s} 33.9 1786657157281\n' "${worker_labels}"
+  printf 'container_fs_write_seconds_total{%s} 4.1 1786657157281\n' "${worker_labels}"
+  printf 'container_fs_io_current{%s} 3 1786657157281\n' "${worker_labels}"
+  printf 'container_fs_io_time_seconds_total{%s} 41.2 1786657157281\n' "${worker_labels}"
+  printf 'container_fs_io_time_weighted_seconds_total{%s} 118.7 1786657157281\n' "${worker_labels}"
+}
+
+# The IO pressure families as the kubelet publishes them when its pressure gate
+# is on. PSI is accounted per cgroup rather than per device, so these rows carry
+# the worker's identifying labels with no device label; derived from the shared
+# label set rather than pasted so the identity cannot drift between fixtures.
+worker_psi_series() {
+  local psi_labels
+  psi_labels=$(printf '%s' "${worker_labels}" | sed 's|device="[^"]*",||')
+  printf 'container_pressure_io_stalled_seconds_total{%s} 12.4 1786657157281\n' "${psi_labels}"
+  printf 'container_pressure_io_waiting_seconds_total{%s} 15.9 1786657157281\n' "${psi_labels}"
+}
+
+# Two rows that must not reach a file headed "worker": the node's own filesystem,
+# which arrives with both selector labels empty, and the Kamaji apiserver, which
+# shares the namespace and has a disk of its own.
+non_worker_series() {
+  printf 'container_fs_reads_bytes_total{container="",device="/dev/sda1",id="/",image="",name="",namespace="",pod=""} 4.294967296e+09 1786657157281\n'
+  printf 'container_fs_reads_bytes_total{container="kube-apiserver",device="/dev/sda1",id="/kubepods.slice/x.scope",image="registry.k8s.io/kube-apiserver:v1.33.0",name="x",namespace="tenant-test",pod="kubernetes-test-latest-version-7d9f8b6c5d-abcde"} 5.24288e+08 1786657157281\n'
+}
+
+timeout_calls=/dev/null
+timeout_fail_node=
+
+kubectl() {
+  printf '%s\n' "$*" >>"${kubectl_calls}"
+
+  if [ "${3:-}" = get ] && [ "${4:-}" = pods ]; then
+    [ -z "${kubectl_list_stderr}" ] || printf '%s\n' "${kubectl_list_stderr}" >&2
+    [ "${kubectl_list_rc}" -eq 0 ] || return "${kubectl_list_rc}"
+    [ -z "${kubectl_node_names}" ] || printf '%s\n' ${kubectl_node_names}
+    return 0
+  fi
+
+  if [ "${1:-}" = get ] && [ "${2:-}" = --raw ]; then
+    [ -z "${kubectl_raw_stderr}" ] || printf '%s\n' "${kubectl_raw_stderr}" >&2
+    # Output before status: a read cut off part way has already written what it
+    # managed to read, and a stub that returns first makes the branch labelling a
+    # partial capture unreachable in tests while it stays the likeliest one in
+    # production.
+    [ -z "${kubectl_raw_output}" ] || printf '%s\n' "${kubectl_raw_output}"
+    return "${kubectl_raw_rc}"
+  fi
+
+  return 0
+}
+
+timeout() {
+  local command_rc=0
+  printf '%s\n' "$*" >>"${timeout_calls}"
+  # Return 97 rather than running the command when the wrapper is not the bounded
+  # form: a read that lost its ceiling must not pass as a read.
+  [ "${1:-}" = -k ] || return 97
+  shift 3
+  "$@" || command_rc=$?
+  if [ -n "${timeout_fail_node}" ]; then
+    case " $* " in
+      *"${timeout_fail_node}"*) return 124 ;;
+    esac
+  fi
+  return "${command_rc}"
+}
+
+assert_file_contains() {
+  local needle="$1"
+  local file="$2"
+
+  if [ ! -f "${file}" ]; then
+    printf 'expected %s to exist so it could be checked for: %s\n' "${file}" "${needle}" >&2
+    return 1
+  fi
+  case "$(cat "${file}")" in
+    *"${needle}"*) return 0 ;;
+  esac
+  printf 'expected %s to contain: %s\n' "${file}" "${needle}" >&2
+  return 1
+}
+
+assert_file_lacks_pattern() {
+  local pattern="$1"
+  local file="$2"
+
+  # A missing file must fail rather than vacuously pass: a bare `! grep -q`
+  # succeeds on an unreadable path, which is indistinguishable from "the file
+  # exists and does not carry the label".
+  if [ ! -f "${file}" ]; then
+    printf 'expected %s to exist so it could be checked for: %s\n' "${file}" "${pattern}" >&2
+    return 1
+  fi
+  # Branched on awk's exact status. awk exits 1 for "no line matched" and 2 for
+  # "I could not evaluate this"; folded into an `if`, both land in the passing
+  # branch and the assertion "this is absent" is satisfied by the matcher giving
+  # up. Every negative claim in this file rests on the three-way split.
+  local _rc=0
+  awk -v pattern="${pattern}" '$0 ~ pattern { found = 1 } END { exit found ? 0 : 1 }' "${file}" || _rc=$?
+  case "${_rc}" in
+    0)
+      printf 'expected %s not to match: %s\n' "${file}" "${pattern}" >&2
+      return 1
+      ;;
+    1) return 0 ;;
+    *)
+      printf 'awk could not evaluate pattern %s against %s\n' "${pattern}" "${file}" >&2
+      return 1
+      ;;
+  esac
+}
+
+# The function under test redirects a command's stderr into a report file and
+# decides which artifact to write from it. cozytest.sh runs under `set -x`, so
+# the tracer's own line for that command lands on the very stderr being
+# redirected, and every assertion about those files would be reading the tracer.
+# Call through this wrapper so the sinks hold what production writes.
+run_capture() {
+  local _rc=0
+  ( set +x; cozy_capture_tenant_worker_block_io ) || _rc=$?
+  return "${_rc}"
+}
+
+@test "a negative assertion fails when its own matcher cannot evaluate" {
+  # The helper under every "must not appear" claim here. What rides on it is this
+  # collector's contract stated negatively: that an unread kubelet was not
+  # written up as an idle disk, and that the node's own filesystem did not land
+  # under a worker heading. A matcher that fails open turns each of those into a
+  # sentence nobody checked.
+  tmp=$(mktemp -d)
+  printf 'anything\n' >"$tmp/subject"
+
+  if assert_file_lacks_pattern '*(' "$tmp/subject" 2>/dev/null; then
+    echo "FAIL: an unparseable pattern was reported as absent" >&2
+    rm -rf "$tmp"
+    return 1
+  fi
+  assert_file_lacks_pattern 'absent-string' "$tmp/subject"
+  if assert_file_lacks_pattern 'anything' "$tmp/subject" 2>/dev/null; then
+    echo "FAIL: a present pattern was reported as absent" >&2
+    rm -rf "$tmp"
+    return 1
+  fi
+  rm -rf "$tmp"
+}
+
+@test "the byte, operation and blkio families of a worker Pod are captured" {
+  # The positive control every negative claim below is measured against. Families
+  # are named one by one rather than counted, because a count passes while one is
+  # silently missing from the filter -- and the blkio family is the one a filter
+  # written from the fs_* names alone loses, while it is the only one carrying the
+  # device major that identifies which volume the reads went to.
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  export COZY_REPORT_DIR="$tmp"
+  COZY_SNAPSHOT_NAME=kubernetes-latest
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_node_names="node-a"
+  kubectl_raw_output="$(worker_v2_series)"
+
+  run_capture
+
+  out="$tmp/snapshots/kubernetes-latest/tenant-block-io/node-a.txt"
+  assert_file_contains 'container_fs_reads_bytes_total{' "$out"
+  assert_file_contains 'container_fs_reads_total{' "$out"
+  assert_file_contains 'container_fs_writes_bytes_total{' "$out"
+  assert_file_contains 'container_fs_writes_total{' "$out"
+  assert_file_contains 'container_blkio_device_usage_total{' "$out"
+  assert_file_contains 'operation="Read"' "$out"
+  # The divisor, kept for a different reason from the rest and therefore the one
+  # a later edit to the filter is most likely to drop: without it the totals in
+  # this file cannot be read as an average at all.
+  assert_file_contains 'container_start_time_seconds{' "$out"
+  rm -rf "$tmp"
+}
+
+@test "one reading is called a total, with the row that turns it into an average" {
+  # The claim the file may not make is that a single cumulative reading IS a rate,
+  # and the claim it may only make when the row is present is how to divide. Both
+  # directions are pinned here, because the note is the only thing standing between
+  # a total and an invented throughput figure.
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  export COZY_REPORT_DIR="$tmp"
+  COZY_SNAPSHOT_NAME=kubernetes-latest
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_node_names="node-a"
+  kubectl_raw_output="$(worker_v2_series)"
+
+  run_capture
+
+  out="$tmp/snapshots/kubernetes-latest/tenant-block-io/node-a.txt"
+  assert_file_contains 'totals and not a rate' "$out"
+  assert_file_contains 'container_start_time_seconds above is the divisor' "$out"
+  rm -rf "$tmp"
+}
+
+@test "a capture with no start time row does not tell the reader to divide by it" {
+  # The same note with its divisor gone. A kubelet can answer with the disk
+  # families and no start time -- a filter narrowed later is the likeliest way --
+  # and an instruction to subtract a row that is not in the file sends the reader
+  # after something that does not exist, which is the failure the note exists to
+  # prevent rather than to cause.
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  export COZY_REPORT_DIR="$tmp"
+  COZY_SNAPSHOT_NAME=kubernetes-latest
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_node_names="node-a"
+  kubectl_raw_output="$(worker_v2_series | grep -v '^container_start_time_seconds')"
+
+  run_capture
+
+  out="$tmp/snapshots/kubernetes-latest/tenant-block-io/node-a.txt"
+  assert_file_contains 'The divisor is missing from this file' "$out"
+  assert_file_lacks_pattern 'above is the divisor' "$out"
+  rm -rf "$tmp"
+}
+
+@test "a truncated capture gets no averaging instruction and no missing-family reading" {
+  # Rows arrived and the read was then cut off, which is the shape a wedged
+  # kubelet produces: the file holds a prefix. Dividing a prefix by the
+  # container's age understates it, and a family absent from a prefix says nothing
+  # about the kernel interface, so both readings are withheld -- the same rule the
+  # CPU note follows for its pairing sentence and the sandbox capture for its
+  # column legend.
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  export COZY_REPORT_DIR="$tmp"
+  COZY_SNAPSHOT_NAME=kubernetes-latest
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_node_names="node-a"
+  kubectl_raw_output="$(worker_v2_series)"
+  timeout_fail_node=node-a
+
+  run_capture
+
+  out="$tmp/snapshots/kubernetes-latest/tenant-block-io/node-a.txt"
+  assert_file_contains 'may be a prefix of what the kubelet had' "$out"
+  assert_file_lacks_pattern 'above is the divisor' "$out"
+  assert_file_lacks_pattern 'io.stat' "$out"
+  assert_file_lacks_pattern 'is a setting rather than a quiet disk' "$out"
+  # The device legend is the exception and stays: it explains a label on the rows
+  # that did arrive, which is as true of a prefix as of a whole file, and a short
+  # file is where a reader needs it most.
+  assert_file_contains 'block major 147 for DRBD' "$out"
+  timeout_fail_node=
+  rm -rf "$tmp"
+}
+
+@test "a counter check that could not run claims nothing about the disk" {
+  # grep exits 1 for "read it, no match" and 2 for "could not read it", and every
+  # sentence past that check is a statement about what the kubelet reported, which
+  # a check that never answered cannot support. Driven by handing the hook a path
+  # that does not exist, which is the cheapest way to reach a status the walk does
+  # not produce on purpose.
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+
+  ( set +x; _cozy_block_io_tail_note "$tmp/absent.txt" 0 0 1 )
+
+  assert_file_contains 'could not be checked' "$tmp/absent.txt"
+  # The device legend still follows: it explains a label on rows, not the file
+  # as a whole, and the arm's own sentence sends the reader to the rows above.
+  assert_file_contains 'block major 147 for DRBD' "$tmp/absent.txt"
+  assert_file_lacks_pattern 'above is the divisor' "$tmp/absent.txt"
+  assert_file_lacks_pattern 'divisor is missing' "$tmp/absent.txt"
+  assert_file_lacks_pattern 'no block IO counter reached' "$tmp/absent.txt"
+  rm -rf "$tmp"
+}
+
+@test "the IO pressure families survive the filter where the kubelet publishes them" {
+  # Asserted on rows rather than on the note text: the note names these families
+  # on every capture, so only a brace after the family name proves a row of the
+  # family itself came through the filter.
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  export COZY_REPORT_DIR="$tmp"
+  COZY_SNAPSHOT_NAME=kubernetes-latest
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_node_names="node-a"
+  kubectl_raw_output="$(worker_v2_series; worker_psi_series)"
+
+  run_capture
+
+  out="$tmp/snapshots/kubernetes-latest/tenant-block-io/node-a.txt"
+  assert_file_contains 'container_pressure_io_stalled_seconds_total{' "$out"
+  assert_file_contains 'container_pressure_io_waiting_seconds_total{' "$out"
+  rm -rf "$tmp"
+}
+
+@test "the queue depth and service time families are captured where they exist" {
+  # The cgroup v1 shape. The filter has to keep them, or a node that does publish
+  # them produces an artifact identical to one that cannot -- and the difference
+  # is the whole reason the note beside the rows explains which families the
+  # cgroup version costs.
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  export COZY_REPORT_DIR="$tmp"
+  COZY_SNAPSHOT_NAME=kubernetes-latest
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_node_names="node-a"
+  kubectl_raw_output="$(worker_v2_series; worker_v1_extra_series)"
+
+  run_capture
+
+  out="$tmp/snapshots/kubernetes-latest/tenant-block-io/node-a.txt"
+  assert_file_contains 'container_fs_read_seconds_total{' "$out"
+  assert_file_contains 'container_fs_write_seconds_total{' "$out"
+  assert_file_contains 'container_fs_io_current{' "$out"
+  assert_file_contains 'container_fs_io_time_seconds_total{' "$out"
+  assert_file_contains 'container_fs_io_time_weighted_seconds_total{' "$out"
+  rm -rf "$tmp"
+}
+
+@test "a capture with no service time family says what the cgroup version costs" {
+  # The reading this collector is most likely to be misread on, and the one a row
+  # cannot state for itself: under cgroup v2 io.stat carries bytes and operations
+  # only, so a missing service time is the kernel interface rather than a disk
+  # that was never touched. Asserted on the cgroup v2 fixture, which is the shape
+  # the sandbox actually produces.
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  export COZY_REPORT_DIR="$tmp"
+  COZY_SNAPSHOT_NAME=kubernetes-latest
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_node_names="node-a"
+  kubectl_raw_output="$(worker_v2_series)"
+
+  run_capture
+
+  out="$tmp/snapshots/kubernetes-latest/tenant-block-io/node-a.txt"
+  assert_file_contains 'io.stat' "$out"
+  # And the row that carries the attribution, because a reader looking for the
+  # guest's system disk has several devices to choose between and the major is
+  # what decides.
+  assert_file_contains 'block major 147 for DRBD' "$out"
+  # The families that would answer the question outright if the kubelet published
+  # them. Their absence is a setting rather than a quiet disk, and a reader with
+  # no sentence for that reads the silence as the answer.
+  assert_file_contains 'container_pressure_io_stalled_seconds_total' "$out"
+  rm -rf "$tmp"
+}
+
+@test "the capture does not send a reader after a sibling sample it never takes" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  export COZY_REPORT_DIR="$tmp"
+  COZY_SNAPSHOT_NAME=kubernetes-latest
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_node_names="node-a"
+  kubectl_raw_output="$(worker_v2_series)"
+
+  run_capture
+
+  out="$tmp/snapshots/kubernetes-latest/tenant-block-io/node-a.txt"
+  # This capture is read once, and it shares its walk with a capture that is read
+  # twice. A file telling the reader to subtract a sibling that was never written
+  # costs them the time it takes to go looking for a directory that does not
+  # exist, so the instruction here has to be the opposite one.
+  assert_file_contains 'a second capture of the same stream' "$out"
+  assert_file_lacks_pattern 'other sample directory' "$out"
+  assert_file_contains 'read attempted from' "$out"
+  rm -rf "$tmp"
+}
+
+@test "the node filesystem and the tenant control plane stay out of a worker heading" {
+  # Both rows are what the wire actually carries. The node's own filesystem
+  # arrives in the same families with both selector labels empty, and the Kamaji
+  # apiserver shares the namespace with the workers and has a disk of its own --
+  # under a heading that says worker, either one answers the question with the
+  # wrong subject.
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  export COZY_REPORT_DIR="$tmp"
+  COZY_SNAPSHOT_NAME=kubernetes-latest
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_node_names="node-a"
+  kubectl_raw_output="$(non_worker_series; worker_v2_series)"
+
+  run_capture
+
+  out="$tmp/snapshots/kubernetes-latest/tenant-block-io/node-a.txt"
+  assert_file_contains "pod=\"${worker_pod}\"" "$out"
+  assert_file_lacks_pattern 'kube-apiserver' "$out"
+  assert_file_lacks_pattern 'pod=""' "$out"
+  rm -rf "$tmp"
+}
+
+@test "a start time with no counter beside it is not written up as an idle disk" {
+  # The shape the divisor row makes possible, and the reason it is not free: the
+  # walk decides "the kubelet reported nothing for this subject" from whether any
+  # row survived, and this family survives for any container cAdvisor knows. So a
+  # worker whose disk counters never arrived leaves a file that is not empty, the
+  # walk's own "no series" sentence cannot fire, and without the note below the
+  # artifact would carry a start time, an instruction for dividing counters, and
+  # no counters.
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  export COZY_REPORT_DIR="$tmp"
+  COZY_SNAPSHOT_NAME=kubernetes-latest
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_node_names="node-a"
+  kubectl_raw_output="$(worker_start_time_row)"
+
+  run_capture
+
+  out="$tmp/snapshots/kubernetes-latest/tenant-block-io/node-a.txt"
+  assert_file_contains 'no block IO counter reached this file' "$out"
+  assert_file_lacks_pattern 'above is the divisor' "$out"
+  assert_file_lacks_pattern 'io.stat' "$out"
+  rm -rf "$tmp"
+}
+
+@test "a kubelet that knows nothing about the container is not written up as an idle disk" {
+  # The other empty direction, and the one the walk does answer: cAdvisor
+  # contributes none of these families for a container it does not know, so the
+  # file is empty and the walk says which of its own arms fired. An empty file
+  # reads as a worker that touched no disk, which is the conclusion the whole
+  # capture was added to test.
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  export COZY_REPORT_DIR="$tmp"
+  COZY_SNAPSHOT_NAME=kubernetes-latest
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_node_names="node-a"
+  kubectl_raw_output='container_cpu_usage_seconds_total{container="compute",namespace="tenant-test",pod="'"${worker_pod}"'"} 412.5 1786657157281'
+
+  run_capture
+
+  out="$tmp/snapshots/kubernetes-latest/tenant-block-io/node-a.txt"
+  # The walk builds this sentence from the subject word the capture passes, and
+  # that word names the divisor family too, because the file can hold the divisor
+  # with no counter beside it and a sentence naming only block IO would be false
+  # about such a file.
+  assert_file_contains 'no block IO or container start-time series' "$out"
+  rm -rf "$tmp"
+}
+
+@test "a kubelet that never answered is not written up as an idle disk either" {
+  # The other half of the same claim, and the one the status decides rather than
+  # the output: timeout kills its child without a word, so this arrives non-zero
+  # with an empty error log, and a collector keyed on stderr would land in the arm
+  # that says the kubelet answered.
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  export COZY_REPORT_DIR="$tmp"
+  COZY_SNAPSHOT_NAME=kubernetes-latest
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_node_names="node-a"
+  kubectl_raw_output=
+  timeout_fail_node=node-a
+
+  run_capture
+
+  out="$tmp/snapshots/kubernetes-latest/tenant-block-io/node-a.txt"
+  assert_file_contains 'is unknown' "$out"
+  assert_file_contains '[capture exit code: 124]' "$out"
+  assert_file_lacks_pattern 'io.stat' "$out"
+  timeout_fail_node=
+  rm -rf "$tmp"
+}
+
+@test "every read this capture makes carries a wall clock bound" {
+  # The property that keeps this collector from costing the artifacts behind it.
+  # It runs on the failure path, where the apiserver and the kubelet are the two
+  # components least likely to answer, and an unbounded read here holds the
+  # chainsaw op until the op is killed -- which loses the tenant snapshot rather
+  # than truncating it. The mock refuses any call that is not the bounded form, so
+  # a read that lost its ceiling exits 97 and the file says so.
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  export COZY_REPORT_DIR="$tmp"
+  COZY_SNAPSHOT_NAME=kubernetes-latest
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_node_names="node-a"
+  kubectl_raw_output="$(worker_v2_series)"
+
+  run_capture
+
+  # Two reads: the virt-launcher listing and the node's metric stream. Both go
+  # through the wrapper, and the count is asserted so a read added later without
+  # one fails here rather than in a timed-out run.
+  [ "$(grep -c 'kubectl' "$timeout_calls")" -eq 2 ]
+  assert_file_lacks_pattern 'exit code: 97' "$tmp/snapshots/kubernetes-latest/tenant-block-io/node-a.txt"
+  rm -rf "$tmp"
+}
diff --git a/hack/run-kubernetes-cpu-throttle_test.bats b/hack/run-kubernetes-cpu-throttle_test.bats
new file mode 100644
index 0000000000..d254c7d496
--- /dev/null
+++ b/hack/run-kubernetes-cpu-throttle_test.bats
@@ -0,0 +1,1637 @@
+#!/usr/bin/env bats
+# Regression coverage for the tenant-worker CPU throttling capture in
+# hack/e2e-chainsaw/_lib/run-kubernetes.sh. cozytest.sh ends an @test block at
+# the first bare closing brace, so command mocks stay at top level.
+#
+# What this capture answers, and why nothing else in the tree answers it: when
+# a worker misses the node-Ready deadline, the sandbox node it runs on is
+# routinely half idle while the guest makes no progress. Node-level utilisation
+# and the node's dmesg both look healthy in that state, so "the host was
+# starved" and "the VM was held at its own CFS ceiling" produce the same
+# evidence from outside. Only the container's own throttling counters separate
+# them, and a capture that reports an unread kubelet as a quiet one would hand
+# the next reader the same ambiguity while looking like it had resolved it.
+# These tests pin the separation, not the reading.
+
+load test_helper
+
+kubectl_calls=/dev/null
+kubectl_node_names=
+kubectl_list_rc=0
+kubectl_list_stderr=
+kubectl_raw_rc=0
+kubectl_raw_stderr=
+# Two of the fixtures in this file claim to be wire shapes, and the rest do not.
+# This one and the uncapped test's single line are the two cAdvisor can actually
+# produce -- every family for a capped container, the period alone for one
+# with no limit, the two sides of the same Quota != 0 gate. Usage sits outside
+# that gate and is published for any container at all, so it belongs in both
+# shapes; the uncapped fixture stages only the line its own assertion needs, as
+# the rest of this file does. Every other fixture
+# below stages only the lines its own assertion needs, so a missing sibling
+# series there means "not relevant here" rather than "absent on the wire".
+kubectl_raw_output='container_cpu_usage_seconds_total{container="compute",namespace="tenant-test",pod="virt-launcher-a"} 118.4
+container_cpu_cfs_periods_total{container="compute",namespace="tenant-test",pod="virt-launcher-a"} 51200
+container_cpu_cfs_throttled_periods_total{container="compute",namespace="tenant-test",pod="virt-launcher-a"} 4211
+container_cpu_cfs_throttled_seconds_total{container="compute",namespace="tenant-test",pod="virt-launcher-a"} 12.5
+container_spec_cpu_quota{container="compute",namespace="tenant-test",pod="virt-launcher-a"} 100000
+container_spec_cpu_period{container="compute",namespace="tenant-test",pod="virt-launcher-a"} 100000'
+timeout_calls=/dev/null
+timeout_fail_node=
+
+kubectl() {
+  printf '%s\n' "$*" >>"${kubectl_calls}"
+
+  if [ "${3:-}" = get ] && [ "${4:-}" = pods ]; then
+    [ -z "${kubectl_list_stderr}" ] || printf '%s\n' "${kubectl_list_stderr}" >&2
+    [ "${kubectl_list_rc}" -eq 0 ] || return "${kubectl_list_rc}"
+    [ -z "${kubectl_node_names}" ] || printf '%s\n' ${kubectl_node_names}
+    return 0
+  fi
+
+  if [ "${1:-}" = get ] && [ "${2:-}" = --raw ]; then
+    [ -z "${kubectl_raw_stderr}" ] || printf '%s\n' "${kubectl_raw_stderr}" >&2
+    # Output is emitted before the status is honoured, because a read that is
+    # cut off part way through has already written what it managed to read. A
+    # stub that returns first can only ever produce empty-plus-failure, and
+    # the branch that labels a partial capture would be unreachable in tests
+    # while being the likeliest one in production.
+    [ -z "${kubectl_raw_output}" ] || printf '%s\n' "${kubectl_raw_output}"
+    return "${kubectl_raw_rc}"
+  fi
+
+  return 0
+}
+
+timeout() {
+  local command_rc=0
+  printf '%s\n' "$*" >>"${timeout_calls}"
+  # Return 97 rather than running the command when the wrapper is not the
+  # bounded form: a read that lost its ceiling must not pass as a read.
+  [ "${1:-}" = -k ] || return 97
+  shift 3
+  "$@" || command_rc=$?
+  if [ -n "${timeout_fail_node}" ]; then
+    case " $* " in
+      *"${timeout_fail_node}"*) return 124 ;;
+    esac
+  fi
+  return "${command_rc}"
+}
+
+assert_file_contains() {
+  local needle="$1"
+  local file="$2"
+
+  if [ ! -f "${file}" ]; then
+    printf 'expected %s to exist so it could be checked for: %s\n' "${file}" "${needle}" >&2
+    return 1
+  fi
+  case "$(cat "${file}")" in
+    *"${needle}"*) return 0 ;;
+  esac
+  printf 'expected %s to contain: %s\n' "${file}" "${needle}" >&2
+  return 1
+}
+
+assert_file_lacks_pattern() {
+  local pattern="$1"
+  local file="$2"
+
+  # A missing file must fail rather than vacuously pass: a bare `! grep -q`
+  # succeeds on an unreadable path, which is indistinguishable from "the file
+  # exists and does not carry the label". awk exits 2 on an unreadable path,
+  # which folded into an if reads the same way, so the file is checked first.
+  if [ ! -f "${file}" ]; then
+    printf 'expected %s to exist so it could be checked for: %s\n' "${file}" "${pattern}" >&2
+    return 1
+  fi
+  # Branched on awk's exact status, not on truthiness. awk exits 1 for "no line
+  # matched" and 2 for "I could not evaluate this" -- an unparseable regex, most
+  # of all. Folded into `if ... then fail; fi`, both land in the passing branch,
+  # so the assertion "this pattern is absent" is satisfied by the matcher giving
+  # up. That is the wrong direction for a negative assertion: a positive one
+  # fails loudly when its matcher breaks and gets fixed, this one goes green and
+  # stays green. Every claim in this file about something NOT appearing rests on
+  # the three-way split below.
+  # `|| _rc=$?` rather than a bare call: both runners set -e, and awk exiting 1
+  # for "no match" -- the ordinary success case here -- would otherwise abort the
+  # test before the branch below ever runs. The `if` form this replaces was
+  # exempt only because conditions are exempt.
+  local _rc=0
+  awk -v pattern="${pattern}" '$0 ~ pattern { found = 1 } END { exit found ? 0 : 1 }' "${file}" || _rc=$?
+  case "${_rc}" in
+    0)
+      printf 'expected %s not to match: %s\n' "${file}" "${pattern}" >&2
+      return 1
+      ;;
+    1) return 0 ;;
+    *)
+      printf 'awk could not evaluate pattern %s against %s\n' "${pattern}" "${file}" >&2
+      return 1
+      ;;
+  esac
+}
+
+# COZY_REPORT_DIR is set inline in each test below rather than through a helper,
+# which is the opposite of what the node-join suite does. The difference is
+# deliberate and shrinks to one line: there the assignment carries a ten-line
+# explanation that would otherwise stand in twenty copies, so the helper exists
+# to hold the explanation, not the assignment. Here it is a bare one-liner with
+# nothing to deduplicate, and a helper would buy indirection at no saving. The
+# reason it must be set at all is the same in both files and lives there.
+#
+# The function under test redirects a command's stderr into a report file and
+# decides which artifact to write from it. cozytest.sh runs under `set -x`, so
+# the tracer's own line for that command lands on the very stderr being
+# redirected, and every assertion about those files would be reading the
+# tracer. Call through this wrapper so the sinks hold what production writes.
+run_capture() {
+  local _rc=0
+  ( set +x; cozy_capture_tenant_worker_cpu_throttle 1 ) || _rc=$?
+  return "${_rc}"
+}
+
+@test "the phase-start warning names this collector as the exception it is" {
+  # That warning is what an operator reads in the CI log when `timeout` is
+  # missing, and the sibling suite treats its collector list as load-bearing
+  # rather than decorative -- it says which collectors do still fail that way.
+  # This one calls `timeout` directly, which puts it in the named class, and
+  # then does NOT fail that way because it carries a fallback. Unnamed, the
+  # sentence sends the reader to the opposite conclusion about the one collector
+  # whose behaviour differs, and a comment in the source does not reach them.
+  lib=hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  # Anchored on the phrase unique to the phase warning itself: the bracket-pair
+  # captures write their own [bounds] notes carrying "timeout is not on PATH",
+  # so the first match of that phrase is no longer this sentence.
+  warn=$(grep -n 'run UNBOUNDED' "$lib" | head -n 1 | cut -d: -f1)
+  if [ -z "$warn" ]; then
+    echo "expected the phase to still warn when timeout is missing" >&2
+    return 1
+  fi
+  line=$(sed -n "${warn}p" "$lib")
+  case "$line" in
+    *'exit 127 and collect nothing'*) ;;
+    *) echo "expected the warning to still name the 127 class it is contrasting against" >&2; return 1 ;;
+  esac
+  # The sentence went through false shapes before this one, including "except
+  # the worker CPU throttling capture", which read as a sole exception even
+  # though talos-image-cache has the same shape. An enumeration of a growing set
+  # is wrong the next time someone adds to it.
+  # What is pinned now is the DISCRIMINATOR: guarding the call with command -v
+  # is what separates the two outcomes, and every collector that guards is
+  # named. A fourth one added without a mention fails this.
+  case "$line" in
+    *'guard the call with command -v'*) ;;
+    *) echo "expected the warning to state what separates the two outcomes" >&2; return 1 ;;
+  esac
+  for c in 'CPU throttling' 'talos-image-cache'; do
+    case "$line" in
+      *"$c"*) ;;
+      *) echo "expected the warning to name the guarded collector: $c" >&2; return 1 ;;
+    esac
+  done
+}
+
+@test "a negative assertion fails when its own matcher cannot evaluate" {
+  # The helper below every "must not appear" claim in this file. Folded into an
+  # `if`, awk exiting 2 for an unparseable regex lands in the same branch as
+  # exiting 1 for "no match", so the assertion passes without having looked.
+  # What rides on it here are the claims that the artifact does NOT say
+  # something -- that a wedged kubelet was not written up as one that answered,
+  # that a capture was not labelled uncapped, that a log which was never
+  # written is not named. Those are the collector's own contract stated
+  # negatively, so a matcher that fails open turns each of them into a sentence
+  # nobody checked.
+  tmp=$(mktemp -d)
+  printf 'anything\n' >"$tmp/subject"
+
+  # A regex awk cannot parse. If the helper still reports "absent", it is
+  # reporting its own failure as a finding about the file.
+  if assert_file_lacks_pattern '*(' "$tmp/subject" 2>/dev/null; then
+    echo "FAIL: an unparseable pattern was reported as absent" >&2
+    rm -rf "$tmp"
+    return 1
+  fi
+  # And the two honest outcomes still work, or the guard above is bought by
+  # breaking the helper for everything.
+  assert_file_lacks_pattern 'nothinglikethis' "$tmp/subject"
+  if assert_file_lacks_pattern 'anything' "$tmp/subject" 2>/dev/null; then
+    echo "FAIL: a present pattern was reported as absent" >&2
+    rm -rf "$tmp"
+    return 1
+  fi
+  rm -rf "$tmp"
+}
+
+@test "the counters are read from the kubelet of the node the worker runs on" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_node_names="srv1"
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=throttle-smoke
+
+  run_capture
+
+  # The endpoint is per node and the counters are per container, so the node
+  # name has to come from the Pod. Reading a fixed node, or the wrong one,
+  # returns a healthy stranger's counters.
+  assert_file_contains 'get --raw /api/v1/nodes/srv1/proxy/metrics/cadvisor' "$kubectl_calls"
+  # And the node name comes from the field this caller asks the listing for.
+  # That projection is a parameter of the shared listing, and the other caller
+  # of it passes the Pod name instead; swapped, this capture would ask kubelets
+  # named after Pods and get nothing, with no error to say why. The mock answers
+  # any listing regardless of what was asked for, so nothing else here sees it.
+  assert_file_contains 'jsonpath={range .items[*]}{.spec.nodeName}{"\n"}{end}' "$kubectl_calls"
+  capture="$COZY_REPORT_DIR/snapshots/throttle-smoke/tenant-cpu-throttle/sample-1/srv1.txt"
+  assert_file_contains 'container_cpu_cfs_throttled_periods_total' "$capture"
+  # One assertion per alternative in the filter's regex, because a typo in an
+  # alternative no test drives through drops that family silently while every
+  # other assertion here stays green. The scheduled-periods count is the
+  # denominator the throttled count is read against, and the duration is what
+  # says whether a small ratio was a long stall.
+  assert_file_contains 'container_cpu_cfs_periods_total' "$capture"
+  assert_file_contains 'container_cpu_cfs_throttled_seconds_total' "$capture"
+  # The negative half of the labels. A complete capture that tells the reader
+  # its answer is missing, while the answer sits in the same file, is the same
+  # "capture misreads itself" harm as silence reported as an answer -- just
+  # inverted, and it fires on every healthy run rather than on the rare one.
+  assert_file_lacks_pattern 'incomplete' "$capture"
+  assert_file_lacks_pattern 'unknown' "$capture"
+  dir="$COZY_REPORT_DIR/snapshots/throttle-smoke/tenant-cpu-throttle/sample-1"
+  [ ! -f "$dir/srv1.read-error.log" ]
+  [ ! -f "$dir/READ-WARNINGS.txt" ]
+  [ ! -f "$dir/COLLECTION-FAILED.txt" ]
+  # The in-tree name the stream falls back to when mktemp fails. The live
+  # cleanup pin is "the raw stream is removed after each node", which follows
+  # the stream to TMPDIR; this one only says the fallback leaves nothing behind
+  # either, and it would go green on a run that never took the fallback.
+  [ ! -f "$dir/srv1.stream.tmp" ]
+  rm -rf "$tmp"
+}
+
+@test "what the workers consumed is captured beside what they were denied" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_node_names="srv1"
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=throttle-smoke
+
+  run_capture
+
+  # The throttled counters say the container met its ceiling. They cannot say
+  # how much CPU it got, and the two are different quantities: a guest held at a
+  # one-core ceiling and a guest scheduled onto a physical CPU for a tenth of
+  # that ceiling both report throttled periods, and the ratio alone does not
+  # separate them. The consumed seconds are what does, and cAdvisor publishes
+  # them on the same stream this capture already reads, so the answer costs a
+  # wider filter rather than another read.
+  capture="$COZY_REPORT_DIR/snapshots/throttle-smoke/tenant-cpu-throttle/sample-1/srv1.txt"
+  assert_file_contains 'container_cpu_usage_seconds_total' "$capture"
+  rm -rf "$tmp"
+}
+
+@test "each read is bounded and keeps its exit code" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_node_names="srv1"
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=throttle-smoke
+
+  run_capture
+
+  # An unbounded read here would hold the whole diagnostics block against a
+  # wedged kubelet, and the phase budget bounds when a read may START, never
+  # how long one already running may take.
+  # Named by their verbs, not by the bound: both reads carry the same one, so a
+  # bare '-k 5 20 kubectl' would be satisfied twice by whichever one survived
+  # and would not notice the other losing its ceiling.
+  # The selector travels with the listing. Without it the walk covers every Pod
+  # in the namespace, and the node set becomes every node running anything.
+  assert_file_contains '-k 5 20 kubectl -n tenant-test get pods -l kubevirt.io=virt-launcher' "$timeout_calls"
+  assert_file_contains '-k 5 20 kubectl get --raw' "$timeout_calls"
+  # Both bounds, not one. The wall-clock wrapper bounds the process and
+  # --request-timeout bounds the HTTP request underneath it; the second is the
+  # only one left when `timeout` is not on PATH, which is the case the fallback
+  # below exists for.
+  assert_file_contains '--request-timeout=20s' "$kubectl_calls"
+  assert_file_contains '[capture exit code: 0]' \
+    "$COZY_REPORT_DIR/snapshots/throttle-smoke/tenant-cpu-throttle/sample-1/srv1.txt"
+  rm -rf "$tmp"
+}
+
+@test "the sample number decides which reading a file belongs to" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_node_names="srv1"
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=throttle-smoke
+
+  ( set +x; cozy_capture_tenant_worker_cpu_throttle 2 )
+
+  # Every counter here is cumulative since the container started, so one reading
+  # is an average over an uptime and the pair is what gives a rate over the
+  # window the deadline covered. A second reading written over the first leaves
+  # one file and no interval -- collected, and unable to answer the question it
+  # was collected for.
+  assert_file_contains 'container_cpu_usage_seconds_total' \
+    "$COZY_REPORT_DIR/snapshots/throttle-smoke/tenant-cpu-throttle/sample-2/srv1.txt"
+  [ ! -d "$COZY_REPORT_DIR/snapshots/throttle-smoke/tenant-cpu-throttle/sample-1" ]
+  rm -rf "$tmp"
+}
+
+@test "each reading records when it was taken" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_node_names="srv1"
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=throttle-smoke
+
+  run_capture
+
+  # The knob names how long the block WAITS between its two passes, which is not
+  # the interval a subject's two readings span: the other subject's pass falls
+  # between them, and on the run this collector exists for that pass is the slow
+  # part. A reader who divides by the advertised number is then wrong by
+  # whatever that pass cost, in the direction that understates a rate. The stamp
+  # is what makes the real interval readable off the pair.
+  capture="$COZY_REPORT_DIR/snapshots/throttle-smoke/tenant-cpu-throttle/sample-1/srv1.txt"
+  assert_file_contains 'read attempted from' "$capture"
+  # Both ends, not one. A single stamp leaves the sampling instant somewhere
+  # inside a read whose duration is what goes wrong on the run this collector
+  # exists for, so the interval a reader divides by would be off by up to the
+  # read bound with nothing in the artifact saying so.
+  stamp=$(sed -n 's/.*read attempted from \([0-9][0-9]*\) to \([0-9][0-9]*\) epoch seconds.*/\1 \2/p' "$capture")
+  if [ -z "$stamp" ]; then
+    echo "expected a bare epoch stamp in $capture" >&2
+    cat "$capture" >&2
+    return 1
+  fi
+  rm -rf "$tmp"
+}
+
+@test "the raw stream is removed after each node" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_node_names="srv1 srv2"
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=throttle-smoke
+  # The stream is staged outside the report tree, so the assertion that used to
+  # catch a missing cleanup -- "no .stream.tmp in the report dir" -- cannot see
+  # it any more. Point TMPDIR at a directory of our own and check it is empty
+  # afterwards: mktemp honours TMPDIR, so this pins the cleanup wherever the
+  # file is staged, rather than pinning the path it used to have.
+  scratch="$tmp/scratch"
+  mkdir -p "$scratch"
+
+  TMPDIR="$scratch" run_capture
+
+  left=$(find "$scratch" -type f | wc -l | tr -d ' ')
+  if [ "$left" -ne 0 ]; then
+    echo "expected the raw metric stream to be removed; $left file(s) left in TMPDIR" >&2
+    find "$scratch" -type f >&2
+    return 1
+  fi
+  rm -rf "$tmp"
+}
+
+@test "a lowered read budget moves both of this collector's bounds" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_node_names="srv1"
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=throttle-smoke
+  # Assigned after sourcing, which is how both a caller and a test set it. A
+  # collector that took the knob's value at source time would keep 20 here.
+  #
+  # Not restored afterwards, and deliberately: run_capture calls the collector
+  # in an explicit subshell, and both runners give every @test a subshell of its
+  # own, so the assignment cannot outlive this body in either direction. A reset
+  # on the last line would be dead code that reads as load-bearing cleanup and
+  # teaches the next reader that state crosses tests here.
+  COZY_DIAG_READ_TIMEOUT=7
+
+  run_capture
+
+  assert_file_contains '-k 5 7 kubectl -n tenant-test get pods' "$timeout_calls"
+  assert_file_contains '-k 5 7 kubectl get --raw' "$timeout_calls"
+  assert_file_contains '--request-timeout=7s' "$kubectl_calls"
+  rm -rf "$tmp"
+}
+
+@test "a zero read budget is corrected rather than disabling the bound" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_node_names="srv1"
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=throttle-smoke
+  # Zero is the value that makes revalidation load-bearing rather than tidy:
+  # `timeout -k 5 0` disables the timeout outright and `--request-timeout=0s`
+  # means no timeout to kubectl, so a zero assigned after sourcing restores the
+  # unbounded read on exactly the wedged-kubelet path the bound exists for.
+  COZY_DIAG_READ_TIMEOUT=0
+
+  run_capture
+
+  assert_file_contains '-k 5 20 kubectl get --raw' "$timeout_calls"
+  # Bracketed rather than backslash-escaped: awk warns on `\-`, and a warning
+  # nobody reads is how an unparseable pattern would arrive here.
+  assert_file_lacks_pattern '[-]k 5 0 ' "$timeout_calls"
+  assert_file_lacks_pattern 'request-timeout=0s' "$kubectl_calls"
+  rm -rf "$tmp"
+}
+
+@test "the read's own status survives the filter that follows it" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_node_names="srv1"
+  # A kubelet that answered in full, whose body carries nothing for this
+  # namespace. Piped straight into grep the collector would report the read's
+  # status as grep's and call a healthy read a failure -- and, the other way
+  # round, would report a dead kubelet as a node with no tenant container.
+  kubectl_raw_output='container_cpu_cfs_periods_total{container="x",namespace="kube-system",pod="p"} 7'
+  kubectl_raw_rc=0
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=throttle-smoke
+
+  run_capture
+
+  capture="$COZY_REPORT_DIR/snapshots/throttle-smoke/tenant-cpu-throttle/sample-1/srv1.txt"
+  assert_file_contains '[capture exit code: 0]' "$capture"
+  assert_file_contains 'the kubelet answered' "$capture"
+  assert_file_lacks_pattern 'the kubelet was not read' "$capture"
+  rm -rf "$tmp"
+}
+
+@test "a node whose read times out does not stop the next node" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_node_names="srv1 srv2"
+  timeout_fail_node=srv1
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=throttle-partial
+
+  run_capture
+
+  # One throttled worker answers the question, but only if the walk survives
+  # the node that did not answer -- and the wedged one is as likely as not to
+  # be first, since the node list is sorted.
+  dir="$COZY_REPORT_DIR/snapshots/throttle-partial/tenant-cpu-throttle/sample-1"
+  assert_file_contains '[capture exit code: 124]' "$dir/srv1.txt"
+  assert_file_contains '[capture exit code: 0]' "$dir/srv2.txt"
+  rm -rf "$tmp"
+}
+
+@test "a warning on a successful listing is kept apart from a setup failure" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_node_names="srv1"
+  kubectl_list_stderr='Warning: v1 ComponentStatus is deprecated'
+  kubectl_list_rc=0
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=throttle-smoke
+
+  run_capture
+
+  # kubectl writes warnings on stderr with a zero exit, so the filename is
+  # decided by the status rather than by something having been written. Filed
+  # as a collection failure, a healthy listing reads as a collector that never
+  # ran at all.
+  dir="$COZY_REPORT_DIR/snapshots/throttle-smoke/tenant-cpu-throttle/sample-1"
+  assert_file_contains 'ComponentStatus is deprecated' "$dir/READ-WARNINGS.txt"
+  [ ! -f "$dir/COLLECTION-FAILED.txt" ]
+  assert_file_contains 'container_cpu_cfs_throttled_periods_total' "$dir/srv1.txt"
+  rm -rf "$tmp"
+}
+
+@test "a pool below the cap leaves no truncation marker" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_node_names="srv1 srv2"
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=throttle-uncapped
+
+  run_capture
+
+  [ ! -f "$COZY_REPORT_DIR/snapshots/throttle-uncapped/tenant-cpu-throttle/sample-1/COLLECTION-TRUNCATED.txt" ]
+  rm -rf "$tmp"
+}
+
+@test "repeated nodes are asked once" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  # Two workers co-scheduled on one node is the ordinary case, not a corner:
+  # the endpoint is per node and carries both, so asking twice spends a second
+  # read out of a budget that declines whatever has not started, and buys a
+  # byte-for-byte duplicate.
+  kubectl_node_names="srv1 srv1"
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=throttle-smoke
+
+  run_capture
+
+  count=$(grep -c 'get --raw' "$kubectl_calls" || true)
+  if [ "$count" -ne 1 ]; then
+    echo "expected one kubelet read for one node, got $count" >&2
+    return 1
+  fi
+  rm -rf "$tmp"
+}
+
+@test "the collector's own caps stay what its comments claim" {
+  # Values, not sums. A comment stating a total has to be kept true in every
+  # copy of it and falsifies silently; a cap the code carries as a literal can
+  # be pinned against the code itself, which is what this does.
+  lib=hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  # The walk and the read moved into the body this capture now shares with the
+  # network counters, so the subject of these assertions is the code the
+  # collector runs rather than the function that carries its name -- which is
+  # now a six-line call. Reading only the named function would leave every
+  # assertion below vacuously true against a body it no longer contains.
+  fn=$(awk '/^cozy_capture_tenant_worker_cpu_throttle\(\)/,/^}/' "$lib"
+      awk '/^_cozy_capture_worker_cadvisor\(\)/,/^}/' "$lib"
+      awk '/^_cozy_cadvisor_node_stream\(\)/,/^}/' "$lib"
+      awk '/^_cozy_virt_launcher_listing\(\)/,/^}/' "$lib")
+  case "$fn" in
+    *'max_nodes=3'*) ;;
+    *) echo "expected the collector to cap the walk at the 3 nodes the comments state" >&2; return 1 ;;
+  esac
+  # The knob, not a literal that equals it today. A hardcoded 20 keeps its
+  # value when the block's budget is lowered, so the one read that ignores the
+  # knob is the one that outlives it -- and the sibling suite that lowers the
+  # knob is what caught exactly that here.
+  case "$fn" in
+    *'timeout -k "${COZY_DIAG_READ_GRACE}" "${COZY_DIAG_READ_TIMEOUT}"'*) ;;
+    *) echo "expected each kubelet read to take the block's read-budget knob" >&2; return 1 ;;
+  esac
+  case "$fn" in
+    *'timeout -k 5 20'*) echo "expected no hardcoded bound to survive beside the knob" >&2; return 1 ;;
+  esac
+  # Checked in the source as well as exercised, not instead of it. `command -v`
+  # finds the shell function this file defines for `timeout`, so the fallback arm
+  # cannot be reached from a test body -- but it can be reached from a subprocess
+  # with a stripped PATH, and a test further down does exactly that.
+  # The scratch stream must not live in the report tree. This is a source-level
+  # claim on purpose: the case it guards against is a hard kill between writing
+  # the stream and removing it, which no unit test can stage, so the only thing
+  # that can be pinned is where the path points.
+  #
+  # Matched against CODE, with comment lines stripped first. The prose here
+  # names both `mktemp` and the fallback path, so a pattern run over the whole
+  # function is satisfied by the explanation of the rule instead of by the rule
+  # -- deleting the assignment outright would leave such a check green.
+  code=$(printf '%s\n' "$fn" | grep -v '^[[:space:]]*#')
+  case "$code" in
+    *'stream=$(mktemp "'*) ;;
+    *) echo "expected the raw metric stream to be staged via mktemp with an explicit template" >&2; return 1 ;;
+  esac
+  # The template must be explicit: BSD mktemp with no template ignores TMPDIR
+  # and always lands in the system directory, so a bare call puts the file
+  # somewhere neither this suite nor an operator chose.
+  case "$code" in
+    *'mktemp "${TMPDIR:-/tmp}/'*) ;;
+    *) echo "expected the scratch template to honour TMPDIR explicitly" >&2; return 1 ;;
+  esac
+  # report_dir may appear only as the fallback, never as the primary target.
+  primary=$(printf '%s\n' "$code" | grep 'stream=' | grep -v '^[[:space:]]*||' | head -n 1)
+  case "$primary" in
+    *'${report_dir}'*) echo "the raw stream must not be staged inside the report tree" >&2; return 1 ;;
+  esac
+  # Both reads, not just the kubelet one: the listing has the same two arms and
+  # the same fallback, so counting only `get --raw` leaves the arm that matters
+  # for the listing unwatched for exactly the same reason.
+  # This loop is the cheap half of that pair: it holds every read that EXISTS to
+  # the flag. It cannot see a branch that was deleted, because a count over the
+  # reads still present balances either way -- that is what the stripped-PATH
+  # test buys, and why both are here.
+  for verb in 'kubectl get --raw' 'kubectl -n tenant-test get pods'; do
+    reads=$(printf '%s\n' "$fn" | grep -c "$verb" || true)
+    bounded=$(printf '%s\n' "$fn" | grep -A3 "$verb" | grep -c -- '--request-timeout=' || true)
+    if [ "$reads" -eq 0 ] || [ "$reads" -ne "$bounded" ]; then
+      echo "every '$verb' must carry --request-timeout; $bounded of $reads do" >&2
+      return 1
+    fi
+  done
+}
+
+@test "both chainsaw comments list the collector where the phase actually spends it" {
+  # The ORDER is the claim, not any duration. Those comments describe the order
+  # the phase budget is spent in, and a budget that runs out declines whatever
+  # has not started -- so an entry in the wrong place misdescribes which
+  # collector survives a tight run. Pinning a minute figure instead would pin
+  # the one thing in that comment nobody can keep true.
+  for f in hack/e2e-chainsaw/kubernetes-latest/chainsaw-test.yaml \
+           hack/e2e-chainsaw/kubernetes-previous/chainsaw-test.yaml; do
+    reads=$(grep -n 'node-join diagnostics reads' "$f" | head -n 1 | cut -d: -f1)
+    cgroup=$(grep -n 'worker CPU usage and throttling counters' "$f" | head -n 1 | cut -d: -f1)
+    console=$(grep -n 'serial-console family' "$f" | head -n 1 | cut -d: -f1)
+    talos=$(grep -n 'guest Talos capture' "$f" | head -n 1 | cut -d: -f1)
+    if [ -z "$reads" ] || [ -z "$cgroup" ] || [ -z "$console" ] || [ -z "$talos" ]; then
+      echo "expected $f to list the reads, the counter capture, the console family and the guest Talos capture" >&2
+      return 1
+    fi
+    # Below the console, not above it. This capture is read twice and can spend
+    # most of the phase budget, and admission gates only when a collector may
+    # start, so above the console it would bound what the console gets -- and
+    # the console is the only surface that survives a worker which never reached
+    # apid. Above the guest Talos capture, which needs the apid that failure
+    # never reached and is the more expensive of the two.
+    if [ "$cgroup" -le "$console" ] || [ "$cgroup" -ge "$talos" ]; then
+      echo "in $f the counter capture must sit between the console family and the guest Talos capture" >&2
+      return 1
+    fi
+    if [ "$console" -le "$reads" ]; then
+      echo "in $f the console family must sit after the node-join reads" >&2
+      return 1
+    fi
+  done
+}
+
+@test "the capture is declined by the phase budget rather than running unconditionally" {
+  # Ungated, this collector would spend its budget after the phase had already
+  # declined the cheaper reads around it -- which is the failure the phase
+  # budget exists to prevent, reintroduced by the newest caller.
+  lib=hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  gate=$(grep -n "^ *if cozy_diag_phase_has_time '(d) tenant worker CPU counters, sandbox node CPU time and worker per-thread CPU time'; then$" \
+    "$lib" | head -n 1 | cut -d: -f1)
+  call=$(grep -n '^ *cozy_capture_tenant_worker_cpu_throttle "${_sample}" || true$' "$lib" | head -n 1 | cut -d: -f1)
+  if [ -z "$gate" ] || [ -z "$call" ]; then
+    echo "expected the capture to sit behind a cozy_diag_phase_has_time gate" >&2
+    return 1
+  fi
+  # THIS gate, not just some gate above the call. A line comparison alone is
+  # satisfied by any earlier gate in the block, which would leave the capture
+  # guarded by a decision taken about something else. The call now sits inside
+  # the sampling loop rather than on the line after the gate, so adjacency is no
+  # longer the way to say it: what says it is that no other gate opens in
+  # between.
+  next=$(awk -v g="$gate" 'NR > g && /cozy_diag_phase_has_time/ { print NR; exit }' "$lib")
+  if [ -z "$next" ]; then
+    echo "expected another phase gate after line $gate, so this test could bound the section" >&2
+    return 1
+  fi
+  if [ "$call" -le "$gate" ] || [ "$call" -ge "$next" ]; then
+    echo "the capture (line $call) must sit between its gate ($gate) and the next one ($next)" >&2
+    return 1
+  fi
+}
+
+@test "the capture runs ahead of the collectors that cost more, and behind the one it could starve" {
+  lib=hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  call=$(grep -n '^ *cozy_capture_tenant_worker_cpu_throttle "${_sample}" || true$' "$lib" | head -n 1 | cut -d: -f1)
+  if [ -z "$call" ]; then
+    echo "expected the failure path to call the throttling capture" >&2
+    return 1
+  fi
+  # What runs last is what the budget declines, so position is what decides
+  # whether this collector is ever taken on a tight run. Its question has no
+  # other answer in this tree, so it precedes the legs below. Stated without a
+  # count on purpose: the loop below is the enumeration, and a sentence that
+  # also counted would go stale the first time a leg is added to it.
+  for leg in 'cozy_capture_tenant_talos "${test_name}" || true' \
+             'talos_image_cache_diagnose || true'; do
+    line=$(grep -n -F -x "    ${leg}" "$lib" | head -n 1 | cut -d: -f1)
+    if [ -z "$line" ]; then
+      echo "expected the failure block to still call: ${leg}" >&2
+      return 1
+    fi
+    if [ "$call" -ge "$line" ]; then
+      echo "the throttling capture (line $call) must run before ${leg} (line $line)" >&2
+      return 1
+    fi
+  done
+  # And behind the console. Reading the counters twice costs the walk twice
+  # plus the interval, which is most of the phase budget at the read bound and
+  # the node cap, and admission gates only when a collector may START. Ahead of
+  # the console, a run that hits those bounds would leave the console never
+  # started rather than cut short -- and the console is the only capture that
+  # survives a worker which never reached apid, the shape this failure usually
+  # takes. Cost, not worth, is what puts it here.
+  console=$(grep -n "cozy_capture_tenant_serial_console 'node-join failed" "$lib" | head -n 1 | cut -d: -f1)
+  if [ -z "$console" ]; then
+    echo "expected the failure block to still capture the guest serial console" >&2
+    return 1
+  fi
+  if [ "$call" -le "$console" ]; then
+    echo "the throttling capture (line $call) must run after the console capture (line $console)" >&2
+    return 1
+  fi
+}
+
+@test "the ceiling is captured beside the counters" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_node_names="srv1"
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=throttle-smoke
+
+  run_capture
+
+  capture="$COZY_REPORT_DIR/snapshots/throttle-smoke/tenant-cpu-throttle/sample-1/srv1.txt"
+  # The throttled counters on their own say a container hit some ceiling, not
+  # which one. Without the quota beside them the reader cannot tell a VM capped
+  # at one core from one capped at eight, which is the whole question.
+  assert_file_contains 'container_spec_cpu_quota' "$capture"
+  # The period travels with the quota because the quota alone is meaningless:
+  # 100000us of quota is one core against a 100000us period and a tenth of one
+  # against a 1000000us period.
+  assert_file_contains 'container_spec_cpu_period' "$capture"
+  rm -rf "$tmp"
+}
+
+@test "the capture tells the reader how to pair it with its sibling sample" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_node_names="srv1"
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=throttle-smoke
+
+  run_capture
+
+  # The instruction lives with the subject that has a sibling rather than in the
+  # walk both subjects share, because the other caller of that walk takes one
+  # sample and would otherwise carry an instruction pointing at a directory that
+  # is never created.
+  capture="$COZY_REPORT_DIR/snapshots/throttle-smoke/tenant-cpu-throttle/sample-1/srv1.txt"
+  assert_file_contains 'subtract this node file from its sibling under the other sample directory' "$capture"
+  rm -rf "$tmp"
+}
+
+@test "a read that did not finish is not told to pair with a sibling" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_node_names="srv1"
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=throttle-smoke
+  # Series arrived and the read still failed, which is a stream cut off part way
+  # through.
+  kubectl_raw_rc=124
+
+  run_capture
+
+  capture="$COZY_REPORT_DIR/snapshots/throttle-smoke/tenant-cpu-throttle/sample-1/srv1.txt"
+  assert_file_contains 'these counters are incomplete' "$capture"
+  # Telling a reader to subtract two files asserts that both hold a whole
+  # reading. This one is already marked incomplete, and a difference taken
+  # against it understates the counter by whatever the read did not return --
+  # in the direction that makes a starved worker look busier than it was. The
+  # sandbox capture withholds its column legend from a short read for the same
+  # reason, so the pair answers this the same way on both sides.
+  assert_file_lacks_pattern 'subtract this node file from its sibling' "$capture"
+  rm -rf "$tmp"
+}
+
+@test "an unquota'd container is reported as uncapped rather than as a gap" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_node_names="srv1"
+  # One line, and it is the whole shape: cAdvisor gates the quota series and all
+  # three CFS counters on the same non-zero quota, so an uncapped container puts
+  # the period on the wire and nothing else. Staging a CFS counter beside it
+  # would be a shape the endpoint cannot produce, and the test would then pass
+  # on a fixture rather than on the contract. It is an answer, not a short read:
+  # filed as "nothing was collected" it would send the reader looking for a
+  # ceiling that does not exist.
+  kubectl_raw_output='container_spec_cpu_period{container="compute",namespace="tenant-test",pod="virt-launcher-a"} 100000'
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=throttle-smoke
+
+  run_capture
+
+  capture="$COZY_REPORT_DIR/snapshots/throttle-smoke/tenant-cpu-throttle/sample-1/srv1.txt"
+  assert_file_contains 'container_spec_cpu_period' "$capture"
+  assert_file_lacks_pattern 'unknown' "$capture"
+  assert_file_lacks_pattern 'incomplete' "$capture"
+  # Said in words, not left to inference. One line at exit 0 is also what a
+  # truncated read looks like, and every other outcome in this collector gets a
+  # sentence -- so the one answer it was built to deliver cannot be the one that
+  # gets none.
+  assert_file_contains 'running uncapped' "$capture"
+  rm -rf "$tmp"
+}
+
+@test "a quota probe that could not read says nothing about the ceiling" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_node_names="srv1"
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=throttle-smoke
+  # The last grep in the function is the one that decides whether the artifact
+  # makes a positive claim about the ceiling. grep exits 2 when it cannot read,
+  # and a bare `!` turns that into "no quota found", which is the direction of
+  # error this whole collector exists to refuse: a statement about the cluster
+  # derived from a read that failed on this runner.
+  grep() {
+    case "$*" in
+      *'^container_spec_cpu_quota{'*) return 2 ;;
+    esac
+    command grep "$@"
+  }
+
+  run_capture
+
+  capture="$COZY_REPORT_DIR/snapshots/throttle-smoke/tenant-cpu-throttle/sample-1/srv1.txt"
+  assert_file_lacks_pattern 'running uncapped' "$capture"
+  unset -f grep
+  rm -rf "$tmp"
+}
+
+@test "a capped container is not labelled uncapped" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_node_names="srv1"
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=throttle-smoke
+
+  run_capture
+
+  # The default fixture is the capped shape: every family, quota included.
+  capture="$COZY_REPORT_DIR/snapshots/throttle-smoke/tenant-cpu-throttle/sample-1/srv1.txt"
+  assert_file_contains 'container_spec_cpu_quota' "$capture"
+  assert_file_lacks_pattern 'running uncapped' "$capture"
+  rm -rf "$tmp"
+}
+
+@test "a read killed by the grace signal says so rather than leaving the code alone" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_node_names="srv1"
+  kubectl_raw_rc=137
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=throttle-smoke
+
+  run_capture
+
+  # 137 is what `timeout -k` leaves behind when the child ignored SIGTERM and
+  # had to be killed, by whatever did it. Naming every way a read comes up
+  # short is this collector's whole argument,
+  # so the one status that means "killed, not finished" cannot be the exception.
+  capture="$COZY_REPORT_DIR/snapshots/throttle-smoke/tenant-cpu-throttle/sample-1/srv1.txt"
+  assert_file_contains 'exit 137' "$capture"
+  assert_file_lacks_pattern 'exit 124' "$capture"
+  rm -rf "$tmp"
+}
+
+@test "a kubelet that was not read is recorded as unknown, not as an absence of throttling" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_node_names="srv1"
+  kubectl_raw_rc=1
+  kubectl_raw_output=
+  kubectl_raw_stderr='error: unable to connect to the server'
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=throttle-smoke
+
+  run_capture
+
+  capture="$COZY_REPORT_DIR/snapshots/throttle-smoke/tenant-cpu-throttle/sample-1/srv1.txt"
+  # This is the failure this collector exists to prevent, inverted: an empty
+  # file here reads as a container that never hit its ceiling, which is the
+  # exact conclusion the capture was added to stop people reaching by default.
+  assert_file_contains 'unknown' "$capture"
+  # `unknown` alone is shared by both labels, so it pins the word and not the
+  # branch: disable this arm and an unread kubelet falls through to the next
+  # one, where the artifact tells the reader the kubelet ANSWERED and merely
+  # carried nothing. Pin the sentence that only this arm writes.
+  assert_file_contains 'the kubelet was not read' "$capture"
+  # And that it points at the log rather than leaving the reader to find it.
+  assert_file_contains 'see read-error.log' "$capture"
+  # The stamp claims only when the read was attempted. This arm has just said
+  # nothing was read, so a line asserting the counters were sampled inside the
+  # bracket contradicts the line above it -- the same two-lines-disagreeing
+  # failure the pairing note and the legend are both gated against.
+  assert_file_lacks_pattern 'counters were sampled' "$capture"
+  assert_file_contains 'read attempted from' "$capture"
+  assert_file_contains 'error: unable to connect to the server' \
+    "$COZY_REPORT_DIR/snapshots/throttle-smoke/tenant-cpu-throttle/sample-1/srv1.read-error.log"
+  rm -rf "$tmp"
+}
+
+@test "a forbidden nodes-proxy read is preserved rather than folded into silence" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_node_names="srv1"
+  kubectl_raw_rc=1
+  kubectl_raw_output=
+  # RBAC on nodes/proxy is a failure mode this read has and an in-container
+  # read did not. It is also the one an operator can fix, so the 403 has to
+  # reach the artifact verbatim instead of becoming a generic "not read".
+  kubectl_raw_stderr='Error from server (Forbidden): nodes "srv1" is forbidden: User "system:serviceaccount:x:y" cannot get resource "nodes/proxy"'
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=throttle-smoke
+
+  run_capture
+
+  dir="$COZY_REPORT_DIR/snapshots/throttle-smoke/tenant-cpu-throttle/sample-1"
+  assert_file_contains 'the kubelet was not read' "$dir/srv1.txt"
+  assert_file_contains 'nodes/proxy' "$dir/srv1.read-error.log"
+  assert_file_contains 'Forbidden' "$dir/srv1.read-error.log"
+  rm -rf "$tmp"
+}
+
+@test "a read killed without a word is not reported as a kubelet that answered" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_node_names="srv1"
+  # `timeout` kills its child and writes nothing, and kubectl dies on SIGTERM
+  # without a word, so this -- not the tidy error above -- is the shape a
+  # wedged kubelet actually produces. Keyed on whether stderr exists rather
+  # than on the status, the collector calls it an answer.
+  kubectl_raw_rc=124
+  kubectl_raw_output=
+  kubectl_raw_stderr=
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=throttle-smoke
+
+  run_capture
+
+  capture="$COZY_REPORT_DIR/snapshots/throttle-smoke/tenant-cpu-throttle/sample-1/srv1.txt"
+  assert_file_contains 'the kubelet was not read' "$capture"
+  # The half that makes it a defect rather than a wording preference: the
+  # artifact must not state the opposite of what happened.
+  assert_file_lacks_pattern 'the kubelet answered' "$capture"
+  # No error log exists for a silent kill, so pointing at one sends the reader
+  # after evidence that was never written.
+  assert_file_lacks_pattern 'see read-error.log' "$capture"
+  assert_file_contains 'without a word' "$capture"
+  [ ! -f "$COZY_REPORT_DIR/snapshots/throttle-smoke/tenant-cpu-throttle/sample-1/srv1.read-error.log" ]
+  rm -rf "$tmp"
+}
+
+@test "a stream cut short without a word is still marked incomplete" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_node_names="srv1"
+  # Counters arrived, the ceiling did not, and the read died silently. This is
+  # the worst shape in the set: the header states that counters without a quota
+  # mean a container running uncapped, so an unlabelled truncation does not
+  # merely lose information -- it reads as a positive finding about the ceiling.
+  kubectl_raw_output='container_cpu_cfs_throttled_periods_total{container="compute",namespace="tenant-test",pod="virt-launcher-a"} 4211'
+  kubectl_raw_rc=137
+  kubectl_raw_stderr=
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=throttle-smoke
+
+  run_capture
+
+  capture="$COZY_REPORT_DIR/snapshots/throttle-smoke/tenant-cpu-throttle/sample-1/srv1.txt"
+  assert_file_contains 'incomplete' "$capture"
+  assert_file_lacks_pattern 'see read-error.log' "$capture"
+  rm -rf "$tmp"
+}
+
+@test "a filter that cannot read the stream blames neither the kubelet nor the namespace" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_node_names="srv1"
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=throttle-smoke
+  # grep exits 2 when it cannot read its input -- a full TMPDIR on the runner
+  # reaches this. The kubelet read itself succeeded, so the artifact must not
+  # say the kubelet answered and carried nothing (that is the conflation this
+  # collector exists to prevent), and must not say the kubelet was not read
+  # (it was). It has to name the local failure and nothing else.
+  grep() { case "$*" in *"-E "*) command grep "$@" >/dev/null 2>&1; return 2 ;; esac; command grep "$@"; }
+
+  run_capture
+
+  capture="$COZY_REPORT_DIR/snapshots/throttle-smoke/tenant-cpu-throttle/sample-1/srv1.txt"
+  assert_file_contains 'could not be read back on this runner' "$capture"
+  assert_file_lacks_pattern 'the kubelet answered' "$capture"
+  assert_file_lacks_pattern 'the kubelet was not read' "$capture"
+  unset -f grep
+  rm -rf "$tmp"
+}
+
+@test "a filter failure that said why points at the log it wrote" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_node_names="srv1"
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=throttle-smoke
+  # The half of this branch the sibling tests do not reach: they all silence the
+  # filter's stderr, so all of them land in the wordless variant and none drives
+  # the one that names the log. Both variants open with the same sentence, so a
+  # test asserting only that sentence passes on either.
+  grep() {
+    case "$*" in
+      *"-E "*) echo 'grep: input: Input/output error' >&2; return 2 ;;
+    esac
+    command grep "$@"
+  }
+
+  run_capture
+
+  dir="$COZY_REPORT_DIR/snapshots/throttle-smoke/tenant-cpu-throttle/sample-1"
+  assert_file_contains 'could not be read back on this runner' "$dir/srv1.txt"
+  assert_file_contains 'see filter-error.log' "$dir/srv1.txt"
+  assert_file_lacks_pattern 'the filter said nothing about why' "$dir/srv1.txt"
+  assert_file_contains 'Input/output error' "$dir/srv1.filter-error.log"
+  unset -f grep
+  rm -rf "$tmp"
+}
+
+@test "a filter failure never names a log that was not written" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_node_names="srv1"
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=throttle-smoke
+  # Fails silently: exit 2 with nothing on stderr. Naming a file that was never
+  # created sends the reader after evidence that does not exist -- the same rule
+  # every other message in this function follows.
+  grep() { case "$*" in *"-E "*) return 2 ;; esac; command grep "$@"; }
+
+  run_capture
+
+  dir="$COZY_REPORT_DIR/snapshots/throttle-smoke/tenant-cpu-throttle/sample-1"
+  assert_file_contains 'the filter said nothing about why' "$dir/srv1.txt"
+  assert_file_lacks_pattern 'see filter-error.log' "$dir/srv1.txt"
+  [ ! -f "$dir/srv1.filter-error.log" ]
+  unset -f grep
+  rm -rf "$tmp"
+}
+
+@test "a namespace filter that cannot read its input is not reported as an answered kubelet" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_node_names="srv1"
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=throttle-smoke
+  # The same unreadable-input failure as the metric filter above, one stage
+  # later. Every stage of the filter narrows the same stream, so an exit 2 from
+  # any of them leaves the capture empty for a reason that has nothing to do
+  # with what the kubelet said.
+  grep() { case "$*" in *'namespace="tenant-test"'*) return 2 ;; esac; command grep "$@"; }
+
+  run_capture
+
+  capture="$COZY_REPORT_DIR/snapshots/throttle-smoke/tenant-cpu-throttle/sample-1/srv1.txt"
+  assert_file_contains 'could not be read back on this runner' "$capture"
+  assert_file_lacks_pattern 'the kubelet answered' "$capture"
+  assert_file_lacks_pattern 'the kubelet was not read' "$capture"
+  unset -f grep
+  rm -rf "$tmp"
+}
+
+@test "a worker filter that cannot read its input is not reported as an answered kubelet" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_node_names="srv1"
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=throttle-smoke
+  # A chain that pipes the stage above into this one drops that stage's status
+  # at the pipe and this one's at the trailing `|| true`, so neither reaches the
+  # artifact and both need their own test: one of them passing says nothing
+  # about the other.
+  grep() { case "$*" in *'pod="virt-launcher-'*) return 2 ;; esac; command grep "$@"; }
+
+  run_capture
+
+  capture="$COZY_REPORT_DIR/snapshots/throttle-smoke/tenant-cpu-throttle/sample-1/srv1.txt"
+  assert_file_contains 'could not be read back on this runner' "$capture"
+  assert_file_lacks_pattern 'the kubelet answered' "$capture"
+  assert_file_lacks_pattern 'the kubelet was not read' "$capture"
+  unset -f grep
+  rm -rf "$tmp"
+}
+
+@test "a filter that fails after writing leaves the capture marked incomplete" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_node_names="srv1"
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=throttle-smoke
+  # A write error is where grep emits what it had flushed and then exits 2 --
+  # ENOSPC on a full disk reaches it, and so does the full TMPDIR this split was
+  # written for. The counters that arrive are real, so the capture is not
+  # unknown; it is short, and the family that goes missing first is the quota,
+  # whose absence reads as a container running uncapped.
+  grep() {
+    case "$*" in
+      *'pod="virt-launcher-'*)
+        command grep "$@" | head -n 1
+        echo 'grep: stdout: File too large' >&2
+        return 2
+        ;;
+    esac
+    command grep "$@"
+  }
+
+  run_capture
+
+  capture="$COZY_REPORT_DIR/snapshots/throttle-smoke/tenant-cpu-throttle/sample-1/srv1.txt"
+  assert_file_contains 'incomplete' "$capture"
+  assert_file_contains 'see filter-error.log' "$capture"
+  # The read itself was fine, so nothing here may blame it.
+  assert_file_lacks_pattern 'the read was cut short' "$capture"
+  assert_file_lacks_pattern 'see read-error.log' "$capture"
+  unset -f grep
+  rm -rf "$tmp"
+}
+
+@test "a filter that fails after writing never names a log that was not written" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_node_names="srv1"
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=throttle-smoke
+  grep() {
+    case "$*" in
+      *'pod="virt-launcher-'*) command grep "$@" | head -n 1; return 2 ;;
+    esac
+    command grep "$@"
+  }
+
+  run_capture
+
+  dir="$COZY_REPORT_DIR/snapshots/throttle-smoke/tenant-cpu-throttle/sample-1"
+  assert_file_contains 'incomplete' "$dir/srv1.txt"
+  assert_file_contains 'the filter said nothing about why' "$dir/srv1.txt"
+  assert_file_lacks_pattern 'see filter-error.log' "$dir/srv1.txt"
+  [ ! -f "$dir/srv1.filter-error.log" ]
+  unset -f grep
+  rm -rf "$tmp"
+}
+
+@test "a namespace whose containers are none of them workers names the worker filter" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_node_names="srv1"
+  kubectl_raw_rc=0
+  # Series for this namespace, none of them from a worker Pod -- what an
+  # upstream rename of the virt-launcher prefix looks like from here. Saying the
+  # kubelet reported nothing for the namespace would be false in this state and
+  # would send a reader after scheduling while the filter is what emptied the
+  # capture.
+  kubectl_raw_output='container_cpu_cfs_throttled_periods_total{container="kube-apiserver",namespace="tenant-test",pod="kube-apiserver-a"} 7
+container_cpu_cfs_throttled_periods_total{container="compute",namespace="tenant-test",pod="RENAMED-launcher-worker-a"} 4211'
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=throttle-smoke
+
+  run_capture
+
+  capture="$COZY_REPORT_DIR/snapshots/throttle-smoke/tenant-cpu-throttle/sample-1/srv1.txt"
+  assert_file_contains 'unknown' "$capture"
+  assert_file_contains 'none of them from a worker Pod' "$capture"
+  assert_file_lacks_pattern 'reported no CPU series' "$capture"
+  assert_file_lacks_pattern 'the kubelet was not read' "$capture"
+  # The rejected series must not ride along either: naming the filter is not a
+  # licence to print what it rejected.
+  assert_file_lacks_pattern 'kube-apiserver' "$capture"
+  rm -rf "$tmp"
+}
+
+@test "a kubelet that answered without this namespace is not reported as unread" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_node_names="srv1"
+  kubectl_raw_rc=0
+  kubectl_raw_output=
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=throttle-smoke
+
+  run_capture
+
+  capture="$COZY_REPORT_DIR/snapshots/throttle-smoke/tenant-cpu-throttle/sample-1/srv1.txt"
+  # Distinct from the kubelet that never answered: this one did, and an
+  # artifact that blames the read would send an operator after RBAC and
+  # networking when the actual finding is that no worker container was there.
+  assert_file_contains 'unknown' "$capture"
+  assert_file_contains 'the kubelet answered' "$capture"
+  assert_file_lacks_pattern 'see read-error.log' "$capture"
+  # Both empty-capture arms open with "the kubelet answered", so the line above
+  # cannot tell them apart on its own. This one is about a node carrying nothing
+  # of the namespace, and the sibling arm's wording is what it must not be.
+  assert_file_contains 'no CPU series for a tenant-test worker' "$capture"
+  assert_file_lacks_pattern 'none of them from a worker Pod' "$capture"
+  rm -rf "$tmp"
+}
+
+@test "with timeout off PATH the kubelet read still runs and keeps its request bound" {
+  # The fallback arm is what the phase-start warning promises for this collector:
+  # on a runner without the binary it runs UNBOUNDED rather than exiting 127, and
+  # `--request-timeout` is then the only ceiling left. A promise the code does not
+  # keep is what this whole collector is against, so it is entered here rather
+  # than inspected.
+  #
+  # A subprocess with a stripped PATH, because this file mocks `timeout` as a
+  # shell function and `command -v` finds functions -- the condition cannot be
+  # reached from inside a test body. Same device as the sibling suite uses for
+  # the block's own reads.
+  tmp=$(mktemp -d)
+  mkdir -p "$tmp/bin"
+  # Everything the collector shells out to, minus `timeout` itself. Missing one
+  # would fail this test for the wrong reason and read as the arm being broken.
+  for c in mkdir sort grep mv rm mktemp wc tr cat date; do
+    for d in /bin /usr/bin /usr/local/bin /opt/homebrew/bin; do
+      if [ -x "$d/$c" ]; then
+        ln -sf "$d/$c" "$tmp/bin/$c"
+        break
+      fi
+    done
+  done
+  for c in mkdir sort grep mv rm mktemp wc tr date; do
+    if [ ! -x "$tmp/bin/$c" ]; then
+      echo "FAIL: could not stage $c in the stripped PATH; the check below would be vacuous" >&2
+      return 1
+    fi
+  done
+  # Only the staged directory is checked. `command -v timeout` is always true
+  # here -- this file defines it as a shell function, which is the very fact the
+  # subprocess exists to escape -- so folding it in would read as if both halves
+  # mattered while only this one does.
+  if [ -e "$tmp/bin/timeout" ]; then
+    echo "FAIL: timeout leaked into the stripped PATH; this test would prove nothing" >&2
+    return 1
+  fi
+
+  out=$(bash -c '
+    set -eu
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    kubectl() {
+      # To a file, not to stderr. The collector redirects the stderr of every
+      # read into its own artifact, so a stub that announces itself there is
+      # captured by the code under test and never reaches this output.
+      printf "KUBECTL %s\n" "$*" >>"$CALLS"
+      if [ "${3:-}" = get ] && [ "${4:-}" = pods ]; then printf "srv1\n"; return 0; fi
+      if [ "${1:-}" = get ] && [ "${2:-}" = --raw ]; then
+        printf "container_cpu_cfs_throttled_periods_total{container=\"compute\",namespace=\"tenant-test\",pod=\"virt-launcher-a\"} 7\n"
+        return 0
+      fi
+      return 0
+    }
+    CALLS='"$tmp"'/calls
+    COZY_REPORT_DIR='"$tmp"'/report
+    COZY_SNAPSHOT_NAME=fallback
+    PATH='"$tmp"'/bin
+    cozy_capture_tenant_worker_cpu_throttle 1
+  ' 2>&1) || true
+  printf '%s\n' "$out" >"$tmp/out"
+
+  # The read ran at all -- bounded into exit 127 would leave nothing here.
+  assert_file_contains 'KUBECTL get --raw' "$tmp/calls"
+  # And carried the only bound it still has. This is the assertion the source
+  # check cannot make: it proves the flag reaches the arm that is actually taken.
+  assert_file_contains '--request-timeout=20s' "$tmp/calls"
+  # And produced counters rather than an "unknown" label.
+  assert_file_contains 'container_cpu_cfs_throttled_periods_total' \
+    "$tmp/report/snapshots/fallback/tenant-cpu-throttle/sample-1/srv1.txt"
+  rm -rf "$tmp"
+}
+
+@test "a killed read is not written up as a grace period that never ran" {
+  tmp=$(mktemp -d)
+  mkdir -p "$tmp/bin"
+  for c in mkdir sort grep mv rm mktemp wc tr cat date; do
+    for d in /bin /usr/bin /usr/local/bin /opt/homebrew/bin; do
+      if [ -x "$d/$c" ]; then
+        ln -sf "$d/$c" "$tmp/bin/$c"
+        break
+      fi
+    done
+  done
+  if [ ! -x "$tmp/bin/grep" ]; then
+    echo "could not stage a PATH without timeout" >&2
+    return 1
+  fi
+
+  # 137 on the arm that has no `timeout` at all. The status is 128+SIGKILL and
+  # says only that something killed the read -- an OOM killer on a loaded
+  # runner, a teardown signalling the process group. On this arm the grace
+  # period is the one cause it cannot have been, because there is no `timeout`
+  # in the call. cozy_diag_read refuses the same wording for the same reason.
+  out=$(bash -c '
+    set -eu
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    kubectl() {
+      if [ "${3:-}" = get ] && [ "${4:-}" = pods ]; then printf "srv1\n"; return 0; fi
+      if [ "${1:-}" = get ] && [ "${2:-}" = --raw ]; then return 137; fi
+      return 0
+    }
+    COZY_REPORT_DIR='"$tmp"'/report
+    COZY_SNAPSHOT_NAME=killed
+    PATH='"$tmp"'/bin
+    cozy_capture_tenant_worker_cpu_throttle 1
+  ' 2>&1) || true
+  printf '%s\n' "$out" >"$tmp/out"
+
+  capture="$tmp/report/snapshots/killed/tenant-cpu-throttle/sample-1/srv1.txt"
+  assert_file_contains 'exit 137' "$capture"
+  assert_file_lacks_pattern 'grace period' "$capture"
+  rm -rf "$tmp"
+}
+
+@test "the tenant control plane is not reported as a worker" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_node_names="srv1"
+  # tenant-test is not a worker-only namespace. It also carries the Kamaji
+  # control plane -- the same file reads the talos-csr-signer sidecar out of it
+  # -- and the CDI importer Pods. Those containers carry their own CPU limits,
+  # so they have a real CFS quota and can show genuine throttling. Reported
+  # under a heading that says "worker", a throttled apiserver answers the
+  # question with the wrong subject, which is the harm the neighbouring test
+  # guards against from a different namespace -- and this direction is likelier.
+  kubectl_raw_output='container_cpu_cfs_throttled_periods_total{container="kube-apiserver",namespace="tenant-test",pod="kubernetes-test-latest-version-abc"} 9999
+container_cpu_cfs_throttled_periods_total{container="compute",namespace="tenant-test",pod="virt-launcher-worker-a-11111"} 4211'
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=throttle-smoke
+
+  run_capture
+
+  capture="$COZY_REPORT_DIR/snapshots/throttle-smoke/tenant-cpu-throttle/sample-1/srv1.txt"
+  assert_file_contains 'virt-launcher-worker-a-11111' "$capture"
+  assert_file_lacks_pattern 'kube-apiserver' "$capture"
+  rm -rf "$tmp"
+}
+
+@test "another tenant's worker on the same node is not reported as ours" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_node_names="srv1"
+  # The node filter is per node, and a management node hosts whatever is
+  # scheduled on it. A virt-launcher belonging to a different tenant carries the
+  # same Pod-name prefix and the same container, so the Pod filter alone cannot
+  # separate them -- only the namespace can. Reported here it would be a
+  # stranger's throttling presented as this suite's worker, which is the same
+  # wrong-subject harm as the control plane, one namespace over.
+  kubectl_raw_output='container_cpu_cfs_throttled_periods_total{container="compute",namespace="tenant-other",pod="virt-launcher-elsewhere-99999"} 8888
+container_cpu_cfs_throttled_periods_total{container="compute",namespace="tenant-test",pod="virt-launcher-worker-a-11111"} 4211'
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=throttle-smoke
+
+  run_capture
+
+  capture="$COZY_REPORT_DIR/snapshots/throttle-smoke/tenant-cpu-throttle/sample-1/srv1.txt"
+  assert_file_contains 'virt-launcher-worker-a-11111' "$capture"
+  assert_file_lacks_pattern 'tenant-other' "$capture"
+  assert_file_lacks_pattern 'virt-launcher-elsewhere' "$capture"
+  rm -rf "$tmp"
+}
+
+@test "a series that merely contains a metric name does not pass the filter" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_node_names="srv1"
+  # An unanchored match would take any series whose name embeds one of the
+  # five, and the artifact would carry numbers that answer a different
+  # question while looking like the ones that answer this one.
+  # The Pod label has to match the worker filter, or the anchor is not what is
+  # under test: without it these lines are dropped for the wrong reason and the
+  # assertion holds whether the regex is anchored or not.
+  kubectl_raw_output='xcontainer_cpu_cfs_periods_total{namespace="tenant-test",pod="virt-launcher-worker-a-11111"} 1
+recorded_container_spec_cpu_quota{namespace="tenant-test",pod="virt-launcher-worker-a-11111"} 2'
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=throttle-smoke
+
+  run_capture
+
+  capture="$COZY_REPORT_DIR/snapshots/throttle-smoke/tenant-cpu-throttle/sample-1/srv1.txt"
+  assert_file_lacks_pattern 'xcontainer' "$capture"
+  assert_file_lacks_pattern 'recorded_container' "$capture"
+  assert_file_contains 'the kubelet answered' "$capture"
+  rm -rf "$tmp"
+}
+
+@test "a read status cannot be read as the guest's own answer" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_node_names="srv1"
+  kubectl_raw_rc=124
+  kubectl_raw_output=
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=throttle-smoke
+
+  run_capture
+
+  capture="$COZY_REPORT_DIR/snapshots/throttle-smoke/tenant-cpu-throttle/sample-1/srv1.txt"
+  # `timeout` reports 124 on expiry and passes the command's own status through
+  # otherwise, so a 124 here is either this collector's deadline or the read
+  # exiting 124 by itself, and nothing separates them. The file states that
+  # rather than picking one.
+  assert_file_contains '124' "$capture"
+  assert_file_contains 'cannot be told apart' "$capture"
+  assert_file_contains '[capture exit code: 124]' "$capture"
+  rm -rf "$tmp"
+}
+
+@test "the walk is capped and names both counts when it stops" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_node_names="n1 n2 n3 n4 n5 n6"
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=throttle-smoke
+
+  run_capture
+
+  # This runs inside a failure path that already spends minutes on other
+  # collectors under one chainsaw op timeout. A short listing otherwise reads
+  # as a small cluster rather than a cut walk.
+  truncated="$COZY_REPORT_DIR/snapshots/throttle-smoke/tenant-cpu-throttle/sample-1/COLLECTION-TRUNCATED.txt"
+  assert_file_contains '6 carried a worker in total' "$truncated"
+  # n4, not n6: the cap's VALUE is the claim, and the two chainsaw Test files
+  # order the failure path on it. Asserting some later node is absent leaves a
+  # larger cap green, which would silently overspend the budget.
+  [ -f "$COZY_REPORT_DIR/snapshots/throttle-smoke/tenant-cpu-throttle/sample-1/n3.txt" ]
+  [ ! -f "$COZY_REPORT_DIR/snapshots/throttle-smoke/tenant-cpu-throttle/sample-1/n4.txt" ]
+  rm -rf "$tmp"
+}
+
+@test "a read cut off part way through is not presented as a complete answer" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_node_names="srv1"
+  # The counters arrived; the stream died before the spec families that carry
+  # the ceiling. This is the one partial result that reads like a complete
+  # answer, because a missing quota otherwise means "uncapped".
+  kubectl_raw_output='container_cpu_cfs_throttled_periods_total{container="compute",namespace="tenant-test",pod="virt-launcher-a"} 4211'
+  kubectl_raw_rc=1
+  kubectl_raw_stderr='error: unexpected EOF'
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=throttle-smoke
+
+  run_capture
+
+  dir="$COZY_REPORT_DIR/snapshots/throttle-smoke/tenant-cpu-throttle/sample-1"
+  capture="$dir/srv1.txt"
+  assert_file_contains 'incomplete' "$capture"
+  assert_file_contains 'see read-error.log' "$capture"
+  assert_file_contains 'unexpected EOF' "$dir/srv1.read-error.log"
+  rm -rf "$tmp"
+}
+
+@test "a namespace with no scheduled worker says so instead of leaving an empty tree" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_node_names=
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=throttle-smoke
+
+  run_capture || true
+
+  # Distinct from the listing that never answered: this one got a real answer.
+  # An unscheduled virt-launcher has no node, so there is no kubelet to ask --
+  # which is itself a finding about the failure, not a gap in the collector.
+  assert_file_contains 'no virt-launcher Pod with a node assigned' \
+    "$COZY_REPORT_DIR/snapshots/throttle-smoke/tenant-cpu-throttle/sample-1/COLLECTION-FAILED.txt"
+  rm -rf "$tmp"
+}
+
+@test "a warning beside a healthy read is not filed as a failure" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_node_names="srv1"
+  kubectl_raw_stderr='Warning: metrics endpoint is deprecated'
+  kubectl_raw_rc=0
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=throttle-smoke
+
+  run_capture
+
+  dir="$COZY_REPORT_DIR/snapshots/throttle-smoke/tenant-cpu-throttle/sample-1"
+  # kubectl writes deprecation and partial-result warnings on stderr with a
+  # zero exit, so the exit status decides the filename, not the fact that
+  # something was written. Filed as an error, a healthy read would look failed.
+  assert_file_contains 'deprecated' "$dir/srv1.READ-WARNINGS.txt"
+  [ ! -f "$dir/srv1.read-error.log" ]
+  assert_file_contains 'container_cpu_cfs_throttled_periods_total' "$dir/srv1.txt"
+  rm -rf "$tmp"
+}
+
+@test "a Pod list that never returned is not reported as no workers" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_list_rc=1
+  kubectl_list_stderr='Unable to connect to the server'
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=throttle-smoke
+
+  run_capture || true
+
+  # An empty listing is what a cluster with no virt-launcher Pods produces. A
+  # listing that never answered has to leave something else behind, and the
+  # status it is judged on has to be kubectl's rather than that of whatever
+  # post-processing follows it.
+  assert_file_contains 'Unable to connect to the server' \
+    "$COZY_REPORT_DIR/snapshots/throttle-smoke/tenant-cpu-throttle/sample-1/COLLECTION-FAILED.txt"
+  assert_file_contains 'failed to list' \
+    "$COZY_REPORT_DIR/snapshots/throttle-smoke/tenant-cpu-throttle/sample-1/COLLECTION-FAILED.txt"
+  rm -rf "$tmp"
+}
+
+@test "the capture is wired into the node-join failure path" {
+  lib=hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  # The reporter is its own function now, so its declaration and its closing
+  # brace bound the region. Anchoring on the `exit 1` that follows would measure
+  # the caller instead: the exit sits outside this function, and every line of
+  # the reporter would count as inside any span reaching it.
+  head=$(grep -n '^cozy_report_node_join_failure() {$' "$lib" | head -n 1 | cut -d: -f1)
+  if [ -z "$head" ]; then
+    echo "expected the node-join failure reporter to still be a function" >&2
+    return 1
+  fi
+  tail=$(awk -v h="$head" 'NR > h && $0 == "}" { print NR; exit }' "$lib")
+  call=$(grep -n '^ *cozy_capture_tenant_worker_cpu_throttle "${_sample}" || true$' "$lib" | head -n 1 | cut -d: -f1)
+  if [ -z "$call" ] || [ -z "$tail" ]; then
+    echo "expected the node-join failure path to capture worker CPU throttling" >&2
+    return 1
+  fi
+  # A collector nothing calls is the shape this tree has shipped before: it
+  # reads as covered in review and produces nothing in the artifact. Pin the
+  # call site, not just the function.
+  if [ "$call" -le "$head" ] || [ "$call" -ge "$tail" ]; then
+    echo "the throttling capture (line $call) must sit inside the reporter ($head..$tail)" >&2
+    return 1
+  fi
+  # And that the reporter is still reached: a function nobody calls has the
+  # same artifact as a collector nobody calls, one level up.
+  grep -q '^ *cozy_report_node_join_failure "${test_name}"$' "$lib" || {
+    echo "expected run_kubernetes_test to still call the node-join reporter" >&2
+    return 1
+  }
+}
diff --git a/hack/run-kubernetes-drain_test.bats b/hack/run-kubernetes-drain_test.bats
new file mode 100644
index 0000000000..bc0ec6b35c
--- /dev/null
+++ b/hack/run-kubernetes-drain_test.bats
@@ -0,0 +1,117 @@
+#!/usr/bin/env bats
+# -----------------------------------------------------------------------------
+# Unit tests for the scoped tenant-drain helpers in run-kubernetes.sh.
+#
+# cozy_tenant_drained is the pure exit-condition of the inter-test drain loop
+# (cozy_wait_tenant_drained). Each argument is one resource-probe capture: the
+# stdout of a `kubectl get -o name` (empty once the resource is gone) or the
+# literal "err" the loop substitutes when a probe itself fails, so an API blip
+# is never misread as "the tenant has drained". The function returns 0 (drained)
+# only when every capture is empty/whitespace, non-zero otherwise.
+#
+# CI runs this file under Bats through `make bats-unit-tests`. It also remains
+# compatible with the legacy `hack/cozytest.sh` translator, whose awk parser
+# recognizes only @test blocks and a bare `}` on its own line. The tests avoid
+# `run` and `$status` for that compatibility path and use direct shell assertions.
+#
+# Run with: bats hack/run-kubernetes-drain_test.bats
+# -----------------------------------------------------------------------------
+
+load test_helper
+
+@test "all-empty captures report drained" {
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    if ! cozy_tenant_drained "" "" ""; then
+        echo "expected drained when every capture is empty" >&2
+        exit 1
+    fi
+}
+
+@test "no arguments reports drained" {
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    if ! cozy_tenant_drained; then
+        echo "expected drained when there are no captures" >&2
+        exit 1
+    fi
+}
+
+@test "a remaining VirtualMachine reports not-drained" {
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    if cozy_tenant_drained "virtualmachine.kubevirt.io/kubernetes-test-latest-version-md0-abcde" "" ""; then
+        echo "expected not-drained while a VirtualMachine is still present" >&2
+        exit 1
+    fi
+}
+
+@test "a remaining PVC in the last capture reports not-drained" {
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    if cozy_tenant_drained "" "" "persistentvolumeclaim/disk-system-kubernetes-test-latest-version-md0-abcde"; then
+        echo "expected not-drained while a worker-disk PVC is still present" >&2
+        exit 1
+    fi
+}
+
+@test "a multi-line resource list reports not-drained" {
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    vms=$(printf 'virtualmachine.kubevirt.io/a\nvirtualmachine.kubevirt.io/b\n')
+    if cozy_tenant_drained "$vms" "" ""; then
+        echo "expected not-drained for a multi-line VirtualMachine list" >&2
+        exit 1
+    fi
+}
+
+@test "the err sentinel is never misread as drained" {
+    # A failed probe (transient API error) substitutes the literal "err". Even
+    # when every other capture is empty, an err capture MUST count as
+    # not-drained so the loop keeps polling instead of declaring victory on a
+    # blip and letting the next tenant schedule onto an un-vacated sandbox.
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    if cozy_tenant_drained "" "err" ""; then
+        echo "expected not-drained when a probe returned the err sentinel" >&2
+        exit 1
+    fi
+}
+
+@test "whitespace-only captures are treated as drained" {
+    # `kubectl get -o name` against an empty result set yields no resource
+    # names; a stray newline must not be mistaken for a live resource.
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    blank=$(printf '\n')
+    if ! cozy_tenant_drained "$blank" "" "  "; then
+        echo "expected drained when captures hold only whitespace" >&2
+        exit 1
+    fi
+}
+
+@test "PVC filtering ignores leftovers from databases and other Kubernetes clusters" {
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    pvcs=$(printf '%s\n' \
+        'persistentvolumeclaim/clickhouse-data-test' \
+        'persistentvolumeclaim/disk-system-kubernetes-test-previous-version-md0-worker-a' \
+        'persistentvolumeclaim/disk-system-kubernetes-test-latest-version-md0-worker-b')
+    got=$(cozy_filter_cluster_pvcs test-latest-version "$pvcs")
+    expected='persistentvolumeclaim/disk-system-kubernetes-test-latest-version-md0-worker-b'
+    [ "$got" = "$expected" ] || {
+        echo "PVC filter crossed cluster ownership: [$got]" >&2
+        exit 1
+    }
+}
+
+@test "scoped drain queries the CAPI label and ignores unrelated PVCs" {
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    calls=$(mktemp)
+    kubectl() {
+        printf '%s\n' "$*" >> "$calls"
+        case "$*" in
+            *" get pvc "*) printf 'persistentvolumeclaim/clickhouse-data-test\n' ;;
+            *) printf '' ;;
+        esac
+    }
+
+    cozy_wait_tenant_drained test-latest-version 0 >/dev/null
+    [ "$(grep -c 'cluster.x-k8s.io/cluster-name=kubernetes-test-latest-version' "$calls")" -eq 2 ] || {
+        echo "VM and VMI probes were not scoped to the current CAPI cluster" >&2
+        cat "$calls" >&2
+        exit 1
+    }
+}
diff --git a/hack/run-kubernetes-install-wait_test.bats b/hack/run-kubernetes-install-wait_test.bats
new file mode 100644
index 0000000000..067ceb4741
--- /dev/null
+++ b/hack/run-kubernetes-install-wait_test.bats
@@ -0,0 +1,2731 @@
+#!/usr/bin/env bats
+# A test that creates a tenant `Kubernetes` cluster must wait for that release
+# to become Ready before the assertions it ends on. The mechanism, and how the
+# budget is sized, are derived once in docs/agents/e2e-testing.md section 4 --
+# not restated here, because two copies of a derivation drift and the one that
+# drifts is the one nobody re-reads.
+#
+# Why the rule holds in every OIDC mode and why the budget's floor does not is
+# derived with the rest of it, in the conventions named above. What follows from
+# it here: the size of the budget is not checked, only its parse and its sign.
+#
+# What follows are the cases this cannot see, each with its mechanism and
+# whether it fails loudly or quietly. A path that exits between the CR and the
+# wait ends the run mid-install too, and the script writes many `exit 1` sites
+# between the two. None carries an assertion name, so the rule reports ok on
+# them -- deliberately for the failing ones: those runs are already red, and
+# the rule is about a run that asserts, passes and ends.
+#
+# That argument covers a failure and nothing else. A path leaving successfully
+# before the wait -- `exit 0`, or a `return` -- ends mid-install with a green
+# run and the rule still answers ok, and this cannot see it: the exit carries
+# no assertion name either. Silent, and the only entry here that is. What keeps
+# it from being live is the subject: between the CR and the wait it writes one
+# `exit 0`, inside a quoted `sh -c` that runs in a probe Pod, and no `return`
+# at all.
+#
+# An indented assertion-helper definition is not exempted by the composition
+# rule, which anchors at column 0, so its inner call counts as a call site and
+# the ordering can red on a script that broke nothing. The diagnosis then names
+# a line inside a definition body, which runs wherever the helper is called.
+#
+# A backslash at the end of a line inside single quotes is literal to the shell
+# and a continuation to this fold, so the two lines are joined here and separate
+# there, as /bin/sh reads it. The direction is loud: joining brings the
+# next line's operators onto the wait's command, so a `|| true` that belongs to
+# a different command reads as this one's and the case reds. Nothing in the
+# subject writes it.
+#
+# The fold's EOF flush matters only for a file whose last line ends in a
+# backslash, which no subject writes. The fixture `eof-continuation.sh` is that
+# file, and the case reading it is what keeps the flush from being deleted as
+# tolerance nothing needs.
+#
+# `set +e` in a CALLER, not in the body. Errexit being off is a property of the
+# shell where the wait runs rather than of the line, and what can be read is the
+# body around it: `_errexit_before` reds on a `set +e` above the wait in the same
+# body. Above it in whatever called that body it does not, because the print
+# stops at the definition. Narrowed, not closed, and silent -- as is the other
+# silent one here, an assertion whose name the convention does not cover, which
+# reads as no assertion at all. Every other entry costs a false red instead. What keeps it from being a live hole
+# is the subject, which disables errexit nowhere, and suites that run under
+# `set -eu`.
+#
+# What it does see, and refuses: a wait inside a compound command. `_wait_nesting`
+# reads the level from bash's own printing of the parsed body, so a wait under
+# `if`, `while`, `for` or `case` is reported as nested and the rule fails. It
+# is a refusal rather than a verdict about the install -- whether the branch is
+# taken is a runtime fact -- and it is refused because the alternative is the
+# one shape that passes while the install runs unbounded.
+#
+# The cost is a false red on shapes that change nothing, and each answers with
+# a different verdict, so the diagnosis names a different cause than the shape
+# suggests. A wait inside a `{ ...; }` group, measured on all three spellings:
+# written on one line it carries a `;`, which SEQUENCE_OK_RE refuses, so no
+# wait is found; written across lines its closing brace stands alone, which the
+# extraction refuses, so the body is `unextractable`; written `{ cmd` on the
+# opening line the command no longer starts the line and the command matcher
+# passes it by. `nested` is reachable for `if`, `while` and `case` and for no
+# brace group. A wait wrapped in a subshell is a fourth answer: `( cmd` prints
+# on the line that opens the subshell, so the printed body shows no wait and
+# the verdict is `absent`. All of them are loud, and none is written in the
+# body this guard reads.
+#
+# The opposite error is also possible and reds valid code: function bodies are
+# delimited by a `}` at column 0, so a heredoc carrying one -- a JSON patch
+# body, say -- ends the body early and the ordering rule answers `unscoped`.
+# The message says so rather than blaming the ordering, which is why this is
+# listed rather than guarded against.
+#
+# The conditional restore of xtrace is pinned as a property of this file's own
+# text, not of a runner's behaviour. Turning xtrace on where the runner had it
+# off makes bats' failure formatter trace its own output, and a later failure in
+# that case then arrives as a hang rather than a red -- exit 124 against exit 1,
+# measured on a two-case file written for that measurement. Watching it happen
+# needs the real `bats` binary, which the lane enforcing this guard does not
+# have -- `hack/cozytest.sh` never calls it -- and a case that skips where the
+# guard runs is a case that passes there. So the behavioural check is not built,
+# and the form is held instead: the case below reads this file and refuses an
+# unconditional restore.
+#
+# What that text rule does not see is another spelling: a conditional restore
+# written some other way reads as absent, and an unconditional trace-on written
+# with anything but a bare `set -x` on its own line reads as fine. Direction:
+# the first reds and names the line, the second passes -- the trade the matchers
+# here make wherever a spelling has to be listed, and the reason the measurement
+# above sits beside it rather than standing in for it.
+#
+# An assertion helper whose name starts with an underscore does not open an
+# exempt body: the composition rule anchors on `cozy_assert_` and
+# `cozy_switch_and_assert_`, while the subject writes its private helpers under
+# a `_cozy_` prefix. A helper named `_cozy_assert_x` would therefore have its
+# inner calls counted as call sites. Loud, like the indented definition above,
+# and the same remedy -- name the helper so the rule sees it, or widen the
+# anchor here.
+#
+# The creator sweep's root is not the whole of what it leaves out. The lane at
+# `hack/e2e-apps` is outside it, and the file types the sweep reads (`.sh`,
+# `.yaml`, `.yml`) leave it out a second time, since that lane holds `.bats`
+# suites: widening the root alone would still read nothing there. Both halves
+# fail in the same silent direction, and closing one of them closes half.
+#
+# The creator sweep pairs an apiVersion with a kind and cannot tell an `apply:`
+# block from an `assert:` one, so a suite that only asserts on a tenant cluster
+# is reported as creating one. Direction is loud -- the uniqueness case reds and
+# names the file -- and the diagnosis says to check that before treating the
+# file as a subject. Telling them apart needs the document structure, which is
+# a parser; the sweep reads lines.
+#
+# The fixtures' marks are comments, and they stay invisible to the matchers that
+# read those fixtures because the comment cut runs before each match. Mechanism:
+# a mark is `# @name`, so a matcher that sees comments sees marks. Direction
+# belongs to the pair of element and edit, not to the element: drop the cut from
+# the call matcher and a comment counted as a call reds the shapes case; drop
+# it from the fold and the wait vanishes under a `<<WORD` named inside a
+# comment; coarsen it to a plain `sub(/[[:space:]]#.*$/)` and it eats the
+# opener along with the tail.
+# Three edits to one definition, three different reds: which matcher reds, and
+# with which diagnosis, depends on the edit. Reachable: the cut is one shared
+# definition, and every matcher here that reads shell lines reads through it --
+# the fold's heredoc probe, the wait, the budget and the call sites -- so an
+# edit to it reaches every marked fixture at once. The kind matchers read YAML
+# rather than shell lines and do not go through it.
+#
+# What this rule costs the subject, which is a consequence rather than a
+# limitation: splitting the body it reads is now a larger change than it looks.
+# Source position is execution order only inside one function, so moving the
+# assertions or the wait into a second one turns the ordering verdict to
+# `outside` and reds the unit lane. The direction is loud and the diagnosis
+# names the lines, but the split is not finished until this rule is pointed at
+# wherever the two now live -- which the message for that verdict says at the
+# moment it fires. Reachable rather than theoretical: the body is long enough
+# that dividing it is a thing someone will want to do.
+#
+# Scope: the tenant cluster is created from a heredoc in
+# hack/e2e-chainsaw/_lib/run-kubernetes.sh, so the script is the subject. There
+# are no Chainsaw fixtures applying this kind -- a guard walking `apply.file`
+# would match nothing and pass by having nothing to check.
+#
+# Run with: hack/cozytest.sh hack/run-kubernetes-install-wait_test.bats
+#
+# Both runners, and not for symmetry. `make unit-tests` runs this through
+# hack/cozytest.sh, which is pure shell -- `sh` with `set -eu` -- so that is the
+# one CI exercises; the `bats` binary runs it only when someone types it. They
+# differ on failures they do not share, and the difference falls the awkward
+# way: a command substitution that fails inside an assignment stops the run
+# under the runner CI uses, while under bats the same helper carries on past it
+# and answers normally, so the case passes. Nothing is hidden there -- no abort
+# happens under bats at all -- which is why running this by hand can look green
+# while CI reds, which is why both are kept green.
+
+load test_helper
+
+REPO_ROOT="$(cd "$(dirname "${BATS_TEST_FILENAME:-$0}")/.." && pwd)"
+TENANT_SCRIPT="${TENANT_SCRIPT:-$REPO_ROOT/hack/e2e-chainsaw/_lib/run-kubernetes.sh}"
+
+# A `--for` that names Ready being true, in the spellings this tree writes.
+# `kubectl wait` takes `condition=<name>[=<value>]` with the value defaulting
+# to true and the name matched case-insensitively, so `Ready` and `ready=true`
+# mean what `ready` means -- and run-kubernetes.sh itself writes the
+# capitalised form for other resources thousands of lines from the wait this
+# guard reads. Anchored at the end of the argument, so `ready=false`, which is
+# the negation of what the rule requires, does not satisfy it.
+#
+# The flag itself is required, not just the condition word: `--for=` and not
+# a bare `condition=ready`, which can sit in another argument. The separated
+# `--for condition=ready` that kubectl's parser (spf13/pflag) also accepts is
+# NOT taken, and the asymmetry with the budget matcher (which does take
+# `--timeout 5m`) is not stylistic: no wait under hack/ writes the separated
+# `--for` -- the only two occurrences are this file, naming it -- while the
+# separated `--timeout` is written there, at hack/e2e-install-cozystack.bats.
+#
+# Not every spelling kubectl tolerates: `=TRUE` is rejected here. The accepted set
+# is the ones written here plus the explicit `=true`, which is a set the table
+# test below can check, unlike "whatever the parser accepts".
+#
+# The argument ends on whitespace or the end of the line, and on nothing else.
+# A condition followed by `;` reaches SEQUENCE_OK_RE and is refused there for
+# carrying a `;` at all, so it needs no arm here.
+READY_CONDITION_RE='--for=condition=[Rr]eady(=[Tt]rue)?([[:space:]]|$)'
+
+# A wait that does not block is not a wait. Rather than enumerate the ways a
+# failure can be discarded -- `|| true`, `|| :`, `|| rc=$?`, a pipeline, and
+# whatever anyone writes next, which is an open set -- these key on shell's
+# control operators, which are a closed one.
+#
+# Rejected: a pipe of any kind, because `||` cannot be told from a masking
+# `|| true` by reading and a pipeline hands the status to the last command;
+# and any `&`, which covers backgrounding, `&&`, and a `2>&1` redirection
+# added for diagnostics -- that last is a false red, loud, and named in the
+# diagnosis rather than silently tolerated. docs/agents/e2e-testing.md, under
+# "The install gate must have teeth", records a gate of the backgrounded shape
+# carrying a permanently failing release through green CI.
+#
+# `&&` is rejected too, and the reason is not obvious. Under `set -e` a
+# command that is not the last of an AND-OR list is exempt from errexit, so
+# `kubectl wait ... && echo ok` carries on to the next line when the wait
+# fails, in sh and bash alike. The list's exit status does
+# carry the failure, but nothing in the script reads it.
+#
+# A HANDLED failure is refused too, so `;` is refused outright and the pattern
+# below takes no `if`. The script writes `if ! kubectl wait ...; then
+# <diagnostics>; exit 1; fi` elsewhere and that shape does end the run, but
+# whether it ends the run lives in the branch body and this rule reads one
+# line: a handler that logs and falls through satisfies every other clause.
+# With `_printed_body` in this file this is a choice rather than a limit -- bash's
+# own parse puts the branch body's top level in reach, so requiring it to end in
+# `exit` is checkable -- and the choice is to keep the refusal narrow rather
+# than grow a second parser of branch semantics here.
+# Scanning the branch does not close it either -- an `exit 1` nested in a
+# further `if` is in the text and conditional in fact, so the scan passes a
+# swallowed failure SILENTLY, while refusing the shape reds every time. The
+# cost is no inline diagnostics on THIS wait (`|| { ...; exit 1; }` goes to the
+# `|` rule), leaving the failure to the errexit the suite runs under.
+# Every filter below runs on the command with its trailing comment cut off.
+# Each of them but SEQUENCE_OK_RE is unanchored, so without the cut a comment
+# can supply whatever the command lacks -- a condition, a release name, a
+# namespace, a missing operator. SEQUENCE_OK_RE needs the cut for the opposite
+# reason: it is anchored on the whole line, so a `;` written inside a comment
+# would disqualify a command that carries none. Only WAIT_COMMAND_RE is
+# unaffected, and only because it runs before the cut.
+#
+# The matchers outside this pipeline need no cut for a different reason: they
+# anchor on what must BEGIN the line, which a trailing comment cannot reach.
+# A comment is not passed to kubectl, so anything found there is not an
+# argument: without the cut, `--for=condition=ready=false # ready` reads as a
+# Ready-true wait and a wait on another release can be rescued by naming the
+# right one in a comment.
+#
+# The command in command position, and a bare one: no `if`, negated or not.
+# A positive `if` makes the wait a condition and discards its status; a negated
+# one hands the failure to a branch this rule cannot read, for which see
+# TOOTHLESS_RE above.
+#
+# A line that merely mentions the command -- `echo kubectl wait hr ...`, or a
+# comment -- runs no wait, and a substring search would report one. The anchor
+# is also why THIS pattern needs no comment filter: a `#` cannot stand where
+# `kubectl` must. It says nothing about the others -- the call matcher below
+# takes a call anywhere in command position, so it has to cut comments first.
+#
+# Two spellings, and the second is the point: `kubectl_wait_retry`, which the
+# subject script defines for transient apiserver failures and today calls on
+# other resources but not on a release, hands its arguments to `kubectl wait`
+# and returns the status, so it blocks and
+# it carries teeth by the same standard as the direct form. Refusing it would
+# leave the guard blocking the transient-failure hardening this tree writes
+# elsewhere. The budget is read from it identically, because its retry
+# list holds transient server-side signatures only and an expired `--timeout`
+# is not among them: that failure returns on the first attempt.
+#
+# The optional `<digits>:` is grep -n's prefix. This pattern runs before that
+# prefix exists, so it never meets one in the pipeline -- it is tolerated so
+# the table below can feed the same row to this pattern and to SEQUENCE_OK_RE,
+# which does run after grep -n and must handle it.
+WAIT_COMMAND_RE='^[0-9]*:?[[:space:]]*kubectl(_wait_retry|[[:space:]]+wait)[[:space:]]+hr[[:space:]]'
+
+# The tenant namespace, in the spellings a shell writes: either flag, with a
+# space or an `=`, quoted or not. A namespace given through a variable is
+# not resolvable by reading and is refused -- named in the diagnosis rather
+# than silently treated as the wrong namespace.
+TENANT_NAMESPACE_RE='(-n[[:space:]=]*|--namespace[[:space:]=]+)"?tenant-test"?([[:space:]]|$)'
+
+TOOTHLESS_RE='\||&'
+SEQUENCE_OK_RE='^[^;]*$'
+
+# Whether $1 is a duration THIS GUARD can read and is non-zero -- a narrower
+# set than the ones kubectl accepts, which include `500ms` and `1.5h`. Not
+# whether it is the right length: that depends on where the wait sits and is
+# held by review (docs/agents/e2e-testing.md section 4).
+_usable_budget() {
+  # Shape first, rather than a character set, because `m5s` and `h1m` are made
+  # of the right characters and are rejected anyway, so a wait carrying one
+  # does not happen. The digit bound is not part of the overflow verdict --
+  # the ceiling below carries that -- it keeps awk's total inside the range
+  # `[` can compare, since an unbounded component makes it print a number
+  # `[` answers with "integer expression expected" on stderr instead. Then the
+  # total, because kubectl parses the value as a Go
+  # duration counting int64 nanoseconds: it overflows somewhat above 2562047h,
+  # and bounding each component would not bound their sum. A day is far above
+  # anything this suite would wait for and far below where the parser breaks,
+  # so one comparison covers both ends without standing in for a size rule.
+  printf '%s' "$1" | grep -Eq '^([0-9]{1,6}[hms])+$' || return 1
+  _ub_seconds=$(printf '%s' "$1" | awk '{
+    total = 0
+    while (match($0, /^[0-9]+[hms]/)) {
+      unit = substr($0, RSTART + RLENGTH - 1, 1)
+      value = substr($0, RSTART, RLENGTH - 1) + 0
+      if (unit == "h") { total += value * 3600 }
+      else if (unit == "m") { total += value * 60 }
+      else { total += value }
+      $0 = substr($0, RSTART + RLENGTH)
+    }
+    print total
+  }')
+  # Explicit returns, not a bare test as the last command: the runner appends
+  # `return 0` in front of a closing brace at column 0, so a helper whose
+  # verdict is its last command's status always reports success.
+  [ "$_ub_seconds" -gt 0 ] || return 1
+  [ "$_ub_seconds" -le 86400 ] || return 1
+  return 0
+}
+
+# The ways this repository's YAML can name the kind on one line, decided once
+# and shared by both matchers below: two spellings of one rule drift apart, and
+# a disagreement between the CR matcher and the sweep surfaces as a count
+# nobody can place rather than as a failure naming its cause.
+#
+# Tolerated, each because the document is unchanged by it: any spacing after
+# the colon including a tab, the value quoted with either quote, trailing
+# whitespace, and a trailing comment.
+#
+# Refused, and this is a scope decision rather than an assumption that nobody
+# writes them: a flow mapping (`{kind: Kubernetes}`), the JSON form
+# (`{"kind":"Kubernetes"}`), anchors and aliases, tags, and block scalars.
+# Recognising any of those means parsing YAML, and this guard matches lines by
+# construction -- a parser is a different tool with different failure modes.
+# The JSON form is not hypothetical: hack/kubernetes-md0-migration.bats spells
+# this kind that way, in the canned answer of a mock kubectl. It sits outside
+# the sweep root, which is the scope this file already declares, and a creator
+# written that way inside the root would be missed -- named here rather than
+# left to be discovered.
+KIND_VALUE_RE='kind:[[:space:]]*["'"'"']?Kubernetes["'"'"']?[[:space:]]*(#.*)?$'
+
+# Which element is taken is not distinguishable while the case below pins the
+# count at one -- first and last are the same line -- so this is a declaration
+# of intent rather than a rule with a case behind it.
+_cr_apply_line() {
+  _cr_apply_lines | head -n 1
+}
+
+# Every line applying the kind, not just the first. The rule below is written
+# for one cluster per script and says so; this exists so that a second one is
+# seen and refused rather than silently left unchecked.
+#
+# Keyed on the apiVersion/kind pair, adjacent and at column 0, not on `kind:`
+# alone. The adjacency is where this matcher is deliberately stricter than the
+# sweep below, which tolerates any key order because a YAML mapping is
+# unordered: here the subject is one heredoc this repository writes, and
+# pinning its shape makes a rewrite of it visible instead of silent.
+# Keyed on the pair rather than on `kind:` alone because the script applies a
+# KubernetesNodes CR too, and `kind:` alone takes whichever comes first. Both
+# halves anchor at column 0, which is also what makes a commented-out block
+# invisible here without a filter for it.
+_cr_apply_lines() {
+  awk -v kindre="^$KIND_VALUE_RE" '
+       /^apiVersion: apps\.cozystack\.io\// { av = NR; next }
+       # `av > 0` is load-bearing: awk starts it at 0, so on line 1 the test
+       # `av == NR - 1` compares 0 with 0 and a kind line there would count as
+       # a CR with no apiVersion anywhere in the file.
+       $0 ~ kindre { if (av > 0 && av == NR - 1) { print NR } }' "$TENANT_SCRIPT"
+}
+
+# How many tenant `Kubernetes` CRs the subject applies, as a number and never
+# as a failure.
+#
+# Counted from the kind line alone, at any indent, without the apiVersion
+# pairing the matcher above uses. The indent matters: a second cluster applied
+# from a `List` document has its keys indented under the item dash, and a count
+# anchored at column 0 reports one cluster while two are created -- silent,
+# where over-counting would red the case below and name the number. That pairing requires the two keys adjacent, which is right for
+# finding the ONE CR whose shape this repository writes, and wrong for counting:
+# a second CR with the keys in the other order, or with a field between them, is
+# the same manifest creating the same cluster and was counted as none -- leaving
+# the case below green while saying a second cluster ran unbounded.
+#
+# awk prints `0` for no matches and exits 0, so the count is a number on every
+# path; a `grep -c` here would print 0 and exit 1, and the assignment would end
+# the case before its own message.
+_cr_count() {
+  awk -v kindre="^[[:space:]]*$KIND_VALUE_RE" '$0 ~ kindre { n++ } END { print n + 0 }' "$TENANT_SCRIPT"
+}
+
+
+# Each line with its trailing comment removed, the way the shell removes one.
+#
+# `#` opens a comment where a word could start and only outside quotes. What
+# this takes as "where a word could start" is narrower than the shell's rule:
+# a space or a tab before the `#`, not the `;`, `&`, `|`, `(` or `)` that also
+# open one (`sh -c 'echo hi;#c'` prints `hi`). Every line that divergence keeps
+# is refused further on and loudly -- a `;` by SEQUENCE_OK_RE, an `&` or a `|`
+# by TOOTHLESS_RE, and a kept `#<<WORD` opens a heredoc that hides the wait
+# rather than inventing one. A backslash outside single quotes escapes whatever
+# follows it, as /bin/sh reads them: `foo#bar`, `"a # b"`, `\'a # b\'` and
+# `"a\" # b"` all keep the `#`, while `foo # note` does not. Cutting on any
+# ` #` takes the quoted case with it, and a wait written
+# `... "name #x" ... || true` then loses its
+# `|| true` and reads as a wait with teeth. That is the silent direction, which
+# is why this is not a `sed` one-liner.
+# The shell's comment rule as an awk function, inlined into both programs that
+# need it: this cut and the fold's heredoc-opener probe. A second copy would
+# drift, and the probe needs the rule in this form specifically. Without any cut
+# a `<<WORD` written inside a comment reads as an opener and every line below it
+# becomes heredoc data, the wait among them. With a crude cut -- a plain
+# `sub(/[[:space:]]#.*$/, "", probe)` -- a quoted ` #` earlier on a real opener
+# line takes the `<<WORD` away with the tail. Both have a fixture.
+AWK_CUT_COMMENTS='
+    function cutcomments(s,   out, sq, dq, n, i, c, p) {
+      out = ""; sq = 0; dq = 0; n = length(s)
+      for (i = 1; i <= n; i++) {
+        c = substr(s, i, 1)
+        # A backslash escapes the next character everywhere but inside single
+        # quotes, so `\"` does not close a double-quoted region. Without this
+        # the region closes early, the rest of the line reads as unquoted, and a
+        # `#` in it cuts away operators the shell still runs.
+        if (c == "\\" && !sq) {
+          out = out c
+          i++
+          if (i <= n) { out = out substr(s, i, 1) }
+          continue
+        }
+        if (c == "\047" && !dq) { sq = !sq }
+        else if (c == "\"" && !sq) { dq = !dq }
+        else if (c == "#" && !sq && !dq) {
+          p = (i == 1) ? " " : substr(s, i - 1, 1)
+          if (p == " " || p == "\t") break
+        }
+        out = out c
+      }
+      sub(/[[:space:]]+$/, "", out)
+      return out
+    }
+'
+
+_cut_comments() {
+  awk "$AWK_CUT_COMMENTS"'{ print cutcomments($0) }'
+}
+
+# The script's commands with their backslash continuations joined, each emitted
+# as "<first physical line>:<command>".
+#
+# Every filter below is line-wise, and a `\` at the end of a line moves whatever
+# follows out of their reach while the wait's own line still satisfies all of
+# them. That turns the toothless shapes this file names -- `|| true`, `&`, an
+# AND-list, a pipeline -- from a loud red into a silent pass, which is the one
+# failure the rule exists to prevent. Folding here rather than teaching each
+# filter about continuations keeps them reading one command at a time, which is
+# what they were written for.
+#
+# The line number is the FIRST physical line, so a diagnosis points at the line
+# a reader would look for. WAIT_COMMAND_RE tolerates that `<digits>:` prefix
+# already, for the same reason it tolerated grep -n's.
+_folded_commands() {
+  awk "$AWK_CUT_COMMENTS"'
+    # Inside a heredoc the lines are data, not commands. Without this a
+    # `kubectl wait hr ...` written into a heredoc body satisfies every filter
+    # below, so without this the rule reports ok on a script whose only such
+    # line is data on its way to `kubectl apply`. The failure direction of the
+    # tracking is the other way: mistaking a command for heredoc content hides
+    # it and the wait is reported missing, which is loud.
+    # One command can open several heredocs -- `cmd <<A <<B` -- and their bodies
+    # arrive in the order they were opened. Tracking only the first ends the
+    # tracking at the first terminator and hands the second body back as
+    # commands, which is how a wait written into data reads as the wait that
+    # runs. Silent, and the only shape here that would fail that way. No
+    # apostrophe in this comment: the awk program is single-quoted, and one
+    # ends it.
+    inhd {
+      if ($0 ~ hdq[hdi]) {
+        hdi++
+        if (hdi > hdn) { inhd = 0 }
+      }
+      next
+    }
+    {
+      cur = $0
+      if (buf != "") { sub(/^[[:space:]]+/, "", cur); cur = buf " " cur } else { start = NR }
+      if (cur ~ /\\$/) { sub(/[[:space:]]*\\$/, "", cur); buf = cur; next }
+      print start ":" cur
+      buf = ""
+      # The opener is itself a command and has been printed; what follows is not.
+      # Searched with any trailing comment cut first, or a `<<WORD` written
+      # inside a comment opens a heredoc that swallows the rest of the file.
+      probe = cutcomments(cur)
+      hdn = 0
+      rest = probe
+      pre = ""
+      # The delimiter is the WORD after the operator, with quote removal
+      # applied -- not a letter run with an optional quote on each end. The
+      # shell ends that word at whitespace or at one of `;&|<>()`, and quoting
+      # may sit anywhere inside it: `<<E"O"F` and `<<E\\OF` both name EOF.
+      # Reading only the leading run takes `E` as the delimiter, the terminator
+      # then never arrives, and every command after that heredoc is swallowed
+      # as data -- silent, and measured that way before this read the word.
+      while (match(rest, /<<-?[[:space:]]*[^[:space:];&|<>()]+/)) {
+        d = substr(rest, RSTART, RLENGTH)
+        # The character before the opener decides whether it is one. Taken from
+        # the previous iteration when the match starts the remainder, since the
+        # original line is no longer what is being scanned.
+        if (RSTART > 1) { pre = substr(rest, RSTART - 1, 1) }
+        prev = substr(d, length(d), 1)
+        rest = substr(rest, RSTART + RLENGTH)
+        # The third `<` is what that check refuses: a here-STRING `<<<WORD`
+        # matches this pattern from its second `<` and would take WORD as a
+        # delimiter that never arrives.
+        if (pre != "<") {
+          dash = (substr(d, 3, 1) == "-")
+          sub(/^<<-?[[:space:]]*/, "", d)
+          gsub(/[\\"\047]/, "", d)
+          # A delimiter carrying an expansion cannot be resolved by reading:
+          # what it names is decided at run time. Nothing under this root
+          # writes one, and the register says what it would cost.
+          if (d ~ /[$`]/) { d = "" }
+          if (d == "") { continue }
+          hdn++
+          # Exactly what the shell accepts as a terminator: `<<WORD`
+          # ends only on a line that is WORD alone at column 0, and `<<-WORD`
+          # strips TABS only -- a space-indented terminator ends neither, and
+          # neither does one with a trailing space. Accepting those closes the
+          # heredoc early and hands the rest of its body back as commands, which
+          # is how a wait planted in data reads as the wait.
+          hdq[hdn] = dash ? "^\t*" d "$" : "^" d "$"
+        }
+        pre = prev
+      }
+      if (hdn > 0) { inhd = 1; hdi = 1 }
+    }
+    END { if (buf != "") print start ":" buf }
+  ' "$TENANT_SCRIPT"
+}
+
+# Keyed on the release name the kind composes -- `kubernetes-<name>` -- so a
+# wait on some other release, which says nothing about this install, does not
+# satisfy the rule.
+#
+# Which lines count as a wait with teeth is TOOTHLESS_RE's and
+# SEQUENCE_OK_RE's business, and the reasoning for both is stated there.
+#
+# The namespace is matched as well as the name, because a HelmRelease is
+# identified by both: the CR is created in `tenant-test`, and a wait on the
+# same name elsewhere leaves this install unbounded.
+#
+# The closing quote in that key is load-bearing, not incidental punctuation:
+# the script also waits on child releases whose names extend the parent's
+# (`kubernetes-<name>-csi`, `-ingress-nginx`, `-ouroboros`, `-<component>`),
+# and without the quote the key is a prefix of every one of them. The cost is
+# that the parent wait has to be written with the name quoted, as the script
+# writes it; the same command with the name unquoted is invisible here, which
+# is why the failure below says so rather than only asking for a wait.
+#
+# Which lines count as the command at all is WAIT_COMMAND_RE's business, and
+# the reason for its shape is stated there.
+#
+# The first qualifying wait AFTER the CR is applied, not the first in the file:
+# a wait on this release before it exists bounds nothing, and answering with it
+# would report on the wrong line while the real wait sat untouched further
+# down. Not the last, either -- what the ordering rule is about is whether the
+# install was bounded before anything asserted on it, and a second wait bounds
+# nothing the first has not.
+#
+# Split from reading the budget so the two can be reported apart: a wait that
+# exists but whose timeout this guard cannot parse is a different fact from no
+# wait at all, and saying the second about the first sends the reader to look
+# for a line that is right where it should be.
+# Which command this is, on stdin and on stdout, in the one place both matchers
+# read it from. Two of them ask about the same wait -- one over the script's
+# text, one over the body bash prints back -- and a clause held by one and not
+# the other is two matchers answering about different commands.
+_wait_identity() {
+  grep -E -- "$READY_CONDITION_RE" \
+    | grep -F 'kubernetes-${test_name}"' \
+    | grep -E -- "$TENANT_NAMESPACE_RE" \
+    | grep -vE "$TOOTHLESS_RE" \
+    | grep -E "$SEQUENCE_OK_RE"
+}
+
+_ready_wait_line() {
+  _folded_commands \
+    | grep -E "$WAIT_COMMAND_RE" \
+    | _cut_comments \
+    | _wait_identity \
+    | cut -d: -f1 \
+    | awk -v cr="$(_cr_apply_line)" '$1 > cr + 0' \
+    | head -n 1
+}
+
+# Nothing when the wait carries no `--timeout` THIS matcher can see, which is
+# not the same as carrying none. Accepts the three spellings a shell writes --
+# `=value`, `="value"` and a separating space -- because the value is what
+# matters, and reporting a quoted one as unreadable would name a cause that is
+# not there.
+# A trailing comment is cut before the value is read: `... --for=condition=ready
+# # --timeout=5m` carries no budget at all, and reading one out of the comment
+# would report a bounded wait where kubectl falls back to its own default.
+#
+# A repeated scalar flag keeps the last occurrence: `Set` overwrites the value
+# rather than accumulating and a duplicate raises no error, so reading the last
+# `--timeout` on the command matches how the flag itself resolves.
+#
+# Read from the folded command, so a `--timeout` pushed onto a continuation is
+# read rather than reported unreadable -- the fold is what makes the value's
+# physical line irrelevant here.
+_ready_wait_budget() {
+  _folded_commands \
+    | sed -n "s/^${1}://p" \
+    | _cut_comments \
+    | sed -n 's/.*--timeout[= ]"\{0,1\}\([^ "]*\)"\{0,1\}.*/\1/p'
+}
+
+# The one line a fixture marks with a trailing `# @<name>`, or `0` when that is
+# not what it finds. None and more than one are refusals rather than
+# resolutions: taking the first would answer about a line nobody meant, and
+# taking none would skip a check while looking like it ran. `0` is never a line
+# number, so even a caller that forgets to test it compares against something no
+# matcher can return.
+#
+# A printed word rather than an exit status, because the repository runner
+# appends `return 0` to a function's closing brace and a status contract reads
+# as success under it.
+_fixture_line() {
+  _fl_hits="$(grep -nE "# @$1\$" "$TENANT_SCRIPT" | cut -d: -f1 | tr '\n' ' ')"
+  case "$_fl_hits" in
+  *' '*' ')
+    echo "fixture marker @$1 is on more than one line: $_fl_hits" >&2
+    echo 0
+    ;;
+  '')
+    echo "fixture marker @$1 is on no line of $TENANT_SCRIPT" >&2
+    echo 0
+    ;;
+  *)
+    printf '%s\n' "${_fl_hits% }"
+    ;;
+  esac
+}
+
+# Every line a fixture marks with `# @<name>`, in file order and space-joined,
+# which is the shape the matchers' own output is compared in.
+#
+# Where a mark comes from decides whether the comparison is a test at all. A
+# mark states the author's reading of the shell's own rules -- this line is a
+# call, this line opens a body -- checked against /bin/sh when in doubt. Marked
+# instead from what the matcher answered, the expectation becomes a copy of the
+# thing under test, every case passes by construction, and no mutation can red
+# it. That is the same trade as reconciling against a generator rather than
+# borrowing from it, one level up.
+_fixture_lines() {
+  grep -nE "# @$1\$" "$TENANT_SCRIPT" | cut -d: -f1 | tr '\n' ' '
+}
+
+# Definitions excluded, so the line that opens a helper is not counted as a
+# call to it.
+#
+# Matched by name prefix rather than by an enumerated pair: the OIDC helpers
+# run only under `enable_oidc`, so naming just those covers one of the two
+# suites while the @test below reads as a statement about both.
+#
+# The leading forms are the ones the tree writes: a bare call, and a call in a
+# condition (`if`, `elif`, `!`, `while`, `until`). `!` needs its space for the
+# same reason the wait matcher requires one: `!cozy_assert_x` names a command
+# that does not exist rather than negating a call, so counting it as a call
+# site would order a line that never runs an assertion. This is a matcher over
+# text, so the set it recognises is the set someone listed -- a shape nobody thought of is
+# invisible to it, and `hack/testdata/` below pins the ones that are. No
+# trailing space is required after the name: a call with no arguments, or one
+# piped into `|| rc=$?`, is still a call. A comment needs no exclusion: `#` is
+# not among the forms allowed to lead, so it fails the match outright.
+#
+# Digits and capitals belong to a name, and a call can end in `;` as well as
+# whitespace or a pipe. A `)` is not among them: for a call to both start the
+# line and end with one it would have to be a case-arm pattern or a subshell,
+# and in either shape the line does not begin with the call. This script talks
+# about md0 throughout, so `cozy_assert_md0_ready` is the next name someone
+# writes rather than a hypothetical one; a name or terminator this misses reads
+# as no assertion at all, which is the one failure here that passes silently.
+#
+# A definition is excluded by its trailing `() {`, not by the absence of a
+# space before it: `name () {` defines a function exactly as `name() {` does,
+# while satisfying the trailing-space class above.
+#
+# The prefix is a naming constraint as much as a matcher: the rule permits
+# reads before the wait, but a read named `cozy_assert_...` is counted as one
+# of the end-assertions and ordered accordingly. Name a mid-install read
+# something else, or the rule reds a script that obeys it.
+# Where this matcher and `_folded_commands` diverge, and deliberately: the fold
+# tracks heredocs and this reads line by line, so a `cozy_assert_*` written
+# inside a heredoc body counts as a call site here. Direction is loud -- a call
+# that never runs is placed, and a script that broke nothing reds -- and no
+# subject writes an assertion into a heredoc. Tracking heredocs in both would be
+# the second copy of a rule this file keeps one of.
+_assert_call_lines() {
+  awk '
+    # An assertion helper opens a body whose contents belong to that helper.
+    # A `cozy_assert_*` call inside one is composition, not an end-assertion
+    # call site: it runs wherever the helper is called from, which the call
+    # site below already places. Counted as a call site it reds a script that
+    # broke nothing, and the only remedy left to the author -- rename the
+    # helper -- contradicts the naming convention this rule relies on.
+    /^cozy_(assert_|switch_and_assert_)[A-Za-z0-9_]*[[:space:]]*\(\)[[:space:]]*\{/ {
+      # Written on one line it also closes on that line, never reaching a `}` of
+      # its own, so opening a body here swallows every call site below it and
+      # the rule reports a script with no assertions at all.
+      if ($0 ~ /\}[[:space:]]*$/) { next }
+      inh = 1; next
+    }
+    /^\}/ { inh = 0; next }
+    inh { next }
+    # Any other definition line is a definition, not a call.
+    /^[[:space:]]*[A-Za-z_][A-Za-z0-9_]*[[:space:]]*\(\)[[:space:]]*\{[[:space:]]*$/ { next }
+    # Two properties of this pattern rest on a single assertion, the set
+    # comparison in "_assert_call_lines recognises the call shapes it claims":
+    # that the whitespace after an operator is optional, and that the keyword
+    # arms below are taken. Either one alone would red that comparison, so
+    # neither is unpinned -- but one carrier holds both, and weakening the
+    # comparison drops both at once without naming either.
+    #
+    # Command position, which is not the same as the start of a line. The
+    # whitespace after an operator is optional here because the shell makes it
+    # optional -- `[ x ] &&cmd` runs, checked under `sh` -- and this subject
+    # never writes it that way today, so the tolerance is for the next author
+    # rather than for the current text. A call
+    # after `&&`, `||`, `;`, `then`, `do` or `{` stands where it stands: it runs
+    # there whenever its condition holds, and a conditional call before the wait
+    # is still a call before the wait. Keying on the line start alone let both
+    # end-assertions sit above the wait in that form with every case green,
+    # which is the one outcome this file exists to prevent. Context, not the
+    # reason: no line in the subject writes an assertion after `&&` today; the
+    # `&&` it does write joins test brackets inside a condition. Comments are cut before this runs, since the widened opener no
+    # longer keeps a `#` from standing where the call must.
+    #
+    # What it now takes that is not a call: the same text inside double quotes
+    # after one of those operators, as in `echo "x && cozy_assert_y"`. That is
+    # a false red, loud, and no line in the subject writes it.
+    $0 ~ "(^|&&[[:space:]]*|\\|\\|[[:space:]]*|;[[:space:]]*|then[[:space:]]+|else[[:space:]]+|do[[:space:]]+|\\{[[:space:]]*|\\([[:space:]]*)[[:space:]]*(if[[:space:]]+|elif[[:space:]]+|![[:space:]]+|while[[:space:]]+|until[[:space:]]+)?cozy_(assert_[A-Za-z0-9_]+|switch_and_assert_[A-Za-z0-9_]+)([[:space:]]|$|\\||;|&)" { print NR }
+  ' <<EOF
+$(_cut_comments < "$TENANT_SCRIPT")
+EOF
+}
+
+# "<start> <end>" of the column-0 function body containing line $1, or nothing
+# if that line is at file scope.
+#
+# The ordering rule compares source positions, and source position is only
+# execution order inside a single body: a call written above the wait but
+# placed in a helper runs wherever that helper is invoked. Rather than pretend
+# to resolve that, the rule below uses this to refuse the comparison when the
+# two are not in the same body.
+_enclosing_def_range() {
+  awk -v n="$1" '
+    /^[A-Za-z_][A-Za-z0-9_]*[[:space:]]*\(\)[[:space:]]*\{/ { start = NR; next }
+    /^\}/ { if (start && n >= start && n <= NR) { print start, NR; exit } start = 0 }
+  ' "$TENANT_SCRIPT"
+}
+
+# The ordering verdict for the wait at line $1. "ok" when the assertion call
+# sites are ordered after it; otherwise a diagnosis -- "unscoped" when the
+# wait is not inside a function body at all, "outside <lines>" for call sites
+# in some other body, "before <lines>" for ones this guard can place and that
+# run too early.
+#
+# "ok" rather than an empty string, because empty is what this prints when it
+# could not answer at all -- no anchor, no input, an error on the way. Reading
+# that as "no violations" is the same fault as a `case` with no default arm:
+# the check that did not happen and the check that passed become one outcome,
+# and the one that did not happen is the one worth hearing about.
+#
+# A function rather than inline in the rule below so that both answers can be
+# pinned against a fixture: the live script has no call in another body, so
+# the "outside" branch would otherwise never be exercised by anything.
+_ordering_violation() {
+  _ov_ln="$1"
+  _ov_scope="$(_enclosing_def_range "$_ov_ln")"
+  if [ -z "$_ov_scope" ]; then
+    echo "unscoped"
+    return 0
+  fi
+  _ov_start="${_ov_scope% *}"
+  _ov_end="${_ov_scope#* }"
+  _ov_bad=""
+  _ov_outside=""
+  for _ov_c in $(_assert_call_lines); do
+    if [ "$_ov_c" -lt "$_ov_start" ] || [ "$_ov_c" -gt "$_ov_end" ]; then
+      _ov_outside="${_ov_outside}${_ov_outside:+ }$_ov_c"
+    # -le, not -lt, and the equal case is unreachable today: a call on the
+    # wait's own line needs a `;` that SEQUENCE_OK_RE refuses. It stays -le
+    # because line numbers cannot say whether a same-line call sits before or
+    # after the wait, and an ambiguous case should red rather than pass.
+    elif [ "$_ov_c" -le "$_ov_ln" ]; then
+      _ov_bad="${_ov_bad}${_ov_bad:+ }$_ov_c"
+    fi
+  done
+  if [ -n "$_ov_outside" ]; then
+    echo "outside $_ov_outside"
+  elif [ -n "$_ov_bad" ]; then
+    echo "before $_ov_bad"
+  else
+    echo "ok"
+  fi
+}
+
+# On stdout, so the caller places it.
+#
+# Split from the rule so every branch is reachable by a test. Left inside the
+# rule, the branch for a wait at file scope could only be reached by moving
+# the wait in the script it reads, which no test can do to its own subject --
+# and a branch nothing reaches is a branch whose deletion nothing catches.
+#
+# The `""` arm is unreachable on purpose: `_ordering_violation` answers with a
+# verdict in every path today. It is here so that an early return added later
+# cannot read as `ok`, and the probe below is what keeps it from being deleted
+# as dead.
+_ordering_message() {
+  case "$1" in
+  unscoped)
+    echo "no function body was found around the readiness wait at line $2."
+    echo "Either it is at file scope, or the body around it ended early: a"
+    echo "body is delimited here by a \`}\` at column 0, and one inside a"
+    echo "heredoc -- a JSON patch written across lines, say -- closes it as"
+    echo "far as this reads. Check for that before moving anything."
+    echo "This guard orders assertion calls by source position, which is"
+    echo "execution order only within one body: with no body around the wait"
+    echo "there is nothing to compare within, and the ordering has to be"
+    echo "established by review instead of asserted here."
+    ;;
+  outside*)
+    echo "assertion call sites at line(s) ${1#outside } sit outside the function"
+    echo "body that holds the readiness wait at line $2. This guard orders call"
+    echo "sites by source position, and source position is execution order only"
+    echo "within one body: a call in another function runs wherever that"
+    echo "function is invoked, which this cannot see. Keep the assertions in the"
+    echo "same body as the wait, or establish the ordering by review."
+    echo "If the split is deliberate, this rule is part of it and there is no"
+    echo "knob for that: the body comes from where the wait sits, so following"
+    echo "the split means editing this file to read the body the assertions"
+    echo "moved into. Leaving that for later leaves the unit lane red on a"
+    echo "script that is correct."
+    echo "This verdict outranks the one for a call running too early, so"
+    echo "such a call may be present as well and is not listed here."
+    ;;
+  before*)
+    echo "assertion call sites at line(s) ${1#before } run at or before the"
+    echo "readiness wait at line $2. Asserting on a cluster whose release is"
+    echo "still installing is what the wait exists to prevent, and the order is"
+    echo "the load-bearing half -- a wait placed after the assertions bounds"
+    echo "nothing."
+    echo "Reading the cluster before the wait is allowed; being NAMED as an"
+    echo "end-assertion is not. If one of those lines is a deliberate"
+    echo "mid-install read, rename it off the \`cozy_assert_\` prefix and this"
+    echo "rule stops counting it."
+    ;;
+  "")
+    echo "no ordering verdict was produced for the wait at line $2. This is not"
+    echo "a passing check: the matcher returned nothing at all, so the ordering"
+    echo "is unknown rather than correct."
+    ;;
+  *)
+    echo "unrecognised ordering verdict '$1' for the wait at line $2. A verdict"
+    echo "this rule cannot read is treated as a failure, because the alternative"
+    echo "is passing on an answer nobody interpreted."
+    ;;
+  esac
+}
+
+# Where the wait at line $1 sits in its own body: `top` when it runs whenever
+# the body runs, `nested` when a compound command decides that, and a refusal
+# otherwise -- `unscoped`, `unextractable`, `unparsed`, `absent`, `ambiguous`.
+# `unparsed` covers both ways the definition can fail to come back readable:
+# it did not source, or it printed without the brace line bash puts on a line
+# of its own.
+#
+# The ordering rule already refuses to judge a call whose execution source
+# position cannot establish, and a wait inside `if`, `while` or `case` is the
+# same question about the wait itself. Accepting it would leave one shape that
+# passes while the install runs unbounded, which is the failure this file
+# exists to catch, so it is refused on the same grounds rather than allowed for
+# being harder to see.
+#
+# The nesting is bash's own answer: `declare -f` re-prints a body it has
+# parsed, one indent level per level of nesting. Counting keywords here would
+# mean deciding which `if` opens a compound command and which is an argument --
+# the parser's job, and a miscount downwards passes a nested wait silently.
+#
+# What is sourced is the extracted definition, never the script: the script's
+# top level sources two more files, so sourcing it would run whatever THEIR top
+# level grows later, on every run of this suite and with nothing to notice it.
+# A definition has no side effect by construction, but only if it is one: the
+# boundaries are checked before the text reaches `source` rather than taken from
+# the range on trust. The first line must open a definition and the last must be
+# the closing brace with nothing after it. A body closing `}; cmd` is a range
+# the helper produces from ordinary shell, and that command would run at source
+# time, so the closing check is the one that carries weight; the opening one is
+# not reachable through the range helper as it reads today, and the stub in the
+# case below is what keeps it from being deleted as dead.
+#
+# The body level is read off the printer's own shape -- the first line after
+# the `{` it prints on a line of its own -- rather than fixed at four
+# columns, so a change in how bash indents moves the floor and the comparison
+# with it. The smallest indent in the body would be the obvious answer and is
+# the wrong one: a heredoc prints verbatim, keeping the indentation it has in
+# the script, and the subject's heredocs put dozens of lines below the level
+# any statement is printed at.
+# The body bash parsed for the definition holding line $1, printed back by
+# `declare -f`. Status says why not, so a caller can name the reason rather
+# than treat every silence alike: 1 the line is at file scope, 2 the range is
+# not a definition, 3 it did not source or came back empty.
+#
+# Two rules read this -- where the wait sits, and whether errexit is switched
+# off above it -- and one extraction serves both. A second copy of these steps
+# would be a second thing to keep in step with `_enclosing_def_range`.
+_printed_body() {
+  _pb_scope="$(_enclosing_def_range "$1")"
+  [ -n "$_pb_scope" ] || return 1
+  _pb_dir="$(mktemp -d)"
+  sed -n "${_pb_scope% *},${_pb_scope#* }p" "$TENANT_SCRIPT" >"$_pb_dir/def.sh"
+  _pb_name="$(sed -n '1s/^\([A-Za-z_][A-Za-z0-9_]*\)[[:space:]]*()[[:space:]]*{.*$/\1/p' "$_pb_dir/def.sh")"
+  # The last line has to BE the closing brace, not merely open with one.
+  # `_enclosing_def_range` ends a body at any line starting `}`, so `}; cmd` is
+  # a range it produces from a file a shell author writes, and the command after
+  # the brace would run at source time. Trailing whitespace is all that may
+  # stand after it.
+  #
+  # The direction of that narrowing, since narrowing a check is where a silent
+  # pass gets introduced: everything refused here comes back as a refusal the
+  # caller names, never as a pass. A brace carrying a trailing comment --
+  # `} # end of foo`, which no body under hack/e2e-chainsaw writes today --
+  # costs a false red on a script that is fine, and that is the price of never
+  # sourcing a line whose tail nobody read.
+  _pb_close="$(tail -n 1 "$_pb_dir/def.sh" | sed 's/[[:space:]]*$//')"
+  [ "$_pb_close" = "}" ] || _pb_name=""
+  # The closing brace of the definition need not be the one the range ends on.
+  # A body can close early and leave a column-0 `}` further down, with commands
+  # between them: both checks above pass on such a range -- the first line opens
+  # a definition, the last is a bare brace -- and what stands between runs at
+  # source time. Three spellings of that were measured, and all three wrote the
+  # witness the case below reads when the refusal is removed: `  }` on its own
+  # line, `  }; cmd`, and `  cmd1; }; cmd2` where the brace closes the body in
+  # the middle of a line.
+  #
+  # So the test is the brace's ROLE, not its column: a brace that closes a body
+  # is a command, and what the fold emits are commands with their heredocs and
+  # comments already out of the way. A `}` standing in command position in any
+  # emitted command but the last means the body closed before the range did.
+  # Keying on the first character of a line is what let the third spelling
+  # through, and keying on the character alone would take the `{}` that this
+  # subject writes in YAML inside its heredocs.
+  #
+  # Why that is the whole class rather than three shapes: for a command to run
+  # at source time it must stand outside the body; the body must therefore close
+  # before the last command; and a body closes only on a `}` in command
+  # position, which is what this reads.
+  #
+  # The cost is a false red on a body that closes a `{ ...; }` group of its own
+  # -- loud, named by the caller, and the body this guard reads carries none.
+  # The surface is the whole body, not the wait's neighbourhood.
+  _pb_inner="$(
+    TENANT_SCRIPT="$_pb_dir/def.sh" _folded_commands \
+      | sed 's/^[0-9]*://' \
+      | sed '$d' \
+      | grep -cE '^[[:space:]]*\}|(;|&&|\|\||&|then[[:space:]]|do[[:space:]])[[:space:]]*\}([[:space:]]|;|$)' \
+      || true
+  )"
+  [ "$_pb_inner" = 0 ] || _pb_name=""
+  if [ -z "$_pb_name" ]; then
+    rm -rf "$_pb_dir"
+    return 2
+  fi
+  _pb_body="$(bash -c '. "$1" && declare -f "$2"' _ "$_pb_dir/def.sh" "$_pb_name" 2>/dev/null || true)"
+  rm -rf "$_pb_dir"
+  [ -n "$_pb_body" ] || return 3
+  printf '%s\n' "$_pb_body"
+}
+
+# The line of the wait inside a printed body, as that body numbers its own
+# lines. Nothing else can place it there: the print carries no line numbers
+# from the script.
+_printed_wait_line() {
+  printf '%s\n' "$1" \
+    | sed 's/;[[:space:]]*$//' \
+    | grep -nE "$WAIT_COMMAND_RE" \
+    | _wait_identity \
+    | cut -d: -f1 \
+    | head -n 1
+}
+
+# Whether errexit is still on where the wait at line $1 runs, as far as the body
+# holding it can say: `enabled`, `disabled`, or `unreadable` when the body or
+# the wait's place in it could not be had. The nesting rule reports on those
+# too, and the case for this one reds on `unreadable` as well, so an unreadable
+# body reds twice about one fact -- deliberately: this rule cannot establish
+# what it exists to establish, and passing on that would be a rule that answers
+# only when the answer is cheap.
+#
+# A wait whose failure is not fatal bounds nothing: the run carries on into the
+# assertions with the install still going. `set +e` cannot appear on the command,
+# so the closed-set argument the matchers rest on does not reach it; the body can.
+#
+# The spellings are the ones a shell writes to switch it off: an `e` among the
+# letters of a combined short flag, and the long `+o errexit`. A `set +e` that a
+# later `set -e` cancels before the wait reds as well -- loud, and the diagnosis
+# says which line it saw.
+_errexit_before() {
+  _eb_body="$(_printed_body "$1")" && _eb_rc=0 || _eb_rc=$?
+  if [ "$_eb_rc" != 0 ]; then
+    echo unreadable
+    return 0
+  fi
+  _eb_at="$(_printed_wait_line "$_eb_body")"
+  if [ -z "$_eb_at" ]; then
+    echo unreadable
+    return 0
+  fi
+  printf '%s\n' "$_eb_body" \
+    | sed 's/;[[:space:]]*$//' \
+    | awk -v at="$_eb_at" '
+        NR >= at + 0 { exit }
+        /^[[:space:]]*set[[:space:]]+\+[a-zA-Z]*e[a-zA-Z]*([[:space:]]|$)/ { found = 1 }
+        /^[[:space:]]*set[[:space:]]+\+o[[:space:]]+errexit([[:space:]]|$)/ { found = 1 }
+        END { print found ? "disabled" : "enabled" }
+      '
+}
+
+_wait_nesting() {
+  # An assignment that is not the last member of an AND-OR list is exempt from
+  # errexit, which is what keeps a refusal here from ending the run.
+  _wn_body="$(_printed_body "$1")" && _wn_rc=0 || _wn_rc=$?
+  case "$_wn_rc" in
+  0) : ;;
+  1) echo unscoped; return 0 ;;
+  2) echo unextractable; return 0 ;;
+  *) echo unparsed; return 0 ;;
+  esac
+  # The same identity the line was chosen by, so the two matchers answer about
+  # one command. Comments cannot reach this one: the parser dropped them before
+  # it printed. What it adds instead is a separator -- every command in the
+  # printed body ends in `;`, which the condition anchor and the sequence rule
+  # both refuse -- so the separator comes off before the source-side matchers
+  # see the line. With the separator left on, every verdict here is `absent`.
+  _wn_hits="$(
+    printf '%s\n' "$_wn_body" \
+      | sed 's/;[[:space:]]*$//' \
+      | grep -E "$WAIT_COMMAND_RE" \
+      | _wait_identity \
+      | awk '{ match($0, /^ */); print RLENGTH }'
+  )"
+  if [ -z "$_wn_hits" ]; then
+    echo absent
+    return 0
+  fi
+  # The printed body carries no line numbers, so two waits on the same release
+  # cannot be told apart here. Refused rather than answered about whichever
+  # came first.
+  if [ "$(printf '%s\n' "$_wn_hits" | awk 'END { print NR }')" != 1 ]; then
+    echo ambiguous
+    return 0
+  fi
+  _wn_base="$(printf '%s\n' "$_wn_body" | awk '
+    seen { match($0, /^ */); print RLENGTH; exit }
+    /^\{[[:space:]]*$/ { seen = 1 }
+  ')"
+  if [ -z "$_wn_base" ]; then
+    echo unparsed
+    return 0
+  fi
+  if [ "$_wn_hits" = "$_wn_base" ]; then
+    echo top
+  else
+    echo nested
+  fi
+}
+
+@test "_usable_budget accepts the durations this script can carry and refuses the rest" {
+  # 24h and 86400s are the ceiling itself, which is a wait, and the two
+  # values one second past it, which this refuses along with everything that
+  # would overflow the parser.
+  for good in 20m 5m 90s 1h 30s 1m30s 24h 86400s; do
+    if ! _usable_budget "$good"; then
+      echo "_usable_budget rejected '$good', which is a usable budget" >&2
+      exit 1
+    fi
+  done
+  # The digit bound's job is keeping awk's total inside the range `[` compares,
+  # and that shows up on stderr rather than in the verdict -- so the verdict
+  # alone would pass with the bound gone.
+  # The capture has to run without xtrace or the trace lands in it -- and the
+  # restore has to be conditional. Turning xtrace ON under a runner that never
+  # had it makes bats' failure formatter trace its own output, so every later
+  # failure in this case reports as a hang instead of a red -- the trace grows
+  # without bound under plain bats, while the repository runner ends with a
+  # readable failure. How large it gets depends on this file, which is why the
+  # size is not written down here.
+  # The capture shape is checked before it is trusted: a redirection that drops
+  # stderr would make the silence asserted below unconditional. Run here rather
+  # than inside the traced region, so this case keeps exactly one conditional
+  # restore -- which the case at the end of this file counts.
+  _ub_ctl="$(sh -c 'echo probe >&2' 2>&1 >/dev/null || true)"
+  if [ "$_ub_ctl" != probe ]; then
+    echo "the stderr capture answered '$_ub_ctl', not 'probe': the silence" >&2
+    echo "asserted below would hold whatever the function wrote." >&2
+    exit 1
+  fi
+  case "$-" in *x*) _ub_xtrace=1 ;; *) _ub_xtrace=0 ;; esac
+  set +x
+  _ub_noise="$(_usable_budget 999999999999999999999h 2>&1 >/dev/null || true)"
+  [ "$_ub_xtrace" = 0 ] || set -x
+  if [ -n "$_ub_noise" ]; then
+    echo "_usable_budget wrote to stderr on an overlong component: $_ub_noise" >&2
+    echo "the digit bound that keeps awk's total inside the range \`[\` can" >&2
+    echo "compare is gone; the verdict alone does not show this" >&2
+    exit 1
+  fi
+  # 0m and 00s are the ones worth naming: readable, positive-looking, useless.
+  # The long ones are not pedantry: kubectl parses the value as a Go duration,
+  # which overflows int64 nanoseconds, and a wait it refuses never happens.
+  # `999999h999999h999999h` is the case a per-component bound lets through.
+  for bad in "" 5 m 5x 500ms 0m 0s 00m -5m m5s h1m 5m5 ms 1m30 20mm \
+             9999999h 999999999999999999999h 25h 86401s 1440m1s \
+             999999h999999h999999h; do
+    if _usable_budget "$bad"; then
+      echo "_usable_budget accepted '$bad', which is not a usable budget" >&2
+      exit 1
+    fi
+  done
+}
+
+@test "READY_CONDITION_RE accepts the ways Ready-is-true is written here" {
+  # The negation case is the reason the pattern is anchored, and the accepted
+  # cases are the reason the anchor cannot be a bare `ready`: this repository
+  # writes the capitalised form too, and `=true` is the explicit spelling of
+  # the default. A wait rejected here is reported as no wait at all.
+  #
+  # `; then` is among the rejected: the argument ends on whitespace or the end
+  # of the line, and a condition followed by `;` belongs to a shape this rule
+  # does not accept at all.
+  for good in \
+    "--for=condition=ready" \
+    "--for=condition=Ready" \
+    "--for=condition=ready=true" \
+    "--for=condition=Ready=True" \
+    "--for=condition=ready --timeout=5m"; do
+    if ! printf '%s' "$good" | grep -Eq -- "$READY_CONDITION_RE"; then
+      echo "READY_CONDITION_RE rejected '$good', which waits for Ready" >&2
+      exit 1
+    fi
+  done
+  for bad in \
+    "condition=ready" \
+    "--for condition=ready" \
+    "--for=condition=ready; then" \
+    "--for=condition=ready=false" \
+    "--for=condition=Ready=False" \
+    "--for=condition=reconciling" \
+    "--for=condition=readyz" \
+    "--for=condition=ready=TRUE" \
+    "--for=condition=READY" \
+    "--for=condition=notready"; do
+    if printf '%s' "$bad" | grep -Eq -- "$READY_CONDITION_RE"; then
+      echo "READY_CONDITION_RE accepted '$bad', which is not Ready-is-true" >&2
+      exit 1
+    fi
+  done
+}
+
+@test "TENANT_NAMESPACE_RE takes the spellings of the tenant namespace" {
+  # The namespace completes the release's identity, so a form it misses is
+  # reported as no wait at all -- and `=` is the spelling this repo's own
+  # convention pushes an author toward. A separator is not required after the
+  # short flag, because `-ntenant-test` names the same namespace, but it is
+  # required after the long one: `--namespacetenant-test` is a flag kubectl
+  # does not have, and calling it correctly scoped would be scoping a line
+  # that never runs. What ends the match is the name itself, which is what
+  # keeps `tenant-test-2` out.
+  for good in \
+    "-n tenant-test" "--namespace tenant-test" "--namespace=tenant-test" \
+    "-n \"tenant-test\"" "-n tenant-test --timeout=5m" "-ntenant-test" \
+    "-n=tenant-test"; do
+    if ! printf 'x %s y\n' "$good" | grep -qE -- "$TENANT_NAMESPACE_RE"; then
+      echo "TENANT_NAMESPACE_RE rejected '$good', which names the tenant namespace" >&2
+      exit 1
+    fi
+  done
+  for bad in "-n other-ns" "-n tenant-test-2" "-n \${NS}" "--namespace kube-system" \
+             "--namespacetenant-test"; do
+    if printf 'x %s y\n' "$bad" | grep -qE -- "$TENANT_NAMESPACE_RE"; then
+      echo "TENANT_NAMESPACE_RE accepted '$bad', which is not the tenant namespace" >&2
+      exit 1
+    fi
+  done
+}
+
+@test "a wait with its failure discarded does not satisfy the rule" {
+  # The accepted set is small and the rejected one is open, so this pins both
+  # ends by shape rather than by naming the commands that mask a failure.
+  #
+  # Both spellings of the command itself are here, and so is the long resource
+  # name the diagnosis promises is refused: `helmrelease` written out. Without
+  # that row, widening the pattern to take it reds nothing.
+  #
+  # The negated `if !` is rejected with the rest: it hands the failure to a
+  # branch, and whether that branch ends the run is not on this line. The first
+  # rejected row carries no `if`, so it is the one that reaches SEQUENCE_OK_RE:
+  # a wait ending in `; then` is the tail of a multi-line `if` condition, whose
+  # status the `if` consumes rather than errexit. The one
+  # accepted row carrying grep -n's `<digits>:` prefix is there because
+  # SEQUENCE_OK_RE runs after grep -n and has to tolerate it.
+  for good in \
+    "  kubectl wait hr -n t \"k\" --timeout=5m --for=condition=ready" \
+    "kubectl wait hr -n t \"k\" --timeout=5m --for=condition=ready" \
+    "  kubectl wait hr -n t \"k\" --for=condition=ready --timeout=5m" \
+    "  kubectl_wait_retry hr -n t \"k\" --timeout=5m --for=condition=ready" \
+    "6013:  kubectl wait hr -n t \"k\" --timeout=5m --for=condition=ready"; do
+    if ! printf '%s\n' "$good" | grep -E "$WAIT_COMMAND_RE" | grep -vE "$TOOTHLESS_RE" \
+      | grep -qE "$SEQUENCE_OK_RE"; then
+      echo "a wait that propagates its failure was rejected: $good" >&2
+      exit 1
+    fi
+  done
+  for bad in \
+    "  kubectl wait hr -n t \"k\" --for=condition=ready &" \
+    "  kubectl wait hr -n t \"k\" --for=condition=ready || true" \
+    "  kubectl wait hr -n t \"k\" --for=condition=ready || rc=\$?" \
+    "  kubectl wait hr -n t \"k\" --for=condition=ready | tee log" \
+    "  kubectl wait hr -n t \"k\" --for=condition=ready; echo done" \
+    "  kubectl wait hr -n t \"k\" --timeout=5m --for=condition=ready ; then" \
+    "  kubectl wait hr/\"k\" -n t \"k\" --for=condition=ready" \
+    "6013:  kubectl wait hr -n t \"k\" --for=condition=ready || true" \
+    "6013:  kubectl wait hr -n t \"k\" --for=condition=ready &" \
+    "6013:  if ! kubectl wait hr -n t \"k\" --for=condition=ready" \
+    "  if ! kubectl wait hr -n t \"k\" --for=condition=ready; then" \
+    "  if !kubectl wait hr -n t \"k\" --for=condition=ready; then" \
+    "  if ! kubectl wait hr -n t \"k\" --for=condition=ready; echo x; then" \
+    "  echo kubectl wait hr -n t \"k\" --for=condition=ready" \
+    "  kubectl wait deployment -n t \"k\" --for=condition=ready" \
+    "  kubectl get hr -n t \"k\" --for=condition=ready" \
+    "  kubectl wait helmrelease -n t \"k\" --for=condition=ready" \
+    "  kubectl wait --timeout=5m hr -n t \"k\" --for=condition=ready" \
+    "  kubectl wait hr -n t \"k\" --for=condition=ready && echo ok" \
+    "  if kubectl wait hr -n t \"k\" --for=condition=ready; then"; do
+    if printf '%s\n' "$bad" | grep -E "$WAIT_COMMAND_RE" | grep -vE "$TOOTHLESS_RE" \
+      | grep -qE "$SEQUENCE_OK_RE"; then
+      echo "a wait whose failure goes nowhere was accepted: $bad" >&2
+      exit 1
+    fi
+  done
+}
+
+@test "_assert_call_lines recognises the call shapes it claims, and only calls" {
+  # The matcher whose gap is invisible: a shape it does not recognise reads as
+  # "no assertion here", so the ordering rule passes on a script that breaks it.
+  # Pinned against a fixture rather than the live script, because the live one
+  # writes two shapes today and the point is the set, not those two.
+  TENANT_SCRIPT="$REPO_ROOT/hack/testdata/install-wait/call-shapes.sh"
+  got="$(_assert_call_lines | tr '\n' ' ')"
+  # Each shape and each near-miss is labelled where it lives, in the fixture,
+  # and the reason a near-miss is one sits on its own line there -- no address
+  # is written down here, because an address in this file is the one thing that
+  # does not move with the line it names. The near-miss next to the negated
+  # call is the shape that reads closest to a call and is not one:
+  # `!cozy_assert_...` with no space names a command rather than negating a
+  # call. The last block covers command position that is not the line's start
+  # -- after `&&`, `||`, `then`, `do` and `{` -- since a call in any of them
+  # runs like one written first.
+  want="$(_fixture_lines call)"
+  if [ "$got" != "$want" ]; then
+    echo "_assert_call_lines on the fixture = [$got], want [$want]" >&2
+    echo "a missing line is a shape the ordering rule cannot see; an extra one" >&2
+    echo "is a comment or a definition counted as a call" >&2
+    exit 1
+  fi
+}
+
+@test "_cr_apply_line finds the tenant CR and nothing that merely resembles it" {
+  # Decoys stand ahead of the real CR in the order a looser match would take
+  # them; each is labelled in the fixture.
+  TENANT_SCRIPT="$REPO_ROOT/hack/testdata/install-wait/call-shapes.sh"
+  got="$(_cr_apply_line)"
+  # Marked on the apiVersion line: the kind line's own trailing space is a
+  # fixture property, and a mark would take its place. The offset is the
+  # adjacency the matcher itself requires.
+  want="$(( $(_fixture_line cr-above) + 1 ))"
+  if [ "$got" != "$want" ]; then
+    echo "_cr_apply_line on the fixture = '$got', want $want (the tenant CR)" >&2
+    exit 1
+  fi
+}
+
+@test "_ready_wait_line takes the wait that runs, on the release that matters" {
+  # A decoy per claim the matcher makes beyond `kubectl wait hr`, each labelled
+  # in the fixture, plus a second qualifying wait after the real one.
+  TENANT_SCRIPT="$REPO_ROOT/hack/testdata/install-wait/call-shapes.sh"
+  got="$(_ready_wait_line)"
+  # The wait's own line ends in a backslash, and a continuation cannot carry a
+  # trailing comment, so the mark sits on the line above it.
+  want="$(( $(_fixture_line live-wait-above) + 1 ))"
+  if [ "$got" != "$want" ]; then
+    echo "_ready_wait_line on the fixture = '$got', want $want" >&2
+    echo "every earlier wait is disqualified by exactly one claim, and a later" >&2
+    echo "qualifying wait follows, which bounds nothing the first has not" >&2
+    exit 1
+  fi
+  # That wait is written across a continuation with the flag split from its
+  # value, so reading its budget goes through the fold: the joined command has
+  # to read `--timeout 5m`, not `--timeout` followed by the continuation's own
+  # indent, or the value is invisible and the wait reads as unbudgeted.
+  budget="$(_ready_wait_budget "$got")"
+  if [ "$budget" != "5m" ]; then
+    echo "_ready_wait_budget on the folded wait = '$budget', want 5m" >&2
+    echo "the fold joined the continuation without dropping its indent" >&2
+    exit 1
+  fi
+}
+
+@test "_ready_wait_budget reads the spellings a shell writes" {
+  # One value, three ways to attach it. A quoted budget reported as unreadable
+  # would send the reader looking for a missing --timeout that is on the line.
+  TENANT_SCRIPT="$REPO_ROOT/hack/testdata/install-wait/call-shapes.sh"
+  # The three spellings the header names, in the order the fixture writes them:
+  # `--timeout=5m`, `--timeout="5m"`, `--timeout 5m`. Named here as well as
+  # marked there, so the set a reader checks against is the set the case runs.
+  set -- '--timeout=5m' '--timeout="5m"' '--timeout 5m'
+  for probe in $(_fixture_lines budget-probe); do
+    spelling="$1"
+    shift
+    line="$(sed -n "${probe}p" "$TENANT_SCRIPT")"
+    case "$line" in
+    *"$spelling"*) : ;;
+    *)
+      echo "the fixture line $probe no longer writes $spelling, so this case" >&2
+      echo "no longer covers the set its header claims" >&2
+      exit 1
+      ;;
+    esac
+    got="$(_ready_wait_budget "$probe")"
+    if [ "$got" != "5m" ]; then
+      echo "_ready_wait_budget $probe ($spelling) = '$got', want 5m" >&2
+      exit 1
+    fi
+  done
+  if [ "$#" != 0 ]; then
+    echo "spellings named here and not marked in the fixture: $*" >&2
+    exit 1
+  fi
+  # A --timeout only inside a trailing comment is no budget at all.
+  in_comment="$(_fixture_line budget-in-comment)"
+  if [ -n "$(_ready_wait_budget "$in_comment")" ]; then
+    echo "_ready_wait_budget read a value out of a trailing comment" >&2
+    exit 1
+  fi
+  # No line number, no budget: `sed -n "p"` would otherwise print the file and
+  # a --timeout from some other line would be read as this wait's.
+  if [ -n "$(_ready_wait_budget "")" ]; then
+    echo "_ready_wait_budget answered without being given a line" >&2
+    exit 1
+  fi
+}
+
+@test "_enclosing_def_range places a line in the body that holds it" {
+  TENANT_SCRIPT="$REPO_ROOT/hack/testdata/install-wait/call-shapes.sh"
+  # Every line here comes from the fixture's own marks, expectations included:
+  # a marked address moves with the line it names, while a number in this file
+  # stays where it was written and starts answering about whatever moved into
+  # its place.
+  #
+  # The body holding the wait. What must not be taken for a body -- an
+  # indented definition, a brace inside a heredoc -- is labelled in the fixture.
+  open="$(_fixture_line body-open)"
+  close="$(_fixture_line body-close)"
+  got="$(_enclosing_def_range "$((open + 1))")"
+  if [ "$got" != "$open $close" ]; then
+    echo "_enclosing_def_range $((open + 1)) = '$got', want '$open $close'" >&2
+    exit 1
+  fi
+  sopen="$(_fixture_line spaced-open)"
+  sclose="$(_fixture_line spaced-close)"
+  got="$(_enclosing_def_range "$((sopen + 1))")"
+  if [ "$got" != "$sopen $sclose" ]; then
+    echo "_enclosing_def_range $((sopen + 1)) = '$got', want '$sopen $sclose'" >&2
+    exit 1
+  fi
+  at_scope="$(_fixture_line file-scope)"
+  got="$(_enclosing_def_range "$at_scope")"
+  if [ -n "$got" ]; then
+    echo "_enclosing_def_range $at_scope = '$got', want nothing: file scope" >&2
+    exit 1
+  fi
+  # Without the reset that follows a close, a brace nothing opened would close
+  # the body that closed already and swallow everything between.
+  after="$(_fixture_line after-close)"
+  got="$(_enclosing_def_range "$after")"
+  if [ -n "$got" ]; then
+    echo "_enclosing_def_range $after = '$got', want nothing: that line sits" >&2
+    echo "between a closed body and a brace nothing opened" >&2
+    exit 1
+  fi
+}
+
+# Both keys within one document at the same indent, in either order, not
+# necessarily adjacent, and with the kind quoted or bare -- `kind: "Kubernetes"`
+# is the same scalar and the same cluster. The pre-filter has to accept the
+# quotes too, since it decides which files the scan is given at all.
+#
+# A YAML mapping is unordered, which is why order is free here: `kind` before
+# `apiVersion`, or `metadata` between them, are the same manifest and create
+# the same cluster. Adjacency would see neither, and a sweep that misses a
+# creator leaves the claim below passing while false -- which is the whole
+# failure this case exists to prevent.
+#
+# No case here exercises the leading anchor: losing it widens the
+# sweep, and a creator found where there is none reds the uniqueness case
+# loudly rather than passing. Named because the CR matcher's comment credits
+# its own anchor with the same job and that one has a case behind it.
+#
+# Two sibling objects at the SAME indent inside one document are not separated:
+# the buckets reset on `---` and nothing else, so an `apps.cozystack.io`
+# apiVersion in one `apply.resource:` block and a `kind: Kubernetes` in the next
+# are paired and the file is reported as a creator though neither object is one.
+# Reproduced -- a file whose two blocks are:
+#
+#     - apply: {resource: {apiVersion: apps.cozystack.io/v1alpha1, kind: Tenant}}
+#     - apply: {resource: {apiVersion: v1, kind: Kubernetes}}
+#
+# written out as indented mappings, comes back from this sweep as a creator.
+#
+# Not cured, and the reason is the cure rather than the cost of the disease.
+# Separating them does not need a parser -- a reset when the indent drops below
+# the bucket would do it -- but that reset, wrong once, splits the apiVersion
+# from the kind of ONE object and a real creator goes missing. The disease reds
+# the uniqueness case and names the file; the cure can hide a creator silently,
+# which is the failure this whole guard exists to prevent. A remedy that can
+# fail quietly is worse than a fault that always fails loudly.
+#
+# Context, not the reason: no file under the sweep root pairs an indented
+# `kind: Kubernetes` with a cozystack apiVersion today. One carries the
+# indented kind alone -- `securitygroup/securitygroup.yaml`, under a `fromApp:`
+# -- and it is named again below, where the reason it is not a creator is the
+# apiVersion rather than the indent.
+#
+# The indent is what keeps the precision an anchor would give -- the case that
+# reaches it is a `kind: Kubernetes` nested under another key with a cozystack
+# apiVersion elsewhere in the same document, which `creators/near-misses.yaml`
+# carries. The two near-misses under the sweep root today are excluded by the
+# same fact: neither carries an `apps.cozystack.io` apiVersion at all, so no
+# pair can form in either. The `application.kind` label is excluded twice over,
+# on the field name as well. The `fromApp:` entry is not: its `- kind:` line
+# registers in the bucket the dash makes, which is what the sequence fixture
+# pins, so the apiVersion is the whole of why that file is not a creator.
+# Pairing across documents is what the `---` split prevents.
+# The sweep sorts under LC_ALL=C: `sort` otherwise orders by the collating
+# sequence of whatever locale the suite runs in, and three cases compare its
+# output against a list written in one order. No fixture name distinguishes the
+# two orders today, so this pins a property nothing measures -- named here for
+# that reason rather than left to look checked.
+_kind_creators() {
+  _kc_root="$1"
+  # Each filename becomes one argument instead of a word of an unquoted
+  # expansion: `$(grep -rl ...)` is re-split on whitespace and globbed, so a
+  # checkout under a path carrying a space sweeps nothing and the uniqueness
+  # case reds blaming a missing creator rather than the path. A filename
+  # holding a newline still splits, since the list is newline-delimited, and
+  # that one reports a file that does not exist rather than passing.
+  #
+  # One awk over the whole list, not one per file: awk dies on the file it
+  # cannot handle, and with the run split per file the survivors come back
+  # looking like a complete answer: a mutation that makes awk fatal
+  # stops reddening anything the moment each file gets its own run.
+  #
+  # What a creator can be written in, decided here rather than left to whatever
+  # the root happens to contain. The rule is pre-emptive: a manifest quoted in
+  # prose creates nothing, and a grep over every file reds on an edit to it.
+  # The shape exists in this repository -- docs/oidc-tenant.md carries the kind
+  # in a fenced example -- outside this root rather than in it, which is why
+  # the root is a choice about place and this is a choice about form. A parked
+  # `.disabled` suite creates nothing either; re-enabling one restores the
+  # `.yaml` name the sweep reads, so that exclusion cannot outlive the parking.
+  #
+  # The two spellings of the YAML suffix are both taken, and the direction is
+  # why: a suffix left out is a creator the sweep walks past, and the case below
+  # then reports one creator while two clusters run. Every other gap here costs
+  # a false red; this one costs a silent pass, so the list errs wide.
+  # `set --` here is the function's own parameter list, not the caller's: a
+  # function's positional parameters are restored on return, measured under
+  # sh, dash and bash. The list is built this way so each filename reaches awk
+  # as one argument regardless of the spaces in it.
+  set --
+  while IFS= read -r _kc_file; do
+    case "$_kc_file" in
+    *.sh | *.yaml | *.yml) set -- "$@" "$_kc_file" ;;
+    esac
+  done <<EOF
+$(grep -rlE 'kind:[[:space:]]*["'"'"']?Kubernetes' "$_kc_root" 2>/dev/null)
+EOF
+  # No files is not no answer: with an empty argument list awk falls back to
+  # standard input and the sweep wedges on whatever the caller was reading.
+  [ "$#" -gt 0 ] || return 0
+  awk -v kindre="^$KIND_VALUE_RE" '
+    function endoc(f,   i) {
+      for (i in kinds) if (i in avs) { print f; break }
+      delete kinds; delete avs
+    }
+    FNR == 1 && NR > 1 { endoc(prev) }
+    {
+      prev = FILENAME
+      ind = $0; sub(/[^ \t].*$/, "", ind)
+      body = $0; sub(/^[ \t]*/, "", body)
+      # A sequence dash introduces an item whose remaining keys are indented
+      # past it, so the bucket takes the width of the dash and the whitespace
+      # after it. Its own width, not a fixed two: `-   apiVersion:` puts the
+      # siblings four columns in, and a fixed two would file the keys of one item
+      # in different buckets and report the creator as none at all -- silently.
+      # No apostrophe in this comment: the awk program is single-quoted, and one
+      # ends it. The break is loud -- the file stops parsing and nothing runs.
+      if (match(body, /^-[ \t]+/)) {
+        ind = ind sprintf("%*s", RLENGTH, "")
+        body = substr(body, RLENGTH + 1)
+      }
+    }
+    /^---/ { endoc(FILENAME); next }
+    body ~ /^apiVersion: apps\.cozystack\.io\// { avs[ind] = 1 }
+    body ~ kindre { kinds[ind] = 1 }
+    END { endoc(prev) }
+  ' "$@" | LC_ALL=C sort -u
+}
+
+@test "KIND_VALUE_RE decides every way this tree can name the kind on one line" {
+  # The axis list, decided once here rather than discovered one at a time.
+  # Accepted forms leave the document unchanged; refused ones
+  # need a YAML parser, which is a different tool than a line matcher.
+  for good in \
+    "kind: Kubernetes" \
+    "kind:  Kubernetes" \
+    "kind:	Kubernetes" \
+    "kind: \"Kubernetes\"" \
+    "kind: 'Kubernetes'" \
+    "kind: Kubernetes # a note" \
+    "kind: Kubernetes "; do
+    if ! printf '%s\n' "$good" | grep -qE "^$KIND_VALUE_RE"; then
+      echo "KIND_VALUE_RE rejected '$good', which names this kind" >&2
+      exit 1
+    fi
+  done
+  # Refused on purpose. A parser would take these; this guard reads lines, and
+  # the header says so beside the pattern.
+  for bad in \
+    "{kind: Kubernetes}" \
+    "{\"kind\":\"Kubernetes\"}" \
+    "kind: &anchor Kubernetes" \
+    "kind: !!str Kubernetes" \
+    "kind: KubernetesNodes" \
+    "kind: \"KubernetesNodes\"" \
+    "kind: Kubernetes extra"; do
+    if printf '%s\n' "$bad" | grep -qE "^$KIND_VALUE_RE"; then
+      echo "KIND_VALUE_RE accepted '$bad'" >&2
+      echo "either it names another kind, or reading it needs a parser" >&2
+      exit 1
+    fi
+  done
+}
+
+@test "one script under the e2e-chainsaw root creates the tenant Kubernetes CR" {
+  # Everything here reads TENANT_SCRIPT, which names one file. A second e2e
+  # script that began creating this kind would be governed by no rule in this
+  # file and nothing would red -- the guard would keep passing about a script
+  # nobody asked it to read. True today, and this is what keeps it true.
+  #
+  # The sweep is hack/e2e-chainsaw only, not the repository. Widening it would
+  # need an exclusion for hack/testdata/, whose fixtures carry the kind on
+  # purpose, and for docs/, where docs/oidc-tenant.md carries it inside a
+  # fenced example; neither creates a cluster. What the narrow root leaves
+  # outside is not only those: `hack/e2e-apps/` is a live lane of its own, and a
+  # creator appearing there would pass this case in silence -- nothing there
+  # creates this kind today, so it is a risk the root carries rather than a
+  # hole it has. That direction costs the most, which is why it is named here
+  # rather than discovered when a second cluster runs unguarded. The root is
+  # not a filter by itself either: what a creator can be
+  # written in is decided beside the sweep, so that prose acquiring a fenced
+  # manifest reds nothing here.
+  #
+  # The Proxmox fixture is the second entry and is deliberately not governed by
+  # the rules above: those read run-kubernetes.sh's shell, and this one is a
+  # declarative manifest a chainsaw `apply:` block applies. It creates a cluster
+  # all the same, which is why it is named here rather than excluded — a reader
+  # asking "what creates a tenant cluster in this tree" gets both answers. The
+  # suite that applies it ships `.disabled`, so nothing runs it in CI today.
+  found="$(_kind_creators "$REPO_ROOT/hack/e2e-chainsaw" \
+    | sed "s|^$REPO_ROOT/||" | tr '\n' ' ')"
+  want="hack/e2e-chainsaw/_lib/run-kubernetes.sh hack/e2e-chainsaw/kubernetes-proxmox/tenant.yaml "
+  if [ "$found" != "$want" ]; then
+    echo "scripts under hack/e2e-chainsaw creating a Kubernetes CR: [$found]" >&2
+    echo "Check first whether the new file APPLIES the kind or only asserts on" >&2
+    echo "it: this sweep pairs an apiVersion with a kind and cannot tell an" >&2
+    echo "\`apply:\` block from an \`assert:\` one, so a suite that merely" >&2
+    echo "asserts lands here too and needs excluding rather than governing." >&2
+    echo "want [$want]. Another one means this guard reads a subject that is no" >&2
+    echo "longer the only one, so point it at each of them or widen the rule." >&2
+    exit 1
+  fi
+}
+
+@test "the fixtures still carry the trailing spaces the end anchors depend on" {
+  # Both anchors are pinned by a line ending in a space, which is invisible and
+  # which an editor or a formatter removes without asking. Losing it would not
+  # red anything -- it would quietly unpin the anchors -- so it is checked here.
+  #
+  # Those lines carry two properties each: they are what the matcher must find,
+  # and they end in the space that measures the end anchor. Appending anything
+  # to one of them -- a note, a fixture mark -- takes the space's place and
+  # removes the second property while the first still reads as intact, which is
+  # why the marks near them sit on neighbouring lines.
+  for f in "$REPO_ROOT/hack/testdata/install-wait/creators/trailing-space.yaml" \
+           "$REPO_ROOT/hack/testdata/install-wait/creators/near-misses.yaml" \
+           "$REPO_ROOT/hack/testdata/install-wait/call-shapes.sh"; do
+    if ! grep -qE 'kind: [A-Za-z]+ $' "$f"; then
+      echo "$f no longer has a \`kind:\` line ending in a space." >&2
+      echo "That space is what makes the end anchors measurable; restore it or" >&2
+      echo "the two cases that depend on it pass without checking anything." >&2
+      exit 1
+    fi
+  done
+  # The same hazard on a different property: a heredoc terminator carrying a
+  # trailing space is not a terminator to the shell, and that is the whole
+  # subject of the fixture below. Stripped, the fixture stops testing the
+  # thing it is named for and still passes.
+  hd="$REPO_ROOT/hack/testdata/install-wait/heredoc-terminators.sh"
+  if ! grep -qE '^[A-Z_]+ $' "$hd"; then
+    echo "$hd no longer has a terminator line ending in a space." >&2
+    echo "That space is why the shell reads that line as heredoc content" >&2
+    echo "rather than as the end of the body; without it the case below" >&2
+    echo "measures nothing." >&2
+    exit 1
+  fi
+}
+
+@test "the creator sweep emits the last document of the last file" {
+  # The scan holds a document open until a separator or the end of the input,
+  # and the END flush is what emits the final one. On the other roots the last
+  # file readdir returns happens not to be a creator, so dropping that flush
+  # changes nothing there -- and readdir order differs between greps and file
+  # systems, which makes that coverage an accident rather than a pin. This root
+  # holds exactly one file and it is a creator.
+  found="$(_kind_creators "$REPO_ROOT/hack/testdata/install-wait/creators-single" \
+    | sed "s|^$REPO_ROOT/||" | tr '\n' ' ')"
+  want="hack/testdata/install-wait/creators-single/only.yaml "
+  if [ "$found" != "$want" ]; then
+    echo "sweep over a single-creator root = [$found], want [$want]" >&2
+    echo "the last document of the last file was not emitted" >&2
+    exit 1
+  fi
+}
+
+@test "the creator sweep pairs across sequence items, loudly and on purpose" {
+  # The cost written above `_kind_creators`, measured rather than asserted: two
+  # items at one indent share a bucket, so an apiVersion from one pairs with a
+  # kind from the other and the file is reported. Nothing under the sweep root
+  # is written this way today.
+  #
+  # The cure is what keeps it uncured. Resetting the bucket when the indent
+  # drops separates the items, and that reset -- wrong once -- separates the
+  # apiVersion from the kind of ONE object, and a real creator goes missing
+  # with nothing to say so. This fault names a file; that one names nothing.
+  found="$(_kind_creators "$REPO_ROOT/hack/testdata/install-wait/creators-cross-pair" \
+    | sed "s|^$REPO_ROOT/||" | tr '\n' ' ')"
+  want="hack/testdata/install-wait/creators-cross-pair/list.yaml "
+  if [ "$found" != "$want" ]; then
+    echo "sweep over the cross-pairing fixture = [$found], want [$want]" >&2
+    echo "If this now answers nothing, the pairing was narrowed: check that" >&2
+    echo "the narrowing cannot also separate the two keys of a single object," >&2
+    echo "because that failure is silent and this one is not." >&2
+    exit 1
+  fi
+}
+
+@test "the creator sweep reads scripts and manifests, not prose or parked suites" {
+  # Neither a manifest quoted in prose nor one in a parked `.disabled` file
+  # creates a cluster. No file under the sweep root carries either shape today,
+  # so the fixtures here are what makes the rule measurable at all -- they put
+  # the kind in both, which is the difference between a rule that is checked
+  # and one that is only stated.
+  #
+  # Both YAML suffixes are here, and they are the half that must be FOUND. A
+  # suffix the list forgets is a creator walked past in silence, while a file
+  # type taken by mistake costs a red somebody reads.
+  found="$(_kind_creators "$REPO_ROOT/hack/testdata/install-wait/creators-filetypes" \
+    | sed "s|^$REPO_ROOT/||" | tr '\n' ' ')"
+  want="hack/testdata/install-wait/creators-filetypes/real.yaml hack/testdata/install-wait/creators-filetypes/real.yml "
+  if [ "$found" != "$want" ]; then
+    echo "sweep over the file-type fixtures = [$found], want [$want]" >&2
+    echo "both manifests must be found and the fenced example and the parked" >&2
+    echo "suite must not. A missing manifest is the worse direction: the" >&2
+    echo "uniqueness case then reports one creator while two clusters run." >&2
+    exit 1
+  fi
+}
+
+@test "the creator sweep reads a file whose path carries a space" {
+  # The path rather than the content: a file list expanded unquoted is re-split
+  # on the space, the sweep answers nothing, and the uniqueness case reds with
+  # a diagnosis about a missing creator -- true about a subject that is not the
+  # one at fault. Checkout paths are the caller's, not this repository's.
+  tmp="$(mktemp -d)"
+  d="$tmp/sweep root"
+  mkdir -p "$d"
+  printf 'apiVersion: apps.cozystack.io/v1alpha1\nkind: Kubernetes\n' >"$d/creator.yaml"
+  found="$(_kind_creators "$d")"
+  if [ "$found" != "$d/creator.yaml" ]; then
+    echo "sweep of a root whose path carries a space = [$found]," >&2
+    echo "want [$d/creator.yaml]" >&2
+    rm -rf "$tmp"
+    exit 1
+  fi
+  rm -rf "$tmp"
+}
+
+@test "the creator sweep answers on an empty sweep rather than reading stdin" {
+  # With no files in its argument list awk falls back to standard input, so the
+  # sweep wedges on a terminal instead of failing -- in the one case it should
+  # be shouting loudest, its root gone. Checked by what is left of stdin, not
+  # by waiting for a hang, so this case cannot itself hang.
+  rest="$(printf 'a\nb\n' | { _kind_creators "$REPO_ROOT/no-such-sweep-root" >/dev/null; cat; })"
+  if [ "$rest" != "a
+b" ]; then
+    echo "the creator sweep consumed its standard input on an empty sweep;" >&2
+    echo "with no files to read awk reads stdin, and a run whose sweep root" >&2
+    echo "moved hangs instead of reporting that it moved" >&2
+    exit 1
+  fi
+}
+
+@test "the creator sweep sees a CR in any valid layout and refuses shapes that only name the kind" {
+  # The sweep's own teeth. Its subject today writes the CR at column 0, so
+  # nothing in the tree would notice the indent tolerance going away -- this
+  # fixture is what notices.
+  found="$(_kind_creators "$REPO_ROOT/hack/testdata/install-wait/creators" \
+    | sed "s|^$REPO_ROOT/||" | tr '\n' ' ')"
+  want="hack/testdata/install-wait/creators/indented-apply.yaml hack/testdata/install-wait/creators/kind-first.yaml hack/testdata/install-wait/creators/quoted-kind.yaml hack/testdata/install-wait/creators/sequence-item.yaml hack/testdata/install-wait/creators/trailing-space.yaml hack/testdata/install-wait/creators/wide-dash.yaml "
+  if [ "$found" != "$want" ]; then
+    echo "creator sweep over the fixtures = [$found], want [$want]" >&2
+    echo "the indented apply.resource shape must be found, and the selector" >&2
+    echo "entry and the application.kind label must not be" >&2
+    exit 1
+  fi
+}
+
+@test "a terminator the shell would not accept does not end a heredoc here" {
+  # `<<WORD` ends only on a line that is WORD alone at column 0; `<<-WORD`
+  # strips tabs and nothing else, in all four forms /bin/sh accepts.
+  # Every wait in this fixture sits in a heredoc body behind one of those
+  # near-terminators, so none of them runs -- and a matcher that ends the
+  # heredoc early answers with a line of YAML data instead of reporting that
+  # the script has no wait.
+  # An assertion that nothing was found is satisfied by a matcher that finds
+  # nothing anywhere, so the control comes first: the same matcher, on a file
+  # of the same shape whose wait is a command, has to answer.
+  _ctl_dir="$(mktemp -d)"
+  printf '%s\n' "f() {" \
+    '  kubectl wait hr -n tenant-test "kubernetes-${test_name}" --timeout=5m --for=condition=ready' \
+    "}" >"$_ctl_dir/live.sh"
+  TENANT_SCRIPT="$_ctl_dir/live.sh"
+  if [ -z "$(_ready_wait_line)" ]; then
+    echo "the control answered nothing: _ready_wait_line finds no wait even" >&2
+    echo "where one runs, so the emptiness asserted below says nothing about" >&2
+    echo "the fixture." >&2
+    rm -rf "$_ctl_dir"
+    exit 1
+  fi
+  rm -rf "$_ctl_dir"
+  TENANT_SCRIPT="$REPO_ROOT/hack/testdata/install-wait/heredoc-terminators.sh"
+  got="$(_ready_wait_line)"
+  if [ -n "$got" ]; then
+    echo "_ready_wait_line on the false-terminator fixture = '$got'," >&2
+    echo "want nothing: every wait there is heredoc data. A terminator was" >&2
+    echo "accepted that the shell would not accept -- space-indented, trailing" >&2
+    echo "space, or space-indented under <<- which strips tabs only." >&2
+    exit 1
+  fi
+}
+
+@test "the three kind matchers diverge only where they are meant to" {
+  # They answer different questions, so they answer differently: the CR matcher
+  # pins the one heredoc this repository writes, the counter has to see a second
+  # cluster in any spelling, and the sweep hunts creators in files nobody here
+  # wrote. Left as prose this becomes a fourth copy of the rules and drifts from
+  # them; derived here, a matcher that changes reds this case and the author
+  # decides whether the new divergence was intended.
+  #
+  # Columns: _cr_apply_lines / _cr_count / _kind_creators / _ready_wait_line.
+  # `-` is no answer.
+  #
+  # The rule the rows follow from: any form in which YAML can write the same
+  # object must be seen by the counter and by the sweep, because a cluster does
+  # not stop being one when it is written differently. Divergence between
+  # matchers is allowed only where they ask different questions -- as with a
+  # heredoc, which is a CR to the matcher that reads what `kubectl apply`
+  # receives and is not a command to the matcher that reads what runs.
+  #
+  # Each row records what was observed AND why that answer is right, because a
+  # recorded value on its own reads as "checked" when it only means "observed":
+  # a wrong answer pinned as an expectation is indistinguishable from a right
+  # one until someone states the reason beside it.
+  #
+  # bare-adjacent / quoted: the CR matcher answers the kind's line, since that
+  # is what it reports; the count is 1 and the sweep finds it -- one cluster,
+  # named three ways.
+  # kind-first / field-between: the CR matcher declines, because it pins the one
+  # heredoc shape this repository writes and that shape is adjacent; the count
+  # and the sweep must still see a cluster, because a cluster is what it is.
+  # indented-pair / sequence-item: same reasoning, and the count is 1 because a
+  # second cluster written either way is still a second cluster.
+  #
+  # The `in-heredoc` row is the one that must NOT agree, and it is here so that
+  # nobody harmonises it away: the CR matcher reads inside a heredoc because
+  # that heredoc is piped to `kubectl apply` and its body IS the CR, while the
+  # wait matcher must not, because nothing there executes. Same syntax,
+  # opposite requirements, recorded as an expectation rather than left looking
+  # like an inconsistency between two neighbouring functions.
+  d="$(mktemp -d)"
+  for probe in \
+    "bare-adjacent|apiVersion: apps.cozystack.io/v1alpha1;kind: Kubernetes|2|1|found|-" \
+    "kind-first|kind: Kubernetes;apiVersion: apps.cozystack.io/v1alpha1|-|1|found|-" \
+    "field-between|apiVersion: apps.cozystack.io/v1alpha1;metadata: {};kind: Kubernetes|-|1|found|-" \
+    "quoted|apiVersion: apps.cozystack.io/v1alpha1;kind: \"Kubernetes\"|2|1|found|-" \
+    "indented-pair|  apiVersion: apps.cozystack.io/v1alpha1;  kind: Kubernetes|-|1|found|-" \
+    "sequence-item|items:;- apiVersion: apps.cozystack.io/v1alpha1;  kind: Kubernetes|-|1|found|-" \
+    "in-heredoc|cat <<EOF;apiVersion: apps.cozystack.io/v1alpha1;kind: Kubernetes;  kubectl wait hr -n tenant-test \"kubernetes-\${test_name}\" --timeout=5m --for=condition=ready;EOF|3|1|found|-"; do
+    name="${probe%%|*}"; rest="${probe#*|}"
+    body="${rest%%|*}"; rest="${rest#*|}"
+    want_cr="${rest%%|*}"; rest="${rest#*|}"
+    want_n="${rest%%|*}"; rest="${rest#*|}"
+    want_sweep="${rest%%|*}"; want_wait="${rest#*|}"
+    mkdir -p "$d/$name"
+    printf '%s\n' "$body" | tr ';' '\n' > "$d/$name/x.yaml"
+    TENANT_SCRIPT="$d/$name/x.yaml"
+    got_cr="$(_cr_apply_lines | tr '\n' ' ')"; got_cr="${got_cr% }"
+    [ -n "$got_cr" ] || got_cr="-"
+    got_n="$(_cr_count)"
+    if [ -n "$(_kind_creators "$d/$name")" ]; then got_sweep="found"; else got_sweep="-"; fi
+    got_wait="$(_ready_wait_line)"; [ -n "$got_wait" ] || got_wait="-"
+    if [ "$got_cr" != "$want_cr" ] || [ "$got_n" != "$want_n" ] \
+       || [ "$got_sweep" != "$want_sweep" ] || [ "$got_wait" != "$want_wait" ]; then
+      echo "$name: cr=$got_cr count=$got_n sweep=$got_sweep wait=$got_wait" >&2
+      echo "want:  cr=$want_cr count=$want_n sweep=$want_sweep wait=$want_wait" >&2
+      echo "a matcher changed how it answers this shape. The three are allowed" >&2
+      echo "to differ -- they answer different questions -- but each difference" >&2
+      echo "is deliberate and this row is the record of it." >&2
+      rm -rf "$d"
+      exit 1
+    fi
+  done
+  rm -rf "$d"
+}
+
+@test "a kind line on the first line is not a CR without an apiVersion" {
+  # awk starts `av` at 0, so on line 1 the adjacency test compares 0 with 0.
+  # Pointed at a fixture whose first line names the kind and which carries no
+  # apiVersion at all: without the `av > 0` guard this answers 1.
+  # Control first, for the same reason: a matcher that answers nothing
+  # everywhere would satisfy the emptiness below without reading anything.
+  TENANT_SCRIPT="$REPO_ROOT/hack/testdata/install-wait/call-shapes.sh"
+  if [ -z "$(_cr_apply_lines)" ]; then
+    echo "the control answered nothing: _cr_apply_lines finds no CR even in" >&2
+    echo "the fixture that carries one, so the emptiness below is about the" >&2
+    echo "matcher rather than about the file." >&2
+    exit 1
+  fi
+  TENANT_SCRIPT="$REPO_ROOT/hack/testdata/install-wait/creators/first-line-kind.yaml"
+  got="$(_cr_apply_lines | tr '\n' ' ')"
+  if [ -n "$got" ]; then
+    echo "_cr_apply_lines on a file with no apiVersion = [$got], want nothing" >&2
+    echo "a kind line on line 1 satisfied the adjacency test against av = 0" >&2
+    exit 1
+  fi
+}
+
+@test "counting the CRs of a subject that has none answers zero rather than failing" {
+  # The zero path of the count. Pointed at the ordering fixture, which carries a
+  # wait and no CR at all: what makes the answer a number rather than a failure
+  # is _cr_count's `print n + 0`, since awk prints 0 for no matches and exits 0.
+  TENANT_SCRIPT="$REPO_ROOT/hack/testdata/install-wait/order-violation.sh"
+  n="$(_cr_count)"
+  if [ "$n" != "0" ]; then
+    echo "_cr_count on a subject with no CR = '$n', want 0" >&2
+    exit 1
+  fi
+}
+
+@test "the script creates exactly one tenant Kubernetes cluster" {
+  # The ordering rule pairs one CR with one wait. A second CR in the same
+  # script would be checked by nothing: the matchers take the first of each,
+  # so the existing wait would keep the guard green while the second cluster
+  # ran to its assertions unbounded. Refusing here is the honest answer --
+  # extending the rule to many clusters is a different rule, and this makes
+  # someone write it rather than inherit a guard that covers half.
+  n="$(_cr_count)"
+  if [ "$n" != "1" ]; then
+    echo "$n tenant Kubernetes CRs applied in $TENANT_SCRIPT; this rule pairs" >&2
+    echo "one CR with one readiness wait and cannot say anything about the" >&2
+    echo "others. Extend it to match waits to CRs before adding another." >&2
+    exit 1
+  fi
+}
+
+@test "the script creates a tenant Kubernetes cluster" {
+  # Not a claim about how many: only that the subject this file reasons about
+  # is still there. Zero means the creation moved or changed shape, and every
+  # rule below would then pass by having nothing to check.
+  cr="$(_cr_apply_line)"
+  if [ -z "$cr" ]; then
+    echo "no tenant Kubernetes CR application found in $TENANT_SCRIPT;" >&2
+    echo "either it moved, or this guard's match is stale -- refusing to" >&2
+    echo "report on a script it could not read" >&2
+    exit 1
+  fi
+  echo "tenant CR applied at line $cr" >&2
+}
+
+@test "the tenant release is waited for Ready, with a budget this guard can read" {
+  cr="$(_cr_apply_line)"
+  [ -n "$cr" ] || { echo "no tenant CR found; see the case above" >&2; exit 1; }
+  ln="$(_ready_wait_line)"
+  if [ -z "$ln" ]; then
+    echo "no readiness wait on the parent tenant HelmRelease after the CR is applied." >&2
+    echo "A release whose install action is still running cannot be uninstalled," >&2
+    echo "so whatever is left of the install is charged to teardown and the run" >&2
+    echo "reds on a step that asserts nothing. Add a" >&2
+    echo "\`kubectl wait hr ... --for=condition=ready --timeout=<budget>\` on the" >&2
+    echo "parent release before the assertions." >&2
+    echo "If such a wait is already there, every way this match can reject a" >&2
+    echo "line ends here, so check all of them rather than the first that comes" >&2
+    echo "to mind:" >&2
+    echo "  - the command spelled \`kubectl wait hr\`, or \`kubectl_wait_retry hr\`" >&2
+    echo "    through the wrapper the subject defines: not helmrelease, not" >&2
+    echo "    hr/<name>, not mentioned inside another command or a comment, and" >&2
+    echo "    the resource directly after \`wait\` -- a flag written ahead of it," >&2
+    echo "    as in \`kubectl wait --timeout=5m hr ...\`, is invisible here" >&2
+    echo "  - the call in command position and bare: no \`if\`, negated or not," >&2
+    echo "    since a handler this rule cannot read may log and fall through." >&2
+    echo "    If you are here because you wrapped the wait to add diagnostics," >&2
+    echo "    only the inline handler is refused: a Chainsaw \`catch:\` block" >&2
+    echo "    attaches them without touching this line, which is what the" >&2
+    echo "    conventions prescribe. To keep them inline, widen this rule to" >&2
+    echo "    read the branch's own exit rather than reading the red as a ban" >&2
+    echo '  - the release written as `kubernetes-${test_name}"`, closing quote and' >&2
+    echo "    variable name included, which is what stops the child releases" >&2
+    echo "    whose names extend the parent's from satisfying the rule. The" >&2
+    echo "    name has to stand on the line as text: hoisted into a variable" >&2
+    echo "    and waited on through it, there is nothing here to match and" >&2
+    echo "    the wait reads as absent" >&2
+    echo "  - the wait placed after the CR is applied: one before it waits on a" >&2
+    echo "    release that does not exist yet and is not counted. A wait moved" >&2
+    echo "    into a helper whose DEFINITION sits above the CR falls here too," >&2
+    echo "    though it runs wherever that helper is called: position in the" >&2
+    echo "    file is all this reads, and it is dropped rather than refused" >&2
+    echo "  - the namespace \`tenant-test\`, in a spelling TENANT_NAMESPACE_RE" >&2
+    echo "    accepts: a release is identified by namespace and name both, and a" >&2
+    echo "    namespace passed through a variable cannot be read from the text" >&2
+    echo "  - a \`--for\` naming Ready as true, in a spelling READY_CONDITION_RE" >&2
+    echo "    accepts" >&2
+    echo "  - no \`|\` and no \`&\` in the command, \`||\` and \`&&\` included: a" >&2
+    echo "    wait whose failure goes nowhere is not a wait. A \`2>&1\` added" >&2
+    echo "    for diagnostics carries an \`&\` and is refused with them --" >&2
+    echo "    a false red, and the redirection is the cause rather than a" >&2
+    echo "    discarded failure: move it off this line." >&2
+    echo "  - no \`;\` in the command at all: every use of one here puts the" >&2
+    echo "    wait in a list or a condition whose status is somebody else's" >&2
+    echo "  A trailing comment is cut before every check but the first, so" >&2
+    echo "  nothing inside one is ever the cause of any of them." >&2
+    exit 1
+  fi
+  budget="$(_ready_wait_budget "$ln")"
+  if [ -z "$budget" ]; then
+    echo "the readiness wait is at line $ln but this guard cannot see a --timeout on it." >&2
+    echo "The wait is there; what is missing is a budget this guard can read." >&2
+    echo "Either the command carries no --timeout at all, or it carries one in a" >&2
+    echo "spelling this cannot read: the value may be bare or double-quoted, and" >&2
+    echo "single quotes are not among the forms it takes." >&2
+    exit 1
+  fi
+  if ! _usable_budget "$budget"; then
+    echo "the readiness wait at line $ln carries '$budget', which is not a duration" >&2
+    echo "this guard can read as non-zero. The readable set is narrower than the" >&2
+    echo "one kubectl accepts -- '500ms' and '1.5h' are refused here by choice --" >&2
+    echo "so check it against _usable_budget rather than against kubectl." >&2
+    echo "A zero timeout is not a wait either." >&2
+    exit 1
+  fi
+  echo "readiness wait at line $ln, budget $budget" >&2
+}
+
+@test "the assertion helpers this rule can name run after the readiness wait" {
+  ln="$(_ready_wait_line)"
+  [ -n "$ln" ] || { echo "no readiness wait; see the case above" >&2; exit 1; }
+  calls="$(_assert_call_lines)"
+  if [ -z "$calls" ]; then
+    echo "no tenant-cluster assertion call sites found; either they moved or" >&2
+    echo "this guard's match is stale" >&2
+    exit 1
+  fi
+  v="$(_ordering_violation "$ln")"
+  if [ "$v" != "ok" ]; then
+    _ordering_message "$v" "$ln" >&2
+    exit 1
+  fi
+}
+
+@test "_ordering_violation refuses to place a call in another function body" {
+  # Not a violation of the ordering rule but a shape it cannot decide; the two
+  # must not be reported as the same thing.
+  TENANT_SCRIPT="$REPO_ROOT/hack/testdata/install-wait/call-shapes.sh"
+  open="$(_fixture_line body-open)"
+  close="$(_fixture_line body-close)"
+  outside=""
+  for c in $(_fixture_lines call); do
+    if [ "$c" -lt "$open" ] || [ "$c" -gt "$close" ]; then
+      outside="${outside}${outside:+ }$c"
+    fi
+  done
+  got="$(_ordering_violation "$((open + 1))")"
+  if [ "$got" != "outside $outside" ]; then
+    echo "_ordering_violation $((open + 1)) = '$got', want 'outside $outside'" >&2
+    echo "those calls sit outside the body holding the wait, so source position" >&2
+    echo "cannot place them" >&2
+    exit 1
+  fi
+  # This probe, not the one above, is what exercises the precedence. The wait
+  # in the fixture stands before every in-body call, so the first probe has no
+  # placeable call to weigh against the unplaceable ones and any rule answering
+  # `outside` would satisfy it. Moving the wait to the last in-body call makes
+  # both sets non-empty, and only then is `outside` a choice rather than the
+  # single available answer. Collapsing this case to one probe turns it from a
+  # test of precedence into a test of detection.
+  last=""
+  for c in $(_fixture_lines call); do
+    if [ "$c" -gt "$open" ] && [ "$c" -lt "$close" ]; then last="$c"; fi
+  done
+  got="$(_ordering_violation "$last")"
+  if [ "$got" != "outside $outside" ]; then
+    echo "_ordering_violation $last = '$got', want 'outside $outside'" >&2
+    exit 1
+  fi
+  # A line at file scope has no body to order within, so the answer is a
+  # refusal rather than a verdict about any call site.
+  got="$(_ordering_violation "$(_fixture_line file-scope)")"
+  if [ "$got" != "unscoped" ]; then
+    echo "_ordering_violation at file scope = '$got', want 'unscoped'" >&2
+    exit 1
+  fi
+}
+
+@test "_ordering_violation reports a call that runs before the wait" {
+  # The verdict that names the violation this guard exists to catch. It needs
+  # its own fixture, for the reason that fixture's header gives.
+  TENANT_SCRIPT="$REPO_ROOT/hack/testdata/install-wait/order-violation.sh"
+  # The equal case the `-le` carries: a call whose line number is the one handed
+  # in as the wait's. Source position cannot say which of the two ran first, so
+  # it reds rather than passing.
+  early="$(_fixture_line early-call)"
+  got="$(_ordering_violation "$(_fixture_line wait)")"
+  if [ "$got" != "before $early" ]; then
+    echo "_ordering_violation at the wait = '$got', want 'before $early': a call on the" >&2
+    echo "line handed in as the wait's is ambiguous and must red, not pass" >&2
+    exit 1
+  fi
+  got="$(_ordering_violation "$early")"
+  if [ "$got" != "before $early" ]; then
+    echo "_ordering_violation at the early call = '$got'," >&2
+    echo "want 'before $early': that line calls an assertion ahead of the wait," >&2
+    echo "and line 11 calls one after it, which is not a violation" >&2
+    exit 1
+  fi
+}
+
+@test "_ordering_violation says ok rather than nothing when the order holds" {
+  # Against the real script, where the order does hold. The point is the word:
+  # silence is what the matcher produces when it could not answer, so success
+  # has to be something a reader and the rule can both name.
+  ln="$(_ready_wait_line)"
+  [ -n "$ln" ] || { echo "no readiness wait; see the case above" >&2; exit 1; }
+  got="$(_ordering_violation "$ln")"
+  if [ "$got" != "ok" ]; then
+    echo "_ordering_violation $ln = '$got', want 'ok'" >&2
+    exit 1
+  fi
+}
+
+@test "_ordering_message answers every verdict, including ones it cannot read" {
+  # The branch for a wait at file scope is unreachable from the live script,
+  # so this is the only thing that exercises it -- and the empty and unknown
+  # verdicts are the two that must not come out as silence.
+  # Each verdict is checked against a phrase only its own arm produces, not
+  # merely against non-emptiness: an arm deleted from the case falls through
+  # to the closing one, which still prints something and still names the line.
+  # Non-emptiness calls that a pass, and a real violation is then reported as
+  # an unreadable verdict instead of as the violation.
+  for probe in \
+    "unscoped|no function body was found around" \
+    "outside 42|sit outside the function" \
+    "before 42|run at or before the" \
+    "|no ordering verdict was produced" \
+    "something nobody wrote|unrecognised ordering verdict"; do
+    verdict="${probe%%|*}"
+    phrase="${probe#*|}"
+    got="$(_ordering_message "$verdict" 99)"
+    case "$got" in
+    *"$phrase"*) : ;;
+    *)
+      echo "_ordering_message '$verdict' did not say '$phrase'" >&2
+      echo "it said: $got" >&2
+      exit 1
+      ;;
+    esac
+    case "$got" in
+    *99*) : ;;
+    *) echo "_ordering_message '$verdict' did not name the line" >&2; exit 1 ;;
+    esac
+  done
+}
+
+@test "_wait_nesting tells a wait that always runs from one a branch decides" {
+  TENANT_SCRIPT="$REPO_ROOT/hack/testdata/install-wait/wait-nesting.sh"
+  # The line is found from the function name rather than written down, so
+  # editing the fixture cannot silently move a probe onto another wait.
+  for row in \
+    "cozy_wait_at_top top" \
+    "cozy_wait_in_branch nested" \
+    "cozy_wait_in_loop nested" \
+    "cozy_wait_in_case nested" \
+    "cozy_wait_in_until nested" \
+    "cozy_wait_in_subshell absent" \
+    "cozy_wait_twice ambiguous" \
+    "cozy_wait_tail unextractable" \
+    "cozy_wait_broken unparsed"; do
+    fn="${row% *}"
+    want="${row#* }"
+    ln="$(awk -v fn="$fn" '
+      $0 ~ "^" fn "\\(\\) \\{" { inside = 1; next }
+      inside && /kubectl wait hr/ { print NR; exit }
+    ' "$TENANT_SCRIPT")"
+    if [ -z "$ln" ]; then
+      echo "no wait found in $fn: the fixture moved out from under this case" >&2
+      exit 1
+    fi
+    got="$(_wait_nesting "$ln")"
+    if [ "$got" != "$want" ]; then
+      echo "_wait_nesting in $fn (line $ln) = '$got', want '$want'" >&2
+      exit 1
+    fi
+  done
+  # A wait at file scope has no body to be nested in, and the ordering rule
+  # reports that same verdict about the same line.
+  got="$(_wait_nesting 1)"
+  if [ "$got" != unscoped ]; then
+    echo "_wait_nesting at file scope = '$got', want 'unscoped'" >&2
+    exit 1
+  fi
+}
+
+@test "_wait_nesting refuses rather than sources what is not a definition" {
+  TENANT_SCRIPT="$REPO_ROOT/hack/testdata/install-wait/wait-nesting.sh"
+  # Stubbed in a subshell: this refusal guards what reaches `source`, and the
+  # range helper cannot produce a range whose first line opens no definition.
+  # Without the stub it would be a branch nothing reaches, and a branch nothing
+  # reaches is one whose deletion nothing catches. The other refusal -- a body
+  # closing `}; cmd` -- the helper does produce, so the case below reaches it
+  # through the fixture rather than through a stub.
+  (
+    _enclosing_def_range() { echo "1 4"; }
+    got="$(_wait_nesting 2)"
+    if [ "$got" != unextractable ]; then
+      echo "_wait_nesting on a range that is not a definition = '$got'," >&2
+      echo "want 'unextractable'" >&2
+      exit 1
+    fi
+  )
+  # A body this could read, holding no wait on the release asked about.
+  (
+    _enclosing_def_range() { awk '/^cozy_wait_none\(\) \{/ { s = NR } s && /^\}/ { print s, NR; exit }' "$TENANT_SCRIPT"; }
+    got="$(_wait_nesting 2)"
+    if [ "$got" != absent ]; then
+      echo "_wait_nesting on a body without the wait = '$got', want 'absent'" >&2
+      exit 1
+    fi
+  )
+  # The reachable refusals that close early, both spellings of one shape: the
+  # definition closes on an indented brace and the column-0 one is left to a
+  # later line, so the range passes both boundary checks while carrying what
+  # stands between them. The second fixture puts a command on the brace line
+  # itself, which is the spelling a refusal keyed on the brace standing alone
+  # would let through.
+  # The control for the three cases below: each fixture is supposed to carry a
+  # command that runs when its range is sourced, and an empty witness proves
+  # the refusal only if the tail would otherwise write one. Sourced here
+  # deliberately, by the same extraction, so a fixture edited into a no-op reds
+  # instead of leaving the refusals vacuously green.
+  for fx in inner-brace inner-brace-command midline-close; do
+    ctl="$(mktemp)"
+    (
+      TENANT_SCRIPT="$REPO_ROOT/hack/testdata/install-wait/${fx}.sh"
+      ln="$(awk '/kubectl wait hr/ { print NR; exit }' "$TENANT_SCRIPT")"
+      range="$(_enclosing_def_range "$ln")"
+      dir="$(mktemp -d)"
+      sed -n "${range% *},${range#* }p" "$TENANT_SCRIPT" >"$dir/def.sh"
+      COZY_TAIL_WITNESS="$ctl" bash -c '. "$1"' _ "$dir/def.sh" >/dev/null 2>&1 || true
+      rm -rf "$dir"
+    )
+    if [ ! -s "$ctl" ]; then
+      echo "$fx carries no command that runs when its range is sourced, so" >&2
+      echo "the empty witness below proves nothing: the fixture, not the" >&2
+      echo "refusal, is what keeps it empty." >&2
+      rm -f "$ctl"
+      exit 1
+    fi
+    rm -f "$ctl"
+  done
+  for fx in inner-brace inner-brace-command midline-close; do
+    witness2="$(mktemp)"
+    (
+      TENANT_SCRIPT="$REPO_ROOT/hack/testdata/install-wait/${fx}.sh"
+      ln2="$(awk '/kubectl wait hr/ { print NR; exit }' "$TENANT_SCRIPT")"
+      COZY_TAIL_WITNESS="$witness2"
+      export COZY_TAIL_WITNESS
+      got2="$(_wait_nesting "$ln2")"
+      if [ "$got2" != unextractable ] || [ -s "$witness2" ]; then
+        echo "$fx answered '$got2'; the witness is" >&2
+        echo "$([ -s "$witness2" ] && echo written || echo empty). Want" >&2
+        echo "'unextractable' and an empty witness: the range ends on a bare" >&2
+        echo "brace that closes nothing, and what stands above it would run." >&2
+        exit 1
+      fi
+    ) || { rm -f "$witness2"; exit 1; }
+    rm -f "$witness2"
+  done
+  # The refusal that is reachable, and the only one whose cost is a side effect
+  # rather than a wrong answer. The verdict alone cannot show it: a tail that
+  # ran and then handed back a readable definition answers `top`, and one
+  # refused answers `unextractable`, so the witness is what separates them.
+  witness="$(mktemp)"
+  ln="$(awk '
+    /^cozy_wait_tail\(\) \{/ { inside = 1; next }
+    inside && /kubectl wait hr/ { print NR; exit }
+  ' "$TENANT_SCRIPT")"
+  if [ -z "$ln" ]; then
+    echo "no wait found in cozy_wait_tail: the fixture moved out from under" >&2
+    echo "this case" >&2
+    exit 1
+  fi
+  got="$(
+    COZY_TAIL_WITNESS="$witness"
+    export COZY_TAIL_WITNESS
+    _wait_nesting "$ln"
+  )"
+  if [ "$got" != unextractable ] || [ -s "$witness" ]; then
+    echo "a body closing \`}; cmd\` answered '$got' and left the witness" >&2
+    echo "$([ -s "$witness" ] && echo written || echo empty). Want" >&2
+    echo "'unextractable' and an empty witness: what stands after the brace" >&2
+    echo "runs at source time, and this helper's whole claim is that only a" >&2
+    echo "definition ever reaches \`source\`." >&2
+    rm -f "$witness"
+    exit 1
+  fi
+  rm -f "$witness"
+}
+
+@test "the readiness wait runs whenever the body holding it runs" {
+  ln="$(_ready_wait_line)"
+  if [ -z "$ln" ]; then
+    echo "no readiness wait; see the case above" >&2
+    exit 1
+  fi
+  got="$(_wait_nesting "$ln")"
+  # One text per verdict. A single message written for the nested case tells a
+  # reader whose wait is at top level that it is not, and leaves the cause --
+  # two waits, a body that would not parse -- named nowhere.
+  case "$got" in
+  top) ;;
+  nested)
+    echo "the readiness wait at line $ln sits inside a compound command." >&2
+    echo "How far down the body it sits does not matter, only what encloses" >&2
+    echo "it: a wait under an \`if\`, a loop or a \`case\` runs when that branch" >&2
+    echo "is taken, and whether it is taken is a runtime fact no rule over" >&2
+    echo "source text has. The ordering below would then be about a command" >&2
+    echo "that need not run at all." >&2
+    exit 1
+    ;;
+  ambiguous)
+    echo "more than one readiness wait on this release stands in the body at" >&2
+    echo "line $ln. The printed body carries no line numbers, so this cannot" >&2
+    echo "say which of them the rule above found, and answering about the" >&2
+    echo "wrong one is worse than refusing. Leave one wait on the parent" >&2
+    echo "release in that body." >&2
+    exit 1
+    ;;
+  absent)
+    echo "the wait at line $ln is not in the body this read back, though the" >&2
+    echo "rule above found it in the file. A wait inside a subshell reads" >&2
+    echo "this way -- the printer puts it on the line that opens the" >&2
+    echo "subshell, where no matcher looks for it -- and so does a" >&2
+    echo "disagreement between the two readings, which would be a defect" >&2
+    echo "here rather than in the script. Check for the subshell first." >&2
+    exit 1
+    ;;
+  unscoped)
+    echo "the readiness wait at line $ln is at file scope, with no body to" >&2
+    echo "be nested in. The ordering rule reports the same about the same" >&2
+    echo "line and says what to do about it." >&2
+    exit 1
+    ;;
+  *)
+    echo "the body holding the readiness wait at line $ln could not be read" >&2
+    echo "('$got'). That is a refusal to judge and not a pass: the placement" >&2
+    echo "this rule exists to establish was never established." >&2
+    echo "Look first for a closing brace standing as a command inside that" >&2
+    echo "body -- at the start of a line or after a \`;\` -- which a" >&2
+    echo "\`{ ...; }\` group written across lines does. Such a brace closes" >&2
+    echo "the definition as far as this reads, so the extraction refuses the" >&2
+    echo "range rather than sourcing what follows it. A heredoc carrying a" >&2
+    echo "\`}\` is a different failure with a different verdict: that one" >&2
+    echo "ends the body at column 0 and reports the wait as unscoped. A" >&2
+    echo "definition that does not parse on its own lands here too." >&2
+    exit 1
+    ;;
+  esac
+}
+
+@test "_errexit_before reads the body around the wait, above it and not below" {
+  TENANT_SCRIPT="$REPO_ROOT/hack/testdata/install-wait/wait-nesting.sh"
+  for row in \
+    "cozy_wait_errexit_off disabled" \
+    "cozy_wait_errexit_combined disabled" \
+    "cozy_wait_errexit_after enabled" \
+    "cozy_wait_at_top enabled"; do
+    fn="${row% *}"
+    want="${row#* }"
+    ln="$(awk -v fn="$fn" '
+      $0 ~ "^" fn "\\(\\) \\{" { inside = 1; next }
+      inside && /kubectl wait hr/ { print NR; exit }
+    ' "$TENANT_SCRIPT")"
+    if [ -z "$ln" ]; then
+      echo "no wait found in $fn: the fixture moved out from under this case" >&2
+      exit 1
+    fi
+    got="$(_errexit_before "$ln")"
+    if [ "$got" != "$want" ]; then
+      echo "_errexit_before in $fn (line $ln) = '$got', want '$want'" >&2
+      exit 1
+    fi
+  done
+}
+
+@test "the composition rule sees a one-line assertion definition close" {
+  TENANT_SCRIPT="$REPO_ROOT/hack/testdata/install-wait/one-line-def.sh"
+  # A definition written on one line opens nothing: the call below it is a call
+  # site, and a rule that opens a body there reports a script with no
+  # assertions at all -- which reads as "nothing asserts after the wait".
+  want="$(grep -n 'cozy_assert_tenant_reachable "' "$TENANT_SCRIPT" | cut -d: -f1)"
+  got="$(_assert_call_lines | tr '\n' ' ')"
+  if [ "$got" != "$want " ]; then
+    echo "_assert_call_lines on a one-line definition = [$got], want [$want ]" >&2
+    exit 1
+  fi
+}
+
+@test "_errexit_before takes the spellings that switch errexit off and no others" {
+  # The set is decided here, the way the other matchers in this file decide
+  # theirs, rather than left to whichever spelling a fixture happens to carry.
+  # `set -euo pipefail` is what this tree writes, so the combined forms are the
+  # ones an author reaches for, and a spelling missed here is a silent pass:
+  # the guard answers `enabled` over a body that switched errexit off.
+  d="$(mktemp -d)"
+  for row in \
+    "set +e|disabled" \
+    "set +ex|disabled" \
+    "set +eu|disabled" \
+    "set +euo pipefail|disabled" \
+    "set +xe|disabled" \
+    "set +o errexit|disabled" \
+    "set +u|enabled" \
+    "set +E|enabled" \
+    "set +o pipefail|enabled" \
+    "set -e|enabled"; do
+    line="${row%|*}"
+    want="${row#*|}"
+    printf '%s\n' "cozy_probe() {" "  $line" \
+      "  kubectl wait hr -n tenant-test \"kubernetes-\${test_name}\" --timeout=5m --for=condition=ready" \
+      "}" >"$d/probe.sh"
+    TENANT_SCRIPT="$d/probe.sh"
+    got="$(_errexit_before 3)"
+    if [ "$got" != "$want" ]; then
+      echo "_errexit_before over a body carrying \`$line\` = '$got'," >&2
+      echo "want '$want'. A spelling that switches errexit off and is not" >&2
+      echo "taken here passes silently, which is the direction this rule" >&2
+      echo "cannot afford." >&2
+      rm -rf "$d"
+      exit 1
+    fi
+  done
+  rm -rf "$d"
+}
+
+@test "errexit is not switched off above the readiness wait" {
+  ln="$(_ready_wait_line)"
+  if [ -z "$ln" ]; then
+    echo "no readiness wait; see the case above" >&2
+    exit 1
+  fi
+  got="$(_errexit_before "$ln")"
+  if [ "$got" != enabled ]; then
+    echo "errexit is '$got' where the readiness wait at line $ln runs. A wait" >&2
+    echo "whose failure is not fatal bounds nothing: the run carries on into" >&2
+    echo "the assertions with the install still going, and every other check" >&2
+    echo "here passes while it does. 'unreadable' means the body could not be" >&2
+    echo "read at all, and this case reds on that too: the nesting case above" >&2
+    echo "names the cause, and both refuse rather than pass on a body neither" >&2
+    echo "of them could establish anything about." >&2
+    exit 1
+  fi
+}
+
+@test "a wait written through the retry wrapper is placed and budgeted like any other" {
+  TENANT_SCRIPT="$REPO_ROOT/hack/testdata/install-wait/retry-wrapper.sh"
+  ln="$(_ready_wait_line)"
+  if [ -z "$ln" ]; then
+    echo "the retry wrapper form was not taken as a wait at all, so hardening" >&2
+    echo "the wait against a transient failure would read as removing it" >&2
+    exit 1
+  fi
+  v="$(_ordering_violation "$ln")"
+  if [ "$v" != ok ]; then
+    echo "_ordering_violation on the wrapper subject = '$v', want 'ok'" >&2
+    exit 1
+  fi
+  # Why an expiry is bounded by the number on the line is derived once, beside
+  # WAIT_COMMAND_RE. What the retry can multiply is the transient path, which
+  # ends the run non-zero anyway.
+  budget="$(_ready_wait_budget "$ln")"
+  if [ "$budget" != 5m ]; then
+    echo "_ready_wait_budget on the wrapper form = '$budget', want 5m" >&2
+    exit 1
+  fi
+}
+
+@test "a wrapper wait with no budget is refused, not exempted" {
+  TENANT_SCRIPT="$REPO_ROOT/hack/testdata/install-wait/retry-wrapper-unbounded.sh"
+  ln="$(_ready_wait_line)"
+  if [ -z "$ln" ]; then
+    echo "the unbounded wrapper wait was not found, so this case measures" >&2
+    echo "nothing about the budget" >&2
+    exit 1
+  fi
+  budget="$(_ready_wait_budget "$ln")"
+  if [ -n "$budget" ]; then
+    echo "_ready_wait_budget invented '$budget' for a wait carrying no" >&2
+    echo "--timeout; kubectl would fall back to its own default and the rule" >&2
+    echo "would report a bound nobody wrote" >&2
+    exit 1
+  fi
+}
+
+@test "_cut_comments cuts what a shell cuts and keeps what it keeps" {
+  # The claims in this helper's header, as cases rather than as prose. The last
+  # row is the one that matters most: an escaped quote does not close the
+  # double-quoted region, so the `||` after it survives the cut and the wait
+  # that carries it is refused for having no teeth.
+  for kept in \
+    'foo#bar' \
+    '"a # b"' \
+    "'a # b'" \
+    '"a\" # b" || true'; do
+    got="$(printf '%s\n' "$kept" | _cut_comments)"
+    if [ "$got" != "$kept" ]; then
+      echo "_cut_comments changed [$kept] into [$got]" >&2
+      exit 1
+    fi
+  done
+  got="$(printf '%s\n' 'cmd --flag # note' | _cut_comments)"
+  if [ "$got" != 'cmd --flag' ]; then
+    echo "_cut_comments left [$got], want [cmd --flag]" >&2
+    exit 1
+  fi
+}
+
+@test "a command still folding when the input ends is emitted, not dropped" {
+  # The flush at EOF, which nothing else reaches: every other subject ends its
+  # last command before the file ends. A file ending inside a continuation
+  # leaves that command in the buffer, and without the flush the wait it holds
+  # is never seen -- the guard then reports a script with no readiness wait,
+  # which is the loud direction but about the wrong cause.
+  TENANT_SCRIPT="$REPO_ROOT/hack/testdata/install-wait/eof-continuation.sh"
+  want="$(grep -n 'kubectl wait hr' "$TENANT_SCRIPT" | cut -d: -f1)"
+  got="$(_ready_wait_line)"
+  if [ "$got" != "$want" ]; then
+    echo "_ready_wait_line on a file ending mid-continuation = '$got'," >&2
+    echo "want $want. The command was still in the fold when the input ran" >&2
+    echo "out, so only the flush at the end of the scan can emit it." >&2
+    exit 1
+  fi
+}
+
+@test "the heredoc opener takes the spellings a shell takes, and their delimiters" {
+  # Derived from the shell\'s rule rather than from what this tree happens to
+  # write: the delimiter is the word after the operator with quote removal
+  # applied, and quoting may sit anywhere inside that word. Both directions are
+  # checked per spelling, because each fails differently -- a body read as
+  # commands reports a wait that never runs, and a delimiter read short
+  # swallows every command after the heredoc, which is the silent one.
+  #
+  # `<<<WORD` is a here-string and opens nothing; a delimiter carrying an
+  # expansion cannot be resolved by reading, so it is not taken as an opener
+  # and its body reads as commands -- a false red, loud, and written nowhere
+  # under this root.
+  d="$(mktemp -d)"
+  for spec in \
+    "EOF|EOF|hides" \
+    "-EOF|\tEOF|hides" \
+    " EOF|EOF|hides" \
+    "\"EOF\"|EOF|hides" \
+    "'EOF'|EOF|hides" \
+    "\\\\EOF|EOF|hides" \
+    "E\"O\"F|EOF|hides" \
+    "E\\\\OF|EOF|hides" \
+    "-\"EOF\"|\tEOF|hides" \
+    "<EOF|EOF|reads" \
+    "\$DELIM|EOF|reads"; do
+    opener="${spec%%|*}"; rest="${spec#*|}"
+    term="${rest%%|*}"; want="${rest#*|}"
+    wait_line='  kubectl wait hr -n tenant-test "kubernetes-${test_name}" --timeout=5m --for=condition=ready'
+    printf '%s\n' "f() {" "  cat <<$opener" "$wait_line" "$(printf '%b' "$term")" "}" >"$d/in.sh"
+    printf '%s\n' "f() {" "  cat <<$opener" "data" "$(printf '%b' "$term")" "$wait_line" "}" >"$d/after.sh"
+    TENANT_SCRIPT="$d/in.sh"
+    inside="$(_ready_wait_line)"
+    TENANT_SCRIPT="$d/after.sh"
+    following="$(_ready_wait_line)"
+    case "$want" in
+    hides)
+      if [ -n "$inside" ] || [ -z "$following" ]; then
+        echo "opener \`<<$opener\`: a wait in the body answered '$inside'" >&2
+        echo "(want nothing) and a wait after the terminator answered" >&2
+        echo "'$following' (want a line). The shell takes this spelling and" >&2
+        echo "resolves the delimiter to the quoted word; reading it short" >&2
+        echo "swallows everything after the heredoc without a sound." >&2
+        rm -rf "$d"
+        exit 1
+      fi
+      ;;
+    reads)
+      if [ -z "$inside" ]; then
+        echo "opener \`<<$opener\` hid the body, and the shell opens no" >&2
+        echo "heredoc on it -- a here-string, or a delimiter this cannot" >&2
+        echo "resolve. Hiding it is the silent direction." >&2
+        rm -rf "$d"
+        exit 1
+      fi
+      ;;
+    esac
+  done
+  rm -rf "$d"
+}
+
+@test "a backslash-quoted heredoc delimiter hides its body like a quoted one" {
+  # `<<\\EOF` quotes the delimiter the way `<<'EOF'` does, and an opener
+  # matcher that takes the quotes and not the backslash reads the body as
+  # commands. The wait inside this fixture is data, so the answer is nothing --
+  # and the failure that follows from getting it wrong is a wait reported on a
+  # script that runs none.
+  # An assertion that nothing was found is satisfied by a matcher that finds
+  # nothing anywhere, so the control comes first: the same matcher, on a file
+  # of the same shape whose wait is a command, has to answer.
+  _ctl_dir="$(mktemp -d)"
+  printf '%s\n' "f() {" \
+    '  kubectl wait hr -n tenant-test "kubernetes-${test_name}" --timeout=5m --for=condition=ready' \
+    "}" >"$_ctl_dir/live.sh"
+  TENANT_SCRIPT="$_ctl_dir/live.sh"
+  if [ -z "$(_ready_wait_line)" ]; then
+    echo "the control answered nothing: _ready_wait_line finds no wait even" >&2
+    echo "where one runs, so the emptiness asserted below says nothing about" >&2
+    echo "the fixture." >&2
+    rm -rf "$_ctl_dir"
+    exit 1
+  fi
+  rm -rf "$_ctl_dir"
+  TENANT_SCRIPT="$REPO_ROOT/hack/testdata/install-wait/heredoc-backslash.sh"
+  got="$(_ready_wait_line)"
+  if [ -n "$got" ]; then
+    echo "_ready_wait_line on the backslash-quoted fixture = '$got'," >&2
+    echo "want nothing: that wait is heredoc data. The opener matcher must" >&2
+    echo "take the backslash as a quote, or the body below it reads as" >&2
+    echo "commands." >&2
+    exit 1
+  fi
+}
+
+@test "a heredoc opener carrying a quoted hash still hides its body" {
+  # An assertion that nothing was found is satisfied by a matcher that finds
+  # nothing anywhere, so the control comes first: the same matcher, on a file
+  # of the same shape whose wait is a command, has to answer.
+  _ctl_dir="$(mktemp -d)"
+  printf '%s\n' "f() {" \
+    '  kubectl wait hr -n tenant-test "kubernetes-${test_name}" --timeout=5m --for=condition=ready' \
+    "}" >"$_ctl_dir/live.sh"
+  TENANT_SCRIPT="$_ctl_dir/live.sh"
+  if [ -z "$(_ready_wait_line)" ]; then
+    echo "the control answered nothing: _ready_wait_line finds no wait even" >&2
+    echo "where one runs, so the emptiness asserted below says nothing about" >&2
+    echo "the fixture." >&2
+    rm -rf "$_ctl_dir"
+    exit 1
+  fi
+  rm -rf "$_ctl_dir"
+  TENANT_SCRIPT="$REPO_ROOT/hack/testdata/install-wait/heredoc-hash-opener.sh"
+  # The fold decides where a heredoc starts, and it has to read the opener the
+  # way the shell does. Cut comments crudely and the ` #` inside quotes takes
+  # the `<<YAML` with it: the body then reads as commands and its planted line
+  # answers as the wait, which is a pass on a script that never waits.
+  ln="$(_ready_wait_line)"
+  if [ -n "$ln" ]; then
+    echo "_ready_wait_line answered line $ln on a subject whose only such line" >&2
+    echo "is heredoc data. The opener was lost, so the body was read as" >&2
+    echo "commands -- the failure the comment rule exists to prevent." >&2
+    exit 1
+  fi
+}
+
+@test "a heredoc named inside a comment does not swallow the wait below it" {
+  TENANT_SCRIPT="$REPO_ROOT/hack/testdata/install-wait/comment-names-heredoc.sh"
+  # The fold has to cut comments before it looks for a heredoc opener. Left in,
+  # the `<<PATCHDOC` inside a comment opens a heredoc that never ends, every
+  # line below it becomes data, and the wait disappears with them. This is the
+  # input that tells the cut apart from its absence: the fixture that names a
+  # heredoc in a comment elsewhere answers the same either way.
+  want="$(_fixture_line wait)"
+  got="$(_ready_wait_line)"
+  if [ "$got" != "$want" ]; then
+    echo "_ready_wait_line = '$got', want '$want': the wait sits below a" >&2
+    echo "comment that names a heredoc, and reading that comment as an opener" >&2
+    echo "turns the rest of the file into heredoc data" >&2
+    exit 1
+  fi
+}
+
+# Lines where an apostrophe sits inside a comment in an awk program, in $1.
+#
+# Every awk program in this tree lives inside a single-quoted shell string, so
+# one apostrophe in one of its comments ends the string: what follows is read as
+# shell, and the failure lands anywhere between a mangled program and a file
+# that will not parse. Which of the two depends on what happens to follow, so
+# the loud end of that range cannot be relied on.
+#
+# Comments rather than every line: the quote that ends a program is an
+# apostrophe too, so the two cannot be told apart by counting. Where it sits
+# can -- inside a comment it can only be prose. A program written entirely on
+# one line carries two quotes, which is why an opener is a line whose count is
+# odd.
+_awk_comment_apostrophes() {
+  awk '
+    { q = gsub(/\047/, "&") }
+    !inprog && /awk .*\047$/ && q % 2 == 1 { inprog = 1; next }
+    !inprog && /^[A-Z_]+=\047$/ { inprog = 1; next }
+    inprog && /^[[:space:]]*#/ { if (q > 0) { print FNR ": " $0 } next }
+    inprog && q > 0 { inprog = 0; next }
+  ' "$1"
+}
+
+@test "no comment inside an awk program here carries an apostrophe" {
+  # The rule is written beside two of those programs and gets typed through
+  # anyway, which is the point at which a rule in the author's head is replaced
+  # by a premise in the tool.
+  #
+  # The fixture is the positive control, and it is what makes this case a
+  # measurement rather than an assertion that nothing was found: the reader can
+  # see the check answer on a file that carries the fault. Without it, a
+  # matcher that silently answers nothing everywhere reads exactly like a clean
+  # tree.
+  planted="$(_awk_comment_apostrophes \
+    "$REPO_ROOT/hack/testdata/install-wait/awk-apostrophe.sh")"
+  case "$planted" in
+  *"heredoc's body"*) : ;;
+  *)
+    echo "the control fixture did not answer: [$planted]" >&2
+    echo "it carries an apostrophe inside an awk comment on purpose, so a" >&2
+    echo "matcher that finds nothing there finds nothing anywhere." >&2
+    exit 1
+    ;;
+  esac
+  guard="$REPO_ROOT/hack/run-kubernetes-install-wait_test.bats"
+  if [ ! -f "$guard" ]; then
+    echo "this rule reads its own file by name, and $guard is not there." >&2
+    exit 1
+  fi
+  bad="$(_awk_comment_apostrophes "$guard")"
+  if [ -n "$bad" ]; then
+    echo "a comment inside an awk program in this file carries an apostrophe:" >&2
+    printf '%s\n' "$bad" >&2
+    echo "That quote ends the shell string holding the program. Rewrite the" >&2
+    echo "comment without it." >&2
+    exit 1
+  fi
+}
+
+@test "this file turns xtrace on nowhere unconditionally" {
+  # The rule is the one the second check states, and it is wider than the
+  # restore: no bare `set -x` anywhere in this file. Any unconditional
+  # trace-on turns a later failure in its case into a hang, so a diagnostic
+  # `set -x` added in good faith reds here -- deliberately, and the message
+  # says so rather than blaming the restore.
+  #
+  # Read as text, the way every other rule here reads its subject. The
+  # behavioural form of this check -- run a case with an unconditional restore
+  # and watch it hang -- needs the bats binary, which the lane that runs this
+  # guard does not have, and a case that skips there passes there.
+  # `grep -c` exits 1 when it counts none, and under the runner CI uses a
+  # failing substitution stops the case at the assignment -- before the
+  # diagnosis below, which is the one thing this case exists to print. Both
+  # counts carry the same guard for that reason, and `|| true` rather than
+  # `|| echo 0`, which would add a second line to a count.
+  # Named rather than derived: under the runner CI uses, `$0` is the runner and
+  # `BATS_TEST_FILENAME` is unset, so a file cannot ask what it is called. The
+  # cost is a name that a rename leaves behind, and a grep over a missing file
+  # counts zero, which is the answer that passes -- so the name is checked
+  # first, and a rename reds here instead of quietly retiring the rule.
+  guard="$REPO_ROOT/hack/run-kubernetes-install-wait_test.bats"
+  if [ ! -f "$guard" ]; then
+    echo "this rule reads its own file by name, and $guard is not there." >&2
+    echo "Point it at the new name; it cannot derive one -- the runner that" >&2
+    echo "enforces this guard passes its own path as \$0." >&2
+    exit 1
+  fi
+  cond="$(grep -cE '^[[:space:]]*\[ "\$_ub_xtrace" = 0 \] \|\| set -x$' "$guard" || true)"
+  bare="$(grep -cE '^[[:space:]]*set -x$' "$guard" || true)"
+  if [ "$cond" != 1 ] || [ "$bare" != 0 ]; then
+    echo "xtrace restores in this file: conditional=$cond bare=$bare," >&2
+    echo "want conditional=1 bare=0. Restoring xtrace where the runner had it" >&2
+    echo "off makes bats trace its own failure output, and the case that" >&2
+    echo "follows reports as a hang instead of a red." >&2
+    exit 1
+  fi
+}
diff --git a/hack/run-kubernetes-join-timing_test.bats b/hack/run-kubernetes-join-timing_test.bats
new file mode 100644
index 0000000000..178dc34c08
--- /dev/null
+++ b/hack/run-kubernetes-join-timing_test.bats
@@ -0,0 +1,90 @@
+#!/usr/bin/env bats
+# Successful-node-join timing stays in the normal job log; these mocks keep its
+# resource/event rendering cluster-free under hack/cozytest.sh.
+
+load test_helper
+
+kubectl() {
+  case "$*" in
+    *"get events.events.k8s.io"*)
+      printf '%b\n' \
+        '\t\t2026-08-27T13:50:07Z\t2026-08-27T13:49:00Z\tDataVolume\tkubernetes-test-latest-version-md0-a-worker-disk-system\tImportInProgress\tImport in progress' \
+        '2026-08-27T13:51:02Z\t\t\t2026-08-27T13:49:00Z\tDataVolume\tkubernetes-test-latest-version-md0-a-worker-disk-system\tCompleted\tImport Complete' \
+        '2026-08-27T13:51:06Z\t\t\t2026-08-27T13:49:00Z\tPod\tvirt-launcher-kubernetes-test-latest-version-md0-a-worker-abc\tPulled\tSuccessfully pulled image in 3.355s' \
+        '2026-08-27T13:51:54Z\t\t\t2026-08-27T13:49:00Z\tMachine\tkubernetes-test-latest-version-md0-a-worker\tSuccessfulSetNodeRef\tkubernetes-test-latest-version-md0-a-worker'
+      ;;
+    *"get nodes"*)
+      printf '%b\n' 'worker-a\tcreated=2026-08-27T13:51:45Z\tReady=2026-08-27T13:52:03Z'
+      ;;
+    *"logs deploy/talos-image-cache"*)
+      printf '%s\n' '2026-08-27T13:51:01Z transfer-finished status=complete path=/image/openstack-amd64.raw.xz range=0-123/124 requested=124 sent=124 duration=0.432s'
+      ;;
+    *)
+      return 1
+      ;;
+  esac
+}
+
+timeout() {
+  shift 3
+  "$@"
+}
+
+assert_contains() {
+  case "$1" in
+    *"$2"*) return 0 ;;
+  esac
+  echo "output did not contain: $2" >&2
+  return 1
+}
+
+@test "successful join report separates wait, lifecycle and image transfer timing" {
+  # shellcheck source=/dev/null
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+
+  output=$(cozy_report_node_join_timing \
+    test-latest-version tenant-kubeconfig 100 140 345 2026-08-27T13:48:00Z)
+
+  assert_contains "$output" 'worker-pool request -> Ready wait: 40s'
+  assert_contains "$output" 'two-node Ready wait: 205s'
+  assert_contains "$output" 'worker-pool request -> two nodes Ready: 245s'
+  expected=$(printf 'DataVolume\tkubernetes-test-latest-version-md0-a-worker-disk-system\tImportInProgress')
+  assert_contains "$output" "$expected"
+  expected=$(printf '2026-08-27T13:50:07Z\tDataVolume')
+  assert_contains "$output" "$expected"
+  assert_contains "$output" 'Successfully pulled image in 3.355s'
+  expected=$(printf 'worker-a\tcreated=2026-08-27T13:51:45Z\tReady=2026-08-27T13:52:03Z')
+  assert_contains "$output" "$expected"
+  assert_contains "$output" 'duration=0.432s'
+}
+
+@test "worker timing starts immediately before the KubernetesNodes request" {
+  lib=hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  stamp_line=$(grep -n '_worker_pool_requested_at=$(date +%s)' "$lib" | cut -d: -f1)
+  nodes_line=$(grep -n '^kind: KubernetesNodes$' "$lib" | cut -d: -f1)
+
+  [ -n "$stamp_line" ]
+  [ -n "$nodes_line" ]
+  [ "$stamp_line" -lt "$nodes_line" ]
+  [ "$(( nodes_line - stamp_line ))" -le 5 ]
+}
+
+@test "guest console summary prices direct GHCR kubelet image work" {
+  # shellcheck source=/dev/null
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  fixture="_out/tmp/guest-console-kubelet-$$.log"
+  mkdir -p "${fixture%/*}"
+  printf '%s\n' \
+    '[   12.037680] [talos] pulling image ghcr.io/siderolabs/kubelet:v1.35.6: starting...' \
+    '[   15.793093] [talos] service[kubelet](Preparing): Creating service runner' \
+    '[   17.837505] [talos] service[kubelet](Running): Health check successful' \
+    >"$fixture"
+
+  output=$(_cozy_guest_kubelet_image_timing worker-a "$fixture")
+  rm -f "$fixture"
+
+  assert_contains "$output" 'kubelet image ghcr.io/siderolabs/kubelet:v1.35.6'
+  assert_contains "$output" 'fetch+unpack 3.755s (guest 12.038s -> 15.793s)'
+  assert_contains "$output" 'kubelet healthy at guest 17.838s'
+  assert_contains "$output" 'source=ghcr.io (no e2e registry mirror)'
+}
diff --git a/hack/run-kubernetes-kvm-exits_test.bats b/hack/run-kubernetes-kvm-exits_test.bats
new file mode 100644
index 0000000000..0473e642f3
--- /dev/null
+++ b/hack/run-kubernetes-kvm-exits_test.bats
@@ -0,0 +1,1018 @@
+#!/usr/bin/env bats
+# Regression coverage for the sandbox kernel's KVM exit counters in
+# hack/e2e-chainsaw/_lib/run-kubernetes.sh. cozytest.sh ends an @test block at
+# the first bare closing brace, so command mocks stay at top level.
+#
+# What this capture answers, and why nothing beside it answers the same thing:
+# every other CPU reading in this tree describes a subject inside the sandbox --
+# a cgroup, a thread, a node's own /proc/stat -- and each of them can say a guest
+# was given its ticks while the guest gets no work done. None of them can say
+# what a tick cost. The tenant worker is a guest of a sandbox node, which is
+# itself a guest of the runner, and the price of nesting is paid where the
+# runner's kernel serves the sandbox VMs: exits, nested page faults and TLB
+# flushes that no counter inside the sandbox can see. That kernel publishes them
+# in debugfs, and the sandbox container shares it, so this is a local read.
+#
+# So the failure this suite guards against is not a wrong number; it is an empty
+# directory, which reads as a kernel that paid nothing while nothing was ever
+# asked.
+
+load test_helper
+
+timeout_calls=/dev/null
+timeout_rc_override=
+unshare_calls=/dev/null
+unshare_rc_override=
+mount_calls=/dev/null
+mount_rc=0
+mount_stderr=
+
+timeout() {
+  local command_rc=0
+  printf '%s\n' "$*" >>"${timeout_calls}"
+  # Return 97 rather than running the command when the wrapper is not the
+  # bounded form: a read that lost its ceiling must not pass as a read.
+  [ "${1:-}" = -k ] || return 97
+  shift 3
+  "$@" || command_rc=$?
+  [ -z "${timeout_rc_override}" ] || return "${timeout_rc_override}"
+  return "${command_rc}"
+}
+
+# Mocked as a function rather than staged as a binary because the collector
+# calls it in this shell. Its own flags are stripped and the rest is run, so the
+# program the collector composed is the program this suite exercises -- the
+# alternative, matching the program text here, would pass against a collector
+# that had stopped composing it.
+unshare() {
+  local command_rc=0
+  printf '%s\n' "$*" >>"${unshare_calls}"
+  while [ "$#" -gt 0 ]; do
+    case "$1" in
+      --mount | --propagation) shift ;;
+      private) shift ;;
+      *) break ;;
+    esac
+  done
+  [ -z "${unshare_rc_override}" ] || return "${unshare_rc_override}"
+  # The status is captured and returned rather than left as the last command's,
+  # which is the same shape the wrapper above uses and not a matter of taste
+  # here: cozytest.sh rewrites every closing brace in the first column into
+  # `return 0` followed by the brace, so a mock ending on a bare command has its
+  # status replaced by zero under that runner and kept under bats. This mock
+  # exists to carry a non-zero mount refusal outward, so losing it turns the two
+  # tests about a refused mount green against a collector that never saw one.
+  "$@" || command_rc=$?
+  return "${command_rc}"
+}
+
+assert_file_contains() {
+  local needle="$1"
+  local file="$2"
+
+  if [ ! -f "${file}" ]; then
+    printf 'expected %s to exist so it could be checked for: %s\n' "${file}" "${needle}" >&2
+    return 1
+  fi
+  case "$(cat "${file}")" in
+    *"${needle}"*) return 0 ;;
+  esac
+  printf 'expected %s to contain: %s\n' "${file}" "${needle}" >&2
+  return 1
+}
+
+assert_file_lacks_pattern() {
+  local pattern="$1"
+  local file="$2"
+
+  # A missing file must fail rather than vacuously pass: a bare `! grep -q`
+  # succeeds on an unreadable path, which is indistinguishable from "the file
+  # exists and does not carry the label".
+  if [ ! -f "${file}" ]; then
+    printf 'expected %s to exist so it could be checked for: %s\n' "${file}" "${pattern}" >&2
+    return 1
+  fi
+  # Branched on awk's exact status. awk exits 1 for "no line matched" and 2 for
+  # "I could not evaluate this"; folded together, a negative assertion is
+  # satisfied by its own matcher giving up, which is the direction that goes
+  # green and stays green.
+  local _rc=0
+  awk -v pattern="${pattern}" '$0 ~ pattern { found = 1 } END { exit found ? 0 : 1 }' "${file}" || _rc=$?
+  case "${_rc}" in
+    0)
+      printf 'expected %s not to match: %s\n' "${file}" "${pattern}" >&2
+      return 1
+      ;;
+    1) return 0 ;;
+    *)
+      printf 'awk could not evaluate pattern %s against %s\n' "${pattern}" "${file}" >&2
+      return 1
+      ;;
+  esac
+}
+
+# The function under test redirects a command's stderr into a report file and
+# decides which artifact to write from it. cozytest.sh runs under `set -x`, so
+# the tracer's own line for that command lands on the very stderr being
+# redirected, and every assertion about those files would be reading the
+# tracer. Call through this wrapper so the sinks hold what production writes.
+run_capture() {
+  local _rc=0
+  ( set +x; cozy_capture_sandbox_kvm_exits "${1:-1}" ) || _rc=$?
+  return "${_rc}"
+}
+
+# `mount` is staged as an executable rather than mocked as a function: the
+# collector runs it inside `sh -c`, a subprocess this shell's functions do not
+# reach. A function here would be invisible exactly where the assertion needs
+# it, and the walk would run against a mount that never happened without the
+# suite noticing.
+stage_mount_stub() {
+  local dir="$1"
+  mkdir -p "${dir}/bin"
+  cat >"${dir}/bin/mount" <<STUB
+#!/bin/sh
+printf '%s\n' "\$*" >>"${dir}/mount.calls"
+[ -z "${mount_stderr}" ] || printf '%s\n' "${mount_stderr}" >&2
+exit ${mount_rc}
+STUB
+  chmod +x "${dir}/bin/mount"
+  mount_calls="${dir}/mount.calls"
+  PATH="${dir}/bin:${PATH}"
+}
+
+# A tree of files shaped like the kernel's, because staging a subject worth
+# reading needs a hypervisor. Two global counters and one per-VM directory is
+# enough to tell the two levels apart; the walk does not count them.
+stage_debugfs() {
+  local root="$1"
+  mkdir -p "${root}/kvm/4242-13"
+  printf '1200\n' >"${root}/kvm/exits"
+  printf '640\n' >"${root}/kvm/pf_taken"
+  printf '31\n' >"${root}/kvm/tlb_flush"
+  printf '800\n' >"${root}/kvm/4242-13/exits"
+  printf '17\n' >"${root}/kvm/4242-13/halt_exits"
+  # The shape the kernel actually puts in every per-VM directory beside the
+  # counters, reproduced rather than imagined: mmu_rmaps_stat is a seq_file
+  # printing a tab-separated histogram table. Without it in the fixture nothing
+  # here is shaped like the directory the walk meets in production, and both
+  # skip paths are unreachable from this suite.
+  {
+    printf 'Rmap_Count:\t0\t1\t2-3\t4-7\n'
+    printf 'Level=4K:\t6291000\t400\t50\t6\n'
+    printf 'Level=2M:\t12200\t88\t0\t0\n'
+    printf 'Level=1G:\t24\t0\t0\t0\n'
+  } >"${root}/kvm/4242-13/mmu_rmaps_stat"
+}
+
+stage() {
+  COZY_REPORT_DIR="$1/report"
+  COZY_SNAPSHOT_NAME=kvm-smoke
+  COZY_DIAG_KVM_DEBUGFS="$1/debugfs"
+  stage_debugfs "$1/debugfs"
+  stage_mount_stub "$1"
+}
+
+capture_path() {
+  printf '%s/snapshots/kvm-smoke/sandbox-kvm-exits/sample-%s/kvm-stats.txt' \
+    "${COZY_REPORT_DIR}" "${1:-1}"
+}
+
+marker_path() {
+  printf '%s/snapshots/kvm-smoke/sandbox-kvm-exits/sample-%s/COLLECTION-FAILED.txt' \
+    "${COZY_REPORT_DIR}" "${1:-1}"
+}
+
+@test "the kernel's own KVM counters are read through a debugfs of this capture's own" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  unshare_calls="$tmp/unshare.calls"
+  stage "$tmp"
+
+  run_capture
+
+  # The mount is what makes the counters reachable at all, and the namespace is
+  # what keeps it from being a change to the sandbox: the suite runs on for
+  # another twenty minutes after this, and a mount left behind would be this
+  # collector editing the environment the rest of the run measures.
+  assert_file_contains '--mount --propagation private' "$unshare_calls"
+  assert_file_contains '-t debugfs' "$mount_calls"
+  capture=$(capture_path)
+  assert_file_contains 'exits 1200' "$capture"
+  assert_file_contains 'tlb_flush 31' "$capture"
+  # What the walk found, counted at both levels and over the directories it
+  # opened. Three numbers rather than one because they answer different
+  # questions -- a kernel hosting no VM has counters and no directories, a VM
+  # that went away under the walk leaves a directory and no counters -- and
+  # without this the directory count and the guard that produces it are carried
+  # by nothing.
+  assert_file_contains 'counters read: 3 kernel-wide and 2 per-VM, across 1 per-VM director' "$capture"
+  assert_file_lacks_pattern 'unknown' "$capture"
+  assert_file_lacks_pattern 'incomplete' "$capture"
+  assert_file_lacks_pattern 'unavailable' "$capture"
+  rm -rf "$tmp"
+}
+
+@test "a file the kernel computes on read is skipped by name and never opened" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  unshare_calls="$tmp/unshare.calls"
+  stage "$tmp"
+
+  run_capture
+
+  # mmu_rmaps_stat is not a counter and, unlike every other file here, reading
+  # it is not free: it is registered with single_open and seq_read, so its
+  # contents are computed on the first read, under the VM slots_lock and MMU
+  # write lock, walking every rmap head. A shape test cannot save that -- to see
+  # the shape you must read it, and the read is the cost -- so it is skipped by
+  # name before anything opens it. The two skip reasons are worded differently
+  # on purpose: this assertion fails, rather than silently passing on the shape
+  # path, if the name check is ever dropped.
+  capture=$(capture_path)
+  assert_file_contains '[skipped vm 4242-13] mmu_rmaps_stat: not opened' "$capture"
+  assert_file_lacks_pattern 'Rmap_Count' "$capture"
+  assert_file_lacks_pattern 'Level=4K' "$capture"
+  # And it is not counted as a per-VM counter either.
+  assert_file_contains 'counters read: 3 kernel-wide and 2 per-VM' "$capture"
+  rm -rf "$tmp"
+}
+
+@test "a file that is not a counter at all is skipped by its shape" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  unshare_calls="$tmp/unshare.calls"
+  stage "$tmp"
+  # The general net behind the name list. A counter is one integer and nothing
+  # else; anything else in these directories would otherwise be emitted under a
+  # heading promising `level name value`, counted as a counter, and then offered
+  # to the reader as something to difference against its sibling.
+  {
+    printf 'header one two\n'
+    printf 'row 1 2\n'
+  } >"$tmp/debugfs/kvm/some_table"
+  printf 'not-a-number\n' >"$tmp/debugfs/kvm/some_text"
+  # A number followed by more of anything: the leading integer alone would
+  # pass, so this pins that the shape check reads the whole content rather than
+  # the first line. Without this fixture a check narrowed to the first line
+  # stays green, and a table whose first row happens to be a bare number would
+  # be filed as a counter.
+  {
+    printf '42\n'
+    printf 'and then some\n'
+  } >"$tmp/debugfs/kvm/some_prefixed_table"
+
+  run_capture
+
+  capture=$(capture_path)
+  assert_file_contains '[skipped global] some_table: not a single integer' "$capture"
+  assert_file_contains '[skipped global] some_text: not a single integer' "$capture"
+  assert_file_contains '[skipped global] some_prefixed_table: not a single integer' "$capture"
+  assert_file_lacks_pattern 'header one two' "$capture"
+  assert_file_lacks_pattern 'not-a-number' "$capture"
+  assert_file_lacks_pattern 'some_prefixed_table 42' "$capture"
+  # Still three kernel-wide counters: neither of the two joined them.
+  assert_file_contains 'counters read: 3 kernel-wide' "$capture"
+  rm -rf "$tmp"
+}
+
+@test "a file that cannot be read is skipped as unread, not called a non-counter" {
+  [ "$(id -u)" -ne 0 ] || skip "mode bits do not stop root from opening the file"
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  unshare_calls="$tmp/unshare.calls"
+  stage "$tmp"
+  # In production the failure is a live counter whose VM is being torn down:
+  # its entry is still listed while the kernel refuses the open, or refuses
+  # the read once the entry is detached. Neither state can be staged with a
+  # plain file, so an unreadable mode stands in; what the walk sees is the
+  # same, a listed file that yields no content.
+  printf '99\n' >"$tmp/debugfs/kvm/locked_out"
+  chmod 000 "$tmp/debugfs/kvm/locked_out"
+
+  run_capture
+
+  capture=$(capture_path)
+  assert_file_contains '[skipped global] locked_out: could not be read' "$capture"
+  assert_file_lacks_pattern 'locked_out: not a single integer' "$capture"
+  # Not read means not counted: still the three counters the fixture stages.
+  assert_file_contains 'counters read: 3 kernel-wide' "$capture"
+  chmod 700 "$tmp/debugfs/kvm/locked_out"
+  rm -rf "$tmp"
+}
+
+@test "the per-VM split is kept apart from the kernel-wide totals" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  unshare_calls="$tmp/unshare.calls"
+  stage "$tmp"
+
+  run_capture
+
+  # Both levels exist in debugfs and they answer different questions: the totals
+  # say what this kernel paid, the per-VM directories say whether the three
+  # sandbox VMs paid it evenly. Folded together, a single VM burning exits looks
+  # like a kernel under uniform load, which is the reading this split exists to
+  # refuse.
+  capture=$(capture_path)
+  assert_file_contains '[vm 4242-13] exits 800' "$capture"
+  assert_file_contains '[global] exits 1200' "$capture"
+  rm -rf "$tmp"
+}
+
+@test "the counter legend travels with the numbers" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  unshare_calls="$tmp/unshare.calls"
+  stage "$tmp"
+
+  run_capture
+
+  capture=$(capture_path)
+  # Which layer these numbers describe. The counters belong to the kernel
+  # hosting the sandbox VMs, so they price the sandbox's own execution and say
+  # nothing about what a tenant worker's guest did to its sandbox node -- and a
+  # reader who takes them for the second draws the opposite conclusion.
+  assert_file_contains 'the sandbox VMs and not what runs inside them' "$capture"
+  # Which of them a difference may be taken of. Subtracting an instantaneous
+  # gauge from its sibling reading yields a number with no meaning, and the
+  # names sit next to the cumulative ones in the same directory.
+  # Both of the vCPU-state gauges, not just the first. They sit in the same
+  # directory as everything else and under the same kind of name, and a list
+  # that names one of them reads as the closed set of things not to difference.
+  assert_file_contains 'guest_mode' "$capture"
+  assert_file_contains 'blocking' "$capture"
+  assert_file_contains 'cumulative' "$capture"
+  # The counter a reader will look for and not find, named where they look.
+  assert_file_contains 'no ept_violation counter' "$capture"
+  # Why the per-VM directories cannot be attributed to a sandbox node.
+  assert_file_contains 'cannot map' "$capture"
+  # The pairing instruction rides with the numbers on the one arm that holds a
+  # whole reading, as it does for the node CPU time capture beside it.
+  assert_file_contains 'subtracting this file from its sibling' "$capture"
+  rm -rf "$tmp"
+}
+
+@test "each reading records when it was taken" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  unshare_calls="$tmp/unshare.calls"
+  stage "$tmp"
+
+  run_capture
+
+  # This pair is not taken inside one diagnostics block: the first reading is
+  # taken before the node-join wait and the second only when that wait has run
+  # out, so the interval between them is the whole join window rather than a
+  # knob. Nothing else in the artifact records it.
+  capture=$(capture_path)
+  assert_file_contains 'read attempted from' "$capture"
+  stamp=$(sed -n 's/.*read attempted from \([0-9][0-9]*\) to \([0-9][0-9]*\) epoch seconds.*/\1 \2/p' "$capture")
+  if [ -z "$stamp" ]; then
+    echo "expected a bare epoch stamp in $capture" >&2
+    cat "$capture" >&2
+    return 1
+  fi
+  rm -rf "$tmp"
+}
+
+@test "the read is bounded and keeps its exit code" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  unshare_calls="$tmp/unshare.calls"
+  stage "$tmp"
+
+  run_capture
+
+  # Local does not mean instant: a mount and a walk over debugfs both enter the
+  # kernel, and this one runs on the failure path of a host already wedged
+  # enough to lose a node join.
+  assert_file_contains '-k 5 20 unshare' "$timeout_calls"
+  assert_file_contains '[capture exit code: 0]' "$(capture_path)"
+  rm -rf "$tmp"
+}
+
+@test "a lowered read budget moves this collector's bound" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  unshare_calls="$tmp/unshare.calls"
+  stage "$tmp"
+  # Set after sourcing, which is how a caller and a test both set it. A value
+  # read only at assignment time would reach `timeout` unchecked here.
+  COZY_DIAG_READ_TIMEOUT=4
+
+  run_capture
+
+  assert_file_contains '-k 5 4 unshare' "$timeout_calls"
+  rm -rf "$tmp"
+}
+
+@test "a zero read budget is corrected rather than disabling the bound" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  unshare_calls="$tmp/unshare.calls"
+  stage "$tmp"
+  # `timeout -k 5 0` disables the timeout outright, so a zero assigned after
+  # sourcing would restore the unbounded read this bound exists to remove.
+  COZY_DIAG_READ_TIMEOUT=0
+
+  run_capture
+
+  assert_file_lacks_pattern '^-k 5 0 ' "$timeout_calls"
+  assert_file_contains "-k 5 $COZY_DIAG_READ_TIMEOUT_DEFAULT unshare" "$timeout_calls"
+  rm -rf "$tmp"
+}
+
+@test "no unshare on PATH is recorded rather than left as an empty directory" {
+  # A subprocess with a stripped PATH, because this file mocks `unshare` as a
+  # shell function and `command -v` finds functions -- the arm cannot be reached
+  # from inside a test body. The PATH is staged rather than emptied: the
+  # collector shells out before it gets to the check, so an empty PATH would
+  # fail this for the wrong reason and read as the arm being broken.
+  tmp=$(mktemp -d)
+  mkdir -p "$tmp/bin"
+  # /sbin and /usr/sbin are in the list because `mount` lives there on the host
+  # this suite is also run from, and a staging loop that cannot find it fails
+  # the test rather than quietly leaving the check to run against a PATH that
+  # is missing more than the one command it is about.
+  for c in mkdir grep rm mount date; do
+    for d in /bin /usr/bin /usr/local/bin /opt/homebrew/bin /sbin /usr/sbin; do
+      if [ -x "$d/$c" ]; then
+        ln -sf "$d/$c" "$tmp/bin/$c"
+        break
+      fi
+    done
+    if [ ! -x "$tmp/bin/$c" ]; then
+      echo "FAIL: could not stage $c in the stripped PATH; the check below would be vacuous" >&2
+      return 1
+    fi
+  done
+  if [ -e "$tmp/bin/unshare" ]; then
+    echo "FAIL: unshare leaked into the stripped PATH; this test would prove nothing" >&2
+    return 1
+  fi
+  rc=0
+
+  # Assigned inside the subprocess rather than in front of it: bash resolves the
+  # command name with the PATH the assignment sets, so `PATH=... bash` cannot
+  # find bash itself.
+  out=$(bash -c '
+    set -eu
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    COZY_REPORT_DIR='"$tmp"'/report
+    COZY_SNAPSHOT_NAME=kvm-smoke
+    PATH='"$tmp"'/bin
+    cozy_capture_sandbox_kvm_exits 1
+  ' 2>&1) || rc=$?
+  printf '%s\n' "$out" >"$tmp/out"
+
+  [ "$rc" -ne 0 ]
+  marker="$tmp/report/snapshots/kvm-smoke/sandbox-kvm-exits/sample-1/COLLECTION-FAILED.txt"
+  assert_file_contains 'unshare is not on PATH' "$marker"
+  # The distinction the marker exists for, spelled out in the artifact: a tool
+  # that was never run says nothing about the kernel, and the reading a missing
+  # file invites is that nesting cost it nothing.
+  assert_file_contains 'not a reading that nesting cost it nothing' "$marker"
+  rm -rf "$tmp"
+}
+
+@test "no mount on PATH is recorded rather than left as an empty directory" {
+  # The sibling of the unshare check above. Staged the same way and for the same
+  # reason, with one difference: `unshare` has to be present for the collector
+  # to reach the check this test is about, and the host running this suite may
+  # have no such binary, so a stub stands in. It is never executed -- the
+  # collector returns at the check below it.
+  tmp=$(mktemp -d)
+  mkdir -p "$tmp/bin"
+  for c in mkdir grep rm mv date; do
+    for d in /bin /usr/bin /usr/local/bin /opt/homebrew/bin /sbin /usr/sbin; do
+      if [ -x "$d/$c" ]; then
+        ln -sf "$d/$c" "$tmp/bin/$c"
+        break
+      fi
+    done
+    if [ ! -x "$tmp/bin/$c" ]; then
+      echo "FAIL: could not stage $c in the stripped PATH; the check below would be vacuous" >&2
+      return 1
+    fi
+  done
+  printf '#!/bin/sh\nexit 91\n' >"$tmp/bin/unshare"
+  chmod +x "$tmp/bin/unshare"
+  if [ -e "$tmp/bin/mount" ]; then
+    echo "FAIL: mount leaked into the stripped PATH; this test would prove nothing" >&2
+    return 1
+  fi
+  rc=0
+
+  out=$(bash -c '
+    set -eu
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    COZY_REPORT_DIR='"$tmp"'/report
+    COZY_SNAPSHOT_NAME=kvm-smoke
+    PATH='"$tmp"'/bin
+    cozy_capture_sandbox_kvm_exits 1
+  ' 2>&1) || rc=$?
+  printf '%s\n' "$out" >"$tmp/out"
+
+  [ "$rc" -ne 0 ]
+  marker="$tmp/report/snapshots/kvm-smoke/sandbox-kvm-exits/sample-1/COLLECTION-FAILED.txt"
+  assert_file_contains 'mount is not on PATH' "$marker"
+  assert_file_contains 'not a reading that nesting cost it nothing' "$marker"
+  rm -rf "$tmp"
+}
+
+@test "a mount that was refused is not reported as a kernel running no guests" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  unshare_calls="$tmp/unshare.calls"
+  mount_rc=32
+  mount_stderr='mount: /sys/kernel/debug: permission denied.'
+  stage "$tmp"
+  rc=0
+
+  run_capture || rc=$?
+
+  # The two readings this has to keep apart: a sandbox that would not let the
+  # capture at debugfs, and a kernel whose KVM is idle. Both leave no counters,
+  # and only the second is a statement about the run.
+  [ "$rc" -ne 0 ]
+  marker=$(marker_path)
+  assert_file_contains 'permission denied' "$marker"
+  assert_file_contains 'debugfs could not be mounted' "$marker"
+  assert_file_lacks_pattern 'no KVM' "$marker"
+  rm -rf "$tmp"
+}
+
+@test "a kernel with no kvm directory is a finding rather than an empty capture" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  unshare_calls="$tmp/unshare.calls"
+  # A hint on stderr beside the finding, so the arm that routes stderr by status
+  # is exercised for this code and not only for its sibling. The kernel answered
+  # here, so the complaint belongs in a file named as a warning; routed with the
+  # failures it would put read-error.log next to a capture that did not fail.
+  mount_stderr='mount: (hint) debugfs is already mounted here.'
+  stage "$tmp"
+  rm -rf "$tmp/debugfs/kvm"
+  rc=0
+
+  run_capture || rc=$?
+
+  # Answered to the caller and not only to the report, because one of the two
+  # callers runs on the passing path, whose report is the artifact nobody
+  # downloads, and this is the most consequential thing the instrument can say.
+  [ "$rc" -ne 0 ]
+  # Not a shortfall of the capture. The sandbox VMs are started with
+  # accel=kvm by hack/e2e-prepare-cluster.bats, so a kernel with no kvm
+  # directory under debugfs is a kernel that ran them some other way -- which
+  # would explain the slowness this whole line of measurement is chasing, and
+  # must not be filed as a collector that came up short.
+  capture=$(capture_path)
+  assert_file_contains 'NO-KVM-DIR' "$capture"
+  assert_file_contains 'accel=kvm' "$capture"
+  # And the legend must not ride on it. A file carrying a finding and no
+  # counters cannot be differenced against its sibling, and an instruction to do
+  # so would turn the sibling's whole cumulative total into a rate over the
+  # window -- the largest number this artifact could possibly produce, arrived
+  # at by following its own advice.
+  assert_file_lacks_pattern 'subtracting this file from its sibling' "$capture"
+  # And a finding is not also a truncated walk, nor a read that came back with
+  # nothing. All three sentences fit in this file and they contradict each
+  # other: one says the kernel answered and had no KVM, the second says the walk
+  # was cut off before it could tell, the third says the read never got that
+  # far. Only the first is true here, and the other two describe an instrument
+  # that failed rather than one that has something to report.
+  assert_file_lacks_pattern 'incomplete' "$capture"
+  assert_file_lacks_pattern 'unavailable' "$capture"
+  # The probe's own status, read out of the capture rather than inferred from
+  # what the legend did or did not say. The collector decides four things from
+  # this code -- which file stderr lands in, whether the legend rides, whether
+  # the pairing instruction rides, what it returns -- so a probe that stopped
+  # emitting it would change all four, and a test that only watches the effects
+  # can be made blind by any one guard added upstream of them.
+  assert_file_contains '[capture exit code: 4]' "$capture"
+  dir="$COZY_REPORT_DIR/snapshots/kvm-smoke/sandbox-kvm-exits/sample-1"
+  assert_file_contains 'debugfs is already mounted here' "$dir/READ-WARNINGS.txt"
+  [ ! -f "$dir/read-error.log" ]
+  rm -rf "$tmp"
+}
+
+@test "a kvm directory holding only per-VM counters is not reported as holding none" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  unshare_calls="$tmp/unshare.calls"
+  stage "$tmp"
+  # The kernel-wide files gone and one VM directory left. Both levels are
+  # optional in their own way -- a kernel hosting no VM has no per-VM
+  # directories -- so the emptiness test has to be about the two together. Read
+  # as either-or it reports a capture that holds counters as one that holds
+  # none, and the arm that says so is the one a reader trusts over the numbers
+  # printed above it.
+  rm -f "$tmp"/debugfs/kvm/exits "$tmp"/debugfs/kvm/pf_taken "$tmp"/debugfs/kvm/tlb_flush
+
+  run_capture
+
+  capture=$(capture_path)
+  assert_file_contains '[vm 4242-13] exits 800' "$capture"
+  assert_file_lacks_pattern 'NO-COUNTER-FILES' "$capture"
+  rm -rf "$tmp"
+}
+
+@test "a kvm directory holding no counter is not filed as a reading" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  unshare_calls="$tmp/unshare.calls"
+  stage "$tmp"
+  rm -rf "$tmp/debugfs/kvm"
+  mkdir -p "$tmp/debugfs/kvm"
+  rc=0
+
+  run_capture || rc=$?
+
+  [ "$rc" -ne 0 ]
+  capture=$(capture_path)
+  assert_file_contains 'NO-COUNTER-FILES' "$capture"
+  # And the legend must not ride on it: telling a reader to subtract two files
+  # asserts that both hold a whole reading, and this one holds none.
+  assert_file_lacks_pattern 'subtracting this file from its sibling' "$capture"
+  assert_file_lacks_pattern 'incomplete' "$capture"
+  assert_file_lacks_pattern 'unavailable' "$capture"
+  rm -rf "$tmp"
+}
+
+@test "a warning beside a finding is filed as a warning, not as a failed read" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  unshare_calls="$tmp/unshare.calls"
+  mount_stderr='mount: (hint) debugfs is already mounted here.'
+  stage "$tmp"
+  # A kernel that answered and had no counters, while mount also wrote a hint.
+  # The status decides which file the complaint lands in, and the two findings
+  # are on the side that succeeded: routing them with the failures would put a
+  # file named read-error.log next to a capture that reports what the kernel
+  # said, which is the failure-shaped name this routing exists to keep off a
+  # reading that did not fail.
+  rm -rf "$tmp/debugfs/kvm"
+  mkdir -p "$tmp/debugfs/kvm"
+  rc=0
+
+  run_capture || rc=$?
+
+  [ "$rc" -ne 0 ]
+  dir="$COZY_REPORT_DIR/snapshots/kvm-smoke/sandbox-kvm-exits/sample-1"
+  assert_file_contains 'NO-COUNTER-FILES' "$dir/kvm-stats.txt"
+  assert_file_contains '[capture exit code: 5]' "$dir/kvm-stats.txt"
+  assert_file_contains 'debugfs is already mounted here' "$dir/READ-WARNINGS.txt"
+  [ ! -f "$dir/read-error.log" ]
+  rm -rf "$tmp"
+}
+
+@test "a capture holding no counter carries no legend about how to read counters" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  unshare_calls="$tmp/unshare.calls"
+  stage "$tmp"
+  # The legend rides on any capture that HOLDS numbers, which is wider than the
+  # captures that hold a whole reading -- and the widening has a floor. Every
+  # line of it describes numbers: which layer they belong to, which of them may
+  # be differenced, what the per-VM tag does and does not identify. On a file
+  # with no numbers the most consequential of those lines invites a reader to
+  # difference a counter that is not there, which is the sibling's entire
+  # cumulative total read as a rate over the window.
+  rm -rf "$tmp/debugfs/kvm"
+  mkdir -p "$tmp/debugfs/kvm"
+
+  run_capture || true
+
+  capture=$(capture_path)
+  assert_file_lacks_pattern 'a difference against the sibling sample' "$capture"
+  assert_file_lacks_pattern 'no ept_violation counter' "$capture"
+  assert_file_lacks_pattern 'per-VM and anonymous' "$capture"
+  rm -rf "$tmp"
+}
+
+@test "a kvm directory holding only kernel-wide counters is not reported as holding none" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  unshare_calls="$tmp/unshare.calls"
+  stage "$tmp"
+  # The mirror of the per-VM case beside this one, and the production shape
+  # whenever the sandbox VMs are down: the kernel keeps its own totals and hosts
+  # no VM, so there is no per-VM directory at all. The emptiness test is about
+  # the two levels together, and read as either-or this direction reports a
+  # capture holding three counters as one holding none.
+  rm -rf "$tmp/debugfs/kvm/4242-13"
+
+  run_capture
+
+  capture=$(capture_path)
+  assert_file_contains '[global] exits 1200' "$capture"
+  assert_file_lacks_pattern 'NO-COUNTER-FILES' "$capture"
+  rm -rf "$tmp"
+}
+
+@test "a counter written without a trailing newline is read rather than passed over" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  unshare_calls="$tmp/unshare.calls"
+  stage "$tmp"
+  # `read` returns non-zero on a last line with no newline while still setting
+  # the variable, so a walk that trusted its status would drop the value it had
+  # just read. The kernel formats its own stat files through "%llu\n" and so
+  # does not produce this shape, which is exactly why nothing else here would
+  # exercise the branch that handles it.
+  # One at each level, because the fallback is written twice -- once per walk --
+  # and a fixture at one level leaves the other's copy free to be deleted with
+  # the suite still green.
+  printf '7' >"$tmp/debugfs/kvm/nested_run"
+  printf '5' >"$tmp/debugfs/kvm/4242-13/irq_exits"
+
+  run_capture
+
+  assert_file_contains '[global] nested_run 7' "$(capture_path)"
+  assert_file_contains '[vm 4242-13] irq_exits 5' "$(capture_path)"
+  rm -rf "$tmp"
+}
+
+@test "a per-VM directory holding no readable counter is not filed as a reading" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  unshare_calls="$tmp/unshare.calls"
+  stage "$tmp"
+  # A VM directory whose counters cannot be read is the shape a VM going away
+  # under the walk produces, and it is indistinguishable on disk from a VM that
+  # reported nothing. Counting directories rather than counters lets it satisfy
+  # the emptiness test: the capture then holds no number and still carries the
+  # instruction to difference it against its sibling, which would turn that
+  # sibling's whole cumulative total into a rate over the window.
+  rm -rf "$tmp/debugfs/kvm"
+  mkdir -p "$tmp/debugfs/kvm/4242-13"
+  rc=0
+
+  run_capture || rc=$?
+
+  [ "$rc" -ne 0 ]
+  capture=$(capture_path)
+  assert_file_contains 'NO-COUNTER-FILES' "$capture"
+  assert_file_lacks_pattern 'subtracting this file from its sibling' "$capture"
+  assert_file_lacks_pattern 'incomplete' "$capture"
+  assert_file_lacks_pattern 'unavailable' "$capture"
+  rm -rf "$tmp"
+}
+
+@test "a read killed before it reached a counter is not presented as a partial reading" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  unshare_calls="$tmp/unshare.calls"
+  stage "$tmp"
+  # The walk writes a heading before it reads anything, so a read killed on its
+  # first blocked file leaves a file that is not empty and holds no number. That
+  # shape is staged here by walking a kvm directory with nothing in it and
+  # forcing the wrapper's status, since what the arm has to get right is the
+  # file, not how it came to look that way. Keyed on file size rather than on a
+  # counter, the capture would be labelled partial and the caller told a pair
+  # was collected.
+  rm -rf "$tmp/debugfs/kvm"
+  mkdir -p "$tmp/debugfs/kvm"
+  timeout_rc_override=124
+  rc=0
+
+  run_capture || rc=$?
+
+  [ "$rc" -ne 0 ]
+  capture=$(capture_path)
+  assert_file_contains 'no counter at all' "$capture"
+  assert_file_lacks_pattern 'incomplete' "$capture"
+  assert_file_lacks_pattern 'subtracting this file from its sibling' "$capture"
+  rm -rf "$tmp"
+}
+
+@test "a read that returned nothing is reported to the caller, not only to the report" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  unshare_calls="$tmp/unshare.calls"
+  stage "$tmp"
+  # Killed before it produced a byte: the dominant shape of a bounded read that
+  # ran out. Both callers ask this function whether it collected anything, and
+  # one of them runs on the passing path where the report is the artifact nobody
+  # downloads -- so a capture that got nothing has to answer non-zero or the
+  # warning that says the pair is broken never prints.
+  unshare_rc_override=124
+  rc=0
+
+  run_capture || rc=$?
+
+  [ "$rc" -ne 0 ]
+  capture=$(capture_path)
+  assert_file_contains 'produced no counter at all' "$capture"
+  assert_file_lacks_pattern 'subtracting this file from its sibling' "$capture"
+  rm -rf "$tmp"
+}
+
+@test "a partial read is not reported to the caller as nothing collected" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  unshare_calls="$tmp/unshare.calls"
+  stage "$tmp"
+  # The other half of the pair above, and the reason the status is decided by
+  # what reached the file rather than by the exit code alone: a walk cut off
+  # after it wrote counters left a usable capture, and a caller told that
+  # nothing was collected would contradict the artifact sitting beside it.
+  timeout_rc_override=124
+  rc=0
+
+  run_capture || rc=$?
+
+  [ "$rc" -eq 0 ]
+  assert_file_contains 'incomplete' "$(capture_path)"
+  rm -rf "$tmp"
+}
+
+@test "a capture that failed points at the error log written beside it" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  unshare_calls="$tmp/unshare.calls"
+  mount_stderr='mount: (hint) debugfs is already mounted here.'
+  stage "$tmp"
+  # A read that was cut short while something was also written to stderr: the
+  # message belongs beside the capture rather than in the job log of a run that
+  # may be days old, and an arm that reports the shortfall without saying where
+  # the message went sends the reader looking there anyway. The node CPU time
+  # capture beside this one names its own error file for the same reason.
+  timeout_rc_override=124
+
+  run_capture || true
+
+  dir="$COZY_REPORT_DIR/snapshots/kvm-smoke/sandbox-kvm-exits/sample-1"
+  assert_file_contains 'read-error.log' "$dir/kvm-stats.txt"
+  assert_file_contains 'debugfs is already mounted here' "$dir/read-error.log"
+  rm -rf "$tmp"
+}
+
+@test "a read that returned no counter but left a message points at where it went" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  unshare_calls="$tmp/unshare.calls"
+  mount_stderr='mount: (hint) debugfs is already mounted here.'
+  stage "$tmp"
+  # The fourth corner of the pair of questions the arms answer: no counter
+  # reached the file, and something was written to stderr. The three other
+  # corners are staged elsewhere in this file, and without this one the arm that
+  # names the error log can be deleted with the suite still green -- leaving a
+  # reader told the capture is unavailable and not told that the reason is
+  # sitting in the file next to it.
+  rm -rf "$tmp/debugfs/kvm"
+  mkdir -p "$tmp/debugfs/kvm"
+  timeout_rc_override=124
+  rc=0
+
+  run_capture || rc=$?
+
+  [ "$rc" -ne 0 ]
+  capture=$(capture_path)
+  assert_file_contains 'no counter at all' "$capture"
+  assert_file_contains 'read-error.log' "$capture"
+  rm -rf "$tmp"
+}
+
+@test "a mount that refused without a word does not point at a message that is not there" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  unshare_calls="$tmp/unshare.calls"
+  mount_rc=32
+  mount_stderr=
+  stage "$tmp"
+  rc=0
+
+  run_capture || rc=$?
+
+  # mount almost always writes a reason, which is why the marker was written to
+  # point at one. When it does not, the marker is a single line telling the
+  # reader to look above it at nothing, and a reader who follows that concludes
+  # the artifact lost the message rather than that there never was one.
+  [ "$rc" -ne 0 ]
+  marker=$(marker_path)
+  assert_file_contains 'without a word on either stream' "$marker"
+  assert_file_lacks_pattern 'the message above' "$marker"
+  rm -rf "$tmp"
+}
+
+@test "a read cut off part way is marked incomplete rather than presented whole" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  unshare_calls="$tmp/unshare.calls"
+  stage "$tmp"
+  # The walk wrote counters and then the wrapper killed it: the dominant shape
+  # of a bounded read that ran out, and the one where a whole-looking file is
+  # most misleading, since the difference against its sibling would understate
+  # every counter the walk never reached.
+  timeout_rc_override=124
+
+  run_capture || true
+
+  capture=$(capture_path)
+  assert_file_contains 'exits 1200' "$capture"
+  assert_file_contains 'incomplete' "$capture"
+  assert_file_lacks_pattern 'subtracting this file from its sibling' "$capture"
+  assert_file_contains '[capture exit code: 124]' "$capture"
+  # The lines that say how to read the numbers stay, because they do not depend
+  # on the walk having finished and this is exactly where a reader needs them:
+  # the counters above are real, and the naming trap and the anonymity of the
+  # per-VM split apply to them whether or not the walk reached the end. Only the
+  # instruction to difference two files asserts completeness.
+  assert_file_contains 'no ept_violation counter' "$capture"
+  assert_file_contains 'per-VM and anonymous' "$capture"
+  rm -rf "$tmp"
+}
+
+@test "a warning beside a healthy read is not filed as a failure" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  unshare_calls="$tmp/unshare.calls"
+  mount_stderr='mount: (hint) source is ignored for debugfs.'
+  stage "$tmp"
+
+  run_capture
+
+  # mount writes hints to stderr and exits zero, exactly as kubectl and talosctl
+  # do. Which file the complaint lands in is decided by the status, so a healthy
+  # capture keeps its warning instead of shipping a failure marker beside a
+  # reading that succeeded.
+  dir="$COZY_REPORT_DIR/snapshots/kvm-smoke/sandbox-kvm-exits/sample-1"
+  assert_file_contains 'source is ignored for debugfs' "$dir/READ-WARNINGS.txt"
+  [ ! -f "$dir/COLLECTION-FAILED.txt" ]
+  assert_file_contains 'exits 1200' "$dir/kvm-stats.txt"
+  rm -rf "$tmp"
+}
+
+@test "a report directory that cannot be created is said out loud" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  unshare_calls="$tmp/unshare.calls"
+  stage "$tmp"
+  # A file where the directory has to go. Every write below it then fails, and
+  # without a check the capture is a silent no-op -- the empty directory this
+  # whole suite exists to refuse, produced by the one cause the markers cannot
+  # describe, because there is nowhere to write a marker.
+  mkdir -p "$COZY_REPORT_DIR/snapshots/kvm-smoke"
+  printf 'not a directory\n' >"$COZY_REPORT_DIR/snapshots/kvm-smoke/sandbox-kvm-exits"
+  rc=0
+
+  out=$( ( set +x; cozy_capture_sandbox_kvm_exits 1 ) 2>&1 ) || rc=$?
+
+  [ "$rc" -ne 0 ]
+  case "$out" in
+    *"could not be created"*) ;;
+    *)
+      printf 'expected the collector to say the report directory could not be created, got: %s\n' "$out" >&2
+      return 1
+      ;;
+  esac
+  rm -rf "$tmp"
+}
+
+@test "the sample number decides which reading a file belongs to" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  unshare_calls="$tmp/unshare.calls"
+  stage "$tmp"
+
+  run_capture 2
+
+  # The pair is the instrument: one reading of a running total is an average
+  # over its whole life, not a rate over the failure. Two readings filed under
+  # the same name would leave the
+  # second overwriting the first and the artifact reading like a single sample.
+  assert_file_contains 'exits 1200' "$(capture_path 2)"
+  [ ! -f "$(capture_path 1)" ]
+  rm -rf "$tmp"
+}
diff --git a/hack/run-kubernetes-network-counters_test.bats b/hack/run-kubernetes-network-counters_test.bats
new file mode 100644
index 0000000000..73da4c2b2b
--- /dev/null
+++ b/hack/run-kubernetes-network-counters_test.bats
@@ -0,0 +1,635 @@
+#!/usr/bin/env bats
+# Regression coverage for the tenant-worker network counter capture in
+# hack/e2e-chainsaw/_lib/run-kubernetes.sh. cozytest.sh ends an @test block at
+# the first bare closing brace, so command mocks stay at top level.
+#
+# What this capture answers, and why the guest cannot answer it: a worker that
+# misses the node-Ready deadline while its image pull crawls has two mechanisms
+# behind the same guest-visible symptom. The link is slow, or the pull keeps
+# restarting and discarding what it fetched. From inside the guest both read as
+# a progress line that barely moves. The host-side byte counters separate them,
+# because they count every byte that crossed into the Pod including the ones a
+# restart threw away. cAdvisor reads these inside the Pod's network namespace
+# and publishes one row per interface, and a bridge-bound worker has four --
+# the number that answers is the renamed NIC's receive, while the interface
+# still named eth0 is a dummy holding the Pod IP and reads zero. A capture that
+# reports an unread kubelet as a quiet link would hand the next reader that same
+# ambiguity while looking like it had settled it, so these tests pin the
+# separation rather than the reading.
+#
+# The fixtures below are real kubelet output with the identifying labels
+# rewritten, not lines composed from the metric documentation. That choice is
+# the subject of two of the tests: the family carries no container name and is
+# spelled packets_dropped, and both are invisible to anyone writing the filter
+# from memory.
+
+load test_helper
+
+kubectl_calls=/dev/null
+kubectl_node_names=
+kubectl_list_rc=0
+kubectl_list_stderr=
+kubectl_raw_rc=0
+kubectl_raw_stderr=
+
+# One worker Pod's set as the kubelet serves it: eight families, one row each
+# per interface, every one of them carrying container="" and cAdvisor's own
+# sample timestamp as the third field. Trimmed to the labels the filter reads
+# plus the ones that make the shape recognisable; the id/name digests are
+# synthetic and the image is the upstream pause reference rather than whichever
+# mirror the cluster it was taken from happened to use.
+#
+# Two different provenances here, and the difference matters enough to state.
+# The row shape and its values are real kubelet output with the identifying
+# labels rewritten. The four INTERFACE NAMES are not measured: they are what
+# KubeVirt bridge binding produces in a worker Pod netns -- a dummy carrying the
+# original name and the Pod IP, the real NIC renamed with a -nic suffix, the
+# bridge, and the tap -- read from the generators in the version this repo
+# ships. A virt-launcher Pod was not available to sample, so the names are
+# derived rather than observed, and the counters attached to them are
+# illustrative of direction, not of magnitude.
+worker_pod='virt-launcher-kubernetes-test-latest-version-md0-abc12-xyz34'
+worker_labels_for() {
+  printf 'container="",id="/kubepods.slice/kubepods-burstable.slice/kubepods-burstable-pod0000000a_0000_0000_0000_00000000000b.slice/cri-containerd-0000000000000000000000000000000000000000000000000000000000000001.scope",image="registry.k8s.io/pause:3.10",interface="%s",name="0000000000000000000000000000000000000000000000000000000000000001",namespace="tenant-test",pod="%s"' "$1" "${worker_pod}"
+}
+worker_labels="$(worker_labels_for eth0)"
+kubectl_raw_output=
+
+# Built rather than pasted so the eight families cannot drift apart by a typo in
+# one of them, and so a test that needs one family can name it.
+worker_series() {
+  local labels="$1"
+  local rx_bytes="${2:-4.4040192e+07}"
+  local rx_packets="${3:-31284}"
+  printf 'container_network_receive_bytes_total{%s} %s 1786657157281\n' "${labels}" "${rx_bytes}"
+  printf 'container_network_receive_packets_total{%s} %s 1786657157281\n' "${labels}" "${rx_packets}"
+  printf 'container_network_receive_packets_dropped_total{%s} 0 1786657157281\n' "${labels}"
+  printf 'container_network_receive_errors_total{%s} 0 1786657157281\n' "${labels}"
+  printf 'container_network_transmit_bytes_total{%s} 1.820267529e+09 1786657157281\n' "${labels}"
+  printf 'container_network_transmit_packets_total{%s} 932294 1786657157281\n' "${labels}"
+  printf 'container_network_transmit_packets_dropped_total{%s} 285 1786657157281\n' "${labels}"
+  printf 'container_network_transmit_errors_total{%s} 0 1786657157281\n' "${labels}"
+}
+
+# The four interfaces a bridge-bound worker Pod presents. eth0 is the dummy and
+# reports zero; eth0-nic is the NIC whose receive answers the question. Both
+# have to survive the filter, or the artifact holds a number the reader cannot
+# interpret -- or worse, only the zero.
+bridge_bound_worker() {
+  worker_series "$(worker_labels_for eth0)" 0 0
+  worker_series "$(worker_labels_for eth0-nic)" 4.4040192e+07 31284
+  worker_series "$(worker_labels_for k6t-eth0)" 4.4040192e+07 31284
+  worker_series "$(worker_labels_for tap0)" 1.2e+05 900
+}
+
+# The node's own interfaces arrive in the same families with both selector
+# labels empty. Kept in the default fixture rather than staged only where it is
+# asserted: it is what the wire actually carries, and a filter that lets it
+# through would report the sandbox node's uplink under a worker heading.
+node_series() {
+  printf 'container_network_receive_bytes_total{container="",id="/",image="",interface="eth0",name="",namespace="",pod=""} 1.066300417297e+12 1786657157281\n'
+  printf 'container_network_transmit_bytes_total{container="",id="/",image="",interface="cilium_host",name="",namespace="",pod=""} 27870 1786657157281\n'
+}
+
+timeout_calls=/dev/null
+timeout_fail_node=
+
+kubectl() {
+  printf '%s\n' "$*" >>"${kubectl_calls}"
+
+  if [ "${3:-}" = get ] && [ "${4:-}" = pods ]; then
+    [ -z "${kubectl_list_stderr}" ] || printf '%s\n' "${kubectl_list_stderr}" >&2
+    [ "${kubectl_list_rc}" -eq 0 ] || return "${kubectl_list_rc}"
+    [ -z "${kubectl_node_names}" ] || printf '%s\n' ${kubectl_node_names}
+    return 0
+  fi
+
+  if [ "${1:-}" = get ] && [ "${2:-}" = --raw ]; then
+    [ -z "${kubectl_raw_stderr}" ] || printf '%s\n' "${kubectl_raw_stderr}" >&2
+    # Output before status, for the reason the sibling suite gives: a read cut
+    # off part way has already written what it managed to read, and a stub that
+    # returns first makes the branch labelling a partial capture unreachable in
+    # tests while it stays the likeliest one in production.
+    [ -z "${kubectl_raw_output}" ] || printf '%s\n' "${kubectl_raw_output}"
+    return "${kubectl_raw_rc}"
+  fi
+
+  return 0
+}
+
+timeout() {
+  local command_rc=0
+  printf '%s\n' "$*" >>"${timeout_calls}"
+  # Return 97 rather than running the command when the wrapper is not the
+  # bounded form: a read that lost its ceiling must not pass as a read.
+  [ "${1:-}" = -k ] || return 97
+  shift 3
+  "$@" || command_rc=$?
+  if [ -n "${timeout_fail_node}" ]; then
+    case " $* " in
+      *"${timeout_fail_node}"*) return 124 ;;
+    esac
+  fi
+  return "${command_rc}"
+}
+
+assert_file_contains() {
+  local needle="$1"
+  local file="$2"
+
+  if [ ! -f "${file}" ]; then
+    printf 'expected %s to exist so it could be checked for: %s\n' "${file}" "${needle}" >&2
+    return 1
+  fi
+  case "$(cat "${file}")" in
+    *"${needle}"*) return 0 ;;
+  esac
+  printf 'expected %s to contain: %s\n' "${file}" "${needle}" >&2
+  return 1
+}
+
+assert_file_lacks_pattern() {
+  local pattern="$1"
+  local file="$2"
+
+  # A missing file must fail rather than vacuously pass: a bare `! grep -q`
+  # succeeds on an unreadable path, which is indistinguishable from "the file
+  # exists and does not carry the label".
+  if [ ! -f "${file}" ]; then
+    printf 'expected %s to exist so it could be checked for: %s\n' "${file}" "${pattern}" >&2
+    return 1
+  fi
+  # Branched on awk's exact status. awk exits 1 for "no line matched" and 2 for
+  # "I could not evaluate this"; folded into an `if`, both land in the passing
+  # branch and the assertion "this is absent" is satisfied by the matcher giving
+  # up. Every negative claim in this file rests on the three-way split.
+  local _rc=0
+  awk -v pattern="${pattern}" '$0 ~ pattern { found = 1 } END { exit found ? 0 : 1 }' "${file}" || _rc=$?
+  case "${_rc}" in
+    0)
+      printf 'expected %s not to match: %s\n' "${file}" "${pattern}" >&2
+      return 1
+      ;;
+    1) return 0 ;;
+    *)
+      printf 'awk could not evaluate pattern %s against %s\n' "${pattern}" "${file}" >&2
+      return 1
+      ;;
+  esac
+}
+
+# The function under test redirects a command's stderr into a report file and
+# decides which artifact to write from it. cozytest.sh runs under `set -x`, so
+# the tracer's own line for that command lands on the very stderr being
+# redirected, and every assertion about those files would be reading the tracer.
+# Call through this wrapper so the sinks hold what production writes.
+run_capture() {
+  local _rc=0
+  ( set +x; cozy_capture_tenant_worker_network_counters ) || _rc=$?
+  return "${_rc}"
+}
+
+@test "the capture does not send a reader after a sibling sample it never takes" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  export COZY_REPORT_DIR="$tmp"
+  COZY_SNAPSHOT_NAME=kubernetes-latest
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_node_names="node-a"
+  kubectl_raw_output="$(worker_series "$worker_labels")"
+
+  run_capture
+
+  out="$tmp/snapshots/kubernetes-latest/tenant-network-counters/node-a.txt"
+  # This capture is read once. Its sibling under the same shared walk is read
+  # twice, and the walk is where a stamp would naturally be written for both --
+  # which is how a file could end up carrying, on consecutive lines, this
+  # capture's own note that no second reading exists and an instruction to
+  # subtract one. Two lines of the same artifact contradicting each other is the
+  # reading failure this tree is written against, and it costs a reader the time
+  # it takes to go looking for a directory that was never created.
+  assert_file_contains 'a second capture of the same stream is what turns them into one' "$out"
+  assert_file_lacks_pattern 'sibling' "$out"
+  assert_file_lacks_pattern 'other sample directory' "$out"
+  # The stamp itself stays: when the read happened is true of every caller, and
+  # it is what makes a rate computable at all if a second capture is ever added.
+  assert_file_contains 'read attempted from' "$out"
+  rm -rf "$tmp"
+}
+
+@test "a negative assertion fails when its own matcher cannot evaluate" {
+  # The helper under every "must not appear" claim in this file. What rides on
+  # it is the collector's contract stated negatively: that an unread kubelet was
+  # not written up as a quiet link, that a node interface did not land under a
+  # worker heading. A matcher that fails open turns each of those into a
+  # sentence nobody checked.
+  tmp=$(mktemp -d)
+  printf 'anything\n' >"$tmp/subject"
+
+  if assert_file_lacks_pattern '*(' "$tmp/subject" 2>/dev/null; then
+    echo "FAIL: an unparseable pattern was reported as absent" >&2
+    rm -rf "$tmp"
+    return 1
+  fi
+  assert_file_lacks_pattern 'absent-string' "$tmp/subject"
+  if assert_file_lacks_pattern 'anything' "$tmp/subject" 2>/dev/null; then
+    echo "FAIL: a present pattern was reported as absent" >&2
+    rm -rf "$tmp"
+    return 1
+  fi
+  rm -rf "$tmp"
+}
+
+@test "the eight families of a worker Pod are captured, packets_dropped included" {
+  # The positive control every negative claim below is measured against. It
+  # names the eight families one by one rather than counting lines, because a
+  # count passes while a family is silently missing from the filter -- and the
+  # dropped-packet families are the ones a filter written from memory loses,
+  # since the obvious spelling for them is *_drops_total, which does not exist.
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  export COZY_REPORT_DIR="$tmp"
+  COZY_SNAPSHOT_NAME=kubernetes-latest
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_node_names="node-a"
+  kubectl_raw_output="$(node_series; worker_series "$worker_labels")"
+
+  run_capture
+
+  out="$tmp/snapshots/kubernetes-latest/tenant-network-counters/node-a.txt"
+  for family in \
+    container_network_receive_bytes_total \
+    container_network_receive_packets_total \
+    container_network_receive_packets_dropped_total \
+    container_network_receive_errors_total \
+    container_network_transmit_bytes_total \
+    container_network_transmit_packets_total \
+    container_network_transmit_packets_dropped_total \
+    container_network_transmit_errors_total; do
+    assert_file_contains "${family}{" "$out"
+  done
+  # And the value, so a filter that kept the family name while dropping the row
+  # it was on cannot pass: 285 is the transmit drop count in the fixture.
+  assert_file_contains ' 285 ' "$out"
+  rm -rf "$tmp"
+}
+
+@test "the filter does not select on the container label, which is always empty here" {
+  # The trap this collector is likeliest to acquire on its next edit. The CPU
+  # counters beside it carry a real container name, so a filter copied from
+  # there and tightened with container="compute" matches nothing at all -- and
+  # nothing at all reads as a worker that moved no bytes. Every row of this
+  # family carries container="", measured against a live kubelet, so the guard
+  # is that the fixture's empty-container rows survive.
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  export COZY_REPORT_DIR="$tmp"
+  COZY_SNAPSHOT_NAME=kubernetes-latest
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_node_names="node-a"
+  kubectl_raw_output="$(worker_series "$worker_labels")"
+
+  run_capture
+
+  out="$tmp/snapshots/kubernetes-latest/tenant-network-counters/node-a.txt"
+  assert_file_contains 'container=""' "$out"
+  rm -rf "$tmp"
+}
+
+@test "node interfaces and foreign namespaces are dropped, workers are kept" {
+  # The node's own uplink arrives in the same eight families with pod="" and
+  # namespace="", so a filter on the family name alone reports the sandbox
+  # node's traffic under a heading that says worker. A Pod of another namespace
+  # and a non-worker Pod of this one are the other two rows that must not pass.
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  export COZY_REPORT_DIR="$tmp"
+  COZY_SNAPSHOT_NAME=kubernetes-latest
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_node_names="node-a"
+  other_ns=$(printf 'container="",interface="eth0",namespace="cozy-system",pod="virt-launcher-elsewhere"')
+  other_pod=$(printf 'container="",interface="eth0",namespace="tenant-test",pod="kubernetes-test-latest-version-kube-apiserver-0"')
+  kubectl_raw_output="$(node_series; worker_series "$worker_labels"; worker_series "$other_ns"; worker_series "$other_pod")"
+
+  run_capture
+
+  out="$tmp/snapshots/kubernetes-latest/tenant-network-counters/node-a.txt"
+  assert_file_contains "pod=\"${worker_pod}\"" "$out"
+  assert_file_lacks_pattern 'pod=""' "$out"
+  assert_file_lacks_pattern 'cozy-system' "$out"
+  assert_file_lacks_pattern 'kube-apiserver' "$out"
+  rm -rf "$tmp"
+}
+
+@test "a kubelet that never answered is reported as unknown, not as a link that moved nothing" {
+  # The conflation this collector exists to prevent. Zero bytes captured is the
+  # same bytes on disk whether the worker received nothing or the kubelet was
+  # never read, and only the note tells them apart. Keyed on the exit status
+  # rather than on stderr, because `timeout` kills its child without a word and
+  # kubectl dies on SIGTERM the same way, so the dominant failure arrives
+  # non-zero with an empty error log.
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  export COZY_REPORT_DIR="$tmp"
+  COZY_SNAPSHOT_NAME=kubernetes-latest
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_node_names="node-a"
+  kubectl_raw_output=
+  kubectl_raw_rc=1
+  kubectl_raw_stderr='Error from server (Forbidden): nodes "node-a" is forbidden'
+
+  run_capture
+
+  out="$tmp/snapshots/kubernetes-latest/tenant-network-counters/node-a.txt"
+  assert_file_contains 'is unknown' "$out"
+  assert_file_contains 'the kubelet was not read' "$out"
+  assert_file_lacks_pattern 'reported no network series' "$out"
+  # The trailing note is gated on series having arrived, and only the "it
+  # appears" direction was pinned. Ungated it would attach "these counters are
+  # cumulative..." to a capture holding no counters, which reads as counters
+  # that exist. The CPU sibling pins its own note both ways for this reason.
+  assert_file_lacks_pattern 'cumulative' "$out"
+  assert_file_contains 'forbidden' \
+    "$tmp/snapshots/kubernetes-latest/tenant-network-counters/node-a.read-error.log"
+  rm -rf "$tmp"
+}
+
+@test "a kubelet that answered without worker rows says which of the two shapes it saw" {
+  # Two empty results with different fixes. A namespace present but carrying no
+  # virt-launcher-* Pod is a filter problem -- what an upstream rename of the
+  # prefix looks like from inside -- and is fixed by looking at what the prefix
+  # is now. A node with none of this namespace on it is a scheduling reading and
+  # is fixed by looking at where the workers went. Naming the wrong one costs
+  # the reader the finding.
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  export COZY_REPORT_DIR="$tmp"
+  COZY_SNAPSHOT_NAME=kubernetes-latest
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_node_names="node-a"
+  renamed=$(printf 'container="",interface="eth0",namespace="tenant-test",pod="compute-launcher-md0-abc12-xyz34"')
+  kubectl_raw_output="$(worker_series "$renamed")"
+
+  run_capture
+
+  out="$tmp/snapshots/kubernetes-latest/tenant-network-counters/node-a.txt"
+  assert_file_contains 'none of them from a worker Pod named virt-launcher-*' "$out"
+  assert_file_lacks_pattern 'no network series for a tenant-test worker' "$out"
+
+  # And the other shape, on a node carrying nothing of this namespace.
+  rm -rf "$tmp/snapshots"
+  kubectl_raw_output="$(node_series)"
+  run_capture
+  assert_file_contains 'reported no network series for a tenant-test worker on this node' "$out"
+  assert_file_lacks_pattern 'none of them from a worker Pod' "$out"
+  rm -rf "$tmp"
+}
+
+@test "a filter that could not read its input is not reported as a kubelet with nothing to say" {
+  # grep exits 1 for "read it, no match" and 2 for "could not read" -- a full
+  # scratch directory on the runner reaches the second. Folded together they
+  # land in the arm asserting the kubelet answered and carried no worker series,
+  # which is a claim about the cluster manufactured by a local failure.
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  export COZY_REPORT_DIR="$tmp"
+  COZY_SNAPSHOT_NAME=kubernetes-latest
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_node_names="node-a"
+  kubectl_raw_output="$(worker_series "$worker_labels")"
+  # grep 2 is what an unreadable input produces; the stub stands in for it
+  # without needing a full disk. Scoped to the calls that read a FILE, which is
+  # what the three filter stages do -- the node listing pipes through a grep of
+  # its own, and failing that one instead would empty the walk and test nothing.
+  grep() {
+    local _last
+    eval "_last=\${$#}"
+    if [ -f "${_last}" ]; then
+      return 2
+    fi
+    command grep "$@"
+  }
+
+  run_capture
+  unset -f grep
+
+  out="$tmp/snapshots/kubernetes-latest/tenant-network-counters/node-a.txt"
+  assert_file_contains 'could not be read back on this runner' "$out"
+  assert_file_lacks_pattern 'reported no network series' "$out"
+  rm -rf "$tmp"
+}
+
+@test "the counters are labelled as totals since the sandbox started, not as a rate" {
+  # The reading this capture is most likely to be misread as. Every family here
+  # is cumulative from the Pod's sandbox coming up, so a drop count of 285 says
+  # nothing about the minutes the node-join deadline covered -- a link that
+  # dropped nothing during the failure and a link that dropped throughout carry
+  # the same total if the earlier traffic was the same. Saying so in the file is
+  # the whole mitigation: a rate needs a second capture of the same stream, and
+  # nothing in the artifact would otherwise say the number is not one.
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  export COZY_REPORT_DIR="$tmp"
+  COZY_SNAPSHOT_NAME=kubernetes-latest
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_node_names="node-a"
+  kubectl_raw_output="$(worker_series "$worker_labels")"
+
+  run_capture
+
+  out="$tmp/snapshots/kubernetes-latest/tenant-network-counters/node-a.txt"
+  assert_file_contains 'cumulative' "$out"
+  rm -rf "$tmp"
+}
+
+@test "a listing that never answered is not reported as a namespace with no workers" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  export COZY_REPORT_DIR="$tmp"
+  COZY_SNAPSHOT_NAME=kubernetes-latest
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_list_rc=1
+  kubectl_list_stderr='Unable to connect to the server'
+
+  rc=0
+  run_capture || rc=$?
+
+  [ "$rc" -ne 0 ]
+  err="$tmp/snapshots/kubernetes-latest/tenant-network-counters/COLLECTION-FAILED.txt"
+  assert_file_contains 'failed to list' "$err"
+  assert_file_contains 'Unable to connect to the server' "$err"
+  rm -rf "$tmp"
+}
+
+@test "a namespace with no scheduled worker says so instead of writing an empty tree" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  export COZY_REPORT_DIR="$tmp"
+  COZY_SNAPSHOT_NAME=kubernetes-latest
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_node_names=
+
+  rc=0
+  run_capture || rc=$?
+
+  [ "$rc" -ne 0 ]
+  assert_file_contains 'no kubelet to ask' \
+    "$tmp/snapshots/kubernetes-latest/tenant-network-counters/COLLECTION-FAILED.txt"
+  rm -rf "$tmp"
+}
+
+@test "the node walk stops at its cap and says how many carried a worker" {
+  # A cap that drops nodes silently answers for part of the cluster while
+  # reading as though it answered for all of it.
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  export COZY_REPORT_DIR="$tmp"
+  COZY_SNAPSHOT_NAME=kubernetes-latest
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_node_names="node-a node-b node-c node-d"
+  kubectl_raw_output="$(worker_series "$worker_labels")"
+
+  run_capture
+
+  dir="$tmp/snapshots/kubernetes-latest/tenant-network-counters"
+  assert_file_contains '4 carried a worker in total' "$dir/COLLECTION-TRUNCATED.txt"
+  [ ! -f "$dir/node-d.txt" ]
+  rm -rf "$tmp"
+}
+
+@test "the read is bounded and the timeout-absent fallback still reads" {
+  # Bounding with a binary that is not there turns every read into an exit 127
+  # and every note into "the kubelet refused" -- a missing local dependency
+  # reported as the cluster failing. The sibling collectors guard the call with
+  # command -v for that reason and this one is held to the same shape.
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  export COZY_REPORT_DIR="$tmp"
+  COZY_SNAPSHOT_NAME=kubernetes-latest
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_node_names="node-a"
+  kubectl_raw_output="$(worker_series "$worker_labels")"
+
+  run_capture
+
+  # Bounded: the wrapper saw the raw read, in the -k form the stub demands.
+  grep -q 'metrics/cadvisor' "$timeout_calls"
+  out="$tmp/snapshots/kubernetes-latest/tenant-network-counters/node-a.txt"
+  assert_file_contains 'container_network_receive_bytes_total{' "$out"
+
+  # And without `timeout` on PATH the read still happens rather than exiting 127.
+  rm -rf "$tmp/snapshots"
+  command() {
+    if [ "${1:-}" = -v ] && [ "${2:-}" = timeout ]; then
+      return 1
+    fi
+    builtin command "$@"
+  }
+  run_capture
+  unset -f command
+  assert_file_contains 'container_network_receive_bytes_total{' "$out"
+  assert_file_lacks_pattern 'is unknown' "$out"
+  rm -rf "$tmp"
+}
+
+@test "a read cut short keeps what arrived and marks it incomplete" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  export COZY_REPORT_DIR="$tmp"
+  COZY_SNAPSHOT_NAME=kubernetes-latest
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_node_names="node-a"
+  kubectl_raw_output="$(worker_series "$worker_labels")"
+  timeout_fail_node=node-a
+
+  run_capture
+
+  out="$tmp/snapshots/kubernetes-latest/tenant-network-counters/node-a.txt"
+  assert_file_contains 'these counters are incomplete' "$out"
+  assert_file_contains 'container_network_receive_bytes_total{' "$out"
+  assert_file_contains '[exit 124:' "$out"
+  rm -rf "$tmp"
+}
+
+@test "a node read whose status never arrived is not written up as a kubelet that answered" {
+  # The default behind `rc=${rc:-137}`, and the only route to it. The status
+  # comes back through a command substitution now, so a subshell killed outright
+  # returns nothing at all -- and the value chosen for that case decides which
+  # sentence the artifact carries. Zero is the one value meaning "the kubelet
+  # answered", so defaulting there would take the single conclusion this
+  # collector may never manufacture and manufacture it from a local failure.
+  #
+  # Written because the default had none: flipping it back to `:-0` left every
+  # suite in this tree green while a killed read was reported as a quiet link.
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  export COZY_REPORT_DIR="$tmp"
+  COZY_SNAPSHOT_NAME=kubernetes-latest
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_node_names="node-a"
+  # Writes the sinks and returns nothing on stdout: what a killed substitution
+  # leaves behind. Stubbed at the helper because no mock of kubectl can produce
+  # an empty command substitution while the function still runs.
+  _cozy_cadvisor_node_stream() { : >"$2"; : >"$3"; }
+
+  run_capture
+
+  out="$tmp/snapshots/kubernetes-latest/tenant-network-counters/node-a.txt"
+  assert_file_contains 'the kubelet was not read' "$out"
+  assert_file_contains '[exit 137:' "$out"
+  assert_file_lacks_pattern 'reported no network series' "$out"
+  # And the trailing note stays away from a capture that holds no counters: it
+  # describes numbers that are not there, and beside an unknown it reads as
+  # counters that exist.
+  assert_file_lacks_pattern 'cumulative' "$out"
+  rm -rf "$tmp"
+}
+
+@test "every interface of a bridge-bound worker survives the filter, dummy and NIC alike" {
+  # The reading this capture is most easily inverted by. A bridge-bound worker
+  # presents four interfaces in its Pod netns, and the one named eth0 is a dummy
+  # that holds the Pod IP and carries no traffic -- so it reports zero, and it is
+  # the row a reader reaches for first because of its name. The number that
+  # answers is the renamed NIC's receive.
+  #
+  # The filter therefore carries no interface predicate, and this pins that:
+  # keeping only one interface would either drop the answer or leave the reader
+  # holding the zero. Which row means what is stated where the collector is
+  # gated; what this test guarantees is that both are in the artifact to compare.
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  export COZY_REPORT_DIR="$tmp"
+  COZY_SNAPSHOT_NAME=kubernetes-latest
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_node_names="node-a"
+  kubectl_raw_output="$(node_series; bridge_bound_worker)"
+
+  run_capture
+
+  out="$tmp/snapshots/kubernetes-latest/tenant-network-counters/node-a.txt"
+  for iface in eth0 eth0-nic k6t-eth0 tap0; do
+    assert_file_contains "interface=\"${iface}\"" "$out"
+  done
+  # The dummy really is staged at zero and the NIC is not, so "both survive" is
+  # a statement about two distinguishable rows rather than two copies.
+  grep -q "^container_network_receive_bytes_total{.*interface=\"eth0\".*} 0 " "$out"
+  grep -q "^container_network_receive_bytes_total{.*interface=\"eth0-nic\".*} 4.4040192e+07 " "$out"
+  # And the node's own interfaces still do not reach a worker heading.
+  assert_file_lacks_pattern 'pod=""' "$out"
+  rm -rf "$tmp"
+}
diff --git a/hack/run-kubernetes-node-join_test.bats b/hack/run-kubernetes-node-join_test.bats
new file mode 100644
index 0000000000..42dbe2f11c
--- /dev/null
+++ b/hack/run-kubernetes-node-join_test.bats
@@ -0,0 +1,2361 @@
+#!/usr/bin/env bats
+# -----------------------------------------------------------------------------
+# Unit tests for cozy_report_node_join_failure in
+# hack/e2e-chainsaw/_lib/run-kubernetes.sh -- the diagnostics the kubernetes-*
+# suites emit when fewer than 2 tenant nodes become Ready inside the 29m
+# deadline.
+#
+# What these pin is not what the block prints but that it finishes. It runs
+# exactly when the cluster is misbehaving, and its first read goes through the
+# tenant kubeconfig to the tenant apiserver -- the component least likely to
+# answer in a node-join failure. So every read carries its own wall-clock bound
+# and every walk a cap, because an unbounded read here does not lose only
+# itself: it holds the Chainsaw op until the op is killed, and the tenant
+# crust-gather snapshot the caller reaches after it is then lost rather than
+# truncated.
+#
+# The kubectl stub hangs, refuses and answers in part on purpose. A stub that
+# always answers cleanly would leave every test here green against an entirely
+# unbounded implementation, which is the state this suite was written against.
+#
+# The block also calls talos_image_cache_diagnose (hack/e2e-chainsaw/_lib/
+# talos-image-cache.sh), whose reads are bounded for the same reason and are
+# covered here rather than in that file's own suite, which is mock-free by
+# design. Its reachability re-probe is deliberately not bounded there: it spends
+# its budget inside a Pod it creates, and shrinking that budget would change
+# which image factory the happy path picks.
+#
+# CI runs this file under Bats through `make bats-unit-tests`. It also remains
+# compatible with the legacy `hack/cozytest.sh` translator, which ends an @test
+# block at the first bare closing brace, so command mocks stay at top level and
+# assertions avoid `run` and `$status`. EXIT-trap
+# cleanup is banned in hack/*.bats and frozen by a guard in hack/cozyreport.bats,
+# so each test removes its own temp dir on its last line.
+#
+# Run with: bats hack/run-kubernetes-node-join_test.bats
+# -----------------------------------------------------------------------------
+
+load test_helper
+
+kubectl_calls=/dev/null
+unbounded_calls=/dev/null
+timeout_calls=/dev/null
+# Set by the timeout mock around the command it runs, so the kubectl mock can
+# record which reads reached it without a bound. This is the whole point of the
+# pair: asserting on the timeout log alone proves that SOME reads are bounded,
+# never that none escaped.
+in_bound=0
+kubectl_fail_match=
+kubectl_fail_rc=1
+timeout_fail_match=
+timeout_fail_rc=124
+importer_pod_names=
+kubectl_gate_output=
+# Fixed clock. `date +%s` decides whether the phase still has budget, so the
+# tests that are about that decision have to own the clock rather than race it.
+date_now=
+
+kubectl() {
+  printf '%s\n' "$*" >>"${kubectl_calls}"
+  if [ "${in_bound}" != 1 ]; then
+    printf '%s\n' "$*" >>"${unbounded_calls}"
+  fi
+
+  if [ -n "${kubectl_fail_match}" ]; then
+    case "$*" in
+      *"${kubectl_fail_match}"*) return "${kubectl_fail_rc}" ;;
+    esac
+  fi
+
+  case "$*" in
+    *"get pods -l kubevirt.io=virt-launcher"*"spec.nodeName"*)
+      # One node, so the throttle capture proceeds past its listing into the
+      # per-node kubelet read. Without this the walk ends at an empty node set
+      # and the audit only ever sees the listing -- an unbounded `get --raw`
+      # added later would slip past the one instrument that watches it.
+      #
+      # Narrowed to the node-name projection because two other reads in this
+      # block carry the same label selector, and a node name is not an answer
+      # either of them could have received.
+      printf 'srv1\n'
+      return 0
+      ;;
+    *"get nodes"*"InternalIP"*)
+      # Name and address, the shape the sandbox CPU time capture asks for. One
+      # node, so the walk proceeds past its listing into the per-node Talos
+      # read -- the read the audit above is the only instrument for.
+      printf 'srv1|192.0.2.11\n'
+      return 0
+      ;;
+    *"get pods -o name"*)
+      [ -z "${importer_pod_names}" ] || printf '%s\n' ${importer_pod_names}
+      return 0
+      ;;
+    *"get deploy talos-image-cache"*)
+      # Empty stdout with exit 0 is what --ignore-not-found returns for a cache
+      # that is not deployed, which is the default here.
+      [ -z "${kubectl_gate_output}" ] || printf '%s\n' "${kubectl_gate_output}"
+      return 0
+      ;;
+  esac
+  return 0
+}
+
+# The sandbox nodes are read over the Talos API rather than through the
+# apiserver, so a mock for kubectl alone leaves those reads outside the audit
+# above: an unbounded talosctl call would hold the op exactly as an unbounded
+# kubectl one does. Recorded through the same in_bound pair for that reason.
+talosctl_calls=/dev/null
+talosctl() {
+  printf '%s\n' "$*" >>"${talosctl_calls}"
+  if [ "${in_bound}" != 1 ]; then
+    printf '%s\n' "$*" >>"${unbounded_calls}"
+  fi
+  # A plausible /proc/stat first line. The collector files a note when the read
+  # returns nothing, so a mock that printed nothing would drive every test here
+  # down that arm instead of the one being exercised.
+  printf 'cpu  10 0 5 900 1 0 0 7 4000 0\n'
+}
+
+# The sampling interval is a real wait in production and a recorded call here.
+# Without the mock every test that drives the block would pay it in wall clock;
+# with it, the log is also what pins the interval being taken ONCE for both
+# collectors rather than once each.
+sleep_calls=/dev/null
+sleep() {
+  printf '%s\n' "$*" >>"${sleep_calls}"
+}
+
+date() {
+  if [ -n "${date_now}" ] && [ "${1:-}" = +%s ]; then
+    printf '%s\n' "${date_now}"
+    return 0
+  fi
+  command date "$@"
+}
+
+timeout() {
+  local rc=0
+  printf '%s\n' "$*" >>"${timeout_calls}"
+  # The idiom every bounded read in this tree uses is `timeout -k <grace> <n>`.
+  # Anything else reaching this mock is a read bonded some other way, and 97 is
+  # a status no kubectl produces, so it cannot be mistaken for the read's own.
+  [ "${1:-}" = -k ] || return 97
+  shift 3
+
+  if [ -n "${timeout_fail_match}" ]; then
+    case " $* " in
+      # A killed read is modelled as producing nothing: `timeout` SIGKILLs the
+      # child, so the command may never write a byte. Returning before running
+      # it is what makes the "cut off" note the only trace of that read.
+      *"${timeout_fail_match}"*) return "${timeout_fail_rc}" ;;
+    esac
+  fi
+
+  in_bound=1
+  "$@" || rc=$?
+  in_bound=0
+  return "${rc}"
+}
+
+# Point a test's report dir at its own temp dir.
+#
+# The collectors this file drives write into COZY_REPORT_DIR. Unset, the
+# library falls back to /workspace/_out, which is not writable under the bare
+# `bats` binary. The collector does not die there -- its call site's `|| true`
+# suspends set -e for the whole body, so mkdir fails, the reads then fail on
+# their own redirects into the directory that was never created, and any
+# assertion about those reads fails for a reason that has nothing to do with
+# the code. cozytest.sh hides this by defaulting the variable to a
+# repo-relative path, so the two runners disagree, which is the divergence
+# docs/agents/e2e-testing.md warns about. Pointing it at the temp dir also
+# keeps the suite from writing into _out/ under the snapshot name the real e2e
+# uses.
+#
+# Called from every test that stages a temp dir -- 20 of the 22 here; the two
+# that do not are pure source greps over the library and stage nothing. Among
+# the 20 are the four whose work happens inside a
+# `bash -c` subprocess. Exported so it reaches those too: they stub every
+# collector today and write nothing, but a stub that later grows a real read
+# would put its report under the tree the e2e run uses, and the call that was
+# supposed to prevent that would have been decorative the whole time.
+#
+# Assigned per test rather than in a bats `setup`: cozytest.sh calls each @test
+# body directly and never runs setup, so a setup-based version would work under
+# one runner and not the other -- the same divergence one level up.
+use_temp_report_dir() {
+  export COZY_REPORT_DIR="$1/report"
+}
+
+# The sandbox CPU time capture refuses to read anything without a talosconfig,
+# and says so rather than leaving an empty directory. Tests that are about the
+# reads have to get past that, and tests that are about the refusal have to be
+# sure the file is absent -- which is not the same as leaving TALOSCONFIG unset,
+# since the fallback path is repo-relative and a developer's tree can carry a
+# stale one from a local sandbox run. Both directions are therefore explicit.
+stage_sandbox_talosconfig() {
+  printf 'context: e2e\n' >"$1/talosconfig"
+  export TALOSCONFIG="$1/talosconfig"
+}
+
+no_sandbox_talosconfig() {
+  export TALOSCONFIG="$1/talosconfig-absent"
+}
+
+# A fresh `bash -c` sees none of the function mocks above, and `timeout` execs
+# its argument, so a read can reach the real kubectl past a stub the subshell
+# does define. These executables go first on that subshell's PATH and record
+# every call into $1/exec.calls, so a test can fail on a call nothing stubbed.
+stage_exec_recorders() {
+  mkdir -p "$1/exec-bin"
+  for c in kubectl talosctl; do
+    printf '#!/bin/sh\necho "%s $*" >>"%s/exec.calls"\nexit 1\n' "$c" "$1" >"$1/exec-bin/$c"
+    chmod +x "$1/exec-bin/$c"
+  done
+}
+
+assert_no_exec_calls() {
+  if [ -s "$1/exec.calls" ]; then
+    echo "FAIL: a cluster client was executed past its stub:" >&2
+    cat "$1/exec.calls" >&2
+    false
+  fi
+}
+
+# The block calls collectors that have their own suites and their own bounds.
+# The ones here are stubbed everywhere; the ones under stub_gated_collectors
+# below are stubbed only where the test is about the budget rather than the
+# reads, for the reason given there. Stubbed after sourcing so these tests are
+# about the block's own reads; left un-stubbed they would drag a Certificate, a
+# helper Pod and a cache probe into every case here.
+stub_collectors() {
+  cozy_report_guest_console_wedge() { printf 'wedge-stub\n'; }
+  cozy_capture_tenant_serial_console() { printf 'serial-console-stub\n'; }
+  cozy_capture_tenant_talos() { printf 'talos-stub\n'; }
+  talos_image_cache_diagnose() { printf 'image-cache-stub\n'; }
+  # Stubbed here rather than left to the gated set, and the audit below loses
+  # nothing by it: that audit works by letting real collector bodies reach the
+  # kubectl mock and failing on any read taken outside a `timeout` wrapper, and
+  # this one issues no kubectl read at all -- it shells out to `unshare` and
+  # `mount`. Un-stubbed it does that for real, so on Linux the unit suite
+  # attempts to mount debugfs with whatever privileges the host gives it -- this
+  # suite runs from `make unit-tests` on an ordinary VM rather than in the
+  # privileged sandbox container, so whether the attempt succeeds is the host's
+  # answer and not the code's -- while on macOS there is no `unshare` at all and
+  # the collector stops at its own precondition, so the path is never exercised.
+  # A unit test whose result is set by the machine rather than by the code is
+  # the property being removed, and the `timeout` mock in this file is a
+  # pass-through, so a `mount` that hung would hang the suite with no ceiling to
+  # stop it.
+  cozy_capture_sandbox_kvm_exits() { printf 'kvm-exits-stub\n'; }
+  # The two readings beside it, stubbed on the same ground and for a sharper
+  # version of it: neither issues a kubectl read, so neither contributes to the
+  # audit below, and un-stubbed they do not probe the host -- they READ it. One
+  # cats the runner's real /proc/stat and the other walks the whole of /proc,
+  # opening a comm file per process on the machine running `make unit-tests`.
+  # The result of a case here would then be set by whatever else that machine
+  # happens to be running, which is the property this file removes.
+  cozy_capture_runner_kernel_cpu_time() { printf 'runner-kernel-cpu-stub\n'; }
+  cozy_capture_sandbox_qemu_thread_cpu() { printf 'sandbox-qemu-thread-stub\n'; }
+  # Stubbed on the same ground and for a sharper version of it again: the canary
+  # issues no kubectl read either, so it contributes nothing to the audit below,
+  # and un-stubbed it does not read this machine -- it LOADS it, occupying a
+  # core for a couple of seconds on every case that drives the block. What it
+  # would then record is set by whatever else is running on the machine, which
+  # is the property this file removes.
+  cozy_capture_runner_canary() { printf 'runner-canary-stub\n'; }
+}
+
+# The collectors below are deliberately NOT in stub_collectors, and that is
+# load-bearing rather than an omission. The block-level audit above --
+# "no node join diagnostic read escapes a wall clock bound" -- works by letting
+# the real collectors run against the kubectl mock and failing on any read that
+# reached it outside a `timeout` wrapper. Stubbing a collector there does not
+# make that test pass more easily; it removes the collector from the audit
+# entirely, and the test stays green because there is nothing left to audit.
+# Each of them carries reads the audit is the only instrument that sees: every
+# cAdvisor capture issues a Pod listing and a node read apiece. Their own suites
+# substitute a grep over the source, which by construction cannot see a read
+# that was added without a bound.
+#
+# They are stubbed only where the test is about the phase budget rather than
+# about the reads, which is the one place their real bodies would drown the
+# signal.
+stub_gated_collectors() {
+  cozy_capture_tenant_worker_cpu_throttle() { printf 'cpu-throttle-stub\n'; }
+  cozy_capture_tenant_worker_network_counters() { printf 'network-counters-stub\n'; }
+  cozy_capture_tenant_worker_block_io() { printf 'block-io-stub\n'; }
+  cozy_capture_sandbox_node_cpu_time() { printf 'sandbox-cpu-time-stub\n'; }
+  cozy_capture_tenant_worker_thread_cpu() { printf 'thread-cpu-stub\n'; }
+}
+
+assert_file_contains() {
+  local needle="$1"
+  local file="$2"
+
+  case "$(cat "${file}")" in
+    *"${needle}"*) return 0 ;;
+  esac
+  printf 'expected %s to contain: %s\n' "${file}" "${needle}" >&2
+  return 1
+}
+
+# The sibling suites' three-way split, and here for the same reason. A bare
+# `! grep -q` succeeds on a file that does not exist, which is
+# indistinguishable from the file existing without the pattern; and awk exits 1
+# for "no line matched" and 2 for "I could not evaluate this", so folding those
+# together lets a broken matcher satisfy a negative assertion. A positive
+# assertion fails loudly when its matcher breaks and gets fixed; this one would
+# go green and stay green.
+assert_file_lacks_pattern() {
+  local pattern="$1"
+  local file="$2"
+  local _rc=0
+
+  if [ ! -f "${file}" ]; then
+    printf 'expected %s to exist so it could be checked for: %s\n' "${file}" "${pattern}" >&2
+    return 1
+  fi
+  awk -v pattern="${pattern}" '$0 ~ pattern { found = 1 } END { exit found ? 0 : 1 }' "${file}" || _rc=$?
+  case "${_rc}" in
+    0)
+      printf 'expected %s not to match: %s\n' "${file}" "${pattern}" >&2
+      return 1
+      ;;
+    1) return 0 ;;
+    *)
+      printf 'awk could not evaluate pattern %s against %s\n' "${pattern}" "${file}" >&2
+      return 1
+      ;;
+  esac
+}
+
+# The ceilings both budget guards below price their sums from, read out of the
+# helper rather than restated in each. They are the same numbers held against
+# two different bounds -- the phase budget from below, the operation window from
+# above -- so a second copy of any of them is a scheduled divergence between the
+# two guards.
+#
+# Sets bound, grace, canary, arms, qemu_reads and wedge. Returns non-zero when
+# one of them could not be read: a guard that lost an input sums it as zero and
+# then reports success for the term it no longer covers.
+read_cost_inputs() {
+  local lib="$1"
+  local qemu_pids v n
+
+  bound=$(grep -oE '^COZY_DIAG_READ_TIMEOUT_DEFAULT=[0-9]+' "$lib" | head -n 1 | sed -E 's/.*=//')
+  grace=$(grep -oE '^COZY_DIAG_READ_GRACE_DEFAULT=[0-9]+' "$lib" | head -n 1 | sed -E 's/.*=//')
+  # The canary declares a ceiling of its own rather than taking the read bound,
+  # so whatever is priced from it is priced from that number and not from
+  # `bound`. Read from source for the reason every input here is: a ceiling
+  # raised there and left alone in a guard would be summed at the old figure
+  # while the guard went on reading as satisfied.
+  canary=$(grep -oE '^COZY_CANARY_RUN_BOUND_DEFAULT=[0-9]+' "$lib" | head -n 1 | sed -E 's/.*=//')
+  # The wedge check does not take the shared read bound either: it carries its
+  # own ceiling on its own call, so it is read off that call.
+  wedge=$(awk '/^cozy_report_guest_console_wedge\(\)/,/^}/' "$lib" \
+    | grep -oE 'timeout -k [0-9]+ [0-9]+ kubectl' | head -n 1 \
+    | awk '{print $3 + $4}')
+  # How many sandbox pid files the QEMU thread reading opens. Each is a bounded
+  # call of its own, so that collector spends one ceiling per file and one more
+  # for the probe walk -- a cost a guard that counts it as a single read
+  # under-prices by the whole loop.
+  qemu_pids=$(awk '/^cozy_capture_sandbox_qemu_thread_cpu\(\)/,/^}/' "$lib" \
+    | grep -oE '^  for srv in [0-9 ]+; do' | head -n 1 \
+    | sed -E 's/^  for srv in //; s/; do$//' | wc -w | tr -d ' ')
+  # The canary's arms, counted rather than written as a multiplier: each runs
+  # under a ceiling of its own, so an arm added there costs another one, and a
+  # literal would go on reading as satisfied while the collector spent more than
+  # the guards say it can.
+  arms=$(awk '/^cozy_capture_runner_canary\(\)/,/^}/' "$lib" \
+    | grep -c '^  if _cozy_canary_report_arm ' || true)
+
+  for v in bound grace canary wedge; do
+    eval "n=\$$v"
+    if [ -z "$n" ]; then
+      printf 'expected to read %s from %s; without it a guard sums that term as zero and reports success for having lost its input\n' "$v" "$lib" >&2
+      return 1
+    fi
+  done
+  # Both of these are COUNTS, and a count that found nothing is `0` rather than
+  # nothing -- `wc -w` on an empty pipeline and `grep -c` on no match both print
+  # it. Checking them for emptiness would therefore pass on exactly the input
+  # loss it is meant to catch, and the term would be summed at one arm and one
+  # read instead of what the collectors spend.
+  for v in qemu_pids arms; do
+    eval "n=\$$v"
+    if [ -z "$n" ] || [ "$n" -lt 1 ]; then
+      printf 'read %s as "%s" from %s; that is a count of nothing, so a guard would price the collector it belongs to at nothing\n' "$v" "$n" "$lib" >&2
+      return 1
+    fi
+  done
+  qemu_reads=$((qemu_pids + 1))
+}
+
+@test "no node join diagnostic read escapes a wall clock bound" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  stub_collectors
+  tmp=$(mktemp -d)
+  use_temp_report_dir "$tmp"
+  stage_sandbox_talosconfig "$tmp"
+  kubectl_calls="$tmp/kubectl.calls"
+  unbounded_calls="$tmp/unbounded.calls"
+  timeout_calls="$tmp/timeout.calls"
+  talosctl_calls="$tmp/talosctl.calls"
+  sleep_calls="$tmp/sleep.calls"
+  : >"$unbounded_calls"
+  importer_pod_names='pod/importer-md0-a pod/importer-md0-b'
+
+  ( set +x; cozy_report_node_join_failure test-latest-version ) >"$tmp/out" 2>&1
+
+  # One unbounded read is the whole defect: against a wedged tenant apiserver it
+  # holds the op to its 67m ceiling, and everything scheduled after it -- the
+  # tenant crust-gather snapshot above all -- is lost rather than truncated.
+  if [ -s "$unbounded_calls" ]; then
+    echo "FAIL: these reads ran with no wall-clock bound:" >&2
+    cat "$unbounded_calls" >&2
+    false
+  fi
+  # And the block did read: without this the check above passes just as well on
+  # an implementation that reads nothing at all.
+  [ "$(grep -c . "$kubectl_calls")" -ge 11 ]
+  # Named collectors, not just a count. The gated collectors below are the ones
+  # this audit is the only instrument for, and each is one line away from
+  # vanishing from it: moving its stub into stub_collectors takes it out of the
+  # run entirely, and every suite stays green because the audit has nothing left
+  # to look at. A count cannot notice that -- the other reads keep it satisfied
+  # -- so each collector is pinned individually.
+  #
+  # Pinned by the report directory each capture writes, not by a read only it
+  # issues. The cAdvisor captures run one shared body, so their Pod listing
+  # and node read are byte-identical and neither has a read of its own: a
+  # listing-keyed pin is satisfied by whichever of them ran, and stays green
+  # with the other absent from the audit entirely. The directory is the one
+  # thing each produces alone.
+  # Keyed on the directory having CONTENT, not on the directory existing. Each
+  # capture mkdir -p's its report directory before it lists anything, so an
+  # empty one is exactly what a capture that issued no read leaves behind -- and
+  # that is the state this pin has to reject, since a capture missing from the
+  # audit is a capture whose reads nobody bounded.
+  for subdir in tenant-cpu-throttle tenant-network-counters tenant-block-io sandbox-host-cpu-time; do
+    dir="$COZY_REPORT_DIR/snapshots/kubernetes/$subdir"
+    if [ -z "$(find "$dir" -type f 2>/dev/null | head -n 1)" ]; then
+      echo "FAIL: $subdir produced no file, so that capture issued no read and its reads were not audited" >&2
+      ls -la "$COZY_REPORT_DIR/snapshots/kubernetes" >&2 || true
+      false
+    fi
+  done
+  rm -rf "$tmp"
+}
+
+@test "the counters are read twice, one interval apart, and the interval is paid once" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  stub_collectors
+  tmp=$(mktemp -d)
+  use_temp_report_dir "$tmp"
+  stage_sandbox_talosconfig "$tmp"
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  talosctl_calls="$tmp/talosctl.calls"
+  sleep_calls="$tmp/sleep.calls"
+  : >"$sleep_calls"
+  COZY_DIAG_RATE_INTERVAL=7
+
+  ( set +x; cozy_report_node_join_failure test-latest-version ) >"$tmp/out" 2>&1
+
+  # A single reading of either subject is an average over an uptime: every
+  # counter on both sides is cumulative, so one file says what the container has
+  # used since it started and nothing about the window the deadline covered. The
+  # pair is the instrument, and a second reading that never happened leaves a
+  # directory that looks collected.
+  for subject in tenant-cpu-throttle sandbox-host-cpu-time; do
+    for sample in 1 2; do
+      dir="$COZY_REPORT_DIR/snapshots/kubernetes/$subject/sample-$sample"
+      if [ -z "$(find "$dir" -type f 2>/dev/null | head -n 1)" ]; then
+        echo "expected $subject to leave a reading under sample-$sample" >&2
+        ls -R "$COZY_REPORT_DIR/snapshots/kubernetes" >&2 || true
+        return 1
+      fi
+    done
+  done
+  # Once, not once per subject. Both subjects answer the same question about the
+  # same window, so they are read on either side of one wait; paid per subject
+  # the wait would be the larger half of what this pair adds to a failing run,
+  # and the two windows would no longer line up.
+  waits=$(grep -c . "$sleep_calls" || true)
+  if [ "$waits" -ne 1 ]; then
+    echo "expected exactly one interval between the two readings; got $waits" >&2
+    cat "$sleep_calls" >&2
+    return 1
+  fi
+  assert_file_contains '7' "$sleep_calls"
+  rm -rf "$tmp"
+}
+
+@test "an interval that would put both readings at the same instant is refused" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  stub_collectors
+  stub_gated_collectors
+  tmp=$(mktemp -d)
+  use_temp_report_dir "$tmp"
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  sleep_calls="$tmp/sleep.calls"
+  : >"$sleep_calls"
+  # Zero is all digits and passes every check the other knobs make, and it is
+  # the one value that leaves this pair collected and meaningless: two readings
+  # at the same instant subtract to nothing. Unlike the read bounds, where zero
+  # removes a ceiling, here it removes the measurement while leaving the files.
+  COZY_DIAG_RATE_INTERVAL=0
+
+  ( set +x; cozy_report_node_join_failure test-latest-version ) >"$tmp/out" 2>&1
+
+  assert_file_contains 'ignoring COZY_DIAG_RATE_INTERVAL' "$tmp/out"
+  # The reason, not just the refusal. The shared helper's default parenthetical
+  # says zero disables a bound, which is true of every other knob it guards and
+  # false of this one: zero here removes no ceiling, it puts both readings at
+  # the same instant. A warning that names the wrong reason sends the reader to
+  # look for a ceiling that was never involved.
+  assert_file_contains 'both readings at the same instant' "$tmp/out"
+  assert_file_lacks_pattern 'COZY_DIAG_RATE_INTERVAL.*disables the bound' "$tmp/out"
+  # The default, not the rejected value: a warning that named the fallback and
+  # then used the value anyway would be worse than no warning.
+  assert_file_contains "$COZY_DIAG_RATE_INTERVAL_DEFAULT" "$sleep_calls"
+  rm -rf "$tmp"
+}
+
+@test "a sandbox with no talosconfig is recorded rather than left as an empty directory" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  stub_collectors
+  tmp=$(mktemp -d)
+  use_temp_report_dir "$tmp"
+  no_sandbox_talosconfig "$tmp"
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  sleep_calls="$tmp/sleep.calls"
+
+  ( set +x; cozy_report_node_join_failure test-latest-version ) >"$tmp/out" 2>&1
+
+  # Steal is the quantity that separates a sandbox node oversubscribed from
+  # inside from one not given its turn by the machine under it. An empty
+  # directory here reads as the first, which is a conclusion nothing observed.
+  assert_file_contains 'no sandbox talosconfig at' \
+    "$COZY_REPORT_DIR/snapshots/kubernetes/sandbox-host-cpu-time/sample-1/COLLECTION-FAILED.txt"
+  rm -rf "$tmp"
+}
+
+@test "a read cut off before it answered says so and the reads after it still run" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  stub_collectors
+  tmp=$(mktemp -d)
+  use_temp_report_dir "$tmp"
+  kubectl_calls="$tmp/kubectl.calls"
+  unbounded_calls="$tmp/unbounded.calls"
+  timeout_calls="$tmp/timeout.calls"
+  # The first read of the block, through the tenant kubeconfig -- the read the
+  # issue names as the one that hangs on a wedged tenant apiserver.
+  timeout_fail_match='describe nodes'
+  timeout_fail_rc=124
+
+  ( set +x; cozy_report_node_join_failure test-latest-version ) >"$tmp/out" 2>&1
+
+  assert_file_contains 'was cut off' "$tmp/out"
+  # A cut-off read is silence about the cluster, not a finding about it. Reported
+  # any other way, the next reader takes an empty node table for an empty cluster.
+  assert_file_contains 'absent from this log, not absent from the cluster' "$tmp/out"
+  # The reads after it are the point of bounding it. The CSR list is what
+  # separates a worker that booted and never registered from one that never
+  # booted, and it comes last in the block.
+  assert_file_contains 'get csr' "$kubectl_calls"
+  rm -rf "$tmp"
+}
+
+@test "a read killed by the grace signal is named as a kill rather than as a deadline" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  stub_collectors
+  tmp=$(mktemp -d)
+  use_temp_report_dir "$tmp"
+  kubectl_calls="$tmp/kubectl.calls"
+  unbounded_calls="$tmp/unbounded.calls"
+  timeout_calls="$tmp/timeout.calls"
+  timeout_fail_match='describe nodes'
+  timeout_fail_rc=137
+
+  ( set +x; cozy_report_node_join_failure test-latest-version ) >"$tmp/out" 2>&1
+
+  # 137 is 128+SIGKILL, which the -k grace produces and so does an OOM kill or a
+  # teardown signalling the group. Quoting the deadline there would state a cause
+  # that was never observed, and a read killed at second two is not one that ran
+  # the full twenty. Its two siblings are pinned; without this the wording can rot.
+  assert_file_contains 'was killed before it finished (SIGKILL)' "$tmp/out"
+  if grep -q "did not finish within" "$tmp/out"; then
+    echo "FAIL: a SIGKILL was reported as the deadline elapsing" >&2
+    false
+  fi
+  rm -rf "$tmp"
+}
+
+@test "lowering the diagnostic read budget after sourcing moves both of its bounds" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  stub_collectors
+  tmp=$(mktemp -d)
+  use_temp_report_dir "$tmp"
+  kubectl_calls="$tmp/kubectl.calls"
+  unbounded_calls="$tmp/unbounded.calls"
+  timeout_calls="$tmp/timeout.calls"
+  # The same property the cache-side knob is pinned for, on the caller's own knob:
+  # both the wall clock and the --request-timeout pasted beside it have to follow a
+  # value lowered after sourcing, which is the only moment a test can lower it.
+  COZY_DIAG_READ_TIMEOUT=3
+
+  ( set +x; cozy_report_node_join_failure test-latest-version ) >"$tmp/out" 2>&1
+
+  assert_file_contains '-k 5 3' "$timeout_calls"
+  assert_file_contains '--request-timeout=3s' "$kubectl_calls"
+  if grep -q -- '-k 5 20' "$timeout_calls"; then
+    echo "FAIL: the wall-clock bound stayed at 20s after the knob was lowered:" >&2
+    grep -- '-k 5 20' "$timeout_calls" >&2
+    false
+  fi
+  rm -rf "$tmp"
+}
+
+@test "a read that failed is named with its status instead of passing in silence" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  stub_collectors
+  tmp=$(mktemp -d)
+  use_temp_report_dir "$tmp"
+  kubectl_calls="$tmp/kubectl.calls"
+  unbounded_calls="$tmp/unbounded.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_fail_match='get hr'
+  kubectl_fail_rc=1
+
+  ( set +x; cozy_report_node_join_failure test-latest-version ) >"$tmp/out" 2>&1
+
+  # `|| true` on a read is how a refused call becomes indistinguishable from a
+  # resource that is not there. The status is what tells them apart.
+  assert_file_contains 'read failed (exit 1)' "$tmp/out"
+  rm -rf "$tmp"
+}
+
+@test "the importer log walk stops at its cap and records both counts" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  stub_collectors
+  tmp=$(mktemp -d)
+  use_temp_report_dir "$tmp"
+  kubectl_calls="$tmp/kubectl.calls"
+  unbounded_calls="$tmp/unbounded.calls"
+  timeout_calls="$tmp/timeout.calls"
+  importer_pod_names='pod/importer-a pod/importer-b pod/importer-c pod/importer-d pod/importer-e'
+
+  ( set +x; cozy_report_node_join_failure test-latest-version ) >"$tmp/out" 2>&1
+
+  # Two reads per Pod (current and previous), so the cap is what keeps this loop
+  # from being an unbounded term in a block whose whole purpose is to finish.
+  [ "$(grep -c 'logs pod/importer' "$kubectl_calls")" -eq 6 ]
+  # A short listing otherwise reads as a small set of importers rather than a
+  # truncated walk, which is the reading that sends the next person looking for
+  # an importer that was never printed.
+  assert_file_contains 'stopped after 3' "$tmp/out"
+  assert_file_contains '5 matched' "$tmp/out"
+  rm -rf "$tmp"
+}
+
+@test "an importer listing that failed is not reported as no importers" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  stub_collectors
+  tmp=$(mktemp -d)
+  use_temp_report_dir "$tmp"
+  kubectl_calls="$tmp/kubectl.calls"
+  unbounded_calls="$tmp/unbounded.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_fail_match='get pods -o name'
+  kubectl_fail_rc=1
+  importer_pod_names='pod/importer-a'
+
+  ( set +x; cozy_report_node_join_failure test-latest-version ) >"$tmp/out" 2>&1
+
+  # The DataVolume import stage is the sub-mode where the OS image never
+  # finishes importing. "No importer Pods" is a real finding there; a listing
+  # that never answered is not that finding, and must not be filed as it.
+  assert_file_contains 'unknown, not none' "$tmp/out"
+  if grep -q 'logs pod/importer' "$kubectl_calls"; then
+    echo "FAIL: walked an importer Pod from a listing that failed" >&2
+    false
+  fi
+  rm -rf "$tmp"
+}
+
+@test "a cache gate read that was cut off is not reported as a cache that was never deployed" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  use_temp_report_dir "$tmp"
+  kubectl_calls="$tmp/kubectl.calls"
+  unbounded_calls="$tmp/unbounded.calls"
+  timeout_calls="$tmp/timeout.calls"
+  timeout_fail_match='get deploy talos-image-cache'
+  timeout_fail_rc=124
+
+  ( set +x; talos_image_cache_diagnose ) >"$tmp/out" 2>&1
+
+  # "not deployed" is a claim about the cluster. Drawn from a read that never
+  # answered, it retires the whole cache hypothesis on this failure path -- the
+  # one the section exists to test -- on the strength of a call that failed.
+  assert_file_contains 'unknown, not no' "$tmp/out"
+  if grep -q 'not deployed' "$tmp/out"; then
+    echo "FAIL: a cut-off gate read was announced as a cache that is not deployed" >&2
+    false
+  fi
+  rm -rf "$tmp"
+}
+
+@test "a cache gate read that failed is not reported as a cache that was never deployed" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  use_temp_report_dir "$tmp"
+  kubectl_calls="$tmp/kubectl.calls"
+  unbounded_calls="$tmp/unbounded.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_fail_match='get deploy talos-image-cache'
+  kubectl_fail_rc=1
+
+  ( set +x; talos_image_cache_diagnose ) >"$tmp/out" 2>&1
+
+  # Exit 1 is what `kubectl get` returns for a refused connection, for
+  # Unauthorized and for an unrecognised kind -- not only for NotFound. Reading
+  # it as "absent" retires the cache hypothesis on the one path that tests it.
+  assert_file_contains 'unknown, not no' "$tmp/out"
+  if grep -q 'not deployed' "$tmp/out"; then
+    echo "FAIL: a failed gate read was announced as a cache that is not deployed" >&2
+    false
+  fi
+  rm -rf "$tmp"
+}
+
+@test "a cache gate that answered with nothing reports the cache as not deployed" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  use_temp_report_dir "$tmp"
+  kubectl_calls="$tmp/kubectl.calls"
+  unbounded_calls="$tmp/unbounded.calls"
+  timeout_calls="$tmp/timeout.calls"
+
+  ( set +x; talos_image_cache_diagnose ) >"$tmp/out" 2>&1
+
+  # --ignore-not-found makes absent an exit 0 with empty output, and that is a
+  # real finding: the run used the public factory, so there is nothing to probe.
+  # Without this the fix above would just report everything as unknown.
+  assert_file_contains 'not deployed' "$tmp/out"
+  assert_file_contains 'ignore-not-found' "$timeout_calls"
+  rm -rf "$tmp"
+}
+
+@test "the diagnostics phase declines the rest out loud once its budget is spent" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  stub_collectors
+  # This test is about which collectors the budget declines, so the two that
+  # stay real elsewhere are stubbed here: their reads would say nothing about
+  # the decline and their markers are what the loop below checks for absence.
+  stub_gated_collectors
+  tmp=$(mktemp -d)
+  use_temp_report_dir "$tmp"
+  kubectl_calls="$tmp/kubectl.calls"
+  unbounded_calls="$tmp/unbounded.calls"
+  timeout_calls="$tmp/timeout.calls"
+  : >"$kubectl_calls"
+  # The clock is already past the deadline when the phase opens, so every
+  # collector after cozy_diag_phase_start is declined.
+  date_now=1000000000
+  COZY_DIAG_PHASE_BUDGET=0
+
+  ( set +x; cozy_report_node_join_failure test-latest-version ) >"$tmp/out" 2>&1
+
+  # The snapshot is the artifact this budget exists to protect, and the note has
+  # to say so: a reader who finds a short bundle otherwise cannot tell a phase
+  # that ran out from a cluster with nothing to report.
+  assert_file_contains 'not collected' "$tmp/out"
+  assert_file_contains 'needs the rest of the op' "$tmp/out"
+  assert_file_contains 'nothing here was observed either way' "$tmp/out"
+  # Named per read, and named for the two whose stdout is piped through grep
+  # above all: a note on stdout there is dropped by the filter, so asserting only
+  # that SOME collector announced its decline passes while those two go silent.
+  assert_file_contains 'worker DataVolume/PVC phases: not collected' "$tmp/out"
+  assert_file_contains 'worker DataVolume detail: not collected' "$tmp/out"
+  # A declined listing never ran, so it must not be reported as one that answered.
+  # This is the third state -- answered-and-empty, failed, never-issued -- and the
+  # conclusion it would otherwise print is the one the whole (a2) section exists to
+  # test: no importer Pod, therefore no import.
+  if grep -q 'the listing answered and matched none' "$tmp/out"; then
+    echo "FAIL: a declined listing was reported as a namespace with no importer:" >&2
+    grep -n 'listing' "$tmp/out" >&2
+    false
+  fi
+  if [ -s "$kubectl_calls" ]; then
+    echo "FAIL: reads were issued after the phase ran out of budget:" >&2
+    cat "$kubectl_calls" >&2
+    false
+  fi
+  # The gates whose collectors are stubbed here are the mechanism, not a
+  # detail: declining the heaviest guest-Talos capture is what the budget
+  # derivation is for, and a stub issues no kubectl, so the check above cannot
+  # see it run. That is the whole reason the walk is over the stubbed ones and
+  # not over every gate in the block -- the importer listing is gated too, and
+  # it reads for real, so the check above already covers it. Each stub prints a
+  # marker; none of them may appear, and each must have said why. The list is
+  # load-bearing rather than descriptive -- a stubbed gate added without a
+  # line here is a collector that may run past the deadline while this test
+  # stays green, which is exactly what the empty-kubectl_calls check above
+  # cannot catch for a collector that issues no reads of its own.
+  #
+  # The same risk runs the other way, and the other way is the one that already
+  # happened: a collector STUBBED in the shared helper stops being visible to
+  # the bound audit at the top of this file, which needs it to run for real.
+  # A rule written for additions does not catch a removal, so both directions
+  # are named here.
+  for marker in serial-console-stub talos-stub image-cache-stub cpu-throttle-stub \
+    network-counters-stub block-io-stub sandbox-cpu-time-stub thread-cpu-stub; do
+    if grep -q "$marker" "$tmp/out"; then
+      echo "FAIL: $marker ran after the phase ran out of budget" >&2
+      false
+    fi
+  done
+  assert_file_contains '(b1) tenant worker guest serial console: not collected' "$tmp/out"
+  assert_file_contains '(b) in-guest Talos dmesg + kubelet logs + service states + links: not collected' "$tmp/out"
+  assert_file_contains 're-probe talos-image-cache ClusterIP + cacher debug bundle: not collected' "$tmp/out"
+  assert_file_contains '(d) tenant worker CPU counters, sandbox node CPU time and worker per-thread CPU time: not collected' "$tmp/out"
+  assert_file_contains '(d2) tenant worker network counters: not collected' "$tmp/out"
+  assert_file_contains '(d3) tenant worker block IO counters: not collected' "$tmp/out"
+  rm -rf "$tmp"
+}
+
+@test "a read outside any diagnostics phase is not gated by the phase budget" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  use_temp_report_dir "$tmp"
+  kubectl_calls="$tmp/kubectl.calls"
+  unbounded_calls="$tmp/unbounded.calls"
+  timeout_calls="$tmp/timeout.calls"
+  : >"$kubectl_calls"
+  date_now=1000000000
+  COZY_DIAG_PHASE_BUDGET=0
+
+  # The scheduling-gate branch reads twice and opens no phase. If an unopened
+  # phase counted as expired, that branch would go silent and the node table it
+  # prints -- the one thing naming the taint that held the node -- would vanish.
+  ( set +x; cozy_diag_read 'tenant node table' kubectl get nodes ) >"$tmp/out" 2>&1
+
+  assert_file_contains 'get nodes' "$kubectl_calls"
+  rm -rf "$tmp"
+}
+
+@test "the cache diagnostic dumps each run inside a wall clock bound" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  use_temp_report_dir "$tmp"
+  kubectl_calls="$tmp/kubectl.calls"
+  unbounded_calls="$tmp/unbounded.calls"
+  timeout_calls="$tmp/timeout.calls"
+  # Created up front: the mock only appends, so this file exists today solely because
+  # the re-probe's seven calls are unbounded. Once cozystack/cozystack#3666 bounds
+  # them the walk below would read a file that was never written and die under set -e
+  # -- a test that fails when the thing it tolerates gets fixed.
+  : >"$unbounded_calls"
+  # The gate has to answer "deployed" or the dumps below it never run.
+  kubectl_gate_output='deployment.apps/talos-image-cache'
+
+  ( set +x; talos_image_cache_diagnose ) >"$tmp/out" 2>&1
+
+  # These three run after the re-probe, on the same path to the same exit, so a
+  # hang in any of them costs the snapshot exactly as one in the block above.
+  assert_file_contains 'get deploy,pod,svc,endpointslice' "$timeout_calls"
+  assert_file_contains 'ciliumclusterwidenetworkpolicy' "$timeout_calls"
+  assert_file_contains '-c serve --tail=50' "$timeout_calls"
+  # And nothing here escaped a bound. Asserting the three positively proves some
+  # reads are bounded, never that none escaped -- the distinction this suite's mock
+  # pair exists for, and the one test that checks unbounded_calls stubs this
+  # collector out entirely. The re-probe's seven calls are the documented residual,
+  # so they are named rather than tolerated by an empty-file check that would also
+  # pass on an unbounded dump.
+  while read -r call; do
+    [ -n "$call" ] || continue
+    case "$call" in
+      # _talos_image_cache_reachable_from_tenant, unbounded on purpose (see the
+      # comment in talos-image-cache.sh) and tracked in its own issue.
+      *"get pod -l app.kubernetes.io/name=talos-image-cache"*) continue ;;
+      *"exec "*"-c serve"*) continue ;;
+      *"get deploy talos-image-cache -o jsonpath"*) continue ;;
+      *"delete pod talos-image-cache-probe"*) continue ;;
+      *"run talos-image-cache-probe"*) continue ;;
+      *"logs talos-image-cache-probe"*) continue ;;
+    esac
+    echo "FAIL: an unexpected unbounded read in the cache diagnosis: $call" >&2
+    false
+  done <"$unbounded_calls"
+  rm -rf "$tmp"
+}
+
+@test "a cache dump cut off mid flight says so instead of leaving a bare section header" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  use_temp_report_dir "$tmp"
+  kubectl_calls="$tmp/kubectl.calls"
+  unbounded_calls="$tmp/unbounded.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_gate_output='deployment.apps/talos-image-cache'
+  timeout_fail_match='get deploy,pod,svc,endpointslice'
+  timeout_fail_rc=124
+
+  ( set +x; talos_image_cache_diagnose ) >"$tmp/out" 2>&1
+
+  # Bounding a dump without a note trades a hang for a lie: `timeout` prints
+  # nothing when it fires, so the section header would be followed by nothing, and
+  # an empty deploy/pod/svc/endpointslice listing reads as a cache that has no Pod,
+  # no Service and no EndpointSlice -- a finding a triager acts on, from a read
+  # that never reached the apiserver.
+  assert_file_contains 'cache deploy/pod/svc/endpointslice: read did not finish' "$tmp/out"
+  assert_file_contains 'absent from this log, not absent from the cluster' "$tmp/out"
+  # And the dumps after it still ran, so one cut-off read does not end the section.
+  assert_file_contains 'ciliumclusterwidenetworkpolicy' "$timeout_calls"
+  rm -rf "$tmp"
+}
+
+@test "lowering the cache read budget after sourcing moves the wall clock too" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  use_temp_report_dir "$tmp"
+  kubectl_calls="$tmp/kubectl.calls"
+  unbounded_calls="$tmp/unbounded.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_gate_output='deployment.apps/talos-image-cache'
+  # After sourcing is the only moment a caller can turn these down, and it is how
+  # the caller's own COZY_DIAG_* budgets are overridden. A wall-clock prefix built
+  # at source time does not follow, so the inner --request-timeout drops to 2s
+  # while the outer stays at the real 20s -- the drift the single value exists to
+  # prevent, arriving through the knob meant to make it adjustable.
+  _TALOS_IMAGE_CACHE_READ_TIMEOUT=2
+
+  ( set +x; talos_image_cache_diagnose ) >"$tmp/out" 2>&1
+
+  assert_file_contains '-k 5 2' "$timeout_calls"
+  if grep -q -- '-k 5 20' "$timeout_calls"; then
+    echo "FAIL: the wall-clock bound stayed at 20s while the request bound moved to 2s:" >&2
+    grep -- '-k 5 20' "$timeout_calls" >&2
+    false
+  fi
+  rm -rf "$tmp"
+}
+
+@test "a knob given a unit suffix or a leading zero is rejected and named rather than breaking the block" {
+  # Each of these is pasted somewhere that takes digits and nothing else, and each
+  # fails differently and quietly. The budget is the severe one: it reaches `$(( ))`
+  # in the first statement of the block, so the arithmetic error unwinds the whole
+  # function before its own headline and the failing run produces no diagnostics at
+  # all -- the outcome this entire change exists to prevent, reached through a knob.
+  # The cap's `[ n -gt 3s ]` exits 2 and the comparison reads false, so the cap
+  # stops existing. The read bound becomes `--request-timeout=2ms`.
+  tmp=$(mktemp -d)
+  use_temp_report_dir "$tmp"
+  stage_exec_recorders "$tmp"
+  # 0480 alongside 8m: all digits, so a digits-only check passes it, and then the
+  # budget dies in `$(( ))` as octal exactly as the suffix does while the read bound
+  # quietly becomes 480 seconds. Same arm the previous-logs collector already has.
+  # The grace is in this list because `timeout -k abc 20` exits 125 BEFORE running the
+  # command, so a non-numeric grace makes every read in the block report exit 125 and
+  # collects nothing -- the same total loss as the other three, by a different route.
+  # The report budget is in this list because the classification runs inside this
+  # block: rejected, it falls back to its default like the four above, and the
+  # collector keeps its walk.
+  for knob in COZY_DIAG_PHASE_BUDGET COZY_DIAG_READ_TIMEOUT COZY_DIAG_MAX_IMPORTERS \
+    COZY_DIAG_READ_GRACE COZY_GUARD_REPORT_BUDGET; do
+   # Only values a `:-` default cannot absorb. An empty value set here is
+   # indistinguishable from unset, so it takes the default silently and correctly;
+   # the empty-string hazard lives on the post-source path and is checked there.
+   for bad in 8m 0480; do
+    out=$(env "$knob=$bad" PATH="$tmp/exec-bin:$PATH" bash -c '
+      set -eu
+      . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+      cozy_report_guest_console_wedge() { :; }
+      cozy_capture_tenant_serial_console() { :; }
+      cozy_capture_tenant_talos() { :; }
+      talos_image_cache_diagnose() { :; }
+      cozy_capture_tenant_worker_cpu_throttle() { :; }
+      cozy_capture_tenant_worker_network_counters() { :; }
+      cozy_capture_sandbox_kvm_exits() { :; }
+      cozy_capture_runner_kernel_cpu_time() { :; }
+      cozy_capture_sandbox_qemu_thread_cpu() { :; }
+      cozy_capture_runner_canary() { :; }
+      timeout() { :; }
+      kubectl() { :; }
+      cozy_report_node_join_failure test-latest-version
+    ' 2>&1) || true
+    printf '%s\n' "$out" >"$tmp/$knob.$bad"
+    if ! grep -q "ignoring $knob='$bad'" "$tmp/$knob.$bad"; then
+      echo "FAIL: $knob=$bad was accepted instead of rejected and named" >&2
+      cat "$tmp/$knob.$bad" >&2
+      false
+    fi
+    # And the block still ran: a rejected knob falls back, it does not take the
+    # diagnostics with it.
+    if ! grep -q 'node-join failed: fewer than 2 tenant nodes Ready' "$tmp/$knob.$bad"; then
+      echo "FAIL: $knob=$bad cost the block its diagnostics" >&2
+      cat "$tmp/$knob.$bad" >&2
+      false
+    fi
+   done
+  done
+  assert_no_exec_calls "$tmp"
+  rm -rf "$tmp"
+}
+
+@test "with timeout off PATH the reads still run unbounded instead of all failing 127" {
+  # The warning at phase start promises exactly this, and a promise the code does not
+  # keep is the thing this whole change is against. Bounded-into-exit-127 is strictly
+  # worse than the unbounded-but-working behaviour this path had before: eleven notes
+  # blaming the cluster, and nothing read.
+  #
+  # A subprocess with a stripped PATH, because the suite mocks `timeout` as a shell
+  # function and `command -v` finds functions -- the condition cannot be reached from
+  # inside this file.
+  tmp=$(mktemp -d)
+  use_temp_report_dir "$tmp"
+  mkdir -p "$tmp/bin"
+  # Resolved from known directories rather than through `command -v`: this file mocks
+  # `date` as a shell function, so `command -v date` answers with the function name,
+  # no symlink gets made, and the stripped PATH loses the clock along with `timeout`.
+  #
+  # `date` is staged so this test fails for its own reason or not at all. Losing it
+  # under `set -eu` -- the mode the chainsaw script and the subshell below both use
+  # -- takes exit 127 into the arithmetic in cozy_diag_phase_start and unwinds the
+  # whole function at its first statement: the warning, one `date: command not
+  # found`, and nothing else. That is not a scenario worth modelling either, because
+  # `date +%s` is already required by the wait helpers this block sits after, so no
+  # run reaches here without it.
+  for c in date grep awk sed cat mktemp rm tr wc head mkdir; do
+    for d in /bin /usr/bin /usr/local/bin /opt/homebrew/bin; do
+      if [ -x "$d/$c" ]; then
+        ln -sf "$d/$c" "$tmp/bin/$c"
+        break
+      fi
+    done
+  done
+  if [ ! -x "$tmp/bin/date" ]; then
+    echo "FAIL: could not stage a real date in the stripped PATH; the check below would be vacuous" >&2
+    false
+  fi
+  out=$(bash -c '
+    set -eu
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    cozy_report_guest_console_wedge() { :; }
+    cozy_capture_tenant_serial_console() { :; }
+    cozy_capture_tenant_talos() { :; }
+    talos_image_cache_diagnose() { :; }
+    cozy_capture_tenant_worker_cpu_throttle() { :; }
+    cozy_capture_tenant_worker_network_counters() { :; }
+    cozy_capture_sandbox_kvm_exits() { :; }
+    cozy_capture_runner_kernel_cpu_time() { :; }
+    cozy_capture_sandbox_qemu_thread_cpu() { :; }
+    cozy_capture_runner_canary() { :; }
+    cozy_capture_tenant_worker_block_io() { :; }
+    cozy_capture_sandbox_node_cpu_time() { :; }
+    cozy_capture_tenant_worker_thread_cpu() { :; }
+    kubectl() { printf "KUBECTL_RAN\n" >&2; }
+    PATH='"$tmp"'/bin
+    cozy_report_node_join_failure test-latest-version
+  ' 2>&1) || true
+  printf '%s\n' "$out" >"$tmp/out"
+
+  ran=$(grep -c 'KUBECTL_RAN' "$tmp/out" || true)
+  if [ "$ran" -lt 11 ]; then
+    echo "FAIL: only $ran reads reached kubectl with timeout absent; expected every read to still run" >&2
+    head -20 "$tmp/out" >&2
+    false
+  fi
+  # And the block ran to its end. The count above saturates before the last
+  # sections -- every collector past (d) is stubbed here, so it reads 11 whether
+  # the block finished or died half way -- which is how an unguarded external
+  # inside the sampling loop could land green. The final section's own header is
+  # the one line printed only if nothing unwound the function on the way there,
+  # and under `set -eu` a single `command not found` is enough to unwind it.
+  assert_file_contains 're-probe talos-image-cache ClusterIP' "$tmp/out"
+  assert_file_lacks_pattern 'command not found' "$tmp/out"
+  # `sleep` is deliberately NOT staged above. It is the one external this block
+  # calls outside a `|| true` and outside cozy_diag_read, so an unguarded call
+  # exits 127 under `set -eu` and unwinds the function -- taking the collectors
+  # after it, two of which the warning above promises keep collecting. Staging
+  # it would make this test pass against exactly that defect, which is how it
+  # went unnoticed once.
+  assert_file_contains 'sleep is not on PATH' "$tmp/out"
+  # And it is announced as a missing local dependency, not implied by the notes.
+  assert_file_contains 'timeout is not on PATH' "$tmp/out"
+  # Matched as a read's note rather than as the bare status: the phase's own warning
+  # names exit 127 too, when it says which collectors do still fail that way, and a
+  # substring match would find the warning and call it a failing read.
+  if grep -q 'read failed (exit 127)' "$tmp/out"; then
+    echo "FAIL: a read reported exit 127, i.e. it was bounded with a binary that is absent" >&2
+    grep -n 'read failed (exit 127)' "$tmp/out" >&2
+    false
+  fi
+  rm -rf "$tmp"
+}
+
+@test "a zero read bound is rejected because zero disables the bound instead of tightening it" {
+  tmp=$(mktemp -d)
+  use_temp_report_dir "$tmp"
+  # `timeout -k 5 0` does not time out at all and `--request-timeout=0s` means "no
+  # timeout" to kubectl, so zero reintroduces the unbounded read this change removes.
+  # The phase budget must keep taking zero -- the suite uses it as "already spent" --
+  # so this is checked per knob rather than banned in the shared helper.
+  out=$(env COZY_DIAG_READ_TIMEOUT=0 bash -c '
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    printf "resolved=%s\n" "$COZY_DIAG_READ_TIMEOUT"
+  ' 2>&1) || true
+  printf '%s\n' "$out" >"$tmp/read"
+  assert_file_contains 'zero disables the bound' "$tmp/read"
+  assert_file_contains 'resolved=20' "$tmp/read"
+
+  # And after sourcing, which is the only moment a caller can adjust it and the case
+  # the assignment-time check cannot see. Both halves of the pair have to follow: a
+  # corrected `timeout` beside a stale `--request-timeout=0s` is the drift the single
+  # value exists to prevent.
+  out=$(bash -c '
+    set -eu
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    COZY_DIAG_READ_TIMEOUT=0
+    timeout() { printf "T: %s\n" "$*"; }
+    kubectl() { :; }
+    cozy_report_guest_console_wedge() { :; }
+    cozy_capture_tenant_serial_console() { :; }
+    cozy_capture_tenant_talos() { :; }
+    talos_image_cache_diagnose() { :; }
+    cozy_capture_tenant_worker_cpu_throttle() { :; }
+    cozy_capture_tenant_worker_network_counters() { :; }
+    cozy_capture_sandbox_kvm_exits() { :; }
+    cozy_capture_runner_kernel_cpu_time() { :; }
+    cozy_capture_sandbox_qemu_thread_cpu() { :; }
+    cozy_capture_runner_canary() { :; }
+    cozy_capture_tenant_worker_block_io() { :; }
+    cozy_report_node_join_failure test-latest-version
+  ' 2>&1) || true
+  printf '%s\n' "$out" >"$tmp/postsource"
+  assert_file_contains 'zero disables the bound' "$tmp/postsource"
+  if grep -q -- '-k 5 0 ' "$tmp/postsource"; then
+    echo "FAIL: a post-source zero left the wall clock unbounded" >&2
+    grep -n -- '-k 5 0 ' "$tmp/postsource" >&2
+    false
+  fi
+  if grep -q -- '--request-timeout=0s' "$tmp/postsource"; then
+    echo "FAIL: a post-source zero left the per-request bound at 0s" >&2
+    grep -n -- '--request-timeout=0s' "$tmp/postsource" >&2
+    false
+  fi
+
+  # An empty value assigned after sourcing is the case a `:-` default cannot cover,
+  # because the re-checks read the bare variable. Both validators have to reject it:
+  # one of them let it through to `timeout -k 5 ''`, which exits 125 before running
+  # the command and drops every read behind it.
+  out=$(bash -c '
+    set -eu
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    COZY_DIAG_READ_TIMEOUT=
+    timeout() { printf "T: %s\n" "$*"; }
+    kubectl() { :; }
+    cozy_report_guest_console_wedge() { :; }
+    cozy_capture_tenant_serial_console() { :; }
+    cozy_capture_tenant_talos() { :; }
+    talos_image_cache_diagnose() { :; }
+    cozy_capture_tenant_worker_cpu_throttle() { :; }
+    cozy_capture_tenant_worker_network_counters() { :; }
+    cozy_capture_sandbox_kvm_exits() { :; }
+    cozy_capture_runner_kernel_cpu_time() { :; }
+    cozy_capture_sandbox_qemu_thread_cpu() { :; }
+    cozy_capture_runner_canary() { :; }
+    cozy_capture_tenant_worker_block_io() { :; }
+    cozy_report_node_join_failure test-latest-version
+  ' 2>&1) || true
+  printf '%s\n' "$out" >"$tmp/empty"
+  assert_file_contains 'a bare integer, no unit suffix' "$tmp/empty"
+  assert_file_contains 'T: -k 5 20 ' "$tmp/empty"
+
+  out=$(bash -c '
+    set -eu
+    . hack/e2e-chainsaw/_lib/talos-image-cache.sh
+    _TALOS_IMAGE_CACHE_READ_TIMEOUT=
+    timeout() { printf "T: %s\n" "$*"; }
+    kubectl() { case "$*" in *"get deploy talos-image-cache"*) printf "dep\n" ;; esac; }
+    _talos_image_cache_reachable_from_tenant() { return 1; }
+    talos_image_cache_diagnose
+  ' 2>&1) || true
+  printf '%s\n' "$out" >"$tmp/empty-cache"
+  assert_file_contains 'a bare integer, no unit suffix' "$tmp/empty-cache"
+  assert_file_contains 'T: -k 5 20 ' "$tmp/empty-cache"
+
+  # The cache grace, on the same post-source path, and it needs its own case for two
+  # reasons: one helper validates both knobs there, so a message can name the wrong
+  # one, and the grace's own hazard is different -- `timeout -k abc 20` exits 125
+  # before running the command, which drops every dump and the gate with them.
+  out=$(bash -c '
+    set -eu
+    . hack/e2e-chainsaw/_lib/talos-image-cache.sh
+    _TALOS_IMAGE_CACHE_READ_GRACE=abc
+    timeout() { printf "T: %s\n" "$*"; }
+    kubectl() { case "$*" in *"get deploy talos-image-cache"*) printf "dep\n" ;; esac; }
+    _talos_image_cache_reachable_from_tenant() { return 1; }
+    talos_image_cache_diagnose
+  ' 2>&1) || true
+  printf '%s\n' "$out" >"$tmp/grace-cache"
+  # Named for the knob the caller set, not for its sibling: the first version of that
+  # helper hardcoded one name into every message and quoted the other's default.
+  assert_file_contains "ignoring _TALOS_IMAGE_CACHE_READ_GRACE='abc'" "$tmp/grace-cache"
+  if grep -q -- '-k abc ' "$tmp/grace-cache"; then
+    echo "FAIL: an invalid grace reached timeout, so every dump exits 125" >&2
+    grep -n -- '-k abc ' "$tmp/grace-cache" >&2
+    false
+  fi
+  # And zero stays legal for a grace, which is what its comment claims: -k 0 only
+  # skips the follow-up SIGKILL, and kubectl does not need it.
+  out=$(bash -c '
+    set -eu
+    _TALOS_IMAGE_CACHE_READ_GRACE=0
+    . hack/e2e-chainsaw/_lib/talos-image-cache.sh
+    printf "grace=%s\n" "$_TALOS_IMAGE_CACHE_READ_GRACE"
+  ' 2>&1) || true
+  printf '%s\n' "$out" >"$tmp/grace-zero"
+  assert_file_contains 'grace=0' "$tmp/grace-zero"
+
+  out=$(env COZY_DIAG_PHASE_BUDGET=0 bash -c '
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    printf "resolved=%s\n" "$COZY_DIAG_PHASE_BUDGET"
+  ' 2>&1) || true
+  printf '%s\n' "$out" >"$tmp/budget"
+  assert_file_contains 'resolved=0' "$tmp/budget"
+  rm -rf "$tmp"
+}
+
+@test "the decisive CSR reads run before the collectors that can exhaust the budget" {
+  lib=hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  # The phase budget declines whatever has not started when it runs out, so
+  # source order decides what gets dropped. Section (c) is the discriminator
+  # between a worker that booted and never registered and one that never booted
+  # -- per the block's own header, the failure a follow-up fix has to target --
+  # and it is two bounded reads. The serial-console walk and the guest-Talos
+  # capture can spend the whole budget between them. With
+  # (c) last, the budget declines the answer and keeps the noise.
+  csr=$(grep -n "cozy_diag_read 'tenant CSR list'" "$lib" | head -n 1 | cut -d: -f1)
+  console=$(grep -n "cozy_capture_tenant_serial_console 'node-join failed" "$lib" | head -n 1 | cut -d: -f1)
+  talos=$(grep -n 'cozy_capture_tenant_talos "${test_name}" || true' "$lib" | head -n 1 | cut -d: -f1)
+  for v in csr console talos; do
+    eval "n=\$$v"
+    if [ -z "$n" ]; then
+      echo "expected to locate $v in $lib" >&2
+      exit 1
+    fi
+  done
+  if [ "$csr" -ge "$console" ] || [ "$csr" -ge "$talos" ]; then
+    echo "the CSR reads (line $csr) must precede the serial console ($console) and the Talos capture ($talos)" >&2
+    exit 1
+  fi
+}
+
+@test "the replicated volume state is read before anything that can spend the budget" {
+  lib=hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  # One read, and it answers a question with no other source once the suite ends:
+  # the report collects the same tables after cleanup has deleted the worker's
+  # volumes, so a red run leaves nothing about their state behind. A DRBD replica
+  # serving the worker's system disk from a peer rather than locally is slow in a
+  # way every counter in this block attributes to something else, so a budget that
+  # declines this read keeps every symptom and drops the cause.
+  volumes=$(grep -n "cozy_diag_read 'LINSTOR resource state'" "$lib" | head -n 1 | cut -d: -f1)
+  console=$(grep -n "cozy_capture_tenant_serial_console 'node-join failed" "$lib" | head -n 1 | cut -d: -f1)
+  cpu=$(grep -n 'cozy_capture_tenant_worker_cpu_throttle "${_sample}" || true' "$lib" | head -n 1 | cut -d: -f1)
+  talos=$(grep -n 'cozy_capture_tenant_talos "${test_name}" || true' "$lib" | head -n 1 | cut -d: -f1)
+  cache=$(grep -n 'talos_image_cache_diagnose || true' "$lib" | head -n 1 | cut -d: -f1)
+  for v in volumes console cpu talos cache; do
+    eval "n=\$$v"
+    if [ -z "$n" ]; then
+      echo "expected to locate $v in $lib" >&2
+      exit 1
+    fi
+  done
+  for later in console cpu talos cache; do
+    eval "n=\$$later"
+    if [ "$volumes" -ge "$n" ]; then
+      echo "the volume state read (line $volumes) must precede $later (line $n), or a tight run declines it" >&2
+      exit 1
+    fi
+  done
+}
+
+@test "the block IO counters run with the cheap reads, ahead of everything that costs minutes" {
+  lib=hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  # Same decision as the network counters beside it and the same shape: one
+  # listing and one read per node, read once, against collectors that can spend
+  # minutes each. What makes it worth a position rather than a place is that
+  # nothing else here counts a read at all -- the CPU families say what the group
+  # was allowed and what it got, the byte counters say what crossed the network,
+  # and a guest waiting on blocks looks exactly like a guest computing without
+  # result in both. Below the guest captures it would be declined on the slow runs
+  # this failure comes from, which are the only runs it exists for.
+  block=$(grep -n 'cozy_capture_tenant_worker_block_io || true' "$lib" | head -n 1 | cut -d: -f1)
+  console=$(grep -n "cozy_capture_tenant_serial_console 'node-join failed" "$lib" | head -n 1 | cut -d: -f1)
+  cpu=$(grep -n 'cozy_capture_tenant_worker_cpu_throttle "${_sample}" || true' "$lib" | head -n 1 | cut -d: -f1)
+  talos=$(grep -n 'cozy_capture_tenant_talos "${test_name}" || true' "$lib" | head -n 1 | cut -d: -f1)
+  cache=$(grep -n 'talos_image_cache_diagnose || true' "$lib" | head -n 1 | cut -d: -f1)
+  for v in block console cpu talos cache; do
+    eval "n=\$$v"
+    if [ -z "$n" ]; then
+      echo "expected to locate $v in $lib" >&2
+      exit 1
+    fi
+  done
+  for later in console cpu talos cache; do
+    eval "n=\$$later"
+    if [ "$block" -ge "$n" ]; then
+      echo "the block IO counters (line $block) must precede $later (line $n), or a tight run declines them" >&2
+      exit 1
+    fi
+  done
+}
+
+@test "the byte-path counters run with the cheap reads, ahead of everything that costs minutes" {
+  lib=hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  # Where this collector sits is a decision, not a placement, and the phase
+  # budget is what makes it one: admission gates when a collector may START, so
+  # what runs last is what gets declined, and a collector's position is its
+  # priority.
+  #
+  # It is first of the gated collectors, and it is there because it is the
+  # cheapest of them: one listing and one read per node against the minutes the
+  # console walk, the guest capture and the CPU pair can each spend. Its answer
+  # exists nowhere else in the artifact either -- the bytes that arrived at the
+  # Pod, set against the progress the guest reported, separate a pull that kept
+  # restarting from a slow link, and no other collector here separates those
+  # two. Which of the Pod's four interfaces carries that number, and which one
+  # is the dummy that reads zero, is stated where the collector is gated. Placed
+  # after the guest captures it would be the first thing declined on exactly the
+  # slow runs that produce this failure.
+  #
+  # It goes AHEAD of the CPU pair, which is a stronger claim than the one it
+  # replaces. The two used to be the same size, so the order between them was
+  # nearly arbitrary; the pair now walks twice and can spend most of the budget,
+  # so cost decides it rather than taste. The companion guard is the one that
+  # bounds what may sit ahead of the console at all.
+  net=$(grep -n 'cozy_capture_tenant_worker_network_counters || true' "$lib" | head -n 1 | cut -d: -f1)
+  console=$(grep -n "cozy_capture_tenant_serial_console 'node-join failed" "$lib" | head -n 1 | cut -d: -f1)
+  cpu=$(grep -n 'cozy_capture_tenant_worker_cpu_throttle "${_sample}" || true' "$lib" | head -n 1 | cut -d: -f1)
+  talos=$(grep -n 'cozy_capture_tenant_talos "${test_name}" || true' "$lib" | head -n 1 | cut -d: -f1)
+  cache=$(grep -n 'talos_image_cache_diagnose || true' "$lib" | head -n 1 | cut -d: -f1)
+  for v in cpu net console talos cache; do
+    eval "n=\$$v"
+    if [ -z "$n" ]; then
+      echo "expected to locate $v in $lib" >&2
+      exit 1
+    fi
+  done
+  for later in console cpu talos cache; do
+    eval "n=\$$later"
+    if [ "$net" -ge "$n" ]; then
+      echo "the network counters (line $net) must precede $later (line $n), or a tight run declines them" >&2
+      exit 1
+    fi
+  done
+}
+
+@test "nothing gated ahead of the console can spend the phase budget by itself" {
+  lib=hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  # The budget guard below holds the phase against the op. This one holds the
+  # ORDER against the collector the phase exists to reach. Admission is "the
+  # budget is not spent yet", so whatever is gated ahead of the serial console
+  # bounds what the console can lose, and the console is documented as the only
+  # surface that survives a worker which never reached apid -- the dominant
+  # shape of this failure. A collector below it can only cost itself; one above
+  # it can cost the console.
+  #
+  # Two claims, because one of them is structural and the other is arithmetic
+  # and neither implies the other.
+  console=$(grep -n "cozy_capture_tenant_serial_console 'node-join failed" "$lib" | head -n 1 | cut -d: -f1)
+  if [ -z "$console" ]; then
+    echo "expected the failure path to capture the guest serial console" >&2
+    return 1
+  fi
+  # Structural: a collector read more than once costs its whole walk again, and
+  # the interval on top. That shape belongs below the console whatever its
+  # arithmetic says today, because the arithmetic is what changes when a node is
+  # added to the sandbox.
+  loop=$(grep -n '^ *for _sample in 1 2; do$' "$lib" | head -n 1 | cut -d: -f1)
+  if [ -z "$loop" ]; then
+    echo "expected the sampling loop to still exist in $lib" >&2
+    return 1
+  fi
+  if [ "$loop" -lt "$console" ]; then
+    echo "the sampling loop (line $loop) is gated ahead of the console (line $console); a collector that walks twice must not bound what the console gets" >&2
+    return 1
+  fi
+  # Arithmetic: what IS ahead of it must not be able to spend the whole budget
+  # on its own. This is deliberately not "ahead + console <= budget", which the
+  # tree has never satisfied and did not at the merge base either: the console's
+  # own worst case plus one four-read walk already exceeds the budget, so a
+  # tight run has always been able to cut the console short. What must not
+  # happen is a collector ahead of it that can spend the budget outright, which
+  # turns "cut short" into "never started".
+  budget=$(grep -oE '^COZY_DIAG_PHASE_BUDGET_DEFAULT=[0-9]+' "$lib" | head -n 1 | sed -E 's/.*=//')
+  read_cost_inputs "$lib" || return 1
+  if [ -z "$budget" ]; then
+    echo "expected to read budget from $lib; without it this guard reports success for having lost its input" >&2
+    return 1
+  fi
+  # Every walk's cap, not the first one, and not only the ones spelled
+  # `max_nodes`: the subjects declare their own literal and two of them are
+  # equal today, so taking the first would be right by accident, and a subject
+  # that walks Pods rather than nodes would be left out of the sum entirely --
+  # under-counting the pair while reading as satisfied.
+  #
+  # A literal cap only. The serial-console walk takes its cap from its caller,
+  # which is what keeps it out of this expression: it is not part of the pair.
+  caps=$(grep -oE 'local max_(nodes|pods)=[0-9]+' "$lib" | sed -E 's/.*=//')
+  # `|| true`: grep -c exits 1 on a count of zero, and under errexit that ends
+  # the test before the branch below can say what was missing -- the guard would
+  # still fail, with the diagnostic it was given replaced by silence.
+  ncaps=$(printf '%s\n' "$caps" | grep -c . || true)
+  if [ "$ncaps" -ne 3 ]; then
+    echo "expected three capped walks in $lib, found $ncaps; the pair arithmetic below is written for exactly the subjects the sampling loop reads" >&2
+    return 1
+  fi
+  # A capped walk costs a listing plus one read per node, each at the read bound
+  # plus its kill grace. Taken from the shared cAdvisor body by name rather than
+  # as the first cap in the file: everything counted into `ahead` below runs
+  # through that body, and picking by position would be right only while it
+  # happens to be declared first.
+  cap=$(awk '/^_cozy_capture_worker_cadvisor\(\)/,/^}/' "$lib" \
+    | grep -oE 'local max_nodes=[0-9]+' | head -n 1 | sed -E 's/.*=//')
+  if [ -z "$cap" ]; then
+    echo "expected the shared cAdvisor walk to declare its own cap; without it this guard reports success for having lost its input" >&2
+    return 1
+  fi
+  walk=$(( (1 + cap) * (bound + grace) ))
+  ahead=0
+  gated=$(grep -nE '^ *(cozy_(capture|report)_[a-z_]+|[a-z_]+_diagnose) [^|]*\|\| true|^ *(cozy_(capture|report)_[a-z_]+|[a-z_]+_diagnose) \|\| true' "$lib" \
+    | sed -E 's/:[[:space:]]*/:/; s/(:[a-z_]+) .*/\1/; s/\|\|.*//')
+  # Checked for emptiness like every other input here, and this one matters
+  # most: the loop below fails on a collector gated ahead of the console that
+  # has no cost arm, which is what catches the next heavy collector being put
+  # there. With no input the loop runs zero times, `ahead` stays 0, and both
+  # arms pass while nothing has been looked at. The input is a grep over call
+  # spellings, and this branch changed one of those spellings.
+  if [ -z "$gated" ]; then
+    echo "found no gated collector at all, so this guard checked nothing" >&2
+    return 1
+  fi
+  # Same block filter as the spend-order test below, and for the same reason:
+  # the exit handler calls one of these collectors from outside any phase, and
+  # a call that spends no phase budget cannot spend it ahead of the console.
+  block=$(grep -n '^cozy_report_node_join_failure()' "$lib" | cut -d: -f1)
+  if [ -z "$block" ]; then
+    echo "expected to find the node-join diagnostics block in $lib" >&2
+    return 1
+  fi
+  for entry in $gated; do
+    line=${entry%%:*}
+    fn=${entry#*:}
+    [ "$line" -gt "$block" ] || continue
+    [ "$line" -lt "$console" ] || continue
+    case "$fn" in
+      # Not behind the phase gate at all: it runs ahead of the headline so the
+      # console experiment's own failure is named before the wording that
+      # matches the bug it studies. Priced all the same, and at its own ceiling
+      # rather than the shared read bound, because ungated is not free -- it
+      # spends ahead of the console exactly like the gated collectors below it.
+      cozy_report_guest_console_wedge) ahead=$((ahead + wedge)) ;;
+      # Not behind the phase gate either, and for a reason of its own: it is the
+      # second half of a pair whose first reading was taken before the node-join
+      # wait, so declining it would not save a reading, it would orphan one
+      # already taken. Counted rather than skipped all the same -- it does sit
+      # ahead of the console in wall clock, and one bounded read is a cost this
+      # arm can state exactly, unlike a walk whose size follows the sandbox.
+      cozy_capture_sandbox_kvm_exits) ahead=$((ahead + bound + grace)) ;;
+      # The other two halves of the same shape. Each pair's first half is taken
+      # before the wait, so declining either here would orphan a reading taken
+      # a 29m node-join wait earlier rather than save one. Counted all the same,
+      # because they do sit ahead of the console in wall clock.
+      #
+      # They are not priced identically, and that is the point of reading the
+      # count: the runner-kernel reading is one bounded read of /proc/stat, and
+      # the QEMU thread reading is a bounded probe walk plus one bounded read
+      # per sandbox pid file. Those are separate calls under separate ceilings,
+      # so the second can spend several times what the first can.
+      cozy_capture_runner_kernel_cpu_time) ahead=$((ahead + bound + grace)) ;;
+      cozy_capture_sandbox_qemu_thread_cpu) ahead=$((ahead + qemu_reads * (bound + grace))) ;;
+      # The fourth reading that brackets the wait, and the only one of them that
+      # is not a read: arms of fixed work, each under the canary ceiling, so it
+      # is priced at one of those per arm rather than at the read bound the
+      # three above it share. Exempt on a ground of its own rather than theirs: its
+      # samples stand alone, so nothing is orphaned by declining this one, but
+      # the figure is only worth what its nearness to the failure makes it, and
+      # the gate can only decline or defer. Counted all the same, because it
+      # does sit ahead of the console in wall clock.
+      cozy_capture_runner_canary) ahead=$((ahead + arms * (canary + grace))) ;;
+      cozy_capture_tenant_worker_network_counters) ahead=$((ahead + walk)) ;;
+      # One walk apiece and read once, so each costs what the expression above
+      # prices a capped walk at. Both sit ahead of the console on the same
+      # ground: their answers exist nowhere else in the artifact, and a walk read
+      # once cannot cost the console more than a walk's worth.
+      cozy_capture_tenant_worker_block_io) ahead=$((ahead + walk)) ;;
+      *)
+        echo "$fn is gated ahead of the console and this guard has no cost arm for it; add one, or move it below the console" >&2
+        return 1
+        ;;
+    esac
+  done
+  if [ "$ahead" -gt "$budget" ]; then
+    echo "the collectors gated ahead of the console can spend ${ahead}s against a ${budget}s budget, so the console can be declined rather than merely cut short" >&2
+    return 1
+  fi
+  # And the pair's own overshoot stays inside the term the budget was derived
+  # against. The phase is start-gated, so a collector admitted a moment before
+  # the deadline runs its whole cost afterwards; the derivation below covers
+  # exactly one such overshoot, sized from the heaviest collector. A pair
+  # heavier than that term would push the tenant snapshot past the op while the
+  # inequality still read as satisfied, because the inequality does not know
+  # which collector is heaviest. Read from the guard that owns it rather than
+  # restated, since two copies of a number are a scheduled divergence.
+  interval=$(grep -oE '^COZY_DIAG_RATE_INTERVAL_DEFAULT=[0-9]+' "$lib" | head -n 1 | sed -E 's/.*=//')
+  # Named rather than taken from $0: cozytest.sh dot-sources a transformed copy
+  # of this file, so $0 is the runner there and the bats binary here, and the
+  # two runners would read different files.
+  largest=$(grep -oE '^  largest=[0-9]+' hack/run-kubernetes-node-join_test.bats | head -n 1 | sed -E 's/.*=//')
+  for v in interval largest; do
+    eval "n=\$$v"
+    if [ -z "$n" ]; then
+      echo "expected to read $v; without it this half of the guard reports success for having lost its input" >&2
+      return 1
+    fi
+  done
+  # Each subject, two samples each, one walk apiece at that subject's own cap,
+  # plus the single wait -- single because the subjects share the pass rather
+  # than each waiting for their own. Summed per subject rather than multiplying
+  # one walk, so a cap raised on one side alone is counted where it lands.
+  pair=$interval
+  for c in $caps; do
+    pair=$(( pair + 2 * (1 + c) * (bound + grace) ))
+  done
+  if [ "$pair" -gt "$largest" ]; then
+    echo "the sampling pair can overshoot by ${pair}s against the ${largest}s the budget derivation allows for one late admission; the snapshot the phase exists to reach no longer fits behind it" >&2
+    return 1
+  fi
+}
+
+@test "every collector that survives a missing timeout is named in the warning that says so" {
+  lib=hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  # The warning an operator reads when `timeout` is absent splits the collectors
+  # into the ones that then exit 127 and collect nothing and the ones that run
+  # unbounded instead, and it names the second group. An enumeration is only
+  # true until the next collector joins the group, and a reader who trusts a
+  # stale one draws the opposite conclusion about whichever collector is
+  # missing from it. So the list is derived here rather than restated: every
+  # function that guards its bounded call with `command -v timeout` has to
+  # appear in that sentence.
+  # Anchored on the phrase unique to the phase warning itself: the captures now
+  # write their own [bounds] notes carrying "timeout is not on PATH", so the
+  # first match of that phrase is no longer this sentence.
+  warn=$(grep -n 'run UNBOUNDED' "$lib" | head -n 1 | cut -d: -f1)
+  if [ -z "$warn" ]; then
+    echo "expected the phase to still warn when timeout is missing" >&2
+    exit 1
+  fi
+  line=$(sed -n "${warn}p" "$lib")
+  # The guarded collectors, found by walking the source: a `command -v timeout`
+  # test inside a function body puts that function in the group. awk tracks the
+  # enclosing definition so the name reported is the function's, not the line's.
+  #
+  # Over the sourced libraries as well as this file, and the list of them is
+  # read from the source rather than written out here. The talos-image-cache
+  # diagnosis named by the sentence lives in a library this file sources, so a
+  # scan of this file alone would not find it. A guarded read added to any
+  # sourced library is what this has to see, and hardcoding today's library
+  # would put the next one outside the scan in exactly the same silent way.
+  libs="$lib $(awk '/^\. hack\/e2e-chainsaw\/_lib\/[a-z-]+\.sh$/ { print $2 }' "$lib")"
+  for f in $libs; do
+    if [ ! -f "$f" ]; then
+      echo "the scan was pointed at $f, which does not exist" >&2
+      exit 1
+    fi
+  done
+  # Two directions, because the sentence goes stale two ways.
+  #
+  # `guarded` is the set of functions that carry the guard, read off the source.
+  # The `^}` reset matters: without it a guard appearing at top level after a
+  # definition is filed under the preceding function, which is a wrong name in
+  # the group rather than a missing one.
+  #
+  # What is deliberately NOT here is a call-graph closure from each capture down
+  # to a guarded read. Deriving one from shell text means matching callee names
+  # inside bodies that also contain comments and strings, and a matcher loose
+  # enough to find the calls reports functions that make none -- green while
+  # naming nothing. A guard that has to parse shell to be right is a guard that
+  # will be wrong; the explicit table below says the same thing in a form that
+  # cannot drift silently, because every name in it must appear in `guarded` or
+  # the test fails.
+  guarded=$(awk '
+    /^[a-z_]+\(\) *[({] *$/ { fn = $0; sub(/\(\).*/, "", fn); next }
+    /^[})]$/ { fn = ""; next }
+    /command -v timeout >\/dev\/null 2>&1; then/ { if (fn != "") print fn }
+  ' $libs | sort -u)
+  if [ -z "$guarded" ]; then
+    echo "found no function carrying the timeout guard, so this test checked nothing" >&2
+    exit 1
+  fi
+  # Direction one: for each capture the sentence names, the functions whose
+  # guard is what makes that sentence true of it. The cAdvisor captures do
+  # not carry the guard themselves -- it lives in the body they share -- and
+  # naming that body here is what the closure was trying and failing to derive.
+  # A helper renamed or a guard removed drops it out of `guarded`, and this
+  # fails; a capture dropped from the warning fails on the phrase check below.
+  for entry in \
+    'cozy_capture_tenant_worker_cpu_throttle:CPU throttling:_cozy_cadvisor_node_stream _cozy_virt_launcher_listing' \
+    'cozy_capture_tenant_worker_network_counters:network counter:_cozy_cadvisor_node_stream _cozy_virt_launcher_listing' \
+    'cozy_capture_tenant_worker_block_io:block IO counter:_cozy_cadvisor_node_stream _cozy_virt_launcher_listing' \
+    'cozy_capture_sandbox_node_cpu_time:sandbox node CPU time:cozy_capture_sandbox_node_cpu_time' \
+    'cozy_capture_sandbox_kvm_exits:sandbox kernel KVM counters:cozy_capture_sandbox_kvm_exits' \
+    'cozy_capture_runner_kernel_cpu_time:runner kernel CPU time:cozy_capture_runner_kernel_cpu_time' \
+    'cozy_capture_sandbox_qemu_thread_cpu:sandbox QEMU per-thread CPU time:cozy_capture_sandbox_qemu_thread_cpu' \
+    'cozy_capture_runner_canary:runner fixed-work canary:_cozy_canary_run_arm' \
+    'cozy_capture_tenant_worker_thread_cpu:worker per-thread CPU time:cozy_capture_tenant_worker_thread_cpu _cozy_virt_launcher_listing' \
+    'talos_image_cache_diagnose:talos-image-cache:talos_image_cache_diagnose _talos_image_cache_bounded_read'; do
+    fn=${entry%%:*}
+    rest=${entry#*:}
+    phrase=${rest%%:*}
+    carriers=${rest#*:}
+    for carrier in $carriers; do
+      case "
+${guarded}
+" in
+        *"
+${carrier}
+"*) ;;
+        *)
+          echo "$fn is named in the warning as surviving a missing timeout, but $carrier carries no command -v guard; the sentence is claiming behaviour the code no longer has" >&2
+          exit 1
+          ;;
+      esac
+    done
+    case "$line" in
+      *"$phrase"*) ;;
+      *)
+        echo "the warning does not name $fn (expected the phrase: $phrase)" >&2
+        exit 1
+        ;;
+    esac
+  done
+  # Direction two: every function carrying the guard is either one of those
+  # captures or exempt for a stated reason. One with no entry here fails rather
+  # than being skipped, because a silent skip is how the enumeration went stale.
+  for fn in $guarded; do
+    case "$fn" in
+      cozy_capture_tenant_worker_cpu_throttle) phrase='CPU throttling' ;;
+      cozy_capture_tenant_worker_network_counters) phrase='network counter' ;;
+      cozy_capture_sandbox_node_cpu_time) phrase='sandbox node CPU time' ;;
+      cozy_capture_sandbox_kvm_exits) phrase='sandbox kernel KVM counters' ;;
+      cozy_capture_runner_kernel_cpu_time) phrase='runner kernel CPU time' ;;
+      cozy_capture_sandbox_qemu_thread_cpu) phrase='sandbox QEMU per-thread CPU time' ;;
+      # In `guarded` twice over: the body that runs one arm guards the ceiling
+      # it puts around the work, and the capture guards a second check of its
+      # own to decide whether to write the [bounds] note. Both belong to the one
+      # collector the sentence names, so the phrase here answers for the pair
+      # and the arm body is exempted below rather than given a phrase of its own.
+      cozy_capture_runner_canary) phrase='runner fixed-work canary' ;;
+      cozy_capture_tenant_worker_thread_cpu) phrase='worker per-thread CPU time' ;;
+      talos_image_cache_diagnose) phrase='talos-image-cache' ;;
+      # The sentence enumerates the CAPTURES. Two other kinds of function guard
+      # the same way and are deliberately not in it, each exempt for a stated
+      # reason rather than by omission: the shared bounded-read helpers, and the
+      # individual reads belonging to a capture the sentence already names.
+      # Both are covered by the comment directly above the warning, and putting
+      # them in the sentence too would be a second copy of that claim to keep in
+      # step. A function that is neither still fails below, which is what makes
+      # this a list of exemptions rather than a list of everything.
+      cozy_diag_read | _talos_image_cache_bounded_read) continue ;;
+      _cozy_guard_kubectl) continue ;;
+      _cozy_cadvisor_node_stream | _cozy_virt_launcher_listing) continue ;;
+      # The canary carries its guard in the body that runs one arm, the way the
+      # cAdvisor captures carry theirs in the stream they share, so the sentence
+      # names the capture and the table above names what makes it true of it.
+      _cozy_canary_run_arm) continue ;;
+      # This is the successful-path timing report, called only after the join
+      # completed. Its bounds protect optional reads without belonging to the
+      # failure diagnostics phase whose missing-timeout warning is under test.
+      cozy_report_node_join_timing) continue ;;
+      cozy_report_node_join_failure | _talos_image_cache_deploy_state) continue ;;
+      *)
+        echo "$fn guards its call with command -v but this test has no phrase for it; add one here and to the warning" >&2
+        exit 1
+        ;;
+    esac
+    case "$line" in
+      *"$phrase"*) ;;
+      *)
+        echo "the warning does not name $fn (expected the phrase: $phrase)" >&2
+        exit 1
+        ;;
+    esac
+  done
+}
+
+@test "the spend order both chainsaw suites document matches the order the block runs" {
+  lib=hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  # Those comments are where a reader checks what the phase budget covers and in
+  # what order it is spent, which makes them the one place a collector added to
+  # the phase is most useful and most easily forgotten -- the ceiling line four
+  # lines above gets edited because a test compares it, and the list below it
+  # did not because nothing did. This is that nothing.
+  #
+  # Position, not just presence. The list's whole subject is the ORDER, since
+  # what a spent budget declines is whatever has not started; a presence check
+  # would accept the new collector appended at the bottom next to the two
+  # collectors it is deliberately ahead of, and the comment would then describe
+  # the opposite of what the block does.
+  #
+  # Both sides are derived. The call order comes from the source, and each
+  # collector with no entry in the phrase table fails here rather than being
+  # skipped, which is how the list went stale in the first place.
+  #
+  # Keyed on the `|| true` call suffix rather than on cozy_diag_phase_has_time,
+  # and the two sets are not identical: cozy_report_guest_console_wedge is
+  # called that way and is NOT behind the gate, which is why it needs an arm of
+  # its own below. The call suffix is what this test can order; the gate is a
+  # separate line from the call it guards.
+  gated=$(grep -nE '^ *(cozy_(capture|report)_[a-z_]+|[a-z_]+_diagnose) [^|]*\|\| true|^ *(cozy_(capture|report)_[a-z_]+|[a-z_]+_diagnose) \|\| true' "$lib" \
+    | sed -E 's/:[[:space:]]*/:/; s/(:[a-z_]+) .*/\1/; s/\|\|.*//')
+  if [ -z "$gated" ]; then
+    echo "found no gated collector at all, so this test checked nothing" >&2
+    exit 1
+  fi
+  # Only the calls inside the diagnostics block. The same collector may also be
+  # called from elsewhere in the file -- the exit handler classifies the tenant
+  # HelmReleases on every other failing path -- and such a call belongs to no
+  # phase and has no place in this order. Matched on position rather than
+  # exempted by name, so a second call added INSIDE the block still has to
+  # appear in the list.
+  block=$(grep -n '^cozy_report_node_join_failure()' "$lib" | cut -d: -f1)
+  if [ -z "$block" ]; then
+    echo "expected to find the node-join diagnostics block in $lib" >&2
+    exit 1
+  fi
+  # Bounded at both ends: without the closing brace every collector call below
+  # the block, run_kubernetes_test's included, would be read as inside it.
+  block_end=$(awk -v b="$block" 'NR > b && /^}/ { print NR; exit }' "$lib")
+  if [ -z "$block_end" ]; then
+    echo "expected to find the end of the node-join diagnostics block in $lib" >&2
+    exit 1
+  fi
+  expected=
+  for entry in $gated; do
+    line=${entry%%:*}
+    fn=${entry#*:}
+    [ "$line" -gt "$block" ] || continue
+    [ "$line" -lt "$block_end" ] || continue
+    case "$fn" in
+      cozy_capture_tenant_worker_cpu_throttle) phrase='worker CPU usage and throttling counters' ;;
+      cozy_capture_sandbox_node_cpu_time) phrase='sandbox node CPU time' ;;
+      cozy_capture_tenant_worker_thread_cpu) phrase='worker per-thread CPU time' ;;
+      cozy_capture_tenant_worker_network_counters) phrase='worker network counters' ;;
+      cozy_capture_tenant_worker_block_io) phrase='worker block IO counters' ;;
+      cozy_capture_tenant_serial_console) phrase='serial-console family' ;;
+      cozy_capture_tenant_talos) phrase='guest Talos capture' ;;
+      cozy_report_helmrelease_remediation) phrase='HelmRelease remediation footprint' ;;
+      talos_image_cache_diagnose) phrase='talos-image-cache diagnosis' ;;
+      # Called with the same suffix but not behind the phase gate: it runs ahead
+      # of the headline so the console experiment's own failure is named before
+      # the wording that matches the bug it studies, and it is not part of what
+      # the budget covers.
+      cozy_report_guest_console_wedge) continue ;;
+      # Called the same way and also not behind the gate. Its first reading was
+      # taken before the node-join wait, so it is not something the budget hands
+      # out or withholds: declining it would leave that earlier reading with
+      # nothing to pair against rather than save the phase any time.
+      cozy_capture_sandbox_kvm_exits) continue ;;
+      # The other two halves of that same pair, exempt on the same ground and not
+      # on their own: each was read once before the node-join wait, so what runs
+      # here is the second half of a measurement rather than a collector the
+      # budget may hand out or withhold.
+      cozy_capture_runner_kernel_cpu_time) continue ;;
+      cozy_capture_sandbox_qemu_thread_cpu) continue ;;
+      # The fourth bracket half, and also not behind the gate.
+      cozy_capture_runner_canary) continue ;;
+      # This is outside the failure diagnostics phase and deliberately remains
+      # best-effort: a missing timing report must not turn a completed join red.
+      cozy_report_node_join_timing) continue ;;
+      *)
+        echo "$fn runs in the diagnostics block but this test has no phrase for it; add one here and to both chainsaw comments" >&2
+        exit 1
+        ;;
+    esac
+    expected="${expected}${phrase}
+"
+  done
+  for f in hack/e2e-chainsaw/kubernetes-latest/chainsaw-test.yaml \
+    hack/e2e-chainsaw/kubernetes-previous/chainsaw-test.yaml; do
+    actual=
+    while IFS= read -r phrase; do
+      [ -n "$phrase" ] || continue
+      line=$(grep -n "$phrase" "$f" | head -n 1 | cut -d: -f1)
+      if [ -z "$line" ]; then
+        echo "$f does not list the spend-order entry: $phrase" >&2
+        exit 1
+      fi
+      actual="${actual}${line} ${phrase}
+"
+    done <<EOF
+$expected
+EOF
+    # Sorting the located lines numerically must reproduce the call order. A
+    # mismatch means the comment and the block disagree about which collector
+    # the budget gives up first, which is the only thing this list is read for.
+    if [ "$(printf '%s' "$actual" | sort -n | sed -E 's/^[0-9]+ //')" != "$(printf '%s' "$actual" | sed -E 's/^[0-9]+ //')" ]; then
+      echo "$f lists the collectors in a different order than the block runs them" >&2
+      printf '%s\n' "$actual" >&2
+      exit 1
+    fi
+  done
+}
+
+@test "nothing new runs between the KVM reading and the two beside it" {
+  lib=hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  # The interval each of the three pairs divides by is whatever runs between its
+  # two readings, and on the failure path that is everything the block does before
+  # the second one. The KVM guard below pins what may precede ITS reading; this
+  # pins the gap between that reading and the two that follow it, which is where
+  # the other two intervals actually widen. Nothing belongs in there: the three
+  # readings are the second halves of three pairs and are meant to be adjacent.
+  block=$(grep -n '^cozy_report_node_join_failure() {' "$lib" | head -n 1 | cut -d: -f1)
+  kvm=$(awk -v b="$block" 'NR > b && /cozy_capture_sandbox_kvm_exits 2/ { print NR; exit }' "$lib")
+  last=$(awk -v b="$block" 'NR > b && /cozy_capture_sandbox_qemu_thread_cpu 2/ { print NR; exit }' "$lib")
+  for v in block kvm last; do
+    eval "n=\$$v"
+    if [ -z "$n" ]; then
+      echo "expected to read $v from $lib; without it this guard reports success for having lost its input" >&2
+      return 1
+    fi
+  done
+  if [ "$last" -le "$kvm" ]; then
+    echo "expected the QEMU thread reading (line $last) to follow the KVM one (line $kvm) inside the failure block" >&2
+    return 1
+  fi
+  # Matched on the call rather than on the `|| true` suffix, for the reason the
+  # KVM guard gives: the suffix says a call is phase-gated and says nothing about
+  # what costs time, and the dominant idiom in this block is `cozy_diag_read`
+  # with no suffix at all.
+  between=$(grep -nE '^ *(cozy_capture_[a-z_]+|cozy_report_[a-z_]+|cozy_diag_read|[a-z_]+_diagnose)( |$)' "$lib" \
+    | sed -E 's/:[[:space:]]*/:/; s/(:[a-z_]+) .*/\1/' \
+    | awk -F: -v a="$kvm" -v b="$last" '$1 > a && $1 < b { print $2 }')
+  case "$(printf '%s\n' $between)" in
+    'cozy_capture_runner_kernel_cpu_time') ;;
+    *)
+      echo "more than the runner kernel reading now runs between the KVM reading and the QEMU thread one, so those two intervals are wider than the wait by whatever it costs:" >&2
+      printf '%s\n' $between >&2
+      return 1
+      ;;
+  esac
+}
+
+@test "the KVM counter readings sit on either side of the node-join wait on both paths" {
+  lib=hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  # What this pair measures is decided by where its two calls sit, not by
+  # anything inside the collector: the counters carry running totals, so the
+  # interval a difference divides by is whatever runs between the readings.
+  #
+  # The failure path gets that for free -- the second reading is among the first
+  # things the failure block does, so the interval is the wait. The passing path
+  # does not. Everything from the kubelet-version check through the storage and
+  # LoadBalancer assertions runs after the wait, and the comment above the wait
+  # prices that tail at ten to fifteen minutes, so a second reading placed after
+  # it prices a different window over a different workload while the capture's
+  # own legend says it priced the join. Since the green run is what the red ones
+  # are read against, that does not merely widen the green number, it removes
+  # the comparison the collector exists for.
+  # Anchored on the wait's own body rather than on its shape: `timeout Nm bash -c`
+  # matches more than one line in the library, and picking the first would
+  # re-anchor this check the day another one is added above it.
+  wait_line=$(awk '/^  timeout [0-9]+m bash -c/ { cand = NR; next } cand && NR == cand + 1 && /get nodes --no-headers/ { print cand; exit } { cand = 0 }' "$lib")
+  first=$(grep -n 'cozy_capture_sandbox_kvm_exits 1' "$lib" | head -n 1 | cut -d: -f1)
+  # The green second reading, found as the one after the wait rather than by
+  # position in the file: the other call with the same argument is the failure
+  # block's, and picking by count would be right only while the two happen to be
+  # written in this order.
+  green=$(awk -v w="$wait_line" 'NR > w && /cozy_capture_sandbox_kvm_exits 2/ { print NR; exit }' "$lib")
+  # The first thing the happy path does with the tenant cluster once the wait
+  # returns. It stands in for the whole tail rather than for itself.
+  tail_line=$(grep -n '^  versions=\$(kubectl --kubeconfig' "$lib" | head -n 1 | cut -d: -f1)
+  for v in wait_line first green tail_line; do
+    eval "n=\$$v"
+    if [ -z "$n" ]; then
+      echo "expected to read $v from $lib; without it this guard reports success for having lost its input" >&2
+      return 1
+    fi
+  done
+  if [ "$first" -ge "$wait_line" ]; then
+    echo "the first KVM counter reading (line $first) is not taken before the node-join wait (line $wait_line), so the pair does not span it" >&2
+    return 1
+  fi
+  if [ "$green" -le "$wait_line" ]; then
+    echo "the passing path's second KVM counter reading (line $green) is not after the wait (line $wait_line)" >&2
+    return 1
+  fi
+  if [ "$green" -ge "$tail_line" ]; then
+    echo "the passing path's second KVM counter reading (line $green) is taken after the suite's happy-path tail begins (line $tail_line), so the green interval covers minutes of work the red one does not and the two are no longer comparable" >&2
+    return 1
+  fi
+  # And the same claim on the failing side, which is the half that has no
+  # equivalent of the tail to fail against and so would otherwise widen in
+  # silence. The failure block's own reads are bounded and small against a
+  # 29m node-join wait, so this is not about today's arithmetic; it is that a collector
+  # inserted ahead of the reading later moves the red interval while the
+  # symmetric mistake on the green side fails loudly.
+  red=$(awk -v w="$wait_line" 'NR < w && /cozy_capture_sandbox_kvm_exits 2/ { line = NR } END { if (line) print line }' "$lib")
+  node_table=$(grep -n "cozy_diag_read 'tenant node table'" "$lib" | head -n 1 | cut -d: -f1)
+  for v in red node_table; do
+    eval "n=\$$v"
+    if [ -z "$n" ]; then
+      echo "expected to read $v from $lib; without it this half of the guard reports success for having lost its input" >&2
+      return 1
+    fi
+  done
+  if [ "$red" -ge "$node_table" ]; then
+    echo "the failure path's second KVM counter reading (line $red) is taken after the diagnostics block has started reading the cluster (line $node_table), so the red interval is the wait plus whatever those reads cost" >&2
+    return 1
+  fi
+  # And what is allowed to run in front of it, by name. The check above bounds
+  # the reading against one later line; it does not notice a collector inserted
+  # between the block's first line and the reading, which is the way the red
+  # interval actually widens. One collector is there on purpose -- the wedge
+  # check, which has to name the console experiment's own failure before the
+  # headline whose wording matches the bug it studies -- and it is two bounded
+  # reads. Anything joining it has to be a decision rather than a diff nobody
+  # priced, so the set is pinned to that one name.
+  block=$(grep -n '^cozy_report_node_join_failure() {' "$lib" | head -n 1 | cut -d: -f1)
+  if [ -z "$block" ]; then
+    echo "expected the failure block to still be a function in $lib; without it this half of the guard reports success for having lost its input" >&2
+    return 1
+  fi
+  # Matched on the call, not on the `|| true` suffix the other guards key on.
+  # The suffix is what makes a call gated by the phase; it says nothing about
+  # what costs time, and the dominant idiom inside this block is `cozy_diag_read`
+  # with no suffix at all. Keyed on the suffix, this check would accept exactly
+  # the insertion it exists to refuse. `cozy_diag_phase_*` is out because it is
+  # bookkeeping rather than a read, and the trailing space or end-of-line keeps
+  # a function definition from matching its own call form.
+  ahead_of_red=$(grep -nE '^ *(cozy_capture_[a-z_]+|cozy_report_[a-z_]+|cozy_diag_read|[a-z_]+_diagnose)( |$)' "$lib" \
+    | sed -E 's/:[[:space:]]*/:/; s/(:[a-z_]+) .*/\1/' \
+    | awk -F: -v b="$block" -v r="$red" '$1 > b && $1 < r { print $2 }')
+  case "$(printf '%s\n' $ahead_of_red)" in
+    cozy_report_guest_console_wedge) ;;
+    '')
+      echo "found no collector at all ahead of the failure path's KVM reading; the wedge check belongs there, so this half of the guard checked nothing" >&2
+      return 1
+      ;;
+    *)
+      echo "more than the wedge check now runs between the failure block's start and its KVM counter reading, so the red interval is wider than the wait by whatever those collectors cost:" >&2
+      printf '%s\n' $ahead_of_red >&2
+      return 1
+      ;;
+  esac
+}
+
+@test "both KVM counter readings report a shortfall to the job log, not only to the report" {
+  lib=hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  # The status exists to make a line print, and the reason is not symmetry with
+  # the collectors inside the diagnostics block, which are called `|| true` and
+  # whose whole record is the report. Both of these readings run outside that
+  # block -- one before the node-join wait, one after it on the passing path --
+  # and a passing run's report is the artifact nobody opens.
+  # docs/agents/e2e-testing.md requires what a passing-path collector could not
+  # collect at all to reach the job log. The guest console capture on the
+  # passing path is consumed the same way for the same reason, and its own suite
+  # pins that shape; this one had nothing pinning it, so rewriting both sites to
+  # `|| true` was invisible to every test in the tree.
+  #
+  # Derived from the source rather than restated, like the call-order checks
+  # above: what is pinned is the shape, one `if !` and one warning line per
+  # call site, not the wording of either.
+  calls=$(grep -c 'if ! cozy_capture_sandbox_kvm_exits [12]; then' "$lib")
+  warns=$(grep -c "» WARNING: the sandbox kernel's KVM counters yielded no reading" "$lib")
+  if [ "$calls" -ne 2 ]; then
+    echo "expected both KVM counter readings outside the diagnostics block to consume the collector's status with 'if !', found $calls" >&2
+    return 1
+  fi
+  if [ "$warns" -ne 2 ]; then
+    echo "expected each of those two call sites to put its shortfall in the job log, found $warns warning lines" >&2
+    return 1
+  fi
+}
+
+@test "the declined path leaves no shell error in the diagnostics log" {
+  # The chainsaw script that calls this runs under `set -eu`, and the declined
+  # path is where a variable assigned only inside the phase gate gets read
+  # afterwards. A shell error in this log is not cosmetic: every other line is
+  # written to mean something exact, and one that does not teaches the next
+  # reader to skim.
+  #
+  # It runs in a subprocess rather than in this file's shell, and the reason is
+  # not `set -u` being off in here -- it is on, `$-` carries `u`. cozytest.sh is
+  # `#!/bin/sh` and dot-sources the transformed test file, so on a host where
+  # /bin/sh is bash 3.2 (macOS) the body runs under semantics where `local x`
+  # with no assignment yields an empty-but-SET variable. `set -u` then has
+  # nothing to fire on, and an assertion written in here would pass against the
+  # broken code.
+  #
+  # Which is also why the shell is probed before the assertion is trusted: on
+  # such a host this check cannot show the defect at all, and it says so instead
+  # of reporting a pass it did not earn.
+  if bash -c 'set -u; f() { local a; printf "%s" "${a}"; }; f' >/dev/null 2>&1; then
+    echo "not checked: this bash reads an unset local as empty, so set -u cannot surface the defect here" >&2
+    return 0
+  fi
+  tmp=$(mktemp -d)
+  use_temp_report_dir "$tmp"
+  stage_exec_recorders "$tmp"
+  PATH="$tmp/exec-bin:$PATH" bash -c '
+    set -eu
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    cozy_report_guest_console_wedge() { :; }
+    cozy_capture_tenant_serial_console() { :; }
+    cozy_capture_tenant_talos() { :; }
+    talos_image_cache_diagnose() { :; }
+    cozy_capture_tenant_worker_cpu_throttle() { :; }
+    cozy_capture_tenant_worker_network_counters() { :; }
+    cozy_capture_sandbox_kvm_exits() { :; }
+    cozy_capture_runner_kernel_cpu_time() { :; }
+    cozy_capture_sandbox_qemu_thread_cpu() { :; }
+    cozy_capture_runner_canary() { :; }
+    cozy_capture_tenant_worker_block_io() { :; }
+    timeout() { :; }
+    kubectl() { :; }
+    COZY_DIAG_PHASE_BUDGET=0
+    cozy_report_node_join_failure test-latest-version
+  ' >"$tmp/out" 2>&1 || true
+
+  if grep -q 'unbound variable' "$tmp/out"; then
+    echo "FAIL: the declined path put a shell error in the diagnostics log:" >&2
+    grep 'unbound variable' "$tmp/out" >&2
+    false
+  fi
+  # Not vacuous: the phase really did decline, so the run above walked the path
+  # the assertion is about rather than returning early somewhere else.
+  assert_file_contains 'not collected' "$tmp/out"
+  assert_no_exec_calls "$tmp"
+  rm -rf "$tmp"
+}
+
+@test "the phase budget leaves the snapshot its time after the phase overshoots and the comments quote the same number" {
+  # This is the inequality the budget is derived from, held so the next collector
+  # added cannot break it quietly:
+  #
+  #   budget + largest collector cost + snapshot <= op - bringup
+  #
+  # `bringup` is not one figure but three, and only the first is a literal.
+  #
+  # `prejoin` is what the run spends before the node-join wait starts, and there is
+  # no expression that yields it. An observed figure and not a ceiling,
+  # deliberately: the bringup's own bounded waits already exceed the whole op
+  # between them -- two ten-minute HelmRelease waits alone -- so a guard written
+  # against those would assert a worst case nobody can state. It is the figure this
+  # guard carried for the whole path to the failure, with the deadline that used to
+  # sit inside it taken out and read from source instead. That split is the point:
+  # raising the deadline moves `bringup` and leaves this term alone. Re-measuring
+  # it takes a green run's own timings, not arithmetic on this page.
+  #
+  # The deadline and the four readings taken between the bringup and the wait are
+  # read from the source that sets them instead, so raising either moves this term
+  # rather than leaving it behind. Until they were, a collector added before the
+  # wait moved the real figure while a single literal sat still.
+  #
+  # `largest` is the heaviest collector's cost at the pool's MINIMUM size, so it is a
+  # floor rather than a ceiling. It is here because admission gates when a collector
+  # may START: one let in a moment early still runs its whole cost, and a guard that
+  # drops that term accepts a budget under which the phase finishes past the window.
+  #
+  # So this catches a budget raised past what today's collectors leave room for, and
+  # a node-join deadline raised past what the operation can carry behind it, and
+  # nothing else. It does not cover the guest-Talos walk growing with the pool, which
+  # carries no cap; nor the collector gated last, whose image-cache re-probe has no
+  # wall-clock bound at all; nor a bounded read gated ahead of the console outside
+  # `cozy_… || true` call form the sibling guard enumerates, as the LINSTOR resource
+  # state read is, whose cost is therefore not summed here; nor a new collector heavier
+  # than the literal, since nothing makes one move it; nor whatever the bringup spends
+  # that `prejoin` does not observe. Those are the residuals, and the first three exist
+  # today rather than hypothetically. All are tracked in cozystack/cozystack#3666.
+  prejoin=420
+  # 620 was this figure while the guest-Talos walk ran two commands per worker.
+  # It now runs four: the service list and the link table were added at a 10s
+  # bound with the usual 5s kill grace, which is 2 x 2 x 15 = 60 more seconds
+  # across the two-worker minimum pool. Derived as a delta on the previous
+  # number rather than recomputed from the walk, deliberately: a fresh
+  # enumeration that missed a step would LOWER this term and loosen the guard
+  # while looking like it had tightened it, and the delta is the part this
+  # change is answerable for.
+  largest=680
+  lib=hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  read_cost_inputs "$lib" || exit 1
+  # Read from the named default rather than from the `:-` expansion: the defaults are
+  # declared once as constants, so that is where the number lives now.
+  budget=$(grep -oE '^COZY_DIAG_PHASE_BUDGET_DEFAULT=[0-9]+' "$lib" | head -n 1 | sed -E 's/.*=//')
+  # The node-join deadline, read off the wait itself. Raising it is exactly the
+  # change this guard exists to follow, so a copy of the number here would sit
+  # still while the window it prices moved underneath it.
+  # Anchored on the wait's own body, like the sibling guard: `timeout Nm bash -c`
+  # matches more than one line here, so a shape match plus `head -n 1` would
+  # start reading a different wait the day one is added above this one.
+  join=$(awk '/^  timeout [0-9]+m bash -c/ { cand = $0; next } cand && /get nodes --no-headers/ { print cand; exit } { cand = "" }' "$lib" | grep -oE '[0-9]+')
+  # The operation the suites give the script, read from the constant that
+  # restates it. That constant is held against both suites' own `timeout:` by a
+  # guard in hack/run-kubernetes-serial-console_test.bats, so reading it here is
+  # reading the suites at one remove rather than trusting a third copy.
+  op=$(grep -oE '^COZY_OP_CEILING=[0-9]+' "$lib" | head -n 1 | sed -E 's/.*=//')
+  for v in budget join op; do
+    eval "n=\$$v"
+    if [ -z "$n" ]; then
+      echo "expected to read $v from $lib; without it this guard reports success for having lost its input" >&2
+      exit 1
+    fi
+  done
+  # What the four readings that bracket the wait spend on its near side. Their
+  # first halves are taken while the bringup is still running, so they belong in
+  # this term or in none. Three are bounded reads -- one of which opens a file
+  # per sandbox node before its walk -- and the fourth is the canary's arms,
+  # each under a ceiling of its own.
+  prewait=$(( arms * (canary + grace) + (qemu_reads + 2) * (bound + grace) ))
+  bringup=$(( prejoin + (join * 60) + prewait ))
+  # The snapshot's own wall-clock bound, read from the source rather than restated,
+  # since a budget that leaves room for a number the collector no longer uses
+  # leaves room for nothing.
+  snapshot=$(grep -oE 'timeout -k 30 [0-9]+ crust-gather' "$lib" | head -n 1 \
+    | sed -E 's/.*-k 30 ([0-9]+).*/\1/')
+  # Checked like `budget` above, and for a sharper reason: an empty match makes
+  # $((snapshot + 30)) evaluate to 30, and the inequality then passes on a term
+  # 360 seconds too small -- a guard that reports success because it lost its input.
+  if [ -z "$snapshot" ]; then
+    echo "expected to read the tenant snapshot's own bound from $lib" >&2
+    exit 1
+  fi
+  snapshot=$((snapshot + 30))
+  window=$((op - bringup))
+  if [ "$((budget + largest + snapshot))" -gt "$window" ]; then
+    echo "phase budget ${budget}s + largest collector ${largest}s + snapshot ${snapshot}s exceeds the ${window}s left after ${bringup}s of bringup" >&2
+    echo "the phase can then end past the point where the snapshot still fits, which is what the budget exists to prevent" >&2
+    exit 1
+  fi
+  # And the comment a reader checks the ceiling against has to carry the same
+  # number the code uses; this is the pair that has to stay in step.
+  minutes=$((budget / 60))
+  for f in hack/e2e-chainsaw/kubernetes-latest/chainsaw-test.yaml \
+    hack/e2e-chainsaw/kubernetes-previous/chainsaw-test.yaml; do
+    if ! grep -q "own ${minutes}m wall-clock budget" "$f"; then
+      echo "expected $f to state the phase budget as ${minutes}m" >&2
+      exit 1
+    fi
+  done
+}
+
+@test "the block returns zero even when every read fails so the caller keeps its exit" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  stub_collectors
+  tmp=$(mktemp -d)
+  use_temp_report_dir "$tmp"
+  kubectl_calls="$tmp/kubectl.calls"
+  unbounded_calls="$tmp/unbounded.calls"
+  timeout_calls="$tmp/timeout.calls"
+  # Every kubectl invocation carries a dash somewhere, so this refuses all of them.
+  kubectl_fail_match='-'
+  kubectl_fail_rc=1
+
+  rc=0
+  ( set +x; cozy_report_node_join_failure test-latest-version ) >"$tmp/out" 2>&1 || rc=$?
+
+  # The caller chooses the exit, and on the node-join path that choice is what
+  # the tenant snapshot keys on. A non-zero return here replaces it under
+  # `set -e`, so a collector that could not read anything would decide the
+  # suite's exit status instead.
+  [ "$rc" -eq 0 ]
+  rm -rf "$tmp"
+}
+
+@test "the node-join deadline leaves an annotation and does not touch the exit" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  use_temp_report_dir "$tmp"
+  export COZY_SNAPSHOT_NAME=kubernetes-latest
+
+  # `set +x` like every other capture in this file, and here it is the assertion
+  # that depends on it rather than the readability: cozytest.sh runs each test
+  # under `set -x`, the trace of the `echo` carries the annotation text verbatim,
+  # and it lands in the same file this test then greps. Left traced, the
+  # assertions below pass against a collector that emits nothing -- and only
+  # under the runner CI actually uses.
+  rc=0
+  ( set +x; cozy_note_node_join_deadline test-latest-version ) >"$tmp/out" 2>&1 || rc=$?
+
+  # This function records; the caller fails. A non-zero return here would reach
+  # the caller under `set -e` and replace the exit it chose, which is the one
+  # thing a recorder must not do.
+  [ "$rc" -eq 0 ]
+  # Asserted as an annotation and not merely as a line of text: the `::warning`
+  # has to start the line or GitHub renders it as ordinary log output.
+  assert_file_contains '::warning title=node-join::' "$tmp/out"
+  # And it carries the deadline it is about. A warning that says only "the join
+  # failed" leaves a reader unable to tell it from the wait having been raised.
+  assert_file_contains 'Ready within 29m' "$tmp/out"
+  # It names the suite, because the report holds one directory per suite and a
+  # run carries more than one tenant cluster.
+  assert_file_contains 'test-latest-version' "$tmp/out"
+  # `::error` over a step that exits zero states a contradiction, and GitHub
+  # renders it beside genuine failures.
+  assert_file_lacks_pattern '::error' "$tmp/out"
+
+  unset COZY_SNAPSHOT_NAME
+  rm -rf "$tmp"
+}
+
+@test "no exit in the suite body is a zero, and the deadline annotation is gated" {
+  lib=hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  # The suite fails on every failure it has, the node-join deadline included.
+  # That is what keeps Chainsaw's catch running and the report honest: a zero
+  # exit here would buy a green check by throwing away the four collectors keyed
+  # on the test failing, which is the shape this design exists to avoid.
+  #
+  # What this holds is that shape, and it is worth saying what it does not: it
+  # does not prove every remaining assertion still fails the suite -- a `|| true`
+  # appended to one of them is invisible here, and telling that apart from the
+  # `|| true` every collector legitimately carries needs a classification this
+  # file does not have.
+  # The function's own control flow, not a program it hands to something else.
+  # The hairpin probe passes a shell script to `sh -c` inside a Pod, and that
+  # script's `exit 0` decides the Pod's status rather than the suite's -- so the
+  # quoted argument is cut out here rather than separated by indentation, which
+  # is what an earlier version of this guard tried: the function's own arms
+  # reach twelve spaces, so any depth bound that excluded the Pod excluded two
+  # levels of real control flow with it. If the quoting around that argument
+  # ever changes shape, the cut stops matching and its `exit 0` is counted --
+  # the guard fails loudly rather than quietly widening.
+  body=$(awk '
+    !inf && /^run_kubernetes_test\(\)/ { inf = 1; next }
+    !inf { next }
+    /^}/ { exit }
+    /--command -- sh -c "/ { inpod = 1; next }
+    inpod { if ($0 ~ /^ *"$/) { inpod = 0 } next }
+    { print }
+  ' "$lib")
+  if [ -z "$body" ]; then
+    echo "expected to read run_kubernetes_test from $lib; without it this guard checked nothing" >&2
+    return 1
+  fi
+  # What this counts is `exit 0` written out. A `return 0` from the function, or
+  # an `exit "$rc"` that happens to carry zero, is outside what a source walk can
+  # see, and saying so is cheaper than implying the walk is exhaustive.
+  zeros=$(printf '%s\n' "$body" | grep -cE '^ *exit 0$' || true)
+  if [ "$zeros" -ne 0 ]; then
+    echo "run_kubernetes_test has $zeros zero exits of its own; a failure that exits zero takes Chainsaw's catch, the previous-instance logs, the host snapshot and the event dump with it, and buys a green check with the evidence" >&2
+    return 1
+  fi
+  # And the annotation sits inside the branch the node-join wait opens, under
+  # the test that says which non-zero the wrapper gave. Without that gate the
+  # branch announces an expired deadline for a wait that could not run at all,
+  # which is a different claim about a different failure.
+  # Anchored on the wait's own body rather than on its shape: `timeout Nm bash -c`
+  # matches more than one line in the library, and picking the first would
+  # re-anchor this check the day another one is added above it.
+  wait_line=$(awk '/^  timeout [0-9]+m bash -c/ { cand = NR; next } cand && NR == cand + 1 && /get nodes --no-headers/ { print cand; exit } { cand = 0 }' "$lib")
+  call_line=$(grep -n 'cozy_note_node_join_deadline "' "$lib" | head -n 1 | cut -d: -f1)
+  gate_line=$(grep -n 'if cozy_node_join_deadline_expired ' "$lib" | head -n 1 | cut -d: -f1)
+  for v in wait_line call_line gate_line; do
+    eval "n=\$$v"
+    if [ -z "$n" ]; then
+      echo "expected to read $v from $lib; without it this guard reports success for having lost its input" >&2
+      return 1
+    fi
+  done
+  # The discriminator is 124, which `timeout` gives when it fired. A `-k` on this
+  # call -- the house idiom on every other bounded read in the file -- makes a
+  # child that ignores SIGTERM come back as 137 instead, and the branch then
+  # silently stops recognising the case it was written for: the run still fails,
+  # but it stops saying the deadline is why.
+  if sed -n "${wait_line}p" "$lib" | grep -q ' -k '; then
+    echo "the node-join wait carries -k; a child that ignores SIGTERM then returns 137 rather than 124, and the deadline branch stops recognising its own case" >&2
+    return 1
+  fi
+  end_line=$(awk -v s="$wait_line" 'NR > s && /^  fi$/ { print NR; exit }' "$lib")
+  if [ -z "$end_line" ]; then
+    echo "expected the node-join wait's branch to close in $lib" >&2
+    return 1
+  fi
+  if [ "$call_line" -lt "$wait_line" ] || [ "$call_line" -gt "$end_line" ]; then
+    echo "cozy_note_node_join_deadline is called at line $call_line, outside the node-join wait's failure branch (lines $wait_line to $end_line); the annotation covers that deadline and nothing else" >&2
+    return 1
+  fi
+  if [ "$gate_line" -lt "$wait_line" ] || [ "$gate_line" -gt "$call_line" ]; then
+    echo "the annotation at line $call_line is not gated by cozy_node_join_deadline_expired between the wait (line $wait_line) and itself; a branch that annotates whatever the wrapper returned reports slow workers for a wait that never ran" >&2
+    return 1
+  fi
+}
+
+@test "only the status that means the deadline expired is reported as one" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  # 124 is what `timeout` returns when it fired, and it is the whole of what the
+  # deadline branch is about. The wrapper's other failures arrive in the same
+  # shape and mean the wait did not run: 125 is `timeout` itself failing, 126 and
+  # 127 are the shell being unusable or absent, and 128+n is that shell killed by
+  # a signal -- 137 above all, which on this path is the OOM killer on a loaded
+  # runner. Reporting any of those as "the workers were slow" is the one claim
+  # this must not start making.
+  if ! cozy_node_join_deadline_expired 124; then
+    echo "exit 124 is timeout firing, and it is the status the deadline branch exists for" >&2
+    return 1
+  fi
+  for rc in 1 2 125 126 127 137 143; do
+    if cozy_node_join_deadline_expired "$rc"; then
+      echo "exit $rc was read as the node-join deadline expiring; that status means the wait did not run, and announcing it reports a slow cluster for a broken harness" >&2
+      return 1
+    fi
+  done
+}
+
+@test "every minute figure written beside a node-join referent is the deadline" {
+  lib=hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  minutes=$(awk '/^  timeout [0-9]+m bash -c/ { cand = $0; next } cand && /get nodes --no-headers/ { print cand; exit } { cand = "" }' "$lib" | grep -oE '[0-9]+')
+  if [ -z "$minutes" ]; then
+    echo "expected to read the node-join deadline from $lib; without it this guard reports success for having lost its input" >&2
+    return 1
+  fi
+  # The deadline is quoted in the failure headline, in the warning annotation, in
+  # the marker, and in comments across six files that reason about how long the
+  # wait is. Swept by what the sentence is ABOUT rather than by exact string: the
+  # copies say it in different words -- "Ready within", "became Ready inside",
+  # "node-Ready wait", "node-join budget" -- and a sweep by one spelling finds
+  # whichever copy it was written from and leaves the rest quoting a deadline
+  # that moved.
+  #
+  # What it can reach, said rather than implied, because the boundary is where
+  # this stops being a guarantee: grep is line-based, so a figure only counts as
+  # quoted about the node-join when it shares a line with something naming the
+  # node-join. Every copy in the tree was written or rewrapped to satisfy that;
+  # a future one that puts the referent a line away is outside this sweep and
+  # nothing here will notice, and so is one that spells the figure in words.
+  # Both spellings of the unit are in, `29m` and `29 minutes`, because prose
+  # written for a reader tends to the second and a sweep that saw only the first
+  # would leave the documentation quoting a deadline that moved.
+  pattern='(node-join|node-Ready|nodes Ready|become Ready|became Ready|Ready within)[^0-9]{0,60}[0-9]+ ?m|[0-9]+ ?m[^0-9]{0,30}(node-join|node-Ready|nodes Ready)'
+  quoted=$(grep -rnE "$pattern" hack/ docs/ || true)
+  count=$(printf '%s\n' "$quoted" | grep -c . || true)
+  # A floor, not a count: the sweep is worth nothing if the sentence stopped
+  # being written anywhere, and every branch below would then agree vacuously.
+  # Set just under what the tree carries today, so a copy going out of reach is
+  # noticed while a copy legitimately deleted is not a failure.
+  if [ "$count" -lt 15 ]; then
+    echo "this pattern found the node-join deadline quoted in $count places, and the tree quotes it in more than that; it has stopped matching what it was written to sweep, so the check below would pass over whatever it no longer sees" >&2
+    return 1
+  fi
+  stale=$(printf '%s\n' "$quoted" | grep -vE "${minutes}m|${minutes} minutes" || true)
+  if [ -n "$stale" ]; then
+    echo "these quote a node-join deadline that is not the ${minutes}m the wait gives:" >&2
+    printf '%s\n' "$stale" >&2
+    return 1
+  fi
+}
diff --git a/hack/run-kubernetes-oidc_test.bats b/hack/run-kubernetes-oidc_test.bats
new file mode 100644
index 0000000000..a9bcd2837b
--- /dev/null
+++ b/hack/run-kubernetes-oidc_test.bats
@@ -0,0 +1,310 @@
+#!/usr/bin/env bats
+# Unit coverage for the OIDC lifecycle folded into kubernetes-latest.
+# Sourcing run-kubernetes.sh only defines functions; every kubectl interaction
+# below is replaced with a shell stub, so this file needs no cluster.
+
+load test_helper
+
+@test "HelmRelease upgrade wait rejects stale Ready and stale observedGeneration" {
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    state_file=$(mktemp)
+    printf '0\n' > "$state_file"
+    kubectl() {
+        count=$(sed -n '1p' "$state_file")
+        count=$(( count + 1 ))
+        printf '%s\n' "$count" > "$state_file"
+        case "$count" in
+            1) printf '7|7|True|' ;;
+            2) printf '8|7|True|' ;;
+            *) printf '8|8|True|' ;;
+        esac
+    }
+    sleep() { :; }
+
+    cozy_wait_helmrelease_upgrade tenant-test kubernetes-demo 7 5 >/dev/null
+    [ "$(sed -n '1p' "$state_file")" -eq 3 ] || {
+        echo "the wait accepted Ready before both generation gates advanced" >&2
+        exit 1
+    }
+}
+
+@test "HelmRelease upgrade wait fails immediately on Stalled" {
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    calls=$(mktemp)
+    kubectl() {
+        printf '%s\n' "$*" >> "$calls"
+        case "$*" in
+            *" get helmrelease "*) printf '8|8|False|True' ;;
+            *" describe helmrelease "*) return 0 ;;
+            *) return 1 ;;
+        esac
+    }
+    sleep() { echo "sleep must not run after Stalled=True" >&2; return 1; }
+
+    if cozy_wait_helmrelease_upgrade tenant-test kubernetes-demo 7 600 >/dev/null 2>&1; then
+        echo "a Stalled HelmRelease was accepted" >&2
+        exit 1
+    fi
+    [ "$(wc -l < "$calls")" -eq 2 ] || {
+        echo "the Stalled path did not stop after status plus diagnostics" >&2
+        cat "$calls" >&2
+        exit 1
+    }
+}
+
+@test "OIDC binding query fails when kubectl cannot list the bindings" {
+    # Piped straight into sort, the query took its status from sort, and a
+    # failed kubectl read as an empty binding list. The status has to hold
+    # without errexit too, because callers capture it in a substitution.
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    kubectl() { echo "the server is currently unable to handle the request" >&2; return 1; }
+
+    if cozy_oidc_bindings demo >/dev/null 2>&1; then
+        echo "a failed binding query was reported as success" >&2
+        return 1
+    fi
+}
+
+@test "System OIDC assertion proves rendered objects bootstrap kubeconfig and tenant RBAC" {
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    kubectl() {
+        case "$*" in
+            *" wait job kubernetes-demo-oidc-bootstrap "*) return 0 ;;
+            *" get kamajicontrolplane kubernetes-demo "*)
+                printf '[--authentication-config=/etc/kubernetes/authentication-config/config.yaml --requestheader-uid-headers=X-Remote-Uid]'
+                ;;
+            *" get secret kubernetes-demo-oidc-authn-config "*)
+                printf 'url: https://keycloak.example.test/realms/cozy\naudiences:\n- tenant-test-kubernetes-demo\nuid:\n  claim: sub\n' | base64 | tr -d '\n'
+                ;;
+            *" get keycloakclient.v1.edp.epam.com tenant-test-kubernetes-demo "*) printf 'true' ;;
+            *" get keycloakclientscope.v1.edp.epam.com tenant-test-kubernetes-demo-audience "*) printf 'oidc-audience-mapper' ;;
+            *" get secret kubernetes-demo-oidc-kubeconfig "*)
+                printf 'args:\n- oidc-login\n- --oidc-client-id=tenant-test-kubernetes-demo\n' | base64 | tr -d '\n'
+                ;;
+            *) echo "unexpected kubectl call: $*" >&2; return 1 ;;
+        esac
+    }
+    cozy_oidc_bindings() {
+        printf 'e2e-admin@example.test\tcluster-admin\ne2e-viewer@example.test\tview\n'
+    }
+
+    cozy_assert_oidc_system demo
+}
+
+@test "System OIDC assertion fails when the aggregation-layer UID header is missing" {
+    # Same mock as the passing case, minus --requestheader-uid-headers, so that
+    # flag is the only thing left to fail on. Drop the grep for it from the helper
+    # and this case goes red, which is what stops it passing for the wrong reason.
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    kubectl() {
+        case "$*" in
+            *" wait job kubernetes-demo-oidc-bootstrap "*) return 0 ;;
+            *" get kamajicontrolplane kubernetes-demo "*)
+                printf '[--authentication-config=/etc/kubernetes/authentication-config/config.yaml]'
+                ;;
+            *" get secret kubernetes-demo-oidc-authn-config "*)
+                printf 'url: https://keycloak.example.test/realms/cozy\naudiences:\n- tenant-test-kubernetes-demo\nuid:\n  claim: sub\n' | base64 | tr -d '\n'
+                ;;
+            *" get keycloakclient.v1.edp.epam.com tenant-test-kubernetes-demo "*) printf 'true' ;;
+            *" get keycloakclientscope.v1.edp.epam.com tenant-test-kubernetes-demo-audience "*) printf 'oidc-audience-mapper' ;;
+            *" get secret kubernetes-demo-oidc-kubeconfig "*)
+                printf 'args:\n- oidc-login\n- --oidc-client-id=tenant-test-kubernetes-demo\n' | base64 | tr -d '\n'
+                ;;
+            *) echo "unexpected kubectl call: $*" >&2; return 1 ;;
+        esac
+    }
+    cozy_oidc_bindings() {
+        printf 'e2e-admin@example.test\tcluster-admin\ne2e-viewer@example.test\tview\n'
+    }
+
+    # The subshell restores `set -e`, which the chainsaw step runs the helper
+    # under: without it a failing `grep -q` mid-function does not end the
+    # function, and the exit status comes from the last assertion instead.
+    #
+    # It has to stand as its own command, not as an `if` condition. Shells
+    # suppress errexit for a command whose status is being tested, and that
+    # suppression reaches inside the subshell too, which is why the plain
+    # `if ( set -e; ... )` spelling reports success here.
+    local rc=0
+    set +e
+    ( set -e; cozy_assert_oidc_system demo )
+    rc=$?
+    set -e
+    if [ "${rc}" -eq 0 ]; then
+        echo "the System assertion passed without --requestheader-uid-headers" >&2
+        return 1
+    fi
+}
+
+@test "System OIDC assertion fails when the uid claim mapping is missing" {
+    # Same mock as the passing case, minus the uid mapping, so that mapping is
+    # the only thing left to fail on. Without it a System-mode user is resolved
+    # to an empty UID and the published header carries nothing across the
+    # aggregation layer.
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    kubectl() {
+        case "$*" in
+            *" wait job kubernetes-demo-oidc-bootstrap "*) return 0 ;;
+            *" get kamajicontrolplane kubernetes-demo "*)
+                printf '[--authentication-config=/etc/kubernetes/authentication-config/config.yaml --requestheader-uid-headers=X-Remote-Uid]'
+                ;;
+            *" get secret kubernetes-demo-oidc-authn-config "*)
+                printf 'url: https://keycloak.example.test/realms/cozy\naudiences:\n- tenant-test-kubernetes-demo\n' | base64 | tr -d '\n'
+                ;;
+            *" get keycloakclient.v1.edp.epam.com tenant-test-kubernetes-demo "*) printf 'true' ;;
+            *" get keycloakclientscope.v1.edp.epam.com tenant-test-kubernetes-demo-audience "*) printf 'oidc-audience-mapper' ;;
+            *" get secret kubernetes-demo-oidc-kubeconfig "*)
+                printf 'args:\n- oidc-login\n- --oidc-client-id=tenant-test-kubernetes-demo\n' | base64 | tr -d '\n'
+                ;;
+            *) echo "unexpected kubectl call: $*" >&2; return 1 ;;
+        esac
+    }
+    cozy_oidc_bindings() {
+        printf 'e2e-admin@example.test\tcluster-admin\ne2e-viewer@example.test\tview\n'
+    }
+
+    # Standalone subshell, not an `if` condition: errexit is suppressed for a
+    # command whose status is tested, and that reaches inside the subshell.
+    local rc=0
+    set +e
+    ( set -e; cozy_assert_oidc_system demo )
+    rc=$?
+    set -e
+    if [ "${rc}" -eq 0 ]; then
+        echo "the System assertion passed without a uid claim mapping" >&2
+        return 1
+    fi
+}
+
+@test "CustomConfig transition fails when it cannot ask whether System leftovers are gone" {
+    # The teardown probes used `if kubectl get ... >/dev/null 2>&1`, which reads
+    # every non-zero exit as "the object is gone" -- including an RBAC denial, a
+    # timeout or a missing CRD -- so the suite reported a clean System teardown
+    # for never having observed one. --ignore-not-found separates the two.
+    #
+    # One probe is broken per iteration and the other two answer "absent", so
+    # each of the three is pinned individually: reverting any single one of them
+    # to the bare form lets that iteration pass and reddens this test. A test
+    # that merely broke all three would pass on any one surviving probe.
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    cozy_wait_helmrelease_upgrade() { :; }
+    cozy_oidc_bindings() { printf 'byo-admin@example.test\tcluster-admin\n'; }
+
+    for unaskable in \
+        'keycloakclient.v1.edp.epam.com tenant-test-kubernetes-demo' \
+        'keycloakclientscope.v1.edp.epam.com tenant-test-kubernetes-demo-audience' \
+        'secret kubernetes-demo-oidc-kubeconfig'; do
+        COZY_TEST_UNASKABLE="$unaskable"
+        kubectl() {
+            case "$*" in
+                *" get helmrelease kubernetes-demo "*) printf '7' ;;
+                *" patch kuberneteses.apps.cozystack.io demo "*) : ;;
+                *" wait job kubernetes-demo-oidc-bootstrap "*) return 0 ;;
+                *" get kamajicontrolplane kubernetes-demo "*)
+                    printf '[--authentication-config=/etc/kubernetes/authentication-config/config.yaml --requestheader-uid-headers=X-Remote-Uid]'
+                    ;;
+                *" get secret kubernetes-demo-oidc-authn-config "*)
+                    printf 'url: https://idp.byo.example.test\naudiences:\n- cozystack-byo-demo\n' | base64 | tr -d '\n'
+                    ;;
+                *"${COZY_TEST_UNASKABLE}"*--ignore-not-found*)
+                    # Cannot ask: an RBAC denial or an unreachable apiserver.
+                    return 1
+                    ;;
+                # Absent, the way kubectl reports it with the flag: exit 0, no output.
+                *--ignore-not-found*) : ;;
+                *) echo "unexpected kubectl call: $*" >&2; return 1 ;;
+            esac
+        }
+
+        if cozy_switch_and_assert_oidc_custom_config demo; then
+            echo "the transition passed while the probe for ${unaskable} could not answer" >&2
+            return 1
+        fi
+    done
+}
+
+@test "CustomConfig transition fails when the aggregation-layer UID header is missing" {
+    # The System helper's twin. Same mock as the passing transition below, minus
+    # --requestheader-uid-headers, so that flag is the only thing left to fail on.
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    kubectl() {
+        case "$*" in
+            *" get helmrelease kubernetes-demo "*) printf '7' ;;
+            *" patch kuberneteses.apps.cozystack.io demo "*) : ;;
+            *" wait job kubernetes-demo-oidc-bootstrap "*) return 0 ;;
+            *" get kamajicontrolplane kubernetes-demo "*)
+                printf '[--authentication-config=/etc/kubernetes/authentication-config/config.yaml]'
+                ;;
+            *" get secret kubernetes-demo-oidc-authn-config "*)
+                printf 'url: https://idp.byo.example.test\naudiences:\n- cozystack-byo-demo\n' | base64 | tr -d '\n'
+                ;;
+            *--ignore-not-found*) : ;;
+            *) echo "unexpected kubectl call: $*" >&2; return 1 ;;
+        esac
+    }
+    cozy_wait_helmrelease_upgrade() { :; }
+    cozy_oidc_bindings() { printf 'byo-admin@example.test\tcluster-admin\n'; }
+
+    # Standalone subshell, not an `if` condition: errexit is suppressed for a
+    # command whose status is tested, and that reaches inside the subshell.
+    local rc=0
+    set +e
+    ( set -e; cozy_switch_and_assert_oidc_custom_config demo )
+    rc=$?
+    set -e
+    if [ "${rc}" -eq 0 ]; then
+        echo "the transition passed without --requestheader-uid-headers" >&2
+        return 1
+    fi
+}
+
+@test "CustomConfig transition patches the live cluster waits for the new generation and rejects System leftovers" {
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    calls=$(mktemp)
+    wait_args=$(mktemp)
+    patch_body=$(mktemp)
+    kubectl() {
+        printf '%s\n' "$*" >> "$calls"
+        case "$*" in
+            *" get helmrelease kubernetes-demo "*) printf '7' ;;
+            *" patch kuberneteses.apps.cozystack.io demo "*)
+                previous=
+                for argument in "$@"; do
+                    if [ "$previous" = --patch ]; then
+                        printf '%s\n' "$argument" > "$patch_body"
+                        break
+                    fi
+                    previous="$argument"
+                done
+                ;;
+            *" wait job kubernetes-demo-oidc-bootstrap "*) return 0 ;;
+            *" get kamajicontrolplane kubernetes-demo "*)
+                printf '[--authentication-config=/etc/kubernetes/authentication-config/config.yaml --requestheader-uid-headers=X-Remote-Uid]'
+                ;;
+            *" get secret kubernetes-demo-oidc-authn-config "*)
+                printf 'url: https://idp.byo.example.test\naudiences:\n- cozystack-byo-demo\n' | base64 | tr -d '\n'
+                ;;
+            # Absence the way kubectl reports it under --ignore-not-found: exit 0
+            # and no output. The fail-closed half is pinned by the next test,
+            # not by this one -- here a bare probe would read the catch-all's
+            # non-zero exit as absence and pass.
+            *" get keycloakclient.v1.edp.epam.com tenant-test-kubernetes-demo --ignore-not-found"*) : ;;
+            *" get keycloakclientscope.v1.edp.epam.com tenant-test-kubernetes-demo-audience --ignore-not-found"*) : ;;
+            *" get secret kubernetes-demo-oidc-kubeconfig --ignore-not-found"*) : ;;
+            *) echo "unexpected kubectl call: $*" >&2; return 1 ;;
+        esac
+    }
+    cozy_wait_helmrelease_upgrade() { printf '%s\n' "$*" > "$wait_args"; }
+    cozy_oidc_bindings() { printf 'byo-admin@example.test\tcluster-admin\n'; }
+
+    cozy_switch_and_assert_oidc_custom_config demo
+    [ "$(sed -n '1p' "$wait_args")" = 'tenant-test kubernetes-demo 7 600' ] || {
+        echo "the transition did not wait from the pre-patch generation" >&2
+        cat "$wait_args" >&2
+        exit 1
+    }
+    jq -e '.spec.oidc.mode == "CustomConfig"' "$patch_body" >/dev/null
+    jq -e '.spec.oidc.users == [{"email":"byo-admin@example.test","role":"admin"}]' "$patch_body" >/dev/null
+    jq -er '.spec.oidc.customConfig.config' "$patch_body" | grep -q 'https://idp.byo.example.test'
+    jq -er '.spec.oidc.customConfig.config' "$patch_body" | grep -q 'cozystack-byo-demo'
+}
diff --git a/hack/run-kubernetes-remediation_test.bats b/hack/run-kubernetes-remediation_test.bats
new file mode 100644
index 0000000000..5f0b18e957
--- /dev/null
+++ b/hack/run-kubernetes-remediation_test.bats
@@ -0,0 +1,1661 @@
+#!/usr/bin/env bats
+# -----------------------------------------------------------------------------
+# Unit tests for cozy_guard_addon_helmreleases in
+# hack/e2e-chainsaw/_lib/run-kubernetes.sh
+#
+# cozy_guard_helmrelease judges one release; cozy_guard_addon_helmreleases runs
+# it over the addon releases a parent installs. One rule decides the verdict:
+# the run fails when a release whose install strategy is RetryOnFailure - the
+# tenant CNI and CSI and every Application HelmRelease - carries a "failed" or
+# "uninstalled" Snapshot. The same footprint on a release using the default
+# strategy, which remediates between retry attempts and which these addons pair
+# with retries: -1, is reported and left green.
+#
+# kubectl is stubbed from fixture files, so these tests exercise the wiring the
+# guard depends on - the name prefix that selects the addons, the readiness that
+# interprets an empty history, and the failure paths of the reads themselves -
+# without a cluster. The readings are unit-tested in hack/remediation-guard.bats.
+#
+# CI runs this file under Bats. It stays compatible with the legacy cozytest.sh
+# translator, whose awk parser recognizes only @test blocks and a bare `}` on its
+# own line, so there is no bats `run` or `$status`. Assertions are expressed as
+# direct shell tests that exit non-zero on failure. Scratch directories are
+# removed at the end of the test body rather than from a trap (both runners set
+# -e, so a failed test leaves its fixtures behind for inspection).
+#
+# Run with: bats hack/run-kubernetes-remediation_test.bats
+# -----------------------------------------------------------------------------
+
+load test_helper
+
+# Writes a fixture-driven kubectl stub into $1/bin and returns with $1/fixtures
+# created. The stub answers the shapes the guard issues: the namespace listing
+# (from ALL_HR), one release's install strategy and Ready condition together
+# (<name>.strategy and <name>.ready, joined the way the guard's jsonpath joins
+# them), and its history statuses (<name>.history). A missing fixture file
+# stands for a field the object does not carry, which is what kubectl prints for
+# an absent jsonpath - nothing.
+#
+# A FAILS marker file makes the matching read exit non-zero with a message on
+# stderr, which is how the API answers a timeout or a denied request. That
+# looks identical to an absent field on stdout, so it is the case the guard has
+# to tell apart by exit status rather than by output. Strategy and readiness
+# travel in one read, so a marker on either of them fails that read.
+#
+# A WARNS marker makes the read write to stderr and still exit 0, which is what
+# kubectl does for a deprecation notice or for the discovery noise a degraded
+# aggregated APIService produces. No value may pick that line up: inside the
+# history capture it turns an empty history into a populated one, which skips
+# the readiness branch and reports an uninspected release as clean, and inside
+# the strategy capture it stops the value matching RetryOnFailure, which
+# downgrades a real failure to a note.
+#
+# Every invocation appends its arguments to a CALLS file, so a case can assert
+# on the shape of the reads rather than only on what they returned.
+#
+# A TURNS_READY marker beside a history fixture makes serving that read write
+# "True" into the release's Ready fixture, which is the interleaving the guard's
+# read order has to survive: a release that completes its install between the
+# two reads.
+
+# Fixed, advancing clock. The failure-path report bounds its walk on wall time,
+# so the cases about that decision own the clock rather than racing it. Empty
+# date_now leaves the real one in place for every other case; date_step is how
+# far the clock moves per reading, which is what lets a walk cross its deadline
+# between two releases without anything sleeping.
+#
+# The tick count lives in a file rather than in a variable, because every
+# reading the report takes is inside a command substitution and a subshell's
+# increment does not survive it - a clock that never moved would leave this
+# green against a walk with no bound at all.
+date_now=
+date_step=0
+date_ticks=
+date() {
+    if [ -n "${date_now}" ] && [ "${1:-}" = +%s ]; then
+        ticks=0
+        if [ -n "${date_ticks}" ] && [ -f "${date_ticks}" ]; then
+            ticks=$(cat "${date_ticks}")
+            printf '%s' "$((ticks + 1))" > "${date_ticks}"
+        fi
+        printf '%s\n' "$((date_now + ticks * date_step))"
+        return 0
+    fi
+    command date "$@"
+}
+
+cozy_make_kubectl_stub() {
+    mkdir -p "$1/bin" "$1/fixtures"
+    cat > "$1/bin/kubectl" <<'STUB'
+#!/bin/sh
+printf '%s\n' "$*" >> "$FIXTURES/CALLS"
+mode=list
+name=
+for a in "$@"; do
+  case "$a" in
+    describe) mode=describe ;;
+    *'status.history'*) mode=history ;;
+    *'install.strategy.name'*) mode=probe ;;
+    kubernetes-*) name=$a ;;
+  esac
+done
+case "$mode" in
+  list) markers=LIST ;;
+  history) markers="$name.history" ;;
+  probe) markers="$name.strategy $name.ready" ;;
+  *) markers= ;;
+esac
+for m in $markers; do
+  if [ -f "$FIXTURES/$m.CUTOFF" ]; then
+    # What the wall clock produces: the process is signalled before it writes,
+    # so the read fails with no output on either stream. 124 is what `timeout`
+    # reports for it.
+    exit 124
+  fi
+done
+for m in $markers; do
+  if [ -f "$FIXTURES/$m.KILLED" ]; then
+    # 128+SIGKILL. The `-k` grace produces it when the read ignores the first
+    # signal, and so does anything else that kills the process. Like the
+    # wall-clock kill above, nothing reaches either stream first.
+    exit 137
+  fi
+done
+for m in $markers; do
+  if [ -f "$FIXTURES/$m.FAILS" ]; then
+    echo "Error from server: the server was unable to return a response in the time allotted" >&2
+    exit 1
+  fi
+done
+for m in $markers; do
+  if [ -f "$FIXTURES/$m.WARNS" ]; then
+    echo "E0806 12:00:00.000000   1 memcache.go:265] couldn't get current server API group list: the server is currently unable to handle the request" >&2
+  fi
+done
+case "$mode" in
+  list) cat "$FIXTURES/ALL_HR" ;;
+  history)
+    cat "$FIXTURES/$name.history" 2>/dev/null || true
+    if [ -f "$FIXTURES/$name.history.TURNS_READY" ]; then
+      printf 'True' > "$FIXTURES/$name.ready"
+    fi
+    ;;
+  probe)
+    printf '%s@%s' \
+      "$(cat "$FIXTURES/$name.strategy" 2>/dev/null || true)" \
+      "$(cat "$FIXTURES/$name.ready" 2>/dev/null || true)"
+    ;;
+  describe) echo "stub describe of $name" ;;
+esac
+exit 0
+STUB
+    chmod +x "$1/bin/kubectl"
+}
+
+@test "the guard is wired into the run, before the snapshot trap is disarmed" {
+    lib=hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    # Everything else here tests the guards in isolation, which says nothing
+    # about whether the run still calls them: delete both invocations and every
+    # case in this file stays green while the suite asserts nothing. Ordering is
+    # part of the wiring - the tenant crust-gather snapshot is taken from an EXIT
+    # trap, so a guard that fired after `trap - EXIT` would report the failure
+    # with the cluster state already gone. Same shape as the ordering pin in
+    # hack/run-kubernetes-schedulable_test.bats.
+    # The arguments are pinned, not only the call. The addon prefix is derived
+    # from the parent name inside the guard, so naming a different release here
+    # would select a different set of addons and still read as wired.
+    #
+    # The line has to END at the call, not merely contain it, because the
+    # verdict reaches the run through errexit rather than through an exit of its
+    # own: appending `|| true` disarms the guard completely and leaves a
+    # substring match, and every other case here, green. Indentation is left
+    # free, so wrapping the call in a block stays a refactor rather than
+    # becoming a red test that reports the guard as missing.
+    call=$(grep -n -E '^ *cozy_guard_all_helmreleases tenant-test "kubernetes-\$\{test_name\}"$' "$lib" | head -n 1 | cut -d: -f1)
+    # Keyword and signal are assembled from separate arguments, the way the
+    # fixtures in hack/bats-no-exit-trap.bats do it: the scan there is lexical
+    # and counts the pair wherever it appears on a line, so spelling the pattern
+    # out here would read as this file installing a handler it does not install.
+    disarm_re=$(printf '^  %s - %s' 'trap' 'EXIT')
+    disarm=$(grep -n "$disarm_re" "$lib" | head -n 1 | cut -d: -f1)
+    if [ -z "$call" ]; then
+        echo "expected run_kubernetes_test to guard the parent HelmRelease and its addons" >&2
+        exit 1
+    fi
+    if [ -z "$disarm" ]; then
+        echo "expected to find the tenant-snapshot trap being disarmed in $lib" >&2
+        exit 1
+    fi
+    if [ "$call" -ge "$disarm" ]; then
+        echo "expected the guard (line $call) before the trap is disarmed (line $disarm)" >&2
+        exit 1
+    fi
+}
+
+@test "a failing parent still leaves every addon inspected" {
+    # Two bare calls under errexit would end the script on the parent's verdict
+    # and read no addon at all. The addon output is the context that explains a
+    # parent failure, which is the same reason the addon loop keeps going after
+    # one of its own fails. The parent here carries an uninstalled Snapshot under
+    # RetryOnFailure, which is fatal; the addon carries a failed Snapshot under
+    # the default strategy, which is a note. Both have to appear, and the verdict
+    # has to stay non-zero.
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    tmp=$(mktemp -d)
+    cozy_make_kubectl_stub "$tmp"
+    export FIXTURES="$tmp/fixtures"
+    printf 'kubernetes-test-latest-version-coredns\n' > "$FIXTURES/ALL_HR"
+    printf 'RetryOnFailure' > "$FIXTURES/kubernetes-test-latest-version.strategy"
+    printf 'uninstalled\ndeployed\n' > "$FIXTURES/kubernetes-test-latest-version.history"
+    printf 'failed\ndeployed\n' > "$FIXTURES/kubernetes-test-latest-version-coredns.history"
+
+    rc=0
+    out=$(PATH="$tmp/bin:$PATH" cozy_guard_all_helmreleases tenant-test kubernetes-test-latest-version 2>&1) || rc=$?
+    if [ "$rc" -eq 0 ]; then
+        echo "expected the run to fail on the parent, got: $out" >&2
+        exit 1
+    fi
+    if ! printf '%s\n' "$out" | grep -q 'carries a failed or uninstalled Snapshot, and its install strategy is RetryOnFailure'; then
+        echo "expected the parent footprint to be reported, got: $out" >&2
+        exit 1
+    fi
+    if ! printf '%s\n' "$out" | grep -q 'NOTE: kubernetes-test-latest-version-coredns carries a failed or uninstalled Snapshot'; then
+        echo "expected the addon to still be inspected after the parent failed, got: $out" >&2
+        exit 1
+    fi
+
+    rm -rf "$tmp"
+}
+
+@test "an addon verdict alone still fails the run" {
+    # The composite carries two verdicts and the addons' has to survive on its
+    # own. With the parent clean, dropping the addon guard's contribution -
+    # trading its collection for a bare || true - leaves every other case in
+    # this file green, so the second verdict needs its own pin.
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    tmp=$(mktemp -d)
+    cozy_make_kubectl_stub "$tmp"
+    export FIXTURES="$tmp/fixtures"
+    printf 'kubernetes-test-latest-version-cilium\n' > "$FIXTURES/ALL_HR"
+    printf 'RetryOnFailure' > "$FIXTURES/kubernetes-test-latest-version.strategy"
+    printf 'deployed\n' > "$FIXTURES/kubernetes-test-latest-version.history"
+    printf 'RetryOnFailure' > "$FIXTURES/kubernetes-test-latest-version-cilium.strategy"
+    printf 'uninstalled\ndeployed\n' > "$FIXTURES/kubernetes-test-latest-version-cilium.history"
+
+    rc=0
+    out=$(PATH="$tmp/bin:$PATH" cozy_guard_all_helmreleases tenant-test kubernetes-test-latest-version 2>&1) || rc=$?
+    if [ "$rc" -eq 0 ]; then
+        echo "expected the addon footprint alone to fail the run, got: $out" >&2
+        exit 1
+    fi
+
+    rm -rf "$tmp"
+}
+
+@test "single-release guard fails a RetryOnFailure release that failed and recovered" {
+    # The entry point the parent kubernetes-<test> release goes through, and the
+    # shape the rule exists for. The apiserver stamps RetryOnFailure on every
+    # Application HelmRelease, and under that strategy helm-controller retries a
+    # failed action as an upgrade instead of remediating it, so no uninstalled
+    # Snapshot is ever written: the failed Snapshot is the only record of an
+    # attempt that went wrong. The history is that of an install that failed
+    # twice and recovered on the third attempt: the second attempt's upgrade
+    # superseded nothing, the third superseded the second, and the first
+    # still reads failed. The release is Ready, and the run must still fail.
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    tmp=$(mktemp -d)
+    cozy_make_kubectl_stub "$tmp"
+    export FIXTURES="$tmp/fixtures"
+    printf 'RetryOnFailure' > "$FIXTURES/kubernetes-test-latest-version.strategy"
+    printf 'True' > "$FIXTURES/kubernetes-test-latest-version.ready"
+    printf 'deployed\nsuperseded\nfailed\n' > "$FIXTURES/kubernetes-test-latest-version.history"
+
+    rc=0
+    out=$(PATH="$tmp/bin:$PATH" cozy_guard_helmrelease tenant-test kubernetes-test-latest-version 2>&1) || rc=$?
+    if [ "$rc" -eq 0 ]; then
+        echo "expected failure for a failed Snapshot under RetryOnFailure, got: $out" >&2
+        exit 1
+    fi
+    if ! printf '%s\n' "$out" | grep -q 'HelmRelease kubernetes-test-latest-version carries a failed or uninstalled Snapshot, and its install strategy is RetryOnFailure'; then
+        echo "expected the failure to name the release and its strategy, got: $out" >&2
+        exit 1
+    fi
+
+    rm -rf "$tmp"
+}
+
+@test "single-release guard cannot see a failed install the next attempt recovered" {
+    # The limitation the guard documents, held here so the comment and the
+    # e2e conventions cannot drift back to claiming otherwise: with no
+    # deployed release to upgrade from, the recovering upgrade supersedes the
+    # failed install, and the history is indistinguishable by status from an
+    # ordinary upgrade. Detecting it needs more than the statuses, and when
+    # the guard learns to, this test is the one to flip.
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    tmp=$(mktemp -d)
+    cozy_make_kubectl_stub "$tmp"
+    export FIXTURES="$tmp/fixtures"
+    printf 'RetryOnFailure' > "$FIXTURES/kubernetes-test-latest-version.strategy"
+    printf 'True' > "$FIXTURES/kubernetes-test-latest-version.ready"
+    printf 'deployed\nsuperseded\n' > "$FIXTURES/kubernetes-test-latest-version.history"
+
+    PATH="$tmp/bin:$PATH" cozy_guard_helmrelease tenant-test kubernetes-test-latest-version required
+
+    rm -rf "$tmp"
+}
+
+@test "single-release guard fails an uninstalled Snapshot under RetryOnFailure" {
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    tmp=$(mktemp -d)
+    cozy_make_kubectl_stub "$tmp"
+    export FIXTURES="$tmp/fixtures"
+    printf 'RetryOnFailure' > "$FIXTURES/kubernetes-test-latest-version.strategy"
+    printf 'uninstalled\ndeployed\n' > "$FIXTURES/kubernetes-test-latest-version.history"
+
+    rc=0
+    out=$(PATH="$tmp/bin:$PATH" cozy_guard_helmrelease tenant-test kubernetes-test-latest-version 2>&1) || rc=$?
+    if [ "$rc" -eq 0 ]; then
+        echo "expected failure for a history carrying an uninstalled snapshot" >&2
+        exit 1
+    fi
+    if ! printf '%s\n' "$out" | grep -q 'HelmRelease kubernetes-test-latest-version carries a failed or uninstalled Snapshot, and its install strategy is RetryOnFailure'; then
+        echo "expected the failure to name the footprint, got: $out" >&2
+        exit 1
+    fi
+
+    rm -rf "$tmp"
+}
+
+@test "addon guard passes when every addon release history is clean" {
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    tmp=$(mktemp -d)
+    cozy_make_kubectl_stub "$tmp"
+    export FIXTURES="$tmp/fixtures"
+    printf 'kubernetes-test-latest-version\nkubernetes-test-latest-version-cilium\nkubernetes-test-latest-version-coredns\n' > "$FIXTURES/ALL_HR"
+    printf 'deployed\n' > "$FIXTURES/kubernetes-test-latest-version-cilium.history"
+    printf 'deployed\nsuperseded\n' > "$FIXTURES/kubernetes-test-latest-version-coredns.history"
+
+    PATH="$tmp/bin:$PATH" cozy_guard_addon_helmreleases tenant-test kubernetes-test-latest-version-
+
+    rm -rf "$tmp"
+}
+
+@test "addon guard fails an uninstalled Snapshot on a RetryOnFailure addon" {
+    # RetryOnFailure never uninstalls to recover, so an uninstalled Snapshot on
+    # the tenant CNI came from somewhere outside the release. Rare, and fatal
+    # for the same reason a failed one is.
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    tmp=$(mktemp -d)
+    cozy_make_kubectl_stub "$tmp"
+    export FIXTURES="$tmp/fixtures"
+    printf 'kubernetes-test-latest-version-cilium\n' > "$FIXTURES/ALL_HR"
+    printf 'RetryOnFailure' > "$FIXTURES/kubernetes-test-latest-version-cilium.strategy"
+    printf 'uninstalled\ndeployed\n' > "$FIXTURES/kubernetes-test-latest-version-cilium.history"
+
+    if PATH="$tmp/bin:$PATH" cozy_guard_addon_helmreleases tenant-test kubernetes-test-latest-version-; then
+        echo "expected failure when an addon history carries an uninstalled snapshot" >&2
+        exit 1
+    fi
+
+    rm -rf "$tmp"
+}
+
+@test "addon guard fails a RetryOnFailure addon that failed an action" {
+    # The tenant csi sets RetryOnFailure, so a failed attempt keeps its
+    # manifests applied and is retried as an upgrade, and the failed Snapshot
+    # is all that records it. Treating it as a note would leave the retry
+    # strategy with no reachable fatal signal at all.
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    tmp=$(mktemp -d)
+    cozy_make_kubectl_stub "$tmp"
+    export FIXTURES="$tmp/fixtures"
+    printf 'kubernetes-test-latest-version-csi\n' > "$FIXTURES/ALL_HR"
+    printf 'RetryOnFailure' > "$FIXTURES/kubernetes-test-latest-version-csi.strategy"
+    printf 'deployed\nfailed\n' > "$FIXTURES/kubernetes-test-latest-version-csi.history"
+
+    if PATH="$tmp/bin:$PATH" cozy_guard_addon_helmreleases tenant-test kubernetes-test-latest-version-; then
+        echo "expected failure when a RetryOnFailure addon carries a failed snapshot" >&2
+        exit 1
+    fi
+
+    rm -rf "$tmp"
+}
+
+@test "a failed cilium install is not blamed on the chart without naming a late node join" {
+    # The cilium install cannot complete before a worker registers, so a join
+    # later than two of its install timeouts leaves this exact history -- two
+    # failed attempts, the third recovered -- while the run is still inside the
+    # node-join deadline. The run fails on it by design; the message has to
+    # send the reader to the join as well as to the release.
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    tmp=$(mktemp -d)
+    cozy_make_kubectl_stub "$tmp"
+    export FIXTURES="$tmp/fixtures"
+    printf 'kubernetes-test-latest-version-cilium\n' > "$FIXTURES/ALL_HR"
+    printf 'RetryOnFailure' > "$FIXTURES/kubernetes-test-latest-version-cilium.strategy"
+    printf 'True' > "$FIXTURES/kubernetes-test-latest-version-cilium.ready"
+    printf 'deployed\nsuperseded\nfailed\n' > "$FIXTURES/kubernetes-test-latest-version-cilium.history"
+
+    rc=0
+    out=$(PATH="$tmp/bin:$PATH" cozy_guard_addon_helmreleases tenant-test kubernetes-test-latest-version- 2>&1) || rc=$?
+    if [ "$rc" -eq 0 ]; then
+        echo "expected the failed cilium Snapshot to fail the run, got: $out" >&2
+        exit 1
+    fi
+    if ! printf '%s\n' "$out" | grep -q 'when the first node turned Ready'; then
+        echo "expected the failure to point at the node join, got: $out" >&2
+        exit 1
+    fi
+
+    rm -rf "$tmp"
+}
+
+@test "addon guard notes a failed Snapshot without failing the run" {
+    # Most of this chart's addons take the default strategy with retries: -1,
+    # which declares repeated remediation acceptable for them, and nothing
+    # measures how often they use it - so their footprint is reported rather
+    # than made fatal on the gate every PR crosses. The line has to be there:
+    # without it the run says nothing at all about the cycle, which is the
+    # blindness the guard was added to remove.
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    tmp=$(mktemp -d)
+    cozy_make_kubectl_stub "$tmp"
+    export FIXTURES="$tmp/fixtures"
+    printf 'kubernetes-test-latest-version-coredns\n' > "$FIXTURES/ALL_HR"
+    printf 'failed\ndeployed\n' > "$FIXTURES/kubernetes-test-latest-version-coredns.history"
+
+    rc=0
+    out=$(PATH="$tmp/bin:$PATH" cozy_guard_addon_helmreleases tenant-test kubernetes-test-latest-version- 2>&1) || rc=$?
+    if [ "$rc" -ne 0 ]; then
+        echo "expected a default-strategy footprint to be reported, not to fail the run, got rc=$rc: $out" >&2
+        exit 1
+    fi
+    if ! printf '%s\n' "$out" | grep -q 'NOTE: kubernetes-test-latest-version-coredns carries a failed or uninstalled Snapshot'; then
+        echo "expected the footprint to be named in the output, got: $out" >&2
+        exit 1
+    fi
+
+    rm -rf "$tmp"
+}
+
+@test "the failed-Snapshot note does not claim a recovery that has not happened" {
+    # The note is reached on any default-strategy release carrying a failed
+    # Snapshot, Ready or not. On one that is still not Ready the failure is
+    # live rather than behind it, and a note saying it "recovered" sends a
+    # reader looking for a second cause while the first one is still the
+    # answer. The release here is the shape that makes the difference visible:
+    # a failed Snapshot in its history and no Ready condition.
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    tmp=$(mktemp -d)
+    cozy_make_kubectl_stub "$tmp"
+    export FIXTURES="$tmp/fixtures"
+    printf 'kubernetes-test-latest-version-coredns\n' > "$FIXTURES/ALL_HR"
+    printf 'False' > "$FIXTURES/kubernetes-test-latest-version-coredns.ready"
+    printf 'failed\n' > "$FIXTURES/kubernetes-test-latest-version-coredns.history"
+
+    rc=0
+    out=$(PATH="$tmp/bin:$PATH" cozy_guard_addon_helmreleases tenant-test kubernetes-test-latest-version- 2>&1) || rc=$?
+    if [ "$rc" -ne 0 ]; then
+        echo "expected a failed Snapshot on a not-Ready addon to be reported, not to fail the run, got rc=$rc: $out" >&2
+        exit 1
+    fi
+    if ! printf '%s\n' "$out" | grep -q 'under the default strategy and is not Ready'; then
+        echo "expected the note to say the release is not Ready, got: $out" >&2
+        exit 1
+    fi
+    if printf '%s\n' "$out" | grep -q 'remediated and recovered'; then
+        echo "expected no claim of recovery on a release that is not Ready, got: $out" >&2
+        exit 1
+    fi
+
+    rm -rf "$tmp"
+}
+
+@test "addon guard notes an uninstall the default strategy performed itself" {
+    # An uninstalled Snapshot on a release still using the default strategy is
+    # that strategy's own install remediation: it uninstalls before retrying, and
+    # these addons pair it with retries: -1, so the configuration declares this
+    # their recovery path. The run has no measurement of how often they take it,
+    # and reddening a whole bringup on a release doing what it is configured
+    # to do is how a guard gets switched off. That the configuration is itself
+    # the defect is true and is filed separately - it is not this guard's to
+    # assert. The line must still be there: a remediation nobody reports is the
+    # blindness the guard was added to remove.
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    tmp=$(mktemp -d)
+    cozy_make_kubectl_stub "$tmp"
+    export FIXTURES="$tmp/fixtures"
+    printf 'kubernetes-test-latest-version-coredns\n' > "$FIXTURES/ALL_HR"
+    printf 'failed\nuninstalled\ndeployed\n' > "$FIXTURES/kubernetes-test-latest-version-coredns.history"
+
+    rc=0
+    out=$(PATH="$tmp/bin:$PATH" cozy_guard_addon_helmreleases tenant-test kubernetes-test-latest-version- 2>&1) || rc=$?
+    if [ "$rc" -ne 0 ]; then
+        echo "expected a default-strategy uninstall to be reported, not to fail the run, got rc=$rc: $out" >&2
+        exit 1
+    fi
+    if ! printf '%s\n' "$out" | grep -q 'NOTE: kubernetes-test-latest-version-coredns carries a failed or uninstalled Snapshot under the default strategy'; then
+        echo "expected the uninstall to be named in the output, got: $out" >&2
+        exit 1
+    fi
+
+    rm -rf "$tmp"
+}
+
+@test "no guard read is issued without a per-request bound" {
+    # The guard runs after the whole bringup on the passing path, and
+    # inside a diagnostics phase on the failing ones, where the tenant
+    # crust-gather snapshot still has to be reachable afterwards. An unbounded
+    # read against a wedged apiserver holds the Chainsaw op until the op is
+    # killed, and the snapshot is then lost rather than truncated - the same
+    # failure the node-join collectors carry their own bounds against.
+    #
+    # Asserted over every recorded call rather than over the one this case
+    # happens to exercise, so a read added later without a bound is caught by
+    # this case rather than by a run. The wall-clock half is pinned on the
+    # failure path, in hack/run-kubernetes-node-join_test.bats, where the
+    # harness can tell a bounded read from an unbounded one.
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    tmp=$(mktemp -d)
+    cozy_make_kubectl_stub "$tmp"
+    export FIXTURES="$tmp/fixtures"
+    printf 'kubernetes-test-latest-version-cilium\n' > "$FIXTURES/ALL_HR"
+    printf 'RetryOnFailure' > "$FIXTURES/kubernetes-test-latest-version.strategy"
+    printf 'deployed\n' > "$FIXTURES/kubernetes-test-latest-version.history"
+    printf 'RetryOnFailure' > "$FIXTURES/kubernetes-test-latest-version-cilium.strategy"
+    printf 'uninstalled\ndeployed\n' > "$FIXTURES/kubernetes-test-latest-version-cilium.history"
+
+    PATH="$tmp/bin:$PATH" cozy_guard_all_helmreleases tenant-test kubernetes-test-latest-version >/dev/null 2>&1 || true
+
+    if [ ! -s "$FIXTURES/CALLS" ]; then
+        echo "expected the guard to have issued reads at all" >&2
+        exit 1
+    fi
+    unbounded=$(grep -v -F -e '--request-timeout=' "$FIXTURES/CALLS" || true)
+    if [ -n "$unbounded" ]; then
+        echo "expected every guard read to carry --request-timeout, these did not:" >&2
+        printf '%s\n' "$unbounded" >&2
+        exit 1
+    fi
+
+    rm -rf "$tmp"
+}
+
+@test "the parent guard fails when its install strategy reads back empty" {
+    # The strategy is what arms the fatal branch, and it is read with kubectl
+    # -o jsonpath, which prints nothing and exits 0 for a path that no longer
+    # resolves. Empty then takes the soft branch, so a rename of
+    # spec.install.strategy in a future helm-controller would turn every
+    # footprint on the parent, cilium and csi into a NOTE, on a green run, with
+    # every other case in this file still passing because they feed the
+    # strategy from a fixture rather than through the jsonpath.
+    #
+    # The parent is where that is checkable: the aggregated apiserver stamps
+    # RetryOnFailure on the HelmRelease of every Application it serves, on
+    # install and upgrade alike, so an empty strategy there is never the object
+    # and always the read. The addons cannot carry the same check - most addon
+    # releases the chart declares set no strategy at all - which is why it is
+    # the parent that is asked for it.
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    tmp=$(mktemp -d)
+    cozy_make_kubectl_stub "$tmp"
+    export FIXTURES="$tmp/fixtures"
+    printf 'kubernetes-test-latest-version-coredns\n' > "$FIXTURES/ALL_HR"
+    printf 'True' > "$FIXTURES/kubernetes-test-latest-version.ready"
+    printf 'deployed\n' > "$FIXTURES/kubernetes-test-latest-version.history"
+    printf 'deployed\n' > "$FIXTURES/kubernetes-test-latest-version-coredns.history"
+
+    rc=0
+    out=$(PATH="$tmp/bin:$PATH" cozy_guard_all_helmreleases tenant-test kubernetes-test-latest-version 2>&1) || rc=$?
+    if [ "$rc" -eq 0 ]; then
+        echo "expected an empty install strategy on the parent to fail the run, got: $out" >&2
+        exit 1
+    fi
+    if ! printf '%s\n' "$out" | grep -q -F 'spec.install.strategy.name of kubernetes-test-latest-version came back empty'; then
+        echo "expected the failure to name the field that read back empty, got: $out" >&2
+        exit 1
+    fi
+
+    rm -rf "$tmp"
+}
+
+@test "the parent guard fails when its install strategy is anything but RetryOnFailure" {
+    # The same lenient reading through a different door: a parent that comes
+    # back with the Flux default, RemediateOnFailure, would send an
+    # uninstall-and-reinstall cycle -- the footprint this guard was written for
+    # -- to the NOTE branch on a green run. The apiserver stamps RetryOnFailure,
+    # so any other value on the parent means the stamp is gone.
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    tmp=$(mktemp -d)
+    cozy_make_kubectl_stub "$tmp"
+    export FIXTURES="$tmp/fixtures"
+    printf 'RemediateOnFailure' > "$FIXTURES/kubernetes-test-latest-version.strategy"
+    printf 'True' > "$FIXTURES/kubernetes-test-latest-version.ready"
+    printf 'deployed\nuninstalled\nfailed\n' > "$FIXTURES/kubernetes-test-latest-version.history"
+
+    rc=0
+    out=$(PATH="$tmp/bin:$PATH" cozy_guard_helmrelease tenant-test kubernetes-test-latest-version required 2>&1) || rc=$?
+    if [ "$rc" -eq 0 ]; then
+        echo "expected a parent strategy other than RetryOnFailure to fail the run, got: $out" >&2
+        exit 1
+    fi
+    if ! printf '%s\n' "$out" | grep -q -F 'spec.install.strategy.name of kubernetes-test-latest-version is RemediateOnFailure'; then
+        echo "expected the failure to name the strategy it read, got: $out" >&2
+        exit 1
+    fi
+
+    rm -rf "$tmp"
+}
+
+@test "an addon that sets no install strategy is not read as a broken jsonpath" {
+    # The counterpart to the case above, and the reason that one is scoped to
+    # the parent. Most addons of this chart set no strategy and take the default
+    # one; an empty value there is the object rather than the read, and failing
+    # on it would red every run on the addon releases that are configured
+    # exactly as intended.
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    tmp=$(mktemp -d)
+    cozy_make_kubectl_stub "$tmp"
+    export FIXTURES="$tmp/fixtures"
+    printf 'kubernetes-test-latest-version-coredns\n' > "$FIXTURES/ALL_HR"
+    printf 'True' > "$FIXTURES/kubernetes-test-latest-version-coredns.ready"
+    printf 'deployed\n' > "$FIXTURES/kubernetes-test-latest-version-coredns.history"
+
+    PATH="$tmp/bin:$PATH" cozy_guard_addon_helmreleases tenant-test kubernetes-test-latest-version-
+
+    rm -rf "$tmp"
+}
+
+@test "addon guard inspects every addon even after one fails" {
+    # The notes the other addons print are the context that explains the
+    # failure - which one the default strategy remediated - so stopping at the
+    # first failure hides exactly what a reader would compare it against. Both releases here have something to say, and the run
+    # must still end non-zero.
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    tmp=$(mktemp -d)
+    cozy_make_kubectl_stub "$tmp"
+    export FIXTURES="$tmp/fixtures"
+    printf 'kubernetes-test-latest-version-cilium\nkubernetes-test-latest-version-coredns\n' > "$FIXTURES/ALL_HR"
+    printf 'RetryOnFailure' > "$FIXTURES/kubernetes-test-latest-version-cilium.strategy"
+    printf 'uninstalled\ndeployed\n' > "$FIXTURES/kubernetes-test-latest-version-cilium.history"
+    printf 'failed\ndeployed\n' > "$FIXTURES/kubernetes-test-latest-version-coredns.history"
+
+    rc=0
+    out=$(PATH="$tmp/bin:$PATH" cozy_guard_addon_helmreleases tenant-test kubernetes-test-latest-version- 2>&1) || rc=$?
+    if [ "$rc" -eq 0 ]; then
+        echo "expected the run to fail on the RetryOnFailure addon, got: $out" >&2
+        exit 1
+    fi
+    if ! printf '%s\n' "$out" | grep -q 'NOTE: kubernetes-test-latest-version-coredns carries a failed or uninstalled Snapshot'; then
+        echo "expected the addon after the failing one to still be inspected, got: $out" >&2
+        exit 1
+    fi
+
+    rm -rf "$tmp"
+}
+
+@test "addon guard fails when no addon HelmRelease matches the prefix" {
+    # The parent is Ready, so its addon releases exist. An empty selection means
+    # the naming this guard walks has changed, and a guard that silently
+    # inspects nothing is worse than no guard at all.
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    tmp=$(mktemp -d)
+    cozy_make_kubectl_stub "$tmp"
+    export FIXTURES="$tmp/fixtures"
+    printf 'kubernetes-test-latest-version\n' > "$FIXTURES/ALL_HR"
+
+    if PATH="$tmp/bin:$PATH" cozy_guard_addon_helmreleases tenant-test kubernetes-test-latest-version-; then
+        echo "expected failure when the prefix selects no addon HelmRelease" >&2
+        exit 1
+    fi
+
+    rm -rf "$tmp"
+}
+
+@test "addon guard fails a Ready addon that reports no release history" {
+    # A Ready HelmRelease has a completed helm action behind it, and the
+    # controller keeps a Snapshot of every one. Ready with no history is the
+    # Flux status shape having moved under the guard, and passing over it would
+    # leave that release unchecked while the run stayed green - the silent gap
+    # this guard exists to close. The parent's own empty-history check does not
+    # cover it: the parent's history says nothing about its children's.
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    tmp=$(mktemp -d)
+    cozy_make_kubectl_stub "$tmp"
+    export FIXTURES="$tmp/fixtures"
+    printf 'kubernetes-test-latest-version-vsnap-crd\n' > "$FIXTURES/ALL_HR"
+    printf 'True' > "$FIXTURES/kubernetes-test-latest-version-vsnap-crd.ready"
+
+    rc=0
+    out=$(PATH="$tmp/bin:$PATH" cozy_guard_addon_helmreleases tenant-test kubernetes-test-latest-version- 2>&1) || rc=$?
+    if [ "$rc" -eq 0 ]; then
+        echo "expected failure for a Ready addon whose history came back empty" >&2
+        exit 1
+    fi
+    if ! printf '%s\n' "$out" | grep -q 'Unexpected empty .status.history on Ready HelmRelease kubernetes-test-latest-version-vsnap-crd'; then
+        echo "expected the failure to name the empty history, got: $out" >&2
+        exit 1
+    fi
+
+    rm -rf "$tmp"
+}
+
+@test "addon guard skips an addon that never completed a helm action" {
+    # The parent Application HelmRelease carries disableWait, so it goes Ready
+    # without waiting for the releases it applied, and the suite waits on only
+    # some of them by name - metrics-server and prometheus-operator-crds among
+    # those it does not. A release still working through its dependsOn has no
+    # history and nothing to find, and failing on it would be a red run with
+    # a Flux-API-change message for a release that is merely still installing.
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    tmp=$(mktemp -d)
+    cozy_make_kubectl_stub "$tmp"
+    export FIXTURES="$tmp/fixtures"
+    printf 'kubernetes-test-latest-version-metrics-server\n' > "$FIXTURES/ALL_HR"
+    printf 'False' > "$FIXTURES/kubernetes-test-latest-version-metrics-server.ready"
+
+    rc=0
+    out=$(PATH="$tmp/bin:$PATH" cozy_guard_addon_helmreleases tenant-test kubernetes-test-latest-version- 2>&1) || rc=$?
+    if [ "$rc" -ne 0 ]; then
+        echo "expected a not-Ready addon with no history to be skipped, got rc=$rc: $out" >&2
+        exit 1
+    fi
+    # Skipped, but never in silence, and the line has to say it was skipped: the
+    # name alone is already printed by the per-addon header above, so asserting
+    # on the name would pass with the skip line deleted and the guard would be
+    # reporting coverage it did not have.
+    if ! printf '%s\n' "$out" | grep -q 'kubernetes-test-latest-version-metrics-server is not Ready and has no release history'; then
+        echo "expected the skipped addon to be reported as not inspected, got: $out" >&2
+        exit 1
+    fi
+
+    rm -rf "$tmp"
+}
+
+@test "addon guard fails when the Ready condition cannot be read" {
+    # Readiness must not conflate "read failed" with "field absent", and this is
+    # where the conflation is worst: an empty Ready condition sends the release
+    # down the not-Ready branch, which reports it as not inspected and returns 0.
+    # A denied or timed-out read would then pass an uninspected release off as
+    # covered. It travels in the same read as the strategy, so the read fails
+    # whichever of the two the API could not answer.
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    tmp=$(mktemp -d)
+    cozy_make_kubectl_stub "$tmp"
+    export FIXTURES="$tmp/fixtures"
+    printf 'kubernetes-test-latest-version-cilium\n' > "$FIXTURES/ALL_HR"
+    : > "$FIXTURES/kubernetes-test-latest-version-cilium.ready.FAILS"
+
+    rc=0
+    out=$(PATH="$tmp/bin:$PATH" cozy_guard_addon_helmreleases tenant-test kubernetes-test-latest-version- 2>&1) || rc=$?
+    if [ "$rc" -eq 0 ]; then
+        echo "expected failure when the Ready condition could not be read, got: $out" >&2
+        exit 1
+    fi
+    # The message too, as with its sibling: without it the case passes when some
+    # other read is the one that broke.
+    if ! printf '%s\n' "$out" | grep -q 'Reading .spec.install.strategy.name and the Ready condition of kubernetes-test-latest-version-cilium failed'; then
+        echo "expected the failure to name the read that carries the Ready condition, got: $out" >&2
+        exit 1
+    fi
+
+    rm -rf "$tmp"
+}
+
+@test "addon guard reads readiness before history, not after" {
+    # The controller writes the Snapshot and flips Ready in one status patch, so
+    # a release is never Ready before its first Snapshot exists. Reading the
+    # history first and readiness afterwards observes the two in the opposite
+    # order: an addon still installing at the history read and Ready one
+    # round-trip later presents as Ready with an empty history, which the guard
+    # fails the run on as a Flux status shape it can no longer read. Nothing
+    # waits on most of these releases, so that window is open on every run. The
+    # other order is not open to the same misreading through truncation, because
+    # neither variant empties a non-empty history: Truncate returns early below
+    # two Snapshots, and TruncateIgnoringPreviousSnapshots cuts only above five.
+    # ClearHistory() drops it outright and is not covered by that - see the
+    # comment on the read order in the library, which says what the order does
+    # and does not buy.
+    #
+    # The stub turns the addon Ready as a side effect of serving the history
+    # read, which is that interleaving exactly: green while readiness is read
+    # first, red the moment the two reads swap back.
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    tmp=$(mktemp -d)
+    cozy_make_kubectl_stub "$tmp"
+    export FIXTURES="$tmp/fixtures"
+    printf 'kubernetes-test-latest-version-cilium\n' > "$FIXTURES/ALL_HR"
+    : > "$FIXTURES/kubernetes-test-latest-version-cilium.history.TURNS_READY"
+
+    rc=0
+    out=$(PATH="$tmp/bin:$PATH" cozy_guard_addon_helmreleases tenant-test kubernetes-test-latest-version- 2>&1) || rc=$?
+    if [ "$rc" -ne 0 ]; then
+        echo "expected an addon that turns Ready mid-check to be reported as not inspected, got rc=$rc: $out" >&2
+        exit 1
+    fi
+    if ! printf '%s\n' "$out" | grep -q 'kubernetes-test-latest-version-cilium is not Ready and has no release history'; then
+        echo "expected the still-installing addon to be reported as not inspected, got: $out" >&2
+        exit 1
+    fi
+
+    rm -rf "$tmp"
+}
+
+@test "addon guard fails when an addon strategy cannot be read" {
+    # The strategy decides whether a footprint is fatal, so a read that timed out
+    # or was denied cannot be folded into "no strategy set": that reading is the
+    # lenient one, and a real failure of the tenant CNI would be reported as the
+    # default strategy's own recovery. Fail on the read instead, and say so.
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    tmp=$(mktemp -d)
+    cozy_make_kubectl_stub "$tmp"
+    export FIXTURES="$tmp/fixtures"
+    printf 'kubernetes-test-latest-version-cilium\n' > "$FIXTURES/ALL_HR"
+    : > "$FIXTURES/kubernetes-test-latest-version-cilium.strategy.FAILS"
+    printf 'uninstalled\ndeployed\n' > "$FIXTURES/kubernetes-test-latest-version-cilium.history"
+
+    rc=0
+    out=$(PATH="$tmp/bin:$PATH" cozy_guard_addon_helmreleases tenant-test kubernetes-test-latest-version- 2>&1) || rc=$?
+    if [ "$rc" -eq 0 ]; then
+        echo "expected failure when the install strategy could not be read" >&2
+        exit 1
+    fi
+    if ! printf '%s\n' "$out" | grep -q 'Reading .spec.install.strategy.name and the Ready condition of kubernetes-test-latest-version-cilium failed'; then
+        echo "expected the failure to name the strategy read, got: $out" >&2
+        exit 1
+    fi
+
+    rm -rf "$tmp"
+}
+
+@test "a kubectl warning does not downgrade a failure to a note" {
+    # The strategy value decides whether a footprint is fatal, and it is
+    # compared for equality. kubectl writes warnings to stderr while exiting 0,
+    # so a capture that took stderr would carry the warning in front of
+    # RetryOnFailure, stop matching it, and report a real failure of the tenant
+    # CNI as the default strategy doing its job - the guard weakened silently,
+    # through the success path, by a line that has nothing to do with the
+    # release.
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    tmp=$(mktemp -d)
+    cozy_make_kubectl_stub "$tmp"
+    export FIXTURES="$tmp/fixtures"
+    printf 'kubernetes-test-latest-version-cilium\n' > "$FIXTURES/ALL_HR"
+    printf 'RetryOnFailure' > "$FIXTURES/kubernetes-test-latest-version-cilium.strategy"
+    : > "$FIXTURES/kubernetes-test-latest-version-cilium.strategy.WARNS"
+    printf 'uninstalled\ndeployed\n' > "$FIXTURES/kubernetes-test-latest-version-cilium.history"
+
+    rc=0
+    out=$(PATH="$tmp/bin:$PATH" cozy_guard_addon_helmreleases tenant-test kubernetes-test-latest-version- 2>&1) || rc=$?
+    if [ "$rc" -eq 0 ]; then
+        echo "expected the failure to stay fatal when kubectl warns on the strategy read, got: $out" >&2
+        exit 1
+    fi
+
+    rm -rf "$tmp"
+}
+
+@test "a kubectl warning does not turn an empty history into a clean one" {
+    # kubectl writes warnings to stderr and still exits 0. If the history capture
+    # takes stderr, that line becomes the history: a release with no Snapshots at
+    # all reads as populated, the readiness branch never runs, and an
+    # uninspected release is reported clean. The addon here is Ready with no
+    # history, which must fail - and does only while the warning stays out of the
+    # value.
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    tmp=$(mktemp -d)
+    cozy_make_kubectl_stub "$tmp"
+    export FIXTURES="$tmp/fixtures"
+    printf 'kubernetes-test-latest-version-cilium\n' > "$FIXTURES/ALL_HR"
+    : > "$FIXTURES/kubernetes-test-latest-version-cilium.history.WARNS"
+    printf 'True' > "$FIXTURES/kubernetes-test-latest-version-cilium.ready"
+
+    rc=0
+    out=$(PATH="$tmp/bin:$PATH" cozy_guard_addon_helmreleases tenant-test kubernetes-test-latest-version- 2>&1) || rc=$?
+    if [ "$rc" -eq 0 ]; then
+        echo "expected a Ready addon with no history to fail even when kubectl warns, got: $out" >&2
+        exit 1
+    fi
+    if ! printf '%s\n' "$out" | grep -q 'Unexpected empty .status.history on Ready HelmRelease'; then
+        echo "expected the empty history to be recognised as empty, got: $out" >&2
+        exit 1
+    fi
+
+    rm -rf "$tmp"
+}
+
+@test "addon guard fails when the HelmRelease listing fails" {
+    # A failed listing prints nothing, exactly like a namespace with no
+    # HelmReleases, so only the exit status tells them apart. Reporting the
+    # empty-prefix message for an API error would send the reader after a
+    # renamed release that is not the problem.
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    tmp=$(mktemp -d)
+    cozy_make_kubectl_stub "$tmp"
+    export FIXTURES="$tmp/fixtures"
+    printf 'kubernetes-test-latest-version-cilium\n' > "$FIXTURES/ALL_HR"
+    : > "$FIXTURES/LIST.FAILS"
+
+    rc=0
+    out=$(PATH="$tmp/bin:$PATH" cozy_guard_addon_helmreleases tenant-test kubernetes-test-latest-version- 2>&1) || rc=$?
+    if [ "$rc" -eq 0 ]; then
+        echo "expected failure when listing the HelmReleases failed" >&2
+        exit 1
+    fi
+    # The message, not just the status: a failed listing also empties the
+    # selection, so the run fails either way and only the reason distinguishes
+    # a broken API call from a release the prefix no longer matches.
+    if ! printf '%s\n' "$out" | grep -q 'Listing HelmReleases in tenant-test failed'; then
+        echo "expected the failure to name the listing, got: $out" >&2
+        exit 1
+    fi
+
+    rm -rf "$tmp"
+}
+
+@test "addon guard fails when an addon history cannot be read" {
+    # The dangerous conflation: a timed-out or denied read yields no output,
+    # which is also what a release with no history yields. Skipping on that
+    # would let the guard pass over the very release it was pointed at.
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    tmp=$(mktemp -d)
+    cozy_make_kubectl_stub "$tmp"
+    export FIXTURES="$tmp/fixtures"
+    printf 'kubernetes-test-latest-version-cilium\n' > "$FIXTURES/ALL_HR"
+    : > "$FIXTURES/kubernetes-test-latest-version-cilium.history.FAILS"
+
+    rc=0
+    out=$(PATH="$tmp/bin:$PATH" cozy_guard_addon_helmreleases tenant-test kubernetes-test-latest-version- 2>&1) || rc=$?
+    if [ "$rc" -eq 0 ]; then
+        echo "expected failure when an addon history could not be read" >&2
+        exit 1
+    fi
+    if ! printf '%s\n' "$out" | grep -q 'Reading .status.history of kubernetes-test-latest-version-cilium failed'; then
+        echo "expected the failure to name the history read, got: $out" >&2
+        exit 1
+    fi
+
+    rm -rf "$tmp"
+}
+
+@test "addon selection reads the prefix literally, not as a regex" {
+    # A HelmRelease name is a DNS-1123 subdomain, so a dot in one is legal, and
+    # an anchored regex would read that dot as any character and pull in
+    # releases belonging to no addon of this parent. Every other case here uses
+    # a prefix with no metacharacter in it and so stays green either way, which
+    # leaves the literal match without a carrier unless it gets a case of its
+    # own - the same reason the scoping in hack/remediation-guard.bats has one.
+    #
+    # The listing holds a name only a wildcard reading would select, so the
+    # selection must come back empty, which the guard reports as a prefix that
+    # matched nothing.
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    tmp=$(mktemp -d)
+    cozy_make_kubectl_stub "$tmp"
+    export FIXTURES="$tmp/fixtures"
+    printf 'kubernetes-aXb-cilium\n' > "$FIXTURES/ALL_HR"
+
+    rc=0
+    out=$(PATH="$tmp/bin:$PATH" cozy_guard_addon_helmreleases tenant-test 'kubernetes-a.b-' 2>&1) || rc=$?
+    if [ "$rc" -eq 0 ]; then
+        echo "expected a dot in the prefix to select nothing, got: $out" >&2
+        exit 1
+    fi
+    if ! printf '%s\n' "$out" | grep -q -F 'No addon HelmReleases matched kubernetes-a.b-'; then
+        echo "expected the empty selection to be reported, got: $out" >&2
+        exit 1
+    fi
+
+    rm -rf "$tmp"
+}
+
+@test "addon selection anchors the prefix at the start of the name" {
+    # The literal-match case above and the outside-the-prefix case below both
+    # stay green if index($0, p) == 1 is relaxed to index($0, p) > 0: neither
+    # listing holds a name that CONTAINS the prefix somewhere other than the
+    # start, so neither separates a prefix reading from a substring one. That
+    # is the reading the selection actually depends on, so it gets a listing
+    # that distinguishes them.
+    #
+    # tenant-test holds releases of other suites and of the previous version,
+    # and nothing constrains their names to begin with this parent's prefix.
+    # A release whose name merely embeds it is not something the chart emits
+    # today, which is exactly why nothing else here would notice the widening.
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    tmp=$(mktemp -d)
+    cozy_make_kubectl_stub "$tmp"
+    export FIXTURES="$tmp/fixtures"
+    printf 'old-kubernetes-test-latest-version-cilium\nkubernetes-test-latest-version-cilium\n' > "$FIXTURES/ALL_HR"
+
+    out=$(PATH="$tmp/bin:$PATH" cozy_addon_helmrelease_names tenant-test kubernetes-test-latest-version-)
+    if ! printf '%s\n' "$out" | grep -qx 'kubernetes-test-latest-version-cilium'; then
+        echo "expected the parent's own addon to be selected, got: $out" >&2
+        exit 1
+    fi
+    if printf '%s\n' "$out" | grep -qx 'old-kubernetes-test-latest-version-cilium'; then
+        echo "expected a name that only embeds the prefix to be left out, got: $out" >&2
+        exit 1
+    fi
+
+    rm -rf "$tmp"
+}
+
+@test "addon guard ignores HelmReleases outside the prefix" {
+    # tenant-test also holds releases of other suites and of the previous
+    # version's cluster. A footprint there is not this test's finding.
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    tmp=$(mktemp -d)
+    cozy_make_kubectl_stub "$tmp"
+    export FIXTURES="$tmp/fixtures"
+    printf 'kubernetes-test-previous-version-cilium\nkubernetes-test-latest-version-cilium\n' > "$FIXTURES/ALL_HR"
+    printf 'uninstalled\ndeployed\n' > "$FIXTURES/kubernetes-test-previous-version-cilium.history"
+    printf 'deployed\n' > "$FIXTURES/kubernetes-test-latest-version-cilium.history"
+
+    PATH="$tmp/bin:$PATH" cozy_guard_addon_helmreleases tenant-test kubernetes-test-latest-version-
+
+    rm -rf "$tmp"
+}
+
+@test "the failure-path report classifies the releases and fails nothing" {
+    # Every deadline the guard's own comment names as the way a child
+    # remediation surfaces - a node that never turns Ready, a HelmRelease wait
+    # that expires, a PVC that never binds - ends the script under errexit
+    # before the guard is reached, so on exactly the runs a failed action
+    # explains, the guard said nothing. This is the same reading issued from
+    # those paths.
+    #
+    # It must not fail its caller: the callers are collectors on a path whose
+    # exit status the tenant crust-gather snapshot hangs off, and a non-zero
+    # return here would replace it. The parent below carries an uninstalled
+    # Snapshot under RetryOnFailure, which is a shape the guard fails a run on.
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    tmp=$(mktemp -d)
+    cozy_make_kubectl_stub "$tmp"
+    export FIXTURES="$tmp/fixtures"
+    printf 'kubernetes-test-latest-version-coredns\n' > "$FIXTURES/ALL_HR"
+    printf 'RetryOnFailure' > "$FIXTURES/kubernetes-test-latest-version.strategy"
+    printf 'uninstalled\ndeployed\n' > "$FIXTURES/kubernetes-test-latest-version.history"
+    printf 'failed\ndeployed\n' > "$FIXTURES/kubernetes-test-latest-version-coredns.history"
+
+    rc=0
+    out=$(PATH="$tmp/bin:$PATH" cozy_report_helmrelease_remediation tenant-test kubernetes-test-latest-version 2>&1) || rc=$?
+    if [ "$rc" -ne 0 ]; then
+        echo "expected the report to return zero so the caller keeps its exit, got rc=$rc: $out" >&2
+        exit 1
+    fi
+    if ! printf '%s\n' "$out" | grep -q 'carries a failed or uninstalled Snapshot, and its install strategy is RetryOnFailure'; then
+        echo "expected the parent footprint to be classified, got: $out" >&2
+        exit 1
+    fi
+    if ! printf '%s\n' "$out" | grep -q 'NOTE: kubernetes-test-latest-version-coredns carries a failed or uninstalled Snapshot'; then
+        echo "expected the addon to be classified too, got: $out" >&2
+        exit 1
+    fi
+
+    rm -rf "$tmp"
+}
+
+@test "the failure-path report survives an addon verdict, not only a parent one" {
+    # The case above fails the PARENT and lets its addon earn a note, so the
+    # addons half of the walk never returns non-zero and the guard against a
+    # collector deciding the run is only half exercised. Here the parent is
+    # clean and the ADDON carries the verdict, which is the arrangement that
+    # reaches the loop's own suppression.
+    #
+    # What it protects is the same thing throughout: the callers are collectors
+    # on a path whose exit status the tenant crust-gather snapshot hangs off,
+    # and a verdict escaping from here would replace it.
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    tmp=$(mktemp -d)
+    cozy_make_kubectl_stub "$tmp"
+    export FIXTURES="$tmp/fixtures"
+    printf 'kubernetes-test-latest-version-cilium\n' > "$FIXTURES/ALL_HR"
+    printf 'RetryOnFailure' > "$FIXTURES/kubernetes-test-latest-version.strategy"
+    printf 'deployed\n' > "$FIXTURES/kubernetes-test-latest-version.history"
+    # The addon is a shape the guard fails a run on: a footprint on a release
+    # that retries in place.
+    printf 'RetryOnFailure' > "$FIXTURES/kubernetes-test-latest-version-cilium.strategy"
+    printf 'uninstalled\ndeployed\n' > "$FIXTURES/kubernetes-test-latest-version-cilium.history"
+
+    rc=0
+    out=$(PATH="$tmp/bin:$PATH" cozy_report_helmrelease_remediation tenant-test kubernetes-test-latest-version 2>&1) || rc=$?
+    if [ "$rc" -ne 0 ]; then
+        echo "expected the report to return zero so the caller keeps its exit, got rc=$rc: $out" >&2
+        exit 1
+    fi
+    # And the verdict is still reported: suppressed for the caller's status, not
+    # suppressed out of the log, or the collector would be silent about the one
+    # release it had something to say about.
+    if ! printf '%s\n' "$out" | grep -q 'kubernetes-test-latest-version-cilium carries a failed or uninstalled Snapshot, and its install strategy is RetryOnFailure'; then
+        echo "expected the addon footprint to be classified, got: $out" >&2
+        exit 1
+    fi
+
+    rm -rf "$tmp"
+}
+
+@test "the failure-path report stops at its budget and names what it did not read" {
+    # What runs after this report on the exit path is the tenant crust-gather
+    # snapshot, which needs the rest of the op. A namespace whose apiserver
+    # answers slowly therefore has to cost a stated number of seconds rather
+    # than however many releases happen to be in it. The release the budget cut
+    # off is named: a walk that stopped in silence leaves a bundle that reads
+    # like one where those releases were clean.
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    tmp=$(mktemp -d)
+    cozy_make_kubectl_stub "$tmp"
+    export FIXTURES="$tmp/fixtures"
+    printf 'kubernetes-test-latest-version-cilium\nkubernetes-test-latest-version-coredns\n' > "$FIXTURES/ALL_HR"
+    printf 'RetryOnFailure' > "$FIXTURES/kubernetes-test-latest-version.strategy"
+    printf 'deployed\n' > "$FIXTURES/kubernetes-test-latest-version.history"
+    printf 'deployed\n' > "$FIXTURES/kubernetes-test-latest-version-cilium.history"
+    printf 'deployed\n' > "$FIXTURES/kubernetes-test-latest-version-coredns.history"
+    # 30s per reading against a 90s budget: the report stamps its deadline at
+    # 1000+90, the listing is checked at 1030, the first addon at 1060 and the
+    # second at 1090, which is the first reading the deadline refuses.
+    date_ticks="$tmp/ticks"
+    printf '0' > "$date_ticks"
+    date_now=1000
+    date_step=30
+    COZY_GUARD_REPORT_BUDGET=90
+
+    rc=0
+    out=$(PATH="$tmp/bin:$PATH" cozy_report_helmrelease_remediation tenant-test kubernetes-test-latest-version 2>&1) || rc=$?
+    date_now=
+    date_step=0
+    date_ticks=
+    unset COZY_GUARD_REPORT_BUDGET
+    if [ "$rc" -ne 0 ]; then
+        echo "expected the report to return zero even when its budget ran out, got rc=$rc: $out" >&2
+        exit 1
+    fi
+    if ! printf '%s\n' "$out" | grep -q 'HelmRelease kubernetes-test-latest-version-cilium '; then
+        echo "expected the first addon to have been read inside the budget, got: $out" >&2
+        exit 1
+    fi
+    if printf '%s\n' "$out" | grep -q 'HelmRelease kubernetes-test-latest-version-coredns (install strategy'; then
+        echo "expected the second addon to fall outside the budget, got: $out" >&2
+        exit 1
+    fi
+    if ! printf '%s\n' "$out" | grep -q -F 'stopped after 90s; kubernetes-test-latest-version-coredns and every release after it were not read'; then
+        echo "expected the cut-off release to be named, got: $out" >&2
+        exit 1
+    fi
+
+    rm -rf "$tmp"
+}
+
+@test "the failure-path report classifies one run once" {
+    # It is reachable from two call sites that both fire on a node-join failure:
+    # the collector block, and the exit handler after it. The same verdicts
+    # printed twice read as two observations of one release, which is a
+    # different finding from the one the run made.
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    tmp=$(mktemp -d)
+    cozy_make_kubectl_stub "$tmp"
+    export FIXTURES="$tmp/fixtures"
+    printf 'kubernetes-test-latest-version-coredns\n' > "$FIXTURES/ALL_HR"
+    printf 'RetryOnFailure' > "$FIXTURES/kubernetes-test-latest-version.strategy"
+    printf 'deployed\n' > "$FIXTURES/kubernetes-test-latest-version.history"
+    printf 'deployed\n' > "$FIXTURES/kubernetes-test-latest-version-coredns.history"
+
+    # Both calls run in one command substitution, because the flag is set inside
+    # the function and a subshell's assignment does not reach the next call
+    # otherwise - which is also how the two real call sites see it, both being
+    # in the same shell. Only stdout is compared: the other runner traces the
+    # body to stderr, and a capture that took it would be comparing the trace.
+    _COZY_GUARD_REPORT_DONE=0
+    out=$( { PATH="$tmp/bin:$PATH" cozy_report_helmrelease_remediation tenant-test kubernetes-test-latest-version
+             PATH="$tmp/bin:$PATH" cozy_report_helmrelease_remediation tenant-test kubernetes-test-latest-version
+           } 2>/dev/null )
+    headers=$(printf '%s\n' "$out" | grep -c 'tenant HelmRelease remediation footprint' || true)
+    if [ "$headers" != 1 ]; then
+        echo "expected exactly one classification, got $headers:
+$out" >&2
+        exit 1
+    fi
+    releases=$(printf '%s\n' "$out" | grep -c '^HelmRelease kubernetes-test-latest-version' || true)
+    if [ "$releases" != 2 ]; then
+        echo "expected the parent and its one addon classified once each, got $releases:
+$out" >&2
+        exit 1
+    fi
+
+    rm -rf "$tmp"
+}
+
+@test "the failure paths reach the classification the guard cannot" {
+    lib=hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    # The behaviour above says nothing about whether the failing paths still
+    # call it: delete both call sites and every case in this file stays green
+    # while a failed tenant CNI goes unnamed exactly as it did before.
+    #
+    # Ordering is part of it on the exit handler. The classification is a
+    # handful of bounded reads and it discriminates between failure modes; the
+    # snapshot costs minutes. Behind the snapshot it would be the thing a slow
+    # collect drops.
+    #
+    # Keyword and signal are assembled from separate arguments, the way the
+    # ordering pin above does it: hack/bats-no-exit-trap.bats scans this file
+    # lexically and would count a spelled-out pair as a handler this file
+    # installs.
+    arm_re=$(printf "^  %s '_tenant_failure_on_exit' %s\$" 'trap' 'EXIT')
+    arm=$(grep -n "$arm_re" "$lib" | head -n 1 | cut -d: -f1)
+    if [ -z "$arm" ]; then
+        echo "expected run_kubernetes_test to arm the composite failure handler" >&2
+        exit 1
+    fi
+    # Armed before the first management-cluster wait, not after them. Everything
+    # from the Kubernetes CR apply to the tenant LB answering is a wait on the
+    # parent HelmRelease or on what it installs, and a helm-wait budget expiring
+    # in there is the remediation this classification exists to name. Armed
+    # afterwards, each of those waits exits under errexit with the handler not
+    # yet installed and the run says nothing about the releases.
+    #
+    # Anchored on the first wait of that window by name, not on whichever
+    # kubectl_wait_retry comes first in the file: a file-global match happens to
+    # land inside run_kubernetes_test today, and one added to any function
+    # defined above it would turn this into a comparison of two unrelated lines
+    # that passes for the wrong reason. If the control-plane wait is renamed the
+    # lookup comes back empty and says so, which is the honest failure.
+    cp_wait=$(grep -n 'kubectl_wait_retry --for=condition=TenantControlPlaneCreated' "$lib" | head -n 1 | cut -d: -f1)
+    if [ -z "$cp_wait" ]; then
+        echo "expected to find the tenant control-plane wait in $lib" >&2
+        exit 1
+    fi
+    if [ "$arm" -ge "$cp_wait" ]; then
+        echo "expected the handler armed (line $arm) before the control-plane wait (line $cp_wait)" >&2
+        exit 1
+    fi
+    # The parent name is part of this one, because it is what tells the
+    # node-join call apart from the handler's. What follows it is not: a
+    # section label is presentation and may change without the wiring changing.
+    node_join=$(grep -n '^ *cozy_report_helmrelease_remediation tenant-test "kubernetes-\${test_name}"' "$lib" | head -n 1 | cut -d: -f1)
+    if [ -z "$node_join" ]; then
+        echo "expected the node-join collector to classify the tenant HelmReleases" >&2
+        exit 1
+    fi
+    # Anchored on the two calls and not on the text of their arguments. Those
+    # arguments name variables of this library, which a refactor there is free
+    # to rename without touching the ordering this asserts; spelling them out
+    # turns such a rename into a red test that reports the collectors as
+    # missing. The trailing space is what keeps each pattern off the function's
+    # own definition line, where the name is followed by a parenthesis.
+    snapshot=$(grep -n '^ *_tenant_snapshot_on_fail ' "$lib" | head -n 1 | cut -d: -f1)
+    if [ -z "$snapshot" ]; then
+        echo "expected the exit handler to take the tenant snapshot" >&2
+        exit 1
+    fi
+    # The last classification call above the snapshot, so the node-join one
+    # further down the file cannot stand in for the handler's.
+    report=$(grep -n '^ *cozy_report_helmrelease_remediation ' "$lib" | cut -d: -f1 \
+        | awk -v s="$snapshot" '$1 < s' | tail -n 1)
+    if [ -z "$report" ]; then
+        echo "expected the exit handler to classify the HelmReleases before the snapshot" >&2
+        exit 1
+    fi
+    if [ "$report" -ge "$snapshot" ]; then
+        echo "expected the classification (line $report) before the snapshot (line $snapshot)" >&2
+        exit 1
+    fi
+}
+
+@test "the exit handler is given the release name it classifies" {
+    lib=hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    # The ordering pin above proves the handler is armed early and that it
+    # classifies before it snapshots. Neither says the handler has anything to
+    # classify: it reads the parent release from CURRENT_TENANT_PARENT_HR, and
+    # with that assignment gone the name arrives empty, the collector returns on
+    # its empty-parent gate, and every failure path goes quiet while the whole
+    # suite stays green. That is the assignment carrying the behaviour of this
+    # change on its own, so it is pinned on its own.
+    #
+    # Keyword and signal assembled from separate arguments, as the pin above
+    # does it, because hack/bats-no-exit-trap.bats scans this file lexically and
+    # a spelled-out pair reads as a handler this file installs.
+    arm_re=$(printf "^  %s '_tenant_failure_on_exit' %s\$" 'trap' 'EXIT')
+    arm=$(grep -n "$arm_re" "$lib" | head -n 1 | cut -d: -f1)
+    if [ -z "$arm" ]; then
+        echo "expected run_kubernetes_test to arm the composite failure handler" >&2
+        exit 1
+    fi
+    assign=$(grep -n '^ *CURRENT_TENANT_PARENT_HR=' "$lib" | head -n 1 | cut -d: -f1)
+    if [ -z "$assign" ]; then
+        echo "expected run_kubernetes_test to record the parent release name for the exit handler" >&2
+        exit 1
+    fi
+    # Before the arming and not merely present: armed first, a failure in the
+    # window between the two lines enters the handler with the name still unset,
+    # which is the same silence as never assigning it.
+    if [ "$assign" -ge "$arm" ]; then
+        echo "expected the parent release name recorded (line $assign) before the handler is armed (line $arm)" >&2
+        exit 1
+    fi
+
+    # And the handler must read that variable rather than a name of its own, so
+    # the two cannot drift apart.
+    if ! grep -q 'CURRENT_TENANT_PARENT_HR' "$lib"; then
+        echo "expected the exit handler to read the recorded parent release name" >&2
+        exit 1
+    fi
+    reader=$(grep -n 'cozy_report_helmrelease_remediation tenant-test "\${CURRENT_TENANT_PARENT_HR' "$lib" | head -n 1 | cut -d: -f1)
+    if [ -z "$reader" ]; then
+        echo "expected the exit handler to pass the recorded parent release name to the classification" >&2
+        exit 1
+    fi
+}
+
+@test "the failure-path report does not list the addons past its budget" {
+    # The per-release check admits or declines a release that is already known.
+    # The listing is what discovers them, and it is a read of its own: spent
+    # past the deadline it buys a name for a walk that has no time left to make.
+    # Checked only inside the loop, the parent's reads plus this one could carry
+    # the walk well past the budget before anything looked at the clock, on the
+    # paths where nothing else bounds it at all.
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    tmp=$(mktemp -d)
+    cozy_make_kubectl_stub "$tmp"
+    export FIXTURES="$tmp/fixtures"
+    printf 'kubernetes-test-latest-version-cilium\n' > "$FIXTURES/ALL_HR"
+    printf 'RetryOnFailure' > "$FIXTURES/kubernetes-test-latest-version.strategy"
+    printf 'deployed\n' > "$FIXTURES/kubernetes-test-latest-version.history"
+    printf 'uninstalled\ndeployed\n' > "$FIXTURES/kubernetes-test-latest-version-cilium.history"
+    # The deadline is stamped at 1000+90 and the listing is checked one reading
+    # later, at 1100.
+    date_ticks="$tmp/ticks"
+    printf '0' > "$date_ticks"
+    date_now=1000
+    date_step=100
+    COZY_GUARD_REPORT_BUDGET=90
+
+    rc=0
+    out=$(PATH="$tmp/bin:$PATH" cozy_report_helmrelease_remediation tenant-test kubernetes-test-latest-version 2>&1) || rc=$?
+    date_now=
+    date_step=0
+    date_ticks=
+    unset COZY_GUARD_REPORT_BUDGET
+    if [ "$rc" -ne 0 ]; then
+        echo "expected the report to return zero, got rc=$rc: $out" >&2
+        exit 1
+    fi
+    if ! printf '%s\n' "$out" | grep -q 'HelmRelease kubernetes-test-latest-version (install strategy'; then
+        echo "expected the parent to have been classified before the budget ran out, got: $out" >&2
+        exit 1
+    fi
+    if printf '%s\n' "$out" | grep -q 'kubernetes-test-latest-version-cilium'; then
+        echo "expected no addon to be read once the budget was spent, got: $out" >&2
+        exit 1
+    fi
+    if ! printf '%s\n' "$out" | grep -q -F 'the addon releases of kubernetes-test-latest-version were not listed'; then
+        echo "expected the skipped listing to be named, got: $out" >&2
+        exit 1
+    fi
+
+    rm -rf "$tmp"
+}
+
+@test "the guard's own verdict does not get classified a second time on the way out" {
+    # The guard call sits before the snapshot trap is disarmed, deliberately, so
+    # when it finds a failure the script exits with the handler still armed and
+    # the handler runs the report over the releases the guard just judged. Both
+    # go through cozy_guard_helmrelease, so every line would be identical: two
+    # observations of one release where there was one, and a second walk
+    # spending its budget in front of the snapshot on the run where the snapshot
+    # matters most.
+    #
+    # Both calls run in one command substitution because the flag is set inside
+    # the functions, which is also how the real pair sees it: the guard runs in
+    # run_kubernetes_test and the handler on that shell's exit. Only stdout is
+    # compared, since the other runner traces the body to stderr.
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    tmp=$(mktemp -d)
+    cozy_make_kubectl_stub "$tmp"
+    export FIXTURES="$tmp/fixtures"
+    printf 'kubernetes-test-latest-version-cilium\n' > "$FIXTURES/ALL_HR"
+    printf 'RetryOnFailure' > "$FIXTURES/kubernetes-test-latest-version.strategy"
+    printf 'uninstalled\ndeployed\n' > "$FIXTURES/kubernetes-test-latest-version.history"
+    printf 'deployed\n' > "$FIXTURES/kubernetes-test-latest-version-cilium.history"
+
+    _COZY_GUARD_REPORT_DONE=0
+    out=$( { PATH="$tmp/bin:$PATH" cozy_guard_all_helmreleases tenant-test kubernetes-test-latest-version || true
+             PATH="$tmp/bin:$PATH" cozy_report_helmrelease_remediation tenant-test kubernetes-test-latest-version
+           } 2>/dev/null )
+    parent=$(printf '%s\n' "$out" | grep -c '^HelmRelease kubernetes-test-latest-version (install strategy' || true)
+    if [ "$parent" != 1 ]; then
+        echo "expected the parent classified once, got $parent:
+$out" >&2
+        exit 1
+    fi
+    addon=$(printf '%s\n' "$out" | grep -c '^HelmRelease kubernetes-test-latest-version-cilium (install strategy' || true)
+    if [ "$addon" != 1 ]; then
+        echo "expected the addon classified once, got $addon:
+$out" >&2
+        exit 1
+    fi
+
+    rm -rf "$tmp"
+}
+
+@test "a report that printed nothing does not spend the run's one classification" {
+    # The flag is set after the early returns, not before them. A call that
+    # returns without printing has classified nothing, and letting it claim the
+    # slot would leave the release unclassified while the run looked as though
+    # it had been read once. The reachable shape is an empty parent name, which
+    # is what the exit handler passes when it fires before the release exists.
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    tmp=$(mktemp -d)
+    cozy_make_kubectl_stub "$tmp"
+    export FIXTURES="$tmp/fixtures"
+    printf 'kubernetes-test-latest-version-coredns\n' > "$FIXTURES/ALL_HR"
+    printf 'RetryOnFailure' > "$FIXTURES/kubernetes-test-latest-version.strategy"
+    printf 'deployed\n' > "$FIXTURES/kubernetes-test-latest-version.history"
+    printf 'deployed\n' > "$FIXTURES/kubernetes-test-latest-version-coredns.history"
+
+    _COZY_GUARD_REPORT_DONE=0
+    out=$( { PATH="$tmp/bin:$PATH" cozy_report_helmrelease_remediation tenant-test ""
+             PATH="$tmp/bin:$PATH" cozy_report_helmrelease_remediation tenant-test kubernetes-test-latest-version
+           } 2>/dev/null )
+    if ! printf '%s\n' "$out" | grep -q '^HelmRelease kubernetes-test-latest-version (install strategy'; then
+        echo "expected the second call to classify after the first printed nothing, got: $out" >&2
+        exit 1
+    fi
+
+    rm -rf "$tmp"
+}
+
+@test "a zero report budget is rejected because zero declines the walk instead of bounding it" {
+    # The budget gates whether the next read may start, so zero does not tighten
+    # the walk, it refuses the first reading: the deadline is stamped at the
+    # current second and the listing that discovers the addons is already past
+    # it. A run reaching this collector is a failing run, and a zero here turns
+    # the only classification it gets into "stopped after 0s".
+    #
+    # Both halves have to reject it. The knob is resolved once at source time,
+    # which is where a value from the environment arrives, and again where the
+    # walk reads it, which is the only moment a caller inside this shell can
+    # move it - the suite lowers it exactly that way in the budget case above.
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    tmp=$(mktemp -d)
+
+    out=$(env COZY_GUARD_REPORT_BUDGET=0 bash -c '
+      . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+      printf "resolved=%s\n" "$COZY_GUARD_REPORT_BUDGET"
+    ' 2>&1) || true
+    if ! printf '%s\n' "$out" | grep -q "ignoring COZY_GUARD_REPORT_BUDGET='0'"; then
+        echo "expected a zero from the environment to be rejected and named, got: $out" >&2
+        exit 1
+    fi
+    if ! printf '%s\n' "$out" | grep -q "resolved=${COZY_GUARD_REPORT_BUDGET_DEFAULT}"; then
+        echo "expected the rejected zero to fall back to the default, got: $out" >&2
+        exit 1
+    fi
+
+    # And after sourcing, which the assignment-time check cannot see. The walk
+    # has to reach the releases: a report that declined every one of them at a
+    # zero deadline reads, in the bundle, exactly like a namespace whose
+    # releases were all clean.
+    cozy_make_kubectl_stub "$tmp"
+    export FIXTURES="$tmp/fixtures"
+    printf 'kubernetes-test-latest-version-coredns\n' > "$FIXTURES/ALL_HR"
+    printf 'RetryOnFailure' > "$FIXTURES/kubernetes-test-latest-version.strategy"
+    printf 'deployed\n' > "$FIXTURES/kubernetes-test-latest-version.history"
+    printf 'deployed\n' > "$FIXTURES/kubernetes-test-latest-version-coredns.history"
+
+    _COZY_GUARD_REPORT_DONE=0
+    COZY_GUARD_REPORT_BUDGET=0
+    out=$(PATH="$tmp/bin:$PATH" cozy_report_helmrelease_remediation tenant-test kubernetes-test-latest-version 2>&1) || true
+    unset COZY_GUARD_REPORT_BUDGET
+    if ! printf '%s\n' "$out" | grep -q "ignoring COZY_GUARD_REPORT_BUDGET='0'"; then
+        echo "expected a post-source zero to be rejected and named, got: $out" >&2
+        exit 1
+    fi
+    if printf '%s\n' "$out" | grep -q 'stopped after 0s'; then
+        echo "expected the walk to run rather than decline at a zero deadline, got: $out" >&2
+        exit 1
+    fi
+    if ! printf '%s\n' "$out" | grep -q 'HelmRelease kubernetes-test-latest-version-coredns (install strategy'; then
+        echo "expected the addon to be read after the zero was corrected, got: $out" >&2
+        exit 1
+    fi
+
+    rm -rf "$tmp"
+}
+
+@test "the exit handler carries the failing status past the collector that clears it" {
+    # The snapshot half is the second half of a composite handler, and what sits
+    # in front of it is a collector ending in `|| true`, so $? read inside the
+    # snapshot half is that `|| true` rather than the run: zero, on every failing
+    # run, and the tenant crust-gather capture returns at its own guard without
+    # collecting anything. The status is therefore captured once at the top of
+    # the handler and passed down.
+    #
+    # The trap installation is pinned above; this is the other half, the value
+    # that travels through it. Called directly after a command of known status
+    # rather than from a real trap, because $? at function entry is the same
+    # either way and a trap inside a test body is what hack/bats-no-exit-trap.bats
+    # exists to keep out.
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    tmp=$(mktemp -d)
+
+    # The collector between the two halves returns zero, which is exactly what
+    # makes the bug invisible: it is the status $? would report.
+    cozy_report_helmrelease_remediation() { return 0; }
+    _tenant_snapshot_on_fail() { printf '%s\n' "${1-<none>}" > "$tmp/rc"; }
+
+    # errexit off across the pair: the point is to enter the handler with a
+    # non-zero $?, which under `set -e` ends the test at the command that sets it.
+    set +e
+    sh -c 'exit 7'
+    _tenant_failure_on_exit
+    set -e
+    if [ ! -f "$tmp/rc" ]; then
+        echo "expected the handler to reach the snapshot on a failing status" >&2
+        exit 1
+    fi
+    if [ "$(cat "$tmp/rc")" != "7" ]; then
+        echo "expected the snapshot to receive the run's status 7, got $(cat "$tmp/rc")" >&2
+        exit 1
+    fi
+
+    # The other half of the contract: a zero status returns before either
+    # collector, so a passing run pays for neither.
+    rm -f "$tmp/rc"
+    set +e
+    true
+    _tenant_failure_on_exit
+    set -e
+    if [ -f "$tmp/rc" ]; then
+        echo "expected the handler to return on a zero status, got $(cat "$tmp/rc")" >&2
+        exit 1
+    fi
+
+    # And the receiving half reads the argument rather than $?, which the two
+    # checks above cannot see because they replace it. Called with the two
+    # disagreeing on purpose: $? says the opposite of the argument each time, so
+    # a function reading the wrong one lands on the wrong branch in both.
+    # Re-sourced rather than unset: the stub above replaced the definition, and
+    # bash keeps one function per name, so unsetting it takes the real one with it.
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    # crust-gather goes on PATH rather than into a shell function, the way
+    # cozy_make_kubectl_stub does it above and the way the other suites stub this
+    # same binary. A hyphen is legal in a command name and not in a function
+    # name, so the function form is a parse error under the sh the second runner
+    # uses -- accepted by the bash this file also runs under, which is what makes
+    # it a stub that works in one runner and takes the whole file down in the
+    # other. `command -v` finds a PATH entry exactly as readily.
+    mkdir -p "$tmp/bin"
+    printf '#!/bin/sh\nexit 0\n' > "$tmp/bin/crust-gather"
+    chmod +x "$tmp/bin/crust-gather"
+    timeout() { :; }
+    CURRENT_TENANT_KC="$tmp/kubeconfig"
+    : > "$CURRENT_TENANT_KC"
+    COZY_REPORT_DIR="$tmp/report"
+
+    set +e
+    true
+    out=$(PATH="$tmp/bin:$PATH" _tenant_snapshot_on_fail 7 2>&1)
+    set -e
+    if ! printf '%s\n' "$out" | grep -q 'capturing tenant crust-gather snapshot'; then
+        echo "expected a failing argument to reach the capture despite a zero \$?, got: $out" >&2
+        exit 1
+    fi
+
+    set +e
+    sh -c 'exit 7'
+    out=$(PATH="$tmp/bin:$PATH" _tenant_snapshot_on_fail 0 2>&1)
+    set -e
+    # Absence of the marker rather than an empty capture: one of the two runners
+    # executes test bodies under xtrace, which writes the trace to the same fd
+    # this redirects, so "nothing was printed" is never true there. The marker is
+    # traced only if the line it comes from is reached, so it discriminates under
+    # both.
+    if printf '%s\n' "$out" | grep -q 'capturing tenant crust-gather snapshot'; then
+        echo "expected a zero argument to return before the capture despite a failing \$?, got: $out" >&2
+        exit 1
+    fi
+
+    rm -rf "$tmp"
+}
+
+@test "a read killed before it finished does not send the reader after a kubectl error" {
+    # Same rule as the wall-clock cut-off above, at the other status the bound
+    # produces. `timeout -k` escalates to SIGKILL when the read ignores the
+    # first signal, and the shell reports that as 137. Nothing is written on
+    # either stream before the process dies, so a note ending in "kubectl's
+    # error is above" sends the reader to an empty screen. The arm exists to
+    # say what happened instead, and without a fixture that reaches 137 it was
+    # unreachable: deleting it changed no test's verdict.
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    tmp=$(mktemp -d)
+    cozy_make_kubectl_stub "$tmp"
+    export FIXTURES="$tmp/fixtures"
+    printf 'kubernetes-test-latest-version-cilium\n' > "$FIXTURES/ALL_HR"
+    printf 'RetryOnFailure' > "$FIXTURES/kubernetes-test-latest-version.strategy"
+    printf 'deployed\n' > "$FIXTURES/kubernetes-test-latest-version.history"
+
+    : > "$FIXTURES/kubernetes-test-latest-version-cilium.history.KILLED"
+    rc=0
+    out=$(PATH="$tmp/bin:$PATH" cozy_guard_helmrelease tenant-test kubernetes-test-latest-version-cilium 2>&1) || rc=$?
+    rm -f "$FIXTURES/kubernetes-test-latest-version-cilium.history.KILLED"
+    if [ "$rc" -eq 0 ]; then
+        echo "expected a killed read to fail the guard, got rc=0: $out" >&2
+        exit 1
+    fi
+    if printf '%s\n' "$out" | grep -q "kubectl's error is above"; then
+        echo "expected no claim of a kubectl error on a read that printed nothing, got: $out" >&2
+        exit 1
+    fi
+    if ! printf '%s\n' "$out" | grep -q 'was killed before it finished'; then
+        echo "expected the note to name the kill, got: $out" >&2
+        exit 1
+    fi
+    rm -rf "$tmp"
+}
+
+@test "a read the wall clock cut off does not send the reader after a kubectl error" {
+    # The bound exists to kill a read that will not finish, and a killed read
+    # writes nothing on either stream. Ending the note with "kubectl's error is
+    # above" points at an empty screen on exactly the failure the bound produces,
+    # while a read that failed for a reason kubectl reported keeps that ending.
+    # cozy_diag_read draws the same line for the same reason.
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    tmp=$(mktemp -d)
+    cozy_make_kubectl_stub "$tmp"
+    export FIXTURES="$tmp/fixtures"
+    printf 'kubernetes-test-latest-version-cilium\n' > "$FIXTURES/ALL_HR"
+    printf 'RetryOnFailure' > "$FIXTURES/kubernetes-test-latest-version.strategy"
+    printf 'deployed\n' > "$FIXTURES/kubernetes-test-latest-version.history"
+
+    : > "$FIXTURES/kubernetes-test-latest-version-cilium.history.CUTOFF"
+    rc=0
+    out=$(PATH="$tmp/bin:$PATH" cozy_guard_helmrelease tenant-test kubernetes-test-latest-version-cilium 2>&1) || rc=$?
+    rm -f "$FIXTURES/kubernetes-test-latest-version-cilium.history.CUTOFF"
+    if [ "$rc" -eq 0 ]; then
+        echo "expected a cut-off read to fail the guard, got rc=0: $out" >&2
+        exit 1
+    fi
+    if printf '%s\n' "$out" | grep -q "kubectl's error is above"; then
+        echo "expected no claim of a kubectl error on a read that printed nothing, got: $out" >&2
+        exit 1
+    fi
+    if ! printf '%s\n' "$out" | grep -q 'was cut off'; then
+        echo "expected the note to name the cut-off, got: $out" >&2
+        exit 1
+    fi
+
+    # The other side: a read that failed with kubectl reporting why keeps the
+    # ending that sends the reader to it.
+    : > "$FIXTURES/kubernetes-test-latest-version-cilium.history.FAILS"
+    rc=0
+    out=$(PATH="$tmp/bin:$PATH" cozy_guard_helmrelease tenant-test kubernetes-test-latest-version-cilium 2>&1) || rc=$?
+    if [ "$rc" -eq 0 ]; then
+        echo "expected a failed read to fail the guard, got rc=0: $out" >&2
+        exit 1
+    fi
+    if ! printf '%s\n' "$out" | grep -q "kubectl's error is above"; then
+        echo "expected a reported failure to keep pointing at kubectl's output, got: $out" >&2
+        exit 1
+    fi
+
+    rm -rf "$tmp"
+}
diff --git a/hack/run-kubernetes-runner-canary_test.bats b/hack/run-kubernetes-runner-canary_test.bats
new file mode 100644
index 0000000000..7e2f85f90c
--- /dev/null
+++ b/hack/run-kubernetes-runner-canary_test.bats
@@ -0,0 +1,2205 @@
+#!/usr/bin/env bats
+# Regression coverage for the runner fixed-work canary in
+# hack/e2e-chainsaw/_lib/run-kubernetes.sh. cozytest.sh ends an @test block at
+# the first bare closing brace, so command mocks stay at top level.
+#
+# What this collector is for, and why its failure modes are worth pinning. No
+# counter that file already reads carries a unit of work of its own, whatever
+# unit it is read in; this one runs a fixed amount of work and times it, which
+# is what gives its reading a scale of its own and lets it call a single red run
+# pathological with no green run beside it. That scale is exactly what a wrong
+# duration destroys, and a wrong duration is cheap to produce: a clock field
+# parsed with the wrong number of decimals is off by a factor of ten, which is
+# the size of the effect being hunted, and a capture reporting it would read like
+# a finding rather than like a bug.
+#
+# So most of what follows is about the arithmetic and about the difference
+# between silence and a reading. An arm nobody could time, an arm stopped at its
+# ceiling and an arm that ran to the end are three different things, and only
+# the last of them is a rate.
+#
+# Run with: bats hack/run-kubernetes-runner-canary_test.bats
+#
+# CI runs this file under Bats through `make bats-unit-tests`; nounset comes from
+# test_helper. The collector itself runs under dash in the sandbox image, so the
+# failed-open behavior below is paired with a structural assertion that pins
+# the safe `true >` spelling. Replacing it with the POSIX special builtin `: >`
+# can exit dash before the caller handles the status even when Bash stays green.
+
+load test_helper
+
+timeout_calls=/dev/null
+timeout_rc_override=
+timeout_rc_match=
+timeout_skip_command=
+
+timeout() {
+  local command_rc=0
+  printf '%s\n' "$*" >>"${timeout_calls}"
+  # Return 97 rather than running the command when the wrapper is not the
+  # bounded form: work that lost its ceiling must not pass as work that had one.
+  [ "${1:-}" = -k ] || return 97
+  shift 3
+  if [ -z "${timeout_skip_command}" ]; then
+    "$@" || command_rc=$?
+  fi
+  case "$*" in
+    *"${timeout_rc_match}"*)
+      [ -z "${timeout_rc_override}" ] || return "${timeout_rc_override}"
+      ;;
+  esac
+  return "${command_rc}"
+}
+
+assert_file_contains() {
+  local needle="$1"
+  local file="$2"
+
+  if [ ! -f "${file}" ]; then
+    printf 'expected %s to exist so it could be checked for: %s\n' "${file}" "${needle}" >&2
+    return 1
+  fi
+  case "$(cat "${file}")" in
+    *"${needle}"*) return 0 ;;
+  esac
+  printf 'expected %s to contain: %s\n' "${file}" "${needle}" >&2
+  cat "${file}" >&2
+  return 1
+}
+
+assert_file_lacks_pattern() {
+  local pattern="$1"
+  local file="$2"
+
+  # A missing file must fail rather than vacuously pass: a bare `! grep -q`
+  # succeeds on an unreadable path, which is indistinguishable from "the file
+  # exists and does not carry the label".
+  if [ ! -f "${file}" ]; then
+    printf 'expected %s to exist so it could be checked for: %s\n' "${file}" "${pattern}" >&2
+    return 1
+  fi
+  # Branched on awk's exact status. awk exits 1 for "no line matched" and 2 for
+  # "I could not evaluate this"; folded together, a negative assertion is
+  # satisfied by its own matcher giving up, which is the direction that goes
+  # green and stays green.
+  local _rc=0
+  awk -v pattern="${pattern}" '$0 ~ pattern { found = 1 } END { exit found ? 0 : 1 }' "${file}" || _rc=$?
+  case "${_rc}" in
+    0)
+      printf 'expected %s not to match: %s\n' "${file}" "${pattern}" >&2
+      cat "${file}" >&2
+      return 1
+      ;;
+    1) return 0 ;;
+    *)
+      printf 'awk could not evaluate pattern %s against %s\n' "${pattern}" "${file}" >&2
+      return 1
+      ;;
+  esac
+}
+
+# The clock the arms are timed by, replaced by a scripted sequence.
+#
+# Real durations are the one thing this suite must not depend on: they are set
+# by whatever else is running on the machine, and every rate below is derived
+# from them. The stub hands out one centisecond stamp per call in the order the
+# collector takes them -- arm one start, arm one end, arm two start, arm two end
+# -- so the arithmetic the capture prints is decided by the test rather than by
+# the host.
+#
+# Installed by a function called after the library is sourced, because sourcing
+# would otherwise replace it with the real one.
+stamp_values=
+stamp_index=0
+stamp_fail_at=
+
+stub_stamp() {
+  _cozy_canary_stamp() {
+    stamp_index=$(( stamp_index + 1 ))
+    if [ "${stamp_index}" = "${stamp_fail_at}" ]; then
+      return 1
+    fi
+    _COZY_CANARY_CS=$(printf '%s\n' ${stamp_values} | sed -n "${stamp_index}p")
+    [ -n "${_COZY_CANARY_CS}" ] || return 1
+  }
+}
+
+# The same collector run in this shell rather than in a subshell, for the cases
+# that read a variable it leaves behind rather than a file: the alert the call
+# sites branch on would go with the subshell.
+run_canary_here() {
+  local _rc=0
+  set +x
+  cozy_capture_runner_canary "${1:-1}" || _rc=$?
+  return "${_rc}"
+}
+
+# The collector writes into files it decides from a command's stderr, and
+# cozytest.sh runs under `set -x`, so the tracer's own lines would land on the
+# very stderr being redirected. Call through this so the sinks hold what
+# production writes.
+run_canary() {
+  local _rc=0
+  ( set +x; cozy_capture_runner_canary "${1:-1}" ) || _rc=$?
+  return "${_rc}"
+}
+
+stage() {
+  COZY_REPORT_DIR="$1/report"
+  COZY_SNAPSHOT_NAME=canary-smoke
+  COZY_DIAG_RUNNER_PROC_UPTIME="$1/uptime"
+  printf '70062.90 774208.84\n' >"${COZY_DIAG_RUNNER_PROC_UPTIME}"
+}
+
+capture_path() {
+  printf '%s/snapshots/canary-smoke/runner-canary/sample-%s/fixed-work.txt' \
+    "${COZY_REPORT_DIR}" "${1:-1}"
+}
+
+# ---------------------------------------------------------------------------
+# The clock.
+# ---------------------------------------------------------------------------
+
+@test "the clock reads the kernel hundredths into centiseconds" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  stage "$tmp"
+
+  _cozy_canary_stamp
+  [ "$_COZY_CANARY_CS" = 7006290 ] || {
+    echo "FAIL: 70062.90 read as $_COZY_CANARY_CS centiseconds" >&2
+    return 1
+  }
+  rm -rf "$tmp"
+}
+
+@test "a clock field the arithmetic is not written for is refused rather than parsed" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  stage "$tmp"
+
+  # None of these is a shape the arithmetic below is written for, and they fail
+  # in three different ways once the checks are gone: a fraction of the wrong
+  # width divides by ten or multiplies by it, which is the size of the effect
+  # being hunted; a field with no point at all reads its own digits as
+  # hundredths and skews by a percent; a non-digit ends the shell mid-arm. A
+  # refused clock is silence; a mis-scaled one is a finding nobody made.
+  for field in '70062.900' '70062.9' '70062' '70' 'x.90' '70062.9x' '070062.90' '7x.90'; do
+    printf '%s 774208.84\n' "$field" >"$COZY_DIAG_RUNNER_PROC_UPTIME"
+    _COZY_CANARY_CS=unset
+    if _cozy_canary_stamp; then
+      echo "FAIL: the clock accepted the field $field and read it as $_COZY_CANARY_CS" >&2
+      return 1
+    fi
+  done
+  rm -rf "$tmp"
+}
+
+@test "a leading zero in the hundredths is not read as octal" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  stage "$tmp"
+
+  # 08 and 09 are not numbers to `$(( ))` at all, so an unstripped fraction ends
+  # the shell on one uptime in fifty rather than returning a wrong figure. There
+  # is no third kind to exercise: the field is two digits, so a leading zero can
+  # only make 00 through 09, and every one of those that parses at all parses as
+  # the value it reads as -- 07 is seven in both shells with the strip and
+  # without it. So the rows are the two that are errors, and each pins the
+  # figure the strip has to leave behind as well as the error it avoids.
+  for pair in '70062.09 7006209' '70062.08 7006208'; do
+    field=${pair% *}
+    want=${pair#* }
+    printf '%s 774208.84\n' "$field" >"$COZY_DIAG_RUNNER_PROC_UPTIME"
+    _cozy_canary_stamp
+    [ "$_COZY_CANARY_CS" = "$want" ] || {
+      echo "FAIL: $field read as $_COZY_CANARY_CS, expected $want" >&2
+      return 1
+    }
+  done
+  rm -rf "$tmp"
+}
+
+@test "an unreadable clock is refused without putting a shell error on stderr" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  stage "$tmp"
+  COZY_DIAG_RUNNER_PROC_UPTIME="$tmp/absent"
+
+  rc=0
+  # The redirect goes INSIDE the subshell, after the tracer is off. cozytest.sh
+  # runs under `set -x`, and a sink attached to the subshell itself collects the
+  # tracer's own line for `set +x` before it takes effect -- so the assertion
+  # below would be reading the runner rather than the function.
+  ( set +x; _cozy_canary_stamp 2>"$tmp/err" ) || rc=$?
+  [ "$rc" -ne 0 ] || {
+    echo "FAIL: a missing clock file was accepted as a stamp" >&2
+    return 1
+  }
+  # The function reports by returning. A shell error here reaches the job log of
+  # a run whose every other line is written to mean something exact, which is
+  # what teaches the next reader to skim.
+  [ ! -s "$tmp/err" ] || {
+    echo "FAIL: the missing clock file put this on stderr:" >&2
+    cat "$tmp/err" >&2
+    return 1
+  }
+  rm -rf "$tmp"
+}
+
+# ---------------------------------------------------------------------------
+# The ceiling around each arm.
+# ---------------------------------------------------------------------------
+
+@test "each arm runs under the canary ceiling rather than under the read bound" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  timeout_skip_command=1
+  stage "$tmp"
+  stub_stamp
+  stamp_values='100 150 150 250'
+  # Set apart on purpose. The canary is work rather than a read, and a read
+  # bound lowered to speed the diagnostics up would kill an arm that is meant to
+  # take seconds; taking the wrong one of these two is invisible until that
+  # happens.
+  COZY_CANARY_RUN_BOUND=11
+  COZY_DIAG_READ_TIMEOUT=7
+  COZY_DIAG_READ_GRACE=3
+
+  run_canary
+
+  assert_file_contains '-k 3 11 awk' "$timeout_calls"
+  assert_file_contains '-k 3 11 dd' "$timeout_calls"
+  assert_file_lacks_pattern '-k 3 7 ' "$timeout_calls"
+  rm -rf "$tmp"
+}
+
+@test "a zero canary ceiling is rejected because zero is no ceiling at all" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  timeout_skip_command=1
+  stage "$tmp"
+  stub_stamp
+  stamp_values='100 150 150 250'
+  COZY_CANARY_RUN_BOUND=0
+  COZY_DIAG_READ_GRACE=3
+
+  ( set +x; run_canary 2>"$tmp/err" )
+
+  # The default, not the rejected value: a warning that named the fallback and
+  # then used the number anyway would be worse than no warning.
+  assert_file_contains "COZY_CANARY_RUN_BOUND='0'" "$tmp/err"
+  assert_file_contains "-k 3 ${COZY_CANARY_RUN_BOUND_DEFAULT} awk" "$timeout_calls"
+  rm -rf "$tmp"
+}
+
+@test "a run that never set the canary ceiling is not warned about ignoring one" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  stage "$tmp"
+
+  # Re-sourced inside the subshell with the knob unset, because that is the
+  # state of every real run: nobody sets COZY_CANARY_RUN_BOUND, the source-time
+  # assignment settles it to the default, and the collector's re-validation
+  # must then find a value rather than an empty string. Without the assignment
+  # the validator warns about ignoring a value nobody supplied, on the
+  # » WARNING: prefix CI readers grep for, on every run including green ones.
+  ( set +x
+    unset COZY_CANARY_RUN_BOUND
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    COZY_CANARY_CPU_ITERATIONS=1000
+    COZY_CANARY_MEM_BLOCK_MIB=1
+    COZY_CANARY_MEM_BLOCKS=1
+    cozy_capture_runner_canary 1
+  ) >"$tmp/out" 2>"$tmp/err"
+
+  assert_file_lacks_pattern 'ignoring COZY_CANARY_RUN_BOUND' "$tmp/err"
+  # And the default reached the arms as a real ceiling, so the silence above is
+  # the knob settling rather than the warning merely going missing.
+  assert_file_contains "-k 5 ${COZY_CANARY_RUN_BOUND_DEFAULT} awk" "$timeout_calls"
+  rm -rf "$tmp"
+}
+
+@test "the arms still run when timeout is not on PATH, and the capture says so" {
+  # The documented fallback: where `timeout` is absent the work runs unbounded
+  # rather than not at all, and the phase warning promises exactly that by name.
+  # `timeout` is a shell function in this file, so `command -v timeout` is always
+  # true here and the else arm is otherwise never executed -- which is the arm
+  # that runs on a machine without coreutils, the one machine it exists for.
+  tmp=$(mktemp -d)
+  mkdir -p "$tmp/bin"
+  for c in sh mkdir date cat grep sed awk dd rm mv printf; do
+    for d in /bin /usr/bin /usr/local/bin /opt/homebrew/bin /sbin /usr/sbin; do
+      if [ -x "$d/$c" ]; then
+        ln -sf "$d/$c" "$tmp/bin/$c"
+        break
+      fi
+    done
+  done
+  for c in sh mkdir date cat awk dd rm; do
+    if [ ! -x "$tmp/bin/$c" ]; then
+      echo "FAIL: could not stage $c in the stripped PATH; the check below would be vacuous" >&2
+      return 1
+    fi
+  done
+  if [ -e "$tmp/bin/timeout" ]; then
+    echo "FAIL: timeout leaked into the stripped PATH; this test would prove nothing" >&2
+    return 1
+  fi
+  printf '70062.90 774208.84\n' >"$tmp/uptime"
+  # The clock here is a file, because /proc/uptime is not on every machine this
+  # suite runs on. A file does not advance on its own, so both stamps of an arm
+  # would read one value, every arm would take the sub-tick branch, and the
+  # division this case exists to exercise would never run. So awk and dd are
+  # wrapped: the wrapper advances the clock by a fixed step and then execs the
+  # real binary, which keeps the work real while the duration each arm reports
+  # is decided here rather than by whatever machine this is. Removed before
+  # writing rather than written over: these are symlinks, and a redirect would
+  # land in the binary they point at.
+  real_awk=$(readlink "$tmp/bin/awk")
+  real_dd=$(readlink "$tmp/bin/dd")
+  rm -f "$tmp/bin/awk" "$tmp/bin/dd"
+  cat >"$tmp/bin/awk" <<EOF
+#!/bin/sh
+printf '70063.90 774208.84\n' >"$tmp/uptime"
+exec "$real_awk" "\$@"
+EOF
+  cat >"$tmp/bin/dd" <<EOF
+#!/bin/sh
+printf '70064.90 774208.84\n' >"$tmp/uptime"
+exec "$real_dd" "\$@"
+EOF
+  chmod +x "$tmp/bin/awk" "$tmp/bin/dd"
+  rc=0
+
+  # PATH is narrowed INSIDE the subprocess rather than in front of it: the shell
+  # resolves the command name with the PATH the assignment sets, so a stripped
+  # PATH in front of `bash` cannot find bash itself.
+  out=$( ( set +x
+    bash -c '
+      . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+      COZY_REPORT_DIR='"$tmp"'/report
+      COZY_SNAPSHOT_NAME=canary-smoke
+      COZY_DIAG_RUNNER_PROC_UPTIME='"$tmp"'/uptime
+      COZY_CANARY_CPU_ITERATIONS=1000
+      COZY_CANARY_MEM_BLOCK_MIB=1
+      COZY_CANARY_MEM_BLOCKS=1
+      PATH='"$tmp"'/bin
+      cozy_capture_runner_canary 1
+    ' ) 2>&1 ) || rc=$?
+
+  [ "$rc" -eq 0 ] || {
+    echo "FAIL: the canary ended $rc with no timeout on PATH; the warning promises it keeps collecting" >&2
+    printf '%s\n' "$out" >&2
+    false
+  }
+  capture="$tmp/report/snapshots/canary-smoke/runner-canary/sample-1/fixed-work.txt"
+  # Both arms ran the real binaries, and the wrapped clock gives each of them a
+  # second, so each reports a duration and divides by it: 1000 iterations and
+  # 1 MiB, each in one second. That is what makes this the case that exercises
+  # the unbounded arm end to end rather than only reaching it.
+  assert_file_contains 'arm: compute' "$capture"
+  assert_file_contains 'arm: memory' "$capture"
+  assert_file_contains 'elapsed: 1000 ms' "$capture"
+  assert_file_contains 'rate: 1000 iterations per second' "$capture"
+  assert_file_contains 'rate: 1 MiB per second' "$capture"
+  assert_file_lacks_pattern 'produced no reading' "$capture"
+  assert_file_lacks_pattern 'finished inside one tick' "$capture"
+  # And the capture says it ran without a ceiling. The phase warning that names
+  # unbounded collectors fires inside the diagnostics phase, and one of this
+  # pair of samples is taken outside it on every run, so a capture that ran
+  # unbounded and stayed quiet about it would read exactly like a bounded one.
+  assert_file_contains '[bounds] timeout is not on PATH here' "$capture"
+  rm -rf "$tmp"
+}
+
+# ---------------------------------------------------------------------------
+# What a duration divides to.
+# ---------------------------------------------------------------------------
+
+@test "an arm that ran with no ceiling is not reported as having hit one" {
+  # The else arm of the `command -v timeout` branch, driven to a status the
+  # ceiling also produces. Nothing bounded this arm, so its elapsed time cannot
+  # be attributed to a bound: on a machine without coreutils an outside kill
+  # landing past the bound would otherwise be published as the
+  # too-slow-to-finish finding this collector exists to detect.
+  tmp=$(mktemp -d)
+  mkdir -p "$tmp/bin"
+  for c in sh mkdir date cat grep sed rm dd printf; do
+    for d in /bin /usr/bin /usr/local/bin /opt/homebrew/bin /sbin /usr/sbin; do
+      if [ -x "$d/$c" ]; then
+        ln -sf "$d/$c" "$tmp/bin/$c"
+        break
+      fi
+    done
+  done
+  for c in sh mkdir date rm dd; do
+    if [ ! -x "$tmp/bin/$c" ]; then
+      echo "FAIL: could not stage $c in the stripped PATH; the check below would be vacuous" >&2
+      return 1
+    fi
+  done
+  if [ -e "$tmp/bin/timeout" ]; then
+    echo "FAIL: timeout leaked into the stripped PATH; this test would prove nothing" >&2
+    return 1
+  fi
+  printf '70062.90 774208.84\n' >"$tmp/uptime"
+  # The compute arm's own command, replaced by one that moves the clock 21
+  # seconds past the start stamp -- one second past the twenty-second bound the
+  # collector would have applied had there been a timeout to apply it with --
+  # and then dies the way an outside kill does.
+  cat >"$tmp/bin/awk" <<STUB
+#!/bin/sh
+printf '70083.90 774208.84\n' >"$tmp/uptime"
+exit 137
+STUB
+  chmod +x "$tmp/bin/awk"
+  rc=0
+
+  out=$( ( set +x
+    bash -c '
+      . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+      COZY_REPORT_DIR='"$tmp"'/report
+      COZY_SNAPSHOT_NAME=canary-smoke
+      COZY_DIAG_RUNNER_PROC_UPTIME='"$tmp"'/uptime
+      COZY_CANARY_MEM_BLOCK_MIB=1
+      COZY_CANARY_MEM_BLOCKS=1
+      COZY_CANARY_RUN_BOUND=20
+      PATH='"$tmp"'/bin
+      cozy_capture_runner_canary 1
+    ' ) 2>&1 ) || rc=$?
+
+  # The memory arm beside it returned without failing, so the collector still
+  # reports success: an arm that died is not the collector failing. That arm
+  # takes both its stamps after the stub moved the clock, so what it contributes
+  # is the sub-tick note rather than a rate.
+  [ "$rc" -eq 0 ] || {
+    echo "FAIL: the canary ended $rc with one arm killed and the other returning cleanly; the call sites read that status as no reading at all" >&2
+    printf '%s\n' "$out" >&2
+    false
+  }
+  capture="$tmp/report/snapshots/canary-smoke/runner-canary/sample-1/fixed-work.txt"
+  assert_file_contains 'ended with status 137 with no ceiling in play' "$capture"
+  # The whole point of the sentence above: the bound was never in play, so the
+  # elapsed time cannot be read as the bound firing.
+  assert_file_lacks_pattern 'stopped at the' "$capture"
+  rm -rf "$tmp"
+}
+
+@test "an unbounded arm ending at a ceiling status survives the flags production runs under" {
+  # `_COZY_CANARY_BOUNDED` is read where a 124 or 137 is classified, and the
+  # suites source this library under `set -eu`. It is initialised at the top of
+  # every arm rather than only on the branch that sets it to 1, so the read on
+  # the unbounded path finds a value; without that initialisation this path dies
+  # on an unset variable instead of reporting, and on the failing path the death
+  # takes the rest of the diagnostics block with it. The case above drives the
+  # same path without the flags, so it cannot see this.
+  tmp=$(mktemp -d)
+  mkdir -p "$tmp/bin"
+  for c in sh mkdir date cat grep sed rm dd printf; do
+    for d in /bin /usr/bin /usr/local/bin /opt/homebrew/bin /sbin /usr/sbin; do
+      if [ -x "$d/$c" ]; then
+        ln -sf "$d/$c" "$tmp/bin/$c"
+        break
+      fi
+    done
+  done
+  for c in sh mkdir date rm dd; do
+    if [ ! -x "$tmp/bin/$c" ]; then
+      echo "FAIL: could not stage $c in the stripped PATH; the check below would be vacuous" >&2
+      return 1
+    fi
+  done
+  if [ -e "$tmp/bin/timeout" ]; then
+    echo "FAIL: timeout leaked into the stripped PATH; this test would prove nothing" >&2
+    return 1
+  fi
+  printf '70062.90 774208.84\n' >"$tmp/uptime"
+  # Exits with the status the ceiling also produces, which is the only status
+  # that reaches the read this case exists for.
+  cat >"$tmp/bin/awk" <<STUB
+#!/bin/sh
+printf '70083.90 774208.84\n' >"$tmp/uptime"
+exit 137
+STUB
+  chmod +x "$tmp/bin/awk"
+  rc=0
+
+  out=$( ( set +x
+    bash -c '
+      set -eu
+      . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+      COZY_REPORT_DIR='"$tmp"'/report
+      COZY_SNAPSHOT_NAME=canary-smoke
+      COZY_DIAG_RUNNER_PROC_UPTIME='"$tmp"'/uptime
+      COZY_CANARY_MEM_BLOCK_MIB=1
+      COZY_CANARY_MEM_BLOCKS=1
+      COZY_CANARY_RUN_BOUND=20
+      PATH='"$tmp"'/bin
+      cozy_capture_runner_canary 1
+    ' ) 2>&1 ) || rc=$?
+
+  [ "$rc" -eq 0 ] || {
+    echo "FAIL: under set -eu the canary ended $rc on the unbounded path; an unset read here aborts the collector instead of reporting" >&2
+    printf '%s\n' "$out" >&2
+    false
+  }
+  case "$out" in
+    *'_COZY_CANARY_BOUNDED'*)
+      echo "FAIL: the unbounded path named _COZY_CANARY_BOUNDED on stderr, which is what an unset read looks like under set -u" >&2
+      printf '%s\n' "$out" >&2
+      return 1
+      ;;
+  esac
+  capture="$tmp/report/snapshots/canary-smoke/runner-canary/sample-1/fixed-work.txt"
+  assert_file_contains 'ended with status 137 with no ceiling in play' "$capture"
+  rm -rf "$tmp"
+}
+
+@test "the note about a missing ceiling is written only when the ceiling was missing" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  timeout_skip_command=1
+  stage "$tmp"
+  stub_stamp
+  stamp_values='1000 1050 1050 1250'
+  COZY_CANARY_CPU_ITERATIONS=1000000
+  COZY_CANARY_MEM_BLOCK_MIB=2048
+  COZY_CANARY_MEM_BLOCKS=4
+
+  run_canary
+
+  capture=$(capture_path)
+  # `timeout` is a shell function in this file, so both arms here ran under a
+  # ceiling. A note saying they did not would tell a reader the figures above it
+  # were taken with no bound -- on every run, which is how a note that is not
+  # conditional reads.
+  assert_file_lacks_pattern 'timeout is not on PATH here' "$capture"
+  assert_file_contains 'rate: 2000000 iterations per second' "$capture"
+  rm -rf "$tmp"
+}
+
+@test "a completed arm reports its duration and the rate that duration divides to" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  timeout_skip_command=1
+  stage "$tmp"
+  stub_stamp
+  # 50 centiseconds for the compute arm, 200 for the memory one.
+  stamp_values='1000 1050 1050 1250'
+  COZY_CANARY_CPU_ITERATIONS=1000000
+  COZY_CANARY_MEM_BLOCK_MIB=2
+  COZY_CANARY_MEM_BLOCKS=4
+
+  run_canary
+
+  capture=$(capture_path)
+  assert_file_contains 'elapsed: 500 ms' "$capture"
+  assert_file_contains 'rate: 2000000 iterations per second' "$capture"
+  assert_file_contains 'elapsed: 2000 ms' "$capture"
+  # The memory rate is per MiB of the work actually done, so it follows both
+  # sizes rather than the block size alone: 2 MiB four times over in 2s.
+  assert_file_contains 'rate: 4 MiB per second' "$capture"
+  rm -rf "$tmp"
+}
+
+@test "the memory arm streams the block size the capture reports it in" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  timeout_skip_command=1
+  stage "$tmp"
+  stub_stamp
+  stamp_values='1000 1050 1050 1250'
+  COZY_CANARY_MEM_BLOCK_MIB=2
+  COZY_CANARY_MEM_BLOCKS=4
+
+  run_canary
+
+  # Bytes rather than a suffix, and the conversion is what makes the reported
+  # MiB the MiB that were written: a `2M` here would be two million bytes to one
+  # dd, two mebibytes to another and an error to a third, and the rate above
+  # would be wrong by that ratio in the first case with nothing to show for it.
+  assert_file_contains 'bs=2097152 count=4' "$timeout_calls"
+  rm -rf "$tmp"
+}
+
+@test "an arm stopped at its ceiling is recorded as a bound rather than as a rate" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  timeout_skip_command=1
+  timeout_rc_match=dd
+  timeout_rc_override=124
+  stage "$tmp"
+  stub_stamp
+  stamp_values='1000 1050 1050 3050'
+  COZY_CANARY_MEM_BLOCK_MIB=100
+  COZY_CANARY_MEM_BLOCKS=8
+  COZY_CANARY_RUN_BOUND=20
+
+  run_canary
+
+  capture=$(capture_path)
+  assert_file_contains 'work: 800 MiB' "$capture"
+  # The ceiling firing is the strongest reading this arm produces, so it is kept
+  # and labelled rather than dropped: the work did not finish inside that many
+  # seconds, which is already a multiple of what it should take. Reported as a
+  # rate it would be an average over work that did not all happen.
+  assert_file_contains 'this arm did not finish: it was stopped at the 20s ceiling' "$capture"
+  assert_file_contains 'BELOW 40 MiB per second' "$capture"
+  assert_file_lacks_pattern '^rate: [0-9]+ MiB' "$capture"
+  # And the compute arm beside it, which did finish, still reports a rate: a
+  # collector that gave up on both arms because one hit its ceiling would lose
+  # the half that discriminates.
+  assert_file_contains 'iterations per second' "$capture"
+  rm -rf "$tmp"
+}
+
+@test "a kill before the ceiling is not reported as the ceiling" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  timeout_skip_command=1
+  timeout_rc_match=dd
+  timeout_rc_override=137
+  stage "$tmp"
+  stub_stamp
+  stamp_values='1000 1050 1050 1250'
+  COZY_CANARY_RUN_BOUND=20
+
+  run_canary
+
+  capture=$(capture_path)
+  # 137 is what the ceiling's follow-up kill produces and also what the OOM
+  # killer produces, and the elapsed line is the only thing that separates
+  # them: an arm that ended two seconds into a twenty-second bound was not
+  # stopped by the bound. Read by status alone, this was published as the
+  # too-slow-to-finish finding the instrument exists to detect, manufactured
+  # by whatever sent the kill.
+  assert_file_contains 'ended with status 137 after 2000 ms, before the 20s ceiling could have fired' "$capture"
+  assert_file_lacks_pattern 'stopped at the' "$capture"
+  assert_file_lacks_pattern 'BELOW' "$capture"
+  rm -rf "$tmp"
+}
+
+@test "a kill that landed at the ceiling is recorded as the ceiling and named as a kill" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  timeout_skip_command=1
+  timeout_rc_match=dd
+  timeout_rc_override=137
+  stage "$tmp"
+  stub_stamp
+  stamp_values='1000 1050 1050 3050'
+  COZY_CANARY_MEM_BLOCK_MIB=100
+  COZY_CANARY_MEM_BLOCKS=8
+  COZY_CANARY_RUN_BOUND=20
+
+  run_canary
+
+  capture=$(capture_path)
+  # A status of 137 says a kill ended the arm where 124 says the term signal
+  # did, which is a different observation the way the sibling collectors name a
+  # kill apart from a deadline -- and it is still the ceiling, because the whole
+  # bound was on the clock when the kill landed. Whose kill it was is not in the
+  # status, so the sentence does not name one.
+  assert_file_contains 'it was stopped at the 20s ceiling, on a status that says a kill ended the arm without saying whose' "$capture"
+  assert_file_contains 'BELOW 40 MiB per second' "$capture"
+  rm -rf "$tmp"
+}
+
+@test "both arms stopped at the ceiling raise the alert rather than a shortfall" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  timeout_skip_command=1
+  timeout_rc_match=
+  timeout_rc_override=124
+  stage "$tmp"
+  stub_stamp
+  # Both arms on the clock for the whole bound, which is the pathology this
+  # collector exists to detect at its loudest. A ceiling-stopped arm carries a
+  # bound rather than a rate, but it is still a reading: counted as nothing, the
+  # sample would report a shortfall and the call sites would print that they got
+  # no reading, which is the vaguest thing they can say about the one machine
+  # state worth naming exactly.
+  stamp_values='1000 3000 3000 5000'
+  COZY_CANARY_MEM_BLOCK_MIB=100
+  COZY_CANARY_MEM_BLOCKS=8
+  COZY_CANARY_RUN_BOUND=20
+  rc=0
+
+  run_canary_here || rc=$?
+
+  capture=$(capture_path)
+  [ "$rc" -eq 0 ] || {
+    echo "FAIL: two arms stopped at their ceiling reported a shortfall ($rc); the call sites would say no reading was taken for the loudest reading this collector produces" >&2
+    cat "$capture" >&2
+    return 1
+  }
+  if [ "${_COZY_CANARY_ALERT:-unset}" != 1 ]; then
+    echo "expected two arms stopped at their ceiling to raise the alert, found ${_COZY_CANARY_ALERT:-unset}" >&2
+    cat "$capture" >&2
+    return 1
+  fi
+  rm -rf "$tmp"
+}
+
+@test "an arm stopped one tick short of its ceiling is not the ceiling" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  timeout_skip_command=1
+  timeout_rc_match=dd
+  timeout_rc_override=124
+  stage "$tmp"
+  stub_stamp
+  # 1099 centiseconds, so 10990 ms against an 11000 ms bound. The bound is not
+  # the 20 the default carries: this is the only case that reaches the sentence
+  # naming the ceiling it did not reach, so it is the only one that can tell
+  # that sentence reading the knob from it reading the compiled-in figure.
+  stamp_values='1000 1050 1050 2149'
+  COZY_CANARY_MEM_BLOCK_MIB=100
+  COZY_CANARY_MEM_BLOCKS=8
+  COZY_CANARY_RUN_BOUND=11
+
+  run_canary
+
+  capture=$(capture_path)
+  # A ceiling that fired cannot read short of its bound: both stamps truncate
+  # hundredths off the one clock and the bound is whole seconds, so the two
+  # floors differ by at least the bound. A duration under it was produced by
+  # something else, and filing that as the ceiling manufactures the very finding
+  # this collector exists to detect.
+  assert_file_lacks_pattern 'it was stopped at the 11s ceiling' "$capture"
+  assert_file_contains 'before the 11s ceiling could have fired' "$capture"
+  rm -rf "$tmp"
+}
+
+@test "an arm stopped exactly at its ceiling is the ceiling" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  timeout_skip_command=1
+  timeout_rc_match=dd
+  timeout_rc_override=124
+  stage "$tmp"
+  stub_stamp
+  # 1100 centiseconds, so 11000 ms against an 11000 ms bound: the shortest
+  # duration a fired ceiling can produce. This case and the one above it hold
+  # the comparison exactly where it belongs -- at the bound it is the ceiling,
+  # one tick under it is not -- so both a reintroduced tolerance and a
+  # comparison tightened to greater-than fail one of the pair. The bound here is
+  # deliberately not the 20 the default carries: every other ceiling case sets
+  # it to exactly that default, so their assertions would hold just as well if
+  # the comparison read the compiled-in figure instead of the knob the caller
+  # set. Reading the default here classifies a fired ceiling as something else.
+  stamp_values='1000 1050 1050 2150'
+  COZY_CANARY_MEM_BLOCK_MIB=100
+  COZY_CANARY_MEM_BLOCKS=8
+  COZY_CANARY_RUN_BOUND=11
+
+  run_canary
+
+  capture=$(capture_path)
+  # The bound on the clock exactly, which is what a ceiling that fired produces
+  # at its shortest. Filing this as something else ending the work early would
+  # lose the strongest reading the collector takes, so the comparison has to
+  # admit the bound itself and nothing under it.
+  assert_file_contains 'it was stopped at the 11s ceiling' "$capture"
+  assert_file_contains 'BELOW 73 MiB per second' "$capture"
+  assert_file_lacks_pattern 'before the 11s ceiling could have fired' "$capture"
+  # The kill note belongs to 124's sibling status and must not appear here. The
+  # case that pins the note pins only its presence, and every case that reaches
+  # this sentence on a 124 asserts it by two substrings the note sits between,
+  # so without this line the note could be attached to every ceiling report and
+  # nothing would notice -- telling a triager a kill ended an arm the term
+  # signal ended, which is the attribution this collector is built to refuse.
+  assert_file_lacks_pattern 'a kill ended the arm' "$capture"
+  rm -rf "$tmp"
+}
+
+@test "an arm that failed on its own account produces no reading and names its exit status" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  timeout_skip_command=1
+  timeout_rc_match=dd
+  timeout_rc_override=127
+  stage "$tmp"
+  stub_stamp
+  stamp_values='1000 1050 1050 1250'
+
+  run_canary
+
+  capture=$(capture_path)
+  # 127 is a binary missing from this machine and a non-zero from the work
+  # itself is something else. The number is what tells them apart, so it goes in
+  # the line rather than only into the stderr above it. Said as what the arm
+  # ended on rather than as what the work returned, because a ceiling that fires
+  # ends the arm with timeout's status while work that ends by itself keeps its
+  # own, and the number does not say which happened.
+  assert_file_contains 'it ended 127' "$capture"
+  # The sentence says "the duration above", which is a claim about order rather
+  # than about presence: every no-reading sentence points back at the elapsed
+  # line instead of repeating the figure, so the line has to be written before
+  # the status is classified. Asserting only that it exists somewhere would hold
+  # just as well with it printed underneath.
+  elapsed_at=$(grep -n '^elapsed: ' "$capture" | head -n 1 | cut -d: -f1)
+  ended_at=$(grep -n 'it ended 127' "$capture" | head -n 1 | cut -d: -f1)
+  for v in elapsed_at ended_at; do
+    eval "n=\$$v"
+    if [ -z "$n" ]; then
+      echo "expected to read $v from the capture; without it this check reports success for having lost its input" >&2
+      cat "$capture" >&2
+      return 1
+    fi
+  done
+  if [ "$elapsed_at" -ge "$ended_at" ]; then
+    echo "the no-reading sentence (capture line $ended_at) says the duration is above it, but the elapsed line is at $elapsed_at" >&2
+    cat "$capture" >&2
+    return 1
+  fi
+  # And not as a rate: a duration measured on a command that never ran is how
+  # long it took to fail.
+  assert_file_lacks_pattern 'MiB per second' "$capture"
+  rm -rf "$tmp"
+}
+
+@test "an arm that failed instantly is named as failed rather than as too fast to measure" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  timeout_skip_command=1
+  timeout_rc_match=dd
+  timeout_rc_override=127
+  stage "$tmp"
+  stub_stamp
+  # Both stamps of the memory arm land on the same tick, which is what a command
+  # this machine does not have actually produces: it fails in well under 10ms.
+  stamp_values='1000 1050 1050 1050'
+
+  run_canary
+
+  capture=$(capture_path)
+  # Read in the other order, the one arm that never ran is reported as the one
+  # arm too fast to measure -- and on a machine missing dd that is every run,
+  # with the capture claiming the memory arm was instantaneous.
+  assert_file_contains 'it ended 127' "$capture"
+  assert_file_lacks_pattern 'finished inside one tick' "$capture"
+  rm -rf "$tmp"
+}
+
+@test "an arm nobody could time is reported as silence rather than as a duration" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  timeout_skip_command=1
+  stage "$tmp"
+  stub_stamp
+  stamp_values='1000 1050 1050 1250'
+  # The clock fails on the memory arm's closing stamp.
+  stamp_fail_at=4
+
+  run_canary
+
+  capture=$(capture_path)
+  assert_file_contains 'the canary clock could not be read at both ends' "$capture"
+  # Silence about this machine rather than a finding about it. A missing
+  # duration written as a zero, or as the arm having been fast, is the one way
+  # this capture could manufacture the conclusion it exists to test for.
+  assert_file_lacks_pattern 'MiB per second' "$capture"
+  rm -rf "$tmp"
+}
+
+@test "an arm whose opening stamp fails reports nothing rather than the machine's uptime" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  timeout_skip_command=1
+  stage "$tmp"
+  stub_stamp
+  # The clock fails on the compute arm's OPENING stamp, which the case beside
+  # this one never reaches: it fails the closing stamp of the second arm, so
+  # indices 1 to 3 go unexercised. The opening stamp is the one that matters,
+  # because the start it would have set is initialised to zero: unchecked, the
+  # closing stamp turns the machine's whole uptime into the arm's duration, and
+  # a duration that large divides to a rate under any floor. The collector would
+  # then raise the alert every call site turns into a job-log line -- a
+  # pathological finding manufactured on a healthy machine, which is the one
+  # outcome this collector must never produce.
+  stamp_fail_at=1
+  stamp_values='1000 1050 1150 1250'
+  COZY_CANARY_CPU_ITERATIONS=6000000
+  COZY_CANARY_MEM_BLOCK_MIB=1000
+  COZY_CANARY_MEM_BLOCKS=1
+
+  run_canary_here
+
+  capture=$(capture_path)
+  assert_file_contains 'the canary clock could not be read at both ends' "$capture"
+  # The arm beside it was timed and carries the run's only figure.
+  assert_file_contains 'rate: 1000 MiB per second' "$capture"
+  if [ "${_COZY_CANARY_ALERT:-unset}" != 0 ]; then
+    echo "expected an arm whose opening stamp failed to raise no alert; an alert here is a pathology manufactured out of an unread clock" >&2
+    cat "$capture" >&2
+    return 1
+  fi
+  rm -rf "$tmp"
+}
+
+@test "an arm faster than one tick reports no rate rather than dividing by zero" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  timeout_skip_command=1
+  stage "$tmp"
+  stub_stamp
+  stamp_values='1000 1000 1000 1000'
+  rc=0
+
+  run_canary || rc=$?
+
+  # Dividing by it ends the shell: in dash an arithmetic division by zero is
+  # fatal on its own account rather than through errexit, so it fires even
+  # inside the `if` condition these call sites use, and on this path that takes
+  # the whole diagnostics block with it. The duration is under the resolution
+  # rather than measured, and at the sizes this canary runs that is itself a
+  # finding.
+  [ "$rc" -eq 0 ] || {
+    echo "FAIL: a sub-tick duration ended the collector with $rc" >&2
+    return 1
+  }
+  capture=$(capture_path)
+  assert_file_contains 'no rate: the arm finished inside one tick' "$capture"
+  rm -rf "$tmp"
+}
+
+@test "a kill inside one tick is named as a kill rather than as the ceiling or a finish" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  timeout_skip_command=1
+  timeout_rc_match=dd
+  timeout_rc_override=124
+  stage "$tmp"
+  stub_stamp
+  # The memory arm ends with a ceiling-shaped status while both of its stamps
+  # land on the same tick, which a real ceiling cannot produce: the ceiling
+  # needs the whole bound on the clock. Read by status alone this was reported
+  # as the ceiling with no duration, which is a finding about the machine
+  # manufactured by whatever actually killed the work.
+  stamp_values='1000 1050 1050 1050'
+  COZY_CANARY_RUN_BOUND=20
+  rc=0
+
+  run_canary || rc=$?
+
+  capture=$(capture_path)
+  assert_file_contains 'before the 20s ceiling could have fired' "$capture"
+  assert_file_lacks_pattern 'finished inside one tick' "$capture"
+  assert_file_lacks_pattern 'stopped at the' "$capture"
+  # And the shell survives it: on the failure path an exit here takes the rest
+  # of the diagnostics block with it, straight past the call site's guard. The
+  # tenant snapshot is armed as an EXIT trap before the block, so it still runs.
+  [ "$rc" -eq 0 ] || {
+    echo "FAIL: a killed arm beside a healthy one ended the collector with $rc" >&2
+    return 1
+  }
+  rm -rf "$tmp"
+}
+
+@test "a clock that could not be read yields no reading rather than a silent success" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  timeout_skip_command=1
+  stage "$tmp"
+  stub_stamp
+  # No stamp at all resolves, so every arm fails at its clock rather than at its
+  # work. The backwards-clock case below pins the same contract for the other
+  # way a duration can be refused; this one is the half that was reported only
+  # in the capture. A sample that measured nothing has to say so through its
+  # status too, because the status is what the two call sites outside the
+  # diagnostics block turn into a job-log line -- report it as success and a run
+  # that timed nothing at all passes in silence.
+  stamp_values=''
+  rc=0
+
+  run_canary || rc=$?
+
+  [ "$rc" -ne 0 ] || {
+    echo "FAIL: a sample whose clock could not be read at either end reported success" >&2
+    return 1
+  }
+  capture=$(capture_path)
+  assert_file_contains 'the canary clock could not be read at both ends' "$capture"
+  # The legend states units of its own, so the absence is asserted on the rate
+  # line rather than on the words.
+  assert_file_lacks_pattern '^rate: ' "$capture"
+  rm -rf "$tmp"
+}
+
+@test "a clock that went backwards yields no reading rather than a negative duration" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  timeout_skip_command=1
+  stage "$tmp"
+  stub_stamp
+  stamp_values='1000 900 900 800'
+  rc=0
+
+  run_canary || rc=$?
+
+  # Neither arm yields a figure, so the collector reports a shortfall -- which
+  # is what the two call sites outside the diagnostics block turn into a line in
+  # the job log.
+  [ "$rc" -ne 0 ] || {
+    echo "FAIL: a capture holding no figure at all reported success" >&2
+    return 1
+  }
+  capture=$(capture_path)
+  # Named as the instrument being wrong rather than as the clock being
+  # unreadable: those send a reader to different places, and one of them is a
+  # machine that has nothing wrong with it. Every figure here is derived from
+  # the duration, so a negative one produces a negative rate that reads exactly
+  # like a real number with a sign in front.
+  assert_file_contains 'the second stamp was the earlier one' "$capture"
+  assert_file_lacks_pattern 'elapsed: -' "$capture"
+  rm -rf "$tmp"
+}
+
+@test "a rate under one unit per second is said in words rather than rounded to nothing" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  timeout_skip_command=1
+  stage "$tmp"
+  stub_stamp
+  # 8 MiB in twenty seconds is under half a MiB per second, which integer
+  # division reports as none at all.
+  stamp_values='1000 1050 1050 3050'
+  COZY_CANARY_MEM_BLOCK_MIB=2
+  COZY_CANARY_MEM_BLOCKS=4
+
+  run_canary
+
+  capture=$(capture_path)
+  # `rate: 0` is the reading this capture must never produce: it is the shape of
+  # a machine that did nothing, and here it would mean arithmetic that ran out
+  # of places on a machine that was merely very slow -- which is the finding, so
+  # rounding it away loses exactly the run this collector exists for.
+  assert_file_lacks_pattern 'rate: 0 ' "$capture"
+  assert_file_contains 'under one MiB per second' "$capture"
+  # And the inputs are in the file, so the reader can divide them themselves.
+  assert_file_contains 'work: 8 MiB' "$capture"
+  assert_file_contains 'elapsed: 20000 ms' "$capture"
+  rm -rf "$tmp"
+}
+
+@test "what the work said on stderr lands beside the figure it explains" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  stage "$tmp"
+  stub_stamp
+  stamp_values='1000 1050'
+  # The arm reads the ceiling and its grace from globals the library settles at
+  # source time, so driving it on its own needs no setup; they are restated here
+  # to pin the two numbers this case's assertions are written against.
+  COZY_CANARY_RUN_BOUND=20
+  COZY_DIAG_READ_GRACE=5
+
+  # Driven through one arm with a command of the test's own, rather than through
+  # the collector: what is pinned is that an arm keeps its stderr, and dd is the
+  # arm that relies on it -- it reports there by design, and a `timeout` giving
+  # up says so there too.
+  capture="$tmp/one-arm.txt"
+  ( set +x; _cozy_canary_report_arm "$capture" 'synthetic' 100 units 1 \
+    sh -c 'echo "$((6*7))-complained" >&2' )
+
+  # The marker is computed by the work rather than written into its command
+  # line, and that is the whole of the case: the reporter echoes the command
+  # before running it, so a needle that appears in both is satisfied by the echo
+  # and says nothing about where the arm's stderr went.
+  assert_file_contains '42-complained' "$capture"
+  assert_file_lacks_pattern 'command: .*42-complained' "$capture"
+  assert_file_contains 'command: sh -c echo "$((6*7))-complained" >&2' "$capture"
+  rm -rf "$tmp"
+}
+
+# ---------------------------------------------------------------------------
+# What the collector tells its caller.
+# ---------------------------------------------------------------------------
+
+@test "the collector reports a shortfall only when the capture holds no figure at all" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  timeout_skip_command=1
+  stage "$tmp"
+  stub_stamp
+  stamp_values='1000 1050 1050 1250'
+  rc=0
+
+  run_canary || rc=$?
+  [ "$rc" -eq 0 ] || {
+    echo "FAIL: a capture holding two rates reported a shortfall ($rc)" >&2
+    return 1
+  }
+
+  # One arm failing is not a shortfall: the other still carries a figure, and
+  # both call sites outside the diagnostics block turn a non-zero into a warning
+  # line saying nothing was measured.
+  timeout_rc_match=dd
+  timeout_rc_override=127
+  stamp_index=0
+  rc=0
+  run_canary 2 || rc=$?
+  [ "$rc" -eq 0 ] || {
+    echo "FAIL: one failed arm out of two reported a shortfall ($rc)" >&2
+    return 1
+  }
+
+  # Both failing is.
+  timeout_rc_match=
+  stamp_index=0
+  rc=0
+  run_canary 3 || rc=$?
+  [ "$rc" -ne 0 ] || {
+    echo "FAIL: a capture holding no figure at all reported success" >&2
+    return 1
+  }
+
+  # And so is both being killed before the ceiling, which reaches the shortfall
+  # by a different branch: a status the ceiling also produces, refused as the
+  # ceiling because the clock says the bound had not run out. Three of the four
+  # ways an arm can yield no reading are pinned for status elsewhere -- the
+  # clock unreadable, the clock backwards, the work failing on its own account
+  # -- and this is the fourth. Left unpinned, two arms killed from outside,
+  # which is the OOM case the ceiling attribution is written for, would report
+  # success with nothing measured and both call sites would stay quiet.
+  timeout_rc_override=137
+  stamp_values='1000 1200 1200 1400'
+  COZY_CANARY_RUN_BOUND=20
+  stamp_index=0
+  rc=0
+  run_canary 4 || rc=$?
+  [ "$rc" -ne 0 ] || {
+    echo "FAIL: two arms killed before their ceiling reported success with no figure in the capture" >&2
+    return 1
+  }
+  rm -rf "$tmp"
+}
+
+@test "no path that measured nothing raises the alert" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  timeout_skip_command=1
+  stage "$tmp"
+  stub_stamp
+  # The alert is what all three reporting sites turn into a job-log line saying
+  # the machine was not getting the work done. Raised on a path that took no
+  # reading, it is a pathology manufactured out of nothing -- the one outcome
+  # this collector must never produce. The clock-failure path is pinned against
+  # it by the case that drives an unreadable stamp; these are the other three
+  # ways an arm can end without a figure, each of which reaches a different
+  # branch of the reporter.
+  COZY_CANARY_RUN_BOUND=20
+
+  # The work failed on its own account.
+  timeout_rc_match=
+  timeout_rc_override=127
+  stamp_values='1000 1200 1200 1400'
+  stamp_index=0
+  run_canary_here || true
+  [ "${_COZY_CANARY_ALERT:-unset}" = 0 ] || {
+    echo "expected two arms that failed on their own account to raise no alert, found ${_COZY_CANARY_ALERT:-unset}" >&2
+    return 1
+  }
+
+  # Killed before the ceiling could have fired.
+  timeout_rc_override=137
+  stamp_index=0
+  run_canary_here 2 || true
+  [ "${_COZY_CANARY_ALERT:-unset}" = 0 ] || {
+    echo "expected two arms killed before their ceiling to raise no alert, found ${_COZY_CANARY_ALERT:-unset}" >&2
+    return 1
+  }
+
+  # Finished inside one tick, which is too fast to measure rather than slow.
+  timeout_rc_override=
+  stamp_values='1000 1000 1000 1000'
+  stamp_index=0
+  run_canary_here 3 || true
+  [ "${_COZY_CANARY_ALERT:-unset}" = 0 ] || {
+    echo "expected two arms finishing inside one tick to raise no alert, found ${_COZY_CANARY_ALERT:-unset}" >&2
+    return 1
+  }
+  rm -rf "$tmp"
+}
+
+@test "each sample announces itself and its number in the job log" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  timeout_skip_command=1
+  stage "$tmp"
+  stub_stamp
+  stamp_values='1000 1050 1050 1250'
+
+  out=$(run_canary 2)
+
+  # The line is the only trace of the canary a reader of the job log gets on a
+  # green run before the report is downloaded, and the sample number is what
+  # ties it to the side of the wait it was taken on.
+  case "$out" in
+    *'--- running the runner fixed-work canary (sample 2) ---'*) ;;
+    *)
+      echo "FAIL: the job log does not announce the canary sample; it said: $out" >&2
+      return 1
+      ;;
+  esac
+  rm -rf "$tmp"
+}
+
+@test "the sample number decides which directory a reading lands in" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  timeout_skip_command=1
+  stage "$tmp"
+  stub_stamp
+  stamp_values='1000 1050 1050 1250'
+
+  run_canary 2
+
+  # Sample 1 is the pre-wait reading and sample 2 the post-wait one; a
+  # collector that folded them into one directory would overwrite the before
+  # with the after, and the pair would compare a reading against itself.
+  [ -f "$(capture_path 2)" ] || {
+    echo "FAIL: sample 2 did not land in its own directory" >&2
+    return 1
+  }
+  [ ! -e "$(capture_path 1)" ] || {
+    echo "FAIL: sample 2 wrote into the sample-1 directory" >&2
+    return 1
+  }
+  rm -rf "$tmp"
+}
+
+@test "a capture left by an earlier run is truncated rather than appended to" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  timeout_skip_command=1
+  stage "$tmp"
+  stub_stamp
+  stamp_values='1000 1050 1050 1250'
+  # The report directory outlives a run, so the same sample number can find a
+  # file already there. Appended to, the capture would carry two runs of one
+  # sample with nothing between them to say where the first ended, and every
+  # figure a reader took from it could belong to either. The neighbouring case
+  # covers the other half of this line -- that a failed open returns rather than
+  # ending the shell -- and cannot see the truncation, because a failed append
+  # fails the same way.
+  capture=$(capture_path)
+  mkdir -p "$(dirname "$capture")"
+  printf 'STALE-FROM-AN-EARLIER-RUN\n' >"$capture"
+
+  run_canary
+
+  assert_file_lacks_pattern 'STALE-FROM-AN-EARLIER-RUN' "$capture"
+  rm -rf "$tmp"
+}
+
+@test "capture truncation avoids a POSIX special builtin under dash" {
+  source_file=hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  body=$(awk '
+    /^cozy_capture_runner_canary\(\) \{/ { inside = 1 }
+    inside { print }
+    inside && /^}$/ { exit }
+  ' "$source_file")
+
+  if ! printf '%s\n' "$body" | grep -Fq 'if ! true >"${capture}"; then'; then
+    echo "FAIL: runner canary no longer opens its capture through non-special true" >&2
+    return 1
+  fi
+}
+
+@test "a capture file that cannot be opened reaches the job log rather than ending the shell" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  stage "$tmp"
+  # The capture path is made a directory, so the open fails while the mkdir -p
+  # above it succeeds -- the one shape where the truncation is the first write
+  # to notice, and one that fails for root and non-root alike. It must fail by
+  # returning: this truncation used to be spelled `: >`, and `:` is a POSIX
+  # special built-in, whose redirection failure exits a non-interactive shell
+  # -- dash, the /bin/sh of the sandbox image -- taking the rest of the
+  # diagnostics block with it, straight past the call site's `|| true`. The
+  # tenant snapshot behind it is an EXIT trap and runs either way; what the exit
+  # costs is everything the block had left to collect.
+  mkdir -p "$(capture_path)"
+  rc=0
+
+  ( set +x; cozy_capture_runner_canary 1 >"$tmp/out" 2>&1 ) || rc=$?
+
+  [ "$rc" -ne 0 ] || {
+    echo "FAIL: a collector that could write nothing reported success" >&2
+    return 1
+  }
+  assert_file_contains 'could not be opened for writing' "$tmp/out"
+  rm -rf "$tmp"
+}
+
+@test "an alert from the sample before does not survive a sample that returned early" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  stage "$tmp"
+  # The flag is cleared at the top of the collector rather than beside the arms,
+  # so that it is cleared on the paths that return before any arm runs too. The
+  # case that pins it beside the arms cannot see this one: it drives a sample
+  # that reaches its work, and the early returns are exactly the paths that do
+  # not. Left standing, sample 1's alert is read back after a sample 2 that
+  # measured nothing, and the call site prints a pathology naming a sample that
+  # took no reading.
+  _COZY_CANARY_ALERT=1
+  printf 'not a directory\n' >"$tmp/blocked"
+  COZY_REPORT_DIR="$tmp/blocked"
+  rc=0
+
+  # Run in this shell rather than a subshell: the flag the call sites branch on
+  # would go with the subshell.
+  set +x
+  cozy_capture_runner_canary 2 >"$tmp/out" 2>&1 || rc=$?
+
+  [ "${_COZY_CANARY_ALERT:-unset}" = 0 ] || {
+    echo "expected a sample that returned before its arms to clear the alert, found ${_COZY_CANARY_ALERT:-unset}; the flag would be read back as a pathology for a sample that measured nothing" >&2
+    return 1
+  }
+  rm -rf "$tmp"
+}
+
+@test "a report directory that cannot be created reaches the job log" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  stage "$tmp"
+  # A file where the directory tree has to go, so mkdir -p cannot succeed.
+  printf 'not a directory\n' >"$tmp/blocked"
+  COZY_REPORT_DIR="$tmp/blocked"
+  rc=0
+
+  ( set +x; cozy_capture_runner_canary 1 >"$tmp/out" 2>&1 ) || rc=$?
+
+  # With no directory every write below it fails, the collector becomes a silent
+  # no-op, and the artifact carries exactly the empty space it exists to refuse
+  # -- with nowhere to put a marker saying so, which is why this one goes to the
+  # log and not to the report.
+  [ "$rc" -ne 0 ] || {
+    echo "FAIL: a collector that could write nothing reported success" >&2
+    return 1
+  }
+  assert_file_contains 'could not be created' "$tmp/out"
+  rm -rf "$tmp"
+}
+
+# ---------------------------------------------------------------------------
+# The legends, which are what let a single red run be read at all.
+# ---------------------------------------------------------------------------
+
+@test "every legend line lands as one line rather than shredded into words" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  timeout_skip_command=1
+  stage "$tmp"
+  stub_stamp
+  stamp_values='1000 1050 1050 1250'
+
+  run_canary
+
+  # Each legend is one long single-quoted shell string, and an apostrophe inside
+  # one ends the quote: the sentence then reaches the file as one word per line,
+  # every `[` unmatched, and the capture still passes any assertion that greps
+  # for a short phrase. This checks the shape instead -- a bracketed line opens
+  # and closes on the same line -- because that is what a shredded legend loses.
+  capture=$(capture_path)
+  if awk '/^\[/ && $0 !~ /\]$/ { print FILENAME ": " $0; found = 1 } END { exit found ? 1 : 0 }' "$capture"; then
+    :
+  else
+    echo "FAIL: a bracketed legend line does not close on its own line, which is what an apostrophe inside its single quotes does to it" >&2
+    return 1
+  fi
+  grep -q '^\[' "$capture" || {
+    echo "FAIL: the capture carries no bracketed legend line at all" >&2
+    return 1
+  }
+  rm -rf "$tmp"
+}
+
+@test "the expected ranges quote the sizes this run actually used" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  timeout_skip_command=1
+  stage "$tmp"
+  stub_stamp
+  stamp_values='1000 1050 1050 1250'
+  COZY_CANARY_CPU_ITERATIONS=777
+  # The floors are overridden away from their defaults for the reason the
+  # ceiling case sets a bound of 11: the legend interpolates them, so a fixture
+  # left on the default cannot tell a templated figure from one written into the
+  # sentence.
+  COZY_CANARY_MEM_MIN_RATE=17
+  COZY_CANARY_CPU_MIN_RATE=19
+  COZY_CANARY_MEM_BLOCK_MIB=3
+  COZY_CANARY_MEM_BLOCKS=5
+
+  run_canary
+
+  # The whole worth of this capture is that its number can be called
+  # pathological with no green run beside it, and that rests on the stated range
+  # describing the work that was actually done. Restated rather than derived,
+  # the range survives a change to the sizes and then describes a different
+  # experiment, which is worse than no range at all.
+  capture=$(capture_path)
+  assert_file_contains 'the 15 MiB it writes' "$capture"
+  assert_file_contains 'the 777 of them here' "$capture"
+  # The sizes are data and the cache figure is context: the sentence must not
+  # assert which of the two is larger, because the relation is a property of
+  # the constants at their declaration, not of this template.
+  assert_file_contains '3 MiB here, against the 32 MiB' "$capture"
+  # The floors the alert compares against are printed from the same constants
+  # rather than written into the sentence, so what a reader is told and what the
+  # collector decides on cannot drift apart.
+  assert_file_contains "anything under ${COZY_CANARY_MEM_MIN_RATE} in the MiB-per-second unit" "$capture"
+  assert_file_contains "anything under ${COZY_CANARY_CPU_MIN_RATE} iterations a second" "$capture"
+  rm -rf "$tmp"
+}
+
+@test "the capture names what it cannot separate and where that answer lives" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  timeout_skip_command=1
+  stage "$tmp"
+  stub_stamp
+  stamp_values='1000 1050 1050 1250'
+
+  run_canary
+
+  # A slow arm has two readings, and only one of them is this collector's. A
+  # capture that stated the interesting one and stayed quiet about the dull one
+  # would be read as proof of the interesting one, which is the failure this
+  # whole investigation keeps producing.
+  capture=$(capture_path)
+  assert_file_contains 'It reads wall clock only' "$capture"
+  assert_file_contains 'runner-kernel-cpu-time' "$capture"
+  assert_file_contains 'sandbox-host-cpu-time' "$capture"
+  # And it describes what each of those two actually covers, because the two
+  # are nothing alike: the runner-kernel rows bracket the wait on both paths,
+  # while the sandbox-host rows are taken inside the on-failure diagnostics
+  # block, seconds apart, minutes after the wait failed. A legend equating them
+  # sends a reader to interpret a 12-second post-mortem pair as the whole join
+  # window, which is why the legend states the window each of them covers
+  # instead of naming the two side by side.
+  assert_file_contains 'a pair bracketing the node-join wait' "$capture"
+  assert_file_contains 'a pair seconds apart inside the on-failure diagnostics block' "$capture"
+  # The legends below are the standalone-readability deliverable, and a reader of
+  # a red run with no green one beside it needs each: which layer the reading
+  # describes and where the answers a layer down are kept, what a difference
+  # between the samples means, that the collector's own burn sits outside the
+  # intervals the sibling pairs divide by, and the resolution every figure here
+  # is quantised to.
+  assert_file_contains 'this canary runs on the RUNNER VM, inside the sandbox container' "$capture"
+  assert_file_contains 'sandbox-host/talos-' "$capture"
+  assert_file_contains 'A difference between them puts the change inside the interval the pair brackets' "$capture"
+  assert_file_contains 'neither burn falls inside any interval those pairs divide by' "$capture"
+  assert_file_contains 'quantised to 10ms' "$capture"
+  # The working set is what makes the two answer the same interference
+  # differently; they differ in plenty else, including how much work each does,
+  # so the sentence claims the one property the two-arm design rests on rather
+  # than a separation the arms do not have.
+  assert_file_contains 'what makes them answer the same interference differently is the working set' "$capture"
+  rm -rf "$tmp"
+}
+
+@test "the capture records the wall-clock window its arms ran in" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  timeout_skip_command=1
+  stage "$tmp"
+  stub_stamp
+  stamp_values='1000 1050 1050 1250'
+
+  run_canary
+
+  # The durations inside the capture are read from a monotonic clock that
+  # says nothing about when, and the two samples sit the whole node-join wait
+  # apart; without this window a reader cannot put either sample beside the
+  # console capture or anything else stamped in the report.
+  capture=$(capture_path)
+  grep -Eq '\[read attempted from [0-9]+ to [0-9]+ epoch seconds\]' "$capture" || {
+    echo "FAIL: the capture does not record when its arms were attempted" >&2
+    cat "$capture" >&2
+    return 1
+  }
+  rm -rf "$tmp"
+}
+
+# ---------------------------------------------------------------------------
+# Where the two samples sit, which is what decides what they mean.
+# ---------------------------------------------------------------------------
+
+@test "the canary samples sit outside the three counter pairs on every path" {
+  lib=hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  # The three pairs beside it read running totals, so each divides by whatever
+  # runs between its two readings. The canary is the one collector here that
+  # occupies a core rather than reading a file, so a sample taken inside any of
+  # those brackets inflates the numerator of a rate the pair reports as the
+  # node-join window. Outside all three on both sides, it cannot.
+  # Anchored on the wait's own body rather than on its shape: `timeout Nm bash -c`
+  # matches more than one line in the library, and picking the first would
+  # re-anchor this check the day another one is added above it.
+  wait_line=$(awk '/^  timeout [0-9]+m bash -c/ { cand = NR; next } cand && NR == cand + 1 && /get nodes --no-headers/ { print cand; exit } { cand = 0 }' "$lib")
+  first=$(grep -n 'cozy_capture_runner_canary 1' "$lib" | head -n 1 | cut -d: -f1)
+  green=$(awk -v w="$wait_line" 'NR > w && /cozy_capture_runner_canary 2/ { print NR; exit }' "$lib")
+  tail_line=$(grep -n '^  versions=\$(kubectl --kubeconfig' "$lib" | head -n 1 | cut -d: -f1)
+  console_line=$(grep -n "cozy_capture_tenant_serial_console 'node-join failed" "$lib" | head -n 1 | cut -d: -f1)
+  # Anchored on the line that hands the failure handler the tenant kubeconfig,
+  # which is where the tenant becomes reachable. The handler itself is armed
+  # earlier, at the CR apply, and a bound there would admit a sample taken
+  # during the management-cluster waits that precede the tenant.
+  armed_line=$(grep -n '^  CURRENT_TENANT_KC=' "$lib" | head -n 1 | cut -d: -f1)
+  red=$(awk -v w="$wait_line" 'NR < w && /cozy_capture_runner_canary 2/ { line = NR } END { if (line) print line }' "$lib")
+  pairs_first=''
+  pairs_green=''
+  pairs_red=''
+  # Derived across all three pairs rather than anchored on one of them. Which
+  # sibling sits outermost is not a property anything holds -- it is today's
+  # source order -- so a guard that compared against one name would keep passing
+  # once the three were reordered around it, while the canary's burn sat inside
+  # whichever pair moved. What has to hold is the extremes: earlier than the
+  # earliest first reading, later than the latest second one, on both paths.
+  for fn in cozy_capture_sandbox_kvm_exits cozy_capture_runner_kernel_cpu_time \
+    cozy_capture_sandbox_qemu_thread_cpu; do
+    sib_first=$(grep -n "${fn} 1" "$lib" | head -n 1 | cut -d: -f1)
+    sib_green=$(awk -v w="$wait_line" -v f="${fn} 2" 'NR > w && index($0, f) { print NR; exit }' "$lib")
+    sib_red=$(awk -v w="$wait_line" -v f="${fn} 2" 'NR < w && index($0, f) { line = NR } END { if (line) print line }' "$lib")
+    for v in sib_first sib_green sib_red; do
+      eval "n=\$$v"
+      if [ -z "$n" ]; then
+        echo "expected to read $v for $fn from $lib; without it this guard reports success for having lost its input" >&2
+        return 1
+      fi
+    done
+    if [ -z "$pairs_first" ] || [ "$sib_first" -lt "$pairs_first" ]; then
+      pairs_first="$sib_first"
+    fi
+    if [ -z "$pairs_green" ] || [ "$sib_green" -gt "$pairs_green" ]; then
+      pairs_green="$sib_green"
+    fi
+    if [ -z "$pairs_red" ] || [ "$sib_red" -gt "$pairs_red" ]; then
+      pairs_red="$sib_red"
+    fi
+  done
+  for v in wait_line first green tail_line red console_line armed_line \
+    pairs_first pairs_green pairs_red; do
+    eval "n=\$$v"
+    if [ -z "$n" ]; then
+      echo "expected to read $v from $lib; without it this guard reports success for having lost its input" >&2
+      return 1
+    fi
+  done
+  if [ "$first" -ge "$pairs_first" ]; then
+    echo "the canary sample before the wait (line $first) is taken after the earliest of the three counter readings (line $pairs_first), so its burn falls inside the interval that pair divides by" >&2
+    return 1
+  fi
+  if [ "$green" -le "$pairs_green" ]; then
+    echo "the passing path takes its canary sample (line $green) before the latest of the three second readings (line $pairs_green), so its burn falls inside the interval that pair divides by" >&2
+    return 1
+  fi
+  if [ "$green" -ge "$tail_line" ]; then
+    echo "the passing path's canary sample (line $green) is taken after the suite's happy-path tail begins (line $tail_line), so the green figure describes a different window than the red one" >&2
+    return 1
+  fi
+  if [ "$red" -le "$pairs_red" ]; then
+    echo "the failure path takes its canary sample (line $red) before the latest of the three second readings (line $pairs_red), so its burn falls inside the interval that pair divides by" >&2
+    return 1
+  fi
+  # And the failure path's sample is bounded from above as well, the way the
+  # passing path's already is. The two bounds are not the same requirement: the
+  # lower one keeps the burn out of a pair's interval, this one keeps the figure
+  # comparable. Everything from the console down can spend the whole diagnostics
+  # phase, so a sample that drifted behind it describes a machine minutes past
+  # the failure, against a green figure taken seconds after the wait -- and the
+  # budget guard prices only what sits above the console, so the drift would
+  # also drop this collector out of that sum while it still runs.
+  if [ "$red" -ge "$console_line" ]; then
+    echo "the failure path takes its canary sample (line $red) at or after the serial console capture (line $console_line), so the red figure describes a machine minutes past the failure and the budget guard stops pricing it" >&2
+    return 1
+  fi
+  # The pre-wait sample is bounded from below for the same reason the others are
+  # bounded at all: the legend tells a reader the pair brackets the wait and the
+  # readings on either side of it. Taken before the tenant is even up, it would
+  # bracket the whole test instead, and the sentence would be false about the
+  # artifact it is printed into.
+  if [ "$first" -le "$armed_line" ]; then
+    echo "the canary sample before the wait (line $first) is taken at or before the tenant kubeconfig is handed to the failure handler (line $armed_line), so it describes the run before the cluster it is meant to characterise exists" >&2
+    return 1
+  fi
+}
+
+@test "both call sites outside the diagnostics block report a shortfall on their own side of the wait" {
+  lib=hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  # docs/agents/e2e-testing.md requires what a passing-path collector could not
+  # collect at all to reach the job log, and one of these two runs on exactly
+  # that path, where the report is the artifact nobody downloads. Each side is
+  # counted through the clause that names it rather than through the shared
+  # prefix: which side of the wait a shortfall fell on is the whole product of a
+  # pair, and two lines matched by one prefix could be swapped between the sites
+  # with the count unchanged.
+  # `|| true`: grep -c exits 1 on a count of zero, and under errexit that ends
+  # the test before the branch below can say what was missing -- the guard would
+  # still fail, with its diagnostic replaced by silence, on exactly the
+  # regression it exists to name.
+  calls=$(grep -c 'if ! cozy_capture_runner_canary [12]; then' "$lib" || true)
+  if [ "$calls" -ne 2 ]; then
+    echo "expected both canary samples outside the diagnostics block to consume the collector's status with 'if !', found $calls" >&2
+    return 1
+  fi
+  # Each clause is located rather than counted. A count of one apiece is
+  # satisfied by the two lines swapped between the sites, and a shortfall
+  # reported on the wrong side of the wait is worse than none: the pair exists to
+  # say which side moved.
+  # Anchored on the wait's own body rather than on its shape: `timeout Nm bash -c`
+  # matches more than one line in the library, and picking the first would
+  # re-anchor this check the day another one is added above it.
+  wait_line=$(awk '/^  timeout [0-9]+m bash -c/ { cand = NR; next } cand && NR == cand + 1 && /get nodes --no-headers/ { print cand; exit } { cand = 0 }' "$lib")
+  before=$(grep -n 'produced no reading before the node-join wait' "$lib" | head -n 1 | cut -d: -f1)
+  after=$(grep -n 'produced no reading after the node-join wait' "$lib" | head -n 1 | cut -d: -f1)
+  tail_line=$(grep -n '^  versions=\$(kubectl --kubeconfig' "$lib" | head -n 1 | cut -d: -f1)
+  for v in wait_line tail_line before after; do
+    eval "n=\$$v"
+    if [ -z "$n" ]; then
+      echo "expected to read $v from $lib; without it this guard reports success for having lost its input" >&2
+      return 1
+    fi
+  done
+  if [ "$before" -ge "$wait_line" ]; then
+    echo "the shortfall line naming the pre-wait sample sits at line $before, at or after the wait at $wait_line" >&2
+    return 1
+  fi
+  if [ "$after" -le "$wait_line" ] || [ "$after" -ge "$tail_line" ]; then
+    echo "the shortfall line naming the post-wait sample sits at line $after, outside the stretch between the wait at $wait_line and the suite's happy-path tail at $tail_line" >&2
+    return 1
+  fi
+}
+
+# ---------------------------------------------------------------------------
+# What a pathological reading does, which is what makes the collector worth
+# taking on the passing path.
+# ---------------------------------------------------------------------------
+
+@test "a memory rate under the floor the legend states raises the alert" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  timeout_skip_command=1
+  stage "$tmp"
+  stub_stamp
+  stamp_values='1000 1050 1050 1250'
+  # 8 MiB in two seconds: 4 MiB per second, against a floor of 500. The compute
+  # arm is sized to 12,000,000 iterations a second, above its own floor, so this
+  # arm is the only one that can raise the alert asserted below. The alert is
+  # one flag for the sample rather than one per arm, so a compute arm left under
+  # its own floor here would satisfy the assertion before this arm ran at all,
+  # and the memory floor could then be disconnected entirely with this case
+  # still green.
+  COZY_CANARY_CPU_ITERATIONS=6000000
+  COZY_CANARY_MEM_BLOCK_MIB=2
+  COZY_CANARY_MEM_BLOCKS=4
+
+  run_canary_here
+
+  capture=$(capture_path)
+  assert_file_contains 'rate: 4 MiB per second' "$capture"
+  if [ "${_COZY_CANARY_ALERT:-unset}" != 1 ]; then
+    echo "expected a memory rate of 4 MiB per second, against the ${COZY_CANARY_MEM_MIN_RATE} the legend calls the floor, to raise the alert the call sites turn into a job-log line" >&2
+    return 1
+  fi
+  rm -rf "$tmp"
+}
+
+@test "a core at the bottom of the healthy band raises no alert" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  timeout_skip_command=1
+  stage "$tmp"
+  stub_stamp
+  stamp_values='1000 1050 1050 1150'
+  # 953 MiB in one second, a gigabyte a second expressed in the unit the rate
+  # line is printed in. The floor sits well under that, so this core is slow and
+  # nothing more. A floor at the near-1000 MiB/s the legend gives for that
+  # bottom would raise the warning here -- on a green run, about a machine its
+  # own legend calls healthy. At this rate exactly it would not: the comparison
+  # is strict.
+  COZY_CANARY_CPU_ITERATIONS=6000000
+  COZY_CANARY_MEM_BLOCK_MIB=953
+  COZY_CANARY_MEM_BLOCKS=1
+
+  run_canary_here
+
+  capture=$(capture_path)
+  assert_file_contains 'rate: 953 MiB per second' "$capture"
+  if [ "${_COZY_CANARY_ALERT:-unset}" != 0 ]; then
+    echo "expected a memory rate of 953 MiB per second to raise no alert against the ${COZY_CANARY_MEM_MIN_RATE} floor" >&2
+    cat "$capture" >&2
+    return 1
+  fi
+  rm -rf "$tmp"
+}
+
+@test "a memory rate exactly at the floor raises no alert" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  timeout_skip_command=1
+  stage "$tmp"
+  stub_stamp
+  stamp_values='1000 1050 1050 1250'
+  # A rate landing on the floor rather than above or below it, which is the one
+  # case that tells `-lt` from `-le`. The neighbours put a rate on either side
+  # and both stay correct under either operator, so without this case the
+  # comparison the alert turns on is unconstrained. The block size is derived
+  # from the floor rather than written next to it: two seconds of a block twice
+  # the floor divides to the floor exactly, whatever the floor is later set to.
+  # The compute arm is sized well above its own floor, so the flag read below
+  # can only have come from the memory arm.
+  COZY_CANARY_CPU_ITERATIONS=6000000
+  COZY_CANARY_MEM_BLOCK_MIB=$(( COZY_CANARY_MEM_MIN_RATE * 2 ))
+  COZY_CANARY_MEM_BLOCKS=1
+
+  run_canary_here
+
+  capture=$(capture_path)
+  assert_file_contains "rate: ${COZY_CANARY_MEM_MIN_RATE} MiB per second" "$capture"
+  if [ "${_COZY_CANARY_ALERT:-unset}" != 0 ]; then
+    echo "expected a memory rate of exactly the ${COZY_CANARY_MEM_MIN_RATE} floor to raise no alert: the comparison is strict, and an alert here means it has stopped being" >&2
+    cat "$capture" >&2
+    return 1
+  fi
+  rm -rf "$tmp"
+}
+
+@test "a memory rate just under the floor raises the alert, not only one far under it" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  timeout_skip_command=1
+  stage "$tmp"
+  stub_stamp
+  stamp_values='1000 1050 1050 1150'
+  # 400 MiB in one second, just under the floor rather than an order of
+  # magnitude beneath it. The case above pins where the alert stays quiet and
+  # this one pins where it starts, so between them the floor is the number that
+  # decides -- a floor moved down far enough to be unreachable leaves the first
+  # case green and fails here.
+  COZY_CANARY_CPU_ITERATIONS=6000000
+  COZY_CANARY_MEM_BLOCK_MIB=400
+  COZY_CANARY_MEM_BLOCKS=1
+
+  run_canary_here
+
+  capture=$(capture_path)
+  assert_file_contains 'rate: 400 MiB per second' "$capture"
+  if [ "${_COZY_CANARY_ALERT:-unset}" != 1 ]; then
+    echo "expected a memory rate of 400 MiB per second, under the ${COZY_CANARY_MEM_MIN_RATE} floor, to raise the alert the call sites turn into a job-log line" >&2
+    cat "$capture" >&2
+    return 1
+  fi
+  rm -rf "$tmp"
+}
+
+@test "a compute rate under the floor the legend states raises the alert" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  timeout_skip_command=1
+  stage "$tmp"
+  stub_stamp
+  stamp_values='1000 1050 1050 1250'
+  # 1000 iterations in half a second: 2000 a second against a floor of three
+  # million. The memory arm beside it is above its own, so each arm's floor is
+  # pinned by the case where only that arm is under it -- one floor left at zero
+  # would otherwise be covered by the other one firing.
+  COZY_CANARY_CPU_ITERATIONS=1000
+  COZY_CANARY_MEM_BLOCK_MIB=2048
+  COZY_CANARY_MEM_BLOCKS=4
+
+  run_canary_here
+
+  capture=$(capture_path)
+  assert_file_contains 'rate: 2000 iterations per second' "$capture"
+  assert_file_contains 'rate: 4096 MiB per second' "$capture"
+  if [ "${_COZY_CANARY_ALERT:-unset}" != 1 ]; then
+    echo "expected a compute rate of 2000 iterations per second, against the ${COZY_CANARY_CPU_MIN_RATE} the legend calls the floor, to raise the alert the call sites turn into a job-log line" >&2
+    return 1
+  fi
+  rm -rf "$tmp"
+}
+
+@test "an arm stopped at its ceiling raises the alert without a rate to compare" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  timeout_skip_command=1
+  timeout_rc_match=dd
+  timeout_rc_override=124
+  stage "$tmp"
+  stub_stamp
+  stamp_values='1000 1050 1050 3050'
+  # Sized so the bound rounds up to 1639 MiB per second, above the floor, and
+  # the compute arm beside it is above its own: the ceiling has to raise the
+  # alert on its own account or nothing here does. An arm the bound stopped got
+  # less work done than the figure printed for it, which is why that figure is a
+  # bound rather than a rate -- and why a machine whose ceiling is reached at a
+  # size the floor would have passed must not read as healthy.
+  COZY_CANARY_CPU_ITERATIONS=6000000
+  COZY_CANARY_MEM_BLOCK_MIB=2048
+  COZY_CANARY_MEM_BLOCKS=16
+  COZY_CANARY_RUN_BOUND=20
+
+  run_canary_here
+
+  capture=$(capture_path)
+  assert_file_contains 'it was stopped at the 20s ceiling' "$capture"
+  # Stated so the case cannot quietly stop being about the ceiling: a size whose
+  # bound falls under the floor would satisfy the assertion below through the
+  # floor instead, and the ceiling could then be dropped from the alert with
+  # every test here still green.
+  assert_file_contains 'BELOW 1639 MiB per second' "$capture"
+  if [ "${_COZY_CANARY_ALERT:-unset}" != 1 ]; then
+    echo "expected an arm stopped at its ceiling, at a size whose bound sits above the floor, to raise the alert the call sites turn into a job-log line" >&2
+    return 1
+  fi
+  rm -rf "$tmp"
+}
+
+@test "an alert raised before the wait does not stand as the reading taken after it" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  timeout_skip_command=1
+  stage "$tmp"
+  stub_stamp
+  # Eight stamps: four for each sample, because run_kubernetes_test takes both
+  # from one shell and the alert is one variable for the pair.
+  stamp_values='1000 1050 1050 1250 1250 1300 1300 1500'
+  COZY_CANARY_CPU_ITERATIONS=1000
+  COZY_CANARY_MEM_BLOCK_MIB=2048
+  COZY_CANARY_MEM_BLOCKS=4
+
+  run_canary_here 1
+  first="${_COZY_CANARY_ALERT:-unset}"
+  COZY_CANARY_CPU_ITERATIONS=6000000
+  run_canary_here 2
+  second="${_COZY_CANARY_ALERT:-unset}"
+
+  if [ "$first" != 1 ]; then
+    echo "expected sample 1, whose compute arm ran at 2000 iterations a second, to raise the alert; got $first" >&2
+    return 1
+  fi
+  # The whole product of the pair is which side of the wait a change fell on. An
+  # alert left standing from the sample before it would be published as the
+  # reading taken after it, so a run that went into the wait slow and came out
+  # healthy would be reported as one that never recovered -- a warning on a green
+  # run, which is the kind a reader learns to skip.
+  if [ "$second" != 0 ]; then
+    echo "expected sample 2, with both arms above their floors, to leave no alert standing from sample 1; got $second" >&2
+    return 1
+  fi
+  rm -rf "$tmp"
+}
+
+@test "a reading inside the range the legend states raises nothing" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  timeout_skip_command=1
+  stage "$tmp"
+  stub_stamp
+  stamp_values='1000 1050 1050 1250'
+  # Both arms above their floors. Without this case an alert wired to fire
+  # always would satisfy every assertion above it, and the job log would carry
+  # the warning on every green run until a reader learned to skip it.
+  COZY_CANARY_CPU_ITERATIONS=6000000
+  COZY_CANARY_MEM_BLOCK_MIB=2048
+  COZY_CANARY_MEM_BLOCKS=4
+
+  run_canary_here
+
+  if [ "${_COZY_CANARY_ALERT:-unset}" != 0 ]; then
+    echo "expected a compute rate of 12000000 and a memory rate of 4096, both above their floors, to raise no alert" >&2
+    cat "$(capture_path)" >&2
+    return 1
+  fi
+  rm -rf "$tmp"
+}
+
+@test "the source keeps an alert branch at every reporting site, each naming where it was taken" {
+  lib=hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  # A reading the legend calls pathological is the loudest thing this collector
+  # produces, and the report holding it is the artifact nobody downloads on the
+  # passing path and the one a triager opens last on the failing one. So all
+  # three reporting sites put it in the job log, each naming where it was taken:
+  # two outside the diagnostics block, on either side of the wait, and the third
+  # inside it, where sample 1's line is a 29m node-join wait above.
+  #
+  # Counted through those clauses rather than through the shared prefix, for the
+  # reason the shortfall guard above gives: three lines matched by one prefix
+  # could be swapped between the sites with the count unchanged.
+  # `|| true` on each count: grep -c exits 1 on a count of zero, and under
+  # errexit that ends the test before the branch below can say what was
+  # missing -- the guard would still fail, with its diagnostic replaced by
+  # silence, on exactly the regression it exists to name.
+  branches=$(grep -cF 'elif [ "${_COZY_CANARY_ALERT:-0}" -eq 1 ]; then' "$lib" || true)
+  # Two leading spaces, so an `elif` line does not answer for the plain `if`
+  # this counts: the shorter needle is a substring of every one of them.
+  in_block=$(grep -cF '  if [ "${_COZY_CANARY_ALERT:-0}" -eq 1 ]; then' "$lib" || true)
+  if [ "$branches" -ne 2 ]; then
+    echo "expected both samples outside the diagnostics block to branch on the alert with elif, found $branches" >&2
+    return 1
+  fi
+  if [ "$in_block" -ne 1 ]; then
+    echo "expected the sample inside the diagnostics block to branch on the alert on its own, found $in_block" >&2
+    return 1
+  fi
+  # Located rather than counted, for the reason the shortfall guard above gives:
+  # one line apiece is satisfied by the three of them swapped around.
+  fail_fn=$(grep -n '^cozy_report_node_join_failure() {' "$lib" | head -n 1 | cut -d: -f1)
+  test_fn=$(grep -n '^run_kubernetes_test() {' "$lib" | head -n 1 | cut -d: -f1)
+  # Anchored on the wait's own body rather than on its shape: `timeout Nm bash -c`
+  # matches more than one line in the library, and picking the first would
+  # re-anchor this check the day another one is added above it.
+  wait_line=$(awk '/^  timeout [0-9]+m bash -c/ { cand = NR; next } cand && NR == cand + 1 && /get nodes --no-headers/ { print cand; exit } { cand = 0 }' "$lib")
+  before=$(grep -n '» WARNING: the runner fixed-work canary did not read inside the range its own legend calls healthy before the node-join wait' "$lib" | head -n 1 | cut -d: -f1)
+  after=$(grep -n '» WARNING: the runner fixed-work canary did not read inside the range its own legend calls healthy after the node-join wait' "$lib" | head -n 1 | cut -d: -f1)
+  failing=$(grep -n '» WARNING: the runner fixed-work canary did not read inside the range its own legend calls healthy on the failing run' "$lib" | head -n 1 | cut -d: -f1)
+  tail_line=$(grep -n '^  versions=\$(kubectl --kubeconfig' "$lib" | head -n 1 | cut -d: -f1)
+  for v in fail_fn test_fn wait_line tail_line before after failing; do
+    eval "n=\$$v"
+    if [ -z "$n" ]; then
+      echo "expected to read $v from $lib; without it this guard reports success for having lost its input" >&2
+      return 1
+    fi
+  done
+  if [ "$failing" -le "$fail_fn" ] || [ "$failing" -ge "$test_fn" ]; then
+    echo "the alert line naming the failing run sits at line $failing, outside the diagnostics block between $fail_fn and $test_fn" >&2
+    return 1
+  fi
+  if [ "$before" -le "$test_fn" ] || [ "$before" -ge "$wait_line" ]; then
+    echo "the alert line naming the pre-wait sample sits at line $before, not between the test body at $test_fn and the wait at $wait_line" >&2
+    return 1
+  fi
+  if [ "$after" -le "$wait_line" ] || [ "$after" -ge "$tail_line" ]; then
+    echo "the alert line naming the post-wait sample sits at line $after, outside the stretch between the wait at $wait_line and the suite's happy-path tail at $tail_line" >&2
+    return 1
+  fi
+}
+
+@test "each arm's floor sits inside the window a bounded arm can reach" {
+  lib=hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  # A floor the ceiling gets to first never fires. The arm is cut off before its
+  # rate can fall that far, so every alert arrives as the ceiling and carries a
+  # bound rather than the slowdown the floor was meant to name -- the collector
+  # goes quiet on exactly the effect it was sized for while its legend states a
+  # figure that decides nothing. A floor crossed in the first few ticks is the
+  # other end of the same failure: it fires on a duration this clock barely
+  # resolves. Derived from the constants because the size, the floor and the
+  # ceiling are three numbers in three places, and moving any one of them moves
+  # this window.
+  iters=$(grep -oE '^COZY_CANARY_CPU_ITERATIONS=[0-9]+' "$lib" | head -n 1 | sed -E 's/.*=//')
+  cpu_floor=$(grep -oE '^COZY_CANARY_CPU_MIN_RATE=[0-9]+' "$lib" | head -n 1 | sed -E 's/.*=//')
+  blk=$(grep -oE '^COZY_CANARY_MEM_BLOCK_MIB=[0-9]+' "$lib" | head -n 1 | sed -E 's/.*=//')
+  blocks=$(grep -oE '^COZY_CANARY_MEM_BLOCKS=[0-9]+' "$lib" | head -n 1 | sed -E 's/.*=//')
+  mem_floor=$(grep -oE '^COZY_CANARY_MEM_MIN_RATE=[0-9]+' "$lib" | head -n 1 | sed -E 's/.*=//')
+  bound=$(grep -oE '^COZY_CANARY_RUN_BOUND_DEFAULT=[0-9]+' "$lib" | head -n 1 | sed -E 's/.*=//')
+  for v in iters cpu_floor blk blocks mem_floor bound; do
+    eval "n=\$$v"
+    if [ -z "$n" ]; then
+      echo "expected to read $v from $lib; without it this guard reports success for having lost its input" >&2
+      return 1
+    fi
+  done
+  # Checked before dividing, for the reason the emptiness check above is
+  # checked: a floor read out as zero makes the shell die on the division rather
+  # than reach the branch below, and the failure then arrives as a raw
+  # arithmetic error rather than as a sentence naming the floor and the file it
+  # was read from.
+  for v in cpu_floor mem_floor; do
+    eval "n=\$$v"
+    if [ "$n" -eq 0 ]; then
+      echo "read $v as zero from $lib; a floor of zero has no window to sit inside and this guard cannot divide by it" >&2
+      return 1
+    fi
+  done
+  for arm in "compute:$(( iters * 1000 / cpu_floor ))" \
+    "memory:$(( blk * blocks * 1000 / mem_floor ))"; do
+    name=${arm%%:*}
+    ms=${arm#*:}
+    if [ "$ms" -ge $(( bound * 1000 )) ]; then
+      echo "the $name arm crosses its floor at ${ms}ms, at or past the ${bound}s ceiling, so the ceiling stops it first and the floor can never fire" >&2
+      return 1
+    fi
+    if [ "$ms" -lt 1000 ]; then
+      echo "the $name arm crosses its floor at ${ms}ms, under a hundred ticks of the 10ms clock, so the floor fires on a duration barely above the resolution" >&2
+      return 1
+    fi
+  done
+}
+
+@test "the memory block is larger than the cache figure its legend states" {
+  lib=hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  # The memory arm measures the memory controller only while its block exceeds
+  # what one core can keep cached; a block that fits reads cache bandwidth
+  # instead, several times higher, and the two arms stop telling the causes
+  # apart. The window guard beside this one divides by the product of the block
+  # size and the block count, so the split between them is invisible to it: 8
+  # MiB across 1024 blocks writes the same 8192 MiB and passes there. Both
+  # numbers are read from the source rather than written here, so the legend and
+  # the constant it describes cannot drift apart.
+  blk=$(grep -oE '^COZY_CANARY_MEM_BLOCK_MIB=[0-9]+' "$lib" | head -n 1 | sed -E 's/.*=//')
+  cache=$(grep -oE 'against the [0-9]+ MiB of last-level cache' "$lib" | head -n 1 | grep -oE '[0-9]+')
+  for v in blk cache; do
+    eval "n=\$$v"
+    if [ -z "$n" ]; then
+      echo "expected to read $v from $lib; without it this guard reports success for having lost its input" >&2
+      return 1
+    fi
+  done
+  if [ "$blk" -le "$cache" ]; then
+    echo "the memory block is ${blk} MiB against the ${cache} MiB of cache the legend states, so the arm fits in cache and stops measuring the memory controller" >&2
+    return 1
+  fi
+  # Bounded above as well: the block is one buffer dd allocates, and the source
+  # names the OOM killer taking that buffer as the realistic outside kill. A
+  # block large enough to be that buffer would pass the window guard beside this
+  # one, which only ever divides by the product of the size and the count.
+  if [ "$blk" -gt $(( cache * 8 )) ]; then
+    echo "the memory block is ${blk} MiB, more than eight times the ${cache} MiB of cache the legend states, so the arm asks dd for a buffer large enough to be the OOM the ceiling attribution is written for" >&2
+    return 1
+  fi
+}
+
+@test "each arm is sized to the duration its own legend states" {
+  lib=hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  # The sizes are chosen so each arm takes about a second, which is what makes
+  # the 10ms clock about a percent of the figure rather than a tenth of it. The
+  # window guard beside this one divides the quantity by the floor, so it holds a
+  # RATIO and moves with the floor: it admits a compute arm a tenth of this size,
+  # whose legend would then print "land in about a second" about a run that took
+  # a hundred milliseconds. What has to hold is the absolute duration, and both
+  # arms carry an anchor for it in the legend already: the compute floor is
+  # stated as a factor of ten under a healthy rate, and the memory arm is stated
+  # to take about eight seconds at the bottom of its band. Derived rather than
+  # timed, because a duration asserted against the clock of whatever machine
+  # runs this would be a flake rather than a guard.
+  iters=$(grep -oE '^COZY_CANARY_CPU_ITERATIONS=[0-9]+' "$lib" | head -n 1 | sed -E 's/.*=//')
+  cpu_floor=$(grep -oE '^COZY_CANARY_CPU_MIN_RATE=[0-9]+' "$lib" | head -n 1 | sed -E 's/.*=//')
+  blk=$(grep -oE '^COZY_CANARY_MEM_BLOCK_MIB=[0-9]+' "$lib" | head -n 1 | sed -E 's/.*=//')
+  blocks=$(grep -oE '^COZY_CANARY_MEM_BLOCKS=[0-9]+' "$lib" | head -n 1 | sed -E 's/.*=//')
+  mem_floor=$(grep -oE '^COZY_CANARY_MEM_MIN_RATE=[0-9]+' "$lib" | head -n 1 | sed -E 's/.*=//')
+  for v in iters cpu_floor blk blocks mem_floor; do
+    eval "n=\$$v"
+    if [ -z "$n" ]; then
+      echo "expected to read $v from $lib; without it this guard reports success for having lost its input" >&2
+      return 1
+    fi
+  done
+  # Compute: a healthy rate is the floor times the decade the legend states, so
+  # the arm's own duration at that rate is what the sentence promises.
+  compute_ms=$(( iters * 1000 / ( cpu_floor * 10 ) ))
+  if [ "$compute_ms" -lt 500 ] || [ "$compute_ms" -gt 2000 ]; then
+    echo "the compute arm runs ${compute_ms}ms at the healthy rate its own legend states, not the about-a-second the sizing comment promises, so the 10ms clock is no longer about a percent of the figure" >&2
+    return 1
+  fi
+  # Memory: the bottom of the band is the size over the eight seconds the legend
+  # gives it, and that bottom has to stay above the floor -- below it, a core at
+  # the bottom of the healthy band would read as pathological.
+  mem_mib=$(( blk * blocks ))
+  if [ $(( mem_mib / 8 )) -le "$mem_floor" ]; then
+    echo "the memory arm is ${mem_mib} MiB, so the bottom of the band its legend describes is $(( mem_mib / 8 )) MiB per second, at or under the ${mem_floor} floor: a core at the bottom of the healthy band would read as pathological" >&2
+    return 1
+  fi
+}
+
+@test "each arm runs the work its rate is a rate of" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  timeout_skip_command=1
+  stage "$tmp"
+  stub_stamp
+  stamp_values='1000 1050 1050 1250'
+
+  run_canary
+
+  capture=$(capture_path)
+  # Every figure in this capture is a rate of THIS work, and nothing else here
+  # reads the commands. An awk program with its loop gone and a dd reading a
+  # file that yields nothing still take a duration and still divide to a rate,
+  # and that rate is process startup reported as the speed of a machine.
+  assert_file_contains "for (i = 0; i < ${COZY_CANARY_CPU_ITERATIONS}; i++)" "$capture"
+  # Kept for the reason the source states beside it: an awk able to see that the
+  # loop has no effect is free to skip it.
+  assert_file_contains 'print s }' "$capture"
+  # The zero device rather than any readable file: dd's read is what fills the
+  # buffer this arm is timing the stores of.
+  assert_file_contains 'dd if=/dev/zero of=/dev/null' "$capture"
+  rm -rf "$tmp"
+}
+
+@test "both kubernetes suites describe the collectors that bracket the wait" {
+  # The node-join guard's own failure message sends a reader to both suite files,
+  # and the guard that orders those files against the library covers the gated
+  # list only -- these four are exempt from it, so nothing else checks the
+  # paragraph that names them. A paragraph that went back to describing three
+  # collectors would be false in two files and green everywhere.
+  for suite in hack/e2e-chainsaw/kubernetes-latest/chainsaw-test.yaml \
+    hack/e2e-chainsaw/kubernetes-previous/chainsaw-test.yaml; do
+  # `|| true` on each count: grep -c exits 1 on a count of zero, and under
+  # errexit that ends the test before the branch below can say what was
+  # missing -- the guard would still fail, with its diagnostic replaced by
+  # silence, on exactly the regression it exists to name.
+    # Counted inside the enumeration rather than anywhere in the file: the
+    # paragraph is what names all four, so a canary dropped from it and
+    # mentioned elsewhere would satisfy a file-wide count while the sentence
+    # stopped identifying the collectors it claims to.
+    named=$(sed -n '/The four collectors that bracket the node-join wait/,/sit outside this order/p' "$suite" | grep -cF 'runner fixed-work canary' || true)
+    counted=$(grep -cF 'The four collectors that bracket the node-join wait' "$suite" || true)
+    if [ "$named" -lt 1 ]; then
+      echo "expected $suite to name the runner fixed-work canary among the collectors that bracket the wait, found $named" >&2
+      return 1
+    fi
+    if [ "$counted" -ne 1 ]; then
+      echo "expected $suite to describe four collectors bracketing the wait, found $counted" >&2
+      return 1
+    fi
+  done
+}
diff --git a/hack/run-kubernetes-runner-cpu_test.bats b/hack/run-kubernetes-runner-cpu_test.bats
new file mode 100644
index 0000000000..4eca0a3fc8
--- /dev/null
+++ b/hack/run-kubernetes-runner-cpu_test.bats
@@ -0,0 +1,1435 @@
+#!/usr/bin/env bats
+# Regression coverage for the two readings that price the layers ABOVE the
+# sandbox nodes, in hack/e2e-chainsaw/_lib/run-kubernetes.sh: the runner
+# kernel's own /proc/stat, and the QEMU threads of the sandbox VMs. cozytest.sh
+# ends an @test block at the first bare closing brace, so command mocks stay at
+# top level.
+#
+# What these two answer, and why nothing beside them answers it. Every other CPU
+# reading in that file has a subject inside the sandbox -- a cgroup, a tenant
+# worker's threads, a sandbox node's own /proc/stat -- and each of them can say a
+# guest was given its ticks while getting no work done. None can say what the
+# layers above spent, and that is where this suite's own tax is paid: the sandbox
+# nodes' guest time is charged to the runner kernel as user time, and whatever
+# the runner VM loses to the machine hosting IT is charged to nobody the sandbox
+# can see. /proc/stat is not namespaced, so reading it from this container reads
+# the runner kernel; the sandbox VMs are QEMU processes in this container's own
+# PID namespace, so their threads are a local read too.
+#
+# So the failure these guard against is not a wrong number. It is a capture that
+# reads the wrong layer, or an empty directory that a reader takes for a machine
+# that spent nothing -- and the legends, which are what stop a reader comparing a
+# hypervisor's row against its guest's.
+#
+# Run from the repo root with `make bats-unit-tests`, or directly with
+# `bats hack/run-kubernetes-runner-cpu_test.bats`. The legacy
+# `hack/cozytest.sh` runner remains a supported compatibility path.
+
+load test_helper
+
+timeout_calls=/dev/null
+timeout_rc_override=
+
+timeout() {
+  local command_rc=0
+  printf '%s\n' "$*" >>"${timeout_calls}"
+  # Return 97 rather than running the command when the wrapper is not the
+  # bounded form: a read that lost its ceiling must not pass as a read.
+  [ "${1:-}" = -k ] || return 97
+  shift 3
+  "$@" || command_rc=$?
+  [ -z "${timeout_rc_override}" ] || return "${timeout_rc_override}"
+  return "${command_rc}"
+}
+
+assert_file_contains() {
+  local needle="$1"
+  local file="$2"
+
+  if [ ! -f "${file}" ]; then
+    printf 'expected %s to exist so it could be checked for: %s\n' "${file}" "${needle}" >&2
+    return 1
+  fi
+  case "$(cat "${file}")" in
+    *"${needle}"*) return 0 ;;
+  esac
+  printf 'expected %s to contain: %s\n' "${file}" "${needle}" >&2
+  cat "${file}" >&2
+  return 1
+}
+
+assert_file_lacks_pattern() {
+  local pattern="$1"
+  local file="$2"
+
+  # A missing file must fail rather than vacuously pass: a bare `! grep -q`
+  # succeeds on an unreadable path, which is indistinguishable from "the file
+  # exists and does not carry the label".
+  if [ ! -f "${file}" ]; then
+    printf 'expected %s to exist so it could be checked for: %s\n' "${file}" "${pattern}" >&2
+    return 1
+  fi
+  # Branched on awk's exact status. awk exits 1 for "no line matched" and 2 for
+  # "I could not evaluate this"; folded together, a negative assertion is
+  # satisfied by its own matcher giving up, which is the direction that goes
+  # green and stays green.
+  local _rc=0
+  awk -v pattern="${pattern}" '$0 ~ pattern { found = 1 } END { exit found ? 0 : 1 }' "${file}" || _rc=$?
+  case "${_rc}" in
+    0)
+      printf 'expected %s not to match: %s\n' "${file}" "${pattern}" >&2
+      cat "${file}" >&2
+      return 1
+      ;;
+    1) return 0 ;;
+    *)
+      printf 'awk could not evaluate pattern %s against %s\n' "${pattern}" "${file}" >&2
+      return 1
+      ;;
+  esac
+}
+
+# The functions under test redirect a command's stderr into a report file and
+# decide which artifact to write from it. cozytest.sh runs under `set -x`, so the
+# tracer's own line for that command lands on the very stderr being redirected,
+# and every assertion about those files would be reading the tracer. Call through
+# these wrappers so the sinks hold what production writes.
+run_kernel_capture() {
+  local _rc=0
+  ( set +x; cozy_capture_runner_kernel_cpu_time "${1:-1}" ) || _rc=$?
+  return "${_rc}"
+}
+
+run_thread_capture() {
+  local _rc=0
+  ( set +x; cozy_capture_sandbox_qemu_thread_cpu "${1:-1}" ) || _rc=$?
+  return "${_rc}"
+}
+
+# A /proc/stat shaped like the kernel's: the summed row first, one row per CPU,
+# then the rows that are not CPU time at all. Two CPU rows are enough to tell the
+# summed row from a per-CPU one; the walk does not count them.
+#
+# The numbers are the ones a loaded hypervisor produces: most of user here is
+# guest, staged so the guest-inside-user accounting rule has something to bite
+# on. How much of user is guest on a real runner is not a claim this fixture
+# makes; the runner also runs the CI process tree, containerd and the suite.
+stage_proc_stat() {
+  local file="$1"
+  mkdir -p "$(dirname "${file}")"
+  {
+    printf 'cpu  9000000 120 800000 4000000 30000 0 9000 45000 8900000 0\n'
+    printf 'cpu0 4500000 60 400000 2000000 15000 0 4500 22000 4450000 0\n'
+    printf 'cpu1 4500000 60 400000 2000000 15000 0 4500 23000 4450000 0\n'
+    printf 'intr 900000000 0 0 0\n'
+    printf 'ctxt 1800000000\n'
+    printf 'btime 1700000000\n'
+    printf 'processes 4000000\n'
+  } >"${file}"
+}
+
+# A /proc shaped like this container's: three QEMU processes, each with an
+# emulator thread and two vCPU threads. The vCPU thread name carries a space
+# inside its parentheses, which is the whole reason the legend tells a reader to
+# parse from the last ) -- a fixture without it would let a field-counting reader
+# pass.
+stage_sandbox_proc() {
+  local root="$1"
+  local pid tid
+  for pid in 101 202 303; do
+    mkdir -p "${root}/${pid}/task/${pid}"
+    printf 'qemu-system-x86_64\n' >"${root}/${pid}/comm"
+    printf '%s (qemu-system-x86) S 1 %s %s 0 -1 0 0 0 0 0 700 300 0 0 20 0 9 0 100 0 0\n' \
+      "${pid}" "${pid}" "${pid}" >"${root}/${pid}/task/${pid}/stat"
+    for tid in 1 2; do
+      mkdir -p "${root}/${pid}/task/${pid}${tid}"
+      printf '%s%s (CPU %s/KVM) R 1 %s %s 0 -1 0 0 0 0 0 5000 900 0 0 20 0 9 0 100 0 0\n' \
+        "${pid}" "${tid}" "$((tid - 1))" "${pid}" "${pid}" \
+        >"${root}/${pid}/task/${pid}${tid}/stat"
+    done
+  done
+  # A process that is not QEMU, so the probe's filter is exercised rather than
+  # assumed: this container also runs the shell driving the suite.
+  mkdir -p "${root}/9/task/9"
+  printf 'bash\n' >"${root}/9/comm"
+  printf '9 (bash) S 1 9 9 0 -1 0 0 0 0 0 4 2 0 0 20 0 1 0 100 0 0\n' >"${root}/9/task/9/stat"
+}
+
+stage() {
+  COZY_REPORT_DIR="$1/report"
+  COZY_SNAPSHOT_NAME=runner-cpu-smoke
+  COZY_DIAG_RUNNER_PROC_STAT="$1/proc-stat"
+  COZY_DIAG_SANDBOX_PROC="$1/proc"
+  stage_proc_stat "$COZY_DIAG_RUNNER_PROC_STAT"
+  stage_sandbox_proc "$COZY_DIAG_SANDBOX_PROC"
+}
+
+kernel_path() {
+  printf '%s/snapshots/runner-cpu-smoke/runner-kernel-cpu-time/sample-%s/proc-stat.txt' \
+    "${COZY_REPORT_DIR}" "${1:-1}"
+}
+
+threads_path() {
+  printf '%s/snapshots/runner-cpu-smoke/sandbox-qemu-thread-cpu/sample-%s/qemu-threads.txt' \
+    "${COZY_REPORT_DIR}" "${1:-1}"
+}
+
+# ---------------------------------------------------------------------------
+# The runner kernel's own CPU time.
+# ---------------------------------------------------------------------------
+
+@test "the runner kernel CPU rows reach the capture" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  stage "$tmp"
+
+  run_kernel_capture
+
+  capture=$(kernel_path)
+  assert_file_contains 'cpu  9000000 120 800000' "$capture"
+  assert_file_contains 'cpu0 4500000' "$capture"
+  rm -rf "$tmp"
+}
+
+@test "the capture says which layer its rows belong to" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  stage "$tmp"
+
+  run_kernel_capture
+
+  # The one reading that inverts every conclusion drawn from this file. Two
+  # kernels in this report publish a /proc/stat -- the runner, and each sandbox
+  # node one layer down -- so a reader who takes these rows for a sandbox node is
+  # comparing a hypervisor against its own guest. The tenant worker has no
+  # /proc/stat capture at all, which the legend now says rather than implying a
+  # third file to go looking for.
+  capture=$(kernel_path)
+  assert_file_contains 'these rows belong to the RUNNER VM kernel' "$capture"
+  assert_file_contains 'one layer above the sandbox nodes' "$capture"
+  assert_file_contains 'sandbox-host-cpu-time' "$capture"
+  # And that there is no third /proc/stat to go looking for. The clause sits in
+  # parallel with one that names a directory, so an earlier wording sent a reader
+  # hunting a tenant-worker /proc/stat that no capture in this report takes.
+  assert_file_contains 'no capture in this report reads /proc/stat inside a tenant worker at all' "$capture"
+  rm -rf "$tmp"
+}
+
+@test "the layer legend does not invent a capture that the report does not take" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  stage "$tmp"
+
+  run_kernel_capture
+
+  # The two claims the legend makes about other readers, each pinned to the
+  # source rather than to a count of the string: counting mentions of the file
+  # also counts the legend itself, so a legend inventing a third reader kept
+  # the count green (M21).
+  capture=$(kernel_path)
+  lib=hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  awk '/^cozy_capture_sandbox_node_cpu_time\(\)/,/^}/' "$lib" | grep -q 'read /proc/stat' || {
+    echo "FAIL: the legend points one layer down at a collector that no longer reads /proc/stat"
+    false
+  }
+  if grep -n 'tenantkubeconfig' "$lib" | grep -q 'proc/stat'; then
+    echo "FAIL: something reads /proc/stat through a tenant kubeconfig; the legend denies exactly that"
+    false
+  fi
+  assert_file_lacks_pattern 'a tenant worker reports its own' "$capture"
+  rm -rf "$tmp"
+}
+
+@test "the column legend travels with the numbers" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  stage "$tmp"
+
+  run_kernel_capture
+
+  capture=$(kernel_path)
+  # The column order, because the eighth and ninth are the two a reader wants
+  # and are adjacent.
+  assert_file_contains 'user nice system idle iowait irq softirq steal guest guest_nice' "$capture"
+  # The two ordinals, by number rather than by the order of the words above: the
+  # eighth and the ninth are adjacent and are the two a reader actually wants, so
+  # a swapped pair turns a fraction of a percent of steal into twenty-odd. Pinned
+  # because the column-order string alone stays green when the ordinals swap.
+  assert_file_contains 'The eighth number is steal and the ninth is guest' "$capture"
+  # And the accounting rule that makes this layer different from the one below:
+  # guest is inside user, so adding them double-counts. Deliberately NOT a claim
+  # about what fraction of this kernel's user time is guest -- the runner also
+  # runs the CI process tree, and these rows are read against nothing that could
+  # establish a proportion.
+  assert_file_contains 'already counted inside user' "$capture"
+  assert_file_lacks_pattern 'nearly all' "$capture"
+  rm -rf "$tmp"
+}
+
+@test "the legend says what steal means on this layer and nowhere else" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  stage "$tmp"
+
+  run_kernel_capture
+
+  # This is the number the whole capture exists for. A sandbox node reporting
+  # steal 0 says the runner kernel served it promptly and says nothing about
+  # whether the runner VM was itself waiting on the machine hosting it -- and
+  # that second number appears in no other file in this report.
+  capture=$(kernel_path)
+  assert_file_contains 'steal on THIS layer' "$capture"
+  assert_file_contains 'gave to somebody else' "$capture"
+  # And read in ONE direction. A climbing steal proves this runner VM was
+  # preempted; a zero proves nothing, because the column is filled only where the
+  # hypervisor exposes a paravirt steal clock and this capture observes neither
+  # the hypervisor nor that clock. The sandbox nodes one layer down can make the
+  # stronger claim because this repository starts them with accel=kvm; nobody
+  # here starts the runner VM.
+  assert_file_contains 'read that column in ONE direction only' "$capture"
+  assert_file_contains 'paravirt steal clock' "$capture"
+  assert_file_lacks_pattern 'A steal of zero here is a reading and not an absence' "$capture"
+  rm -rf "$tmp"
+}
+
+@test "the legend warns that the per-CPU rows are not physical cores" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  stage "$tmp"
+
+  run_kernel_capture
+
+  # A cpuN row is a CPU as this kernel sees it, which is a hardware thread
+  # wherever SMT is exposed. The capture reads no topology, so it says where that
+  # answer lives rather than asserting which this lane is -- an artifact confident
+  # about a machine it never looked at is worse than one that names the gap.
+  capture=$(kernel_path)
+  assert_file_contains 'What the row count is not is a core count' "$capture"
+  assert_file_contains 'thread_siblings_list' "$capture"
+  assert_file_lacks_pattern 'the lane runs SMT' "$capture"
+  # And the online/possible split, which is why the rows can be fewer than the
+  # total is summed over.
+  assert_file_contains 'one per ONLINE CPU' "$capture"
+  rm -rf "$tmp"
+}
+
+@test "the runner kernel read is bounded and keeps its exit code" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  stage "$tmp"
+
+  run_kernel_capture
+
+  # Local does not mean instant: this runs on the failure path of a machine
+  # already wedged enough to lose a node join, and /proc is served by that same
+  # kernel.
+  assert_file_contains "-k 5 20 cat" "$timeout_calls"
+  assert_file_contains '[capture exit code: 0]' "$(kernel_path)"
+  rm -rf "$tmp"
+}
+
+@test "a lowered read budget moves the runner kernel bound" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  stage "$tmp"
+  # Set after sourcing, which is how a caller and a test both set it. A value
+  # read only at assignment time would reach `timeout` unchecked here.
+  COZY_DIAG_READ_TIMEOUT=4
+
+  run_kernel_capture
+
+  assert_file_contains '-k 5 4 cat' "$timeout_calls"
+  rm -rf "$tmp"
+}
+
+@test "a zero read budget is corrected rather than disabling the bound" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  stage "$tmp"
+  # `timeout -k 5 0` disables the timeout outright, so a zero assigned after
+  # sourcing would restore the unbounded read this bound exists to remove.
+  COZY_DIAG_READ_TIMEOUT=0
+
+  run_kernel_capture
+
+  assert_file_lacks_pattern '^-k 5 0 ' "$timeout_calls"
+  assert_file_contains "-k 5 $COZY_DIAG_READ_TIMEOUT_DEFAULT cat" "$timeout_calls"
+  rm -rf "$tmp"
+}
+
+@test "each runner kernel reading records when it was taken" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  stage "$tmp"
+
+  run_kernel_capture
+
+  # This pair is not taken inside one diagnostics block: the first reading is
+  # taken before the node-join wait and the second only when that wait has run
+  # out, so the interval between them is the whole join window rather than a
+  # knob. A /proc/stat row carries no sample time, so nothing else in the
+  # artifact records it.
+  capture=$(kernel_path)
+  stamp=$(sed -n 's/.*read attempted from \([0-9][0-9]*\) to \([0-9][0-9]*\) epoch seconds.*/\1 \2/p' "$capture")
+  if [ -z "$stamp" ]; then
+    echo "expected a bare epoch stamp in $capture" >&2
+    cat "$capture" >&2
+    return 1
+  fi
+  rm -rf "$tmp"
+}
+
+@test "the sample number decides which runner kernel reading a file is" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  stage "$tmp"
+
+  run_kernel_capture 2
+
+  # The pair is the instrument: one reading of a running total is an average over
+  # the machine's whole uptime, not a rate over the failure. Two readings filed
+  # under the same name would leave the second overwriting the first and the
+  # artifact reading like a single sample.
+  assert_file_contains 'cpu  9000000' "$(kernel_path 2)"
+  [ ! -f "$(kernel_path 1)" ]
+  rm -rf "$tmp"
+}
+
+@test "a file holding no cpu row at all is not filed as a reading" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  stage "$tmp"
+  # /proc/stat carries intr, ctxt and btime as well, so a read cut off before the
+  # cpu rows leaves a file with numbers in it and no CPU time at all. Keyed on
+  # size, that would be filed as a reading and the caller told a pair exists.
+  {
+    printf 'intr 900000000 0 0 0\n'
+    printf 'ctxt 1800000000\n'
+  } >"$COZY_DIAG_RUNNER_PROC_STAT"
+  rc=0
+
+  run_kernel_capture || rc=$?
+
+  [ "$rc" -ne 0 ]
+  capture=$(kernel_path)
+  # `cat` exits zero for any file it could open, so this arrives on the CLEAN
+  # exit path: the read did not fail, the file simply carries no CPU time. Said
+  # in the file, because an empty-looking capture with exit code 0 otherwise
+  # reads as a kernel that was idle.
+  assert_file_contains 'the read completed and returned no cpu row at all' "$capture"
+  assert_file_contains 'not a reading that the runner kernel was idle' "$capture"
+  # And the pairing instruction must not ride on it: telling a reader to subtract
+  # two files asserts both hold a reading, and following it here turns the
+  # sibling's whole cumulative total into a rate over the window.
+  assert_file_lacks_pattern 'subtracting this file from its sibling' "$capture"
+  rm -rf "$tmp"
+}
+
+@test "a read that returned nothing is reported to the caller, not only to the report" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  stage "$tmp"
+  # Killed before it produced a byte: the dominant shape of a bounded read that
+  # ran out. Both callers ask this function whether it collected anything, and
+  # one of them runs on the passing path where the report is the artifact nobody
+  # downloads -- so a capture that got nothing has to answer non-zero or the
+  # warning saying the pair is broken never prints.
+  rm -f "$COZY_DIAG_RUNNER_PROC_STAT"
+  rc=0
+
+  run_kernel_capture || rc=$?
+
+  [ "$rc" -ne 0 ]
+  # The arm this staging reaches, not the substring all three unavailable arms
+  # share: cat on a missing file fails with a message, so the note must point
+  # at the failure marker holding it.
+  assert_file_contains 'what it said is in the COLLECTION-FAILED.txt' "$(kernel_path)"
+  rm -rf "$tmp"
+}
+
+@test "a kernel read that failed without a word says so, not something else" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  stage "$tmp"
+  # The fourth corner: non-zero status, no rows, and silence on both streams.
+  # Staged with an empty stat file and a forced status, since a real cat that
+  # fails always says why. Unstaged, this arm and its wording were deletable
+  # with the suite green.
+  : >"$COZY_DIAG_RUNNER_PROC_STAT"
+  timeout_rc_override=124
+  rc=0
+
+  run_kernel_capture || rc=$?
+  timeout_rc_override=
+
+  [ "$rc" -ne 0 ]
+  assert_file_contains 'said nothing on either stream' "$(kernel_path)"
+  rm -rf "$tmp"
+}
+
+@test "a thread walk that failed without a word says so, not something else" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  stage "$tmp"
+  # The probe is stubbed to a silent non-zero exit: every real shape of the
+  # probe leaves either thread lines or a finding, so the silent corner is
+  # reachable only when the walk itself dies wordlessly.
+  _cozy_thread_cpu_probe() { printf 'exit 3'; }
+  rc=0
+
+  run_thread_capture || rc=$?
+
+  [ "$rc" -ne 0 ]
+  capture=$(threads_path)
+  assert_file_contains 'said nothing on either stream' "$capture"
+  rm -rf "$tmp"
+}
+
+@test "a runner kernel read cut off part way is marked incomplete, not whole" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  stage "$tmp"
+  # The walk wrote rows and then the wrapper killed it: the shape where a
+  # whole-looking file is most misleading, since the difference against its
+  # sibling would understate every row the read never reached.
+  timeout_rc_override=124
+
+  run_kernel_capture || true
+
+  capture=$(kernel_path)
+  assert_file_contains 'cpu  9000000' "$capture"
+  assert_file_contains 'incomplete' "$capture"
+  assert_file_lacks_pattern 'subtracting this file from its sibling' "$capture"
+  assert_file_contains '[capture exit code: 124]' "$capture"
+  # The lines that say how to read the numbers stay, because they do not depend
+  # on the read having finished and this is exactly where a reader needs them.
+  assert_file_contains 'RUNNER VM kernel' "$capture"
+  rm -rf "$tmp"
+}
+
+@test "a partial runner kernel read is not reported to the caller as nothing" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  stage "$tmp"
+  # The other half of the pair above, and the reason the status is decided by
+  # what reached the file rather than by the exit code alone: a read cut off
+  # after it wrote rows left a usable capture, and a caller told nothing was
+  # collected would contradict the file sitting beside it.
+  timeout_rc_override=124
+  rc=0
+
+  run_kernel_capture || rc=$?
+
+  [ "$rc" -eq 0 ]
+  rm -rf "$tmp"
+}
+
+@test "a warning beside a healthy runner kernel read is not filed as a failure" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  stage "$tmp"
+  # A read that succeeds and still says something, which is the shape kubectl and
+  # talosctl produce all over this collector's neighbourhood. Staged as a `cat`
+  # on PATH rather than mocked as a function, because the collector runs it
+  # through the `timeout` wrapper, which resolves it as a command.
+  #
+  # Which file the complaint lands in is decided by the STATUS, not by whether
+  # stderr holds anything, so a healthy capture keeps its warning instead of
+  # shipping a failure marker beside a reading that succeeded.
+  mkdir -p "$tmp/bin"
+  cat >"$tmp/bin/cat" <<'STUB'
+#!/bin/sh
+printf 'cat: (hint) this file is served by a pseudo filesystem\n' >&2
+while IFS= read -r line || [ -n "$line" ]; do printf '%s\n' "$line"; done <"$1"
+STUB
+  chmod +x "$tmp/bin/cat"
+  PATH="$tmp/bin:$PATH"
+
+  run_kernel_capture
+
+  dir="$COZY_REPORT_DIR/snapshots/runner-cpu-smoke/runner-kernel-cpu-time/sample-1"
+  assert_file_contains 'cpu  9000000' "$dir/proc-stat.txt"
+  assert_file_contains 'served by a pseudo filesystem' "$dir/READ-WARNINGS.txt"
+  [ ! -f "$dir/COLLECTION-FAILED.txt" ]
+  [ ! -f "$dir/read-error.log" ]
+  rm -rf "$tmp"
+}
+
+@test "a failed runner kernel read sends its message to the failure marker" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  stage "$tmp"
+  # The other side of that routing rule, and the shape a missing pseudo file
+  # produces: no row reached the capture and the reason exists. Sent beside the
+  # capture rather than into it, and named as a failure rather than as a warning,
+  # because this one did fail.
+  rm -f "$COZY_DIAG_RUNNER_PROC_STAT"
+  rc=0
+
+  run_kernel_capture || rc=$?
+
+  [ "$rc" -ne 0 ]
+  dir="$COZY_REPORT_DIR/snapshots/runner-cpu-smoke/runner-kernel-cpu-time/sample-1"
+  assert_file_contains 'No such file' "$dir/COLLECTION-FAILED.txt"
+  assert_file_contains 'COLLECTION-FAILED.txt beside this file' "$dir/proc-stat.txt"
+  [ ! -f "$dir/READ-WARNINGS.txt" ]
+  rm -rf "$tmp"
+}
+
+@test "a runner kernel report directory that cannot be created is said out loud" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  stage "$tmp"
+  # A file where the directory has to go. Every write below it then fails, and
+  # without a check the capture is a silent no-op -- the empty directory this
+  # whole suite exists to refuse, produced by the one cause the markers cannot
+  # describe, because there is nowhere to write a marker.
+  mkdir -p "$COZY_REPORT_DIR/snapshots/runner-cpu-smoke"
+  printf 'not a directory\n' >"$COZY_REPORT_DIR/snapshots/runner-cpu-smoke/runner-kernel-cpu-time"
+  rc=0
+
+  out=$( ( set +x; cozy_capture_runner_kernel_cpu_time 1 ) 2>&1 ) || rc=$?
+
+  [ "$rc" -ne 0 ]
+  case "$out" in
+    *"could not be created"*) ;;
+    *)
+      printf 'expected the collector to say the report directory could not be created, got: %s\n' "$out" >&2
+      return 1
+      ;;
+  esac
+  rm -rf "$tmp"
+}
+
+# ---------------------------------------------------------------------------
+# The sandbox VMs' QEMU threads.
+# ---------------------------------------------------------------------------
+
+@test "the sandbox QEMU thread stat lines reach the capture" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  stage "$tmp"
+
+  run_thread_capture
+
+  capture=$(threads_path)
+  # All three sandbox VMs, because the question this answers is whether the
+  # three nodes paid evenly: one node's vCPU threads pinned while its siblings
+  # idle is a different fault from three nodes evenly loaded, and the kernel row
+  # one layer up sums all three.
+  assert_file_contains 'process 101 comm qemu-system-x86_64' "$capture"
+  assert_file_contains 'process 202 comm qemu-system-x86_64' "$capture"
+  assert_file_contains 'process 303 comm qemu-system-x86_64' "$capture"
+  assert_file_contains '(CPU 0/KVM)' "$capture"
+  # And nothing that is not QEMU: this container also runs the shell driving the
+  # suite, and its threads are not what this measures.
+  assert_file_lacks_pattern '\(bash\)' "$capture"
+  rm -rf "$tmp"
+}
+
+@test "the thread capture says which layer its threads belong to" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  stage "$tmp"
+
+  run_thread_capture
+
+  # Two captures in this report read QEMU threads and they are one layer apart:
+  # these are the sandbox VMs, and the ones under tenant-thread-cpu are the
+  # workers running inside them. Read as the wrong one, a busy hypervisor looks
+  # like a busy guest.
+  capture=$(threads_path)
+  assert_file_contains 'these threads belong to the SANDBOX VMs' "$capture"
+  assert_file_contains 'tenant-thread-cpu' "$capture"
+  assert_file_contains 'runner-kernel-cpu-time' "$capture"
+  rm -rf "$tmp"
+}
+
+@test "the thread legend says to parse from the last closing parenthesis" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  stage "$tmp"
+
+  run_thread_capture
+
+  # The trap that costs a reader the exact threads this capture exists to
+  # identify: a vCPU thread is named `CPU 0/KVM`, that space sits inside the
+  # parentheses, and every field counted over whitespace after it is off by one.
+  capture=$(threads_path)
+  assert_file_contains 'Parse from the last ) in the line instead' "$capture"
+  assert_file_contains 'utime the 12th and stime the 13th' "$capture"
+  rm -rf "$tmp"
+}
+
+@test "a container with no QEMU process is a finding rather than an empty capture" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  stage "$tmp"
+  # The sandbox VMs are what the whole run stands on, so a container running none
+  # of them is the most consequential thing this instrument can say -- and it
+  # leaves exactly the same empty directory as a collector that failed.
+  rm -rf "$COZY_DIAG_SANDBOX_PROC"
+  mkdir -p "$COZY_DIAG_SANDBOX_PROC/9/task/9"
+  printf 'bash\n' >"$COZY_DIAG_SANDBOX_PROC/9/comm"
+  printf '9 (bash) S 1 9 9 0 -1 0 0 0 0 0 4 2 0 0 20 0 1 0 100 0 0\n' \
+    >"$COZY_DIAG_SANDBOX_PROC/9/task/9/stat"
+  rc=0
+
+  run_thread_capture || rc=$?
+
+  [ "$rc" -ne 0 ]
+  capture=$(threads_path)
+  assert_file_contains 'NO-QEMU-PROCESS' "$capture"
+  # And the column legend must not ride on a file with no columns in it.
+  assert_file_lacks_pattern 'Parse from the last' "$capture"
+  rm -rf "$tmp"
+}
+
+@test "a proc mount that yields nothing is not reported as a container with no QEMU" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  stage "$tmp"
+  # The two say different things about the run: one is a container that was read
+  # and holds no hypervisor, the other is a read that never happened. Folded
+  # together, a mount this collector could not open would be filed as a sandbox
+  # with no VMs, which is a finding about the cluster it never observed.
+  rm -rf "$COZY_DIAG_SANDBOX_PROC"
+  mkdir -p "$COZY_DIAG_SANDBOX_PROC"
+  rc=0
+
+  run_thread_capture || rc=$?
+
+  [ "$rc" -ne 0 ]
+  capture=$(threads_path)
+  assert_file_contains 'NO-PROC-READ' "$capture"
+  assert_file_lacks_pattern 'NO-QEMU-PROCESS' "$capture"
+  # The closing sentence follows the marker: a read that never happened must not
+  # close with the no-QEMU verdict, whose subject the walk never observed.
+  assert_file_contains 'says nothing about what the container was running' "$capture"
+  assert_file_lacks_pattern 'a sandbox running no QEMU' "$capture"
+  rm -rf "$tmp"
+}
+
+@test "a QEMU named and then gone is not filed as a reading" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  stage "$tmp"
+  # A routine result on this failure path: the process was named and its task
+  # directory was gone by the time the walk reached it. Without this the capture
+  # holds a heading and no thread, which is enough bytes to look like a reading.
+  for pid in 101 202 303; do
+    rm -rf "$COZY_DIAG_SANDBOX_PROC/$pid/task"
+  done
+  # Pid files staged on purpose: this is the path where "which node still had a
+  # usable pid file" is the whole answer, so the map must print here too.
+  mkdir -p "$tmp/vmroot/srv1" "$tmp/vmroot/srv2" "$tmp/vmroot/srv3"
+  printf '101\n' >"$tmp/vmroot/srv1/qemu.pid"
+  printf '202\n' >"$tmp/vmroot/srv2/qemu.pid"
+  printf '303\n' >"$tmp/vmroot/srv3/qemu.pid"
+  COZY_DIAG_SANDBOX_VM_ROOT="$tmp/vmroot"
+  rc=0
+
+  run_thread_capture || rc=$?
+
+  [ "$rc" -ne 0 ]
+  capture=$(threads_path)
+  assert_file_contains 'NO-THREAD-LINES' "$capture"
+  assert_file_lacks_pattern 'Parse from the last' "$capture"
+  # Three QEMUs were named two lines up, so the closing sentence must read as a
+  # guest going away, never as a sandbox running no QEMU.
+  assert_file_contains 'a guest going away under the walk' "$capture"
+  assert_file_lacks_pattern 'a sandbox running no QEMU' "$capture"
+  # And the node map still prints here: which node still had a usable pid file
+  # is the question this path exists to answer.
+  assert_file_contains 'is srv' "$capture"
+  rm -rf "$tmp"
+}
+
+@test "the sandbox thread read is bounded and keeps its exit code" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  stage "$tmp"
+
+  run_thread_capture
+
+  assert_file_contains '-k 5 20 sh -c' "$timeout_calls"
+  assert_file_contains '[capture exit code: 0]' "$(threads_path)"
+  rm -rf "$tmp"
+}
+
+@test "the sample number decides which thread reading a file is" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  stage "$tmp"
+
+  run_thread_capture 2
+
+  assert_file_contains 'process 101' "$(threads_path 2)"
+  [ ! -f "$(threads_path 1)" ]
+  rm -rf "$tmp"
+}
+
+@test "a thread walk cut off part way is marked incomplete rather than whole" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  stage "$tmp"
+  timeout_rc_override=124
+
+  run_thread_capture || true
+
+  capture=$(threads_path)
+  assert_file_contains 'process 101' "$capture"
+  assert_file_contains 'incomplete' "$capture"
+  assert_file_contains '[capture exit code: 124]' "$capture"
+  rm -rf "$tmp"
+}
+
+@test "each thread reading records when it was taken" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  stage "$tmp"
+
+  run_thread_capture
+
+  capture=$(threads_path)
+  stamp=$(sed -n 's/.*read attempted from \([0-9][0-9]*\) to \([0-9][0-9]*\) epoch seconds.*/\1 \2/p' "$capture")
+  if [ -z "$stamp" ]; then
+    echo "expected a bare epoch stamp in $capture" >&2
+    cat "$capture" >&2
+    return 1
+  fi
+  rm -rf "$tmp"
+}
+
+@test "the thread capture reuses the probe the worker capture runs" {
+  # A source check, and the point is the sharing rather than the text: the probe
+  # already answers the two outcomes that matter here -- found QEMU, and QEMU is
+  # gone -- and already names the three ways it can come up short. A second copy
+  # would drift from this one exactly at those failure paths, which is where
+  # nobody looks until it matters.
+  lib=hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  n=$(awk '/^cozy_capture_sandbox_qemu_thread_cpu\(\)/,/^}/' "$lib" | grep -cF '_cozy_thread_cpu_probe' || true)
+  [ "$n" -ge 1 ] || {
+    echo "FAIL: the sandbox thread capture no longer runs the shared probe"
+    false
+  }
+  # And that there is still exactly one probe to share.
+  d=$(grep -cE '^_cozy_thread_cpu_probe\(\)' "$lib" || true)
+  [ "$d" -eq 1 ] || {
+    echo "FAIL: found $d definitions of the thread probe; a second copy is the drift this test exists to refuse"
+    false
+  }
+}
+
+# ---------------------------------------------------------------------------
+# Where the two readings of each pair sit.
+# ---------------------------------------------------------------------------
+
+@test "both new readings bracket the node-join wait on both paths" {
+  lib=hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  # What these pairs measure is decided by where their calls sit, not by anything
+  # inside the collectors: /proc/stat and a thread's utime are running totals, so
+  # the interval a difference divides by is whatever runs between the readings.
+  # The same reasoning the KVM pair beside them is held to, and the same failure:
+  # a second reading placed after the happy-path tail prices ten to fifteen
+  # minutes of storage and LoadBalancer work while the capture's own legend says
+  # it priced the join.
+  # Anchored on the wait's own body rather than on its shape: `timeout Nm bash -c`
+  # matches more than one line in the library, and picking the first would
+  # re-anchor this check the day another one is added above it.
+  wait_line=$(awk '/^  timeout [0-9]+m bash -c/ { cand = NR; next } cand && NR == cand + 1 && /get nodes --no-headers/ { print cand; exit } { cand = 0 }' "$lib")
+  tail_line=$(grep -n '^  versions=\$(kubectl --kubeconfig' "$lib" | head -n 1 | cut -d: -f1)
+  node_table=$(grep -n "cozy_diag_read 'tenant node table'" "$lib" | head -n 1 | cut -d: -f1)
+  for v in wait_line tail_line node_table; do
+    eval "n=\$$v"
+    if [ -z "$n" ]; then
+      echo "expected to read $v from $lib; without it this guard reports success for having lost its input" >&2
+      return 1
+    fi
+  done
+  for fn in cozy_capture_runner_kernel_cpu_time cozy_capture_sandbox_qemu_thread_cpu; do
+    first=$(grep -n "${fn} 1" "$lib" | head -n 1 | cut -d: -f1)
+    # The green second reading, found as the one after the wait rather than by
+    # position in the file: the other call with the same argument is the failure
+    # block's, and picking by count would be right only while the two happen to
+    # be written in this order.
+    green=$(awk -v w="$wait_line" -v f="${fn} 2" 'NR > w && index($0, f) { print NR; exit }' "$lib")
+    red=$(awk -v w="$wait_line" -v f="${fn} 2" 'NR < w && index($0, f) { line = NR } END { if (line) print line }' "$lib")
+    for v in first green red; do
+      eval "n=\$$v"
+      if [ -z "$n" ]; then
+        echo "expected to find $v for $fn in $lib; without it this guard reports success for having lost its input" >&2
+        return 1
+      fi
+    done
+    if [ "$first" -ge "$wait_line" ]; then
+      echo "$fn's first reading (line $first) is not taken before the node-join wait (line $wait_line), so the pair does not span it" >&2
+      return 1
+    fi
+    if [ "$green" -le "$wait_line" ] || [ "$green" -ge "$tail_line" ]; then
+      echo "$fn's passing-path second reading (line $green) does not sit between the wait (line $wait_line) and the happy-path tail (line $tail_line), so the green interval is not the join window the red one is compared against" >&2
+      return 1
+    fi
+    if [ "$red" -ge "$node_table" ]; then
+      echo "$fn's failure-path second reading (line $red) is taken after the diagnostics block has started reading the cluster (line $node_table), so the red interval is the wait plus whatever those reads cost" >&2
+      return 1
+    fi
+  done
+}
+
+@test "the bringup names the QEMU threads the legend identifies by name" {
+  # The legend reads vCPU threads by the name `CPU N/KVM`, and QEMU only
+  # assigns those names when started with `-name ...,debug-threads=on`; without
+  # the flag every thread carries the bare process name and the identification
+  # the legend promises does not exist on this lane. Pinned on the qemu command
+  # line itself, non-comment lines only, so a dropped flag fails here rather
+  # than surfacing as an unexplained absence in production captures.
+  awk '/^    qemu-system-x86_64 /,/-pidfile/' hack/e2e-prepare-cluster.bats |
+    grep -v '^\s*#' | grep -q 'debug-threads=on' || {
+    echo "FAIL: hack/e2e-prepare-cluster.bats starts QEMU without debug-threads=on; the thread names the legend documents will not exist" >&2
+    false
+  }
+}
+
+@test "the pair orders mirror around the wait so the KVM interval stays exact" {
+  lib=hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  # The KVM legend calls its interval the window and means it exactly; that is
+  # only true while nothing runs between its samples and the wait. Its first
+  # reading must therefore be the LAST of the three before the wait, and its
+  # second the FIRST after it -- on both paths. The other two legends name the
+  # sibling readings inside their intervals, so their order is free.
+  # Anchored on the wait's own body rather than on its shape: `timeout Nm bash -c`
+  # matches more than one line in the library, and picking the first would
+  # re-anchor this check the day another one is added above it.
+  wait_line=$(awk '/^  timeout [0-9]+m bash -c/ { cand = NR; next } cand && NR == cand + 1 && /get nodes --no-headers/ { print cand; exit } { cand = 0 }' "$lib")
+  [ -n "$wait_line" ] || { echo "FAIL: could not find the node-join wait"; false; }
+  last_before=$(awk -v w="$wait_line" 'NR < w && /^  if ! cozy_capture_(sandbox_kvm_exits|runner_kernel_cpu_time|sandbox_qemu_thread_cpu) 1; then/ { l = $0 } END { print l }' "$lib")
+  case "$last_before" in
+    *cozy_capture_sandbox_kvm_exits*) ;;
+    *) echo "FAIL: the reading closest to the wait from above is not the KVM pair: $last_before"; false ;;
+  esac
+  # The failure block is defined ABOVE the wait in file order and carries the
+  # `|| true` form its budget guard requires; the green second readings are the
+  # warned `if !` calls below the wait. Position in the file is the opposite of
+  # position in time here, which is exactly why the forms are matched too.
+  for scope in green red; do
+    if [ "$scope" = green ]; then
+      first_after=$(awk -v w="$wait_line" 'NR > w && /^  if ! cozy_capture_(sandbox_kvm_exits|runner_kernel_cpu_time|sandbox_qemu_thread_cpu) 2; then/ { print $0; exit }' "$lib")
+    else
+      first_after=$(awk -v w="$wait_line" 'NR < w && /^  cozy_capture_(sandbox_kvm_exits|runner_kernel_cpu_time|sandbox_qemu_thread_cpu) 2 \|\| true$/ { print $0; exit }' "$lib")
+    fi
+    case "$first_after" in
+      *cozy_capture_sandbox_kvm_exits*) ;;
+      *) echo "FAIL: the $scope second reading closest to the wait is not the KVM pair: $first_after"; false ;;
+    esac
+  done
+}
+
+@test "both new readings report a shortfall to the job log, not only to the report" {
+  lib=hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  # Two of the three call sites run outside the diagnostics block, and one of
+  # those is the passing path -- where the report is the artifact nobody
+  # downloads. A capture that collected nothing there has to say so where a
+  # reader of a green run will see it, or the pair is silently broken for every
+  # red run compared against it.
+  for fn in cozy_capture_runner_kernel_cpu_time cozy_capture_sandbox_qemu_thread_cpu; do
+    n=$(grep -cE "^  if ! ${fn} [12]; then" "$lib" || true)
+    [ "$n" -eq 2 ] || {
+      echo "FAIL: $fn has $n status-checked call sites; the two outside the failure block must both warn"
+      false
+    }
+  done
+  # And the warnings say WHICH reading is missing, matched on text specific to each
+  # collector. Unscoped, these greps pass on the pre-existing KVM warnings, which
+  # carry the same two phrases: emptying all four new warning bodies then left the
+  # whole suite green.
+  for subject in "the runner kernel's CPU time" "the sandbox VMs' QEMU threads"; do
+    for when in before after; do
+      n=$(grep -cF "WARNING: ${subject} yielded no reading ${when} the node-join wait" "$lib" || true)
+      [ "$n" -eq 1 ] || {
+        echo "FAIL: found $n warnings for ${subject} ${when} the wait; each reading warns once, in its own words"
+        false
+      }
+    done
+  done
+}
+
+@test "every legend line lands as one line rather than shredded into words" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  stage "$tmp"
+
+  run_kernel_capture
+  run_thread_capture
+
+  # Each legend is one long single-quoted shell string, and an apostrophe inside
+  # one ends the quote: the sentence then reaches the file as one word per line,
+  # every `[` unmatched, and the capture still passes any assertion that greps for
+  # a short phrase. This checks the shape instead -- a bracketed line opens and
+  # closes on the same line -- because that is what a shredded legend loses.
+  for capture in "$(kernel_path)" "$(threads_path)"; do
+    if awk '/^\[/ && $0 !~ /\]$/ { print FILENAME ": " $0; found = 1 } END { exit found ? 1 : 0 }' "$capture"; then
+      :
+    else
+      echo "FAIL: a bracketed legend line in $capture does not close on its own line, which is what an apostrophe inside its single quotes does to it" >&2
+      return 1
+    fi
+    # And some bracketed line must exist at all: a requote that drops a whole
+    # legend block leaves nothing for the shape check to object to.
+    grep -q '^\[' "$capture" || {
+      echo "FAIL: $capture carries no bracketed legend line at all" >&2
+      return 1
+    }
+  done
+  rm -rf "$tmp"
+}
+
+@test "the thread legend rule is executable, not just present" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  stage "$tmp"
+
+  run_thread_capture
+
+  # The legend tells a reader to parse from the last `)`. Nothing pinned that the
+  # rule works on the lines this capture actually holds, so the fixture's space
+  # inside `(CPU 0/KVM)` carried no assertion at all -- it only made the comment
+  # sound justified. Applied here to a real captured line: after the last `)` the
+  # state is field 1, utime field 12, stime field 13.
+  line=$(grep -F '(CPU 0/KVM)' "$(threads_path)" | head -n 1)
+  [ -n "$line" ] || {
+    echo "FAIL: no vCPU thread line in the capture to apply the rule to"
+    false
+  }
+  tail_fields=${line##*) }
+  set -- $tail_fields
+  [ "$1" = R ] || {
+    echo "FAIL: field 1 after the last ) is '$1', expected the thread state"
+    false
+  }
+  [ "${12}" = 5000 ] || {
+    echo "FAIL: field 12 after the last ) is '${12}', expected utime 5000"
+    false
+  }
+  [ "${13}" = 900 ] || {
+    echo "FAIL: field 13 after the last ) is '${13}', expected stime 900"
+    false
+  }
+  # And that counting over whitespace from the start of the line gets it WRONG,
+  # which is the whole reason the rule exists: the space inside the parentheses
+  # shifts every later field by one.
+  set -- $line
+  [ "${14}" != 5000 ] || {
+    echo "FAIL: field 14 counted from the start equals utime, so this fixture no longer carries the trap the legend warns about"
+    false
+  }
+  rm -rf "$tmp"
+}
+
+@test "the thread capture names which sandbox node each process is" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  stage "$tmp"
+  # The pid files hack/e2e-prepare-cluster.bats writes when it starts the guests.
+  # Without this map a reader has a container pid and no way to tell the
+  # control-plane node from a worker-carrying one -- which is the discriminating
+  # question, because the tenant workers sit on specific sandbox nodes.
+  for srv in 1 2 3; do
+    mkdir -p "$tmp/vmroot/srv${srv}"
+  done
+  printf '101\n' >"$tmp/vmroot/srv1/qemu.pid"
+  printf '202\n' >"$tmp/vmroot/srv2/qemu.pid"
+  printf '303\n' >"$tmp/vmroot/srv3/qemu.pid"
+  COZY_DIAG_SANDBOX_VM_ROOT="$tmp/vmroot"
+
+  run_thread_capture
+
+  capture=$(threads_path)
+  assert_file_contains '[process 101 is srv1]' "$capture"
+  assert_file_contains '[process 202 is srv2]' "$capture"
+  assert_file_contains '[process 303 is srv3]' "$capture"
+  assert_file_lacks_pattern 'anonymous by node' "$capture"
+  rm -rf "$tmp"
+}
+
+@test "a sandbox node whose pid file is gone is absent from the map, not renamed" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  stage "$tmp"
+  # Two of three pid files, which is what a node that died during the join looks
+  # like from here. The map must not silently shift, since a wrong node name is
+  # worse than no name: a triager would go and read the wrong guest console.
+  mkdir -p "$tmp/vmroot/srv1" "$tmp/vmroot/srv3"
+  printf '101\n' >"$tmp/vmroot/srv1/qemu.pid"
+  printf '303\n' >"$tmp/vmroot/srv3/qemu.pid"
+  COZY_DIAG_SANDBOX_VM_ROOT="$tmp/vmroot"
+
+  run_thread_capture
+
+  capture=$(threads_path)
+  assert_file_contains '[process 101 is srv1]' "$capture"
+  assert_file_contains '[process 303 is srv3]' "$capture"
+  assert_file_lacks_pattern 'is srv2' "$capture"
+  # And the legend says an absent node means an unreadable pid file rather than
+  # leaving the gap to be read as a node that never existed.
+  assert_file_contains 'had no usable pid file' "$capture"
+  rm -rf "$tmp"
+}
+
+@test "a capture with no pid map says it is anonymous rather than implying a name" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  stage "$tmp"
+  # No pid files at all: a sandbox created some other way, or a tree where the
+  # bringup wrote them elsewhere. The KVM capture beside this one discloses its
+  # own anonymity in exactly this situation, and a reader who has seen that one
+  # would otherwise take a process id here for a node identifier.
+  COZY_DIAG_SANDBOX_VM_ROOT="$tmp/nowhere"
+
+  run_thread_capture
+
+  capture=$(threads_path)
+  assert_file_contains 'anonymous by node' "$capture"
+  assert_file_contains 'not which of them paid what' "$capture"
+  assert_file_lacks_pattern 'is srv1' "$capture"
+  rm -rf "$tmp"
+}
+
+@test "a pid file holding something that is not a pid is skipped, not trusted" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  stage "$tmp"
+  # A truncated or half-written pid file, which is what a guest killed during
+  # startup can leave. One node's file holds text and another's is empty, and
+  # the asserts hold both forms out of the whole map line: an empty value slid
+  # through validation once rendered as `[process srv1 is ]`, which a narrow
+  # `is srv1` pattern read as clean (the surviving mutant both reviews named).
+  mkdir -p "$tmp/vmroot/srv1" "$tmp/vmroot/srv2" "$tmp/vmroot/srv3"
+  printf '\n' >"$tmp/vmroot/srv1/qemu.pid"
+  printf 'not-a-pid\n' >"$tmp/vmroot/srv3/qemu.pid"
+  printf '202\n' >"$tmp/vmroot/srv2/qemu.pid"
+  COZY_DIAG_SANDBOX_VM_ROOT="$tmp/vmroot"
+
+  run_thread_capture
+
+  capture=$(threads_path)
+  assert_file_contains '[process 202 is srv2]' "$capture"
+  assert_file_lacks_pattern 'srv1' "$capture"
+  assert_file_lacks_pattern 'not-a-pid' "$capture"
+  assert_file_lacks_pattern 'is srv3' "$capture"
+  # Exactly one map line: nothing rendered for the two bad files in any form.
+  n=$(grep -c '^\[process ' "$capture" || true)
+  [ "$n" -eq 1 ] || {
+    echo "FAIL: expected exactly one map line, found $n"
+    grep '^\[process ' "$capture"
+    false
+  }
+  rm -rf "$tmp"
+}
+
+@test "a thread walk cut off after writing lines withholds the pairing instruction" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  stage "$tmp"
+  # The half its sibling capture already pins: telling a reader to subtract two
+  # files asserts both hold a whole reading. A walk cut off after the first node
+  # would have the other two read as having spent nothing across the window,
+  # which is the largest wrong number this artifact could produce.
+  timeout_rc_override=124
+
+  run_thread_capture || true
+
+  capture=$(threads_path)
+  assert_file_contains 'incomplete' "$capture"
+  assert_file_lacks_pattern 'subtracting this file from its sibling' "$capture"
+  # The lines that say how to read the numbers stay: they do not depend on the
+  # walk having finished, and a cut-off capture is where a reader needs them.
+  assert_file_contains 'Parse from the last ) in the line instead' "$capture"
+  rm -rf "$tmp"
+}
+
+@test "a thread walk that ends clean with nothing to read says that is a finding" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  stage "$tmp"
+  # The probe exits zero on a container it read and found no QEMU in, so this
+  # arrives on the clean path with an exit code of 0 under it. Left silent, the
+  # capture reads as a healthy reading of an idle machine -- while what it
+  # actually records is that the three VMs the whole run stands on are not there.
+  rm -rf "$COZY_DIAG_SANDBOX_PROC"
+  mkdir -p "$COZY_DIAG_SANDBOX_PROC/9/task/9"
+  printf 'bash\n' >"$COZY_DIAG_SANDBOX_PROC/9/comm"
+  printf '9 (bash) S 1 9 9 0 -1 0 0 0 0 0 4 2 0 0 20 0 1 0 100 0 0\n' \
+    >"$COZY_DIAG_SANDBOX_PROC/9/task/9/stat"
+
+  run_thread_capture || true
+
+  capture=$(threads_path)
+  assert_file_contains 'NO-QEMU-PROCESS' "$capture"
+  assert_file_contains 'the walk completed and produced no thread line at all' "$capture"
+  assert_file_contains 'a finding about this run rather than a shortfall of this capture' "$capture"
+  assert_file_lacks_pattern 'subtracting this file from its sibling' "$capture"
+  rm -rf "$tmp"
+}
+
+@test "a failed thread walk sends its message to the failure marker its sibling uses" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  stage "$tmp"
+  # No thread line AND a message: the shape a walk killed against an unreadable
+  # proc mount produces. It goes into COLLECTION-FAILED.txt, which is the name the
+  # report's documentation gives the artifact-level failure marker and the name
+  # the runner-kernel capture writes for this same shape -- a reader sweeping the
+  # tarball for markers would otherwise miss this walk entirely.
+  mkdir -p "$tmp/bin"
+  cat >"$tmp/bin/sh" <<STUB
+#!/bin/sh
+printf 'sh: cannot open the proc mount\\n' >&2
+exit 2
+STUB
+  chmod +x "$tmp/bin/sh"
+  PATH="$tmp/bin:$PATH"
+  rc=0
+
+  run_thread_capture || rc=$?
+
+  [ "$rc" -ne 0 ]
+  dir="$COZY_REPORT_DIR/snapshots/runner-cpu-smoke/sandbox-qemu-thread-cpu/sample-1"
+  assert_file_contains 'cannot open the proc mount' "$dir/COLLECTION-FAILED.txt"
+  assert_file_contains 'COLLECTION-FAILED.txt beside this file' "$dir/qemu-threads.txt"
+  [ ! -f "$dir/read-error.log" ]
+  rm -rf "$tmp"
+}
+
+@test "a thread report directory that cannot be created is said out loud" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  stage "$tmp"
+  # The one failure the markers cannot describe, because there is nowhere to put
+  # one. Its sibling capture has this test; this one did not, which is the same
+  # asymmetry as the failure marker above.
+  mkdir -p "$COZY_REPORT_DIR/snapshots/runner-cpu-smoke"
+  printf 'not a directory\n' >"$COZY_REPORT_DIR/snapshots/runner-cpu-smoke/sandbox-qemu-thread-cpu"
+  rc=0
+
+  out=$( ( set +x; cozy_capture_sandbox_qemu_thread_cpu 1 ) 2>&1 ) || rc=$?
+
+  [ "$rc" -ne 0 ]
+  case "$out" in
+    *"could not be created"*) ;;
+    *)
+      printf 'expected the collector to say the report directory could not be created, got: %s\n' "$out" >&2
+      return 1
+      ;;
+  esac
+  rm -rf "$tmp"
+}
+
+@test "a runner kernel read that failed after writing rows points at its message" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  stage "$tmp"
+  # Rows AND a non-zero status AND something on stderr: the fourth corner of the
+  # pair of questions the arms answer, and the one no test staged. Without it the
+  # arm that names read-error.log can be deleted with the suite green, leaving a
+  # reader told the reading is partial and not told where the reason went.
+  mkdir -p "$tmp/bin"
+  cat >"$tmp/bin/cat" <<'STUB'
+#!/bin/sh
+while IFS= read -r line || [ -n "$line" ]; do printf '%s\n' "$line"; done <"$1"
+printf 'cat: the pseudo file stopped answering part way\n' >&2
+exit 1
+STUB
+  chmod +x "$tmp/bin/cat"
+  PATH="$tmp/bin:$PATH"
+
+  run_kernel_capture || true
+
+  dir="$COZY_REPORT_DIR/snapshots/runner-cpu-smoke/runner-kernel-cpu-time/sample-1"
+  assert_file_contains 'cpu  9000000' "$dir/proc-stat.txt"
+  assert_file_contains 'read-error.log beside this file' "$dir/proc-stat.txt"
+  assert_file_contains 'stopped answering part way' "$dir/read-error.log"
+  rm -rf "$tmp"
+}
+
+@test "a thread walk that failed after writing lines points at its message" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  stage "$tmp"
+  # The same fourth corner on the thread side. Its arm was unreachable from this
+  # suite for the same reason: the only non-zero case drove the real probe, which
+  # leaves stderr empty.
+  mkdir -p "$tmp/bin"
+  cat >"$tmp/bin/sh" <<STUB
+#!/bin/sh
+printf '101 (qemu-system-x86) S 1 101 101 0 -1 0 0 0 0 0 700 300 0 0 20 0 9 0 100 0 0\\n'
+printf 'sh: the proc walk stopped part way\\n' >&2
+exit 1
+STUB
+  chmod +x "$tmp/bin/sh"
+  PATH="$tmp/bin:$PATH"
+
+  run_thread_capture || true
+
+  dir="$COZY_REPORT_DIR/snapshots/runner-cpu-smoke/sandbox-qemu-thread-cpu/sample-1"
+  assert_file_contains 'incomplete' "$dir/qemu-threads.txt"
+  assert_file_contains 'read-error.log beside this file' "$dir/qemu-threads.txt"
+  assert_file_contains 'stopped part way' "$dir/read-error.log"
+  rm -rf "$tmp"
+}
+
+@test "both collectors still collect when timeout is not on PATH" {
+  # The documented fallback, which every comparable suite beside this one pins:
+  # where `timeout` is absent the reads run unbounded rather than not at all, and
+  # the phase warning promises exactly that by name. `timeout` is a shell function
+  # in this file, so `command -v timeout` is always true here and the else arm of
+  # both collectors is otherwise never executed -- a broken redirect or a lost
+  # `</dev/null` in there would surface only on a runner without coreutils, which
+  # is the one machine the arm exists for.
+  tmp=$(mktemp -d)
+  mkdir -p "$tmp/bin"
+  for c in sh mkdir date cat grep sed awk rm mv printf; do
+    for d in /bin /usr/bin /usr/local/bin /opt/homebrew/bin /sbin /usr/sbin; do
+      if [ -x "$d/$c" ]; then
+        ln -sf "$d/$c" "$tmp/bin/$c"
+        break
+      fi
+    done
+  done
+  for c in sh mkdir date cat grep rm; do
+    if [ ! -x "$tmp/bin/$c" ]; then
+      echo "FAIL: could not stage $c in the stripped PATH; the check below would be vacuous" >&2
+      return 1
+    fi
+  done
+  if [ -e "$tmp/bin/timeout" ]; then
+    echo "FAIL: timeout leaked into the stripped PATH; this test would prove nothing" >&2
+    return 1
+  fi
+  stage_proc_stat "$tmp/proc-stat"
+  stage_sandbox_proc "$tmp/proc"
+  rc=0
+
+  # PATH is narrowed INSIDE the subprocess rather than in front of it: the shell
+  # resolves the command name with the PATH the assignment sets, so a stripped
+  # PATH in front of `bash` cannot find bash itself. The same trap the KVM suite
+  # documents beside its own stripped-PATH test.
+  out=$( ( set +x
+    bash -c '
+      . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+      COZY_REPORT_DIR='"$tmp"'/report
+      COZY_SNAPSHOT_NAME=runner-cpu-smoke
+      COZY_DIAG_RUNNER_PROC_STAT='"$tmp"'/proc-stat
+      COZY_DIAG_SANDBOX_PROC='"$tmp"'/proc
+      PATH='"$tmp"'/bin
+      cozy_capture_runner_kernel_cpu_time 1
+      cozy_capture_sandbox_qemu_thread_cpu 1
+    ' ) 2>&1 ) || rc=$?
+
+  [ "$rc" -eq 0 ] || {
+    echo "FAIL: the collectors ended $rc with no timeout on PATH; the warning promises they keep collecting" >&2
+    printf '%s\n' "$out" >&2
+    false
+  }
+  assert_file_contains 'cpu  9000000' \
+    "$tmp/report/snapshots/runner-cpu-smoke/runner-kernel-cpu-time/sample-1/proc-stat.txt"
+  assert_file_contains 'process 101' \
+    "$tmp/report/snapshots/runner-cpu-smoke/sandbox-qemu-thread-cpu/sample-1/qemu-threads.txt"
+  # And each capture says so itself. The phase warning that names unbounded
+  # collectors fires inside the diagnostics phase, and two of this pair's three
+  # call sites run outside it, so a capture that ran with no ceiling and stayed
+  # quiet about it would read exactly like a bounded one.
+  assert_file_contains '[bounds] timeout is not on PATH here' \
+    "$tmp/report/snapshots/runner-cpu-smoke/runner-kernel-cpu-time/sample-1/proc-stat.txt"
+  assert_file_contains '[bounds] timeout is not on PATH here' \
+    "$tmp/report/snapshots/runner-cpu-smoke/sandbox-qemu-thread-cpu/sample-1/qemu-threads.txt"
+  rm -rf "$tmp"
+}
+
+@test "a pid file that never yields a byte cannot hold the capture" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  timeout_calls="$tmp/timeout.calls"
+  stage "$tmp"
+  # A FIFO with no writer: `[ -r ]` passes on it and the shell redirect open
+  # would block forever, outside anything a wrapper can cover -- which is why
+  # the read is an external cat under the read ceiling instead. Staged with a
+  # low ceiling so the bounded path is what the test exercises; the outer
+  # timeout is the M20 lesson from the identity suite -- a mutant that removes
+  # the bound must fail this test, not hang the whole run.
+  mkdir -p "$tmp/vmroot/srv1" "$tmp/vmroot/srv2"
+  printf '101\n' >"$tmp/vmroot/srv1/qemu.pid"
+  mkfifo "$tmp/vmroot/srv2/qemu.pid"
+  COZY_DIAG_SANDBOX_VM_ROOT="$tmp/vmroot"
+  COZY_DIAG_READ_TIMEOUT=1
+  COZY_DIAG_READ_GRACE=1
+  rc=0
+
+  out=$( ( set +x; command timeout 20 bash -c '
+      . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+      COZY_REPORT_DIR="'"$tmp"'/report"
+      COZY_SNAPSHOT_NAME=runner-cpu-smoke
+      COZY_DIAG_SANDBOX_PROC="'"$tmp"'/proc"
+      COZY_DIAG_SANDBOX_VM_ROOT="'"$tmp"'/vmroot"
+      COZY_DIAG_READ_TIMEOUT=1
+      COZY_DIAG_READ_GRACE=1
+      cozy_capture_sandbox_qemu_thread_cpu 1
+    ' ) 2>&1 ) || rc=$?
+  [ "$rc" -eq 0 ] || [ "$rc" -eq 124 ] || {
+    echo "FAIL: the capture ended $rc; its output follows"
+    printf '%s\n' "$out"
+    false
+  }
+
+  [ "$rc" -ne 124 ] || {
+    echo "FAIL: the capture hung on the FIFO until the outer timeout killed it"
+    false
+  }
+  capture=$(threads_path)
+  assert_file_contains '[process 101 is srv1]' "$capture"
+  assert_file_lacks_pattern 'is srv2' "$capture"
+  assert_file_contains 'had no usable pid file' "$capture"
+  rm -rf "$tmp"
+}
diff --git a/hack/run-kubernetes-sandbox-cpu-time_test.bats b/hack/run-kubernetes-sandbox-cpu-time_test.bats
new file mode 100644
index 0000000000..0cd1bace4b
--- /dev/null
+++ b/hack/run-kubernetes-sandbox-cpu-time_test.bats
@@ -0,0 +1,606 @@
+#!/usr/bin/env bats
+# Regression coverage for the sandbox node CPU time capture in
+# hack/e2e-chainsaw/_lib/run-kubernetes.sh. cozytest.sh ends an @test block at
+# the first bare closing brace, so command mocks stay at top level.
+#
+# What this capture answers, and why nothing beside it answers the same thing:
+# the worker captures describe a cgroup, so they can say what the tenant worker
+# was allowed and what it consumed, and they are blind to the layer under the
+# sandbox. A guest that is runnable and never scheduled looks from the cgroup
+# like a guest that asked for nothing. Whether the sandbox node itself was given
+# its turn is recorded in one place only -- the steal column of its own
+# /proc/stat -- and the kubelet endpoints this tree already reads do not carry
+# it. So the failure this suite guards against is not a wrong number; it is an
+# empty directory, which reads as a sandbox that lost no time while nothing was
+# ever asked.
+
+load test_helper
+
+kubectl_calls=/dev/null
+kubectl_rows='srv1|192.0.2.11'
+kubectl_list_rc=0
+kubectl_list_stderr=
+talosctl_calls=/dev/null
+talosctl_rc=0
+talosctl_stderr=
+talosctl_output='cpu  10 0 5 900 1 0 0 7 4000 0
+cpu0 10 0 5 900 1 0 0 7 4000 0'
+timeout_calls=/dev/null
+timeout_fail_node=
+
+kubectl() {
+  printf '%s\n' "$*" >>"${kubectl_calls}"
+  [ -z "${kubectl_list_stderr}" ] || printf '%s\n' "${kubectl_list_stderr}" >&2
+  [ "${kubectl_list_rc}" -eq 0 ] || return "${kubectl_list_rc}"
+  # Quoted, or the mock decides the shape of the answer before the code under
+  # test sees it: jsonpath puts a dual-stack node's two addresses in one field,
+  # separated by a space, and an unquoted expansion splits that into two rows
+  # here -- which is exactly the input the walk has a branch for, and the branch
+  # would then be unreachable from this suite.
+  [ -z "${kubectl_rows}" ] || printf '%s\n' "${kubectl_rows}"
+  return 0
+}
+
+talosctl() {
+  printf '%s\n' "$*" >>"${talosctl_calls}"
+  [ -z "${talosctl_stderr}" ] || printf '%s\n' "${talosctl_stderr}" >&2
+  # Output before the status, because a read cut off part way has already
+  # written what it managed to read. A mock that returned first could only ever
+  # produce empty-plus-failure, leaving the arm that labels a partial capture
+  # unreachable in tests while being the likeliest one in production.
+  [ -z "${talosctl_output}" ] || printf '%s\n' "${talosctl_output}"
+  return "${talosctl_rc}"
+}
+
+timeout() {
+  local command_rc=0
+  printf '%s\n' "$*" >>"${timeout_calls}"
+  # Return 97 rather than running the command when the wrapper is not the
+  # bounded form: a read that lost its ceiling must not pass as a read.
+  [ "${1:-}" = -k ] || return 97
+  shift 3
+  "$@" || command_rc=$?
+  if [ -n "${timeout_fail_node}" ]; then
+    case " $* " in
+      *"${timeout_fail_node}"*) return 124 ;;
+    esac
+  fi
+  return "${command_rc}"
+}
+
+assert_file_contains() {
+  local needle="$1"
+  local file="$2"
+
+  if [ ! -f "${file}" ]; then
+    printf 'expected %s to exist so it could be checked for: %s\n' "${file}" "${needle}" >&2
+    return 1
+  fi
+  case "$(cat "${file}")" in
+    *"${needle}"*) return 0 ;;
+  esac
+  printf 'expected %s to contain: %s\n' "${file}" "${needle}" >&2
+  return 1
+}
+
+assert_file_lacks_pattern() {
+  local pattern="$1"
+  local file="$2"
+
+  # A missing file must fail rather than vacuously pass: a bare `! grep -q`
+  # succeeds on an unreadable path, which is indistinguishable from "the file
+  # exists and does not carry the label".
+  if [ ! -f "${file}" ]; then
+    printf 'expected %s to exist so it could be checked for: %s\n' "${file}" "${pattern}" >&2
+    return 1
+  fi
+  # Branched on awk's exact status. awk exits 1 for "no line matched" and 2 for
+  # "I could not evaluate this"; folded together, a negative assertion is
+  # satisfied by its own matcher giving up, which is the direction that goes
+  # green and stays green.
+  local _rc=0
+  awk -v pattern="${pattern}" '$0 ~ pattern { found = 1 } END { exit found ? 0 : 1 }' "${file}" || _rc=$?
+  case "${_rc}" in
+    0)
+      printf 'expected %s not to match: %s\n' "${file}" "${pattern}" >&2
+      return 1
+      ;;
+    1) return 0 ;;
+    *)
+      printf 'awk could not evaluate pattern %s against %s\n' "${pattern}" "${file}" >&2
+      return 1
+      ;;
+  esac
+}
+
+# The function under test redirects a command's stderr into a report file and
+# decides which artifact to write from it. cozytest.sh runs under `set -x`, so
+# the tracer's own line for that command lands on the very stderr being
+# redirected, and every assertion about those files would be reading the
+# tracer. Call through this wrapper so the sinks hold what production writes.
+run_capture() {
+  local _rc=0
+  ( set +x; cozy_capture_sandbox_node_cpu_time "${1:-1}" ) || _rc=$?
+  return "${_rc}"
+}
+
+stage() {
+  COZY_REPORT_DIR="$1/report"
+  COZY_SNAPSHOT_NAME=steal-smoke
+  printf 'context: e2e\n' >"$1/talosconfig"
+  export TALOSCONFIG="$1/talosconfig"
+}
+
+@test "the node's own CPU accounting is read over the Talos API" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  talosctl_calls="$tmp/talosctl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  stage "$tmp"
+
+  run_capture
+
+  # The endpoint and the node are both the address, because the e2e talosconfig
+  # carries no endpoints: one without the other reaches nothing at all.
+  assert_file_contains '-e 192.0.2.11 -n 192.0.2.11 read /proc/stat' "$talosctl_calls"
+  capture="$COZY_REPORT_DIR/snapshots/steal-smoke/sandbox-host-cpu-time/sample-1/srv1.txt"
+  assert_file_contains 'cpu  10 0 5 900 1 0 0 7 4000 0' "$capture"
+  assert_file_lacks_pattern 'unknown' "$capture"
+  assert_file_lacks_pattern 'incomplete' "$capture"
+  rm -rf "$tmp"
+}
+
+@test "the column legend travels with the numbers" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  talosctl_calls="$tmp/talosctl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  stage "$tmp"
+
+  run_capture
+
+  # /proc/stat carries no header, and the two columns that matter here sit next
+  # to each other: steal is the eighth number after the label and guest is the
+  # ninth. Guest is large on a node running VMs and is already counted inside
+  # user, so reading the ninth as the eighth turns a fraction of a percent into
+  # twenty-odd -- which has already happened once against these nodes. The
+  # legend is what stops the next reader repeating it, and it is only useful
+  # where the numbers are.
+  capture="$COZY_REPORT_DIR/snapshots/steal-smoke/sandbox-host-cpu-time/sample-1/srv1.txt"
+  assert_file_contains 'The eighth number is steal and the ninth is guest' "$capture"
+  # The pairing instruction rides with the legend, on the one arm that holds a
+  # whole reading, and so does the claim that counters were sampled inside the
+  # brackets -- the stamp itself only says when the read was attempted.
+  assert_file_contains 'subtracting this node file from its sibling' "$capture"
+  assert_file_contains 'counters were sampled somewhere inside each read' "$capture"
+  rm -rf "$tmp"
+}
+
+@test "each reading records when it was taken" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  talosctl_calls="$tmp/talosctl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  stage "$tmp"
+
+  run_capture
+
+  # Here the stamp is the only timing there is. A cAdvisor row carries its own
+  # sample time; a /proc/stat row carries none, so without this the gap between
+  # two readings of a node is unrecoverable from the artifact and a steal rate
+  # would have to be computed from a number the block does not promise.
+  capture="$COZY_REPORT_DIR/snapshots/steal-smoke/sandbox-host-cpu-time/sample-1/srv1.txt"
+  assert_file_contains 'read attempted from' "$capture"
+  # Both ends, for the reason the sibling suite states: one stamp hides the read
+  # duration inside the interval, and that duration is the variable this
+  # collector is deployed against.
+  stamp=$(sed -n 's/.*read attempted from \([0-9][0-9]*\) to \([0-9][0-9]*\) epoch seconds.*/\1 \2/p' "$capture")
+  if [ -z "$stamp" ]; then
+    echo "expected a bare epoch stamp in $capture" >&2
+    cat "$capture" >&2
+    return 1
+  fi
+  rm -rf "$tmp"
+}
+
+@test "each read is bounded and keeps its exit code" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  talosctl_calls="$tmp/talosctl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  stage "$tmp"
+
+  run_capture
+
+  # An unbounded read here would hold the whole diagnostics block against a node
+  # whose Talos API is up but wedged, and the phase budget bounds when a read
+  # may START, never how long one already running may take. Named by their verbs
+  # rather than by the bound, because both carry the same one and a bare check
+  # for it would be satisfied twice by whichever read survived.
+  assert_file_contains '-k 5 20 kubectl get nodes' "$timeout_calls"
+  assert_file_contains '-k 5 20 talosctl' "$timeout_calls"
+  assert_file_contains '--request-timeout=20s' "$kubectl_calls"
+  assert_file_contains '[capture exit code: 0]' \
+    "$COZY_REPORT_DIR/snapshots/steal-smoke/sandbox-host-cpu-time/sample-1/srv1.txt"
+  rm -rf "$tmp"
+}
+
+@test "a lowered read budget moves both of this collector's bounds" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  talosctl_calls="$tmp/talosctl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  stage "$tmp"
+  # Set after sourcing, which is how a caller and a test both set it. A value
+  # read only at assignment time would reach `timeout` unchecked here.
+  COZY_DIAG_READ_TIMEOUT=4
+
+  run_capture
+
+  assert_file_contains '-k 5 4 kubectl get nodes' "$timeout_calls"
+  assert_file_contains '-k 5 4 talosctl' "$timeout_calls"
+  assert_file_contains '--request-timeout=4s' "$kubectl_calls"
+  rm -rf "$tmp"
+}
+
+@test "a zero read budget is corrected rather than disabling the bound" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  talosctl_calls="$tmp/talosctl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  stage "$tmp"
+  # `timeout -k 5 0` disables the timeout outright, so a zero assigned after
+  # sourcing would restore the unbounded read this bound exists to remove.
+  COZY_DIAG_READ_TIMEOUT=0
+
+  run_capture
+
+  assert_file_lacks_pattern '^-k 5 0 ' "$timeout_calls"
+  assert_file_contains "-k 5 $COZY_DIAG_READ_TIMEOUT_DEFAULT talosctl" "$timeout_calls"
+  rm -rf "$tmp"
+}
+
+@test "no talosctl on PATH is recorded rather than left as an empty directory" {
+  # A subprocess with a stripped PATH, because this file mocks `talosctl` as a
+  # shell function and `command -v` finds functions -- the arm cannot be reached
+  # from inside a test body. Same device the sibling suites use, and the PATH is
+  # staged rather than emptied: the collector shells out before it gets to the
+  # check, so an empty PATH would fail this for the wrong reason and read as the
+  # arm being broken.
+  tmp=$(mktemp -d)
+  mkdir -p "$tmp/bin"
+  for c in mkdir grep mv rm; do
+    for d in /bin /usr/bin /usr/local/bin /opt/homebrew/bin; do
+      if [ -x "$d/$c" ]; then
+        ln -sf "$d/$c" "$tmp/bin/$c"
+        break
+      fi
+    done
+    if [ ! -x "$tmp/bin/$c" ]; then
+      echo "FAIL: could not stage $c in the stripped PATH; the check below would be vacuous" >&2
+      return 1
+    fi
+  done
+  if [ -e "$tmp/bin/talosctl" ]; then
+    echo "FAIL: talosctl leaked into the stripped PATH; this test would prove nothing" >&2
+    return 1
+  fi
+  printf 'context: e2e\n' >"$tmp/talosconfig"
+  rc=0
+
+  # Assigned inside the subprocess rather than in front of it: bash resolves the
+  # command name with the PATH the assignment sets, so `PATH=... bash` cannot
+  # find bash itself.
+  out=$(bash -c '
+    set -eu
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    COZY_REPORT_DIR='"$tmp"'/report
+    COZY_SNAPSHOT_NAME=steal-smoke
+    TALOSCONFIG='"$tmp"'/talosconfig
+    PATH='"$tmp"'/bin
+    cozy_capture_sandbox_node_cpu_time 1
+  ' 2>&1) || rc=$?
+  printf '%s\n' "$out" >"$tmp/out"
+
+  [ "$rc" -ne 0 ]
+  marker="$tmp/report/snapshots/steal-smoke/sandbox-host-cpu-time/sample-1/COLLECTION-FAILED.txt"
+  assert_file_contains 'talosctl is not on PATH' "$marker"
+  # The distinction the marker exists for, spelled out in the artifact: a tool
+  # that was never run says nothing about the nodes, and the reading a missing
+  # file invites is that they lost no time.
+  assert_file_contains 'not a reading that they lost no time' "$marker"
+  rm -rf "$tmp"
+}
+
+@test "no talosconfig is recorded as a config that was missing, not as a node that refused" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  talosctl_calls="$tmp/talosctl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  stage "$tmp"
+  export TALOSCONFIG="$tmp/absent"
+  rc=0
+
+  run_capture || rc=$?
+
+  [ "$rc" -ne 0 ]
+  assert_file_contains 'no sandbox talosconfig at' \
+    "$COZY_REPORT_DIR/snapshots/steal-smoke/sandbox-host-cpu-time/sample-1/COLLECTION-FAILED.txt"
+  # And nothing was asked, so no per-node file may claim otherwise.
+  [ ! -f "$COZY_REPORT_DIR/snapshots/steal-smoke/sandbox-host-cpu-time/sample-1/srv1.txt" ]
+  rm -rf "$tmp"
+}
+
+@test "a node listing that failed is not reported as a cluster with no nodes" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  talosctl_calls="$tmp/talosctl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  stage "$tmp"
+  kubectl_list_rc=1
+  kubectl_list_stderr='error: You must be logged in to the server (Unauthorized)'
+  rc=0
+
+  run_capture || rc=$?
+
+  [ "$rc" -ne 0 ]
+  marker="$COZY_REPORT_DIR/snapshots/steal-smoke/sandbox-host-cpu-time/sample-1/COLLECTION-FAILED.txt"
+  assert_file_contains 'failed to list sandbox nodes' "$marker"
+  # The status alone names none of the ways a listing fails -- Unauthorized, a
+  # refused connection and an unrecognised kind are all exit 1 -- so the stderr
+  # that says which is kept.
+  assert_file_contains 'Unauthorized' "$marker"
+  rm -rf "$tmp"
+}
+
+@test "a warning on a successful listing is kept apart from a failure" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  talosctl_calls="$tmp/talosctl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  stage "$tmp"
+  # kubectl writes deprecation and partial-result warnings on stderr with a zero
+  # exit, so which file stderr lands in is decided by the status and not by
+  # something having been written.
+  kubectl_list_stderr='Warning: v1 Node is deprecated'
+  dir="$COZY_REPORT_DIR/snapshots/steal-smoke/sandbox-host-cpu-time/sample-1"
+
+  run_capture
+
+  assert_file_contains 'Warning: v1 Node is deprecated' "$dir/READ-WARNINGS.txt"
+  [ ! -f "$dir/COLLECTION-FAILED.txt" ]
+  rm -rf "$tmp"
+}
+
+@test "a node with no InternalIP says why it was not asked" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  talosctl_calls="$tmp/talosctl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  stage "$tmp"
+  kubectl_rows='srv1|'
+
+  run_capture
+
+  # An absent file would be the same artifact as a node that was never listed.
+  # The Talos API is reached on that address, so its absence is the reason this
+  # node carries no numbers, and the reason is what the file holds.
+  assert_file_contains 'reports no InternalIP' \
+    "$COZY_REPORT_DIR/snapshots/steal-smoke/sandbox-host-cpu-time/sample-1/srv1.txt"
+  rm -rf "$tmp"
+}
+
+@test "a dual-stack node is one node, dialled on its first address" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  talosctl_calls="$tmp/talosctl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  stage "$tmp"
+  # jsonpath emits every matching address into the same field, space separated,
+  # so a node with an IPv4 and an IPv6 InternalIP arrives as one row carrying
+  # two addresses. Both halves of that are wrong if taken literally: the pair
+  # concatenated is not an address to dial, and the second one is not a node.
+  kubectl_rows='srv1|192.0.2.11 2001:db8::11
+srv2|192.0.2.12 2001:db8::12
+srv3|192.0.2.13 2001:db8::13
+srv4|192.0.2.14 2001:db8::14'
+
+  run_capture
+
+  assert_file_contains '-e 192.0.2.11 -n 192.0.2.11 read /proc/stat' "$talosctl_calls"
+  assert_file_lacks_pattern '2001:db8' "$talosctl_calls"
+  # And the count in the truncation marker is nodes, not addresses. The marker
+  # exists to say a short listing was truncated rather than small, so a total
+  # that counts each node twice is the one number in it that must not be wrong.
+  assert_file_contains 'capture stopped after 3 nodes; 4 were listed in total' \
+    "$COZY_REPORT_DIR/snapshots/steal-smoke/sandbox-host-cpu-time/sample-1/COLLECTION-TRUNCATED.txt"
+  rm -rf "$tmp"
+}
+
+@test "a node whose read timed out does not stop the next node" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  talosctl_calls="$tmp/talosctl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  stage "$tmp"
+  kubectl_rows='srv1|192.0.2.11
+srv2|192.0.2.12'
+  timeout_fail_node=192.0.2.11
+
+  run_capture
+
+  dir="$COZY_REPORT_DIR/snapshots/steal-smoke/sandbox-host-cpu-time/sample-1"
+  assert_file_contains '[capture exit code: 124]' "$dir/srv1.txt"
+  assert_file_contains 'cpu  10 0 5 900 1 0 0 7 4000 0' "$dir/srv2.txt"
+  rm -rf "$tmp"
+}
+
+@test "a read that never answered is recorded as unread, not as a node that lost nothing" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  talosctl_calls="$tmp/talosctl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  stage "$tmp"
+  talosctl_rc=1
+  talosctl_output=
+  talosctl_stderr='rpc error: code = Unavailable desc = connection error'
+
+  run_capture
+
+  capture="$COZY_REPORT_DIR/snapshots/steal-smoke/sandbox-host-cpu-time/sample-1/srv1.txt"
+  assert_file_contains 'is unknown: the Talos API was not read' "$capture"
+  # This file holds no counters at all, so a reader following a pairing
+  # instruction here would subtract nothing from a healthy sibling and read that
+  # sibling's whole cumulative value as the delta -- steal inflated to the node's
+  # entire uptime, manufacturing the finding this collector looks for.
+  assert_file_lacks_pattern 'subtracting this node file from its sibling' "$capture"
+  # Nor may the stamp assert that anything was sampled between its two instants.
+  # When the read was attempted is true on every arm; that counters exist inside
+  # that bracket is exactly what this arm has just denied, and two consecutive
+  # lines contradicting each other is the reading failure this tree is written
+  # against.
+  assert_file_lacks_pattern 'counters were sampled' "$capture"
+  assert_file_contains 'read attempted from' "$capture"
+  # The note has to name a file that exists. There is no bare read-error.log in
+  # the directory -- each is named for its node, and the walk writes one per
+  # node -- so a note pointing at the bare name sends the reader after an
+  # artifact that was never written, which is the same harm as silence reported
+  # as an answer, one indirection out.
+  assert_file_contains 'beside this file, named for the same node' "$capture"
+  assert_file_contains 'connection error' \
+    "$COZY_REPORT_DIR/snapshots/steal-smoke/sandbox-host-cpu-time/sample-1/srv1.read-error.log"
+  rm -rf "$tmp"
+}
+
+@test "a read killed without a word does not point at a file that was never written" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  talosctl_calls="$tmp/talosctl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  stage "$tmp"
+  # `timeout` SIGKILLs its child, so the dominant failure arrives non-zero with
+  # nothing on either stream. A note naming an error log here sends the reader
+  # after evidence that does not exist.
+  talosctl_rc=1
+  talosctl_output=
+  talosctl_stderr=
+
+  run_capture
+
+  capture="$COZY_REPORT_DIR/snapshots/steal-smoke/sandbox-host-cpu-time/sample-1/srv1.txt"
+  assert_file_contains 'died without a word on either stream' "$capture"
+  [ ! -f "$COZY_REPORT_DIR/snapshots/steal-smoke/sandbox-host-cpu-time/sample-1/srv1.read-error.log" ]
+  rm -rf "$tmp"
+}
+
+@test "a read cut off part way is marked incomplete rather than presented whole" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  talosctl_calls="$tmp/talosctl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  stage "$tmp"
+  # Output arrived and the read still failed, which is what a stream cut off
+  # part way through looks like. Read as complete, its numbers are a smaller
+  # total over the same interval -- a steal figure biased toward zero, in the
+  # direction that ends the investigation.
+  talosctl_rc=124
+
+  run_capture
+
+  capture="$COZY_REPORT_DIR/snapshots/steal-smoke/sandbox-host-cpu-time/sample-1/srv1.txt"
+  assert_file_contains 'these counters are incomplete' "$capture"
+  # And the legend, which is a statement about a complete row, must not be
+  # attached to one that was truncated.
+  assert_file_lacks_pattern 'eighth number is steal' "$capture"
+  # Nor the instruction to pair it. A difference taken against a prefix
+  # understates the counter by whatever the read did not return, which for steal
+  # is the direction that says the node was given every turn it asked for.
+  assert_file_lacks_pattern 'subtracting this node file from its sibling' "$capture"
+  rm -rf "$tmp"
+}
+
+@test "a read that succeeded and returned nothing is not filed as a reading" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  talosctl_calls="$tmp/talosctl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  stage "$tmp"
+  talosctl_output=
+
+  run_capture
+
+  capture="$COZY_REPORT_DIR/snapshots/steal-smoke/sandbox-host-cpu-time/sample-1/srv1.txt"
+  assert_file_contains 'the read succeeded and returned nothing' "$capture"
+  rm -rf "$tmp"
+}
+
+@test "the walk is capped and names both counts when it stops" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  talosctl_calls="$tmp/talosctl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  stage "$tmp"
+  kubectl_rows='srv1|192.0.2.11
+srv2|192.0.2.12
+srv3|192.0.2.13
+srv4|192.0.2.14'
+
+  run_capture
+
+  # A short listing otherwise reads as a small cluster rather than a truncated
+  # walk, so a cap that fired is recorded with both counts.
+  assert_file_contains 'capture stopped after 3 nodes; 4 were listed in total' \
+    "$COZY_REPORT_DIR/snapshots/steal-smoke/sandbox-host-cpu-time/sample-1/COLLECTION-TRUNCATED.txt"
+  [ ! -f "$COZY_REPORT_DIR/snapshots/steal-smoke/sandbox-host-cpu-time/sample-1/srv4.txt" ]
+  rm -rf "$tmp"
+}
+
+@test "a cluster within the cap leaves no truncation marker" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  talosctl_calls="$tmp/talosctl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  stage "$tmp"
+
+  run_capture
+
+  [ ! -f "$COZY_REPORT_DIR/snapshots/steal-smoke/sandbox-host-cpu-time/sample-1/COLLECTION-TRUNCATED.txt" ]
+  rm -rf "$tmp"
+}
+
+@test "the sample number decides which reading a file belongs to" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  talosctl_calls="$tmp/talosctl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  stage "$tmp"
+
+  run_capture 2
+
+  # The pair is the instrument and the counters are cumulative, so a second
+  # reading written over the first leaves one file and no interval -- collected,
+  # and unable to answer the question it was collected for.
+  assert_file_contains 'cpu  10 0 5 900 1 0 0 7 4000 0' \
+    "$COZY_REPORT_DIR/snapshots/steal-smoke/sandbox-host-cpu-time/sample-2/srv1.txt"
+  [ ! -d "$COZY_REPORT_DIR/snapshots/steal-smoke/sandbox-host-cpu-time/sample-1" ]
+  rm -rf "$tmp"
+}
diff --git a/hack/run-kubernetes-schedulable_test.bats b/hack/run-kubernetes-schedulable_test.bats
new file mode 100644
index 0000000000..cfd09bc27f
--- /dev/null
+++ b/hack/run-kubernetes-schedulable_test.bats
@@ -0,0 +1,338 @@
+#!/usr/bin/env bats
+# -----------------------------------------------------------------------------
+# Unit tests for cozy_node_accepts_pods and cozy_has_schedulable_node in
+# hack/e2e-chainsaw/_lib/run-kubernetes.sh
+#
+# Together they are the pure exit-condition of the tenant scheduling gate
+# (cozy_wait_schedulable_node), which runs before the backend workload is
+# created so that scheduling delay is charged to its own budget instead of the
+# workload's readiness budget. The input is the capture of
+#   kubectl get nodes --no-headers -o custom-columns=NAME,READY,UNSCHEDULABLE,TAINTS
+# where TAINTS is `.spec.taints[*].effect`, so custom-columns renders an absent
+# field as the literal "<none>" and joins several effects with a comma. The
+# rows below are shaped exactly as kubectl emits them.
+#
+# The predicate is the scheduler's own rule for a Pod with no tolerations:
+# Ready, not SchedulingDisabled, and no NoSchedule/NoExecute taint.
+# PreferNoSchedule only lowers the node's score and must not block.
+#
+# CI runs this file under Bats through `make bats-unit-tests`. It also remains
+# compatible with the legacy `hack/cozytest.sh` translator, whose awk parser
+# recognizes only @test blocks and a bare `}` on its own line. The tests avoid
+# `run` and `$status` for that compatibility path and use direct shell assertions.
+#
+# Run with: bats hack/run-kubernetes-schedulable_test.bats
+# -----------------------------------------------------------------------------
+
+load test_helper
+
+@test "a Ready node with no taints accepts pods" {
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    if ! cozy_node_accepts_pods True '<none>' '<none>'; then
+        echo "expected a Ready, untainted, schedulable node to accept pods" >&2
+        exit 1
+    fi
+}
+
+@test "a NotReady node does not accept pods" {
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    if cozy_node_accepts_pods False '<none>' '<none>'; then
+        echo "expected a node whose Ready condition is False to be rejected" >&2
+        exit 1
+    fi
+}
+
+@test "an Unknown Ready condition does not accept pods" {
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    if cozy_node_accepts_pods Unknown '<none>' '<none>'; then
+        echo "expected a node whose Ready condition is Unknown to be rejected" >&2
+        exit 1
+    fi
+}
+
+@test "a cordoned node does not accept pods" {
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    if cozy_node_accepts_pods True true '<none>' ; then
+        echo "expected a node with .spec.unschedulable=true to be rejected" >&2
+        exit 1
+    fi
+}
+
+@test "a NoSchedule taint does not accept pods" {
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    if cozy_node_accepts_pods True '<none>' NoSchedule; then
+        echo "expected a NoSchedule-tainted node to be rejected" >&2
+        exit 1
+    fi
+}
+
+@test "a NoExecute taint does not accept pods" {
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    if cozy_node_accepts_pods True '<none>' NoExecute; then
+        echo "expected a NoExecute-tainted node to be rejected" >&2
+        exit 1
+    fi
+}
+
+@test "a blocking effect anywhere in a comma-joined list is found" {
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    if cozy_node_accepts_pods True '<none>' PreferNoSchedule,NoExecute; then
+        echo "expected a trailing NoExecute in a joined effect list to be found" >&2
+        exit 1
+    fi
+    if cozy_node_accepts_pods True '<none>' NoSchedule,PreferNoSchedule; then
+        echo "expected a leading NoSchedule in a joined effect list to be found" >&2
+        exit 1
+    fi
+}
+
+@test "PreferNoSchedule alone still accepts pods" {
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    if ! cozy_node_accepts_pods True '<none>' PreferNoSchedule; then
+        echo "expected PreferNoSchedule to lower the score, not block scheduling" >&2
+        exit 1
+    fi
+    if ! cozy_node_accepts_pods True '<none>' PreferNoSchedule,PreferNoSchedule; then
+        echo "expected several PreferNoSchedule taints not to block scheduling" >&2
+        exit 1
+    fi
+}
+
+@test "a Ready untainted node reports the tenant schedulable" {
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    nodes=$(printf '%s\n' \
+        'kubernetes-test-latest-version-md0-abcde   True   <none>   <none>')
+    if ! cozy_has_schedulable_node "$nodes"; then
+        echo "expected a Ready, untainted node to release the gate" >&2
+        exit 1
+    fi
+}
+
+@test "the observed cilium/cordon node pair reports not-schedulable" {
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    nodes=$(printf '%s\n%s\n' \
+        'kubernetes-test-latest-version-md0-abcde   True   <none>   NoSchedule' \
+        'kubernetes-test-latest-version-md0-fghij   True   true     NoSchedule')
+    if cozy_has_schedulable_node "$nodes"; then
+        echo "expected agent-not-ready + SchedulingDisabled nodes to hold the gate" >&2
+        exit 1
+    fi
+}
+
+@test "one free node among blocked ones reports schedulable" {
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    nodes=$(printf '%s\n%s\n' \
+        'kubernetes-test-latest-version-md0-abcde   True   <none>   NoSchedule' \
+        'kubernetes-test-latest-version-md0-fghij   True   <none>   <none>')
+    if ! cozy_has_schedulable_node "$nodes"; then
+        echo "expected the second, untainted node to release the gate" >&2
+        exit 1
+    fi
+}
+
+@test "a node still becoming Ready reports not-schedulable" {
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    nodes=$(printf '%s\n' \
+        'kubernetes-test-latest-version-md0-abcde   False   <none>   NoSchedule,NoExecute')
+    if cozy_has_schedulable_node "$nodes"; then
+        echo "expected a NotReady node to hold the gate" >&2
+        exit 1
+    fi
+}
+
+@test "an empty capture is never misread as schedulable" {
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    if cozy_has_schedulable_node ""; then
+        echo "expected a failed or empty node probe to hold the gate" >&2
+        exit 1
+    fi
+}
+
+@test "a whitespace-only capture is never misread as schedulable" {
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    blank=$(printf '\n   \n')
+    if cozy_has_schedulable_node "$blank"; then
+        echo "expected a blank node probe to hold the gate" >&2
+        exit 1
+    fi
+}
+
+@test "the scheduling gate runs before the backend Deployment is applied" {
+    lib=hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    # Ordering is the fix: a gate placed after the apply would charge the
+    # scheduling delay to the workload's readiness budget again, which is the
+    # arrangement that failed. Nothing else in the suite can catch that.
+    gate=$(grep -n 'cozy_wait_schedulable_node "tenantkubeconfig-' "$lib" | head -n 1 | cut -d: -f1)
+    deploy=$(grep -n 'name: "\${test_name}-backend"' "$lib" | head -n 1 | cut -d: -f1)
+    if [ -z "$gate" ]; then
+        echo "expected run_kubernetes_test to gate on a schedulable tenant node" >&2
+        exit 1
+    fi
+    if [ -z "$deploy" ]; then
+        echo "expected to find the backend Deployment in $lib" >&2
+        exit 1
+    fi
+    if [ "$gate" -ge "$deploy" ]; then
+        echo "expected the scheduling gate (line $gate) before the backend Deployment (line $deploy)" >&2
+        exit 1
+    fi
+}
+
+@test "the scheduling gate diagnostics read through the bounded helper" {
+    lib=hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    # This branch ends in the exit that triggers the tenant crust-gather
+    # snapshot, and it reads the node table through the tenant kubeconfig -- a
+    # tenant whose nodes are Ready but unschedulable is one whose apiserver may
+    # or may not answer. An unbounded read here holds the Chainsaw op to its
+    # ceiling and the snapshot after it is lost rather than truncated, which is
+    # a property of the source and not of any function this suite can call.
+    head=$(grep -n 'tenant scheduling gate failed' "$lib" | head -n 1 | cut -d: -f1)
+    if [ -z "$head" ]; then
+        echo "expected the scheduling gate to announce its own failure" >&2
+        exit 1
+    fi
+    tail_line=$(awk -v s="$head" 'NR > s && $0 ~ /^ *exit 1$/ { print NR; exit }' "$lib")
+    if [ -z "$tail_line" ]; then
+        echo "expected the scheduling gate diagnostics to end in exit 1" >&2
+        exit 1
+    fi
+    # Continuations are folded first: a bounded read wrapped across lines puts
+    # `kubectl` at the start of its second line, so scanning raw lines would
+    # report every bounded read as an unbounded one.
+    block=$(awk -v s="$head" -v e="$tail_line" 'NR > s && NR < e' "$lib" \
+        | awk '{ line = line $0
+                 if (line ~ /\\$/) { sub(/\\$/, " ", line); next }
+                 print line; line = "" }
+               END { if (line != "") print line }')
+    bare=$(printf '%s\n' "$block" | grep -nE '^[[:space:]]*kubectl ' || true)
+    if [ -n "$bare" ]; then
+        echo "these scheduling gate reads run with no wall-clock bound:" >&2
+        printf '%s\n' "$bare" >&2
+        exit 1
+    fi
+    # Not vacuous: the block still reads the two things it exists to read. Counted as
+    # invocations at the start of a line, not as mentions -- naming the helper in a
+    # comment must not move a count of calls.
+    bounded=$(printf '%s\n' "$block" | grep -cE '^[[:space:]]*cozy_diag_read ' || true)
+    if [ "$bounded" -ne 2 ]; then
+        echo "expected 2 bounded reads in the scheduling gate diagnostics, found $bounded" >&2
+        exit 1
+    fi
+}
+
+@test "the tenant backend workload image is pinned by digest" {
+    lib=hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    # The tenant workers reach no registry mirror, so this image is fetched
+    # from Docker Hub inside the readiness budget on every run. A floating tag
+    # puts content of unknown size under a fixed deadline.
+    ref=$(grep -E '^[[:space:]]*image: nginx' "$lib" | head -n 1)
+    if [ -z "$ref" ]; then
+        echo "expected the backend workload to declare an nginx image" >&2
+        exit 1
+    fi
+    case "$ref" in
+        *@sha256:*) ;;
+        *)  echo "expected the backend workload image to be pinned by digest: $ref" >&2
+            exit 1 ;;
+    esac
+}
+
+@test "the probe asks for the columns in the order the predicate parses them" {
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    # A shell function shadows the PATH lookup, so the gate's own kubectl call
+    # lands here with no stub binary and nothing to put on PATH. The gate reads
+    # the probe through a command substitution, which is a subshell, so what
+    # the stub records has to travel through a file rather than a variable.
+    argfile=$(mktemp)
+    kubectl() {
+        printf '%s\n' "$*" > "$argfile"
+        printf 'kubernetes-test-latest-version-md0-abcde   True   <none>   <none>\n'
+    }
+    cozy_wait_schedulable_node tenantkubeconfig-test-latest-version 0 > /dev/null
+    args=$(cat "$argfile")
+    rm -f "$argfile"
+    case "$args" in
+        *"--kubeconfig tenantkubeconfig-test-latest-version"*) ;;
+        *)  echo "expected the probe to carry the tenant kubeconfig: $args" >&2
+            exit 1 ;;
+    esac
+    case "$args" in
+        *--no-headers*) ;;
+        *)  echo "expected --no-headers, or a header row is parsed as a node: $args" >&2
+            exit 1 ;;
+    esac
+    # Column order is the predicate's argument order; reordering the query
+    # without reordering the parse would compare a taint effect against Ready.
+    case "$args" in
+        *'NAME:.metadata.name,READY:.status.conditions[?(@.type=="Ready")].status,UNSCHEDULABLE:.spec.unschedulable,TAINTS:.spec.taints[*].effect'*) ;;
+        *)  echo "expected NAME,READY,UNSCHEDULABLE,TAINTS in that order: $args" >&2
+            exit 1 ;;
+    esac
+}
+
+@test "the gate releases on a later poll once the taint clears" {
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    callfile=$(mktemp)
+    printf '0\n' > "$callfile"
+    kubectl() {
+        _calls=$(( $(cat "$callfile") + 1 ))
+        printf '%s\n' "$_calls" > "$callfile"
+        if [ "$_calls" -eq 1 ]; then
+            printf 'kubernetes-test-latest-version-md0-abcde   True   <none>   NoSchedule\n'
+        else
+            printf 'kubernetes-test-latest-version-md0-abcde   True   <none>   <none>\n'
+        fi
+    }
+    rc=0
+    cozy_wait_schedulable_node tenantkubeconfig-test-latest-version 60 > /dev/null || rc=$?
+    calls=$(cat "$callfile")
+    rm -f "$callfile"
+    if [ "$rc" -ne 0 ]; then
+        echo "expected the gate to release once the taint cleared" >&2
+        exit 1
+    fi
+    if [ "$calls" -lt 2 ]; then
+        echo "expected the gate to poll again rather than accept the first answer" >&2
+        exit 1
+    fi
+}
+
+@test "a tainted node holds the gate to its own deadline" {
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    kubectl() {
+        printf 'kubernetes-test-latest-version-md0-abcde   True   <none>   NoSchedule\n'
+    }
+    if cozy_wait_schedulable_node tenantkubeconfig-test-latest-version 0 > /dev/null 2>&1; then
+        echo "expected an elapsed deadline with a tainted node to fail the gate" >&2
+        exit 1
+    fi
+}
+
+@test "a failing probe holds the gate rather than releasing it" {
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    kubectl() {
+        echo 'Unable to connect to the server' >&2
+        return 1
+    }
+    if cozy_wait_schedulable_node tenantkubeconfig-test-latest-version 0 > /dev/null 2>&1; then
+        echo "expected an unreachable tenant API to hold the gate, not release it" >&2
+        exit 1
+    fi
+}
+
+@test "the scan reports a hit without exiting its caller" {
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    nodes=$(printf '%s\n' \
+        'kubernetes-test-latest-version-md0-abcde   True   <none>   <none>')
+    # The scan signals a hit with `exit 0`, which is contained only because it
+    # runs in the subshell on the right of a pipeline. Rewritten to read the
+    # capture in the current shell (a heredoc, say) that same `exit` would end
+    # the caller mid-test, silently skipping everything after the gate. The
+    # command substitution below is itself a subshell, so a leaked exit kills
+    # it before the marker is written.
+    reached=$( ( cozy_has_schedulable_node "$nodes"; printf reached ) )
+    if [ "$reached" != reached ]; then
+        echo "expected the scan to return to its caller, not exit it" >&2
+        exit 1
+    fi
+}
diff --git a/hack/run-kubernetes-serial-console_test.bats b/hack/run-kubernetes-serial-console_test.bats
new file mode 100644
index 0000000000..3dd91773d8
--- /dev/null
+++ b/hack/run-kubernetes-serial-console_test.bats
@@ -0,0 +1,1629 @@
+#!/usr/bin/env bats
+# Regression coverage for tenant-worker guest serial console capture in
+# hack/e2e-chainsaw/_lib/run-kubernetes.sh. cozytest.sh ends an @test block at
+# the first bare closing brace, so command mocks stay at top level.
+#
+# The capture exists for the one failure class no other collector reaches: a
+# worker that stalls in the guest before Talos apid answers. Its defining
+# property is therefore what it does NOT need — no talosctl, no reader
+# certificate, no helper Pod, nothing inside the guest. These tests pin that
+# property, because a capture that grew an in-guest dependency would still look
+# healthy while being blind to exactly the runs it was written for.
+
+load test_helper
+
+kubectl_calls=/dev/null
+kubectl_pod_names=
+kubectl_list_rc=0
+kubectl_list_stderr=
+kubectl_init_names=
+kubectl_init_rc=0
+kubectl_wedge_rows=
+kubectl_wedge_rc=0
+kubectl_wedge_stderr=
+mktemp_fail=0
+kubectl_logs_output='mock console output'
+kubectl_logs_rc=0
+kubectl_logs_stderr=
+kubectl_timeline_rows='name=virt-launcher-worker-a-11111 phase=Running podStartTime=2026-08-15T14:35:26Z computeStartedAt=2026-08-15T14:35:47Z consoleStartedAt=2026-08-15T14:35:47Z'
+kubectl_timeline_rc=0
+kubectl_timeline_stderr=
+talosctl_calls=/dev/null
+timeout_calls=/dev/null
+timeout_fail_pod=
+date_now=
+
+date() {
+  # Same shape the node-join suite uses: a fixed clock so the passing path's
+  # remaining-time arithmetic is decided by the test rather than by when it ran.
+  if [ -n "${date_now}" ] && [ "${1:-}" = +%s ]; then
+    printf '%s\n' "${date_now}"
+    return 0
+  fi
+  command date "$@"
+}
+
+kubectl() {
+  printf '%s\n' "$*" >>"${kubectl_calls}"
+
+  if [ "${3:-}" = get ] && [ "${4:-}" = pods ]; then
+    case "$*" in
+      *computeStartedAt*)
+        # Rows first, status after, so a cut-off read can be modelled as what it
+        # is: a prefix that arrived plus a non-zero status. Returning early on
+        # the status instead would make "failed" and "returned nothing" the same
+        # scenario, and the branch that tells them apart untestable.
+        #
+        # stderr is staged separately for the same reason every other arm here
+        # stages it: kubectl writes warnings beside a healthy read as well as
+        # errors beside a failed one, and which file those land in is decided by
+        # the status rather than by anything in the text.
+        [ -z "${kubectl_timeline_stderr}" ] || printf '%s\n' "${kubectl_timeline_stderr}" >&2
+        [ -z "${kubectl_timeline_rows}" ] || printf '%s\n' "${kubectl_timeline_rows}"
+        return "${kubectl_timeline_rc}"
+        ;;
+      *initContainerStatuses*)
+        [ -z "${kubectl_wedge_stderr}" ] || printf '%s\n' "${kubectl_wedge_stderr}" >&2
+        [ "${kubectl_wedge_rc}" -eq 0 ] || return "${kubectl_wedge_rc}"
+        [ -z "${kubectl_wedge_rows}" ] || printf '%s\n' "${kubectl_wedge_rows}"
+        return 0
+        ;;
+      *initContainers*)
+        [ "${kubectl_init_rc}" -eq 0 ] || return "${kubectl_init_rc}"
+        [ -z "${kubectl_init_names}" ] || printf '%s\n' "${kubectl_init_names}"
+        return 0
+        ;;
+    esac
+    [ -z "${kubectl_list_stderr}" ] || printf '%s\n' "${kubectl_list_stderr}" >&2
+    [ "${kubectl_list_rc}" -eq 0 ] || return "${kubectl_list_rc}"
+    [ -z "${kubectl_pod_names}" ] || printf '%s\n' ${kubectl_pod_names}
+    return 0
+  fi
+
+  if [ "${3:-}" = logs ]; then
+    [ -z "${kubectl_logs_stderr}" ] || printf '%s\n' "${kubectl_logs_stderr}" >&2
+    [ "${kubectl_logs_rc}" -eq 0 ] || return "${kubectl_logs_rc}"
+    [ -z "${kubectl_logs_output}" ] || printf '%s for %s\n' "${kubectl_logs_output}" "${4:-}"
+    return 0
+  fi
+
+  return 0
+}
+
+talosctl() {
+  printf '%s\n' "$*" >>"${talosctl_calls}"
+}
+
+timeout() {
+  local command_rc=0
+  printf '%s\n' "$*" >>"${timeout_calls}"
+  [ "${1:-}" = -k ] || return 97
+  shift 3
+  "$@" || command_rc=$?
+  if [ -n "${timeout_fail_pod}" ]; then
+    case " $* " in
+      *" ${timeout_fail_pod} "*) return 124 ;;
+    esac
+  fi
+  return "${command_rc}"
+}
+
+mktemp() {
+  # The scratch file the wedge check allocates is the one failure the function
+  # cannot report through kubectl, so it needs its own knob. `-d` is left
+  # working because the tests themselves use it for their own temp dirs.
+  if [ "${mktemp_fail}" = 1 ] && [ "${1:-}" != -d ]; then
+    return 1
+  fi
+  command mktemp "$@"
+}
+
+assert_file_contains() {
+  local needle="$1"
+  local file="$2"
+
+  case "$(cat "${file}")" in
+    *"${needle}"*) return 0 ;;
+  esac
+  printf 'expected %s to contain: %s\n' "${file}" "${needle}" >&2
+  return 1
+}
+
+assert_file_lacks_pattern() {
+  local pattern="$1"
+  local file="$2"
+
+  # A missing file must fail rather than vacuously pass: awk exits 2 on an
+  # unreadable path, which is indistinguishable from "no line matched" once the
+  # status is folded into an if.
+  if [ ! -f "${file}" ]; then
+    printf 'expected %s to exist so it could be checked for: %s\n' "${file}" "${pattern}" >&2
+    return 1
+  fi
+  if awk -v pattern="${pattern}" '$0 ~ pattern { found = 1 } END { exit found ? 0 : 1 }' "${file}"; then
+    printf 'expected %s not to match: %s\n' "${file}" "${pattern}" >&2
+    return 1
+  fi
+}
+
+# The function under test redirects a command's stderr into a report file and
+# decides which artifact to write from it. cozytest.sh runs under `set -x`, so
+# the tracer's own line for that command is emitted on the very stderr being
+# redirected, and every assertion about those files would be reading the
+# tracer. Call through this wrapper so the sinks hold what production would
+# put in them.
+run_capture() {
+  local _rc=0
+  ( set +x; cozy_capture_tenant_serial_console "${1:-capture staged by a unit test}" "${2:-6}" ) || _rc=$?
+  return "${_rc}"
+}
+
+@test "a wedged console container is named in the headline, not buried" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_wedge_rows="$(printf 'false PodInitializing virt-launcher-worker-a-11111\nfalse PodInitializing virt-launcher-worker-b-22222')"
+
+  ( set +x; cozy_report_guest_console_wedge ) >"$tmp/out" 2>&1
+
+  # If kubevirt/kubevirt#15989 still bites, the suite's own headline reads
+  # "fewer than 2 tenant nodes Ready within 29m" -- byte-identical to the
+  # failure this instrumentation exists to study. A triager would file the
+  # experiment's answer as the known flake. The diagnostic has to name its
+  # own worst case before the noise starts.
+  assert_file_contains 'guest-console-log' "$tmp/out"
+  assert_file_contains '15989' "$tmp/out"
+  assert_file_contains 'virt-launcher-worker-a-11111' "$tmp/out"
+  rm -rf "$tmp"
+}
+
+@test "a read that never answered is not reported as a healthy console" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_wedge_rc=1
+  kubectl_wedge_rows="$(printf 'false PodInitializing virt-launcher-worker-a-11111')"
+
+  ( set +x; cozy_report_guest_console_wedge ) >"$tmp/out" 2>&1
+
+  # The guard against a false headline must not become a false all-clear.
+  # An apiserver blip here would otherwise leave the reader with no line at
+  # all, which reads as "the console container is fine" -- nothing was
+  # checked. Same rule the sibling attach check follows.
+  assert_file_lacks_pattern '15989' "$tmp/out"
+  assert_file_contains 'unknown, not fine' "$tmp/out"
+  rm -rf "$tmp"
+}
+
+@test "the wedge row carries the waiting reason, not just the ready bit" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_wedge_rows="$(printf 'false PodInitializing virt-launcher-worker-a-11111')"
+
+  ( set +x; cozy_report_guest_console_wedge ) >"$tmp/out" 2>&1
+
+  # ready=false on a sidecar means "not running", which a terminated Pod
+  # satisfies as well as a wedged one. The reason keeps the two apart.
+  assert_file_contains 'PodInitializing' "$tmp/out"
+  assert_file_contains 'state.waiting.reason' "$kubectl_calls"
+  rm -rf "$tmp"
+}
+
+@test "the taxonomy does not claim to be exhaustive" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_wedge_rows="$(printf 'false OOMKilled virt-launcher-worker-a-11111')"
+
+  ( set +x; cozy_report_guest_console_wedge ) >"$tmp/out" 2>&1
+
+  # Two named reasons do not cover the space -- OOMKilled and ContainerCreating
+  # reach this line too, and a superseded Pod killed past its grace period
+  # reads Error. A headline that enumerates two and stops implies the rest
+  # cannot happen, which is the over-claim this whole line was rewritten to
+  # stop making.
+  assert_file_contains 'any other reason, or none, is not covered' "$tmp/out"
+  rm -rf "$tmp"
+}
+
+@test "the wedge taxonomy names CrashLoopBackOff as the bug, not as a superseded Pod" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_wedge_rows="$(printf 'false CrashLoopBackOff virt-launcher-worker-a-11111')"
+
+  ( set +x; cozy_report_guest_console_wedge ) >"$tmp/out" 2>&1
+
+  # The sidecar restarts on failure, so the hang settles into CrashLoopBackOff
+  # and passes through Error. Filing those under "superseded Pod" would hand a
+  # triager the experiment's own failure labelled as noise -- the precise
+  # inversion this function exists to prevent.
+  assert_file_contains 'CrashLoopBackOff or Error below is the wedge shape' "$tmp/out"
+  assert_file_lacks_pattern 'Completed or Error below means a superseded' "$tmp/out"
+  rm -rf "$tmp"
+}
+
+@test "a superseded Pod is labelled, not called a wedge" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_wedge_rows="$(printf 'false Completed virt-launcher-worker-a-11111')"
+
+  ( set +x; cozy_report_guest_console_wedge ) >"$tmp/out" 2>&1
+
+  # ContainerState is a union, so a waiting reason alone is blank for the
+  # terminated case and cannot separate it from anything else at ready=false.
+  # The terminated reason is what labels the superseded Pod, and Completed is
+  # the shape that means superseded rather than wedged.
+  assert_file_contains 'Completed' "$tmp/out"
+  assert_file_contains 'state.terminated.reason' "$kubectl_calls"
+  rm -rf "$tmp"
+}
+
+@test "the headline points at the describe rather than concluding" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_wedge_rows="$(printf 'false  virt-launcher-worker-a-11111')"
+
+  ( set +x; cozy_report_guest_console_wedge ) >"$tmp/out" 2>&1
+
+  # The bit cannot separate every shape, so the line must not assert one. A
+  # headline that concludes more than it established is the same mislabel this
+  # function exists to prevent, pointing the other way.
+  assert_file_contains 'if these are current Pods' "$tmp/out"
+  assert_file_contains 'describe that follows settles it' "$tmp/out"
+  rm -rf "$tmp"
+}
+
+@test "a scratch file that could not be allocated is not silence either" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_wedge_rows="$(printf 'false CrashLoopBackOff virt-launcher-worker-a-11111')"
+  mktemp_fail=1
+
+  ( set +x; cozy_report_guest_console_wedge ) >"$tmp/out" 2>&1
+  mktemp_fail=0
+
+  # The function argues twelve lines further down that silence would read as
+  # "the console container is fine" when nothing was checked. That argument
+  # does not stop applying one branch earlier.
+  assert_file_contains 'unknown, not fine' "$tmp/out"
+  assert_file_lacks_pattern '15989' "$tmp/out"
+  rm -rf "$tmp"
+}
+
+@test "a failed read keeps the reason it failed" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_wedge_rc=1
+  kubectl_wedge_stderr="Error from server: etcdserver: leader changed"
+
+  ( set +x; cozy_report_guest_console_wedge ) >"$tmp/out" 2>&1
+
+  # Discarding stderr here would report a bare exit code for a failure whose
+  # cause kubectl already named, on the one path that exists to stop a reader
+  # guessing. Same rule the sibling attach check follows.
+  assert_file_contains 'leader changed' "$tmp/out"
+  rm -rf "$tmp"
+}
+
+@test "a healthy console container says nothing in the headline" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_wedge_rows="$(printf 'true  virt-launcher-worker-a-11111')"
+
+  ( set +x; cozy_report_guest_console_wedge ) >"$tmp/out" 2>&1
+
+  # A marker that fires on healthy runs is one a reader learns to skip.
+  assert_file_lacks_pattern '15989' "$tmp/out"
+  rm -rf "$tmp"
+}
+
+@test "the wedge check runs before the rest of the node-join diagnostics" {
+  lib=hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  head=$(grep -n 'node-join failed: fewer than 2 tenant nodes Ready' "$lib" | head -n 1 | cut -d: -f1)
+  wedge=$(grep -n '^ *cozy_report_guest_console_wedge || true$' "$lib" | head -n 1 | cut -d: -f1)
+  first=$(grep -n 'describe nodes' "$lib" | head -n 1 | cut -d: -f1)
+  if [ -z "$wedge" ]; then
+    echo "expected the node-join failure path to check for a wedged console container" >&2
+    return 1
+  fi
+  if [ "$wedge" -le "$head" ] || [ "$wedge" -ge "$first" ]; then
+    echo "the wedge check (line $wedge) must sit between the headline ($head) and the first diagnostic ($first)" >&2
+    return 1
+  fi
+}
+
+@test "console capture needs nothing from inside the guest" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  talosctl_calls="$tmp/talosctl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_pod_names="virt-launcher-worker-a-11111"
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=console-smoke
+
+  run_capture
+
+  assert_file_contains 'logs virt-launcher-worker-a-11111 -c guest-console-log' "$kubectl_calls"
+  assert_file_lacks_pattern 'certificate|exec|apply|talosconfig' "$kubectl_calls"
+  [ ! -s "$talosctl_calls" ]
+  assert_file_contains 'mock console output' "$COZY_REPORT_DIR/snapshots/console-smoke/tenant-serial-console/virt-launcher-worker-a-11111.log"
+  rm -rf "$tmp"
+}
+
+@test "each read is bounded and keeps its exit code" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_pod_names="virt-launcher-worker-a-11111"
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=console-bounded
+
+  run_capture
+
+  assert_file_contains '-k 5 30 kubectl -n tenant-test logs virt-launcher-worker-a-11111 -c guest-console-log' "$timeout_calls"
+  assert_file_contains '[capture exit code: 0]' "$COZY_REPORT_DIR/snapshots/console-bounded/tenant-serial-console/virt-launcher-worker-a-11111.log"
+  rm -rf "$tmp"
+}
+
+@test "the read keeps the boot output instead of the tail" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_pod_names="virt-launcher-worker-a-11111"
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=console-head
+
+  run_capture
+
+  # A guest that stalls before apid is diagnosed from what it printed while
+  # booting, and a guest that instead repaints the console indefinitely would
+  # push that boot output out of any --tail window. --limit-bytes truncates
+  # from the far end instead, which keeps whatever the kubelet still holds.
+  # It cannot recover what container-log rotation already dropped.
+  assert_file_contains '--limit-bytes=' "$kubectl_calls"
+  assert_file_lacks_pattern '--tail' "$kubectl_calls"
+  rm -rf "$tmp"
+}
+
+@test "a pod whose read times out does not stop the next pod" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_pod_names="virt-launcher-worker-a-11111 virt-launcher-worker-b-22222"
+  timeout_fail_pod=virt-launcher-worker-a-11111
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=console-partial
+
+  run_capture
+
+  assert_file_contains '[capture exit code: 124]' "$COZY_REPORT_DIR/snapshots/console-partial/tenant-serial-console/virt-launcher-worker-a-11111.log"
+  assert_file_contains '[capture exit code: 0]' "$COZY_REPORT_DIR/snapshots/console-partial/tenant-serial-console/virt-launcher-worker-b-22222.log"
+  rm -rf "$tmp"
+}
+
+@test "an empty virt-launcher list is recorded rather than passed over" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_pod_names=
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=console-empty
+
+  capture_rc=0
+  run_capture || capture_rc=$?
+
+  [ "$capture_rc" -eq 1 ]
+  assert_file_contains 'no virt-launcher Pod found' "$COZY_REPORT_DIR/snapshots/console-empty/tenant-serial-console/setup-error.log"
+  assert_file_lacks_pattern 'guest-console-log' "$timeout_calls"
+  rm -rf "$tmp"
+}
+
+@test "a failed Pod listing is recorded rather than passed over" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_list_rc=1
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=console-list-error
+
+  capture_rc=0
+  run_capture || capture_rc=$?
+
+  [ "$capture_rc" -eq 1 ]
+  assert_file_contains 'failed to list tenant virt-launcher Pods' "$COZY_REPORT_DIR/snapshots/console-list-error/tenant-serial-console/setup-error.log"
+  assert_file_lacks_pattern 'guest-console-log' "$timeout_calls"
+  rm -rf "$tmp"
+}
+
+@test "a warning on a successful listing is kept apart from a setup failure" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_pod_names="virt-launcher-worker-a-11111"
+  kubectl_list_stderr="W0807 partial results warning"
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=console-warn
+
+  run_capture
+
+  # kubectl writes to stderr and exits 0 for warnings and for "No resources
+  # found" alike, so the exit status decides the file. A warning filed as a
+  # setup error reads as a broken collector on an otherwise healthy run.
+  assert_file_contains 'partial results warning' "$COZY_REPORT_DIR/snapshots/console-warn/tenant-serial-console/READ-WARNINGS.txt"
+  [ ! -f "$COZY_REPORT_DIR/snapshots/console-warn/tenant-serial-console/setup-error.log" ]
+  rm -rf "$tmp"
+}
+
+@test "a healthy listing leaves no warnings file behind" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_pod_names="virt-launcher-worker-a-11111"
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=console-quiet
+
+  run_capture
+
+  [ ! -f "$COZY_REPORT_DIR/snapshots/console-quiet/tenant-serial-console/READ-WARNINGS.txt" ]
+  [ ! -f "$COZY_REPORT_DIR/snapshots/console-quiet/tenant-serial-console/setup-error.log" ]
+  rm -rf "$tmp"
+}
+
+@test "a failed listing keeps the stderr that explains it" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_list_rc=1
+  kubectl_list_stderr="Error from server (Forbidden): pods is forbidden"
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=console-forbidden
+
+  capture_rc=0
+  run_capture || capture_rc=$?
+
+  [ "$capture_rc" -eq 1 ]
+  assert_file_contains 'Forbidden' "$COZY_REPORT_DIR/snapshots/console-forbidden/tenant-serial-console/setup-error.log"
+  rm -rf "$tmp"
+}
+
+@test "the attach check passes when the console container is present" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_init_names="virt-launcher-worker-a-11111=guest-console-log"
+
+  attach_rc=0
+  ( set +x; cozy_assert_guest_console_attached ) || attach_rc=$?
+
+  [ "$attach_rc" -eq 0 ]
+  rm -rf "$tmp"
+}
+
+@test "a matched Pod with no init containers at all is the finding, not a miss" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_init_names="virt-launcher-worker-a-11111="
+
+  attach_rc=0
+  ( set +x; cozy_assert_guest_console_attached ) || attach_rc=$?
+
+  # This is the shape an inert setting actually produces here: guest-console-log
+  # is the only init container these Pods ever get, so "the field did not take
+  # effect" means initContainers is absent, not that some other name appears.
+  # Reading a bare list of container names would render it byte-identical to
+  # "no Pod matched" and let the suite pass over the one thing this checks.
+  [ "$attach_rc" -eq 2 ]
+  rm -rf "$tmp"
+}
+
+@test "a read that never answered is not reported as an inert setting" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_init_rc=1
+
+  attach_rc=0
+  ( set +x; cozy_assert_guest_console_attached ) 2>"$tmp/err" || attach_rc=$?
+
+  # Piping the read into grep would collapse this onto the absent-container
+  # branch: no output, grep fails, and an API blip gets published as "the
+  # override did not take effect" -- a cause nothing established. The message
+  # is asserted, not just the code: a failed read and a read that matched
+  # nothing share an exit code but are different facts, and only the status
+  # tells them apart.
+  [ "$attach_rc" -eq 1 ]
+  assert_file_contains 'could not read tenant virt-launcher Pods' "$tmp/err"
+  rm -rf "$tmp"
+}
+
+@test "a read that matched no Pod is not reported as an inert setting either" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_init_names=
+
+  attach_rc=0
+  ( set +x; cozy_assert_guest_console_attached ) 2>"$tmp/err" || attach_rc=$?
+
+  # A selector that matched nothing says nothing about any Pod's containers,
+  # so it belongs with the failed read rather than with the absent container.
+  [ "$attach_rc" -eq 1 ]
+  assert_file_contains 'no tenant virt-launcher Pod matched' "$tmp/err"
+  rm -rf "$tmp"
+}
+
+@test "the absent-container diagnostics are bounded like the check itself" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_init_names="virt-launcher-worker-a-11111="
+
+  attach_rc=0
+  ( set +x; cozy_assert_guest_console_attached ) || attach_rc=$?
+
+  [ "$attach_rc" -eq 2 ]
+  # These run on a path that ends in exit 1; an unbounded hang here would take
+  # the step's deadline and the tenant snapshot the exit is meant to reach.
+  [ "$(grep -c 'get virtualmachineinstances' "$timeout_calls")" -eq 1 ]
+  [ "$(grep -c 'get pods' "$timeout_calls")" -eq 2 ]
+  rm -rf "$tmp"
+}
+
+@test "a silent read records whether the container ever started" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_pod_names="virt-launcher-worker-a-11111"
+  kubectl_logs_output=
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=console-silent
+
+  run_capture
+
+  # An empty console log has two causes that look identical in the artifact:
+  # the guest printed nothing, or the container never started so there was no
+  # stream at all. The second is what kubevirt/kubevirt#15989 produces, and it
+  # is the reading that would otherwise be filed as "the guest was silent".
+  # The Pod's own state is the only thing that separates them.
+  d="$COZY_REPORT_DIR/snapshots/console-silent/tenant-serial-console"
+  assert_file_contains 'describe pod' "$d/POD-STATE.txt"
+  assert_file_contains 'events' "$d/POD-STATE.txt"
+  assert_file_contains 'returned nothing' "$d/virt-launcher-worker-a-11111.log"
+  rm -rf "$tmp"
+}
+
+@test "a container that never started is not called truncated or silent" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_pod_names="virt-launcher-worker-a-11111"
+  kubectl_logs_output=
+  kubectl_logs_rc=1
+  kubectl_logs_stderr="Error from server (BadRequest): container guest-console-log is not valid for pod virt-launcher-worker-a-11111"
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=console-absent
+
+  run_capture
+
+  # This is the shape kubevirt/kubevirt#15989 produces and the headline case
+  # for the whole collector. Folding stderr into the capture would make the
+  # file non-empty and the console would read as having said something;
+  # nothing was truncated, because nothing was ever read.
+  d="$COZY_REPORT_DIR/snapshots/console-absent/tenant-serial-console"
+  assert_file_contains 'no console at all' "$d/virt-launcher-worker-a-11111.log"
+  assert_file_lacks_pattern 'truncated' "$d/virt-launcher-worker-a-11111.log"
+  assert_file_contains 'is not valid for pod' "$d/virt-launcher-worker-a-11111.read-error.log"
+  [ -f "$d/POD-STATE.txt" ]
+  rm -rf "$tmp"
+}
+
+@test "a read killed without a word does not point at a missing file" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_pod_names="virt-launcher-worker-a-11111"
+  kubectl_logs_output=
+  timeout_fail_pod=virt-launcher-worker-a-11111
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=console-killed
+
+  run_capture
+
+  # timeout kills the child without a word, so both streams can be empty.
+  # Naming read-error.log then sends the reader after evidence that was
+  # never written.
+  d="$COZY_REPORT_DIR/snapshots/console-killed/tenant-serial-console"
+  [ ! -f "$d/virt-launcher-worker-a-11111.read-error.log" ]
+  assert_file_contains 'failed silently' "$d/virt-launcher-worker-a-11111.log"
+  assert_file_lacks_pattern 'see read-error.log' "$d/virt-launcher-worker-a-11111.log"
+  rm -rf "$tmp"
+}
+
+@test "a warning beside a healthy capture is not filed as a read error" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_pod_names="virt-launcher-worker-a-11111"
+  kubectl_logs_stderr="Warning: deprecated flag"
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=console-podwarn
+
+  run_capture
+
+  # Same rule the Pod-list read follows: kubectl writes warnings on stderr
+  # with a zero status, so presence of stderr does not make it an error.
+  d="$COZY_REPORT_DIR/snapshots/console-podwarn/tenant-serial-console"
+  assert_file_contains 'deprecated flag' "$d/virt-launcher-worker-a-11111.READ-WARNINGS.txt"
+  [ ! -f "$d/virt-launcher-worker-a-11111.read-error.log" ]
+  [ ! -f "$d/POD-STATE.txt" ]
+  rm -rf "$tmp"
+}
+
+@test "a healthy read leaves no read-error file" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_pod_names="virt-launcher-worker-a-11111"
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=console-noerr
+
+  run_capture
+
+  [ ! -f "$COZY_REPORT_DIR/snapshots/console-noerr/tenant-serial-console/virt-launcher-worker-a-11111.read-error.log" ]
+  rm -rf "$tmp"
+}
+
+@test "a truncated read is not reported as silence" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_pod_names="virt-launcher-worker-a-11111"
+  timeout_fail_pod=virt-launcher-worker-a-11111
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=console-truncated
+
+  out=$( ( set +x; cozy_capture_tenant_serial_console 'a unit test' 6 ) 2>/dev/null )
+  printf '%s\n' "$out" >"$tmp/out"
+
+  # The read broke off mid-stream, so the file holds a prefix. Calling that
+  # "no console output" is the same unestablished claim about silence the
+  # Pod-state capture exists to prevent.
+  f="$COZY_REPORT_DIR/snapshots/console-truncated/tenant-serial-console/virt-launcher-worker-a-11111.log"
+  assert_file_contains 'mock console output' "$f"
+  assert_file_contains 'truncated' "$f"
+  assert_file_lacks_pattern 'no console output' "$f"
+  # And the summary line the passing path reads must not undo that. It is fed
+  # by the same counter that gates the Pod-state read, which a cut-short console
+  # needs as much as an empty one -- so counting them together is right and
+  # naming them together is not. On the green path this line is the only thing
+  # anyone sees, and a partial baseline reported as no baseline sends the reader
+  # past evidence that is sitting in the artifact.
+  assert_file_contains 'of the 1 guest consoles read, 0 came back empty and 1 were cut short' "$tmp/out"
+  rm -rf "$tmp"
+}
+
+@test "a failed read records the Pod state too" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_pod_names="virt-launcher-worker-a-11111"
+  timeout_fail_pod=virt-launcher-worker-a-11111
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=console-failed-read
+
+  run_capture
+
+  assert_file_contains 'describe pod' "$COZY_REPORT_DIR/snapshots/console-failed-read/tenant-serial-console/POD-STATE.txt"
+  rm -rf "$tmp"
+}
+
+@test "a healthy capture leaves no Pod-state file" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_pod_names="virt-launcher-worker-a-11111"
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=console-healthy
+
+  run_capture
+
+  [ ! -f "$COZY_REPORT_DIR/snapshots/console-healthy/tenant-serial-console/POD-STATE.txt" ]
+  rm -rf "$tmp"
+}
+
+@test "the Pod-state reads are bounded and taken once for the whole selector" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_pod_names="p1 p2 p3"
+  kubectl_logs_output=
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=console-once
+
+  run_capture
+
+  # One describe and one events read for the selector, not per Pod: three
+  # silent workers is one finding, and paying for it per Pod would put an
+  # unbounded term back into the failure path the cap exists to bound.
+  [ "$(grep -c 'describe pods' "$timeout_calls")" -eq 1 ]
+  [ "$(grep -c 'get events' "$timeout_calls")" -eq 1 ]
+  rm -rf "$tmp"
+}
+
+@test "the attach check accepts the container wherever KubeVirt puts it" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  # It is an init container today. The question the check asks is whether the
+  # container exists at all, so reading both lists costs nothing and removes
+  # the one way a KubeVirt-side move would red a green run over a diagnostic.
+  kubectl_init_names="virt-launcher-worker-a-11111= guest-console-log"
+  accept_rc=0
+  ( set +x; cozy_assert_guest_console_attached ) || accept_rc=$?
+  [ "$accept_rc" -eq 0 ]
+
+  kubectl_init_names="virt-launcher-worker-a-11111="
+  attach_rc=0
+  ( set +x; cozy_assert_guest_console_attached ) || attach_rc=$?
+  [ "$attach_rc" -eq 2 ]
+  assert_file_contains '{.spec.containers[*].name}' "$kubectl_calls"
+  rm -rf "$tmp"
+}
+
+@test "a passing attach check records the positive outcome, not just the negative" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_init_names="$(printf 'p1=\np2=guest-console-log')"
+
+  ( set +x; cozy_assert_guest_console_attached ) >"$tmp/out" 2>&1
+
+  # This run doubles as the revalidation of a platform-wide workaround, so the
+  # positive outcome has to leave an artifact too. Returning 0 in silence
+  # leaves "the override worked" to be inferred from the absence of a
+  # complaint -- the exact inference this collector refuses to make elsewhere.
+  assert_file_contains 'attached on 1 of 2 virt-launcher Pods' "$tmp/out"
+  rm -rf "$tmp"
+}
+
+@test "a truncated read names the error file when there is one" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_pod_names="virt-launcher-worker-a-11111"
+  kubectl_logs_stderr="Warning: stream reset"
+  timeout_fail_pod=virt-launcher-worker-a-11111
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=console-trunc-err
+
+  run_capture
+
+  # Same discipline as the silent branch: name a file only when it is there.
+  d="$COZY_REPORT_DIR/snapshots/console-trunc-err/tenant-serial-console"
+  assert_file_contains 'truncated' "$d/virt-launcher-worker-a-11111.log"
+  assert_file_contains 'read-error.log' "$d/virt-launcher-worker-a-11111.log"
+  assert_file_contains 'stream reset' "$d/virt-launcher-worker-a-11111.read-error.log"
+  rm -rf "$tmp"
+}
+
+@test "a truncated read with no error file does not name one" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_pod_names="virt-launcher-worker-a-11111"
+  timeout_fail_pod=virt-launcher-worker-a-11111
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=console-trunc-noerr
+
+  run_capture
+
+  d="$COZY_REPORT_DIR/snapshots/console-trunc-noerr/tenant-serial-console"
+  assert_file_contains 'truncated' "$d/virt-launcher-worker-a-11111.log"
+  assert_file_lacks_pattern 'read-error.log' "$d/virt-launcher-worker-a-11111.log"
+  rm -rf "$tmp"
+}
+
+@test "the typical-cost figure in both chainsaw comments counts the Pod-state reads" {
+  # A comment carrying a number that the code contradicts is worse than no
+  # number: it outlives the session and is trusted by the next reader.
+  for f in hack/e2e-chainsaw/kubernetes-latest/chainsaw-test.yaml \
+           hack/e2e-chainsaw/kubernetes-previous/chainsaw-test.yaml; do
+    grep -q '4m05s' "$f" || {
+      echo "expected $f to state the minReplicas-2 cost including the wedge and Pod-state reads" >&2
+      return 1
+    }
+    grep -q '6m25s' "$f" || {
+      echo "expected $f to state the worst-case cost including the wedge read" >&2
+      return 1
+    }
+  done
+}
+
+@test "the attach read gives every matched Pod a non-empty line" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_init_names="virt-launcher-worker-a-11111=guest-console-log"
+
+  ( set +x; cozy_assert_guest_console_attached )
+
+  # Asserted on the query rather than the answer, because no mock can stand in
+  # for kubectl's jsonpath engine and this is the property the answer depends
+  # on. Without the Pod name, a Pod whose initContainers list is absent emits a
+  # bare newline that command substitution strips, so "Pods matched, none
+  # carries the container" arrives byte-identical to "no Pod matched" -- and
+  # the check silently stops being able to report the one thing it is for.
+  assert_file_contains '{.metadata.name}{"="}{.spec.initContainers[*].name}' "$kubectl_calls"
+  rm -rf "$tmp"
+}
+
+@test "the failure-path diagnostics carry a client deadline too" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_init_names="virt-launcher-worker-a-11111="
+
+  attach_rc=0
+  ( set +x; cozy_assert_guest_console_attached ) || attach_rc=$?
+
+  [ "$attach_rc" -eq 2 ]
+  # timeout bounds the process; --request-timeout bounds the call the process
+  # makes. The wrapper alone leaves kubectl free to sit in its own retry loop
+  # for the whole 30s and return nothing.
+  [ "$(grep -c -- '--request-timeout=30s' "$kubectl_calls")" -eq 3 ]
+  rm -rf "$tmp"
+}
+
+@test "one Pod carrying the container is enough to pass" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_init_names="$(printf 'virt-launcher-worker-a-11111=\nvirt-launcher-worker-b-22222=guest-console-log')"
+
+  attach_rc=0
+  ( set +x; cozy_assert_guest_console_attached ) || attach_rc=$?
+
+  # Deliberately "any", not "every": the namespace is not scoped to this
+  # release, so an every-Pod rule would fail a run over a Pod that is not
+  # this test's. It can miss; it cannot false-fail.
+  [ "$attach_rc" -eq 0 ]
+  rm -rf "$tmp"
+}
+
+@test "the attach read is bounded like every other read here" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_init_names="virt-launcher-worker-a-11111=guest-console-log"
+
+  ( set +x; cozy_assert_guest_console_attached )
+
+  assert_file_contains '-k 5 30 kubectl -n tenant-test get pods' "$timeout_calls"
+  rm -rf "$tmp"
+}
+
+@test "only an answered read that lacks the container fails the suite" {
+  lib=hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  # The two non-zero outcomes must not be treated alike: exit 1 says the read
+  # did not answer and is not evidence, exit 2 says it did and the container
+  # is absent.
+  grep -q 'if \[ "${attach_rc}" -eq 2 \]; then' "$lib"
+}
+
+@test "the console capture stops at a cap and records what it dropped" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_pod_names="p1 p2 p3 p4 p5 p6 p7 p8"
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=console-capped
+
+  run_capture
+
+  d="$COZY_REPORT_DIR/snapshots/console-capped/tenant-serial-console"
+  [ -f "$d/p6.log" ]
+  [ ! -f "$d/p7.log" ]
+  assert_file_contains 'stopped after 6 Pods; 8 matched in total' "$d/COLLECTION-TRUNCATED.txt"
+  rm -rf "$tmp"
+}
+
+@test "an uncapped pool leaves no truncation marker" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_pod_names="p1 p2"
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=console-uncapped
+
+  run_capture
+
+  [ ! -f "$COZY_REPORT_DIR/snapshots/console-uncapped/tenant-serial-console/COLLECTION-TRUNCATED.txt" ]
+  rm -rf "$tmp"
+}
+
+@test "the attach check sits on the passing path, after the functional block" {
+  lib=hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  # Two placements are wrong and this pins against both. In the failure block
+  # it would answer only in the run where the console can no longer be
+  # recovered. Ahead of the functional assertions it would let a diagnostic
+  # preempt the checks the suite exists for.
+  gate=$(grep -n '^ *cozy_assert_guest_console_attached || attach_rc=$?$' "$lib" | head -n 1 | cut -d: -f1)
+  capture=$(grep -n "^ *cozy_capture_tenant_serial_console 'node-join failed" "$lib" | head -n 1 | cut -d: -f1)
+  if [ -z "$gate" ]; then
+    echo "expected the suite to verify guest-console-log attached on the passing path" >&2
+    return 1
+  fi
+  if [ -z "$capture" ]; then
+    echo "expected to find the failure-path console capture in $lib" >&2
+    return 1
+  fi
+  if [ "$gate" -le "$capture" ]; then
+    echo "the attach check (line $gate) must sit after node-join succeeds, not in the failure block (line $capture)" >&2
+    return 1
+  fi
+  # Anchored on the LAST functional assertion in the function, not a
+  # mid-file one, or everything between it and the gate is unprotected.
+  #
+  # On the call rather than on the text of its arguments. The arguments name
+  # local variables of the library, which a refactor there is free to rename
+  # without touching what this test asserts; an anchor that spells them out
+  # stops matching on that rename, and the failure lands on whoever rebases
+  # second rather than on either author. The call is what the ordering is
+  # about, so it is what the anchor reads.
+  last=$(grep -n '^ *cozy_guard_all_helmreleases ' "$lib" | tail -n 1 | cut -d: -f1)
+  if [ -z "$last" ]; then
+    echo "expected to find the HelmRelease remediation guard in $lib" >&2
+    return 1
+  fi
+  if [ "$gate" -le "$last" ]; then
+    echo "the attach check (line $gate) must sit after every functional assertion (last at line $last)" >&2
+    return 1
+  fi
+}
+
+@test "the node-join failure path captures the console before the talosctl capture" {
+  lib=hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  # Ordering is the whole point: the talosctl capture needs an apid that the
+  # failure class this collects never reached, so running it first spends the
+  # failure path's budget on the collector that cannot answer.
+  console=$(grep -n "^ *cozy_capture_tenant_serial_console 'node-join failed" "$lib" | head -n 1 | cut -d: -f1)
+  talos=$(grep -n '^ *cozy_capture_tenant_talos "${test_name}" || true$' "$lib" | head -n 1 | cut -d: -f1)
+  if [ -z "$console" ]; then
+    echo "expected the node-join failure path to capture the guest serial console" >&2
+    return 1
+  fi
+  if [ -z "$talos" ]; then
+    echo "expected to find the talosctl capture call in $lib" >&2
+    return 1
+  fi
+  if [ "$console" -ge "$talos" ]; then
+    echo "serial console capture (line $console) must run before the talosctl capture (line $talos)" >&2
+    return 1
+  fi
+}
+
+@test "the passing path captures the console and leaves teardown to Chainsaw finally" {
+  lib=hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  # An instrument that only runs on the failure path answers in one direction.
+  # Every console this tree has ever captured came from a run that failed, so
+  # the boot stages a healthy worker goes through, and how long each takes, have
+  # no measured value to compare a failing run against -- and "slower than
+  # usual" is the claim the failure keeps resting on. The passing run is where
+  # that value comes from, and it exists only until the tenant is deleted.
+  gate=$(grep -n '^ *cozy_assert_guest_console_attached || attach_rc=$?$' "$lib" | head -n 1 | cut -d: -f1)
+  green=$(grep -n "^ *if ! cozy_capture_tenant_serial_console 'the suite passed" "$lib" | head -n 1 | cut -d: -f1)
+  function_end=$(awk -v start="$green" 'NR > start && /^}$/ { print NR; exit }' "$lib")
+  for v in gate green function_end; do
+    eval "n=\$$v"
+    if [ -z "$n" ]; then
+      echo "expected to locate $v in $lib" >&2
+      return 1
+    fi
+  done
+  # After the attach check, because that check is what says there is a container
+  # to read. The function must not start an asynchronous tenant teardown after
+  # the capture: each suite's finally block owns the single authoritative delete.
+  if [ "$green" -le "$gate" ]; then
+    echo "the passing-path capture (line $green) must sit after the attach check ($gate)" >&2
+    return 1
+  fi
+  if sed -n "${green},${function_end}p" "$lib" | grep -Eq 'delete kubernetes(nodeses|es)[.]apps[.]cozystack[.]io'; then
+    echo "run_kubernetes_test still starts tenant teardown on its success path" >&2
+    return 1
+  fi
+  for suite in latest previous; do
+    grep -Fq "cozy_cleanup test-${suite}-version" "hack/e2e-chainsaw/kubernetes-${suite}/chainsaw-test.yaml" || {
+      echo "kubernetes-${suite} finally does not own authoritative tenant teardown" >&2
+      return 1
+    }
+  done
+}
+
+@test "the passing path asks for the pool minimum, not the pool" {
+  lib=hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  # The failure path runs inside a phase whose budget is derived against the
+  # whole operation, so it can afford the pool at its maximum. The passing path
+  # has neither a phase nor a budget: it runs inside the same 67m operation the
+  # suite has already spent most of, and every read it issues is bounded
+  # individually but not as a group. A walk over the maximum pool could
+  # therefore turn a suite that proved everything it exists to prove into a red
+  # run for collecting a debugging aid slowly. Two workers booting is the same
+  # baseline as ten, so that is what it asks for.
+  green=$(grep -n "cozy_capture_tenant_serial_console 'the suite passed[^']*' 2;" "$lib" | head -n 1 | cut -d: -f1)
+  red=$(grep -n "cozy_capture_tenant_serial_console 'node-join failed[^']*' 6 || true" "$lib" | head -n 1 | cut -d: -f1)
+  if [ -z "$green" ]; then
+    echo "expected the passing path to cap its console walk at the pool minimum" >&2
+    return 1
+  fi
+  if [ -z "$red" ]; then
+    echo "expected the failure path to keep covering the pool at its maximum" >&2
+    return 1
+  fi
+}
+
+@test "the walk covers exactly the number of Pods the caller asked for" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_pod_names="virt-launcher-a virt-launcher-b virt-launcher-c"
+  kubectl_logs_output=
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=console-cap-arg
+
+  out=$( ( set +x; cozy_capture_tenant_serial_console 'a unit test' 2 ) 2>/dev/null )
+  printf '%s\n' "$out" >"$tmp/out"
+
+  # The cap is the caller's, not a literal in the walk, or the passing path
+  # cannot be cheaper than the failure path and the argument above is decorative.
+  dir="$COZY_REPORT_DIR/snapshots/console-cap-arg/tenant-serial-console"
+  [ -f "$dir/virt-launcher-a.log" ]
+  [ -f "$dir/virt-launcher-b.log" ]
+  [ ! -f "$dir/virt-launcher-c.log" ]
+  assert_file_contains 'capture stopped after 2 Pods; 3 matched in total' \
+    "$dir/COLLECTION-TRUNCATED.txt"
+  # And the count on stdout is over the Pods actually read. The cap probe runs
+  # on the Pod past the cap, so the counter driving it is one higher than the
+  # walk; reported as the denominator it would name a number that is neither
+  # what was read nor what matched, and disagree with the truncation marker
+  # written beside it -- on the path where nobody opens that marker.
+  assert_file_contains 'of the 2 guest consoles read, 2 came back empty and 0 were cut short' "$tmp/out"
+  rm -rf "$tmp"
+}
+
+@test "a passing-path capture that failed is said out loud instead of failing the suite" {
+  lib=hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  # Two failure modes, and this pins against both. Left bare, a non-zero return
+  # would fail a suite that proved everything it exists to prove, on a
+  # debugging aid. Silenced with `|| true`, a capture that collected nothing
+  # would leave a green run whose only trace of the gap is an artifact nobody
+  # opens on a green run.
+  green=$(grep -n "^ *if ! cozy_capture_tenant_serial_console 'the suite passed" "$lib" | head -n 1 | cut -d: -f1)
+  if [ -z "$green" ]; then
+    echo "expected the passing path to capture the console through a tested call" >&2
+    return 1
+  fi
+  # Bounded by the branch rather than by a line count: the warning is what the
+  # branch is for, and a fixed offset would break on a comment being added to it
+  # while a whole-file search would accept a warning belonging to something
+  # else.
+  warn=$(awk -v g="$green" '
+    NR <= g { next }
+    /^  fi$/ { exit }
+    /WARNING: the guest console capture/ { print NR; exit }
+  ' "$lib")
+  if [ -z "$warn" ]; then
+    echo "expected the failed passing-path capture to warn in the job log" >&2
+    return 1
+  fi
+}
+
+@test "the capture says which run produced it" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_pod_names="virt-launcher-worker-a-11111"
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=console-context
+
+  run_capture 'the suite passed: captured after the last assertion'
+
+  # Both paths write the same directory, and the two readings mean opposite
+  # things: one is the failure being studied, the other is the baseline it is
+  # compared against. Which one a tarball holds is otherwise recoverable only
+  # from the run's verdict somewhere else entirely.
+  assert_file_contains 'the suite passed: captured after the last assertion' \
+    "$COZY_REPORT_DIR/snapshots/console-context/tenant-serial-console/CAPTURE-CONTEXT.txt"
+  rm -rf "$tmp"
+}
+
+@test "a walk that came back with empty consoles says so on stdout" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_pod_names="virt-launcher-worker-a-11111"
+  kubectl_logs_output=
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=console-silent-count
+
+  out=$( ( set +x; cozy_capture_tenant_serial_console 'a unit test' 6 ) 2>/dev/null )
+  printf '%s\n' "$out" >"$tmp/out"
+
+  # The per-pod notes and POD-STATE.txt already record this in the report, and
+  # on the failure path that is enough because the report gets opened. The
+  # passing path is the one that does not: a baseline that came back empty
+  # there would otherwise be visible only to whoever downloads a green run's
+  # artifact. The count is not a failure and the capture still returns zero, so
+  # stdout is the only place the two callers share.
+  assert_file_contains 'of the 1 guest consoles read, 1 came back empty and 0 were cut short' "$tmp/out"
+  rm -rf "$tmp"
+}
+
+@test "a healthy walk says nothing about silent consoles" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_pod_names="virt-launcher-worker-a-11111"
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=console-silent-none
+
+  out=$( ( set +x; cozy_capture_tenant_serial_console 'a unit test' 6 ) 2>/dev/null )
+  printf '%s\n' "$out" >"$tmp/out"
+
+  # The other half of the pair. A line printed on every run is a line nobody
+  # reads, and this one is meant to be read on the green path.
+  assert_file_lacks_pattern 'guest consoles read, ' "$tmp/out"
+  rm -rf "$tmp"
+}
+
+@test "the context is written even when there is nothing to capture" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_pod_names=
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=console-context-empty
+  rc=0
+
+  run_capture 'the suite passed: captured after the last assertion' || rc=$?
+
+  # The empty case is the one where the context matters most: a directory
+  # holding only a failure note is where a reader most needs to know which run
+  # left it, and the early return is the path most likely to skip writing it.
+  [ "$rc" -ne 0 ]
+  assert_file_contains 'the suite passed' \
+    "$COZY_REPORT_DIR/snapshots/console-context-empty/tenant-serial-console/CAPTURE-CONTEXT.txt"
+  rm -rf "$tmp"
+}
+
+@test "each console says when it was read, so its last kernel stamp has a wall clock to sit against" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_pod_names="virt-launcher-worker-a-11111"
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=console-read-instant
+
+  run_capture
+
+  # A console log is stamped in guest seconds since the guest's own kernel
+  # started, and it ends wherever the guest had got to when the read ran. Those
+  # two facts alone cannot say whether a short log means a guest that started
+  # late or a guest that went quiet, because the instant of the read is not in
+  # the file. Without this line the only trace of it is the artifact's mtime,
+  # which is metadata rather than content: nothing in the report says it, and a
+  # reader has to know to go looking outside the file for it.
+  f="$COZY_REPORT_DIR/snapshots/console-read-instant/tenant-serial-console/virt-launcher-worker-a-11111.log"
+  assert_file_contains 'console read started at ' "$f"
+  assert_file_contains ' epoch seconds' "$f"
+  rm -rf "$tmp"
+}
+
+@test "the capture records when each guest started, beside the console it captured" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_pod_names="virt-launcher-worker-a-11111"
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=console-timeline
+
+  run_capture
+
+  # The other end of the subtraction. With the read instant above and the
+  # compute container's start here, how long the guest had been alive when the
+  # console was read is one subtraction away, and comparing that against the
+  # last stamp in the log says which of the two happened: a guest that had not
+  # lived long enough to reach a milestone, or one that lived and stopped
+  # printing. Without it both look like the same short file.
+  f="$COZY_REPORT_DIR/snapshots/console-timeline/tenant-serial-console/CAPTURE-TIMELINE.txt"
+  assert_file_contains 'computeStartedAt=2026-08-15T14:35:47Z' "$f"
+  # The subtraction is spelled out rather than left to be reconstructed. This
+  # file is read by whoever opens a failed run's tarball months later, and the
+  # relation between a guest-relative kernel stamp and two absolute instants is
+  # exactly the step a reader gets wrong.
+  assert_file_contains 'epoch seconds' "$f"
+  rm -rf "$tmp"
+}
+
+@test "a start-time read that failed is named rather than left out" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_pod_names="virt-launcher-worker-a-11111"
+  # Non-zero AND nothing written: the read that never got a row across, which is
+  # a different fact from the one cut off part way through and takes a different
+  # note. Both have to be staged explicitly or the mock decides which arm runs.
+  kubectl_timeline_rc=9
+  kubectl_timeline_rows=
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=console-timeline-failed
+
+  run_capture
+
+  # An absent file reads as a capture that had no reason to write one, which is
+  # the silence every collector here is built to refuse. The read failing is a
+  # statement about this machine's view of the cluster, not about when the
+  # guests started, and the file has to say which of those it is holding.
+  f="$COZY_REPORT_DIR/snapshots/console-timeline-failed/tenant-serial-console/CAPTURE-TIMELINE.txt"
+  assert_file_contains 'exit 9' "$f"
+  assert_file_lacks_pattern 'computeStartedAt=2026' "$f"
+  rm -rf "$tmp"
+}
+
+@test "a start-time read cut off part way is not reported as having observed nothing" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_pod_names="virt-launcher-worker-a-11111"
+  kubectl_timeline_rc=124
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=console-timeline-cut
+
+  run_capture
+
+  # A read killed at its bound can leave rows behind and still report failure.
+  # Saying "when these guests started was not observed" under start times that
+  # are plainly sitting there makes the file contradict itself, and a reader who
+  # believes the note discards the rows -- which for a capture that exists to be
+  # subtracted is the whole value of the file.
+  f="$COZY_REPORT_DIR/snapshots/console-timeline-cut/tenant-serial-console/CAPTURE-TIMELINE.txt"
+  assert_file_contains 'computeStartedAt=2026-08-15T14:35:47Z' "$f"
+  assert_file_contains 'cut off (exit 124)' "$f"
+  assert_file_lacks_pattern 'was not observed, which is not the same' "$f"
+  rm -rf "$tmp"
+}
+
+@test "a start-time read that answered with nothing is not reported as a start time" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_pod_names="virt-launcher-worker-a-11111"
+  kubectl_timeline_rows=
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=console-timeline-empty
+
+  run_capture
+
+  # The third outcome, and the one that looks most like success: the read
+  # answered, and answered with nothing. A zero-length file here would be read
+  # as a capture that ran and found the guests had no start times, which is not
+  # a state a Pod can be in -- the walk above just read consoles from these
+  # same Pods.
+  f="$COZY_REPORT_DIR/snapshots/console-timeline-empty/tenant-serial-console/CAPTURE-TIMELINE.txt"
+  assert_file_contains 'returned no rows' "$f"
+  rm -rf "$tmp"
+}
+
+@test "the start-time read is bounded like every other read in this capture" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_pod_names="virt-launcher-worker-a-11111"
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=console-timeline-bound
+
+  run_capture
+
+  # This read runs on the same failure path as the rest, where the apiserver is
+  # the component least likely to answer. An unbounded one does not lose only
+  # itself: it holds the op until the op is killed, and the tenant snapshot
+  # queued behind it is lost rather than truncated.
+  assert_file_contains 'computeStartedAt' "$timeout_calls"
+  assert_file_contains 'request-timeout' "$kubectl_calls"
+  rm -rf "$tmp"
+}
+
+@test "a warning beside a healthy start-time read is not filed as an error" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_pod_names="virt-launcher-worker-a-11111"
+  kubectl_timeline_stderr='Warning: v1 Pod is deprecated in this build'
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=console-timeline-warn
+
+  run_capture
+
+  # kubectl writes deprecation and partial-result warnings on stderr with a zero
+  # exit, so what a message means is decided by the status and not by the fact
+  # that something was written. Filed as an error, a healthy read sends the next
+  # reader after a failure that did not happen; folded into the rows, it sits
+  # inside the data the success probe reads.
+  dir="$COZY_REPORT_DIR/snapshots/console-timeline-warn/tenant-serial-console"
+  assert_file_contains 'v1 Pod is deprecated' "$dir/CAPTURE-TIMELINE-warnings.txt"
+  [ ! -f "$dir/CAPTURE-TIMELINE-error.log" ]
+  assert_file_lacks_pattern 'deprecated' "$dir/CAPTURE-TIMELINE.txt"
+  rm -rf "$tmp"
+}
+
+@test "the stderr of a start-time read that failed is kept as the diagnosis" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_pod_names="virt-launcher-worker-a-11111"
+  kubectl_timeline_rc=1
+  kubectl_timeline_rows=
+  kubectl_timeline_stderr='error: the server could not find the requested resource'
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=console-timeline-err
+
+  run_capture
+
+  # The other direction: on a failed read that message IS the diagnosis, and
+  # dropping it leaves a note saying the read failed with nothing saying why.
+  # The note has to name the file, or the evidence sits in a directory the
+  # reader has no reason to open.
+  dir="$COZY_REPORT_DIR/snapshots/console-timeline-err/tenant-serial-console"
+  assert_file_contains 'could not find the requested resource' "$dir/CAPTURE-TIMELINE-error.log"
+  [ ! -f "$dir/CAPTURE-TIMELINE-warnings.txt" ]
+  assert_file_contains 'CAPTURE-TIMELINE-error.log' "$dir/CAPTURE-TIMELINE.txt"
+  rm -rf "$tmp"
+}
+
+@test "a start-time read that failed without a word does not point at a missing file" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_pod_names="virt-launcher-worker-a-11111"
+  kubectl_timeline_rc=124
+  kubectl_timeline_rows=
+  kubectl_timeline_stderr=
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=console-timeline-silent
+
+  run_capture
+
+  # timeout kills the child without a word, so this read can fail having written
+  # to neither stream. Naming the error log unconditionally would then send the
+  # reader after a file that was never created, which is the same trap the
+  # per-Pod notes above are written to avoid.
+  dir="$COZY_REPORT_DIR/snapshots/console-timeline-silent/tenant-serial-console"
+  [ ! -f "$dir/CAPTURE-TIMELINE-error.log" ]
+  assert_file_contains 'gave no reason on either stream' "$dir/CAPTURE-TIMELINE.txt"
+  assert_file_lacks_pattern 'reason it gave is in' "$dir/CAPTURE-TIMELINE.txt"
+  rm -rf "$tmp"
+}
+
+@test "the console container's start is asked for in both status lists" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_pod_names="virt-launcher-worker-a-11111"
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=console-timeline-lists
+
+  run_capture
+
+  # KubeVirt runs guest-console-log as an init container, so its runtime state
+  # lives under initContainerStatuses. Asking only containerStatuses returns
+  # empty for a container that started perfectly well, and an empty start time
+  # here is supposed to mean the container never ran -- the one reading this
+  # field exists to support. The attach check reads both spec lists for the
+  # same reason; a missing key costs an empty string, so naming both is free.
+  assert_file_contains 'initContainerStatuses[?(@.name=="guest-console-log")]' "$kubectl_calls"
+  assert_file_contains 'containerStatuses[?(@.name=="compute")]' "$kubectl_calls"
+  rm -rf "$tmp"
+}
+
+@test "a run near its operation ceiling declines the baseline instead of being killed collecting it" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  # The capture costs real wall clock and runs after everything the suite
+  # proves. Inside an operation with a fixed ceiling that makes it a way for a
+  # green run to end red, which is the one thing a passing-path collector may
+  # not do. Driven rather than grepped: the direction of the comparison IS the
+  # safety property, and an inverted one runs the capture on exactly the runs
+  # that cannot afford it while every structural check still passes.
+  date_now=1000000000
+  _COZY_RUN_STARTED_AT=$(( date_now - (COZY_OP_CEILING - COZY_GREEN_CAPTURE_RESERVE) - 1 ))
+  rc=0
+  ( set +x; cozy_green_capture_has_room 'the baseline' ) >"$tmp/out" 2>&1 || rc=$?
+
+  [ "$rc" -eq 1 ]
+  # And the decline is spoken. A collector that stops running silently leaves a
+  # green run that looks exactly like one where the baseline was collected and
+  # came back empty, which is the reading every note in this file exists to
+  # prevent.
+  assert_file_contains 'not collected' "$tmp/out"
+  assert_file_contains 'the baseline' "$tmp/out"
+  rm -rf "$tmp"
+}
+
+@test "a run with the operation's room to spare collects the baseline" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  # The other direction, and the one an inverted comparison breaks silently: a
+  # gate that declines a run with forty minutes left costs the baseline on every
+  # healthy run, and the only symptom is a diagnostic that stopped appearing.
+  date_now=1000000000
+  _COZY_RUN_STARTED_AT=$(( date_now - 60 ))
+  rc=0
+  ( set +x; cozy_green_capture_has_room 'the baseline' ) >"$tmp/out" 2>&1 || rc=$?
+
+  [ "$rc" -eq 0 ]
+  assert_file_lacks_pattern 'not collected' "$tmp/out"
+  rm -rf "$tmp"
+}
+
+@test "a run whose start was never stamped declines rather than dying on the arithmetic" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  # The stamp is set by run_kubernetes_test, which no unit test invokes, so
+  # nothing else here would notice it being deleted. Under the `set -eu` the
+  # chainsaw script runs with, an unbound name inside the arithmetic aborts the
+  # whole function -- ending a passing run red, which is the outcome this gate
+  # exists to prevent. Declared zero at file scope, it fails closed instead.
+  date_now=1000000000
+  rc=0
+  ( set -u; set +x; cozy_green_capture_has_room 'the baseline' ) >"$tmp/out" 2>&1 || rc=$?
+
+  [ "$rc" -eq 1 ]
+  assert_file_contains 'not collected' "$tmp/out"
+  rm -rf "$tmp"
+}
+
+@test "the passing path decides through the gate rather than around it" {
+  lib=hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  # The behavioural tests above cover the predicate. Its wiring is what they
+  # cannot reach: run_kubernetes_test is not callable from a unit test, so the
+  # stamp it takes and the gate it calls are only assertable as source. Both
+  # halves fail the same silent way -- a correct predicate nothing calls
+  # protects nothing, and a predicate called without the stamp reads the whole
+  # epoch as elapsed and declines the baseline on every run forever.
+  stamp=$(grep -n '^  _COZY_RUN_STARTED_AT=\$(date +%s)$' "$lib" | head -n 1 | cut -d: -f1)
+  gate=$(grep -n 'cozy_green_capture_has_room ' "$lib" | tail -n 1 | cut -d: -f1)
+  green=$(grep -n "cozy_capture_tenant_serial_console 'the suite passed" "$lib" | head -n 1 | cut -d: -f1)
+  for v in stamp gate green; do
+    eval "n=\$$v"
+    if [ -z "$n" ]; then
+      echo "expected to locate $v in $lib" >&2
+      return 1
+    fi
+  done
+  # Inside the function whose elapsed time it measures, not at file scope: taken
+  # once when the library is sourced, it would time the sourcing rather than the
+  # run, and every suite after the first would read as already over its ceiling.
+  fn=$(grep -n '^run_kubernetes_test() {$' "$lib" | head -n 1 | cut -d: -f1)
+  if [ -z "$fn" ] || [ "$stamp" -le "$fn" ]; then
+    echo "the run's start stamp (line $stamp) must be taken inside run_kubernetes_test (line $fn)" >&2
+    return 1
+  fi
+  if [ "$stamp" -ge "$gate" ] || [ "$gate" -ge "$green" ]; then
+    echo "expected the stamp ($stamp) before the gate ($gate) before the capture ($green)" >&2
+    return 1
+  fi
+}
+
+@test "the operation ceiling the reserve is measured against is the one the suites give" {
+  lib=hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  # A reserve is only meaningful against the right ceiling. This number is a
+  # restatement of one that lives in the suite files, so it is read from both
+  # sides rather than trusted: a suite that raises or lowers its `timeout:`
+  # otherwise leaves the reserve protecting a ceiling that moved, and the
+  # decline either stops firing when it should or starts firing when it should
+  # not.
+  ceiling=$(grep -oE '^COZY_OP_CEILING=[0-9]+' "$lib" | head -n 1 | sed -E 's/.*=//')
+  reserve=$(grep -oE '^COZY_GREEN_CAPTURE_RESERVE=[0-9]+' "$lib" | head -n 1 | sed -E 's/.*=//')
+  for v in ceiling reserve; do
+    eval "n=\$$v"
+    if [ -z "$n" ]; then
+      echo "expected to read $v from $lib; without it this guard reports success for having lost its input" >&2
+      return 1
+    fi
+  done
+  for f in hack/e2e-chainsaw/kubernetes-latest/chainsaw-test.yaml \
+           hack/e2e-chainsaw/kubernetes-previous/chainsaw-test.yaml; do
+    # The first `timeout:` in each file is the bringup op's, which is the one
+    # this whole helper runs inside; the teardown step below it has its own.
+    minutes=$(grep -oE '^ *timeout: [0-9]+m$' "$f" | head -n 1 | grep -oE '[0-9]+')
+    if [ -z "$minutes" ]; then
+      echo "expected to read the operation timeout from $f" >&2
+      return 1
+    fi
+    if [ "$((minutes * 60))" -ne "$ceiling" ]; then
+      echo "$f gives the operation ${minutes}m but the reserve is measured against ${ceiling}s" >&2
+      return 1
+    fi
+  done
+  # And the reserve has to leave room for the capture it is reserving for, or it
+  # protects nothing: the walk it admits would still run past the ceiling.
+  if [ "$reserve" -lt 210 ]; then
+    echo "the reserve ${reserve}s is under the 210s the capture can cost at this caller's cap" >&2
+    return 1
+  fi
+}
+
+@test "the e2e tenant node group asks KubeVirt for the guest console log" {
+  # Anchored to a bare two-space-indented key so a comment or a prose mention
+  # of the field cannot stand in for the setting itself. Since the Phase 2 split
+  # the worker pool is a separate KubernetesNodes CR whose fields sit two spaces
+  # under spec, not six spaces under a nodeGroups.<name> block. It does not prove
+  # the key sits in that CR specifically -- the render is what would catch that,
+  # and the chart's own suites cover it.
+  grep -q '^  logSerialConsole: true$' hack/e2e-chainsaw/_lib/run-kubernetes.sh
+}
diff --git a/hack/run-kubernetes-talos-diagnostics_test.bats b/hack/run-kubernetes-talos-diagnostics_test.bats
new file mode 100644
index 0000000000..c5411837f0
--- /dev/null
+++ b/hack/run-kubernetes-talos-diagnostics_test.bats
@@ -0,0 +1,508 @@
+#!/usr/bin/env bats
+# Regression coverage for tenant-worker Talos diagnostics in
+# hack/e2e-chainsaw/_lib/run-kubernetes.sh. cozytest.sh ends an @test block at
+# the first bare closing brace, so command mocks stay at top level.
+#
+# Scratch directories are removed at the end of the test body, never from a
+# `trap ... EXIT`. Such a trap replaces the one the bats binary installs for its
+# own bookkeeping, and a test that then fails prints no TAP line at all -- not
+# `not ok`, nothing -- so a reader grepping the output for failures sees a green
+# suite while the test silently did not finish. Both runners set -e, so on
+# failure the cleanup below is unreachable and the directory survives for
+# inspection, which is what a failed test wants anyway. See
+# docs/agents/e2e-testing.md and hack/bats-no-exit-trap.bats.
+
+load test_helper
+
+kubectl_calls=/dev/null
+kubectl_manifest=/dev/null
+kubectl_exec_rc=0
+kubectl_vmi_json=
+talosctl_calls=/dev/null
+timeout_calls=/dev/null
+timeout_rc=0
+timeout_fail_node_ip=
+# Per-read failure, which the two knobs above cannot express: one is global and
+# the other selects a whole node. The marker below is decided by how many of a
+# worker's four reads answered, so every interesting case is a mix -- and with
+# only all-or-nothing knobs the boundary between them cannot be reached at all,
+# which is how it went untested while a test named for it passed.
+#
+# Space-separated tokens matched against the composed command; each of the four
+# reads carries one the others do not (dmesg, kubelet, links, services).
+timeout_fail_commands=
+
+kubectl() {
+  printf '%s\n' "$*" >>"${kubectl_calls}"
+
+  if [ "${1:-}" = apply ]; then
+    cat >"${kubectl_manifest}"
+    return 0
+  fi
+
+  if [ "${1:-}" = -n ] && [ "${2:-}" = tenant-test ] \
+    && [ "${3:-}" = get ] && [ "${4:-}" = secret ]; then
+    if [ "${7:-}" = name ]; then
+      printf 'secret/%s\n' "${5}"
+      return 0
+    fi
+    case "${7:-}" in
+      *tls.key*) printf '%s\n' 'mock-client-key' ;;
+      *) printf '%s\n' 'mock-certificate' ;;
+    esac
+    return 0
+  fi
+
+  if [ "${1:-}" = -n ] && [ "${2:-}" = tenant-test ] \
+    && [ "${3:-}" = get ] \
+    && [ "${4:-}" = virtualmachineinstances.kubevirt.io ] \
+    && [ "${8:-}" = json ] && [ -n "${kubectl_vmi_json}" ]; then
+    cat "${kubectl_vmi_json}"
+    return 0
+  fi
+
+  if [ "${3:-}" = exec ] && [ "${4:-}" = deploy/linstor-controller ]; then
+    printf '%s\n' '104857600:satellite-a'
+    return 0
+  fi
+
+  if [ "${3:-}" = exec ]; then
+    printf 'mock capture for %s\n' "$*"
+    return "${kubectl_exec_rc}"
+  fi
+
+  return 0
+}
+
+talosctl() {
+  printf '%s\n' "$*" >>"${talosctl_calls}"
+  if [ "${1:-}" = --talosconfig ] && [ "${3:-}" = config ] \
+    && [ "${4:-}" = add ]; then
+    printf '%s\n' 'mock-talosconfig' >"${2}"
+  fi
+}
+
+timeout() {
+  local command_rc=0
+  printf '%s\n' "$*" >>"${timeout_calls}"
+  [ "${1:-}" = -k ] || return 97
+  shift 3
+  "$@" || command_rc=$?
+  if [ -n "${timeout_fail_node_ip}" ]; then
+    case " $* " in
+      *" -e ${timeout_fail_node_ip} "*) return 124 ;;
+    esac
+  fi
+  local _tok
+  for _tok in ${timeout_fail_commands}; do
+    case " $* " in
+      *" ${_tok}"*) return 1 ;;
+    esac
+  done
+  [ "${timeout_rc}" -eq 0 ] || return "${timeout_rc}"
+  return "${command_rc}"
+}
+
+assert_file_contains() {
+  local needle="$1"
+  local file="$2"
+
+  case "$(cat "${file}")" in
+    *"${needle}"*) return 0 ;;
+  esac
+  printf 'expected %s to contain: %s\n' "${file}" "${needle}" >&2
+  return 1
+}
+
+assert_file_lacks_pattern() {
+  local pattern="$1"
+  local file="$2"
+
+  if awk -v pattern="${pattern}" '$0 ~ pattern { found = 1 } END { exit found ? 0 : 1 }' "${file}"; then
+    printf 'expected %s not to match: %s\n' "${file}" "${pattern}" >&2
+    return 1
+  fi
+}
+
+@test "worker VMI rows retain names whose default interface has no IP" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  rows=$(printf '%s\n' '{"items":[{"metadata":{"name":"worker-a"},"status":{"interfaces":[{"name":"default","ipAddress":"10.244.1.92"}]}},{"metadata":{"name":"worker-b"},"status":{"interfaces":[{"name":"other","ipAddress":"192.0.2.1"}]}}]}' | cozy_tenant_worker_vmi_rows)
+  [ "${rows}" = "$(printf 'worker-a|10.244.1.92\nworker-b|')" ]
+}
+
+@test "reader Certificate is short-lived and never embeds credential data" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  kubectl_manifest="$tmp/certificate.yaml"
+
+  cozy_apply_tenant_talos_reader_certificate test-latest-version
+
+  assert_file_contains 'name: kubernetes-test-latest-version-e2e-talos-reader' "$kubectl_manifest"
+  assert_file_contains 'duration: 1h' "$kubectl_manifest"
+  assert_file_contains 'commonName: kubernetes-test-latest-version-e2e-talos-reader' "$kubectl_manifest"
+  assert_file_contains '- os:reader' "$kubectl_manifest"
+  assert_file_contains 'name: kubernetes-test-latest-version-talos-ca' "$kubectl_manifest"
+  assert_file_contains 'cozystack-e2e.io/tenant-talos-diagnostics: "test-latest-version"' "$kubectl_manifest"
+  assert_file_lacks_pattern '^[[:space:]]*(tls[.]crt|tls[.]key|data):' "$kubectl_manifest"
+  rm -rf "$tmp"
+}
+
+@test "talosconfig uses the tenant CA and the issued reader key" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  kubectl_manifest="$tmp/certificate.yaml"
+  talosctl_calls="$tmp/talosctl.calls"
+
+  cozy_prepare_tenant_talosconfig test-latest-version "$tmp"
+
+  [ "$(sed -n '1p' "$kubectl_calls")" = '-n tenant-test delete certificate kubernetes-test-latest-version-e2e-talos-reader --ignore-not-found --wait=true --timeout=10s' ]
+  [ "$(sed -n '2p' "$kubectl_calls")" = '-n tenant-test delete secret kubernetes-test-latest-version-e2e-talos-reader --ignore-not-found --wait=true --timeout=10s' ]
+  assert_file_contains 'wait -n tenant-test certificate kubernetes-test-latest-version-e2e-talos-reader --for=condition=Ready --timeout=30s' "$kubectl_calls"
+  assert_file_contains '-n tenant-test get secret kubernetes-test-latest-version-talos-ca -o go-template={{index .data "tls.crt" | base64decode}}' "$kubectl_calls"
+  assert_file_contains '-n tenant-test get secret kubernetes-test-latest-version-e2e-talos-reader -o go-template={{index .data "tls.key" | base64decode}}' "$kubectl_calls"
+  assert_file_contains "--talosconfig $tmp/talosconfig config add kubernetes-test-latest-version --ca $tmp/ca.crt --crt $tmp/client.crt --key $tmp/client.key" "$talosctl_calls"
+  assert_file_contains "--talosconfig $tmp/talosconfig config context kubernetes-test-latest-version" "$talosctl_calls"
+  case "$(LC_ALL=C ls -ld "$tmp/talosconfig")" in
+    -rw-------*) ;;
+    *) echo "talosconfig permissions are not 0600" >&2; return 1 ;;
+  esac
+  rm -rf "$tmp"
+}
+
+@test "diagnostics Pod has no API token or Secret volume" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  kubectl_manifest="$tmp/pod.yaml"
+
+  cozy_apply_tenant_talos_diagnostics_pod test-latest-version
+
+  assert_file_contains 'automountServiceAccountToken: false' "$kubectl_manifest"
+  assert_file_contains 'runAsNonRoot: true' "$kubectl_manifest"
+  assert_file_contains 'readOnlyRootFilesystem: true' "$kubectl_manifest"
+  assert_file_contains 'drop:' "$kubectl_manifest"
+  assert_file_contains '- ALL' "$kubectl_manifest"
+  assert_file_contains 'image: docker.io/alpine/k8s:1.36.2@sha256:44ef4942e171939b9c665a4a84beb80e2dcdb9a24330d4651cfdfd2e9deecc47' "$kubectl_manifest"
+  assert_file_contains "'docker.io/alpine/k8s:1.36.2@sha256:44ef4942e171939b9c665a4a84beb80e2dcdb9a24330d4651cfdfd2e9deecc47'" hack/e2e-install-cozystack.bats
+  assert_file_lacks_pattern 'secret:|secretName:' "$kubectl_manifest"
+  rm -rf "$tmp"
+}
+
+@test "Kubernetes Chainsaw operations leave room for failure diagnostics" {
+  [ "$(yq 'select(.metadata.name == "kubernetes-latest").spec.steps[0].try[0].script.timeout' hack/e2e-chainsaw/kubernetes-latest/chainsaw-test.yaml)" = 67m ]
+  [ "$(yq 'select(.metadata.name == "kubernetes-previous").spec.steps[0].try[0].script.timeout' hack/e2e-chainsaw/kubernetes-previous/chainsaw-test.yaml)" = 67m ]
+}
+
+@test "orchestrator skips credentials and helper Pod when every VMI lacks an IP" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  kubectl_manifest="$tmp/manifest.yaml"
+  kubectl_vmi_json="$tmp/vmis.json"
+  talosctl_calls="$tmp/talosctl.calls"
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=diagnostic-no-ip
+  printf '%s\n' '{"items":[{"metadata":{"name":"worker-a"},"status":{"interfaces":[{"name":"default"}]}},{"metadata":{"name":"worker-b"},"status":{}}]}' >"$kubectl_vmi_json"
+
+  capture_rc=0
+  cozy_capture_tenant_talos test-latest-version || capture_rc=$?
+
+  [ "$capture_rc" -eq 1 ]
+  assert_file_lacks_pattern '(^|[[:space:]])apply([[:space:]]|$)' "$kubectl_calls"
+  assert_file_lacks_pattern 'delete (certificate|secret|pod)|wait (certificate|pod)|exec' "$kubectl_calls"
+  [ ! -s "$talosctl_calls" ]
+  assert_file_contains 'default VMI interface has no reported IP address' "$COZY_REPORT_DIR/snapshots/$COZY_SNAPSHOT_NAME/tenant-talos/worker-a/capture-error.log"
+  assert_file_contains 'default VMI interface has no reported IP address' "$COZY_REPORT_DIR/snapshots/$COZY_SNAPSHOT_NAME/tenant-talos/worker-b/capture-error.log"
+  assert_file_contains 'no tenant worker VMI has a reported IP for Talos diagnostics' "$COZY_REPORT_DIR/snapshots/$COZY_SNAPSHOT_NAME/tenant-talos/setup-error.log"
+  rm -rf "$tmp"
+}
+
+@test "node capture uses the VMI IP for endpoint and node with bounded commands" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+
+  cozy_capture_tenant_talos_node diagnostics-pod 10.244.1.92 "$tmp/node"
+
+  [ -s "$tmp/node/dmesg.log" ]
+  [ -s "$tmp/node/kubelet.log" ]
+  [ "$(sed -n '1p' "$kubectl_calls")" = '-n tenant-test exec diagnostics-pod -c diagnostics -- /tmp/talosctl --talosconfig /tmp/talosconfig -e 10.244.1.92 -n 10.244.1.92 dmesg' ]
+  [ "$(sed -n '2p' "$kubectl_calls")" = '-n tenant-test exec diagnostics-pod -c diagnostics -- /tmp/talosctl --talosconfig /tmp/talosconfig -e 10.244.1.92 -n 10.244.1.92 logs kubelet --tail=500' ]
+  [ "$(sed -n '1p' "$timeout_calls")" = '-k 5 20 kubectl -n tenant-test exec diagnostics-pod -c diagnostics -- /tmp/talosctl --talosconfig /tmp/talosconfig -e 10.244.1.92 -n 10.244.1.92 dmesg' ]
+  [ "$(sed -n '2p' "$timeout_calls")" = '-k 5 20 kubectl -n tenant-test exec diagnostics-pod -c diagnostics -- /tmp/talosctl --talosconfig /tmp/talosconfig -e 10.244.1.92 -n 10.244.1.92 logs kubelet --tail=500' ]
+  case "$(sed -n '1p' "$kubectl_calls")" in
+    *--tail*) echo "dmesg must not receive a --tail flag" >&2; exit 1 ;;
+  esac
+  assert_file_contains '[capture exit code: 0]' "$tmp/node/dmesg.log"
+  assert_file_contains '[capture exit code: 0]' "$tmp/node/kubelet.log"
+  rm -rf "$tmp"
+}
+
+@test "the service state machine is captured, so a kubelet that never ran is legible" {
+  # The log this collector took before was not the whole answer, and on the
+  # dominant shape of this failure it is not an answer at all. Talos creates a
+  # service's log buffer when its runner opens the log writer, as it starts the
+  # process, so a kubelet held in Waiting -- for its volumes, for time sync, or
+  # for the container runtime to report healthy -- never reached its runner, has
+  # no log to read, and `logs kubelet` fails naming a log never registered.
+  # That error is a true statement about the log and says
+  # nothing about the service, so a reader gets an unexplained failure where the
+  # actual finding is the state and the condition it is waiting on. ServiceList
+  # carries both, for every service at once, and the reader role is allowed to
+  # call it.
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+
+  cozy_capture_tenant_talos_node diagnostics-pod 10.244.1.92 "$tmp/node"
+
+  [ -s "$tmp/node/services.log" ]
+  assert_file_contains ' 10.244.1.92 services' "$kubectl_calls"
+  assert_file_contains '[capture exit code: 0]' "$tmp/node/services.log"
+  rm -rf "$tmp"
+}
+
+@test "the guest link table is captured as yaml, because MTU is not a printed column" {
+  # MTU is the value that decides whether the PMTU reading of a stalled transfer
+  # is alive: a guest at 1500 over an encapsulated fabric drops exactly the large
+  # segments while the small ones pass. LinkStatus carries it in the spec and
+  # not in the resource's print columns, so the table form -- which is what the
+  # command prints by default -- omits the one field this is read for.
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+
+  cozy_capture_tenant_talos_node diagnostics-pod 10.244.1.92 "$tmp/node"
+
+  # Named .yaml.log, not .yaml, and the suffix is the assertion. Every capture
+  # here gets `[capture exit code: N]` appended by the shared helper, so a file
+  # promising YAML would not parse as YAML -- and a reader who reaches for yq
+  # and gets a parse error learns something about the tool rather than about the
+  # cluster. The .log suffix matches every other consumer of that footer.
+  [ -s "$tmp/node/links.yaml.log" ]
+  [ ! -e "$tmp/node/links.yaml" ]
+  assert_file_contains ' 10.244.1.92 get links -o yaml' "$kubectl_calls"
+  rm -rf "$tmp"
+}
+
+@test "the two added reads carry the tighter bound and the two older ones do not" {
+  # The phase budget is what makes this a decision rather than a detail. These
+  # two reads sit inside the collector the budget's own guard sizes itself
+  # against, so every second added here is a second taken from the collectors
+  # gated after it. Both are single tabular RPCs that a reachable apid answers
+  # at once, which is not the shape of the two reads beside them: a kernel ring
+  # buffer and five hundred lines of service log are streams, and cutting those
+  # to ten seconds would lose evidence on exactly the slow-apid worker the
+  # capture exists for.
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+
+  cozy_capture_tenant_talos_node diagnostics-pod 10.244.1.92 "$tmp/node"
+
+  while IFS= read -r line; do
+    case "$line" in
+      *' dmesg') [ "${line#-k 5 20 }" != "$line" ] || { echo "dmesg lost its 20s bound: $line" >&2; exit 1 ;} ;;
+      *'logs kubelet --tail=500') [ "${line#-k 5 20 }" != "$line" ] || { echo "kubelet log lost its 20s bound: $line" >&2; exit 1 ;} ;;
+      *' services') [ "${line#-k 5 10 }" != "$line" ] || { echo "services must carry the tighter bound: $line" >&2; exit 1 ;} ;;
+      *'get links -o yaml') [ "${line#-k 5 10 }" != "$line" ] || { echo "links must carry the tighter bound: $line" >&2; exit 1 ;} ;;
+      *) echo "unexpected bounded call: $line" >&2; exit 1 ;;
+    esac
+  done <"$timeout_calls"
+  [ "$(wc -l < "$timeout_calls")" -eq 4 ]
+  rm -rf "$tmp"
+}
+
+@test "a worker that produced no guest evidence at all says so in its own directory" {
+  # The gap this closes is a directory that looks like a worker with nothing to
+  # report. When apid refuses the connection every read fails and each log holds
+  # its own rpc error plus an exit code, which is accurate per file and adds up
+  # to nothing a reader scanning the tree can see: the directory has the same
+  # shape as one whose reads returned little. The marker states the outcome for
+  # the worker rather than for each read, and it is written only when NOTHING
+  # succeeded, so a worker that answered one read out of four is not written up
+  # as unreachable.
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  timeout_rc=1
+
+  rc=0
+  cozy_capture_tenant_talos_node diagnostics-pod 10.244.1.93 "$tmp/node" || rc=$?
+
+  # A zero status on the all-fail path, which is the ordinary shape of an
+  # unreachable worker. Note what this assertion does NOT establish: the call
+  # above uses `|| rc=$?`, which suppresses errexit for everything it covers, so
+  # a failing statement inside the function would not abort here either way.
+  # That the function keeps its caller's walk alive under a live errexit is a
+  # property of the `|| true` on the marker write, and it is not observable from
+  # this suite -- reaching it needs a bare call in a shell this file does not
+  # provide.
+  [ "$rc" -eq 0 ]
+  assert_file_contains 'no Talos read completed for this worker' "$tmp/node/CAPTURE-FAILED.txt"
+  # The per-read logs stay: they carry the reason, and the marker only points.
+  assert_file_contains '[capture exit code: 1]' "$tmp/node/dmesg.log"
+  rm -rf "$tmp"
+}
+
+@test "a worker that answered even one read carries no capture-failed marker" {
+  # The positive control for the marker above, and it has to sit at the
+  # BOUNDARY rather than at the easy end. The marker's contract is "nothing
+  # answered", so the case that distinguishes it from every nearby threshold is
+  # one read answering and three failing -- not four answering, which is what
+  # this test used to stage and which any `answered < N` would also satisfy.
+  # Measured: with the all-succeed staging, changing the condition to
+  # `-lt 4` left this file green while a worker that answered three reads of
+  # four was written up as having produced no guest evidence at all, which is
+  # the false statement the marker exists to prevent.
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  # Everything but the service list fails, so exactly one read answers.
+  timeout_fail_commands="dmesg kubelet links"
+
+  cozy_capture_tenant_talos_node diagnostics-pod 10.244.1.92 "$tmp/node"
+
+  [ ! -f "$tmp/node/CAPTURE-FAILED.txt" ]
+  # Not vacuous: the staging really did leave three reads failing and one
+  # answering, so the absence above is the boundary rather than an easy case.
+  assert_file_contains '[capture exit code: 1]' "$tmp/node/dmesg.log"
+  assert_file_contains '[capture exit code: 0]' "$tmp/node/services.log"
+  rm -rf "$tmp"
+}
+
+@test "every one of the four reads counts toward the tally, not just the last" {
+  # The other direction of the same boundary, and it has to walk all four
+  # readings rather than restage the one above. The marker is decided by a COUNT
+  # over four reads, so a read that stops contributing is invisible in any
+  # staging where some other read answers -- it only changes which staging
+  # reaches zero. Measured before this test existed: dropping the tally from
+  # three of the four reads at once left the whole file green, because the one
+  # staging in use happened to keep the fourth.
+  #
+  # So each read takes a turn as the sole answering one. Dropping any single
+  # read's contribution makes its own turn report a worker that answered
+  # nothing, while its own log in the same directory holds a clean capture.
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  for sole in dmesg kubelet links services; do
+    tmp=$(mktemp -d)
+    kubectl_calls="$tmp/kubectl.calls"
+    timeout_calls="$tmp/timeout.calls"
+    timeout_fail_commands=$(printf '%s\n' dmesg kubelet links services | grep -v "^${sole}$" | tr '\n' ' ')
+
+    cozy_capture_tenant_talos_node diagnostics-pod 10.244.1.92 "$tmp/node"
+
+    case "$sole" in
+      dmesg) log="dmesg.log" ;;
+      kubelet) log="kubelet.log" ;;
+      links) log="links.yaml.log" ;;
+      services) log="services.log" ;;
+    esac
+    # Not vacuous: the staging really did leave this read as the only answer.
+    assert_file_contains '[capture exit code: 0]' "$tmp/node/$log"
+    if [ -f "$tmp/node/CAPTURE-FAILED.txt" ]; then
+      echo "FAIL: with $sole the only answering read, the worker was declared to have produced nothing" >&2
+      rm -rf "$tmp"
+      false
+    fi
+    rm -rf "$tmp"
+  done
+}
+
+@test "a timed-out worker remains recorded and does not block the next capture" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  timeout_rc=124
+
+  cozy_capture_tenant_talos_node diagnostics-pod 10.244.1.93 "$tmp/node"
+
+  [ "$(wc -l < "$kubectl_calls")" -eq 4 ]
+  [ "$(wc -l < "$timeout_calls")" -eq 4 ]
+  assert_file_contains '[capture exit code: 124]' "$tmp/node/dmesg.log"
+  assert_file_contains '[capture exit code: 124]' "$tmp/node/kubelet.log"
+  assert_file_contains '[capture exit code: 124]' "$tmp/node/services.log"
+  rm -rf "$tmp"
+}
+
+@test "orchestrator continues from a timed-out worker to the next VMI" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  origin=$PWD
+  kubectl_calls="$tmp/kubectl.calls"
+  kubectl_manifest="$tmp/manifest.yaml"
+  kubectl_vmi_json="$tmp/vmis.json"
+  talosctl_calls="$tmp/talosctl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  timeout_fail_node_ip=10.244.1.93
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=diagnostic-smoke
+  printf '%s\n' '{"items":[{"metadata":{"name":"worker-no-ip"},"status":{"interfaces":[{"name":"default"}]}},{"metadata":{"name":"worker-a"},"status":{"interfaces":[{"name":"default","ipAddress":"10.244.1.93"}]}},{"metadata":{"name":"worker-b"},"status":{"interfaces":[{"name":"default","ipAddress":"10.244.1.94"}]}}]}' >"$kubectl_vmi_json"
+  printf '%s\n' '#!/bin/sh' >"$tmp/talosctl"
+  chmod 755 "$tmp/talosctl"
+  cd "$tmp"
+
+  cozy_capture_tenant_talos test-latest-version
+
+  [ "$(awk '/ exec kubernetes-test-latest-version-talos-diagnostics / { count++ } END { print count + 0 }' "$kubectl_calls")" -eq 8 ]
+  assert_file_contains 'default VMI interface has no reported IP address' "$COZY_REPORT_DIR/snapshots/$COZY_SNAPSHOT_NAME/tenant-talos/worker-no-ip/capture-error.log"
+  assert_file_contains '[capture exit code: 124]' "$COZY_REPORT_DIR/snapshots/$COZY_SNAPSHOT_NAME/tenant-talos/worker-a/dmesg.log"
+  assert_file_contains '[capture exit code: 124]' "$COZY_REPORT_DIR/snapshots/$COZY_SNAPSHOT_NAME/tenant-talos/worker-a/kubelet.log"
+  assert_file_contains '[capture exit code: 0]' "$COZY_REPORT_DIR/snapshots/$COZY_SNAPSHOT_NAME/tenant-talos/worker-b/dmesg.log"
+  assert_file_contains '[capture exit code: 0]' "$COZY_REPORT_DIR/snapshots/$COZY_SNAPSHOT_NAME/tenant-talos/worker-b/kubelet.log"
+  # Back out of the scratch directory before removing it: this test runs the
+  # orchestrator from inside it. Not because rm would fail -- BSD, busybox and
+  # GNU rm all remove a directory from inside it and return 0 -- but because
+  # the runner's own bookkeeping still runs in this subshell after the body
+  # returns, and it would be doing so on an unlinked cwd.
+  cd "$origin"
+  rm -rf "$tmp"
+}
+
+@test "cleanup deletes diagnostic Certificate before its Pod and Secret" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  cozy_wait_linstor_pool_baseline() { return 0; }
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+
+  cozy_cleanup test-latest-version
+
+  [ "$(sed -n '2p' "$kubectl_calls")" = '-n tenant-test delete certificates.cert-manager.io -l cozystack-e2e.io/tenant-talos-diagnostics --ignore-not-found --wait=true --timeout=30s' ]
+  [ "$(sed -n '3p' "$kubectl_calls")" = '-n tenant-test delete pod,secret -l cozystack-e2e.io/tenant-talos-diagnostics --ignore-not-found --wait=false' ]
+  rm -rf "$tmp"
+}
+
+@test "a worker whose reads were cut short is not told its directory is empty" {
+  # The slow-apid worker, and the shape this capture is most often reached on:
+  # every read is killed at its bound after writing part of what it fetched, so
+  # nothing exits zero and the tally reads nothing-completed -- while the
+  # directory holds real evidence. A marker saying nothing was observed would be
+  # this collector making the unsupported claim its own status arms exist to
+  # prevent, one directory up.
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  # Output first, then the non-zero status: what `timeout` does to a stream it
+  # kills, and the reason the mock cannot return before writing.
+  timeout_rc=124
+
+  cozy_capture_tenant_talos_node diagnostics-pod 10.244.1.93 "$tmp/node"
+
+  # Not vacuous: a read really did leave content behind before it was killed.
+  assert_file_contains 'mock capture for' "$tmp/node/dmesg.log"
+  assert_file_contains '[capture exit code: 124]' "$tmp/node/dmesg.log"
+  # The marker still fires -- nothing completed -- but says only that.
+  assert_file_contains 'no Talos read completed for this worker' "$tmp/node/CAPTURE-FAILED.txt"
+  assert_file_lacks_pattern 'nothing here was observed' "$tmp/node/CAPTURE-FAILED.txt"
+  rm -rf "$tmp"
+}
diff --git a/hack/run-kubernetes-talos-spec_test.bats b/hack/run-kubernetes-talos-spec_test.bats
new file mode 100644
index 0000000000..9eabc119db
--- /dev/null
+++ b/hack/run-kubernetes-talos-spec_test.bats
@@ -0,0 +1,64 @@
+#!/usr/bin/env bats
+# -----------------------------------------------------------------------------
+# Unit tests for talos_spec_block in hack/e2e-chainsaw/_lib/run-kubernetes.sh
+#
+# It is the composition point for the tenant Kubernetes CR's `spec.talos`: the
+# Talos OS image cache contributes imageFactoryURL when available. The result is
+# spliced into an unquoted heredoc directly under `spec:`, so an indentation slip
+# does not fail this function -- it produces a CR the API rejects, and every
+# kubernetes-* suite dies at tenant creation with an error that points at the CR
+# rather than at this line.
+#
+# The resolver is replaced with a stub after sourcing, which reduces this to the
+# pure composition it is: the resolver has its own coverage in
+# hack/talos-image-cache_test.bats and needs a cluster to mean anything.
+#
+# The assertion goes through yq on a spliced document rather than through grep
+# on the string, so what it pins is "the CR parses and the key lands under
+# spec.talos", which is the actual contract. A string match would keep passing
+# on a block indented into the wrong parent.
+#
+# CI runs this file under Bats through `make bats-unit-tests`. It also remains
+# compatible with the legacy `hack/cozytest.sh` translator, whose awk parser
+# recognizes only @test blocks and a bare `}` on its own line. The tests avoid
+# `run` and `$status` for that compatibility path. Sourcing run-kubernetes.sh
+# only defines functions and touches no cluster.
+#
+# Run with: bats hack/run-kubernetes-talos-spec_test.bats
+# -----------------------------------------------------------------------------
+
+load test_helper
+
+# Splice a talos_spec_block result under `spec:` of a minimal CR and print the
+# document, so yq can be asked what the tenant apiserver would see.
+spec_doc() {
+    printf 'apiVersion: apps.cozystack.io/v1alpha1\nkind: Kubernetes\nmetadata:\n  name: t\nspec:\n%s\n  host: ""\n' "$1"
+}
+
+@test "no Talos image cache renders nothing, so the chart default applies" {
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    resolve_talos_image_factory_url() { printf ''; }
+    out=$(talos_spec_block)
+    [ -z "$out" ] || { echo "expected no spec.talos block when the image cache is down, got [$out]" >&2; exit 1; }
+}
+
+@test "the Talos image cache renders imageFactoryURL and no registryMirrors" {
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    resolve_talos_image_factory_url() { printf 'http://talos-image-cache.kube-system.svc'; }
+    work=$(mktemp -d)
+    spec_doc "$(talos_spec_block)" > "$work/cr.yaml"
+    got=$(yq '.spec.talos.imageFactoryURL' "$work/cr.yaml")
+    [ "$got" = "http://talos-image-cache.kube-system.svc" ] || { echo "imageFactoryURL did not land under spec.talos, got [$got]" >&2; cat "$work/cr.yaml" >&2; rm -rf "$work"; exit 1; }
+    mirrors=$(yq '.spec.talos.registryMirrors' "$work/cr.yaml")
+    [ "$mirrors" = "null" ] || { echo "e2e must not inject registryMirrors, got [$mirrors]" >&2; rm -rf "$work"; exit 1; }
+    rm -rf "$work"
+}
+
+@test "the key the sandbox keys off is spelled the way the chart declares it" {
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    # talos_spec_block writes imageFactoryURL by hand. If the chart ever renames
+    # it, the CR would be rejected only at e2e time, and this file is the cheapest
+    # place to notice.
+    yq -e '.talos | has("imageFactoryURL")' packages/apps/kubernetes/values.yaml >/dev/null \
+        || { echo "packages/apps/kubernetes/values.yaml has no talos.imageFactoryURL; talos_spec_block would emit a key the chart rejects" >&2; exit 1; }
+}
diff --git a/hack/run-kubernetes-thread-cpu_test.bats b/hack/run-kubernetes-thread-cpu_test.bats
new file mode 100644
index 0000000000..4d9f7c90b4
--- /dev/null
+++ b/hack/run-kubernetes-thread-cpu_test.bats
@@ -0,0 +1,954 @@
+#!/usr/bin/env bats
+# Regression coverage for the tenant-worker per-thread CPU capture in
+# hack/e2e-chainsaw/_lib/run-kubernetes.sh. cozytest.sh ends an @test block at
+# the first bare closing brace, so command mocks stay at top level.
+#
+# What this capture answers, and why the collector beside it cannot: the
+# throttling capture reads the compute container's cgroup, and that cgroup holds
+# every thread QEMU runs -- the guest's vCPUs, the emulator thread, and the IO
+# helpers. A container burning most of its quota while the guest reports no
+# progress is therefore two different findings wearing the same number, and the
+# container-level counter cannot separate them. Only the per-thread split can,
+# and it exists nowhere else in this tree. These tests pin the split and the
+# separation between an unread container and a quiet one, not the reading.
+
+load test_helper
+
+kubectl_calls=/dev/null
+kubectl_pod_names=
+kubectl_list_rc=0
+kubectl_list_stderr=
+kubectl_exec_rc=0
+kubectl_exec_stderr=
+# Two stat lines from one process, in the shape /proc writes them. The second
+# is the one every field-counting reader gets wrong: a KVM vCPU thread is named
+# "CPU 0/KVM", the space sits inside the parentheses, and every field after it
+# shifts by one.
+kubectl_exec_output='clock ticks per second: 100
+process 41 comm qemu-kvm
+41 (qemu-kvm) S 1 41 41 0 -1 4194560 8100 0 0 0 4210 1180 0 0 20 0 9 0 5512
+57 (CPU 0/KVM) R 1 41 41 0 -1 4194368 120 0 0 0 39120 2210 0 0 20 0 9 0 5530'
+timeout_calls=/dev/null
+timeout_fail_pod=
+
+kubectl() {
+  printf '%s\n' "$*" >>"${kubectl_calls}"
+
+  if [ "${3:-}" = get ] && [ "${4:-}" = pods ]; then
+    [ -z "${kubectl_list_stderr}" ] || printf '%s\n' "${kubectl_list_stderr}" >&2
+    [ "${kubectl_list_rc}" -eq 0 ] || return "${kubectl_list_rc}"
+    [ -z "${kubectl_pod_names}" ] || printf '%s\n' ${kubectl_pod_names}
+    return 0
+  fi
+
+  if [ "${3:-}" = exec ]; then
+    [ -z "${kubectl_exec_stderr}" ] || printf '%s\n' "${kubectl_exec_stderr}" >&2
+    # Output before the status, so the branch that labels a partial capture is
+    # reachable: a read cut off part way through has already written what it
+    # managed to read, and a stub that returns first can only ever stage
+    # empty-plus-failure.
+    [ -z "${kubectl_exec_output}" ] || printf '%s\n' "${kubectl_exec_output}"
+    return "${kubectl_exec_rc}"
+  fi
+
+  return 0
+}
+
+timeout() {
+  local command_rc=0
+  printf '%s\n' "$*" >>"${timeout_calls}"
+  # Return 97 rather than running the command when the wrapper is not the
+  # bounded form: a read that lost its ceiling must not pass as a read.
+  [ "${1:-}" = -k ] || return 97
+  shift 3
+  "$@" || command_rc=$?
+  if [ -n "${timeout_fail_pod}" ]; then
+    case " $* " in
+      *"${timeout_fail_pod}"*) return 124 ;;
+    esac
+  fi
+  return "${command_rc}"
+}
+
+assert_file_contains() {
+  local needle="$1"
+  local file="$2"
+
+  if [ ! -f "${file}" ]; then
+    printf 'expected %s to exist so it could be checked for: %s\n' "${file}" "${needle}" >&2
+    return 1
+  fi
+  case "$(cat "${file}")" in
+    *"${needle}"*) return 0 ;;
+  esac
+  printf 'expected %s to contain: %s\n' "${file}" "${needle}" >&2
+  return 1
+}
+
+assert_file_lacks_pattern() {
+  local pattern="$1"
+  local file="$2"
+
+  # A missing file must fail rather than vacuously pass: a bare `! grep -q`
+  # succeeds on an unreadable path, which is indistinguishable from "the file
+  # exists and does not carry the label".
+  if [ ! -f "${file}" ]; then
+    printf 'expected %s to exist so it could be checked for: %s\n' "${file}" "${pattern}" >&2
+    return 1
+  fi
+  # Branched on awk's exact status. awk exits 1 for "no line matched" and 2 for
+  # "I could not evaluate this"; folded into an `if`, both land in the passing
+  # branch and the assertion "this pattern is absent" is satisfied by the
+  # matcher giving up. Every claim in this file about something NOT appearing
+  # rests on the three-way split below.
+  local _rc=0
+  awk -v pattern="${pattern}" '$0 ~ pattern { found = 1 } END { exit found ? 0 : 1 }' "${file}" || _rc=$?
+  case "${_rc}" in
+    0)
+      printf 'expected %s not to match: %s\n' "${file}" "${pattern}" >&2
+      return 1
+      ;;
+    1) return 0 ;;
+    *)
+      printf 'awk could not evaluate pattern %s against %s\n' "${pattern}" "${file}" >&2
+      return 1
+      ;;
+  esac
+}
+
+# The function under test redirects a command's stderr into a report file and
+# decides which artifact to write from it. cozytest.sh runs under `set -x`, so
+# the tracer's own line for that command lands on the very stderr being
+# redirected, and every assertion about those files would be reading the
+# tracer. Call through this wrapper so the sinks hold what production writes.
+run_capture() {
+  local _rc=0
+  ( set +x; cozy_capture_tenant_worker_thread_cpu 1 ) || _rc=$?
+  return "${_rc}"
+}
+
+@test "a negative assertion fails when its own matcher cannot evaluate" {
+  # The helper below every "must not appear" claim in this file. What rides on
+  # it here is the collector's contract stated negatively -- that an unreachable
+  # container is not written up as one that answered, that an incomplete read
+  # carries no pairing instruction -- so a matcher that fails open turns each of
+  # them into a sentence nobody checked.
+  tmp=$(mktemp -d)
+  printf 'anything\n' >"$tmp/subject"
+
+  if assert_file_lacks_pattern '*(' "$tmp/subject" 2>/dev/null; then
+    echo "FAIL: an unparseable pattern was reported as absent" >&2
+    rm -rf "$tmp"
+    return 1
+  fi
+  assert_file_lacks_pattern 'nothinglikethis' "$tmp/subject"
+  if assert_file_lacks_pattern 'anything' "$tmp/subject" 2>/dev/null; then
+    echo "FAIL: a present pattern was reported as absent" >&2
+    rm -rf "$tmp"
+    return 1
+  fi
+  rm -rf "$tmp"
+}
+
+@test "the threads are read from inside the compute container of each worker Pod" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_pod_names="virt-launcher-a"
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=thread-smoke
+
+  run_capture
+
+  # The container has to be named. virt-launcher runs several, and kubectl's
+  # default is the first one in the spec rather than the one running QEMU, so an
+  # unnamed exec reads a stranger's threads or fails on a container with no shell.
+  assert_file_contains 'exec virt-launcher-a -c compute' "$kubectl_calls"
+  # The projection is a parameter now, and the two callers of that listing pass
+  # different ones from twelve hundred lines apart. Swapped, this collector
+  # would exec into Pods named after nodes and the cAdvisor one would ask
+  # kubelets named after Pods: both dead, neither with an error, and every
+  # artifact full of sentences saying the subject was not reached. Nothing else
+  # in either suite sees the argument, because the mocks answer any listing
+  # regardless of what was asked for.
+  assert_file_contains 'jsonpath={range .items[?(@.status.phase=="Running")]}{.metadata.name}' "$kubectl_calls"
+  capture="$COZY_REPORT_DIR/snapshots/thread-smoke/tenant-thread-cpu/sample-1/virt-launcher-a.txt"
+  # The vCPU line and the emulator line both, because the whole question is
+  # which of them carries the time: a capture that kept only one of the two
+  # would answer it by construction.
+  assert_file_contains '(CPU 0/KVM)' "$capture"
+  assert_file_contains '(qemu-kvm)' "$capture"
+  assert_file_lacks_pattern 'incomplete' "$capture"
+  assert_file_lacks_pattern 'unknown' "$capture"
+  dir="$COZY_REPORT_DIR/snapshots/thread-smoke/tenant-thread-cpu/sample-1"
+  [ ! -f "$dir/virt-launcher-a.exec-error.log" ]
+  [ ! -f "$dir/COLLECTION-FAILED.txt" ]
+  rm -rf "$tmp"
+}
+
+@test "each read is bounded and keeps its exit code" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_pod_names="virt-launcher-a"
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=thread-smoke
+
+  run_capture
+
+  # An unbounded exec would hold the whole diagnostics block against the wedged
+  # kubelet this collector exists to study, and the phase budget bounds when a
+  # read may START, never how long one already running may take.
+  # Named by their verbs: both reads carry the same bound, so a bare '-k 5 20'
+  # would be satisfied twice by whichever one survived.
+  assert_file_contains '-k 5 20 kubectl -n tenant-test get pods -l kubevirt.io=virt-launcher' "$timeout_calls"
+  assert_file_contains '-k 5 20 kubectl -n tenant-test exec' "$timeout_calls"
+  # The listing is a request and carries the second bound too; the exec is a
+  # streamed connection and the tree's other exec captures bound it with the
+  # wrapper alone.
+  assert_file_contains '--request-timeout=20s' "$kubectl_calls"
+  assert_file_contains '[capture exit code: 0]' \
+    "$COZY_REPORT_DIR/snapshots/thread-smoke/tenant-thread-cpu/sample-1/virt-launcher-a.txt"
+  rm -rf "$tmp"
+}
+
+@test "the sample number decides which reading a file belongs to" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_pod_names="virt-launcher-a"
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=thread-smoke
+
+  ( set +x; cozy_capture_tenant_worker_thread_cpu 2 )
+
+  # utime and stime are cumulative since the thread started, so one reading is
+  # an average over an uptime and says nothing about which thread burned the
+  # window the deadline covered. A second reading written over the first leaves
+  # one file and no interval.
+  assert_file_contains '(CPU 0/KVM)' \
+    "$COZY_REPORT_DIR/snapshots/thread-smoke/tenant-thread-cpu/sample-2/virt-launcher-a.txt"
+  [ ! -d "$COZY_REPORT_DIR/snapshots/thread-smoke/tenant-thread-cpu/sample-1" ]
+  rm -rf "$tmp"
+}
+
+@test "each reading records when it was taken" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_pod_names="virt-launcher-a"
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=thread-smoke
+
+  run_capture
+
+  capture="$COZY_REPORT_DIR/snapshots/thread-smoke/tenant-thread-cpu/sample-1/virt-launcher-a.txt"
+  # The wait between the two passes is not the interval this subject's two
+  # readings span: the other two subjects' passes fall between them, and on the
+  # run this collector exists for those passes are the slow part. The stamps are
+  # what make the real interval readable off the pair.
+  assert_file_contains 'read attempted from' "$capture"
+  stamp=$(sed -n 's/.*read attempted from \([0-9][0-9]*\) to \([0-9][0-9]*\) epoch seconds.*/\1 \2/p' "$capture")
+  if [ -z "$stamp" ]; then
+    echo "expected a bare epoch stamp in $capture" >&2
+    cat "$capture" >&2
+    return 1
+  fi
+  rm -rf "$tmp"
+}
+
+@test "the legend names the field positions and the thread name that shifts them" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_pod_names="virt-launcher-a"
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=thread-smoke
+
+  run_capture
+
+  capture="$COZY_REPORT_DIR/snapshots/thread-smoke/tenant-thread-cpu/sample-1/virt-launcher-a.txt"
+  # Raw lines with no legend are a trap rather than data. The two numbers a
+  # reader wants sit at fixed positions in /proc/<pid>/task/<tid>/stat, and the
+  # thread this capture exists to identify is the one whose name breaks the
+  # count: awk over whitespace reads the wrong column for exactly the vCPU
+  # threads and the right one for every other thread, which is the shape of a
+  # wrong answer that looks right.
+  assert_file_contains 'utime' "$capture"
+  assert_file_contains 'stime' "$capture"
+  assert_file_contains 'CPU 0/KVM' "$capture"
+  # The escape from the trap, not just a warning about it. A legend that names
+  # the hazard without naming the parse leaves the next reader to invent one.
+  assert_file_contains 'last )' "$capture"
+  rm -rf "$tmp"
+}
+
+@test "the legend names which thread each comm belongs to" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_pod_names="virt-launcher-a"
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=thread-smoke
+
+  run_capture
+
+  capture="$COZY_REPORT_DIR/snapshots/thread-smoke/tenant-thread-cpu/sample-1/virt-launcher-a.txt"
+  # The whole discriminator is which of four kinds of thread holds the time, so
+  # a capture that does not say which name is which kind leaves the reader to
+  # guess the answer it was collected to settle.
+  assert_file_contains 'emulator' "$capture"
+  rm -rf "$tmp"
+}
+
+@test "the capture tells the reader how to pair it with its sibling sample" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_pod_names="virt-launcher-a"
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=thread-smoke
+
+  run_capture
+
+  capture="$COZY_REPORT_DIR/snapshots/thread-smoke/tenant-thread-cpu/sample-1/virt-launcher-a.txt"
+  assert_file_contains 'subtract this Pod file from its sibling under the other sample directory' "$capture"
+  rm -rf "$tmp"
+}
+
+@test "a read that did not finish is not told to pair with a sibling" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_pod_names="virt-launcher-a"
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=thread-smoke
+  # Lines arrived and the read still failed, which is a stream cut off part way
+  # through the thread list.
+  kubectl_exec_rc=124
+
+  run_capture
+
+  capture="$COZY_REPORT_DIR/snapshots/thread-smoke/tenant-thread-cpu/sample-1/virt-launcher-a.txt"
+  assert_file_contains 'these thread counters are incomplete' "$capture"
+  # Telling a reader to subtract two files asserts that both hold a whole
+  # reading. A difference taken against a truncated one understates whichever
+  # threads the read did not reach, and the threads it did not reach are the
+  # ones listed last -- so the understated set is not even random.
+  assert_file_lacks_pattern 'subtract this Pod file from its sibling' "$capture"
+  # And a legend that explains a column layout the file may not carry in full
+  # is the same overclaim one line down.
+  assert_file_lacks_pattern 'last \)' "$capture"
+  rm -rf "$tmp"
+}
+
+@test "a compute container that was not reached is recorded as unknown, not as an idle guest" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_pod_names="virt-launcher-a"
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=thread-smoke
+  kubectl_exec_rc=1
+  kubectl_exec_output=
+  kubectl_exec_stderr='Error from server: error dialing backend: remote error: tls: internal error'
+
+  run_capture
+
+  dir="$COZY_REPORT_DIR/snapshots/thread-smoke/tenant-thread-cpu/sample-1"
+  capture="$dir/virt-launcher-a.txt"
+  # An empty file here reads as a guest whose threads were all idle, which is
+  # the one conclusion this collector must never manufacture: the container
+  # dying is a routine outcome on this failure path and it is not a reading.
+  assert_file_contains 'was not reached' "$capture"
+  assert_file_contains 'exec-error.log' "$capture"
+  assert_file_lacks_pattern 'subtract this Pod file from its sibling' "$capture"
+  assert_file_contains 'error dialing backend' "$dir/virt-launcher-a.exec-error.log"
+  rm -rf "$tmp"
+}
+
+@test "an exec that died without a word is not reported as a container that answered" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_pod_names="virt-launcher-a"
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=thread-smoke
+  # timeout kills its child without a word and kubectl dies on SIGTERM the same
+  # way, so the dominant failure here arrives non-zero with an empty error log.
+  # Keyed on stderr rather than on the status, the artifact would say the
+  # opposite of what happened.
+  kubectl_exec_rc=137
+  kubectl_exec_output=
+  kubectl_exec_stderr=
+
+  run_capture
+
+  dir="$COZY_REPORT_DIR/snapshots/thread-smoke/tenant-thread-cpu/sample-1"
+  capture="$dir/virt-launcher-a.txt"
+  assert_file_contains 'was not reached' "$capture"
+  assert_file_contains 'without a word on either stream' "$capture"
+  # Naming a file that was never written sends the reader looking for evidence
+  # that does not exist.
+  [ ! -f "$dir/virt-launcher-a.exec-error.log" ]
+  assert_file_contains '[exit 137:' "$capture"
+  rm -rf "$tmp"
+}
+
+@test "a container that answered and said nothing is not reported as unreachable" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_pod_names="virt-launcher-a"
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=thread-smoke
+  kubectl_exec_rc=0
+  kubectl_exec_output=
+
+  run_capture
+
+  capture="$COZY_REPORT_DIR/snapshots/thread-smoke/tenant-thread-cpu/sample-1/virt-launcher-a.txt"
+  # Two different problems that leave the same empty file: an exec that never
+  # landed, and a shell that ran and printed nothing. They are fixed by looking
+  # in different places, so they must not share a sentence.
+  assert_file_contains 'answered and returned nothing' "$capture"
+  assert_file_lacks_pattern 'was not reached' "$capture"
+  rm -rf "$tmp"
+}
+
+@test "a container whose QEMU is gone carries no legend for columns it does not have" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_pod_names="virt-launcher-a"
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=thread-smoke
+  kubectl_exec_rc=0
+  kubectl_exec_output='clock ticks per second: 100
+NO-QEMU-PROCESS: no process whose name starts with qemu- exists in this container, so it had no threads to read'
+
+  run_capture
+
+  capture="$COZY_REPORT_DIR/snapshots/thread-smoke/tenant-thread-cpu/sample-1/virt-launcher-a.txt"
+  # A clean read that found nothing to read is a finding about the failure, and
+  # a different one from every arm around it.
+  assert_file_contains 'nothing to split' "$capture"
+  # A legend explaining a column layout over a file with no columns is the same
+  # overclaim as a pairing instruction over a partial read, and it would send
+  # the reader looking for stat lines that are not there.
+  assert_file_lacks_pattern 'last \)' "$capture"
+  assert_file_lacks_pattern 'subtract this Pod file from its sibling' "$capture"
+  rm -rf "$tmp"
+}
+
+@test "a warning beside a healthy listing is not filed as a failure" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_pod_names="virt-launcher-a"
+  kubectl_list_stderr='Warning: v1 Pod is deprecated in this cluster'
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=thread-smoke
+
+  run_capture
+
+  dir="$COZY_REPORT_DIR/snapshots/thread-smoke/tenant-thread-cpu/sample-1"
+  # kubectl writes deprecation and partial-result warnings with a zero exit, so
+  # a sink chosen by "something was written" files a healthy read as a failed
+  # one and the capture beside it reads as salvage.
+  [ ! -f "$dir/COLLECTION-FAILED.txt" ]
+  assert_file_contains 'deprecated' "$dir/READ-WARNINGS.txt"
+  rm -rf "$tmp"
+}
+
+@test "a warning beside a healthy exec is not filed as a failure" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_pod_names="virt-launcher-a"
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=thread-smoke
+  kubectl_exec_rc=0
+  kubectl_exec_stderr='Defaulted container "compute" out of: compute, volumecontainerdisk'
+
+  run_capture
+
+  dir="$COZY_REPORT_DIR/snapshots/thread-smoke/tenant-thread-cpu/sample-1"
+  # kubectl writes deprecation and defaulted-container notices on stderr with a
+  # zero exit, so the sink is chosen by the status rather than by something
+  # having been written. Filed as an error, a healthy exec would look failed and
+  # the capture beside it would read as salvage; discarded, a real notice about
+  # the read would be gone. The two sibling collectors pin this branch, and the
+  # round that suppressed the probe's own stderr rests on it.
+  assert_file_contains 'Defaulted container' "$dir/virt-launcher-a.READ-WARNINGS.txt"
+  [ ! -f "$dir/virt-launcher-a.exec-error.log" ]
+  assert_file_contains '(CPU 0/KVM)' "$dir/virt-launcher-a.txt"
+  rm -rf "$tmp"
+}
+
+@test "a Pod list that never returned is not reported as no workers" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_list_rc=1
+  kubectl_list_stderr='Unable to connect to the server: dial tcp: i/o timeout'
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=thread-smoke
+
+  run_capture || true
+
+  dir="$COZY_REPORT_DIR/snapshots/thread-smoke/tenant-thread-cpu/sample-1"
+  # An apiserver that never answered and a namespace with no worker in it are
+  # different findings, and an empty directory is how they become one.
+  assert_file_contains 'failed to list' "$dir/COLLECTION-FAILED.txt"
+  assert_file_contains 'i/o timeout' "$dir/COLLECTION-FAILED.txt"
+  rm -rf "$tmp"
+}
+
+@test "a namespace with no worker Pod says so instead of leaving an empty tree" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_pod_names=
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=thread-smoke
+
+  run_capture || true
+
+  dir="$COZY_REPORT_DIR/snapshots/thread-smoke/tenant-thread-cpu/sample-1"
+  # Named for the filter the query carries. A namespace whose launchers are all
+  # Pending is a different finding from one with no launcher at all, and the
+  # sentence has to be true of the listing that was actually issued.
+  assert_file_contains 'no Running virt-launcher Pod' "$dir/COLLECTION-FAILED.txt"
+  rm -rf "$tmp"
+}
+
+@test "the walk is capped and names both counts when it stops" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_pod_names="virt-launcher-a virt-launcher-b virt-launcher-c virt-launcher-d virt-launcher-e"
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=thread-smoke
+
+  run_capture
+
+  dir="$COZY_REPORT_DIR/snapshots/thread-smoke/tenant-thread-cpu/sample-1"
+  # A short listing otherwise reads as a small pool rather than a truncated
+  # walk, and the two counts are what separate them. Asserted as the whole
+  # sentence, the way the sibling suites assert theirs: the marker's claim is
+  # that the two numbers DIFFER, and a pair of bare digit checks is satisfied by
+  # a marker reading "stopped after 4 Pods; 4 matched in total".
+  assert_file_contains 'capture stopped after 4 Pods; 5 matched in total' \
+    "$dir/COLLECTION-TRUNCATED.txt"
+  # And the cap's VALUE, not just its wording. The marker prints max_pods rather
+  # than what the walk read, so an off-by-one in the boundary test leaves the
+  # sentence byte-identical while a Pod goes unread -- and max_pods is the term
+  # the node-join budget guard multiplies, so the arithmetic and the marker
+  # would misstate the same run together.
+  [ -f "$dir/virt-launcher-d.txt" ]
+  [ ! -f "$dir/virt-launcher-e.txt" ]
+  rm -rf "$tmp"
+}
+
+@test "a pool below the cap leaves no truncation marker" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_pod_names="virt-launcher-a virt-launcher-b"
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=thread-smoke
+
+  run_capture
+
+  dir="$COZY_REPORT_DIR/snapshots/thread-smoke/tenant-thread-cpu/sample-1"
+  # A marker on every run is a marker nobody reads, and this one is the only
+  # thing that says a capture answered for part of the pool.
+  [ ! -f "$dir/COLLECTION-TRUNCATED.txt" ]
+  [ -f "$dir/virt-launcher-b.txt" ]
+  rm -rf "$tmp"
+}
+
+@test "a Pod whose read times out does not stop the next one" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_pod_names="virt-launcher-a virt-launcher-b"
+  timeout_fail_pod=virt-launcher-a
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=thread-smoke
+
+  run_capture
+
+  dir="$COZY_REPORT_DIR/snapshots/thread-smoke/tenant-thread-cpu/sample-1"
+  # The two workers of one cluster are the comparison this capture is for, so a
+  # walk that abandons the rest after one wedged container answers half the
+  # question while looking like it answered all of it.
+  assert_file_contains '[exit 124:' "$dir/virt-launcher-a.txt"
+  assert_file_contains '(CPU 0/KVM)' "$dir/virt-launcher-b.txt"
+  rm -rf "$tmp"
+}
+
+@test "the probe finds the qemu process and reads every one of its threads" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  # A /proc the size of the one inside a virt-launcher: the QEMU process, a
+  # neighbour that is not it, and two threads under QEMU.
+  mkdir -p "$tmp/proc/41/task/41" "$tmp/proc/41/task/57" "$tmp/proc/9/task/9"
+  printf 'qemu-kvm\n' >"$tmp/proc/41/comm"
+  printf 'virt-launcher\n' >"$tmp/proc/9/comm"
+  printf '41 (qemu-kvm) S 1 41 41 0 -1 4194560 8100 0 0 0 4210 1180\n' >"$tmp/proc/41/task/41/stat"
+  printf '57 (CPU 0/KVM) R 1 41 41 0 -1 4194368 120 0 0 0 39120 2210\n' >"$tmp/proc/41/task/57/stat"
+  printf '9 (virt-launcher) S 0 9 9 0 -1 4194304 900 0 0 0 12 4\n' >"$tmp/proc/9/task/9/stat"
+
+  out=$(sh -c "$(_cozy_thread_cpu_probe)" probe "$tmp/proc")
+
+  printf '%s\n' "$out" >"$tmp/out"
+  # Both threads of the QEMU process, or the split this capture exists for is
+  # taken over a subset chosen by the probe rather than by the guest.
+  assert_file_contains '(qemu-kvm)' "$tmp/out"
+  assert_file_contains '(CPU 0/KVM)' "$tmp/out"
+  # And nothing from the neighbour: virt-launcher's own threads are outside the
+  # question and would be read as QEMU's under a heading that says QEMU's.
+  assert_file_lacks_pattern 'virt-launcher\) S' "$tmp/out"
+  rm -rf "$tmp"
+}
+
+@test "a process that vanished mid-walk leaves nothing on the probe's stderr" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  mkdir -p "$tmp/proc/41/task/41" "$tmp/proc/99"
+  printf 'qemu-kvm\n' >"$tmp/proc/41/comm"
+  printf '41 (qemu-kvm) S 1 41 41 0 -1 0 0 0 0 0 4210 1180\n' >"$tmp/proc/41/task/41/stat"
+  # An entry the glob finds and the read cannot open, which is what a thread
+  # exiting between the two looks like. A dangling symlink stages it the same
+  # way whatever uid the suite runs as, where a chmod would not.
+  ln -s /definitely-not-here "$tmp/proc/99/comm"
+
+  sh -c "$(_cozy_thread_cpu_probe)" probe "$tmp/proc" >"$tmp/out" 2>"$tmp/err"
+
+  # The probe's stderr is the collector's error artifact. A shell complaint
+  # about a process that had already exited lands there, and on a clean read the
+  # collector files it as a read warning -- a healthy capture shipping a warning
+  # about something that did not affect the reading, which is the misfiling
+  # every branch in this collector is written against.
+  if [ -s "$tmp/err" ]; then
+    echo "expected the probe to say nothing on stderr; it wrote:" >&2
+    cat "$tmp/err" >&2
+    return 1
+  fi
+  # And the suppression did not cost the reading it was protecting.
+  assert_file_contains '(qemu-kvm)' "$tmp/out"
+  rm -rf "$tmp"
+}
+
+@test "the probe says so when no qemu process exists rather than returning nothing" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  mkdir -p "$tmp/proc/9/task/9"
+  printf 'virt-launcher\n' >"$tmp/proc/9/comm"
+  printf '9 (virt-launcher) S 0 9 9 0 -1 4194304 900 0 0 0 12 4\n' >"$tmp/proc/9/task/9/stat"
+
+  out=$(sh -c "$(_cozy_thread_cpu_probe)" probe "$tmp/proc")
+
+  printf '%s\n' "$out" >"$tmp/out"
+  # A container whose QEMU has already exited is a finding about the failure,
+  # and silence from the probe would reach the artifact as a container that
+  # answered and said nothing -- a different problem, in a different place.
+  assert_file_contains 'NO-QEMU-PROCESS' "$tmp/out"
+  # And it reports having read the neighbour, because that is what separates
+  # this from a probe that could read nothing at all.
+  assert_file_lacks_pattern 'NO-PROC-READ' "$tmp/out"
+  rm -rf "$tmp"
+}
+
+@test "the probe says so when QEMU is named and its threads are already gone" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  # The race the probe runs into by construction: the comm read succeeds and
+  # the task directory is gone by the time it is opened. Staged as a process
+  # with no task tree at all, which is what the walk sees either way.
+  mkdir -p "$tmp/proc/41"
+  printf 'qemu-kvm\n' >"$tmp/proc/41/comm"
+
+  out=$(sh -c "$(_cozy_thread_cpu_probe)" probe "$tmp/proc")
+
+  printf '%s\n' "$out" >"$tmp/out"
+  # The heading alone makes the capture non-empty, so nothing downstream can
+  # tell this from a reading unless the probe says it. Reported as its own
+  # outcome rather than as "no QEMU": QEMU was there, which is a different
+  # sentence about the guest.
+  assert_file_contains 'NO-THREAD-LINES' "$tmp/out"
+  assert_file_lacks_pattern 'NO-QEMU-PROCESS' "$tmp/out"
+  rm -rf "$tmp"
+}
+
+@test "a capture carrying only a process heading is not given a column legend" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_pod_names="virt-launcher-a"
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=thread-smoke
+  kubectl_exec_rc=0
+  kubectl_exec_output='clock ticks per second: 100
+process 41 comm qemu-kvm
+NO-THREAD-LINES: a qemu-* process was named and not one of its task stat files could be read, so it exited between the two reads'
+
+  run_capture
+
+  capture="$COZY_REPORT_DIR/snapshots/thread-smoke/tenant-thread-cpu/sample-1/virt-launcher-a.txt"
+  assert_file_contains 'threads were gone before they could be read' "$capture"
+  # The whole hazard: a heading is enough to make the file non-empty, so every
+  # "was it read" arm above passes and the legend would describe columns this
+  # capture does not have.
+  assert_file_lacks_pattern 'last \)' "$capture"
+  assert_file_lacks_pattern 'subtract this Pod file from its sibling' "$capture"
+  rm -rf "$tmp"
+}
+
+@test "the probe reports a proc it could not read apart from a container without QEMU" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  # A proc mount with nothing readable under it. The two outcomes are fixed in
+  # different places, and only one of them is about the guest: reported as the
+  # other, the artifact would state that QEMU had exited on the strength of a
+  # read that never happened.
+  mkdir -p "$tmp/proc"
+
+  out=$(sh -c "$(_cozy_thread_cpu_probe)" probe "$tmp/proc")
+
+  printf '%s\n' "$out" >"$tmp/out"
+  assert_file_contains 'NO-PROC-READ' "$tmp/out"
+  assert_file_lacks_pattern 'NO-QEMU-PROCESS' "$tmp/out"
+  rm -rf "$tmp"
+}
+
+@test "a proc the probe could not read is not written up as a guest without QEMU" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  kubectl_calls="$tmp/kubectl.calls"
+  timeout_calls="$tmp/timeout.calls"
+  kubectl_pod_names="virt-launcher-a"
+  COZY_REPORT_DIR="$tmp/report"
+  COZY_SNAPSHOT_NAME=thread-smoke
+  kubectl_exec_rc=0
+  kubectl_exec_output='clock ticks per second: 100
+NO-PROC-READ: not one process could be read under the proc mount, so this says nothing about what the container was running'
+
+  run_capture
+
+  capture="$COZY_REPORT_DIR/snapshots/thread-smoke/tenant-thread-cpu/sample-1/virt-launcher-a.txt"
+  # The collector has to carry the distinction the probe drew, or drawing it
+  # bought nothing: a statement about the probe filed as a statement about the
+  # guest is the conflation this whole collector is built against.
+  assert_file_contains 'the thread split is unknown' "$capture"
+  assert_file_lacks_pattern 'nothing to split' "$capture"
+  assert_file_lacks_pattern 'last \)' "$capture"
+  rm -rf "$tmp"
+}
+
+@test "the probe reports the tick rate its two numbers are counted in" {
+  . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  tmp=$(mktemp -d)
+  mkdir -p "$tmp/proc/9/task/9"
+  printf 'virt-launcher\n' >"$tmp/proc/9/comm"
+
+  out=$(sh -c "$(_cozy_thread_cpu_probe)" probe "$tmp/proc")
+
+  printf '%s\n' "$out" >"$tmp/out"
+  # utime and stime are clock ticks, and the figure this capture is read
+  # against is cores. Without the rate on the same page the reader supplies one
+  # from memory, which is where a factor of ten enters a measurement.
+  assert_file_contains 'clock ticks per second' "$tmp/out"
+  rm -rf "$tmp"
+}
+
+@test "with timeout off PATH the exec still runs instead of exiting 127" {
+  # The fallback arm is what the phase-start warning promises for this
+  # collector: on a runner without the binary it runs UNBOUNDED rather than
+  # exiting 127 and leaving an empty directory. A promise the code does not keep
+  # is what this collector's every other branch is against, so the arm is
+  # entered here rather than inspected.
+  #
+  # A subprocess with a stripped PATH, because this file mocks `timeout` as a
+  # shell function and `command -v` finds functions -- the condition cannot be
+  # reached from inside a test body.
+  tmp=$(mktemp -d)
+  mkdir -p "$tmp/bin"
+  # Everything the collector shells out to, minus `timeout` itself. Missing one
+  # would fail this test for the wrong reason and read as the arm being broken.
+  for c in mkdir sort grep mv rm wc tr cat date; do
+    for d in /bin /usr/bin /usr/local/bin /opt/homebrew/bin; do
+      if [ -x "$d/$c" ]; then
+        ln -sf "$d/$c" "$tmp/bin/$c"
+        break
+      fi
+    done
+  done
+  for c in mkdir sort grep mv rm wc tr cat date; do
+    if [ ! -x "$tmp/bin/$c" ]; then
+      echo "FAIL: could not stage $c in the stripped PATH; the check below would be vacuous" >&2
+      return 1
+    fi
+  done
+  # Only the staged directory is checked. `command -v timeout` is always true
+  # here -- this file defines it as a shell function, which is the very fact the
+  # subprocess exists to escape.
+  if [ -e "$tmp/bin/timeout" ]; then
+    echo "FAIL: timeout leaked into the stripped PATH; this test would prove nothing" >&2
+    return 1
+  fi
+
+  out=$(bash -c '
+    set -eu
+    . hack/e2e-chainsaw/_lib/run-kubernetes.sh
+    kubectl() {
+      # To a file, not to stderr. The collector redirects the stderr of every
+      # read into its own artifact, so a stub that announces itself there is
+      # captured by the code under test and never reaches this output.
+      printf "KUBECTL %s\n" "$*" >>"$CALLS"
+      if [ "${3:-}" = get ] && [ "${4:-}" = pods ]; then printf "virt-launcher-a\n"; return 0; fi
+      if [ "${3:-}" = exec ]; then printf "41 (qemu-kvm) S 1 41 41 0 -1 0 0 0 0 0 4210 1180\n"; return 0; fi
+      return 0
+    }
+    CALLS='"$tmp"'/calls
+    COZY_REPORT_DIR='"$tmp"'/report
+    COZY_SNAPSHOT_NAME=fallback
+    PATH='"$tmp"'/bin
+    cozy_capture_tenant_worker_thread_cpu 1
+  ' 2>&1) || true
+  printf '%s\n' "$out" >"$tmp/out"
+
+  # The read ran at all -- bounded into exit 127 would leave nothing here.
+  assert_file_contains 'KUBECTL -n tenant-test exec virt-launcher-a -c compute' "$tmp/calls"
+  # And produced thread lines rather than an "unknown" label.
+  assert_file_contains '(qemu-kvm)' \
+    "$tmp/report/snapshots/fallback/tenant-thread-cpu/sample-1/virt-launcher-a.txt"
+  rm -rf "$tmp"
+}
+
+@test "the collector's own caps stay what its comments claim" {
+  lib=hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  # The Pod listing lives in the body this collector shares with the cAdvisor
+  # captures, so the subject here is the code the collector runs rather than the
+  # function that carries its name; reading only the named function would leave
+  # the listing assertions vacuously true against a body it does not contain.
+  fn=$(awk '/^cozy_capture_tenant_worker_thread_cpu\(\)/,/^}/' "$lib"
+      awk '/^_cozy_virt_launcher_listing\(\)/,/^}/' "$lib")
+  if [ -z "$fn" ]; then
+    echo "expected to find the collector in $lib" >&2
+    return 1
+  fi
+  case "$fn" in
+    *'max_pods=4'*) ;;
+    *) echo "expected the collector to cap the walk at the 4 Pods the comments state" >&2; return 1 ;;
+  esac
+  # The knob, not a literal that equals it today. A hardcoded 20 keeps its value
+  # when the block's budget is lowered, so the one read that ignores the knob is
+  # the one that outlives it.
+  case "$fn" in
+    *'timeout -k "${COZY_DIAG_READ_GRACE}" "${COZY_DIAG_READ_TIMEOUT}"'*) ;;
+    *) echo "expected each read to take the block's read-budget knob" >&2; return 1 ;;
+  esac
+  case "$fn" in
+    *'timeout -k 5 20'*) echo "expected no hardcoded bound to survive beside the knob" >&2; return 1 ;;
+  esac
+  # The listing is an apiserver request and carries the HTTP bound as well as
+  # the wall-clock one; without it a client retrying against a wedged apiserver
+  # is bounded only by the wrapper.
+  reads=$(printf '%s\n' "$fn" | grep -c 'kubectl -n tenant-test get pods' || true)
+  bounded=$(printf '%s\n' "$fn" | grep -A3 'kubectl -n tenant-test get pods' | grep -c -- '--request-timeout=' || true)
+  if [ "$reads" -eq 0 ] || [ "$reads" -ne "$bounded" ]; then
+    echo "every Pod listing must carry --request-timeout; $bounded of $reads do" >&2
+    return 1
+  fi
+}
+
+@test "the capture is declined by the phase budget rather than running unconditionally" {
+  lib=hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  gate=$(grep -n "^ *if cozy_diag_phase_has_time '(d) tenant worker CPU counters, sandbox node CPU time and worker per-thread CPU time'; then$" \
+    "$lib" | head -n 1 | cut -d: -f1)
+  call=$(grep -n '^ *cozy_capture_tenant_worker_thread_cpu "${_sample}" || true$' "$lib" | head -n 1 | cut -d: -f1)
+  if [ -z "$gate" ] || [ -z "$call" ]; then
+    echo "expected the capture to sit behind a cozy_diag_phase_has_time gate" >&2
+    return 1
+  fi
+  # THIS gate, not just some gate above the call. A line comparison alone is
+  # satisfied by any earlier gate in the block, which would leave the capture
+  # guarded by a decision taken about something else.
+  next=$(awk -v g="$gate" 'NR > g && /cozy_diag_phase_has_time/ { print NR; exit }' "$lib")
+  if [ -z "$next" ]; then
+    echo "expected another phase gate after line $gate, so this test could bound the section" >&2
+    return 1
+  fi
+  if [ "$call" -le "$gate" ] || [ "$call" -ge "$next" ]; then
+    echo "the capture (line $call) must sit between its gate ($gate) and the next one ($next)" >&2
+    return 1
+  fi
+}
+
+@test "the capture shares the pass the other two subjects already wait for" {
+  lib=hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  # A second wait would be paid on every failing run for a second rate over the
+  # same window, and the window is already the scarce term: the phase declines
+  # whatever has not started, so an added pause is taken out of the collectors
+  # below it rather than out of slack.
+  waits=$(grep -c '^ *sleep "\${COZY_DIAG_RATE_INTERVAL}"$' "$lib" || true)
+  if [ "$waits" -ne 1 ]; then
+    echo "expected exactly one measurement wait in the block, found $waits" >&2
+    return 1
+  fi
+  loop=$(grep -n '^ *for _sample in 1 2; do$' "$lib" | head -n 1 | cut -d: -f1)
+  done_line=$(awk -v l="$loop" 'NR > l && /^ *done$/ { print NR; exit }' "$lib")
+  call=$(grep -n '^ *cozy_capture_tenant_worker_thread_cpu "${_sample}" || true$' "$lib" | head -n 1 | cut -d: -f1)
+  for v in loop done_line call; do
+    eval "n=\$$v"
+    if [ -z "$n" ]; then
+      echo "expected to locate $v in $lib" >&2
+      return 1
+    fi
+  done
+  if [ "$call" -le "$loop" ] || [ "$call" -ge "$done_line" ]; then
+    echo "the capture (line $call) must run inside the existing sampling loop ($loop..$done_line)" >&2
+    return 1
+  fi
+}
+
+@test "the capture runs behind the console it could otherwise starve" {
+  lib=hack/e2e-chainsaw/_lib/run-kubernetes.sh
+  call=$(grep -n '^ *cozy_capture_tenant_worker_thread_cpu "${_sample}" || true$' "$lib" | head -n 1 | cut -d: -f1)
+  console=$(grep -n "cozy_capture_tenant_serial_console 'node-join failed" "$lib" | head -n 1 | cut -d: -f1)
+  if [ -z "$call" ] || [ -z "$console" ]; then
+    echo "expected the failure path to call both the console and this capture" >&2
+    return 1
+  fi
+  # Admission gates only when a collector may START, so a collector read twice
+  # and placed ahead of the console can leave the console never started rather
+  # than cut short -- and the console is the only surface that survives a worker
+  # which never reached apid, the shape this failure usually takes.
+  if [ "$call" -le "$console" ]; then
+    echo "the thread capture (line $call) must run after the console capture (line $console)" >&2
+    return 1
+  fi
+}
diff --git a/hack/run-migrations.bats b/hack/run-migrations.bats
new file mode 100644
index 0000000000..7f9817a494
--- /dev/null
+++ b/hack/run-migrations.bats
@@ -0,0 +1,180 @@
+#!/usr/bin/env bats
+# -----------------------------------------------------------------------------
+# Unit tests for packages/core/platform/images/migrations/run-migrations.sh.
+#
+# The migration hook Job retries a failed pod with the environment rendered for
+# the first one, so CURRENT_VERSION is what the cluster was on before any
+# migration of this upgrade ran. Every migration that finished has stamped the
+# cozystack-version ConfigMap since, and a retried pod must start from that
+# stamp, or it runs finished migrations a second time.
+#
+# The runner executes in the migrations image's alpine base (busybox ash, the
+# interpreter it ships with) against stand-in migrations and a fake kubectl
+# that keeps the stamped version in a file, so one pod's stamps are what the
+# next pod reads. The harness shape is hack/migration-58-http-cache-freeze.bats's.
+#
+# Run with: bats hack/run-migrations.bats from the repo root.
+# -----------------------------------------------------------------------------
+
+load test_helper
+
+FAKEBIN="$PWD/hack/testdata/run-migrations"
+RUNNER="$PWD/packages/core/platform/images/migrations/run-migrations.sh"
+LIB="$PWD/packages/core/platform/images/migrations/migrations/lib"
+ALPINE=$(sed -n 's/^FROM \(alpine:[^ ]*\).*$/\1/p' \
+  "$PWD/packages/core/platform/images/migrations/Dockerfile" | head -1)
+WORKROOT="${TMPDIR:-/tmp}/cozy-run-migrations-$$"
+
+cozy_cleanup() {
+  rm -rf "$WORKROOT"
+  return 0
+}
+
+# prep <stamped version, or "none" for no ConfigMap>
+prep() {
+  docker info >/dev/null 2>&1 || {
+    echo "docker is required: these tests run run-migrations.sh inside $ALPINE," >&2
+    echo "the migrations image's base." >&2
+    return 1
+  }
+  mkdir -p "$WORKROOT"
+  WORK=$(mktemp -d "$WORKROOT/XXXXXX")
+  mkdir -p "$WORK/migrations"
+  cp -R "$LIB" "$WORK/migrations/lib"
+  for n in 57 58 59; do
+    cp "$FAKEBIN/migration" "$WORK/migrations/$n"
+  done
+  : > "$WORK/ran"
+  [ "$1" = none ] || printf '%s' "$1" > "$WORK/state"
+  chmod +x "$FAKEBIN/kubectl"
+  unset FAKE_FAIL_AT FAKE_READ_FAIL FAKE_EXIST_FAIL || true
+  return 0
+}
+
+# run_pod <CURRENT_VERSION> <TARGET_VERSION> -- one pod of the hook Job.
+run_pod() {
+  _run_pod_rc=0
+  docker run --rm --network none \
+    --user "$(id -u):$(id -g)" \
+    -v "$RUNNER:/usr/bin/run-migrations.sh:ro" \
+    -v "$WORK/migrations:/migrations" \
+    -v "$FAKEBIN:/fakebin:ro" \
+    -v "$WORK:/work" \
+    -e PATH=/fakebin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin \
+    -e FAKE_STATE=/work/state \
+    -e FAKE_FAIL_AT="${FAKE_FAIL_AT-}" \
+    -e FAKE_READ_FAIL="${FAKE_READ_FAIL-}" \
+    -e FAKE_EXIST_FAIL="${FAKE_EXIST_FAIL-}" \
+    -e NAMESPACE=cozy-system \
+    -e CURRENT_VERSION="$1" \
+    -e TARGET_VERSION="$2" \
+    "$ALPINE" /bin/sh /usr/bin/run-migrations.sh || _run_pod_rc=$?
+  return "$_run_pod_rc"
+}
+
+ran() {
+  tr '\n' ' ' < "$WORK/ran" | sed 's/ $//'
+  return 0
+}
+
+@test "a retried pod starts from the version the failed pod stamped" {
+  prep 57
+  export FAKE_FAIL_AT=59
+  rc=0
+  run_pod 57 60 || rc=$?
+  [ "$rc" -ne 0 ]
+  [ "$(cat "$WORK/state")" = 59 ]
+
+  unset FAKE_FAIL_AT
+  rc=0
+  run_pod 57 60 || rc=$?
+  echo "ran: $(ran)"
+  [ "$rc" -eq 0 ]
+  [ "$(ran)" = "57 58 59 59" ]
+  [ "$(cat "$WORK/state")" = 60 ]
+  rm -rf "$WORK"
+}
+
+@test "a pod that finds the target already stamped runs nothing" {
+  prep 60
+  rc=0
+  run_pod 57 60 || rc=$?
+  echo "ran: $(ran)"
+  [ "$rc" -eq 0 ]
+  [ -z "$(ran)" ]
+  rm -rf "$WORK"
+}
+
+@test "a ConfigMap with no version falls back to the rendered one" {
+  prep ""
+  rc=0
+  run_pod 58 60 || rc=$?
+  echo "ran: $(ran)"
+  [ "$rc" -eq 0 ]
+  [ "$(ran)" = "58 59" ]
+  rm -rf "$WORK"
+}
+
+# A non-integer start fails the -ge test inside an if and makes seq fail
+# inside the for list, and neither trips set -e: without the fallback such a
+# stamp gives a green Job that ran nothing and moved no stamp.
+@test "a ConfigMap with a non-integer version falls back to the rendered one" {
+  prep v58
+  rc=0
+  run_pod 58 60 || rc=$?
+  echo "ran: $(ran)"
+  [ "$rc" -eq 0 ]
+  [ "$(ran)" = "58 59" ]
+  rm -rf "$WORK"
+}
+
+# The same unguarded -ge and empty seq turn an all-digit stamp past the shell's
+# integer range into a green Job that ran nothing. Falling back is no answer:
+# the chart's int renders such a stamp as 0, which would replay every migration.
+@test "a stamped version outside the shell's integer range stops before any migration" {
+  prep 999999999999999999999999999999
+  rc=0
+  run_pod 0 60 || rc=$?
+  echo "ran: $(ran)"
+  [ "$rc" -ne 0 ]
+  [ -z "$(ran)" ]
+  rm -rf "$WORK"
+}
+
+@test "a failed read of the stamped version stops before any migration" {
+  prep 58
+  export FAKE_READ_FAIL="Error from server (Timeout): the server was unable to return a response in the time allotted"
+  rc=0
+  run_pod 57 60 || rc=$?
+  echo "ran: $(ran)"
+  [ "$rc" -ne 0 ]
+  [ -z "$(ran)" ]
+  [ "$(cat "$WORK/state")" = 58 ]
+  rm -rf "$WORK"
+}
+
+# Only NotFound means a fresh cluster. Reading any other failure of the
+# existence check as absence stamps the target over a cluster whose
+# migrations never ran, and the Job ends green.
+@test "a failed existence check stops before stamping or running anything" {
+  prep 57
+  export FAKE_EXIST_FAIL="Unable to connect to the server: net/http: TLS handshake timeout"
+  rc=0
+  run_pod 57 60 || rc=$?
+  echo "ran: $(ran)"
+  [ "$rc" -ne 0 ]
+  [ -z "$(ran)" ]
+  [ "$(cat "$WORK/state")" = 57 ]
+  rm -rf "$WORK"
+}
+
+@test "with no ConfigMap it stamps the target and runs nothing" {
+  prep none
+  rc=0
+  run_pod 57 60 || rc=$?
+  echo "ran: $(ran)"
+  [ "$rc" -eq 0 ]
+  [ -z "$(ran)" ]
+  [ "$(cat "$WORK/state")" = 60 ]
+  rm -rf "$WORK"
+}
diff --git a/hack/runner-identity.bats b/hack/runner-identity.bats
new file mode 100644
index 0000000000..acfa36e32d
--- /dev/null
+++ b/hack/runner-identity.bats
@@ -0,0 +1,1452 @@
+#!/usr/bin/env bats
+# -----------------------------------------------------------------------------
+# Unit tests for hack/e2e-runner-identity.sh -- the record of which machine an
+# e2e run landed on.
+#
+# What this suite is guarding, and why it is not a numbers test: the capture
+# cannot be wrong about the hardware, because it copies what the machine says.
+# What it can be is absent, or present and empty, or present and describing the
+# wrong layer -- and each of those reads, in the artifact, exactly like a run on
+# an unremarkable runner. So the assertions below are about the arms that keep
+# those apart: an `imds unreachable` line rather than a missing block, a named
+# absent field rather than a silent one, and a legend saying the numbers belong
+# to the runner VM and not to anything inside it.
+#
+# Two shapes of test, like hack/capture-dataplane.bats.
+#
+# The first sources the script with E2E_RUNNER_IDENTITY_LIB set, which its guard
+# honours by defining the helpers and returning before it reads or writes
+# anything. Those tests drive the pure helpers directly: the number reader over the
+# shape sizing object, the scalar guard that decides whether a per-key answer is
+# one value, and the ceiling knob.
+#
+# The second runs the script as a subprocess against stubs on PATH. That is the
+# only way to reach the body: `curl` is invoked in a child process, so a shell
+# function here would be invisible exactly where the assertion needs it, and the
+# arms that matter -- what reaches the file, what reaches stdout, what the exit
+# status is -- are properties of the running script.
+#
+# The root-document fixture uses an obviously synthetic OCID and display name, and
+# it is there to be asserted ABSENT twice over: this capture never requests that
+# document, and the arm that refuses a value which is not one scalar is what holds
+# that when a service answers it anyway. A real instance's root document carries
+# the instance and compartment OCIDs, the image OCID, the display name, the
+# hostname and the user metadata bag, and this record is published as a CI
+# artifact.
+#
+# Title syntax constraints (inherited from cozytest.sh's awk parser):
+#   - Titles delimited by ASCII double quotes; embedded quotes truncate.
+#   - Only [A-Za-z0-9] from the title survives into the function name, so keep
+#     titles distinctive in their alphanumeric run.
+#   - An @test block ends at the first closing brace in column zero, so helpers
+#     and stub heredocs stay at top level.
+#
+# Run from the repo root with `make bats-unit-tests`, or directly with
+# `bats hack/runner-identity.bats`. The legacy `hack/cozytest.sh` runner remains
+# a supported compatibility path.
+# -----------------------------------------------------------------------------
+
+load test_helper
+
+HACK_DIR="$(cd "$(dirname "${BATS_TEST_FILENAME:-$0}")" && pwd)"
+SCRIPT="$HACK_DIR/e2e-runner-identity.sh"
+REPO_ROOT="$(cd "$HACK_DIR/.." && pwd)"
+
+# Loads the pure helpers. The guard returns before anything is read or written,
+# so this needs no runner and no network. It also brings in the two defaults, so
+# the assertions below read them from the script instead of restating them --
+# a restated default is one that goes stale in the direction that stays green.
+E2E_RUNNER_IDENTITY_LIB=1
+# shellcheck source=/dev/null
+. "$SCRIPT"
+
+# And the report side, whose fold-in is one function for the same reason: the
+# module around it needs a cluster, while the arm that decides between a record
+# and an explanation is decided entirely by a local file.
+COZYREPORT_LIB=1
+# shellcheck source=/dev/null
+. "$REPO_ROOT/hack/cozyreport.sh"
+
+assert_file_contains() {
+  local needle="$1"
+  local file="$2"
+
+  if [ ! -f "${file}" ]; then
+    printf 'expected %s to exist so it could be checked for: %s\n' "${file}" "${needle}" >&2
+    return 1
+  fi
+  case "$(cat "${file}")" in
+    *"${needle}"*) return 0 ;;
+  esac
+  printf 'expected %s to contain: %s\n' "${file}" "${needle}" >&2
+  cat "${file}" >&2
+  return 1
+}
+
+assert_file_lacks_pattern() {
+  local pattern="$1"
+  local file="$2"
+
+  # A missing file must fail rather than vacuously pass: a bare `! grep -q`
+  # succeeds on an unreadable path, which is indistinguishable from "the file
+  # exists and does not carry the pattern".
+  if [ ! -f "${file}" ]; then
+    printf 'expected %s to exist so it could be checked for: %s\n' "${file}" "${pattern}" >&2
+    return 1
+  fi
+  # Branched on awk's exact status. awk exits 1 for "no line matched" and 2 for
+  # "I could not evaluate this"; folded together, a negative assertion is
+  # satisfied by its own matcher giving up, which is the direction that goes
+  # green and stays green.
+  local _rc=0
+  awk -v pattern="${pattern}" '$0 ~ pattern { found = 1 } END { exit found ? 0 : 1 }' "${file}" || _rc=$?
+  case "${_rc}" in
+    0)
+      printf 'expected %s not to match: %s\n' "${file}" "${pattern}" >&2
+      cat "${file}" >&2
+      return 1
+      ;;
+    1) return 0 ;;
+    *)
+      printf 'awk could not evaluate pattern %s against %s\n' "${pattern}" "${file}" >&2
+      return 1
+      ;;
+  esac
+}
+
+# The shape sizing object, as the `shapeConfig` subpath serves it: a flat object of
+# sizing numbers with one string in it, pretty-printed because the service is free
+# to answer either way and the reader buffers its whole input for that reason.
+shape_config() {
+  cat <<'JSON'
+{
+  "ocpus" : 16.0,
+  "memoryInGBs" : 128.0,
+  "networkingBandwidthInGbps" : 16.0,
+  "maxVnicAttachments" : 16,
+  "processorDescription" : "AMD EPYC 9J14 96-Core Processor"
+}
+JSON
+}
+
+# The ROOT instance document, which this capture deliberately never requests.
+#
+# It is here to be asserted absent, and to be fed to the scalar guard as the thing
+# a per-key request must never be allowed to render: on a real instance it carries
+# the instance and compartment OCIDs, the image OCID, the display name, the
+# hostname and the user-supplied metadata bag. The values below are obviously
+# synthetic.
+imds_root_document() {
+  cat <<'JSON'
+{
+  "availabilityDomain" : "xYzA:US-CHICAGO-1-AD-1",
+  "faultDomain" : "FAULT-DOMAIN-2",
+  "timeCreated" : 1600381928581,
+  "compartmentId" : "ocid1.compartment.oc1..aaaaexample",
+  "displayName" : "runner-pool-node-7",
+  "hostname" : "runner-pool-node-7",
+  "id" : "ocid1.instance.oc1.us-chicago-1.anexampleocid",
+  "image" : "ocid1.image.oc1.us-chicago-1.anexampleocid",
+  "metadata" : {
+    "ssh_authorized_keys" : "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5example"
+  },
+  "region" : "us-chicago-1",
+  "shape" : "VM.Standard.E5.Flex"
+}
+JSON
+}
+
+# Stubs for the tools the body runs, staged as executables rather than mocked as
+# functions: every one of them is run in a child process, where a function defined
+# in this shell does not exist.
+#
+# Each stub reads what it should do from a FILE beside it rather than from a value
+# baked in when it was written. A stub carrying its behaviour in its own text has
+# to be regenerated after every change, and a test that changes the behaviour and
+# forgets to regenerate passes against the previous fixture -- which is a green
+# test asserting nothing, in a suite whose whole subject is the difference between
+# a capture that ran and one that did not.
+#
+# The curl stub answers PER KEY, out of `imds/<key>`, because the capture reads one
+# key at a time and a stub answering the same bytes to every URL could not tell a
+# test about one key from a test about another. It records its whole argv, since the
+# ceiling, the header and the path are the three things about these reads that a
+# test can check and a reader of the record cannot.
+stage_stubs() {
+  local dir="$1"
+  mkdir -p "${dir}/bin" "${dir}/imds"
+  cat >"${dir}/bin/curl" <<STUB
+#!/bin/sh
+printf '%s\n' "\$*" >>"${dir}/curl.args"
+for a in "\$@"; do url=\$a; done
+key=\${url##*/instance/}
+if [ -f "${dir}/imds/\$key.rc" ]; then
+  rc=\$(cat "${dir}/imds/\$key.rc")
+else
+  rc=\$(cat "${dir}/curl.rc")
+fi
+if [ -s "${dir}/imds/\$key.err" ]; then
+  cat "${dir}/imds/\$key.err" >&2
+elif [ -s "${dir}/curl.stderr" ]; then
+  cat "${dir}/curl.stderr" >&2
+fi
+[ ! -f "${dir}/imds/\$key" ] || cat "${dir}/imds/\$key"
+exit "\$rc"
+STUB
+  cat >"${dir}/bin/lscpu" <<STUB
+#!/bin/sh
+cat "${dir}/lscpu.out"
+STUB
+  cat >"${dir}/bin/nproc" <<STUB
+#!/bin/sh
+cat "${dir}/nproc.out"
+STUB
+  cat >"${dir}/bin/uname" <<STUB
+#!/bin/sh
+cat "${dir}/uname.out"
+STUB
+  chmod +x "${dir}/bin/curl" "${dir}/bin/lscpu" "${dir}/bin/nproc" "${dir}/bin/uname"
+  curl_args="${dir}/curl.args"
+  stub_bin="${dir}/bin"
+}
+
+curl_args=/dev/null
+stub_bin=
+
+# Runs the script with the staged stubs ahead of the real PATH and captures its
+# stdout. Wrapped in `set +x` because cozytest.sh runs test bodies under the
+# tracer, and every line of the trace would otherwise land in the capture this
+# suite reads.
+#
+# The status is returned rather than asserted here: several tests are about the
+# script exiting zero on a path that failed, so the status is the subject.
+run_identity() {
+  local _rc=0
+  ( set +x
+    PATH="${stub_bin}:${PATH}" \
+      COZY_RUNNER_IDENTITY_FILE="${identity_file}" \
+      sh "$SCRIPT" >"${stdout_file}" 2>"${stderr_file}"
+  ) || _rc=$?
+  return "${_rc}"
+}
+
+# The healthy fixture: an OCI instance answering every key this capture asks for, a
+# processor table with a model line, a CPU count and a kernel release. Every test
+# starts here and overwrites the one file it is about, so what a test changes is
+# visible in the test rather than in a stub regenerated behind it.
+#
+# `region` is staged short and `canonicalRegionName` long, which is what the
+# service does for some regions and the reason the record keeps both.
+stage() {
+  stage_stubs "$1"
+  identity_file="$1/out/runner-identity.txt"
+  stdout_file="$1/stdout"
+  stderr_file="$1/stderr"
+  printf '0\n' >"$1/curl.rc"
+  : >"$1/curl.stderr"
+  printf 'VM.Standard.E5.Flex\n' >"$1/imds/shape"
+  printf 'chi\n' >"$1/imds/region"
+  printf 'us-chicago-1\n' >"$1/imds/canonicalRegionName"
+  printf 'xYzA:US-CHICAGO-1-AD-1\n' >"$1/imds/availabilityDomain"
+  printf 'FAULT-DOMAIN-2\n' >"$1/imds/faultDomain"
+  shape_config >"$1/imds/shapeConfig"
+  {
+    printf 'Architecture:                       x86_64\n'
+    printf 'Model name:                         AMD EPYC 9J14 96-Core Processor\n'
+    printf 'Flags:                              fpu vme de pse tsc msr svm npt nrip_save vgif umip pku\n'
+  } >"$1/lscpu.out"
+  printf '32\n' >"$1/nproc.out"
+  printf '6.8.0-1021-oracle\n' >"$1/uname.out"
+}
+
+# ---------------------------------------------------------------------------
+# The SVM sub-feature reader, driven directly.
+#
+# These exist because the flag this reader was added for, vgif, is the one field
+# in the record that decides whether a nested guest runs at hardware speed or
+# traps to the layer below on every world switch, and it is read out of a flag
+# list where a whole-word match is the only thing standing between `svm` and
+# `svm_lock`.
+# ---------------------------------------------------------------------------
+
+@test "the svm reader keeps the sub-features an AMD guest was given" {
+  tmp=$(mktemp -d)
+  printf 'Model name:  AMD EPYC 7J13 64-Core Processor\n' >"$tmp/lscpu"
+  printf 'Flags:       fpu de tsc svm cr8_legacy npt nrip_save vgif umip pku\n' >>"$tmp/lscpu"
+
+  out=$(runner_svm_features <"$tmp/lscpu")
+
+  # vgif is the whole reason for this line: present here, and its absence on an
+  # otherwise identical host is the only difference measured between a runner
+  # whose nested guests boot and one whose do not.
+  [ "$out" = "svm npt nrip_save vgif" ] || {
+    echo "expected 'svm npt nrip_save vgif', got '$out'" >&2
+    return 1
+  }
+}
+
+@test "the svm reader reports the same host without vgif as lacking it" {
+  tmp=$(mktemp -d)
+  printf 'Flags:       fpu de tsc svm cr8_legacy npt nrip_save umip pku\n' >"$tmp/lscpu"
+
+  out=$(runner_svm_features <"$tmp/lscpu")
+
+  [ "$out" = "svm npt nrip_save" ] || {
+    echo "expected 'svm npt nrip_save', got '$out'" >&2
+    return 1
+  }
+}
+
+@test "the svm reader says nothing about an Intel host, whose vnmi is not SVM" {
+  tmp=$(mktemp -d)
+  # vnmi is a flag name under VMX as well as SVM. Ungated, this reader would
+  # print one SVM sub-feature for a machine that has no SVM, which is not a
+  # shorter answer but a wrong one.
+  printf 'Flags:       fpu vme de pse tsc msr vmx ept vpid vnmi\n' >"$tmp/lscpu"
+
+  out=$(runner_svm_features <"$tmp/lscpu")
+
+  [ -z "$out" ] || {
+    echo "expected no output for an Intel flag list, got '$out'" >&2
+    return 1
+  }
+}
+
+@test "the svm reader does not take svm from svm_lock alone" {
+  tmp=$(mktemp -d)
+  # A whole-word match is what keeps this honest: svm_lock is a sub-feature name
+  # in its own right and its presence does not mean SVM is exposed.
+  printf 'Flags:       fpu de tsc svm_lock npt umip\n' >"$tmp/lscpu"
+
+  out=$(runner_svm_features <"$tmp/lscpu")
+
+  [ -z "$out" ] || {
+    echo "expected no output when only svm_lock is present, got '$out'" >&2
+    return 1
+  }
+}
+
+@test "the svm reader reads the first Flags line only" {
+  tmp=$(mktemp -d)
+  # lscpu prints one Flags line, but a caller handing this a concatenated table
+  # would otherwise get two machines' features merged into one answer.
+  printf 'Flags:       fpu svm npt vgif\n' >"$tmp/lscpu"
+  printf 'Flags:       fpu svm npt avic\n' >>"$tmp/lscpu"
+
+  out=$(runner_svm_features <"$tmp/lscpu")
+
+  [ "$out" = "svm npt vgif" ] || {
+    echo "expected only the first Flags line, got '$out'" >&2
+    return 1
+  }
+}
+
+# ---------------------------------------------------------------------------
+# The number reader and the scalar guard, driven directly.
+# ---------------------------------------------------------------------------
+
+@test "the number reader keeps every number the sizing object carries" {
+  tmp=$(mktemp -d)
+  shape_config >"$tmp/obj"
+
+  runner_imds_numbers shapeConfig <"$tmp/obj" >"$tmp/out"
+
+  # ocpus against the vCPU count the lane advertises is the one arithmetic nothing
+  # else in the report can do: a 32-vCPU lane served 16 physical cores is a
+  # different machine from one served 32, and only these two numbers together say
+  # which it was.
+  assert_file_contains 'shapeConfig.ocpus: 16.0' "$tmp/out"
+  assert_file_contains 'shapeConfig.memoryInGBs: 128.0' "$tmp/out"
+  assert_file_contains 'shapeConfig.networkingBandwidthInGbps: 16.0' "$tmp/out"
+  assert_file_contains 'shapeConfig.maxVnicAttachments: 16' "$tmp/out"
+  rm -rf "$tmp"
+}
+
+@test "the number reader reads by key rather than by a list of key names" {
+  tmp=$(mktemp -d)
+  # A key nobody here has heard of. The sizing keys have been renamed upstream
+  # before, and a reader built on a hardcoded list reports the size of the machine
+  # as unknown on every run, quietly, from the day the rename lands.
+  printf '%s' '{"ocpusRenamedUpstream":48.0}' | runner_imds_numbers shapeConfig >"$tmp/out"
+
+  assert_file_contains 'shapeConfig.ocpusRenamedUpstream: 48.0' "$tmp/out"
+  rm -rf "$tmp"
+}
+
+@test "the number reader drops what is not a number and says how much it dropped" {
+  tmp=$(mktemp -d)
+  # Numbers only, and that is what makes the privacy rule structural rather than
+  # an argument about whatever Oracle may add to this object later: a size is a
+  # number and an identifier is a string.
+  printf '%s' '{"ocpus":16.0,"processorDescription":"AMD EPYC 9J14","gpus":null,"burstable":true}' |
+    runner_imds_numbers shapeConfig >"$tmp/out"
+
+  assert_file_contains 'shapeConfig.ocpus: 16.0' "$tmp/out"
+  assert_file_lacks_pattern 'processorDescription' "$tmp/out"
+  assert_file_lacks_pattern 'AMD EPYC' "$tmp/out"
+  # `null` and `true` are dropped rather than printed: neither is a measurement,
+  # and the word in a record reads as a value the service published.
+  assert_file_lacks_pattern 'null' "$tmp/out"
+  assert_file_lacks_pattern 'true' "$tmp/out"
+  # Counted, not listed. Naming the keys would print the very strings the rule
+  # exists to keep out, and a count is enough to say the object held more.
+  assert_file_contains 'shapeConfig: 3 further field(s) were not kept' "$tmp/out"
+  rm -rf "$tmp"
+}
+
+@test "an object answered on one line reads the same as a pretty printed one" {
+  tmp=$(mktemp -d)
+  # The service is free to answer either way, and a reader that scanned line by
+  # line would find a key whose value sits on the next line and call it absent.
+  printf '{\n  "ocpus" : 12.0,\n  "memoryInGBs" : 96.0\n}\n' |
+    runner_imds_numbers shapeConfig >"$tmp/pretty"
+  printf '{"ocpus":12.0,"memoryInGBs":96.0}' | runner_imds_numbers shapeConfig >"$tmp/flat"
+
+  assert_file_contains 'shapeConfig.ocpus: 12.0' "$tmp/pretty"
+  assert_file_contains 'shapeConfig.memoryInGBs: 96.0' "$tmp/pretty"
+  diff "$tmp/pretty" "$tmp/flat"
+  rm -rf "$tmp"
+}
+
+@test "an object holding no number at all is not rendered as a size" {
+  tmp=$(mktemp -d)
+  printf '%s' '{"gpuDescription":"none"}' | runner_imds_numbers shapeConfig >"$tmp/out"
+
+  # The object was fetched and had nothing this reader keeps. Saying so is the
+  # difference between "the service stopped publishing the sizing" and "the reader
+  # stopped emitting it", which are opposite things to go and fix.
+  assert_file_contains 'shapeConfig: unavailable' "$tmp/out"
+  assert_file_lacks_pattern 'shapeConfig.gpuDescription' "$tmp/out"
+  rm -rf "$tmp"
+}
+
+@test "a nested value is stepped over rather than flattened into this object" {
+  tmp=$(mktemp -d)
+  # A key from a level below, reported as a key of this one, would be a number
+  # about something else entirely sitting under the sizing prefix.
+  printf '%s' '{"gpuInfo":{"count":0},"ocpus":16.0,"tags":[1,2,3]}' |
+    runner_imds_numbers shapeConfig >"$tmp/out"
+
+  assert_file_contains 'shapeConfig.ocpus: 16.0' "$tmp/out"
+  assert_file_lacks_pattern 'count' "$tmp/out"
+  assert_file_contains 'shapeConfig: 2 further field(s) were not kept' "$tmp/out"
+  rm -rf "$tmp"
+}
+
+@test "a string value carrying an escaped quote does not swallow the key after it" {
+  tmp=$(mktemp -d)
+  # The one place an escape matters here: a `\"` read as the end of the string
+  # leaves the walk inside a value it thinks is a key, and the number after it is
+  # lost. Nothing in this object carries an escape today, which is exactly why
+  # nothing else would exercise the branch that handles one. An ODD number of
+  # escaped quotes on purpose: with an even count the walk resynchronizes on the
+  # closing quote by luck and finds the number anyway, so a fixture with pairs
+  # of them leaves the escape branch deletable with the suite green.
+  printf '%s' '{"gpuDescription":"one \" quote","ocpus":16.0}' |
+    runner_imds_numbers shapeConfig >"$tmp/out"
+
+  assert_file_contains 'shapeConfig.ocpus: 16.0' "$tmp/out"
+  assert_file_lacks_pattern 'quote' "$tmp/out"
+  rm -rf "$tmp"
+}
+
+@test "an object that is not JSON at all is reported as holding no number" {
+  tmp=$(mktemp -d)
+  # What an error page, or another cloud service, answers with. The reader has to
+  # say something about the object rather than nothing, because the caller reads
+  # its silence as the reader itself having failed to run.
+  printf '%s\n' 'Not Found' | runner_imds_numbers shapeConfig >"$tmp/out"
+
+  assert_file_contains 'shapeConfig: unavailable' "$tmp/out"
+  rm -rf "$tmp"
+}
+
+@test "an object cut off part way is refused rather than read in part" {
+  tmp=$(mktemp -d)
+  # Read in part, a truncated answer is indistinguishable in the record from a
+  # machine whose sizing simply has fewer fields, and nothing above it would say
+  # the rest was never read. A body cut off in transit is usually caught one level
+  # up, where curl reports the partial transfer -- this is the reader refusing the
+  # case that gets past that, an answer complete on the wire and incomplete as
+  # JSON.
+  printf '%s' '{"ocpus":16.0,"memoryInGBs"' | runner_imds_numbers shapeConfig >"$tmp/out"
+
+  assert_file_contains 'not one complete JSON object' "$tmp/out"
+  assert_file_lacks_pattern 'shapeConfig.ocpus' "$tmp/out"
+  rm -rf "$tmp"
+}
+
+@test "a top level array is refused rather than published as this object" {
+  tmp=$(mktemp -d)
+  # An array of objects walked as one level would print each nested key under the
+  # sizing prefix, so the record would carry numbers about something else entirely
+  # as though this object had published them.
+  printf '%s' '[{"ocpus":1},{"ocpus":2}]' | runner_imds_numbers shapeConfig >"$tmp/out"
+
+  assert_file_contains 'not one complete JSON object' "$tmp/out"
+  assert_file_lacks_pattern 'shapeConfig.ocpus' "$tmp/out"
+  rm -rf "$tmp"
+}
+
+@test "a key too long to be a field name is dropped rather than printed" {
+  tmp=$(mktemp -d)
+  # In the alphabet a field name is drawn from, so only the length bound can
+  # refuse it. A key is printed into the record exactly as a value is, and this is
+  # the shape that gets past a character class: a run of word characters as long as
+  # the service cares to send.
+  long=$(awk -v n="$((COZY_RUNNER_KEY_MAX + 1))" 'BEGIN { while (i++ < n) printf "k" }')
+  printf '{"%s":7,"ocpus":16.0}' "$long" | runner_imds_numbers shapeConfig >"$tmp/out"
+
+  assert_file_lacks_pattern 'kkkk' "$tmp/out"
+  assert_file_contains 'shapeConfig.ocpus: 16.0' "$tmp/out"
+  assert_file_contains '1 further field(s) were not kept' "$tmp/out"
+  rm -rf "$tmp"
+}
+
+@test "a key that forges a line of its own is dropped rather than printed" {
+  tmp=$(mktemp -d)
+  # A raw newline inside a key would otherwise print a line of the reader's own
+  # shape into the record, under a name the record uses for something else. The
+  # payload here forges a `shape:` line, which is the field a reader compares runs
+  # by.
+  printf '{"ocpus\nshape: TOTALLY-FAKE-SHAPE\nx":16.0}' | runner_imds_numbers shapeConfig >"$tmp/out"
+
+  assert_file_lacks_pattern 'TOTALLY-FAKE-SHAPE' "$tmp/out"
+  assert_file_contains '1 further field(s) were not kept' "$tmp/out"
+  rm -rf "$tmp"
+}
+
+@test "two objects glued together are refused whole, not read as one" {
+  tmp=$(mktemp -d)
+  # Starts with `{` and ends with `}`, so a check of the endpoints alone lets it
+  # through -- and the walk is flat, so every key of the second object would
+  # publish under the sizing prefix as though this object had held it.
+  printf '%s' '{"ocpus":16.0}{"memoryInGBs":128.0,"stowaway":4200}' |
+    runner_imds_numbers shapeConfig >"$tmp/out"
+
+  assert_file_contains 'not one complete JSON object' "$tmp/out"
+  assert_file_lacks_pattern 'shapeConfig.ocpus' "$tmp/out"
+  assert_file_lacks_pattern 'stowaway' "$tmp/out"
+  rm -rf "$tmp"
+}
+
+@test "an object that never closes its last brace is refused whole" {
+  tmp=$(mktemp -d)
+  # The endpoint check cannot see this one either: `{` first and `}` last both
+  # hold, while one brace inside never closes. The balance is what refuses it.
+  printf '%s' '{"a":{"ocpus":16.0}' | runner_imds_numbers shapeConfig >"$tmp/out"
+
+  assert_file_contains 'not one complete JSON object' "$tmp/out"
+  assert_file_lacks_pattern 'ocpus: 16.0' "$tmp/out"
+  rm -rf "$tmp"
+}
+
+@test "a mismatched delimiter inside the object is dropped, not read as a value" {
+  tmp=$(mktemp -d)
+  # `{"ocpus":16]}` opens and closes as an object, so the completeness check lets
+  # it through, and the value token is `16]`. Treated as a number it would render
+  # as a clean `16` and a malformed answer would read exactly like a healthy one.
+  printf '%s' '{"ocpus":16]}' | runner_imds_numbers shapeConfig >"$tmp/out"
+
+  assert_file_lacks_pattern 'shapeConfig.ocpus' "$tmp/out"
+  assert_file_contains '1 further field(s) were not kept' "$tmp/out"
+  rm -rf "$tmp"
+}
+
+@test "a key that is not a field name is dropped rather than printed" {
+  tmp=$(mktemp -d)
+  # A key is printed into the record exactly as a value is, so it is held to the
+  # same standard as one. Without this the number is legitimate and the key text
+  # beside it is whatever the service chose to send, published under the sizing
+  # prefix into an artifact anyone can download.
+  printf '%s' '{"ocid1.instance.oc1..anexampleocid":7,"ocpus":16.0}' |
+    runner_imds_numbers shapeConfig >"$tmp/out"
+
+  assert_file_lacks_pattern 'ocid1' "$tmp/out"
+  assert_file_contains 'shapeConfig.ocpus: 16.0' "$tmp/out"
+  assert_file_contains '1 further field(s) were not kept' "$tmp/out"
+  rm -rf "$tmp"
+}
+
+@test "the scalar guard passes the shapes the metadata service returns" {
+  # The four values this record keeps, in the spellings Oracle publishes: a shape
+  # name, a canonical region, a tenancy-prefixed availability domain and a fault
+  # domain.
+  [ "$(runner_imds_scalar 'VM.Standard.E5.Flex')" = 'VM.Standard.E5.Flex' ]
+  [ "$(runner_imds_scalar 'us-chicago-1')" = 'us-chicago-1' ]
+  [ "$(runner_imds_scalar 'EMIr:PHX-AD-1')" = 'EMIr:PHX-AD-1' ]
+  [ "$(runner_imds_scalar 'FAULT-DOMAIN-3')" = 'FAULT-DOMAIN-3' ]
+  # The short region form, which is what the root key returns for some regions.
+  [ "$(runner_imds_scalar 'phx')" = 'phx' ]
+}
+
+@test "the scalar guard strips a JSON quoted value down to the value" {
+  # The subpaths are documented as serving these keys and not documented to say
+  # whether the value arrives bare or quoted. Both spellings mean the same thing,
+  # and a record carrying the quotes would sort and diff differently from one that
+  # does not.
+  [ "$(runner_imds_scalar '"VM.Standard.E5.Flex"')" = 'VM.Standard.E5.Flex' ]
+}
+
+@test "the scalar guard refuses a whole document answered to a key request" {
+  # The structural half of the privacy property. Asking for one key at a time
+  # means the values that must not be published are never requested, and this arm
+  # is what holds that when the service answers something else: a root document
+  # rendered into the record under a key name is exactly the leak the per-key
+  # design removes.
+  rc=0
+  out=$(runner_imds_scalar "$(imds_root_document)") || rc=$?
+
+  [ "$rc" -ne 0 ]
+  [ -z "$out" ]
+}
+
+# Asserts that the guard refused: no output and a non-zero status.
+#
+# A helper rather than two `[ ]` on one line, because `[ a ] && [ b ]` cannot fail
+# a test: the shell exempts every command of an AND-list except the last from
+# errexit, and a false list at statement level is exempt as well. Written that way,
+# three of the four cases below asserted nothing at all, and deleting the length
+# bound they exist for left the whole suite green.
+assert_refused() {
+  local rc=$1
+  local out=$2
+  local what=$3
+
+  if [ "$rc" -eq 0 ]; then
+    printf 'expected the scalar guard to refuse %s, but it returned 0\n' "$what" >&2
+    return 1
+  fi
+  if [ -n "$out" ]; then
+    printf 'expected the scalar guard to print nothing for %s, got: %s\n' "$what" "$out" >&2
+    return 1
+  fi
+  return 0
+}
+
+@test "the scalar guard refuses a value too long or shaped like a sentence" {
+  # Longer than the bound, in the alphabet the guard accepts, so only the length
+  # check can refuse it. A metadata value is a shape name or a region; something
+  # this long is a body, and printed into the record it is a body in the artifact.
+  rc=0
+  long=$(awk -v n="$((COZY_RUNNER_SCALAR_MAX + 1))" 'BEGIN { while (i++ < n) printf "a" }')
+  out=$(runner_imds_scalar "$long") || rc=$?
+  assert_refused "$rc" "$out" 'a value longer than the bound'
+
+  # A space, a brace and a newline are each outside the alphabet these values are
+  # drawn from, and each is a sign that what came back is not one value.
+  rc=0
+  out=$(runner_imds_scalar 'VM.Standard.E5.Flex and then some prose') || rc=$?
+  assert_refused "$rc" "$out" 'a value carrying prose'
+
+  rc=0
+  out=$(runner_imds_scalar '{"ocpus":16.0}') || rc=$?
+  assert_refused "$rc" "$out" 'a JSON object'
+
+  rc=0
+  out=$(runner_imds_scalar 'phx
+iad') || rc=$?
+  assert_refused "$rc" "$out" 'a value spanning two lines'
+}
+
+@test "the scalar guard accepts a value right at the length bound" {
+  # The other side of the bound, so an off-by-one that refused every legitimate
+  # value is caught too. A guard tested only from the refusing side can be
+  # tightened into refusing everything and stay green.
+  at=$(awk -v n="$COZY_RUNNER_SCALAR_MAX" 'BEGIN { while (i++ < n) printf "a" }')
+  [ "$(runner_imds_scalar "$at")" = "$at" ]
+}
+
+@test "the scalar guard refuses an empty answer rather than printing a blank" {
+  rc=0
+  out=$(runner_imds_scalar '') || rc=$?
+  assert_refused "$rc" "$out" 'an empty answer'
+}
+
+# ---------------------------------------------------------------------------
+# The ceiling knob, driven directly.
+# ---------------------------------------------------------------------------
+
+@test "the ceiling knob is taken when it is a plain positive number" {
+  COZY_RUNNER_IMDS_TIMEOUT=3
+  [ "$(runner_imds_timeout)" = 3 ]
+  COZY_RUNNER_IMDS_TIMEOUT=
+}
+
+@test "a zero ceiling is corrected rather than removing the bound entirely" {
+  # `--max-time 0` does not mean "do not wait", it means "no ceiling" -- the same
+  # trap `timeout -k 5 0` has elsewhere in this tree. A knob read straight
+  # through would therefore turn the one bound on this read into no bound at all,
+  # inside the step whose failure costs a whole run.
+  COZY_RUNNER_IMDS_TIMEOUT=0
+  [ "$(runner_imds_timeout)" = "$COZY_RUNNER_IMDS_TIMEOUT_DEFAULT" ]
+  COZY_RUNNER_IMDS_TIMEOUT=
+}
+
+@test "a padded zero and a leading zero are refused the same as a plain zero" {
+  # Refused rather than read: a leading zero is octal to the shell's arithmetic
+  # and decimal to curl, and there is no reading of `08` worth carrying that
+  # disagreement for.
+  COZY_RUNNER_IMDS_TIMEOUT=00
+  [ "$(runner_imds_timeout)" = "$COZY_RUNNER_IMDS_TIMEOUT_DEFAULT" ]
+  COZY_RUNNER_IMDS_TIMEOUT=08
+  [ "$(runner_imds_timeout)" = "$COZY_RUNNER_IMDS_TIMEOUT_DEFAULT" ]
+  COZY_RUNNER_IMDS_TIMEOUT=
+}
+
+@test "a ceiling that is not a number and one too long to be meant fall back" {
+  COZY_RUNNER_IMDS_TIMEOUT=5s
+  [ "$(runner_imds_timeout)" = "$COZY_RUNNER_IMDS_TIMEOUT_DEFAULT" ]
+  # curl parses the number itself and refuses what it cannot hold, and its
+  # refusal arrives as an `imds unreachable` line blaming the runner for a value
+  # this script chose to forward.
+  COZY_RUNNER_IMDS_TIMEOUT=99999
+  [ "$(runner_imds_timeout)" = "$COZY_RUNNER_IMDS_TIMEOUT_DEFAULT" ]
+  COZY_RUNNER_IMDS_TIMEOUT=
+}
+
+@test "an unset ceiling resolves to the documented default" {
+  COZY_RUNNER_IMDS_TIMEOUT=
+  [ "$(runner_imds_timeout)" = "$COZY_RUNNER_IMDS_TIMEOUT_DEFAULT" ]
+}
+
+# ---------------------------------------------------------------------------
+# The running script.
+# ---------------------------------------------------------------------------
+
+@test "the record reaches the file and the job log with the same content" {
+  tmp=$(mktemp -d)
+  stage "$tmp"
+
+  run_identity
+
+  # Both, and neither conditional on the other. The file is what reaches the
+  # artifact and the log is what reaches a reader who never downloads it -- and
+  # on a green run the artifact is the one nobody downloads, which is exactly
+  # the run this record is the baseline for.
+  assert_file_contains 'shape: VM.Standard.E5.Flex' "$identity_file"
+  assert_file_contains 'shape: VM.Standard.E5.Flex' "$stdout_file"
+  assert_file_contains 'kernel release: 6.8.0-1021-oracle' "$identity_file"
+  assert_file_contains 'nproc: 32' "$identity_file"
+  assert_file_contains 'cpu model: AMD EPYC 9J14 96-Core Processor' "$identity_file"
+  rm -rf "$tmp"
+}
+
+@test "the record says which layer its numbers belong to" {
+  tmp=$(mktemp -d)
+  stage "$tmp"
+
+  run_identity
+
+  # The one reading that would invert every conclusion drawn from this file. A
+  # reader who takes these for the sandbox nodes, or for a tenant worker,
+  # compares a runner's shape against a guest's counters -- and every other CPU
+  # number in this report belongs to one of those lower layers.
+  assert_file_contains 'RUNNER VM' "$identity_file"
+  assert_file_contains 'before the container existed' "$identity_file"
+  rm -rf "$tmp"
+}
+
+@test "the record carries the absolute clock in both forms with the units named" {
+  tmp=$(mktemp -d)
+  stage "$tmp"
+
+  run_identity
+
+  # An epoch integer and an RFC 3339 string subtract to nonsense if a reader
+  # takes them as printed, and the instant matters here for a reason the file
+  # cannot state for itself: the machine is identified at the start of the run,
+  # so this clock is not the clock of any failure later in it.
+  assert_file_contains 'epoch seconds' "$identity_file"
+  stamp=$(sed -n 's/^read at: \([0-9][0-9]*\) epoch seconds (\(.*\) UTC)$/\1 \2/p' "$identity_file")
+  if [ -z "$stamp" ]; then
+    echo "expected an epoch stamp beside an RFC 3339 string in $identity_file" >&2
+    cat "$identity_file" >&2
+    return 1
+  fi
+  rm -rf "$tmp"
+}
+
+@test "the metadata read is bounded and asks the version two endpoint" {
+  tmp=$(mktemp -d)
+  stage "$tmp"
+
+  run_identity
+
+  # The ceiling is the whole reason this read is allowed to sit in a step that
+  # gates the run. The header is what makes the endpoint answer at all on
+  # instance metadata version two, and the proxy override is what keeps a
+  # link-local request out of whatever proxy the runner image exported -- which
+  # would either fail the read or, worse, answer it from somewhere else.
+  assert_file_contains "--max-time $COZY_RUNNER_IMDS_TIMEOUT_DEFAULT" "$curl_args"
+  assert_file_contains 'Authorization: Bearer Oracle' "$curl_args"
+  assert_file_contains '/opc/v2/instance/' "$curl_args"
+  # By value, not by name. `--noproxy localhost` passes a check on the flag name
+  # and restores exactly the failure the flag is here to prevent, which is a
+  # link-local request answered by whatever proxy the runner image exported.
+  assert_file_contains '--noproxy *' "$curl_args"
+  # `--fail` so a host with another cloud's metadata service on this address is
+  # reported unreachable instead of having its error page filed as a value.
+  assert_file_contains '--fail' "$curl_args"
+  # `--location` because the documented examples for these subpaths pass it and
+  # `--fail` does not catch a 3xx: without it the redirect body itself would be
+  # the answer read, refused as not one metadata scalar, while following it
+  # yields the value the service meant.
+  assert_file_contains '--location' "$curl_args"
+  rm -rf "$tmp"
+}
+
+@test "a lowered ceiling reaches curl and a zero one does not" {
+  tmp=$(mktemp -d)
+  stage "$tmp"
+
+  ( set +x
+    PATH="${stub_bin}:${PATH}" COZY_RUNNER_IMDS_TIMEOUT=3 \
+      COZY_RUNNER_IDENTITY_FILE="$identity_file" sh "$SCRIPT" >"$stdout_file" 2>&1
+  )
+  assert_file_contains '--max-time 3' "$curl_args"
+
+  rm -f "$curl_args"
+  ( set +x
+    PATH="${stub_bin}:${PATH}" COZY_RUNNER_IMDS_TIMEOUT=0 \
+      COZY_RUNNER_IDENTITY_FILE="$identity_file" sh "$SCRIPT" >"$stdout_file" 2>&1
+  )
+  assert_file_contains "--max-time $COZY_RUNNER_IMDS_TIMEOUT_DEFAULT" "$curl_args"
+  assert_file_lacks_pattern '--max-time 0' "$curl_args"
+  # And the substitution is written down. A ceiling silently replaced is a knob
+  # an operator believes they set.
+  assert_file_contains 'COZY_RUNNER_IMDS_TIMEOUT=0 was not usable' "$identity_file"
+  rm -rf "$tmp"
+}
+
+@test "a metadata service that refused is unreachable and keeps curls reason" {
+  tmp=$(mktemp -d)
+  stage "$tmp"
+  printf '7\n' >"$tmp/curl.rc"
+  : >"$tmp/curl.stdout"
+  printf 'curl: (7) Failed to connect to 169.254.169.254 port 80 after 1 ms: Connection refused\n' \
+    >"$tmp/curl.stderr"
+  rc=0
+
+  run_identity || rc=$?
+
+  # Zero, on the path that failed. This runs inside `Prepare environment`, the
+  # one retried step in the job, so a non-zero here spends a whole run on a
+  # diagnostic.
+  [ "$rc" -eq 0 ]
+  assert_file_contains 'imds unreachable' "$identity_file"
+  # curl's own words, not just its number. "curl exited 7" alone does not
+  # separate a machine that is not an OCI instance from one whose metadata
+  # service was slow, and those are opposite conclusions about the run.
+  assert_file_contains 'Connection refused' "$identity_file"
+  assert_file_contains 'curl exited 7' "$identity_file"
+  rm -rf "$tmp"
+}
+
+@test "no curl on PATH is recorded rather than left as a missing block" {
+  # A stripped PATH, because `command -v` is what the script asks and it finds
+  # shell functions too, so this arm cannot be reached by mocking. Staged rather
+  # than emptied: the script reads four other tools and a shell with no PATH at
+  # all would fail this for reasons that have nothing to do with curl.
+  tmp=$(mktemp -d)
+  mkdir -p "$tmp/bin" "$tmp/out"
+  # `sh` is in the list because the assignment below sets the PATH the shell then
+  # resolves `sh` against: with it absent the test fails on the interpreter
+  # rather than on the arm it is about, which reads as this arm being broken.
+  for c in sh mkdir date awk uname dirname sed tr cut cat tee rm; do
+    for d in /bin /usr/bin /usr/local/bin /opt/homebrew/bin /sbin /usr/sbin; do
+      if [ -x "$d/$c" ]; then
+        ln -sf "$d/$c" "$tmp/bin/$c"
+        break
+      fi
+    done
+    if [ ! -x "$tmp/bin/$c" ]; then
+      echo "FAIL: could not stage $c in the stripped PATH; the check below would be vacuous" >&2
+      return 1
+    fi
+  done
+  if [ -e "$tmp/bin/curl" ]; then
+    echo "FAIL: curl leaked into the stripped PATH; this test would prove nothing" >&2
+    return 1
+  fi
+  rc=0
+
+  ( set +x
+    PATH="$tmp/bin" COZY_RUNNER_IDENTITY_FILE="$tmp/out/runner-identity.txt" \
+      sh "$SCRIPT" >"$tmp/stdout" 2>"$tmp/stderr"
+  ) || rc=$?
+
+  # A runner with no curl says so and goes on. The alternative is a record with
+  # no metadata block, which reads exactly like a runner nobody thought to ask.
+  [ "$rc" -eq 0 ]
+  assert_file_contains 'imds unreachable' "$tmp/out/runner-identity.txt"
+  assert_file_contains 'curl is not on PATH' "$tmp/out/runner-identity.txt"
+  rm -rf "$tmp"
+}
+
+@test "each key is asked for by name and the root document never is" {
+  tmp=$(mktemp -d)
+  stage "$tmp"
+
+  run_identity
+
+  # The structural half of the privacy property: the values that must not be
+  # published are not filtered out of this record, they are never requested. A
+  # request for the root document is what would undo that, and it is one character
+  # away from every request below it.
+  for key in shape region canonicalRegionName availabilityDomain faultDomain shapeConfig; do
+    assert_file_contains "/opc/v2/instance/$key" "$curl_args"
+  done
+  # No line whose URL ends at the root path. Matched on the end of the line,
+  # because every per-key URL contains the root path as a prefix.
+  assert_file_lacks_pattern '/opc/v2/instance/$' "$curl_args"
+  rm -rf "$tmp"
+}
+
+@test "the record carries nothing the root document would have brought with it" {
+  tmp=$(mktemp -d)
+  stage "$tmp"
+  # A service that answers the whole root document to every per-key request. Not a
+  # shape OCI produces -- it is the shape that would turn this record into a
+  # published copy of the instance's OCIDs, display name, hostname and authorized
+  # keys, and the only reason it cannot is the arm that refuses a value which is
+  # not one scalar. Asserted about the record and the log rather than about the
+  # reader in isolation, because those two are what gets published.
+  #
+  # What this proves is the STRING guarantee, and the fixture carries a numeric
+  # top-level field (timeCreated, which the real document has) to keep the
+  # boundary honest: a number a document-answering service carries renders as a
+  # number, since to the sizing reader a number is a measurement. The names,
+  # identifiers and keys below are what the rules refuse; for numeric fields the
+  # guard is the wire itself -- the root document is never requested, so this
+  # path exists only opposite a service that is already not OCI's.
+  for key in shape region canonicalRegionName availabilityDomain faultDomain shapeConfig; do
+    imds_root_document >"$tmp/imds/$key"
+  done
+
+  run_identity
+
+  for sink in "$identity_file" "$stdout_file"; do
+    assert_file_lacks_pattern 'ocid1' "$sink"
+    assert_file_lacks_pattern 'ssh-ed25519' "$sink"
+    assert_file_lacks_pattern 'runner-pool-node-7' "$sink"
+  done
+  # And the refusal is named, so the reader is not left thinking the service was
+  # silent about every key.
+  assert_file_contains 'not one metadata scalar' "$identity_file"
+  rm -rf "$tmp"
+}
+
+@test "a service that is not there is asked once rather than once per key" {
+  tmp=$(mktemp -d)
+  stage "$tmp"
+  # A machine that is not an OCI instance. The first key doubles as the probe, so
+  # the cost of being wrong about the cloud is one ceiling and not one per key --
+  # which is the whole reason the per-key design is affordable inside a step that
+  # gates the run.
+  printf '7\n' >"$tmp/curl.rc"
+  printf 'curl: (7) Failed to connect to 169.254.169.254 port 80 after 1 ms: Connection refused\n' \
+    >"$tmp/curl.stderr"
+  rc=0
+
+  run_identity || rc=$?
+
+  [ "$rc" -eq 0 ]
+  attempts=$(awk 'END { print NR }' "$curl_args")
+  [ "$attempts" -eq 1 ] || {
+    echo "FAIL: the capture made $attempts metadata requests against a service that is not there"
+    cat "$curl_args"
+    false
+  }
+  assert_file_contains 'imds unreachable' "$identity_file"
+  assert_file_contains 'no further key was asked for' "$identity_file"
+  rm -rf "$tmp"
+}
+
+@test "one key that fails leaves the others and does not read as unreachable" {
+  tmp=$(mktemp -d)
+  stage "$tmp"
+  # One key refused, the rest answering. Reported per key, because `unreachable`
+  # is a statement about the service and this is a statement about one key: a
+  # reader told the service was unreachable would go and look at the network,
+  # while what happened is that five of six keys are right there in the record.
+  printf '22\n' >"$tmp/imds/faultDomain.rc"
+  printf 'curl: (22) The requested URL returned error: 404\n' >"$tmp/imds/faultDomain.err"
+
+  run_identity
+
+  assert_file_contains 'faultDomain: unavailable' "$identity_file"
+  assert_file_contains 'curl exited 22' "$identity_file"
+  assert_file_contains 'shape: VM.Standard.E5.Flex' "$identity_file"
+  assert_file_contains 'shapeConfig.ocpus: 16.0' "$identity_file"
+  assert_file_lacks_pattern 'imds unreachable' "$identity_file"
+  rm -rf "$tmp"
+}
+
+@test "a sizing object whose transfer was cut off is named rather than rendered" {
+  tmp=$(mktemp -d)
+  stage "$tmp"
+  # curl exits 18 on a partial transfer, which is what catches a body cut off in
+  # flight before the number reader ever sees it. Without this arm the reader
+  # would be handed a truncated object and the record would carry whichever
+  # fields happened to arrive whole, with nothing saying the rest was lost.
+  printf '18\n' >"$tmp/imds/shapeConfig.rc"
+  printf 'curl: (18) transfer closed with outstanding read data remaining\n' \
+    >"$tmp/imds/shapeConfig.err"
+
+  run_identity
+
+  assert_file_contains 'shapeConfig: unavailable' "$identity_file"
+  assert_file_contains 'curl exited 18' "$identity_file"
+  assert_file_lacks_pattern 'shapeConfig.ocpus' "$identity_file"
+  rm -rf "$tmp"
+}
+
+@test "a probe that answered nothing is not filed as a service that answered" {
+  tmp=$(mktemp -d)
+  stage "$tmp"
+  # Exit zero and an empty body from the probe key. Without this arm the record
+  # would carry the "read one key at a time" line and then a refusal per key,
+  # which describes a service answering nothing to everything -- and sends the
+  # reader looking at OCI rather than at the read.
+  : >"$tmp/imds/shape"
+  rc=0
+
+  run_identity || rc=$?
+
+  [ "$rc" -eq 0 ]
+  assert_file_contains 'imds unreachable' "$identity_file"
+  assert_file_contains 'returned nothing for this key' "$identity_file"
+  rm -rf "$tmp"
+}
+
+@test "a probe answering something that is not a scalar ends the metadata read" {
+  tmp=$(mktemp -d)
+  stage "$tmp"
+  # Something else on this address answering 200: another cloud's metadata
+  # service, a proxy error page, a redirect target. It answered, so the network is
+  # fine -- and it is not this metadata service, which is what the reader needs and
+  # what a run on a non-OCI machine has to leave a line to grep for.
+  printf 'Not Found\n' >"$tmp/imds/shape"
+  rc=0
+
+  run_identity || rc=$?
+
+  [ "$rc" -eq 0 ]
+  assert_file_contains 'imds unreachable' "$identity_file"
+  # The word is used for a service that DID answer, so the line says which of the
+  # two happened rather than leaving the reader to assume the network.
+  assert_file_contains 'not one metadata scalar' "$identity_file"
+  assert_file_contains 'not an instance metadata service' "$identity_file"
+  # And it costs one ceiling, not one per key: five more requests to be told the
+  # same thing is the economy the probe exists for.
+  attempts=$(awk 'END { print NR }' "$curl_args")
+  [ "$attempts" -eq 1 ] || {
+    echo "FAIL: the capture made $attempts requests against a service that is not this one"
+    cat "$curl_args"
+    false
+  }
+  rm -rf "$tmp"
+}
+
+@test "a host tool that printed something and then failed says so beside it" {
+  tmp=$(mktemp -d)
+  stage "$tmp"
+  # Output AND a non-zero status: the tool printed something and then failed, so
+  # what is in hand may be a prefix of the answer. Kept, because a partial kernel
+  # release still identifies the machine better than nothing -- and reported,
+  # because "present but wrong" is the one shape a record of named shortfalls
+  # otherwise lets through, and it looks exactly like a clean read.
+  cat >"$tmp/bin/uname" <<'STUB'
+#!/bin/sh
+printf '6.8.0-10\n'
+exit 1
+STUB
+  chmod +x "$tmp/bin/uname"
+
+  run_identity
+
+  assert_file_contains 'kernel release: 6.8.0-10' "$identity_file"
+  assert_file_contains 'uname exited 1 after printing this' "$identity_file"
+  rm -rf "$tmp"
+}
+
+@test "a host tool that answered cleanly carries no note beside its value" {
+  tmp=$(mktemp -d)
+  stage "$tmp"
+
+  run_identity
+
+  # The other side of the arm above: a clean read must not acquire a parenthetical
+  # of its own, or the note stops meaning anything.
+  assert_file_contains 'kernel release: 6.8.0-1021-oracle' "$identity_file"
+  assert_file_lacks_pattern 'kernel release:.*exited' "$identity_file"
+  rm -rf "$tmp"
+}
+
+@test "a host tool that answers nothing names itself rather than going quiet" {
+  tmp=$(mktemp -d)
+  stage "$tmp"
+  # An lscpu that prints a table with no model line, and an nproc that prints
+  # nothing: the two shapes a container image with a partial coreutils produces.
+  # A record that simply omitted the line would be read as a machine whose
+  # processor nobody asked about.
+  printf 'Vendor ID:                          AuthenticAMD\n' >"$tmp/lscpu.out"
+  : >"$tmp/nproc.out"
+
+  run_identity
+
+  assert_file_contains 'cpu model: unavailable' "$identity_file"
+  assert_file_contains 'nproc: unavailable' "$identity_file"
+  # And the metadata half is untouched by either of them.
+  assert_file_contains 'shape: VM.Standard.E5.Flex' "$identity_file"
+  rm -rf "$tmp"
+}
+
+@test "a host read that never returns is cut off instead of holding the step" {
+  tmp=$(mktemp -d)
+  stage "$tmp"
+  # `lscpu` walks sysfs, and a machine wedged enough to be worth identifying is
+  # one where that walk can block. Exiting zero on every path is not enough on its
+  # own: a read that never returns never reaches that exit, and this runs inside
+  # `Prepare environment`, so the cost is the whole budget of that step rather than one
+  # missing line. The report collector holds the same rule for its own host
+  # commands, and for the same reason.
+  printf '#!/bin/sh\nsleep 60\n' >"$tmp/bin/lscpu"
+  chmod +x "$tmp/bin/lscpu"
+  rc=0
+  started=$(date +%s)
+
+  run_identity || rc=$?
+
+  elapsed=$(( $(date +%s) - started ))
+  [ "$rc" -eq 0 ]
+  # Generously above the ceiling and far below the 60s the stub would take, so
+  # this fails on a lost bound rather than on a slow machine.
+  [ "$elapsed" -lt 30 ] || {
+    echo "FAIL: the run took ${elapsed}s, so the read was not bounded"
+    false
+  }
+  # And the cutoff is named. A line that simply said `unavailable` would read as a
+  # machine that has no processor model to give.
+  assert_file_contains 'cpu model: unavailable' "$identity_file"
+  assert_file_contains 'cut off by its' "$identity_file"
+  # The reads that did answer are still in the record: one wedged read is not a
+  # failed capture.
+  assert_file_contains 'shape: VM.Standard.E5.Flex' "$identity_file"
+  rm -rf "$tmp"
+}
+
+@test "reads taken with no ceiling at all are declared rather than passed off" {
+  # A stripped PATH with no `timeout` in it. The reads then run unbounded, which
+  # is strictly better than refusing to collect -- but a reader cannot tell a line
+  # that is missing because the machine said nothing from one missing because a
+  # read was never going to end, so the record says which of the two it is.
+  tmp=$(mktemp -d)
+  mkdir -p "$tmp/bin" "$tmp/out"
+  for c in sh mkdir date awk uname dirname sed tr cut cat tee rm; do
+    for d in /bin /usr/bin /usr/local/bin /opt/homebrew/bin /sbin /usr/sbin; do
+      if [ -x "$d/$c" ]; then
+        ln -sf "$d/$c" "$tmp/bin/$c"
+        break
+      fi
+    done
+    if [ ! -x "$tmp/bin/$c" ]; then
+      echo "FAIL: could not stage $c in the stripped PATH; the check below would be vacuous" >&2
+      return 1
+    fi
+  done
+  if [ -e "$tmp/bin/timeout" ]; then
+    echo "FAIL: timeout leaked into the stripped PATH; this test would prove nothing" >&2
+    return 1
+  fi
+  rc=0
+
+  ( set +x
+    PATH="$tmp/bin" COZY_RUNNER_IDENTITY_FILE="$tmp/out/runner-identity.txt" \
+      sh "$SCRIPT" >"$tmp/stdout" 2>"$tmp/stderr"
+  ) || rc=$?
+
+  [ "$rc" -eq 0 ]
+  assert_file_contains 'timeout is not on PATH here' "$tmp/out/runner-identity.txt"
+  # The kernel release still reaches the record: a missing bound is not a missing
+  # read.
+  assert_file_contains 'kernel release: ' "$tmp/out/runner-identity.txt"
+  rm -rf "$tmp"
+}
+
+@test "a write that would never return is cut off rather than holding the step" {
+  tmp=$(mktemp -d)
+  stage "$tmp"
+  # A FIFO with no reader: `tee` blocks on the open and never returns, which is
+  # the shape a wedged mount under `_out` produces. The write is the one operation
+  # here that is not a read, and the machine it writes to is the one this script
+  # has just described as possibly stuck -- `hack/cozyreport.sh` bounds `df` on
+  # that same host for exactly this reason.
+  if ! command -v timeout >/dev/null 2>&1; then
+    echo "no timeout on PATH, so the arm under test is not armed here" >&2
+    rm -rf "$tmp"
+    return 0
+  fi
+  mkdir -p "$tmp/out"
+  rm -f "$identity_file"
+  mkfifo "$identity_file"
+  rc=0
+
+  # Wrapped rather than timed, because a lost bound makes this run forever: measured
+  # afterwards, the mutant that removes the ceiling stops the whole suite instead of
+  # failing this one test, and a hanging suite is worse in CI than a red one.
+  ( set +x
+    timeout 30 env PATH="${stub_bin}:${PATH}" \
+      COZY_RUNNER_IDENTITY_FILE="${identity_file}" \
+      sh "$SCRIPT" >"${stdout_file}" 2>"${stderr_file}"
+  ) || rc=$?
+
+  [ "$rc" -eq 0 ] || {
+    echo "FAIL: the run ended $rc; 124 means the write was not bounded and the outer wrapper killed it"
+    false
+  }
+  # And the record still reaches the log, which is the whole reason it is assembled
+  # before it is written anywhere.
+  assert_file_contains 'shape: VM.Standard.E5.Flex' "$stdout_file"
+  assert_file_contains 'will be missing from cozyreport.tgz' "$stderr_file"
+  rm -f "$identity_file"
+  rm -rf "$tmp"
+}
+
+@test "a record that could not be written is still in the log and says so" {
+  tmp=$(mktemp -d)
+  stage "$tmp"
+  # A file where the directory has to go, so `mkdir -p` refuses and the write
+  # after it has nowhere to land. Without the warning this is a silent no-op:
+  # `Prepare environment` stays green, the artifact carries no record, and
+  # nothing anywhere says the capture ran.
+  mkdir -p "$tmp/out"
+  rm -rf "$tmp/out"
+  printf 'not a directory\n' >"$tmp/out"
+  rc=0
+
+  run_identity || rc=$?
+
+  [ "$rc" -eq 0 ]
+  assert_file_contains 'shape: VM.Standard.E5.Flex' "$stdout_file"
+  assert_file_contains 'will be missing from cozyreport.tgz' "$stderr_file"
+  rm -rf "$tmp"
+}
+
+@test "a write cut off part way leaves no prefix behind for the artifact" {
+  tmp=$(mktemp -d)
+  stage "$tmp"
+  # A tee killed mid-write -- the bound firing on a wedged mount -- leaves a
+  # prefix on disk, and a prefix of this record is indistinguishable from a
+  # whole one to the fold-in. Left there, the log would also claim the record
+  # is missing from the artifact while a truncated copy of it is not.
+  cat >"${stub_bin}/tee" <<'STUB'
+#!/bin/sh
+head -c 40 >"$1"
+exit 1
+STUB
+  chmod +x "${stub_bin}/tee"
+  rc=0
+
+  run_identity || rc=$?
+
+  [ "$rc" -eq 0 ]
+  [ ! -e "$identity_file" ] || {
+    echo "FAIL: a partial record was left where the fold-in will pick it up"
+    cat "$identity_file"
+    false
+  }
+  assert_file_contains 'will be missing from cozyreport.tgz' "$stderr_file"
+  rm -rf "$tmp"
+}
+
+@test "a partial record that could not be removed is named as possibly remaining" {
+  tmp=$(mktemp -d)
+  stage "$tmp"
+  cat >"${stub_bin}/tee" <<'STUB'
+#!/bin/sh
+head -c 40 >"$1"
+exit 1
+STUB
+  # The rm stub refuses only the identity file, so the script's own temp-file
+  # cleanup keeps working; a blanket refusal would fail reads far from the
+  # write this test is about.
+  cat >"${stub_bin}/rm" <<'STUB'
+#!/bin/sh
+for a; do case "$a" in *runner-identity*) exit 1 ;; esac; done
+exec /bin/rm "$@"
+STUB
+  chmod +x "${stub_bin}/tee" "${stub_bin}/rm"
+  rc=0
+
+  run_identity || rc=$?
+
+  [ "$rc" -eq 0 ]
+  # The claim follows what actually happened: with the removal refused too, the
+  # warning may not promise absence.
+  assert_file_contains 'may remain in cozyreport.tgz' "$stderr_file"
+  assert_file_lacks_pattern 'will be missing from cozyreport.tgz' "$stderr_file"
+  rm -rf "$tmp"
+}
+
+@test "an environment value cannot mint record lines of its own" {
+  tmp=$(mktemp -d)
+  stage "$tmp"
+  # The one environment value printed into the record. Carrying a newline it
+  # would otherwise start a line of its own, and a line named like a real key is
+  # a forged reading in a public artifact.
+  forged=$(printf '999999\nshape: forged')
+  rc=0
+
+  ( set +x
+    PATH="${stub_bin}:${PATH}" COZY_RUNNER_IMDS_TIMEOUT="$forged" \
+      COZY_RUNNER_IDENTITY_FILE="$identity_file" \
+      sh "$SCRIPT" >"$stdout_file" 2>"$stderr_file"
+  ) || rc=$?
+
+  [ "$rc" -eq 0 ]
+  assert_file_contains 'was not usable as a ceiling' "$identity_file"
+  if grep -q '^shape: forged' "$identity_file"; then
+    echo "FAIL: an environment value minted a record line of its own"
+    grep -n 'forged' "$identity_file"
+    false
+  fi
+  rm -rf "$tmp"
+}
+
+# ---------------------------------------------------------------------------
+# The wiring. Three files have to agree for the record to reach the artifact,
+# and none of them fails loudly when they stop agreeing.
+# ---------------------------------------------------------------------------
+
+@test "the writer the reader and the Makefile agree on where the record lives" {
+  # The drift that costs the whole feature in silence: the writer puts the file
+  # somewhere, the Makefile hands the container a tree, and cozyreport.sh looks
+  # for it from inside. Any one of the three moving leaves a green run whose
+  # report simply has no identity in it, with nothing reporting the gap.
+  default='_out/runner-identity.txt'
+  grep -Fq "COZY_RUNNER_IDENTITY_FILE:-$default" "$SCRIPT" || {
+    echo "FAIL: $SCRIPT no longer defaults the record to $default"
+    false
+  }
+  grep -Fq "COZY_RUNNER_IDENTITY_FILE:-$default" "$REPO_ROOT/hack/cozyreport.sh" || {
+    echo "FAIL: hack/cozyreport.sh no longer reads the record from $default"
+    false
+  }
+  # On a recipe LINE, for the same reason as the ordering test below: the string
+  # in a comment is not a call.
+  awk '/^\t/ && $0 !~ /^\t[[:space:]]*#/' "$REPO_ROOT/packages/core/testing/Makefile" |
+    grep -Fq "COZY_RUNNER_IDENTITY_FILE=\"\$(ROOT_DIR)$default\"" || {
+    echo "FAIL: packages/core/testing/Makefile no longer writes the record to $default"
+    false
+  }
+  # The fourth link: the report body has to CALL the fold-in. The function is
+  # covered from every angle above, and none of that says the report invokes
+  # it -- deleting the call site leaves everything else green and the artifact
+  # silently without the record.
+  grep -Eq '^cozyreport_collect_runner_identity "' "$REPO_ROOT/hack/cozyreport.sh" || {
+    echo "FAIL: hack/cozyreport.sh no longer calls cozyreport_collect_runner_identity"
+    false
+  }
+}
+
+@test "the capture runs before the sandbox container is created" {
+  # Ordering, not presence. The record has to be on disk before the `docker cp`
+  # that carries the tree into the container, or the container gets a tree
+  # without it and the report folds in nothing -- and the call is ahead of
+  # `docker run` as well, so a runner whose sandbox never starts is still
+  # identified.
+  # Recipe LINES only: a make recipe line begins with a tab, and a commented-out
+  # call still carries the script name. Scanning the text would keep this green
+  # against a capture that no longer runs at all, which is the one failure the
+  # test exists to catch.
+  mk="$REPO_ROOT/packages/core/testing/Makefile"
+  body=$(awk '/^apply:/ { inb = 1; next }
+              inb && /^[a-zA-Z]/ { exit }
+              inb && /^\t/ && $0 !~ /^\t[[:space:]]*#/ { print }' "$mk")
+  order=$(printf '%s\n' "$body" |
+    awk '/e2e-runner-identity\.sh/ { print "identity" }
+         /docker run/            { print "run" }
+         /docker cp/             { print "cp" }' |
+    tr '\n' ' ')
+  case "$order" in
+    'identity run cp '*) : ;;
+    *)
+      echo "FAIL: the apply recipe runs [$order]; the identity capture must come first"
+      printf '%s\n' "$body"
+      false
+      ;;
+  esac
+}
+
+@test "the report folds a record it finds into the sandbox host directory" {
+  tmp=$(mktemp -d)
+  mkdir -p "$tmp/report"
+  printf '=== e2e runner identity ===\nshape: VM.Standard.E5.Flex\n' >"$tmp/record.txt"
+
+  COZY_RUNNER_IDENTITY_FILE="$tmp/record.txt" \
+    cozyreport_collect_runner_identity "$tmp/report"
+
+  assert_file_contains 'shape: VM.Standard.E5.Flex' "$tmp/report/runner-identity.txt"
+  rm -rf "$tmp"
+}
+
+@test "the report treats a record that arrived empty as no record at all" {
+  tmp=$(mktemp -d)
+  mkdir -p "$tmp/report"
+  # A write cut off by a full disk leaves the file there and empty. Copied
+  # through, that is a zero-byte runner-identity.txt in the report holding neither
+  # the record nor a reason, which is exactly the outcome the one-filename promise
+  # is supposed to rule out.
+  : >"$tmp/record.txt"
+
+  COZY_RUNNER_IDENTITY_FILE="$tmp/record.txt" \
+    cozyreport_collect_runner_identity "$tmp/report"
+
+  assert_file_contains 'absent, or present and empty' "$tmp/report/runner-identity.txt"
+  rm -rf "$tmp"
+}
+
+@test "the report names every cause of a missing record rather than picking one" {
+  tmp=$(mktemp -d)
+  mkdir -p "$tmp/report"
+
+  COZY_RUNNER_IDENTITY_FILE="$tmp/gone.txt" \
+    cozyreport_collect_runner_identity "$tmp/report"
+
+  # The capture exits 0 whatever happens, so an absent file does not say which of
+  # the three it was -- and one of them leaves the record in the job log, which is
+  # where a reader would then go. Asserting a single cause would be this collector
+  # naming a mechanism it did not observe.
+  assert_file_contains 'the capture step did not run' "$tmp/report/runner-identity.txt"
+  assert_file_contains 'could not write its file' "$tmp/report/runner-identity.txt"
+  assert_file_contains 'in the log of the step that took it' "$tmp/report/runner-identity.txt"
+  rm -rf "$tmp"
+}
+
+@test "the report writes the same filename when there is no record to fold in" {
+  tmp=$(mktemp -d)
+  mkdir -p "$tmp/report"
+
+  COZY_RUNNER_IDENTITY_FILE="$tmp/does-not-exist.txt" \
+    cozyreport_collect_runner_identity "$tmp/report"
+
+  # One filename, present on every run. A marker file beside an absent one would
+  # carry the same words and be found by nobody, because the absence is where a
+  # reader stops.
+  assert_file_contains 'no runner identity record' "$tmp/report/runner-identity.txt"
+  # And it says what the absence does not mean. An unidentified runner and an
+  # unremarkable one leave the same empty space, and only one of them is a
+  # statement about the run.
+  assert_file_contains 'NOT a statement that the runner was an ordinary one' \
+    "$tmp/report/runner-identity.txt"
+  # In the shared marker form, so one anchored grep over the unpacked tarball
+  # finds this alongside every other note the collector leaves.
+  grep -q '^# \[cozyreport\]' "$tmp/report/runner-identity.txt" || {
+    echo "FAIL: the explanation does not carry the shared marker form"
+    cat "$tmp/report/runner-identity.txt"
+    false
+  }
+  rm -rf "$tmp"
+}
diff --git a/hack/sandbox-cidr-disjoint.bats b/hack/sandbox-cidr-disjoint.bats
new file mode 100644
index 0000000000..44c1e0d144
--- /dev/null
+++ b/hack/sandbox-cidr-disjoint.bats
@@ -0,0 +1,151 @@
+#!/usr/bin/env bats
+# Asserts that the sandbox Kubernetes cluster CIDR overlaps none of the address
+# ranges the sandbox platform is configured with (pod, service and join).
+#
+# Two allocators are live on this datapath and neither knows about the other.
+# kube-ovn owns pod IPAM and allocates flat from POD_CIDR across all nodes.
+# Cilium allocates nothing for pods -- it is chained behind kube-ovn -- but it
+# does carve its own per-node infrastructure addresses out of
+# Node.spec.podCIDR, which kube-controller-manager slices from the cluster
+# CIDR: the router IP on cilium_host, and the per-node Ingress IP that Gateway
+# API brings with it. Let the two ranges overlap and kube-ovn eventually hands
+# a pod an address cilium already holds.
+#
+# On the Ingress IP that is loud: the agent refuses the sandbox with "IP
+# ipv4:<addr> is already in use". Cilium never relents on the address, so the
+# pod recovers only if something puts it on a different one. Whether that
+# happens is not a property of this collision: hack/e2e-cilium-endpoint-leak-
+# healer.sh records deleting the wedged pod landing it on a clean address, and
+# in the failure this guard comes from the same address was refused seven times
+# across six distinct pod UIDs before the suite ran out of budget. On the
+# router IP it is silent instead: the endpoint is created, the pod runs, and
+# only host-to-pod traffic breaks, because to the node's own kernel that
+# address is local.
+#
+# Cilium picks those offsets by random scan over the node's range, so excluding
+# a fixed set of addresses on the kube-ovn side does not work -- the ranges
+# have to be disjoint.
+#
+# The invariant is checked, not the literals: any of the values may move, and
+# this still passes as long as none of them overlap. An extraction that comes
+# up empty, duplicated or misshapen fails the test instead of shrinking the
+# comparison, and comments and blank lines inside the list are skipped rather
+# than read as the end of it. This is not a YAML parser, though. Anything it
+# does not read as a bare dotted quad fails the shape validation rather than
+# being understood, and that set is wider than the exotic shapes: an anchor, a
+# nested flow mapping, but also a plainly quoted scalar. Quoting is asymmetric
+# between the two sides as well -- a platform key is read only when its value
+# is double-quoted, a Talos entry only when its value is not. All of those are
+# legal reformats and all of them turn the guard red with the offending value
+# in the message, which is the safe direction but not the same promise.
+#
+# Harness compatibility note: CI runs this file under Bats through
+# `make bats-unit-tests`. It also remains compatible with the narrower legacy
+# `hack/cozytest.sh` translator, so it avoids `run`, `$status`, `$output`,
+# `skip`, and setup()/teardown(). A `!`-negated command never trips errexit, so
+# every assertion below is written as an explicit `if ... return 1`. The legacy
+# translator injects `return 0` before a top-level helper's closing brace, which
+# is why the arithmetic is inlined instead. Paths stay repo-root-relative.
+#
+# Run with: bats hack/sandbox-cidr-disjoint.bats
+
+load test_helper
+
+@test "sandbox cluster CIDR overlaps no platform range" {
+  talos_file=hack/e2e-prepare-cluster.bats
+  install_file=hack/e2e-platform-packages.sh
+
+  # Talos cluster.network.podSubnets: every list item under the key, including
+  # ones separated from the first by a comment or a blank line, so a second
+  # entry cannot slip past unexamined. An IPv6 entry does not get an overlap
+  # check, it fails the shape validation below; teaching this guard dual-stack
+  # means extending it, not just adding the value.
+  cluster_cidrs=$(awk '
+    /^[[:space:]]*podSubnets:[[:space:]]*$/ { inlist = 1; next }
+    inlist && /^[[:space:]]*-[[:space:]]+[^[:space:]]/ { print $2; next }
+    # A comment or a blank line between two entries is not the end of the
+    # list. Treating it as the end would drop every entry below it and still
+    # leave a non-empty result, which is the one way this extraction could go
+    # green while checking less than it says. The block comment that landed
+    # above podSubnets alongside this guard makes that the likely shape rather
+    # than a rare one; the guard does not require that comment, it just has to
+    # survive it and whatever gets written next to it later.
+    inlist && /^[[:space:]]*(#|$)/ { next }
+    inlist { inlist = 0 }
+  ' "$talos_file")
+
+  if [ -z "$cluster_cidrs" ]; then
+    echo "found no podSubnets entries in $talos_file" >&2
+    echo "the extraction below is keyed on 'podSubnets:' followed by a list" >&2
+    return 1
+  fi
+
+  # The ranges the install step hands the platform chart. podCIDR is the one
+  # that collides today; serviceCIDR and joinCIDR are here because the cluster
+  # CIDR must miss all three, and picking a replacement that lands on the join
+  # range instead is the obvious next way to get this wrong. These three are
+  # the allocator ranges and nothing else: the sandbox node network, the
+  # load-balancer pool and the transit range of an off-by-default component
+  # are not read here, so this list is not a complete map of what the cluster
+  # CIDR must avoid.
+  platform_cidrs=
+  for key in podCIDR serviceCIDR joinCIDR; do
+    # `|| true`: grep -c exits 1 when it counts zero, and under the runner's
+    # errexit that kills the test on the assignment, before the message below
+    # can name which key went missing. The outcome is red either way; this is
+    # only about saying why.
+    count=$(grep -cE "^[[:space:]]*${key}:[[:space:]]*\"" "$install_file" || true)
+    # grep exits 2 with no stdout when the file itself is gone, which leaves
+    # count empty and turns the arithmetic below into "integer expression
+    # expected". Still red, but named after the wrong thing.
+    count=${count:-0}
+    if [ "$count" -ne 1 ]; then
+      echo "expected exactly one $key key in $install_file, found $count" >&2
+      return 1
+    fi
+    value=$(awk -F'"' -v k="$key" '$0 ~ "^[[:space:]]*" k ":[[:space:]]*\"" { print $2; exit }' "$install_file")
+    # A present-but-empty value passes the count check above, then disappears
+    # in the unquoted word split below, dropping that range from the
+    # comparison with nothing to show for it. Refuse instead.
+    if [ -z "$value" ]; then
+      echo "$key in $install_file is present but empty" >&2
+      return 1
+    fi
+    platform_cidrs="$platform_cidrs $value"
+  done
+
+  for cidr in $cluster_cidrs $platform_cidrs; do
+    if printf '%s\n' "$cidr" | grep -qvE '^[0-9]{1,3}(\.[0-9]{1,3}){3}/[0-9]{1,2}$'; then
+      echo "extracted value is not an IPv4 CIDR: '$cidr'" >&2
+      return 1
+    fi
+  done
+
+  for cluster_cidr in $cluster_cidrs; do
+    for platform_cidr in $platform_cidrs; do
+      # Two prefixes overlap when, masked to the shorter of the two lengths,
+      # their network addresses are equal. Symmetric by construction: neither
+      # argument is privileged, so containment is caught whichever way round
+      # it is. awk arithmetic is IEEE double, exact well past the 2^32 needed.
+      if printf '%s\n%s\n' "$cluster_cidr" "$platform_cidr" | awk '
+        function toint(a,   p) {
+          split(a, p, ".")
+          return ((p[1] * 256 + p[2]) * 256 + p[3]) * 256 + p[4]
+        }
+        NR == 1 { split($0, a, "/"); ip1 = toint(a[1]); len1 = a[2] }
+        NR == 2 { split($0, b, "/"); ip2 = toint(b[1]); len2 = b[2] }
+        END {
+          shorter = (len1 < len2 ? len1 : len2)
+          block = 2 ^ (32 - shorter)
+          exit (int(ip1 / block) == int(ip2 / block)) ? 0 : 1
+        }
+      '; then
+        echo "sandbox cluster CIDR $cluster_cidr ($talos_file)" >&2
+        echo "overlaps platform range $platform_cidr ($install_file)" >&2
+        echo "cilium carves its per-node router and Ingress addresses out of the cluster CIDR." >&2
+        echo "Pick a cluster CIDR that misses every range the platform is configured with." >&2
+        return 1
+      fi
+    done
+  done
+}
diff --git a/hack/sandbox-runner-headroom.bats b/hack/sandbox-runner-headroom.bats
new file mode 100644
index 0000000000..ce1eec15bc
--- /dev/null
+++ b/hack/sandbox-runner-headroom.bats
@@ -0,0 +1,469 @@
+#!/usr/bin/env bats
+# Asserts that the e2e sandbox never fills a CI runner to its nominal capacity:
+# every workflow job that boots the sandbox must run on a runner class with
+# strictly more vCPUs and strictly more memory than the sandbox's QEMU guests
+# demand.
+#
+# The sandbox boots a fixed set of QEMU management nodes, each with its own
+# `-smp` and `-m`, and those resources are committed for the whole run. The
+# host needs cycles and memory for its own work on top of that, so a 1:1
+# commit leaves nothing to give it. That is an arithmetic statement about the
+# configuration, and it is the entire basis for this check.
+#
+# Nothing enforced that pairing before this file: the guest demand lives in a
+# bats file and the runner classes live in four workflows, so raising `-smp`
+# or adding a lane on a smaller runner drifted them apart silently. That is how
+# one lane came to sit on a 32-vCPU class while another ran the same sandbox on
+# a 24-vCPU one.
+#
+# The scope is that drift and nothing more, and the limit is worth stating
+# because the check is easy to over-read. It compares numbers. It attributes no
+# red run to a runner class, predicts nothing about how fast a lane runs, and a
+# green result means only that a lane is not oversubscribed on paper. Whether a
+# lane is fast enough also depends on what else shares the host, which none of
+# these files describe. Memory is compared because the same arithmetic applies
+# to it and the numbers are already in the strings being read, not because a
+# class that violates it exists today.
+#
+# Both sides are derived, never listed. The guest demand is read out of
+# hack/e2e-prepare-cluster.bats by multiplying each qemu launch's `-smp` and
+# `-m` by the iteration count of the `for` loop it sits in, so moving any of
+# those moves this check with it. The job list is read out of .github/workflows
+# by finding the jobs that invoke the `prepare-env` / `prepare-cluster` make
+# targets, so a fifth lane written as an ordinary job is covered the day it is
+# added rather than the day someone remembers to extend a literal list here.
+#
+# The floor of that derivation is the workflow file itself, and it is worth
+# naming rather than leaving as an implied promise of total coverage. A lane
+# that reached the sandbox through a composite action would carry the make
+# target inside the action and only `runs-on` in the workflow, so neither the
+# marker sweep nor the coverage cross-check would see it. Nothing in the tree
+# is written that way today. A workflow reached through `workflow_call` is a
+# different case and is covered, because the called file carries both its own
+# `runs-on` and its own marker. Covering a composite action means teaching both
+# legs to follow `uses:`, which is a larger change than widening a pattern.
+#
+# A derivation that cannot read its input has two ways out, and only one of
+# them is safe. Guessing produces a number smaller than the truth, which passes
+# a runner that cannot hold the sandbox; stopping produces a red naming the
+# line. This one stops. The guest-side shapes in the list below are pinned by
+# the fixture tests at the end of this file; the last bullet is a runner-side
+# refusal, which only the live tree exercises.
+#
+#   - a line naming qemu-system-x86_64 with no literal `-smp <n>` or no literal
+#     `-m <n>`, which covers `-smp cpus=8` and `-m size=24576` as well as an
+#     absent flag;
+#   - such a line outside any @test block, where no loop count applies to it;
+#   - a @test block still open at end of file, whose contents were never
+#     accounted for;
+#   - a `for` opener the strict pattern does not match, counted separately from
+#     the ones it does so that `do` on the following line is refused instead of
+#     silently multiplying by one;
+#   - a `for` list holding anything but literal words, so `$(seq 1 3)` is
+#     refused rather than counted as three whitespace tokens by coincidence;
+#   - a `while` or `until` loop in the same @test block as a qemu launch, since
+#     its iteration count is not a static property at all;
+#   - more than one qemu launch or more than one `for` loop in a single @test
+#     block;
+#   - a sandbox job whose `runs-on` does not carry an `oracle-vm-<n>cpu-<m>gb`
+#     class.
+#
+# Several of those are scoped to the @test block rather than to real nesting,
+# and say so in their messages, because this file refuses rather than parses
+# shell. A poll loop added beside a qemu launch trips the while/until refusal
+# without enclosing anything; moving it into its own @test block is the answer,
+# and the message says that rather than leaving the reader to derive it. The
+# loop multiplier is block-scoped for the same reason: a strict `for` anywhere
+# in the block multiplies the launch whether or not it encloses it. That
+# over-counts rather than under-counts, so the worst it yields is a false red,
+# and the one-loop-per-block refusal bounds how far it can go.
+#
+# The qemu match is deliberately any line naming `qemu-system-x86_64`, which is
+# wider than a launch. Narrowing it to lines that begin with the binary would
+# skip a launch written as `sudo qemu-system-x86_64` or with a leading `env`,
+# and a skipped launch lowers the demand this compares, which is the one
+# direction that must never happen quietly. So the width stays and a line that
+# names the binary without a literal `-smp`/`-m` is refused by name.
+#
+# Unit note for the memory leg: qemu's `-m` is MiB, and the runner class names
+# its memory in `gb`. This reads that `gb` as GiB, which is the permissive
+# direction, not the safe one: if the vendor means GB, the runner holds less
+# than assumed and this leg lets through a class it should not. It is written
+# that way because the inequality it asserts holds under either reading for the
+# classes in .github/actionlint.yaml, so the looser unit costs nothing today.
+#
+# The coverage cross-check exists for the other rot direction. Matching jobs on
+# a make-target name says nothing when the name changes or the YAML is
+# reindented: the parser simply finds fewer jobs and the survivors still pass.
+# So every workflow file that drives the sandbox make targets at all must yield
+# at least one matched job, which turns a half-broken parser red instead of
+# quietly narrowing what is checked.
+#
+# Harness compatibility note: CI runs this file under Bats through
+# `make bats-unit-tests`. It also remains compatible with the narrower legacy
+# `hack/cozytest.sh` translator, so it avoids `run`, `$status`, `$output`,
+# `skip`, and setup()/teardown(). A `!`-negated command never trips errexit, so
+# every assertion below is written as an explicit `if ... return 1`. The legacy
+# translator injects `return 0` before a top-level helper's closing brace, so
+# nothing is factored into one. It also rewrites bare `}` lines and lines that
+# begin with `@test `, so the fixtures below use `printf` instead of heredocs.
+# Paths stay repo-root-relative.
+#
+# Run with: bats hack/sandbox-runner-headroom.bats
+
+load test_helper
+
+# The guest-side derivation, held in one place so the check that runs against
+# the live tree and the fixtures that pin its refusals cannot drift apart.
+# Prints the vCPU total then the MiB total on success, one ERROR line
+# otherwise. `exit` inside an awk rule still runs END, so the error path raises
+# a flag END reads first: stdout is the only channel that survives to a caller.
+GUEST_DEMAND_AWK='
+  /^@test / {
+    if (inblk) { print "ERROR unclosed @test block above line " NR; failed = 1; exit 1 }
+    inblk = 1; nfor = 0; nforraw = 0; nloop = 0; forcount = 0
+    nqemu = 0; smp = ""; mem = ""; baditem = ""
+    next
+  }
+  inblk && /^}/ {
+    if (nqemu > 0) {
+      blk = " in the @test block ending at line " NR
+      if (nqemu > 1) { print "ERROR " nqemu " lines naming qemu-system-x86_64" blk; failed = 1; exit 1 }
+      if (smp == "") { print "ERROR line naming qemu-system-x86_64 with no literal -smp <n>" blk; failed = 1; exit 1 }
+      if (mem == "") { print "ERROR line naming qemu-system-x86_64 with no literal -m <n>" blk; failed = 1; exit 1 }
+      if (nloop > 0) { print "ERROR while/until loop in the same @test block as a qemu launch" blk; failed = 1; exit 1 }
+      if (nforraw > nfor) { print "ERROR for opener the strict pattern could not read" blk; failed = 1; exit 1 }
+      if (nfor > 1) { print "ERROR " nfor " for-loops" blk; failed = 1; exit 1 }
+      if (baditem != "") { print "ERROR non-literal item \"" baditem "\" in the for list" blk; failed = 1; exit 1 }
+      mult = (nfor == 1 ? forcount : 1)
+      total_cpu += smp * mult
+      total_mem += mem * mult
+      launches += 1
+    }
+    inblk = 0
+    next
+  }
+  !inblk && /qemu-system-x86_64/ {
+    print "ERROR line naming qemu-system-x86_64 outside any @test block at line " NR
+    failed = 1
+    exit 1
+  }
+  inblk {
+    line = $0
+    if (line ~ /^[[:space:]]*(while|until)[[:space:]]/) nloop += 1
+    if (line ~ /^[[:space:]]*for[[:space:]]/) {
+      nforraw += 1
+      if (line ~ /^[[:space:]]*for[[:space:]]+[A-Za-z_][A-Za-z0-9_]*[[:space:]]+in[[:space:]]+[^;]+;[[:space:]]*do[[:space:]]*$/) {
+        sub(/^[[:space:]]*for[[:space:]]+[A-Za-z_][A-Za-z0-9_]*[[:space:]]+in[[:space:]]+/, "", line)
+        sub(/;[[:space:]]*do[[:space:]]*$/, "", line)
+        sub(/^[[:space:]]+/, "", line)
+        sub(/[[:space:]]+$/, "", line)
+        nfor += 1
+        forcount = split(line, items, /[[:space:]]+/)
+        for (k = 1; k <= forcount; k++) {
+          if (items[k] !~ /^[A-Za-z0-9_.-]+$/) baditem = items[k]
+        }
+      }
+      line = $0
+    }
+    if (line ~ /qemu-system-x86_64/) {
+      nqemu += 1
+      if (match(line, /-smp[[:space:]]+[0-9]+([[:space:]]|$)/)) {
+        smp = substr(line, RSTART, RLENGTH)
+        sub(/-smp[[:space:]]+/, "", smp)
+        sub(/[^0-9]/, "", smp)
+      }
+      if (match(line, /-m[[:space:]]+[0-9]+([[:space:]]|$)/)) {
+        mem = substr(line, RSTART, RLENGTH)
+        sub(/-m[[:space:]]+/, "", mem)
+        sub(/[^0-9]/, "", mem)
+      }
+    }
+  }
+  END {
+    if (failed) exit 1
+    if (inblk) { print "ERROR @test block still open at end of file"; exit 1 }
+    if (launches == 0) { print "ERROR no qemu-system-x86_64 launch found"; exit 1 }
+    print total_cpu
+    print total_mem
+  }
+'
+
+@test "every workflow job that boots the e2e sandbox leaves spare host capacity" {
+  # Read from the QEMU sandbox file for every lane, container lanes included:
+  # the `prepare-env` substring also matches `prepare-env-container`, and the
+  # compose file gives its three nodes the same 8 CPU / 24576 MiB the QEMU
+  # guests get, by design (packages/core/testing/Makefile). So the figures are
+  # right for both substrates, but only because the two agree -- and that they
+  # agree is itself pinned, in hack/container-lane-capacity_test.bats, which
+  # holds hack/e2e-compose.yaml to the same literals. If the container lane is
+  # ever sized differently, this test has to start reading e2e-compose.yaml for
+  # those jobs; it will not notice on its own.
+  sandbox_file=hack/e2e-prepare-cluster.bats
+  workflow_dir=.github/workflows
+
+  # `|| true` because the assignment inherits awk's status, and under errexit a
+  # refusal would kill the test right here, before the branch below can print
+  # the sentence that says which shapes the parser needs.
+  guest=$(awk "$GUEST_DEMAND_AWK" "$sandbox_file") || true
+
+  guest_vcpus=$(printf '%s\n' "$guest" | sed -n 1p)
+  guest_mib=$(printf '%s\n' "$guest" | sed -n 2p)
+  for value in "$guest_vcpus" "$guest_mib"; do
+    case "$value" in
+      ""|*[!0-9]*)
+        echo "could not read the sandbox guest demand from $sandbox_file:" >&2
+        printf '%s\n' "$guest" >&2
+        echo "every qemu-system-x86_64 launch must carry a literal '-smp <n>' and '-m <n>', sit inside a closed @test block, and be enclosed by at most one literal 'for VAR in ...; do' loop." >&2
+        return 1
+        ;;
+    esac
+  done
+  if [ "$guest_vcpus" -le 0 ] || [ "$guest_mib" -le 0 ]; then
+    echo "the sandbox guest demand read from $sandbox_file is $guest_vcpus vCPU / $guest_mib MiB" >&2
+    return 1
+  fi
+
+  # ── Runner side. One line per job that drives the sandbox make targets:
+  # workflow path, job name, the vCPU and GiB of its runner class (or NONE for
+  # both) and the raw runs-on value. Comment lines are dropped before the
+  # marker match, so prose naming e2e-prepare-cluster.bats above a job cannot
+  # enrol it. Both globs are passed unquoted: if either matches nothing awk
+  # gets a literal path and exits 2, which errexit turns into a red without the
+  # named line the refusals above carry. Louder than they are, and still the
+  # safe direction, since no workflow extension drops out of the sweep quietly.
+  sandbox_jobs=$(awk '
+    function class_of(s,   n) {
+      if (match(s, /oracle-vm-[0-9]+cpu-[0-9]+gb/)) {
+        n = substr(s, RSTART, RLENGTH)
+        sub(/^oracle-vm-/, "", n)
+        sub(/cpu-/, " ", n)
+        sub(/gb$/, "", n)
+        return n
+      }
+      return "NONE NONE"
+    }
+    function flush() {
+      if (job != "" && sandbox) print wf, job, class_of(ro), ro
+      job = ""; ro = ""; sandbox = 0
+    }
+    FNR == 1 { flush(); wf = FILENAME }
+    /^  [A-Za-z0-9_-]+:[[:space:]]*$/ {
+      flush()
+      job = $0
+      sub(/^[[:space:]]+/, "", job)
+      sub(/:[[:space:]]*$/, "", job)
+      next
+    }
+    job != "" {
+      if ($0 ~ /^[[:space:]]*#/) next
+      if ($0 ~ /^    runs-on:/) {
+        ro = $0
+        sub(/^[[:space:]]*runs-on:[[:space:]]*/, "", ro)
+      }
+      if ($0 ~ /prepare-env/ || $0 ~ /prepare-cluster/) sandbox = 1
+    }
+    END { flush() }
+  ' "$workflow_dir"/*.yaml "$workflow_dir"/*.yml)
+
+  if [ -z "$sandbox_jobs" ]; then
+    echo "no job in $workflow_dir invokes the sandbox make targets" >&2
+    echo "this check matches jobs on 'prepare-env' / 'prepare-cluster'; if those targets were renamed, rename them here too." >&2
+    return 1
+  fi
+
+  # ── Coverage cross-check, before the comparison it guards. A file that runs
+  # anything under packages/core/testing is a sandbox lane, so failing to match
+  # a job in it means the parser above lost the file, not that the file is
+  # innocent.
+  for wf in "$workflow_dir"/*.yaml "$workflow_dir"/*.yml; do
+    [ -e "$wf" ] || continue
+    if grep -v '^[[:space:]]*#' "$wf" | grep -q 'packages/core/testing'; then
+      if printf '%s\n' "$sandbox_jobs" | grep -qF "$wf "; then
+        continue
+      fi
+      # Named exemption: the isp-hosted lane starts the sandbox container but
+      # no guests -- its cluster is kind, sized by the runner itself -- so it
+      # has no guest demand to compare. It is checked after the job match, so
+      # the day that lane calls prepare-env or prepare-cluster it is sized
+      # like any other.
+      case "$wf" in
+        "$workflow_dir"/e2e-isp-hosted.yaml) continue ;;
+      esac
+      echo "$wf runs the packages/core/testing make targets but no job in it matched the sandbox marker" >&2
+      echo "the job parser reads job names at two-space indent and runs-on at four; a reindent or a renamed target breaks it silently." >&2
+      return 1
+    fi
+  done
+
+  violations=
+  while read -r wf job cpus gib raw; do
+    if [ "$cpus" = "NONE" ]; then
+      echo "job '$job' in $wf boots the e2e sandbox but its runs-on names no oracle-vm-<n>cpu-<m>gb class: ${raw:-<empty>}" >&2
+      echo "this check cannot size a runner it cannot name, and guessing one would be worse than stopping." >&2
+      return 1
+    fi
+    runner_mib=$((gib * 1024))
+    if [ "$guest_vcpus" -ge "$cpus" ]; then
+      violations="$violations
+  $wf job '$job': $guest_vcpus guest vCPU on a ${cpus}-vCPU runner ($raw)"
+    fi
+    if [ "$guest_mib" -ge "$runner_mib" ]; then
+      violations="$violations
+  $wf job '$job': $guest_mib MiB of guest memory on a ${gib}-GiB runner ($raw)"
+    fi
+  done <<EOF
+$sandbox_jobs
+EOF
+
+  if [ -n "$violations" ]; then
+    echo "the e2e sandbox demands $guest_vcpus guest vCPU and $guest_mib MiB (from $sandbox_file)," >&2
+    echo "which leaves no host headroom on these runners:" >&2
+    printf '%s\n' "$violations" >&2
+    echo "Move the job to a larger runner class, or lower the sandbox's -smp / -m." >&2
+    return 1
+  fi
+}
+
+# ── Fixtures for the guest-side derivation.
+#
+# The check above passes on the live tree whether or not the refusals still
+# work, so loosening the awk would be a silent no-op without these. Each one
+# feeds a synthetic file to the same program the check uses and asserts on the
+# value it prints.
+
+@test "guest demand multiplies -smp and -m by the loop count" {
+  fixdir=$(mktemp -d)
+  printf '@test "boot" {\n  for i in 1 2 3; do\n    qemu-system-x86_64 -smp 8 -m 24576 -display none\n  done\n}\n' > "$fixdir/f.bats"
+  demand=$(awk "$GUEST_DEMAND_AWK" "$fixdir/f.bats" 2>&1) || true
+  rm -rf "$fixdir"
+  cpu=$(printf '%s\n' "$demand" | sed -n 1p)
+  mib=$(printf '%s\n' "$demand" | sed -n 2p)
+  if [ "$cpu" != 24 ] || [ "$mib" != 73728 ]; then
+    echo "expected 24 vCPU / 73728 MiB, got: [$demand]" >&2
+    return 1
+  fi
+}
+
+@test "guest demand counts a launch outside any loop exactly once" {
+  fixdir=$(mktemp -d)
+  printf '@test "boot" {\n  qemu-system-x86_64 -smp 8 -m 24576 -display none\n}\n' > "$fixdir/f.bats"
+  demand=$(awk "$GUEST_DEMAND_AWK" "$fixdir/f.bats" 2>&1) || true
+  rm -rf "$fixdir"
+  cpu=$(printf '%s\n' "$demand" | sed -n 1p)
+  mib=$(printf '%s\n' "$demand" | sed -n 2p)
+  if [ "$cpu" != 8 ] || [ "$mib" != 24576 ]; then
+    echo "expected 8 vCPU / 24576 MiB, got: [$demand]" >&2
+    return 1
+  fi
+}
+
+@test "guest demand refuses a qemu line outside any @test block" {
+  fixdir=$(mktemp -d)
+  printf 'boot_node() {\n  qemu-system-x86_64 -smp 4 -m 8192\n}\n@test "boot" {\n  for i in 1 2 3; do\n    qemu-system-x86_64 -smp 8 -m 24576\n  done\n}\n' > "$fixdir/f.bats"
+  demand=$(awk "$GUEST_DEMAND_AWK" "$fixdir/f.bats" 2>&1) || true
+  rm -rf "$fixdir"
+  case "$demand" in
+    ERROR*outside\ any\ @test\ block*) : ;;
+    *) echo "expected a refusal naming the out-of-block line, got: [$demand]" >&2; return 1 ;;
+  esac
+}
+
+@test "guest demand refuses a @test block left open at end of file" {
+  fixdir=$(mktemp -d)
+  printf '@test "boot" {\n  for i in 1 2 3; do\n    qemu-system-x86_64 -smp 8 -m 24576\n  done\n' > "$fixdir/f.bats"
+  demand=$(awk "$GUEST_DEMAND_AWK" "$fixdir/f.bats" 2>&1) || true
+  rm -rf "$fixdir"
+  case "$demand" in
+    ERROR*still\ open\ at\ end\ of\ file*) : ;;
+    *) echo "expected a refusal naming the unclosed block, got: [$demand]" >&2; return 1 ;;
+  esac
+}
+
+@test "guest demand refuses a launch with no literal -smp" {
+  fixdir=$(mktemp -d)
+  printf '@test "boot" {\n  for i in 1 2 3; do\n    qemu-system-x86_64 -smp cpus=8 -m 24576\n  done\n}\n' > "$fixdir/f.bats"
+  demand=$(awk "$GUEST_DEMAND_AWK" "$fixdir/f.bats" 2>&1) || true
+  rm -rf "$fixdir"
+  case "$demand" in
+    ERROR*no\ literal\ -smp*) : ;;
+    *) echo "expected a refusal naming -smp, got: [$demand]" >&2; return 1 ;;
+  esac
+}
+
+@test "guest demand refuses a launch with no literal -m" {
+  fixdir=$(mktemp -d)
+  printf '@test "boot" {\n  for i in 1 2 3; do\n    qemu-system-x86_64 -smp 8 -m size=24576\n  done\n}\n' > "$fixdir/f.bats"
+  demand=$(awk "$GUEST_DEMAND_AWK" "$fixdir/f.bats" 2>&1) || true
+  rm -rf "$fixdir"
+  case "$demand" in
+    ERROR*no\ literal\ -m*) : ;;
+    *) echo "expected a refusal naming -m, got: [$demand]" >&2; return 1 ;;
+  esac
+}
+
+@test "guest demand refuses a for opener the strict pattern cannot read" {
+  fixdir=$(mktemp -d)
+  printf '@test "boot" {\n  for i in 1 2 3\n  do\n    qemu-system-x86_64 -smp 8 -m 24576\n  done\n}\n' > "$fixdir/f.bats"
+  demand=$(awk "$GUEST_DEMAND_AWK" "$fixdir/f.bats" 2>&1) || true
+  rm -rf "$fixdir"
+  case "$demand" in
+    ERROR*for\ opener*) : ;;
+    *) echo "expected a refusal naming the for opener, got: [$demand]" >&2; return 1 ;;
+  esac
+}
+
+@test "guest demand refuses a for list that is not literal words" {
+  fixdir=$(mktemp -d)
+  printf '@test "boot" {\n  for i in $(seq 1 3); do\n    qemu-system-x86_64 -smp 8 -m 24576\n  done\n}\n' > "$fixdir/f.bats"
+  demand=$(awk "$GUEST_DEMAND_AWK" "$fixdir/f.bats" 2>&1) || true
+  rm -rf "$fixdir"
+  case "$demand" in
+    ERROR*non-literal\ item*) : ;;
+    *) echo "expected a refusal naming the non-literal item, got: [$demand]" >&2; return 1 ;;
+  esac
+}
+
+@test "guest demand refuses a while loop beside a qemu launch" {
+  fixdir=$(mktemp -d)
+  printf '@test "boot" {\n  i=1\n  while [ $i -le 3 ]; do\n    qemu-system-x86_64 -smp 8 -m 24576\n  done\n}\n' > "$fixdir/f.bats"
+  demand=$(awk "$GUEST_DEMAND_AWK" "$fixdir/f.bats" 2>&1) || true
+  rm -rf "$fixdir"
+  case "$demand" in
+    ERROR*while/until\ loop*) : ;;
+    *) echo "expected a refusal naming the while loop, got: [$demand]" >&2; return 1 ;;
+  esac
+}
+
+@test "guest demand refuses two qemu lines in one @test block" {
+  fixdir=$(mktemp -d)
+  printf '@test "boot" {\n  for i in 1 2 3; do\n    qemu-system-x86_64 -smp 8 -m 24576\n    qemu-system-x86_64 -smp 4 -m 8192\n  done\n}\n' > "$fixdir/f.bats"
+  demand=$(awk "$GUEST_DEMAND_AWK" "$fixdir/f.bats" 2>&1) || true
+  rm -rf "$fixdir"
+  case "$demand" in
+    ERROR*lines\ naming\ qemu-system-x86_64*) : ;;
+    *) echo "expected a refusal naming the second launch, got: [$demand]" >&2; return 1 ;;
+  esac
+}
+
+@test "guest demand refuses two for loops in one @test block" {
+  fixdir=$(mktemp -d)
+  printf '@test "boot" {\n  for j in a b; do\n    echo "$j"\n  done\n  for i in 1 2 3; do\n    qemu-system-x86_64 -smp 8 -m 24576\n  done\n}\n' > "$fixdir/f.bats"
+  demand=$(awk "$GUEST_DEMAND_AWK" "$fixdir/f.bats" 2>&1) || true
+  rm -rf "$fixdir"
+  case "$demand" in
+    ERROR*for-loops*) : ;;
+    *) echo "expected a refusal naming the second loop, got: [$demand]" >&2; return 1 ;;
+  esac
+}
+
+@test "guest demand refuses a file with no qemu launch at all" {
+  fixdir=$(mktemp -d)
+  printf '@test "nothing" {\n  true\n}\n' > "$fixdir/f.bats"
+  demand=$(awk "$GUEST_DEMAND_AWK" "$fixdir/f.bats" 2>&1) || true
+  rm -rf "$fixdir"
+  case "$demand" in
+    ERROR*no\ qemu-system-x86_64\ launch\ found*) : ;;
+    *) echo "expected a refusal naming the absent launch, got: [$demand]" >&2; return 1 ;;
+  esac
+}
diff --git a/hack/seaweedfs-chart-seam.bats b/hack/seaweedfs-chart-seam.bats
new file mode 100644
index 0000000000..188ab85397
--- /dev/null
+++ b/hack/seaweedfs-chart-seam.bats
@@ -0,0 +1,80 @@
+#!/usr/bin/env bats
+# Unit test: the volume size limit the SeaweedFS app chart writes into its
+# <name>-system HelmRelease reaches the master the data-plane chart renders,
+# with the growth counts that make up the rest of the bucket budget intact.
+#
+# Each chart has its own suite and neither feeds the other: the app chart's
+# asserts on the spec.values it writes, the data-plane chart's on the command it
+# renders from its own defaults. A key the app chart writes and the data-plane
+# chart no longer reads, or one a chart bump moves, leaves both green. This
+# renders the app chart, lifts spec.values out of the HelmRelease and renders
+# the data-plane chart with exactly that, the way helm-controller does.
+#
+# What it leaves out: the tenant's cozystack-values Secret, which the release
+# also takes through valuesFrom; the tenant chart writes only _cluster and
+# _namespace into it (packages/apps/tenant/templates/namespace.yaml). The live
+# merge, Secret included, is asserted by hack/e2e-chainsaw/seaweedfs/.
+#
+# Run with: bats hack/seaweedfs-chart-seam.bats
+
+load test_helper
+
+REPO_ROOT="$(cd "$(dirname "${BATS_TEST_FILENAME:-$0}")/.." && pwd)"
+APP_CHART="$REPO_ROOT/packages/extra/seaweedfs"
+SYSTEM_CHART="$REPO_ROOT/packages/system/seaweedfs"
+
+# render_master <workdir> [helm args...] -- the master StatefulSet the
+# data-plane chart renders from the app chart's output; leaves the master
+# script in <workdir>/command and its env in <workdir>/env.
+render_master() {
+  dir=$1
+  shift
+  helm template seaweedfs "$APP_CHART" --namespace tenant-root \
+    --set _namespace.host=example.org --set _namespace.ingress=tenant-root \
+    --set _cluster.solver=http01 "$@" \
+    --show-only templates/seaweedfs.yaml > "$dir/app.yaml"
+  yq 'select(.metadata.name == "seaweedfs-system") | .spec.values' \
+    "$dir/app.yaml" > "$dir/values.yaml"
+  # Premise: an empty lift would render the data-plane defaults and pass the
+  # COPY_* checks on its own.
+  grep -q '^seaweedfs:' "$dir/values.yaml"
+  helm template seaweedfs-system "$SYSTEM_CHART" --namespace tenant-root \
+    --values "$dir/values.yaml" \
+    --show-only charts/seaweedfs/templates/master/master-statefulset.yaml > "$dir/master.yaml"
+  yq '.spec.template.spec.containers[0].command[2]' "$dir/master.yaml" > "$dir/command"
+  yq -o=json -I=0 '.spec.template.spec.containers[0].env[] | select(.name | test("^WEED_MASTER_VOLUME_GROWTH_")) | [.name, .value]' \
+    "$dir/master.yaml" > "$dir/env"
+}
+
+# The four growth counts, as the master must see them: COPY_2 from the
+# data-plane chart's own values, the other three from the subchart beneath it.
+# The app chart sends a master block of its own, and a merge that replaced
+# rather than merged it would drop all four.
+EXPECTED_GROWTH='["WEED_MASTER_VOLUME_GROWTH_COPY_1","7"]
+["WEED_MASTER_VOLUME_GROWTH_COPY_2","3"]
+["WEED_MASTER_VOLUME_GROWTH_COPY_3","3"]
+["WEED_MASTER_VOLUME_GROWTH_COPY_OTHER","1"]'
+
+@test "the app chart's default volume size limit starts the master" {
+  # Read rather than pinned: the default itself is pinned in the app chart's
+  # own suite, this checks only that it arrives. It has to differ from the
+  # data-plane fallback, or a dropped hand-off would render the same flag.
+  app=$(yq '.master.volumeSizeLimitMB' "$APP_CHART/values.yaml")
+  fallback=$(yq '.seaweedfs.master.volumeSizeLimitMB' "$SYSTEM_CHART/values.yaml")
+  case "$app" in ''|*[!0-9]*) echo "app chart default is not a number: '$app'" >&2; exit 1 ;; esac
+  case "$fallback" in ''|*[!0-9]*) echo "data-plane fallback is not a number: '$fallback'" >&2; exit 1 ;; esac
+  [ "$app" != "$fallback" ]
+  dir=$(mktemp -d)
+  render_master "$dir"
+  grep -qE -- "-volumeSizeLimitMB=$app( |\$)" "$dir/command"
+  [ "$(cat "$dir/env")" = "$EXPECTED_GROWTH" ]
+  rm -rf "$dir"
+}
+
+@test "an operator's volume size limit starts the master" {
+  dir=$(mktemp -d)
+  render_master "$dir" --set master.volumeSizeLimitMB=500
+  grep -qE -- '-volumeSizeLimitMB=500( |$)' "$dir/command"
+  [ "$(cat "$dir/env")" = "$EXPECTED_GROWTH" ]
+  rm -rf "$dir"
+}
diff --git a/hack/seaweedfs-guard-parity.bats b/hack/seaweedfs-guard-parity.bats
new file mode 100644
index 0000000000..afa68a4e9d
--- /dev/null
+++ b/hack/seaweedfs-guard-parity.bats
@@ -0,0 +1,248 @@
+#!/usr/bin/env bats
+# -----------------------------------------------------------------------------
+# The SeaweedFS naming guard exists in two copies:
+#
+#   packages/system/seaweedfs/templates/naming-guard.yaml   (ENFORCING — the
+#     <name>-system HelmRelease pulls this chart from a platform-managed
+#     ExternalArtifact, so a platform upgrade re-renders it directly and nothing
+#     else stands between the upgrade and the tenant's workloads)
+#   packages/extra/seaweedfs/templates/seaweedfs.yaml       (sibling — warns on
+#     the SeaweedFS application itself, where the operator looks first)
+#
+# They cannot be shared: the two packages are separate charts and neither depends
+# on cozy-lib, so there is no library either could include the classifier from.
+# They were kept in sync by a comment saying "keep the two classifications in
+# sync" — and this whole branch exists because the guard lived in the wrong
+# chart. Silent drift between the copies is the same failure class, so pin it.
+#
+# Only the DETECTION block is compared: the two `fail` messages differ by design
+# ("SeaweedFS release <name>" vs "SeaweedFS <name>", matching each chart's voice)
+# and the branch structure is asserted separately. It is the detection — which
+# objects establish which generation — that must never diverge.
+#
+# The block starts at the reconstruction, not at the flag declarations: the line
+# above it is deliberately different per chart (system/ IS the <name>-system
+# release; extra/ is <name> and derives the child), and that is the ONLY sanctioned
+# difference. Both are asserted separately below.
+#
+# Run with: bats hack/seaweedfs-guard-parity.bats
+# -----------------------------------------------------------------------------
+
+load test_helper
+
+SYS="$PWD/packages/system/seaweedfs/templates/naming-guard.yaml"
+EXTRA="$PWD/packages/extra/seaweedfs/templates/seaweedfs.yaml"
+
+# detection_block <file> -- the generation-detection lines, from the first flag
+# declaration through the two derived generation booleans.
+detection_block() {
+  sed -n '/\$renamedVol := include/,/\$systemGen := or/p' "$1"
+}
+
+# template_code <file> -- the file with its {{/* ... */}} spans removed.
+#
+# A discriminator is forbidden as template LOGIC, and both charts carry long
+# comment blocks arguing why these particular signals were rejected. Grepping the
+# raw file cannot tell the argument from the thing argued against, so it reports
+# a chart for documenting the rule it obeys.
+#
+# The span and not the line. Dropping every line that opens a comment is one
+# character shorter and silently loses `{{- $x := .creationTimestamp }} {{/* why
+# */}}`: the discriminator leaves with the comment and the checks below find
+# nothing. Nothing downstream sees it either -- that line both opens and closes,
+# so the strip finishes cleanly and every canary token survives. The only
+# symptom is a chart that classifies on a forbidden signal and a test that says
+# it does not.
+#
+# A file that ends inside a comment is reported on stdout, not through an exit
+# status. Every `{{/*` is read as an opener, including one inside a quoted
+# string -- these charts carry long `fail (printf ...)` messages -- and a lone
+# opener swallows the rest of the file, leaving the checks reading nothing.
+# hack/cozytest.sh rewrites every `}` at column 0 into `return 0; }`, which is
+# this function's closing brace too, so its exit status never reaches the
+# caller: a status the runner discards is a check that is not there.
+#
+# Counting delimiters cannot stand in for the state the strip already carries.
+# Go template comments do not nest -- the first `*/}}` closes the block -- so
+# `{{/* the opener is spelled {{/* */}}` is a comment Helm renders, while its
+# two openers against one closer read as an imbalance that is not one.
+template_code() {
+  awk '
+    {
+      line = $0; out = ""
+      while (1) {
+        if (!inc) {
+          if (match(line, /\{\{-? *\/\*/)) {
+            out = out substr(line, 1, RSTART - 1)
+            line = substr(line, RSTART + RLENGTH); inc = 1
+          } else { out = out line; break }
+        } else {
+          if (match(line, /\*\/ *-?\}\}/)) { line = substr(line, RSTART + RLENGTH); inc = 0 }
+          else break
+        }
+      }
+      if (out ~ /[^[:space:]]/) print out
+    }
+    END { if (inc) print "__TEMPLATE_COMMENT_LEFT_OPEN__" }
+  ' "$1"
+}
+
+@test "the comment strip removes the span, not the line that opens it" {
+  # Pins the difference between the two spellings, because on today's charts
+  # they agree: no line carries both a discriminator and a comment opener, so
+  # the weaker version passes every check below. It is the shape that would go
+  # wrong silently -- a chart classifying on a forbidden signal and this suite
+  # reporting that it does not -- so it gets a fixture rather than trust.
+  tmp="$(mktemp)"
+  printf '%s\n' \
+    '{{- $renamedVol := include "x" . }}' \
+    '{{- $bad := .metadata.creationTimestamp }} {{/* why this is fine */}}' \
+    '{{- /* a whole-line block' \
+    '   mentioning readyReplicas */}}' > "$tmp"
+
+  code="$(template_code "$tmp")"
+  # A comment-only block still goes.
+  if printf '%s\n' "$code" | grep -q 'readyReplicas'; then
+    echo "FAIL: a comment-only block survived the strip"
+    false
+  fi
+  # The code sharing a line with an opener does not.
+  printf '%s\n' "$code" | grep -q 'creationTimestamp'
+  printf '%s\n' "$code" | grep -q 'renamedVol'
+  rm -f "$tmp"
+}
+
+@test "the comment strip reads a quoted opener as text and reports one left open" {
+  # Go template comments do not nest -- the first `*/}}` closes the block -- so
+  # a comment documenting the opener syntax is one Helm renders. The strip is
+  # already inside a comment when the second opener arrives, so it reads that
+  # opener as comment text; counting delimiters reads the same line as two
+  # openers against one closer and refuses a chart that is fine.
+  tmp="$(mktemp)"
+  printf '%s\n' \
+    '{{- $renamedVol := include "x" . }}' \
+    '{{/* the opener is spelled {{/* and mentions readyReplicas */}}' > "$tmp"
+  code="$(template_code "$tmp")"
+  printf '%s\n' "$code" | grep -q 'renamedVol'
+  if printf '%s\n' "$code" | grep -q 'readyReplicas'; then
+    echo "FAIL: the comment quoting an opener survived the strip"
+    false
+  fi
+  if printf '%s\n' "$code" | grep -qF -- '__TEMPLATE_COMMENT_LEFT_OPEN__'; then
+    echo "FAIL: a comment that closes was reported as left open"
+    false
+  fi
+
+  # An opener with no closer leaves the strip mid-comment at EOF -- the shape
+  # that silently swallows every check below it -- and that is what the marker
+  # is for.
+  printf '%s\n' \
+    '{{- $renamedVol := include "x" . }}' \
+    '{{- fail (printf "the opener is spelled {{/* in the docs") }}' \
+    '{{- $bad := .metadata.creationTimestamp }}' > "$tmp"
+  code="$(template_code "$tmp")"
+  printf '%s\n' "$code" | grep -qF -- '__TEMPLATE_COMMENT_LEFT_OPEN__'
+  # The swallowing is real, not just announced: the line after the lone opener
+  # is gone from the output.
+  if printf '%s\n' "$code" | grep -q 'creationTimestamp'; then
+    echo "FAIL: the fixture does not reproduce the swallow it claims to pin"
+    false
+  fi
+  rm -f "$tmp"
+}
+
+@test "both charts detect naming generations with byte-identical logic" {
+  a=$(mktemp); b=$(mktemp)
+  detection_block "$SYS"   > "$a"
+  detection_block "$EXTRA" > "$b"
+  # Non-empty: a sed range that matched nothing would make this test vacuous.
+  [ -s "$a" ]
+  [ -s "$b" ]
+  diff -u "$a" "$b"
+  rm -f "$a" "$b"
+}
+
+@test "each chart feeds the reconstruction the <name>-system release name" {
+  # system/seaweedfs IS that release; extra/seaweedfs is <name> and must derive it.
+  # Getting this wrong silently reconstructs the wrong prefix, so neither
+  # generation matches and the guard renders through.
+  grep -qF -- '$sysRelease := .Release.Name' "$SYS"
+  grep -qF -- '$sysRelease := printf "%s-system" .Release.Name' "$EXTRA"
+}
+
+@test "both charts reconstruct the renamed prefix rather than prefix-matching alone" {
+  # An instance legitimately named `seaweedfs-volume` renders release-named objects
+  # (seaweedfs-volume-system-volume, data1-seaweedfs-volume-system-volume-0) that
+  # ALSO satisfy the chart-named prefixes. Release-named must be tested FIRST,
+  # against a reconstructed prefix, or live storage reads as legacy.
+  for f in "$SYS" "$EXTRA"; do
+    grep -qF -- '$renamedVol := include "seaweedfs.renamedVolumePrefix" $sysRelease' "$f"
+    # release-named branch precedes the chart-named fallback in both scans
+    pv=$(grep -n 'hasPrefix (printf "data1-%s" $renamedVol)' "$f" | cut -d: -f1)
+    lv=$(grep -n 'hasPrefix "data1-seaweedfs-volume"' "$f" | cut -d: -f1)
+    [ -n "$pv" ] && [ -n "$lv" ] && [ "$pv" -lt "$lv" ]
+    ps=$(grep -n 'hasPrefix $renamedVol .metadata.name' "$f" | cut -d: -f1)
+    ls=$(grep -n 'hasPrefix "seaweedfs-volume" .metadata.name' "$f" | cut -d: -f1)
+    [ -n "$ps" ] && [ -n "$ls" ] && [ "$ps" -lt "$ls" ]
+  done
+}
+
+@test "both charts derive the generation flags from PVC and StatefulSet evidence" {
+  # The OR is load-bearing: a tenant whose PVCs are not provisioned yet is only
+  # visible through its label-matched StatefulSet.
+  for f in "$SYS" "$EXTRA"; do
+    grep -qF -- '$legacyGen := or $legacyPVC $legacySTS' "$f"
+    grep -qF -- '$systemGen := or $systemPVC $systemSTS' "$f"
+  done
+}
+
+@test "both charts refuse when both generations are present" {
+  for f in "$SYS" "$EXTRA"; do
+    grep -qF -- 'if and $legacyGen $systemGen' "$f"
+    grep -qF -- 'has BOTH naming generations present' "$f"
+  done
+}
+
+@test "both charts refuse a release-named-only tenant (class S)" {
+  for f in "$SYS" "$EXTRA"; do
+    grep -qF -- 'else if $systemGen' "$f"
+    grep -qF -- 'keeps its data on volumes named after the Helm release' "$f"
+  done
+}
+
+@test "neither chart classifies on mutable claim timestamps or liveness" {
+  # The premise "PVCs are never recreated in place" is false: the runbook's own
+  # Step 2 re-bind deletes and recreates each claim, so a tenant interrupted
+  # part-way through reads as the exact inverse of the truth — and the step the
+  # old classification pointed at deletes the claim Step 2 just re-bound.
+  # readyReplicas is likewise only a snapshot, not proof a duplicate never
+  # served. Neither may come back as a discriminator.
+  for f in "$SYS" "$EXTRA"; do
+    # Whether the strip finished is the precondition for reading what it
+    # returned. A lone `{{/*` -- one inside a quoted string, and these charts
+    # carry long `fail (printf ...)` messages -- swallows the rest of the file,
+    # and the checks below would then find nothing and report a clean chart.
+    # It has to be asked here rather than covered by a canary token: a token
+    # only proves that whatever precedes IT survived, and the block most likely
+    # to do the swallowing is the last one in the file.
+    code=$(template_code "$f")
+    if printf '%s\n' "$code" | grep -qF -- '__TEMPLATE_COMMENT_LEFT_OPEN__'; then
+      echo "FAIL: $f ends inside a template comment, so the strip cannot be trusted"
+      false
+    fi
+    printf '%s\n' "$code" | grep -qF -- '$renamedVol'
+    for signal in 'creationTimestamp' 'readyReplicas' '$systemOldest' '$legacyOldest'; do
+      if printf '%s\n' "$code" | grep -qF -- "$signal"; then
+        echo "FAIL: $f classifies on $signal, which cannot establish which generation holds the data"
+        false
+      fi
+    done
+  done
+}
+
+@test "both charts gate the guard behind the same cluster-view canary" {
+  for f in "$SYS" "$EXTRA"; do
+    grep -qF -- '$canary := lookup "v1" "Namespace" "" .Release.Namespace' "$f"
+    grep -qF -- 'refusing to upgrade blind' "$f"
+  done
+}
diff --git a/hack/seaweedfs-naming-audit.bats b/hack/seaweedfs-naming-audit.bats
new file mode 100644
index 0000000000..0efef73349
--- /dev/null
+++ b/hack/seaweedfs-naming-audit.bats
@@ -0,0 +1,764 @@
+#!/usr/bin/env bats
+# -----------------------------------------------------------------------------
+# Unit tests for hack/seaweedfs-naming-audit.sh.
+#
+# The chart's naming guard refuses whenever both naming generations exist, so the
+# audit IS the classifier — it is what an operator acts on, and acting on it
+# deletes PVCs. Two earlier revisions of this classification shipped as an
+# untested shell snippet inside the runbook, and both were wrong in ways that
+# routed a live tenant into the step that strands its data:
+#
+#   - a selector `^data1-(.*seaweedfs.*)-volume` also matched the CHART-named
+#     claims, so the release-named age range spanned both generations, every
+#     tenant read as "ranges overlap / mid-rebind", and a genuine S-damaged tenant
+#     was routed AWAY from Step 2a (which would have been correct) into Step 2,
+#     which deletes its data claim;
+#   - matching claims by name with `grep seaweedfs` cannot see a long instance
+#     name, whose claims the chart truncates past `seaweedfs`, so such a tenant
+#     read as "L — nothing to do" while the chart refused it.
+#
+# Moving the classifier into a file with tests is the point. These drive it
+# against a fake kubectl, mocking only the cluster boundary.
+#
+# CI runs this file under Bats through `make bats-unit-tests`. It also remains
+# compatible with the legacy `hack/cozytest.sh` translator, whose awk parser
+# recognizes only @test blocks and a bare `}` on its own line. The tests avoid
+# `run`, `$status`, and setup() for that compatibility path.
+#
+# Run with: bats hack/seaweedfs-naming-audit.bats
+# -----------------------------------------------------------------------------
+
+load test_helper
+
+SEAWEEDFS_AUDIT_LIB=1
+export SEAWEEDFS_AUDIT_LIB
+# shellcheck source=seaweedfs-naming-audit.sh
+. "$PWD/hack/seaweedfs-naming-audit.sh"
+
+@test "reconstructs the renamed volume prefix for a default instance" {
+  [ "$(renamed_volume_prefix seaweedfs-system)" = "seaweedfs-system-volume" ]
+}
+
+@test "reconstructs the renamed volume prefix for a non-default instance" {
+  # The release name does not contain the chart name, so 4.31 appends it.
+  [ "$(renamed_volume_prefix foo-system)" = "foo-system-seaweedfs-volume" ]
+}
+
+@test "reconstructs the truncated prefix for a long instance name" {
+  # componentName cuts the fullname to 62-len("volume")=56 before appending, so
+  # `seaweedfs` falls off the tail — the case a `grep seaweedfs` name match cannot
+  # see, and the reason this is reconstructed rather than pattern-matched.
+  got=$(renamed_volume_prefix archive-of-quarterly-financial-statements-x1-system)
+  [ "$got" = "archive-of-quarterly-financial-statements-x1-system-seaw-volume" ]
+  # 56 chars of fullname + "-volume"
+  [ "${#got}" -eq 63 ]
+}
+
+@test "reconstructs a distinct prefix for an instance named seaweedfs-volume" {
+  # The pathological case: this instance's RELEASE-named objects
+  # (seaweedfs-volume-system-volume, data1-seaweedfs-volume-system-volume-0) also
+  # satisfy the CHART-named prefixes. The reconstruction must return the
+  # release-named prefix so the release-named branch can be tested first.
+  got=$(renamed_volume_prefix seaweedfs-volume-system)
+  [ "$got" = "seaweedfs-volume-system-volume" ]
+  # It must NOT collide with the chart-named prefix.
+  [ "$got" != "seaweedfs-volume" ]
+}
+
+@test "the reconstructed prefix never equals the chart-named prefix" {
+  # If it did, both generations would match one branch and the guard/audit could
+  # not separate them at all.
+  for r in seaweedfs-system foo-system seaweedfs-volume-system a-system; do
+    [ "$(renamed_volume_prefix "$r")" != "seaweedfs-volume" ]
+  done
+}
+
+@test "clean duplicate: release-named PVs all strictly newer => legacy is original" {
+  # A tenant that passed through the 4.31 rename: legacy PVs at install time,
+  # duplicate PVs provisioned by the bad upgrade much later.
+  [ "$(classify_mixed_direction 1000 1010 5000 5020)" = "legacy-original" ]
+}
+
+@test "S-damaged: chart-named PVs all strictly newer => release-named is original" {
+  # Installed fresh on 1.5.x (release-named PVs first); an unguarded 1.6 upgrade
+  # then created empty chart-named claims beside them.
+  [ "$(classify_mixed_direction 5000 5020 1000 1010)" = "renamed-original" ]
+}
+
+@test "interrupted Step 2 re-bind: overlapping vintages => no candidate" {
+  # Step 2 re-binds release-named claims onto their ORIGINAL PVs under chart
+  # names, one claim at a time. Interrupted part-way, BOTH generations sit on
+  # original-vintage PVs, so the ranges interleave. The old absolute-window
+  # classifier fell through to a coin flip here and its advice deleted the
+  # un-re-bound claims; the relative rule must refuse instead.
+  [ "$(classify_mixed_direction 1000 1010 1005 1015)" = "overlap" ]
+}
+
+@test "a tie is overlap, not a candidate" {
+  # Second-resolution timestamps: a duplicate provisioned within the same second
+  # as the newest original PV is not STRICTLY newer. Refusing is recoverable;
+  # naming the wrong candidate is not.
+  [ "$(classify_mixed_direction 1000 1010 1010 1020)" = "overlap" ]
+}
+
+@test "direction needs no clock: vintages far from any anchor still classify" {
+  # The shipped StorageClasses are WaitForFirstConsumer, so PVs appear at
+  # pod-SCHEDULE time — on a cold cluster minutes after first_deployed. The rule
+  # must not care: only the two generations' ranges relative to EACH OTHER count.
+  # (The previous classifier anchored a 120s window on first_deployed and
+  # misclassified exactly this case.)
+  [ "$(classify_mixed_direction 100000 100600 200000 200600)" = "legacy-original" ]
+}
+
+@test "the audit's reconstruction agrees with the chart helper it mirrors" {
+  # hack/seaweedfs-naming-audit.sh and
+  # packages/system/seaweedfs/templates/_naming.tpl reimplement the same two
+  # upstream helpers in two languages. If they drift, the audit classifies a
+  # tenant differently from the render that refuses it, and the operator is
+  # working from a different picture than the chart. Render the chart helper
+  # through helm and compare it to this script's output, release by release.
+  chart=$(mktemp -d)
+  printf 'apiVersion: v2\nname: probe\nversion: 0.0.0\n' > "$chart/Chart.yaml"
+  mkdir -p "$chart/templates"
+  cp packages/system/seaweedfs/templates/_naming.tpl "$chart/templates/"
+  cat > "$chart/templates/out.yaml" <<'EOF'
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: probe
+data:
+{{- range $r := list "seaweedfs-system" "foo-system" "seaweedfs-volume-system" "archive-of-quarterly-financial-statements-x1-system" "a-system" }}
+  {{ $r }}: {{ include "seaweedfs.renamedVolumePrefix" $r }}
+{{- end }}
+EOF
+  helm template probe "$chart" 2>/dev/null | sed -n 's/^  \([a-z0-9-]*-system\): \(.*\)$/\1=\2/p' > "$chart/rendered"
+  [ -s "$chart/rendered" ]
+  [ "$(wc -l < "$chart/rendered")" -eq 5 ]
+  while IFS='=' read -r rel expected; do
+    [ -n "$rel" ] || continue
+    got=$(renamed_volume_prefix "$rel")
+    echo "chart: $rel -> $expected ; audit: $got"
+    [ "$got" = "$expected" ]
+  done < "$chart/rendered"
+  rm -rf "$chart"
+}
+
+# -----------------------------------------------------------------------------
+# Fail-closed tests (issue #3431).
+#
+# The classification tests above mock nothing below the classifier. These drive
+# the KUBECTL layer, where the fail-open bug lived: a kubectl call that failed
+# used to return empty stdout, byte-identical to a genuinely clean fleet, so the
+# audit printed an empty table and exited 0 -- the exact false "nothing to do" the
+# operator is told to trust before deleting PVCs. They shim `kubectl` on PATH with
+# a fake and assert the audit fails LOUDLY (non-zero exit + a FATAL naming the
+# query) on any real error, while still treating a genuinely-absent object as
+# clean. Two families:
+#
+#   * enumerating LISTs (get ns / secret / pvc / sts) -- a failure is always fatal;
+#   * by-NAME GETs (a release secret in system_releases, a PVC/PV in pv_epoch) --
+#     `--ignore-not-found` splits a real error (fatal) from a legitimate absence:
+#     an absent release revision is a clean skip; an absent PV degrades to the
+#     safe "cannot establish direction" note and must NOT become a deletion
+#     candidate (the range-narrowing flip Codex reproduced).
+#
+# The two golden tests guard the reverse: on a healthy cluster the output stays
+# byte-for-byte what it was on origin/main, including the MIXED path that exercises
+# every pv_epoch GET.
+#
+# The fake is a real executable on PATH, so it exercises the actual exit-status
+# handling in run_kubectl and the propagation up through every caller -- a for
+# loop over `$(...)` swallows the status, so this is where a regression would hide.
+
+# _release_blob [chart-name] -- the value kubectl returns for a Helm release
+# secret's `.data.release`: base64(base64(gzip(json))). release_json base64-decodes
+# twice and gunzips it, and system_releases reads the chart name from
+# chart.metadata.name (as real Helm payloads carry it). Defaults to a cozy-seaweedfs
+# release so the audit confirms the tenant; pass another chart name for a non-
+# SeaweedFS release, or the literal EMPTY for a chartless {} payload.
+#
+# Three payload SHAPES beyond the default compact one, because the chart-name
+# extraction is now fatal on a miss and every shape below is something a
+# re-serializer or a user's values could produce:
+#   SPACED  whitespace around the JSON punctuation (json.dumps' default)
+#   PRETTY  indented and MULTI-LINE (jq . / yq -o=json), which a line-based
+#           matcher cannot read at all unless newlines are folded first
+#   DECOY   a real cozy-seaweedfs chart PLUS a values subtree that spells
+#           chart.metadata.name with a different value. Helm marshals "config"
+#           (the values) AFTER "chart", so a last-match extraction returns the
+#           decoy and silently declares the tenant non-SeaweedFS.
+#   FIRSTDEP a payload that carries info.first_deployed, so the first_deployed
+#           date call site (the other one #4273 names) is actually exercised --
+#           the default blob omits the field, so first_deployed returns early
+#           without ever touching date.
+_release_blob() {
+  _rb_name=${1:-cozy-seaweedfs}
+  case "$_rb_name" in
+    EMPTY)  _rb_json='{}' ;;
+    SPACED) _rb_json='{"name": "seaweedfs-system", "chart": {"metadata": {"name": "cozy-seaweedfs", "version": "1.0.0"}}}' ;;
+    PRETTY) _rb_json='{
+  "name": "seaweedfs-system",
+  "chart": {
+    "metadata": {
+      "name": "cozy-seaweedfs",
+      "version": "1.0.0"
+    }
+  }
+}' ;;
+    DECOY)  _rb_json='{"name":"seaweedfs-system","chart":{"metadata":{"name":"cozy-seaweedfs"}},"config":{"chart":{"metadata":{"name":"decoy-not-seaweedfs"}}}}' ;;
+    FIRSTDEP) _rb_json='{"name":"seaweedfs-system","info":{"first_deployed":"2019-01-01T00:00:00Z"},"chart":{"metadata":{"name":"cozy-seaweedfs"}}}' ;;
+    *)      _rb_json='{"name":"seaweedfs-system","chart":{"metadata":{"name":"'"$_rb_name"'"}}}' ;;
+  esac
+  printf '%s' "$_rb_json" | gzip | base64 | base64 | tr -d '\n'
+}
+
+# _write_fake_kubectl <dir> <fail> <absent-pv> <blob> <pvcs> -- drop a fake kubectl
+# into <dir>.
+#   <fail>       one of ns | secretlist | secretget | secretget_absent |
+#                secret_missing_field | secret_bad_payload | pvclist | pvcget |
+#                sts | pvget | "" -- the single call to make behave badly. Real-
+#                error targets exit non-zero with a stderr message; secretget_absent
+#                mirrors an absent Secret (--ignore-not-found: exit 0, empty -o
+#                name); secret_missing_field / secret_bad_payload keep the Secret
+#                present but return an empty / undecodable .data.release payload.
+#   <absent-pv>  a PV name (pv-legacy|pv-legacy2|pv-renamed) to report as absent
+#                (exit 0, empty), exercising the "bound claim, PV gone" path.
+#   <pvcs>       newline-separated `get pvc -o name` LIST output.
+#   <bad-ts-pv>  optional PV name whose creationTimestamp GET returns a present
+#                but UNPARSEABLE value (exit 0, garbage), exercising the parse-
+#                failure path #4273 splits from absent evidence.
+# It otherwise walks one confirmed seaweedfs-system tenant. The by-name PVC->PV and
+# PV->timestamp maps are fixed here; timestamps are chosen so the two legacy PVs
+# straddle the single renamed PV (true answer OVERLAP), which is what makes the
+# range-narrowing flip observable. Kept POSIX and free of a column-0 `}` so
+# cozytest.sh's awk converter passes the heredoc through untouched.
+_write_fake_kubectl() {
+  # Grouped redirect (one open of the file). The closing brace is indented, so
+  # cozytest.sh's awk -- which only rewrites a `}` in column 0 -- leaves it and the
+  # heredoc alone.
+  {
+    printf '#!/bin/sh\n'
+    printf "FAIL='%s'\n" "$2"
+    printf "ABSENT_PV='%s'\n" "$3"
+    printf "BLOB='%s'\n" "$4"
+    printf "PVCS='%s'\n" "$5"
+    printf "BAD_TS_PV='%s'\n" "${6:-}"
+    cat <<'FAKE'
+verb=${1:-}; res=${2:-}; args="$*"
+fail() { echo "fake kubectl: $1 (real error)" >&2; exit 1; }
+# Anything this fake does not model must NOT look like a successful empty
+# answer: that is the fail-open shape the audited script exists to reject, and
+# it would let a new query added to the script pass these goldens unnoticed.
+unmodelled() { echo "fake kubectl: unmodelled invocation: $args" >&2; exit 97; }
+if [ "$verb $res" = "get ns" ]; then
+  [ "$FAIL" = ns ] && fail "get ns"
+  printf 'namespace/tenant-test\n'; exit 0
+fi
+if [ "$verb $res" = "get secret" ]; then
+  case "$args" in
+    *sh.helm.release.v1*)
+      # release_json now asks two questions: existence (-o name) then payload
+      # (jsonpath .data.release). Mirror that split so absence, real error, and
+      # corrupt-payload are all reachable independently.
+      case "$args" in
+        *"-o name"*)
+          [ "$FAIL" = secretget ] && fail "release secret existence GET"
+          [ "$FAIL" = secretget_absent ] && exit 0
+          printf 'secret/sh.helm.release.v1.seaweedfs-system.v1\n'; exit 0 ;;
+        *)
+          [ "$FAIL" = secret_missing_field ] && exit 0
+          if [ "$FAIL" = secret_bad_payload ]; then printf '@@@not-base64@@@\n'; exit 0; fi
+          printf '%s\n' "$BLOB"; exit 0 ;;
+      esac ;;
+    *owner=helm*) printf '1\n'; exit 0 ;;
+    *) [ "$FAIL" = secretlist ] && fail "namespace secret LIST"
+       printf 'seaweedfs-system\n'; exit 0 ;;
+  esac
+fi
+if [ "$verb $res" = "get pvc" ]; then
+  case "$args" in
+    *"-o name"*)
+      [ "$FAIL" = pvclist ] && fail "pvc LIST"
+      [ -n "$PVCS" ] && printf '%s\n' "$PVCS"
+      exit 0 ;;
+    *data1-seaweedfs-system-volume-0*) [ "$FAIL" = pvcget ] && fail "pvc GET"; printf 'pv-renamed\n'; exit 0 ;;
+    *data1-seaweedfs-volume-1*)        [ "$FAIL" = pvcget ] && fail "pvc GET"; printf 'pv-legacy2\n'; exit 0 ;;
+    *data1-seaweedfs-volume-0*)        [ "$FAIL" = pvcget ] && fail "pvc GET"; printf 'pv-legacy\n'; exit 0 ;;
+  esac
+  unmodelled
+fi
+if [ "$verb $res" = "get sts" ]; then
+  [ "$FAIL" = sts ] && fail "sts LIST"
+  exit 0
+fi
+if [ "$verb $res" = "get pv" ]; then
+  [ "$FAIL" = pvget ] && fail "get pv"
+  if [ -n "$BAD_TS_PV" ]; then
+    case "$args" in *"$BAD_TS_PV"*) printf 'not-a-timestamp\n'; exit 0 ;; esac
+  fi
+  case "$args" in
+    *pv-legacy2*) [ "$ABSENT_PV" = pv-legacy2 ] && exit 0; printf '2099-01-01T00:00:00Z\n'; exit 0 ;;
+    *pv-legacy*)  [ "$ABSENT_PV" = pv-legacy ]  && exit 0; printf '2020-01-01T00:00:00Z\n'; exit 0 ;;
+    *pv-renamed*) [ "$ABSENT_PV" = pv-renamed ] && exit 0; printf '2020-06-01T00:00:00Z\n'; exit 0 ;;
+  esac
+  unmodelled
+fi
+unmodelled
+FAKE
+  } > "$1/kubectl"
+  chmod +x "$1/kubectl"
+}
+
+# _write_fake_date <dir> -- drop a BSD-flavoured `date` shim into <dir>. It rejects
+# the GNU `-d` spelling exactly as macOS/BSD date does, forcing the audited script
+# down its portable BSD branch, and services that branch with whatever real date
+# lives beneath us (GNU on a CI runner, BSD on a developer's mac). That is what
+# reproduces issue #4273 on EITHER kind of host: without the shim a GNU runner
+# never hits the failing spelling and the bug is invisible in CI. Same heredoc
+# discipline as _write_fake_kubectl -- indented grouped-redirect brace, no
+# column-0 `}` inside, so cozytest.sh's awk converter leaves it untouched.
+_write_fake_date() {
+  {
+    cat <<'FAKEDATE'
+#!/bin/sh
+for _a in "$@"; do
+  case "$_a" in
+    -d) echo "date: illegal option -- d" >&2; exit 1 ;;
+  esac
+done
+# The audit's only other date form: -u -j -f FMT VALUE +%s. Capture BOTH the
+# format and the value the audit actually passed, so this shim exercises the
+# script's real BSD spelling instead of substituting its own. If it dropped the
+# format, a regression in that exact string would ship green -- and the BSD path
+# is the whole of issue #4273, so an inert guard here would defeat the test.
+_fmt=""; _val=""
+while [ "$#" -gt 0 ]; do
+  if [ "$1" = -f ]; then _fmt=${2:-}; _val=${3:-}; break; fi
+  shift
+done
+if [ -n "$_val" ]; then
+  # A real BSD host has `-j -f`, so honor the format the audit passed: a wrong
+  # format fails here exactly as production would.
+  /bin/date -u -j -f "$_fmt" "$_val" +%s 2>/dev/null && exit 0
+  /usr/bin/date -u -j -f "$_fmt" "$_val" +%s 2>/dev/null && exit 0
+  # A GNU-only runner (the CI gate) has no `-j` to enforce the format, so
+  # recompute via `-d` -- but ONLY for the exact format the audit is supposed to
+  # pass. A regressed format must NOT be rescued by GNU here, or these BSD tests
+  # would go green on a broken spelling on the very runner they are meant to guard.
+  if [ "$_fmt" = '%Y-%m-%dT%H:%M:%S' ]; then
+    /usr/bin/date -u -d "$_val" +%s 2>/dev/null && exit 0
+    /bin/date -u -d "$_val" +%s 2>/dev/null && exit 0
+  fi
+fi
+echo "fake date: unsupported invocation: $*" >&2
+exit 1
+FAKEDATE
+  } > "$1/date"
+  chmod +x "$1/date"
+}
+
+# _pvcs_mixed -- the `get pvc -o name` LIST for a MIXED tenant: two legacy claims
+# and one release-named claim, whose PV vintages truly overlap.
+_pvcs_mixed() {
+  printf '%s\n' \
+    persistentvolumeclaim/data1-seaweedfs-volume-0 \
+    persistentvolumeclaim/data1-seaweedfs-volume-1 \
+    persistentvolumeclaim/data1-seaweedfs-system-volume-0
+}
+
+# _expected_L / _expected_mixed_overlap -- golden output built with the SAME printf
+# contract the script uses, so a drift in row count, text, or padding fails the diff.
+_expected_L() {
+  printf '%-24s %-14s %-8s %s\n' NAMESPACE RELEASE CLASS NOTE
+  printf '%-24s %-14s %-8s %s\n' --------- ------- ----- ----
+  printf '%-24s %-14s %-8s %s\n' tenant-test seaweedfs-system L 'chart-named only; the upgrade adopts it, nothing to do'
+}
+_expected_mixed_overlap() {
+  printf '%-24s %-14s %-8s %s\n' NAMESPACE RELEASE CLASS NOTE
+  printf '%-24s %-14s %-8s %s\n' --------- ------- ----- ----
+  printf '%-24s %-14s %-8s %s\n' tenant-test seaweedfs-system MIXED 'both generations; the chart REFUSES until one is removed'
+  printf '%-24s %-14s %-8s   %s\n' '' '' '' 'PV vintages OVERLAP => no candidate. An interrupted Step 2 re-bind looks exactly like this (both generations on original PVs). Finish Step 2 if one is in progress; otherwise escalate. Do NOT run Step 2a.'
+  printf '%-24s %-14s %-8s   %s\n' '' '' '' 'CANDIDATE ONLY: "original" does not mean the other set is EMPTY. A duplicate that'
+  printf '%-24s %-14s %-8s   %s\n' '' '' '' 'served writes and later crashed looks identical here. Verify emptiness before deleting.'
+}
+
+@test "fails closed when 'kubectl get ns' fails (whole-cluster mode)" {
+  # No namespace args -> main enumerates namespaces itself. If that LIST fails,
+  # the OLD code audited zero namespaces and still printed an empty clean table.
+  d=$(mktemp -d)
+  _write_fake_kubectl "$d" ns "" "$(_release_blob)" ""
+  rc=0
+  out=$(PATH="$d:$PATH" SEAWEEDFS_AUDIT_LIB=0 sh "$PWD/hack/seaweedfs-naming-audit.sh" 2>&1) || rc=$?
+  rm -rf "$d"
+  echo "rc=$rc"; echo "$out"
+  [ "$rc" -ne 0 ]
+  printf '%s\n' "$out" | grep -q 'FATAL'
+  printf '%s\n' "$out" | grep -q 'list namespaces'
+}
+
+@test "fails closed when the namespace-wide secret LIST fails" {
+  # system_releases enumerates Helm releases with a namespace-wide secret LIST --
+  # the exact call that timed out in the field and reported a false clean.
+  d=$(mktemp -d)
+  _write_fake_kubectl "$d" secretlist "" "$(_release_blob)" ""
+  rc=0
+  out=$(PATH="$d:$PATH" SEAWEEDFS_AUDIT_LIB=0 sh "$PWD/hack/seaweedfs-naming-audit.sh" tenant-test 2>&1) || rc=$?
+  rm -rf "$d"
+  echo "rc=$rc"; echo "$out"
+  [ "$rc" -ne 0 ]
+  printf '%s\n' "$out" | grep -q 'FATAL'
+  printf '%s\n' "$out" | grep -q 'list Helm release secrets'
+}
+
+@test "fails closed when the by-name release-secret existence GET hits a real error" {
+  # Codex Finding 1: system_releases uses release_json to decide whether a release
+  # IS SeaweedFS. Both LISTs succeed, then a transient/forbidden by-name Secret GET
+  # used to leave `chart` empty -> the tenant was silently skipped -> exit 0, empty
+  # table. A real error here must now be fatal, not a false clean.
+  d=$(mktemp -d)
+  _write_fake_kubectl "$d" secretget "" "$(_release_blob)" ""
+  rc=0
+  out=$(PATH="$d:$PATH" SEAWEEDFS_AUDIT_LIB=0 sh "$PWD/hack/seaweedfs-naming-audit.sh" tenant-test 2>&1) || rc=$?
+  rm -rf "$d"
+  echo "rc=$rc"; echo "$out"
+  [ "$rc" -ne 0 ]
+  printf '%s\n' "$out" | grep -q 'FATAL'
+  printf '%s\n' "$out" | grep -q 'Helm release secret'
+}
+
+@test "an absent release-secret revision is a clean skip, not a failure" {
+  # The one legitimately-empty case for release_json: the revision secret does not
+  # exist (pruned by Helm history limit). The existence check (--ignore-not-found -o
+  # name) returns empty + exit 0, so the release is simply not confirmed as
+  # SeaweedFS. No error, no crash -- the audit completes and reports nothing here.
+  d=$(mktemp -d)
+  _write_fake_kubectl "$d" secretget_absent "" "$(_release_blob)" ""
+  rc=0
+  out=$(PATH="$d:$PATH" SEAWEEDFS_AUDIT_LIB=0 sh "$PWD/hack/seaweedfs-naming-audit.sh" tenant-test 2>&1) || rc=$?
+  rm -rf "$d"
+  echo "rc=$rc"; echo "$out"
+  [ "$rc" -eq 0 ]
+  [ "$(printf '%s\n' "$out" | grep -c 'FATAL')" -eq 0 ]
+}
+
+@test "fails closed when a present release secret has no .data.release payload" {
+  # Codex re-review round 2: the existence check passes (Secret EXISTS), but its
+  # .data.release field is empty/missing. That is CORRUPT state, not an absence --
+  # and because the earlier fix used --ignore-not-found -o jsonpath, which returns
+  # empty+0 for BOTH, it used to read as a clean skip. It must be a loud stop.
+  d=$(mktemp -d)
+  _write_fake_kubectl "$d" secret_missing_field "" "$(_release_blob)" ""
+  rc=0
+  out=$(PATH="$d:$PATH" SEAWEEDFS_AUDIT_LIB=0 sh "$PWD/hack/seaweedfs-naming-audit.sh" tenant-test 2>&1) || rc=$?
+  rm -rf "$d"
+  echo "rc=$rc"; echo "$out"
+  [ "$rc" -ne 0 ]
+  printf '%s\n' "$out" | grep -q 'FATAL'
+  printf '%s\n' "$out" | grep -q 'no .data.release payload'
+}
+
+@test "fails closed when a present release secret has an undecodable payload" {
+  # Existence passes, .data.release is non-empty but is not base64(base64(gzip(...))),
+  # so every decode fails. The old `|| return 0` converted that decode failure into
+  # a clean 0 return -> silent skip. A corrupt payload must be fatal.
+  d=$(mktemp -d)
+  _write_fake_kubectl "$d" secret_bad_payload "" "$(_release_blob)" ""
+  rc=0
+  out=$(PATH="$d:$PATH" SEAWEEDFS_AUDIT_LIB=0 sh "$PWD/hack/seaweedfs-naming-audit.sh" tenant-test 2>&1) || rc=$?
+  rm -rf "$d"
+  echo "rc=$rc"; echo "$out"
+  [ "$rc" -ne 0 ]
+  printf '%s\n' "$out" | grep -q 'FATAL'
+  printf '%s\n' "$out" | grep -q 'not decodable'
+}
+
+@test "fails closed when a present release secret decodes to a chartless payload" {
+  # Codex round 3: the payload fetches and DECODES cleanly (valid JSON {}), so the
+  # decode guards all pass -- but it carries no chart name. system_releases then
+  # extracted chart='' and silently skipped the tenant -> exit 0, clean table. A
+  # decoded helm.sh/release.v1 release without a chart name is corrupt: fatal.
+  d=$(mktemp -d)
+  _write_fake_kubectl "$d" "" "" "$(_release_blob EMPTY)" ""
+  rc=0
+  out=$(PATH="$d:$PATH" SEAWEEDFS_AUDIT_LIB=0 sh "$PWD/hack/seaweedfs-naming-audit.sh" tenant-test 2>&1) || rc=$?
+  rm -rf "$d"
+  echo "rc=$rc"; echo "$out"
+  [ "$rc" -ne 0 ]
+  printf '%s\n' "$out" | grep -q 'FATAL'
+  printf '%s\n' "$out" | grep -q 'could not read the chart name'
+  # The diagnostic must name the path it looked at, so a future Helm payload
+  # format change is diagnosable as such instead of reading as real corruption.
+  printf '%s\n' "$out" | grep -q '\.chart\.metadata\.name'
+}
+
+@test "a present release secret for a non-SeaweedFS chart is a silent legitimate skip" {
+  # The counterpart the guard must NOT break: a real, well-formed release whose
+  # chart is simply not cozy-seaweedfs. It has a chart name (so it is not corrupt),
+  # but the wrong one, so it is filtered out exactly as before -- no row, no error.
+  d=$(mktemp -d)
+  _write_fake_kubectl "$d" "" "" "$(_release_blob cozy-postgres)" ""
+  rc=0
+  out=$(PATH="$d:$PATH" SEAWEEDFS_AUDIT_LIB=0 sh "$PWD/hack/seaweedfs-naming-audit.sh" tenant-test 2>&1) || rc=$?
+  rm -rf "$d"
+  echo "rc=$rc"; echo "$out"
+  [ "$rc" -eq 0 ]
+  [ "$(printf '%s\n' "$out" | grep -c 'FATAL')" -eq 0 ]
+  # Not confirmed as SeaweedFS -> no classification row for the release.
+  [ "$(printf '%s\n' "$out" | grep -c 'seaweedfs-system')" -eq 0 ]
+}
+
+@test "fails closed when 'kubectl get pvc' LIST fails" {
+  # The secret enumeration succeeds and confirms a seaweedfs-system tenant, so the
+  # audit reaches the per-namespace PVC LIST; a failure there must abort, not read
+  # as "this tenant has no claims".
+  d=$(mktemp -d)
+  _write_fake_kubectl "$d" pvclist "" "$(_release_blob)" ""
+  rc=0
+  out=$(PATH="$d:$PATH" SEAWEEDFS_AUDIT_LIB=0 sh "$PWD/hack/seaweedfs-naming-audit.sh" tenant-test 2>&1) || rc=$?
+  rm -rf "$d"
+  echo "rc=$rc"; echo "$out"
+  [ "$rc" -ne 0 ]
+  printf '%s\n' "$out" | grep -q 'FATAL'
+  printf '%s\n' "$out" | grep -q 'list PVCs'
+}
+
+@test "fails closed when 'kubectl get sts' LIST fails" {
+  # PVC LIST succeeds (empty), so the audit reaches the StatefulSet LIST; a
+  # failure there must abort rather than read as "no StatefulSets".
+  d=$(mktemp -d)
+  _write_fake_kubectl "$d" sts "" "$(_release_blob)" ""
+  rc=0
+  out=$(PATH="$d:$PATH" SEAWEEDFS_AUDIT_LIB=0 sh "$PWD/hack/seaweedfs-naming-audit.sh" tenant-test 2>&1) || rc=$?
+  rm -rf "$d"
+  echo "rc=$rc"; echo "$out"
+  [ "$rc" -ne 0 ]
+  printf '%s\n' "$out" | grep -q 'FATAL'
+  printf '%s\n' "$out" | grep -q 'StatefulSets'
+}
+
+@test "fails closed when the by-name PV GET hits a real error" {
+  # Codex Finding 2, error half: pv_epoch reads each bound PV's age by name. A real
+  # error (RBAC/timeout) must abort, not silently drop that PV from the range.
+  d=$(mktemp -d)
+  _write_fake_kubectl "$d" pvget "" "$(_release_blob)" "$(_pvcs_mixed)"
+  rc=0
+  out=$(PATH="$d:$PATH" SEAWEEDFS_AUDIT_LIB=0 sh "$PWD/hack/seaweedfs-naming-audit.sh" tenant-test 2>&1) || rc=$?
+  rm -rf "$d"
+  echo "rc=$rc"; echo "$out"
+  [ "$rc" -ne 0 ]
+  printf '%s\n' "$out" | grep -q 'FATAL'
+  printf '%s\n' "$out" | grep -q "get PV '"
+}
+
+@test "an absent PV degrades to the safe fallback, never a wrong candidate" {
+  # Codex Finding 2, absence half. True vintages: legacy PVs 2020 + 2099 straddle
+  # the single renamed PV 2020-06 => OVERLAP. Report the newest legacy PV (2099) as
+  # ABSENT: the observed legacy range collapses to {2020} and, unguarded, "every
+  # release-named PV is strictly newer" would fire -- naming the release-named set a
+  # deletion candidate on incomplete evidence. The generation must instead read as
+  # incomplete and fall to "cannot establish direction".
+  d=$(mktemp -d)
+  _write_fake_kubectl "$d" "" pv-legacy2 "$(_release_blob)" "$(_pvcs_mixed)"
+  rc=0
+  out=$(PATH="$d:$PATH" SEAWEEDFS_AUDIT_LIB=0 sh "$PWD/hack/seaweedfs-naming-audit.sh" tenant-test 2>&1) || rc=$?
+  rm -rf "$d"
+  echo "rc=$rc"; echo "$out"
+  [ "$rc" -eq 0 ]
+  [ "$(printf '%s\n' "$out" | grep -c 'FATAL')" -eq 0 ]
+  printf '%s\n' "$out" | grep -q 'direction cannot be established from PV ages'
+  # The whole point: incomplete evidence must NOT be reported as a deletion candidate.
+  [ "$(printf '%s\n' "$out" | grep -c 'candidate duplicate')" -eq 0 ]
+}
+
+@test "success path (L) is byte-identical to the expected fixture" {
+  # A single chart-named claim, no release-named one, no StatefulSets => L, adopt in
+  # place. Full-output compare, so an extra row / warning / duplicate line fails.
+  d=$(mktemp -d)
+  _write_fake_kubectl "$d" "" "" "$(_release_blob)" "persistentvolumeclaim/data1-seaweedfs-volume-0"
+  rc=0
+  out=$(PATH="$d:$PATH" SEAWEEDFS_AUDIT_LIB=0 sh "$PWD/hack/seaweedfs-naming-audit.sh" tenant-test 2>&1) || rc=$?
+  printf '%s\n' "$out" > "$d/got"
+  _expected_L > "$d/want"
+  echo "rc=$rc"; echo "--- got ---"; cat "$d/got"; echo "--- want ---"; cat "$d/want"
+  [ "$rc" -eq 0 ]
+  diff "$d/want" "$d/got"
+  rm -rf "$d"
+}
+
+@test "success path (MIXED/overlap) is byte-identical and exercises pv_epoch" {
+  # Both generations present with all PVs readable => the MIXED path runs every
+  # pv_epoch GET and lands on OVERLAP. Full-output compare against the golden.
+  d=$(mktemp -d)
+  _write_fake_kubectl "$d" "" "" "$(_release_blob)" "$(_pvcs_mixed)"
+  rc=0
+  out=$(PATH="$d:$PATH" SEAWEEDFS_AUDIT_LIB=0 sh "$PWD/hack/seaweedfs-naming-audit.sh" tenant-test 2>&1) || rc=$?
+  printf '%s\n' "$out" > "$d/got"
+  _expected_mixed_overlap > "$d/want"
+  echo "rc=$rc"; echo "--- got ---"; cat "$d/got"; echo "--- want ---"; cat "$d/want"
+  [ "$rc" -eq 0 ]
+  diff "$d/want" "$d/got"
+  rm -rf "$d"
+}
+
+@test "a whitespace-spaced Helm payload still classifies the tenant" {
+  # The chart-name read is FATAL on a miss, so any payload shape a re-serializer
+  # can produce must parse. Byte-compare against the same golden as the compact
+  # payload: the shape must make no difference to the report at all.
+  d=$(mktemp -d)
+  _write_fake_kubectl "$d" "" "" "$(_release_blob SPACED)" "persistentvolumeclaim/data1-seaweedfs-volume-0"
+  rc=0
+  out=$(PATH="$d:$PATH" SEAWEEDFS_AUDIT_LIB=0 sh "$PWD/hack/seaweedfs-naming-audit.sh" tenant-test 2>&1) || rc=$?
+  printf '%s\n' "$out" > "$d/got"
+  _expected_L > "$d/want"
+  echo "rc=$rc"; echo "--- got ---"; cat "$d/got"
+  [ "$rc" -eq 0 ]
+  diff "$d/want" "$d/got"
+  rm -rf "$d"
+}
+
+@test "a pretty-printed multi-line Helm payload still classifies the tenant" {
+  # Line-based sed/grep cannot see across newlines at all, so this shape is the
+  # one that fails hardest without the newline fold -- and jq/yq re-serialization
+  # is exactly how a payload would arrive indented.
+  d=$(mktemp -d)
+  _write_fake_kubectl "$d" "" "" "$(_release_blob PRETTY)" "persistentvolumeclaim/data1-seaweedfs-volume-0"
+  rc=0
+  out=$(PATH="$d:$PATH" SEAWEEDFS_AUDIT_LIB=0 sh "$PWD/hack/seaweedfs-naming-audit.sh" tenant-test 2>&1) || rc=$?
+  printf '%s\n' "$out" > "$d/got"
+  _expected_L > "$d/want"
+  echo "rc=$rc"; echo "--- got ---"; cat "$d/got"
+  [ "$rc" -eq 0 ]
+  diff "$d/want" "$d/got"
+  rm -rf "$d"
+}
+
+@test "a values subtree spelling chart.metadata.name cannot shadow the real chart" {
+  # Helm marshals "config" (the user's values) AFTER "chart", so a LAST-match
+  # extraction returns the decoy, the release reads as non-SeaweedFS, and the
+  # tenant vanishes from the report with exit 0 -- a false clean, the failure this
+  # whole script exists to prevent. First-match extraction is what stops it.
+  d=$(mktemp -d)
+  _write_fake_kubectl "$d" "" "" "$(_release_blob DECOY)" "persistentvolumeclaim/data1-seaweedfs-volume-0"
+  rc=0
+  out=$(PATH="$d:$PATH" SEAWEEDFS_AUDIT_LIB=0 sh "$PWD/hack/seaweedfs-naming-audit.sh" tenant-test 2>&1) || rc=$?
+  printf '%s\n' "$out" > "$d/got"
+  _expected_L > "$d/want"
+  echo "rc=$rc"; echo "--- got ---"; cat "$d/got"
+  [ "$rc" -eq 0 ]
+  # The decoy name must never reach the report.
+  [ "$(printf '%s\n' "$out" | grep -c 'decoy-not-seaweedfs')" -eq 0 ]
+  diff "$d/want" "$d/got"
+  rm -rf "$d"
+}
+
+@test "fails closed when the by-name PVC GET hits a real error" {
+  # pv_epoch resolves each claim's bound PV by name before reading the PV's age.
+  # A real error there (RBAC/timeout) must abort: silently dropping the claim
+  # shrinks the observed vintage range, which is what produces a wrong "candidate
+  # duplicate" verdict. The PV half of this pair was already covered; this is the
+  # PVC half, whose fake FAIL mode existed with no test behind it.
+  d=$(mktemp -d)
+  _write_fake_kubectl "$d" pvcget "" "$(_release_blob)" "$(_pvcs_mixed)"
+  rc=0
+  out=$(PATH="$d:$PATH" SEAWEEDFS_AUDIT_LIB=0 sh "$PWD/hack/seaweedfs-naming-audit.sh" tenant-test 2>&1) || rc=$?
+  rm -rf "$d"
+  echo "rc=$rc"; echo "$out"
+  [ "$rc" -ne 0 ]
+  printf '%s\n' "$out" | grep -q 'FATAL'
+  printf '%s\n' "$out" | grep -q "get PVC '"
+}
+
+# -----------------------------------------------------------------------------
+# Portable timestamp parsing (issue #4273).
+#
+# first_deployed and pv_epoch turn an RFC3339 timestamp into epoch seconds. The
+# call sites used `date -u -d`, which only GNU date accepts; on a host with BSD
+# date (macOS) the call failed, its stderr was swallowed, and `|| return 0`
+# converted that host-tool failure into the script's "no epoch" signal -- so every
+# tenant read as MIXED / "direction cannot be established". These drive both call
+# sites, the parse_epoch helper directly, and the split the fix introduces between
+# an ABSENT timestamp (benign, still silent) and a PRESENT-but-unreadable one
+# (fatal, loud). The BSD-date reproduction shims `date` on PATH so it is
+# deterministic on a GNU CI runner too, where the raw bug is otherwise invisible.
+
+@test "parse_epoch reads an RFC3339 timestamp on either GNU or BSD date" {
+  # The fix's core: whichever spelling the host's date speaks, the same epoch
+  # comes out. On a BSD host this exercises the branch #4273 was about; on a GNU
+  # runner the other. Either way the answer is the known epoch, Z-suffix and all.
+  #
+  # These are ABSOLUTE epochs and hold on any host timezone: both forms carry
+  # `-u`, which forces the zoneless string (the fix strips the Z at 19 chars) to
+  # be parsed as UTC on GNU and BSD alike -- not just formatted as UTC. So a
+  # non-UTC TZ shifts neither value, which is also why the audit's clock-free
+  # relative comparison is timezone-immune. Run under a deliberately non-UTC TZ
+  # so this stays a regression guard on that `-u`: drop it and the values move.
+  [ "$(TZ='XXX5'; export TZ; parse_epoch 2026-09-15T11:00:00Z)" = 1789470000 ]
+  [ "$(TZ='XXX5'; export TZ; parse_epoch 2020-01-01T00:00:00Z)" = 1577836800 ]
+}
+
+@test "parse_epoch fails loudly on a value neither date form can read" {
+  # A present-but-unreadable timestamp is NOT the absent-evidence case: it is a
+  # clock the host could not read. It must be fatal and name the value, never
+  # folded into the silent "no epoch" path (#4273). audit_fatal writes to stderr.
+  rc=0
+  out=$(parse_epoch 'not-a-timestamp' 2>&1) || rc=$?
+  echo "rc=$rc out=$out"
+  [ "$rc" -ne 0 ]
+  # Nothing on stdout: a caller capturing the epoch gets empty, not garbage.
+  [ -z "$(parse_epoch 'not-a-timestamp' 2>/dev/null)" ]
+  printf '%s\n' "$out" | grep -q 'FATAL'
+  printf '%s\n' "$out" | grep -q 'not-a-timestamp'
+}
+
+@test "MIXED classifies under a BSD-only date, not 'direction cannot be established'" {
+  # #4273 reproduced end-to-end at the pv_epoch call site. With a date that has no
+  # GNU -d, the OLD code swallowed every parse, marked both generations INCOMPLETE,
+  # and reported "direction cannot be established" for a tenant whose PV ages ARE
+  # readable. The portable parse must classify the SAME fixtures as OVERLAP,
+  # byte-identical to the golden the GNU path produces.
+  d=$(mktemp -d)
+  _write_fake_kubectl "$d" "" "" "$(_release_blob)" "$(_pvcs_mixed)"
+  _write_fake_date "$d"
+  rc=0
+  out=$(PATH="$d:$PATH" SEAWEEDFS_AUDIT_LIB=0 sh "$PWD/hack/seaweedfs-naming-audit.sh" tenant-test 2>&1) || rc=$?
+  printf '%s\n' "$out" > "$d/got"
+  _expected_mixed_overlap > "$d/want"
+  echo "rc=$rc"; echo "--- got ---"; cat "$d/got"; echo "--- want ---"; cat "$d/want"
+  [ "$rc" -eq 0 ]
+  [ "$(printf '%s\n' "$out" | grep -c 'direction cannot be established')" -eq 0 ]
+  diff "$d/want" "$d/got"
+  rm -rf "$d"
+}
+
+@test "first_deployed parses under a BSD-only date (the second call site)" {
+  # #4273 names BOTH date call sites. With a payload that carries first_deployed
+  # and a BSD-only date, the OLD line returned non-zero and aborted the whole
+  # audit before the MIXED report; the portable parse reads it, so the
+  # 'oldest PV vs first_deployed' context line appears and the audit completes.
+  d=$(mktemp -d)
+  _write_fake_kubectl "$d" "" "" "$(_release_blob FIRSTDEP)" "$(_pvcs_mixed)"
+  _write_fake_date "$d"
+  rc=0
+  out=$(PATH="$d:$PATH" SEAWEEDFS_AUDIT_LIB=0 sh "$PWD/hack/seaweedfs-naming-audit.sh" tenant-test 2>&1) || rc=$?
+  echo "rc=$rc"; echo "$out"
+  [ "$rc" -eq 0 ]
+  printf '%s\n' "$out" | grep -q 'oldest PV vs first_deployed'
+}
+
+@test "an unparseable PV timestamp is fatal, not absent evidence" {
+  # The distinction #4273 asks for, at the pv_epoch site: a PV whose
+  # creationTimestamp is PRESENT but unreadable must abort loudly, NOT degrade to
+  # the absent-evidence 'direction cannot be established' branch that a Pending
+  # claim legitimately takes. The fake returns garbage for one bound PV; real
+  # host date is used, so this fails on GNU and BSD alike.
+  d=$(mktemp -d)
+  _write_fake_kubectl "$d" "" "" "$(_release_blob)" "$(_pvcs_mixed)" pv-renamed
+  rc=0
+  out=$(PATH="$d:$PATH" SEAWEEDFS_AUDIT_LIB=0 sh "$PWD/hack/seaweedfs-naming-audit.sh" tenant-test 2>&1) || rc=$?
+  rm -rf "$d"
+  echo "rc=$rc"; echo "$out"
+  [ "$rc" -ne 0 ]
+  printf '%s\n' "$out" | grep -q 'FATAL'
+  printf '%s\n' "$out" | grep -q 'not-a-timestamp'
+  [ "$(printf '%s\n' "$out" | grep -c 'direction cannot be established')" -eq 0 ]
+}
diff --git a/hack/seaweedfs-naming-audit.sh b/hack/seaweedfs-naming-audit.sh
new file mode 100755
index 0000000000..702c0864c9
--- /dev/null
+++ b/hack/seaweedfs-naming-audit.sh
@@ -0,0 +1,446 @@
+#!/bin/sh
+# SeaweedFS 4.31 rename — fleet audit (READ-ONLY).
+#
+# Classifies every SeaweedFS tenant into the three states the chart's naming guard
+# (packages/system/seaweedfs/templates/naming-guard.yaml) decides between:
+#
+#   L      exactly the chart-named generation -> the upgrade adopts it. Nothing to do.
+#   S      exactly the release-named generation -> re-bind first (runbook Step 2).
+#   MIXED  both generations -> the chart REFUSES; an operator must remove the empty one.
+#
+# For MIXED it also reports which generation is ORIGINAL, from durable evidence:
+#
+#   sh.helm.release.v1.<name>-system.v1  — the manifest of revision 1 names either
+#       seaweedfs-master (born pre-4.31) or <release>-master (born 4.31). Exact, but
+#       revision 1 may have been pruned by Helm's history limit.
+#   PersistentVolume creation timestamps — the original generation's PVs predate the
+#       duplicate's, which were provisioned later by the bad upgrade. Compared only
+#       against each other (see the relative rule below); info.first_deployed is
+#       printed as context but decides nothing.
+#
+# PV timestamps, not PVC ones: runbook Step 2 deletes each release-named claim and
+# recreates it under the chart name against the SAME PV, so claim age is not durable
+# and inverts for a tenant interrupted mid-re-bind. The PV survives and keeps its
+# creationTimestamp.
+#
+# Direction is decided by a RELATIVE rule, never a clock window: a generation is
+# the candidate duplicate only when EVERY one of its bound PVs is strictly newer
+# than every bound PV of the other generation — the same precondition runbook
+# Step 2a enforces before deleting anything. Overlapping vintages mean an
+# interrupted Step 2 re-bind (both generations on original PVs) or interleaved
+# provisioning, and the audit refuses to name a candidate. An absolute window
+# measured from first_deployed was tried first and is unsound: the shipped
+# StorageClasses are WaitForFirstConsumer, so PVs appear at pod-SCHEDULE time,
+# and ordinary cold-cluster latency puts even the original generation's PVs
+# minutes past first_deployed — which pushed a mid-rebind tenant into the branch
+# whose advice deletes the un-re-bound claims.
+#
+# IMPORTANT — what this does NOT tell you. "Which generation is original" is not
+# "the other one is empty". A duplicate that never scheduled (safe to delete) and one
+# that served writes and later crashed (holds unique objects) are identical on every
+# durable signal — same revision-1 scheme, same first_deployed deltas. Establishing
+# emptiness needs the duplicate's volume files and the filer's volume list, which this
+# script does not inspect. It narrows the question; it does not answer it.
+#
+# Usage:  hack/seaweedfs-naming-audit.sh [namespace...]
+#         KUBECONFIG=<file> hack/seaweedfs-naming-audit.sh
+# Exit:   0        the audit RAN TO COMPLETION; the table is the whole answer
+#                  (an empty table then means a genuinely clean fleet).
+#         non-zero a kubectl query FAILED, so the audit is INCOMPLETE and the
+#                  table must NOT be trusted -- a message naming the failed query
+#                  is on stderr. This is fail-CLOSED by design (see run_kubectl):
+#                  the output gates a destructive runbook step, so an unreachable
+#                  API aborts loudly rather than printing an empty table that
+#                  reads identically to "nothing to do".
+# Nothing is ever mutated on either path -- every kubectl call is read-only.
+#
+# POSIX sh, deliberately. hack/seaweedfs-naming-audit.bats sources the pure
+# helpers under Bats, then drives the executable path repeatedly with explicit
+# `sh hack/seaweedfs-naming-audit.sh` subprocesses. Those subprocess assertions,
+# plus the narrow cozytest.sh compatibility pass in the root Makefile, keep the
+# tested shell and the executed shell aligned; retain at least one explicit sh
+# invocation if this suite is refactored. A bash shebang would not save sourced
+# helpers: `.` runs the file's contents in the caller's shell and the shebang is
+# just a comment. `pipefail` in particular is not POSIX and dash 0.5.12 (Ubuntu)
+# rejects it outright.
+set -u
+
+# run_kubectl <what> <kubectl-args...> -- run ONE read-only kubectl query
+# fail-CLOSED and print its stdout. This audit is the documented gate in front of
+# a destructive runbook step (deleting a tenant's PVCs), so a query that FAILS
+# must never be mistaken for a query that found nothing: an enumerating LIST
+# returns empty stdout on a timeout or an RBAC denial, byte-identical to the same
+# LIST succeeding on a genuinely clean fleet, and the old `2>/dev/null` on each
+# call turned an unreachable API into a silent false "nothing to do". Every
+# enumeration is routed through here so any failure is loud and terminal instead.
+#
+# On success prints kubectl's stdout verbatim -- which may legitimately be empty,
+# because a LIST that matched nothing is honestly clean; keeping that case
+# distinct from failure is the whole point. On a non-zero exit prints the failed
+# query to stderr and returns that exit code; kubectl's own stderr stays on fd 2
+# and reaches the operator unfiltered. Callers MUST propagate the non-zero status
+# (`|| return`/`|| exit`) -- a bare `for x in $(run_kubectl ...)` would swallow
+# it, because a for-loop ignores the exit status of its word-list command, and an
+# `exit` inside the `$(...)` subshell would only leave that subshell.
+run_kubectl() {
+  _rk_what="$1"; shift
+  if _rk_out=$(kubectl "$@"); then
+    printf '%s' "$_rk_out"
+    return 0
+  else
+    _rk_rc=$?
+    printf 'seaweedfs-naming-audit: FATAL: %s failed (kubectl %s -> exit %s). Refusing to report a clean fleet on an unreachable API.\n' \
+      "$_rk_what" "$*" "$_rk_rc" >&2
+    return "$_rk_rc"
+  fi
+}
+
+# audit_fatal <message> -- the counterpart to run_kubectl for corruption the API
+# call itself did NOT report: the query succeeded, but what it returned is
+# impossible for a healthy object (a helm.sh/release.v1 Secret with no decodable
+# release payload). Same fail-CLOSED contract -- print a FATAL line naming the
+# object to stderr and return non-zero; callers MUST propagate it. A silent skip
+# here would be the identical false-clean this whole script guards against, just
+# one field deeper than an unreachable API.
+audit_fatal() {
+  printf 'seaweedfs-naming-audit: FATAL: %s Refusing to report a clean fleet on corrupt state.\n' "$1" >&2
+  return 1
+}
+
+# renamed_volume_prefix <release> -- reconstruct the name 4.31 gives the volume
+# component of <release>. Mirrors seaweedfs.fullname + seaweedfs.componentName
+# (see packages/system/seaweedfs/templates/_naming.tpl, which the chart's guard
+# uses for exactly the same purpose): the fullname gains -seaweedfs when the
+# release name does not already contain it, is capped at 63, and componentName
+# then cuts it to (62 - len("volume")) = 56 before appending -volume.
+renamed_volume_prefix() {
+  release="$1"
+  case "$release" in
+    *seaweedfs*) full="$release" ;;
+    *)           full="${release}-seaweedfs" ;;
+  esac
+  full=$(printf '%s' "$full" | cut -c1-63 | sed 's/-$//')
+  printf '%s-volume' "$(printf '%s' "$full" | cut -c1-56 | sed 's/-$//')"
+}
+
+# release_json <ns> <release> [rev] -- decode a Helm release secret's payload, or
+# "" when that revision's secret does not exist. Helm stores base64(gzip(json)) in
+# Secret.data.release, and Kubernetes base64s the data value again, hence the two
+# decodes.
+#
+# This is a by-NAME GET, but it is NOT best-effort: system_releases decides whether
+# a release IS SeaweedFS from the result, so a swallowed failure silently drops a
+# real tenant -- the false-clean this script exists to prevent. EXISTENCE and
+# EXTRACTION are therefore two separate questions, because `--ignore-not-found
+# -o jsonpath` cannot tell them apart (it returns empty + exit 0 both for an absent
+# Secret AND for a present Secret whose .data.release is missing):
+#
+#   1. Existence, via `--ignore-not-found -o name`. Empty + exit 0 = the revision
+#      was pruned by Helm's history limit -- a legitimate absence; return "" and
+#      let rev1_scheme / first_deployed treat it as "pruned". A real error (RBAC,
+#      timeout, apiserver down) stays non-zero and run_kubectl makes it fatal.
+#   2. The Secret EXISTS, so its payload MUST decode. A helm.sh/release.v1 Secret
+#      with no .data.release, a payload that is not base64(base64(gzip(...))), or an
+#      empty JSON after decoding is CORRUPT state, not an absence -- and here that
+#      is safety-critical, so every such anomaly is audit_fatal, never a silent skip
+#      (contrast pv_epoch, where an empty field is a benign "no evidence").
+#
+# The extraction GET drops --ignore-not-found deliberately: the Secret existed a
+# moment ago, so a NotFound now is a mid-audit deletion race, and failing closed on
+# it is correct.
+release_json() {
+  _rj_secret="sh.helm.release.v1.$2.v${3:-1}"
+  _rj_exists=$(run_kubectl "check Helm release secret '$_rj_secret' in namespace '$1'" \
+    get secret -n "$1" "$_rj_secret" --ignore-not-found -o name) || return $?
+  [ -n "$_rj_exists" ] || return 0
+  _rj_field=$(run_kubectl "read .data.release of secret '$_rj_secret' in namespace '$1'" \
+    get secret -n "$1" "$_rj_secret" -o jsonpath='{.data.release}') || return $?
+  [ -n "$_rj_field" ] || { audit_fatal "secret '$_rj_secret' in namespace '$1' exists but has no .data.release payload (corrupt Helm release)."; return 1; }
+  _rj_json=$(printf '%s' "$_rj_field" | base64 -d 2>/dev/null | base64 -d 2>/dev/null | gunzip 2>/dev/null) \
+    || { audit_fatal "secret '$_rj_secret' in namespace '$1': .data.release is not decodable base64(base64(gzip(json))) (corrupt Helm release)."; return 1; }
+  [ -n "$_rj_json" ] || { audit_fatal "secret '$_rj_secret' in namespace '$1': release payload decoded to nothing (corrupt Helm release)."; return 1; }
+  printf '%s' "$_rj_json"
+}
+
+# revisions <ns> <release> -- retained revision numbers, oldest first.
+revisions() {
+  _rev_out=$(run_kubectl "list Helm revision secrets for '$2' in namespace '$1'" \
+    get secret -n "$1" -l "name=$2,owner=helm" \
+    -o jsonpath='{range .items[*]}{.metadata.labels.version}{"\n"}{end}') || return $?
+  printf '%s\n' "$_rev_out" | sort -n
+}
+
+# system_releases <ns> -- the SeaweedFS <name>-system Helm releases in a namespace.
+# Filtering on the `-system` suffix alone is not enough: every Cozystack app has a
+# <name>-system release (ingress-nginx-system, bucket-*-system, ...), and since the
+# generation scan below matches PVCs by NAME across the whole namespace, an
+# unrelated release in a namespace that happens to run SeaweedFS would be reported
+# as a SeaweedFS tenant. Confirm the chart.
+system_releases() {
+  _sr_secrets=$(run_kubectl "list Helm release secrets in namespace '$1'" \
+    get secret -n "$1" \
+    -o jsonpath='{range .items[?(@.type=="helm.sh/release.v1")]}{.metadata.labels.name}{"\n"}{end}') || return $?
+  for rel in $(printf '%s\n' "$_sr_secrets" | grep -E -- '-system$' | sort -u); do
+    _sr_revs=$(revisions "$1" "$rel") || return $?
+    for rev in $_sr_revs; do
+      _sr_json=$(release_json "$1" "$rel" "$rev") || return $?
+      # Empty "" here means the revision secret was pruned (release_json's absence
+      # path) -- a legitimate skip. A NON-empty payload, however, was fetched and
+      # decoded successfully, so it MUST name its chart: a helm.sh/release.v1 release
+      # always carries chart.metadata.name. A payload without one ({} , or any valid
+      # JSON lacking it) is corrupt/unexpected, and since "no chart name" is
+      # indistinguishable downstream from "not SeaweedFS", silently skipping it is
+      # the very false-clean this guard exists to stop -- so it is FATAL. A present
+      # but different chart name is a real, non-SeaweedFS release and stays a
+      # legitimate skip, filtered exactly as before by the cozy-seaweedfs test.
+      #
+      # Two properties make this match trustworthy, and both are load-bearing now
+      # that a miss is FATAL:
+      #
+      #   * FIRST match, not last. Helm's Release marshals "chart" before
+      #     "config" (the user's values), so a values subtree that happens to
+      #     spell chart.metadata.name sits LATER in the payload -- and a greedy
+      #     `sed 's/.*"chart"...'` would return that decoy instead of the real
+      #     chart. A wrong name reads downstream as "not SeaweedFS" and drops a
+      #     real release from the report: the exact silent false-clean this guard
+      #     exists to stop. `grep -o | head -1` takes the leftmost match.
+      #   * The chart -> metadata -> name key path stays ADJACENT. A looser "any
+      #     'name' after 'metadata'" matches chart.templates[].name, which Helm
+      #     serializes immediately after metadata on EVERY healthy release, so it
+      #     would return a template path for every tenant.
+      #
+      # Newlines are folded first so a pretty-printed payload parses at all (sed
+      # and grep are line-based), and whitespace around the punctuation is
+      # tolerated. Failing loudly on a payload this cannot read is the safe
+      # direction -- over-strictness stops the runbook, over-looseness lets it
+      # delete data -- so the message says what shape was expected.
+      if [ -n "$_sr_json" ]; then
+        _sr_chart=$(printf '%s' "$_sr_json" | tr '\n' ' ' \
+          | grep -o '"chart"[[:space:]]*:[[:space:]]*{[[:space:]]*"metadata"[[:space:]]*:[[:space:]]*{[[:space:]]*"name"[[:space:]]*:[[:space:]]*"[^"]*"' \
+          | head -1 \
+          | sed -n 's/.*"\([^"]*\)"$/\1/p')
+        [ -n "$_sr_chart" ] || { audit_fatal "could not read the chart name of secret 'sh.helm.release.v1.$rel.v$rev' in namespace '$1' at .chart.metadata.name (expected 'name' as metadata's first key; a corrupt Helm release, or a payload format this parser does not handle)."; return 1; }
+        if [ "$_sr_chart" = cozy-seaweedfs ]; then printf '%s\n' "$rel"; fi
+      fi
+      break
+    done
+  done
+}
+
+# parse_epoch <rfc3339> -- an RFC3339 timestamp -> epoch seconds, portably across
+# GNU and BSD date. GNU spells this `date -d`, BSD spells it `date -j -f <fmt>`,
+# and each REJECTS the other's flag, so both are attempted (each with its own
+# stderr muted) and the first that yields an epoch wins. Only the leading 19
+# chars are fed in -- "YYYY-MM-DDTHH:MM:SS", dropping any fractional seconds and
+# the zone suffix -- which both accept and which the callers compare purely
+# against each other, never against a wall clock.
+#
+# The value passed here is always NON-EMPTY: an absent field is a benign "no
+# evidence" case the callers settle BEFORE reaching this. So a value that NEITHER
+# form can read is not absent evidence -- it is a clock the host could not read: a
+# `date` with no usable form on PATH, or a value no healthy apiserver / Helm
+# payload emits. Folding that into the empty-field "direction cannot be
+# established" branch is exactly issue #4273 -- a host-tool failure printed as a
+# statement about the cluster, on every tenant, on any host without GNU date. So
+# it is FATAL and names the value, kept loud and distinct from the silent
+# absent-evidence path by construction. The muted stderr above hides only the
+# expected "illegal option" from the wrong spelling; a genuine total failure is
+# reported here, not swallowed.
+parse_epoch() {
+  _pe_in=$(printf '%s' "$1" | cut -c1-19)
+  if _pe_out=$(date -u -d "$_pe_in" +%s 2>/dev/null); then printf '%s' "$_pe_out"; return 0; fi
+  if _pe_out=$(date -u -j -f '%Y-%m-%dT%H:%M:%S' "$_pe_in" +%s 2>/dev/null); then printf '%s' "$_pe_out"; return 0; fi
+  audit_fatal "could not parse timestamp '$1' as epoch seconds with either GNU (date -d) or BSD (date -j -f) date. The host has no usable date on PATH, or the value is not an RFC3339 timestamp."
+  return 1
+}
+
+# first_deployed <ns> <release> -- epoch seconds of the release's first install,
+# from any retained revision (the field is identical on all of them).
+first_deployed() {
+  _fd_revs=$(revisions "$1" "$2") || return $?
+  for rev in $_fd_revs; do
+    _fd_json=$(release_json "$1" "$2" "$rev") || return $?
+    # Same extraction discipline as the chart name above: fold newlines so a
+    # pretty-printed payload parses at all, tolerate whitespace around the
+    # punctuation, and take the FIRST match (.info precedes .config, so a values
+    # subtree cannot shadow the real timestamp). An ABSENT first_deployed is not
+    # fatal -- the loop simply falls through and the caller degrades to the
+    # documented safe fallback -- but a WRONG timestamp would silently change a
+    # vintage verdict, which is worse than none. A PRESENT-but-unparseable one is
+    # handled by parse_epoch, which fails loudly rather than degrading (#4273):
+    # the two are different, an absent field being no evidence and an unreadable
+    # field being a clock the host could not read.
+    ts=$(printf '%s' "$_fd_json" | tr '\n' ' ' \
+      | grep -o '"first_deployed"[[:space:]]*:[[:space:]]*"[^"]*"' \
+      | head -1 \
+      | sed -n 's/.*"\([^"]*\)"$/\1/p')
+    if [ -n "$ts" ]; then parse_epoch "$ts"; return; fi
+  done
+}
+
+# rev1_scheme <ns> <release> -- "legacy" | "renamed" | "" (revision 1 pruned).
+rev1_scheme() {
+  m=$(release_json "$1" "$2" 1) || return $?
+  [ -n "$m" ] || return 0
+  if printf '%s' "$m" | grep -q 'name: seaweedfs-master'; then printf 'legacy'
+  elif printf '%s' "$m" | grep -qE "name: $2(-seaweedfs)?-master"; then printf 'renamed'
+  fi
+}
+
+# pv_epoch <ns> <pvc> -- creation epoch of the PV the claim is BOUND to, or "" when
+# there is no PV age to read (an unbound claim, or a NotFound PVC/PV). A PV age
+# that is PRESENT but unreadable is not this case -- it is fatal (see below). Two
+# by-NAME GETs.
+#
+# A real API error must abort (an epoch silently missing from a range can invert
+# the strict-newer comparison and name the WRONG deletion candidate), so both GETs
+# go through run_kubectl. But UNLIKE release_json, an EMPTY field here is NOT
+# corruption and is NOT fatal -- because the consequence differs. When release_json
+# returns empty for a present Secret the tenant is dropped from the report: a
+# false-clean. When pv_epoch returns "" the claim merely contributes no epoch,
+# which marks its whole generation INCOMPLETE (see audit_ns) and forces the safe
+# "direction cannot be established -> classify by hand" branch. That degradation is
+# conservative by construction: it never yields a false-clean and never names a
+# candidate. So the two empty-field cases are deliberately kept benign:
+#   * PVC .spec.volumeName empty -- a Pending / unbound claim, a routine state;
+#   * PV .metadata.creationTimestamp empty -- shouldn't happen (the apiserver always
+#     stamps it), but if it ever did the only effect is one missing epoch, i.e. the
+#     same safe incomplete fallback, so a hard stop is not warranted here.
+# `--ignore-not-found` keeps a genuinely-absent PVC/PV (NotFound) on that same
+# benign path rather than turning it into a run_kubectl failure. A timestamp that
+# is PRESENT but unparseable is deliberately NOT on that path: parse_epoch makes
+# it FATAL (issue #4273), because a host whose `date` cannot read the clock is not
+# the same as a claim that carries no evidence, and the old `2>/dev/null || return
+# 0` collapsed the two -- reporting every tenant "direction cannot be established"
+# on any host without GNU date. Only a real run_kubectl error, or now an
+# unreadable-but-present timestamp, propagates; the two empty-field cases above
+# stay benign.
+pv_epoch() {
+  pv=$(run_kubectl "get PVC '$2' in namespace '$1'" \
+    get pvc -n "$1" "$2" --ignore-not-found -o jsonpath='{.spec.volumeName}') || return $?
+  [ -n "$pv" ] || return 0
+  t=$(run_kubectl "get PV '$pv' (bound by PVC '$2' in namespace '$1')" \
+    get pv "$pv" --ignore-not-found -o jsonpath='{.metadata.creationTimestamp}') || return $?
+  [ -n "$t" ] || return 0
+  parse_epoch "$t"
+}
+
+# classify_mixed_direction <lmin> <lmax> <rmin> <rmax> -- direction of a MIXED
+# tenant, from the bound-PV creation-epoch ranges of the chart-named (l*) and
+# release-named (r*) generations. Prints one of:
+#
+#   legacy-original   every release-named PV strictly newer -> it is the candidate
+#                     duplicate (runbook Step 3)
+#   renamed-original  every chart-named PV strictly newer -> S-damaged, the
+#                     chart-named set is the candidate duplicate (Step 2a, then 2)
+#   overlap           vintages interleave or touch -> no candidate. An interrupted
+#                     Step 2 re-bind puts BOTH generations on original-vintage PVs.
+#
+# Purely relative — no clock, no window, no first_deployed. Ties (second-resolution
+# timestamps) count as overlap: refusing a candidate is recoverable, naming the
+# wrong one is not.
+classify_mixed_direction() {
+  if [ "$3" -gt "$2" ]; then printf 'legacy-original'
+  elif [ "$1" -gt "$4" ]; then printf 'renamed-original'
+  else printf 'overlap'
+  fi
+}
+
+audit_ns() {
+  ns="$1"
+  _rels=$(system_releases "$ns") || return $?
+  for rel in $_rels; do
+    prefix=$(renamed_volume_prefix "$rel")
+    legacy_pvcs=""; renamed_pvcs=""
+    _pvcs=$(run_kubectl "list PVCs in namespace '$ns'" get pvc -n "$ns" -o name) || return $?
+    for pvc in $(printf '%s\n' "$_pvcs" | sed 's|persistentvolumeclaim/||'); do
+      case "$pvc" in
+        "data1-${prefix}"*)      renamed_pvcs="$renamed_pvcs $pvc" ;;
+        data1-seaweedfs-volume*) legacy_pvcs="$legacy_pvcs $pvc" ;;
+      esac
+    done
+    legacy_sts=""; renamed_sts=""
+    _sts_list=$(run_kubectl "list SeaweedFS StatefulSets in namespace '$ns'" \
+      get sts -n "$ns" -l app.kubernetes.io/name=seaweedfs -o name) || return $?
+    for sts in $(printf '%s\n' "$_sts_list" | sed 's|statefulset.apps/||'); do
+      case "$sts" in
+        "${prefix}"*)      renamed_sts="$renamed_sts $sts" ;;
+        seaweedfs-volume*) legacy_sts="$legacy_sts $sts" ;;
+      esac
+    done
+    has_legacy=0; has_renamed=0
+    [ -n "$legacy_pvcs$legacy_sts" ] && has_legacy=1
+    [ -n "$renamed_pvcs$renamed_sts" ] && has_renamed=1
+    [ "$has_legacy" = 0 ] && [ "$has_renamed" = 0 ] && continue
+
+    if [ "$has_legacy" = 1 ] && [ "$has_renamed" = 0 ]; then
+      printf '%-24s %-14s %-8s %s\n' "$ns" "$rel" "L" "chart-named only; the upgrade adopts it, nothing to do"
+      continue
+    fi
+    if [ "$has_renamed" = 1 ] && [ "$has_legacy" = 0 ]; then
+      printf '%-24s %-14s %-8s %s\n' "$ns" "$rel" "S" "release-named only; re-bind the volumes (Step 2) BEFORE upgrading"
+      continue
+    fi
+
+    # Both generations. Report which is ORIGINAL from durable evidence.
+    fd=$(first_deployed "$ns" "$rel") || return $?
+    scheme=$(rev1_scheme "$ns" "$rel") || return $?
+    printf '%-24s %-14s %-8s %s\n' "$ns" "$rel" "MIXED" "both generations; the chart REFUSES until one is removed"
+    if [ -n "$scheme" ]; then
+      printf '%-24s %-14s %-8s   revision 1 was installed with the %s names => the %s generation is ORIGINAL\n' \
+        "" "" "" "$scheme" "$scheme"
+    fi
+    # The direction rule is "EVERY PV of one generation strictly newer than every
+    # PV of the other". That holds only if we saw EVERY bound PV: a claim whose PV
+    # age we could not read (unbound, or PV gone) leaves the range unbounded on one
+    # side, and a silently-narrowed range can flip OVERLAP into a confident (wrong)
+    # candidate. So a generation with any unreadable claim is INCOMPLETE
+    # and forces the safe "cannot establish" branch -- distinct from a real API
+    # error, which pv_epoch has already turned into a hard failure above.
+    lmin=""; lmax=""; rmin=""; rmax=""; l_incomplete=0; r_incomplete=0
+    for p in $legacy_pvcs; do
+      e=$(pv_epoch "$ns" "$p") || return $?
+      if [ -z "$e" ]; then l_incomplete=1; continue; fi
+      { [ -z "$lmin" ] || [ "$e" -lt "$lmin" ]; } && lmin=$e
+      { [ -z "$lmax" ] || [ "$e" -gt "$lmax" ]; } && lmax=$e
+    done
+    for p in $renamed_pvcs; do
+      e=$(pv_epoch "$ns" "$p") || return $?
+      if [ -z "$e" ]; then r_incomplete=1; continue; fi
+      { [ -z "$rmin" ] || [ "$e" -lt "$rmin" ]; } && rmin=$e
+      { [ -z "$rmax" ] || [ "$e" -gt "$rmax" ]; } && rmax=$e
+    done
+    if [ -n "$fd" ] && [ -n "$lmin" ] && [ -n "$rmin" ]; then
+      printf '%-24s %-14s %-8s   oldest PV vs first_deployed: chart-named +%ss, release-named +%ss (context only, not the rule)\n' \
+        "" "" "" "$((lmin - fd))" "$((rmin - fd))"
+    fi
+    if [ -n "$lmin" ] && [ -n "$rmin" ] && [ "$l_incomplete" = 0 ] && [ "$r_incomplete" = 0 ]; then
+      case $(classify_mixed_direction "$lmin" "$lmax" "$rmin" "$rmax") in
+        legacy-original)
+          printf '%-24s %-14s %-8s   every release-named PV is strictly newer => chart-named is ORIGINAL, the release-named set is the candidate duplicate (Step 3)\n' "" "" "" ;;
+        renamed-original)
+          printf '%-24s %-14s %-8s   every chart-named PV is strictly newer => release-named is ORIGINAL, the chart-named set is the candidate duplicate (Step 2a, then Step 2)\n' "" "" "" ;;
+        overlap)
+          printf '%-24s %-14s %-8s   PV vintages OVERLAP => no candidate. An interrupted Step 2 re-bind looks exactly like this (both generations on original PVs). Finish Step 2 if one is in progress; otherwise escalate. Do NOT run Step 2a.\n' "" "" "" ;;
+      esac
+    else
+      printf '%-24s %-14s %-8s   direction cannot be established from PV ages: a generation has no bound PVs (Pending/unbound claims, or StatefulSets only) or a bound PV age could not be read. Resolve those claims or classify by hand. Do NOT run Step 2a.\n' "" "" ""
+    fi
+    printf '%-24s %-14s %-8s   CANDIDATE ONLY: "original" does not mean the other set is EMPTY. A duplicate that\n' "" "" ""
+    printf '%-24s %-14s %-8s   served writes and later crashed looks identical here. Verify emptiness before deleting.\n' "" "" ""
+  done
+}
+
+main() {
+  printf '%-24s %-14s %-8s %s\n' NAMESPACE RELEASE CLASS NOTE
+  printf '%-24s %-14s %-8s %s\n' --------- ------- ----- ----
+  if [ "$#" -gt 0 ]; then
+    for ns in "$@"; do audit_ns "$ns" || exit $?; done
+  else
+    _ns_list=$(run_kubectl 'list namespaces (whole-cluster mode)' get ns -o name) || exit $?
+    for ns in $(printf '%s\n' "$_ns_list" | sed 's|namespace/||'); do audit_ns "$ns" || exit $?; done
+  fi
+}
+
+# Sourced by hack/seaweedfs-naming-audit.bats to exercise the classifier directly.
+[ "${SEAWEEDFS_AUDIT_LIB:-0}" = "1" ] || main "$@"
diff --git a/hack/select-changelog-source.sh b/hack/select-changelog-source.sh
new file mode 100755
index 0000000000..3eb207537a
--- /dev/null
+++ b/hack/select-changelog-source.sh
@@ -0,0 +1,64 @@
+#!/bin/sh
+# Usage: select-changelog-source.sh <version> <rc_branch>
+#
+# Decide which pre-existing changelog (if any) release generation should use,
+# WITHOUT running the AI — validate-then-fall-through across the sources, so an
+# invalid higher-priority file can never silently suppress a valid lower-priority
+# one:
+#
+#   1. docs/changelogs/vX.Y.Z.md already in the working tree (the rc TAG tree) —
+#      a maintainer hand-wrote it before the tag was cut.
+#   2. docs/changelogs/vX.Y.Z.md on the rc STAGING branch <rc_branch> —
+#      changelog-rc.yaml committed it there at rc time (the "copy" pickup).
+#
+# Each candidate is validated with validate-changelog.sh; an invalid one is
+# reported with a ::warning:: and DISCARDED (rm) so the next source is tried.
+# Exactly one machine-readable line is printed as the LAST line of stdout:
+#
+#   source=rc-tag | source=rc-branch | source=none
+#
+# On rc-tag / rc-branch the usable changelog is left at docs/changelogs/vX.Y.Z.md.
+# On none nothing usable was found and the caller must generate. The ::warning::
+# annotations for discarded files are printed to stdout too, ahead of that line.
+#
+# Run from the repo root AFTER the .release-tooling overlay, with `origin`
+# fetch-authenticated (changelog-preserve.sh fetches the branch).
+# validate-changelog.sh and changelog-preserve.sh must sit beside this script.
+#
+# Exit 0 = a decision was reached (source line printed). Exit 1 = bad args.
+
+set -eu
+
+VERSION="${1:?usage: select-changelog-source.sh <version> <rc_branch>}"
+RC_BRANCH="${2:?usage: select-changelog-source.sh <version> <rc_branch>}"
+
+HERE="$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)"
+VALIDATE="${HERE}/validate-changelog.sh"
+PRESERVE="${HERE}/changelog-preserve.sh"
+CL="docs/changelogs/v${VERSION}.md"
+
+# 1. The rc tag tree — validate before trusting it.
+if [ -s "$CL" ]; then
+  if REASON="$("$VALIDATE" "$CL" "$VERSION" 2>&1)"; then
+    echo "::notice::Using ${CL} already in the rc tag tree (${REASON})."
+    echo "source=rc-tag"
+    exit 0
+  fi
+  echo "::warning::${CL} is in the rc tag tree but is NOT usable (${REASON}); discarding it and trying the rc staging branch ${RC_BRANCH}."
+  rm -f "$CL"
+fi
+
+# 2. The rc staging branch — fetch, then validate before trusting it.
+mkdir -p docs/changelogs
+if "$PRESERVE" "$RC_BRANCH" "$VERSION" "$CL"; then
+  if REASON="$("$VALIDATE" "$CL" "$VERSION" 2>&1)"; then
+    echo "::notice::Copied ${CL} from rc staging branch ${RC_BRANCH} (${REASON})."
+    echo "source=rc-branch"
+    exit 0
+  fi
+  echo "::warning::${CL} on rc staging branch ${RC_BRANCH} is NOT usable (${REASON}); discarding it and generating."
+  rm -f "$CL"
+fi
+
+echo "source=none"
+exit 0
diff --git a/hack/select-e2e.sh b/hack/select-e2e.sh
new file mode 100755
index 0000000000..4c33cb5944
--- /dev/null
+++ b/hack/select-e2e.sh
@@ -0,0 +1,633 @@
+#!/bin/sh
+# Read a list of changed files (one per line) and emit space-separated suite
+# names whose Chainsaw suites under hack/e2e-chainsaw/ should run.
+#
+# Usage: hack/select-e2e.sh <changed-files> [<sources-dir>]
+# Defaults: sources-dir = packages/core/platform/sources
+#
+# Output:
+#   - empty         no E2E impact, decided by one of the rules that select
+#                   nothing: step 1 for docs/, dashboards/ and *.md, step 2 for
+#                   a *.disabled Chainsaw suite and for an
+#                   examples/backups/<app>/ with no suite, and
+#                   inert_config_pattern for repo meta and agent config
+#   - <suite names> selected per the PackageSource dependency graph
+#   - full list     any path that affects all tests, OR an unrecognised
+#                   packages/* path, OR a changed package that reaches no
+#                   runnable suite through the graph, OR a path matching NEITHER
+#                   the full-suite nor the inert list, OR a yq that failed to
+#                   build the dependency graph (conservative fallbacks)
+#   - nothing, and  the suite list itself is unavailable: find failed, or
+#     a non-zero    hack/e2e-chainsaw holds no suite file. Unlike the
+#     exit          yq case there is no fallback left to take — an empty list
+#                   silently corrupts both the escalations, which would print
+#                   it, and the backups rule, which membership-tests against
+#                   it — so the script refuses to answer at all, and since both
+#                   lanes run it under `bash -e` the step fails
+#
+# Every changed path must land in exactly one of the three selection classes by
+# an explicit rule; the fourth outcome is not a classification but a refusal to
+# produce one. An unclassified path escalates to the full suite rather than
+# selecting nothing: both e2e lanes read an empty selection as "skip Chainsaw"
+# and then post the required "E2E Tests" status green, so a silent default is a
+# green gate with no suite run (#3392). When that escalation fires for a path
+# that genuinely cannot affect e2e, add it to inert_config_pattern — do not
+# widen the fall-through.
+#
+# "Empty" is not a synonym for inert_config_pattern. Several rules select
+# nothing: step 1 for docs/, dashboards/ and *.md, step 2 for a *.disabled
+# Chainsaw suite and for an examples/backups/<app>/ whose app has no suite, and
+# the pattern itself. The property the lanes depend on is weaker than "matched
+# the inert list" and it is the one to preserve: an empty selection is a
+# decision some rule reached, never a path nothing looked at.
+#
+# Every branch that escalates names its cause on stderr, and that is a contract
+# rather than a courtesy: the answer "run everything" is the same list of every
+# suite whichever rule produced it, so without a reason line the only way to learn why
+# a pull request ran the whole suite is to re-derive the selection by hand. Four
+# of them were silent before this rule, full_suite_pattern — the commonest cause
+# by a wide margin — among them, which made the usual answer the one the log
+# never had. A test asserts each line, because a reason that regresses to silence
+# changes no selection and so is invisible to every other test here. Deliberately
+# stated without a count: the number of escalating branches moves whenever a rule
+# is added, and a comment carrying a stale one reads as authoritative.
+#
+# The lines go to stderr, never stdout. stdout is the suite list and both lanes
+# parse it, so a reason line there would be read as a suite name.
+#
+# One caveat worth knowing before trusting that: inert_config_pattern makes
+# .github/ inert as a whole directory, and the e2e workflows are exempted by
+# NAME in full_suite_pattern, which is checked first. So a workflow added under
+# .github/workflows/ that runs the suite is silently inert until someone adds it
+# to that list — the fall-through never sees it. The enumeration is the guard,
+# which is why it carries the `rg -l test-chainsaw` reminder; treat that comment
+# as load-bearing rather than decorative.
+set -eu
+
+CHANGED="${1:?missing changed-files arg}"
+SOURCES_DIR="${2:-packages/core/platform/sources}"
+
+# Anything matching this pattern triggers the full Chainsaw suite. Per-suite
+# edits (hack/e2e-chainsaw/<name>/...) are matched BEFORE this so editing one
+# suite doesn't escalate to the full suite; the shared _lib helpers and the
+# .chainsaw.yaml config affect every suite and DO escalate (handled inline).
+#
+# Three groups, all "cannot be scoped to one app":
+#   - shipped code and its build inputs: packages/library, packages/core, the Go
+#     trees (api, cmd, internal, pkg), the codegen under tools/, go.mod/go.sum,
+#     the root Makefile, hack/*.mk (the tag/push/output flags of every image),
+#     hack/buildkitd.toml (the builder every image is built with), and hack/lib/
+#     (sourced by the hack/*.sh scripts that already escalate);
+#   - the e2e harness itself: hack/*.sh, hack/e2e-*.bats and hack/e2e-*.yaml.
+#     The bats half is prefix-matched rather than taking every hack/*.bats,
+#     because the root Makefile splits those two sets by exactly that prefix —
+#     `BATS_UNIT_FILES := $(filter-out hack/e2e-%.bats,$(wildcard hack/*.bats))`
+#     — so the files it keeps are the unit lane and the e2e sandbox runs none
+#     of them. The ones it filters out are the ones packages/core/testing's
+#     recipes execute inside the sandbox, and they stay here. Narrowing this
+#     cannot leave a bats-only pull request untested: `make unit-tests` is gated
+#     on the `code` output, which pull-requests.yaml computes as "any path
+#     outside docs/" and never from this script, so the unit files run on their
+#     own lane whatever the selection here is;
+#   - the workflows that RUN the suite — enumerated rather than matched by
+#     prefix, so an unrelated workflow does not burn a full run. Keep this list
+#     in step with `rg -l test-chainsaw .github/workflows/`.
+#
+#     What that costs, stated rather than left to be rediscovered: only
+#     pull-requests.yaml is executed from the PR's own head. e2e-fork runs on
+#     workflow_run, which always takes the default-branch copy; e2e-tag runs on
+#     workflow_call from a tag push; nightly runs on a schedule. So for those
+#     three the suite cannot exercise the edit under review, and escalating buys
+#     generic regression coverage rather than coverage of the change. Measured
+#     over the last six months of main: 26 commits touch one of the three with
+#     no other escalating path, and each now pays a full Chainsaw run it would
+#     previously have skipped. They stay on the list so the rule remains one
+#     idea ("workflows that run the suite") rather than two, and because the
+#     alternative leaves them inert, which reads as an oversight rather than a
+#     decision. Reopen the trade if the full suite's flake rate makes the
+#     generic coverage cost more than it returns.
+full_suite_pattern='^(packages/library/|packages/core/|api/|cmd/|internal/|pkg/|tools/|hack/lib/|hack/[^/]+\.sh$|hack/e2e-[^/]+\.bats$|hack/[^/]+\.mk$|hack/buildkitd\.toml$|hack/e2e-[^/]+\.ya?ml$|go\.(mod|sum)$|Makefile$|\.github/workflows/(pull-requests|e2e-fork|e2e-tag|nightly)\.yaml$)'
+
+# Paths with no bearing on what e2e exercises. Checked AFTER full_suite_pattern,
+# so a specific escalation wins over a broad directory here (.github/ is inert,
+# .github/workflows/pull-requests.yaml is not). This list is the whole reason
+# the fall-through at the bottom of the loop can escalate safely: the cost of
+# forgetting an inert path is a wasted full run, the cost of forgetting a live
+# one used to be a green gate with nothing tested.
+#   - examples/       demo manifests; examples/backups/<app>/,
+#                     examples/backups/_lib/ and any file directly in
+#                     examples/backups/ are handled above as real test harness
+#                     before this check is reached
+#   - .github/        templates, CODEOWNERS, labels, renovate, linter config —
+#                     minus the e2e workflows escalated above
+#   - .claude/ .gemini/  agent config, never shipped
+#   - img/            README assets
+#   - hack/testdata/  fixtures for the bats unit tests, not for e2e
+#   - hack/*.bats     the unit lane, minus the hack/e2e-*.bats escalated above.
+#                     The root Makefile draws the line at that prefix
+#                     (BATS_UNIT_FILES filters hack/e2e-%.bats out of
+#                     hack/*.bats), so these files are never executed inside
+#                     the e2e sandbox and no Chainsaw suite can regress from one.
+#                     They are not untested by being inert here: `make
+#                     unit-tests` runs them, gated on pull-requests.yaml's `code`
+#                     output, which is "any path outside docs/" and is computed
+#                     in the workflow rather than from this script
+#   - hack/test_helper.bash  shared setup for that same unit-only BATS lane. It
+#                     is loaded by BATS_UNIT_FILES and by nothing in the e2e
+#                     sandbox; enumerate it rather than making every future
+#                     top-level *.bash file inert
+#   - packages/tests/ helm-unittest fixture charts. cozy-lib-tests exercises
+#                     library/cozy-lib from the outside; changing a test OF
+#                     cozy-lib does not change cozy-lib, no PackageSource lists
+#                     these paths as a component, and nothing installs them. A
+#                     change to the library itself still escalates through
+#                     packages/library/ in full_suite_pattern
+#   - boilerplate.go.txt / dcgm-default-counters.csv  codegen header; a CSV read
+#                     only by check-gpu-recording-rules.bats
+#   - the three .gitattributes  ENUMERATED, not matched by name. Every
+#                     .gitattributes in this tree holds nothing but
+#                     `linguist-generated` markers — GitHub's language-stats and
+#                     diff-collapsing hint, which reaches no build, chart or test
+#                     — and these are the three whose classification the entry
+#                     changes; the two under api/ and internal/ are escalated by
+#                     full_suite_pattern first, so an entry for them would be
+#                     dead. The justification is about what these files CONTAIN,
+#                     and the file name does not carry it: .gitattributes can also
+#                     set `filter`, `eol`, `working-tree-encoding` and
+#                     `export-subst`, every one of which changes what lands in the
+#                     working tree and therefore what gets built, so a by-name
+#                     rule would silently make a live file inert. Same trade as
+#                     the workflow enumeration above, and the same upkeep: after
+#                     adding or moving one, re-check with
+#                     `git ls-files '*.gitattributes' '.gitattributes'` and
+#                     confirm the contents are still only linguist markers. A
+#                     .gitattributes NOT on this list is classified by whatever
+#                     rule its path falls under — the graph, or the unclassified
+#                     fall-through — both of which fail safe
+inert_config_pattern='^(examples/|\.github/|\.claude/|\.gemini/|img/|hack/testdata/|packages/tests/|hack/[^/]+\.bats$|hack/test_helper\.bash$|hack/boilerplate\.go\.txt$|hack/dcgm-default-counters\.csv$|LICENSE$|\.gitignore$|\.pre-commit-config\.yaml$|\.coderabbit\.yaml$|packages/system/\.gitattributes$|packages/system/(backup-controller|backupstrategy-controller)/definitions/\.gitattributes$)'
+
+# All known Chainsaw suites: every dir directly under hack/e2e-chainsaw/ in
+# which Chainsaw v0.2.15 would find a Test (pkg/discovery/load.go and step.go).
+# A Test is a chainsaw-test.yaml, or chainsaw-test.yml when the .yaml is absent,
+# or, with neither, files named like 01-install.yaml, which Chainsaw turns into
+# a Test on its own. Chainsaw walks every subdirectory of the dir it is handed
+# (pkg/utils/fs/discover.go), so a Test in a top-level dir or anywhere below it
+# belongs to that dir. A suite that runs but is never listed is never selected.
+# A parked chainsaw-test.yaml.disabled matches none of these. A step-file name
+# counts unless the entry is a directory (TryFindStepFiles), so a symlink counts
+# and `-type f` would be too narrow. A chainsaw-test.y*ml counts whatever its
+# type: Chainsaw stats it and fails loudly on a directory, and leaving that
+# suite out would hide the failure instead.
+#
+# Captured before the sed/sort rather than piped straight into them: a pipeline
+# carries its LAST command's status, so `$(find ... | sed | sort)` would report
+# sort's success whatever find did — the same blindness handled for yq below,
+# and worse here, because this list is what every escalation prints. Errors go
+# to stderr rather than /dev/null for the same reason.
+if ! suite_files=$(find hack/e2e-chainsaw -mindepth 2 \( ! -type d -o -name chainsaw-test.yaml -o -name chainsaw-test.yml \)); then
+  echo "select-e2e: find failed listing the Chainsaw suites under hack/e2e-chainsaw — nothing can be decided without that list" >&2
+  exit 1
+fi
+all_apps=$(printf '%s\n' "$suite_files" \
+  | sed -nE 's,^hack/e2e-chainsaw/([^/]+)/(.*/)?(chainsaw-test|[0-9]+-[^/]*)\.ya?ml$,\1,p' | sort -u)
+
+# An empty list here is a broken enumeration — a moved directory, a wrong
+# working directory — not a project without tests, and it silently corrupts
+# every answer the script can give:
+#
+#   - the escalation branches print this list, so "run everything"
+#     becomes a blank line, which both lanes read as "skip Chainsaw" before
+#     posting the required "E2E Tests" status green;
+#   - the examples/backups/<app>/ rule takes no escalation and still consults
+#     it, as a membership test. With the list empty the test fails, the app is
+#     not selected, and an edit to a backup harness that should run its suite
+#     reports nothing to run instead.
+#
+# Neither is distinguishable in the output from a legitimately empty selection,
+# which is the failure #3392 exists to keep out. Checking once here rather than
+# at the escalation branches covers both, and covers the next consumer that
+# reads the list without escalating.
+#
+# Both lanes run this step under `bash -e`, so the non-zero exit fails the job
+# instead of falling through to the empty selection.
+if [ -z "$all_apps" ]; then
+  echo "select-e2e: found no Chainsaw suite under hack/e2e-chainsaw (no chainsaw-test.yaml, chainsaw-test.yml or numbered step file in any directory below it) — the suite enumeration is broken (wrong working directory?), refusing to decide anything from an empty suite list" >&2
+  exit 1
+fi
+
+# Single exit point for every escalating branch, so the invariant above has
+# one consumer to reason about rather than one copy per branch.
+escalate_to_full_suite() {
+  echo "$all_apps" | paste -sd ' ' -
+  exit 0
+}
+
+# PackageSource name -> Chainsaw suite name(s). Most *-application sources map
+# by stripping the suffix, a source that is not an app carries its own name
+# (cozystack.kuberture owns the kuberture suite), and the few that match neither
+# are listed explicitly.
+#
+# This is the inverse of select-install.sh's suite_to_source() and has to stay
+# in step with it — a suite that does not round-trip is unreachable from its own
+# package, so every change to that package escalates to the full run instead of
+# selecting the one suite that covers it (#3665). The round-trip is pinned by a
+# test rather than left to review.
+#
+# Mapping optimistically is safe: a name that is not a suite is dropped by
+# intersect_suites() downstream.
+#
+# Only names the two general arms get wrong are listed. `postgres-application`
+# and `external-dns` used to sit here and no longer do: the first is what
+# stripping the suffix already produces, and the second is what carrying the
+# source name through already produces, so both said the rule twice and made
+# this list read as longer than the set of real exceptions.
+src_to_suites() {
+  case "$1" in
+    vm-instance-application) echo vminstance ;;
+    # The vminstance suite creates a VMDisk and asserts the DataVolume behind it
+    # (hack/e2e-chainsaw/vminstance/vmdisk.yaml, vmdisk-vmi.yaml), so it is the
+    # suite that covers this source and everything reaching it, kubevirt-cdi
+    # included. Without the entry the source maps to a `vm-disk` suite that does
+    # not exist, is dropped by intersect_suites(), and a CDI change reaches
+    # nothing runnable through it.
+    vm-disk-application) echo vminstance ;;
+    # The VMInstance and VMDisk backup round-trips are the only Tests that run a
+    # Velero backup and restore; without this the source maps to a `velero`
+    # suite that does not exist and a Velero change runs neither.
+    velero) echo vminstance ;;
+    # Both sources own system/ingress-nginx, and the gateway suite carries the
+    # legacy Ingress admission regression coverage. Without these explicit
+    # mappings their derived names point at suites that do not exist, so an
+    # ingress-only package change can omit the suite that exercises it.
+    ingress-application|ingress-nginx) echo gateway ;;
+    kubernetes-application) echo "kubernetes-latest kubernetes-previous" ;;
+    # apps/kubernetes-nodes also belongs to computeplane-application, which has
+    # a suite; without this entry an edit there selects computeplane alone,
+    # whose pools go through the module allowlist, and drops the suites that
+    # create KubernetesNodes natively.
+    kubernetes-nodes-application) echo "kubernetes-latest kubernetes-previous computeplane" ;;
+    securitygroup-controller) echo securitygroup ;;
+    # The kafka app source covers both the app suite and the metadata-backup
+    # roundtrip, so an edit to packages/apps/kafka (or kafka-operator, which
+    # reaches this source) selects both.
+    kafka-application) echo "kafka kafka-metadata" ;;
+    # The seaweedfs suite runs an instance of its own, and the rest use
+    # tenant-root's. bucket drives the Bucket API against the
+    # tenant-root instance, the backup round-trips write to it through the
+    # in-cluster seaweedfs-s3 endpoint, most of them verifying its CA, and
+    # harbor stores its registry in a BucketClaim the seaweedfs COSI driver
+    # serves. etcd's round-trip is left out because CI gates it off. A test
+    # derives this set from the suites.
+    seaweedfs-application) echo "bucket clickhouse harbor kafka kafka-metadata mariadb mongodb postgres rabbitmq redis seaweedfs valkey vminstance" ;;
+    # Both suites create a KeycloakClient and wait for the operator's finalizer
+    # to remove it. kubernetes-application has no dependsOn on keycloak-operator
+    # (#4680), so the graph reaches only monitoring and would drop the tenant
+    # Kubernetes OIDC lifecycle in kubernetes-latest.
+    keycloak|keycloak-operator) echo "kubernetes-latest monitoring" ;;
+    *-application) echo "${1%-application}" ;;
+    *) echo "$1" ;;
+  esac
+}
+
+# yq: path -> PackageSource name
+build_owners_index() {
+  yq -rN '.metadata.name as $n | .spec.variants[]?.components[]?.path | select(. != null and . != "") | . + "\t" + $n' "$SOURCES_DIR"/*.yaml
+}
+
+# yq: PackageSource name -> sources that depend on it (reverse of dependsOn)
+#
+# Exclude cozystack.cozystack-engine as a propagation hub. Every *-application
+# source declares `dependsOn: cozystack.cozystack-engine` purely as an INSTALL
+# ORDERING edge — the app's *-rd HelmRelease must wait for the engine to
+# register the ApplicationDefinition CRD before it can reconcile. That is a
+# universal lifecycle dependency, NOT a behavioral one: a change to an engine
+# dependency (postgres-operator, keycloak, cert-manager, ...) does not alter any
+# app's runtime behavior, so it must not fan test selection out to every app.
+# Without this filter, postgres-operator -> keycloak -> cozystack-engine -> EVERY
+# app, defeating test-impact analysis. Dropping the engine reverse edges keeps
+# the engine reachable but stops it propagating selection downstream. A change to
+# the engine itself still triggers the full suite: its group reaches no suite, so
+# the per-path escalation below fires on it.
+#
+# cozystack.cozystack-basics is the second hub of that kind and is excluded for
+# the same reason. Every edge into it exists so a namespace or a platform-wide
+# policy is in place before the dependent installs — kubevirt-cdi says so in its
+# own source ("Depend on cozystack-basics so the target namespace exists
+# first") — which is install ordering, not behavior. It is also the hub where
+# treating the edge as behavioral does the most damage, and in the wrong
+# direction: cozystack-basics reaches no suite today, so it escalates, but it
+# sits upstream of kubevirt-cdi, so the FIRST suite that lands downstream of CDI
+# silently converts the platform's namespace-and-policy package from the full
+# run to that one suite. Reproduced on #3426, where enabling the site-router
+# suite takes cozystack-basics from 22 suites to `site-router` alone. Dropping
+# the reverse edges keeps the package reachable and stops it propagating
+# selection downstream, and a change to it still runs everything through the
+# per-path escalation.
+build_reverse_deps() {
+  yq -rN '.metadata.name as $n | .spec.variants[]?.dependsOn[]? | select(. != null and . != "" and . != "cozystack.cozystack-engine" and . != "cozystack.cozystack-basics") | . + "\t" + $n' "$SOURCES_DIR"/*.yaml
+}
+
+# Each index is one yq, and `OWNERS=$(build_owners_index | sort -u)` reports
+# sort's status, never yq's — so `set -eu` above cannot see a yq that failed.
+# The index then comes back empty, every path falls through to escalation, and
+# the run is a full suite indistinguishable in the output from "no owners
+# matched". Safe in direction, invisible in nature: selection has stopped
+# working and it reads as the conservatism it is supposed to be.
+#
+# So capture each half on its own, check its status, and say once, loudly, that
+# yq is the broken component before taking the same fallback the empty index
+# would have taken anyway.
+broken=''
+OWNERS=$(build_owners_index) || broken='the ownership index'
+REVERSE=$(build_reverse_deps) || broken="${broken:+$broken and }the reverse-dependency index"
+if [ -n "$broken" ]; then
+  echo "select-e2e: yq failed building $broken from $SOURCES_DIR/*.yaml — the dependency graph is unusable, running the full suite" >&2
+  escalate_to_full_suite
+fi
+# Sorted after the check rather than inside the pipeline above, for the reason
+# the pipeline was the bug.
+OWNERS=$(printf '%s\n' "$OWNERS" | sort -u)
+REVERSE=$(printf '%s\n' "$REVERSE" | sort -u)
+
+trigger_full=0
+trigger_any=0
+selected_groups=""
+selected_apps=""
+
+# `|| [ -n "$file" ]` is what makes the classification below total. POSIX read
+# assigns the last line and then returns non-zero when the input does not end in
+# a newline, so a plain `while read` silently drops it. That is the one way a
+# path can reach this loop and be classified by nothing at all: the fall-through
+# at the end, which exists so an unrecognised path escalates instead of
+# selecting nothing, sits inside the body the drop skips. Callers building the
+# list themselves rather than piping `git diff` are the ones that hit it, and
+# the guard belongs here rather than in each of them.
+while IFS= read -r file || [ -n "$file" ]; do
+  [ -z "$file" ] && continue
+
+  # 1. Skip: docs, dashboards, *.md. Checked before everything else because
+  #    these can never matter wherever they live — a README inside
+  #    packages/core/ must not escalate the way its templates do.
+  if echo "$file" | grep -qE '^(docs/|dashboards/)' || echo "$file" | grep -qE '\.md$'; then
+    continue
+  fi
+
+  # 2. Chainsaw edits. A per-suite file selects only that suite; the shared
+  #    _lib helpers and the .chainsaw.yaml config affect every suite, so they
+  #    escalate to the full run.
+  case "$file" in
+    hack/e2e-chainsaw/_lib/*|hack/e2e-chainsaw/.chainsaw.yaml)
+      echo "select-e2e: '$file' is shared by every Chainsaw suite — escalating to the full suite" >&2
+      trigger_full=1
+      continue ;;
+    hack/e2e-chainsaw/*/*.disabled)
+      # A suite parked as chainsaw-test.yaml.disabled is registered nowhere and
+      # executed by nothing, so an edit to it cannot regress a test. Matched
+      # before the per-suite rule below, which reads the suite name off the
+      # directory and ignores the suffix: a parked suite's directory holds no
+      # live suite, so that rule would escalate to the full run — the most
+      # expensive outcome, bought by the one file class that provably cannot
+      # affect anything. Inert is the classification.
+      continue ;;
+    hack/e2e-chainsaw/*/*)
+      # Membership-tested here rather than left to the final intersection, for
+      # the reason given on the hack/e2e-apps/ arm below: a directory holding no
+      # suite (shared material beside _lib/) must escalate whatever else the
+      # diff selected.
+      app=$(echo "$file" | sed -nE 's,^hack/e2e-chainsaw/([^/]+)/.*,\1,p')
+      if echo "$all_apps" | grep -Fxq "$app"; then
+        selected_apps="$selected_apps $app"
+        trigger_any=1
+      else
+        echo "select-e2e: '$file' names no runnable suite ('$app') — escalating to the full suite" >&2
+        trigger_full=1
+      fi
+      continue ;;
+    hack/e2e-apps/*)
+      # The pre-Chainsaw per-app BATS suites. One file per app, named after it,
+      # so the suite name comes off the basename exactly as the rule above takes
+      # it off the directory.
+      #
+      # Deliberately NOT marked inert. The files formerly kept here were wired to
+      # nothing after the Chainsaw migration, but inert would bake that orphan
+      # status into the rule and go quietly wrong the day a lane runs this layout
+      # again. A file named after an app selects that app's suite whether or not
+      # anything currently executes it.
+      #
+      # The membership test is what makes this per-path, and it is not optional.
+      # Adding an unmatched name to selected_apps and letting the final
+      # intersection drop it leaves the verdict to the REST of the diff: alone it
+      # empties the selection and the backstop escalates, but beside any path that
+      # contributed a suite the escalation vanishes and the run narrows to that
+      # suite with nothing on stderr. That is the merge-before-escalate shape
+      # #3330 removed from the graph walk, and it applies here for the same
+      # reason — coverage is a property of the changed path.
+      #
+      # `[^/]+` rather than `.+`: POSIX case matches `/` with `*`, so this arm
+      # also sees nested paths, and an unanchored capture would turn
+      # hack/e2e-apps/fixtures/postgres.bats into the "suite" fixtures/postgres.
+      # Nothing nested exists here today; whatever appears would be shared
+      # material for these suites the way hack/e2e-chainsaw/_lib/ is for the
+      # Chainsaw ones, so it escalates for the same reason rather than being
+      # guessed at. A non-.bats file directly in the directory lands here too and
+      # is treated the same way.
+      app=$(echo "$file" | sed -nE 's,^hack/e2e-apps/([^/]+)\.bats$,\1,p')
+      if [ -z "$app" ]; then
+        echo "select-e2e: '$file' is not a per-app suite file (hack/e2e-apps/<name>.bats), so it is shared material for all of them — escalating to the full suite" >&2
+        trigger_full=1
+      elif echo "$all_apps" | grep -Fxq "$app"; then
+        selected_apps="$selected_apps $app"
+        trigger_any=1
+      else
+        echo "select-e2e: '$file' names no runnable suite ('$app') — escalating to the full suite" >&2
+        trigger_full=1
+      fi
+      continue ;;
+    examples/backups/_lib/*)
+      # A helper here is shared by the backup walkthroughs, so it is material
+      # of the same kind as hack/e2e-chainsaw/_lib/. Matched before the per-app
+      # rule below, which would read _lib as an app, find no suite and select
+      # nothing. Escalated rather than mapped to the suites that run a
+      # walkthrough: that set is spread across the suites' own scripts, and a
+      # derivation that misses one fails open.
+      echo "select-e2e: '$file' is shared by every backup walkthrough — escalating to the full suite" >&2
+      trigger_full=1
+      continue ;;
+    examples/backups/*/*)
+      # A backup round-trip Test executes the example scripts under
+      # examples/backups/<app>/ as its harness, so an edit there must run that
+      # app's suite. This mapping is
+      # also why a round-trip Test belongs in its app's own suite dir: put it
+      # in a dir whose name does not match examples/backups/<app>/ and an edit
+      # to the harness selects a suite that cannot exercise it. A dir with no
+      # matching suite is a docs-only demo and stays ignored (adding it to
+      # selected_apps would empty the final intersection and trip the
+      # full-suite safety net). The redis walkthrough is the one harness shared
+      # across suites: the valkey round-trip runs it with APP_KIND=Valkey, so an
+      # edit there selects both.
+      app=$(echo "$file" | sed -nE 's,^examples/backups/([^/]+)/.*,\1,p')
+      # The vmi and vmdisk backup demos are both harnessed by the vminstance
+      # suite, which owns VMDisk coverage too (see vm-disk-application in
+      # src_to_suites), so their dirs need the same source-style translation.
+      # The suite runs the vmi demo with SKIP_RESTORE_TO_COPY=1, so the to-copy
+      # step is docs-only: selecting the suite would pass without executing it.
+      case "$file" in
+        examples/backups/vmi/07-restore-to-copy.sh) continue ;;
+      esac
+      case "$app" in
+        redis) users="redis valkey" ;;
+        vmi|vmdisk) users=vminstance ;;
+        *) users=$app ;;
+      esac
+      for user in $users; do
+        if echo "$all_apps" | grep -Fxq "$user"; then
+          selected_apps="$selected_apps $user"
+          trigger_any=1
+        fi
+      done
+      continue ;;
+    examples/backups/*)
+      # A file beside the per-app dirs rather than in one (POSIX case lets `*`
+      # match `/`, so the arm above has already taken every nested path)
+      # belongs to no single walkthrough, so it is treated as shared by all of
+      # them. Otherwise it would fall to examples/ in inert_config_pattern and
+      # select nothing.
+      echo "select-e2e: '$file' belongs to no single backup walkthrough — escalating to the full suite" >&2
+      trigger_full=1
+      continue ;;
+  esac
+
+  # 3. Full-suite trigger
+  if echo "$file" | grep -qE "$full_suite_pattern"; then
+    echo "select-e2e: '$file' cannot be scoped to one suite (full_suite_pattern) — escalating to the full suite" >&2
+    trigger_full=1
+    continue
+  fi
+
+  # 4. Explicitly inert: repo meta, agent config, non-e2e workflows, fixtures.
+  if echo "$file" | grep -qE "$inert_config_pattern"; then
+    continue
+  fi
+
+  # 5. Component change: lookup in PackageSource graph
+  rel=$(echo "$file" | sed -nE 's,^packages/(apps|system|extra)/([^/]+)/.*,\1/\2,p')
+  if [ -n "$rel" ]; then
+    src=$(echo "$OWNERS" | awk -v p="$rel" -F'\t' '$1==p {print $2}')
+    if [ -n "$src" ]; then
+      # Keep this path's owning sources together as one comma-joined group. The
+      # unit coverage is decided over is the changed PATH, not the single
+      # source: a path can belong to several PackageSources, some of which
+      # reach no suite, and deciding per source would escalate on that half
+      # and run everything for every change to it.
+      selected_groups="$selected_groups $(echo "$src" | paste -sd , -)"
+      trigger_any=1
+    else
+      # Inside packages/ but no graph entry — be conservative.
+      echo "select-e2e: no PackageSource in $SOURCES_DIR lists '$rel' as a component path — escalating to the full suite" >&2
+      trigger_full=1
+    fi
+    continue
+  fi
+
+  # 6. Unclassified. Escalate instead of ignoring: an empty selection makes both
+  #    e2e lanes skip Chainsaw and post "E2E Tests" green, so a path nobody has
+  #    classified must fail safe, not fail open (#3392). Add genuinely inert
+  #    paths to inert_config_pattern rather than relaxing this.
+  echo "select-e2e: unclassified path '$file' — escalating to the full suite (classify it in hack/select-e2e.sh, see #3392)" >&2
+  trigger_full=1
+done < "$CHANGED"
+
+if [ "$trigger_full" = 1 ]; then
+  escalate_to_full_suite
+fi
+
+if [ "$trigger_any" = 0 ]; then
+  exit 0  # nothing to run
+fi
+
+# Deduplicate a space-separated suite list; keep only names that are suites.
+intersect_suites() {
+  echo "$1" | tr ' ' '\n' | sort -u | grep -v '^$' | while read -r app; do
+    if echo "$all_apps" | grep -Fxq "$app"; then
+      echo "$app"
+    fi
+  done | paste -sd ' ' -
+}
+
+# Transitive closure over reverse-deps from the given PackageSource names, every
+# reached source mapped through src_to_suites. Emits candidate suite names, not
+# yet filtered — pass the result through intersect_suites.
+#
+# POSIX sh has no `local`, so this scribbles on all_sources/new/final. Its one
+# call site invokes it inside $( ), which contains the damage; a direct call
+# would clobber the caller's variables. A test pins that there is still exactly
+# one call.
+resolve_suites() {
+  all_sources="$*"
+  while :; do
+    new=""
+    for s in $all_sources; do
+      deps=$(echo "$REVERSE" | awk -v src="$s" -F'\t' '$1==src {print $2}')
+      for d in $deps; do
+        case " $all_sources " in *" $d "*) ;; *) new="$new $d";; esac
+      done
+    done
+    [ -z "$new" ] && break
+    all_sources="$all_sources $new"
+  done
+
+  final=""
+  for s in $all_sources; do
+    final="$final $(src_to_suites "${s#cozystack.}")"
+  done
+  echo "$final"
+}
+
+# Escalation is a property of the changed path, not of the whole diff. A path
+# that reaches no runnable suite is covered by nothing and forces the full run
+# on its own account, whatever the rest of the diff selected.
+#
+# Reading that off an empty FINAL selection instead — which is what the old
+# safety net at the bottom did, and still does as a backstop — let any other
+# changed path that contributed a suite name swallow the escalation, with
+# nothing in the output to record that it happened (#3330). The shape that hits
+# it is ordinary rather than exotic: change a platform component, adjust the
+# Chainsaw test next to it, and the component's escalation disappears behind
+# that one suite.
+group_suites=""
+for g in $(echo "$selected_groups" | tr ' ' '\n' | sort -u); do
+  s=$(intersect_suites "$(resolve_suites "$(echo "$g" | tr ',' ' ')")")
+  if [ -z "$s" ]; then
+    # Say which changed path bought the full run. Every other escalation here
+    # names its cause on stderr, and this one is the common case rather than the
+    # rare one — most packages reach no suite of their own — so without a line
+    # "why did this pull request run everything" has no answer in the log. The
+    # sources are printed rather than the path because they are what the walk
+    # started from; the path that owns them is the one this group came from in
+    # the classification loop above.
+    echo "select-e2e: no runnable suite covers $(echo "$g" | tr ',' ' ') — escalating to the full suite" >&2
+    escalate_to_full_suite
+  fi
+  group_suites="$group_suites $s"
+done
+
+# Union of the graph-selected suites and the directly-selected ones from
+# per-suite edits. Walking the graph once per group rather than once over all of
+# them costs an extra walk per changed path and buys the escalation above; the
+# answer is unchanged, because reverse reachability distributes over union, so
+# the union of the per-group results is the set the single walk produced.
+final_apps=$(intersect_suites "$group_suites $selected_apps")
+
+# Backstop. Every graph path above either escalates or contributes a suite that
+# exists, and every rule that selects a suite by name membership-tests it first,
+# so no classification this file makes reaches here today. It stays for the next
+# rule that forgets to: selecting nothing would skip E2E outright, so failing
+# towards the full suite is the only safe way to be wrong. It prints the
+# directly-selected names, since a rule that skipped its membership test is the
+# likely way to get here; no test asserts the line.
+if [ -z "$final_apps" ]; then
+  echo "select-e2e: no runnable suite is named by '${selected_apps# }' — escalating to the full suite" >&2
+  escalate_to_full_suite
+fi
+
+echo "$final_apps"
diff --git a/hack/select-e2e_test.bats b/hack/select-e2e_test.bats
new file mode 100644
index 0000000000..6ce1988305
--- /dev/null
+++ b/hack/select-e2e_test.bats
@@ -0,0 +1,1313 @@
+#!/usr/bin/env bats
+# -----------------------------------------------------------------------------
+# Unit tests for hack/select-e2e.sh
+#
+# CI runs this file under Bats through `make bats-unit-tests`. It also remains
+# compatible with the legacy `hack/cozytest.sh` translator, whose awk parser
+# recognizes only @test blocks and a bare `}` on its own line. The tests avoid
+# `run`, `$status`, setup(), and teardown() for that compatibility path and use
+# direct shell assertions with inline fixture cleanup.
+#
+# Test-level EXIT traps replace Bats' own handler and hide failing TAP results.
+# Cleanup follows aborting assertions; see docs/agents/e2e-testing.md.
+#
+# Run with: bats hack/select-e2e_test.bats
+# -----------------------------------------------------------------------------
+
+load test_helper
+
+# Assert that a selection is the WHOLE suite list, not merely a long one.
+#
+# These asserts used to read `[ "$(echo "$output" | wc -w)" -gt 5 ]`, which is
+# satisfied by any selection of six or more suites. The regression worth
+# catching on every escalation path is partial escalation — a selector bug that
+# picks most suites but not all — and a threshold cannot see it: at the tree's
+# suite count, dropping most of them still passes. Equality can.
+#
+# The expected set is derived the way the script's full-suite branch derives it
+# rather than pinned as a literal, so adding or disabling a Chainsaw suite does
+# not need an edit at every full-suite assertion here.
+#
+# A helper rather than an inline one-liner because cozytest.sh runs each @test
+# under `set -x`: a bare failing `[ ... ]` prints the two values already
+# expanded, but not which side is which, and reading a whole-tree diff off a trace
+# line is exactly the moment a test stops being worth having.
+full_suite_list() {
+    find hack/e2e-chainsaw -mindepth 2 \( -not -type d -o -name chainsaw-test.yaml -o -name chainsaw-test.yml \) \
+      | sed -nE 's,^hack/e2e-chainsaw/([^/]+)/(.*/)?(chainsaw-test|[0-9]+-[^/]*)\.ya?ml$,\1,p' \
+      | sort -u | paste -sd ' ' -
+}
+
+assert_selection() {
+    if [ "$2" != "$3" ]; then
+        echo "$1" >&2
+        echo "  want: $3" >&2
+        echo "  got:  $2" >&2
+        exit 1
+    fi
+}
+
+assert_full_suite() {
+    assert_selection "expected the full Chainsaw suite" "$1" "$(full_suite_list)"
+}
+
+@test "single app diff selects only that suite" {
+    tmp=$(mktemp -d)
+    cp -r packages/core/platform/sources "$tmp/sources"
+    echo "packages/apps/postgres/values.yaml" > "$tmp/diff"
+    output=$(hack/select-e2e.sh "$tmp/diff" "$tmp/sources")
+    [ "$output" = "postgres" ]
+    rm -rf "$tmp"
+}
+
+@test "operator diff selects all dependent app suites" {
+    # postgres-operator is depended on by postgres-application, harbor-application
+    # (Harbor uses postgres as its backing DB), and monitoring-application (Grafana
+    # DB), each of which has a chainsaw suite.
+    tmp=$(mktemp -d)
+    cp -r packages/core/platform/sources "$tmp/sources"
+    echo "packages/system/postgres-operator/values.yaml" > "$tmp/diff"
+    output=$(hack/select-e2e.sh "$tmp/diff" "$tmp/sources")
+    echo "$output" | grep -wq postgres
+    echo "$output" | grep -wq harbor
+    if echo "$output" | grep -wq kafka; then
+        echo "operator diff must not trigger full suite; got: $output" >&2
+        exit 1
+    fi
+    rm -rf "$tmp"
+}
+
+@test "engine-dependency change does not fan out via the ordering edge" {
+    # cert-manager is a dependency of cozystack-engine, and every app declares
+    # dependsOn cozystack-engine purely as an INSTALL-ORDERING edge (the app's
+    # *-rd HelmRelease waits for the ApplicationDefinition CRD). That edge must
+    # not propagate test selection: a cert-manager change selects only its
+    # genuine direct dependents (postgres, harbor, ...), never unrelated apps
+    # like kafka that reach cert-manager solely through the engine.
+    tmp=$(mktemp -d)
+    cp -r packages/core/platform/sources "$tmp/sources"
+    echo "packages/system/cert-manager/values.yaml" > "$tmp/diff"
+    output=$(hack/select-e2e.sh "$tmp/diff" "$tmp/sources")
+    echo "$output" | grep -wq postgres
+    echo "$output" | grep -wq harbor
+    if echo "$output" | grep -wq kafka; then
+        echo "cert-manager change must not fan out via engine; got: $output" >&2
+        exit 1
+    fi
+    rm -rf "$tmp"
+}
+
+@test "cozystack-basics does not narrow to a suite that lands downstream of it" {
+    # The other install-ordering hub. Its edges exist so a namespace or a
+    # platform-wide policy is in place first, and it reaches no suite today, so
+    # it escalates. The hazard is what happens when a suite DOES land downstream:
+    # the walk would carry cozystack-basics into it and the platform's
+    # namespace-and-policy package would run that one suite instead of
+    # everything. Seeded here rather than waited for, by giving an app that owns
+    # a real suite an edge onto the hub — the shape #3426 produces for real,
+    # where enabling the site-router suite takes cozystack-basics from the full
+    # run to `site-router` alone.
+    tmp=$(mktemp -d)
+    cp -r packages/core/platform/sources "$tmp/sources"
+    yq -i '.spec.variants[0].dependsOn += ["cozystack.cozystack-basics"]' \
+        "$tmp/sources/redis-application.yaml"
+    # Premise: the seeded edge is the thing under test, so a redis change must
+    # still select redis. Without it the assertion below passes on an empty
+    # graph.
+    echo "packages/apps/redis/values.yaml" > "$tmp/diff"
+    output=$(hack/select-e2e.sh "$tmp/diff" "$tmp/sources")
+    echo "$output" | grep -wq redis
+    echo "packages/system/cozystack-basics/values.yaml" > "$tmp/diff"
+    output=$(hack/select-e2e.sh "$tmp/diff" "$tmp/sources")
+    assert_full_suite "$output"
+    rm -rf "$tmp"
+}
+
+@test "a CDI change selects a closure that keeps VMDisk and CDI" {
+    # kubevirt-cdi reaches vm-disk-application and nothing else runnable, so
+    # until vm-disk-application mapped to a suite every CDI change ran all of
+    # them. The vminstance suite creates a VMDisk and asserts the DataVolume
+    # behind it, so it is the suite that covers CDI.
+    tmp=$(mktemp -d)
+    cp -r packages/core/platform/sources "$tmp/sources"
+    echo "packages/system/kubevirt-cdi/values.yaml" > "$tmp/diff"
+    output=$(hack/select-e2e.sh "$tmp/diff" "$tmp/sources")
+    [ "$output" = "vminstance" ]
+    closure=$(hack/select-install.sh "$output" "$tmp/sources")
+    printf '%s\n' "$closure" | tr ' ' '\n' | grep -Fxq cozystack.vm-disk-application
+    printf '%s\n' "$closure" | tr ' ' '\n' | grep -Fxq cozystack.kubevirt-cdi
+    rm -rf "$tmp"
+}
+
+@test "a CNI change selects every suite the graph can reach" {
+    # Named for what it measures rather than for the full suite it once claimed.
+    # `packages/system/cilium` is owned by cozystack.networking and resolves
+    # through the dependency graph, not through full_suite_pattern, so what this
+    # measures is "every suite reachable from networking".
+    #
+    # That used to be 19 of the 21 suites, subtracted here by name: the mapping
+    # covered *-application sources plus external-dns, so the walk reached
+    # cozystack.kuberture and cozystack.securitygroup-controller and the filter
+    # dropped them again — a CNI change ran neither of the two controller suites
+    # most likely to regress from it. With the mapping no longer restricted to
+    # app-shaped names, both round-trip and the reachable set is the whole tree.
+    # The subtraction is gone rather than inverted: leaving it as an exclusion
+    # list would keep the assertion green if the walk stopped reaching them for
+    # some unrelated reason.
+    tmp=$(mktemp -d)
+    cp -r packages/core/platform/sources "$tmp/sources"
+    script="$PWD/hack/select-e2e.sh"
+    echo "packages/system/cilium/values.yaml" > "$tmp/diff"
+    output=$(hack/select-e2e.sh "$tmp/diff" "$tmp/sources")
+    assert_selection "expected every graph-reachable suite" "$output" "$(full_suite_list)"
+    # Reachable and full now agree, so the equality above can no longer tell a
+    # walk that reached everything from an escalation that printed everything.
+    # Re-run against a tree holding one suite networking reaches and one no
+    # source names at all: only a real walk leaves the second out, and an
+    # escalation prints both.
+    mkdir -p "$tmp/tree/hack/e2e-chainsaw/kuberture" "$tmp/tree/hack/e2e-chainsaw/zz-no-source"
+    touch "$tmp/tree/hack/e2e-chainsaw/kuberture/chainsaw-test.yaml" \
+          "$tmp/tree/hack/e2e-chainsaw/zz-no-source/chainsaw-test.yaml"
+    scoped=$(cd "$tmp/tree" && "$script" "$tmp/diff" "$tmp/sources")
+    assert_selection "a CNI change must reach kuberture through the graph, not by escalating" \
+        "$scoped" "kuberture"
+    rm -rf "$tmp"
+}
+
+@test "library change triggers full suite" {
+    tmp=$(mktemp -d)
+    cp -r packages/core/platform/sources "$tmp/sources"
+    echo "packages/library/cozy-lib/templates/_helpers.tpl" > "$tmp/diff"
+    output=$(hack/select-e2e.sh "$tmp/diff" "$tmp/sources" 2>"$tmp/err")
+    assert_full_suite "$output"
+    # full_suite_pattern is the commonest escalation cause by a wide margin, so a
+    # full run with nothing on stderr leaves the usual answer to "why did
+    # everything run" out of the log entirely. Matched on the path and the rule
+    # name rather than on the word "escalating", which every other reason line
+    # here also prints.
+    if ! grep -q "select-e2e:.*cozy-lib.*full_suite_pattern" "$tmp/err"; then
+        echo "a full_suite_pattern match must name the path that caused it; stderr was:" >&2
+        cat "$tmp/err" >&2
+        exit 1
+    fi
+    rm -rf "$tmp"
+}
+
+@test "docs-only diff selects nothing" {
+    tmp=$(mktemp -d)
+    cp -r packages/core/platform/sources "$tmp/sources"
+    echo "docs/README.md" > "$tmp/diff"
+    output=$(hack/select-e2e.sh "$tmp/diff" "$tmp/sources")
+    [ -z "$output" ]
+    rm -rf "$tmp"
+}
+
+@test "kubernetes-application maps to the two kubernetes suites" {
+    tmp=$(mktemp -d)
+    cp -r packages/core/platform/sources "$tmp/sources"
+    echo "packages/apps/kubernetes/values.yaml" > "$tmp/diff"
+    output=$(hack/select-e2e.sh "$tmp/diff" "$tmp/sources")
+    echo "$output" | grep -q "kubernetes-latest"
+    echo "$output" | grep -q "kubernetes-previous"
+    # OIDC System -> CustomConfig lifecycle coverage is folded into latest.
+    if echo "$output" | grep -q "kubernetes-oidc-"; then
+        echo "FAIL: selector still names the removed OIDC suites" >&2
+        false
+    fi
+    rm -rf "$tmp"
+}
+
+@test "dashboards-only diff selects nothing (path is plural)" {
+    tmp=$(mktemp -d)
+    cp -r packages/core/platform/sources "$tmp/sources"
+    echo "dashboards/gpu/gpu-fleet.json" > "$tmp/diff"
+    output=$(hack/select-e2e.sh "$tmp/diff" "$tmp/sources")
+    [ -z "$output" ]
+    rm -rf "$tmp"
+}
+
+@test "shared E2E helper script triggers full suite" {
+    tmp=$(mktemp -d)
+    cp -r packages/core/platform/sources "$tmp/sources"
+    echo "hack/e2e-chainsaw/_lib/run-kubernetes.sh" > "$tmp/diff"
+    output=$(hack/select-e2e.sh "$tmp/diff" "$tmp/sources" 2>"$tmp/err")
+    assert_full_suite "$output"
+    if ! grep -q "select-e2e:.*run-kubernetes.sh.*shared by every Chainsaw suite" "$tmp/err"; then
+        echo "a shared-Chainsaw escalation must name the file that caused it; stderr was:" >&2
+        cat "$tmp/err" >&2
+        exit 1
+    fi
+    rm -rf "$tmp"
+}
+
+@test "chainsaw config change triggers full suite" {
+    tmp=$(mktemp -d)
+    cp -r packages/core/platform/sources "$tmp/sources"
+    echo "hack/e2e-chainsaw/.chainsaw.yaml" > "$tmp/diff"
+    output=$(hack/select-e2e.sh "$tmp/diff" "$tmp/sources")
+    assert_full_suite "$output"
+    rm -rf "$tmp"
+}
+
+@test "install bats triggers full suite" {
+    tmp=$(mktemp -d)
+    cp -r packages/core/platform/sources "$tmp/sources"
+    echo "hack/e2e-install-cozystack.bats" > "$tmp/diff"
+    output=$(hack/select-e2e.sh "$tmp/diff" "$tmp/sources")
+    assert_full_suite "$output"
+    rm -rf "$tmp"
+}
+
+@test "per-suite edit selects only that suite, never escalates" {
+    tmp=$(mktemp -d)
+    cp -r packages/core/platform/sources "$tmp/sources"
+    echo "hack/e2e-chainsaw/redis/chainsaw-test.yaml" > "$tmp/diff"
+    output=$(hack/select-e2e.sh "$tmp/diff" "$tmp/sources")
+    [ "$output" = "redis" ]
+    rm -rf "$tmp"
+}
+
+@test "pull-requests workflow change triggers full suite" {
+    tmp=$(mktemp -d)
+    cp -r packages/core/platform/sources "$tmp/sources"
+    echo ".github/workflows/pull-requests.yaml" > "$tmp/diff"
+    output=$(hack/select-e2e.sh "$tmp/diff" "$tmp/sources")
+    assert_full_suite "$output"
+    rm -rf "$tmp"
+}
+
+@test "backup example harness edit selects its app suite" {
+    tmp=$(mktemp -d)
+    cp -r packages/core/platform/sources "$tmp/sources"
+    echo "examples/backups/postgres/run-all.sh" > "$tmp/diff"
+    output=$(hack/select-e2e.sh "$tmp/diff" "$tmp/sources")
+    [ "$output" = "postgres" ]
+    rm -rf "$tmp"
+}
+
+@test "redis backup harness edit selects the valkey suite that also runs it" {
+    # valkey-backup-roundtrip drives examples/backups/redis with
+    # APP_KIND=Valkey, so a change to that harness must run both suites.
+    tmp=$(mktemp -d)
+    cp -r packages/core/platform/sources "$tmp/sources"
+    echo "examples/backups/redis/00-helpers.sh" > "$tmp/diff"
+    output=$(hack/select-e2e.sh "$tmp/diff" "$tmp/sources")
+    [ "$output" = "redis valkey" ]
+    rm -rf "$tmp"
+}
+
+@test "a velero change selects the vminstance suite" {
+    tmp=$(mktemp -d)
+    cp -r packages/core/platform/sources "$tmp/sources"
+    echo "packages/system/velero/values.yaml" > "$tmp/diff"
+    output=$(hack/select-e2e.sh "$tmp/diff" "$tmp/sources")
+    rm -rf "$tmp"
+    case " $output " in *" vminstance "*) ;; *) echo "a velero change selected '$output'" >&2; exit 1 ;; esac
+}
+
+@test "vmi/vmdisk backup harness edit selects the vminstance suite" {
+    tmp=$(mktemp -d)
+    cp -r packages/core/platform/sources "$tmp/sources"
+    for f in examples/backups/vmi/run-all.sh examples/backups/vmdisk/run-all.sh; do
+        echo "$f" > "$tmp/diff"
+        output=$(hack/select-e2e.sh "$tmp/diff" "$tmp/sources")
+        [ "$output" = "vminstance" ]
+    done
+    rm -rf "$tmp"
+}
+
+@test "vmi restore-to-copy step, which the suite skips, selects nothing" {
+    tmp=$(mktemp -d)
+    cp -r packages/core/platform/sources "$tmp/sources"
+    echo "examples/backups/vmi/07-restore-to-copy.sh" > "$tmp/diff"
+    output=$(hack/select-e2e.sh "$tmp/diff" "$tmp/sources") || true
+    rm -rf "$tmp"
+    [ -z "$output" ]
+}
+
+@test "backup example without a matching suite selects nothing" {
+    tmp=$(mktemp -d)
+    cp -r packages/core/platform/sources "$tmp/sources"
+    echo "examples/backups/no-such-app/run.sh" > "$tmp/diff"
+    output=$(hack/select-e2e.sh "$tmp/diff" "$tmp/sources") || true
+    [ -z "$output" ]
+    rm -rf "$tmp"
+}
+
+@test "a file directly under examples/backups escalates instead of selecting nothing" {
+    # A file beside the per-app directories rather than inside one belongs to
+    # no single walkthrough, so it is treated as shared by all of them. It
+    # matched neither backup rule and fell to examples/ in
+    # inert_config_pattern, so an edit to it selected nothing.
+    # README.md stays inert through the *.md rule, which runs first.
+    tmp=$(mktemp -d)
+    cp -r packages/core/platform/sources "$tmp/sources"
+    for diff in "examples/backups/common.sh" \
+        "examples/backups/common.sh examples/backups/postgres/run-all.sh"; do
+        printf '%s\n' $diff > "$tmp/diff"
+        output=$(hack/select-e2e.sh "$tmp/diff" "$tmp/sources" 2>"$tmp/err")
+        assert_selection "a loose backup file was not escalated for: $diff" \
+            "$output" "$(full_suite_list)"
+        if ! grep -q "select-e2e: 'examples/backups/common.sh' belongs to no single backup walkthrough" "$tmp/err"; then
+            echo "the escalation must name the file; stderr was:" >&2
+            cat "$tmp/err" >&2
+            exit 1
+        fi
+    done
+    echo examples/backups/README.md > "$tmp/diff"
+    output=$(hack/select-e2e.sh "$tmp/diff" "$tmp/sources")
+    [ -z "$output" ]
+    rm -rf "$tmp"
+}
+
+@test "a shared backup helper escalates instead of selecting nothing" {
+    # examples/backups/_lib/ is sourced by the backup walkthroughs, so it is
+    # shared material the way hack/e2e-chainsaw/_lib/ is. Read as an app named
+    # _lib it matched no suite and selected nothing, which both lanes take as
+    # "skip Chainsaw": a change to every walkthrough at once would test none.
+    # Also pinned beside an app path, where selecting only that app would pass
+    # a test that checked for a non-empty selection.
+    tmp=$(mktemp -d)
+    cp -r packages/core/platform/sources "$tmp/sources"
+    for diff in "examples/backups/_lib/wait-helpers.sh" \
+        "examples/backups/_lib/wait-helpers.sh examples/backups/postgres/run-all.sh"; do
+        printf '%s\n' $diff > "$tmp/diff"
+        output=$(hack/select-e2e.sh "$tmp/diff" "$tmp/sources" 2>"$tmp/err")
+        assert_selection "a shared backup helper was not escalated for: $diff" \
+            "$output" "$(full_suite_list)"
+        if ! grep -q "select-e2e: 'examples/backups/_lib/wait-helpers.sh' is shared by every backup walkthrough" "$tmp/err"; then
+            echo "the escalation must name the helper; stderr was:" >&2
+            cat "$tmp/err" >&2
+            exit 1
+        fi
+    done
+    rm -rf "$tmp"
+}
+
+# --- #3392: every path is classified; unclassified escalates -----------------
+#
+# The bug these cover: an unrecognised path used to select nothing, both lanes
+# read an empty selection as "skip Chainsaw", and the required "E2E Tests"
+# status was then posted green with no suite run. Each test below pins one side
+# of the classification — escalate, or skip by an explicit rule.
+
+@test "hack/*.mk triggers full suite (build flags of every image)" {
+    tmp=$(mktemp -d)
+    cp -r packages/core/platform/sources "$tmp/sources"
+    echo "hack/common-envs.mk" > "$tmp/diff"
+    output=$(hack/select-e2e.sh "$tmp/diff" "$tmp/sources")
+    assert_full_suite "$output"
+    rm -rf "$tmp"
+}
+
+@test "the fork e2e workflow triggers full suite" {
+    tmp=$(mktemp -d)
+    cp -r packages/core/platform/sources "$tmp/sources"
+    echo ".github/workflows/e2e-fork.yaml" > "$tmp/diff"
+    output=$(hack/select-e2e.sh "$tmp/diff" "$tmp/sources")
+    assert_full_suite "$output"
+    rm -rf "$tmp"
+}
+
+@test "pkg/ triggers full suite (shipped Go code)" {
+    tmp=$(mktemp -d)
+    cp -r packages/core/platform/sources "$tmp/sources"
+    echo "pkg/cozystack/registry.go" > "$tmp/diff"
+    output=$(hack/select-e2e.sh "$tmp/diff" "$tmp/sources")
+    assert_full_suite "$output"
+    rm -rf "$tmp"
+}
+
+@test "go.mod triggers full suite" {
+    tmp=$(mktemp -d)
+    cp -r packages/core/platform/sources "$tmp/sources"
+    echo "go.mod" > "$tmp/diff"
+    output=$(hack/select-e2e.sh "$tmp/diff" "$tmp/sources")
+    assert_full_suite "$output"
+    rm -rf "$tmp"
+}
+
+@test "hack/lib helper triggers full suite" {
+    tmp=$(mktemp -d)
+    cp -r packages/core/platform/sources "$tmp/sources"
+    echo "hack/lib/image-refs.sh" > "$tmp/diff"
+    output=$(hack/select-e2e.sh "$tmp/diff" "$tmp/sources")
+    assert_full_suite "$output"
+    rm -rf "$tmp"
+}
+
+@test "an unclassified path escalates instead of selecting nothing" {
+    tmp=$(mktemp -d)
+    cp -r packages/core/platform/sources "$tmp/sources"
+    echo "brand-new-top-level/thing.conf" > "$tmp/diff"
+    output=$(hack/select-e2e.sh "$tmp/diff" "$tmp/sources" 2>"$tmp/err")
+    assert_full_suite "$output"
+    # The reason line is asserted as well as the selection, and this branch is
+    # the one that most needs it: it is #3392's own guard, the escalation whose
+    # cause is hardest to work out from the outside (the answer is "a path nobody
+    # has classified", which the selection cannot express), and the only action it
+    # asks for is to go and classify the path it names. Deleting this echo used to
+    # leave the whole file green while the word "unclassified" appeared in seven
+    # comments here, so the branch read as covered without being pinned.
+    if ! grep -q "select-e2e:.*unclassified path.*thing\.conf" "$tmp/err"; then
+        echo "an unclassified path must be named on stderr; stderr was:" >&2
+        cat "$tmp/err" >&2
+        exit 1
+    fi
+    rm -rf "$tmp"
+}
+
+@test "inert repo meta selects nothing" {
+    tmp=$(mktemp -d)
+    cp -r packages/core/platform/sources "$tmp/sources"
+    printf '%s\n' .gitignore LICENSE .pre-commit-config.yaml > "$tmp/diff"
+    output=$(hack/select-e2e.sh "$tmp/diff" "$tmp/sources")
+    [ -z "$output" ]
+    rm -rf "$tmp"
+}
+
+@test "a non-e2e workflow selects nothing, an e2e one still escalates" {
+    tmp=$(mktemp -d)
+    cp -r packages/core/platform/sources "$tmp/sources"
+    # .github/ is inert as a directory, but the escalation for the workflows
+    # that run the suite is checked first and must win.
+    echo ".github/workflows/tags.yaml" > "$tmp/diff"
+    output=$(hack/select-e2e.sh "$tmp/diff" "$tmp/sources")
+    [ -z "$output" ]
+    echo ".github/workflows/e2e-tag.yaml" > "$tmp/diff"
+    output=$(hack/select-e2e.sh "$tmp/diff" "$tmp/sources")
+    assert_full_suite "$output"
+    rm -rf "$tmp"
+}
+
+@test "a README inside an escalating tree stays inert" {
+    tmp=$(mktemp -d)
+    cp -r packages/core/platform/sources "$tmp/sources"
+    # packages/core/ escalates, but *.md is matched before that so a doc edit
+    # under it does not burn a full run.
+    echo "packages/core/installer/README.md" > "$tmp/diff"
+    output=$(hack/select-e2e.sh "$tmp/diff" "$tmp/sources")
+    [ -z "$output" ]
+    rm -rf "$tmp"
+}
+
+@test "an inert path alongside a real one does not mask the selection" {
+    tmp=$(mktemp -d)
+    cp -r packages/core/platform/sources "$tmp/sources"
+    printf '%s\n' .gitignore packages/apps/postgres/values.yaml > "$tmp/diff"
+    output=$(hack/select-e2e.sh "$tmp/diff" "$tmp/sources")
+    [ "$output" = "postgres" ]
+    rm -rf "$tmp"
+}
+
+# The classification above is only total if every line reaches the loop that
+# applies it. POSIX read assigns the last line and returns non-zero when the
+# input has no trailing newline, so a plain `while read` drops it, and the
+# fall-through that escalates an unrecognised path lives inside the body that
+# drop skips. `git diff --name-only` always terminates its output, so the bug is
+# invisible to a caller that pipes it; a caller assembling the list itself sees
+# it immediately. Both cases below are red without `|| [ -n "$file" ]`.
+#
+# Cleanup here, as everywhere in this file, is the last statement of the body
+# rather than a `trap ... EXIT`: that trap replaces the one the bats binary
+# installs for its own bookkeeping, and a test failing under it can print no TAP
+# line at all, which is the opposite of what a regression pin is for. Last, not
+# before the assertion, so that `set -e` leaves the scratch directory behind on
+# failure for inspection (docs/agents/e2e-testing.md §3).
+
+@test "editing a disabled chainsaw suite selects nothing" {
+    # A .disabled suite runs nowhere, so its edits are the one file class that
+    # provably cannot regress a test — and before this rule they bought the
+    # most expensive outcome the selector has. The suffix was ignored when
+    # deriving the suite name, the derived name matched no existing suite, the
+    # final intersection came back empty, and the empty-selection safety net
+    # escalated to the full run.
+    tmp=$(mktemp -d)
+    cp -r packages/core/platform/sources "$tmp/sources"
+    echo "hack/e2e-chainsaw/kubernetes-proxmox/chainsaw-test.yaml.disabled" > "$tmp/diff"
+    output=$(hack/select-e2e.sh "$tmp/diff" "$tmp/sources")
+    [ -z "$output" ]
+    rm -rf "$tmp"
+}
+
+@test "a disabled suite alongside a live one does not mask the selection" {
+    # The inert rule must drop the disabled path only, not the whole diff: the
+    # cheap way to make the test above pass is a rule that returns early, and
+    # that would silently unselect real work committed in the same change.
+    tmp=$(mktemp -d)
+    cp -r packages/core/platform/sources "$tmp/sources"
+    printf '%s\n' hack/e2e-chainsaw/kubernetes-proxmox/chainsaw-test.yaml.disabled \
+        packages/apps/postgres/values.yaml > "$tmp/diff"
+    output=$(hack/select-e2e.sh "$tmp/diff" "$tmp/sources")
+    [ "$output" = "postgres" ]
+    rm -rf "$tmp"
+}
+
+@test "a top-level unit bats file selects nothing" {
+    # The non-e2e hack/*.bats files used to escalate to the full suite. The
+    # root Makefile is the authority on which of them the e2e sandbox runs:
+    # BATS_UNIT_FILES := $(filter-out hack/e2e-%.bats,$(wildcard hack/*.bats))
+    # keeps exactly these for the unit lane, and packages/core/testing's recipes
+    # execute only the ones it filters out. So the sandbox never runs one of
+    # these, and no Chainsaw suite can regress from an edit to one.
+    #
+    # Not a green gate with nothing behind it: `make unit-tests` DOES run them,
+    # gated on pull-requests.yaml's `code` output, which is computed there as
+    # "any path outside docs/" and never from this script.
+    tmp=$(mktemp -d)
+    cp -r packages/core/platform/sources "$tmp/sources"
+    # Premise, read off the Makefile rather than assumed: the unit set is the
+    # hack/*.bats files whose names do not start with e2e-, and the file under
+    # test has to be in it.
+    grep -Fq 'BATS_UNIT_FILES := $(filter-out hack/e2e-%.bats,$(wildcard hack/*.bats))' Makefile
+    printf '%s\n' hack/select-e2e_test.bats hack/md-no-hardwrap.bats > "$tmp/diff"
+    output=$(hack/select-e2e.sh "$tmp/diff" "$tmp/sources")
+    [ -z "$output" ]
+    # The e2e-prefixed ones are the sandbox's own harness and must still
+    # escalate; the narrowing lives one alternative away from them in
+    # full_suite_pattern, so pin both sides of the prefix.
+    for f in hack/e2e-install-cozystack.bats hack/e2e-prepare-cluster.bats hack/e2e-test-openapi.bats; do
+        echo "$f" > "$tmp/diff"
+        output=$(hack/select-e2e.sh "$tmp/diff" "$tmp/sources" 2>/dev/null)
+        assert_full_suite "$output"
+    done
+    # And an inert unit bats file beside a real app path must not mask it.
+    printf '%s\n' hack/select-e2e_test.bats packages/apps/postgres/values.yaml > "$tmp/diff"
+    output=$(hack/select-e2e.sh "$tmp/diff" "$tmp/sources")
+    [ "$output" = "postgres" ]
+    rm -rf "$tmp"
+}
+
+@test "the shared unit Bats helper selects nothing" {
+    # test_helper.bash is loaded only by BATS_UNIT_FILES. Enumerate this exact
+    # helper as inert rather than matching hack/*.bash: a future production
+    # helper must still hit the unclassified fail-safe until someone decides
+    # which e2e lane exercises it.
+    tmp=$(mktemp -d)
+    cp -r packages/core/platform/sources "$tmp/sources"
+    echo "hack/test_helper.bash" > "$tmp/diff"
+    output=$(hack/select-e2e.sh "$tmp/diff" "$tmp/sources")
+    [ -z "$output" ]
+    # Inert means this path contributes nothing; it must not mask a real app
+    # path beside it.
+    printf '%s\n' hack/test_helper.bash packages/apps/postgres/values.yaml > "$tmp/diff"
+    output=$(hack/select-e2e.sh "$tmp/diff" "$tmp/sources")
+    [ "$output" = "postgres" ]
+    rm -rf "$tmp"
+}
+
+@test "every hack/*.bats file lands on the lane its name says" {
+    # The rule above is a claim about every hack/*.bats, asserted on two. This
+    # pins the claim itself: for every hack/*.bats in the tree, the selector's
+    # verdict must agree with the Makefile's split -- e2e-prefixed escalates,
+    # everything else selects nothing. A file added with a name that fits neither
+    # lane's expectation shows up here rather than on the next PR that touches it.
+    tmp=$(mktemp -d)
+    cp -r packages/core/platform/sources "$tmp/sources"
+    full=$(full_suite_list)
+    for f in hack/*.bats; do
+        echo "$f" > "$tmp/diff"
+        output=$(hack/select-e2e.sh "$tmp/diff" "$tmp/sources" 2>/dev/null)
+        case "$f" in
+            hack/e2e-*) want="$full" ;;
+            *)          want="" ;;
+        esac
+        assert_selection "wrong lane for $f" "$output" "$want"
+    done
+    rm -rf "$tmp"
+}
+
+@test "a per-app e2e bats file selects that app's suite" {
+    # hack/e2e-apps/<name>.bats is the pre-Chainsaw per-app BATS suite, named
+    # after the app exactly as a Chainsaw suite directory is. Those paths matched
+    # no rule at all and escalated as unclassified -- 5 of the last 150 merged
+    # pull requests, all of them the migration deleting one of these files.
+    #
+    # Mapped rather than marked inert: the files formerly kept here were wired to
+    # nothing after migration, and inert would go quietly wrong if this layout
+    # returns. This fixture asserts the rule independently of the historical file
+    # inventory.
+    tmp=$(mktemp -d)
+    cp -r packages/core/platform/sources "$tmp/sources"
+    echo "hack/e2e-apps/postgres.bats" > "$tmp/diff"
+    output=$(hack/select-e2e.sh "$tmp/diff" "$tmp/sources")
+    [ "$output" = "postgres" ]
+    # Alongside a real app path it must union, not replace -- the cheap way to
+    # pass the line above is a rule that returns early.
+    printf '%s\n' hack/e2e-apps/postgres.bats packages/apps/redis/values.yaml > "$tmp/diff"
+    output=$(hack/select-e2e.sh "$tmp/diff" "$tmp/sources")
+    [ "$output" = "postgres redis" ]
+    rm -rf "$tmp"
+}
+
+@test "a per-app e2e bats file naming no suite escalates on its own account" {
+    # The other half of the mapping, and the half that has to be decided HERE
+    # rather than by the final intersection. Deferring it made the verdict depend
+    # on the rest of the diff: alone the selection emptied and the backstop
+    # escalated, but beside any path that contributed a suite the escalation
+    # disappeared and the run narrowed to that suite with nothing on stderr --
+    # the merge-before-escalate shape #3330 removed from the graph walk.
+    #
+    # So both diffs are asserted, and the mixed one is the regression pin: the
+    # isolated case passes with the escalation deferred and cannot see the bug.
+    tmp=$(mktemp -d)
+    cp -r packages/core/platform/sources "$tmp/sources"
+    # Premise: the name must really be absent from the suite list, or this
+    # measures the matched branch.
+    if full_suite_list | tr ' ' '\n' | grep -Fxq no-such-app; then
+        echo "premise broken: no-such-app is a real suite" >&2
+        exit 1
+    fi
+    echo "hack/e2e-apps/no-such-app.bats" > "$tmp/diff"
+    output=$(hack/select-e2e.sh "$tmp/diff" "$tmp/sources" 2>"$tmp/err")
+    assert_full_suite "$output"
+    if ! grep -q "select-e2e:.*no-such-app.*names no runnable suite" "$tmp/err"; then
+        echo "an unmatched e2e-apps basename must name itself; stderr was:" >&2
+        cat "$tmp/err" >&2
+        exit 1
+    fi
+    printf '%s\n' hack/e2e-apps/no-such-app.bats packages/apps/redis/values.yaml > "$tmp/diff"
+    output=$(hack/select-e2e.sh "$tmp/diff" "$tmp/sources" 2>"$tmp/err")
+    assert_selection "an unmatched per-app bats file was swallowed by another path's suite" \
+        "$output" "$(full_suite_list)"
+    if ! grep -q "select-e2e:.*no-such-app.*names no runnable suite" "$tmp/err"; then
+        echo "the escalation must still be named in a mixed diff; stderr was:" >&2
+        cat "$tmp/err" >&2
+        exit 1
+    fi
+    rm -rf "$tmp"
+}
+
+@test "a nested path under e2e-apps escalates instead of being read as a suite" {
+    # POSIX case matches `/` with `*`, so the hack/e2e-apps/ arm sees nested paths
+    # too. With an unanchored capture the sed turned
+    # hack/e2e-apps/fixtures/postgres.bats into the "suite" fixtures/postgres --
+    # a name no suite carries, so the outcome was right by accident while the
+    # reason line printed a path where a suite name belongs.
+    #
+    # Nothing nested exists there today, which is exactly why the rule has to
+    # state what it does with one instead of letting it fall out of a regex.
+    tmp=$(mktemp -d)
+    cp -r packages/core/platform/sources "$tmp/sources"
+    [ ! -d hack/e2e-apps/fixtures ]
+    for f in hack/e2e-apps/fixtures/postgres.bats hack/e2e-apps/helpers.sh; do
+        echo "$f" > "$tmp/diff"
+        output=$(hack/select-e2e.sh "$tmp/diff" "$tmp/sources" 2>"$tmp/err")
+        assert_full_suite "$output"
+        if ! grep -q "select-e2e:.*shared material" "$tmp/err"; then
+            echo "a non-per-app path under e2e-apps must escalate as shared material; stderr was:" >&2
+            cat "$tmp/err" >&2
+            exit 1
+        fi
+        # The capture must never leak a path fragment into the suite name.
+        if grep -q "fixtures/postgres'" "$tmp/err"; then
+            echo "the reason line named a path where a suite name belongs; stderr was:" >&2
+            cat "$tmp/err" >&2
+            exit 1
+        fi
+    done
+    rm -rf "$tmp"
+}
+
+@test "helm-unittest fixtures and the enumerated gitattributes select nothing" {
+    # packages/tests/ is a helm-unittest fixture chart: changing a test OF
+    # cozy-lib does not change cozy-lib, no PackageSource lists these paths as a
+    # component, and nothing installs them. The .gitattributes named here hold
+    # nothing but linguist-generated markers, which reach no build, chart or test.
+    # Both classes fell through as unclassified and bought a full run -- 6 of the
+    # last 150 merged pull requests between them.
+    tmp=$(mktemp -d)
+    cp -r packages/core/platform/sources "$tmp/sources"
+    printf '%s\n' packages/tests/cozy-lib-tests/tests/quota_test.yaml \
+        packages/tests/cozy-lib-tests/templates/tests/quota.yaml \
+        packages/system/.gitattributes \
+        packages/system/backup-controller/definitions/.gitattributes \
+        packages/system/backupstrategy-controller/definitions/.gitattributes > "$tmp/diff"
+    output=$(hack/select-e2e.sh "$tmp/diff" "$tmp/sources")
+    [ -z "$output" ]
+    # The .gitattributes rule is an ENUMERATION and must stay one. The
+    # justification is what those files contain, and the filename does not carry
+    # it -- .gitattributes can also set filter, eol, working-tree-encoding and
+    # export-subst, each of which changes what lands in the working tree and so
+    # what gets built. A by-name rule would make such a file inert in silence, so
+    # pin that a path not on the list is still classified by its own rule: at the
+    # repo root that is the unclassified fall-through.
+    echo ".gitattributes" > "$tmp/diff"
+    output=$(hack/select-e2e.sh "$tmp/diff" "$tmp/sources" 2>/dev/null)
+    assert_full_suite "$output"
+    # The library itself is a different question and must still escalate: these
+    # fixtures test cozy-lib, so an inert rule reaching the library would be the
+    # dangerous over-reach here.
+    echo "packages/library/cozy-lib/templates/_quota.tpl" > "$tmp/diff"
+    output=$(hack/select-e2e.sh "$tmp/diff" "$tmp/sources" 2>/dev/null)
+    assert_full_suite "$output"
+    # And an inert fixture beside a real app path must not mask the selection.
+    printf '%s\n' packages/tests/cozy-lib-tests/tests/quota_test.yaml \
+        packages/apps/postgres/values.yaml > "$tmp/diff"
+    output=$(hack/select-e2e.sh "$tmp/diff" "$tmp/sources")
+    [ "$output" = "postgres" ]
+    rm -rf "$tmp"
+}
+
+@test "a broken yq is named rather than passed off as an empty graph" {
+    # Both indexes are one yq each, read as `$(build_owners_index | sort -u)`,
+    # so the pipeline reports sort's status and set -e never sees yq's. A
+    # missing binary or a malformed PackageSource then yields an empty index,
+    # every path falls through to escalation, and the run is a full suite that
+    # looks exactly like intended conservatism. Nothing distinguishes it from
+    # "no owners matched", so nobody is told the selector stopped working.
+    #
+    # The escalation is the right outcome and is asserted here too; what this
+    # pins is that it comes with a line naming yq.
+    #
+    # The exit status is asserted as ZERO on purpose, and it is the difference
+    # between this case and the two below it. What a broken yq costs is the
+    # dependency graph, and the full suite is a correct answer without one, so
+    # the script still answers. When the SUITE LIST is what broke there is no
+    # correct answer left to give and the script exits non-zero instead. Both
+    # halves are pinned so the header and docs cannot drift into claiming this
+    # one reddens the gate — it does not; it is conservative and quiet.
+    tmp=$(mktemp -d)
+    cp -r packages/core/platform/sources "$tmp/sources"
+    mkdir "$tmp/bin"
+    printf '#!/bin/sh\necho "yq: broken fixture" >&2\nexit 1\n' > "$tmp/bin/yq"
+    chmod +x "$tmp/bin/yq"
+    echo "packages/apps/postgres/values.yaml" > "$tmp/diff"
+    rc=0
+    output=$(PATH="$tmp/bin:$PATH" hack/select-e2e.sh "$tmp/diff" "$tmp/sources" 2>"$tmp/err") || rc=$?
+    if [ "$rc" -ne 0 ]; then
+        echo "a broken yq must still answer with the full suite, not exit $rc" >&2
+        cat "$tmp/err" >&2
+        exit 1
+    fi
+    # Matched on the script's own prefix, not on the word alone: the stub writes
+    # to stderr the way a real yq does, so a bare `grep yq` passes on the
+    # fixture's noise and pins nothing.
+    if ! grep -q 'select-e2e:.*yq' "$tmp/err"; then
+        echo "a yq failure must be reported by select-e2e itself; stderr was:" >&2
+        cat "$tmp/err" >&2
+        exit 1
+    fi
+    assert_full_suite "$output"
+    rm -rf "$tmp"
+}
+
+@test "a broken find is reported rather than yielding an empty suite list" {
+    # The suite list is built as `$(find ... | sed | sort)`, which reports
+    # sort's status and never find's — the same blindness as the yq indexes
+    # above, in a worse place: every escalation prints that list, so a silent
+    # failure here turns "run everything" into a run of nothing.
+    tmp=$(mktemp -d)
+    cp -r packages/core/platform/sources "$tmp/sources"
+    mkdir "$tmp/bin"
+    printf '#!/bin/sh\necho "find: broken fixture" >&2\nexit 1\n' > "$tmp/bin/find"
+    chmod +x "$tmp/bin/find"
+    echo "go.mod" > "$tmp/diff"
+    rc=0
+    output=$(PATH="$tmp/bin:$PATH" hack/select-e2e.sh "$tmp/diff" "$tmp/sources" 2>"$tmp/err") || rc=$?
+    if [ "$rc" -eq 0 ]; then
+        echo "a broken find must fail the run; it exited 0 with output: '$output'" >&2
+        exit 1
+    fi
+    if ! grep -q 'select-e2e:.*find' "$tmp/err"; then
+        echo "a find failure must be reported by select-e2e itself; stderr was:" >&2
+        cat "$tmp/err" >&2
+        exit 1
+    fi
+    rm -rf "$tmp"
+}
+
+@test "an empty suite list is fatal whatever the diff classifies as" {
+    # Checked once where the list is built, not at the escalation branches,
+    # because an empty list corrupts more than those. The escalations would
+    # print it, and a blank selection is what both lanes read as "skip
+    # Chainsaw" before posting the required status green — the outcome meaning
+    # "run everything" delivering a run of nothing. But the
+    # examples/backups/<app>/ rule escalates nothing and still consults the
+    # list as a membership test, so with the list empty a backup-harness edit
+    # that should run its suite reports nothing to run instead — and that one
+    # is indistinguishable from a legitimately empty selection.
+    #
+    # Run from a tree whose hack/e2e-chainsaw exists but holds no
+    # chainsaw-test.yaml, so find succeeds and matches nothing — the state a
+    # moved directory or a wrong working directory produces. All three diff
+    # classes are exercised: one that escalates, one that selects by
+    # membership, and one that legitimately selects nothing. The middle two
+    # exited 0 while the guard lived at the escalation branches.
+    tmp=$(mktemp -d)
+    script="$PWD/hack/select-e2e.sh"
+    cp -r packages/core/platform/sources "$tmp/sources"
+    mkdir -p "$tmp/tree/hack/e2e-chainsaw"
+    for d in go.mod examples/backups/postgres/run-all.sh docs/x.md; do
+        echo "$d" > "$tmp/diff"
+        rc=0
+        output=$(cd "$tmp/tree" && "$script" "$tmp/diff" "$tmp/sources" 2>"$tmp/err") || rc=$?
+        if [ "$rc" -eq 0 ]; then
+            echo "a broken suite enumeration must fail for '$d', not print '$output' and exit 0" >&2
+            cat "$tmp/err" >&2
+            exit 1
+        fi
+        if ! grep -q 'suite enumeration is broken' "$tmp/err"; then
+            echo "the refusal must say why for '$d'; stderr was:" >&2
+            cat "$tmp/err" >&2
+            exit 1
+        fi
+    done
+    rm -rf "$tmp"
+}
+
+@test "a suite written as chainsaw-test.yml is discovered" {
+    # Chainsaw loads chainsaw-test.yml when there is no chainsaw-test.yaml, so a
+    # suite spelled that way runs. Enumerated by the .yaml name alone it was
+    # absent from every escalation and unselectable by its own per-suite edits,
+    # and a suite that exists but is never selected reds nothing.
+    tmp=$(mktemp -d)
+    script="$PWD/hack/select-e2e.sh"
+    cp -r packages/core/platform/sources "$tmp/sources"
+    mkdir -p "$tmp/tree/hack/e2e-chainsaw/alpha" "$tmp/tree/hack/e2e-chainsaw/beta"
+    : > "$tmp/tree/hack/e2e-chainsaw/alpha/chainsaw-test.yaml"
+    : > "$tmp/tree/hack/e2e-chainsaw/beta/chainsaw-test.yml"
+    # A directory holding both spellings is still one suite.
+    : > "$tmp/tree/hack/e2e-chainsaw/alpha/chainsaw-test.yml"
+    echo go.mod > "$tmp/diff"
+    output=$(cd "$tmp/tree" && "$script" "$tmp/diff" "$tmp/sources" 2>/dev/null)
+    assert_selection "the full suite must include a .yml suite" "$output" "alpha beta"
+    echo hack/e2e-chainsaw/beta/step.yaml > "$tmp/diff"
+    output=$(cd "$tmp/tree" && "$script" "$tmp/diff" "$tmp/sources")
+    assert_selection "a per-suite edit must select a .yml suite" "$output" "beta"
+    rm -rf "$tmp"
+}
+
+@test "a suite made only of numbered step files is discovered" {
+    # With no chainsaw-test.* in a directory, Chainsaw builds a Test from files
+    # named like 01-install.yaml (TryFindStepFiles), so that directory runs as a
+    # suite whenever the whole tree is handed to chainsaw. Listed by the
+    # chainsaw-test name alone, it was never selected.
+    tmp=$(mktemp -d)
+    script="$PWD/hack/select-e2e.sh"
+    cp -r packages/core/platform/sources "$tmp/sources"
+    mkdir -p "$tmp/tree/hack/e2e-chainsaw/alpha" "$tmp/tree/hack/e2e-chainsaw/gamma" \
+        "$tmp/tree/hack/e2e-chainsaw/delta"
+    : > "$tmp/tree/hack/e2e-chainsaw/alpha/chainsaw-test.yaml"
+    : > "$tmp/tree/hack/e2e-chainsaw/gamma/01-install.yaml"
+    : > "$tmp/tree/hack/e2e-chainsaw/gamma/01-assert.yml"
+    # Not a step file: the number has to lead the name.
+    : > "$tmp/tree/hack/e2e-chainsaw/delta/install-01.yaml"
+    # Nor is a name with no number at all.
+    : > "$tmp/tree/hack/e2e-chainsaw/delta/-install.yaml"
+    # Not a step file either: Chainsaw skips directories. It keeps a symlink,
+    # though, because a symlink's directory entry is not a directory.
+    mkdir -p "$tmp/tree/hack/e2e-chainsaw/theta/01-x.yaml" "$tmp/tree/hack/e2e-chainsaw/iota" \
+        "$tmp/tree/hack/e2e-chainsaw/kappa"
+    ln -s ../alpha/chainsaw-test.yaml "$tmp/tree/hack/e2e-chainsaw/iota/01-link.yaml"
+    # Step files spelled .yml alone make a suite too.
+    : > "$tmp/tree/hack/e2e-chainsaw/kappa/01-install.yml"
+    # A directory named chainsaw-test.yaml is still read by Chainsaw, which
+    # then fails loudly, so its suite stays listed.
+    mkdir -p "$tmp/tree/hack/e2e-chainsaw/lambda/chainsaw-test.yaml" \
+        "$tmp/tree/hack/e2e-chainsaw/mu/chainsaw-test.yml"
+    echo go.mod > "$tmp/diff"
+    output=$(cd "$tmp/tree" && "$script" "$tmp/diff" "$tmp/sources" 2>/dev/null)
+    assert_selection "the full suite must include a step-file suite" "$output" "alpha gamma iota kappa lambda mu"
+    echo hack/e2e-chainsaw/gamma/01-install.yaml > "$tmp/diff"
+    output=$(cd "$tmp/tree" && "$script" "$tmp/diff" "$tmp/sources")
+    assert_selection "a per-suite edit must select a step-file suite" "$output" "gamma"
+    rm -rf "$tmp"
+}
+
+@test "a suite nested below a top-level directory is discovered" {
+    # Chainsaw walks every directory under the path it is given, so a test in
+    # hack/e2e-chainsaw/<dir>/<sub>/ runs whenever <dir> is handed to chainsaw,
+    # with or without a test of its own at the top. Read off the top level
+    # alone, <dir> was never listed, so even the full suite left it out.
+    tmp=$(mktemp -d)
+    script="$PWD/hack/select-e2e.sh"
+    cp -r packages/core/platform/sources "$tmp/sources"
+    mkdir -p "$tmp/tree/hack/e2e-chainsaw/alpha" "$tmp/tree/hack/e2e-chainsaw/epsilon/cases" \
+        "$tmp/tree/hack/e2e-chainsaw/eta/cases/deep"
+    : > "$tmp/tree/hack/e2e-chainsaw/alpha/chainsaw-test.yaml"
+    : > "$tmp/tree/hack/e2e-chainsaw/epsilon/cases/chainsaw-test.yml"
+    : > "$tmp/tree/hack/e2e-chainsaw/eta/cases/deep/02-apply.yaml"
+    echo go.mod > "$tmp/diff"
+    output=$(cd "$tmp/tree" && "$script" "$tmp/diff" "$tmp/sources" 2>/dev/null)
+    assert_selection "the full suite must include a nested suite" "$output" "alpha epsilon eta"
+    echo hack/e2e-chainsaw/eta/cases/deep/02-apply.yaml > "$tmp/diff"
+    output=$(cd "$tmp/tree" && "$script" "$tmp/diff" "$tmp/sources")
+    assert_selection "an edit to a nested suite must select its top-level directory" "$output" "eta"
+    rm -rf "$tmp"
+}
+
+@test "an unterminated last line is still classified" {
+    tmp=$(mktemp -d)
+    cp -r packages/core/platform/sources "$tmp/sources"
+    printf '%s' packages/apps/postgres/values.yaml > "$tmp/diff"
+    output=$(hack/select-e2e.sh "$tmp/diff" "$tmp/sources")
+    [ "$output" = "postgres" ]
+    rm -rf "$tmp"
+}
+
+@test "an unterminated unclassified last line still escalates" {
+    tmp=$(mktemp -d)
+    cp -r packages/core/platform/sources "$tmp/sources"
+    # The unclassified path is the one the drop would eat, so without the guard
+    # the escalation never fires and the selection comes back empty — the exact
+    # silent-green this classification exists to remove.
+    printf 'docs/x.md\n%s' brand-new/thing.conf > "$tmp/diff"
+    output=$(hack/select-e2e.sh "$tmp/diff" "$tmp/sources")
+    assert_full_suite "$output"
+    rm -rf "$tmp"
+}
+
+# Coverage is decided per changed path, and the tests below pin both directions
+# of that: a path reaching no suite escalates whatever else the diff selected,
+# and a path that is covered never drags the full suite in with it.
+
+@test "a package covered by no suite escalates despite other selections" {
+    # cozystack-basics is in the graph and reaches no runnable Chainsaw suite,
+    # so a change to it must run everything. That escalation belongs to the
+    # changed path, not to the shape of the rest of the diff: adding an
+    # unrelated per-suite Chainsaw edit — the ordinary "change a platform
+    # component and adjust the e2e next to it" PR — used to narrow the run down
+    # to that one suite (#3330).
+    tmp=$(mktemp -d)
+    cp -r packages/core/platform/sources "$tmp/sources"
+    # Guard the premise: if the package ever leaves the graph it escalates as an
+    # unrecognised packages/ path instead, and this test passes on the wrong
+    # rule.
+    grep -rq 'path: system/cozystack-basics' "$tmp/sources"
+    echo "packages/system/cozystack-basics/templates/ingress-hostname-policy.yaml" > "$tmp/diff"
+    alone=$(hack/select-e2e.sh "$tmp/diff" "$tmp/sources" 2>"$tmp/err")
+    assert_full_suite "$alone"
+    # The escalation has to say it happened. This is the branch most packages
+    # take, so a full run with nothing on stderr leaves "why did everything
+    # run" unanswerable — the same complaint this change makes about the old
+    # swallowed escalation. Matched on the script's own prefix and on the source
+    # it names, not on the word "escalating" alone, which the unclassified
+    # fall-through also prints.
+    if ! grep -q 'select-e2e:.*cozystack\.cozystack-basics' "$tmp/err"; then
+        echo "the per-path escalation must name the sources it escalated for; stderr was:" >&2
+        cat "$tmp/err" >&2
+        exit 1
+    fi
+    echo "hack/e2e-chainsaw/postgres/chainsaw-test.yaml" >> "$tmp/diff"
+    output=$(hack/select-e2e.sh "$tmp/diff" "$tmp/sources")
+    assert_selection "a per-suite edit swallowed the full-suite escalation" \
+        "$output" "$(full_suite_list)"
+    rm -rf "$tmp"
+}
+
+@test "escalation also survives another package that does select suites" {
+    # The swallowing was not specific to Chainsaw edits: any other changed path
+    # contributing a suite name hid it, a second packages/ path included.
+    tmp=$(mktemp -d)
+    cp -r packages/core/platform/sources "$tmp/sources"
+    printf '%s\n' packages/system/cozystack-basics/templates/ingress-hostname-policy.yaml \
+        packages/apps/postgres/values.yaml > "$tmp/diff"
+    output=$(hack/select-e2e.sh "$tmp/diff" "$tmp/sources")
+    assert_full_suite "$output"
+    rm -rf "$tmp"
+}
+
+@test "two covered packages still narrow to their own suites" {
+    # The per-path loop is the code that can over-escalate, so pin the negative
+    # direction too: a path that IS covered must never pull the full suite in.
+    # Without this the cheapest way to pass every test above is to escalate
+    # always.
+    tmp=$(mktemp -d)
+    cp -r packages/core/platform/sources "$tmp/sources"
+    printf '%s\n' packages/apps/postgres/values.yaml packages/apps/redis/values.yaml > "$tmp/diff"
+    output=$(hack/select-e2e.sh "$tmp/diff" "$tmp/sources")
+    [ "$output" = "postgres redis" ]
+    rm -rf "$tmp"
+}
+
+@test "a path owned by several sources counts as covered if any one is" {
+    # system/postgres-operator belongs to two PackageSources: cozystack.monitoring
+    # and cozystack.postgres-operator, which reaches postgres-application,
+    # harbor-application (Harbor uses postgres as its backing DB),
+    # monitoring-application, and keycloak, which maps to the suites driving
+    # Keycloak clients. Coverage is decided over the path's sources
+    # together, which is why the unit is the path and not the source — deciding
+    # per source would escalate on a half that reaches nothing and run everything
+    # for every change here. cozystack.monitoring maps to the monitoring
+    # suite by name, so it is renamed below to a source that reaches no suite,
+    # which is the half this test needs.
+    tmp=$(mktemp -d)
+    cp -r packages/core/platform/sources "$tmp/sources"
+    yq -i '.metadata.name = "cozystack.monitoring-stack"' "$tmp/sources/monitoring.yaml"
+    # Guard the premise. Filter outside yq: a trailing `| $n` re-emits the
+    # binding whether or not the select() matched, so counting that way returns
+    # every source in the graph and can never fail. Route the yq output through
+    # `echo "$VAR" | awk`, the same as select-e2e.sh's own owners split, because
+    # mikefarah yq emits `"\t"` in a concatenation as a literal backslash-t and
+    # `echo` is what turns it into the tab `awk -F'\t'` splits on.
+    owners_tsv=$(yq -rN '.metadata.name as $n | .spec.variants[]?.components[]?.path | select(. != null) | . + "\t" + $n' "$tmp/sources"/*.yaml)
+    owners=$(echo "$owners_tsv" | awk -F'\t' '$1=="system/postgres-operator"{print $2}' | sort -u | wc -l)
+    [ "$owners" -ge 2 ]
+    echo "packages/system/postgres-operator/values.yaml" > "$tmp/diff"
+    output=$(hack/select-e2e.sh "$tmp/diff" "$tmp/sources")
+    [ "$output" = "harbor kubernetes-latest monitoring postgres" ]
+    rm -rf "$tmp"
+}
+
+@test "a suite owned by a non-application source is reachable from its package" {
+    # kuberture and securitygroup stand on sources named neither *-application
+    # nor after the suite, and external-dns on one that carries the suite name
+    # itself. All three map through src_to_suites, so a change to their package
+    # selects that suite instead of escalating the whole run (#3665).
+    tmp=$(mktemp -d)
+    cp -r packages/core/platform/sources "$tmp/sources"
+    echo "packages/system/kuberture/values.yaml" > "$tmp/diff"
+    output=$(hack/select-e2e.sh "$tmp/diff" "$tmp/sources")
+    [ "$output" = "kuberture" ]
+    echo "packages/system/securitygroup-controller/values.yaml" > "$tmp/diff"
+    output=$(hack/select-e2e.sh "$tmp/diff" "$tmp/sources")
+    [ "$output" = "securitygroup" ]
+    echo "packages/system/external-dns/values.yaml" > "$tmp/diff"
+    output=$(hack/select-e2e.sh "$tmp/diff" "$tmp/sources")
+    [ "$output" = "external-dns" ]
+    rm -rf "$tmp"
+}
+
+@test "an ingress-nginx change selects the gateway admission regression" {
+    # system/ingress-nginx is shared by the root ingress package, the tenant
+    # ingress application, and tenant Kubernetes clusters. The gateway suite
+    # owns the host-cluster Ingress admission regression, while the two
+    # Kubernetes suites cover the copies installed inside tenant clusters --
+    # two, not four, since the OIDC pair was folded into kubernetes-latest --
+    # and computeplane covers the copy its module pins inside its cluster.
+    tmp=$(mktemp -d)
+    cp -r packages/core/platform/sources "$tmp/sources"
+    echo "packages/system/ingress-nginx/templates/admission-webhook-egress-policy.yaml" > "$tmp/diff"
+    output=$(hack/select-e2e.sh "$tmp/diff" "$tmp/sources")
+    assert_selection "an ingress-nginx change must exercise every installed copy" \
+        "$output" "computeplane gateway kubernetes-latest kubernetes-previous"
+    rm -rf "$tmp"
+}
+
+@test "a kubernetes-nodes pool chart change selects computeplane and both kubernetes suites" {
+    # apps/kubernetes-nodes belongs to kubernetes-nodes-application and to
+    # computeplane-application. The kubernetes suites create KubernetesNodes
+    # natively and computeplane renders pools through its module, so a pool
+    # chart change has to reach all three, not only the source that happens
+    # to have a suite of its own name.
+    tmp=$(mktemp -d)
+    cp -r packages/core/platform/sources "$tmp/sources"
+    echo "packages/apps/kubernetes-nodes/values.yaml" > "$tmp/diff"
+    output=$(hack/select-e2e.sh "$tmp/diff" "$tmp/sources")
+    assert_selection "a pool chart change must exercise native and module pools" \
+        "$output" "computeplane kubernetes-latest kubernetes-previous"
+    rm -rf "$tmp"
+}
+
+@test "a kubernetes-nodes-rd change selects computeplane and both kubernetes suites" {
+    # kubernetes-nodes-rd ships only in kubernetes-nodes-application, which
+    # maps to the same three suites as the pool chart it registers.
+    tmp=$(mktemp -d)
+    cp -r packages/core/platform/sources "$tmp/sources"
+    echo "packages/system/kubernetes-nodes-rd/cozyrds/kubernetes-nodes.yaml" > "$tmp/diff"
+    output=$(hack/select-e2e.sh "$tmp/diff" "$tmp/sources")
+    assert_selection "a kubernetes-nodes-rd change must exercise native and module pools" \
+        "$output" "computeplane kubernetes-latest kubernetes-previous"
+    rm -rf "$tmp"
+}
+
+@test "a keycloak change selects both suites that drive Keycloak clients" {
+    # monitoring and kubernetes-latest both create a KeycloakClient and assert
+    # it is removed again, which goes through the operator's finalizer. Only
+    # monitoring-application declares the keycloak-operator edge, so the graph
+    # alone reaches monitoring and drops the tenant Kubernetes OIDC lifecycle.
+    tmp=$(mktemp -d)
+    cp -r packages/core/platform/sources "$tmp/sources"
+    for path in packages/system/keycloak/values.yaml packages/system/keycloak-operator/values.yaml; do
+        echo "$path" > "$tmp/diff"
+        output=$(hack/select-e2e.sh "$tmp/diff" "$tmp/sources")
+        assert_selection "a change to $path must run every Keycloak client lifecycle" \
+            "$output" "kubernetes-latest monitoring"
+    done
+    rm -rf "$tmp"
+}
+
+@test "an etcd-operator change selects the etcd suite, not the whole run" {
+    # cozystack.etcd-operator reached no runnable suite, so every change to the
+    # operator ran all 21 -- 5 of the last 150 merged pull requests. The suite
+    # exists and the app genuinely needs the operator (extra/etcd renders kind:
+    # EtcdCluster from etcd-operator.cozystack.io/v1alpha2), so what was missing
+    # was the dependsOn edge that makes the app reachable from it. Both operator
+    # components are asserted: the reverse walk starts from whichever
+    # PackageSource owns the changed path, and the CRDs sit in the same source.
+    tmp=$(mktemp -d)
+    cp -r packages/core/platform/sources "$tmp/sources"
+    # Guard the premise: without the edge this passes for the wrong reason,
+    # because the full suite contains "etcd" too.
+    grep -q 'cozystack\.etcd-operator' "$tmp/sources/etcd-application.yaml"
+    for path in packages/system/etcd-operator/values.yaml \
+        packages/system/etcd-operator-crds/templates/etcd-clusters.yaml; do
+        echo "$path" > "$tmp/diff"
+        output=$(hack/select-e2e.sh "$tmp/diff" "$tmp/sources")
+        assert_selection "an etcd-operator change must select only the etcd suite" \
+            "$output" "etcd"
+    done
+    rm -rf "$tmp"
+}
+
+@test "a seaweedfs change selects every suite that uses seaweedfs object storage" {
+    # cozystack.seaweedfs-application used to map to a seaweedfs suite that did
+    # not exist, so every seaweedfs change ran the whole suite. The seaweedfs
+    # suite, which runs an instance of its own, is not the only one it can
+    # break. bucket drives tenant-root's instance, the backup round-trips write
+    # to that instance through the in-cluster seaweedfs-s3 endpoint, most of
+    # them verifying its CA, which bucket skips; harbor gets its registry
+    # storage from a BucketClaim served by the seaweedfs COSI driver, and no
+    # graph edge links the two. The expected set is read off the suites' own
+    # yaml rather than written here, so a new suite that names the endpoint or
+    # a BucketClaim there and is left out of src_to_suites goes red. A suite reaching seaweedfs only through a
+    # sourced script is invisible to the scan; the round-trips pass S3_ENDPOINT
+    # in their yaml, which is what makes it hold today. Comment lines are
+    # skipped, which is what keeps etcd out: its round-trip is gated off in CI
+    # and names the endpoint only in prose.
+    tmp=$(mktemp -d)
+    cp -r packages/core/platform/sources "$tmp/sources"
+    want=''
+    for s in $(full_suite_list); do
+        if cat hack/e2e-chainsaw/"$s"/*.y*ml | grep -v '^[[:space:]]*#' \
+            | grep -qE 'seaweedfs-s3|BucketClaim|objectstorage\.k8s\.io'; then
+            want="${want:+$want }$s"
+        fi
+    done
+    # Premise: the scan must find the suite that exists for this, or it is
+    # reading the wrong files.
+    case " $want " in *" bucket "*) ;; *) echo "premise broken: scan found '$want'" >&2; exit 1 ;; esac
+    for path in packages/system/seaweedfs/values.yaml packages/extra/seaweedfs/values.yaml \
+        packages/system/seaweedfs-db/values.yaml packages/system/seaweedfs-rd/Chart.yaml; do
+        echo "$path" > "$tmp/diff"
+        output=$(hack/select-e2e.sh "$tmp/diff" "$tmp/sources")
+        assert_selection "a seaweedfs change must select the suites that use it: $path" \
+            "$output" "$want"
+    done
+    rm -rf "$tmp"
+}
+
+@test "every suite owner round-trips through selection and install closure" {
+    # select-install.sh maps a suite to the PackageSource that installs it, and
+    # select-e2e.sh must map that source back to the suite. A suite that does
+    # not round-trip is unreachable from its own package. Exercise the actual
+    # scripts as well as the two mapping functions so a full-suite fallback or
+    # a closure that happens to contain a baseline source cannot pass vacuously.
+    eval "$(sed -n '/^src_to_suites()/,/^}/p' hack/select-e2e.sh)"
+    eval "$(sed -n '/^suite_to_source()/,/^}/p' hack/select-install.sh)"
+    # suite_to_source falls back to probing the graph for a source of that name,
+    # and reads it from NODES, which its own script builds before calling it.
+    NODES=$(yq -rN '.metadata.name' packages/core/platform/sources/*.yaml | sort -u)
+    tmp=$(mktemp -d)
+    for suite in $(full_suite_list | tr ' ' '\n'); do
+        owners=$(suite_to_source "$suite")
+        if [ -z "$owners" ]; then
+            echo "suite '$suite' has no source in select-install.sh's suite_to_source" >&2
+            exit 1
+        fi
+        for src in $owners; do
+            if ! src_to_suites "${src#cozystack.}" | tr ' ' '\n' | grep -Fxq "$suite"; then
+                echo "suite '$suite' maps to $src, which select-e2e.sh maps back to '$(src_to_suites "${src#cozystack.}")'" >&2
+                exit 1
+            fi
+
+            source_file="packages/core/platform/sources/${src#cozystack.}.yaml"
+            component_path=$(yq -r '.spec.variants[].components[]?.path | select(. != null)' "$source_file" | sed -n '1p')
+            component_path="packages/$component_path"
+            files=$(find "$component_path" -type f ! -name '*.md')
+            changed=$(printf '%s\n' "$files" | sort | sed -n '1p')
+            if [ -z "$changed" ]; then
+                echo "suite owner '$src' has no real component file for the selector matrix" >&2
+                exit 1
+            fi
+            printf '%s\n' "$changed" > "$tmp/diff"
+            selected=$(hack/select-e2e.sh "$tmp/diff")
+            if [ "$selected" = "$(full_suite_list)" ]; then
+                echo "owner '$src' reached '$suite' only through full-suite fallback for $changed" >&2
+                exit 1
+            fi
+            if ! printf '%s\n' "$selected" | tr ' ' '\n' | grep -Fxq "$suite"; then
+                echo "owner '$src' did not select its suite '$suite' for $changed: $selected" >&2
+                exit 1
+            fi
+            closure=$(hack/select-install.sh "$selected")
+            if ! printf '%s\n' "$closure" | tr ' ' '\n' | grep -Fxq "$src"; then
+                echo "selection '$selected' does not install owner '$src' for suite '$suite'" >&2
+                exit 1
+            fi
+        done
+    done
+    rm -rf "$tmp"
+}
+
+@test "an edit to a non-suite directory under e2e-chainsaw escalates on its own account" {
+    # Only a switched-off suite is ignorable. Shared material next to _lib/ is
+    # invisible to all_apps, and selecting nothing for it would skip E2E
+    # outright.
+    #
+    # The mixed diff is the regression pin. When the name was left for the final
+    # intersection to drop, the path escalated alone, through the empty-selection
+    # backstop, but beside any path that contributed a suite the run narrowed to
+    # that suite with nothing on stderr -- the merge-before-escalate shape #3330
+    # removed from the graph walk. The single-path case passes either way.
+    tmp=$(mktemp -d)
+    cp -r packages/core/platform/sources "$tmp/sources"
+    # Premise: the directory must not exist, or all_apps would hold it and the
+    # test would be measuring the ordinary per-suite rule.
+    [ ! -d hack/e2e-chainsaw/_fixtures ]
+    for diff in "hack/e2e-chainsaw/_fixtures/tenant.yaml" \
+        "hack/e2e-chainsaw/_fixtures/tenant.yaml packages/apps/postgres/values.yaml" \
+        "hack/e2e-chainsaw/postgres/chainsaw-test.yaml hack/e2e-chainsaw/_fixtures/tenant.yaml"; do
+        printf '%s\n' $diff > "$tmp/diff"
+        output=$(hack/select-e2e.sh "$tmp/diff" "$tmp/sources" 2>"$tmp/err")
+        assert_selection "a non-suite directory under e2e-chainsaw was not escalated for: $diff" \
+            "$output" "$(full_suite_list)"
+        if ! grep -q "select-e2e: 'hack/e2e-chainsaw/_fixtures/tenant.yaml' names no runnable suite ('_fixtures')" "$tmp/err"; then
+            echo "the escalation must name the path and the directory it read; stderr was:" >&2
+            cat "$tmp/err" >&2
+            exit 1
+        fi
+    done
+    rm -rf "$tmp"
+}
+
+@test "a packages/ path with no graph entry escalates and says which" {
+    # The fourth branch that used to escalate in silence: a path under
+    # packages/(apps|system|extra)/<name>/ that no PackageSource lists as a
+    # component path. That is how a new package looks before its source lands, so
+    # the line has to name the package dir rather than the rule — the reader's
+    # next step is to add it to the graph.
+    tmp=$(mktemp -d)
+    cp -r packages/core/platform/sources "$tmp/sources"
+    # Premise: no source may claim this path, or the graph lookup succeeds and
+    # the test measures the ordinary component rule instead.
+    if grep -rq 'path: system/zz-not-a-package' "$tmp/sources"; then
+        echo "premise broken: system/zz-not-a-package is in the graph" >&2
+        exit 1
+    fi
+    echo "packages/system/zz-not-a-package/values.yaml" > "$tmp/diff"
+    output=$(hack/select-e2e.sh "$tmp/diff" "$tmp/sources" 2>"$tmp/err")
+    assert_full_suite "$output"
+    if ! grep -q "select-e2e:.*system/zz-not-a-package.*component path" "$tmp/err"; then
+        echo "an unowned packages/ path must name itself; stderr was:" >&2
+        cat "$tmp/err" >&2
+        exit 1
+    fi
+    rm -rf "$tmp"
+}
+
+@test "resolve_suites still has exactly one call site" {
+    # resolve_suites writes its working variables into the caller's scope (POSIX
+    # sh, no local). That is safe only because its single call sits inside $( ).
+    # A second call added without noticing would clobber the loop state around
+    # it silently, so this guards the note above the function: in code the name
+    # belongs on its definition line and on that one call, nowhere else.
+    #
+    # Comment lines are dropped first, or the guard's own subject goes out of
+    # bounds — describing the hazard above the function would turn it red for
+    # prose. Occurrences rather than matching lines, so a second call folded
+    # onto the line the first sits on still moves the number.
+    count=$(grep -v '^[[:space:]]*#' hack/select-e2e.sh | grep -o 'resolve_suites' | wc -l)
+    [ "$count" -eq 2 ]
+}
diff --git a/hack/select-install.sh b/hack/select-install.sh
new file mode 100755
index 0000000000..cea5442a81
--- /dev/null
+++ b/hack/select-install.sh
@@ -0,0 +1,465 @@
+#!/bin/sh
+# Given the E2E app suite(s) about to run, emit the conservative set of packages
+# that must be INSTALLED for those suites: the suite owners and runtime needs,
+# the E2E install baseline, and their forward PackageSource dependency closure.
+# This is the install-side companion to select-e2e.sh:
+# select-e2e.sh picks WHICH Chainsaw suites run (reverse dependency walk);
+# select-install.sh picks WHAT must be up for them (forward dependency walk).
+#
+# Usage:
+#   hack/select-install.sh <suites> [<sources-dir>]
+#   hack/select-install.sh --disabled <suites> [<sources-dir>]
+#   hack/select-install.sh --validate [<sources-dir> [<suites-dir>]]
+#
+# Defaults: sources-dir = packages/core/platform/sources
+#           suites-dir  = hack/e2e-chainsaw
+#
+# <suites>: whitespace-separated suite names, i.e. the output of select-e2e.sh
+#           (e.g. "postgres harbor"). "-" reads the list from stdin.
+#
+# Output (closure mode): space-separated PackageSource names (cozystack.*) that
+#   the run must enable, seeds + the platform baseline + all transitive
+#   dependsOn. Empty when <suites> is empty.
+#
+# Output (--disabled): the COMPLEMENT of that closure, for bundles.disabledPackages
+#   in the platform chart. The base package helper in
+#   packages/core/platform/templates/_helpers.tpl consults disabledPackages for
+#   every package rather than only the optional ones, so an ordinary variant
+#   can be reduced by subtraction with no new variant. Refuses on an empty
+#   selection, where the complement would be the whole platform.
+#
+#   Three limits worth knowing before consuming it.
+#
+#   Subtraction governs a FRESH install only. Both package defines stamp
+#   `helm.sh/resource-policy: keep`, so adding a name on a live cluster stops
+#   emitting the Package CR but does not remove the one already there; the
+#   package stays installed. Fine for a per-run E2E install, wrong as a way to
+#   uninstall.
+#
+#   Packages emitted through package.optional (nfs-driver, telepresence,
+#   external-dns, external-dns-application, and the others gated the same way)
+#   need bundles.enabledPackages as well. Keeping one in the closure is
+#   therefore not enough to install it, and a suite whose closure contains one
+#   needs that list set separately. Subtraction is correct for them either way,
+#   since an optional package absent from enabledPackages is not installed
+#   regardless.
+#
+#   A package that no selected suite owns or needs, and that the baseline does
+#   not keep, is not installed, including when select-e2e.sh answers with every
+#   suite. That is deliberate: nothing in the run looks at such packages
+#   (monitoring exporters like goldpinger and kubeovn-plunger, apps without a
+#   suite, provider-specific operators), so installing them only adds a
+#   readiness wait. A change to one of them gets no install check from this gate.
+#
+#   The declared graph is not the whole runtime contract. The standard E2E
+#   install waits for storage, load-balancer, CAPI and OIDC components which no
+#   selected application necessarily reaches, so they are explicit baseline
+#   seeds below. This mode describes a FRESH install using that audited path;
+#   live convergence still has to be proved separately. A suite with no known
+#   mapping is a HARD ERROR (fail closed) — a silently-skipped suite would
+#   install nothing and let the test pass vacuously or fail later on a missing
+#   CRD.
+#
+# --validate: check the whole graph AND the suite mapping — every dependsOn
+#   target resolves to a real PackageSource, there are no dependency cycles, and
+#   every Chainsaw suite under <suites-dir> has real PackageSources for both its
+#   owners and runtime requirements. Exit non-zero on any failure. The graph
+#   is read from the current PackageSource inventory. The hand-maintained suite
+#   mapping can drift independently, so validation checks it against both that
+#   inventory and the current suite directories.
+#
+# Unlike select-e2e.sh's reverse walk, the forward walk KEEPS the
+# cozystack.cozystack-engine edge: every *-application declares
+# `dependsOn: cozystack.cozystack-engine` because the app's *-rd HelmRelease
+# needs the engine to register the ApplicationDefinition CRD before it can
+# reconcile. For test SELECTION that edge is noise (it would fan every app out
+# to every other); for INSTALL it is a genuine prerequisite that must be up.
+# Suites backed by a system package (e.g. securitygroup) carry no such edge, so
+# the engine is seeded explicitly for any non-empty closure (see below).
+set -eu
+
+SOURCES_DIR="packages/core/platform/sources"
+SUITES_DIR="hack/e2e-chainsaw"
+MODE="closure"
+SUITES=""
+
+if [ "${1:-}" = "--disabled" ]; then
+  MODE="disabled"
+  shift
+  suites_arg="${1?usage: select-install.sh --disabled <suites> [sources-dir]}"
+  SOURCES_DIR="${2:-$SOURCES_DIR}"
+  if [ "$suites_arg" = "-" ]; then
+    SUITES="$(cat)"
+  else
+    SUITES="$suites_arg"
+  fi
+elif [ "${1:-}" = "--validate" ]; then
+  MODE="validate"
+  SOURCES_DIR="${2:-$SOURCES_DIR}"
+  SUITES_DIR="${3:-$SUITES_DIR}"
+else
+  suites_arg="${1?usage: select-install.sh <suites> [sources-dir] | --validate [sources-dir [suites-dir]]}"
+  SOURCES_DIR="${2:-$SOURCES_DIR}"
+  if [ "$suites_arg" = "-" ]; then
+    SUITES="$(cat)"
+  else
+    SUITES="$suites_arg"
+  fi
+fi
+
+# suite name -> owning PackageSource(s). Prints:
+#   - one or more "cozystack.*" names   every direct install target
+#   - nothing                           no mapping is known (caller fails closed)
+# Most suites follow the <suite>-application convention; a bare-<suite> fallback
+# and the explicit cases cover suites whose source is named differently. Kept in
+# lockstep with select-e2e.sh's src_to_suites() and the hack/e2e-chainsaw/ dirs;
+# --validate asserts every suite dir still resolves here.
+#
+# A suite may have more than one direct owner. The Kubernetes suites create
+# Kubernetes and KubernetesNodes; vminstance creates VMInstance and VMDisk and
+# observes the DataVolume behind the disk. Each API needs its application source.
+# Fixtures which only name other app kinds as selectors are not owners.
+suite_to_source() {
+  case "$1" in
+    kubernetes-latest|kubernetes-previous)
+      echo "cozystack.kubernetes-application cozystack.kubernetes-nodes-application"
+      return ;;
+    vminstance)
+      echo "cozystack.vm-instance-application cozystack.vm-disk-application"
+      return ;;
+    securitygroup) echo cozystack.securitygroup-controller ; return ;;
+    kafka-metadata) echo cozystack.kafka-application ; return ;;
+  esac
+  for cand in "cozystack.$1-application" "cozystack.$1"; do
+    if echo "$NODES" | grep -Fxq "$cand"; then echo "$cand"; return; fi
+  done
+}
+
+# Backup examples create Bucket and backup CRs alongside the selected app;
+# gateway's namespace-churn test also requires the pod admission webhook.
+# These requirements belong to the suites; adding application graph edges
+# would also change reverse test selection.
+suite_runtime_sources() {
+  case "$1" in
+    clickhouse|etcd|kafka|kafka-metadata|mariadb|mongodb|postgres|rabbitmq|redis|valkey)
+      echo cozystack.backupstrategy-controller ;;
+    gateway) echo cozystack.kubeovn-webhook ;;
+  esac
+}
+
+# yq: forward edges — "owner<TAB>dep", one per variant dependsOn entry.
+# NOTE: this unions dependsOn across ALL spec.variants[] rather than the single
+# variant actually installed (e.g. cozystack.networking has 6 variants; only 5
+# declare gateway-api-crds). That OVER-selects, never under-selects, so the
+# emitted set is a safe superset of the true minimal set for the chosen variant.
+build_forward_deps() {
+  yq -rN '.metadata.name as $n | .spec.variants[]?.dependsOn[]? | select(. != null and . != "") | $n + "\t" + .' "$SOURCES_DIR"/*.yaml
+}
+
+# Capture each producer before sorting. This file runs under dash through
+# cozytest, so pipefail is not available; checking the producer explicitly is
+# what prevents a failed yq from turning into a successful empty graph.
+if ! nodes_raw=$(yq -rN '.metadata.name | select(. != null and . != "")' "$SOURCES_DIR"/*.yaml); then
+  echo "select-install: yq failed while reading PackageSource names from $SOURCES_DIR" >&2
+  exit 1
+fi
+NODES=$(printf '%s\n' "$nodes_raw" | sort -u)
+if [ -z "$NODES" ]; then
+  echo "select-install: found no PackageSources in $SOURCES_DIR" >&2
+  exit 1
+fi
+
+if ! forward_raw=$(build_forward_deps); then
+  echo "select-install: yq failed while reading PackageSource dependencies from $SOURCES_DIR" >&2
+  exit 1
+fi
+FORWARD=$(printf '%s\n' "$forward_raw" | sort -u)
+
+# forward deps of a single node
+deps_of() {
+  echo "$FORWARD" | awk -v s="$1" -F'\t' '$1==s {print $2}'
+}
+
+# Validate the complete PackageSource graph, including branches unrelated to
+# the requested suites. Any emitted closure or complement describes this
+# inventory as a whole, so accepting a dangling edge or cycle elsewhere would
+# make the result depend on an invalid input snapshot.
+validate_graph() {
+  # One awk pass checks every reference and walks every node once, because
+  # ordinary selection runs this validation too and the graph has ~100 nodes.
+  # The node list goes through the environment: BWK awk rejects literal
+  # newlines in -v assignments.
+  if graph_errors=$(printf '%s\n' "$FORWARD" | SELECT_INSTALL_NODES="$NODES" awk -F'\t' '
+    function visit(node, i, next_node) {
+      if (state[node] == 1) {
+        cycle = node
+        return 1
+      }
+      if (state[node] == 2)
+        return 0
+      state[node] = 1
+      for (i = 1; i <= degree[node]; i++) {
+        next_node = edge[node, i]
+        if (visit(next_node))
+          return 1
+      }
+      state[node] = 2
+      return 0
+    }
+    BEGIN {
+      count = split(ENVIRON["SELECT_INSTALL_NODES"], known_list, "\n")
+      for (i = 1; i <= count; i++)
+        known[known_list[i]] = 1
+    }
+    NF == 2 {
+      if (references[$2] == "")
+        references[$2] = $1
+      else
+        references[$2] = references[$2] "," $1
+      edge[$1, ++degree[$1]] = $2
+    }
+    END {
+      rc = 0
+      for (dependency in references) {
+        if (!(dependency in known)) {
+          print "select-install: dangling dependency \047" dependency \
+            "\047 (referenced by: " references[dependency] ") has no PackageSource"
+          rc = 1
+        }
+      }
+      for (i = 1; i <= count; i++) {
+        if (visit(known_list[i])) {
+          print "select-install: dependency cycle detected involving \047" cycle "\047"
+          rc = 1
+          break
+        }
+      }
+      exit rc
+    }
+  '); then
+    return 0
+  fi
+  printf '%s\n' "$graph_errors" >&2
+  return 1
+}
+
+# all Chainsaw suite names under a suites-dir (top-level dirs holding, in them or
+# below, chainsaw-test.yaml, chainsaw-test.yml or numbered step files such as
+# 01-install.yaml), discovered exactly like select-e2e.sh. find runs from inside
+# the dir so the suite name is the first path component however the dir is
+# spelled. It is captured on its own because a pipeline reports sort's status,
+# and a failed listing must not read as an empty suites dir.
+discover_suites() {
+  if ! found=$(cd "$1" && find . -mindepth 2 \( ! -type d -o -name chainsaw-test.yaml -o -name chainsaw-test.yml \)); then
+    echo "select-install: find failed listing the suites under $1" >&2
+    return 1
+  fi
+  suites=$(printf '%s\n' "$found" \
+    | sed -nE 's,^\./([^/]+)/(.*/)?(chainsaw-test|[0-9]+-[^/]*)\.ya?ml$,\1,p' | sort -u)
+  if [ -z "$suites" ]; then
+    echo "select-install: found no chainsaw-test.yaml, chainsaw-test.yml or numbered step file under $1" >&2
+    return 1
+  fi
+  printf '%s\n' "$suites"
+}
+
+if [ "$MODE" = "validate" ]; then
+  rc=0
+
+  validate_graph || rc=1
+
+  # Suite mapping: every Chainsaw suite dir must resolve to a real source.
+  #    The suite universe is auto-discovered while suite_to_source() is
+  #    hand-maintained, so this is the part that actually drifts. A missing
+  #    suites dir is itself a failure — otherwise a moved/misspelled path would
+  #    make discovery yield nothing and silently pass this whole check.
+  if [ ! -d "$SUITES_DIR" ]; then
+    echo "select-install: suites dir '$SUITES_DIR' does not exist" >&2
+    rc=1
+  elif ! suites=$(discover_suites "$SUITES_DIR"); then
+    rc=1
+  else
+    for suite in $suites; do
+      owners="$(suite_to_source "$suite")"
+      if [ -z "$owners" ]; then
+        echo "select-install: suite '$suite' has no PackageSource mapping (add it to suite_to_source)" >&2
+        rc=1
+        continue
+      fi
+      for src in $owners $(suite_runtime_sources "$suite"); do
+        if ! echo "$NODES" | grep -Fxq "$src"; then
+          echo "select-install: suite '$suite' maps to '$src', not a PackageSource in $SOURCES_DIR" >&2
+          rc=1
+        fi
+      done
+    done
+  fi
+
+  [ "$rc" = 0 ] && echo "select-install: graph OK ($(echo "$NODES" | grep -c .) sources)" >&2
+  exit "$rc"
+fi
+
+# Closure mode: map suites to seed sources, then take the forward closure.
+seeds=""
+map_rc=0
+for suite in $SUITES; do
+  [ -z "$suite" ] && continue
+  owners="$(suite_to_source "$suite")"
+  if [ -z "$owners" ]; then
+    # Fail closed: a suite that maps to nothing must abort, not silently emit an
+    # empty set. Collect every bad suite so one run reports them all.
+    echo "select-install: error: suite '$suite' has no known PackageSource mapping (add it to suite_to_source)" >&2
+    map_rc=1
+    continue
+  fi
+  for src in $owners $(suite_runtime_sources "$suite"); do
+    if echo "$NODES" | grep -Fxq "$src"; then
+      case " $seeds " in *" $src "*) ;; *) seeds="$seeds $src" ;; esac
+    else
+      echo "select-install: error: suite '$suite' -> '$src' is not a PackageSource in $SOURCES_DIR" >&2
+      map_rc=1
+    fi
+  done
+done
+[ "$map_rc" = 0 ] || exit "$map_rc"
+
+# An empty seed set means no suite was selected. In closure mode that is a valid
+# answer -- install nothing extra. In disabled mode it is not: the complement of
+# an empty closure is the whole platform, which as an install instruction is a
+# platform with no packages at all, so refuse rather than emit it.
+if [ -z "$seeds" ]; then
+  if [ "$MODE" = "disabled" ]; then
+    echo "select-install: refusing to emit a disable list for an empty suite selection — the complement would be the entire platform" >&2
+    exit 1
+  fi
+  exit 0
+fi
+
+# Do not emit an answer from an invalid inventory. Suite-directory validation
+# remains exclusive to --validate because ordinary selection must not depend on
+# scanning an unrelated test tree.
+validate_graph || exit 1
+
+# The standard E2E install has unconditional runtime requirements which are not
+# owned by any selected application. Seed those direct requirements here rather
+# than inventing PackageSource edges: graph edges also drive select-e2e.sh's
+# reverse test selection, while these dependencies belong to the install harness.
+#
+# Root platform: aggregated APIs, tenant namespaces and three root services
+# (etcd, ingress, SeaweedFS) are waited before a selected suite can finish;
+# monitoring is not waited and stays only because tenant-application depends on
+# it. Storage/network prep waits
+# LINSTOR, CDI and MetalLB. The install then waits the CAPI operator plus all four
+# providers, and later enables and waits the Keycloak OIDC stack. Kamaji,
+# KubeVirt, storage controllers and CRDs remain graph-derived so losing those
+# declared edges stays observable in tests. Tenant HelmReleases carry a shard
+# label excluded by flux-aio, so the shard operator must supply their reconciler.
+#
+# Platform services no suite owns are kept as well, so a selective install still
+# runs the platform the way a full one does: multus (secondary networks), the
+# cozystack and LINSTOR schedulers, flux-plunger (repairs HelmReleases stuck on
+# "has no deployed releases"), cozy-proxy (external Services of VMs) and
+# ouroboros (hairpin NAT, asserted by the Kubernetes suites). Nothing waits for
+# them, so no graph edge reaches them; keeping them here leaves the product
+# PackageSources untouched.
+baseline="cozystack.cozystack-engine
+cozystack.flux-shard-operator
+cozystack.cozystack-basics
+cozystack.tenant-application
+cozystack.etcd-application
+cozystack.ingress-application
+cozystack.monitoring-application
+cozystack.seaweedfs-application
+cozystack.linstor
+cozystack.kubevirt-cdi
+cozystack.metallb
+cozystack.capi-operator
+cozystack.capi-provider-bootstrap-kubeadm
+cozystack.capi-provider-core
+cozystack.capi-provider-cp-kamaji
+cozystack.capi-provider-infra-kubevirt
+cozystack.keycloak
+cozystack.keycloak-operator
+cozystack.multus
+cozystack.cozystack-scheduler
+cozystack.linstor-scheduler
+cozystack.flux-plunger
+cozystack.cozy-proxy
+cozystack.ouroboros"
+
+missing=""
+for b in $baseline; do
+  if echo "$NODES" | grep -Fxq "$b"; then
+    case " $seeds " in *" $b "*) ;; *) seeds="$seeds $b" ;; esac
+  else
+    missing="${missing:+$missing }$b"
+  fi
+done
+if [ -n "$missing" ]; then
+  echo "select-install: error: required baseline PackageSource(s) not found in $SOURCES_DIR: $missing" >&2
+  exit 1
+fi
+
+all="$seeds"
+while :; do
+  new=""
+  for s in $all; do
+    for d in $(deps_of "$s"); do
+      case " $all $new " in *" $d "*) ;; *) new="$new $d" ;; esac
+    done
+  done
+  [ -z "$new" ] && break
+  all="$all $new"
+done
+
+closure="$(echo "$all" | tr ' ' '\n' | grep -v '^$' | sort -u)"
+
+# These runtime prerequisites are intentionally graph-derived rather than
+# redundant seeds. That keeps their PackageSource edges meaningful: if a CAPI
+# provider loses Kamaji or KubeVirt, or LINSTOR loses one of its controllers,
+# the selector fails closed instead of silently emitting an under-sized install.
+derived_baseline="cozystack.cert-manager
+cozystack.networking
+cozystack.gateway-api-crds
+cozystack.etcd-operator
+cozystack.grafana-operator
+cozystack.postgres-operator
+cozystack.victoria-metrics-operator
+cozystack.prometheus-operator-crds
+cozystack.vertical-pod-autoscaler
+cozystack.reloader
+cozystack.snapshot-controller
+cozystack.objectstorage-controller
+cozystack.gateway-application
+cozystack.info-application
+cozystack.kamaji
+cozystack.kubevirt"
+missing_sources=""
+missing_reachable=""
+for required in $derived_baseline; do
+  if ! echo "$NODES" | grep -Fxq "$required"; then
+    missing_sources="${missing_sources:+$missing_sources }$required"
+  elif ! echo "$closure" | grep -Fxq "$required"; then
+    missing_reachable="${missing_reachable:+$missing_reachable }$required"
+  fi
+done
+if [ -n "$missing_sources" ]; then
+  echo "select-install: error: required runtime PackageSource(s) not found in $SOURCES_DIR: $missing_sources" >&2
+  exit 1
+fi
+if [ -n "$missing_reachable" ]; then
+  echo "select-install: error: runtime baseline dependency closure is missing: $missing_reachable" >&2
+  exit 1
+fi
+
+if [ "$MODE" = "disabled" ]; then
+  # The complement is every PackageSource minus the audited baseline, selected
+  # owners and their declared forward closure. No declared dependency of a kept
+  # package can enter it. The explicit baseline covers the current install
+  # harness's known undeclared requirements; only a fresh live run can establish
+  # that no other operational dependency is missing.
+  echo "$NODES" | grep -vxF "$closure" | paste -sd ' ' -
+  exit 0
+fi
+
+echo "$closure" | paste -sd ' ' -
diff --git a/hack/select-install_test.bats b/hack/select-install_test.bats
new file mode 100644
index 0000000000..3d741a584b
--- /dev/null
+++ b/hack/select-install_test.bats
@@ -0,0 +1,750 @@
+#!/usr/bin/env bats
+# -----------------------------------------------------------------------------
+# Unit tests for hack/select-install.sh
+#
+# CI runs this file under Bats through `make bats-unit-tests`. It also remains
+# compatible with the legacy `hack/cozytest.sh` translator, whose awk parser
+# recognizes only @test blocks and a bare `}` on its own line. The tests avoid
+# `run`, `$status`, setup(), and teardown() for that compatibility path. Cleanup
+# stays at the last reachable line rather than in an EXIT trap, which would
+# replace Bats' bookkeeping trap and hide a failing TAP result.
+#
+# Tests that only READ the production sources call the script directly (it
+# defaults sources-dir to packages/core/platform/sources); only the tests that
+# build a synthetic graph or suite tree use a scratch dir.
+#
+# Run with: bats hack/select-install_test.bats
+# -----------------------------------------------------------------------------
+
+load test_helper
+
+assert_contains_package() {
+    printf '%s\n' "$1" | tr ' ' '\n' | grep -Fxq "$2"
+}
+
+assert_output_graph_error() {
+    mode=$1
+    sources=$2
+    expected=$3
+    requested_suite=${4:-postgres}
+    out=$(mktemp)
+    err=$(mktemp)
+    if [ "$mode" = disabled ]; then
+        if hack/select-install.sh --disabled "$requested_suite" "$sources" >"$out" 2>"$err"; then
+            echo "expected disabled mode to reject invalid graph $sources" >&2
+            exit 1
+        fi
+    elif hack/select-install.sh "$requested_suite" "$sources" >"$out" 2>"$err"; then
+        echo "expected closure mode to reject invalid graph $sources" >&2
+        exit 1
+    fi
+    [ ! -s "$out" ]
+    grep -Fq "$expected" "$err"
+    rm -f "$out" "$err"
+}
+
+@test "single app selects its forward dependency closure" {
+    output=$(hack/select-install.sh "postgres")
+    assert_contains_package "$output" cozystack.postgres-application
+    assert_contains_package "$output" cozystack.postgres-operator
+    assert_contains_package "$output" cozystack.networking
+    # engine edge is KEPT on the install walk (unlike select-e2e.sh)
+    assert_contains_package "$output" cozystack.cozystack-engine
+}
+
+@test "closure is transitive (deps of deps are pulled in)" {
+    output=$(hack/select-install.sh "postgres")
+    # cert-manager is a 2-hop dep (via postgres-operator and via the engine)
+    assert_contains_package "$output" cozystack.cert-manager
+    # gateway-api-crds is a 3-hop dep (postgres-application -> networking -> gateway-api-crds)
+    assert_contains_package "$output" cozystack.gateway-api-crds
+}
+
+@test "app pulls its direct operator dependencies" {
+    output=$(hack/select-install.sh "harbor")
+    assert_contains_package "$output" cozystack.harbor-application
+    assert_contains_package "$output" cozystack.postgres-operator
+    assert_contains_package "$output" cozystack.redis-operator
+    assert_contains_package "$output" cozystack.objectstorage-controller
+}
+
+@test "kubernetes suites keep the cluster and worker pool APIs" {
+    for suite in kubernetes-latest kubernetes-previous; do
+        output=$(hack/select-install.sh "$suite")
+        assert_contains_package "$output" cozystack.kubernetes-application
+        assert_contains_package "$output" cozystack.kubernetes-nodes-application
+    done
+}
+
+@test "mongodb keeps the operator for its PerconaServerMongoDB resources" {
+    output=$(hack/select-install.sh mongodb)
+    assert_contains_package "$output" cozystack.mongodb-application
+    assert_contains_package "$output" cozystack.mongodb-operator
+}
+
+@test "root SeaweedFS keeps COSI for suites without backup steps" {
+    output=$(hack/select-install.sh kuberture)
+    assert_contains_package "$output" cozystack.seaweedfs-application
+    assert_contains_package "$output" cozystack.objectstorage-controller
+
+    # A backup suite would hide a lost SeaweedFS edge by retaining COSI itself.
+    tmp=$(mktemp -d)
+    cp -r packages/core/platform/sources "$tmp/sources"
+    yq -i '(.spec.variants[].dependsOn) -= ["cozystack.objectstorage-controller"]' \
+      "$tmp/sources/seaweedfs-application.yaml"
+    for mode in closure disabled; do
+        assert_output_graph_error "$mode" "$tmp/sources" \
+          "runtime baseline dependency closure is missing: cozystack.objectstorage-controller" kuberture
+    done
+    rm -rf "$tmp"
+}
+
+@test "vminstance keeps both application owners" {
+    output=$(hack/select-install.sh "vminstance")
+    printf '%s\n' "$output" | tr ' ' '\n' | grep -Fxq cozystack.vm-instance-application
+    printf '%s\n' "$output" | tr ' ' '\n' | grep -Fxq cozystack.vm-disk-application
+    printf '%s\n' "$output" | tr ' ' '\n' | grep -Fxq cozystack.kubevirt-cdi
+}
+
+@test "multiple suites union their closures" {
+    output=$(hack/select-install.sh "postgres kafka")
+    assert_contains_package "$output" cozystack.postgres-application
+    assert_contains_package "$output" cozystack.kafka-application
+}
+
+@test "suite list can be read from stdin with -" {
+    output=$(printf '%s\n' "postgres kafka" | hack/select-install.sh -)
+    assert_contains_package "$output" cozystack.postgres-application
+    assert_contains_package "$output" cozystack.kafka-application
+    assert_contains_package "$output" cozystack.cozystack-engine
+}
+
+@test "empty suites select nothing" {
+    output=$(hack/select-install.sh "")
+    [ -z "$output" ]
+}
+
+@test "unmapped suites are a hard error, all reported, no partial output" {
+    # Fail closed: a suite that maps to nothing must abort, not silently emit an
+    # empty set (which would install nothing and let the run pass vacuously).
+    # Also lock the contract that EVERY bad suite is reported in one run (not
+    # just the first) and that no partial closure leaks to stdout.
+    out=$(mktemp); err=$(mktemp)
+    if hack/select-install.sh "bad-one postgres bad-two" >"$out" 2>"$err"; then
+        echo "expected a non-zero exit for unmapped suites" >&2
+        exit 1
+    fi
+    grep -q "bad-one" "$err"
+    grep -q "bad-two" "$err"
+    [ ! -s "$out" ]
+    rm -f "$out" "$err"
+}
+
+@test "suite whose source omits the -application suffix resolves via fallback" {
+    # kuberture's PackageSource is cozystack.kuberture (no -application suffix)
+    output=$(hack/select-install.sh "kuberture")
+    assert_contains_package "$output" cozystack.kuberture
+}
+
+@test "securitygroup closure includes the engine that serves sdn.cozystack.io" {
+    # Regression for the under-selection bug: the securitygroup suite applies
+    # sdn.cozystack.io/v1alpha1, served by the aggregated apiserver
+    # (a cozystack-engine component). The forward walk from the controller can't
+    # reach the engine, so it must be seeded. Assert the controller AND the
+    # engine AND the engine's stable prerequisites — asserting only the
+    # controller (a single member) is what let the bug through.
+    output=$(hack/select-install.sh "securitygroup")
+    assert_contains_package "$output" cozystack.securitygroup-controller
+    assert_contains_package "$output" cozystack.cozystack-engine
+    assert_contains_package "$output" cozystack.cert-manager
+    assert_contains_package "$output" cozystack.networking
+    assert_contains_package "$output" cozystack.gateway-api-crds
+}
+
+@test "runtime baseline rejects a lost etcd operator dependency edge" {
+    # etcd-application is also a baseline seed, so merely selecting etcd cannot
+    # prove that its operator edge is necessary.
+    tmp=$(mktemp -d)
+    cp -r packages/core/platform/sources "$tmp/sources"
+    hack/select-install.sh postgres "$tmp/sources" >/dev/null
+    yq -i '(.spec.variants[].dependsOn) -= ["cozystack.etcd-operator"]' \
+      "$tmp/sources/etcd-application.yaml"
+    for mode in closure disabled; do
+        assert_output_graph_error "$mode" "$tmp/sources" \
+          "runtime baseline dependency closure is missing: cozystack.etcd-operator"
+    done
+    rm -rf "$tmp"
+}
+
+@test "backup suites keep the APIs used by their roundtrip examples" {
+    for suite in clickhouse etcd kafka kafka-metadata mariadb mongodb postgres rabbitmq redis valkey; do
+        keep=$(hack/select-install.sh "$suite")
+        drop=$(hack/select-install.sh --disabled "$suite")
+        for required in cozystack.backupstrategy-controller cozystack.backup-controller \
+            cozystack.bucket-application cozystack.objectstorage-controller cozystack.velero; do
+            assert_contains_package "$keep" "$required"
+            case " $drop " in
+                *" $required "*) echo "suite '$suite' disables backup prerequisite '$required'" >&2; exit 1 ;;
+            esac
+        done
+    done
+    # Suites without backup steps must not acquire the backup stack as baseline.
+    drop=$(hack/select-install.sh --disabled kuberture)
+    assert_contains_package "$drop" cozystack.backupstrategy-controller
+}
+
+@test "gateway keeps the pod admission webhook used by its churn test" {
+    output=$(hack/select-install.sh gateway)
+    assert_contains_package "$output" cozystack.kubeovn-webhook
+}
+
+@test "suite runtime requirements must resolve in every selector mode" {
+    for pair in "postgres backupstrategy-controller" "gateway kubeovn-webhook"; do
+        set -- $pair
+        suite=$1
+        requirement=$2
+        tmp=$(mktemp -d)
+        cp -r packages/core/platform/sources "$tmp/sources"
+        mkdir -p "$tmp/suites/$suite"
+        : > "$tmp/suites/$suite/chainsaw-test.yaml"
+        hack/select-install.sh --validate "$tmp/sources" "$tmp/suites"
+        mv "$tmp/sources/$requirement.yaml" "$tmp/$requirement.yaml"
+        hack/select-install.sh kuberture "$tmp/sources" >/dev/null
+        for mode in closure disabled; do
+            assert_output_graph_error "$mode" "$tmp/sources" \
+              "'cozystack.$requirement' is not a PackageSource" "$suite"
+        done
+        if hack/select-install.sh --validate "$tmp/sources" "$tmp/suites" >"$tmp/out" 2>"$tmp/err"; then
+            echo "expected validation to reject a missing suite runtime requirement" >&2
+            exit 1
+        fi
+        [ ! -s "$tmp/out" ]
+        grep -Fq "maps to 'cozystack.$requirement', not a PackageSource" "$tmp/err"
+        rm -rf "$tmp"
+    done
+}
+
+@test "validate passes on the real source graph and suite mapping" {
+    hack/select-install.sh --validate
+}
+
+@test "validate detects a dangling dependency" {
+    tmp=$(mktemp -d)
+    mkdir -p "$tmp/sources" "$tmp/suites/foo"
+    : > "$tmp/suites/foo/chainsaw-test.yaml"
+    cat > "$tmp/sources/foo-application.yaml" <<'YAML'
+apiVersion: cozystack.io/v1alpha1
+kind: PackageSource
+metadata:
+  name: cozystack.foo-application
+spec:
+  variants:
+    - name: default
+      dependsOn:
+        - cozystack.does-not-exist
+YAML
+    out="$tmp/out"; err="$tmp/err"
+    if hack/select-install.sh --validate "$tmp/sources" "$tmp/suites" >"$out" 2>"$err"; then
+        echo "expected validation to fail on a dangling dependency" >&2
+        exit 1
+    fi
+    [ ! -s "$out" ]
+    grep -Fq "dangling dependency 'cozystack.does-not-exist'" "$err"
+    if grep -Fq "found no chainsaw-test.yaml" "$err"; then
+        echo "positive-control suite discovery failed instead of graph validation" >&2
+        exit 1
+    fi
+    rm -rf "$tmp"
+}
+
+@test "validate detects a dependency cycle" {
+    tmp=$(mktemp -d)
+    mkdir -p "$tmp/sources" "$tmp/suites/a"
+    : > "$tmp/suites/a/chainsaw-test.yaml"
+    cat > "$tmp/sources/a.yaml" <<'YAML'
+apiVersion: cozystack.io/v1alpha1
+kind: PackageSource
+metadata:
+  name: cozystack.a
+spec:
+  variants:
+    - name: default
+      dependsOn:
+        - cozystack.b
+YAML
+    cat > "$tmp/sources/b.yaml" <<'YAML'
+apiVersion: cozystack.io/v1alpha1
+kind: PackageSource
+metadata:
+  name: cozystack.b
+spec:
+  variants:
+    - name: default
+      dependsOn:
+        - cozystack.a
+YAML
+    out="$tmp/out"; err="$tmp/err"
+    if hack/select-install.sh --validate "$tmp/sources" "$tmp/suites" >"$out" 2>"$err"; then
+        echo "expected validation to fail on a dependency cycle" >&2
+        exit 1
+    fi
+    [ ! -s "$out" ]
+    grep -Fq "dependency cycle detected involving 'cozystack.a'" "$err"
+    if grep -Fq "found no chainsaw-test.yaml" "$err"; then
+        echo "positive-control suite discovery failed instead of graph validation" >&2
+        exit 1
+    fi
+    rm -rf "$tmp"
+}
+
+@test "output modes reject a removed runtime source" {
+    tmp=$(mktemp -d)
+    cp -r packages/core/platform/sources "$tmp/sources"
+    mv "$tmp/sources/reloader.yaml" "$tmp/reloader.yaml"
+    for mode in closure disabled; do
+        assert_output_graph_error "$mode" "$tmp/sources" \
+          "dangling dependency 'cozystack.reloader'"
+    done
+
+    yq -i '(.spec.variants[].dependsOn) -= ["cozystack.reloader"]' \
+      "$tmp/sources/linstor.yaml"
+    for mode in closure disabled; do
+        assert_output_graph_error "$mode" "$tmp/sources" \
+          "required runtime PackageSource(s) not found in $tmp/sources: cozystack.reloader"
+    done
+    rm -rf "$tmp"
+}
+
+@test "output modes reject a dangling dependency in an unselected package" {
+    tmp=$(mktemp -d)
+    cp -r packages/core/platform/sources "$tmp/sources"
+    yq -i '.spec.variants[0].dependsOn += ["cozystack.does-not-exist"]' \
+      "$tmp/sources/kafka-application.yaml"
+    for mode in closure disabled; do
+        assert_output_graph_error "$mode" "$tmp/sources" \
+          "dangling dependency 'cozystack.does-not-exist' (referenced by: cozystack.kafka-application)"
+    done
+    rm -rf "$tmp"
+}
+
+@test "output modes reject selected and unselected dependency cycles" {
+    tmp=$(mktemp -d)
+    cp -r packages/core/platform/sources "$tmp/selected"
+    cp -r packages/core/platform/sources "$tmp/unselected"
+    yq -i '.spec.variants[0].dependsOn += ["cozystack.postgres-application"]' \
+      "$tmp/selected/postgres-application.yaml"
+    yq -i '.spec.variants[0].dependsOn += ["cozystack.kafka-application"]' \
+      "$tmp/unselected/kafka-application.yaml"
+    for mode in closure disabled; do
+        assert_output_graph_error "$mode" "$tmp/selected" \
+          "dependency cycle detected involving 'cozystack.postgres-application'"
+        assert_output_graph_error "$mode" "$tmp/unselected" \
+          "dependency cycle detected involving 'cozystack.kafka-application'"
+    done
+    rm -rf "$tmp"
+}
+
+@test "validate detects a suite directory with no source mapping" {
+    tmp=$(mktemp -d)
+    mkdir -p "$tmp/suites/totally-unmapped-suite"
+    : > "$tmp/suites/totally-unmapped-suite/chainsaw-test.yaml"
+    # real graph (so graph checks pass); the only failure is the unmapped suite
+    if hack/select-install.sh --validate packages/core/platform/sources "$tmp/suites" 2>/dev/null; then
+        echo "expected validation to fail on an unmapped suite dir" >&2
+        exit 1
+    fi
+    rm -rf "$tmp"
+}
+
+@test "validate sees a suite written as chainsaw-test.yml" {
+    # Chainsaw runs a chainsaw-test.yml suite, so the mapping check has to see
+    # one too, or an unmapped suite spelled that way passes validation.
+    tmp=$(mktemp -d)
+    mkdir -p "$tmp/suites/totally-unmapped-suite"
+    : > "$tmp/suites/totally-unmapped-suite/chainsaw-test.yml"
+    err=$(hack/select-install.sh --validate packages/core/platform/sources "$tmp/suites" 2>&1 1>/dev/null) && {
+        echo "expected validation to fail on an unmapped .yml suite" >&2
+        exit 1
+    }
+    echo "$err" | grep -q "suite 'totally-unmapped-suite' has no PackageSource mapping"
+    rm -rf "$tmp"
+}
+
+@test "validate sees a suite made only of numbered step files" {
+    # Chainsaw runs a directory of 01-*.yaml step files as a suite when it holds
+    # no chainsaw-test.*, so the mapping check has to see that layout too. The
+    # step file is a symlink because Chainsaw counts one.
+    tmp=$(mktemp -d)
+    mkdir -p "$tmp/suites/totally-unmapped-suite"
+    : > "$tmp/install.yaml"
+    ln -s "$tmp/install.yaml" "$tmp/suites/totally-unmapped-suite/00-install.yaml"
+    err=$(hack/select-install.sh --validate packages/core/platform/sources "$tmp/suites" 2>&1 1>/dev/null) && {
+        echo "expected validation to fail on an unmapped step-file suite" >&2
+        exit 1
+    }
+    echo "$err" | grep -q "suite 'totally-unmapped-suite' has no PackageSource mapping"
+    rm -rf "$tmp"
+}
+
+@test "validate ignores what Chainsaw does not load as a step file" {
+    # Chainsaw skips a step-file name when the entry is a directory, and a name
+    # with no leading number is not a step file, so neither makes a suite that
+    # needs a mapping.
+    tmp=$(mktemp -d)
+    mkdir -p "$tmp/suites/postgres" "$tmp/suites/totally-unmapped-suite/01-x.yaml"
+    : > "$tmp/suites/totally-unmapped-suite/-install.yaml"
+    : > "$tmp/suites/postgres/chainsaw-test.yaml"
+    hack/select-install.sh --validate packages/core/platform/sources "$tmp/suites"
+    rm -rf "$tmp"
+}
+
+@test "validate sees a directory named chainsaw-test.yaml or .yml" {
+    # Chainsaw stats chainsaw-test.yaml or .yml without checking its type, so a
+    # directory of that name fails discovery loudly. Listing its suite keeps
+    # that failure where a run reaches it instead of leaving the suite out.
+    for name in chainsaw-test.yaml chainsaw-test.yml; do
+        tmp=$(mktemp -d)
+        mkdir -p "$tmp/suites/totally-unmapped-suite/$name"
+        : > "$tmp/suites/totally-unmapped-suite/$name/x"
+        err=$(hack/select-install.sh --validate packages/core/platform/sources "$tmp/suites" 2>&1 1>/dev/null) && {
+            echo "expected validation to fail on an unmapped suite with a $name directory" >&2
+            exit 1
+        }
+        echo "$err" | grep -q "suite 'totally-unmapped-suite' has no PackageSource mapping"
+        rm -rf "$tmp"
+    done
+}
+
+@test "validate sees a suite nested below a top-level directory" {
+    # Chainsaw walks every directory under the one it is handed, so a test in a
+    # subdirectory runs as part of its top-level directory, which then needs a
+    # mapping like any other suite.
+    tmp=$(mktemp -d)
+    mkdir -p "$tmp/suites/totally-unmapped-suite/cases"
+    : > "$tmp/suites/totally-unmapped-suite/cases/chainsaw-test.yaml"
+    err=$(hack/select-install.sh --validate packages/core/platform/sources "$tmp/suites" 2>&1 1>/dev/null) && {
+        echo "expected validation to fail on an unmapped nested suite" >&2
+        exit 1
+    }
+    echo "$err" | grep -q "suite 'totally-unmapped-suite' has no PackageSource mapping"
+    rm -rf "$tmp"
+}
+
+@test "validate fails when the suite listing itself fails" {
+    # A failed find and an empty suites dir used to read the same: the error
+    # went to /dev/null and the pipeline reported sort's status, so the mapping
+    # check validated nothing and passed.
+    tmp=$(mktemp -d)
+    mkdir "$tmp/bin"
+    printf '#!/bin/sh\necho "find: broken fixture" >&2\nexit 1\n' > "$tmp/bin/find"
+    chmod +x "$tmp/bin/find"
+    err=$(PATH="$tmp/bin:$PATH" hack/select-install.sh --validate 2>&1 1>/dev/null) && {
+        echo "expected validate to fail when find fails" >&2
+        exit 1
+    }
+    echo "$err" | grep -q "select-install: find failed listing the suites"
+    rm -rf "$tmp"
+}
+
+@test "validate detects a suite mapped to a source absent from the graph" {
+    # suite_to_source() hardcodes securitygroup -> cozystack.securitygroup-controller;
+    # a sources dir without that PackageSource must fail validation (fail closed),
+    # pinning that the elif validates every mapping, including hardcoded ones,
+    # against the graph.
+    tmp=$(mktemp -d)
+    mkdir -p "$tmp/sources" "$tmp/suites/securitygroup"
+    : > "$tmp/suites/securitygroup/chainsaw-test.yaml"
+    cat > "$tmp/sources/standalone.yaml" <<'YAML'
+apiVersion: cozystack.io/v1alpha1
+kind: PackageSource
+metadata:
+  name: cozystack.standalone
+spec:
+  variants:
+    - name: default
+YAML
+    err=$(hack/select-install.sh --validate "$tmp/sources" "$tmp/suites" 2>&1 1>/dev/null) && {
+        echo "expected validation to fail on a mapping to a missing source" >&2
+        exit 1
+    }
+    echo "$err" | grep -q "maps to 'cozystack.securitygroup-controller', not a PackageSource"
+    rm -rf "$tmp"
+}
+
+@test "validate fails when the suites dir does not exist" {
+    tmp=$(mktemp -d)
+    # real graph passes the graph checks; a missing suites dir must still FAIL
+    # (find would yield nothing and silently pass the mapping check otherwise).
+    if hack/select-install.sh --validate packages/core/platform/sources "$tmp/does-not-exist" 2>/dev/null; then
+        echo "expected validate to fail on a missing suites dir" >&2
+        exit 1
+    fi
+    rm -rf "$tmp"
+}
+
+@test "validate fails when suite discovery fails" {
+    tmp=$(mktemp -d)
+    mkdir -p "$tmp/bin" "$tmp/suites/one"
+    : > "$tmp/suites/one/chainsaw-test.yaml"
+    cat > "$tmp/bin/find" <<'SH'
+#!/bin/sh
+exit 42
+SH
+    chmod +x "$tmp/bin/find"
+    out=$(mktemp); err=$(mktemp)
+    if PATH="$tmp/bin:$PATH" hack/select-install.sh --validate \
+        packages/core/platform/sources "$tmp/suites" >"$out" 2>"$err"; then
+        echo "expected validate to fail when find fails" >&2
+        exit 1
+    fi
+    [ ! -s "$out" ]
+    grep -Fq "find failed listing the suites" "$err"
+    rm -rf "$tmp"; rm -f "$out" "$err"
+}
+
+@test "yq producer failures cannot become a successful partial graph" {
+    tmp=$(mktemp -d)
+    mkdir -p "$tmp/bin"
+    real_yq=$(command -v yq)
+    cat > "$tmp/bin/yq" <<'SH'
+#!/bin/sh
+case "${FAIL_YQ:-}" in
+  names)
+    case "$*" in
+      *metadata.name*) echo cozystack.partial; exit 42 ;;
+    esac
+    ;;
+  dependencies)
+    case "$*" in
+      *spec.variants*) printf 'cozystack.partial\tcozystack.missing\n'; exit 42 ;;
+    esac
+    ;;
+esac
+exec "$REAL_YQ" "$@"
+SH
+    chmod +x "$tmp/bin/yq"
+    for stage in names dependencies; do
+        out="$tmp/$stage.out"; err="$tmp/$stage.err"
+        if REAL_YQ="$real_yq" FAIL_YQ="$stage" PATH="$tmp/bin:$PATH" \
+            hack/select-install.sh postgres >"$out" 2>"$err"; then
+            echo "expected the $stage yq failure to propagate" >&2
+            exit 1
+        fi
+        [ ! -s "$out" ]
+        grep -Fq "yq failed while reading PackageSource" "$err"
+    done
+    rm -rf "$tmp"
+}
+
+@test "closure fails closed when the engine PackageSource is absent" {
+    tmp=$(mktemp -d)
+    mkdir -p "$tmp/sources"
+    # a lone app source, with no cozystack.cozystack-engine in the graph
+    cat > "$tmp/sources/foo-application.yaml" <<'YAML'
+apiVersion: cozystack.io/v1alpha1
+kind: PackageSource
+metadata:
+  name: cozystack.foo-application
+spec:
+  variants:
+    - name: default
+YAML
+    if hack/select-install.sh "foo" "$tmp/sources" 2>/dev/null; then
+        echo "expected a non-zero exit when the engine source is missing" >&2
+        exit 1
+    fi
+    rm -rf "$tmp"
+}
+
+# --disabled emits the complement of the closure: what bundles.disabledPackages
+# must hold so an ordinary platform variant installs only what the suites need.
+@test "disabled mode: closure and complement partition the source list" {
+    # Count names only after yq itself has succeeded; dash has no pipefail.
+    names=$(yq -rN '.metadata.name | select(. != null and . != "")' \
+              packages/core/platform/sources/*.yaml)
+    total=$(printf '%s\n' "$names" | sort -u | wc -l | tr -d ' ')
+    keep_output=$(hack/select-install.sh "postgres")
+    drop_output=$(hack/select-install.sh --disabled "postgres")
+    keep=$(printf '%s\n' "$keep_output" | wc -w | tr -d ' ')
+    drop=$(printf '%s\n' "$drop_output" | wc -w | tr -d ' ')
+    sum=$((keep + drop))
+    if [ "$sum" -ne "$total" ]; then
+        echo "closure ($keep) + complement ($drop) = $sum, but there are $total PackageSources" >&2
+        exit 1
+    fi
+    inventory=$(printf '%s\n' "$names" | sort -u)
+    partition=$(printf '%s\n%s\n' "$keep_output" "$drop_output" | tr ' ' '\n' | sort -u)
+    [ "$partition" = "$inventory" ]
+}
+
+@test "disabled mode accepts a valid inventory with an empty complement" {
+    tmp=$(mktemp -d)
+    mkdir -p "$tmp/sources"
+    keep=$(hack/select-install.sh postgres)
+    for source in $keep; do
+        name=${source#cozystack.}
+        cp "packages/core/platform/sources/$name.yaml" "$tmp/sources/"
+    done
+    output=$(hack/select-install.sh --disabled postgres "$tmp/sources")
+    [ -z "$output" ]
+    rm -rf "$tmp"
+}
+
+@test "disabled mode: never lists a package the closure keeps" {
+    keep=$(hack/select-install.sh "postgres kafka")
+    drop=$(hack/select-install.sh --disabled "postgres kafka")
+    for k in $keep; do
+        case " $drop " in
+            *" $k "*) echo "package '$k' is both kept and disabled" >&2; exit 1 ;;
+        esac
+    done
+}
+
+# A declared dependency of something kept can never land in the complement.
+# Assert the property over every suite instead of citing an unreachable pair.
+@test "disabled mode: no kept package has a dependency in the complement" {
+    deps=$(mktemp)
+    yq -rN '.metadata.name as $n | .spec.variants[]?.dependsOn[]? | select(. != null and . != "") | $n + " " + .' \
+      packages/core/platform/sources/*.yaml > "$deps"
+
+    for suite in $(find hack/e2e-chainsaw -mindepth 2 -maxdepth 2 -name chainsaw-test.yaml \
+                    | sed -e 's,^hack/e2e-chainsaw/,,' -e 's,/chainsaw-test\.yaml$,,'); do
+        keep=$(hack/select-install.sh "$suite")
+        drop=$(hack/select-install.sh --disabled "$suite")
+        for k in $keep; do
+            for d in $(awk -v owner="$k" '$1 == owner {print $2}' "$deps"); do
+                case " $drop " in
+                    *" $d "*)
+                        echo "suite '$suite': kept '$k' depends on '$d', which is in the disable list" >&2
+                        rm -f "$deps"; exit 1 ;;
+                esac
+            done
+        done
+    done
+    rm -f "$deps"
+}
+
+# Direct seeds correspond to unconditional install steps, even when another
+# baseline source also reaches them through dependsOn.
+@test "disabled mode: never disables the direct runtime baseline" {
+    drop=$(hack/select-install.sh --disabled "postgres")
+    for b in cozystack.cozystack-engine cozystack.flux-shard-operator cozystack.cozystack-basics \
+             cozystack.tenant-application cozystack.etcd-application \
+             cozystack.ingress-application cozystack.monitoring-application \
+             cozystack.seaweedfs-application cozystack.linstor \
+             cozystack.kubevirt-cdi cozystack.metallb cozystack.capi-operator \
+             cozystack.capi-provider-bootstrap-kubeadm \
+             cozystack.capi-provider-core cozystack.capi-provider-cp-kamaji \
+             cozystack.capi-provider-infra-kubevirt cozystack.keycloak \
+             cozystack.keycloak-operator cozystack.multus \
+             cozystack.cozystack-scheduler cozystack.linstor-scheduler \
+             cozystack.flux-plunger cozystack.cozy-proxy cozystack.ouroboros; do
+        case " $drop " in
+            *" $b "*) echo "baseline package '$b' is in the disable list" >&2; exit 1 ;;
+        esac
+    done
+}
+
+@test "runtime baseline reaches every derived controller and CRD prerequisite" {
+    keep=$(hack/select-install.sh "postgres")
+    for required in cozystack.cert-manager cozystack.networking \
+        cozystack.gateway-api-crds cozystack.etcd-operator \
+        cozystack.grafana-operator cozystack.postgres-operator \
+        cozystack.victoria-metrics-operator cozystack.prometheus-operator-crds \
+        cozystack.vertical-pod-autoscaler cozystack.reloader \
+        cozystack.snapshot-controller cozystack.gateway-application \
+        cozystack.info-application cozystack.kamaji cozystack.kubevirt; do
+        if ! printf '%s\n' "$keep" | tr ' ' '\n' | grep -Fxq "$required"; then
+            echo "runtime baseline is missing derived prerequisite '$required'" >&2
+            exit 1
+        fi
+    done
+}
+
+@test "runtime baseline fails closed when a provider prerequisite edge is lost" {
+    tmp=$(mktemp -d)
+    cp -r packages/core/platform/sources "$tmp/sources"
+    yq -i '(.spec.variants[].dependsOn) -= ["cozystack.kamaji"]' \
+      "$tmp/sources/capi-provider-cp-kamaji.yaml"
+    out="$tmp/out"; err="$tmp/err"
+    if hack/select-install.sh postgres "$tmp/sources" >"$out" 2>"$err"; then
+        echo "expected a missing Kamaji prerequisite to fail closed" >&2
+        exit 1
+    fi
+    [ ! -s "$out" ]
+    grep -Fq "runtime baseline dependency closure is missing: cozystack.kamaji" "$err"
+
+    cp packages/core/platform/sources/capi-provider-cp-kamaji.yaml \
+      "$tmp/sources/capi-provider-cp-kamaji.yaml"
+    yq -i '(.spec.variants[].dependsOn) -= ["cozystack.kubevirt"]' \
+      "$tmp/sources/capi-provider-infra-kubevirt.yaml"
+    if hack/select-install.sh postgres "$tmp/sources" >"$out" 2>"$err"; then
+        echo "expected a missing KubeVirt prerequisite to fail closed" >&2
+        exit 1
+    fi
+    [ ! -s "$out" ]
+    grep -Fq "runtime baseline dependency closure is missing: cozystack.kubevirt" "$err"
+    rm -rf "$tmp"
+}
+
+@test "runtime baseline fails closed when storage prerequisite edges are lost" {
+    tmp=$(mktemp -d)
+    cp -r packages/core/platform/sources "$tmp/sources"
+    yq -i '(.spec.variants[].dependsOn) -= ["cozystack.reloader", "cozystack.snapshot-controller"]' \
+      "$tmp/sources/linstor.yaml"
+    out="$tmp/out"; err="$tmp/err"
+    if hack/select-install.sh postgres "$tmp/sources" >"$out" 2>"$err"; then
+        echo "expected missing LINSTOR prerequisites to fail closed" >&2
+        exit 1
+    fi
+    [ ! -s "$out" ]
+    grep -Fq "cozystack.reloader" "$err"
+    grep -Fq "cozystack.snapshot-controller" "$err"
+    rm -rf "$tmp"
+}
+
+@test "generated Helm values fixture matches the current disable list" {
+    generated_raw=$(hack/select-install.sh --disabled postgres)
+    generated=$(printf '%s\n' "$generated_raw" | tr ' ' '\n' | sort)
+    fixture_raw=$(yq -r '.bundles.disabledPackages[]' \
+      packages/core/platform/tests/fixtures/selective-install-postgres-values.yaml)
+    fixture=$(printf '%s\n' "$fixture_raw" | sort)
+    if [ "$generated" != "$fixture" ]; then
+        echo "selective-install-postgres-values.yaml is stale; regenerate it from select-install.sh" >&2
+        exit 1
+    fi
+
+    tmp=$(mktemp -d)
+    cp -r packages/core/platform/sources "$tmp/sources"
+    cat > "$tmp/sources/fixture-drift.yaml" <<'YAML'
+apiVersion: cozystack.io/v1alpha1
+kind: PackageSource
+metadata:
+  name: cozystack.fixture-drift
+spec:
+  variants:
+    - name: default
+YAML
+    drifted_raw=$(hack/select-install.sh --disabled postgres "$tmp/sources")
+    drifted=$(printf '%s\n' "$drifted_raw" | tr ' ' '\n' | sort)
+    if [ "$drifted" = "$fixture" ]; then
+        echo "a new PackageSource did not invalidate the generated fixture" >&2
+        exit 1
+    fi
+    printf '%s\n' "$drifted" | grep -Fxq cozystack.fixture-drift
+    rm -rf "$tmp"
+}
+
+# An empty closure would make the complement the entire platform. As an install
+# instruction that is a platform with no packages, so it must refuse rather than
+# emit it.
+@test "disabled mode: refuses an empty selection" {
+    out=$(mktemp); err=$(mktemp)
+    if hack/select-install.sh --disabled "" >"$out" 2>"$err"; then
+        echo "expected a non-zero exit for an empty selection, got: $(cat "$out")" >&2
+        rm -f "$out" "$err"; exit 1
+    fi
+    grep -q "refusing to emit a disable list" "$err" \
+      || { echo "expected the refusal message, got: $(cat "$err")" >&2; rm -f "$out" "$err"; exit 1; }
+    rm -f "$out" "$err"
+}
diff --git a/hack/stitch-multiarch.sh b/hack/stitch-multiarch.sh
new file mode 100755
index 0000000000..d52bb6cb43
--- /dev/null
+++ b/hack/stitch-multiarch.sh
@@ -0,0 +1,277 @@
+#!/bin/sh
+# Join the amd64 and arm64 builds of every first-party image into one
+# multi-arch index, and repin the packages tree on the index digests.
+#
+# Usage: hack/stitch-multiarch.sh <packages-root> <registry> <image-tag>
+#   <packages-root>  a tree stamped by the amd64 build (packages/, or an
+#                    extracted artifact with the same <group>/<pkg> layout)
+#   <registry>       the registry both builds pushed to
+#   <image-tag>      the amd64 build's IMAGE_TAG; the arm64 build pushed each
+#                    image as <image-tag>-arm64
+#
+# The amd64 build and the arm64 leg run on separate native runners, so each
+# pushes a single-platform image. For every ref <registry>/<repo>[:<t>]@A in
+# the tree, whatever tag <t> it carries, with <tag> the <image-tag>:
+#
+#   1. B is the digest of <repo>:<tag>-arm64. No such image is not an error:
+#      matchbox is built for both arches by the amd64 job and the e2e
+#      sandbox for amd64 only, so neither has an arm64 twin; the ref is
+#      skipped and named in the summary.
+#   2. Every tag this build pushed for <repo> is moved to an index of A and B
+#      if it points at A, so none is left naming the amd64 half alone: <tag>,
+#      the tag <t> the ref carries, and every <repo>:<tag> line in the file
+#      PUSHED_TAGS_LOG names. image-tags in hack/common-envs.mk writes that
+#      log when the variable is set and PUSH=1, and it is how the component
+#      version pushed beside <image-tag> under PUBLISH_VERSIONED=1 is found,
+#      since most refs name only <image-tag>. These are the only tags read;
+#      a tag of another build that sits on the same bytes is not this build's
+#      to move.
+#      PUSHED_TAGS_LOG set to a file that does not exist fails the run.
+#   3. A is replaced with the index digest in the files hack/lib/image-refs.sh
+#      enumerates, and nowhere else.
+#
+# When <tag> already points at an index of A and an arm64 image, as it does on
+# a rerun of a stitch that failed partway, that index is used as is and copied
+# to the build's other tags still left on A. <tag> pointing anywhere else means
+# another build moved it and the tree no longer matches the registry, so the
+# run fails.
+#
+# A registry read answered with a rate limit or a 5xx is retried, three tries
+# in all, STITCH_RETRY_DELAY seconds (default 10) times the attempt apart; any
+# other registry error fails the run at once.
+#
+# The rewrite is as narrow as the enumeration, so the check after it is not:
+# any sha256:A left under the tree outside charts/, gzip payloads included,
+# fails the run. A ref whose digest also sits in a file the rewrite does not
+# reach is skipped before anything is pushed, since rewriting only some of its
+# copies would split one image across two digests. The one gzip it rewrites is
+# declared in GZIP_COPIES below; see docs/agents/image-refs.md.
+#
+# Requires: skopeo, docker buildx, jq, sha256sum, gzip, yq (mikefarah), and a
+# login to <registry> that both skopeo and docker read (REGISTRY_AUTH_FILE for
+# skopeo).
+set -eu
+
+ROOT="${1:?usage: stitch-multiarch.sh <packages-root> <registry> <image-tag>}"
+REGISTRY="${2:?usage: stitch-multiarch.sh <packages-root> <registry> <image-tag>}"
+IMAGE_TAG="${3:?usage: stitch-multiarch.sh <packages-root> <registry> <image-tag>}"
+
+ROOT="${ROOT%/}"
+[ -d "$ROOT" ] || { echo "packages-root '$ROOT' is not a directory" >&2; exit 1; }
+for _tool in skopeo docker jq sha256sum gzip yq; do
+  command -v "$_tool" >/dev/null || { echo "$_tool is required" >&2; exit 1; }
+done
+if [ -n "${PUSHED_TAGS_LOG:-}" ] && [ ! -f "$PUSHED_TAGS_LOG" ]; then
+  echo "PUSHED_TAGS_LOG '$PUSHED_TAGS_LOG' does not exist; the build recorded no tags" >&2
+  exit 1
+fi
+
+# shellcheck source=hack/lib/image-refs.sh
+. "$(dirname "$0")/lib/image-refs.sh"
+
+# sk runs skopeo and asks again on a rate limit or a 5xx, which say nothing
+# about the image; any other failure, or one that outlasts the tries, is
+# returned with skopeo's message.
+sk() {
+  _sk_err="$(mktemp)"
+  _sk_try=1
+  while :; do
+    if skopeo "$@" 2>"$_sk_err"; then rm -f "$_sk_err"; return 0; fi
+    if [ "$_sk_try" -ge 3 ] \
+      || ! grep -qiE 'toomanyrequests|too many requests|status:? (429|5[0-9][0-9])|status code (429|5[0-9][0-9])' "$_sk_err"; then
+      cat "$_sk_err" >&2
+      rm -f "$_sk_err"
+      return 1
+    fi
+    sleep $((_sk_try * ${STITCH_RETRY_DELAY:-10}))
+    _sk_try=$((_sk_try + 1))
+  done
+}
+
+# manifest_digest <ref> prints the digest of <ref>'s raw manifest, or nothing
+# when the registry says it does not exist. Any other failure returns non-zero:
+# a rate limit read as "no arm64 image" would quietly ship amd64 only.
+manifest_digest() {
+  _md_out="$(mktemp)"
+  _md_err="$(mktemp)"
+  if sk inspect --raw "docker://$1" >"$_md_out" 2>"$_md_err" && [ -s "$_md_out" ]; then
+    printf 'sha256:%s' "$(sha256sum <"$_md_out" | cut -d' ' -f1)"
+    rm -f "$_md_out" "$_md_err"
+    return 0
+  fi
+  if grep -qiE 'manifest unknown|not found|404' "$_md_err"; then
+    rm -f "$_md_out" "$_md_err"
+    return 0
+  fi
+  echo "::error::cannot read the manifest of $1: $(tr '\n' ' ' <"$_md_err")" >&2
+  rm -f "$_md_out" "$_md_err"
+  return 1
+}
+
+# image_arch <repo@digest> prints the architecture of a single-platform image,
+# or nothing for an index or a non-image artifact. A registry error returns
+# non-zero, like manifest_digest.
+image_arch() {
+  _ia_raw="$(sk inspect --raw "docker://$1")" || return 1
+  printf '%s' "$_ia_raw" | jq -r '.config.mediaType // empty' \
+    | grep -qE 'image\.config|container\.image' || return 0
+  _ia_cfg="$(sk inspect --config "docker://$1")" || return 1
+  printf '%s' "$_ia_cfg" | jq -r '.architecture // empty'
+}
+
+# Every lookup below is assigned before it is compared: `set -e` aborts on a
+# failed command substitution only in a plain assignment, and inside a test a
+# registry error would read as a mismatch and turn into a skip.
+
+skipped=""
+skipped_n=0
+skip() {
+  skipped="${skipped}${skipped:+, }$1"
+  skipped_n=$((skipped_n + 1))
+  echo "::warning::stitch: skipping $1: $2" >&2
+}
+
+# "<gzip>=<plain file>" pairs, root-relative. The kamaji provider's chart ships
+# its components only as files/components.gz, which the package's image target
+# builds from control-plane-components.yaml with `gzip -nc`. Both copies are
+# rewritten, the gzip by decompressing, rewriting and recompressing with -n,
+# which is byte for byte what that target writes as long as both run GNU gzip,
+# as CI does (Apple's gzip compresses differently). The list is not in
+# image-refs.sh: the mirror's host rewrite there cannot reach inside a gzip, and
+# declaring only the plain copy to it would split the two.
+GZIP_COPIES="system/capi-providers-cpprovider/files/components.gz=system/capi-providers-cpprovider/files/control-plane-components.yaml"
+
+ref_files="$(image_ref_files "$ROOT")"
+gz_files=""
+for _pair in $GZIP_COPIES; do
+  [ -f "$ROOT/${_pair%%=*}" ] || continue
+  gz_files="${gz_files}${gz_files:+
+}${ROOT}/${_pair%%=*}"
+  ref_files="${ref_files}
+${ROOT}/${_pair#*=}"
+done
+
+# pinned_in <digest> lists every file outside charts/ that pins it, looking
+# inside gzips too: grep -I skips them as binary.
+pinned_in() {
+  grep -rIl --exclude-dir=charts "$1" "$ROOT" || true
+  find "$ROOT" -name charts -prune -o -type f -name '*.gz' -print | while IFS= read -r _gz; do
+    if gzip -dc "$_gz" 2>/dev/null | grep -q "$1"; then printf '%s\n' "$_gz"; fi
+  done
+}
+reg_re="$(printf '%s' "$REGISTRY" | sed -e 's/[].[^$*/\\]/\\&/g')"
+
+# "<repo> <digest> <tags>" per owned image, <tags> the comma-joined tags its
+# refs carry, or "-". Every build pushed the image under <image-tag>; a
+# component-versioned ref names its component version, pushed beside it. The
+# packages artifact is not an image; the caller republishes it from the
+# rewritten tree. grep -o drops anything around the ref, such as a
+# --migrate-image= prefix.
+pairs="$(collect_image_refs "$ROOT" \
+  | grep -oE "${reg_re}/[^@[:space:]\"']+@sha256:[0-9a-f]{64}" \
+  | while IFS= read -r _ref; do
+      _name="${_ref%@*}"
+      _last="${_name##*/}"
+      _t=-
+      if [ "${_last#*:}" != "$_last" ]; then _t="${_last#*:}"; fi
+      printf '%s/%s %s %s\n' "${_name%/*}" "${_last%%:*}" "${_ref##*@}" "$_t"
+    done \
+  | grep -v "^${reg_re}/cozystack-packages " \
+  | sort -u \
+  | awk '{ k = $1 " " $2; if (!(k in t)) { order[++n] = k; t[k] = "" } if ($3 != "-") t[k] = t[k] "," $3 }
+      END { for (i = 1; i <= n; i++) { v = t[order[i]]; sub(/^,/, "", v); print order[i], (v == "" ? "-" : v) } }')" || true
+[ -n "$pairs" ] || { echo "no ${REGISTRY}/ refs found under ${ROOT}; is this a tree the build stamped?" >&2; exit 1; }
+tag="$IMAGE_TAG"
+
+stitched=""
+stitched_n=0
+stitched_digests=""
+
+# tags_at_a sets $move to a --tag flag for each tag this build pushed for
+# $repo that still points at $a.
+tags_at_a() {
+  move=""
+  logged=""
+  if [ -n "${PUSHED_TAGS_LOG:-}" ]; then
+    logged="$(awk -v r="$repo" 'index($0, r ":") == 1 { t = substr($0, length(r) + 2); if (t !~ /[\/:]/) print t }' "$PUSHED_TAGS_LOG")"
+  fi
+  for t in $tag $(printf '%s' "$reftags" | tr ',' ' ') $logged; do
+    [ "$t" != - ] || continue
+    case "$move " in *" --tag ${repo}:${t} "*) continue ;; esac
+    d="$(manifest_digest "${repo}:${t}")"
+    if [ "$d" = "$a" ]; then move="${move} --tag ${repo}:${t}"; fi
+  done
+}
+# fd 3, so a registry client that reads stdin cannot swallow the list.
+while read -r repo a reftags <&3; do
+  name="${repo##*/}"
+
+  b="$(manifest_digest "${repo}:${tag}-arm64")"
+  if [ -z "$b" ]; then skip "$name" "no ${tag}-arm64 image"; continue; fi
+  elsewhere="$(pinned_in "$a" | grep -vxF "${ref_files}${gz_files:+
+}${gz_files}" || true)"
+  if [ -n "$elsewhere" ]; then
+    skip "$name" "digest also pinned in $(echo "$elsewhere" | tr '\n' ' ')which the rewrite does not reach"; continue
+  fi
+  cur="$(manifest_digest "${repo}:${tag}")"
+
+  if [ "$cur" = "$a" ]; then
+    arch_a="$(image_arch "${repo}@${a}")"
+    arch_b="$(image_arch "${repo}@${b}")"
+    if [ "$arch_a" != amd64 ] || [ "$arch_b" != arm64 ]; then
+      skip "$name" "${tag} and ${tag}-arm64 are not one amd64 and one arm64 image"; continue
+    fi
+
+    tags_at_a
+    [ -n "$move" ] || { echo "::error::no tag of ${repo} left to move to the index" >&2; exit 1; }
+    # $move is a list of --tag words; tags cannot contain whitespace.
+    # shellcheck disable=SC2086
+    docker buildx imagetools create $move "${repo}@${a}" "${repo}@${b}"
+    index="$(manifest_digest "${repo}:${tag}")"
+    [ -n "$index" ] && [ "$index" != "$a" ] || { echo "::error::${repo}:${tag} did not move to an index" >&2; exit 1; }
+  else
+    [ -n "$cur" ] || { echo "::error::${repo}:${tag} does not exist, though the tree pins it" >&2; exit 1; }
+    raw="$(sk inspect --raw "docker://${repo}@${cur}")"
+    # Its arm64 half need not be this run's B: a rerun rebuilds the arm64
+    # image, which need not reproduce it byte for byte.
+    if ! printf '%s' "$raw" | jq -e --arg a "$a" \
+      '(.manifests // []) as $m | any($m[]; .digest == $a) and any($m[]; .platform.architecture == "arm64")' >/dev/null; then
+      echo "::error::${repo}:${tag} points at ${cur}, which is neither the digest the tree pins (${a}) nor an index of it and an arm64 image" >&2
+      exit 1
+    fi
+    index="$cur"
+    # An attempt that died inside imagetools create may have moved <tag> and
+    # not the others; copy the index to any still left on A.
+    tags_at_a
+    # shellcheck disable=SC2086
+    if [ -n "$move" ]; then docker buildx imagetools create $move "${repo}@${index}"; fi
+  fi
+
+  for f in $ref_files; do
+    grep -q "$a" "$f" || continue
+    sed "s|${a}|${index}|g" "$f" >"$f.stitch"
+    cat "$f.stitch" >"$f"
+    rm -f "$f.stitch"
+  done
+  for f in $gz_files; do
+    gzip -dc "$f" | grep -q "$a" || continue
+    gzip -dc "$f" | sed "s|${a}|${index}|g" | gzip -n >"$f.stitch"
+    cat "$f.stitch" >"$f"
+    rm -f "$f.stitch"
+  done
+  stitched="${stitched}${stitched:+, }${name}"
+  stitched_n=$((stitched_n + 1))
+  stitched_digests="${stitched_digests} ${a}"
+done 3<<EOF
+$pairs
+EOF
+
+for a in $stitched_digests; do
+  left="$(pinned_in "$a")"
+  if [ -n "$left" ]; then
+    echo "::error::${a} is still pinned after the rewrite, in: $(echo "$left" | tr '\n' ' ')" >&2
+    exit 1
+  fi
+done
+
+echo "stitch: ${stitched_n} stitched (${stitched}); ${skipped_n} skipped (${skipped})"
diff --git a/hack/stitch-multiarch_test.bats b/hack/stitch-multiarch_test.bats
new file mode 100644
index 0000000000..730a89d641
--- /dev/null
+++ b/hack/stitch-multiarch_test.bats
@@ -0,0 +1,627 @@
+#!/usr/bin/env bats
+# Tests for hack/stitch-multiarch.sh, which joins the amd64 build and the arm64
+# leg of every first-party image into one index and repins the tree on it.
+#
+# The registry is a stub: skopeo and docker on PATH read and write a flat table
+# of "<repo> <tag> <digest>" lines plus one file per manifest, so digests are
+# real sha256 sums of the stored bytes and an index the docker stub creates
+# resolves like any other manifest.
+#
+# Harness note: the unit lane runs this file under Bats. The bodies stay POSIX
+# sh (no `run`, no [[ ]]; each @test a shell function under `set -eu`), so
+# hack/cozytest.sh can still run it under dash by hand.
+#
+# Run with: bats hack/stitch-multiarch_test.bats
+
+load test_helper
+
+REG=registry.example/cozy
+
+_stub_registry() {
+  MOCK_REG="$1"
+  export MOCK_REG
+  mkdir -p "$MOCK_REG/bin" "$MOCK_REG/blobs"
+  : >"$MOCK_REG/tags"
+  : >"$MOCK_REG/log"
+  cat >"$MOCK_REG/bin/skopeo" <<'EOF'
+#!/bin/sh
+set -eu
+printf 'skopeo %s\n' "$*" >>"$MOCK_REG/log"
+resolve() {
+  r="${1#docker://}"
+  case "$r" in
+    *@*) printf '%s' "${r##*@}" ;;
+    *) awk -v r="${r%:*}" -v t="${r##*:}" '$1 == r && $2 == t { d = $3 } END { printf "%s", d }' "$MOCK_REG/tags" ;;
+  esac
+}
+case "$1" in
+  inspect)
+    d="$(resolve "$3")"
+    f="$MOCK_REG/blobs/${d#sha256:}"
+    [ -n "$d" ] && [ -f "$f" ] || { echo "Error: reading manifest $3: manifest unknown" >&2; exit 1; }
+    if [ "$2" = --config ]; then jq '{architecture: .arch}' "$f"; else cat "$f"; fi
+    ;;
+  list-tags)
+    awk -v r="${2#docker://}" '$1 == r { print $2 }' "$MOCK_REG/tags" | sort -u | jq -R . | jq -s '{Tags: .}'
+    ;;
+  *) exit 2 ;;
+esac
+EOF
+  cat >"$MOCK_REG/bin/docker" <<'EOF'
+#!/bin/sh
+set -eu
+printf 'docker %s\n' "$*" >>"$MOCK_REG/log"
+[ "$1 $2 $3" = "buildx imagetools create" ] || exit 2
+shift 3
+# MOCK_CREATE_LIMIT=N: the (N+1)th create fails, as a registry outage would.
+n=$(grep -c 'imagetools create' "$MOCK_REG/log")
+if [ -n "${MOCK_CREATE_LIMIT:-}" ] && [ "$n" -gt "$MOCK_CREATE_LIMIT" ]; then
+  echo "ERROR: failed to push: 503 Service Unavailable" >&2
+  exit 1
+fi
+tags=""
+entries=""
+srcs=$(printf '%s\n' "$@" | awk 'prev != "--tag" && $0 != "--tag" { print } { prev = $0 }')
+# One source that is already an index is copied as is, like the real tool.
+if [ "$(printf '%s\n' "$srcs" | wc -l | tr -d ' ')" -eq 1 ] \
+  && jq -e '.manifests' "$MOCK_REG/blobs/$(printf '%s' "${srcs##*@}" | sed 's/^sha256://')" >/dev/null 2>&1; then
+  while [ "$#" -gt 0 ]; do
+    if [ "$1" = --tag ]; then printf '%s %s %s\n' "${2%:*}" "${2##*:}" "${srcs##*@}" >>"$MOCK_REG/tags"; shift; fi
+    shift
+  done
+  exit 0
+fi
+while [ "$#" -gt 0 ]; do
+  case "$1" in
+    --tag) tags="$tags $2"; shift 2 ;;
+    *)
+      d="${1##*@}"
+      arch="$(jq -r .arch "$MOCK_REG/blobs/${d#sha256:}")"
+      entries="$entries${entries:+,}{\"digest\":\"$d\",\"platform\":{\"os\":\"linux\",\"architecture\":\"$arch\"}}"
+      shift ;;
+  esac
+done
+body="{\"mediaType\":\"application/vnd.oci.image.index.v1+json\",\"manifests\":[$entries]}"
+hex="$(printf '%s' "$body" | sha256sum | cut -d' ' -f1)"
+printf '%s' "$body" >"$MOCK_REG/blobs/$hex"
+for t in $tags; do
+  printf '%s %s sha256:%s\n' "${t%:*}" "${t##*:}" "$hex" >>"$MOCK_REG/tags"
+done
+EOF
+  chmod +x "$MOCK_REG/bin/skopeo" "$MOCK_REG/bin/docker"
+}
+
+# _push <repo> <tag> <arch> [<config-media-type>] stores a single-platform
+# manifest, tags it, and prints its digest.
+_push() {
+  body="{\"mediaType\":\"application/vnd.oci.image.manifest.v1+json\",\"config\":{\"mediaType\":\"${4:-application/vnd.oci.image.config.v1+json}\"},\"arch\":\"$3\",\"name\":\"$1:$2\"}"
+  hex="$(printf '%s' "$body" | sha256sum | cut -d' ' -f1)"
+  printf '%s' "$body" >"$MOCK_REG/blobs/$hex"
+  printf '%s %s sha256:%s\n' "$1" "$2" "$hex" >>"$MOCK_REG/tags"
+  printf 'sha256:%s' "$hex"
+}
+
+_tag() {
+  awk -v r="$1" -v t="$2" '$1 == r && $2 == t { d = $3 } END { printf "%s", d }' "$MOCK_REG/tags"
+}
+
+# A tree stamped by an amd64 build with IMAGE_TAG=main, one image per storage
+# shape and values.yaml sub-shape, each with an arm64 twin, plus the refs that
+# must be left alone. Sets A_<name> to each amd64 digest.
+_make_world() {
+  t="$1/tree"
+  mkdir -p "$t/system/api" "$t/system/cil" "$t/system/lin" "$t/system/ovn" \
+           "$t/apps/kube/images" "$t/system/multus/templates" "$t/core/testing" \
+           "$t/core/installer" "$t/system/capi-providers-cpprovider/images" \
+           "$t/system/capi-providers-cpprovider/files" "$t/system/stray/files" "$t/system/zipped/files" \
+           "$t/system/third" "$t/system/api/charts/up"
+  for n in api cil lin ovn signer multus; do
+    eval "A_$n=\$(_push $REG/$n main amd64)"
+    _push "$REG/$n" main-arm64 arm64 >/dev/null
+  done
+  # The build pushed api's component version beside the build tag, though the
+  # tree ref names only the build tag, as every package but kamaji stamps it;
+  # the pushed-tags log is what records it, and it must move with the build
+  # tag. Any other tag on the same bytes belongs to another build and must be
+  # neither read nor moved.
+  printf '%s v9.9.9 %s\n%s pr-1-abc %s\n%s v0.0.1-rc.1 %s\n' \
+    "$REG/api" "$A_api" "$REG/api" "$A_api" "$REG/api" "$A_api" >>"$MOCK_REG/tags"
+  PUSHED_TAGS_LOG="$1/pushed-tags"
+  export PUSHED_TAGS_LOG
+  for n in api cil lin ovn signer multus kamaji; do
+    printf '%s/%s:main\n' "$REG" "$n" >>"$PUSHED_TAGS_LOG"
+  done
+  printf '%s/api:v9.9.9\n' "$REG" >>"$PUSHED_TAGS_LOG"
+  A_sandbox=$(_push "$REG/sandbox" main amd64)
+  for n in kamaji stray zipped; do
+    eval "A_$n=\$(_push $REG/$n main amd64)"
+    _push "$REG/$n" main-arm64 arm64 >/dev/null
+  done
+  A_pkg=$(_push "$REG/cozystack-packages" main amd64 application/vnd.cncf.flux.config.v1+json)
+  _push "$REG/cozystack-packages" main-arm64 arm64 application/vnd.cncf.flux.config.v1+json >/dev/null
+  THIRD="sha256:$(printf 'f%.0s' $(seq 1 64))"
+
+  # values.yaml, single string
+  printf 'image: %s/api:main@%s\n' "$REG" "$A_api" >"$t/system/api/values.yaml"
+  # values.yaml, split map with a digest key
+  printf 'image:\n  repository: %s/cil\n  tag: main\n  digest: %s\n' "$REG" "$A_cil" >"$t/system/cil/values.yaml"
+  # values.yaml, split map with the digest inside tag
+  printf 'image:\n  repository: %s/lin\n  tag: main@%s\n' "$REG" "$A_lin" >"$t/system/lin/values.yaml"
+  # values.yaml, chart-global registry
+  printf 'global:\n  registry:\n    address: %s\n  images:\n    kubeovn:\n      repository: ovn\n      tag: main@%s\n' "$REG" "$A_ovn" >"$t/system/ovn/values.yaml"
+  # images/*.tag
+  # a component-versioned ref: its tag was never pushed by this build, which
+  # pushed the image as main like every other
+  printf '%s/signer:v7.7.7-cozystack.0@%s\n' "$REG" "$A_signer" >"$t/apps/kube/images/signer.tag"
+  # the declared file; the Helm conditional keeps yq from parsing it, as in the
+  # real one
+  printf '{{- if .Values.x }}\n        - image: %s/multus:main@%s\n{{- end }}\n' "$REG" "$A_multus" \
+    >"$t/system/multus/templates/multus-daemonset-thick.yml"
+  # no arm64 twin
+  printf 'image: %s/sandbox:main@%s\n' "$REG" "$A_sandbox" >"$t/core/testing/values.yaml"
+  # the chart ships this ref only inside a gzip built from a plain copy, as the
+  # package's image target writes it
+  cpp="$t/system/capi-providers-cpprovider"
+  printf '%s/kamaji:v0.1.0-cozystack.0@%s\n' "$REG" "$A_kamaji" >"$cpp/images/kamaji.tag"
+  printf 'kind: Deployment\nimage: %s/kamaji:v0.1.0-cozystack.0@%s\n' "$REG" "$A_kamaji" >"$cpp/files/control-plane-components.yaml"
+  gzip -nc "$cpp/files/control-plane-components.yaml" >"$cpp/files/components.gz"
+  # the digest also sits in a file, or a gzip, the rewrite does not reach
+  printf '%s/stray:main@%s\n' "$REG" "$A_stray" >"$t/apps/kube/images/stray.tag"
+  printf 'image: %s/stray:main@%s\n' "$REG" "$A_stray" >"$t/system/stray/files/copy.yaml"
+  printf '%s/zipped:main@%s\n' "$REG" "$A_zipped" >"$t/apps/kube/images/zipped.tag"
+  printf 'image: %s/zipped:main@%s\n' "$REG" "$A_zipped" | gzip -nc >"$t/system/zipped/files/copy.gz"
+  # the packages artifact, and an image the build does not own
+  printf 'cozystackOperator:\n  platformSourceUrl: oci://%s/cozystack-packages\n  platformSourceRef: digest=%s\n' "$REG" "$A_pkg" \
+    >"$t/core/installer/values.yaml"
+  printf 'image: docker.io/library/busybox:1@%s\n' "$THIRD" >"$t/system/third/values.yaml"
+  # a vendored chart pinning the same digest: out of the rewrite and the check
+  printf 'image: %s/api:main@%s\n' "$REG" "$A_api" >"$t/system/api/charts/up/values.yaml"
+}
+
+@test "every storage shape is repinned on an index of its amd64 and arm64 builds" {
+  tmp=$(mktemp -d)
+  _stub_registry "$tmp/reg"
+  _make_world "$tmp"
+  t="$tmp/tree"
+
+  PATH="$MOCK_REG/bin:$PATH" hack/stitch-multiarch.sh "$t/" "$REG" main >"$tmp/out" 2>"$tmp/err"
+
+  for n in api cil lin ovn signer multus; do
+    eval "a=\$A_$n"
+    i="$(_tag "$REG/$n" main)"
+    [ "$i" != "$a" ]
+    jq -e --arg a "$a" '.mediaType == "application/vnd.oci.image.index.v1+json" and .manifests[0].digest == $a and .manifests[0].platform.architecture == "amd64" and .manifests[1].platform.architecture == "arm64"' \
+      "$MOCK_REG/blobs/${i#sha256:}" >/dev/null
+    if grep -rq --exclude-dir=charts "$a" "$t"; then echo "FAIL: $n still pinned on its amd64 digest"; false; fi
+    grep -rqF "$i" "$t"
+  done
+  grep -q "^  digest: $(_tag "$REG/cil" main)\$" "$t/system/cil/values.yaml"
+  grep -q "^      tag: main@$(_tag "$REG/ovn" main)\$" "$t/system/ovn/values.yaml"
+  grep -q "multus:main@$(_tag "$REG/multus" main)\$" "$t/system/multus/templates/multus-daemonset-thick.yml"
+
+  # the component tag the build pushed moved with the build tag; tags of other
+  # builds on the same bytes were never read, let alone moved
+  [ "$(_tag "$REG/api" v9.9.9)" = "$(_tag "$REG/api" main)" ]
+  [ "$(_tag "$REG/api" pr-1-abc)" = "$A_api" ]
+  [ "$(_tag "$REG/api" v0.0.1-rc.1)" = "$A_api" ]
+  if grep -q 'list-tags\|api:pr-1-abc\|api:v0.0.1-rc.1' "$MOCK_REG/log"; then echo "FAIL: a tag this build did not push was read"; false; fi
+  # vendored charts are neither rewritten nor checked
+  grep -q "$A_api" "$t/system/api/charts/up/values.yaml"
+
+  # the gzip is rewritten with its plain copy, to what the image target builds
+  i="$(_tag "$REG/kamaji" main)"
+  [ "$i" != "$A_kamaji" ]
+  grep -q "kamaji:v0.1.0-cozystack.0@$i\$" "$cpp/images/kamaji.tag"
+  grep -q "kamaji:v0.1.0-cozystack.0@$i\$" "$cpp/files/control-plane-components.yaml"
+  gzip -dc "$cpp/files/components.gz" | grep -q "kamaji:v0.1.0-cozystack.0@$i\$"
+  if gzip -dc "$cpp/files/components.gz" | grep -q "$A_kamaji"; then echo "FAIL: the gzip still pins the amd64 digest"; false; fi
+  gzip -nc "$cpp/files/control-plane-components.yaml" | cmp - "$cpp/files/components.gz"
+
+  # skipped: no arm64 twin, and a digest pinned outside the enumerated files
+  [ "$(_tag "$REG/sandbox" main)" = "$A_sandbox" ]
+  grep -q "$A_sandbox" "$t/core/testing/values.yaml"
+  for n in stray zipped; do
+    eval "a=\$A_$n"
+    [ "$(_tag "$REG/$n" main)" = "$a" ]
+    grep -q "$a" "$t/apps/kube/images/$n.tag"
+  done
+  grep -q 'skipping sandbox: no main-arm64 image' "$tmp/err"
+  grep -q 'skipping stray: digest also pinned in .*/system/stray/files/copy.yaml' "$tmp/err"
+  grep -q 'skipping zipped: digest also pinned in .*/system/zipped/files/copy.gz' "$tmp/err"
+  if grep -q 'imagetools create.*\(stray\|zipped\|sandbox\|cozystack-packages\)' "$MOCK_REG/log"; then
+    echo "FAIL: a skipped ref was pushed"; false
+  fi
+
+  # the packages artifact and third-party refs are untouched
+  grep -q "platformSourceRef: digest=$A_pkg" "$t/core/installer/values.yaml"
+  grep -q "busybox:1@$THIRD" "$t/system/third/values.yaml"
+
+  [ "$(wc -l <"$tmp/out" | tr -d ' ')" -eq 1 ]
+  grep -q '^stitch: 7 stitched (.*kamaji.*); 3 skipped (.*stray.*zipped.*)$' "$tmp/out"
+  grep -q 'skipped (.*sandbox.*)$' "$tmp/out"
+  rm -rf "$tmp"
+}
+
+@test "the rewritten gzip is byte-identical across two stitches of one tree" {
+  tmp=$(mktemp -d)
+  _stub_registry "$tmp/reg"
+  _make_world "$tmp"
+  cp -R "$tmp/tree" "$tmp/stamped"
+  PATH="$MOCK_REG/bin:$PATH" hack/stitch-multiarch.sh "$tmp/tree" "$REG" main >/dev/null 2>&1
+  cp "$tmp/tree/system/capi-providers-cpprovider/files/components.gz" "$tmp/first.gz"
+  # The second run finds every tag already on its index and repins on it.
+  rm -rf "$tmp/tree"
+  cp -R "$tmp/stamped" "$tmp/tree"
+  sleep 1
+  PATH="$MOCK_REG/bin:$PATH" hack/stitch-multiarch.sh "$tmp/tree" "$REG" main >/dev/null 2>&1
+  cmp "$tmp/first.gz" "$tmp/tree/system/capi-providers-cpprovider/files/components.gz"
+  if cmp -s "$tmp/first.gz" "$tmp/stamped/system/capi-providers-cpprovider/files/components.gz"; then echo "FAIL: the gzip was not rewritten"; false; fi
+  rm -rf "$tmp"
+}
+
+@test "a digest left inside the gzip fails the run" {
+  # A sed that rewrites files but passes stdin through stands in for a rewrite
+  # that misses the gzip payload alone; grep -I would never look inside it.
+  tmp=$(mktemp -d)
+  _stub_registry "$tmp/reg"
+  _make_world "$tmp"
+  real_sed="$(command -v sed)"
+  printf '#!/bin/sh\ncase "$1" in s\\|*) [ -n "${2:-}" ] || exec cat ;; esac\nexec %s "$@"\n' "$real_sed" >"$MOCK_REG/bin/sed"
+  chmod +x "$MOCK_REG/bin/sed"
+  rc=0
+  PATH="$MOCK_REG/bin:$PATH" hack/stitch-multiarch.sh "$tmp/tree" "$REG" main >"$tmp/out" 2>"$tmp/err" || rc=$?
+  [ "$rc" -ne 0 ]
+  grep -q "${A_kamaji} is still pinned after the rewrite, in: .*components.gz" "$tmp/err"
+  if grep -q "is still pinned after the rewrite, in: .*control-plane-components.yaml" "$tmp/err"; then echo "FAIL: the plain copy was not rewritten"; false; fi
+  rm -rf "$tmp"
+}
+
+@test "prepare-release applies the amd64 build's tree, stitches, gates, then republishes before the commit" {
+  # The amd64 build pushed the artifact and chart pinned on amd64-only
+  # digests. The chart's values pin the operator image and the digest
+  # image-packages writes, so it must be packaged after that write, and the
+  # gate must see the stitched tree before anything is published from it.
+  wf=.github/workflows/tags.yaml
+  names=$(yq -r '.jobs.prepare-release.steps[].name' "$wf")
+  d=$(echo "$names" | grep -nx 'Download the amd64 build' | cut -d: -f1)
+  a=$(echo "$names" | grep -nx 'Apply the stamped tree' | cut -d: -f1)
+  st=$(echo "$names" | grep -nx 'Stitch multi-arch indexes and republish' | cut -d: -f1)
+  c=$(echo "$names" | grep -nx 'Commit release artifacts' | cut -d: -f1)
+  u=$(echo "$names" | grep -nx 'Upload assets' | cut -d: -f1)
+  [ -n "$d" ] && [ -n "$a" ] && [ -n "$st" ] && [ -n "$c" ] && [ -n "$u" ] \
+    && [ "$d" -lt "$a" ] && [ "$a" -lt "$st" ] && [ "$st" -lt "$c" ] && [ "$c" -lt "$u" ] \
+    || { echo "FAIL: prepare-release steps are out of order"; false; }
+  run=$(yq -r '.jobs.prepare-release.steps[] | select(.name == "Stitch multi-arch indexes and republish") | .run' "$wf")
+  s=$(echo "$run" | grep -n 'hack/stitch-multiarch.sh packages ' | cut -d: -f1)
+  v=$(echo "$run" | grep -n 'hack/verify-multiarch.sh packages$' | cut -d: -f1)
+  p=$(echo "$run" | grep -n 'make -C packages/core/installer image-packages chart$' | cut -d: -f1)
+  [ -n "$s" ] && [ -n "$v" ] && [ -n "$p" ] && [ "$s" -lt "$v" ] && [ "$v" -lt "$p" ] \
+    || { echo "FAIL: stitch, gate and republish are out of order"; false; }
+  out=$(make -n -C packages/core/installer image-packages chart COZYSTACK_VERSION=0)
+  ref=$(echo "$out" | grep -n 'platformSourceRef = ' | cut -d: -f1)
+  pkg=$(echo "$out" | grep -n 'helm package' | cut -d: -f1)
+  [ -n "$ref" ] && [ -n "$pkg" ] && [ "$ref" -lt "$pkg" ]
+  echo "$out" | grep -q 'helm push'
+}
+
+@test "the amd64 build hands its tree, tag log and assets to prepare-release, and a missing hand-off fails" {
+  wf=.github/workflows/tags.yaml
+  up='.jobs.build-amd64.steps[] | select(.uses // "" | test("actions/upload-artifact@"))'
+  down='.jobs.prepare-release.steps[] | select(.uses // "" | test("actions/download-artifact@"))'
+  [ "$(yq -r "[$up] | length" "$wf")" -ge 2 ]
+  [ "$(yq -r "[$up | select(.with.\"if-no-files-found\" != \"error\")] | length" "$wf")" -eq 0 ]
+  # Every artifact uploaded is downloaded under the same name.
+  [ "$(yq -r "$up | .with.name" "$wf" | sort)" = "$(yq -r "$down | .with.name" "$wf" | sort)" ]
+  # The tag log the Build step writes is the file the stitch reads, and it
+  # travels in an uploaded artifact that lands at that same path.
+  build_log=$(yq -r '.jobs.build-amd64.steps[] | select(.name == "Build") | .env.PUSHED_TAGS_LOG' "$wf")
+  stitch_log=$(yq -r '.jobs.prepare-release.steps[] | select(.name == "Stitch multi-arch indexes and republish") | .env.PUSHED_TAGS_LOG' "$wf")
+  [ -n "$build_log" ] && [ "$build_log" != null ] && [ "$build_log" = "$stitch_log" ]
+  dir="${build_log%/*}"
+  yq -r "$up | .with.path" "$wf" | grep -qxF "$dir/"
+  yq -r "$down | .with.path" "$wf" | grep -qxF "$dir"
+  # The stamped tree is captured after the build and applied before the stitch.
+  capture=$(yq -r '.jobs.build-amd64.steps[] | select(.name == "Capture the stamped tree") | .run' "$wf")
+  echo "$capture" | grep -q "git diff --cached --binary HEAD >\"$dir/stamped-tree.patch\""
+  yq -r '.jobs.prepare-release.steps[] | select(.name == "Apply the stamped tree") | .run' "$wf" \
+    | grep -q "git apply --binary \"$dir/stamped-tree.patch\""
+}
+
+@test "the amd64 and arm64 builds run side by side, prepare-release waits for both, and a stable tag runs without arm64" {
+  wf=.github/workflows/tags.yaml
+  [ "$(yq -r '.jobs.build-amd64.needs // "none"' "$wf")" = none ]
+  [ "$(yq -r '.jobs.build-arm64.needs // "none"' "$wf")" = none ]
+  [ "$(yq -r '.jobs.build-arm64.if' "$wf")" = "contains(github.ref_name, '-')" ]
+  # The amd64 job runs for every tag: it holds the release-exists no-op and the
+  # hand-pushed stable tag rejection.
+  [ "$(yq -r '.jobs.build-amd64.if // "none"' "$wf")" = none ]
+  amd_steps=$(yq -r '.jobs.build-amd64.steps[].name' "$wf")
+  echo "$amd_steps" | grep -qx 'Check if release already exists'
+  echo "$amd_steps" | grep -qx 'Reject hand-pushed stable tags'
+  [ "$(yq -r '.jobs.build-arm64.steps[] | select(.run // "" | test("build-matrix")) | .env.IMAGE_TAG' "$wf")" = '${{ github.ref_name }}-arm64' ]
+  [ "$(yq -r '.jobs.prepare-release.needs | sort | join(" ")' "$wf")" = 'build-amd64 build-arm64' ]
+  cond=$(yq -r '.jobs.prepare-release.if' "$wf")
+  echo "$cond" | grep -qF '!cancelled()'
+  echo "$cond" | grep -qF "needs.build-amd64.result == 'success'"
+  echo "$cond" | grep -qF "needs.build-arm64.result == 'success'"
+  echo "$cond" | grep -qF "needs.build-arm64.result == 'skipped'"
+  if echo "$cond" | grep -qE "always\(\)|'failure'"; then echo "FAIL: a failed build must not let the release through"; false; fi
+  # prepare-release no-ops exactly when the amd64 job found the release.
+  [ "$(yq -r '.jobs.prepare-release.outputs.release_exists' "$wf")" = '${{ needs.build-amd64.outputs.release_exists }}' ]
+  # A stable tag skips build-arm64, and a skipped ancestor makes the implicit
+  # success() false for every job below it, so each one needs a status
+  # function of its own or it silently never runs on a stable tag.
+  down=prepare-release
+  while :; do
+    more=$(yq -r '.jobs | keys | .[]' "$wf" | while read -r j; do
+      needs=$(yq -r "[.jobs.\"$j\".needs // []] | flatten | .[]" "$wf")
+      for d in $down; do
+        if echo "$needs" | grep -qxF "$d" && ! echo " $down " | grep -qF " $j "; then echo "$j"; break; fi
+      done
+    done | sort -u)
+    [ -n "$more" ] || break
+    down="$down $(echo "$more" | tr '\n' ' ')"
+  done
+  for j in $down; do
+    yq -r ".jobs.\"$j\".if // \"\"" "$wf" | grep -qE '!cancelled\(\)|always\(\)' \
+      || { echo "FAIL: $j runs below build-arm64 without a status function"; false; }
+  done
+  echo " $down " | grep -qF ' generate-changelog '
+  echo " $down " | grep -qF ' rc-e2e '
+  echo " $down " | grep -qF ' update-website-docs '
+  # A re-run of an rc whose release is already prepared rebuilds nothing.
+  [ "$(yq -r '.jobs.build-arm64.steps[] | select(.name == "Build arm64 images") | .if' "$wf")" = "steps.check_release.outputs.release_exists == 'false'" ]
+  [ "$(yq -r '.jobs.build-amd64.steps[] | select(.name == "Build") | .if' "$wf")" = "steps.check_release.outputs.release_exists == 'false'" ]
+  # The stitch and the gate need skopeo and mikefarah yq on the release runner.
+  tool=$(yq -r '.jobs.prepare-release.steps[] | select(.name == "Set up build toolchain") | .run' "$wf")
+  echo "$tool" | grep -q skopeo
+  echo "$tool" | grep -q 'yq --version | grep -q mikefarah'
+  # prepare-release pushes the packages artifact with flux, so it installs the
+  # same flux build-amd64 does rather than whatever is latest.
+  want=$(yq -r '.jobs.build-amd64.steps[] | select(.name == "Set up flux") | .with.version' "$wf")
+  [ -n "$want" ] && [ "$want" != null ]
+  [ "$(yq -r '.jobs.prepare-release.steps[] | select(.name == "Set up flux") | .with.version' "$wf")" = "$want" ]
+}
+
+@test "the amd64 release job rebuilds matchbox as a two-arch index before it captures the tree" {
+  # matchbox has no arm64 twin to stitch, so this rebuild is the only thing
+  # that makes the ref the gate checks an index. It needs a builder that can
+  # push an index while make build stays on the default docker driver.
+  wf=.github/workflows/tags.yaml
+  steps=$(yq -r '.jobs.build-amd64.steps[].name' "$wf")
+  pos() { echo "$steps" | grep -nxF "$1" | cut -d: -f1; }
+  bx=$(pos 'Set up Buildx for matchbox (docker-container driver)')
+  build=$(pos 'Build')
+  capture=$(pos 'Capture the stamped tree')
+  [ -n "$bx" ] && [ -n "$build" ] && [ -n "$capture" ]
+  [ "$bx" -lt "$build" ] && [ "$build" -lt "$capture" ]
+  sel='.jobs.build-amd64.steps[] | select(.id == "matchbox_buildx")'
+  [ "$(yq -r "$sel | .with.driver" "$wf")" = docker-container ]
+  [ "$(yq -r "$sel | .with.use" "$wf")" = false ]
+  run_=$(yq -r '.jobs.build-amd64.steps[] | select(.name == "Build") | .run' "$wf")
+  echo "$run_" | grep -qxE '[[:space:]]*make -C packages/core/talos image-matchbox PLATFORM=linux/amd64,linux/arm64 BUILDER="\$MATCHBOX_BUILDER"'
+  [ "$(yq -r '.jobs.build-amd64.steps[] | select(.name == "Build") | .env.MATCHBOX_BUILDER' "$wf")" = '${{ steps.matchbox_buildx.outputs.name }}' ]
+}
+
+@test "an arm64 tag that holds no arm64 image is skipped, not stitched" {
+  # The testing package pins amd64 (an x86 KVM sandbox), so a stray
+  # <tag>-arm64 of it holds a second amd64 image. An index of two amd64
+  # manifests would be wrong.
+  tmp=$(mktemp -d)
+  _stub_registry "$tmp/reg"
+  _make_world "$tmp"
+  _push "$REG/sandbox" main-arm64 amd64 >/dev/null
+
+  PATH="$MOCK_REG/bin:$PATH" hack/stitch-multiarch.sh "$tmp/tree" "$REG" main >"$tmp/out" 2>"$tmp/err"
+
+  [ "$(_tag "$REG/sandbox" main)" = "$A_sandbox" ]
+  grep -q "$A_sandbox" "$tmp/tree/core/testing/values.yaml"
+  grep -q 'skipping sandbox: main and main-arm64 are not one amd64 and one arm64 image' "$tmp/err"
+  rm -rf "$tmp"
+}
+
+@test "a rerun after a stitch that failed partway repins every ref" {
+  # The stitch job starts from the amd64 build's stamped tree every time, while
+  # the registry keeps what the failed attempt already pushed: some tags are
+  # indexes by then. Those must be repinned on the existing index, not skipped,
+  # or the rerun goes green with those images left amd64 only.
+  tmp=$(mktemp -d)
+  _stub_registry "$tmp/reg"
+  _make_world "$tmp"
+  cp -R "$tmp/tree" "$tmp/stamped"
+
+  rc=0
+  PATH="$MOCK_REG/bin:$PATH" MOCK_CREATE_LIMIT=2 hack/stitch-multiarch.sh "$tmp/tree" "$REG" main >"$tmp/out" 2>"$tmp/err" || rc=$?
+  [ "$rc" -ne 0 ]
+  [ "$(grep -c 'imagetools create' "$MOCK_REG/log")" -eq 3 ]
+
+  # An attempt that died inside imagetools create may leave a tag behind on A.
+  printf '%s v9.9.9 %s\n' "$REG/api" "$A_api" >>"$MOCK_REG/tags"
+
+  rm -rf "$tmp/tree"
+  cp -R "$tmp/stamped" "$tmp/tree"
+  PATH="$MOCK_REG/bin:$PATH" hack/stitch-multiarch.sh "$tmp/tree" "$REG" main >"$tmp/out" 2>"$tmp/err"
+  [ "$(_tag "$REG/api" v9.9.9)" = "$(_tag "$REG/api" main)" ]
+
+  for n in api cil lin ovn signer multus kamaji; do
+    eval "a=\$A_$n"
+    i="$(_tag "$REG/$n" main)"
+    [ "$i" != "$a" ]
+    if grep -rq --exclude-dir=charts "$a" "$tmp/tree"; then echo "FAIL: $n still pinned on its amd64 digest"; false; fi
+    grep -rqF "$i" "$tmp/tree"
+  done
+  grep -q '^stitch: 7 stitched ' "$tmp/out"
+  if grep -q 'no longer points\|skipping \(api\|cil\|lin\|ovn\|signer\|multus\|kamaji\)' "$tmp/err"; then
+    echo "FAIL: the rerun skipped an image"; false
+  fi
+
+  # A tag moved to anything but an index of the pinned image and an arm64
+  # image fails: a plain other image; another build's index; an index holding
+  # the twin but another amd64 image, as after a newer main run moved both
+  # tags; an index holding the pinned image and no arm64 image.
+  other_amd=$(_push "$REG/api" other amd64)
+  other_arm=$(_push "$REG/api" other-arm64 arm64)
+  b_api=$(_tag "$REG/api" main-arm64)
+  for sources in "single" "$REG/api@$other_amd $REG/api@$other_arm" "$REG/api@$other_amd $REG/api@$b_api" "$REG/api@$A_api $REG/api@$other_amd"; do
+    if [ "$sources" = single ]; then
+      _push "$REG/api" main amd64-other >/dev/null
+    else
+      # shellcheck disable=SC2086
+      PATH="$MOCK_REG/bin:$PATH" docker buildx imagetools create --tag "$REG/api:main" $sources
+    fi
+    rm -rf "$tmp/tree"
+    cp -R "$tmp/stamped" "$tmp/tree"
+    rc=0
+    PATH="$MOCK_REG/bin:$PATH" hack/stitch-multiarch.sh "$tmp/tree" "$REG" main >"$tmp/out" 2>"$tmp/err" || rc=$?
+    [ "$rc" -ne 0 ] || { echo "FAIL: api:main on '$sources' was accepted"; false; }
+    grep -q "api:main points at .*neither the digest the tree pins" "$tmp/err"
+  done
+  rm -rf "$tmp"
+}
+
+@test "a rerun whose arm64 leg rebuilt the image repins on the index already there" {
+  # A rerun starts again from the amd64 build's stamped tree, but its arm64 leg
+  # pushes a new arm64 image unless the cache reproduces it byte for byte. The
+  # build tag then sits on an index of the pinned amd64 image and the previous
+  # arm64 half. That is a valid index of the pinned image.
+  tmp=$(mktemp -d)
+  _stub_registry "$tmp/reg"
+  _make_world "$tmp"
+  cp -R "$tmp/tree" "$tmp/stamped"
+  PATH="$MOCK_REG/bin:$PATH" hack/stitch-multiarch.sh "$tmp/tree" "$REG" main >/dev/null 2>&1
+  first="$(_tag "$REG/api" main)"
+
+  for n in api cil lin ovn signer multus kamaji; do
+    _push "$REG/$n" main-arm64 arm64 application/vnd.docker.container.image.v1+json >/dev/null
+  done
+  rm -rf "$tmp/tree"
+  cp -R "$tmp/stamped" "$tmp/tree"
+  PATH="$MOCK_REG/bin:$PATH" hack/stitch-multiarch.sh "$tmp/tree" "$REG" main >"$tmp/out" 2>"$tmp/err"
+
+  [ "$(_tag "$REG/api" main)" = "$first" ]
+  grep -q "api:main@$first\$" "$tmp/tree/system/api/values.yaml"
+  grep -q '^stitch: 7 stitched ' "$tmp/out"
+  rm -rf "$tmp"
+}
+
+@test "a digest the rewrite leaves behind fails the run" {
+  # Scan wider than you rewrite. A sed that rewrites nothing stands in for any
+  # way the rewrite can miss a copy of a digest it has already re-pointed.
+  tmp=$(mktemp -d)
+  _stub_registry "$tmp/reg"
+  _make_world "$tmp"
+  real_sed="$(command -v sed)"
+  printf '#!/bin/sh\ncase "$1" in s\\|*) cat "$2" ;; *) exec %s "$@" ;; esac\n' "$real_sed" >"$MOCK_REG/bin/sed"
+  chmod +x "$MOCK_REG/bin/sed"
+
+  rc=0
+  PATH="$MOCK_REG/bin:$PATH" hack/stitch-multiarch.sh "$tmp/tree" "$REG" main >"$tmp/out" 2>"$tmp/err" || rc=$?
+
+  [ "$rc" -ne 0 ]
+  grep -q "$A_api is still pinned after the rewrite, in: .*/system/api/values.yaml" "$tmp/err"
+  rm -rf "$tmp"
+}
+
+@test "a registry error fails the run at every lookup instead of becoming a skip" {
+  # Skipping on a rate limit would leave the image amd64 only while the run
+  # reports success. Each lookup the stitch makes for one image fails in turn,
+  # on every try: the arm64 twin, the build tag, the architecture of either
+  # half, and the ref's own tag read while collecting the tags to move. api is
+  # processed first, so the failure lands before anything is pushed and the
+  # world can be reused.
+  tmp=$(mktemp -d)
+  _stub_registry "$tmp/reg"
+  _make_world "$tmp"
+  mv "$MOCK_REG/bin/skopeo" "$MOCK_REG/bin/skopeo.real"
+  {
+    echo '#!/bin/sh'
+    echo 'case "$*" in'
+    echo '  $MOCK_FAIL) echo "received unexpected HTTP status: 429 Too Many Requests" >&2; exit 1 ;;'
+    echo 'esac'
+    echo 'exec "$MOCK_REG/bin/skopeo.real" "$@"'
+  } >"$MOCK_REG/bin/skopeo"
+  chmod +x "$MOCK_REG/bin/skopeo"
+
+  for fail in \
+    "inspect --raw docker://$REG/api:main-arm64" \
+    "inspect --raw docker://$REG/api:main" \
+    "inspect --raw docker://$REG/api@$A_api" \
+    "inspect --config docker://$REG/api@*" \
+    "inspect --raw docker://$REG/api:v9.9.9"; do
+    rc=0
+    PATH="$MOCK_REG/bin:$PATH" MOCK_FAIL="$fail" STITCH_RETRY_DELAY=0 hack/stitch-multiarch.sh "$tmp/tree" "$REG" main >"$tmp/out" 2>"$tmp/err" || rc=$?
+    [ "$rc" -ne 0 ] || { echo "FAIL: a 429 on '$fail' did not fail the run"; false; }
+    grep -q '429 Too Many Requests' "$tmp/err"
+    if grep -q 'skipping' "$tmp/err"; then echo "FAIL: a 429 on '$fail' became a skip"; false; fi
+  done
+  grep -q "$A_api" "$tmp/tree/system/api/values.yaml"
+  if grep -q 'imagetools create' "$MOCK_REG/log"; then echo "FAIL: pushed despite a registry error"; false; fi
+  rm -rf "$tmp"
+}
+
+@test "only a rate limit or a 5xx is retried, and a missing tag log fails the run" {
+  tmp=$(mktemp -d)
+  _stub_registry "$tmp/reg"
+  _make_world "$tmp"
+  mv "$MOCK_REG/bin/skopeo" "$MOCK_REG/bin/skopeo.real"
+  # MOCK_ERR is answered to the first MOCK_TIMES lookups of api's arm64 twin;
+  # every lookup of it is counted.
+  {
+    echo '#!/bin/sh'
+    echo 'if [ "$*" = "inspect --raw docker://$MOCK_TWIN" ]; then'
+    echo '  echo x >>"$MOCK_REG/twin-calls"'
+    echo '  if [ "$(wc -l <"$MOCK_REG/twin-calls")" -le "$MOCK_TIMES" ]; then echo "$MOCK_ERR" >&2; exit 1; fi'
+    echo 'fi'
+    echo 'exec "$MOCK_REG/bin/skopeo.real" "$@"'
+  } >"$MOCK_REG/bin/skopeo"
+  chmod +x "$MOCK_REG/bin/skopeo"
+  cp -R "$tmp/tree" "$tmp/stamped"
+
+  # Deterministic: asked once, and the run fails.
+  rc=0
+  PATH="$MOCK_REG/bin:$PATH" MOCK_TWIN="$REG/api:main-arm64" MOCK_TIMES=99 STITCH_RETRY_DELAY=0 \
+    MOCK_ERR="Error: reading manifest main-arm64: unauthorized: authentication required" \
+    hack/stitch-multiarch.sh "$tmp/tree" "$REG" main >"$tmp/out" 2>"$tmp/err" || rc=$?
+  [ "$rc" -ne 0 ]
+  grep -q 'unauthorized: authentication required' "$tmp/err"
+  [ "$(wc -l <"$MOCK_REG/twin-calls" | tr -d ' ')" -eq 1 ]
+
+  # A 5xx that clears on the second try.
+  rm -f "$MOCK_REG/twin-calls"
+  PATH="$MOCK_REG/bin:$PATH" MOCK_TWIN="$REG/api:main-arm64" MOCK_TIMES=1 STITCH_RETRY_DELAY=0 \
+    MOCK_ERR="Error: reading manifest main-arm64: received unexpected HTTP status: 503 Service Unavailable" \
+    hack/stitch-multiarch.sh "$tmp/tree" "$REG" main >"$tmp/out" 2>"$tmp/err"
+  [ "$(wc -l <"$MOCK_REG/twin-calls" | tr -d ' ')" -eq 2 ]
+  grep -q '^stitch: 7 stitched (api, ' "$tmp/out"
+
+  # A tag log that was asked for and never written.
+  rm -rf "$tmp/tree"
+  cp -R "$tmp/stamped" "$tmp/tree"
+  rc=0
+  PATH="$MOCK_REG/bin:$PATH" PUSHED_TAGS_LOG="$tmp/missing" hack/stitch-multiarch.sh "$tmp/tree" "$REG" main >"$tmp/out" 2>"$tmp/err" || rc=$?
+  [ "$rc" -ne 0 ]
+  grep -q "PUSHED_TAGS_LOG '$tmp/missing' does not exist" "$tmp/err"
+  rm -rf "$tmp"
+}
+
+@test "a rate limit that clears within the tries does not fail the run" {
+  tmp=$(mktemp -d)
+  _stub_registry "$tmp/reg"
+  _make_world "$tmp"
+  mv "$MOCK_REG/bin/skopeo" "$MOCK_REG/bin/skopeo.real"
+  # The first two lookups of api's arm64 twin are refused, the third answered.
+  {
+    echo '#!/bin/sh'
+    echo 'if [ "$*" = "inspect --raw docker://$MOCK_TWIN" ]; then'
+    echo '  n=$(cat "$MOCK_REG/refused" 2>/dev/null || echo 0)'
+    echo '  if [ "$n" -lt 2 ]; then echo $((n + 1)) >"$MOCK_REG/refused"; echo "toomanyrequests: rate limit" >&2; exit 1; fi'
+    echo 'fi'
+    echo 'exec "$MOCK_REG/bin/skopeo.real" "$@"'
+  } >"$MOCK_REG/bin/skopeo"
+  chmod +x "$MOCK_REG/bin/skopeo"
+  PATH="$MOCK_REG/bin:$PATH" MOCK_TWIN="$REG/api:main-arm64" STITCH_RETRY_DELAY=0 \
+    hack/stitch-multiarch.sh "$tmp/tree" "$REG" main >"$tmp/out" 2>"$tmp/err"
+  [ "$(cat "$MOCK_REG/refused")" -eq 2 ]
+  grep -q '^stitch: 7 stitched (api, ' "$tmp/out"
+  rm -rf "$tmp"
+}
diff --git a/hack/talos-image-cache_test.bats b/hack/talos-image-cache_test.bats
new file mode 100644
index 0000000000..e3ce75d926
--- /dev/null
+++ b/hack/talos-image-cache_test.bats
@@ -0,0 +1,411 @@
+#!/usr/bin/env bats
+# -----------------------------------------------------------------------------
+# Unit tests for the in-sandbox Talos image cache manifest split and the
+# importer-reachability contract it relies on.
+#
+# hack/e2e-talos-image-cache.yaml bundles four documents but they are applied in
+# two phases: hack/e2e-install-cozystack.bats applies everything EXCEPT the
+# CiliumClusterwideNetworkPolicy (its CRD does not exist before Cozystack is
+# installed), and hack/e2e-chainsaw/_lib/talos-image-cache.sh applies ONLY that
+# policy later, once Cilium is up. If a future document is added to the manifest
+# and silently dropped from the pre-Cilium apply, or the Cilium document leaks
+# into it (and errors on the missing CRD), the mirror breaks and e2e falls back
+# to the flaky public factory. These tests pin that split.
+#
+# They also pin the load-bearing reachability invariant: the throwaway probe pod
+# is a faithful proxy for a real CDI importer only if it carries the exact label
+# and namespace the egress policy selects. If either side drifts, the probe can
+# pass while real importers stay blocked (a false positive that makes CI worse).
+#
+# Finally they cover the decision itself, sourced from
+# hack/e2e-chainsaw/_lib/talos-image-cache.sh (sourcing it has no cluster side
+# effects — it only sets parameter defaults and defines functions). Two pure
+# fragments are exercised directly: the strict 206 gate that decides whether
+# tenants are pointed at the mirror at all, and the --overrides JSON builder
+# whose silent breakage would drop every probe to the public factory. The
+# kubectl orchestration around them is driven here too, against a throwaway
+# `kubectl` and `timeout` placed on PATH — the decision of which factory a whole
+# suite pulls from is worth pinning without waiting for a cluster.
+#
+# On PATH, not shell functions, and that is not a style choice: the lookup runs
+# `timeout -k 5 40 kubectl …` wherever timeout is installed, and an external
+# timeout binary execs a real file.
+# A `kubectl() { … }` override is invisible to it, so the stub would never be
+# reached, and a suite that stubs that way goes quietly vacuous. A stub on PATH
+# is also the only way to assert how the real call was spelled, which matters
+# for the flags the three-way answer depends on: the stub answers exit 0 with no
+# output for an absence no matter what flags it is handed, while a real kubectl
+# does that only with --ignore-not-found, so that flag is pinned by inspecting
+# the recorded call rather than by the behaviour around it.
+#
+# Root cause + fix are from cozystack/cozystack#3254 (@lexfrei); this is the port
+# to the Chainsaw layout (hack/e2e-chainsaw/_lib/).
+#
+# CI runs this file under Bats through `make bats-unit-tests`. It also remains
+# compatible with the legacy `hack/cozytest.sh` translator, whose awk parser
+# recognizes only @test blocks and a bare `}` on its own line. The tests avoid
+# `run`, `$status`, setup(), and teardown() for that compatibility path and use
+# direct shell assertions. mikefarah yq's document separators are stripped.
+#
+# Run with: bats hack/talos-image-cache_test.bats
+# -----------------------------------------------------------------------------
+
+load test_helper
+
+@test "manifest documents partition into pre-Cilium apply plus the Cilium policy" {
+    manifest=hack/e2e-talos-image-cache.yaml
+    total=$(yq '.kind' "$manifest" | grep -vc '^---$')
+    excluded=$(yq 'select(.kind != "CiliumClusterwideNetworkPolicy") | .kind' "$manifest" | grep -vc '^---$')
+    selected=$(yq 'select(.kind == "CiliumClusterwideNetworkPolicy") | .kind' "$manifest" | grep -vc '^---$')
+    [ "$total" -eq 4 ]
+    [ "$excluded" -eq 3 ]
+    [ "$selected" -eq 1 ]
+    [ $((excluded + selected)) -eq "$total" ]
+}
+
+@test "pre-Cilium apply keeps Service, Deployment, ConfigMap and drops the Cilium policy" {
+    manifest=hack/e2e-talos-image-cache.yaml
+    kinds=$(yq 'select(.kind != "CiliumClusterwideNetworkPolicy") | .kind' "$manifest" | grep -v '^---$')
+    for want in Service Deployment ConfigMap; do
+        printf '%s\n' "$kinds" | grep -qx "$want" || { echo "pre-Cilium apply is missing $want" >&2; exit 1; }
+    done
+    if printf '%s\n' "$kinds" | grep -qx CiliumClusterwideNetworkPolicy; then
+        echo "CiliumClusterwideNetworkPolicy leaked into the pre-Cilium apply" >&2
+        exit 1
+    fi
+}
+
+@test "point-of-use apply selects exactly the Cilium policy" {
+    manifest=hack/e2e-talos-image-cache.yaml
+    kinds=$(yq 'select(.kind == "CiliumClusterwideNetworkPolicy") | .kind' "$manifest" | grep -v '^---$')
+    [ "$kinds" = "CiliumClusterwideNetworkPolicy" ]
+}
+
+@test "range server records transfer outcome, bytes and duration" {
+    script=$(yq 'select(.kind == "ConfigMap") | .data."serve.py"' hack/e2e-talos-image-cache.yaml)
+
+    printf '%s\n' "$script" | python3 -c 'import sys; compile(sys.stdin.read(), "serve.py", "exec")'
+    printf '%s\n' "$script" | grep -Fq 'transfer-finished status=%s path=%s range=%s requested=%d sent=%d duration=%.3fs'
+    printf '%s\n' "$script" | grep -Fq 'time.monotonic() - started'
+}
+
+@test "egress policy selects the importer label and namespace the probe pod uses" {
+    manifest=hack/e2e-talos-image-cache.yaml
+    helper=hack/e2e-chainsaw/_lib/talos-image-cache.sh
+    label=$(yq 'select(.kind == "CiliumClusterwideNetworkPolicy") | .spec.endpointSelector.matchLabels["k8s:cdi.kubevirt.io"]' "$manifest")
+    ns=$(yq 'select(.kind == "CiliumClusterwideNetworkPolicy") | .spec.endpointSelector.matchLabels["k8s:io.kubernetes.pod.namespace"]' "$manifest")
+    [ "$label" = "importer" ]
+    [ "$ns" = "tenant-test" ]
+    # The probe pod must carry the same label the policy selects, else it faces a
+    # different egress than a real importer and the guarantee breaks.
+    grep -q "cdi.kubevirt.io=importer" "$helper" || { echo "probe pod label drifted from the egress selector" >&2; exit 1; }
+    grep -q "TALOS_IMAGE_CACHE_PROBE_NS:-tenant-test" "$helper" || { echo "probe namespace drifted from the egress selector" >&2; exit 1; }
+}
+
+@test "egress rule targets the mirror pod's own identity" {
+    manifest=hack/e2e-talos-image-cache.yaml
+    target=$(yq 'select(.kind == "CiliumClusterwideNetworkPolicy") | .spec.egress[0].toEndpoints[0].matchLabels["k8s:app.kubernetes.io/name"]' "$manifest")
+    target_ns=$(yq 'select(.kind == "CiliumClusterwideNetworkPolicy") | .spec.egress[0].toEndpoints[0].matchLabels["k8s:io.kubernetes.pod.namespace"]' "$manifest")
+    mirror=$(yq 'select(.kind == "Deployment") | .spec.template.metadata.labels["app.kubernetes.io/name"]' "$manifest")
+    mirror_ns=$(yq 'select(.kind == "Deployment") | .metadata.namespace' "$manifest")
+    [ "$target" = "talos-image-cache" ]
+    [ "$target_ns" = "kube-system" ]
+    # The allow's destination must equal the mirror Deployment's own pod label and
+    # namespace, otherwise the hole is punched toward nothing: moving the mirror
+    # would leave these tests green while importers could no longer reach it.
+    [ "$target" = "$mirror" ]
+    [ "$target_ns" = "$mirror_ns" ]
+}
+
+@test "strict 206 gate selects the mirror on a byte-range success" {
+    . hack/e2e-chainsaw/_lib/talos-image-cache.sh
+    if ! _talos_image_cache_probe_succeeded "code=206"; then
+        echo "expected a 206 probe result to select the mirror" >&2
+        exit 1
+    fi
+}
+
+@test "strict 206 gate finds the marker inside surrounding probe output" {
+    . hack/e2e-chainsaw/_lib/talos-image-cache.sh
+    out=$(printf 'pod/talos-image-cache-probe created\ncode=206\npod "talos-image-cache-probe" deleted\n')
+    if ! _talos_image_cache_probe_succeeded "$out"; then
+        echo "expected 206 to be found in multi-line attach output" >&2
+        exit 1
+    fi
+}
+
+@test "strict 206 gate falls back on range-less, unreachable, empty and unrelated output" {
+    . hack/e2e-chainsaw/_lib/talos-image-cache.sh
+    # A plain 200 means the mirror answered without range support; 000 means curl
+    # never connected. Both fall back to the public factory, as does output that
+    # carried no result marker at all (an attach stream lost with no logs to recover).
+    for bad in "code=200" "code=000" "code=404" "" "error: pods not found"; do
+        if _talos_image_cache_probe_succeeded "$bad"; then
+            echo "expected non-206 output to fall back to the public factory: [$bad]" >&2
+            exit 1
+        fi
+    done
+}
+
+_stub_kubectl_dir() {
+    # Build a throwaway PATH entry whose `kubectl get deploy ... -o name` fails
+    # its first $2 invocations and then answers with $3 on stdout (empty for a
+    # genuine absence). $1 is the scratch dir. printf, not a heredoc: cozytest.sh
+    # translates the file with awk and would read a @test or a bare `}` inside a
+    # heredoc as real syntax.
+    mkdir -p "$1/bin"
+    printf '%s\n' \
+        '#!/bin/sh' \
+        'printf "%s\n" "$*" >> "$STUB_CALLS"' \
+        'n=$(cat "$STUB_COUNTER")' \
+        'n=$((n + 1))' \
+        'printf "%s" "$n" > "$STUB_COUNTER"' \
+        'if [ "$n" -le "$STUB_FAILS" ]; then' \
+        '  echo "error: the server was unable to return a response" >&2' \
+        '  exit 1' \
+        'fi' \
+        'printf "%s" "$STUB_OUT"' \
+        > "$1/bin/kubectl"
+    chmod +x "$1/bin/kubectl"
+    # A transparent `timeout` that records how it was invoked and then runs the
+    # command anyway, so a test can pin the wrapper without changing what the
+    # wrapped call does. Same idiom as hack/run-kubernetes-serial-console_test.bats.
+    # With STUB_TIMEOUT_RC set it instead exits that status without running the
+    # command and without printing, which is what a real kill looks like from the
+    # caller's side: the wrapper says nothing and the command never reaches the
+    # point where it would have.
+    printf '%s\n' \
+        '#!/bin/sh' \
+        'printf "%s\n" "$*" >> "$STUB_TIMEOUT_CALLS"' \
+        'if [ -n "$STUB_TIMEOUT_RC" ]; then exit "$STUB_TIMEOUT_RC"; fi' \
+        'while [ $# -gt 0 ] && [ "$1" != kubectl ]; do shift; done' \
+        'exec "$@"' \
+        > "$1/bin/timeout"
+    chmod +x "$1/bin/timeout"
+    printf '0' > "$1/counter"
+    : > "$1/calls"
+    : > "$1/timeout.calls"
+    export STUB_COUNTER="$1/counter" STUB_CALLS="$1/calls" \
+        STUB_TIMEOUT_CALLS="$1/timeout.calls" STUB_FAILS="$2" STUB_OUT="$3" \
+        STUB_TIMEOUT_RC=""
+    PATH="$1/bin:$PATH"
+}
+
+@test "deployment lookup reports present when the mirror answers with a name" {
+    . hack/e2e-chainsaw/_lib/talos-image-cache.sh
+    d=$(mktemp -d)
+    _TALOS_IMAGE_CACHE_QUERY_DELAY=0
+    _stub_kubectl_dir "$d" 0 'deployment.apps/talos-image-cache'
+    state=$(_talos_image_cache_deploy_state)
+    rm -rf "$d"
+    [ "$state" = present ]
+}
+
+@test "deployment lookup reports absent only on an empty answer the apiserver actually gave" {
+    . hack/e2e-chainsaw/_lib/talos-image-cache.sh
+    d=$(mktemp -d)
+    _TALOS_IMAGE_CACHE_QUERY_DELAY=0
+    # --ignore-not-found: a real absence is exit 0 with no output. This is the
+    # one outcome allowed to turn the whole suite toward the public factory.
+    _stub_kubectl_dir "$d" 0 ''
+    state=$(_talos_image_cache_deploy_state)
+    # The flag has to be pinned by inspection, because the stub gives exit 0 and
+    # no output whether or not the call asks for it. Drop it from the real call
+    # and kubectl reports a genuine absence as an error instead: `absent` becomes
+    # a state production can never reach, while this test keeps passing.
+    flagged=$(grep -c -- '--ignore-not-found' "$d/calls" || true)
+    rm -rf "$d"
+    [ "$state" = absent ]
+    [ "$flagged" = 1 ]
+}
+
+@test "deployment lookup reports unknown when the apiserver never answers" {
+    . hack/e2e-chainsaw/_lib/talos-image-cache.sh
+    d=$(mktemp -d)
+    _TALOS_IMAGE_CACHE_QUERY_DELAY=0
+    # Every attempt refused. Reading this as "absent" is the defect: a blip would
+    # send every tenant worker in the suite to the public factory.
+    _stub_kubectl_dir "$d" 99 'deployment.apps/talos-image-cache'
+    state=$(_talos_image_cache_deploy_state)
+    rm -rf "$d"
+    [ "$state" = unknown ]
+}
+
+@test "deployment lookup rides out a blip and reports what a later attempt found" {
+    . hack/e2e-chainsaw/_lib/talos-image-cache.sh
+    d=$(mktemp -d)
+    _TALOS_IMAGE_CACHE_QUERY_DELAY=0
+    _stub_kubectl_dir "$d" 1 'deployment.apps/talos-image-cache'
+    state=$(_talos_image_cache_deploy_state)
+    tries=$(cat "$d/counter")
+    rm -rf "$d"
+    [ "$state" = present ]
+    [ "$tries" = 2 ]
+}
+
+@test "every attempt at the lookup carries a request deadline" {
+    . hack/e2e-chainsaw/_lib/talos-image-cache.sh
+    d=$(mktemp -d)
+    _TALOS_IMAGE_CACHE_QUERY_DELAY=0
+    _stub_kubectl_dir "$d" 99 'deployment.apps/talos-image-cache'
+    state=$(_talos_image_cache_deploy_state)
+    # kubectl's --request-timeout defaults to 0, so a connection that
+    # establishes and then stalls hangs with no deadline, and re-asking would
+    # multiply that hang instead of riding out a blip. The flag alone is not a
+    # wall-clock bound either — kubectl retries discovery several times over
+    # before it gives up — so each attempt needs the wrapper as well. The last
+    # count pins the number of attempts, not their duration.
+    bounded=$(grep -c -- '--request-timeout=30s' "$d/calls" || true)
+    # The wall-clock bound is deliberately above the request deadline beside it:
+    # level with it, the kill lands first every time and --request-timeout can
+    # never fire, which is how the one silent failure mode stays silent.
+    wrapped=$(grep -c '^-k 5 40 kubectl ' "$d/timeout.calls" || true)
+    total=$(grep -c . "$d/calls" || true)
+    rm -rf "$d"
+    [ "$state" = unknown ]
+    [ "$total" = 3 ]
+    [ "$bounded" = 3 ]
+    [ "$wrapped" = 3 ]
+}
+
+@test "a present mirror routes the decision into the reachability probe" {
+    d=$(mktemp -d)
+    _TALOS_IMAGE_FACTORY_DECISION_FILE="$d/decision"
+    . hack/e2e-chainsaw/_lib/talos-image-cache.sh
+    _TALOS_IMAGE_CACHE_QUERY_DELAY=0
+    _stub_kubectl_dir "$d" 0 'deployment.apps/talos-image-cache'
+    set +x
+    url=$(resolve_talos_image_factory_url 2>"$d/err")
+    err=$(cat "$d/err")
+    rm -rf "$d"
+    # The state token is a contract between this helper and its two readers.
+    # Drift on the resolve side is the worst case there is: the present branch
+    # would fall through to "not deployed", cache an empty URL, and send every
+    # tenant worker in the suite to the public factory — the very harm the
+    # three-way answer exists to prevent, with every other test still green.
+    [ -z "$url" ]
+    printf '%s' "$err" | grep -q 'Available but a tenant-scoped probe' || { echo "a present mirror must reach the probe, not the not-deployed branch: [$err]" >&2; exit 1; }
+}
+
+@test "an undecidable lookup warns and is not cached for the rest of the suite" {
+    d=$(mktemp -d)
+    _TALOS_IMAGE_FACTORY_DECISION_FILE="$d/decision"
+    . hack/e2e-chainsaw/_lib/talos-image-cache.sh
+    _TALOS_IMAGE_CACHE_QUERY_DELAY=0
+    _stub_kubectl_dir "$d" 99 'deployment.apps/talos-image-cache'
+    # cozytest.sh runs each test under `set -x`, and xtrace shares the stderr
+    # this captures. Off for the call, so the assertions below read what the
+    # function said rather than an echo of the commands it ran, and left off
+    # afterwards: a test that turns it back on and then fails wedges `bats`
+    # instead of reporting, which costs a reader the failure they came for.
+    set +x
+    url=$(resolve_talos_image_factory_url 2>"$d/err")
+    cached=no
+    if [ -f "$d/decision" ]; then cached=yes; fi
+    err=$(cat "$d/err")
+    rm -rf "$d"
+    # Falling back for this one caller is fine; pinning that fallback for every
+    # later tenant test on the strength of a failed question is not.
+    [ -z "$url" ]
+    [ "$cached" = no ]
+    printf '%s' "$err" | grep -q 'could not determine' || { echo "an undecidable lookup must say so: [$err]" >&2; exit 1; }
+    # And it must say why. "could not determine" alone leaves an operator with a
+    # new silent failure in place of the old one: refused, Unauthorized and
+    # timed-out all read the same until kubectl's own message reaches the log.
+    printf '%s' "$err" | grep -q 'the server was unable to return a response' || { echo "the reason the lookup failed must reach the log: [$err]" >&2; exit 1; }
+}
+
+@test "a lookup killed by the wall-clock bound still accounts for itself" {
+    d=$(mktemp -d)
+    _TALOS_IMAGE_FACTORY_DECISION_FILE="$d/decision"
+    . hack/e2e-chainsaw/_lib/talos-image-cache.sh
+    _TALOS_IMAGE_CACHE_QUERY_DELAY=0
+    _stub_kubectl_dir "$d" 0 'deployment.apps/talos-image-cache'
+    # The stall this loop exists for, and the one case where nobody speaks:
+    # `timeout` prints nothing when it fires, and the kubectl it killed never
+    # reached the point where it would have printed either. The sibling test
+    # below pins the reason on a kubectl that failed loudly, which every stub
+    # does by default -- so without this case "the reason reaches the log" is
+    # pinned only where it was never in doubt.
+    export STUB_TIMEOUT_RC=124
+    set +x
+    url=$(resolve_talos_image_factory_url 2>"$d/err")
+    err=$(cat "$d/err")
+    spoke=$(grep -c . "$d/calls" || true)
+    rm -rf "$d"
+    [ -z "$url" ]
+    # kubectl never ran, so anything the warning points at has to come from the
+    # lookup itself. Drop this and the case degrades into the sibling below.
+    [ "$spoke" = 0 ]
+    printf '%s' "$err" | grep -q 'the last one exited 124' || { echo "a lookup cut off by its own bound must say so: [$err]" >&2; exit 1; }
+}
+
+@test "a genuine absence still resolves once and stays cached" {
+    d=$(mktemp -d)
+    _TALOS_IMAGE_FACTORY_DECISION_FILE="$d/decision"
+    . hack/e2e-chainsaw/_lib/talos-image-cache.sh
+    _TALOS_IMAGE_CACHE_QUERY_DELAY=0
+    _stub_kubectl_dir "$d" 0 ''
+    set +x
+    url=$(resolve_talos_image_factory_url 2>"$d/err")
+    cached=no
+    if [ -f "$d/decision" ]; then cached=yes; fi
+    err=$(cat "$d/err")
+    rm -rf "$d"
+    [ -z "$url" ]
+    [ "$cached" = yes ]
+    printf '%s' "$err" | grep -q 'not deployed' || { echo "a real absence must report itself as such: [$err]" >&2; exit 1; }
+}
+
+@test "with timeout off PATH the lookup still asks instead of answering unknown" {
+    . hack/e2e-chainsaw/_lib/talos-image-cache.sh
+    d=$(mktemp -d)
+    _TALOS_IMAGE_CACHE_QUERY_DELAY=0
+    _stub_kubectl_dir "$d" 0 'deployment.apps/talos-image-cache'
+    rm -f "$d/bin/timeout"
+    # Everything the kubectl stub itself needs, staged from known directories so
+    # the stripped PATH below loses `timeout` and nothing else. Resolved this way
+    # rather than through `command -v` for the reason the same idiom gives in
+    # hack/run-kubernetes-node-join_test.bats: a name mocked as a shell function
+    # answers with the function and no link gets made.
+    for c in cat sleep; do
+        for p in /bin /usr/bin /usr/local/bin /opt/homebrew/bin; do
+            if [ -x "$p/$c" ]; then ln -sf "$p/$c" "$d/bin/$c"; break; fi
+        done
+    done
+    if [ ! -x "$d/bin/cat" ]; then
+        echo "could not stage a real cat in the stripped PATH; the check below would be vacuous" >&2
+        rm -rf "$d"
+        exit 1
+    fi
+    # Stripped for the call and restored right after: the assertions below need a
+    # `grep` this PATH deliberately does not have.
+    oldpath=$PATH
+    PATH="$d/bin"
+    state=$(_talos_image_cache_deploy_state)
+    PATH=$oldpath
+    wrapped=$(grep -c . "$d/timeout.calls" || true)
+    rm -rf "$d"
+    # Calling the wrapper anyway when it is not installed makes every attempt
+    # exit 127, and three of those read as an apiserver that never answered: a
+    # missing local binary would pin the whole suite to the public factory while
+    # every message blamed the cluster. Asserting the state rather than the exit
+    # is what distinguishes the two — 127 lands on `unknown`, not on an error.
+    [ "$state" = present ]
+    [ "$wrapped" = 0 ]
+}
+
+@test "probe overrides builder emits valid JSON with the image, command and restricted PSA" {
+    . hack/e2e-chainsaw/_lib/talos-image-cache.sh
+    img=example.invalid/img:tag
+    cmd='curl -s -o /dev/null -w code=%{http_code} -r 0-0 http://talos-image-cache.kube-system.svc/x.raw.xz'
+    json=$(_talos_image_cache_probe_overrides "$img" "$cmd")
+    # Invalid JSON would make every probe fail and silently drop CI back to the
+    # public factory, so parse it rather than pattern-match it.
+    printf '%s' "$json" | yq -p=json -o=json '.' >/dev/null
+    [ "$(printf '%s' "$json" | yq -p=json '.spec.containers[0].name')" = "c" ]
+    [ "$(printf '%s' "$json" | yq -p=json '.spec.containers[0].image')" = "$img" ]
+    [ "$(printf '%s' "$json" | yq -p=json '.spec.containers[0].command[2]')" = "$cmd" ]
+    [ "$(printf '%s' "$json" | yq -p=json '.spec.securityContext.runAsNonRoot')" = "true" ]
+    [ "$(printf '%s' "$json" | yq -p=json '.spec.containers[0].securityContext.allowPrivilegeEscalation')" = "false" ]
+}
diff --git a/hack/talos-installer-index_test.bats b/hack/talos-installer-index_test.bats
new file mode 100644
index 0000000000..6bf7d63fb3
--- /dev/null
+++ b/hack/talos-installer-index_test.bats
@@ -0,0 +1,38 @@
+#!/usr/bin/env bats
+# packages/core/talos/hack/installer-index.sh ties the per-arch installer
+# manifests skopeo left in an OCI layout into the index the talos image is
+# pushed as. A wrong digest or size makes that push fail; a wrong or missing
+# platform makes a node pull the other arch's installer.
+#
+# Requires: jq, sha256sum.
+
+load test_helper
+
+@test "installer-index.sh indexes each arch's manifest under its platform" {
+  layout="$(mktemp -d)"
+  mkdir -p "$layout/blobs/sha256"
+  cat > "$layout/index.json" <<'EOF'
+{"schemaVersion":2,"manifests":[
+{"mediaType":"application/vnd.oci.image.manifest.v1+json","digest":"sha256:aa","size":10,"annotations":{"org.opencontainers.image.ref.name":"amd64"}},
+{"mediaType":"application/vnd.oci.image.manifest.v1+json","digest":"sha256:bb","size":20,"annotations":{"org.opencontainers.image.ref.name":"arm64"}}]}
+EOF
+  packages/core/talos/hack/installer-index.sh "$layout" amd64 arm64
+
+  desc=$(jq -c '.manifests[] | select(.annotations["org.opencontainers.image.ref.name"] == "index")' "$layout/index.json")
+  digest=$(printf '%s' "$desc" | jq -r .digest)
+  blob="$layout/blobs/sha256/${digest#sha256:}"
+  [ "$(sha256sum "$blob" | cut -d' ' -f1)" = "${digest#sha256:}" ]
+  [ "$(printf '%s' "$desc" | jq .size)" -eq "$(wc -c < "$blob" | tr -d ' ')" ]
+  [ "$(jq -c '[.manifests[] | [.digest, .platform.os, .platform.architecture]]' "$blob")" = '[["sha256:aa","linux","amd64"],["sha256:bb","linux","arm64"]]' ]
+  rm -rf "$layout"
+}
+
+@test "installer-index.sh refuses an arch the layout has no manifest for" {
+  layout="$(mktemp -d)"
+  mkdir -p "$layout/blobs/sha256"
+  echo '{"schemaVersion":2,"manifests":[{"mediaType":"application/vnd.oci.image.manifest.v1+json","digest":"sha256:aa","size":10,"annotations":{"org.opencontainers.image.ref.name":"amd64"}}]}' > "$layout/index.json"
+  if packages/core/talos/hack/installer-index.sh "$layout" amd64 arm64 2>/dev/null; then
+    echo "FAIL: indexed an arch with no manifest"; rm -rf "$layout"; false
+  fi
+  rm -rf "$layout"
+}
diff --git a/hack/talos-reconcile-heredoc_test.bats b/hack/talos-reconcile-heredoc_test.bats
new file mode 100644
index 0000000000..6fd19e850a
--- /dev/null
+++ b/hack/talos-reconcile-heredoc_test.bats
@@ -0,0 +1,336 @@
+#!/usr/bin/env bats
+# -----------------------------------------------------------------------------
+# Execution-level regression test for the worker TalosConfigTemplate heredoc:
+# it pins that the reconcile Job's unquoted heredoc still emits a valid config
+# when talos.registryMirrors (and the Talos image coordinates) carry hostile
+# free-form input.
+#
+# Since the Phase 2 split the worker pool, its talos-reconcile Job, and the
+# TalosConfigTemplate it applies live only in the kubernetes-nodes chart; the
+# parent kubernetes chart no longer renders a worker reconcile Job. These tests
+# therefore render packages/apps/kubernetes-nodes.
+#
+# The reconcile Job applies the TalosConfigTemplate via an UNQUOTED `cat <<EOF`
+# heredoc, captured into a variable and then applied, so every line of its body
+# is subject to shell parameter expansion and command substitution at Job
+# runtime. The `talos.registryMirrors` knob and the Talos image coordinates
+# render free-form tenant-facing input into that heredoc. A helm-unittest
+# string `matchRegex` cannot catch a heredoc that the shell refuses to emit
+# (e.g. an unbalanced backtick from an un-escaped value): it never runs the
+# shell. This test does.
+#
+# The chart's own invariant (see the INVARIANT note in
+# packages/apps/kubernetes-nodes/templates/talos-reconcile-job.yaml) gives a field
+# two ways to be safe here, and which one a field uses decides what to assert:
+#
+#   escaped     the value reaches the heredoc and is escaped for backslash,
+#               dollar and backtick. Assert it survives a real shell as a
+#               LITERAL. This covers talos.installerRepository and
+#               talos.registryMirrors, both genuinely free-form.
+#   validated   the value is refused at render before it can reach the heredoc.
+#               Assert the refusal. This covers talos.schematicID and
+#               talos.version, which also land in the worker DataVolume name and
+#               the image URL, where an unquoted YAML scalar makes escaping the
+#               wrong tool. templates/nodegroup.yaml pattern-checks them. It also
+#               covers kernelModules, whose names and parameters
+#               templates/_helpers.tpl checks before rebuilding the list.
+#
+# A field that is in neither arm is the regression this file exists to catch.
+#
+# Needs `helm` + `yq` and must run from the repo root.
+# Run with: bats hack/talos-reconcile-heredoc_test.bats
+# -----------------------------------------------------------------------------
+
+load test_helper
+
+@test "kubernetes-nodes refuses hostile Talos image coordinates at render" {
+    work=$(mktemp -d)
+    cat > "$work/vals.yaml" <<'VALS'
+cluster: myk8s
+_cluster:
+  cluster-domain: cozy.local
+version: "v1.35"
+minReplicas: 0
+maxReplicas: 3
+instanceType: ""
+diskSize: 20Gi
+storageClass: replicated
+roles: [ingress-nginx]
+resources: {cpu: "2", memory: 4Gi}
+VALS
+    # schematicID and version are not escaped into safety, they are refused. They
+    # are also interpolated into the worker DataVolume name and its source URL,
+    # where the scalar is unquoted and escaping buys nothing, so the render is the
+    # only place that can stop them.
+    for f in 'talos.schematicID=sch$(id)`q`z' 'talos.version=v1.13.6$(id)`v`w'; do
+        if helm template kubernetes-nodes-myk8s-md0 packages/apps/kubernetes-nodes \
+            -n tenant-test -f "$work/vals.yaml" --set "$f" >/dev/null 2>"$work/err"; then
+            echo "render accepted a hostile ${f%%=*}, so the value reaches the DataVolume name and the heredoc" >&2
+            rm -rf "$work"; exit 1
+        fi
+        grep -qE 'is not a plain lowercase alphanumeric identifier|is not a vMAJOR\.MINOR\.PATCH release' "$work/err" \
+            || { echo "render failed on ${f%%=*} for some other reason:" >&2; cat "$work/err" >&2; rm -rf "$work"; exit 1; }
+    done
+    rm -rf "$work"
+}
+
+@test "kubernetes-nodes worker TalosConfigTemplate heredoc keeps a hostile installerRepository literal" {
+    work=$(mktemp -d)
+    cat > "$work/vals.yaml" <<'VALS'
+cluster: myk8s
+_cluster:
+  cluster-domain: cozy.local
+version: "v1.35"
+minReplicas: 0
+maxReplicas: 3
+instanceType: ""
+diskSize: 20Gi
+storageClass: replicated
+roles: [ingress-nginx]
+resources: {cpu: "2", memory: 4Gi}
+VALS
+    # installerRepository is an OCI repository prefix and stays free-form: it is
+    # not part of the DataVolume name, so escaping is the right tool and this is
+    # the assertion that proves it still works.
+    helm template kubernetes-nodes-myk8s-md0 packages/apps/kubernetes-nodes -n tenant-test -f "$work/vals.yaml" \
+        --set 'talos.installerRepository=reg$(id)`x`y/installer' \
+        --show-only templates/talos-reconcile-job.yaml \
+        | yq 'select(.kind == "Job") | .spec.template.spec.containers[0].command[2]' \
+        > "$work/cmd.sh"
+    [ -s "$work/cmd.sh" ] || { echo "kubernetes-nodes render produced no Job command" >&2; rm -rf "$work"; exit 1; }
+    awk '
+      /(^|=\"?\$\()cat <<EOF/ { print "cat <<EOF"; inblock=1; next }
+      inblock && /^EOF$/            { print "EOF"; inblock=0; next }
+      inblock                       { print }
+    ' "$work/cmd.sh" > "$work/heredoc.sh"
+    grep -q '^cat <<EOF$' "$work/heredoc.sh" || { echo "could not extract the kubernetes-nodes heredoc" >&2; rm -rf "$work"; exit 1; }
+    out=$(sh "$work/heredoc.sh" 2>"$work/err") || { echo "kubernetes-nodes heredoc shell exited non-zero" >&2; cat "$work/err" >&2; rm -rf "$work"; exit 1; }
+    [ -n "$out" ] || { echo "kubernetes-nodes heredoc emitted no output" >&2; rm -rf "$work"; exit 1; }
+    printf '%s' "$out" | grep -qF 'reg$(id)`x`y/installer' || { echo "kubernetes-nodes installerRepository was not preserved literally" >&2; rm -rf "$work"; exit 1; }
+    # The default version still reaches both of its sites, so narrowing this test
+    # to installerRepository did not quietly drop the two-site assertion.
+    [ "$(printf '%s' "$out" | grep -cF 'v1.13.6')" -ge 2 ] || { echo "kubernetes-nodes talos.version did not reach both sites" >&2; printf '%s\n' "$out" | grep -iE 'talosVersion|image:' >&2; rm -rf "$work"; exit 1; }
+    rm -rf "$work"
+}
+
+@test "kubernetes-nodes worker TalosConfigTemplate heredoc emits with a hostile registryMirrors value" {
+    work=$(mktemp -d)
+    cat > "$work/vals.yaml" <<'VALS'
+cluster: myk8s
+_cluster:
+  cluster-domain: cozy.local
+version: "v1.35"
+minReplicas: 0
+maxReplicas: 3
+instanceType: ""
+diskSize: 20Gi
+storageClass: replicated
+roles: [ingress-nginx]
+resources: {cpu: "2", memory: 4Gi}
+VALS
+    helm template kubernetes-nodes-myk8s-md0 packages/apps/kubernetes-nodes -n tenant-test -f "$work/vals.yaml" \
+        --set 'talos.registryMirrors.ghcr\.io.endpoints[0]=http://m$(id)`x`y' \
+        --show-only templates/talos-reconcile-job.yaml \
+        | yq 'select(.kind == "Job") | .spec.template.spec.containers[0].command[2]' \
+        > "$work/cmd.sh"
+    [ -s "$work/cmd.sh" ] || { echo "kubernetes-nodes render produced no Job command" >&2; rm -rf "$work"; exit 1; }
+    awk '
+      /(^|=\"?\$\()cat <<EOF/ { print "cat <<EOF"; inblock=1; next }
+      inblock && /^EOF$/            { print "EOF"; inblock=0; next }
+      inblock                       { print }
+    ' "$work/cmd.sh" > "$work/heredoc.sh"
+    grep -q '^cat <<EOF$' "$work/heredoc.sh" || { echo "could not extract the kubernetes-nodes heredoc" >&2; rm -rf "$work"; exit 1; }
+    out=$(sh "$work/heredoc.sh" 2>"$work/err") || { echo "kubernetes-nodes heredoc shell exited non-zero" >&2; cat "$work/err" >&2; rm -rf "$work"; exit 1; }
+    [ -n "$out" ] || { echo "kubernetes-nodes heredoc emitted no output" >&2; cat "$work/err" >&2; rm -rf "$work"; exit 1; }
+    printf '%s' "$out" | grep -q 'kind: TalosConfigTemplate' || { echo "kubernetes-nodes heredoc output is not the TalosConfigTemplate" >&2; rm -rf "$work"; exit 1; }
+    printf '%s' "$out" | grep -qF 'http://m$(id)`x`y' || { echo "kubernetes-nodes hostile endpoint not preserved literally" >&2; rm -rf "$work"; exit 1; }
+    rm -rf "$work"
+}
+
+# The proxmox substrate adds the only tenant-controlled value in this heredoc
+# that is not shell-escaped: proxmox.dnsServers. `quote` there is YAML quoting
+# and leaves $(...) and backticks for the Job's shell to run — rendered with a
+# substitution, the shell executed it and its output ended up in the worker's
+# resolver list. The fix is render-time validation rather than escaping, because
+# Talos takes addresses here and an address cannot carry a metacharacter, so
+# these two tests hold both halves: the render refuses what is not an address,
+# and what is an address survives the shell untouched.
+@test "kubernetes-nodes refuses a proxmox dnsServers entry that is not an address" {
+    work=$(mktemp -d)
+    cat > "$work/vals.yaml" <<'VALS'
+cluster: myk8s
+_cluster:
+  cluster-domain: cozy.local
+version: "v1.35"
+minReplicas: 0
+maxReplicas: 3
+instanceType: ""
+diskSize: 20Gi
+storageClass: replicated
+roles: [ingress-nginx]
+resources: {cpu: "2", memory: 4Gi}
+substrate: proxmox
+proxmox:
+  templateTags: [talos]
+  network: {bridge: vmbr0}
+  dnsServers: ["10.0.0.1", "$(id -u)"]
+VALS
+    if helm template kubernetes-nodes-myk8s-md0 packages/apps/kubernetes-nodes -n tenant-test -f "$work/vals.yaml" \
+        --show-only templates/talos-reconcile-job.yaml > "$work/out.yaml" 2>"$work/err"; then
+        echo "render accepted a command substitution in proxmox.dnsServers" >&2
+        rm -rf "$work"; exit 1
+    fi
+    grep -qF 'proxmox.dnsServers[1]' "$work/err" || { echo "refusal does not name the offending entry" >&2; cat "$work/err" >&2; rm -rf "$work"; exit 1; }
+    rm -rf "$work"
+}
+
+# The validator has two branches and a value without a colon never reaches the
+# second one. This case does: `::1$(id -u)` looks enough like an IPv6 address to
+# take the IPv6 path, so it is what pins that path's character class. Widen the
+# class and this entry renders, with the substitution back in the heredoc, while
+# the case above still passes on its IPv4 branch.
+@test "kubernetes-nodes refuses an IPv6-shaped dnsServers entry carrying a substitution" {
+    work=$(mktemp -d)
+    cat > "$work/vals.yaml" <<'VALS'
+cluster: myk8s
+_cluster:
+  cluster-domain: cozy.local
+version: "v1.35"
+minReplicas: 0
+maxReplicas: 3
+instanceType: ""
+diskSize: 20Gi
+storageClass: replicated
+roles: [ingress-nginx]
+resources: {cpu: "2", memory: 4Gi}
+substrate: proxmox
+proxmox:
+  templateTags: [talos]
+  network: {bridge: vmbr0}
+  dnsServers: ["10.0.0.1", "::1$(id -u)"]
+VALS
+    if helm template kubernetes-nodes-myk8s-md0 packages/apps/kubernetes-nodes -n tenant-test -f "$work/vals.yaml" \
+        --show-only templates/talos-reconcile-job.yaml > "$work/out.yaml" 2>"$work/err"; then
+        echo "render accepted a substitution inside an IPv6-shaped entry" >&2
+        rm -rf "$work"; exit 1
+    fi
+    grep -qF 'proxmox.dnsServers[1]' "$work/err" || { echo "refusal does not name the IPv6-shaped entry" >&2; cat "$work/err" >&2; rm -rf "$work"; exit 1; }
+    rm -rf "$work"
+}
+
+@test "kubernetes-nodes proxmox heredoc emits the nameservers it was given" {
+    work=$(mktemp -d)
+    cat > "$work/vals.yaml" <<'VALS'
+cluster: myk8s
+_cluster:
+  cluster-domain: cozy.local
+version: "v1.35"
+minReplicas: 0
+maxReplicas: 3
+instanceType: ""
+diskSize: 20Gi
+storageClass: replicated
+roles: [ingress-nginx]
+resources: {cpu: "2", memory: 4Gi}
+substrate: proxmox
+proxmox:
+  templateTags: [talos]
+  network: {bridge: vmbr0}
+  dnsServers: ["10.0.0.1", "2001:4860:4860::8888"]
+VALS
+    helm template kubernetes-nodes-myk8s-md0 packages/apps/kubernetes-nodes -n tenant-test -f "$work/vals.yaml" \
+        --show-only templates/talos-reconcile-job.yaml \
+        | yq 'select(.kind == "Job") | .spec.template.spec.containers[0].command[2]' \
+        > "$work/cmd.sh"
+    [ -s "$work/cmd.sh" ] || { echo "proxmox render produced no Job command" >&2; rm -rf "$work"; exit 1; }
+    awk '
+      # Matched on shape: `cat <<EOF` at the start of a line, or right after
+      # `=$(` / `="$(` when the heredoc is captured into a variable.
+      /(^|=\"?\$\()cat <<EOF/ { print "cat <<EOF"; inblock=1; next }
+      inblock && /^EOF$/            { print "EOF"; inblock=0; next }
+      inblock                       { print }
+    ' "$work/cmd.sh" > "$work/heredoc.sh"
+    grep -q '^cat <<EOF$' "$work/heredoc.sh" || { echo "could not extract the proxmox heredoc" >&2; rm -rf "$work"; exit 1; }
+    out=$(sh "$work/heredoc.sh" 2>"$work/err") || { echo "proxmox heredoc shell exited non-zero" >&2; cat "$work/err" >&2; rm -rf "$work"; exit 1; }
+    printf '%s' "$out" | grep -qF -e '- "10.0.0.1"' || { echo "IPv4 nameserver missing from the emitted config" >&2; rm -rf "$work"; exit 1; }
+    printf '%s' "$out" | grep -qF -e '- "2001:4860:4860::8888"' || { echo "IPv6 nameserver missing from the emitted config" >&2; rm -rf "$work"; exit 1; }
+    rm -rf "$work"
+}
+
+# kernelModules is in the validated arm: its names and parameters are refused at
+# render, and the list is rebuilt from those two fields so no other key reaches
+# the heredoc. The refusal and the one character class it deliberately lets
+# through are pinned separately, because a guard that grows to reject `;` breaks
+# NVIDIA's documented multi-value parameter while every refusal still passes.
+@test "kubernetes-nodes refuses a hostile kernelModules name or parameter at render" {
+    work=$(mktemp -d)
+    cat > "$work/vals.yaml" <<'VALS'
+cluster: myk8s
+_cluster:
+  cluster-domain: cozy.local
+version: "v1.35"
+minReplicas: 0
+maxReplicas: 3
+instanceType: ""
+diskSize: 20Gi
+storageClass: replicated
+roles: [ingress-nginx]
+resources: {cpu: "2", memory: 4Gi}
+VALS
+    cat > "$work/name.yaml" <<'VALS'
+kernelModules:
+  - name: nvidia$(id)`q`z
+VALS
+    cat > "$work/param.yaml" <<'VALS'
+kernelModules:
+  - name: nvidia
+    parameters: ["opt=$(id)`q`z"]
+VALS
+    for f in name param; do
+        if helm template kubernetes-nodes-myk8s-md0 packages/apps/kubernetes-nodes -n tenant-test -f "$work/vals.yaml" -f "$work/$f.yaml" \
+            --show-only templates/talos-reconcile-job.yaml >/dev/null 2>"$work/err"; then
+            echo "render accepted a hostile kernelModules $f, so the value reaches the heredoc" >&2
+            rm -rf "$work"; exit 1
+        fi
+        grep -qF "invalid kernelModules $f" "$work/err" \
+            || { echo "render failed on kernelModules $f for some other reason:" >&2; cat "$work/err" >&2; rm -rf "$work"; exit 1; }
+    done
+    rm -rf "$work"
+}
+
+@test "kubernetes-nodes worker TalosConfigTemplate heredoc keeps a semicolon kernelModules parameter literal" {
+    work=$(mktemp -d)
+    cat > "$work/vals.yaml" <<'VALS'
+cluster: myk8s
+_cluster:
+  cluster-domain: cozy.local
+version: "v1.35"
+minReplicas: 0
+maxReplicas: 3
+instanceType: ""
+diskSize: 20Gi
+storageClass: replicated
+roles: [ingress-nginx]
+resources: {cpu: "2", memory: 4Gi}
+kernelModules:
+  - name: nvidia
+    parameters: ["NVreg_RegistryDwords=PowerMizerEnable=0x1;PerfLevelSrc=0x2222"]
+VALS
+    helm template kubernetes-nodes-myk8s-md0 packages/apps/kubernetes-nodes -n tenant-test -f "$work/vals.yaml" \
+        --show-only templates/talos-reconcile-job.yaml \
+        | yq 'select(.kind == "Job") | .spec.template.spec.containers[0].command[2]' \
+        > "$work/cmd.sh"
+    [ -s "$work/cmd.sh" ] || { echo "kubernetes-nodes render produced no Job command" >&2; rm -rf "$work"; exit 1; }
+    awk '
+      # Matched on shape: `cat <<EOF` at the start of a line, or right after
+      # `=$(` / `="$(` when the heredoc is captured into a variable.
+      /(^|=\"?\$\()cat <<EOF/ { print "cat <<EOF"; inblock=1; next }
+      inblock && /^EOF$/            { print "EOF"; inblock=0; next }
+      inblock                       { print }
+    ' "$work/cmd.sh" > "$work/heredoc.sh"
+    grep -q '^cat <<EOF$' "$work/heredoc.sh" || { echo "could not extract the kubernetes-nodes heredoc" >&2; rm -rf "$work"; exit 1; }
+    out=$(sh "$work/heredoc.sh" 2>"$work/err") || { echo "kubernetes-nodes heredoc shell exited non-zero" >&2; cat "$work/err" >&2; rm -rf "$work"; exit 1; }
+    printf '%s' "$out" | grep -qF -e '- NVreg_RegistryDwords=PowerMizerEnable=0x1;PerfLevelSrc=0x2222' \
+        || { echo "kernelModules parameter was not preserved literally" >&2; printf '%s\n' "$out" | grep -A6 'kernel:' >&2; rm -rf "$work"; exit 1; }
+    rm -rf "$work"
+}
diff --git a/hack/tenant-pre-delete-hook.bats b/hack/tenant-pre-delete-hook.bats
new file mode 100644
index 0000000000..b142e3904d
--- /dev/null
+++ b/hack/tenant-pre-delete-hook.bats
@@ -0,0 +1,300 @@
+#!/usr/bin/env bats
+# Behavioural tests for the pre-delete cleanup hook of packages/apps/tenant: the
+# script is extracted from the rendered Job and executed against a stub kubectl.
+# The helm-unittest cases in packages/apps/tenant/tests/cleanup_role_watch_test.yaml
+# assert the Job's shape — the deadline and the attempt count — which is what
+# the script cannot observe about itself.
+#
+# What a stub can and cannot show. `--timeout` is implemented inside kubectl, so
+# no stub can make that deadline actually elapse; what the stub can do is record
+# whether the flag reached kubectl at all, and answer for the run that follows a
+# delete which gave up. Those are the two halves below: one test reads the
+# arguments, the rest inject the non-zero exit an expired delete produces.
+#
+# Run from the repo root through `make bats-unit-tests`; relative paths resolve
+# against that cwd. The file also remains compatible with the legacy
+# `hack/cozytest.sh` translator, so each @test builds and removes its fixture
+# inline instead of relying on setup()/teardown(). No EXIT
+# traps: a test that dies inside one prints neither `not ok` nor a reason, and
+# the suite reads green. A failing test therefore leaves its temp directory
+# behind, which is what you want when reading the rendered script afterwards.
+
+load test_helper
+
+CHART=packages/apps/tenant
+
+# The two waves, told apart by their label selector. `*tenantmodule=true*` does
+# not match the applications wave: that one spells the selector
+# `tenantmodule!=true`, which contains no `tenantmodule=true` substring.
+WAVE_APPS='*tenantmodule!=true*'
+WAVE_MODULES='*tenantmodule=true*'
+
+# Render the pre-delete Job into $1. The release name has to start with
+# `tenant-` and carry no second dash (templates/tenant.yaml enforces it), and
+# `_cluster` normally arrives from the cozystack-values Secret, so the one key
+# templates/keycloakgroups.yaml indexes is supplied here as a string.
+#
+# The emptiness check must be an early `return 1`: hack/cozytest.sh rewrites
+# every line matching ^}$ into `return 0` plus `}`, helpers included, so a check
+# left in last position has its status discarded. helm's stderr is kept rather
+# than dropped, because it carries the reason a render failed; only the
+# per-render notice about the charts/cozy-lib symlink is filtered out.
+render_job() {
+  helm template tenant-test "$CHART" \
+    --namespace tenant-root \
+    --set-string '_cluster.oidc-enabled=false' \
+    --show-only templates/cleanup-job.yaml 2>"$1.err" |
+    yq 'select(.kind == "Job")' - > "$1"
+  if [ ! -s "$1" ]; then
+    echo "FAIL: the chart rendered no pre-delete Job" >&2
+    grep -v 'found symbolic link in path' "$1.err" >&2 || true
+    return 1
+  fi
+}
+
+# A stub kubectl in $1. Every invocation is logged; those matching a glob in
+# $KUBECTL_FAIL exit non-zero with the wording kubectl itself prints when a
+# `--wait` deadline expires, which is the only outcome the script can tell apart
+# from success.
+#
+# The closing brace of the helper inside the heredoc is indented on purpose:
+# cozytest.sh rewrites every line matching ^}$ anywhere in this file, the
+# heredoc included, and a `return 0` spliced into the stub would make every
+# injected failure disappear.
+make_kubectl() {
+  mkdir -p "$1"
+  cat > "$1/kubectl" <<'STUB'
+#!/bin/sh
+args="$*"
+echo "$args" >> "${KUBECTL_LOG:-/dev/null}"
+
+matches() {
+  [ -n "$1" ] || return 1
+  oldifs=$IFS
+  IFS='
+'
+  for pat in $1; do
+    case "$args" in
+      $pat) IFS=$oldifs; return 0 ;;
+    esac
+  done
+  IFS=$oldifs
+  return 1
+  }
+
+if matches "${KUBECTL_FAIL:-}"; then
+  echo "error: timed out waiting for the condition on helmreleases.helm.toolkit.fluxcd.io" >&2
+  exit 1
+fi
+exit 0
+STUB
+  chmod 0755 "$1/kubectl"
+}
+
+# Fixture: $tmp holds the rendered Job, its script, and the stub kubectl.
+setup_case() {
+  tmp=$(mktemp -d) || return 1
+  render_job "$tmp/job.yaml" || return 1
+  yq '.spec.template.spec.containers[0].command[2]' "$tmp/job.yaml" > "$tmp/s.sh" || return 1
+  [ -s "$tmp/s.sh" ] || return 1
+  make_kubectl "$tmp/bin" || return 1
+}
+
+# Run the hook with the failures injected by $1, leaving merged output in
+# $tmp/out, the invocations in $tmp/kubectl.log and the exit status in $rc. The
+# status must not abort the test: it is itself one of the things under test.
+# KUBECONFIG is neutered so a stub that stopped being found on PATH cannot reach
+# a real cluster.
+run_hook() {
+  rc=0
+  : > "$tmp/kubectl.log"
+  KUBECONFIG=/dev/null \
+  KUBECTL_LOG="$tmp/kubectl.log" \
+  KUBECTL_FAIL="$1" \
+  PATH="$tmp/bin:$PATH" sh "$tmp/s.sh" > "$tmp/out" 2>&1 || rc=$?
+  # The stub has to have been reached, or the assertions below measured
+  # something other than this script driving kubectl.
+  [ -s "$tmp/kubectl.log" ] || return 1
+}
+
+@test "a run where both waves completed reports success" {
+  setup_case
+  run_hook ""
+
+  [ "$rc" = 0 ]
+  grep -qF 'Cleanup completed successfully' "$tmp/out"
+  # Both waves have to have run, or the success claim is about a script that
+  # deleted nothing and the tests below have no baseline to differ from.
+  grep -q 'tenantmodule!=true' "$tmp/kubectl.log"
+  grep -q 'tenantmodule=true' "$tmp/kubectl.log"
+
+  rm -rf "$tmp"
+}
+
+@test "every delete reaches kubectl with a wall-clock bound" {
+  # The defect this pins. kubectl reads the default `--timeout=0` as wait
+  # forever and substitutes a week, so a delete that arrives without the flag
+  # hangs the hook for as long as any child HelmRelease cannot finalize — and
+  # helm returns from the uninstall before removing anything, leaving the
+  # release in storage to be retried. Read from the arguments the stub actually
+  # received rather than from the template text, so a flag that stops being
+  # passed cannot pass here by still being written somewhere in the file.
+  setup_case
+  run_hook ""
+
+  deletes=$(grep -c 'delete helmreleases' "$tmp/kubectl.log" || true)
+  [ "$deletes" = 2 ]
+  # A bound of zero is the unbounded case spelled explicitly, so the value has
+  # to start with a non-zero digit rather than merely be present.
+  bounded=$(grep 'delete helmreleases' "$tmp/kubectl.log" |
+    grep -c -- '--timeout=[1-9][0-9]*s' || true)
+  if [ "$bounded" != "$deletes" ]; then
+    echo "FAIL: $bounded of $deletes deletes carried a non-zero --timeout"
+    cat "$tmp/kubectl.log"
+    return 1
+  fi
+
+  rm -rf "$tmp"
+}
+
+@test "the waits, the Job deadline and the uninstall budget stay in order" {
+  # Four numbers, one ordering, and both ends of it are load-bearing.
+  #
+  # Waves under the deadline: activeDeadlineSeconds is the outer stop, and only
+  # a backstop while the waits inside it can finish first. Raise a wave past the
+  # remainder and the deadline starts cutting runs that were going to succeed.
+  #
+  # Deadline plus termination under the uninstall budget: flux takes that budget
+  # from spec.uninstall.timeout / spec.timeout, and cozystack-api generates the
+  # tenant HelmRelease with neither, so it is helm-controller's 300s default. The
+  # deadline is measured from the Job's startTime and helm's budget from just
+  # before it creates the Job, so at 300 helm gives up first — on a Job that is
+  # still running, which is the state this whole change exists to end.
+  #
+  # The termination period belongs on the same side of that comparison as the
+  # deadline. Since 1.31 the Job controller withholds the terminal condition
+  # until every pod has finished terminating, so what helm waits for is the sum
+  # rather than the deadline alone — and the sum is what is actually spent here,
+  # because PID 1 is a shell running a multi-command script: it never execs into
+  # kubectl, and a default disposition sent to PID 1 is discarded by the kernel
+  # with no handler installed to catch it. Comparing the deadline alone would
+  # call a Job that reports its failure at 300 correctly bounded at 270.
+  UNINSTALL_BUDGET=300
+  setup_case
+
+  waits=0
+  for seconds in $(grep -o -- '--timeout=[0-9]*s' "$tmp/s.sh" |
+    sed -e 's|--timeout=||' -e 's|s$||'); do
+    waits=$((waits + seconds))
+  done
+  # Non-zero, or the comparison below is satisfied by a script with no waits at
+  # all to measure.
+  [ "$waits" -gt 0 ]
+
+  deadline=$(yq '.spec.activeDeadlineSeconds' "$tmp/job.yaml")
+  # Checked before it is compared. Both comparisons below sit inside `if`, where
+  # a status is a verdict rather than an error, so `[ 180 -ge null ]` reads as
+  # "false" and a Job with no deadline at all passes every ordering check here.
+  case "$deadline" in
+    '' | *[!0-9]*)
+      echo "FAIL: the Job carries no numeric activeDeadlineSeconds (read: '$deadline')"
+      echo "      and then nothing bounds a run whose kubectl call never returns"
+      return 1
+      ;;
+  esac
+  if [ "$waits" -ge "$deadline" ]; then
+    echo "FAIL: ${waits}s of bounded waits against an activeDeadlineSeconds of ${deadline}s"
+    echo "      leaves nothing for scheduling, the image pull and the delete calls"
+    return 1
+  fi
+
+  grace=$(yq '.spec.template.spec.terminationGracePeriodSeconds' "$tmp/job.yaml")
+  # Read before it is added, for the same reason the deadline is: `null` here
+  # would make the sum below a string comparison away from meaning nothing, and
+  # an absent period is the 30s default rather than zero — the case that puts
+  # the failure at exactly the budget.
+  case "$grace" in
+    '' | *[!0-9]*)
+      echo "FAIL: the pod carries no numeric terminationGracePeriodSeconds (read: '$grace')"
+      echo "      so it defaults to 30s and the Job reports its failure at ${deadline}s+30s"
+      return 1
+      ;;
+  esac
+  if [ "$((deadline + grace))" -ge "$UNINSTALL_BUDGET" ]; then
+    echo "FAIL: an activeDeadlineSeconds of ${deadline}s plus a termination period of"
+    echo "      ${grace}s reaches ${UNINSTALL_BUDGET}s of uninstall budget, so helm gives up"
+    echo "      before the Job it is waiting on reports the failure"
+    return 1
+  fi
+
+  rm -rf "$tmp"
+}
+
+@test "an applications wave that did not finish ends the run" {
+  # Nothing stands behind these deletes, so a wave that gave up must not be
+  # reported as done. The closing line is unreachable under `set -e`, and it has
+  # to stay that way: a `|| echo` appended here would reinstate the exact defect
+  # this file exists to stop — a cleanup that did not happen, claimed as one
+  # that did, after which helm goes on to tear the tenant namespace down over
+  # HelmReleases that are still there.
+  setup_case
+  run_hook "$WAVE_APPS"
+
+  if [ "$rc" = 0 ]; then
+    echo "FAIL: a wave that could not finish left the hook reporting success"
+    cat "$tmp/out"
+    return 1
+  fi
+  if grep -qF 'Cleanup completed successfully' "$tmp/out"; then
+    echo "FAIL: the hook claimed success with applications still undeleted"
+    cat "$tmp/out"
+    return 1
+  fi
+
+  rm -rf "$tmp"
+}
+
+@test "an applications wave that did not finish does not go on to the modules" {
+  # The ordering the two waves exist for. Tenant modules — etcd, monitoring,
+  # ingress, seaweedfs, the gateway — are what the applications above run on,
+  # and deleting them out from under applications that are still terminating
+  # makes the namespace harder to remove, not easier.
+  setup_case
+  run_hook "$WAVE_APPS"
+
+  # The first wave has to have been attempted, or the absence below is the
+  # absence of a script that ran nothing.
+  grep -q 'tenantmodule!=true' "$tmp/kubectl.log"
+  if grep -q 'tenantmodule=true' "$tmp/kubectl.log"; then
+    echo "FAIL: the tenant modules were deleted after the applications wave gave up"
+    cat "$tmp/kubectl.log"
+    return 1
+  fi
+
+  rm -rf "$tmp"
+}
+
+@test "a tenant modules wave that did not finish ends the run" {
+  # The second wave is the last thing the script does, so a guard appended to it
+  # would be invisible to every assertion about what runs afterwards. Only the
+  # exit status and the closing line separate a swallowed failure from a real
+  # completion here.
+  setup_case
+  run_hook "$WAVE_MODULES"
+
+  # Both waves ran: the failure being injected is the second one, not the first.
+  grep -q 'tenantmodule!=true' "$tmp/kubectl.log"
+  grep -q 'tenantmodule=true' "$tmp/kubectl.log"
+  if [ "$rc" = 0 ]; then
+    echo "FAIL: a tenant modules wave that could not finish left the hook reporting success"
+    cat "$tmp/out"
+    return 1
+  fi
+  if grep -qF 'Cleanup completed successfully' "$tmp/out"; then
+    echo "FAIL: the hook claimed success with tenant modules still undeleted"
+    cat "$tmp/out"
+    return 1
+  fi
+
+  rm -rf "$tmp"
+}
diff --git a/hack/test_helper.bash b/hack/test_helper.bash
new file mode 100644
index 0000000000..f3944c9c09
--- /dev/null
+++ b/hack/test_helper.bash
@@ -0,0 +1,11 @@
+# Bats supplies errexit but not nounset. Enable nounset in each test process
+# without exporting shell options to production scripts launched by the tests.
+# A file-local setup() must call strict_setup first; bats-strict-setup.bats
+# audits that contract against the Makefile's discovered unit files.
+strict_setup() {
+  set -u
+}
+
+setup() {
+  strict_setup
+}
diff --git a/hack/testdata/install-wait/awk-apostrophe.sh b/hack/testdata/install-wait/awk-apostrophe.sh
new file mode 100644
index 0000000000..c1d335b2e8
--- /dev/null
+++ b/hack/testdata/install-wait/awk-apostrophe.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+# Fixture for hack/run-kubernetes-install-wait_test.bats.
+# Not executed: read as text, and deliberately carries the fault the case
+# looks for -- an apostrophe inside a comment in an awk program, which ends
+# the single-quoted shell string holding it.
+scan() {
+  awk '
+    # The heredoc's body is data, and the quote in that word is the fault: it
+    # ends the string holding this program, so this file does not parse as
+    # shell at all. Nothing runs it -- the case reads it as text -- and a
+    # fixture that parsed would not carry what the case looks for.
+    /^x/ { print }
+  ' "$1"
+}
diff --git a/hack/testdata/install-wait/call-shapes.sh b/hack/testdata/install-wait/call-shapes.sh
new file mode 100644
index 0000000000..7f0fcee6e0
--- /dev/null
+++ b/hack/testdata/install-wait/call-shapes.sh
@@ -0,0 +1,289 @@
+# Fixture for hack/run-kubernetes-install-wait_test.bats.
+# Not executed: read as text by the guard's matchers. Each block pairs a shape
+# with the line the test expects a matcher to return for it.
+##
+# `git diff --check` flags the trailing space on that line, deliberately:
+# the space is the subject here, not an accident, and a case reds if it is
+# stripped. Nothing suppresses the warning -- a suppression would cover the
+# next file written here too, where a stray space would be an accident.
+# Decoys come first because every matcher here stops at its first hit. A decoy
+# placed after the real thing is never reached and pins nothing.
+
+# Same group, different kind.
+kubectl apply -f - <<YAML
+apiVersion: apps.cozystack.io/v1alpha1
+# An apiVersion commented out directly above a column-0 kind. The apiVersion
+# half is anchored at column 0 too, and this is what that anchor refuses: a
+# commented line is not an applied field.
+# apiVersion: apps.cozystack.io/v1alpha1
+kind: Kubernetes
+
+# The pair with a field between them. The CR matcher wants the apiVersion on
+# the line IMMEDIATELY above, not merely nearby: a window would pair a kind
+# with an apiVersion belonging to another object.
+apiVersion: apps.cozystack.io/v1alpha1
+metadata: {}
+kind: Kubernetes
+
+# A pair whose apiVersion sits at column 0 while its kind is indented. The CR
+# matcher anchors both, because the heredoc it pins writes both at column 0 --
+# without that anchor on the kind, this counts as a second CR and the rule that
+# pairs one CR with one wait would be reasoning about two.
+apiVersion: apps.cozystack.io/v1alpha1
+  kind: Kubernetes
+
+# The same pair indented, as an inline apply.resource block writes it. Valid
+# YAML naming this kind, and deliberately NOT what the CR matcher takes: it
+# pins the heredoc shape this script writes, at column 0. The sweep does take
+# this shape -- the two answer different questions and the fixture holds both.
+  apiVersion: apps.cozystack.io/v1alpha1
+  kind: Kubernetes
+
+kind: KubernetesNodes # @file-scope
+metadata:
+  name: "fixture-md0"
+YAML
+
+# Right kind, different group.
+kubectl apply -f - <<YAML
+apiVersion: v1
+kind: Kubernetes
+metadata:
+  name: "fixture-wrong-group"
+YAML
+
+# Right pair, commented out.
+# apiVersion: apps.cozystack.io/v1alpha1
+# kind: Kubernetes
+
+# A call in a helper defined BEFORE the body that holds the wait. Source
+# position puts it ahead of everything; execution puts it wherever the helper
+# is invoked. Its line is below the body's first line, not above its last.
+early_helper_with_assertion() {
+  cozy_assert_before_the_body "${test_name}" # @call
+}
+
+# A fully qualifying wait BEFORE the CR is applied. Nothing is wrong with the
+# command; it waits on a release that does not exist yet, so only its position
+# disqualifies it.
+  kubectl wait hr -n tenant-test "kubernetes-${test_name}" --timeout=9m --for=condition=ready
+
+# The subject shape: everything the ordering rule compares lives in one
+# function body, which is what makes source position stand in for execution
+# order at all.
+run_fixture_test() { # @body-open
+# An indented definition: not a body this guard delimits, because the shapes
+# it walks open and close at column 0.
+  inner_helper() {
+    :
+  }
+
+kubectl apply -f - <<YAML
+apiVersion: apps.cozystack.io/v1alpha1  # @cr-above
+kind: Kubernetes 
+metadata:
+  name: "fixture"
+YAML
+
+# A disabled wait: every string the matcher keys on, behind a `#`.
+  # kubectl wait hr -n tenant-test "kubernetes-${test_name}" --timeout=9m --for=condition=ready
+
+# Not an invocation: the command name appears as an argument to something else,
+# so nothing waits. A substring match would take this line.
+  echo kubectl wait hr -n tenant-test "kubernetes-${test_name}" --timeout=9m --for=condition=ready
+
+# Waits with no teeth: backgrounded, and with the failure discarded.
+# docs/agents/e2e-testing.md, under "The install gate must have teeth", records
+# a gate of exactly this shape shipping a failing
+# release through green CI, so neither may satisfy the rule.
+  kubectl wait hr -n tenant-test "kubernetes-${test_name}" --timeout=9m --for=condition=ready &
+  kubectl wait hr -n tenant-test "kubernetes-${test_name}" --timeout=9m --for=condition=ready || true
+
+# The right name in the wrong namespace: a HelmRelease is identified by both,
+# and this one leaves the tenant's install unbounded.
+  kubectl wait hr -n other-ns "kubernetes-${test_name}" --timeout=9m --for=condition=ready
+
+# Waits that run but are not this one: a child release whose name extends the
+# parent's, another release, another condition, and a wait for the negation of
+# the one that matters. The child is why the match keeps the closing quote.
+  kubectl wait hr -n tenant-test "kubernetes-${test_name}-csi" --timeout=9m --for=condition=ready
+  kubectl wait hr -n tenant-test "postgres-${test_name}" --timeout=9m --for=condition=ready
+  kubectl wait hr -n tenant-test "kubernetes-${test_name}" --timeout=9m --for=condition=reconciling
+  kubectl wait hr -n tenant-test "kubernetes-${test_name}" --timeout=9m --for=condition=ready=false
+
+# The command waits for the negation; a comment names the condition the
+# matcher wants. Only cutting the comment first rejects this.
+  kubectl wait hr -n tenant-test "kubernetes-${test_name}" --timeout=9m --for=condition=ready=false # --for=condition=ready
+# The same rescue with no space after the `#`. The cut keys on the whitespace
+# BEFORE the marker, not after it, so this is cut too -- and a cut that also
+# demanded a space after `#` would read the comment as an argument.
+  kubectl wait hr -n tenant-test "kubernetes-${test_name}" --timeout=9m --for=condition=reconciling #--for=condition=ready
+
+# A wait whose failure is discarded on the NEXT physical line, joined to it by
+# a backslash. Read line by line it satisfies every filter and would be taken
+# as the wait; read as one command it carries `|| true` and is refused. This is
+# what the fold is for, and it stands ahead of the real wait so that losing the
+# fold changes which line is answered.
+  kubectl wait hr -n tenant-test "kubernetes-${test_name}" --timeout=9m --for=condition=ready \
+    || true
+
+# A fully qualifying wait written inside a heredoc body. Nothing runs it -- it
+# is data on its way to `kubectl apply` -- so a matcher that reads heredoc
+# bodies as commands answers with this line and reports a script with no live
+# wait at all as ok.
+cat > /dev/null <<'HEREDOC_WAIT'
+HEREDOC_WAITING: a data line that starts with the delimiter. Matched as a prefix
+it would end the heredoc here and hand the lines below back as commands.
+  kubectl wait hr -n tenant-test "kubernetes-${test_name}" --timeout=9m --for=condition=ready
+HEREDOC_WAIT
+
+# A here-string and a comment naming a heredoc, both immediately before the
+# real wait. Neither opens a heredoc: `<<<` is a here-string, and a `<<WORD`
+# inside a comment is text. Taken as openers they would swallow everything
+# below, including the wait, and the answer would be "no wait" on a script that
+# has one.
+  grep -q ready <<<PROBE_STRING
+# see the `<<HEREDOC_IN_COMMENT` form described above
+
+# The same shape with an UNQUOTED hash that starts no comment because no space
+# precedes it. `foo#bar` is one word to the shell; a cut that fires on
+# any hash removes the `|| true` here too.
+  kubectl wait hr -n tenant-test "kubernetes-${test_name}" --timeout=9m --for=condition=ready x#y || true
+
+# A wait whose failure is discarded, with a quoted `#` earlier on the line. A
+# cut that keys on any ` #` takes the `|| true` away with the comment that is
+# not there, and the line reads as a wait with teeth.
+  kubectl wait hr -n tenant-test "kubernetes-${test_name}" --timeout=9m --for=condition=ready "note #1" || true
+
+# A qualifying wait whose line carries a second command. The shell reports the
+# list's status from the last command, so this wait's failure is not what ends
+# the run. The `;` sits away from the condition on purpose: next to it, the
+# condition match refuses the line first and the sequence rule never runs.
+  kubectl wait hr -n tenant-test "kubernetes-${test_name}" --for=condition=ready --timeout=9m; echo continued
+
+# A negated wait whose `then` sits on the next line, so the wait's own line
+# carries no `;` for the sequence rule to refuse. Only the command pattern
+# rejects this one, which is what makes the two rules separable here.
+  if ! kubectl wait hr -n tenant-test "kubernetes-${test_name}" --timeout=9m --for=condition=ready
+  then
+    :
+  fi
+# @live-wait-above
+  kubectl wait hr -n tenant-test "kubernetes-${test_name}" --timeout \
+    5m --for=condition=ready
+
+# A second qualifying wait. The first one is what bounds the install; a later
+# one bounds nothing that has not already been bounded.
+  kubectl wait hr -n tenant-test "kubernetes-${test_name}" --timeout=5m --for=condition=ready
+
+cozy_assert_at_column_zero "${test_name}" # @call
+	cozy_assert_tab_indented "${test_name}" # @call
+      cozy_assert_six_spaces "${test_name}" # @call
+  cozy_assert_indented_opener() {
+    cozy_assert_inner_of_indented "${test_name}" # @call
+  }
+  cozy_assert_bare "${test_name}" # @call
+  if cozy_assert_in_if "${test_name}"; then :; fi # @call
+  if false; then
+    :
+  elif cozy_assert_in_elif "${test_name}"; then # @call
+    :
+  fi
+  ! cozy_assert_negated "${test_name}" # @call
+  !cozy_assert_negated_no_space "${test_name}"   # not a negation: no space after !
+  while cozy_assert_in_while "${test_name}"; do :; done # @call
+  until cozy_assert_in_until "${test_name}"; do :; done # @call
+  cozy_assert_piped || rc=$? # @call
+  cozy_switch_and_assert_prefixed "${test_name}" # @call
+  cozy_assert_noargs # @call
+  cozy_assert_semicolon_terminated; # @call
+  cozy_assert_nospace_piped|cat # @call
+  cozy_assert_md0_ready "${test_name}" # @call
+  # cozy_assert_commented_out "${test_name}"
+  # A definition nested inside this body, with a space before the parens. The
+  # column-0 rule that exempts an assertion helper cannot see it, and the
+  # space makes it look like a call to the shape matcher.
+  cozy_assert_indented_definition () {
+    :
+  }
+  cozy_assert_not_a_call=1
+} # @body-close
+
+cozy_assert_definition_at_col0() {
+  :
+}
+
+# An assertion helper that calls another. The inner call runs wherever this
+# helper is called from, so it is composition and not a call site of its own.
+cozy_assert_composed() {
+  cozy_assert_inner "${test_name}"
+}
+
+# The same shape under the other assertion prefix. Without it only half of the
+# composition rule's alternative has a case behind it, and the subject already carries a
+# `cozy_switch_and_assert_*` definition -- the day it calls an assert helper
+# inside, the inner call would be counted as a call site of its own.
+cozy_switch_and_assert_composed() {
+  cozy_assert_inner_of_switch "${test_name}"
+}
+
+# The same definition with a space before the parens, which is a definition
+# just as much and must not read as a call.
+cozy_assert_definition_with_space () { # @spaced-open
+  cozy_assert_inner_of_spaced "${test_name}"
+} # @spaced-close
+
+# A call in another function body. Source position cannot place it: it runs
+# wherever this helper is invoked, which may be before or after the wait.
+helper_with_assertion() {
+  cozy_assert_inside_another_function "${test_name}" # @call
+}
+
+# Spellings of one budget, for the matcher that reads it. Prefixed with `echo`
+# rather than commented out, and that is the only form that works here: the
+# budget matcher cuts comments before reading the value, so a `#` in front of
+# these lines strips them to nothing and the matcher finds no budget at all.
+# The `echo` keeps them off the wait matcher's answer -- it reads a command in
+# command position -- while leaving the line for the budget matcher to read by
+# number.
+  echo BUDGET_PROBE kubectl wait hr -n tenant-test "kubernetes-${test_name}" --timeout=5m --for=condition=ready # @budget-probe
+  echo BUDGET_PROBE kubectl wait hr -n tenant-test "kubernetes-${test_name}" --timeout="5m" --for=condition=ready # @budget-probe
+  echo BUDGET_PROBE kubectl wait hr -n tenant-test "kubernetes-${test_name}" --timeout 5m --for=condition=ready # @budget-probe
+
+# A line at file scope, followed by a column-0 `}` inside a heredoc -- which is
+# how one really occurs, and why this file still parses as shell. The brace
+# must not close a body, and must not extend the one that closed above it to
+# cover this line.
+at_file_scope_between_a_close_and_a_stray_brace=1 # @after-close
+kubectl patch something --type=json -p "$(cat <<'JSON'
+{"op": "replace", "path": "/spec/x", "value": {
+}
+JSON
+)"
+  echo BUDGET_PROBE kubectl wait hr -n tenant-test "kubernetes-${test_name}" --for=condition=ready # --timeout=5m # @budget-in-comment
+
+# Command position that is not the start of a line. Each of these runs where it
+# stands whenever its condition holds -- which is what the ordering rule has to
+# place, since a conditional call before the wait is still a call before it --
+# and the script this guard reads writes the and-list form elsewhere.
+# A comment carrying the widened matcher's own shape. It is not a call site,
+# and what excludes it is the comment cut running before the match -- not the
+# pattern, which would take it. Remove the cut and this line is counted.
+#   [ x ] && cozy_assert_in_comment "$1"
+
+cozy_shapes_in_command_position() {
+  [ "$enable_oidc" = true ] && cozy_assert_oidc_system "$1" # @call
+  [ "$enable_oidc" = true ] || cozy_assert_fallback "$1" # @call
+  for _n in 1; do cozy_assert_in_loop "$1"; done # @call
+  if [ -n "$1" ]; then cozy_assert_after_then "$1"; fi # @call
+  { cozy_assert_in_group "$1"; } # @call
+  if [ -n "$1" ]; then :; else cozy_assert_after_else "$1"; fi # @call
+  ( cozy_assert_in_subshell "$1" ) # @call
+  # No space after the operator, which the shell accepts and which the
+  # tolerance in the pattern exists for.
+  [ "$enable_oidc" = true ] &&cozy_assert_no_space "$1" # @call
+  # Excluded by the closing quote, not by being inside a string: the matcher
+  # requires whitespace, a `|`, a `;`, an `&` or the line end after the name,
+  # and a `"` is none of them.
+  echo "not a call: && cozy_assert_quoted"
+}
diff --git a/hack/testdata/install-wait/comment-names-heredoc.sh b/hack/testdata/install-wait/comment-names-heredoc.sh
new file mode 100644
index 0000000000..070b731495
--- /dev/null
+++ b/hack/testdata/install-wait/comment-names-heredoc.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+# A `<<WORD` that exists only inside a trailing comment, before the real wait.
+# Nothing opens a heredoc here. Read the line without cutting the comment first
+# and the probe takes `<<PATCHDOC` for an opener, then swallows every line until
+# a lone `PATCHDOC` that never comes -- the wait below among them -- and the
+# answer is "no wait" on a script that waits.
+#
+# This is the input that tells whether the fold cuts comments before looking for
+# an opener. The fixture that names a heredoc inside a comment elsewhere does
+# not: its own answer is the same either way.
+
+run_kubernetes_test() {
+  kubectl apply -f - <<EOF
+apiVersion: apps.cozystack.io/v1alpha1
+kind: Kubernetes
+metadata:
+  name: ${test_name}
+EOF
+  echo "the patch form is written with a heredoc"   # like `kubectl patch <<PATCHDOC`
+  kubectl wait hr -n tenant-test "kubernetes-${test_name}" --timeout=5m --for=condition=ready # @wait
+  cozy_assert_tenant_reachable "${test_name}"
+}
diff --git a/hack/testdata/install-wait/creators-cross-pair/list.yaml b/hack/testdata/install-wait/creators-cross-pair/list.yaml
new file mode 100644
index 0000000000..feac5419c8
--- /dev/null
+++ b/hack/testdata/install-wait/creators-cross-pair/list.yaml
@@ -0,0 +1,14 @@
+# Two sequence items at the same indent inside one document. The cozystack
+# apiVersion belongs to the first item and the kind to the second, which is a
+# core-group object, so neither item creates a tenant cluster -- and the sweep
+# reports the file anyway, because its buckets are keyed by indent and both
+# items share one.
+items:
+- apiVersion: apps.cozystack.io/v1alpha1
+  kind: Tenant
+  metadata:
+    name: some-tenant
+- apiVersion: v1
+  kind: Kubernetes
+  metadata:
+    name: the-service-named-after-the-api
diff --git a/hack/testdata/install-wait/creators-filetypes/chainsaw-test.yaml.disabled b/hack/testdata/install-wait/creators-filetypes/chainsaw-test.yaml.disabled
new file mode 100644
index 0000000000..5c64ee2af8
--- /dev/null
+++ b/hack/testdata/install-wait/creators-filetypes/chainsaw-test.yaml.disabled
@@ -0,0 +1,4 @@
+apiVersion: apps.cozystack.io/v1alpha1
+kind: Kubernetes
+metadata:
+  name: "parked"
diff --git a/hack/testdata/install-wait/creators-filetypes/example.md b/hack/testdata/install-wait/creators-filetypes/example.md
new file mode 100644
index 0000000000..8c1a9479ad
--- /dev/null
+++ b/hack/testdata/install-wait/creators-filetypes/example.md
@@ -0,0 +1,10 @@
+# Prose that shows the CR without creating one
+
+The sweep's root holds documentation, and documentation quotes manifests:
+
+```yaml
+apiVersion: apps.cozystack.io/v1alpha1
+kind: Kubernetes
+metadata:
+  name: "example"
+```
diff --git a/hack/testdata/install-wait/creators-filetypes/real.yaml b/hack/testdata/install-wait/creators-filetypes/real.yaml
new file mode 100644
index 0000000000..60d0806d83
--- /dev/null
+++ b/hack/testdata/install-wait/creators-filetypes/real.yaml
@@ -0,0 +1,4 @@
+apiVersion: apps.cozystack.io/v1alpha1
+kind: Kubernetes
+metadata:
+  name: "fixture"
diff --git a/hack/testdata/install-wait/creators-filetypes/real.yml b/hack/testdata/install-wait/creators-filetypes/real.yml
new file mode 100644
index 0000000000..60d0806d83
--- /dev/null
+++ b/hack/testdata/install-wait/creators-filetypes/real.yml
@@ -0,0 +1,4 @@
+apiVersion: apps.cozystack.io/v1alpha1
+kind: Kubernetes
+metadata:
+  name: "fixture"
diff --git a/hack/testdata/install-wait/creators-single/only.yaml b/hack/testdata/install-wait/creators-single/only.yaml
new file mode 100644
index 0000000000..9b6ba6be9b
--- /dev/null
+++ b/hack/testdata/install-wait/creators-single/only.yaml
@@ -0,0 +1,7 @@
+# A sweep root holding exactly one file, which is a creator, so the last
+# document of the last file is the only one there is. Without the END flush
+# the scan reaches the end with that document still unemitted and answers
+# nothing -- which on the other roots is hidden by whichever file readdir
+# happens to return last.
+apiVersion: apps.cozystack.io/v1alpha1
+kind: Kubernetes
diff --git a/hack/testdata/install-wait/creators/cross-document.yaml b/hack/testdata/install-wait/creators/cross-document.yaml
new file mode 100644
index 0000000000..9f39cddf0d
--- /dev/null
+++ b/hack/testdata/install-wait/creators/cross-document.yaml
@@ -0,0 +1,13 @@
+# Two documents in one file: the first carries a cozystack apiVersion for a
+# different kind, the second names Kubernetes with no apiVersion of its own.
+# Neither creates a tenant cluster. Without the `---` split the scan pairs the
+# apiVersion of one document with the kind of the other and reports a creator
+# that does not exist.
+apiVersion: apps.cozystack.io/v1alpha1
+kind: Tenant
+metadata:
+  name: some-tenant
+---
+kind: Kubernetes
+metadata:
+  name: named-not-created
diff --git a/hack/testdata/install-wait/creators/first-line-kind.yaml b/hack/testdata/install-wait/creators/first-line-kind.yaml
new file mode 100644
index 0000000000..a6546cd060
--- /dev/null
+++ b/hack/testdata/install-wait/creators/first-line-kind.yaml
@@ -0,0 +1,7 @@
+kind: Kubernetes
+# The kind on line 1 with no apiVersion anywhere. awk starts `av` at 0, so a
+# matcher testing `av == NR - 1` compares 0 with 0 here and calls this a CR.
+# The sweep is not fooled -- it pairs by document and indent, not by NR -- so
+# this file must NOT be reported as a creator.
+metadata:
+  name: not-a-creator
diff --git a/hack/testdata/install-wait/creators/indented-apply.yaml b/hack/testdata/install-wait/creators/indented-apply.yaml
new file mode 100644
index 0000000000..8d49ee4e5f
--- /dev/null
+++ b/hack/testdata/install-wait/creators/indented-apply.yaml
@@ -0,0 +1,19 @@
+# A Chainsaw suite creating a cozystack app the way the tree usually does it:
+# an inline `apply.resource:` block, where the CR's fields are indented. The
+# sweep that finds creators has to see this shape, or a second creator written
+# the idiomatic way leaves the "exactly one script" claim passing while false.
+apiVersion: chainsaw.kyverno.io/v1alpha1
+kind: Test
+spec:
+  steps:
+  - try:
+    - apply:
+        resource:
+          apiVersion: apps.cozystack.io/v1alpha1
+          # a value carrying --- mid-line: a document separator is a line that
+          # STARTS with it, and an unanchored split would cut the document here
+          # and lose the creator below.
+          description: "before --- after"
+          kind: Kubernetes
+          metadata:
+            name: fixture
diff --git a/hack/testdata/install-wait/creators/kind-first.yaml b/hack/testdata/install-wait/creators/kind-first.yaml
new file mode 100644
index 0000000000..64d711833c
--- /dev/null
+++ b/hack/testdata/install-wait/creators/kind-first.yaml
@@ -0,0 +1,14 @@
+# The same creator with the two keys in the other order, and with a field
+# between them. A YAML mapping is unordered, so both are valid manifests and
+# both create a cluster; a sweep keyed on adjacency sees neither.
+apiVersion: chainsaw.kyverno.io/v1alpha1
+kind: Test
+spec:
+  steps:
+  - try:
+    - apply:
+        resource:
+          kind: Kubernetes
+          metadata:
+            name: reversed
+          apiVersion: apps.cozystack.io/v1alpha1
diff --git a/hack/testdata/install-wait/creators/near-misses.yaml b/hack/testdata/install-wait/creators/near-misses.yaml
new file mode 100644
index 0000000000..b8f591feb2
--- /dev/null
+++ b/hack/testdata/install-wait/creators/near-misses.yaml
@@ -0,0 +1,34 @@
+# Shapes that name the kind without creating one: a selector entry and a label
+# whose value happens to be the kind, both of which exist under
+# hack/e2e-chainsaw today, and a bare `kind:` with no apiVersion above it --
+# the one that reaches the indent comparison rather than dying at the field name.
+# `git diff --check` flags the trailing space on that line, deliberately:
+# the space is the subject here, not an accident, and a case reds if it is
+# stripped. Nothing suppresses the warning -- a suppression would cover the
+# next file written here too, where a stray space would be an accident.
+spec:
+  fromApp:
+  - kind: Kubernetes
+    name: other
+  selector:
+    matchLabels:
+      apps.cozystack.io/application.kind: Kubernetes
+  template:
+    kind: Kubernetes
+---
+# A cozystack apiVersion and the kind in one document but at different indents:
+# they belong to different objects, so the pair does not make a creator. Only
+# comparing the indents tells them apart.
+apiVersion: apps.cozystack.io/v1alpha1
+kind: Tenant
+spec:
+  nested:
+      kind: Kubernetes
+---
+# The sibling kind. `KubernetesNodes` shares the group and the first eleven
+# characters, and the script that creates the tenant cluster creates one of
+# these too, so a sweep matching the name as a prefix calls every such file a
+# creator. The trailing space on the line below is legal YAML and changes no
+# document -- an anchor that assumes nothing follows the value does not see it.
+apiVersion: apps.cozystack.io/v1alpha1
+kind: KubernetesNodes 
diff --git a/hack/testdata/install-wait/creators/quoted-kind.yaml b/hack/testdata/install-wait/creators/quoted-kind.yaml
new file mode 100644
index 0000000000..e26183faf3
--- /dev/null
+++ b/hack/testdata/install-wait/creators/quoted-kind.yaml
@@ -0,0 +1,8 @@
+# The kind written as a quoted scalar. YAML makes no distinction, so this
+# creates the same cluster; a matcher keyed on the bare word sees no creator
+# here and the "exactly one script" claim stays green while being false.
+apiVersion: apps.cozystack.io/v1alpha1
+kind: "Kubernetes"
+---
+apiVersion: apps.cozystack.io/v1alpha1
+kind: 'Kubernetes'
diff --git a/hack/testdata/install-wait/creators/sequence-item.yaml b/hack/testdata/install-wait/creators/sequence-item.yaml
new file mode 100644
index 0000000000..155e2451c9
--- /dev/null
+++ b/hack/testdata/install-wait/creators/sequence-item.yaml
@@ -0,0 +1,9 @@
+# A creator written as a YAML sequence item: the object keys are indented past
+# a dash, which is how a List document or an inline list of resources writes
+# them. The dash and the space after it are the item's indent, so these keys share a bucket
+# with each other and with nothing else.
+items:
+- apiVersion: apps.cozystack.io/v1alpha1
+  kind: Kubernetes
+  metadata:
+    name: sequence-item
diff --git a/hack/testdata/install-wait/creators/trailing-space.yaml b/hack/testdata/install-wait/creators/trailing-space.yaml
new file mode 100644
index 0000000000..a21dcd12e8
--- /dev/null
+++ b/hack/testdata/install-wait/creators/trailing-space.yaml
@@ -0,0 +1,11 @@
+# A creator whose `kind` line ends in a space. YAML ignores it and the document
+# is exactly the one next to it; an anchor assuming nothing follows the value
+# does not see this file at all, and the sweep then reports one creator fewer
+# while saying nothing. The space is deliberate -- a case below fails if an
+# editor strips it, so the pin cannot be lost silently.
+# `git diff --check` flags the trailing space on that line, deliberately:
+# the space is the subject here, not an accident, and a case reds if it is
+# stripped. Nothing suppresses the warning -- a suppression would cover the
+# next file written here too, where a stray space would be an accident.
+apiVersion: apps.cozystack.io/v1alpha1
+kind: Kubernetes 
diff --git a/hack/testdata/install-wait/creators/wide-dash.yaml b/hack/testdata/install-wait/creators/wide-dash.yaml
new file mode 100644
index 0000000000..0750822cbc
--- /dev/null
+++ b/hack/testdata/install-wait/creators/wide-dash.yaml
@@ -0,0 +1,11 @@
+# A creator whose sequence dash is followed by more than one space, so the keys
+# of the item sit four columns in, aligned with the first key after the dash
+# rather than two columns in. The bucket has
+# to take its width from the dash and the whitespace that follows it: adding a
+# fixed two columns puts this apiVersion in one bucket and its own kind in
+# another, and the creator goes missing without a word.
+items:
+-   apiVersion: apps.cozystack.io/v1alpha1
+    kind: Kubernetes
+    metadata:
+      name: wide-dash
diff --git a/hack/testdata/install-wait/eof-continuation.sh b/hack/testdata/install-wait/eof-continuation.sh
new file mode 100644
index 0000000000..492a0faa00
--- /dev/null
+++ b/hack/testdata/install-wait/eof-continuation.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+# Fixture for hack/run-kubernetes-install-wait_test.bats.
+# Not executed: read as text by the guard's matchers.
+#
+# The file ends inside a backslash continuation, so the last command is still
+# in the fold's buffer when the input runs out. Only the flush at EOF emits it;
+# without that flush the wait below is never seen and the guard reports a
+# script with no wait at all.
+run_fixture_test() {
+  cozy_assert_before "${test_name}"
+  kubectl wait hr -n tenant-test "kubernetes-${test_name}" --timeout=5m \
+    --for=condition=ready \
\ No newline at end of file
diff --git a/hack/testdata/install-wait/heredoc-backslash.sh b/hack/testdata/install-wait/heredoc-backslash.sh
new file mode 100644
index 0000000000..2ee9a673ae
--- /dev/null
+++ b/hack/testdata/install-wait/heredoc-backslash.sh
@@ -0,0 +1,18 @@
+#!/bin/sh
+# Fixture for hack/run-kubernetes-install-wait_test.bats.
+# Not executed: read as text by the guard's matchers.
+#
+# A backslash quotes the delimiter exactly as a quote does: `<<\EOF` opens a
+# heredoc whose body is data with no expansion. An opener matcher that takes
+# the quotes and not the backslash reads this body as commands, and the wait
+# written into it below is data that never runs.
+creating_body() {
+  kubectl apply -f - <<\EOF
+apiVersion: apps.cozystack.io/v1alpha1
+kind: KubernetesNodes
+spec:
+  script: |
+    kubectl wait hr -n tenant-test "kubernetes-${test_name}" --timeout=5m --for=condition=ready
+EOF
+  cozy_assert_after "${test_name}"
+}
diff --git a/hack/testdata/install-wait/heredoc-hash-opener.sh b/hack/testdata/install-wait/heredoc-hash-opener.sh
new file mode 100644
index 0000000000..8fd174c3e7
--- /dev/null
+++ b/hack/testdata/install-wait/heredoc-hash-opener.sh
@@ -0,0 +1,20 @@
+#!/bin/sh
+# A heredoc whose opening line carries a quoted ` #` before the `<<`. A crude
+# comment cut loses the opener, the body is read as commands, and the planted
+# line below -- data on its way to `kubectl apply` -- is answered as the
+# readiness wait, on a script that never waits.
+
+run_kubernetes_test() {
+  kubectl apply -f - <<EOF
+apiVersion: apps.cozystack.io/v1alpha1
+kind: Kubernetes
+metadata:
+  name: ${test_name}
+EOF
+  kubectl annotate ns x "note #1" --overwrite && kubectl apply -f - <<YAML
+data:
+  planted: |
+    kubectl wait hr -n tenant-test "kubernetes-${test_name}" --timeout=5m --for=condition=ready
+YAML
+  cozy_assert_tenant_reachable "${test_name}"
+}
diff --git a/hack/testdata/install-wait/heredoc-terminators.sh b/hack/testdata/install-wait/heredoc-terminators.sh
new file mode 100644
index 0000000000..643482f0fe
--- /dev/null
+++ b/hack/testdata/install-wait/heredoc-terminators.sh
@@ -0,0 +1,43 @@
+# Fixture for hack/run-kubernetes-install-wait_test.bats.
+# Not executed: read as text by the guard's matchers.
+#
+# Every shape here is a heredoc whose body contains something that LOOKS like a
+# terminator but is not one, followed by a fully qualifying wait. The shell
+# keeps reading data past each of them, so none of these waits ever runs; a
+# matcher that ends the heredoc early hands the wait back as a command and
+# answers with a line from a YAML document.#
+# `git diff --check` flags the trailing space on that line, deliberately:
+# the space is the subject here, not an accident, and a case reds if it is
+# stripped. Nothing suppresses the warning -- a suppression would cover the
+# next file written here too, where a stray space would be an accident.
+creating_body() {
+  kubectl apply -f - <<EOF
+apiVersion: apps.cozystack.io/v1alpha1
+kind: KubernetesNodes
+spec:
+  script: |
+    EOF
+  kubectl wait hr -n tenant-test "kubernetes-${test_name}" --timeout=5m --for=condition=ready
+EOF
+  kubectl apply -f - <<EOF
+data:
+  note: |
+EOF 
+  kubectl wait hr -n tenant-test "kubernetes-${test_name}" --timeout=6m --for=condition=ready
+EOF
+  kubectl apply -f - <<-TABBED
+	data: |
+      TABBED
+  kubectl wait hr -n tenant-test "kubernetes-${test_name}" --timeout=7m --for=condition=ready
+	TABBED
+  # Two openers on one command. Their bodies arrive in the order opened, so
+  # FIRST's terminator ends the first body and the wait below it is still data,
+  # inside SECOND. Tracking one delimiter per command ends the tracking here and
+  # hands that wait back as a command.
+  kubectl apply -f - <<FIRST <<SECOND
+data: one
+FIRST
+  kubectl wait hr -n tenant-test "kubernetes-${test_name}" --timeout=8m --for=condition=ready
+SECOND
+  cozy_assert_after "${test_name}"
+}
diff --git a/hack/testdata/install-wait/inner-brace-command.sh b/hack/testdata/install-wait/inner-brace-command.sh
new file mode 100644
index 0000000000..b6e564e5d2
--- /dev/null
+++ b/hack/testdata/install-wait/inner-brace-command.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+# Fixture for hack/run-kubernetes-install-wait_test.bats.
+# Not executed: read as text by the guard's matchers.
+#
+# The definition closes on the indented brace below and runs a command on the
+# same line; the column-0 brace at the end belongs to nothing. The range helper
+# ends a body at the column-0 one, so the extracted text opens with a definition
+# and ends with a bare `}`, and the middle line is neither -- it is a close
+# followed by a command, which runs if that text is sourced.
+cozy_wait_inner_brace_command() {
+  kubectl wait hr -n tenant-test "kubernetes-${test_name}" --timeout=5m --for=condition=ready
+  }; printf 'ran\n' >"${COZY_TAIL_WITNESS:-/dev/null}"
+}
diff --git a/hack/testdata/install-wait/inner-brace.sh b/hack/testdata/install-wait/inner-brace.sh
new file mode 100644
index 0000000000..d398113e8a
--- /dev/null
+++ b/hack/testdata/install-wait/inner-brace.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+# Fixture for hack/run-kubernetes-install-wait_test.bats.
+# Not executed: read as text by the guard's matchers.
+#
+# The definition closes on the indented brace below, and the column-0 brace at
+# the end belongs to nothing. The range helper ends a body at the column-0 one,
+# so the extracted text opens with a definition and ends with a bare `}` --
+# both boundary checks pass -- while the command between them runs at source
+# time if that text is sourced.
+cozy_wait_inner_brace() {
+  kubectl wait hr -n tenant-test "kubernetes-${test_name}" --timeout=5m --for=condition=ready
+  }
+printf 'ran\n' >"${COZY_TAIL_WITNESS:-/dev/null}"
+}
diff --git a/hack/testdata/install-wait/midline-close.sh b/hack/testdata/install-wait/midline-close.sh
new file mode 100644
index 0000000000..2349091cc6
--- /dev/null
+++ b/hack/testdata/install-wait/midline-close.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+# Fixture for hack/run-kubernetes-install-wait_test.bats.
+# Not executed: read as text by the guard's matchers.
+#
+# The body closes in the MIDDLE of a line: the brace after `:;` ends the
+# definition, and what follows on the same line stands outside it. No line here
+# begins with a brace, so a refusal keyed on the first character of a line
+# passes this range on and sources it -- which runs the command after the brace.
+cozy_wait_midline_close() {
+  kubectl wait hr -n tenant-test "kubernetes-${test_name}" --timeout=5m --for=condition=ready
+  :; }; printf 'ran\n' >"${COZY_TAIL_WITNESS:-/dev/null}"
+}
diff --git a/hack/testdata/install-wait/one-line-def.sh b/hack/testdata/install-wait/one-line-def.sh
new file mode 100644
index 0000000000..a43ce5b828
--- /dev/null
+++ b/hack/testdata/install-wait/one-line-def.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+# An assertion helper defined on one line at column 0, with a call site after
+# it. The definition never reaches a `}` of its own, so a composition rule that
+# opens a body on the definition line swallows the call below and answers that
+# the script asserts nothing.
+
+cozy_assert_one_line() { :; }
+
+run_kubernetes_test() {
+  kubectl wait hr -n tenant-test "kubernetes-${test_name}" --timeout=5m --for=condition=ready
+  cozy_assert_tenant_reachable "${test_name}"
+}
diff --git a/hack/testdata/install-wait/order-violation.sh b/hack/testdata/install-wait/order-violation.sh
new file mode 100644
index 0000000000..8ac71d3e6f
--- /dev/null
+++ b/hack/testdata/install-wait/order-violation.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+# Fixture for hack/run-kubernetes-install-wait_test.bats.
+# Not executed: read as text by the guard's matchers.
+#
+# The only shape that produces the "before" verdict: every call in the same
+# body as the wait, one of them ahead of it. Why the sibling fixture cannot
+# produce it, and why the live script cannot either, is at _ordering_violation
+# in the guard, where the precedence is decided.
+violating_body() {
+  cozy_assert_early "${test_name}" # @early-call
+  kubectl wait hr -n tenant-test "kubernetes-${test_name}" --timeout=5m --for=condition=ready # @wait
+  cozy_assert_late "${test_name}"
+}
diff --git a/hack/testdata/install-wait/retry-wrapper-unbounded.sh b/hack/testdata/install-wait/retry-wrapper-unbounded.sh
new file mode 100644
index 0000000000..154e58e878
--- /dev/null
+++ b/hack/testdata/install-wait/retry-wrapper-unbounded.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+# The wrapper form with no `--timeout` at all. kubectl falls back to its own
+# default, which is far below the floor the install needs, and the rule has to
+# report a missing budget rather than exempt the line for its spelling.
+
+run_kubernetes_test() {
+  kubectl apply -f - <<EOF
+apiVersion: apps.cozystack.io/v1alpha1
+kind: Kubernetes
+metadata:
+  name: ${test_name}
+EOF
+  kubectl_wait_retry hr -n tenant-test "kubernetes-${test_name}" --for=condition=ready
+  cozy_assert_tenant_reachable "${test_name}"
+}
diff --git a/hack/testdata/install-wait/retry-wrapper.sh b/hack/testdata/install-wait/retry-wrapper.sh
new file mode 100644
index 0000000000..58ed593326
--- /dev/null
+++ b/hack/testdata/install-wait/retry-wrapper.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+# A subject whose readiness wait goes through the retry wrapper the e2e library
+# defines for transient apiserver failures. Why that form is placed and budgeted
+# like a direct wait is written once, beside WAIT_COMMAND_RE in the guard.
+
+run_kubernetes_test() {
+  kubectl apply -f - <<EOF
+apiVersion: apps.cozystack.io/v1alpha1
+kind: Kubernetes
+metadata:
+  name: ${test_name}
+EOF
+  kubectl_wait_retry hr -n tenant-test "kubernetes-${test_name}" --timeout=5m --for=condition=ready
+  cozy_assert_tenant_reachable "${test_name}"
+}
diff --git a/hack/testdata/install-wait/wait-nesting.sh b/hack/testdata/install-wait/wait-nesting.sh
new file mode 100644
index 0000000000..64d7a1d63f
--- /dev/null
+++ b/hack/testdata/install-wait/wait-nesting.sh
@@ -0,0 +1,87 @@
+#!/bin/sh
+# Bodies for the nesting rule. Every function below writes the same wait the
+# subject writes, so the identity matcher takes it in each of them; what
+# differs is where the wait sits and whether the body parses at all.
+
+cozy_wait_at_top() {
+  kubectl wait hr -n tenant-test "kubernetes-${test_name}" --timeout=5m --for=condition=ready
+  cozy_assert_tenant_reachable
+}
+
+cozy_wait_in_branch() {
+  if [ "$mode" = None ]; then
+    kubectl wait hr -n tenant-test "kubernetes-${test_name}" --timeout=5m --for=condition=ready
+  fi
+  cozy_assert_tenant_reachable
+}
+
+cozy_wait_in_loop() {
+  for _attempt in 1 2 3; do
+    kubectl wait hr -n tenant-test "kubernetes-${test_name}" --timeout=5m --for=condition=ready
+  done
+}
+
+# Two waits on the same release: the printed body carries no line numbers, so
+# the one the caller asked about cannot be told from the other.
+cozy_wait_twice() {
+  kubectl wait hr -n tenant-test "kubernetes-${test_name}" --timeout=5m --for=condition=ready
+  kubectl wait hr -n tenant-test "kubernetes-${test_name}" --timeout=5m --for=condition=ready
+}
+
+cozy_wait_in_case() {
+  case "$mode" in
+  None)
+    kubectl wait hr -n tenant-test "kubernetes-${test_name}" --timeout=5m --for=condition=ready
+    ;;
+  esac
+}
+
+cozy_wait_in_until() {
+  until [ "$ready" = yes ]; do
+    kubectl wait hr -n tenant-test "kubernetes-${test_name}" --timeout=5m --for=condition=ready
+  done
+}
+
+# A subshell prints on the line that opens it, so the wait is not at the start
+# of any printed line and the command matcher does not see it at all.
+cozy_wait_in_subshell() {
+  ( kubectl wait hr -n tenant-test "kubernetes-${test_name}" --timeout=5m --for=condition=ready
+  )
+}
+
+cozy_wait_none() {
+  cozy_assert_tenant_reachable
+}
+
+cozy_wait_errexit_off() {
+  set +e
+  kubectl wait hr -n tenant-test "kubernetes-${test_name}" --timeout=5m --for=condition=ready
+}
+
+# `set -euo pipefail` is what this tree writes, so `set +euo pipefail` is what
+# an author writes to undo it: the `e` is not the last letter of the flag.
+cozy_wait_errexit_combined() {
+  set +euo pipefail
+  kubectl wait hr -n tenant-test "kubernetes-${test_name}" --timeout=5m --for=condition=ready
+}
+
+cozy_wait_errexit_after() {
+  kubectl wait hr -n tenant-test "kubernetes-${test_name}" --timeout=5m --for=condition=ready
+  set +e
+}
+
+# Closes with a command on the brace line. The range helper ends a body at a
+# `}` in column 0, so this reaches the extractor looking like a definition,
+# and what stands after the brace runs if the text is sourced. The witness
+# says whether it did; unset, it writes nowhere.
+cozy_wait_tail() {
+  kubectl wait hr -n tenant-test "kubernetes-${test_name}" --timeout=5m --for=condition=ready
+}; printf 'ran\n' >"${COZY_TAIL_WITNESS:-/dev/null}"
+
+# Deliberately missing its `fi`, which is what a body truncated at a brace
+# inside a heredoc looks like to the shell. Last in the file so the unbalanced
+# `if` cannot be read as covering the definitions below it.
+cozy_wait_broken() {
+  if [ "$mode" = None ]; then
+    kubectl wait hr -n tenant-test "kubernetes-${test_name}" --timeout=5m --for=condition=ready
+}
diff --git a/hack/testdata/kubectl-wait-retry/kubectl b/hack/testdata/kubectl-wait-retry/kubectl
new file mode 100755
index 0000000000..d2647b940b
--- /dev/null
+++ b/hack/testdata/kubectl-wait-retry/kubectl
@@ -0,0 +1,24 @@
+#!/bin/sh
+# Fake kubectl for hack/kubectl-wait-retry_test.bats. Mocks only `kubectl wait`.
+# Env:
+#   FAKE_CMDLOG  path to append one line per invocation (also the call counter)
+#   FAKE_MODE    transient-once: first call fails with an etcd leader-change
+#                message (the wrapper's retry allowlist), later calls succeed
+#                notfound: every call fails NotFound (must NOT be retried)
+echo "wait $*" >> "$FAKE_CMDLOG"
+calls=$(grep -c . "$FAKE_CMDLOG")
+case "${FAKE_MODE:-}" in
+  transient-once)
+    if [ "$calls" -le 1 ]; then
+      echo "Error from server: etcdserver: leader changed" >&2
+      exit 1
+    fi
+    echo "deployment.apps/x condition met"
+    exit 0 ;;
+  notfound)
+    echo 'Error from server (NotFound): deployments.apps "x" not found' >&2
+    exit 1 ;;
+  *)
+    echo "condition met"
+    exit 0 ;;
+esac
diff --git a/hack/testdata/kubernetes-nodes-unpin/kubectl b/hack/testdata/kubernetes-nodes-unpin/kubectl
new file mode 100755
index 0000000000..10d6651144
--- /dev/null
+++ b/hack/testdata/kubernetes-nodes-unpin/kubectl
@@ -0,0 +1,43 @@
+#!/bin/sh
+# Fake kubectl for hack/kubernetes-nodes-unpin-hook.bats. Mocks the apiserver
+# boundary of the pre-delete unpin hook's embedded script. Env:
+#   FAKE_MODE      named-object get behavior:
+#                    absent       success, empty output (the hook passes
+#                                 --ignore-not-found, so absence is exit 0)
+#                    error-named  transient server error exit 1 (list still ok)
+#                    error-named-notfoundish
+#                                 exit 1 with a conversion-webhook message whose
+#                                 text contains "not found" -- still a FAILURE
+#                    pinned       jsonpath read returns "keep"
+#                    unpinned     jsonpath read returns empty, exit 0
+#   FAKE_LIST_FAIL when set, the KMT list query fails with a transient error
+#   FAKE_WARN_STDERR
+#                  when set, successful reads print a deprecation warning to
+#                  stderr first, the way real kubectl does
+#   FAKE_KMT_NAMES newline-separated names the KMT list query returns
+#   FAKE_CMDLOG    path to append annotate calls to
+log() { [ -n "${FAKE_CMDLOG:-}" ] && echo "$*" >> "$FAKE_CMDLOG"; return 0; }
+warn() { [ -n "${FAKE_WARN_STDERR:-}" ] && echo "Warning: cluster.x-k8s.io/v1beta1 MachineDeployment is deprecated" >&2; return 0; }
+args="$*"
+mode="${FAKE_MODE:-absent}"
+case "$args" in
+  *" annotate "*)
+    log "annotate $args"; exit 0 ;;
+  *"get kubevirtmachinetemplate.infrastructure.cluster.x-k8s.io -o"*)
+    # list query (no /name)
+    if [ -n "${FAKE_LIST_FAIL:-}" ]; then
+      echo "Error from server: etcdserver: request timed out" >&2; exit 1
+    fi
+    warn
+    [ -n "${FAKE_KMT_NAMES:-}" ] && printf '%s\n' "$FAKE_KMT_NAMES"
+    exit 0 ;;
+esac
+# named-object get
+case "$mode" in
+  pinned)      warn; printf 'keep'; exit 0 ;;
+  unpinned)    warn; exit 0 ;;
+  error-named) echo "Error from server: etcdserver: request timed out" >&2; exit 1 ;;
+  error-named-notfoundish)
+    echo 'Error from server: conversion webhook for cluster.x-k8s.io/v1beta1, Kind=MachineDeployment failed: service "capi-webhook-service" not found' >&2; exit 1 ;;
+  *)           warn; exit 0 ;;  # absent: --ignore-not-found -> success, empty
+esac
diff --git a/hack/testdata/migration-50/etcd-migrate b/hack/testdata/migration-50/etcd-migrate
new file mode 100755
index 0000000000..bad03729a6
--- /dev/null
+++ b/hack/testdata/migration-50/etcd-migrate
@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+# Fake etcd-migrate for hack/migration-50-etcd-adopt.bats: records its full
+# argument vector to $FAKE_CMDLOG and succeeds. The real tool refuses --apply
+# without a backup destination or --skip-backup; the test asserts that the
+# script always passes a destination, so this stub never needs to reproduce
+# that guard.
+set -u
+[ -n "${FAKE_CMDLOG:-}" ] && printf 'ETCD-MIGRATE %s\n' "$*" >> "$FAKE_CMDLOG"
+# FAKE_MIGRATE_FAIL=1 makes the --apply invocation fail, to exercise the
+# migration's restore-operator-on-failure trap (review blocker B1).
+case " $* " in
+  *" --apply "*) [ "${FAKE_MIGRATE_FAIL:-0}" = "1" ] && { echo "fake etcd-migrate: forced failure" >&2; exit 1; } ;;
+esac
+exit 0
diff --git a/hack/testdata/migration-50/kubectl b/hack/testdata/migration-50/kubectl
new file mode 100755
index 0000000000..d9f4e007a0
--- /dev/null
+++ b/hack/testdata/migration-50/kubectl
@@ -0,0 +1,248 @@
+#!/usr/bin/env bash
+# Fake kubectl for hack/migration-50-etcd-adopt.bats. It serves only the calls
+# migration 50 makes; behaviour is driven by FAKE_* env and every invocation is
+# appended to $FAKE_CMDLOG so the test can assert on order and content.
+#
+#   FAKE_CMDLOG       file to append a one-line record of each call to
+#   FAKE_STAGE_DIR    if set, staged Secret YAML is written to <dir>/<ns>.json
+#   FAKE_LEGACY_CRD   "1" => the etcd.aenix.io CRD exists (default 1)
+#   FAKE_CLUSTERS     newline list of "<ns> <name>" legacy clusters
+#   FAKE_STRATEGY     "1" => the cozy-default-etcd Strategy CR resolves (default 1)
+#   FAKE_STRATEGY_ENDPOINT  the CR's s3.endpoint (default: the v1.5.x plaintext
+#                            seaweedfs default)
+#   FAKE_STRATEGY_BUCKET    the CR's s3.bucket (default cozy-backups-7f3a)
+#   FAKE_STRATEGY_REGION    the CR's s3.region (default us-east-1)
+#   FAKE_STRATEGY_FPS       the CR's s3.forcePathStyle (default true)
+#   FAKE_CREDS        "1" => cozy-backups-creds (with AWS_* keys) exists (default 1)
+#   FAKE_CREDS_ENDPOINT     the projected `endpoint` value; always a BARE host.
+#                            Set to the EMPTY string to drop the key entirely
+#                            (default s3.example.com)
+#   FAKE_CREDS_BUCKET       the projected `bucketName` value (default
+#                            cozy-backups-7f3a). Copied from the admin's source
+#                            Secret on the external path, so it can disagree
+#                            with the CR's bucket outright.
+#   FAKE_CREDS_REGION       the projected `region` value (default us-east-1)
+#   FAKE_CREDS_FPS          the projected `forcePathStyle` value (default true)
+#   FAKE_CLAIM_CRD    "1"     => the bucketclaims.objectstorage.k8s.io CRD
+#                                exists, i.e. COSI is installed (default 1)
+#                     "0"     => genuinely absent: `--ignore-not-found -o name`
+#                                prints nothing at rc=0
+#                     "error" => the read FAILS (rc!=0) -- a transient API
+#                                error, which is NOT the same answer as absent
+#   FAKE_CLAIM_LIST_ERR "1" => the cluster-wide claim list read fails (default 0)
+#   FAKE_CLAIM_LIST_SHAPE   emit an unexpected list document instead of a List:
+#                            "items-not-array" | "no-items" | "not-json"
+#                            (default: a well-formed List). No real producer
+#                            emits these; they pin that an uninterpretable list
+#                            is never silently read as "no claim" = external.
+#   FAKE_CLAIMS       newline list of BucketClaims, one per line, as
+#                     "<ns> <name> <status.bucketName|-> <deletionTimestamp|->"
+#                     (default: one healthy claim provisioned into the same
+#                     bucket the projected Secret advertises => COSI path)
+#   FAKE_CLAIM_FILLER N synthetic extra claims appended AFTER FAKE_CLAIMS, with
+#                     realistically long bucket-<uuid> status names (default 0).
+#                     Models a big multi-tenant cluster: the FAKE_CLAIMS entries
+#                     stay FIRST, i.e. the matching claim is NOT last, which is
+#                     the position a first-match-exit consumer gets wrong.
+#   FAKE_CERTS        "1" => server/peer cert-manager Certificates exist and
+#                            initially LACK the native wildcard SAN (default 0,
+#                            i.e. no Certificate -> ensure_wildcard_sans skips)
+set -u
+
+log() { [ -n "${FAKE_CMDLOG:-}" ] && printf '%s\n' "$*" >> "$FAKE_CMDLOG"; }
+log "KUBECTL $*"
+
+args="$*"
+state_dir="${FAKE_CMDLOG%/*}"
+# arg_after KEY -- echoes the token following KEY in the argument vector.
+arg_after() { k="$1"; shift; p=""; for a in "$@"; do [ "$p" = "$k" ] && { printf '%s' "$a"; return; }; p="$a"; done; }
+
+b64() { printf '%s' "$1" | base64 | tr -d '\n'; }
+
+# Strategy CR JSON as the version being upgraded FROM rendered it. The default
+# endpoint is the static v1.5.x one: plaintext against SeaweedFS's :8333 TLS
+# listener, i.e. unusable. The script must NOT take its endpoint from here on the
+# COSI path. FAKE_STRATEGY=0 models the other v1.5.x shape, where the CR was
+# never rendered at all (its template is guarded by a bucketName lookup that
+# races the BucketClaim on first install) — a shape reachable ONLY under
+# provisionBucket: true, since the lookup is skipped entirely for external S3.
+strategy_endpoint="${FAKE_STRATEGY_ENDPOINT:-http://seaweedfs-s3.tenant-root.svc.cozy.local:8333}"
+strategy_json='{"spec":{"template":{"destination":{"s3":{"endpoint":"'"$strategy_endpoint"'","bucket":"'"${FAKE_STRATEGY_BUCKET:-cozy-backups-7f3a}"'","region":"'"${FAKE_STRATEGY_REGION:-us-east-1}"'","forcePathStyle":'"${FAKE_STRATEGY_FPS:-true}"'}}}}}'
+# cozy-backups-creds as eagerly projected into cozy-velero (carries owner/anno
+# metadata the stage copy must strip, plus the AWS_* keys). It also carries a
+# tenantresource label here so the test can prove the stage copy strips it.
+#
+# The projector ALWAYS writes a bare-host `endpoint`: it scheme-strips it and
+# refuses to project (ReasonSourceMalformed) when it would be empty, so there is
+# no reachable state in which it is missing — that is why its presence cannot
+# discriminate COSI from external S3, and why the BucketClaim data does. The
+# empty FAKE_CREDS_ENDPOINT (drop the key) models NO reachable projector state;
+# it exists only to pin the defensive CR fallback.
+# bucketName/region/forcePathStyle ARE droppable: the projector's setOrDelete
+# deletes a key whose value is empty. FAKE_CREDS_COORDS=0 models that.
+creds_endpoint_key=''
+[ -z "${FAKE_CREDS_ENDPOINT-s3.example.com}" ] \
+  || creds_endpoint_key='"endpoint":"'"$(b64 "${FAKE_CREDS_ENDPOINT-s3.example.com}")"'",'
+creds_coords='"bucketName":"'"$(b64 "${FAKE_CREDS_BUCKET:-cozy-backups-7f3a}")"'","region":"'"$(b64 "${FAKE_CREDS_REGION:-us-east-1}")"'","forcePathStyle":"'"$(b64 "${FAKE_CREDS_FPS:-true}")"'",'
+[ "${FAKE_CREDS_COORDS:-1}" = "1" ] || creds_coords=''
+creds_json='{"apiVersion":"v1","kind":"Secret","metadata":{"name":"cozy-backups-creds","namespace":"cozy-velero","resourceVersion":"123","uid":"abc","ownerReferences":[{"name":"projector"}],"labels":{"internal.cozystack.io/tenantresource":"true"},"annotations":{"reconcile.io/x":"y"}},"data":{'"$creds_endpoint_key$creds_coords"'"AWS_ACCESS_KEY_ID":"QUtJQUVYQU1QTEU=","AWS_SECRET_ACCESS_KEY":"c2VjcmV0a2V5"}}'
+
+# BucketClaims as data. The COSI driver assigns .status.bucketName and the
+# projector republishes exactly that as the `bucketName` key, so the DEFAULT
+# claim is provisioned into the same bucket the creds advertise => COSI path.
+# A claim whose status names a DIFFERENT bucket (a stale/Terminating leftover)
+# must not classify the cluster as COSI, which is why the probe matches on
+# status rather than on the claim's existence.
+FAKE_CLAIMS="${FAKE_CLAIMS-tenant-root bucket-cozy-backups cozy-backups-7f3a -}"
+
+# claims_all emits FAKE_CLAIMS followed by FAKE_CLAIM_FILLER synthetic claims.
+# Filler status names are full-length bucket-<uuid> strings because it is the
+# BYTE SIZE of the rendered list, not the claim count, that pushes a streaming
+# consumer past a pipe write boundary.
+claims_all() {
+  printf '%s\n' "$FAKE_CLAIMS"
+  local i=1 n="${FAKE_CLAIM_FILLER:-0}"
+  while [ "$i" -le "$n" ]; do
+    printf 'tenant-f%04d bucket-f%04d bucket-%08x-956e-4630-91f4-e1d265de5f51 -\n' "$i" "$i" "$i"
+    i=$((i + 1))
+  done
+}
+
+# claims_json renders claims_all as a real `kubectl get -A -o json` List.
+claims_json() {
+  local first=1 out='{"apiVersion":"v1","kind":"List","items":[' ns name bn dts item
+  while read -r ns name bn dts; do
+    [ -n "${ns:-}" ] || continue
+    item='{"apiVersion":"objectstorage.k8s.io/v1alpha1","kind":"BucketClaim","metadata":{"namespace":"'"$ns"'","name":"'"$name"'","finalizers":["cosi.objectstorage.k8s.io/bucketclaim-protection"]'
+    [ "${dts:--}" = "-" ] || item="$item"',"deletionTimestamp":"'"$dts"'"'
+    item="$item"'}'
+    if [ "${bn:--}" = "-" ]; then item="$item"',"status":{}}'; else item="$item"',"status":{"bucketName":"'"$bn"'"}}'; fi
+    [ "$first" = 1 ] && { out="$out$item"; first=0; } || out="$out,$item"
+  done < <(claims_all)
+  printf '%s]}\n' "$out"
+}
+
+# claim_exists <ns> <name> -- 0 iff FAKE_CLAIMS lists that claim, regardless of
+# its status. Models the name-keyed single GET, which succeeds for a Terminating
+# claim too (the bucketclaim-protection finalizer keeps the object around).
+claim_exists() {
+  local want_ns="$1" want_name="$2" ns name bn dts
+  while read -r ns name bn dts; do
+    [ -n "${ns:-}" ] || continue
+    [ "$ns" = "$want_ns" ] && [ "$name" = "$want_name" ] && return 0
+  done <<EOF
+$FAKE_CLAIMS
+EOF
+  return 1
+}
+
+emit_clusters_name() { printf '%s\n' "${FAKE_CLUSTERS:-}" | while read -r ns name; do [ -n "$ns" ] && printf 'etcdcluster.etcd.aenix.io/%s\n' "$name"; done; }
+emit_clusters_jsonpath() { printf '%s\n' "${FAKE_CLUSTERS:-}" | while read -r ns name; do [ -n "$ns" ] && printf '%s %s\n' "$ns" "$name"; done; }
+
+case "$args" in
+  # version stamp (kubectl apply --filename -) and creds copy
+  # (kubectl -n ns apply --server-side --force-conflicts -f -)
+  *"apply --filename -"*) cat >/dev/null 2>&1 || true; log "STAMP"; exit 0 ;;
+  *"apply"*" -f -"*)
+    ns=""; prev=""; for a in "$@"; do [ "$prev" = "-n" ] && ns="$a"; prev="$a"; done
+    if [ -n "${FAKE_STAGE_DIR:-}" ]; then cat > "$FAKE_STAGE_DIR/$ns.json" 2>/dev/null || true; else cat >/dev/null 2>&1 || true; fi
+    log "STAGE $ns"; exit 0 ;;
+
+  *"get crd etcdclusters.etcd.aenix.io"*)
+    [ "${FAKE_LEGACY_CRD:-1}" = "1" ] && exit 0 || exit 1 ;;
+  *"get crd etcdclusters.etcd-operator.cozystack.io"*)
+    [ "${FAKE_V2_CRD:-0}" = "1" ] && exit 0 || exit 1 ;;
+  *"get crd etcdbackup"*) exit 1 ;;  # no orphaned schedule/backup CRDs
+  *"apply"*"etcd-operator-crds"*) log "APPLY-CRDS"; exit 0 ;;  # baked v1alpha2 CRDs
+  *" wait "*"established"*) exit 0 ;;  # crd established wait
+
+  *"etcds.strategy.backups.cozystack.io"*)
+    [ "${FAKE_STRATEGY:-1}" = "1" ] || exit 1
+    printf '%s\n' "$strategy_json"; exit 0 ;;
+
+  # COSI presence. With --ignore-not-found real kubectl distinguishes a genuinely
+  # absent CRD (rc=0, no output) from a failed read (rc!=0) — the script must
+  # treat only the former as "external".
+  *"get crd bucketclaims.objectstorage.k8s.io"*)
+    log "CLAIM-CRD-PROBE"
+    case "${FAKE_CLAIM_CRD:-1}" in
+      1) printf 'customresourcedefinition.apiextensions.k8s.io/bucketclaims.objectstorage.k8s.io\n'; exit 0 ;;
+      0) exit 0 ;;   # --ignore-not-found: absent is a rc=0 empty answer
+      *) exit 1 ;;   # transient read error
+    esac ;;
+
+  # Cluster-wide claim list: the data the probe matches the projected bucketName
+  # against.
+  *"bucketclaims.objectstorage.k8s.io"*"-A"*)
+    log "BUCKETCLAIM-LIST"
+    [ "${FAKE_CLAIM_LIST_ERR:-0}" = "1" ] && exit 1
+    [ "${FAKE_CLAIM_CRD:-1}" = "1" ] || exit 1
+    case "${FAKE_CLAIM_LIST_SHAPE:-}" in
+      items-not-array) printf '{"items":"oops"}\n'; exit 0 ;;
+      no-items)        printf '{"apiVersion":"v1","kind":"List"}\n'; exit 0 ;;
+      not-json)        printf 'definitely not json\n'; exit 0 ;;
+    esac
+    claims_json; exit 0 ;;
+
+  # Name-keyed single GET. Nothing in the migration issues this any more; kept so
+  # the pre-fix script can still be driven against this fixture to prove the new
+  # tests bite.
+  *"bucketclaims.objectstorage.k8s.io"*)
+    log "BUCKETCLAIM-GET"
+    [ "${FAKE_CLAIM_CRD:-1}" = "1" ] || exit 1
+    claim_exists "$(arg_after -n "$@")" "$(arg_after bucketclaims.objectstorage.k8s.io "$@")" || exit 1
+    printf 'bucketclaim.objectstorage.k8s.io/x\n'; exit 0 ;;
+
+  *"get secret cozy-backups-creds"*)   # both-keys validation probe AND stage source
+    [ "${FAKE_CREDS:-1}" = "1" ] || exit 1
+    printf '%s\n' "$creds_json"; exit 0 ;;
+
+  *"etcdclusters.etcd.aenix.io"*"-o name"*)  emit_clusters_name; exit 0 ;;
+  *"etcdclusters.etcd.aenix.io"*"jsonpath"*) emit_clusters_jsonpath; exit 0 ;;
+
+  # --- ensure_wildcard_sans path (only when FAKE_CERTS=1) -------------------
+  # cert-manager re-issue is modelled statefully: a Certificate initially lacks
+  # the native wildcard; after the script patches it, the Secret's alt-names
+  # annotation reports the wildcard (a per-secret flag file marks the re-issue).
+  *"patch certificate.cert-manager.io"*)
+    cert="$(arg_after certificate.cert-manager.io "$@")"
+    : > "$state_dir/reissued-${cert}-tls"
+    log "PATCH-CERT $cert"; exit 0 ;;
+  # jsonpath '{.spec.dnsNames[*]}' probe used by _san_present: emit a
+  # SPACE-separated SAN list (matches real kubectl jsonpath[*] output), NOT the
+  # -o json blob below. FAKE_CERT_SUPERSTRING=1 injects a longer SAN that
+  # CONTAINS the native wildcard as a substring (*.etcd.<ns>.svc inside
+  # *.etcd.<ns>.svc.cluster.local) but is not an exact match — exercises the
+  # exact-match guard (a substring match would wrongly skip the re-issue patch).
+  *"get certificate.cert-manager.io"*"dnsNames"*)
+    ns="$(arg_after -n "$@")"
+    if [ "${FAKE_CERT_SUPERSTRING:-0}" = "1" ]; then
+      printf 'etcd etcd.%s.svc *.etcd.%s.svc.cluster.local\n' "$ns" "$ns"
+    else
+      printf 'etcd etcd.%s.svc\n' "$ns"
+    fi
+    exit 0 ;;
+  *"get certificate.cert-manager.io"*"-o json"*)
+    ns="$(arg_after -n "$@")"
+    printf '{"spec":{"dnsNames":["etcd","etcd.%s.svc"]}}\n' "$ns"; exit 0 ;;
+  *"get certificate.cert-manager.io"*)
+    [ "${FAKE_CERTS:-0}" = "1" ] && exit 0 || exit 1 ;;
+  *"get secret"*"alt-names"*)
+    ns="$(arg_after -n "$@")"; secret="$(arg_after secret "$@")"
+    if [ -f "$state_dir/reissued-$secret" ]; then
+      printf 'etcd,etcd.%s.svc,*.etcd.%s.svc\n' "$ns" "$ns"
+    else
+      printf 'etcd,etcd.%s.svc\n' "$ns"
+    fi
+    exit 0 ;;
+
+  *"scale deploy"*)
+    case "$args" in
+      *"--replicas=0"*) log "SCALE 0" ;;
+      *"--replicas=1"*) log "SCALE 1" ;;
+    esac
+    exit 0 ;;
+  *"rollout status"*) exit 0 ;;
+
+  *) exit 0 ;;
+esac
diff --git a/hack/testdata/migration-54-redis/kubectl b/hack/testdata/migration-54-redis/kubectl
new file mode 100755
index 0000000000..9250d798d9
--- /dev/null
+++ b/hack/testdata/migration-54-redis/kubectl
@@ -0,0 +1,139 @@
+#!/bin/sh
+# Fake kubectl for hack/migration-54-redis-adopt.bats. It serves only the calls
+# migration 54 (and lib/cozystack-version.sh) make; behaviour is driven by
+# FAKE_* env and every invocation is appended to $FAKE_CMDLOG so the test can
+# assert on which RedisFailovers were patched and with what payload, and which
+# version was stamped.
+#
+#   FAKE_CMDLOG          file to append a one-line record of each call to
+#   FAKE_CRD_ABSENT      non-empty => the CRD probe prints nothing at rc 0, i.e.
+#                        the spotahome RedisFailover CRD is genuinely absent
+#                        (nothing to adopt). Mutually exclusive with the next.
+#   FAKE_CRD_PROBE_FAIL  non-empty => the CRD probe itself FAILS (rc != 0). A
+#                        real apiserver error is NOT the same answer as "absent":
+#                        the migration must abort under set -euo pipefail rather
+#                        than stamp past an un-probed fleet.
+#   FAKE_RFS             newline list of "<ns> <name> <redis_img> <sentinel_img>"
+#                        — one per RedisFailover the -A fleet scan reports and the
+#                        per-CR read serves. A field of "-" (or empty) models an
+#                        UNSET image, so the migration's pin-where-empty branch is
+#                        exercised; any other value is a preset image that must be
+#                        left untouched.
+#   FAKE_LABEL_FAIL      non-empty => every `patch` exits 1 with this stderr. The
+#                        adoption label/pin is the whole point of the migration:
+#                        a failed patch must abort before stamping so the Job
+#                        retries rather than leaving the fleet invisible to the
+#                        new operator.
+#
+# Any call the migration makes that is not modelled below is drift between the
+# script and this fake and fails loudly, rather than letting the migration run
+# against a call the test never reasoned about.
+set -u
+
+log() { [ -n "${FAKE_CMDLOG:-}" ] && printf '%s\n' "$*" >> "$FAKE_CMDLOG"; }
+log "KUBECTL $*"
+
+args="$*"
+
+# arg_after KEY -- echoes the token following KEY in the argument vector.
+arg_after() { k="$1"; shift; p=""; for a in "$@"; do [ "$p" = "$k" ] && { printf '%s' "$a"; return; }; p="$a"; done; }
+
+# spec_image_obj VALUE -- a JSON object for a spec.<role> node. "-" or empty
+# models an unset image (empty object, so `.spec.<role>.image // ""` is ""); any
+# other value is a preset image the migration must not overwrite.
+spec_image_obj() {
+  case "${1:-}" in
+    ""|"-") printf '{}' ;;
+    *)      printf '{"image":"%s"}' "$1" ;;
+  esac
+}
+
+case "$args" in
+  # CRD probe: `get crd <fqdn> --ignore-not-found -o name`. Empty + rc 0 => the
+  # CRD is absent (nothing to adopt); a non-zero exit models a genuine apiserver
+  # error, which under the migration's set -euo pipefail must abort — the exact
+  # failure the --ignore-not-found form exists to keep distinct from "absent".
+  *"get crd redisfailovers.databases.spotahome.com"*)
+    if [ -n "${FAKE_CRD_PROBE_FAIL:-}" ]; then
+      printf 'fake kubectl: the server could not find the requested resource\n' >&2
+      exit 1
+    fi
+    if [ -n "${FAKE_CRD_ABSENT:-}" ]; then
+      exit 0
+    fi
+    printf 'customresourcedefinition.apiextensions.k8s.io/redisfailovers.databases.spotahome.com\n'
+    exit 0
+    ;;
+
+  # Fleet scan: every RedisFailover across all namespaces, as JSON. The
+  # migration pipes this through jq for "<ns> <name>", so only those two fields
+  # are consumed here; the per-CR read below serves the spec.
+  *"get redisfailovers.databases.spotahome.com"*"--all-namespaces"*)
+    printf '{"items":['
+    printf '%s\n' "${FAKE_RFS:-}" | {
+      sep=""
+      while read -r ns name ri si; do
+        [ -n "$ns" ] || continue
+        printf '%s{"metadata":{"namespace":"%s","name":"%s"}}' "$sep" "$ns" "$name"
+        sep=","
+      done
+    }
+    printf ']}\n'
+    exit 0
+    ;;
+
+  # Per-CR read: `-n <ns> get <fqdn> <name> -o json`. Serves the spec so the
+  # migration can decide, per role, whether the image is empty (pin) or preset
+  # (leave). Reads the same FAKE_RFS row the fleet scan reported.
+  *"get redisfailovers.databases.spotahome.com"*)
+    ns=$(arg_after -n "$@")
+    name=$(arg_after redisfailovers.databases.spotahome.com "$@")
+    out=$(printf '%s\n' "${FAKE_RFS:-}" | {
+      while read -r rns rname rri rsi; do
+        [ "$rns" = "$ns" ] && [ "$rname" = "$name" ] || continue
+        printf '{"metadata":{"namespace":"%s","name":"%s"},"spec":{"redis":%s,"sentinel":%s}}\n' \
+          "$rns" "$rname" "$(spec_image_obj "$rri")" "$(spec_image_obj "$rsi")"
+        break
+      done
+    })
+    # A read with no matching FAKE_RFS row is a test-harness typo, not a cluster
+    # state: serving empty at rc 0 would flow into the migration's pin-both
+    # branch as a misleading green. Fail loudly, like every unmodelled call.
+    if [ -z "$out" ]; then
+      printf 'fake kubectl: no RedisFailover %s/%s in FAKE_RFS\n' "$ns" "$name" >&2
+      exit 1
+    fi
+    printf '%s\n' "$out"
+    exit 0
+    ;;
+
+  # The adoption patch. --type=merge, carrying the operator-group label and, only
+  # where empty, the engine pin. Logged verbatim so the test can inspect the
+  # payload (label present on every CR; image pin present only where it should
+  # be). FAKE_LABEL_FAIL models a patch the apiserver rejects.
+  *"patch redisfailovers.databases.spotahome.com"*)
+    if [ -n "${FAKE_LABEL_FAIL:-}" ]; then
+      printf 'fake kubectl: admission webhook denied the patch\n' >&2
+      exit 1
+    fi
+    ns=$(arg_after -n "$@")
+    name=$(arg_after redisfailovers.databases.spotahome.com "$@")
+    patch=$(arg_after -p "$@")
+    log "PATCH $ns $name $patch"
+    exit 0
+    ;;
+
+  # Version stamp: kubectl apply --filename -. Record the number actually
+  # stamped; a wrong number would loop run-migrations.sh forever and a bare
+  # "STAMP" assertion would not notice.
+  *"apply --filename -"*)
+    manifest=$(cat)
+    v=$(printf '%s\n' "$manifest" | sed -n 's/^  version: "\{0,1\}\([0-9]\{1,\}\)"\{0,1\}$/\1/p' | head -1)
+    log "STAMP ${v:-unknown}"
+    exit 0
+    ;;
+esac
+
+log "UNHANDLED $args"
+printf 'fake kubectl: unmodelled call: %s\n' "$args" >&2
+exit 1
diff --git a/hack/testdata/migration-55-fluxcd/kubectl b/hack/testdata/migration-55-fluxcd/kubectl
new file mode 100755
index 0000000000..b75d8d1fb7
--- /dev/null
+++ b/hack/testdata/migration-55-fluxcd/kubectl
@@ -0,0 +1,128 @@
+#!/bin/sh
+# Fake kubectl for hack/migration-55-fluxcd-orphan.bats. It serves only the
+# calls migration 55 (and lib/cozystack-version.sh) make; behaviour is driven by
+# FAKE_* env and every invocation is appended to $FAKE_CMDLOG so the test can
+# assert on which HelmReleases were suspended, finalizer-patched and deleted, in
+# what order, and which were never touched.
+#
+# Migration 55 fully-qualifies the resource as
+# `helmreleases.helm.toolkit.fluxcd.io` on every call, so this fake matches (and
+# reads the object name after) that exact token. The verify read and the fleet
+# scan therefore share a prefix; they are told apart by the verify read's
+# `-o jsonpath=` selector, matched first below.
+#
+#   FAKE_CMDLOG          file to append a one-line record of each call to
+#   FAKE_HRS             newline list of "<ns> <name> <chartRef.name>" — one per
+#                        HelmRelease the -A fleet scan should report. jq in the
+#                        migration selects the two fluxcd-addon chartRef names;
+#                        rows with any other chartRef must be listed but ignored.
+#   FAKE_LIST_FAIL       non-empty => the -A fleet scan exits 1 with this stderr
+#   FAKE_PATCH_FAIL      non-empty => every `patch` exits 1 with this stderr
+#   FAKE_DELETE_FAIL     non-empty => every `delete` exits 1 with this stderr
+#   FAKE_FINALIZER_STICKS non-empty => the verify read returns a still-present
+#                        finalizer, modelling a patch the apiserver did not honour
+#   FAKE_VERIFY_READ_FAIL non-empty => the finalizer verify read itself exits 1
+#                        with this stderr, modelling an API error on the read
+#                        that gates the delete — the suspend and finalizer
+#                        patches before it still succeed
+#
+# The failure knobs exist because the point of migration 55 is fail-closed: a
+# kubectl error, or a finalizer that survives the patch, must ABORT the migration
+# before it deletes a still-finalized object or stamps the version. A fake that
+# can only succeed cannot test that.
+set -u
+
+log() { [ -n "${FAKE_CMDLOG:-}" ] && printf '%s\n' "$*" >> "$FAKE_CMDLOG"; }
+log "KUBECTL $*"
+
+args="$*"
+
+# arg_after KEY -- echoes the token following KEY in the argument vector.
+arg_after() { k="$1"; shift; p=""; for a in "$@"; do [ "$p" = "$k" ] && { printf '%s' "$a"; return; }; p="$a"; done; }
+
+case "$args" in
+  # Version stamp: kubectl apply --filename -
+  *"apply --filename -"*)
+    manifest=$(cat)
+    # Record the version actually stamped. A migration that stamped the wrong
+    # number would loop the runner forever, and asserting a bare "STAMP" would
+    # not notice.
+    v=$(printf '%s\n' "$manifest" | sed -n 's/^  version: "\{0,1\}\([0-9]\{1,\}\)"\{0,1\}$/\1/p' | head -1)
+    log "STAMP ${v:-unknown}"
+    exit 0
+    ;;
+
+  # Per-namespace finalizer verify read, gating the delete. Shares the fleet
+  # scan's resource token, so it is matched FIRST and distinguished by the
+  # `-o jsonpath=` selector; --ignore-not-found (the migration's own flag) is
+  # just another token here and needs no handling. Empty output => the finalizer
+  # is gone and the delete may proceed; a non-empty value => it survived the
+  # patch and the migration must refuse to delete.
+  *"get helmreleases.helm.toolkit.fluxcd.io"*"jsonpath"*)
+    if [ -n "${FAKE_VERIFY_READ_FAIL:-}" ]; then
+      printf '%s\n' "$FAKE_VERIFY_READ_FAIL" >&2
+      exit 1
+    fi
+    if [ -n "${FAKE_FINALIZER_STICKS:-}" ]; then
+      printf '%s' '["helm.toolkit.fluxcd.io/finalizer"]'
+    fi
+    exit 0
+    ;;
+
+  # Fleet scan: every HelmRelease across all namespaces, as JSON. The migration
+  # pipes this through jq to pick out the two fluxcd-addon chartRef names, so the
+  # selection logic under test is jq's, not the fake's — the fake just emits what
+  # FAKE_HRS describes, matching and non-matching rows alike.
+  *"get helmreleases.helm.toolkit.fluxcd.io"*)
+    if [ -n "${FAKE_LIST_FAIL:-}" ]; then
+      printf '%s\n' "$FAKE_LIST_FAIL" >&2
+      exit 1
+    fi
+    printf '{"items":['
+    printf '%s\n' "${FAKE_HRS:-}" | {
+      sep=""
+      while read -r ns name chart; do
+        [ -n "$ns" ] || continue
+        printf '%s{"metadata":{"namespace":"%s","name":"%s"},"spec":{"chartRef":{"name":"%s"}}}' \
+          "$sep" "$ns" "$name" "$chart"
+        sep=","
+      done
+    }
+    printf ']}\n'
+    exit 0
+    ;;
+
+  # Suspend and finalizer-drop patches.
+  *"patch helmreleases.helm.toolkit.fluxcd.io"*)
+    if [ -n "${FAKE_PATCH_FAIL:-}" ]; then
+      printf '%s\n' "$FAKE_PATCH_FAIL" >&2
+      exit 1
+    fi
+    ns=$(arg_after -n "$@")
+    name=$(arg_after helmreleases.helm.toolkit.fluxcd.io "$@")
+    case "$args" in
+      *suspend*)    log "SUSPEND $ns $name" ;;
+      *finalizers*) log "FINALIZER-PATCH $ns $name" ;;
+    esac
+    exit 0
+    ;;
+
+  # The orphaning delete itself.
+  *"delete helmreleases.helm.toolkit.fluxcd.io"*)
+    if [ -n "${FAKE_DELETE_FAIL:-}" ]; then
+      printf '%s\n' "$FAKE_DELETE_FAIL" >&2
+      exit 1
+    fi
+    ns=$(arg_after -n "$@")
+    name=$(arg_after helmreleases.helm.toolkit.fluxcd.io "$@")
+    log "DELETE $ns $name"
+    exit 0
+    ;;
+esac
+
+# Any call the migration makes that is not modelled above is a drift between the
+# script and this fake — fail loudly rather than let the migration proceed
+# against a call the test never actually reasoned about.
+log "UNHANDLED $args"
+printf 'fake kubectl: unmodelled call: %s\n' "$args" >&2
+exit 1
diff --git a/hack/testdata/migration-56/kubectl b/hack/testdata/migration-56/kubectl
new file mode 100755
index 0000000000..26284fe8f5
--- /dev/null
+++ b/hack/testdata/migration-56/kubectl
@@ -0,0 +1,123 @@
+#!/bin/sh
+# Fake kubectl for the migration-56 unit test (hack/migration-56-adopt-values.bats).
+# Mocks only the cluster boundary. Env:
+#   FAKE_HR_LIST  path to the `get helmrelease -o json` list fixture
+#   FAKE_CHILD_HR path to write the child HelmRelease that `apply -f -` receives
+#   FAKE_CMDLOG   path to append a call log (APPLY-HR / STAMP / annotate / label)
+#   FAKE_GET_FAIL substring: any `get` whose args match it fails with a
+#                 transient server error (message overridable via
+#                 FAKE_GET_FAIL_MSG, e.g. a conversion-webhook failure whose
+#                 text happens to contain "not found"), so the migration's
+#                 absence-vs-failure classification is exercised
+#   FAKE_WARN_STDERR when set, every successful get prints a deprecation
+#                 warning to stderr first, the way real kubectl does -- data
+#                 captured with 2>&1 would be contaminated by it
+# Absence honors --ignore-not-found the way real kubectl does: with the flag a
+# missing object is SUCCESS with empty output; without it, "Error from server
+# (NotFound)" on stderr and exit 1.
+log() { [ -n "${FAKE_CMDLOG:-}" ] && echo "$*" >> "$FAKE_CMDLOG"; return 0; }
+notfound() { echo "Error from server (NotFound): $1 not found" >&2; exit 1; }
+absent() {
+  case "$args" in
+    *--ignore-not-found*) exit 0 ;;
+  esac
+  notfound "$1"
+}
+verb=${1:-}
+shift 2>/dev/null || true
+args="$*"
+case "$verb" in
+  get)
+    if [ -n "${FAKE_GET_FAIL:-}" ]; then
+      case "$args" in
+        *"${FAKE_GET_FAIL}"*)
+          echo "${FAKE_GET_FAIL_MSG:-Error from server: etcdserver: request timed out}" >&2; exit 1 ;;
+      esac
+    fi
+    if [ -n "${FAKE_WARN_STDERR:-}" ]; then
+      echo "Warning: cluster.x-k8s.io/v1beta1 MachineDeployment is deprecated" >&2
+    fi
+    case "$args" in
+      *helmrelease*--all-namespaces*)
+        cat "$FAKE_HR_LIST"; exit 0 ;;
+      *helmrelease*kubernetes-nodes-*)
+        notfound "helmreleases.helm.toolkit.fluxcd.io" ;;  # child HR absent -> create path
+    esac
+    # tokenize: $1=resource, $2=object-name (or a flag for list queries)
+    # shellcheck disable=SC2086
+    set -- $args
+    res=$1; name=$2
+    # Real kubectl rejects a name containing '/' client-side, before any API
+    # call, deterministically -- reproduce that so the migration provably never
+    # issues a read for a composed name that cannot exist.
+    case "$name" in
+      */*)
+        echo "error: there is no need to specify a resource type as a separate argument when passing arguments in resource/name form" >&2
+        exit 1 ;;
+    esac
+    case "$res" in
+      kubevirtmachinetemplate*)
+        case "$name" in
+          -*|"")                        # KMT range/list query
+            [ -n "${FAKE_KMT_NAMES:-}" ] && printf '%s\n' "$FAKE_KMT_NAMES"
+            exit 0 ;;
+        esac ;;
+    esac
+    # Named-object get. When FAKE_OBJS is set (adoption-path tests), look the
+    # object up there: a matching line "<res> <name> <release-name>" means present.
+    # Without FAKE_OBJS every named get is "absent" (value-mapping tests rely on
+    # adopt_one short-circuiting on absent).
+    if [ -n "${FAKE_OBJS:-}" ] && [ -f "$FAKE_OBJS" ]; then
+      line=$(grep -E "^${res}[[:space:]]+${name}([[:space:]]|$)" "$FAKE_OBJS" || true)
+      [ -z "$line" ] && absent "${res} \"${name}\""         # absent
+      rel=$(printf '%s\n' "$line" | awk '{print $3}')
+      case "$args" in
+        *jsonpath*release-name*) printf '%s' "$rel"; exit 0 ;;
+        *" -o json"*)
+          printf '{"metadata":{"annotations":{"meta.helm.sh/release-name":"%s"}}}' "$rel"; exit 0 ;;
+        *" -o name"*)   printf '%s/%s\n' "$res" "$name"; exit 0 ;;
+        *) exit 0 ;;                                        # existence check
+      esac
+    fi
+    absent "${res} \"${name}\"" ;;      # default: absent
+  apply)
+    payload=$(cat)
+    if printf '%s' "$payload" | grep -q 'HelmRelease'; then
+      # Reject an RFC-1123-invalid metadata.name the way the real apiserver would,
+      # so the migration's name-validity guard is exercised: without it the script
+      # would reach this apply and exit non-zero, deadlocking the upgrade.
+      hrname=$(printf '%s' "$payload" | jq -r '.metadata.name // ""' 2>/dev/null)
+      if ! printf '%s' "$hrname" | grep -qE '^[a-z0-9]([-a-z0-9]*[a-z0-9])?$'; then
+        echo "The HelmRelease \"$hrname\" is invalid: metadata.name: Invalid value: \"$hrname\": a lowercase RFC 1123 label is required" >&2
+        exit 1
+      fi
+      printf '%s' "$payload" > "$FAKE_CHILD_HR"; log "APPLY-HR"
+    elif printf '%s' "$payload" | grep -q 'ConfigMap'; then
+      if printf '%s' "$payload" | grep -q 'cozystack-migration-56-unadopted'; then
+        # FAKE_UNADOPTED_CM_FAIL exercises the best-effort path: a permanent
+        # failure publishing the record must NOT abort the migration.
+        if [ -n "${FAKE_UNADOPTED_CM_FAIL:-}" ]; then
+          echo "Error from server: ConfigMap \"cozystack-migration-56-unadopted\" is invalid: exceeds object size limit" >&2
+          exit 1
+        fi
+        log "APPLY-UNADOPTED-CM"
+      else
+        log "STAMP"
+      fi
+    else
+      log "APPLY-OTHER"
+    fi
+    exit 0 ;;
+  annotate) log "annotate $args"; exit 0 ;;
+  label)    log "label $args"; exit 0 ;;
+  create)
+    # Only `create configmap cozystack-migration-56-unadopted --from-file ...
+    # --dry-run=client -o yaml` is used; emit a minimal ConfigMap manifest so the
+    # piped `apply --filename -` receives it and logs APPLY-UNADOPTED-CM.
+    case "$args" in
+      *configmap*cozystack-migration-56-unadopted*)
+        printf 'apiVersion: v1\nkind: ConfigMap\nmetadata:\n  name: cozystack-migration-56-unadopted\n' ;;
+    esac
+    exit 0 ;;
+  *) exit 0 ;;
+esac
diff --git a/hack/testdata/migration-57-seaweedfs-size-limit/kubectl b/hack/testdata/migration-57-seaweedfs-size-limit/kubectl
new file mode 100755
index 0000000000..c8719e53b9
--- /dev/null
+++ b/hack/testdata/migration-57-seaweedfs-size-limit/kubectl
@@ -0,0 +1,105 @@
+#!/bin/sh
+# Fake kubectl for hack/migration-57-seaweedfs-size-limit.bats. It serves only
+# the calls migration 57 (and lib/cozystack-version.sh) and the matching steps of
+# docs/operations/seaweedfs-lowering-the-volume-size-limit.md make; behaviour is
+# driven by FAKE_* env and every invocation is appended to $FAKE_CMDLOG.
+#
+#   FAKE_CMDLOG      file to append a one-line record of each call to
+#   FAKE_HRS         newline list of "<ns> <name> <values>", one per SeaweedFS
+#                    HelmRelease the fleet list reports. <values> is the JSON of
+#                    spec.values, or "-" for a release that has no spec.values at
+#                    all (the shape the tenant module renders).
+#   FAKE_VALUESFROM  newline list of "<ns> <valuesFrom>", overriding the
+#                    valuesFrom of that namespace's release. <valuesFrom> is JSON,
+#                    or "-" for none. Every other release carries the single
+#                    cozystack-values entry both of its writers set.
+#   FAKE_LIST_FAIL   non-empty => the fleet list exits 1, as an apiserver error.
+#   FAKE_PATCH_FAIL  non-empty => every patch exits 1.
+#
+# The list is served only for the exact selector cozystack-api uses to find
+# SeaweedFS instances (the kind and group requirements in
+# pkg/registry/apps/application/rest.go). Any other selector is refused rather
+# than answered with an empty list: an empty list is a legitimate cluster state
+# here, so a mistyped selector would otherwise pass every test and patch nothing
+# in production.
+set -u
+
+SELECTOR='apps.cozystack.io/application.kind=SeaweedFS,apps.cozystack.io/application.group=apps.cozystack.io'
+
+log() { [ -n "${FAKE_CMDLOG:-}" ] && printf '%s\n' "$*" >> "$FAKE_CMDLOG"; }
+log "KUBECTL $*"
+
+args="$*"
+
+# arg_after KEY -- echoes the token following KEY in the argument vector.
+arg_after() { k="$1"; shift; p=""; for a in "$@"; do [ "$p" = "$k" ] && { printf '%s' "$a"; return; }; p="$a"; done; }
+
+# has ARG -- whether ARG appears as a whole token.
+has() { k="$1"; shift; for a in "$@"; do [ "$a" = "$k" ] && return 0; done; return 1; }
+
+case "$args" in
+  *"get helmreleases.helm.toolkit.fluxcd.io"*)
+    if [ "$(arg_after -l "$@")" != "$SELECTOR" ] || ! { has --all-namespaces "$@" || has -A "$@"; } \
+        || [ "$(arg_after -o "$@")" != json ]; then
+      log "BADLIST $args"
+      printf 'fake kubectl: unexpected fleet list: %s\n' "$args" >&2
+      exit 1
+    fi
+    if [ -n "${FAKE_LIST_FAIL:-}" ]; then
+      printf 'fake kubectl: the server is currently unable to handle the request\n' >&2
+      exit 1
+    fi
+    printf '{"items":['
+    printf '%s\n' "${FAKE_HRS:-}" | {
+      sep=""
+      while read -r ns name values; do
+        [ -n "$ns" ] || continue
+        from=$(printf '%s\n' "${FAKE_VALUESFROM:-}" | while read -r vns vfrom; do
+          [ "$vns" = "$ns" ] && printf '%s' "$vfrom"
+        done)
+        case "$from" in
+          "") from=',"valuesFrom":[{"kind":"Secret","name":"cozystack-values"}]' ;;
+          -) from="" ;;
+          *) from=",\"valuesFrom\":$from" ;;
+        esac
+        if [ "$values" = "-" ]; then
+          spec="{\"interval\":\"5m\"$from}"
+        else
+          spec="{\"interval\":\"5m\",\"values\":$values$from}"
+        fi
+        printf '%s{"metadata":{"namespace":"%s","name":"%s"},"spec":%s}' "$sep" "$ns" "$name" "$spec"
+        sep=","
+      done
+    }
+    printf ']}\n'
+    exit 0
+    ;;
+
+  *"patch helmreleases.helm.toolkit.fluxcd.io"*)
+    if [ "$(arg_after --type "$@")" != merge ] && ! has --type=merge "$@"; then
+      log "BADPATCH $args"
+      printf 'fake kubectl: patch is not a merge patch: %s\n' "$args" >&2
+      exit 1
+    fi
+    if [ -n "${FAKE_PATCH_FAIL:-}" ]; then
+      printf 'fake kubectl: admission webhook denied the patch\n' >&2
+      exit 1
+    fi
+    ns=$(arg_after -n "$@")
+    name=$(arg_after helmreleases.helm.toolkit.fluxcd.io "$@")
+    patch=$(arg_after -p "$@")
+    log "PATCH ${ns:-<none>} $name $patch"
+    exit 0
+    ;;
+
+  *"apply --filename -"*)
+    manifest=$(cat)
+    v=$(printf '%s\n' "$manifest" | sed -n 's/^  version: "\{0,1\}\([0-9]\{1,\}\)"\{0,1\}$/\1/p' | head -1)
+    log "STAMP ${v:-unknown}"
+    exit 0
+    ;;
+esac
+
+log "UNHANDLED $args"
+printf 'fake kubectl: unmodelled call: %s\n' "$args" >&2
+exit 1
diff --git a/hack/testdata/migration-58-http-cache/kubectl b/hack/testdata/migration-58-http-cache/kubectl
new file mode 100755
index 0000000000..0fb03f5c1d
--- /dev/null
+++ b/hack/testdata/migration-58-http-cache/kubectl
@@ -0,0 +1,169 @@
+#!/bin/sh
+# Fake kubectl for hack/migration-58-http-cache-freeze.bats, modelled on
+# hack/testdata/migration-55-fluxcd/kubectl. It serves only the calls migration
+# 58 and lib/cozystack-version.sh make, and logs each one to $FAKE_CMDLOG.
+#
+# Both the frozen OCIRepository and the version stamp arrive as
+# `apply --filename -`, so this fake reads stdin and branches on the manifest's
+# kind rather than on the argument vector.
+#
+#   FAKE_CMDLOG          file to append a one-line record of each call to
+#   FAKE_HRS             newline list of "<ns> <name> <chartRef.name> [<kind>]"
+#                        for the fleet scan; <kind> is the application.kind
+#                        label, "-" or absent for none
+#   FAKE_LIST_FAIL       non-empty => the fleet scan exits 1 with this stderr
+#   FAKE_OCIREPO_REF     shape of the live source's ref: "digest" (default) is
+#                        a spec.ref.digest pin, "tag" is a tag ref resolved in
+#                        status.artifact.revision, "unresolved" is a tag ref
+#                        with no artifact yet
+#   FAKE_OCIREPO_READ_FAIL non-empty => reading the source OCIRepository exits 1
+#   FAKE_PATCH_FAIL      non-empty => every patch exits 1 with this stderr
+#   FAKE_DELETE_FAIL     non-empty => every delete exits 1 with this stderr
+set -u
+
+log() { [ -n "${FAKE_CMDLOG:-}" ] && printf '%s\n' "$*" >> "$FAKE_CMDLOG"; }
+log "KUBECTL $*"
+
+args="$*"
+arg_after() { k="$1"; shift; p=""; for a in "$@"; do [ "$p" = "$k" ] && { printf '%s' "$a"; return; }; p="$a"; done; }
+
+case "$args" in
+  *"apply --filename -"*)
+    manifest=$(cat)
+    case "$manifest" in
+      *"kind: ConfigMap"*|*'"kind": "ConfigMap"'*)
+        v=$(printf '%s\n' "$manifest" | sed -n 's/^  version: "\{0,1\}\([0-9]\{1,\}\)"\{0,1\}$/\1/p' | head -1)
+        log "STAMP ${v:-unknown}"
+        ;;
+      *OCIRepository*)
+        # Record the fields the migration must carry over or set, so a copy that
+        # silently drops the pull secret or forgets the digest is caught.
+        name=$(printf '%s' "$manifest" | jq -r '.metadata.name')
+        digest=$(printf '%s' "$manifest" | jq -r '.spec.ref.digest // "none"')
+        url=$(printf '%s' "$manifest" | jq -r '.spec.url // "none"')
+        secret=$(printf '%s' "$manifest" | jq -r '.spec.secretRef.name // "none"')
+        interval=$(printf '%s' "$manifest" | jq -r '.spec.interval // "none"')
+        owners=$(printf '%s' "$manifest" | jq -r '(.metadata.ownerReferences // []) | length')
+        nodelete=$(printf '%s' "$manifest" | jq -r 'if .metadata.labels["platform.cozystack.io/no-delete"] == "true" then 1 else 0 end')
+        verify=$(printf '%s' "$manifest" | jq -r '.spec.verify.provider // "none"')
+        log "APPLY-OCIREPO $name $digest $url $secret $interval verify=$verify owners=$owners nodelete=$nodelete"
+        ;;
+      *"kind: ClusterRole"*)
+        name=$(printf '%s\n' "$manifest" | sed -n 's/^  name: //p' | head -1)
+        agg=$(printf '%s\n' "$manifest" | grep -c 'rbac.cozystack.io/aggregate-to-tenant-admin: "true"')
+        nodelete=$(printf '%s\n' "$manifest" | grep -c 'platform.cozystack.io/no-delete: "true"')
+        res=$(printf '%s\n' "$manifest" | sed -n 's/^  resources: \[\(.*\)\]$/\1/p' | tr -d '" ')
+        verbs=$(printf '%s\n' "$manifest" | sed -n 's/^  verbs: \[\(.*\)\]$/\1/p' | tr -d '" ')
+        log "APPLY-CLUSTERROLE $name aggregate=$agg nodelete=$nodelete resources=$res verbs=$verbs"
+        ;;
+      *)
+        log "APPLY-UNKNOWN"
+        printf 'fake kubectl: unmodelled apply\n' >&2
+        exit 1
+        ;;
+    esac
+    exit 0
+    ;;
+
+  *"get ocirepositories.source.toolkit.fluxcd.io"*)
+    if [ -n "${FAKE_OCIREPO_READ_FAIL:-}" ]; then
+      printf '%s\n' "$FAKE_OCIREPO_READ_FAIL" >&2
+      exit 1
+    fi
+    case "${FAKE_OCIREPO_REF:-digest}" in
+      digest)     ref='{"digest":"sha256:1111111111111111111111111111111111111111111111111111111111111111"}'
+                  status=',"status":{"artifact":{"revision":"v1.7.0@sha256:2222222222222222222222222222222222222222222222222222222222222222","digest":"sha256:3333333333333333333333333333333333333333333333333333333333333333"}}' ;;
+      tag)        ref='{"tag":"v1.7.0"}'
+                  status=',"status":{"artifact":{"revision":"v1.7.0@sha256:2222222222222222222222222222222222222222222222222222222222222222","digest":"sha256:3333333333333333333333333333333333333333333333333333333333333333"}}' ;;
+      unresolved) ref='{"tag":"v1.7.0"}'
+                  status='' ;;
+      *) printf 'fake kubectl: unknown FAKE_OCIREPO_REF %s\n' "$FAKE_OCIREPO_REF" >&2; exit 1 ;;
+    esac
+    # A Helm-owned, labelled, owner-referenced original: the copy must keep the
+    # spec, drop the ownership, and set its own labels.
+    cat <<JSON
+{"apiVersion":"source.toolkit.fluxcd.io/v1","kind":"OCIRepository",
+ "metadata":{"name":"cozystack-packages","namespace":"cozy-system",
+   "labels":{"app.kubernetes.io/managed-by":"Helm","platform.cozystack.io/no-delete":"true"},
+   "annotations":{"meta.helm.sh/release-name":"cozy-platform"},
+   "ownerReferences":[{"apiVersion":"cozystack.io/v1alpha1","kind":"Package","name":"x","uid":"1","controller":true}]},
+ "spec":{"url":"oci://registry.example.org/cozystack/cozystack-packages","interval":"5m",
+   "secretRef":{"name":"registry-creds"},
+   "verify":{"provider":"cosign","secretRef":{"name":"cosign-pub"}},"ref":${ref}}${status}}
+JSON
+    exit 0
+    ;;
+
+  *"get helmreleases.helm.toolkit.fluxcd.io"*)
+    if [ -n "${FAKE_LIST_FAIL:-}" ]; then
+      printf '%s\n' "$FAKE_LIST_FAIL" >&2
+      exit 1
+    fi
+    printf '{"items":['
+    printf '%s\n' "${FAKE_HRS:-}" | {
+      sep=""
+      while read -r ns name chart kind; do
+        [ -n "$ns" ] || continue
+        if [ -n "${kind:-}" ] && [ "$kind" != "-" ]; then
+          labels=$(printf '{"apps.cozystack.io/application.kind":"%s"}' "$kind")
+        else
+          labels=null
+        fi
+        printf '%s{"metadata":{"namespace":"%s","name":"%s","labels":%s},"spec":{"chartRef":{"name":"%s"}}}' \
+          "$sep" "$ns" "$name" "$labels" "$chart"
+        sep=","
+      done
+    }
+    printf ']}\n'
+    exit 0
+    ;;
+
+  *"patch packagesources.cozystack.io"*)
+    if [ -n "${FAKE_PATCH_FAIL:-}" ]; then printf '%s\n' "$FAKE_PATCH_FAIL" >&2; exit 1; fi
+    body=$(printf '%s' "$args" | sed 's/.*-p //')
+    keep=$(printf '%s' "$body" | grep -c 'resource-policy')
+    src=$(printf '%s' "$body" | grep -c 'cozystack-packages-http-cache')
+    disown=$(printf '%s' "$body" | grep -c '"meta.helm.sh/release-name":null')
+    managed=$(printf '%s' "$body" | grep -c '"app.kubernetes.io/managed-by":null')
+    log "PATCH-PACKAGESOURCE keep=$keep source=$src disown=$disown managed=$managed"
+    exit 0
+    ;;
+
+  *"patch packages.cozystack.io"*)
+    if [ -n "${FAKE_PATCH_FAIL:-}" ]; then printf '%s\n' "$FAKE_PATCH_FAIL" >&2; exit 1; fi
+    log "PATCH-PACKAGE"
+    exit 0
+    ;;
+
+  *"delete packages.cozystack.io"*)
+    if [ -n "${FAKE_DELETE_FAIL:-}" ]; then printf '%s\n' "$FAKE_DELETE_FAIL" >&2; exit 1; fi
+    case "$args" in
+      *--wait=false*) _w=0 ;;
+      *)              _w=1 ;;
+    esac
+    log "DELETE-PACKAGE $(arg_after packages.cozystack.io "$@") wait=$_w"
+    exit 0
+    ;;
+
+  *"delete helmreleases.helm.toolkit.fluxcd.io"*)
+    if [ -n "${FAKE_DELETE_FAIL:-}" ]; then printf '%s\n' "$FAKE_DELETE_FAIL" >&2; exit 1; fi
+    log "DELETE-HR $(arg_after -n "$@") $(arg_after helmreleases.helm.toolkit.fluxcd.io "$@")"
+    exit 0
+    ;;
+
+  *"delete applicationdefinitions.cozystack.io"*)
+    if [ -n "${FAKE_DELETE_FAIL:-}" ]; then printf '%s\n' "$FAKE_DELETE_FAIL" >&2; exit 1; fi
+    log "DELETE-APPDEF $(arg_after applicationdefinitions.cozystack.io "$@")"
+    exit 0
+    ;;
+
+  *"delete secret"*)
+    if [ -n "${FAKE_DELETE_FAIL:-}" ]; then printf '%s\n' "$FAKE_DELETE_FAIL" >&2; exit 1; fi
+    log "DELETE-SECRETS $(arg_after -n "$@") $(arg_after -l "$@")"
+    exit 0
+    ;;
+esac
+
+log "UNHANDLED $args"
+printf 'fake kubectl: unmodelled call: %s\n' "$args" >&2
+exit 1
diff --git a/hack/testdata/migration-59-vmi-hotplug/kubectl b/hack/testdata/migration-59-vmi-hotplug/kubectl
new file mode 100755
index 0000000000..73062dbbd3
--- /dev/null
+++ b/hack/testdata/migration-59-vmi-hotplug/kubectl
@@ -0,0 +1,93 @@
+#!/bin/sh
+# Fake kubectl for hack/migration-59-vmi-hotplug-volumes.bats. It serves only
+# the calls migration 59 and lib/cozystack-version.sh make, and logs each one
+# to $FAKE_CMDLOG.
+#
+# The VMs live in $FAKE_STATE/vms.json and a JSON patch is applied to that
+# file, so a second run of the migration reads what the first one wrote.
+#
+#   FAKE_CMDLOG      file to append a one-line record of each call to
+#   FAKE_STATE       directory holding vms.json and vmis.json
+#   FAKE_NO_KUBEVIRT non-empty => the VirtualMachine CRD is absent
+#   FAKE_CRD_FAIL    non-empty => reading the VirtualMachine CRD exits 1
+#   FAKE_LIST_FAIL   non-empty => listing VMs exits 1 with this stderr
+#   FAKE_VMI_LIST_FAIL non-empty => listing VMIs exits 1 with this stderr
+#   FAKE_PATCH_FAIL  non-empty => every patch exits 1 with this stderr
+set -u
+
+log() { [ -n "${FAKE_CMDLOG:-}" ] && printf '%s\n' "$*" >> "$FAKE_CMDLOG"; }
+log "KUBECTL $*"
+
+args="$*"
+arg_after() { k="$1"; shift; p=""; for a in "$@"; do [ "$p" = "$k" ] && { printf '%s' "$a"; return; }; p="$a"; done; }
+
+case "$args" in
+  *"apply --filename -"*|*"apply -f -"*)
+    manifest=$(cat)
+    case "$manifest" in
+      *"kind: ConfigMap"*)
+        v=$(printf '%s\n' "$manifest" | sed -n 's/^  version: "\{0,1\}\([0-9]\{1,\}\)"\{0,1\}$/\1/p' | head -1)
+        log "STAMP ${v:-unknown}"
+        exit 0
+        ;;
+    esac
+    log "APPLY-UNKNOWN"
+    printf 'fake kubectl: unmodelled apply\n' >&2
+    exit 1
+    ;;
+
+  *"get crd virtualmachines.kubevirt.io"*)
+    if [ -n "${FAKE_CRD_FAIL:-}" ]; then printf '%s\n' "$FAKE_CRD_FAIL" >&2; exit 1; fi
+    [ -n "${FAKE_NO_KUBEVIRT:-}" ] || echo "customresourcedefinition.apiextensions.k8s.io/virtualmachines.kubevirt.io"
+    exit 0
+    ;;
+
+  *"get virtualmachines.kubevirt.io"*)
+    if [ -n "${FAKE_LIST_FAIL:-}" ]; then printf '%s\n' "$FAKE_LIST_FAIL" >&2; exit 1; fi
+    cat "$FAKE_STATE/vms.json" || exit 1
+    exit 0
+    ;;
+
+  *"get virtualmachineinstances.kubevirt.io"*)
+    if [ -n "${FAKE_VMI_LIST_FAIL:-}" ]; then printf '%s\n' "$FAKE_VMI_LIST_FAIL" >&2; exit 1; fi
+    cat "$FAKE_STATE/vmis.json" || exit 1
+    exit 0
+    ;;
+
+  *"patch virtualmachines.kubevirt.io"*)
+    if [ -n "${FAKE_PATCH_FAIL:-}" ]; then printf '%s\n' "$FAKE_PATCH_FAIL" >&2; exit 1; fi
+    ns=$(arg_after -n "$@")
+    name=$(arg_after virtualmachines.kubevirt.io "$@")
+    patch=$(arg_after -p "$@")
+    # Refuse a stale resourceVersion the way the API server does, then apply
+    # every add op and bump the resourceVersion.
+    rv=$(jq -r --arg ns "$ns" --arg n "$name" \
+      '.items[] | select(.metadata.namespace == $ns and .metadata.name == $n) | .metadata.resourceVersion' \
+      "$FAKE_STATE/vms.json")
+    want=$(printf '%s' "$patch" | jq -r '.[] | select(.op == "test" and .path == "/metadata/resourceVersion") | .value')
+    if [ -z "$want" ] || [ "$want" != "$rv" ]; then
+      printf 'Error from server (Conflict): test failed\n' >&2
+      exit 1
+    fi
+    jq --arg ns "$ns" --arg n "$name" --argjson p "$patch" '
+      .items |= map(
+        if .metadata.namespace == $ns and .metadata.name == $n then
+          reduce ($p[] | select(.op == "add")) as $op (.;
+            setpath($op.path | ltrimstr("/") | split("/"); $op.value))
+          | .metadata.resourceVersion = ((.metadata.resourceVersion | tonumber) + 1 | tostring)
+        else . end)' "$FAKE_STATE/vms.json" > "$FAKE_STATE/vms.json.new"
+    mv "$FAKE_STATE/vms.json.new" "$FAKE_STATE/vms.json"
+    vols=$(jq -r --arg ns "$ns" --arg n "$name" \
+      '.items[] | select(.metadata.namespace == $ns and .metadata.name == $n) | [.spec.template.spec.volumes[].name] | join(",")' \
+      "$FAKE_STATE/vms.json")
+    disks=$(jq -r --arg ns "$ns" --arg n "$name" \
+      '.items[] | select(.metadata.namespace == $ns and .metadata.name == $n) | [.spec.template.spec.domain.devices.disks[].name] | join(",")' \
+      "$FAKE_STATE/vms.json")
+    log "PATCH-VM $ns/$name volumes=$vols disks=$disks"
+    exit 0
+    ;;
+esac
+
+log "UNHANDLED $args"
+printf 'fake kubectl: unmodelled call: %s\n' "$args" >&2
+exit 1
diff --git a/hack/testdata/migration-59-vmi-hotplug/vmis.json b/hack/testdata/migration-59-vmi-hotplug/vmis.json
new file mode 100644
index 0000000000..c7167ccd8d
--- /dev/null
+++ b/hack/testdata/migration-59-vmi-hotplug/vmis.json
@@ -0,0 +1,80 @@
+{"apiVersion":"v1","kind":"List","items":[
+{"apiVersion":"kubevirt.io/v1","kind":"VirtualMachineInstance",
+ "metadata":{"namespace":"tenant-a","name":"worker-old",
+   "ownerReferences":[{"apiVersion":"kubevirt.io/v1","kind":"VirtualMachine","name":"worker-old","uid":"a","controller":true}]},
+ "spec":{
+   "domain":{"devices":{"disks":[
+     {"name":"root","disk":{"bus":"virtio"}},
+     {"name":"pvc-in-spec","disk":{"bus":"scsi"},"serial":"in-spec"},
+     {"name":"pvc-vmi-only","disk":{"bus":"scsi"},"serial":"vmi-only"},
+     {"name":"pvc-claim-only","disk":{"bus":"scsi"},"serial":"claim-only"},
+     {"name":"cloudinit","disk":{"bus":"virtio"}}]}},
+   "volumes":[
+     {"name":"root","dataVolume":{"name":"worker-old-root"}},
+     {"name":"pvc-in-spec","dataVolume":{"name":"pvc-in-spec","hotpluggable":true}},
+     {"name":"pvc-vmi-only","dataVolume":{"name":"pvc-vmi-only","hotpluggable":true}},
+     {"name":"pvc-claim-only","persistentVolumeClaim":{"claimName":"pvc-claim-only","hotpluggable":true}},
+     {"name":"cloudinit","cloudInitNoCloud":{"userData":"#cloud-config"}}]},
+ "status":{"phase":"Running","volumeStatus":[
+   {"name":"pvc-vmi-only","hotplugVolume":{"attachPodName":"hp-a"}},
+   {"name":"pvc-claim-only","hotplugVolume":{"attachPodName":"hp-a"}}]}},
+{"apiVersion":"kubevirt.io/v1","kind":"VirtualMachineInstance",
+ "metadata":{"namespace":"tenant-b","name":"worker-new",
+   "ownerReferences":[{"apiVersion":"kubevirt.io/v1","kind":"VirtualMachine","name":"worker-new","uid":"b","controller":true}]},
+ "spec":{
+   "domain":{"devices":{"disks":[
+     {"name":"root","disk":{"bus":"virtio"}},
+     {"name":"pvc-b","disk":{"bus":"scsi"},"serial":"b"}]}},
+   "volumes":[
+     {"name":"root","dataVolume":{"name":"worker-new-root"}},
+     {"name":"pvc-b","dataVolume":{"name":"pvc-b","hotpluggable":true}}]},
+ "status":{"phase":"Running"}},
+{"apiVersion":"kubevirt.io/v1","kind":"VirtualMachineInstance",
+ "metadata":{"namespace":"tenant-c","name":"orphan"},
+ "spec":{
+   "domain":{"devices":{"disks":[{"name":"pvc-c","disk":{"bus":"scsi"}}]}},
+   "volumes":[{"name":"pvc-c","dataVolume":{"name":"pvc-c","hotpluggable":true}}]},
+ "status":{"phase":"Running"}},
+{"apiVersion":"kubevirt.io/v1","kind":"VirtualMachineInstance",
+ "metadata":{"namespace":"tenant-f","name":"worker-gone",
+   "ownerReferences":[{"apiVersion":"kubevirt.io/v1","kind":"VirtualMachine","name":"worker-gone","uid":"f","controller":true}]},
+ "spec":{
+   "domain":{"devices":{"disks":[{"name":"pvc-f","disk":{"bus":"scsi"}}]}},
+   "volumes":[{"name":"pvc-f","dataVolume":{"name":"pvc-f","hotpluggable":true}}]},
+ "status":{"phase":"Running"}},
+{"apiVersion":"kubevirt.io/v1","kind":"VirtualMachineInstance",
+ "metadata":{"namespace":"tenant-e","name":"worker-ref",
+   "ownerReferences":[{"apiVersion":"kubevirt.io/v1","kind":"VirtualMachine","name":"worker-ref","uid":"e"}]},
+ "spec":{
+   "domain":{"devices":{"disks":[{"name":"pvc-e","disk":{"bus":"scsi"}}]}},
+   "volumes":[{"name":"pvc-e","dataVolume":{"name":"pvc-e","hotpluggable":true}}]},
+ "status":{"phase":"Running"}},
+{"apiVersion":"kubevirt.io/v1","kind":"VirtualMachineInstance",
+ "metadata":{"namespace":"tenant-d","name":"worker-disk",
+   "ownerReferences":[{"apiVersion":"kubevirt.io/v1","kind":"VirtualMachine","name":"worker-disk","uid":"d","controller":true}]},
+ "spec":{
+   "domain":{"devices":{"disks":[
+     {"name":"root","disk":{"bus":"virtio"}},
+     {"name":"pvc-d","disk":{"bus":"scsi"},"serial":"d"}]}},
+   "volumes":[
+     {"name":"root","dataVolume":{"name":"worker-disk-root"}},
+     {"name":"pvc-d","dataVolume":{"name":"pvc-d","hotpluggable":true}}]},
+ "status":{"phase":"Running"}},
+{"apiVersion":"kubevirt.io/v1","kind":"VirtualMachineInstance",
+ "metadata":{"namespace":"tenant-g","name":"worker-failed",
+   "ownerReferences":[{"apiVersion":"kubevirt.io/v1","kind":"VirtualMachine","name":"worker-failed","uid":"g","controller":true}]},
+ "spec":{
+   "domain":{"devices":{"disks":[
+     {"name":"root","disk":{"bus":"virtio"}},
+     {"name":"pvc-g","disk":{"bus":"scsi"},"serial":"g"}]}},
+   "volumes":[
+     {"name":"root","dataVolume":{"name":"worker-failed-root"}},
+     {"name":"pvc-g","dataVolume":{"name":"pvc-g","hotpluggable":true}}]},
+ "status":{"phase":"Failed"}},
+{"apiVersion":"kubevirt.io/v1","kind":"VirtualMachineInstance",
+ "metadata":{"namespace":"tenant-h","name":"worker-pending",
+   "ownerReferences":[{"apiVersion":"kubevirt.io/v1","kind":"VirtualMachine","name":"worker-pending","uid":"h","controller":true}]},
+ "spec":{
+   "domain":{"devices":{"disks":[{"name":"pvc-h","disk":{"bus":"scsi"}}]}},
+   "volumes":[{"name":"pvc-h","dataVolume":{"name":"pvc-h","hotpluggable":true}}]}}
+]}
diff --git a/hack/testdata/migration-59-vmi-hotplug/vms.json b/hack/testdata/migration-59-vmi-hotplug/vms.json
new file mode 100644
index 0000000000..92b586f625
--- /dev/null
+++ b/hack/testdata/migration-59-vmi-hotplug/vms.json
@@ -0,0 +1,45 @@
+{"apiVersion":"v1","kind":"List","items":[
+{"apiVersion":"kubevirt.io/v1","kind":"VirtualMachine",
+ "metadata":{"namespace":"tenant-a","name":"worker-old","resourceVersion":"100"},
+ "spec":{"template":{"spec":{
+   "domain":{"devices":{"disks":[
+     {"name":"root","disk":{"bus":"virtio"}},
+     {"name":"pvc-in-spec","disk":{"bus":"scsi"},"serial":"in-spec"}]}},
+   "volumes":[
+     {"name":"root","dataVolume":{"name":"worker-old-root"}},
+     {"name":"pvc-in-spec","dataVolume":{"name":"pvc-in-spec","hotpluggable":true}}]}}}},
+{"apiVersion":"kubevirt.io/v1","kind":"VirtualMachine",
+ "metadata":{"namespace":"tenant-b","name":"worker-new","resourceVersion":"200"},
+ "spec":{"template":{"spec":{
+   "domain":{"devices":{"disks":[
+     {"name":"root","disk":{"bus":"virtio"}},
+     {"name":"pvc-b","disk":{"bus":"scsi"},"serial":"b"}]}},
+   "volumes":[
+     {"name":"root","dataVolume":{"name":"worker-new-root"}},
+     {"name":"pvc-b","dataVolume":{"name":"pvc-b","hotpluggable":true}}]}}}},
+{"apiVersion":"kubevirt.io/v1","kind":"VirtualMachine",
+ "metadata":{"namespace":"tenant-e","name":"worker-ref","resourceVersion":"500"},
+ "spec":{"template":{"spec":{
+   "domain":{"devices":{"disks":[]}},
+   "volumes":[]}}}},
+{"apiVersion":"kubevirt.io/v1","kind":"VirtualMachine",
+ "metadata":{"namespace":"tenant-d","name":"worker-disk","resourceVersion":"400"},
+ "spec":{"template":{"spec":{
+   "domain":{"devices":{"disks":[
+     {"name":"root","disk":{"bus":"virtio"}},
+     {"name":"pvc-d","disk":{"bus":"scsi"},"serial":"d"}]}},
+   "volumes":[
+     {"name":"root","dataVolume":{"name":"worker-disk-root"}}]}}}},
+{"apiVersion":"kubevirt.io/v1","kind":"VirtualMachine",
+ "metadata":{"namespace":"tenant-g","name":"worker-failed","resourceVersion":"700"},
+ "spec":{"template":{"spec":{
+   "domain":{"devices":{"disks":[
+     {"name":"root","disk":{"bus":"virtio"}}]}},
+   "volumes":[
+     {"name":"root","dataVolume":{"name":"worker-failed-root"}}]}}}},
+{"apiVersion":"kubevirt.io/v1","kind":"VirtualMachine",
+ "metadata":{"namespace":"tenant-h","name":"worker-pending","resourceVersion":"800"},
+ "spec":{"template":{"spec":{
+   "domain":{"devices":{"disks":[]}},
+   "volumes":[]}}}}
+]}
diff --git a/hack/testdata/migration-seaweedfs-db/kubectl b/hack/testdata/migration-seaweedfs-db/kubectl
new file mode 100755
index 0000000000..dba02f54bf
--- /dev/null
+++ b/hack/testdata/migration-seaweedfs-db/kubectl
@@ -0,0 +1,101 @@
+#!/bin/sh
+# Fake kubectl for hack/migration-seaweedfs-db-adopt.bats. It serves only the
+# calls lib/seaweedfs-db-adopt.sh makes; behaviour is driven by FAKE_* env and
+# every invocation is appended to $FAKE_CMDLOG so the test can assert on which
+# namespaces were acted on and with which annotations.
+#
+#   FAKE_CMDLOG    file to append a one-line record of each call to
+#   FAKE_CLUSTERS  newline list of "<ns> <release-name> <resource-policy>" — one
+#                  per namespace holding a Cluster/seaweedfs-db. Use "-" for
+#                  either annotation to model it being ABSENT (jsonpath prints
+#                  nothing and exits 0).
+#   FAKE_LIST_FAIL      non-empty => the -A fleet scan exits 1 with this as stderr
+#   FAKE_GET_FAIL       non-empty => the per-namespace get exits 1 with this stderr
+#   FAKE_ANNOTATE_FAIL  non-empty => `annotate` exits 1 (a failed hand-over)
+#
+# The failure knobs exist because the point of the helper is that a kubectl error
+# must ABORT the migration rather than let it stamp the version and never run
+# again. A fake that can only succeed cannot test that.
+set -u
+
+log() { [ -n "${FAKE_CMDLOG:-}" ] && printf '%s\n' "$*" >> "$FAKE_CMDLOG"; }
+log "KUBECTL $*"
+
+args="$*"
+
+# arg_after KEY -- echoes the token following KEY in the argument vector.
+arg_after() { k="$1"; shift; p=""; for a in "$@"; do [ "$p" = "$k" ] && { printf '%s' "$a"; return; }; p="$a"; done; }
+
+# field <ns> <rel|keep> -- echo that annotation for the FAKE_CLUSTERS row of ns.
+field() {
+  printf '%s\n' "${FAKE_CLUSTERS:-}" | while read -r n rel keep; do
+    if [ "$n" = "$1" ]; then
+      case "$2" in
+        rel)  [ "${rel:--}" = "-" ]  || printf '%s' "$rel" ;;
+        keep) [ "${keep:--}" = "-" ] || printf '%s' "$keep" ;;
+      esac
+      break
+    fi
+  done
+}
+
+case "$args" in
+  # Version stamp: kubectl apply --filename -
+  *"apply --filename -"*)
+    manifest=$(cat)
+    # Record the version actually stamped. A migration that stamped the wrong
+    # number would loop the runner forever, and asserting a bare "STAMP" would
+    # not notice.
+    v=$(printf '%s\n' "$manifest" | sed -n 's/^  version: "\{0,1\}\([0-9]\{1,\}\)"\{0,1\}$/\1/p' | head -1)
+    log "STAMP ${v:-unknown}"
+    exit 0
+    ;;
+
+  # Fleet scan: list namespaces holding a Cluster named seaweedfs-db.
+  *"get cluster.postgresql.cnpg.io -A"*)
+    if [ -n "${FAKE_LIST_FAIL:-}" ]; then
+      printf '%s\n' "$FAKE_LIST_FAIL" >&2
+      exit 1
+    fi
+    printf '%s\n' "${FAKE_CLUSTERS:-}" | while read -r ns rel keep; do
+      [ -n "$ns" ] && printf '%s\n' "$ns"
+    done
+    exit 0
+    ;;
+
+  # Per-namespace read of an annotation.
+  *"get cluster.postgresql.cnpg.io seaweedfs-db"*)
+    if [ -n "${FAKE_GET_FAIL:-}" ]; then
+      printf '%s\n' "$FAKE_GET_FAIL" >&2
+      exit 1
+    fi
+    ns=$(arg_after -n "$@")
+    case "$args" in
+      *"resource-policy"*) field "$ns" keep ;;
+      *)                   field "$ns" rel ;;
+    esac
+    exit 0
+    ;;
+
+  # The hand-over itself.
+  *"annotate cluster.postgresql.cnpg.io seaweedfs-db"*)
+    if [ -n "${FAKE_ANNOTATE_FAIL:-}" ]; then
+      printf '%s\n' "$FAKE_ANNOTATE_FAIL" >&2
+      exit 1
+    fi
+    ns=$(arg_after -n "$@")
+    rel=""
+    keep=""
+    for a in "$@"; do
+      case "$a" in
+        meta.helm.sh/release-name=*) rel="${a#meta.helm.sh/release-name=}" ;;
+        helm.sh/resource-policy=*)   keep="${a#helm.sh/resource-policy=}" ;;
+      esac
+    done
+    log "ANNOTATE $ns release-name=${rel:-<unset>} resource-policy=${keep:-<unset>}"
+    exit 0
+    ;;
+esac
+
+log "UNHANDLED $args"
+exit 0
diff --git a/hack/testdata/needs-semantics.yaml b/hack/testdata/needs-semantics.yaml
new file mode 100644
index 0000000000..762377a12b
--- /dev/null
+++ b/hack/testdata/needs-semantics.yaml
@@ -0,0 +1,36 @@
+# Fixture for hack/release-changelog-behaviour.bats: proves, by RUNNING it, the
+# GitHub Actions semantics promote-rc.yaml depends on — that a job needing a
+# FAILED job still runs when its `if:` gates only on a different, successful one.
+# Mirrors the promote / changelog / open-pr shapes exactly.
+name: needs-semantics-fixture
+on: [push]
+jobs:
+  promote:
+    runs-on: ubuntu-latest
+    outputs:
+      stable_version: ${{ steps.p.outputs.stable_version }}
+    steps:
+      - id: p
+        run: echo "stable_version=1.6.0" >> "$GITHUB_OUTPUT"
+
+  changelog:
+    runs-on: ubuntu-latest
+    outputs:
+      present: ${{ steps.v.outputs.present }}
+    steps:
+      # Stands in for `npm i -g @github/copilot` failing: a fatal step in the
+      # changelog job that is NOT the continue-on-error AI step.
+      - run: exit 1
+      - id: v
+        run: echo "present=true" >> "$GITHUB_OUTPUT"
+
+  open-pr:
+    runs-on: ubuntu-latest
+    needs: [promote, changelog]
+    if: ${{ !cancelled() && needs.promote.result == 'success' }}
+    steps:
+      - run: |
+          echo "OPEN_PR_RAN=yes"
+          echo "changelog_result=${{ needs.changelog.result }}"
+          echo "changelog_present=[${{ needs.changelog.outputs.present }}]"
+          echo "stable_version=[${{ needs.promote.outputs.stable_version }}]"
diff --git a/hack/testdata/render-fixtures/README.md b/hack/testdata/render-fixtures/README.md
new file mode 100644
index 0000000000..adfc24f2eb
--- /dev/null
+++ b/hack/testdata/render-fixtures/README.md
@@ -0,0 +1,27 @@
+# Render fixtures
+
+`hack/check-render-matrix.sh` renders every app chart with its defaults plus these injected values. helm-unittest renders the templates selected by each suite, so a chart with passing unit tests can still have an untested template that fails to render. This sweep checks that Helm accepts the rendered YAML; it does not validate Kubernetes schemas or runtime behavior.
+
+The source of `_cluster` is `packages/core/platform/templates/apps.yaml`; `_namespace` comes from `packages/apps/tenant/templates/namespace.yaml`. These fixtures model selected install states, not a complete copy of every platform setting. Top-level scalar values in these maps are strings, including booleans. Charts such as tenant compare `oidc-enabled` with `"true"`, so a YAML boolean has the wrong type.
+
+`scheduling` and `branding` are maps copied with `toYaml`, which preserves their nested types. The scheduling keys read by app charts have a more specific contract: `globalAppTopologySpreadConstraints` is a string containing YAML (or an empty string), and `dedicatedNodesForWindowsVMs` is compared with the string `"true"`. The configured and wildcard fixtures supply a topology constraint; fresh leaves it empty. The embedded YAML retains numeric fields such as `maxSkew`.
+
+`_namespace.<service>` contains the namespace providing the shared service, or an empty string when unavailable. A non-empty value enables the service-dependent templates in the Kubernetes chart. These states use ingress rather than Gateway API, so `gateway` stays empty: a non-empty gateway would disable Harbor Ingress and leave the certificate modes untested.
+
+| File | State |
+|---|---|
+| `fresh.yaml` | OIDC off, no certificates or shared services, no topology constraint |
+| `configured.yaml` | OIDC on, per-host ACME via http01, shared services and topology constraint |
+| `wildcard.yaml` | OIDC on, dns01 with a platform-issued wildcard certificate, shared services and topology constraint |
+
+Each chart is attempted under every fixture. `vm-instance` and `kubernetes-nodes` require a `VirtualMachineClusterInstancetype` lookup on their defaults. The sweep accepts their skip only while every fixture fails with the recorded lookup diagnostic; a successful render or a different error fails the sweep. For kubernetes-nodes it supplies a parent cluster and matching release name first. For tenant it declares the Keycloak API with `--api-versions v1.edp.epam.com/v1`, allowing OIDC-enabled fixtures to render the realm groups.
+
+`lookup` returns an empty result during this check. Tests for existing objects belong in chart-specific helm-unittest suites using `kubernetesProvider`; `packages/apps/clickhouse/tests/backup_api_password_persistence_test.yaml` covers both password generation and preservation that way. Presets, replica counts and other app feature toggles are outside this sweep.
+
+The BATS suite checks fixture types with the small Helm chart in `validator/`, using `--set-file` so explicit nulls are not removed by Helm's values merge. Separate assertions check PostgreSQL topology constraints, tenant OIDC groups, the Kubernetes metrics-server HelmRelease and Harbor per-host ACME versus wildcard TLS. Pairwise comparison of complete tenant renders detects duplicate fixture states, and a second render of each state checks that randomness cannot satisfy that comparison. The branch assertions are needed because tenant also copies injected values into a Secret, so different output alone does not prove a conditional resource was rendered.
+
+When adding an injected value read by an app, update the relevant states and add an assertion for the branch it exercises. Review all read forms, including `index`, `get` and `dig`, before deciding a value is unused:
+
+```sh
+grep -rn -e '_cluster' -e '_namespace' packages/apps/*/templates/
+```
diff --git a/hack/testdata/render-fixtures/configured.yaml b/hack/testdata/render-fixtures/configured.yaml
new file mode 100644
index 0000000000..1417de8fcb
--- /dev/null
+++ b/hack/testdata/render-fixtures/configured.yaml
@@ -0,0 +1,30 @@
+# OIDC on, per-host ACME through http01, services exposed. The other side of the
+# branches fresh.yaml leaves off.
+_cluster:
+  root-host: "example.org"
+  bundle-name: "paas-full"
+  solver: "http01"
+  issuer-name: "letsencrypt-prod"
+  wildcard-secret-name: ""
+  wildcard-issue: "false"
+  oidc-enabled: "true"
+  oidc-insecure-skip-verify: "false"
+  keycloak-internal-url: "https://keycloak.cozy-keycloak.svc.cluster.local"
+  extra-keycloak-redirect-uri-for-dashboard: ""
+  expose-ingress: "tenant-root"
+  expose-services: "tenant-root"
+  cluster-domain: "cluster.local"
+  scheduling:
+    dedicatedNodesForWindowsVMs: "false"
+    globalAppTopologySpreadConstraints: |
+      topologySpreadConstraints:
+      - maxSkew: 1
+        topologyKey: topology.kubernetes.io/zone
+        whenUnsatisfiable: ScheduleAnyway
+_namespace:
+  etcd: "tenant-test"
+  ingress: "tenant-test"
+  gateway: ""
+  monitoring: "tenant-test"
+  seaweedfs: "tenant-test"
+  host: "example.org"
diff --git a/hack/testdata/render-fixtures/fresh.yaml b/hack/testdata/render-fixtures/fresh.yaml
new file mode 100644
index 0000000000..f056daf5a4
--- /dev/null
+++ b/hack/testdata/render-fixtures/fresh.yaml
@@ -0,0 +1,25 @@
+# A cluster right after install: nothing configured yet.
+_cluster:
+  root-host: "example.org"
+  bundle-name: "paas-full"
+  solver: ""
+  issuer-name: ""
+  wildcard-secret-name: ""
+  wildcard-issue: "false"
+  oidc-enabled: "false"
+  oidc-insecure-skip-verify: "false"
+  keycloak-internal-url: ""
+  extra-keycloak-redirect-uri-for-dashboard: ""
+  expose-ingress: ""
+  expose-services: ""
+  cluster-domain: "cluster.local"
+  scheduling:
+    dedicatedNodesForWindowsVMs: "false"
+    globalAppTopologySpreadConstraints: ""
+_namespace:
+  etcd: ""
+  ingress: ""
+  gateway: ""
+  monitoring: ""
+  seaweedfs: ""
+  host: "example.org"
diff --git a/hack/testdata/render-fixtures/validator/Chart.yaml b/hack/testdata/render-fixtures/validator/Chart.yaml
new file mode 100644
index 0000000000..f46c7cc964
--- /dev/null
+++ b/hack/testdata/render-fixtures/validator/Chart.yaml
@@ -0,0 +1,4 @@
+apiVersion: v2
+name: render-fixture-validator
+version: 0.0.0
+type: application
diff --git a/hack/testdata/render-fixtures/validator/templates/check.yaml b/hack/testdata/render-fixtures/validator/templates/check.yaml
new file mode 100644
index 0000000000..2648055e99
--- /dev/null
+++ b/hack/testdata/render-fixtures/validator/templates/check.yaml
@@ -0,0 +1,32 @@
+{{- /* Parse raw fixture YAML: merging values would silently remove null keys. */ -}}
+{{- $fixture := .Values.fixture | fromYaml -}}
+{{- if hasKey $fixture "Error" -}}
+  {{- fail (get $fixture "Error") -}}
+{{- end -}}
+{{- range $section := list "_cluster" "_namespace" -}}
+  {{- $values := get $fixture $section -}}
+  {{- if or (not (kindIs "map" $values)) (empty $values) -}}
+    {{- fail (printf "%s must be a non-empty map" $section) -}}
+  {{- end -}}
+  {{- range $key, $value := $values -}}
+    {{- if and (eq $section "_cluster") (has $key (list "scheduling" "branding")) -}}
+      {{- if not (kindIs "map" $value) -}}
+        {{- fail (printf "%s.%s must be a map" $section $key) -}}
+      {{- end -}}
+    {{- else if not (kindIs "string" $value) -}}
+      {{- fail (printf "%s.%s must be a string" $section $key) -}}
+    {{- end -}}
+  {{- end -}}
+{{- end -}}
+{{- $scheduling := get $fixture._cluster "scheduling" -}}
+{{- if not (kindIs "map" $scheduling) -}}
+  {{- fail "_cluster.scheduling must be a map" -}}
+{{- end -}}
+{{- range $key := list "globalAppTopologySpreadConstraints" "dedicatedNodesForWindowsVMs" -}}
+  {{- if not (hasKey $scheduling $key) -}}
+    {{- fail (printf "_cluster.scheduling.%s is missing" $key) -}}
+  {{- end -}}
+  {{- if not (kindIs "string" (get $scheduling $key)) -}}
+    {{- fail (printf "_cluster.scheduling.%s must be a string" $key) -}}
+  {{- end -}}
+{{- end -}}
diff --git a/hack/testdata/render-fixtures/wildcard.yaml b/hack/testdata/render-fixtures/wildcard.yaml
new file mode 100644
index 0000000000..895ec38732
--- /dev/null
+++ b/hack/testdata/render-fixtures/wildcard.yaml
@@ -0,0 +1,30 @@
+# dns01 with a platform-issued wildcard certificate: the path where charts stop
+# doing per-host ACME and use the ingress controller default certificate.
+_cluster:
+  root-host: "example.org"
+  bundle-name: "paas-full"
+  solver: "dns01"
+  issuer-name: "letsencrypt-prod"
+  wildcard-secret-name: "wildcard-tls"
+  wildcard-issue: "true"
+  oidc-enabled: "true"
+  oidc-insecure-skip-verify: "false"
+  keycloak-internal-url: "https://keycloak.cozy-keycloak.svc.cluster.local"
+  extra-keycloak-redirect-uri-for-dashboard: ""
+  expose-ingress: "tenant-root"
+  expose-services: "tenant-root"
+  cluster-domain: "cluster.local"
+  scheduling:
+    dedicatedNodesForWindowsVMs: "false"
+    globalAppTopologySpreadConstraints: |
+      topologySpreadConstraints:
+      - maxSkew: 1
+        topologyKey: topology.kubernetes.io/zone
+        whenUnsatisfiable: ScheduleAnyway
+_namespace:
+  etcd: "tenant-test"
+  ingress: "tenant-test"
+  gateway: ""
+  monitoring: "tenant-test"
+  seaweedfs: "tenant-test"
+  host: "example.org"
diff --git a/hack/testdata/run-migrations/kubectl b/hack/testdata/run-migrations/kubectl
new file mode 100755
index 0000000000..a230e32536
--- /dev/null
+++ b/hack/testdata/run-migrations/kubectl
@@ -0,0 +1,37 @@
+#!/bin/sh
+# Fake kubectl for hack/run-migrations.bats. It serves the three calls
+# run-migrations.sh and lib/cozystack-version.sh make against the
+# cozystack-version ConfigMap, backed by a state file so a stamp made by one
+# pod is what the next pod reads.
+#
+#   FAKE_STATE      file holding the stamped version; absent => no ConfigMap
+#   FAKE_READ_FAIL  non-empty => reading .data.version exits 1 with this stderr
+#   FAKE_EXIST_FAIL non-empty => the existence check exits 1 with this stderr,
+#                   --ignore-not-found or not, as a real non-NotFound error does
+set -u
+
+case "$*" in
+  *"apply --filename -"*)
+    v=$(sed -n 's/^  version: "\([0-9]*\)"$/\1/p')
+    [ -n "$v" ] || { echo "fake kubectl: no version in the applied manifest" >&2; exit 1; }
+    printf '%s' "$v" > "$FAKE_STATE"
+    ;;
+  *"get configmap"*"cozystack-version"*"jsonpath"*)
+    if [ -n "${FAKE_READ_FAIL:-}" ]; then echo "$FAKE_READ_FAIL" >&2; exit 1; fi
+    [ -f "$FAKE_STATE" ] || { echo 'Error from server (NotFound): configmaps "cozystack-version" not found' >&2; exit 1; }
+    cat "$FAKE_STATE"
+    ;;
+  *"get configmap"*"cozystack-version"*)
+    if [ -n "${FAKE_EXIST_FAIL:-}" ]; then echo "$FAKE_EXIST_FAIL" >&2; exit 1; fi
+    if [ ! -f "$FAKE_STATE" ]; then
+      case "$*" in *--ignore-not-found*) exit 0 ;; esac
+      echo 'Error from server (NotFound): configmaps "cozystack-version" not found' >&2
+      exit 1
+    fi
+    echo "configmap/cozystack-version"
+    ;;
+  *)
+    echo "fake kubectl: unexpected call: $*" >&2
+    exit 1
+    ;;
+esac
diff --git a/hack/testdata/run-migrations/migration b/hack/testdata/run-migrations/migration
new file mode 100755
index 0000000000..9deef7bef0
--- /dev/null
+++ b/hack/testdata/run-migrations/migration
@@ -0,0 +1,10 @@
+#!/bin/sh
+# Stand-in for a platform migration, copied to /migrations/<n> by
+# hack/run-migrations.bats: it records that it ran and stamps n+1 through the
+# real helper, or fails before stamping when FAKE_FAIL_AT names it.
+set -eu
+. "$(dirname "$0")/lib/cozystack-version.sh"
+n=$(basename "$0")
+echo "$n" >> /work/ran
+[ "${FAKE_FAIL_AT:-}" != "$n" ] || exit 1
+stamp_cozystack_version $((n + 1))
diff --git a/hack/tracing-central-credentials.bats b/hack/tracing-central-credentials.bats
new file mode 100644
index 0000000000..63b0bfebbf
--- /dev/null
+++ b/hack/tracing-central-credentials.bats
@@ -0,0 +1,31 @@
+#!/usr/bin/env bats
+# The central traces collector reads its vmauth password at start and is rolled
+# by a checksum of it. On a first install the password is random, and it is
+# rendered twice, into the Secret and into that checksum: if the two renders
+# disagree, the collector rolls on every reconcile and the checksum proves
+# nothing. helm-unittest asserts one template at a time and cannot compare them,
+# so this renders both together and compares.
+#
+# Run from the repo root: bats hack/tracing-central-credentials.bats.
+
+load test_helper
+
+MONITORING_CHART=packages/system/monitoring
+
+@test "a first install hashes the same password it stores" {
+  out=$(mktemp -d)
+  for run in 1 2 3; do
+    helm template monitoring "$MONITORING_CHART" --namespace tenant-foo \
+      --show-only templates/vtraces/central-credentials.yaml \
+      --show-only templates/vtraces/collector.yaml \
+      --set _namespace.tracingCentral=true --set _namespace.host=example.org \
+      > "$out/render-$run.yaml"
+    password=$(yq eval 'select(.kind == "Secret" and .metadata.name == "traces-central-credentials") | .stringData.password' "$out/render-$run.yaml")
+    checksum=$(yq eval 'select(.kind == "Deployment") | .spec.template.metadata.annotations["checksum/credentials"]' "$out/render-$run.yaml")
+    # Separate commands: under set -e a failure on the left of && is not fatal.
+    [ -n "$password" ]
+    [ "$password" != "null" ]
+    [ "$(printf '%s' "$password" | sha256sum | cut -d' ' -f1)" = "$checksum" ]
+  done
+  rm -rf "$out"
+}
diff --git a/hack/unit-lane-no-cluster.bats b/hack/unit-lane-no-cluster.bats
new file mode 100644
index 0000000000..5899ba3a5d
--- /dev/null
+++ b/hack/unit-lane-no-cluster.bats
@@ -0,0 +1,59 @@
+#!/usr/bin/env bats
+# The unit and controller targets of the root Makefile must reach no cluster,
+# whatever the caller's environment points at. A stub written as a shell
+# function does not survive `timeout`, `env`, `xargs` or a fresh `bash -c`,
+# which exec the real binary from PATH, so the guard has to sit where the
+# whole lane inherits it rather than in each test.
+#
+# The test drives the real root Makefile from a miniature tree with a hostile
+# environment: a kubeconfig path and an in-cluster service host that must not
+# arrive. Each recipe in the lane is replaced by an echo of what it was given.
+#
+# Requires: make.
+
+load test_helper
+
+REPO_ROOT="$(cd "$(dirname "${BATS_TEST_FILENAME}")/.." && pwd)"
+
+@test "every unit-tests prerequisite and test-controllers run on their own with no cluster to reach" {
+  parts=$(sed -n 's/^unit-tests:[[:space:]]*//p' "$REPO_ROOT/Makefile")
+  if [ -z "$parts" ]; then
+    echo "FAIL: no prerequisites read from the unit-tests rule, so nothing below would be checked" >&2
+    false
+  fi
+
+  fixture="$(mktemp -d)"
+  mkdir "$fixture/hack"
+  : >"$fixture/hack/common-envs.mk"
+  : >"$fixture/hack/a.bats"
+  {
+    printf 'include %s/Makefile\n' "$REPO_ROOT"
+    printf '%s test-controllers:\n' "$(printf '%s ' $parts)"
+    printf '\t@echo "$@ KUBECONFIG=$${KUBECONFIG-unset} KUBERNETES_SERVICE_HOST=$${KUBERNETES_SERVICE_HOST-unset}"\n'
+  } >"$fixture/lane.mk"
+
+  # Each one as its own goal, not through unit-tests: a guard set only on
+  # unit-tests reaches its prerequisites through inheritance, and would pass
+  # here while `make bats-unit-tests` on its own ran unguarded. MAKEFLAGS and
+  # MAKELEVEL are dropped so a parent `make unit-tests` lends this run nothing.
+  env -u MAKEFLAGS -u MFLAGS -u MAKELEVEL \
+    KUBECONFIG="$fixture/must-not-be-read" KUBERNETES_SERVICE_HOST=192.0.2.1 KUBERNETES_SERVICE_PORT=443 \
+    make --file=lane.mk --directory="$fixture" $parts test-controllers >"$fixture/out" 2>&1
+  cat "$fixture/out"
+
+  for part in $parts test-controllers; do
+    line=$(grep "^$part " "$fixture/out" || true)
+    case "$line" in
+      "$part KUBECONFIG=/dev/null KUBERNETES_SERVICE_HOST=") ;;
+      "")
+        echo "FAIL: $part did not run" >&2
+        false
+        ;;
+      *)
+        echo "FAIL: $part ran with a cluster to reach: $line" >&2
+        false
+        ;;
+    esac
+  done
+  rm -rf "$fixture"
+}
diff --git a/hack/unit-test-parallelism.bats b/hack/unit-test-parallelism.bats
new file mode 100644
index 0000000000..532dbf4f2d
--- /dev/null
+++ b/hack/unit-test-parallelism.bats
@@ -0,0 +1,37 @@
+#!/usr/bin/env bats
+# Bats owns per-test parallelism; Make also schedules the non-Bats targets.
+
+load test_helper
+
+@test "the Bats invocation receives every discovered unit file exactly once" {
+    tmp=$(mktemp -d)
+    mkdir "$tmp/bin"
+    printf '%s\n' '#!/bin/sh' 'printf "%s\n" "$@" >> "$BATS_ARG_LOG"' > "$tmp/bin/bats"
+    chmod +x "$tmp/bin/bats"
+    expected=$(MAKEFLAGS= MAKELEVEL= make --no-print-directory -s print-bats-unit-files)
+    [ -n "$expected" ]
+    MAKEFLAGS= MAKELEVEL= PATH="$tmp/bin:$PATH" BATS_ARG_LOG="$tmp/args" \
+        make --no-print-directory -s BATS_JOBS=4 "BATS_REPORT_DIR=$tmp/reports" bats-unit-tests
+    actual=$(grep '^hack/.*\.bats$' "$tmp/args")
+    [ "$actual" = "$expected" ] || {
+        echo "Bats did not receive the discovered unit files exactly once" >&2
+        cat "$tmp/args" >&2
+        false
+    }
+    [ "$(sed -n '1,2p' "$tmp/args")" = "$(printf '%s\n' -j 4)" ]
+    rm -rf "$tmp"
+}
+
+@test "PR workflow schedules unit and controller targets with four Make jobs and -k" {
+    # -k is what lets test-controllers start when a unit-tests prerequisite
+    # fails first; without it a red Bats file hides the Go controller suite.
+    grep -qF 'run: make unit-tests test-controllers test-controllers-envtest -j4 -k --output-sync=target' \
+        .github/workflows/pull-requests.yaml || {
+        echo "PR checks do not use the bounded four-slot make invocation" >&2
+        exit 1
+    }
+    [ "$(grep -c 'run: make test-controllers' .github/workflows/pull-requests.yaml)" -eq 0 ] || {
+        echo "controller tests still run in a separate sequential workflow step" >&2
+        exit 1
+    }
+}
diff --git a/hack/update-codegen.sh b/hack/update-codegen.sh
index bd873d6c54..95fcee6321 100755
--- a/hack/update-codegen.sh
+++ b/hack/update-codegen.sh
@@ -24,8 +24,8 @@ SCRIPT_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
 # for `code-generator@vX.Y.Z` and expects exactly one match, so keep
 # the version literal only in CODEGEN_PKG (not duplicated in any
 # comment) — bump both lines together when upgrading.
-CODEGEN_VERSION=v0.34.1
-CODEGEN_PKG=${CODEGEN_PKG:-~/go/pkg/mod/k8s.io/code-generator@v0.34.1}
+CODEGEN_VERSION=v0.37.1
+CODEGEN_PKG=${CODEGEN_PKG:-~/go/pkg/mod/k8s.io/code-generator@v0.37.1}
 
 # Pre-fetch the code-generator module if it is not yet in the local
 # module cache. We intentionally do not declare k8s.io/code-generator
@@ -52,6 +52,7 @@ COZY_CONTROLLER_CRDDIR=packages/system/cozystack-controller/definitions
 COZY_RD_CRDDIR=packages/system/application-definition-crd/definition
 BACKUPS_CORE_CRDDIR=packages/system/backup-controller/definitions
 BACKUPSTRATEGY_CRDDIR=packages/system/backupstrategy-controller/definitions
+MIGRATION_CRDDIR=packages/system/migration-controller/definitions
 
 trap 'rm -rf ${TMPDIR}' EXIT
 
@@ -91,7 +92,7 @@ kube::codegen::gen_client \
     "${SCRIPT_ROOT}/pkg/apis"
 
 $CONTROLLER_GEN object:headerFile="hack/boilerplate.go.txt" paths="./api/..."
-$CONTROLLER_GEN rbac:roleName=manager-role crd paths="./api/v1alpha1/..." paths="./api/backups/..." paths="./api/gateway/..." output:crd:artifacts:config=${TMPDIR}
+$CONTROLLER_GEN rbac:roleName=manager-role crd paths="./api/v1alpha1/..." paths="./api/backups/..." paths="./api/gateway/..." paths="./api/internalapi/..." paths="./api/migration/..." output:crd:artifacts:config=${TMPDIR}
 
 mv ${TMPDIR}/cozystack.io_packages.yaml ${OPERATOR_CRDDIR}/cozystack.io_packages.yaml
 mv ${TMPDIR}/cozystack.io_packagesources.yaml ${OPERATOR_CRDDIR}/cozystack.io_packagesources.yaml
@@ -101,6 +102,7 @@ mv ${TMPDIR}/cozystack.io_applicationdefinitions.yaml \
 
 mv ${TMPDIR}/backups.cozystack.io*.yaml ${BACKUPS_CORE_CRDDIR}/
 mv ${TMPDIR}/strategy.backups.cozystack.io*.yaml ${BACKUPSTRATEGY_CRDDIR}/
+mv ${TMPDIR}/forklift.cozystack.io*.yaml ${MIGRATION_CRDDIR}/
 
 mv ${TMPDIR}/*.yaml ${COZY_CONTROLLER_CRDDIR}/
 
diff --git a/hack/upload-assets.sh b/hack/upload-assets.sh
index 2f7f981302..cdebe00598 100755
--- a/hack/upload-assets.sh
+++ b/hack/upload-assets.sh
@@ -7,11 +7,13 @@ gh release upload --clobber $version _out/assets/cozystack-crds.yaml
 gh release upload --clobber $version _out/assets/cozystack-operator-talos.yaml
 gh release upload --clobber $version _out/assets/cozystack-operator-generic.yaml
 gh release upload --clobber $version _out/assets/cozystack-operator-hosted.yaml
-gh release upload --clobber $version _out/assets/metal-amd64.iso
-gh release upload --clobber $version _out/assets/metal-amd64.raw.xz
-gh release upload --clobber $version _out/assets/nocloud-amd64.raw.xz
-gh release upload --clobber $version _out/assets/kernel-amd64
-gh release upload --clobber $version _out/assets/initramfs-metal-amd64.xz
+for arch in amd64 arm64; do
+  gh release upload --clobber $version _out/assets/metal-$arch.iso
+  gh release upload --clobber $version _out/assets/metal-$arch.raw.xz
+  gh release upload --clobber $version _out/assets/nocloud-$arch.raw.xz
+  gh release upload --clobber $version _out/assets/kernel-$arch
+  gh release upload --clobber $version _out/assets/initramfs-metal-$arch.xz
+done
 gh release upload --clobber $version _out/assets/cozypkg-*.tar.gz
 gh release upload --clobber $version _out/assets/cozypkg-checksums.txt
 gh release upload --clobber $version _out/assets/openapi.json
diff --git a/hack/validate-changelog.sh b/hack/validate-changelog.sh
new file mode 100755
index 0000000000..117391be1c
--- /dev/null
+++ b/hack/validate-changelog.sh
@@ -0,0 +1,62 @@
+#!/bin/sh
+# Usage: hack/validate-changelog.sh <changelog-file> <version-without-v>
+#
+# Decides whether a changelog file is publishable as a GitHub Release body.
+#
+# promote-rc.yaml lets the AI generation step fail (a Copilot outage must never
+# block a release), which means a run can die mid-stream and leave a fragment
+# behind. Without this check that fragment would be committed, advertised as a
+# valid changelog in the promote PR body, and published verbatim by finalize as
+# the release notes — worse than having no changelog, because nobody is told.
+#
+# The assertions are deliberately narrow: only invariants every shipped changelog
+# in docs/changelogs/ actually satisfies. Two forms exist and both are valid —
+# minor releases use `# Cozystack vX.Y.Z`, patch releases use `# vX.Y.Z (date)` —
+# so the header check accepts either. There is deliberately NO line-count floor:
+# v1.5.1 is a complete, shipped, 19-line patch changelog, and a floor set above
+# it would reject good output and mislabel it as a generation failure.
+#
+# The version is checked into the header, the release-link comment and the
+# compare link, so a changelog generated for the wrong version (an rc string, or
+# a stale version carried over from a retry) is caught rather than published.
+#
+# Exit 0 = publishable. Exit 1 = not publishable, with the reason on stderr.
+
+set -eu
+
+CL="${1:?usage: validate-changelog.sh <file> <version>}"
+VERSION="${2:?usage: validate-changelog.sh <file> <version>}"
+
+fail() {
+  echo "$1" >&2
+  exit 1
+}
+
+[ -f "$CL" ] || fail "file absent: $CL"
+[ -s "$CL" ] || fail "file empty: $CL"
+grep -q '[^[:space:]]' "$CL" || fail "file is only whitespace: $CL"
+
+# Both header conventions. \b is not portable in POSIX grep -E, so anchor on
+# "end of line or a non-version character" instead: that keeps v1.5.1 from
+# satisfying a check for v1.5.11.
+grep -qE "^# (Cozystack )?v${VERSION}([^0-9.]|\$)" "$CL" \
+  || fail "missing an H1 for v${VERSION}: expected '# Cozystack v${VERSION}' (minor) or '# v${VERSION} (<date>)' (patch)"
+
+# Leading HTML comment pointing at the release. Present in every shipped
+# changelog and the first thing a truncated write would still have, so on its
+# own it is weak — it is the version check here that earns its keep.
+grep -qF "releases/tag/v${VERSION}" "$CL" \
+  || fail "missing the release-link comment for v${VERSION}"
+
+# A truncated stream loses the tail, so assert something that only exists at the
+# end. The compare link must also name this version, catching a changelog
+# generated against the rc tag or a stale version.
+grep -qE "compare/.*\.\.\.v${VERSION}([^0-9.]|\$)" "$CL" \
+  || fail "missing the 'Full Changelog' compare link ending in v${VERSION} (likely truncated, or generated for the wrong version)"
+
+# At least one section. Distinguishes a real changelog from a header plus a
+# stub line, without assuming which sections a given release happens to have.
+grep -qE '^## ' "$CL" \
+  || fail "no '## ' sections — not a complete changelog"
+
+echo "OK: $CL is publishable as the v${VERSION} release body ($(wc -l < "$CL" | tr -d ' ') lines)"
diff --git a/hack/verify-multiarch.sh b/hack/verify-multiarch.sh
new file mode 100755
index 0000000000..5db960559f
--- /dev/null
+++ b/hack/verify-multiarch.sh
@@ -0,0 +1,180 @@
+#!/bin/sh
+# Fail unless every image the packages tree pins is an index serving both
+# linux/amd64 and linux/arm64.
+#
+# Usage: hack/verify-multiarch.sh [--report] [--allowlist <file>] <packages-root>
+#        hack/verify-multiarch.sh [--report] [--allowlist <file>] --refs-file <file>
+#   --report     print the same list but exit 0, for a tree that is not being
+#                released (the nightly arm64 build runs it against main)
+#   --allowlist  repositories allowed to stay single-arch; defaults to
+#                hack/multiarch-allowlist
+#   --refs-file  check the refs listed in <file>, one per line, instead of a
+#                tree: what an e2e run's nodes actually pulled, which includes
+#                images the tree does not pin by digest. A ref without a digest
+#                is resolved by its tag.
+#
+# A release ships one ref per image to clusters of either architecture, so a
+# ref that resolves to a single-platform manifest, or to an index missing one of
+# the two, installs on one of them and fails to pull on the other. First- and
+# third-party refs are checked alike: an arm64 node pulls both.
+#
+# The allowlist holds one repository per line with a mandatory `# reason`, and
+# no tag or digest, so bumping an allowed image needs no edit. Allowed refs are
+# still listed, under their own heading, and in tree mode an entry that
+# matches no ref that failed the check is named as stale.
+#
+# A registry that answers a lookup with a rate limit or a 5xx is asked again,
+# up to three times, VERIFY_MULTIARCH_RETRY_DELAY seconds (default 10) times
+# the attempt apart; a ref still refused fails as rate-limited, never as
+# single-arch.
+#
+# Exit: 0 all refs pass (or --report), 1 a ref failed, 2 usage or allowlist
+# error. Requires skopeo, jq, and yq (mikefarah) to read a tree.
+set -eu
+
+usage() { echo "usage: verify-multiarch.sh [--report] [--allowlist <file>] <packages-root> | --refs-file <file>" >&2; exit 2; }
+
+report=0
+allowlist="$(dirname "$0")/multiarch-allowlist"
+refs_file=""
+while [ "$#" -gt 0 ]; do
+  case "$1" in
+    --report) report=1; shift ;;
+    --allowlist) [ "$#" -ge 2 ] || usage; allowlist="$2"; shift 2 ;;
+    --refs-file) [ "$#" -ge 2 ] || usage; refs_file="$2"; shift 2 ;;
+    -*) usage ;;
+    *) break ;;
+  esac
+done
+if [ -n "$refs_file" ]; then
+  [ "$#" -eq 0 ] || usage
+  [ -f "$refs_file" ] || { echo "refs file '$refs_file' does not exist" >&2; exit 2; }
+  tools="skopeo jq"
+else
+  [ "$#" -eq 1 ] || usage
+  ROOT="${1%/}"
+  [ -d "$ROOT" ] || { echo "packages-root '$ROOT' is not a directory" >&2; exit 2; }
+  tools="skopeo jq yq"
+fi
+[ -f "$allowlist" ] || { echo "allowlist '$allowlist' does not exist" >&2; exit 2; }
+for _tool in $tools; do
+  command -v "$_tool" >/dev/null || { echo "$_tool is required" >&2; exit 2; }
+done
+
+# shellcheck source=hack/lib/image-refs.sh
+. "$(dirname "$0")/lib/image-refs.sh"
+
+# "<repo> <reason>" per entry.
+allowed="$(sed -E '/^[[:space:]]*(#|$)/d' "$allowlist" | while IFS= read -r _line; do
+  _repo="$(printf '%s' "$_line" | sed -E 's/[[:space:]]*#.*//')"
+  _why="$(printf '%s' "$_line" | sed -nE 's/^[^#]*#[[:space:]]*//p')"
+  if [ -z "$_why" ] || [ -z "$_repo" ]; then
+    echo "::error::allowlist entry '$_line' needs a '# reason'" >&2
+    exit 2
+  fi
+  printf '%s %s\n' "$_repo" "$_why"
+done)" || exit 2
+
+# A ref can sit inside a container argument, such as kamaji's
+# --migrate-image=<ref>. The packages artifact is an OCI artifact with no
+# platform, so it is left out. The enumeration also emits the bare
+# "<tag>@<digest>" or "<repo>@<digest>" half of a split map next to the full
+# ref; such a fragment is dropped when a ref with a host carries its digest, and
+# kept otherwise, so a ref the gate cannot resolve still fails it.
+if [ -n "$refs_file" ]; then
+  refs="$(grep -vE '^[[:space:]]*(#|$)' "$refs_file" | sort -u)" || true
+  [ -n "$refs" ] || { echo "no image refs in ${refs_file}" >&2; exit 2; }
+else
+  refs="$(collect_image_refs "$ROOT" \
+    | sed -E 's/^--[A-Za-z0-9-]+=//' \
+    | grep -vE '/cozystack-packages(:[^@]*)?@' \
+    | sort -u \
+    | awk -F@ '{ ref[NR] = $0; dig[NR] = $2; if ($1 ~ /\//) full[$2] = 1 }
+        END { for (i = 1; i <= NR; i++) if (ref[i] ~ /^[^@]*\// || !(dig[i] in full)) print ref[i] }')" || true
+  [ -n "$refs" ] || { echo "no image refs found under ${ROOT}" >&2; exit 2; }
+fi
+
+bad=""
+ok_single=""
+used=""
+nl='
+'
+while IFS= read -r ref; do
+  name="${ref%@*}"
+  last="${name##*/}"
+  repo="${name%/*}/${last%%:*}"
+  case "$name" in */*) ;; *) repo="${last%%:*}" ;; esac
+  # A registry client rejects a ref carrying both a tag and a digest, so a
+  # digest ref drops its tag; a tag-only ref resolves as written.
+  case "$ref" in
+    *@*) target="${repo}@${ref##*@}" ;;
+    *) target="$ref" ;;
+  esac
+  # A rate limit or a 5xx says nothing about the image, so that answer alone is
+  # retried, a bounded number of times; any other error is deterministic and
+  # fails at once.
+  err="$(mktemp)"
+  try=1
+  while :; do
+    if raw="$(skopeo inspect --raw "docker://${target}" 2>"$err")"; then
+      missing="$(printf '%s' "$raw" | jq -r '
+        if .manifests then
+          [.manifests[].platform | select(.os == "linux") | .architecture] as $a
+          | ["amd64", "arm64"] - $a | map("index without linux/" + .) | join(", ")
+        else "single-platform manifest" end')"
+      break
+    fi
+    if ! grep -qiE 'toomanyrequests|too many requests|status:? (429|5[0-9][0-9])|status code (429|5[0-9][0-9])' "$err"; then
+      missing="cannot read the manifest: $(head -n 1 "$err")"
+      break
+    fi
+    if [ "$try" -ge 3 ]; then
+      missing="rate-limited or unavailable after 3 tries, not checked: $(head -n 1 "$err")"
+      break
+    fi
+    sleep $((try * ${VERIFY_MULTIARCH_RETRY_DELAY:-10}))
+    try=$((try + 1))
+  done
+  rm -f "$err"
+  [ -n "$missing" ] || continue
+  # A ref of an allowlisted repository that failed the check, whatever the
+  # reason, keeps the entry from being stale; the entry excuses a platform
+  # verdict only, since a ref that cannot be read or stays rate-limited is no
+  # more usable on amd64 than on arm64.
+  entry="$(printf '%s\n' "$allowed" | awk -v r="$repo" '$1 == r { $1 = ""; sub(/^ /, ""); print; exit }')"
+  [ -z "$entry" ] || used="${used}${repo}${nl}"
+  why=""
+  case "$missing" in
+    "single-platform manifest"|"index without"*) why="$entry" ;;
+  esac
+  if [ -n "$why" ]; then
+    ok_single="${ok_single}  ${ref}: ${missing} (${why})${nl}"
+  else
+    bad="${bad}  ${ref}: ${missing}${nl}"
+  fi
+done <<EOF
+$refs
+EOF
+
+# Only a tree says an entry is dead. A list of pulled images leaves out every
+# image the run did not pull, allowed ones included.
+stale=""
+if [ -z "$refs_file" ]; then
+  stale="$(printf '%s\n' "$allowed" | awk 'NF { print $1 }' | while IFS= read -r _repo; do
+    printf '%s' "$used" | grep -qxF "$_repo" || printf '  %s\n' "$_repo"
+  done)" || true
+fi
+
+n_bad="$(printf '%s' "$bad" | grep -c . || true)"
+echo "refs that failed (${n_bad}):"
+printf '%s\n' "$bad"
+if [ -n "$ok_single" ]; then
+  echo "allowed single-arch:"
+  printf '%s\n' "$ok_single"
+fi
+if [ -n "$stale" ]; then
+  echo "stale allowlist entries, matching no ref that failed the check:"
+  printf '%s\n\n' "$stale"
+fi
+
+[ "$n_bad" -eq 0 ] || [ "$report" -eq 1 ] || exit 1
diff --git a/hack/verify-multiarch_test.bats b/hack/verify-multiarch_test.bats
new file mode 100644
index 0000000000..655dab8f57
--- /dev/null
+++ b/hack/verify-multiarch_test.bats
@@ -0,0 +1,275 @@
+#!/usr/bin/env bats
+# Tests for hack/verify-multiarch.sh, the release gate that every pinned image
+# is an index serving both linux/amd64 and linux/arm64.
+#
+# The registry is a stub: skopeo on PATH answers `inspect --raw` from one file
+# per digest, so each test decides what every ref resolves to.
+#
+# Harness note: the unit lane runs this file under Bats. The bodies stay POSIX
+# sh (no `run`, no [[ ]]; each @test a shell function under `set -eu`), so
+# hack/cozytest.sh can still run it under dash by hand.
+#
+# Run with: bats hack/verify-multiarch_test.bats
+
+load test_helper
+
+_stub_registry() {
+  MOCK_REG="$1"
+  export MOCK_REG
+  mkdir -p "$MOCK_REG/bin" "$MOCK_REG/blobs"
+  : >"$MOCK_REG/log"
+  : >"$MOCK_REG/tags"
+  cat >"$MOCK_REG/bin/skopeo" <<'EOF'
+#!/bin/sh
+set -eu
+printf 'skopeo %s\n' "$*" >>"$MOCK_REG/log"
+[ "$1 $2" = "inspect --raw" ] || exit 2
+# MOCK_THROTTLE=N: the first N lookups are refused as a rate-limited
+# registry refuses them.
+if [ -n "${MOCK_THROTTLE:-}" ] && [ "$(grep -c 'inspect --raw' "$MOCK_REG/log")" -le "$MOCK_THROTTLE" ]; then
+  echo "Error: reading manifest: toomanyrequests: You have reached your pull rate limit" >&2
+  exit 1
+fi
+r="${3#docker://}"
+case "$r" in
+  *:*@sha256:*) echo "Error: a tag and a digest together: $r" >&2; exit 2 ;;
+  *@sha256:*) ;;
+  # "<repo>:<tag>" resolves through the tags table, as a registry would.
+  *) r="x@$(awk -v r="$r" '$1 == r { d = $2 } END { printf "%s", d }' "$MOCK_REG/tags")" ;;
+esac
+f="$MOCK_REG/blobs/${r##*@sha256:}"
+[ -f "$f" ] || { echo "Error: reading manifest ${r##*@}: manifest unknown" >&2; exit 1; }
+cat "$f"
+EOF
+  chmod +x "$MOCK_REG/bin/skopeo"
+}
+
+# _blob <body> stores a manifest and prints its digest.
+_blob() {
+  hex="$(printf '%s' "$1" | sha256sum | cut -d' ' -f1)"
+  printf '%s' "$1" >"$MOCK_REG/blobs/$hex"
+  printf 'sha256:%s' "$hex"
+}
+
+# _index <arch>... prints the digest of an index with one linux entry per arch,
+# plus the attestation entry buildx adds.
+_index() {
+  entries='{"digest":"sha256:0","platform":{"os":"unknown","architecture":"unknown"}}'
+  for a in "$@"; do
+    entries="$entries,{\"digest\":\"sha256:$a\",\"platform\":{\"os\":\"linux\",\"architecture\":\"$a\"}}"
+  done
+  _blob "{\"mediaType\":\"application/vnd.oci.image.index.v1+json\",\"manifests\":[$entries]}"
+}
+
+_single() {
+  _blob "{\"mediaType\":\"application/vnd.oci.image.manifest.v1+json\",\"config\":{\"mediaType\":\"application/vnd.oci.image.config.v1+json\"},\"name\":\"$1\"}"
+}
+
+# A tree with a string ref, two split-map refs, a ref behind a --flag= prefix,
+# a .tag file and the packages artifact, every image a two-arch index.
+_make_tree() {
+  t="$1/tree"
+  mkdir -p "$t/system/api" "$t/system/cil" "$t/system/lin" "$t/system/kamaji" "$t/apps/kube/images" "$t/core/installer"
+  printf 'image: ghcr.io/cozy/api:v1@%s\n' "$(_index amd64 arm64)" >"$t/system/api/values.yaml"
+  printf 'cilium:\n  image:\n    repository: quay.io/cilium/cilium\n    tag: v1.0\n    digest: %s\n' \
+    "$(_index amd64 arm64)" >"$t/system/cil/values.yaml"
+  # The enumeration also emits this map's bare "v2@<digest>" tag value.
+  printf 'image:\n  repository: ghcr.io/cozy/lin\n  tag: v2@%s\n' "$(_index amd64 arm64)" >"$t/system/lin/values.yaml"
+  printf 'extraArgs:\n  - --migrate-image=ghcr.io/cozy/kamaji:v1@%s\n' "$(_index arm64 amd64)" >"$t/system/kamaji/values.yaml"
+  printf 'ghcr.io/cozy/ubuntu:v1@%s\n' "$(_index amd64 arm64 s390x)" >"$t/apps/kube/images/ubuntu.tag"
+  # Not an image: the gate must not ask it for platforms.
+  printf 'platformSourceUrl: oci://ghcr.io/cozy/cozystack-packages\nplatformSourceRef: digest=%s\n' \
+    "$(_blob '{"mediaType":"application/vnd.oci.image.manifest.v1+json","artifactType":"application/vnd.cncf.flux.config.v1+json"}')" \
+    >"$t/core/installer/values.yaml"
+  : >"$1/allowlist"
+}
+
+@test "a tree of two-arch indexes passes, flag-prefixed refs included" {
+  tmp=$(mktemp -d)
+  _stub_registry "$tmp/reg"
+  _make_tree "$tmp"
+  PATH="$MOCK_REG/bin:$PATH" hack/verify-multiarch.sh --allowlist "$tmp/allowlist" "$tmp/tree" >"$tmp/out"
+  grep -q 'ghcr.io/cozy/kamaji@sha256:' "$MOCK_REG/log"
+  if grep -q 'migrate-image' "$MOCK_REG/log"; then echo "FAIL: the --flag= prefix reached the registry"; false; fi
+  if grep -q 'cozystack-packages' "$MOCK_REG/log"; then echo "FAIL: the packages artifact was inspected"; false; fi
+  # One lookup per image: the bare tag half of the lin map is not a ref.
+  [ "$(grep -c 'inspect --raw' "$MOCK_REG/log")" -eq 5 ]
+  rm -rf "$tmp"
+}
+
+@test "every single-arch ref fails the gate and is named with its reason" {
+  tmp=$(mktemp -d)
+  _stub_registry "$tmp/reg"
+  _make_tree "$tmp"
+  single=$(_single api)
+  amd_only=$(_index amd64)
+  printf 'image: ghcr.io/cozy/api:v1@%s\n' "$single" >"$tmp/tree/system/api/values.yaml"
+  printf 'extraArgs:\n  - --migrate-image=ghcr.io/cozy/kamaji:v1@%s\n' "$amd_only" >"$tmp/tree/system/kamaji/values.yaml"
+  printf 'ghcr.io/cozy/ubuntu:v1@sha256:%s\n' "$(printf 'f%.0s' $(seq 1 64))" >"$tmp/tree/apps/kube/images/ubuntu.tag"
+  # A digest seen only without a host still has to resolve, or fail.
+  printf 'image:\n  tag: v3@sha256:%s\n' "$(printf 'e%.0s' $(seq 1 64))" >"$tmp/tree/system/lin/values.yaml"
+  rc=0
+  PATH="$MOCK_REG/bin:$PATH" hack/verify-multiarch.sh --allowlist "$tmp/allowlist" "$tmp/tree" >"$tmp/out" 2>&1 || rc=$?
+  [ "$rc" -eq 1 ]
+  grep -q "ghcr.io/cozy/api:v1@$single: single-platform manifest" "$tmp/out"
+  grep -q "ghcr.io/cozy/kamaji:v1@$amd_only: index without linux/arm64" "$tmp/out"
+  grep -q "ghcr.io/cozy/ubuntu:v1@sha256:f*: cannot read the manifest" "$tmp/out"
+  grep -q "^  v3@sha256:e*: cannot read the manifest" "$tmp/out"
+  if grep -q 'quay.io/cilium' "$tmp/out"; then echo "FAIL: a passing ref was listed"; false; fi
+
+  # --report prints the same list and does not fail.
+  PATH="$MOCK_REG/bin:$PATH" hack/verify-multiarch.sh --report --allowlist "$tmp/allowlist" "$tmp/tree" >"$tmp/report" 2>&1
+  diff "$tmp/out" "$tmp/report"
+  rm -rf "$tmp"
+}
+
+@test "an allowlisted repository passes as allowed single-arch, and a stale entry is named" {
+  tmp=$(mktemp -d)
+  _stub_registry "$tmp/reg"
+  _make_tree "$tmp"
+  single=$(_single api)
+  printf 'image: ghcr.io/cozy/api:v1@%s\n' "$single" >"$tmp/tree/system/api/values.yaml"
+  printf '# header\n\nghcr.io/cozy/api  # amd64 drivers only\nghcr.io/cozy/gone  # removed image\n' >"$tmp/allowlist"
+  # A stale entry is a warning: the run still exits 0.
+  PATH="$MOCK_REG/bin:$PATH" hack/verify-multiarch.sh --allowlist "$tmp/allowlist" "$tmp/tree" >"$tmp/out" 2>&1
+  grep -q '^refs that failed (0):' "$tmp/out"
+  sed -n '/^allowed single-arch/,/^$/p' "$tmp/out" | grep -q "ghcr.io/cozy/api:v1@$single: single-platform manifest (amd64 drivers only)"
+  sed -n '/^stale allowlist/,/^$/p' "$tmp/out" | grep -q 'ghcr.io/cozy/gone'
+  PATH="$MOCK_REG/bin:$PATH" hack/verify-multiarch.sh --report --allowlist "$tmp/allowlist" "$tmp/tree" >"$tmp/report" 2>&1
+  diff "$tmp/out" "$tmp/report"
+
+  # The entry covers its repository only: another single-arch image still fails.
+  printf 'image: ghcr.io/cozy/other:v1@%s\n' "$(_single other)" >"$tmp/tree/system/cil/values.yaml"
+  rc=0
+  PATH="$MOCK_REG/bin:$PATH" hack/verify-multiarch.sh --allowlist "$tmp/allowlist" "$tmp/tree" >"$tmp/out" 2>&1 || rc=$?
+  [ "$rc" -eq 1 ]
+  sed -n '/^refs that failed/,/^$/p' "$tmp/out" | grep -q 'ghcr.io/cozy/other:v1@'
+  if sed -n '/^refs that failed/,/^$/p' "$tmp/out" | grep -q 'ghcr.io/cozy/api'; then echo "FAIL: the allowlisted ref was counted as a failure"; false; fi
+
+  # The allowlist excuses a platform verdict only. An allowlisted ref that
+  # cannot be read, or stays rate-limited, is broken on amd64 as well.
+  printf 'image: ghcr.io/cozy/other:v1@%s\n' "$(_index amd64 arm64)" >"$tmp/tree/system/cil/values.yaml"
+  printf 'image: ghcr.io/cozy/api:v1@sha256:%s\n' "$(printf 'd%.0s' $(seq 1 64))" >"$tmp/tree/system/api/values.yaml"
+  rc=0
+  PATH="$MOCK_REG/bin:$PATH" hack/verify-multiarch.sh --allowlist "$tmp/allowlist" "$tmp/tree" >"$tmp/out" 2>&1 || rc=$?
+  [ "$rc" -eq 1 ]
+  sed -n '/^refs that failed/,/^$/p' "$tmp/out" | grep -q 'ghcr.io/cozy/api:v1@sha256:d*: cannot read the manifest'
+  if sed -n '/^allowed single-arch/,/^$/p' "$tmp/out" | grep -q 'ghcr.io/cozy/api'; then echo "FAIL: an unreadable ref was allowed"; false; fi
+  if sed -n '/^stale allowlist/,/^$/p' "$tmp/out" | grep -q 'ghcr.io/cozy/api'; then echo "FAIL: a pinned allowlisted repository was called stale"; false; fi
+  : >"$MOCK_REG/log"
+  printf 'image: ghcr.io/cozy/api:v1@%s\n' "$single" >"$tmp/tree/system/api/values.yaml"
+  rc=0
+  PATH="$MOCK_REG/bin:$PATH" MOCK_THROTTLE=99 VERIFY_MULTIARCH_RETRY_DELAY=0 \
+    hack/verify-multiarch.sh --allowlist "$tmp/allowlist" "$tmp/tree" >"$tmp/out" 2>&1 || rc=$?
+  [ "$rc" -eq 1 ]
+  sed -n '/^refs that failed/,/^$/p' "$tmp/out" | grep -q "ghcr.io/cozy/api:v1@$single: rate-limited"
+  if sed -n '/^stale allowlist/,/^$/p' "$tmp/out" | grep -q 'ghcr.io/cozy/api'; then echo "FAIL: a rate-limited allowlisted repository was called stale"; false; fi
+
+  # Once the allowlisted repository's pins all pass, its entry is stale.
+  printf 'image: ghcr.io/cozy/api:v1@%s\n' "$(_index amd64 arm64)" >"$tmp/tree/system/api/values.yaml"
+  PATH="$MOCK_REG/bin:$PATH" hack/verify-multiarch.sh --allowlist "$tmp/allowlist" "$tmp/tree" >"$tmp/out" 2>&1
+  sed -n '/^stale allowlist/,/^$/p' "$tmp/out" | grep -q 'ghcr.io/cozy/api'
+  rm -rf "$tmp"
+}
+
+@test "an allowlist entry without a reason is refused" {
+  tmp=$(mktemp -d)
+  _stub_registry "$tmp/reg"
+  _make_tree "$tmp"
+  printf 'ghcr.io/cozy/api\n' >"$tmp/allowlist"
+  rc=0
+  PATH="$MOCK_REG/bin:$PATH" hack/verify-multiarch.sh --report --allowlist "$tmp/allowlist" "$tmp/tree" >"$tmp/out" 2>&1 || rc=$?
+  [ "$rc" -eq 2 ]
+  grep -q 'ghcr.io/cozy/api.*reason' "$tmp/out"
+  rm -rf "$tmp"
+}
+
+@test "the committed allowlist gives every entry a reason" {
+  [ -f hack/multiarch-allowlist ]
+  if grep -vE '^[[:space:]]*(#|$)' hack/multiarch-allowlist | grep -vE '^[^[:space:]#]+[[:space:]]+#[[:space:]]*[^[:space:]]'; then
+    echo "FAIL: an entry above has no reason comment"; false
+  fi
+}
+
+@test "--refs-file checks a list of refs, tag-only ones resolved by tag" {
+  tmp=$(mktemp -d)
+  _stub_registry "$tmp/reg"
+  : >"$tmp/allowlist"
+  both=$(_index amd64 arm64)
+  printf 'ghcr.io/cozy/multi:v1 %s\n' "$both" >>"$MOCK_REG/tags"
+  single=$(_single one)
+  printf 'ghcr.io/cozy/one:v1 %s\n' "$single" >>"$MOCK_REG/tags"
+  # Duplicates, and the same image reached by tag and by digest, as a node's
+  # image store lists it.
+  printf 'ghcr.io/cozy/multi:v1\nghcr.io/cozy/multi:v1\nghcr.io/cozy/multi@%s\n\n' "$both" >"$tmp/refs"
+  PATH="$MOCK_REG/bin:$PATH" hack/verify-multiarch.sh --allowlist "$tmp/allowlist" --refs-file "$tmp/refs" >"$tmp/out" 2>&1
+  grep -q '^refs that failed (0):' "$tmp/out"
+  [ "$(grep -c 'inspect --raw docker://ghcr.io/cozy/multi:v1$' "$MOCK_REG/log")" -eq 1 ]
+  [ "$(grep -c 'inspect --raw' "$MOCK_REG/log")" -eq 2 ]
+
+  printf 'ghcr.io/cozy/one:v1\n' >>"$tmp/refs"
+  rc=0
+  PATH="$MOCK_REG/bin:$PATH" hack/verify-multiarch.sh --allowlist "$tmp/allowlist" --refs-file "$tmp/refs" >"$tmp/out" 2>&1 || rc=$?
+  [ "$rc" -eq 1 ]
+  grep -q '^  ghcr.io/cozy/one:v1: single-platform manifest$' "$tmp/out"
+  PATH="$MOCK_REG/bin:$PATH" hack/verify-multiarch.sh --report --allowlist "$tmp/allowlist" --refs-file "$tmp/refs" >"$tmp/report" 2>&1
+  diff "$tmp/out" "$tmp/report"
+
+  # The allowlist applies to a list of refs as it does to a tree. An entry that
+  # matches nothing is not stale here: a list of pulled images is not the tree,
+  # and an image the run never pulled says nothing about the entry.
+  printf 'ghcr.io/cozy/one  # amd64 drivers only\nghcr.io/cozy/unpulled  # never pulled here\n' >"$tmp/allowlist"
+  PATH="$MOCK_REG/bin:$PATH" hack/verify-multiarch.sh --allowlist "$tmp/allowlist" --refs-file "$tmp/refs" >"$tmp/out" 2>&1
+  sed -n '/^allowed single-arch/,/^$/p' "$tmp/out" | grep -q 'ghcr.io/cozy/one:v1: single-platform manifest (amd64 drivers only)'
+  if grep -q 'stale' "$tmp/out"; then echo "FAIL: --refs-file reported a stale entry"; false; fi
+
+  # An empty list is an error, not a pass: the collection produced nothing.
+  : >"$tmp/empty"
+  rc=0
+  PATH="$MOCK_REG/bin:$PATH" hack/verify-multiarch.sh --report --allowlist "$tmp/allowlist" --refs-file "$tmp/empty" >"$tmp/out" 2>&1 || rc=$?
+  [ "$rc" -eq 2 ]
+  rm -rf "$tmp"
+}
+
+@test "a rate-limited lookup is retried, and one still refused is named as rate-limited" {
+  tmp=$(mktemp -d)
+  _stub_registry "$tmp/reg"
+  : >"$tmp/allowlist"
+  printf 'ghcr.io/cozy/multi@%s\n' "$(_index amd64 arm64)" >"$tmp/refs"
+  # Refused twice, answered on the third try.
+  PATH="$MOCK_REG/bin:$PATH" MOCK_THROTTLE=2 VERIFY_MULTIARCH_RETRY_DELAY=0 \
+    hack/verify-multiarch.sh --allowlist "$tmp/allowlist" --refs-file "$tmp/refs" >"$tmp/out" 2>&1
+  grep -q '^refs that failed (0):' "$tmp/out"
+  [ "$(grep -c 'inspect --raw' "$MOCK_REG/log")" -eq 3 ]
+
+  # Refused every time: a failure that says so, never a platform verdict.
+  : >"$MOCK_REG/log"
+  rc=0
+  PATH="$MOCK_REG/bin:$PATH" MOCK_THROTTLE=99 VERIFY_MULTIARCH_RETRY_DELAY=0 \
+    hack/verify-multiarch.sh --allowlist "$tmp/allowlist" --refs-file "$tmp/refs" >"$tmp/out" 2>&1 || rc=$?
+  [ "$rc" -eq 1 ]
+  grep -q '^  ghcr.io/cozy/multi@sha256:[0-9a-f]*: rate-limited or unavailable after 3 tries' "$tmp/out"
+  if grep -q 'single-platform\|cannot read the manifest' "$tmp/out"; then echo "FAIL: a rate limit read as a verdict"; false; fi
+  [ "$(grep -c 'inspect --raw' "$MOCK_REG/log")" -eq 3 ]
+
+  # A missing manifest is deterministic: one lookup, no retry.
+  : >"$MOCK_REG/log"
+  printf 'ghcr.io/cozy/gone@sha256:%s\n' "$(printf 'e%.0s' $(seq 1 64))" >"$tmp/refs"
+  rc=0
+  PATH="$MOCK_REG/bin:$PATH" VERIFY_MULTIARCH_RETRY_DELAY=0 \
+    hack/verify-multiarch.sh --allowlist "$tmp/allowlist" --refs-file "$tmp/refs" >"$tmp/out" 2>&1 || rc=$?
+  [ "$rc" -eq 1 ]
+  grep -q 'gone@sha256:e*: cannot read the manifest: .*manifest unknown' "$tmp/out"
+  [ "$(grep -c 'inspect --raw' "$MOCK_REG/log")" -eq 1 ]
+  rm -rf "$tmp"
+}
+
+@test "the nightly arm64 build reports main's refs before its build stamps the tree" {
+  wf=.github/workflows/build-arm64-nightly.yaml
+  names=$(yq -r '.jobs.build-arm64.steps[].name' "$wf")
+  r=$(echo "$names" | grep -nx 'Report refs that are not multi-arch' | cut -d: -f1)
+  b=$(echo "$names" | grep -nx 'Build arm64 images' | cut -d: -f1)
+  [ -n "$r" ] && [ -n "$b" ] && [ "$r" -lt "$b" ]
+  [ "$(yq -r '.jobs.build-arm64.steps[] | select(.name == "Report refs that are not multi-arch") | .run' "$wf")" = 'hack/verify-multiarch.sh --report packages' ]
+  [ "$(yq -r '.jobs.build-arm64.steps[] | select(.name == "Build arm64 images") | .env.WRITE_CACHE' "$wf")" = 1 ]
+}
diff --git a/hack/verify-promoted-packages.sh b/hack/verify-promoted-packages.sh
new file mode 100755
index 0000000000..2ea463ec58
--- /dev/null
+++ b/hack/verify-promoted-packages.sh
@@ -0,0 +1,267 @@
+#!/bin/sh
+# Verify that the packages artifact pinned by a stable promotion is exactly the
+# packages tree in the merge commit, apart from the artifact's impossible
+# self-reference. This runs before finalize creates any stable git/release tag.
+#
+# Usage: hack/verify-promoted-packages.sh <stable-version> [root]
+#   <stable-version>  X.Y.Z (without a leading v)
+#   [root]            release packages tree; defaults to packages
+#
+# Environment:
+#   EXPECTED_PACKAGES_REPOSITORY  exact trusted OCI repository; defaults to
+#                                 the public Cozystack release repository
+#   VERIFY_PACKAGES_WORKDIR       caller-owned work directory; when set, the
+#                                 verifier neither creates nor removes it
+set -eu
+
+STABLE_VERSION="${1:?usage: verify-promoted-packages.sh <stable-version> [root]}"
+ROOT="${2:-packages}"
+
+# EXPECTED_PACKAGES_REPOSITORY and PACKAGES_DIGEST_REF_PATTERN, shared with the
+# publisher so its dispatch-time preflight cannot drift from this guard.
+# shellcheck source=hack/lib/promoted-packages.sh
+. "$(dirname "$0")/lib/promoted-packages.sh"
+
+printf '%s\n' "$STABLE_VERSION" | grep -Eq '^[0-9]+\.[0-9]+\.[0-9]+$' \
+  || { echo "stable-version '$STABLE_VERSION' must match X.Y.Z" >&2; exit 1; }
+[ -d "$ROOT" ] || { echo "root '$ROOT' is not a directory" >&2; exit 1; }
+VALUES="$ROOT/core/installer/values.yaml"
+[ -f "$VALUES" ] || { echo "root '$ROOT' has no core/installer/values.yaml" >&2; exit 1; }
+
+command -v flux >/dev/null || { echo "flux is required" >&2; exit 1; }
+command -v yq >/dev/null   || { echo "yq (mikefarah) is required" >&2; exit 1; }
+yq --version 2>&1 | grep -q mikefarah \
+  || { echo "yq (mikefarah) is required" >&2; exit 1; }
+
+source_url="$(yq -e -r '.cozystackOperator.platformSourceUrl' "$VALUES")"
+source_ref="$(yq -e -r '.cozystackOperator.platformSourceRef' "$VALUES")"
+[ "$source_url" = "$EXPECTED_PACKAGES_REPOSITORY" ] \
+  || { echo "platformSourceUrl '$source_url' must equal trusted repository '$EXPECTED_PACKAGES_REPOSITORY'" >&2; exit 1; }
+printf '%s\n' "$source_ref" | grep -Eq "$PACKAGES_DIGEST_REF_PATTERN" \
+  || { echo "platformSourceRef '$source_ref' is not an immutable digest" >&2; exit 1; }
+
+if [ -n "${VERIFY_PACKAGES_WORKDIR:-}" ]; then
+  tmp="$VERIFY_PACKAGES_WORKDIR"
+  [ ! -e "$tmp" ] || { echo "VERIFY_PACKAGES_WORKDIR '$tmp' already exists" >&2; exit 1; }
+  mkdir -p "$tmp"
+else
+  tmp="$(mktemp -d)"
+  cleanup() {
+    case "$tmp" in
+      "${TMPDIR:-/tmp}"/*) rm -r -- "$tmp" ;;
+      *) echo "refusing to clean unexpected work directory '$tmp'" >&2 ;;
+    esac
+  }
+  trap cleanup EXIT HUP INT TERM
+fi
+artifact="$tmp/artifact"
+mkdir -p "$artifact"
+flux pull artifact "${source_url}@${source_ref#digest=}" --output "$artifact"
+
+ARTIFACT_VALUES="$artifact/core/installer/values.yaml"
+[ -f "$ARTIFACT_VALUES" ] \
+  || { echo "promoted artifact has no core/installer/values.yaml" >&2; exit 1; }
+
+# The candidate was pushed before its own digest was written into installer
+# values, so its embedded platformSourceRef is the immutable rc artifact it was
+# derived from. Pull that baseline now; comparing its normalized refs below is
+# what proves promotion changed tag strings rather than container bytes.
+rc_source_url="$(yq -e -r '.cozystackOperator.platformSourceUrl' "$ARTIFACT_VALUES")"
+rc_source_ref="$(yq -e -r '.cozystackOperator.platformSourceRef' "$ARTIFACT_VALUES")"
+[ "$rc_source_url" = "$EXPECTED_PACKAGES_REPOSITORY" ] \
+  || { echo "candidate's original platformSourceUrl '$rc_source_url' must equal trusted repository '$EXPECTED_PACKAGES_REPOSITORY'" >&2; exit 1; }
+printf '%s\n' "$rc_source_ref" | grep -Eq "$PACKAGES_DIGEST_REF_PATTERN" \
+  || { echo "candidate's original platformSourceRef '$rc_source_ref' is not an immutable digest" >&2; exit 1; }
+
+# Promotion must have rewritten every version-line image tag in the artifact,
+# not merely in git. Keep the match scoped to image-reference positions so an
+# unrelated dependency version or historical prose cannot abort a release.
+stable_esc="$(printf '%s' "$STABLE_VERSION" | sed 's/\./\\./g')"
+scan_err="$tmp/rc-scan-err"
+leftovers="$(find "$artifact" -type f ! -path '*/charts/*' ! -name '*.md' \
+  -exec grep -lE -- \
+  "(image|repository|tag)[\"']?:[^#]*${stable_esc}-rc\.[0-9]+|${stable_esc}-rc\.[0-9]+@sha256:" \
+  {} + 2>"$scan_err" || true)"
+# An unreadable file is NOT "a file with no match" — the silent-skip shape
+# hack/promote-rewrite-tags.sh refuses by name, and the `|| true` here has to
+# stay because `-exec … +` reports the legitimate "nothing matched" as failure
+# too. That leaves grep's own diagnostics as the only signal that a file went
+# unscanned, so treat any of them as a failed scan. Defence in depth: the
+# per-file `cmp` below would catch a leftover rc string anyway, since the
+# release tree has none. Cheap enough to not depend on that.
+if [ -s "$scan_err" ]; then
+  echo "::error::could not scan the promoted artifact for rc image references:" >&2
+  cat "$scan_err" >&2
+  exit 1
+fi
+if [ -n "$leftovers" ]; then
+  echo "::error::promoted packages artifact still carries rc image references:" >&2
+  printf '%s\n' "$leftovers" >&2
+  exit 1
+fi
+
+# Flux's default archive excludes these file classes and omits symlinks rather
+# than following or storing them. Match that established RC artifact view here;
+# changing it would be a separate packages-format migration. .build-revision is
+# an ignored build nonce generated only by the rc image-packages target; it is
+# not consumed at runtime. The installer values are compared separately below
+# after normalizing the one impossible self-reference.
+#
+# This list is a RESTATEMENT of flux's built-in `excludeOCI` set, not a
+# derivation of it — the CLI does not expose it — so it is coupled to a flux
+# version. That version is the `version:` input (2.8.6) of every
+# fluxcd/flux2/action step in the workflows, and the ci-tool-installs contract
+# test pins that they agree. If flux ever changes the set, the symptom is a
+# "contain different files" failure naming the newly included or excluded
+# class, which is loud and lands before any stable name exists; the fix is to
+# update this list and that version together, in that order.
+artifact_entries() {
+  (
+    cd "$1"
+    find . -type f \
+      ! -name '.gitignore' \
+      ! -name '.gitmodules' \
+      ! -name '.gitattributes' \
+      ! -name '*.jpg' \
+      ! -name '*.jpeg' \
+      ! -name '*.gif' \
+      ! -name '*.png' \
+      ! -name '*.wmv' \
+      ! -name '*.flv' \
+      ! -name '*.tar.gz' \
+      ! -name '*.zip' \
+      ! -name '.build-revision' \
+      ! -path './core/installer/values.yaml' \
+      | LC_ALL=C sort
+  )
+}
+
+artifact_entries "$artifact" > "$tmp/artifact-files"
+artifact_entries "$ROOT" > "$tmp/release-files"
+if ! cmp -s "$tmp/artifact-files" "$tmp/release-files"; then
+  echo "::error::promoted artifact and release tree contain different files:" >&2
+  diff -u "$tmp/artifact-files" "$tmp/release-files" >&2 || true
+  exit 1
+fi
+
+while IFS= read -r rel; do
+  rel="${rel#./}"
+  artifact_file="$artifact/$rel"
+  release_file="$ROOT/$rel"
+  if ! cmp -s "$artifact_file" "$release_file"; then
+    echo "::error::promoted artifact file differs from release tree: $rel" >&2
+    exit 1
+  fi
+  # Resolve each side to a value first. Written as one `&&`/`||` chain this
+  # reads like a symmetric difference and is not one: POSIX gives the two
+  # operators equal precedence and left associativity, so `A && B || C && D`
+  # groups as `((A && B) || C) && D` and the candidate-executable direction —
+  # the one that makes content executable inside the artifact the operator
+  # installs — is accepted silently.
+  if [ -x "$artifact_file" ]; then artifact_exec=1; else artifact_exec=0; fi
+  if [ -x "$release_file" ]; then release_exec=1; else release_exec=0; fi
+  if [ "$artifact_exec" -ne "$release_exec" ]; then
+    echo "::error::promoted artifact executable bit differs from release tree: $rel" >&2
+    exit 1
+  fi
+done < "$tmp/artifact-files"
+
+normalize_installer() {
+  sed -E 's|^([[:space:]]*platformSourceRef:[[:space:]]*).*$|\1digest=sha256:SELF|' "$1"
+}
+normalize_installer "$ARTIFACT_VALUES" > "$tmp/artifact-installer"
+normalize_installer "$VALUES" > "$tmp/release-installer"
+if ! cmp -s "$tmp/artifact-installer" "$tmp/release-installer"; then
+  echo "::error::promoted artifact installer values differ beyond their self-reference" >&2
+  diff -u "$tmp/artifact-installer" "$tmp/release-installer" >&2 || true
+  exit 1
+fi
+
+# Compare normalized repo@digest sets against the rc artifact as an explicit
+# proof that promotion did not change any container bytes. The packages
+# artifact's own digest is omitted because that is the intentional declarative
+# content change this verification is proving.
+# shellcheck source=hack/lib/image-refs.sh
+. "$(dirname "$0")/lib/image-refs.sh"
+normalized_refs() {
+  # Collect into a file rather than piping straight into the loop. As the head
+  # of a pipeline the collector's exit status is thrown away — the pipeline
+  # reports `sort -u`'s, POSIX sh has no `pipefail` and this script has to stay
+  # POSIX — so `set -e` never sees it and a failed or truncated collection
+  # becomes a smaller set that the comparison below happily matches. Same
+  # fail-open class as the rc-reference scan above, on the one guard that is
+  # supposed to prove the container bytes did not move across promotion.
+  _nr_raw="$tmp/refs-raw"
+  collect_image_refs "$1" > "$_nr_raw"
+  # A collection that comes back empty is that same failure wearing a zero exit
+  # status: two empty sets compare equal, so the proof passes having examined
+  # nothing at all. Every packages tree carries image references — none means
+  # the collector understood nothing it was given, not that there was nothing
+  # to find.
+  [ -s "$_nr_raw" ] \
+    || { echo "::error::collected no image references from '$1'; cannot prove the container digests are unchanged" >&2; exit 1; }
+  while IFS= read -r raw; do
+    [ -n "$raw" ] || continue
+    without_digest="${raw%@*}"
+    digest="${raw##*@}"
+    image="${without_digest##*/}"
+    if [ "$without_digest" = "$image" ]; then
+      # No `/` anywhere ahead of the digest, so nothing in this ref names a
+      # registry host or a repository path — it is a bare scalar sitting in
+      # front of a digest, and the collector emits those by design. Shape 3
+      # (`repository:` on one key, `tag: <tag>@sha256:<digest>` on another) is
+      # the dominant shape in the tree, and shape 1's recursive descent sees
+      # that `tag` scalar on its own, so every shape-3 map arrives here twice:
+      # once correctly joined, once as the bare tag. hack/lib/image-refs.sh
+      # documents that degeneracy and leaves host-less refs to its callers —
+      # promote-retag.sh drops them through its ownership filter, and this
+      # function had no equivalent. `${image%:*}` is then a no-op (a tag holds
+      # no colon) and the TAG arrives as the repository. Promotion rewrites
+      # exactly those tags, which is how a promotion that moved no container
+      # bytes at all reported six changed "repositories" whose digests were
+      # identical on both sides.
+      #
+      # Compare such a ref on its digest alone. The digest is the whole of the
+      # container identity a host-less ref carries, and it is the only part
+      # promotion must not move; the empty repository yields a leading `@`,
+      # which no real repository name can produce, so these cannot collide with
+      # a host-bearing entry. Where a repository name does exist behind one of
+      # them — kube-ovn's `global.images.kubeovn`, whose host lives in
+      # `global.registry.address` — the same image also arrives host-bearing
+      # from shape 4, so a repository change stays visible through that entry.
+      #
+      # Dropping host-less refs outright would be wrong rather than merely
+      # blunter: packages/system/kuberture/values.yaml carries an `image:` map
+      # with a `tag:` and no `repository:`, so shape 1 is the only rule that
+      # ever sees its digest. Skipping it would silently stop proving that
+      # digest is unchanged — a hole in the very guard this branch repairs.
+      #
+      # Do NOT reach for promote-retag.sh's `${REGISTRY}/` ownership filter to
+      # do this job. The verify job's REGISTRY names the private build registry
+      # while both artifacts under comparison live on the public one, so that
+      # filter drops every ref; and the emptiness guard above tests the RAW
+      # collection rather than the filtered set, so the proof would then pass
+      # by comparing two empty sets — failing open on the one invariant it
+      # exists to establish.
+      repo=""
+    else
+      repo="${without_digest%/*}/${image%:*}"
+    fi
+    case "$repo" in
+      */cozystack-packages) continue ;;
+    esac
+    printf '%s@%s\n' "$repo" "$digest"
+  done < "$_nr_raw" | LC_ALL=C sort -u
+}
+rc_artifact="$tmp/rc-artifact"
+mkdir -p "$rc_artifact"
+flux pull artifact "${rc_source_url}@${rc_source_ref#digest=}" --output "$rc_artifact"
+normalized_refs "$rc_artifact" > "$tmp/rc-refs"
+normalized_refs "$artifact" > "$tmp/artifact-refs"
+if ! cmp -s "$tmp/rc-refs" "$tmp/artifact-refs"; then
+  echo "::error::promotion changed the container repository/digest set" >&2
+  diff -u "$tmp/rc-refs" "$tmp/artifact-refs" >&2 || true
+  exit 1
+fi
+
+echo "Verified ${source_url}@${source_ref#digest=}: stable tags, identical package tree, and the rc artifact's container digests."
diff --git a/hack/verify-promoted-packages_test.bats b/hack/verify-promoted-packages_test.bats
new file mode 100644
index 0000000000..582fc5e6c7
--- /dev/null
+++ b/hack/verify-promoted-packages_test.bats
@@ -0,0 +1,474 @@
+#!/usr/bin/env bats
+# Behavioural tests for the pre-publication packages artifact verification.
+# Run with: bats hack/verify-promoted-packages_test.bats
+
+load test_helper
+
+_test_workspace() {
+  if [ -n "${BATS_TEST_TMPDIR:-}" ]; then
+    printf '%s\n' "$BATS_TEST_TMPDIR"
+  else
+    printf '%s\n' "${tmp:?cozytest workspace is missing}"
+  fi
+}
+
+_make_verify_fixture() {
+  t="$1"
+  mkdir -p "$t/bin" "$t/release/core/installer" "$t/release/system/dashboard"
+  mkdir -p "$t/artifact/core/installer" "$t/artifact/system/dashboard"
+  mkdir -p "$t/rc-artifact/core/installer" "$t/rc-artifact/system/dashboard"
+  cat > "$t/bin/flux" <<'EOF'
+#!/bin/sh
+set -eu
+[ "$1" = "pull" ]
+[ "$2" = "artifact" ]
+shift 2
+ref="$1"
+printf '%s\n' "$@" >> "$MOCK_FLUX_LOG"
+out=""
+while [ "$#" -gt 0 ]; do
+  if [ "$1" = "--output" ]; then
+    out="$2"
+    shift 2
+  else
+    shift
+  fi
+done
+[ -n "$out" ]
+case "$ref" in
+  *@sha256:bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb)
+    src="$MOCK_ARTIFACT"
+    ;;
+  *@sha256:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa)
+    src="$MOCK_RC_ARTIFACT"
+    ;;
+  *)
+    echo "unexpected artifact ref: $ref" >&2
+    exit 1
+    ;;
+esac
+cp -R "$src"/. "$out"/
+EOF
+  chmod +x "$t/bin/flux"
+  cat > "$t/release/core/installer/values.yaml" <<'EOF'
+cozystackOperator:
+  platformSourceUrl: oci://ghcr.io/cozystack/cozystack/cozystack-packages
+  platformSourceRef: digest=sha256:bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
+EOF
+  cat > "$t/artifact/core/installer/values.yaml" <<'EOF'
+cozystackOperator:
+  platformSourceUrl: oci://ghcr.io/cozystack/cozystack/cozystack-packages
+  platformSourceRef: digest=sha256:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+EOF
+  image='ghcr.io/cozystack/cozystack/cozystack-ui:v9.9.9@sha256:cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc'
+  printf 'console:\n  image: %s\n' "$image" > "$t/release/system/dashboard/values.yaml"
+  printf 'console:\n  image: %s\n' "$image" > "$t/artifact/system/dashboard/values.yaml"
+  cp "$t/artifact/core/installer/values.yaml" "$t/rc-artifact/core/installer/values.yaml"
+  printf 'console:\n  image: %s\n' \
+    'ghcr.io/cozystack/cozystack/cozystack-ui:v9.9.9-rc.3@sha256:cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc' \
+    > "$t/rc-artifact/system/dashboard/values.yaml"
+  # Flux's established packages archive omits symlinks. The verifier must
+  # compare against that archive view rather than demanding this node back.
+  ln -s values.yaml "$t/release/system/dashboard/values-link.yaml"
+}
+
+@test "accepts an identical candidate with only the self-reference changed" {
+  tmp="$(_test_workspace)/fixture"
+  _make_verify_fixture "$tmp"
+
+  rc=0
+  MOCK_ARTIFACT="$tmp/artifact" MOCK_RC_ARTIFACT="$tmp/rc-artifact" MOCK_FLUX_LOG="$tmp/flux.log" \
+    VERIFY_PACKAGES_WORKDIR="$tmp/work" \
+    PATH="$tmp/bin:$PATH" \
+    hack/verify-promoted-packages.sh 9.9.9 "$tmp/release" \
+    > "$tmp/out" 2> "$tmp/err" || rc=$?
+  if [ "$rc" -ne 0 ]; then
+    echo "verification exited $rc" >&2
+    cat "$tmp/err" >&2
+    return "$rc"
+  fi
+
+  grep -qx 'oci://ghcr.io/cozystack/cozystack/cozystack-packages@sha256:bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' "$tmp/flux.log"
+  grep -q "stable tags, identical package tree, and the rc artifact's container digests" "$tmp/out"
+}
+
+@test "rejects an rc image reference inside the candidate" {
+  tmp="$(_test_workspace)/fixture"
+  _make_verify_fixture "$tmp"
+  sed 's/:v9.9.9@/:v9.9.9-rc.3@/' "$tmp/artifact/system/dashboard/values.yaml" \
+    > "$tmp/rc-values.yaml"
+  mv "$tmp/rc-values.yaml" "$tmp/artifact/system/dashboard/values.yaml"
+
+  rc=0
+  MOCK_ARTIFACT="$tmp/artifact" MOCK_RC_ARTIFACT="$tmp/rc-artifact" MOCK_FLUX_LOG="$tmp/flux.log" \
+    VERIFY_PACKAGES_WORKDIR="$tmp/work" \
+    PATH="$tmp/bin:$PATH" \
+    hack/verify-promoted-packages.sh 9.9.9 "$tmp/release" \
+    > "$tmp/out" 2> "$tmp/err" || rc=$?
+
+  [ "$rc" -ne 0 ]
+  grep -q 'still carries rc image references' "$tmp/err"
+}
+
+# The scan's `|| true` is not optional — `find … -exec … +` reports the
+# legitimate "nothing matched" as a failure too — which leaves grep's own
+# diagnostics as the only remaining signal that a file went unscanned. Produce
+# that signal the way an unreadable file produces it, without depending on the
+# runner's uid: root reads a chmod 000 fixture anyway, so a permissions-based
+# test would quietly stop testing anything wherever the suite runs as root.
+# A grep on PATH answering the scan's invocation the way the real one answers a
+# file it cannot open is the same injection idiom as _tooling_with_collector
+# below, one dependency further out.
+_grep_failing_the_rc_scan() {
+  real_grep="$(command -v grep)"
+  cat > "$1/grep" <<EOF
+#!/bin/sh
+# Only the scan, which find invokes as: grep -lE -- <pattern> <files...>. Every
+# other grep in the verifier, and in the collector it sources, must behave.
+if [ "\$1" = "-lE" ]; then
+  for _a in "\$@"; do _last="\$_a"; done
+  echo "grep: \$_last: Permission denied" >&2
+  exit 2
+fi
+exec $real_grep "\$@"
+EOF
+  chmod +x "$1/grep"
+}
+
+@test "refuses when the rc-reference scan could not read a file" {
+  tmp="$(_test_workspace)/fixture"
+  _make_verify_fixture "$tmp"
+  _grep_failing_the_rc_scan "$tmp/bin"
+
+  rc=0
+  MOCK_ARTIFACT="$tmp/artifact" MOCK_RC_ARTIFACT="$tmp/rc-artifact" MOCK_FLUX_LOG="$tmp/flux.log" \
+    VERIFY_PACKAGES_WORKDIR="$tmp/work" \
+    PATH="$tmp/bin:$PATH" \
+    hack/verify-promoted-packages.sh 9.9.9 "$tmp/release" \
+    > "$tmp/out" 2> "$tmp/err" || rc=$?
+
+  [ "$rc" -ne 0 ]
+  grep -q 'could not scan the promoted artifact for rc image references' "$tmp/err"
+  # The diagnostic itself has to reach the log, or the failure names no file and
+  # nobody can tell which one went unscanned.
+  grep -q 'Permission denied' "$tmp/err"
+  # …and the verifier did not go on to report a proof it skipped part of.
+  # Counted rather than negated with `!`, which suppresses errexit and would
+  # pass regardless.
+  count="$(grep -c 'identical package tree' "$tmp/out" || true)"
+  [ "${count:-0}" -eq 0 ]
+}
+
+# The threat this whole job exists for: someone edits packages/ on the release
+# PR after promotion published the candidate, so the artifact the installer
+# resolves is no longer the tree that was reviewed and tagged. A file present on
+# BOTH sides with different bytes is the shape that takes, and only the per-file
+# comparison catches it — the file-set compare sees the same names, the installer
+# compare reads one file, and the rc-refs compare never looks at the release tree
+# at all. The edit here is deliberately not an image reference, so no other leg
+# can fire and claim the credit.
+@test "rejects a file whose content changed on only one side" {
+  tmp="$(_test_workspace)/fixture"
+  _make_verify_fixture "$tmp"
+  printf '  replicas: 3\n' >> "$tmp/release/system/dashboard/values.yaml"
+
+  rc=0
+  MOCK_ARTIFACT="$tmp/artifact" MOCK_RC_ARTIFACT="$tmp/rc-artifact" MOCK_FLUX_LOG="$tmp/flux.log" \
+    VERIFY_PACKAGES_WORKDIR="$tmp/work" \
+    PATH="$tmp/bin:$PATH" \
+    hack/verify-promoted-packages.sh 9.9.9 "$tmp/release" \
+    > "$tmp/out" 2> "$tmp/err" || rc=$?
+
+  [ "$rc" -ne 0 ]
+  grep -q 'promoted artifact file differs from release tree: system/dashboard/values.yaml' "$tmp/err"
+}
+
+@test "rejects package content changed after the candidate was published" {
+  tmp="$(_test_workspace)/fixture"
+  _make_verify_fixture "$tmp"
+  printf 'changed: true\n' > "$tmp/release/system/dashboard/extra.yaml"
+
+  rc=0
+  MOCK_ARTIFACT="$tmp/artifact" MOCK_RC_ARTIFACT="$tmp/rc-artifact" MOCK_FLUX_LOG="$tmp/flux.log" \
+    VERIFY_PACKAGES_WORKDIR="$tmp/work" \
+    PATH="$tmp/bin:$PATH" \
+    hack/verify-promoted-packages.sh 9.9.9 "$tmp/release" \
+    > "$tmp/out" 2> "$tmp/err" || rc=$?
+
+  [ "$rc" -ne 0 ]
+  grep -q 'contain different files' "$tmp/err"
+}
+
+@test "rejects a candidate outside the trusted release repository" {
+  tmp="$(_test_workspace)/fixture"
+  _make_verify_fixture "$tmp"
+  sed 's#oci://ghcr.io/cozystack/cozystack/cozystack-packages#oci://example.invalid/cozystack-packages#' \
+    "$tmp/release/core/installer/values.yaml" > "$tmp/untrusted-values.yaml"
+  mv "$tmp/untrusted-values.yaml" "$tmp/release/core/installer/values.yaml"
+
+  rc=0
+  MOCK_ARTIFACT="$tmp/artifact" MOCK_RC_ARTIFACT="$tmp/rc-artifact" MOCK_FLUX_LOG="$tmp/flux.log" \
+    VERIFY_PACKAGES_WORKDIR="$tmp/work" \
+    PATH="$tmp/bin:$PATH" \
+    hack/verify-promoted-packages.sh 9.9.9 "$tmp/release" \
+    > "$tmp/out" 2> "$tmp/err" || rc=$?
+
+  [ "$rc" -ne 0 ]
+  grep -q 'must equal trusted repository' "$tmp/err"
+  [ ! -s "$tmp/flux.log" ]
+}
+
+@test "rejects an embedded rc baseline outside the trusted release repository" {
+  tmp="$(_test_workspace)/fixture"
+  _make_verify_fixture "$tmp"
+  sed 's#oci://ghcr.io/cozystack/cozystack/cozystack-packages#oci://example.invalid/cozystack-packages#' \
+    "$tmp/artifact/core/installer/values.yaml" > "$tmp/untrusted-values.yaml"
+  mv "$tmp/untrusted-values.yaml" "$tmp/artifact/core/installer/values.yaml"
+
+  rc=0
+  MOCK_ARTIFACT="$tmp/artifact" MOCK_RC_ARTIFACT="$tmp/rc-artifact" MOCK_FLUX_LOG="$tmp/flux.log" \
+    VERIFY_PACKAGES_WORKDIR="$tmp/work" \
+    PATH="$tmp/bin:$PATH" \
+    hack/verify-promoted-packages.sh 9.9.9 "$tmp/release" \
+    > "$tmp/out" 2> "$tmp/err" || rc=$?
+
+  [ "$rc" -ne 0 ]
+  grep -q "candidate's original platformSourceUrl.*must equal trusted repository" "$tmp/err"
+}
+
+# The mode check has to catch BOTH directions, and only one of them is the
+# dangerous one. A candidate whose file is executable where the release tree's
+# is not is content the merge reviewer never saw made runnable inside the
+# artifact the operator installs — cmp(1) compares bytes and says nothing about
+# it. The mirror case is the benign one, and it was the only one an earlier
+# `&&`/`||` chain actually rejected: POSIX gives the two operators equal
+# precedence and left associativity, so the guard grouped as
+# `((A && B) || C) && D` and quietly accepted a candidate-only executable bit.
+@test "rejects an executable bit set only in the candidate" {
+  tmp="$(_test_workspace)/fixture"
+  _make_verify_fixture "$tmp"
+  chmod +x "$tmp/artifact/system/dashboard/values.yaml"
+
+  rc=0
+  MOCK_ARTIFACT="$tmp/artifact" MOCK_RC_ARTIFACT="$tmp/rc-artifact" MOCK_FLUX_LOG="$tmp/flux.log" \
+    VERIFY_PACKAGES_WORKDIR="$tmp/work" \
+    PATH="$tmp/bin:$PATH" \
+    hack/verify-promoted-packages.sh 9.9.9 "$tmp/release" \
+    > "$tmp/out" 2> "$tmp/err" || rc=$?
+
+  [ "$rc" -ne 0 ]
+  grep -q 'executable bit differs from release tree' "$tmp/err"
+}
+
+@test "rejects an executable bit set only in the release tree" {
+  tmp="$(_test_workspace)/fixture"
+  _make_verify_fixture "$tmp"
+  chmod +x "$tmp/release/system/dashboard/values.yaml"
+
+  rc=0
+  MOCK_ARTIFACT="$tmp/artifact" MOCK_RC_ARTIFACT="$tmp/rc-artifact" MOCK_FLUX_LOG="$tmp/flux.log" \
+    VERIFY_PACKAGES_WORKDIR="$tmp/work" \
+    PATH="$tmp/bin:$PATH" \
+    hack/verify-promoted-packages.sh 9.9.9 "$tmp/release" \
+    > "$tmp/out" 2> "$tmp/err" || rc=$?
+
+  [ "$rc" -ne 0 ]
+  grep -q 'executable bit differs from release tree' "$tmp/err"
+}
+
+@test "rejects installer drift beyond the self-reference" {
+  tmp="$(_test_workspace)/fixture"
+  _make_verify_fixture "$tmp"
+  printf '  platformSourceSecret: changed-after-push\n' \
+    >> "$tmp/release/core/installer/values.yaml"
+
+  rc=0
+  MOCK_ARTIFACT="$tmp/artifact" MOCK_RC_ARTIFACT="$tmp/rc-artifact" MOCK_FLUX_LOG="$tmp/flux.log" \
+    VERIFY_PACKAGES_WORKDIR="$tmp/work" \
+    PATH="$tmp/bin:$PATH" \
+    hack/verify-promoted-packages.sh 9.9.9 "$tmp/release" \
+    > "$tmp/out" 2> "$tmp/err" || rc=$?
+
+  [ "$rc" -ne 0 ]
+  grep -q 'installer values differ beyond their self-reference' "$tmp/err"
+}
+
+# Run the verifier from a copy whose sibling lib/ is ours. That is already how
+# the workflows invoke it — `.release-tooling/hack/verify-promoted-packages.sh`,
+# with its libraries resolved next to the script — so replacing one library is
+# the faithful way to reach a failure inside it rather than a contrived one.
+_tooling_with_collector() {
+  mkdir -p "$1/lib"
+  cp hack/verify-promoted-packages.sh "$1/"
+  cp hack/lib/promoted-packages.sh "$1/lib/"
+  cat > "$1/lib/image-refs.sh" <<EOF
+collect_image_refs() {
+$2
+}
+EOF
+}
+
+# The digest-set comparison is the only thing standing behind "no container
+# bytes changed". Both tests below make it compare two empty sets, which
+# succeeds, so without the fix the verifier reports that proof as passed having
+# examined nothing.
+@test "refuses when image-reference collection fails" {
+  tmp="$(_test_workspace)/fixture"
+  _make_verify_fixture "$tmp"
+  _tooling_with_collector "$tmp/tooling" '  echo "collector exploded" >&2
+  return 3'
+
+  rc=0
+  MOCK_ARTIFACT="$tmp/artifact" MOCK_RC_ARTIFACT="$tmp/rc-artifact" MOCK_FLUX_LOG="$tmp/flux.log" \
+    VERIFY_PACKAGES_WORKDIR="$tmp/work" \
+    PATH="$tmp/bin:$PATH" \
+    "$tmp/tooling/verify-promoted-packages.sh" 9.9.9 "$tmp/release" \
+    > "$tmp/out" 2> "$tmp/err" || rc=$?
+
+  [ "$rc" -ne 0 ]
+  grep -q 'collector exploded' "$tmp/err"
+  # …and it did not also claim the proof it never completed. Counted rather
+  # than negated with `!`, which suppresses errexit and would pass regardless.
+  count="$(grep -c 'identical package tree' "$tmp/out" || true)"
+  [ "${count:-0}" -eq 0 ]
+}
+
+@test "refuses when the collector reports no image references at all" {
+  tmp="$(_test_workspace)/fixture"
+  _make_verify_fixture "$tmp"
+  _tooling_with_collector "$tmp/tooling" '  return 0'
+
+  rc=0
+  MOCK_ARTIFACT="$tmp/artifact" MOCK_RC_ARTIFACT="$tmp/rc-artifact" MOCK_FLUX_LOG="$tmp/flux.log" \
+    VERIFY_PACKAGES_WORKDIR="$tmp/work" \
+    PATH="$tmp/bin:$PATH" \
+    "$tmp/tooling/verify-promoted-packages.sh" 9.9.9 "$tmp/release" \
+    > "$tmp/out" 2> "$tmp/err" || rc=$?
+
+  [ "$rc" -ne 0 ]
+  grep -q 'collected no image references' "$tmp/err"
+}
+
+@test "rejects a changed container digest even when candidate and merge tree match" {
+  tmp="$(_test_workspace)/fixture"
+  _make_verify_fixture "$tmp"
+  sed 's/cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc/dddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd/' \
+    "$tmp/artifact/system/dashboard/values.yaml" > "$tmp/changed-values.yaml"
+  mv "$tmp/changed-values.yaml" "$tmp/artifact/system/dashboard/values.yaml"
+  cp "$tmp/artifact/system/dashboard/values.yaml" "$tmp/release/system/dashboard/values.yaml"
+
+  rc=0
+  MOCK_ARTIFACT="$tmp/artifact" MOCK_RC_ARTIFACT="$tmp/rc-artifact" MOCK_FLUX_LOG="$tmp/flux.log" \
+    VERIFY_PACKAGES_WORKDIR="$tmp/work" \
+    PATH="$tmp/bin:$PATH" \
+    hack/verify-promoted-packages.sh 9.9.9 "$tmp/release" \
+    > "$tmp/out" 2> "$tmp/err" || rc=$?
+
+  [ "$rc" -ne 0 ]
+  grep -q 'promotion changed the container repository/digest set' "$tmp/err"
+}
+
+# Shape 3 — `repository:` on one key, `tag: <tag>@sha256:<digest>` on another —
+# is the shape hack/lib/image-refs.sh itself calls the dominant one, and the one
+# no fixture above builds. The collector emits TWO entries for such a map: the
+# correctly joined repository@digest, plus shape 1's recursive scrape of the
+# bare `tag` scalar, which names no repository at all. Promotion rewrites
+# exactly that scalar, so normalization keeping it — treating the tag as the
+# repository — makes every clean promotion look as though it moved container
+# bytes. The single-string ref in _make_verify_fixture cannot reach that path:
+# it carries a registry host, so it normalizes through the other branch and its
+# own rc-to-stable rewrite passes either way. That is why the suite looked
+# covered while the dominant shape went untested.
+_write_split_map() {
+  cat > "$1" <<EOF
+linstorCSI:
+  image:
+    repository: ghcr.io/cozystack/cozystack/linstor-csi
+    tag: $2@sha256:eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
+EOF
+}
+
+# Same repository and the same digest on every side. ONLY the tag string moves,
+# which is exactly and only what promotion is meant to change.
+_add_split_map_package() {
+  t="$1"
+  mkdir -p "$t/release/system/linstor" "$t/artifact/system/linstor" \
+    "$t/rc-artifact/system/linstor"
+  _write_split_map "$t/release/system/linstor/values.yaml" v9.9.9
+  _write_split_map "$t/artifact/system/linstor/values.yaml" v9.9.9
+  _write_split_map "$t/rc-artifact/system/linstor/values.yaml" v9.9.9-rc.3
+}
+
+@test "accepts a split-map tag rewritten from rc to stable" {
+  tmp="$(_test_workspace)/fixture"
+  _make_verify_fixture "$tmp"
+  _add_split_map_package "$tmp"
+
+  rc=0
+  MOCK_ARTIFACT="$tmp/artifact" MOCK_RC_ARTIFACT="$tmp/rc-artifact" MOCK_FLUX_LOG="$tmp/flux.log" \
+    VERIFY_PACKAGES_WORKDIR="$tmp/work" \
+    PATH="$tmp/bin:$PATH" \
+    hack/verify-promoted-packages.sh 9.9.9 "$tmp/release" \
+    > "$tmp/out" 2> "$tmp/err" || rc=$?
+  if [ "$rc" -ne 0 ]; then
+    echo "verification exited $rc" >&2
+    cat "$tmp/err" >&2
+    return "$rc"
+  fi
+
+  grep -q "stable tags, identical package tree, and the rc artifact's container digests" "$tmp/out"
+}
+
+# The property a blunter fix would break. packages/system/kuberture/values.yaml
+# carries an `image:` map with a `tag:` and no `repository:` — shape 2 wants a
+# `digest` key and shape 3 a `repository` key, so shape 1's scrape of the bare
+# tag scalar is the ONLY rule that ever sees that image's digest. Discarding
+# host-less refs rather than comparing them on their digest would silently stop
+# proving it unchanged, which is a hole in the same guard being repaired here.
+# Asserted from the rejecting direction, because that is the direction able to
+# go red: the digest moves and nothing else does, so the digest-set comparison
+# is the only leg that can fire — artifact and release tree stay byte-identical,
+# no rc string appears in the candidate, and the installer values match.
+_write_repository_less_map() {
+  cat > "$1" <<EOF
+kuberture:
+  image:
+    tag: 0.1.1@sha256:$2
+EOF
+}
+
+_add_repository_less_package() {
+  t="$1"
+  mkdir -p "$t/release/system/kuberture" "$t/artifact/system/kuberture" \
+    "$t/rc-artifact/system/kuberture"
+  _repoless_stable=1111111111111111111111111111111111111111111111111111111111111111
+  _repoless_rc=2222222222222222222222222222222222222222222222222222222222222222
+  _write_repository_less_map "$t/release/system/kuberture/values.yaml" "$_repoless_stable"
+  _write_repository_less_map "$t/artifact/system/kuberture/values.yaml" "$_repoless_stable"
+  _write_repository_less_map "$t/rc-artifact/system/kuberture/values.yaml" "$_repoless_rc"
+}
+
+@test "rejects a changed digest carried only by a repository-less image map" {
+  tmp="$(_test_workspace)/fixture"
+  _make_verify_fixture "$tmp"
+  _add_repository_less_package "$tmp"
+
+  rc=0
+  MOCK_ARTIFACT="$tmp/artifact" MOCK_RC_ARTIFACT="$tmp/rc-artifact" MOCK_FLUX_LOG="$tmp/flux.log" \
+    VERIFY_PACKAGES_WORKDIR="$tmp/work" \
+    PATH="$tmp/bin:$PATH" \
+    hack/verify-promoted-packages.sh 9.9.9 "$tmp/release" \
+    > "$tmp/out" 2> "$tmp/err" || rc=$?
+
+  [ "$rc" -ne 0 ]
+  grep -q 'promotion changed the container repository/digest set' "$tmp/err"
+  # The rejection has to come from the digest set and not from a neighbouring leg
+  # rejecting a tree this test never perturbed, or it would still pass with the
+  # digest dropped from the comparison entirely. Counted rather than negated with
+  # `!`, which suppresses errexit and would pass regardless.
+  for _other in 'contain different files' 'differs from release tree' \
+    'still carries rc image references' 'installer values differ'; do
+    count="$(grep -c "$_other" "$tmp/err" || true)"
+    [ "${count:-0}" -eq 0 ]
+  done
+}
diff --git a/internal/apigate/classify.go b/internal/apigate/classify.go
new file mode 100644
index 0000000000..4673c3c9c6
--- /dev/null
+++ b/internal/apigate/classify.go
@@ -0,0 +1,188 @@
+/*
+Copyright 2026 The Cozystack Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package apigate
+
+import (
+	"fmt"
+	"sort"
+)
+
+// Classify compares the base and head snapshots and returns every sizeable
+// change, ordered deterministically (new groups, then new resources, then
+// breaking changes; each block sorted by group/plural/detail). An empty slice
+// means the change set is not sizeable and needs no designated-owner review.
+func Classify(base, head Snapshot) []Finding {
+	var findings []Finding
+
+	baseGroups := base.groups()
+	// New API groups: present in head, absent in base. Reported once per group
+	// against the first (sorted) resource that introduces it.
+	newGroups := map[string]struct{}{}
+	for _, res := range sortedResources(head) {
+		if _, ok := baseGroups[res.Group]; ok {
+			continue
+		}
+		if _, done := newGroups[res.Group]; done {
+			continue
+		}
+		newGroups[res.Group] = struct{}{}
+		findings = append(findings, Finding{
+			Category: NewGroup,
+			Group:    res.Group,
+			Kind:     res.Kind,
+			Plural:   res.Plural,
+			Source:   res.Source,
+			Origin:   res.Origin,
+			Detail:   fmt.Sprintf("API group %q is introduced by this change", res.Group),
+		})
+	}
+
+	// New resources: (group, plural) present in head, absent in base. A
+	// resource whose group is itself new is already covered by the new-group
+	// finding, so skip it here to avoid double-flagging.
+	for _, res := range sortedResources(head) {
+		if _, ok := base[res.key()]; ok {
+			continue
+		}
+		if _, groupIsNew := newGroups[res.Group]; groupIsNew {
+			continue
+		}
+		findings = append(findings, Finding{
+			Category: NewResource,
+			Group:    res.Group,
+			Kind:     res.Kind,
+			Plural:   res.Plural,
+			Source:   res.Source,
+			Origin:   res.Origin,
+			Detail:   fmt.Sprintf("resource %s (%s) is added to group %q", res.Plural, displayKind(res), res.Group),
+		})
+	}
+
+	// Removed API groups: present in base, absent in head. Reported once per
+	// group against the first (sorted) base resource that carried it.
+	headGroups := head.groups()
+	removedGroups := map[string]struct{}{}
+	for _, res := range sortedResources(base) {
+		if _, ok := headGroups[res.Group]; ok {
+			continue
+		}
+		if _, done := removedGroups[res.Group]; done {
+			continue
+		}
+		removedGroups[res.Group] = struct{}{}
+		findings = append(findings, Finding{
+			Category: RemovedGroup,
+			Group:    res.Group,
+			Kind:     res.Kind,
+			Plural:   res.Plural,
+			Source:   res.Source,
+			Origin:   res.Origin,
+			Detail:   fmt.Sprintf("API group %q is removed by this change", res.Group),
+		})
+	}
+
+	// Removed resources: present in base, absent in head. A resource whose
+	// whole group was removed is already covered above, so skip it here.
+	for _, res := range sortedResources(base) {
+		if _, ok := head[res.key()]; ok {
+			continue
+		}
+		if _, groupGone := removedGroups[res.Group]; groupGone {
+			continue
+		}
+		findings = append(findings, Finding{
+			Category: RemovedResource,
+			Group:    res.Group,
+			Kind:     res.Kind,
+			Plural:   res.Plural,
+			Source:   res.Source,
+			Origin:   res.Origin,
+			Detail:   fmt.Sprintf("resource %s (%s) is removed from group %q", res.Plural, displayKind(res), res.Group),
+		})
+	}
+
+	// Breaking changes: resources present in both, whose schema regresses.
+	for _, res := range sortedResources(head) {
+		prev, ok := base[res.key()]
+		if !ok {
+			continue
+		}
+		for _, detail := range diffResource(prev, res) {
+			findings = append(findings, Finding{
+				Category: Breaking,
+				Group:    res.Group,
+				Kind:     res.Kind,
+				Plural:   res.Plural,
+				Source:   res.Source,
+				Origin:   res.Origin,
+				Detail:   detail,
+			})
+		}
+	}
+
+	return findings
+}
+
+// diffResource returns human-readable descriptions of every breaking change
+// between the base and head form of one resource: a removed served version, or
+// a breaking schema change within a shared version. New versions are additive
+// and ignored.
+func diffResource(base, head Resource) []string {
+	var out []string
+	versions := make([]string, 0, len(base.Versions))
+	for v := range base.Versions {
+		versions = append(versions, v)
+	}
+	sort.Strings(versions)
+	for _, v := range versions {
+		headSchema, ok := head.Versions[v]
+		if !ok {
+			out = append(out, fmt.Sprintf("served version %q was removed", v))
+			continue
+		}
+		for _, c := range diffSchema("spec", base.Versions[v], headSchema) {
+			out = append(out, fmt.Sprintf("[%s] %s", v, c))
+		}
+		for _, c := range diffNameSchema(base.Versions[v], headSchema) {
+			out = append(out, fmt.Sprintf("[%s] %s", v, c))
+		}
+	}
+	return out
+}
+
+func displayKind(r Resource) string {
+	if r.Kind != "" {
+		return r.Kind
+	}
+	return r.Plural
+}
+
+// sortedResources returns a snapshot's resources in a stable order for
+// deterministic output.
+func sortedResources(s Snapshot) []Resource {
+	out := make([]Resource, 0, len(s))
+	for _, r := range s {
+		out = append(out, r)
+	}
+	sort.Slice(out, func(i, j int) bool {
+		if out[i].Group != out[j].Group {
+			return out[i].Group < out[j].Group
+		}
+		return out[i].Plural < out[j].Plural
+	})
+	return out
+}
diff --git a/internal/apigate/classify_test.go b/internal/apigate/classify_test.go
new file mode 100644
index 0000000000..9cb11c30cd
--- /dev/null
+++ b/internal/apigate/classify_test.go
@@ -0,0 +1,173 @@
+/*
+Copyright 2026 The Cozystack Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package apigate
+
+import "testing"
+
+// res is a small constructor for building test snapshots.
+func res(group, kind, plural string, src Source, schema Schema) Resource {
+	r := Resource{Group: group, Kind: kind, Plural: plural, Source: src, Versions: map[string]Schema{}}
+	if schema != nil {
+		r.Versions["v1alpha1"] = schema
+	}
+	return r
+}
+
+func snap(rs ...Resource) Snapshot {
+	s := Snapshot{}
+	for _, r := range rs {
+		s[r.key()] = r
+	}
+	return s
+}
+
+func countCategory(fs []Finding, c Category) int {
+	n := 0
+	for _, f := range fs {
+		if f.Category == c {
+			n++
+		}
+	}
+	return n
+}
+
+func TestClassify(t *testing.T) {
+	pgBase := res("apps.cozystack.io", "Postgres", "postgreses", SourceCozyRD,
+		Schema{"type": "object", "properties": map[string]any{"replicas": map[string]any{"type": "integer"}}})
+	pgBreaking := res("apps.cozystack.io", "Postgres", "postgreses", SourceCozyRD,
+		Schema{"type": "object", "properties": map[string]any{}})
+
+	t.Run("no change", func(t *testing.T) {
+		got := Classify(snap(pgBase), snap(pgBase))
+		if len(got) != 0 {
+			t.Fatalf("expected no findings, got %v", got)
+		}
+	})
+
+	t.Run("new resource in existing group", func(t *testing.T) {
+		redis := res("apps.cozystack.io", "Redis", "redises", SourceCozyRD, Schema{"type": "object"})
+		got := Classify(snap(pgBase), snap(pgBase, redis))
+		if n := countCategory(got, NewResource); n != 1 {
+			t.Fatalf("expected 1 new-resource finding, got %d (%v)", n, got)
+		}
+		if countCategory(got, NewGroup) != 0 {
+			t.Fatalf("existing group must not be flagged as new: %v", got)
+		}
+	})
+
+	t.Run("new group flags group once and does not double-count its resources", func(t *testing.T) {
+		sg1 := res("brandnew.cozystack.io", "Widget", "widgets", SourceCRD, Schema{"type": "object"})
+		sg2 := res("brandnew.cozystack.io", "Gadget", "gadgets", SourceCRD, Schema{"type": "object"})
+		got := Classify(snap(pgBase), snap(pgBase, sg1, sg2))
+		if n := countCategory(got, NewGroup); n != 1 {
+			t.Fatalf("expected exactly 1 new-group finding, got %d (%v)", n, got)
+		}
+		if n := countCategory(got, NewResource); n != 0 {
+			t.Fatalf("resources of a brand-new group must not also be flagged as new resources, got %d (%v)", n, got)
+		}
+	})
+
+	t.Run("breaking schema change", func(t *testing.T) {
+		got := Classify(snap(pgBase), snap(pgBreaking))
+		if n := countCategory(got, Breaking); n != 1 {
+			t.Fatalf("expected 1 breaking finding, got %d (%v)", n, got)
+		}
+	})
+
+	t.Run("removed resource is gated", func(t *testing.T) {
+		// Deleting a resource is the most disruptive single-resource change and
+		// must require owner review. The resource's group still has another
+		// member here, so this is a resource removal, not a group removal.
+		other := res("apps.cozystack.io", "Redis", "redises", SourceCozyRD, Schema{"type": "object"})
+		got := Classify(snap(pgBase, other), snap(other))
+		if n := countCategory(got, RemovedResource); n != 1 {
+			t.Fatalf("expected 1 removed-resource finding, got %d (%v)", n, got)
+		}
+		if countCategory(got, RemovedGroup) != 0 {
+			t.Fatalf("group still has a member; must not be flagged as removed group: %v", got)
+		}
+	})
+
+	t.Run("removed group flags group once and does not double-count its resources", func(t *testing.T) {
+		g1 := res("gone.cozystack.io", "Widget", "widgets", SourceCRD, Schema{"type": "object"})
+		g2 := res("gone.cozystack.io", "Gadget", "gadgets", SourceCRD, Schema{"type": "object"})
+		got := Classify(snap(pgBase, g1, g2), snap(pgBase))
+		if n := countCategory(got, RemovedGroup); n != 1 {
+			t.Fatalf("expected exactly 1 removed-group finding, got %d (%v)", n, got)
+		}
+		if n := countCategory(got, RemovedResource); n != 0 {
+			t.Fatalf("resources of a fully-removed group must not also be flagged as removed resources, got %d (%v)", n, got)
+		}
+	})
+
+	t.Run("static go-backed new resource is detected", func(t *testing.T) {
+		base := snap(res("core.cozystack.io", "", "tenantsecrets", SourceAPIServer, nil))
+		head := snap(
+			res("core.cozystack.io", "", "tenantsecrets", SourceAPIServer, nil),
+			res("core.cozystack.io", "", "tenantwidgets", SourceAPIServer, nil),
+		)
+		got := Classify(base, head)
+		if n := countCategory(got, NewResource); n != 1 {
+			t.Fatalf("expected 1 new-resource finding for static group, got %d (%v)", n, got)
+		}
+	})
+}
+
+// TestClassifyNameDeclaration covers the constraints an application declares
+// on its own metadata.name at the schema root: tightening one rejects names
+// the base accepted, loosening or dropping one does not.
+func TestClassifyNameDeclaration(t *testing.T) {
+	kube := func(declaration map[string]any) Resource {
+		s := Schema{"type": "object", "properties": map[string]any{}}
+		if declaration != nil {
+			s["x-cozystack-name"] = declaration
+		}
+		return res("apps.cozystack.io", "Kubernetes", "kuberneteses", SourceCozyRD, s)
+	}
+	capAt := func(n float64) map[string]any { return map[string]any{"type": "string", "maxLength": n} }
+	kubeRaw := func(declaration any) Resource {
+		s := Schema{"type": "object", "properties": map[string]any{}, "x-cozystack-name": declaration}
+		return res("apps.cozystack.io", "Kubernetes", "kuberneteses", SourceCozyRD, s)
+	}
+
+	for _, tc := range []struct {
+		name       string
+		base, head Resource
+		breaking   bool
+	}{
+		{"cap added", kube(nil), kube(capAt(32)), true},
+		{"cap lowered", kube(capAt(32)), kube(capAt(30)), true},
+		{"pattern added", kube(capAt(32)), kube(map[string]any{"type": "string", "maxLength": 32.0, "pattern": "^[a-z]+$"}), true},
+		{"cap raised", kube(capAt(32)), kube(capAt(40)), false},
+		{"cap dropped", kube(capAt(32)), kube(nil), false},
+		{"unchanged", kube(capAt(32)), kube(capAt(32)), false},
+		{"declaration turned into a string", kube(capAt(32)), kubeRaw("32"), true},
+		{"misspelled keyword", kube(nil), kube(map[string]any{"maxLenght": 32.0}), true},
+		{"null declaration", kube(capAt(32)), kubeRaw(nil), true},
+		{"annotation added", kube(capAt(32)), kube(map[string]any{"type": "string", "maxLength": 32.0, "title": "Name"}), false},
+	} {
+		t.Run(tc.name, func(t *testing.T) {
+			got := countCategory(Classify(snap(tc.base), snap(tc.head)), Breaking)
+			if tc.breaking && got != 1 {
+				t.Fatalf("expected 1 breaking finding, got %d", got)
+			}
+			if !tc.breaking && got != 0 {
+				t.Fatalf("expected no breaking finding, got %d", got)
+			}
+		})
+	}
+}
diff --git a/internal/apigate/model.go b/internal/apigate/model.go
new file mode 100644
index 0000000000..be08e71da4
--- /dev/null
+++ b/internal/apigate/model.go
@@ -0,0 +1,131 @@
+/*
+Copyright 2026 The Cozystack Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// Package apigate detects "sizeable" Cozystack API changes between two
+// checkouts of the repository so CI can require a review from a designated
+// API owner. Sizeable means one of: a new API group, a new resource, or a
+// breaking change to an existing resource's schema. The detection is fully
+// deterministic — it parses the checked-in, codegen-kept-in-sync artifacts
+// that define the served API surface, with no network or LLM calls.
+package apigate
+
+// Category classifies why a change is sizeable. The three values mirror the
+// gate's contract exactly.
+type Category string
+
+const (
+	// NewGroup is emitted when an API group appears in head but not base.
+	NewGroup Category = "new-api-group"
+	// NewResource is emitted when a (group, resource) pair appears in head
+	// but not base.
+	NewResource Category = "new-resource"
+	// Breaking is emitted when an existing resource's schema changes in a
+	// way that can reject requests or objects that the base schema accepted
+	// (removed field, narrowed type/enum, newly-required field, tightened
+	// constraint, removed served version).
+	Breaking Category = "breaking-change"
+	// RemovedGroup is emitted when an entire API group present in base is gone
+	// from head. Deleting a group withdraws its whole API surface.
+	RemovedGroup Category = "removed-api-group"
+	// RemovedResource is emitted when a (group, resource) present in base is
+	// gone from head — the most disruptive single-resource change, since every
+	// stored object and client of that resource breaks.
+	RemovedResource Category = "removed-resource"
+)
+
+// Source identifies which checked-in artifact a resource was parsed from.
+// It is carried through to findings so the report points reviewers at the
+// right file family.
+type Source string
+
+const (
+	// SourceCRD is a CustomResourceDefinition YAML manifest.
+	SourceCRD Source = "crd"
+	// SourceCozyRD is an ApplicationDefinition (cozyrd) backing the
+	// apps.cozystack.io aggregated API.
+	SourceCozyRD Source = "cozyrd"
+	// SourceAPIServer is a static Go-backed aggregated resource discovered
+	// from the apiserver storage registrations. These carry no checked-in
+	// schema, so they participate only in new-group / new-resource
+	// detection.
+	SourceAPIServer Source = "apiserver"
+	// SourceAPIService is a group/version registered via a kind: APIService
+	// manifest, delegating to an aggregated apiserver that may be built
+	// entirely outside this repository (no vendored Go types, no CRD). Like
+	// SourceAPIServer, these carry no checked-in schema, so they participate
+	// only in new-group / new-resource / removal detection.
+	SourceAPIService Source = "apiservice"
+)
+
+// Resource is the normalized identity + schema of one API resource, keyed
+// across base and head by (Group, Plural). Plural is always present; Kind may
+// be empty for static Go-backed resources whose kind is not recoverable from
+// the storage registration alone.
+type Resource struct {
+	Group  string
+	Kind   string
+	Plural string
+	Source Source
+	// Origin is the repo-relative path the resource was parsed from, used
+	// only for human-facing reporting.
+	Origin string
+	// Versions maps a served version name to its parsed schema. Empty for
+	// SourceAPIServer resources (schema lives only in Go structs, out of
+	// scope for breaking detection).
+	Versions map[string]Schema
+}
+
+// key is the base/head correlation key for a resource.
+func (r Resource) key() resourceKey { return resourceKey{Group: r.Group, Plural: r.Plural} }
+
+type resourceKey struct {
+	Group  string
+	Plural string
+}
+
+// Schema is a parsed JSON/OpenAPI-v3 schema node, using the generic
+// map[string]any shape produced by sigs.k8s.io/yaml (JSON number/string/bool
+// semantics). Comparing parsed nodes rather than raw text makes the diff
+// insensitive to key ordering and formatting, and lets us ignore purely
+// descriptive fields.
+type Schema map[string]any
+
+// Snapshot is the full set of API resources discovered in one checkout,
+// indexed by correlation key.
+type Snapshot map[resourceKey]Resource
+
+// groups returns the set of API group names present in the snapshot.
+func (s Snapshot) groups() map[string]struct{} {
+	out := make(map[string]struct{})
+	for k := range s {
+		out[k.Group] = struct{}{}
+	}
+	return out
+}
+
+// Finding is one reason a change is sizeable, ready to render into the CI
+// report.
+type Finding struct {
+	Category Category
+	Group    string
+	Kind     string
+	Plural   string
+	Source   Source
+	Origin   string
+	// Detail is a human-readable explanation. For Breaking findings it names
+	// the schema path and the nature of the break.
+	Detail string
+}
diff --git a/internal/apigate/parse.go b/internal/apigate/parse.go
new file mode 100644
index 0000000000..0fe248f6cb
--- /dev/null
+++ b/internal/apigate/parse.go
@@ -0,0 +1,355 @@
+/*
+Copyright 2026 The Cozystack Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package apigate
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+	"regexp"
+	"strings"
+
+	"sigs.k8s.io/yaml"
+)
+
+// appsGroup is the fixed API group served by the cozyrd ApplicationDefinitions.
+const appsGroup = "apps.cozystack.io"
+
+// ParseCozyRD parses an ApplicationDefinition (cozyrd) manifest into a single
+// apps.cozystack.io Resource. The apps group is served at v1alpha1 only, and
+// its per-resource schema lives in spec.application.openAPISchema as an
+// embedded JSON string.
+func ParseCozyRD(origin string, data []byte) (Resource, bool, error) {
+	var doc struct {
+		Kind string `json:"kind"`
+		Spec struct {
+			Application struct {
+				Kind          string `json:"kind"`
+				Plural        string `json:"plural"`
+				OpenAPISchema string `json:"openAPISchema"`
+			} `json:"application"`
+		} `json:"spec"`
+	}
+	if err := yaml.Unmarshal(data, &doc); err != nil {
+		return Resource{}, false, fmt.Errorf("%s: %w", origin, err)
+	}
+	if doc.Kind != "ApplicationDefinition" {
+		return Resource{}, false, nil
+	}
+	app := doc.Spec.Application
+	if app.Plural == "" {
+		return Resource{}, false, fmt.Errorf("%s: ApplicationDefinition has empty spec.application.plural", origin)
+	}
+	res := Resource{
+		Group:    appsGroup,
+		Kind:     app.Kind,
+		Plural:   app.Plural,
+		Source:   SourceCozyRD,
+		Origin:   origin,
+		Versions: map[string]Schema{},
+	}
+	if strings.TrimSpace(app.OpenAPISchema) != "" {
+		var sch Schema
+		if err := json.Unmarshal([]byte(app.OpenAPISchema), &sch); err != nil {
+			return Resource{}, false, fmt.Errorf("%s: spec.application.openAPISchema is not valid JSON: %w", origin, err)
+		}
+		res.Versions["v1alpha1"] = sch
+	}
+	return res, true, nil
+}
+
+// ParseCRDs parses a (possibly multi-document) CustomResourceDefinition YAML
+// file into one Resource per CRD, keyed by spec.group + spec.names.plural with
+// each served version's openAPIV3Schema. CRD discovery is content-based (any
+// file under the walked roots, regardless of directory name — see
+// discoverYAMLFiles), so a single file routinely mixes genuine CRD documents
+// with unrendered Helm markup (a `{{- if }}` guard, an `{{ include }}` call)
+// in neighboring documents of the same `---`-delimited stream. A document
+// that fails to parse as YAML is therefore skipped on its own rather than
+// aborting the whole file, so a real CRD sharing a file with templated
+// documents is still found.
+func ParseCRDs(origin string, data []byte) ([]Resource, error) {
+	var out []Resource
+	for i, docBytes := range splitYAMLDocs(data) {
+		if len(strings.TrimSpace(string(docBytes))) == 0 {
+			continue
+		}
+		res, ok, err := crdFromDoc(origin, i, docBytes)
+		if err != nil {
+			return nil, err
+		}
+		if ok {
+			out = append(out, res)
+		}
+	}
+	return out, nil
+}
+
+// crdFromDoc attempts to parse a single YAML document as a
+// CustomResourceDefinition. ok is false whenever the document is not a CRD,
+// including when it fails to parse at all; err is non-nil only when the
+// document unambiguously claims to be a CRD (right kind) but is structurally
+// incomplete. docKind is checked first so the fuller CRD-shaped unmarshal —
+// and its cost — is paid only for documents that are actually CRDs, since
+// LoadSnapshot's content-based walk runs this against every YAML file in the
+// tree, the overwhelming majority of which are not CRDs at all.
+func crdFromDoc(origin string, i int, docBytes []byte) (Resource, bool, error) {
+	if docKind(docBytes) != "CustomResourceDefinition" {
+		return Resource{}, false, nil
+	}
+	var doc struct {
+		Spec struct {
+			Group string `json:"group"`
+			Names struct {
+				Kind   string `json:"kind"`
+				Plural string `json:"plural"`
+			} `json:"names"`
+			Versions []struct {
+				Name   string `json:"name"`
+				Served bool   `json:"served"`
+				Schema struct {
+					OpenAPIV3Schema Schema `json:"openAPIV3Schema"`
+				} `json:"schema"`
+			} `json:"versions"`
+		} `json:"spec"`
+	}
+	if err := unmarshalYAMLDoc(docBytes, &doc); err != nil {
+		// docKind above already parsed this document successfully, so this
+		// would be surprising; tolerate it like any other unparseable
+		// document rather than erroring.
+		return Resource{}, false, nil
+	}
+	if doc.Spec.Group == "" || doc.Spec.Names.Plural == "" {
+		return Resource{}, false, fmt.Errorf("%s (document %d): CRD missing spec.group or spec.names.plural", origin, i)
+	}
+	res := Resource{
+		Group:    doc.Spec.Group,
+		Kind:     doc.Spec.Names.Kind,
+		Plural:   doc.Spec.Names.Plural,
+		Source:   SourceCRD,
+		Origin:   origin,
+		Versions: map[string]Schema{},
+	}
+	for _, v := range doc.Spec.Versions {
+		// Only served versions are live API surface. Skipping unserved
+		// versions keeps the classifier from diffing schemas no client can
+		// call, and makes the standard CRD deprecation step (flip
+		// served:true -> false) surface as a removed served version.
+		if v.Name == "" || !v.Served {
+			continue
+		}
+		res.Versions[v.Name] = v.Schema.OpenAPIV3Schema
+	}
+	return res, true, nil
+}
+
+// storageVarGroups maps the storage-map variable prefixes used in
+// pkg/apiserver/apiserver.go to their API group. The apps map is intentionally
+// omitted: apps.cozystack.io resources are discovered from the cozyrds, which
+// additionally carry their schema. A new entry here (or a new variable prefix
+// in the apiserver) is the signal to extend this table.
+var storageVarGroups = map[string]string{
+	"coreV1alpha1Storage": "core.cozystack.io",
+	"sdnV1alpha1Storage":  "sdn.cozystack.io",
+}
+
+// apiserverStorageRe matches `<var>["<plural>"]` storage registrations, e.g.
+//
+//	coreV1alpha1Storage["tenantsecrets"] = ...
+//
+// The plural class allows hyphens so a future hyphenated resource name is not
+// silently dropped. The apps storage map is indexed by a variable
+// (appsV1alpha1Storage[resConfig.Application.Plural]), not a string literal, so
+// it never matches here — the apps API is covered by the cozyrds instead.
+var apiserverStorageRe = regexp.MustCompile(`(\w+Storage)\["([a-z0-9-]+)"\]`)
+
+// unmappedStoragePrefix labels resources whose storage variable prefix is not
+// in storageVarGroups. Rather than silently dropping them — which would let a
+// contributor add a brand-new aggregated group under a new variable and bypass
+// the gate — they are surfaced under this synthetic group so the classifier
+// reports them as a new group/resource, prompting the reviewer to map the
+// prefix in storageVarGroups.
+const unmappedStoragePrefix = "unmapped-apiserver-storage:"
+
+// ParseAPIServerStorages extracts the static Go-backed aggregated resources
+// registered in pkg/apiserver/apiserver.go. Known variable prefixes map to
+// their real group (storageVarGroups); an unknown prefix is surfaced under a
+// synthetic group (unmappedStoragePrefix) so drift cannot silently defeat the
+// gate. These resources carry no checked-in schema, so they populate only the
+// new-group / new-resource / removal detection. Kind is left empty (not
+// recoverable from the registration line alone); reporting falls back to the
+// plural.
+func ParseAPIServerStorages(origin string, data []byte) []Resource {
+	var out []Resource
+	seen := map[resourceKey]struct{}{}
+	for _, m := range apiserverStorageRe.FindAllStringSubmatch(string(data), -1) {
+		prefix, plural := m[1], m[2]
+		group, ok := storageVarGroups[prefix]
+		if !ok {
+			group = unmappedStoragePrefix + prefix
+		}
+		k := resourceKey{Group: group, Plural: plural}
+		if _, dup := seen[k]; dup {
+			continue
+		}
+		seen[k] = struct{}{}
+		out = append(out, Resource{
+			Group:    group,
+			Plural:   plural,
+			Source:   SourceAPIServer,
+			Origin:   origin,
+			Versions: map[string]Schema{},
+		})
+	}
+	return out
+}
+
+// apiServicePlural is the sentinel Plural used for SourceAPIService
+// resources. An APIService does not describe an individual resource the way
+// a CRD or cozyrd does — it registers a whole (group, version) pair, served
+// by whatever aggregated apiserver binary the group's registration points
+// at, which may be built entirely outside this repository (no vendored Go
+// types, no checked-in CRD). The literal is namespaced with "$" so it can
+// never collide with a real plural name.
+const apiServicePlural = "$apiservice"
+
+// ParseAPIServices parses a (possibly multi-document) YAML file for
+// kind: APIService manifests, surfacing one schema-less Resource per
+// first-party (group, version) registration. Like ParseAPIServerStorages,
+// these resources carry no checked-in schema, so they participate only in
+// new-group / new-resource / removal detection via the shared
+// empty-Versions mechanism — diffResource has nothing to iterate, so no
+// Breaking finding is ever produced from one of these alone. Documents that
+// fail to parse (Helm markup sharing a file with a real APIService, as with
+// ParseCRDs) are skipped rather than failing the file.
+func ParseAPIServices(origin string, data []byte) []Resource {
+	var out []Resource
+	for _, docBytes := range splitYAMLDocs(data) {
+		if len(strings.TrimSpace(string(docBytes))) == 0 {
+			continue
+		}
+		if res, ok := apiServiceFromDoc(origin, docBytes); ok {
+			out = append(out, res)
+		}
+	}
+	return out
+}
+
+// apiServiceFromDoc attempts to parse a single YAML document as an
+// APIService. See crdFromDoc for why docKind is checked before the fuller
+// unmarshal.
+func apiServiceFromDoc(origin string, docBytes []byte) (Resource, bool) {
+	if docKind(docBytes) != "APIService" {
+		return Resource{}, false
+	}
+	var doc struct {
+		Spec struct {
+			Group   string `json:"group"`
+			Version string `json:"version"`
+		} `json:"spec"`
+	}
+	if err := unmarshalYAMLDoc(docBytes, &doc); err != nil {
+		return Resource{}, false
+	}
+	if doc.Spec.Group == "" || doc.Spec.Version == "" {
+		return Resource{}, false
+	}
+	return Resource{
+		Group:    doc.Spec.Group,
+		Kind:     "(aggregated apiserver)",
+		Plural:   apiServicePlural,
+		Source:   SourceAPIService,
+		Origin:   origin,
+		Versions: map[string]Schema{doc.Spec.Version: {}},
+	}, true
+}
+
+// helmDirectiveLine matches a line that is entirely Go-template/Helm markup
+// (`{{- if ... }}`, `{{- end }}`, `{{- /* comment */ -}}`), including its
+// trailing newline.
+var helmDirectiveLine = regexp.MustCompile(`(?m)^[ \t]*\{\{-?[^\n]*-?\}\}[ \t]*\r?\n?`)
+
+// unmarshalYAMLDoc decodes one `---`-delimited document, tolerating Helm
+// directive lines that share a document with otherwise-valid YAML. The
+// convention this repo's charts use for a raw CRD/APIService body is to wrap
+// the whole manifest in a single `{{- if }}...{{- end }}` block; the `{{- if
+// }}` half is naturally its own document (nothing precedes it since it opens
+// the block before a `---`), but the closing `{{- end }}` has no `---` before
+// it and so lands in the same document as the manifest itself — plain
+// yaml.Unmarshal rejects that whole document as invalid. Stripping
+// whole-line directives before decoding recovers the manifest; a document
+// that still fails after stripping is genuinely not YAML and is left to the
+// caller to skip.
+func unmarshalYAMLDoc(doc []byte, out any) error {
+	if err := yaml.Unmarshal(doc, out); err == nil {
+		return nil
+	}
+	return yaml.Unmarshal(helmDirectiveLine.ReplaceAll(doc, nil), out)
+}
+
+// docKind cheaply extracts a YAML document's top-level kind field, without
+// paying for a full CRD- or APIService-shaped unmarshal on documents that
+// are neither. LoadSnapshot's discovery walk scans every .yaml/.yml file
+// under packages/ and internal/ rather than a curated directory allowlist
+// (see discoverYAMLFiles), so the overwhelming majority of documents it
+// sees are not API manifests at all; probing kind first, once, keeps that
+// walk cheap.
+// mightBeAPIManifest is a cheap fast-reject shared by docKind (per document)
+// and LoadSnapshot (per whole file, before even splitting it into
+// documents). Both kinds this package looks for (crdFromDoc,
+// apiServiceFromDoc) appear as their own kind name verbatim in a valid
+// manifest; content containing neither substring cannot be either kind. This
+// is the overwhelming majority of what a content-based walk across the whole
+// tree sees — Deployments, Services, plain values trees, and everything else
+// that is neither a CRD nor an APIService — so rejecting on a raw substring
+// scan avoids the cost of the `---` split, the YAML parse attempt, and (for
+// a document that isn't valid strict YAML at all — an ordinary Helm
+// template) the further regex-stripped retry in unmarshalYAMLDoc.
+func mightBeAPIManifest(data []byte) bool {
+	return bytes.Contains(data, []byte("CustomResourceDefinition")) || bytes.Contains(data, []byte("APIService"))
+}
+
+func docKind(docBytes []byte) string {
+	if !mightBeAPIManifest(docBytes) {
+		return ""
+	}
+	var probe struct {
+		Kind string `json:"kind"`
+	}
+	if err := unmarshalYAMLDoc(docBytes, &probe); err != nil {
+		return ""
+	}
+	return probe.Kind
+}
+
+// yamlDocSeparator matches a `---` document-separator line. Compiled once at
+// package init rather than per splitYAMLDocs call, since LoadSnapshot's
+// content-based walk now runs this against every YAML file in the tree.
+var yamlDocSeparator = regexp.MustCompile(`(?m)^---\s*$`)
+
+// splitYAMLDocs splits a YAML stream into individual document byte slices on
+// `---` separators. It intentionally mirrors the simple splitting Helm and
+// kubectl use; CRD manifests in this repo do not embed `---` inside block
+// scalars, so line-based splitting is safe.
+func splitYAMLDocs(data []byte) [][]byte {
+	parts := yamlDocSeparator.Split(string(data), -1)
+	out := make([][]byte, 0, len(parts))
+	for _, p := range parts {
+		out = append(out, []byte(p))
+	}
+	return out
+}
diff --git a/internal/apigate/parse_test.go b/internal/apigate/parse_test.go
new file mode 100644
index 0000000000..8c6ba577dd
--- /dev/null
+++ b/internal/apigate/parse_test.go
@@ -0,0 +1,558 @@
+/*
+Copyright 2026 The Cozystack Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package apigate
+
+import (
+	"os"
+	"path/filepath"
+	"strings"
+	"testing"
+)
+
+const sampleCozyRD = `apiVersion: cozystack.io/v1alpha1
+kind: ApplicationDefinition
+metadata:
+  name: postgres
+spec:
+  application:
+    kind: Postgres
+    singular: postgres
+    plural: postgreses
+    openAPISchema: |-
+      {"type":"object","properties":{"replicas":{"type":"integer","default":2}}}
+`
+
+const sampleCRD = `apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  name: widgets.example.cozystack.io
+spec:
+  group: example.cozystack.io
+  names:
+    kind: Widget
+    plural: widgets
+  scope: Namespaced
+  versions:
+  - name: v1alpha1
+    served: true
+    storage: true
+    schema:
+      openAPIV3Schema:
+        type: object
+        properties:
+          spec:
+            type: object
+            properties:
+              size:
+                type: string
+`
+
+func TestParseCozyRD(t *testing.T) {
+	r, ok, err := ParseCozyRD("postgres.yaml", []byte(sampleCozyRD))
+	if err != nil || !ok {
+		t.Fatalf("ParseCozyRD failed: ok=%v err=%v", ok, err)
+	}
+	if r.Group != "apps.cozystack.io" || r.Kind != "Postgres" || r.Plural != "postgreses" {
+		t.Fatalf("unexpected identity: %+v", r)
+	}
+	if _, ok := r.Versions["v1alpha1"]; !ok {
+		t.Fatalf("expected v1alpha1 schema, got versions %v", r.Versions)
+	}
+}
+
+func TestParseCRDs(t *testing.T) {
+	rs, err := ParseCRDs("widget.yaml", []byte(sampleCRD))
+	if err != nil {
+		t.Fatalf("ParseCRDs failed: %v", err)
+	}
+	if len(rs) != 1 {
+		t.Fatalf("expected 1 CRD resource, got %d", len(rs))
+	}
+	r := rs[0]
+	if r.Group != "example.cozystack.io" || r.Kind != "Widget" || r.Plural != "widgets" {
+		t.Fatalf("unexpected identity: %+v", r)
+	}
+	if _, ok := r.Versions["v1alpha1"]; !ok {
+		t.Fatalf("expected v1alpha1 schema")
+	}
+}
+
+// TestParseCRDsSkipsUnservedVersions covers B7(a): a version flipped to
+// served:false is not live API surface and must be excluded, so the standard
+// CRD deprecation step surfaces later as a removed served version.
+func TestParseCRDsSkipsUnservedVersions(t *testing.T) {
+	const crd = `apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  name: widgets.example.cozystack.io
+spec:
+  group: example.cozystack.io
+  names: {kind: Widget, plural: widgets}
+  versions:
+  - name: v1alpha1
+    served: false
+    schema: {openAPIV3Schema: {type: object}}
+  - name: v1beta1
+    served: true
+    schema: {openAPIV3Schema: {type: object}}
+`
+	rs, err := ParseCRDs("widget.yaml", []byte(crd))
+	if err != nil {
+		t.Fatal(err)
+	}
+	if len(rs) != 1 {
+		t.Fatalf("expected 1 resource, got %d", len(rs))
+	}
+	if _, ok := rs[0].Versions["v1alpha1"]; ok {
+		t.Fatalf("unserved v1alpha1 must be excluded, got versions %v", rs[0].Versions)
+	}
+	if _, ok := rs[0].Versions["v1beta1"]; !ok {
+		t.Fatalf("served v1beta1 must be present, got versions %v", rs[0].Versions)
+	}
+}
+
+// TestParseCRDsToleratesTemplatedNeighborDocument reproduces the cozyplane
+// bug: a real CRD living in a chart's templates/ dir, guarded by a
+// `{{- if }}` block that is not valid YAML on its own. The malformed
+// neighbor document must not take the real CRD down with it.
+func TestParseCRDsToleratesTemplatedNeighborDocument(t *testing.T) {
+	const doc = `{{- /* CRDs are installed only in CRD mode */ -}}
+{{- if not .Values.apiserver.enabled }}
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  name: vpcs.sdn.cozystack.io
+spec:
+  group: sdn.cozystack.io
+  names: {kind: VPC, plural: vpcs}
+  versions:
+  - name: v1alpha1
+    served: true
+    schema: {openAPIV3Schema: {type: object}}
+{{- end }}
+`
+	rs, err := ParseCRDs("templates/crds.yaml", []byte(doc))
+	if err != nil {
+		t.Fatalf("ParseCRDs failed: %v", err)
+	}
+	if len(rs) != 1 || rs[0].Plural != "vpcs" {
+		t.Fatalf("expected the CRD sharing the file with templated markup to survive, got %v", rs)
+	}
+}
+
+// TestParseAPIServices covers the new APIService source: a first-party group
+// registration is surfaced as a schema-less resource, and a non-APIService or
+// incomplete document is ignored.
+func TestParseAPIServices(t *testing.T) {
+	const doc = `apiVersion: apiregistration.k8s.io/v1
+kind: APIService
+metadata:
+  name: v1alpha1.sdn.cozystack.io
+spec:
+  group: sdn.cozystack.io
+  version: v1alpha1
+  groupPriorityMinimum: 1000
+  versionPriority: 10
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: cozyplane-apiserver
+`
+	rs := ParseAPIServices("apiserver.yaml", []byte(doc))
+	if len(rs) != 1 {
+		t.Fatalf("expected exactly 1 APIService resource, got %v", rs)
+	}
+	r := rs[0]
+	if r.Group != "sdn.cozystack.io" || r.Source != SourceAPIService || r.Plural != apiServicePlural {
+		t.Fatalf("unexpected APIService resource: %+v", r)
+	}
+	if _, ok := r.Versions["v1alpha1"]; !ok {
+		t.Fatalf("expected v1alpha1 in versions, got %v", r.Versions)
+	}
+}
+
+func TestParseAPIServerStorages(t *testing.T) {
+	src := `
+	coreV1alpha1Storage["tenantsecrets"] = cozyregistry.RESTInPeace(x)
+	sdnV1alpha1Storage["securitygroups"] = cozyregistry.RESTInPeace(y)
+	appsV1alpha1Storage[resConfig.Application.Plural] = cozyregistry.RESTInPeace(z)
+	`
+	rs := ParseAPIServerStorages("apiserver.go", []byte(src))
+	got := map[string]string{}
+	for _, r := range rs {
+		got[r.Plural] = r.Group
+	}
+	if got["tenantsecrets"] != "core.cozystack.io" {
+		t.Fatalf("expected core tenantsecrets, got %v", got)
+	}
+	if got["securitygroups"] != "sdn.cozystack.io" {
+		t.Fatalf("expected sdn securitygroups, got %v", got)
+	}
+	if _, leaked := got["Plural"]; leaked {
+		t.Fatalf("apps dynamic registration must not be captured: %v", got)
+	}
+}
+
+// TestParseAPIServerStoragesSurfacesUnknownPrefix covers the drift guard: a new
+// aggregated group registered under an unlisted *Storage variable must not be
+// silently dropped, or it would bypass the gate entirely.
+func TestParseAPIServerStoragesSurfacesUnknownPrefix(t *testing.T) {
+	src := `newgroupV1alpha1Storage["foos"] = cozyregistry.RESTInPeace(x)`
+	rs := ParseAPIServerStorages("apiserver.go", []byte(src))
+	if len(rs) != 1 {
+		t.Fatalf("expected the unknown-prefix resource to be surfaced, got %v", rs)
+	}
+	if !strings.HasPrefix(rs[0].Group, unmappedStoragePrefix) {
+		t.Fatalf("unknown prefix must surface under the unmapped group, got %q", rs[0].Group)
+	}
+}
+
+// TestLoadSnapshotDiscoversCRDsUnderChartsCrds covers B6: a first-party CRD that
+// lives in a chart's crds/ directory (rather than a definitions/ dir) is still
+// discovered.
+func TestLoadSnapshotDiscoversCRDsUnderChartsCrds(t *testing.T) {
+	root := t.TempDir()
+	write := func(rel, content string) {
+		p := filepath.Join(root, filepath.FromSlash(rel))
+		if err := os.MkdirAll(filepath.Dir(p), 0o755); err != nil {
+			t.Fatal(err)
+		}
+		if err := os.WriteFile(p, []byte(content), 0o644); err != nil {
+			t.Fatal(err)
+		}
+	}
+	write("packages/system/foo/charts/foo/crds/example.cozystack.io_widgets.yaml", sampleCRD)
+
+	snap, err := LoadSnapshot(root)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if _, ok := snap[resourceKey{Group: "example.cozystack.io", Plural: "widgets"}]; !ok {
+		t.Fatalf("CRD under charts/*/crds/ was not discovered: %v", snap)
+	}
+}
+
+// TestLoadSnapshotDiscoversCRDUnderTemplatesDir reproduces the real gap found
+// in the cozyplane PR: a raw CRD document guarded by `{{- if }}`, sitting in a
+// chart's templates/ dir (not crds/), must still be discovered — directory
+// name is no longer the discovery signal, file content is.
+func TestLoadSnapshotDiscoversCRDUnderTemplatesDir(t *testing.T) {
+	root := t.TempDir()
+	write := func(rel, content string) {
+		p := filepath.Join(root, filepath.FromSlash(rel))
+		if err := os.MkdirAll(filepath.Dir(p), 0o755); err != nil {
+			t.Fatal(err)
+		}
+		if err := os.WriteFile(p, []byte(content), 0o644); err != nil {
+			t.Fatal(err)
+		}
+	}
+	write("packages/system/cozyplane/templates/crds.yaml", `{{- if not .Values.apiserver.enabled }}
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  name: vpcs.sdn.cozystack.io
+spec:
+  group: sdn.cozystack.io
+  names: {kind: VPC, plural: vpcs}
+  versions:
+  - name: v1alpha1
+    served: true
+    schema: {openAPIV3Schema: {type: object}}
+{{- end }}
+`)
+
+	snap, err := LoadSnapshot(root)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if _, ok := snap[resourceKey{Group: "sdn.cozystack.io", Plural: "vpcs"}]; !ok {
+		t.Fatalf("CRD under templates/ was not discovered: %v", snap)
+	}
+}
+
+// TestLoadSnapshotDiscoversAPIServiceAndTripsNewGroup covers the other half of
+// the cozyplane gap: a group served only by an aggregated apiserver (no CRD,
+// no cozyrd, no apiserver.go entry) — its schema lives entirely outside this
+// repo, but the group's first appearance must still require review. Versions
+// registered via separate sibling APIService objects (one per version, the
+// real-world shape) must merge onto the same resource.
+func TestLoadSnapshotDiscoversAPIServiceAndTripsNewGroup(t *testing.T) {
+	root := t.TempDir()
+	write := func(rel, content string) {
+		p := filepath.Join(root, filepath.FromSlash(rel))
+		if err := os.MkdirAll(filepath.Dir(p), 0o755); err != nil {
+			t.Fatal(err)
+		}
+		if err := os.WriteFile(p, []byte(content), 0o644); err != nil {
+			t.Fatal(err)
+		}
+	}
+	write("packages/system/cozyplane/templates/apiserver-v1alpha1.yaml", `apiVersion: apiregistration.k8s.io/v1
+kind: APIService
+metadata: {name: v1alpha1.sdn.cozystack.io}
+spec: {group: sdn.cozystack.io, version: v1alpha1}
+`)
+	write("packages/system/cozyplane/templates/apiserver-v1beta1.yaml", `apiVersion: apiregistration.k8s.io/v1
+kind: APIService
+metadata: {name: v1beta1.sdn.cozystack.io}
+spec: {group: sdn.cozystack.io, version: v1beta1}
+`)
+
+	// A minimal but non-empty base, unrelated to sdn.cozystack.io.
+	baseRoot := t.TempDir()
+	writeBase := func(rel, content string) {
+		p := filepath.Join(baseRoot, filepath.FromSlash(rel))
+		if err := os.MkdirAll(filepath.Dir(p), 0o755); err != nil {
+			t.Fatal(err)
+		}
+		if err := os.WriteFile(p, []byte(content), 0o644); err != nil {
+			t.Fatal(err)
+		}
+	}
+	writeBase("packages/system/postgres-rd/cozyrds/postgres.yaml", sampleCozyRD)
+
+	base, err := LoadSnapshot(baseRoot)
+	if err != nil {
+		t.Fatal(err)
+	}
+	head, err := LoadSnapshot(root)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	key := resourceKey{Group: "sdn.cozystack.io", Plural: apiServicePlural}
+	res, ok := head[key]
+	if !ok {
+		t.Fatalf("APIService group was not discovered: %v", head)
+	}
+	if _, ok := res.Versions["v1alpha1"]; !ok {
+		t.Fatalf("expected v1alpha1 merged in, got %v", res.Versions)
+	}
+	if _, ok := res.Versions["v1beta1"]; !ok {
+		t.Fatalf("expected v1beta1 from the sibling APIService object merged in, got %v", res.Versions)
+	}
+
+	if countCategory(Classify(base, head), NewGroup) != 1 {
+		t.Fatalf("expected the APIService-only group to trip NewGroup, got %v", Classify(base, head))
+	}
+}
+
+// TestLoadSnapshotIgnoresThirdPartyManifestsUnderTemplates guards against the
+// content-based walk becoming too permissive: a vendored CRD and APIService
+// for a non-cozystack.io group, sitting in the exact same templates/ shape,
+// must still be filtered out.
+func TestLoadSnapshotIgnoresThirdPartyManifestsUnderTemplates(t *testing.T) {
+	root := t.TempDir()
+	write := func(rel, content string) {
+		p := filepath.Join(root, filepath.FromSlash(rel))
+		if err := os.MkdirAll(filepath.Dir(p), 0o755); err != nil {
+			t.Fatal(err)
+		}
+		if err := os.WriteFile(p, []byte(content), 0o644); err != nil {
+			t.Fatal(err)
+		}
+	}
+	write("packages/system/cert-manager/templates/crds.yaml", `apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata: {name: certificates.cert-manager.io}
+spec:
+  group: cert-manager.io
+  names: {kind: Certificate, plural: certificates}
+  versions:
+  - name: v1
+    served: true
+    schema: {openAPIV3Schema: {type: object}}
+`)
+	write("packages/system/metrics/templates/apiservice.yaml", `apiVersion: apiregistration.k8s.io/v1
+kind: APIService
+metadata: {name: v1beta1.metrics.k8s.io}
+spec: {group: metrics.k8s.io, version: v1beta1}
+`)
+	// Give the checkout a first-party resource so LoadSnapshot's
+	// empty-snapshot guard doesn't fire for an unrelated reason.
+	write("packages/system/postgres-rd/cozyrds/postgres.yaml", sampleCozyRD)
+
+	snap, err := LoadSnapshot(root)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if _, ok := snap[resourceKey{Group: "cert-manager.io", Plural: "certificates"}]; ok {
+		t.Fatalf("vendored third-party CRD must not be discovered: %v", snap)
+	}
+	if _, ok := snap[resourceKey{Group: "metrics.k8s.io", Plural: apiServicePlural}]; ok {
+		t.Fatalf("vendored third-party APIService must not be discovered: %v", snap)
+	}
+}
+
+// TestLoadSnapshotSkipsOversizedFiles guards the size cap added alongside
+// content-based discovery: since every .yaml/.yml file in the tree is now a
+// candidate (no directory allowlist), an untrusted PR head checkout could
+// otherwise force an unbounded read/parse of a pathologically large file. A
+// first-party CRD past maxYAMLFileSize must be excluded from discovery.
+func TestLoadSnapshotSkipsOversizedFiles(t *testing.T) {
+	root := t.TempDir()
+	write := func(rel, content string) {
+		p := filepath.Join(root, filepath.FromSlash(rel))
+		if err := os.MkdirAll(filepath.Dir(p), 0o755); err != nil {
+			t.Fatal(err)
+		}
+		if err := os.WriteFile(p, []byte(content), 0o644); err != nil {
+			t.Fatal(err)
+		}
+	}
+	padding := strings.Repeat("# padding\n", (maxYAMLFileSize/len("# padding\n"))+1)
+	write("packages/system/oversized/crds/widgets.yaml", padding+sampleCRD)
+	// A small, legitimate resource so the empty-snapshot guard doesn't fire
+	// for an unrelated reason.
+	write("packages/system/postgres-rd/cozyrds/postgres.yaml", sampleCozyRD)
+
+	snap, err := LoadSnapshot(root)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if _, ok := snap[resourceKey{Group: "example.cozystack.io", Plural: "widgets"}]; ok {
+		t.Fatalf("CRD in a file past maxYAMLFileSize must be excluded: %v", snap)
+	}
+}
+
+// TestLoadSnapshotMergesAPIServiceOriginAcrossFiles covers the traceability
+// fix: when a group's versions are registered via several sibling APIService
+// objects in different files (the real-world shape — one object per
+// version), the merged resource's Origin must mention every contributing
+// file, not just the first one encountered.
+func TestLoadSnapshotMergesAPIServiceOriginAcrossFiles(t *testing.T) {
+	root := t.TempDir()
+	write := func(rel, content string) {
+		p := filepath.Join(root, filepath.FromSlash(rel))
+		if err := os.MkdirAll(filepath.Dir(p), 0o755); err != nil {
+			t.Fatal(err)
+		}
+		if err := os.WriteFile(p, []byte(content), 0o644); err != nil {
+			t.Fatal(err)
+		}
+	}
+	write("packages/system/cozyplane/templates/apiserver-v1alpha1.yaml", `apiVersion: apiregistration.k8s.io/v1
+kind: APIService
+metadata: {name: v1alpha1.sdn.cozystack.io}
+spec: {group: sdn.cozystack.io, version: v1alpha1}
+`)
+	write("packages/system/cozyplane/templates/apiserver-v1beta1.yaml", `apiVersion: apiregistration.k8s.io/v1
+kind: APIService
+metadata: {name: v1beta1.sdn.cozystack.io}
+spec: {group: sdn.cozystack.io, version: v1beta1}
+`)
+
+	snap, err := LoadSnapshot(root)
+	if err != nil {
+		t.Fatal(err)
+	}
+	res, ok := snap[resourceKey{Group: "sdn.cozystack.io", Plural: apiServicePlural}]
+	if !ok {
+		t.Fatalf("APIService group was not discovered: %v", snap)
+	}
+	for _, want := range []string{
+		"packages/system/cozyplane/templates/apiserver-v1alpha1.yaml",
+		"packages/system/cozyplane/templates/apiserver-v1beta1.yaml",
+	} {
+		if !strings.Contains(res.Origin, want) {
+			t.Fatalf("expected Origin to mention %q, got %q", want, res.Origin)
+		}
+	}
+}
+
+// BenchmarkLoadSnapshotRealTree tracks LoadSnapshot's wall-clock cost against
+// this repository's own checkout — the actual worst case the CI gate runs
+// against on every PR. Content-based discovery (see discoverYAMLFiles) scans
+// every .yaml/.yml file under packages/ and internal/, not a curated
+// directory allowlist, so this is meant to catch a future change that
+// reintroduces redundant per-file work (e.g. splitting or parsing the same
+// file's documents more than once). Run with:
+//
+//	go test ./internal/apigate/ -run '^$' -bench LoadSnapshotRealTree
+func BenchmarkLoadSnapshotRealTree(b *testing.B) {
+	for b.Loop() {
+		if _, err := LoadSnapshot("../.."); err != nil {
+			b.Fatal(err)
+		}
+	}
+}
+
+// TestLoadSnapshotEmptyErrors covers the silent-bypass guard: an empty result
+// (e.g. wrong directory) must be an error, not a clean pass.
+func TestLoadSnapshotEmptyErrors(t *testing.T) {
+	if _, err := LoadSnapshot(t.TempDir()); err == nil {
+		t.Fatal("expected an error for a directory with no API resources")
+	}
+}
+
+// TestIsFirstPartyGroup covers the subdomain check: only cozystack.io and its
+// dot-delimited subdomains are first-party; a lookalike suffix is not.
+func TestIsFirstPartyGroup(t *testing.T) {
+	cases := map[string]bool{
+		"cozystack.io":                  true,
+		"apps.cozystack.io":             true,
+		"strategy.backups.cozystack.io": true,
+		"fakecozystack.io":              false,
+		"cozystack.io.evil.com":         false,
+		"cert-manager.io":               false,
+	}
+	for group, want := range cases {
+		if got := isFirstPartyGroup(group); got != want {
+			t.Errorf("isFirstPartyGroup(%q) = %v, want %v", group, got, want)
+		}
+	}
+}
+
+// TestLoadSnapshotEndToEnd builds two minimal checkouts on disk and verifies
+// the loader + classifier wire together across all three sources.
+func TestLoadSnapshotEndToEnd(t *testing.T) {
+	base := t.TempDir()
+	head := t.TempDir()
+
+	write := func(root, rel, content string) {
+		p := filepath.Join(root, filepath.FromSlash(rel))
+		if err := os.MkdirAll(filepath.Dir(p), 0o755); err != nil {
+			t.Fatal(err)
+		}
+		if err := os.WriteFile(p, []byte(content), 0o644); err != nil {
+			t.Fatal(err)
+		}
+	}
+
+	// Base has just Postgres.
+	write(base, "packages/system/postgres-rd/cozyrds/postgres.yaml", sampleCozyRD)
+	// Head keeps Postgres and adds a brand-new CRD group.
+	write(head, "packages/system/postgres-rd/cozyrds/postgres.yaml", sampleCozyRD)
+	write(head, "internal/crdinstall/manifests/example.yaml", sampleCRD)
+
+	baseSnap, err := LoadSnapshot(base)
+	if err != nil {
+		t.Fatal(err)
+	}
+	headSnap, err := LoadSnapshot(head)
+	if err != nil {
+		t.Fatal(err)
+	}
+	findings := Classify(baseSnap, headSnap)
+	if countCategory(findings, NewGroup) != 1 {
+		t.Fatalf("expected 1 new-group finding, got %v", findings)
+	}
+}
diff --git a/internal/apigate/report.go b/internal/apigate/report.go
new file mode 100644
index 0000000000..e5737edcb0
--- /dev/null
+++ b/internal/apigate/report.go
@@ -0,0 +1,97 @@
+/*
+Copyright 2026 The Cozystack Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package apigate
+
+import (
+	"fmt"
+	"strings"
+)
+
+// categoryTitles gives each category a stable, human-readable heading.
+var categoryTitles = map[Category]string{
+	NewGroup:        "New API group",
+	NewResource:     "New resource",
+	RemovedGroup:    "Removed API group",
+	RemovedResource: "Removed resource",
+	Breaking:        "Breaking change to existing API",
+}
+
+// categoryOrder is the stable order categories are rendered in.
+var categoryOrder = []Category{NewGroup, NewResource, RemovedGroup, RemovedResource, Breaking}
+
+// Report renders findings for CI consumption. format "markdown" (default)
+// produces a PR-comment-friendly summary; any other value produces plain text.
+func Report(findings []Finding, format string) string {
+	if len(findings) == 0 {
+		return "No sizeable API changes detected.\n"
+	}
+	var b strings.Builder
+	md := format != "text"
+
+	if md {
+		b.WriteString("### Sizeable API change detected\n\n")
+		b.WriteString("This change touches the API surface in a way that requires review from a designated API owner.\n\n")
+	} else {
+		b.WriteString("Sizeable API change detected:\n\n")
+	}
+
+	for _, cat := range categoryOrder {
+		group := findingsOf(findings, cat)
+		if len(group) == 0 {
+			continue
+		}
+		if md {
+			fmt.Fprintf(&b, "#### %s\n\n", categoryTitles[cat])
+		} else {
+			fmt.Fprintf(&b, "%s:\n", categoryTitles[cat])
+		}
+		for _, f := range group {
+			line := fmt.Sprintf("%s %s — %s (%s)", identity(f, md), f.Detail, f.Origin, f.Source)
+			if md {
+				fmt.Fprintf(&b, "- %s\n", line)
+			} else {
+				fmt.Fprintf(&b, "  - %s\n", line)
+			}
+		}
+		b.WriteString("\n")
+	}
+	return b.String()
+}
+
+// identity renders the resource identity, emphasized only in Markdown mode so
+// text output stays free of markup.
+func identity(f Finding, markdown bool) string {
+	kind := f.Kind
+	if kind == "" {
+		kind = f.Plural
+	}
+	id := fmt.Sprintf("%s/%s", f.Group, kind)
+	if markdown {
+		return "**" + id + "**"
+	}
+	return id
+}
+
+func findingsOf(findings []Finding, cat Category) []Finding {
+	var out []Finding
+	for _, f := range findings {
+		if f.Category == cat {
+			out = append(out, f)
+		}
+	}
+	return out
+}
diff --git a/internal/apigate/schemadiff.go b/internal/apigate/schemadiff.go
new file mode 100644
index 0000000000..7b151facf0
--- /dev/null
+++ b/internal/apigate/schemadiff.go
@@ -0,0 +1,420 @@
+/*
+Copyright 2026 The Cozystack Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package apigate
+
+import (
+	"encoding/json"
+	"fmt"
+	"reflect"
+	"sort"
+	"strings"
+
+	appsv1alpha1 "github.com/cozystack/cozystack/pkg/apis/apps/v1alpha1"
+	"github.com/cozystack/cozystack/pkg/apis/apps/validation"
+)
+
+// diffSchema walks a base and head OpenAPIv3Schema node in lockstep and
+// returns a description of every *breaking* difference — one that can reject a
+// request or stored object the base schema accepted. Additive changes (a new
+// optional property, a widened type, an added enum value, a relaxed
+// constraint, a changed description or default) return nothing.
+//
+// The rules are deliberately conservative in the safe direction: when a
+// constraint's equivalence cannot be proven cheaply (e.g. a changed regex
+// pattern), the change is treated as breaking rather than risk waving through
+// a real incompatibility.
+func diffSchema(path string, base, head Schema) []string {
+	var out []string
+	diffNode(path, base, head, &out)
+	sort.Strings(out)
+	return out
+}
+
+// diffNameSchema reports a tightened constraint on metadata.name. An
+// application declares those beside "properties" at the schema root, where the
+// walk over spec never looks. A declaration the API server cannot enforce
+// refuses every create of the kind, the harshest outcome a schema change can
+// have, so it is reported whenever it changes. The type is left out of the
+// diff: a name is a string whether or not the declaration says so.
+func diffNameSchema(base, head Schema) []string {
+	headRaw, present := head[appsv1alpha1.NameSchemaExtension]
+	if !present || reflect.DeepEqual(base[appsv1alpha1.NameSchemaExtension], headRaw) {
+		return nil
+	}
+	encoded, err := json.Marshal(headRaw)
+	if err == nil {
+		_, err = validation.ParseNameDeclaration(encoded)
+	}
+	if err != nil {
+		return []string{fmt.Sprintf("metadata.name: %s cannot be enforced, so every create of this kind is refused: %v", appsv1alpha1.NameSchemaExtension, err)}
+	}
+	return diffSchema("metadata.name", nameDeclaration(base), nameDeclaration(head))
+}
+
+func nameDeclaration(s Schema) Schema {
+	declared, ok := s[appsv1alpha1.NameSchemaExtension].(map[string]any)
+	if !ok {
+		return nil
+	}
+	out := Schema{}
+	for k, v := range declared {
+		if k != "type" {
+			out[k] = v
+		}
+	}
+	return out
+}
+
+func diffNode(path string, base, head Schema, out *[]string) {
+	// A nil head means the schema at this path was removed entirely. Dropping a
+	// constraint is a widening, never a break, so there is nothing to report.
+	// Callers avoid handing us a nil head for genuine field/version removals
+	// (those are reported by the parent), so this only guards the defensive
+	// case of a child schema that vanished.
+	if head == nil {
+		return
+	}
+
+	// Type constraint changes:
+	//   base unconstrained, head constrained  -> breaking (rejects other types)
+	//   both constrained, head drops a type   -> breaking (narrowing)
+	//   head unconstrained                     -> safe (widening)
+	bt, ht := schemaTypes(base), schemaTypes(head)
+	switch {
+	case len(bt) == 0 && len(ht) > 0:
+		*out = append(*out, fmt.Sprintf("%s: type constraint added, now only accepts %s", path, strings.Join(sortedKeys(ht), "/")))
+	case len(bt) > 0 && len(ht) > 0:
+		if removed := setDiff(bt, ht); len(removed) > 0 {
+			*out = append(*out, fmt.Sprintf("%s: type narrowed, no longer accepts %s", path, strings.Join(removed, "/")))
+		}
+	}
+
+	// Enum: removing an allowed value, or introducing an enum where none
+	// existed, shrinks the accepted set.
+	be, hasBaseEnum := schemaEnum(base)
+	he, hasHeadEnum := schemaEnum(head)
+	switch {
+	case !hasBaseEnum && hasHeadEnum:
+		*out = append(*out, fmt.Sprintf("%s: enum constraint added (previously unrestricted)", path))
+	case hasBaseEnum && hasHeadEnum:
+		if removed := setDiff(be, he); len(removed) > 0 {
+			*out = append(*out, fmt.Sprintf("%s: enum value(s) removed: %s", path, strings.Join(removed, ", ")))
+		}
+	}
+
+	// Pattern: an added or changed regex may reject previously-valid strings.
+	// A removed pattern is a relaxation and is safe.
+	bp := schemaString(base, "pattern")
+	hp := schemaString(head, "pattern")
+	if hp != "" && hp != bp {
+		if bp == "" {
+			*out = append(*out, fmt.Sprintf("%s: pattern constraint added (%q)", path, hp))
+		} else {
+			*out = append(*out, fmt.Sprintf("%s: pattern changed (%q -> %q)", path, bp, hp))
+		}
+	}
+
+	// Numeric and length bounds: a tightened or newly-added bound can reject
+	// previously-valid values.
+	diffLowerBound(path, "minimum", base, head, out)
+	diffLowerBound(path, "minLength", base, head, out)
+	diffLowerBound(path, "minItems", base, head, out)
+	diffUpperBound(path, "maximum", base, head, out)
+	diffUpperBound(path, "maxLength", base, head, out)
+	diffUpperBound(path, "maxItems", base, head, out)
+
+	// Required: a field required in head but not in base breaks clients (and
+	// stored objects) that omit it — whether the field is newly added or was
+	// previously optional.
+	baseReq, headReq := schemaRequired(base), schemaRequired(head)
+	for _, name := range sortedKeys(headReq) {
+		if !baseReq[name] {
+			*out = append(*out, fmt.Sprintf("%s: field %q is now required", path, name))
+		}
+	}
+
+	// CEL validation rules (x-kubernetes-validations): a rule present in head
+	// but not in base can reject previously-valid values or updates. Removing a
+	// rule is a relaxation and is safe, mirroring how pattern/enum are treated.
+	baseRules, headRules := schemaValidationRules(base), schemaValidationRules(head)
+	for _, rule := range setDiff(headRules, baseRules) {
+		*out = append(*out, fmt.Sprintf("%s: validation rule added (%q)", path, rule))
+	}
+
+	// nullable: Kubernetes expresses "may be null" via nullable:true rather than
+	// a "null" entry in the type set. Dropping it rejects previously-valid null
+	// values, so a true -> false/absent transition is breaking.
+	if schemaBool(base, "nullable") && !schemaBool(head, "nullable") {
+		*out = append(*out, fmt.Sprintf("%s: no longer nullable (null values rejected)", path))
+	}
+
+	// Composition keywords (oneOf/allOf/not): introducing one where base had
+	// none can reject previously-valid objects. Conservative like the rest of
+	// the file — flag an addition; removing a composition constraint is a
+	// relaxation and is safe.
+	for _, kw := range []string{"oneOf", "allOf", "not"} {
+		if _, inBase := base[kw]; inBase {
+			continue
+		}
+		if _, inHead := head[kw]; inHead {
+			*out = append(*out, fmt.Sprintf("%s: %s composition constraint added", path, kw))
+		}
+	}
+
+	// Properties: recurse into shared properties; flag removals. A brand-new
+	// property is additive unless it is required (handled above).
+	baseProps, headProps := schemaProps(base), schemaProps(head)
+	for _, name := range sortedKeys(baseProps) {
+		child := childPath(path, name)
+		hp, ok := headProps[name]
+		if !ok {
+			*out = append(*out, fmt.Sprintf("%s: field %q was removed", path, name))
+			continue
+		}
+		diffNode(child, baseProps[name], hp, out)
+	}
+
+	// additionalProperties governs undeclared fields; its permissiveness runs
+	// false (none) < schema (matching) < true/absent (any).
+	//   - open -> false:        breaking (fields once accepted now rejected)
+	//   - open -> schema:       recurse; adding a schema to a previously-open
+	//                           map is itself a restriction, caught by diffing
+	//                           the new schema against an empty (unconstrained)
+	//                           base.
+	//   - base false -> *:      relaxation (base accepted nothing), so safe.
+	//   - open -> true/absent:  relaxation, safe.
+	baseOpenAP := base["additionalProperties"] != false
+	if baseOpenAP && head["additionalProperties"] == false {
+		*out = append(*out, fmt.Sprintf("%s: additionalProperties restricted to false (undeclared fields no longer accepted)", path))
+	} else if baseOpenAP {
+		if b, h, ok := childSchemas(base, head, "additionalProperties"); ok {
+			diffNode(path+"{}", b, h, out)
+		}
+	}
+
+	// items: recurse whenever head defines an item schema. When base has none,
+	// the head schema is diffed against an empty base so that constraining a
+	// previously-unconstrained array element is caught; a base schema with no
+	// head counterpart is a relaxation and is skipped.
+	if b, h, ok := childSchemas(base, head, "items"); ok {
+		diffNode(path+"[]", b, h, out)
+	}
+}
+
+// diffLowerBound flags a lower-bound (minimum/minLength/minItems) that was
+// added or raised — both reject values the base accepted.
+func diffLowerBound(path, key string, base, head Schema, out *[]string) {
+	bv, hasB := schemaNumber(base, key)
+	hv, hasH := schemaNumber(head, key)
+	if !hasH {
+		return
+	}
+	if !hasB {
+		*out = append(*out, fmt.Sprintf("%s: %s constraint added (%s)", path, key, formatNum(hv)))
+	} else if hv > bv {
+		*out = append(*out, fmt.Sprintf("%s: %s raised (%s -> %s)", path, key, formatNum(bv), formatNum(hv)))
+	}
+}
+
+// diffUpperBound flags an upper-bound (maximum/maxLength/maxItems) that was
+// added or lowered.
+func diffUpperBound(path, key string, base, head Schema, out *[]string) {
+	bv, hasB := schemaNumber(base, key)
+	hv, hasH := schemaNumber(head, key)
+	if !hasH {
+		return
+	}
+	if !hasB {
+		*out = append(*out, fmt.Sprintf("%s: %s constraint added (%s)", path, key, formatNum(hv)))
+	} else if hv < bv {
+		*out = append(*out, fmt.Sprintf("%s: %s lowered (%s -> %s)", path, key, formatNum(bv), formatNum(hv)))
+	}
+}
+
+// --- schema field accessors -------------------------------------------------
+
+// schemaTypes returns the set of JSON types a node accepts, gathering both the
+// scalar/array `type` keyword and any `anyOf[].type` (as used by the
+// int-or-string quantity fields). An empty set means "unconstrained".
+func schemaTypes(s Schema) map[string]struct{} {
+	out := map[string]struct{}{}
+	switch t := s["type"].(type) {
+	case string:
+		if t != "" {
+			out[t] = struct{}{}
+		}
+	case []any:
+		for _, v := range t {
+			if str, ok := v.(string); ok {
+				out[str] = struct{}{}
+			}
+		}
+	}
+	if anyOf, ok := s["anyOf"].([]any); ok {
+		for _, v := range anyOf {
+			if sub, ok := v.(map[string]any); ok {
+				if str, ok := sub["type"].(string); ok && str != "" {
+					out[str] = struct{}{}
+				}
+			}
+		}
+	}
+	return out
+}
+
+// schemaEnum returns the enum value set and whether an enum was declared.
+func schemaEnum(s Schema) (map[string]struct{}, bool) {
+	raw, ok := s["enum"].([]any)
+	if !ok {
+		return nil, false
+	}
+	out := make(map[string]struct{}, len(raw))
+	for _, v := range raw {
+		out[fmt.Sprintf("%v", v)] = struct{}{}
+	}
+	return out, true
+}
+
+// schemaRequired returns the set of required property names at a node.
+func schemaRequired(s Schema) map[string]bool {
+	out := map[string]bool{}
+	if raw, ok := s["required"].([]any); ok {
+		for _, v := range raw {
+			if name, ok := v.(string); ok {
+				out[name] = true
+			}
+		}
+	}
+	return out
+}
+
+// schemaProps returns the child property schemas at a node.
+func schemaProps(s Schema) map[string]Schema {
+	out := map[string]Schema{}
+	if raw, ok := s["properties"].(map[string]any); ok {
+		for name, v := range raw {
+			if sub, ok := v.(map[string]any); ok {
+				out[name] = Schema(sub)
+			}
+		}
+	}
+	return out
+}
+
+// childSchemas extracts a named child schema (items or additionalProperties)
+// for recursion. It reports ok only when HEAD carries a schema object; base's
+// counterpart is returned when present and an empty schema otherwise. The
+// asymmetry is deliberate:
+//   - head schema, base schema   -> diff them (nested changes).
+//   - head schema, base none     -> diff head against an empty base, so that
+//     constraining a previously-unconstrained array element / map value
+//     (base absent or true) surfaces as breaking.
+//   - head none, base schema     -> ok=false: removing a child schema loosens
+//     the contract (relaxation), so it is skipped.
+//
+// A boolean additionalProperties (true/false) is not a schema object and is
+// handled separately by the caller.
+func childSchemas(base, head Schema, key string) (Schema, Schema, bool) {
+	h, ok := head[key].(map[string]any)
+	if !ok {
+		return nil, nil, false
+	}
+	b, _ := base[key].(map[string]any) // nil -> empty (unconstrained) base schema
+	return Schema(b), Schema(h), true
+}
+
+// schemaValidationRules returns the set of CEL rule expressions declared in a
+// node's x-kubernetes-validations, keyed by the rule string so that a reworded
+// or tightened rule reads as a new rule.
+func schemaValidationRules(s Schema) map[string]struct{} {
+	out := map[string]struct{}{}
+	raw, ok := s["x-kubernetes-validations"].([]any)
+	if !ok {
+		return out
+	}
+	for _, v := range raw {
+		if entry, ok := v.(map[string]any); ok {
+			if rule, ok := entry["rule"].(string); ok && rule != "" {
+				out[rule] = struct{}{}
+			}
+		}
+	}
+	return out
+}
+
+func schemaString(s Schema, key string) string {
+	if v, ok := s[key].(string); ok {
+		return v
+	}
+	return ""
+}
+
+// schemaBool reads a boolean keyword (e.g. nullable), defaulting to false when
+// absent or non-boolean.
+func schemaBool(s Schema, key string) bool {
+	b, _ := s[key].(bool)
+	return b
+}
+
+// schemaNumber reads a numeric keyword. JSON numbers decode as float64 through
+// sigs.k8s.io/yaml; integers may also appear as int/int64 depending on the
+// decoder, so both are handled.
+func schemaNumber(s Schema, key string) (float64, bool) {
+	switch v := s[key].(type) {
+	case float64:
+		return v, true
+	case int:
+		return float64(v), true
+	case int64:
+		return float64(v), true
+	default:
+		return 0, false
+	}
+}
+
+// --- helpers ----------------------------------------------------------------
+
+func childPath(parent, name string) string {
+	return parent + "." + name
+}
+
+func setDiff(a, b map[string]struct{}) []string {
+	var out []string
+	for k := range a {
+		if _, ok := b[k]; !ok {
+			out = append(out, k)
+		}
+	}
+	sort.Strings(out)
+	return out
+}
+
+func sortedKeys[V any](m map[string]V) []string {
+	out := make([]string, 0, len(m))
+	for k := range m {
+		out = append(out, k)
+	}
+	sort.Strings(out)
+	return out
+}
+
+func formatNum(f float64) string {
+	if f == float64(int64(f)) {
+		return fmt.Sprintf("%d", int64(f))
+	}
+	return fmt.Sprintf("%g", f)
+}
diff --git a/internal/apigate/schemadiff_test.go b/internal/apigate/schemadiff_test.go
new file mode 100644
index 0000000000..6cb926bbfb
--- /dev/null
+++ b/internal/apigate/schemadiff_test.go
@@ -0,0 +1,286 @@
+/*
+Copyright 2026 The Cozystack Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package apigate
+
+import (
+	"encoding/json"
+	"strings"
+	"testing"
+)
+
+// mustSchema parses a JSON schema literal, mirroring how cozyrd openAPISchema
+// strings and CRD openAPIV3Schema nodes decode at runtime.
+func mustSchema(t *testing.T, j string) Schema {
+	t.Helper()
+	var s Schema
+	if err := json.Unmarshal([]byte(j), &s); err != nil {
+		t.Fatalf("bad schema literal: %v", err)
+	}
+	return s
+}
+
+func TestDiffSchema(t *testing.T) {
+	tests := []struct {
+		name     string
+		base     string
+		head     string
+		breaking bool // whether at least one breaking change is expected
+		wantSub  string
+	}{
+		{
+			name: "identical is safe",
+			base: `{"type":"object","properties":{"replicas":{"type":"integer"}}}`,
+			head: `{"type":"object","properties":{"replicas":{"type":"integer"}}}`,
+		},
+		{
+			name: "new optional field is additive",
+			base: `{"type":"object","properties":{"a":{"type":"string"}}}`,
+			head: `{"type":"object","properties":{"a":{"type":"string"},"b":{"type":"integer"}}}`,
+		},
+		{
+			name: "description-only change is safe",
+			base: `{"type":"object","properties":{"a":{"type":"string","description":"old"}}}`,
+			head: `{"type":"object","properties":{"a":{"type":"string","description":"new"}}}`,
+		},
+		{
+			name: "default change is safe",
+			base: `{"type":"object","properties":{"a":{"type":"integer","default":1}}}`,
+			head: `{"type":"object","properties":{"a":{"type":"integer","default":2}}}`,
+		},
+		{
+			name:     "removed field is breaking",
+			base:     `{"type":"object","properties":{"a":{"type":"string"},"b":{"type":"string"}}}`,
+			head:     `{"type":"object","properties":{"a":{"type":"string"}}}`,
+			breaking: true,
+			wantSub:  `"b" was removed`,
+		},
+		{
+			name:     "new required field is breaking",
+			base:     `{"type":"object","properties":{"a":{"type":"string"}}}`,
+			head:     `{"type":"object","required":["b"],"properties":{"a":{"type":"string"},"b":{"type":"string"}}}`,
+			breaking: true,
+			wantSub:  `"b" is now required`,
+		},
+		{
+			name:     "existing optional field becoming required is breaking",
+			base:     `{"type":"object","properties":{"a":{"type":"string"}}}`,
+			head:     `{"type":"object","required":["a"],"properties":{"a":{"type":"string"}}}`,
+			breaking: true,
+			wantSub:  `"a" is now required`,
+		},
+		{
+			name: "new enum value is additive",
+			base: `{"type":"object","properties":{"v":{"type":"string","enum":["a","b"]}}}`,
+			head: `{"type":"object","properties":{"v":{"type":"string","enum":["a","b","c"]}}}`,
+		},
+		{
+			name:     "removed enum value is breaking",
+			base:     `{"type":"object","properties":{"v":{"type":"string","enum":["a","b","c"]}}}`,
+			head:     `{"type":"object","properties":{"v":{"type":"string","enum":["a","b"]}}}`,
+			breaking: true,
+			wantSub:  "enum value(s) removed: c",
+		},
+		{
+			name:     "adding an enum where none existed is breaking",
+			base:     `{"type":"object","properties":{"v":{"type":"string"}}}`,
+			head:     `{"type":"object","properties":{"v":{"type":"string","enum":["a"]}}}`,
+			breaking: true,
+			wantSub:  "enum constraint added",
+		},
+		{
+			name:     "type narrowing is breaking",
+			base:     `{"type":"object","properties":{"v":{"anyOf":[{"type":"integer"},{"type":"string"}]}}}`,
+			head:     `{"type":"object","properties":{"v":{"type":"string"}}}`,
+			breaking: true,
+			wantSub:  "type narrowed",
+		},
+		{
+			name: "type widening is safe",
+			base: `{"type":"object","properties":{"v":{"type":"string"}}}`,
+			head: `{"type":"object","properties":{"v":{"anyOf":[{"type":"integer"},{"type":"string"}]}}}`,
+		},
+		{
+			name:     "added pattern is breaking",
+			base:     `{"type":"object","properties":{"v":{"type":"string"}}}`,
+			head:     `{"type":"object","properties":{"v":{"type":"string","pattern":"^x"}}}`,
+			breaking: true,
+			wantSub:  "pattern constraint added",
+		},
+		{
+			name: "removed pattern is safe",
+			base: `{"type":"object","properties":{"v":{"type":"string","pattern":"^x"}}}`,
+			head: `{"type":"object","properties":{"v":{"type":"string"}}}`,
+		},
+		{
+			name:     "raised minimum is breaking",
+			base:     `{"type":"object","properties":{"n":{"type":"integer","minimum":1}}}`,
+			head:     `{"type":"object","properties":{"n":{"type":"integer","minimum":2}}}`,
+			breaking: true,
+			wantSub:  "minimum raised",
+		},
+		{
+			name: "lowered minimum is safe",
+			base: `{"type":"object","properties":{"n":{"type":"integer","minimum":2}}}`,
+			head: `{"type":"object","properties":{"n":{"type":"integer","minimum":1}}}`,
+		},
+		{
+			name:     "lowered maximum is breaking",
+			base:     `{"type":"object","properties":{"n":{"type":"integer","maximum":10}}}`,
+			head:     `{"type":"object","properties":{"n":{"type":"integer","maximum":5}}}`,
+			breaking: true,
+			wantSub:  "maximum lowered",
+		},
+		{
+			name:     "nested map value break is caught",
+			base:     `{"type":"object","properties":{"users":{"type":"object","additionalProperties":{"type":"object","properties":{"pw":{"type":"string"}}}}}}`,
+			head:     `{"type":"object","properties":{"users":{"type":"object","additionalProperties":{"type":"object","properties":{}}}}}`,
+			breaking: true,
+			wantSub:  `"pw" was removed`,
+		},
+		{
+			name:     "nested array item break is caught",
+			base:     `{"type":"object","properties":{"list":{"type":"array","items":{"type":"object","properties":{"x":{"type":"string"}}}}}}`,
+			head:     `{"type":"object","properties":{"list":{"type":"array","items":{"type":"object","properties":{}}}}}`,
+			breaking: true,
+			wantSub:  `"x" was removed`,
+		},
+
+		// B1(a): removing a nested constraint entirely is a widening, not a break.
+		{
+			name: "removing items schema is safe (widening)",
+			base: `{"type":"object","properties":{"list":{"type":"array","items":{"type":"string"}}}}`,
+			head: `{"type":"object","properties":{"list":{"type":"array"}}}`,
+		},
+		{
+			name: "removing additionalProperties schema is safe (widening)",
+			base: `{"type":"object","properties":{"m":{"type":"object","additionalProperties":{"type":"string"}}}}`,
+			head: `{"type":"object","properties":{"m":{"type":"object"}}}`,
+		},
+		// B1(b): adding a type to a previously-unconstrained field is breaking.
+		{
+			name:     "adding a type to an unconstrained field is breaking",
+			base:     `{"type":"object","properties":{"v":{}}}`,
+			head:     `{"type":"object","properties":{"v":{"type":"string"}}}`,
+			breaking: true,
+			wantSub:  "type constraint added",
+		},
+		// B1(c): a field becoming unconstrained is a widening, not a break.
+		{
+			name: "field becoming unconstrained is safe (widening)",
+			base: `{"type":"object","properties":{"v":{"type":"string"}}}`,
+			head: `{"type":"object","properties":{"v":{}}}`,
+		},
+		// B2: restricting additionalProperties to false rejects undeclared fields.
+		{
+			name:     "additionalProperties true to false is breaking",
+			base:     `{"type":"object","properties":{"m":{"type":"object","additionalProperties":true}}}`,
+			head:     `{"type":"object","properties":{"m":{"type":"object","additionalProperties":false}}}`,
+			breaking: true,
+			wantSub:  "additionalProperties restricted to false",
+		},
+		{
+			name:     "additionalProperties absent to false is breaking",
+			base:     `{"type":"object","properties":{"m":{"type":"object"}}}`,
+			head:     `{"type":"object","properties":{"m":{"type":"object","additionalProperties":false}}}`,
+			breaking: true,
+			wantSub:  "additionalProperties restricted to false",
+		},
+		{
+			name: "additionalProperties false to true is safe (widening)",
+			base: `{"type":"object","properties":{"m":{"type":"object","additionalProperties":false}}}`,
+			head: `{"type":"object","properties":{"m":{"type":"object","additionalProperties":true}}}`,
+		},
+		{
+			name: "additionalProperties false to schema is safe (relaxation)",
+			base: `{"type":"object","properties":{"m":{"type":"object","additionalProperties":false}}}`,
+			head: `{"type":"object","properties":{"m":{"type":"object","additionalProperties":{"type":"string"}}}}`,
+		},
+		// Adding a schema where the map/array element was previously
+		// unconstrained is a restriction and must be flagged.
+		{
+			name:     "adding additionalProperties schema to open map is breaking",
+			base:     `{"type":"object","properties":{"m":{"type":"object"}}}`,
+			head:     `{"type":"object","properties":{"m":{"type":"object","additionalProperties":{"type":"string"}}}}`,
+			breaking: true,
+			wantSub:  "type constraint added",
+		},
+		{
+			name:     "adding items schema to unconstrained array is breaking",
+			base:     `{"type":"object","properties":{"list":{"type":"array"}}}`,
+			head:     `{"type":"object","properties":{"list":{"type":"array","items":{"type":"object","properties":{"foo":{"type":"string"}}}}}}`,
+			breaking: true,
+			wantSub:  "type constraint added",
+		},
+		// B7(b): CEL validation rules — additions break, removals are safe.
+		{
+			name:     "added CEL validation rule is breaking",
+			base:     `{"type":"object","properties":{"v":{"type":"integer"}}}`,
+			head:     `{"type":"object","properties":{"v":{"type":"integer","x-kubernetes-validations":[{"rule":"self > 0","message":"must be positive"}]}}}`,
+			breaking: true,
+			wantSub:  "validation rule added",
+		},
+		{
+			name: "removed CEL validation rule is safe",
+			base: `{"type":"object","properties":{"v":{"type":"integer","x-kubernetes-validations":[{"rule":"self > 0"}]}}}`,
+			head: `{"type":"object","properties":{"v":{"type":"integer"}}}`,
+		},
+		// nullable removal is breaking; adding nullable is a widening.
+		{
+			name:     "removing nullable is breaking",
+			base:     `{"type":"object","properties":{"v":{"type":"string","nullable":true}}}`,
+			head:     `{"type":"object","properties":{"v":{"type":"string"}}}`,
+			breaking: true,
+			wantSub:  "no longer nullable",
+		},
+		{
+			name: "adding nullable is safe (widening)",
+			base: `{"type":"object","properties":{"v":{"type":"string"}}}`,
+			head: `{"type":"object","properties":{"v":{"type":"string","nullable":true}}}`,
+		},
+		// oneOf/allOf/not composition added is breaking; removed is safe.
+		{
+			name:     "adding oneOf composition is breaking",
+			base:     `{"type":"object","properties":{"v":{"type":"object"}}}`,
+			head:     `{"type":"object","properties":{"v":{"type":"object","oneOf":[{"required":["a"]},{"required":["b"]}]}}}`,
+			breaking: true,
+			wantSub:  "oneOf composition constraint added",
+		},
+		{
+			name: "removing allOf composition is safe",
+			base: `{"type":"object","properties":{"v":{"type":"object","allOf":[{"required":["a"]}]}}}`,
+			head: `{"type":"object","properties":{"v":{"type":"object"}}}`,
+		},
+	}
+
+	for _, tc := range tests {
+		t.Run(tc.name, func(t *testing.T) {
+			got := diffSchema("spec", mustSchema(t, tc.base), mustSchema(t, tc.head))
+			if tc.breaking && len(got) == 0 {
+				t.Fatalf("expected a breaking change, got none")
+			}
+			if !tc.breaking && len(got) != 0 {
+				t.Fatalf("expected no breaking change, got: %v", got)
+			}
+			if tc.wantSub != "" {
+				joined := strings.Join(got, "\n")
+				if !strings.Contains(joined, tc.wantSub) {
+					t.Fatalf("expected finding containing %q, got:\n%s", tc.wantSub, joined)
+				}
+			}
+		})
+	}
+}
diff --git a/internal/apigate/snapshot.go b/internal/apigate/snapshot.go
new file mode 100644
index 0000000000..1f23543d4b
--- /dev/null
+++ b/internal/apigate/snapshot.go
@@ -0,0 +1,242 @@
+/*
+Copyright 2026 The Cozystack Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package apigate
+
+import (
+	"fmt"
+	"io/fs"
+	"maps"
+	"os"
+	"path/filepath"
+	"strings"
+)
+
+// cozyRDGlob matches every ApplicationDefinition backing the apps.cozystack.io
+// aggregated API.
+const cozyRDGlob = "packages/system/*-rd/cozyrds/*.yaml"
+
+// crdRoots are the trees walked to discover checked-in CustomResourceDefinition
+// and APIService manifests. Every .yaml/.yml file under them is a candidate;
+// filtering to the resources we actually care about is content-based (does
+// this document parse, and does it have the right kind and a first-party
+// group?) rather than directory-based. A directory-name allowlist (crds/,
+// definitions/, manifests/, ...) was tried first and missed a real CRD that
+// shipped inside a chart's templates/ dir behind a `{{- if }}` guard — the
+// convention a contributor uses for a chart layout is not a reliable signal,
+// so content sniffing replaces it entirely.
+var crdRoots = []string{"packages", "internal"}
+
+// apiserverGoFile is the source of the static Go-backed aggregated registrations.
+const apiserverGoFile = "pkg/apiserver/apiserver.go"
+
+// crdGroupBase is the first-party API group family. A discovered CRD is gated
+// only when its group is exactly this or a dot-delimited subdomain of it, so
+// vendored upstream CRDs (cert-manager, flux, …) sitting in a crds/ directory
+// are not gated — and a lookalike such as "fakecozystack.io" is not mistaken
+// for first-party.
+const crdGroupBase = "cozystack.io"
+
+// isFirstPartyGroup reports whether group belongs to the cozystack.io family.
+func isFirstPartyGroup(group string) bool {
+	return group == crdGroupBase || strings.HasSuffix(group, "."+crdGroupBase)
+}
+
+// LoadSnapshot walks a repository checkout rooted at dir and builds the full
+// API Snapshot from every source of truth: cozyrds (apps API), CRD manifests
+// (typed groups), the apiserver storage registrations (static Go groups), and
+// APIService manifests (groups delegated to an aggregated apiserver, possibly
+// built outside this repo entirely). Files that are absent are skipped so the
+// loader works against historical checkouts predating a given path.
+func LoadSnapshot(dir string) (Snapshot, error) {
+	snap := Snapshot{}
+	add := func(r Resource) {
+		snap[r.key()] = r
+	}
+
+	// Apps API: one Resource per cozyrd.
+	cozyrds, err := filepath.Glob(filepath.Join(dir, filepath.FromSlash(cozyRDGlob)))
+	if err != nil {
+		return nil, err
+	}
+	for _, path := range cozyrds {
+		data, err := os.ReadFile(path)
+		if err != nil {
+			return nil, err
+		}
+		res, ok, err := ParseCozyRD(rel(dir, path), data)
+		if err != nil {
+			return nil, err
+		}
+		if ok {
+			add(res)
+		}
+	}
+
+	// Typed groups (CRD manifests) and APIService-backed groups: both are
+	// discovered by content from the same file walk, splitting each file's
+	// documents exactly once and probing each document's kind exactly once
+	// (docKind) before deciding which of the two shapes to try — the walk
+	// now scans every YAML file under packages/ and internal/ rather than a
+	// curated directory allowlist, so most documents are neither and this
+	// keeps the common case cheap. APIService resources are accumulated
+	// separately and merged by group below, since a group's versions are
+	// commonly registered as several sibling APIService objects (one per
+	// version) rather than a single document listing all of them.
+	yamlFiles, err := discoverYAMLFiles(dir)
+	if err != nil {
+		return nil, err
+	}
+	apiServices := map[resourceKey]Resource{}
+	for _, path := range yamlFiles {
+		data, err := os.ReadFile(path)
+		if err != nil {
+			return nil, err
+		}
+		if !mightBeAPIManifest(data) {
+			// Whole file contains neither marker substring anywhere, so no
+			// document within it can be a CRD or an APIService either;
+			// skip the `---` split (a regexp pass over the full file) too.
+			continue
+		}
+		origin := rel(dir, path)
+
+		for i, docBytes := range splitYAMLDocs(data) {
+			if len(strings.TrimSpace(string(docBytes))) == 0 {
+				continue
+			}
+			switch docKind(docBytes) {
+			case "CustomResourceDefinition":
+				res, ok, err := crdFromDoc(origin, i, docBytes)
+				if err != nil {
+					// A document unambiguously claiming to be a first-party
+					// CRD but structurally incomplete; skip just this
+					// document rather than losing any other resource that
+					// shares its file.
+					continue
+				}
+				if ok && isFirstPartyGroup(res.Group) {
+					add(res)
+				}
+			case "APIService":
+				res, ok := apiServiceFromDoc(origin, docBytes)
+				if !ok || !isFirstPartyGroup(res.Group) {
+					continue
+				}
+				key := resourceKey{Group: res.Group, Plural: res.Plural}
+				existing, ok := apiServices[key]
+				if !ok {
+					apiServices[key] = res
+					continue
+				}
+				maps.Copy(existing.Versions, res.Versions)
+				if existing.Origin != res.Origin {
+					existing.Origin += ", " + res.Origin
+				}
+				apiServices[key] = existing
+			}
+		}
+	}
+	for key, res := range apiServices {
+		// Do not overwrite a richer cozyrd/CRD/apiserver-storage resource
+		// that shares the same key; apiServicePlural is reserved and cannot
+		// collide with a real plural, so in practice this only guards
+		// against processing the same merged group twice.
+		if _, exists := snap[key]; !exists {
+			add(res)
+		}
+	}
+
+	// Static Go-backed aggregated groups: apiserver registrations.
+	apiserverPath := filepath.Join(dir, filepath.FromSlash(apiserverGoFile))
+	if data, err := os.ReadFile(apiserverPath); err == nil {
+		for _, res := range ParseAPIServerStorages(apiserverGoFile, data) {
+			// Do not overwrite a richer cozyrd/CRD resource that shares the
+			// same (group, plural); the apiserver entry has no schema.
+			if _, exists := snap[res.key()]; !exists {
+				add(res)
+			}
+		}
+	} else if !os.IsNotExist(err) {
+		return nil, fmt.Errorf("read %s: %w", apiserverPath, err)
+	}
+
+	// A zero-resource snapshot means the loader ran against the wrong directory
+	// (or the layout moved out from under every discovery rule). Failing here
+	// prevents the gate from silently passing — "no resources found" must never
+	// be mistaken for "no sizeable change".
+	if len(snap) == 0 {
+		return nil, fmt.Errorf("no API resources discovered under %s; verify the checkout path and directory layout", dir)
+	}
+
+	return snap, nil
+}
+
+// maxYAMLFileSize bounds how large a single discovered file is read and
+// parsed. Discovery is now content-based across every YAML file in the tree
+// (no directory allowlist — see crdRoots), so this walk runs against
+// untrusted PR head checkouts with no other size guard; real chart
+// CRD/APIService manifests in this repo are well under a megabyte, so this
+// is generous headroom, not a tight fit, and only bounds a pathological or
+// adversarial file.
+const maxYAMLFileSize = 8 << 20 // 8 MiB
+
+// discoverYAMLFiles walks the crdRoots under dir and returns the path of
+// every .yaml/.yml file found, up to maxYAMLFileSize. Filtering to the CRD /
+// APIService documents we actually care about happens at parse time in
+// LoadSnapshot.
+func discoverYAMLFiles(dir string) ([]string, error) {
+	var out []string
+	for _, root := range crdRoots {
+		base := filepath.Join(dir, root)
+		if _, err := os.Stat(base); os.IsNotExist(err) {
+			continue
+		}
+		err := filepath.WalkDir(base, func(path string, d fs.DirEntry, err error) error {
+			if err != nil {
+				return err
+			}
+			if d.IsDir() {
+				return nil
+			}
+			if ext := filepath.Ext(path); ext != ".yaml" && ext != ".yml" {
+				return nil
+			}
+			info, err := d.Info()
+			if err != nil {
+				return err
+			}
+			if info.Size() > maxYAMLFileSize {
+				return nil
+			}
+			out = append(out, path)
+			return nil
+		})
+		if err != nil {
+			return nil, err
+		}
+	}
+	return out, nil
+}
+
+// rel renders a discovered path repo-relative for reporting, falling back to
+// the absolute path if it lies outside dir.
+func rel(dir, path string) string {
+	if r, err := filepath.Rel(dir, path); err == nil {
+		return filepath.ToSlash(r)
+	}
+	return path
+}
diff --git a/internal/backupcontroller/altinitystrategy_controller.go b/internal/backupcontroller/altinitystrategy_controller.go
index 3d44f00332..b96d571f06 100644
--- a/internal/backupcontroller/altinitystrategy_controller.go
+++ b/internal/backupcontroller/altinitystrategy_controller.go
@@ -4,6 +4,7 @@ package backupcontroller
 import (
 	"context"
 	"fmt"
+	"maps"
 	"strings"
 	"time"
 
@@ -107,12 +108,12 @@ func backupParameters(b *backupsv1alpha1.Backup) map[string]string {
 // the release shorthand, the run mode, and the resolved parameters.
 func renderAltinityTemplate(
 	tmpl corev1.PodTemplateSpec,
-	app map[string]interface{},
+	app map[string]any,
 	releaseName, releaseNamespace, mode string,
 	parameters map[string]string,
 	backup *backupsv1alpha1.Backup,
 ) (*corev1.PodTemplateSpec, error) {
-	ctxMap := map[string]interface{}{
+	ctxMap := map[string]any{
 		"Application": app,
 		"Release": map[string]string{
 			"Name":      releaseName,
@@ -134,7 +135,7 @@ func renderAltinityTemplate(
 		if backup.Spec.ApplicationRef.APIGroup != nil {
 			sourceAPIGroup = *backup.Spec.ApplicationRef.APIGroup
 		}
-		ctxMap["Backup"] = map[string]interface{}{
+		ctxMap["Backup"] = map[string]any{
 			"Name":      backup.Name,
 			"Namespace": backup.Namespace,
 			"ApplicationRef": map[string]string{
@@ -294,9 +295,7 @@ func (r *BackupJobReconciler) ensureAltinityJob(
 	}
 
 	labels := map[string]string{altinityLabelMode: mode}
-	for k, v := range ownerLabels {
-		labels[k] = v
-	}
+	maps.Copy(labels, ownerLabels)
 
 	desired := buildAltinityBatchJob(namespace, name, labels, rendered)
 	if err := controllerutil.SetControllerReference(owner, desired, r.Scheme); err != nil {
@@ -337,9 +336,7 @@ func (r *RestoreJobReconciler) ensureAltinityRestoreJob(
 	}
 
 	labels := map[string]string{altinityLabelMode: mode}
-	for k, v := range ownerLabels {
-		labels[k] = v
-	}
+	maps.Copy(labels, ownerLabels)
 
 	desired := buildAltinityBatchJob(namespace, name, labels, rendered)
 	if err := controllerutil.SetControllerReference(owner, desired, r.Scheme); err != nil {
@@ -369,9 +366,7 @@ func buildAltinityBatchJob(namespace, name string, labels map[string]string, ren
 	if pod.Labels == nil {
 		pod.Labels = map[string]string{}
 	}
-	for k, v := range labels {
-		pod.Labels[k] = v
-	}
+	maps.Copy(pod.Labels, labels)
 	backoffLimit := int32(2)
 	return &batchv1.Job{
 		ObjectMeta: metav1.ObjectMeta{
@@ -478,7 +473,7 @@ func (r *BackupJobReconciler) createAltinityBackupArtifact(
 // default ("apps.cozystack.io"); RESTMapping must apply the same default so
 // a BackupJob/RestoreJob with apiGroup omitted does not blow up at lookup
 // time with a misleading "no matches for /ClickHouse" error.
-func (r *BackupJobReconciler) getApplicationUnstructured(ctx context.Context, namespace string, ref corev1.TypedLocalObjectReference) (map[string]interface{}, error) {
+func (r *BackupJobReconciler) getApplicationUnstructured(ctx context.Context, namespace string, ref corev1.TypedLocalObjectReference) (map[string]any, error) {
 	group := backupsv1alpha1.DefaultApplicationAPIGroup
 	if ref.APIGroup != nil && *ref.APIGroup != "" {
 		group = *ref.APIGroup
@@ -500,7 +495,7 @@ func (r *BackupJobReconciler) getApplicationUnstructured(ctx context.Context, na
 
 // getApplicationUnstructured is the RestoreJob-side mirror. Same APIGroup
 // default applies (see the BackupJob variant for the rationale).
-func (r *RestoreJobReconciler) getApplicationUnstructured(ctx context.Context, namespace string, ref corev1.TypedLocalObjectReference) (map[string]interface{}, error) {
+func (r *RestoreJobReconciler) getApplicationUnstructured(ctx context.Context, namespace string, ref corev1.TypedLocalObjectReference) (map[string]any, error) {
 	group := backupsv1alpha1.DefaultApplicationAPIGroup
 	if ref.APIGroup != nil && *ref.APIGroup != "" {
 		group = *ref.APIGroup
@@ -566,7 +561,7 @@ func (r *RestoreJobReconciler) reconcileAltinityRestore(ctx context.Context, res
 		}
 	}
 	targetRef := corev1.TypedLocalObjectReference{
-		APIGroup: stringPtr(targetAPIGroup),
+		APIGroup: new(targetAPIGroup),
 		Kind:     targetAppKind,
 		Name:     targetAppName,
 	}
diff --git a/internal/backupcontroller/altinitystrategy_controller_test.go b/internal/backupcontroller/altinitystrategy_controller_test.go
index 143d8c0927..68f18fa28b 100644
--- a/internal/backupcontroller/altinitystrategy_controller_test.go
+++ b/internal/backupcontroller/altinitystrategy_controller_test.go
@@ -70,18 +70,18 @@ func newAltinityTestEnv(t *testing.T, app *unstructured.Unstructured, builder *c
 		Build()
 
 	return &BackupJobReconciler{
-			Client:     c,
-			Interface:  dynamicClient,
-			RESTMapper: restMapper,
-			Scheme:     testScheme,
-			Recorder:   record.NewFakeRecorder(10),
-		}, &RestoreJobReconciler{
-			Client:     c,
-			Interface:  dynamicClient,
-			RESTMapper: restMapper,
-			Scheme:     testScheme,
-			Recorder:   record.NewFakeRecorder(10),
-		}, testScheme
+		Client:     c,
+		Interface:  dynamicClient,
+		RESTMapper: restMapper,
+		Scheme:     testScheme,
+		Recorder:   record.NewFakeRecorder(10),
+	}, &RestoreJobReconciler{
+		Client:     c,
+		Interface:  dynamicClient,
+		RESTMapper: restMapper,
+		Scheme:     testScheme,
+		Recorder:   record.NewFakeRecorder(10),
+	}, testScheme
 }
 
 func newAltinityStrategy(name string) *strategyv1alpha1.Altinity {
@@ -108,7 +108,7 @@ func newAltinityStrategy(name string) *strategyv1alpha1.Altinity {
 
 func newAltinityClickHouseRef(name string) corev1.TypedLocalObjectReference {
 	return corev1.TypedLocalObjectReference{
-		APIGroup: stringPtr(backupsv1alpha1.DefaultApplicationAPIGroup),
+		APIGroup: new(backupsv1alpha1.DefaultApplicationAPIGroup),
 		Kind:     "ClickHouse",
 		Name:     name,
 	}
@@ -128,7 +128,7 @@ func TestReconcileAltinity_CreatesBatchJob(t *testing.T) {
 
 	resolved := &ResolvedBackupConfig{
 		StrategyRef: corev1.TypedLocalObjectReference{
-			APIGroup: stringPtr(strategyv1alpha1.GroupVersion.Group),
+			APIGroup: new(strategyv1alpha1.GroupVersion.Group),
 			Kind:     strategyv1alpha1.AltinityStrategyKind,
 			Name:     "clickhouse-strategy",
 		},
@@ -224,7 +224,7 @@ func TestReconcileAltinity_CompletesAndCreatesBackup(t *testing.T) {
 
 	resolved := &ResolvedBackupConfig{
 		StrategyRef: corev1.TypedLocalObjectReference{
-			APIGroup: stringPtr(strategyv1alpha1.GroupVersion.Group),
+			APIGroup: new(strategyv1alpha1.GroupVersion.Group),
 			Kind:     strategyv1alpha1.AltinityStrategyKind,
 			Name:     "clickhouse-strategy",
 		},
@@ -304,7 +304,7 @@ func TestReconcileAltinity_FailsOnJobFailed(t *testing.T) {
 
 	resolved := &ResolvedBackupConfig{
 		StrategyRef: corev1.TypedLocalObjectReference{
-			APIGroup: stringPtr(strategyv1alpha1.GroupVersion.Group),
+			APIGroup: new(strategyv1alpha1.GroupVersion.Group),
 			Kind:     strategyv1alpha1.AltinityStrategyKind,
 			Name:     "clickhouse-strategy",
 		},
@@ -357,7 +357,7 @@ func TestReconcileAltinityRestore_CreatesBatchJobInTargetNamespace(t *testing.T)
 		Spec: backupsv1alpha1.BackupSpec{
 			ApplicationRef: newAltinityClickHouseRef("ch-test"),
 			StrategyRef: corev1.TypedLocalObjectReference{
-				APIGroup: stringPtr(strategyv1alpha1.GroupVersion.Group),
+				APIGroup: new(strategyv1alpha1.GroupVersion.Group),
 				Kind:     strategyv1alpha1.AltinityStrategyKind,
 				Name:     "clickhouse-strategy",
 			},
@@ -370,7 +370,7 @@ func TestReconcileAltinityRestore_CreatesBatchJobInTargetNamespace(t *testing.T)
 		Spec: backupsv1alpha1.RestoreJobSpec{
 			BackupRef: corev1.LocalObjectReference{Name: backup.Name},
 			TargetApplicationRef: &corev1.TypedLocalObjectReference{
-				APIGroup: stringPtr(backupsv1alpha1.DefaultApplicationAPIGroup),
+				APIGroup: new(backupsv1alpha1.DefaultApplicationAPIGroup),
 				Kind:     "ClickHouse",
 				Name:     "ch-restore",
 			},
@@ -427,7 +427,7 @@ func TestReconcileAltinity_RenderedBackupJobOwnedByBackupJob(t *testing.T) {
 	}
 	resolved := &ResolvedBackupConfig{
 		StrategyRef: corev1.TypedLocalObjectReference{
-			APIGroup: stringPtr(strategyv1alpha1.GroupVersion.Group),
+			APIGroup: new(strategyv1alpha1.GroupVersion.Group),
 			Kind:     strategyv1alpha1.AltinityStrategyKind,
 			Name:     "clickhouse-strategy",
 		},
@@ -474,7 +474,7 @@ func TestReconcileAltinityRestore_RenderedRestoreJobOwnedByRestoreJob(t *testing
 		Spec: backupsv1alpha1.BackupSpec{
 			ApplicationRef: newAltinityClickHouseRef("ch-test"),
 			StrategyRef: corev1.TypedLocalObjectReference{
-				APIGroup: stringPtr(strategyv1alpha1.GroupVersion.Group),
+				APIGroup: new(strategyv1alpha1.GroupVersion.Group),
 				Kind:     strategyv1alpha1.AltinityStrategyKind,
 				Name:     "clickhouse-strategy",
 			},
@@ -486,7 +486,7 @@ func TestReconcileAltinityRestore_RenderedRestoreJobOwnedByRestoreJob(t *testing
 		Spec: backupsv1alpha1.RestoreJobSpec{
 			BackupRef: corev1.LocalObjectReference{Name: backup.Name},
 			TargetApplicationRef: &corev1.TypedLocalObjectReference{
-				APIGroup: stringPtr(backupsv1alpha1.DefaultApplicationAPIGroup),
+				APIGroup: new(backupsv1alpha1.DefaultApplicationAPIGroup),
 				Kind:     "ClickHouse",
 				Name:     "ch-restore",
 			},
@@ -552,7 +552,7 @@ func TestReconcileAltinityRestore_TargetNamespaceIsRestoreJobNamespace(t *testin
 		{
 			name: "full triple targetRef -> to-copy explicit",
 			targetRef: &corev1.TypedLocalObjectReference{
-				APIGroup: stringPtr(backupsv1alpha1.DefaultApplicationAPIGroup),
+				APIGroup: new(backupsv1alpha1.DefaultApplicationAPIGroup),
 				Kind:     "ClickHouse",
 				Name:     "ch-copy",
 			},
@@ -570,7 +570,7 @@ func TestReconcileAltinityRestore_TargetNamespaceIsRestoreJobNamespace(t *testin
 				Spec: backupsv1alpha1.BackupSpec{
 					ApplicationRef: newAltinityClickHouseRef("ch-source"),
 					StrategyRef: corev1.TypedLocalObjectReference{
-						APIGroup: stringPtr(strategyv1alpha1.GroupVersion.Group),
+						APIGroup: new(strategyv1alpha1.GroupVersion.Group),
 						Kind:     strategyv1alpha1.AltinityStrategyKind,
 						Name:     "clickhouse-strategy",
 					},
@@ -647,7 +647,7 @@ func TestReconcileAltinityRestore_ExposesSourceApplicationRef(t *testing.T) {
 		Spec: backupsv1alpha1.BackupSpec{
 			ApplicationRef: newAltinityClickHouseRef("ch-source"),
 			StrategyRef: corev1.TypedLocalObjectReference{
-				APIGroup: stringPtr(strategyv1alpha1.GroupVersion.Group),
+				APIGroup: new(strategyv1alpha1.GroupVersion.Group),
 				Kind:     strategyv1alpha1.AltinityStrategyKind,
 				Name:     "clickhouse-strategy",
 			},
@@ -659,7 +659,7 @@ func TestReconcileAltinityRestore_ExposesSourceApplicationRef(t *testing.T) {
 		Spec: backupsv1alpha1.RestoreJobSpec{
 			BackupRef: corev1.LocalObjectReference{Name: backup.Name},
 			TargetApplicationRef: &corev1.TypedLocalObjectReference{
-				APIGroup: stringPtr(backupsv1alpha1.DefaultApplicationAPIGroup),
+				APIGroup: new(backupsv1alpha1.DefaultApplicationAPIGroup),
 				Kind:     "ClickHouse",
 				Name:     "ch-restore",
 			},
diff --git a/internal/backupcontroller/backup_controller.go b/internal/backupcontroller/backup_controller.go
index 0b379b686e..1a8ec0b40a 100644
--- a/internal/backupcontroller/backup_controller.go
+++ b/internal/backupcontroller/backup_controller.go
@@ -39,6 +39,9 @@ type BackupReconciler struct {
 	client.Client
 	Scheme   *runtime.Scheme
 	Recorder record.EventRecorder
+	// CredentialsConfig lets the Rabbitmq cleanup path project cozy-backups-creds
+	// into the Backup's namespace before spawning its best-effort delete Job.
+	CredentialsConfig BackupCredentialsConfig
 }
 
 func (r *BackupReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
@@ -57,10 +60,17 @@ func (r *BackupReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctr
 	if !backup.DeletionTimestamp.IsZero() {
 		if controllerutil.ContainsFinalizer(backup, backupFinalizer) ||
 			controllerutil.ContainsFinalizer(backup, legacyVeleroBackupFinalizer) {
-			if err := r.cleanupOnDelete(ctx, backup); err != nil {
+			res, err := r.cleanupOnDelete(ctx, backup)
+			if err != nil {
 				logger.Error(err, "failed to clean up strategy-owned side state")
 				return ctrl.Result{}, err
 			}
+			if res.Requeue || res.RequeueAfter > 0 {
+				// Cleanup is still in progress (the Rabbitmq delete Job has not
+				// finished); keep the finalizer and requeue so no object is
+				// orphaned.
+				return res, nil
+			}
 
 			controllerutil.RemoveFinalizer(backup, backupFinalizer)
 			controllerutil.RemoveFinalizer(backup, legacyVeleroBackupFinalizer)
@@ -89,17 +99,20 @@ func (r *BackupReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctr
 // pattern - each strategy knows what it created and how to undo it. Velero
 // owns the velero.io/Backup CR plus archive data on the BSL; CNPG owns the
 // postgresql.cnpg.io/Backup CR; Job owns nothing namespace-scoped.
-func (r *BackupReconciler) cleanupOnDelete(ctx context.Context, backup *backupsv1alpha1.Backup) error {
+// A non-zero ctrl.Result asks the caller to keep the finalizer and requeue -
+// used by the Rabbitmq branch, which waits for its S3 delete Job to finish
+// before letting the Backup be removed, so no object is orphaned.
+func (r *BackupReconciler) cleanupOnDelete(ctx context.Context, backup *backupsv1alpha1.Backup) (ctrl.Result, error) {
 	logger := log.FromContext(ctx)
 	kind := strategyKindForBackup(backup)
 	logger.V(1).Info("dispatching Backup cleanup", "backup", backup.Name, "strategy", kind)
 	switch kind {
 	case strategyv1alpha1.CNPGStrategyKind:
-		return r.cleanupCNPGBackup(ctx, backup)
+		return ctrl.Result{}, r.cleanupCNPGBackup(ctx, backup)
 	case strategyv1alpha1.JobStrategyKind:
 		// Nothing to clean up: Job-strategy Backups own no namespace-scoped
 		// artifacts that survive Backup deletion.
-		return nil
+		return ctrl.Result{}, nil
 	case strategyv1alpha1.AltinityStrategyKind:
 		// Cozystack Backup deletion does NOT purge the upstream
 		// clickhouse-backup archive in object storage. Lifecycle of the
@@ -111,7 +124,7 @@ func (r *BackupReconciler) cleanupOnDelete(ctx context.Context, backup *backupsv
 		// driver does not own the S3 data, so it does not delete it on
 		// CR removal. See packages/apps/clickhouse/README.md "Backup
 		// orchestration" for tenant-facing guidance.
-		return nil
+		return ctrl.Result{}, nil
 	case strategyv1alpha1.MariaDBStrategyKind:
 		// Cozystack Backup deletion does NOT delete the operator-side
 		// k8s.mariadb.com/Backup CR or the backing S3/PVC archive.
@@ -123,7 +136,17 @@ func (r *BackupReconciler) cleanupOnDelete(ctx context.Context, backup *backupsv
 		// default) keeps the contract honest: the MariaDB driver does
 		// not own the archive, so it does not delete it on CR removal.
 		// Mirrors the Altinity branch's "we do not own S3" stance.
-		return nil
+		return ctrl.Result{}, nil
+	case strategyv1alpha1.MongoDBStrategyKind:
+		// Split by flow (see cleanupMongoDBBackup). A legacy backup writes to the
+		// tenant's own bucket and its lifecycle stays the tenant's / psmdb
+		// operator's — that branch is a no-op, the same "we do not own the
+		// archive" contract as Altinity / MariaDB / FDB. A useSystemBucket backup
+		// lands in the shared cozy-backups bucket with no psmdb task retention to
+		// prune it, so the driver OWNS it: this deletes the operator
+		// PerconaServerMongoDBBackup CR and waits for its delete-backup finalizer
+		// to free the object before the Backup is removed (like Redis / Rabbitmq).
+		return r.cleanupMongoDBBackup(ctx, backup)
 	case strategyv1alpha1.FoundationDBStrategyKind:
 		// Cozystack Backup deletion does NOT delete the operator-side
 		// foundationdb.org/FoundationDBBackup CR. That CR drives a
@@ -135,15 +158,39 @@ func (r *BackupReconciler) cleanupOnDelete(ctx context.Context, backup *backupsv
 		// branch guards the seam against a future driver refactor that
 		// might incidentally stamp velero.io/backup-name onto FDB
 		// driverMetadata via a shared helper.
-		return nil
+		return ctrl.Result{}, nil
+	case strategyv1alpha1.RabbitmqStrategyKind:
+		// Unlike the operator-backed drivers above, the Rabbitmq driver
+		// uniquely OWNS its artifact - a plain definitions object it wrote,
+		// with the exact key on status.artifact.uri - and no engine retention
+		// prunes it. Without an explicit delete a retention-pruned Plan would
+		// grow the bucket unboundedly, so this branch deletes the object and
+		// WAITS for that delete to complete before the Backup is removed, so no
+		// object is orphaned (see cleanupRabbitmqBackup).
+		return r.cleanupRabbitmqBackup(ctx, backup)
+	case strategyv1alpha1.RedisStrategyKind:
+		// Like Rabbitmq, the Redis driver OWNS its artifact - redisObjectKey
+		// mints one object per BackupJob and no engine retention prunes it - so
+		// this branch deletes that object and WAITS for the delete before the
+		// Backup is removed. Without it a retention-pruned Plan grows the bucket
+		// unboundedly and the key is lost with the CR (see cleanupRedisBackup).
+		return r.cleanupRedisBackup(ctx, backup)
+	case strategyv1alpha1.KafkaStrategyKind:
+		// Same property as Rabbitmq: the Kafka driver OWNS its artifact (a plain
+		// metadata object it wrote with curl, keyed on status.artifact.uri) and
+		// no engine retention prunes it. Without an explicit delete a
+		// retention-pruned Plan would grow the bucket unboundedly, so this branch
+		// deletes the object and WAITS for that delete before the Backup is
+		// removed, so no object is orphaned (see cleanupKafkaBackup).
+		return r.cleanupKafkaBackup(ctx, backup)
 	case strategyv1alpha1.VeleroStrategyKind:
-		return r.cleanupVeleroBackup(ctx, backup)
+		return ctrl.Result{}, r.cleanupVeleroBackup(ctx, backup)
 	default:
 		// Unknown or empty strategy. Conservative path: try the Velero
 		// cleanup since it is keyed on a metadata field that only Velero
 		// sets, so it is a no-op for non-Velero Backups. This preserves
 		// backward compatibility with pre-existing objects.
-		return r.cleanupVeleroBackup(ctx, backup)
+		return ctrl.Result{}, r.cleanupVeleroBackup(ctx, backup)
 	}
 }
 
diff --git a/internal/backupcontroller/backup_controller_test.go b/internal/backupcontroller/backup_controller_test.go
index 7824287d20..579cb5fe69 100644
--- a/internal/backupcontroller/backup_controller_test.go
+++ b/internal/backupcontroller/backup_controller_test.go
@@ -3,16 +3,20 @@ package backupcontroller
 
 import (
 	"context"
+	"strings"
 	"testing"
 
+	batchv1 "k8s.io/api/batch/v1"
 	corev1 "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/kubernetes/scheme"
 	"k8s.io/client-go/tools/record"
+	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	clientfake "sigs.k8s.io/controller-runtime/pkg/client/fake"
+	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 
 	strategyv1alpha1 "github.com/cozystack/cozystack/api/backups/strategy/v1alpha1"
 	backupsv1alpha1 "github.com/cozystack/cozystack/api/backups/v1alpha1"
@@ -44,7 +48,7 @@ func TestBackupCleanup_CNPG_DeletesUnderlyingCNPGBackup(t *testing.T) {
 	c := newBackupTestClient(t, backup, cnpgBk)
 	r := &BackupReconciler{Client: c, Recorder: record.NewFakeRecorder(10)}
 
-	if err := r.cleanupOnDelete(context.Background(), backup); err != nil {
+	if _, err := r.cleanupOnDelete(context.Background(), backup); err != nil {
 		t.Fatalf("cleanupOnDelete returned %v", err)
 	}
 
@@ -75,7 +79,7 @@ func TestBackupCleanup_CNPG_NoMetadataIsNoOp(t *testing.T) {
 	c := newBackupTestClient(t, backup)
 	r := &BackupReconciler{Client: c, Recorder: record.NewFakeRecorder(10)}
 
-	if err := r.cleanupOnDelete(context.Background(), backup); err != nil {
+	if _, err := r.cleanupOnDelete(context.Background(), backup); err != nil {
 		t.Fatalf("cleanupOnDelete returned unexpected error %v", err)
 	}
 }
@@ -103,7 +107,7 @@ func TestBackupCleanup_Velero_DispatchUnchanged(t *testing.T) {
 	c := newBackupTestClient(t, backup, veleroBk)
 	r := &BackupReconciler{Client: c, Recorder: record.NewFakeRecorder(10)}
 
-	if err := r.cleanupOnDelete(context.Background(), backup); err != nil {
+	if _, err := r.cleanupOnDelete(context.Background(), backup); err != nil {
 		t.Fatalf("cleanupOnDelete returned %v", err)
 	}
 
@@ -152,7 +156,7 @@ func TestBackupCleanup_Altinity_DoesNotFallThroughToVelero(t *testing.T) {
 	c := newBackupTestClient(t, backup, veleroBk)
 	r := &BackupReconciler{Client: c, Recorder: record.NewFakeRecorder(10)}
 
-	if err := r.cleanupOnDelete(context.Background(), backup); err != nil {
+	if _, err := r.cleanupOnDelete(context.Background(), backup); err != nil {
 		t.Fatalf("cleanupOnDelete returned %v", err)
 	}
 
@@ -204,7 +208,7 @@ func TestBackupCleanup_MariaDB_DoesNotFallThroughToVelero(t *testing.T) {
 	c := newBackupTestClient(t, backup, veleroBk)
 	r := &BackupReconciler{Client: c, Recorder: record.NewFakeRecorder(10)}
 
-	if err := r.cleanupOnDelete(context.Background(), backup); err != nil {
+	if _, err := r.cleanupOnDelete(context.Background(), backup); err != nil {
 		t.Fatalf("cleanupOnDelete returned %v", err)
 	}
 
@@ -252,7 +256,7 @@ func TestBackupCleanup_FoundationDB_DoesNotFallThroughToVelero(t *testing.T) {
 	c := newBackupTestClient(t, backup, veleroBk)
 	r := &BackupReconciler{Client: c, Recorder: record.NewFakeRecorder(10)}
 
-	if err := r.cleanupOnDelete(context.Background(), backup); err != nil {
+	if _, err := r.cleanupOnDelete(context.Background(), backup); err != nil {
 		t.Fatalf("cleanupOnDelete returned %v", err)
 	}
 
@@ -269,6 +273,53 @@ func TestBackupCleanup_FoundationDB_DoesNotFallThroughToVelero(t *testing.T) {
 	}
 }
 
+// TestBackupCleanup_MongoDB_DoesNotFallThroughToVelero locks in the same
+// invariant as the Altinity / MariaDB / FoundationDB variants for the MongoDB
+// strategy. The dispatcher must route MongoDB-strategy Backups to the MongoDB
+// cleanup (which prunes a system-bucket archive through the operator CR's
+// finalizer and leaves a legacy one alone) rather than fall through to the
+// Velero default. Without the explicit case a future refactor that
+// incidentally stamps velero.io/backup-name onto MongoDB driverMetadata would
+// silently synthesise a DeleteBackupRequest. The test seeds those keys plus a
+// matching velero.io/Backup and no MongoDB metadata; with the explicit branch
+// no DBR is created and the Velero Backup survives.
+func TestBackupCleanup_MongoDB_DoesNotFallThroughToVelero(t *testing.T) {
+	apiGroup := strategyv1alpha1.GroupVersion.Group
+	veleroBk := &velerov1.Backup{
+		ObjectMeta: metav1.ObjectMeta{Namespace: veleroNamespace, Name: "stale-vb-mongo"},
+	}
+	backup := &backupsv1alpha1.Backup{
+		ObjectMeta: metav1.ObjectMeta{Namespace: "tenant", Name: "bk-mongo"},
+		Spec: backupsv1alpha1.BackupSpec{
+			StrategyRef: corev1.TypedLocalObjectReference{
+				APIGroup: &apiGroup, Kind: strategyv1alpha1.MongoDBStrategyKind, Name: "mongodb-strategy-default",
+			},
+			DriverMetadata: map[string]string{
+				veleroBackupNameMetadataKey:      "stale-vb-mongo",
+				veleroBackupNamespaceMetadataKey: veleroNamespace,
+			},
+		},
+	}
+	c := newBackupTestClient(t, backup, veleroBk)
+	r := &BackupReconciler{Client: c, Recorder: record.NewFakeRecorder(10)}
+
+	if _, err := r.cleanupOnDelete(context.Background(), backup); err != nil {
+		t.Fatalf("cleanupOnDelete returned %v", err)
+	}
+
+	dbrList := &velerov1.DeleteBackupRequestList{}
+	if err := c.List(context.Background(), dbrList, client.InNamespace(veleroNamespace)); err != nil {
+		t.Fatalf("list DeleteBackupRequests: %v", err)
+	}
+	if len(dbrList.Items) != 0 {
+		t.Fatalf("expected no DeleteBackupRequests for MongoDB Backup, got %d (Velero fall-through leak)", len(dbrList.Items))
+	}
+	got := &velerov1.Backup{}
+	if err := c.Get(context.Background(), client.ObjectKey{Namespace: veleroNamespace, Name: "stale-vb-mongo"}, got); err != nil {
+		t.Fatalf("Velero Backup unexpectedly removed: %v", err)
+	}
+}
+
 // TestStrategyKindForBackup mirrors the dispatcher's strategy lookup. Useful
 // in isolation when reasoning about edge cases (empty strategyRef, etc.).
 func TestStrategyKindForBackup(t *testing.T) {
@@ -310,3 +361,270 @@ func newBackupTestClient(t *testing.T, objs ...client.Object) client.Client {
 	_ = cnpgtypes.AddToScheme(s)
 	return clientfake.NewClientBuilder().WithScheme(s).WithObjects(objs...).Build()
 }
+
+// newRabbitmqBackupReconcilerClient builds a client for the Reconcile-level
+// Rabbitmq cleanup tests: it registers the Rabbitmq strategy CRD and a Job
+// status subresource (so the delete Job's completion can be simulated).
+func newRabbitmqBackupReconcilerClient(objs ...client.Object) (client.Client, *runtime.Scheme) {
+	s := runtime.NewScheme()
+	_ = scheme.AddToScheme(s)
+	_ = backupsv1alpha1.AddToScheme(s)
+	_ = strategyv1alpha1.AddToScheme(s)
+	return clientfake.NewClientBuilder().WithScheme(s).
+		WithStatusSubresource(&batchv1.Job{}).
+		WithObjects(objs...).Build(), s
+}
+
+// TestBackupReconcile_HoldsFinalizerWhileRabbitmqCleanupRuns pins the
+// deletion-blocking wiring: while the delete Job runs, Reconcile keeps the
+// finalizer (the Backup is not removed until the object is gone), and removes it
+// once the Job completes. Deleting the requeue block in Reconcile turns this red.
+func TestBackupReconcile_HoldsFinalizerWhileRabbitmqCleanupRuns(t *testing.T) {
+	ns := &corev1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: "tenant-test"}}
+	backup := rabbitmqBackup("rmq-src") // status.artifact.uri set by the fixture
+	backup.Finalizers = []string{backupFinalizer}
+	strategy := newRabbitmqStrategy("cozy-default-rabbitmq")
+	c, s := newRabbitmqBackupReconcilerClient(ns, backup, strategy)
+	r := &BackupReconciler{Client: c, Scheme: s, Recorder: record.NewFakeRecorder(10)}
+	ctx := context.Background()
+
+	// Delete the Backup: the finalizer holds it in Terminating.
+	if err := c.Delete(ctx, backup); err != nil {
+		t.Fatalf("delete backup: %v", err)
+	}
+	key := client.ObjectKeyFromObject(backup)
+
+	res, err := r.Reconcile(ctx, ctrl.Request{NamespacedName: key})
+	if err != nil {
+		t.Fatalf("Reconcile() error = %v", err)
+	}
+	if res.RequeueAfter == 0 {
+		t.Error("expected Reconcile to requeue while the delete Job runs")
+	}
+	got := &backupsv1alpha1.Backup{}
+	if err := c.Get(ctx, key, got); err != nil {
+		t.Fatalf("Backup must still exist while cleanup runs: %v", err)
+	}
+	if !controllerutil.ContainsFinalizer(got, backupFinalizer) {
+		t.Error("expected the finalizer to be retained while the delete Job runs")
+	}
+	jobs := &batchv1.JobList{}
+	if err := c.List(ctx, jobs, client.InNamespace("tenant-test")); err != nil {
+		t.Fatalf("list jobs: %v", err)
+	}
+	if len(jobs.Items) != 1 {
+		t.Fatalf("expected the cleanup Job, got %d", len(jobs.Items))
+	}
+
+	// Complete the Job; the next reconcile removes the finalizer -> Backup gone.
+	job := jobs.Items[0]
+	job.Status.Conditions = []batchv1.JobCondition{{Type: batchv1.JobComplete, Status: corev1.ConditionTrue}}
+	if err := c.Status().Update(ctx, &job); err != nil {
+		t.Fatalf("update job status: %v", err)
+	}
+	if _, err := r.Reconcile(ctx, ctrl.Request{NamespacedName: key}); err != nil {
+		t.Fatalf("Reconcile() second call error = %v", err)
+	}
+	if err := c.Get(ctx, key, got); !apierrors.IsNotFound(err) {
+		t.Errorf("expected the Backup removed after the delete Job completed, got err=%v", err)
+	}
+}
+
+// TestBackupReconcile_ReleasesInTerminatingNamespace pins the teardown fix: a
+// Rabbitmq Backup in a Terminating namespace must release (CREATE is forbidden
+// there, so the delete Job cannot run) rather than wedge the namespace, and must
+// record a Warning Event naming the object left behind.
+func TestBackupReconcile_ReleasesInTerminatingNamespace(t *testing.T) {
+	ns := &corev1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: "tenant-test", Finalizers: []string{"kubernetes"}}}
+	backup := rabbitmqBackup("rmq-src")
+	backup.Finalizers = []string{backupFinalizer}
+	strategy := newRabbitmqStrategy("cozy-default-rabbitmq")
+	rec := record.NewFakeRecorder(10)
+	c, s := newRabbitmqBackupReconcilerClient(ns, backup, strategy)
+	r := &BackupReconciler{Client: c, Scheme: s, Recorder: rec}
+	ctx := context.Background()
+
+	// Put both the namespace and the Backup into Terminating.
+	if err := c.Delete(ctx, ns); err != nil {
+		t.Fatalf("delete namespace: %v", err)
+	}
+	if err := c.Delete(ctx, backup); err != nil {
+		t.Fatalf("delete backup: %v", err)
+	}
+	key := client.ObjectKeyFromObject(backup)
+
+	if _, err := r.Reconcile(ctx, ctrl.Request{NamespacedName: key}); err != nil {
+		t.Fatalf("Reconcile() error = %v", err)
+	}
+
+	got := &backupsv1alpha1.Backup{}
+	if err := c.Get(ctx, key, got); !apierrors.IsNotFound(err) {
+		t.Errorf("expected the Backup released in a terminating namespace (no wedge), got err=%v", err)
+	}
+	jobs := &batchv1.JobList{}
+	if err := c.List(ctx, jobs, client.InNamespace("tenant-test")); err != nil {
+		t.Fatalf("list jobs: %v", err)
+	}
+	if len(jobs.Items) != 0 {
+		t.Errorf("expected no cleanup Job created in a terminating namespace, got %d", len(jobs.Items))
+	}
+	select {
+	case ev := <-rec.Events:
+		if !strings.Contains(ev, "ArtifactNotDeleted") {
+			t.Errorf("expected an ArtifactNotDeleted Warning Event, got %q", ev)
+		}
+	default:
+		t.Error("expected a Warning Event naming the object left behind")
+	}
+}
+
+// redisCleanupBackup is a Redis Backup carrying the object key on its
+// DriverMetadata - the object cleanupRedisBackup must delete.
+func redisCleanupBackup(name, objectKey string) *backupsv1alpha1.Backup {
+	return &backupsv1alpha1.Backup{
+		ObjectMeta: metav1.ObjectMeta{Name: name, Namespace: "tenant-test"},
+		Spec: backupsv1alpha1.BackupSpec{
+			ApplicationRef: corev1.TypedLocalObjectReference{
+				APIGroup: new(backupsv1alpha1.DefaultApplicationAPIGroup),
+				Kind:     "Redis",
+				Name:     "cache",
+			},
+			StrategyRef: corev1.TypedLocalObjectReference{
+				APIGroup: new(strategyv1alpha1.GroupVersion.Group),
+				Kind:     strategyv1alpha1.RedisStrategyKind,
+				Name:     "cozy-default-redis",
+			},
+			TakenAt:        metav1.Now(),
+			DriverMetadata: map[string]string{redisObjectMetaKey: objectKey},
+		},
+	}
+}
+
+// newRedisCleanupStrategy renders in cleanup mode: its template references only
+// .Mode and .ObjectKey (never .Application), which cleanup passes as nil.
+func newRedisCleanupStrategy(name string) *strategyv1alpha1.Redis {
+	return &strategyv1alpha1.Redis{
+		ObjectMeta: metav1.ObjectMeta{Name: name},
+		Spec: strategyv1alpha1.RedisSpec{
+			Template: corev1.PodTemplateSpec{
+				Spec: corev1.PodSpec{
+					RestartPolicy: corev1.RestartPolicyNever,
+					Containers: []corev1.Container{{
+						Name:  "cleanup",
+						Image: "redis-backup:test",
+						Args:  []string{"--mode={{ .Mode }}", "--key={{ .ObjectKey }}"},
+					}},
+				},
+			},
+		},
+	}
+}
+
+// TestBackupReconcile_HoldsFinalizerWhileRedisCleanupRuns pins that a deleted
+// Redis Backup deletes its object (the Redis driver owns it) instead of falling
+// through to the Velero no-op: Reconcile spawns a cleanup Job, holds the
+// finalizer while it runs, and removes the Backup once the Job completes.
+// Dropping the Redis case in cleanupOnDelete turns this red (no Job, Backup
+// removed immediately with its object orphaned).
+func TestBackupReconcile_HoldsFinalizerWhileRedisCleanupRuns(t *testing.T) {
+	ns := &corev1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: "tenant-test"}}
+	backup := redisCleanupBackup("redis-src", "tenant-test/cache/redis-src.rdb")
+	backup.Finalizers = []string{backupFinalizer}
+	strategy := newRedisCleanupStrategy("cozy-default-redis")
+	c, s := newRabbitmqBackupReconcilerClient(ns, backup, strategy)
+	r := &BackupReconciler{Client: c, Scheme: s, Recorder: record.NewFakeRecorder(10)}
+	ctx := context.Background()
+
+	if err := c.Delete(ctx, backup); err != nil {
+		t.Fatalf("delete backup: %v", err)
+	}
+	key := client.ObjectKeyFromObject(backup)
+
+	res, err := r.Reconcile(ctx, ctrl.Request{NamespacedName: key})
+	if err != nil {
+		t.Fatalf("Reconcile() error = %v", err)
+	}
+	if res.RequeueAfter == 0 {
+		t.Error("expected Reconcile to requeue while the delete Job runs")
+	}
+	got := &backupsv1alpha1.Backup{}
+	if err := c.Get(ctx, key, got); err != nil {
+		t.Fatalf("Backup must still exist while cleanup runs: %v", err)
+	}
+	if !controllerutil.ContainsFinalizer(got, backupFinalizer) {
+		t.Error("expected the finalizer to be retained while the delete Job runs")
+	}
+	jobs := &batchv1.JobList{}
+	if err := c.List(ctx, jobs, client.InNamespace("tenant-test")); err != nil {
+		t.Fatalf("list jobs: %v", err)
+	}
+	if len(jobs.Items) != 1 {
+		t.Fatalf("expected the cleanup Job, got %d", len(jobs.Items))
+	}
+	if got := jobs.Items[0].Labels[redisLabelMode]; got != redisModeCleanup {
+		t.Errorf("expected the Job labelled mode=%q, got %q", redisModeCleanup, got)
+	}
+
+	// Complete the Job; the next reconcile removes the finalizer -> Backup gone.
+	job := jobs.Items[0]
+	job.Status.Conditions = []batchv1.JobCondition{{Type: batchv1.JobComplete, Status: corev1.ConditionTrue}}
+	if err := c.Status().Update(ctx, &job); err != nil {
+		t.Fatalf("update job status: %v", err)
+	}
+	if _, err := r.Reconcile(ctx, ctrl.Request{NamespacedName: key}); err != nil {
+		t.Fatalf("Reconcile() second call error = %v", err)
+	}
+	if err := c.Get(ctx, key, got); !apierrors.IsNotFound(err) {
+		t.Errorf("expected the Backup removed after the delete Job completed, got err=%v", err)
+	}
+}
+
+// TestBackupCleanup_Redis_NoObjectKeyIsNoOp pins that a legacy Redis Backup
+// with no recorded object key releases without spawning a Job (nothing to
+// delete), rather than wedging.
+func TestBackupCleanup_Redis_NoObjectKeyIsNoOp(t *testing.T) {
+	backup := redisCleanupBackup("redis-legacy", "")
+	backup.Spec.DriverMetadata = nil
+	c, s := newRabbitmqBackupReconcilerClient(backup)
+	r := &BackupReconciler{Client: c, Scheme: s, Recorder: record.NewFakeRecorder(10)}
+	res, err := r.cleanupOnDelete(context.Background(), backup)
+	if err != nil {
+		t.Fatalf("cleanupOnDelete returned %v", err)
+	}
+	if res.RequeueAfter != 0 {
+		t.Error("expected no requeue when there is no object to delete")
+	}
+	jobs := &batchv1.JobList{}
+	if err := c.List(context.Background(), jobs, client.InNamespace("tenant-test")); err != nil {
+		t.Fatalf("list jobs: %v", err)
+	}
+	if len(jobs.Items) != 0 {
+		t.Errorf("expected no cleanup Job for a keyless Backup, got %d", len(jobs.Items))
+	}
+}
+
+// TestBackupCleanup_Redis_UnknownKindRendersNothing pins that a Backup routed
+// to the Redis strategy for a kind with no chart prefix is released without a
+// Job, rather than rendered with an empty prefix.
+func TestBackupCleanup_Redis_UnknownKindRendersNothing(t *testing.T) {
+	ns := &corev1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: "tenant-test"}}
+	backup := redisCleanupBackup("redis-odd", "tenant-test/cache/redis-odd.rdb")
+	backup.Spec.ApplicationRef.Kind = "Postgres"
+	strategy := newRedisCleanupStrategy("cozy-default-redis")
+	c, s := newRabbitmqBackupReconcilerClient(ns, backup, strategy)
+	r := &BackupReconciler{Client: c, Scheme: s, Recorder: record.NewFakeRecorder(10)}
+	res, err := r.cleanupOnDelete(context.Background(), backup)
+	if err != nil {
+		t.Fatalf("cleanupOnDelete returned %v", err)
+	}
+	if res.RequeueAfter != 0 {
+		t.Error("expected the Backup released, not requeued")
+	}
+	jobs := &batchv1.JobList{}
+	if err := c.List(context.Background(), jobs, client.InNamespace("tenant-test")); err != nil {
+		t.Fatalf("list jobs: %v", err)
+	}
+	if len(jobs.Items) != 0 {
+		t.Errorf("expected no cleanup Job for a kind with no prefix, got %d", len(jobs.Items))
+	}
+}
diff --git a/internal/backupcontroller/backupclass_resolver_test.go b/internal/backupcontroller/backupclass_resolver_test.go
index cd65f22aa3..76b1e49e84 100644
--- a/internal/backupcontroller/backupclass_resolver_test.go
+++ b/internal/backupcontroller/backupclass_resolver_test.go
@@ -27,7 +27,7 @@ func TestNormalizeApplicationRef(t *testing.T) {
 				Name: "vm1",
 			},
 			expected: corev1.TypedLocalObjectReference{
-				APIGroup: stringPtr(DefaultApplicationAPIGroup),
+				APIGroup: new(DefaultApplicationAPIGroup),
 				Kind:     "VirtualMachine",
 				Name:     "vm1",
 			},
@@ -40,7 +40,7 @@ func TestNormalizeApplicationRef(t *testing.T) {
 				Name:     "vm1",
 			},
 			expected: corev1.TypedLocalObjectReference{
-				APIGroup: stringPtr(DefaultApplicationAPIGroup),
+				APIGroup: new(DefaultApplicationAPIGroup),
 				Kind:     "VirtualMachine",
 				Name:     "vm1",
 			},
@@ -48,12 +48,12 @@ func TestNormalizeApplicationRef(t *testing.T) {
 		{
 			name: "apiGroup is empty string - should default to apps.cozystack.io",
 			input: corev1.TypedLocalObjectReference{
-				APIGroup: stringPtr(""),
+				APIGroup: new(""),
 				Kind:     "VirtualMachine",
 				Name:     "vm1",
 			},
 			expected: corev1.TypedLocalObjectReference{
-				APIGroup: stringPtr(DefaultApplicationAPIGroup),
+				APIGroup: new(DefaultApplicationAPIGroup),
 				Kind:     "VirtualMachine",
 				Name:     "vm1",
 			},
@@ -61,12 +61,12 @@ func TestNormalizeApplicationRef(t *testing.T) {
 		{
 			name: "apiGroup is explicitly set - should keep it",
 			input: corev1.TypedLocalObjectReference{
-				APIGroup: stringPtr("custom.api.group.io"),
+				APIGroup: new("custom.api.group.io"),
 				Kind:     "CustomApp",
 				Name:     "custom-app",
 			},
 			expected: corev1.TypedLocalObjectReference{
-				APIGroup: stringPtr("custom.api.group.io"),
+				APIGroup: new("custom.api.group.io"),
 				Kind:     "CustomApp",
 				Name:     "custom-app",
 			},
@@ -74,12 +74,12 @@ func TestNormalizeApplicationRef(t *testing.T) {
 		{
 			name: "apiGroup is apps.cozystack.io - should keep it",
 			input: corev1.TypedLocalObjectReference{
-				APIGroup: stringPtr(DefaultApplicationAPIGroup),
+				APIGroup: new(DefaultApplicationAPIGroup),
 				Kind:     "VirtualMachine",
 				Name:     "vm1",
 			},
 			expected: corev1.TypedLocalObjectReference{
-				APIGroup: stringPtr(DefaultApplicationAPIGroup),
+				APIGroup: new(DefaultApplicationAPIGroup),
 				Kind:     "VirtualMachine",
 				Name:     "vm1",
 			},
@@ -126,7 +126,7 @@ func TestResolveBackupClass(t *testing.T) {
 					Strategies: []backupsv1alpha1.BackupClassStrategy{
 						{
 							StrategyRef: corev1.TypedLocalObjectReference{
-								APIGroup: stringPtr("strategy.backups.cozystack.io"),
+								APIGroup: new("strategy.backups.cozystack.io"),
 								Kind:     "Velero",
 								Name:     "velero-strategy-vm",
 							},
@@ -139,7 +139,7 @@ func TestResolveBackupClass(t *testing.T) {
 						},
 						{
 							StrategyRef: corev1.TypedLocalObjectReference{
-								APIGroup: stringPtr("strategy.backups.cozystack.io"),
+								APIGroup: new("strategy.backups.cozystack.io"),
 								Kind:     "Velero",
 								Name:     "velero-strategy-mariadb",
 							},
@@ -160,7 +160,7 @@ func TestResolveBackupClass(t *testing.T) {
 			backupClassName: "velero",
 			wantErr:         false,
 			expectedStrategyRef: &corev1.TypedLocalObjectReference{
-				APIGroup: stringPtr("strategy.backups.cozystack.io"),
+				APIGroup: new("strategy.backups.cozystack.io"),
 				Kind:     "Velero",
 				Name:     "velero-strategy-vm",
 			},
@@ -178,12 +178,12 @@ func TestResolveBackupClass(t *testing.T) {
 					Strategies: []backupsv1alpha1.BackupClassStrategy{
 						{
 							StrategyRef: corev1.TypedLocalObjectReference{
-								APIGroup: stringPtr("strategy.backups.cozystack.io"),
+								APIGroup: new("strategy.backups.cozystack.io"),
 								Kind:     "Velero",
 								Name:     "velero-strategy-mariadb",
 							},
 							Application: backupsv1alpha1.ApplicationSelector{
-								APIGroup: stringPtr("apps.cozystack.io"),
+								APIGroup: new("apps.cozystack.io"),
 								Kind:     "MariaDB",
 							},
 							Parameters: map[string]string{
@@ -194,14 +194,14 @@ func TestResolveBackupClass(t *testing.T) {
 				},
 			},
 			applicationRef: corev1.TypedLocalObjectReference{
-				APIGroup: stringPtr("apps.cozystack.io"),
+				APIGroup: new("apps.cozystack.io"),
 				Kind:     "MariaDB",
 				Name:     "mariadb1",
 			},
 			backupClassName: "velero",
 			wantErr:         false,
 			expectedStrategyRef: &corev1.TypedLocalObjectReference{
-				APIGroup: stringPtr("strategy.backups.cozystack.io"),
+				APIGroup: new("strategy.backups.cozystack.io"),
 				Kind:     "Velero",
 				Name:     "velero-strategy-mariadb",
 			},
@@ -219,7 +219,7 @@ func TestResolveBackupClass(t *testing.T) {
 					Strategies: []backupsv1alpha1.BackupClassStrategy{
 						{
 							StrategyRef: corev1.TypedLocalObjectReference{
-								APIGroup: stringPtr("strategy.backups.cozystack.io"),
+								APIGroup: new("strategy.backups.cozystack.io"),
 								Kind:     "Velero",
 								Name:     "velero-strategy-vm",
 							},
@@ -241,7 +241,7 @@ func TestResolveBackupClass(t *testing.T) {
 			backupClassName: "velero",
 			wantErr:         false,
 			expectedStrategyRef: &corev1.TypedLocalObjectReference{
-				APIGroup: stringPtr("strategy.backups.cozystack.io"),
+				APIGroup: new("strategy.backups.cozystack.io"),
 				Kind:     "Velero",
 				Name:     "velero-strategy-vm",
 			},
@@ -276,7 +276,7 @@ func TestResolveBackupClass(t *testing.T) {
 					Strategies: []backupsv1alpha1.BackupClassStrategy{
 						{
 							StrategyRef: corev1.TypedLocalObjectReference{
-								APIGroup: stringPtr("strategy.backups.cozystack.io"),
+								APIGroup: new("strategy.backups.cozystack.io"),
 								Kind:     "Velero",
 								Name:     "velero-strategy-vm",
 							},
@@ -304,12 +304,12 @@ func TestResolveBackupClass(t *testing.T) {
 					Strategies: []backupsv1alpha1.BackupClassStrategy{
 						{
 							StrategyRef: corev1.TypedLocalObjectReference{
-								APIGroup: stringPtr("strategy.backups.cozystack.io"),
+								APIGroup: new("strategy.backups.cozystack.io"),
 								Kind:     "Velero",
 								Name:     "velero-strategy-vm",
 							},
 							Application: backupsv1alpha1.ApplicationSelector{
-								APIGroup: stringPtr("custom.api.group.io"),
+								APIGroup: new("custom.api.group.io"),
 								Kind:     "VirtualMachine",
 							},
 						},
@@ -317,7 +317,7 @@ func TestResolveBackupClass(t *testing.T) {
 				},
 			},
 			applicationRef: corev1.TypedLocalObjectReference{
-				APIGroup: stringPtr("apps.cozystack.io"), // Different apiGroup
+				APIGroup: new("apps.cozystack.io"), // Different apiGroup
 				Kind:     "VirtualMachine",
 				Name:     "vm1",
 			},
diff --git a/internal/backupcontroller/backupjob_controller.go b/internal/backupcontroller/backupjob_controller.go
index edbadbb561..791524240a 100644
--- a/internal/backupcontroller/backupjob_controller.go
+++ b/internal/backupcontroller/backupjob_controller.go
@@ -5,6 +5,7 @@ import (
 	"errors"
 	"fmt"
 	"net/http"
+	"slices"
 	"strings"
 	"time"
 
@@ -34,6 +35,10 @@ type BackupJobReconciler struct {
 	Scheme            *runtime.Scheme
 	Recorder          record.EventRecorder
 	CredentialsConfig BackupCredentialsConfig
+	// APIReader is the manager's uncached reader, through which Reconcile
+	// re-reads the BackupJob before dispatching to a driver. Wired in
+	// SetupWithManager.
+	APIReader client.Reader
 }
 
 func (r *BackupJobReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
@@ -61,6 +66,24 @@ func (r *BackupJobReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
 		return ctrl.Result{}, nil
 	}
 
+	// The cache can trail this reconciler's own writes. A pass that stamps
+	// StartedAt and then fails the job has already requeued it through the
+	// first write, so the next pass can start before the informer has seen
+	// Failed, retry the step that failed, and create a driver object for a
+	// job that is over and that nothing will track. Re-read the job past the
+	// cache; the check above only spares finished jobs the extra request.
+	if err := r.apiReader().Get(ctx, req.NamespacedName, j); err != nil {
+		if apierrors.IsNotFound(err) {
+			return ctrl.Result{}, nil
+		}
+		logger.Error(err, "failed to re-read BackupJob")
+		return ctrl.Result{}, err
+	}
+	if j.Status.Phase == backupsv1alpha1.BackupJobPhaseSucceeded || j.Status.Phase == backupsv1alpha1.BackupJobPhaseFailed {
+		logger.V(1).Info("BackupJob terminal on the apiserver ahead of the cache, skipping", "phase", j.Status.Phase)
+		return ctrl.Result{}, nil
+	}
+
 	// Normalize ApplicationRef (default apiGroup if not specified)
 	normalizedAppRef := NormalizeApplicationRef(j.Spec.ApplicationRef)
 
@@ -124,17 +147,28 @@ func (r *BackupJobReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
 	// leak cozy-backups-creds into the tenant namespace and then
 	// silently no-op in the dispatch switch below — leaving the
 	// BackupJob in a phaseless state forever.
-	supported := false
-	for _, k := range supportedBackupStrategyKinds() {
-		if strategyRef.Kind == k {
-			supported = true
-			break
-		}
-	}
+	supported := slices.Contains(supportedBackupStrategyKinds(), strategyRef.Kind)
 	if !supported {
 		return r.markBackupJobFailed(ctx, j, fmt.Sprintf("strategy Kind %q is not supported by this controller (supported: %s)", strategyRef.Kind, strings.Join(supportedBackupStrategyKinds(), ", ")))
 	}
 
+	// Hold a run that has not started while a restore writes into its
+	// application. Only before StartedAt: every driver stamps it on its
+	// first pass, and a run already moving data is not interrupted here.
+	if j.Status.StartedAt == nil {
+		restore, err := activeRestoreTargeting(ctx, r.Client, j.Namespace, normalizedAppRef)
+		if err != nil {
+			logger.Error(err, "failed to check for a restore in progress")
+			return ctrl.Result{}, err
+		}
+		if restore != "" {
+			return r.holdForRestore(ctx, j, restore)
+		}
+		if err := r.releaseRestoreHold(ctx, j); err != nil {
+			return ctrl.Result{}, err
+		}
+	}
+
 	// Now project the platform-managed S3 credentials into the tenant
 	// namespace so default Strategy CRs can reference a deterministic
 	// Secret name. The projection is idempotent and silently skipped on
@@ -164,10 +198,18 @@ func (r *BackupJobReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
 		return r.reconcileAltinity(ctx, j, resolved)
 	case strategyv1alpha1.MariaDBStrategyKind:
 		return r.reconcileMariaDB(ctx, j, resolved)
+	case strategyv1alpha1.MongoDBStrategyKind:
+		return r.reconcileMongoDB(ctx, j, resolved)
 	case strategyv1alpha1.FoundationDBStrategyKind:
 		return r.reconcileFoundationDB(ctx, j, resolved)
 	case strategyv1alpha1.EtcdStrategyKind:
 		return r.reconcileEtcd(ctx, j, resolved)
+	case strategyv1alpha1.RabbitmqStrategyKind:
+		return r.reconcileRabbitmq(ctx, j, resolved)
+	case strategyv1alpha1.RedisStrategyKind:
+		return r.reconcileRedis(ctx, j, resolved)
+	case strategyv1alpha1.KafkaStrategyKind:
+		return r.reconcileKafka(ctx, j, resolved)
 	default:
 		logger.V(1).Info("BackupJob resolved StrategyRef.Kind not supported, skipping",
 			"backupjob", j.Name,
@@ -188,8 +230,12 @@ func supportedBackupStrategyKinds() []string {
 		strategyv1alpha1.CNPGStrategyKind,
 		strategyv1alpha1.AltinityStrategyKind,
 		strategyv1alpha1.MariaDBStrategyKind,
+		strategyv1alpha1.MongoDBStrategyKind,
 		strategyv1alpha1.FoundationDBStrategyKind,
 		strategyv1alpha1.EtcdStrategyKind,
+		strategyv1alpha1.RabbitmqStrategyKind,
+		strategyv1alpha1.RedisStrategyKind,
+		strategyv1alpha1.KafkaStrategyKind,
 	}
 }
 
@@ -206,6 +252,7 @@ func (r *BackupJobReconciler) SetupWithManager(mgr ctrl.Manager) error {
 		return err
 	}
 
+	r.APIReader = mgr.GetAPIReader()
 	cfg := mgr.GetConfig()
 	var err error
 	if r.Interface, err = dynamic.NewForConfig(cfg); err != nil {
@@ -223,6 +270,16 @@ func (r *BackupJobReconciler) SetupWithManager(mgr ctrl.Manager) error {
 		Complete(r)
 }
 
+// apiReader returns the uncached reader. Reconcilers built by hand in unit
+// tests have none and fall back to their fake Client, which has no cache to
+// bypass.
+func (r *BackupJobReconciler) apiReader() client.Reader {
+	if r.APIReader != nil {
+		return r.APIReader
+	}
+	return r.Client
+}
+
 // handleProjectionError classifies a credentials-projection error as
 // transient (requeue) or terminal (mark Failed). Transient errors record
 // a Ready=False condition without setting Phase=Failed so the BackupJob
diff --git a/internal/backupcontroller/backupjob_controller_test.go b/internal/backupcontroller/backupjob_controller_test.go
index 6a9c8639ad..f802fe3742 100644
--- a/internal/backupcontroller/backupjob_controller_test.go
+++ b/internal/backupcontroller/backupjob_controller_test.go
@@ -39,8 +39,12 @@ func TestSupportedBackupStrategyKindsMatchesDispatch(t *testing.T) {
 		strategyv1alpha1.CNPGStrategyKind,
 		strategyv1alpha1.AltinityStrategyKind,
 		strategyv1alpha1.MariaDBStrategyKind,
+		strategyv1alpha1.MongoDBStrategyKind,
 		strategyv1alpha1.FoundationDBStrategyKind,
 		strategyv1alpha1.EtcdStrategyKind,
+		strategyv1alpha1.RabbitmqStrategyKind,
+		strategyv1alpha1.RedisStrategyKind,
+		strategyv1alpha1.KafkaStrategyKind,
 	}
 	sort.Strings(got)
 	sort.Strings(want)
@@ -171,7 +175,7 @@ func TestReconcile_SkipsProjection_ForeignAPIGroup(t *testing.T) {
 			Strategies: []backupsv1alpha1.BackupClassStrategy{
 				{
 					Application: backupsv1alpha1.ApplicationSelector{
-						APIGroup: stringPtr("apps.cozystack.io"),
+						APIGroup: new("apps.cozystack.io"),
 						Kind:     "Postgres",
 					},
 					StrategyRef: corev1.TypedLocalObjectReference{
@@ -188,7 +192,7 @@ func TestReconcile_SkipsProjection_ForeignAPIGroup(t *testing.T) {
 		Spec: backupsv1alpha1.BackupJobSpec{
 			BackupClassName: "foreign-class",
 			ApplicationRef: corev1.TypedLocalObjectReference{
-				APIGroup: stringPtr("apps.cozystack.io"),
+				APIGroup: new("apps.cozystack.io"),
 				Kind:     "Postgres",
 				Name:     "pg",
 			},
@@ -244,7 +248,7 @@ func TestReconcile_NoMatchingStrategy_IsTerminal(t *testing.T) {
 				{
 					Application: backupsv1alpha1.ApplicationSelector{APIGroup: &appsGroup, Kind: "Postgres"},
 					StrategyRef: corev1.TypedLocalObjectReference{
-						APIGroup: stringRef(strategyv1alpha1.GroupVersion.Group), Kind: "CNPG", Name: "cozy-default-cnpg",
+						APIGroup: new(strategyv1alpha1.GroupVersion.Group), Kind: "CNPG", Name: "cozy-default-cnpg",
 					},
 				},
 			},
@@ -280,8 +284,6 @@ func TestReconcile_NoMatchingStrategy_IsTerminal(t *testing.T) {
 	}
 }
 
-func stringRef(s string) *string { return &s }
-
 // TestReconcile_BackupClassNotFound_IsTransient covers round-12 blocker
 // #3: a BackupJob referencing a BackupClass that does not exist must
 // requeue with Ready=False/BackupClassNotFound, not return a bare
diff --git a/internal/backupcontroller/backupjob_restore_lock.go b/internal/backupcontroller/backupjob_restore_lock.go
new file mode 100644
index 0000000000..06f165285b
--- /dev/null
+++ b/internal/backupcontroller/backupjob_restore_lock.go
@@ -0,0 +1,170 @@
+// SPDX-License-Identifier: Apache-2.0
+package backupcontroller
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"sort"
+	"time"
+
+	corev1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/api/meta"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	ctrl "sigs.k8s.io/controller-runtime"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+
+	strategyv1alpha1 "github.com/cozystack/cozystack/api/backups/strategy/v1alpha1"
+	backupsv1alpha1 "github.com/cozystack/cozystack/api/backups/v1alpha1"
+)
+
+// RestoreInProgressRequeue is how often a BackupJob held by a restore checks
+// again. Restores run for minutes, so there is nothing to gain from polling
+// faster.
+const RestoreInProgressRequeue = 30 * time.Second
+
+// ConditionReasonRestoreInProgress is the Ready=False reason of a BackupJob
+// held back because its application is being restored.
+const ConditionReasonRestoreInProgress = "RestoreInProgress"
+
+// activeRestoreTargeting returns the name of a non-terminal RestoreJob in
+// namespace that writes into app, or "" when there is none.
+//
+// A backup must not start against an application a restore is rewriting. It
+// would capture a half-restored state at best, and on the CNPG path it does
+// worse: every BackupJob reconcile re-applies the Cluster's barman plugin, and
+// one landing between the restore re-rendering the Cluster with its new
+// serverName and the plugin being attached can put the restored cluster back
+// on the source's WAL prefix, where its recovery fails with "Expected empty
+// archive". Plan-created runs are the ones that hit this, since nothing else
+// looks at restores before creating a BackupJob.
+func activeRestoreTargeting(ctx context.Context, c client.Client, namespace string, app corev1.TypedLocalObjectReference) (string, error) {
+	app = NormalizeApplicationRef(app)
+	list := &backupsv1alpha1.RestoreJobList{}
+	if err := c.List(ctx, list, client.InNamespace(namespace)); err != nil {
+		return "", fmt.Errorf("list RestoreJobs: %w", err)
+	}
+	var holding []string
+	for i := range list.Items {
+		rj := &list.Items[i]
+		if rj.Status.Phase == backupsv1alpha1.RestoreJobPhaseSucceeded || rj.Status.Phase == backupsv1alpha1.RestoreJobPhaseFailed {
+			continue
+		}
+		target, ok, err := restoreJobTarget(ctx, c, rj)
+		if err != nil {
+			return "", err
+		}
+		if ok && sameApplication(target, app) {
+			holding = append(holding, rj.Name)
+		}
+	}
+	if len(holding) == 0 {
+		return "", nil
+	}
+	sort.Strings(holding)
+	return holding[0], nil
+}
+
+// restoreJobTarget resolves the application a RestoreJob writes into in its
+// own namespace, as the drivers resolve it (resolveCNPGRestoreTarget and the
+// Job-based paths): the Backup's applicationRef, with the target's kind and
+// name when a target is set — the CRD requires both — and the target's API
+// group only when it names one. A target without an API group therefore stays
+// in the Backup's group, which is not always the default one. The Velero
+// driver drops the target's API group (resolveRestoreTarget) and restores the
+// Backup's resources, so a Velero restore always stays in the Backup's group.
+//
+// It reports false for a restore that writes nothing here. One whose Backup is
+// gone is failed by the restore controller on its next pass. A Velero restore
+// whose options name another namespace writes there: only the Velero driver
+// reads options.targetNamespace, so the option is looked at only when the
+// Backup's strategy is Velero — the CNPG and Job-based drivers ignore it and
+// restore in place.
+func restoreJobTarget(ctx context.Context, c client.Client, rj *backupsv1alpha1.RestoreJob) (corev1.TypedLocalObjectReference, bool, error) {
+	backup := &backupsv1alpha1.Backup{}
+	if err := c.Get(ctx, client.ObjectKey{Namespace: rj.Namespace, Name: rj.Spec.BackupRef.Name}, backup); err != nil {
+		if client.IgnoreNotFound(err) == nil {
+			return corev1.TypedLocalObjectReference{}, false, nil
+		}
+		return corev1.TypedLocalObjectReference{}, false, fmt.Errorf("get Backup %s of RestoreJob %s: %w", rj.Spec.BackupRef.Name, rj.Name, err)
+	}
+	if backup.Spec.StrategyRef.Kind == strategyv1alpha1.VeleroStrategyKind && restoresIntoAnotherNamespace(rj, backup.Namespace) {
+		return corev1.TypedLocalObjectReference{}, false, nil
+	}
+	ref := backup.Spec.ApplicationRef
+	if t := rj.Spec.TargetApplicationRef; t != nil {
+		ref.Kind, ref.Name = t.Kind, t.Name
+		if t.APIGroup != nil && backup.Spec.StrategyRef.Kind != strategyv1alpha1.VeleroStrategyKind {
+			ref.APIGroup = t.APIGroup
+		}
+	}
+	return NormalizeApplicationRef(ref), true, nil
+}
+
+// restoresIntoAnotherNamespace reports whether a Velero RestoreJob's
+// options.targetNamespace sends it away from namespace, compared as the Velero
+// driver compares it. Options that do not parse are read as none.
+func restoresIntoAnotherNamespace(rj *backupsv1alpha1.RestoreJob, namespace string) bool {
+	if rj.Spec.Options == nil || len(rj.Spec.Options.Raw) == 0 {
+		return false
+	}
+	var opts struct {
+		TargetNamespace string `json:"targetNamespace"`
+	}
+	if err := json.Unmarshal(rj.Spec.Options.Raw, &opts); err != nil {
+		return false
+	}
+	return opts.TargetNamespace != "" && opts.TargetNamespace != namespace
+}
+
+// sameApplication expects both references normalized: an API group left
+// unset compares equal only once it has been defaulted on both sides.
+func sameApplication(a, b corev1.TypedLocalObjectReference) bool {
+	return a.Kind == b.Kind && a.Name == b.Name && ptrString(a.APIGroup) == ptrString(b.APIGroup)
+}
+
+func ptrString(s *string) string {
+	if s == nil {
+		return ""
+	}
+	return *s
+}
+
+// holdForRestore keeps a BackupJob that has not started yet waiting while a
+// restore writes into its application. It stays non-terminal, so a scheduled
+// run still happens once the restore ends, only later than its slot.
+//
+// A failed status write is returned so the manager retries it with backoff.
+// The job is held either way, since nothing past the gate ran, but a hold
+// nobody can see reads as a run stuck for no reason.
+func (r *BackupJobReconciler) holdForRestore(ctx context.Context, j *backupsv1alpha1.BackupJob, restore string) (ctrl.Result, error) {
+	if j.Status.Phase == backupsv1alpha1.BackupJobPhaseEmpty {
+		j.Status.Phase = backupsv1alpha1.BackupJobPhasePending
+	}
+	meta.SetStatusCondition(&j.Status.Conditions, metav1.Condition{
+		Type:    "Ready",
+		Status:  metav1.ConditionFalse,
+		Reason:  ConditionReasonRestoreInProgress,
+		Message: fmt.Sprintf("waiting for RestoreJob %q to finish: application %s/%s is being restored", restore, j.Spec.ApplicationRef.Kind, j.Spec.ApplicationRef.Name),
+	})
+	if err := r.Status().Update(ctx, j); err != nil {
+		return ctrl.Result{}, fmt.Errorf("record RestoreInProgress on BackupJob %s: %w", j.Name, err)
+	}
+	return ctrl.Result{RequeueAfter: RestoreInProgressRequeue}, nil
+}
+
+// releaseRestoreHold removes the condition holdForRestore left, once the
+// restore has ended and the job goes on to start. Left in place it would read
+// "waiting for RestoreJob" until the driver next writes Ready, which for a
+// healthy run is when the backup completes.
+func (r *BackupJobReconciler) releaseRestoreHold(ctx context.Context, j *backupsv1alpha1.BackupJob) error {
+	cond := meta.FindStatusCondition(j.Status.Conditions, "Ready")
+	if cond == nil || cond.Reason != ConditionReasonRestoreInProgress {
+		return nil
+	}
+	meta.RemoveStatusCondition(&j.Status.Conditions, "Ready")
+	if err := r.Status().Update(ctx, j); err != nil {
+		return fmt.Errorf("clear RestoreInProgress on BackupJob %s: %w", j.Name, err)
+	}
+	return nil
+}
diff --git a/internal/backupcontroller/backupjob_restore_lock_test.go b/internal/backupcontroller/backupjob_restore_lock_test.go
new file mode 100644
index 0000000000..edb1972e0a
--- /dev/null
+++ b/internal/backupcontroller/backupjob_restore_lock_test.go
@@ -0,0 +1,341 @@
+// SPDX-License-Identifier: Apache-2.0
+package backupcontroller
+
+import (
+	"context"
+	"errors"
+	"testing"
+
+	corev1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/api/meta"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/types"
+	"k8s.io/client-go/kubernetes/scheme"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+	clientfake "sigs.k8s.io/controller-runtime/pkg/client/fake"
+	"sigs.k8s.io/controller-runtime/pkg/client/interceptor"
+	"sigs.k8s.io/controller-runtime/pkg/reconcile"
+
+	strategyv1alpha1 "github.com/cozystack/cozystack/api/backups/strategy/v1alpha1"
+	backupsv1alpha1 "github.com/cozystack/cozystack/api/backups/v1alpha1"
+)
+
+const lockNS = "tenant-acme"
+
+func lockTestClient(t *testing.T, objs ...client.Object) client.Client {
+	t.Helper()
+	s := runtime.NewScheme()
+	_ = scheme.AddToScheme(s)
+	_ = backupsv1alpha1.AddToScheme(s)
+	return clientfake.NewClientBuilder().
+		WithScheme(s).
+		WithObjects(objs...).
+		WithStatusSubresource(&backupsv1alpha1.BackupJob{}, &backupsv1alpha1.RestoreJob{}).
+		Build()
+}
+
+func pgRef(name string) corev1.TypedLocalObjectReference {
+	return corev1.TypedLocalObjectReference{APIGroup: new("apps.cozystack.io"), Kind: "Postgres", Name: name}
+}
+
+func lockBackup(name string, app corev1.TypedLocalObjectReference) *backupsv1alpha1.Backup {
+	return lockBackupBy(name, app, strategyv1alpha1.CNPGStrategyKind)
+}
+
+func lockBackupBy(name string, app corev1.TypedLocalObjectReference, strategyKind string) *backupsv1alpha1.Backup {
+	return &backupsv1alpha1.Backup{
+		ObjectMeta: metav1.ObjectMeta{Namespace: lockNS, Name: name},
+		Spec: backupsv1alpha1.BackupSpec{
+			ApplicationRef: app,
+			StrategyRef:    corev1.TypedLocalObjectReference{APIGroup: new(strategyv1alpha1.GroupVersion.Group), Kind: strategyKind, Name: "s"},
+		},
+	}
+}
+
+func lockRestore(name, backup string, phase backupsv1alpha1.RestoreJobPhase, target *corev1.TypedLocalObjectReference, options string) *backupsv1alpha1.RestoreJob {
+	rj := &backupsv1alpha1.RestoreJob{
+		ObjectMeta: metav1.ObjectMeta{Namespace: lockNS, Name: name},
+		Spec: backupsv1alpha1.RestoreJobSpec{
+			BackupRef:            corev1.LocalObjectReference{Name: backup},
+			TargetApplicationRef: target,
+		},
+		Status: backupsv1alpha1.RestoreJobStatus{Phase: phase},
+	}
+	if options != "" {
+		rj.Spec.Options = &runtime.RawExtension{Raw: []byte(options)}
+	}
+	return rj
+}
+
+func TestActiveRestoreTargeting(t *testing.T) {
+	other := pgRef("other")
+	anotherKind := corev1.TypedLocalObjectReference{APIGroup: new("apps.cozystack.io"), Kind: "MariaDB", Name: "pg"}
+	anotherGroup := corev1.TypedLocalObjectReference{APIGroup: new("example.com"), Kind: "Postgres", Name: "pg"}
+	vm := corev1.TypedLocalObjectReference{APIGroup: new("apps.cozystack.io"), Kind: "VMInstance", Name: "vm"}
+	vmInGroup := corev1.TypedLocalObjectReference{APIGroup: new("example.com"), Kind: "VMInstance", Name: "vm"}
+	pg2InGroup := corev1.TypedLocalObjectReference{APIGroup: new("example.com"), Kind: "Postgres", Name: "pg2"}
+	pg2Default := pgRef("pg2")
+	for _, tc := range []struct {
+		name    string
+		app     *corev1.TypedLocalObjectReference // pgRef("pg") when nil
+		objects []client.Object
+		want    string
+	}{
+		{"no restore", nil, nil, ""},
+		{"in-place restore of the same application", nil, []client.Object{
+			lockBackup("pg-1", pgRef("pg")), lockRestore("r1", "pg-1", backupsv1alpha1.RestoreJobPhaseRunning, nil, ""),
+		}, "r1"},
+		{"restore not picked up yet", nil, []client.Object{
+			lockBackup("pg-1", pgRef("pg")), lockRestore("r1", "pg-1", "", nil, ""),
+		}, "r1"},
+		{"to-copy restore into this application", nil, []client.Object{
+			lockBackup("other-1", other), lockRestore("r1", "other-1", backupsv1alpha1.RestoreJobPhaseRunning, &corev1.TypedLocalObjectReference{Kind: "Postgres", Name: "pg"}, ""),
+		}, "r1"},
+		{"to-copy restore out of this application", nil, []client.Object{
+			lockBackup("pg-1", pgRef("pg")), lockRestore("r1", "pg-1", backupsv1alpha1.RestoreJobPhaseRunning, &other, ""),
+		}, ""},
+		{"finished restores", nil, []client.Object{
+			lockBackup("pg-1", pgRef("pg")),
+			lockRestore("r1", "pg-1", backupsv1alpha1.RestoreJobPhaseSucceeded, nil, ""),
+			lockRestore("r2", "pg-1", backupsv1alpha1.RestoreJobPhaseFailed, nil, ""),
+		}, ""},
+		{"same name, another kind", nil, []client.Object{
+			lockBackup("m-1", anotherKind), lockRestore("r1", "m-1", backupsv1alpha1.RestoreJobPhaseRunning, nil, ""),
+		}, ""},
+		{"same kind and name, another API group", nil, []client.Object{
+			lockBackup("x-1", anotherGroup), lockRestore("r1", "x-1", backupsv1alpha1.RestoreJobPhaseRunning, nil, ""),
+		}, ""},
+		// A target without an API group stays in the Backup's group.
+		{"to-copy target inheriting the Backup's API group", &pg2InGroup, []client.Object{
+			lockBackup("x-1", anotherGroup), lockRestore("r1", "x-1", backupsv1alpha1.RestoreJobPhaseRunning, &corev1.TypedLocalObjectReference{Kind: "Postgres", Name: "pg2"}, ""),
+		}, "r1"},
+		{"to-copy target without an API group is not in the default one", &pg2Default, []client.Object{
+			lockBackup("x-1", anotherGroup), lockRestore("r1", "x-1", backupsv1alpha1.RestoreJobPhaseRunning, &corev1.TypedLocalObjectReference{Kind: "Postgres", Name: "pg2"}, ""),
+		}, ""},
+		// Only the Velero driver reads targetNamespace.
+		{"Velero restore sent to another namespace", &vm, []client.Object{
+			lockBackupBy("vm-1", vm, strategyv1alpha1.VeleroStrategyKind), lockRestore("r1", "vm-1", backupsv1alpha1.RestoreJobPhaseRunning, nil, `{"targetNamespace":"tenant-other"}`),
+		}, ""},
+		{"Velero restore naming its own namespace", &vm, []client.Object{
+			lockBackupBy("vm-1", vm, strategyv1alpha1.VeleroStrategyKind), lockRestore("r1", "vm-1", backupsv1alpha1.RestoreJobPhaseRunning, nil, `{"targetNamespace":"`+lockNS+`"}`),
+		}, "r1"},
+		// The Velero driver drops the target's API group and restores the
+		// Backup's resources, in the Backup's group.
+		{"Velero target naming another API group restores in the Backup's", &vm, []client.Object{
+			lockBackupBy("vm-1", vm, strategyv1alpha1.VeleroStrategyKind), lockRestore("r1", "vm-1", backupsv1alpha1.RestoreJobPhaseRunning, &corev1.TypedLocalObjectReference{APIGroup: new("example.com"), Kind: "VMInstance", Name: "vm"}, ""),
+		}, "r1"},
+		{"Velero target naming another API group does not hold that group", &vmInGroup, []client.Object{
+			lockBackupBy("vm-1", vm, strategyv1alpha1.VeleroStrategyKind), lockRestore("r1", "vm-1", backupsv1alpha1.RestoreJobPhaseRunning, &corev1.TypedLocalObjectReference{APIGroup: new("example.com"), Kind: "VMInstance", Name: "vm"}, ""),
+		}, ""},
+		{"Postgres restore carrying targetNamespace, which CNPG ignores", nil, []client.Object{
+			lockBackup("pg-1", pgRef("pg")), lockRestore("r1", "pg-1", backupsv1alpha1.RestoreJobPhaseRunning, nil, `{"targetNamespace":"tenant-other"}`),
+		}, "r1"},
+		{"backup gone", nil, []client.Object{
+			lockRestore("r1", "pg-1", backupsv1alpha1.RestoreJobPhaseRunning, nil, ""),
+		}, ""},
+		// The restore controller fails it on its next pass for want of its
+		// Backup, however complete its target.
+		{"backup gone, target complete", nil, []client.Object{
+			lockRestore("r1", "pg-1", backupsv1alpha1.RestoreJobPhaseRunning, &corev1.TypedLocalObjectReference{Kind: "Postgres", Name: "pg"}, ""),
+		}, ""},
+	} {
+		t.Run(tc.name, func(t *testing.T) {
+			c := lockTestClient(t, tc.objects...)
+			app := pgRef("pg")
+			if tc.app != nil {
+				app = *tc.app
+			}
+			got, err := activeRestoreTargeting(context.Background(), c, lockNS, app)
+			if err != nil {
+				t.Fatalf("activeRestoreTargeting: %v", err)
+			}
+			if got != tc.want {
+				t.Errorf("got %q, want %q", got, tc.want)
+			}
+		})
+	}
+}
+
+func lockBackupClass() *backupsv1alpha1.BackupClass {
+	return &backupsv1alpha1.BackupClass{
+		ObjectMeta: metav1.ObjectMeta{Name: "cozy-default"},
+		Spec: backupsv1alpha1.BackupClassSpec{
+			Strategies: []backupsv1alpha1.BackupClassStrategy{{
+				Application: backupsv1alpha1.ApplicationSelector{APIGroup: new("apps.cozystack.io"), Kind: "Postgres"},
+				StrategyRef: corev1.TypedLocalObjectReference{
+					APIGroup: new(strategyv1alpha1.GroupVersion.Group), Kind: strategyv1alpha1.CNPGStrategyKind, Name: "cozy-default-cnpg",
+				},
+			}},
+		},
+	}
+}
+
+func lockBackupJob(started bool) *backupsv1alpha1.BackupJob {
+	j := &backupsv1alpha1.BackupJob{
+		ObjectMeta: metav1.ObjectMeta{Namespace: lockNS, Name: "nightly-29842560"},
+		Spec:       backupsv1alpha1.BackupJobSpec{BackupClassName: "cozy-default", ApplicationRef: pgRef("pg")},
+	}
+	if started {
+		now := metav1.Now()
+		j.Status.StartedAt = &now
+		j.Status.Phase = backupsv1alpha1.BackupJobPhaseRunning
+	}
+	return j
+}
+
+// TestReconcile_HoldsABackupJobWhileItsApplicationIsRestored is the
+// regression: a Plan-created BackupJob for a Postgres application under an
+// in-place restore reached the CNPG driver, which re-applied the Cluster's
+// barman plugin and put the restored cluster back on the source's WAL
+// prefix. The job must wait, non-terminal, without reaching projection or
+// dispatch; and once the restore is over, it must go ahead.
+func TestReconcile_HoldsABackupJobWhileItsApplicationIsRestored(t *testing.T) {
+	restore := lockRestore("restore-pg", "pg-1", backupsv1alpha1.RestoreJobPhaseRunning, nil, "")
+	c := lockTestClient(t, lockBackupJob(false), lockBackupClass(), lockBackup("pg-1", pgRef("pg")), restore, flatSourceSecret())
+	r := &BackupJobReconciler{Client: c, CredentialsConfig: defaultCfg()}
+	key := types.NamespacedName{Namespace: lockNS, Name: "nightly-29842560"}
+
+	res, err := r.Reconcile(context.Background(), reconcile.Request{NamespacedName: key})
+	if err != nil {
+		t.Fatalf("Reconcile: %v", err)
+	}
+	if res.RequeueAfter != RestoreInProgressRequeue {
+		t.Errorf("RequeueAfter = %v, want %v", res.RequeueAfter, RestoreInProgressRequeue)
+	}
+	got := &backupsv1alpha1.BackupJob{}
+	if err := c.Get(context.Background(), key, got); err != nil {
+		t.Fatal(err)
+	}
+	if got.Status.Phase != backupsv1alpha1.BackupJobPhasePending {
+		t.Errorf("Phase = %q, want Pending", got.Status.Phase)
+	}
+	if got.Status.StartedAt != nil {
+		t.Error("a held BackupJob must not be marked started")
+	}
+	cond := meta.FindStatusCondition(got.Status.Conditions, "Ready")
+	if cond == nil || cond.Reason != ConditionReasonRestoreInProgress {
+		t.Fatalf("Ready condition = %+v, want reason %s", cond, ConditionReasonRestoreInProgress)
+	}
+	secret := &corev1.Secret{}
+	if err := c.Get(context.Background(), types.NamespacedName{Namespace: lockNS, Name: "cozy-backups-creds"}, secret); err == nil {
+		t.Error("a held BackupJob went on to project credentials")
+	}
+
+	// The restore ends: the job is no longer held.
+	fresh := &backupsv1alpha1.RestoreJob{}
+	if err := c.Get(context.Background(), types.NamespacedName{Namespace: lockNS, Name: "restore-pg"}, fresh); err != nil {
+		t.Fatal(err)
+	}
+	fresh.Status.Phase = backupsv1alpha1.RestoreJobPhaseSucceeded
+	if err := c.Status().Update(context.Background(), fresh); err != nil {
+		t.Fatal(err)
+	}
+	if held, err := activeRestoreTargeting(context.Background(), c, lockNS, pgRef("pg")); err != nil || held != "" {
+		t.Errorf("after the restore ended: held by %q (%v), want none", held, err)
+	}
+
+	// The next reconcile starts the job without the hold's condition.
+	_, _ = r.Reconcile(context.Background(), reconcile.Request{NamespacedName: key})
+	released := &backupsv1alpha1.BackupJob{}
+	if err := c.Get(context.Background(), key, released); err != nil {
+		t.Fatal(err)
+	}
+	if cond := meta.FindStatusCondition(released.Status.Conditions, "Ready"); cond != nil && cond.Reason == ConditionReasonRestoreInProgress {
+		t.Errorf("Ready = %+v: a job the restore released still says it is waiting for it", cond)
+	}
+}
+
+// TestReconcile_DoesNotHoldARunningBackupJob: the gate is on starting. A run
+// already moving data is left to its driver, whose own state it would
+// otherwise strand.
+func TestReconcile_DoesNotHoldARunningBackupJob(t *testing.T) {
+	restore := lockRestore("restore-pg", "pg-1", backupsv1alpha1.RestoreJobPhaseRunning, nil, "")
+	// No source Secret: projection fails transiently, which stops the
+	// reconcile before dispatch and shows the gate was passed.
+	c := lockTestClient(t, lockBackupJob(true), lockBackupClass(), lockBackup("pg-1", pgRef("pg")), restore)
+	r := &BackupJobReconciler{Client: c, CredentialsConfig: defaultCfg()}
+	key := types.NamespacedName{Namespace: lockNS, Name: "nightly-29842560"}
+
+	if _, err := r.Reconcile(context.Background(), reconcile.Request{NamespacedName: key}); err != nil {
+		t.Fatalf("Reconcile: %v", err)
+	}
+	got := &backupsv1alpha1.BackupJob{}
+	if err := c.Get(context.Background(), key, got); err != nil {
+		t.Fatal(err)
+	}
+	if cond := meta.FindStatusCondition(got.Status.Conditions, "Ready"); cond != nil && cond.Reason == ConditionReasonRestoreInProgress {
+		t.Error("a BackupJob already started was held")
+	}
+}
+
+// TestReconcile_RetriesAHoldItCouldNotRecord: a hold whose status write fails
+// is returned as an error, so the manager retries it, rather than requeued as
+// though it had been recorded.
+func TestReconcile_RetriesAHoldItCouldNotRecord(t *testing.T) {
+	s := runtime.NewScheme()
+	_ = scheme.AddToScheme(s)
+	_ = backupsv1alpha1.AddToScheme(s)
+	writeFailed := errors.New("apiserver unavailable")
+	c := clientfake.NewClientBuilder().
+		WithScheme(s).
+		WithObjects(lockBackupJob(false), lockBackupClass(), lockBackup("pg-1", pgRef("pg")),
+			lockRestore("restore-pg", "pg-1", backupsv1alpha1.RestoreJobPhaseRunning, nil, ""), flatSourceSecret()).
+		WithStatusSubresource(&backupsv1alpha1.BackupJob{}, &backupsv1alpha1.RestoreJob{}).
+		WithInterceptorFuncs(interceptor.Funcs{
+			SubResourceUpdate: func(ctx context.Context, cl client.Client, sub string, obj client.Object, opts ...client.SubResourceUpdateOption) error {
+				if _, ok := obj.(*backupsv1alpha1.BackupJob); ok {
+					return writeFailed
+				}
+				return cl.SubResource(sub).Update(ctx, obj, opts...)
+			},
+		}).
+		Build()
+	r := &BackupJobReconciler{Client: c, CredentialsConfig: defaultCfg()}
+
+	res, err := r.Reconcile(context.Background(), reconcile.Request{NamespacedName: types.NamespacedName{Namespace: lockNS, Name: "nightly-29842560"}})
+	if !errors.Is(err, writeFailed) {
+		t.Fatalf("Reconcile error = %v, want the failed status write", err)
+	}
+	if res.RequeueAfter != 0 {
+		t.Errorf("RequeueAfter = %v: a failed hold must be retried through the error, not requeued as recorded", res.RequeueAfter)
+	}
+}
+
+// TestReleaseRestoreHold: once the restore has ended, the job starts without
+// the "waiting for RestoreJob" condition, which the drivers would otherwise
+// leave in place for the whole run. Any other Ready condition is not ours to
+// remove.
+func TestReleaseRestoreHold(t *testing.T) {
+	for _, tc := range []struct {
+		name     string
+		reason   string
+		wantKept bool
+	}{
+		{"held by a restore", ConditionReasonRestoreInProgress, false},
+		{"another reason", "CredentialsNotReady", true},
+	} {
+		t.Run(tc.name, func(t *testing.T) {
+			j := lockBackupJob(false)
+			j.Status.Phase = backupsv1alpha1.BackupJobPhasePending
+			meta.SetStatusCondition(&j.Status.Conditions, metav1.Condition{Type: "Ready", Status: metav1.ConditionFalse, Reason: tc.reason, Message: "x"})
+			c := lockTestClient(t, j)
+			r := &BackupJobReconciler{Client: c}
+			live := &backupsv1alpha1.BackupJob{}
+			key := types.NamespacedName{Namespace: lockNS, Name: j.Name}
+			if err := c.Get(context.Background(), key, live); err != nil {
+				t.Fatal(err)
+			}
+			if err := r.releaseRestoreHold(context.Background(), live); err != nil {
+				t.Fatalf("releaseRestoreHold: %v", err)
+			}
+			got := &backupsv1alpha1.BackupJob{}
+			if err := c.Get(context.Background(), key, got); err != nil {
+				t.Fatal(err)
+			}
+			if kept := meta.FindStatusCondition(got.Status.Conditions, "Ready") != nil; kept != tc.wantKept {
+				t.Errorf("Ready condition kept = %v, want %v", kept, tc.wantKept)
+			}
+		})
+	}
+}
diff --git a/internal/backupcontroller/bootstrap_disable_patch_test.go b/internal/backupcontroller/bootstrap_disable_patch_test.go
new file mode 100644
index 0000000000..59e7ae4d36
--- /dev/null
+++ b/internal/backupcontroller/bootstrap_disable_patch_test.go
@@ -0,0 +1,41 @@
+package backupcontroller
+
+import (
+	"bytes"
+	"testing"
+
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+
+	"github.com/cozystack/cozystack/internal/backupcontroller/postgresapp"
+)
+
+// disablePostgresAppBootstrap flips Bootstrap.Enabled from true to false through
+// a client.MergeFrom merge patch. If the field keeps `json:"...,omitempty"`, the
+// false zero value is dropped from the patched object, so the computed merge
+// patch DELETES the key (`{"enabled":null}`) instead of setting it false — the
+// exact trap the sibling Backup.UseSystemBucket field carries a comment against.
+// It only converges today because the chart default for bootstrap.enabled is
+// false; if that ever changes the restore reports Succeeded while recovery stays
+// wedged. Pin that the wire patch sets enabled:false. Re-adding omitempty to the
+// Enabled field turns this red.
+func TestDisableBootstrapMergePatchSetsEnabledFalse(t *testing.T) {
+	app := &postgresapp.Postgres{
+		ObjectMeta: metav1.ObjectMeta{Name: "pg-target", Namespace: "tenant-root"},
+	}
+	app.Spec.Bootstrap.Enabled = true
+
+	patched := app.DeepCopy()
+	patched.Spec.Bootstrap.Enabled = false
+
+	data, err := client.MergeFrom(app).Data(patched)
+	if err != nil {
+		t.Fatalf("build merge patch: %v", err)
+	}
+	if bytes.Contains(data, []byte(`"enabled":null`)) {
+		t.Fatalf("merge patch deletes the enabled key instead of setting false; the server would fall back to a default: %s", data)
+	}
+	if !bytes.Contains(data, []byte(`"enabled":false`)) {
+		t.Fatalf("merge patch must carry enabled:false so the server clears bootstrap; got: %s", data)
+	}
+}
diff --git a/internal/backupcontroller/cnpgstrategy_controller.go b/internal/backupcontroller/cnpgstrategy_controller.go
index f4e3236fe1..99e6b03f68 100644
--- a/internal/backupcontroller/cnpgstrategy_controller.go
+++ b/internal/backupcontroller/cnpgstrategy_controller.go
@@ -3,16 +3,25 @@ package backupcontroller
 
 import (
 	"context"
+	"crypto/sha256"
+	"encoding/hex"
 	"encoding/json"
 	"fmt"
+	"io"
+	"slices"
+	"sort"
+	"strconv"
+	"strings"
 	"time"
 
 	corev1 "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	apimeta "k8s.io/apimachinery/pkg/api/meta"
+	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/types"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
@@ -32,10 +41,16 @@ const (
 	cnpgFieldManager = "cozystack-cnpg-backup-driver"
 
 	cnpgClusterLabel        = "cnpg.io/cluster"
-	cnpgBackupMethodBarman  = "barmanObjectStore"
 	cnpgBackupPhaseComplete = "completed"
 	cnpgBackupPhaseFailed   = "failed"
 
+	// barmanObjectNameParam / barmanServerNameParam are the barman-cloud plugin
+	// parameter keys on a Cluster's spec.plugins entry. barmanObjectName points
+	// at the ObjectStore CR; serverName is the per-server folder under
+	// destinationPath (the plugin forbids serverName inside the ObjectStore).
+	barmanObjectNameParam = "barmanObjectName"
+	barmanServerNameParam = "serverName"
+
 	postgresAppKind   = "Postgres"
 	postgresAppPrefix = "postgres-"
 
@@ -52,6 +67,11 @@ const (
 	cnpgEndpointURLKey     = "cnpg.io/endpoint-url"
 	cnpgClusterNameKey     = "cnpg.io/cluster-name"
 	cnpgS3SecretRefKey     = "cnpg.io/s3-secret-ref"
+	cnpgMajorVersionKey    = "cnpg.io/major-version"
+
+	// Annotation the postgres chart renders on the Cluster from
+	// bootstrap.newServerName.
+	cnpgRestoredServerNameAnnotation = "postgres.cozystack.io/restored-server-name"
 
 	// Polling cadence for the CNPG backup/restore lifecycle. Mirrors the
 	// Velero strategy's defaults so behaviour is uniform across drivers.
@@ -69,18 +89,49 @@ const (
 	// with "WAL not found" and the source data is gone with the PVC.
 	restoreCondWALArchiveReady = "WALArchiveReady"
 
+	// Condition Type recorded on a RestoreJob when the chart-rendered
+	// recovery Cluster keeps failing to converge - i.e. its bootstrap-
+	// recovery pods exit non-zero and CNPG recreates them in a loop. Set to
+	// False with reason RecoveryTargetUnreachable when a recoveryTime is in
+	// play (the usual cause: a point-in-time target past the latest archived
+	// WAL) or RecoveryFailed otherwise. Lets a tenant see *why* the restore
+	// is failing before the full restore deadline elapses.
+	restoreCondRecoveryConverged = "RecoveryConverged"
+
+	// True while clearing spec.bootstrap.enabled keeps failing transiently, before
+	// the grace window is exhausted. Without it the RestoreJob sits non-terminal
+	// for up to the whole window with nothing on .status explaining the wait.
+	restoreCondBootstrapDisablePending = "BootstrapDisablePending"
+
 	// Default deadline on the time a RestoreJob can spend waiting for the
 	// target Cluster to reach a healthy state. Tenants override this via
 	// RestoreJob.spec.options.restoreTimeoutSeconds when the source DB is
 	// large enough that 30 minutes isn't enough.
 	cnpgDefaultRestoreDeadline = 30 * time.Minute
 
+	// Fixed grace window the post-convergence bootstrap-disable step keeps
+	// requeueing over a transient error before it terminates the restore Failed.
+	// It is deliberately NOT tied to restoreTimeoutSeconds: that knob bounds the
+	// *recovery* wait (a tenant sets it short to fail fast on a stuck PITR
+	// target), whereas this window absorbs a transient control-plane blip between
+	// convergence and clearing bootstrap.enabled - a blip whose duration has
+	// nothing to do with how long recovery is allowed to take or how big the
+	// database is. A fixed value rides out those blips without letting a short
+	// timeout shrink it or a large one inflate it. It is sized at 30m, near the old
+	// max(restoreDeadline, floor) it replaced, because the disable Patch travels
+	// through the aggregated cozystack-api apiserver and the expensive direction
+	// here is a FALSE Failed (a resubmit's purge-guard then deletes the healthy
+	// restored Cluster + PVCs, per the branch below) - and cozystack-api can itself
+	// be unavailable for several minutes during a platform upgrade, so a 5m window
+	// would fail restores that a slightly longer one rides out.
+	cnpgBootstrapDisableGrace = 30 * time.Minute
+
 	// Wall-clock cap on how long the WALArchiveReady gate can stay False
 	// before the RestoreJob is marked Failed. The gate fires before the
 	// destructive purge to confirm the backup's endWal is in object
-	// storage; if the source's lastArchivedWAL never advances, archive_-
-	// command on the source is broken (no barmanObjectStore on the
-	// Cluster, S3 outage, bad credentials, etc.) - waiting longer won't
+	// storage; if the source's lastArchivedWAL never advances, WAL
+	// archiving on the source is broken (no barman-cloud plugin wired on
+	// the Cluster, S3 outage, bad credentials, etc.) - waiting longer won't
 	// fix it. This is independent of cnpgDefaultRestoreDeadline because
 	// archive lag and recovery time scale with completely different
 	// inputs: the gate clears in seconds for any healthy cluster
@@ -91,6 +142,39 @@ const (
 	// a problem that won't self-resolve.
 	cnpgWALArchiveDeadline = 3 * time.Minute
 
+	// Both constants below couple to CNPG/PostgreSQL internals. Verified
+	// against CNPG 1.28.1 + barman-cloud plugin (postgresql:18.1) on a test
+	// cluster. The negative e2e in examples/backups/postgres/run-all.sh
+	// (step 46: a recoveryTime past the archive must fail with reason
+	// RecoveryTargetUnreachable) is what catches a drift in either string on
+	// a future CNPG/PostgreSQL bump - if it regresses, this fail-fast silently
+	// degrades back to hanging until the restore deadline.
+
+	// Container name of a CNPG bootstrap-recovery pod (<cluster>-<n>-full-recovery).
+	// The driver reads this container's log to classify a stuck recovery.
+	cnpgRecoveryContainerName = "full-recovery"
+
+	// cnpgRecoveryTargetUnreachableLog is the PostgreSQL FATAL a recovery
+	// instance logs when it replays every available WAL without reaching the
+	// configured recovery target and then gives up - the definitive signal
+	// that a point-in-time recoveryTime is past the latest archived WAL.
+	// Matching this exact string (rather than counting failed pods) is what
+	// keeps the fail-fast from misfiring on transient recovery-pod crashes
+	// (node blips, brief API-server unreachability) that CNPG recovers from:
+	// those never emit this message, and the recovery goes on to converge.
+	cnpgRecoveryTargetUnreachableLog = "recovery ended before configured recovery target was reached"
+
+	// Number of tail lines of the recovery container log the driver scans for
+	// the unreachable-target signature. The message is emitted once near the
+	// end of the replay, so a small tail is enough and keeps the read cheap.
+	cnpgRecoveryLogTailLines = 200
+
+	// Max bootstrap-recovery pods whose log the driver reads when classifying a
+	// deadline-expired restore. Bounds the log reads even if many failed
+	// attempts have piled up; the newest few are enough since every attempt
+	// against an unreachable target reproduces the same FATAL.
+	cnpgRecoveryMaxInspectPods = 5
+
 	// Cap on the wall-clock time a BackupJob can spend observing a
 	// cnpg.io/Backup stuck in phase=failed before the driver gives up and
 	// marks the BackupJob Failed. CNPG can transition out of "failed" on
@@ -101,6 +185,20 @@ const (
 	cnpgDefaultBackupDeadline = 30 * time.Minute
 
 	cnpgClusterHealthyPhase = "Cluster in healthy state"
+
+	// Condition Type recorded on a BackupJob that has to attach the
+	// barman-cloud plugin to a Cluster carrying none: a fresh platform-flow
+	// app, or one an in-place restore re-rendered. Attaching it changes the
+	// instance pod spec (the plugin injects its sidecar), so CNPG rolls every
+	// instance, and a cnpg.io/Backup created meanwhile fails with "requested
+	// plugin is not available" or "instance manager was restarted during
+	// backup" and never recovers. False holds the Backup back; its
+	// LastTransitionTime, written before the plugin is attached, is what the
+	// instance pods must postdate (see cnpgPluginRolloutPending).
+	backupCondPluginRolledOut = "PluginRolledOut"
+
+	cnpgPodRoleLabel    = "cnpg.io/podRole"
+	cnpgPodRoleInstance = "instance"
 )
 
 // cnpgClusterNameForApp returns the cnpg.io Cluster name for a Postgres
@@ -110,6 +208,21 @@ func cnpgClusterNameForApp(appName string) string {
 	return postgresAppPrefix + appName
 }
 
+// defaultCNPGServerName is the WAL-archive serverName of a Cluster whose
+// strategy names none. It is keyed by the application UID because the
+// destinationPath is keyed by name only: a Postgres deleted and recreated under
+// the same name would otherwise archive into its predecessor's prefix, and
+// barman-cloud's empty-archive check cannot catch it, since CNPG removes
+// .check-empty-wal-archive once ContinuousArchiving turns True, which happens
+// on the first no-op archive_command, long before a BackupJob attaches the
+// plugin.
+func defaultCNPGServerName(clusterName string, appUID types.UID) string {
+	if appUID == "" {
+		return clusterName
+	}
+	return clusterName + "-" + string(appUID)
+}
+
 // validateCNPGApplicationRef rejects ApplicationRefs that name a Kind/APIGroup
 // the CNPG driver does not own. The driver assumes apps.cozystack.io/Postgres;
 // without this gate a ref like other.example.com/Postgres would be accepted
@@ -200,10 +313,18 @@ func (r *BackupJobReconciler) reconcileCNPG(ctx context.Context, j *backupsv1alp
 	clusterName := cnpgClusterNameForApp(j.Spec.ApplicationRef.Name)
 	serverName := rendered.ServerName
 	if serverName == "" {
-		serverName = clusterName
+		serverName = defaultCNPGServerName(clusterName, app.UID)
+	}
+
+	existingBackup, err := r.findCNPGBackupForJob(ctx, j)
+	if err != nil {
+		return ctrl.Result{}, err
 	}
+	rollout := apimeta.FindStatusCondition(j.Status.Conditions, backupCondPluginRolledOut)
+	awaitingRollout := existingBackup == nil && rollout != nil && rollout.Status == metav1.ConditionFalse
 
-	if err := r.applyClusterBarmanObjectStore(ctx, j.Namespace, clusterName, rendered, serverName); err != nil {
+	attachment, err := r.applyClusterPluginBackup(ctx, j.Namespace, clusterName, rendered, serverName, existingBackup != nil || awaitingRollout)
+	if err != nil {
 		if apierrors.IsNotFound(err) {
 			// HelmRelease has not yet rendered the Cluster (fresh app, or
 			// the operator restart wiped its informer cache). Surface the
@@ -221,7 +342,75 @@ func (r *BackupJobReconciler) reconcileCNPG(ctx context.Context, j *backupsv1alp
 			}
 			return ctrl.Result{RequeueAfter: cnpgPollInterval}, nil
 		}
-		return r.markBackupJobFailed(ctx, j, fmt.Sprintf("failed to apply barmanObjectStore to Cluster: %v", err))
+		return r.markBackupJobFailed(ctx, j, fmt.Sprintf("failed to attach barman-cloud plugin to Cluster: %v", err))
+	}
+	if attachment.serverName != serverName {
+		logger.Info("preserving the live Cluster's barman serverName over the strategy template's",
+			"cluster", clusterName, "live", attachment.serverName, "strategy", serverName)
+		serverName = attachment.serverName
+	}
+
+	rolledOut := false
+	if existingBackup == nil && (attachment.missing || awaitingRollout) {
+		if !awaitingRollout {
+			// Latch before attaching: if this write is lost, the next pass
+			// still finds the plugin missing instead of a Cluster that looks
+			// ready to back up while CNPG rolls it.
+			message := fmt.Sprintf("attaching the barman-cloud plugin to cnpg.io/Cluster %s/%s, which rolls its instances", j.Namespace, clusterName)
+			apimeta.SetStatusCondition(&j.Status.Conditions, metav1.Condition{
+				Type:    backupCondPluginRolledOut,
+				Status:  metav1.ConditionFalse,
+				Reason:  "WaitingForPluginRollout",
+				Message: message,
+			})
+			apimeta.SetStatusCondition(&j.Status.Conditions, metav1.Condition{
+				Type:    "Ready",
+				Status:  metav1.ConditionFalse,
+				Reason:  "WaitingForPluginRollout",
+				Message: message,
+			})
+			if err := r.Status().Update(ctx, j); err != nil {
+				return ctrl.Result{}, err
+			}
+			return ctrl.Result{RequeueAfter: cnpgPollInterval}, nil
+		}
+		pending, err := r.cnpgPluginRolloutPending(ctx, j.Namespace, clusterName, attachment, rollout.LastTransitionTime)
+		if err != nil {
+			return ctrl.Result{}, err
+		}
+		if pending != "" {
+			if cnpgBackupDeadlineExceeded(j.Status.StartedAt) {
+				return r.markBackupJobFailed(ctx, j, fmt.Sprintf(
+					"barman-cloud plugin rollout did not finish within %s: %s", cnpgDefaultBackupDeadline, pending))
+			}
+			if apimeta.SetStatusCondition(&j.Status.Conditions, metav1.Condition{
+				Type:    "Ready",
+				Status:  metav1.ConditionFalse,
+				Reason:  "WaitingForPluginRollout",
+				Message: pending,
+			}) {
+				if err := r.Status().Update(ctx, j); err != nil {
+					return ctrl.Result{}, err
+				}
+			}
+			return ctrl.Result{RequeueAfter: cnpgPollInterval}, nil
+		}
+		apimeta.SetStatusCondition(&j.Status.Conditions, metav1.Condition{
+			Type:    backupCondPluginRolledOut,
+			Status:  metav1.ConditionTrue,
+			Reason:  "PluginRolledOut",
+			Message: fmt.Sprintf("every instance of cnpg.io/Cluster %s/%s restarted with the barman-cloud plugin", j.Namespace, clusterName),
+		})
+		apimeta.RemoveStatusCondition(&j.Status.Conditions, "Ready")
+		rolledOut = true
+	}
+
+	// The chart refuses a flavor change on a live Cluster, but the app keeps
+	// the refused value: the Backup records the image family the data was
+	// written by, which is what a restore has to match.
+	if specFlavor := cnpgFlavor(app.Spec.Flavor); specFlavor != attachment.flavor {
+		logger.Info("recording the live Cluster's image flavor over the application's",
+			"cluster", clusterName, "live", attachment.flavor, "application", specFlavor)
 	}
 
 	cnpgBackup, err := r.ensureCNPGBackup(ctx, j, clusterName)
@@ -229,7 +418,7 @@ func (r *BackupJobReconciler) reconcileCNPG(ctx context.Context, j *backupsv1alp
 		return r.markBackupJobFailed(ctx, j, fmt.Sprintf("failed to ensure cnpg.io/Backup: %v", err))
 	}
 
-	if j.Status.Phase != backupsv1alpha1.BackupJobPhaseRunning {
+	if j.Status.Phase != backupsv1alpha1.BackupJobPhaseRunning || rolledOut {
 		j.Status.Phase = backupsv1alpha1.BackupJobPhaseRunning
 		if err := r.Status().Update(ctx, j); err != nil {
 			return ctrl.Result{}, err
@@ -244,7 +433,7 @@ func (r *BackupJobReconciler) reconcileCNPG(ctx context.Context, j *backupsv1alp
 		if j.Status.BackupRef != nil {
 			return ctrl.Result{}, nil
 		}
-		artifact, err := r.createCNPGBackupArtifact(ctx, j, resolved, cnpgBackup, clusterName, serverName, rendered, app)
+		artifact, err := r.createCNPGBackupArtifact(ctx, j, resolved, cnpgBackup, clusterName, serverName, attachment.flavor, rendered, app)
 		if err != nil {
 			return r.markBackupJobFailed(ctx, j, fmt.Sprintf("failed to create Backup artifact: %v", err))
 		}
@@ -314,39 +503,247 @@ func cnpgBackupDeadlineExceeded(startedAt *metav1.Time) bool {
 // destructive step:
 //  1. The RestoreJob already records that we've purged
 //     (restoreCondTargetPurged=True). Normal idempotent path.
-//  2. The live Cluster already has spec.bootstrap.recovery populated. This
-//     only happens when an earlier reconcile purged successfully but the
+//  2. The live Cluster is a freshly-recovered one that THIS restore's own
+//     purge + chart re-render produced (see cnpgClusterFreshlyRecovered).
+//     This only happens when an earlier reconcile purged successfully but the
 //     status-condition write failed; the chart has since re-rendered the
 //     Cluster with our restore-shaped values. Re-purging here would delete
 //     the Cluster CNPG is actively bootstrapping from S3.
-func cnpgPurgeNeeded(purgedCondition, liveClusterHasRecovery bool) bool {
+//
+// A live Cluster that carries spec.bootstrap.recovery but predates this
+// RestoreJob is NOT a skip signal: it is leftover from an earlier, already-
+// completed restore and still holds the old data. Skipping the purge on it
+// (the previous behaviour, which keyed only on "has recovery bootstrap") made
+// a repeat in-place restore a silent no-op - the job reported Succeeded while
+// the PVC, disk, and data were never touched.
+func cnpgPurgeNeeded(purgedCondition, liveClusterFreshlyRecovered bool) bool {
 	if purgedCondition {
 		return false
 	}
-	return !liveClusterHasRecovery
+	return !liveClusterFreshlyRecovered
+}
+
+// cnpgClusterFreshlyRecovered reports whether a live cnpg.io Cluster that
+// carries spec.bootstrap.recovery was produced by THIS RestoreJob's own purge
+// + chart re-render rather than rendered for some other restore.
+//
+// Only the former is safe to skip re-purging. Any other recovery Cluster holds
+// another restore's data and must be purged for this restore to re-bootstrap
+// from its backup. That includes a Cluster a concurrent RestoreJob produced,
+// and one the chart re-renders from an earlier restore's values after being
+// deleted while this restore waits for the WAL archive: both are created after
+// this job's StartedAt, so a timestamp alone cannot tell them apart.
+//
+// The chart annotates the Cluster with bootstrap.newServerName, which the
+// restore patch sets to restoredServerName(cluster, RestoreJob UID). The value
+// lives on the object the chart renders, not in RestoreJob status, so it
+// survives the failed status write the skip exists for, and it names the
+// restore that rendered the Cluster. When the annotation is present, the
+// Cluster is fresh only if it carries wantMark.
+//
+// A Cluster without the annotation was rendered either by a chart that
+// predates it or from values with no bootstrap.newServerName (a manually
+// configured recovery). It is fresh only if appMark, the application's current
+// bootstrap.newServerName, is wantMark - this restore has patched the values -
+// and it was created strictly after StartedAt, which separates a Cluster from
+// an earlier completed restore from this restore's own re-render.
+//
+// Returns false when freshness cannot be determined (no recovery bootstrap, or
+// a missing timestamp on the fallback path): the caller then purges, which is
+// the safe default.
+func cnpgClusterFreshlyRecovered(state recoveryClusterState, wantMark, appMark string, restoreStartedAt *metav1.Time) bool {
+	if !state.hasRecovery {
+		return false
+	}
+	if state.restoreMark != "" {
+		return state.restoreMark == wantMark
+	}
+	if appMark != wantMark || state.createdAt == nil || restoreStartedAt == nil {
+		return false
+	}
+	return state.createdAt.After(restoreStartedAt.Time)
+}
+
+// cnpgClusterGVR addresses Clusters on the dynamic client, for reads that must
+// bypass the manager's cache.
+var cnpgClusterGVR = schema.GroupVersionResource{
+	Group:    cnpgtypes.GroupName,
+	Version:  cnpgtypes.Version,
+	Resource: "clusters",
 }
 
-// applyClusterBarmanObjectStore SSA-patches the live CNPG Cluster's
-// spec.backup from the templated strategy. The driver owns the fields via
-// its own field manager so the chart - which only emits spec.backup when
-// backup.enabled=true - does not contend.
+// applyClusterPluginBackup wires the templated strategy onto the live CNPG
+// Cluster through the barman-cloud plugin: it SSA-applies an ObjectStore CR
+// carrying the S3/barman configuration and SSA-patches the Cluster's
+// spec.plugins to reference it. This replaces the deprecated native
+// spec.backup.barmanObjectStore path (removed from the `standard` image
+// variant in CNPG 1.29). The driver owns both objects via its own field
+// manager so the chart - which only emits them for the non-platform flow -
+// does not contend.
 //
 // Returns an apierrors.IsNotFound error when the Cluster has not yet been
-// rendered by the HelmRelease. The SSA path on its own would fail with a
+// rendered by the HelmRelease. The Cluster SSA on its own would fail with a
 // hard validation error (CNPG's Cluster CRD has many required fields the
 // driver does not set), so we surface the precondition explicitly and let
 // the caller treat it as a retryable wait.
-func (r *BackupJobReconciler) applyClusterBarmanObjectStore(ctx context.Context, namespace, clusterName string, t *strategyv1alpha1.CNPGTemplate, serverName string) error {
+// applyClusterPluginBackup returns the serverName the Cluster effectively
+// archives under. A live Cluster that already has the barman-cloud plugin
+// attached (chart-rendered, or a previous BackupJob) keeps its current
+// serverName even when the strategy template names a different one: the
+// serverName is the S3 path prefix of the WAL archive, and flipping it
+// mid-stream splits the archive across two prefixes — WALs around the flip
+// land under the old prefix while the base backup indexes under the new one,
+// and the eventual restore fails with "WAL not found".
+//
+// It also returns the flavor of the image the live Cluster runs, read from
+// the same object.
+//
+// With attach unset, a Cluster that has no barman-cloud plugin yet is left
+// untouched and only reported missing, so the caller can record that it is
+// about to roll the Cluster before it does.
+func (r *BackupJobReconciler) applyClusterPluginBackup(ctx context.Context, namespace, clusterName string, t *strategyv1alpha1.CNPGTemplate, serverName string, attach bool) (cnpgPluginAttachment, error) {
+	// Live read: the cached Cluster can predate a restore re-render, and the
+	// serverName, the flavor and the UID below must come from the current
+	// object.
 	existing := &cnpgtypes.Cluster{}
-	if err := r.Get(ctx, types.NamespacedName{Namespace: namespace, Name: clusterName}, existing); err != nil {
-		return err
+	live, err := r.Resource(cnpgClusterGVR).Namespace(namespace).Get(ctx, clusterName, metav1.GetOptions{})
+	if err != nil {
+		return cnpgPluginAttachment{}, err
+	}
+	if err := runtime.DefaultUnstructuredConverter.FromUnstructured(live.Object, existing); err != nil {
+		return cnpgPluginAttachment{}, fmt.Errorf("decode Cluster %s/%s: %w", namespace, clusterName, err)
+	}
+	attachment := cnpgPluginAttachment{
+		serverName:    serverName,
+		flavor:        cnpgImageFlavor(existing.Spec.ImageName),
+		clusterStatus: existing.Status,
+	}
+	if live := currentBarmanServerName(existing); live != "" {
+		attachment.serverName = live
+	} else {
+		attachment.missing = true
+		if !attach {
+			return attachment, nil
+		}
+	}
+	serverName = attachment.serverName
+
+	// The ObjectStore is named after the Cluster (distinct kind, same
+	// namespace). serverName is deliberately left off the ObjectStore
+	// configuration - the plugin forbids it there and takes it from the
+	// Cluster plugin parameter instead - so backups keep landing under the
+	// same s3://.../<serverName>/ path the native barmanObjectStore used.
+	objStoreName := clusterName
+	objStore := newObjectStorePatch(namespace, objStoreName)
+	// Own the ObjectStore by the live Cluster so Kubernetes garbage-collects it
+	// when the Cluster is deleted (tenant app teardown, or the RestoreJob purge).
+	// The platform flow does not chart-render this ObjectStore, so without an
+	// owner reference it would otherwise be orphaned in the tenant namespace.
+	// Owner and owned are in the same namespace, as GC requires.
+	controller := true
+	objStore.OwnerReferences = []metav1.OwnerReference{{
+		APIVersion: cnpgtypes.GroupVersion.String(),
+		Kind:       "Cluster",
+		Name:       existing.Name,
+		UID:        existing.UID,
+		Controller: &controller,
+	}}
+	objStore.Spec = cnpgtypes.ObjectStoreSpec{
+		Configuration:                *buildBarmanObjectStore(t.BarmanObjectStore, ""),
+		RetentionPolicy:              t.BarmanObjectStore.RetentionPolicy,
+		InstanceSidecarConfiguration: barmanSidecarConfiguration(),
+	}
+	if err := r.Patch(ctx, objStore, client.Apply, client.FieldOwner(cnpgFieldManager), client.ForceOwnership); err != nil {
+		return cnpgPluginAttachment{}, fmt.Errorf("apply ObjectStore %s/%s: %w", namespace, objStoreName, err)
 	}
+
 	patch := newCNPGClusterPatch(namespace, clusterName)
-	patch.Spec.Backup = &cnpgtypes.BackupConfiguration{
-		BarmanObjectStore: buildBarmanObjectStore(t.BarmanObjectStore, serverName),
-		RetentionPolicy:   t.BarmanObjectStore.RetentionPolicy,
+	patch.Spec.Plugins = []cnpgtypes.PluginConfiguration{buildBarmanPlugin(objStoreName, serverName)}
+	if err := r.Patch(ctx, patch, client.Apply, client.FieldOwner(cnpgFieldManager), client.ForceOwnership); err != nil {
+		return cnpgPluginAttachment{}, err
+	}
+	return attachment, nil
+}
+
+// cnpgPluginAttachment is what applyClusterPluginBackup read off the live
+// Cluster before applying the plugin.
+type cnpgPluginAttachment struct {
+	// serverName is the serverName the Cluster effectively archives under.
+	serverName string
+	// flavor is the image flavor the live Cluster runs.
+	flavor string
+	// missing reports a Cluster that carried no barman-cloud plugin.
+	missing       bool
+	clusterStatus cnpgtypes.ClusterStatus
+}
+
+// cnpgPluginRolloutPending returns why the rollout that attaching the
+// barman-cloud plugin started is not over yet, or "" once it is: CNPG reports
+// the Cluster healthy and every instance pod was created after attachedAt,
+// and is Ready.
+//
+// The phase alone cannot tell: the Cluster status carries no
+// observedGeneration and its Ready condition is derived from the phase, so
+// until CNPG reconciles the new spec the phase still reads healthy from
+// before. Nor can status.pluginStatus, which also lists plugins referenced
+// only from externalClusters, as on a Cluster an in-place restore
+// re-rendered. A pod spec change cannot be applied in place, so the instance
+// pods are recreated, and pods newer than the attach are the ones that run
+// the plugin sidecar.
+func (r *BackupJobReconciler) cnpgPluginRolloutPending(ctx context.Context, namespace, clusterName string, attachment cnpgPluginAttachment, attachedAt metav1.Time) (string, error) {
+	if phase := attachment.clusterStatus.Phase; phase != cnpgClusterHealthyPhase {
+		pending := fmt.Sprintf("cnpg.io/Cluster %s/%s is in phase %q", namespace, clusterName, phase)
+		if reason := attachment.clusterStatus.PhaseReason; reason != "" {
+			pending += ": " + reason
+		}
+		return pending, nil
+	}
+	pods := &corev1.PodList{}
+	if err := r.List(ctx, pods, client.InNamespace(namespace), client.MatchingLabels{
+		cnpgClusterLabel: clusterName,
+		cnpgPodRoleLabel: cnpgPodRoleInstance,
+	}); err != nil {
+		return "", err
+	}
+	if len(pods.Items) == 0 {
+		return fmt.Sprintf("cnpg.io/Cluster %s/%s has no instance pod", namespace, clusterName), nil
+	}
+	for i := range pods.Items {
+		pod := &pods.Items[i]
+		if !pod.CreationTimestamp.After(attachedAt.Time) {
+			return fmt.Sprintf("instance pod %s/%s predates the barman-cloud plugin", namespace, pod.Name), nil
+		}
+		if pod.DeletionTimestamp != nil || !podReady(pod) {
+			return fmt.Sprintf("instance pod %s/%s is not ready", namespace, pod.Name), nil
+		}
+	}
+	return "", nil
+}
+
+func podReady(pod *corev1.Pod) bool {
+	for _, c := range pod.Status.Conditions {
+		if c.Type == corev1.PodReady {
+			return c.Status == corev1.ConditionTrue
+		}
+	}
+	return false
+}
+
+// currentBarmanServerName returns the serverName the Cluster's barman-cloud
+// plugin currently archives under: the explicit plugin parameter when set, the
+// Cluster's own name when the plugin is attached without one (the plugin's
+// documented default), and "" when the plugin is not attached at all.
+func currentBarmanServerName(c *cnpgtypes.Cluster) string {
+	for _, p := range c.Spec.Plugins {
+		if p.Name != cnpgtypes.PluginName {
+			continue
+		}
+		if name := p.Parameters[barmanServerNameParam]; name != "" {
+			return name
+		}
+		return c.Name
 	}
-	return r.Patch(ctx, patch, client.Apply, client.FieldOwner(cnpgFieldManager), client.ForceOwnership)
+	return ""
 }
 
 // ensureCNPGBackup creates a one-shot postgresql.cnpg.io/Backup CR labelled
@@ -372,8 +769,9 @@ func (r *BackupJobReconciler) ensureCNPGBackup(ctx context.Context, j *backupsv1
 			},
 		},
 		Spec: cnpgtypes.BackupSpec{
-			Method:  cnpgBackupMethodBarman,
-			Cluster: cnpgtypes.ClusterReference{Name: clusterName},
+			Method:              cnpgtypes.BackupMethodPlugin,
+			Cluster:             cnpgtypes.ClusterReference{Name: clusterName},
+			PluginConfiguration: &cnpgtypes.BackupPluginConfiguration{Name: cnpgtypes.PluginName},
 		},
 	}
 
@@ -413,7 +811,7 @@ func (r *BackupJobReconciler) createCNPGBackupArtifact(
 	j *backupsv1alpha1.BackupJob,
 	resolved *ResolvedBackupConfig,
 	cnpgBackup *cnpgtypes.Backup,
-	clusterName, serverName string,
+	clusterName, serverName, flavor string,
 	rendered *strategyv1alpha1.CNPGTemplate,
 	sourceApp *postgresapp.Postgres,
 ) (*backupsv1alpha1.Backup, error) {
@@ -432,8 +830,13 @@ func (r *BackupJobReconciler) createCNPGBackupArtifact(
 	if rendered.BarmanObjectStore.S3Credentials != nil {
 		driverMD[cnpgS3SecretRefKey] = rendered.BarmanObjectStore.S3Credentials.SecretRef.Name
 	}
+	// Copied rather than read back at restore time: barman retention deletes
+	// the cnpg.io/Backup while the artifact can still be restored from.
+	if cnpgBackup.Status.MajorVersion > 0 {
+		driverMD[cnpgMajorVersionKey] = strconv.Itoa(cnpgBackup.Status.MajorVersion)
+	}
 
-	underlyingResources, err := marshalCNPGBackupSnapshot(sourceApp, resolved.Parameters)
+	underlyingResources, err := marshalCNPGBackupSnapshot(sourceApp, resolved.Parameters, flavor)
 	if err != nil {
 		return nil, fmt.Errorf("encode source snapshot for Backup.status.underlyingResources: %w", err)
 	}
@@ -579,13 +982,24 @@ func (r *RestoreJobReconciler) reconcileCNPGRestore(ctx context.Context, restore
 	// time. Without this, restore-time rendering with parameters=nil
 	// silently produced `<no value>` and patched the target Postgres app
 	// with broken Secret references.
-	sourceDatabases, sourceUsers, sourceParameters, err := unmarshalCNPGBackupSnapshot(backup)
+	snapshot, err := unmarshalCNPGBackupSnapshot(backup)
 	if err != nil {
 		return r.markRestoreJobFailed(ctx, restoreJob, fmt.Sprintf(
 			"Backup %s/%s carries no usable source-spec snapshot in status.underlyingResources: %v "+
 				"(re-take the backup with a controller version that persists source spec)",
 			backup.Namespace, backup.Name, err))
 	}
+	sourceDatabases, sourceUsers, sourceParameters := snapshot.Databases, snapshot.Users, snapshot.Parameters
+
+	// Checked before the destructive purge below, which would otherwise wipe
+	// the target only for the recovery to come up on the wrong image family.
+	if src, dst := cnpgFlavor(snapshot.Flavor), cnpgFlavor(targetApp.Spec.Flavor); src != dst {
+		return r.markRestoreJobFailed(ctx, restoreJob, fmt.Sprintf(
+			"Backup %s/%s was taken from a %s cluster and cannot be restored into %s/%s, which runs the %s flavor: "+
+				"a physical restore must keep the image family. Restore into a Postgres app with flavor %s, "+
+				"or move the data with a logical dump (pg_dump / pg_restore)",
+			backup.Namespace, backup.Name, src, target.Namespace, target.AppName, dst, src))
+	}
 
 	rendered, err := renderCNPGTemplate(strategy.Spec.Template, targetApp, sourceParameters)
 	if err != nil {
@@ -614,12 +1028,40 @@ func (r *RestoreJobReconciler) reconcileCNPGRestore(ctx context.Context, restore
 	// check the live Cluster for bootstrap.recovery: if present, the chart
 	// has already re-rendered after a previous purge, and we must NOT delete
 	// it again.
-	hasRecovery, err := r.clusterHasRecoveryBootstrap(ctx, target.Namespace, clusterName)
+	clusterState, err := r.recoveryBootstrapClusterState(ctx, target.Namespace, clusterName)
 	if err != nil {
 		return ctrl.Result{}, err
 	}
 	purgedCondition := apimeta.IsStatusConditionTrue(restoreJob.Status.Conditions, restoreCondTargetPurged)
-	if cnpgPurgeNeeded(purgedCondition, hasRecovery) {
+	// Only skip the destructive purge for a recovery Cluster THIS restore just
+	// produced. A recovery Cluster rendered for any other restore still holds
+	// that restore's data, so it must be purged - otherwise a repeat in-place
+	// restore silently no-ops.
+	freshlyRecovered := cnpgClusterFreshlyRecovered(clusterState, restoredServerName(clusterName, restoreJob.UID), targetApp.Spec.Bootstrap.NewServerName, restoreJob.Status.StartedAt)
+	if cnpgPurgeNeeded(purgedCondition, freshlyRecovered) {
+		// A physical restore only opens on the major version that wrote the
+		// data files. Across majors the recovery pods loop on "database files
+		// are incompatible with server" until the deadline, with the target
+		// already purged. spec.version is what the chart renders the
+		// recovered Cluster from, so it is compared rather than the live
+		// Cluster's image. An unknown side keeps the restore going: refusing
+		// would break every backup taken before the version was recorded.
+		backupMajor, err := r.cnpgBackupMajorVersion(ctx, backup)
+		if err != nil {
+			return ctrl.Result{}, err
+		}
+		targetMajor := postgresAppMajorVersion(targetApp.Spec.Version)
+		switch {
+		case backupMajor == 0 || targetMajor == 0:
+			logger.Info("PostgreSQL major version unknown; restoring without the version check",
+				"backup", backup.Name, "backupMajorVersion", backupMajor, "targetVersion", targetApp.Spec.Version)
+		case backupMajor != targetMajor:
+			return r.markRestoreJobFailedReason(ctx, restoreJob, "MajorVersionMismatch", fmt.Sprintf(
+				"Backup %s/%s was taken on PostgreSQL %d and cannot be restored into %s/%s, which runs PostgreSQL %d (spec.version=%q): "+
+					"a physical restore needs the same major version; the target was left untouched",
+				backup.Namespace, backup.Name, backupMajor, target.Namespace, target.AppName, targetMajor, targetApp.Spec.Version))
+		}
+
 		// Gate the destructive flow on the source cluster having shipped
 		// the backup's required WALs to object storage. archive_command runs
 		// on the source primary; once we delete the Cluster + PVCs, any
@@ -633,7 +1075,7 @@ func (r *RestoreJobReconciler) reconcileCNPGRestore(ctx context.Context, restore
 		// bootstrap.initdb -> bootstrap.recovery swap with "Only one
 		// bootstrap". helm-controller then drops into an UpgradeFailed /
 		// RollbackFailed loop whose rollbacks strip the SSA-applied
-		// spec.backup.barmanObjectStore - which stops archive_command
+		// spec.plugins (and its ObjectStore) - which stops WAL archiving
 		// and pins lastArchivedWAL at "" forever. By gating before the
 		// patch, the HelmRelease stays untouched while we wait, the
 		// source primary keeps archiving, and the chart's failure-loop
@@ -665,7 +1107,7 @@ func (r *RestoreJobReconciler) reconcileCNPGRestore(ctx context.Context, restore
 				time.Since(cond.LastTransitionTime.Time) > walDeadline {
 				return r.markRestoreJobFailed(ctx, restoreJob, fmt.Sprintf(
 					"WAL archive did not catch up to the backup endWal within %s: %s "+
-						"(check that the source cnpg.io/Cluster has spec.backup.barmanObjectStore set and archive_command is shipping WALs to object storage; override via spec.options.walArchiveTimeoutSeconds)",
+						"(check that the source cnpg.io/Cluster has the barman-cloud plugin wired - spec.plugins referencing an ObjectStore - and is shipping WALs to object storage; override via spec.options.walArchiveTimeoutSeconds)",
 					walDeadline, walMessage))
 			}
 			return ctrl.Result{RequeueAfter: cnpgPollInterval}, nil
@@ -689,11 +1131,34 @@ func (r *RestoreJobReconciler) reconcileCNPGRestore(ctx context.Context, restore
 		// reconciling, we patch + purge in peace, and only resume once
 		// the Cluster + PVCs are fully gone so the next render lands
 		// bootstrap.recovery on an empty namespace.
+		sourceCNPGBackup, err := r.cnpgSourceBackup(ctx, backup)
+		if err != nil {
+			return ctrl.Result{}, err
+		}
+		if sourceCNPGBackup == nil {
+			r.Recorder.Eventf(restoreJob, corev1.EventTypeWarning, "BaseBackupGone",
+				"cnpg.io/Backup %s/%s no longer exists, so its base backup has likely been removed by retention; the barman-cloud plugin picks the base backup from the catalog",
+				backup.Namespace, backup.Spec.DriverMetadata[cnpgBackupNameKey])
+		}
+		backupID := cnpgRestoreBackupID(sourceCNPGBackup, options.RecoveryTime)
+		if backupID == "" {
+			logger.Info("restore does not pin its base backup; the barman-cloud plugin picks one from the catalog",
+				"backup", backup.Name, "recoveryTime", options.RecoveryTime)
+		}
 		hrName := postgresAppPrefix + target.AppName
 		if err := r.setCNPGRestoreHRSuspended(ctx, target.Namespace, hrName, true); err != nil {
 			return ctrl.Result{}, err
 		}
-		if err := r.patchPostgresAppForRestore(ctx, targetApp, sourceServerName, sourceDestinationPath, sourceEndpointURL, options.RecoveryTime, rendered.BarmanObjectStore.S3Credentials, rendered.BarmanObjectStore.EndpointCA, sourceDatabases, sourceUsers); err != nil {
+		newServerName := restoredServerName(clusterName, restoreJob.UID)
+		if newServerName == sourceServerName {
+			// Practically unreachable (see restoredServerName), but if a digest
+			// ever collides the restored cluster would archive onto the source's
+			// prefix and CNPG would fail with "Expected empty archive" - log so
+			// that recurrence is diagnosable as a hash collision, not a mystery.
+			logger.Info("restored WAL-archive serverName collided with the recovery source",
+				"cluster", clusterName, "serverName", newServerName)
+		}
+		if err := r.patchPostgresAppForRestore(ctx, targetApp, sourceServerName, newServerName, sourceDestinationPath, sourceEndpointURL, options.RecoveryTime, backupID, rendered.BarmanObjectStore.S3Credentials, rendered.BarmanObjectStore.EndpointCA, sourceDatabases, sourceUsers); err != nil {
 			// Resume HR before terminal failure so an operator deleting
 			// the failed RestoreJob does not leave the HR stuck.
 			_ = r.setCNPGRestoreHRSuspended(ctx, target.Namespace, hrName, false)
@@ -739,38 +1204,208 @@ func (r *RestoreJobReconciler) reconcileCNPGRestore(ctx context.Context, restore
 		return ctrl.Result{RequeueAfter: cnpgPollInterval}, nil
 	}
 
-	deadline := options.effectiveRestoreDeadline()
-	if restoreJob.Status.StartedAt != nil && time.Since(restoreJob.Status.StartedAt.Time) > deadline {
-		return r.markRestoreJobFailed(ctx, restoreJob, fmt.Sprintf(
-			"RestoreJob exceeded %s deadline before target Cluster reached a healthy state (override via spec.options.restoreTimeoutSeconds)",
-			deadline))
+	// Health wins unconditionally, and is checked BEFORE the deadline. A
+	// recovery that has reached a healthy Cluster is a success no matter how
+	// late the reconcile observes it: a reconcile gap longer than
+	// restoreTimeoutSeconds (a controller restart or a stalled workqueue that
+	// spans the window) must not flip an already-converged restore to Failed.
+	// Getting the order wrong is not just a cosmetic mislabel - a false Failed
+	// can be resubmitted, and the next RestoreJob's purge guard would then
+	// delete the already-recovered Cluster + PVCs to start over.
+	if clusterState.hasRecovery {
+		healthy, herr := r.cnpgClusterHealthy(ctx, target.Namespace, clusterName)
+		if herr != nil {
+			return ctrl.Result{}, herr
+		}
+		if healthy && !apimeta.IsStatusConditionTrue(restoreJob.Status.Conditions, restoreCondRecoveryConverged) {
+			// Latch convergence durably BEFORE the terminal step below disables
+			// bootstrap. Disabling bootstrap re-renders the Cluster without
+			// spec.bootstrap.recovery, so hasRecovery never reports true again;
+			// a crash between that flip and the terminal status write must not
+			// drop an already-converged restore into the deadline path and fail
+			// it. Persisting the condition here, on its own Status().Update,
+			// makes the success verdict survive independent of the live
+			// cluster's current bootstrap state.
+			//
+			// RecoveryConverged=True is also symmetric with the False the
+			// unreachable-target path records, so .status.conditions tells the
+			// whole story rather than only ever showing the condition on failure.
+			apimeta.SetStatusCondition(&restoreJob.Status.Conditions, metav1.Condition{
+				Type:    restoreCondRecoveryConverged,
+				Status:  metav1.ConditionTrue,
+				Reason:  "RecoveryConverged",
+				Message: fmt.Sprintf("target cnpg.io Cluster %s/%s reached a healthy state", target.Namespace, clusterName),
+			})
+			if err := r.Status().Update(ctx, restoreJob); err != nil {
+				return ctrl.Result{}, err
+			}
+			return ctrl.Result{RequeueAfter: cnpgPollInterval}, nil
+		}
 	}
 
-	if !hasRecovery {
-		return ctrl.Result{RequeueAfter: cnpgPollInterval}, nil
+	// Terminal step, reachable regardless of the live cluster's current
+	// bootstrap state once convergence has latched above. Recovery restores the
+	// source's role catalog and password hashes, but the freshly reconciled
+	// <target>-credentials Secret advertises chart-generated passwords that do
+	// not match those hashes. While bootstrap.enabled stays true the chart skips
+	// the init-job that would reconcile them (see init-job.yaml), so every
+	// application-user login against the target keeps failing. Disable bootstrap
+	// so the post-upgrade init-job runs ALTER ROLE ... WITH PASSWORD for each
+	// spec.users entry, converging the recovered roles onto the generated
+	// Secret. Idempotent, so a crash before the Succeeded write below just
+	// re-runs it on the next reconcile.
+	if apimeta.IsStatusConditionTrue(restoreJob.Status.Conditions, restoreCondRecoveryConverged) {
+		if err := r.disablePostgresAppBootstrap(ctx, target.Namespace, target.AppName); err != nil {
+			// Recovery already converged - the data is restored and reachable as
+			// the CNPG superuser; only clearing bootstrap.enabled (the trigger for
+			// the init-job that reconciles the generated passwords onto the
+			// recovered roles) is failing. Give this step its OWN grace window,
+			// measured from when recovery converged (RecoveryConverged's
+			// LastTransitionTime), NOT from the restore StartedAt: the health
+			// check wins BEFORE the restore deadline on purpose (a large-DB
+			// recovery legitimately outlives it - see the health-before-deadline
+			// ordering above), so a StartedAt-based bound is often already past
+			// the deadline the instant this step first runs and would fail it on
+			// the FIRST transient error (an apiserver restart, a webhook timeout).
+			// That is exactly the false Failed the ordering exists to prevent: a
+			// resubmit's purge-guard would then delete the healthy restored
+			// Cluster + PVCs. Only a failure that persists across the whole window
+			// AFTER convergence terminates as Failed; a transient one requeues.
+			// The window is a fixed cnpgBootstrapDisableGrace, independent of
+			// restoreTimeoutSeconds, sized for a control-plane blip.
+			grace := options.effectiveBootstrapDisableGrace()
+			if cond := apimeta.FindStatusCondition(restoreJob.Status.Conditions, restoreCondRecoveryConverged); cond != nil &&
+				time.Since(cond.LastTransitionTime.Time) > grace {
+				return r.markRestoreJobFailedReason(ctx, restoreJob, "BootstrapDisableFailed", fmt.Sprintf(
+					"recovery converged but clearing spec.bootstrap.enabled on Postgres app %s/%s kept failing for %s after convergence, so the restored copy's application credentials will not converge on their own: %v. "+
+						"The data is restored and reachable as the CNPG superuser; clear bootstrap.enabled on the app - and stop any GitOps source from re-asserting it - so the init-job reconciles the passwords.",
+					target.Namespace, target.AppName, grace, err))
+			}
+			// Still inside the window. Record WHY the RestoreJob is non-terminal on
+			// .status so it does not sit silent for up to the whole grace window, and
+			// emit the Event once (on the transition into pending), not on every poll.
+			firstFailure := !apimeta.IsStatusConditionTrue(restoreJob.Status.Conditions, restoreCondBootstrapDisablePending)
+			apimeta.SetStatusCondition(&restoreJob.Status.Conditions, metav1.Condition{
+				Type:   restoreCondBootstrapDisablePending,
+				Status: metav1.ConditionTrue,
+				Reason: "Retrying",
+				Message: fmt.Sprintf(
+					"recovery converged; clearing spec.bootstrap.enabled on Postgres app %s/%s is retrying after a transient error and will fail the restore if it does not clear within %s of convergence: %v",
+					target.Namespace, target.AppName, grace, err),
+			})
+			if updErr := r.Status().Update(ctx, restoreJob); updErr != nil {
+				return ctrl.Result{}, updErr
+			}
+			if firstFailure {
+				r.Recorder.Eventf(restoreJob, corev1.EventTypeWarning, "BootstrapDisablePending",
+					"recovery converged but clearing spec.bootstrap.enabled on Postgres app %s/%s failed; retrying up to %s after convergence: %v",
+					target.Namespace, target.AppName, grace, err)
+			}
+			return ctrl.Result{RequeueAfter: cnpgPollInterval}, nil
+		}
+		now := metav1.Now()
+		restoreJob.Status.CompletedAt = &now
+		restoreJob.Status.Phase = backupsv1alpha1.RestoreJobPhaseSucceeded
+		// The DATA is restored and the Cluster is healthy - that is what this
+		// terminal Succeeded asserts. Clearing bootstrap only STARTS the credential
+		// convergence: the chart's post-upgrade init-job runs ALTER ROLE on the next
+		// HelmRelease reconcile, which this controller does not wait for. Carry that
+		// pending handoff as the REASON on Ready rather than as a standalone
+		// CredentialsConverged condition: this controller never observes the
+		// convergence, so such a condition would be structurally False on every
+		// success - indistinguishable from a standing failure to a generic
+		// conditions view - and answer nothing. A reason on Ready=True says the same
+		// thing without pretending to a lifecycle it cannot complete; the message
+		// and the Event below carry the how-to-confirm.
+		apimeta.SetStatusCondition(&restoreJob.Status.Conditions, metav1.Condition{
+			Type:    "Ready",
+			Status:  metav1.ConditionTrue,
+			Reason:  "RestoreCompletedCredentialsPending",
+			Message: "target cnpg.io Cluster reached a healthy state and spec.bootstrap.enabled was cleared; the app's post-upgrade init-job reconciles the generated passwords onto the recovered roles on the next HelmRelease reconcile (this RestoreJob does not wait for it - confirm by logging in as an application user)",
+		})
+		// If the disable retried within the window, close out that pending condition.
+		if apimeta.FindStatusCondition(restoreJob.Status.Conditions, restoreCondBootstrapDisablePending) != nil {
+			apimeta.SetStatusCondition(&restoreJob.Status.Conditions, metav1.Condition{
+				Type:    restoreCondBootstrapDisablePending,
+				Status:  metav1.ConditionFalse,
+				Reason:  "Cleared",
+				Message: "spec.bootstrap.enabled was cleared",
+			})
+		}
+		// The status message above is honest that credential convergence is still
+		// pending; back it with an Event so the handoff is discoverable in
+		// `kubectl describe`/`get events`, not only by reading .status. This
+		// RestoreJob's contract is the DATA restore (healthy Cluster + bootstrap
+		// cleared); the ALTER ROLE convergence belongs to the chart's post-upgrade
+		// init-job, and gating this terminal write on that Helm-hook Job would couple
+		// two controllers and wedge the restore whenever a GitOps source re-asserts
+		// bootstrap.enabled. Announce the pending convergence instead of blocking on
+		// it.
+		r.Recorder.Eventf(restoreJob, corev1.EventTypeNormal, "CredentialsConvergencePending",
+			"Data restored and spec.bootstrap.enabled cleared on Postgres app %s/%s; application credentials converge when the chart's post-upgrade init-job runs ALTER ROLE on the next HelmRelease reconcile. This RestoreJob does not wait for it - verify with an application login.",
+			target.Namespace, target.AppName)
+		if err := r.Status().Update(ctx, restoreJob); err != nil {
+			return ctrl.Result{}, err
+		}
+		return ctrl.Result{}, nil
 	}
 
-	healthy, err := r.cnpgClusterHealthy(ctx, target.Namespace, clusterName)
-	if err != nil {
-		return ctrl.Result{}, err
-	}
-	if !healthy {
-		return ctrl.Result{RequeueAfter: cnpgPollInterval}, nil
+	// Not (yet) healthy. Now the restore deadline is the authority for "this
+	// restore is stuck". A recovery that CAN converge does so within the
+	// deadline and is caught by the health check above; only a genuinely wedged
+	// restore (most often a recoveryTime past the latest archived WAL) burns the
+	// whole window. We do NOT fail earlier off the recovery pod's FATAL: a valid
+	// near-now target hits that same "recovery ended before ... target ...
+	// reached" FATAL transiently - and repeatedly, on a slow archiver - before
+	// it converges, so an earlier trip would wrongly reject a recoverable
+	// restore. The FATAL is used only to explain a failure the deadline has
+	// already declared. Tenants who want a fast rejection set a short
+	// spec.options.restoreTimeoutSeconds.
+	deadline := options.effectiveRestoreDeadline()
+	if restoreJob.Status.StartedAt != nil && time.Since(restoreJob.Status.StartedAt.Time) > deadline {
+		classificationForbidden := false
+		if options.RecoveryTime != "" {
+			unreachable, pod, forbidden, uerr := r.recoveryTargetUnreachable(ctx, target.Namespace, clusterName)
+			if uerr != nil {
+				return ctrl.Result{}, uerr
+			}
+			classificationForbidden = forbidden
+			if unreachable {
+				msg := fmt.Sprintf(
+					"point-in-time recovery target %s is past the latest WAL archived to object storage: over the %s restore window recovery kept replaying all available WAL without reaching it and PostgreSQL gave up (%q; most recent recovery pod: %s). "+
+						"Pick a recoveryTime inside the recoverable window - see the PITR docs on discovering the earliest/latest restorable time.",
+					options.RecoveryTime, deadline, cnpgRecoveryTargetUnreachableLog, pod)
+				apimeta.SetStatusCondition(&restoreJob.Status.Conditions, metav1.Condition{
+					Type:    restoreCondRecoveryConverged,
+					Status:  metav1.ConditionFalse,
+					Reason:  "RecoveryTargetUnreachable",
+					Message: msg,
+				})
+				return r.markRestoreJobFailedReason(ctx, restoreJob, "RecoveryTargetUnreachable", msg)
+			}
+		}
+		msg := fmt.Sprintf(
+			"RestoreJob exceeded %s deadline before target Cluster reached a healthy state (override via spec.options.restoreTimeoutSeconds)",
+			deadline)
+		if options.RecoveryTime != "" {
+			msg += fmt.Sprintf("; spec.options.recoveryTime %s may be past the recoverable window, or the source may be large enough to need a longer restoreTimeoutSeconds", options.RecoveryTime)
+		}
+		if classificationForbidden {
+			// The RecoveryTargetUnreachable classification needs to read the
+			// recovery pod's log; the controller was denied that (missing
+			// pods/log RBAC grant), so it could not tell an unreachable target
+			// apart from a slow one. Make the misconfiguration visible rather
+			// than hiding it behind a bare generic timeout.
+			msg += ". NOTE: could not read recovery pod logs to classify this failure - the controller's pods/log RBAC grant appears to be missing, so a RecoveryTargetUnreachable diagnosis was unavailable"
+			r.Recorder.Eventf(restoreJob, corev1.EventTypeWarning, "RecoveryClassificationForbidden",
+				"cannot read recovery pod logs (pods/log RBAC grant missing); unable to diagnose whether recoveryTime %s is past the recoverable window", options.RecoveryTime)
+		}
+		return r.markRestoreJobFailed(ctx, restoreJob, msg)
 	}
 
-	now := metav1.Now()
-	restoreJob.Status.CompletedAt = &now
-	restoreJob.Status.Phase = backupsv1alpha1.RestoreJobPhaseSucceeded
-	apimeta.SetStatusCondition(&restoreJob.Status.Conditions, metav1.Condition{
-		Type:    "Ready",
-		Status:  metav1.ConditionTrue,
-		Reason:  "RestoreCompleted",
-		Message: "target cnpg.io Cluster reached healthy state",
-	})
-	if err := r.Status().Update(ctx, restoreJob); err != nil {
-		return ctrl.Result{}, err
-	}
-	return ctrl.Result{}, nil
+	// Within the deadline and not yet healthy (or the recovery Cluster is not
+	// chart-rendered yet): keep waiting.
+	return ctrl.Result{RequeueAfter: cnpgPollInterval}, nil
 }
 
 // cnpgRestoreTarget captures the resolved target for a CNPG restore. The
@@ -811,11 +1446,13 @@ func (r *RestoreJobReconciler) resolveCNPGRestoreTarget(restoreJob *backupsv1alp
 // patchPostgresAppForRestore writes the restore-related fields into the
 // target Postgres app instance spec. The chart already exposes these knobs;
 // once the HelmRelease re-renders, the cnpg.io Cluster picks up
-// bootstrap.recovery and externalClusters[].barmanObjectStore.
+// bootstrap.recovery and externalClusters[].plugin referencing the
+// chart-rendered recovery ObjectStore.
 //
 // Credentials are forwarded as a Secret reference (spec.backup.s3CredentialsSecret),
 // not as cleartext keys. The controller never reads the Secret itself; the
-// chart wires the named Secret straight into barmanObjectStore.s3Credentials.
+// chart wires the named Secret into the recovery ObjectStore's
+// spec.configuration.s3Credentials.
 // This keeps S3 access keys out of the Postgres CR .spec, etcd, audit logs,
 // and any tenant-readable copies.
 //
@@ -827,16 +1464,54 @@ func (r *RestoreJobReconciler) resolveCNPGRestoreTarget(restoreJob *backupsv1alp
 func (r *RestoreJobReconciler) patchPostgresAppForRestore(
 	ctx context.Context,
 	app *postgresapp.Postgres,
-	sourceServerName, sourceDestinationPath, sourceEndpointURL, recoveryTime string,
+	sourceServerName, newServerName, sourceDestinationPath, sourceEndpointURL, recoveryTime, backupID string,
 	credsRef *strategyv1alpha1.S3CredentialsTemplate,
 	caRef *strategyv1alpha1.EndpointCARef,
 	sourceDatabases map[string]postgresapp.Database,
 	sourceUsers map[string]postgresapp.User,
 ) error {
-	patched := buildPostgresAppRestorePatch(app, sourceServerName, sourceDestinationPath, sourceEndpointURL, recoveryTime, credsRef, caRef, sourceDatabases, sourceUsers)
+	patched := buildPostgresAppRestorePatch(app, sourceServerName, newServerName, sourceDestinationPath, sourceEndpointURL, recoveryTime, backupID, credsRef, caRef, sourceDatabases, sourceUsers)
 	return r.Patch(ctx, patched, client.MergeFrom(app), client.FieldOwner(cnpgFieldManager))
 }
 
+// disablePostgresAppBootstrap clears spec.bootstrap.enabled on the target
+// Postgres app once recovery has converged. patchPostgresAppForRestore set it
+// true to make the chart render bootstrap.recovery; nothing else ever turns it
+// back off, and while it stays true the chart skips its post-upgrade init-job
+// (see init-job.yaml). That init-job is the only actor that reconciles the
+// chart-generated <release>-credentials Secret onto the live roles via
+// ALTER ROLE ... WITH PASSWORD. The recovered roles carry the source's password
+// hashes, the freshly generated Secret does not match them, so until the flag
+// flips every application-user login against the restored target fails while
+// the Secret advertises a password that was never applied. Flipping it lets the
+// init-job re-converge the roles onto the Secret on the next HelmRelease
+// upgrade. Idempotent: a no-op once already disabled, and re-GETs the live app
+// so a concurrent tenant edit is merged rather than clobbered.
+func (r *RestoreJobReconciler) disablePostgresAppBootstrap(ctx context.Context, namespace, appName string) error {
+	app, err := r.getPostgresApp(ctx, namespace, appName)
+	if err != nil {
+		return err
+	}
+	if !app.Spec.Bootstrap.Enabled {
+		return nil
+	}
+	patched := app.DeepCopy()
+	patched.Spec.Bootstrap.Enabled = false
+	return r.Patch(ctx, patched, client.MergeFrom(app), client.FieldOwner(cnpgFieldManager))
+}
+
+// restoredServerName returns the WAL-archive serverName a restored cluster
+// writes to. Keyed by the RestoreJob UID, it is unique per restore and never
+// equals a source serverName, so the re-bootstrapped cluster archives into an
+// empty prefix and barman-cloud-check-wal-archive passes even on an in-place
+// restore (where the target cluster name equals the source's).
+func restoredServerName(clusterName string, uid types.UID) string {
+	// 64 bits of the digest: enough that two RestoreJob UIDs colliding on the
+	// same cluster is not a practical concern, while keeping the prefix short.
+	sum := sha256.Sum256([]byte(uid))
+	return fmt.Sprintf("%s-restore-%s", clusterName, hex.EncodeToString(sum[:])[:16])
+}
+
 // buildPostgresAppRestorePatch returns a deep-copied Postgres application
 // instance with restore-related fields overlaid. Pure: no cluster I/O. The
 // wrapper above invokes the Kubernetes Patch.
@@ -851,7 +1526,7 @@ func (r *RestoreJobReconciler) patchPostgresAppForRestore(
 // anything not in spec) must see the source's exact map.
 func buildPostgresAppRestorePatch(
 	app *postgresapp.Postgres,
-	sourceServerName, sourceDestinationPath, sourceEndpointURL, recoveryTime string,
+	sourceServerName, newServerName, sourceDestinationPath, sourceEndpointURL, recoveryTime, backupID string,
 	credsRef *strategyv1alpha1.S3CredentialsTemplate,
 	caRef *strategyv1alpha1.EndpointCARef,
 	sourceDatabases map[string]postgresapp.Database,
@@ -861,10 +1536,21 @@ func buildPostgresAppRestorePatch(
 	patched.Spec.Bootstrap.Enabled = true
 	patched.Spec.Bootstrap.OldName = sourceServerName
 	patched.Spec.Bootstrap.ServerName = sourceServerName
+	// Archive under a fresh prefix distinct from the recovery source, or an
+	// in-place restore fails barman-cloud-check-wal-archive ("Expected empty archive").
+	patched.Spec.Bootstrap.NewServerName = newServerName
 	patched.Spec.Bootstrap.RecoveryTime = recoveryTime
+	patched.Spec.Bootstrap.BackupID = backupID
 
 	patched.Spec.Backup.DestinationPath = sourceDestinationPath
 	patched.Spec.Backup.EndpointURL = sourceEndpointURL
+	// The restore populates explicit S3 coordinates (destinationPath /
+	// s3CredentialsSecret / endpointCA below), so the app is no longer on the
+	// system-bucket path. Clear useSystemBucket: the chart rejects
+	// bootstrap.enabled together with useSystemBucket (an unset-coordinates
+	// guard), and a system-bucket app restored in place would otherwise wedge
+	// its HelmRelease in that render error instead of re-bootstrapping.
+	patched.Spec.Backup.UseSystemBucket = false
 	// Switching to s3CredentialsSecret means inline keys must not survive
 	// on the CR .spec; otherwise tenants who switch credential modes leave
 	// cleartext keys behind in etcd and audit logs.
@@ -878,10 +1564,11 @@ func buildPostgresAppRestorePatch(
 			SecretAccessKeyKey: credsRef.SecretAccessKeyKey,
 		}
 	}
-	// endpointCA flows into both the chart's spec.backup.barmanObjectStore
-	// and externalClusters[].barmanObjectStore. The recovery path
-	// specifically needs it - without a trusted CA the cnpg-instance-manager
-	// panics in InitInfo.loadBackup when it can't verify the seaweedfs cert.
+	// endpointCA flows into both the chart's backup ObjectStore
+	// (spec.configuration.endpointCA) and the recovery ObjectStore referenced
+	// from externalClusters[].plugin. The recovery path specifically needs it -
+	// without a trusted CA the cnpg-instance-manager panics in
+	// InitInfo.loadBackup when it can't verify the seaweedfs cert.
 	patched.Spec.Backup.EndpointCA = postgresapp.EndpointCA{}
 	if caRef != nil && caRef.SecretRef.Name != "" {
 		patched.Spec.Backup.EndpointCA = postgresapp.EndpointCA{
@@ -916,12 +1603,18 @@ func buildPostgresAppRestorePatch(
 // names, prefixes, secret references), never cleartext credentials -
 // credentials are always referenced through `secretRef`, not inlined, and
 // the Secret content stays in etcd's encryption-at-rest store.
+//
+// Flavor records the source's image family. A physical backup only restores
+// safely onto the same family: the two ship different glibc versions, which
+// invalidates collatable indexes, and postgis objects need the postgis
+// libraries.
 type cnpgBackupSnapshot struct {
 	Kind       string                          `json:"kind"`
 	APIVersion string                          `json:"apiVersion"`
 	Databases  map[string]postgresapp.Database `json:"databases,omitempty"`
 	Users      map[string]postgresapp.User     `json:"users,omitempty"`
 	Parameters map[string]string               `json:"parameters,omitempty"`
+	Flavor     string                          `json:"flavor,omitempty"`
 }
 
 const cnpgBackupSnapshotKind = "CNPGBackupSnapshot"
@@ -934,7 +1627,9 @@ var cnpgBackupSnapshotAPIVersion = backupsv1alpha1.GroupVersion.String()
 // marshalCNPGBackupSnapshot serializes the source app's spec.databases /
 // spec.users plus the BackupClassStrategy parameters into a
 // runtime.RawExtension suitable for Backup.Status.UnderlyingResources.
-func marshalCNPGBackupSnapshot(app *postgresapp.Postgres, parameters map[string]string) (*runtime.RawExtension, error) {
+// flavor is the live Cluster's, not app.Spec.Flavor: the chart refuses a
+// flavor change, but the app keeps the refused value.
+func marshalCNPGBackupSnapshot(app *postgresapp.Postgres, parameters map[string]string, flavor string) (*runtime.RawExtension, error) {
 	if app == nil {
 		return nil, nil
 	}
@@ -944,6 +1639,7 @@ func marshalCNPGBackupSnapshot(app *postgresapp.Postgres, parameters map[string]
 		Databases:  app.Spec.Databases,
 		Users:      app.Spec.Users,
 		Parameters: parameters,
+		Flavor:     flavor,
 	}
 	raw, err := json.Marshal(snap)
 	if err != nil {
@@ -962,19 +1658,42 @@ func marshalCNPGBackupSnapshot(app *postgresapp.Postgres, parameters map[string]
 // `{{ .Parameters.foo }}` references stores nil here, and a Backup taken
 // by a controller version that pre-dates parameter persistence has no
 // parameters block at all). The caller must treat a nil/empty map the
-// same as "no parameter overrides" rather than failing.
-func unmarshalCNPGBackupSnapshot(backup *backupsv1alpha1.Backup) (map[string]postgresapp.Database, map[string]postgresapp.User, map[string]string, error) {
+// same as "no parameter overrides" rather than failing. Flavor is empty on
+// a Backup taken before flavors existed, when every cluster ran postgresql;
+// compare it through cnpgFlavor.
+func unmarshalCNPGBackupSnapshot(backup *backupsv1alpha1.Backup) (*cnpgBackupSnapshot, error) {
 	if backup == nil || backup.Status.UnderlyingResources == nil || len(backup.Status.UnderlyingResources.Raw) == 0 {
-		return nil, nil, nil, fmt.Errorf("status.underlyingResources is empty")
+		return nil, fmt.Errorf("status.underlyingResources is empty")
 	}
 	var snap cnpgBackupSnapshot
 	if err := json.Unmarshal(backup.Status.UnderlyingResources.Raw, &snap); err != nil {
-		return nil, nil, nil, fmt.Errorf("decode snapshot: %w", err)
+		return nil, fmt.Errorf("decode snapshot: %w", err)
 	}
 	if snap.Kind != cnpgBackupSnapshotKind {
-		return nil, nil, nil, fmt.Errorf("unexpected snapshot kind %q (want %q)", snap.Kind, cnpgBackupSnapshotKind)
+		return nil, fmt.Errorf("unexpected snapshot kind %q (want %q)", snap.Kind, cnpgBackupSnapshotKind)
 	}
-	return snap.Databases, snap.Users, snap.Parameters, nil
+	return &snap, nil
+}
+
+// cnpgFlavor resolves an unset flavor to the chart default.
+func cnpgFlavor(flavor string) string {
+	if flavor == "" {
+		return "postgresql"
+	}
+	return flavor
+}
+
+// cnpgImageFlavor names the flavor of a Cluster's spec.imageName the way the
+// chart's postgres.flavorGuard compares images: the last path segment without
+// tag or digest, so a registry mirror rewriting the host still matches. The
+// chart names each flavor after its image; an empty imageName is CNPG's
+// default postgresql image.
+func cnpgImageFlavor(imageName string) string {
+	name := imageName[strings.LastIndex(imageName, "/")+1:]
+	if i := strings.IndexAny(name, ":@"); i >= 0 {
+		name = name[:i]
+	}
+	return cnpgFlavor(name)
 }
 
 // purgeExistingCluster deletes the live cnpg.io Cluster and its PVCs so the
@@ -1113,6 +1832,90 @@ func (r *RestoreJobReconciler) cnpgBackupWALArchived(ctx context.Context, backup
 	return true, fmt.Sprintf("cnpg.io/Backup %s/%s phase=completed, endWal=%q", backup.Namespace, backupName, cnpgBackup.Status.EndWal), nil
 }
 
+// cnpgSourceBackup returns the cnpg.io/Backup behind a Backup artifact, or
+// nil once it is gone. The driver deletes it only together with its
+// artifact, while plugin-barman-cloud's retention deletes it together with
+// the base backup it describes (deleteBackupsNotInCatalog), so an artifact
+// that outlives its cnpg.io/Backup names a base backup the catalog has lost.
+func (r *RestoreJobReconciler) cnpgSourceBackup(ctx context.Context, backup *backupsv1alpha1.Backup) (*cnpgtypes.Backup, error) {
+	name := backup.Spec.DriverMetadata[cnpgBackupNameKey]
+	if name == "" {
+		return nil, nil
+	}
+	cnpgBackup := &cnpgtypes.Backup{}
+	if err := r.Get(ctx, types.NamespacedName{Namespace: backup.Namespace, Name: name}, cnpgBackup); err != nil {
+		if apierrors.IsNotFound(err) {
+			return nil, nil
+		}
+		return nil, err
+	}
+	return cnpgBackup, nil
+}
+
+// cnpgBackupMajorVersion returns the PostgreSQL major a Backup artifact was
+// taken on, or 0 when it is unknown. An artifact created before the driver
+// recorded it falls back to the cnpg.io/Backup, as long as retention has not
+// removed it.
+func (r *RestoreJobReconciler) cnpgBackupMajorVersion(ctx context.Context, backup *backupsv1alpha1.Backup) (int, error) {
+	if v, err := strconv.Atoi(backup.Spec.DriverMetadata[cnpgMajorVersionKey]); err == nil && v > 0 {
+		return v, nil
+	}
+	source, err := r.cnpgSourceBackup(ctx, backup)
+	if err != nil || source == nil {
+		return 0, err
+	}
+	return source.Status.MajorVersion, nil
+}
+
+// postgresAppMajorVersion parses a Postgres app's spec.version ("v16"), or
+// returns 0 when it is empty or not in that form.
+func postgresAppMajorVersion(version string) int {
+	v, err := strconv.Atoi(strings.TrimPrefix(version, "v"))
+	if err != nil || v <= 0 {
+		return 0
+	}
+	return v
+}
+
+// cnpgRestoreBackupID decides whether a restore pins the base backup it
+// starts from, and returns the backupID to set in
+// bootstrap.recovery.recoveryTarget, or "" to leave the choice to the
+// barman-cloud plugin.
+//
+// Left to itself the plugin starts from the newest backup in the catalog
+// when no recoveryTime is set, whichever backup the RestoreJob names, and
+// otherwise from the newest one ending at or before recoveryTime, on any
+// timeline (barman-cloud pkg/catalog FindBackupInfo). On a stream holding
+// several timelines either can start from another branch of the history
+// and bring back other data than the backup asked for.
+//
+// A source that is gone (nil) is not pinned: its base backup is no longer
+// in the catalog, and pinning it would fail the recovery after the target
+// has been purged.
+//
+// A backup cannot serve a recoveryTime before it ended: recovery would stop
+// before it is consistent. Such a request keeps the plugin's choice, which
+// can find an older backup. stoppedAt is truncated to the second while the
+// catalog compares barman's end time to the microsecond, so a backup is
+// pinned only once recoveryTime is a full second past stoppedAt.
+func cnpgRestoreBackupID(source *cnpgtypes.Backup, recoveryTime string) string {
+	if source == nil || source.Status.BackupID == "" {
+		return ""
+	}
+	if recoveryTime == "" {
+		return source.Status.BackupID
+	}
+	stoppedAt := source.Status.StoppedAt
+	if stoppedAt == nil || stoppedAt.IsZero() {
+		return ""
+	}
+	target, err := time.Parse(time.RFC3339Nano, recoveryTime)
+	if err != nil || target.Before(stoppedAt.Add(time.Second)) {
+		return ""
+	}
+	return source.Status.BackupID
+}
+
 // cnpgClusterHealthy returns true once the named cnpg.io Cluster reports its
 // healthy phase. Treats a missing Cluster as not-yet-healthy.
 func (r *RestoreJobReconciler) cnpgClusterHealthy(ctx context.Context, namespace, clusterName string) (bool, error) {
@@ -1126,11 +1929,141 @@ func (r *RestoreJobReconciler) cnpgClusterHealthy(ctx context.Context, namespace
 	return cluster.Status.Phase == cnpgClusterHealthyPhase, nil
 }
 
-// clusterHasRecoveryBootstrap returns true when the live cnpg.io Cluster's
-// spec.bootstrap.recovery is populated - the signal that the chart has
-// re-rendered with our restore-shaped values and the operator is using the
-// recovery bootstrap path. Treats a missing Cluster as "not yet" rather
-// than an error so the caller can keep polling while HelmRelease catches up.
+// logIndicatesRecoveryTargetUnreachable reports whether a recovery container
+// log contains the PostgreSQL FATAL that a recovery instance emits when it
+// exhausts the WAL archive before reaching the configured recovery target.
+// Pure string match so it is unit-testable without a live cluster.
+func logIndicatesRecoveryTargetUnreachable(recoveryLog string) bool {
+	return strings.Contains(recoveryLog, cnpgRecoveryTargetUnreachableLog)
+}
+
+// recoveryUnreachableFromLogs reports whether any recovery-pod log carries the
+// unreachable-target FATAL. It is consulted only once the restore deadline has
+// elapsed (see reconcileCNPGRestore), so a single match is enough: recovery has
+// already had the whole window to converge, and this only classifies *why* it
+// did not. Pure so the decision is unit-testable without a live cluster.
+func recoveryUnreachableFromLogs(logs []string) bool {
+	return slices.ContainsFunc(logs, logIndicatesRecoveryTargetUnreachable)
+}
+
+// recoveryTargetUnreachable inspects the target Cluster's bootstrap-recovery
+// pods and reports whether recovery has definitively failed because the
+// point-in-time target is past the last archived WAL. It reads the recovery
+// container's log and matches the PostgreSQL "recovery ended before ..."
+// FATAL - a signal unique to an unreachable target, so a transient recovery-
+// pod crash (which never emits it) does NOT trip the guard and the recovery
+// is left to converge or hit the restore deadline. Returns the inspected pod
+// name for the operator-facing message. Nil-safe: with no Clientset wired it
+// reports false so the deadline remains the backstop.
+//
+// Every recovery attempt for an unreachable target reproduces the same FATAL,
+// so scanning the most recent pods (running or Failed, newest first) reliably
+// catches it across reconciles without depending on any single pod surviving.
+func (r *RestoreJobReconciler) recoveryTargetUnreachable(ctx context.Context, namespace, clusterName string) (unreachable bool, pod string, forbidden bool, err error) {
+	readLog := r.readPodLog
+	if readLog == nil {
+		readLog = r.readPodContainerLog
+	}
+	// No way to read logs (no Clientset wired and no injected reader): report
+	// not-unreachable so the deadline stays the backstop.
+	if r.Clientset == nil && r.readPodLog == nil {
+		return false, "", false, nil
+	}
+	podList := &corev1.PodList{}
+	if err := r.List(ctx, podList,
+		client.InNamespace(namespace),
+		client.MatchingLabels{cnpgClusterLabel: clusterName},
+	); err != nil {
+		return false, "", false, fmt.Errorf("list pods for cluster %s/%s: %w", namespace, clusterName, err)
+	}
+	logger := getLogger(ctx)
+	logs := make([]string, 0, cnpgRecoveryMaxInspectPods)
+	fatalPod := "" // newest FATAL-ing pod (pods are inspected newest-first)
+	forbiddenSeen := false
+	for _, p := range recoveryPodsToInspect(podList.Items) {
+		recoveryLog, readErr := readLog(ctx, p.Namespace, p.Name, cnpgRecoveryContainerName)
+		if readErr != nil {
+			// A log read can fail transiently (pod being GC'd, apiserver
+			// blip); don't fail the RestoreJob on it - skip this pod. But a
+			// Forbidden is NOT transient: it means the controller lacks the
+			// pods/log RBAC grant, which disables the RecoveryTargetUnreachable
+			// classification. Flag it so the caller can surface it (Warning
+			// Event + message) instead of failing with a bare generic reason.
+			if apierrors.IsForbidden(readErr) {
+				forbiddenSeen = true
+				logger.Info("cannot read recovery pod log to classify a stuck point-in-time restore - the pods/log RBAC grant is missing, so the RecoveryTargetUnreachable classification is unavailable and this restore falls back to the restore deadline",
+					"pod", p.Name, "error", readErr)
+			} else {
+				logger.Debug("skipping recovery pod log read", "pod", p.Name, "error", readErr)
+			}
+			continue
+		}
+		logs = append(logs, recoveryLog)
+		if fatalPod == "" && logIndicatesRecoveryTargetUnreachable(recoveryLog) {
+			fatalPod = p.Name
+		}
+	}
+	return recoveryUnreachableFromLogs(logs), fatalPod, forbiddenSeen, nil
+}
+
+// recoveryPodsToInspect narrows a Cluster's pod list to the bootstrap-recovery
+// pods worth reading a log from: it keeps only pods carrying the full-recovery
+// container, orders them newest-first (the current/most-recent recovery
+// attempt is the most likely to hold a fresh, complete replay log), and caps
+// the result at cnpgRecoveryMaxInspectPods to bound the per-reconcile log
+// reads. Pure and deterministic so the filter/order/cap contract - the part
+// that would silently regress the fail-fast into a deadline hang if it drifted
+// - is unit-testable without a live cluster.
+func recoveryPodsToInspect(pods []corev1.Pod) []*corev1.Pod {
+	out := make([]*corev1.Pod, 0, len(pods))
+	for i := range pods {
+		p := &pods[i]
+		for _, c := range p.Spec.Containers {
+			if c.Name == cnpgRecoveryContainerName {
+				out = append(out, p)
+				break
+			}
+		}
+	}
+	sort.Slice(out, func(i, j int) bool {
+		return out[i].CreationTimestamp.After(out[j].CreationTimestamp.Time)
+	})
+	if len(out) > cnpgRecoveryMaxInspectPods {
+		out = out[:cnpgRecoveryMaxInspectPods]
+	}
+	return out
+}
+
+// readPodContainerLog returns the tail of a pod container's log via the
+// clientset (the controller-runtime cache client cannot read the log
+// subresource).
+func (r *RestoreJobReconciler) readPodContainerLog(ctx context.Context, namespace, podName, container string) (string, error) {
+	tail := int64(cnpgRecoveryLogTailLines)
+	req := r.Clientset.CoreV1().Pods(namespace).GetLogs(podName, &corev1.PodLogOptions{
+		Container: container,
+		TailLines: &tail,
+	})
+	stream, err := req.Stream(ctx)
+	if err != nil {
+		return "", err
+	}
+	defer func() { _ = stream.Close() }() // read-only log stream; nothing depends on the close error
+	data, err := io.ReadAll(stream)
+	if err != nil {
+		return "", err
+	}
+	return string(data), nil
+}
+
+// recoveryBootstrapClusterState fetches the live cnpg.io Cluster and reports
+// whether its spec.bootstrap.recovery is populated - the signal that the chart
+// has re-rendered with our restore-shaped values and the operator is using the
+// recovery bootstrap path - together with the Cluster's creationTimestamp. The
+// caller pairs the timestamp with the RestoreJob's StartedAt (via
+// cnpgClusterFreshlyRecovered) to tell a Cluster this restore just produced
+// apart from one left over by an earlier completed restore. Treats a missing
+// Cluster as "not yet" rather than an error so the caller can keep polling
+// while HelmRelease catches up.
 //
 // A Cluster carrying DeletionTimestamp is also treated as "not yet": that is
 // the in-flight purge case, where r.Delete has fired but cnpg.io's
@@ -1143,18 +2076,37 @@ func (r *RestoreJobReconciler) cnpgClusterHealthy(ctx context.Context, namespace
 // drops the change and the cluster ends up with the original initdb spec.
 // Holding here forces the caller to requeue until the old CR is fully GC'd
 // and the chart re-creates a fresh one.
-func (r *RestoreJobReconciler) clusterHasRecoveryBootstrap(ctx context.Context, namespace, clusterName string) (bool, error) {
+func (r *RestoreJobReconciler) recoveryBootstrapClusterState(ctx context.Context, namespace, clusterName string) (recoveryClusterState, error) {
 	cluster := &cnpgtypes.Cluster{}
 	if err := r.Get(ctx, types.NamespacedName{Namespace: namespace, Name: clusterName}, cluster); err != nil {
 		if apierrors.IsNotFound(err) {
-			return false, nil
+			return recoveryClusterState{}, nil
 		}
-		return false, err
+		return recoveryClusterState{}, err
 	}
 	if !cluster.DeletionTimestamp.IsZero() {
-		return false, nil
+		return recoveryClusterState{}, nil
 	}
-	return cluster.Spec.Bootstrap != nil && cluster.Spec.Bootstrap.Recovery != nil, nil
+	if cluster.Spec.Bootstrap == nil || cluster.Spec.Bootstrap.Recovery == nil {
+		return recoveryClusterState{}, nil
+	}
+	created := cluster.CreationTimestamp
+	return recoveryClusterState{
+		hasRecovery: true,
+		createdAt:   &created,
+		restoreMark: cluster.Annotations[cnpgRestoredServerNameAnnotation],
+	}, nil
+}
+
+// recoveryClusterState is what the purge decision reads off the live Cluster.
+// The zero value is a Cluster that is absent, terminating, or not bootstrapped
+// from a recovery.
+type recoveryClusterState struct {
+	hasRecovery bool
+	createdAt   *metav1.Time
+	// restoreMark is cnpgRestoredServerNameAnnotation, or "" on a Cluster the
+	// chart rendered before it set the annotation.
+	restoreMark string
 }
 
 // ---------------------------------------------------------------------------
@@ -1171,7 +2123,7 @@ func renderCNPGTemplate(t strategyv1alpha1.CNPGTemplate, app *postgresapp.Postgr
 	if err != nil {
 		return nil, fmt.Errorf("encode application for templating: %w", err)
 	}
-	templateContext := map[string]interface{}{
+	templateContext := map[string]any{
 		"Application": appAsMap,
 		"Parameters":  parameters,
 	}
@@ -1182,12 +2134,12 @@ func renderCNPGTemplate(t strategyv1alpha1.CNPGTemplate, app *postgresapp.Postgr
 // so user-authored go-templates continue to address fields by their JSON
 // names (e.g. .Application.metadata.name) without leaking the Go struct
 // hierarchy to user-facing strategy templates.
-func toJSONMap(obj interface{}) (map[string]interface{}, error) {
+func toJSONMap(obj any) (map[string]any, error) {
 	raw, err := json.Marshal(obj)
 	if err != nil {
 		return nil, err
 	}
-	out := map[string]interface{}{}
+	out := map[string]any{}
 	if err := json.Unmarshal(raw, &out); err != nil {
 		return nil, err
 	}
@@ -1226,8 +2178,82 @@ func newCNPGClusterPatch(namespace, name string) *cnpgtypes.Cluster {
 	}
 }
 
+// newObjectStorePatch returns an empty typed ObjectStore addressed by
+// (namespace, name), TypeMeta set so the SSA Apply path can identify the kind.
+func newObjectStorePatch(namespace, name string) *cnpgtypes.ObjectStore {
+	return &cnpgtypes.ObjectStore{
+		TypeMeta: metav1.TypeMeta{
+			APIVersion: cnpgtypes.BarmanGroupVersion.String(),
+			Kind:       "ObjectStore",
+		},
+		ObjectMeta: metav1.ObjectMeta{Namespace: namespace, Name: name},
+	}
+}
+
+// buildBarmanPlugin returns the Cluster spec.plugins entry that routes
+// backup/WAL/recovery through the barman-cloud plugin, referencing the named
+// ObjectStore and (optionally) the per-server folder.
+func buildBarmanPlugin(objectStoreName, serverName string) cnpgtypes.PluginConfiguration {
+	isWALArchiver := true
+	params := map[string]string{barmanObjectNameParam: objectStoreName}
+	if serverName != "" {
+		params[barmanServerNameParam] = serverName
+	}
+	return cnpgtypes.PluginConfiguration{
+		Name:          cnpgtypes.PluginName,
+		IsWALArchiver: &isWALArchiver,
+		Parameters:    params,
+	}
+}
+
+// barmanSidecarConfiguration carries the two settings the barman-cloud sidecar
+// cannot get right on its own.
+//
+// Resources: the plugin injects the sidecar with no resources. This ObjectStore
+// lands in the application's namespace, and a tenant with resourceQuotas set
+// carries a LimitRange (packages/apps/tenant/templates/quota.yaml) that defaults
+// every container to 128Mi; the sidecar is OOMKilled mid-backup under it,
+// leaving the ObjectStore healthy and the backup failed. Measured cgroup
+// high-water mark on a 38 MB database is 254 MiB, so 128Mi cannot hold it. A
+// tenant that leaves resourceQuotas empty has no LimitRange, and there the
+// sidecar had no requests and no limit at all. 256Mi holds the measured working
+// set and 1Gi is four times the measurement. No CPU limit is set, matching the
+// entityOperator precedent in packages/apps/kafka: a throttled sidecar stalls
+// WAL archiving instead of failing it.
+//
+// Checksum: since botocore ~1.36 the default (when_supported) attaches a
+// flexible checksum to every PutObject, which non-AWS S3-compatible backends
+// (Ceph RGW, and the platform's own default SeaweedFS system bucket) reject
+// with "x-amz-content-sha256 must be UNSIGNED-PAYLOAD, ...". Compute a checksum
+// only when required; AWS S3 accepts that too, so it is a safe default
+// everywhere.
+//
+// This mirrors the chart-rendered ObjectStores, which take both fields from
+// cozy-lib.barman.sidecarConfiguration (packages/{apps/postgres,
+// system/keycloak}/templates/db.yaml), and the etcd-operator fix (#342).
+func barmanSidecarConfiguration() *cnpgtypes.InstanceSidecarConfiguration {
+	return &cnpgtypes.InstanceSidecarConfiguration{
+		Resources: corev1.ResourceRequirements{
+			Requests: corev1.ResourceList{
+				corev1.ResourceCPU:    resource.MustParse("100m"),
+				corev1.ResourceMemory: resource.MustParse("256Mi"),
+			},
+			Limits: corev1.ResourceList{
+				corev1.ResourceMemory: resource.MustParse("1Gi"),
+			},
+		},
+		Env: []cnpgtypes.EnvVar{{
+			Name:  "AWS_REQUEST_CHECKSUM_CALCULATION",
+			Value: "when_required",
+		}},
+	}
+}
+
 // buildBarmanObjectStore translates the typed strategy template into the
-// shape postgresql.cnpg.io expects for spec.backup.barmanObjectStore.
+// barman configuration shape shared by the deprecated
+// spec.backup.barmanObjectStore and the plugin's ObjectStore.spec.configuration.
+// Pass serverName="" when building an ObjectStore (the plugin forbids
+// serverName there and takes it from the Cluster plugin parameter).
 func buildBarmanObjectStore(t strategyv1alpha1.BarmanObjectStoreTemplate, serverName string) *cnpgtypes.BarmanObjectStoreConfiguration {
 	out := &cnpgtypes.BarmanObjectStoreConfiguration{
 		DestinationPath: t.DestinationPath,
@@ -1342,6 +2368,15 @@ func (o CNPGRestoreOptions) effectiveRestoreDeadline() time.Duration {
 	return cnpgDefaultRestoreDeadline
 }
 
+// effectiveBootstrapDisableGrace returns the fixed window the post-convergence
+// bootstrap-disable step keeps requeueing over a transient error before it
+// terminates the restore Failed. It is independent of restoreTimeoutSeconds:
+// that knob bounds the recovery wait, which is unrelated to how long a
+// control-plane blip takes to clear (see cnpgBootstrapDisableGrace).
+func (o CNPGRestoreOptions) effectiveBootstrapDisableGrace() time.Duration {
+	return cnpgBootstrapDisableGrace
+}
+
 // effectiveWALArchiveDeadline returns the configured WAL-archive gate
 // deadline, applying the driver's default when the option is unset or
 // non-positive.
diff --git a/internal/backupcontroller/cnpgstrategy_controller_test.go b/internal/backupcontroller/cnpgstrategy_controller_test.go
index f8ee1c7b93..697843d9e9 100644
--- a/internal/backupcontroller/cnpgstrategy_controller_test.go
+++ b/internal/backupcontroller/cnpgstrategy_controller_test.go
@@ -3,22 +3,26 @@ package backupcontroller
 
 import (
 	"context"
+	"fmt"
 	"strings"
 	"testing"
 	"time"
 
 	apiequality "k8s.io/apimachinery/pkg/api/equality"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	apimeta "k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/dynamic"
 	dynamicfake "k8s.io/client-go/dynamic/fake"
 	"k8s.io/client-go/kubernetes/scheme"
-	"k8s.io/utils/ptr"
+	"k8s.io/client-go/tools/record"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	clientfake "sigs.k8s.io/controller-runtime/pkg/client/fake"
+	"sigs.k8s.io/controller-runtime/pkg/client/interceptor"
 
 	corev1 "k8s.io/api/core/v1"
 
@@ -60,7 +64,7 @@ func TestBuildBarmanObjectStore_AllFields(t *testing.T) {
 			SecretAccessKey: &cnpgtypes.SecretKeySelector{Name: "creds", Key: defaultS3SecretAccessKeyKey},
 		},
 		Wal:  &cnpgtypes.WalBackupConfiguration{Compression: "gzip"},
-		Data: &cnpgtypes.DataBackupConfiguration{Compression: "gzip", Jobs: ptr.To(int32(4))},
+		Data: &cnpgtypes.DataBackupConfiguration{Compression: "gzip", Jobs: new(int32(4))},
 	}
 	if !apiequality.Semantic.DeepEqual(got, want) {
 		t.Fatalf("buildBarmanObjectStore mismatch\n got: %#v\nwant: %#v", got, want)
@@ -221,15 +225,16 @@ func TestRenderCNPGTemplate_RoundTripsParametersThroughSnapshot(t *testing.T) {
 	}
 
 	// Round-trip parameters through Backup.status.underlyingResources.
-	raw, err := marshalCNPGBackupSnapshot(app, parameters)
+	raw, err := marshalCNPGBackupSnapshot(app, parameters, "")
 	if err != nil {
 		t.Fatalf("marshal snapshot: %v", err)
 	}
 	bk := &backupsv1alpha1.Backup{Status: backupsv1alpha1.BackupStatus{UnderlyingResources: raw}}
-	_, _, gotParams, err := unmarshalCNPGBackupSnapshot(bk)
+	snap, err := unmarshalCNPGBackupSnapshot(bk)
 	if err != nil {
 		t.Fatalf("unmarshal snapshot: %v", err)
 	}
+	gotParams := snap.Parameters
 
 	// Restore-time render with retrieved parameters: same values out.
 	rendRestore, err := renderCNPGTemplate(tmpl, app, gotParams)
@@ -324,6 +329,35 @@ func TestEffectiveRestoreDeadline(t *testing.T) {
 	}
 }
 
+// TestEffectiveBootstrapDisableGrace pins that the post-convergence
+// bootstrap-disable window is a FIXED cnpgBootstrapDisableGrace, independent of
+// restoreTimeoutSeconds: that knob bounds the recovery wait, whereas this window
+// absorbs a control-plane blip whose duration is unrelated to it. A short timeout
+// must not shrink the window (a blip would then falsely fail a converged restore
+// and expose the healthy Cluster to a resubmit's purge-guard), and a long timeout
+// must not inflate it.
+func TestEffectiveBootstrapDisableGrace(t *testing.T) {
+	// The grace is a FIXED window, independent of restoreTimeoutSeconds: a short,
+	// a long and an unset recovery timeout all yield the same control-plane-blip
+	// window. Re-coupling it to the deadline turns these red.
+	cases := []struct {
+		name string
+		opts CNPGRestoreOptions
+	}{
+		{"unset", CNPGRestoreOptions{}},
+		{"short timeout", CNPGRestoreOptions{RestoreTimeoutSeconds: 60}},
+		{"long timeout", CNPGRestoreOptions{RestoreTimeoutSeconds: 7200}},
+	}
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			got := tc.opts.effectiveBootstrapDisableGrace()
+			if got != cnpgBootstrapDisableGrace {
+				t.Errorf("grace %s should be the fixed %s regardless of restoreTimeoutSeconds", got, cnpgBootstrapDisableGrace)
+			}
+		})
+	}
+}
+
 // TestEffectiveWALArchiveDeadline mirrors TestEffectiveRestoreDeadline for
 // the dedicated WAL-archive gate cap. The two deadlines exist independently
 // so a big-DB restore can extend RestoreTimeoutSeconds without simultaneously
@@ -488,9 +522,11 @@ func TestBuildPostgresAppRestorePatch_ForwardsSecretRef_NotCleartext(t *testing.
 	patched := buildPostgresAppRestorePatch(
 		app,
 		"pg-src",
+		"postgres-pg-target-restore-deadbeef",
 		"s3://bucket/pg-src/",
 		"https://s3.example",
 		"",
+		"",
 		creds,
 		nil,
 		nil, nil,
@@ -521,7 +557,7 @@ func TestBuildPostgresAppRestorePatch_ForwardsCustomKeyOverrides(t *testing.T) {
 		SecretAccessKeyKey: "SECRET_KEY",
 	}
 
-	patched := buildPostgresAppRestorePatch(app, "src", "s3://b/", "", "", creds, nil, nil, nil)
+	patched := buildPostgresAppRestorePatch(app, "src", "pg-new", "s3://b/", "", "", "", creds, nil, nil, nil)
 
 	want := postgresapp.S3CredentialsSecret{
 		Name:               "creds",
@@ -539,7 +575,7 @@ func TestBuildPostgresAppRestorePatch_ForwardsCustomKeyOverrides(t *testing.T) {
 // Secret name and helm install would fail.
 func TestBuildPostgresAppRestorePatch_NoSecretRefIsSkipped(t *testing.T) {
 	app := newPostgresApp("pg", "tenant")
-	patched := buildPostgresAppRestorePatch(app, "src", "s3://b/", "", "", nil, nil, nil, nil)
+	patched := buildPostgresAppRestorePatch(app, "src", "pg-new", "s3://b/", "", "", "", nil, nil, nil, nil)
 	if got := patched.Spec.Backup.S3CredentialsSecret; got != (postgresapp.S3CredentialsSecret{}) {
 		t.Errorf("spec.backup.s3CredentialsSecret must be zero when credsRef is nil; got %#v", got)
 	}
@@ -549,43 +585,162 @@ func TestBuildPostgresAppRestorePatch_NoSecretRefIsSkipped(t *testing.T) {
 // freshly-recovered Cluster on a status-update failure. The controller used
 // to rely solely on a Status condition: if the post-purge Status().Update
 // raced or failed, the next reconcile would re-purge the just-restored
-// Cluster, destroying recovery progress. Cross-checking the live Cluster's
-// bootstrap.recovery makes the second purge a no-op.
+// Cluster, destroying recovery progress. Cross-checking that the live
+// Cluster is a *freshly-recovered* one (bootstrap.recovery + created after
+// the job started) makes that second purge a no-op - while still purging a
+// stale recovery Cluster left over from an earlier completed restore, so a
+// repeat in-place restore is not a silent no-op.
 func TestCNPGPurgeNeeded(t *testing.T) {
 	cases := []struct {
-		name            string
-		purgedCondition bool
-		hasRecovery     bool
-		want            bool
+		name                        string
+		purgedCondition             bool
+		liveClusterFreshlyRecovered bool
+		want                        bool
+	}{
+		{
+			name:                        "fresh restore, old cluster still in place: purge",
+			purgedCondition:             false,
+			liveClusterFreshlyRecovered: false,
+			want:                        true,
+		},
+		{
+			name:                        "purge already recorded: skip",
+			purgedCondition:             true,
+			liveClusterFreshlyRecovered: false,
+			want:                        false,
+		},
+		{
+			name:                        "live cluster freshly recovered by this restore (status write raced): skip",
+			purgedCondition:             false,
+			liveClusterFreshlyRecovered: true,
+			want:                        false,
+		},
+		{
+			name:                        "stale recovery cluster from a previous completed restore: purge (repeat-restore fix)",
+			purgedCondition:             false,
+			liveClusterFreshlyRecovered: false,
+			want:                        true,
+		},
+		{
+			name:                        "both true: skip (post-purge steady state)",
+			purgedCondition:             true,
+			liveClusterFreshlyRecovered: true,
+			want:                        false,
+		},
+	}
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			got := cnpgPurgeNeeded(tc.purgedCondition, tc.liveClusterFreshlyRecovered)
+			if got != tc.want {
+				t.Errorf("got %v want %v", got, tc.want)
+			}
+		})
+	}
+}
+
+// TestCNPGClusterFreshlyRecovered locks in the signal that separates a
+// recovery Cluster THIS restore just produced from one rendered for another
+// restore. The repeat-in-place-restore bug was a stale recovery Cluster being
+// mistaken for a freshly-recovered one and skipping the purge; a Cluster
+// produced by a concurrent restore, or re-rendered from an earlier restore's
+// values, is created after StartedAt and must still be purged.
+func TestCNPGClusterFreshlyRecovered(t *testing.T) {
+	started := metav1.NewTime(time.Now())
+	after := metav1.NewTime(started.Add(time.Minute))
+	before := metav1.NewTime(started.Add(-time.Hour))
+	const ours = "postgres-app-restore-ours"
+	const other = "postgres-app-restore-other"
+
+	cases := []struct {
+		name      string
+		state     recoveryClusterState
+		appMark   string
+		startedAt *metav1.Time
+		want      bool
 	}{
 		{
-			name:            "fresh restore, old cluster still in place: purge",
-			purgedCondition: false,
-			hasRecovery:     false,
-			want:            true,
+			name:      "no recovery bootstrap: not fresh",
+			state:     recoveryClusterState{createdAt: &after, restoreMark: ours},
+			startedAt: &started,
+			want:      false,
+		},
+		{
+			name:      "marked by this restore: fresh",
+			state:     recoveryClusterState{hasRecovery: true, createdAt: &after, restoreMark: ours},
+			startedAt: &started,
+			want:      true,
+		},
+		{
+			name:      "marked by another restore, created after start (concurrent restore or re-render of an earlier restore): not fresh",
+			state:     recoveryClusterState{hasRecovery: true, createdAt: &after, restoreMark: other},
+			startedAt: &started,
+			want:      false,
+		},
+		{
+			name:      "marked by another restore, created before start (leftover from previous restore): not fresh",
+			state:     recoveryClusterState{hasRecovery: true, createdAt: &before, restoreMark: other},
+			startedAt: &started,
+			want:      false,
+		},
+		{
+			name:      "marked by this restore with no job start timestamp: fresh, the mark does not need one",
+			state:     recoveryClusterState{hasRecovery: true, createdAt: &after, restoreMark: ours},
+			startedAt: nil,
+			want:      true,
+		},
+		{
+			name:      "unmarked, created after start (our own re-render by an older chart): fresh",
+			state:     recoveryClusterState{hasRecovery: true, createdAt: &after},
+			appMark:   ours,
+			startedAt: &started,
+			want:      true,
+		},
+		{
+			name:      "unmarked, created after start, values not patched by this restore (manual recovery re-rendered): not fresh",
+			state:     recoveryClusterState{hasRecovery: true, createdAt: &after},
+			appMark:   "",
+			startedAt: &started,
+			want:      false,
+		},
+		{
+			name:      "unmarked, created after start, values patched by another restore: not fresh",
+			state:     recoveryClusterState{hasRecovery: true, createdAt: &after},
+			appMark:   other,
+			startedAt: &started,
+			want:      false,
+		},
+		{
+			name:      "unmarked, created before start (leftover from previous restore): not fresh",
+			state:     recoveryClusterState{hasRecovery: true, createdAt: &before},
+			appMark:   ours,
+			startedAt: &started,
+			want:      false,
 		},
 		{
-			name:            "purge already recorded: skip",
-			purgedCondition: true,
-			hasRecovery:     false,
-			want:            false,
+			name:      "unmarked, created exactly at start: not fresh (conservative tie -> purge)",
+			state:     recoveryClusterState{hasRecovery: true, createdAt: &started},
+			appMark:   ours,
+			startedAt: &started,
+			want:      false,
 		},
 		{
-			name:            "live cluster already recovered (status write raced): skip - the bug fix",
-			purgedCondition: false,
-			hasRecovery:     true,
-			want:            false,
+			name:      "unmarked, missing cluster creation timestamp: not fresh",
+			state:     recoveryClusterState{hasRecovery: true},
+			appMark:   ours,
+			startedAt: &started,
+			want:      false,
 		},
 		{
-			name:            "both true: skip (post-purge steady state)",
-			purgedCondition: true,
-			hasRecovery:     true,
-			want:            false,
+			name:      "unmarked, missing job start timestamp: not fresh",
+			state:     recoveryClusterState{hasRecovery: true, createdAt: &after},
+			appMark:   ours,
+			startedAt: nil,
+			want:      false,
 		},
 	}
 	for _, tc := range cases {
 		t.Run(tc.name, func(t *testing.T) {
-			got := cnpgPurgeNeeded(tc.purgedCondition, tc.hasRecovery)
+			got := cnpgClusterFreshlyRecovered(tc.state, ours, tc.appMark, tc.startedAt)
 			if got != tc.want {
 				t.Errorf("got %v want %v", got, tc.want)
 			}
@@ -598,35 +753,35 @@ func TestCNPGPurgeNeeded(t *testing.T) {
 // databases must be wiped and replaced with source's exact map. The
 // recovered cluster carries source's role catalog and data; if target's
 // pre-restore drift survives, the chart's init-job either tries to
-// re-create roles against the wrong data or leaks cleartext passwords
-// from a previous tenant configuration.
+// re-create roles against the wrong data or resurrects a role a previous
+// tenant configuration had dropped.
 func TestBuildPostgresAppRestorePatch_ReplacesTargetUsersAndDatabases(t *testing.T) {
 	app := newPostgresApp("pg-target", "tenant")
 	// Target had pre-existing users/databases (e.g. from a previous restore
 	// or operator drift). Replace must wipe them.
 	app.Spec.Users = map[string]postgresapp.User{
-		"stale-target-user": {Password: "leak-me"},
+		"stale-target-user": {Replication: true},
 	}
 	app.Spec.Databases = map[string]postgresapp.Database{
 		"stale-target-db": {Extensions: []string{"pgcrypto"}},
 	}
 
 	sourceUsers := map[string]postgresapp.User{
-		"app": {Password: "src"},
+		"app": {Replication: true},
 	}
 	sourceDatabases := map[string]postgresapp.Database{
 		"appdb": {Extensions: []string{"hstore"}},
 	}
 
-	patched := buildPostgresAppRestorePatch(app, "src", "s3://b/", "", "", nil, nil, sourceDatabases, sourceUsers)
+	patched := buildPostgresAppRestorePatch(app, "src", "pg-new", "s3://b/", "", "", "", nil, nil, sourceDatabases, sourceUsers)
 
 	if _, ok := patched.Spec.Users["stale-target-user"]; ok {
 		t.Errorf("stale target user survived restore; replace semantics regressed")
 	}
 	if u, ok := patched.Spec.Users["app"]; !ok {
 		t.Errorf("source user was not propagated onto target")
-	} else if u.Password != "src" {
-		t.Errorf("source user password mismatch; got %q want %q", u.Password, "src")
+	} else if !u.Replication {
+		t.Errorf("source user attributes not propagated; got %#v", u)
 	}
 	if _, ok := patched.Spec.Databases["stale-target-db"]; ok {
 		t.Errorf("stale target database survived restore; replace semantics regressed")
@@ -644,6 +799,7 @@ func TestBuildPostgresAppRestorePatch_ReplacesTargetUsersAndDatabases(t *testing
 func TestBuildPostgresAppRestorePatch_ScrubsStaleBackupSettings(t *testing.T) {
 	app := newPostgresApp("pg-target", "tenant")
 	app.Spec.Bootstrap.RecoveryTime = "2025-01-01T00:00:00Z"
+	app.Spec.Backup.UseSystemBucket = true
 	app.Spec.Backup.EndpointURL = "https://stale.example"
 	app.Spec.Backup.S3AccessKey = "stale-ak"
 	app.Spec.Backup.S3SecretKey = "stale-sk"
@@ -654,7 +810,7 @@ func TestBuildPostgresAppRestorePatch_ScrubsStaleBackupSettings(t *testing.T) {
 
 	// Restore with no recoveryTime, no endpointURL, no creds, no CA -
 	// everything stale on the target must be wiped.
-	patched := buildPostgresAppRestorePatch(app, "src", "s3://b/", "", "", nil, nil, nil, nil)
+	patched := buildPostgresAppRestorePatch(app, "src", "pg-new", "s3://b/", "", "", "", nil, nil, nil, nil)
 
 	if got := patched.Spec.Bootstrap.RecoveryTime; got != "" {
 		t.Errorf("stale recoveryTime survived; got %q", got)
@@ -674,6 +830,11 @@ func TestBuildPostgresAppRestorePatch_ScrubsStaleBackupSettings(t *testing.T) {
 	if patched.Spec.Backup.EndpointCA != (postgresapp.EndpointCA{}) {
 		t.Errorf("stale endpointCA survived; got %+v", patched.Spec.Backup.EndpointCA)
 	}
+	// A system-bucket source must be flipped to the explicit-creds path, or the
+	// chart's bootstrap.enabled + useSystemBucket guard wedges the restore.
+	if patched.Spec.Backup.UseSystemBucket {
+		t.Errorf("useSystemBucket must be cleared on restore so the bootstrap guard passes")
+	}
 }
 
 // TestBuildPostgresAppRestorePatch_ForwardsEndpointCA verifies that a
@@ -688,7 +849,7 @@ func TestBuildPostgresAppRestorePatch_ForwardsEndpointCA(t *testing.T) {
 		SecretRef: corev1.LocalObjectReference{Name: "pg-cnpg-backup-ca"},
 		Key:       "ca.crt",
 	}
-	patched := buildPostgresAppRestorePatch(app, "src", "s3://b/", "", "", nil, caRef, nil, nil)
+	patched := buildPostgresAppRestorePatch(app, "src", "pg-new", "s3://b/", "", "", "", nil, caRef, nil, nil)
 
 	want := postgresapp.EndpointCA{Name: "pg-cnpg-backup-ca", Key: "ca.crt"}
 	if got := patched.Spec.Backup.EndpointCA; got != want {
@@ -696,6 +857,50 @@ func TestBuildPostgresAppRestorePatch_ForwardsEndpointCA(t *testing.T) {
 	}
 }
 
+// TestBuildPostgresAppRestorePatch_ArchiveServerNameDiffersFromSource guards the
+// in-place restore fix: the restored cluster archives under bootstrap.newServerName,
+// distinct from the recovery source (bootstrap.serverName / oldName).
+func TestBuildPostgresAppRestorePatch_ArchiveServerNameDiffersFromSource(t *testing.T) {
+	app := newPostgresApp("pg", "tenant")
+	// An in-place restore is the worst case: source serverName equals the
+	// target cluster's own name.
+	const source = "postgres-pg"
+	patched := buildPostgresAppRestorePatch(app, source, "postgres-pg-restore-deadbeef", "s3://b/", "", "", "", nil, nil, nil, nil)
+
+	if got := patched.Spec.Bootstrap.ServerName; got != source {
+		t.Errorf("recovery serverName must stay the source; got %q want %q", got, source)
+	}
+	if got := patched.Spec.Bootstrap.OldName; got != source {
+		t.Errorf("recovery oldName must stay the source; got %q want %q", got, source)
+	}
+	if got := patched.Spec.Bootstrap.NewServerName; got == "" || got == source {
+		t.Errorf("archive newServerName must be non-empty and differ from the source %q; got %q", source, got)
+	}
+}
+
+// TestRestoredServerName pins the archive-prefix generator: deterministic per
+// RestoreJob UID, distinct across UIDs, and never equal to the plain cluster
+// name (which is the source serverName on an in-place restore).
+func TestRestoredServerName(t *testing.T) {
+	const cluster = "postgres-pg"
+	a1 := restoredServerName(cluster, types.UID("3c2ee41b-346f-4ae2-98d2-5d629c96f744"))
+	a2 := restoredServerName(cluster, types.UID("3c2ee41b-346f-4ae2-98d2-5d629c96f744"))
+	b := restoredServerName(cluster, types.UID("9eb8feed-7d49-467e-b719-d1896c0602d5"))
+
+	if a1 != a2 {
+		t.Errorf("not deterministic for a fixed UID: %q vs %q", a1, a2)
+	}
+	if a1 == b {
+		t.Errorf("distinct UIDs must yield distinct serverNames; both %q", a1)
+	}
+	if a1 == cluster {
+		t.Errorf("restored serverName must never equal the plain cluster name %q", cluster)
+	}
+	if !strings.HasPrefix(a1, cluster+"-restore-") {
+		t.Errorf("restored serverName %q must carry the %q-restore- prefix", a1, cluster)
+	}
+}
+
 // TestMarshalUnmarshalCNPGBackupSnapshot round-trips the source-spec
 // snapshot persisted in Backup.status.underlyingResources, including the
 // BackupClassStrategy parameters that were in effect at backup time -
@@ -708,14 +913,14 @@ func TestMarshalUnmarshalCNPGBackupSnapshot(t *testing.T) {
 		"app": {Extensions: []string{"pgcrypto"}},
 	}
 	src.Spec.Users = map[string]postgresapp.User{
-		"app": {Password: "p"},
+		"app": {Replication: true},
 	}
 	parameters := map[string]string{
 		"credsSecret": "tenant-shared-creds",
 		"region":      "eu-west-1",
 	}
 
-	raw, err := marshalCNPGBackupSnapshot(src, parameters)
+	raw, err := marshalCNPGBackupSnapshot(src, parameters, "")
 	if err != nil {
 		t.Fatalf("marshal: %v", err)
 	}
@@ -724,14 +929,15 @@ func TestMarshalUnmarshalCNPGBackupSnapshot(t *testing.T) {
 	}
 
 	bk := &backupsv1alpha1.Backup{Status: backupsv1alpha1.BackupStatus{UnderlyingResources: raw}}
-	dbs, users, params, err := unmarshalCNPGBackupSnapshot(bk)
+	snap, err := unmarshalCNPGBackupSnapshot(bk)
 	if err != nil {
 		t.Fatalf("unmarshal: %v", err)
 	}
+	dbs, users, params := snap.Databases, snap.Users, snap.Parameters
 	if dbs["app"].Extensions[0] != "pgcrypto" {
 		t.Errorf("databases round-trip mismatch: %#v", dbs)
 	}
-	if users["app"].Password != "p" {
+	if !users["app"].Replication {
 		t.Errorf("users round-trip mismatch: %#v", users)
 	}
 	if params["credsSecret"] != "tenant-shared-creds" {
@@ -752,12 +958,17 @@ func TestMarshalUnmarshalCNPGBackupSnapshot(t *testing.T) {
 func TestMarshalUnmarshalCNPGBackupSnapshot_BackwardCompat(t *testing.T) {
 	legacyRaw := []byte(`{"kind":"CNPGBackupSnapshot","apiVersion":"backups.cozystack.io/v1alpha1","databases":{"app":{}},"users":{"app":{}}}`)
 	bk := &backupsv1alpha1.Backup{Status: backupsv1alpha1.BackupStatus{UnderlyingResources: &runtime.RawExtension{Raw: legacyRaw}}}
-	_, _, params, err := unmarshalCNPGBackupSnapshot(bk)
+	snap, err := unmarshalCNPGBackupSnapshot(bk)
 	if err != nil {
 		t.Fatalf("unmarshal legacy snapshot: %v", err)
 	}
-	if len(params) != 0 {
-		t.Errorf("legacy snapshot must yield empty parameters, got %#v", params)
+	if len(snap.Parameters) != 0 {
+		t.Errorf("legacy snapshot must yield empty parameters, got %#v", snap.Parameters)
+	}
+	// Flavors did not exist when this snapshot was written: every cluster
+	// ran postgresql, and the restore flavor check must read it that way.
+	if got := cnpgFlavor(snap.Flavor); got != "postgresql" {
+		t.Errorf("legacy snapshot must resolve to the postgresql flavor, got %q", got)
 	}
 }
 
@@ -778,7 +989,7 @@ func TestUnmarshalCNPGBackupSnapshot_RejectsMissingOrWrongKind(t *testing.T) {
 	for _, tc := range cases {
 		t.Run(tc.name, func(t *testing.T) {
 			bk := &backupsv1alpha1.Backup{Status: backupsv1alpha1.BackupStatus{UnderlyingResources: tc.ur}}
-			_, _, _, err := unmarshalCNPGBackupSnapshot(bk)
+			_, err := unmarshalCNPGBackupSnapshot(bk)
 			if err == nil {
 				t.Fatalf("expected error, got nil")
 			}
@@ -862,7 +1073,7 @@ func TestCreateCNPGBackupArtifact_AlreadyExistsReturnsExisting(t *testing.T) {
 	}
 
 	sourceApp := newPostgresApp("pg", "tenant")
-	got, err := r.createCNPGBackupArtifact(context.Background(), j, resolved, cnpgBk, "postgres-pg", "postgres-pg", rendered, sourceApp)
+	got, err := r.createCNPGBackupArtifact(context.Background(), j, resolved, cnpgBk, "postgres-pg", "postgres-pg", "postgresql", rendered, sourceApp)
 	if err != nil {
 		t.Fatalf("expected AlreadyExists to be swallowed, got error %v", err)
 	}
@@ -874,22 +1085,21 @@ func TestCreateCNPGBackupArtifact_AlreadyExistsReturnsExisting(t *testing.T) {
 	}
 }
 
-// TestApplyClusterBarmanObjectStore_NotFoundOnMissingCluster locks in the
-// precondition added for the smaller blocker on applyClusterBarmanObjectStore:
-// when the live cnpg.io Cluster has not yet been rendered by the chart, the
-// driver must surface NotFound (so the caller can retry-with-backoff)
-// instead of issuing a doomed SSA Apply that would be rejected by the API
-// server for missing required Cluster fields.
-func TestApplyClusterBarmanObjectStore_NotFoundOnMissingCluster(t *testing.T) {
+// TestApplyClusterPluginBackup_NotFoundOnMissingCluster locks in the
+// precondition on applyClusterPluginBackup: when the live cnpg.io Cluster has
+// not yet been rendered by the chart, the driver must surface NotFound (so the
+// caller can retry-with-backoff) instead of issuing a doomed SSA Apply that
+// would be rejected by the API server for missing required Cluster fields.
+func TestApplyClusterPluginBackup_NotFoundOnMissingCluster(t *testing.T) {
 	c := newCNPGStrategyTestClient(t)
-	r := &BackupJobReconciler{Client: c}
+	r := &BackupJobReconciler{Client: c, Interface: cnpgDynamicFor(t)}
 	tmpl := &strategyv1alpha1.CNPGTemplate{
 		BarmanObjectStore: strategyv1alpha1.BarmanObjectStoreTemplate{
 			DestinationPath: "s3://bucket/x/",
 		},
 	}
 
-	err := r.applyClusterBarmanObjectStore(context.Background(), "tenant", "postgres-missing", tmpl, "postgres-missing")
+	_, err := r.applyClusterPluginBackup(context.Background(), "tenant", "postgres-missing", tmpl, "postgres-missing", true)
 	if err == nil {
 		t.Fatalf("expected NotFound error, got nil")
 	}
@@ -898,7 +1108,7 @@ func TestApplyClusterBarmanObjectStore_NotFoundOnMissingCluster(t *testing.T) {
 	}
 }
 
-// TestClusterHasRecoveryBootstrap_TerminatingCluster locks in the
+// TestRecoveryBootstrapClusterState_TerminatingCluster locks in the
 // DeletionTimestamp guard. Without it, a Cluster CR mid-deletion (after
 // purgeExistingCluster fired r.Delete but cnpg.io's finalizers haven't
 // drained yet) would get treated as "still has bootstrap" by the
@@ -907,7 +1117,7 @@ func TestApplyClusterBarmanObjectStore_NotFoundOnMissingCluster(t *testing.T) {
 // might SSA-merge the chart's bootstrap.recovery onto the terminating
 // CR and cnpg-operator's bootstrap-immutability check would drop the
 // change, leaving the cluster on the original initdb spec.
-func TestClusterHasRecoveryBootstrap_TerminatingCluster(t *testing.T) {
+func TestRecoveryBootstrapClusterState_TerminatingCluster(t *testing.T) {
 	now := metav1.Now()
 	t.Run("terminating cluster reports not-yet-recovered", func(t *testing.T) {
 		cluster := &cnpgtypes.Cluster{
@@ -925,18 +1135,24 @@ func TestClusterHasRecoveryBootstrap_TerminatingCluster(t *testing.T) {
 		}
 		c := newCNPGStrategyTestClient(t, cluster)
 		r := &RestoreJobReconciler{Client: c}
-		got, err := r.clusterHasRecoveryBootstrap(context.Background(), "tenant", "postgres-app")
+		got, err := r.recoveryBootstrapClusterState(context.Background(), "tenant", "postgres-app")
 		if err != nil {
 			t.Fatalf("unexpected error: %v", err)
 		}
-		if got {
-			t.Fatalf("expected false for terminating cluster, got true")
+		if got != (recoveryClusterState{}) {
+			t.Fatalf("expected the zero state for a terminating cluster, got %+v", got)
 		}
 	})
 
-	t.Run("live recovery cluster reports recovered", func(t *testing.T) {
+	t.Run("live recovery cluster reports recovered with creation timestamp", func(t *testing.T) {
+		created := metav1.NewTime(time.Now().Add(-time.Hour))
 		cluster := &cnpgtypes.Cluster{
-			ObjectMeta: metav1.ObjectMeta{Namespace: "tenant", Name: "postgres-app"},
+			ObjectMeta: metav1.ObjectMeta{
+				Namespace:         "tenant",
+				Name:              "postgres-app",
+				CreationTimestamp: created,
+				Annotations:       map[string]string{cnpgRestoredServerNameAnnotation: "postgres-app-restore-0123456789abcdef"},
+			},
 			Spec: cnpgtypes.ClusterSpec{
 				Bootstrap: &cnpgtypes.BootstrapConfiguration{
 					Recovery: &cnpgtypes.RecoverySource{Source: "pg-src"},
@@ -945,24 +1161,30 @@ func TestClusterHasRecoveryBootstrap_TerminatingCluster(t *testing.T) {
 		}
 		c := newCNPGStrategyTestClient(t, cluster)
 		r := &RestoreJobReconciler{Client: c}
-		got, err := r.clusterHasRecoveryBootstrap(context.Background(), "tenant", "postgres-app")
+		got, err := r.recoveryBootstrapClusterState(context.Background(), "tenant", "postgres-app")
 		if err != nil {
 			t.Fatalf("unexpected error: %v", err)
 		}
-		if !got {
-			t.Fatalf("expected true for live recovery cluster, got false")
+		if !got.hasRecovery {
+			t.Fatalf("expected hasRecovery for live recovery cluster, got false")
+		}
+		if got.createdAt == nil {
+			t.Fatalf("expected non-nil createdAt for live recovery cluster")
+		}
+		if got.restoreMark != "postgres-app-restore-0123456789abcdef" {
+			t.Fatalf("restoreMark = %q, want the %s annotation", got.restoreMark, cnpgRestoredServerNameAnnotation)
 		}
 	})
 
 	t.Run("missing cluster reports not-yet", func(t *testing.T) {
 		c := newCNPGStrategyTestClient(t)
 		r := &RestoreJobReconciler{Client: c}
-		got, err := r.clusterHasRecoveryBootstrap(context.Background(), "tenant", "postgres-app")
+		got, err := r.recoveryBootstrapClusterState(context.Background(), "tenant", "postgres-app")
 		if err != nil {
 			t.Fatalf("unexpected error: %v", err)
 		}
-		if got {
-			t.Fatalf("expected false for missing cluster, got true")
+		if got != (recoveryClusterState{}) {
+			t.Fatalf("expected the zero state for a missing cluster, got %+v", got)
 		}
 	})
 }
@@ -1106,7 +1328,7 @@ func TestSetCNPGRestoreHRSuspended(t *testing.T) {
 		hr.SetGroupVersionKind(schema.GroupVersionKind{Group: "helm.toolkit.fluxcd.io", Version: "v2", Kind: "HelmRelease"})
 		hr.SetNamespace(ns)
 		hr.SetName(name)
-		spec := map[string]interface{}{}
+		spec := map[string]any{}
 		if suspended != nil {
 			spec["suspend"] = *suspended
 		}
@@ -1259,155 +1481,848 @@ func TestCNPGClusterFullyGone(t *testing.T) {
 	})
 }
 
-// testCNPGScheme returns a runtime.Scheme that knows the unstructured
-// HelmRelease GVK used by the dynamic-client tests above.
-func testCNPGScheme(t *testing.T) *runtime.Scheme {
-	t.Helper()
-	s := runtime.NewScheme()
-	_ = scheme.AddToScheme(s)
-	s.AddKnownTypeWithName(schema.GroupVersionKind{Group: "helm.toolkit.fluxcd.io", Version: "v2", Kind: "HelmRelease"}, &unstructured.Unstructured{})
-	s.AddKnownTypeWithName(schema.GroupVersionKind{Group: "helm.toolkit.fluxcd.io", Version: "v2", Kind: "HelmReleaseList"}, &unstructured.UnstructuredList{})
-	return s
-}
-
-// TestApplyClusterBarmanObjectStore_PatchesExistingCluster confirms the
-// precondition does not regress the happy path: when the Cluster exists
-// the driver still SSA-patches spec.backup.barmanObjectStore.
-func TestApplyClusterBarmanObjectStore_PatchesExistingCluster(t *testing.T) {
-	cluster := &cnpgtypes.Cluster{
-		ObjectMeta: metav1.ObjectMeta{Namespace: "tenant", Name: "postgres-app"},
-	}
-	c := newCNPGStrategyTestClient(t, cluster)
-	r := &BackupJobReconciler{Client: c}
-	tmpl := &strategyv1alpha1.CNPGTemplate{
-		BarmanObjectStore: strategyv1alpha1.BarmanObjectStoreTemplate{
-			DestinationPath: "s3://bucket/x/",
-			RetentionPolicy: "30d",
+func TestLogIndicatesRecoveryTargetUnreachable(t *testing.T) {
+	cases := []struct {
+		name string
+		log  string
+		want bool
+	}{
+		{
+			name: "empty log",
+			log:  "",
+			want: false,
+		},
+		{
+			name: "healthy replay progress",
+			log:  "LOG: restored log file \"000000010000000000000005\" from archive\nLOG: consistent recovery state reached",
+			want: false,
+		},
+		{
+			name: "transient recovery-pod crash (API unreachable) does not match",
+			log:  `{"level":"error","msg":"while building the manager","error":"failed to get server groups: Get \"https://10.96.0.1:443/api\": dial tcp 10.96.0.1:443: i/o timeout"}`,
+			want: false,
+		},
+		{
+			name: "target unreachable FATAL matches",
+			log:  "LOG:  redo done at 0/50000A8\nFATAL:  recovery ended before configured recovery target was reached\nLOG:  startup process exited with exit code 1",
+			want: true,
+		},
+		{
+			name: "target unreachable FATAL embedded in JSON log line matches",
+			log:  `{"level":"info","record":{"error_severity":"FATAL","message":"recovery ended before configured recovery target was reached"}}`,
+			want: true,
 		},
 	}
-
-	if err := r.applyClusterBarmanObjectStore(context.Background(), "tenant", "postgres-app", tmpl, "postgres-app"); err != nil {
-		t.Fatalf("unexpected error: %v", err)
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			if got := logIndicatesRecoveryTargetUnreachable(tc.log); got != tc.want {
+				t.Fatalf("logIndicatesRecoveryTargetUnreachable(%q) = %v, want %v", tc.log, got, tc.want)
+			}
+		})
 	}
+}
 
-	got := &cnpgtypes.Cluster{}
-	if err := c.Get(context.Background(), client.ObjectKeyFromObject(cluster), got); err != nil {
-		t.Fatalf("get cluster after patch: %v", err)
-	}
-	if got.Spec.Backup == nil || got.Spec.Backup.BarmanObjectStore == nil {
-		t.Fatalf("expected spec.backup.barmanObjectStore to be set, got %+v", got.Spec.Backup)
-	}
-	if got.Spec.Backup.BarmanObjectStore.DestinationPath != "s3://bucket/x/" {
-		t.Errorf("destinationPath: got %q", got.Spec.Backup.BarmanObjectStore.DestinationPath)
+// TestRecoveryUnreachableFromLogs: any recovery log carrying the unreachable-
+// target FATAL classifies the (already deadline-expired) restore as
+// target-unreachable; logs without it do not.
+func TestRecoveryUnreachableFromLogs(t *testing.T) {
+	fatal := "LOG: redo done\nFATAL:  " + cnpgRecoveryTargetUnreachableLog
+	healthy := "LOG: restored log file from archive\nLOG: consistent recovery state reached"
+	cases := []struct {
+		name string
+		logs []string
+		want bool
+	}{
+		{"no logs", nil, false},
+		{"only healthy/progress logs", []string{healthy, healthy}, false},
+		{"a FATAL among others", []string{healthy, fatal}, true},
+		{"all FATAL", []string{fatal, fatal}, true},
 	}
-	if got.Spec.Backup.RetentionPolicy != "30d" {
-		t.Errorf("retentionPolicy: got %q", got.Spec.Backup.RetentionPolicy)
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			if got := recoveryUnreachableFromLogs(tc.logs); got != tc.want {
+				t.Fatalf("recoveryUnreachableFromLogs = %v, want %v", got, tc.want)
+			}
+		})
 	}
 }
 
-// TestReconcileCNPG_StartedAtPreservedAcrossStaleCache locks in the bug fix
-// for the StartedAt race called out in the branch review: a second reconcile
-// with a stale local copy (which observes StartedAt==nil) must NOT advance
-// the persisted timestamp the first reconcile already wrote. Without the
-// refetch-before-write guard, the wall-clock deadline gate slides forward
-// on every poll, defeating the purpose of cnpgDefaultBackupDeadline.
-func TestReconcileCNPG_StartedAtPreservedAcrossStaleCache(t *testing.T) {
-	// metav1.Time loses sub-second precision on JSON round-trip; truncate
-	// upfront so the equality check below isn't fooled by nanosecond drift.
-	original := metav1.NewTime(time.Now().Add(-10 * time.Minute).Truncate(time.Second))
-	stored := &backupsv1alpha1.BackupJob{
-		ObjectMeta: metav1.ObjectMeta{Namespace: "tenant", Name: "bj"},
-		Status: backupsv1alpha1.BackupJobStatus{
-			StartedAt: &original,
-		},
+// TestRecoveryPodsToInspect pins the filter/order/cap contract of the pod
+// selection the fail-fast guard relies on: only full-recovery pods, newest
+// first, capped at cnpgRecoveryMaxInspectPods. A regression here (wrong sort
+// direction, off-by-one cap, broken container filter) would silently degrade
+// the fail-fast back into a 30-minute deadline hang.
+func TestRecoveryPodsToInspect(t *testing.T) {
+	recoveryPod := func(name string, ageSeconds int64) corev1.Pod {
+		return corev1.Pod{
+			ObjectMeta: metav1.ObjectMeta{
+				Name:              name,
+				CreationTimestamp: metav1.NewTime(time.Unix(ageSeconds, 0)),
+			},
+			Spec: corev1.PodSpec{Containers: []corev1.Container{{Name: cnpgRecoveryContainerName}}},
+		}
 	}
-	c := newCNPGStrategyTestClient(t, stored)
-	r := &BackupJobReconciler{Client: c}
 
-	// Stale local copy as the reconcile would have observed it: StartedAt==nil.
-	stale := stored.DeepCopy()
-	stale.Status.StartedAt = nil
+	t.Run("no pods -> empty", func(t *testing.T) {
+		if got := recoveryPodsToInspect(nil); len(got) != 0 {
+			t.Fatalf("expected empty, got %d", len(got))
+		}
+	})
 
-	// Inline the refetch-before-write block from reconcileCNPG. (The full
-	// reconciler path requires more wiring than this lightweight test
-	// builds; the block under test is the bug-fix surface, not the
-	// surrounding decode/template logic.)
-	fresh := &backupsv1alpha1.BackupJob{}
-	if err := r.Get(context.Background(), client.ObjectKeyFromObject(stored), fresh); err != nil {
-		t.Fatalf("get fresh: %v", err)
-	}
-	if fresh.Status.StartedAt != nil {
-		stale.Status.StartedAt = fresh.Status.StartedAt
-	} else {
-		base := fresh.DeepCopy()
-		now := metav1.Now()
-		fresh.Status.StartedAt = &now
-		if err := r.Status().Patch(context.Background(), fresh, client.MergeFrom(base)); err != nil {
-			t.Fatalf("patch: %v", err)
+	t.Run("skips non-recovery pods (no full-recovery container)", func(t *testing.T) {
+		pods := []corev1.Pod{
+			recoveryPod("rec-1", 100),
+			{
+				ObjectMeta: metav1.ObjectMeta{Name: "primary-newest", CreationTimestamp: metav1.NewTime(time.Unix(999, 0))},
+				Spec:       corev1.PodSpec{Containers: []corev1.Container{{Name: "postgres"}}},
+			},
 		}
-		stale.Status.StartedAt = fresh.Status.StartedAt
-	}
+		got := recoveryPodsToInspect(pods)
+		if len(got) != 1 || got[0].Name != "rec-1" {
+			t.Fatalf("expected only the full-recovery pod, got %v", names(got))
+		}
+	})
 
-	got := &backupsv1alpha1.BackupJob{}
-	if err := c.Get(context.Background(), client.ObjectKeyFromObject(stored), got); err != nil {
-		t.Fatalf("get after fix: %v", err)
-	}
-	if got.Status.StartedAt == nil || !got.Status.StartedAt.Equal(&original) {
-		t.Errorf("persisted StartedAt was advanced by stale-cache reconcile; got %v, want %v",
-			got.Status.StartedAt, original)
-	}
-	if stale.Status.StartedAt == nil || !stale.Status.StartedAt.Equal(&original) {
-		t.Errorf("local copy did not pick up persisted StartedAt; got %v, want %v",
-			stale.Status.StartedAt, original)
-	}
+	t.Run("newest-first order and cap at cnpgRecoveryMaxInspectPods", func(t *testing.T) {
+		// Seed two more recovery pods than the cap, out of order, plus a
+		// non-recovery pod that is the newest of all (must be excluded). The
+		// result must be exactly the cap-many newest recovery pods, newest-first.
+		n := cnpgRecoveryMaxInspectPods + 2
+		var pods []corev1.Pod
+		for i := range n {
+			// age i*100 so higher i == newer.
+			pods = append(pods, recoveryPod(fmt.Sprintf("rec-%d", i), int64(i*100)))
+		}
+		pods = append(pods, corev1.Pod{
+			ObjectMeta: metav1.ObjectMeta{Name: "primary", CreationTimestamp: metav1.NewTime(time.Unix(9_999_999, 0))},
+			Spec:       corev1.PodSpec{Containers: []corev1.Container{{Name: "postgres"}}},
+		})
+		got := recoveryPodsToInspect(pods)
+		want := make([]string, 0, cnpgRecoveryMaxInspectPods)
+		for i := range cnpgRecoveryMaxInspectPods {
+			want = append(want, fmt.Sprintf("rec-%d", n-1-i)) // newest-first
+		}
+		if gotNames := names(got); !equalStrings(gotNames, want) {
+			t.Fatalf("expected %v, got %v", want, gotNames)
+		}
+	})
 }
 
-// TestReconcileCNPG_StartedAtReturnsEarlyToAvoidStaleResourceVersion locks
-// in the early-return after the StartedAt patch. Before the fix, reconcileCNPG
-// patched StartedAt onto a refetched copy and then continued the same call
-// using the local `j` whose ResourceVersion was stale, so any subsequent
-// r.Status().Update on `j` (e.g. the markBackupJobFailed path or the
-// ClusterNotReady condition write) carried a pre-patch RV and produced a
-// Conflict on the very first poll. The fix returns RequeueAfter immediately
-// after the StartedAt patch so the next reconcile reads `j` cleanly.
-func TestReconcileCNPG_StartedAtReturnsEarlyToAvoidStaleResourceVersion(t *testing.T) {
-	apiGroup := backupsv1alpha1.DefaultApplicationAPIGroup
-	strategyGroup := strategyv1alpha1.GroupVersion.Group
-
-	stored := &backupsv1alpha1.BackupJob{
-		ObjectMeta: metav1.ObjectMeta{Namespace: "tenant", Name: "bj"},
-		Spec: backupsv1alpha1.BackupJobSpec{
-			ApplicationRef: corev1.TypedLocalObjectReference{APIGroup: &apiGroup, Kind: postgresAppKind, Name: "pg"},
-		},
+func names(pods []*corev1.Pod) []string {
+	out := make([]string, len(pods))
+	for i, p := range pods {
+		out[i] = p.Name
 	}
-	c := newCNPGStrategyTestClient(t, stored)
-	r := &BackupJobReconciler{Client: c}
+	return out
+}
 
-	j := stored.DeepCopy()
-	resolved := &ResolvedBackupConfig{
-		StrategyRef: corev1.TypedLocalObjectReference{
-			APIGroup: &strategyGroup,
-			Kind:     strategyv1alpha1.CNPGStrategyKind,
-			Name:     "missing-strategy",
-		},
+func equalStrings(a, b []string) bool {
+	if len(a) != len(b) {
+		return false
+	}
+	for i := range a {
+		if a[i] != b[i] {
+			return false
+		}
 	}
+	return true
+}
 
-	result, err := r.reconcileCNPG(context.Background(), j, resolved)
+// recoveryTargetUnreachable is nil-safe when no Clientset is wired, so the
+// deadline stays the backstop instead of the driver panicking.
+func TestRecoveryTargetUnreachable_NilClientsetReportsFalse(t *testing.T) {
+	r := &RestoreJobReconciler{Client: newCNPGStrategyTestClient(t)}
+	unreachable, pod, forbidden, err := r.recoveryTargetUnreachable(context.Background(), "tenant", "postgres-app")
 	if err != nil {
-		t.Fatalf("reconcileCNPG: unexpected error %v", err)
+		t.Fatalf("unexpected error: %v", err)
 	}
-	if result.RequeueAfter == 0 {
-		t.Fatalf("expected RequeueAfter > 0 after StartedAt patch, got %+v", result)
+	if unreachable || pod != "" || forbidden {
+		t.Fatalf("expected (false, \"\", false) with no Clientset, got (%v, %q, %v)", unreachable, pod, forbidden)
 	}
+}
 
-	persisted := &backupsv1alpha1.BackupJob{}
-	if err := c.Get(context.Background(), client.ObjectKeyFromObject(stored), persisted); err != nil {
-		t.Fatalf("get persisted: %v", err)
-	}
-	if persisted.Status.StartedAt == nil {
-		t.Errorf("expected StartedAt persisted, got nil")
+// TestRecoveryTargetUnreachable_ClassifiesFromLogs drives the log-based
+// classification through an injected reader (the fake Clientset's GetLogs
+// can't return specific content or a Forbidden), covering the three outcomes
+// the deadline path branches on: the unreachable-target FATAL is present
+// (-> unreachable, newest pod), it is absent (-> not unreachable), and the log
+// read is Forbidden (-> forbidden flagged so the caller surfaces the missing
+// pods/log RBAC instead of failing silently-generic).
+func TestRecoveryTargetUnreachable_ClassifiesFromLogs(t *testing.T) {
+	const (
+		ns      = "tenant"
+		cluster = "postgres-app"
+	)
+	recPod := func(name string, ageSeconds int64) client.Object {
+		return &corev1.Pod{
+			ObjectMeta: metav1.ObjectMeta{
+				Namespace:         ns,
+				Name:              name,
+				Labels:            map[string]string{cnpgClusterLabel: cluster},
+				CreationTimestamp: metav1.NewTime(time.Unix(ageSeconds, 0)),
+			},
+			Spec: corev1.PodSpec{Containers: []corev1.Container{{Name: cnpgRecoveryContainerName}}},
+		}
 	}
-	// Without the early return, reconcileCNPG would have proceeded past the
+	seed := func() []client.Object { return []client.Object{recPod("rec-old", 100), recPod("rec-new", 200)} }
+	fatalLog := "LOG:  redo done\nFATAL:  " + cnpgRecoveryTargetUnreachableLog
+
+	t.Run("FATAL present -> unreachable, reports newest pod", func(t *testing.T) {
+		r := &RestoreJobReconciler{
+			Client:     newCNPGStrategyTestClient(t, seed()...),
+			readPodLog: func(context.Context, string, string, string) (string, error) { return fatalLog, nil },
+		}
+		un, pod, forb, err := r.recoveryTargetUnreachable(context.Background(), ns, cluster)
+		if err != nil {
+			t.Fatalf("unexpected error: %v", err)
+		}
+		if !un || forb || pod != "rec-new" {
+			t.Fatalf("got unreachable=%v pod=%q forbidden=%v, want (true, rec-new, false)", un, pod, forb)
+		}
+	})
+
+	t.Run("no FATAL -> not unreachable", func(t *testing.T) {
+		r := &RestoreJobReconciler{
+			Client: newCNPGStrategyTestClient(t, seed()...),
+			readPodLog: func(context.Context, string, string, string) (string, error) {
+				return "LOG: consistent recovery state reached", nil
+			},
+		}
+		un, _, forb, err := r.recoveryTargetUnreachable(context.Background(), ns, cluster)
+		if err != nil {
+			t.Fatalf("unexpected error: %v", err)
+		}
+		if un || forb {
+			t.Fatalf("got unreachable=%v forbidden=%v, want (false, false)", un, forb)
+		}
+	})
+
+	t.Run("Forbidden log read -> forbidden flagged, not unreachable", func(t *testing.T) {
+		r := &RestoreJobReconciler{
+			Client: newCNPGStrategyTestClient(t, seed()...),
+			readPodLog: func(context.Context, string, string, string) (string, error) {
+				return "", apierrors.NewForbidden(schema.GroupResource{Resource: "pods"}, "rec-new", fmt.Errorf("pods/log grant missing"))
+			},
+		}
+		un, _, forb, err := r.recoveryTargetUnreachable(context.Background(), ns, cluster)
+		if err != nil {
+			t.Fatalf("unexpected error: %v", err)
+		}
+		if un || !forb {
+			t.Fatalf("got unreachable=%v forbidden=%v, want (false, true)", un, forb)
+		}
+	})
+}
+
+// TestApplyClusterPluginBackup_ReadsTheLiveClusterNotTheCache seeds the cached
+// and the live client with the Cluster before and after an in-place restore
+// re-rendered it, and asserts the driver takes both the serverName and the
+// ObjectStore owner UID from the live one.
+func TestApplyClusterPluginBackup_ReadsTheLiveClusterNotTheCache(t *testing.T) {
+	archiver := true
+	purged := &cnpgtypes.Cluster{
+		ObjectMeta: metav1.ObjectMeta{Namespace: "tenant", Name: "postgres-app", UID: "uid-before-restore"},
+	}
+	purged.Spec.Plugins = []cnpgtypes.PluginConfiguration{{
+		Name:          cnpgtypes.PluginName,
+		IsWALArchiver: &archiver,
+		Parameters:    map[string]string{barmanObjectNameParam: "postgres-app", barmanServerNameParam: "postgres-app"},
+	}}
+
+	rebootstrapped := purged.DeepCopy()
+	rebootstrapped.UID = "uid-after-restore"
+	rebootstrapped.Spec.Plugins[0].Parameters[barmanServerNameParam] = "postgres-app-restore-0123456789abcdef"
+
+	c := newCNPGStrategyTestClient(t, purged)
+	r := &BackupJobReconciler{Client: c, Interface: cnpgDynamicFor(t, rebootstrapped)}
+	tmpl := &strategyv1alpha1.CNPGTemplate{
+		BarmanObjectStore: strategyv1alpha1.BarmanObjectStoreTemplate{DestinationPath: "s3://bucket/x/"},
+	}
+
+	got, err := r.applyClusterPluginBackup(context.Background(), "tenant", "postgres-app", tmpl, "strategy-name", true)
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+	if want := "postgres-app-restore-0123456789abcdef"; got.serverName != want {
+		t.Fatalf("effective serverName = %q, want %q: the restored cluster would archive onto the source's prefix", got.serverName, want)
+	}
+
+	store := &cnpgtypes.ObjectStore{}
+	if err := c.Get(context.Background(), client.ObjectKey{Namespace: "tenant", Name: "postgres-app"}, store); err != nil {
+		t.Fatalf("get ObjectStore after apply: %v", err)
+	}
+	owners := store.GetOwnerReferences()
+	if len(owners) != 1 {
+		t.Fatalf("ObjectStore owner references = %v, want exactly the live Cluster", owners)
+	}
+	if got := string(owners[0].UID); got != "uid-after-restore" {
+		t.Fatalf("ObjectStore owned by UID %q, want the live Cluster's: it would be garbage-collected immediately", got)
+	}
+}
+
+// TestReconcileCNPG_RecordsTheLiveClusterFlavor: the chart refuses a flavor
+// change on a live Cluster, but the Postgres app keeps the refused value. The
+// Backup must record the flavor the Cluster actually runs, or a restore would
+// accept a target of the wrong image family and refuse the right one.
+func TestReconcileCNPG_RecordsTheLiveClusterFlavor(t *testing.T) {
+	apiGroup := backupsv1alpha1.DefaultApplicationAPIGroup
+	strategyGroup := strategyv1alpha1.GroupVersion.Group
+	const ns, appName = "tenant", "pg"
+	clusterName := cnpgClusterNameForApp(appName)
+
+	cases := []struct {
+		name       string
+		liveImage  string
+		specFlavor string
+		want       string
+	}{
+		{name: "app switched to postgis on a postgresql cluster", liveImage: "ghcr.io/cloudnative-pg/postgresql:17.5", specFlavor: "postgis", want: "postgresql"},
+		{name: "app switched to postgresql on a postgis cluster", liveImage: "ghcr.io/cloudnative-pg/postgis:17-3.5", specFlavor: "", want: "postgis"},
+		{name: "cluster on the CNPG default image", liveImage: "", specFlavor: "postgis", want: "postgresql"},
+	}
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			startedAt := metav1.Now()
+			job := &backupsv1alpha1.BackupJob{
+				ObjectMeta: metav1.ObjectMeta{Namespace: ns, Name: "bj"},
+				Spec: backupsv1alpha1.BackupJobSpec{
+					ApplicationRef: corev1.TypedLocalObjectReference{APIGroup: &apiGroup, Kind: postgresAppKind, Name: appName},
+				},
+				Status: backupsv1alpha1.BackupJobStatus{StartedAt: &startedAt},
+			}
+			strategy := &strategyv1alpha1.CNPG{
+				ObjectMeta: metav1.ObjectMeta{Name: "cnpg-strategy"},
+				Spec: strategyv1alpha1.CNPGSpec{
+					Template: strategyv1alpha1.CNPGTemplate{
+						BarmanObjectStore: strategyv1alpha1.BarmanObjectStoreTemplate{DestinationPath: "s3://bucket/"},
+					},
+				},
+			}
+			app := newPostgresApp(appName, ns)
+			app.Spec.Flavor = tc.specFlavor
+			cluster := &cnpgtypes.Cluster{
+				ObjectMeta: metav1.ObjectMeta{Namespace: ns, Name: clusterName, UID: "cluster-uid"},
+				Spec:       cnpgtypes.ClusterSpec{ImageName: tc.liveImage},
+			}
+			cnpgBackup := &cnpgtypes.Backup{
+				ObjectMeta: metav1.ObjectMeta{Namespace: ns, Name: "bj-cnpg", Labels: map[string]string{
+					backupsv1alpha1.OwningJobNameLabel:      job.Name,
+					backupsv1alpha1.OwningJobNamespaceLabel: job.Namespace,
+				}},
+				Spec:   cnpgtypes.BackupSpec{Cluster: cnpgtypes.ClusterReference{Name: clusterName}},
+				Status: cnpgtypes.BackupStatus{Phase: cnpgBackupPhaseComplete},
+			}
+			c := newCNPGStrategyTestClient(t, job, strategy, app, cluster, cnpgBackup)
+			r := &BackupJobReconciler{Client: c, Interface: cnpgDynamicFor(t, cluster)}
+			resolved := &ResolvedBackupConfig{
+				StrategyRef: corev1.TypedLocalObjectReference{APIGroup: &strategyGroup, Kind: strategyv1alpha1.CNPGStrategyKind, Name: strategy.Name},
+			}
+
+			j := &backupsv1alpha1.BackupJob{}
+			if err := c.Get(context.Background(), client.ObjectKeyFromObject(job), j); err != nil {
+				t.Fatalf("get BackupJob: %v", err)
+			}
+			if _, err := r.reconcileCNPG(context.Background(), j, resolved); err != nil {
+				t.Fatalf("reconcileCNPG: %v", err)
+			}
+			if j.Status.Phase != backupsv1alpha1.BackupJobPhaseSucceeded {
+				t.Fatalf("BackupJob phase = %q (%s), want Succeeded", j.Status.Phase, j.Status.Message)
+			}
+
+			backup := &backupsv1alpha1.Backup{}
+			if err := c.Get(context.Background(), client.ObjectKey{Namespace: ns, Name: job.Name}, backup); err != nil {
+				t.Fatalf("get Backup artifact: %v", err)
+			}
+			snap, err := unmarshalCNPGBackupSnapshot(backup)
+			if err != nil {
+				t.Fatalf("unmarshal snapshot: %v", err)
+			}
+			if got := cnpgFlavor(snap.Flavor); got != tc.want {
+				t.Fatalf("Backup records flavor %q, want the live Cluster's %q", got, tc.want)
+			}
+		})
+	}
+}
+
+// TestCNPGImageFlavor pins the image-to-flavor mapping to the chart's
+// postgres.flavorGuard: only the image name counts, never the host, tag or
+// digest.
+func TestCNPGImageFlavor(t *testing.T) {
+	cases := map[string]string{
+		"":                                       "postgresql",
+		"ghcr.io/cloudnative-pg/postgresql:18.1": "postgresql",
+		"ghcr.io/cloudnative-pg/postgis:18-3.6":  "postgis",
+		"mirror.local:5000/cloudnative-pg/postgis:18-3.6@sha256:0123": "postgis",
+		"postgis@sha256:0123": "postgis",
+	}
+	for image, want := range cases {
+		if got := cnpgImageFlavor(image); got != want {
+			t.Errorf("cnpgImageFlavor(%q) = %q, want %q", image, got, want)
+		}
+	}
+}
+
+// cnpgDynamicFor builds the dynamic client applyClusterPluginBackup reads
+// Clusters through, seeded independently of the typed client.
+func cnpgDynamicFor(t *testing.T, clusters ...*cnpgtypes.Cluster) dynamic.Interface {
+	t.Helper()
+	s := runtime.NewScheme()
+	s.AddKnownTypeWithName(cnpgtypes.GroupVersion.WithKind("Cluster"), &unstructured.Unstructured{})
+	s.AddKnownTypeWithName(cnpgtypes.GroupVersion.WithKind("ClusterList"), &unstructured.UnstructuredList{})
+	s.AddKnownTypeWithName(cnpgtypes.BarmanGroupVersion.WithKind("ObjectStore"), &unstructured.Unstructured{})
+	s.AddKnownTypeWithName(cnpgtypes.BarmanGroupVersion.WithKind("ObjectStoreList"), &unstructured.UnstructuredList{})
+
+	objs := make([]runtime.Object, 0, len(clusters))
+	for _, c := range clusters {
+		raw, err := runtime.DefaultUnstructuredConverter.ToUnstructured(c)
+		if err != nil {
+			t.Fatalf("converting Cluster %s: %v", c.Name, err)
+		}
+		u := &unstructured.Unstructured{Object: raw}
+		u.SetAPIVersion(cnpgtypes.GroupVersion.String())
+		u.SetKind("Cluster")
+		objs = append(objs, u)
+	}
+	return dynamicfake.NewSimpleDynamicClient(s, objs...)
+}
+
+// testCNPGScheme returns a runtime.Scheme that knows the unstructured
+// HelmRelease GVK used by the dynamic-client tests above.
+func testCNPGScheme(t *testing.T) *runtime.Scheme {
+	t.Helper()
+	s := runtime.NewScheme()
+	_ = scheme.AddToScheme(s)
+	s.AddKnownTypeWithName(schema.GroupVersionKind{Group: "helm.toolkit.fluxcd.io", Version: "v2", Kind: "HelmRelease"}, &unstructured.Unstructured{})
+	s.AddKnownTypeWithName(schema.GroupVersionKind{Group: "helm.toolkit.fluxcd.io", Version: "v2", Kind: "HelmReleaseList"}, &unstructured.UnstructuredList{})
+	return s
+}
+
+// TestApplyClusterPluginBackup_PatchesExistingCluster confirms the happy path:
+// when the Cluster exists the driver SSA-applies an ObjectStore CR carrying the
+// The serverName is the S3 WAL-archive path prefix; changing it on a live
+// Cluster splits the archive across two prefixes and breaks the eventual
+// restore with "WAL not found". A Cluster that already has the barman-cloud
+// plugin attached must therefore keep its effective serverName — the explicit
+// parameter when present, its own name (the plugin's default) when the plugin
+// is attached without one — and only a Cluster with no plugin at all takes the
+// strategy template's value.
+func TestApplyClusterPluginBackup_PreservesLiveServerName(t *testing.T) {
+	explicit := true
+	cases := []struct {
+		name       string
+		plugins    []cnpgtypes.PluginConfiguration
+		wantServer string
+	}{
+		{
+			name: "explicit live serverName wins over the strategy's",
+			plugins: []cnpgtypes.PluginConfiguration{{
+				Name:          cnpgtypes.PluginName,
+				IsWALArchiver: &explicit,
+				Parameters:    map[string]string{barmanObjectNameParam: "postgres-app", barmanServerNameParam: "postgres-app"},
+			}},
+			wantServer: "postgres-app",
+		},
+		{
+			name: "plugin attached without serverName defaults to the cluster name",
+			plugins: []cnpgtypes.PluginConfiguration{{
+				Name:          cnpgtypes.PluginName,
+				IsWALArchiver: &explicit,
+				Parameters:    map[string]string{barmanObjectNameParam: "postgres-app"},
+			}},
+			wantServer: "postgres-app",
+		},
+		{
+			name:       "no plugin attached: the strategy's serverName applies",
+			plugins:    nil,
+			wantServer: "strategy-name",
+		},
+	}
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			cluster := &cnpgtypes.Cluster{
+				ObjectMeta: metav1.ObjectMeta{Namespace: "tenant", Name: "postgres-app", UID: "cluster-uid-123"},
+			}
+			cluster.Spec.Plugins = tc.plugins
+			c := newCNPGStrategyTestClient(t, cluster)
+			r := &BackupJobReconciler{Client: c, Interface: cnpgDynamicFor(t, cluster)}
+			tmpl := &strategyv1alpha1.CNPGTemplate{
+				BarmanObjectStore: strategyv1alpha1.BarmanObjectStoreTemplate{DestinationPath: "s3://bucket/x/"},
+			}
+
+			got, err := r.applyClusterPluginBackup(context.Background(), "tenant", "postgres-app", tmpl, "strategy-name", true)
+			if err != nil {
+				t.Fatalf("unexpected error: %v", err)
+			}
+			if got.serverName != tc.wantServer {
+				t.Fatalf("effective serverName = %q, want %q", got.serverName, tc.wantServer)
+			}
+
+			patched := &cnpgtypes.Cluster{}
+			if err := c.Get(context.Background(), client.ObjectKey{Namespace: "tenant", Name: "postgres-app"}, patched); err != nil {
+				t.Fatalf("get Cluster after apply: %v", err)
+			}
+			if len(patched.Spec.Plugins) != 1 {
+				t.Fatalf("expected exactly one plugin entry, got %+v", patched.Spec.Plugins)
+			}
+			if s := patched.Spec.Plugins[0].Parameters[barmanServerNameParam]; s != tc.wantServer {
+				t.Fatalf("patched plugin serverName = %q, want %q", s, tc.wantServer)
+			}
+		})
+	}
+}
+
+// defaultStrategyServerName is the serverName the cozy-default-cnpg Strategy
+// renders; tests/strategy_cnpg_test.yaml in the backupstrategy-controller chart
+// pins the chart to this same string.
+const defaultStrategyServerName = "{{ .Application.metadata.namespace }}-{{ .Application.metadata.name }}{{ with .Application.metadata.uid }}-{{ . }}{{ end }}"
+
+func TestRenderCNPGTemplate_DefaultServerName(t *testing.T) {
+	tmpl := strategyv1alpha1.CNPGTemplate{ServerName: defaultStrategyServerName}
+	for _, tc := range []struct {
+		name string
+		uid  types.UID
+		want string
+	}{
+		{name: "uid present", uid: "8f14e45f-ceea-467a-9575-6f0d6e2c1a3b", want: "tenant-pg-8f14e45f-ceea-467a-9575-6f0d6e2c1a3b"},
+		{name: "uid absent", want: "tenant-pg"},
+	} {
+		t.Run(tc.name, func(t *testing.T) {
+			app := newPostgresApp("pg", "tenant")
+			app.UID = tc.uid
+			got, err := renderCNPGTemplate(tmpl, app, nil)
+			if err != nil {
+				t.Fatalf("renderCNPGTemplate: %v", err)
+			}
+			if got.ServerName != tc.want {
+				t.Fatalf("serverName = %q, want %q", got.ServerName, tc.want)
+			}
+		})
+	}
+}
+
+// TestReconcileCNPG_RecreatedAppArchivesUnderAFreshPrefix deletes a Postgres
+// and recreates it under the same name, then runs a BackupJob against each.
+// The destinationPath is keyed by name, so only the serverName keeps the new
+// Cluster from writing its WALs and base backups into the old one's archive;
+// the empty-archive check that would refuse it is gone by the time the first
+// BackupJob attaches the plugin. A Cluster that already archives keeps its
+// serverName, so existing archives stay continuous.
+func TestReconcileCNPG_RecreatedAppArchivesUnderAFreshPrefix(t *testing.T) {
+	apiGroup := backupsv1alpha1.DefaultApplicationAPIGroup
+	strategyGroup := strategyv1alpha1.GroupVersion.Group
+	archiver := true
+
+	backUp := func(t *testing.T, strategyServerName string, appUID types.UID, plugins []cnpgtypes.PluginConfiguration) string {
+		t.Helper()
+		started := metav1.NewTime(time.Now())
+		job := &backupsv1alpha1.BackupJob{
+			ObjectMeta: metav1.ObjectMeta{Namespace: "tenant", Name: "bj"},
+			Spec: backupsv1alpha1.BackupJobSpec{
+				ApplicationRef: corev1.TypedLocalObjectReference{APIGroup: &apiGroup, Kind: postgresAppKind, Name: "pg"},
+			},
+			Status: backupsv1alpha1.BackupJobStatus{StartedAt: &started},
+		}
+		strategy := &strategyv1alpha1.CNPG{
+			ObjectMeta: metav1.ObjectMeta{Name: "cozy-default-cnpg"},
+			Spec: strategyv1alpha1.CNPGSpec{Template: strategyv1alpha1.CNPGTemplate{
+				ServerName: strategyServerName,
+				BarmanObjectStore: strategyv1alpha1.BarmanObjectStoreTemplate{
+					DestinationPath: "s3://bucket/{{ .Application.metadata.namespace }}/{{ .Application.metadata.name }}/",
+				},
+			}},
+		}
+		app := newPostgresApp("pg", "tenant")
+		app.UID = appUID
+		cluster := &cnpgtypes.Cluster{
+			ObjectMeta: metav1.ObjectMeta{Namespace: "tenant", Name: "postgres-pg", UID: types.UID("cluster-" + appUID)},
+		}
+		cluster.Spec.Plugins = plugins
+
+		c := newCNPGStrategyTestClient(t, job, strategy, app, cluster)
+		r := &BackupJobReconciler{Client: c, Interface: cnpgDynamicFor(t, cluster)}
+		resolved := &ResolvedBackupConfig{StrategyRef: corev1.TypedLocalObjectReference{
+			APIGroup: &strategyGroup, Kind: strategyv1alpha1.CNPGStrategyKind, Name: strategy.Name,
+		}}
+		// A Cluster without the plugin takes two passes: the first only
+		// records that the driver is about to roll it, the second attaches.
+		patched := &cnpgtypes.Cluster{}
+		for range 2 {
+			j := &backupsv1alpha1.BackupJob{}
+			if err := c.Get(context.Background(), client.ObjectKeyFromObject(job), j); err != nil {
+				t.Fatalf("get BackupJob: %v", err)
+			}
+			if _, err := r.reconcileCNPG(context.Background(), j, resolved); err != nil {
+				t.Fatalf("reconcileCNPG: %v", err)
+			}
+			if j.Status.Phase == backupsv1alpha1.BackupJobPhaseFailed {
+				t.Fatalf("BackupJob failed: %+v", j.Status.Conditions)
+			}
+
+			if err := c.Get(context.Background(), client.ObjectKeyFromObject(cluster), patched); err != nil {
+				t.Fatalf("get Cluster: %v", err)
+			}
+			if got := currentBarmanServerName(patched); got != "" {
+				return got
+			}
+		}
+		t.Fatalf("BackupJob left the barman-cloud plugin unattached: %+v", patched.Spec.Plugins)
+		return ""
+	}
+
+	for _, tc := range []struct {
+		name               string
+		strategyServerName string
+	}{
+		{name: "default strategy", strategyServerName: defaultStrategyServerName},
+		{name: "strategy without serverName", strategyServerName: ""},
+	} {
+		t.Run(tc.name, func(t *testing.T) {
+			first := backUp(t, tc.strategyServerName, "3c2ee41b-346f-4ae2-98d2-5d629c96f744", nil)
+			second := backUp(t, tc.strategyServerName, "9eb8feed-7d49-467e-b719-d1896c0602d5", nil)
+			if first == second {
+				t.Fatalf("both instances of tenant/pg archive under serverName %q: the recreated one writes into its predecessor's archive", first)
+			}
+			for _, name := range []string{first, second} {
+				if strings.Contains(name, "<no value>") {
+					t.Fatalf("serverName %q rendered a missing key", name)
+				}
+			}
+
+			const legacy = "tenant-pg"
+			kept := backUp(t, tc.strategyServerName, "9eb8feed-7d49-467e-b719-d1896c0602d5", []cnpgtypes.PluginConfiguration{{
+				Name:          cnpgtypes.PluginName,
+				IsWALArchiver: &archiver,
+				Parameters:    map[string]string{barmanObjectNameParam: "postgres-pg", barmanServerNameParam: legacy},
+			}})
+			if kept != legacy {
+				t.Fatalf("a Cluster already archiving under %q moved to %q, splitting its archive", legacy, kept)
+			}
+		})
+	}
+}
+
+// barman configuration and SSA-patches the Cluster's spec.plugins to reference
+// it via the barman-cloud plugin (the plugin replaces the deprecated native
+// spec.backup.barmanObjectStore). serverName must land on the Cluster plugin
+// parameter, never inside the ObjectStore configuration (the plugin forbids it).
+func TestApplyClusterPluginBackup_PatchesExistingCluster(t *testing.T) {
+	cluster := &cnpgtypes.Cluster{
+		ObjectMeta: metav1.ObjectMeta{Namespace: "tenant", Name: "postgres-app", UID: "cluster-uid-123"},
+	}
+	c := newCNPGStrategyTestClient(t, cluster)
+	r := &BackupJobReconciler{Client: c, Interface: cnpgDynamicFor(t, cluster)}
+	tmpl := &strategyv1alpha1.CNPGTemplate{
+		BarmanObjectStore: strategyv1alpha1.BarmanObjectStoreTemplate{
+			DestinationPath: "s3://bucket/x/",
+			RetentionPolicy: "30d",
+		},
+	}
+
+	if _, err := r.applyClusterPluginBackup(context.Background(), "tenant", "postgres-app", tmpl, "tenant-app", true); err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+
+	// The ObjectStore CR carries destinationPath + retentionPolicy and no serverName.
+	store := &cnpgtypes.ObjectStore{}
+	if err := c.Get(context.Background(), client.ObjectKey{Namespace: "tenant", Name: "postgres-app"}, store); err != nil {
+		t.Fatalf("get ObjectStore after apply: %v", err)
+	}
+	if store.Spec.Configuration.DestinationPath != "s3://bucket/x/" {
+		t.Errorf("ObjectStore destinationPath: got %q", store.Spec.Configuration.DestinationPath)
+	}
+	if store.Spec.RetentionPolicy != "30d" {
+		t.Errorf("ObjectStore retentionPolicy: got %q", store.Spec.RetentionPolicy)
+	}
+	// The ObjectStore must pin the barman-cloud sidecar's S3 request-checksum
+	// policy to when_required, or uploads to non-AWS S3 gateways (Ceph RGW, the
+	// platform's own SeaweedFS system bucket) fail with an x-amz-content-sha256
+	// InvalidArgument. The chart does not render this ObjectStore in the
+	// platform-managed useSystemBucket=true flow, so this Go path is the only
+	// place that sets it there.
+	sc := store.Spec.InstanceSidecarConfiguration
+	if sc == nil {
+		t.Fatal("ObjectStore has no instanceSidecarConfiguration")
+	}
+	if len(sc.Env) != 1 ||
+		sc.Env[0].Name != "AWS_REQUEST_CHECKSUM_CALCULATION" || sc.Env[0].Value != "when_required" {
+		t.Errorf("ObjectStore instanceSidecarConfiguration.env: got %+v, want [AWS_REQUEST_CHECKSUM_CALCULATION=when_required]", sc)
+	}
+	if sc.Resources.Requests.Memory().Value() != 256*1024*1024 ||
+		sc.Resources.Limits.Memory().Value() != 1024*1024*1024 ||
+		sc.Resources.Requests.Cpu().MilliValue() != 100 {
+		t.Errorf("ObjectStore leaves Barman subject to undersized tenant resource defaults: %+v", sc.Resources)
+	}
+	if _, ok := sc.Resources.Limits[corev1.ResourceCPU]; ok {
+		t.Errorf("ObjectStore caps sidecar CPU, which throttles WAL archiving instead of failing it: %+v", sc.Resources.Limits)
+	}
+	// The ObjectStore must be owner-referenced to the Cluster so Kubernetes GC
+	// removes it when the Cluster is deleted (no orphan in the platform flow,
+	// where the chart does not render this ObjectStore).
+	if len(store.OwnerReferences) != 1 {
+		t.Fatalf("expected exactly one ownerReference on the ObjectStore, got %+v", store.OwnerReferences)
+	}
+	own := store.OwnerReferences[0]
+	if own.Kind != "Cluster" || own.Name != "postgres-app" || own.UID != "cluster-uid-123" {
+		t.Errorf("ObjectStore ownerReference: got kind=%q name=%q uid=%q, want Cluster/postgres-app/cluster-uid-123", own.Kind, own.Name, own.UID)
+	}
+	if store.Spec.Configuration.ServerName != "" {
+		t.Errorf("ObjectStore configuration must not carry serverName (plugin forbids it); got %q", store.Spec.Configuration.ServerName)
+	}
+
+	// The Cluster references the ObjectStore through spec.plugins, with
+	// serverName on the plugin parameter and isWALArchiver=true.
+	got := &cnpgtypes.Cluster{}
+	if err := c.Get(context.Background(), client.ObjectKeyFromObject(cluster), got); err != nil {
+		t.Fatalf("get cluster after patch: %v", err)
+	}
+	if len(got.Spec.Plugins) != 1 {
+		t.Fatalf("expected exactly one plugin entry, got %+v", got.Spec.Plugins)
+	}
+	p := got.Spec.Plugins[0]
+	if p.Name != cnpgtypes.PluginName {
+		t.Errorf("plugin name: got %q, want %q", p.Name, cnpgtypes.PluginName)
+	}
+	if p.IsWALArchiver == nil || !*p.IsWALArchiver {
+		t.Errorf("expected isWALArchiver=true, got %v", p.IsWALArchiver)
+	}
+	if got := p.Parameters[barmanObjectNameParam]; got != "postgres-app" {
+		t.Errorf("plugin barmanObjectName: got %q, want %q", got, "postgres-app")
+	}
+	if got := p.Parameters[barmanServerNameParam]; got != "tenant-app" {
+		t.Errorf("plugin serverName: got %q, want %q", got, "tenant-app")
+	}
+}
+
+// TestEnsureCNPGBackup_UsesPluginMethod locks in that driver-initiated backups
+// go through the barman-cloud plugin. spec.method / spec.pluginConfiguration is
+// the single field that routes the run: if it regressed to the default
+// (barmanObjectStore) method, CNPG would run the legacy method against a Cluster
+// that no longer has one and every platform backup would fail.
+func TestEnsureCNPGBackup_UsesPluginMethod(t *testing.T) {
+	j := &backupsv1alpha1.BackupJob{
+		ObjectMeta: metav1.ObjectMeta{Namespace: "tenant", Name: "bj"},
+	}
+	c := newCNPGStrategyTestClient(t, j)
+	r := &BackupJobReconciler{Client: c}
+
+	bk, err := r.ensureCNPGBackup(context.Background(), j, "postgres-app")
+	if err != nil {
+		t.Fatalf("ensureCNPGBackup: %v", err)
+	}
+	if bk.Spec.Method != cnpgtypes.BackupMethodPlugin {
+		t.Errorf("Backup spec.method: got %q, want %q", bk.Spec.Method, cnpgtypes.BackupMethodPlugin)
+	}
+	if bk.Spec.PluginConfiguration == nil || bk.Spec.PluginConfiguration.Name != cnpgtypes.PluginName {
+		t.Errorf("Backup spec.pluginConfiguration: got %+v, want name=%q", bk.Spec.PluginConfiguration, cnpgtypes.PluginName)
+	}
+	if bk.Spec.Cluster.Name != "postgres-app" {
+		t.Errorf("Backup spec.cluster.name: got %q, want postgres-app", bk.Spec.Cluster.Name)
+	}
+}
+
+// TestReconcileCNPG_StartedAtPreservedAcrossStaleCache locks in the bug fix
+// for the StartedAt race called out in the branch review: a second reconcile
+// with a stale local copy (which observes StartedAt==nil) must NOT advance
+// the persisted timestamp the first reconcile already wrote. Without the
+// refetch-before-write guard, the wall-clock deadline gate slides forward
+// on every poll, defeating the purpose of cnpgDefaultBackupDeadline.
+func TestReconcileCNPG_StartedAtPreservedAcrossStaleCache(t *testing.T) {
+	// metav1.Time loses sub-second precision on JSON round-trip; truncate
+	// upfront so the equality check below isn't fooled by nanosecond drift.
+	original := metav1.NewTime(time.Now().Add(-10 * time.Minute).Truncate(time.Second))
+	stored := &backupsv1alpha1.BackupJob{
+		ObjectMeta: metav1.ObjectMeta{Namespace: "tenant", Name: "bj"},
+		Status: backupsv1alpha1.BackupJobStatus{
+			StartedAt: &original,
+		},
+	}
+	c := newCNPGStrategyTestClient(t, stored)
+	r := &BackupJobReconciler{Client: c}
+
+	// Stale local copy as the reconcile would have observed it: StartedAt==nil.
+	stale := stored.DeepCopy()
+	stale.Status.StartedAt = nil
+
+	// Inline the refetch-before-write block from reconcileCNPG. (The full
+	// reconciler path requires more wiring than this lightweight test
+	// builds; the block under test is the bug-fix surface, not the
+	// surrounding decode/template logic.)
+	fresh := &backupsv1alpha1.BackupJob{}
+	if err := r.Get(context.Background(), client.ObjectKeyFromObject(stored), fresh); err != nil {
+		t.Fatalf("get fresh: %v", err)
+	}
+	if fresh.Status.StartedAt != nil {
+		stale.Status.StartedAt = fresh.Status.StartedAt
+	} else {
+		base := fresh.DeepCopy()
+		now := metav1.Now()
+		fresh.Status.StartedAt = &now
+		if err := r.Status().Patch(context.Background(), fresh, client.MergeFrom(base)); err != nil {
+			t.Fatalf("patch: %v", err)
+		}
+		stale.Status.StartedAt = fresh.Status.StartedAt
+	}
+
+	got := &backupsv1alpha1.BackupJob{}
+	if err := c.Get(context.Background(), client.ObjectKeyFromObject(stored), got); err != nil {
+		t.Fatalf("get after fix: %v", err)
+	}
+	if got.Status.StartedAt == nil || !got.Status.StartedAt.Equal(&original) {
+		t.Errorf("persisted StartedAt was advanced by stale-cache reconcile; got %v, want %v",
+			got.Status.StartedAt, original)
+	}
+	if stale.Status.StartedAt == nil || !stale.Status.StartedAt.Equal(&original) {
+		t.Errorf("local copy did not pick up persisted StartedAt; got %v, want %v",
+			stale.Status.StartedAt, original)
+	}
+}
+
+// TestReconcileCNPG_StartedAtReturnsEarlyToAvoidStaleResourceVersion locks
+// in the early-return after the StartedAt patch. Before the fix, reconcileCNPG
+// patched StartedAt onto a refetched copy and then continued the same call
+// using the local `j` whose ResourceVersion was stale, so any subsequent
+// r.Status().Update on `j` (e.g. the markBackupJobFailed path or the
+// ClusterNotReady condition write) carried a pre-patch RV and produced a
+// Conflict on the very first poll. The fix returns RequeueAfter immediately
+// after the StartedAt patch so the next reconcile reads `j` cleanly.
+func TestReconcileCNPG_StartedAtReturnsEarlyToAvoidStaleResourceVersion(t *testing.T) {
+	apiGroup := backupsv1alpha1.DefaultApplicationAPIGroup
+	strategyGroup := strategyv1alpha1.GroupVersion.Group
+
+	stored := &backupsv1alpha1.BackupJob{
+		ObjectMeta: metav1.ObjectMeta{Namespace: "tenant", Name: "bj"},
+		Spec: backupsv1alpha1.BackupJobSpec{
+			ApplicationRef: corev1.TypedLocalObjectReference{APIGroup: &apiGroup, Kind: postgresAppKind, Name: "pg"},
+		},
+	}
+	c := newCNPGStrategyTestClient(t, stored)
+	r := &BackupJobReconciler{Client: c}
+
+	j := stored.DeepCopy()
+	resolved := &ResolvedBackupConfig{
+		StrategyRef: corev1.TypedLocalObjectReference{
+			APIGroup: &strategyGroup,
+			Kind:     strategyv1alpha1.CNPGStrategyKind,
+			Name:     "missing-strategy",
+		},
+	}
+
+	result, err := r.reconcileCNPG(context.Background(), j, resolved)
+	if err != nil {
+		t.Fatalf("reconcileCNPG: unexpected error %v", err)
+	}
+	if result.RequeueAfter == 0 {
+		t.Fatalf("expected RequeueAfter > 0 after StartedAt patch, got %+v", result)
+	}
+
+	persisted := &backupsv1alpha1.BackupJob{}
+	if err := c.Get(context.Background(), client.ObjectKeyFromObject(stored), persisted); err != nil {
+		t.Fatalf("get persisted: %v", err)
+	}
+	if persisted.Status.StartedAt == nil {
+		t.Errorf("expected StartedAt persisted, got nil")
+	}
+	// Without the early return, reconcileCNPG would have proceeded past the
 	// StartedAt block, found the strategy missing, and called
 	// markBackupJobFailed - persisting Phase=Failed (and, depending on RV
 	// enforcement, returning Conflict). With the fix, Phase stays empty and
@@ -1417,96 +2332,1546 @@ func TestReconcileCNPG_StartedAtReturnsEarlyToAvoidStaleResourceVersion(t *testi
 	}
 }
 
-// TestReconcileCNPGRestore_MissingStrategyFailsClosedAfterDeadline covers the
-// restore-path blocker: a RestoreJob whose referenced CNPG Strategy CR never
-// appears must NOT requeue forever. requeueRestoreStrategyNotReady gates
-// terminal-vs-transient on Status.StartedAt, and the "fail closed" guarantee
-// only holds if every driver stamps StartedAt before it can reach the Strategy
-// NotFound branch. reconcileCNPGRestore stamps StartedAt and returns early on
-// the first reconcile (well before the strategy lookup), so the deadline clock
-// starts even when the job begins with StartedAt==nil; once the deadline
-// elapses the next reconcile flips the RestoreJob to Phase=Failed.
-//
-// The existing TestRequeueRestoreStrategyNotReady_BoundedByDeadline only
-// exercises the helper in isolation with StartedAt pre-populated, so it cannot
-// catch a driver that reaches the NotFound branch without ever stamping
-// StartedAt. This test proves the guarantee end to end at the driver call site.
-func TestReconcileCNPGRestore_MissingStrategyFailsClosedAfterDeadline(t *testing.T) {
+// cnpgRolloutFixture drives reconcileCNPG against one Postgres app whose
+// Cluster and instance pods a test swaps between passes, standing in for
+// CNPG rolling the instances.
+type cnpgRolloutFixture struct {
+	t        *testing.T
+	c        client.Client
+	r        *BackupJobReconciler
+	resolved *ResolvedBackupConfig
+}
+
+const (
+	rolloutNS      = "tenant"
+	rolloutApp     = "app"
+	rolloutCluster = "postgres-app"
+)
+
+func newCNPGRolloutFixture(t *testing.T, j *backupsv1alpha1.BackupJob, cluster *cnpgtypes.Cluster, pods ...*corev1.Pod) *cnpgRolloutFixture {
+	t.Helper()
+	strategyGroup := strategyv1alpha1.GroupVersion.Group
+	strategy := &strategyv1alpha1.CNPG{
+		ObjectMeta: metav1.ObjectMeta{Name: "cnpg-strategy"},
+		Spec: strategyv1alpha1.CNPGSpec{Template: strategyv1alpha1.CNPGTemplate{
+			BarmanObjectStore: strategyv1alpha1.BarmanObjectStoreTemplate{DestinationPath: "s3://bucket/"},
+		}},
+	}
+	objs := []client.Object{j, strategy, newPostgresApp(rolloutApp, rolloutNS), cluster}
+	for _, p := range pods {
+		objs = append(objs, p)
+	}
+	c := newCNPGStrategyTestClient(t, objs...)
+	return &cnpgRolloutFixture{
+		t: t,
+		c: c,
+		r: &BackupJobReconciler{Client: c, Interface: cnpgDynamicFor(t, cluster)},
+		resolved: &ResolvedBackupConfig{StrategyRef: corev1.TypedLocalObjectReference{
+			APIGroup: &strategyGroup,
+			Kind:     strategyv1alpha1.CNPGStrategyKind,
+			Name:     strategy.Name,
+		}},
+	}
+}
+
+func newRolloutBackupJob(startedAt time.Time) *backupsv1alpha1.BackupJob {
+	apiGroup := backupsv1alpha1.DefaultApplicationAPIGroup
+	started := metav1.NewTime(startedAt)
+	return &backupsv1alpha1.BackupJob{
+		ObjectMeta: metav1.ObjectMeta{Namespace: rolloutNS, Name: "bj"},
+		Spec: backupsv1alpha1.BackupJobSpec{
+			ApplicationRef: corev1.TypedLocalObjectReference{APIGroup: &apiGroup, Kind: postgresAppKind, Name: rolloutApp},
+		},
+		Status: backupsv1alpha1.BackupJobStatus{StartedAt: &started},
+	}
+}
+
+func newRolloutCluster(phase string, plugins ...cnpgtypes.PluginConfiguration) *cnpgtypes.Cluster {
+	return &cnpgtypes.Cluster{
+		ObjectMeta: metav1.ObjectMeta{Namespace: rolloutNS, Name: rolloutCluster, UID: "cluster-uid"},
+		Spec:       cnpgtypes.ClusterSpec{Plugins: plugins},
+		Status:     cnpgtypes.ClusterStatus{Phase: phase},
+	}
+}
+
+func newRolloutInstancePod(created time.Time) *corev1.Pod {
+	return &corev1.Pod{
+		ObjectMeta: metav1.ObjectMeta{
+			Namespace:         rolloutNS,
+			Name:              rolloutCluster + "-1",
+			CreationTimestamp: metav1.NewTime(created),
+			Labels:            map[string]string{cnpgClusterLabel: rolloutCluster, cnpgPodRoleLabel: cnpgPodRoleInstance},
+		},
+		Status: corev1.PodStatus{Conditions: []corev1.PodCondition{{Type: corev1.PodReady, Status: corev1.ConditionTrue}}},
+	}
+}
+
+// pass runs one reconcile and returns the persisted BackupJob and the
+// cnpg.io/Backups that exist afterwards.
+func (f *cnpgRolloutFixture) pass() (*backupsv1alpha1.BackupJob, []cnpgtypes.Backup) {
+	f.t.Helper()
+	ctx := context.Background()
+	key := client.ObjectKey{Namespace: rolloutNS, Name: "bj"}
+	j := &backupsv1alpha1.BackupJob{}
+	if err := f.c.Get(ctx, key, j); err != nil {
+		f.t.Fatalf("get BackupJob: %v", err)
+	}
+	if _, err := f.r.reconcileCNPG(ctx, j, f.resolved); err != nil {
+		f.t.Fatalf("reconcileCNPG: %v", err)
+	}
+	got := &backupsv1alpha1.BackupJob{}
+	if err := f.c.Get(ctx, key, got); err != nil {
+		f.t.Fatalf("get BackupJob after reconcile: %v", err)
+	}
+	backups := &cnpgtypes.BackupList{}
+	if err := f.c.List(ctx, backups, client.InNamespace(rolloutNS)); err != nil {
+		f.t.Fatalf("list cnpg.io/Backups: %v", err)
+	}
+	return got, backups.Items
+}
+
+// observeCNPG makes the next live read see cluster, as CNPG has written it.
+func (f *cnpgRolloutFixture) observeCNPG(cluster *cnpgtypes.Cluster) {
+	f.r.Interface = cnpgDynamicFor(f.t, cluster)
+}
+
+func (f *cnpgRolloutFixture) replacePod(old, recreated *corev1.Pod) {
+	f.t.Helper()
+	if err := f.c.Delete(context.Background(), old); err != nil {
+		f.t.Fatalf("delete pod: %v", err)
+	}
+	if err := f.c.Create(context.Background(), recreated); err != nil {
+		f.t.Fatalf("create pod: %v", err)
+	}
+}
+
+// TestReconcileCNPG_WaitsForPluginRolloutBeforeBackup covers the first backup
+// of a Cluster that had no barman-cloud plugin. Attaching it makes CNPG roll
+// every instance, and a cnpg.io/Backup created before the rollout is over
+// fails for good ("requested plugin is not available"). No Backup may exist
+// until the instances have been recreated and CNPG reports the Cluster
+// healthy again, including in the window where CNPG has not reconciled the
+// new spec yet and the phase still reads healthy from before.
+func TestReconcileCNPG_WaitsForPluginRolloutBeforeBackup(t *testing.T) {
+	oldPod := newRolloutInstancePod(time.Now().Add(-time.Hour).Truncate(time.Second))
+	f := newCNPGRolloutFixture(t, newRolloutBackupJob(time.Now().Add(-time.Minute)),
+		newRolloutCluster(cnpgClusterHealthyPhase), oldPod)
+
+	j, backups := f.pass()
+	if len(backups) != 0 {
+		t.Fatalf("a cnpg.io/Backup was created before the plugin was even attached: %+v", backups)
+	}
+	if cond := apimeta.FindStatusCondition(j.Status.Conditions, backupCondPluginRolledOut); cond == nil || cond.Status != metav1.ConditionFalse {
+		t.Fatalf("%s condition = %+v, want False before the plugin is attached", backupCondPluginRolledOut, cond)
+	}
+	if cond := apimeta.FindStatusCondition(j.Status.Conditions, "Ready"); cond == nil || cond.Reason != "WaitingForPluginRollout" {
+		t.Fatalf("Ready condition = %+v, want reason WaitingForPluginRollout", cond)
+	}
+	attachedAt := apimeta.FindStatusCondition(j.Status.Conditions, backupCondPluginRolledOut).LastTransitionTime
+
+	_, backups = f.pass()
+	if len(backups) != 0 {
+		t.Fatalf("a cnpg.io/Backup was created in the pass that attached the plugin: %+v", backups)
+	}
+	attached := &cnpgtypes.Cluster{}
+	if err := f.c.Get(context.Background(), client.ObjectKey{Namespace: rolloutNS, Name: rolloutCluster}, attached); err != nil {
+		t.Fatalf("get Cluster: %v", err)
+	}
+	if currentBarmanServerName(attached) == "" {
+		t.Fatalf("the barman-cloud plugin was never attached: %+v", attached.Spec.Plugins)
+	}
+
+	// CNPG has not picked the new spec up yet: its phase is the one from
+	// before the attach.
+	f.observeCNPG(newRolloutCluster(cnpgClusterHealthyPhase, attached.Spec.Plugins...))
+	j, backups = f.pass()
+	if len(backups) != 0 {
+		t.Fatalf("a cnpg.io/Backup was created on a stale healthy phase, against instances without the plugin: %+v", backups)
+	}
+	if cond := apimeta.FindStatusCondition(j.Status.Conditions, "Ready"); cond == nil || !strings.Contains(cond.Message, "predates") {
+		t.Fatalf("Ready condition = %+v, want the instance pod that predates the plugin in its message", cond)
+	}
+
+	rolling := newRolloutCluster("Upgrading cluster", attached.Spec.Plugins...)
+	rolling.Status.PhaseReason = "Restarting instance postgres-app-1, because: volumes: element plugins has been added"
+	f.observeCNPG(rolling)
+	recreated := newRolloutInstancePod(attachedAt.Add(time.Minute))
+	f.replacePod(oldPod, recreated)
+	j, backups = f.pass()
+	if len(backups) != 0 {
+		t.Fatalf("a cnpg.io/Backup was created while CNPG was rolling the instances: %+v", backups)
+	}
+	if cond := apimeta.FindStatusCondition(j.Status.Conditions, "Ready"); cond == nil || !strings.Contains(cond.Message, "Upgrading cluster") {
+		t.Fatalf("Ready condition = %+v, want the rolling phase in its message", cond)
+	}
+
+	f.observeCNPG(newRolloutCluster(cnpgClusterHealthyPhase, attached.Spec.Plugins...))
+	j, backups = f.pass()
+	if len(backups) != 1 {
+		t.Fatalf("got %d cnpg.io/Backups once the rollout is over, want 1", len(backups))
+	}
+	if j.Status.Phase != backupsv1alpha1.BackupJobPhaseRunning {
+		t.Errorf("BackupJob phase = %q, want Running", j.Status.Phase)
+	}
+	if !apimeta.IsStatusConditionTrue(j.Status.Conditions, backupCondPluginRolledOut) {
+		t.Errorf("%s condition = %+v, want True", backupCondPluginRolledOut, apimeta.FindStatusCondition(j.Status.Conditions, backupCondPluginRolledOut))
+	}
+	if cond := apimeta.FindStatusCondition(j.Status.Conditions, "Ready"); cond != nil {
+		t.Errorf("Ready condition = %+v left over from the wait while the backup runs", cond)
+	}
+}
+
+// TestReconcileCNPG_AttachedPluginDoesNotDelayBackup: a Cluster that already
+// runs the plugin is not rolled by the driver, so its Backup is created on the
+// first pass, whatever the age of its pods.
+func TestReconcileCNPG_AttachedPluginDoesNotDelayBackup(t *testing.T) {
+	f := newCNPGRolloutFixture(t, newRolloutBackupJob(time.Now().Add(-time.Minute)),
+		newRolloutCluster(cnpgClusterHealthyPhase, buildBarmanPlugin(rolloutCluster, rolloutCluster)),
+		newRolloutInstancePod(time.Now().Add(-time.Hour)))
+
+	j, backups := f.pass()
+	if len(backups) != 1 {
+		t.Fatalf("got %d cnpg.io/Backups on the first pass, want 1", len(backups))
+	}
+	if cond := apimeta.FindStatusCondition(j.Status.Conditions, backupCondPluginRolledOut); cond != nil {
+		t.Errorf("%s condition = %+v on a Cluster the driver did not roll", backupCondPluginRolledOut, cond)
+	}
+}
+
+// TestReconcileCNPG_PluginRolloutWaitIsBounded: a rollout that never ends
+// fails the BackupJob at the backup deadline instead of holding it Running.
+func TestReconcileCNPG_PluginRolloutWaitIsBounded(t *testing.T) {
+	startedAt := time.Now().Add(-cnpgDefaultBackupDeadline - time.Minute)
+	j := newRolloutBackupJob(startedAt)
+	j.Status.Conditions = []metav1.Condition{{
+		Type:               backupCondPluginRolledOut,
+		Status:             metav1.ConditionFalse,
+		Reason:             "WaitingForPluginRollout",
+		LastTransitionTime: metav1.NewTime(startedAt),
+	}}
+	f := newCNPGRolloutFixture(t, j,
+		newRolloutCluster("Waiting for user action", buildBarmanPlugin(rolloutCluster, rolloutCluster)),
+		newRolloutInstancePod(startedAt.Add(-time.Hour)))
+
+	got, backups := f.pass()
+	if len(backups) != 0 {
+		t.Fatalf("a cnpg.io/Backup was created against an unfinished rollout: %+v", backups)
+	}
+	if got.Status.Phase != backupsv1alpha1.BackupJobPhaseFailed {
+		t.Fatalf("BackupJob phase = %q, want Failed past the deadline", got.Status.Phase)
+	}
+	if !strings.Contains(got.Status.Message, "Waiting for user action") {
+		t.Errorf("BackupJob message = %q, want the phase CNPG is stuck in", got.Status.Message)
+	}
+}
+
+// TestReconcileCNPGRestore_MissingStrategyFailsClosedAfterDeadline covers the
+// restore-path blocker: a RestoreJob whose referenced CNPG Strategy CR never
+// appears must NOT requeue forever. requeueRestoreStrategyNotReady gates
+// terminal-vs-transient on Status.StartedAt, and the "fail closed" guarantee
+// only holds if every driver stamps StartedAt before it can reach the Strategy
+// NotFound branch. reconcileCNPGRestore stamps StartedAt and returns early on
+// the first reconcile (well before the strategy lookup), so the deadline clock
+// starts even when the job begins with StartedAt==nil; once the deadline
+// elapses the next reconcile flips the RestoreJob to Phase=Failed.
+//
+// The existing TestRequeueRestoreStrategyNotReady_BoundedByDeadline only
+// exercises the helper in isolation with StartedAt pre-populated, so it cannot
+// catch a driver that reaches the NotFound branch without ever stamping
+// StartedAt. This test proves the guarantee end to end at the driver call site.
+func TestReconcileCNPGRestore_MissingStrategyFailsClosedAfterDeadline(t *testing.T) {
+	apiGroup := backupsv1alpha1.DefaultApplicationAPIGroup
+	strategyGroup := strategyv1alpha1.GroupVersion.Group
+
+	backup := &backupsv1alpha1.Backup{
+		ObjectMeta: metav1.ObjectMeta{Namespace: "tenant", Name: "bk"},
+		Spec: backupsv1alpha1.BackupSpec{
+			ApplicationRef: corev1.TypedLocalObjectReference{APIGroup: &apiGroup, Kind: postgresAppKind, Name: "pg"},
+			StrategyRef: corev1.TypedLocalObjectReference{
+				APIGroup: &strategyGroup, Kind: strategyv1alpha1.CNPGStrategyKind, Name: "missing-strategy",
+			},
+		},
+	}
+	// Status.StartedAt deliberately nil: the driver itself must start the clock.
+	rj := &backupsv1alpha1.RestoreJob{
+		ObjectMeta: metav1.ObjectMeta{Namespace: "tenant", Name: "rj"},
+		Spec:       backupsv1alpha1.RestoreJobSpec{BackupRef: corev1.LocalObjectReference{Name: backup.Name}},
+	}
+	// No CNPG Strategy CR seeded - the NotFound branch is the point.
+	c := newCNPGStrategyTestClient(t, backup, rj)
+	r := &RestoreJobReconciler{Client: c}
+	ctx := context.Background()
+
+	// Pass 1: StartedAt is nil, so the driver stamps it and requeues. It must
+	// NOT fail yet - the bootstrap grace window has only just opened.
+	res, err := r.reconcileCNPGRestore(ctx, rj, backup)
+	if err != nil {
+		t.Fatalf("pass 1 reconcileCNPGRestore: %v", err)
+	}
+	if res.RequeueAfter == 0 {
+		t.Fatalf("pass 1 must requeue after stamping StartedAt, got %+v", res)
+	}
+	persisted := &backupsv1alpha1.RestoreJob{}
+	if err := c.Get(ctx, client.ObjectKeyFromObject(rj), persisted); err != nil {
+		t.Fatalf("get after pass 1: %v", err)
+	}
+	if persisted.Status.StartedAt == nil {
+		t.Fatalf("driver did not stamp StartedAt before the Strategy NotFound branch; " +
+			"the deadline clock would never start and the RestoreJob would requeue forever")
+	}
+	if persisted.Status.Phase == backupsv1alpha1.RestoreJobPhaseFailed {
+		t.Fatalf("must not fail within the grace window, got Phase=%q", persisted.Status.Phase)
+	}
+
+	// Simulate StrategyNotReadyDeadline of wall-clock elapsing by backdating the
+	// persisted StartedAt past the deadline.
+	stale := metav1.NewTime(persisted.Status.StartedAt.Add(-StrategyNotReadyDeadline - time.Minute))
+	base := persisted.DeepCopy()
+	persisted.Status.StartedAt = &stale
+	if err := c.Status().Patch(ctx, persisted, client.MergeFrom(base)); err != nil {
+		t.Fatalf("backdate StartedAt: %v", err)
+	}
+
+	// Pass 2: StartedAt is now past the deadline and the Strategy CR still does
+	// not exist, so the driver call site must fail closed.
+	reloaded := &backupsv1alpha1.RestoreJob{}
+	if err := c.Get(ctx, client.ObjectKeyFromObject(rj), reloaded); err != nil {
+		t.Fatalf("get before pass 2: %v", err)
+	}
+	res, err = r.reconcileCNPGRestore(ctx, reloaded, backup)
+	if err != nil {
+		t.Fatalf("pass 2 reconcileCNPGRestore: %v", err)
+	}
+	if res.RequeueAfter != 0 {
+		t.Fatalf("terminal failure must not requeue, got %+v", res)
+	}
+	final := &backupsv1alpha1.RestoreJob{}
+	if err := c.Get(ctx, client.ObjectKeyFromObject(rj), final); err != nil {
+		t.Fatalf("get after pass 2: %v", err)
+	}
+	if final.Status.Phase != backupsv1alpha1.RestoreJobPhaseFailed {
+		t.Fatalf("expected Phase=Failed once the deadline elapsed, got %q", final.Status.Phase)
+	}
+	if !strings.Contains(final.Status.Message, "missing-strategy") {
+		t.Errorf("failure message should name the missing strategy, got %q", final.Status.Message)
+	}
+}
+
+// TestReconcileCNPGRestore_RepeatInPlacePurgesStaleRecoveryCluster is the
+// reconcile-level regression test for #3311. The pure-function tests
+// (TestCNPGPurgeNeeded / TestCNPGClusterFreshlyRecovered) lock in the truth
+// table, but the bug lived at the call site: a repeat in-place restore fed the
+// purge decision the wrong signal and skipped the destructive purge, so the
+// job reported Succeeded against untouched data. This drives the real
+// reconcileCNPGRestore path with a fake client and asserts the destructive
+// purge actually fires for a stale leftover recovery Cluster - and, in the
+// mirror case, that a Cluster this restore just re-created is NOT re-purged
+// (the status-write-race protection the guard was originally built for).
+func TestReconcileCNPGRestore_RepeatInPlacePurgesStaleRecoveryCluster(t *testing.T) {
+	const (
+		ns          = "tenant"
+		appName     = "app"
+		clusterName = "postgres-app"
+		cnpgBkName  = "cnpgbk"
+	)
+	apiGroup := backupsv1alpha1.DefaultApplicationAPIGroup
+	strategyGroup := strategyv1alpha1.GroupVersion.Group
+	ctx := context.Background()
+
+	// startedAt anchors the discriminator: a stale leftover Cluster predates
+	// it, a freshly-recovered one postdates it.
+	startedAt := metav1.NewTime(time.Now())
+
+	mkBackupArtifact := func(t *testing.T) *backupsv1alpha1.Backup {
+		t.Helper()
+		snap, err := marshalCNPGBackupSnapshot(newPostgresApp(appName, ns), nil, "")
+		if err != nil {
+			t.Fatalf("marshal snapshot: %v", err)
+		}
+		return &backupsv1alpha1.Backup{
+			ObjectMeta: metav1.ObjectMeta{Namespace: ns, Name: "bk"},
+			Spec: backupsv1alpha1.BackupSpec{
+				ApplicationRef: corev1.TypedLocalObjectReference{APIGroup: &apiGroup, Kind: postgresAppKind, Name: appName},
+				StrategyRef:    corev1.TypedLocalObjectReference{APIGroup: &strategyGroup, Kind: strategyv1alpha1.CNPGStrategyKind, Name: "cnpg-strategy"},
+				DriverMetadata: map[string]string{
+					cnpgServerNameKey:      appName,
+					cnpgDestinationPathKey: "s3://bucket/" + appName + "/",
+					cnpgBackupNameKey:      cnpgBkName,
+				},
+			},
+			Status: backupsv1alpha1.BackupStatus{UnderlyingResources: snap},
+		}
+	}
+	strategy := &strategyv1alpha1.CNPG{
+		ObjectMeta: metav1.ObjectMeta{Name: "cnpg-strategy"},
+		Spec: strategyv1alpha1.CNPGSpec{
+			Template: strategyv1alpha1.CNPGTemplate{
+				BarmanObjectStore: strategyv1alpha1.BarmanObjectStoreTemplate{DestinationPath: "s3://bucket/"},
+			},
+		},
+	}
+	// A completed cnpg.io/Backup with endWal set clears the WAL-archive gate
+	// so the reconcile can reach the purge step.
+	cnpgBackup := &cnpgtypes.Backup{
+		ObjectMeta: metav1.ObjectMeta{Namespace: ns, Name: cnpgBkName},
+		Spec:       cnpgtypes.BackupSpec{Cluster: cnpgtypes.ClusterReference{Name: clusterName}},
+		Status:     cnpgtypes.BackupStatus{Phase: cnpgBackupPhaseComplete, EndWal: "000000010000000000000003"},
+	}
+	mkRecoveryCluster := func(created metav1.Time) *cnpgtypes.Cluster {
+		return &cnpgtypes.Cluster{
+			ObjectMeta: metav1.ObjectMeta{Namespace: ns, Name: clusterName, CreationTimestamp: created},
+			Spec: cnpgtypes.ClusterSpec{
+				Bootstrap: &cnpgtypes.BootstrapConfiguration{
+					Recovery: &cnpgtypes.RecoverySource{Source: appName},
+				},
+			},
+		}
+	}
+	mkClusterPVC := func() *corev1.PersistentVolumeClaim {
+		return &corev1.PersistentVolumeClaim{
+			ObjectMeta: metav1.ObjectMeta{Namespace: ns, Name: clusterName + "-1", Labels: map[string]string{cnpgClusterLabel: clusterName}},
+		}
+	}
+	mkRestoreJob := func() *backupsv1alpha1.RestoreJob {
+		sa := startedAt
+		return &backupsv1alpha1.RestoreJob{
+			ObjectMeta: metav1.ObjectMeta{Namespace: ns, Name: "rj"},
+			Spec:       backupsv1alpha1.RestoreJobSpec{BackupRef: corev1.LocalObjectReference{Name: "bk"}},
+			Status:     backupsv1alpha1.RestoreJobStatus{StartedAt: &sa, Phase: backupsv1alpha1.RestoreJobPhaseRunning},
+		}
+	}
+
+	t.Run("stale leftover recovery cluster from a prior restore is purged", func(t *testing.T) {
+		backup := mkBackupArtifact(t)
+		// creationTimestamp an hour before StartedAt: leftover from a prior restore.
+		stale := metav1.NewTime(startedAt.Add(-time.Hour))
+		c := newCNPGStrategyTestClient(t, backup, mkRestoreJob(), strategy, cnpgBackup,
+			newPostgresApp(appName, ns), mkRecoveryCluster(stale), mkClusterPVC())
+		r := &RestoreJobReconciler{Client: c, Interface: dynamicfake.NewSimpleDynamicClient(testCNPGScheme(t)), Recorder: record.NewFakeRecorder(10)}
+
+		rj := &backupsv1alpha1.RestoreJob{}
+		if err := c.Get(ctx, client.ObjectKey{Namespace: ns, Name: "rj"}, rj); err != nil {
+			t.Fatalf("get seeded RestoreJob: %v", err)
+		}
+		if _, err := r.reconcileCNPGRestore(ctx, rj, backup); err != nil {
+			t.Fatalf("reconcileCNPGRestore: %v", err)
+		}
+
+		// The stale Cluster (and its labelled PVC) must have been purged.
+		err := c.Get(ctx, client.ObjectKey{Namespace: ns, Name: clusterName}, &cnpgtypes.Cluster{})
+		if !apierrors.IsNotFound(err) {
+			t.Fatalf("expected stale Cluster to be purged (NotFound), got err=%v", err)
+		}
+		pvcs := &corev1.PersistentVolumeClaimList{}
+		if err := c.List(ctx, pvcs, client.InNamespace(ns), client.MatchingLabels{cnpgClusterLabel: clusterName}); err != nil {
+			t.Fatalf("list PVCs: %v", err)
+		}
+		if len(pvcs.Items) != 0 {
+			t.Fatalf("expected cluster PVCs purged, still have %d", len(pvcs.Items))
+		}
+	})
+
+	t.Run("unmarked cluster this restore's values rendered is not re-purged", func(t *testing.T) {
+		backup := mkBackupArtifact(t)
+		// creationTimestamp a minute after StartedAt: this restore's own
+		// re-render by a chart that does not annotate the Cluster.
+		fresh := metav1.NewTime(startedAt.Add(time.Minute))
+		rjSeed := mkRestoreJob()
+		app := newPostgresApp(appName, ns)
+		app.Spec.Bootstrap.NewServerName = restoredServerName(clusterName, rjSeed.UID)
+		c := newCNPGStrategyTestClient(t, backup, rjSeed, strategy, cnpgBackup,
+			app, mkRecoveryCluster(fresh))
+		r := &RestoreJobReconciler{Client: c, Interface: dynamicfake.NewSimpleDynamicClient(testCNPGScheme(t)), Recorder: record.NewFakeRecorder(10)}
+
+		rj := &backupsv1alpha1.RestoreJob{}
+		if err := c.Get(ctx, client.ObjectKey{Namespace: ns, Name: "rj"}, rj); err != nil {
+			t.Fatalf("get seeded RestoreJob: %v", err)
+		}
+		if _, err := r.reconcileCNPGRestore(ctx, rj, backup); err != nil {
+			t.Fatalf("reconcileCNPGRestore: %v", err)
+		}
+
+		// The freshly-recovered Cluster must survive - re-purging it would
+		// destroy the recovery this restore just started (the status-write-race
+		// protection the guard was built for).
+		got := &cnpgtypes.Cluster{}
+		if err := c.Get(ctx, client.ObjectKey{Namespace: ns, Name: clusterName}, got); err != nil {
+			t.Fatalf("expected freshly-recovered Cluster to survive, got err=%v", err)
+		}
+		if !got.DeletionTimestamp.IsZero() {
+			t.Fatalf("freshly-recovered Cluster must not be marked for deletion")
+		}
+	})
+
+	// A manually configured recovery (bootstrap.enabled without
+	// newServerName) renders no annotation. Re-rendered after StartedAt but
+	// before this restore patches the values, it holds the manual recovery
+	// source, not this restore's backup.
+	t.Run("unmarked cluster from values this restore has not patched is purged even when created after start", func(t *testing.T) {
+		backup := mkBackupArtifact(t)
+		fresh := metav1.NewTime(startedAt.Add(time.Minute))
+		app := newPostgresApp(appName, ns)
+		app.Spec.Bootstrap.Enabled = true
+		app.Spec.Bootstrap.OldName = "manual-source"
+		c := newCNPGStrategyTestClient(t, backup, mkRestoreJob(), strategy, cnpgBackup,
+			app, mkRecoveryCluster(fresh), mkClusterPVC())
+		r := &RestoreJobReconciler{Client: c, Interface: dynamicfake.NewSimpleDynamicClient(testCNPGScheme(t)), Recorder: record.NewFakeRecorder(10)}
+
+		rj := &backupsv1alpha1.RestoreJob{}
+		if err := c.Get(ctx, client.ObjectKey{Namespace: ns, Name: "rj"}, rj); err != nil {
+			t.Fatalf("get seeded RestoreJob: %v", err)
+		}
+		if _, err := r.reconcileCNPGRestore(ctx, rj, backup); err != nil {
+			t.Fatalf("reconcileCNPGRestore: %v", err)
+		}
+		err := c.Get(ctx, client.ObjectKey{Namespace: ns, Name: clusterName}, &cnpgtypes.Cluster{})
+		if !apierrors.IsNotFound(err) {
+			t.Fatalf("expected the manual recovery Cluster to be purged (NotFound), got err=%v", err)
+		}
+	})
+
+	t.Run("recovery cluster marked by another restore is purged even when created after start", func(t *testing.T) {
+		backup := mkBackupArtifact(t)
+		fresh := metav1.NewTime(startedAt.Add(time.Minute))
+		other := mkRecoveryCluster(fresh)
+		other.Annotations = map[string]string{cnpgRestoredServerNameAnnotation: clusterName + "-restore-0123456789abcdef"}
+		c := newCNPGStrategyTestClient(t, backup, mkRestoreJob(), strategy, cnpgBackup,
+			newPostgresApp(appName, ns), other, mkClusterPVC())
+		r := &RestoreJobReconciler{Client: c, Interface: dynamicfake.NewSimpleDynamicClient(testCNPGScheme(t)), Recorder: record.NewFakeRecorder(10)}
+
+		rj := &backupsv1alpha1.RestoreJob{}
+		if err := c.Get(ctx, client.ObjectKey{Namespace: ns, Name: "rj"}, rj); err != nil {
+			t.Fatalf("get seeded RestoreJob: %v", err)
+		}
+		if _, err := r.reconcileCNPGRestore(ctx, rj, backup); err != nil {
+			t.Fatalf("reconcileCNPGRestore: %v", err)
+		}
+		err := c.Get(ctx, client.ObjectKey{Namespace: ns, Name: clusterName}, &cnpgtypes.Cluster{})
+		if !apierrors.IsNotFound(err) {
+			t.Fatalf("expected another restore's Cluster to be purged (NotFound), got err=%v", err)
+		}
+	})
+
+	// The mark the purge decision expects has to be the one the restore patch
+	// writes into bootstrap.newServerName, which the chart renders onto the
+	// Cluster. The Cluster here predates StartedAt, so only a matching mark
+	// keeps it: the creation-time fallback would purge it.
+	t.Run("recovery cluster carrying the mark this restore's patch wrote is not re-purged", func(t *testing.T) {
+		backup := mkBackupArtifact(t)
+		stale := metav1.NewTime(startedAt.Add(-time.Hour))
+		c := newCNPGStrategyTestClient(t, backup, mkRestoreJob(), strategy, cnpgBackup,
+			newPostgresApp(appName, ns), mkRecoveryCluster(stale), mkClusterPVC())
+		r := &RestoreJobReconciler{Client: c, Interface: dynamicfake.NewSimpleDynamicClient(testCNPGScheme(t)), Recorder: record.NewFakeRecorder(10)}
+
+		rj := &backupsv1alpha1.RestoreJob{}
+		if err := c.Get(ctx, client.ObjectKey{Namespace: ns, Name: "rj"}, rj); err != nil {
+			t.Fatalf("get seeded RestoreJob: %v", err)
+		}
+		if _, err := r.reconcileCNPGRestore(ctx, rj, backup); err != nil {
+			t.Fatalf("first reconcileCNPGRestore: %v", err)
+		}
+		if err := c.Get(ctx, client.ObjectKey{Namespace: ns, Name: clusterName}, &cnpgtypes.Cluster{}); !apierrors.IsNotFound(err) {
+			t.Fatalf("first pass should purge the stale Cluster, got err=%v", err)
+		}
+		app := &postgresapp.Postgres{}
+		if err := c.Get(ctx, client.ObjectKey{Namespace: ns, Name: appName}, app); err != nil {
+			t.Fatalf("get patched Postgres app: %v", err)
+		}
+		mark := app.Spec.Bootstrap.NewServerName
+		if mark == "" {
+			t.Fatalf("the restore patch left bootstrap.newServerName empty")
+		}
+
+		// The chart re-renders the Cluster from the patched values, and the
+		// TargetPurged status write is lost.
+		rendered := mkRecoveryCluster(stale)
+		rendered.Annotations = map[string]string{cnpgRestoredServerNameAnnotation: mark}
+		if err := c.Create(ctx, rendered); err != nil {
+			t.Fatalf("create re-rendered Cluster: %v", err)
+		}
+		if err := c.Get(ctx, client.ObjectKey{Namespace: ns, Name: "rj"}, rj); err != nil {
+			t.Fatalf("reload RestoreJob: %v", err)
+		}
+		apimeta.RemoveStatusCondition(&rj.Status.Conditions, restoreCondTargetPurged)
+		if err := c.Status().Update(ctx, rj); err != nil {
+			t.Fatalf("drop TargetPurged: %v", err)
+		}
+
+		if _, err := r.reconcileCNPGRestore(ctx, rj, backup); err != nil {
+			t.Fatalf("second reconcileCNPGRestore: %v", err)
+		}
+		got := &cnpgtypes.Cluster{}
+		if err := c.Get(ctx, client.ObjectKey{Namespace: ns, Name: clusterName}, got); err != nil {
+			t.Fatalf("expected the Cluster this restore rendered to survive, got err=%v", err)
+		}
+		if !got.DeletionTimestamp.IsZero() {
+			t.Fatalf("the Cluster this restore rendered must not be marked for deletion")
+		}
+	})
+}
+
+// TestReconcileCNPGRestore_RefusesCrossFlavorRestore: a physical backup only
+// restores onto the image family it was taken from. The postgresql and
+// postgis images ship different glibc versions, and postgis objects need the
+// postgis libraries, so a cross-flavor RestoreJob must fail before the purge
+// deletes the target's Cluster and PVCs. A snapshot without a flavor predates
+// flavors and therefore comes from a postgresql cluster.
+func TestReconcileCNPGRestore_RefusesCrossFlavorRestore(t *testing.T) {
+	const (
+		ns          = "tenant"
+		appName     = "app"
+		clusterName = "postgres-app"
+		cnpgBkName  = "cnpgbk"
+	)
+	apiGroup := backupsv1alpha1.DefaultApplicationAPIGroup
+	strategyGroup := strategyv1alpha1.GroupVersion.Group
+	ctx := context.Background()
+	startedAt := metav1.NewTime(time.Now())
+
+	strategy := &strategyv1alpha1.CNPG{
+		ObjectMeta: metav1.ObjectMeta{Name: "cnpg-strategy"},
+		Spec: strategyv1alpha1.CNPGSpec{
+			Template: strategyv1alpha1.CNPGTemplate{
+				BarmanObjectStore: strategyv1alpha1.BarmanObjectStoreTemplate{DestinationPath: "s3://bucket/"},
+			},
+		},
+	}
+	cnpgBackup := &cnpgtypes.Backup{
+		ObjectMeta: metav1.ObjectMeta{Namespace: ns, Name: cnpgBkName},
+		Spec:       cnpgtypes.BackupSpec{Cluster: cnpgtypes.ClusterReference{Name: clusterName}},
+		Status:     cnpgtypes.BackupStatus{Phase: cnpgBackupPhaseComplete, EndWal: "000000010000000000000003"},
+	}
+
+	cases := []struct {
+		name          string
+		sourceFlavor  string
+		targetFlavor  string
+		wantFailed    bool
+		wantInMessage string
+	}{
+		{name: "postgis backup into a postgresql app", sourceFlavor: "postgis", targetFlavor: "", wantFailed: true, wantInMessage: "taken from a postgis cluster"},
+		{name: "pre-flavor backup into a postgis app", sourceFlavor: "", targetFlavor: "postgis", wantFailed: true, wantInMessage: "taken from a postgresql cluster"},
+		{name: "postgis backup into a postgis app", sourceFlavor: "postgis", targetFlavor: "postgis", wantFailed: false},
+	}
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			snap, err := marshalCNPGBackupSnapshot(newPostgresApp(appName, ns), nil, tc.sourceFlavor)
+			if err != nil {
+				t.Fatalf("marshal snapshot: %v", err)
+			}
+			backup := &backupsv1alpha1.Backup{
+				ObjectMeta: metav1.ObjectMeta{Namespace: ns, Name: "bk"},
+				Spec: backupsv1alpha1.BackupSpec{
+					ApplicationRef: corev1.TypedLocalObjectReference{APIGroup: &apiGroup, Kind: postgresAppKind, Name: appName},
+					StrategyRef:    corev1.TypedLocalObjectReference{APIGroup: &strategyGroup, Kind: strategyv1alpha1.CNPGStrategyKind, Name: "cnpg-strategy"},
+					DriverMetadata: map[string]string{
+						cnpgServerNameKey:      appName,
+						cnpgDestinationPathKey: "s3://bucket/" + appName + "/",
+						cnpgBackupNameKey:      cnpgBkName,
+					},
+				},
+				Status: backupsv1alpha1.BackupStatus{UnderlyingResources: snap},
+			}
+			target := newPostgresApp(appName, ns)
+			target.Spec.Flavor = tc.targetFlavor
+			sa := startedAt
+			restoreJob := &backupsv1alpha1.RestoreJob{
+				ObjectMeta: metav1.ObjectMeta{Namespace: ns, Name: "rj"},
+				Spec:       backupsv1alpha1.RestoreJobSpec{BackupRef: corev1.LocalObjectReference{Name: "bk"}},
+				Status:     backupsv1alpha1.RestoreJobStatus{StartedAt: &sa, Phase: backupsv1alpha1.RestoreJobPhaseRunning},
+			}
+			liveCluster := &cnpgtypes.Cluster{
+				ObjectMeta: metav1.ObjectMeta{Namespace: ns, Name: clusterName, CreationTimestamp: metav1.NewTime(startedAt.Add(-time.Hour))},
+			}
+			pvc := &corev1.PersistentVolumeClaim{
+				ObjectMeta: metav1.ObjectMeta{Namespace: ns, Name: clusterName + "-1", Labels: map[string]string{cnpgClusterLabel: clusterName}},
+			}
+			c := newCNPGStrategyTestClient(t, backup, restoreJob, strategy, cnpgBackup, target, liveCluster, pvc)
+			r := &RestoreJobReconciler{Client: c, Interface: dynamicfake.NewSimpleDynamicClient(testCNPGScheme(t)), Recorder: record.NewFakeRecorder(10)}
+
+			rj := &backupsv1alpha1.RestoreJob{}
+			if err := c.Get(ctx, client.ObjectKey{Namespace: ns, Name: "rj"}, rj); err != nil {
+				t.Fatalf("get seeded RestoreJob: %v", err)
+			}
+			if _, err := r.reconcileCNPGRestore(ctx, rj, backup); err != nil {
+				t.Fatalf("reconcileCNPGRestore: %v", err)
+			}
+
+			got := &backupsv1alpha1.RestoreJob{}
+			if err := c.Get(ctx, client.ObjectKey{Namespace: ns, Name: "rj"}, got); err != nil {
+				t.Fatalf("get RestoreJob: %v", err)
+			}
+			clusterErr := c.Get(ctx, client.ObjectKey{Namespace: ns, Name: clusterName}, &cnpgtypes.Cluster{})
+			app, err := r.getPostgresApp(ctx, ns, appName)
+			if err != nil {
+				t.Fatalf("get target app: %v", err)
+			}
+
+			if !tc.wantFailed {
+				if got.Status.Phase == backupsv1alpha1.RestoreJobPhaseFailed {
+					t.Fatalf("same-flavor restore must proceed, got Failed: %s", got.Status.Message)
+				}
+				if !apierrors.IsNotFound(clusterErr) {
+					t.Fatalf("same-flavor restore must purge the target Cluster, got err=%v", clusterErr)
+				}
+				return
+			}
+			if got.Status.Phase != backupsv1alpha1.RestoreJobPhaseFailed {
+				t.Fatalf("cross-flavor restore must fail, got phase %q", got.Status.Phase)
+			}
+			if !strings.Contains(got.Status.Message, tc.wantInMessage) || !strings.Contains(got.Status.Message, "pg_dump") {
+				t.Errorf("failure message must name the source flavor and point to a logical dump, got %q", got.Status.Message)
+			}
+			if clusterErr != nil {
+				t.Fatalf("cross-flavor restore must leave the target Cluster in place, got err=%v", clusterErr)
+			}
+			pvcs := &corev1.PersistentVolumeClaimList{}
+			if err := c.List(ctx, pvcs, client.InNamespace(ns), client.MatchingLabels{cnpgClusterLabel: clusterName}); err != nil {
+				t.Fatalf("list PVCs: %v", err)
+			}
+			if len(pvcs.Items) != 1 {
+				t.Fatalf("cross-flavor restore must leave the target PVCs in place, have %d", len(pvcs.Items))
+			}
+			if app.Spec.Bootstrap.Enabled {
+				t.Fatalf("cross-flavor restore must not patch the target app for recovery")
+			}
+		})
+	}
+}
+
+// TestReconcileCNPGRestore_HealthyClusterSucceeds drives the reconcile to its
+// success branch: with the target already purged (TargetPurged=True) and the
+// recovery Cluster reporting healthy, the RestoreJob must reach phase
+// Succeeded with Ready=True AND the new RecoveryConverged=True condition.
+func TestReconcileCNPGRestore_HealthyClusterSucceeds(t *testing.T) {
+	const (
+		ns          = "tenant"
+		appName     = "app"
+		clusterName = "postgres-app"
+		cnpgBkName  = "cnpgbk"
+	)
 	apiGroup := backupsv1alpha1.DefaultApplicationAPIGroup
 	strategyGroup := strategyv1alpha1.GroupVersion.Group
+	ctx := context.Background()
+	startedAt := metav1.NewTime(time.Now())
 
+	snap, err := marshalCNPGBackupSnapshot(newPostgresApp(appName, ns), nil, "")
+	if err != nil {
+		t.Fatalf("marshal snapshot: %v", err)
+	}
 	backup := &backupsv1alpha1.Backup{
-		ObjectMeta: metav1.ObjectMeta{Namespace: "tenant", Name: "bk"},
+		ObjectMeta: metav1.ObjectMeta{Namespace: ns, Name: "bk"},
 		Spec: backupsv1alpha1.BackupSpec{
-			ApplicationRef: corev1.TypedLocalObjectReference{APIGroup: &apiGroup, Kind: postgresAppKind, Name: "pg"},
-			StrategyRef: corev1.TypedLocalObjectReference{
-				APIGroup: &strategyGroup, Kind: strategyv1alpha1.CNPGStrategyKind, Name: "missing-strategy",
+			ApplicationRef: corev1.TypedLocalObjectReference{APIGroup: &apiGroup, Kind: postgresAppKind, Name: appName},
+			StrategyRef:    corev1.TypedLocalObjectReference{APIGroup: &strategyGroup, Kind: strategyv1alpha1.CNPGStrategyKind, Name: "cnpg-strategy"},
+			DriverMetadata: map[string]string{
+				cnpgServerNameKey:      appName,
+				cnpgDestinationPathKey: "s3://bucket/" + appName + "/",
+				cnpgBackupNameKey:      cnpgBkName,
+			},
+		},
+		Status: backupsv1alpha1.BackupStatus{UnderlyingResources: snap},
+	}
+	strategy := &strategyv1alpha1.CNPG{
+		ObjectMeta: metav1.ObjectMeta{Name: "cnpg-strategy"},
+		Spec: strategyv1alpha1.CNPGSpec{Template: strategyv1alpha1.CNPGTemplate{
+			BarmanObjectStore: strategyv1alpha1.BarmanObjectStoreTemplate{DestinationPath: "s3://bucket/"},
+		}},
+	}
+	// Healthy recovery Cluster created after StartedAt (this restore's own).
+	healthyCluster := &cnpgtypes.Cluster{
+		ObjectMeta: metav1.ObjectMeta{Namespace: ns, Name: clusterName, CreationTimestamp: metav1.NewTime(startedAt.Add(time.Minute))},
+		Spec:       cnpgtypes.ClusterSpec{Bootstrap: &cnpgtypes.BootstrapConfiguration{Recovery: &cnpgtypes.RecoverySource{Source: appName}}},
+		Status:     cnpgtypes.ClusterStatus{Phase: cnpgClusterHealthyPhase},
+	}
+	sa := startedAt
+	restoreJob := &backupsv1alpha1.RestoreJob{
+		ObjectMeta: metav1.ObjectMeta{Namespace: ns, Name: "rj"},
+		Spec:       backupsv1alpha1.RestoreJobSpec{BackupRef: corev1.LocalObjectReference{Name: "bk"}},
+		Status: backupsv1alpha1.RestoreJobStatus{
+			StartedAt: &sa,
+			Phase:     backupsv1alpha1.RestoreJobPhaseRunning,
+			// Purge already done for this restore, so reconcile skips straight
+			// to the wait-for-healthy / success path. A prior reconcile hit a
+			// transient disable error and recorded BootstrapDisablePending=True
+			// within the grace window; the disable now succeeds, so the terminal
+			// success write must clear that pending condition rather than leave it
+			// standing True next to a Succeeded RestoreJob.
+			Conditions: []metav1.Condition{
+				{
+					Type: restoreCondTargetPurged, Status: metav1.ConditionTrue, Reason: "ClusterPurged",
+					LastTransitionTime: startedAt, Message: "purged",
+				},
+				{
+					Type: restoreCondBootstrapDisablePending, Status: metav1.ConditionTrue, Reason: "Retrying",
+					LastTransitionTime: startedAt, Message: "clearing spec.bootstrap.enabled is retrying after a transient error",
+				},
 			},
 		},
 	}
-	// Status.StartedAt deliberately nil: the driver itself must start the clock.
-	rj := &backupsv1alpha1.RestoreJob{
-		ObjectMeta: metav1.ObjectMeta{Namespace: "tenant", Name: "rj"},
-		Spec:       backupsv1alpha1.RestoreJobSpec{BackupRef: corev1.LocalObjectReference{Name: backup.Name}},
+
+	c := newCNPGStrategyTestClient(t, backup, restoreJob, strategy, newPostgresApp(appName, ns), healthyCluster)
+	rec := record.NewFakeRecorder(10)
+	r := &RestoreJobReconciler{Client: c, Interface: dynamicfake.NewSimpleDynamicClient(testCNPGScheme(t)), Recorder: rec}
+
+	// A healthy recovery now converges in two reconciles: the first latches
+	// RecoveryConverged durably and requeues, the second disables bootstrap and
+	// marks Succeeded (see reconcileCNPGRestore's terminal block).
+	got := reconcileCNPGRestoreToTerminal(t, ctx, r, c, backup, ns, "rj")
+	if got.Status.Phase != backupsv1alpha1.RestoreJobPhaseSucceeded {
+		t.Fatalf("expected phase Succeeded, got %q (msg=%q)", got.Status.Phase, got.Status.Message)
+	}
+	if c := apimeta.FindStatusCondition(got.Status.Conditions, "Ready"); c == nil || c.Status != metav1.ConditionTrue {
+		t.Fatalf("expected Ready=True, got %+v", c)
+	}
+	if c := apimeta.FindStatusCondition(got.Status.Conditions, restoreCondRecoveryConverged); c == nil || c.Status != metav1.ConditionTrue {
+		t.Fatalf("expected RecoveryConverged=True, got %+v", c)
+	}
+	// The terminal write must also emit the pending-convergence Event, so the
+	// credential handoff is discoverable in `kubectl get events`, not only in
+	// .status. Dropping the r.Recorder.Eventf call leaves this channel empty.
+	select {
+	case ev := <-rec.Events:
+		if !strings.Contains(ev, "CredentialsConvergencePending") {
+			t.Fatalf("expected a CredentialsConvergencePending event, got %q", ev)
+		}
+	default:
+		t.Fatalf("expected a CredentialsConvergencePending event, got none")
+	}
+	// The pending credential handoff is carried as the REASON on Ready=True (not a
+	// standalone never-True condition): a durable, readable marker that does not
+	// look like a standing failure. Changing the reason back to a bare
+	// "RestoreCompleted" reddens this.
+	if c := apimeta.FindStatusCondition(got.Status.Conditions, "Ready"); c == nil || c.Reason != "RestoreCompletedCredentialsPending" {
+		t.Fatalf("expected Ready reason RestoreCompletedCredentialsPending, got %+v", c)
+	}
+	// The seeded BootstrapDisablePending=True must be closed out on success, not
+	// left standing next to a Succeeded RestoreJob. Dropping the terminal
+	// clear-block reddens this.
+	if c := apimeta.FindStatusCondition(got.Status.Conditions, restoreCondBootstrapDisablePending); c == nil || c.Status != metav1.ConditionFalse || c.Reason != "Cleared" {
+		t.Fatalf("expected BootstrapDisablePending cleared to False/Cleared, got %+v", c)
 	}
-	// No CNPG Strategy CR seeded - the NotFound branch is the point.
-	c := newCNPGStrategyTestClient(t, backup, rj)
-	r := &RestoreJobReconciler{Client: c}
+}
+
+// TestReconcileCNPGRestore_HealthyDisablesBootstrap is the regression guard for
+// the restore-credentials fix: patchPostgresAppForRestore leaves the target app
+// with bootstrap.enabled=true, and while it stays true the chart skips the
+// init-job that reconciles the generated <release>-credentials Secret onto the
+// recovered roles. The recovered roles carry the source's password hashes, the
+// freshly generated Secret does not match them, so without this flip every
+// application-user login against the restored target fails. On convergence the
+// controller must clear bootstrap.enabled so the next HelmRelease upgrade runs
+// that init-job.
+func TestReconcileCNPGRestore_HealthyDisablesBootstrap(t *testing.T) {
+	const (
+		ns          = "tenant"
+		appName     = "app"
+		clusterName = "postgres-app"
+		cnpgBkName  = "cnpgbk"
+	)
+	apiGroup := backupsv1alpha1.DefaultApplicationAPIGroup
+	strategyGroup := strategyv1alpha1.GroupVersion.Group
 	ctx := context.Background()
+	startedAt := metav1.NewTime(time.Now().Add(-time.Hour))
 
-	// Pass 1: StartedAt is nil, so the driver stamps it and requeues. It must
-	// NOT fail yet - the bootstrap grace window has only just opened.
+	snap, err := marshalCNPGBackupSnapshot(newPostgresApp(appName, ns), nil, "")
+	if err != nil {
+		t.Fatalf("marshal snapshot: %v", err)
+	}
+	backup := &backupsv1alpha1.Backup{
+		ObjectMeta: metav1.ObjectMeta{Namespace: ns, Name: "bk"},
+		Spec: backupsv1alpha1.BackupSpec{
+			ApplicationRef: corev1.TypedLocalObjectReference{APIGroup: &apiGroup, Kind: postgresAppKind, Name: appName},
+			StrategyRef:    corev1.TypedLocalObjectReference{APIGroup: &strategyGroup, Kind: strategyv1alpha1.CNPGStrategyKind, Name: "cnpg-strategy"},
+			DriverMetadata: map[string]string{
+				cnpgServerNameKey:      appName,
+				cnpgDestinationPathKey: "s3://bucket/" + appName + "/",
+				cnpgBackupNameKey:      cnpgBkName,
+			},
+		},
+		Status: backupsv1alpha1.BackupStatus{UnderlyingResources: snap},
+	}
+	strategy := &strategyv1alpha1.CNPG{
+		ObjectMeta: metav1.ObjectMeta{Name: "cnpg-strategy"},
+		Spec: strategyv1alpha1.CNPGSpec{Template: strategyv1alpha1.CNPGTemplate{
+			BarmanObjectStore: strategyv1alpha1.BarmanObjectStoreTemplate{DestinationPath: "s3://bucket/"},
+		}},
+	}
+	healthyCluster := &cnpgtypes.Cluster{
+		ObjectMeta: metav1.ObjectMeta{Namespace: ns, Name: clusterName, CreationTimestamp: metav1.NewTime(startedAt.Add(time.Minute))},
+		Spec:       cnpgtypes.ClusterSpec{Bootstrap: &cnpgtypes.BootstrapConfiguration{Recovery: &cnpgtypes.RecoverySource{Source: appName}}},
+		Status:     cnpgtypes.ClusterStatus{Phase: cnpgClusterHealthyPhase},
+	}
+	// The target app is mid-restore: patchPostgresAppForRestore already set
+	// bootstrap.enabled=true (oldName is required alongside it by the schema).
+	app := newPostgresApp(appName, ns)
+	app.Spec.Bootstrap.Enabled = true
+	app.Spec.Bootstrap.OldName = appName
+	sa := startedAt
+	restoreJob := &backupsv1alpha1.RestoreJob{
+		ObjectMeta: metav1.ObjectMeta{Namespace: ns, Name: "rj"},
+		Spec:       backupsv1alpha1.RestoreJobSpec{BackupRef: corev1.LocalObjectReference{Name: "bk"}},
+		Status: backupsv1alpha1.RestoreJobStatus{
+			StartedAt: &sa,
+			Phase:     backupsv1alpha1.RestoreJobPhaseRunning,
+			Conditions: []metav1.Condition{{
+				Type: restoreCondTargetPurged, Status: metav1.ConditionTrue, Reason: "ClusterPurged",
+				LastTransitionTime: startedAt, Message: "purged",
+			}},
+		},
+	}
+
+	c := newCNPGStrategyTestClient(t, backup, restoreJob, strategy, app, healthyCluster)
+	r := &RestoreJobReconciler{Client: c, Interface: dynamicfake.NewSimpleDynamicClient(testCNPGScheme(t)), Recorder: record.NewFakeRecorder(10)}
+
+	got := reconcileCNPGRestoreToTerminal(t, ctx, r, c, backup, ns, "rj")
+	if got.Status.Phase != backupsv1alpha1.RestoreJobPhaseSucceeded {
+		t.Fatalf("expected phase Succeeded, got %q (msg=%q)", got.Status.Phase, got.Status.Message)
+	}
+
+	gotApp := &postgresapp.Postgres{}
+	if err := c.Get(ctx, client.ObjectKey{Namespace: ns, Name: appName}, gotApp); err != nil {
+		t.Fatalf("get target app after reconcile: %v", err)
+	}
+	if gotApp.Spec.Bootstrap.Enabled {
+		t.Fatalf("expected bootstrap.enabled cleared after recovery converged, still true")
+	}
+	// oldName must survive: the app schema requires it whenever the bootstrap
+	// block is present, and clearing it would fail admission on the next apply.
+	if gotApp.Spec.Bootstrap.OldName != appName {
+		t.Fatalf("expected bootstrap.oldName preserved, got %q", gotApp.Spec.Bootstrap.OldName)
+	}
+}
+
+// TestReconcileCNPGRestore_BootstrapDisableFailsPastDeadline is the regression
+// guard for the still-open risk on the disable-bootstrap terminal step: recovery
+// has converged (RecoveryConverged=True latched) but clearing bootstrap.enabled
+// keeps failing - the app was deleted/renamed mid-restore, or a GitOps source
+// re-asserts it. Without a deadline bound the terminal block requeues forever and
+// the RestoreJob sits Running with no Failed/Ready=False. Past the restore
+// deadline it must terminate as Failed with a BootstrapDisableFailed reason.
+func TestReconcileCNPGRestore_BootstrapDisableFailsPastDeadline(t *testing.T) {
+	const (
+		ns          = "tenant"
+		appName     = "app"
+		clusterName = "postgres-app"
+		cnpgBkName  = "cnpgbk"
+	)
+	apiGroup := backupsv1alpha1.DefaultApplicationAPIGroup
+	strategyGroup := strategyv1alpha1.GroupVersion.Group
+	ctx := context.Background()
+	// Well past the 30m default deadline.
+	startedAt := metav1.NewTime(time.Now().Add(-72 * time.Hour))
+
+	snap, err := marshalCNPGBackupSnapshot(newPostgresApp(appName, ns), nil, "")
+	if err != nil {
+		t.Fatalf("marshal snapshot: %v", err)
+	}
+	backup := &backupsv1alpha1.Backup{
+		ObjectMeta: metav1.ObjectMeta{Namespace: ns, Name: "bk"},
+		Spec: backupsv1alpha1.BackupSpec{
+			ApplicationRef: corev1.TypedLocalObjectReference{APIGroup: &apiGroup, Kind: postgresAppKind, Name: appName},
+			StrategyRef:    corev1.TypedLocalObjectReference{APIGroup: &strategyGroup, Kind: strategyv1alpha1.CNPGStrategyKind, Name: "cnpg-strategy"},
+			DriverMetadata: map[string]string{
+				cnpgServerNameKey:      appName,
+				cnpgDestinationPathKey: "s3://bucket/" + appName + "/",
+				cnpgBackupNameKey:      cnpgBkName,
+			},
+		},
+		Status: backupsv1alpha1.BackupStatus{UnderlyingResources: snap},
+	}
+	strategy := &strategyv1alpha1.CNPG{
+		ObjectMeta: metav1.ObjectMeta{Name: "cnpg-strategy"},
+		Spec: strategyv1alpha1.CNPGSpec{Template: strategyv1alpha1.CNPGTemplate{
+			BarmanObjectStore: strategyv1alpha1.BarmanObjectStoreTemplate{DestinationPath: "s3://bucket/"},
+		}},
+	}
+	healthyCluster := &cnpgtypes.Cluster{
+		ObjectMeta: metav1.ObjectMeta{Namespace: ns, Name: clusterName, CreationTimestamp: metav1.NewTime(startedAt.Add(time.Minute))},
+		Spec:       cnpgtypes.ClusterSpec{Bootstrap: &cnpgtypes.BootstrapConfiguration{Recovery: &cnpgtypes.RecoverySource{Source: appName}}},
+		Status:     cnpgtypes.ClusterStatus{Phase: cnpgClusterHealthyPhase},
+	}
+	app := newPostgresApp(appName, ns)
+	app.Spec.Bootstrap.Enabled = true
+	app.Spec.Bootstrap.OldName = appName
+	sa := startedAt
+	restoreJob := &backupsv1alpha1.RestoreJob{
+		ObjectMeta: metav1.ObjectMeta{Namespace: ns, Name: "rj"},
+		Spec:       backupsv1alpha1.RestoreJobSpec{BackupRef: corev1.LocalObjectReference{Name: "bk"}},
+		Status: backupsv1alpha1.RestoreJobStatus{
+			StartedAt: &sa,
+			Phase:     backupsv1alpha1.RestoreJobPhaseRunning,
+			Conditions: []metav1.Condition{
+				{Type: restoreCondTargetPurged, Status: metav1.ConditionTrue, Reason: "ClusterPurged", LastTransitionTime: startedAt, Message: "purged"},
+				{Type: restoreCondRecoveryConverged, Status: metav1.ConditionTrue, Reason: "RecoveryConverged", LastTransitionTime: startedAt, Message: "converged"},
+			},
+		},
+	}
+
+	// A fake client that fails Patch on the Postgres app, so
+	// disablePostgresAppBootstrap can never clear bootstrap.enabled.
+	s := runtime.NewScheme()
+	_ = scheme.AddToScheme(s)
+	_ = backupsv1alpha1.AddToScheme(s)
+	_ = strategyv1alpha1.AddToScheme(s)
+	_ = cnpgtypes.AddToScheme(s)
+	_ = postgresapp.AddToScheme(s)
+	c := clientfake.NewClientBuilder().
+		WithScheme(s).
+		WithObjects(backup, restoreJob, strategy, app, healthyCluster).
+		WithStatusSubresource(&backupsv1alpha1.BackupJob{}, &backupsv1alpha1.RestoreJob{}, &backupsv1alpha1.Backup{}).
+		WithInterceptorFuncs(interceptor.Funcs{
+			Patch: func(ctx context.Context, cl client.WithWatch, obj client.Object, patch client.Patch, opts ...client.PatchOption) error {
+				if _, ok := obj.(*postgresapp.Postgres); ok {
+					return fmt.Errorf("injected bootstrap-disable failure")
+				}
+				return cl.Patch(ctx, obj, patch, opts...)
+			},
+		}).
+		Build()
+	r := &RestoreJobReconciler{Client: c, Interface: dynamicfake.NewSimpleDynamicClient(testCNPGScheme(t)), Recorder: record.NewFakeRecorder(10)}
+
+	rj := &backupsv1alpha1.RestoreJob{}
+	if err := c.Get(ctx, client.ObjectKey{Namespace: ns, Name: "rj"}, rj); err != nil {
+		t.Fatalf("get seeded RestoreJob: %v", err)
+	}
+	if _, err := r.reconcileCNPGRestore(ctx, rj, backup); err != nil {
+		t.Fatalf("reconcileCNPGRestore: %v", err)
+	}
+
+	got := &backupsv1alpha1.RestoreJob{}
+	if err := c.Get(ctx, client.ObjectKey{Namespace: ns, Name: "rj"}, got); err != nil {
+		t.Fatalf("get RestoreJob after reconcile: %v", err)
+	}
+	if got.Status.Phase != backupsv1alpha1.RestoreJobPhaseFailed {
+		t.Fatalf("expected phase Failed when bootstrap-disable keeps failing past the deadline, got %q", got.Status.Phase)
+	}
+	if cond := apimeta.FindStatusCondition(got.Status.Conditions, "Ready"); cond == nil || cond.Reason != "BootstrapDisableFailed" {
+		t.Fatalf("expected Ready=False reason BootstrapDisableFailed, got %+v", cond)
+	}
+}
+
+// TestReconcileCNPGRestore_BootstrapDisableTransientErrorRequeues guards the
+// grace window on the disable step: the health check wins BEFORE the restore
+// deadline on purpose, so recovery may legitimately have spent the whole
+// deadline by the time bootstrap is cleared. The disable step must therefore be
+// bounded from RecoveryConverged's LastTransitionTime, not from StartedAt - or a
+// single transient error on the first disable attempt (StartedAt already past
+// the deadline) would terminate the restore Failed, which on a resubmit lets the
+// purge-guard delete the healthy restored Cluster. A transient failure right
+// after convergence must requeue, not fail.
+func TestReconcileCNPGRestore_BootstrapDisableTransientErrorRequeues(t *testing.T) {
+	const (
+		ns          = "tenant"
+		appName     = "app"
+		clusterName = "postgres-app"
+		cnpgBkName  = "cnpgbk"
+	)
+	apiGroup := backupsv1alpha1.DefaultApplicationAPIGroup
+	strategyGroup := strategyv1alpha1.GroupVersion.Group
+	ctx := context.Background()
+	// StartedAt is well past the 30m restore deadline: a StartedAt-based bound
+	// would fail immediately; convergence just happened, so the disable window is
+	// still open and a transient error must requeue.
+	startedAt := metav1.NewTime(time.Now().Add(-72 * time.Hour))
+	convergedAt := metav1.Now()
+
+	snap, err := marshalCNPGBackupSnapshot(newPostgresApp(appName, ns), nil, "")
+	if err != nil {
+		t.Fatalf("marshal snapshot: %v", err)
+	}
+	backup := &backupsv1alpha1.Backup{
+		ObjectMeta: metav1.ObjectMeta{Namespace: ns, Name: "bk"},
+		Spec: backupsv1alpha1.BackupSpec{
+			ApplicationRef: corev1.TypedLocalObjectReference{APIGroup: &apiGroup, Kind: postgresAppKind, Name: appName},
+			StrategyRef:    corev1.TypedLocalObjectReference{APIGroup: &strategyGroup, Kind: strategyv1alpha1.CNPGStrategyKind, Name: "cnpg-strategy"},
+			DriverMetadata: map[string]string{
+				cnpgServerNameKey:      appName,
+				cnpgDestinationPathKey: "s3://bucket/" + appName + "/",
+				cnpgBackupNameKey:      cnpgBkName,
+			},
+		},
+		Status: backupsv1alpha1.BackupStatus{UnderlyingResources: snap},
+	}
+	strategy := &strategyv1alpha1.CNPG{
+		ObjectMeta: metav1.ObjectMeta{Name: "cnpg-strategy"},
+		Spec: strategyv1alpha1.CNPGSpec{Template: strategyv1alpha1.CNPGTemplate{
+			BarmanObjectStore: strategyv1alpha1.BarmanObjectStoreTemplate{DestinationPath: "s3://bucket/"},
+		}},
+	}
+	healthyCluster := &cnpgtypes.Cluster{
+		ObjectMeta: metav1.ObjectMeta{Namespace: ns, Name: clusterName, CreationTimestamp: metav1.NewTime(startedAt.Add(time.Minute))},
+		Spec:       cnpgtypes.ClusterSpec{Bootstrap: &cnpgtypes.BootstrapConfiguration{Recovery: &cnpgtypes.RecoverySource{Source: appName}}},
+		Status:     cnpgtypes.ClusterStatus{Phase: cnpgClusterHealthyPhase},
+	}
+	app := newPostgresApp(appName, ns)
+	app.Spec.Bootstrap.Enabled = true
+	app.Spec.Bootstrap.OldName = appName
+	sa := startedAt
+	restoreJob := &backupsv1alpha1.RestoreJob{
+		ObjectMeta: metav1.ObjectMeta{Namespace: ns, Name: "rj"},
+		Spec:       backupsv1alpha1.RestoreJobSpec{BackupRef: corev1.LocalObjectReference{Name: "bk"}},
+		Status: backupsv1alpha1.RestoreJobStatus{
+			StartedAt: &sa,
+			Phase:     backupsv1alpha1.RestoreJobPhaseRunning,
+			Conditions: []metav1.Condition{
+				{Type: restoreCondTargetPurged, Status: metav1.ConditionTrue, Reason: "ClusterPurged", LastTransitionTime: startedAt, Message: "purged"},
+				{Type: restoreCondRecoveryConverged, Status: metav1.ConditionTrue, Reason: "RecoveryConverged", LastTransitionTime: convergedAt, Message: "converged"},
+			},
+		},
+	}
+
+	s := runtime.NewScheme()
+	_ = scheme.AddToScheme(s)
+	_ = backupsv1alpha1.AddToScheme(s)
+	_ = strategyv1alpha1.AddToScheme(s)
+	_ = cnpgtypes.AddToScheme(s)
+	_ = postgresapp.AddToScheme(s)
+	c := clientfake.NewClientBuilder().
+		WithScheme(s).
+		WithObjects(backup, restoreJob, strategy, app, healthyCluster).
+		WithStatusSubresource(&backupsv1alpha1.BackupJob{}, &backupsv1alpha1.RestoreJob{}, &backupsv1alpha1.Backup{}).
+		WithInterceptorFuncs(interceptor.Funcs{
+			Patch: func(ctx context.Context, cl client.WithWatch, obj client.Object, patch client.Patch, opts ...client.PatchOption) error {
+				if _, ok := obj.(*postgresapp.Postgres); ok {
+					return fmt.Errorf("injected transient bootstrap-disable failure")
+				}
+				return cl.Patch(ctx, obj, patch, opts...)
+			},
+		}).
+		Build()
+	rec := record.NewFakeRecorder(10)
+	r := &RestoreJobReconciler{Client: c, Interface: dynamicfake.NewSimpleDynamicClient(testCNPGScheme(t)), Recorder: rec}
+
+	rj := &backupsv1alpha1.RestoreJob{}
+	if err := c.Get(ctx, client.ObjectKey{Namespace: ns, Name: "rj"}, rj); err != nil {
+		t.Fatalf("get seeded RestoreJob: %v", err)
+	}
 	res, err := r.reconcileCNPGRestore(ctx, rj, backup)
 	if err != nil {
-		t.Fatalf("pass 1 reconcileCNPGRestore: %v", err)
+		t.Fatalf("reconcileCNPGRestore: %v", err)
+	}
+	if res.RequeueAfter <= 0 {
+		t.Fatalf("expected a requeue after a transient disable failure, got %+v", res)
+	}
+
+	got := &backupsv1alpha1.RestoreJob{}
+	if err := c.Get(ctx, client.ObjectKey{Namespace: ns, Name: "rj"}, got); err != nil {
+		t.Fatalf("get RestoreJob after reconcile: %v", err)
+	}
+	if got.Status.Phase == backupsv1alpha1.RestoreJobPhaseFailed {
+		t.Fatalf("a transient disable failure within the post-convergence window must requeue, not Fail; got phase %q", got.Status.Phase)
+	}
+	// The window must not be silent: the requeue records WHY on .status (a durable
+	// condition) and announces it once via an Event. Dropping either leaves the
+	// RestoreJob non-terminal for up to the whole grace window with no explanation.
+	if c := apimeta.FindStatusCondition(got.Status.Conditions, restoreCondBootstrapDisablePending); c == nil || c.Status != metav1.ConditionTrue {
+		t.Fatalf("expected BootstrapDisablePending=True during the window, got %+v", c)
+	}
+	select {
+	case ev := <-rec.Events:
+		if !strings.Contains(ev, "BootstrapDisablePending") {
+			t.Fatalf("expected a BootstrapDisablePending event, got %q", ev)
+		}
+	default:
+		t.Fatalf("expected a BootstrapDisablePending event, got none")
+	}
+}
+
+// TestReconcileCNPGRestore_BootstrapDisableShortTimeoutHonorsGraceFloor is the
+// regression guard for the grace-window floor. A tenant sets
+// restoreTimeoutSeconds:60 to fail fast on a stuck recovery; recovery actually
+// converged 90s ago and the disable step is now hitting a transient error.
+// Without the floor the disable grace collapses to 60s (the recovery timeout),
+// so 90s-since-convergence terminates the restore Failed on a blip - and a
+// resubmit's purge-guard would then delete the healthy restored Cluster. With
+// the floor (cnpgBootstrapDisableGrace) the window stays open and the
+// transient error requeues. Reverting effectiveBootstrapDisableGrace back to
+// effectiveRestoreDeadline turns this red.
+func TestReconcileCNPGRestore_BootstrapDisableShortTimeoutHonorsGraceFloor(t *testing.T) {
+	const (
+		ns          = "tenant"
+		appName     = "app"
+		clusterName = "postgres-app"
+		cnpgBkName  = "cnpgbk"
+	)
+	apiGroup := backupsv1alpha1.DefaultApplicationAPIGroup
+	strategyGroup := strategyv1alpha1.GroupVersion.Group
+	ctx := context.Background()
+	startedAt := metav1.NewTime(time.Now().Add(-72 * time.Hour))
+	// Converged 90s ago: past the tenant's 60s restoreTimeoutSeconds but well
+	// within the 5m post-convergence floor.
+	convergedAt := metav1.NewTime(time.Now().Add(-90 * time.Second))
+
+	snap, err := marshalCNPGBackupSnapshot(newPostgresApp(appName, ns), nil, "")
+	if err != nil {
+		t.Fatalf("marshal snapshot: %v", err)
+	}
+	backup := &backupsv1alpha1.Backup{
+		ObjectMeta: metav1.ObjectMeta{Namespace: ns, Name: "bk"},
+		Spec: backupsv1alpha1.BackupSpec{
+			ApplicationRef: corev1.TypedLocalObjectReference{APIGroup: &apiGroup, Kind: postgresAppKind, Name: appName},
+			StrategyRef:    corev1.TypedLocalObjectReference{APIGroup: &strategyGroup, Kind: strategyv1alpha1.CNPGStrategyKind, Name: "cnpg-strategy"},
+			DriverMetadata: map[string]string{
+				cnpgServerNameKey:      appName,
+				cnpgDestinationPathKey: "s3://bucket/" + appName + "/",
+				cnpgBackupNameKey:      cnpgBkName,
+			},
+		},
+		Status: backupsv1alpha1.BackupStatus{UnderlyingResources: snap},
+	}
+	strategy := &strategyv1alpha1.CNPG{
+		ObjectMeta: metav1.ObjectMeta{Name: "cnpg-strategy"},
+		Spec: strategyv1alpha1.CNPGSpec{Template: strategyv1alpha1.CNPGTemplate{
+			BarmanObjectStore: strategyv1alpha1.BarmanObjectStoreTemplate{DestinationPath: "s3://bucket/"},
+		}},
+	}
+	healthyCluster := &cnpgtypes.Cluster{
+		ObjectMeta: metav1.ObjectMeta{Namespace: ns, Name: clusterName, CreationTimestamp: metav1.NewTime(startedAt.Add(time.Minute))},
+		Spec:       cnpgtypes.ClusterSpec{Bootstrap: &cnpgtypes.BootstrapConfiguration{Recovery: &cnpgtypes.RecoverySource{Source: appName}}},
+		Status:     cnpgtypes.ClusterStatus{Phase: cnpgClusterHealthyPhase},
+	}
+	app := newPostgresApp(appName, ns)
+	app.Spec.Bootstrap.Enabled = true
+	app.Spec.Bootstrap.OldName = appName
+	sa := startedAt
+	restoreJob := &backupsv1alpha1.RestoreJob{
+		ObjectMeta: metav1.ObjectMeta{Namespace: ns, Name: "rj"},
+		Spec: backupsv1alpha1.RestoreJobSpec{
+			BackupRef: corev1.LocalObjectReference{Name: "bk"},
+			Options:   &runtime.RawExtension{Raw: []byte(`{"restoreTimeoutSeconds":60}`)},
+		},
+		Status: backupsv1alpha1.RestoreJobStatus{
+			StartedAt: &sa,
+			Phase:     backupsv1alpha1.RestoreJobPhaseRunning,
+			Conditions: []metav1.Condition{
+				{Type: restoreCondTargetPurged, Status: metav1.ConditionTrue, Reason: "ClusterPurged", LastTransitionTime: startedAt, Message: "purged"},
+				{Type: restoreCondRecoveryConverged, Status: metav1.ConditionTrue, Reason: "RecoveryConverged", LastTransitionTime: convergedAt, Message: "converged"},
+			},
+		},
+	}
+
+	s := runtime.NewScheme()
+	_ = scheme.AddToScheme(s)
+	_ = backupsv1alpha1.AddToScheme(s)
+	_ = strategyv1alpha1.AddToScheme(s)
+	_ = cnpgtypes.AddToScheme(s)
+	_ = postgresapp.AddToScheme(s)
+	c := clientfake.NewClientBuilder().
+		WithScheme(s).
+		WithObjects(backup, restoreJob, strategy, app, healthyCluster).
+		WithStatusSubresource(&backupsv1alpha1.BackupJob{}, &backupsv1alpha1.RestoreJob{}, &backupsv1alpha1.Backup{}).
+		WithInterceptorFuncs(interceptor.Funcs{
+			Patch: func(ctx context.Context, cl client.WithWatch, obj client.Object, patch client.Patch, opts ...client.PatchOption) error {
+				if _, ok := obj.(*postgresapp.Postgres); ok {
+					return fmt.Errorf("injected transient bootstrap-disable failure")
+				}
+				return cl.Patch(ctx, obj, patch, opts...)
+			},
+		}).
+		Build()
+	r := &RestoreJobReconciler{Client: c, Interface: dynamicfake.NewSimpleDynamicClient(testCNPGScheme(t)), Recorder: record.NewFakeRecorder(10)}
+
+	rj := &backupsv1alpha1.RestoreJob{}
+	if err := c.Get(ctx, client.ObjectKey{Namespace: ns, Name: "rj"}, rj); err != nil {
+		t.Fatalf("get seeded RestoreJob: %v", err)
+	}
+	res, err := r.reconcileCNPGRestore(ctx, rj, backup)
+	if err != nil {
+		t.Fatalf("reconcileCNPGRestore: %v", err)
+	}
+	if res.RequeueAfter <= 0 {
+		t.Fatalf("expected a requeue within the floored grace window, got %+v", res)
+	}
+
+	got := &backupsv1alpha1.RestoreJob{}
+	if err := c.Get(ctx, client.ObjectKey{Namespace: ns, Name: "rj"}, got); err != nil {
+		t.Fatalf("get RestoreJob after reconcile: %v", err)
+	}
+	if got.Status.Phase == backupsv1alpha1.RestoreJobPhaseFailed {
+		t.Fatalf("a short restoreTimeoutSeconds must not shrink the disable grace below the floor; a blip 90s after convergence must requeue, got phase %q", got.Status.Phase)
+	}
+}
+
+// TestReconcileCNPGRestore_HealthyPastDeadlineSucceeds is the regression guard
+// for the health-before-deadline ordering: a recovery that has reached a
+// healthy Cluster must be reported Succeeded even when the reconcile observing
+// it lands AFTER the restore deadline has elapsed (e.g. a controller restart
+// spanning the window). StartedAt is 72h in the past (well past the 30m default
+// deadline) and a recoveryTime is set, so if the deadline branch ran first it
+// would classify the restore Failed/RecoveryTargetUnreachable - a wrong verdict
+// that can escalate to data loss on resubmit. The injected readPodLog fails the
+// test if the classification path is entered at all, proving health short-circuits.
+func TestReconcileCNPGRestore_HealthyPastDeadlineSucceeds(t *testing.T) {
+	const (
+		ns          = "tenant"
+		appName     = "app"
+		clusterName = "postgres-app"
+		cnpgBkName  = "cnpgbk"
+	)
+	apiGroup := backupsv1alpha1.DefaultApplicationAPIGroup
+	strategyGroup := strategyv1alpha1.GroupVersion.Group
+	ctx := context.Background()
+	// Far past the 30m default deadline: this is the reconcile-gap case.
+	startedAt := metav1.NewTime(time.Now().Add(-72 * time.Hour))
+
+	snap, err := marshalCNPGBackupSnapshot(newPostgresApp(appName, ns), nil, "")
+	if err != nil {
+		t.Fatalf("marshal snapshot: %v", err)
+	}
+	backup := &backupsv1alpha1.Backup{
+		ObjectMeta: metav1.ObjectMeta{Namespace: ns, Name: "bk"},
+		Spec: backupsv1alpha1.BackupSpec{
+			ApplicationRef: corev1.TypedLocalObjectReference{APIGroup: &apiGroup, Kind: postgresAppKind, Name: appName},
+			StrategyRef:    corev1.TypedLocalObjectReference{APIGroup: &strategyGroup, Kind: strategyv1alpha1.CNPGStrategyKind, Name: "cnpg-strategy"},
+			DriverMetadata: map[string]string{
+				cnpgServerNameKey:      appName,
+				cnpgDestinationPathKey: "s3://bucket/" + appName + "/",
+				cnpgBackupNameKey:      cnpgBkName,
+			},
+		},
+		Status: backupsv1alpha1.BackupStatus{UnderlyingResources: snap},
+	}
+	strategy := &strategyv1alpha1.CNPG{
+		ObjectMeta: metav1.ObjectMeta{Name: "cnpg-strategy"},
+		Spec: strategyv1alpha1.CNPGSpec{Template: strategyv1alpha1.CNPGTemplate{
+			BarmanObjectStore: strategyv1alpha1.BarmanObjectStoreTemplate{DestinationPath: "s3://bucket/"},
+		}},
+	}
+	healthyCluster := &cnpgtypes.Cluster{
+		ObjectMeta: metav1.ObjectMeta{Namespace: ns, Name: clusterName, CreationTimestamp: metav1.NewTime(startedAt.Add(time.Minute))},
+		Spec:       cnpgtypes.ClusterSpec{Bootstrap: &cnpgtypes.BootstrapConfiguration{Recovery: &cnpgtypes.RecoverySource{Source: appName}}},
+		Status:     cnpgtypes.ClusterStatus{Phase: cnpgClusterHealthyPhase},
+	}
+	sa := startedAt
+	restoreJob := &backupsv1alpha1.RestoreJob{
+		ObjectMeta: metav1.ObjectMeta{Namespace: ns, Name: "rj"},
+		Spec: backupsv1alpha1.RestoreJobSpec{
+			BackupRef: corev1.LocalObjectReference{Name: "bk"},
+			// recoveryTime set so the (wrongly-ordered) deadline branch would classify.
+			Options: &runtime.RawExtension{Raw: []byte(`{"recoveryTime":"2026-01-01T00:00:00Z"}`)},
+		},
+		Status: backupsv1alpha1.RestoreJobStatus{
+			StartedAt: &sa,
+			Phase:     backupsv1alpha1.RestoreJobPhaseRunning,
+			Conditions: []metav1.Condition{{
+				Type: restoreCondTargetPurged, Status: metav1.ConditionTrue, Reason: "ClusterPurged",
+				LastTransitionTime: startedAt, Message: "purged",
+			}},
+		},
 	}
-	if res.RequeueAfter == 0 {
-		t.Fatalf("pass 1 must requeue after stamping StartedAt, got %+v", res)
+
+	c := newCNPGStrategyTestClient(t, backup, restoreJob, strategy, newPostgresApp(appName, ns), healthyCluster)
+	r := &RestoreJobReconciler{
+		Client:    c,
+		Interface: dynamicfake.NewSimpleDynamicClient(testCNPGScheme(t)),
+		Recorder:  record.NewFakeRecorder(10),
+		// If the deadline/classification branch runs before the health check,
+		// it reaches the log reader - which must never happen for a healthy cluster.
+		readPodLog: func(context.Context, string, string, string) (string, error) {
+			t.Fatalf("classification (log read) ran for an already-healthy Cluster: health check must precede the deadline branch")
+			return "", nil
+		},
 	}
-	persisted := &backupsv1alpha1.RestoreJob{}
-	if err := c.Get(ctx, client.ObjectKeyFromObject(rj), persisted); err != nil {
-		t.Fatalf("get after pass 1: %v", err)
+
+	// Two reconciles to terminal (latch, then disable-bootstrap + Succeeded);
+	// the injected readPodLog still fails the test if the deadline/classification
+	// branch runs on either pass, proving health short-circuits regardless.
+	got := reconcileCNPGRestoreToTerminal(t, ctx, r, c, backup, ns, "rj")
+	if got.Status.Phase != backupsv1alpha1.RestoreJobPhaseSucceeded {
+		t.Fatalf("expected phase Succeeded (healthy cluster past deadline), got %q (msg=%q)", got.Status.Phase, got.Status.Message)
 	}
-	if persisted.Status.StartedAt == nil {
-		t.Fatalf("driver did not stamp StartedAt before the Strategy NotFound branch; " +
-			"the deadline clock would never start and the RestoreJob would requeue forever")
+	if cond := apimeta.FindStatusCondition(got.Status.Conditions, "Ready"); cond == nil || cond.Status != metav1.ConditionTrue {
+		t.Fatalf("expected Ready=True, got %+v", cond)
 	}
-	if persisted.Status.Phase == backupsv1alpha1.RestoreJobPhaseFailed {
-		t.Fatalf("must not fail within the grace window, got Phase=%q", persisted.Status.Phase)
+	if cond := apimeta.FindStatusCondition(got.Status.Conditions, restoreCondRecoveryConverged); cond == nil || cond.Status != metav1.ConditionTrue {
+		t.Fatalf("expected RecoveryConverged=True, got %+v", cond)
 	}
+}
 
-	// Simulate StrategyNotReadyDeadline of wall-clock elapsing by backdating the
-	// persisted StartedAt past the deadline.
-	stale := metav1.NewTime(persisted.Status.StartedAt.Add(-StrategyNotReadyDeadline - time.Minute))
-	base := persisted.DeepCopy()
-	persisted.Status.StartedAt = &stale
-	if err := c.Status().Patch(ctx, persisted, client.MergeFrom(base)); err != nil {
-		t.Fatalf("backdate StartedAt: %v", err)
-	}
+// TestReconcileCNPGRestore_DeadlineClassifiesRecoveryTargetUnreachable drives the
+// full reconcileCNPGRestore deadline branch (the classification call site), which
+// the pure-helper tests (TestRecoveryTargetUnreachable_*) do not exercise:
+// swapping the RecoveryTargetUnreachable reason back to the generic RestoreFailed
+// at that call site leaves them green. Each sub-case backdates StartedAt past the
+// restore deadline with a recoveryTime set (so classification runs) and asserts
+// the three outcomes the branch distinguishes: FATAL found, FATAL absent, and a
+// Forbidden log read (missing pods/log RBAC).
+func TestReconcileCNPGRestore_DeadlineClassifiesRecoveryTargetUnreachable(t *testing.T) {
+	const (
+		ns          = "tenant"
+		appName     = "app"
+		clusterName = "postgres-app"
+	)
+	apiGroup := backupsv1alpha1.DefaultApplicationAPIGroup
+	strategyGroup := strategyv1alpha1.GroupVersion.Group
+	ctx := context.Background()
 
-	// Pass 2: StartedAt is now past the deadline and the Strategy CR still does
-	// not exist, so the driver call site must fail closed.
-	reloaded := &backupsv1alpha1.RestoreJob{}
-	if err := c.Get(ctx, client.ObjectKeyFromObject(rj), reloaded); err != nil {
-		t.Fatalf("get before pass 2: %v", err)
-	}
-	res, err = r.reconcileCNPGRestore(ctx, reloaded, backup)
+	// StartedAt far past cnpgDefaultRestoreDeadline (30m) so the first reconcile
+	// enters the deadline-classification branch.
+	startedAt := metav1.NewTime(time.Now().Add(-72 * time.Hour))
+
+	snap, err := marshalCNPGBackupSnapshot(newPostgresApp(appName, ns), nil, "")
 	if err != nil {
-		t.Fatalf("pass 2 reconcileCNPGRestore: %v", err)
+		t.Fatalf("marshal snapshot: %v", err)
 	}
-	if res.RequeueAfter != 0 {
-		t.Fatalf("terminal failure must not requeue, got %+v", res)
+	mkBackup := func() *backupsv1alpha1.Backup {
+		return &backupsv1alpha1.Backup{
+			ObjectMeta: metav1.ObjectMeta{Namespace: ns, Name: "bk"},
+			Spec: backupsv1alpha1.BackupSpec{
+				ApplicationRef: corev1.TypedLocalObjectReference{APIGroup: &apiGroup, Kind: postgresAppKind, Name: appName},
+				StrategyRef:    corev1.TypedLocalObjectReference{APIGroup: &strategyGroup, Kind: strategyv1alpha1.CNPGStrategyKind, Name: "cnpg-strategy"},
+				DriverMetadata: map[string]string{
+					cnpgServerNameKey:      appName,
+					cnpgDestinationPathKey: "s3://bucket/" + appName + "/",
+				},
+			},
+			Status: backupsv1alpha1.BackupStatus{UnderlyingResources: snap},
+		}
 	}
-	final := &backupsv1alpha1.RestoreJob{}
-	if err := c.Get(ctx, client.ObjectKeyFromObject(rj), final); err != nil {
-		t.Fatalf("get after pass 2: %v", err)
+	strategy := &strategyv1alpha1.CNPG{
+		ObjectMeta: metav1.ObjectMeta{Name: "cnpg-strategy"},
+		Spec: strategyv1alpha1.CNPGSpec{Template: strategyv1alpha1.CNPGTemplate{
+			BarmanObjectStore: strategyv1alpha1.BarmanObjectStoreTemplate{DestinationPath: "s3://bucket/"},
+		}},
+	}
+	// Recovery Cluster created after StartedAt (this restore's own -> not
+	// re-purged), so the reconcile flows past the purge block to the deadline
+	// check. Phase left empty (still wedged): the deadline check precedes the
+	// healthy check, so it fires regardless.
+	mkCluster := func() *cnpgtypes.Cluster {
+		return &cnpgtypes.Cluster{
+			ObjectMeta: metav1.ObjectMeta{Namespace: ns, Name: clusterName, CreationTimestamp: metav1.NewTime(startedAt.Add(time.Minute))},
+			Spec:       cnpgtypes.ClusterSpec{Bootstrap: &cnpgtypes.BootstrapConfiguration{Recovery: &cnpgtypes.RecoverySource{Source: appName}}},
+		}
 	}
-	if final.Status.Phase != backupsv1alpha1.RestoreJobPhaseFailed {
-		t.Fatalf("expected Phase=Failed once the deadline elapsed, got %q", final.Status.Phase)
+	// A bootstrap-recovery pod for the cluster; recoveryTargetUnreachable lists
+	// these and reads each through the readPodLog seam.
+	mkPod := func() *corev1.Pod {
+		return &corev1.Pod{
+			ObjectMeta: metav1.ObjectMeta{
+				Namespace:         ns,
+				Name:              clusterName + "-full-recovery-abcde",
+				Labels:            map[string]string{cnpgClusterLabel: clusterName},
+				CreationTimestamp: metav1.NewTime(startedAt.Add(2 * time.Minute)),
+			},
+			Spec: corev1.PodSpec{Containers: []corev1.Container{{Name: cnpgRecoveryContainerName}}},
+		}
 	}
-	if !strings.Contains(final.Status.Message, "missing-strategy") {
-		t.Errorf("failure message should name the missing strategy, got %q", final.Status.Message)
+	mkRestoreJob := func() *backupsv1alpha1.RestoreJob {
+		sa := startedAt
+		return &backupsv1alpha1.RestoreJob{
+			ObjectMeta: metav1.ObjectMeta{Namespace: ns, Name: "rj"},
+			Spec: backupsv1alpha1.RestoreJobSpec{
+				BackupRef: corev1.LocalObjectReference{Name: "bk"},
+				// recoveryTime present -> the reconcile runs the classification.
+				Options: &runtime.RawExtension{Raw: []byte(`{"recoveryTime":"2026-01-01T00:00:00Z"}`)},
+			},
+			Status: backupsv1alpha1.RestoreJobStatus{
+				StartedAt: &sa,
+				Phase:     backupsv1alpha1.RestoreJobPhaseRunning,
+				// Purge already done -> reconcile reaches the deadline check.
+				Conditions: []metav1.Condition{{
+					Type: restoreCondTargetPurged, Status: metav1.ConditionTrue, Reason: "ClusterPurged",
+					LastTransitionTime: startedAt, Message: "purged",
+				}},
+			},
+		}
+	}
+
+	fatalLog := "LOG:  redo done\nFATAL:  " + cnpgRecoveryTargetUnreachableLog
+
+	newReconciler := func(c client.Client, readLog func(context.Context, string, string, string) (string, error)) *RestoreJobReconciler {
+		return &RestoreJobReconciler{
+			Client:     c,
+			Interface:  dynamicfake.NewSimpleDynamicClient(testCNPGScheme(t)),
+			Recorder:   record.NewFakeRecorder(10),
+			readPodLog: readLog,
+		}
+	}
+	reconcileToFailed := func(t *testing.T, r *RestoreJobReconciler, c client.Client, backup *backupsv1alpha1.Backup) *backupsv1alpha1.RestoreJob {
+		t.Helper()
+		rj := &backupsv1alpha1.RestoreJob{}
+		if err := c.Get(ctx, client.ObjectKey{Namespace: ns, Name: "rj"}, rj); err != nil {
+			t.Fatalf("get seeded RestoreJob: %v", err)
+		}
+		res, err := r.reconcileCNPGRestore(ctx, rj, backup)
+		if err != nil {
+			t.Fatalf("reconcileCNPGRestore: %v", err)
+		}
+		if res.RequeueAfter != 0 {
+			t.Fatalf("terminal deadline failure must not requeue, got %+v", res)
+		}
+		got := &backupsv1alpha1.RestoreJob{}
+		if err := c.Get(ctx, client.ObjectKey{Namespace: ns, Name: "rj"}, got); err != nil {
+			t.Fatalf("get RestoreJob after reconcile: %v", err)
+		}
+		if got.Status.Phase != backupsv1alpha1.RestoreJobPhaseFailed {
+			t.Fatalf("expected Phase=Failed after deadline, got %q (msg=%q)", got.Status.Phase, got.Status.Message)
+		}
+		return got
 	}
+
+	t.Run("recovery-target-unreachable FATAL -> RecoveryTargetUnreachable reason", func(t *testing.T) {
+		backup := mkBackup()
+		c := newCNPGStrategyTestClient(t, backup, mkRestoreJob(), strategy, newPostgresApp(appName, ns), mkCluster(), mkPod())
+		r := newReconciler(c, func(context.Context, string, string, string) (string, error) { return fatalLog, nil })
+
+		got := reconcileToFailed(t, r, c, backup)
+
+		// The mutation the review flagged: the call site must set reason
+		// RecoveryTargetUnreachable, not the generic RestoreFailed.
+		conv := apimeta.FindStatusCondition(got.Status.Conditions, restoreCondRecoveryConverged)
+		if conv == nil || conv.Status != metav1.ConditionFalse || conv.Reason != "RecoveryTargetUnreachable" {
+			t.Fatalf("expected RecoveryConverged=False reason=RecoveryTargetUnreachable, got %+v", conv)
+		}
+		if ready := apimeta.FindStatusCondition(got.Status.Conditions, "Ready"); ready == nil || ready.Reason != "RecoveryTargetUnreachable" {
+			t.Fatalf("expected Ready reason=RecoveryTargetUnreachable, got %+v", ready)
+		}
+		if !strings.Contains(got.Status.Message, "past the latest WAL archived") {
+			t.Errorf("message should explain the unreachable target, got %q", got.Status.Message)
+		}
+	})
+
+	t.Run("no FATAL -> generic deadline failure, not RecoveryTargetUnreachable", func(t *testing.T) {
+		backup := mkBackup()
+		c := newCNPGStrategyTestClient(t, backup, mkRestoreJob(), strategy, newPostgresApp(appName, ns), mkCluster(), mkPod())
+		r := newReconciler(c, func(context.Context, string, string, string) (string, error) {
+			return "LOG:  consistent recovery state reached", nil
+		})
+
+		got := reconcileToFailed(t, r, c, backup)
+
+		if conv := apimeta.FindStatusCondition(got.Status.Conditions, restoreCondRecoveryConverged); conv != nil {
+			t.Fatalf("did not expect a RecoveryConverged condition on a generic timeout, got %+v", conv)
+		}
+		if ready := apimeta.FindStatusCondition(got.Status.Conditions, "Ready"); ready != nil && ready.Reason == "RecoveryTargetUnreachable" {
+			t.Fatalf("generic timeout must NOT be classified RecoveryTargetUnreachable, got %+v", ready)
+		}
+		if !strings.Contains(got.Status.Message, "deadline") {
+			t.Errorf("message should mention the deadline, got %q", got.Status.Message)
+		}
+		if strings.Contains(got.Status.Message, "pods/log RBAC") {
+			t.Errorf("a readable log must not report a Forbidden RBAC note, got %q", got.Status.Message)
+		}
+	})
+
+	t.Run("Forbidden log read -> generic failure with missing-RBAC note", func(t *testing.T) {
+		backup := mkBackup()
+		c := newCNPGStrategyTestClient(t, backup, mkRestoreJob(), strategy, newPostgresApp(appName, ns), mkCluster(), mkPod())
+		r := newReconciler(c, func(context.Context, string, string, string) (string, error) {
+			return "", apierrors.NewForbidden(schema.GroupResource{Resource: "pods"}, "rec", fmt.Errorf("pods/log grant missing"))
+		})
+
+		got := reconcileToFailed(t, r, c, backup)
+
+		if conv := apimeta.FindStatusCondition(got.Status.Conditions, restoreCondRecoveryConverged); conv != nil && conv.Reason == "RecoveryTargetUnreachable" {
+			t.Fatalf("a Forbidden log read must not yield a RecoveryTargetUnreachable classification, got %+v", conv)
+		}
+		if !strings.Contains(got.Status.Message, "pods/log RBAC") {
+			t.Errorf("Forbidden classification should surface the missing pods/log RBAC grant, got %q", got.Status.Message)
+		}
+	})
 }
 
 // newCNPGStrategyTestClient returns a fake client.Client wired up with
@@ -1525,3 +3890,482 @@ func newCNPGStrategyTestClient(t *testing.T, objs ...client.Object) client.Clien
 		WithStatusSubresource(&backupsv1alpha1.BackupJob{}, &backupsv1alpha1.RestoreJob{}, &backupsv1alpha1.Backup{}).
 		Build()
 }
+
+// reconcileCNPGRestoreToTerminal drives reconcileCNPGRestore until the
+// RestoreJob reaches a terminal phase (Succeeded/Failed) or a small iteration
+// bound is hit. The success path is multi-step - it latches RecoveryConverged
+// on one reconcile and disables bootstrap + marks Succeeded on the next - so a
+// single reconcile does not reach the verdict. Re-fetching between passes
+// mirrors how the controller-runtime requeue would re-enter Reconcile.
+func reconcileCNPGRestoreToTerminal(t *testing.T, ctx context.Context, r *RestoreJobReconciler, c client.Client, backup *backupsv1alpha1.Backup, ns, name string) *backupsv1alpha1.RestoreJob {
+	t.Helper()
+	got := &backupsv1alpha1.RestoreJob{}
+	for i := 0; i < 8; i++ {
+		rj := &backupsv1alpha1.RestoreJob{}
+		if err := c.Get(ctx, client.ObjectKey{Namespace: ns, Name: name}, rj); err != nil {
+			t.Fatalf("get RestoreJob: %v", err)
+		}
+		if _, err := r.reconcileCNPGRestore(ctx, rj, backup); err != nil {
+			t.Fatalf("reconcileCNPGRestore: %v", err)
+		}
+		if err := c.Get(ctx, client.ObjectKey{Namespace: ns, Name: name}, got); err != nil {
+			t.Fatalf("get RestoreJob after reconcile: %v", err)
+		}
+		if got.Status.Phase == backupsv1alpha1.RestoreJobPhaseSucceeded ||
+			got.Status.Phase == backupsv1alpha1.RestoreJobPhaseFailed {
+			return got
+		}
+	}
+	t.Fatalf("RestoreJob did not reach a terminal phase; last phase %q", got.Status.Phase)
+	return got
+}
+
+// TestDisablePostgresAppBootstrap_Idempotent pins the early-return in
+// disablePostgresAppBootstrap. When the app already has bootstrap.enabled=false
+// the method must return without issuing a Patch: the already-disabled subtest
+// fails any Patch on the Postgres app, so removing the `if !Enabled { return nil }`
+// guard turns the intended no-op into a failed Patch and reddens it. When the flag
+// is true the method must patch it to false.
+func TestDisablePostgresAppBootstrap_Idempotent(t *testing.T) {
+	const (
+		ns      = "tenant"
+		appName = "app"
+	)
+	ctx := context.Background()
+	s := runtime.NewScheme()
+	_ = scheme.AddToScheme(s)
+	_ = postgresapp.AddToScheme(s)
+
+	t.Run("already disabled is a no-op that issues no Patch", func(t *testing.T) {
+		app := newPostgresApp(appName, ns)
+		app.Spec.Bootstrap.Enabled = false
+		c := clientfake.NewClientBuilder().
+			WithScheme(s).
+			WithObjects(app).
+			WithInterceptorFuncs(interceptor.Funcs{
+				Patch: func(ctx context.Context, cl client.WithWatch, obj client.Object, patch client.Patch, opts ...client.PatchOption) error {
+					if _, ok := obj.(*postgresapp.Postgres); ok {
+						return fmt.Errorf("Patch must not be issued when bootstrap is already disabled")
+					}
+					return cl.Patch(ctx, obj, patch, opts...)
+				},
+			}).
+			Build()
+		r := &RestoreJobReconciler{Client: c}
+		if err := r.disablePostgresAppBootstrap(ctx, ns, appName); err != nil {
+			t.Fatalf("expected a no-op returning nil, got %v", err)
+		}
+	})
+
+	t.Run("enabled is patched to false", func(t *testing.T) {
+		app := newPostgresApp(appName, ns)
+		app.Spec.Bootstrap.Enabled = true
+		c := clientfake.NewClientBuilder().WithScheme(s).WithObjects(app).Build()
+		r := &RestoreJobReconciler{Client: c}
+		if err := r.disablePostgresAppBootstrap(ctx, ns, appName); err != nil {
+			t.Fatalf("disable: %v", err)
+		}
+		got := &postgresapp.Postgres{}
+		if err := c.Get(ctx, client.ObjectKey{Namespace: ns, Name: appName}, got); err != nil {
+			t.Fatalf("get app after disable: %v", err)
+		}
+		if got.Spec.Bootstrap.Enabled {
+			t.Fatalf("expected bootstrap.enabled=false after disable, still true")
+		}
+	})
+}
+
+// TestCNPGRestoreBackupID pins when a restore names the base backup it starts
+// from. Without a backupID the barman-cloud plugin picks the newest backup of
+// the stream (no recoveryTime) or the newest one ending by recoveryTime, on
+// any timeline, which is not necessarily the backup the RestoreJob names.
+func TestCNPGRestoreBackupID(t *testing.T) {
+	stopped := metav1.NewTime(time.Date(2026, 9, 21, 6, 27, 23, 0, time.UTC))
+	cases := []struct {
+		name         string
+		backupID     string
+		stoppedAt    *metav1.Time
+		recoveryTime string
+		want         string
+	}{
+		{"no recoveryTime pins the requested backup", "20260921T062713", &stopped, "", "20260921T062713"},
+		{"no recoveryTime pins it even without its end", "20260921T062713", nil, "", "20260921T062713"},
+		{"recoveryTime a second past the end pins it", "20260921T062713", &stopped, "2026-09-21T06:27:24Z", "20260921T062713"},
+		{"recoveryTime well after the end pins it", "20260921T062713", &stopped, "2026-09-22T10:00:00+02:00", "20260921T062713"},
+		{"recoveryTime within the truncated second leaves the choice to the plugin", "20260921T062713", &stopped, "2026-09-21T06:27:23.5Z", ""},
+		{"recoveryTime before the end leaves the choice to the plugin", "20260921T062713", &stopped, "2026-09-21T05:00:00Z", ""},
+		{"unknown end with a recoveryTime leaves the choice to the plugin", "20260921T062713", nil, "2026-09-22T10:00:00Z", ""},
+		{"unparseable recoveryTime leaves the choice to the plugin", "20260921T062713", &stopped, "2026-09-22 10:00:00", ""},
+		{"unknown backupID pins nothing", "", &stopped, "", ""},
+	}
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			source := &cnpgtypes.Backup{Status: cnpgtypes.BackupStatus{BackupID: tc.backupID, StoppedAt: tc.stoppedAt}}
+			if got := cnpgRestoreBackupID(source, tc.recoveryTime); got != tc.want {
+				t.Errorf("cnpgRestoreBackupID(%q, %v, %q) = %q, want %q", tc.backupID, tc.stoppedAt, tc.recoveryTime, got, tc.want)
+			}
+		})
+	}
+	t.Run("a cnpg.io/Backup that is gone pins nothing", func(t *testing.T) {
+		if got := cnpgRestoreBackupID(nil, ""); got != "" {
+			t.Errorf("cnpgRestoreBackupID(nil, \"\") = %q, want none", got)
+		}
+	})
+}
+
+// TestBuildPostgresAppRestorePatch_ReplacesBackupID guards against a
+// re-restore into the same target starting from the backup a previous
+// restore pinned.
+func TestBuildPostgresAppRestorePatch_ReplacesBackupID(t *testing.T) {
+	app := newPostgresApp("pg", "tenant")
+	app.Spec.Bootstrap.BackupID = "20260101T000000"
+
+	if got := buildPostgresAppRestorePatch(app, "src", "pg-new", "s3://b/", "", "", "20260921T062713", nil, nil, nil, nil).Spec.Bootstrap.BackupID; got != "20260921T062713" {
+		t.Errorf("bootstrap.backupID: got %q want %q", got, "20260921T062713")
+	}
+	if got := buildPostgresAppRestorePatch(app, "src", "pg-new", "s3://b/", "", "", "", nil, nil, nil, nil).Spec.Bootstrap.BackupID; got != "" {
+		t.Errorf("bootstrap.backupID from a previous restore must be cleared; got %q", got)
+	}
+}
+
+// TestReconcileCNPGRestore_PinsTheRequestedBackup drives a restore through the
+// purge step and reads back what the target Postgres app is patched with: the
+// barman backupId of the backup the RestoreJob names, read from its
+// cnpg.io/Backup. Retention deletes that cnpg.io/Backup together with the base
+// backup, and pinning an id the catalog has lost fails the recovery after the
+// purge, so a cnpg.io/Backup that is gone leaves the choice to the plugin.
+func TestReconcileCNPGRestore_PinsTheRequestedBackup(t *testing.T) {
+	const (
+		ns          = "tenant"
+		appName     = "app"
+		clusterName = "postgres-app"
+		cnpgBkName  = "cnpgbk"
+		backupID    = "20260921T062713"
+	)
+	apiGroup := backupsv1alpha1.DefaultApplicationAPIGroup
+	strategyGroup := strategyv1alpha1.GroupVersion.Group
+	ctx := context.Background()
+	startedAt := metav1.NewTime(time.Now())
+	stoppedAt := metav1.NewTime(time.Date(2026, 9, 21, 6, 27, 23, 0, time.UTC))
+
+	mkBackupArtifact := func(t *testing.T) *backupsv1alpha1.Backup {
+		t.Helper()
+		snap, err := marshalCNPGBackupSnapshot(newPostgresApp(appName, ns), nil, "")
+		if err != nil {
+			t.Fatalf("marshal snapshot: %v", err)
+		}
+		driverMD := map[string]string{
+			cnpgServerNameKey:      appName,
+			cnpgDestinationPathKey: "s3://bucket/" + appName + "/",
+			cnpgBackupNameKey:      cnpgBkName,
+		}
+		return &backupsv1alpha1.Backup{
+			ObjectMeta: metav1.ObjectMeta{Namespace: ns, Name: "bk"},
+			Spec: backupsv1alpha1.BackupSpec{
+				ApplicationRef: corev1.TypedLocalObjectReference{APIGroup: &apiGroup, Kind: postgresAppKind, Name: appName},
+				StrategyRef:    corev1.TypedLocalObjectReference{APIGroup: &strategyGroup, Kind: strategyv1alpha1.CNPGStrategyKind, Name: "cnpg-strategy"},
+				DriverMetadata: driverMD,
+			},
+			Status: backupsv1alpha1.BackupStatus{UnderlyingResources: snap},
+		}
+	}
+	strategy := &strategyv1alpha1.CNPG{
+		ObjectMeta: metav1.ObjectMeta{Name: "cnpg-strategy"},
+		Spec: strategyv1alpha1.CNPGSpec{
+			Template: strategyv1alpha1.CNPGTemplate{
+				BarmanObjectStore: strategyv1alpha1.BarmanObjectStoreTemplate{DestinationPath: "s3://bucket/"},
+			},
+		},
+	}
+	mkCNPGBackup := func(id string) *cnpgtypes.Backup {
+		return &cnpgtypes.Backup{
+			ObjectMeta: metav1.ObjectMeta{Namespace: ns, Name: cnpgBkName},
+			Spec:       cnpgtypes.BackupSpec{Cluster: cnpgtypes.ClusterReference{Name: clusterName}},
+			Status: cnpgtypes.BackupStatus{
+				Phase: cnpgBackupPhaseComplete, EndWal: "000000010000000000000003",
+				BackupID: id, StoppedAt: &stoppedAt,
+			},
+		}
+	}
+	mkRestoreJob := func(recoveryTime string) *backupsv1alpha1.RestoreJob {
+		sa := startedAt
+		rj := &backupsv1alpha1.RestoreJob{
+			ObjectMeta: metav1.ObjectMeta{Namespace: ns, Name: "rj"},
+			Spec:       backupsv1alpha1.RestoreJobSpec{BackupRef: corev1.LocalObjectReference{Name: "bk"}},
+			Status:     backupsv1alpha1.RestoreJobStatus{StartedAt: &sa, Phase: backupsv1alpha1.RestoreJobPhaseRunning},
+		}
+		if recoveryTime != "" {
+			rj.Spec.Options = &runtime.RawExtension{Raw: []byte(`{"recoveryTime":"` + recoveryTime + `"}`)}
+		}
+		return rj
+	}
+	restoredBootstrap := func(t *testing.T, cnpgBackup *cnpgtypes.Backup, recoveryTime string) (postgresapp.Bootstrap, *record.FakeRecorder) {
+		t.Helper()
+		backup := mkBackupArtifact(t)
+		objs := []client.Object{backup, mkRestoreJob(recoveryTime), strategy, newPostgresApp(appName, ns)}
+		if cnpgBackup != nil {
+			objs = append(objs, cnpgBackup)
+		}
+		c := newCNPGStrategyTestClient(t, objs...)
+		recorder := record.NewFakeRecorder(10)
+		r := &RestoreJobReconciler{Client: c, Interface: dynamicfake.NewSimpleDynamicClient(testCNPGScheme(t)), Recorder: recorder}
+		rj := &backupsv1alpha1.RestoreJob{}
+		if err := c.Get(ctx, client.ObjectKey{Namespace: ns, Name: "rj"}, rj); err != nil {
+			t.Fatalf("get seeded RestoreJob: %v", err)
+		}
+		if _, err := r.reconcileCNPGRestore(ctx, rj, backup); err != nil {
+			t.Fatalf("reconcileCNPGRestore: %v", err)
+		}
+		app := &postgresapp.Postgres{}
+		if err := c.Get(ctx, client.ObjectKey{Namespace: ns, Name: appName}, app); err != nil {
+			t.Fatalf("get patched Postgres app: %v", err)
+		}
+		if !app.Spec.Bootstrap.Enabled {
+			t.Fatalf("the reconcile did not reach the restore patch")
+		}
+		return app.Spec.Bootstrap, recorder
+	}
+
+	t.Run("without recoveryTime the requested backup is pinned", func(t *testing.T) {
+		if b, _ := restoredBootstrap(t, mkCNPGBackup(backupID), ""); b.BackupID != backupID {
+			t.Errorf("bootstrap.backupID: got %q want %q", b.BackupID, backupID)
+		}
+	})
+
+	t.Run("a recoveryTime after the backup ended pins it", func(t *testing.T) {
+		b, _ := restoredBootstrap(t, mkCNPGBackup(backupID), "2026-09-22T10:00:00Z")
+		if b.BackupID != backupID || b.RecoveryTime != "2026-09-22T10:00:00Z" {
+			t.Errorf("bootstrap: got backupID %q recoveryTime %q, want %q and the requested instant", b.BackupID, b.RecoveryTime, backupID)
+		}
+	})
+
+	t.Run("a recoveryTime before the backup ended leaves the choice to the plugin", func(t *testing.T) {
+		if b, _ := restoredBootstrap(t, mkCNPGBackup(backupID), "2026-09-21T05:00:00Z"); b.BackupID != "" {
+			t.Errorf("bootstrap.backupID: got %q, want none: the backup cannot serve an instant before its end", b.BackupID)
+		}
+	})
+
+	for _, recoveryTime := range []string{"", "2026-09-22T10:00:00Z"} {
+		t.Run("a cnpg.io/Backup removed by retention leaves the choice to the plugin, recoveryTime="+recoveryTime, func(t *testing.T) {
+			b, recorder := restoredBootstrap(t, nil, recoveryTime)
+			if b.BackupID != "" {
+				t.Errorf("bootstrap.backupID: got %q, want none: the catalog no longer holds that base backup", b.BackupID)
+			}
+			select {
+			case ev := <-recorder.Events:
+				if !strings.Contains(ev, "Warning BaseBackupGone") {
+					t.Errorf("event: got %q, want a BaseBackupGone warning", ev)
+				}
+			default:
+				t.Errorf("no event: a restore that cannot start from the backup it names must say so")
+			}
+		})
+	}
+}
+
+func TestCreateCNPGBackupArtifact_RecordsMajorVersion(t *testing.T) {
+	apiGroup := backupsv1alpha1.DefaultApplicationAPIGroup
+	strategyGroup := strategyv1alpha1.GroupVersion.Group
+	for _, tc := range []struct {
+		major int
+		want  string
+	}{{major: 18, want: "18"}, {major: 0, want: ""}} {
+		t.Run(fmt.Sprintf("majorVersion=%d", tc.major), func(t *testing.T) {
+			r := &BackupJobReconciler{Client: newCNPGStrategyTestClient(t)}
+			j := &backupsv1alpha1.BackupJob{
+				ObjectMeta: metav1.ObjectMeta{Namespace: "tenant", Name: "bj"},
+				Spec: backupsv1alpha1.BackupJobSpec{
+					ApplicationRef: corev1.TypedLocalObjectReference{APIGroup: &apiGroup, Kind: postgresAppKind, Name: "pg"},
+				},
+			}
+			resolved := &ResolvedBackupConfig{
+				StrategyRef: corev1.TypedLocalObjectReference{APIGroup: &strategyGroup, Kind: strategyv1alpha1.CNPGStrategyKind, Name: "strat"},
+			}
+			cnpgBk := &cnpgtypes.Backup{
+				ObjectMeta: metav1.ObjectMeta{Name: "cnpg-bk"},
+				Status:     cnpgtypes.BackupStatus{MajorVersion: tc.major},
+			}
+			rendered := &strategyv1alpha1.CNPGTemplate{
+				BarmanObjectStore: strategyv1alpha1.BarmanObjectStoreTemplate{DestinationPath: "s3://b/"},
+			}
+			got, err := r.createCNPGBackupArtifact(context.Background(), j, resolved, cnpgBk, "postgres-pg", "postgres-pg", "postgresql", rendered, newPostgresApp("pg", "tenant"))
+			if err != nil {
+				t.Fatalf("createCNPGBackupArtifact: %v", err)
+			}
+			if v, ok := got.Spec.DriverMetadata[cnpgMajorVersionKey]; v != tc.want || ok != (tc.want != "") {
+				t.Errorf("driverMetadata[%s]: got %q (present=%v), want %q", cnpgMajorVersionKey, v, ok, tc.want)
+			}
+		})
+	}
+}
+
+// TestReconcileCNPGRestore_RefusesCrossMajorRestore drives the restore up to
+// the purge with the backup and the target on different PostgreSQL majors.
+// The purge used to run regardless, and the recovery could then never start:
+// the target was left empty.
+func TestReconcileCNPGRestore_RefusesCrossMajorRestore(t *testing.T) {
+	const (
+		ns         = "tenant"
+		sourceApp  = "app"
+		copyApp    = "copy"
+		cnpgBkName = "cnpgbk"
+	)
+	apiGroup := backupsv1alpha1.DefaultApplicationAPIGroup
+	strategyGroup := strategyv1alpha1.GroupVersion.Group
+	ctx := context.Background()
+	startedAt := metav1.NewTime(time.Now())
+
+	strategy := &strategyv1alpha1.CNPG{
+		ObjectMeta: metav1.ObjectMeta{Name: "cnpg-strategy"},
+		Spec: strategyv1alpha1.CNPGSpec{
+			Template: strategyv1alpha1.CNPGTemplate{
+				BarmanObjectStore: strategyv1alpha1.BarmanObjectStoreTemplate{DestinationPath: "s3://bucket/"},
+			},
+		},
+	}
+
+	for _, tc := range []struct {
+		name string
+		// recorded is the major the artifact's driverMetadata carries, "" for
+		// an artifact taken before the driver recorded it.
+		recorded string
+		// cnpgMajor is the cnpg.io/Backup's status.majorVersion; -1 for a
+		// cnpg.io/Backup that retention has removed.
+		cnpgMajor     int
+		targetVersion string
+		toCopy        bool
+		wantRefused   bool
+	}{
+		{name: "v18 backup into a v16 copy", recorded: "18", cnpgMajor: 18, targetVersion: "v16", toCopy: true, wantRefused: true},
+		{name: "in place into an app upgraded since its v16 backup", recorded: "16", cnpgMajor: 16, targetVersion: "v18", wantRefused: true},
+		{name: "artifact without the record falls back to the cnpg.io/Backup", cnpgMajor: 18, targetVersion: "v16", toCopy: true, wantRefused: true},
+		{name: "same major restores", recorded: "16", cnpgMajor: 16, targetVersion: "v16", toCopy: true},
+		{name: "unknown backup major restores", cnpgMajor: -1, targetVersion: "v16", toCopy: true},
+		{name: "cnpg.io/Backup without majorVersion restores", cnpgMajor: 0, targetVersion: "v16"},
+		{name: "unknown target version restores", recorded: "18", cnpgMajor: 18, targetVersion: ""},
+	} {
+		t.Run(tc.name, func(t *testing.T) {
+			targetApp := sourceApp
+			if tc.toCopy {
+				targetApp = copyApp
+			}
+			targetCluster := cnpgClusterNameForApp(targetApp)
+
+			snap, err := marshalCNPGBackupSnapshot(newPostgresApp(sourceApp, ns), nil, "")
+			if err != nil {
+				t.Fatalf("marshal snapshot: %v", err)
+			}
+			driverMD := map[string]string{
+				cnpgServerNameKey:      sourceApp,
+				cnpgDestinationPathKey: "s3://bucket/" + sourceApp + "/",
+				cnpgBackupNameKey:      cnpgBkName,
+			}
+			if tc.recorded != "" {
+				driverMD[cnpgMajorVersionKey] = tc.recorded
+			}
+			backup := &backupsv1alpha1.Backup{
+				ObjectMeta: metav1.ObjectMeta{Namespace: ns, Name: "bk"},
+				Spec: backupsv1alpha1.BackupSpec{
+					ApplicationRef: corev1.TypedLocalObjectReference{APIGroup: &apiGroup, Kind: postgresAppKind, Name: sourceApp},
+					StrategyRef:    corev1.TypedLocalObjectReference{APIGroup: &strategyGroup, Kind: strategyv1alpha1.CNPGStrategyKind, Name: "cnpg-strategy"},
+					DriverMetadata: driverMD,
+				},
+				Status: backupsv1alpha1.BackupStatus{UnderlyingResources: snap},
+			}
+			rj := &backupsv1alpha1.RestoreJob{
+				ObjectMeta: metav1.ObjectMeta{Namespace: ns, Name: "rj"},
+				Spec:       backupsv1alpha1.RestoreJobSpec{BackupRef: corev1.LocalObjectReference{Name: "bk"}},
+				Status:     backupsv1alpha1.RestoreJobStatus{StartedAt: &startedAt, Phase: backupsv1alpha1.RestoreJobPhaseRunning},
+			}
+			if tc.toCopy {
+				rj.Spec.TargetApplicationRef = &corev1.TypedLocalObjectReference{APIGroup: &apiGroup, Kind: postgresAppKind, Name: copyApp}
+			}
+			app := newPostgresApp(targetApp, ns)
+			app.Spec.Version = tc.targetVersion
+			objs := []client.Object{backup, rj, strategy, app,
+				&cnpgtypes.Cluster{ObjectMeta: metav1.ObjectMeta{Namespace: ns, Name: targetCluster}},
+				&corev1.PersistentVolumeClaim{ObjectMeta: metav1.ObjectMeta{
+					Namespace: ns, Name: targetCluster + "-1", Labels: map[string]string{cnpgClusterLabel: targetCluster},
+				}},
+			}
+			if tc.cnpgMajor >= 0 {
+				objs = append(objs, &cnpgtypes.Backup{
+					ObjectMeta: metav1.ObjectMeta{Namespace: ns, Name: cnpgBkName},
+					Spec:       cnpgtypes.BackupSpec{Cluster: cnpgtypes.ClusterReference{Name: cnpgClusterNameForApp(sourceApp)}},
+					Status: cnpgtypes.BackupStatus{
+						Phase: cnpgBackupPhaseComplete, EndWal: "000000010000000000000003", MajorVersion: tc.cnpgMajor,
+					},
+				})
+			}
+
+			s := runtime.NewScheme()
+			_ = scheme.AddToScheme(s)
+			_ = backupsv1alpha1.AddToScheme(s)
+			_ = strategyv1alpha1.AddToScheme(s)
+			_ = cnpgtypes.AddToScheme(s)
+			_ = postgresapp.AddToScheme(s)
+			var deleted []string
+			c := clientfake.NewClientBuilder().
+				WithScheme(s).
+				WithObjects(objs...).
+				WithStatusSubresource(&backupsv1alpha1.BackupJob{}, &backupsv1alpha1.RestoreJob{}, &backupsv1alpha1.Backup{}).
+				WithInterceptorFuncs(interceptor.Funcs{
+					Delete: func(ctx context.Context, cl client.WithWatch, obj client.Object, opts ...client.DeleteOption) error {
+						deleted = append(deleted, fmt.Sprintf("%T %s", obj, obj.GetName()))
+						return cl.Delete(ctx, obj, opts...)
+					},
+				}).
+				Build()
+			r := &RestoreJobReconciler{Client: c, Interface: dynamicfake.NewSimpleDynamicClient(testCNPGScheme(t)), Recorder: record.NewFakeRecorder(10)}
+
+			live := &backupsv1alpha1.RestoreJob{}
+			if err := c.Get(ctx, client.ObjectKey{Namespace: ns, Name: "rj"}, live); err != nil {
+				t.Fatalf("get seeded RestoreJob: %v", err)
+			}
+			if _, err := r.reconcileCNPGRestore(ctx, live, backup); err != nil {
+				t.Fatalf("reconcileCNPGRestore: %v", err)
+			}
+			got := &backupsv1alpha1.RestoreJob{}
+			if err := c.Get(ctx, client.ObjectKey{Namespace: ns, Name: "rj"}, got); err != nil {
+				t.Fatalf("get RestoreJob after reconcile: %v", err)
+			}
+			patched := &postgresapp.Postgres{}
+			if err := c.Get(ctx, client.ObjectKey{Namespace: ns, Name: targetApp}, patched); err != nil {
+				t.Fatalf("get target Postgres app: %v", err)
+			}
+
+			if !tc.wantRefused {
+				if got.Status.Phase == backupsv1alpha1.RestoreJobPhaseFailed {
+					t.Fatalf("restore failed: %s", got.Status.Message)
+				}
+				if len(deleted) == 0 || !patched.Spec.Bootstrap.Enabled {
+					t.Fatalf("restore did not reach the purge: deleted=%v bootstrap.enabled=%v", deleted, patched.Spec.Bootstrap.Enabled)
+				}
+				return
+			}
+			if got.Status.Phase != backupsv1alpha1.RestoreJobPhaseFailed {
+				t.Errorf("expected phase Failed, got %q", got.Status.Phase)
+			}
+			if cond := apimeta.FindStatusCondition(got.Status.Conditions, "Ready"); cond == nil || cond.Reason != "MajorVersionMismatch" {
+				t.Errorf("expected Ready=False reason MajorVersionMismatch, got %+v", cond)
+			}
+			for _, major := range []string{"PostgreSQL 16", "PostgreSQL 18"} {
+				if !strings.Contains(got.Status.Message, major) {
+					t.Errorf("message must name both majors, %q missing from %q", major, got.Status.Message)
+				}
+			}
+			if len(deleted) != 0 {
+				t.Errorf("a refused restore must delete nothing, deleted %v", deleted)
+			}
+			if err := c.Get(ctx, client.ObjectKey{Namespace: ns, Name: targetCluster}, &cnpgtypes.Cluster{}); err != nil {
+				t.Errorf("target Cluster must survive: %v", err)
+			}
+			if err := c.Get(ctx, client.ObjectKey{Namespace: ns, Name: targetCluster + "-1"}, &corev1.PersistentVolumeClaim{}); err != nil {
+				t.Errorf("target PVC must survive: %v", err)
+			}
+			if patched.Spec.Bootstrap.Enabled {
+				t.Errorf("a refused restore must not patch the target app")
+			}
+		})
+	}
+}
diff --git a/internal/backupcontroller/cnpgtypes/deepcopy_test.go b/internal/backupcontroller/cnpgtypes/deepcopy_test.go
new file mode 100644
index 0000000000..1edb584b71
--- /dev/null
+++ b/internal/backupcontroller/cnpgtypes/deepcopy_test.go
@@ -0,0 +1,46 @@
+// SPDX-License-Identifier: Apache-2.0
+
+package cnpgtypes
+
+import (
+	"testing"
+	"time"
+
+	corev1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/api/resource"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+func TestObjectStoreDeepCopySidecarResources(t *testing.T) {
+	original := &ObjectStore{Spec: ObjectStoreSpec{
+		InstanceSidecarConfiguration: &InstanceSidecarConfiguration{
+			Resources: corev1.ResourceRequirements{
+				Requests: corev1.ResourceList{corev1.ResourceMemory: resource.MustParse("256Mi")},
+				Limits:   corev1.ResourceList{corev1.ResourceMemory: resource.MustParse("1Gi")},
+			},
+			Env: []EnvVar{{Name: "AWS_REQUEST_CHECKSUM_CALCULATION", Value: "when_required"}},
+		},
+	}}
+	copy := original.DeepCopy()
+	copy.Spec.InstanceSidecarConfiguration.Resources.Requests[corev1.ResourceMemory] = resource.MustParse("512Mi")
+	copy.Spec.InstanceSidecarConfiguration.Resources.Limits[corev1.ResourceMemory] = resource.MustParse("2Gi")
+	copy.Spec.InstanceSidecarConfiguration.Env[0].Value = "changed"
+	got := original.Spec.InstanceSidecarConfiguration
+	if got.Resources.Requests.Memory().String() != "256Mi" || got.Resources.Limits.Memory().String() != "1Gi" || got.Env[0].Value != "when_required" {
+		t.Fatalf("mutating the copy changed the original sidecar configuration: %+v", got)
+	}
+}
+
+func TestBackupStatusDeepCopyStoppedAt(t *testing.T) {
+	stopped := metav1.NewTime(time.Date(2026, 9, 21, 6, 27, 23, 0, time.UTC))
+	original := &Backup{Status: BackupStatus{BackupID: "20260921T062713", StoppedAt: &stopped}}
+
+	want := stopped.Time
+
+	copied := original.DeepCopy()
+	copied.Status.StoppedAt.Time = copied.Status.StoppedAt.Add(time.Hour)
+
+	if !original.Status.StoppedAt.Time.Equal(want) {
+		t.Fatalf("mutating the copy's stoppedAt changed the original: %v", original.Status.StoppedAt)
+	}
+}
diff --git a/internal/backupcontroller/cnpgtypes/types.go b/internal/backupcontroller/cnpgtypes/types.go
index 064c5feb4f..c506313ce6 100644
--- a/internal/backupcontroller/cnpgtypes/types.go
+++ b/internal/backupcontroller/cnpgtypes/types.go
@@ -11,6 +11,7 @@
 package cnpgtypes
 
 import (
+	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
@@ -19,12 +20,30 @@ import (
 const (
 	GroupName = "postgresql.cnpg.io"
 	Version   = "v1"
+
+	// BarmanGroupName / BarmanVersion identify the Barman Cloud plugin API
+	// (github.com/cloudnative-pg/plugin-barman-cloud). The ObjectStore CRD it
+	// ships carries the S3/barman configuration the driver used to inline into
+	// spec.backup.barmanObjectStore; native barman is deprecated in CNPG 1.27
+	// and removed in 1.29.
+	BarmanGroupName = "barmancloud.cnpg.io"
+	BarmanVersion   = "v1"
+
+	// PluginName is the CNPG-I plugin name the barman-cloud plugin registers
+	// under. It MUST match the plugin Service's cnpg.io/pluginName label so
+	// CNPG routes backup/WAL/recovery through it.
+	PluginName = "barman-cloud.cloudnative-pg.io"
+
+	// BackupMethodPlugin is the postgresql.cnpg.io/Backup spec.method value
+	// that delegates the run to a CNPG-I plugin (here barman-cloud).
+	BackupMethodPlugin = "plugin"
 )
 
 var (
-	GroupVersion  = schema.GroupVersion{Group: GroupName, Version: Version}
-	SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
-	AddToScheme   = SchemeBuilder.AddToScheme
+	GroupVersion       = schema.GroupVersion{Group: GroupName, Version: Version}
+	BarmanGroupVersion = schema.GroupVersion{Group: BarmanGroupName, Version: BarmanVersion}
+	SchemeBuilder      = runtime.NewSchemeBuilder(addKnownTypes)
+	AddToScheme        = SchemeBuilder.AddToScheme
 )
 
 func addKnownTypes(scheme *runtime.Scheme) error {
@@ -32,7 +51,11 @@ func addKnownTypes(scheme *runtime.Scheme) error {
 		&Cluster{}, &ClusterList{},
 		&Backup{}, &BackupList{},
 	)
+	scheme.AddKnownTypes(BarmanGroupVersion,
+		&ObjectStore{}, &ObjectStoreList{},
+	)
 	metav1.AddToGroupVersion(scheme, GroupVersion)
+	metav1.AddToGroupVersion(scheme, BarmanGroupVersion)
 	return nil
 }
 
@@ -52,12 +75,32 @@ type ClusterList struct {
 }
 
 type ClusterSpec struct {
+	// ImageName is read, never patched: the backup driver records the image
+	// family the data directory runs on. Empty means CNPG's default
+	// postgresql image.
+	ImageName string                  `json:"imageName,omitempty"`
 	Backup    *BackupConfiguration    `json:"backup,omitempty"`
 	Bootstrap *BootstrapConfiguration `json:"bootstrap,omitempty"`
+	// Plugins wires CNPG-I plugins (here barman-cloud) onto the Cluster. The
+	// driver SSA-patches exactly this field for the platform-managed backup
+	// flow, replacing the deprecated spec.backup.barmanObjectStore path.
+	Plugins []PluginConfiguration `json:"plugins,omitempty"`
+}
+
+// PluginConfiguration references a CNPG-I plugin from a Cluster. For
+// barman-cloud, Parameters carries barmanObjectName (the ObjectStore CR name)
+// and optionally serverName (the per-server folder under destinationPath).
+type PluginConfiguration struct {
+	Name string `json:"name"`
+	// IsWALArchiver marks this plugin as the WAL archiver. Exactly one plugin
+	// entry must set it for continuous archiving / PITR to work.
+	IsWALArchiver *bool             `json:"isWALArchiver,omitempty"`
+	Parameters    map[string]string `json:"parameters,omitempty"`
 }
 
 type ClusterStatus struct {
-	Phase string `json:"phase,omitempty"`
+	Phase       string `json:"phase,omitempty"`
+	PhaseReason string `json:"phaseReason,omitempty"`
 }
 
 type BackupConfiguration struct {
@@ -131,12 +174,66 @@ type BackupList struct {
 type BackupSpec struct {
 	Method  string           `json:"method,omitempty"`
 	Cluster ClusterReference `json:"cluster,omitempty"`
+	// PluginConfiguration selects the CNPG-I plugin that executes the backup
+	// when Method is "plugin". For barman-cloud, Name is the plugin name.
+	PluginConfiguration *BackupPluginConfiguration `json:"pluginConfiguration,omitempty"`
+}
+
+// BackupPluginConfiguration names the plugin a Backup run delegates to.
+type BackupPluginConfiguration struct {
+	Name       string            `json:"name"`
+	Parameters map[string]string `json:"parameters,omitempty"`
 }
 
 type ClusterReference struct {
 	Name string `json:"name,omitempty"`
 }
 
+// ObjectStore is the minimal subset of the barmancloud.cnpg.io/v1 ObjectStore
+// CRD the driver writes. spec.configuration carries the S3/barman settings
+// (the same shape native barmanObjectStore used, minus serverName which the
+// plugin forbids there and takes from the Cluster plugin parameter instead);
+// spec.retentionPolicy is top-level.
+//
+// +kubebuilder:object:root=true
+type ObjectStore struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+	Spec              ObjectStoreSpec `json:"spec,omitempty"`
+}
+
+// +kubebuilder:object:root=true
+type ObjectStoreList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+	Items           []ObjectStore `json:"items"`
+}
+
+type ObjectStoreSpec struct {
+	Configuration BarmanObjectStoreConfiguration `json:"configuration"`
+	// RetentionPolicy is a barman retention expression validated by the plugin
+	// CRD against ^[1-9][0-9]*[dwm]$ (e.g. "30d").
+	RetentionPolicy string `json:"retentionPolicy,omitempty"`
+	// InstanceSidecarConfiguration passes settings to the barman-cloud sidecar
+	// that the plugin injects into the CNPG pods. Only the fields we set are
+	// modelled (see the upstream ObjectStore CRD for the full type).
+	InstanceSidecarConfiguration *InstanceSidecarConfiguration `json:"instanceSidecarConfiguration,omitempty"`
+}
+
+// InstanceSidecarConfiguration is a minimal mirror of the barman-cloud
+// ObjectStore's spec.instanceSidecarConfiguration.
+type InstanceSidecarConfiguration struct {
+	Env       []EnvVar                    `json:"env,omitempty"`
+	Resources corev1.ResourceRequirements `json:"resources,omitempty"`
+}
+
+// EnvVar is a minimal corev1.EnvVar (name/value only) — enough to pass a
+// literal environment variable to the barman-cloud sidecar.
+type EnvVar struct {
+	Name  string `json:"name"`
+	Value string `json:"value,omitempty"`
+}
+
 type BackupStatus struct {
 	Phase     string       `json:"phase,omitempty"`
 	Error     string       `json:"error,omitempty"`
@@ -149,4 +246,13 @@ type BackupStatus struct {
 	// destroys the source PVCs.
 	BeginWal string `json:"beginWal,omitempty"`
 	EndWal   string `json:"endWal,omitempty"`
+	// BackupID is barman's identifier for the base backup, the value
+	// bootstrap.recovery.recoveryTarget.backupID selects it by. StoppedAt is
+	// when it ended, truncated to the second where barman records the
+	// microsecond.
+	BackupID  string       `json:"backupId,omitempty"`
+	StoppedAt *metav1.Time `json:"stoppedAt,omitempty"`
+	// MajorVersion is the PostgreSQL major the backup was taken on. Zero on
+	// a Backup written by a CNPG release that predates the field.
+	MajorVersion int `json:"majorVersion,omitempty"`
 }
diff --git a/internal/backupcontroller/cnpgtypes/zz_generated.deepcopy.go b/internal/backupcontroller/cnpgtypes/zz_generated.deepcopy.go
index a83024a430..ac9752d7da 100644
--- a/internal/backupcontroller/cnpgtypes/zz_generated.deepcopy.go
+++ b/internal/backupcontroller/cnpgtypes/zz_generated.deepcopy.go
@@ -7,6 +7,8 @@
 package cnpgtypes
 
 import (
+	"maps"
+
 	"k8s.io/apimachinery/pkg/runtime"
 )
 
@@ -72,6 +74,24 @@ func (in *ClusterSpec) DeepCopyInto(out *ClusterSpec) {
 		out.Bootstrap = new(BootstrapConfiguration)
 		in.Bootstrap.DeepCopyInto(out.Bootstrap)
 	}
+	if in.Plugins != nil {
+		out.Plugins = make([]PluginConfiguration, len(in.Plugins))
+		for i := range in.Plugins {
+			in.Plugins[i].DeepCopyInto(&out.Plugins[i])
+		}
+	}
+}
+
+func (in *PluginConfiguration) DeepCopyInto(out *PluginConfiguration) {
+	*out = *in
+	if in.IsWALArchiver != nil {
+		out.IsWALArchiver = new(bool)
+		*out.IsWALArchiver = *in.IsWALArchiver
+	}
+	if in.Parameters != nil {
+		out.Parameters = make(map[string]string, len(in.Parameters))
+		maps.Copy(out.Parameters, in.Parameters)
+	}
 }
 
 func (in *BackupConfiguration) DeepCopyInto(out *BackupConfiguration) {
@@ -142,10 +162,105 @@ func (in *Backup) DeepCopyInto(out *Backup) {
 	*out = *in
 	out.TypeMeta = in.TypeMeta
 	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
-	out.Spec = in.Spec
+	in.Spec.DeepCopyInto(&out.Spec)
 	in.Status.DeepCopyInto(&out.Status)
 }
 
+func (in *BackupSpec) DeepCopyInto(out *BackupSpec) {
+	*out = *in
+	out.Cluster = in.Cluster
+	if in.PluginConfiguration != nil {
+		out.PluginConfiguration = new(BackupPluginConfiguration)
+		in.PluginConfiguration.DeepCopyInto(out.PluginConfiguration)
+	}
+}
+
+func (in *BackupPluginConfiguration) DeepCopyInto(out *BackupPluginConfiguration) {
+	*out = *in
+	if in.Parameters != nil {
+		out.Parameters = make(map[string]string, len(in.Parameters))
+		maps.Copy(out.Parameters, in.Parameters)
+	}
+}
+
+func (in *ObjectStore) DeepCopyInto(out *ObjectStore) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
+	in.Spec.DeepCopyInto(&out.Spec)
+}
+
+func (in *ObjectStore) DeepCopy() *ObjectStore {
+	if in == nil {
+		return nil
+	}
+	out := new(ObjectStore)
+	in.DeepCopyInto(out)
+	return out
+}
+
+func (in *ObjectStore) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+func (in *ObjectStoreList) DeepCopyInto(out *ObjectStoreList) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ListMeta.DeepCopyInto(&out.ListMeta)
+	if in.Items != nil {
+		out.Items = make([]ObjectStore, len(in.Items))
+		for i := range in.Items {
+			in.Items[i].DeepCopyInto(&out.Items[i])
+		}
+	}
+}
+
+func (in *ObjectStoreList) DeepCopy() *ObjectStoreList {
+	if in == nil {
+		return nil
+	}
+	out := new(ObjectStoreList)
+	in.DeepCopyInto(out)
+	return out
+}
+
+func (in *ObjectStoreList) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+func (in *ObjectStoreSpec) DeepCopyInto(out *ObjectStoreSpec) {
+	*out = *in
+	in.Configuration.DeepCopyInto(&out.Configuration)
+	if in.InstanceSidecarConfiguration != nil {
+		out.InstanceSidecarConfiguration = new(InstanceSidecarConfiguration)
+		in.InstanceSidecarConfiguration.DeepCopyInto(out.InstanceSidecarConfiguration)
+	}
+}
+
+func (in *InstanceSidecarConfiguration) DeepCopyInto(out *InstanceSidecarConfiguration) {
+	*out = *in
+	in.Resources.DeepCopyInto(&out.Resources)
+	if in.Env != nil {
+		out.Env = make([]EnvVar, len(in.Env))
+		copy(out.Env, in.Env)
+	}
+}
+
+func (in *InstanceSidecarConfiguration) DeepCopy() *InstanceSidecarConfiguration {
+	if in == nil {
+		return nil
+	}
+	out := new(InstanceSidecarConfiguration)
+	in.DeepCopyInto(out)
+	return out
+}
+
 func (in *Backup) DeepCopy() *Backup {
 	if in == nil {
 		return nil
@@ -195,4 +310,7 @@ func (in *BackupStatus) DeepCopyInto(out *BackupStatus) {
 	if in.StartedAt != nil {
 		out.StartedAt = in.StartedAt.DeepCopy()
 	}
+	if in.StoppedAt != nil {
+		out.StoppedAt = in.StoppedAt.DeepCopy()
+	}
 }
diff --git a/internal/backupcontroller/credentials_projector_runnable.go b/internal/backupcontroller/credentials_projector_runnable.go
index 0b5219631d..7988d42293 100644
--- a/internal/backupcontroller/credentials_projector_runnable.go
+++ b/internal/backupcontroller/credentials_projector_runnable.go
@@ -80,7 +80,7 @@ func (p *SystemCredentialsProjector) NeedLeaderElection() bool { return true }
 // if Period is zero.
 func NewSystemCredentialsProjector(c client.Client, cfg BackupCredentialsConfig, namespacesCSV string, period time.Duration) *SystemCredentialsProjector {
 	var ns []string
-	for _, s := range strings.Split(namespacesCSV, ",") {
+	for s := range strings.SplitSeq(namespacesCSV, ",") {
 		s = strings.TrimSpace(s)
 		if s != "" {
 			ns = append(ns, s)
@@ -138,8 +138,7 @@ func (p *SystemCredentialsProjector) projectAll(ctx context.Context, logger logr
 // error is one of ours, otherwise "Unknown". Used as a metric label, so
 // the cardinality is bounded by the small Reason* set.
 func classifyReason(err error) string {
-	var perr *ProjectionError
-	if errors.As(err, &perr) {
+	if perr, ok := errors.AsType[*ProjectionError](err); ok {
 		return perr.Reason
 	}
 	return "Unknown"
diff --git a/internal/backupcontroller/default_objects_gate.go b/internal/backupcontroller/default_objects_gate.go
new file mode 100644
index 0000000000..023682036a
--- /dev/null
+++ b/internal/backupcontroller/default_objects_gate.go
@@ -0,0 +1,552 @@
+package backupcontroller
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"net/http"
+	"sort"
+	"time"
+
+	"github.com/go-logr/logr"
+	"github.com/prometheus/client_golang/prometheus"
+	corev1 "k8s.io/api/core/v1"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	"k8s.io/apimachinery/pkg/api/meta"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apimachinery/pkg/types"
+	"k8s.io/client-go/dynamic"
+	"k8s.io/client-go/rest"
+	ctrl "sigs.k8s.io/controller-runtime"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/client/apiutil"
+	"sigs.k8s.io/controller-runtime/pkg/log"
+	"sigs.k8s.io/controller-runtime/pkg/manager"
+	"sigs.k8s.io/controller-runtime/pkg/metrics"
+
+	backupsv1alpha1 "github.com/cozystack/cozystack/api/backups/v1alpha1"
+)
+
+// defaultObjectsMissing reports how many of the objects the platform default
+// backups depend on are absent from the cluster: the bucket credentials
+// Secret the projector reads, the Strategy CRs the BackupClass routes to,
+// and the Velero BSL. It is the signal an operator alerts on: a non-zero
+// value that does not return to zero means the platform default backups are
+// not usable, whatever the HelmRelease's Ready condition says.
+//
+// It is only written when a check reached a conclusion. An API error mid-check
+// leaves the previous value in place rather than flapping the alert, so the
+// gauge alone cannot distinguish "healthy" from "not evaluated" — that is what
+// defaultObjectsCheckErrors is for, and the runbook pairs the two.
+var defaultObjectsMissing = prometheus.NewGaugeVec(
+	prometheus.GaugeOpts{
+		Name: "cozystack_backup_default_objects_missing",
+		Help: "Number of objects the platform default backups depend on (bucket credentials Secret, BackupClass strategy CRs, Velero BSL) that do not exist in the cluster.",
+	},
+	[]string{"backupclass"},
+)
+
+// defaultObjectsForceReconciles counts the forced Helm upgrades the gate
+// issued to materialise those objects. A counter that keeps climbing means
+// the forced render is not producing the objects (e.g. a CRD is missing),
+// which is a different failure than the install-time race this gate closes.
+// A suspended release is NOT counted here: it is skipped before the patch,
+// so a paused release cannot masquerade as a render that keeps failing.
+var defaultObjectsForceReconciles = prometheus.NewCounterVec(
+	prometheus.CounterOpts{
+		Name: "cozystack_backup_default_objects_force_reconciles_total",
+		Help: "Number of forced HelmRelease reconciles issued to create missing platform backup objects.",
+	},
+	[]string{"namespace", "name"},
+)
+
+// defaultObjectsCheckErrors counts the checks that could not reach a
+// conclusion (API error reading the source Secret, the BackupClass, or one
+// of the routed objects). While this climbs, defaultObjectsMissing is stale:
+// alerting on the gauge alone would silently keep reporting the last known
+// state, including a 0 that is no longer true.
+var defaultObjectsCheckErrors = prometheus.NewCounterVec(
+	prometheus.CounterOpts{
+		Name: "cozystack_backup_default_objects_check_errors_total",
+		Help: "Number of default backup object checks that failed before reaching a conclusion, leaving cozystack_backup_default_objects_missing stale.",
+	},
+	[]string{"backupclass"},
+)
+
+func init() {
+	metrics.Registry.MustRegister(defaultObjectsMissing, defaultObjectsForceReconciles, defaultObjectsCheckErrors)
+}
+
+const (
+	// strategyAPIGroup is the API group of the strategy.backups.cozystack.io
+	// CRs a BackupClass routes to. BackupClassStrategy.StrategyRef is a
+	// TypedLocalObjectReference and carries no version, so the group+kind
+	// are mapped to a resource through the RESTMapper.
+	strategyAPIGroup = "strategy.backups.cozystack.io"
+
+	// defaultBackupStorageLocationName is the Velero BSL the cozy-default
+	// Velero strategies reference via storageLocation. It is rendered by the
+	// same lookup-gated template as the Strategy CRs, so it belongs to the
+	// same existence check.
+	defaultBackupStorageLocationName = "cozy-default"
+)
+
+var backupStorageLocationGVR = schema.GroupVersionResource{
+	Group:    "velero.io",
+	Version:  "v1",
+	Resource: "backupstoragelocations",
+}
+
+// DefaultObjectsGate closes a race the chart's templates cannot close by
+// themselves.
+//
+// The default Strategy CRs and the Velero BackupStorageLocation are
+// Helm-templated behind a `lookup` of the BucketClaim the SAME chart
+// creates, because the S3 bucket name is assigned by the COSI driver
+// (`bucket-<claim-UID>`) and is therefore unknowable at render time. On a
+// fresh install the lookup is empty and those templates render nothing.
+// helm-controller does not re-render a release that succeeded and whose
+// chart and values did not change (drift detection is off on
+// operator-generated HelmReleases), so the skip is PERMANENT: the objects
+// are never created, and the only recovery is a forced Helm upgrade
+// (reconcile.fluxcd.io/forceAt + requestedAt — a plain reconcile request
+// does not re-render).
+//
+// This runnable performs that recovery automatically. Once the bucket name
+// is resolvable — read from the same platform credentials Secret the
+// projector already consumes, so no new dependency and no `lookup` — it
+// checks that every object the platform BackupClass routes to actually
+// exists, and forces one Helm upgrade when any is missing. A forced
+// upgrade re-runs the lookups, so the gated templates materialise.
+//
+// It deliberately does not create the objects itself: their bodies are
+// values-driven (endpoint, region, forcePathStyle, the Altinity strategy's
+// whole PodTemplateSpec) and Helm remains their single owner. The gate only
+// makes sure the render that produces them actually happens.
+type DefaultObjectsGate struct {
+	// Client reads the BackupClass (cached) and the source credentials
+	// Secret (uncached — the manager disables the Secret cache).
+	Client client.Client
+	// Interface is a dynamic client used for the per-object existence
+	// checks and the HelmRelease annotation patch. Going through the
+	// dynamic client keeps these reads off the controller-runtime cache,
+	// so they need only `get` RBAC and start no cluster-wide informers.
+	dynamic.Interface
+	meta.RESTMapper
+
+	// Config supplies the source credentials Secret coordinates. Reused
+	// verbatim from the credentials projector.
+	Config BackupCredentialsConfig
+	// BackupClassName is the platform BackupClass whose strategyRefs
+	// enumerate the objects that must exist. Empty disables the gate.
+	BackupClassName string
+	// HelmRelease is the release that renders those objects and is forced
+	// when they are missing. Empty name disables the gate.
+	HelmRelease types.NamespacedName
+	// CredentialsHelmRelease is the platform bucket's <bucket>-system
+	// release, which renders the user-credentials Secret named by
+	// Config.SourceSecretName behind a `lookup` of the COSI Secret — the
+	// same permanent-skip trap as the Strategy CRs, one release earlier.
+	// Forcing it is what unblocks everything downstream, since the gate
+	// itself cannot resolve the bucket name without that Secret.
+	//
+	// Empty when the platform bucket is not provisioned by Cozystack
+	// (backupStorage.provisionBucket=false, external S3): the Secret is
+	// then admin-managed and no release renders it, so there is nothing
+	// to force.
+	CredentialsHelmRelease types.NamespacedName
+	// VeleroNamespace is where the cozy-default BackupStorageLocation
+	// lives. Empty skips the BSL check (velero.bslEnabled=false).
+	VeleroNamespace string
+
+	// Period is the check interval. Defaults to 1 minute.
+	Period time.Duration
+	// MinForceInterval throttles forced upgrades so a condition the forced
+	// render cannot fix (missing CRD, wrong bucket) does not turn into a
+	// hot loop against helm-controller. Defaults to 5 minutes.
+	MinForceInterval time.Duration
+
+	// now is a test seam for the throttle clock.
+	now func() time.Time
+	// lastForce and lastCredentialsForce throttle the two releases
+	// independently: the credentials release is forced during the window in
+	// which the objects release cannot even be evaluated, so sharing one
+	// timestamp would make the first force delay the second by
+	// MinForceInterval for no reason.
+	lastForce            time.Time
+	lastCredentialsForce time.Time
+}
+
+// errHelmReleaseSuspended reports that the target release has
+// spec.suspend: true. helm-controller ignores reconcile.fluxcd.io/forceAt on
+// a suspended release, so patching it would be a no-op repeated every
+// MinForceInterval for as long as the suspension lasts.
+var errHelmReleaseSuspended = errors.New("HelmRelease is suspended")
+
+var (
+	_ manager.Runnable               = (*DefaultObjectsGate)(nil)
+	_ manager.LeaderElectionRunnable = (*DefaultObjectsGate)(nil)
+)
+
+// NeedLeaderElection keeps a single replica forcing the release. Two
+// replicas racing the same annotation patch would double the Helm upgrades
+// for no benefit.
+func (g *DefaultObjectsGate) NeedLeaderElection() bool { return true }
+
+// SetupWithManager wires the dynamic client and the RESTMapper from the
+// manager's rest.Config, mirroring RestoreJobReconciler, and registers the
+// gate as a manager Runnable.
+func (g *DefaultObjectsGate) SetupWithManager(mgr ctrl.Manager) error {
+	cfg := mgr.GetConfig()
+	var err error
+	if g.Interface, err = dynamic.NewForConfig(cfg); err != nil {
+		return err
+	}
+	var h *http.Client
+	if h, err = rest.HTTPClientFor(cfg); err != nil {
+		return err
+	}
+	if g.RESTMapper, err = apiutil.NewDynamicRESTMapper(cfg, h); err != nil {
+		return err
+	}
+	return mgr.Add(g)
+}
+
+func (g *DefaultObjectsGate) Start(ctx context.Context) error {
+	logger := log.FromContext(ctx).WithName("default-objects-gate")
+	if g.BackupClassName == "" || g.HelmRelease.Name == "" || g.HelmRelease.Namespace == "" || !g.Config.IsEnabled() {
+		logger.V(1).Info("default backup objects gate disabled",
+			"backupClass", g.BackupClassName,
+			"helmRelease", g.HelmRelease.String(),
+			"credentialsConfigured", g.Config.IsEnabled())
+		return nil
+	}
+	if g.Period == 0 {
+		g.Period = time.Minute
+	}
+	if g.MinForceInterval == 0 {
+		g.MinForceInterval = 5 * time.Minute
+	}
+	if g.now == nil {
+		g.now = time.Now
+	}
+	// force() logs the suspended-release skip from deep in the call stack;
+	// without this it would land on a bare logger with no name.
+	ctx = log.IntoContext(ctx, logger)
+
+	tick := time.NewTicker(g.Period)
+	defer tick.Stop()
+	g.checkAndLog(ctx, logger)
+	for {
+		select {
+		case <-ctx.Done():
+			return nil
+		case <-tick.C:
+			g.checkAndLog(ctx, logger)
+		}
+	}
+}
+
+// checkTimeout bounds a single check. It stays below Period so a slow check
+// cannot overlap the next tick, and is capped so a long Period does not mean a
+// correspondingly long stall.
+func (g *DefaultObjectsGate) checkTimeout() time.Duration {
+	const maxTimeout = 30 * time.Second
+	if g.Period <= 0 {
+		return maxTimeout
+	}
+	if half := g.Period / 2; half < maxTimeout {
+		return half
+	}
+	return maxTimeout
+}
+
+func (g *DefaultObjectsGate) checkAndLog(ctx context.Context, logger logr.Logger) {
+	// Bound every tick. Check makes several sequential API calls (Secret get,
+	// BackupClass get, one Get per routed strategy, HelmRelease patch) and the
+	// manager context is only cancelled at shutdown, so an API server that
+	// stalls on any one of them would block here indefinitely. The loop that
+	// drives this is sequential, so that single stuck call would stop all
+	// later checks for the life of the pod: the recovery this gate exists to
+	// provide would go silent, with a stale gauge and no further log line, and
+	// only a restart would bring it back.
+	checkCtx, cancel := context.WithTimeout(ctx, g.checkTimeout())
+	defer cancel()
+	missing, forced, err := g.Check(checkCtx)
+	switch {
+	case err != nil:
+		// Info, not Error: every branch here is either transient (the
+		// bucket is still being provisioned) or already exposed as a
+		// metric, and this runs every minute for the life of the cluster.
+		logger.Info("default backup objects check failed", "error", err.Error())
+	case len(missing) > 0 && forced:
+		// The release named here is whichever one renders what is missing:
+		// the credentials Secret comes from the bucket's <bucket>-system
+		// release, everything else from this chart's own.
+		logger.Info("forced a Helm upgrade to create missing default backup objects",
+			"helmRelease", g.forcedReleaseFor(missing).String(), "missing", missing)
+	case len(missing) > 0:
+		logger.Info("default backup objects still missing, no force issued on this tick",
+			"helmRelease", g.forcedReleaseFor(missing).String(), "missing", missing,
+			"minForceInterval", g.MinForceInterval.String())
+	default:
+		logger.V(1).Info("all default backup objects present")
+	}
+}
+
+// forcedReleaseFor reports which release renders the given missing set, for
+// logging only. reconcileCredentials returns the credentials Secret as the
+// sole missing object, and it is never mixed with the routed objects —
+// resolving the bucket name is a precondition for checking those at all.
+func (g *DefaultObjectsGate) forcedReleaseFor(missing []string) types.NamespacedName {
+	credsKey := fmt.Sprintf("Secret/%s", g.Config.SourceSecretName)
+	if len(missing) == 1 && missing[0] == credsKey && g.CredentialsHelmRelease.Name != "" {
+		return g.CredentialsHelmRelease
+	}
+	return g.HelmRelease
+}
+
+// Check resolves the platform bucket name, verifies that every object the
+// BackupClass routes to exists, and forces one Helm upgrade when any is
+// missing. It returns the missing objects (formatted for logs) and whether
+// a forced upgrade was issued on this call.
+//
+// While the source Secret is absent or carries no bucket name, the gate
+// cannot evaluate the routed objects — their templates gate on the same
+// unresolved bucket — so it instead forces the release that renders that
+// Secret (see reconcileCredentials). The bucket name is read from the
+// projector's source Secret rather than from the BucketClaim, so the gate
+// needs no objectstorage RBAC and works for the external-S3 path too.
+func (g *DefaultObjectsGate) Check(ctx context.Context) ([]string, bool, error) {
+	src := &corev1.Secret{}
+	if err := g.Client.Get(ctx, types.NamespacedName{Namespace: g.Config.SourceNamespace, Name: g.Config.SourceSecretName}, src); err != nil {
+		if apierrors.IsNotFound(err) {
+			// The Secret the projector reads does not exist. On a fresh
+			// install that is the bootstrap window; months later it is the
+			// permanent skip this gate exists to repair, and the two are
+			// indistinguishable from here — so treat both the same way and
+			// let the throttle bound the cost.
+			return g.reconcileCredentials(ctx)
+		}
+		defaultObjectsCheckErrors.WithLabelValues(g.BackupClassName).Inc()
+		return nil, false, fmt.Errorf("get source credentials Secret %s/%s: %w", g.Config.SourceNamespace, g.Config.SourceSecretName, err)
+	}
+	creds, err := parseSourceSecret(src)
+	if err != nil {
+		defaultObjectsCheckErrors.WithLabelValues(g.BackupClassName).Inc()
+		return nil, false, err
+	}
+	if creds.bucket == "" {
+		// The Secret exists but carries no bucket name: a partially rendered
+		// or hand-written Secret. Same treatment — a re-render of the
+		// producing release is the only thing that can complete it.
+		return g.reconcileCredentials(ctx)
+	}
+
+	backupClass := &backupsv1alpha1.BackupClass{}
+	if err := g.Client.Get(ctx, client.ObjectKey{Name: g.BackupClassName}, backupClass); err != nil {
+		defaultObjectsCheckErrors.WithLabelValues(g.BackupClassName).Inc()
+		return nil, false, fmt.Errorf("get BackupClass %s: %w", g.BackupClassName, err)
+	}
+
+	missing, err := g.missingObjects(ctx, backupClass)
+	if err != nil {
+		defaultObjectsCheckErrors.WithLabelValues(g.BackupClassName).Inc()
+		return nil, false, err
+	}
+	defaultObjectsMissing.WithLabelValues(g.BackupClassName).Set(float64(len(missing)))
+	if len(missing) == 0 {
+		return nil, false, nil
+	}
+
+	return g.force(ctx, g.HelmRelease, &g.lastForce, missing)
+}
+
+// reconcileCredentials handles the one object the gate cannot check the same
+// way as the others: the bucket user-credentials Secret it reads to resolve
+// the bucket name in the first place.
+//
+// That Secret is rendered by the platform bucket's <bucket>-system release
+// behind a `lookup` of the COSI Secret, so it is subject to the identical
+// permanent-skip trap — and when it is missing, nothing downstream can
+// resolve: the projector has no source, every Strategy CR and the Velero BSL
+// stay gated off, and migration 50 cannot find its snapshot target.
+//
+// The chart cannot repair this itself. Making the render `fail` instead of
+// skip would abort the whole <bucket>-system release — the other users'
+// Secrets and the bucket UI Deployment/Service/Ingress with it — and one
+// user whose BucketAccess never provisions would park the release in Failed,
+// blocking every later upgrade of that bucket with no per-bucket way out. So
+// the repair belongs here, where it is per-object and costs a throttled
+// annotation patch: exactly the mechanism the gate already applies to the
+// Strategy CRs, one release earlier in the chain.
+//
+// Forcing that release cannot deadlock its own precondition: the BucketClaim
+// and the BucketAccess whose COSI Secret the lookup reads are rendered
+// unconditionally by the PARENT release (packages/apps/bucket/templates/
+// bucketclaim.yaml), not by the one being forced.
+func (g *DefaultObjectsGate) reconcileCredentials(ctx context.Context) ([]string, bool, error) {
+	missing := []string{fmt.Sprintf("Secret/%s", g.Config.SourceSecretName)}
+	defaultObjectsMissing.WithLabelValues(g.BackupClassName).Set(float64(len(missing)))
+	if g.CredentialsHelmRelease.Name == "" || g.CredentialsHelmRelease.Namespace == "" {
+		// External S3: the Secret is admin-managed and no release renders
+		// it. Report it missing, force nothing.
+		return missing, false, nil
+	}
+	return g.force(ctx, g.CredentialsHelmRelease, &g.lastCredentialsForce, missing)
+}
+
+// force issues at most one throttled forced Helm upgrade of target and
+// reports whether it went through. last is the caller's throttle timestamp,
+// advanced on every outcome that must not be retried immediately.
+func (g *DefaultObjectsGate) force(ctx context.Context, target types.NamespacedName, last *time.Time, missing []string) ([]string, bool, error) {
+	now := g.now()
+	if !last.IsZero() && now.Sub(*last) < g.MinForceInterval {
+		return missing, false, nil
+	}
+	if err := g.forceHelmRelease(ctx, target, now); err != nil {
+		switch {
+		case apierrors.IsNotFound(err):
+			// Not a Flux-managed install (a plain `helm install` for local
+			// development). There is nothing to force; stay quiet rather
+			// than logging an error every tick.
+			*last = now
+			return missing, false, nil
+		case errors.Is(err, errHelmReleaseSuspended):
+			// Deliberate operator state (cozyhr suspend, maintenance). The
+			// annotations would be ignored, so skip the patch entirely and
+			// leave the force counter alone — a climbing counter must keep
+			// meaning "the forced render is not producing the objects".
+			log.FromContext(ctx).Info("skipped forcing a suspended HelmRelease; missing default backup objects will not be repaired until it is resumed",
+				"helmRelease", target.String(), "missing", missing)
+			*last = now
+			return missing, false, nil
+		}
+		return missing, false, fmt.Errorf("force HelmRelease %s: %w", target.String(), err)
+	}
+	*last = now
+	defaultObjectsForceReconciles.WithLabelValues(target.Namespace, target.Name).Inc()
+	return missing, true, nil
+}
+
+// missingObjects returns a sorted, de-duplicated list of the
+// "<kind>/<name>" objects the BackupClass references that do not exist,
+// plus the Velero BSL when a Velero namespace is configured.
+//
+// An unmappable group/kind (the CRD is not installed) is NOT reported as
+// missing: no Helm re-render can create an object whose CRD is absent, and
+// counting it would keep the gate forcing upgrades forever.
+func (g *DefaultObjectsGate) missingObjects(ctx context.Context, backupClass *backupsv1alpha1.BackupClass) ([]string, error) {
+	seen := map[string]struct{}{}
+	var missing []string
+
+	for _, strategy := range backupClass.Spec.Strategies {
+		name := strategy.StrategyRef.Name
+		kind := strategy.StrategyRef.Kind
+		if name == "" || kind == "" {
+			continue
+		}
+		group := strategyAPIGroup
+		if strategy.StrategyRef.APIGroup != nil && *strategy.StrategyRef.APIGroup != "" {
+			group = *strategy.StrategyRef.APIGroup
+		}
+		// When the Velero BSL is disabled (velero.bslEnabled=false, surfaced
+		// here as an empty VeleroNamespace) the chart gates the Velero
+		// Strategy CRs off the SAME flag, so they are never rendered. The
+		// BackupClass still routes to them unconditionally, so counting them
+		// as missing would force a Helm upgrade every MinForceInterval
+		// forever against a render that can never produce them.
+		if g.VeleroNamespace == "" && group == strategyAPIGroup && kind == "Velero" {
+			continue
+		}
+		key := fmt.Sprintf("%s/%s", kind, name)
+		if _, dup := seen[key]; dup {
+			continue
+		}
+		seen[key] = struct{}{}
+
+		mapping, err := g.RESTMapping(schema.GroupKind{Group: group, Kind: kind})
+		if err != nil {
+			if meta.IsNoMatchError(err) {
+				continue
+			}
+			return nil, fmt.Errorf("map %s/%s: %w", group, kind, err)
+		}
+		// Strategy CRs are cluster-scoped; Namespace("") is correct for
+		// both scopes on the dynamic client.
+		_, err = g.Resource(mapping.Resource).Get(ctx, name, metav1.GetOptions{})
+		switch {
+		case err == nil:
+		case apierrors.IsNotFound(err):
+			missing = append(missing, key)
+		default:
+			return nil, fmt.Errorf("get %s %s: %w", kind, name, err)
+		}
+	}
+
+	if g.VeleroNamespace != "" {
+		// Resolve through the RESTMapper, like the strategy loop above, so a
+		// genuinely absent Velero API is a NoMatch we skip rather than a
+		// NotFound we count. The dynamic client's Get bypasses the mapper and
+		// returns a plain 404 for an unserved group, which IsNotFound would
+		// catch first, making the "CRDs absent" branch dead code and looping
+		// the gate forever if Velero were removed while bslEnabled=true.
+		mapping, err := g.RESTMapping(schema.GroupKind{Group: backupStorageLocationGVR.Group, Kind: "BackupStorageLocation"})
+		switch {
+		case err == nil:
+			_, getErr := g.Resource(mapping.Resource).Namespace(g.VeleroNamespace).Get(ctx, defaultBackupStorageLocationName, metav1.GetOptions{})
+			switch {
+			case getErr == nil:
+			case apierrors.IsNotFound(getErr):
+				missing = append(missing, fmt.Sprintf("BackupStorageLocation/%s", defaultBackupStorageLocationName))
+			default:
+				return nil, fmt.Errorf("get BackupStorageLocation %s: %w", defaultBackupStorageLocationName, getErr)
+			}
+		case meta.IsNoMatchError(err):
+			// Velero API not served (e.g. Velero uninstalled after bootstrap):
+			// no Helm re-render can create the BSL, so it is not "missing".
+		default:
+			return nil, fmt.Errorf("map BackupStorageLocation: %w", err)
+		}
+	}
+
+	sort.Strings(missing)
+	return missing, nil
+}
+
+// forceHelmRelease stamps BOTH reconcile.fluxcd.io/forceAt and
+// reconcile.fluxcd.io/requestedAt. requestedAt alone only asks
+// helm-controller to reconcile, which is a no-op for a release whose chart
+// and values are unchanged — it is forceAt that makes it run a real Helm
+// upgrade, and forceAt is only honoured together with requestedAt.
+//
+// A point Get precedes the patch so a suspended release is skipped rather
+// than re-stamped forever: helm-controller ignores both annotations while
+// spec.suspend is true, and `cozyhr suspend` sets exactly that. Without the
+// check the gate would patch every MinForceInterval for the whole suspension
+// and inflate the force counter, which the runbook reads as a render that
+// keeps failing — the wrong diagnosis. The Get needs no RBAC beyond the
+// `get` on helmreleases the chart already grants.
+func (g *DefaultObjectsGate) forceHelmRelease(ctx context.Context, target types.NamespacedName, now time.Time) error {
+	hr, err := g.Resource(helmReleaseGVR).Namespace(target.Namespace).Get(ctx, target.Name, metav1.GetOptions{})
+	if err != nil {
+		return err
+	}
+	// A malformed spec.suspend (wrong type) is reported by NestedBool as an
+	// error; treat it as not suspended and let the patch proceed, rather
+	// than silently disabling the repair on a field we could not parse.
+	if suspended, found, err := unstructured.NestedBool(hr.Object, "spec", "suspend"); err == nil && found && suspended {
+		return errHelmReleaseSuspended
+	}
+
+	stamp := now.UTC().Format(time.RFC3339Nano)
+	patch := fmt.Sprintf(
+		`{"metadata":{"annotations":{"reconcile.fluxcd.io/forceAt":%q,"reconcile.fluxcd.io/requestedAt":%q}}}`,
+		stamp, stamp,
+	)
+	_, err = g.Resource(helmReleaseGVR).Namespace(target.Namespace).
+		Patch(ctx, target.Name, types.MergePatchType, []byte(patch), metav1.PatchOptions{})
+	return err
+}
diff --git a/internal/backupcontroller/default_objects_gate_test.go b/internal/backupcontroller/default_objects_gate_test.go
new file mode 100644
index 0000000000..f5cbb54896
--- /dev/null
+++ b/internal/backupcontroller/default_objects_gate_test.go
@@ -0,0 +1,746 @@
+package backupcontroller
+
+import (
+	"context"
+	"testing"
+	"time"
+
+	"github.com/prometheus/client_golang/prometheus/testutil"
+	corev1 "k8s.io/api/core/v1"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	"k8s.io/apimachinery/pkg/api/meta"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apimachinery/pkg/types"
+	dynamicfake "k8s.io/client-go/dynamic/fake"
+	k8stesting "k8s.io/client-go/testing"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/client/fake"
+
+	backupsv1alpha1 "github.com/cozystack/cozystack/api/backups/v1alpha1"
+)
+
+// gateGVKs are the kinds the gate touches in these tests: the
+// strategy.backups.cozystack.io CRs cozy-default routes to, the Velero BSL,
+// and the HelmRelease it patches. The RESTMapper and the dynamic fake's
+// resource registry are both derived from this one list so the plural the
+// gate resolves and the plural the fake serves cannot drift apart.
+var gateGVKs = []schema.GroupVersionKind{
+	{Group: strategyAPIGroup, Version: "v1alpha1", Kind: "CNPG"},
+	{Group: strategyAPIGroup, Version: "v1alpha1", Kind: "MariaDB"},
+	{Group: strategyAPIGroup, Version: "v1alpha1", Kind: "Etcd"},
+	{Group: strategyAPIGroup, Version: "v1alpha1", Kind: "Altinity"},
+	{Group: strategyAPIGroup, Version: "v1alpha1", Kind: "Velero"},
+	{Group: "velero.io", Version: "v1", Kind: "BackupStorageLocation"},
+	{Group: "helm.toolkit.fluxcd.io", Version: "v2", Kind: "HelmRelease"},
+}
+
+func gateScheme() *runtime.Scheme {
+	scheme := runtime.NewScheme()
+	_ = corev1.AddToScheme(scheme)
+	_ = backupsv1alpha1.AddToScheme(scheme)
+	return scheme
+}
+
+func gateListKinds() map[schema.GroupVersionResource]string {
+	out := map[schema.GroupVersionResource]string{}
+	for _, gvk := range gateGVKs {
+		gvr, _ := meta.UnsafeGuessKindToResource(gvk)
+		out[gvr] = gvk.Kind + "List"
+	}
+	return out
+}
+
+// gateRESTMapper resolves group+kind (the only coordinates a
+// BackupClass strategyRef carries) to a resource, which is what the gate
+// does in production through the dynamic RESTMapper. The group versions must
+// be passed as defaults: RESTMapping is called without a version.
+func gateRESTMapper() meta.RESTMapper {
+	groupVersions := map[schema.GroupVersion]struct{}{}
+	for _, gvk := range gateGVKs {
+		groupVersions[gvk.GroupVersion()] = struct{}{}
+	}
+	var gvs []schema.GroupVersion
+	for gv := range groupVersions {
+		gvs = append(gvs, gv)
+	}
+	m := meta.NewDefaultRESTMapper(gvs)
+	for _, gvk := range gateGVKs {
+		scope := meta.RESTScopeRoot
+		if gvk.Kind == "BackupStorageLocation" || gvk.Kind == "HelmRelease" {
+			scope = meta.RESTScopeNamespace
+		}
+		m.Add(gvk, scope)
+	}
+	return m
+}
+
+// cozyDefaultBackupClass mirrors the routes the chart's
+// backupclass-default.yaml renders unconditionally: it is the manifest of
+// what must exist, which is exactly why the gate reads it instead of
+// hard-coding a list of Strategy names.
+func cozyDefaultBackupClass() *backupsv1alpha1.BackupClass {
+	ref := func(kind, name string) backupsv1alpha1.BackupClassStrategy {
+		return backupsv1alpha1.BackupClassStrategy{
+			Application: backupsv1alpha1.ApplicationSelector{
+				APIGroup: new("apps.cozystack.io"),
+				Kind:     kind + "App",
+			},
+			StrategyRef: corev1.TypedLocalObjectReference{
+				APIGroup: new(strategyAPIGroup),
+				Kind:     kind,
+				Name:     name,
+			},
+		}
+	}
+	return &backupsv1alpha1.BackupClass{
+		ObjectMeta: metav1.ObjectMeta{Name: "cozy-default"},
+		Spec: backupsv1alpha1.BackupClassSpec{
+			Strategies: []backupsv1alpha1.BackupClassStrategy{
+				ref("CNPG", "cozy-default-cnpg"),
+				ref("MariaDB", "cozy-default-mariadb"),
+				ref("Etcd", "cozy-default-etcd"),
+				ref("Altinity", "cozy-default-altinity"),
+				ref("Velero", "cozy-default-velero-vminstance"),
+				ref("Velero", "cozy-default-velero-vmdisk"),
+			},
+		},
+	}
+}
+
+func strategyObject(kind, name string) *unstructured.Unstructured {
+	u := &unstructured.Unstructured{}
+	u.SetAPIVersion(strategyAPIGroup + "/v1alpha1")
+	u.SetKind(kind)
+	u.SetName(name)
+	return u
+}
+
+func helmReleaseObject() *unstructured.Unstructured {
+	u := &unstructured.Unstructured{}
+	u.SetAPIVersion("helm.toolkit.fluxcd.io/v2")
+	u.SetKind("HelmRelease")
+	u.SetNamespace("cozy-backup-controller")
+	u.SetName("backupstrategy-controller")
+	return u
+}
+
+// credentialsHelmReleaseObject is the platform bucket's <bucket>-system
+// release: the one that renders the user-credentials Secret the gate reads
+// to resolve the bucket name, behind its own install-time lookup.
+func credentialsHelmReleaseObject() *unstructured.Unstructured {
+	u := &unstructured.Unstructured{}
+	u.SetAPIVersion("helm.toolkit.fluxcd.io/v2")
+	u.SetKind("HelmRelease")
+	u.SetNamespace("tenant-root")
+	u.SetName("bucket-cozy-backups-system")
+	return u
+}
+
+func suspended(u *unstructured.Unstructured) *unstructured.Unstructured {
+	_ = unstructured.SetNestedField(u.Object, true, "spec", "suspend")
+	return u
+}
+
+func newGate(t *testing.T, ctrlObjs []client.Object, dynObjs ...runtime.Object) (*DefaultObjectsGate, *dynamicfake.FakeDynamicClient) {
+	t.Helper()
+	dyn := dynamicfake.NewSimpleDynamicClientWithCustomListKinds(runtime.NewScheme(), gateListKinds(), dynObjs...)
+	g := &DefaultObjectsGate{
+		Client: fake.NewClientBuilder().WithScheme(gateScheme()).WithObjects(ctrlObjs...).Build(),
+		Config: BackupCredentialsConfig{
+			SourceNamespace:  "tenant-root",
+			SourceSecretName: "bucket-cozy-backups-system-credentials",
+			TargetSecretName: "cozy-backups-creds",
+		},
+		BackupClassName: "cozy-default",
+		HelmRelease: types.NamespacedName{
+			Namespace: "cozy-backup-controller",
+			Name:      "backupstrategy-controller",
+		},
+		CredentialsHelmRelease: types.NamespacedName{
+			Namespace: "tenant-root",
+			Name:      "bucket-cozy-backups-system",
+		},
+		VeleroNamespace:  "cozy-velero",
+		MinForceInterval: 5 * time.Minute,
+		now:              func() time.Time { return time.Date(2026, 1, 2, 3, 4, 5, 0, time.UTC) },
+	}
+	g.Interface = dyn
+	g.RESTMapper = gateRESTMapper()
+	return g, dyn
+}
+
+func sourceSecret(bucket string) *corev1.Secret {
+	data := map[string][]byte{
+		"accessKey": []byte("AK"),
+		"secretKey": []byte("SK"),
+		"endpoint":  []byte("s3.example.com"),
+	}
+	if bucket != "" {
+		data["bucketName"] = []byte(bucket)
+	}
+	return &corev1.Secret{
+		ObjectMeta: metav1.ObjectMeta{Namespace: "tenant-root", Name: "bucket-cozy-backups-system-credentials"},
+		Data:       data,
+	}
+}
+
+func bslObject() *unstructured.Unstructured {
+	u := &unstructured.Unstructured{}
+	u.SetAPIVersion("velero.io/v1")
+	u.SetKind("BackupStorageLocation")
+	u.SetNamespace("cozy-velero")
+	u.SetName(defaultBackupStorageLocationName)
+	return u
+}
+
+func forceAnnotations(t *testing.T, dyn *dynamicfake.FakeDynamicClient) map[string]string {
+	t.Helper()
+	return annotationsOf(t, dyn, "cozy-backup-controller", "backupstrategy-controller")
+}
+
+func credentialsForceAnnotations(t *testing.T, dyn *dynamicfake.FakeDynamicClient) map[string]string {
+	t.Helper()
+	return annotationsOf(t, dyn, "tenant-root", "bucket-cozy-backups-system")
+}
+
+func annotationsOf(t *testing.T, dyn *dynamicfake.FakeDynamicClient, namespace, name string) map[string]string {
+	t.Helper()
+	hr, err := dyn.Resource(helmReleaseGVR).Namespace(namespace).
+		Get(context.Background(), name, metav1.GetOptions{})
+	if err != nil {
+		t.Fatalf("get HelmRelease %s/%s: %v", namespace, name, err)
+	}
+	return hr.GetAnnotations()
+}
+
+// TestCheckForcesWhenObjectsMissing is the bug this gate exists for: the
+// bucket name resolves, so a Helm re-render WOULD produce the gated
+// templates, but the objects are absent because the install-time lookup was
+// empty and helm-controller never re-rendered. The gate must force a real
+// Helm upgrade — BOTH annotations, because requestedAt alone is a no-op for
+// an unchanged release.
+func TestCheckForcesWhenObjectsMissing(t *testing.T) {
+	g, dyn := newGate(t,
+		[]client.Object{sourceSecret("bucket-1a2b"), cozyDefaultBackupClass()},
+		helmReleaseObject(),
+	)
+
+	missing, forced, err := g.Check(context.Background())
+	if err != nil {
+		t.Fatalf("Check: %v", err)
+	}
+	if !forced {
+		t.Fatal("expected a forced Helm upgrade when default objects are missing")
+	}
+	// 6 strategyRefs (Velero twice under different names) + the BSL.
+	if len(missing) != 7 {
+		t.Fatalf("missing = %v, want 7 entries", missing)
+	}
+	ann := forceAnnotations(t, dyn)
+	forceAt, ok := ann["reconcile.fluxcd.io/forceAt"]
+	if !ok || forceAt == "" {
+		t.Errorf("reconcile.fluxcd.io/forceAt not set: %v", ann)
+	}
+	requestedAt, ok := ann["reconcile.fluxcd.io/requestedAt"]
+	if !ok || requestedAt == "" {
+		t.Errorf("reconcile.fluxcd.io/requestedAt not set: %v", ann)
+	}
+	if forceAt != requestedAt {
+		t.Errorf("forceAt (%q) and requestedAt (%q) must carry the same stamp", forceAt, requestedAt)
+	}
+}
+
+// TestCheckNoopWhenAllPresent pins the steady state: no forced upgrades
+// once the objects exist, otherwise the gate would rewrite the annotation
+// forever and re-run a Helm upgrade every MinForceInterval for the life of
+// the cluster.
+func TestCheckNoopWhenAllPresent(t *testing.T) {
+	g, dyn := newGate(t,
+		[]client.Object{sourceSecret("bucket-1a2b"), cozyDefaultBackupClass()},
+		helmReleaseObject(),
+		strategyObject("CNPG", "cozy-default-cnpg"),
+		strategyObject("MariaDB", "cozy-default-mariadb"),
+		strategyObject("Etcd", "cozy-default-etcd"),
+		strategyObject("Altinity", "cozy-default-altinity"),
+		strategyObject("Velero", "cozy-default-velero-vminstance"),
+		strategyObject("Velero", "cozy-default-velero-vmdisk"),
+		bslObject(),
+	)
+
+	missing, forced, err := g.Check(context.Background())
+	if err != nil {
+		t.Fatalf("Check: %v", err)
+	}
+	if len(missing) != 0 || forced {
+		t.Fatalf("missing = %v, forced = %v, want none", missing, forced)
+	}
+	if ann := forceAnnotations(t, dyn); len(ann) != 0 {
+		t.Errorf("HelmRelease annotated in the steady state: %v", ann)
+	}
+}
+
+// TestCheckForcesCredentialsReleaseWhenSourceSecretAbsent is the second half
+// of the bug. The Secret the gate reads to resolve the bucket name is itself
+// rendered behind an install-time lookup, by the bucket's <bucket>-system
+// release — so it is subject to the identical permanent skip, one release
+// earlier. While it is absent nothing downstream can resolve: no projected
+// credentials, no Strategy CRs, no Velero, and migration 50 has no snapshot
+// target. Forcing THIS chart's release would be useless (its own lookups
+// depend on that Secret); the bucket release is the one to force.
+func TestCheckForcesCredentialsReleaseWhenSourceSecretAbsent(t *testing.T) {
+	g, dyn := newGate(t,
+		[]client.Object{cozyDefaultBackupClass()},
+		helmReleaseObject(),
+		credentialsHelmReleaseObject(),
+	)
+
+	missing, forced, err := g.Check(context.Background())
+	if err != nil {
+		t.Fatalf("Check: %v", err)
+	}
+	if !forced {
+		t.Fatal("expected the bucket release to be forced while the credentials Secret is absent")
+	}
+	if len(missing) != 1 || missing[0] != "Secret/bucket-cozy-backups-system-credentials" {
+		t.Fatalf("missing = %v, want the credentials Secret", missing)
+	}
+	ann := credentialsForceAnnotations(t, dyn)
+	if ann["reconcile.fluxcd.io/forceAt"] == "" || ann["reconcile.fluxcd.io/requestedAt"] == "" {
+		t.Errorf("bucket release not forced with both annotations: %v", ann)
+	}
+	// This chart's own release must be left alone: its templates gate on the
+	// same unresolved bucket, so forcing it would burn a Helm upgrade that
+	// re-runs the same empty lookup.
+	if ann := forceAnnotations(t, dyn); len(ann) != 0 {
+		t.Errorf("own HelmRelease forced before the bucket resolved: %v", ann)
+	}
+}
+
+// TestCheckForcesCredentialsReleaseWhenBucketNameEmpty pins the same
+// treatment one state later: the Secret exists but carries no bucket name (a
+// partial render, or a hand-written Secret missing the key). Only a
+// re-render of the producing release can complete it.
+func TestCheckForcesCredentialsReleaseWhenBucketNameEmpty(t *testing.T) {
+	g, dyn := newGate(t,
+		[]client.Object{sourceSecret(""), cozyDefaultBackupClass()},
+		helmReleaseObject(),
+		credentialsHelmReleaseObject(),
+	)
+
+	missing, forced, err := g.Check(context.Background())
+	if err != nil {
+		t.Fatalf("Check: %v", err)
+	}
+	if !forced || len(missing) != 1 {
+		t.Fatalf("missing = %v, forced = %v; want the credentials Secret forced", missing, forced)
+	}
+	if ann := credentialsForceAnnotations(t, dyn); ann["reconcile.fluxcd.io/forceAt"] == "" {
+		t.Errorf("bucket release not forced: %v", ann)
+	}
+}
+
+// TestCheckReportsCredentialsSecretWithoutBucketRelease covers external S3
+// (backupStorage.provisionBucket=false): the Secret is admin-managed and no
+// release renders it, so there is nothing to force — but it must still be
+// reported missing, because that is the state an operator has to alert on.
+func TestCheckReportsCredentialsSecretWithoutBucketRelease(t *testing.T) {
+	g, dyn := newGate(t,
+		[]client.Object{cozyDefaultBackupClass()},
+		helmReleaseObject(),
+		credentialsHelmReleaseObject(),
+	)
+	g.CredentialsHelmRelease = types.NamespacedName{}
+
+	missing, forced, err := g.Check(context.Background())
+	if err != nil {
+		t.Fatalf("Check: %v", err)
+	}
+	if forced {
+		t.Error("forced a release on the external-S3 path, where none renders the Secret")
+	}
+	if len(missing) != 1 {
+		t.Fatalf("missing = %v, want the credentials Secret reported", missing)
+	}
+	if ann := credentialsForceAnnotations(t, dyn); len(ann) != 0 {
+		t.Errorf("bucket release annotated with no coordinates configured: %v", ann)
+	}
+}
+
+// TestCheckThrottlesTheTwoReleasesIndependently pins that forcing the bucket
+// release does not eat the objects release's throttle budget. The two happen
+// in sequence on a real bootstrap — credentials first, then the objects the
+// resolved bucket unblocks — so a shared timestamp would delay the second
+// force by a full MinForceInterval for no reason.
+func TestCheckThrottlesTheTwoReleasesIndependently(t *testing.T) {
+	base := time.Date(2026, 1, 2, 3, 4, 5, 0, time.UTC)
+	g, dyn := newGate(t,
+		[]client.Object{cozyDefaultBackupClass()},
+		helmReleaseObject(),
+		credentialsHelmReleaseObject(),
+	)
+	g.now = func() time.Time { return base }
+
+	// No source Secret yet: the bucket release is forced.
+	if _, forced, err := g.Check(context.Background()); err != nil || !forced {
+		t.Fatalf("first Check: forced = %v, err = %v; want the bucket release forced", forced, err)
+	}
+
+	// A minute later the Secret lands. The objects are still missing, and
+	// this force must go through despite being well inside MinForceInterval
+	// of the previous one.
+	g.now = func() time.Time { return base.Add(time.Minute) }
+	if err := g.Client.Create(context.Background(), sourceSecret("bucket-1a2b")); err != nil {
+		t.Fatalf("create source Secret: %v", err)
+	}
+	missing, forced, err := g.Check(context.Background())
+	if err != nil {
+		t.Fatalf("second Check: %v", err)
+	}
+	if !forced {
+		t.Fatal("objects release throttled by the earlier credentials force")
+	}
+	if len(missing) != 7 {
+		t.Fatalf("missing = %v, want the 6 strategies + the BSL", missing)
+	}
+	if ann := forceAnnotations(t, dyn); ann["reconcile.fluxcd.io/forceAt"] == "" {
+		t.Errorf("own HelmRelease not forced: %v", ann)
+	}
+}
+
+// TestForceSkipsSuspendedHelmRelease pins the suspend guard. helm-controller
+// ignores forceAt/requestedAt while spec.suspend is true (`cozyhr suspend` is
+// a standard dev workflow), so patching anyway would re-stamp every
+// MinForceInterval for the whole suspension and climb
+// cozystack_backup_default_objects_force_reconciles_total — which the runbook
+// reads as "the forced render is not producing the objects", the wrong
+// diagnosis. The objects must still be reported missing.
+func TestForceSkipsSuspendedHelmRelease(t *testing.T) {
+	g, dyn := newGate(t,
+		[]client.Object{sourceSecret("bucket-1a2b"), cozyDefaultBackupClass()},
+		suspended(helmReleaseObject()),
+	)
+
+	missing, forced, err := g.Check(context.Background())
+	if err != nil {
+		t.Fatalf("Check: %v", err)
+	}
+	if forced {
+		t.Error("forced reported true for a suspended HelmRelease that ignores the annotations")
+	}
+	if len(missing) != 7 {
+		t.Fatalf("missing = %v, want the objects still reported", missing)
+	}
+	if ann := forceAnnotations(t, dyn); len(ann) != 0 {
+		t.Errorf("suspended HelmRelease annotated: %v", ann)
+	}
+}
+
+// TestForceSkipsSuspendedCredentialsHelmRelease pins the same guard on the
+// bucket release, which an operator is far more likely to have suspended:
+// it lives in a tenant namespace and is not part of this chart.
+func TestForceSkipsSuspendedCredentialsHelmRelease(t *testing.T) {
+	g, dyn := newGate(t,
+		[]client.Object{cozyDefaultBackupClass()},
+		helmReleaseObject(),
+		suspended(credentialsHelmReleaseObject()),
+	)
+
+	missing, forced, err := g.Check(context.Background())
+	if err != nil {
+		t.Fatalf("Check: %v", err)
+	}
+	if forced {
+		t.Error("forced reported true for a suspended bucket HelmRelease")
+	}
+	if len(missing) != 1 {
+		t.Fatalf("missing = %v, want the credentials Secret still reported", missing)
+	}
+	if ann := credentialsForceAnnotations(t, dyn); len(ann) != 0 {
+		t.Errorf("suspended bucket HelmRelease annotated: %v", ann)
+	}
+}
+
+// TestCheckTimeoutStaysBelowPeriod pins the bound on a single check. The ticker
+// loop is sequential and the manager context is only cancelled at shutdown, so
+// an unbounded check that hangs on a stalled API call stops every later check
+// for the life of the pod.
+func TestCheckTimeoutStaysBelowPeriod(t *testing.T) {
+	for _, tc := range []struct {
+		name   string
+		period time.Duration
+		want   time.Duration
+	}{
+		{"unset falls back to the cap", 0, 30 * time.Second},
+		{"default period halves", time.Minute, 30 * time.Second},
+		{"short period halves", 10 * time.Second, 5 * time.Second},
+		{"long period is capped", time.Hour, 30 * time.Second},
+	} {
+		t.Run(tc.name, func(t *testing.T) {
+			g := &DefaultObjectsGate{Period: tc.period}
+			got := g.checkTimeout()
+			if got != tc.want {
+				t.Fatalf("checkTimeout() = %v, want %v", got, tc.want)
+			}
+			if tc.period > 0 && got >= tc.period {
+				t.Fatalf("checkTimeout() = %v, must stay below Period %v", got, tc.period)
+			}
+		})
+	}
+}
+
+// TestCheckThrottlesRepeatedForces pins the throttle. A condition a
+// re-render cannot fix (missing CRD, unreachable bucket) must not turn into
+// a hot loop of Helm upgrades against helm-controller.
+func TestCheckThrottlesRepeatedForces(t *testing.T) {
+	g, _ := newGate(t,
+		[]client.Object{sourceSecret("bucket-1a2b"), cozyDefaultBackupClass()},
+		helmReleaseObject(),
+	)
+	base := time.Date(2026, 1, 2, 3, 4, 5, 0, time.UTC)
+	g.now = func() time.Time { return base }
+
+	if _, forced, err := g.Check(context.Background()); err != nil || !forced {
+		t.Fatalf("first Check: forced = %v, err = %v; want forced", forced, err)
+	}
+
+	// Well inside MinForceInterval: still missing, but no second upgrade.
+	g.now = func() time.Time { return base.Add(time.Minute) }
+	missing, forced, err := g.Check(context.Background())
+	if err != nil {
+		t.Fatalf("second Check: %v", err)
+	}
+	if forced {
+		t.Error("second Check forced inside MinForceInterval")
+	}
+	if len(missing) == 0 {
+		t.Error("second Check should still report the objects as missing")
+	}
+
+	// Past MinForceInterval: force again, because the objects are still gone.
+	g.now = func() time.Time { return base.Add(6 * time.Minute) }
+	if _, forced, err := g.Check(context.Background()); err != nil || !forced {
+		t.Fatalf("third Check: forced = %v, err = %v; want forced", forced, err)
+	}
+}
+
+// TestMissingObjectsIgnoresUnmappedKinds pins that a strategyRef whose CRD
+// is not installed is not counted as missing. No Helm re-render can create
+// such an object, so counting it would force upgrades forever.
+func TestMissingObjectsIgnoresUnmappedKinds(t *testing.T) {
+	bc := cozyDefaultBackupClass()
+	bc.Spec.Strategies = append(bc.Spec.Strategies, backupsv1alpha1.BackupClassStrategy{
+		Application: backupsv1alpha1.ApplicationSelector{Kind: "Nonexistent"},
+		StrategyRef: corev1.TypedLocalObjectReference{
+			APIGroup: new(strategyAPIGroup),
+			Kind:     "NotInstalled",
+			Name:     "cozy-default-notinstalled",
+		},
+	})
+	g, _ := newGate(t, []client.Object{sourceSecret("b"), bc},
+		helmReleaseObject(),
+		strategyObject("CNPG", "cozy-default-cnpg"),
+		strategyObject("MariaDB", "cozy-default-mariadb"),
+		strategyObject("Etcd", "cozy-default-etcd"),
+		strategyObject("Altinity", "cozy-default-altinity"),
+		strategyObject("Velero", "cozy-default-velero-vminstance"),
+		strategyObject("Velero", "cozy-default-velero-vmdisk"),
+		bslObject(),
+	)
+
+	missing, err := g.missingObjects(context.Background(), bc)
+	if err != nil {
+		t.Fatalf("missingObjects: %v", err)
+	}
+	if len(missing) != 0 {
+		t.Fatalf("missing = %v, want none (unmapped kind must be ignored)", missing)
+	}
+}
+
+// TestMissingObjectsSkipsVeleroWhenNamespaceEmpty covers
+// velero.bslEnabled=false: the chart gates BOTH the BSL and the Velero
+// Strategy CRs off the same flag, so neither is rendered and their absence
+// is not a defect. The BackupClass still routes to the Velero strategies
+// unconditionally, which is the trap: without the skip the gate would count
+// the never-rendered Velero CRs as missing and force a Helm upgrade every
+// MinForceInterval forever. The Velero objects are deliberately NOT
+// pre-created here, because with the BSL disabled the chart never renders
+// them on a real cluster.
+func TestMissingObjectsSkipsVeleroWhenNamespaceEmpty(t *testing.T) {
+	bc := cozyDefaultBackupClass()
+	g, _ := newGate(t, []client.Object{sourceSecret("b"), bc},
+		helmReleaseObject(),
+		strategyObject("CNPG", "cozy-default-cnpg"),
+		strategyObject("MariaDB", "cozy-default-mariadb"),
+		strategyObject("Etcd", "cozy-default-etcd"),
+		strategyObject("Altinity", "cozy-default-altinity"),
+	)
+	g.VeleroNamespace = ""
+
+	missing, err := g.missingObjects(context.Background(), bc)
+	if err != nil {
+		t.Fatalf("missingObjects: %v", err)
+	}
+	if len(missing) != 0 {
+		t.Fatalf("missing = %v, want none when Velero is disabled", missing)
+	}
+}
+
+// TestMissingObjectsSkipsBSLWhenVeleroAPIAbsent covers Velero being removed
+// after bootstrap while bslEnabled=true: the velero.io API is no longer
+// served, so the BSL cannot be re-rendered and must not be counted as
+// missing. Resolving through the RESTMapper turns that into a NoMatch skip;
+// the previous hardcoded-GVR Get returned a NotFound that would have looped
+// the gate forever.
+func TestMissingObjectsSkipsBSLWhenVeleroAPIAbsent(t *testing.T) {
+	bc := cozyDefaultBackupClass()
+	g, _ := newGate(t, []client.Object{sourceSecret("b"), bc},
+		helmReleaseObject(),
+		strategyObject("CNPG", "cozy-default-cnpg"),
+		strategyObject("MariaDB", "cozy-default-mariadb"),
+		strategyObject("Etcd", "cozy-default-etcd"),
+		strategyObject("Altinity", "cozy-default-altinity"),
+		strategyObject("Velero", "cozy-default-velero-vminstance"),
+		strategyObject("Velero", "cozy-default-velero-vmdisk"),
+	)
+	// Rebuild the RESTMapper without BackupStorageLocation: the velero.io API
+	// is not served on this cluster.
+	gvset := map[schema.GroupVersion]struct{}{}
+	var kept []schema.GroupVersionKind
+	for _, gvk := range gateGVKs {
+		if gvk.Kind == "BackupStorageLocation" {
+			continue
+		}
+		gvset[gvk.GroupVersion()] = struct{}{}
+		kept = append(kept, gvk)
+	}
+	var gvs []schema.GroupVersion
+	for gv := range gvset {
+		gvs = append(gvs, gv)
+	}
+	m := meta.NewDefaultRESTMapper(gvs)
+	for _, gvk := range kept {
+		scope := meta.RESTScopeRoot
+		if gvk.Kind == "HelmRelease" {
+			scope = meta.RESTScopeNamespace
+		}
+		m.Add(gvk, scope)
+	}
+	g.RESTMapper = m
+
+	missing, err := g.missingObjects(context.Background(), bc)
+	if err != nil {
+		t.Fatalf("missingObjects: %v", err)
+	}
+	if len(missing) != 0 {
+		t.Fatalf("missing = %v, want none when the Velero API is absent", missing)
+	}
+}
+
+// TestCheckSurfacesPatchFailure pins that a failed force is reported rather
+// than silently recorded as done — and that lastForce is NOT advanced, so
+// the next tick retries instead of waiting out MinForceInterval.
+func TestCheckSurfacesPatchFailure(t *testing.T) {
+	g, dyn := newGate(t,
+		[]client.Object{sourceSecret("bucket-1a2b"), cozyDefaultBackupClass()},
+		helmReleaseObject(),
+	)
+	dyn.PrependReactor("patch", "helmreleases", func(k8stesting.Action) (bool, runtime.Object, error) {
+		return true, nil, apierrors.NewForbidden(schema.GroupResource{Group: "helm.toolkit.fluxcd.io", Resource: "helmreleases"}, "backupstrategy-controller", nil)
+	})
+
+	if _, forced, err := g.Check(context.Background()); err == nil || forced {
+		t.Fatalf("forced = %v, err = %v; want an error and forced=false", forced, err)
+	}
+	if !g.lastForce.IsZero() {
+		t.Error("lastForce advanced despite the patch failing; the next tick would be throttled")
+	}
+}
+
+// TestMissingGaugeCoversTheUnresolvedPath pins the alerting contract. The
+// gauge used to be written only after the bucket resolved, so the state the
+// gate exists to catch — no credentials Secret, therefore no strategies —
+// reported 0 or nothing at all, and an alert on it never fired. Deleting the
+// source Secret later (credential rotation) had the same effect: the gauge
+// froze at its last value.
+func TestMissingGaugeCoversTheUnresolvedPath(t *testing.T) {
+	defaultObjectsMissing.Reset()
+	g, _ := newGate(t,
+		[]client.Object{cozyDefaultBackupClass()},
+		helmReleaseObject(),
+		credentialsHelmReleaseObject(),
+	)
+
+	if _, _, err := g.Check(context.Background()); err != nil {
+		t.Fatalf("Check: %v", err)
+	}
+	if got := testutil.ToFloat64(defaultObjectsMissing.WithLabelValues("cozy-default")); got != 1 {
+		t.Fatalf("cozystack_backup_default_objects_missing = %v, want 1 while the credentials Secret is absent", got)
+	}
+}
+
+// TestCheckErrorsCounterMarksTheGaugeStale pins the other half of that
+// contract. On an API error the gauge deliberately keeps its last value
+// rather than flapping the alert, which means the gauge alone cannot tell
+// "healthy" from "not evaluated". The errors counter is what closes that
+// gap, and the runbook alerts on both.
+func TestCheckErrorsCounterMarksTheGaugeStale(t *testing.T) {
+	defaultObjectsMissing.Reset()
+	defaultObjectsCheckErrors.Reset()
+	// No BackupClass: the check cannot enumerate what must exist.
+	g, _ := newGate(t,
+		[]client.Object{sourceSecret("bucket-1a2b")},
+		helmReleaseObject(),
+	)
+
+	if _, _, err := g.Check(context.Background()); err == nil {
+		t.Fatal("Check succeeded with no BackupClass, want an error")
+	}
+	if got := testutil.ToFloat64(defaultObjectsCheckErrors.WithLabelValues("cozy-default")); got != 1 {
+		t.Fatalf("cozystack_backup_default_objects_check_errors_total = %v, want 1", got)
+	}
+	if got := testutil.ToFloat64(defaultObjectsMissing.WithLabelValues("cozy-default")); got != 0 {
+		t.Fatalf("gauge = %v, want it left untouched by a failed check", got)
+	}
+}
+
+// TestStartDisabledWithoutHelmRelease pins the opt-out: without release
+// coordinates the runnable must return immediately instead of ticking with
+// a nil target.
+func TestStartDisabledWithoutHelmRelease(t *testing.T) {
+	g, _ := newGate(t, []client.Object{sourceSecret("b"), cozyDefaultBackupClass()}, helmReleaseObject())
+	g.HelmRelease = types.NamespacedName{}
+
+	ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)
+	defer cancel()
+	done := make(chan error, 1)
+	go func() { done <- g.Start(ctx) }()
+	select {
+	case err := <-done:
+		if err != nil {
+			t.Fatalf("Start: %v", err)
+		}
+	case <-ctx.Done():
+		t.Fatal("Start did not return immediately when disabled")
+	}
+}
+
+// TestCheckToleratesAbsentHelmRelease covers a plain `helm install` (local
+// development): there is no HelmRelease to force, which is not an error to
+// report every tick.
+func TestCheckToleratesAbsentHelmRelease(t *testing.T) {
+	g, _ := newGate(t, []client.Object{sourceSecret("bucket-1a2b"), cozyDefaultBackupClass()})
+
+	missing, forced, err := g.Check(context.Background())
+	if err != nil {
+		t.Fatalf("Check: %v", err)
+	}
+	if forced {
+		t.Error("forced reported true with no HelmRelease to patch")
+	}
+	if len(missing) == 0 {
+		t.Error("objects should still be reported as missing")
+	}
+}
diff --git a/internal/backupcontroller/etcdapp/types.go b/internal/backupcontroller/etcdapp/types.go
index 1914c4b5ae..49d174dea8 100644
--- a/internal/backupcontroller/etcdapp/types.go
+++ b/internal/backupcontroller/etcdapp/types.go
@@ -3,9 +3,9 @@
 // Package etcdapp declares the typed shape of the
 // apps.cozystack.io/v1alpha1 Etcd CR that the Etcd backup driver reads.
 // It carries only fields the driver touches (currently nothing under
-// spec - the driver materialises etcd.aenix.io EtcdBackup CRs against the
-// operator API and writes back through the typed EtcdCluster handle in
-// etcdtypes), but the type still serves as a typed application-side
+// spec - the driver materialises etcd-operator.cozystack.io EtcdSnapshot CRs
+// against the operator API and writes back through the typed EtcdCluster
+// handle in etcdtypes), but the type still serves as a typed application-side
 // handle so the driver can fetch the CR via the typed client and surface
 // NotFound semantics cleanly.
 //
@@ -57,9 +57,9 @@ type EtcdList struct {
 
 // EtcdSpec is intentionally empty: the driver does not currently read or
 // patch any apps.cozystack.io/Etcd spec fields. It uses the downstream
-// etcd.aenix.io/EtcdCluster CR (rendered by the chart's HelmRelease) as
-// the operational handle and materialises etcd.aenix.io/EtcdBackup CRs
-// through etcdtypes.
+// etcd-operator.cozystack.io/EtcdCluster CR (rendered by the chart's
+// HelmRelease) as the operational handle and materialises
+// etcd-operator.cozystack.io/EtcdSnapshot CRs through etcdtypes.
 //
 // Reserved for future fields the driver might need to read. Add fields
 // here only when the driver genuinely needs them.
diff --git a/internal/backupcontroller/etcdstrategy_controller.go b/internal/backupcontroller/etcdstrategy_controller.go
index eb38beffd7..2f2f2732c7 100644
--- a/internal/backupcontroller/etcdstrategy_controller.go
+++ b/internal/backupcontroller/etcdstrategy_controller.go
@@ -35,7 +35,7 @@ const (
 	// etcdAppKind is the apps.cozystack.io Kind the driver claims.
 	etcdAppKind = "Etcd"
 
-	// etcdClusterName is the singleton etcd.aenix.io/EtcdCluster name the
+	// etcdClusterName is the singleton etcd-operator.cozystack.io/EtcdCluster name the
 	// chart renders (templates/etcd-cluster.yaml sets metadata.name: etcd
 	// regardless of the application name). The chart additionally pins the
 	// Helm release name to "etcd" via templates/check-release-name.yaml -
@@ -47,6 +47,12 @@ const (
 	// restore path reads these to feed
 	// EtcdCluster.spec.bootstrap.restore.source.s3 on the re-created
 	// EtcdCluster.
+	//
+	// These are opaque cozystack-internal label keys on the Backup CR, NOT
+	// operator API. They intentionally keep the legacy "etcd.aenix.io/"
+	// prefix across the v1alpha2 migration so Backup artefacts taken before
+	// the migration still decode on the restore path; renaming them would
+	// silently strand pre-migration backups.
 	etcdBackupBucketKey         = "etcd.aenix.io/bucket"
 	etcdBackupEndpointKey       = "etcd.aenix.io/endpoint"
 	etcdBackupKeyKey            = "etcd.aenix.io/key"
@@ -55,11 +61,11 @@ const (
 	etcdBackupCredsSecretKey    = "etcd.aenix.io/credentials-secret-name"
 	etcdBackupNameKey           = "etcd.aenix.io/backup-name"
 
-	// Polling cadence for both the EtcdBackup status loop and the restore
+	// Polling cadence for both the EtcdSnapshot status loop and the restore
 	// purge/Ready loop. Matches the upstream operator's reconcile beat.
 	etcdPollInterval = 10 * time.Second
 
-	// Wall-clock cap on a BackupJob waiting for the operator EtcdBackup
+	// Wall-clock cap on a BackupJob waiting for the operator EtcdSnapshot
 	// to reach phase=Complete. A single etcd snapshot rarely takes more
 	// than a minute, but the Job pod may sit Pending behind image pulls
 	// and PVC provisioning. CNPG/MariaDB use 30m; etcd is faster so 20m
@@ -68,7 +74,7 @@ const (
 	etcdDefaultBackupDeadline = 20 * time.Minute
 
 	// Wall-clock cap on a RestoreJob waiting for the new EtcdCluster to
-	// reach Ready. Includes EtcdCluster deletion drain, PVC garbage
+	// become Available. Includes EtcdCluster deletion drain, PVC garbage
 	// collection, fresh PVC provisioning, snapshot download, etcd boot,
 	// peer/client TLS handshake, and member election. 30m matches the
 	// CNPG/Velero pattern and gives slow CSI provisioners headroom.
@@ -204,38 +210,38 @@ func (r *BackupJobReconciler) reconcileEtcd(ctx context.Context, j *backupsv1alp
 	}
 
 	// EtcdCluster is the chart-rendered, singleton-named CR. Defer the
-	// EtcdBackup creation until the cluster reports Ready - the operator
+	// EtcdSnapshot creation until the cluster reports Available - the operator
 	// otherwise materialises a Job that fails immediately because there
 	// are no etcd members to snapshot.
 	//
-	// Wait-budget: the cluster-Ready wait shares the same wall-clock cap
-	// (etcdDefaultBackupDeadline) as the operator-side EtcdBackup wait.
-	// Without this gate, a BackupJob against a never-Ready EtcdCluster
+	// Wait-budget: the cluster-Available wait shares the same wall-clock cap
+	// (etcdDefaultBackupDeadline) as the operator-side EtcdSnapshot wait.
+	// Without this gate, a BackupJob against a never-Available EtcdCluster
 	// (broken etcd, deleted source app, stuck PVC provisioner) requeues
 	// forever and the tenant gets no terminal signal. Mirror the same
-	// deadline check the post-EtcdBackup-created path uses (line ~286)
+	// deadline check the post-EtcdSnapshot-created path uses (line ~286)
 	// so the failure mode collapses to a clean phase=Failed.
 	cluster := &etcdtypes.EtcdCluster{}
 	if err := r.Get(ctx, types.NamespacedName{Namespace: j.Namespace, Name: etcdClusterName}, cluster); err != nil {
 		if apierrors.IsNotFound(err) {
 			if j.Status.StartedAt != nil && time.Since(j.Status.StartedAt.Time) > etcdDefaultBackupDeadline {
 				return r.markBackupJobFailed(ctx, j, fmt.Sprintf(
-					"etcd.aenix.io/EtcdCluster %s/%s did not appear within %s (deploy the source Etcd application before requesting the backup)",
+					"etcd-operator.cozystack.io/EtcdCluster %s/%s did not appear within %s (deploy the source Etcd application before requesting the backup)",
 					j.Namespace, etcdClusterName, etcdDefaultBackupDeadline))
 			}
-			return r.requeueBackupJobWithReason(ctx, j, "EtcdClusterNotReady",
-				fmt.Sprintf("waiting for etcd.aenix.io/EtcdCluster %s/%s to exist", j.Namespace, etcdClusterName))
+			return r.requeueBackupJobWithReason(ctx, j, "EtcdClusterNotAvailable",
+				fmt.Sprintf("waiting for etcd-operator.cozystack.io/EtcdCluster %s/%s to exist", j.Namespace, etcdClusterName))
 		}
 		return ctrl.Result{}, err
 	}
 	if !etcdClusterReady(cluster) {
 		if j.Status.StartedAt != nil && time.Since(j.Status.StartedAt.Time) > etcdDefaultBackupDeadline {
 			return r.markBackupJobFailed(ctx, j, fmt.Sprintf(
-				"etcd.aenix.io/EtcdCluster %s/%s did not reach Ready within %s (current Ready condition: %s)",
+				"etcd-operator.cozystack.io/EtcdCluster %s/%s did not become Available within %s (current Available condition: %s)",
 				j.Namespace, etcdClusterName, etcdDefaultBackupDeadline, etcdClusterReadyReason(cluster)))
 		}
-		return r.requeueBackupJobWithReason(ctx, j, "EtcdClusterNotReady",
-			fmt.Sprintf("waiting for etcd.aenix.io/EtcdCluster %s/%s to become Ready", j.Namespace, etcdClusterName))
+		return r.requeueBackupJobWithReason(ctx, j, "EtcdClusterNotAvailable",
+			fmt.Sprintf("waiting for etcd-operator.cozystack.io/EtcdCluster %s/%s to become Available", j.Namespace, etcdClusterName))
 	}
 
 	// Intentionally skip a pre-flight Secret existence check for the
@@ -252,15 +258,15 @@ func (r *BackupJobReconciler) reconcileEtcd(ctx context.Context, j *backupsv1alp
 	// informer in practice. The etcd path would always hit it.
 	//
 	// Missing-Secret diagnostics still surface, just one step later:
-	// the operator-side EtcdBackup Job mounts the Secret by name and
+	// the operator-side EtcdSnapshot Job mounts the Secret by name and
 	// fails fast at pod start with a CreateContainerConfigError. The
 	// BackupJob deadline (etcdDefaultBackupDeadline = 20m) catches the
 	// pathological stuck case and flips the job Failed with a clear
 	// message.
 
-	eb, err := r.ensureEtcdBackup(ctx, j, rendered)
+	eb, err := r.ensureEtcdSnapshot(ctx, j, rendered)
 	if err != nil {
-		return r.markBackupJobFailed(ctx, j, fmt.Sprintf("failed to ensure etcd.aenix.io/EtcdBackup: %v", err))
+		return r.markBackupJobFailed(ctx, j, fmt.Sprintf("failed to ensure etcd-operator.cozystack.io/EtcdSnapshot: %v", err))
 	}
 
 	if j.Status.Phase != backupsv1alpha1.BackupJobPhaseRunning {
@@ -287,7 +293,7 @@ func (r *BackupJobReconciler) reconcileEtcd(ctx context.Context, j *backupsv1alp
 			Type:    "Ready",
 			Status:  metav1.ConditionTrue,
 			Reason:  "BackupCompleted",
-			Message: "etcd.aenix.io/EtcdBackup reached phase=Complete",
+			Message: "etcd-operator.cozystack.io/EtcdSnapshot reached phase=Complete",
 		})
 		if err := r.Status().Update(ctx, j); err != nil {
 			return ctrl.Result{}, err
@@ -296,25 +302,25 @@ func (r *BackupJobReconciler) reconcileEtcd(ctx context.Context, j *backupsv1alp
 
 	case etcdtypes.BackupPhaseFailed:
 		return r.markBackupJobFailed(ctx, j, fmt.Sprintf(
-			"etcd.aenix.io/EtcdBackup %s/%s reached phase=Failed (%s)",
-			eb.Namespace, eb.Name, latestEtcdBackupConditionMessage(eb)))
+			"etcd-operator.cozystack.io/EtcdSnapshot %s/%s reached phase=Failed (%s)",
+			eb.Namespace, eb.Name, latestEtcdSnapshotConditionMessage(eb)))
 
 	default:
 		// Pending / Started / empty: still waiting on the operator.
 		if j.Status.StartedAt != nil && time.Since(j.Status.StartedAt.Time) > etcdDefaultBackupDeadline {
 			return r.markBackupJobFailed(ctx, j, fmt.Sprintf(
-				"etcd.aenix.io/EtcdBackup %s/%s did not reach phase=Complete within %s (current phase=%q)",
+				"etcd-operator.cozystack.io/EtcdSnapshot %s/%s did not reach phase=Complete within %s (current phase=%q)",
 				eb.Namespace, eb.Name, etcdDefaultBackupDeadline, eb.Status.Phase))
 		}
 		return r.requeueBackupJobWithReason(ctx, j, "EtcdBackupRunning",
-			fmt.Sprintf("etcd.aenix.io/EtcdBackup %s/%s phase=%q", eb.Namespace, eb.Name, eb.Status.Phase))
+			fmt.Sprintf("etcd-operator.cozystack.io/EtcdSnapshot %s/%s phase=%q", eb.Namespace, eb.Name, eb.Status.Phase))
 	}
 }
 
 // requeueBackupJobWithReason stamps a transient Ready=False/<reason>
 // condition and requeues after etcdPollInterval. Mirrors the FDB driver's
 // transient-error helper but without the patch-on-Conflict retry loop
-// because EtcdBackup status updates by the operator are far slower than
+// because EtcdSnapshot status updates by the operator are far slower than
 // FoundationDBBackup, so the 409 race the FDB driver works around does
 // not surface in practice for this driver.
 //
@@ -342,26 +348,26 @@ func (r *BackupJobReconciler) requeueBackupJobWithReason(ctx context.Context, j
 	return ctrl.Result{RequeueAfter: etcdPollInterval}, nil
 }
 
-// etcdClusterReady checks the operator-side Ready condition.
+// etcdClusterReady checks the operator-side Available condition.
 func etcdClusterReady(c *etcdtypes.EtcdCluster) bool {
 	if c == nil {
 		return false
 	}
-	cond := apimeta.FindStatusCondition(c.Status.Conditions, etcdtypes.ClusterConditionReady)
+	cond := apimeta.FindStatusCondition(c.Status.Conditions, etcdtypes.ClusterConditionAvailable)
 	return cond != nil && cond.Status == metav1.ConditionTrue
 }
 
 // etcdClusterReadyReason returns a short human-readable summary of the
-// operator-side Ready condition for inclusion in BackupJob terminal
-// failure messages. Falls back to a sentinel when no Ready condition
+// operator-side Available condition for inclusion in BackupJob terminal
+// failure messages. Falls back to a sentinel when no Available condition
 // has been emitted yet.
 func etcdClusterReadyReason(c *etcdtypes.EtcdCluster) string {
 	if c == nil {
 		return "cluster=nil"
 	}
-	cond := apimeta.FindStatusCondition(c.Status.Conditions, etcdtypes.ClusterConditionReady)
+	cond := apimeta.FindStatusCondition(c.Status.Conditions, etcdtypes.ClusterConditionAvailable)
 	if cond == nil {
-		return "no Ready condition emitted yet"
+		return "no Available condition emitted yet"
 	}
 	if cond.Message != "" {
 		return fmt.Sprintf("%s=%s/%s", cond.Type, cond.Status, cond.Message)
@@ -369,7 +375,7 @@ func etcdClusterReadyReason(c *etcdtypes.EtcdCluster) string {
 	return fmt.Sprintf("%s=%s/%s", cond.Type, cond.Status, cond.Reason)
 }
 
-// latestEtcdBackupConditionMessage returns the message most likely to
+// latestEtcdSnapshotConditionMessage returns the message most likely to
 // describe a terminal failure. The upstream operator's reconcile may
 // stamp a housekeeping condition (Started, Uploading, ...) AFTER the
 // failure landed, which would shadow the actual cause if we picked the
@@ -377,7 +383,7 @@ func etcdClusterReadyReason(c *etcdtypes.EtcdCluster) string {
 // (or a Ready=False entry) so tenants see the upstream reason, falling
 // back to the latest transition only when no failure-shaped condition
 // exists.
-func latestEtcdBackupConditionMessage(eb *etcdtypes.EtcdBackup) string {
+func latestEtcdSnapshotConditionMessage(eb *etcdtypes.EtcdSnapshot) string {
 	if eb == nil || len(eb.Status.Conditions) == 0 {
 		return ""
 	}
@@ -396,7 +402,7 @@ func latestEtcdBackupConditionMessage(eb *etcdtypes.EtcdBackup) string {
 		// operator's exact spelling is not pinned by the typed wrapper.
 		isFailure := strings.EqualFold(c.Type, "Failed") ||
 			strings.HasPrefix(c.Reason, "Failed") ||
-			(c.Type == etcdtypes.ClusterConditionReady && c.Status == metav1.ConditionFalse)
+			(c.Type == etcdtypes.ClusterConditionAvailable && c.Status == metav1.ConditionFalse)
 		if !isFailure {
 			continue
 		}
@@ -410,23 +416,23 @@ func latestEtcdBackupConditionMessage(eb *etcdtypes.EtcdBackup) string {
 	return latestAny.Message
 }
 
-// ensureEtcdBackup materialises a per-BackupJob EtcdBackup CR, or returns
+// ensureEtcdSnapshot materialises a per-BackupJob EtcdSnapshot CR, or returns
 // the existing one if a previous reconcile already created it.
 // Idempotency relies on the OwningJob labels.
 //
-// IMPORTANT: the EtcdBackup CR is intentionally NOT linked back to the
+// IMPORTANT: the EtcdSnapshot CR is intentionally NOT linked back to the
 // BackupJob via metav1.OwnerReference. Same reasoning as the FDB driver:
 // a fresh BackupJob with the same name (e.g. tenant `kubectl delete &&
 // kubectl apply`) must find the prior operator CR by its OwningJob label
 // and reuse it instead of leaking a duplicate Job. Adding an OwnerRef
 // would make Kubernetes GC reap the operator CR with the parent
 // BackupJob, defeating the reuse contract.
-func (r *BackupJobReconciler) ensureEtcdBackup(
+func (r *BackupJobReconciler) ensureEtcdSnapshot(
 	ctx context.Context,
 	j *backupsv1alpha1.BackupJob,
 	rendered *strategyv1alpha1.EtcdTemplate,
-) (*etcdtypes.EtcdBackup, error) {
-	existing, err := r.findEtcdBackupForJob(ctx, j)
+) (*etcdtypes.EtcdSnapshot, error) {
+	existing, err := r.findEtcdSnapshotForJob(ctx, j)
 	if err != nil {
 		return nil, err
 	}
@@ -439,7 +445,7 @@ func (r *BackupJobReconciler) ensureEtcdBackup(
 		return nil, err
 	}
 
-	obj := &etcdtypes.EtcdBackup{
+	obj := &etcdtypes.EtcdSnapshot{
 		ObjectMeta: metav1.ObjectMeta{
 			Namespace:    j.Namespace,
 			GenerateName: fmt.Sprintf("%s-", j.Name),
@@ -448,7 +454,7 @@ func (r *BackupJobReconciler) ensureEtcdBackup(
 				backupsv1alpha1.OwningJobNamespaceLabel: j.Namespace,
 			},
 		},
-		Spec: etcdtypes.EtcdBackupSpec{
+		Spec: etcdtypes.EtcdSnapshotSpec{
 			ClusterRef:  etcdtypes.EtcdLocalObjectReference{Name: etcdClusterName},
 			Destination: dest,
 		},
@@ -459,10 +465,10 @@ func (r *BackupJobReconciler) ensureEtcdBackup(
 	return obj, nil
 }
 
-// findEtcdBackupForJob returns the EtcdBackup labelled with the
+// findEtcdSnapshotForJob returns the EtcdSnapshot labelled with the
 // BackupJob's OwningJob{Name,Namespace}, if any.
-func (r *BackupJobReconciler) findEtcdBackupForJob(ctx context.Context, j *backupsv1alpha1.BackupJob) (*etcdtypes.EtcdBackup, error) {
-	list := &etcdtypes.EtcdBackupList{}
+func (r *BackupJobReconciler) findEtcdSnapshotForJob(ctx context.Context, j *backupsv1alpha1.BackupJob) (*etcdtypes.EtcdSnapshot, error) {
+	list := &etcdtypes.EtcdSnapshotList{}
 	if err := r.List(ctx, list,
 		client.InNamespace(j.Namespace),
 		client.MatchingLabels{
@@ -480,7 +486,7 @@ func (r *BackupJobReconciler) findEtcdBackupForJob(ctx context.Context, j *backu
 		for i := range list.Items {
 			names = append(names, list.Items[i].Name)
 		}
-		getLogger(ctx).Debug("multiple etcd.aenix.io/EtcdBackup CRs match BackupJob OwningJob labels; reusing first",
+		getLogger(ctx).Debug("multiple etcd-operator.cozystack.io/EtcdSnapshot CRs match BackupJob OwningJob labels; reusing first",
 			"backupjob", j.Name, "namespace", j.Namespace, "matches", names, "picked", names[0])
 	}
 	return &list.Items[0], nil
@@ -491,12 +497,12 @@ func (r *BackupJobReconciler) findEtcdBackupForJob(ctx context.Context, j *backu
 // rendered S3/PVC coordinates are persisted in
 // Backup.status.underlyingResources so restore-time templating produces
 // the same values the backup ran with even after the operator-side
-// EtcdBackup CR has been pruned.
+// EtcdSnapshot CR has been pruned.
 func (r *BackupJobReconciler) createEtcdBackupArtifact(
 	ctx context.Context,
 	j *backupsv1alpha1.BackupJob,
 	resolved *ResolvedBackupConfig,
-	eb *etcdtypes.EtcdBackup,
+	eb *etcdtypes.EtcdSnapshot,
 	rendered *strategyv1alpha1.EtcdTemplate,
 ) (*backupsv1alpha1.Backup, error) {
 	takenAt := metav1.Now()
@@ -529,8 +535,8 @@ func (r *BackupJobReconciler) createEtcdBackupArtifact(
 	// Pass through the upstream operator's reported snapshot location
 	// + integrity hash. The backup-agent emits the final URI in a
 	// terminal pod-log marker that the operator (v0.4.4+) parses into
-	// EtcdBackup.status.snapshot — see upstream
-	// internal/controller/etcdbackup_controller.go. The spec
+	// EtcdSnapshot.status.artifact — see the upstream etcd-operator
+	// EtcdSnapshot reconciler. The spec
 	// destination alone is just the prefix; the agent appends the
 	// backup-name (and any rev/timestamp suffix), so status.snapshot
 	// is the authoritative final URI for human inspection.
@@ -543,7 +549,7 @@ func (r *BackupJobReconciler) createEtcdBackupArtifact(
 	// a URI that points at a non-existent S3 object is worse than
 	// emitting nothing. The buildEtcdRestoreS3Key helper handles
 	// reconstruction at restore time for both cases.
-	if s := eb.Status.Snapshot; s != nil && s.URI != "" {
+	if s := eb.Status.Artifact; s != nil && s.URI != "" {
 		status.Artifact = &backupsv1alpha1.BackupArtifact{
 			URI:       s.URI,
 			SizeBytes: s.SizeBytes,
@@ -579,7 +585,6 @@ func (r *BackupJobReconciler) createEtcdBackupArtifact(
 	return backup, nil
 }
 
-
 // ---------------------------------------------------------------------------
 // RestoreJob path - in-place only (R2: suspend HR, snapshot live spec,
 // delete + recreate EtcdCluster with bootstrap.restore, resume HR)
@@ -663,7 +668,7 @@ func (r *RestoreJobReconciler) reconcileEtcdRestore(ctx context.Context, restore
 	}
 
 	// Resolve the snapshot destination from the persisted underlyingResources
-	// (the authoritative source - durable beyond the operator EtcdBackup
+	// (the authoritative source - durable beyond the operator EtcdSnapshot
 	// CR's lifetime). Fall back to driverMetadata on decode failure unless
 	// the snapshot identifies an unrecognised schema, in which case the
 	// restore terminates - same contract as the FoundationDB driver.
@@ -689,7 +694,7 @@ func (r *RestoreJobReconciler) reconcileEtcdRestore(ctx context.Context, restore
 	// EtcdCluster disappear would re-render the chart's bootstrap-less
 	// EtcdCluster on the next sync and the operator would start a fresh
 	// empty cluster, defeating the restore. Suspend the HR, hold it
-	// suspended until the new EtcdCluster is Ready, then resume.
+	// suspended until the new EtcdCluster is Available, then resume.
 	hrName := target.AppName
 
 	// First reconcile in the destructive window: snapshot the live spec
@@ -718,7 +723,7 @@ func (r *RestoreJobReconciler) reconcileEtcdRestore(ctx context.Context, restore
 					Type:    etcdRestoreCondTargetPurged,
 					Status:  metav1.ConditionTrue,
 					Reason:  "ClusterPurgedRecovered",
-					Message: fmt.Sprintf("etcd.aenix.io/EtcdCluster %s/%s already gone on this iteration; advancing to recreate phase", target.Namespace, etcdClusterName),
+					Message: fmt.Sprintf("etcd-operator.cozystack.io/EtcdCluster %s/%s already gone on this iteration; advancing to recreate phase", target.Namespace, etcdClusterName),
 				})
 				if err := r.Status().Update(ctx, restoreJob); err != nil {
 					return ctrl.Result{}, err
@@ -726,7 +731,7 @@ func (r *RestoreJobReconciler) reconcileEtcdRestore(ctx context.Context, restore
 				return ctrl.Result{RequeueAfter: etcdPollInterval}, nil
 			}
 			return r.markRestoreJobFailed(ctx, restoreJob, fmt.Sprintf(
-				"etcd.aenix.io/EtcdCluster %s/%s not found; cannot derive the spec to re-create with bootstrap.restore (deploy the source Etcd application before requesting the restore)",
+				"etcd-operator.cozystack.io/EtcdCluster %s/%s not found; cannot derive the spec to re-create with bootstrap.restore (deploy the source Etcd application before requesting the restore)",
 				target.Namespace, etcdClusterName))
 		}
 
@@ -738,7 +743,7 @@ func (r *RestoreJobReconciler) reconcileEtcdRestore(ctx context.Context, restore
 			liveSpec, _, _ := unstructured.NestedMap(live.Object, "spec")
 			if len(liveSpec) == 0 {
 				return r.markRestoreJobFailed(ctx, restoreJob,
-					"live etcd.aenix.io/EtcdCluster has empty spec; refusing to restore against an unconfigured cluster")
+					"live etcd-operator.cozystack.io/EtcdCluster has empty spec; refusing to restore against an unconfigured cluster")
 			}
 			specPayload, mErr := json.Marshal(liveSpec)
 			if mErr != nil {
@@ -751,7 +756,7 @@ func (r *RestoreJobReconciler) reconcileEtcdRestore(ctx context.Context, restore
 			// with the spec lost.
 			if len(specPayload) > etcdRestoreCapturedSpecMaxBytes {
 				return r.markRestoreJobFailed(ctx, restoreJob, fmt.Sprintf(
-					"live etcd.aenix.io/EtcdCluster spec is %d bytes which exceeds the %d-byte limit the driver can durably capture before the destructive purge; trim podTemplate / topologySpreadConstraints customisation on the source app or open an issue for a ConfigMap-backed capture path",
+					"live etcd-operator.cozystack.io/EtcdCluster spec is %d bytes which exceeds the %d-byte limit the driver can durably capture before the destructive purge; trim podTemplate / topologySpreadConstraints customisation on the source app or open an issue for a ConfigMap-backed capture path",
 					len(specPayload), etcdRestoreCapturedSpecMaxBytes))
 			}
 			apimeta.SetStatusCondition(&restoreJob.Status.Conditions, metav1.Condition{
@@ -774,7 +779,7 @@ func (r *RestoreJobReconciler) reconcileEtcdRestore(ctx context.Context, restore
 
 		if err := r.Resource(etcdClusterGVR).Namespace(target.Namespace).Delete(ctx, etcdClusterName, metav1.DeleteOptions{}); err != nil && !apierrors.IsNotFound(err) {
 			return r.markEtcdRestoreFailedAndResumeHR(ctx, restoreJob, target.Namespace, hrName, fmt.Sprintf(
-				"delete etcd.aenix.io/EtcdCluster %s/%s: %v", target.Namespace, etcdClusterName, err))
+				"delete etcd-operator.cozystack.io/EtcdCluster %s/%s: %v", target.Namespace, etcdClusterName, err))
 		}
 
 		gone, err := r.etcdClusterFullyGone(ctx, target.Namespace)
@@ -794,7 +799,7 @@ func (r *RestoreJobReconciler) reconcileEtcdRestore(ctx context.Context, restore
 			Type:    etcdRestoreCondTargetPurged,
 			Status:  metav1.ConditionTrue,
 			Reason:  "ClusterPurged",
-			Message: fmt.Sprintf("etcd.aenix.io/EtcdCluster %s/%s and member PVCs are gone; recreating with bootstrap.restore", target.Namespace, etcdClusterName),
+			Message: fmt.Sprintf("etcd-operator.cozystack.io/EtcdCluster %s/%s and member PVCs are gone; recreating with bootstrap.restore", target.Namespace, etcdClusterName),
 		})
 		if err := r.Status().Update(ctx, restoreJob); err != nil {
 			return ctrl.Result{}, err
@@ -816,8 +821,8 @@ func (r *RestoreJobReconciler) reconcileEtcdRestore(ctx context.Context, restore
 				"recover captured EtcdCluster spec: %v", specErr))
 		}
 		// Inject bootstrap.restore.source on top of the captured spec.
-		bootstrap := map[string]interface{}{
-			"restore": map[string]interface{}{
+		bootstrap := map[string]any{
+			"restore": map[string]any{
 				"source": etcdBackupDestinationToUnstructured(dest),
 			},
 		}
@@ -852,20 +857,20 @@ func (r *RestoreJobReconciler) reconcileEtcdRestore(ctx context.Context, restore
 		deadline := options.effectiveRestoreDeadline()
 		if restoreJob.Status.StartedAt != nil && time.Since(restoreJob.Status.StartedAt.Time) > deadline {
 			// This is the most likely production failure point - the
-			// recreated EtcdCluster never becomes Ready within deadline
+			// recreated EtcdCluster never becomes Available within deadline
 			// (e.g. snapshot download stuck, S3 creds wrong, PVC
 			// provisioner slow). Resume the HR before terminal-failing
 			// so helm-controller is not left frozen on the tenant's
 			// Etcd app.
 			return r.markEtcdRestoreFailedAndResumeHR(ctx, restoreJob, target.Namespace, hrName, fmt.Sprintf(
-				"etcd.aenix.io/EtcdCluster %s/%s did not reach Ready within %s after recreation with bootstrap.restore (override via spec.options.restoreTimeoutSeconds)",
+				"etcd-operator.cozystack.io/EtcdCluster %s/%s did not become Available within %s after recreation with bootstrap.restore (override via spec.options.restoreTimeoutSeconds)",
 				target.Namespace, etcdClusterName, deadline))
 		}
 		apimeta.SetStatusCondition(&restoreJob.Status.Conditions, metav1.Condition{
 			Type:    "Ready",
 			Status:  metav1.ConditionFalse,
 			Reason:  "EtcdClusterBootstrapping",
-			Message: fmt.Sprintf("waiting for etcd.aenix.io/EtcdCluster %s/%s to reach Ready after bootstrap.restore", target.Namespace, etcdClusterName),
+			Message: fmt.Sprintf("waiting for etcd-operator.cozystack.io/EtcdCluster %s/%s to become Available after bootstrap.restore", target.Namespace, etcdClusterName),
 		})
 		if err := r.Status().Update(ctx, restoreJob); err != nil {
 			return ctrl.Result{}, err
@@ -873,7 +878,7 @@ func (r *RestoreJobReconciler) reconcileEtcdRestore(ctx context.Context, restore
 		return ctrl.Result{RequeueAfter: etcdPollInterval}, nil
 	}
 
-	// Cluster is Ready - resume the HR. Idempotent: a NotFound on the HR
+	// Cluster is Available - resume the HR. Idempotent: a NotFound on the HR
 	// (deleted between suspend and resume) is treated as success.
 	if err := r.setEtcdRestoreHRSuspended(ctx, target.Namespace, hrName, false); err != nil {
 		return ctrl.Result{}, err
@@ -886,7 +891,7 @@ func (r *RestoreJobReconciler) reconcileEtcdRestore(ctx context.Context, restore
 		Type:    "Ready",
 		Status:  metav1.ConditionTrue,
 		Reason:  "RestoreCompleted",
-		Message: fmt.Sprintf("etcd.aenix.io/EtcdCluster %s/%s reached Ready after bootstrap.restore", target.Namespace, etcdClusterName),
+		Message: fmt.Sprintf("etcd-operator.cozystack.io/EtcdCluster %s/%s became Available after bootstrap.restore", target.Namespace, etcdClusterName),
 	})
 	if err := r.Status().Update(ctx, restoreJob); err != nil {
 		return ctrl.Result{}, err
@@ -921,12 +926,12 @@ const (
 // a typed unmarshal would drop everything the chart populated (replicas,
 // storage, security, options, podTemplate, ...) and the recreated
 // EtcdCluster would be an empty shell.
-func readCapturedEtcdClusterSpec(restoreJob *backupsv1alpha1.RestoreJob) (map[string]interface{}, error) {
+func readCapturedEtcdClusterSpec(restoreJob *backupsv1alpha1.RestoreJob) (map[string]any, error) {
 	cond := apimeta.FindStatusCondition(restoreJob.Status.Conditions, etcdRestoreCondClusterSpecCaptured)
 	if cond == nil || cond.Message == "" {
 		return nil, errors.New("EtcdClusterSpecCaptured condition is missing or empty; cannot rebuild EtcdCluster spec")
 	}
-	specMap := map[string]interface{}{}
+	specMap := map[string]any{}
 	if err := json.Unmarshal([]byte(cond.Message), &specMap); err != nil {
 		return nil, fmt.Errorf("decode captured spec: %w", err)
 	}
@@ -1004,13 +1009,13 @@ func buildEtcdRestoreS3Key(keyPrefix, backupName string) string {
 // endpoint / credentialsSecretRef.name; emitting them explicitly would
 // turn a partial-config into a noisier admission error than the
 // driver's own validateRenderedEtcdDestination already surfaces).
-func etcdBackupDestinationToUnstructured(d etcdtypes.EtcdBackupDestination) map[string]interface{} {
-	out := map[string]interface{}{}
+func etcdBackupDestinationToUnstructured(d etcdtypes.EtcdBackupDestination) map[string]any {
+	out := map[string]any{}
 	if s := d.S3; s != nil {
-		s3 := map[string]interface{}{
+		s3 := map[string]any{
 			"bucket":   s.Bucket,
 			"endpoint": s.Endpoint,
-			"credentialsSecretRef": map[string]interface{}{
+			"credentialsSecretRef": map[string]any{
 				"name": s.CredentialsSecretRef.Name,
 			},
 		}
@@ -1203,7 +1208,7 @@ func (r *RestoreJobReconciler) etcdClusterFullyGone(ctx context.Context, namespa
 	case err == nil:
 		return false, nil
 	case !apierrors.IsNotFound(err):
-		return false, fmt.Errorf("get etcd.aenix.io/EtcdCluster %s/%s: %w", namespace, etcdClusterName, err)
+		return false, fmt.Errorf("get etcd-operator.cozystack.io/EtcdCluster %s/%s: %w", namespace, etcdClusterName, err)
 	}
 	pvcList := &corev1.PersistentVolumeClaimList{}
 	if err := r.List(ctx, pvcList,
@@ -1238,7 +1243,7 @@ func (r *RestoreJobReconciler) resolveEtcdRestoreTarget(restoreJob *backupsv1alp
 // etcdBackupSnapshot is the Etcd-specific payload persisted in
 // Backup.status.underlyingResources at backup time. Carries the rendered
 // destination and BackupClass parameters so a future RestoreJob can
-// reproduce them exactly when the operator-side EtcdBackup CR has been
+// reproduce them exactly when the operator-side EtcdSnapshot CR has been
 // pruned. The JSON tag for Destination matches the strategy CR's
 // spec.template.destination so the on-disk shape is self-describing
 // when an operator inspects the Backup artefact.
@@ -1307,7 +1312,7 @@ func renderEtcdTemplate(t strategyv1alpha1.EtcdTemplate, app *etcdapp.Etcd, para
 	if err != nil {
 		return nil, fmt.Errorf("encode application for templating: %w", err)
 	}
-	templateContext := map[string]interface{}{
+	templateContext := map[string]any{
 		"Application": appAsMap,
 		"Parameters":  parameters,
 	}
@@ -1317,12 +1322,12 @@ func renderEtcdTemplate(t strategyv1alpha1.EtcdTemplate, app *etcdapp.Etcd, para
 // toJSONMapEtcd converts a typed object to a generic map via JSON tags so
 // user-authored go-templates address fields by their JSON names (e.g.
 // .Application.metadata.name).
-func toJSONMapEtcd(obj interface{}) (map[string]interface{}, error) {
+func toJSONMapEtcd(obj any) (map[string]any, error) {
 	raw, err := json.Marshal(obj)
 	if err != nil {
 		return nil, err
 	}
-	out := map[string]interface{}{}
+	out := map[string]any{}
 	if err := json.Unmarshal(raw, &out); err != nil {
 		return nil, err
 	}
@@ -1400,7 +1405,7 @@ func strategyToEtcdBackupDestination(d strategyv1alpha1.EtcdDestinationTemplate)
 // the boundary parses lazily and keeps behaviour permissive.
 type EtcdRestoreOptions struct {
 	// RestoreTimeoutSeconds caps the time the driver waits for the
-	// re-created EtcdCluster to reach Ready before it marks the
+	// re-created EtcdCluster to become Available before it marks the
 	// RestoreJob Failed. Zero or unset falls back to
 	// etcdDefaultRestoreDeadline.
 	// +optional
diff --git a/internal/backupcontroller/etcdstrategy_controller_test.go b/internal/backupcontroller/etcdstrategy_controller_test.go
index f5948704e7..b68286bc78 100644
--- a/internal/backupcontroller/etcdstrategy_controller_test.go
+++ b/internal/backupcontroller/etcdstrategy_controller_test.go
@@ -54,13 +54,11 @@ func newEtcdTestClient(t *testing.T, objs ...client.Object) client.Client {
 			&backupsv1alpha1.RestoreJob{},
 			&backupsv1alpha1.Backup{},
 			&etcdtypes.EtcdCluster{},
-			&etcdtypes.EtcdBackup{},
+			&etcdtypes.EtcdSnapshot{},
 		).
 		Build()
 }
 
-func ptrBool(v bool) *bool { return &v }
-
 // ---------------------------------------------------------------------------
 // Validation
 // ---------------------------------------------------------------------------
@@ -151,7 +149,7 @@ func TestValidateRenderedEtcdDestination(t *testing.T) {
 // See review feedback in github.com/cozystack/cozystack PR #2641,
 // review #4327696458, blocker #1.
 func TestEtcdDestinationTemplate_NoPVCField(t *testing.T) {
-	typ := reflect.TypeOf(strategyv1alpha1.EtcdDestinationTemplate{})
+	typ := reflect.TypeFor[strategyv1alpha1.EtcdDestinationTemplate]()
 	if _, ok := typ.FieldByName("PVC"); ok {
 		t.Fatal("EtcdDestinationTemplate must not expose a PVC field; " +
 			"upstream PVC restore is broken (asymmetric path between " +
@@ -161,7 +159,7 @@ func TestEtcdDestinationTemplate_NoPVCField(t *testing.T) {
 	// Defense-in-depth: same for the snapshot persistence struct.
 	// snap.Destination embeds EtcdDestinationTemplate, so a re-added
 	// PVC field would also leak through Backup.status.underlyingResources.
-	snapType := reflect.TypeOf(etcdBackupSnapshot{})
+	snapType := reflect.TypeFor[etcdBackupSnapshot]()
 	destField, ok := snapType.FieldByName("Destination")
 	if !ok {
 		t.Fatal("etcdBackupSnapshot must have a Destination field")
@@ -221,7 +219,7 @@ func TestStrategyToEtcdBackupDestination_S3(t *testing.T) {
 			Endpoint:             "https://e",
 			Key:                  "etcd-src/",
 			Region:               "us-east-1",
-			ForcePathStyle:       ptrBool(true),
+			ForcePathStyle:       new(true),
 			CredentialsSecretRef: strategyv1alpha1.EtcdLocalObjectReference{Name: "creds"},
 		},
 	}
@@ -259,7 +257,7 @@ func TestEtcdBackupSnapshot_RoundTrip(t *testing.T) {
 				Bucket:               "b",
 				Endpoint:             "https://e",
 				Key:                  "etcd-src/",
-				ForcePathStyle:       ptrBool(true),
+				ForcePathStyle:       new(true),
 				CredentialsSecretRef: strategyv1alpha1.EtcdLocalObjectReference{Name: "creds"},
 			},
 		},
@@ -561,7 +559,7 @@ func TestS3KeyFromArtifactURI(t *testing.T) {
 }
 
 // TestResolveEtcdRestoreDestination_PrefersArtifactURIForRevSuffix is
-// the integration test for the bug found on dev7: with a v0.4.4
+// the integration test for the bug found on a test cluster: with a v0.4.4
 // operator (BACKUP_INCLUDE_REVISION=true), the agent wrote
 // "etcd/etcd-backup-job-6gghq-rev2.db" but the driver's
 // buildEtcdRestoreS3Key would emit "etcd/etcd-backup-job-6gghq.db" —
@@ -660,11 +658,11 @@ func TestEnsureEtcdBackup_LabelIdempotency(t *testing.T) {
 		},
 	}
 
-	first, err := r.ensureEtcdBackup(context.Background(), bj, rendered)
+	first, err := r.ensureEtcdSnapshot(context.Background(), bj, rendered)
 	if err != nil {
 		t.Fatalf("first ensure: %v", err)
 	}
-	second, err := r.ensureEtcdBackup(context.Background(), bj, rendered)
+	second, err := r.ensureEtcdSnapshot(context.Background(), bj, rendered)
 	if err != nil {
 		t.Fatalf("second ensure: %v", err)
 	}
@@ -673,7 +671,7 @@ func TestEnsureEtcdBackup_LabelIdempotency(t *testing.T) {
 	}
 
 	// And there's exactly one EtcdBackup in the namespace.
-	list := &etcdtypes.EtcdBackupList{}
+	list := &etcdtypes.EtcdSnapshotList{}
 	if err := c.List(context.Background(), list, client.InNamespace(bj.Namespace)); err != nil {
 		t.Fatalf("list: %v", err)
 	}
@@ -704,7 +702,7 @@ func TestEnsureEtcdBackup_NoOwnerReference(t *testing.T) {
 			},
 		},
 	}
-	eb, err := r.ensureEtcdBackup(context.Background(), bj, rendered)
+	eb, err := r.ensureEtcdSnapshot(context.Background(), bj, rendered)
 	if err != nil {
 		t.Fatalf("ensure: %v", err)
 	}
@@ -735,11 +733,11 @@ func TestCreateEtcdBackupArtifact_PassesSnapshotThrough(t *testing.T) {
 	c := newEtcdTestClient(t, bj)
 	r := &BackupJobReconciler{Client: c, Scheme: newEtcdTestScheme(t)}
 
-	eb := &etcdtypes.EtcdBackup{
+	eb := &etcdtypes.EtcdSnapshot{
 		ObjectMeta: metav1.ObjectMeta{Namespace: "tenant-root", Name: "bj-1-abcde"},
-		Status: etcdtypes.EtcdBackupStatus{
+		Status: etcdtypes.EtcdSnapshotStatus{
 			Phase: etcdtypes.BackupPhaseComplete,
-			Snapshot: &etcdtypes.EtcdBackupSnapshot{
+			Artifact: &etcdtypes.EtcdSnapshotArtifact{
 				URI:       "s3://my-bucket/etcd/bj-1-abcde-rev42.db",
 				SizeBytes: 20512,
 				Checksum:  "sha256:abcd1234",
@@ -767,14 +765,14 @@ func TestCreateEtcdBackupArtifact_PassesSnapshotThrough(t *testing.T) {
 	if backup.Status.Artifact == nil {
 		t.Fatal("status.artifact: got nil, want pass-through")
 	}
-	if backup.Status.Artifact.URI != eb.Status.Snapshot.URI {
-		t.Errorf("artifact.URI: got %q want %q", backup.Status.Artifact.URI, eb.Status.Snapshot.URI)
+	if backup.Status.Artifact.URI != eb.Status.Artifact.URI {
+		t.Errorf("artifact.URI: got %q want %q", backup.Status.Artifact.URI, eb.Status.Artifact.URI)
 	}
-	if backup.Status.Artifact.SizeBytes != eb.Status.Snapshot.SizeBytes {
-		t.Errorf("artifact.SizeBytes: got %d want %d", backup.Status.Artifact.SizeBytes, eb.Status.Snapshot.SizeBytes)
+	if backup.Status.Artifact.SizeBytes != eb.Status.Artifact.SizeBytes {
+		t.Errorf("artifact.SizeBytes: got %d want %d", backup.Status.Artifact.SizeBytes, eb.Status.Artifact.SizeBytes)
 	}
-	if backup.Status.Artifact.Checksum != eb.Status.Snapshot.Checksum {
-		t.Errorf("artifact.Checksum: got %q want %q", backup.Status.Artifact.Checksum, eb.Status.Snapshot.Checksum)
+	if backup.Status.Artifact.Checksum != eb.Status.Artifact.Checksum {
+		t.Errorf("artifact.Checksum: got %q want %q", backup.Status.Artifact.Checksum, eb.Status.Artifact.Checksum)
 	}
 }
 
@@ -795,9 +793,9 @@ func TestCreateEtcdBackupArtifact_NoSnapshotLeavesArtifactNil(t *testing.T) {
 	c := newEtcdTestClient(t, bj)
 	r := &BackupJobReconciler{Client: c, Scheme: newEtcdTestScheme(t)}
 
-	eb := &etcdtypes.EtcdBackup{
+	eb := &etcdtypes.EtcdSnapshot{
 		ObjectMeta: metav1.ObjectMeta{Namespace: "tenant-root", Name: "bj-2-xyz"},
-		Status: etcdtypes.EtcdBackupStatus{
+		Status: etcdtypes.EtcdSnapshotStatus{
 			Phase: etcdtypes.BackupPhaseComplete,
 			// Snapshot is nil — older operator version.
 		},
@@ -956,7 +954,7 @@ func TestEtcdClusterReady(t *testing.T) {
 	t.Run("Ready=False is not ready", func(t *testing.T) {
 		c := &etcdtypes.EtcdCluster{}
 		apimeta.SetStatusCondition(&c.Status.Conditions, metav1.Condition{
-			Type: etcdtypes.ClusterConditionReady, Status: metav1.ConditionFalse, Reason: "Bootstrapping",
+			Type: etcdtypes.ClusterConditionAvailable, Status: metav1.ConditionFalse, Reason: "Bootstrapping",
 		})
 		if etcdClusterReady(c) {
 			t.Error("Ready=False reported ready")
@@ -965,7 +963,7 @@ func TestEtcdClusterReady(t *testing.T) {
 	t.Run("Ready=True is ready", func(t *testing.T) {
 		c := &etcdtypes.EtcdCluster{}
 		apimeta.SetStatusCondition(&c.Status.Conditions, metav1.Condition{
-			Type: etcdtypes.ClusterConditionReady, Status: metav1.ConditionTrue, Reason: "Ok",
+			Type: etcdtypes.ClusterConditionAvailable, Status: metav1.ConditionTrue, Reason: "Ok",
 		})
 		if !etcdClusterReady(c) {
 			t.Error("Ready=True not reported ready")
@@ -1117,13 +1115,13 @@ func TestReconcileEtcd_BackupJobDeadlineWhileWaitingForCluster(t *testing.T) {
 		}
 	})
 
-	t.Run("EtcdCluster present but Ready=False -> Failed past deadline", func(t *testing.T) {
+	t.Run("EtcdCluster present but Available=False -> Failed past deadline", func(t *testing.T) {
 		bj := mkBJ(time.Now().Add(-2 * etcdDefaultBackupDeadline))
 		notReady := &etcdtypes.EtcdCluster{
 			ObjectMeta: metav1.ObjectMeta{Namespace: "tenant", Name: etcdClusterName},
 		}
 		apimeta.SetStatusCondition(&notReady.Status.Conditions, metav1.Condition{
-			Type:    etcdtypes.ClusterConditionReady,
+			Type:    etcdtypes.ClusterConditionAvailable,
 			Status:  metav1.ConditionFalse,
 			Reason:  "Bootstrapping",
 			Message: "waiting for first quorum",
@@ -1140,12 +1138,12 @@ func TestReconcileEtcd_BackupJobDeadlineWhileWaitingForCluster(t *testing.T) {
 		if got.Status.Phase != backupsv1alpha1.BackupJobPhaseFailed {
 			t.Fatalf("expected Failed phase, got %q (msg=%q)", got.Status.Phase, got.Status.Message)
 		}
-		if !strings.Contains(got.Status.Message, "did not reach Ready within") {
-			t.Errorf("failure message should mention Ready-deadline; got %q", got.Status.Message)
+		if !strings.Contains(got.Status.Message, "did not become Available within") {
+			t.Errorf("failure message should mention Available-deadline; got %q", got.Status.Message)
 		}
 		// And the operator-side condition reason/message must be surfaced
 		// so an operator inspecting the failed BackupJob can see WHY the
-		// cluster never became Ready.
+		// cluster never became Available.
 		if !strings.Contains(got.Status.Message, "waiting for first quorum") {
 			t.Errorf("failure message should surface operator Ready condition; got %q", got.Status.Message)
 		}
@@ -1173,7 +1171,7 @@ func TestReconcileEtcd_BackupJobDeadlineWhileWaitingForCluster(t *testing.T) {
 }
 
 // ---------------------------------------------------------------------------
-// latestEtcdBackupConditionMessage prefers failure-shaped conditions
+// latestEtcdSnapshotConditionMessage prefers failure-shaped conditions
 // ---------------------------------------------------------------------------
 
 // TestLatestEtcdBackupConditionMessage_PrefersFailedCondition pins the
@@ -1187,8 +1185,8 @@ func TestLatestEtcdBackupConditionMessage_PrefersFailedCondition(t *testing.T) {
 	laterAt := metav1.NewTime(failedAt.Add(5 * time.Minute))
 
 	t.Run("Failed condition wins over later housekeeping", func(t *testing.T) {
-		eb := &etcdtypes.EtcdBackup{
-			Status: etcdtypes.EtcdBackupStatus{
+		eb := &etcdtypes.EtcdSnapshot{
+			Status: etcdtypes.EtcdSnapshotStatus{
 				Conditions: []metav1.Condition{
 					{Type: "Failed", Status: metav1.ConditionTrue, Reason: "UploadFailed",
 						Message: "upload to s3://x failed: AccessDenied", LastTransitionTime: failedAt},
@@ -1197,32 +1195,32 @@ func TestLatestEtcdBackupConditionMessage_PrefersFailedCondition(t *testing.T) {
 				},
 			},
 		}
-		got := latestEtcdBackupConditionMessage(eb)
+		got := latestEtcdSnapshotConditionMessage(eb)
 		if !strings.Contains(got, "AccessDenied") {
 			t.Errorf("expected failure message, got %q", got)
 		}
 	})
 
 	t.Run("Ready=False also counts as failure-shaped", func(t *testing.T) {
-		eb := &etcdtypes.EtcdBackup{
-			Status: etcdtypes.EtcdBackupStatus{
+		eb := &etcdtypes.EtcdSnapshot{
+			Status: etcdtypes.EtcdSnapshotStatus{
 				Conditions: []metav1.Condition{
-					{Type: etcdtypes.ClusterConditionReady, Status: metav1.ConditionFalse, Reason: "Backoff",
+					{Type: etcdtypes.ClusterConditionAvailable, Status: metav1.ConditionFalse, Reason: "Backoff",
 						Message: "etcdctl exited 1: tls handshake timeout", LastTransitionTime: failedAt},
 					{Type: "Started", Status: metav1.ConditionFalse, Reason: "Idle",
 						Message: "idle", LastTransitionTime: laterAt},
 				},
 			},
 		}
-		got := latestEtcdBackupConditionMessage(eb)
+		got := latestEtcdSnapshotConditionMessage(eb)
 		if !strings.Contains(got, "tls handshake") {
 			t.Errorf("expected Ready=False message to be preferred, got %q", got)
 		}
 	})
 
 	t.Run("falls back to latest when no failure-shaped condition exists", func(t *testing.T) {
-		eb := &etcdtypes.EtcdBackup{
-			Status: etcdtypes.EtcdBackupStatus{
+		eb := &etcdtypes.EtcdSnapshot{
+			Status: etcdtypes.EtcdSnapshotStatus{
 				Conditions: []metav1.Condition{
 					{Type: "Started", Status: metav1.ConditionTrue, Reason: "Started",
 						Message: "snapshot in progress", LastTransitionTime: failedAt},
@@ -1231,17 +1229,17 @@ func TestLatestEtcdBackupConditionMessage_PrefersFailedCondition(t *testing.T) {
 				},
 			},
 		}
-		got := latestEtcdBackupConditionMessage(eb)
+		got := latestEtcdSnapshotConditionMessage(eb)
 		if !strings.Contains(got, "uploaded") {
 			t.Errorf("expected latest-by-time fallback, got %q", got)
 		}
 	})
 
 	t.Run("nil and empty are empty string", func(t *testing.T) {
-		if latestEtcdBackupConditionMessage(nil) != "" {
+		if latestEtcdSnapshotConditionMessage(nil) != "" {
 			t.Error("nil should produce empty string")
 		}
-		if latestEtcdBackupConditionMessage(&etcdtypes.EtcdBackup{}) != "" {
+		if latestEtcdSnapshotConditionMessage(&etcdtypes.EtcdSnapshot{}) != "" {
 			t.Error("empty conditions should produce empty string")
 		}
 	})
@@ -1262,7 +1260,7 @@ func TestRequeueBackupJobWithReason_SetsRunningPhase(t *testing.T) {
 	}
 	c := newEtcdTestClient(t, bj)
 	r := &BackupJobReconciler{Client: c, Scheme: newEtcdTestScheme(t)}
-	if _, err := r.requeueBackupJobWithReason(context.Background(), bj, "EtcdClusterNotReady", "waiting"); err != nil {
+	if _, err := r.requeueBackupJobWithReason(context.Background(), bj, "EtcdClusterNotAvailable", "waiting"); err != nil {
 		t.Fatalf("requeue: %v", err)
 	}
 	got := &backupsv1alpha1.BackupJob{}
@@ -1273,8 +1271,8 @@ func TestRequeueBackupJobWithReason_SetsRunningPhase(t *testing.T) {
 		t.Errorf("expected phase=Running on first observable iteration, got %q", got.Status.Phase)
 	}
 	cond := apimeta.FindStatusCondition(got.Status.Conditions, "Ready")
-	if cond == nil || cond.Reason != "EtcdClusterNotReady" {
-		t.Errorf("expected Ready=False/EtcdClusterNotReady condition, got %+v", cond)
+	if cond == nil || cond.Reason != "EtcdClusterNotAvailable" {
+		t.Errorf("expected Ready=False/EtcdClusterNotAvailable condition, got %+v", cond)
 	}
 }
 
@@ -1536,7 +1534,7 @@ func suspendedHelmRelease(namespace, name string, suspend bool) *unstructured.Un
 	hr.SetGroupVersionKind(schema.GroupVersionKind{Group: "helm.toolkit.fluxcd.io", Version: "v2", Kind: "HelmRelease"})
 	hr.SetNamespace(namespace)
 	hr.SetName(name)
-	_ = unstructured.SetNestedMap(hr.Object, map[string]interface{}{"suspend": suspend}, "spec")
+	_ = unstructured.SetNestedMap(hr.Object, map[string]any{"suspend": suspend}, "spec")
 	return hr
 }
 
@@ -1550,23 +1548,25 @@ func hrSuspended(t *testing.T, dyn dynamic.Interface, namespace, name string) bo
 	return got
 }
 
-// TestReconcileEtcdRestore_ReadyDeadlineResumesHR pins the most likely
-// production failure path: the recreated EtcdCluster does NOT reach
-// Ready within restoreTimeoutSeconds (e.g. snapshot download stuck, S3
+// TestReconcileEtcdRestore_AvailableDeadlineResumesHR pins the most likely
+// production failure path: the recreated EtcdCluster does NOT become
+// Available within restoreTimeoutSeconds (e.g. snapshot download stuck, S3
 // creds wrong, PVC provisioner slow). Without this gate, the driver
 // flips the RestoreJob Failed and leaves spec.suspend=true on the
 // HelmRelease, freezing helm-controller on the Etcd app indefinitely —
 // the only manual recovery is `kubectl patch hr/etcd -p
-// '{"spec":{"suspend":false}}'`.
+// '{"spec":{"suspend":false}}'`. It also pins the failure wording to the
+// operator's actual condition (Available); the v1alpha2 operator emits no
+// "Ready" condition.
 //
-// Setup walks the state machine to the Ready-poll branch:
-//   - EtcdCluster exists (bootstrap.restore stamped, not Ready),
+// Setup walks the state machine to the Available-poll branch:
+//   - EtcdCluster exists (bootstrap.restore stamped, not Available),
 //   - pre-seeded TargetPurged AND EtcdClusterSpecCaptured so the
 //     destructive path is skipped on this reconcile,
 //   - HR is already suspended (simulating that a prior reconcile ran
 //     the destructive window),
 //   - StartedAt is far enough in the past that the deadline trips.
-func TestReconcileEtcdRestore_ReadyDeadlineResumesHR(t *testing.T) {
+func TestReconcileEtcdRestore_AvailableDeadlineResumesHR(t *testing.T) {
 	const ns = "tenant"
 	apps := etcdapp.GroupName
 	backup := &backupsv1alpha1.Backup{
@@ -1604,7 +1604,7 @@ func TestReconcileEtcdRestore_ReadyDeadlineResumesHR(t *testing.T) {
 	hr := suspendedHelmRelease(ns, etcdClusterName, true)
 	dyn := dynamicfake.NewSimpleDynamicClient(testEtcdDynamicScheme(t), cluster, hr)
 
-	// typed-client EtcdCluster (no Ready=True condition) so the Ready-poll branch trips the deadline.
+	// typed-client EtcdCluster (no Available=True condition) so the Available-poll branch trips the deadline.
 	typedCluster := &etcdtypes.EtcdCluster{ObjectMeta: metav1.ObjectMeta{Namespace: ns, Name: etcdClusterName}}
 	c := newEtcdTestClient(t, backup, rj, typedCluster)
 	r := &RestoreJobReconciler{Client: c, Interface: dyn, Scheme: newEtcdTestScheme(t), Recorder: record.NewFakeRecorder(10)}
@@ -1617,13 +1617,19 @@ func TestReconcileEtcdRestore_ReadyDeadlineResumesHR(t *testing.T) {
 		t.Fatalf("refetch: %v", err)
 	}
 	if got.Status.Phase != backupsv1alpha1.RestoreJobPhaseFailed {
-		t.Fatalf("expected Failed phase on Ready deadline; got %q (msg=%q)", got.Status.Phase, got.Status.Message)
+		t.Fatalf("expected Failed phase on Available deadline; got %q (msg=%q)", got.Status.Phase, got.Status.Message)
+	}
+	// The v1alpha2 operator emits no "Ready" condition; the restore-deadline
+	// message must report the actual gate (Available), not a condition that
+	// does not exist, or it misleads an operator debugging a stuck restore.
+	if !strings.Contains(got.Status.Message, "did not become Available within") {
+		t.Errorf("failure message should name the Available deadline; got %q", got.Status.Message)
 	}
-	if !strings.Contains(got.Status.Message, "did not reach Ready") {
-		t.Errorf("failure message should name the Ready deadline; got %q", got.Status.Message)
+	if strings.Contains(got.Status.Message, "Ready") {
+		t.Errorf("failure message must not mention the nonexistent Ready condition; got %q", got.Status.Message)
 	}
 	if hrSuspended(t, dyn, ns, etcdClusterName) {
-		t.Fatalf("HelmRelease must NOT remain suspended after terminal Ready-deadline failure - helm-controller would be frozen on the Etcd app")
+		t.Fatalf("HelmRelease must NOT remain suspended after terminal Available-deadline failure - helm-controller would be frozen on the Etcd app")
 	}
 }
 
@@ -1796,7 +1802,7 @@ func TestSetEtcdRestoreHRSuspended(t *testing.T) {
 		hr.SetGroupVersionKind(schema.GroupVersionKind{Group: "helm.toolkit.fluxcd.io", Version: "v2", Kind: "HelmRelease"})
 		hr.SetNamespace(ns)
 		hr.SetName(name)
-		spec := map[string]interface{}{}
+		spec := map[string]any{}
 		if suspended != nil {
 			spec["suspend"] = *suspended
 		}
diff --git a/internal/backupcontroller/etcdtypes/types.go b/internal/backupcontroller/etcdtypes/types.go
index d6659e95cb..66b5198c97 100644
--- a/internal/backupcontroller/etcdtypes/types.go
+++ b/internal/backupcontroller/etcdtypes/types.go
@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: Apache-2.0
 
 // Package etcdtypes declares the minimum subset of the
-// etcd.aenix.io/v1alpha1 CRD shape that the backupstrategy controller
-// operates on. We avoid pulling the full upstream etcd-operator Go API
-// (which transitively imports a large surface area we do not need) while
-// letting us drop unstructured.Unstructured from the controller and
+// etcd-operator.cozystack.io/v1alpha2 CRD shape that the backupstrategy
+// controller operates on. We avoid pulling the full upstream etcd-operator
+// Go API (which transitively imports a large surface area we do not need)
+// while letting us drop unstructured.Unstructured from the controller and
 // tests.
 //
 // MergeFrom-style patches preserve unknown fields. Get + Patch builds two
@@ -13,8 +13,8 @@
 // server applies that patch to the full stored object on the server side,
 // leaving everything else untouched.
 //
-// +groupName=etcd.aenix.io
-// +versionName=v1alpha1
+// +groupName=etcd-operator.cozystack.io
+// +versionName=v1alpha2
 package etcdtypes
 
 import (
@@ -24,11 +24,11 @@ import (
 )
 
 const (
-	GroupName = "etcd.aenix.io"
-	Version   = "v1alpha1"
+	GroupName = "etcd-operator.cozystack.io"
+	Version   = "v1alpha2"
 
-	// BackupPhase* mirror etcd.aenix.io/v1alpha1
-	// EtcdBackup.status.phase. The upstream controller emits these
+	// BackupPhase* mirror etcd-operator.cozystack.io/v1alpha2
+	// EtcdSnapshot.status.phase. The upstream controller emits these
 	// literal strings; the driver reads them to decide when a
 	// BackupJob is done.
 	//
@@ -43,11 +43,12 @@ const (
 	BackupPhaseComplete = "Complete"
 	BackupPhaseFailed   = "Failed"
 
-	// ClusterConditionReady is the condition type the etcd-operator
-	// raises once an EtcdCluster has finished bootstrapping (every
-	// member elected, peer/client TLS materialised). The driver gates
-	// restore success on it.
-	ClusterConditionReady = "Ready"
+	// ClusterConditionAvailable is the condition type the etcd-operator
+	// raises once an EtcdCluster has a healthy quorum (every member
+	// elected, peer/client TLS materialised). The driver gates backup and
+	// restore readiness on it. The v1alpha2 operator reports
+	// Available/Progressing/Degraded — there is no "Ready" condition.
+	ClusterConditionAvailable = "Available"
 )
 
 var (
@@ -59,7 +60,7 @@ var (
 func addKnownTypes(scheme *runtime.Scheme) error {
 	scheme.AddKnownTypes(GroupVersion,
 		&EtcdCluster{}, &EtcdClusterList{},
-		&EtcdBackup{}, &EtcdBackupList{},
+		&EtcdSnapshot{}, &EtcdSnapshotList{},
 	)
 	metav1.AddToGroupVersion(scheme, GroupVersion)
 	return nil
@@ -84,14 +85,14 @@ type EtcdClusterList struct {
 	Items           []EtcdCluster `json:"items"`
 }
 
-// EtcdClusterSpec mirrors the subset of etcd.aenix.io/v1alpha1
+// EtcdClusterSpec mirrors the subset of etcd-operator.cozystack.io/v1alpha2
 // EtcdCluster.spec the driver writes during restore. Unknown fields are
 // preserved on the server side; everything we don't set falls back to
 // chart/operator defaults.
 type EtcdClusterSpec struct {
 	// Bootstrap configures initial-cluster initialization from an existing
 	// data source. The operator only consults this on first reconcile of
-	// the EtcdCluster - mutating it after the cluster is Ready has no
+	// the EtcdCluster - mutating it after the cluster is Available has no
 	// effect. The driver therefore stamps it onto the freshly-created
 	// EtcdCluster during the in-place restore flow (suspend HR, snapshot
 	// live spec, delete + recreate with bootstrap.restore.source set).
@@ -118,106 +119,100 @@ type EtcdClusterRestore struct {
 // reads as a readiness gate.
 type EtcdClusterStatus struct {
 	// Conditions reflects the latest observations. The driver checks the
-	// "Ready" entry.
+	// "Available" entry.
 	// +optional
 	Conditions []metav1.Condition `json:"conditions,omitempty"`
 }
 
 // ---------------------------------------------------------------------------
-// EtcdBackup (one-shot snapshot Job)
+// EtcdSnapshot (one-shot snapshot Job)
 // ---------------------------------------------------------------------------
 
 // +kubebuilder:object:root=true
-type EtcdBackup struct {
+type EtcdSnapshot struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
-	Spec              EtcdBackupSpec   `json:"spec,omitempty"`
-	Status            EtcdBackupStatus `json:"status,omitempty"`
+	Spec              EtcdSnapshotSpec   `json:"spec,omitempty"`
+	Status            EtcdSnapshotStatus `json:"status,omitempty"`
 }
 
 // +kubebuilder:object:root=true
-type EtcdBackupList struct {
+type EtcdSnapshotList struct {
 	metav1.TypeMeta `json:",inline"`
 	metav1.ListMeta `json:"metadata,omitempty"`
-	Items           []EtcdBackup `json:"items"`
-}
-
-// EtcdBackupSpec mirrors etcd.aenix.io/v1alpha1 EtcdBackup.spec. The
-// driver materialises one of these per Cozystack BackupJob so each
-// snapshot lives in a deterministic location keyed off the BackupJob
-// name; the operator handles the Job and writes back status.phase.
-type EtcdBackupSpec struct {
-	// ClusterRef references the EtcdCluster to snapshot.
+	Items           []EtcdSnapshot `json:"items"`
+}
+
+// EtcdSnapshotSpec mirrors etcd-operator.cozystack.io/v1alpha2
+// EtcdSnapshot.spec. The driver materialises one of these per Cozystack
+// BackupJob so each snapshot lives in a deterministic location keyed off
+// the BackupJob name; the operator handles the Job and writes back
+// status.phase.
+type EtcdSnapshotSpec struct {
+	// ClusterRef references the EtcdCluster to snapshot. Upstream types it
+	// as corev1.LocalObjectReference; the bare {name: ""} shape our mirror
+	// emits is JSON-identical.
 	ClusterRef EtcdLocalObjectReference `json:"clusterRef"`
 
 	// Destination is where the snapshot will be uploaded.
 	Destination EtcdBackupDestination `json:"destination"`
 }
 
-// EtcdBackupStatus mirrors etcd.aenix.io/v1alpha1 EtcdBackup.status. The
-// driver reads Phase to decide when the snapshot is done, and Snapshot
-// to populate the cozystack Backup artefact pass-through.
-type EtcdBackupStatus struct {
+// EtcdSnapshotStatus mirrors etcd-operator.cozystack.io/v1alpha2
+// EtcdSnapshot.status. The driver reads Phase to decide when the snapshot
+// is done, and Artifact to populate the cozystack Backup artefact
+// pass-through.
+type EtcdSnapshotStatus struct {
 	// Phase is one of Pending / Started / Complete / Failed.
 	Phase string `json:"phase,omitempty"`
 
-	// Conditions reflects per-aspect state (e.g. the upload condition).
-	// The driver surfaces the latest message back onto the Cozystack
-	// BackupJob on failure.
+	// Conditions reflects per-aspect state (the "Ready" condition is True
+	// only in the terminal Complete phase). The driver surfaces the latest
+	// message back onto the Cozystack BackupJob on failure.
 	// +optional
 	Conditions []metav1.Condition `json:"conditions,omitempty"`
 
-	// Snapshot is the URI/size/checksum trio populated by the
-	// etcd-operator's EtcdBackup controller after the backup Job
-	// reaches phase=Complete. Restore-friendly contract: the URI is
-	// the FULL S3 key (or file path) including rev/timestamp suffix
-	// the backup-agent injects at write time, which the spec
-	// destination alone doesn't carry.
+	// Artifact is the URI/size/checksum trio populated by the
+	// etcd-operator's EtcdSnapshot controller after the snapshot Job
+	// reaches phase=Complete. Restore-friendly contract: the URI is the
+	// FULL S3 key (or file path) including the "<snapshot-name>.db" suffix
+	// the operator appends at write time, which the spec destination alone
+	// doesn't carry.
 	//
-	// Available from etcd-operator v0.4.4 onward (upstream PR
-	// aenix-io/etcd-operator#316). The bundled chart at
-	// packages/system/etcd-operator pins v0.4.4+, so the driver can
-	// rely on this field being populated on every Complete EtcdBackup.
-	// The defensive nil-check in the pass-through path stays to
-	// handle pre-Complete reconciles and a forensic downgrade.
+	// The defensive nil-check in the pass-through path stays to handle
+	// pre-Complete reconciles.
 	// +optional
-	Snapshot *EtcdBackupSnapshot `json:"snapshot,omitempty"`
+	Artifact *EtcdSnapshotArtifact `json:"artifact,omitempty"`
 }
 
-// EtcdBackupSnapshot mirrors etcd.aenix.io/v1alpha1
-// BackupSnapshot. Field tags match upstream
-// (api/v1alpha1/etcdbackup_types.go) including the required URI; see
-// internal/controller/etcdbackup_controller.go in aenix-io/etcd-operator
-// for the marker-scan parser that populates this struct.
-type EtcdBackupSnapshot struct {
+// EtcdSnapshotArtifact mirrors etcd-operator.cozystack.io/v1alpha2
+// SnapshotArtifact (api/v1alpha2/etcdsnapshot_types.go).
+type EtcdSnapshotArtifact struct {
 	// URI is the canonical location of the snapshot, e.g.
-	// "s3://<bucket>/<key>" or "file://<abs-path>". Required upstream
-	// (no omitempty) so the schema rejects empty values; we mirror
-	// the omission for consistency with the source-of-truth shape.
+	// "s3://<bucket>/<key>" or "file:///<abs-path>". Required upstream
+	// (no omitempty) so the schema rejects empty values; we mirror the
+	// omission for consistency with the source-of-truth shape.
 	URI string `json:"uri"`
 
-	// SizeBytes is the snapshot size as observed by the agent at
-	// write time. Zero only when the upstream agent's emit overflows
-	// int64 — that branch deliberately keeps the URI/Checksum landed
-	// so a reviewer sees the snapshot exists.
+	// SizeBytes is the snapshot size as observed by the agent at write
+	// time.
 	// +optional
 	SizeBytes int64 `json:"sizeBytes,omitempty"`
 
-	// Checksum is "<algo>:<hex>" of the snapshot bytes. Currently
-	// always "sha256:<hex>" when set; consumers MUST tolerate other
-	// algorithms via the prefix (upstream admits sha3-256, blake2b-256,
-	// blake3-256 by pattern).
+	// Checksum is "<algo>:<hex>" of the snapshot bytes. Currently always
+	// "sha256:<hex>" when set; consumers MUST tolerate other algorithms
+	// via the prefix.
 	// +optional
 	Checksum string `json:"checksum,omitempty"`
 }
 
 // ---------------------------------------------------------------------------
-// Shared types (destination shape is identical for EtcdBackup.spec and
+// Shared types (destination shape is identical for EtcdSnapshot.spec and
 // EtcdCluster.spec.bootstrap.restore.source)
 // ---------------------------------------------------------------------------
 
-// EtcdBackupDestination mirrors etcd.aenix.io/v1alpha1
-// EtcdBackup.spec.destination AND
+// EtcdBackupDestination mirrors etcd-operator.cozystack.io/v1alpha2
+// SnapshotLocation (EtcdSnapshot.spec.destination) AND
 // EtcdCluster.spec.bootstrap.restore.source. The upstream CRDs share the
 // same shape; one Go type lets the driver render the same destination
 // onto both code paths.
@@ -231,7 +226,10 @@ type EtcdBackupDestination struct {
 	PVC *EtcdBackupPVC `json:"pvc,omitempty"`
 }
 
-// EtcdBackupS3 mirrors etcd.aenix.io/v1alpha1 EtcdBackup.spec.destination.s3.
+// EtcdBackupS3 mirrors etcd-operator.cozystack.io/v1alpha2
+// S3SnapshotLocation. ForcePathStyle is kept as *bool (rather than the
+// upstream bool) so an unset value is omitted from the rendered JSON and
+// the operator applies its own default.
 type EtcdBackupS3 struct {
 	Bucket               string                   `json:"bucket"`
 	Endpoint             string                   `json:"endpoint"`
@@ -241,15 +239,16 @@ type EtcdBackupS3 struct {
 	CredentialsSecretRef EtcdLocalObjectReference `json:"credentialsSecretRef"`
 }
 
-// EtcdBackupPVC mirrors etcd.aenix.io/v1alpha1
-// EtcdBackup.spec.destination.pvc.
+// EtcdBackupPVC mirrors etcd-operator.cozystack.io/v1alpha2
+// PVCSnapshotLocation.
 type EtcdBackupPVC struct {
 	ClaimName string `json:"claimName"`
 	SubPath   string `json:"subPath,omitempty"`
 }
 
 // EtcdLocalObjectReference is a minimal local Secret/EtcdCluster
-// reference. Mirrors the upstream operator's bare {name: ""} shape.
+// reference. JSON-identical to corev1.LocalObjectReference's {name: ""}
+// shape.
 type EtcdLocalObjectReference struct {
 	Name string `json:"name"`
 }
diff --git a/internal/backupcontroller/etcdtypes/zz_generated.deepcopy.go b/internal/backupcontroller/etcdtypes/zz_generated.deepcopy.go
index 0078df8e6e..9a3eca2766 100644
--- a/internal/backupcontroller/etcdtypes/zz_generated.deepcopy.go
+++ b/internal/backupcontroller/etcdtypes/zz_generated.deepcopy.go
@@ -163,7 +163,7 @@ func (in *EtcdClusterStatus) DeepCopy() *EtcdClusterStatus {
 }
 
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *EtcdBackup) DeepCopyInto(out *EtcdBackup) {
+func (in *EtcdSnapshot) DeepCopyInto(out *EtcdSnapshot) {
 	*out = *in
 	out.TypeMeta = in.TypeMeta
 	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
@@ -171,18 +171,18 @@ func (in *EtcdBackup) DeepCopyInto(out *EtcdBackup) {
 	in.Status.DeepCopyInto(&out.Status)
 }
 
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new EtcdBackup.
-func (in *EtcdBackup) DeepCopy() *EtcdBackup {
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new EtcdSnapshot.
+func (in *EtcdSnapshot) DeepCopy() *EtcdSnapshot {
 	if in == nil {
 		return nil
 	}
-	out := new(EtcdBackup)
+	out := new(EtcdSnapshot)
 	in.DeepCopyInto(out)
 	return out
 }
 
 // DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *EtcdBackup) DeepCopyObject() runtime.Object {
+func (in *EtcdSnapshot) DeepCopyObject() runtime.Object {
 	if c := in.DeepCopy(); c != nil {
 		return c
 	}
@@ -190,31 +190,31 @@ func (in *EtcdBackup) DeepCopyObject() runtime.Object {
 }
 
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *EtcdBackupList) DeepCopyInto(out *EtcdBackupList) {
+func (in *EtcdSnapshotList) DeepCopyInto(out *EtcdSnapshotList) {
 	*out = *in
 	out.TypeMeta = in.TypeMeta
 	in.ListMeta.DeepCopyInto(&out.ListMeta)
 	if in.Items != nil {
 		in, out := &in.Items, &out.Items
-		*out = make([]EtcdBackup, len(*in))
+		*out = make([]EtcdSnapshot, len(*in))
 		for i := range *in {
 			(*in)[i].DeepCopyInto(&(*out)[i])
 		}
 	}
 }
 
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new EtcdBackupList.
-func (in *EtcdBackupList) DeepCopy() *EtcdBackupList {
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new EtcdSnapshotList.
+func (in *EtcdSnapshotList) DeepCopy() *EtcdSnapshotList {
 	if in == nil {
 		return nil
 	}
-	out := new(EtcdBackupList)
+	out := new(EtcdSnapshotList)
 	in.DeepCopyInto(out)
 	return out
 }
 
 // DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *EtcdBackupList) DeepCopyObject() runtime.Object {
+func (in *EtcdSnapshotList) DeepCopyObject() runtime.Object {
 	if c := in.DeepCopy(); c != nil {
 		return c
 	}
@@ -222,24 +222,24 @@ func (in *EtcdBackupList) DeepCopyObject() runtime.Object {
 }
 
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *EtcdBackupSpec) DeepCopyInto(out *EtcdBackupSpec) {
+func (in *EtcdSnapshotSpec) DeepCopyInto(out *EtcdSnapshotSpec) {
 	*out = *in
 	out.ClusterRef = in.ClusterRef
 	in.Destination.DeepCopyInto(&out.Destination)
 }
 
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new EtcdBackupSpec.
-func (in *EtcdBackupSpec) DeepCopy() *EtcdBackupSpec {
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new EtcdSnapshotSpec.
+func (in *EtcdSnapshotSpec) DeepCopy() *EtcdSnapshotSpec {
 	if in == nil {
 		return nil
 	}
-	out := new(EtcdBackupSpec)
+	out := new(EtcdSnapshotSpec)
 	in.DeepCopyInto(out)
 	return out
 }
 
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *EtcdBackupStatus) DeepCopyInto(out *EtcdBackupStatus) {
+func (in *EtcdSnapshotStatus) DeepCopyInto(out *EtcdSnapshotStatus) {
 	*out = *in
 	if in.Conditions != nil {
 		in, out := &in.Conditions, &out.Conditions
@@ -248,34 +248,34 @@ func (in *EtcdBackupStatus) DeepCopyInto(out *EtcdBackupStatus) {
 			(*in)[i].DeepCopyInto(&(*out)[i])
 		}
 	}
-	if in.Snapshot != nil {
-		in, out := &in.Snapshot, &out.Snapshot
-		*out = new(EtcdBackupSnapshot)
+	if in.Artifact != nil {
+		in, out := &in.Artifact, &out.Artifact
+		*out = new(EtcdSnapshotArtifact)
 		**out = **in
 	}
 }
 
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *EtcdBackupSnapshot) DeepCopyInto(out *EtcdBackupSnapshot) {
+func (in *EtcdSnapshotArtifact) DeepCopyInto(out *EtcdSnapshotArtifact) {
 	*out = *in
 }
 
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new EtcdBackupSnapshot.
-func (in *EtcdBackupSnapshot) DeepCopy() *EtcdBackupSnapshot {
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new EtcdSnapshotArtifact.
+func (in *EtcdSnapshotArtifact) DeepCopy() *EtcdSnapshotArtifact {
 	if in == nil {
 		return nil
 	}
-	out := new(EtcdBackupSnapshot)
+	out := new(EtcdSnapshotArtifact)
 	in.DeepCopyInto(out)
 	return out
 }
 
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new EtcdBackupStatus.
-func (in *EtcdBackupStatus) DeepCopy() *EtcdBackupStatus {
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new EtcdSnapshotStatus.
+func (in *EtcdSnapshotStatus) DeepCopy() *EtcdSnapshotStatus {
 	if in == nil {
 		return nil
 	}
-	out := new(EtcdBackupStatus)
+	out := new(EtcdSnapshotStatus)
 	in.DeepCopyInto(out)
 	return out
 }
diff --git a/internal/backupcontroller/factory/backupjob_test.go b/internal/backupcontroller/factory/backupjob_test.go
index afe1f15581..ccfa3becb3 100644
--- a/internal/backupcontroller/factory/backupjob_test.go
+++ b/internal/backupcontroller/factory/backupjob_test.go
@@ -11,10 +11,10 @@ import (
 
 func TestBackupJob(t *testing.T) {
 	tests := []struct {
-		name     string
-		plan     *backupsv1alpha1.Plan
+		name      string
+		plan      *backupsv1alpha1.Plan
 		scheduled time.Time
-		validate func(*testing.T, *backupsv1alpha1.BackupJob)
+		validate  func(*testing.T, *backupsv1alpha1.BackupJob)
 	}{
 		{
 			name: "creates BackupJob with BackupClassName",
@@ -97,7 +97,7 @@ func TestBackupJob(t *testing.T) {
 				},
 				Spec: backupsv1alpha1.PlanSpec{
 					ApplicationRef: corev1.TypedLocalObjectReference{
-						APIGroup: stringPtr("custom.api.group.io"),
+						APIGroup: new("custom.api.group.io"),
 						Kind:     "CustomApp",
 						Name:     "custom1",
 					},
@@ -161,7 +161,3 @@ func TestBackupJob(t *testing.T) {
 		})
 	}
 }
-
-func stringPtr(s string) *string {
-	return &s
-}
diff --git a/internal/backupcontroller/foundationdbstrategy_controller.go b/internal/backupcontroller/foundationdbstrategy_controller.go
index 8231595d4c..146436077c 100644
--- a/internal/backupcontroller/foundationdbstrategy_controller.go
+++ b/internal/backupcontroller/foundationdbstrategy_controller.go
@@ -374,7 +374,7 @@ func (r *BackupJobReconciler) requeueWithReason(ctx context.Context, j *backupsv
 		Message: message,
 	}
 	apimeta.SetStatusCondition(&j.Status.Conditions, cond)
-	for attempt := 0; attempt < foundationdbStopConflictRetries; attempt++ {
+	for attempt := range foundationdbStopConflictRetries {
 		err := r.Status().Update(ctx, j)
 		if err == nil {
 			return ctrl.Result{RequeueAfter: foundationdbPollInterval}, nil
@@ -428,7 +428,6 @@ func (r *BackupJobReconciler) requeueWithReason(ctx context.Context, j *backupsv
 // Cleanup of the operator-side CR is therefore the framework's
 // responsibility, not Kubernetes ownerRef GC. See:
 //   - examples/backups/foundationdb/cleanup.sh (label-based reap),
-//   - hack/e2e-apps/backup-foundationdb.bats teardown(),
 //   - stopFoundationDBBackupForJob (deadline-expiry cleanup in this file).
 //
 // The `TestEnsureFoundationDBBackup_DoesNotSetOwnerReference` test pins
@@ -555,7 +554,7 @@ const foundationdbStopConflictRetries = 5
 // reached). The function mutates *b to the final observed state on
 // success.
 func (r *BackupJobReconciler) patchStopWithRetry(ctx context.Context, b *foundationdbtypes.FoundationDBBackup) error {
-	for attempt := 0; attempt < foundationdbStopConflictRetries; attempt++ {
+	for attempt := range foundationdbStopConflictRetries {
 		base := b.DeepCopy()
 		b.Spec.BackupState = foundationdbtypes.BackupStateStopped
 		err := r.Patch(ctx, b, client.MergeFrom(base))
@@ -1109,12 +1108,12 @@ func (r *RestoreJobReconciler) resolveFoundationDBRestoreTarget(restoreJob *back
 // future RestoreJob can reproduce them exactly when the operator-side
 // FoundationDBBackup CR has been pruned.
 type foundationdbBackupSnapshot struct {
-	Kind              string                                       `json:"kind"`
-	APIVersion        string                                       `json:"apiVersion"`
+	Kind              string                                         `json:"kind"`
+	APIVersion        string                                         `json:"apiVersion"`
 	Storage           strategyv1alpha1.FoundationDBBlobStoreTemplate `json:"storage"`
-	CustomParameters  []string                                     `json:"customParameters,omitempty"`
-	EncryptionKeyPath string                                       `json:"encryptionKeyPath,omitempty"`
-	Parameters        map[string]string                            `json:"parameters,omitempty"`
+	CustomParameters  []string                                       `json:"customParameters,omitempty"`
+	EncryptionKeyPath string                                         `json:"encryptionKeyPath,omitempty"`
+	Parameters        map[string]string                              `json:"parameters,omitempty"`
 }
 
 func marshalFoundationDBBackupSnapshot(
@@ -1192,7 +1191,7 @@ func renderFoundationDBTemplate(t strategyv1alpha1.FoundationDBTemplate, app *fo
 	if err != nil {
 		return nil, fmt.Errorf("encode application for templating: %w", err)
 	}
-	templateContext := map[string]interface{}{
+	templateContext := map[string]any{
 		"Application": appAsMap,
 		"Parameters":  parameters,
 	}
@@ -1202,12 +1201,12 @@ func renderFoundationDBTemplate(t strategyv1alpha1.FoundationDBTemplate, app *fo
 // toJSONMapFoundationDB converts a typed object to a generic map via JSON
 // tags so user-authored go-templates address fields by their JSON names
 // (e.g. .Application.metadata.name).
-func toJSONMapFoundationDB(obj interface{}) (map[string]interface{}, error) {
+func toJSONMapFoundationDB(obj any) (map[string]any, error) {
 	raw, err := json.Marshal(obj)
 	if err != nil {
 		return nil, err
 	}
-	out := map[string]interface{}{}
+	out := map[string]any{}
 	if err := json.Unmarshal(raw, &out); err != nil {
 		return nil, err
 	}
diff --git a/internal/backupcontroller/jobstrategy_controller.go b/internal/backupcontroller/jobstrategy_controller.go
index e15a0ed5ee..594a2f2b11 100644
--- a/internal/backupcontroller/jobstrategy_controller.go
+++ b/internal/backupcontroller/jobstrategy_controller.go
@@ -4,6 +4,7 @@ package backupcontroller
 import (
 	"context"
 	"fmt"
+	"maps"
 	"strings"
 	"time"
 
@@ -76,12 +77,12 @@ func jobStrategyParameters(b *backupsv1alpha1.Backup) map[string]string {
 // renderFoundationDBTemplate convention).
 func renderJobTemplate(
 	tmpl corev1.PodTemplateSpec,
-	app map[string]interface{},
+	app map[string]any,
 	releaseName, releaseNamespace, mode string,
 	parameters map[string]string,
 	backup *backupsv1alpha1.Backup,
 ) (*corev1.PodTemplateSpec, error) {
-	ctxMap := map[string]interface{}{
+	ctxMap := map[string]any{
 		"Application": app,
 		"Release": map[string]string{
 			"Name":      releaseName,
@@ -99,7 +100,7 @@ func renderJobTemplate(
 		if backup.Spec.ApplicationRef.APIGroup != nil {
 			sourceAPIGroup = *backup.Spec.ApplicationRef.APIGroup
 		}
-		ctxMap["Backup"] = map[string]interface{}{
+		ctxMap["Backup"] = map[string]any{
 			"Name":      backup.Name,
 			"Namespace": backup.Namespace,
 			"ApplicationRef": map[string]string{
@@ -274,9 +275,7 @@ func (r *BackupJobReconciler) ensureJobStrategyJob(
 	}
 
 	labels := map[string]string{jobStrategyLabelMode: mode}
-	for k, v := range ownerLabels {
-		labels[k] = v
-	}
+	maps.Copy(labels, ownerLabels)
 
 	desired := buildJobStrategyBatchJob(namespace, name, labels, rendered)
 	if err := controllerutil.SetControllerReference(owner, desired, r.Scheme); err != nil {
@@ -306,9 +305,7 @@ func buildJobStrategyBatchJob(namespace, name string, labels map[string]string,
 	if pod.Labels == nil {
 		pod.Labels = map[string]string{}
 	}
-	for k, v := range labels {
-		pod.Labels[k] = v
-	}
+	maps.Copy(pod.Labels, labels)
 	// backoffLimit is fixed at 2 (inherited from the Altinity driver). For an
 	// app-agnostic driver this is a footgun - an S3-heavy dump may want 0
 	// retries while a sidecar wants more - so making it operator-configurable
@@ -419,7 +416,7 @@ func (r *RestoreJobReconciler) reconcileJobRestore(ctx context.Context, restoreJ
 		}
 	}
 	targetRef := corev1.TypedLocalObjectReference{
-		APIGroup: stringPtr(targetAPIGroup),
+		APIGroup: new(targetAPIGroup),
 		Kind:     targetAppKind,
 		Name:     targetAppName,
 	}
@@ -544,9 +541,7 @@ func (r *RestoreJobReconciler) ensureJobStrategyRestoreJob(
 	}
 
 	labels := map[string]string{jobStrategyLabelMode: mode}
-	for k, v := range ownerLabels {
-		labels[k] = v
-	}
+	maps.Copy(labels, ownerLabels)
 
 	desired := buildJobStrategyBatchJob(namespace, name, labels, rendered)
 	if err := controllerutil.SetControllerReference(owner, desired, r.Scheme); err != nil {
diff --git a/internal/backupcontroller/jobstrategy_controller_test.go b/internal/backupcontroller/jobstrategy_controller_test.go
index a0b52ca046..09ce1d8467 100644
--- a/internal/backupcontroller/jobstrategy_controller_test.go
+++ b/internal/backupcontroller/jobstrategy_controller_test.go
@@ -52,7 +52,7 @@ func newJobStrategyApp(name, namespace string) *unstructured.Unstructured {
 
 func newJobStrategyAppRef(name string) corev1.TypedLocalObjectReference {
 	return corev1.TypedLocalObjectReference{
-		APIGroup: stringPtr(backupsv1alpha1.DefaultApplicationAPIGroup),
+		APIGroup: new(backupsv1alpha1.DefaultApplicationAPIGroup),
 		Kind:     jobStrategyTestKind,
 		Name:     name,
 	}
@@ -91,18 +91,18 @@ func newJobStrategyTestEnv(t *testing.T, app *unstructured.Unstructured, builder
 		Build()
 
 	return &BackupJobReconciler{
-			Client:     c,
-			Interface:  dynamicClient,
-			RESTMapper: restMapper,
-			Scheme:     testScheme,
-			Recorder:   record.NewFakeRecorder(10),
-		}, &RestoreJobReconciler{
-			Client:     c,
-			Interface:  dynamicClient,
-			RESTMapper: restMapper,
-			Scheme:     testScheme,
-			Recorder:   record.NewFakeRecorder(10),
-		}
+		Client:     c,
+		Interface:  dynamicClient,
+		RESTMapper: restMapper,
+		Scheme:     testScheme,
+		Recorder:   record.NewFakeRecorder(10),
+	}, &RestoreJobReconciler{
+		Client:     c,
+		Interface:  dynamicClient,
+		RESTMapper: restMapper,
+		Scheme:     testScheme,
+		Recorder:   record.NewFakeRecorder(10),
+	}
 }
 
 // newJobStrategy returns a Job strategy whose template exercises every key the
@@ -134,7 +134,7 @@ func newJobStrategy(name string) *strategyv1alpha1.Job {
 func newJobStrategyResolved(strategyName string, params map[string]string) *ResolvedBackupConfig {
 	return &ResolvedBackupConfig{
 		StrategyRef: corev1.TypedLocalObjectReference{
-			APIGroup: stringPtr(strategyv1alpha1.GroupVersion.Group),
+			APIGroup: new(strategyv1alpha1.GroupVersion.Group),
 			Kind:     strategyv1alpha1.JobStrategyKind,
 			Name:     strategyName,
 		},
@@ -400,7 +400,7 @@ func TestReconcileJobRestore_CreatesBatchJobInTargetNamespace(t *testing.T) {
 		Spec: backupsv1alpha1.BackupSpec{
 			ApplicationRef: newJobStrategyAppRef("app-test"),
 			StrategyRef: corev1.TypedLocalObjectReference{
-				APIGroup: stringPtr(strategyv1alpha1.GroupVersion.Group),
+				APIGroup: new(strategyv1alpha1.GroupVersion.Group),
 				Kind:     strategyv1alpha1.JobStrategyKind,
 				Name:     "generic-strategy",
 			},
@@ -413,7 +413,7 @@ func TestReconcileJobRestore_CreatesBatchJobInTargetNamespace(t *testing.T) {
 		Spec: backupsv1alpha1.RestoreJobSpec{
 			BackupRef: corev1.LocalObjectReference{Name: backup.Name},
 			TargetApplicationRef: &corev1.TypedLocalObjectReference{
-				APIGroup: stringPtr(backupsv1alpha1.DefaultApplicationAPIGroup),
+				APIGroup: new(backupsv1alpha1.DefaultApplicationAPIGroup),
 				Kind:     jobStrategyTestKind,
 				Name:     "app-restore",
 			},
@@ -464,7 +464,7 @@ func TestReconcileJobRestore_CompletesSucceeds(t *testing.T) {
 		Spec: backupsv1alpha1.BackupSpec{
 			ApplicationRef: newJobStrategyAppRef("app-test"),
 			StrategyRef: corev1.TypedLocalObjectReference{
-				APIGroup: stringPtr(strategyv1alpha1.GroupVersion.Group),
+				APIGroup: new(strategyv1alpha1.GroupVersion.Group),
 				Kind:     strategyv1alpha1.JobStrategyKind,
 				Name:     "generic-strategy",
 			},
@@ -607,7 +607,7 @@ func TestReconcileJobRestore_FailsOnUnmappableTargetKind(t *testing.T) {
 		Spec: backupsv1alpha1.BackupSpec{
 			ApplicationRef: newJobStrategyAppRef("app-test"),
 			StrategyRef: corev1.TypedLocalObjectReference{
-				APIGroup: stringPtr(strategyv1alpha1.GroupVersion.Group),
+				APIGroup: new(strategyv1alpha1.GroupVersion.Group),
 				Kind:     strategyv1alpha1.JobStrategyKind,
 				Name:     "generic-strategy",
 			},
diff --git a/internal/backupcontroller/kafkastrategy_controller.go b/internal/backupcontroller/kafkastrategy_controller.go
new file mode 100644
index 0000000000..70f594d655
--- /dev/null
+++ b/internal/backupcontroller/kafkastrategy_controller.go
@@ -0,0 +1,945 @@
+// SPDX-License-Identifier: Apache-2.0
+package backupcontroller
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"maps"
+	"strings"
+	"time"
+
+	batchv1 "k8s.io/api/batch/v1"
+	corev1 "k8s.io/api/core/v1"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	apimeta "k8s.io/apimachinery/pkg/api/meta"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/types"
+	ctrl "sigs.k8s.io/controller-runtime"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
+
+	strategyv1alpha1 "github.com/cozystack/cozystack/api/backups/strategy/v1alpha1"
+	backupsv1alpha1 "github.com/cozystack/cozystack/api/backups/v1alpha1"
+	"github.com/cozystack/cozystack/internal/backupcontroller/kafkatypes"
+	"github.com/cozystack/cozystack/internal/template"
+)
+
+// The Kafka strategy is a typed variant of the generic Job strategy for the
+// topic METADATA of a Cozystack Kafka application: the driver renders
+// spec.template into a one-shot batch/v1.Job that talks to the Kafka Admin API
+// (export topic definitions + configs on backup, recreate them on restore).
+// It adds three things on top of the Job strategy's render-a-Job flow: an
+// applicationRef Kind gate, a Ready precondition on the Strimzi Kafka cluster,
+// and a per-run object key via .BackupName + ArtifactURITemplate.
+
+const (
+	kafkaStrategyLabelMode   = "kafka.strategy.backups.cozystack.io/mode"
+	kafkaStrategyModeBackup  = "backup"
+	kafkaStrategyModeRestore = "restore"
+	kafkaStrategyModeCleanup = "cleanup"
+
+	// kafkaSkipArtifactCleanupAnnotation, set to "true" on a Backup, releases it
+	// without deleting (or waiting to delete) its S3 object - the operator escape
+	// hatch for a Backup left Terminating because object storage is unreachable.
+	// Shares the platform-wide key with the RabbitMQ driver's identical hatch.
+	kafkaSkipArtifactCleanupAnnotation = "backups.cozystack.io/skip-artifact-cleanup"
+
+	// Round-trips BackupClass parameters through the Backup's DriverMetadata so
+	// a later RestoreJob re-renders with the backup-time values.
+	kafkaStrategyParamPrefix = "kafka.strategy.backups.cozystack.io/parameter/"
+
+	// Stamped on every produced Backup so `kubectl describe backup` and any
+	// consumer make the narrow scope explicit: this strategy captures topic
+	// definitions/configs, not message data, offsets, ACLs or users.
+	kafkaScopeKey   = "strategy.backups.cozystack.io/scope"
+	kafkaScopeValue = "topic-metadata"
+
+	kafkaStrategyPollInterval = 5 * time.Second
+
+	// Default wall-clock bound, used for two things: the Ready-precondition wait
+	// (controller-timed, before any Job exists) and the run itself (the Job's
+	// activeDeadlineSeconds). Export time scales with topic count, so operators
+	// whose cluster legitimately runs past this raise it per BackupClass with the
+	// kafkaBackupTimeoutParam parameter rather than being capped at a fixed value.
+	kafkaDefaultBackupDeadline = 30 * time.Minute
+
+	// Floor for an operator-supplied backupTimeout: a value below this (or an
+	// unparseable one) falls back to kafkaDefaultBackupDeadline, so a typo cannot
+	// wedge every run at a near-zero deadline.
+	kafkaMinBackupDeadline = time.Minute
+
+	// BackupClass parameter overriding the wall-clock deadline (a Go duration
+	// string, e.g. "2h"). It round-trips through the Backup's DriverMetadata like
+	// every other parameter, so a restore is bounded by the same value.
+	kafkaBackupTimeoutParam = "backupTimeout"
+
+	// The Cozystack chart names the Strimzi Kafka cluster "kafka-<app>".
+	kafkaClusterNamePrefix = "kafka-"
+
+	kafkaApplicationKind = "Kafka"
+
+	// The Strimzi cluster-operator stamps every pod of a Kafka cluster with the
+	// cluster name; a broker pod carries a container named "kafka". The driver
+	// resolves the client image from a live broker instead of a pinned value, so
+	// the Admin-API CLI it runs always matches the broker it talks to (any Kafka
+	// version the operator provisions, not only the chart default).
+	kafkaBrokerClusterLabel  = "strimzi.io/cluster"
+	kafkaBrokerContainerName = "kafka"
+
+	// kafkaStrategyClientImageKey records, on the produced Backup, the broker
+	// image the backup Job ran. Cleanup reuses it to run the S3 delete once the
+	// source cluster (and its brokers) may be gone and no broker is left to
+	// resolve an image from; the image itself still resolves in the registry.
+	kafkaStrategyClientImageKey = "kafka.strategy.backups.cozystack.io/client-image"
+)
+
+// kafkaClusterName maps an apps.cozystack.io/Kafka name to the Strimzi Kafka
+// cluster CR name the chart creates.
+func kafkaClusterName(appName string) string {
+	return kafkaClusterNamePrefix + appName
+}
+
+// validateKafkaApplicationRef enforces that the driver only ever acts on an
+// apps.cozystack.io/Kafka application.
+func validateKafkaApplicationRef(ref corev1.TypedLocalObjectReference) error {
+	if ref.Kind != kafkaApplicationKind {
+		return fmt.Errorf("Kafka strategy only supports applicationRef.kind=%q, got %q", kafkaApplicationKind, ref.Kind)
+	}
+	if ref.APIGroup != nil && *ref.APIGroup != "" && *ref.APIGroup != backupsv1alpha1.DefaultApplicationAPIGroup {
+		return fmt.Errorf("Kafka strategy only supports applicationRef.apiGroup=%q, got %q", backupsv1alpha1.DefaultApplicationAPIGroup, *ref.APIGroup)
+	}
+	return nil
+}
+
+// kafkaNotReadyMessage returns "" when the cluster reports Ready=True, otherwise
+// a legible reason for the BackupJob/RestoreJob precondition.
+func kafkaNotReadyMessage(cluster *kafkatypes.Kafka) string {
+	cond := apimeta.FindStatusCondition(cluster.Status.Conditions, kafkatypes.ConditionTypeReady)
+	if cond == nil {
+		return fmt.Sprintf("Kafka cluster %s has no Ready condition yet", cluster.Name)
+	}
+	if cond.Status == metav1.ConditionTrue {
+		return ""
+	}
+	msg := fmt.Sprintf("Kafka cluster %s is Ready=%s", cluster.Name, cond.Status)
+	if cond.Message != "" {
+		msg += ": " + cond.Message
+	}
+	return msg
+}
+
+// kafkaStrategyParameters extracts the round-tripped BackupClass parameters from
+// a Backup's DriverMetadata. Mirrors jobStrategyParameters.
+func kafkaStrategyParameters(b *backupsv1alpha1.Backup) map[string]string {
+	out := map[string]string{}
+	for k, v := range b.Spec.DriverMetadata {
+		if !strings.HasPrefix(k, kafkaStrategyParamPrefix) {
+			continue
+		}
+		paramKey := strings.TrimPrefix(k, kafkaStrategyParamPrefix)
+		if paramKey == "" {
+			continue
+		}
+		out[paramKey] = v
+	}
+	return out
+}
+
+// kafkaRunDeadline resolves the wall-clock bound for a run from its parameters,
+// falling back to kafkaDefaultBackupDeadline when unset, unparseable, or below
+// the floor. When a backupTimeout is set but rejected, the second return value is
+// a message naming the rejected value and the deadline actually applied, so the
+// silent fallback becomes a Warning Event the caller records; it is empty when the
+// value is honoured or unset.
+func kafkaRunDeadline(parameters map[string]string) (time.Duration, string) {
+	v := parameters[kafkaBackupTimeoutParam]
+	if v == "" {
+		return kafkaDefaultBackupDeadline, ""
+	}
+	d, err := time.ParseDuration(v)
+	switch {
+	case err != nil:
+		return kafkaDefaultBackupDeadline, fmt.Sprintf("backupTimeout %q is not a valid Go duration; applying the default %s", v, kafkaDefaultBackupDeadline)
+	case d < kafkaMinBackupDeadline:
+		return kafkaDefaultBackupDeadline, fmt.Sprintf("backupTimeout %q is below the %s floor; applying the default %s", v, kafkaMinBackupDeadline, kafkaDefaultBackupDeadline)
+	default:
+		return d, ""
+	}
+}
+
+// kafkaRenderContext builds the template context. Unlike the Job strategy it
+// carries .BackupName (the per-run identity) so the strategy can scope the S3
+// object key and a restore reads the exact object its Backup wrote.
+func kafkaRenderContext(
+	app map[string]any,
+	releaseName, releaseNamespace, mode, backupName, artifactURI, clientImage string,
+	parameters map[string]string,
+	backup *backupsv1alpha1.Backup,
+) map[string]any {
+	ctxMap := map[string]any{
+		"Application": app,
+		"Release": map[string]string{
+			"Name":      releaseName,
+			"Namespace": releaseNamespace,
+		},
+		"Mode":       mode,
+		"BackupName": backupName,
+		// ClientImage is the container image the rendered Job runs. The chart
+		// leaves the strategy template's image as the placeholder "{{ .ClientImage }}"
+		// and the driver fills it with the target Kafka broker's own image, so the
+		// Admin-API CLI version always matches the broker.
+		"ClientImage": clientImage,
+		// ArtifactURI is the single source of truth for the stored object's
+		// location. On backup it is the rendered artifactURITemplate (also
+		// recorded on the Backup); on restore and cleanup it is that recorded
+		// value read back from the Backup, so both act on the exact object the
+		// backup wrote and a later key-layout change cannot orphan old backups.
+		"ArtifactURI": artifactURI,
+		"Parameters":  parameters,
+	}
+	if backup != nil {
+		sourceAPIGroup := ""
+		if backup.Spec.ApplicationRef.APIGroup != nil {
+			sourceAPIGroup = *backup.Spec.ApplicationRef.APIGroup
+		}
+		ctxMap["Backup"] = map[string]any{
+			"Name":      backup.Name,
+			"Namespace": backup.Namespace,
+			"ApplicationRef": map[string]string{
+				"APIGroup": sourceAPIGroup,
+				"Kind":     backup.Spec.ApplicationRef.Kind,
+				"Name":     backup.Spec.ApplicationRef.Name,
+			},
+		}
+	}
+	return ctxMap
+}
+
+func renderKafkaTemplate(tmpl corev1.PodTemplateSpec, ctxMap map[string]any) (*corev1.PodTemplateSpec, error) {
+	return template.Template(&tmpl, ctxMap)
+}
+
+// renderKafkaArtifactURI renders the strategy's ArtifactURITemplate against the
+// same context, surfacing template errors so a broken URI fails the backup
+// rather than recording a half-rendered location.
+func renderKafkaArtifactURI(tmplStr string, ctxMap map[string]any) (string, error) {
+	uri, err := template.String(tmplStr, ctxMap)
+	if err != nil {
+		return "", fmt.Errorf("artifact URI template: %w", err)
+	}
+	return strings.TrimSpace(uri), nil
+}
+
+// errNoKafkaBroker distinguishes "the cluster is Ready but no broker pod is
+// listable" (terminal - the callers gate on Ready first) from a transient List
+// error, which the caller requeues instead of failing the whole run.
+var errNoKafkaBroker = errors.New("no Kafka broker pod to resolve the client image from")
+
+// resolveKafkaBrokerImage returns the container image of a running broker of the
+// Strimzi Kafka cluster, so the backup/restore Job runs the exact Admin-API CLI
+// the broker ships rather than a separately pinned guess that drifts from it.
+// Callers gate on the cluster being Ready first, so at least one broker pod
+// exists; an empty result is a hard error, never a silent fallback.
+func resolveKafkaBrokerImage(ctx context.Context, c client.Client, namespace, clusterName string) (string, error) {
+	pods := &corev1.PodList{}
+	if err := c.List(ctx, pods, client.InNamespace(namespace),
+		client.MatchingLabels{kafkaBrokerClusterLabel: clusterName}); err != nil {
+		return "", err
+	}
+	for i := range pods.Items {
+		for _, ct := range pods.Items[i].Spec.Containers {
+			if ct.Name == kafkaBrokerContainerName && ct.Image != "" {
+				return ct.Image, nil
+			}
+		}
+	}
+	return "", fmt.Errorf("%w (looked for a %q container in cluster %s/%s)", errNoKafkaBroker, kafkaBrokerContainerName, namespace, clusterName)
+}
+
+// ---------------------------------------------------------------------------
+// BackupJob path
+// ---------------------------------------------------------------------------
+
+func (r *BackupJobReconciler) reconcileKafka(ctx context.Context, j *backupsv1alpha1.BackupJob, resolved *ResolvedBackupConfig) (ctrl.Result, error) {
+	logger := getLogger(ctx)
+	logger.Debug("reconciling Kafka strategy", "backupjob", j.Name, "phase", j.Status.Phase)
+
+	if j.Status.Phase == backupsv1alpha1.BackupJobPhaseSucceeded ||
+		j.Status.Phase == backupsv1alpha1.BackupJobPhaseFailed {
+		return ctrl.Result{}, nil
+	}
+
+	if err := validateKafkaApplicationRef(j.Spec.ApplicationRef); err != nil {
+		return r.markBackupJobFailed(ctx, j, err.Error())
+	}
+
+	deadline, deadlineWarn := kafkaRunDeadline(resolved.Parameters)
+	if deadlineWarn != "" && r.Recorder != nil {
+		r.Recorder.Event(j, corev1.EventTypeWarning, "BackupTimeoutInvalid", deadlineWarn)
+	}
+
+	// First-reconcile bookkeeping (refetch guards against a stale informer
+	// sliding StartedAt forward). Mirrors reconcileJob.
+	if j.Status.StartedAt == nil {
+		fresh := &backupsv1alpha1.BackupJob{}
+		if err := r.Get(ctx, types.NamespacedName{Namespace: j.Namespace, Name: j.Name}, fresh); err != nil {
+			return ctrl.Result{}, err
+		}
+		if fresh.Status.StartedAt != nil {
+			j.Status.StartedAt = fresh.Status.StartedAt
+			j.Status.Phase = fresh.Status.Phase
+		} else {
+			base := fresh.DeepCopy()
+			now := metav1.Now()
+			fresh.Status.StartedAt = &now
+			fresh.Status.Phase = backupsv1alpha1.BackupJobPhaseRunning
+			if err := r.Status().Patch(ctx, fresh, client.MergeFrom(base)); err != nil {
+				return ctrl.Result{}, err
+			}
+			return ctrl.Result{RequeueAfter: kafkaStrategyPollInterval}, nil
+		}
+	}
+
+	strategy := &strategyv1alpha1.Kafka{}
+	if err := r.Get(ctx, client.ObjectKey{Name: resolved.StrategyRef.Name}, strategy); err != nil {
+		if apierrors.IsNotFound(err) {
+			return r.requeueStrategyNotReady(ctx, j, resolved.StrategyRef.Name)
+		}
+		return ctrl.Result{}, err
+	}
+
+	app, err := r.getApplicationUnstructured(ctx, j.Namespace, j.Spec.ApplicationRef)
+	if err != nil {
+		if apierrors.IsNotFound(err) || apimeta.IsNoMatchError(err) {
+			return r.markBackupJobFailed(ctx, j, fmt.Sprintf("application not found or kind not registered: %s/%s (kind=%q)", j.Namespace, j.Spec.ApplicationRef.Name, j.Spec.ApplicationRef.Kind))
+		}
+		return ctrl.Result{}, err
+	}
+
+	// Ready precondition on the Strimzi Kafka cluster: the Admin API is only
+	// reachable once it is up. Deadline-gate the wait so a cluster that never
+	// becomes Ready fails legibly.
+	appName := j.Spec.ApplicationRef.Name
+	cluster := &kafkatypes.Kafka{}
+	clusterErr := r.Get(ctx, types.NamespacedName{Namespace: j.Namespace, Name: kafkaClusterName(appName)}, cluster)
+	if clusterErr != nil {
+		if !apierrors.IsNotFound(clusterErr) {
+			return ctrl.Result{}, clusterErr
+		}
+		return r.kafkaBackupNotReady(ctx, j, deadline, "KafkaClusterNotReady",
+			fmt.Sprintf("Kafka cluster %s not found yet", kafkaClusterName(appName)))
+	}
+	if msg := kafkaNotReadyMessage(cluster); msg != "" {
+		return r.kafkaBackupNotReady(ctx, j, deadline, "KafkaClusterNotReady", msg)
+	}
+
+	// Run the exact CLI the broker ships by resolving its image now that the
+	// cluster is Ready (so a broker pod exists), rather than from a chart pin that
+	// drifts from the broker version. A transient List error requeues; only a
+	// Ready cluster with no listable broker is terminal.
+	clientImage, err := resolveKafkaBrokerImage(ctx, r.Client, j.Namespace, kafkaClusterName(appName))
+	if err != nil {
+		if errors.Is(err, errNoKafkaBroker) {
+			return r.markBackupJobFailed(ctx, j, fmt.Sprintf("cannot resolve Kafka client image: %v", err))
+		}
+		return ctrl.Result{}, err
+	}
+
+	// The artifact URI is the single source of truth for where the export is
+	// stored: render it once, inject it into the Job (which writes exactly that
+	// object), and record the same value on the Backup so restore/cleanup act on
+	// it rather than reconstructing a key a later layout change could orphan.
+	if strategy.Spec.ArtifactURITemplate == "" {
+		return r.markBackupJobFailed(ctx, j, "Kafka strategy has no spec.artifactURITemplate; nothing records where the export is stored")
+	}
+	artifactURI, err := renderKafkaArtifactURI(strategy.Spec.ArtifactURITemplate,
+		kafkaRenderContext(app, appName, j.Namespace, kafkaStrategyModeBackup, j.Name, "", clientImage, resolved.Parameters, nil))
+	if err != nil {
+		return r.markBackupJobFailed(ctx, j, fmt.Sprintf("failed to render Kafka strategy artifact URI: %v", err))
+	}
+	ctxMap := kafkaRenderContext(app, appName, j.Namespace, kafkaStrategyModeBackup, j.Name, artifactURI, clientImage, resolved.Parameters, nil)
+	rendered, err := renderKafkaTemplate(strategy.Spec.Template, ctxMap)
+	if err != nil {
+		return r.markBackupJobFailed(ctx, j, fmt.Sprintf("failed to template Kafka strategy: %v", err))
+	}
+
+	batchJob, err := r.ensureKafkaJob(ctx, j, j.Namespace, jobNameForBackupJob(j),
+		kafkaStrategyModeBackup, deadline,
+		map[string]string{
+			backupsv1alpha1.OwningJobNameLabel:      j.Name,
+			backupsv1alpha1.OwningJobNamespaceLabel: j.Namespace,
+		},
+		rendered,
+	)
+	if err != nil {
+		return r.markBackupJobFailed(ctx, j, fmt.Sprintf("failed to ensure batch/v1.Job: %v", err))
+	}
+
+	switch jobConditionState(batchJob) {
+	case batchv1.JobComplete:
+		if j.Status.BackupRef != nil {
+			return ctrl.Result{}, nil
+		}
+		artifact, err := r.createKafkaBackupArtifact(ctx, j, resolved, artifactURI, clientImage)
+		if err != nil {
+			return r.markBackupJobFailed(ctx, j, fmt.Sprintf("failed to create Backup artifact: %v", err))
+		}
+		now := metav1.Now()
+		j.Status.BackupRef = &corev1.LocalObjectReference{Name: artifact.Name}
+		j.Status.CompletedAt = &now
+		j.Status.Phase = backupsv1alpha1.BackupJobPhaseSucceeded
+		apimeta.SetStatusCondition(&j.Status.Conditions, metav1.Condition{
+			Type:    "Ready",
+			Status:  metav1.ConditionTrue,
+			Reason:  "BackupCompleted",
+			Message: "Kafka topic-metadata backup completed (topic definitions and configs only; no message data, offsets, ACLs or users)",
+		})
+		if err := r.Status().Update(ctx, j); err != nil {
+			return ctrl.Result{}, err
+		}
+		return ctrl.Result{}, nil
+
+	case batchv1.JobFailed:
+		message := jobFailureMessage(batchJob)
+		if message == "" {
+			message = "Kafka metadata backup Job reported Failed"
+		}
+		return r.markBackupJobFailed(ctx, j, message)
+
+	default:
+		// The Job carries activeDeadlineSeconds (set in ensureKafkaJob), so a run
+		// that never completes - an unschedulable pod or a wedged export - is
+		// failed by Kubernetes as DeadlineExceeded and lands in the JobFailed
+		// branch above; the pod is killed before the script's final upload, so no
+		// object is left orphaned. Here we only poll while it makes progress.
+		return ctrl.Result{RequeueAfter: kafkaStrategyPollInterval}, nil
+	}
+}
+
+// kafkaBackupNotReady surfaces a precise Ready=False on the BackupJob and
+// requeues, or fails once the deadline since StartedAt is exceeded.
+func (r *BackupJobReconciler) kafkaBackupNotReady(ctx context.Context, j *backupsv1alpha1.BackupJob, deadline time.Duration, reason, message string) (ctrl.Result, error) {
+	if j.Status.StartedAt != nil && time.Since(j.Status.StartedAt.Time) > deadline {
+		return r.markBackupJobFailed(ctx, j, fmt.Sprintf("timed out waiting for Kafka cluster to become Ready: %s", message))
+	}
+	apimeta.SetStatusCondition(&j.Status.Conditions, metav1.Condition{
+		Type:    "Ready",
+		Status:  metav1.ConditionFalse,
+		Reason:  reason,
+		Message: message,
+	})
+	if err := r.Status().Update(ctx, j); err != nil {
+		return ctrl.Result{}, err
+	}
+	return ctrl.Result{RequeueAfter: kafkaStrategyPollInterval}, nil
+}
+
+func (r *BackupJobReconciler) ensureKafkaJob(
+	ctx context.Context,
+	owner client.Object,
+	namespace, name, mode string,
+	deadline time.Duration,
+	ownerLabels map[string]string,
+	rendered *corev1.PodTemplateSpec,
+) (*batchv1.Job, error) {
+	existing := &batchv1.Job{}
+	err := r.Get(ctx, types.NamespacedName{Namespace: namespace, Name: name}, existing)
+	if err == nil {
+		return existing, nil
+	}
+	if !apierrors.IsNotFound(err) {
+		return nil, err
+	}
+
+	labels := map[string]string{kafkaStrategyLabelMode: mode}
+	maps.Copy(labels, ownerLabels)
+
+	desired := buildJobStrategyBatchJob(namespace, name, labels, rendered)
+	// Bound the run at the Job layer: Kubernetes fails an unschedulable or wedged
+	// Job as DeadlineExceeded and kills its pod before the script's final upload,
+	// so a timed-out run cannot both leave the BackupJob terminal and go on to
+	// write an object no Backup ever references.
+	setKafkaJobDeadline(desired, deadline)
+	if err := controllerutil.SetControllerReference(owner, desired, r.Scheme); err != nil {
+		return nil, fmt.Errorf("set controller reference on backup Job: %w", err)
+	}
+	if err := r.Create(ctx, desired); err != nil {
+		if apierrors.IsAlreadyExists(err) {
+			if err := r.Get(ctx, types.NamespacedName{Namespace: namespace, Name: name}, existing); err != nil {
+				return nil, err
+			}
+			return existing, nil
+		}
+		return nil, err
+	}
+	return desired, nil
+}
+
+func (r *BackupJobReconciler) createKafkaBackupArtifact(
+	ctx context.Context,
+	j *backupsv1alpha1.BackupJob,
+	resolved *ResolvedBackupConfig,
+	artifactURI, clientImage string,
+) (*backupsv1alpha1.Backup, error) {
+	driverMD := map[string]string{kafkaScopeKey: kafkaScopeValue}
+	for k, v := range resolved.Parameters {
+		driverMD[kafkaStrategyParamPrefix+k] = v
+	}
+	// Record the broker image this backup ran so cleanup can reuse it once the
+	// source cluster is gone (no broker left to resolve one from).
+	if clientImage != "" {
+		driverMD[kafkaStrategyClientImageKey] = clientImage
+	}
+
+	backup := &backupsv1alpha1.Backup{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      j.Name,
+			Namespace: j.Namespace,
+		},
+		Spec: backupsv1alpha1.BackupSpec{
+			ApplicationRef: j.Spec.ApplicationRef,
+			StrategyRef:    resolved.StrategyRef,
+			TakenAt:        metav1.Now(),
+			DriverMetadata: driverMD,
+		},
+		Status: backupsv1alpha1.BackupStatus{
+			Phase: backupsv1alpha1.BackupPhaseReady,
+		},
+	}
+	if artifactURI != "" {
+		backup.Status.Artifact = &backupsv1alpha1.BackupArtifact{URI: artifactURI}
+	}
+	if j.Spec.PlanRef != nil {
+		backup.Spec.PlanRef = j.Spec.PlanRef
+	}
+	if err := r.Create(ctx, backup); err != nil {
+		if !apierrors.IsAlreadyExists(err) {
+			return nil, err
+		}
+		existing := &backupsv1alpha1.Backup{}
+		if getErr := r.Get(ctx, types.NamespacedName{Namespace: backup.Namespace, Name: backup.Name}, existing); getErr != nil {
+			return nil, getErr
+		}
+		// Adopt an existing Backup only when it describes the same application.
+		// A retained Backup whose BackupJob was reaped, then reused for a
+		// different application of the same name, would otherwise be reported as
+		// this run's success while describing something else (mirrors the
+		// RabbitMQ driver's guard).
+		if existing.Spec.ApplicationRef.Kind != backup.Spec.ApplicationRef.Kind ||
+			existing.Spec.ApplicationRef.Name != backup.Spec.ApplicationRef.Name {
+			return nil, fmt.Errorf("Backup %s/%s already exists for a different application (%s/%s, not %s/%s)",
+				backup.Namespace, backup.Name,
+				existing.Spec.ApplicationRef.Kind, existing.Spec.ApplicationRef.Name,
+				backup.Spec.ApplicationRef.Kind, backup.Spec.ApplicationRef.Name)
+		}
+		return existing, nil
+	}
+	return backup, nil
+}
+
+// ---------------------------------------------------------------------------
+// RestoreJob path
+// ---------------------------------------------------------------------------
+
+func (r *RestoreJobReconciler) reconcileKafkaRestore(ctx context.Context, restoreJob *backupsv1alpha1.RestoreJob, backup *backupsv1alpha1.Backup) (ctrl.Result, error) {
+	logger := getLogger(ctx)
+	logger.Debug("reconciling Kafka restore", "restorejob", restoreJob.Name, "backup", backup.Name)
+
+	if restoreJob.Status.Phase == backupsv1alpha1.RestoreJobPhaseSucceeded ||
+		restoreJob.Status.Phase == backupsv1alpha1.RestoreJobPhaseFailed {
+		return ctrl.Result{}, nil
+	}
+
+	if err := validateKafkaApplicationRef(backup.Spec.ApplicationRef); err != nil {
+		return r.markRestoreJobFailed(ctx, restoreJob, err.Error())
+	}
+
+	// The deadline round-trips from backup time via the Backup's parameters, so a
+	// restore is bounded by the same value the operator set for the backup.
+	deadline, deadlineWarn := kafkaRunDeadline(kafkaStrategyParameters(backup))
+	if deadlineWarn != "" && r.Recorder != nil {
+		r.Recorder.Event(restoreJob, corev1.EventTypeWarning, "BackupTimeoutInvalid", deadlineWarn)
+	}
+
+	// A Backup with no recorded object can never restore; fail fast, before the
+	// readiness gate, so it does not wait out the whole deadline and then report a
+	// misleading "timed out waiting for Kafka cluster to become Ready".
+	if backup.Status.Artifact == nil || backup.Status.Artifact.URI == "" {
+		return r.markRestoreJobFailed(ctx, restoreJob, "Backup has no recorded artifact URI (status.artifact.uri); cannot locate the metadata object to restore")
+	}
+
+	// Resolve the effective target: source app by default, overridden per-field
+	// by targetApplicationRef for a to-copy restore.
+	targetNamespace := restoreJob.Namespace
+	targetAppName := backup.Spec.ApplicationRef.Name
+	targetAppKind := backup.Spec.ApplicationRef.Kind
+	targetAPIGroup := ""
+	if backup.Spec.ApplicationRef.APIGroup != nil {
+		targetAPIGroup = *backup.Spec.ApplicationRef.APIGroup
+	}
+	if restoreJob.Spec.TargetApplicationRef != nil {
+		if restoreJob.Spec.TargetApplicationRef.Name != "" {
+			targetAppName = restoreJob.Spec.TargetApplicationRef.Name
+		}
+		if restoreJob.Spec.TargetApplicationRef.Kind != "" {
+			targetAppKind = restoreJob.Spec.TargetApplicationRef.Kind
+		}
+		if restoreJob.Spec.TargetApplicationRef.APIGroup != nil {
+			targetAPIGroup = *restoreJob.Spec.TargetApplicationRef.APIGroup
+		}
+	}
+	targetRef := corev1.TypedLocalObjectReference{
+		APIGroup: new(targetAPIGroup),
+		Kind:     targetAppKind,
+		Name:     targetAppName,
+	}
+	if err := validateKafkaApplicationRef(targetRef); err != nil {
+		return r.markRestoreJobFailed(ctx, restoreJob, err.Error())
+	}
+
+	if restoreJob.Status.StartedAt == nil {
+		fresh := &backupsv1alpha1.RestoreJob{}
+		if err := r.Get(ctx, types.NamespacedName{Namespace: restoreJob.Namespace, Name: restoreJob.Name}, fresh); err != nil {
+			return ctrl.Result{}, err
+		}
+		if fresh.Status.StartedAt != nil {
+			restoreJob.Status.StartedAt = fresh.Status.StartedAt
+			restoreJob.Status.Phase = fresh.Status.Phase
+		} else {
+			base := fresh.DeepCopy()
+			now := metav1.Now()
+			fresh.Status.StartedAt = &now
+			fresh.Status.Phase = backupsv1alpha1.RestoreJobPhaseRunning
+			if err := r.Status().Patch(ctx, fresh, client.MergeFrom(base)); err != nil {
+				return ctrl.Result{}, err
+			}
+			return ctrl.Result{RequeueAfter: kafkaStrategyPollInterval}, nil
+		}
+	}
+
+	strategy := &strategyv1alpha1.Kafka{}
+	if err := r.Get(ctx, client.ObjectKey{Name: backup.Spec.StrategyRef.Name}, strategy); err != nil {
+		if apierrors.IsNotFound(err) {
+			return r.requeueRestoreStrategyNotReady(ctx, restoreJob, backup.Spec.StrategyRef.Name)
+		}
+		return ctrl.Result{}, err
+	}
+
+	app, err := r.getApplicationUnstructured(ctx, targetNamespace, targetRef)
+	if err != nil {
+		if apierrors.IsNotFound(err) || apimeta.IsNoMatchError(err) {
+			return r.markRestoreJobFailed(ctx, restoreJob, fmt.Sprintf(
+				"target Kafka application not found or kind not registered: %s/%s (kind=%q; deploy it before requesting a restore)",
+				targetNamespace, targetAppName, targetAppKind))
+		}
+		return ctrl.Result{}, err
+	}
+
+	// Ready precondition on the TARGET cluster.
+	cluster := &kafkatypes.Kafka{}
+	clusterErr := r.Get(ctx, types.NamespacedName{Namespace: targetNamespace, Name: kafkaClusterName(targetAppName)}, cluster)
+	if clusterErr != nil {
+		if !apierrors.IsNotFound(clusterErr) {
+			return ctrl.Result{}, clusterErr
+		}
+		return r.kafkaRestoreNotReady(ctx, restoreJob, deadline, "KafkaClusterNotReady",
+			fmt.Sprintf("target Kafka cluster %s not found yet", kafkaClusterName(targetAppName)))
+	}
+	if msg := kafkaNotReadyMessage(cluster); msg != "" {
+		return r.kafkaRestoreNotReady(ctx, restoreJob, deadline, "KafkaClusterNotReady", msg)
+	}
+
+	// Resolve the client image from the TARGET broker (Ready above, so a broker
+	// pod exists), so a to-copy restore into a differently-versioned cluster runs
+	// that cluster's own CLI rather than the source's. Transient List errors
+	// requeue; only a Ready cluster with no listable broker is terminal.
+	clientImage, err := resolveKafkaBrokerImage(ctx, r.Client, targetNamespace, kafkaClusterName(targetAppName))
+	if err != nil {
+		if errors.Is(err, errNoKafkaBroker) {
+			return r.markRestoreJobFailed(ctx, restoreJob, fmt.Sprintf("cannot resolve Kafka client image: %v", err))
+		}
+		return ctrl.Result{}, err
+	}
+
+	// Restore reads the object the Backup recorded (guarded non-empty above), not a
+	// reconstruction, so a later change to the key layout cannot make older backups
+	// unrestorable.
+	artifactURI := backup.Status.Artifact.URI
+	ctxMap := kafkaRenderContext(app, targetAppName, targetNamespace, kafkaStrategyModeRestore, backup.Name, artifactURI, clientImage, kafkaStrategyParameters(backup), backup)
+	rendered, err := renderKafkaTemplate(strategy.Spec.Template, ctxMap)
+	if err != nil {
+		return r.markRestoreJobFailed(ctx, restoreJob, fmt.Sprintf("failed to template Kafka strategy: %v", err))
+	}
+
+	batchJob, err := r.ensureKafkaRestoreJob(ctx, restoreJob, targetNamespace, jobNameForRestoreJob(restoreJob),
+		kafkaStrategyModeRestore, deadline,
+		map[string]string{
+			backupsv1alpha1.OwningJobNameLabel:      restoreJob.Name,
+			backupsv1alpha1.OwningJobNamespaceLabel: restoreJob.Namespace,
+		},
+		rendered,
+	)
+	if err != nil {
+		return r.markRestoreJobFailed(ctx, restoreJob, fmt.Sprintf("failed to ensure batch/v1.Job: %v", err))
+	}
+
+	switch jobConditionState(batchJob) {
+	case batchv1.JobComplete:
+		now := metav1.Now()
+		restoreJob.Status.CompletedAt = &now
+		restoreJob.Status.Phase = backupsv1alpha1.RestoreJobPhaseSucceeded
+		apimeta.SetStatusCondition(&restoreJob.Status.Conditions, metav1.Condition{
+			Type:    "Ready",
+			Status:  metav1.ConditionTrue,
+			Reason:  "RestoreCompleted",
+			Message: "Kafka topic-metadata restore completed (topic definitions and configs only)",
+		})
+		if err := r.Status().Update(ctx, restoreJob); err != nil {
+			return ctrl.Result{}, err
+		}
+		return ctrl.Result{}, nil
+
+	case batchv1.JobFailed:
+		message := jobFailureMessage(batchJob)
+		if message == "" {
+			message = "Kafka metadata restore Job reported Failed"
+		}
+		return r.markRestoreJobFailed(ctx, restoreJob, message)
+
+	default:
+		// Same bound as the backup path, at the Job layer: the restore Job carries
+		// activeDeadlineSeconds, so an unschedulable or wedged pod is failed by
+		// Kubernetes and lands in the JobFailed branch above rather than requeuing
+		// in Running forever.
+		return ctrl.Result{RequeueAfter: kafkaStrategyPollInterval}, nil
+	}
+}
+
+func (r *RestoreJobReconciler) kafkaRestoreNotReady(ctx context.Context, rj *backupsv1alpha1.RestoreJob, deadline time.Duration, reason, message string) (ctrl.Result, error) {
+	if rj.Status.StartedAt != nil && time.Since(rj.Status.StartedAt.Time) > deadline {
+		return r.markRestoreJobFailed(ctx, rj, fmt.Sprintf("timed out waiting for Kafka cluster to become Ready: %s", message))
+	}
+	apimeta.SetStatusCondition(&rj.Status.Conditions, metav1.Condition{
+		Type:    "Ready",
+		Status:  metav1.ConditionFalse,
+		Reason:  reason,
+		Message: message,
+	})
+	if err := r.Status().Update(ctx, rj); err != nil {
+		return ctrl.Result{}, err
+	}
+	return ctrl.Result{RequeueAfter: kafkaStrategyPollInterval}, nil
+}
+
+func (r *RestoreJobReconciler) ensureKafkaRestoreJob(
+	ctx context.Context,
+	owner client.Object,
+	namespace, name, mode string,
+	deadline time.Duration,
+	ownerLabels map[string]string,
+	rendered *corev1.PodTemplateSpec,
+) (*batchv1.Job, error) {
+	existing := &batchv1.Job{}
+	err := r.Get(ctx, types.NamespacedName{Namespace: namespace, Name: name}, existing)
+	if err == nil {
+		return existing, nil
+	}
+	if !apierrors.IsNotFound(err) {
+		return nil, err
+	}
+
+	labels := map[string]string{kafkaStrategyLabelMode: mode}
+	maps.Copy(labels, ownerLabels)
+
+	desired := buildJobStrategyBatchJob(namespace, name, labels, rendered)
+	setKafkaJobDeadline(desired, deadline)
+	if err := controllerutil.SetControllerReference(owner, desired, r.Scheme); err != nil {
+		return nil, fmt.Errorf("set controller reference on restore Job: %w", err)
+	}
+	if err := r.Create(ctx, desired); err != nil {
+		if apierrors.IsAlreadyExists(err) {
+			if err := r.Get(ctx, types.NamespacedName{Namespace: namespace, Name: name}, existing); err != nil {
+				return nil, err
+			}
+			return existing, nil
+		}
+		return nil, err
+	}
+	return desired, nil
+}
+
+// ---------------------------------------------------------------------------
+// Backup cleanup path (best-effort object deletion on Backup delete)
+// ---------------------------------------------------------------------------
+
+// cleanupKafkaBackup deletes the metadata object a Backup recorded, and WAITS
+// for that delete to finish before the Backup is removed, so no object is
+// orphaned. Like the RabbitMQ driver, this one uniquely owns its artifact (a
+// plain object it wrote with curl, keyed on status.artifact.uri) and no engine
+// retention prunes it. The controller has no S3 client, so the delete runs as a
+// one-shot Job through the strategy's image; this returns a requeue until the
+// Job succeeds. The script treats "object already gone" as success; a genuine
+// failure keeps the Backup Terminating rather than orphaning the object.
+func (r *BackupReconciler) cleanupKafkaBackup(ctx context.Context, backup *backupsv1alpha1.Backup) (ctrl.Result, error) {
+	logger := getLogger(ctx)
+
+	// Escape hatch: an operator releases a Backup stuck Terminating (object
+	// storage unreachable) by setting this annotation. Cleanup then skips the
+	// delete - reaping any in-flight delete Job - and lets the Backup go.
+	if backup.Annotations[kafkaSkipArtifactCleanupAnnotation] == "true" {
+		existing := &batchv1.Job{}
+		if err := r.Get(ctx, types.NamespacedName{Namespace: backup.Namespace, Name: backup.Name + "-cleanup"}, existing); err == nil {
+			_ = r.deleteKafkaCleanupJob(ctx, existing)
+		}
+		logger.Debug("skipping Kafka artifact cleanup per annotation; object left in bucket", "backup", backup.Name, "annotation", kafkaSkipArtifactCleanupAnnotation)
+		return ctrl.Result{}, nil
+	}
+
+	if backup.Status.Artifact == nil || backup.Status.Artifact.URI == "" {
+		return ctrl.Result{}, nil
+	}
+	uri := backup.Status.Artifact.URI
+
+	// The delete runs through the image the backup recorded: the source cluster
+	// (and its brokers) may already be gone, so there is no broker left to resolve
+	// one from. Absent it, there is nothing to run the delete with - release the
+	// Backup rather than wedge it Terminating forever.
+	clientImage := backup.Spec.DriverMetadata[kafkaStrategyClientImageKey]
+	if clientImage == "" {
+		return r.releaseKafkaCleanup(ctx, backup, uri, "no recorded client image on the Backup"), nil
+	}
+
+	strategy := &strategyv1alpha1.Kafka{}
+	if err := r.Get(ctx, client.ObjectKey{Name: backup.Spec.StrategyRef.Name}, strategy); err != nil {
+		if apierrors.IsNotFound(err) {
+			// No strategy to render the delete Job from (the shipped strategy is
+			// gated on a resolved bucket name and stops rendering if that lookup
+			// fails). Release the Backup rather than wedge it forever.
+			return r.releaseKafkaCleanup(ctx, backup, uri, "strategy CR is gone"), nil
+		}
+		return ctrl.Result{}, err
+	}
+
+	jobName := backup.Name + "-cleanup"
+	job := &batchv1.Job{}
+	err := r.Get(ctx, types.NamespacedName{Namespace: backup.Namespace, Name: jobName}, job)
+	switch {
+	case apierrors.IsNotFound(err):
+		// Spawning the delete Job and projecting the credentials Secret it needs
+		// are CREATEs, which NamespaceLifecycle admission forbids in a Terminating
+		// namespace. Release the Backup then, so teardown can finish; the object
+		// cannot be deleted from a namespace that no longer exists.
+		terminating, nsErr := r.namespaceTerminating(ctx, backup.Namespace)
+		if nsErr != nil {
+			return ctrl.Result{}, nsErr
+		}
+		if terminating {
+			return r.releaseKafkaCleanup(ctx, backup, uri, "namespace is terminating"), nil
+		}
+		if perr := ProjectBackupCredentials(ctx, r.Client, r.CredentialsConfig, backup.Namespace); perr != nil {
+			return r.releaseKafkaCleanup(ctx, backup, uri, fmt.Sprintf("cannot project credentials: %v", perr)), nil
+		}
+		// The template reads only .Mode, .ArtifactURI and .ClientImage in cleanup
+		// mode (never .Application), so the source app being gone does not matter.
+		renderCtx := kafkaRenderContext(nil, backup.Spec.ApplicationRef.Name, backup.Namespace, kafkaStrategyModeCleanup, backup.Name, uri, clientImage, nil, nil)
+		rendered, rerr := renderKafkaTemplate(strategy.Spec.Template, renderCtx)
+		if rerr != nil {
+			return r.releaseKafkaCleanup(ctx, backup, uri, fmt.Sprintf("cleanup template render failed: %v", rerr)), nil
+		}
+		if cerr := r.Create(ctx, buildKafkaCleanupJob(backup.Namespace, jobName, rendered)); cerr != nil && !apierrors.IsAlreadyExists(cerr) {
+			// Forbidden (namespace went Terminating after the check) or Invalid
+			// (an over-long <name>-cleanup Job name) cannot be fixed by retrying;
+			// release. Other errors are transient - requeue.
+			if apierrors.IsForbidden(cerr) || apierrors.IsInvalid(cerr) {
+				return r.releaseKafkaCleanup(ctx, backup, uri, fmt.Sprintf("cannot create cleanup Job: %v", cerr)), nil
+			}
+			return ctrl.Result{}, cerr
+		}
+		return ctrl.Result{RequeueAfter: kafkaStrategyPollInterval}, nil
+	case err != nil:
+		return ctrl.Result{}, err
+	}
+
+	if !job.DeletionTimestamp.IsZero() {
+		// A prior failed attempt is being collected; wait, then the NotFound
+		// branch recreates a fresh one.
+		return ctrl.Result{RequeueAfter: kafkaStrategyPollInterval}, nil
+	}
+
+	switch jobConditionState(job) {
+	case batchv1.JobComplete:
+		_ = r.deleteKafkaCleanupJob(ctx, job)
+		logger.Debug("Kafka backup object deleted", "backup", backup.Name, "uri", uri)
+		return ctrl.Result{}, nil
+	case batchv1.JobFailed:
+		// A genuine delete failure (a missing object is success in the script).
+		// Collect the failed Job so the NotFound branch recreates a fresh one,
+		// and keep the Backup Terminating.
+		logger.Debug("Kafka cleanup Job failed; retrying", "backup", backup.Name, "job", jobName)
+		_ = r.deleteKafkaCleanupJob(ctx, job)
+		return ctrl.Result{RequeueAfter: kafkaStrategyPollInterval}, nil
+	default:
+		return ctrl.Result{RequeueAfter: kafkaStrategyPollInterval}, nil
+	}
+}
+
+// deleteKafkaCleanupJob removes a finished cleanup Job together with its Pod.
+func (r *BackupReconciler) deleteKafkaCleanupJob(ctx context.Context, job *batchv1.Job) error {
+	policy := metav1.DeletePropagationBackground
+	return client.IgnoreNotFound(r.Delete(ctx, job, &client.DeleteOptions{PropagationPolicy: &policy}))
+}
+
+// releaseKafkaCleanup gives up on deleting the backup object and lets the Backup
+// be removed - for the conditions under which the delete cannot run here
+// (namespace terminating, credentials/permissions unavailable, an unrenderable
+// or absent strategy). It records a Warning Event naming the object left behind
+// so the give-up is visible, then returns a zero Result so the finalizer is
+// released. The delete is best-effort, not guaranteed.
+func (r *BackupReconciler) releaseKafkaCleanup(ctx context.Context, backup *backupsv1alpha1.Backup, uri, reason string) ctrl.Result {
+	getLogger(ctx).Info("releasing Backup without deleting its object", "backup", backup.Name, "uri", uri, "reason", reason)
+	if r.Recorder != nil {
+		r.Recorder.Eventf(backup, corev1.EventTypeWarning, "ArtifactNotDeleted", "left object %s in the bucket: %s", uri, reason)
+	}
+	return ctrl.Result{}
+}
+
+// setKafkaJobDeadline stamps activeDeadlineSeconds on a backup/restore Job. No
+// TTLSecondsAfterFinished: the controller must observe the Job's terminal
+// condition (to create the Backup, or mark the owner Failed) before it is
+// collected, and the owning BackupJob/RestoreJob garbage-collects it.
+func setKafkaJobDeadline(job *batchv1.Job, deadline time.Duration) {
+	secs := max(int64(deadline/time.Second), 1)
+	job.Spec.ActiveDeadlineSeconds = &secs
+}
+
+// buildKafkaCleanupJob wraps the cleanup-mode pod in a one-shot, ownerless Job.
+// Ownerless because cleanupKafkaBackup manages its lifecycle explicitly and it
+// must outlive the Backup being deleted; activeDeadlineSeconds + TTL are
+// backstops if the controller stops mid-wait.
+func buildKafkaCleanupJob(namespace, name string, rendered *corev1.PodTemplateSpec) *batchv1.Job {
+	pod := *rendered.DeepCopy()
+	if pod.Spec.RestartPolicy == "" {
+		pod.Spec.RestartPolicy = corev1.RestartPolicyNever
+	}
+	if pod.Labels == nil {
+		pod.Labels = map[string]string{}
+	}
+	pod.Labels[kafkaStrategyLabelMode] = kafkaStrategyModeCleanup
+	backoffLimit := int32(1)
+	activeDeadline := int64(300)
+	ttl := int32(300)
+	return &batchv1.Job{
+		ObjectMeta: metav1.ObjectMeta{
+			Namespace: namespace,
+			Name:      name,
+			Labels:    map[string]string{kafkaStrategyLabelMode: kafkaStrategyModeCleanup},
+		},
+		Spec: batchv1.JobSpec{
+			BackoffLimit:            &backoffLimit,
+			ActiveDeadlineSeconds:   &activeDeadline,
+			TTLSecondsAfterFinished: &ttl,
+			Template:                pod,
+		},
+	}
+}
diff --git a/internal/backupcontroller/kafkastrategy_controller_test.go b/internal/backupcontroller/kafkastrategy_controller_test.go
new file mode 100644
index 0000000000..09f97ce3f7
--- /dev/null
+++ b/internal/backupcontroller/kafkastrategy_controller_test.go
@@ -0,0 +1,911 @@
+// SPDX-License-Identifier: Apache-2.0
+package backupcontroller
+
+import (
+	"context"
+	"errors"
+	"strings"
+	"testing"
+	"time"
+
+	batchv1 "k8s.io/api/batch/v1"
+	corev1 "k8s.io/api/core/v1"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	"k8s.io/apimachinery/pkg/api/meta"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	dynamicfake "k8s.io/client-go/dynamic/fake"
+	"k8s.io/client-go/kubernetes/scheme"
+	"k8s.io/client-go/tools/record"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+	clientfake "sigs.k8s.io/controller-runtime/pkg/client/fake"
+
+	strategyv1alpha1 "github.com/cozystack/cozystack/api/backups/strategy/v1alpha1"
+	backupsv1alpha1 "github.com/cozystack/cozystack/api/backups/v1alpha1"
+	"github.com/cozystack/cozystack/internal/backupcontroller/kafkatypes"
+)
+
+func TestValidateKafkaApplicationRef(t *testing.T) {
+	cases := []struct {
+		name    string
+		ref     corev1.TypedLocalObjectReference
+		wantErr bool
+	}{
+		{"kind Kafka, empty group", corev1.TypedLocalObjectReference{Kind: "Kafka"}, false},
+		{"kind Kafka, default group", corev1.TypedLocalObjectReference{Kind: "Kafka", APIGroup: new("apps.cozystack.io")}, false},
+		{"wrong kind", corev1.TypedLocalObjectReference{Kind: "Postgres"}, true},
+		{"wrong group", corev1.TypedLocalObjectReference{Kind: "Kafka", APIGroup: new("kafka.strimzi.io")}, true},
+	}
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			err := validateKafkaApplicationRef(tc.ref)
+			if tc.wantErr != (err != nil) {
+				t.Fatalf("validateKafkaApplicationRef(%+v) err=%v, wantErr=%v", tc.ref, err, tc.wantErr)
+			}
+		})
+	}
+}
+
+func TestKafkaClusterName(t *testing.T) {
+	if got := kafkaClusterName("foo"); got != "kafka-foo" {
+		t.Fatalf("kafkaClusterName(foo) = %q, want kafka-foo", got)
+	}
+}
+
+func TestKafkaNotReadyMessage(t *testing.T) {
+	ready := &kafkatypes.Kafka{
+		ObjectMeta: metav1.ObjectMeta{Name: "kafka-app"},
+		Status: kafkatypes.KafkaStatus{Conditions: []metav1.Condition{
+			{Type: kafkatypes.ConditionTypeReady, Status: metav1.ConditionTrue},
+		}},
+	}
+	if msg := kafkaNotReadyMessage(ready); msg != "" {
+		t.Fatalf("ready cluster: got %q, want empty", msg)
+	}
+
+	notReady := &kafkatypes.Kafka{
+		ObjectMeta: metav1.ObjectMeta{Name: "kafka-app"},
+		Status: kafkatypes.KafkaStatus{Conditions: []metav1.Condition{
+			{Type: kafkatypes.ConditionTypeReady, Status: metav1.ConditionFalse, Message: "brokers pending"},
+		}},
+	}
+	msg := kafkaNotReadyMessage(notReady)
+	if !strings.Contains(msg, "Ready=False") || !strings.Contains(msg, "brokers pending") {
+		t.Fatalf("not-ready cluster: got %q, want Ready=False + message", msg)
+	}
+
+	missing := &kafkatypes.Kafka{ObjectMeta: metav1.ObjectMeta{Name: "kafka-app"}}
+	if msg := kafkaNotReadyMessage(missing); !strings.Contains(msg, "no Ready condition") {
+		t.Fatalf("missing condition: got %q, want 'no Ready condition'", msg)
+	}
+}
+
+func TestKafkaStrategyParameters_RoundTrip(t *testing.T) {
+	b := &backupsv1alpha1.Backup{
+		Spec: backupsv1alpha1.BackupSpec{DriverMetadata: map[string]string{
+			kafkaStrategyParamPrefix + "topics": "orders",
+			kafkaStrategyParamPrefix + "":       "dropped-empty-key",
+			"unrelated":                         "ignored",
+		}},
+	}
+	got := kafkaStrategyParameters(b)
+	if len(got) != 1 || got["topics"] != "orders" {
+		t.Fatalf("kafkaStrategyParameters = %v, want {topics: orders}", got)
+	}
+}
+
+func TestRenderKafkaArtifactURI(t *testing.T) {
+	tmpl := "s3://bkt/{{ .Release.Namespace }}/{{ .Release.Name }}/{{ .BackupName }}/kafka-topics.json"
+
+	ctxA := kafkaRenderContext(nil, "kafka-test", "tenant-root", kafkaStrategyModeBackup, "run-a", "", "", nil, nil)
+	uriA, err := renderKafkaArtifactURI(tmpl, ctxA)
+	if err != nil {
+		t.Fatalf("renderKafkaArtifactURI: %v", err)
+	}
+	if uriA != "s3://bkt/tenant-root/kafka-test/run-a/kafka-topics.json" {
+		t.Fatalf("uriA = %q", uriA)
+	}
+
+	ctxB := kafkaRenderContext(nil, "kafka-test", "tenant-root", kafkaStrategyModeBackup, "run-b", "", "", nil, nil)
+	uriB, _ := renderKafkaArtifactURI(tmpl, ctxB)
+	if uriA == uriB {
+		t.Fatalf("distinct BackupName must yield distinct key: %q == %q", uriA, uriB)
+	}
+
+	if uri, err := renderKafkaArtifactURI("", ctxA); err != nil || uri != "" {
+		t.Fatalf("empty template: uri=%q err=%v, want empty/nil", uri, err)
+	}
+}
+
+// TestReconcileKafka_RejectsWrongKind covers the applicationRef Kind gate on the
+// BackupJob path: a non-Kafka application terminates the BackupJob as Failed
+// rather than running a Job against it.
+func TestReconcileKafka_RejectsWrongKind(t *testing.T) {
+	bj := &backupsv1alpha1.BackupJob{
+		ObjectMeta: metav1.ObjectMeta{Namespace: "tenant", Name: "bj"},
+		Spec: backupsv1alpha1.BackupJobSpec{
+			ApplicationRef: corev1.TypedLocalObjectReference{
+				APIGroup: new("apps.cozystack.io"), Kind: "Postgres", Name: "pg",
+			},
+			BackupClassName: "cozy-default",
+		},
+	}
+	c := newBackupJobTestClient(t, bj)
+	r := &BackupJobReconciler{Client: c, Recorder: record.NewFakeRecorder(10)}
+
+	if _, err := r.reconcileKafka(context.Background(), bj, &ResolvedBackupConfig{
+		StrategyRef: corev1.TypedLocalObjectReference{Kind: strategyv1alpha1.KafkaStrategyKind, Name: "cozy-default-kafka"},
+	}); err != nil {
+		t.Fatalf("reconcileKafka returned error: %v", err)
+	}
+
+	got := &backupsv1alpha1.BackupJob{}
+	if err := c.Get(context.Background(), client.ObjectKeyFromObject(bj), got); err != nil {
+		t.Fatalf("get bj: %v", err)
+	}
+	if got.Status.Phase != backupsv1alpha1.BackupJobPhaseFailed {
+		t.Fatalf("wrong-kind BackupJob phase = %q, want Failed", got.Status.Phase)
+	}
+}
+
+func newKafkaApp(name, namespace string) *unstructured.Unstructured {
+	u := &unstructured.Unstructured{}
+	u.SetGroupVersionKind(schema.GroupVersionKind{
+		Group:   backupsv1alpha1.DefaultApplicationAPIGroup,
+		Version: "v1alpha1",
+		Kind:    "Kafka",
+	})
+	u.SetName(name)
+	u.SetNamespace(namespace)
+	return u
+}
+
+func newKafkaTestEnv(t *testing.T, app *unstructured.Unstructured, builder *clientfake.ClientBuilder) (*BackupJobReconciler, *RestoreJobReconciler) {
+	t.Helper()
+	testScheme := runtime.NewScheme()
+	_ = scheme.AddToScheme(testScheme)
+	_ = backupsv1alpha1.AddToScheme(testScheme)
+	_ = strategyv1alpha1.AddToScheme(testScheme)
+	_ = kafkatypes.AddToScheme(testScheme)
+
+	gvr := schema.GroupVersionResource{Group: backupsv1alpha1.DefaultApplicationAPIGroup, Version: "v1alpha1", Resource: "kafkas"}
+	dynamicClient := dynamicfake.NewSimpleDynamicClientWithCustomListKinds(
+		testScheme, map[schema.GroupVersionResource]string{gvr: "KafkaList"}, app)
+	restMapper := &mockRESTMapper{mapping: &meta.RESTMapping{
+		Resource: gvr, GroupVersionKind: app.GroupVersionKind(), Scope: meta.RESTScopeNamespace,
+	}}
+	c := builder.WithScheme(testScheme).
+		WithStatusSubresource(&backupsv1alpha1.BackupJob{}, &backupsv1alpha1.RestoreJob{}, &backupsv1alpha1.Backup{}).
+		Build()
+	return &BackupJobReconciler{Client: c, Interface: dynamicClient, RESTMapper: restMapper, Scheme: testScheme, Recorder: record.NewFakeRecorder(10)},
+		&RestoreJobReconciler{Client: c, Interface: dynamicClient, RESTMapper: restMapper, Scheme: testScheme, Recorder: record.NewFakeRecorder(10)}
+}
+
+func newKafkaStrategy(name string) *strategyv1alpha1.Kafka {
+	return &strategyv1alpha1.Kafka{
+		ObjectMeta: metav1.ObjectMeta{Name: name},
+		Spec: strategyv1alpha1.KafkaSpec{
+			ArtifactURITemplate: "s3://bkt/{{ .Release.Namespace }}/{{ .Release.Name }}/{{ .BackupName }}/kafka-metadata.txt",
+			Template: corev1.PodTemplateSpec{Spec: corev1.PodSpec{
+				RestartPolicy: corev1.RestartPolicyNever,
+				Containers:    []corev1.Container{{Name: "kafka-backup", Image: "{{ .ClientImage }}", Args: []string{"--mode={{ .Mode }}", "--uri={{ .ArtifactURI }}"}}},
+			}},
+		},
+	}
+}
+
+func kafkaAppRef(name string) corev1.TypedLocalObjectReference {
+	return corev1.TypedLocalObjectReference{APIGroup: new(backupsv1alpha1.DefaultApplicationAPIGroup), Kind: "Kafka", Name: name}
+}
+
+// TestReconcileKafka_WaitsForNotReadyCluster: while the Strimzi Kafka cluster is
+// not Ready the BackupJob must stay out of Succeeded (Ready=False precondition,
+// requeue) and create no batch Job — the precondition is one of the driver's
+// three reasons to exist, and a mutation dropping it must fail here.
+func TestReconcileKafka_WaitsForNotReadyCluster(t *testing.T) {
+	now := metav1.Now()
+	bj := &backupsv1alpha1.BackupJob{
+		ObjectMeta: metav1.ObjectMeta{Namespace: "tenant", Name: "bj"},
+		Spec:       backupsv1alpha1.BackupJobSpec{ApplicationRef: kafkaAppRef("src"), BackupClassName: "cozy-default"},
+		// Preset StartedAt so reconcile skips the first-pass bookkeeping requeue
+		// and reaches the readiness gate.
+		Status: backupsv1alpha1.BackupJobStatus{StartedAt: &now, Phase: backupsv1alpha1.BackupJobPhaseRunning},
+	}
+	cluster := &kafkatypes.Kafka{
+		ObjectMeta: metav1.ObjectMeta{Namespace: "tenant", Name: "kafka-src"},
+		Status: kafkatypes.KafkaStatus{Conditions: []metav1.Condition{
+			{Type: kafkatypes.ConditionTypeReady, Status: metav1.ConditionFalse, Reason: "Creating", Message: "brokers starting"},
+		}},
+	}
+	r, _ := newKafkaTestEnv(t, newKafkaApp("src", "tenant"),
+		clientfake.NewClientBuilder().WithObjects(bj, newKafkaStrategy("cozy-default-kafka"), cluster))
+
+	res, err := r.reconcileKafka(context.Background(), bj, &ResolvedBackupConfig{
+		StrategyRef: corev1.TypedLocalObjectReference{Kind: strategyv1alpha1.KafkaStrategyKind, Name: "cozy-default-kafka"},
+	})
+	if err != nil {
+		t.Fatalf("reconcileKafka: %v", err)
+	}
+	if res.RequeueAfter <= 0 {
+		t.Fatalf("expected a requeue while the cluster is not Ready, got %+v", res)
+	}
+	got := &backupsv1alpha1.BackupJob{}
+	if err := r.Get(context.Background(), client.ObjectKeyFromObject(bj), got); err != nil {
+		t.Fatalf("get bj: %v", err)
+	}
+	if got.Status.Phase == backupsv1alpha1.BackupJobPhaseSucceeded {
+		t.Fatalf("BackupJob reached Succeeded while cluster not Ready")
+	}
+	jobs := &batchv1.JobList{}
+	if err := r.List(context.Background(), jobs, client.InNamespace("tenant")); err != nil {
+		t.Fatalf("list jobs: %v", err)
+	}
+	if len(jobs.Items) != 0 {
+		t.Fatalf("expected no batch Job while cluster not Ready, got %d", len(jobs.Items))
+	}
+}
+
+// TestReconcileKafkaRestore_RejectsWrongTargetKind: a to-copy restore whose
+// target is not a Kafka application terminates the RestoreJob as Failed.
+func TestReconcileKafkaRestore_RejectsWrongTargetKind(t *testing.T) {
+	pgGroup := backupsv1alpha1.DefaultApplicationAPIGroup
+	rj := &backupsv1alpha1.RestoreJob{
+		ObjectMeta: metav1.ObjectMeta{Namespace: "tenant", Name: "rj"},
+		Spec: backupsv1alpha1.RestoreJobSpec{
+			BackupRef:            corev1.LocalObjectReference{Name: "bk"},
+			TargetApplicationRef: &corev1.TypedLocalObjectReference{APIGroup: &pgGroup, Kind: "Postgres", Name: "pg"},
+		},
+	}
+	backup := &backupsv1alpha1.Backup{
+		ObjectMeta: metav1.ObjectMeta{Namespace: "tenant", Name: "bk"},
+		Spec: backupsv1alpha1.BackupSpec{
+			ApplicationRef: kafkaAppRef("src"),
+			StrategyRef:    corev1.TypedLocalObjectReference{Kind: strategyv1alpha1.KafkaStrategyKind, Name: "cozy-default-kafka"},
+		},
+	}
+	c := newRestoreJobTestClient(t, rj, backup)
+	r := &RestoreJobReconciler{Client: c, Recorder: record.NewFakeRecorder(10)}
+
+	if _, err := r.reconcileKafkaRestore(context.Background(), rj, backup); err != nil {
+		t.Fatalf("reconcileKafkaRestore: %v", err)
+	}
+	got := &backupsv1alpha1.RestoreJob{}
+	if err := c.Get(context.Background(), client.ObjectKeyFromObject(rj), got); err != nil {
+		t.Fatalf("get rj: %v", err)
+	}
+	if got.Status.Phase != backupsv1alpha1.RestoreJobPhaseFailed {
+		t.Fatalf("wrong-target-kind RestoreJob phase = %q, want Failed", got.Status.Phase)
+	}
+}
+
+// restoreJobRunning builds a RestoreJob already past its first-reconcile
+// bookkeeping (StartedAt preset), so a test reaches the gates below it.
+func restoreJobRunning(name, namespace string, target *corev1.TypedLocalObjectReference) *backupsv1alpha1.RestoreJob {
+	now := metav1.Now()
+	return &backupsv1alpha1.RestoreJob{
+		ObjectMeta: metav1.ObjectMeta{Namespace: namespace, Name: name},
+		Spec: backupsv1alpha1.RestoreJobSpec{
+			BackupRef:            corev1.LocalObjectReference{Name: "bk"},
+			TargetApplicationRef: target,
+		},
+		Status: backupsv1alpha1.RestoreJobStatus{StartedAt: &now, Phase: backupsv1alpha1.RestoreJobPhaseRunning},
+	}
+}
+
+// TestReconcileKafkaRestore_ToCopy pins the to-copy happy path AND the
+// target-field merge: the restore resolves the TARGET (targetApplicationRef),
+// not the source. Only "dst" is registered, so reaching Succeeded proves the
+// TargetApplicationRef.Name merge was observed - ignoring it would resolve the
+// absent source "src" and fail.
+func TestReconcileKafkaRestore_ToCopy(t *testing.T) {
+	rj := restoreJobRunning("rj", "tenant",
+		&corev1.TypedLocalObjectReference{APIGroup: new(backupsv1alpha1.DefaultApplicationAPIGroup), Kind: "Kafka", Name: "dst"})
+	backup := kafkaBackup("bk", "tenant") // source "src", artifact URI recorded
+	completed := &batchv1.Job{
+		ObjectMeta: metav1.ObjectMeta{Namespace: "tenant", Name: "rj-restore"},
+		Status:     batchv1.JobStatus{Conditions: []batchv1.JobCondition{{Type: batchv1.JobComplete, Status: corev1.ConditionTrue}}},
+	}
+	_, r := newKafkaTestEnv(t, newKafkaApp("dst", "tenant"),
+		clientfake.NewClientBuilder().WithObjects(rj, backup, newKafkaStrategy("cozy-default-kafka"),
+			readyKafkaCluster("kafka-dst", "tenant"), kafkaBrokerPod("kafka-dst", "tenant", "quay.io/strimzi/kafka:test"), completed))
+
+	if _, err := r.reconcileKafkaRestore(context.Background(), rj, backup); err != nil {
+		t.Fatalf("reconcileKafkaRestore: %v", err)
+	}
+	got := &backupsv1alpha1.RestoreJob{}
+	if err := r.Get(context.Background(), client.ObjectKeyFromObject(rj), got); err != nil {
+		t.Fatalf("get rj: %v", err)
+	}
+	if got.Status.Phase != backupsv1alpha1.RestoreJobPhaseSucceeded {
+		t.Fatalf("to-copy restore phase = %q, want Succeeded (target merge unobserved?)", got.Status.Phase)
+	}
+}
+
+// TestReconcileKafkaRestore_NoRecordedArtifactURI pins that a Backup with no
+// recorded object fails FAST, before the readiness gate - not after waiting out
+// the deadline and reporting a misleading readiness timeout. No cluster is
+// seeded, so the old ordering would requeue instead of failing.
+func TestReconcileKafkaRestore_NoRecordedArtifactURI(t *testing.T) {
+	rj := restoreJobRunning("rj", "tenant", nil)
+	backup := &backupsv1alpha1.Backup{
+		ObjectMeta: metav1.ObjectMeta{Namespace: "tenant", Name: "bk"},
+		Spec: backupsv1alpha1.BackupSpec{
+			ApplicationRef: kafkaAppRef("src"),
+			StrategyRef:    corev1.TypedLocalObjectReference{Kind: strategyv1alpha1.KafkaStrategyKind, Name: "cozy-default-kafka"},
+		},
+	}
+	_, r := newKafkaTestEnv(t, newKafkaApp("src", "tenant"),
+		clientfake.NewClientBuilder().WithObjects(rj, backup, newKafkaStrategy("cozy-default-kafka")))
+
+	if _, err := r.reconcileKafkaRestore(context.Background(), rj, backup); err != nil {
+		t.Fatalf("reconcileKafkaRestore: %v", err)
+	}
+	got := &backupsv1alpha1.RestoreJob{}
+	if err := r.Get(context.Background(), client.ObjectKeyFromObject(rj), got); err != nil {
+		t.Fatalf("get rj: %v", err)
+	}
+	if got.Status.Phase != backupsv1alpha1.RestoreJobPhaseFailed {
+		t.Fatalf("no-artifact restore phase = %q, want Failed fast (not a readiness timeout)", got.Status.Phase)
+	}
+	if !strings.Contains(got.Status.Message, "artifact URI") {
+		t.Fatalf("message = %q, want it to name the missing artifact URI", got.Status.Message)
+	}
+}
+
+// TestReconcileKafkaRestore_TargetClusterNotReady pins that while the target
+// Kafka cluster is not Ready the restore requeues and creates no Job.
+func TestReconcileKafkaRestore_TargetClusterNotReady(t *testing.T) {
+	rj := restoreJobRunning("rj", "tenant", nil)
+	backup := kafkaBackup("bk", "tenant")
+	notReady := &kafkatypes.Kafka{
+		ObjectMeta: metav1.ObjectMeta{Namespace: "tenant", Name: "kafka-src"},
+		Status: kafkatypes.KafkaStatus{Conditions: []metav1.Condition{
+			{Type: kafkatypes.ConditionTypeReady, Status: metav1.ConditionFalse, Reason: "Creating", Message: "brokers starting"},
+		}},
+	}
+	_, r := newKafkaTestEnv(t, newKafkaApp("src", "tenant"),
+		clientfake.NewClientBuilder().WithObjects(rj, backup, newKafkaStrategy("cozy-default-kafka"), notReady))
+
+	res, err := r.reconcileKafkaRestore(context.Background(), rj, backup)
+	if err != nil {
+		t.Fatalf("reconcileKafkaRestore: %v", err)
+	}
+	if res.RequeueAfter <= 0 {
+		t.Fatalf("expected a requeue while the target cluster is not Ready, got %+v", res)
+	}
+	got := &backupsv1alpha1.RestoreJob{}
+	if err := r.Get(context.Background(), client.ObjectKeyFromObject(rj), got); err != nil {
+		t.Fatalf("get rj: %v", err)
+	}
+	if got.Status.Phase == backupsv1alpha1.RestoreJobPhaseSucceeded {
+		t.Fatal("restore reached Succeeded while target cluster not Ready")
+	}
+	jobs := &batchv1.JobList{}
+	if err := r.List(context.Background(), jobs, client.InNamespace("tenant")); err != nil {
+		t.Fatalf("list jobs: %v", err)
+	}
+	if len(jobs.Items) != 0 {
+		t.Fatalf("expected no restore Job while cluster not Ready, got %d", len(jobs.Items))
+	}
+}
+
+// TestReconcileKafkaRestore_TargetNotFound pins that a restore whose target
+// application is not registered terminates as Failed rather than requeuing.
+func TestReconcileKafkaRestore_TargetNotFound(t *testing.T) {
+	rj := restoreJobRunning("rj", "tenant", nil) // target defaults to the source "src"
+	backup := kafkaBackup("bk", "tenant")
+	// Seed a different app so the target "src" resolves NotFound.
+	_, r := newKafkaTestEnv(t, newKafkaApp("other", "tenant"),
+		clientfake.NewClientBuilder().WithObjects(rj, backup, newKafkaStrategy("cozy-default-kafka")))
+
+	if _, err := r.reconcileKafkaRestore(context.Background(), rj, backup); err != nil {
+		t.Fatalf("reconcileKafkaRestore: %v", err)
+	}
+	got := &backupsv1alpha1.RestoreJob{}
+	if err := r.Get(context.Background(), client.ObjectKeyFromObject(rj), got); err != nil {
+		t.Fatalf("get rj: %v", err)
+	}
+	if got.Status.Phase != backupsv1alpha1.RestoreJobPhaseFailed {
+		t.Fatalf("missing-target restore phase = %q, want Failed", got.Status.Phase)
+	}
+}
+
+// TestCreateKafkaBackupArtifact_StampsScope pins that every produced Backup
+// carries strategy.backups.cozystack.io/scope=topic-metadata, so `kubectl
+// describe backup` and any consumer see the narrow scope. Dropping the stamp
+// turns this red.
+func TestCreateKafkaBackupArtifact_StampsScope(t *testing.T) {
+	testScheme := runtime.NewScheme()
+	_ = scheme.AddToScheme(testScheme)
+	_ = backupsv1alpha1.AddToScheme(testScheme)
+	c := clientfake.NewClientBuilder().WithScheme(testScheme).
+		WithStatusSubresource(&backupsv1alpha1.Backup{}).Build()
+	r := &BackupJobReconciler{Client: c, Scheme: testScheme, Recorder: record.NewFakeRecorder(10)}
+
+	bj := &backupsv1alpha1.BackupJob{
+		ObjectMeta: metav1.ObjectMeta{Namespace: "tenant", Name: "bj"},
+		Spec:       backupsv1alpha1.BackupJobSpec{ApplicationRef: kafkaAppRef("src")},
+	}
+	resolved := &ResolvedBackupConfig{
+		StrategyRef: corev1.TypedLocalObjectReference{Kind: strategyv1alpha1.KafkaStrategyKind, Name: "cozy-default-kafka"},
+	}
+	backup, err := r.createKafkaBackupArtifact(context.Background(), bj, resolved, "s3://bkt/tenant/src/bj/kafka-metadata.txt", "quay.io/strimzi/kafka:test@sha256:deadbeef")
+	if err != nil {
+		t.Fatalf("createKafkaBackupArtifact: %v", err)
+	}
+	if got := backup.Spec.DriverMetadata[kafkaScopeKey]; got != kafkaScopeValue {
+		t.Fatalf("scope stamp = %q, want %q (driverMetadata=%v)", got, kafkaScopeValue, backup.Spec.DriverMetadata)
+	}
+	// The resolved broker image is recorded so cleanup can reuse it once the
+	// source cluster is gone.
+	if got := backup.Spec.DriverMetadata[kafkaStrategyClientImageKey]; got != "quay.io/strimzi/kafka:test@sha256:deadbeef" {
+		t.Fatalf("recorded client image = %q, want the resolved broker image (driverMetadata=%v)", got, backup.Spec.DriverMetadata)
+	}
+}
+
+// TestCreateKafkaBackupArtifact_RejectsDifferentApp pins the adoption guard: a
+// same-named Backup left over for a different application is not reported as this
+// run's success (mirrors the RabbitMQ driver).
+func TestCreateKafkaBackupArtifact_RejectsDifferentApp(t *testing.T) {
+	testScheme := runtime.NewScheme()
+	_ = scheme.AddToScheme(testScheme)
+	_ = backupsv1alpha1.AddToScheme(testScheme)
+
+	// A retained Backup named "bj" that describes application "other".
+	stale := &backupsv1alpha1.Backup{
+		ObjectMeta: metav1.ObjectMeta{Namespace: "tenant", Name: "bj"},
+		Spec:       backupsv1alpha1.BackupSpec{ApplicationRef: kafkaAppRef("other")},
+	}
+	c := clientfake.NewClientBuilder().WithScheme(testScheme).
+		WithStatusSubresource(&backupsv1alpha1.Backup{}).WithObjects(stale).Build()
+	r := &BackupJobReconciler{Client: c, Scheme: testScheme, Recorder: record.NewFakeRecorder(10)}
+
+	bj := &backupsv1alpha1.BackupJob{
+		ObjectMeta: metav1.ObjectMeta{Namespace: "tenant", Name: "bj"},
+		Spec:       backupsv1alpha1.BackupJobSpec{ApplicationRef: kafkaAppRef("src")},
+	}
+	resolved := &ResolvedBackupConfig{
+		StrategyRef: corev1.TypedLocalObjectReference{Kind: strategyv1alpha1.KafkaStrategyKind, Name: "cozy-default-kafka"},
+	}
+	if _, err := r.createKafkaBackupArtifact(context.Background(), bj, resolved, "s3://bkt/tenant/src/bj/kafka-metadata.txt", "quay.io/strimzi/kafka:test@sha256:deadbeef"); err == nil {
+		t.Fatal("expected an error adopting a same-named Backup for a different application, got nil")
+	} else if !strings.Contains(err.Error(), "different application") {
+		t.Fatalf("error = %v, want it to mention a different application", err)
+	}
+}
+
+// TestCleanupOnDelete_Kafka_RoutesToKafkaCleanup pins the Backup-delete dispatch
+// case: a Kafka Backup must route to cleanupKafkaBackup (which spawns the delete
+// Job and requeues), not fall through to the Velero default that would release
+// the object un-deleted. Dropping the `case KafkaStrategyKind` turns this red.
+func TestCleanupOnDelete_Kafka_RoutesToKafkaCleanup(t *testing.T) {
+	testScheme := runtime.NewScheme()
+	_ = scheme.AddToScheme(testScheme)
+	_ = backupsv1alpha1.AddToScheme(testScheme)
+	_ = strategyv1alpha1.AddToScheme(testScheme)
+
+	backup := kafkaBackup("kafka-src", "tenant-test")
+	ns := &corev1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: "tenant-test"}}
+	c := clientfake.NewClientBuilder().WithScheme(testScheme).
+		WithStatusSubresource(&batchv1.Job{}).
+		WithObjects(ns, backup, newKafkaStrategy("cozy-default-kafka")).Build()
+	r := &BackupReconciler{Client: c, Scheme: testScheme, Recorder: record.NewFakeRecorder(10)}
+
+	res, err := r.cleanupOnDelete(context.Background(), backup)
+	if err != nil {
+		t.Fatalf("cleanupOnDelete: %v", err)
+	}
+	if res.RequeueAfter == 0 {
+		t.Fatal("expected a requeue while the Kafka delete Job runs; a fall-through to the Velero default would release the object un-deleted")
+	}
+	jobs := &batchv1.JobList{}
+	if err := c.List(context.Background(), jobs, client.InNamespace("tenant-test")); err != nil {
+		t.Fatalf("list jobs: %v", err)
+	}
+	if len(jobs.Items) != 1 || jobs.Items[0].Name != "kafka-src-cleanup" {
+		t.Fatalf("expected one kafka-src-cleanup Job from the Kafka dispatch route, got %+v", jobs.Items)
+	}
+}
+
+// TestReconcileKafka_FailsAfterReadinessDeadline pins the deadline: a BackupJob
+// whose cluster never becomes Ready must terminate as Failed once
+// kafkaDefaultBackupDeadline elapses, not requeue forever. Neutralising the
+// deadline comparison turns this red.
+func TestReconcileKafka_FailsAfterReadinessDeadline(t *testing.T) {
+	old := metav1.NewTime(time.Now().Add(-(kafkaDefaultBackupDeadline + time.Minute)))
+	bj := &backupsv1alpha1.BackupJob{
+		ObjectMeta: metav1.ObjectMeta{Namespace: "tenant", Name: "bj"},
+		Spec:       backupsv1alpha1.BackupJobSpec{ApplicationRef: kafkaAppRef("src"), BackupClassName: "cozy-default"},
+		Status:     backupsv1alpha1.BackupJobStatus{StartedAt: &old, Phase: backupsv1alpha1.BackupJobPhaseRunning},
+	}
+	// App present, but the Strimzi Kafka cluster CR absent → never Ready.
+	r, _ := newKafkaTestEnv(t, newKafkaApp("src", "tenant"),
+		clientfake.NewClientBuilder().WithObjects(bj, newKafkaStrategy("cozy-default-kafka")))
+
+	if _, err := r.reconcileKafka(context.Background(), bj, &ResolvedBackupConfig{
+		StrategyRef: corev1.TypedLocalObjectReference{Kind: strategyv1alpha1.KafkaStrategyKind, Name: "cozy-default-kafka"},
+	}); err != nil {
+		t.Fatalf("reconcileKafka: %v", err)
+	}
+	got := &backupsv1alpha1.BackupJob{}
+	if err := r.Get(context.Background(), client.ObjectKeyFromObject(bj), got); err != nil {
+		t.Fatalf("get bj: %v", err)
+	}
+	if got.Status.Phase != backupsv1alpha1.BackupJobPhaseFailed {
+		t.Fatalf("expected Failed after the readiness deadline, got %q", got.Status.Phase)
+	}
+}
+
+func getKafkaJob(t *testing.T, c client.Client, namespace, name string) *batchv1.Job {
+	t.Helper()
+	job := &batchv1.Job{}
+	if err := c.Get(context.Background(), client.ObjectKey{Namespace: namespace, Name: name}, job); err != nil {
+		t.Fatalf("get job %s/%s: %v", namespace, name, err)
+	}
+	return job
+}
+
+func TestKafkaRunDeadline(t *testing.T) {
+	cases := []struct {
+		name     string
+		params   map[string]string
+		want     time.Duration
+		wantWarn bool // a rejected value must surface a non-empty warning
+	}{
+		{"unset falls back to default", nil, kafkaDefaultBackupDeadline, false},
+		{"valid override honoured", map[string]string{kafkaBackupTimeoutParam: "2h"}, 2 * time.Hour, false},
+		{"below floor falls back and warns", map[string]string{kafkaBackupTimeoutParam: "10s"}, kafkaDefaultBackupDeadline, true},
+		{"unparseable falls back and warns", map[string]string{kafkaBackupTimeoutParam: "nope"}, kafkaDefaultBackupDeadline, true},
+	}
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			got, warn := kafkaRunDeadline(tc.params)
+			if got != tc.want {
+				t.Fatalf("kafkaRunDeadline(%v) = %s, want %s", tc.params, got, tc.want)
+			}
+			if (warn != "") != tc.wantWarn {
+				t.Fatalf("kafkaRunDeadline(%v) warn = %q, wantWarn %v", tc.params, warn, tc.wantWarn)
+			}
+		})
+	}
+}
+
+// TestReconcileKafka_BoundsRunWithActiveDeadline pins that the run is bounded at
+// the Job layer: the backup Job the controller creates carries
+// activeDeadlineSeconds, so Kubernetes fails an unschedulable or wedged Job as
+// DeadlineExceeded and kills its pod before the script's final upload - rather
+// than a controller wall-clock that marks the BackupJob Failed while the Job
+// runs on and orphans its object. Dropping setKafkaJobDeadline turns this red.
+func TestReconcileKafka_BoundsRunWithActiveDeadline(t *testing.T) {
+	now := metav1.Now()
+	bj := &backupsv1alpha1.BackupJob{
+		ObjectMeta: metav1.ObjectMeta{Namespace: "tenant", Name: "bj"},
+		Spec:       backupsv1alpha1.BackupJobSpec{ApplicationRef: kafkaAppRef("src"), BackupClassName: "cozy-default"},
+		Status:     backupsv1alpha1.BackupJobStatus{StartedAt: &now, Phase: backupsv1alpha1.BackupJobPhaseRunning},
+	}
+	r, _ := newKafkaTestEnv(t, newKafkaApp("src", "tenant"),
+		clientfake.NewClientBuilder().WithObjects(bj, newKafkaStrategy("cozy-default-kafka"),
+			readyKafkaCluster("kafka-src", "tenant"), kafkaBrokerPod("kafka-src", "tenant", "quay.io/strimzi/kafka:test")))
+
+	if _, err := r.reconcileKafka(context.Background(), bj, &ResolvedBackupConfig{
+		StrategyRef: corev1.TypedLocalObjectReference{Kind: strategyv1alpha1.KafkaStrategyKind, Name: "cozy-default-kafka"},
+	}); err != nil {
+		t.Fatalf("reconcileKafka: %v", err)
+	}
+	job := getKafkaJob(t, r.Client, "tenant", "bj-backup")
+	if job.Spec.ActiveDeadlineSeconds == nil {
+		t.Fatal("backup Job must carry activeDeadlineSeconds to bound the run at the Job layer")
+	}
+	if got, want := *job.Spec.ActiveDeadlineSeconds, int64(kafkaDefaultBackupDeadline/time.Second); got != want {
+		t.Fatalf("activeDeadlineSeconds = %d, want %d", got, want)
+	}
+}
+
+// TestReconcileKafka_BackupTimeoutParameterOverridesDeadline pins that the
+// backupTimeout BackupClass parameter widens the Job's activeDeadlineSeconds, so
+// a cluster whose export legitimately runs long is not capped at the default.
+func TestReconcileKafka_BackupTimeoutParameterOverridesDeadline(t *testing.T) {
+	now := metav1.Now()
+	bj := &backupsv1alpha1.BackupJob{
+		ObjectMeta: metav1.ObjectMeta{Namespace: "tenant", Name: "bj"},
+		Spec:       backupsv1alpha1.BackupJobSpec{ApplicationRef: kafkaAppRef("src"), BackupClassName: "cozy-default"},
+		Status:     backupsv1alpha1.BackupJobStatus{StartedAt: &now, Phase: backupsv1alpha1.BackupJobPhaseRunning},
+	}
+	r, _ := newKafkaTestEnv(t, newKafkaApp("src", "tenant"),
+		clientfake.NewClientBuilder().WithObjects(bj, newKafkaStrategy("cozy-default-kafka"),
+			readyKafkaCluster("kafka-src", "tenant"), kafkaBrokerPod("kafka-src", "tenant", "quay.io/strimzi/kafka:test")))
+
+	if _, err := r.reconcileKafka(context.Background(), bj, &ResolvedBackupConfig{
+		StrategyRef: corev1.TypedLocalObjectReference{Kind: strategyv1alpha1.KafkaStrategyKind, Name: "cozy-default-kafka"},
+		Parameters:  map[string]string{kafkaBackupTimeoutParam: "2h"},
+	}); err != nil {
+		t.Fatalf("reconcileKafka: %v", err)
+	}
+	job := getKafkaJob(t, r.Client, "tenant", "bj-backup")
+	if job.Spec.ActiveDeadlineSeconds == nil || *job.Spec.ActiveDeadlineSeconds != int64((2*time.Hour)/time.Second) {
+		t.Fatalf("activeDeadlineSeconds = %v, want %d from backupTimeout=2h", job.Spec.ActiveDeadlineSeconds, int64((2*time.Hour)/time.Second))
+	}
+}
+
+// TestReconcileKafka_FailsWhenJobFails pins that a backup Job reported Failed -
+// which is how Kubernetes marks a run that exceeds activeDeadlineSeconds -
+// terminates the BackupJob as Failed rather than requeuing in Running forever.
+func TestReconcileKafka_FailsWhenJobFails(t *testing.T) {
+	now := metav1.Now()
+	bj := &backupsv1alpha1.BackupJob{
+		ObjectMeta: metav1.ObjectMeta{Namespace: "tenant", Name: "bj"},
+		Spec:       backupsv1alpha1.BackupJobSpec{ApplicationRef: kafkaAppRef("src"), BackupClassName: "cozy-default"},
+		Status:     backupsv1alpha1.BackupJobStatus{StartedAt: &now, Phase: backupsv1alpha1.BackupJobPhaseRunning},
+	}
+	failedJob := &batchv1.Job{
+		ObjectMeta: metav1.ObjectMeta{Namespace: "tenant", Name: "bj-backup"},
+		Status: batchv1.JobStatus{Conditions: []batchv1.JobCondition{
+			{Type: batchv1.JobFailed, Status: corev1.ConditionTrue, Reason: "DeadlineExceeded", Message: "Job was active longer than specified deadline"},
+		}},
+	}
+	r, _ := newKafkaTestEnv(t, newKafkaApp("src", "tenant"),
+		clientfake.NewClientBuilder().WithObjects(bj, newKafkaStrategy("cozy-default-kafka"),
+			readyKafkaCluster("kafka-src", "tenant"), kafkaBrokerPod("kafka-src", "tenant", "quay.io/strimzi/kafka:test"), failedJob))
+
+	if _, err := r.reconcileKafka(context.Background(), bj, &ResolvedBackupConfig{
+		StrategyRef: corev1.TypedLocalObjectReference{Kind: strategyv1alpha1.KafkaStrategyKind, Name: "cozy-default-kafka"},
+	}); err != nil {
+		t.Fatalf("reconcileKafka: %v", err)
+	}
+	got := &backupsv1alpha1.BackupJob{}
+	if err := r.Get(context.Background(), client.ObjectKeyFromObject(bj), got); err != nil {
+		t.Fatalf("get bj: %v", err)
+	}
+	if got.Status.Phase != backupsv1alpha1.BackupJobPhaseFailed {
+		t.Fatalf("expected Failed once the Job reported Failed, got %q", got.Status.Phase)
+	}
+}
+
+// podListErrClient forces PodList to fail, to simulate a transient apiserver
+// error while resolving the broker image.
+type podListErrClient struct {
+	client.Client
+	err error
+}
+
+func (c podListErrClient) List(ctx context.Context, list client.ObjectList, opts ...client.ListOption) error {
+	if _, ok := list.(*corev1.PodList); ok {
+		return c.err
+	}
+	return c.Client.List(ctx, list, opts...)
+}
+
+// TestReconcileKafka_RequeuesTransientBrokerImageError pins that a transient
+// List error while resolving the broker image requeues (returns an error) rather
+// than terminating the whole backup - only a Ready cluster with no listable
+// broker is terminal.
+func TestReconcileKafka_RequeuesTransientBrokerImageError(t *testing.T) {
+	now := metav1.Now()
+	bj := &backupsv1alpha1.BackupJob{
+		ObjectMeta: metav1.ObjectMeta{Namespace: "tenant", Name: "bj"},
+		Spec:       backupsv1alpha1.BackupJobSpec{ApplicationRef: kafkaAppRef("src"), BackupClassName: "cozy-default"},
+		Status:     backupsv1alpha1.BackupJobStatus{StartedAt: &now, Phase: backupsv1alpha1.BackupJobPhaseRunning},
+	}
+	r, _ := newKafkaTestEnv(t, newKafkaApp("src", "tenant"),
+		clientfake.NewClientBuilder().WithObjects(bj, newKafkaStrategy("cozy-default-kafka"),
+			readyKafkaCluster("kafka-src", "tenant")))
+	r.Client = podListErrClient{Client: r.Client, err: apierrors.NewInternalError(errors.New("apiserver unavailable"))}
+
+	_, err := r.reconcileKafka(context.Background(), bj, &ResolvedBackupConfig{
+		StrategyRef: corev1.TypedLocalObjectReference{Kind: strategyv1alpha1.KafkaStrategyKind, Name: "cozy-default-kafka"},
+	})
+	if err == nil {
+		t.Fatal("expected a requeue error on a transient broker List failure")
+	}
+	got := &backupsv1alpha1.BackupJob{}
+	if gerr := r.Get(context.Background(), client.ObjectKeyFromObject(bj), got); gerr != nil {
+		t.Fatalf("get bj: %v", gerr)
+	}
+	if got.Status.Phase == backupsv1alpha1.BackupJobPhaseFailed {
+		t.Fatal("a transient List error must not terminate the backup as Failed")
+	}
+}
+
+// kafkaBackup builds a Backup fixture that has already recorded its metadata
+// object, for the cleanup path (whose delete is keyed on status.artifact.uri).
+func kafkaBackup(name, namespace string) *backupsv1alpha1.Backup {
+	return &backupsv1alpha1.Backup{
+		ObjectMeta: metav1.ObjectMeta{Namespace: namespace, Name: name},
+		Spec: backupsv1alpha1.BackupSpec{
+			ApplicationRef: kafkaAppRef("src"),
+			StrategyRef:    corev1.TypedLocalObjectReference{Kind: strategyv1alpha1.KafkaStrategyKind, Name: "cozy-default-kafka"},
+			DriverMetadata: map[string]string{
+				kafkaScopeKey:               kafkaScopeValue,
+				kafkaStrategyClientImageKey: "quay.io/strimzi/kafka:test@sha256:deadbeef",
+			},
+		},
+		Status: backupsv1alpha1.BackupStatus{
+			Phase:    backupsv1alpha1.BackupPhaseReady,
+			Artifact: &backupsv1alpha1.BackupArtifact{URI: "s3://bkt/" + namespace + "/src/" + name + "/kafka-metadata.txt"},
+		},
+	}
+}
+
+// TestCleanupKafkaBackup_SpawnsDeleteJob pins that deleting a Backup spawns an
+// ownerless, self-cleaning Job that deletes the recorded object in cleanup mode
+// (with the URI injected), so a retention-pruned Plan does not leak objects -
+// the same contract the Backup cleanup dispatcher routes KafkaStrategyKind to.
+func TestCleanupKafkaBackup_SpawnsDeleteJob(t *testing.T) {
+	testScheme := runtime.NewScheme()
+	_ = scheme.AddToScheme(testScheme)
+	_ = backupsv1alpha1.AddToScheme(testScheme)
+	_ = strategyv1alpha1.AddToScheme(testScheme)
+
+	backup := kafkaBackup("kafka-src", "tenant-test")
+	strategy := newKafkaStrategy("cozy-default-kafka")
+	ns := &corev1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: "tenant-test"}}
+	c := clientfake.NewClientBuilder().WithScheme(testScheme).
+		WithStatusSubresource(&batchv1.Job{}).
+		WithObjects(ns, backup, strategy).Build()
+	// Empty CredentialsConfig: ProjectBackupCredentials is a no-op when disabled.
+	r := &BackupReconciler{Client: c, Scheme: testScheme, Recorder: record.NewFakeRecorder(10)}
+	ctx := context.Background()
+
+	res, err := r.cleanupKafkaBackup(ctx, backup)
+	if err != nil {
+		t.Fatalf("cleanupKafkaBackup() error = %v", err)
+	}
+	if res.RequeueAfter == 0 {
+		t.Error("expected a requeue while the delete Job runs (must not orphan the object)")
+	}
+	jobs := &batchv1.JobList{}
+	if err := c.List(ctx, jobs, client.InNamespace("tenant-test")); err != nil {
+		t.Fatalf("list jobs: %v", err)
+	}
+	if len(jobs.Items) != 1 {
+		t.Fatalf("expected 1 cleanup Job, got %d", len(jobs.Items))
+	}
+	job := jobs.Items[0]
+	if job.Name != "kafka-src-cleanup" {
+		t.Errorf("job name = %q, want kafka-src-cleanup", job.Name)
+	}
+	if len(job.OwnerReferences) != 0 {
+		t.Errorf("cleanup Job must be ownerless so it survives Backup deletion, got %d ownerRefs", len(job.OwnerReferences))
+	}
+	if job.Labels[kafkaStrategyLabelMode] != kafkaStrategyModeCleanup {
+		t.Errorf("mode label = %q, want %q", job.Labels[kafkaStrategyLabelMode], kafkaStrategyModeCleanup)
+	}
+	if job.Spec.TTLSecondsAfterFinished == nil || job.Spec.ActiveDeadlineSeconds == nil {
+		t.Error("expected TTLSecondsAfterFinished + ActiveDeadlineSeconds on the cleanup Job")
+	}
+	args := job.Spec.Template.Spec.Containers[0].Args
+	foundMode, foundURI := false, false
+	for _, a := range args {
+		if a == "--mode=cleanup" {
+			foundMode = true
+		}
+		if a == "--uri="+backup.Status.Artifact.URI {
+			foundURI = true
+		}
+	}
+	if !foundMode {
+		t.Errorf("expected the pod rendered in cleanup mode (--mode=cleanup), got args %v", args)
+	}
+	if !foundURI {
+		t.Errorf("expected the recorded artifact URI injected into the cleanup pod, got args %v", args)
+	}
+	// Cleanup runs through the image the backup recorded (the source broker may be
+	// gone), injected via the .ClientImage placeholder.
+	if img := job.Spec.Template.Spec.Containers[0].Image; img != backup.Spec.DriverMetadata[kafkaStrategyClientImageKey] {
+		t.Errorf("cleanup Job image = %q, want the recorded client image %q", img, backup.Spec.DriverMetadata[kafkaStrategyClientImageKey])
+	}
+
+	// Once the delete Job completes, cleanup finishes (zero Result) and reaps the
+	// Job - so the Backup is only released after the object is gone.
+	job.Status.Conditions = []batchv1.JobCondition{{Type: batchv1.JobComplete, Status: corev1.ConditionTrue}}
+	if err := c.Status().Update(ctx, &job); err != nil {
+		t.Fatalf("update job status: %v", err)
+	}
+	res, err = r.cleanupKafkaBackup(ctx, backup)
+	if err != nil {
+		t.Fatalf("cleanupKafkaBackup() second call error = %v", err)
+	}
+	if res.RequeueAfter != 0 || res.Requeue {
+		t.Errorf("expected cleanup to finish once the Job completed, got requeue %+v", res)
+	}
+	if err := c.List(ctx, jobs, client.InNamespace("tenant-test")); err != nil {
+		t.Fatalf("list jobs: %v", err)
+	}
+	if len(jobs.Items) != 0 {
+		t.Errorf("expected the completed cleanup Job to be reaped, got %d", len(jobs.Items))
+	}
+}
+
+func readyKafkaCluster(name, namespace string) *kafkatypes.Kafka {
+	return &kafkatypes.Kafka{
+		ObjectMeta: metav1.ObjectMeta{Namespace: namespace, Name: name},
+		Status: kafkatypes.KafkaStatus{Conditions: []metav1.Condition{
+			{Type: kafkatypes.ConditionTypeReady, Status: metav1.ConditionTrue, Reason: "Ready"},
+		}},
+	}
+}
+
+// kafkaBrokerPod builds a Strimzi broker pod the way the driver locates it: by
+// the cluster label, with the image on a container named "kafka".
+func kafkaBrokerPod(cluster, namespace, image string) *corev1.Pod {
+	return &corev1.Pod{
+		ObjectMeta: metav1.ObjectMeta{
+			Namespace: namespace,
+			Name:      cluster + "-broker-0",
+			Labels:    map[string]string{kafkaBrokerClusterLabel: cluster},
+		},
+		Spec: corev1.PodSpec{Containers: []corev1.Container{{Name: kafkaBrokerContainerName, Image: image}}},
+	}
+}
+
+// TestReconcileKafka_ResolvesBrokerImage pins that the backup Job runs the target
+// broker's own image (resolved from a live broker pod), not a chart pin. Dropping
+// the resolver leaves the container image the unrendered ".ClientImage"
+// placeholder, turning this red.
+func TestReconcileKafka_ResolvesBrokerImage(t *testing.T) {
+	const brokerImage = "quay.io/strimzi/kafka:0.45.1-kafka-3.9.1@sha256:abc"
+	now := metav1.Now()
+	bj := &backupsv1alpha1.BackupJob{
+		ObjectMeta: metav1.ObjectMeta{Namespace: "tenant", Name: "bj"},
+		Spec:       backupsv1alpha1.BackupJobSpec{ApplicationRef: kafkaAppRef("src"), BackupClassName: "cozy-default"},
+		Status:     backupsv1alpha1.BackupJobStatus{StartedAt: &now, Phase: backupsv1alpha1.BackupJobPhaseRunning},
+	}
+	r, _ := newKafkaTestEnv(t, newKafkaApp("src", "tenant"),
+		clientfake.NewClientBuilder().WithObjects(bj, newKafkaStrategy("cozy-default-kafka"),
+			readyKafkaCluster("kafka-src", "tenant"), kafkaBrokerPod("kafka-src", "tenant", brokerImage)))
+
+	if _, err := r.reconcileKafka(context.Background(), bj, &ResolvedBackupConfig{
+		StrategyRef: corev1.TypedLocalObjectReference{Kind: strategyv1alpha1.KafkaStrategyKind, Name: "cozy-default-kafka"},
+	}); err != nil {
+		t.Fatalf("reconcileKafka: %v", err)
+	}
+	jobs := &batchv1.JobList{}
+	if err := r.List(context.Background(), jobs, client.InNamespace("tenant")); err != nil {
+		t.Fatalf("list jobs: %v", err)
+	}
+	if len(jobs.Items) != 1 {
+		t.Fatalf("expected one backup Job, got %d", len(jobs.Items))
+	}
+	if img := jobs.Items[0].Spec.Template.Spec.Containers[0].Image; img != brokerImage {
+		t.Fatalf("backup Job image = %q, want the resolved broker image %q", img, brokerImage)
+	}
+}
+
+// TestReconcileKafka_FailsWhenNoBrokerImage pins the fail-closed behaviour: a
+// Ready cluster with no resolvable broker image terminates the BackupJob Failed
+// with a legible reason and creates no Job, rather than running one with an
+// empty/placeholder image.
+func TestReconcileKafka_FailsWhenNoBrokerImage(t *testing.T) {
+	now := metav1.Now()
+	bj := &backupsv1alpha1.BackupJob{
+		ObjectMeta: metav1.ObjectMeta{Namespace: "tenant", Name: "bj"},
+		Spec:       backupsv1alpha1.BackupJobSpec{ApplicationRef: kafkaAppRef("src"), BackupClassName: "cozy-default"},
+		Status:     backupsv1alpha1.BackupJobStatus{StartedAt: &now, Phase: backupsv1alpha1.BackupJobPhaseRunning},
+	}
+	// Ready cluster, but no broker pod to resolve the image from.
+	r, _ := newKafkaTestEnv(t, newKafkaApp("src", "tenant"),
+		clientfake.NewClientBuilder().WithObjects(bj, newKafkaStrategy("cozy-default-kafka"),
+			readyKafkaCluster("kafka-src", "tenant")))
+
+	if _, err := r.reconcileKafka(context.Background(), bj, &ResolvedBackupConfig{
+		StrategyRef: corev1.TypedLocalObjectReference{Kind: strategyv1alpha1.KafkaStrategyKind, Name: "cozy-default-kafka"},
+	}); err != nil {
+		t.Fatalf("reconcileKafka: %v", err)
+	}
+	got := &backupsv1alpha1.BackupJob{}
+	if err := r.Get(context.Background(), client.ObjectKeyFromObject(bj), got); err != nil {
+		t.Fatalf("get bj: %v", err)
+	}
+	if got.Status.Phase != backupsv1alpha1.BackupJobPhaseFailed {
+		t.Fatalf("phase = %q, want Failed when the client image cannot be resolved", got.Status.Phase)
+	}
+	jobs := &batchv1.JobList{}
+	if err := r.List(context.Background(), jobs, client.InNamespace("tenant")); err != nil {
+		t.Fatalf("list jobs: %v", err)
+	}
+	if len(jobs.Items) != 0 {
+		t.Fatalf("expected no batch Job when the image cannot be resolved, got %d", len(jobs.Items))
+	}
+}
diff --git a/internal/backupcontroller/kafkatypes/types.go b/internal/backupcontroller/kafkatypes/types.go
new file mode 100644
index 0000000000..9a7e362676
--- /dev/null
+++ b/internal/backupcontroller/kafkatypes/types.go
@@ -0,0 +1,68 @@
+// SPDX-License-Identifier: Apache-2.0
+
+// Package kafkatypes declares the minimum subset of the kafka.strimzi.io/v1beta2
+// Kafka cluster CR the backupstrategy controller reads: the Ready condition,
+// used only as a readiness precondition before the Kafka metadata backup/restore
+// Job runs. Modelled as a partial (no spec) so we avoid pulling the full Strimzi
+// Go API while dropping unstructured.Unstructured from the driver and its tests.
+// The driver never writes this CR.
+//
+// +groupName=kafka.strimzi.io
+// +versionName=v1beta2
+// +kubebuilder:object:generate=true
+package kafkatypes
+
+import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+)
+
+const (
+	GroupName = "kafka.strimzi.io"
+	Version   = "v1beta2"
+
+	// ConditionTypeReady is the Strimzi cluster-operator condition that turns
+	// True once the Kafka cluster (brokers, and in ZooKeeper mode ZooKeeper) is
+	// up and serving. The Admin API the backup Job talks to is only reachable
+	// then.
+	ConditionTypeReady = "Ready"
+)
+
+var (
+	GroupVersion  = schema.GroupVersion{Group: GroupName, Version: Version}
+	SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
+	AddToScheme   = SchemeBuilder.AddToScheme
+)
+
+func addKnownTypes(scheme *runtime.Scheme) error {
+	scheme.AddKnownTypes(GroupVersion,
+		&Kafka{}, &KafkaList{},
+	)
+	metav1.AddToGroupVersion(scheme, GroupVersion)
+	return nil
+}
+
+// +kubebuilder:object:root=true
+type Kafka struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+	Spec              KafkaSpec   `json:"spec,omitempty"`
+	Status            KafkaStatus `json:"status,omitempty"`
+}
+
+// +kubebuilder:object:root=true
+type KafkaList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+	Items           []Kafka `json:"items"`
+}
+
+// KafkaSpec is intentionally empty: the driver reads the cluster only for its
+// existence and Ready condition, never a spec field. Kept as a named struct so
+// Kafka stays a regular kubebuilder object rather than a degenerate shell.
+type KafkaSpec struct{}
+
+type KafkaStatus struct {
+	Conditions []metav1.Condition `json:"conditions,omitempty"`
+}
diff --git a/internal/backupcontroller/kafkatypes/zz_generated.deepcopy.go b/internal/backupcontroller/kafkatypes/zz_generated.deepcopy.go
new file mode 100644
index 0000000000..7ff2c3a555
--- /dev/null
+++ b/internal/backupcontroller/kafkatypes/zz_generated.deepcopy.go
@@ -0,0 +1,122 @@
+//go:build !ignore_autogenerated
+
+/*
+Copyright 2025 The Cozystack Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// Code generated by controller-gen. DO NOT EDIT.
+
+package kafkatypes
+
+import (
+	"k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+)
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *Kafka) DeepCopyInto(out *Kafka) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
+	out.Spec = in.Spec
+	in.Status.DeepCopyInto(&out.Status)
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Kafka.
+func (in *Kafka) DeepCopy() *Kafka {
+	if in == nil {
+		return nil
+	}
+	out := new(Kafka)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *Kafka) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *KafkaList) DeepCopyInto(out *KafkaList) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ListMeta.DeepCopyInto(&out.ListMeta)
+	if in.Items != nil {
+		in, out := &in.Items, &out.Items
+		*out = make([]Kafka, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new KafkaList.
+func (in *KafkaList) DeepCopy() *KafkaList {
+	if in == nil {
+		return nil
+	}
+	out := new(KafkaList)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *KafkaList) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *KafkaSpec) DeepCopyInto(out *KafkaSpec) {
+	*out = *in
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new KafkaSpec.
+func (in *KafkaSpec) DeepCopy() *KafkaSpec {
+	if in == nil {
+		return nil
+	}
+	out := new(KafkaSpec)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *KafkaStatus) DeepCopyInto(out *KafkaStatus) {
+	*out = *in
+	if in.Conditions != nil {
+		in, out := &in.Conditions, &out.Conditions
+		*out = make([]v1.Condition, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new KafkaStatus.
+func (in *KafkaStatus) DeepCopy() *KafkaStatus {
+	if in == nil {
+		return nil
+	}
+	out := new(KafkaStatus)
+	in.DeepCopyInto(out)
+	return out
+}
diff --git a/internal/backupcontroller/legacy_password_scrubber.go b/internal/backupcontroller/legacy_password_scrubber.go
new file mode 100644
index 0000000000..d54393f108
--- /dev/null
+++ b/internal/backupcontroller/legacy_password_scrubber.go
@@ -0,0 +1,121 @@
+package backupcontroller
+
+import (
+	"bytes"
+	"context"
+	"encoding/json"
+
+	"k8s.io/apimachinery/pkg/runtime"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/log"
+	"sigs.k8s.io/controller-runtime/pkg/manager"
+
+	backupsv1alpha1 "github.com/cozystack/cozystack/api/backups/v1alpha1"
+)
+
+// LegacyPasswordScrubber is a one-shot Runnable that removes plaintext
+// users[].password values from CNPG Backup snapshots in
+// status.underlyingResources.
+//
+// Snapshots taken while the Postgres app still accepted users[].password
+// copied it verbatim, where anyone with `get backups` in the namespace can
+// read it. New snapshots no longer carry the field, and restore ignores it,
+// so dropping it changes nothing but the exposure.
+//
+// It runs on every leader start rather than once per cluster, so a Backup
+// written by a pre-upgrade replica during the rollout, or brought back from
+// an object-level backup, is still cleaned. On a clean cluster it is a
+// single cached List.
+//
+// TODO(#4179): remove once upgrading from a release that accepted
+// users[].password is no longer supported.
+type LegacyPasswordScrubber struct {
+	Client client.Client
+}
+
+var (
+	_ manager.Runnable               = (*LegacyPasswordScrubber)(nil)
+	_ manager.LeaderElectionRunnable = (*LegacyPasswordScrubber)(nil)
+)
+
+func (s *LegacyPasswordScrubber) NeedLeaderElection() bool { return true }
+
+// Start never returns an error: a returned error stops the manager, and a
+// Backup that cannot be cleaned must not take backups down with it.
+func (s *LegacyPasswordScrubber) Start(ctx context.Context) error {
+	logger := log.FromContext(ctx).WithName("legacy-password-scrubber")
+
+	var backups backupsv1alpha1.BackupList
+	if err := s.Client.List(ctx, &backups); err != nil {
+		logger.Error(err, "listing Backups; legacy snapshot passwords were not scrubbed")
+		return nil
+	}
+
+	scrubbed := 0
+	for i := range backups.Items {
+		b := &backups.Items[i]
+		if b.Status.UnderlyingResources == nil {
+			continue
+		}
+		raw, changed, err := scrubCNPGSnapshotPasswords(b.Status.UnderlyingResources.Raw)
+		if err != nil {
+			logger.Error(err, "decoding status.underlyingResources", "namespace", b.Namespace, "backup", b.Name)
+			continue
+		}
+		if !changed {
+			continue
+		}
+		// A merge patch computed from the diff carries only
+		// `password: null` per user, so it cannot overwrite status fields
+		// another writer changed since the List.
+		orig := b.DeepCopy()
+		b.Status.UnderlyingResources = &runtime.RawExtension{Raw: raw}
+		if err := s.Client.Patch(ctx, b, client.MergeFrom(orig)); client.IgnoreNotFound(err) != nil {
+			logger.Error(err, "patching Backup", "namespace", b.Namespace, "backup", b.Name)
+			continue
+		}
+		scrubbed++
+		logger.Info("removed legacy plaintext passwords from Backup snapshot", "namespace", b.Namespace, "backup", b.Name)
+	}
+	logger.Info("legacy snapshot password scrub finished", "scanned", len(backups.Items), "scrubbed", scrubbed)
+	return nil
+}
+
+// scrubCNPGSnapshotPasswords returns raw with users.*.password removed when
+// raw is a CNPG snapshot carrying one, and changed=false otherwise. It
+// decodes into generic maps so fields the current snapshot type does not
+// know survive the round trip.
+func scrubCNPGSnapshotPasswords(raw []byte) ([]byte, bool, error) {
+	if len(raw) == 0 {
+		return raw, false, nil
+	}
+	dec := json.NewDecoder(bytes.NewReader(raw))
+	dec.UseNumber()
+	var snap map[string]any
+	if err := dec.Decode(&snap); err != nil {
+		return nil, false, err
+	}
+	if snap["kind"] != cnpgBackupSnapshotKind || snap["apiVersion"] != cnpgBackupSnapshotAPIVersion {
+		return raw, false, nil
+	}
+	users, _ := snap["users"].(map[string]any)
+	changed := false
+	for _, u := range users {
+		user, ok := u.(map[string]any)
+		if !ok {
+			continue
+		}
+		if _, ok := user["password"]; ok {
+			delete(user, "password")
+			changed = true
+		}
+	}
+	if !changed {
+		return raw, false, nil
+	}
+	out, err := json.Marshal(snap)
+	if err != nil {
+		return nil, false, err
+	}
+	return out, true, nil
+}
diff --git a/internal/backupcontroller/legacy_password_scrubber_test.go b/internal/backupcontroller/legacy_password_scrubber_test.go
new file mode 100644
index 0000000000..0f0f4e58ab
--- /dev/null
+++ b/internal/backupcontroller/legacy_password_scrubber_test.go
@@ -0,0 +1,167 @@
+package backupcontroller
+
+import (
+	"bytes"
+	"context"
+	"encoding/json"
+	"errors"
+	"testing"
+
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/types"
+	"k8s.io/client-go/kubernetes/scheme"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+	clientfake "sigs.k8s.io/controller-runtime/pkg/client/fake"
+	"sigs.k8s.io/controller-runtime/pkg/client/interceptor"
+
+	backupsv1alpha1 "github.com/cozystack/cozystack/api/backups/v1alpha1"
+)
+
+func backupWithSnapshot(name, raw string) *backupsv1alpha1.Backup {
+	b := &backupsv1alpha1.Backup{
+		ObjectMeta: metav1.ObjectMeta{Name: name, Namespace: "tenant-a"},
+	}
+	if raw != "" {
+		b.Status.UnderlyingResources = &runtime.RawExtension{Raw: []byte(raw)}
+	}
+	return b
+}
+
+func legacyCNPGSnapshot() string {
+	return `{"kind":"CNPGBackupSnapshot","apiVersion":"` + cnpgBackupSnapshotAPIVersion + `",` +
+		`"databases":{"app":{"roles":{"admin":["alice"]}}},` +
+		`"users":{"alice":{"password":"hunter2","replication":true},"bob":{"password":"s3cret"},"carol":{}},` +
+		`"parameters":{"retention":"30d"},"futureField":{"n":12345678901234567890}}`
+}
+
+func newScrubberClient(objs ...client.Object) client.WithWatch {
+	s := runtime.NewScheme()
+	_ = scheme.AddToScheme(s)
+	_ = backupsv1alpha1.AddToScheme(s)
+	return clientfake.NewClientBuilder().WithScheme(s).WithObjects(objs...).Build()
+}
+
+func getSnapshot(t *testing.T, c client.Client, name string) map[string]any {
+	t.Helper()
+	var b backupsv1alpha1.Backup
+	if err := c.Get(context.Background(), types.NamespacedName{Namespace: "tenant-a", Name: name}, &b); err != nil {
+		t.Fatalf("get Backup %s: %v", name, err)
+	}
+	if b.Status.UnderlyingResources == nil {
+		return nil
+	}
+	var snap map[string]any
+	dec := json.NewDecoder(bytes.NewReader(b.Status.UnderlyingResources.Raw))
+	dec.UseNumber()
+	if err := dec.Decode(&snap); err != nil {
+		t.Fatalf("decode snapshot of %s: %v", name, err)
+	}
+	return snap
+}
+
+func TestLegacyPasswordScrubber_RemovesPasswordsAndKeepsTheRest(t *testing.T) {
+	c := newScrubberClient(backupWithSnapshot("legacy", legacyCNPGSnapshot()))
+
+	if err := (&LegacyPasswordScrubber{Client: c}).Start(context.Background()); err != nil {
+		t.Fatalf("Start: %v", err)
+	}
+
+	snap := getSnapshot(t, c, "legacy")
+	users := snap["users"].(map[string]any)
+	for name, u := range users {
+		if _, ok := u.(map[string]any)["password"]; ok {
+			t.Errorf("user %s still carries a password", name)
+		}
+	}
+	if len(users) != 3 {
+		t.Errorf("users = %v, want alice, bob and carol kept", users)
+	}
+	if got := users["alice"].(map[string]any)["replication"]; got != true {
+		t.Errorf("alice.replication = %v, want true", got)
+	}
+	if got := snap["parameters"].(map[string]any)["retention"]; got != "30d" {
+		t.Errorf("parameters.retention = %v, want 30d", got)
+	}
+	if _, ok := snap["databases"].(map[string]any)["app"]; !ok {
+		t.Errorf("databases.app was dropped: %v", snap["databases"])
+	}
+	if got := snap["futureField"].(map[string]any)["n"]; got != json.Number("12345678901234567890") {
+		t.Errorf("unknown field lost precision or was dropped: %v", got)
+	}
+
+	// The restore path must still accept the scrubbed snapshot.
+	var b backupsv1alpha1.Backup
+	_ = c.Get(context.Background(), types.NamespacedName{Namespace: "tenant-a", Name: "legacy"}, &b)
+	if _, err := unmarshalCNPGBackupSnapshot(&b); err != nil {
+		t.Errorf("scrubbed snapshot no longer decodes for restore: %v", err)
+	}
+}
+
+func TestLegacyPasswordScrubber_LeavesOtherBackupsUntouched(t *testing.T) {
+	cases := map[string]string{
+		"clean-cnpg":    `{"kind":"CNPGBackupSnapshot","apiVersion":"` + cnpgBackupSnapshotAPIVersion + `","users":{"alice":{}}}`,
+		"other-kind":    `{"kind":"SomeOtherSnapshot","apiVersion":"` + cnpgBackupSnapshotAPIVersion + `","users":{"alice":{"password":"keep"}}}`,
+		"other-version": `{"kind":"CNPGBackupSnapshot","apiVersion":"example.com/v9","users":{"alice":{"password":"keep"}}}`,
+		"no-snapshot":   ``,
+	}
+	var objs []client.Object
+	for name, raw := range cases {
+		objs = append(objs, backupWithSnapshot(name, raw))
+	}
+	c := newScrubberClient(objs...)
+	before := map[string]string{}
+	for name := range cases {
+		var b backupsv1alpha1.Backup
+		_ = c.Get(context.Background(), types.NamespacedName{Namespace: "tenant-a", Name: name}, &b)
+		before[name] = b.ResourceVersion
+	}
+
+	if err := (&LegacyPasswordScrubber{Client: c}).Start(context.Background()); err != nil {
+		t.Fatalf("Start: %v", err)
+	}
+
+	for name := range cases {
+		var b backupsv1alpha1.Backup
+		_ = c.Get(context.Background(), types.NamespacedName{Namespace: "tenant-a", Name: name}, &b)
+		if b.ResourceVersion != before[name] {
+			t.Errorf("%s was patched but carries nothing to scrub", name)
+		}
+	}
+}
+
+func TestLegacyPasswordScrubber_OneBadBackupDoesNotStopTheRest(t *testing.T) {
+	c := newScrubberClient(
+		backupWithSnapshot("not-an-object", `["not","an","object"]`),
+		backupWithSnapshot("a-patch-fails", legacyCNPGSnapshot()),
+		backupWithSnapshot("z-legacy", legacyCNPGSnapshot()),
+	)
+	failing := interceptor.NewClient(c, interceptor.Funcs{
+		Patch: func(ctx context.Context, cl client.WithWatch, obj client.Object, patch client.Patch, opts ...client.PatchOption) error {
+			if obj.GetName() == "a-patch-fails" {
+				return errors.New("apiserver unavailable")
+			}
+			return cl.Patch(ctx, obj, patch, opts...)
+		},
+	})
+
+	if err := (&LegacyPasswordScrubber{Client: failing}).Start(context.Background()); err != nil {
+		t.Fatalf("Start must not fail the manager, got %v", err)
+	}
+
+	users := getSnapshot(t, c, "z-legacy")["users"].(map[string]any)
+	if _, ok := users["alice"].(map[string]any)["password"]; ok {
+		t.Error("legacy Backup was not scrubbed after an earlier Backup failed")
+	}
+}
+
+func TestLegacyPasswordScrubber_ListFailureDoesNotStopTheManager(t *testing.T) {
+	failing := interceptor.NewClient(newScrubberClient(), interceptor.Funcs{
+		List: func(context.Context, client.WithWatch, client.ObjectList, ...client.ListOption) error {
+			return errors.New("forbidden")
+		},
+	})
+	if err := (&LegacyPasswordScrubber{Client: failing}).Start(context.Background()); err != nil {
+		t.Fatalf("Start must not fail the manager, got %v", err)
+	}
+}
diff --git a/internal/backupcontroller/mariadbstrategy_controller.go b/internal/backupcontroller/mariadbstrategy_controller.go
index c5bfcdb801..a5bd770944 100644
--- a/internal/backupcontroller/mariadbstrategy_controller.go
+++ b/internal/backupcontroller/mariadbstrategy_controller.go
@@ -13,6 +13,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/types"
+	"k8s.io/utils/ptr"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
@@ -302,6 +303,10 @@ func (r *BackupJobReconciler) ensureMariaDBBackup(ctx context.Context, j *backup
 			Compression:  rendered.Compression,
 			LogLevel:     rendered.LogLevel,
 			MaxRetention: rendered.MaxRetention.DeepCopy(),
+			// Keep the source's grant table out of the dump so a restore into a
+			// copy leaves the target's chart-managed users and root intact (see
+			// BackupSpec.IgnoreGlobalPriv).
+			IgnoreGlobalPriv: ptr.To(true),
 		},
 	}
 
@@ -745,7 +750,7 @@ func renderMariaDBTemplate(t strategyv1alpha1.MariaDBTemplate, app *mariadbapp.M
 	if err != nil {
 		return nil, fmt.Errorf("encode application for templating: %w", err)
 	}
-	templateContext := map[string]interface{}{
+	templateContext := map[string]any{
 		"Application": appAsMap,
 		"Parameters":  parameters,
 	}
@@ -756,12 +761,12 @@ func renderMariaDBTemplate(t strategyv1alpha1.MariaDBTemplate, app *mariadbapp.M
 // so user-authored go-templates address fields by their JSON names (e.g.
 // .Application.metadata.name). Mirrors the helper in the CNPG controller;
 // scoped here to avoid cross-strategy import.
-func toJSONMapMariaDB(obj interface{}) (map[string]interface{}, error) {
+func toJSONMapMariaDB(obj any) (map[string]any, error) {
 	raw, err := json.Marshal(obj)
 	if err != nil {
 		return nil, err
 	}
-	out := map[string]interface{}{}
+	out := map[string]any{}
 	if err := json.Unmarshal(raw, &out); err != nil {
 		return nil, err
 	}
diff --git a/internal/backupcontroller/mariadbstrategy_controller_test.go b/internal/backupcontroller/mariadbstrategy_controller_test.go
index 9d0001e81d..0e4f63b5e5 100644
--- a/internal/backupcontroller/mariadbstrategy_controller_test.go
+++ b/internal/backupcontroller/mariadbstrategy_controller_test.go
@@ -300,6 +300,13 @@ func TestEnsureMariaDBBackup_IdempotentByLabel(t *testing.T) {
 	if got.Labels[backupsv1alpha1.OwningJobNameLabel] != "bj-1" {
 		t.Errorf("OwningJobName label missing or wrong: %v", got.Labels)
 	}
+	// The grant table must be excluded from the dump: the operator otherwise
+	// ships mysql.global_priv even for a scoped backup, and a restore into a
+	// copy would then overwrite the target's chart-managed users and root with
+	// the source's hashes, which never match <release>-credentials.
+	if got.Spec.IgnoreGlobalPriv == nil || !*got.Spec.IgnoreGlobalPriv {
+		t.Errorf("IgnoreGlobalPriv: got %v want true", got.Spec.IgnoreGlobalPriv)
+	}
 }
 
 // ---------------------------------------------------------------------------
diff --git a/internal/backupcontroller/mariadbtypes/types.go b/internal/backupcontroller/mariadbtypes/types.go
index 3a1be22c79..7bc5b03a10 100644
--- a/internal/backupcontroller/mariadbtypes/types.go
+++ b/internal/backupcontroller/mariadbtypes/types.go
@@ -122,12 +122,23 @@ type BackupList struct {
 // the driver writes. Unknown fields are preserved by the server during
 // merge patches; everything we don't set falls back to operator defaults.
 type BackupSpec struct {
-	MariaDBRef  MariaDBObjectRef `json:"mariaDbRef"`
-	Storage     BackupStorage    `json:"storage"`
-	Databases   []string         `json:"databases,omitempty"`
-	Compression string           `json:"compression,omitempty"`
+	MariaDBRef   MariaDBObjectRef `json:"mariaDbRef"`
+	Storage      BackupStorage    `json:"storage"`
+	Databases    []string         `json:"databases,omitempty"`
+	Compression  string           `json:"compression,omitempty"`
 	MaxRetention *metav1.Duration `json:"maxRetention,omitempty"`
-	LogLevel    string           `json:"logLevel,omitempty"`
+	LogLevel     string           `json:"logLevel,omitempty"`
+	// IgnoreGlobalPriv excludes mysql.global_priv (the grant table holding
+	// every user's password hash, root included) from the logical dump. The
+	// operator otherwise ships it even for a database-scoped backup, so a
+	// restore into a copy would overwrite the target's grant table with the
+	// source's hashes - and the target's passwords are chart-generated in
+	// <release>-credentials, never the source's, so every application-user
+	// login would then fail and root, which the operator only sets at datadir
+	// bootstrap, would be wrong for good. Cozystack owns users through their
+	// User CRs and root through rootPasswordSecretKeyRef, so the grant table is
+	// never the source of truth and is safe to drop from the dump.
+	IgnoreGlobalPriv *bool `json:"ignoreGlobalPriv,omitempty"`
 }
 
 // MariaDBObjectRef is a local reference to the source/target MariaDB CR.
diff --git a/internal/backupcontroller/mongodbapp/types.go b/internal/backupcontroller/mongodbapp/types.go
new file mode 100644
index 0000000000..e00cacb270
--- /dev/null
+++ b/internal/backupcontroller/mongodbapp/types.go
@@ -0,0 +1,73 @@
+// SPDX-License-Identifier: Apache-2.0
+
+// Package mongodbapp declares the typed shape of the apps.cozystack.io/v1alpha1
+// MongoDB CR that the MongoDB backup driver reads. It carries only fields the
+// driver touches (currently nothing under spec — the driver drives the
+// downstream psmdb.percona.com CRs directly via psmdbtypes), but the type
+// still serves as a typed application-side handle so the driver can fetch the
+// CR via the typed client and surface NotFound semantics cleanly. Mirrors
+// mariadbapp.
+//
+// Living in an internal package keeps this duplication out of the public
+// api/apps/v1alpha1 module, which exists for external consumers (the
+// cozystack-api server, in particular) and has its own release cadence.
+//
+// +groupName=apps.cozystack.io
+// +versionName=v1alpha1
+package mongodbapp
+
+import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+)
+
+const (
+	GroupName = "apps.cozystack.io"
+	Version   = "v1alpha1"
+	Kind      = "MongoDB"
+	ListKind  = Kind + "List"
+)
+
+var (
+	GroupVersion  = schema.GroupVersion{Group: GroupName, Version: Version}
+	SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
+	AddToScheme   = SchemeBuilder.AddToScheme
+)
+
+func addKnownTypes(scheme *runtime.Scheme) error {
+	scheme.AddKnownTypeWithName(GroupVersion.WithKind(Kind), &MongoDB{})
+	scheme.AddKnownTypeWithName(GroupVersion.WithKind(ListKind), &MongoDBList{})
+	metav1.AddToGroupVersion(scheme, GroupVersion)
+	return nil
+}
+
+type MongoDB struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+	Spec              MongoDBSpec `json:"spec,omitempty"`
+}
+
+type MongoDBList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+	Items           []MongoDB `json:"items"`
+}
+
+// MongoDBSpec mirrors only the apps.cozystack.io/MongoDB spec fields the driver
+// reads. It drives the downstream psmdb.percona.com CRs directly, so it keeps
+// no other spec state here.
+type MongoDBSpec struct {
+	Backup MongoDBBackupSpec `json:"backup,omitempty"`
+}
+
+// MongoDBBackupSpec carries the backup fields the driver reads off the app CR.
+// UseSystemBucket is the tenant's opt-in to the platform system bucket: on that
+// flow the chart leaves spec.backup.storages unset and the driver injects the
+// storage from the strategy coordinates at BackupJob time. The driver keys its
+// injection and its snapshot fallback off this flag, not off whatever storage
+// happens to be on the live cluster, so a legacy app that ships its own static
+// storage (UseSystemBucket=false) is never touched.
+type MongoDBBackupSpec struct {
+	UseSystemBucket bool `json:"useSystemBucket,omitempty"`
+}
diff --git a/internal/backupcontroller/mongodbapp/zz_generated.deepcopy.go b/internal/backupcontroller/mongodbapp/zz_generated.deepcopy.go
new file mode 100644
index 0000000000..da5d691688
--- /dev/null
+++ b/internal/backupcontroller/mongodbapp/zz_generated.deepcopy.go
@@ -0,0 +1,62 @@
+// SPDX-License-Identifier: Apache-2.0
+
+// Hand-written DeepCopy methods. The package opted not to wire deepcopy-gen
+// (this is an internal partial-schema mirror, not a generated public API);
+// the surface area is small enough to maintain by hand.
+
+package mongodbapp
+
+import (
+	"k8s.io/apimachinery/pkg/runtime"
+)
+
+func (in *MongoDB) DeepCopyInto(out *MongoDB) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
+	out.Spec = in.Spec
+}
+
+func (in *MongoDB) DeepCopy() *MongoDB {
+	if in == nil {
+		return nil
+	}
+	out := new(MongoDB)
+	in.DeepCopyInto(out)
+	return out
+}
+
+func (in *MongoDB) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+func (in *MongoDBList) DeepCopyInto(out *MongoDBList) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ListMeta.DeepCopyInto(&out.ListMeta)
+	if in.Items != nil {
+		out.Items = make([]MongoDB, len(in.Items))
+		for i := range in.Items {
+			in.Items[i].DeepCopyInto(&out.Items[i])
+		}
+	}
+}
+
+func (in *MongoDBList) DeepCopy() *MongoDBList {
+	if in == nil {
+		return nil
+	}
+	out := new(MongoDBList)
+	in.DeepCopyInto(out)
+	return out
+}
+
+func (in *MongoDBList) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
diff --git a/internal/backupcontroller/postgresapp/types.go b/internal/backupcontroller/postgresapp/types.go
index db628ec52f..914f522fa4 100644
--- a/internal/backupcontroller/postgresapp/types.go
+++ b/internal/backupcontroller/postgresapp/types.go
@@ -2,7 +2,7 @@
 
 // Package postgresapp declares the typed shape of the apps.cozystack.io/v1alpha1
 // Postgres CR that the CNPG backup driver reads and patches. It carries only
-// the fields the driver touches - bootstrap, backup, databases, users -
+// the fields the driver touches - bootstrap, backup, databases, users, flavor -
 // because the live CR has many more fields (resources, quorum, postgresql
 // parameters, ...) that we never look at and that round-tripping through
 // this partial schema would otherwise silently drop.
@@ -64,22 +64,38 @@ type PostgresList struct {
 // genuinely needs them; everything else stays on the server, untouched by
 // the controller's patches.
 type PostgresSpec struct {
+	// Version is the PostgreSQL major the chart renders the Cluster with,
+	// in the chart's "v16" form.
+	Version   string              `json:"version,omitempty"`
 	Bootstrap Bootstrap           `json:"bootstrap,omitempty"`
 	Backup    Backup              `json:"backup,omitempty"`
 	Databases map[string]Database `json:"databases,omitempty"`
 	Users     map[string]User     `json:"users,omitempty"`
+	// Flavor is read, never patched: a restore must land on the image family
+	// the backup was taken from. Empty means the chart default, postgresql.
+	Flavor string `json:"flavor,omitempty"`
 }
 
 type Bootstrap struct {
-	Enabled      bool   `json:"enabled,omitempty"`
-	OldName      string `json:"oldName,omitempty"`
-	ServerName   string `json:"serverName,omitempty"`
-	RecoveryTime string `json:"recoveryTime,omitempty"`
+	// No omitempty: the restore driver merge-patches this back to false once
+	// recovery converges, and a bool+omitempty would drop false from the patch
+	// (it deletes the key instead), leaving the server to fall back to a default
+	// rather than being explicitly cleared. Same rule as Backup.UseSystemBucket.
+	Enabled       bool   `json:"enabled"`
+	OldName       string `json:"oldName,omitempty"`
+	ServerName    string `json:"serverName,omitempty"`
+	NewServerName string `json:"newServerName,omitempty"`
+	RecoveryTime  string `json:"recoveryTime,omitempty"`
+	BackupID      string `json:"backupID,omitempty"`
 }
 
 type Backup struct {
-	DestinationPath     string              `json:"destinationPath,omitempty"`
-	EndpointURL         string              `json:"endpointURL,omitempty"`
+	DestinationPath string `json:"destinationPath,omitempty"`
+	EndpointURL     string `json:"endpointURL,omitempty"`
+	// No omitempty: the restore patch must be able to set this back to false,
+	// and a bool+omitempty would drop false from the merge patch, leaving the
+	// server value at true.
+	UseSystemBucket     bool                `json:"useSystemBucket"`
 	S3AccessKey         string              `json:"s3AccessKey,omitempty"`
 	S3SecretKey         string              `json:"s3SecretKey,omitempty"`
 	S3CredentialsSecret S3CredentialsSecret `json:"s3CredentialsSecret,omitempty"`
@@ -111,6 +127,5 @@ type DatabaseRoles struct {
 }
 
 type User struct {
-	Password    string `json:"password,omitempty"`
-	Replication bool   `json:"replication,omitempty"`
+	Replication bool `json:"replication,omitempty"`
 }
diff --git a/internal/backupcontroller/postgresapp/zz_generated.deepcopy.go b/internal/backupcontroller/postgresapp/zz_generated.deepcopy.go
index 1046d00262..80e481cc4c 100644
--- a/internal/backupcontroller/postgresapp/zz_generated.deepcopy.go
+++ b/internal/backupcontroller/postgresapp/zz_generated.deepcopy.go
@@ -7,6 +7,8 @@
 package postgresapp
 
 import (
+	"maps"
+
 	"k8s.io/apimachinery/pkg/runtime"
 )
 
@@ -73,9 +75,7 @@ func (in *PostgresSpec) DeepCopyInto(out *PostgresSpec) {
 	}
 	if in.Users != nil {
 		out.Users = make(map[string]User, len(in.Users))
-		for k, v := range in.Users {
-			out.Users[k] = v
-		}
+		maps.Copy(out.Users, in.Users)
 	}
 }
 
diff --git a/internal/backupcontroller/psmdbstrategy_controller.go b/internal/backupcontroller/psmdbstrategy_controller.go
new file mode 100644
index 0000000000..702a3a1a04
--- /dev/null
+++ b/internal/backupcontroller/psmdbstrategy_controller.go
@@ -0,0 +1,2204 @@
+// SPDX-License-Identifier: Apache-2.0
+package backupcontroller
+
+import (
+	"context"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"sort"
+	"strconv"
+	"strings"
+	"time"
+
+	corev1 "k8s.io/api/core/v1"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	apimeta "k8s.io/apimachinery/pkg/api/meta"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apimachinery/pkg/types"
+	ctrl "sigs.k8s.io/controller-runtime"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
+
+	strategyv1alpha1 "github.com/cozystack/cozystack/api/backups/strategy/v1alpha1"
+	backupsv1alpha1 "github.com/cozystack/cozystack/api/backups/v1alpha1"
+	"github.com/cozystack/cozystack/internal/backupcontroller/mongodbapp"
+	"github.com/cozystack/cozystack/internal/backupcontroller/psmdbtypes"
+	"github.com/cozystack/cozystack/internal/template"
+)
+
+// ---------------------------------------------------------------------------
+// Constants
+// ---------------------------------------------------------------------------
+
+const (
+	// mongodbAppKind / mongodbAppPrefix map a cozystack MongoDB application
+	// instance to its operator-side psmdb.percona.com/PerconaServerMongoDB CR.
+	// The mongodb-rd ApplicationDefinition renders the HelmRelease with
+	// releaseName = "mongodb-" + appName (release.prefix in
+	// packages/system/mongodb-rd/cozyrds/mongodb.yaml), and the chart's
+	// templates/mongodb.yaml sets the PerconaServerMongoDB metadata.name to
+	// .Release.Name — so the driver looks up by the prefixed name. Mirrors the
+	// MariaDB driver's mariadbAppPrefix.
+	mongodbAppKind   = "MongoDB"
+	mongodbAppPrefix = "mongodb-"
+
+	// psmdbDefaultStorageName is the storage the mongodb chart declares in the
+	// PerconaServerMongoDB CR's spec.backup.storages when backup.enabled=true
+	// (see packages/apps/mongodb/templates/mongodb.yaml). The strategy names a
+	// storage; when it leaves StorageName empty the driver falls back to this.
+	psmdbDefaultStorageName = "s3-storage"
+
+	// psmdbDefaultCredentialsSecret is the Secret the useSystemBucket flow
+	// authenticates against: the BackupJob reconciler projects it into the
+	// namespace before dispatch. Both the storage injection and the snapshot
+	// fallback default to it when the strategy names none.
+	psmdbDefaultCredentialsSecret = "cozy-backups-creds"
+
+	// psmdbFieldManager is the server-side-apply field owner for the driver's
+	// storage injection on the useSystemBucket flow. A dedicated manager (with
+	// ForceOwnership) keeps the injected spec.backup.storages entry from being
+	// reverted by the app's Helm/Flux field manager on re-render.
+	psmdbFieldManager = "cozystack-psmdb-backup-driver"
+
+	// Driver-metadata keys persisted on Cozystack Backup artifacts. The
+	// restore path reads Destination (+ the S3 snapshot) to drive the operator
+	// Restore CR's backupSource, so a restore-to-differently-named instance
+	// works without the source PerconaServerMongoDBBackup CR still existing.
+	psmdbBackupNameKey      = "psmdb.percona.com/backup-name"
+	psmdbBackupNamespaceKey = "psmdb.percona.com/backup-namespace"
+	psmdbDestinationKey     = "psmdb.percona.com/destination"
+
+	// psmdbDeleteBackupFinalizer is the psmdb-operator finalizer that removes the
+	// pbm archive from object storage when its PerconaServerMongoDBBackup CR is
+	// deleted. The driver stamps it onto the CRs it mints on the useSystemBucket
+	// flow so that deleting a Cozystack Backup also frees the object it wrote
+	// to the shared bucket. Without it deleting the Backup would leave the
+	// object behind for every tenant at once, since the system-bucket flow
+	// ships no psmdb task retention (the chart's tasks[].keep is gated out) to
+	// prune it.
+	psmdbDeleteBackupFinalizer = "percona.com/delete-backup"
+
+	// psmdbSkipArtifactCleanupAnnotation, on a Cozystack Backup, releases it from
+	// Terminating without waiting for the operator to prune the archive — an
+	// escape hatch for a wedged delete (operator down, storage unreachable). The
+	// object is then left in the bucket. Mirrors the Redis/Rabbitmq drivers.
+	psmdbSkipArtifactCleanupAnnotation = "backups.cozystack.io/skip-artifact-cleanup"
+
+	// Polling cadence for the operator Backup/Restore lifecycle.
+	psmdbPollInterval = 5 * time.Second
+
+	// Wall-clock cap on a BackupJob waiting for the operator Backup to start
+	// (and, on the legacy flow, to finish). A permanently-stuck backup (e.g.
+	// the cluster never brings up its pbm agents) must not pin the BackupJob
+	// in Running: nothing else bounds it, and a Plan keeps stacking new jobs
+	// beside it. Mirrors the MariaDB/CNPG deadline.
+	psmdbDefaultBackupDeadline = 30 * time.Minute
+
+	// psmdbRunningCeiling bounds a system-bucket dump that has begun streaming.
+	// Such a dump is exempt from psmdbDefaultBackupDeadline (a real dataset
+	// outruns 30m, and cancelling mid-stream strands a partial in the shared
+	// bucket), but a pbm agent that wedges never moves the CR off `running`,
+	// so past this the job fails with the operator CR left in place as the
+	// handle to whatever pbm still writes.
+	psmdbRunningCeiling = 24 * time.Hour
+
+	// Default deadline on a RestoreJob waiting for the operator Restore to
+	// terminate. Tenants override via spec.options.restoreTimeoutSeconds.
+	psmdbDefaultRestoreDeadline = 30 * time.Minute
+
+	// psmdbLiveReadGrace bounds how long past the backup deadline the driver keeps
+	// deferring a cancel it cannot confirm: the live re-read of the operator CR
+	// keeps failing (throttle, revoked verb, removed CRD). After it the job fails
+	// and the CR is left in place rather than deleted blind.
+	psmdbLiveReadGrace = 30 * time.Minute
+
+	// psmdbStorageRaceRetryBudget caps how many times the storage-race retry may
+	// delete an errored operator CR and mint a fresh one for one BackupJob. The
+	// race clears after a poll or two on a healthy operator, so a job still
+	// hitting it after this many retries has a standing problem the tenant must
+	// see rather than a churn of CRs. The count lives on the BackupJob
+	// (psmdbStorageRaceRetriesAnnotation), not on the CRs: an errored CR is
+	// reaped as soon as it is deleted (the operator drops delete-backup without
+	// pruning on a non-ready CR), so counting surviving CRs never reaches the
+	// budget.
+	psmdbStorageRaceRetryBudget = 3
+
+	// psmdbStorageRaceRetriesAnnotation, on the BackupJob, carries the number of
+	// storage-race retries spent so far.
+	psmdbStorageRaceRetriesAnnotation = "backups.cozystack.io/mongodb-storage-race-retries"
+
+	// psmdbBackupSnapshotKind is the Kind stamped onto the snapshot persisted
+	// in Backup.status.underlyingResources. It carries the S3 storage
+	// descriptor (by reference — bucket/endpoint/credentialsSecret NAME, never
+	// a raw credential) and the backup destination read back from the operator
+	// Backup status, so the restore path can rebuild backupSource even after
+	// the operator-side Backup CR has been reaped.
+	psmdbBackupSnapshotKind = "MongoDBBackupSnapshot"
+)
+
+// psmdbBackupSnapshotAPIVersion is the apiVersion stamped onto the snapshot.
+// Borrows the Cozystack backups group so the field is self-typed within the
+// existing API surface. Mirrors the MariaDB driver.
+var psmdbBackupSnapshotAPIVersion = backupsv1alpha1.GroupVersion.String()
+
+// psmdbBackupGVR addresses PerconaServerMongoDBBackup through the dynamic client
+// for an uncached, live status read (see psmdbBackupLiveState).
+var psmdbBackupGVR = schema.GroupVersionResource{
+	Group:    psmdbtypes.GroupVersion.Group,
+	Version:  psmdbtypes.GroupVersion.Version,
+	Resource: "perconaservermongodbbackups",
+}
+
+// mongodbNameForApp returns the psmdb.percona.com/PerconaServerMongoDB CR name
+// for a cozystack MongoDB application instance.
+func mongodbNameForApp(appName string) string {
+	return mongodbAppPrefix + appName
+}
+
+// validateMongoDBApplicationRef rejects ApplicationRefs that name a
+// Kind/APIGroup the MongoDB driver does not own. Empty APIGroup is accepted and
+// treated as the default (apps.cozystack.io), matching the BackupClass
+// resolution helpers and the Plan/BackupJob CRD docs.
+func validateMongoDBApplicationRef(ref corev1.TypedLocalObjectReference) error {
+	if ref.Kind != mongodbAppKind {
+		return fmt.Errorf("MongoDB strategy supports applicationRef.kind=%q, got %q", mongodbAppKind, ref.Kind)
+	}
+	apiGroup := ""
+	if ref.APIGroup != nil {
+		apiGroup = *ref.APIGroup
+	}
+	if apiGroup != "" && apiGroup != mongodbapp.GroupName {
+		return fmt.Errorf("MongoDB strategy supports applicationRef.apiGroup=%q, got %q", mongodbapp.GroupName, apiGroup)
+	}
+	return nil
+}
+
+// psmdbBackupTypeOrDefault returns the rendered backup type, defaulting to
+// logical. Only logical is supported (the CRD enum on MongoDBTemplate.Type
+// enforces this at admission; this keeps a pre-admission strategy well-defined).
+func psmdbBackupTypeOrDefault(t string) string {
+	if t == "" {
+		return psmdbtypes.BackupTypeLogical
+	}
+	return t
+}
+
+// psmdbStorageNameOrDefault resolves the storage name the operator Backup CR
+// references, defaulting to the chart's storage.
+func psmdbStorageNameOrDefault(name string) string {
+	if name == "" {
+		return psmdbDefaultStorageName
+	}
+	return name
+}
+
+// ---------------------------------------------------------------------------
+// BackupJob path
+// ---------------------------------------------------------------------------
+
+func (r *BackupJobReconciler) reconcileMongoDB(ctx context.Context, j *backupsv1alpha1.BackupJob, resolved *ResolvedBackupConfig) (ctrl.Result, error) {
+	logger := getLogger(ctx)
+	logger.Debug("reconciling MongoDB strategy", "backupjob", j.Name, "phase", j.Status.Phase)
+
+	if j.Status.Phase == backupsv1alpha1.BackupJobPhaseSucceeded ||
+		j.Status.Phase == backupsv1alpha1.BackupJobPhaseFailed {
+		return ctrl.Result{}, nil
+	}
+
+	if err := validateMongoDBApplicationRef(j.Spec.ApplicationRef); err != nil {
+		return r.markBackupJobFailed(ctx, j, err.Error())
+	}
+
+	if j.Status.StartedAt == nil {
+		// Refetch the latest persisted state before writing StartedAt: a stale
+		// informer cache that returns StartedAt==nil after we already persisted
+		// it would otherwise let the deadline gate slide forward on every poll.
+		// Same idempotency pattern as the MariaDB/CNPG drivers.
+		fresh := &backupsv1alpha1.BackupJob{}
+		if err := r.Get(ctx, types.NamespacedName{Namespace: j.Namespace, Name: j.Name}, fresh); err != nil {
+			return ctrl.Result{}, err
+		}
+		if fresh.Status.StartedAt != nil {
+			j.Status.StartedAt = fresh.Status.StartedAt
+		} else {
+			base := fresh.DeepCopy()
+			now := metav1.Now()
+			fresh.Status.StartedAt = &now
+			if err := r.Status().Patch(ctx, fresh, client.MergeFrom(base)); err != nil {
+				return ctrl.Result{}, err
+			}
+			return ctrl.Result{RequeueAfter: psmdbPollInterval}, nil
+		}
+	}
+
+	// The job's operator CR, if a previous reconcile minted one, resolved before
+	// anything else is read. Everything up to the mint (the strategy, app and
+	// cluster reads, the legacy-render and no-coordinates holds, the storage
+	// injection, the precondition, the ownership decision) is bounded by the
+	// backup deadline and runs in full only while there is no CR: once one
+	// exists the dump is under way against the storage it names, and the state
+	// switch below handles it off its own finalizer, so a flag flipped, a
+	// strategy edited or removed, or backups disabled mid-dump cannot fail or
+	// redirect it here. The reads the state switch still needs (the strategy
+	// and app, for the artifact) are then bounded by the running ceiling
+	// instead, and past it the job fails naming the CR left in place, the same
+	// way a dump that never finishes does.
+	existing, err := r.findMongoDBBackupForJob(ctx, j)
+	if err != nil {
+		return ctrl.Result{}, err
+	}
+
+	strategy := &strategyv1alpha1.MongoDB{}
+	if err := r.Get(ctx, client.ObjectKey{Name: resolved.StrategyRef.Name}, strategy); err != nil {
+		if apierrors.IsNotFound(err) {
+			if existing == nil {
+				return r.requeueStrategyNotReady(ctx, j, resolved.StrategyRef.Name)
+			}
+			return r.requeueMongoDBBackupBehindCR(ctx, j, existing, "MongoDBStrategyNotReady",
+				fmt.Sprintf("waiting for MongoDB strategy %s to exist", resolved.StrategyRef.Name))
+		}
+		return ctrl.Result{}, err
+	}
+
+	app, err := r.getMongoDBApp(ctx, j.Namespace, j.Spec.ApplicationRef.Name)
+	if err != nil {
+		if apierrors.IsNotFound(err) {
+			// A GitOps apply that lands the MongoDB app and the BackupJob in one
+			// commit can reconcile the BackupJob before the app CR is visible in
+			// the cache. Tolerate a not-yet-present app with the same bounded
+			// grace the psmdb-CR existence gate below uses, instead of failing
+			// terminally on a transient ordering race. StartedAt was persisted
+			// above, so the deadline clock is already running.
+			if existing != nil {
+				return r.requeueMongoDBBackupBehindCR(ctx, j, existing, "MongoDBApplicationNotReady",
+					fmt.Sprintf("waiting for MongoDB application %s/%s to exist", j.Namespace, j.Spec.ApplicationRef.Name))
+			}
+			if psmdbBackupDeadlineExceeded(j.Status.StartedAt) {
+				return r.markBackupJobFailed(ctx, j, fmt.Sprintf(
+					"MongoDB application %s/%s not found within %s",
+					j.Namespace, j.Spec.ApplicationRef.Name, psmdbDefaultBackupDeadline))
+			}
+			return r.requeueMongoDBBackupWaiting(ctx, j, "MongoDBApplicationNotReady",
+				fmt.Sprintf("waiting for MongoDB application %s/%s to exist", j.Namespace, j.Spec.ApplicationRef.Name))
+		}
+		return ctrl.Result{}, err
+	}
+
+	useSystemBucket := app.Spec.Backup.UseSystemBucket
+
+	rendered, err := renderMongoDBTemplate(strategy.Spec.Template, app, resolved.Parameters)
+	if err != nil {
+		if existing != nil {
+			return r.requeueMongoDBBackupBehindCR(ctx, j, existing, "MongoDBStrategyNotReady",
+				fmt.Sprintf("failed to template MongoDB strategy: %v", err))
+		}
+		return r.markBackupJobFailed(ctx, j, fmt.Sprintf("failed to template MongoDB strategy: %v", err))
+	}
+	storageName := psmdbStorageNameOrDefault(rendered.StorageName)
+	psmdbName := mongodbNameForApp(j.Spec.ApplicationRef.Name)
+
+	var (
+		mdbBackup       *psmdbtypes.PerconaServerMongoDBBackup
+		platformStorage bool
+	)
+	if existing == nil {
+		// The operator-side PerconaServerMongoDB CR carries the prefixed release
+		// name. Verify it exists and has backups wired up before we ask the
+		// operator to snapshot it. psmdb only services PerconaServerMongoDBBackup
+		// CRs when spec.backup.enabled=true and the named storage is declared;
+		// without that the Backup would sit in waiting/error forever, so surface
+		// a precise precondition instead. Bounded by psmdbDefaultBackupDeadline —
+		// StartedAt was persisted above, so the clock is already running.
+		//
+		// The mint-time decisions below read the cluster's render (tasks, pitr,
+		// the storage entry) and the operator's view of it, and a cached read
+		// can lag a re-render by one reconcile: a flag already true with the
+		// tasks not yet visible is a consistent pre-flip view that would let the
+		// apply force-own an entry the tenant's restored tasks name. Read from
+		// the apiserver when a dynamic client is present, the way the deadline
+		// cancel reads the operator CR live; without one (tests) the cached
+		// object stands.
+		cluster, err := r.psmdbClusterForMint(ctx, j.Namespace, psmdbName)
+		if err != nil {
+			if apierrors.IsNotFound(err) {
+				if psmdbBackupDeadlineExceeded(j.Status.StartedAt) {
+					return r.markBackupJobFailed(ctx, j, fmt.Sprintf(
+						"psmdb.percona.com/PerconaServerMongoDB %s/%s never reached existence within %s",
+						j.Namespace, psmdbName, psmdbDefaultBackupDeadline))
+				}
+				return r.requeueMongoDBBackupWaiting(ctx, j, "PerconaServerMongoDBNotReady",
+					fmt.Sprintf("waiting for psmdb.percona.com/PerconaServerMongoDB %s/%s to exist", j.Namespace, psmdbName))
+			}
+			return ctrl.Result{}, err
+		}
+
+		// The app flag is the tenant's desired value: the app CR is projected
+		// from the HelmRelease's spec.values, so it reads true the moment the
+		// tenant writes it, whether or not helm-controller has rendered that
+		// revision. The chart renders spec.backup.tasks and pitr only without
+		// useSystemBucket, so a cluster still carrying them was last rendered on
+		// the legacy flow, and its tenant-bucket storage is what those tasks and
+		// the oplog stream write to. Injecting over it would redirect the
+		// tenant's own nightly dump and PITR into the shared bucket under
+		// platform credentials, as objects no Backup represents. Hold the job
+		// until the release re-renders instead.
+		legacyRender := useSystemBucket && psmdbClusterHasLegacyRender(cluster)
+		if useSystemBucket {
+			if rendered.S3 == nil {
+				// Nothing to inject and nothing to own: the storage the CR would name
+				// is whatever the cluster already declares, which may be the tenant's
+				// own bucket. Refuse to mint rather than stamp the prune finalizer on
+				// a dump the platform does not own.
+				if psmdbBackupDeadlineExceeded(j.Status.StartedAt) {
+					return r.markBackupJobFailed(ctx, j, fmt.Sprintf(
+						"the MongoDB strategy %s still carries no s3 coordinates to inject (%s after the job started); set spec.template.s3 on it",
+						resolved.StrategyRef.Name, psmdbDefaultBackupDeadline))
+				}
+				return r.requeueMongoDBBackupWaiting(ctx, j, "MongoDBStrategyHasNoS3",
+					"the MongoDB strategy carries no s3 coordinates to inject; set spec.template.s3 on it")
+			}
+			if legacyRender {
+				if psmdbBackupDeadlineExceeded(j.Status.StartedAt) {
+					return r.markBackupJobFailed(ctx, j, fmt.Sprintf(
+						"psmdb.percona.com/PerconaServerMongoDB %s/%s still carries the chart's scheduled tasks/pitr from a render without backup.useSystemBucket (%s after the job started); the release has not rendered the flag (check the HelmRelease), and the driver does not inject over a legacy storage",
+						j.Namespace, psmdbName, psmdbDefaultBackupDeadline))
+				}
+				return r.requeueMongoDBBackupWaiting(ctx, j, "PerconaServerMongoDBLegacyRender",
+					"the cluster still carries the chart's scheduled tasks/pitr from a render without backup.useSystemBucket; waiting for the release to render the flag before injecting the system-bucket storage")
+			}
+		}
+
+		// System-bucket flow: the app chart leaves spec.backup.storages unset (it
+		// cannot know the platform bucket/endpoint at render time), so SSA-inject
+		// the storage from the strategy's coordinates before the precondition looks
+		// for it. Owned by a dedicated field manager with ForceOwnership so a Flux
+		// re-render of the app never reverts it (mirrors the CNPG driver's
+		// spec.plugins patch). Keyed off the app's useSystemBucket flag, not off
+		// whatever storage is on the live cluster: when the flag is set the apply
+		// runs before each mint (once per BackupJob, plus once per storage-race
+		// re-mint), so a later change to the strategy coordinates (endpoint,
+		// region, bucket re-provision) catches up on the next job rather than
+		// being frozen at the first backup; when it is unset the driver never
+		// touches the cluster, so a legacy app that ships its own static storage
+		// is left alone. Once the job has a CR the storage it names is fixed for
+		// that dump, so nothing is applied on the polls that follow: not the
+		// coordinates (rewriting them under a streaming dump would split it), and
+		// not over a cluster that re-acquired the chart's tasks and pitr since the
+		// mint. The path prefix is deterministic (<namespace>/<application>), so
+		// re-applying the whole entry on the next job never splits the archive the
+		// way CNPG's serverName would. Gated additionally on backups being enabled:
+		// a cluster that can never service a backup should not be mutated just to
+		// fail the precondition below on the enabled check anyway.
+		if cluster.Spec.Backup.Enabled && shouldInjectMongoDBSystemStorage(useSystemBucket, rendered) {
+			storageSettled := psmdbStorageEntrySettled(cluster.Spec.Backup.Storages[storageName], rendered.S3)
+			injected, err := r.applyMongoDBSystemStorage(ctx, j.Namespace, psmdbName, storageName, rendered.S3)
+			if err != nil {
+				// A server-side apply can fail transiently — an apiserver hiccup, or a
+				// conflict while the psmdb operator writes the same cluster — so requeue
+				// with backoff rather than failing the BackupJob outright. The deadline
+				// still turns a permanently-failing apply terminal, matching how the
+				// cluster/app read errors above are handled.
+				if psmdbBackupDeadlineExceeded(j.Status.StartedAt) {
+					return r.markBackupJobFailed(ctx, j, fmt.Sprintf(
+						"failed to inject system-bucket storage onto psmdb.percona.com/PerconaServerMongoDB %s/%s within %s: %v",
+						j.Namespace, psmdbName, psmdbDefaultBackupDeadline, err))
+				}
+				return ctrl.Result{}, err
+			}
+			cluster = injected
+			if !storageSettled {
+				// The apply changed what the entry says (first injection for this
+				// app, or the strategy coordinates moved since the last one). The
+				// psmdb operator resolves spec.backup.storages from a CACHED cluster
+				// read when it services the PerconaServerMongoDBBackup, and its cache
+				// may not have observed the apply yet. A miss there latches the CR at
+				// State=error with nothing to re-drive it (the operator returns for a
+				// terminal-state CR and watches only the Backup CR and Pods), and the
+				// driver reads that as a terminal failure; a stale hit would resolve
+				// the previous coordinates and write the dump there. So requeue
+				// instead of minting the CR in the same pass: on the next reconcile
+				// this driver's own read reflects the entry as applied, which is a
+				// good proxy that the operator's does too, and only then do we mint.
+				// Later BackupJobs find the entry already as applied and skip through.
+				//
+				// Bounded and observable like the other waits: consult the deadline so
+				// a cluster whose cache never reflects the storage cannot poll forever,
+				// and write Ready=False so the wait is named in kubectl describe.
+				if psmdbBackupDeadlineExceeded(j.Status.StartedAt) {
+					return r.markBackupJobFailed(ctx, j, fmt.Sprintf(
+						"psmdb.percona.com/PerconaServerMongoDB %s/%s did not reflect the injected storage %q within %s",
+						j.Namespace, psmdbName, storageName, psmdbDefaultBackupDeadline))
+				}
+				return r.requeueMongoDBBackupWaiting(ctx, j, "PerconaServerMongoDBStorageInjected",
+					fmt.Sprintf("injected storage %q; waiting for the cluster to reflect it before starting the backup", storageName))
+			}
+			// The entry is on the spec; whether pbm holds it is the operator's to
+			// say. At the pinned version the backup reconciler hands pbm only a
+			// storage name and records status.s3 from the spec entry it read,
+			// while the storage pbm writes to is what the cluster reconciler last
+			// pushed into pbm's own config (reconcilePBM: PBMReady goes False, the
+			// config is set, then True; observedGeneration is stamped when that
+			// reconcile ends). A CR minted between the apply and that push dumps
+			// to the previous coordinates while its Backup records the new ones,
+			// so the mint waits for both signals. Bounded by the deadline like the
+			// other waits.
+			if !psmdbPBMConfigApplied(cluster) {
+				if psmdbBackupDeadlineExceeded(j.Status.StartedAt) {
+					return r.markBackupJobFailed(ctx, j, fmt.Sprintf(
+						"psmdb.percona.com/PerconaServerMongoDB %s/%s did not report the backup configuration applied (observedGeneration %d of %d, %s %s) within %s",
+						j.Namespace, psmdbName, cluster.Status.ObservedGeneration, cluster.Generation, psmdbtypes.ConditionPBMReady, psmdbConditionStatus(cluster, psmdbtypes.ConditionPBMReady), psmdbDefaultBackupDeadline))
+				}
+				return r.requeueMongoDBBackupWaiting(ctx, j, "PerconaServerMongoDBPBMConfigPending",
+					fmt.Sprintf("waiting for the operator to push spec.backup into pbm (observedGeneration %d of %d, %s %s) before starting the backup",
+						cluster.Status.ObservedGeneration, cluster.Generation, psmdbtypes.ConditionPBMReady, psmdbConditionStatus(cluster, psmdbtypes.ConditionPBMReady)))
+			}
+		}
+		if msg := psmdbBackupPrecondition(cluster, storageName); msg != "" {
+			const hint = "set backup.enabled=true on the MongoDB application"
+			if psmdbBackupDeadlineExceeded(j.Status.StartedAt) {
+				return r.markBackupJobFailed(ctx, j, fmt.Sprintf(
+					"psmdb.percona.com/PerconaServerMongoDB %s/%s not ready for backups within %s: %s (%s)",
+					j.Namespace, psmdbName, psmdbDefaultBackupDeadline, msg, hint))
+			}
+			return r.requeueMongoDBBackupWaiting(ctx, j, "PerconaServerMongoDBBackupsDisabled", msg)
+		}
+
+		// Whether the storage the CR will name points at the platform bucket with
+		// the platform credential. The prune finalizer stamped at mint means "the
+		// platform owns this archive", and cleanup deletes the archive on that
+		// marker, so it must follow where the dump actually lands, never the flag.
+		// The useSystemBucket term is shadowed by the opt-out case below, which
+		// refuses first whenever the flag is off and the entry carries the injected
+		// credential; it stays as the statement of intent should that case narrow.
+		bucket, cred := psmdbStorageS3(cluster.Spec.Backup.Storages[storageName])
+		platformStorage = useSystemBucket && rendered.S3 != nil && bucket == rendered.S3.Bucket && cred == psmdbInjectedCredentialsSecret(rendered.S3)
+
+		switch {
+		case !useSystemBucket && cred != "" && psmdbCredentialsSecretIsInjected(cred, rendered):
+			// Opting out (useSystemBucket true→false) stops the injection but
+			// leaves the driver's storage entry on the live cluster: the chart never
+			// owned it and does not prune it, so it stays until removed by hand
+			// (backup-classes.md). A CR minted against it would carry no finalizer
+			// and land the dump in the platform bucket as an object nothing owns or
+			// prunes. The injected entry is identified by its credentialsSecret, the
+			// one field on it the driver chose: bucket names collide with an admin's
+			// external bucket and drift when the platform bucket is re-provisioned.
+			if psmdbBackupDeadlineExceeded(j.Status.StartedAt) {
+				return r.markBackupJobFailed(ctx, j, fmt.Sprintf(
+					"psmdb.percona.com/PerconaServerMongoDB %s/%s storage %q is still the entry injected for the system bucket (credentialsSecret %q) while backup.useSystemBucket=false (%s after the job started); delete that storage entry from the PerconaServerMongoDB by hand or set backup.useSystemBucket=true again (see docs/operations/backup-classes.md)",
+					j.Namespace, psmdbName, storageName, cred, psmdbDefaultBackupDeadline))
+			}
+			return r.requeueMongoDBBackupWaiting(ctx, j, "PerconaServerMongoDBStorageStale",
+				fmt.Sprintf("storage %q is still the entry injected for the system bucket (credentialsSecret %q) while backup.useSystemBucket=false; delete it from the PerconaServerMongoDB by hand or set backup.useSystemBucket=true again", storageName, cred))
+		case useSystemBucket && !platformStorage:
+			// The apply above should have left the platform coordinates on the
+			// entry; whatever put something else there (a mutating webhook, a
+			// concurrent writer), a CR minted now would carry the prune finalizer
+			// against a bucket the platform does not own.
+			if psmdbBackupDeadlineExceeded(j.Status.StartedAt) {
+				return r.markBackupJobFailed(ctx, j, fmt.Sprintf(
+					"psmdb.percona.com/PerconaServerMongoDB %s/%s storage %q did not carry the system-bucket coordinates (bucket %q, credentialsSecret %q) even %s after the job started; refusing to mint a platform-owned backup against bucket %q",
+					j.Namespace, psmdbName, storageName, rendered.S3.Bucket, psmdbInjectedCredentialsSecret(rendered.S3), psmdbDefaultBackupDeadline, bucket))
+			}
+			return r.requeueMongoDBBackupWaiting(ctx, j, "PerconaServerMongoDBStorageForeign",
+				fmt.Sprintf("storage %q points at bucket %q with credentialsSecret %q, not the system-bucket coordinates the strategy carries; not minting a platform-owned backup against it", storageName, bucket, cred))
+		}
+
+		mdbBackup, err = r.ensureMongoDBBackup(ctx, j, psmdbName, storageName, rendered, platformStorage)
+		if err != nil {
+			return r.markBackupJobFailed(ctx, j, fmt.Sprintf("failed to ensure psmdb.percona.com/PerconaServerMongoDBBackup: %v", err))
+		}
+	} else {
+		mdbBackup = existing
+	}
+	// The flow a CR belongs to is fixed at mint time by its finalizer, not by the
+	// app flag a tenant can flip while the dump streams: a CR carrying
+	// delete-backup writes into the platform bucket whatever the flag reads now,
+	// and is handled as system-bucket for the rest of its life.
+	flowSystemBucket := controllerutil.ContainsFinalizer(mdbBackup, psmdbDeleteBackupFinalizer)
+
+	if j.Status.Phase != backupsv1alpha1.BackupJobPhaseRunning {
+		j.Status.Phase = backupsv1alpha1.BackupJobPhaseRunning
+		if err := r.Status().Update(ctx, j); err != nil {
+			return ctrl.Result{}, err
+		}
+	}
+
+	switch state := mdbBackup.Status.State; {
+	case state == psmdbtypes.StateReady:
+		// Backup completed successfully. Materialise the Cozystack artifact and
+		// finalise the BackupJob. Idempotent: reuse the existing artifact if a
+		// previous reconcile created it and then raced on the status update.
+		if j.Status.BackupRef != nil {
+			return ctrl.Result{}, nil
+		}
+		artifact, err := r.createMongoDBBackupArtifact(ctx, j, resolved, mdbBackup, rendered, storageName, flowSystemBucket)
+		if err != nil {
+			// The archive is already written; the Backup object is the only thing
+			// that can ever reach it again. A transient Create failure (etcd
+			// timeout, quota, webhook hiccup) must not turn that into a terminal
+			// Failed with no artifact, so retry with backoff for a window after
+			// the dump completed — the SSA-apply error above gets the same
+			// treatment — and only then give up, naming the CR that still holds
+			// the archive so it can be reclaimed by hand.
+			window, exceeded := psmdbArtifactWindow(mdbBackup, j.Status.StartedAt)
+			if !exceeded {
+				return ctrl.Result{}, err
+			}
+			if r.Recorder != nil && flowSystemBucket {
+				r.Recorder.Eventf(j, corev1.EventTypeWarning, "BackupArtifactNotCreated",
+					"the dump completed but no Backup object could be created (%v); the archive is reachable only through PerconaServerMongoDBBackup %s, which is left in place", err, mdbBackup.Name)
+			}
+			return r.markBackupJobFailed(ctx, j, fmt.Sprintf("failed to create Backup artifact for %s after retrying for %s: %v", mdbBackup.Name, window, err))
+		}
+		now := metav1.Now()
+		j.Status.BackupRef = &corev1.LocalObjectReference{Name: artifact.Name}
+		j.Status.CompletedAt = &now
+		j.Status.Phase = backupsv1alpha1.BackupJobPhaseSucceeded
+		apimeta.SetStatusCondition(&j.Status.Conditions, metav1.Condition{
+			Type:    "Ready",
+			Status:  metav1.ConditionTrue,
+			Reason:  "BackupCompleted",
+			Message: "psmdb.percona.com PerconaServerMongoDBBackup completed",
+		})
+		if err := r.Status().Update(ctx, j); err != nil {
+			return ctrl.Result{}, err
+		}
+		return ctrl.Result{}, nil
+
+	case state == psmdbtypes.StateError || state == psmdbtypes.StateRejected:
+		message := mdbBackup.Status.Error
+		// The residual half of the injection race: on the useSystemBucket flow the
+		// operator can latch state=error because it resolved the injected storage
+		// from a cluster cache that had not yet observed the apply. That is the
+		// driver's own race, not the tenant's failure, so retry it (bounded by the
+		// deadline) — delete the errored CR so a fresh one resolves against a
+		// caught-up cache — rather than failing the BackupJob terminally.
+		if flowSystemBucket && psmdbErrorIsUnresolvedStorage(message, storageName) && !psmdbBackupDeadlineExceeded(j.Status.StartedAt) {
+			// The budget is kept on the BackupJob: the errored CR is reaped as soon
+			// as it is deleted, so nothing about the CRs themselves records how many
+			// times this has already happened. The count is written before the
+			// delete, so a crash between the two over-counts rather than restarts.
+			retries := psmdbStorageRaceRetries(j)
+			if retries < psmdbStorageRaceRetryBudget {
+				if err := r.recordMongoDBStorageRaceRetry(ctx, j, retries+1); err != nil {
+					return ctrl.Result{}, err
+				}
+				if mdbBackup.DeletionTimestamp.IsZero() {
+					if derr := r.Delete(ctx, mdbBackup); derr != nil && !apierrors.IsNotFound(derr) {
+						return ctrl.Result{}, derr
+					}
+				}
+				return r.requeueMongoDBBackupWaiting(ctx, j, "PerconaServerMongoDBStorageRace",
+					fmt.Sprintf("operator has not observed the injected storage %q yet; retrying the backup (retry %d of %d)", storageName, retries+1, psmdbStorageRaceRetryBudget))
+			}
+			message = fmt.Sprintf("%s (the operator still could not resolve the injected storage after %d retries)", message, psmdbStorageRaceRetryBudget)
+		}
+		// Terminal failure. The operator sets state=error/rejected once the pbm
+		// backup fails or is refused, so fail the BackupJob immediately rather
+		// than waiting for the driver-side deadline.
+		if message == "" {
+			message = fmt.Sprintf("psmdb.percona.com PerconaServerMongoDBBackup reported state=%s", state)
+		}
+		return r.markBackupJobFailed(ctx, j, message)
+
+	default:
+		// Still in progress ("", requested, running, waiting).
+		if state == psmdbtypes.StateRunning {
+			if !psmdbBackupTimedOut(state, j.Status.StartedAt, flowSystemBucket) {
+				// The wait is long by nature (a real dataset routinely outruns any
+				// wall-clock window) and the CR carries nothing to tell a slow dump
+				// from a wedged one: the pinned operator persists status only when the
+				// state string or error changes, so status.lastTransition freezes at
+				// the instant the dump entered `running`. Name the wait on the
+				// BackupJob instead of judging it by a timer — Ready=False with the
+				// start time, so `kubectl describe backupjob` shows what it is waiting
+				// on — and let the operator move the CR to ready/error.
+				since := "an unknown start time"
+				if j.Status.StartedAt != nil {
+					since = j.Status.StartedAt.UTC().Format(time.RFC3339)
+				}
+				return r.requeueMongoDBBackupWaiting(ctx, j, "PerconaServerMongoDBBackupRunning",
+					fmt.Sprintf("psmdb.percona.com PerconaServerMongoDBBackup %s has been streaming since %s; a running dump is left to finish", mdbBackup.Name, since))
+			}
+			if flowSystemBucket {
+				// Past the running ceiling: a wedged pbm agent never moves the CR off
+				// running, and a job that never terminates is one a nightly Plan
+				// stacks another beside. The CR is not cancelled (deleting it with
+				// its prune finalizer would take a partial or a late-completing
+				// archive with it); it stays as the only handle to whatever pbm still
+				// writes, so the failure names it.
+				if r.Recorder != nil {
+					r.Recorder.Eventf(j, corev1.EventTypeWarning, "BackupAbandoned",
+						"PerconaServerMongoDBBackup %s has been running for over %s; the BackupJob is failed and the operator backup is left in place, so an archive it still completes is reachable only through that CR (delete the CR to prune it)", mdbBackup.Name, psmdbRunningCeiling)
+				}
+				return r.markBackupJobFailed(ctx, j, fmt.Sprintf(
+					"psmdb.percona.com PerconaServerMongoDBBackup %s did not complete within %s (state=running); the operator backup is left in place, not cancelled", mdbBackup.Name, psmdbRunningCeiling))
+			}
+			// Legacy flow past the deadline: the archive is in the tenant's own bucket
+			// and is theirs to reclaim — no platform retention covers it (the
+			// operator prunes only its own scheduled backups, selected by ancestor
+			// label, which a driver-minted CR does not carry), so failing the job
+			// strands nothing the platform owns. The operator CR is left alone, as
+			// it was before this driver existed.
+			return r.markBackupJobFailed(ctx, j, fmt.Sprintf(
+				"psmdb.percona.com PerconaServerMongoDBBackup did not complete within %s (state=running)", psmdbDefaultBackupDeadline))
+		}
+		// Not-yet-started states ("", requested, waiting). A wall-clock deadline
+		// fails a backup the operator never starts, so it cannot pin the BackupJob
+		// Running forever.
+		if !psmdbBackupTimedOut(state, j.Status.StartedAt, flowSystemBucket) {
+			return ctrl.Result{RequeueAfter: psmdbPollInterval}, nil
+		}
+		detail := "no state observed"
+		if state != "" {
+			detail = fmt.Sprintf("state=%s", state)
+		}
+		if !flowSystemBucket {
+			// Legacy flow: the CR and whatever it may still write are the tenant's,
+			// in the tenant's bucket. Fail the job and leave the CR, as before this
+			// driver existed; only a system-bucket CR is ever cancelled below.
+			return r.markBackupJobFailed(ctx, j, fmt.Sprintf(
+				"psmdb.percona.com PerconaServerMongoDBBackup did not start within %s (%s)", psmdbDefaultBackupDeadline, detail))
+		}
+		// The deadline hit for a system-bucket backup that has not started. A late
+		// run would land in the shared bucket with no Backup object to represent
+		// it, so the CR is cancelled — but only on a positive answer that nothing
+		// has been handed to pbm yet. mdbBackup came from the cache, so re-read it
+		// live first: the CR carries delete-backup and the operator prunes storage
+		// on that finalizer once the CR is ready, so deleting anything that has
+		// moved on risks taking a running dump's partial or a completed archive
+		// with it. A read error ("" is indistinguishable, so the helper returns an
+		// error) defers rather than deletes blind.
+		liveState, liveRV, lerr := r.psmdbBackupLiveState(ctx, mdbBackup.Namespace, mdbBackup.Name)
+		if lerr != nil {
+			// Deferring is the safe default, but not forever: past the grace the
+			// job fails with the CR left in place (never deleted blind), so an
+			// unreadable CR cannot pin the job Running with nothing to act on.
+			if j.Status.StartedAt != nil && time.Since(j.Status.StartedAt.Time) > psmdbDefaultBackupDeadline+psmdbLiveReadGrace {
+				return r.markBackupJobFailed(ctx, j, fmt.Sprintf(
+					"psmdb.percona.com PerconaServerMongoDBBackup %s did not start within %s and its live state could not be confirmed for a further %s (%v); the operator backup is left in place",
+					mdbBackup.Name, psmdbDefaultBackupDeadline, psmdbLiveReadGrace, lerr))
+			}
+			return r.requeueMongoDBBackupWaiting(ctx, j, "PerconaServerMongoDBLiveStateUnknown",
+				fmt.Sprintf("backup %s passed the start deadline but its live state could not be read (%v); not cancelling blind", mdbBackup.Name, lerr))
+		}
+		switch liveState {
+		case "", psmdbtypes.StateWaiting:
+			// Not handed to pbm: "" means the operator has not observed the CR,
+			// waiting means it is queued behind another backup. At v1.22.0 the
+			// operator returns for a CR with a deletion timestamp before it
+			// dispatches, so the delete below prevents the late run.
+		case psmdbtypes.StateRequested:
+			// Dispatched: at v1.22.0 `requested` is set right after the command is
+			// sent to pbm, so pbm already holds it and deleting the CR cannot recall
+			// it — a late dump would then land with no CR to own it. Leave the CR
+			// (its finalizer stays the handle to whatever pbm writes) and fail.
+			return r.markBackupJobFailed(ctx, j, fmt.Sprintf(
+				"psmdb.percona.com PerconaServerMongoDBBackup did not start within %s (state=requested: already dispatched to pbm, so the operator backup is left in place)", psmdbDefaultBackupDeadline))
+		default:
+			// running/ready/error/rejected — the CR moved on; let the state switch
+			// handle it on the next reconcile instead of deleting it here.
+			return ctrl.Result{RequeueAfter: psmdbPollInterval}, nil
+		}
+		// The delete is pinned to the resourceVersion the live read answered for:
+		// a CR the operator moved on between that read and this delete is the
+		// case the live read exists to rule out, so a conflict means "moved on",
+		// and the next poll re-reads it. Any other delete failure is best-effort:
+		// it must not stop the job from failing (a leftover CR is the pre-existing
+		// behaviour, not a regression), and the terminal Phase=Failed makes
+		// reconcileMongoDB return early next time, so nothing re-creates it.
+		if mdbBackup.DeletionTimestamp.IsZero() {
+			derr := r.Delete(ctx, mdbBackup, client.Preconditions{ResourceVersion: &liveRV})
+			if apierrors.IsConflict(derr) {
+				return ctrl.Result{RequeueAfter: psmdbPollInterval}, nil
+			}
+			if derr != nil && !apierrors.IsNotFound(derr) {
+				getLogger(ctx).Debug("could not cancel the timed-out operator backup before failing",
+					"backupjob", j.Name, "sourceBackup", mdbBackup.Name, "error", derr)
+			}
+		}
+		return r.markBackupJobFailed(ctx, j, fmt.Sprintf(
+			"psmdb.percona.com PerconaServerMongoDBBackup did not start within %s (%s)", psmdbDefaultBackupDeadline, detail))
+	}
+}
+
+// requeueMongoDBBackupWaiting records a transient Ready=False condition on the
+// BackupJob and requeues. Factored out because the backup path has two
+// waiting-for-precondition branches (cluster absent, backups disabled) that
+// share the same shape.
+func (r *BackupJobReconciler) requeueMongoDBBackupWaiting(ctx context.Context, j *backupsv1alpha1.BackupJob, reason, message string) (ctrl.Result, error) {
+	// Write only when the condition actually changes: a running dump polls
+	// through here every few seconds for as long as it streams, and rewriting an
+	// identical condition each time would be a status write per poll for hours.
+	changed := apimeta.SetStatusCondition(&j.Status.Conditions, metav1.Condition{
+		Type:    "Ready",
+		Status:  metav1.ConditionFalse,
+		Reason:  reason,
+		Message: message,
+	})
+	if changed {
+		if err := r.Status().Update(ctx, j); err != nil {
+			return ctrl.Result{}, err
+		}
+	}
+	return ctrl.Result{RequeueAfter: psmdbPollInterval}, nil
+}
+
+// psmdbBackupPrecondition reports why a cluster is not ready to service an
+// on-demand backup, or "" when it is. Two independent conditions must hold, for
+// two different reasons: the operator runs the pbm agents only when
+// spec.backup.enabled=true, and a PerconaServerMongoDBBackup that names a
+// storage absent from spec.backup.storages fails resolution rather than
+// running. (Agent startup itself is gated on Enabled alone; the storage is
+// required by the backup CR, not by the agents.)
+func psmdbBackupPrecondition(cluster *psmdbtypes.PerconaServerMongoDB, storageName string) string {
+	if !cluster.Spec.Backup.Enabled {
+		return "spec.backup.enabled is false; on-demand backups need the percona-backup-mongodb agents running"
+	}
+	if _, ok := cluster.Spec.Backup.Storages[storageName]; !ok {
+		return fmt.Sprintf("spec.backup.storages does not declare storage %q", storageName)
+	}
+	return ""
+}
+
+// psmdbTargetCredentialsSecret returns the s3 credentialsSecret the target
+// cluster declares for a storage on the SAME bucket (wantBucket) as the source
+// archive, so a restore authenticates with the TARGET's own credentials rather
+// than the (possibly deleted) source's — but only when the target actually has
+// access to that bucket. Requiring the bucket to match keeps a legacy→legacy
+// restore on a shared bucket working while refusing to hand a cross-flow restore
+// a credential for the wrong bucket (a system-bucket target's cozy-backups-creds
+// against a legacy tenant bucket, or vice versa). It prefers the storage the
+// source backup named, then the chart default, then — only when the cluster
+// declares exactly one storage — that sole storage. Returns "" when nothing on
+// wantBucket is resolvable (including when wantBucket is empty), in which case
+// the caller keeps the source reference. spec.backup.storages is decoded on
+// demand from runtime.RawExtension, so no upstream storage shape is mirrored.
+func psmdbTargetCredentialsSecret(cluster *psmdbtypes.PerconaServerMongoDB, preferredStorage, wantBucket string) string {
+	storages := cluster.Spec.Backup.Storages
+	if len(storages) == 0 || wantBucket == "" {
+		return ""
+	}
+	credOnWantBucket := func(raw runtime.RawExtension) string {
+		bucket, cred := psmdbStorageS3(raw)
+		if cred != "" && bucket == wantBucket {
+			return cred
+		}
+		return ""
+	}
+	if preferredStorage != "" {
+		if cred := credOnWantBucket(storages[preferredStorage]); cred != "" {
+			return cred
+		}
+	}
+	if cred := credOnWantBucket(storages[psmdbDefaultStorageName]); cred != "" {
+		return cred
+	}
+	if len(storages) == 1 {
+		for _, raw := range storages {
+			return credOnWantBucket(raw)
+		}
+	}
+	return ""
+}
+
+// mongodbRestoreCredentialsSecret picks the s3 credentialsSecret a restore into
+// targetCluster should authenticate with. It returns the source's own reference
+// unless a safe swap applies, so the caller can compare and re-point only when
+// the value actually changes. Two guards make the swap correct across the legacy
+// and useSystemBucket flows:
+//   - When the source already names the platform-projected cozy-backups-creds
+//     (useSystemBucket), keep it: that Secret is projected into the restore
+//     namespace and outlives the source app, so there is nothing to repair, and
+//     repointing it at a legacy target's own creds would send a platform-bucket
+//     restore at the wrong credentials.
+//   - Otherwise adopt a target credential only when its storage is on the SAME
+//     bucket as the archive (source.S3.Bucket): the backupSource's bucket stays
+//     the source's, so a credential for a different bucket (a system-bucket
+//     target's cozy-backups-creds against a legacy tenant bucket) would fail the
+//     restore with AccessDenied. When no same-bucket target credential is
+//     discoverable the source reference is kept (in-place restore into the
+//     still-present source resolves to the same Secret, so this is a no-op).
+//
+// Returns "" only when the source carries no s3 reference at all.
+func mongodbRestoreCredentialsSecret(source *psmdbtypes.BackupSource, targetCluster *psmdbtypes.PerconaServerMongoDB) string {
+	if source == nil || source.S3 == nil {
+		return ""
+	}
+	current := source.S3.CredentialsSecret
+	if current == psmdbDefaultCredentialsSecret {
+		return current
+	}
+	if cred := psmdbTargetCredentialsSecret(targetCluster, source.StorageName, source.S3.Bucket); cred != "" {
+		return cred
+	}
+	return current
+}
+
+// psmdbStorageS3 extracts .s3.bucket and .s3.credentialsSecret from one psmdb
+// spec.backup.storages entry. Returns ("","") for an empty/non-object entry or
+// a non-s3 storage. The bucket lets the restore path refuse to hand a restore a
+// credential for a storage on a different bucket than the archive.
+func psmdbStorageS3(raw runtime.RawExtension) (bucket, credentialsSecret string) {
+	if len(raw.Raw) == 0 {
+		return "", ""
+	}
+	var st struct {
+		S3 struct {
+			Bucket            string `json:"bucket"`
+			CredentialsSecret string `json:"credentialsSecret"`
+		} `json:"s3"`
+	}
+	if err := json.Unmarshal(raw.Raw, &st); err != nil {
+		return "", ""
+	}
+	return st.S3.Bucket, st.S3.CredentialsSecret
+}
+
+// psmdbInjectedCredentialsSecret is the Secret name the injected storage entry
+// carries: the strategy's, or the platform-projected default when the strategy
+// leaves it empty. It is the one field on the entry the driver chose (bucket and
+// endpoint are whatever the platform bucket happens to be named or hosted at),
+// so it is what identifies the driver's entry on a live cluster.
+func psmdbInjectedCredentialsSecret(s3 *strategyv1alpha1.MongoDBStorageS3) string {
+	if s3.CredentialsSecret != "" {
+		return s3.CredentialsSecret
+	}
+	return psmdbDefaultCredentialsSecret
+}
+
+// psmdbCredentialsSecretIsInjected reports whether a live storage entry's
+// credentialsSecret is one the driver would have written: the strategy's
+// current name, or the platform default. Checking the default as well keeps a
+// lingering injected entry recognisable after the strategy drops or renames
+// its s3 block — otherwise the opt-out refusal would stop seeing the entry it
+// exists to refuse, and a legacy CR would be minted onto the platform bucket.
+func psmdbCredentialsSecretIsInjected(cred string, rendered *strategyv1alpha1.MongoDBTemplate) bool {
+	if cred == psmdbDefaultCredentialsSecret {
+		return true
+	}
+	return rendered.S3 != nil && cred == psmdbInjectedCredentialsSecret(rendered.S3)
+}
+
+// shouldInjectMongoDBSystemStorage reports whether the driver must SSA-inject
+// the system-bucket storage onto the live cluster: only when the app opted in
+// via backup.useSystemBucket AND the strategy actually carries S3 coordinates
+// to inject. Keying off the app flag (not the live cluster's storage set) is
+// the load-bearing guarantee: a legacy app leaves the flag false and is never
+// touched, so injection never clobbers a manually configured bucket; a
+// useSystemBucket app is injected on every BackupJob, so a later change to the
+// strategy coordinates catches up instead of being frozen at the first backup.
+func shouldInjectMongoDBSystemStorage(useSystemBucket bool, rendered *strategyv1alpha1.MongoDBTemplate) bool {
+	return useSystemBucket && rendered.S3 != nil
+}
+
+// buildMongoDBSystemStorageEntry constructs the psmdb spec.backup.storages
+// entry the driver injects on the useSystemBucket flow. Factored out of the
+// SSA path so the defaulting (empty credentialsSecret → cozy-backups-creds),
+// the forcePathStyle omit-when-nil (a nil pointer must not surface as a
+// forcePathStyle:false the app never chose), and the {"type":"s3","s3":{…}}
+// shape are exercised without a live apiserver.
+func buildMongoDBSystemStorageEntry(s3 *strategyv1alpha1.MongoDBStorageS3) map[string]interface{} {
+	cred := psmdbInjectedCredentialsSecret(s3)
+	s3Cfg := map[string]interface{}{
+		"bucket":                s3.Bucket,
+		"endpointUrl":           s3.EndpointURL,
+		"region":                s3.Region,
+		"prefix":                s3.Prefix,
+		"credentialsSecret":     cred,
+		"insecureSkipTLSVerify": s3.InsecureSkipTLSVerify,
+	}
+	if s3.ForcePathStyle != nil {
+		s3Cfg["forcePathStyle"] = *s3.ForcePathStyle
+	}
+	return map[string]interface{}{"type": "s3", "s3": s3Cfg}
+}
+
+// applyMongoDBSystemStorage SSA-injects the system-bucket S3 storage onto the
+// live PerconaServerMongoDB's spec.backup.storages[storageName] and returns the
+// server's post-apply view of the cluster. On the useSystemBucket flow the app
+// chart omits the storage (it cannot know the platform bucket/endpoint at render
+// time), so the driver owns this subtree via a dedicated field manager +
+// ForceOwnership - the app's Helm/Flux manager never sets it, so re-renders
+// leave the injected storage intact (mirrors the CNPG driver's spec.plugins
+// patch). CredentialsSecret defaults to cozy-backups-creds, which the BackupJob
+// reconciler projects into the namespace before dispatch. The typed Patch
+// decodes the apiserver's response (the full merged object, storage included)
+// back into the patch object, so the caller reads the injected storage straight
+// from the return value instead of a follow-up Get, which would hit the
+// informer cache and see the pre-patch cluster.
+func (r *BackupJobReconciler) applyMongoDBSystemStorage(ctx context.Context, namespace, psmdbName, storageName string, s3 *strategyv1alpha1.MongoDBStorageS3) (*psmdbtypes.PerconaServerMongoDB, error) {
+	entry, err := json.Marshal(buildMongoDBSystemStorageEntry(s3))
+	if err != nil {
+		return nil, err
+	}
+	patch := &psmdbtypes.PerconaServerMongoDB{
+		TypeMeta:   metav1.TypeMeta{APIVersion: psmdbtypes.GroupVersion.String(), Kind: "PerconaServerMongoDB"},
+		ObjectMeta: metav1.ObjectMeta{Namespace: namespace, Name: psmdbName},
+	}
+	patch.Spec.Backup.Storages = map[string]runtime.RawExtension{
+		storageName: {Raw: entry},
+	}
+	if err := r.Patch(ctx, patch, client.Apply, client.FieldOwner(psmdbFieldManager), client.ForceOwnership); err != nil {
+		return nil, err
+	}
+	return patch, nil
+}
+
+// psmdbBackupDeadlineExceeded reports whether enough wall-clock time elapsed
+// since the BackupJob started that we should give up on a stuck operator
+// backup. Returns false when StartedAt is nil so the first reconcile does not
+// trip the gate.
+func psmdbBackupDeadlineExceeded(startedAt *metav1.Time) bool {
+	if startedAt == nil {
+		return false
+	}
+	return time.Since(startedAt.Time) > psmdbDefaultBackupDeadline
+}
+
+// psmdbBackupTimedOut reports whether an in-progress operator backup should be
+// failed on wall-clock. On the useSystemBucket flow a backup that has begun
+// streaming (state=running) is exempt from the deadline: pbm keeps writing
+// into the shared bucket after the driver gives up, and the BackupJob's
+// terminal-phase guard means the artifact-creating branch never runs again, so
+// failing it would strand an archive that no Backup object represents and no
+// retention can reach (the operator CR carries no ownerRef either). A real
+// dataset routinely outruns 30m, and a genuinely broken dump terminates
+// through the operator's own error/rejected state, so it is left to finish up
+// to psmdbRunningCeiling, past which the caller fails the job without
+// cancelling the CR. On the legacy flow the deadline applies to `running` too:
+// the archive is in the tenant's own bucket and is theirs to reclaim (no
+// platform retention covers it), so nothing the platform owns is stranded, and
+// the pre-existing contract failed the job on the deadline while leaving the
+// operator CR alone. The deadline bounds the not-yet-`running` states ("",
+// requested, waiting) on both flows: a backup the operator has not begun
+// streaming can still be advanced later — a `waiting` backup runs when the slot
+// frees, and `requested` is set as the operator dispatches — so the caller
+// cancels the operator CR when this trips, rather than leaving it to run into
+// the shared bucket after the BackupJob is already Failed.
+func psmdbBackupTimedOut(state string, startedAt *metav1.Time, useSystemBucket bool) bool {
+	if state == psmdbtypes.StateRunning && useSystemBucket {
+		return startedAt != nil && time.Since(startedAt.Time) > psmdbRunningCeiling
+	}
+	return psmdbBackupDeadlineExceeded(startedAt)
+}
+
+// psmdbArtifactWindow bounds how long the driver keeps retrying to materialise
+// the Backup object for a completed dump: psmdbLiveReadGrace after the operator
+// marked the CR complete, or the backup deadline plus that grace after the job
+// started when the operator recorded no completion time. It returns the window
+// in force and whether it is spent.
+func psmdbArtifactWindow(b *psmdbtypes.PerconaServerMongoDBBackup, startedAt *metav1.Time) (time.Duration, bool) {
+	if b.Status.Completed != nil {
+		return psmdbLiveReadGrace, time.Since(b.Status.Completed.Time) > psmdbLiveReadGrace
+	}
+	window := psmdbDefaultBackupDeadline + psmdbLiveReadGrace
+	return window, startedAt != nil && time.Since(startedAt.Time) > window
+}
+
+// psmdbStorageEntrySettled reports whether the live storage entry already says
+// what the driver is about to apply: present, and agreeing on every field the
+// driver writes. A false answer means the apply that follows changes the
+// entry, so the operator has something new to push into pbm before a CR may
+// be minted against it. A field the entry lacks counts as its zero value, so
+// an entry the operator rewrote without an empty region or a false flag is
+// still settled, while a non-empty value the entry lacks is a change the apply
+// adds. Fields the server adds on its own are ignored.
+func psmdbStorageEntrySettled(raw runtime.RawExtension, s3 *strategyv1alpha1.MongoDBStorageS3) bool {
+	if len(raw.Raw) == 0 {
+		return false
+	}
+	var live struct {
+		Type string                 `json:"type"`
+		S3   map[string]interface{} `json:"s3"`
+	}
+	if err := json.Unmarshal(raw.Raw, &live); err != nil {
+		return false
+	}
+	desired := buildMongoDBSystemStorageEntry(s3)
+	if want, _ := desired["type"].(string); live.Type != want {
+		return false
+	}
+	want := desired["s3"].(map[string]interface{})
+	for k, v := range want {
+		got, ok := live.S3[k]
+		if !ok {
+			if v != "" && v != false {
+				return false
+			}
+			continue
+		}
+		if got != v {
+			return false
+		}
+	}
+	// forcePathStyle is the one driver field the apply omits when the strategy
+	// leaves it unset; an entry still carrying it is about to lose it.
+	if _, live := live.S3["forcePathStyle"]; live {
+		if _, wanted := want["forcePathStyle"]; !wanted {
+			return false
+		}
+	}
+	return true
+}
+
+// psmdbPBMConfigApplied reports whether the operator has acted on the
+// cluster's current spec.backup: its last reconcile saw this generation, and
+// the PBMReady condition says pbm holds the config that reconcile pushed. An
+// absent condition is not ready: at the pinned version the operator sets it
+// the first time a backup config reaches pbm, so a cluster that never had one
+// (the useSystemBucket render before its first injection) is exactly the case
+// to wait on.
+func psmdbPBMConfigApplied(cluster *psmdbtypes.PerconaServerMongoDB) bool {
+	return cluster.Status.ObservedGeneration >= cluster.Generation &&
+		psmdbConditionStatus(cluster, psmdbtypes.ConditionPBMReady) == "True"
+}
+
+// psmdbConditionStatus returns the status of the named cluster condition, or
+// "Unknown" when the operator has not set it.
+func psmdbConditionStatus(cluster *psmdbtypes.PerconaServerMongoDB, condType string) string {
+	for _, c := range cluster.Status.Conditions {
+		if c.Type == condType {
+			return c.Status
+		}
+	}
+	return "Unknown"
+}
+
+// psmdbClusterForMint reads the PerconaServerMongoDB the mint-time decisions
+// are made on: from the apiserver when a dynamic client is configured, from
+// the manager's cache otherwise.
+func (r *BackupJobReconciler) psmdbClusterForMint(ctx context.Context, namespace, name string) (*psmdbtypes.PerconaServerMongoDB, error) {
+	if r.Interface != nil {
+		return r.psmdbClusterLive(ctx, namespace, name)
+	}
+	cluster := &psmdbtypes.PerconaServerMongoDB{}
+	if err := r.Get(ctx, types.NamespacedName{Namespace: namespace, Name: name}, cluster); err != nil {
+		return nil, err
+	}
+	return cluster, nil
+}
+
+// requeueMongoDBBackupBehindCR names a wait on a job whose operator CR already
+// exists (a read the artifact needs is failing), bounded by the running
+// ceiling rather than the backup deadline: the dump is under way and nothing
+// here may cancel it. Past the ceiling the job fails naming the CR, which is
+// left in place as the handle to whatever pbm wrote.
+func (r *BackupJobReconciler) requeueMongoDBBackupBehindCR(ctx context.Context, j *backupsv1alpha1.BackupJob, cr *psmdbtypes.PerconaServerMongoDBBackup, reason, message string) (ctrl.Result, error) {
+	if j.Status.StartedAt != nil && time.Since(j.Status.StartedAt.Time) > psmdbRunningCeiling {
+		return r.markBackupJobFailed(ctx, j, fmt.Sprintf(
+			"%s for over %s after the job started; the operator backup %s is left in place, not cancelled", message, psmdbRunningCeiling, cr.Name))
+	}
+	return r.requeueMongoDBBackupWaiting(ctx, j, reason, fmt.Sprintf("%s (operator backup %s is under way and is left alone)", message, cr.Name))
+}
+
+// psmdbClusterGVR addresses PerconaServerMongoDB through the dynamic client for
+// an uncached read of the cluster's current render (see reconcileMongoDB).
+var psmdbClusterGVR = schema.GroupVersionResource{
+	Group:    psmdbtypes.GroupVersion.Group,
+	Version:  psmdbtypes.GroupVersion.Version,
+	Resource: "perconaservermongodbs",
+}
+
+// psmdbClusterLive reads the PerconaServerMongoDB straight from the apiserver,
+// bypassing the informer cache, and decodes the fields the driver reads.
+func (r *BackupJobReconciler) psmdbClusterLive(ctx context.Context, namespace, name string) (*psmdbtypes.PerconaServerMongoDB, error) {
+	u, err := r.Interface.Resource(psmdbClusterGVR).Namespace(namespace).Get(ctx, name, metav1.GetOptions{})
+	if err != nil {
+		return nil, err
+	}
+	raw, err := json.Marshal(u.Object)
+	if err != nil {
+		return nil, err
+	}
+	out := &psmdbtypes.PerconaServerMongoDB{}
+	if err := json.Unmarshal(raw, out); err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+// psmdbClusterHasLegacyRender reports whether the cluster still carries the
+// scheduled tasks or the PITR stream the mongodb chart renders only without
+// useSystemBucket: the mark of a release whose applied revision predates the
+// flag, whatever the app CR's desired values say.
+func psmdbClusterHasLegacyRender(cluster *psmdbtypes.PerconaServerMongoDB) bool {
+	b := cluster.Spec.Backup
+	return len(b.Tasks) > 0 || (b.PITR != nil && b.PITR.Enabled)
+}
+
+// psmdbStorageRaceRetries reads how many storage-race retries the BackupJob has
+// spent; an absent or unparseable annotation counts as none.
+func psmdbStorageRaceRetries(j *backupsv1alpha1.BackupJob) int {
+	n, err := strconv.Atoi(j.Annotations[psmdbStorageRaceRetriesAnnotation])
+	if err != nil || n < 0 {
+		return 0
+	}
+	return n
+}
+
+// recordMongoDBStorageRaceRetry persists the retry count on the BackupJob's
+// metadata. The patch response updates j in place, so the status write that
+// follows in the same reconcile does not conflict on a stale resourceVersion.
+func (r *BackupJobReconciler) recordMongoDBStorageRaceRetry(ctx context.Context, j *backupsv1alpha1.BackupJob, retries int) error {
+	base := j.DeepCopy()
+	if j.Annotations == nil {
+		j.Annotations = map[string]string{}
+	}
+	j.Annotations[psmdbStorageRaceRetriesAnnotation] = strconv.Itoa(retries)
+	return r.Patch(ctx, j, client.MergeFrom(base))
+}
+
+// psmdbErrorIsUnresolvedStorage reports whether a PerconaServerMongoDBBackup
+// error is the operator failing to resolve the named storage — the message the
+// v1.22.0 backup reconciler sets ("unable to get storage '<name>'") when it
+// reads a cluster cache that has not yet observed the driver's storage
+// injection. That is the residual half of the injection race, retryable rather
+// than a tenant failure. The match is against upstream's wording at the
+// operator version the chart pins (packages/apps/mongodb/templates/mongodb.yaml,
+// spec.crVersion): a bump that rewords this error silently turns the retry
+// off, so re-check pkg/controller/perconaservermongodbbackup/backup.go there.
+func psmdbErrorIsUnresolvedStorage(errMsg, storageName string) bool {
+	return strings.Contains(errMsg, "unable to get storage") && strings.Contains(errMsg, storageName)
+}
+
+// psmdbBackupLiveState reads the operator backup CR straight from the apiserver
+// (bypassing the informer cache) and returns its status.state and the
+// resourceVersion that state was read at, so a delete decided on the state can
+// be pinned to it. It returns an error whenever the live state could not be
+// established — the dynamic client is unset, the read failed (throttle, 403,
+// removed CRD), or the object is gone — so the caller can tell "could not read"
+// apart from a genuine empty state and never treat an unanswerable read as a
+// not-started answer. A successful read of a CR that carries no status.state yet
+// returns "" for the state.
+func (r *BackupJobReconciler) psmdbBackupLiveState(ctx context.Context, namespace, name string) (state, resourceVersion string, err error) {
+	if r.Interface == nil {
+		return "", "", fmt.Errorf("dynamic client not configured")
+	}
+	u, err := r.Interface.Resource(psmdbBackupGVR).Namespace(namespace).Get(ctx, name, metav1.GetOptions{})
+	if err != nil {
+		return "", "", err
+	}
+	state, _, _ = unstructured.NestedString(u.Object, "status", "state")
+	return state, u.GetResourceVersion(), nil
+}
+
+// ensureMongoDBBackup creates a one-shot PerconaServerMongoDBBackup CR labelled
+// with the BackupJob, or returns the existing one if a previous reconcile
+// already created it. Idempotency relies on the OwningJob labels. ownArchive
+// says the storage the CR names carries the platform bucket's coordinates, as
+// the caller verified on the live cluster; only then does the CR get the prune
+// finalizer that marks the archive as the platform's to delete.
+func (r *BackupJobReconciler) ensureMongoDBBackup(ctx context.Context, j *backupsv1alpha1.BackupJob, clusterName, storageName string, rendered *strategyv1alpha1.MongoDBTemplate, ownArchive bool) (*psmdbtypes.PerconaServerMongoDBBackup, error) {
+	existing, err := r.findMongoDBBackupForJob(ctx, j)
+	if err != nil {
+		return nil, err
+	}
+	if existing != nil {
+		return existing, nil
+	}
+
+	obj := &psmdbtypes.PerconaServerMongoDBBackup{
+		ObjectMeta: metav1.ObjectMeta{
+			Namespace:    j.Namespace,
+			GenerateName: fmt.Sprintf("%s-", j.Name),
+			Labels: map[string]string{
+				backupsv1alpha1.OwningJobNameLabel:      j.Name,
+				backupsv1alpha1.OwningJobNamespaceLabel: j.Namespace,
+			},
+		},
+		Spec: psmdbtypes.PerconaServerMongoDBBackupSpec{
+			ClusterName:     clusterName,
+			StorageName:     storageName,
+			Type:            psmdbBackupTypeOrDefault(rendered.Type),
+			CompressionType: rendered.CompressionType,
+		},
+	}
+	if rendered.CompressionLevel != nil {
+		lvl := *rendered.CompressionLevel
+		obj.Spec.CompressionLevel = &lvl
+	}
+	if ownArchive {
+		// Own the archive's lifecycle on the shared bucket: the operator's
+		// delete-backup finalizer prunes the pbm object from storage when this CR
+		// is deleted, which is how the cleanup path reclaims cozy-backups when a
+		// Backup is deleted. A legacy backup writes to the tenant's own bucket and is
+		// left unfinalized, so cleanup reads it as unowned. That finalizer check
+		// is only ever run against the one CR this function minted — cleanup
+		// resolves it by the backup-name recorded in driverMetadata, never by
+		// label or by scanning the namespace — so a task-minted CR that the
+		// operator itself finalizes on the legacy flow (spec.backup.tasks with a
+		// delete-from-storage retention) is never in scope and never mistaken for
+		// ours.
+		controllerutil.AddFinalizer(obj, psmdbDeleteBackupFinalizer)
+	}
+
+	if err := r.Create(ctx, obj); err != nil {
+		return nil, err
+	}
+	return obj, nil
+}
+
+// findMongoDBBackupForJob returns the PerconaServerMongoDBBackup labelled with
+// the BackupJob's OwningJob{Name,Namespace}, if any. Returns (nil, nil) when no
+// match is found. See the MariaDB driver's findMariaDBBackupForJob for the
+// duplicate-observation rationale (list race across replicas → pick [0]
+// deterministically with a breadcrumb).
+func (r *BackupJobReconciler) findMongoDBBackupForJob(ctx context.Context, j *backupsv1alpha1.BackupJob) (*psmdbtypes.PerconaServerMongoDBBackup, error) {
+	list := &psmdbtypes.PerconaServerMongoDBBackupList{}
+	if err := r.List(ctx, list,
+		client.InNamespace(j.Namespace),
+		client.MatchingLabels{
+			backupsv1alpha1.OwningJobNameLabel:      j.Name,
+			backupsv1alpha1.OwningJobNamespaceLabel: j.Namespace,
+		},
+	); err != nil {
+		return nil, err
+	}
+	// Skip CRs already being deleted. The storage-race retry deletes an errored
+	// CR so a fresh one resolves against a caught-up cache, but the release-lock
+	// finalizer keeps it briefly Terminating; treating that lingering CR as the
+	// current one would re-observe the same error and requeue without ever
+	// re-minting. The mint uses GenerateName, so a new CR never collides with the
+	// Terminating one.
+	live := make([]*psmdbtypes.PerconaServerMongoDBBackup, 0, len(list.Items))
+	for i := range list.Items {
+		if list.Items[i].DeletionTimestamp.IsZero() {
+			live = append(live, &list.Items[i])
+		}
+	}
+	if len(live) == 0 {
+		return nil, nil
+	}
+	if len(live) > 1 {
+		names := make([]string, 0, len(live))
+		for _, b := range live {
+			names = append(names, b.Name)
+		}
+		getLogger(ctx).Debug("multiple PerconaServerMongoDBBackup CRs match BackupJob OwningJob labels; reusing first",
+			"backupjob", j.Name, "namespace", j.Namespace, "matches", names, "picked", names[0])
+	}
+	return live[0], nil
+}
+
+// createMongoDBBackupArtifact materialises a Cozystack Backup resource carrying
+// the metadata callers need to drive a future restore: the operator backup
+// name/namespace, the S3 destination, and a snapshot of the storage descriptor
+// (persisted in status.underlyingResources) so a restore can rebuild
+// backupSource even once the operator-side Backup CR is reaped.
+func (r *BackupJobReconciler) createMongoDBBackupArtifact(
+	ctx context.Context,
+	j *backupsv1alpha1.BackupJob,
+	resolved *ResolvedBackupConfig,
+	mdbBackup *psmdbtypes.PerconaServerMongoDBBackup,
+	rendered *strategyv1alpha1.MongoDBTemplate,
+	storageName string,
+	useSystemBucket bool,
+) (*backupsv1alpha1.Backup, error) {
+	takenAt := metav1.Now()
+	if mdbBackup.Status.Completed != nil && !mdbBackup.Status.Completed.IsZero() {
+		takenAt = *mdbBackup.Status.Completed
+	}
+
+	driverMD := map[string]string{
+		psmdbBackupNameKey:      mdbBackup.Name,
+		psmdbBackupNamespaceKey: mdbBackup.Namespace,
+	}
+	if mdbBackup.Status.Destination != "" {
+		driverMD[psmdbDestinationKey] = mdbBackup.Status.Destination
+	}
+
+	underlyingResources, err := marshalMongoDBBackupSnapshot(mdbBackup, rendered, storageName, resolved.Parameters, useSystemBucket)
+	if err != nil {
+		return nil, fmt.Errorf("encode source snapshot for Backup.status.underlyingResources: %w", err)
+	}
+
+	status := backupsv1alpha1.BackupStatus{
+		Phase:               backupsv1alpha1.BackupPhaseReady,
+		UnderlyingResources: underlyingResources,
+	}
+	if mdbBackup.Status.Destination != "" {
+		status.Artifact = &backupsv1alpha1.BackupArtifact{URI: mdbBackup.Status.Destination}
+	}
+
+	backup := &backupsv1alpha1.Backup{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      j.Name,
+			Namespace: j.Namespace,
+		},
+		Spec: backupsv1alpha1.BackupSpec{
+			ApplicationRef: j.Spec.ApplicationRef,
+			StrategyRef:    resolved.StrategyRef,
+			TakenAt:        takenAt,
+			DriverMetadata: driverMD,
+		},
+		Status: status,
+	}
+	if j.Spec.PlanRef != nil {
+		backup.Spec.PlanRef = j.Spec.PlanRef
+	}
+	if err := r.Create(ctx, backup); err != nil {
+		if !apierrors.IsAlreadyExists(err) {
+			return nil, err
+		}
+		existing := &backupsv1alpha1.Backup{}
+		if getErr := r.Get(ctx, types.NamespacedName{Namespace: backup.Namespace, Name: backup.Name}, existing); getErr != nil {
+			return nil, getErr
+		}
+		return existing, nil
+	}
+	return backup, nil
+}
+
+// cleanupMongoDBBackup prunes the pbm archive a system-bucket Backup wrote to
+// the shared cozy-backups bucket when that Backup is deleted (by hand, or by
+// whatever retention lands on the platform). Ownership is read from the delete-backup finalizer on the ONE
+// operator CR named in driverMetadata (the one ensureMongoDBBackup minted for
+// this Backup) — resolved by name, never by label or scan, so a task-minted CR
+// the operator finalizes on the legacy flow is out of scope. ensureMongoDBBackup
+// stamps that finalizer only on the useSystemBucket flow, so its presence on the
+// named CR is the "the driver owns this archive" marker (and there is no separate
+// driverMetadata flag that could disagree if the app's useSystemBucket flag
+// flipped mid-backup). When the driver owns it, this deletes the operator CR and
+// waits for the finalizer to remove the object before releasing the Cozystack
+// Backup, so nothing is orphaned — the "own the artifact, wait for the delete"
+// contract the Redis/Rabbitmq branches use. A legacy backup (no such finalizer)
+// is left untouched, the pre-existing no-op contract for the operator-backed
+// drivers.
+//
+// The wait has give-up conditions so a wedged operator does not, on its own,
+// keep this driver holding the Backup in Terminating: the escape-hatch
+// annotation (honoured before any apiserver read, so it still frees a Backup
+// whose operator CR has become unreadable) and a going-away namespace (the psmdb
+// delete-backup exec cannot run there) each make the driver strip its own
+// finalizer and release, leaving the object for a bucket lifecycle policy. This
+// bounds only what the driver contributes: a Get that fails with something other
+// than NotFound/NoMatchError still requeues (below), and the psmdb operator's own
+// release-lock finalizer keeps the CR Terminating while the operator is down,
+// whatever the driver strips. A down operator in a live namespace is likewise
+// not auto-released: the Backup stays Terminating as a visible signal until an
+// operator recovers or the annotation is set.
+func (r *BackupReconciler) cleanupMongoDBBackup(ctx context.Context, backup *backupsv1alpha1.Backup) (ctrl.Result, error) {
+	sourceBackupName := backup.Spec.DriverMetadata[psmdbBackupNameKey]
+	if sourceBackupName == "" {
+		// Nothing recorded to delete (Backup written before the name was tracked).
+		return ctrl.Result{}, nil
+	}
+
+	// Escape hatch first, before any apiserver read: the Backup must be releasable
+	// even when the operator CR cannot be read at all — its CRD removed, or the
+	// verb revoked — which is exactly the situation someone sets it in. Mirrors
+	// the Redis cleanup, which reads its skip annotation before it touches the
+	// apiserver.
+	if backup.Annotations[psmdbSkipArtifactCleanupAnnotation] == "true" {
+		// No object in hand (this runs before any read); releaseMongoDBCleanup
+		// does the best-effort fetch.
+		return r.releaseMongoDBCleanup(ctx, backup, sourceBackupName, nil, "skip-artifact-cleanup annotation set")
+	}
+
+	// A legacy Backup owns nothing on the shared bucket, and before this driver
+	// its cleanup was an unconditional no-op that no apiserver error could hold
+	// up. The snapshot records the flow, so decide from it first: when it is our
+	// kind and says legacy, release without reading the operator CR at all, so a
+	// throttle or a revoked verb on a CR the driver does not own cannot pin the
+	// Backup (or a namespace being torn down) in Terminating. A missing or
+	// undecodable snapshot falls through to the read below, never the other way.
+	if snap, serr := unmarshalMongoDBBackupSnapshot(backup.Status.UnderlyingResources); serr == nil && snap != nil && snap.Kind == psmdbBackupSnapshotKind && !snap.UseSystemBucket {
+		return ctrl.Result{}, nil
+	}
+
+	live := &psmdbtypes.PerconaServerMongoDBBackup{}
+	err := r.Get(ctx, types.NamespacedName{Namespace: backup.Namespace, Name: sourceBackupName}, live)
+	if apierrors.IsNotFound(err) || apimeta.IsNoMatchError(err) {
+		// The operator CR is gone (a driver-owned archive was pruned with it, and
+		// a legacy CR that is gone was nothing of ours), or its CRD is no longer
+		// served (nothing to strip when the kind itself is unmapped). Release.
+		// Classifying NoMatchError alongside NotFound matches the Job/Redis
+		// cleanups.
+		return ctrl.Result{}, nil
+	}
+	if err != nil {
+		return ctrl.Result{}, err
+	}
+
+	if !controllerutil.ContainsFinalizer(live, psmdbDeleteBackupFinalizer) {
+		// Legacy backup: the driver never stamped the prune finalizer, so the
+		// archive is the tenant's (its own bucket) and its lifecycle is not ours.
+		return ctrl.Result{}, nil
+	}
+
+	terminating, nsErr := r.namespaceTerminating(ctx, backup.Namespace)
+	if nsErr != nil {
+		return ctrl.Result{}, nsErr
+	}
+	if terminating {
+		// Hand down the object already read and confirmed owned above, so the
+		// release strips its finalizer without a second Get that a transient
+		// throttle/Forbidden could fold into "nothing of ours" — leaving the CR
+		// finalized in a namespace being torn down, the exact wedge this prevents.
+		return r.releaseMongoDBCleanup(ctx, backup, sourceBackupName, live, "namespace is terminating")
+	}
+
+	if live.DeletionTimestamp.IsZero() {
+		if derr := r.Delete(ctx, live); derr != nil && !apierrors.IsNotFound(derr) {
+			return ctrl.Result{}, derr
+		}
+	}
+	// Requeue until the operator finalizer has removed the CR (and the archive
+	// with it).
+	getLogger(ctx).Debug("waiting for psmdb operator to prune system-bucket archive",
+		"backup", backup.Name, "sourceBackup", sourceBackupName)
+	return ctrl.Result{RequeueAfter: psmdbPollInterval}, nil
+}
+
+// releaseMongoDBCleanup lets the Cozystack Backup (and any enclosing namespace)
+// finish deleting when the archive cannot be pruned in place. It only ever
+// touches an operator CR the driver OWNS — one carrying the delete-backup
+// finalizer: it strips that finalizer so the CR no longer blocks teardown and
+// deletes it. A legacy CR (no finalizer) or one that cannot be read at all is
+// left entirely intact, so the never-deleted contract for legacy backups holds
+// even though the annotation reaches this path before the ownership check, and
+// an unreadable CR still releases. The finalizer strip is best-effort — the
+// release must proceed even against an unreachable CR — but a failed strip is
+// surfaced (log + Event), because the CR then keeps the finalizer and can hold
+// its namespace in Terminating, and the operator needs to know which one.
+//
+// `live` is the object the caller already read and confirmed owned; the
+// terminating path passes it so the strip is not gated on a second Get whose
+// transient failure would silently drop it. The annotation path passes nil (it
+// runs before any read), and this does the best-effort fetch itself — an
+// unreadable or unowned CR is then left intact and the Backup still releases.
+func (r *BackupReconciler) releaseMongoDBCleanup(ctx context.Context, backup *backupsv1alpha1.Backup, sourceBackupName string, live *psmdbtypes.PerconaServerMongoDBBackup, reason string) (ctrl.Result, error) {
+	logger := getLogger(ctx)
+	if live == nil {
+		fetched := &psmdbtypes.PerconaServerMongoDBBackup{}
+		err := r.Get(ctx, types.NamespacedName{Namespace: backup.Namespace, Name: sourceBackupName}, fetched)
+		switch {
+		case err != nil:
+			// The CR could not be read (its CRD removed, the verb revoked, a
+			// throttle). It may still carry the driver's delete-backup finalizer, so
+			// the annotation releases the Backup regardless — but this is the same
+			// class of leftover as a failed strip below, so surface which object may
+			// be left finalized rather than a Debug line nobody sees.
+			logger.Info("releasing MongoDB Backup; could not read the operator CR to strip its finalizer",
+				"backup", backup.Name, "sourceBackup", sourceBackupName, "reason", reason, "error", err)
+			if r.Recorder != nil {
+				r.Recorder.Eventf(backup, corev1.EventTypeWarning, "FinalizerNotStripped",
+					"released Backup but could not read PerconaServerMongoDBBackup %s to strip its delete-backup finalizer (%v); if it carries the finalizer it may hold its namespace in Terminating", sourceBackupName, err)
+			}
+			return ctrl.Result{}, nil
+		case !controllerutil.ContainsFinalizer(fetched, psmdbDeleteBackupFinalizer):
+			// Legacy backup (no delete-backup finalizer): genuinely not the
+			// driver's, so leave the operator CR untouched and release quietly.
+			logger.Debug("releasing MongoDB Backup; no driver-owned archive to prune",
+				"backup", backup.Name, "sourceBackup", sourceBackupName, "reason", reason)
+			return ctrl.Result{}, nil
+		}
+		live = fetched
+	}
+
+	base := live.DeepCopy()
+	controllerutil.RemoveFinalizer(live, psmdbDeleteBackupFinalizer)
+	if perr := r.Patch(ctx, live, client.MergeFrom(base)); perr != nil {
+		// The release still proceeds (an unreachable CR must not wedge the
+		// Backup), but the CR keeps the finalizer and can pin its namespace in
+		// Terminating — surface which object so an operator can find it.
+		logger.Info("released MongoDB Backup but could not strip the delete-backup finalizer; the operator CR may hold its namespace in Terminating",
+			"backup", backup.Name, "sourceBackup", sourceBackupName, "reason", reason, "error", perr)
+		if r.Recorder != nil {
+			r.Recorder.Eventf(backup, corev1.EventTypeWarning, "FinalizerNotStripped",
+				"released Backup but could not strip the delete-backup finalizer from PerconaServerMongoDBBackup %s (%v); it may keep the namespace in Terminating", sourceBackupName, perr)
+		}
+		return ctrl.Result{}, nil
+	}
+	if live.DeletionTimestamp.IsZero() {
+		_ = r.Delete(ctx, live)
+	}
+	logger.Info("releasing MongoDB Backup, leaving its shared-bucket object for a lifecycle policy",
+		"backup", backup.Name, "sourceBackup", sourceBackupName, "reason", reason)
+	if r.Recorder != nil {
+		r.Recorder.Eventf(backup, corev1.EventTypeWarning, "ArtifactNotDeleted",
+			"left MongoDB archive in the bucket: %s", reason)
+	}
+	return ctrl.Result{}, nil
+}
+
+// ---------------------------------------------------------------------------
+// RestoreJob path
+// ---------------------------------------------------------------------------
+
+func (r *RestoreJobReconciler) reconcileMongoDBRestore(ctx context.Context, restoreJob *backupsv1alpha1.RestoreJob, backup *backupsv1alpha1.Backup) (ctrl.Result, error) {
+	logger := getLogger(ctx)
+	logger.Debug("reconciling MongoDB restore", "restorejob", restoreJob.Name, "backup", backup.Name)
+
+	if restoreJob.Status.Phase == backupsv1alpha1.RestoreJobPhaseSucceeded ||
+		restoreJob.Status.Phase == backupsv1alpha1.RestoreJobPhaseFailed {
+		return ctrl.Result{}, nil
+	}
+
+	if err := validateMongoDBApplicationRef(backup.Spec.ApplicationRef); err != nil {
+		return r.markRestoreJobFailed(ctx, restoreJob, err.Error())
+	}
+
+	// Validate the resolved target shape before any apiserver call.
+	target := r.resolveMongoDBRestoreTarget(restoreJob, backup)
+	if target.Kind != mongodbAppKind {
+		return r.markRestoreJobFailed(ctx, restoreJob, fmt.Sprintf(
+			"target applicationRef.kind=%q is not supported by the MongoDB driver", target.Kind))
+	}
+	if target.APIGroup != "" && target.APIGroup != mongodbapp.GroupName {
+		return r.markRestoreJobFailed(ctx, restoreJob, fmt.Sprintf(
+			"target applicationRef.apiGroup=%q is not supported by the MongoDB driver", target.APIGroup))
+	}
+
+	if restoreJob.Status.StartedAt == nil {
+		fresh := &backupsv1alpha1.RestoreJob{}
+		if err := r.Get(ctx, types.NamespacedName{Namespace: restoreJob.Namespace, Name: restoreJob.Name}, fresh); err != nil {
+			return ctrl.Result{}, err
+		}
+		if fresh.Status.StartedAt != nil {
+			restoreJob.Status.StartedAt = fresh.Status.StartedAt
+			if fresh.Status.Phase != "" {
+				restoreJob.Status.Phase = fresh.Status.Phase
+			}
+		} else {
+			base := fresh.DeepCopy()
+			now := metav1.Now()
+			fresh.Status.StartedAt = &now
+			fresh.Status.Phase = backupsv1alpha1.RestoreJobPhaseRunning
+			if err := r.Status().Patch(ctx, fresh, client.MergeFrom(base)); err != nil {
+				return ctrl.Result{}, err
+			}
+			restoreJob.Status.StartedAt = fresh.Status.StartedAt
+			restoreJob.Status.Phase = fresh.Status.Phase
+			return ctrl.Result{RequeueAfter: psmdbPollInterval}, nil
+		}
+	}
+
+	// parseMongoDBRestoreOptions is intentionally permissive (event + log,
+	// proceed with defaults) for a malformed blob, but a malformed recoveryTime
+	// is load-bearing — restoring to the wrong point silently would be worse
+	// than failing — so a bad recoveryTime fails terminally below.
+	options, unknownKeys, err := parseMongoDBRestoreOptions(restoreJob.Spec.Options)
+	if err != nil {
+		// Falling back to defaults is safe for most malformed options, but not
+		// when the blob carries a recoveryTime key: silently degrading a PITR
+		// request to a plain snapshot restore is exactly the wrong-point restore
+		// pitrSpec fails terminally to prevent. spec.options is free-form
+		// runtime.RawExtension, so a non-string recoveryTime (e.g. {"recoveryTime":
+		// 20260805}) passes admission yet fails the typed decode here — fail
+		// terminally rather than restore to the snapshot and report Succeeded.
+		if restoreOptionsCarryRecoveryTimeKey(restoreJob.Spec.Options) {
+			return r.markRestoreJobFailed(ctx, restoreJob, fmt.Sprintf(
+				"restoreJob.spec.options carries a recoveryTime but is malformed (%v); refusing to fall back to a plain snapshot restore, which would silently ignore the requested point-in-time", err))
+		}
+		logger.Info("malformed restoreJob.spec.options; falling back to defaults", "error", err)
+		r.Recorder.Eventf(restoreJob, corev1.EventTypeWarning, "MalformedOptions",
+			"spec.options is not valid JSON; falling back to defaults: %v", err)
+	}
+	// Warn (don't fail) on keys the MongoDB driver doesn't recognise: a typo
+	// like "recoverytime" would otherwise be silently ignored and the restore
+	// would run to the snapshot instead of the intended point. A Warning event
+	// gives the tenant a breadcrumb without rejecting an otherwise-valid restore.
+	for _, k := range unknownKeys {
+		logger.Info("ignoring unknown restoreJob.spec.options key", "key", k, "known", mongodbKnownRestoreOptionKeys)
+		r.Recorder.Eventf(restoreJob, corev1.EventTypeWarning, "UnknownRestoreOption",
+			"spec.options.%s is not a recognised MongoDB restore option and was ignored (known: %s)",
+			k, strings.Join(mongodbKnownRestoreOptionKeys, ", "))
+	}
+	pitr, perr := options.pitrSpec()
+	if perr != nil {
+		return r.markRestoreJobFailed(ctx, restoreJob, fmt.Sprintf("invalid restoreJob.spec.options.recoveryTime: %v", perr))
+	}
+
+	// Resolve the backup source (destination + S3 config). Prefer the live
+	// operator Backup CR's status (freshest), fall back to the snapshot
+	// persisted on the Cozystack Backup so a reaped operator CR still restores.
+	source, err := r.resolveMongoDBBackupSource(ctx, backup)
+	if err != nil {
+		// A read error on the live operator Backup CR is retryable (cache not
+		// yet synced, apiserver hiccup); requeue rather than fail the
+		// RestoreJob, matching the backup path's handling of the symmetric
+		// read error. Only a genuinely unresolvable source (no destination)
+		// is terminal.
+		if errors.Is(err, errTransientRestoreSource) {
+			return ctrl.Result{}, err
+		}
+		return r.markRestoreJobFailed(ctx, restoreJob, err.Error())
+	}
+
+	// Point-in-time recovery needs an oplog stream, which the useSystemBucket flow
+	// never captures — the chart leaves spec.backup.pitr unset there (see
+	// backup-classes.md). Refuse a recoveryTime restore of a system-bucket backup
+	// with a named error rather than hand the operator a PITR target it cannot
+	// serve. Identify the flow from the flag recorded on the snapshot at backup
+	// time, not from the resolved credentialsSecret: a BackupClass may name any
+	// Secret, so the Secret name is only a proxy, while the snapshot flag is what
+	// the backup actually ran on.
+	if pitr != nil {
+		snap, serr := unmarshalMongoDBBackupSnapshot(backup.Status.UnderlyingResources)
+		if serr != nil {
+			// Flow unknown: refuse rather than fall open. resolveMongoDBBackupSource
+			// treats the same decode failure as fatal only on its snapshot-fallback
+			// path and returns from the live-CR path first, so this is the one check
+			// that still sees it while the operator CR is alive.
+			return r.markRestoreJobFailed(ctx, restoreJob, fmt.Sprintf(
+				"restoreJob.spec.options.recoveryTime is set, but the Backup snapshot cannot be decoded (%v), so the flow the backup was taken on is unknown; refusing point-in-time recovery rather than handing the operator a target it may not serve", serr))
+		}
+		if snap != nil && snap.UseSystemBucket {
+			return r.markRestoreJobFailed(ctx, restoreJob,
+				"restoreJob.spec.options.recoveryTime is set, but point-in-time recovery is not available for a backup taken on the useSystemBucket flow (no oplog is captured there); omit recoveryTime to restore the backup as taken. See docs/operations/backup-classes.md.")
+		}
+	}
+
+	// The operator Restore replays into a live cluster, so the target
+	// PerconaServerMongoDB must exist (and, for the pbm agents to run the
+	// restore, have backups enabled). Mirror the backup path's transient
+	// handling and let the deadline guard a target that never shows up.
+	targetPSMDBName := mongodbNameForApp(target.AppName)
+	targetCluster := &psmdbtypes.PerconaServerMongoDB{}
+	if err := r.Get(ctx, types.NamespacedName{Namespace: target.Namespace, Name: targetPSMDBName}, targetCluster); err != nil {
+		if apierrors.IsNotFound(err) {
+			deadline := options.effectiveRestoreDeadline()
+			if restoreJob.Status.StartedAt != nil && time.Since(restoreJob.Status.StartedAt.Time) > deadline {
+				return r.markRestoreJobFailed(ctx, restoreJob, fmt.Sprintf(
+					"target psmdb.percona.com/PerconaServerMongoDB %s/%s not found within %s (deploy the target MongoDB application with backup.enabled=true before requesting the restore; override via spec.options.restoreTimeoutSeconds)",
+					target.Namespace, targetPSMDBName, deadline))
+			}
+			return r.requeueMongoDBRestoreWaiting(ctx, restoreJob, "TargetPerconaServerMongoDBNotReady",
+				fmt.Sprintf("waiting for target psmdb.percona.com/PerconaServerMongoDB %s/%s to exist", target.Namespace, targetPSMDBName))
+		}
+		return ctrl.Result{}, err
+	}
+	if !targetCluster.Spec.Backup.Enabled {
+		deadline := options.effectiveRestoreDeadline()
+		if restoreJob.Status.StartedAt != nil && time.Since(restoreJob.Status.StartedAt.Time) > deadline {
+			return r.markRestoreJobFailed(ctx, restoreJob, fmt.Sprintf(
+				"target psmdb.percona.com/PerconaServerMongoDB %s/%s has spec.backup.enabled=false within %s; the percona-backup-mongodb agents must run to restore (set backup.enabled=true on the target MongoDB application)",
+				target.Namespace, targetPSMDBName, deadline))
+		}
+		return r.requeueMongoDBRestoreWaiting(ctx, restoreJob, "TargetPerconaServerMongoDBBackupsDisabled",
+			fmt.Sprintf("waiting for target psmdb.percona.com/PerconaServerMongoDB %s/%s to enable backups", target.Namespace, targetPSMDBName))
+	}
+
+	// Re-point the restore at the TARGET cluster's own S3 credentials when a safe
+	// swap applies. On the legacy flow the backupSource carries the SOURCE
+	// release's -s3-creds Secret, which is deleted together with the source app —
+	// exactly the disaster-recovery case backups exist for — so a restore into a
+	// fresh, differently-named target must not depend on it. mongodbRestoreCreden-
+	// tialsSecret encodes the cross-flow guards (skip when the source already
+	// names the projected cozy-backups-creds; adopt a target credential only on
+	// the same bucket as the archive); it is unit-tested across the four flow
+	// combinations.
+	if source.S3 != nil {
+		if cred := mongodbRestoreCredentialsSecret(source, targetCluster); cred != "" && cred != source.S3.CredentialsSecret {
+			logger.Debug("re-pointing MongoDB restore credentials at target cluster storage",
+				"restorejob", restoreJob.Name, "from", source.S3.CredentialsSecret, "to", cred)
+			source.S3.CredentialsSecret = cred
+		}
+		// The reference must resolve before the operator sees it. After an app opts
+		// into useSystemBucket the chart prunes the legacy <release>-s3-creds while
+		// older Backups still name it, and with no same-bucket target credential to
+		// adopt the restore would reach the operator naming a Secret that is gone
+		// and die on a pbm-level message. Like the other preconditions here (target
+		// absent, backups disabled) this waits until the restore deadline and only
+		// then fails — the Secret can be re-created. It is a hand-over check: once
+		// the operator restore exists the reference is the operator's, and a Secret
+		// pruned mid-replay is its error to report, not grounds to mark a restore
+		// still in progress Failed.
+		if source.S3.CredentialsSecret != "" {
+			existingRestore, err := r.findMongoDBRestoreForJob(ctx, restoreJob)
+			if err != nil {
+				return ctrl.Result{}, err
+			}
+			if existingRestore == nil {
+				if err := r.Get(ctx, types.NamespacedName{Namespace: target.Namespace, Name: source.S3.CredentialsSecret}, &corev1.Secret{}); err != nil {
+					if !apierrors.IsNotFound(err) {
+						return ctrl.Result{}, err
+					}
+					msg := fmt.Sprintf(
+						"credentialsSecret %q for bucket %q does not exist in namespace %s (a release's <release>-s3-creds goes away with the release, or when it opts into useSystemBucket); re-create a Secret by that name holding credentials for that bucket, or restore into a target whose storage declares that bucket",
+						source.S3.CredentialsSecret, source.S3.Bucket, target.Namespace)
+					deadline := options.effectiveRestoreDeadline()
+					if restoreJob.Status.StartedAt != nil && time.Since(restoreJob.Status.StartedAt.Time) > deadline {
+						return r.markRestoreJobFailedReason(ctx, restoreJob, "RestoreCredentialsMissing", fmt.Sprintf("%s; not resolved within %s", msg, deadline))
+					}
+					return r.requeueMongoDBRestoreWaiting(ctx, restoreJob, "RestoreCredentialsMissing", msg)
+				}
+			}
+		}
+	}
+
+	mdbRestore, err := r.ensureMongoDBRestore(ctx, restoreJob, targetPSMDBName, source, pitr)
+	if err != nil {
+		return r.markRestoreJobFailed(ctx, restoreJob, fmt.Sprintf("failed to ensure psmdb.percona.com/PerconaServerMongoDBRestore: %v", err))
+	}
+
+	switch state := mdbRestore.Status.State; {
+	case state == psmdbtypes.StateReady:
+		now := metav1.Now()
+		restoreJob.Status.CompletedAt = &now
+		restoreJob.Status.Phase = backupsv1alpha1.RestoreJobPhaseSucceeded
+		apimeta.SetStatusCondition(&restoreJob.Status.Conditions, metav1.Condition{
+			Type:    "Ready",
+			Status:  metav1.ConditionTrue,
+			Reason:  "RestoreCompleted",
+			Message: fmt.Sprintf("psmdb.percona.com/PerconaServerMongoDBRestore %s/%s completed", mdbRestore.Namespace, mdbRestore.Name),
+		})
+		if err := r.Status().Update(ctx, restoreJob); err != nil {
+			return ctrl.Result{}, err
+		}
+		return ctrl.Result{}, nil
+
+	case state == psmdbtypes.StateError || state == psmdbtypes.StateRejected:
+		message := mdbRestore.Status.Error
+		if message == "" {
+			message = fmt.Sprintf("psmdb.percona.com/PerconaServerMongoDBRestore %s/%s reported state=%s", mdbRestore.Namespace, mdbRestore.Name, state)
+		}
+		return r.markRestoreJobFailed(ctx, restoreJob, message)
+
+	default:
+		deadline := options.effectiveRestoreDeadline()
+		if restoreJob.Status.StartedAt != nil && time.Since(restoreJob.Status.StartedAt.Time) > deadline {
+			detail := "no state observed"
+			if state != "" {
+				detail = fmt.Sprintf("state=%s", state)
+			}
+			return r.markRestoreJobFailed(ctx, restoreJob, fmt.Sprintf(
+				"psmdb.percona.com/PerconaServerMongoDBRestore did not complete within %s (%s; override via spec.options.restoreTimeoutSeconds)",
+				deadline, detail))
+		}
+		return ctrl.Result{RequeueAfter: psmdbPollInterval}, nil
+	}
+}
+
+// requeueMongoDBRestoreWaiting records a transient Ready=False condition on the
+// RestoreJob and requeues.
+func (r *RestoreJobReconciler) requeueMongoDBRestoreWaiting(ctx context.Context, rj *backupsv1alpha1.RestoreJob, reason, message string) (ctrl.Result, error) {
+	apimeta.SetStatusCondition(&rj.Status.Conditions, metav1.Condition{
+		Type:    "Ready",
+		Status:  metav1.ConditionFalse,
+		Reason:  reason,
+		Message: message,
+	})
+	if err := r.Status().Update(ctx, rj); err != nil {
+		return ctrl.Result{}, err
+	}
+	return ctrl.Result{RequeueAfter: psmdbPollInterval}, nil
+}
+
+// errTransientRestoreSource marks a backup-source resolution failure that a
+// retry can clear — an API read error (cache not yet synced, apiserver hiccup)
+// on the live operator Backup CR — as opposed to a terminal one (no restorable
+// destination). The RestoreJob reconciler requeues on it rather than failing
+// the job, mirroring the backup path, which requeues the symmetric live-CR read
+// error (return ctrl.Result{}, err) instead of failing the BackupJob.
+var errTransientRestoreSource = errors.New("transient backup-source resolution error")
+
+// resolveMongoDBBackupSource builds the restore backupSource from the freshest
+// available source: the live operator Backup CR's status when it still exists,
+// otherwise the snapshot persisted on the Cozystack Backup at backup time.
+// Fails terminally when neither yields a destination — without one there is
+// nothing to restore from. A transient read error on the live Backup CR is
+// wrapped in errTransientRestoreSource so the caller can requeue instead.
+func (r *RestoreJobReconciler) resolveMongoDBBackupSource(ctx context.Context, backup *backupsv1alpha1.Backup) (*psmdbtypes.BackupSource, error) {
+	// Snapshot persisted at backup time. Decoded up front so the live path can
+	// backfill an S3 block the operator status omits. The pinned psmdb operator
+	// (v1.22.0) always echoes status.s3 once a backup reaches a destination
+	// (reconcilePBMConfig resolves the storage), so on that operator the live
+	// path already carries coordinates and this backfill is a defensive guard —
+	// an operator that reported a bare destination would otherwise strand a
+	// system-bucket restore, whose target has no chart-declared storage to
+	// resolve from (injection runs only on the BackupJob path). It keeps the
+	// snapshot the single fallback source, matching the reaped-CR path below.
+	snap, snapErr := unmarshalMongoDBBackupSnapshot(backup.Status.UnderlyingResources)
+
+	// Live operator Backup CR (same namespace as the Cozystack Backup).
+	sourceBackupName := backup.Spec.DriverMetadata[psmdbBackupNameKey]
+	if sourceBackupName != "" {
+		live := &psmdbtypes.PerconaServerMongoDBBackup{}
+		err := r.Get(ctx, types.NamespacedName{Namespace: backup.Namespace, Name: sourceBackupName}, live)
+		if err == nil {
+			if live.Status.Destination != "" {
+				src := &psmdbtypes.BackupSource{
+					Type:        psmdbBackupTypeOrDefault(live.Status.Type),
+					Destination: live.Status.Destination,
+					StorageName: live.Status.StorageName,
+					S3:          live.Status.S3.DeepCopy(),
+				}
+				if src.S3 == nil && snap != nil {
+					src.S3 = snap.S3.DeepCopy()
+					if src.StorageName == "" {
+						src.StorageName = snap.StorageName
+					}
+				}
+				return src, nil
+			}
+		} else if !apierrors.IsNotFound(err) {
+			return nil, fmt.Errorf("%w: get source PerconaServerMongoDBBackup %s/%s: %v", errTransientRestoreSource, backup.Namespace, sourceBackupName, err)
+		}
+	}
+
+	// Snapshot fallback (operator CR reaped or never reported a destination).
+	if snapErr != nil {
+		return nil, fmt.Errorf("decode Backup snapshot: %v", snapErr)
+	}
+	destination := backup.Spec.DriverMetadata[psmdbDestinationKey]
+	if snap != nil && snap.Destination != "" {
+		destination = snap.Destination
+	}
+	if destination == "" {
+		return nil, fmt.Errorf(
+			"Backup has no restorable destination (the operator PerconaServerMongoDBBackup was reaped and no snapshot destination is persisted); re-run the BackupJob")
+	}
+	src := &psmdbtypes.BackupSource{
+		Type:        psmdbtypes.BackupTypeLogical,
+		Destination: destination,
+	}
+	if snap != nil {
+		if snap.Type != "" {
+			src.Type = snap.Type
+		}
+		src.StorageName = snap.StorageName
+		src.S3 = snap.S3.DeepCopy()
+	}
+	return src, nil
+}
+
+// findMongoDBRestoreForJob returns the PerconaServerMongoDBRestore labelled with
+// the RestoreJob's OwningJob{Name,Namespace}, or (nil, nil) when none exists.
+func (r *RestoreJobReconciler) findMongoDBRestoreForJob(ctx context.Context, rj *backupsv1alpha1.RestoreJob) (*psmdbtypes.PerconaServerMongoDBRestore, error) {
+	list := &psmdbtypes.PerconaServerMongoDBRestoreList{}
+	if err := r.List(ctx, list,
+		client.InNamespace(rj.Namespace),
+		client.MatchingLabels{
+			backupsv1alpha1.OwningJobNameLabel:      rj.Name,
+			backupsv1alpha1.OwningJobNamespaceLabel: rj.Namespace,
+		},
+	); err != nil {
+		return nil, err
+	}
+	if len(list.Items) == 0 {
+		return nil, nil
+	}
+	return &list.Items[0], nil
+}
+
+// ensureMongoDBRestore creates a PerconaServerMongoDBRestore CR labelled with
+// the RestoreJob, or returns the existing one if a previous reconcile already
+// created it.
+func (r *RestoreJobReconciler) ensureMongoDBRestore(ctx context.Context, rj *backupsv1alpha1.RestoreJob, targetClusterName string, source *psmdbtypes.BackupSource, pitr *psmdbtypes.PITRSpec) (*psmdbtypes.PerconaServerMongoDBRestore, error) {
+	if existing, err := r.findMongoDBRestoreForJob(ctx, rj); err != nil || existing != nil {
+		return existing, err
+	}
+
+	obj := &psmdbtypes.PerconaServerMongoDBRestore{
+		ObjectMeta: metav1.ObjectMeta{
+			Namespace:    rj.Namespace,
+			GenerateName: fmt.Sprintf("%s-", rj.Name),
+			Labels: map[string]string{
+				backupsv1alpha1.OwningJobNameLabel:      rj.Name,
+				backupsv1alpha1.OwningJobNamespaceLabel: rj.Namespace,
+			},
+		},
+		Spec: psmdbtypes.PerconaServerMongoDBRestoreSpec{
+			ClusterName:  targetClusterName,
+			BackupSource: source,
+			PITR:         pitr,
+		},
+	}
+	if err := r.Create(ctx, obj); err != nil {
+		return nil, err
+	}
+	return obj, nil
+}
+
+// mongodbRestoreTarget captures the resolved target for a MongoDB restore.
+// In-place and to-copy are treated identically: both create a
+// PerconaServerMongoDBRestore CR pointing (via clusterName) at the named target
+// cluster. Callers infer the mode from AppName != backup.Spec.ApplicationRef.Name.
+type mongodbRestoreTarget struct {
+	Namespace string
+	AppName   string
+	Kind      string
+	APIGroup  string
+}
+
+func (r *RestoreJobReconciler) resolveMongoDBRestoreTarget(restoreJob *backupsv1alpha1.RestoreJob, backup *backupsv1alpha1.Backup) mongodbRestoreTarget {
+	t := mongodbRestoreTarget{
+		Namespace: backup.Namespace,
+		AppName:   backup.Spec.ApplicationRef.Name,
+		Kind:      backup.Spec.ApplicationRef.Kind,
+	}
+	if backup.Spec.ApplicationRef.APIGroup != nil {
+		t.APIGroup = *backup.Spec.ApplicationRef.APIGroup
+	}
+	if restoreJob.Spec.TargetApplicationRef != nil {
+		if restoreJob.Spec.TargetApplicationRef.Name != "" {
+			t.AppName = restoreJob.Spec.TargetApplicationRef.Name
+		}
+		if restoreJob.Spec.TargetApplicationRef.Kind != "" {
+			t.Kind = restoreJob.Spec.TargetApplicationRef.Kind
+		}
+		if restoreJob.Spec.TargetApplicationRef.APIGroup != nil {
+			t.APIGroup = *restoreJob.Spec.TargetApplicationRef.APIGroup
+		}
+	}
+	return t
+}
+
+// ---------------------------------------------------------------------------
+// Snapshot persisted on Cozystack Backup.status.underlyingResources
+// ---------------------------------------------------------------------------
+
+// mongodbBackupSnapshot is the MongoDB-specific payload persisted in
+// Backup.status.underlyingResources at backup time. It carries the S3
+// destination and storage descriptor read back from the operator Backup status
+// so the restore path can rebuild backupSource even after the operator-side
+// PerconaServerMongoDBBackup CR is reaped.
+//
+// SECRET-HANDLING CONTRACT (plaintext-readable to anyone with read access to
+// backups.cozystack.io/Backups):
+//
+//   - S3 carries only a Secret NAME (CredentialsSecret) plus non-secret
+//     coordinates (bucket, endpoint, prefix, region) — the psmdb storage shape
+//     has no field for a raw credential, so the snapshot can never contain an
+//     access key. The operator dereferences CredentialsSecret at restore time
+//     against the apiserver's Secret cache in the restore namespace.
+//   - Parameters lands here verbatim from BackupClassStrategy.parameters.
+//     Callers MUST NOT put credentials in Parameters.
+type mongodbBackupSnapshot struct {
+	Kind        string                      `json:"kind"`
+	APIVersion  string                      `json:"apiVersion"`
+	Destination string                      `json:"destination,omitempty"`
+	Type        string                      `json:"type,omitempty"`
+	StorageName string                      `json:"storageName,omitempty"`
+	S3          *psmdbtypes.BackupStorageS3 `json:"s3,omitempty"`
+	Parameters  map[string]string           `json:"parameters,omitempty"`
+	// UseSystemBucket records the flow the backup was taken on, so the restore
+	// path can identify a system-bucket backup directly rather than inferring it
+	// from the resolved credentialsSecret name (which a BackupClass may set to
+	// anything). Point-in-time recovery is refused on this flow.
+	UseSystemBucket bool `json:"useSystemBucket,omitempty"`
+}
+
+func marshalMongoDBBackupSnapshot(mdbBackup *psmdbtypes.PerconaServerMongoDBBackup, rendered *strategyv1alpha1.MongoDBTemplate, storageName string, parameters map[string]string, useSystemBucket bool) (*runtime.RawExtension, error) {
+	snap := mongodbBackupSnapshot{
+		Kind:            psmdbBackupSnapshotKind,
+		APIVersion:      psmdbBackupSnapshotAPIVersion,
+		Destination:     mdbBackup.Status.Destination,
+		Type:            psmdbBackupTypeOrDefault(rendered.Type),
+		StorageName:     storageName,
+		S3:              mdbBackup.Status.S3.DeepCopy(),
+		Parameters:      parameters,
+		UseSystemBucket: useSystemBucket,
+	}
+	// On the useSystemBucket flow the driver injected the storage, so fall back
+	// to those coordinates when the operator's status echo is empty - the
+	// restore path rebuilds backupSource from this snapshot and needs the
+	// endpoint + credentialsSecret (cozy-backups-creds) to be present. Gated on
+	// the flow the CR was minted on (the caller reads it off the CR's own
+	// finalizer, so a flag flipped mid-dump does not change it), not on
+	// rendered.S3 alone: the coordinates now live on the shared cozy-default
+	// strategy, so rendered.S3 is non-nil for a legacy app too, and recording
+	// the platform bucket for an archive written to the tenant's own bucket
+	// would send restore to the wrong place.
+	if useSystemBucket && snap.S3 == nil && rendered.S3 != nil {
+		cred := rendered.S3.CredentialsSecret
+		if cred == "" {
+			cred = psmdbDefaultCredentialsSecret
+		}
+		snap.S3 = &psmdbtypes.BackupStorageS3{
+			Bucket:                rendered.S3.Bucket,
+			CredentialsSecret:     cred,
+			EndpointURL:           rendered.S3.EndpointURL,
+			Prefix:                rendered.S3.Prefix,
+			Region:                rendered.S3.Region,
+			ForcePathStyle:        rendered.S3.ForcePathStyle,
+			InsecureSkipTLSVerify: rendered.S3.InsecureSkipTLSVerify,
+		}
+	}
+	raw, err := json.Marshal(snap)
+	if err != nil {
+		return nil, err
+	}
+	return &runtime.RawExtension{Raw: raw}, nil
+}
+
+func unmarshalMongoDBBackupSnapshot(raw *runtime.RawExtension) (*mongodbBackupSnapshot, error) {
+	if raw == nil || len(raw.Raw) == 0 {
+		return nil, nil
+	}
+	var snap mongodbBackupSnapshot
+	if err := json.Unmarshal(raw.Raw, &snap); err != nil {
+		return nil, err
+	}
+	return &snap, nil
+}
+
+// ---------------------------------------------------------------------------
+// Helpers
+// ---------------------------------------------------------------------------
+
+// renderMongoDBTemplate templates the strategy template against a context
+// containing the live application object and the BackupClass parameters.
+func renderMongoDBTemplate(t strategyv1alpha1.MongoDBTemplate, app *mongodbapp.MongoDB, parameters map[string]string) (*strategyv1alpha1.MongoDBTemplate, error) {
+	appAsMap, err := toJSONMapMongoDB(app)
+	if err != nil {
+		return nil, fmt.Errorf("encode application for templating: %w", err)
+	}
+	templateContext := map[string]any{
+		"Application": appAsMap,
+		"Parameters":  parameters,
+	}
+	return template.Template(&t, templateContext)
+}
+
+// toJSONMapMongoDB converts a typed object to a generic map via JSON tags so
+// user-authored go-templates address fields by their JSON names (e.g.
+// .Application.metadata.name). Mirrors the MariaDB controller's helper; scoped
+// here to avoid cross-strategy import.
+func toJSONMapMongoDB(obj any) (map[string]any, error) {
+	raw, err := json.Marshal(obj)
+	if err != nil {
+		return nil, err
+	}
+	out := map[string]any{}
+	if err := json.Unmarshal(raw, &out); err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+// getMongoDBApp fetches the apps.cozystack.io MongoDB instance via the shared
+// typed client. The MongoDB scheme is registered in main.go so the
+// controller-runtime cache serves it directly.
+func (r *BackupJobReconciler) getMongoDBApp(ctx context.Context, namespace, name string) (*mongodbapp.MongoDB, error) {
+	app := &mongodbapp.MongoDB{}
+	if err := r.Get(ctx, types.NamespacedName{Namespace: namespace, Name: name}, app); err != nil {
+		return nil, err
+	}
+	return app, nil
+}
+
+// MongoDBRestoreOptions is the typed shape of RestoreJob.Spec.Options for the
+// MongoDB driver. The option surface is kept uniform with the CNPG strategy
+// (CNPGRestoreOptions): point-in-time recovery is expressed as a single
+// RFC3339 recoveryTime string, and restoreTimeoutSeconds caps the wait.
+type MongoDBRestoreOptions struct {
+	// RecoveryTime is an optional RFC3339 timestamp for point-in-time recovery,
+	// mirroring the CNPG strategy's spec.options.recoveryTime. When set, the
+	// driver maps it onto the psmdb Restore's pitr {type: date, date} (converted
+	// to the operator's "YYYY-MM-DD HH:MM:SS" UTC format). Empty restores the
+	// backup snapshot as taken (no oplog replay) — note this differs from CNPG,
+	// whose empty recoveryTime replays WAL to the latest archived point; a psmdb
+	// logical backup is already a consistent snapshot, so "restore this backup"
+	// is the safe, always-available default here.
+	// +optional
+	RecoveryTime string `json:"recoveryTime,omitempty"`
+
+	// RestoreTimeoutSeconds caps the time the driver waits for the
+	// PerconaServerMongoDBRestore to terminate before it marks the RestoreJob
+	// Failed. Zero or unset falls back to psmdbDefaultRestoreDeadline. Same knob
+	// and semantics as the CNPG strategy.
+	// +optional
+	RestoreTimeoutSeconds int64 `json:"restoreTimeoutSeconds,omitempty"`
+}
+
+// mongodbKnownRestoreOptionKeys enumerates the JSON keys parseMongoDBRestoreOptions
+// recognises. Any other key in spec.options is surfaced as a Warning event
+// (see reconcileMongoDBRestore) so a typo like "recoverytime" is not silently
+// dropped. Keep in sync with the MongoDBRestoreOptions json tags.
+var mongodbKnownRestoreOptionKeys = []string{"recoveryTime", "restoreTimeoutSeconds"}
+
+// parseMongoDBRestoreOptions decodes RestoreJob.Spec.Options into the typed
+// shape and additionally reports any keys the driver does not recognise. The
+// typed decode stays permissive (unknown keys are ignored, not rejected), so
+// the returned options are always usable; the unknownKeys slice lets the caller
+// warn without failing. A malformed blob returns the zero options + a decode
+// error the caller surfaces as an event. Mirrors parseCNPGRestoreOptions, plus
+// the unknown-key detection.
+func parseMongoDBRestoreOptions(opts *runtime.RawExtension) (MongoDBRestoreOptions, []string, error) {
+	var out MongoDBRestoreOptions
+	if opts == nil || len(opts.Raw) == 0 {
+		return out, nil, nil
+	}
+	if err := json.Unmarshal(opts.Raw, &out); err != nil {
+		return MongoDBRestoreOptions{}, nil, fmt.Errorf("decode restoreJob.spec.options: %w", err)
+	}
+	// Second pass into a generic map to diff keys against the known set. Done
+	// separately from the typed decode so the options stay usable even when an
+	// unknown key is present.
+	unknown := unknownJSONKeys(opts.Raw, mongodbKnownRestoreOptionKeys)
+	return out, unknown, nil
+}
+
+// restoreOptionsCarryRecoveryTimeKey reports whether spec.options parses as a
+// JSON object with a "recoveryTime" key present, regardless of that value's
+// type. The caller uses it to decide whether a typed-decode failure is
+// load-bearing (a malformed recoveryTime must fail terminally) or benign (a
+// malformed unrelated field can fall back to defaults). A blob that is not a
+// JSON object at all returns false — there is no recoveryTime to honour, so the
+// permissive fall-back applies.
+func restoreOptionsCarryRecoveryTimeKey(opts *runtime.RawExtension) bool {
+	if opts == nil || len(opts.Raw) == 0 {
+		return false
+	}
+	var obj map[string]json.RawMessage
+	if err := json.Unmarshal(opts.Raw, &obj); err != nil {
+		return false
+	}
+	_, ok := obj["recoveryTime"]
+	return ok
+}
+
+// unknownJSONKeys returns the top-level object keys in raw that are not in
+// known. Returns nil when raw is not a JSON object (a malformed blob is handled
+// by the typed decode's error path, not here).
+func unknownJSONKeys(raw []byte, known []string) []string {
+	var obj map[string]json.RawMessage
+	if err := json.Unmarshal(raw, &obj); err != nil {
+		return nil
+	}
+	knownSet := make(map[string]struct{}, len(known))
+	for _, k := range known {
+		knownSet[k] = struct{}{}
+	}
+	var out []string
+	for k := range obj {
+		if _, ok := knownSet[k]; !ok {
+			out = append(out, k)
+		}
+	}
+	sort.Strings(out)
+	return out
+}
+
+func (o MongoDBRestoreOptions) effectiveRestoreDeadline() time.Duration {
+	if o.RestoreTimeoutSeconds > 0 {
+		return time.Duration(o.RestoreTimeoutSeconds) * time.Second
+	}
+	return psmdbDefaultRestoreDeadline
+}
+
+// pitrSpec translates the RFC3339 recoveryTime into the operator restore's
+// pitr {type: date, date} shape, converting to psmdb's "YYYY-MM-DD HH:MM:SS"
+// UTC format (the operator CRD's XValidation regex). Returns (nil, nil) when no
+// recoveryTime is requested (plain snapshot restore). A recoveryTime that does
+// not parse as RFC3339 is a terminal error — a silent wrong-point restore is
+// worse than failing.
+func (o MongoDBRestoreOptions) pitrSpec() (*psmdbtypes.PITRSpec, error) {
+	if o.RecoveryTime == "" {
+		return nil, nil
+	}
+	t, err := time.Parse(time.RFC3339, o.RecoveryTime)
+	if err != nil {
+		return nil, fmt.Errorf("recoveryTime %q is not a valid RFC3339 timestamp: %w", o.RecoveryTime, err)
+	}
+	return &psmdbtypes.PITRSpec{Type: "date", Date: t.UTC().Format("2006-01-02 15:04:05")}, nil
+}
diff --git a/internal/backupcontroller/psmdbstrategy_controller_test.go b/internal/backupcontroller/psmdbstrategy_controller_test.go
new file mode 100644
index 0000000000..9cae869ae2
--- /dev/null
+++ b/internal/backupcontroller/psmdbstrategy_controller_test.go
@@ -0,0 +1,3967 @@
+// SPDX-License-Identifier: Apache-2.0
+package backupcontroller
+
+import (
+	"context"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"strings"
+	"testing"
+	"time"
+
+	corev1 "k8s.io/api/core/v1"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	apimeta "k8s.io/apimachinery/pkg/api/meta"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apimachinery/pkg/types"
+	dynamicfake "k8s.io/client-go/dynamic/fake"
+	"k8s.io/client-go/kubernetes/scheme"
+	"k8s.io/client-go/tools/record"
+	ctrl "sigs.k8s.io/controller-runtime"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+	clientfake "sigs.k8s.io/controller-runtime/pkg/client/fake"
+	"sigs.k8s.io/controller-runtime/pkg/client/interceptor"
+	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
+
+	strategyv1alpha1 "github.com/cozystack/cozystack/api/backups/strategy/v1alpha1"
+	backupsv1alpha1 "github.com/cozystack/cozystack/api/backups/v1alpha1"
+	"github.com/cozystack/cozystack/internal/backupcontroller/mongodbapp"
+	"github.com/cozystack/cozystack/internal/backupcontroller/psmdbtypes"
+)
+
+// ---------------------------------------------------------------------------
+// Validation
+// ---------------------------------------------------------------------------
+
+func TestValidateMongoDBApplicationRef(t *testing.T) {
+	apps := mongodbapp.GroupName
+	other := "other.example.com"
+	cases := []struct {
+		name    string
+		ref     corev1.TypedLocalObjectReference
+		wantErr bool
+	}{
+		{"happy path with apps group", corev1.TypedLocalObjectReference{Kind: "MongoDB", Name: "x", APIGroup: &apps}, false},
+		{"empty apiGroup is accepted", corev1.TypedLocalObjectReference{Kind: "MongoDB", Name: "x"}, false},
+		{"foreign apiGroup rejected", corev1.TypedLocalObjectReference{Kind: "MongoDB", Name: "x", APIGroup: &other}, true},
+		{"wrong kind rejected", corev1.TypedLocalObjectReference{Kind: "MariaDB", Name: "x", APIGroup: &apps}, true},
+	}
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			err := validateMongoDBApplicationRef(tc.ref)
+			if tc.wantErr && err == nil {
+				t.Fatalf("expected validation error, got nil")
+			}
+			if !tc.wantErr && err != nil {
+				t.Fatalf("unexpected validation error: %v", err)
+			}
+		})
+	}
+}
+
+// ---------------------------------------------------------------------------
+// Defaults
+// ---------------------------------------------------------------------------
+
+func TestPsmdbStorageAndTypeDefaults(t *testing.T) {
+	if got := psmdbStorageNameOrDefault(""); got != psmdbDefaultStorageName {
+		t.Errorf("psmdbStorageNameOrDefault(\"\"): got %q want %q", got, psmdbDefaultStorageName)
+	}
+	if got := psmdbStorageNameOrDefault("custom"); got != "custom" {
+		t.Errorf("psmdbStorageNameOrDefault(custom): got %q", got)
+	}
+	if got := psmdbBackupTypeOrDefault(""); got != psmdbtypes.BackupTypeLogical {
+		t.Errorf("psmdbBackupTypeOrDefault(\"\"): got %q want logical", got)
+	}
+	if got := psmdbBackupTypeOrDefault("logical"); got != "logical" {
+		t.Errorf("psmdbBackupTypeOrDefault(logical): got %q", got)
+	}
+}
+
+// ---------------------------------------------------------------------------
+// Precondition gate
+// ---------------------------------------------------------------------------
+
+func TestPsmdbBackupPrecondition(t *testing.T) {
+	t.Run("backups disabled", func(t *testing.T) {
+		cluster := &psmdbtypes.PerconaServerMongoDB{
+			Spec: psmdbtypes.PerconaServerMongoDBSpec{
+				Backup: psmdbtypes.PerconaServerMongoDBBackupConfig{Enabled: false},
+			},
+		}
+		if msg := psmdbBackupPrecondition(cluster, "s3-storage"); msg == "" {
+			t.Fatal("expected a precondition message when backups are disabled")
+		}
+	})
+	t.Run("storage not declared", func(t *testing.T) {
+		cluster := &psmdbtypes.PerconaServerMongoDB{
+			Spec: psmdbtypes.PerconaServerMongoDBSpec{
+				Backup: psmdbtypes.PerconaServerMongoDBBackupConfig{
+					Enabled:  true,
+					Storages: map[string]runtime.RawExtension{"other": {}},
+				},
+			},
+		}
+		if msg := psmdbBackupPrecondition(cluster, "s3-storage"); msg == "" {
+			t.Fatal("expected a precondition message when the named storage is missing")
+		}
+	})
+	t.Run("ready", func(t *testing.T) {
+		cluster := &psmdbtypes.PerconaServerMongoDB{
+			Spec: psmdbtypes.PerconaServerMongoDBSpec{
+				Backup: psmdbtypes.PerconaServerMongoDBBackupConfig{
+					Enabled:  true,
+					Storages: map[string]runtime.RawExtension{"s3-storage": {}},
+				},
+			},
+		}
+		if msg := psmdbBackupPrecondition(cluster, "s3-storage"); msg != "" {
+			t.Fatalf("expected no precondition message, got %q", msg)
+		}
+	})
+}
+
+// ---------------------------------------------------------------------------
+// Restore credentials re-pointed at the target cluster (DR after source delete)
+// ---------------------------------------------------------------------------
+
+// TestPsmdbTargetCredentialsSecret pins the fix for the disaster-recovery gap:
+// a restore into a differently-named target must authenticate with the TARGET
+// cluster's own S3 credentials, because the source release's -s3-creds Secret is
+// deleted together with the source app. The selector prefers the source's
+// storage name, then the chart default, then a sole storage.
+func TestPsmdbTargetCredentialsSecret(t *testing.T) {
+	s3Storage := func(bucket, secret string) runtime.RawExtension {
+		return runtime.RawExtension{Raw: []byte(fmt.Sprintf(`{"type":"s3","s3":{"bucket":%q,"credentialsSecret":%q}}`, bucket, secret))}
+	}
+	clusterWith := func(storages map[string]runtime.RawExtension) *psmdbtypes.PerconaServerMongoDB {
+		return &psmdbtypes.PerconaServerMongoDB{
+			Spec: psmdbtypes.PerconaServerMongoDBSpec{
+				Backup: psmdbtypes.PerconaServerMongoDBBackupConfig{Storages: storages},
+			},
+		}
+	}
+	cases := []struct {
+		name       string
+		storages   map[string]runtime.RawExtension
+		preferred  string
+		wantBucket string
+		want       string
+	}{
+		{
+			name:       "preferred storage on the source bucket wins",
+			storages:   map[string]runtime.RawExtension{"s3-storage": s3Storage("shared", "target-creds"), "other": s3Storage("shared", "other-creds")},
+			preferred:  "s3-storage",
+			wantBucket: "shared",
+			want:       "target-creds",
+		},
+		{
+			name:       "falls back to chart default when preferred absent",
+			storages:   map[string]runtime.RawExtension{"s3-storage": s3Storage("shared", "target-creds")},
+			preferred:  "nonexistent",
+			wantBucket: "shared",
+			want:       "target-creds",
+		},
+		{
+			name:       "sole non-default storage on the source bucket is used",
+			storages:   map[string]runtime.RawExtension{"custom": s3Storage("shared", "custom-creds")},
+			wantBucket: "shared",
+			want:       "custom-creds",
+		},
+		{
+			name:       "different bucket is NOT adopted (cross-flow guard)",
+			storages:   map[string]runtime.RawExtension{"s3-storage": s3Storage("platform-bucket", "cozy-backups-creds")},
+			preferred:  "s3-storage",
+			wantBucket: "tenant-bucket",
+			want:       "",
+		},
+		{
+			name:       "empty wantBucket yields empty (unknown source bucket, no swap)",
+			storages:   map[string]runtime.RawExtension{"s3-storage": s3Storage("shared", "target-creds")},
+			preferred:  "s3-storage",
+			wantBucket: "",
+			want:       "",
+		},
+		{
+			name:       "ambiguous (multiple, none default, no preferred) yields empty",
+			storages:   map[string]runtime.RawExtension{"a": s3Storage("shared", "a-creds"), "b": s3Storage("shared", "b-creds")},
+			wantBucket: "shared",
+			want:       "",
+		},
+		{
+			name:       "no storages yields empty",
+			storages:   nil,
+			wantBucket: "shared",
+			want:       "",
+		},
+		{
+			name:       "non-s3 storage yields empty",
+			storages:   map[string]runtime.RawExtension{"s3-storage": {Raw: []byte(`{"type":"azure","azure":{"container":"c"}}`)}},
+			wantBucket: "shared",
+			want:       "",
+		},
+	}
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			if got := psmdbTargetCredentialsSecret(clusterWith(tc.storages), tc.preferred, tc.wantBucket); got != tc.want {
+				t.Errorf("psmdbTargetCredentialsSecret: got %q want %q", got, tc.want)
+			}
+		})
+	}
+}
+
+// TestMongoDBRestoreCredentialsSecret pins the restore credential-swap decision
+// across the four {legacy,system}×{legacy,system} flow combinations, so neither
+// cross-flow guard can be dropped unnoticed: the projected-secret skip (a system
+// source keeps cozy-backups-creds rather than adopting a legacy target's own
+// Secret) and the same-bucket match (a legacy source is not handed a credential
+// for a bucket its archive does not live in).
+func TestMongoDBRestoreCredentialsSecret(t *testing.T) {
+	s3Storage := func(bucket, secret string) runtime.RawExtension {
+		return runtime.RawExtension{Raw: []byte(fmt.Sprintf(`{"type":"s3","s3":{"bucket":%q,"credentialsSecret":%q}}`, bucket, secret))}
+	}
+	target := func(storages map[string]runtime.RawExtension) *psmdbtypes.PerconaServerMongoDB {
+		return &psmdbtypes.PerconaServerMongoDB{
+			Spec: psmdbtypes.PerconaServerMongoDBSpec{
+				Backup: psmdbtypes.PerconaServerMongoDBBackupConfig{Storages: storages},
+			},
+		}
+	}
+	src := func(bucket, cred string) *psmdbtypes.BackupSource {
+		return &psmdbtypes.BackupSource{StorageName: "s3-storage", S3: &psmdbtypes.BackupStorageS3{Bucket: bucket, CredentialsSecret: cred}}
+	}
+	cases := []struct {
+		name   string
+		source *psmdbtypes.BackupSource
+		target *psmdbtypes.PerconaServerMongoDB
+		want   string
+	}{
+		{
+			name:   "legacy source -> legacy target on the same bucket: swap to target creds (DR after source delete)",
+			source: src("tenant-bucket", "src-s3-creds"),
+			target: target(map[string]runtime.RawExtension{"s3-storage": s3Storage("tenant-bucket", "target-s3-creds")}),
+			want:   "target-s3-creds",
+		},
+		{
+			name:   "legacy source -> legacy target on a different bucket: keep source creds (no cross-bucket swap)",
+			source: src("tenant-bucket", "src-s3-creds"),
+			target: target(map[string]runtime.RawExtension{"s3-storage": s3Storage("other-bucket", "target-s3-creds")}),
+			want:   "src-s3-creds",
+		},
+		{
+			name:   "system source -> legacy target: keep projected cozy-backups-creds (outlives source, reads the platform bucket)",
+			source: src("cozy-backups-PLATFORM", "cozy-backups-creds"),
+			target: target(map[string]runtime.RawExtension{"s3-storage": s3Storage("tenant-bucket", "target-s3-creds")}),
+			want:   "cozy-backups-creds",
+		},
+		{
+			name:   "legacy source -> system-bucket target: keep source creds (target storage is on the platform bucket, not the archive's)",
+			source: src("tenant-bucket", "src-s3-creds"),
+			target: target(map[string]runtime.RawExtension{"s3-storage": s3Storage("cozy-backups-PLATFORM", "cozy-backups-creds")}),
+			want:   "src-s3-creds",
+		},
+		{
+			// Reaches the projected-secret early return specifically: the target
+			// declares a storage on the SAME bucket as the archive under a
+			// different credentialsSecret, so without the "already cozy-backups-
+			// creds" short-circuit the same-bucket swap would re-point the restore
+			// at the operator-managed secret. Keeping the projected secret is
+			// correct — it outlives the source app and reads the platform bucket.
+			name:   "system source -> target with same-bucket storage under other creds: keep projected cozy-backups-creds",
+			source: src("cozy-backups-PLATFORM", "cozy-backups-creds"),
+			target: target(map[string]runtime.RawExtension{"s3-storage": s3Storage("cozy-backups-PLATFORM", "operator-managed-creds")}),
+			want:   "cozy-backups-creds",
+		},
+		{
+			name:   "no s3 source: empty (caller keeps the source reference)",
+			source: &psmdbtypes.BackupSource{StorageName: "s3-storage"},
+			target: target(map[string]runtime.RawExtension{"s3-storage": s3Storage("tenant-bucket", "target-s3-creds")}),
+			want:   "",
+		},
+		{
+			// Source archive with no bucket recorded (wantBucket==""): the swap
+			// must be refused even against a lone target storage that also has an
+			// empty bucket, keeping the source reference. Pins the wantBucket==""
+			// short-circuit — without it that sole storage would be adopted.
+			name:   "no-bucket source: keep source creds against an empty-bucket target storage",
+			source: src("", "src-s3-creds"),
+			target: target(map[string]runtime.RawExtension{"only": s3Storage("", "empty-bucket-creds")}),
+			want:   "src-s3-creds",
+		},
+	}
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			if got := mongodbRestoreCredentialsSecret(tc.source, tc.target); got != tc.want {
+				t.Errorf("mongodbRestoreCredentialsSecret: got %q want %q", got, tc.want)
+			}
+		})
+	}
+}
+
+// ---------------------------------------------------------------------------
+// Backup-side ensure idempotency + CR shape
+// ---------------------------------------------------------------------------
+
+func TestEnsureMongoDBBackup_IdempotentByLabel(t *testing.T) {
+	c := newMongoDBStrategyTestClient(t)
+	r := &BackupJobReconciler{Client: c, Scheme: c.Scheme()}
+	job := newMongoDBBackupJob("bj-1", "tenant")
+	if err := c.Create(context.Background(), job); err != nil {
+		t.Fatalf("seed BackupJob: %v", err)
+	}
+	rendered := newRenderedMongoDBTemplate()
+	cluster := mongodbNameForApp("mongodb-src")
+
+	first, err := r.ensureMongoDBBackup(context.Background(), job, cluster, "s3-storage", rendered, false)
+	if err != nil {
+		t.Fatalf("first ensureMongoDBBackup: %v", err)
+	}
+	second, err := r.ensureMongoDBBackup(context.Background(), job, cluster, "s3-storage", rendered, false)
+	if err != nil {
+		t.Fatalf("second ensureMongoDBBackup: %v", err)
+	}
+	if first.Name != second.Name {
+		t.Errorf("expected idempotent reuse: first=%q second=%q", first.Name, second.Name)
+	}
+
+	list := &psmdbtypes.PerconaServerMongoDBBackupList{}
+	if err := c.List(context.Background(), list, client.InNamespace("tenant")); err != nil {
+		t.Fatalf("list backups: %v", err)
+	}
+	if len(list.Items) != 1 {
+		t.Fatalf("expected exactly one operator Backup CR, got %d", len(list.Items))
+	}
+	got := &list.Items[0]
+	// The cozystack mongodb ApplicationDefinition prefixes the release name with
+	// "mongodb-", so a BackupJob targeting applicationRef.name=mongodb-src is
+	// reconciled against psmdb.percona.com/PerconaServerMongoDB named
+	// mongodb-mongodb-src.
+	if got.Spec.ClusterName != "mongodb-mongodb-src" {
+		t.Errorf("ClusterName: got %q want mongodb-mongodb-src", got.Spec.ClusterName)
+	}
+	if got.Spec.StorageName != "s3-storage" {
+		t.Errorf("StorageName: got %q want s3-storage", got.Spec.StorageName)
+	}
+	if got.Spec.Type != psmdbtypes.BackupTypeLogical {
+		t.Errorf("Type: got %q want logical", got.Spec.Type)
+	}
+	if got.Spec.CompressionType != "gzip" {
+		t.Errorf("CompressionType: got %q want gzip", got.Spec.CompressionType)
+	}
+	if got.Labels[backupsv1alpha1.OwningJobNameLabel] != "bj-1" {
+		t.Errorf("OwningJobName label missing or wrong: %v", got.Labels)
+	}
+	// Legacy flow: the archive is the tenant's, so the driver must NOT stamp the
+	// delete-backup finalizer that would prune it on CR deletion.
+	for _, f := range got.Finalizers {
+		if f == psmdbDeleteBackupFinalizer {
+			t.Errorf("legacy backup must not carry %q finalizer; got %v", psmdbDeleteBackupFinalizer, got.Finalizers)
+		}
+	}
+}
+
+func TestEnsureMongoDBBackup_SystemBucketStampsDeleteFinalizer(t *testing.T) {
+	c := newMongoDBStrategyTestClient(t)
+	r := &BackupJobReconciler{Client: c, Scheme: c.Scheme()}
+	job := newMongoDBBackupJob("bj-sb", "tenant")
+	if err := c.Create(context.Background(), job); err != nil {
+		t.Fatalf("seed BackupJob: %v", err)
+	}
+	got, err := r.ensureMongoDBBackup(context.Background(), job, "mongodb-app", "s3-storage", newRenderedMongoDBTemplate(), true)
+	if err != nil {
+		t.Fatalf("ensureMongoDBBackup: %v", err)
+	}
+	found := false
+	for _, f := range got.Finalizers {
+		if f == psmdbDeleteBackupFinalizer {
+			found = true
+		}
+	}
+	if !found {
+		// Without it, deleting the Backup would orphan the object in the shared
+		// cozy-backups bucket forever.
+		t.Errorf("system-bucket backup must carry %q finalizer so its archive is pruned on delete; got %v", psmdbDeleteBackupFinalizer, got.Finalizers)
+	}
+}
+
+// ---------------------------------------------------------------------------
+// Restore-side ensure idempotency + backupSource wiring
+// ---------------------------------------------------------------------------
+
+func TestEnsureMongoDBRestore_IdempotentByLabel(t *testing.T) {
+	c := newMongoDBStrategyTestClient(t)
+	r := &RestoreJobReconciler{Client: c, Scheme: c.Scheme()}
+	rj := newMongoDBRestoreJob("rj-1", "tenant")
+	if err := c.Create(context.Background(), rj); err != nil {
+		t.Fatalf("seed RestoreJob: %v", err)
+	}
+	fps := true
+	source := &psmdbtypes.BackupSource{
+		Type:        psmdbtypes.BackupTypeLogical,
+		Destination: "s3://bkt/mongodb-src/2026-08-05T00:00:00Z",
+		S3: &psmdbtypes.BackupStorageS3{
+			Bucket:            "bkt",
+			CredentialsSecret: "mongodb-mongodb-src-s3-creds",
+			EndpointURL:       "https://seaweedfs-s3.tenant-root:8333",
+			ForcePathStyle:    &fps,
+		},
+	}
+
+	first, err := r.ensureMongoDBRestore(context.Background(), rj, "mongodb-mongodb-target", source, nil)
+	if err != nil {
+		t.Fatalf("first ensureMongoDBRestore: %v", err)
+	}
+	second, err := r.ensureMongoDBRestore(context.Background(), rj, "mongodb-mongodb-target", source, nil)
+	if err != nil {
+		t.Fatalf("second ensureMongoDBRestore: %v", err)
+	}
+	if first.Name != second.Name {
+		t.Errorf("expected idempotent reuse: first=%q second=%q", first.Name, second.Name)
+	}
+	list := &psmdbtypes.PerconaServerMongoDBRestoreList{}
+	if err := c.List(context.Background(), list, client.InNamespace("tenant")); err != nil {
+		t.Fatalf("list restores: %v", err)
+	}
+	if len(list.Items) != 1 {
+		t.Fatalf("expected exactly one operator Restore CR, got %d", len(list.Items))
+	}
+	got := &list.Items[0]
+	if got.Spec.ClusterName != "mongodb-mongodb-target" {
+		t.Errorf("ClusterName: got %q want mongodb-mongodb-target", got.Spec.ClusterName)
+	}
+	if got.Spec.BackupSource == nil || got.Spec.BackupSource.Destination != source.Destination {
+		t.Errorf("BackupSource mismatch: %#v", got.Spec.BackupSource)
+	}
+	if got.Spec.BackupSource.S3 == nil || got.Spec.BackupSource.S3.Bucket != "bkt" {
+		t.Errorf("BackupSource.S3 mismatch: %#v", got.Spec.BackupSource.S3)
+	}
+}
+
+// ---------------------------------------------------------------------------
+// resolveMongoDBRestoreTarget (in-place vs to-copy)
+// ---------------------------------------------------------------------------
+
+func TestResolveMongoDBRestoreTarget(t *testing.T) {
+	apps := mongodbapp.GroupName
+	backup := &backupsv1alpha1.Backup{
+		ObjectMeta: metav1.ObjectMeta{Namespace: "tenant", Name: "src-bk"},
+		Spec: backupsv1alpha1.BackupSpec{
+			ApplicationRef: corev1.TypedLocalObjectReference{
+				Kind: "MongoDB", Name: "mongodb-src", APIGroup: &apps,
+			},
+		},
+	}
+
+	t.Run("in-place: missing targetApplicationRef inherits source", func(t *testing.T) {
+		rj := &backupsv1alpha1.RestoreJob{Spec: backupsv1alpha1.RestoreJobSpec{}}
+		r := &RestoreJobReconciler{}
+		got := r.resolveMongoDBRestoreTarget(rj, backup)
+		if got.AppName != "mongodb-src" || got.Kind != "MongoDB" {
+			t.Errorf("in-place target: got %+v want AppName=mongodb-src Kind=MongoDB", got)
+		}
+	})
+
+	t.Run("to-copy: targetApplicationRef wins over source", func(t *testing.T) {
+		rj := &backupsv1alpha1.RestoreJob{
+			Spec: backupsv1alpha1.RestoreJobSpec{
+				TargetApplicationRef: &corev1.TypedLocalObjectReference{
+					Kind: "MongoDB", Name: "mongodb-target", APIGroup: &apps,
+				},
+			},
+		}
+		r := &RestoreJobReconciler{}
+		got := r.resolveMongoDBRestoreTarget(rj, backup)
+		if got.AppName != "mongodb-target" {
+			t.Errorf("to-copy AppName: got %q want mongodb-target", got.AppName)
+		}
+	})
+}
+
+// ---------------------------------------------------------------------------
+// Restore options + PITR
+// ---------------------------------------------------------------------------
+
+func TestParseMongoDBRestoreOptionsAndPITR(t *testing.T) {
+	t.Run("empty options are permissive", func(t *testing.T) {
+		o, unknown, err := parseMongoDBRestoreOptions(nil)
+		if err != nil {
+			t.Fatalf("parse nil options: %v", err)
+		}
+		if len(unknown) != 0 {
+			t.Errorf("no unknown keys expected, got %v", unknown)
+		}
+		if o.effectiveRestoreDeadline() != psmdbDefaultRestoreDeadline {
+			t.Errorf("default deadline mismatch: %v", o.effectiveRestoreDeadline())
+		}
+		pitr, err := o.pitrSpec()
+		if err != nil || pitr != nil {
+			t.Errorf("no pitr expected: pitr=%v err=%v", pitr, err)
+		}
+	})
+	t.Run("malformed json errors", func(t *testing.T) {
+		if _, _, err := parseMongoDBRestoreOptions(&runtime.RawExtension{Raw: []byte("{not-json")}); err == nil {
+			t.Fatal("expected decode error")
+		}
+	})
+	t.Run("known keys parse with no unknowns", func(t *testing.T) {
+		o, unknown, err := parseMongoDBRestoreOptions(&runtime.RawExtension{
+			Raw: []byte(`{"recoveryTime":"2026-08-05T12:34:56Z","restoreTimeoutSeconds":600}`),
+		})
+		if err != nil {
+			t.Fatalf("parse: %v", err)
+		}
+		if len(unknown) != 0 {
+			t.Errorf("expected no unknown keys, got %v", unknown)
+		}
+		if o.RecoveryTime != "2026-08-05T12:34:56Z" || o.RestoreTimeoutSeconds != 600 {
+			t.Errorf("options mismatch: %#v", o)
+		}
+	})
+	t.Run("unknown keys are reported (typo guard)", func(t *testing.T) {
+		_, unknown, err := parseMongoDBRestoreOptions(&runtime.RawExtension{
+			Raw: []byte(`{"recoverytime":"oops","bogus":1}`),
+		})
+		if err != nil {
+			t.Fatalf("parse: %v", err)
+		}
+		// sorted: bogus, recoverytime
+		if len(unknown) != 2 || unknown[0] != "bogus" || unknown[1] != "recoverytime" {
+			t.Errorf("unknown keys: got %v want [bogus recoverytime]", unknown)
+		}
+	})
+	t.Run("recoveryTime RFC3339 maps to psmdb date in UTC", func(t *testing.T) {
+		// A non-UTC offset must be normalised to UTC in the psmdb date format.
+		o := MongoDBRestoreOptions{RecoveryTime: "2026-08-05T14:34:56+02:00"}
+		pitr, err := o.pitrSpec()
+		if err != nil {
+			t.Fatalf("pitrSpec: %v", err)
+		}
+		if pitr == nil || pitr.Type != "date" || pitr.Date != "2026-08-05 12:34:56" {
+			t.Errorf("pitr mismatch: %#v (want date=2026-08-05 12:34:56)", pitr)
+		}
+	})
+	t.Run("empty recoveryTime yields no pitr (snapshot restore)", func(t *testing.T) {
+		pitr, err := MongoDBRestoreOptions{}.pitrSpec()
+		if err != nil || pitr != nil {
+			t.Errorf("expected nil pitr: pitr=%#v err=%v", pitr, err)
+		}
+	})
+	t.Run("malformed recoveryTime errors terminally", func(t *testing.T) {
+		if _, err := (MongoDBRestoreOptions{RecoveryTime: "2026-08-05 12:34:56"}).pitrSpec(); err == nil {
+			t.Fatal("expected error for non-RFC3339 recoveryTime")
+		}
+	})
+	t.Run("custom deadline honoured", func(t *testing.T) {
+		o := MongoDBRestoreOptions{RestoreTimeoutSeconds: 120}
+		if o.effectiveRestoreDeadline().Seconds() != 120 {
+			t.Errorf("deadline: got %v want 120s", o.effectiveRestoreDeadline())
+		}
+	})
+	// A non-string recoveryTime (spec.options is free-form runtime.RawExtension,
+	// so {"recoveryTime": 20260805} passes admission) must be treated as a
+	// load-bearing decode failure: the caller fails the RestoreJob terminally
+	// rather than silently degrading the PITR request to a snapshot restore. The
+	// two conditions the caller ANDs are (a) the typed decode errors and (b) the
+	// recoveryTime key is present.
+	t.Run("non-string recoveryTime is a load-bearing decode failure (major-2 guard)", func(t *testing.T) {
+		opts := &runtime.RawExtension{Raw: []byte(`{"recoveryTime":20260805}`)}
+		if _, _, err := parseMongoDBRestoreOptions(opts); err == nil {
+			t.Fatal("expected a typed-decode error for a numeric recoveryTime")
+		}
+		if !restoreOptionsCarryRecoveryTimeKey(opts) {
+			t.Fatal("expected the recoveryTime key to be detected so the caller fails terminally")
+		}
+	})
+	t.Run("recoveryTime-key detection is scoped to object blobs carrying the key", func(t *testing.T) {
+		if restoreOptionsCarryRecoveryTimeKey(nil) {
+			t.Error("nil options must report no recoveryTime key")
+		}
+		if restoreOptionsCarryRecoveryTimeKey(&runtime.RawExtension{Raw: []byte(`{"restoreTimeoutSeconds":30}`)}) {
+			t.Error("a blob without recoveryTime must report no key (benign fall-back applies)")
+		}
+		if restoreOptionsCarryRecoveryTimeKey(&runtime.RawExtension{Raw: []byte(`"garbage`)}) {
+			t.Error("a non-object blob must report no key (no recoveryTime to honour)")
+		}
+	})
+}
+
+// ---------------------------------------------------------------------------
+// Snapshot round-trip
+// ---------------------------------------------------------------------------
+
+func TestMarshalUnmarshalMongoDBBackupSnapshot_RoundTrip(t *testing.T) {
+	fps := true
+	mdbBackup := &psmdbtypes.PerconaServerMongoDBBackup{
+		Status: psmdbtypes.PerconaServerMongoDBBackupStatus{
+			Destination: "s3://bkt/mongodb-src/2026-08-05T00:00:00Z",
+			S3: &psmdbtypes.BackupStorageS3{
+				Bucket:            "bkt",
+				CredentialsSecret: "mongodb-mongodb-src-s3-creds",
+				EndpointURL:       "https://seaweedfs-s3.tenant-root:8333",
+				ForcePathStyle:    &fps,
+			},
+		},
+	}
+	rendered := &strategyv1alpha1.MongoDBTemplate{Type: "logical"}
+	raw, err := marshalMongoDBBackupSnapshot(mdbBackup, rendered, "s3-storage", map[string]string{"k": "v"}, false)
+	if err != nil {
+		t.Fatalf("marshal: %v", err)
+	}
+	snap, err := unmarshalMongoDBBackupSnapshot(raw)
+	if err != nil {
+		t.Fatalf("unmarshal: %v", err)
+	}
+	if snap == nil || snap.Destination != mdbBackup.Status.Destination {
+		t.Fatalf("destination round-trip: %#v", snap)
+	}
+	if snap.Kind != psmdbBackupSnapshotKind || snap.StorageName != "s3-storage" {
+		t.Errorf("snapshot metadata mismatch: %#v", snap)
+	}
+	if snap.S3 == nil || snap.S3.CredentialsSecret != "mongodb-mongodb-src-s3-creds" {
+		t.Errorf("snapshot S3 mismatch: %#v", snap.S3)
+	}
+	// Secret-handling contract: the snapshot must carry only a Secret NAME,
+	// never a raw credential. There is no field on BackupStorageS3 for a key,
+	// so this is structurally guaranteed; assert the reference is preserved.
+	if snap.S3.Bucket != "bkt" {
+		t.Errorf("snapshot bucket mismatch: %q", snap.S3.Bucket)
+	}
+}
+
+// TestMarshalMongoDBBackupSnapshot_SystemBucketFallback guards the
+// useSystemBucket restore path: when the operator Backup status carries no S3
+// echo, the snapshot must fall back to the strategy's injected coordinates
+// (rendered.S3) so restore can rebuild backupSource - with credentialsSecret
+// defaulting to cozy-backups-creds.
+func TestMarshalMongoDBBackupSnapshot_SystemBucketFallback(t *testing.T) {
+	mdbBackup := &psmdbtypes.PerconaServerMongoDBBackup{
+		Status: psmdbtypes.PerconaServerMongoDBBackupStatus{
+			Destination: "s3://cozybkt/tenant-root/mongodb-src/2026-08-26T00:00:00Z",
+			// S3 intentionally nil: operator did not echo storage config.
+		},
+	}
+	rendered := &strategyv1alpha1.MongoDBTemplate{
+		Type: "logical",
+		S3: &strategyv1alpha1.MongoDBStorageS3{
+			Bucket:      "cozybkt",
+			EndpointURL: "https://s3.example.org",
+			Prefix:      "tenant-root/mongodb-src",
+			Region:      "us-east-1",
+			// CredentialsSecret intentionally empty -> defaults below.
+		},
+	}
+	raw, err := marshalMongoDBBackupSnapshot(mdbBackup, rendered, "s3-storage", nil, true)
+	if err != nil {
+		t.Fatalf("marshal: %v", err)
+	}
+	snap, err := unmarshalMongoDBBackupSnapshot(raw)
+	if err != nil {
+		t.Fatalf("unmarshal: %v", err)
+	}
+	if snap.S3 == nil {
+		t.Fatal("snapshot S3 must be populated from rendered.S3 when the operator echo is empty")
+	}
+	if snap.S3.CredentialsSecret != "cozy-backups-creds" {
+		t.Errorf("credentialsSecret must default to cozy-backups-creds; got %q", snap.S3.CredentialsSecret)
+	}
+	if snap.S3.EndpointURL != "https://s3.example.org" || snap.S3.Bucket != "cozybkt" {
+		t.Errorf("snapshot S3 coords mismatch: %#v", snap.S3)
+	}
+}
+
+// TestMarshalMongoDBBackupSnapshot_LegacyNoFallback pins the other half of the
+// gate: a legacy app (useSystemBucket=false) whose operator echoed no S3 must
+// leave the snapshot S3 nil even though the shared cozy-default strategy now
+// carries platform coordinates. Recording the platform bucket for an archive
+// the tenant wrote to its own bucket would send restore to the wrong place.
+func TestMarshalMongoDBBackupSnapshot_LegacyNoFallback(t *testing.T) {
+	mdbBackup := &psmdbtypes.PerconaServerMongoDBBackup{
+		Status: psmdbtypes.PerconaServerMongoDBBackupStatus{
+			Destination: "s3://tenant-own-bucket/mongodb-src/2026-08-26T00:00:00Z",
+			// S3 nil: operator echoed nothing, as on a legacy app whose storage
+			// lives on the app CR.
+		},
+	}
+	rendered := &strategyv1alpha1.MongoDBTemplate{
+		Type: "logical",
+		S3: &strategyv1alpha1.MongoDBStorageS3{
+			Bucket:      "cozy-backups-PLATFORM",
+			EndpointURL: "https://platform-s3.example",
+		},
+	}
+	raw, err := marshalMongoDBBackupSnapshot(mdbBackup, rendered, "s3-storage", nil, false)
+	if err != nil {
+		t.Fatalf("marshal: %v", err)
+	}
+	snap, err := unmarshalMongoDBBackupSnapshot(raw)
+	if err != nil {
+		t.Fatalf("unmarshal: %v", err)
+	}
+	if snap.S3 != nil {
+		t.Fatalf("legacy snapshot must not adopt the platform coordinates; got %#v", snap.S3)
+	}
+	if snap.Destination != "s3://tenant-own-bucket/mongodb-src/2026-08-26T00:00:00Z" {
+		t.Errorf("legacy destination must be preserved; got %q", snap.Destination)
+	}
+}
+
+func TestUnmarshalMongoDBBackupSnapshot_Empty(t *testing.T) {
+	snap, err := unmarshalMongoDBBackupSnapshot(nil)
+	if err != nil || snap != nil {
+		t.Fatalf("nil snapshot should decode to (nil,nil): snap=%v err=%v", snap, err)
+	}
+}
+
+// ---------------------------------------------------------------------------
+// resolveMongoDBBackupSource: live status preferred, snapshot fallback
+// ---------------------------------------------------------------------------
+
+func TestResolveMongoDBBackupSource_LivePreferred(t *testing.T) {
+	liveBackup := &psmdbtypes.PerconaServerMongoDBBackup{
+		ObjectMeta: metav1.ObjectMeta{Namespace: "tenant", Name: "op-backup"},
+		Status: psmdbtypes.PerconaServerMongoDBBackupStatus{
+			State:       psmdbtypes.StateReady,
+			Type:        "logical",
+			Destination: "s3://bkt/live/2026",
+			S3:          &psmdbtypes.BackupStorageS3{Bucket: "bkt"},
+		},
+	}
+	cozyBackup := &backupsv1alpha1.Backup{
+		ObjectMeta: metav1.ObjectMeta{Namespace: "tenant", Name: "cozy-bk"},
+		Spec: backupsv1alpha1.BackupSpec{
+			DriverMetadata: map[string]string{
+				psmdbBackupNameKey:  "op-backup",
+				psmdbDestinationKey: "s3://bkt/stale/2020",
+			},
+		},
+	}
+	c := newMongoDBStrategyTestClient(t, liveBackup)
+	r := &RestoreJobReconciler{Client: c, Recorder: record.NewFakeRecorder(10)}
+	src, err := r.resolveMongoDBBackupSource(context.Background(), cozyBackup)
+	if err != nil {
+		t.Fatalf("resolveMongoDBBackupSource: %v", err)
+	}
+	if src.Destination != "s3://bkt/live/2026" {
+		t.Errorf("expected live destination to win, got %q", src.Destination)
+	}
+}
+
+func TestResolveMongoDBBackupSource_SnapshotFallback(t *testing.T) {
+	// No live operator Backup CR seeded; a snapshot on the Cozystack Backup is
+	// the only source of the destination.
+	fps := true
+	snapBackup := &psmdbtypes.PerconaServerMongoDBBackup{
+		Status: psmdbtypes.PerconaServerMongoDBBackupStatus{
+			Destination: "s3://bkt/snap/2026",
+			S3:          &psmdbtypes.BackupStorageS3{Bucket: "bkt", ForcePathStyle: &fps},
+		},
+	}
+	raw, err := marshalMongoDBBackupSnapshot(snapBackup, &strategyv1alpha1.MongoDBTemplate{Type: "logical"}, "s3-storage", nil, false)
+	if err != nil {
+		t.Fatalf("marshal snapshot: %v", err)
+	}
+	cozyBackup := &backupsv1alpha1.Backup{
+		ObjectMeta: metav1.ObjectMeta{Namespace: "tenant", Name: "cozy-bk"},
+		Spec: backupsv1alpha1.BackupSpec{
+			DriverMetadata: map[string]string{psmdbBackupNameKey: "reaped-backup"},
+		},
+		Status: backupsv1alpha1.BackupStatus{UnderlyingResources: raw},
+	}
+	c := newMongoDBStrategyTestClient(t)
+	r := &RestoreJobReconciler{Client: c, Recorder: record.NewFakeRecorder(10)}
+	src, err := r.resolveMongoDBBackupSource(context.Background(), cozyBackup)
+	if err != nil {
+		t.Fatalf("resolveMongoDBBackupSource: %v", err)
+	}
+	if src.Destination != "s3://bkt/snap/2026" {
+		t.Errorf("expected snapshot destination, got %q", src.Destination)
+	}
+	if src.S3 == nil || src.S3.Bucket != "bkt" {
+		t.Errorf("expected snapshot S3 reused, got %#v", src.S3)
+	}
+}
+
+func TestResolveMongoDBBackupSource_NoDestinationFails(t *testing.T) {
+	cozyBackup := &backupsv1alpha1.Backup{
+		ObjectMeta: metav1.ObjectMeta{Namespace: "tenant", Name: "cozy-bk"},
+		Spec:       backupsv1alpha1.BackupSpec{DriverMetadata: map[string]string{}},
+	}
+	c := newMongoDBStrategyTestClient(t)
+	r := &RestoreJobReconciler{Client: c, Recorder: record.NewFakeRecorder(10)}
+	if _, err := r.resolveMongoDBBackupSource(context.Background(), cozyBackup); err == nil {
+		t.Fatal("expected an error when no destination is resolvable")
+	}
+}
+
+// A non-NotFound read error on the live operator Backup CR is transient (cache
+// not yet synced, apiserver hiccup): resolveMongoDBBackupSource must wrap it in
+// errTransientRestoreSource so the reconciler requeues instead of failing the
+// RestoreJob — matching the backup path, which requeues the symmetric read
+// error. A terminal snapshot fallback (no destination) must NOT carry the
+// sentinel; TestResolveMongoDBBackupSource_NoDestinationFails pins that side.
+func TestResolveMongoDBBackupSource_TransientLiveReadRequeues(t *testing.T) {
+	cozyBackup := &backupsv1alpha1.Backup{
+		ObjectMeta: metav1.ObjectMeta{Namespace: "tenant", Name: "cozy-bk"},
+		Spec: backupsv1alpha1.BackupSpec{
+			DriverMetadata: map[string]string{psmdbBackupNameKey: "op-backup"},
+		},
+	}
+	s := runtime.NewScheme()
+	_ = scheme.AddToScheme(s)
+	_ = backupsv1alpha1.AddToScheme(s)
+	_ = strategyv1alpha1.AddToScheme(s)
+	_ = psmdbtypes.AddToScheme(s)
+	_ = mongodbapp.AddToScheme(s)
+	c := clientfake.NewClientBuilder().
+		WithScheme(s).
+		WithInterceptorFuncs(interceptor.Funcs{
+			Get: func(ctx context.Context, cl client.WithWatch, key client.ObjectKey, obj client.Object, opts ...client.GetOption) error {
+				if _, ok := obj.(*psmdbtypes.PerconaServerMongoDBBackup); ok {
+					return apierrors.NewServiceUnavailable("apiserver hiccup")
+				}
+				return cl.Get(ctx, key, obj, opts...)
+			},
+		}).
+		Build()
+	r := &RestoreJobReconciler{Client: c, Recorder: record.NewFakeRecorder(10)}
+	_, err := r.resolveMongoDBBackupSource(context.Background(), cozyBackup)
+	if err == nil {
+		t.Fatal("expected a transient error from the live-CR read, got nil")
+	}
+	if !errors.Is(err, errTransientRestoreSource) {
+		t.Errorf("expected errTransientRestoreSource so the caller requeues, got %v", err)
+	}
+}
+
+// ---------------------------------------------------------------------------
+// createMongoDBBackupArtifact: driver-metadata + snapshot wiring
+// ---------------------------------------------------------------------------
+
+// TestCreateMongoDBBackupArtifact_ArtifactShape pins the producer side of the
+// restore contract: the driver-metadata keys and the persisted snapshot that
+// resolveMongoDBBackupSource reads back. Without this the producer/consumer
+// seam is only exercised end-to-end in e2e — a key-name drift between writer
+// and reader would pass every other unit test. Mirrors the MariaDB sibling
+// TestCreateMariaDBBackupArtifact_ArtifactShape.
+func TestCreateMongoDBBackupArtifact_ArtifactShape(t *testing.T) {
+	apps := mongodbapp.GroupName
+	resolved := &ResolvedBackupConfig{
+		StrategyRef: corev1.TypedLocalObjectReference{Kind: "MongoDB", Name: "cozy-default-mongodb"},
+		Parameters:  map[string]string{},
+	}
+	rendered := newRenderedMongoDBTemplate()
+
+	t.Run("ready backup with destination populates metadata + artifact + snapshot", func(t *testing.T) {
+		job := &backupsv1alpha1.BackupJob{
+			ObjectMeta: metav1.ObjectMeta{Namespace: "tenant", Name: "bj-ok"},
+			Spec: backupsv1alpha1.BackupJobSpec{
+				ApplicationRef: corev1.TypedLocalObjectReference{Kind: "MongoDB", Name: "mongodb-src", APIGroup: &apps},
+			},
+		}
+		c := newMongoDBStrategyTestClient(t, job)
+		r := &BackupJobReconciler{Client: c, Scheme: c.Scheme()}
+		mdbBackup := &psmdbtypes.PerconaServerMongoDBBackup{
+			ObjectMeta: metav1.ObjectMeta{Namespace: "tenant", Name: "op-bk"},
+			Status: psmdbtypes.PerconaServerMongoDBBackupStatus{
+				State:       psmdbtypes.StateReady,
+				Type:        "logical",
+				Destination: "s3://bkt/mongodb-src/2026-08-05T00:00:00Z",
+				S3:          &psmdbtypes.BackupStorageS3{Bucket: "bkt", CredentialsSecret: "mongodb-mongodb-src-s3-creds"},
+			},
+		}
+
+		artefact, err := r.createMongoDBBackupArtifact(context.Background(), job, resolved, mdbBackup, rendered, "s3-storage", false)
+		if err != nil {
+			t.Fatalf("createMongoDBBackupArtifact: %v", err)
+		}
+		if got := artefact.Spec.DriverMetadata[psmdbBackupNameKey]; got != "op-bk" {
+			t.Errorf("%s: got %q want op-bk", psmdbBackupNameKey, got)
+		}
+		if got := artefact.Spec.DriverMetadata[psmdbBackupNamespaceKey]; got != "tenant" {
+			t.Errorf("%s: got %q want tenant", psmdbBackupNamespaceKey, got)
+		}
+		if got := artefact.Spec.DriverMetadata[psmdbDestinationKey]; got != mdbBackup.Status.Destination {
+			t.Errorf("%s: got %q want %q", psmdbDestinationKey, got, mdbBackup.Status.Destination)
+		}
+		if artefact.Status.Phase != backupsv1alpha1.BackupPhaseReady {
+			t.Errorf("Status.Phase: got %q want Ready", artefact.Status.Phase)
+		}
+		if artefact.Status.Artifact == nil || artefact.Status.Artifact.URI != mdbBackup.Status.Destination {
+			t.Errorf("Status.Artifact.URI: got %#v want %q", artefact.Status.Artifact, mdbBackup.Status.Destination)
+		}
+		// The persisted snapshot must decode back to a usable backupSource —
+		// this is exactly what resolveMongoDBBackupSource consumes on the
+		// restore path when the operator Backup CR has been reaped.
+		snap, err := unmarshalMongoDBBackupSnapshot(artefact.Status.UnderlyingResources)
+		if err != nil {
+			t.Fatalf("decode snapshot: %v", err)
+		}
+		if snap == nil || snap.Destination != mdbBackup.Status.Destination {
+			t.Fatalf("snapshot destination round-trip: %#v", snap)
+		}
+		if snap.S3 == nil || snap.S3.CredentialsSecret != "mongodb-mongodb-src-s3-creds" {
+			t.Errorf("snapshot S3 by-reference mismatch: %#v", snap.S3)
+		}
+	})
+
+	t.Run("no destination leaves Artifact nil and omits destination key", func(t *testing.T) {
+		job := &backupsv1alpha1.BackupJob{
+			ObjectMeta: metav1.ObjectMeta{Namespace: "tenant", Name: "bj-nodest"},
+			Spec: backupsv1alpha1.BackupJobSpec{
+				ApplicationRef: corev1.TypedLocalObjectReference{Kind: "MongoDB", Name: "mongodb-src", APIGroup: &apps},
+			},
+		}
+		c := newMongoDBStrategyTestClient(t, job)
+		r := &BackupJobReconciler{Client: c, Scheme: c.Scheme()}
+		mdbBackup := &psmdbtypes.PerconaServerMongoDBBackup{
+			ObjectMeta: metav1.ObjectMeta{Namespace: "tenant", Name: "op-bk2"},
+			Status:     psmdbtypes.PerconaServerMongoDBBackupStatus{State: psmdbtypes.StateReady},
+		}
+
+		artefact, err := r.createMongoDBBackupArtifact(context.Background(), job, resolved, mdbBackup, rendered, "s3-storage", false)
+		if err != nil {
+			t.Fatalf("createMongoDBBackupArtifact: %v", err)
+		}
+		if artefact.Status.Artifact != nil {
+			t.Errorf("no destination must leave Status.Artifact nil; got %#v", artefact.Status.Artifact)
+		}
+		if _, ok := artefact.Spec.DriverMetadata[psmdbDestinationKey]; ok {
+			t.Errorf("no destination must omit %s from driverMetadata", psmdbDestinationKey)
+		}
+	})
+}
+
+// ---------------------------------------------------------------------------
+// System-bucket storage injection
+// ---------------------------------------------------------------------------
+
+// TestShouldInjectMongoDBSystemStorage pins the injection gate: inject only when
+// the app opted into the system bucket AND the strategy carries S3 coordinates.
+// The flag-false branch is the guarantee that a legacy app is never touched,
+// regardless of what storage happens to be on the live cluster.
+func TestShouldInjectMongoDBSystemStorage(t *testing.T) {
+	s3 := &strategyv1alpha1.MongoDBStorageS3{Bucket: "b", EndpointURL: "https://s3"}
+	cases := []struct {
+		name            string
+		useSystemBucket bool
+		rendered        *strategyv1alpha1.MongoDBTemplate
+		want            bool
+	}{
+		{
+			name:            "useSystemBucket flow with strategy coordinates: inject",
+			useSystemBucket: true,
+			rendered:        &strategyv1alpha1.MongoDBTemplate{StorageName: "s3-storage", S3: s3},
+			want:            true,
+		},
+		{
+			name:            "legacy app (flag off): skip even when the shared strategy carries coordinates",
+			useSystemBucket: false,
+			rendered:        &strategyv1alpha1.MongoDBTemplate{StorageName: "s3-storage", S3: s3},
+			want:            false,
+		},
+		{
+			name:            "useSystemBucket flag but strategy carries no coordinates: skip (nothing to inject)",
+			useSystemBucket: true,
+			rendered:        &strategyv1alpha1.MongoDBTemplate{StorageName: "s3-storage"},
+			want:            false,
+		},
+	}
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			if got := shouldInjectMongoDBSystemStorage(tc.useSystemBucket, tc.rendered); got != tc.want {
+				t.Fatalf("shouldInjectMongoDBSystemStorage = %v, want %v", got, tc.want)
+			}
+		})
+	}
+}
+
+// TestBuildMongoDBSystemStorageEntry pins the injected storage-entry shape: the
+// {"type":"s3","s3":{…}} envelope, the empty-credentialsSecret default, and the
+// forcePathStyle omit-when-nil (a nil pointer must not surface as
+// forcePathStyle:false the app never chose).
+func TestBuildMongoDBSystemStorageEntry(t *testing.T) {
+	t.Run("defaults credentialsSecret and omits forcePathStyle when nil", func(t *testing.T) {
+		entry := buildMongoDBSystemStorageEntry(&strategyv1alpha1.MongoDBStorageS3{
+			Bucket:      "sys-bucket",
+			EndpointURL: "https://s3.example",
+			Region:      "us-east-1",
+			Prefix:      "mongodb-src",
+		})
+		if entry["type"] != "s3" {
+			t.Fatalf("type = %v, want s3", entry["type"])
+		}
+		s3, ok := entry["s3"].(map[string]interface{})
+		if !ok {
+			t.Fatalf("s3 block is not a map: %#v", entry["s3"])
+		}
+		if s3["credentialsSecret"] != "cozy-backups-creds" {
+			t.Errorf("credentialsSecret = %v, want cozy-backups-creds", s3["credentialsSecret"])
+		}
+		if _, present := s3["forcePathStyle"]; present {
+			t.Errorf("forcePathStyle must be omitted when the pointer is nil; got %v", s3["forcePathStyle"])
+		}
+		for k, want := range map[string]interface{}{
+			"bucket":                "sys-bucket",
+			"endpointUrl":           "https://s3.example",
+			"region":                "us-east-1",
+			"prefix":                "mongodb-src",
+			"insecureSkipTLSVerify": false,
+		} {
+			if s3[k] != want {
+				t.Errorf("s3[%q] = %v, want %v", k, s3[k], want)
+			}
+		}
+	})
+
+	t.Run("honours explicit credentialsSecret and forcePathStyle", func(t *testing.T) {
+		fps := true
+		entry := buildMongoDBSystemStorageEntry(&strategyv1alpha1.MongoDBStorageS3{
+			Bucket:                "b",
+			CredentialsSecret:     "custom-creds",
+			ForcePathStyle:        &fps,
+			InsecureSkipTLSVerify: true,
+		})
+		s3 := entry["s3"].(map[string]interface{})
+		if s3["credentialsSecret"] != "custom-creds" {
+			t.Errorf("credentialsSecret = %v, want custom-creds", s3["credentialsSecret"])
+		}
+		if s3["forcePathStyle"] != true {
+			t.Errorf("forcePathStyle = %v, want true", s3["forcePathStyle"])
+		}
+		if s3["insecureSkipTLSVerify"] != true {
+			t.Errorf("insecureSkipTLSVerify = %v, want true", s3["insecureSkipTLSVerify"])
+		}
+	})
+}
+
+// ---------------------------------------------------------------------------
+// Test helpers
+// ---------------------------------------------------------------------------
+
+func newMongoDBStrategyTestClient(t *testing.T, objs ...client.Object) client.Client {
+	t.Helper()
+	s := runtime.NewScheme()
+	_ = scheme.AddToScheme(s)
+	_ = backupsv1alpha1.AddToScheme(s)
+	_ = strategyv1alpha1.AddToScheme(s)
+	_ = psmdbtypes.AddToScheme(s)
+	_ = mongodbapp.AddToScheme(s)
+	return clientfake.NewClientBuilder().
+		WithScheme(s).
+		WithObjects(objs...).
+		WithStatusSubresource(&backupsv1alpha1.BackupJob{}, &backupsv1alpha1.RestoreJob{}, &backupsv1alpha1.Backup{}).
+		Build()
+}
+
+func newMongoDBBackupJob(name, namespace string) *backupsv1alpha1.BackupJob {
+	apps := mongodbapp.GroupName
+	return &backupsv1alpha1.BackupJob{
+		ObjectMeta: metav1.ObjectMeta{Name: name, Namespace: namespace},
+		Spec: backupsv1alpha1.BackupJobSpec{
+			ApplicationRef: corev1.TypedLocalObjectReference{
+				Kind: "MongoDB", Name: "mongodb-src", APIGroup: &apps,
+			},
+		},
+	}
+}
+
+func newMongoDBRestoreJob(name, namespace string) *backupsv1alpha1.RestoreJob {
+	return &backupsv1alpha1.RestoreJob{
+		ObjectMeta: metav1.ObjectMeta{Name: name, Namespace: namespace},
+		Spec: backupsv1alpha1.RestoreJobSpec{
+			BackupRef: corev1.LocalObjectReference{Name: "src-backup"},
+		},
+	}
+}
+
+func newRenderedMongoDBTemplate() *strategyv1alpha1.MongoDBTemplate {
+	return &strategyv1alpha1.MongoDBTemplate{
+		StorageName:     "s3-storage",
+		Type:            "logical",
+		CompressionType: "gzip",
+	}
+}
+
+// ---------------------------------------------------------------------------
+// Strategy rendering
+// ---------------------------------------------------------------------------
+
+// The strategy prefix reaches the CR as a literal Go template
+// ("<ns>/<app>") and renderMongoDBTemplate is what turns it into a per-tenant
+// path at BackupJob time. That resolution is the only thing keeping two tenants'
+// dumps apart inside one shared bucket, so pin it: an unrendered prefix would
+// collide every tenant under the same path. Mirrors the CNPG/FoundationDB
+// sibling render tests.
+func TestRenderMongoDBTemplate_TemplatingApplicationName(t *testing.T) {
+	tmpl := strategyv1alpha1.MongoDBTemplate{
+		StorageName: "s3-storage",
+		Type:        "logical",
+		S3: &strategyv1alpha1.MongoDBStorageS3{
+			Bucket:            "cozy-backups",
+			EndpointURL:       "https://s3.example",
+			Prefix:            "{{ .Application.metadata.namespace }}/{{ .Application.metadata.name }}",
+			CredentialsSecret: "cozy-backups-creds",
+		},
+	}
+	app := &mongodbapp.MongoDB{ObjectMeta: metav1.ObjectMeta{Namespace: "tenant-x", Name: "mongo-y"}}
+
+	got, err := renderMongoDBTemplate(tmpl, app, nil)
+	if err != nil {
+		t.Fatalf("renderMongoDBTemplate: %v", err)
+	}
+	if got.S3 == nil {
+		t.Fatalf("rendered S3 is nil")
+	}
+	if got.S3.Prefix != "tenant-x/mongo-y" {
+		t.Errorf("prefix not templated per application: got %q want tenant-x/mongo-y", got.S3.Prefix)
+	}
+	// The non-templated coordinates must pass through untouched.
+	if got.S3.Bucket != "cozy-backups" || got.S3.CredentialsSecret != "cozy-backups-creds" {
+		t.Errorf("static coordinates altered: %#v", got.S3)
+	}
+}
+
+// ---------------------------------------------------------------------------
+// System-bucket storage injection (BackupJob path)
+// ---------------------------------------------------------------------------
+
+// The injection is what makes the useSystemBucket flow work: the app chart omits
+// the storage, so reconcileMongoDB SSA-injects it and must read the precondition
+// off the post-apply cluster (cluster = injected), not the pre-apply one it
+// Got. This pins that within a single reconcile: with a live cluster that has
+// backups enabled but no storage declared, the reconcile must inject, pass the
+// precondition, and create the operator Backup CR. Drop the reassignment and the
+// precondition reads the pre-apply cluster, fails, and no Backup is created.
+func TestReconcileMongoDB_InjectsSystemStorageBeforePrecondition(t *testing.T) {
+	apps := mongodbapp.GroupName
+	strategyGroup := strategyv1alpha1.GroupVersion.Group
+	now := metav1.Now()
+
+	job := &backupsv1alpha1.BackupJob{
+		ObjectMeta: metav1.ObjectMeta{Namespace: "tenant", Name: "bj-inj"},
+		Spec: backupsv1alpha1.BackupJobSpec{
+			ApplicationRef: corev1.TypedLocalObjectReference{Kind: "MongoDB", Name: "app1", APIGroup: &apps},
+		},
+		Status: backupsv1alpha1.BackupJobStatus{StartedAt: &now},
+	}
+	strategy := &strategyv1alpha1.MongoDB{
+		ObjectMeta: metav1.ObjectMeta{Name: "cozy-default-mongodb"},
+		Spec: strategyv1alpha1.MongoDBSpec{Template: strategyv1alpha1.MongoDBTemplate{
+			StorageName: "s3-storage",
+			Type:        "logical",
+			S3: &strategyv1alpha1.MongoDBStorageS3{
+				Bucket:            "cozy-backups",
+				EndpointURL:       "https://s3.example",
+				Prefix:            "{{ .Application.metadata.namespace }}/{{ .Application.metadata.name }}",
+				CredentialsSecret: "cozy-backups-creds",
+			},
+		}},
+	}
+	app := &mongodbapp.MongoDB{
+		ObjectMeta: metav1.ObjectMeta{Namespace: "tenant", Name: "app1"},
+		Spec:       mongodbapp.MongoDBSpec{Backup: mongodbapp.MongoDBBackupSpec{UseSystemBucket: true}},
+	}
+	// Live cluster: backups enabled (agents run) but storage NOT declared — the
+	// exact state the chart leaves on the useSystemBucket flow.
+	cluster := &psmdbtypes.PerconaServerMongoDB{
+		ObjectMeta: metav1.ObjectMeta{Namespace: "tenant", Name: "mongodb-app1"},
+		Spec:       psmdbtypes.PerconaServerMongoDBSpec{Backup: psmdbtypes.PerconaServerMongoDBBackupConfig{Enabled: true}},
+		Status:     psmdbtypes.PerconaServerMongoDBStatus{Conditions: []psmdbtypes.PerconaServerMongoDBCondition{{Type: psmdbtypes.ConditionPBMReady, Status: "True"}}},
+	}
+
+	c := newMongoDBStrategyTestClient(t, job, strategy, app, cluster)
+	r := &BackupJobReconciler{Client: c, Scheme: c.Scheme()}
+
+	resolved := &ResolvedBackupConfig{
+		StrategyRef: corev1.TypedLocalObjectReference{APIGroup: &strategyGroup, Kind: strategyv1alpha1.MongoDBStrategyKind, Name: "cozy-default-mongodb"},
+		Parameters:  map[string]string{},
+	}
+
+	// First pass: the storage is freshly injected, so the driver requeues rather
+	// than minting the Backup CR in the same reconcile (see the injection-race
+	// note in reconcileMongoDB). The apply is persisted onto the live cluster.
+	res, err := r.reconcileMongoDB(context.Background(), job.DeepCopy(), resolved)
+	if err != nil {
+		t.Fatalf("reconcileMongoDB pass 1: %v", err)
+	}
+	if res.RequeueAfter == 0 {
+		t.Fatalf("expected a requeue after the first injection, got %+v", res)
+	}
+	list := &psmdbtypes.PerconaServerMongoDBBackupList{}
+	if err := c.List(context.Background(), list, client.InNamespace("tenant")); err != nil {
+		t.Fatalf("list operator backups: %v", err)
+	}
+	if len(list.Items) != 0 {
+		t.Fatalf("no operator Backup should be minted before the requeue, got %d", len(list.Items))
+	}
+	got := &psmdbtypes.PerconaServerMongoDB{}
+	if err := c.Get(context.Background(), types.NamespacedName{Namespace: "tenant", Name: "mongodb-app1"}, got); err != nil {
+		t.Fatalf("get cluster: %v", err)
+	}
+	entry, ok := got.Spec.Backup.Storages["s3-storage"]
+	if !ok {
+		t.Fatalf("expected injected s3-storage on the cluster, got %#v", got.Spec.Backup.Storages)
+	}
+	// The whole entry must reach the cluster, the prefix above all: it is the
+	// only thing separating two tenants' archives inside the one shared bucket.
+	var persistedEntry struct {
+		Type string `json:"type"`
+		S3   struct {
+			Bucket            string `json:"bucket"`
+			EndpointURL       string `json:"endpointUrl"`
+			Prefix            string `json:"prefix"`
+			CredentialsSecret string `json:"credentialsSecret"`
+		} `json:"s3"`
+	}
+	if err := json.Unmarshal(entry.Raw, &persistedEntry); err != nil {
+		t.Fatalf("decode injected entry %s: %v", entry.Raw, err)
+	}
+	if persistedEntry.Type != "s3" || persistedEntry.S3.Bucket != "cozy-backups" || persistedEntry.S3.EndpointURL != "https://s3.example" ||
+		persistedEntry.S3.CredentialsSecret != "cozy-backups-creds" || persistedEntry.S3.Prefix != "tenant/app1" {
+		t.Errorf("injected entry must carry the strategy coordinates with the per-application prefix resolved, got %s", entry.Raw)
+	}
+
+	// Second pass: the cluster already declares the storage (the operator cache
+	// has had a poll to observe it), so the precondition passes off the injected
+	// storage and the operator Backup CR is minted. Re-fetch the BackupJob first —
+	// pass 1 wrote its Ready=False condition, so a stale copy would conflict.
+	fresh := &backupsv1alpha1.BackupJob{}
+	if err := c.Get(context.Background(), types.NamespacedName{Namespace: "tenant", Name: "bj-inj"}, fresh); err != nil {
+		t.Fatalf("re-get job: %v", err)
+	}
+	res, err = r.reconcileMongoDB(context.Background(), fresh, resolved)
+	if err != nil {
+		t.Fatalf("reconcileMongoDB pass 2: %v", err)
+	}
+	if res.RequeueAfter == 0 {
+		t.Fatalf("expected a poll requeue while the operator Backup runs, got %+v", res)
+	}
+	if err := c.List(context.Background(), list, client.InNamespace("tenant")); err != nil {
+		t.Fatalf("list operator backups: %v", err)
+	}
+	if len(list.Items) != 1 {
+		t.Fatalf("expected the injected storage to let the precondition pass and create 1 operator Backup, got %d", len(list.Items))
+	}
+}
+
+// mongodbInjectFixture builds the four objects reconcileMongoDB needs to reach
+// the injection point on the useSystemBucket flow, parameterised on the live
+// cluster's backup.enabled.
+func mongodbInjectFixture(enabled bool) (*backupsv1alpha1.BackupJob, *strategyv1alpha1.MongoDB, *mongodbapp.MongoDB, *psmdbtypes.PerconaServerMongoDB, *ResolvedBackupConfig) {
+	apps := mongodbapp.GroupName
+	strategyGroup := strategyv1alpha1.GroupVersion.Group
+	now := metav1.Now()
+	job := &backupsv1alpha1.BackupJob{
+		ObjectMeta: metav1.ObjectMeta{Namespace: "tenant", Name: "bj-inj"},
+		Spec: backupsv1alpha1.BackupJobSpec{
+			ApplicationRef: corev1.TypedLocalObjectReference{Kind: "MongoDB", Name: "app1", APIGroup: &apps},
+		},
+		Status: backupsv1alpha1.BackupJobStatus{StartedAt: &now},
+	}
+	strategy := &strategyv1alpha1.MongoDB{
+		ObjectMeta: metav1.ObjectMeta{Name: "cozy-default-mongodb"},
+		Spec: strategyv1alpha1.MongoDBSpec{Template: strategyv1alpha1.MongoDBTemplate{
+			StorageName: "s3-storage",
+			Type:        "logical",
+			S3: &strategyv1alpha1.MongoDBStorageS3{
+				Bucket: "cozy-backups", EndpointURL: "https://s3.example",
+				Prefix: "{{ .Application.metadata.namespace }}/{{ .Application.metadata.name }}", CredentialsSecret: "cozy-backups-creds",
+			},
+		}},
+	}
+	app := &mongodbapp.MongoDB{
+		ObjectMeta: metav1.ObjectMeta{Namespace: "tenant", Name: "app1"},
+		Spec:       mongodbapp.MongoDBSpec{Backup: mongodbapp.MongoDBBackupSpec{UseSystemBucket: true}},
+	}
+	cluster := &psmdbtypes.PerconaServerMongoDB{
+		ObjectMeta: metav1.ObjectMeta{Namespace: "tenant", Name: "mongodb-app1"},
+		Spec:       psmdbtypes.PerconaServerMongoDBSpec{Backup: psmdbtypes.PerconaServerMongoDBBackupConfig{Enabled: enabled}},
+		Status:     psmdbtypes.PerconaServerMongoDBStatus{Conditions: []psmdbtypes.PerconaServerMongoDBCondition{{Type: psmdbtypes.ConditionPBMReady, Status: "True"}}},
+	}
+	resolved := &ResolvedBackupConfig{
+		StrategyRef: corev1.TypedLocalObjectReference{APIGroup: &strategyGroup, Kind: strategyv1alpha1.MongoDBStrategyKind, Name: "cozy-default-mongodb"},
+		Parameters:  map[string]string{},
+	}
+	return job, strategy, app, cluster, resolved
+}
+
+// The first BackupJob of a useSystemBucket app injects the storage; the psmdb
+// operator resolves it from a cached cluster read when it services the Backup
+// CR, so minting the CR in the same pass races that cache and can latch it at
+// State=error. The driver must requeue after a fresh injection instead of
+// minting, giving the cache a poll to observe the storage.
+func TestReconcileMongoDB_FirstInjectionRequeuesBeforeMinting(t *testing.T) {
+	// Fixture seeds a cluster with backups enabled and NO storage declared.
+	job, strategy, app, cluster, resolved := mongodbInjectFixture(true)
+	c := newMongoDBStrategyTestClient(t, job, strategy, app, cluster)
+	r := &BackupJobReconciler{Client: c, Scheme: c.Scheme()}
+
+	res, err := r.reconcileMongoDB(context.Background(), job.DeepCopy(), resolved)
+	if err != nil {
+		t.Fatalf("reconcileMongoDB: %v", err)
+	}
+	if res.RequeueAfter == 0 {
+		t.Fatalf("expected a requeue after the first injection, got %+v", res)
+	}
+	// No operator Backup CR minted yet — that waits for the next pass.
+	list := &psmdbtypes.PerconaServerMongoDBBackupList{}
+	if err := c.List(context.Background(), list, client.InNamespace("tenant")); err != nil {
+		t.Fatalf("list: %v", err)
+	}
+	if len(list.Items) != 0 {
+		t.Errorf("no operator Backup should be created in the same pass as a fresh injection, got %d", len(list.Items))
+	}
+	// The wait is named on the BackupJob, not silent: a Ready=False condition with
+	// the injection reason so the pause is visible in kubectl describe.
+	persisted := &backupsv1alpha1.BackupJob{}
+	if err := c.Get(context.Background(), types.NamespacedName{Namespace: "tenant", Name: job.Name}, persisted); err != nil {
+		t.Fatalf("get job: %v", err)
+	}
+	cond := apimeta.FindStatusCondition(persisted.Status.Conditions, "Ready")
+	if cond == nil || cond.Status != metav1.ConditionFalse || cond.Reason != "PerconaServerMongoDBStorageInjected" {
+		t.Errorf("expected Ready=False with reason PerconaServerMongoDBStorageInjected, got %+v", cond)
+	}
+}
+
+// A cluster that can never service a backup (backup.enabled=false) must not be
+// mutated: injection is gated on Enabled so the disabled cluster fails the
+// precondition on the enabled check without the driver having written storage
+// onto it.
+func TestReconcileMongoDB_DisabledClusterNotMutated(t *testing.T) {
+	job, strategy, app, cluster, resolved := mongodbInjectFixture(false)
+	c := newMongoDBStrategyTestClient(t, job, strategy, app, cluster)
+	r := &BackupJobReconciler{Client: c, Scheme: c.Scheme()}
+
+	res, err := r.reconcileMongoDB(context.Background(), job.DeepCopy(), resolved)
+	if err != nil {
+		t.Fatalf("reconcileMongoDB: %v", err)
+	}
+	if res.RequeueAfter == 0 {
+		t.Fatalf("expected a waiting requeue for a disabled cluster, got %+v", res)
+	}
+	got := &psmdbtypes.PerconaServerMongoDB{}
+	if err := c.Get(context.Background(), types.NamespacedName{Namespace: "tenant", Name: "mongodb-app1"}, got); err != nil {
+		t.Fatalf("get cluster: %v", err)
+	}
+	if len(got.Spec.Backup.Storages) != 0 {
+		t.Errorf("disabled cluster must not be injected, got storages %#v", got.Spec.Backup.Storages)
+	}
+	list := &psmdbtypes.PerconaServerMongoDBBackupList{}
+	if err := c.List(context.Background(), list, client.InNamespace("tenant")); err != nil {
+		t.Fatalf("list: %v", err)
+	}
+	if len(list.Items) != 0 {
+		t.Errorf("no operator Backup should be created for a disabled cluster, got %d", len(list.Items))
+	}
+}
+
+// A server-side apply that fails transiently (apiserver hiccup, operator
+// conflict) must requeue with backoff, not fail the BackupJob terminally. Before
+// the fix the injection error went straight to markBackupJobFailed, so one
+// transient apply killed the backup.
+func TestReconcileMongoDB_InjectApplyErrorRequeues(t *testing.T) {
+	job, strategy, app, cluster, resolved := mongodbInjectFixture(true)
+
+	s := runtime.NewScheme()
+	_ = scheme.AddToScheme(s)
+	_ = backupsv1alpha1.AddToScheme(s)
+	_ = strategyv1alpha1.AddToScheme(s)
+	_ = psmdbtypes.AddToScheme(s)
+	_ = mongodbapp.AddToScheme(s)
+	c := clientfake.NewClientBuilder().
+		WithScheme(s).
+		WithObjects(job, strategy, app, cluster).
+		WithStatusSubresource(&backupsv1alpha1.BackupJob{}).
+		WithInterceptorFuncs(interceptor.Funcs{
+			Patch: func(ctx context.Context, cl client.WithWatch, obj client.Object, patch client.Patch, opts ...client.PatchOption) error {
+				if _, ok := obj.(*psmdbtypes.PerconaServerMongoDB); ok {
+					return apierrors.NewConflict(schema.GroupResource{Group: "psmdb.percona.com", Resource: "perconaservermongodbs"}, obj.GetName(), errors.New("racing the operator"))
+				}
+				return cl.Patch(ctx, obj, patch, opts...)
+			},
+		}).
+		Build()
+	r := &BackupJobReconciler{Client: c, Scheme: c.Scheme()}
+
+	_, err := r.reconcileMongoDB(context.Background(), job.DeepCopy(), resolved)
+	if err == nil {
+		t.Fatal("expected a transient error so the caller requeues, got nil")
+	}
+	// The BackupJob must NOT be marked Failed by a transient apply error.
+	persisted := &backupsv1alpha1.BackupJob{}
+	if err := c.Get(context.Background(), types.NamespacedName{Namespace: "tenant", Name: "bj-inj"}, persisted); err != nil {
+		t.Fatalf("get job: %v", err)
+	}
+	if persisted.Status.Phase == backupsv1alpha1.BackupJobPhaseFailed {
+		t.Errorf("a transient inject error must not fail the BackupJob terminally")
+	}
+}
+
+// resolveMongoDBBackupSource must fill an S3 block the live operator status
+// omits from the snapshot: on the useSystemBucket flow the operator can report
+// status.destination with status.s3 empty (the storage was injected, not
+// declared), and without the coordinates the restore has nothing to authenticate
+// or address the archive with. Neither prior test covers a live CR whose
+// destination is set but whose S3 is nil.
+func TestResolveMongoDBBackupSource_LiveMissingS3BackfillsFromSnapshot(t *testing.T) {
+	liveBackup := &psmdbtypes.PerconaServerMongoDBBackup{
+		ObjectMeta: metav1.ObjectMeta{Namespace: "tenant", Name: "op-backup"},
+		Status: psmdbtypes.PerconaServerMongoDBBackupStatus{
+			State:       psmdbtypes.StateReady,
+			Type:        "logical",
+			Destination: "s3://cozy-backups/tenant/app1/2026",
+			// S3 intentionally nil: the operator echoed a destination only.
+		},
+	}
+	snapBackup := &psmdbtypes.PerconaServerMongoDBBackup{
+		Status: psmdbtypes.PerconaServerMongoDBBackupStatus{
+			Destination: "s3://cozy-backups/tenant/app1/2026",
+			S3:          &psmdbtypes.BackupStorageS3{Bucket: "cozy-backups", CredentialsSecret: "cozy-backups-creds", EndpointURL: "https://s3.example"},
+		},
+	}
+	raw, err := marshalMongoDBBackupSnapshot(snapBackup, &strategyv1alpha1.MongoDBTemplate{Type: "logical"}, "s3-storage", nil, false)
+	if err != nil {
+		t.Fatalf("marshal snapshot: %v", err)
+	}
+	cozyBackup := &backupsv1alpha1.Backup{
+		ObjectMeta: metav1.ObjectMeta{Namespace: "tenant", Name: "cozy-bk"},
+		Spec: backupsv1alpha1.BackupSpec{
+			DriverMetadata: map[string]string{psmdbBackupNameKey: "op-backup"},
+		},
+		Status: backupsv1alpha1.BackupStatus{UnderlyingResources: raw},
+	}
+	c := newMongoDBStrategyTestClient(t, liveBackup)
+	r := &RestoreJobReconciler{Client: c, Recorder: record.NewFakeRecorder(10)}
+	src, err := r.resolveMongoDBBackupSource(context.Background(), cozyBackup)
+	if err != nil {
+		t.Fatalf("resolveMongoDBBackupSource: %v", err)
+	}
+	if src.Destination != "s3://cozy-backups/tenant/app1/2026" {
+		t.Errorf("expected live destination, got %q", src.Destination)
+	}
+	if src.S3 == nil {
+		t.Fatalf("expected S3 backfilled from snapshot, got nil (restore would have no coordinates)")
+	}
+	if src.S3.CredentialsSecret != "cozy-backups-creds" || src.S3.Bucket != "cozy-backups" {
+		t.Errorf("expected snapshot S3 coordinates, got %#v", src.S3)
+	}
+}
+
+// ---------------------------------------------------------------------------
+// System-bucket archive cleanup (retention)
+// ---------------------------------------------------------------------------
+
+func TestCleanupMongoDBBackup(t *testing.T) {
+	md := map[string]string{psmdbBackupNameKey: "op-bk"}
+	newBackup := func(ann map[string]string) *backupsv1alpha1.Backup {
+		return &backupsv1alpha1.Backup{
+			ObjectMeta: metav1.ObjectMeta{Namespace: "tenant", Name: "cozy-bk", Annotations: ann},
+			Spec:       backupsv1alpha1.BackupSpec{DriverMetadata: md},
+		}
+	}
+	// The delete-backup finalizer is the ownership marker: present = the driver
+	// owns the shared-bucket archive; absent = legacy (tenant bucket).
+	opBackup := func(finalized bool) *psmdbtypes.PerconaServerMongoDBBackup {
+		b := &psmdbtypes.PerconaServerMongoDBBackup{
+			ObjectMeta: metav1.ObjectMeta{Namespace: "tenant", Name: "op-bk"},
+		}
+		if finalized {
+			b.Finalizers = []string{psmdbDeleteBackupFinalizer}
+		}
+		return b
+	}
+	liveNamespace := &corev1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: "tenant"}}
+	getOp := func(t *testing.T, c client.Client) *psmdbtypes.PerconaServerMongoDBBackup {
+		got := &psmdbtypes.PerconaServerMongoDBBackup{}
+		if err := c.Get(context.Background(), types.NamespacedName{Namespace: "tenant", Name: "op-bk"}, got); err != nil {
+			t.Fatalf("get operator CR: %v", err)
+		}
+		return got
+	}
+
+	t.Run("legacy backup (no finalizer) is a no-op", func(t *testing.T) {
+		c := newMongoDBStrategyTestClient(t, opBackup(false), liveNamespace)
+		r := &BackupReconciler{Client: c}
+		res, err := r.cleanupMongoDBBackup(context.Background(), newBackup(nil))
+		if err != nil || res.RequeueAfter != 0 {
+			t.Fatalf("legacy cleanup must be a no-op, got res=%+v err=%v", res, err)
+		}
+		if !getOp(t, c).DeletionTimestamp.IsZero() {
+			t.Errorf("legacy cleanup must not delete the operator CR")
+		}
+	})
+
+	t.Run("owned archive deletes the operator CR and waits", func(t *testing.T) {
+		c := newMongoDBStrategyTestClient(t, opBackup(true), liveNamespace)
+		r := &BackupReconciler{Client: c}
+		res, err := r.cleanupMongoDBBackup(context.Background(), newBackup(nil))
+		if err != nil {
+			t.Fatalf("cleanupMongoDBBackup: %v", err)
+		}
+		if res.RequeueAfter == 0 {
+			t.Fatalf("expected a requeue while the operator prunes the archive, got %+v", res)
+		}
+		// The finalizer holds the CR Terminating until the operator prunes; the
+		// driver keeps its finalizer and waits, it does not strip it here.
+		got := getOp(t, c)
+		if got.DeletionTimestamp.IsZero() {
+			t.Errorf("expected the operator CR to be marked for deletion")
+		}
+		if !controllerutil.ContainsFinalizer(got, psmdbDeleteBackupFinalizer) {
+			t.Errorf("driver must keep the finalizer while waiting, so the operator can prune")
+		}
+	})
+
+	t.Run("operator CR already gone releases", func(t *testing.T) {
+		c := newMongoDBStrategyTestClient(t, liveNamespace)
+		r := &BackupReconciler{Client: c}
+		res, err := r.cleanupMongoDBBackup(context.Background(), newBackup(nil))
+		if err != nil || res.RequeueAfter != 0 {
+			t.Fatalf("a reaped operator CR must release, got res=%+v err=%v", res, err)
+		}
+	})
+
+	t.Run("skip annotation strips the finalizer and releases", func(t *testing.T) {
+		c := newMongoDBStrategyTestClient(t, opBackup(true), liveNamespace)
+		r := &BackupReconciler{Client: c, Recorder: record.NewFakeRecorder(10)}
+		res, err := r.cleanupMongoDBBackup(context.Background(), newBackup(map[string]string{psmdbSkipArtifactCleanupAnnotation: "true"}))
+		if err != nil || res.RequeueAfter != 0 {
+			t.Fatalf("skip annotation must release, got res=%+v err=%v", res, err)
+		}
+		// Releasing strips our finalizer so the CR can be reaped (in the fake
+		// client, with no finalizer left, the best-effort delete removes it): the
+		// escape hatch actually unwedges. Tolerate either "gone" or "present
+		// without our finalizer".
+		got := &psmdbtypes.PerconaServerMongoDBBackup{}
+		err = c.Get(context.Background(), types.NamespacedName{Namespace: "tenant", Name: "op-bk"}, got)
+		if err == nil && controllerutil.ContainsFinalizer(got, psmdbDeleteBackupFinalizer) {
+			t.Errorf("release must strip the delete-backup finalizer; still present: %v", got.Finalizers)
+		}
+	})
+
+	t.Run("terminating namespace strips the finalizer and releases (no wedge)", func(t *testing.T) {
+		// No namespace object seeded → namespaceTerminating reports true, the
+		// teardown case. The driver must not requeue forever waiting on an
+		// operator that can no longer prune; it strips its finalizer and releases.
+		c := newMongoDBStrategyTestClient(t, opBackup(true))
+		r := &BackupReconciler{Client: c, Recorder: record.NewFakeRecorder(10)}
+		res, err := r.cleanupMongoDBBackup(context.Background(), newBackup(nil))
+		if err != nil || res.RequeueAfter != 0 {
+			t.Fatalf("teardown must release, not wedge; got res=%+v err=%v", res, err)
+		}
+		got := &psmdbtypes.PerconaServerMongoDBBackup{}
+		err = c.Get(context.Background(), types.NamespacedName{Namespace: "tenant", Name: "op-bk"}, got)
+		if err == nil && controllerutil.ContainsFinalizer(got, psmdbDeleteBackupFinalizer) {
+			t.Errorf("teardown must strip the finalizer so the namespace can finish; still present: %v", got.Finalizers)
+		}
+	})
+
+	t.Run("terminating release uses the pre-read CR, not a second Get", func(t *testing.T) {
+		// The terminating path hands the CR it already read and confirmed owned to
+		// releaseMongoDBCleanup, so the strip is not gated on a second Get. Fail
+		// every operator-CR Get after the first: cleanup's initial read succeeds
+		// and confirms ownership, and the release must strip from the passed object
+		// without re-reading. If the call site instead passed nil, the release
+		// would re-Get (fail here) and skip the strip — no ArtifactNotDeleted Event.
+		getN := 0
+		s := runtime.NewScheme()
+		_ = scheme.AddToScheme(s)
+		_ = backupsv1alpha1.AddToScheme(s)
+		_ = psmdbtypes.AddToScheme(s)
+		c := clientfake.NewClientBuilder().
+			WithScheme(s).
+			WithObjects(opBackup(true)).
+			WithInterceptorFuncs(interceptor.Funcs{
+				Get: func(ctx context.Context, cl client.WithWatch, key client.ObjectKey, obj client.Object, opts ...client.GetOption) error {
+					if _, ok := obj.(*psmdbtypes.PerconaServerMongoDBBackup); ok {
+						getN++
+						if getN > 1 {
+							return apierrors.NewServiceUnavailable("read throttled after first")
+						}
+					}
+					return cl.Get(ctx, key, obj, opts...)
+				},
+			}).
+			Build()
+		rec := record.NewFakeRecorder(10)
+		r := &BackupReconciler{Client: c, Recorder: rec}
+		// No Namespace object → namespaceTerminating reports true (teardown path).
+		res, err := r.cleanupMongoDBBackup(context.Background(), newBackup(nil))
+		if err != nil || res.RequeueAfter != 0 {
+			t.Fatalf("teardown must release, got res=%+v err=%v", res, err)
+		}
+		select {
+		case ev := <-rec.Events:
+			if !strings.Contains(ev, "ArtifactNotDeleted") {
+				t.Errorf("expected the owned-release event proving the pre-read CR was used, got %q", ev)
+			}
+		default:
+			t.Errorf("expected an ArtifactNotDeleted event (pre-read CR used, strip ran), got none")
+		}
+	})
+
+	// A client whose Get on the operator CR hard-fails the way a missing CRD or a
+	// revoked verb does — NoKindMatchError / an arbitrary error — models the case
+	// the escape hatch exists for. The annotation must free the Backup without
+	// depending on that read, and a bare NoMatchError must be treated as "gone".
+	failingGetClient := func(getErr error) client.Client {
+		s := runtime.NewScheme()
+		_ = scheme.AddToScheme(s)
+		_ = backupsv1alpha1.AddToScheme(s)
+		_ = psmdbtypes.AddToScheme(s)
+		return clientfake.NewClientBuilder().
+			WithScheme(s).
+			WithInterceptorFuncs(interceptor.Funcs{
+				Get: func(ctx context.Context, cl client.WithWatch, key client.ObjectKey, obj client.Object, opts ...client.GetOption) error {
+					if _, ok := obj.(*psmdbtypes.PerconaServerMongoDBBackup); ok {
+						return getErr
+					}
+					return cl.Get(ctx, key, obj, opts...)
+				},
+			}).
+			Build()
+	}
+	noMatch := &apimeta.NoKindMatchError{GroupKind: schema.GroupKind{Group: "psmdb.percona.com", Kind: "PerconaServerMongoDBBackup"}}
+
+	t.Run("skip annotation releases even when the operator CR is unreadable", func(t *testing.T) {
+		// The verb is revoked (Forbidden): the escape hatch runs before the Get, so
+		// it must still release rather than propagate the read error and wedge.
+		c := failingGetClient(apierrors.NewForbidden(schema.GroupResource{Group: "psmdb.percona.com", Resource: "perconaservermongodbbackups"}, "op-bk", errors.New("rbac revoked")))
+		rec := record.NewFakeRecorder(10)
+		r := &BackupReconciler{Client: c, Recorder: rec}
+		res, err := r.cleanupMongoDBBackup(context.Background(), newBackup(map[string]string{psmdbSkipArtifactCleanupAnnotation: "true"}))
+		if err != nil || res.RequeueAfter != 0 {
+			t.Fatalf("annotation must release despite an unreadable operator CR, got res=%+v err=%v", res, err)
+		}
+		// A CR that could not be read may still carry the finalizer, so the release
+		// surfaces which object may be left stuck rather than a Debug line nobody sees.
+		select {
+		case ev := <-rec.Events:
+			if !strings.Contains(ev, "FinalizerNotStripped") || !strings.Contains(ev, "op-bk") {
+				t.Errorf("expected a FinalizerNotStripped event naming the unreadable CR, got %q", ev)
+			}
+		default:
+			t.Errorf("expected a FinalizerNotStripped Warning for the unreadable CR, got none")
+		}
+	})
+
+	t.Run("a missing CRD (NoMatchError) releases instead of wedging", func(t *testing.T) {
+		c := failingGetClient(noMatch)
+		r := &BackupReconciler{Client: c}
+		res, err := r.cleanupMongoDBBackup(context.Background(), newBackup(nil))
+		if err != nil || res.RequeueAfter != 0 {
+			t.Fatalf("NoMatchError must be treated as gone and release, got res=%+v err=%v", res, err)
+		}
+	})
+
+	// The annotation reaches releaseMongoDBCleanup before the ownership check, so
+	// the release must itself refuse to touch a CR the driver does not own — the
+	// legacy operator-side backup record is what a psmdb restore-by-name resolves
+	// against, and the RBAC comment and docs both promise it is never deleted.
+	t.Run("legacy backup with the skip annotation keeps its operator CR", func(t *testing.T) {
+		c := newMongoDBStrategyTestClient(t, opBackup(false), liveNamespace)
+		r := &BackupReconciler{Client: c, Recorder: record.NewFakeRecorder(10)}
+		res, err := r.cleanupMongoDBBackup(context.Background(), newBackup(map[string]string{psmdbSkipArtifactCleanupAnnotation: "true"}))
+		if err != nil || res.RequeueAfter != 0 {
+			t.Fatalf("legacy + annotation must release, got res=%+v err=%v", res, err)
+		}
+		got := getOp(t, c)
+		if !got.DeletionTimestamp.IsZero() {
+			t.Errorf("the escape hatch must not delete a legacy (unowned) operator CR")
+		}
+	})
+
+	// When the finalizer strip fails, the CR keeps percona.com/delete-backup and
+	// can pin its namespace in Terminating; the release still proceeds, but it
+	// must say which object is stuck rather than emit the success-case Event.
+	t.Run("a failed finalizer strip surfaces the stuck object", func(t *testing.T) {
+		s := runtime.NewScheme()
+		_ = scheme.AddToScheme(s)
+		_ = backupsv1alpha1.AddToScheme(s)
+		_ = psmdbtypes.AddToScheme(s)
+		c := clientfake.NewClientBuilder().
+			WithScheme(s).
+			WithObjects(opBackup(true)).
+			WithInterceptorFuncs(interceptor.Funcs{
+				Patch: func(ctx context.Context, cl client.WithWatch, obj client.Object, patch client.Patch, opts ...client.PatchOption) error {
+					if _, ok := obj.(*psmdbtypes.PerconaServerMongoDBBackup); ok {
+						return apierrors.NewServiceUnavailable("apiserver down")
+					}
+					return cl.Patch(ctx, obj, patch, opts...)
+				},
+			}).
+			Build()
+		rec := record.NewFakeRecorder(10)
+		r := &BackupReconciler{Client: c, Recorder: rec}
+		res, err := r.cleanupMongoDBBackup(context.Background(), newBackup(map[string]string{psmdbSkipArtifactCleanupAnnotation: "true"}))
+		if err != nil || res.RequeueAfter != 0 {
+			t.Fatalf("release must proceed even when the strip fails, got res=%+v err=%v", res, err)
+		}
+		select {
+		case ev := <-rec.Events:
+			if !strings.Contains(ev, "FinalizerNotStripped") || !strings.Contains(ev, "op-bk") {
+				t.Errorf("expected a FinalizerNotStripped event naming the object, got %q", ev)
+			}
+		default:
+			t.Errorf("expected an event surfacing the stuck finalizer, got none")
+		}
+	})
+}
+
+// On the useSystemBucket flow a dump the operator is actively writing
+// (state=running) is never failed on the wall-clock deadline: pbm keeps
+// streaming into the shared bucket after the driver gives up, so failing it
+// strands an archive no Backup object represents. On the legacy flow the
+// archive lands in the tenant's own bucket under psmdb task retention, so the
+// pre-existing deadline still applies to running. Not-started states trip the
+// deadline on both flows.
+func TestPsmdbBackupTimedOut(t *testing.T) {
+	past := &metav1.Time{Time: time.Now().Add(-2 * psmdbDefaultBackupDeadline)}
+	recent := &metav1.Time{Time: time.Now()}
+	cases := []struct {
+		name    string
+		state   string
+		started *metav1.Time
+		usb     bool
+		want    bool
+	}{
+		{"system-bucket running past deadline: never strand the shared archive", psmdbtypes.StateRunning, past, true, false},
+		// The ceiling is 24h, pinned as a boundary pair in absolute terms so a
+		// change to the constant is a deliberate change here too.
+		{"system-bucket running just under the 24h ceiling: left to finish", psmdbtypes.StateRunning, &metav1.Time{Time: time.Now().Add(-(24*time.Hour - time.Minute))}, true, false},
+		{"system-bucket running just past the 24h ceiling: a wedged agent cannot pin the job forever", psmdbtypes.StateRunning, &metav1.Time{Time: time.Now().Add(-(24*time.Hour + time.Minute))}, true, true},
+		{"legacy running past deadline: the pre-existing deadline applies", psmdbtypes.StateRunning, past, false, true},
+		{"waiting past deadline: nothing written, safe to fail", psmdbtypes.StateWaiting, past, true, true},
+		{"requested past deadline", psmdbtypes.StateRequested, past, false, true},
+		{"never observed past deadline", "", past, true, true},
+		{"legacy running within deadline", psmdbtypes.StateRunning, recent, false, false},
+		{"waiting within deadline", psmdbtypes.StateWaiting, recent, true, false},
+		{"legacy running with no StartedAt", psmdbtypes.StateRunning, nil, false, false},
+	}
+	for _, tc := range cases {
+		if got := psmdbBackupTimedOut(tc.state, tc.started, tc.usb); got != tc.want {
+			t.Errorf("%s: psmdbBackupTimedOut(state=%q, useSystemBucket=%v): got %v want %v", tc.name, tc.state, tc.usb, got, tc.want)
+		}
+	}
+}
+
+// The SSA-patch call site is the one place that could force-overwrite a running
+// legacy tenant's own s3-storage entry. On the legacy flow (useSystemBucket
+// false) the driver must never touch the cluster, even when the cluster is
+// otherwise ready to back up — the injection is gated on the app flag, not on
+// the live storage set.
+func TestReconcileMongoDB_LegacyClusterNotPatched(t *testing.T) {
+	apps := mongodbapp.GroupName
+	strategyGroup := strategyv1alpha1.GroupVersion.Group
+	now := metav1.Now()
+
+	job := &backupsv1alpha1.BackupJob{
+		ObjectMeta: metav1.ObjectMeta{Namespace: "tenant", Name: "bj-legacy"},
+		Spec: backupsv1alpha1.BackupJobSpec{
+			ApplicationRef: corev1.TypedLocalObjectReference{Kind: "MongoDB", Name: "app1", APIGroup: &apps},
+		},
+		Status: backupsv1alpha1.BackupJobStatus{StartedAt: &now},
+	}
+	// Strategy still carries S3 coordinates (they live on the shared default), so
+	// the guard cannot lean on rendered.S3 being nil — only the app flag.
+	strategy := &strategyv1alpha1.MongoDB{
+		ObjectMeta: metav1.ObjectMeta{Name: "cozy-default-mongodb"},
+		Spec: strategyv1alpha1.MongoDBSpec{Template: strategyv1alpha1.MongoDBTemplate{
+			StorageName: "s3-storage",
+			Type:        "logical",
+			S3:          &strategyv1alpha1.MongoDBStorageS3{Bucket: "cozy-backups", EndpointURL: "https://s3.example", CredentialsSecret: "cozy-backups-creds"},
+		}},
+	}
+	app := &mongodbapp.MongoDB{
+		ObjectMeta: metav1.ObjectMeta{Namespace: "tenant", Name: "app1"},
+		Spec:       mongodbapp.MongoDBSpec{Backup: mongodbapp.MongoDBBackupSpec{UseSystemBucket: false}},
+	}
+	// Legacy cluster with backups enabled AND its own tenant-bucket storage.
+	ownStorage := runtime.RawExtension{Raw: []byte(`{"type":"s3","s3":{"bucket":"tenant-own","credentialsSecret":"mongodb-app1-s3-creds"}}`)}
+	cluster := &psmdbtypes.PerconaServerMongoDB{
+		ObjectMeta: metav1.ObjectMeta{Namespace: "tenant", Name: "mongodb-app1"},
+		Spec: psmdbtypes.PerconaServerMongoDBSpec{Backup: psmdbtypes.PerconaServerMongoDBBackupConfig{
+			Enabled:  true,
+			Storages: map[string]runtime.RawExtension{"s3-storage": ownStorage},
+		}},
+	}
+
+	c := newMongoDBStrategyTestClient(t, job, strategy, app, cluster)
+	r := &BackupJobReconciler{Client: c, Scheme: c.Scheme()}
+	resolved := &ResolvedBackupConfig{
+		StrategyRef: corev1.TypedLocalObjectReference{APIGroup: &strategyGroup, Kind: strategyv1alpha1.MongoDBStrategyKind, Name: "cozy-default-mongodb"},
+		Parameters:  map[string]string{},
+	}
+
+	if _, err := r.reconcileMongoDB(context.Background(), job.DeepCopy(), resolved); err != nil {
+		t.Fatalf("reconcileMongoDB: %v", err)
+	}
+
+	got := &psmdbtypes.PerconaServerMongoDB{}
+	if err := c.Get(context.Background(), types.NamespacedName{Namespace: "tenant", Name: "mongodb-app1"}, got); err != nil {
+		t.Fatalf("get cluster: %v", err)
+	}
+	bucket, _ := psmdbStorageS3(got.Spec.Backup.Storages["s3-storage"])
+	if bucket != "tenant-own" {
+		t.Errorf("legacy tenant's own s3-storage was overwritten: bucket=%q, want tenant-own", bucket)
+	}
+}
+
+// releaseMongoDBCleanup must strip the finalizer off the object the caller
+// already read and confirmed owned, without a second Get whose transient
+// failure would silently drop the strip and wedge a terminating namespace.
+func TestReleaseMongoDBCleanup_UsesPassedObjectNotReRead(t *testing.T) {
+	owned := &psmdbtypes.PerconaServerMongoDBBackup{
+		ObjectMeta: metav1.ObjectMeta{Namespace: "tenant", Name: "op-bk", Finalizers: []string{psmdbDeleteBackupFinalizer}},
+	}
+	s := runtime.NewScheme()
+	_ = scheme.AddToScheme(s)
+	_ = backupsv1alpha1.AddToScheme(s)
+	_ = psmdbtypes.AddToScheme(s)
+	c := clientfake.NewClientBuilder().
+		WithScheme(s).
+		WithObjects(owned.DeepCopy()).
+		WithInterceptorFuncs(interceptor.Funcs{
+			Get: func(ctx context.Context, cl client.WithWatch, key client.ObjectKey, obj client.Object, opts ...client.GetOption) error {
+				if _, ok := obj.(*psmdbtypes.PerconaServerMongoDBBackup); ok {
+					return apierrors.NewServiceUnavailable("read throttled")
+				}
+				return cl.Get(ctx, key, obj, opts...)
+			},
+		}).
+		Build()
+	rec := record.NewFakeRecorder(10)
+	r := &BackupReconciler{Client: c, Recorder: rec}
+	backup := &backupsv1alpha1.Backup{
+		ObjectMeta: metav1.ObjectMeta{Namespace: "tenant", Name: "cozy-bk"},
+		Spec:       backupsv1alpha1.BackupSpec{DriverMetadata: map[string]string{psmdbBackupNameKey: "op-bk"}},
+	}
+
+	res, err := r.releaseMongoDBCleanup(context.Background(), backup, "op-bk", owned.DeepCopy(), "namespace is terminating")
+	if err != nil || res.RequeueAfter != 0 {
+		t.Fatalf("release must proceed, got res=%+v err=%v", res, err)
+	}
+	// The owned-strip path fires ArtifactNotDeleted; if the code had re-read the
+	// CR (Get throttled), it would have taken the quiet "nothing of ours" path
+	// with no event — so the event proves the passed object was used.
+	select {
+	case ev := <-rec.Events:
+		if !strings.Contains(ev, "ArtifactNotDeleted") {
+			t.Errorf("expected the owned-release event proving the passed object was used, got %q", ev)
+		}
+	default:
+		t.Errorf("expected an ArtifactNotDeleted event (passed object used, strip ran), got none")
+	}
+}
+
+// A streaming dump on the useSystemBucket flow is neither cancelled nor failed
+// on the deadline: the pinned operator persists status only on a state/error
+// change, so status.lastTransition freezes at the instant the dump entered
+// running, and a real dataset routinely outruns any window. The wait is named
+// on the BackupJob (Ready=False with the start time) rather than silent. On the
+// legacy flow the archive lands in the tenant's own bucket under psmdb task
+// retention, so the pre-existing deadline still fails the job — and the operator
+// CR is left alone either way.
+func TestReconcileMongoDB_RunningPastDeadline(t *testing.T) {
+	setup := func(t *testing.T, useSystemBucket bool) (*BackupJobReconciler, client.Client, *ResolvedBackupConfig, *backupsv1alpha1.BackupJob) {
+		job, strategy, app, cluster, resolved := mongodbInjectFixture(true)
+		app.Spec.Backup.UseSystemBucket = useSystemBucket
+		job.Status.StartedAt = &metav1.Time{Time: time.Now().Add(-4 * psmdbDefaultBackupDeadline)}
+		bucket := "cozy-backups"
+		if !useSystemBucket {
+			// Legacy: the strategy carries no coordinates to inject and the cluster
+			// declares the tenant's own bucket.
+			strategy.Spec.Template.S3 = nil
+			bucket = "tenant-own"
+		}
+		cluster.Spec.Backup.Storages = map[string]runtime.RawExtension{
+			"s3-storage": {Raw: []byte(fmt.Sprintf(`{"type":"s3","s3":{"bucket":%q}}`, bucket))},
+		}
+		running := &psmdbtypes.PerconaServerMongoDBBackup{
+			ObjectMeta: metav1.ObjectMeta{
+				Namespace: "tenant",
+				Name:      "op-running",
+				Labels: map[string]string{
+					backupsv1alpha1.OwningJobNameLabel:      job.Name,
+					backupsv1alpha1.OwningJobNamespaceLabel: job.Namespace,
+				},
+			},
+			// lastTransition frozen at the start, as the pinned operator leaves it.
+			Status: psmdbtypes.PerconaServerMongoDBBackupStatus{
+				State:          psmdbtypes.StateRunning,
+				LastTransition: &metav1.Time{Time: time.Now().Add(-4 * psmdbDefaultBackupDeadline)},
+			},
+		}
+		if useSystemBucket {
+			running.Finalizers = []string{psmdbDeleteBackupFinalizer}
+		}
+		c := newMongoDBStrategyTestClient(t, job, strategy, app, cluster, running)
+		return &BackupJobReconciler{Client: c, Scheme: c.Scheme(), Recorder: record.NewFakeRecorder(10)}, c, resolved, job
+	}
+	getCR := func(t *testing.T, c client.Client) *psmdbtypes.PerconaServerMongoDBBackup {
+		got := &psmdbtypes.PerconaServerMongoDBBackup{}
+		if err := c.Get(context.Background(), types.NamespacedName{Namespace: "tenant", Name: "op-running"}, got); err != nil {
+			t.Fatalf("get running backup: %v", err)
+		}
+		return got
+	}
+	getJob := func(t *testing.T, c client.Client, name string) *backupsv1alpha1.BackupJob {
+		p := &backupsv1alpha1.BackupJob{}
+		if err := c.Get(context.Background(), types.NamespacedName{Namespace: "tenant", Name: name}, p); err != nil {
+			t.Fatalf("get job: %v", err)
+		}
+		return p
+	}
+
+	t.Run("system bucket: left to finish, wait named on the job", func(t *testing.T) {
+		r, c, resolved, job := setup(t, true)
+		res, err := r.reconcileMongoDB(context.Background(), job.DeepCopy(), resolved)
+		if err != nil {
+			t.Fatalf("reconcileMongoDB: %v", err)
+		}
+		if res.RequeueAfter == 0 {
+			t.Fatalf("expected a poll requeue for a running system-bucket backup, got %+v", res)
+		}
+		if !getCR(t, c).DeletionTimestamp.IsZero() {
+			t.Errorf("a running system-bucket backup must never be cancelled; it was deleted")
+		}
+		p := getJob(t, c, job.Name)
+		if p.Status.Phase == backupsv1alpha1.BackupJobPhaseFailed {
+			t.Errorf("a running system-bucket backup must not fail the BackupJob on the deadline")
+		}
+		cond := apimeta.FindStatusCondition(p.Status.Conditions, "Ready")
+		if cond == nil || cond.Status != metav1.ConditionFalse || cond.Reason != "PerconaServerMongoDBBackupRunning" || !strings.Contains(cond.Message, "streaming since") {
+			t.Errorf("expected Ready=False PerconaServerMongoDBBackupRunning naming the start time, got %+v", cond)
+		}
+	})
+
+	// Past the running ceiling the job fails, but the CR is still not cancelled:
+	// with its prune finalizer it is the only handle to whatever pbm still
+	// writes, and the failure names it.
+	t.Run("system bucket: past the ceiling → fail, CR left in place", func(t *testing.T) {
+		r, c, resolved, job := setup(t, true)
+		job.Status.StartedAt = &metav1.Time{Time: time.Now().Add(-2 * psmdbRunningCeiling)}
+		if _, err := r.reconcileMongoDB(context.Background(), job.DeepCopy(), resolved); err != nil {
+			t.Fatalf("reconcileMongoDB: %v", err)
+		}
+		if !getCR(t, c).DeletionTimestamp.IsZero() {
+			t.Errorf("a running system-bucket backup must not be cancelled even past the ceiling")
+		}
+		p := getJob(t, c, job.Name)
+		if p.Status.Phase != backupsv1alpha1.BackupJobPhaseFailed {
+			t.Fatalf("a system-bucket dump running past the ceiling must fail the BackupJob, got phase=%q", p.Status.Phase)
+		}
+		if !strings.Contains(p.Status.Message, "op-running") || !strings.Contains(p.Status.Message, "left in place") {
+			t.Errorf("the failure must name the operator CR left in place, got %q", p.Status.Message)
+		}
+	})
+
+	t.Run("legacy: the deadline still fails the job, CR left alone", func(t *testing.T) {
+		r, c, resolved, job := setup(t, false)
+		if _, err := r.reconcileMongoDB(context.Background(), job.DeepCopy(), resolved); err != nil {
+			t.Fatalf("reconcileMongoDB: %v", err)
+		}
+		p := getJob(t, c, job.Name)
+		if p.Status.Phase != backupsv1alpha1.BackupJobPhaseFailed {
+			t.Fatalf("a legacy backup running past the deadline must fail the BackupJob, got phase=%q", p.Status.Phase)
+		}
+		cond := apimeta.FindStatusCondition(p.Status.Conditions, "Ready")
+		if cond == nil || !strings.Contains(cond.Message, "did not complete within") {
+			t.Errorf("expected a Ready condition naming the deadline, got %+v", cond)
+		}
+		if !getCR(t, c).DeletionTimestamp.IsZero() {
+			t.Errorf("the legacy operator CR must be left alone (hands-off); it was deleted")
+		}
+	})
+}
+
+// The storage-race retry hinges on recognising the operator's own
+// unable-to-get-storage error and only that: a different error, or the right
+// error naming a different storage, must not be swallowed as retryable.
+func TestPsmdbErrorIsUnresolvedStorage(t *testing.T) {
+	cases := []struct {
+		msg, storage string
+		want         bool
+	}{
+		{`unable to get storage "s3-storage": not found`, "s3-storage", true},
+		{`unable to get storage "other": not found`, "s3-storage", false},
+		{"connection refused", "s3-storage", false},
+		{"", "s3-storage", false},
+	}
+	for _, tc := range cases {
+		if got := psmdbErrorIsUnresolvedStorage(tc.msg, tc.storage); got != tc.want {
+			t.Errorf("psmdbErrorIsUnresolvedStorage(%q, %q): got %v want %v", tc.msg, tc.storage, got, tc.want)
+		}
+	}
+}
+
+// The first-injection requeue waits for the cluster cache to reflect the applied
+// storage, but that wait is deadline-bounded: a cluster whose cache never
+// reflects it must fail terminally, not requeue forever. Pin the bound — a fresh
+// injection past the deadline fails the BackupJob without minting a Backup CR.
+func TestReconcileMongoDB_FirstInjectionDeadlineFails(t *testing.T) {
+	job, strategy, app, cluster, resolved := mongodbInjectFixture(true)
+	// No storage declared (fresh injection) and started well past the deadline.
+	job.Status.StartedAt = &metav1.Time{Time: time.Now().Add(-2 * psmdbDefaultBackupDeadline)}
+
+	c := newMongoDBStrategyTestClient(t, job, strategy, app, cluster)
+	r := &BackupJobReconciler{Client: c, Scheme: c.Scheme()}
+
+	if _, err := r.reconcileMongoDB(context.Background(), job.DeepCopy(), resolved); err != nil {
+		t.Fatalf("reconcileMongoDB: %v", err)
+	}
+
+	persisted := &backupsv1alpha1.BackupJob{}
+	if err := c.Get(context.Background(), types.NamespacedName{Namespace: "tenant", Name: job.Name}, persisted); err != nil {
+		t.Fatalf("get job: %v", err)
+	}
+	if persisted.Status.Phase != backupsv1alpha1.BackupJobPhaseFailed {
+		t.Fatalf("expected the BackupJob to be Failed past the injection deadline, got phase=%q", persisted.Status.Phase)
+	}
+	cond := apimeta.FindStatusCondition(persisted.Status.Conditions, "Ready")
+	if cond == nil || !strings.Contains(cond.Message, "did not reflect the injected storage") {
+		t.Errorf("expected a Ready condition naming the unreflected storage, got %+v", cond)
+	}
+	list := &psmdbtypes.PerconaServerMongoDBBackupList{}
+	if err := c.List(context.Background(), list, client.InNamespace("tenant")); err != nil {
+		t.Fatalf("list: %v", err)
+	}
+	if len(list.Items) != 0 {
+		t.Errorf("no operator Backup should be minted on the deadline failure, got %d", len(list.Items))
+	}
+}
+
+// The residual injection race: the operator can latch the Backup CR at
+// state=error because it resolved storage from a cache that had not observed the
+// apply. Within the deadline the driver must delete that CR and requeue (a fresh
+// one resolves against a caught-up cache), not fail the BackupJob — that error
+// is the driver's own race, not the tenant's failure.
+func TestReconcileMongoDB_StorageRaceErrorRetried(t *testing.T) {
+	job, strategy, app, cluster, resolved := mongodbInjectFixture(true)
+	job.Status.StartedAt = &metav1.Time{Time: time.Now()} // within deadline
+	// Storage already declared so the reconcile skips the first-injection requeue
+	// and reaches the state switch.
+	cluster.Spec.Backup.Storages = map[string]runtime.RawExtension{
+		"s3-storage": {Raw: []byte(`{"type":"s3","s3":{"bucket":"cozy-backups","endpointUrl":"https://s3.example","region":"","prefix":"tenant/app1","credentialsSecret":"cozy-backups-creds","insecureSkipTLSVerify":false}}`)},
+	}
+	errored := &psmdbtypes.PerconaServerMongoDBBackup{
+		ObjectMeta: metav1.ObjectMeta{
+			Namespace:  "tenant",
+			Name:       "op-errored",
+			Finalizers: []string{psmdbDeleteBackupFinalizer},
+			Labels: map[string]string{
+				backupsv1alpha1.OwningJobNameLabel:      job.Name,
+				backupsv1alpha1.OwningJobNamespaceLabel: job.Namespace,
+			},
+		},
+		Status: psmdbtypes.PerconaServerMongoDBBackupStatus{
+			State: psmdbtypes.StateError,
+			Error: `unable to get storage "s3-storage": not found`,
+		},
+	}
+
+	c := newMongoDBStrategyTestClient(t, job, strategy, app, cluster, errored)
+	r := &BackupJobReconciler{Client: c, Scheme: c.Scheme()}
+
+	res, err := r.reconcileMongoDB(context.Background(), job.DeepCopy(), resolved)
+	if err != nil {
+		t.Fatalf("reconcileMongoDB: %v", err)
+	}
+	if res.RequeueAfter == 0 {
+		t.Fatalf("expected a retry requeue on the storage-race error, got %+v", res)
+	}
+	// The errored CR is deleted (Terminating with its finalizer) so a fresh one
+	// resolves against a caught-up cache.
+	got := &psmdbtypes.PerconaServerMongoDBBackup{}
+	gerr := c.Get(context.Background(), types.NamespacedName{Namespace: "tenant", Name: "op-errored"}, got)
+	if gerr == nil && got.DeletionTimestamp.IsZero() {
+		t.Errorf("the storage-race errored CR must be deleted before retrying; it was left untouched")
+	}
+	// The BackupJob is NOT failed.
+	persisted := &backupsv1alpha1.BackupJob{}
+	if err := c.Get(context.Background(), types.NamespacedName{Namespace: "tenant", Name: job.Name}, persisted); err != nil {
+		t.Fatalf("get job: %v", err)
+	}
+	if persisted.Status.Phase == backupsv1alpha1.BackupJobPhaseFailed {
+		t.Errorf("the storage-race error must be retried, not fail the BackupJob")
+	}
+	if got := psmdbStorageRaceRetries(persisted); got != 1 {
+		t.Errorf("the retry must be counted on the BackupJob (the deleted CR is reaped), got %d", got)
+	}
+}
+
+// The storage-race retry is a system-bucket repair: it deletes the errored CR
+// and re-mints. On the legacy flow the same operator error is the tenant's own
+// storage problem and the CR is the tenant's — it must be left alone and the
+// job failed terminally, never deleted and retried.
+func TestReconcileMongoDB_StorageRaceErrorIsTerminalOnLegacy(t *testing.T) {
+	job, strategy, app, cluster, resolved := mongodbInjectFixture(true)
+	app.Spec.Backup.UseSystemBucket = false
+	strategy.Spec.Template.S3 = nil
+	job.Status.StartedAt = &metav1.Time{Time: time.Now()}
+	cluster.Spec.Backup.Storages = map[string]runtime.RawExtension{
+		"s3-storage": {Raw: []byte(`{"type":"s3","s3":{"bucket":"tenant-own","credentialsSecret":"mongodb-app1-s3-creds"}}`)},
+	}
+	errored := &psmdbtypes.PerconaServerMongoDBBackup{ // no delete-backup finalizer: legacy
+		ObjectMeta: metav1.ObjectMeta{
+			Namespace: "tenant", Name: "op-legacy-errored",
+			Labels: map[string]string{
+				backupsv1alpha1.OwningJobNameLabel:      job.Name,
+				backupsv1alpha1.OwningJobNamespaceLabel: job.Namespace,
+			},
+		},
+		Status: psmdbtypes.PerconaServerMongoDBBackupStatus{State: psmdbtypes.StateError, Error: `unable to get storage "s3-storage": not found`},
+	}
+	c := newMongoDBStrategyTestClient(t, job, strategy, app, cluster, errored)
+	r := &BackupJobReconciler{Client: c, Scheme: c.Scheme(), Recorder: record.NewFakeRecorder(10)}
+	if _, err := r.reconcileMongoDB(context.Background(), job.DeepCopy(), resolved); err != nil {
+		t.Fatalf("reconcileMongoDB: %v", err)
+	}
+	got := &psmdbtypes.PerconaServerMongoDBBackup{}
+	if err := c.Get(context.Background(), types.NamespacedName{Namespace: "tenant", Name: "op-legacy-errored"}, got); err != nil || !got.DeletionTimestamp.IsZero() {
+		t.Errorf("a legacy operator CR must never be deleted by the storage-race retry, err=%v", err)
+	}
+	persisted := &backupsv1alpha1.BackupJob{}
+	if err := c.Get(context.Background(), types.NamespacedName{Namespace: "tenant", Name: job.Name}, persisted); err != nil {
+		t.Fatalf("get job: %v", err)
+	}
+	if persisted.Status.Phase != backupsv1alpha1.BackupJobPhaseFailed {
+		t.Errorf("a legacy storage error is terminal, got phase=%q", persisted.Status.Phase)
+	}
+}
+
+// The retry deletes the errored CR, but its release-lock finalizer keeps it
+// briefly Terminating. The lookup must skip a Terminating CR so a fresh one is
+// minted (against a caught-up cache) rather than re-observing the same error on
+// the lingering object and requeuing forever.
+func TestReconcileMongoDB_StorageRaceReMintsPastLingeringCR(t *testing.T) {
+	job, strategy, app, cluster, resolved := mongodbInjectFixture(true)
+	job.Status.StartedAt = &metav1.Time{Time: time.Now()} // within deadline
+	cluster.Spec.Backup.Storages = map[string]runtime.RawExtension{
+		"s3-storage": {Raw: []byte(`{"type":"s3","s3":{"bucket":"cozy-backups","endpointUrl":"https://s3.example","region":"","prefix":"tenant/app1","credentialsSecret":"cozy-backups-creds","insecureSkipTLSVerify":false}}`)},
+	}
+	// An errored CR from a previous retry, still carrying the finalizer.
+	lingering := &psmdbtypes.PerconaServerMongoDBBackup{
+		ObjectMeta: metav1.ObjectMeta{
+			Namespace:  "tenant",
+			Name:       "op-lingering",
+			Finalizers: []string{psmdbDeleteBackupFinalizer},
+			Labels: map[string]string{
+				backupsv1alpha1.OwningJobNameLabel:      job.Name,
+				backupsv1alpha1.OwningJobNamespaceLabel: job.Namespace,
+			},
+		},
+		Status: psmdbtypes.PerconaServerMongoDBBackupStatus{State: psmdbtypes.StateError, Error: `unable to get storage "s3-storage": not found`},
+	}
+	c := newMongoDBStrategyTestClient(t, job, strategy, app, cluster, lingering)
+	// Delete it so the finalizer holds it Terminating (DeletionTimestamp set).
+	if err := c.Delete(context.Background(), lingering); err != nil {
+		t.Fatalf("delete to make it Terminating: %v", err)
+	}
+	r := &BackupJobReconciler{Client: c, Scheme: c.Scheme(), Recorder: record.NewFakeRecorder(10)}
+
+	if _, err := r.reconcileMongoDB(context.Background(), job.DeepCopy(), resolved); err != nil {
+		t.Fatalf("reconcileMongoDB: %v", err)
+	}
+
+	// A fresh, non-Terminating CR must exist — the retry re-minted past the
+	// lingering one instead of re-observing it.
+	list := &psmdbtypes.PerconaServerMongoDBBackupList{}
+	if err := c.List(context.Background(), list, client.InNamespace("tenant")); err != nil {
+		t.Fatalf("list: %v", err)
+	}
+	fresh := 0
+	for i := range list.Items {
+		if list.Items[i].DeletionTimestamp.IsZero() {
+			fresh++
+		}
+	}
+	if fresh == 0 {
+		t.Errorf("expected a fresh operator Backup minted past the Terminating CR, got none (lookup did not skip the lingering CR)")
+	}
+}
+
+// psmdbBackupUnstructured builds a live PerconaServerMongoDBBackup for the fake
+// dynamic client, carrying status.state (omitted when empty).
+func psmdbBackupUnstructured(namespace, name, state string) *unstructured.Unstructured {
+	u := &unstructured.Unstructured{}
+	u.SetGroupVersionKind(schema.GroupVersionKind{
+		Group:   psmdbBackupGVR.Group,
+		Version: psmdbBackupGVR.Version,
+		Kind:    "PerconaServerMongoDBBackup",
+	})
+	u.SetNamespace(namespace)
+	u.SetName(name)
+	// The typed fake client stamps every seeded object with this
+	// resourceVersion; the cancel pins its delete to the version the live read
+	// answered for, so the two must agree for the delete to go through.
+	u.SetResourceVersion("999")
+	if state != "" {
+		_ = unstructured.SetNestedField(u.Object, state, "status", "state")
+	}
+	return u
+}
+
+// newPsmdbBackupDynamicClient is the dynamic (uncached) client the cancel path
+// re-reads live state through. Modelled on altinitystrategy_controller_test.go.
+func newPsmdbBackupDynamicClient(objs ...*unstructured.Unstructured) *dynamicfake.FakeDynamicClient {
+	rtObjs := make([]runtime.Object, 0, len(objs))
+	for _, o := range objs {
+		rtObjs = append(rtObjs, o)
+	}
+	return dynamicfake.NewSimpleDynamicClientWithCustomListKinds(
+		runtime.NewScheme(),
+		map[schema.GroupVersionResource]string{psmdbBackupGVR: "PerconaServerMongoDBBackupList", psmdbClusterGVR: "PerconaServerMongoDBList"},
+		rtObjs...,
+	)
+}
+
+// The deadline cancel re-reads the CR live and must delete it only on a positive
+// not-started answer: a live state that has moved to running or ready, or a read
+// that cannot be answered at all, must defer instead of deleting a CR whose
+// delete-backup finalizer would take a running partial or a completed archive
+// with it. The cached mdbBackup reads not-started (waiting) past the deadline in
+// every case; only the live answer differs.
+func TestReconcileMongoDB_TimedOutCancelUsesLiveState(t *testing.T) {
+	setup := func(t *testing.T, live *dynamicfake.FakeDynamicClient) (*BackupJobReconciler, client.Client, *ResolvedBackupConfig, *backupsv1alpha1.BackupJob) {
+		job, strategy, app, cluster, resolved := mongodbInjectFixture(true)
+		// Past the deadline but inside the live-read grace.
+		job.Status.StartedAt = &metav1.Time{Time: time.Now().Add(-psmdbDefaultBackupDeadline - psmdbLiveReadGrace/2)}
+		cluster.Spec.Backup.Storages = map[string]runtime.RawExtension{
+			"s3-storage": {Raw: []byte(`{"type":"s3","s3":{"bucket":"cozy-backups","endpointUrl":"https://s3.example","region":"","prefix":"tenant/app1","credentialsSecret":"cozy-backups-creds","insecureSkipTLSVerify":false}}`)},
+		}
+		// Cached CR reads a not-started state (waiting) past the deadline.
+		cached := &psmdbtypes.PerconaServerMongoDBBackup{
+			ObjectMeta: metav1.ObjectMeta{
+				Namespace:  "tenant",
+				Name:       "op-waiting",
+				Finalizers: []string{psmdbDeleteBackupFinalizer},
+				Labels: map[string]string{
+					backupsv1alpha1.OwningJobNameLabel:      job.Name,
+					backupsv1alpha1.OwningJobNamespaceLabel: job.Namespace,
+				},
+			},
+			Status: psmdbtypes.PerconaServerMongoDBBackupStatus{State: psmdbtypes.StateWaiting},
+		}
+		c := newMongoDBStrategyTestClient(t, job, strategy, app, cluster, cached)
+		return &BackupJobReconciler{Client: c, Interface: live, Scheme: c.Scheme(), Recorder: record.NewFakeRecorder(10)}, c, resolved, job
+	}
+	deleted := func(t *testing.T, c client.Client) bool {
+		got := &psmdbtypes.PerconaServerMongoDBBackup{}
+		err := c.Get(context.Background(), types.NamespacedName{Namespace: "tenant", Name: "op-waiting"}, got)
+		return err == nil && !got.DeletionTimestamp.IsZero()
+	}
+	failed := func(t *testing.T, c client.Client, name string) bool {
+		p := &backupsv1alpha1.BackupJob{}
+		if err := c.Get(context.Background(), types.NamespacedName{Namespace: "tenant", Name: name}, p); err != nil {
+			t.Fatalf("get job: %v", err)
+		}
+		return p.Status.Phase == backupsv1alpha1.BackupJobPhaseFailed
+	}
+
+	t.Run("live still not-started → cancel and fail", func(t *testing.T) {
+		live := newPsmdbBackupDynamicClient(psmdbBackupUnstructured("tenant", "op-waiting", psmdbtypes.StateWaiting))
+		r, c, resolved, job := setup(t, live)
+		if _, err := r.reconcileMongoDB(context.Background(), job.DeepCopy(), resolved); err != nil {
+			t.Fatalf("reconcileMongoDB: %v", err)
+		}
+		if !deleted(t, c) {
+			t.Errorf("a positively not-started backup past the deadline must be cancelled")
+		}
+		if !failed(t, c, job.Name) {
+			t.Errorf("the BackupJob must be Failed after cancelling a timed-out not-started backup")
+		}
+	})
+
+	// The delete is pinned to the resourceVersion the live read answered for: a
+	// CR written between that read and the delete is exactly what the live read
+	// exists to rule out, so it must not be deleted on the stale answer.
+	t.Run("live not-started but moved since the read → not deleted", func(t *testing.T) {
+		stale := psmdbBackupUnstructured("tenant", "op-waiting", psmdbtypes.StateWaiting)
+		stale.SetResourceVersion("998")
+		live := newPsmdbBackupDynamicClient(stale)
+		r, c, resolved, job := setup(t, live)
+		res, err := r.reconcileMongoDB(context.Background(), job.DeepCopy(), resolved)
+		if err != nil {
+			t.Fatalf("reconcileMongoDB: %v", err)
+		}
+		if res.RequeueAfter == 0 {
+			t.Fatalf("a CR that moved since the live read must be re-read on the next poll, got %+v", res)
+		}
+		if deleted(t, c) {
+			t.Errorf("a CR written after the live read must not be deleted on that read's answer")
+		}
+		if failed(t, c, job.Name) {
+			t.Errorf("the BackupJob must not fail while the CR's live state is unsettled")
+		}
+	})
+
+	// No dynamic client at all is an unanswerable read, not a not-started
+	// answer: the cancel must defer exactly as it does for a failed read.
+	t.Run("no live client → defer, never cancel", func(t *testing.T) {
+		r, c, resolved, job := setup(t, nil)
+		r.Interface = nil
+		res, err := r.reconcileMongoDB(context.Background(), job.DeepCopy(), resolved)
+		if err != nil {
+			t.Fatalf("reconcileMongoDB: %v", err)
+		}
+		if res.RequeueAfter == 0 {
+			t.Fatalf("an unanswerable live read must requeue, got %+v", res)
+		}
+		if deleted(t, c) {
+			t.Errorf("with no live client the CR must not be deleted blind")
+		}
+		if failed(t, c, job.Name) {
+			t.Errorf("with no live client the BackupJob must not fail inside the grace")
+		}
+		// An unanswerable read is a named, grace-bounded wait, not a silent poll:
+		// treating it as a not-started answer would leave the job requeueing
+		// with no condition and no way to ever fail.
+		p := &backupsv1alpha1.BackupJob{}
+		if err := c.Get(context.Background(), types.NamespacedName{Namespace: "tenant", Name: job.Name}, p); err != nil {
+			t.Fatalf("get job: %v", err)
+		}
+		if cond := apimeta.FindStatusCondition(p.Status.Conditions, "Ready"); cond == nil || cond.Reason != "PerconaServerMongoDBLiveStateUnknown" {
+			t.Errorf("the missing live client must be named on the job (Ready=False PerconaServerMongoDBLiveStateUnknown), got %+v", cond)
+		}
+	})
+
+	t.Run("live turned running → defer, never cancel", func(t *testing.T) {
+		live := newPsmdbBackupDynamicClient(psmdbBackupUnstructured("tenant", "op-waiting", psmdbtypes.StateRunning))
+		r, c, resolved, job := setup(t, live)
+		res, err := r.reconcileMongoDB(context.Background(), job.DeepCopy(), resolved)
+		if err != nil {
+			t.Fatalf("reconcileMongoDB: %v", err)
+		}
+		if res.RequeueAfter == 0 {
+			t.Fatalf("a live running state must requeue, got %+v", res)
+		}
+		if deleted(t, c) {
+			t.Errorf("a CR whose live state turned running must not be cancelled (partial archive)")
+		}
+		if failed(t, c, job.Name) {
+			t.Errorf("the BackupJob must not fail while the live backup is running")
+		}
+	})
+
+	t.Run("live completed ready → defer, archive protected", func(t *testing.T) {
+		live := newPsmdbBackupDynamicClient(psmdbBackupUnstructured("tenant", "op-waiting", psmdbtypes.StateReady))
+		r, c, resolved, job := setup(t, live)
+		if _, err := r.reconcileMongoDB(context.Background(), job.DeepCopy(), resolved); err != nil {
+			t.Fatalf("reconcileMongoDB: %v", err)
+		}
+		if deleted(t, c) {
+			t.Errorf("a just-completed (ready) CR must not be deleted — its delete-backup finalizer would prune the archive")
+		}
+	})
+
+	t.Run("live read cannot be answered → defer, never cancel", func(t *testing.T) {
+		// Empty dynamic store: the live Get returns NotFound (an error), which must
+		// not be read as a not-started answer.
+		live := newPsmdbBackupDynamicClient()
+		r, c, resolved, job := setup(t, live)
+		res, err := r.reconcileMongoDB(context.Background(), job.DeepCopy(), resolved)
+		if err != nil {
+			t.Fatalf("reconcileMongoDB: %v", err)
+		}
+		if res.RequeueAfter == 0 {
+			t.Fatalf("an unanswerable live read must requeue, got %+v", res)
+		}
+		if deleted(t, c) {
+			t.Errorf("an unanswerable live read must defer, not delete blind")
+		}
+		if failed(t, c, job.Name) {
+			t.Errorf("an unanswerable live read must not fail the BackupJob inside the grace")
+		}
+		p := &backupsv1alpha1.BackupJob{}
+		if err := c.Get(context.Background(), types.NamespacedName{Namespace: "tenant", Name: job.Name}, p); err != nil {
+			t.Fatalf("get job: %v", err)
+		}
+		if cond := apimeta.FindStatusCondition(p.Status.Conditions, "Ready"); cond == nil || cond.Reason != "PerconaServerMongoDBLiveStateUnknown" {
+			t.Errorf("the deferral must be named on the job (Ready=False PerconaServerMongoDBLiveStateUnknown), got %+v", cond)
+		}
+	})
+
+	// Deferring cannot be forever: once the grace past the deadline is spent the
+	// job fails, and the CR is still not deleted blind.
+	t.Run("live read still unanswerable past the grace → fail, CR left alone", func(t *testing.T) {
+		live := newPsmdbBackupDynamicClient()
+		r, c, resolved, job := setup(t, live)
+		job.Status.StartedAt = &metav1.Time{Time: time.Now().Add(-2*psmdbDefaultBackupDeadline - psmdbLiveReadGrace)}
+		if _, err := r.reconcileMongoDB(context.Background(), job.DeepCopy(), resolved); err != nil {
+			t.Fatalf("reconcileMongoDB: %v", err)
+		}
+		if deleted(t, c) {
+			t.Errorf("an unconfirmed CR must never be deleted blind, even when the job finally fails")
+		}
+		if !failed(t, c, job.Name) {
+			t.Errorf("an unreadable CR must not pin the BackupJob Running forever; expected Failed past the grace")
+		}
+	})
+
+	t.Run("live requested → fail but leave the CR (already dispatched to pbm)", func(t *testing.T) {
+		live := newPsmdbBackupDynamicClient(psmdbBackupUnstructured("tenant", "op-waiting", psmdbtypes.StateRequested))
+		r, c, resolved, job := setup(t, live)
+		if _, err := r.reconcileMongoDB(context.Background(), job.DeepCopy(), resolved); err != nil {
+			t.Fatalf("reconcileMongoDB: %v", err)
+		}
+		if deleted(t, c) {
+			t.Errorf("a requested CR was already handed to pbm; deleting it cannot recall the command and would orphan the dump")
+		}
+		if !failed(t, c, job.Name) {
+			t.Errorf("the BackupJob must still fail on the deadline for a requested-but-never-run backup")
+		}
+	})
+
+	// The legacy flow keeps its hands-off contract: the deadline fails the job
+	// and the operator CR — the tenant's — is left in place, exactly as before
+	// this driver existed. No live read is consulted.
+	t.Run("legacy waiting past deadline → fail, CR left alone", func(t *testing.T) {
+		job, strategy, app, cluster, resolved := mongodbInjectFixture(true)
+		app.Spec.Backup.UseSystemBucket = false
+		strategy.Spec.Template.S3 = nil
+		job.Status.StartedAt = &metav1.Time{Time: time.Now().Add(-2 * psmdbDefaultBackupDeadline)}
+		cluster.Spec.Backup.Storages = map[string]runtime.RawExtension{
+			"s3-storage": {Raw: []byte(`{"type":"s3","s3":{"bucket":"tenant-own","credentialsSecret":"mongodb-app1-s3-creds"}}`)},
+		}
+		cached := &psmdbtypes.PerconaServerMongoDBBackup{ // no delete-backup finalizer: legacy
+			ObjectMeta: metav1.ObjectMeta{
+				Namespace: "tenant", Name: "op-waiting",
+				Labels: map[string]string{
+					backupsv1alpha1.OwningJobNameLabel:      job.Name,
+					backupsv1alpha1.OwningJobNamespaceLabel: job.Namespace,
+				},
+			},
+			Status: psmdbtypes.PerconaServerMongoDBBackupStatus{State: psmdbtypes.StateWaiting},
+		}
+		c := newMongoDBStrategyTestClient(t, job, strategy, app, cluster, cached)
+		// No dynamic client at all: the legacy path must not need a live read.
+		r := &BackupJobReconciler{Client: c, Scheme: c.Scheme(), Recorder: record.NewFakeRecorder(10)}
+		if _, err := r.reconcileMongoDB(context.Background(), job.DeepCopy(), resolved); err != nil {
+			t.Fatalf("reconcileMongoDB: %v", err)
+		}
+		if !failed(t, c, job.Name) {
+			t.Errorf("a legacy backup that never started must fail on the deadline")
+		}
+		got := &psmdbtypes.PerconaServerMongoDBBackup{}
+		if err := c.Get(context.Background(), types.NamespacedName{Namespace: "tenant", Name: "op-waiting"}, got); err != nil || !got.DeletionTimestamp.IsZero() {
+			t.Errorf("the legacy operator CR must be left alone (hands-off), err=%v", err)
+		}
+	})
+}
+
+// PITR needs an oplog stream the useSystemBucket flow never captures, so a
+// recoveryTime restore of a backup taken on that flow (recorded by the snapshot
+// flag, not inferred from a Secret name) must fail with a named error rather
+// than hand the operator a target it cannot serve. The refusal fires before the
+// target cluster read, so no target need exist.
+func TestReconcileMongoDBRestore_RefusesPITROnSystemBucketBackup(t *testing.T) {
+	apps := mongodbapp.GroupName
+	snap := &psmdbtypes.PerconaServerMongoDBBackup{
+		Status: psmdbtypes.PerconaServerMongoDBBackupStatus{
+			Destination: "s3://cozy-backups/tenant/app1/2026",
+			S3:          &psmdbtypes.BackupStorageS3{Bucket: "cozy-backups", CredentialsSecret: psmdbDefaultCredentialsSecret},
+		},
+	}
+	raw, err := marshalMongoDBBackupSnapshot(snap, &strategyv1alpha1.MongoDBTemplate{Type: "logical"}, "s3-storage", nil, true)
+	if err != nil {
+		t.Fatalf("marshal snapshot: %v", err)
+	}
+	backup := &backupsv1alpha1.Backup{
+		ObjectMeta: metav1.ObjectMeta{Namespace: "tenant", Name: "src-backup"},
+		Spec: backupsv1alpha1.BackupSpec{
+			ApplicationRef: corev1.TypedLocalObjectReference{Kind: "MongoDB", Name: "app1", APIGroup: &apps},
+		},
+		Status: backupsv1alpha1.BackupStatus{UnderlyingResources: raw},
+	}
+	restoreJob := newMongoDBRestoreJob("rj-pitr", "tenant")
+	restoreJob.Status.StartedAt = &metav1.Time{Time: time.Now()}
+	restoreJob.Status.Phase = backupsv1alpha1.RestoreJobPhaseRunning
+	restoreJob.Spec.Options = &runtime.RawExtension{Raw: []byte(`{"recoveryTime":"2026-08-05T12:34:56Z"}`)}
+
+	c := newMongoDBStrategyTestClient(t, backup, restoreJob)
+	r := &RestoreJobReconciler{Client: c, Scheme: c.Scheme(), Recorder: record.NewFakeRecorder(10)}
+
+	if _, err := r.reconcileMongoDBRestore(context.Background(), restoreJob.DeepCopy(), backup); err != nil {
+		t.Fatalf("reconcileMongoDBRestore: %v", err)
+	}
+	persisted := &backupsv1alpha1.RestoreJob{}
+	if err := c.Get(context.Background(), types.NamespacedName{Namespace: "tenant", Name: "rj-pitr"}, persisted); err != nil {
+		t.Fatalf("get restore job: %v", err)
+	}
+	if persisted.Status.Phase != backupsv1alpha1.RestoreJobPhaseFailed {
+		t.Fatalf("expected the RestoreJob to fail on a PITR request over a system-bucket backup, got phase=%q", persisted.Status.Phase)
+	}
+	cond := apimeta.FindStatusCondition(persisted.Status.Conditions, "Ready")
+	if cond == nil || !strings.Contains(cond.Message, "point-in-time recovery is not available") {
+		t.Errorf("expected a Ready condition explaining PITR is unavailable, got %+v", cond)
+	}
+}
+
+// The refusal keys on the snapshot flow flag, not on the credentialsSecret name:
+// a legacy (non-system-bucket) backup that happens to resolve to cozy-backups-creds
+// must NOT have its recoveryTime restore refused. Keeps the check honest — the
+// Secret name is a proxy a BackupClass can defeat either way.
+func TestReconcileMongoDBRestore_PITRAllowedForNonSystemBucketBackup(t *testing.T) {
+	apps := mongodbapp.GroupName
+	snap := &psmdbtypes.PerconaServerMongoDBBackup{
+		Status: psmdbtypes.PerconaServerMongoDBBackupStatus{
+			Destination: "s3://tenant-own/tenant/app1/2026",
+			S3:          &psmdbtypes.BackupStorageS3{Bucket: "tenant-own", CredentialsSecret: psmdbDefaultCredentialsSecret},
+		},
+	}
+	// useSystemBucket=false recorded on the snapshot despite the cozy-backups-creds name.
+	raw, err := marshalMongoDBBackupSnapshot(snap, &strategyv1alpha1.MongoDBTemplate{Type: "logical"}, "s3-storage", nil, false)
+	if err != nil {
+		t.Fatalf("marshal snapshot: %v", err)
+	}
+	backup := &backupsv1alpha1.Backup{
+		ObjectMeta: metav1.ObjectMeta{Namespace: "tenant", Name: "src-backup"},
+		Spec: backupsv1alpha1.BackupSpec{
+			ApplicationRef: corev1.TypedLocalObjectReference{Kind: "MongoDB", Name: "app1", APIGroup: &apps},
+		},
+		Status: backupsv1alpha1.BackupStatus{UnderlyingResources: raw},
+	}
+	restoreJob := newMongoDBRestoreJob("rj-pitr-legacy", "tenant")
+	restoreJob.Status.StartedAt = &metav1.Time{Time: time.Now()}
+	restoreJob.Status.Phase = backupsv1alpha1.RestoreJobPhaseRunning
+	restoreJob.Spec.Options = &runtime.RawExtension{Raw: []byte(`{"recoveryTime":"2026-08-05T12:34:56Z"}`)}
+
+	c := newMongoDBStrategyTestClient(t, backup, restoreJob)
+	r := &RestoreJobReconciler{Client: c, Scheme: c.Scheme(), Recorder: record.NewFakeRecorder(10)}
+
+	// No target cluster exists, so the reconcile requeues on the target read — it
+	// must get past the PITR refusal to reach it. A PITR-refusal failure here would
+	// mean the check still keyed on the Secret name.
+	if _, err := r.reconcileMongoDBRestore(context.Background(), restoreJob.DeepCopy(), backup); err != nil {
+		t.Fatalf("reconcileMongoDBRestore: %v", err)
+	}
+	persisted := &backupsv1alpha1.RestoreJob{}
+	if err := c.Get(context.Background(), types.NamespacedName{Namespace: "tenant", Name: "rj-pitr-legacy"}, persisted); err != nil {
+		t.Fatalf("get restore job: %v", err)
+	}
+	if persisted.Status.Phase == backupsv1alpha1.RestoreJobPhaseFailed {
+		cond := apimeta.FindStatusCondition(persisted.Status.Conditions, "Ready")
+		if cond != nil && strings.Contains(cond.Message, "point-in-time recovery is not available") {
+			t.Errorf("PITR must not be refused for a non-system-bucket backup (keyed on Secret name, not the flow): %+v", cond)
+		}
+	}
+}
+
+// A recoveryTime restore must know which flow the backup was taken on; a
+// snapshot that fails to decode leaves that unknown, and the refusal must fail
+// closed rather than hand the operator a point-in-time target it may not serve.
+// The live operator CR is present so source resolution succeeds on the live path
+// (which never consults the snapshot) — exactly the case that reaches this guard.
+func TestReconcileMongoDBRestore_PITRRefusedWhenSnapshotUndecodable(t *testing.T) {
+	apps := mongodbapp.GroupName
+	live := &psmdbtypes.PerconaServerMongoDBBackup{
+		ObjectMeta: metav1.ObjectMeta{Namespace: "tenant", Name: "op-backup"},
+		Status: psmdbtypes.PerconaServerMongoDBBackupStatus{
+			State:       psmdbtypes.StateReady,
+			Destination: "s3://cozy-backups/tenant/app1/2026",
+			S3:          &psmdbtypes.BackupStorageS3{Bucket: "cozy-backups", CredentialsSecret: psmdbDefaultCredentialsSecret},
+		},
+	}
+	backup := &backupsv1alpha1.Backup{
+		ObjectMeta: metav1.ObjectMeta{Namespace: "tenant", Name: "src-backup"},
+		Spec: backupsv1alpha1.BackupSpec{
+			ApplicationRef: corev1.TypedLocalObjectReference{Kind: "MongoDB", Name: "app1", APIGroup: &apps},
+			DriverMetadata: map[string]string{psmdbBackupNameKey: "op-backup"},
+		},
+		// Valid JSON, wrong shape: the flag field is not a bool, so the typed decode fails.
+		Status: backupsv1alpha1.BackupStatus{UnderlyingResources: &runtime.RawExtension{Raw: []byte(`{"kind":"MongoDBBackupSnapshot","useSystemBucket":"not-a-bool"}`)}},
+	}
+	restoreJob := newMongoDBRestoreJob("rj-pitr-bad", "tenant")
+	restoreJob.Status.StartedAt = &metav1.Time{Time: time.Now()}
+	restoreJob.Status.Phase = backupsv1alpha1.RestoreJobPhaseRunning
+	restoreJob.Spec.Options = &runtime.RawExtension{Raw: []byte(`{"recoveryTime":"2026-08-05T12:34:56Z"}`)}
+
+	c := newMongoDBStrategyTestClient(t, backup, restoreJob, live)
+	r := &RestoreJobReconciler{Client: c, Scheme: c.Scheme(), Recorder: record.NewFakeRecorder(10)}
+
+	if _, err := r.reconcileMongoDBRestore(context.Background(), restoreJob.DeepCopy(), backup); err != nil {
+		t.Fatalf("reconcileMongoDBRestore: %v", err)
+	}
+	persisted := &backupsv1alpha1.RestoreJob{}
+	if err := c.Get(context.Background(), types.NamespacedName{Namespace: "tenant", Name: "rj-pitr-bad"}, persisted); err != nil {
+		t.Fatalf("get restore job: %v", err)
+	}
+	if persisted.Status.Phase != backupsv1alpha1.RestoreJobPhaseFailed {
+		t.Fatalf("a PITR request over an undecodable snapshot must fail closed, got phase=%q", persisted.Status.Phase)
+	}
+	cond := apimeta.FindStatusCondition(persisted.Status.Conditions, "Ready")
+	if cond == nil || !strings.Contains(cond.Message, "cannot be decoded") {
+		t.Errorf("expected a Ready condition naming the undecodable snapshot, got %+v", cond)
+	}
+}
+
+// After an app opts into useSystemBucket the chart prunes its legacy
+// <release>-s3-creds, and its live storage moves to the platform bucket, so a
+// restore of an older legacy backup finds no same-bucket credential to adopt
+// and keeps the source's — now deleted — Secret. It must fail with a legible,
+// named reason before the operator sees a reference to a Secret that is gone.
+func TestReconcileMongoDBRestore_FailsNamedWhenCredentialsSecretMissing(t *testing.T) {
+	apps := mongodbapp.GroupName
+	snap := &psmdbtypes.PerconaServerMongoDBBackup{
+		Status: psmdbtypes.PerconaServerMongoDBBackupStatus{
+			Destination: "s3://tenant-own/tenant/app1/2026",
+			S3:          &psmdbtypes.BackupStorageS3{Bucket: "tenant-own", CredentialsSecret: "mongodb-app1-s3-creds"},
+		},
+	}
+	raw, err := marshalMongoDBBackupSnapshot(snap, &strategyv1alpha1.MongoDBTemplate{Type: "logical"}, "s3-storage", nil, false)
+	if err != nil {
+		t.Fatalf("marshal snapshot: %v", err)
+	}
+	newBackup := func() *backupsv1alpha1.Backup {
+		return &backupsv1alpha1.Backup{
+			ObjectMeta: metav1.ObjectMeta{Namespace: "tenant", Name: "src-backup"},
+			Spec: backupsv1alpha1.BackupSpec{
+				ApplicationRef: corev1.TypedLocalObjectReference{Kind: "MongoDB", Name: "app1", APIGroup: &apps},
+			},
+			Status: backupsv1alpha1.BackupStatus{UnderlyingResources: raw},
+		}
+	}
+	// The same app, now on the system bucket: its only storage is on cozy-backups,
+	// so nothing on tenant-own is adoptable.
+	newTarget := func() *psmdbtypes.PerconaServerMongoDB {
+		return &psmdbtypes.PerconaServerMongoDB{
+			ObjectMeta: metav1.ObjectMeta{Namespace: "tenant", Name: mongodbNameForApp("app1")},
+			Spec: psmdbtypes.PerconaServerMongoDBSpec{Backup: psmdbtypes.PerconaServerMongoDBBackupConfig{
+				Enabled:  true,
+				Storages: map[string]runtime.RawExtension{"s3-storage": {Raw: []byte(`{"type":"s3","s3":{"bucket":"cozy-backups","endpointUrl":"https://s3.example","region":"","prefix":"tenant/app1","credentialsSecret":"cozy-backups-creds","insecureSkipTLSVerify":false}}`)}},
+			}},
+		}
+	}
+	newRJ := func(name string) *backupsv1alpha1.RestoreJob {
+		rj := newMongoDBRestoreJob(name, "tenant")
+		rj.Status.StartedAt = &metav1.Time{Time: time.Now()}
+		rj.Status.Phase = backupsv1alpha1.RestoreJobPhaseRunning
+		return rj
+	}
+
+	getRJ := func(t *testing.T, c client.Client, name string) *backupsv1alpha1.RestoreJob {
+		p := &backupsv1alpha1.RestoreJob{}
+		if err := c.Get(context.Background(), types.NamespacedName{Namespace: "tenant", Name: name}, p); err != nil {
+			t.Fatalf("get restore job: %v", err)
+		}
+		return p
+	}
+
+	// Like the sibling preconditions (target absent, backups disabled) the check
+	// waits until the restore deadline — the Secret can be re-created — naming
+	// the reason on the job, and only then fails.
+	t.Run("missing Secret waits with a named reason", func(t *testing.T) {
+		backup, rj := newBackup(), newRJ("rj-nocred")
+		c := newMongoDBStrategyTestClient(t, backup, rj, newTarget())
+		r := &RestoreJobReconciler{Client: c, Scheme: c.Scheme(), Recorder: record.NewFakeRecorder(10)}
+		res, err := r.reconcileMongoDBRestore(context.Background(), rj.DeepCopy(), backup)
+		if err != nil {
+			t.Fatalf("reconcileMongoDBRestore: %v", err)
+		}
+		if res.RequeueAfter == 0 {
+			t.Fatalf("a missing Secret within the deadline must requeue, got %+v", res)
+		}
+		p := getRJ(t, c, "rj-nocred")
+		if p.Status.Phase == backupsv1alpha1.RestoreJobPhaseFailed {
+			t.Errorf("must not fail before the restore deadline")
+		}
+		cond := apimeta.FindStatusCondition(p.Status.Conditions, "Ready")
+		if cond == nil || cond.Reason != "RestoreCredentialsMissing" || !strings.Contains(cond.Message, "mongodb-app1-s3-creds") {
+			t.Errorf("expected Ready=False RestoreCredentialsMissing naming the Secret, got %+v", cond)
+		}
+	})
+
+	t.Run("missing Secret past the deadline fails with the named reason", func(t *testing.T) {
+		backup, rj := newBackup(), newRJ("rj-nocred-late")
+		rj.Status.StartedAt = &metav1.Time{Time: time.Now().Add(-2 * psmdbDefaultRestoreDeadline)}
+		c := newMongoDBStrategyTestClient(t, backup, rj, newTarget())
+		r := &RestoreJobReconciler{Client: c, Scheme: c.Scheme(), Recorder: record.NewFakeRecorder(10)}
+		if _, err := r.reconcileMongoDBRestore(context.Background(), rj.DeepCopy(), backup); err != nil {
+			t.Fatalf("reconcileMongoDBRestore: %v", err)
+		}
+		p := getRJ(t, c, "rj-nocred-late")
+		if p.Status.Phase != backupsv1alpha1.RestoreJobPhaseFailed {
+			t.Fatalf("expected Failed past the deadline, got phase=%q", p.Status.Phase)
+		}
+		if cond := apimeta.FindStatusCondition(p.Status.Conditions, "Ready"); cond == nil || cond.Reason != "RestoreCredentialsMissing" {
+			t.Errorf("expected RestoreCredentialsMissing, got %+v", cond)
+		}
+	})
+
+	// Once the operator restore exists the reference has been handed over; a
+	// Secret pruned mid-replay must not mark a restore still in progress Failed.
+	t.Run("an existing operator restore skips the check", func(t *testing.T) {
+		backup, rj := newBackup(), newRJ("rj-replaying")
+		inflight := &psmdbtypes.PerconaServerMongoDBRestore{
+			ObjectMeta: metav1.ObjectMeta{
+				Namespace: "tenant", Name: "rj-replaying-abc",
+				Labels: map[string]string{
+					backupsv1alpha1.OwningJobNameLabel:      rj.Name,
+					backupsv1alpha1.OwningJobNamespaceLabel: rj.Namespace,
+				},
+			},
+			Status: psmdbtypes.PerconaServerMongoDBRestoreStatus{State: psmdbtypes.StateRunning},
+		}
+		c := newMongoDBStrategyTestClient(t, backup, rj, newTarget(), inflight)
+		r := &RestoreJobReconciler{Client: c, Scheme: c.Scheme(), Recorder: record.NewFakeRecorder(10)}
+		if _, err := r.reconcileMongoDBRestore(context.Background(), rj.DeepCopy(), backup); err != nil {
+			t.Fatalf("reconcileMongoDBRestore: %v", err)
+		}
+		p := getRJ(t, c, "rj-replaying")
+		if cond := apimeta.FindStatusCondition(p.Status.Conditions, "Ready"); cond != nil && cond.Reason == "RestoreCredentialsMissing" {
+			t.Errorf("a restore already replaying must not be reported as missing credentials: %+v", cond)
+		}
+		if p.Status.Phase == backupsv1alpha1.RestoreJobPhaseFailed {
+			t.Errorf("a restore already replaying must not be failed by the pre-check")
+		}
+	})
+
+	t.Run("present Secret lets the restore proceed", func(t *testing.T) {
+		backup, rj := newBackup(), newRJ("rj-cred-ok")
+		secret := &corev1.Secret{ObjectMeta: metav1.ObjectMeta{Namespace: "tenant", Name: "mongodb-app1-s3-creds"}}
+		c := newMongoDBStrategyTestClient(t, backup, rj, newTarget(), secret)
+		r := &RestoreJobReconciler{Client: c, Scheme: c.Scheme(), Recorder: record.NewFakeRecorder(10)}
+		if _, err := r.reconcileMongoDBRestore(context.Background(), rj.DeepCopy(), backup); err != nil {
+			t.Fatalf("reconcileMongoDBRestore: %v", err)
+		}
+		persisted := &backupsv1alpha1.RestoreJob{}
+		if err := c.Get(context.Background(), types.NamespacedName{Namespace: "tenant", Name: "rj-cred-ok"}, persisted); err != nil {
+			t.Fatalf("get restore job: %v", err)
+		}
+		if cond := apimeta.FindStatusCondition(persisted.Status.Conditions, "Ready"); cond != nil && cond.Reason == "RestoreCredentialsMissing" {
+			t.Errorf("an existing credentialsSecret must not be reported missing: %+v", cond)
+		}
+	})
+}
+
+// Opting out (useSystemBucket true→false) stops the injection but leaves the
+// driver's storage on the live cluster until the chart re-renders. A BackupJob
+// in that window must not mint a CR — it would carry no delete-backup finalizer
+// and write an object nothing owns into the platform bucket. The wait is named
+// and deadline-bounded like the others.
+func TestReconcileMongoDB_OptOutRefusesStalePlatformStorage(t *testing.T) {
+	setup := func(t *testing.T, startedAt time.Time) (*BackupJobReconciler, client.Client, *ResolvedBackupConfig, *backupsv1alpha1.BackupJob) {
+		job, strategy, app, cluster, resolved := mongodbInjectFixture(true)
+		app.Spec.Backup.UseSystemBucket = false // opted back out; the strategy still names cozy-backups
+		job.Status.StartedAt = &metav1.Time{Time: startedAt}
+		// Live cluster still carries the entry the driver injected.
+		cluster.Spec.Backup.Storages = map[string]runtime.RawExtension{
+			"s3-storage": {Raw: []byte(`{"type":"s3","s3":{"bucket":"cozy-backups","endpointUrl":"https://s3.example","region":"","prefix":"tenant/app1","credentialsSecret":"cozy-backups-creds","insecureSkipTLSVerify":false}}`)},
+		}
+		c := newMongoDBStrategyTestClient(t, job, strategy, app, cluster)
+		return &BackupJobReconciler{Client: c, Scheme: c.Scheme(), Recorder: record.NewFakeRecorder(10)}, c, resolved, job
+	}
+	countCRs := func(t *testing.T, c client.Client) int {
+		list := &psmdbtypes.PerconaServerMongoDBBackupList{}
+		if err := c.List(context.Background(), list, client.InNamespace("tenant")); err != nil {
+			t.Fatalf("list: %v", err)
+		}
+		return len(list.Items)
+	}
+
+	t.Run("within the deadline: no mint, named wait", func(t *testing.T) {
+		r, c, resolved, job := setup(t, time.Now())
+		res, err := r.reconcileMongoDB(context.Background(), job.DeepCopy(), resolved)
+		if err != nil {
+			t.Fatalf("reconcileMongoDB: %v", err)
+		}
+		if res.RequeueAfter == 0 {
+			t.Fatalf("expected a waiting requeue while the platform storage lingers, got %+v", res)
+		}
+		if n := countCRs(t, c); n != 0 {
+			t.Errorf("no operator Backup must be minted onto the platform bucket with useSystemBucket=false, got %d", n)
+		}
+		persisted := &backupsv1alpha1.BackupJob{}
+		if err := c.Get(context.Background(), types.NamespacedName{Namespace: "tenant", Name: job.Name}, persisted); err != nil {
+			t.Fatalf("get job: %v", err)
+		}
+		cond := apimeta.FindStatusCondition(persisted.Status.Conditions, "Ready")
+		if cond == nil || cond.Reason != "PerconaServerMongoDBStorageStale" {
+			t.Errorf("expected Ready=False PerconaServerMongoDBStorageStale, got %+v", cond)
+		}
+	})
+
+	t.Run("past the deadline: fails, still no mint", func(t *testing.T) {
+		r, c, resolved, job := setup(t, time.Now().Add(-2*psmdbDefaultBackupDeadline))
+		if _, err := r.reconcileMongoDB(context.Background(), job.DeepCopy(), resolved); err != nil {
+			t.Fatalf("reconcileMongoDB: %v", err)
+		}
+		if n := countCRs(t, c); n != 0 {
+			t.Errorf("no operator Backup must be minted on the deadline failure either, got %d", n)
+		}
+		persisted := &backupsv1alpha1.BackupJob{}
+		if err := c.Get(context.Background(), types.NamespacedName{Namespace: "tenant", Name: job.Name}, persisted); err != nil {
+			t.Fatalf("get job: %v", err)
+		}
+		if persisted.Status.Phase != backupsv1alpha1.BackupJobPhaseFailed {
+			t.Errorf("expected the BackupJob to fail once the stale storage outlives the deadline, got phase=%q", persisted.Status.Phase)
+		}
+	})
+
+	// A CR minted while the flag was true carries the delete-backup finalizer and
+	// is still streaming into the platform bucket; flipping the flag must not
+	// route later polls into the refusal and fail it at the deadline.
+	t.Run("a dump already in flight is not pre-empted by the refusal", func(t *testing.T) {
+		r, c, resolved, job := setup(t, time.Now().Add(-2*psmdbDefaultBackupDeadline))
+		running := &psmdbtypes.PerconaServerMongoDBBackup{
+			ObjectMeta: metav1.ObjectMeta{
+				Namespace: "tenant", Name: "op-inflight",
+				Finalizers: []string{psmdbDeleteBackupFinalizer},
+				Labels: map[string]string{
+					backupsv1alpha1.OwningJobNameLabel:      job.Name,
+					backupsv1alpha1.OwningJobNamespaceLabel: job.Namespace,
+				},
+			},
+			Status: psmdbtypes.PerconaServerMongoDBBackupStatus{State: psmdbtypes.StateRunning},
+		}
+		if err := c.Create(context.Background(), running); err != nil {
+			t.Fatalf("seed in-flight CR: %v", err)
+		}
+		res, err := r.reconcileMongoDB(context.Background(), job.DeepCopy(), resolved)
+		if err != nil {
+			t.Fatalf("reconcileMongoDB: %v", err)
+		}
+		if res.RequeueAfter == 0 {
+			t.Fatalf("an in-flight system-bucket dump must keep polling, got %+v", res)
+		}
+		persisted := &backupsv1alpha1.BackupJob{}
+		if err := c.Get(context.Background(), types.NamespacedName{Namespace: "tenant", Name: job.Name}, persisted); err != nil {
+			t.Fatalf("get job: %v", err)
+		}
+		if persisted.Status.Phase == backupsv1alpha1.BackupJobPhaseFailed {
+			t.Errorf("the opt-out refusal must not fail a dump already streaming (flow comes from the CR's finalizer)")
+		}
+		cond := apimeta.FindStatusCondition(persisted.Status.Conditions, "Ready")
+		if cond == nil || cond.Reason != "PerconaServerMongoDBBackupRunning" {
+			t.Errorf("expected the running wait, not the stale-storage refusal, got %+v", cond)
+		}
+		got := &psmdbtypes.PerconaServerMongoDBBackup{}
+		if err := c.Get(context.Background(), types.NamespacedName{Namespace: "tenant", Name: "op-inflight"}, got); err != nil || !got.DeletionTimestamp.IsZero() {
+			t.Errorf("the in-flight CR must be left alone, err=%v deleted=%v", err, err == nil && !got.DeletionTimestamp.IsZero())
+		}
+	})
+
+	// The injected entry is identified by its credentialsSecret, not by bucket
+	// name: a legacy tenant whose own bucket happens to carry the platform's name
+	// (external S3, admin-chosen name) must not be refused.
+	t.Run("a legacy storage on a same-named bucket with its own Secret is not refused", func(t *testing.T) {
+		job, strategy, app, cluster, resolved := mongodbInjectFixture(true)
+		app.Spec.Backup.UseSystemBucket = false
+		job.Status.StartedAt = &metav1.Time{Time: time.Now()}
+		cluster.Spec.Backup.Storages = map[string]runtime.RawExtension{
+			"s3-storage": {Raw: []byte(`{"type":"s3","s3":{"bucket":"cozy-backups","credentialsSecret":"mongodb-app1-s3-creds"}}`)},
+		}
+		c := newMongoDBStrategyTestClient(t, job, strategy, app, cluster)
+		r := &BackupJobReconciler{Client: c, Scheme: c.Scheme(), Recorder: record.NewFakeRecorder(10)}
+		if _, err := r.reconcileMongoDB(context.Background(), job.DeepCopy(), resolved); err != nil {
+			t.Fatalf("reconcileMongoDB: %v", err)
+		}
+		if n := countCRs(t, c); n != 1 {
+			t.Errorf("a legacy storage with the tenant's own Secret must mint normally, got %d CRs", n)
+		}
+	})
+}
+
+// A running dump polls through requeueMongoDBBackupWaiting for hours; the
+// condition it writes is stable, so only the first reconcile may write status.
+// Counts status updates on the BackupJob across two reconciles of the same
+// fixture and requires exactly one.
+func TestRequeueMongoDBBackupWaiting_WritesStatusOnlyOnChange(t *testing.T) {
+	job, strategy, app, cluster, resolved := mongodbInjectFixture(true)
+	job.Status.StartedAt = &metav1.Time{Time: time.Now().Add(-4 * psmdbDefaultBackupDeadline)}
+	cluster.Spec.Backup.Storages = map[string]runtime.RawExtension{
+		"s3-storage": {Raw: []byte(`{"type":"s3","s3":{"bucket":"cozy-backups","endpointUrl":"https://s3.example","region":"","prefix":"tenant/app1","credentialsSecret":"cozy-backups-creds","insecureSkipTLSVerify":false}}`)},
+	}
+	running := &psmdbtypes.PerconaServerMongoDBBackup{
+		ObjectMeta: metav1.ObjectMeta{
+			Namespace: "tenant", Name: "op-running",
+			Finalizers: []string{psmdbDeleteBackupFinalizer},
+			Labels: map[string]string{
+				backupsv1alpha1.OwningJobNameLabel:      job.Name,
+				backupsv1alpha1.OwningJobNamespaceLabel: job.Namespace,
+			},
+		},
+		Status: psmdbtypes.PerconaServerMongoDBBackupStatus{State: psmdbtypes.StateRunning},
+	}
+	sch := runtime.NewScheme()
+	_ = scheme.AddToScheme(sch)
+	_ = backupsv1alpha1.AddToScheme(sch)
+	_ = strategyv1alpha1.AddToScheme(sch)
+	_ = psmdbtypes.AddToScheme(sch)
+	_ = mongodbapp.AddToScheme(sch)
+	statusWrites := 0
+	c := clientfake.NewClientBuilder().
+		WithScheme(sch).
+		WithObjects(job, strategy, app, cluster, running).
+		WithStatusSubresource(&backupsv1alpha1.BackupJob{}).
+		WithInterceptorFuncs(interceptor.Funcs{
+			SubResourceUpdate: func(ctx context.Context, cl client.Client, sub string, obj client.Object, opts ...client.SubResourceUpdateOption) error {
+				if _, ok := obj.(*backupsv1alpha1.BackupJob); ok && sub == "status" {
+					statusWrites++
+				}
+				return cl.SubResource(sub).Update(ctx, obj, opts...)
+			},
+		}).
+		Build()
+	r := &BackupJobReconciler{Client: c, Scheme: sch, Recorder: record.NewFakeRecorder(10)}
+
+	for pass := 1; pass <= 2; pass++ {
+		fresh := &backupsv1alpha1.BackupJob{}
+		if err := c.Get(context.Background(), types.NamespacedName{Namespace: "tenant", Name: job.Name}, fresh); err != nil {
+			t.Fatalf("get job: %v", err)
+		}
+		if _, err := r.reconcileMongoDB(context.Background(), fresh, resolved); err != nil {
+			t.Fatalf("reconcileMongoDB pass %d: %v", pass, err)
+		}
+	}
+	// Pass 1 also flips Phase to Running (one write) and writes the condition;
+	// pass 2 must add nothing.
+	if statusWrites < 1 {
+		t.Fatalf("expected the first reconcile to write status, got %d writes", statusWrites)
+	}
+	first := statusWrites
+	fresh := &backupsv1alpha1.BackupJob{}
+	if err := c.Get(context.Background(), types.NamespacedName{Namespace: "tenant", Name: job.Name}, fresh); err != nil {
+		t.Fatalf("get job: %v", err)
+	}
+	if _, err := r.reconcileMongoDB(context.Background(), fresh, resolved); err != nil {
+		t.Fatalf("reconcileMongoDB pass 3: %v", err)
+	}
+	if statusWrites != first {
+		t.Errorf("an unchanged running wait must not write status again: %d writes before, %d after", first, statusWrites)
+	}
+}
+
+// The flow a backup ran on is fixed at mint time by its CR's finalizer, and the
+// artifact must record that — not the app flag re-read on the completing
+// reconcile. Flip the flag to false while the system-bucket dump completes: the
+// snapshot must still say useSystemBucket, or the PITR refusal and the S3
+// backfill both switch off for an archive that lives in cozy-backups.
+func TestReconcileMongoDB_ArtifactRecordsTheCRsFlowNotTheFlag(t *testing.T) {
+	job, strategy, app, cluster, resolved := mongodbInjectFixture(true)
+	app.Spec.Backup.UseSystemBucket = false // flipped after the mint
+	job.Status.StartedAt = &metav1.Time{Time: time.Now()}
+	cluster.Spec.Backup.Storages = map[string]runtime.RawExtension{
+		"s3-storage": {Raw: []byte(`{"type":"s3","s3":{"bucket":"cozy-backups","endpointUrl":"https://s3.example","region":"","prefix":"tenant/app1","credentialsSecret":"cozy-backups-creds","insecureSkipTLSVerify":false}}`)},
+	}
+	ready := &psmdbtypes.PerconaServerMongoDBBackup{
+		ObjectMeta: metav1.ObjectMeta{
+			Namespace: "tenant", Name: "op-ready",
+			Finalizers: []string{psmdbDeleteBackupFinalizer}, // minted on the system-bucket flow
+			Labels: map[string]string{
+				backupsv1alpha1.OwningJobNameLabel:      job.Name,
+				backupsv1alpha1.OwningJobNamespaceLabel: job.Namespace,
+			},
+		},
+		Status: psmdbtypes.PerconaServerMongoDBBackupStatus{
+			State:       psmdbtypes.StateReady,
+			Destination: "s3://cozy-backups/tenant/app1/2026-09-20",
+			S3:          &psmdbtypes.BackupStorageS3{Bucket: "cozy-backups", CredentialsSecret: psmdbDefaultCredentialsSecret},
+		},
+	}
+	c := newMongoDBStrategyTestClient(t, job, strategy, app, cluster, ready)
+	r := &BackupJobReconciler{Client: c, Scheme: c.Scheme(), Recorder: record.NewFakeRecorder(10)}
+	if _, err := r.reconcileMongoDB(context.Background(), job.DeepCopy(), resolved); err != nil {
+		t.Fatalf("reconcileMongoDB: %v", err)
+	}
+	persisted := &backupsv1alpha1.BackupJob{}
+	if err := c.Get(context.Background(), types.NamespacedName{Namespace: "tenant", Name: job.Name}, persisted); err != nil {
+		t.Fatalf("get job: %v", err)
+	}
+	if persisted.Status.BackupRef == nil {
+		t.Fatalf("expected a Backup artifact, got phase=%q conditions=%+v", persisted.Status.Phase, persisted.Status.Conditions)
+	}
+	artifact := &backupsv1alpha1.Backup{}
+	if err := c.Get(context.Background(), types.NamespacedName{Namespace: "tenant", Name: persisted.Status.BackupRef.Name}, artifact); err != nil {
+		t.Fatalf("get artifact: %v", err)
+	}
+	snap, err := unmarshalMongoDBBackupSnapshot(artifact.Status.UnderlyingResources)
+	if err != nil || snap == nil {
+		t.Fatalf("snapshot: %v (%+v)", err, snap)
+	}
+	if !snap.UseSystemBucket {
+		t.Errorf("the snapshot must record the flow the CR ran on (useSystemBucket), not the app flag re-read at completion")
+	}
+}
+
+// On useSystemBucket the chart refuses backup.enabled=false, so a missing storage
+// means the strategy carried nothing to inject; the wait must say that rather
+// than send the tenant to a value they already have set.
+func TestReconcileMongoDB_StrategyWithoutS3NamesTheCause(t *testing.T) {
+	cases := []struct {
+		name     string
+		storages map[string]runtime.RawExtension
+	}{
+		{"no storage on the cluster", nil},
+		// The cluster still holds a legacy entry pointing at the tenant's own
+		// bucket. Nothing was injected, so a CR minted here would carry the prune
+		// finalizer against that bucket, and deleting the Backup would delete the
+		// tenant's archive. The refusal must not depend on the storage being absent.
+		{"legacy tenant-bucket storage still on the cluster", map[string]runtime.RawExtension{
+			"s3-storage": {Raw: []byte(`{"type":"s3","s3":{"bucket":"tenant-private-bucket","credentialsSecret":"mongodb-app1-s3-creds"}}`)},
+		}},
+	}
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			job, strategy, app, cluster, resolved := mongodbInjectFixture(true)
+			strategy.Spec.Template.S3 = nil
+			job.Status.StartedAt = &metav1.Time{Time: time.Now()}
+			cluster.Spec.Backup.Storages = tc.storages
+			c := newMongoDBStrategyTestClient(t, job, strategy, app, cluster)
+			r := &BackupJobReconciler{Client: c, Scheme: c.Scheme(), Recorder: record.NewFakeRecorder(10)}
+			if _, err := r.reconcileMongoDB(context.Background(), job.DeepCopy(), resolved); err != nil {
+				t.Fatalf("reconcileMongoDB: %v", err)
+			}
+			list := &psmdbtypes.PerconaServerMongoDBBackupList{}
+			if err := c.List(context.Background(), list, client.InNamespace("tenant")); err != nil {
+				t.Fatalf("list: %v", err)
+			}
+			if len(list.Items) != 0 {
+				t.Errorf("no operator Backup may be minted without s3 coordinates to own, got %d (finalizers=%v)", len(list.Items), list.Items[0].Finalizers)
+			}
+			persisted := &backupsv1alpha1.BackupJob{}
+			if err := c.Get(context.Background(), types.NamespacedName{Namespace: "tenant", Name: job.Name}, persisted); err != nil {
+				t.Fatalf("get job: %v", err)
+			}
+			cond := apimeta.FindStatusCondition(persisted.Status.Conditions, "Ready")
+			if cond == nil || cond.Reason != "MongoDBStrategyHasNoS3" || !strings.Contains(cond.Message, "no s3 coordinates") {
+				t.Errorf("expected Ready=False MongoDBStrategyHasNoS3 naming the missing coordinates, got %+v", cond)
+			}
+		})
+	}
+}
+
+// The app flag is a desired value: it reads true as soon as the tenant writes
+// it, before helm-controller renders the revision. A cluster still carrying the
+// chart's scheduled tasks and PITR stream was rendered without the flag, and
+// they write to the storage key the driver would rewrite, so injecting would
+// redirect the tenant's own nightly dump and oplog into the shared bucket. The
+// driver must leave that cluster alone and hold the job, bounded by the deadline.
+func TestReconcileMongoDB_LegacyRenderIsNotInjectedOver(t *testing.T) {
+	setup := func(t *testing.T, startedAt time.Time, pitrOnly bool) (*BackupJobReconciler, client.Client, *ResolvedBackupConfig, *backupsv1alpha1.BackupJob) {
+		job, strategy, app, cluster, resolved := mongodbInjectFixture(true)
+		job.Status.StartedAt = &metav1.Time{Time: startedAt}
+		cluster.Spec.Backup.Storages = map[string]runtime.RawExtension{
+			"s3-storage": {Raw: []byte(`{"type":"s3","s3":{"bucket":"tenant-own","credentialsSecret":"mongodb-app1-s3-creds"}}`)},
+		}
+		if pitrOnly {
+			cluster.Spec.Backup.PITR = &psmdbtypes.PerconaServerMongoDBPITR{Enabled: true}
+		} else {
+			cluster.Spec.Backup.Tasks = []runtime.RawExtension{{Raw: []byte(`{"name":"daily-backup","enabled":true,"schedule":"0 2 * * *","keep":30,"storageName":"s3-storage","type":"logical"}`)}}
+		}
+		c := newMongoDBStrategyTestClient(t, job, strategy, app, cluster)
+		return &BackupJobReconciler{Client: c, Scheme: c.Scheme(), Recorder: record.NewFakeRecorder(10)}, c, resolved, job
+	}
+	assertUntouched := func(t *testing.T, c client.Client) {
+		got := &psmdbtypes.PerconaServerMongoDB{}
+		if err := c.Get(context.Background(), types.NamespacedName{Namespace: "tenant", Name: "mongodb-app1"}, got); err != nil {
+			t.Fatalf("get cluster: %v", err)
+		}
+		if bucket, _ := psmdbStorageS3(got.Spec.Backup.Storages["s3-storage"]); bucket != "tenant-own" {
+			t.Errorf("a legacy-rendered cluster must not be injected over; storage now points at %q", bucket)
+		}
+		list := &psmdbtypes.PerconaServerMongoDBBackupList{}
+		if err := c.List(context.Background(), list, client.InNamespace("tenant")); err != nil {
+			t.Fatalf("list: %v", err)
+		}
+		if len(list.Items) != 0 {
+			t.Errorf("no operator Backup may be minted against a legacy render, got %d", len(list.Items))
+		}
+	}
+	getJob := func(t *testing.T, c client.Client, name string) *backupsv1alpha1.BackupJob {
+		p := &backupsv1alpha1.BackupJob{}
+		if err := c.Get(context.Background(), types.NamespacedName{Namespace: "tenant", Name: name}, p); err != nil {
+			t.Fatalf("get job: %v", err)
+		}
+		return p
+	}
+
+	for _, pitrOnly := range []bool{false, true} {
+		name := "tasks still rendered"
+		if pitrOnly {
+			name = "pitr still rendered"
+		}
+		t.Run(name+": held, cluster untouched", func(t *testing.T) {
+			r, c, resolved, job := setup(t, time.Now(), pitrOnly)
+			res, err := r.reconcileMongoDB(context.Background(), job.DeepCopy(), resolved)
+			if err != nil {
+				t.Fatalf("reconcileMongoDB: %v", err)
+			}
+			if res.RequeueAfter == 0 {
+				t.Fatalf("expected a named wait for the release to render, got %+v", res)
+			}
+			assertUntouched(t, c)
+			p := getJob(t, c, job.Name)
+			if cond := apimeta.FindStatusCondition(p.Status.Conditions, "Ready"); cond == nil || cond.Reason != "PerconaServerMongoDBLegacyRender" {
+				t.Errorf("expected Ready=False PerconaServerMongoDBLegacyRender, got %+v", cond)
+			}
+		})
+	}
+
+	t.Run("past the deadline: fails, cluster still untouched", func(t *testing.T) {
+		r, c, resolved, job := setup(t, time.Now().Add(-2*psmdbDefaultBackupDeadline), false)
+		if _, err := r.reconcileMongoDB(context.Background(), job.DeepCopy(), resolved); err != nil {
+			t.Fatalf("reconcileMongoDB: %v", err)
+		}
+		assertUntouched(t, c)
+		if p := getJob(t, c, job.Name); p.Status.Phase != backupsv1alpha1.BackupJobPhaseFailed {
+			t.Errorf("a release that never renders the flag must fail the job on the deadline, got phase=%q", p.Status.Phase)
+		}
+	})
+}
+
+// The prune finalizer means "the platform owns this archive", so it must follow
+// where the storage actually points, not the flag: if the apply's merged view
+// carries anything but the strategy's coordinates on the entry (a mutating
+// webhook, a concurrent writer), no CR may be minted against it. Each term is
+// varied on its own: the credentialsSecret is what tells a tenant's entry from
+// the platform's when a bucket name collides, so a foreign credential on the
+// platform bucket must be refused just as a foreign bucket is.
+func TestReconcileMongoDB_ForeignStorageIsNotOwned(t *testing.T) {
+	cases := []struct {
+		name    string
+		foreign string
+		named   string
+	}{
+		{"foreign bucket, platform credential", `{"type":"s3","s3":{"bucket":"somebody-elses","credentialsSecret":"cozy-backups-creds"}}`, "somebody-elses"},
+		{"platform bucket, foreign credential", `{"type":"s3","s3":{"bucket":"cozy-backups","credentialsSecret":"mongodb-app1-s3-creds"}}`, "mongodb-app1-s3-creds"},
+	}
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			job, strategy, app, cluster, resolved := mongodbInjectFixture(true)
+			job.Status.StartedAt = &metav1.Time{Time: time.Now()}
+			cluster.Spec.Backup.Storages = map[string]runtime.RawExtension{
+				"s3-storage": {Raw: []byte(`{"type":"s3","s3":{"bucket":"cozy-backups","endpointUrl":"https://s3.example","region":"","prefix":"tenant/app1","credentialsSecret":"cozy-backups-creds","insecureSkipTLSVerify":false}}`)},
+			}
+			sch := runtime.NewScheme()
+			_ = scheme.AddToScheme(sch)
+			_ = backupsv1alpha1.AddToScheme(sch)
+			_ = strategyv1alpha1.AddToScheme(sch)
+			_ = psmdbtypes.AddToScheme(sch)
+			_ = mongodbapp.AddToScheme(sch)
+			foreign := runtime.RawExtension{Raw: []byte(tc.foreign)}
+			c := clientfake.NewClientBuilder().WithScheme(sch).WithObjects(job, strategy, app, cluster).
+				WithStatusSubresource(&backupsv1alpha1.BackupJob{}).
+				WithInterceptorFuncs(interceptor.Funcs{
+					Patch: func(ctx context.Context, cl client.WithWatch, obj client.Object, patch client.Patch, opts ...client.PatchOption) error {
+						err := cl.Patch(ctx, obj, patch, opts...)
+						if psmdb, ok := obj.(*psmdbtypes.PerconaServerMongoDB); ok && err == nil {
+							psmdb.Spec.Backup.Storages["s3-storage"] = foreign
+						}
+						return err
+					},
+				}).Build()
+			r := &BackupJobReconciler{Client: c, Scheme: sch, Recorder: record.NewFakeRecorder(10)}
+			res, err := r.reconcileMongoDB(context.Background(), job.DeepCopy(), resolved)
+			if err != nil {
+				t.Fatalf("reconcileMongoDB: %v", err)
+			}
+			if res.RequeueAfter == 0 {
+				t.Fatalf("expected a named wait on the foreign storage, got %+v", res)
+			}
+			list := &psmdbtypes.PerconaServerMongoDBBackupList{}
+			if err := c.List(context.Background(), list, client.InNamespace("tenant")); err != nil {
+				t.Fatalf("list: %v", err)
+			}
+			if len(list.Items) != 0 {
+				t.Errorf("no operator Backup may be minted against a storage that does not carry the platform coordinates, got %d (finalizers=%v)", len(list.Items), list.Items[0].Finalizers)
+			}
+			p := &backupsv1alpha1.BackupJob{}
+			if err := c.Get(context.Background(), types.NamespacedName{Namespace: "tenant", Name: job.Name}, p); err != nil {
+				t.Fatalf("get job: %v", err)
+			}
+			if cond := apimeta.FindStatusCondition(p.Status.Conditions, "Ready"); cond == nil || cond.Reason != "PerconaServerMongoDBStorageForeign" || !strings.Contains(cond.Message, tc.named) {
+				t.Errorf("expected Ready=False PerconaServerMongoDBStorageForeign naming %q, got %+v", tc.named, cond)
+			}
+		})
+	}
+}
+
+// Once a job has its operator CR the storage that CR names is fixed for the
+// dump, so the polls that follow must not touch the cluster or fail the job on
+// anything decided at mint time: not the legacy-render hold (a cluster that
+// re-acquired the chart's tasks and pitr after the mint), not the precondition
+// (backups disabled on the cluster mid-dump), and not the no-coordinates hold
+// (the strategy's s3 block dropped mid-dump). Each hold fails a job at the
+// 30-minute deadline, so the job is aged past it: a streaming system-bucket
+// dump must still be left to the state switch and its 24h ceiling, with the
+// finalized CR reachable through the job that owns it.
+func TestReconcileMongoDB_ExistingCRIsNotInjectedOver(t *testing.T) {
+	cases := []struct {
+		name  string
+		shape func(cluster *psmdbtypes.PerconaServerMongoDB, strategy *strategyv1alpha1.MongoDB)
+	}{
+		{"tasks re-acquired after the mint", func(cluster *psmdbtypes.PerconaServerMongoDB, _ *strategyv1alpha1.MongoDB) {
+			cluster.Spec.Backup.Tasks = []runtime.RawExtension{{Raw: []byte(`{"name":"daily-backup","enabled":true,"schedule":"0 2 * * *","storageName":"s3-storage"}`)}}
+		}},
+		{"backups disabled after the mint", func(cluster *psmdbtypes.PerconaServerMongoDB, _ *strategyv1alpha1.MongoDB) {
+			cluster.Spec.Backup.Enabled = false
+		}},
+		{"strategy lost its s3 block after the mint", func(_ *psmdbtypes.PerconaServerMongoDB, strategy *strategyv1alpha1.MongoDB) {
+			strategy.Spec.Template.S3 = nil
+		}},
+	}
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			job, strategy, app, cluster, resolved := mongodbInjectFixture(true)
+			job.Status.StartedAt = &metav1.Time{Time: time.Now().Add(-2 * psmdbDefaultBackupDeadline)}
+			// The release rendered back to the legacy flow after the CR was minted:
+			// the tenant's own storage is on the cluster again.
+			cluster.Spec.Backup.Storages = map[string]runtime.RawExtension{
+				"s3-storage": {Raw: []byte(`{"type":"s3","s3":{"bucket":"tenant-own","credentialsSecret":"mongodb-app1-s3-creds"}}`)},
+			}
+			tc.shape(cluster, strategy)
+			minted := &psmdbtypes.PerconaServerMongoDBBackup{
+				ObjectMeta: metav1.ObjectMeta{
+					Namespace: "tenant", Name: "op-minted", Finalizers: []string{psmdbDeleteBackupFinalizer},
+					Labels: map[string]string{
+						backupsv1alpha1.OwningJobNameLabel:      job.Name,
+						backupsv1alpha1.OwningJobNamespaceLabel: job.Namespace,
+					},
+				},
+				Status: psmdbtypes.PerconaServerMongoDBBackupStatus{State: psmdbtypes.StateRunning},
+			}
+			sch := runtime.NewScheme()
+			_ = scheme.AddToScheme(sch)
+			_ = backupsv1alpha1.AddToScheme(sch)
+			_ = strategyv1alpha1.AddToScheme(sch)
+			_ = psmdbtypes.AddToScheme(sch)
+			_ = mongodbapp.AddToScheme(sch)
+			applies := 0
+			c := clientfake.NewClientBuilder().WithScheme(sch).WithObjects(job, strategy, app, cluster, minted).
+				WithStatusSubresource(&backupsv1alpha1.BackupJob{}).
+				WithInterceptorFuncs(interceptor.Funcs{
+					Patch: func(ctx context.Context, cl client.WithWatch, obj client.Object, patch client.Patch, opts ...client.PatchOption) error {
+						if _, ok := obj.(*psmdbtypes.PerconaServerMongoDB); ok {
+							applies++
+						}
+						return cl.Patch(ctx, obj, patch, opts...)
+					},
+				}).Build()
+			r := &BackupJobReconciler{Client: c, Scheme: sch, Recorder: record.NewFakeRecorder(10)}
+			res, err := r.reconcileMongoDB(context.Background(), job.DeepCopy(), resolved)
+			if err != nil {
+				t.Fatalf("reconcileMongoDB: %v", err)
+			}
+			if res.RequeueAfter == 0 {
+				t.Fatalf("a job with a running CR must keep polling it, got %+v", res)
+			}
+			if applies != 0 {
+				t.Errorf("no storage may be applied once the job has its CR, got %d apply patch(es) on the cluster", applies)
+			}
+			got := &psmdbtypes.PerconaServerMongoDB{}
+			if err := c.Get(context.Background(), types.NamespacedName{Namespace: "tenant", Name: "mongodb-app1"}, got); err != nil {
+				t.Fatalf("get cluster: %v", err)
+			}
+			if bucket, _ := psmdbStorageS3(got.Spec.Backup.Storages["s3-storage"]); bucket != "tenant-own" {
+				t.Errorf("the tenant's storage was rewritten to %q", bucket)
+			}
+			p := &backupsv1alpha1.BackupJob{}
+			if err := c.Get(context.Background(), types.NamespacedName{Namespace: "tenant", Name: job.Name}, p); err != nil {
+				t.Fatalf("get job: %v", err)
+			}
+			if p.Status.Phase == backupsv1alpha1.BackupJobPhaseFailed {
+				t.Errorf("a streaming CR must not be failed by a mint-time hold past the deadline, got %q", p.Status.Message)
+			}
+			cr := &psmdbtypes.PerconaServerMongoDBBackup{}
+			if err := c.Get(context.Background(), types.NamespacedName{Namespace: "tenant", Name: "op-minted"}, cr); err != nil || !cr.DeletionTimestamp.IsZero() {
+				t.Errorf("the running CR must be left alone, err=%v", err)
+			}
+		})
+	}
+}
+
+// A change to the strategy coordinates rewrites an entry the operator has
+// already cached, so the next mint must wait a poll for the cache to observe
+// the new entry exactly as the first injection does; otherwise the operator
+// may resolve the previous coordinates and write the dump there. Only a real
+// change waits: an entry already as applied mints in the same pass.
+func TestReconcileMongoDB_CoordinateChangeRequeuesBeforeMinting(t *testing.T) {
+	mint := func(t *testing.T, seeded string) (ctrl.Result, int, string) {
+		job, strategy, app, cluster, resolved := mongodbInjectFixture(true)
+		cluster.Spec.Backup.Storages = map[string]runtime.RawExtension{"s3-storage": {Raw: []byte(seeded)}}
+		c := newMongoDBStrategyTestClient(t, job, strategy, app, cluster)
+		r := &BackupJobReconciler{Client: c, Scheme: c.Scheme()}
+		res, err := r.reconcileMongoDB(context.Background(), job.DeepCopy(), resolved)
+		if err != nil {
+			t.Fatalf("reconcileMongoDB: %v", err)
+		}
+		list := &psmdbtypes.PerconaServerMongoDBBackupList{}
+		if err := c.List(context.Background(), list, client.InNamespace("tenant")); err != nil {
+			t.Fatalf("list: %v", err)
+		}
+		p := &backupsv1alpha1.BackupJob{}
+		if err := c.Get(context.Background(), types.NamespacedName{Namespace: "tenant", Name: job.Name}, p); err != nil {
+			t.Fatalf("get job: %v", err)
+		}
+		reason := ""
+		if cond := apimeta.FindStatusCondition(p.Status.Conditions, "Ready"); cond != nil {
+			reason = cond.Reason
+		}
+		return res, len(list.Items), reason
+	}
+	asApplied := `{"type":"s3","s3":{"bucket":"cozy-backups","endpointUrl":"https://s3.example","region":"","prefix":"tenant/app1","credentialsSecret":"cozy-backups-creds","insecureSkipTLSVerify":false}}`
+	movedBucket := `{"type":"s3","s3":{"bucket":"cozy-backups-old","endpointUrl":"https://s3.example","region":"","prefix":"tenant/app1","credentialsSecret":"cozy-backups-creds","insecureSkipTLSVerify":false}}`
+
+	t.Run("entry already as applied: mints in the same pass", func(t *testing.T) {
+		_, minted, reason := mint(t, asApplied)
+		if minted != 1 {
+			t.Errorf("an entry already carrying the current coordinates must mint without waiting, got %d CRs (reason=%q)", minted, reason)
+		}
+	})
+	// forcePathStyle is omitted from the apply when the strategy leaves it
+	// unset, so an entry still carrying it is about to change too.
+	t.Run("strategy dropped forcePathStyle since the last injection: waits a poll first", func(t *testing.T) {
+		withPathStyle := `{"type":"s3","s3":{"bucket":"cozy-backups","endpointUrl":"https://s3.example","region":"","prefix":"tenant/app1","credentialsSecret":"cozy-backups-creds","insecureSkipTLSVerify":false,"forcePathStyle":true}}`
+		res, minted, reason := mint(t, withPathStyle)
+		if res.RequeueAfter == 0 || minted != 0 || reason != "PerconaServerMongoDBStorageInjected" {
+			t.Errorf("an entry about to lose forcePathStyle must wait a poll, got res=%+v minted=%d reason=%q", res, minted, reason)
+		}
+	})
+	t.Run("bucket moved since the last injection: waits a poll first", func(t *testing.T) {
+		res, minted, reason := mint(t, movedBucket)
+		if res.RequeueAfter == 0 {
+			t.Fatalf("expected a requeue after the coordinates changed, got %+v", res)
+		}
+		if minted != 0 {
+			t.Errorf("no CR may be minted in the pass that rewrote the coordinates, got %d", minted)
+		}
+		if reason != "PerconaServerMongoDBStorageInjected" {
+			t.Errorf("the wait must be named PerconaServerMongoDBStorageInjected, got %q", reason)
+		}
+	})
+}
+
+// The mint-time reads decide from the apiserver, not the manager's cache: a
+// cache lagging a re-render back to the legacy flow shows the flag true with
+// the tasks absent, and the apply would force-own the entry the tenant's
+// restored tasks name. With a dynamic client the live cluster wins.
+func TestReconcileMongoDB_MintTimeReadsTheClusterLive(t *testing.T) {
+	job, strategy, app, cached, resolved := mongodbInjectFixture(true)
+	// The cache still shows the useSystemBucket render: enabled, no storage.
+	live := cached.DeepCopy()
+	live.Spec.Backup.Storages = map[string]runtime.RawExtension{
+		"s3-storage": {Raw: []byte(`{"type":"s3","s3":{"bucket":"tenant-own","credentialsSecret":"mongodb-app1-s3-creds"}}`)},
+	}
+	live.Spec.Backup.Tasks = []runtime.RawExtension{{Raw: []byte(`{"name":"daily-backup","enabled":true,"storageName":"s3-storage"}`)}}
+	liveObj, err := runtime.DefaultUnstructuredConverter.ToUnstructured(live)
+	if err != nil {
+		t.Fatalf("to unstructured: %v", err)
+	}
+	u := &unstructured.Unstructured{Object: liveObj}
+	u.SetGroupVersionKind(psmdbtypes.GroupVersion.WithKind("PerconaServerMongoDB"))
+	dyn := newPsmdbBackupDynamicClient(u)
+
+	sch := runtime.NewScheme()
+	_ = scheme.AddToScheme(sch)
+	_ = backupsv1alpha1.AddToScheme(sch)
+	_ = strategyv1alpha1.AddToScheme(sch)
+	_ = psmdbtypes.AddToScheme(sch)
+	_ = mongodbapp.AddToScheme(sch)
+	applies := 0
+	c := clientfake.NewClientBuilder().WithScheme(sch).WithObjects(job, strategy, app, cached).
+		WithStatusSubresource(&backupsv1alpha1.BackupJob{}).
+		WithInterceptorFuncs(interceptor.Funcs{
+			Patch: func(ctx context.Context, cl client.WithWatch, obj client.Object, patch client.Patch, opts ...client.PatchOption) error {
+				if _, ok := obj.(*psmdbtypes.PerconaServerMongoDB); ok {
+					applies++
+				}
+				return cl.Patch(ctx, obj, patch, opts...)
+			},
+		}).Build()
+	r := &BackupJobReconciler{Client: c, Interface: dyn, Scheme: sch, Recorder: record.NewFakeRecorder(10)}
+	res, err := r.reconcileMongoDB(context.Background(), job.DeepCopy(), resolved)
+	if err != nil {
+		t.Fatalf("reconcileMongoDB: %v", err)
+	}
+	if res.RequeueAfter == 0 {
+		t.Fatalf("expected the legacy-render hold off the live read, got %+v", res)
+	}
+	if applies != 0 {
+		t.Errorf("the live cluster carries tasks; nothing may be applied on the cached view, got %d patch(es)", applies)
+	}
+	p := &backupsv1alpha1.BackupJob{}
+	if err := c.Get(context.Background(), types.NamespacedName{Namespace: "tenant", Name: job.Name}, p); err != nil {
+		t.Fatalf("get job: %v", err)
+	}
+	if cond := apimeta.FindStatusCondition(p.Status.Conditions, "Ready"); cond == nil || cond.Reason != "PerconaServerMongoDBLegacyRender" {
+		t.Errorf("expected Ready=False PerconaServerMongoDBLegacyRender from the live read, got %+v", cond)
+	}
+}
+
+// The storage-race retry recognises one operator error and only that. Any other
+// failure of a system-bucket CR is the tenant's to see: terminal, with the
+// operator's own text, the CR left in place and no retry spent.
+func TestReconcileMongoDB_NonStorageErrorIsTerminal(t *testing.T) {
+	job, strategy, app, cluster, resolved := mongodbInjectFixture(true)
+	job.Status.StartedAt = &metav1.Time{Time: time.Now()}
+	cluster.Spec.Backup.Storages = map[string]runtime.RawExtension{
+		"s3-storage": {Raw: []byte(`{"type":"s3","s3":{"bucket":"cozy-backups","endpointUrl":"https://s3.example","region":"","prefix":"tenant/app1","credentialsSecret":"cozy-backups-creds","insecureSkipTLSVerify":false}}`)},
+	}
+	errored := &psmdbtypes.PerconaServerMongoDBBackup{
+		ObjectMeta: metav1.ObjectMeta{
+			Namespace: "tenant", Name: "op-pbm-failed", Finalizers: []string{psmdbDeleteBackupFinalizer},
+			Labels: map[string]string{
+				backupsv1alpha1.OwningJobNameLabel:      job.Name,
+				backupsv1alpha1.OwningJobNamespaceLabel: job.Namespace,
+			},
+		},
+		Status: psmdbtypes.PerconaServerMongoDBBackupStatus{State: psmdbtypes.StateError, Error: "pbm-agent: connection refused"},
+	}
+	c := newMongoDBStrategyTestClient(t, job, strategy, app, cluster, errored)
+	r := &BackupJobReconciler{Client: c, Scheme: c.Scheme(), Recorder: record.NewFakeRecorder(10)}
+	if _, err := r.reconcileMongoDB(context.Background(), job.DeepCopy(), resolved); err != nil {
+		t.Fatalf("reconcileMongoDB: %v", err)
+	}
+	p := &backupsv1alpha1.BackupJob{}
+	if err := c.Get(context.Background(), types.NamespacedName{Namespace: "tenant", Name: job.Name}, p); err != nil {
+		t.Fatalf("get job: %v", err)
+	}
+	if p.Status.Phase != backupsv1alpha1.BackupJobPhaseFailed || !strings.Contains(p.Status.Message, "connection refused") {
+		t.Errorf("an operator error other than the storage race must fail the job with the operator's text, got phase=%q msg=%q", p.Status.Phase, p.Status.Message)
+	}
+	if got := psmdbStorageRaceRetries(p); got != 0 {
+		t.Errorf("no storage-race retry may be spent on an unrelated error, got %d", got)
+	}
+	got := &psmdbtypes.PerconaServerMongoDBBackup{}
+	if err := c.Get(context.Background(), types.NamespacedName{Namespace: "tenant", Name: "op-pbm-failed"}, got); err != nil || !got.DeletionTimestamp.IsZero() {
+		t.Errorf("the errored CR must be left in place for the tenant to inspect, err=%v", err)
+	}
+}
+
+// The storage-race retry deletes the errored CR and mints a fresh one; at the
+// pinned operator version the deleted CR is reaped at once (delete-backup is
+// dropped without pruning on a non-ready CR), so nothing about the surviving
+// CRs records how many retries were spent. The budget must survive that reap:
+// this drives the loop with the operator simulated between polls, reaping the
+// deleted CR and erroring the fresh one, and expects the job to stop at the
+// budget with the operator's error rather than churn a CR per poll.
+func TestReconcileMongoDB_StorageRaceRetryBudgetExhausted(t *testing.T) {
+	job, strategy, app, cluster, resolved := mongodbInjectFixture(true)
+	job.Status.StartedAt = &metav1.Time{Time: time.Now()}
+	cluster.Spec.Backup.Storages = map[string]runtime.RawExtension{
+		"s3-storage": {Raw: []byte(`{"type":"s3","s3":{"bucket":"cozy-backups","endpointUrl":"https://s3.example","region":"","prefix":"tenant/app1","credentialsSecret":"cozy-backups-creds","insecureSkipTLSVerify":false}}`)},
+	}
+	first := &psmdbtypes.PerconaServerMongoDBBackup{
+		ObjectMeta: metav1.ObjectMeta{
+			Namespace: "tenant", Name: "op-try-1", Finalizers: []string{psmdbDeleteBackupFinalizer},
+			Labels: map[string]string{
+				backupsv1alpha1.OwningJobNameLabel:      job.Name,
+				backupsv1alpha1.OwningJobNamespaceLabel: job.Namespace,
+			},
+		},
+		Status: psmdbtypes.PerconaServerMongoDBBackupStatus{State: psmdbtypes.StateError, Error: `unable to get storage "s3-storage": not found`},
+	}
+	c := newMongoDBStrategyTestClient(t, job, strategy, app, cluster, first)
+	r := &BackupJobReconciler{Client: c, Scheme: c.Scheme(), Recorder: record.NewFakeRecorder(10)}
+
+	listCRs := func(t *testing.T) []psmdbtypes.PerconaServerMongoDBBackup {
+		list := &psmdbtypes.PerconaServerMongoDBBackupList{}
+		if err := c.List(context.Background(), list, client.InNamespace("tenant")); err != nil {
+			t.Fatalf("list: %v", err)
+		}
+		return list.Items
+	}
+	// The operator between polls: a deleted CR loses its finalizer and goes
+	// away, and the fresh CR resolves the storage from a stale cache and errors.
+	operator := func(t *testing.T) {
+		for _, cr := range listCRs(t) {
+			cr := cr
+			if !cr.DeletionTimestamp.IsZero() {
+				base := cr.DeepCopy()
+				cr.Finalizers = nil
+				if err := c.Patch(context.Background(), &cr, client.MergeFrom(base)); err != nil && !apierrors.IsNotFound(err) {
+					t.Fatalf("reap %s: %v", cr.Name, err)
+				}
+				continue
+			}
+			if cr.Status.State == "" {
+				cr.Status.State = psmdbtypes.StateError
+				cr.Status.Error = `unable to get storage "s3-storage": not found`
+				if err := c.Update(context.Background(), &cr); err != nil {
+					t.Fatalf("error %s: %v", cr.Name, err)
+				}
+			}
+		}
+	}
+	getJob := func(t *testing.T) *backupsv1alpha1.BackupJob {
+		p := &backupsv1alpha1.BackupJob{}
+		if err := c.Get(context.Background(), types.NamespacedName{Namespace: "tenant", Name: job.Name}, p); err != nil {
+			t.Fatalf("get job: %v", err)
+		}
+		return p
+	}
+
+	// Each retry: one reconcile deletes the errored CR, the operator reaps it,
+	// the next reconcile mints a fresh one, and the operator errors that too.
+	for retry := 1; retry <= psmdbStorageRaceRetryBudget; retry++ {
+		res, err := r.reconcileMongoDB(context.Background(), getJob(t), resolved)
+		if err != nil {
+			t.Fatalf("retry %d: reconcileMongoDB: %v", retry, err)
+		}
+		if res.RequeueAfter == 0 {
+			t.Fatalf("retry %d: expected a retry requeue, got %+v", retry, res)
+		}
+		if p := getJob(t); p.Status.Phase == backupsv1alpha1.BackupJobPhaseFailed {
+			t.Fatalf("retry %d: the job must not fail inside the budget", retry)
+		} else if got := psmdbStorageRaceRetries(p); got != retry {
+			t.Fatalf("retry %d: the BackupJob must carry the retry count, got %d", retry, got)
+		}
+		operator(t)
+		// Nothing survives the reap: the count lives on the job or nowhere.
+		if crs := listCRs(t); len(crs) != 0 {
+			t.Fatalf("retry %d: expected no CR after the operator reaped the deleted one, got %d", retry, len(crs))
+		}
+		if _, err := r.reconcileMongoDB(context.Background(), getJob(t), resolved); err != nil {
+			t.Fatalf("retry %d: re-mint reconcileMongoDB: %v", retry, err)
+		}
+		if crs := listCRs(t); len(crs) != 1 || crs[0].Status.State != "" {
+			t.Fatalf("retry %d: expected exactly one fresh CR minted, got %+v", retry, crs)
+		}
+		operator(t)
+	}
+
+	// Budget spent: the next error is terminal, with the operator's message, and
+	// the live errored CR is not deleted.
+	if _, err := r.reconcileMongoDB(context.Background(), getJob(t), resolved); err != nil {
+		t.Fatalf("reconcileMongoDB past the budget: %v", err)
+	}
+	p := getJob(t)
+	if p.Status.Phase != backupsv1alpha1.BackupJobPhaseFailed {
+		t.Fatalf("with the retry budget spent the job must fail, got phase=%q", p.Status.Phase)
+	}
+	if !strings.Contains(p.Status.Message, "unable to get storage") || !strings.Contains(p.Status.Message, fmt.Sprintf("after %d retries", psmdbStorageRaceRetryBudget)) {
+		t.Errorf("the terminal message must carry the operator's error and the spent budget, got %q", p.Status.Message)
+	}
+	crs := listCRs(t)
+	if len(crs) != 1 || !crs[0].DeletionTimestamp.IsZero() {
+		t.Errorf("the terminal path must leave the live errored CR in place and mint no other, got %d CRs", len(crs))
+	}
+}
+
+// The archive exists once the operator CR is ready; the Backup object is the
+// only thing that can ever reach it. A transient Create failure must retry (the
+// job stays Running) rather than fail terminally with no artifact, and when the
+// window is spent the failure names the CR that still holds the archive.
+func TestReconcileMongoDB_ArtifactCreateFailureRetriesThenNamesTheCR(t *testing.T) {
+	build := func(t *testing.T, startedAgo time.Duration, completed *time.Time) (*BackupJobReconciler, client.Client, *record.FakeRecorder, *ResolvedBackupConfig, *backupsv1alpha1.BackupJob) {
+		job, strategy, app, cluster, resolved := mongodbInjectFixture(true)
+		job.Status.StartedAt = &metav1.Time{Time: time.Now().Add(-startedAgo)}
+		cluster.Spec.Backup.Storages = map[string]runtime.RawExtension{
+			"s3-storage": {Raw: []byte(`{"type":"s3","s3":{"bucket":"cozy-backups","endpointUrl":"https://s3.example","region":"","prefix":"tenant/app1","credentialsSecret":"cozy-backups-creds","insecureSkipTLSVerify":false}}`)},
+		}
+		ready := &psmdbtypes.PerconaServerMongoDBBackup{
+			ObjectMeta: metav1.ObjectMeta{
+				Namespace: "tenant", Name: "op-ready", Finalizers: []string{psmdbDeleteBackupFinalizer},
+				Labels: map[string]string{
+					backupsv1alpha1.OwningJobNameLabel:      job.Name,
+					backupsv1alpha1.OwningJobNamespaceLabel: job.Namespace,
+				},
+			},
+			Status: psmdbtypes.PerconaServerMongoDBBackupStatus{
+				State:       psmdbtypes.StateReady,
+				Destination: "s3://cozy-backups/tenant/app1/2026-09-20",
+				S3:          &psmdbtypes.BackupStorageS3{Bucket: "cozy-backups", CredentialsSecret: psmdbDefaultCredentialsSecret},
+			},
+		}
+		if completed != nil {
+			ready.Status.Completed = &metav1.Time{Time: *completed}
+		}
+		sch := runtime.NewScheme()
+		_ = scheme.AddToScheme(sch)
+		_ = backupsv1alpha1.AddToScheme(sch)
+		_ = strategyv1alpha1.AddToScheme(sch)
+		_ = psmdbtypes.AddToScheme(sch)
+		_ = mongodbapp.AddToScheme(sch)
+		c := clientfake.NewClientBuilder().WithScheme(sch).WithObjects(job, strategy, app, cluster, ready).
+			WithStatusSubresource(&backupsv1alpha1.BackupJob{}, &backupsv1alpha1.Backup{}).
+			WithInterceptorFuncs(interceptor.Funcs{
+				Create: func(ctx context.Context, cl client.WithWatch, obj client.Object, opts ...client.CreateOption) error {
+					if _, ok := obj.(*backupsv1alpha1.Backup); ok {
+						return apierrors.NewServiceUnavailable("etcd timeout")
+					}
+					return cl.Create(ctx, obj, opts...)
+				},
+			}).Build()
+		rec := record.NewFakeRecorder(10)
+		return &BackupJobReconciler{Client: c, Scheme: sch, Recorder: rec}, c, rec, resolved, job
+	}
+	getJob := func(t *testing.T, c client.Client, name string) *backupsv1alpha1.BackupJob {
+		p := &backupsv1alpha1.BackupJob{}
+		if err := c.Get(context.Background(), types.NamespacedName{Namespace: "tenant", Name: name}, p); err != nil {
+			t.Fatalf("get job: %v", err)
+		}
+		return p
+	}
+
+	t.Run("inside the window: retried, not failed", func(t *testing.T) {
+		now := time.Now()
+		r, c, _, resolved, job := build(t, 10*time.Minute, &now)
+		if _, err := r.reconcileMongoDB(context.Background(), job.DeepCopy(), resolved); err == nil {
+			t.Fatalf("a transient artifact Create failure must be returned for backoff, got nil")
+		}
+		if p := getJob(t, c, job.Name); p.Status.Phase == backupsv1alpha1.BackupJobPhaseFailed {
+			t.Errorf("a transient artifact Create failure must not fail the job while the window is open")
+		}
+	})
+
+	t.Run("window spent: fails and names the CR holding the archive", func(t *testing.T) {
+		completed := time.Now().Add(-2 * psmdbLiveReadGrace)
+		r, c, rec, resolved, job := build(t, 10*time.Minute, &completed)
+		if _, err := r.reconcileMongoDB(context.Background(), job.DeepCopy(), resolved); err != nil {
+			t.Fatalf("reconcileMongoDB: %v", err)
+		}
+		p := getJob(t, c, job.Name)
+		if p.Status.Phase != backupsv1alpha1.BackupJobPhaseFailed {
+			t.Fatalf("expected Failed once the artifact window is spent, got phase=%q", p.Status.Phase)
+		}
+		if cond := apimeta.FindStatusCondition(p.Status.Conditions, "Ready"); cond == nil || !strings.Contains(cond.Message, "op-ready") || !strings.Contains(cond.Message, psmdbLiveReadGrace.String()) {
+			t.Errorf("the terminal message must name the CR that still holds the archive and the window it retried for, got %+v", cond)
+		}
+		select {
+		case ev := <-rec.Events:
+			if !strings.Contains(ev, "BackupArtifactNotCreated") || !strings.Contains(ev, "op-ready") {
+				t.Errorf("expected a BackupArtifactNotCreated Warning naming the CR, got %q", ev)
+			}
+		default:
+			t.Errorf("expected a Warning naming the orphaned archive's CR, got none")
+		}
+	})
+
+	// With no completion time on the CR the window runs from the job's start,
+	// the deadline plus the grace, and the failure must say which window it was.
+	t.Run("no completion time: window is deadline plus grace, and named", func(t *testing.T) {
+		r, c, _, resolved, job := build(t, 2*(psmdbDefaultBackupDeadline+psmdbLiveReadGrace), nil)
+		if _, err := r.reconcileMongoDB(context.Background(), job.DeepCopy(), resolved); err != nil {
+			t.Fatalf("reconcileMongoDB: %v", err)
+		}
+		p := getJob(t, c, job.Name)
+		if p.Status.Phase != backupsv1alpha1.BackupJobPhaseFailed {
+			t.Fatalf("expected Failed once the start-based window is spent, got phase=%q", p.Status.Phase)
+		}
+		if want := (psmdbDefaultBackupDeadline + psmdbLiveReadGrace).String(); !strings.Contains(p.Status.Message, want) {
+			t.Errorf("the failure must name the window in force (%s), got %q", want, p.Status.Message)
+		}
+	})
+}
+
+// A legacy Backup owns nothing on the shared bucket; before this driver its
+// cleanup was an unconditional no-op. With the flow recorded on the snapshot,
+// cleanup must release a legacy Backup without any apiserver read, so a throttle
+// or revoked verb on a CR the driver does not own cannot hold it Terminating.
+func TestCleanupMongoDBBackup_LegacySnapshotSkipsTheRead(t *testing.T) {
+	legacySnap := &psmdbtypes.PerconaServerMongoDBBackup{Status: psmdbtypes.PerconaServerMongoDBBackupStatus{
+		Destination: "s3://tenant-own/x", S3: &psmdbtypes.BackupStorageS3{Bucket: "tenant-own", CredentialsSecret: "mongodb-app1-s3-creds"},
+	}}
+	raw, err := marshalMongoDBBackupSnapshot(legacySnap, &strategyv1alpha1.MongoDBTemplate{Type: "logical"}, "s3-storage", nil, false)
+	if err != nil {
+		t.Fatalf("marshal: %v", err)
+	}
+	s := runtime.NewScheme()
+	_ = scheme.AddToScheme(s)
+	_ = backupsv1alpha1.AddToScheme(s)
+	_ = psmdbtypes.AddToScheme(s)
+	reads := 0
+	c := clientfake.NewClientBuilder().WithScheme(s).WithInterceptorFuncs(interceptor.Funcs{
+		Get: func(ctx context.Context, cl client.WithWatch, key client.ObjectKey, obj client.Object, opts ...client.GetOption) error {
+			if _, ok := obj.(*psmdbtypes.PerconaServerMongoDBBackup); ok {
+				reads++
+				return apierrors.NewTooManyRequests("apiserver throttled", 1)
+			}
+			return cl.Get(ctx, key, obj, opts...)
+		},
+	}).Build()
+	r := &BackupReconciler{Client: c, Recorder: record.NewFakeRecorder(10)}
+	backup := &backupsv1alpha1.Backup{
+		ObjectMeta: metav1.ObjectMeta{Namespace: "tenant", Name: "legacy-bk"},
+		Spec:       backupsv1alpha1.BackupSpec{DriverMetadata: map[string]string{psmdbBackupNameKey: "op-legacy"}},
+		Status:     backupsv1alpha1.BackupStatus{UnderlyingResources: raw},
+	}
+	res, err := r.cleanupMongoDBBackup(context.Background(), backup)
+	if err != nil || res.RequeueAfter != 0 {
+		t.Fatalf("a legacy Backup must release without depending on the operator CR read, got res=%+v err=%v", res, err)
+	}
+	if reads != 0 {
+		t.Errorf("a legacy Backup must not read the operator CR at all, got %d reads", reads)
+	}
+
+	// The shortcut is for this driver's own snapshot shape only: a snapshot of
+	// another kind says nothing about the flow, so cleanup must fall through to
+	// the read rather than release on it.
+	t.Run("foreign snapshot kind falls through to the read", func(t *testing.T) {
+		foreign := &runtime.RawExtension{Raw: []byte(`{"kind":"SomethingElse","apiVersion":"v1","useSystemBucket":false}`)}
+		reads = 0
+		other := &backupsv1alpha1.Backup{
+			ObjectMeta: metav1.ObjectMeta{Namespace: "tenant", Name: "foreign-bk"},
+			Spec:       backupsv1alpha1.BackupSpec{DriverMetadata: map[string]string{psmdbBackupNameKey: "op-foreign"}},
+			Status:     backupsv1alpha1.BackupStatus{UnderlyingResources: foreign},
+		}
+		if _, err := r.cleanupMongoDBBackup(context.Background(), other); err == nil {
+			t.Fatalf("a snapshot of another kind must not release without reading the operator CR")
+		}
+		if reads != 1 {
+			t.Errorf("expected the operator CR to be read once for a foreign snapshot kind, got %d reads", reads)
+		}
+	})
+}
+
+// The other direction of the snapshot gate: a Backup whose snapshot records the
+// system-bucket flow must go on to the operator CR and delete it, so the prune
+// finalizer frees the archive. Releasing it the way a legacy one is released
+// would leave the object in the shared bucket with nothing left to prune it.
+func TestCleanupMongoDBBackup_SystemBucketSnapshotReachesThePrune(t *testing.T) {
+	sbSnap := &psmdbtypes.PerconaServerMongoDBBackup{Status: psmdbtypes.PerconaServerMongoDBBackupStatus{
+		Destination: "s3://cozy-backups/tenant/app1/x", S3: &psmdbtypes.BackupStorageS3{Bucket: "cozy-backups", CredentialsSecret: psmdbDefaultCredentialsSecret},
+	}}
+	raw, err := marshalMongoDBBackupSnapshot(sbSnap, &strategyv1alpha1.MongoDBTemplate{Type: "logical"}, "s3-storage", nil, true)
+	if err != nil {
+		t.Fatalf("marshal: %v", err)
+	}
+	owned := &psmdbtypes.PerconaServerMongoDBBackup{
+		ObjectMeta: metav1.ObjectMeta{Namespace: "tenant", Name: "op-sb", Finalizers: []string{psmdbDeleteBackupFinalizer}},
+	}
+	c := newMongoDBStrategyTestClient(t, owned, &corev1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: "tenant"}})
+	r := &BackupReconciler{Client: c, Recorder: record.NewFakeRecorder(10)}
+	backup := &backupsv1alpha1.Backup{
+		ObjectMeta: metav1.ObjectMeta{Namespace: "tenant", Name: "sb-bk"},
+		Spec:       backupsv1alpha1.BackupSpec{DriverMetadata: map[string]string{psmdbBackupNameKey: "op-sb"}},
+		Status:     backupsv1alpha1.BackupStatus{UnderlyingResources: raw},
+	}
+	res, err := r.cleanupMongoDBBackup(context.Background(), backup)
+	if err != nil {
+		t.Fatalf("cleanupMongoDBBackup: %v", err)
+	}
+	if res.RequeueAfter == 0 {
+		t.Fatalf("a system-bucket Backup must wait for the operator to prune, got %+v", res)
+	}
+	got := &psmdbtypes.PerconaServerMongoDBBackup{}
+	if err := c.Get(context.Background(), types.NamespacedName{Namespace: "tenant", Name: "op-sb"}, got); err != nil {
+		t.Fatalf("get operator CR: %v", err)
+	}
+	if got.DeletionTimestamp.IsZero() {
+		t.Errorf("a system-bucket Backup must delete its operator CR so the delete-backup finalizer prunes the archive")
+	}
+}
+
+// After a tenant opts out, the platform may drop or rename the strategy's s3
+// block; the lingering injected entry still carries the platform default Secret
+// and must still be refused, or a legacy CR is minted onto the platform bucket.
+func TestReconcileMongoDB_OptOutRefusalSurvivesStrategyWithoutS3(t *testing.T) {
+	job, strategy, app, cluster, resolved := mongodbInjectFixture(true)
+	app.Spec.Backup.UseSystemBucket = false
+	strategy.Spec.Template.S3 = nil // platform dropped the coordinates after the opt-out
+	job.Status.StartedAt = &metav1.Time{Time: time.Now()}
+	cluster.Spec.Backup.Storages = map[string]runtime.RawExtension{
+		"s3-storage": {Raw: []byte(`{"type":"s3","s3":{"bucket":"cozy-backups","endpointUrl":"https://s3.example","region":"","prefix":"tenant/app1","credentialsSecret":"cozy-backups-creds","insecureSkipTLSVerify":false}}`)},
+	}
+	c := newMongoDBStrategyTestClient(t, job, strategy, app, cluster)
+	r := &BackupJobReconciler{Client: c, Scheme: c.Scheme(), Recorder: record.NewFakeRecorder(10)}
+	if _, err := r.reconcileMongoDB(context.Background(), job.DeepCopy(), resolved); err != nil {
+		t.Fatalf("reconcileMongoDB: %v", err)
+	}
+	list := &psmdbtypes.PerconaServerMongoDBBackupList{}
+	if err := c.List(context.Background(), list, client.InNamespace("tenant")); err != nil {
+		t.Fatalf("list: %v", err)
+	}
+	if len(list.Items) != 0 {
+		t.Errorf("the lingering injected entry must still be refused when the strategy carries no s3, got %d CRs minted", len(list.Items))
+	}
+	persisted := &backupsv1alpha1.BackupJob{}
+	if err := c.Get(context.Background(), types.NamespacedName{Namespace: "tenant", Name: job.Name}, persisted); err != nil {
+		t.Fatalf("get job: %v", err)
+	}
+	if cond := apimeta.FindStatusCondition(persisted.Status.Conditions, "Ready"); cond == nil || cond.Reason != "PerconaServerMongoDBStorageStale" {
+		t.Errorf("expected Ready=False PerconaServerMongoDBStorageStale, got %+v", cond)
+	}
+}
+
+// settledPlatformEntry is the storage entry exactly as the driver applies it
+// for mongodbInjectFixture's strategy, so a cluster seeded with it mints
+// without the settle wait.
+const settledPlatformEntry = `{"type":"s3","s3":{"bucket":"cozy-backups","endpointUrl":"https://s3.example","region":"","prefix":"tenant/app1","credentialsSecret":"cozy-backups-creds","insecureSkipTLSVerify":false}}`
+
+// The entry on the spec is not the storage pbm writes to: the operator pushes
+// spec.backup into pbm's own config in the cluster reconcile, stamping
+// observedGeneration at its end and flipping PBMReady False then True around
+// the push. A CR minted before both hold is resolved against the previous
+// coordinates, so the mint must wait for both, bounded by the deadline.
+func TestReconcileMongoDB_MintWaitsForPBMConfig(t *testing.T) {
+	run := func(t *testing.T, shape func(c *psmdbtypes.PerconaServerMongoDB), startedAgo time.Duration) (ctrl.Result, int, *backupsv1alpha1.BackupJob) {
+		job, strategy, app, cluster, resolved := mongodbInjectFixture(true)
+		job.Status.StartedAt = &metav1.Time{Time: time.Now().Add(-startedAgo)}
+		cluster.Spec.Backup.Storages = map[string]runtime.RawExtension{"s3-storage": {Raw: []byte(settledPlatformEntry)}}
+		shape(cluster)
+		c := newMongoDBStrategyTestClient(t, job, strategy, app, cluster)
+		r := &BackupJobReconciler{Client: c, Scheme: c.Scheme()}
+		res, err := r.reconcileMongoDB(context.Background(), job.DeepCopy(), resolved)
+		if err != nil {
+			t.Fatalf("reconcileMongoDB: %v", err)
+		}
+		list := &psmdbtypes.PerconaServerMongoDBBackupList{}
+		if err := c.List(context.Background(), list, client.InNamespace("tenant")); err != nil {
+			t.Fatalf("list: %v", err)
+		}
+		p := &backupsv1alpha1.BackupJob{}
+		if err := c.Get(context.Background(), types.NamespacedName{Namespace: "tenant", Name: job.Name}, p); err != nil {
+			t.Fatalf("get job: %v", err)
+		}
+		return res, len(list.Items), p
+	}
+	held := func(t *testing.T, res ctrl.Result, minted int, p *backupsv1alpha1.BackupJob) {
+		if res.RequeueAfter == 0 || minted != 0 {
+			t.Fatalf("the mint must wait for the operator, got res=%+v minted=%d", res, minted)
+		}
+		if cond := apimeta.FindStatusCondition(p.Status.Conditions, "Ready"); cond == nil || cond.Reason != "PerconaServerMongoDBPBMConfigPending" {
+			t.Errorf("expected Ready=False PerconaServerMongoDBPBMConfigPending, got %+v", cond)
+		}
+	}
+
+	t.Run("operator has not seen this generation: held", func(t *testing.T) {
+		res, minted, p := run(t, func(c *psmdbtypes.PerconaServerMongoDB) {
+			c.Generation = 5
+			c.Status.ObservedGeneration = 4
+		}, 0)
+		held(t, res, minted, p)
+	})
+	t.Run("PBMReady False while the config is pushed: held", func(t *testing.T) {
+		res, minted, p := run(t, func(c *psmdbtypes.PerconaServerMongoDB) {
+			c.Status.Conditions = []psmdbtypes.PerconaServerMongoDBCondition{{Type: psmdbtypes.ConditionPBMReady, Status: "False"}}
+		}, 0)
+		held(t, res, minted, p)
+	})
+	t.Run("PBMReady never set (cluster never had a backup config): held", func(t *testing.T) {
+		res, minted, p := run(t, func(c *psmdbtypes.PerconaServerMongoDB) { c.Status.Conditions = nil }, 0)
+		held(t, res, minted, p)
+	})
+	t.Run("generation observed and PBMReady True: mints", func(t *testing.T) {
+		_, minted, _ := run(t, func(c *psmdbtypes.PerconaServerMongoDB) {
+			c.Generation = 5
+			c.Status.ObservedGeneration = 5
+		}, 0)
+		if minted != 1 {
+			t.Errorf("with the config applied the CR must be minted, got %d", minted)
+		}
+	})
+	t.Run("never applied past the deadline: fails, nothing minted", func(t *testing.T) {
+		_, minted, p := run(t, func(c *psmdbtypes.PerconaServerMongoDB) { c.Status.Conditions = nil }, 2*psmdbDefaultBackupDeadline)
+		if minted != 0 || p.Status.Phase != backupsv1alpha1.BackupJobPhaseFailed || !strings.Contains(p.Status.Message, "backup configuration applied") {
+			t.Errorf("an operator that never applies the config must fail the job at the deadline with nothing minted, got minted=%d phase=%q msg=%q", minted, p.Status.Phase, p.Status.Message)
+		}
+	})
+}
+
+// The reads the state switch still needs once a CR exists (strategy, app) are
+// bounded by the running ceiling, not the backup deadline: a strategy absent
+// for one reconcile 40 minutes into a streaming dump must not fail the job and
+// leave the finalized CR unreachable. Past the ceiling the failure names the CR.
+func TestReconcileMongoDB_ReadsBehindExistingCRDoNotFailAtDeadline(t *testing.T) {
+	build := func(t *testing.T, startedAgo time.Duration, withStrategy, withApp bool) (*BackupJobReconciler, client.Client, *ResolvedBackupConfig, *backupsv1alpha1.BackupJob) {
+		job, strategy, app, cluster, resolved := mongodbInjectFixture(true)
+		job.Status.StartedAt = &metav1.Time{Time: time.Now().Add(-startedAgo)}
+		running := &psmdbtypes.PerconaServerMongoDBBackup{
+			ObjectMeta: metav1.ObjectMeta{
+				Namespace: "tenant", Name: "op-running", Finalizers: []string{psmdbDeleteBackupFinalizer},
+				Labels: map[string]string{
+					backupsv1alpha1.OwningJobNameLabel:      job.Name,
+					backupsv1alpha1.OwningJobNamespaceLabel: job.Namespace,
+				},
+			},
+			Status: psmdbtypes.PerconaServerMongoDBBackupStatus{State: psmdbtypes.StateRunning},
+		}
+		objs := []client.Object{job, cluster, running}
+		if withStrategy {
+			objs = append(objs, strategy)
+		}
+		if withApp {
+			objs = append(objs, app)
+		}
+		c := newMongoDBStrategyTestClient(t, objs...)
+		return &BackupJobReconciler{Client: c, Scheme: c.Scheme(), Recorder: record.NewFakeRecorder(10)}, c, resolved, job
+	}
+	getJob := func(t *testing.T, c client.Client, name string) *backupsv1alpha1.BackupJob {
+		p := &backupsv1alpha1.BackupJob{}
+		if err := c.Get(context.Background(), types.NamespacedName{Namespace: "tenant", Name: name}, p); err != nil {
+			t.Fatalf("get job: %v", err)
+		}
+		return p
+	}
+	crIntact := func(t *testing.T, c client.Client) {
+		cr := &psmdbtypes.PerconaServerMongoDBBackup{}
+		if err := c.Get(context.Background(), types.NamespacedName{Namespace: "tenant", Name: "op-running"}, cr); err != nil || !cr.DeletionTimestamp.IsZero() {
+			t.Errorf("the running CR must be left alone, err=%v", err)
+		}
+	}
+
+	for _, tc := range []struct {
+		name                  string
+		withStrategy, withApp bool
+		reason                string
+	}{
+		{"strategy absent", false, true, "MongoDBStrategyNotReady"},
+		{"app absent", true, false, "MongoDBApplicationNotReady"},
+	} {
+		t.Run(tc.name+" past the deadline: held, not failed", func(t *testing.T) {
+			r, c, resolved, job := build(t, 40*time.Minute, tc.withStrategy, tc.withApp)
+			res, err := r.reconcileMongoDB(context.Background(), job.DeepCopy(), resolved)
+			if err != nil {
+				t.Fatalf("reconcileMongoDB: %v", err)
+			}
+			if res.RequeueAfter == 0 {
+				t.Fatalf("expected a named wait behind the running CR, got %+v", res)
+			}
+			p := getJob(t, c, job.Name)
+			if p.Status.Phase == backupsv1alpha1.BackupJobPhaseFailed {
+				t.Fatalf("a job with a streaming CR must not fail on the backup deadline, got %q", p.Status.Message)
+			}
+			if cond := apimeta.FindStatusCondition(p.Status.Conditions, "Ready"); cond == nil || cond.Reason != tc.reason || !strings.Contains(cond.Message, "op-running") {
+				t.Errorf("expected Ready=False %s naming the CR, got %+v", tc.reason, cond)
+			}
+			crIntact(t, c)
+		})
+	}
+
+	t.Run("strategy absent past the ceiling: fails naming the CR left in place", func(t *testing.T) {
+		r, c, resolved, job := build(t, 2*psmdbRunningCeiling, false, true)
+		if _, err := r.reconcileMongoDB(context.Background(), job.DeepCopy(), resolved); err != nil {
+			t.Fatalf("reconcileMongoDB: %v", err)
+		}
+		p := getJob(t, c, job.Name)
+		if p.Status.Phase != backupsv1alpha1.BackupJobPhaseFailed || !strings.Contains(p.Status.Message, "op-running") || !strings.Contains(p.Status.Message, "left in place") {
+			t.Errorf("past the ceiling the job must fail naming the CR left in place, got phase=%q msg=%q", p.Status.Phase, p.Status.Message)
+		}
+		crIntact(t, c)
+	})
+}
+
+// The settle check compares the entry with what the apply writes, field by
+// field: a non-empty value the entry lacks is a change the apply adds, a
+// different type is a change, and a zero value the entry lacks is not.
+func TestPsmdbStorageEntrySettled(t *testing.T) {
+	s3 := &strategyv1alpha1.MongoDBStorageS3{Bucket: "cozy-backups", EndpointURL: "https://s3.example", Prefix: "tenant/app1", CredentialsSecret: "cozy-backups-creds"}
+	on := true
+	cases := []struct {
+		name string
+		live string
+		s3   *strategyv1alpha1.MongoDBStorageS3
+		want bool
+	}{
+		{"as applied", settledPlatformEntry, s3, true},
+		{"operator rewrote it without the empty region and the false flag", `{"type":"s3","s3":{"bucket":"cozy-backups","endpointUrl":"https://s3.example","prefix":"tenant/app1","credentialsSecret":"cozy-backups-creds"}}`, s3, true},
+		{"entry lacks the endpoint the apply adds", `{"type":"s3","s3":{"bucket":"cozy-backups","prefix":"tenant/app1","credentialsSecret":"cozy-backups-creds"}}`, s3, false},
+		{"entry lacks forcePathStyle the strategy now sets", settledPlatformEntry, &strategyv1alpha1.MongoDBStorageS3{Bucket: "cozy-backups", EndpointURL: "https://s3.example", Prefix: "tenant/app1", CredentialsSecret: "cozy-backups-creds", ForcePathStyle: &on}, false},
+		{"entry carries forcePathStyle the strategy dropped", `{"type":"s3","s3":{"bucket":"cozy-backups","endpointUrl":"https://s3.example","prefix":"tenant/app1","credentialsSecret":"cozy-backups-creds","forcePathStyle":true}}`, s3, false},
+		{"bucket moved", `{"type":"s3","s3":{"bucket":"old","endpointUrl":"https://s3.example","prefix":"tenant/app1","credentialsSecret":"cozy-backups-creds"}}`, s3, false},
+		{"different storage type", `{"type":"azure","s3":{"bucket":"cozy-backups","endpointUrl":"https://s3.example","prefix":"tenant/app1","credentialsSecret":"cozy-backups-creds"}}`, s3, false},
+		{"absent", ``, s3, false},
+	}
+	for _, tc := range cases {
+		if got := psmdbStorageEntrySettled(runtime.RawExtension{Raw: []byte(tc.live)}, tc.s3); got != tc.want {
+			t.Errorf("%s: settled=%v, want %v", tc.name, got, tc.want)
+		}
+	}
+}
diff --git a/internal/backupcontroller/psmdbtypes/types.go b/internal/backupcontroller/psmdbtypes/types.go
new file mode 100644
index 0000000000..e1f1893910
--- /dev/null
+++ b/internal/backupcontroller/psmdbtypes/types.go
@@ -0,0 +1,269 @@
+// SPDX-License-Identifier: Apache-2.0
+
+// Package psmdbtypes declares the minimum subset of psmdb.percona.com/v1 CRD
+// shape that the backupstrategy controller operates on. As with mariadbtypes,
+// we avoid pulling the full upstream percona-server-mongodb-operator Go API
+// (which transitively imports a large surface area we do not need) while still
+// letting us drop unstructured.Unstructured from the driver and its tests.
+//
+// The driver reads PerconaServerMongoDB for an existence/backup-enabled gate,
+// creates PerconaServerMongoDBBackup CRs on the BackupJob path, and creates
+// PerconaServerMongoDBRestore CRs on the RestoreJob path. On the useSystemBucket
+// flow it also server-side-applies spec.backup.storages onto the live
+// PerconaServerMongoDB (storage injection) and strips its own delete-backup
+// finalizer from a PerconaServerMongoDBBackup on teardown. These partial specs
+// carry only the fields the driver reads or writes; unknown fields are preserved
+// by the server on any apply/merge patch, so injecting one subtree never drops
+// the storage the operator resolved from the rest of the object.
+//
+// +groupName=psmdb.percona.com
+// +versionName=v1
+package psmdbtypes
+
+import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+)
+
+const (
+	GroupName = "psmdb.percona.com"
+	Version   = "v1"
+
+	// Backup / Restore terminal + in-progress states. The psmdb operator
+	// (percona-backup-mongodb underneath) expresses run state as a plain
+	// string in .status.state rather than metav1 conditions, so the driver
+	// matches on these literals. "ready" is the only success value; "error"
+	// and "rejected" are terminal failures; the rest are in-progress
+	// (including the empty string a freshly-created CR carries before the
+	// operator picks it up).
+	StateReady     = "ready"
+	StateError     = "error"
+	StateRejected  = "rejected"
+	StateRequested = "requested"
+	StateRunning   = "running"
+	StateWaiting   = "waiting"
+
+	// BackupTypeLogical is the only backup type the driver takes. Logical
+	// (mongodump/pbm logical) dumps are portable across clusters, which is
+	// what makes restore-to-differently-named instances possible; physical
+	// backups are pinned to the source topology.
+	BackupTypeLogical = "logical"
+)
+
+var (
+	GroupVersion  = schema.GroupVersion{Group: GroupName, Version: Version}
+	SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
+	AddToScheme   = SchemeBuilder.AddToScheme
+)
+
+func addKnownTypes(scheme *runtime.Scheme) error {
+	scheme.AddKnownTypes(GroupVersion,
+		&PerconaServerMongoDB{}, &PerconaServerMongoDBList{},
+		&PerconaServerMongoDBBackup{}, &PerconaServerMongoDBBackupList{},
+		&PerconaServerMongoDBRestore{}, &PerconaServerMongoDBRestoreList{},
+	)
+	metav1.AddToGroupVersion(scheme, GroupVersion)
+	return nil
+}
+
+// ---------------------------------------------------------------------------
+// PerconaServerMongoDB (cluster) — existence / backup-enabled gate
+// ---------------------------------------------------------------------------
+
+// +kubebuilder:object:root=true
+type PerconaServerMongoDB struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+	Spec              PerconaServerMongoDBSpec   `json:"spec,omitempty"`
+	Status            PerconaServerMongoDBStatus `json:"status,omitempty"`
+}
+
+// +kubebuilder:object:root=true
+type PerconaServerMongoDBList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+	Items           []PerconaServerMongoDB `json:"items"`
+}
+
+// PerconaServerMongoDBSpec carries only the backup sub-tree the driver reads
+// to gate on "does this cluster have on-demand backups wired up". The psmdb
+// operator only runs the percona-backup-mongodb agents (and therefore only
+// services PerconaServerMongoDBBackup CRs) when spec.backup.enabled is true
+// and at least one storage is declared; without that a Backup CR would sit in
+// "waiting"/"error" forever. The driver reads these to surface a precise
+// precondition message instead of a generic deadline hang.
+type PerconaServerMongoDBSpec struct {
+	Backup PerconaServerMongoDBBackupConfig `json:"backup,omitempty"`
+}
+
+// PerconaServerMongoDBBackupConfig mirrors the psmdb .spec.backup fields the
+// driver inspects. Storages is a name→config map whose values the driver decodes
+// only as far as .s3.bucket/.s3.credentialsSecret. Tasks and PITR are read for
+// presence alone: the mongodb chart renders them only without useSystemBucket,
+// so a cluster still carrying them was last rendered on the legacy flow whatever
+// the app CR's desired values say. Both stay opaque and omitempty so the
+// driver's server-side apply never touches them.
+type PerconaServerMongoDBBackupConfig struct {
+	Enabled  bool                            `json:"enabled,omitempty"`
+	Storages map[string]runtime.RawExtension `json:"storages,omitempty"`
+	Tasks    []runtime.RawExtension          `json:"tasks,omitempty"`
+	PITR     *PerconaServerMongoDBPITR       `json:"pitr,omitempty"`
+}
+
+// PerconaServerMongoDBPITR mirrors psmdb .spec.backup.pitr down to the enabled
+// flag.
+type PerconaServerMongoDBPITR struct {
+	Enabled bool `json:"enabled,omitempty"`
+}
+
+// PerconaServerMongoDBStatus carries the fields the driver reads to know the
+// operator has acted on the cluster's current spec: ObservedGeneration is
+// stamped at the end of every cluster reconcile, and the PBMReady condition
+// goes False while the operator pushes a changed spec.backup config into pbm
+// and True once pbm holds it. A PerconaServerMongoDBBackup minted before both
+// hold is resolved by the operator against whatever pbm still carries.
+type PerconaServerMongoDBStatus struct {
+	State              string                          `json:"state,omitempty"`
+	ObservedGeneration int64                           `json:"observedGeneration,omitempty"`
+	Conditions         []PerconaServerMongoDBCondition `json:"conditions,omitempty"`
+}
+
+// PerconaServerMongoDBCondition mirrors the operator's ClusterCondition down
+// to the two fields the driver compares.
+type PerconaServerMongoDBCondition struct {
+	Type   string `json:"type"`
+	Status string `json:"status"`
+}
+
+// ConditionPBMReady is the cluster condition the operator sets around pushing
+// spec.backup into pbm's own config.
+const ConditionPBMReady = "PBMReady"
+
+// ---------------------------------------------------------------------------
+// PerconaServerMongoDBBackup (on-demand logical backup)
+// ---------------------------------------------------------------------------
+
+// +kubebuilder:object:root=true
+type PerconaServerMongoDBBackup struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+	Spec              PerconaServerMongoDBBackupSpec   `json:"spec,omitempty"`
+	Status            PerconaServerMongoDBBackupStatus `json:"status,omitempty"`
+}
+
+// +kubebuilder:object:root=true
+type PerconaServerMongoDBBackupList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+	Items           []PerconaServerMongoDBBackup `json:"items"`
+}
+
+// PerconaServerMongoDBBackupSpec mirrors the on-demand backup spec. The
+// storage is NOT inlined here (unlike mariadb): psmdb resolves StorageName
+// against the source cluster's spec.backup.storages, so the storage config
+// lives on the PerconaServerMongoDB CR and the Backup CR only names it.
+type PerconaServerMongoDBBackupSpec struct {
+	ClusterName      string `json:"clusterName"`
+	StorageName      string `json:"storageName,omitempty"`
+	Type             string `json:"type,omitempty"`
+	CompressionType  string `json:"compressionType,omitempty"`
+	CompressionLevel *int   `json:"compressionLevel,omitempty"`
+}
+
+// PerconaServerMongoDBBackupStatus mirrors the status fields the driver reads
+// to (a) drive the poll loop (State) and (b) build a restore backupSource
+// (Destination + S3). The operator populates S3 with the fully-resolved
+// storage config (bucket, endpoint, credentialsSecret, prefix, ...) it used,
+// which is exactly what a restore-to-differently-named needs.
+type PerconaServerMongoDBBackupStatus struct {
+	State                string           `json:"state,omitempty"`
+	Destination          string           `json:"destination,omitempty"`
+	StorageName          string           `json:"storageName,omitempty"`
+	Type                 string           `json:"type,omitempty"`
+	PBMName              string           `json:"pbmName,omitempty"`
+	Error                string           `json:"error,omitempty"`
+	Completed            *metav1.Time     `json:"completed,omitempty"`
+	LastTransition       *metav1.Time     `json:"lastTransition,omitempty"`
+	LatestRestorableTime *metav1.Time     `json:"latestRestorableTime,omitempty"`
+	S3                   *BackupStorageS3 `json:"s3,omitempty"`
+}
+
+// ---------------------------------------------------------------------------
+// PerconaServerMongoDBRestore (logical restore, optionally to a new cluster)
+// ---------------------------------------------------------------------------
+
+// +kubebuilder:object:root=true
+type PerconaServerMongoDBRestore struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+	Spec              PerconaServerMongoDBRestoreSpec   `json:"spec,omitempty"`
+	Status            PerconaServerMongoDBRestoreStatus `json:"status,omitempty"`
+}
+
+// +kubebuilder:object:root=true
+type PerconaServerMongoDBRestoreList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+	Items           []PerconaServerMongoDBRestore `json:"items"`
+}
+
+// PerconaServerMongoDBRestoreSpec mirrors the restore spec. The driver always
+// drives BackupSource (not BackupName): BackupName binds a restore to a
+// PerconaServerMongoDBBackup CR of the SAME cluster, which cannot express
+// restore-into-a-differently-named-cluster; BackupSource carries the S3
+// destination + credentials explicitly, so it works both in-place and to-copy
+// and survives the source Backup CR being reaped.
+type PerconaServerMongoDBRestoreSpec struct {
+	ClusterName  string        `json:"clusterName"`
+	BackupName   string        `json:"backupName,omitempty"`
+	BackupSource *BackupSource `json:"backupSource,omitempty"`
+	StorageName  string        `json:"storageName,omitempty"`
+	PITR         *PITRSpec     `json:"pitr,omitempty"`
+}
+
+type PerconaServerMongoDBRestoreStatus struct {
+	State      string       `json:"state,omitempty"`
+	Error      string       `json:"error,omitempty"`
+	PBMName    string       `json:"pbmName,omitempty"`
+	PITRTarget string       `json:"pitrTarget,omitempty"`
+	Completed  *metav1.Time `json:"completed,omitempty"`
+}
+
+// ---------------------------------------------------------------------------
+// Shared storage / PITR shapes
+// ---------------------------------------------------------------------------
+
+// BackupSource mirrors restore.spec.backupSource and the backup .status shape
+// it is copied from. Destination is the full backup URI (e.g.
+// s3://bucket/prefix/2024-...); S3 carries the storage config the operator
+// needs to reach it.
+type BackupSource struct {
+	Type        string           `json:"type,omitempty"`
+	Destination string           `json:"destination,omitempty"`
+	StorageName string           `json:"storageName,omitempty"`
+	S3          *BackupStorageS3 `json:"s3,omitempty"`
+}
+
+// BackupStorageS3 mirrors the psmdb s3 storage block as it appears both in
+// backup .status.s3 and restore .spec.backupSource.s3. CredentialsSecret is a
+// Secret NAME in the CR's namespace (by reference — never a raw credential),
+// which keeps any persisted snapshot free of secret material.
+type BackupStorageS3 struct {
+	Bucket                string `json:"bucket,omitempty"`
+	CredentialsSecret     string `json:"credentialsSecret,omitempty"`
+	EndpointURL           string `json:"endpointUrl,omitempty"`
+	Prefix                string `json:"prefix,omitempty"`
+	Region                string `json:"region,omitempty"`
+	StorageClass          string `json:"storageClass,omitempty"`
+	ForcePathStyle        *bool  `json:"forcePathStyle,omitempty"`
+	InsecureSkipTLSVerify bool   `json:"insecureSkipTLSVerify,omitempty"`
+}
+
+// PITRSpec mirrors restore.spec.pitr. Type is "date" or "latest"; Date is
+// required for "date" (format "YYYY-MM-DD HH:MM:SS", enforced by the operator
+// CRD's XValidation).
+type PITRSpec struct {
+	Type string `json:"type,omitempty"`
+	Date string `json:"date,omitempty"`
+}
diff --git a/internal/backupcontroller/psmdbtypes/zz_generated.deepcopy.go b/internal/backupcontroller/psmdbtypes/zz_generated.deepcopy.go
new file mode 100644
index 0000000000..51a95a2e7a
--- /dev/null
+++ b/internal/backupcontroller/psmdbtypes/zz_generated.deepcopy.go
@@ -0,0 +1,371 @@
+// SPDX-License-Identifier: Apache-2.0
+
+// Hand-written DeepCopy methods. As with mariadbtypes, this package opted not
+// to take the full percona-server-mongodb-operator Go API as a dependency, so
+// deepcopy-gen is not wired up; the surface area is small enough to maintain
+// by hand.
+
+package psmdbtypes
+
+import (
+	"k8s.io/apimachinery/pkg/runtime"
+)
+
+// ---------------------------------------------------------------------------
+// PerconaServerMongoDB
+// ---------------------------------------------------------------------------
+
+func (in *PerconaServerMongoDB) DeepCopyInto(out *PerconaServerMongoDB) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
+	in.Spec.DeepCopyInto(&out.Spec)
+	in.Status.DeepCopyInto(&out.Status)
+}
+
+func (in *PerconaServerMongoDBStatus) DeepCopyInto(out *PerconaServerMongoDBStatus) {
+	*out = *in
+	if in.Conditions != nil {
+		out.Conditions = make([]PerconaServerMongoDBCondition, len(in.Conditions))
+		copy(out.Conditions, in.Conditions)
+	}
+}
+
+func (in *PerconaServerMongoDBStatus) DeepCopy() *PerconaServerMongoDBStatus {
+	if in == nil {
+		return nil
+	}
+	out := new(PerconaServerMongoDBStatus)
+	in.DeepCopyInto(out)
+	return out
+}
+
+func (in *PerconaServerMongoDB) DeepCopy() *PerconaServerMongoDB {
+	if in == nil {
+		return nil
+	}
+	out := new(PerconaServerMongoDB)
+	in.DeepCopyInto(out)
+	return out
+}
+
+func (in *PerconaServerMongoDB) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+func (in *PerconaServerMongoDBList) DeepCopyInto(out *PerconaServerMongoDBList) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ListMeta.DeepCopyInto(&out.ListMeta)
+	if in.Items != nil {
+		out.Items = make([]PerconaServerMongoDB, len(in.Items))
+		for i := range in.Items {
+			in.Items[i].DeepCopyInto(&out.Items[i])
+		}
+	}
+}
+
+func (in *PerconaServerMongoDBList) DeepCopy() *PerconaServerMongoDBList {
+	if in == nil {
+		return nil
+	}
+	out := new(PerconaServerMongoDBList)
+	in.DeepCopyInto(out)
+	return out
+}
+
+func (in *PerconaServerMongoDBList) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+func (in *PerconaServerMongoDBSpec) DeepCopyInto(out *PerconaServerMongoDBSpec) {
+	*out = *in
+	in.Backup.DeepCopyInto(&out.Backup)
+}
+
+func (in *PerconaServerMongoDBSpec) DeepCopy() *PerconaServerMongoDBSpec {
+	if in == nil {
+		return nil
+	}
+	out := new(PerconaServerMongoDBSpec)
+	in.DeepCopyInto(out)
+	return out
+}
+
+func (in *PerconaServerMongoDBBackupConfig) DeepCopyInto(out *PerconaServerMongoDBBackupConfig) {
+	*out = *in
+	if in.Storages != nil {
+		out.Storages = make(map[string]runtime.RawExtension, len(in.Storages))
+		for k, v := range in.Storages {
+			out.Storages[k] = *v.DeepCopy()
+		}
+	}
+	if in.Tasks != nil {
+		out.Tasks = make([]runtime.RawExtension, len(in.Tasks))
+		for i := range in.Tasks {
+			in.Tasks[i].DeepCopyInto(&out.Tasks[i])
+		}
+	}
+	if in.PITR != nil {
+		out.PITR = new(PerconaServerMongoDBPITR)
+		*out.PITR = *in.PITR
+	}
+}
+
+func (in *PerconaServerMongoDBBackupConfig) DeepCopy() *PerconaServerMongoDBBackupConfig {
+	if in == nil {
+		return nil
+	}
+	out := new(PerconaServerMongoDBBackupConfig)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// ---------------------------------------------------------------------------
+// PerconaServerMongoDBBackup
+// ---------------------------------------------------------------------------
+
+func (in *PerconaServerMongoDBBackup) DeepCopyInto(out *PerconaServerMongoDBBackup) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
+	in.Spec.DeepCopyInto(&out.Spec)
+	in.Status.DeepCopyInto(&out.Status)
+}
+
+func (in *PerconaServerMongoDBBackup) DeepCopy() *PerconaServerMongoDBBackup {
+	if in == nil {
+		return nil
+	}
+	out := new(PerconaServerMongoDBBackup)
+	in.DeepCopyInto(out)
+	return out
+}
+
+func (in *PerconaServerMongoDBBackup) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+func (in *PerconaServerMongoDBBackupList) DeepCopyInto(out *PerconaServerMongoDBBackupList) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ListMeta.DeepCopyInto(&out.ListMeta)
+	if in.Items != nil {
+		out.Items = make([]PerconaServerMongoDBBackup, len(in.Items))
+		for i := range in.Items {
+			in.Items[i].DeepCopyInto(&out.Items[i])
+		}
+	}
+}
+
+func (in *PerconaServerMongoDBBackupList) DeepCopy() *PerconaServerMongoDBBackupList {
+	if in == nil {
+		return nil
+	}
+	out := new(PerconaServerMongoDBBackupList)
+	in.DeepCopyInto(out)
+	return out
+}
+
+func (in *PerconaServerMongoDBBackupList) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+func (in *PerconaServerMongoDBBackupSpec) DeepCopyInto(out *PerconaServerMongoDBBackupSpec) {
+	*out = *in
+	if in.CompressionLevel != nil {
+		out.CompressionLevel = new(int)
+		*out.CompressionLevel = *in.CompressionLevel
+	}
+}
+
+func (in *PerconaServerMongoDBBackupSpec) DeepCopy() *PerconaServerMongoDBBackupSpec {
+	if in == nil {
+		return nil
+	}
+	out := new(PerconaServerMongoDBBackupSpec)
+	in.DeepCopyInto(out)
+	return out
+}
+
+func (in *PerconaServerMongoDBBackupStatus) DeepCopyInto(out *PerconaServerMongoDBBackupStatus) {
+	*out = *in
+	if in.Completed != nil {
+		out.Completed = in.Completed.DeepCopy()
+	}
+	if in.LastTransition != nil {
+		out.LastTransition = in.LastTransition.DeepCopy()
+	}
+	if in.LatestRestorableTime != nil {
+		out.LatestRestorableTime = in.LatestRestorableTime.DeepCopy()
+	}
+	if in.S3 != nil {
+		out.S3 = new(BackupStorageS3)
+		in.S3.DeepCopyInto(out.S3)
+	}
+}
+
+func (in *PerconaServerMongoDBBackupStatus) DeepCopy() *PerconaServerMongoDBBackupStatus {
+	if in == nil {
+		return nil
+	}
+	out := new(PerconaServerMongoDBBackupStatus)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// ---------------------------------------------------------------------------
+// PerconaServerMongoDBRestore
+// ---------------------------------------------------------------------------
+
+func (in *PerconaServerMongoDBRestore) DeepCopyInto(out *PerconaServerMongoDBRestore) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
+	in.Spec.DeepCopyInto(&out.Spec)
+	in.Status.DeepCopyInto(&out.Status)
+}
+
+func (in *PerconaServerMongoDBRestore) DeepCopy() *PerconaServerMongoDBRestore {
+	if in == nil {
+		return nil
+	}
+	out := new(PerconaServerMongoDBRestore)
+	in.DeepCopyInto(out)
+	return out
+}
+
+func (in *PerconaServerMongoDBRestore) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+func (in *PerconaServerMongoDBRestoreList) DeepCopyInto(out *PerconaServerMongoDBRestoreList) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ListMeta.DeepCopyInto(&out.ListMeta)
+	if in.Items != nil {
+		out.Items = make([]PerconaServerMongoDBRestore, len(in.Items))
+		for i := range in.Items {
+			in.Items[i].DeepCopyInto(&out.Items[i])
+		}
+	}
+}
+
+func (in *PerconaServerMongoDBRestoreList) DeepCopy() *PerconaServerMongoDBRestoreList {
+	if in == nil {
+		return nil
+	}
+	out := new(PerconaServerMongoDBRestoreList)
+	in.DeepCopyInto(out)
+	return out
+}
+
+func (in *PerconaServerMongoDBRestoreList) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+func (in *PerconaServerMongoDBRestoreSpec) DeepCopyInto(out *PerconaServerMongoDBRestoreSpec) {
+	*out = *in
+	if in.BackupSource != nil {
+		out.BackupSource = new(BackupSource)
+		in.BackupSource.DeepCopyInto(out.BackupSource)
+	}
+	if in.PITR != nil {
+		out.PITR = new(PITRSpec)
+		*out.PITR = *in.PITR
+	}
+}
+
+func (in *PerconaServerMongoDBRestoreSpec) DeepCopy() *PerconaServerMongoDBRestoreSpec {
+	if in == nil {
+		return nil
+	}
+	out := new(PerconaServerMongoDBRestoreSpec)
+	in.DeepCopyInto(out)
+	return out
+}
+
+func (in *PerconaServerMongoDBRestoreStatus) DeepCopyInto(out *PerconaServerMongoDBRestoreStatus) {
+	*out = *in
+	if in.Completed != nil {
+		out.Completed = in.Completed.DeepCopy()
+	}
+}
+
+func (in *PerconaServerMongoDBRestoreStatus) DeepCopy() *PerconaServerMongoDBRestoreStatus {
+	if in == nil {
+		return nil
+	}
+	out := new(PerconaServerMongoDBRestoreStatus)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// ---------------------------------------------------------------------------
+// Shared storage / PITR shapes
+// ---------------------------------------------------------------------------
+
+func (in *BackupSource) DeepCopyInto(out *BackupSource) {
+	*out = *in
+	if in.S3 != nil {
+		out.S3 = new(BackupStorageS3)
+		in.S3.DeepCopyInto(out.S3)
+	}
+}
+
+func (in *BackupSource) DeepCopy() *BackupSource {
+	if in == nil {
+		return nil
+	}
+	out := new(BackupSource)
+	in.DeepCopyInto(out)
+	return out
+}
+
+func (in *BackupStorageS3) DeepCopyInto(out *BackupStorageS3) {
+	*out = *in
+	if in.ForcePathStyle != nil {
+		out.ForcePathStyle = new(bool)
+		*out.ForcePathStyle = *in.ForcePathStyle
+	}
+}
+
+func (in *BackupStorageS3) DeepCopy() *BackupStorageS3 {
+	if in == nil {
+		return nil
+	}
+	out := new(BackupStorageS3)
+	in.DeepCopyInto(out)
+	return out
+}
+
+func (in *PITRSpec) DeepCopyInto(out *PITRSpec) {
+	*out = *in
+}
+
+func (in *PITRSpec) DeepCopy() *PITRSpec {
+	if in == nil {
+		return nil
+	}
+	out := new(PITRSpec)
+	in.DeepCopyInto(out)
+	return out
+}
diff --git a/internal/backupcontroller/rabbitmqstrategy_controller.go b/internal/backupcontroller/rabbitmqstrategy_controller.go
new file mode 100644
index 0000000000..adfe11d830
--- /dev/null
+++ b/internal/backupcontroller/rabbitmqstrategy_controller.go
@@ -0,0 +1,885 @@
+// SPDX-License-Identifier: Apache-2.0
+package backupcontroller
+
+import (
+	"context"
+	"fmt"
+	"maps"
+	"strings"
+	"time"
+
+	batchv1 "k8s.io/api/batch/v1"
+	corev1 "k8s.io/api/core/v1"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	apimeta "k8s.io/apimachinery/pkg/api/meta"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/types"
+	ctrl "sigs.k8s.io/controller-runtime"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
+
+	strategyv1alpha1 "github.com/cozystack/cozystack/api/backups/strategy/v1alpha1"
+	backupsv1alpha1 "github.com/cozystack/cozystack/api/backups/v1alpha1"
+	"github.com/cozystack/cozystack/internal/backupcontroller/rabbitmqtypes"
+	"github.com/cozystack/cozystack/internal/template"
+)
+
+// ---------------------------------------------------------------------------
+// Constants
+// ---------------------------------------------------------------------------
+
+const (
+	rabbitmqAppKind = "RabbitMQ"
+
+	// rabbitmqReleasePrefix is the release.prefix the rabbitmq-rd
+	// ApplicationDefinition prepends, so an application named <app> is served by
+	// a rabbitmq.com/RabbitmqCluster (and its Service / default-user Secret)
+	// named rabbitmq-<app>. The driver reads that cluster for its readiness
+	// gate.
+	rabbitmqReleasePrefix = "rabbitmq-"
+
+	rabbitmqLabelMode   = "rabbitmq.strategy.backups.cozystack.io/mode"
+	rabbitmqModeBackup  = "backup"
+	rabbitmqModeRestore = "restore"
+	rabbitmqModeCleanup = "cleanup"
+
+	rabbitmqParamPrefix = "rabbitmq.strategy.backups.cozystack.io/parameter/"
+
+	// rabbitmqSkipArtifactCleanupAnnotation, set to "true" on a Backup, is the
+	// operator escape hatch: cleanup then releases the Backup without deleting
+	// (or waiting to delete) its S3 object. It exists to unstick a Backup left
+	// Terminating because object storage is unreachable - the object is left in
+	// the bucket to be reclaimed manually or by a bucket lifecycle policy.
+	rabbitmqSkipArtifactCleanupAnnotation = "backups.cozystack.io/skip-artifact-cleanup"
+
+	rabbitmqPollInterval = 5 * time.Second
+
+	// rabbitmqBackupDeadline bounds the AllReplicasReady precondition wait: past
+	// it a BackupJob/RestoreJob whose broker never becomes ready fails with the
+	// last not-ready message instead of requeuing forever in phase=Running.
+	// Mirrors psmdbDefaultBackupDeadline.
+	rabbitmqBackupDeadline = 30 * time.Minute
+)
+
+// rabbitmqBackupDeadlineExceeded reports whether the precondition wait has run
+// past rabbitmqBackupDeadline since StartedAt. Mirrors psmdbBackupDeadlineExceeded.
+func rabbitmqBackupDeadlineExceeded(startedAt *metav1.Time) bool {
+	return startedAt != nil && time.Since(startedAt.Time) > rabbitmqBackupDeadline
+}
+
+// rabbitmqClusterName maps an apps.cozystack.io/RabbitMQ application name to the
+// rabbitmq.com/RabbitmqCluster the operator creates for it.
+func rabbitmqClusterName(appName string) string {
+	return rabbitmqReleasePrefix + appName
+}
+
+// validateRabbitmqApplicationRef rejects ApplicationRefs that are not
+// apps.cozystack.io/RabbitMQ, so the dispatcher cannot route a foreign ref into
+// this driver. Empty APIGroup is accepted as the documented default, matching
+// the other drivers and the BackupClass resolver.
+func validateRabbitmqApplicationRef(ref corev1.TypedLocalObjectReference) error {
+	if ref.Kind != rabbitmqAppKind {
+		return fmt.Errorf("rabbitmq strategy supports applicationRef.kind=%q, got %q", rabbitmqAppKind, ref.Kind)
+	}
+	apiGroup := ""
+	if ref.APIGroup != nil {
+		apiGroup = *ref.APIGroup
+	}
+	if apiGroup != "" && apiGroup != backupsv1alpha1.DefaultApplicationAPIGroup {
+		return fmt.Errorf("rabbitmq strategy supports applicationRef.apiGroup=%q, got %q", backupsv1alpha1.DefaultApplicationAPIGroup, apiGroup)
+	}
+	return nil
+}
+
+// rabbitmqBackupParameters round-trips BackupClassStrategy parameters through
+// the Backup's DriverMetadata so a later RestoreJob re-renders the strategy
+// template with the same values in effect at backup time.
+func rabbitmqBackupParameters(b *backupsv1alpha1.Backup) map[string]string {
+	out := map[string]string{}
+	for k, v := range b.Spec.DriverMetadata {
+		if !strings.HasPrefix(k, rabbitmqParamPrefix) {
+			continue
+		}
+		paramKey := strings.TrimPrefix(k, rabbitmqParamPrefix)
+		if paramKey == "" {
+			continue
+		}
+		out[paramKey] = v
+	}
+	return out
+}
+
+// rabbitmqRenderContext builds the context every Rabbitmq strategy string field
+// is rendered against: the live application object, the release shorthand, the
+// run mode, the resolved parameters, and (restore only) the source Backup. The
+// pod template and the artifact URI render against this one context.
+func rabbitmqRenderContext(
+	app map[string]any,
+	releaseName, releaseNamespace, mode, backupName, artifactURI string,
+	parameters map[string]string,
+	backup *backupsv1alpha1.Backup,
+) map[string]any {
+	ctxMap := map[string]any{
+		"Application": app,
+		"Release": map[string]string{
+			"Name":      releaseName,
+			"Namespace": releaseNamespace,
+		},
+		"Mode": mode,
+		// BackupName is the per-run identity used to scope the object key so
+		// distinct backups of one application do not overwrite each other. On
+		// backup it is the BackupJob name (which the produced Backup is named
+		// after); on restore it is the source Backup name.
+		"BackupName": backupName,
+		// ArtifactURI is the single source of truth for the stored object's
+		// location. On backup it is the rendered artifactURITemplate (also
+		// recorded on the Backup); on restore it is that recorded value read
+		// back from the Backup, so restore fetches the exact object the backup
+		// wrote and a later change to the key layout cannot orphan old backups.
+		"ArtifactURI": artifactURI,
+		"Parameters":  parameters,
+	}
+	if backup != nil {
+		// Expose ApplicationRef so a to-copy restore can address the SOURCE
+		// release's object key even when restoring into a differently-named
+		// target. Mirrors renderAltinityTemplate's rationale.
+		sourceAPIGroup := ""
+		if backup.Spec.ApplicationRef.APIGroup != nil {
+			sourceAPIGroup = *backup.Spec.ApplicationRef.APIGroup
+		}
+		ctxMap["Backup"] = map[string]any{
+			"Name":      backup.Name,
+			"Namespace": backup.Namespace,
+			"ApplicationRef": map[string]string{
+				"APIGroup": sourceAPIGroup,
+				"Kind":     backup.Spec.ApplicationRef.Kind,
+				"Name":     backup.Spec.ApplicationRef.Name,
+			},
+		}
+	}
+	return ctxMap
+}
+
+func renderRabbitmqTemplate(tmpl corev1.PodTemplateSpec, renderCtx map[string]any) (*corev1.PodTemplateSpec, error) {
+	return template.Template(&tmpl, renderCtx)
+}
+
+// renderRabbitmqArtifactURI renders the strategy's artifact URI template,
+// surfacing template errors so a broken URI fails the backup rather than
+// recording a half-rendered location.
+func renderRabbitmqArtifactURI(tmplStr string, renderCtx map[string]any) (string, error) {
+	uri, err := template.String(tmplStr, renderCtx)
+	if err != nil {
+		return "", fmt.Errorf("artifact URI template: %w", err)
+	}
+	return strings.TrimSpace(uri), nil
+}
+
+// rabbitmqNotReadyMessage reports why the RabbitmqCluster is not ready to
+// service a definitions export/import, or "" when it is. The cluster-operator
+// only serves the management API once every replica is up, so the driver gates
+// on AllReplicasReady and surfaces a precise Ready=False message instead of a
+// Job that starts and fails against an unreachable API.
+func rabbitmqNotReadyMessage(cluster *rabbitmqtypes.RabbitmqCluster) string {
+	for _, c := range cluster.Status.Conditions {
+		if c.Type != rabbitmqtypes.ConditionAllReplicasReady {
+			continue
+		}
+		if c.Status == metav1.ConditionTrue {
+			return ""
+		}
+		msg := fmt.Sprintf("RabbitmqCluster %s is %s=%s", cluster.Name, c.Type, c.Status)
+		if c.Message != "" {
+			msg += ": " + c.Message
+		}
+		return msg
+	}
+	return fmt.Sprintf("RabbitmqCluster %s has no %s condition yet", cluster.Name, rabbitmqtypes.ConditionAllReplicasReady)
+}
+
+// ---------------------------------------------------------------------------
+// BackupJob path
+// ---------------------------------------------------------------------------
+
+func (r *BackupJobReconciler) reconcileRabbitmq(ctx context.Context, j *backupsv1alpha1.BackupJob, resolved *ResolvedBackupConfig) (ctrl.Result, error) {
+	logger := getLogger(ctx)
+	logger.Debug("reconciling Rabbitmq strategy", "backupjob", j.Name, "phase", j.Status.Phase)
+
+	if j.Status.Phase == backupsv1alpha1.BackupJobPhaseSucceeded ||
+		j.Status.Phase == backupsv1alpha1.BackupJobPhaseFailed {
+		return ctrl.Result{}, nil
+	}
+
+	if err := validateRabbitmqApplicationRef(j.Spec.ApplicationRef); err != nil {
+		return r.markBackupJobFailed(ctx, j, err.Error())
+	}
+
+	// First-reconcile bookkeeping. Refetch before writing StartedAt so a stale
+	// informer cache cannot slide the timestamp forward across reconciles.
+	// Mirrors reconcileAltinity / reconcileCNPG.
+	if j.Status.StartedAt == nil {
+		fresh := &backupsv1alpha1.BackupJob{}
+		if err := r.Get(ctx, types.NamespacedName{Namespace: j.Namespace, Name: j.Name}, fresh); err != nil {
+			return ctrl.Result{}, err
+		}
+		if fresh.Status.StartedAt != nil {
+			j.Status.StartedAt = fresh.Status.StartedAt
+			j.Status.Phase = fresh.Status.Phase
+		} else {
+			base := fresh.DeepCopy()
+			now := metav1.Now()
+			fresh.Status.StartedAt = &now
+			fresh.Status.Phase = backupsv1alpha1.BackupJobPhaseRunning
+			if err := r.Status().Patch(ctx, fresh, client.MergeFrom(base)); err != nil {
+				return ctrl.Result{}, err
+			}
+			return ctrl.Result{RequeueAfter: rabbitmqPollInterval}, nil
+		}
+	}
+
+	strategy := &strategyv1alpha1.Rabbitmq{}
+	if err := r.Get(ctx, client.ObjectKey{Name: resolved.StrategyRef.Name}, strategy); err != nil {
+		if apierrors.IsNotFound(err) {
+			return r.requeueStrategyNotReady(ctx, j, resolved.StrategyRef.Name)
+		}
+		return ctrl.Result{}, err
+	}
+
+	app, err := r.getApplicationUnstructured(ctx, j.Namespace, j.Spec.ApplicationRef)
+	if err != nil {
+		if apierrors.IsNotFound(err) {
+			return r.markBackupJobFailed(ctx, j, fmt.Sprintf("RabbitMQ application not found: %s/%s", j.Namespace, j.Spec.ApplicationRef.Name))
+		}
+		return ctrl.Result{}, err
+	}
+
+	// Precondition: defer until the RabbitmqCluster reports every replica ready,
+	// so an export against an unreachable management API surfaces a precise
+	// Ready=False wait instead of a Job that starts and fails.
+	cluster := &rabbitmqtypes.RabbitmqCluster{}
+	clusterName := rabbitmqClusterName(j.Spec.ApplicationRef.Name)
+	notReady := ""
+	if err := r.Get(ctx, client.ObjectKey{Namespace: j.Namespace, Name: clusterName}, cluster); err != nil {
+		if !apierrors.IsNotFound(err) {
+			return ctrl.Result{}, err
+		}
+		notReady = fmt.Sprintf("RabbitmqCluster %s/%s not found yet", j.Namespace, clusterName)
+	} else {
+		notReady = rabbitmqNotReadyMessage(cluster)
+	}
+	if notReady != "" {
+		// Bounded: a broker that never reaches AllReplicasReady (PVC stuck
+		// Pending, OOMKilled, undersized preset) must fail the BackupJob rather
+		// than requeue in phase=Running forever.
+		if rabbitmqBackupDeadlineExceeded(j.Status.StartedAt) {
+			return r.markBackupJobFailed(ctx, j, fmt.Sprintf("RabbitmqCluster did not become ready within %s: %s", rabbitmqBackupDeadline, notReady))
+		}
+		return r.requeueRabbitmqBackupWaiting(ctx, j, "RabbitMQClusterNotReady", notReady)
+	}
+
+	// The artifact URI is the single source of truth for where the export is
+	// stored: render it once, inject it into the Job (which writes exactly that
+	// object), and record the same value on the Backup so restore reads it back
+	// rather than reconstructing a key that a later layout change could orphan.
+	// A strategy that stores backups must set artifactURITemplate.
+	if strategy.Spec.ArtifactURITemplate == "" {
+		return r.markBackupJobFailed(ctx, j, "Rabbitmq strategy has no spec.artifactURITemplate; nothing records where the export is stored")
+	}
+	artifactURI, err := renderRabbitmqArtifactURI(strategy.Spec.ArtifactURITemplate,
+		rabbitmqRenderContext(app, j.Spec.ApplicationRef.Name, j.Namespace, rabbitmqModeBackup, j.Name, "", resolved.Parameters, nil))
+	if err != nil {
+		return r.markBackupJobFailed(ctx, j, fmt.Sprintf("failed to render Rabbitmq strategy artifact URI: %v", err))
+	}
+	renderCtx := rabbitmqRenderContext(app, j.Spec.ApplicationRef.Name, j.Namespace, rabbitmqModeBackup, j.Name, artifactURI, resolved.Parameters, nil)
+	rendered, err := renderRabbitmqTemplate(strategy.Spec.Template, renderCtx)
+	if err != nil {
+		return r.markBackupJobFailed(ctx, j, fmt.Sprintf("failed to template Rabbitmq strategy: %v", err))
+	}
+
+	batchJob, err := r.ensureRabbitmqJob(ctx, j, j.Namespace, jobNameForBackupJob(j),
+		rabbitmqModeBackup,
+		map[string]string{
+			backupsv1alpha1.OwningJobNameLabel:      j.Name,
+			backupsv1alpha1.OwningJobNamespaceLabel: j.Namespace,
+		},
+		rendered,
+	)
+	if err != nil {
+		return r.markBackupJobFailed(ctx, j, fmt.Sprintf("failed to ensure batch/v1.Job: %v", err))
+	}
+
+	switch jobConditionState(batchJob) {
+	case batchv1.JobComplete:
+		if j.Status.BackupRef != nil {
+			return ctrl.Result{}, nil
+		}
+		artifact, err := r.createRabbitmqBackupArtifact(ctx, j, resolved, artifactURI)
+		if err != nil {
+			return r.markBackupJobFailed(ctx, j, fmt.Sprintf("failed to create Backup artifact: %v", err))
+		}
+		now := metav1.Now()
+		j.Status.BackupRef = &corev1.LocalObjectReference{Name: artifact.Name}
+		j.Status.CompletedAt = &now
+		j.Status.Phase = backupsv1alpha1.BackupJobPhaseSucceeded
+		apimeta.SetStatusCondition(&j.Status.Conditions, metav1.Condition{
+			Type:    "Ready",
+			Status:  metav1.ConditionTrue,
+			Reason:  "BackupCompleted",
+			Message: "RabbitMQ definitions backup Job completed",
+		})
+		if err := r.Status().Update(ctx, j); err != nil {
+			return ctrl.Result{}, err
+		}
+		return ctrl.Result{}, nil
+
+	case batchv1.JobFailed:
+		message := jobFailureMessage(batchJob)
+		if message == "" {
+			message = "RabbitMQ definitions backup Job reported Failed"
+		}
+		return r.markBackupJobFailed(ctx, j, message)
+
+	default:
+		return ctrl.Result{RequeueAfter: rabbitmqPollInterval}, nil
+	}
+}
+
+// requeueRabbitmqBackupWaiting records a transient Ready=False condition on the
+// BackupJob and requeues, so an unmet cluster-readiness precondition surfaces a
+// precise wait instead of a Job that starts and fails. Mirrors
+// requeueMongoDBBackupWaiting.
+func (r *BackupJobReconciler) requeueRabbitmqBackupWaiting(ctx context.Context, j *backupsv1alpha1.BackupJob, reason, message string) (ctrl.Result, error) {
+	apimeta.SetStatusCondition(&j.Status.Conditions, metav1.Condition{
+		Type:    "Ready",
+		Status:  metav1.ConditionFalse,
+		Reason:  reason,
+		Message: message,
+	})
+	if err := r.Status().Update(ctx, j); err != nil {
+		return ctrl.Result{}, err
+	}
+	return ctrl.Result{RequeueAfter: rabbitmqPollInterval}, nil
+}
+
+// ensureRabbitmqJob materialises a batch/v1.Job from the rendered
+// PodTemplateSpec, idempotently and with a controllerRef so kube-gc collects it
+// with the owning BackupJob. Mirrors ensureAltinityJob.
+func (r *BackupJobReconciler) ensureRabbitmqJob(
+	ctx context.Context,
+	owner client.Object,
+	namespace, name, mode string,
+	ownerLabels map[string]string,
+	rendered *corev1.PodTemplateSpec,
+) (*batchv1.Job, error) {
+	existing := &batchv1.Job{}
+	err := r.Get(ctx, types.NamespacedName{Namespace: namespace, Name: name}, existing)
+	if err == nil {
+		return existing, nil
+	}
+	if !apierrors.IsNotFound(err) {
+		return nil, err
+	}
+
+	labels := map[string]string{rabbitmqLabelMode: mode}
+	maps.Copy(labels, ownerLabels)
+
+	desired := buildRabbitmqBatchJob(namespace, name, labels, rendered)
+	if err := controllerutil.SetControllerReference(owner, desired, r.Scheme); err != nil {
+		return nil, fmt.Errorf("set controller reference on backup Job: %w", err)
+	}
+	if err := r.Create(ctx, desired); err != nil {
+		if apierrors.IsAlreadyExists(err) {
+			if err := r.Get(ctx, types.NamespacedName{Namespace: namespace, Name: name}, existing); err != nil {
+				return nil, err
+			}
+			return existing, nil
+		}
+		return nil, err
+	}
+	return desired, nil
+}
+
+// ensureRabbitmqRestoreJob is the RestoreJob-side mirror of ensureRabbitmqJob.
+func (r *RestoreJobReconciler) ensureRabbitmqRestoreJob(
+	ctx context.Context,
+	owner client.Object,
+	namespace, name, mode string,
+	ownerLabels map[string]string,
+	rendered *corev1.PodTemplateSpec,
+) (*batchv1.Job, error) {
+	existing := &batchv1.Job{}
+	err := r.Get(ctx, types.NamespacedName{Namespace: namespace, Name: name}, existing)
+	if err == nil {
+		return existing, nil
+	}
+	if !apierrors.IsNotFound(err) {
+		return nil, err
+	}
+
+	labels := map[string]string{rabbitmqLabelMode: mode}
+	maps.Copy(labels, ownerLabels)
+
+	desired := buildRabbitmqBatchJob(namespace, name, labels, rendered)
+	if err := controllerutil.SetControllerReference(owner, desired, r.Scheme); err != nil {
+		return nil, fmt.Errorf("set controller reference on restore Job: %w", err)
+	}
+	if err := r.Create(ctx, desired); err != nil {
+		if apierrors.IsAlreadyExists(err) {
+			if err := r.Get(ctx, types.NamespacedName{Namespace: namespace, Name: name}, existing); err != nil {
+				return nil, err
+			}
+			return existing, nil
+		}
+		return nil, err
+	}
+	return desired, nil
+}
+
+// buildRabbitmqBatchJob wraps the rendered PodTemplateSpec in a one-shot Job.
+// RestartPolicyNever and a small backoff cap match a dump-style backup - the
+// export/import either succeeds or fails. Mirrors buildAltinityBatchJob.
+func buildRabbitmqBatchJob(namespace, name string, labels map[string]string, rendered *corev1.PodTemplateSpec) *batchv1.Job {
+	pod := *rendered.DeepCopy()
+	if pod.Spec.RestartPolicy == "" {
+		pod.Spec.RestartPolicy = corev1.RestartPolicyNever
+	}
+	if pod.Labels == nil {
+		pod.Labels = map[string]string{}
+	}
+	maps.Copy(pod.Labels, labels)
+	backoffLimit := int32(2)
+	return &batchv1.Job{
+		ObjectMeta: metav1.ObjectMeta{
+			Namespace: namespace,
+			Name:      name,
+			Labels:    labels,
+		},
+		Spec: batchv1.JobSpec{
+			BackoffLimit: &backoffLimit,
+			Template:     pod,
+		},
+	}
+}
+
+// createRabbitmqBackupArtifact materialises a Cozystack Backup carrying the
+// strategy reference, the parameter snapshot (via DriverMetadata) and, when the
+// strategy renders one, the artifact URI. The Backup CRD has no status
+// subresource, so status.artifact persists on Create (as in createEtcdBackupArtifact).
+func (r *BackupJobReconciler) createRabbitmqBackupArtifact(
+	ctx context.Context,
+	j *backupsv1alpha1.BackupJob,
+	resolved *ResolvedBackupConfig,
+	artifactURI string,
+) (*backupsv1alpha1.Backup, error) {
+	driverMD := map[string]string{}
+	for k, v := range resolved.Parameters {
+		driverMD[rabbitmqParamPrefix+k] = v
+	}
+
+	status := backupsv1alpha1.BackupStatus{
+		Phase: backupsv1alpha1.BackupPhaseReady,
+	}
+	if artifactURI != "" {
+		status.Artifact = &backupsv1alpha1.BackupArtifact{URI: artifactURI}
+	}
+
+	backup := &backupsv1alpha1.Backup{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      j.Name,
+			Namespace: j.Namespace,
+		},
+		Spec: backupsv1alpha1.BackupSpec{
+			ApplicationRef: j.Spec.ApplicationRef,
+			StrategyRef:    resolved.StrategyRef,
+			TakenAt:        metav1.Now(),
+			DriverMetadata: driverMD,
+		},
+		Status: status,
+	}
+	if j.Spec.PlanRef != nil {
+		backup.Spec.PlanRef = j.Spec.PlanRef
+	}
+	if err := r.Create(ctx, backup); err != nil {
+		if !apierrors.IsAlreadyExists(err) {
+			return nil, err
+		}
+		existing := &backupsv1alpha1.Backup{}
+		if getErr := r.Get(ctx, types.NamespacedName{Namespace: backup.Namespace, Name: backup.Name}, existing); getErr != nil {
+			return nil, getErr
+		}
+		// Adopt an existing Backup only when it describes the same application.
+		// A retained Backup whose BackupJob was reaped, then reused for a
+		// different application of the same name, would otherwise be reported as
+		// this run's success while describing something else.
+		if existing.Spec.ApplicationRef.Kind != backup.Spec.ApplicationRef.Kind ||
+			existing.Spec.ApplicationRef.Name != backup.Spec.ApplicationRef.Name {
+			return nil, fmt.Errorf("Backup %s/%s already exists for a different application (%s/%s, not %s/%s)",
+				backup.Namespace, backup.Name,
+				existing.Spec.ApplicationRef.Kind, existing.Spec.ApplicationRef.Name,
+				backup.Spec.ApplicationRef.Kind, backup.Spec.ApplicationRef.Name)
+		}
+		return existing, nil
+	}
+	return backup, nil
+}
+
+// ---------------------------------------------------------------------------
+// RestoreJob path
+// ---------------------------------------------------------------------------
+
+func (r *RestoreJobReconciler) reconcileRabbitmqRestore(ctx context.Context, restoreJob *backupsv1alpha1.RestoreJob, backup *backupsv1alpha1.Backup) (ctrl.Result, error) {
+	logger := getLogger(ctx)
+	logger.Debug("reconciling Rabbitmq restore", "restorejob", restoreJob.Name, "backup", backup.Name)
+
+	if restoreJob.Status.Phase == backupsv1alpha1.RestoreJobPhaseSucceeded ||
+		restoreJob.Status.Phase == backupsv1alpha1.RestoreJobPhaseFailed {
+		return ctrl.Result{}, nil
+	}
+
+	if err := validateRabbitmqApplicationRef(backup.Spec.ApplicationRef); err != nil {
+		return r.markRestoreJobFailed(ctx, restoreJob, err.Error())
+	}
+
+	// Restore reads the object the Backup recorded, not a reconstruction, so a
+	// later change to the key layout cannot make older backups unrestorable.
+	if backup.Status.Artifact == nil || backup.Status.Artifact.URI == "" {
+		return r.markRestoreJobFailed(ctx, restoreJob, "Backup has no recorded artifact URI (status.artifact.uri); cannot locate the definitions object to restore")
+	}
+	artifactURI := backup.Status.Artifact.URI
+
+	// Resolve the effective restore target. Defaults to the source application;
+	// targetApplicationRef overrides for a to-copy restore into a differently
+	// named RabbitMQ in the same namespace (TypedLocalObjectReference has no
+	// namespace field, so cross-namespace restore is not representable).
+	targetNamespace := restoreJob.Namespace
+	targetAppName := backup.Spec.ApplicationRef.Name
+	targetAppKind := backup.Spec.ApplicationRef.Kind
+	targetAPIGroup := ""
+	if backup.Spec.ApplicationRef.APIGroup != nil {
+		targetAPIGroup = *backup.Spec.ApplicationRef.APIGroup
+	}
+	if restoreJob.Spec.TargetApplicationRef != nil {
+		if restoreJob.Spec.TargetApplicationRef.Name != "" {
+			targetAppName = restoreJob.Spec.TargetApplicationRef.Name
+		}
+		if restoreJob.Spec.TargetApplicationRef.Kind != "" {
+			targetAppKind = restoreJob.Spec.TargetApplicationRef.Kind
+		}
+		if restoreJob.Spec.TargetApplicationRef.APIGroup != nil {
+			targetAPIGroup = *restoreJob.Spec.TargetApplicationRef.APIGroup
+		}
+	}
+	targetRef := corev1.TypedLocalObjectReference{
+		APIGroup: new(targetAPIGroup),
+		Kind:     targetAppKind,
+		Name:     targetAppName,
+	}
+	if err := validateRabbitmqApplicationRef(targetRef); err != nil {
+		return r.markRestoreJobFailed(ctx, restoreJob, err.Error())
+	}
+
+	if restoreJob.Status.StartedAt == nil {
+		fresh := &backupsv1alpha1.RestoreJob{}
+		if err := r.Get(ctx, types.NamespacedName{Namespace: restoreJob.Namespace, Name: restoreJob.Name}, fresh); err != nil {
+			return ctrl.Result{}, err
+		}
+		if fresh.Status.StartedAt != nil {
+			restoreJob.Status.StartedAt = fresh.Status.StartedAt
+			restoreJob.Status.Phase = fresh.Status.Phase
+		} else {
+			base := fresh.DeepCopy()
+			now := metav1.Now()
+			fresh.Status.StartedAt = &now
+			fresh.Status.Phase = backupsv1alpha1.RestoreJobPhaseRunning
+			if err := r.Status().Patch(ctx, fresh, client.MergeFrom(base)); err != nil {
+				return ctrl.Result{}, err
+			}
+			return ctrl.Result{RequeueAfter: rabbitmqPollInterval}, nil
+		}
+	}
+
+	strategy := &strategyv1alpha1.Rabbitmq{}
+	if err := r.Get(ctx, client.ObjectKey{Name: backup.Spec.StrategyRef.Name}, strategy); err != nil {
+		if apierrors.IsNotFound(err) {
+			return r.requeueRestoreStrategyNotReady(ctx, restoreJob, backup.Spec.StrategyRef.Name)
+		}
+		return ctrl.Result{}, err
+	}
+
+	app, err := r.getApplicationUnstructured(ctx, targetNamespace, targetRef)
+	if err != nil {
+		if apierrors.IsNotFound(err) {
+			return r.markRestoreJobFailed(ctx, restoreJob, fmt.Sprintf(
+				"target RabbitMQ application not found: %s/%s (deploy it before requesting a copy restore)",
+				targetNamespace, targetAppName))
+		}
+		return ctrl.Result{}, err
+	}
+
+	// Precondition: the TARGET broker must be ready to accept a definitions
+	// import. Same gate as backup, on the restore target's cluster.
+	cluster := &rabbitmqtypes.RabbitmqCluster{}
+	clusterName := rabbitmqClusterName(targetAppName)
+	notReady := ""
+	if err := r.Get(ctx, client.ObjectKey{Namespace: targetNamespace, Name: clusterName}, cluster); err != nil {
+		if !apierrors.IsNotFound(err) {
+			return ctrl.Result{}, err
+		}
+		notReady = fmt.Sprintf("target RabbitmqCluster %s/%s not found yet", targetNamespace, clusterName)
+	} else {
+		notReady = rabbitmqNotReadyMessage(cluster)
+	}
+	if notReady != "" {
+		// Bounded, as on the backup path: a target broker that never becomes
+		// ready fails the RestoreJob rather than requeuing forever.
+		if rabbitmqBackupDeadlineExceeded(restoreJob.Status.StartedAt) {
+			return r.markRestoreJobFailed(ctx, restoreJob, fmt.Sprintf("target RabbitmqCluster did not become ready within %s: %s", rabbitmqBackupDeadline, notReady))
+		}
+		return r.requeueRabbitmqRestoreWaiting(ctx, restoreJob, "RabbitMQClusterNotReady", notReady)
+	}
+
+	renderCtx := rabbitmqRenderContext(app, targetAppName, targetNamespace, rabbitmqModeRestore, backup.Name, artifactURI, rabbitmqBackupParameters(backup), backup)
+	rendered, err := renderRabbitmqTemplate(strategy.Spec.Template, renderCtx)
+	if err != nil {
+		return r.markRestoreJobFailed(ctx, restoreJob, fmt.Sprintf("failed to template Rabbitmq strategy: %v", err))
+	}
+
+	batchJob, err := r.ensureRabbitmqRestoreJob(ctx, restoreJob, targetNamespace, jobNameForRestoreJob(restoreJob),
+		rabbitmqModeRestore,
+		map[string]string{
+			backupsv1alpha1.OwningJobNameLabel:      restoreJob.Name,
+			backupsv1alpha1.OwningJobNamespaceLabel: restoreJob.Namespace,
+		},
+		rendered,
+	)
+	if err != nil {
+		return r.markRestoreJobFailed(ctx, restoreJob, fmt.Sprintf("failed to ensure batch/v1.Job: %v", err))
+	}
+
+	switch jobConditionState(batchJob) {
+	case batchv1.JobComplete:
+		now := metav1.Now()
+		restoreJob.Status.CompletedAt = &now
+		restoreJob.Status.Phase = backupsv1alpha1.RestoreJobPhaseSucceeded
+		apimeta.SetStatusCondition(&restoreJob.Status.Conditions, metav1.Condition{
+			Type:    "Ready",
+			Status:  metav1.ConditionTrue,
+			Reason:  "RestoreCompleted",
+			Message: "RabbitMQ definitions restore Job completed",
+		})
+		if err := r.Status().Update(ctx, restoreJob); err != nil {
+			return ctrl.Result{}, err
+		}
+		return ctrl.Result{}, nil
+
+	case batchv1.JobFailed:
+		message := jobFailureMessage(batchJob)
+		if message == "" {
+			message = "RabbitMQ definitions restore Job reported Failed"
+		}
+		return r.markRestoreJobFailed(ctx, restoreJob, message)
+
+	default:
+		return ctrl.Result{RequeueAfter: rabbitmqPollInterval}, nil
+	}
+}
+
+// requeueRabbitmqRestoreWaiting is the RestoreJob mirror of
+// requeueRabbitmqBackupWaiting.
+func (r *RestoreJobReconciler) requeueRabbitmqRestoreWaiting(ctx context.Context, restoreJob *backupsv1alpha1.RestoreJob, reason, message string) (ctrl.Result, error) {
+	apimeta.SetStatusCondition(&restoreJob.Status.Conditions, metav1.Condition{
+		Type:    "Ready",
+		Status:  metav1.ConditionFalse,
+		Reason:  reason,
+		Message: message,
+	})
+	if err := r.Status().Update(ctx, restoreJob); err != nil {
+		return ctrl.Result{}, err
+	}
+	return ctrl.Result{RequeueAfter: rabbitmqPollInterval}, nil
+}
+
+// ---------------------------------------------------------------------------
+// Backup cleanup path (best-effort object deletion on Backup delete)
+// ---------------------------------------------------------------------------
+
+// cleanupRabbitmqBackup deletes the definitions object a Backup recorded, and
+// WAITS for that delete to finish before the Backup is removed, so no object is
+// orphaned. This driver uniquely owns its artifact (a plain object it wrote,
+// with the exact key on status.artifact.uri) and no engine retention prunes it.
+// The controller has no S3 client, so the delete runs as a one-shot Job through
+// the strategy's curl image; this returns a requeue (non-zero Result) until the
+// Job succeeds. The script treats "object already gone" as success; a genuine
+// failure is retried and the Backup stays Terminating - a visible signal an
+// operator can act on - rather than the object being silently orphaned.
+func (r *BackupReconciler) cleanupRabbitmqBackup(ctx context.Context, backup *backupsv1alpha1.Backup) (ctrl.Result, error) {
+	logger := getLogger(ctx)
+
+	// Escape hatch: an operator releases a Backup stuck Terminating (object
+	// storage unreachable) by setting this annotation. Cleanup then skips the
+	// delete - reaping any in-flight delete Job - and lets the Backup go,
+	// leaving the object in the bucket.
+	if backup.Annotations[rabbitmqSkipArtifactCleanupAnnotation] == "true" {
+		existing := &batchv1.Job{}
+		if err := r.Get(ctx, types.NamespacedName{Namespace: backup.Namespace, Name: backup.Name + "-cleanup"}, existing); err == nil {
+			_ = r.deleteRabbitmqCleanupJob(ctx, existing)
+		}
+		logger.Debug("skipping Rabbitmq artifact cleanup per annotation; object left in bucket", "backup", backup.Name, "annotation", rabbitmqSkipArtifactCleanupAnnotation)
+		return ctrl.Result{}, nil
+	}
+
+	if backup.Status.Artifact == nil || backup.Status.Artifact.URI == "" {
+		return ctrl.Result{}, nil
+	}
+	uri := backup.Status.Artifact.URI
+
+	strategy := &strategyv1alpha1.Rabbitmq{}
+	if err := r.Get(ctx, client.ObjectKey{Name: backup.Spec.StrategyRef.Name}, strategy); err != nil {
+		if apierrors.IsNotFound(err) {
+			// No strategy to render the delete Job from (rare: the shipped
+			// strategy is normally always present, but it is gated on a resolved
+			// bucket name and stops rendering if that lookup fails). Release the
+			// Backup rather than wedge it forever; the object is left behind.
+			return r.releaseRabbitmqCleanup(ctx, backup, uri, "strategy CR is gone"), nil
+		}
+		return ctrl.Result{}, err
+	}
+
+	jobName := backup.Name + "-cleanup"
+	job := &batchv1.Job{}
+	err := r.Get(ctx, types.NamespacedName{Namespace: backup.Namespace, Name: jobName}, job)
+	switch {
+	case apierrors.IsNotFound(err):
+		// First pass (or a fresh retry after a failed attempt was collected).
+		// Spawning the delete Job - and projecting the credentials Secret it
+		// needs - are CREATEs, which NamespaceLifecycle admission forbids in a
+		// Terminating namespace. When the namespace is going away, release the
+		// Backup so teardown can finish; the object cannot be deleted from a
+		// namespace that no longer exists, so it is left behind.
+		terminating, nsErr := r.namespaceTerminating(ctx, backup.Namespace)
+		if nsErr != nil {
+			return ctrl.Result{}, nsErr
+		}
+		if terminating {
+			return r.releaseRabbitmqCleanup(ctx, backup, uri, "namespace is terminating"), nil
+		}
+		if perr := ProjectBackupCredentials(ctx, r.Client, r.CredentialsConfig, backup.Namespace); perr != nil {
+			// Cannot obtain credentials to run the delete (source Secret gone,
+			// ownership guard tripped, ...). Release rather than wedge.
+			return r.releaseRabbitmqCleanup(ctx, backup, uri, fmt.Sprintf("cannot project credentials: %v", perr)), nil
+		}
+		// The template reads only .Release, .Mode and .ArtifactURI in cleanup
+		// mode (never .Application), so the source app being already gone does
+		// not matter.
+		renderCtx := rabbitmqRenderContext(nil, backup.Spec.ApplicationRef.Name, backup.Namespace, rabbitmqModeCleanup, backup.Name, uri, nil, nil)
+		rendered, rerr := renderRabbitmqTemplate(strategy.Spec.Template, renderCtx)
+		if rerr != nil {
+			// A broken template cannot be fixed by retrying; release.
+			return r.releaseRabbitmqCleanup(ctx, backup, uri, fmt.Sprintf("cleanup template render failed: %v", rerr)), nil
+		}
+		if cerr := r.Create(ctx, buildRabbitmqCleanupJob(backup.Namespace, jobName, rendered)); cerr != nil && !apierrors.IsAlreadyExists(cerr) {
+			// Forbidden (the namespace went Terminating after the check above)
+			// or Invalid (e.g. a >55-char Backup name makes <name>-cleanup
+			// exceed the 63-char Job-name limit) cannot be fixed by retrying;
+			// release rather than wedge. Other errors are transient - requeue.
+			if apierrors.IsForbidden(cerr) || apierrors.IsInvalid(cerr) {
+				return r.releaseRabbitmqCleanup(ctx, backup, uri, fmt.Sprintf("cannot create cleanup Job: %v", cerr)), nil
+			}
+			return ctrl.Result{}, cerr
+		}
+		return ctrl.Result{RequeueAfter: rabbitmqPollInterval}, nil
+	case err != nil:
+		return ctrl.Result{}, err
+	}
+
+	if !job.DeletionTimestamp.IsZero() {
+		// A prior failed attempt is being collected; wait, then the NotFound
+		// branch recreates a fresh one.
+		return ctrl.Result{RequeueAfter: rabbitmqPollInterval}, nil
+	}
+
+	switch jobConditionState(job) {
+	case batchv1.JobComplete:
+		// Object deleted (or already gone): drop the Job and let the Backup go.
+		_ = r.deleteRabbitmqCleanupJob(ctx, job)
+		logger.Debug("Rabbitmq backup object deleted", "backup", backup.Name, "uri", uri)
+		return ctrl.Result{}, nil
+	case batchv1.JobFailed:
+		// The delete genuinely failed (a missing object is success in the
+		// script, not a failure). Collect the failed Job so the NotFound branch
+		// recreates a fresh one, and keep the Backup Terminating.
+		logger.Debug("Rabbitmq cleanup Job failed; retrying", "backup", backup.Name, "job", jobName)
+		_ = r.deleteRabbitmqCleanupJob(ctx, job)
+		return ctrl.Result{RequeueAfter: rabbitmqPollInterval}, nil
+	default:
+		return ctrl.Result{RequeueAfter: rabbitmqPollInterval}, nil
+	}
+}
+
+// deleteRabbitmqCleanupJob removes a finished cleanup Job together with its Pod.
+func (r *BackupReconciler) deleteRabbitmqCleanupJob(ctx context.Context, job *batchv1.Job) error {
+	policy := metav1.DeletePropagationBackground
+	return client.IgnoreNotFound(r.Delete(ctx, job, &client.DeleteOptions{PropagationPolicy: &policy}))
+}
+
+// namespaceTerminating reports whether the namespace is gone or carries a
+// deletion timestamp - in which case the API server forbids CREATE (the delete
+// Job, the projected credentials Secret), so cleanup must not attempt it and
+// must instead release the Backup.
+func (r *BackupReconciler) namespaceTerminating(ctx context.Context, name string) (bool, error) {
+	ns := &corev1.Namespace{}
+	if err := r.Get(ctx, client.ObjectKey{Name: name}, ns); err != nil {
+		if apierrors.IsNotFound(err) {
+			return true, nil
+		}
+		return false, err
+	}
+	return !ns.DeletionTimestamp.IsZero(), nil
+}
+
+// releaseRabbitmqCleanup gives up on deleting the backup object and lets the
+// Backup be removed - for the conditions under which the delete cannot run here
+// (namespace terminating, credentials/permissions unavailable, an unrenderable
+// or absent strategy). It logs and records a Warning Event naming the object
+// left behind so the give-up is visible, then returns a zero Result so the
+// finalizer is released and the Backup (and any enclosing namespace) can finish
+// deleting. So the delete is best-effort, not guaranteed.
+func (r *BackupReconciler) releaseRabbitmqCleanup(ctx context.Context, backup *backupsv1alpha1.Backup, uri, reason string) ctrl.Result {
+	getLogger(ctx).Info("releasing Backup without deleting its object", "backup", backup.Name, "uri", uri, "reason", reason)
+	if r.Recorder != nil {
+		r.Recorder.Eventf(backup, corev1.EventTypeWarning, "ArtifactNotDeleted", "left object %s in the bucket: %s", uri, reason)
+	}
+	return ctrl.Result{}
+}
+
+// buildRabbitmqCleanupJob wraps the cleanup-mode pod in a one-shot, ownerless
+// Job. Ownerless because cleanupRabbitmqBackup manages its lifecycle explicitly
+// (it deletes the Job on completion) and it must outlive the Backup being
+// deleted; activeDeadlineSeconds + TTL are backstops if the controller stops
+// mid-wait.
+func buildRabbitmqCleanupJob(namespace, name string, rendered *corev1.PodTemplateSpec) *batchv1.Job {
+	pod := *rendered.DeepCopy()
+	if pod.Spec.RestartPolicy == "" {
+		pod.Spec.RestartPolicy = corev1.RestartPolicyNever
+	}
+	if pod.Labels == nil {
+		pod.Labels = map[string]string{}
+	}
+	pod.Labels[rabbitmqLabelMode] = rabbitmqModeCleanup
+	backoffLimit := int32(1)
+	activeDeadline := int64(300)
+	ttl := int32(300)
+	return &batchv1.Job{
+		ObjectMeta: metav1.ObjectMeta{
+			Namespace: namespace,
+			Name:      name,
+			Labels:    map[string]string{rabbitmqLabelMode: rabbitmqModeCleanup},
+		},
+		Spec: batchv1.JobSpec{
+			BackoffLimit:            &backoffLimit,
+			ActiveDeadlineSeconds:   &activeDeadline,
+			TTLSecondsAfterFinished: &ttl,
+			Template:                pod,
+		},
+	}
+}
diff --git a/internal/backupcontroller/rabbitmqstrategy_controller_test.go b/internal/backupcontroller/rabbitmqstrategy_controller_test.go
new file mode 100644
index 0000000000..0ba264244d
--- /dev/null
+++ b/internal/backupcontroller/rabbitmqstrategy_controller_test.go
@@ -0,0 +1,776 @@
+// SPDX-License-Identifier: Apache-2.0
+package backupcontroller
+
+import (
+	"context"
+	"strings"
+	"testing"
+	"time"
+
+	batchv1 "k8s.io/api/batch/v1"
+	corev1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/api/meta"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	dynamicfake "k8s.io/client-go/dynamic/fake"
+	"k8s.io/client-go/kubernetes/scheme"
+	"k8s.io/client-go/tools/record"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+	clientfake "sigs.k8s.io/controller-runtime/pkg/client/fake"
+
+	strategyv1alpha1 "github.com/cozystack/cozystack/api/backups/strategy/v1alpha1"
+	backupsv1alpha1 "github.com/cozystack/cozystack/api/backups/v1alpha1"
+	"github.com/cozystack/cozystack/internal/backupcontroller/rabbitmqtypes"
+)
+
+func newRabbitmqApp(name, namespace string) *unstructured.Unstructured {
+	u := &unstructured.Unstructured{}
+	u.SetGroupVersionKind(schema.GroupVersionKind{
+		Group:   backupsv1alpha1.DefaultApplicationAPIGroup,
+		Version: "v1alpha1",
+		Kind:    rabbitmqAppKind,
+	})
+	u.SetName(name)
+	u.SetNamespace(namespace)
+	return u
+}
+
+func newRabbitmqRef(name string) corev1.TypedLocalObjectReference {
+	return corev1.TypedLocalObjectReference{
+		APIGroup: new(backupsv1alpha1.DefaultApplicationAPIGroup),
+		Kind:     rabbitmqAppKind,
+		Name:     name,
+	}
+}
+
+// newRabbitmqCluster builds the operator-side RabbitmqCluster the driver reads
+// for its readiness gate. AllReplicasReady drives whether the precondition
+// passes.
+func newRabbitmqCluster(appName, namespace string, ready bool) *rabbitmqtypes.RabbitmqCluster {
+	status := metav1.ConditionFalse
+	if ready {
+		status = metav1.ConditionTrue
+	}
+	return &rabbitmqtypes.RabbitmqCluster{
+		ObjectMeta: metav1.ObjectMeta{Name: rabbitmqClusterName(appName), Namespace: namespace},
+		Status: rabbitmqtypes.RabbitmqClusterStatus{
+			Conditions: []metav1.Condition{{
+				Type:               rabbitmqtypes.ConditionAllReplicasReady,
+				Status:             status,
+				Reason:             "Test",
+				Message:            "test condition",
+				LastTransitionTime: metav1.Now(),
+			}},
+		},
+	}
+}
+
+func newRabbitmqStrategy(name string) *strategyv1alpha1.Rabbitmq {
+	return &strategyv1alpha1.Rabbitmq{
+		ObjectMeta: metav1.ObjectMeta{Name: name},
+		Spec: strategyv1alpha1.RabbitmqSpec{
+			ArtifactURITemplate: "s3://bkt/{{ .Release.Namespace }}/{{ .Release.Name }}/{{ .BackupName }}/definitions.json",
+			Template: corev1.PodTemplateSpec{
+				Spec: corev1.PodSpec{
+					RestartPolicy: corev1.RestartPolicyNever,
+					Containers: []corev1.Container{{
+						Name:  "rabbitmq-backup",
+						Image: "curl:test",
+						Args: []string{
+							"--host=rabbitmq-{{ .Release.Name }}.{{ .Release.Namespace }}.svc",
+							"--mode={{ .Mode }}",
+							"--uri={{ .ArtifactURI }}",
+						},
+					}},
+				},
+			},
+		},
+	}
+}
+
+func newRabbitmqResolved(strategyName string, params map[string]string) *ResolvedBackupConfig {
+	return &ResolvedBackupConfig{
+		StrategyRef: corev1.TypedLocalObjectReference{
+			APIGroup: new(strategyv1alpha1.GroupVersion.Group),
+			Kind:     strategyv1alpha1.RabbitmqStrategyKind,
+			Name:     strategyName,
+		},
+		Parameters: params,
+	}
+}
+
+func newRabbitmqTestEnv(t *testing.T, app *unstructured.Unstructured, builder *clientfake.ClientBuilder) (*BackupJobReconciler, *RestoreJobReconciler) {
+	t.Helper()
+
+	testScheme := runtime.NewScheme()
+	_ = scheme.AddToScheme(testScheme)
+	_ = backupsv1alpha1.AddToScheme(testScheme)
+	_ = strategyv1alpha1.AddToScheme(testScheme)
+	_ = rabbitmqtypes.AddToScheme(testScheme)
+
+	gvr := schema.GroupVersionResource{
+		Group:    backupsv1alpha1.DefaultApplicationAPIGroup,
+		Version:  "v1alpha1",
+		Resource: "rabbitmqs",
+	}
+	dynamicClient := dynamicfake.NewSimpleDynamicClientWithCustomListKinds(
+		testScheme,
+		map[schema.GroupVersionResource]string{gvr: rabbitmqAppKind + "List"},
+		app,
+	)
+	mapping := &meta.RESTMapping{
+		Resource:         gvr,
+		GroupVersionKind: app.GroupVersionKind(),
+		Scope:            meta.RESTScopeNamespace,
+	}
+	restMapper := &mockRESTMapper{mapping: mapping}
+
+	c := builder.WithScheme(testScheme).
+		// Backup deliberately omitted: its real CRD has no status subresource,
+		// which is exactly why createRabbitmqBackupArtifact persists
+		// status.artifact on Create. Registering it here would make the fake
+		// drop status on Create and hide a regression the driver depends on.
+		WithStatusSubresource(&backupsv1alpha1.BackupJob{}, &backupsv1alpha1.RestoreJob{}).
+		Build()
+
+	return &BackupJobReconciler{
+		Client:     c,
+		Interface:  dynamicClient,
+		RESTMapper: restMapper,
+		Scheme:     testScheme,
+		Recorder:   record.NewFakeRecorder(10),
+	}, &RestoreJobReconciler{
+		Client:     c,
+		Interface:  dynamicClient,
+		RESTMapper: restMapper,
+		Scheme:     testScheme,
+		Recorder:   record.NewFakeRecorder(10),
+	}
+}
+
+func TestValidateRabbitmqApplicationRef(t *testing.T) {
+	group := backupsv1alpha1.DefaultApplicationAPIGroup
+	other := "example.com"
+	tests := []struct {
+		name    string
+		ref     corev1.TypedLocalObjectReference
+		wantErr bool
+	}{
+		{name: "RabbitMQ default group", ref: corev1.TypedLocalObjectReference{APIGroup: &group, Kind: "RabbitMQ"}},
+		{name: "RabbitMQ empty group", ref: corev1.TypedLocalObjectReference{Kind: "RabbitMQ"}},
+		{name: "wrong kind", ref: corev1.TypedLocalObjectReference{Kind: "Postgres"}, wantErr: true},
+		{name: "wrong group", ref: corev1.TypedLocalObjectReference{APIGroup: &other, Kind: "RabbitMQ"}, wantErr: true},
+	}
+	for _, tc := range tests {
+		t.Run(tc.name, func(t *testing.T) {
+			err := validateRabbitmqApplicationRef(tc.ref)
+			if (err != nil) != tc.wantErr {
+				t.Errorf("validateRabbitmqApplicationRef(%+v) err=%v, wantErr=%v", tc.ref, err, tc.wantErr)
+			}
+		})
+	}
+}
+
+func TestRabbitmqClusterName(t *testing.T) {
+	if got := rabbitmqClusterName("foo"); got != "rabbitmq-foo" {
+		t.Errorf("rabbitmqClusterName(foo) = %q, want rabbitmq-foo", got)
+	}
+}
+
+func TestRabbitmqNotReadyMessage(t *testing.T) {
+	ready := &rabbitmqtypes.RabbitmqCluster{
+		Status: rabbitmqtypes.RabbitmqClusterStatus{Conditions: []metav1.Condition{
+			{Type: rabbitmqtypes.ConditionAllReplicasReady, Status: metav1.ConditionTrue},
+		}},
+	}
+	if msg := rabbitmqNotReadyMessage(ready); msg != "" {
+		t.Errorf("ready cluster: want empty message, got %q", msg)
+	}
+
+	notReady := &rabbitmqtypes.RabbitmqCluster{
+		ObjectMeta: metav1.ObjectMeta{Name: "rabbitmq-x"},
+		Status: rabbitmqtypes.RabbitmqClusterStatus{Conditions: []metav1.Condition{
+			{Type: rabbitmqtypes.ConditionAllReplicasReady, Status: metav1.ConditionFalse, Message: "starting"},
+		}},
+	}
+	if msg := rabbitmqNotReadyMessage(notReady); !strings.Contains(msg, "AllReplicasReady=False") || !strings.Contains(msg, "starting") {
+		t.Errorf("not-ready cluster: unexpected message %q", msg)
+	}
+
+	missing := &rabbitmqtypes.RabbitmqCluster{ObjectMeta: metav1.ObjectMeta{Name: "rabbitmq-x"}}
+	if msg := rabbitmqNotReadyMessage(missing); !strings.Contains(msg, "no AllReplicasReady") {
+		t.Errorf("condition-less cluster: unexpected message %q", msg)
+	}
+}
+
+func TestRenderRabbitmqArtifactURI(t *testing.T) {
+	const tmpl = "s3://bkt/{{ .Release.Namespace }}/{{ .Release.Name }}/{{ .BackupName }}/definitions.json"
+
+	ctx1 := rabbitmqRenderContext(nil, "app-test", "tenant-test", rabbitmqModeBackup, "bj-1", "", nil, nil)
+	uri1, err := renderRabbitmqArtifactURI(tmpl, ctx1)
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+	if want := "s3://bkt/tenant-test/app-test/bj-1/definitions.json"; uri1 != want {
+		t.Errorf("uri = %q, want %q", uri1, want)
+	}
+
+	// A second backup of the SAME application must render a DISTINCT key, or the
+	// backups would overwrite each other in object storage and restoring an
+	// older Backup would read the latest data.
+	ctx2 := rabbitmqRenderContext(nil, "app-test", "tenant-test", rabbitmqModeBackup, "bj-2", "", nil, nil)
+	uri2, err := renderRabbitmqArtifactURI(tmpl, ctx2)
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+	if uri2 == uri1 {
+		t.Errorf("two backups of one application produced the same key %q — they would overwrite each other", uri1)
+	}
+
+	if _, err := renderRabbitmqArtifactURI("{{ .Missing", ctx1); err == nil {
+		t.Error("expected error for malformed artifact URI template")
+	}
+}
+
+func TestRabbitmqBackupParameters_RoundTrip(t *testing.T) {
+	backup := &backupsv1alpha1.Backup{
+		Spec: backupsv1alpha1.BackupSpec{DriverMetadata: map[string]string{
+			rabbitmqParamPrefix + "prefix": "p1",
+			"other/key":                    "ignored",
+			rabbitmqParamPrefix:            "ignored-empty-key",
+		}},
+	}
+	got := rabbitmqBackupParameters(backup)
+	if got["prefix"] != "p1" {
+		t.Errorf("prefix = %q, want p1", got["prefix"])
+	}
+	if _, ok := got["other/key"]; ok {
+		t.Errorf("non-parameter key leaked: %v", got)
+	}
+}
+
+// TestReconcileRabbitmq_PreconditionGate pins that the readiness gate defers a
+// run (Ready=False, no batch Job) until the RabbitmqCluster reports
+// AllReplicasReady, then proceeds once it does.
+func TestReconcileRabbitmq_PreconditionGate(t *testing.T) {
+	newRunningBackupJob := func() *backupsv1alpha1.BackupJob {
+		now := metav1.Now()
+		return &backupsv1alpha1.BackupJob{
+			ObjectMeta: metav1.ObjectMeta{Name: "test-bj", Namespace: "tenant-test"},
+			Spec: backupsv1alpha1.BackupJobSpec{
+				ApplicationRef:  newRabbitmqRef("rmq-test"),
+				BackupClassName: "cozy-default",
+			},
+			Status: backupsv1alpha1.BackupJobStatus{StartedAt: &now, Phase: backupsv1alpha1.BackupJobPhaseRunning},
+		}
+	}
+
+	t.Run("cluster not ready defers without creating a Job", func(t *testing.T) {
+		app := newRabbitmqApp("rmq-test", "tenant-test")
+		backupJob := newRunningBackupJob()
+		cluster := newRabbitmqCluster("rmq-test", "tenant-test", false)
+		r, _ := newRabbitmqTestEnv(t, app, clientfake.NewClientBuilder().
+			WithObjects(backupJob, newRabbitmqStrategy("cozy-default-rabbitmq"), cluster))
+		ctx := context.Background()
+
+		res, err := r.reconcileRabbitmq(ctx, backupJob, newRabbitmqResolved("cozy-default-rabbitmq", nil))
+		if err != nil {
+			t.Fatalf("reconcileRabbitmq() error = %v", err)
+		}
+		if res.RequeueAfter == 0 {
+			t.Error("expected a requeue while the cluster is not ready")
+		}
+		jobs := &batchv1.JobList{}
+		if err := r.List(ctx, jobs, client.InNamespace("tenant-test")); err != nil {
+			t.Fatalf("list jobs: %v", err)
+		}
+		if len(jobs.Items) != 0 {
+			t.Fatalf("expected no Job while the precondition is unmet, got %d", len(jobs.Items))
+		}
+		updated := &backupsv1alpha1.BackupJob{}
+		if err := r.Get(ctx, client.ObjectKeyFromObject(backupJob), updated); err != nil {
+			t.Fatalf("get backupjob: %v", err)
+		}
+		cond := meta.FindStatusCondition(updated.Status.Conditions, "Ready")
+		if cond == nil || cond.Status != metav1.ConditionFalse || cond.Reason != "RabbitMQClusterNotReady" {
+			t.Errorf("expected Ready=False/RabbitMQClusterNotReady, got %+v", cond)
+		}
+	})
+
+	t.Run("cluster ready proceeds to create the Job", func(t *testing.T) {
+		app := newRabbitmqApp("rmq-test", "tenant-test")
+		backupJob := newRunningBackupJob()
+		cluster := newRabbitmqCluster("rmq-test", "tenant-test", true)
+		r, _ := newRabbitmqTestEnv(t, app, clientfake.NewClientBuilder().
+			WithObjects(backupJob, newRabbitmqStrategy("cozy-default-rabbitmq"), cluster))
+		ctx := context.Background()
+
+		if _, err := r.reconcileRabbitmq(ctx, backupJob, newRabbitmqResolved("cozy-default-rabbitmq", nil)); err != nil {
+			t.Fatalf("reconcileRabbitmq() error = %v", err)
+		}
+		jobs := &batchv1.JobList{}
+		if err := r.List(ctx, jobs, client.InNamespace("tenant-test")); err != nil {
+			t.Fatalf("list jobs: %v", err)
+		}
+		if len(jobs.Items) != 1 {
+			t.Fatalf("expected the Job once the cluster is ready, got %d", len(jobs.Items))
+		}
+		args := jobs.Items[0].Spec.Template.Spec.Containers[0].Args
+		want := []string{"--host=rabbitmq-rmq-test.tenant-test.svc", "--mode=backup"}
+		for i, w := range want {
+			if i >= len(args) || args[i] != w {
+				t.Errorf("rendered args[%d]: want %q, got %q", i, w, args)
+			}
+		}
+	})
+}
+
+// TestReconcileRabbitmq_RejectsWrongKind pins that a non-RabbitMQ applicationRef
+// fails the BackupJob terminally rather than spawning a Job.
+func TestReconcileRabbitmq_RejectsWrongKind(t *testing.T) {
+	app := newRabbitmqApp("rmq-test", "tenant-test")
+	backupJob := &backupsv1alpha1.BackupJob{
+		ObjectMeta: metav1.ObjectMeta{Name: "test-bj", Namespace: "tenant-test"},
+		Spec: backupsv1alpha1.BackupJobSpec{
+			ApplicationRef:  corev1.TypedLocalObjectReference{APIGroup: new(backupsv1alpha1.DefaultApplicationAPIGroup), Kind: "Postgres", Name: "rmq-test"},
+			BackupClassName: "cozy-default",
+		},
+	}
+	r, _ := newRabbitmqTestEnv(t, app, clientfake.NewClientBuilder().WithObjects(backupJob))
+	ctx := context.Background()
+
+	if _, err := r.reconcileRabbitmq(ctx, backupJob, newRabbitmqResolved("cozy-default-rabbitmq", nil)); err != nil {
+		t.Fatalf("reconcileRabbitmq() error = %v", err)
+	}
+	updated := &backupsv1alpha1.BackupJob{}
+	if err := r.Get(ctx, client.ObjectKeyFromObject(backupJob), updated); err != nil {
+		t.Fatalf("get backupjob: %v", err)
+	}
+	if updated.Status.Phase != backupsv1alpha1.BackupJobPhaseFailed {
+		t.Errorf("expected phase Failed for wrong kind, got %q", updated.Status.Phase)
+	}
+}
+
+// rabbitmqBackup builds a source Backup produced by the Rabbitmq strategy, for
+// the restore-path tests.
+func rabbitmqBackup(sourceApp string) *backupsv1alpha1.Backup {
+	return &backupsv1alpha1.Backup{
+		ObjectMeta: metav1.ObjectMeta{Name: "rmq-src-adhoc", Namespace: "tenant-test"},
+		Spec: backupsv1alpha1.BackupSpec{
+			ApplicationRef: newRabbitmqRef(sourceApp),
+			StrategyRef: corev1.TypedLocalObjectReference{
+				APIGroup: new(strategyv1alpha1.GroupVersion.Group),
+				Kind:     strategyv1alpha1.RabbitmqStrategyKind,
+				Name:     "cozy-default-rabbitmq",
+			},
+			TakenAt: metav1.Now(),
+		},
+		Status: backupsv1alpha1.BackupStatus{
+			Artifact: &backupsv1alpha1.BackupArtifact{
+				URI: "s3://bkt/tenant-test/" + sourceApp + "/rmq-src-adhoc/definitions.json",
+			},
+		},
+	}
+}
+
+func rabbitmqRunningRestoreJob(name, targetApp string) *backupsv1alpha1.RestoreJob {
+	now := metav1.Now()
+	rj := &backupsv1alpha1.RestoreJob{
+		ObjectMeta: metav1.ObjectMeta{Name: name, Namespace: "tenant-test"},
+		Spec: backupsv1alpha1.RestoreJobSpec{
+			BackupRef: corev1.LocalObjectReference{Name: "rmq-src-adhoc"},
+		},
+		Status: backupsv1alpha1.RestoreJobStatus{StartedAt: &now, Phase: backupsv1alpha1.RestoreJobPhaseRunning},
+	}
+	if targetApp != "" {
+		rj.Spec.TargetApplicationRef = &corev1.TypedLocalObjectReference{
+			APIGroup: new(backupsv1alpha1.DefaultApplicationAPIGroup),
+			Kind:     rabbitmqAppKind,
+			Name:     targetApp,
+		}
+	}
+	return rj
+}
+
+// TestReconcileRabbitmqRestore_ToCopy pins the to-copy path: the restore Job
+// renders against the TARGET (targetApplicationRef override), not the source.
+func TestReconcileRabbitmqRestore_ToCopy(t *testing.T) {
+	targetApp := newRabbitmqApp("rmq-copy", "tenant-test")
+	restoreJob := rabbitmqRunningRestoreJob("rmq-src-to-copy", "rmq-copy")
+	backup := rabbitmqBackup("rmq-src")
+	cluster := newRabbitmqCluster("rmq-copy", "tenant-test", true)
+
+	_, rr := newRabbitmqTestEnv(t, targetApp, clientfake.NewClientBuilder().
+		WithObjects(newRabbitmqStrategy("cozy-default-rabbitmq"), backup, restoreJob, cluster))
+	ctx := context.Background()
+
+	if _, err := rr.reconcileRabbitmqRestore(ctx, restoreJob, backup); err != nil {
+		t.Fatalf("reconcileRabbitmqRestore() error = %v", err)
+	}
+	jobs := &batchv1.JobList{}
+	if err := rr.List(ctx, jobs, client.InNamespace("tenant-test")); err != nil {
+		t.Fatalf("list jobs: %v", err)
+	}
+	if len(jobs.Items) != 1 {
+		t.Fatalf("expected 1 restore Job, got %d", len(jobs.Items))
+	}
+	if got := jobs.Items[0].Labels[rabbitmqLabelMode]; got != rabbitmqModeRestore {
+		t.Errorf("mode label = %q, want %q", got, rabbitmqModeRestore)
+	}
+	args := jobs.Items[0].Spec.Template.Spec.Containers[0].Args
+	// --host renders to the TARGET broker (rmq-copy), proving targetApplicationRef
+	// override drove the render; --mode=restore; --uri is the URI RECORDED on the
+	// source Backup (not a reconstruction), proving restore reads status.artifact.uri.
+	want := []string{
+		"--host=rabbitmq-rmq-copy.tenant-test.svc",
+		"--mode=restore",
+		"--uri=s3://bkt/tenant-test/rmq-src/rmq-src-adhoc/definitions.json",
+	}
+	for i, w := range want {
+		if i >= len(args) || args[i] != w {
+			t.Errorf("rendered restore args[%d]: want %q, got %q", i, w, args)
+		}
+	}
+}
+
+// TestReconcileRabbitmqRestore_TargetNotFound pins that a to-copy target that is
+// not deployed fails the RestoreJob terminally rather than hanging.
+func TestReconcileRabbitmqRestore_TargetNotFound(t *testing.T) {
+	// The dynamic client only serves rmq-src, so the rmq-missing target Get
+	// returns NotFound.
+	seeded := newRabbitmqApp("rmq-src", "tenant-test")
+	restoreJob := rabbitmqRunningRestoreJob("rmq-src-to-missing", "rmq-missing")
+	backup := rabbitmqBackup("rmq-src")
+
+	_, rr := newRabbitmqTestEnv(t, seeded, clientfake.NewClientBuilder().
+		WithObjects(newRabbitmqStrategy("cozy-default-rabbitmq"), backup, restoreJob))
+	ctx := context.Background()
+
+	if _, err := rr.reconcileRabbitmqRestore(ctx, restoreJob, backup); err != nil {
+		t.Fatalf("reconcileRabbitmqRestore() error = %v", err)
+	}
+	updated := &backupsv1alpha1.RestoreJob{}
+	if err := rr.Get(ctx, client.ObjectKeyFromObject(restoreJob), updated); err != nil {
+		t.Fatalf("get restorejob: %v", err)
+	}
+	if updated.Status.Phase != backupsv1alpha1.RestoreJobPhaseFailed {
+		t.Errorf("expected phase Failed for missing target, got %q", updated.Status.Phase)
+	}
+	if !strings.Contains(updated.Status.Message, "target RabbitMQ application not found") {
+		t.Errorf("expected 'target not found' message, got %q", updated.Status.Message)
+	}
+}
+
+// TestReconcileRabbitmqRestore_TargetClusterNotReady pins that the readiness
+// gate defers a restore until the TARGET broker is ready.
+func TestReconcileRabbitmqRestore_TargetClusterNotReady(t *testing.T) {
+	targetApp := newRabbitmqApp("rmq-copy", "tenant-test")
+	restoreJob := rabbitmqRunningRestoreJob("rmq-src-to-copy", "rmq-copy")
+	backup := rabbitmqBackup("rmq-src")
+	cluster := newRabbitmqCluster("rmq-copy", "tenant-test", false)
+
+	_, rr := newRabbitmqTestEnv(t, targetApp, clientfake.NewClientBuilder().
+		WithObjects(newRabbitmqStrategy("cozy-default-rabbitmq"), backup, restoreJob, cluster))
+	ctx := context.Background()
+
+	res, err := rr.reconcileRabbitmqRestore(ctx, restoreJob, backup)
+	if err != nil {
+		t.Fatalf("reconcileRabbitmqRestore() error = %v", err)
+	}
+	if res.RequeueAfter == 0 {
+		t.Error("expected a requeue while the target cluster is not ready")
+	}
+	jobs := &batchv1.JobList{}
+	if err := rr.List(ctx, jobs, client.InNamespace("tenant-test")); err != nil {
+		t.Fatalf("list jobs: %v", err)
+	}
+	if len(jobs.Items) != 0 {
+		t.Fatalf("expected no restore Job while the target is not ready, got %d", len(jobs.Items))
+	}
+	updated := &backupsv1alpha1.RestoreJob{}
+	if err := rr.Get(ctx, client.ObjectKeyFromObject(restoreJob), updated); err != nil {
+		t.Fatalf("get restorejob: %v", err)
+	}
+	cond := meta.FindStatusCondition(updated.Status.Conditions, "Ready")
+	if cond == nil || cond.Status != metav1.ConditionFalse || cond.Reason != "RabbitMQClusterNotReady" {
+		t.Errorf("expected Ready=False/RabbitMQClusterNotReady, got %+v", cond)
+	}
+}
+
+// TestReconcileRabbitmqRestore_NoRecordedArtifactURI pins that a Backup with no
+// recorded status.artifact.uri fails the restore terminally, instead of
+// reconstructing a key that may not point at a real object.
+func TestReconcileRabbitmqRestore_NoRecordedArtifactURI(t *testing.T) {
+	targetApp := newRabbitmqApp("rmq-src", "tenant-test")
+	restoreJob := rabbitmqRunningRestoreJob("rmq-src-in-place", "")
+	backup := rabbitmqBackup("rmq-src")
+	backup.Status.Artifact = nil
+
+	_, rr := newRabbitmqTestEnv(t, targetApp, clientfake.NewClientBuilder().
+		WithObjects(newRabbitmqStrategy("cozy-default-rabbitmq"), backup, restoreJob))
+	ctx := context.Background()
+
+	if _, err := rr.reconcileRabbitmqRestore(ctx, restoreJob, backup); err != nil {
+		t.Fatalf("reconcileRabbitmqRestore() error = %v", err)
+	}
+	updated := &backupsv1alpha1.RestoreJob{}
+	if err := rr.Get(ctx, client.ObjectKeyFromObject(restoreJob), updated); err != nil {
+		t.Fatalf("get restorejob: %v", err)
+	}
+	if updated.Status.Phase != backupsv1alpha1.RestoreJobPhaseFailed {
+		t.Errorf("expected phase Failed for a Backup with no artifact URI, got %q", updated.Status.Phase)
+	}
+	if !strings.Contains(updated.Status.Message, "no recorded artifact URI") {
+		t.Errorf("expected 'no recorded artifact URI' message, got %q", updated.Status.Message)
+	}
+}
+
+// TestReconcileRabbitmq_RequiresArtifactURITemplate pins that a strategy without
+// artifactURITemplate fails the backup: the Backup would have no recorded
+// location for a restore to read.
+func TestReconcileRabbitmq_RequiresArtifactURITemplate(t *testing.T) {
+	app := newRabbitmqApp("rmq-test", "tenant-test")
+	strategy := newRabbitmqStrategy("cozy-default-rabbitmq")
+	strategy.Spec.ArtifactURITemplate = ""
+	now := metav1.Now()
+	backupJob := &backupsv1alpha1.BackupJob{
+		ObjectMeta: metav1.ObjectMeta{Name: "test-bj", Namespace: "tenant-test"},
+		Spec: backupsv1alpha1.BackupJobSpec{
+			ApplicationRef:  newRabbitmqRef("rmq-test"),
+			BackupClassName: "cozy-default",
+		},
+		Status: backupsv1alpha1.BackupJobStatus{StartedAt: &now, Phase: backupsv1alpha1.BackupJobPhaseRunning},
+	}
+	cluster := newRabbitmqCluster("rmq-test", "tenant-test", true)
+	r, _ := newRabbitmqTestEnv(t, app, clientfake.NewClientBuilder().WithObjects(backupJob, strategy, cluster))
+	ctx := context.Background()
+
+	if _, err := r.reconcileRabbitmq(ctx, backupJob, newRabbitmqResolved("cozy-default-rabbitmq", nil)); err != nil {
+		t.Fatalf("reconcileRabbitmq() error = %v", err)
+	}
+	updated := &backupsv1alpha1.BackupJob{}
+	if err := r.Get(ctx, client.ObjectKeyFromObject(backupJob), updated); err != nil {
+		t.Fatalf("get backupjob: %v", err)
+	}
+	if updated.Status.Phase != backupsv1alpha1.BackupJobPhaseFailed {
+		t.Errorf("expected phase Failed for a strategy with no artifactURITemplate, got %q", updated.Status.Phase)
+	}
+	if !strings.Contains(updated.Status.Message, "artifactURITemplate") {
+		t.Errorf("expected 'artifactURITemplate' message, got %q", updated.Status.Message)
+	}
+}
+
+// TestCreateRabbitmqBackupArtifact_ArtifactURI pins that a rendered artifact URI
+// is recorded on the Backup, and an empty URI leaves status.artifact unset.
+func TestCreateRabbitmqBackupArtifact_ArtifactURI(t *testing.T) {
+	app := newRabbitmqApp("rmq-test", "tenant-test")
+	backupJob := &backupsv1alpha1.BackupJob{
+		ObjectMeta: metav1.ObjectMeta{Name: "test-bj", Namespace: "tenant-test"},
+		Spec:       backupsv1alpha1.BackupJobSpec{ApplicationRef: newRabbitmqRef("rmq-test"), BackupClassName: "cozy-default"},
+	}
+	r, _ := newRabbitmqTestEnv(t, app, clientfake.NewClientBuilder().WithObjects(backupJob))
+	ctx := context.Background()
+	resolved := newRabbitmqResolved("cozy-default-rabbitmq", nil)
+
+	const wantURI = "s3://bkt/tenant-test/rmq-test/definitions.json"
+	if _, err := r.createRabbitmqBackupArtifact(ctx, backupJob, resolved, wantURI); err != nil {
+		t.Fatalf("createRabbitmqBackupArtifact() with URI: %v", err)
+	}
+	// Re-Get, not the returned struct: the real Backup CRD has no status
+	// subresource, so Create persists status.artifact - the re-Get is what
+	// proves it, and would fail if a status subresource were ever added.
+	created := &backupsv1alpha1.Backup{}
+	if err := r.Get(ctx, client.ObjectKey{Namespace: "tenant-test", Name: "test-bj"}, created); err != nil {
+		t.Fatalf("get Backup: %v", err)
+	}
+	if created.Status.Artifact == nil || created.Status.Artifact.URI != wantURI {
+		t.Errorf("expected persisted artifact URI %q, got %+v", wantURI, created.Status.Artifact)
+	}
+
+	backupJob.Name = "test-bj-2"
+	if _, err := r.createRabbitmqBackupArtifact(ctx, backupJob, resolved, ""); err != nil {
+		t.Fatalf("createRabbitmqBackupArtifact() without URI: %v", err)
+	}
+	noURI := &backupsv1alpha1.Backup{}
+	if err := r.Get(ctx, client.ObjectKey{Namespace: "tenant-test", Name: "test-bj-2"}, noURI); err != nil {
+		t.Fatalf("get Backup (no URI): %v", err)
+	}
+	if noURI.Status.Artifact != nil {
+		t.Errorf("expected no persisted artifact when URI is empty, got %+v", noURI.Status.Artifact)
+	}
+}
+
+// TestCleanupRabbitmqBackup_SpawnsDeleteJob pins that deleting a Backup spawns
+// an ownerless, self-cleaning Job that deletes the recorded object in cleanup
+// mode - so a retention-pruned Plan does not leak objects.
+func TestCleanupRabbitmqBackup_SpawnsDeleteJob(t *testing.T) {
+	testScheme := runtime.NewScheme()
+	_ = scheme.AddToScheme(testScheme)
+	_ = backupsv1alpha1.AddToScheme(testScheme)
+	_ = strategyv1alpha1.AddToScheme(testScheme)
+
+	backup := rabbitmqBackup("rmq-src") // status.artifact.uri is set by the fixture
+	strategy := newRabbitmqStrategy("cozy-default-rabbitmq")
+	ns := &corev1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: "tenant-test"}}
+	c := clientfake.NewClientBuilder().WithScheme(testScheme).
+		WithStatusSubresource(&batchv1.Job{}).
+		WithObjects(ns, backup, strategy).Build()
+	// Empty CredentialsConfig: ProjectBackupCredentials is a no-op when disabled,
+	// so the spawn path runs without a source Secret in the fake.
+	r := &BackupReconciler{Client: c, Scheme: testScheme, Recorder: record.NewFakeRecorder(10)}
+	ctx := context.Background()
+
+	// First pass: spawns the delete Job and requeues (waits) rather than
+	// letting the Backup go.
+	res, err := r.cleanupRabbitmqBackup(ctx, backup)
+	if err != nil {
+		t.Fatalf("cleanupRabbitmqBackup() error = %v", err)
+	}
+	if res.RequeueAfter == 0 {
+		t.Error("expected a requeue while the delete Job runs (must not orphan the object)")
+	}
+	jobs := &batchv1.JobList{}
+	if err := c.List(ctx, jobs, client.InNamespace("tenant-test")); err != nil {
+		t.Fatalf("list jobs: %v", err)
+	}
+	if len(jobs.Items) != 1 {
+		t.Fatalf("expected 1 cleanup Job, got %d", len(jobs.Items))
+	}
+	job := jobs.Items[0]
+	if job.Name != "rmq-src-adhoc-cleanup" {
+		t.Errorf("job name = %q, want rmq-src-adhoc-cleanup", job.Name)
+	}
+	if len(job.OwnerReferences) != 0 {
+		t.Errorf("cleanup Job must be ownerless so it survives Backup deletion, got %d ownerRefs", len(job.OwnerReferences))
+	}
+	if job.Labels[rabbitmqLabelMode] != rabbitmqModeCleanup {
+		t.Errorf("mode label = %q, want %q", job.Labels[rabbitmqLabelMode], rabbitmqModeCleanup)
+	}
+	if job.Spec.TTLSecondsAfterFinished == nil || job.Spec.ActiveDeadlineSeconds == nil {
+		t.Error("expected TTLSecondsAfterFinished + ActiveDeadlineSeconds on the cleanup Job")
+	}
+	foundMode := false
+	for _, a := range job.Spec.Template.Spec.Containers[0].Args {
+		if a == "--mode=cleanup" {
+			foundMode = true
+		}
+	}
+	if !foundMode {
+		t.Errorf("expected the pod rendered in cleanup mode (--mode=cleanup), got args %v", job.Spec.Template.Spec.Containers[0].Args)
+	}
+
+	// Once the delete Job completes, cleanup finishes (zero Result) and reaps
+	// the Job - so the Backup is only released after the object is gone.
+	job.Status.Conditions = []batchv1.JobCondition{{Type: batchv1.JobComplete, Status: corev1.ConditionTrue}}
+	if err := c.Status().Update(ctx, &job); err != nil {
+		t.Fatalf("update job status: %v", err)
+	}
+	res, err = r.cleanupRabbitmqBackup(ctx, backup)
+	if err != nil {
+		t.Fatalf("cleanupRabbitmqBackup() second call error = %v", err)
+	}
+	if res.RequeueAfter != 0 || res.Requeue {
+		t.Errorf("expected cleanup to finish once the Job completed, got requeue %+v", res)
+	}
+	if err := c.List(ctx, jobs, client.InNamespace("tenant-test")); err != nil {
+		t.Fatalf("list jobs: %v", err)
+	}
+	if len(jobs.Items) != 0 {
+		t.Errorf("expected the completed cleanup Job to be reaped, got %d", len(jobs.Items))
+	}
+}
+
+// TestCleanupRabbitmqBackup_NoArtifactNoop pins that a Backup with no recorded
+// artifact spawns nothing (there is no object to delete).
+func TestCleanupRabbitmqBackup_NoArtifactNoop(t *testing.T) {
+	testScheme := runtime.NewScheme()
+	_ = scheme.AddToScheme(testScheme)
+	_ = backupsv1alpha1.AddToScheme(testScheme)
+	_ = strategyv1alpha1.AddToScheme(testScheme)
+
+	backup := rabbitmqBackup("rmq-src")
+	backup.Status.Artifact = nil
+	c := clientfake.NewClientBuilder().WithScheme(testScheme).WithObjects(backup, newRabbitmqStrategy("cozy-default-rabbitmq")).Build()
+	r := &BackupReconciler{Client: c, Scheme: testScheme, Recorder: record.NewFakeRecorder(10)}
+	ctx := context.Background()
+
+	res, err := r.cleanupRabbitmqBackup(ctx, backup)
+	if err != nil {
+		t.Fatalf("cleanupRabbitmqBackup() error = %v", err)
+	}
+	if res.RequeueAfter != 0 || res.Requeue {
+		t.Errorf("expected no requeue when there is nothing to delete, got %+v", res)
+	}
+	jobs := &batchv1.JobList{}
+	if err := c.List(ctx, jobs, client.InNamespace("tenant-test")); err != nil {
+		t.Fatalf("list jobs: %v", err)
+	}
+	if len(jobs.Items) != 0 {
+		t.Fatalf("expected no cleanup Job when there is no artifact, got %d", len(jobs.Items))
+	}
+}
+
+// TestReconcileRabbitmq_ReadinessDeadline pins that the AllReplicasReady wait is
+// bounded: a broker that never becomes ready fails the BackupJob past the
+// deadline instead of requeuing in phase=Running forever.
+func TestReconcileRabbitmq_ReadinessDeadline(t *testing.T) {
+	app := newRabbitmqApp("rmq-test", "tenant-test")
+	strategy := newRabbitmqStrategy("cozy-default-rabbitmq")
+	started := metav1.NewTime(time.Now().Add(-31 * time.Minute))
+	backupJob := &backupsv1alpha1.BackupJob{
+		ObjectMeta: metav1.ObjectMeta{Name: "test-bj", Namespace: "tenant-test"},
+		Spec:       backupsv1alpha1.BackupJobSpec{ApplicationRef: newRabbitmqRef("rmq-test"), BackupClassName: "cozy-default"},
+		Status:     backupsv1alpha1.BackupJobStatus{StartedAt: &started, Phase: backupsv1alpha1.BackupJobPhaseRunning},
+	}
+	cluster := newRabbitmqCluster("rmq-test", "tenant-test", false) // never ready
+	r, _ := newRabbitmqTestEnv(t, app, clientfake.NewClientBuilder().WithObjects(backupJob, strategy, cluster))
+	ctx := context.Background()
+
+	if _, err := r.reconcileRabbitmq(ctx, backupJob, newRabbitmqResolved("cozy-default-rabbitmq", nil)); err != nil {
+		t.Fatalf("reconcileRabbitmq() error = %v", err)
+	}
+	updated := &backupsv1alpha1.BackupJob{}
+	if err := r.Get(ctx, client.ObjectKeyFromObject(backupJob), updated); err != nil {
+		t.Fatalf("get backupjob: %v", err)
+	}
+	if updated.Status.Phase != backupsv1alpha1.BackupJobPhaseFailed {
+		t.Errorf("expected phase Failed past the readiness deadline, got %q", updated.Status.Phase)
+	}
+	if !strings.Contains(updated.Status.Message, "did not become ready within") {
+		t.Errorf("expected a deadline message, got %q", updated.Status.Message)
+	}
+}
+
+// TestCleanupRabbitmqBackup_SkipAnnotation pins the escape hatch: an annotated
+// Backup is released without spawning a delete Job, so an operator can remove a
+// Backup stuck Terminating because object storage is unreachable.
+func TestCleanupRabbitmqBackup_SkipAnnotation(t *testing.T) {
+	testScheme := runtime.NewScheme()
+	_ = scheme.AddToScheme(testScheme)
+	_ = backupsv1alpha1.AddToScheme(testScheme)
+	_ = strategyv1alpha1.AddToScheme(testScheme)
+
+	backup := rabbitmqBackup("rmq-src")
+	backup.Annotations = map[string]string{"backups.cozystack.io/skip-artifact-cleanup": "true"}
+	c := clientfake.NewClientBuilder().WithScheme(testScheme).
+		WithObjects(backup, newRabbitmqStrategy("cozy-default-rabbitmq")).Build()
+	r := &BackupReconciler{Client: c, Scheme: testScheme, Recorder: record.NewFakeRecorder(10)}
+	ctx := context.Background()
+
+	res, err := r.cleanupRabbitmqBackup(ctx, backup)
+	if err != nil {
+		t.Fatalf("cleanupRabbitmqBackup() error = %v", err)
+	}
+	if res.RequeueAfter != 0 || res.Requeue {
+		t.Errorf("expected the annotation to release the Backup (no requeue), got %+v", res)
+	}
+	jobs := &batchv1.JobList{}
+	if err := c.List(ctx, jobs, client.InNamespace("tenant-test")); err != nil {
+		t.Fatalf("list jobs: %v", err)
+	}
+	if len(jobs.Items) != 0 {
+		t.Fatalf("expected no delete Job when cleanup is skipped by annotation, got %d", len(jobs.Items))
+	}
+}
diff --git a/internal/backupcontroller/rabbitmqtypes/types.go b/internal/backupcontroller/rabbitmqtypes/types.go
new file mode 100644
index 0000000000..b251008473
--- /dev/null
+++ b/internal/backupcontroller/rabbitmqtypes/types.go
@@ -0,0 +1,140 @@
+// SPDX-License-Identifier: Apache-2.0
+
+// Package rabbitmqtypes declares the minimum subset of rabbitmq.com/v1beta1
+// RabbitmqCluster the backupstrategy controller reads. The RabbitMQ backup
+// driver never creates or patches operator CRs (it exports/imports definitions
+// over the management API from a Job), so this carries only the status the
+// driver gates on — whether every replica is ready — rather than pulling the
+// full rabbitmq-cluster-operator Go API. Reads are lenient, so the hand-written
+// partial is sufficient.
+//
+// +groupName=rabbitmq.com
+// +versionName=v1beta1
+package rabbitmqtypes
+
+import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+)
+
+const (
+	GroupName = "rabbitmq.com"
+	Version   = "v1beta1"
+
+	// ConditionAllReplicasReady is the cluster-operator condition the driver
+	// gates on: True once every RabbitMQ server replica is running (and the
+	// management API is therefore serving). The driver defers a backup/restore
+	// with a precise Ready=False message until this is True.
+	ConditionAllReplicasReady = "AllReplicasReady"
+)
+
+var (
+	GroupVersion  = schema.GroupVersion{Group: GroupName, Version: Version}
+	SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
+	AddToScheme   = SchemeBuilder.AddToScheme
+)
+
+func addKnownTypes(scheme *runtime.Scheme) error {
+	scheme.AddKnownTypes(GroupVersion,
+		&RabbitmqCluster{}, &RabbitmqClusterList{},
+	)
+	metav1.AddToGroupVersion(scheme, GroupVersion)
+	return nil
+}
+
+// +kubebuilder:object:root=true
+
+// RabbitmqCluster carries only the status the driver reads for its readiness
+// gate; the spec is intentionally omitted (the driver never writes the CR).
+type RabbitmqCluster struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+	Status            RabbitmqClusterStatus `json:"status,omitempty"`
+}
+
+// +kubebuilder:object:root=true
+
+// RabbitmqClusterList contains a list of RabbitmqCluster.
+type RabbitmqClusterList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+	Items           []RabbitmqCluster `json:"items"`
+}
+
+// RabbitmqClusterStatus mirrors the subset of the operator status the driver
+// reads. Conditions decode as metav1.Condition (the operator's conditions are
+// wire-compatible); the driver only inspects ConditionAllReplicasReady.
+type RabbitmqClusterStatus struct {
+	Conditions []metav1.Condition `json:"conditions,omitempty"`
+}
+
+func (in *RabbitmqCluster) DeepCopyInto(out *RabbitmqCluster) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
+	in.Status.DeepCopyInto(&out.Status)
+}
+
+func (in *RabbitmqCluster) DeepCopy() *RabbitmqCluster {
+	if in == nil {
+		return nil
+	}
+	out := new(RabbitmqCluster)
+	in.DeepCopyInto(out)
+	return out
+}
+
+func (in *RabbitmqCluster) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+func (in *RabbitmqClusterList) DeepCopyInto(out *RabbitmqClusterList) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ListMeta.DeepCopyInto(&out.ListMeta)
+	if in.Items != nil {
+		out.Items = make([]RabbitmqCluster, len(in.Items))
+		for i := range in.Items {
+			in.Items[i].DeepCopyInto(&out.Items[i])
+		}
+	}
+}
+
+func (in *RabbitmqClusterList) DeepCopy() *RabbitmqClusterList {
+	if in == nil {
+		return nil
+	}
+	out := new(RabbitmqClusterList)
+	in.DeepCopyInto(out)
+	return out
+}
+
+func (in *RabbitmqClusterList) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+func (in *RabbitmqClusterStatus) DeepCopyInto(out *RabbitmqClusterStatus) {
+	*out = *in
+	if in.Conditions != nil {
+		out.Conditions = make([]metav1.Condition, len(in.Conditions))
+		for i := range in.Conditions {
+			in.Conditions[i].DeepCopyInto(&out.Conditions[i])
+		}
+	}
+}
+
+func (in *RabbitmqClusterStatus) DeepCopy() *RabbitmqClusterStatus {
+	if in == nil {
+		return nil
+	}
+	out := new(RabbitmqClusterStatus)
+	in.DeepCopyInto(out)
+	return out
+}
diff --git a/internal/backupcontroller/redisstrategy_controller.go b/internal/backupcontroller/redisstrategy_controller.go
new file mode 100644
index 0000000000..7d287d385f
--- /dev/null
+++ b/internal/backupcontroller/redisstrategy_controller.go
@@ -0,0 +1,882 @@
+// SPDX-License-Identifier: Apache-2.0
+package backupcontroller
+
+import (
+	"context"
+	"fmt"
+	"maps"
+	"strings"
+	"time"
+
+	batchv1 "k8s.io/api/batch/v1"
+	corev1 "k8s.io/api/core/v1"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	apimeta "k8s.io/apimachinery/pkg/api/meta"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/types"
+	ctrl "sigs.k8s.io/controller-runtime"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
+
+	strategyv1alpha1 "github.com/cozystack/cozystack/api/backups/strategy/v1alpha1"
+	backupsv1alpha1 "github.com/cozystack/cozystack/api/backups/v1alpha1"
+	"github.com/cozystack/cozystack/internal/template"
+)
+
+// ---------------------------------------------------------------------------
+// Constants
+// ---------------------------------------------------------------------------
+
+// redisAppPrefixes maps each application Kind this driver serves to the
+// resource-name prefix its chart puts in front of the app name (RedisFailover,
+// sentinel Service, auth and CA Secrets). Valkey runs on the same RedisFailover
+// operator, so the one strategy dumps and restores both; the template reads the
+// prefix as .Release.Prefix.
+var redisAppPrefixes = map[string]string{
+	"Redis":  "redis-",
+	"Valkey": "valkey-",
+}
+
+const (
+	redisAppKind = "Redis"
+
+	// Mode label / values applied to the rendered batch/v1.Job so RBAC and
+	// debugging tools can distinguish backup vs restore runs at a glance.
+	// Mirrors the Altinity driver's altinityLabelMode convention.
+	redisLabelMode   = "redis.strategy.backups.cozystack.io/mode"
+	redisModeBackup  = "backup"
+	redisModeRestore = "restore"
+	// redisModeCleanup renders the strategy as a one-shot object-delete Job that
+	// removes a deleted Backup's object from the bucket. It never contacts Redis,
+	// so it works after the source app is gone.
+	redisModeCleanup = "cleanup"
+
+	// redisSkipArtifactCleanupAnnotation, set to "true" on a Backup, releases it
+	// from Terminating without deleting its object — the escape hatch for a
+	// Backup wedged on an unreachable bucket. The object is left behind.
+	redisSkipArtifactCleanupAnnotation = "backups.cozystack.io/skip-artifact-cleanup"
+
+	// Driver-metadata key prefix used to round-trip BackupClassStrategy
+	// parameters through the Backup artifact, so a later RestoreJob can
+	// re-render the strategy template with the same parameter values that
+	// were in effect at backup time. Mirrors altinityParamPrefix.
+	redisParamPrefix = "redis.strategy.backups.cozystack.io/parameter/"
+
+	// redisObjectMetaKey records, on the Backup, the exact object-storage key
+	// the dump was written to. Each BackupJob mints a distinct key (see
+	// redisObjectKey), so a Plan keeps one object per run and a restore reads
+	// back the object its Backup names rather than whatever last overwrote a
+	// shared path.
+	redisObjectMetaKey = "redis.strategy.backups.cozystack.io/object"
+
+	// Polling cadence for the Job lifecycle. Mirrors the Altinity / Job /
+	// CNPG strategy cadence so behaviour is uniform across drivers.
+	redisPollInterval = 5 * time.Second
+
+	// redisDefaultBackupDeadline bounds how long the driver will wait on the
+	// app-readiness precondition before failing the run terminally, so a
+	// RedisFailover that reports Ready=False forever surfaces a legible
+	// failure instead of requeuing silently. Matches the etcd deadline.
+	redisDefaultBackupDeadline = 20 * time.Minute
+)
+
+// validateRedisApplicationRef rejects ApplicationRefs that are not one of the
+// apps.cozystack.io kinds in redisAppPrefixes. Without this gate the dispatcher
+// would route other refs to the Redis driver and the templated redis-cli
+// invocation would fail with confusing runtime errors. Mirrors
+// validateAltinityApplicationRef; empty APIGroup is accepted and treated as
+// the default (apps.cozystack.io).
+func validateRedisApplicationRef(ref corev1.TypedLocalObjectReference) error {
+	if _, ok := redisAppPrefixes[ref.Kind]; !ok {
+		return fmt.Errorf("redis strategy supports applicationRef.kind Redis or Valkey, got %q", ref.Kind)
+	}
+	apiGroup := ""
+	if ref.APIGroup != nil {
+		apiGroup = *ref.APIGroup
+	}
+	if apiGroup != "" && apiGroup != backupsv1alpha1.DefaultApplicationAPIGroup {
+		return fmt.Errorf("redis strategy supports applicationRef.apiGroup=%q, got %q", backupsv1alpha1.DefaultApplicationAPIGroup, apiGroup)
+	}
+	return nil
+}
+
+// redisAppReady is the backup/restore precondition. It reports whether the
+// driver may proceed to launch the dump/restore Job against the live Redis
+// application object.
+//
+// It blocks ONLY on an explicit Ready=False condition (returning its reason and
+// message so the BackupJob surfaces a precise cause), and proceeds on Ready=True,
+// Ready=Unknown, or the absence of a Ready condition. Proceeding on absence is
+// deliberate: not every apps.cozystack.io object surfaces a Ready condition, and
+// a driver that blocked on a missing condition would wedge backups for those
+// apps until the deadline. When the app is genuinely unreachable, the Job itself
+// fails with the connection error rather than the driver hanging.
+func redisAppReady(app map[string]any) (proceed bool, reason, message string) {
+	conditions, found, err := unstructured.NestedSlice(app, "status", "conditions")
+	if err != nil || !found {
+		return true, "", ""
+	}
+	for _, raw := range conditions {
+		cond, ok := raw.(map[string]any)
+		if !ok {
+			continue
+		}
+		condType, _, _ := unstructured.NestedString(cond, "type")
+		if condType != "Ready" {
+			continue
+		}
+		status, _, _ := unstructured.NestedString(cond, "status")
+		if status == string(metav1.ConditionFalse) {
+			reason, _, _ = unstructured.NestedString(cond, "reason")
+			message, _, _ = unstructured.NestedString(cond, "message")
+			return false, reason, message
+		}
+		return true, "", ""
+	}
+	return true, "", ""
+}
+
+// redisBackupDeadlineExceeded reports whether the precondition wait has
+// exhausted its budget. Returns false when StartedAt is nil so the first
+// reconcile (which sets it) never trips the gate. Mirrors
+// cnpgBackupDeadlineExceeded.
+func redisBackupDeadlineExceeded(startedAt *metav1.Time) bool {
+	if startedAt == nil {
+		return false
+	}
+	return time.Since(startedAt.Time) > redisDefaultBackupDeadline
+}
+
+// redisStrategyParameters extracts BackupClassStrategy parameters from a
+// Backup's DriverMetadata. Round-trips the values written by reconcileRedis at
+// backup time so a later RestoreJob can render the strategy template with the
+// parameter snapshot in effect when the backup was taken. Mirrors
+// backupParameters from the Altinity driver.
+func redisStrategyParameters(b *backupsv1alpha1.Backup) map[string]string {
+	out := map[string]string{}
+	for k, v := range b.Spec.DriverMetadata {
+		if !strings.HasPrefix(k, redisParamPrefix) {
+			continue
+		}
+		paramKey := strings.TrimPrefix(k, redisParamPrefix)
+		if paramKey == "" {
+			continue
+		}
+		out[paramKey] = v
+	}
+	return out
+}
+
+// redisObjectKey mints the object-storage key for one backup. Including the
+// BackupJob name (unique per Plan tick) makes every backup a distinct object, so
+// a later run cannot overwrite an earlier recovery point.
+func redisObjectKey(namespace, appName, backupName string) string {
+	return fmt.Sprintf("%s/%s/%s.rdb", namespace, appName, backupName)
+}
+
+// redisRestoreObjectKey resolves which object a restore must read: the key
+// recorded on the Backup at backup time. A Backup written before object keys
+// were recorded (none exist in a released cluster, but be defensive) falls back
+// to the legacy fixed name so it can still be restored.
+func redisRestoreObjectKey(b *backupsv1alpha1.Backup) string {
+	if key := b.Spec.DriverMetadata[redisObjectMetaKey]; key != "" {
+		return key
+	}
+	return fmt.Sprintf("%s/%s/dump.rdb", b.Namespace, b.Spec.ApplicationRef.Name)
+}
+
+// renderRedisTemplate runs the strategy's PodTemplateSpec through the
+// repository's text/template engine with the same context shape as the Altinity
+// / Job drivers: every string field is templated against the application
+// object, the release shorthand, the run mode, and the resolved parameters. On
+// restore it also exposes .Backup.ApplicationRef so a to-copy restore can read
+// the SOURCE release's object-storage prefix while writing into a differently-
+// named target. Mirrors renderAltinityTemplate.
+func renderRedisTemplate(
+	tmpl corev1.PodTemplateSpec,
+	app map[string]any,
+	appKind, releaseName, releaseNamespace, mode, objectKey string,
+	parameters map[string]string,
+	backup *backupsv1alpha1.Backup,
+) (*corev1.PodTemplateSpec, error) {
+	prefix, ok := redisAppPrefixes[appKind]
+	if !ok {
+		return nil, fmt.Errorf("no resource-name prefix for application kind %q", appKind)
+	}
+	ctxMap := map[string]any{
+		"Application": app,
+		"Release": map[string]string{
+			"Name":      releaseName,
+			"Namespace": releaseNamespace,
+			"Prefix":    prefix,
+		},
+		"Mode":       mode,
+		"ObjectKey":  objectKey,
+		"Parameters": parameters,
+	}
+	if backup != nil {
+		sourceAPIGroup := ""
+		if backup.Spec.ApplicationRef.APIGroup != nil {
+			sourceAPIGroup = *backup.Spec.ApplicationRef.APIGroup
+		}
+		ctxMap["Backup"] = map[string]any{
+			"Name":      backup.Name,
+			"Namespace": backup.Namespace,
+			"ApplicationRef": map[string]string{
+				"APIGroup": sourceAPIGroup,
+				"Kind":     backup.Spec.ApplicationRef.Kind,
+				"Name":     backup.Spec.ApplicationRef.Name,
+			},
+		}
+	}
+	return template.Template(&tmpl, ctxMap)
+}
+
+// ---------------------------------------------------------------------------
+// BackupJob path
+// ---------------------------------------------------------------------------
+
+// reconcileRedis drives a BackupJob whose resolved strategy is a
+// strategy.backups.cozystack.io/Redis. The spotahome operator ships no backup
+// CRD, so the driver renders the strategy's PodTemplateSpec against the live
+// Redis application object and runs it once as a batch/v1.Job that dumps an RDB
+// snapshot to object storage; Job completion is backup success. Structurally a
+// specialisation of the Job strategy with a Redis applicationRef gate and an
+// app-readiness precondition, mirroring reconcileAltinity.
+func (r *BackupJobReconciler) reconcileRedis(ctx context.Context, j *backupsv1alpha1.BackupJob, resolved *ResolvedBackupConfig) (ctrl.Result, error) {
+	logger := getLogger(ctx)
+	logger.Debug("reconciling Redis strategy", "backupjob", j.Name, "phase", j.Status.Phase)
+
+	if j.Status.Phase == backupsv1alpha1.BackupJobPhaseSucceeded ||
+		j.Status.Phase == backupsv1alpha1.BackupJobPhaseFailed {
+		return ctrl.Result{}, nil
+	}
+
+	if err := validateRedisApplicationRef(j.Spec.ApplicationRef); err != nil {
+		return r.markBackupJobFailed(ctx, j, err.Error())
+	}
+
+	// First-reconcile bookkeeping. Refetch before writing StartedAt so a
+	// stale informer cache cannot silently slide the timestamp forward
+	// across reconciles, mirroring reconcileAltinity.
+	if j.Status.StartedAt == nil {
+		fresh := &backupsv1alpha1.BackupJob{}
+		if err := r.Get(ctx, types.NamespacedName{Namespace: j.Namespace, Name: j.Name}, fresh); err != nil {
+			return ctrl.Result{}, err
+		}
+		if fresh.Status.StartedAt != nil {
+			j.Status.StartedAt = fresh.Status.StartedAt
+			j.Status.Phase = fresh.Status.Phase
+		} else {
+			base := fresh.DeepCopy()
+			now := metav1.Now()
+			fresh.Status.StartedAt = &now
+			fresh.Status.Phase = backupsv1alpha1.BackupJobPhaseRunning
+			if err := r.Status().Patch(ctx, fresh, client.MergeFrom(base)); err != nil {
+				return ctrl.Result{}, err
+			}
+			// Requeue so the next reconcile re-Gets j with the post-patch
+			// ResourceVersion. See reconcileAltinity for the rationale.
+			return ctrl.Result{RequeueAfter: redisPollInterval}, nil
+		}
+	}
+
+	strategy := &strategyv1alpha1.Redis{}
+	if err := r.Get(ctx, client.ObjectKey{Name: resolved.StrategyRef.Name}, strategy); err != nil {
+		if apierrors.IsNotFound(err) {
+			return r.requeueStrategyNotReady(ctx, j, resolved.StrategyRef.Name)
+		}
+		return ctrl.Result{}, err
+	}
+
+	app, err := r.getApplicationUnstructured(ctx, j.Namespace, j.Spec.ApplicationRef)
+	if err != nil {
+		if apierrors.IsNotFound(err) || apimeta.IsNoMatchError(err) {
+			return r.markBackupJobFailed(ctx, j, fmt.Sprintf("%s application not found or kind not registered: %s/%s", j.Spec.ApplicationRef.Kind, j.Namespace, j.Spec.ApplicationRef.Name))
+		}
+		return ctrl.Result{}, err
+	}
+
+	// Gate on application readiness only before the Job exists. Once it has been
+	// created, observe it directly (via the switch below): re-checking readiness
+	// here would mark a run Failed whose Job may already have completed, if the
+	// app's Ready flips False after launch and stays so past the deadline (an
+	// unrelated HelmRelease blip). Only a definite NotFound means "not created
+	// yet"; any other Get error is undecidable, so requeue rather than re-gate
+	// readiness on it (a transient error must not reintroduce the spurious fail).
+	// The deadline still bounds the pre-launch wait.
+	existingBackupJob := &batchv1.Job{}
+	switch err := r.Get(ctx, client.ObjectKey{Namespace: j.Namespace, Name: jobNameForBackupJob(j)}, existingBackupJob); {
+	case err == nil:
+		// Job exists; skip the readiness re-gate and observe it below.
+	case apierrors.IsNotFound(err):
+		if proceed, reason, message := redisAppReady(app); !proceed {
+			if redisBackupDeadlineExceeded(j.Status.StartedAt) {
+				return r.markBackupJobFailed(ctx, j, fmt.Sprintf(
+					"%s application %s/%s not ready within %s (%s: %s)",
+					j.Spec.ApplicationRef.Kind, j.Namespace, j.Spec.ApplicationRef.Name, redisDefaultBackupDeadline, reason, message))
+			}
+			apimeta.SetStatusCondition(&j.Status.Conditions, metav1.Condition{
+				Type:    "Ready",
+				Status:  metav1.ConditionFalse,
+				Reason:  "ApplicationNotReady",
+				Message: fmt.Sprintf("%s application %s/%s is not ready (%s: %s)", j.Spec.ApplicationRef.Kind, j.Namespace, j.Spec.ApplicationRef.Name, reason, message),
+			})
+			if updateErr := r.Status().Update(ctx, j); updateErr != nil {
+				return ctrl.Result{}, updateErr
+			}
+			return ctrl.Result{RequeueAfter: redisPollInterval}, nil
+		}
+	default:
+		return ctrl.Result{}, err
+	}
+
+	objectKey := redisObjectKey(j.Namespace, j.Spec.ApplicationRef.Name, j.Name)
+	rendered, err := renderRedisTemplate(
+		strategy.Spec.Template,
+		app,
+		j.Spec.ApplicationRef.Kind,
+		j.Spec.ApplicationRef.Name,
+		j.Namespace,
+		redisModeBackup,
+		objectKey,
+		resolved.Parameters,
+		nil,
+	)
+	if err != nil {
+		return r.markBackupJobFailed(ctx, j, fmt.Sprintf("failed to template Redis strategy: %v", err))
+	}
+
+	batchJob, err := r.ensureRedisJob(ctx, j, j.Namespace, jobNameForBackupJob(j),
+		redisModeBackup,
+		map[string]string{
+			backupsv1alpha1.OwningJobNameLabel:      j.Name,
+			backupsv1alpha1.OwningJobNamespaceLabel: j.Namespace,
+		},
+		rendered,
+	)
+	if err != nil {
+		return r.markBackupJobFailed(ctx, j, fmt.Sprintf("failed to ensure batch/v1.Job: %v", err))
+	}
+
+	switch jobConditionState(batchJob) {
+	case batchv1.JobComplete:
+		if j.Status.BackupRef != nil {
+			return ctrl.Result{}, nil
+		}
+		artifact, err := r.createRedisBackupArtifact(ctx, j, resolved, objectKey)
+		if err != nil {
+			return r.markBackupJobFailed(ctx, j, fmt.Sprintf("failed to create Backup artifact: %v", err))
+		}
+		now := metav1.Now()
+		j.Status.BackupRef = &corev1.LocalObjectReference{Name: artifact.Name}
+		j.Status.CompletedAt = &now
+		j.Status.Phase = backupsv1alpha1.BackupJobPhaseSucceeded
+		apimeta.SetStatusCondition(&j.Status.Conditions, metav1.Condition{
+			Type:    "Ready",
+			Status:  metav1.ConditionTrue,
+			Reason:  "BackupCompleted",
+			Message: "redis backup Job completed",
+		})
+		if err := r.Status().Update(ctx, j); err != nil {
+			return ctrl.Result{}, err
+		}
+		return ctrl.Result{}, nil
+
+	case batchv1.JobFailed:
+		message := jobFailureMessage(batchJob)
+		if message == "" {
+			message = "redis backup Job reported Failed"
+		}
+		return r.markBackupJobFailed(ctx, j, message)
+
+	default:
+		return ctrl.Result{RequeueAfter: redisPollInterval}, nil
+	}
+}
+
+// ensureBackupBatchJob idempotently materialises a batch/v1.Job from the
+// rendered PodTemplateSpec: a deterministic name makes a retried reconcile
+// observe the existing Job rather than create a duplicate, and the controllerRef
+// lets kube-gc collect the Job (and its Pod) when the owner is deleted. The
+// backup and restore paths of the Job-executed drivers share this shape (see
+// ensureAltinityJob / ensureJobStrategyJob); the Redis driver factors it out
+// rather than copy it a fifth time.
+func ensureBackupBatchJob(
+	ctx context.Context,
+	c client.Client,
+	scheme *runtime.Scheme,
+	owner client.Object,
+	namespace, name string,
+	labels map[string]string,
+	rendered *corev1.PodTemplateSpec,
+) (*batchv1.Job, error) {
+	existing := &batchv1.Job{}
+	err := c.Get(ctx, types.NamespacedName{Namespace: namespace, Name: name}, existing)
+	if err == nil {
+		return existing, nil
+	}
+	if !apierrors.IsNotFound(err) {
+		return nil, err
+	}
+
+	desired := buildJobStrategyBatchJob(namespace, name, labels, rendered)
+	// Promote the strategy's Pod-level activeDeadlineSeconds to the Job so it
+	// bounds the whole run: buildJobStrategyBatchJob sets backoffLimit=2, and a
+	// Pod-level deadline alone would let a wedged run burn (backoffLimit+1) x the
+	// deadline before the Job reports Failed, widening the window a cron Plan
+	// stacks behind. A Job-level deadline caps the aggregate regardless of retries.
+	if d := desired.Spec.Template.Spec.ActiveDeadlineSeconds; d != nil && desired.Spec.ActiveDeadlineSeconds == nil {
+		desired.Spec.ActiveDeadlineSeconds = d
+	}
+	if err := controllerutil.SetControllerReference(owner, desired, scheme); err != nil {
+		return nil, fmt.Errorf("set controller reference on backup Job: %w", err)
+	}
+	if err := c.Create(ctx, desired); err != nil {
+		if apierrors.IsAlreadyExists(err) {
+			if err := c.Get(ctx, types.NamespacedName{Namespace: namespace, Name: name}, existing); err != nil {
+				return nil, err
+			}
+			return existing, nil
+		}
+		return nil, err
+	}
+	return desired, nil
+}
+
+// ensureRedisJob wraps ensureBackupBatchJob with the Redis mode label, mirroring
+// ensureAltinityJob.
+func (r *BackupJobReconciler) ensureRedisJob(
+	ctx context.Context,
+	owner client.Object,
+	namespace, name, mode string,
+	ownerLabels map[string]string,
+	rendered *corev1.PodTemplateSpec,
+) (*batchv1.Job, error) {
+	labels := map[string]string{redisLabelMode: mode}
+	maps.Copy(labels, ownerLabels)
+	return ensureBackupBatchJob(ctx, r.Client, r.Scheme, owner, namespace, name, labels, rendered)
+}
+
+// createRedisBackupArtifact materialises a Cozystack Backup carrying the
+// strategy reference and the BackupClassStrategy parameters in effect at backup
+// time. Parameters round-trip via DriverMetadata under redisParamPrefix so a
+// later RestoreJob can re-render the strategy template against the same values.
+// The Redis driver keeps no operator-side restore state, so there is no
+// underlyingResources snapshot — mirrors createAltinityBackupArtifact.
+func (r *BackupJobReconciler) createRedisBackupArtifact(
+	ctx context.Context,
+	j *backupsv1alpha1.BackupJob,
+	resolved *ResolvedBackupConfig,
+	objectKey string,
+) (*backupsv1alpha1.Backup, error) {
+	driverMD := map[string]string{redisObjectMetaKey: objectKey}
+	for k, v := range resolved.Parameters {
+		driverMD[redisParamPrefix+k] = v
+	}
+
+	backup := &backupsv1alpha1.Backup{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      j.Name,
+			Namespace: j.Namespace,
+		},
+		Spec: backupsv1alpha1.BackupSpec{
+			ApplicationRef: j.Spec.ApplicationRef,
+			StrategyRef:    resolved.StrategyRef,
+			TakenAt:        metav1.Now(),
+			DriverMetadata: driverMD,
+		},
+		Status: backupsv1alpha1.BackupStatus{
+			Phase: backupsv1alpha1.BackupPhaseReady,
+		},
+	}
+	if j.Spec.PlanRef != nil {
+		backup.Spec.PlanRef = j.Spec.PlanRef
+	}
+	if err := r.Create(ctx, backup); err != nil {
+		if !apierrors.IsAlreadyExists(err) {
+			return nil, err
+		}
+		existing := &backupsv1alpha1.Backup{}
+		if getErr := r.Get(ctx, types.NamespacedName{Namespace: backup.Namespace, Name: backup.Name}, existing); getErr != nil {
+			return nil, getErr
+		}
+		return existing, nil
+	}
+	return backup, nil
+}
+
+// ---------------------------------------------------------------------------
+// RestoreJob path
+// ---------------------------------------------------------------------------
+
+// reconcileRedisRestore drives a RestoreJob whose source Backup was produced by
+// the Redis strategy. It re-renders the same PodTemplateSpec with Mode=restore
+// and runs it once as a batch/v1.Job that replays the RDB snapshot into the
+// target's master; Job completion is restore success. in-place (target defaults
+// to the source app) and to-copy (targetApplicationRef overrides the name) share
+// this path, mirroring reconcileAltinityRestore.
+//
+// Cross-namespace restore is intentionally unsupported: RestoreJob.spec.
+// targetApplicationRef is corev1.TypedLocalObjectReference, so the restore Job
+// always runs in restoreJob.Namespace.
+func (r *RestoreJobReconciler) reconcileRedisRestore(ctx context.Context, restoreJob *backupsv1alpha1.RestoreJob, backup *backupsv1alpha1.Backup) (ctrl.Result, error) {
+	logger := getLogger(ctx)
+	logger.Debug("reconciling Redis restore", "restorejob", restoreJob.Name, "backup", backup.Name)
+
+	if restoreJob.Status.Phase == backupsv1alpha1.RestoreJobPhaseSucceeded ||
+		restoreJob.Status.Phase == backupsv1alpha1.RestoreJobPhaseFailed {
+		return ctrl.Result{}, nil
+	}
+
+	if err := validateRedisApplicationRef(backup.Spec.ApplicationRef); err != nil {
+		return r.markRestoreJobFailed(ctx, restoreJob, err.Error())
+	}
+
+	// Resolve the effective restore target. Defaults to the source application
+	// recorded on the Backup; targetApplicationRef overrides any of
+	// name/kind/apiGroup when set (to-copy into a differently-named app in the
+	// same namespace).
+	targetNamespace := restoreJob.Namespace
+	targetAppName := backup.Spec.ApplicationRef.Name
+	targetAppKind := backup.Spec.ApplicationRef.Kind
+	targetAPIGroup := ""
+	if backup.Spec.ApplicationRef.APIGroup != nil {
+		targetAPIGroup = *backup.Spec.ApplicationRef.APIGroup
+	}
+	if restoreJob.Spec.TargetApplicationRef != nil {
+		if restoreJob.Spec.TargetApplicationRef.Name != "" {
+			targetAppName = restoreJob.Spec.TargetApplicationRef.Name
+		}
+		if restoreJob.Spec.TargetApplicationRef.Kind != "" {
+			targetAppKind = restoreJob.Spec.TargetApplicationRef.Kind
+		}
+		if restoreJob.Spec.TargetApplicationRef.APIGroup != nil {
+			targetAPIGroup = *restoreJob.Spec.TargetApplicationRef.APIGroup
+		}
+	}
+	targetRef := corev1.TypedLocalObjectReference{
+		APIGroup: new(targetAPIGroup),
+		Kind:     targetAppKind,
+		Name:     targetAppName,
+	}
+	if err := validateRedisApplicationRef(targetRef); err != nil {
+		return r.markRestoreJobFailed(ctx, restoreJob, err.Error())
+	}
+	// Redis and Valkey diverge in commands and RDB versions across releases, so
+	// a cross-engine replay is not something the strategy can promise.
+	if targetAppKind != backup.Spec.ApplicationRef.Kind {
+		return r.markRestoreJobFailed(ctx, restoreJob, fmt.Sprintf(
+			"cannot restore a %s backup into a %s application", backup.Spec.ApplicationRef.Kind, targetAppKind))
+	}
+
+	if restoreJob.Status.StartedAt == nil {
+		fresh := &backupsv1alpha1.RestoreJob{}
+		if err := r.Get(ctx, types.NamespacedName{Namespace: restoreJob.Namespace, Name: restoreJob.Name}, fresh); err != nil {
+			return ctrl.Result{}, err
+		}
+		if fresh.Status.StartedAt != nil {
+			restoreJob.Status.StartedAt = fresh.Status.StartedAt
+			restoreJob.Status.Phase = fresh.Status.Phase
+		} else {
+			base := fresh.DeepCopy()
+			now := metav1.Now()
+			fresh.Status.StartedAt = &now
+			fresh.Status.Phase = backupsv1alpha1.RestoreJobPhaseRunning
+			if err := r.Status().Patch(ctx, fresh, client.MergeFrom(base)); err != nil {
+				return ctrl.Result{}, err
+			}
+			return ctrl.Result{RequeueAfter: redisPollInterval}, nil
+		}
+	}
+
+	strategy := &strategyv1alpha1.Redis{}
+	if err := r.Get(ctx, client.ObjectKey{Name: backup.Spec.StrategyRef.Name}, strategy); err != nil {
+		if apierrors.IsNotFound(err) {
+			return r.requeueRestoreStrategyNotReady(ctx, restoreJob, backup.Spec.StrategyRef.Name)
+		}
+		return ctrl.Result{}, err
+	}
+
+	app, err := r.getApplicationUnstructured(ctx, targetNamespace, targetRef)
+	if err != nil {
+		if apierrors.IsNotFound(err) || apimeta.IsNoMatchError(err) {
+			return r.markRestoreJobFailed(ctx, restoreJob, fmt.Sprintf(
+				"target %s application not found or kind not registered: %s/%s (deploy it before requesting a restore)",
+				targetAppKind, targetNamespace, targetAppName))
+		}
+		return ctrl.Result{}, err
+	}
+
+	// Gate on target readiness only before the restore Job exists (see the
+	// backup path): once created, the Job is observed directly, so a post-launch
+	// Ready flip cannot spuriously fail a restore whose Job may have completed.
+	// Only a definite NotFound means "not created yet"; any other Get error is
+	// undecidable, so requeue rather than re-gate readiness on it.
+	existingRestoreJob := &batchv1.Job{}
+	switch err := r.Get(ctx, client.ObjectKey{Namespace: targetNamespace, Name: jobNameForRestoreJob(restoreJob)}, existingRestoreJob); {
+	case err == nil:
+		// Job exists; skip the readiness re-gate and observe it below.
+	case apierrors.IsNotFound(err):
+		if proceed, reason, message := redisAppReady(app); !proceed {
+			if redisBackupDeadlineExceeded(restoreJob.Status.StartedAt) {
+				return r.markRestoreJobFailed(ctx, restoreJob, fmt.Sprintf(
+					"target %s application %s/%s not ready within %s (%s: %s)",
+					targetAppKind, targetNamespace, targetAppName, redisDefaultBackupDeadline, reason, message))
+			}
+			apimeta.SetStatusCondition(&restoreJob.Status.Conditions, metav1.Condition{
+				Type:    "Ready",
+				Status:  metav1.ConditionFalse,
+				Reason:  "ApplicationNotReady",
+				Message: fmt.Sprintf("target %s application %s/%s is not ready (%s: %s)", targetAppKind, targetNamespace, targetAppName, reason, message),
+			})
+			if updateErr := r.Status().Update(ctx, restoreJob); updateErr != nil {
+				return ctrl.Result{}, updateErr
+			}
+			return ctrl.Result{RequeueAfter: redisPollInterval}, nil
+		}
+	default:
+		return ctrl.Result{}, err
+	}
+
+	rendered, err := renderRedisTemplate(
+		strategy.Spec.Template,
+		app,
+		targetAppKind,
+		targetAppName,
+		targetNamespace,
+		redisModeRestore,
+		redisRestoreObjectKey(backup),
+		redisStrategyParameters(backup),
+		backup,
+	)
+	if err != nil {
+		return r.markRestoreJobFailed(ctx, restoreJob, fmt.Sprintf("failed to template Redis strategy: %v", err))
+	}
+
+	batchJob, err := r.ensureRedisRestoreJob(ctx, restoreJob, targetNamespace, jobNameForRestoreJob(restoreJob),
+		redisModeRestore,
+		map[string]string{
+			backupsv1alpha1.OwningJobNameLabel:      restoreJob.Name,
+			backupsv1alpha1.OwningJobNamespaceLabel: restoreJob.Namespace,
+		},
+		rendered,
+	)
+	if err != nil {
+		return r.markRestoreJobFailed(ctx, restoreJob, fmt.Sprintf("failed to ensure batch/v1.Job: %v", err))
+	}
+
+	switch jobConditionState(batchJob) {
+	case batchv1.JobComplete:
+		now := metav1.Now()
+		restoreJob.Status.CompletedAt = &now
+		restoreJob.Status.Phase = backupsv1alpha1.RestoreJobPhaseSucceeded
+		apimeta.SetStatusCondition(&restoreJob.Status.Conditions, metav1.Condition{
+			Type:    "Ready",
+			Status:  metav1.ConditionTrue,
+			Reason:  "RestoreCompleted",
+			Message: "redis restore Job completed",
+		})
+		if err := r.Status().Update(ctx, restoreJob); err != nil {
+			return ctrl.Result{}, err
+		}
+		return ctrl.Result{}, nil
+
+	case batchv1.JobFailed:
+		message := jobFailureMessage(batchJob)
+		if message == "" {
+			message = "redis restore Job reported Failed"
+		}
+		return r.markRestoreJobFailed(ctx, restoreJob, message)
+
+	default:
+		return ctrl.Result{RequeueAfter: redisPollInterval}, nil
+	}
+}
+
+// ensureRedisRestoreJob is the RestoreJob-side mirror of ensureRedisJob. The Job
+// lives in the RestoreJob's namespace and gets a controllerRef on the
+// RestoreJob. Mirrors ensureAltinityRestoreJob.
+func (r *RestoreJobReconciler) ensureRedisRestoreJob(
+	ctx context.Context,
+	owner client.Object,
+	namespace, name, mode string,
+	ownerLabels map[string]string,
+	rendered *corev1.PodTemplateSpec,
+) (*batchv1.Job, error) {
+	labels := map[string]string{redisLabelMode: mode}
+	maps.Copy(labels, ownerLabels)
+	return ensureBackupBatchJob(ctx, r.Client, r.Scheme, owner, namespace, name, labels, rendered)
+}
+
+// ---------------------------------------------------------------------------
+// Backup deletion cleanup
+// ---------------------------------------------------------------------------
+
+// cleanupRedisBackup deletes the object a Backup names when the Backup is
+// removed. Unlike the operator-backed drivers, the Redis driver OWNS its
+// artifact - redisObjectKey mints one object per BackupJob and no engine
+// retention prunes it - so without this a retention-pruned Plan would grow the
+// bucket unboundedly and the object's key would be lost with the CR. It spawns
+// a one-shot cleanup-mode Job (which never contacts Redis, only S3) and WAITS
+// for it before releasing the finalizer, so no object is orphaned. Mirrors
+// cleanupRabbitmqBackup; the object key comes from the Backup's DriverMetadata
+// rather than a status.artifact.URI.
+func (r *BackupReconciler) cleanupRedisBackup(ctx context.Context, backup *backupsv1alpha1.Backup) (ctrl.Result, error) {
+	logger := getLogger(ctx)
+
+	// Escape hatch: release a Backup stuck Terminating (bucket unreachable) by
+	// setting the annotation. Reap any in-flight delete Job and let it go,
+	// leaving the object in the bucket.
+	if backup.Annotations[redisSkipArtifactCleanupAnnotation] == "true" {
+		existing := &batchv1.Job{}
+		if err := r.Get(ctx, types.NamespacedName{Namespace: backup.Namespace, Name: backup.Name + "-cleanup"}, existing); err == nil {
+			_ = r.deleteRedisCleanupJob(ctx, existing)
+		}
+		logger.Debug("skipping Redis artifact cleanup per annotation; object left in bucket", "backup", backup.Name, "annotation", redisSkipArtifactCleanupAnnotation)
+		return ctrl.Result{}, nil
+	}
+
+	objectKey := backup.Spec.DriverMetadata[redisObjectMetaKey]
+	if objectKey == "" {
+		// A Backup written before object keys were recorded names no object to
+		// delete; nothing to do.
+		return ctrl.Result{}, nil
+	}
+
+	strategy := &strategyv1alpha1.Redis{}
+	if err := r.Get(ctx, client.ObjectKey{Name: backup.Spec.StrategyRef.Name}, strategy); err != nil {
+		if apierrors.IsNotFound(err) {
+			// No strategy to render the delete Job from (the shipped one is gated
+			// on a resolved bucket name and stops rendering if that lookup fails).
+			// Release rather than wedge the Backup forever; the object is left.
+			return r.releaseRedisCleanup(ctx, backup, objectKey, "strategy CR is gone"), nil
+		}
+		return ctrl.Result{}, err
+	}
+
+	jobName := backup.Name + "-cleanup"
+	job := &batchv1.Job{}
+	err := r.Get(ctx, types.NamespacedName{Namespace: backup.Namespace, Name: jobName}, job)
+	switch {
+	case apierrors.IsNotFound(err):
+		// Spawning the delete Job and projecting the credentials Secret it needs
+		// are CREATEs, which NamespaceLifecycle admission forbids in a Terminating
+		// namespace. When the namespace is going away, release the Backup so
+		// teardown can finish; the object cannot be deleted from a namespace that
+		// no longer exists, so it is left behind.
+		terminating, nsErr := r.namespaceTerminating(ctx, backup.Namespace)
+		if nsErr != nil {
+			return ctrl.Result{}, nsErr
+		}
+		if terminating {
+			return r.releaseRedisCleanup(ctx, backup, objectKey, "namespace is terminating"), nil
+		}
+		if perr := ProjectBackupCredentials(ctx, r.Client, r.CredentialsConfig, backup.Namespace); perr != nil {
+			return r.releaseRedisCleanup(ctx, backup, objectKey, fmt.Sprintf("cannot project credentials: %v", perr)), nil
+		}
+		// Cleanup mode reads only .Release, .Mode and .ObjectKey (never
+		// .Application), so the source app being already gone does not matter.
+		rendered, rerr := renderRedisTemplate(
+			strategy.Spec.Template,
+			nil,
+			backup.Spec.ApplicationRef.Kind,
+			backup.Spec.ApplicationRef.Name,
+			backup.Namespace,
+			redisModeCleanup,
+			objectKey,
+			redisStrategyParameters(backup),
+			nil,
+		)
+		if rerr != nil {
+			return r.releaseRedisCleanup(ctx, backup, objectKey, fmt.Sprintf("cleanup template render failed: %v", rerr)), nil
+		}
+		if cerr := r.Create(ctx, buildRedisCleanupJob(backup.Namespace, jobName, rendered)); cerr != nil && !apierrors.IsAlreadyExists(cerr) {
+			// Forbidden (namespace went Terminating after the check) or Invalid
+			// (a >55-char Backup name makes <name>-cleanup exceed 63 chars) cannot
+			// be fixed by retrying; release. Other errors are transient - requeue.
+			if apierrors.IsForbidden(cerr) || apierrors.IsInvalid(cerr) {
+				return r.releaseRedisCleanup(ctx, backup, objectKey, fmt.Sprintf("cannot create cleanup Job: %v", cerr)), nil
+			}
+			return ctrl.Result{}, cerr
+		}
+		return ctrl.Result{RequeueAfter: redisPollInterval}, nil
+	case err != nil:
+		return ctrl.Result{}, err
+	}
+
+	if !job.DeletionTimestamp.IsZero() {
+		// A prior failed attempt is being collected; wait, then the NotFound
+		// branch recreates a fresh one.
+		return ctrl.Result{RequeueAfter: redisPollInterval}, nil
+	}
+
+	switch jobConditionState(job) {
+	case batchv1.JobComplete:
+		// Object deleted (a missing object is success in the script): drop the
+		// Job and let the Backup go.
+		_ = r.deleteRedisCleanupJob(ctx, job)
+		logger.Debug("Redis backup object deleted", "backup", backup.Name, "object", objectKey)
+		return ctrl.Result{}, nil
+	case batchv1.JobFailed:
+		// The delete genuinely failed. Collect the failed Job so the NotFound
+		// branch recreates a fresh one, and keep the Backup Terminating.
+		logger.Debug("Redis cleanup Job failed; retrying", "backup", backup.Name, "job", jobName)
+		_ = r.deleteRedisCleanupJob(ctx, job)
+		return ctrl.Result{RequeueAfter: redisPollInterval}, nil
+	default:
+		return ctrl.Result{RequeueAfter: redisPollInterval}, nil
+	}
+}
+
+// deleteRedisCleanupJob removes a cleanup Job and its Pod. Mirrors
+// deleteRabbitmqCleanupJob.
+func (r *BackupReconciler) deleteRedisCleanupJob(ctx context.Context, job *batchv1.Job) error {
+	policy := metav1.DeletePropagationBackground
+	return client.IgnoreNotFound(r.Delete(ctx, job, &client.DeleteOptions{PropagationPolicy: &policy}))
+}
+
+// releaseRedisCleanup gives up deleting the object and lets the Backup be
+// removed, recording a Warning Event naming the object left behind so the
+// give-up is visible. So the delete is best-effort, not guaranteed. Mirrors
+// releaseRabbitmqCleanup.
+func (r *BackupReconciler) releaseRedisCleanup(ctx context.Context, backup *backupsv1alpha1.Backup, objectKey, reason string) ctrl.Result {
+	getLogger(ctx).Info("releasing Backup without deleting its object", "backup", backup.Name, "object", objectKey, "reason", reason)
+	if r.Recorder != nil {
+		r.Recorder.Eventf(backup, corev1.EventTypeWarning, "ArtifactNotDeleted", "left object %s in the bucket: %s", objectKey, reason)
+	}
+	return ctrl.Result{}
+}
+
+// buildRedisCleanupJob wraps the cleanup-mode pod in a one-shot, ownerless Job.
+// Ownerless because cleanupRedisBackup manages its lifecycle explicitly and it
+// must outlive the Backup being deleted; activeDeadlineSeconds + TTL are
+// backstops if the controller stops mid-wait. Mirrors buildRabbitmqCleanupJob.
+func buildRedisCleanupJob(namespace, name string, rendered *corev1.PodTemplateSpec) *batchv1.Job {
+	pod := *rendered.DeepCopy()
+	if pod.Spec.RestartPolicy == "" {
+		pod.Spec.RestartPolicy = corev1.RestartPolicyNever
+	}
+	if pod.Labels == nil {
+		pod.Labels = map[string]string{}
+	}
+	pod.Labels[redisLabelMode] = redisModeCleanup
+	backoffLimit := int32(1)
+	activeDeadline := int64(300)
+	ttl := int32(300)
+	return &batchv1.Job{
+		ObjectMeta: metav1.ObjectMeta{
+			Namespace: namespace,
+			Name:      name,
+			Labels:    map[string]string{redisLabelMode: redisModeCleanup},
+		},
+		Spec: batchv1.JobSpec{
+			BackoffLimit:            &backoffLimit,
+			ActiveDeadlineSeconds:   &activeDeadline,
+			TTLSecondsAfterFinished: &ttl,
+			Template:                pod,
+		},
+	}
+}
diff --git a/internal/backupcontroller/redisstrategy_controller_test.go b/internal/backupcontroller/redisstrategy_controller_test.go
new file mode 100644
index 0000000000..95fa086161
--- /dev/null
+++ b/internal/backupcontroller/redisstrategy_controller_test.go
@@ -0,0 +1,904 @@
+// SPDX-License-Identifier: Apache-2.0
+package backupcontroller
+
+import (
+	"context"
+	"strings"
+	"testing"
+	"time"
+
+	batchv1 "k8s.io/api/batch/v1"
+	corev1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/api/meta"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	dynamicfake "k8s.io/client-go/dynamic/fake"
+	"k8s.io/client-go/kubernetes/scheme"
+	"k8s.io/client-go/tools/record"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+	clientfake "sigs.k8s.io/controller-runtime/pkg/client/fake"
+
+	strategyv1alpha1 "github.com/cozystack/cozystack/api/backups/strategy/v1alpha1"
+	backupsv1alpha1 "github.com/cozystack/cozystack/api/backups/v1alpha1"
+)
+
+// newRedisApp returns an unstructured apps.cozystack.io/Redis application the
+// driver's dynamic client can serve. Carries a Ready=True condition (so the
+// precondition passes) and a spec so tests can assert templates read the live
+// object via .Application.
+func newRedisApp(name, namespace string) *unstructured.Unstructured {
+	return newRedisAppOfKind(redisAppKind, name, namespace)
+}
+
+func newRedisAppOfKind(kind, name, namespace string) *unstructured.Unstructured {
+	u := &unstructured.Unstructured{}
+	u.SetGroupVersionKind(schema.GroupVersionKind{
+		Group:   backupsv1alpha1.DefaultApplicationAPIGroup,
+		Version: "v1alpha1",
+		Kind:    kind,
+	})
+	u.SetName(name)
+	u.SetNamespace(namespace)
+	u.Object["spec"] = map[string]any{"replicas": int64(3)}
+	u.Object["status"] = map[string]any{
+		"conditions": []any{
+			map[string]any{"type": "Ready", "status": "True"},
+		},
+	}
+	return u
+}
+
+func newRedisAppRef(name string) corev1.TypedLocalObjectReference {
+	return newRedisAppRefOfKind(redisAppKind, name)
+}
+
+func newRedisAppRefOfKind(kind, name string) corev1.TypedLocalObjectReference {
+	return corev1.TypedLocalObjectReference{
+		APIGroup: new(backupsv1alpha1.DefaultApplicationAPIGroup),
+		Kind:     kind,
+		Name:     name,
+	}
+}
+
+// newRedisTestEnv mirrors newJobStrategyTestEnv but for the app's Redis or
+// Valkey kind. The dynamic fake matches GVR exactly, so the mapping must agree.
+func newRedisTestEnv(t *testing.T, app *unstructured.Unstructured, builder *clientfake.ClientBuilder) (*BackupJobReconciler, *RestoreJobReconciler) {
+	t.Helper()
+
+	testScheme := runtime.NewScheme()
+	_ = scheme.AddToScheme(testScheme)
+	_ = backupsv1alpha1.AddToScheme(testScheme)
+	_ = strategyv1alpha1.AddToScheme(testScheme)
+
+	gvr := schema.GroupVersionResource{
+		Group:    backupsv1alpha1.DefaultApplicationAPIGroup,
+		Version:  "v1alpha1",
+		Resource: map[string]string{"Redis": "redises", "Valkey": "valkeys"}[app.GetKind()],
+	}
+	dynamicClient := dynamicfake.NewSimpleDynamicClientWithCustomListKinds(
+		testScheme,
+		map[schema.GroupVersionResource]string{gvr: app.GetKind() + "List"},
+	)
+	// Seed under the explicit GVR: the fake's kind-to-resource guess turns
+	// Valkey into "valkeies", not the CRD's "valkeys".
+	if err := dynamicClient.Tracker().Create(gvr, app, app.GetNamespace()); err != nil {
+		t.Fatalf("seed application: %v", err)
+	}
+	mapping := &meta.RESTMapping{
+		Resource:         gvr,
+		GroupVersionKind: app.GroupVersionKind(),
+		Scope:            meta.RESTScopeNamespace,
+	}
+	restMapper := &mockRESTMapper{mapping: mapping}
+
+	c := builder.WithScheme(testScheme).
+		WithStatusSubresource(&backupsv1alpha1.BackupJob{}, &backupsv1alpha1.RestoreJob{}, &backupsv1alpha1.Backup{}).
+		Build()
+
+	return &BackupJobReconciler{
+		Client:     c,
+		Interface:  dynamicClient,
+		RESTMapper: restMapper,
+		Scheme:     testScheme,
+		Recorder:   record.NewFakeRecorder(10),
+	}, &RestoreJobReconciler{
+		Client:     c,
+		Interface:  dynamicClient,
+		RESTMapper: restMapper,
+		Scheme:     testScheme,
+		Recorder:   record.NewFakeRecorder(10),
+	}
+}
+
+// newRedisStrategy returns a Redis strategy whose template exercises every key
+// the driver exposes: .Release, .Mode, .ObjectKey, .Parameters, and
+// .Application. --key pins the object-key plumbing (unique per backup, read
+// back on restore) so a regression that stopped rendering it is caught;
+// --prefix pins the per-kind chart prefix the shipped template builds the
+// sentinel and Secret names from.
+func newRedisStrategy(name string) *strategyv1alpha1.Redis {
+	return &strategyv1alpha1.Redis{
+		ObjectMeta: metav1.ObjectMeta{Name: name},
+		Spec: strategyv1alpha1.RedisSpec{
+			Template: corev1.PodTemplateSpec{
+				Spec: corev1.PodSpec{
+					RestartPolicy: corev1.RestartPolicyNever,
+					Containers: []corev1.Container{{
+						Name:  "backup",
+						Image: "redis-backup:test",
+						Args: []string{
+							"--app={{ .Release.Name }}",
+							"--mode={{ .Mode }}",
+							"--bucket={{ .Parameters.bucketName }}",
+							"--replicas={{ .Application.spec.replicas }}",
+							"--key={{ .ObjectKey }}",
+							"--prefix={{ .Release.Prefix }}",
+						},
+					}},
+				},
+			},
+		},
+	}
+}
+
+func newRedisResolved(strategyName string, params map[string]string) *ResolvedBackupConfig {
+	return &ResolvedBackupConfig{
+		StrategyRef: corev1.TypedLocalObjectReference{
+			APIGroup: new(strategyv1alpha1.GroupVersion.Group),
+			Kind:     strategyv1alpha1.RedisStrategyKind,
+			Name:     strategyName,
+		},
+		Parameters: params,
+	}
+}
+
+func TestValidateRedisApplicationRef(t *testing.T) {
+	group := backupsv1alpha1.DefaultApplicationAPIGroup
+	other := "other.example.io"
+	cases := []struct {
+		name    string
+		ref     corev1.TypedLocalObjectReference
+		wantErr bool
+	}{
+		{"redis empty group", corev1.TypedLocalObjectReference{Kind: "Redis"}, false},
+		{"redis default group", corev1.TypedLocalObjectReference{APIGroup: &group, Kind: "Redis"}, false},
+		{"valkey default group", corev1.TypedLocalObjectReference{APIGroup: &group, Kind: "Valkey"}, false},
+		{"wrong kind", corev1.TypedLocalObjectReference{Kind: "Postgres"}, true},
+		{"wrong group", corev1.TypedLocalObjectReference{APIGroup: &other, Kind: "Redis"}, true},
+	}
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			err := validateRedisApplicationRef(tc.ref)
+			if (err != nil) != tc.wantErr {
+				t.Errorf("validateRedisApplicationRef(%+v) err=%v, wantErr=%v", tc.ref, err, tc.wantErr)
+			}
+		})
+	}
+}
+
+func TestRedisAppReady(t *testing.T) {
+	ready := map[string]any{"status": map[string]any{
+		"conditions": []any{map[string]any{"type": "Ready", "status": "True"}},
+	}}
+	notReady := map[string]any{"status": map[string]any{
+		"conditions": []any{map[string]any{"type": "Ready", "status": "False", "reason": "HelmUpgradeFailed", "message": "boom"}},
+	}}
+	noCond := map[string]any{"status": map[string]any{}}
+
+	if proceed, _, _ := redisAppReady(ready); !proceed {
+		t.Error("Ready=True should proceed")
+	}
+	if proceed, reason, message := redisAppReady(notReady); proceed || reason != "HelmUpgradeFailed" || message != "boom" {
+		t.Errorf("Ready=False should block with reason/message, got proceed=%v reason=%q message=%q", proceed, reason, message)
+	}
+	if proceed, _, _ := redisAppReady(noCond); !proceed {
+		t.Error("absent Ready condition should proceed (never wedge backups on a missing condition)")
+	}
+}
+
+func TestRedisStrategyParameters_RoundTrip(t *testing.T) {
+	backup := &backupsv1alpha1.Backup{
+		Spec: backupsv1alpha1.BackupSpec{
+			DriverMetadata: map[string]string{
+				redisParamPrefix + "bucketName": "b1",
+				redisParamPrefix + "endpoint":   "s3-host",
+				"job.batch/name":                "ignored",
+				"":                              "ignored",
+			},
+		},
+	}
+	got := redisStrategyParameters(backup)
+	if got["bucketName"] != "b1" || got["endpoint"] != "s3-host" {
+		t.Errorf("redisStrategyParameters = %v", got)
+	}
+	if _, ok := got["job.batch/name"]; ok {
+		t.Errorf("non-parameter key leaked through: %v", got)
+	}
+}
+
+func TestReconcileRedis_CreatesBatchJob(t *testing.T) {
+	app := newRedisApp("cache", "tenant-test")
+	strategy := newRedisStrategy("redis-strategy")
+
+	backupJob := &backupsv1alpha1.BackupJob{
+		ObjectMeta: metav1.ObjectMeta{Name: "test-bj", Namespace: "tenant-test"},
+		Spec: backupsv1alpha1.BackupJobSpec{
+			ApplicationRef:  newRedisAppRef("cache"),
+			BackupClassName: "cozy-default",
+		},
+	}
+	resolved := newRedisResolved("redis-strategy", map[string]string{"bucketName": "redis-bucket"})
+
+	r, _ := newRedisTestEnv(t, app, clientfake.NewClientBuilder().WithObjects(backupJob, strategy))
+	ctx := context.Background()
+
+	if _, err := r.reconcileRedis(ctx, backupJob, resolved); err != nil {
+		t.Fatalf("reconcileRedis() first call: %v", err)
+	}
+	if err := r.Get(ctx, client.ObjectKeyFromObject(backupJob), backupJob); err != nil {
+		t.Fatalf("refresh BackupJob: %v", err)
+	}
+	if _, err := r.reconcileRedis(ctx, backupJob, resolved); err != nil {
+		t.Fatalf("reconcileRedis() second call: %v", err)
+	}
+
+	jobs := &batchv1.JobList{}
+	if err := r.List(ctx, jobs, client.InNamespace("tenant-test")); err != nil {
+		t.Fatalf("list batch jobs: %v", err)
+	}
+	if len(jobs.Items) != 1 {
+		t.Fatalf("expected 1 batch/v1.Job, got %d", len(jobs.Items))
+	}
+	k8sJob := jobs.Items[0]
+	if got := k8sJob.Name; got != jobNameForBackupJob(backupJob) {
+		t.Errorf("expected Job name %q, got %q", jobNameForBackupJob(backupJob), got)
+	}
+	if got := k8sJob.Labels[backupsv1alpha1.OwningJobNameLabel]; got != backupJob.Name {
+		t.Errorf("expected owning label %q, got %q", backupJob.Name, got)
+	}
+	if got := k8sJob.Labels[redisLabelMode]; got != redisModeBackup {
+		t.Errorf("expected mode label %q, got %q", redisModeBackup, got)
+	}
+	args := k8sJob.Spec.Template.Spec.Containers[0].Args
+	// --key pins that the per-BackupJob object key reaches the rendered Job;
+	// without it a Plan's history would collapse onto one object.
+	want := []string{"--app=cache", "--mode=backup", "--bucket=redis-bucket", "--replicas=3", "--key=tenant-test/cache/test-bj.rdb", "--prefix=redis-"}
+	for i, w := range want {
+		if i >= len(args) || args[i] != w {
+			t.Errorf("rendered args[%d]: want %q, got %q", i, w, args)
+			break
+		}
+	}
+
+	if k8sJob.OwnerReferences == nil || k8sJob.OwnerReferences[0].Name != backupJob.Name || k8sJob.OwnerReferences[0].Controller == nil || !*k8sJob.OwnerReferences[0].Controller {
+		t.Errorf("expected controller ownerRef on the BackupJob, got %v", k8sJob.OwnerReferences)
+	}
+}
+
+func TestReconcileRedis_CompletesAndCreatesBackup(t *testing.T) {
+	app := newRedisApp("cache", "tenant-test")
+	strategy := newRedisStrategy("redis-strategy")
+	now := metav1.Now()
+	backupJob := &backupsv1alpha1.BackupJob{
+		ObjectMeta: metav1.ObjectMeta{Name: "test-bj", Namespace: "tenant-test"},
+		Spec: backupsv1alpha1.BackupJobSpec{
+			ApplicationRef:  newRedisAppRef("cache"),
+			BackupClassName: "cozy-default",
+		},
+		Status: backupsv1alpha1.BackupJobStatus{StartedAt: &now, Phase: backupsv1alpha1.BackupJobPhaseRunning},
+	}
+	completedK8sJob := &batchv1.Job{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      jobNameForBackupJob(backupJob),
+			Namespace: backupJob.Namespace,
+			Labels: map[string]string{
+				backupsv1alpha1.OwningJobNameLabel:      backupJob.Name,
+				backupsv1alpha1.OwningJobNamespaceLabel: backupJob.Namespace,
+			},
+		},
+		Status: batchv1.JobStatus{
+			CompletionTime: &now,
+			Conditions:     []batchv1.JobCondition{{Type: batchv1.JobComplete, Status: corev1.ConditionTrue}},
+		},
+	}
+	resolved := newRedisResolved("redis-strategy", map[string]string{"bucketName": "redis-bucket"})
+
+	r, _ := newRedisTestEnv(t, app, clientfake.NewClientBuilder().WithObjects(backupJob, strategy, completedK8sJob))
+	ctx := context.Background()
+
+	if _, err := r.reconcileRedis(ctx, backupJob, resolved); err != nil {
+		t.Fatalf("reconcileRedis() error = %v", err)
+	}
+
+	updated := &backupsv1alpha1.BackupJob{}
+	if err := r.Get(ctx, client.ObjectKeyFromObject(backupJob), updated); err != nil {
+		t.Fatalf("get backupjob: %v", err)
+	}
+	if updated.Status.Phase != backupsv1alpha1.BackupJobPhaseSucceeded {
+		t.Errorf("expected phase Succeeded, got %q", updated.Status.Phase)
+	}
+	if updated.Status.BackupRef == nil || updated.Status.BackupRef.Name == "" {
+		t.Fatalf("expected BackupRef set, got %v", updated.Status.BackupRef)
+	}
+
+	created := &backupsv1alpha1.Backup{}
+	if err := r.Get(ctx, client.ObjectKey{Namespace: backupJob.Namespace, Name: updated.Status.BackupRef.Name}, created); err != nil {
+		t.Fatalf("get Backup: %v", err)
+	}
+	if created.Spec.StrategyRef.Name != "redis-strategy" {
+		t.Errorf("expected StrategyRef name 'redis-strategy', got %q", created.Spec.StrategyRef.Name)
+	}
+	if got := created.Spec.DriverMetadata[redisParamPrefix+"bucketName"]; got != "redis-bucket" {
+		t.Errorf("expected driverMetadata[parameter/bucketName]=redis-bucket, got %q", got)
+	}
+	// The Backup must record the exact object its dump was written to, keyed by
+	// the BackupJob name so a Plan's runs do not collapse onto one object.
+	wantKey := "tenant-test/cache/test-bj.rdb"
+	if got := created.Spec.DriverMetadata[redisObjectMetaKey]; got != wantKey {
+		t.Errorf("expected recorded object %q, got %q", wantKey, got)
+	}
+}
+
+// TestReconcileRedis_ReadinessNotRegatedAfterJobExists pins that once the backup
+// Job exists, a subsequent app Ready=False (past the deadline) does NOT mark the
+// run Failed — the completed Job is observed directly. Dropping the
+// jobPreexists guard makes the readiness gate fire and turns this RED.
+func TestReconcileRedis_ReadinessNotRegatedAfterJobExists(t *testing.T) {
+	app := newRedisApp("cache", "tenant-test")
+	// App went not-Ready after the Job was launched (e.g. an unrelated
+	// HelmRelease blip), and stayed so past the deadline.
+	app.Object["status"] = map[string]any{
+		"conditions": []any{
+			map[string]any{"type": "Ready", "status": "False", "reason": "HelmUpgradeFailed", "message": "blip"},
+		},
+	}
+	strategy := newRedisStrategy("redis-strategy")
+	stale := metav1.NewTime(time.Now().Add(-(redisDefaultBackupDeadline + time.Minute)))
+	backupJob := &backupsv1alpha1.BackupJob{
+		ObjectMeta: metav1.ObjectMeta{Name: "test-bj", Namespace: "tenant-test"},
+		Spec: backupsv1alpha1.BackupJobSpec{
+			ApplicationRef:  newRedisAppRef("cache"),
+			BackupClassName: "cozy-default",
+		},
+		Status: backupsv1alpha1.BackupJobStatus{StartedAt: &stale, Phase: backupsv1alpha1.BackupJobPhaseRunning},
+	}
+	completedK8sJob := &batchv1.Job{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      jobNameForBackupJob(backupJob),
+			Namespace: backupJob.Namespace,
+			Labels: map[string]string{
+				backupsv1alpha1.OwningJobNameLabel:      backupJob.Name,
+				backupsv1alpha1.OwningJobNamespaceLabel: backupJob.Namespace,
+			},
+		},
+		Status: batchv1.JobStatus{
+			CompletionTime: &stale,
+			Conditions:     []batchv1.JobCondition{{Type: batchv1.JobComplete, Status: corev1.ConditionTrue}},
+		},
+	}
+	resolved := newRedisResolved("redis-strategy", map[string]string{"bucketName": "redis-bucket"})
+
+	r, _ := newRedisTestEnv(t, app, clientfake.NewClientBuilder().WithObjects(backupJob, strategy, completedK8sJob))
+	ctx := context.Background()
+
+	if _, err := r.reconcileRedis(ctx, backupJob, resolved); err != nil {
+		t.Fatalf("reconcileRedis() error = %v", err)
+	}
+	updated := &backupsv1alpha1.BackupJob{}
+	if err := r.Get(ctx, client.ObjectKeyFromObject(backupJob), updated); err != nil {
+		t.Fatalf("get backupjob: %v", err)
+	}
+	if updated.Status.Phase != backupsv1alpha1.BackupJobPhaseSucceeded {
+		t.Fatalf("expected Succeeded (Job already complete; readiness must not be re-gated), got %q", updated.Status.Phase)
+	}
+}
+
+// TestRedisObjectKey_UniquePerBackupAndRoundTrips pins the fix for the
+// overwrite-on-every-backup defect: each BackupJob mints a distinct object, and
+// a restore reads back the object recorded on ITS Backup rather than whatever
+// last landed at a shared path.
+func TestRedisObjectKey_UniquePerBackupAndRoundTrips(t *testing.T) {
+	monday := redisObjectKey("tenant-test", "cache", "cache-plan-0001")
+	tuesday := redisObjectKey("tenant-test", "cache", "cache-plan-0002")
+	if monday == tuesday {
+		t.Fatalf("distinct BackupJobs must mint distinct objects, both got %q", monday)
+	}
+
+	// A restore of Monday's Backup must resolve to Monday's object even after
+	// Tuesday's backup exists — the read follows the recorded key, not the newest.
+	mondayBackup := &backupsv1alpha1.Backup{
+		Spec: backupsv1alpha1.BackupSpec{
+			ApplicationRef: newRedisAppRef("cache"),
+			DriverMetadata: map[string]string{redisObjectMetaKey: monday},
+		},
+	}
+	if got := redisRestoreObjectKey(mondayBackup); got != monday {
+		t.Errorf("restore must read the recorded object %q, got %q", monday, got)
+	}
+
+	// Defensive fallback for a Backup with no recorded key (none in a released
+	// cluster): the legacy fixed name, so it is at least restorable.
+	legacy := &backupsv1alpha1.Backup{
+		ObjectMeta: metav1.ObjectMeta{Namespace: "tenant-test"},
+		Spec:       backupsv1alpha1.BackupSpec{ApplicationRef: newRedisAppRef("cache")},
+	}
+	if got, want := redisRestoreObjectKey(legacy), "tenant-test/cache/dump.rdb"; got != want {
+		t.Errorf("fallback object = %q, want %q", got, want)
+	}
+}
+
+func TestReconcileRedis_FailsOnJobFailed(t *testing.T) {
+	app := newRedisApp("cache", "tenant-test")
+	strategy := newRedisStrategy("redis-strategy")
+	now := metav1.Now()
+	backupJob := &backupsv1alpha1.BackupJob{
+		ObjectMeta: metav1.ObjectMeta{Name: "test-bj", Namespace: "tenant-test"},
+		Spec: backupsv1alpha1.BackupJobSpec{
+			ApplicationRef:  newRedisAppRef("cache"),
+			BackupClassName: "cozy-default",
+		},
+		Status: backupsv1alpha1.BackupJobStatus{StartedAt: &now, Phase: backupsv1alpha1.BackupJobPhaseRunning},
+	}
+	failedK8sJob := &batchv1.Job{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      jobNameForBackupJob(backupJob),
+			Namespace: backupJob.Namespace,
+			Labels: map[string]string{
+				backupsv1alpha1.OwningJobNameLabel:      backupJob.Name,
+				backupsv1alpha1.OwningJobNamespaceLabel: backupJob.Namespace,
+			},
+		},
+		Status: batchv1.JobStatus{
+			Conditions: []batchv1.JobCondition{{Type: batchv1.JobFailed, Status: corev1.ConditionTrue, Message: "BackoffLimitExceeded"}},
+		},
+	}
+
+	r, _ := newRedisTestEnv(t, app, clientfake.NewClientBuilder().WithObjects(backupJob, strategy, failedK8sJob))
+	ctx := context.Background()
+
+	if _, err := r.reconcileRedis(ctx, backupJob, newRedisResolved("redis-strategy", nil)); err != nil {
+		t.Fatalf("reconcileRedis() error = %v", err)
+	}
+
+	updated := &backupsv1alpha1.BackupJob{}
+	if err := r.Get(ctx, client.ObjectKeyFromObject(backupJob), updated); err != nil {
+		t.Fatalf("get backupjob: %v", err)
+	}
+	if updated.Status.Phase != backupsv1alpha1.BackupJobPhaseFailed {
+		t.Errorf("expected phase Failed, got %q", updated.Status.Phase)
+	}
+	if updated.Status.Message == "" {
+		t.Error("expected failure message to be set")
+	}
+}
+
+func TestReconcileRedis_FailsOnWrongKind(t *testing.T) {
+	app := newRedisApp("cache", "tenant-test")
+	strategy := newRedisStrategy("redis-strategy")
+	badGroup := backupsv1alpha1.DefaultApplicationAPIGroup
+	backupJob := &backupsv1alpha1.BackupJob{
+		ObjectMeta: metav1.ObjectMeta{Name: "test-bj", Namespace: "tenant-test"},
+		Spec: backupsv1alpha1.BackupJobSpec{
+			ApplicationRef:  corev1.TypedLocalObjectReference{APIGroup: &badGroup, Kind: "Postgres", Name: "cache"},
+			BackupClassName: "cozy-default",
+		},
+	}
+
+	r, _ := newRedisTestEnv(t, app, clientfake.NewClientBuilder().WithObjects(backupJob, strategy))
+	ctx := context.Background()
+
+	if _, err := r.reconcileRedis(ctx, backupJob, newRedisResolved("redis-strategy", nil)); err != nil {
+		t.Fatalf("reconcileRedis() error = %v", err)
+	}
+
+	updated := &backupsv1alpha1.BackupJob{}
+	if err := r.Get(ctx, client.ObjectKeyFromObject(backupJob), updated); err != nil {
+		t.Fatalf("get backupjob: %v", err)
+	}
+	if updated.Status.Phase != backupsv1alpha1.BackupJobPhaseFailed {
+		t.Errorf("expected phase Failed for wrong applicationRef.kind, got %q", updated.Status.Phase)
+	}
+	if want := "applicationRef.kind"; !strings.Contains(updated.Status.Message, want) {
+		t.Errorf("expected gate message to contain %q, got %q", want, updated.Status.Message)
+	}
+}
+
+// TestReconcileRedis_RequeuesWhenAppNotReady pins that an explicit Ready=False on
+// the application blocks the dump Job (no Job created) and surfaces a precise
+// ApplicationNotReady condition rather than launching a Job that would fail
+// connecting.
+func TestReconcileRedis_RequeuesWhenAppNotReady(t *testing.T) {
+	app := newRedisApp("cache", "tenant-test")
+	app.Object["status"] = map[string]any{
+		"conditions": []any{map[string]any{"type": "Ready", "status": "False", "reason": "HelmUpgradeFailed", "message": "still deploying"}},
+	}
+	strategy := newRedisStrategy("redis-strategy")
+	now := metav1.Now()
+	backupJob := &backupsv1alpha1.BackupJob{
+		ObjectMeta: metav1.ObjectMeta{Name: "test-bj", Namespace: "tenant-test"},
+		Spec: backupsv1alpha1.BackupJobSpec{
+			ApplicationRef:  newRedisAppRef("cache"),
+			BackupClassName: "cozy-default",
+		},
+		Status: backupsv1alpha1.BackupJobStatus{StartedAt: &now, Phase: backupsv1alpha1.BackupJobPhaseRunning},
+	}
+
+	r, _ := newRedisTestEnv(t, app, clientfake.NewClientBuilder().WithObjects(backupJob, strategy))
+	ctx := context.Background()
+
+	res, err := r.reconcileRedis(ctx, backupJob, newRedisResolved("redis-strategy", nil))
+	if err != nil {
+		t.Fatalf("reconcileRedis() error = %v", err)
+	}
+	if res.RequeueAfter == 0 {
+		t.Error("expected a requeue while the app is not ready")
+	}
+
+	jobs := &batchv1.JobList{}
+	if err := r.List(ctx, jobs, client.InNamespace("tenant-test")); err != nil {
+		t.Fatalf("list batch jobs: %v", err)
+	}
+	if len(jobs.Items) != 0 {
+		t.Fatalf("expected no Job while app not ready, got %d", len(jobs.Items))
+	}
+
+	updated := &backupsv1alpha1.BackupJob{}
+	if err := r.Get(ctx, client.ObjectKeyFromObject(backupJob), updated); err != nil {
+		t.Fatalf("get backupjob: %v", err)
+	}
+	if updated.Status.Phase == backupsv1alpha1.BackupJobPhaseFailed {
+		t.Error("expected non-terminal phase while waiting on app readiness")
+	}
+	cond := meta.FindStatusCondition(updated.Status.Conditions, "Ready")
+	if cond == nil || cond.Reason != "ApplicationNotReady" {
+		t.Errorf("expected Ready=False/ApplicationNotReady condition, got %v", cond)
+	}
+}
+
+// TestReconcileRedis_RequeuesOnMissingStrategy pins that a not-yet-provisioned
+// Redis strategy CR requeues (bootstrap self-heal) rather than failing the
+// BackupJob, mirroring the Altinity driver.
+func TestReconcileRedis_RequeuesOnMissingStrategy(t *testing.T) {
+	app := newRedisApp("cache", "tenant-test")
+	now := metav1.Now()
+	backupJob := &backupsv1alpha1.BackupJob{
+		ObjectMeta: metav1.ObjectMeta{Name: "test-bj", Namespace: "tenant-test"},
+		Spec: backupsv1alpha1.BackupJobSpec{
+			ApplicationRef:  newRedisAppRef("cache"),
+			BackupClassName: "cozy-default",
+		},
+		Status: backupsv1alpha1.BackupJobStatus{StartedAt: &now, Phase: backupsv1alpha1.BackupJobPhaseRunning},
+	}
+
+	r, _ := newRedisTestEnv(t, app, clientfake.NewClientBuilder().WithObjects(backupJob))
+	ctx := context.Background()
+
+	if _, err := r.reconcileRedis(ctx, backupJob, newRedisResolved("missing-strategy", nil)); err != nil {
+		t.Fatalf("reconcileRedis() error = %v", err)
+	}
+
+	updated := &backupsv1alpha1.BackupJob{}
+	if err := r.Get(ctx, client.ObjectKeyFromObject(backupJob), updated); err != nil {
+		t.Fatalf("get backupjob: %v", err)
+	}
+	if updated.Status.Phase == backupsv1alpha1.BackupJobPhaseFailed {
+		t.Error("expected non-terminal phase for a not-yet-provisioned strategy (bootstrap self-heal)")
+	}
+	cond := meta.FindStatusCondition(updated.Status.Conditions, "Ready")
+	if cond == nil || cond.Reason != "StrategyNotReady" {
+		t.Errorf("expected Ready=False/StrategyNotReady condition, got %v", cond)
+	}
+}
+
+// TestReconcileRedis_FailsOnUnmappableKind mirrors the restore-path test: an
+// applicationRef.kind that passes the Redis gate but has no REST mapping (a CRD
+// that isn't installed) must fail the BackupJob terminally, not requeue forever.
+func TestReconcileRedis_FailsOnUnmappableKind(t *testing.T) {
+	app := newRedisApp("cache", "tenant-test")
+	strategy := newRedisStrategy("redis-strategy")
+	now := metav1.Now()
+	backupJob := &backupsv1alpha1.BackupJob{
+		ObjectMeta: metav1.ObjectMeta{Name: "test-bj", Namespace: "tenant-test"},
+		Spec: backupsv1alpha1.BackupJobSpec{
+			ApplicationRef:  newRedisAppRef("cache"),
+			BackupClassName: "cozy-default",
+		},
+		Status: backupsv1alpha1.BackupJobStatus{StartedAt: &now, Phase: backupsv1alpha1.BackupJobPhaseRunning},
+	}
+
+	r, _ := newRedisTestEnv(t, app, clientfake.NewClientBuilder().WithObjects(backupJob, strategy))
+	r.RESTMapper = &noMatchRESTMapper{
+		mockRESTMapper: &mockRESTMapper{},
+		gk:             schema.GroupKind{Group: backupsv1alpha1.DefaultApplicationAPIGroup, Kind: "Redis"},
+	}
+	ctx := context.Background()
+
+	if _, err := r.reconcileRedis(ctx, backupJob, newRedisResolved("redis-strategy", nil)); err != nil {
+		t.Fatalf("reconcileRedis() should fail terminally for an unmappable kind, not return a requeue error: %v", err)
+	}
+
+	updated := &backupsv1alpha1.BackupJob{}
+	if err := r.Get(ctx, client.ObjectKeyFromObject(backupJob), updated); err != nil {
+		t.Fatalf("get backupjob: %v", err)
+	}
+	if updated.Status.Phase != backupsv1alpha1.BackupJobPhaseFailed {
+		t.Errorf("expected phase Failed for unmappable kind, got %q", updated.Status.Phase)
+	}
+	if want := "not found or kind not registered"; !strings.Contains(updated.Status.Message, want) {
+		t.Errorf("expected message to contain %q, got %q", want, updated.Status.Message)
+	}
+}
+
+func TestReconcileRedisRestore_CreatesBatchJobInTargetNamespace(t *testing.T) {
+	targetApp := newRedisApp("cache-copy", "tenant-test")
+	strategy := &strategyv1alpha1.Redis{
+		ObjectMeta: metav1.ObjectMeta{Name: "redis-strategy"},
+		Spec: strategyv1alpha1.RedisSpec{
+			Template: corev1.PodTemplateSpec{
+				Spec: corev1.PodSpec{
+					RestartPolicy: corev1.RestartPolicyNever,
+					Containers: []corev1.Container{{
+						Name:  "restore",
+						Image: "redis-backup:test",
+						Args: []string{
+							"--app={{ .Release.Name }}",
+							"--mode={{ .Mode }}",
+							"--source={{ .Backup.ApplicationRef.Name }}",
+							"--bucket={{ .Parameters.bucketName }}",
+							"--key={{ .ObjectKey }}",
+						},
+					}},
+				},
+			},
+		},
+	}
+	now := metav1.Now()
+	backup := &backupsv1alpha1.Backup{
+		ObjectMeta: metav1.ObjectMeta{Name: "redis-backup", Namespace: "tenant-test"},
+		Spec: backupsv1alpha1.BackupSpec{
+			ApplicationRef: newRedisAppRef("cache"),
+			StrategyRef: corev1.TypedLocalObjectReference{
+				APIGroup: new(strategyv1alpha1.GroupVersion.Group),
+				Kind:     strategyv1alpha1.RedisStrategyKind,
+				Name:     "redis-strategy",
+			},
+			TakenAt: now,
+			DriverMetadata: map[string]string{
+				redisParamPrefix + "bucketName": "redis-bucket",
+				redisObjectMetaKey:              "tenant-test/cache/redis-backup.rdb",
+			},
+		},
+	}
+	restoreJob := &backupsv1alpha1.RestoreJob{
+		ObjectMeta: metav1.ObjectMeta{Name: "test-rj", Namespace: "tenant-test"},
+		Spec: backupsv1alpha1.RestoreJobSpec{
+			BackupRef: corev1.LocalObjectReference{Name: backup.Name},
+			TargetApplicationRef: &corev1.TypedLocalObjectReference{
+				APIGroup: new(backupsv1alpha1.DefaultApplicationAPIGroup),
+				Kind:     redisAppKind,
+				Name:     "cache-copy",
+			},
+		},
+		Status: backupsv1alpha1.RestoreJobStatus{StartedAt: &now, Phase: backupsv1alpha1.RestoreJobPhaseRunning},
+	}
+
+	_, rr := newRedisTestEnv(t, targetApp, clientfake.NewClientBuilder().WithObjects(strategy, backup, restoreJob))
+	ctx := context.Background()
+
+	if _, err := rr.reconcileRedisRestore(ctx, restoreJob, backup); err != nil {
+		t.Fatalf("reconcileRedisRestore() error = %v", err)
+	}
+
+	jobs := &batchv1.JobList{}
+	if err := rr.List(ctx, jobs, client.InNamespace("tenant-test")); err != nil {
+		t.Fatalf("list batch jobs: %v", err)
+	}
+	if len(jobs.Items) != 1 {
+		t.Fatalf("expected 1 restore Job, got %d", len(jobs.Items))
+	}
+	k8sJob := jobs.Items[0]
+	if got := k8sJob.Labels[redisLabelMode]; got != redisModeRestore {
+		t.Errorf("expected mode label %q, got %q", redisModeRestore, got)
+	}
+	args := k8sJob.Spec.Template.Spec.Containers[0].Args
+	// to-copy: --app renders to the TARGET (cache-copy), --source to the backup's
+	// SOURCE applicationRef (cache), so the restore reads the source's prefix.
+	// --key renders to the exact object recorded on the Backup, not a value
+	// recomputed from the target, so the restore reads back the object its
+	// Backup names.
+	want := []string{"--app=cache-copy", "--mode=restore", "--source=cache", "--bucket=redis-bucket", "--key=tenant-test/cache/redis-backup.rdb"}
+	for i, w := range want {
+		if i >= len(args) || args[i] != w {
+			t.Errorf("rendered restore args[%d]: want %q, got %q", i, w, args)
+		}
+	}
+}
+
+func TestReconcileRedisRestore_CompletesSucceeds(t *testing.T) {
+	targetApp := newRedisApp("cache", "tenant-test")
+	strategy := newRedisStrategy("redis-strategy")
+	now := metav1.Now()
+	backup := &backupsv1alpha1.Backup{
+		ObjectMeta: metav1.ObjectMeta{Name: "redis-backup", Namespace: "tenant-test"},
+		Spec: backupsv1alpha1.BackupSpec{
+			ApplicationRef: newRedisAppRef("cache"),
+			StrategyRef: corev1.TypedLocalObjectReference{
+				APIGroup: new(strategyv1alpha1.GroupVersion.Group),
+				Kind:     strategyv1alpha1.RedisStrategyKind,
+				Name:     "redis-strategy",
+			},
+			TakenAt: now,
+		},
+	}
+	restoreJob := &backupsv1alpha1.RestoreJob{
+		ObjectMeta: metav1.ObjectMeta{Name: "test-rj", Namespace: "tenant-test"},
+		Spec:       backupsv1alpha1.RestoreJobSpec{BackupRef: corev1.LocalObjectReference{Name: backup.Name}},
+		Status:     backupsv1alpha1.RestoreJobStatus{StartedAt: &now, Phase: backupsv1alpha1.RestoreJobPhaseRunning},
+	}
+	completedK8sJob := &batchv1.Job{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      jobNameForRestoreJob(restoreJob),
+			Namespace: restoreJob.Namespace,
+			Labels: map[string]string{
+				backupsv1alpha1.OwningJobNameLabel:      restoreJob.Name,
+				backupsv1alpha1.OwningJobNamespaceLabel: restoreJob.Namespace,
+			},
+		},
+		Status: batchv1.JobStatus{
+			CompletionTime: &now,
+			Conditions:     []batchv1.JobCondition{{Type: batchv1.JobComplete, Status: corev1.ConditionTrue}},
+		},
+	}
+
+	_, rr := newRedisTestEnv(t, targetApp, clientfake.NewClientBuilder().WithObjects(strategy, backup, restoreJob, completedK8sJob))
+	ctx := context.Background()
+
+	if _, err := rr.reconcileRedisRestore(ctx, restoreJob, backup); err != nil {
+		t.Fatalf("reconcileRedisRestore() error = %v", err)
+	}
+
+	updated := &backupsv1alpha1.RestoreJob{}
+	if err := rr.Get(ctx, client.ObjectKeyFromObject(restoreJob), updated); err != nil {
+		t.Fatalf("get restorejob: %v", err)
+	}
+	if updated.Status.Phase != backupsv1alpha1.RestoreJobPhaseSucceeded {
+		t.Errorf("expected phase Succeeded, got %q", updated.Status.Phase)
+	}
+}
+
+func TestReconcileRedisRestore_FailsOnUnmappableTargetKind(t *testing.T) {
+	targetApp := newRedisApp("cache", "tenant-test")
+	strategy := newRedisStrategy("redis-strategy")
+	now := metav1.Now()
+	backup := &backupsv1alpha1.Backup{
+		ObjectMeta: metav1.ObjectMeta{Name: "redis-backup", Namespace: "tenant-test"},
+		Spec: backupsv1alpha1.BackupSpec{
+			ApplicationRef: newRedisAppRef("cache"),
+			StrategyRef: corev1.TypedLocalObjectReference{
+				APIGroup: new(strategyv1alpha1.GroupVersion.Group),
+				Kind:     strategyv1alpha1.RedisStrategyKind,
+				Name:     "redis-strategy",
+			},
+			TakenAt: now,
+		},
+	}
+	restoreJob := &backupsv1alpha1.RestoreJob{
+		ObjectMeta: metav1.ObjectMeta{Name: "test-rj", Namespace: "tenant-test"},
+		Spec:       backupsv1alpha1.RestoreJobSpec{BackupRef: corev1.LocalObjectReference{Name: backup.Name}},
+		Status:     backupsv1alpha1.RestoreJobStatus{StartedAt: &now, Phase: backupsv1alpha1.RestoreJobPhaseRunning},
+	}
+
+	_, rr := newRedisTestEnv(t, targetApp, clientfake.NewClientBuilder().WithObjects(strategy, backup, restoreJob))
+	rr.RESTMapper = &noMatchRESTMapper{
+		mockRESTMapper: &mockRESTMapper{},
+		gk:             schema.GroupKind{Group: backupsv1alpha1.DefaultApplicationAPIGroup, Kind: "Redis"},
+	}
+	ctx := context.Background()
+
+	if _, err := rr.reconcileRedisRestore(ctx, restoreJob, backup); err != nil {
+		t.Fatalf("reconcileRedisRestore() should fail terminally for an unmappable target kind, not return a requeue error: %v", err)
+	}
+
+	updated := &backupsv1alpha1.RestoreJob{}
+	if err := rr.Get(ctx, client.ObjectKeyFromObject(restoreJob), updated); err != nil {
+		t.Fatalf("get restorejob: %v", err)
+	}
+	if updated.Status.Phase != backupsv1alpha1.RestoreJobPhaseFailed {
+		t.Errorf("expected phase Failed for unmappable target kind, got %q", updated.Status.Phase)
+	}
+	if want := "kind not registered"; !strings.Contains(updated.Status.Message, want) {
+		t.Errorf("expected message to contain %q, got %q", want, updated.Status.Message)
+	}
+}
+
+// Valkey runs on the same RedisFailover operator as Redis but its chart names
+// every resource valkey-<app>; a template that kept the redis- prefix would
+// look up a sentinel Service that does not exist.
+func TestReconcileRedis_ValkeyRendersValkeyPrefix(t *testing.T) {
+	app := newRedisAppOfKind("Valkey", "cache", "tenant-test")
+	strategy := newRedisStrategy("redis-strategy")
+	backupJob := &backupsv1alpha1.BackupJob{
+		ObjectMeta: metav1.ObjectMeta{Name: "test-bj", Namespace: "tenant-test"},
+		Spec: backupsv1alpha1.BackupJobSpec{
+			ApplicationRef:  newRedisAppRefOfKind("Valkey", "cache"),
+			BackupClassName: "cozy-default",
+		},
+	}
+	resolved := newRedisResolved("redis-strategy", map[string]string{"bucketName": "redis-bucket"})
+
+	r, _ := newRedisTestEnv(t, app, clientfake.NewClientBuilder().WithObjects(backupJob, strategy))
+	ctx := context.Background()
+
+	if _, err := r.reconcileRedis(ctx, backupJob, resolved); err != nil {
+		t.Fatalf("reconcileRedis() first call: %v", err)
+	}
+	if err := r.Get(ctx, client.ObjectKeyFromObject(backupJob), backupJob); err != nil {
+		t.Fatalf("refresh BackupJob: %v", err)
+	}
+	if _, err := r.reconcileRedis(ctx, backupJob, resolved); err != nil {
+		t.Fatalf("reconcileRedis() second call: %v", err)
+	}
+
+	jobs := &batchv1.JobList{}
+	if err := r.List(ctx, jobs, client.InNamespace("tenant-test")); err != nil {
+		t.Fatalf("list batch jobs: %v", err)
+	}
+	if len(jobs.Items) != 1 {
+		t.Fatalf("expected 1 batch/v1.Job, got %d", len(jobs.Items))
+	}
+	args := jobs.Items[0].Spec.Template.Spec.Containers[0].Args
+	if got, want := args[len(args)-1], "--prefix=valkey-"; got != want {
+		t.Errorf("rendered prefix arg: want %q, got %q", want, got)
+	}
+}
+
+func TestReconcileRedisRestore_RejectsCrossKindTarget(t *testing.T) {
+	targetApp := newRedisAppOfKind("Valkey", "cache-copy", "tenant-test")
+	strategy := newRedisStrategy("redis-strategy")
+	now := metav1.Now()
+	backup := &backupsv1alpha1.Backup{
+		ObjectMeta: metav1.ObjectMeta{Name: "redis-backup", Namespace: "tenant-test"},
+		Spec: backupsv1alpha1.BackupSpec{
+			ApplicationRef: newRedisAppRef("cache"),
+			StrategyRef: corev1.TypedLocalObjectReference{
+				APIGroup: new(strategyv1alpha1.GroupVersion.Group),
+				Kind:     strategyv1alpha1.RedisStrategyKind,
+				Name:     "redis-strategy",
+			},
+			TakenAt: now,
+		},
+	}
+	target := newRedisAppRefOfKind("Valkey", "cache-copy")
+	restoreJob := &backupsv1alpha1.RestoreJob{
+		ObjectMeta: metav1.ObjectMeta{Name: "test-rj", Namespace: "tenant-test"},
+		Spec: backupsv1alpha1.RestoreJobSpec{
+			BackupRef:            corev1.LocalObjectReference{Name: backup.Name},
+			TargetApplicationRef: &target,
+		},
+		Status: backupsv1alpha1.RestoreJobStatus{StartedAt: &now, Phase: backupsv1alpha1.RestoreJobPhaseRunning},
+	}
+
+	_, rr := newRedisTestEnv(t, targetApp, clientfake.NewClientBuilder().WithObjects(strategy, backup, restoreJob))
+	ctx := context.Background()
+
+	if _, err := rr.reconcileRedisRestore(ctx, restoreJob, backup); err != nil {
+		t.Fatalf("reconcileRedisRestore() error = %v", err)
+	}
+
+	updated := &backupsv1alpha1.RestoreJob{}
+	if err := rr.Get(ctx, client.ObjectKeyFromObject(restoreJob), updated); err != nil {
+		t.Fatalf("get restorejob: %v", err)
+	}
+	if updated.Status.Phase != backupsv1alpha1.RestoreJobPhaseFailed {
+		t.Errorf("expected phase Failed for a Redis backup restored into Valkey, got %q", updated.Status.Phase)
+	}
+	jobs := &batchv1.JobList{}
+	if err := rr.List(ctx, jobs, client.InNamespace("tenant-test")); err != nil {
+		t.Fatalf("list batch jobs: %v", err)
+	}
+	if len(jobs.Items) != 0 {
+		t.Errorf("expected no restore Job for a cross-kind target, got %d", len(jobs.Items))
+	}
+}
diff --git a/internal/backupcontroller/restorejob_controller.go b/internal/backupcontroller/restorejob_controller.go
index 23b65279e4..1a61f08008 100644
--- a/internal/backupcontroller/restorejob_controller.go
+++ b/internal/backupcontroller/restorejob_controller.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"net/http"
+	"slices"
 
 	corev1 "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
@@ -12,11 +13,13 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/dynamic"
+	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/record"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/client/apiutil"
+	"sigs.k8s.io/controller-runtime/pkg/controller"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 
@@ -34,9 +37,26 @@ type RestoreJobReconciler struct {
 	client.Client
 	dynamic.Interface
 	meta.RESTMapper
-	Scheme            *runtime.Scheme
-	Recorder          record.EventRecorder
+	Scheme   *runtime.Scheme
+	Recorder record.EventRecorder
+	// Clientset reads Pod logs (the controller-runtime cache client cannot);
+	// the CNPG restore driver uses it to read a bootstrap-recovery pod's log
+	// and tell an unreachable point-in-time target apart from a transient
+	// recovery-pod failure. Wired in SetupWithManager; nil-safe at call sites.
+	Clientset kubernetes.Interface
+	// readPodLog is the seam the CNPG restore driver reads a recovery pod's log
+	// through. Defaults to readPodContainerLog (which uses Clientset); tests
+	// inject a stub so the log-classification path - including the Forbidden
+	// (missing pods/log RBAC) branch - is unit-testable without a live cluster.
+	readPodLog        func(ctx context.Context, namespace, podName, container string) (string, error)
 	CredentialsConfig BackupCredentialsConfig
+	// APIReader is the manager's uncached reader. Reconcile re-reads the
+	// RestoreJob through it before dispatching to a driver, the
+	// keepOriginalPVC rename reads back objects it has just written, which
+	// the cache may not have seen yet, and the concurrent-restore gate must
+	// see a peer's StartedAt before the cache does. Wired in
+	// SetupWithManager.
+	APIReader client.Reader
 }
 
 func (r *RestoreJobReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
@@ -88,6 +108,22 @@ func (r *RestoreJobReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 		return ctrl.Result{}, nil
 	}
 
+	// Re-read past the cache for the reason BackupJobReconciler.Reconcile
+	// gives. Here the step retried for a job already over can be destructive:
+	// halting the VM, renaming its PVCs, deleting the Postgres cluster.
+	if err := r.apiReader().Get(ctx, req.NamespacedName, restoreJob); err != nil {
+		if apierrors.IsNotFound(err) {
+			return ctrl.Result{}, nil
+		}
+		logger.Error(err, "failed to re-read RestoreJob")
+		return ctrl.Result{}, err
+	}
+	if restoreJob.Status.Phase == backupsv1alpha1.RestoreJobPhaseSucceeded ||
+		restoreJob.Status.Phase == backupsv1alpha1.RestoreJobPhaseFailed {
+		logger.V(1).Info("RestoreJob terminal on the apiserver ahead of the cache, skipping", "phase", restoreJob.Status.Phase)
+		return ctrl.Result{}, nil
+	}
+
 	// Step 1: Fetch the referenced Backup
 	backup := &backupsv1alpha1.Backup{}
 	backupKey := types.NamespacedName{Namespace: req.Namespace, Name: restoreJob.Spec.BackupRef.Name}
@@ -115,18 +151,25 @@ func (r *RestoreJobReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 	// namespace and then fall through to markRestoreJobFailed with the
 	// Secret already in place.
 	{
-		supported := false
-		for _, k := range supportedBackupStrategyKinds() {
-			if backup.Spec.StrategyRef.Kind == k {
-				supported = true
-				break
-			}
-		}
+		supported := slices.Contains(supportedBackupStrategyKinds(), backup.Spec.StrategyRef.Kind)
 		if !supported {
 			return r.markRestoreJobFailed(ctx, restoreJob, fmt.Sprintf("StrategyRef.Kind not supported: %s", backup.Spec.StrategyRef.Kind))
 		}
 	}
 
+	// Only a job that has not started yet is refused, so a restore already
+	// rewriting the application is never failed by one created after it.
+	if !restoreJobStarted(restoreJob) {
+		ahead, err := restoreAhead(ctx, r.apiReader(), r.Client, restoreJob)
+		if err != nil {
+			return ctrl.Result{}, err
+		}
+		if ahead != "" {
+			return r.markRestoreJobFailedReason(ctx, restoreJob, ConditionReasonConcurrentRestore, fmt.Sprintf(
+				"RestoreJob %s is already restoring the same application; wait for it to finish, then create a new RestoreJob", ahead))
+		}
+	}
+
 	// Step 3: Project the platform-managed S3 credentials into the tenant
 	// namespace so default Strategy CRs (re-rendered at restore time) can
 	// reference a deterministic Secret name. Idempotent / no-op when
@@ -149,10 +192,18 @@ func (r *RestoreJobReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 		return r.reconcileAltinityRestore(ctx, restoreJob, backup)
 	case strategyv1alpha1.MariaDBStrategyKind:
 		return r.reconcileMariaDBRestore(ctx, restoreJob, backup)
+	case strategyv1alpha1.MongoDBStrategyKind:
+		return r.reconcileMongoDBRestore(ctx, restoreJob, backup)
 	case strategyv1alpha1.FoundationDBStrategyKind:
 		return r.reconcileFoundationDBRestore(ctx, restoreJob, backup)
 	case strategyv1alpha1.EtcdStrategyKind:
 		return r.reconcileEtcdRestore(ctx, restoreJob, backup)
+	case strategyv1alpha1.RabbitmqStrategyKind:
+		return r.reconcileRabbitmqRestore(ctx, restoreJob, backup)
+	case strategyv1alpha1.RedisStrategyKind:
+		return r.reconcileRedisRestore(ctx, restoreJob, backup)
+	case strategyv1alpha1.KafkaStrategyKind:
+		return r.reconcileKafkaRestore(ctx, restoreJob, backup)
 	default:
 		return r.markRestoreJobFailed(ctx, restoreJob, fmt.Sprintf("StrategyRef.Kind not supported: %s", backup.Spec.StrategyRef.Kind))
 	}
@@ -160,11 +211,15 @@ func (r *RestoreJobReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 
 // SetupWithManager registers our controller with the Manager and sets up watches.
 func (r *RestoreJobReconciler) SetupWithManager(mgr ctrl.Manager) error {
+	r.APIReader = mgr.GetAPIReader()
 	cfg := mgr.GetConfig()
 	var err error
 	if r.Interface, err = dynamic.NewForConfig(cfg); err != nil {
 		return err
 	}
+	if r.Clientset, err = kubernetes.NewForConfig(cfg); err != nil {
+		return err
+	}
 	var h *http.Client
 	if h, err = rest.HTTPClientFor(cfg); err != nil {
 		return err
@@ -174,9 +229,23 @@ func (r *RestoreJobReconciler) SetupWithManager(mgr ctrl.Manager) error {
 	}
 	return ctrl.NewControllerManagedBy(mgr).
 		For(&backupsv1alpha1.RestoreJob{}).
+		// One worker: restoreAhead lets exactly one of two concurrent restores
+		// through only because a peer's StartedAt, written by an earlier
+		// reconcile, is already on the API server when the next one reads.
+		WithOptions(controller.Options{MaxConcurrentReconciles: 1}).
 		Complete(r)
 }
 
+// apiReader returns the uncached reader. Reconcilers built by hand in unit
+// tests have none and fall back to their fake Client, which has no cache to
+// bypass.
+func (r *RestoreJobReconciler) apiReader() client.Reader {
+	if r.APIReader != nil {
+		return r.APIReader
+	}
+	return r.Client
+}
+
 // handleProjectionError classifies a credentials-projection error as
 // transient (requeue with Ready=False/CredentialsProjectionPending) or
 // terminal (markRestoreJobFailed). Mirrors the BackupJob variant — both
@@ -212,6 +281,14 @@ func (r *RestoreJobReconciler) handleProjectionError(ctx context.Context, rj *ba
 // fresh budget is what users expect after correcting the cause of the
 // previous failure.
 func (r *RestoreJobReconciler) markRestoreJobFailed(ctx context.Context, restoreJob *backupsv1alpha1.RestoreJob, message string) (ctrl.Result, error) {
+	return r.markRestoreJobFailedReason(ctx, restoreJob, "RestoreFailed", message)
+}
+
+// markRestoreJobFailedReason is markRestoreJobFailed with a caller-chosen
+// Ready-condition Reason so a driver can distinguish failure classes a tenant
+// acts on differently (e.g. RecoveryTargetUnreachable, which points at the
+// recoverable window rather than at the controller).
+func (r *RestoreJobReconciler) markRestoreJobFailedReason(ctx context.Context, restoreJob *backupsv1alpha1.RestoreJob, reason, message string) (ctrl.Result, error) {
 	logger := getLogger(ctx)
 	now := metav1.Now()
 	restoreJob.Status.CompletedAt = &now
@@ -226,7 +303,7 @@ func (r *RestoreJobReconciler) markRestoreJobFailed(ctx context.Context, restore
 	meta.SetStatusCondition(&restoreJob.Status.Conditions, metav1.Condition{
 		Type:    "Ready",
 		Status:  metav1.ConditionFalse,
-		Reason:  "RestoreFailed",
+		Reason:  reason,
 		Message: message,
 	})
 
@@ -305,12 +382,14 @@ func (r *RestoreJobReconciler) cleanupOnDelete(ctx context.Context, restoreJob *
 	case strategyv1alpha1.VeleroStrategyKind:
 		r.cleanupVeleroRestore(ctx, restoreJob)
 
-	case strategyv1alpha1.CNPGStrategyKind, strategyv1alpha1.JobStrategyKind, strategyv1alpha1.AltinityStrategyKind, strategyv1alpha1.MariaDBStrategyKind, strategyv1alpha1.FoundationDBStrategyKind, strategyv1alpha1.EtcdStrategyKind:
+	case strategyv1alpha1.CNPGStrategyKind, strategyv1alpha1.JobStrategyKind, strategyv1alpha1.AltinityStrategyKind, strategyv1alpha1.MariaDBStrategyKind, strategyv1alpha1.MongoDBStrategyKind, strategyv1alpha1.FoundationDBStrategyKind, strategyv1alpha1.EtcdStrategyKind, strategyv1alpha1.RabbitmqStrategyKind, strategyv1alpha1.RedisStrategyKind, strategyv1alpha1.KafkaStrategyKind:
 		// Nothing to clean up: these drivers don't materialise namespaced
 		// artifacts that outlive the RestoreJob. (Etcd: the operator-side
 		// EtcdCluster is owned by the source HelmRelease, and the
 		// EtcdClusterSpecCaptured / TargetPurged conditions live on the
-		// RestoreJob itself - all gone with the parent.)
+		// RestoreJob itself - all gone with the parent. Kafka: the metadata
+		// restore runs a one-shot Job owned by the RestoreJob and writes only
+		// to the Kafka cluster via the Admin API.)
 	default:
 		// Readable Backup, but an unrecognised strategy kind — not Velero
 		// as far as we can tell. Speculatively reap a stray labelled Velero
diff --git a/internal/backupcontroller/restorejob_controller_test.go b/internal/backupcontroller/restorejob_controller_test.go
index e606781d8b..804679a11b 100644
--- a/internal/backupcontroller/restorejob_controller_test.go
+++ b/internal/backupcontroller/restorejob_controller_test.go
@@ -42,6 +42,7 @@ func TestStrategyKindForRestoreJob(t *testing.T) {
 		{"job strategy", strategyv1alpha1.JobStrategyKind, strategyv1alpha1.JobStrategyKind},
 		{"mariadb strategy", strategyv1alpha1.MariaDBStrategyKind, strategyv1alpha1.MariaDBStrategyKind},
 		{"etcd strategy", strategyv1alpha1.EtcdStrategyKind, strategyv1alpha1.EtcdStrategyKind},
+		{"kafka strategy", strategyv1alpha1.KafkaStrategyKind, strategyv1alpha1.KafkaStrategyKind},
 	}
 	for _, tc := range cases {
 		t.Run(tc.name, func(t *testing.T) {
@@ -232,6 +233,49 @@ func TestCleanupOnDelete_Etcd_DoesNotTouchVeleroNamespace(t *testing.T) {
 	}
 }
 
+// TestCleanupOnDelete_Kafka_DoesNotTouchVeleroNamespace mirrors the sibling
+// cleanup tests for the Kafka metadata strategy. The Kafka driver's restore
+// runs a one-shot Job owned by the RestoreJob and writes only to the Kafka
+// cluster via the Admin API — it materialises nothing in cozy-velero. Dropping
+// Kafka from the no-op group would fall through to the conservative `default`
+// branch, which runs the Velero cleanup unconditionally and, on a cluster with
+// velero.bslEnabled=false, that is every Kafka RestoreJob deletion. Seeding a
+// label-matching Velero Restore proves the Kafka branch stays no-op.
+func TestCleanupOnDelete_Kafka_DoesNotTouchVeleroNamespace(t *testing.T) {
+	apiGroup := strategyv1alpha1.GroupVersion.Group
+	rj := &backupsv1alpha1.RestoreJob{
+		ObjectMeta: metav1.ObjectMeta{Namespace: "tenant", Name: "rj"},
+		Spec:       backupsv1alpha1.RestoreJobSpec{BackupRef: corev1.LocalObjectReference{Name: "bk"}},
+	}
+	backup := &backupsv1alpha1.Backup{
+		ObjectMeta: metav1.ObjectMeta{Namespace: "tenant", Name: "bk"},
+		Spec: backupsv1alpha1.BackupSpec{
+			StrategyRef: corev1.TypedLocalObjectReference{
+				APIGroup: &apiGroup, Kind: strategyv1alpha1.KafkaStrategyKind, Name: "s",
+			},
+		},
+	}
+	owned := &velerov1.Restore{
+		ObjectMeta: metav1.ObjectMeta{
+			Namespace: veleroNamespace,
+			Name:      "would-be-victim",
+			Labels: map[string]string{
+				backupsv1alpha1.OwningJobNameLabel:      "rj",
+				backupsv1alpha1.OwningJobNamespaceLabel: "tenant",
+			},
+		},
+	}
+	c := newRestoreJobTestClient(t, rj, backup, owned)
+	r := &RestoreJobReconciler{Client: c, Recorder: record.NewFakeRecorder(10)}
+
+	r.cleanupOnDelete(context.Background(), rj)
+
+	got := &velerov1.Restore{}
+	if err := c.Get(context.Background(), client.ObjectKeyFromObject(owned), got); err != nil {
+		t.Fatalf("Kafka cleanup incorrectly routed to Velero cleanup; matching Velero Restore was deleted (err=%v)", err)
+	}
+}
+
 // TestCleanupOnDelete_Velero_DeletesOwnedRestore confirms the dispatcher
 // still routes Velero RestoreJob deletions to the Velero cleanup path.
 func TestCleanupOnDelete_Velero_DeletesOwnedRestore(t *testing.T) {
diff --git a/internal/backupcontroller/restorejob_target_lock.go b/internal/backupcontroller/restorejob_target_lock.go
new file mode 100644
index 0000000000..c5cddd717f
--- /dev/null
+++ b/internal/backupcontroller/restorejob_target_lock.go
@@ -0,0 +1,83 @@
+// SPDX-License-Identifier: Apache-2.0
+package backupcontroller
+
+import (
+	"context"
+	"fmt"
+
+	"sigs.k8s.io/controller-runtime/pkg/client"
+
+	backupsv1alpha1 "github.com/cozystack/cozystack/api/backups/v1alpha1"
+)
+
+// ConditionReasonConcurrentRestore is the Failed reason of a RestoreJob that
+// was refused because another restore into the same application goes first.
+const ConditionReasonConcurrentRestore = "ConcurrentRestore"
+
+// restoreAhead returns the name of the first non-terminal RestoreJob in rj's
+// namespace that writes into the same application as rj and goes before it,
+// or "" when there is none.
+//
+// Two restores into one application must not interleave: each rewrites the
+// target from its own Backup, and the CNPG driver cannot tell which of them
+// produced the live Cluster when both run. The one that goes second fails
+// instead of waiting, so the application is never restored a second time,
+// later, by a job its author may no longer expect to run.
+//
+// A restore that has started goes before one that has not; between two that
+// have not, the older goes first, by creation time and then by name. Creation
+// times have one-second precision, so two jobs created in the same second are
+// ordered by name. The order is the same from either side.
+//
+// The list comes from reader, which must not be the informer cache: a job can
+// be reconciled before the cache holds a peer's StartedAt, see that peer as
+// not started, and proceed alongside it. Backups are read through c.
+func restoreAhead(ctx context.Context, reader client.Reader, c client.Client, rj *backupsv1alpha1.RestoreJob) (string, error) {
+	target, ok, err := restoreJobTarget(ctx, c, rj)
+	if err != nil || !ok {
+		return "", err
+	}
+	list := &backupsv1alpha1.RestoreJobList{}
+	if err := reader.List(ctx, list, client.InNamespace(rj.Namespace)); err != nil {
+		return "", fmt.Errorf("list RestoreJobs: %w", err)
+	}
+	var first *backupsv1alpha1.RestoreJob
+	for i := range list.Items {
+		other := &list.Items[i]
+		if other.Name == rj.Name {
+			continue
+		}
+		if other.Status.Phase == backupsv1alpha1.RestoreJobPhaseSucceeded || other.Status.Phase == backupsv1alpha1.RestoreJobPhaseFailed {
+			continue
+		}
+		if !other.DeletionTimestamp.IsZero() || !restoreGoesFirst(other, rj) {
+			continue
+		}
+		otherTarget, ok, err := restoreJobTarget(ctx, c, other)
+		if err != nil {
+			return "", err
+		}
+		if ok && sameApplication(otherTarget, target) && (first == nil || restoreGoesFirst(other, first)) {
+			first = other
+		}
+	}
+	if first == nil {
+		return "", nil
+	}
+	return first.Name, nil
+}
+
+func restoreJobStarted(rj *backupsv1alpha1.RestoreJob) bool {
+	return rj.Status.StartedAt != nil || rj.Status.Phase == backupsv1alpha1.RestoreJobPhaseRunning
+}
+
+// restoreGoesFirst reports whether a runs before b; see restoreAhead.
+func restoreGoesFirst(a, b *backupsv1alpha1.RestoreJob) bool {
+	if sa, sb := restoreJobStarted(a), restoreJobStarted(b); sa != sb {
+		return sa
+	}
+	if !a.CreationTimestamp.Equal(&b.CreationTimestamp) {
+		return a.CreationTimestamp.Before(&b.CreationTimestamp)
+	}
+	return a.Name < b.Name
+}
diff --git a/internal/backupcontroller/restorejob_target_lock_test.go b/internal/backupcontroller/restorejob_target_lock_test.go
new file mode 100644
index 0000000000..33c4d7ba8e
--- /dev/null
+++ b/internal/backupcontroller/restorejob_target_lock_test.go
@@ -0,0 +1,242 @@
+// SPDX-License-Identifier: Apache-2.0
+package backupcontroller
+
+import (
+	"context"
+	"strings"
+	"testing"
+	"time"
+
+	corev1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/api/meta"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/types"
+	"k8s.io/client-go/tools/record"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/reconcile"
+
+	strategyv1alpha1 "github.com/cozystack/cozystack/api/backups/strategy/v1alpha1"
+	backupsv1alpha1 "github.com/cozystack/cozystack/api/backups/v1alpha1"
+)
+
+func TestRestoreAhead(t *testing.T) {
+	t0 := metav1.NewTime(time.Date(2026, 10, 1, 12, 0, 0, 0, time.UTC))
+	t1 := metav1.NewTime(t0.Add(time.Minute))
+	started := metav1.NewTime(t0.Add(30 * time.Second))
+	other := pgRef("other")
+
+	restore := func(name string, created metav1.Time, phase backupsv1alpha1.RestoreJobPhase, target *corev1.TypedLocalObjectReference) *backupsv1alpha1.RestoreJob {
+		rj := lockRestore(name, "bk", phase, target, "")
+		rj.CreationTimestamp = created
+		return rj
+	}
+
+	for _, tc := range []struct {
+		name   string
+		self   *backupsv1alpha1.RestoreJob
+		others []client.Object
+		want   string
+	}{
+		{
+			name: "no other restore",
+			self: restore("second", t1, "", nil),
+			want: "",
+		},
+		{
+			name:   "an older restore that has not started goes first",
+			self:   restore("second", t1, "", nil),
+			others: []client.Object{restore("first", t0, backupsv1alpha1.RestoreJobPhasePending, nil)},
+			want:   "first",
+		},
+		{
+			name:   "a newer restore that has not started does not go first",
+			self:   restore("first", t0, "", nil),
+			others: []client.Object{restore("second", t1, "", nil)},
+			want:   "",
+		},
+		{
+			name:   "a running restore goes first even when created later",
+			self:   restore("first", t0, "", nil),
+			others: []client.Object{restore("second", t1, backupsv1alpha1.RestoreJobPhaseRunning, nil)},
+			want:   "second",
+		},
+		{
+			name: "a restore with StartedAt goes first even when created later",
+			self: restore("first", t0, "", nil),
+			others: []client.Object{func() client.Object {
+				rj := restore("second", t1, "", nil)
+				rj.Status.StartedAt = &started
+				return rj
+			}()},
+			want: "second",
+		},
+		{
+			name:   "an older restore goes first even when its name sorts later",
+			self:   restore("alpha", t1, "", nil),
+			others: []client.Object{restore("zeta", t0, "", nil)},
+			want:   "zeta",
+		},
+		{
+			name:   "a newer restore does not go first even when its name sorts earlier",
+			self:   restore("zeta", t0, "", nil),
+			others: []client.Object{restore("alpha", t1, "", nil)},
+			want:   "",
+		},
+		{
+			name: "several ahead: names the one that goes first, not the lowest name",
+			self: restore("self", metav1.NewTime(t1.Add(time.Minute)), "", nil),
+			others: []client.Object{
+				restore("alpha", t1, "", nil),
+				restore("zeta", t0, backupsv1alpha1.RestoreJobPhaseRunning, nil),
+			},
+			want: "zeta",
+		},
+		{
+			name:   "created at the same time: the lower name goes first",
+			self:   restore("b", t0, "", nil),
+			others: []client.Object{restore("a", t0, "", nil)},
+			want:   "a",
+		},
+		{
+			name:   "created at the same time: a higher name does not go first",
+			self:   restore("a", t0, "", nil),
+			others: []client.Object{restore("b", t0, "", nil)},
+			want:   "",
+		},
+		{
+			name: "finished restores do not hold",
+			self: restore("third", t1, "", nil),
+			others: []client.Object{
+				restore("done", t0, backupsv1alpha1.RestoreJobPhaseSucceeded, nil),
+				restore("failed", t0, backupsv1alpha1.RestoreJobPhaseFailed, nil),
+			},
+			want: "",
+		},
+		{
+			name: "a restore being deleted does not hold",
+			self: restore("second", t1, "", nil),
+			others: []client.Object{func() client.Object {
+				rj := restore("first", t0, backupsv1alpha1.RestoreJobPhaseRunning, nil)
+				rj.DeletionTimestamp = &t1
+				rj.Finalizers = []string{restoreJobFinalizer}
+				return rj
+			}()},
+			want: "",
+		},
+		{
+			name:   "a restore into another application does not hold",
+			self:   restore("second", t1, "", nil),
+			others: []client.Object{restore("first", t0, backupsv1alpha1.RestoreJobPhaseRunning, &other)},
+			want:   "",
+		},
+		{
+			name:   "a restore retargeted onto this job's application holds",
+			self:   restore("second", t1, "", &other),
+			others: []client.Object{restore("first", t0, backupsv1alpha1.RestoreJobPhaseRunning, &other)},
+			want:   "first",
+		},
+		{
+			name:   "the lowest name is reported when several hold",
+			self:   restore("third", t1, "", nil),
+			others: []client.Object{restore("zeta", t0, backupsv1alpha1.RestoreJobPhaseRunning, nil), restore("alpha", t0, backupsv1alpha1.RestoreJobPhaseRunning, nil)},
+			want:   "alpha",
+		},
+	} {
+		t.Run(tc.name, func(t *testing.T) {
+			objs := append([]client.Object{lockBackup("bk", pgRef("pg")), tc.self}, tc.others...)
+			c := lockTestClient(t, objs...)
+			got, err := restoreAhead(context.Background(), c, c, tc.self)
+			if err != nil {
+				t.Fatalf("restoreAhead: %v", err)
+			}
+			if got != tc.want {
+				t.Fatalf("restoreAhead = %q, want %q", got, tc.want)
+			}
+		})
+	}
+}
+
+func TestRestoreAhead_VeleroIntoAnotherNamespaceIsNotHeld(t *testing.T) {
+	t0 := metav1.NewTime(time.Date(2026, 10, 1, 12, 0, 0, 0, time.UTC))
+	vm := corev1.TypedLocalObjectReference{APIGroup: new("apps.cozystack.io"), Kind: "VMInstance", Name: "vm"}
+	first := lockRestore("first", "bk", backupsv1alpha1.RestoreJobPhaseRunning, nil, "")
+	first.CreationTimestamp = t0
+	second := lockRestore("second", "bk", "", nil, `{"targetNamespace":"tenant-copy"}`)
+	second.CreationTimestamp = metav1.NewTime(t0.Add(time.Minute))
+	c := lockTestClient(t, lockBackupBy("bk", vm, strategyv1alpha1.VeleroStrategyKind), first, second)
+	got, err := restoreAhead(context.Background(), c, c, second)
+	if err != nil {
+		t.Fatalf("restoreAhead: %v", err)
+	}
+	if got != "" {
+		t.Fatalf("restoreAhead = %q, want none: the job writes into another namespace", got)
+	}
+}
+
+func TestReconcileRestore_ConcurrentRestoreIsRefused(t *testing.T) {
+	t0 := metav1.NewTime(time.Date(2026, 10, 1, 12, 0, 0, 0, time.UTC))
+	first := lockRestore("first", "bk", backupsv1alpha1.RestoreJobPhaseRunning, nil, "")
+	first.CreationTimestamp = t0
+	first.Status.StartedAt = &t0
+	second := lockRestore("second", "bk", "", nil, "")
+	second.CreationTimestamp = metav1.NewTime(t0.Add(time.Minute))
+	c := lockTestClient(t, lockBackup("bk", pgRef("pg")), first, second)
+	r := &RestoreJobReconciler{Client: c, Recorder: record.NewFakeRecorder(10)}
+
+	if _, err := r.Reconcile(context.Background(), reconcile.Request{NamespacedName: types.NamespacedName{Namespace: lockNS, Name: "second"}}); err != nil {
+		t.Fatalf("Reconcile: %v", err)
+	}
+	got := &backupsv1alpha1.RestoreJob{}
+	if err := c.Get(context.Background(), types.NamespacedName{Namespace: lockNS, Name: "second"}, got); err != nil {
+		t.Fatalf("get RestoreJob: %v", err)
+	}
+	if got.Status.Phase != backupsv1alpha1.RestoreJobPhaseFailed {
+		t.Fatalf("Phase = %q, want Failed", got.Status.Phase)
+	}
+	ready := meta.FindStatusCondition(got.Status.Conditions, "Ready")
+	if ready == nil || ready.Reason != ConditionReasonConcurrentRestore {
+		t.Fatalf("Ready condition = %+v, want reason %s", ready, ConditionReasonConcurrentRestore)
+	}
+	if !strings.Contains(got.Status.Message, "first") {
+		t.Fatalf("message %q does not name the restore that goes first", got.Status.Message)
+	}
+
+	running := &backupsv1alpha1.RestoreJob{}
+	if err := c.Get(context.Background(), types.NamespacedName{Namespace: lockNS, Name: "first"}, running); err != nil {
+		t.Fatalf("get RestoreJob: %v", err)
+	}
+	if running.Status.Phase != backupsv1alpha1.RestoreJobPhaseRunning {
+		t.Fatalf("the running restore changed phase to %q", running.Status.Phase)
+	}
+}
+
+// The informer cache can lag a peer's status: here it still holds zeta as not
+// started, while the API server already has its StartedAt. Read from the cache,
+// alpha would see zeta behind it by name and proceed alongside it.
+func TestReconcileRestore_ConcurrentRestoreReadsPastTheCache(t *testing.T) {
+	t0 := metav1.NewTime(time.Date(2026, 10, 1, 12, 0, 0, 0, time.UTC))
+	staleZeta := lockRestore("zeta", "bk", "", nil, "")
+	staleZeta.CreationTimestamp = t0
+	alpha := lockRestore("alpha", "bk", "", nil, "")
+	alpha.CreationTimestamp = t0
+	alpha.Finalizers = []string{restoreJobFinalizer}
+	startedZeta := staleZeta.DeepCopy()
+	startedZeta.Status.Phase = backupsv1alpha1.RestoreJobPhaseRunning
+	startedZeta.Status.StartedAt = &t0
+
+	cached := lockTestClient(t, lockBackup("bk", pgRef("pg")), staleZeta, alpha)
+	live := lockTestClient(t, lockBackup("bk", pgRef("pg")), startedZeta, alpha.DeepCopy())
+	r := &RestoreJobReconciler{Client: cached, APIReader: live, Recorder: record.NewFakeRecorder(10)}
+
+	if _, err := r.Reconcile(context.Background(), reconcile.Request{NamespacedName: types.NamespacedName{Namespace: lockNS, Name: "alpha"}}); err != nil {
+		t.Fatalf("Reconcile: %v", err)
+	}
+	got := &backupsv1alpha1.RestoreJob{}
+	if err := cached.Get(context.Background(), types.NamespacedName{Namespace: lockNS, Name: "alpha"}, got); err != nil {
+		t.Fatalf("get RestoreJob: %v", err)
+	}
+	ready := meta.FindStatusCondition(got.Status.Conditions, "Ready")
+	if got.Status.Phase != backupsv1alpha1.RestoreJobPhaseFailed || ready == nil || ready.Reason != ConditionReasonConcurrentRestore {
+		t.Fatalf("alpha: phase %q, Ready %+v; want Failed with reason %s, since zeta has started", got.Status.Phase, ready, ConditionReasonConcurrentRestore)
+	}
+}
diff --git a/internal/backupcontroller/stale_cache_test.go b/internal/backupcontroller/stale_cache_test.go
new file mode 100644
index 0000000000..916f562c51
--- /dev/null
+++ b/internal/backupcontroller/stale_cache_test.go
@@ -0,0 +1,197 @@
+// SPDX-License-Identifier: Apache-2.0
+package backupcontroller
+
+import (
+	"context"
+	"testing"
+	"time"
+
+	corev1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/api/meta"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	dynamicfake "k8s.io/client-go/dynamic/fake"
+	"k8s.io/client-go/kubernetes/scheme"
+	"k8s.io/client-go/tools/record"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+	clientfake "sigs.k8s.io/controller-runtime/pkg/client/fake"
+	"sigs.k8s.io/controller-runtime/pkg/reconcile"
+
+	strategyv1alpha1 "github.com/cozystack/cozystack/api/backups/strategy/v1alpha1"
+	backupsv1alpha1 "github.com/cozystack/cozystack/api/backups/v1alpha1"
+	velerov1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
+)
+
+// staleCacheScheme registers what both the cache and the apiserver stand-in
+// hold.
+func staleCacheScheme() *runtime.Scheme {
+	s := runtime.NewScheme()
+	_ = scheme.AddToScheme(s)
+	_ = backupsv1alpha1.AddToScheme(s)
+	_ = strategyv1alpha1.AddToScheme(s)
+	_ = velerov1.AddToScheme(s)
+	return s
+}
+
+// apiServerHolding stands in for the apiserver: it holds job as the cache
+// does, except for its phase.
+func apiServerHolding(s *runtime.Scheme, job client.Object, phase string) client.Reader {
+	onAPI := job.DeepCopyObject().(client.Object)
+	switch j := onAPI.(type) {
+	case *backupsv1alpha1.BackupJob:
+		j.Status.Phase = backupsv1alpha1.BackupJobPhase(phase)
+	case *backupsv1alpha1.RestoreJob:
+		j.Status.Phase = backupsv1alpha1.RestoreJobPhase(phase)
+	}
+	onAPI.SetResourceVersion("")
+	return clientfake.NewClientBuilder().WithScheme(s).WithObjects(onAPI).Build()
+}
+
+func countIn(t *testing.T, c client.Client, list client.ObjectList) int {
+	t.Helper()
+	if err := c.List(context.Background(), list); err != nil {
+		t.Fatalf("list %T: %v", list, err)
+	}
+	return meta.LenList(list)
+}
+
+// TestReconcile_DoesNotRetryAJobItAlreadyFailed reproduces a pass that
+// starts on a cache trailing the controller's own writes: the previous pass
+// stamped StartedAt, which requeued the job, then failed it on a transient
+// error. The cache holds the job with StartedAt and no phase; the apiserver
+// holds it Failed. Before the re-read, the pass retried the Velero Backup
+// creation and the job ended Failed with a Velero Backup nothing tracks.
+func TestReconcile_DoesNotRetryAJobItAlreadyFailed(t *testing.T) {
+	appsGroup := "apps.cozystack.io"
+	strategyGroup := strategyv1alpha1.GroupVersion.Group
+	started := metav1.NewTime(time.Now().Add(-time.Second).Truncate(time.Second))
+
+	run := func(t *testing.T, apiPhase backupsv1alpha1.BackupJobPhase) (created int, cached backupsv1alpha1.BackupJobPhase) {
+		s := staleCacheScheme()
+		bc := &backupsv1alpha1.BackupClass{
+			ObjectMeta: metav1.ObjectMeta{Name: "bc"},
+			Spec: backupsv1alpha1.BackupClassSpec{Strategies: []backupsv1alpha1.BackupClassStrategy{{
+				Application: backupsv1alpha1.ApplicationSelector{APIGroup: &appsGroup, Kind: "Bucket"},
+				StrategyRef: corev1.TypedLocalObjectReference{APIGroup: &strategyGroup, Kind: strategyv1alpha1.VeleroStrategyKind, Name: "velero"},
+			}}},
+		}
+		j := &backupsv1alpha1.BackupJob{
+			ObjectMeta: metav1.ObjectMeta{Namespace: "tenant", Name: "bj"},
+			Spec: backupsv1alpha1.BackupJobSpec{
+				BackupClassName: "bc",
+				ApplicationRef:  corev1.TypedLocalObjectReference{APIGroup: &appsGroup, Kind: "Bucket", Name: "app"},
+			},
+			Status: backupsv1alpha1.BackupJobStatus{StartedAt: &started},
+		}
+		strategy := &strategyv1alpha1.Velero{ObjectMeta: metav1.ObjectMeta{Name: "velero"}}
+		c := clientfake.NewClientBuilder().WithScheme(s).WithObjects(j, bc, strategy).
+			WithStatusSubresource(&backupsv1alpha1.BackupJob{}).Build()
+		gvr := schema.GroupVersionResource{Group: appsGroup, Version: "v1alpha1", Resource: "buckets"}
+		app := &unstructured.Unstructured{}
+		app.SetGroupVersionKind(gvr.GroupVersion().WithKind("Bucket"))
+		app.SetNamespace("tenant")
+		app.SetName("app")
+		r := &BackupJobReconciler{
+			Client:    c,
+			APIReader: apiServerHolding(s, j, string(apiPhase)),
+			Interface: dynamicfake.NewSimpleDynamicClientWithCustomListKinds(runtime.NewScheme(), map[schema.GroupVersionResource]string{gvr: "BucketList"}, app),
+			RESTMapper: &mockRESTMapper{mapping: &meta.RESTMapping{
+				Resource:         gvr,
+				GroupVersionKind: gvr.GroupVersion().WithKind("Bucket"),
+				Scope:            meta.RESTScopeNamespace,
+			}},
+			Scheme:   s,
+			Recorder: record.NewFakeRecorder(10),
+		}
+		if _, err := r.Reconcile(context.Background(), reconcile.Request{NamespacedName: client.ObjectKeyFromObject(j)}); err != nil {
+			t.Fatalf("Reconcile: %v", err)
+		}
+		got := &backupsv1alpha1.BackupJob{}
+		if err := c.Get(context.Background(), client.ObjectKeyFromObject(j), got); err != nil {
+			t.Fatalf("get BackupJob: %v", err)
+		}
+		return countIn(t, c, &velerov1.BackupList{}), got.Status.Phase
+	}
+
+	if created, _ := run(t, ""); created != 1 {
+		t.Fatalf("job still active on the apiserver: %d Velero Backups created, want 1", created)
+	}
+	created, cached := run(t, backupsv1alpha1.BackupJobPhaseFailed)
+	if created != 0 {
+		t.Errorf("job Failed on the apiserver: %d Velero Backups created, want 0", created)
+	}
+	if cached != "" {
+		t.Errorf("the pass wrote phase %q over a job it should have left alone", cached)
+	}
+}
+
+// TestReconcileRestore_DoesNotRetryAJobItAlreadyFailed is the restore-side
+// counterpart. The retried step is destructive there: before creating the
+// Velero Restore, the pass suspends the VM's HelmRelease and halts the VM.
+func TestReconcileRestore_DoesNotRetryAJobItAlreadyFailed(t *testing.T) {
+	const ns = "tenant"
+	strategyGroup := strategyv1alpha1.GroupVersion.Group
+	hrName := vmNamePrefix + "vm"
+	started := metav1.NewTime(time.Now().Add(-time.Second).Truncate(time.Second))
+
+	run := func(t *testing.T, apiPhase backupsv1alpha1.RestoreJobPhase) (restores int, hrSuspended bool, cached backupsv1alpha1.RestoreJobPhase) {
+		s := staleCacheScheme()
+		backup := &backupsv1alpha1.Backup{
+			ObjectMeta: metav1.ObjectMeta{Name: "bk", Namespace: ns},
+			Spec: backupsv1alpha1.BackupSpec{
+				ApplicationRef: corev1.TypedLocalObjectReference{APIGroup: new("apps.cozystack.io"), Kind: vmInstanceKind, Name: "vm"},
+				StrategyRef:    corev1.TypedLocalObjectReference{APIGroup: &strategyGroup, Kind: strategyv1alpha1.VeleroStrategyKind, Name: "velero"},
+				DriverMetadata: map[string]string{veleroBackupNameMetadataKey: "vb"},
+			},
+		}
+		rj := &backupsv1alpha1.RestoreJob{
+			ObjectMeta: metav1.ObjectMeta{Name: "rj", Namespace: ns, Finalizers: []string{restoreJobFinalizer}},
+			Spec:       backupsv1alpha1.RestoreJobSpec{BackupRef: corev1.LocalObjectReference{Name: "bk"}},
+			Status:     backupsv1alpha1.RestoreJobStatus{StartedAt: &started, Phase: backupsv1alpha1.RestoreJobPhaseRunning},
+		}
+		strategy := &strategyv1alpha1.Velero{ObjectMeta: metav1.ObjectMeta{Name: "velero"}}
+		veleroBackup := &velerov1.Backup{
+			ObjectMeta: metav1.ObjectMeta{Name: "vb", Namespace: veleroNamespace},
+			Status:     velerov1.BackupStatus{Phase: velerov1.BackupPhaseCompleted},
+		}
+		c := clientfake.NewClientBuilder().WithScheme(s).WithObjects(rj, backup, strategy, veleroBackup).
+			WithStatusSubresource(&backupsv1alpha1.RestoreJob{}).Build()
+		dyn := dynamicfake.NewSimpleDynamicClient(testCNPGScheme(t), makeUnstructuredHelmRelease(hrName, ns, nil))
+		r := &RestoreJobReconciler{
+			Client:    c,
+			APIReader: apiServerHolding(s, rj, string(apiPhase)),
+			Interface: dyn,
+			Scheme:    s,
+			Recorder:  record.NewFakeRecorder(100),
+		}
+		if _, err := r.Reconcile(context.Background(), reconcile.Request{NamespacedName: client.ObjectKeyFromObject(rj)}); err != nil {
+			t.Fatalf("Reconcile: %v", err)
+		}
+		hr, err := dyn.Resource(helmReleaseGVR).Namespace(ns).Get(context.Background(), hrName, metav1.GetOptions{})
+		if err != nil {
+			t.Fatalf("get HelmRelease: %v", err)
+		}
+		hrSuspended, _, _ = unstructured.NestedBool(hr.Object, "spec", "suspend")
+		got := &backupsv1alpha1.RestoreJob{}
+		if err := c.Get(context.Background(), client.ObjectKeyFromObject(rj), got); err != nil {
+			t.Fatalf("get RestoreJob: %v", err)
+		}
+		return countIn(t, c, &velerov1.RestoreList{}), hrSuspended, got.Status.Phase
+	}
+
+	if restores, suspended, _ := run(t, backupsv1alpha1.RestoreJobPhaseRunning); restores != 1 || !suspended {
+		t.Fatalf("job still active on the apiserver: %d Velero Restores, HelmRelease suspended=%v; want 1 and true", restores, suspended)
+	}
+	restores, suspended, cached := run(t, backupsv1alpha1.RestoreJobPhaseFailed)
+	if suspended {
+		t.Error("job Failed on the apiserver: the pass suspended the VM's HelmRelease")
+	}
+	if restores != 0 {
+		t.Errorf("job Failed on the apiserver: %d Velero Restores created, want 0", restores)
+	}
+	if cached != backupsv1alpha1.RestoreJobPhaseRunning {
+		t.Errorf("the pass wrote phase %q over a job it should have left alone", cached)
+	}
+}
diff --git a/internal/backupcontroller/velerostrategy_controller.go b/internal/backupcontroller/velerostrategy_controller.go
index 1c6a062269..524be644bc 100644
--- a/internal/backupcontroller/velerostrategy_controller.go
+++ b/internal/backupcontroller/velerostrategy_controller.go
@@ -6,6 +6,8 @@ import (
 	"encoding/hex"
 	"encoding/json"
 	"fmt"
+	"slices"
+	"sort"
 	"strings"
 	"time"
 
@@ -18,6 +20,7 @@ import (
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/client-go/util/retry"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/log"
@@ -41,7 +44,7 @@ type loggerWithDebug struct {
 }
 
 // Debug logs at debug level (equivalent to V(1).Info())
-func (l loggerWithDebug) Debug(msg string, keysAndValues ...interface{}) {
+func (l loggerWithDebug) Debug(msg string, keysAndValues ...any) {
 	l.Logger.V(1).Info(msg, keysAndValues...)
 }
 
@@ -50,6 +53,14 @@ const (
 	defaultActiveJobPollingInterval     = defaultRequeueAfter
 	defaultRestoreRequeueAfter          = 5 * time.Second
 	defaultActiveRestorePollingInterval = defaultRestoreRequeueAfter
+
+	// Condition recorded on a RestoreJob before prepareForRestore first changes
+	// the target. From then on a failure has to say what preparation left
+	// behind, and its LastTransitionTime starts the preparation deadline.
+	restoreCondPreparationStarted = "PreparationStarted"
+	// How long preparation may wait (VM shutdown, Pods releasing the disks, the
+	// DataVolume and a recreated PVC going away) before the RestoreJob fails.
+	restorePreparationDeadline = 30 * time.Minute
 	// Velero requires API objects and secrets to be in the cozy-velero namespace
 	veleroNamespace                  = "cozy-velero"
 	veleroBackupNameMetadataKey      = "velero.io/backup-name"
@@ -58,6 +69,17 @@ const (
 	// Annotation key for persisting underlying resources on the Velero Backup object
 	underlyingResourcesAnnotation = "backups.cozystack.io/underlying-resources"
 
+	// keepOriginalPVC moves a disk's PV to Retain so it survives the deletion
+	// of its PVC. The policy it had is kept here, on the PV and on the
+	// <name>-orig-<hash> PVC, because nothing in the controller restores it:
+	// whoever deletes the -orig PVC must set it back first, or a PV that was
+	// Delete stays Retain and its volume is never reclaimed.
+	originalReclaimPolicyAnnotation = "backups.cozystack.io/original-reclaim-policy"
+	// The -orig suffix hashes the RestoreJob name, and a name can be reused
+	// once the previous RestoreJob is deleted, leaving its -orig PVC behind.
+	// The UID tells a rename this RestoreJob started apart from that one.
+	origPVCRestoreJobUIDAnnotation = "backups.cozystack.io/restore-job-uid"
+
 	// VM-specific constants
 	vmInstanceKind        = "VMInstance"
 	vmDiskAppKind         = "VMDisk"
@@ -71,15 +93,6 @@ const (
 	cdiAllowClaimAdoption = "cdi.kubevirt.io/allowClaimAdoption"
 )
 
-func stringPtr(s string) *string {
-	return &s
-}
-
-// boolPtr returns a pointer to a bool value.
-func boolPtr(b bool) *bool {
-	return &b
-}
-
 // boolDefault returns the value of a *bool pointer, or the given default if nil.
 func boolDefault(p *bool, def bool) bool {
 	if p != nil {
@@ -102,12 +115,13 @@ type CommonRestoreOptions struct {
 
 // RestoreOptions is the typed representation of RestoreJob.Spec.Options for the
 // Velero driver. The struct is deserialized from runtime.RawExtension and used
-// for all application kinds. VMInstance-specific fields (KeepOriginalPVC,
-// KeepOriginalIpAndMac) are only effective when the application kind is VMInstance.
+// for all application kinds. KeepOriginalPVC applies to VMInstance and VMDisk
+// targets; KeepOriginalIpAndMac only to VMInstance.
 type RestoreOptions struct {
 	CommonRestoreOptions `json:",inline"`
-	// KeepOriginalPVC renames the original PVC to <name>-orig-<hash> before restore.
-	// Only effective for in-place VMInstance restore (no targetNamespace). Defaults to true when omitted.
+	// KeepOriginalPVC renames the original PVC to <name>-orig-<hash> before restore;
+	// when false, the original PVC is deleted so that Velero recreates it.
+	// Only effective for an in-place VMInstance or VMDisk restore (no targetNamespace). Defaults to true when omitted.
 	KeepOriginalPVC *bool `json:"keepOriginalPVC,omitempty"`
 	// KeepOriginalIpAndMac preserves the original IP and MAC address via OVN
 	// annotations. Only effective for VMInstance restores. Defaults to true when omitted.
@@ -179,13 +193,13 @@ func resolveRestoreTarget(restoreJob *backupsv1alpha1.RestoreJob, backup *backup
 // vmInstanceResources contains VM-specific underlying resources discovered during backup.
 type vmInstanceResources struct {
 	DataVolumes []backupsv1alpha1.DataVolumeResource `json:"dataVolumes,omitempty"`
-	IP          string                                `json:"ip,omitempty"`
-	MAC         string                                `json:"mac,omitempty"`
+	IP          string                               `json:"ip,omitempty"`
+	MAC         string                               `json:"mac,omitempty"`
 }
 
 // marshalUnderlyingResources serializes application-specific data into a
 // runtime.RawExtension suitable for Backup.Status.UnderlyingResources.
-func marshalUnderlyingResources(data interface{}) (*runtime.RawExtension, error) {
+func marshalUnderlyingResources(data any) (*runtime.RawExtension, error) {
 	raw, err := json.Marshal(data)
 	if err != nil {
 		return nil, err
@@ -359,14 +373,30 @@ func (r *BackupJobReconciler) reconcileVelero(ctx context.Context, j *backupsv1a
 // Returns nil if the application type has no underlying resources to collect.
 func (r *BackupJobReconciler) collectUnderlyingResources(ctx context.Context, app *unstructured.Unstructured, appKind, ns string) (*runtime.RawExtension, error) {
 	logger := getLogger(ctx)
+	appName := app.GetName()
+
+	// A standalone VMDisk is its own underlying disk. Capturing it lets the
+	// restore controller prepare it as it prepares a VMInstance's disks: keep
+	// the live PVC aside and delete the DataVolume, so the restored PVC is
+	// created fresh under the original name. The HelmRelease is suspended only
+	// until Velero restores it; Flux then recreates the DataVolume and CDI
+	// adopts the restored PVC through the allowClaimAdoption annotation the
+	// restore's resource modifiers set. A standalone VMDisk has no VM, so there
+	// is no IP/MAC to collect.
+	if appKind == vmDiskAppKind {
+		return marshalUnderlyingResources(vmInstanceResources{
+			DataVolumes: []backupsv1alpha1.DataVolumeResource{{
+				DataVolumeName:  vmDiskNamePrefix + appName,
+				ApplicationName: appName,
+			}},
+		})
+	}
 
 	if appKind != vmInstanceKind {
-		logger.Debug("application is not a VMInstance, skipping underlying resource collection", "kind", appKind)
+		logger.Debug("application has no underlying resources to collect", "kind", appKind)
 		return nil, nil
 	}
 
-	appName := app.GetName()
-
 	// Extract disk names from VMInstance spec.disks[].name
 	disks, found, err := unstructured.NestedSlice(app.Object, "spec", "disks")
 	if err != nil {
@@ -376,7 +406,7 @@ func (r *BackupJobReconciler) collectUnderlyingResources(ctx context.Context, ap
 	var dataVolumes []backupsv1alpha1.DataVolumeResource
 	if found {
 		for _, d := range disks {
-			disk, ok := d.(map[string]interface{})
+			disk, ok := d.(map[string]any)
 			if !ok {
 				continue
 			}
@@ -448,7 +478,7 @@ func (r *BackupJobReconciler) createVeleroBackup(ctx context.Context, backupJob
 		// Non-fatal: proceed with backup even if collection fails
 	}
 
-	templateContext := map[string]interface{}{
+	templateContext := map[string]any{
 		"Application": app.Object,
 		"Parameters":  resolved.Parameters,
 	}
@@ -458,8 +488,11 @@ func (r *BackupJobReconciler) createVeleroBackup(ctx context.Context, backupJob
 		return err
 	}
 
-	// Add label selectors for underlying VMDisk HelmReleases
-	if vmRes := getVMInstanceResources(underlyingResources); vmRes != nil {
+	// Add label selectors for a VMInstance's VMDisk HelmReleases. A VMDisk's own
+	// strategy already selects the disk, and Velero rejects a spec that carries
+	// both labelSelector and orLabelSelectors, so a VMDisk strategy written with
+	// labelSelector must be left as it is.
+	if vmRes := getVMInstanceResources(underlyingResources); vmRes != nil && backupJob.Spec.ApplicationRef.Kind == vmInstanceKind {
 		for _, dv := range vmRes.DataVolumes {
 			veleroBackupSpec.OrLabelSelectors = append(veleroBackupSpec.OrLabelSelectors, &metav1.LabelSelector{
 				MatchLabels: map[string]string{
@@ -606,6 +639,27 @@ func (r *RestoreJobReconciler) reconcileVeleroRestore(ctx context.Context, resto
 				"Use options.targetNamespace to restore into a different namespace")
 	}
 
+	// Validate: rename is only implemented for VMInstance. Failing here beats a
+	// Succeeded RestoreJob whose application silently keeps the source name.
+	if target.IsRenamed && !veleroRenameSupported(backup.Spec.ApplicationRef.Kind) {
+		msg := fmt.Sprintf(
+			"restoring %s %q under a different name (%q) is not supported by the Velero strategy: "+
+				"Velero DataUpload always restores volumes under their original names and only a VMInstance "+
+				"can adopt them. Omit targetApplicationRef.name to keep the source name",
+			backup.Spec.ApplicationRef.Kind, backup.Spec.ApplicationRef.Name, target.AppName)
+		if backup.Spec.ApplicationRef.Kind != vmDiskAppKind {
+			msg += ", or use the application's engine-native strategy to restore into a new application"
+		}
+		if restoreJob.Status.StartedAt != nil {
+			// The job predates this check: its Velero Restore may already have
+			// restored the application under the source name.
+			r.cleanupResourceModifierConfigMaps(ctx, restoreJob)
+			msg += fmt.Sprintf(". This RestoreJob was already running, so %q may have been restored into namespace %q under its source name",
+				backup.Spec.ApplicationRef.Name, target.Namespace)
+		}
+		return r.markRestoreJobFailed(ctx, restoreJob, msg)
+	}
+
 	// Step 1: On first reconcile, set startedAt and phase = Running
 	if restoreJob.Status.StartedAt == nil {
 		logger.Debug("setting RestoreJob StartedAt and phase to Running")
@@ -673,15 +727,42 @@ func (r *RestoreJobReconciler) reconcileVeleroRestore(ctx context.Context, resto
 			}
 		}
 
+		// The Backup artifact outlives the Velero Backup it points to, which
+		// Velero garbage-collects once its TTL expires. Checked on every pass
+		// before prepareForRestore halts the application and deletes its disks,
+		// so a restore that cannot run leaves them in place, or, when preparation
+		// already started, names what it left behind.
+		veleroBackup, unrestorable, err := r.veleroBackupForRestore(ctx, veleroBackupName)
+		if err != nil {
+			return ctrl.Result{}, err
+		}
+
 		// Resolve underlying resources once; prefer Backup status, fall back to Velero annotation.
-		ur := r.resolveUnderlyingResourcesForRestore(ctx, backup, veleroBackupName)
+		ur := resolveUnderlyingResourcesForRestore(backup, veleroBackup)
+
+		// Preparation spans several passes. Once it has changed the target, a
+		// failure must name what it left behind instead of claiming nothing changed.
+		failBeforeRestore := func(msg string) (ctrl.Result, error) {
+			if meta.IsStatusConditionTrue(restoreJob.Status.Conditions, restoreCondPreparationStarted) {
+				return r.markPreparedRestoreFailed(ctx, restoreJob, msg+r.preparedRestoreLeftovers(ctx, restoreJob, backup, ur, target, restoreOpts))
+			}
+			return r.markRestoreJobFailed(ctx, restoreJob, msg+"; nothing was changed")
+		}
+
+		if unrestorable != "" {
+			return failBeforeRestore(unrestorable)
+		}
 
 		// Pre-restore: graceful shutdown, suspend HRs, rename PVCs (skipped for copy)
 		ready, result, err := r.prepareForRestore(ctx, restoreJob, backup, ur, target, restoreOpts)
 		if err != nil {
-			return r.markRestoreJobFailed(ctx, restoreJob, fmt.Sprintf("pre-restore preparation failed: %v", err))
+			return failBeforeRestore(fmt.Sprintf("pre-restore preparation failed: %v", err))
 		}
 		if !ready {
+			if cond := meta.FindStatusCondition(restoreJob.Status.Conditions, restoreCondPreparationStarted); cond != nil &&
+				cond.Status == metav1.ConditionTrue && time.Since(cond.LastTransitionTime.Time) > restorePreparationDeadline {
+				return failBeforeRestore(fmt.Sprintf("pre-restore preparation did not finish within %s; see the RestoreJob events for what it was waiting on", restorePreparationDeadline))
+			}
 			logger.Debug("pre-restore preparation in progress, requeuing")
 			return result, nil
 		}
@@ -690,7 +771,8 @@ func (r *RestoreJobReconciler) reconcileVeleroRestore(ctx context.Context, resto
 		logger.Debug("Velero Restore not found, creating new one")
 		if err := r.createVeleroRestore(ctx, restoreJob, backup, veleroStrategy, veleroBackupName, ur, target, restoreOpts); err != nil {
 			logger.Error(err, "failed to create Velero Restore")
-			return r.markRestoreJobFailed(ctx, restoreJob, fmt.Sprintf("failed to create Velero Restore: %v", err))
+			return r.markPreparedRestoreFailed(ctx, restoreJob, fmt.Sprintf("failed to create Velero Restore: %v", err)+
+				r.preparedRestoreLeftovers(ctx, restoreJob, backup, ur, target, restoreOpts))
 		}
 		logger.Debug("created Velero Restore, requeuing")
 		// Requeue to check status
@@ -699,7 +781,8 @@ func (r *RestoreJobReconciler) reconcileVeleroRestore(ctx context.Context, resto
 
 	if len(veleroRestoreList.Items) > 1 {
 		logger.Error(fmt.Errorf("too many Velero restores for RestoreJob"), "found more than one Velero Restore referencing a single RestoreJob as owner")
-		return r.markRestoreJobFailed(ctx, restoreJob, "found multiple Velero Restores for this RestoreJob")
+		return r.markPreparedRestoreFailed(ctx, restoreJob, "found multiple Velero Restores for this RestoreJob"+
+			r.preparedRestoreLeftovers(ctx, restoreJob, backup, r.restoredUnderlyingResources(ctx, backup, veleroBackupName), target, restoreOpts))
 	}
 
 	veleroRestore := veleroRestoreList.Items[0].DeepCopy()
@@ -737,14 +820,21 @@ func (r *RestoreJobReconciler) reconcileVeleroRestore(ctx context.Context, resto
 		return ctrl.Result{}, nil
 	}
 
-	// Step 5: On failure
-	if phase == "Failed" || phase == "PartiallyFailed" {
+	// Step 5: On failure. FailedValidation is terminal too; left to the polling
+	// branch below it would keep a target that preparation already took apart
+	// Running forever.
+	if phase == string(velerov1.RestorePhaseFailed) || phase == string(velerov1.RestorePhasePartiallyFailed) ||
+		phase == string(velerov1.RestorePhaseFailedValidation) {
 		r.cleanupResourceModifierConfigMaps(ctx, restoreJob)
 		message := fmt.Sprintf("Velero Restore failed with phase: %s", phase)
 		if veleroRestore.Status.FailureReason != "" {
 			message = fmt.Sprintf("%s: %s", message, veleroRestore.Status.FailureReason)
 		}
-		return r.markRestoreJobFailed(ctx, restoreJob, message)
+		if len(veleroRestore.Status.ValidationErrors) > 0 {
+			message = fmt.Sprintf("%s: %s", message, strings.Join(veleroRestore.Status.ValidationErrors, "; "))
+		}
+		return r.markPreparedRestoreFailed(ctx, restoreJob, message+
+			r.preparedRestoreLeftovers(ctx, restoreJob, backup, r.restoredUnderlyingResources(ctx, backup, veleroBackupName), target, restoreOpts))
 	}
 
 	// Still in progress (InProgress, New, etc.)
@@ -782,7 +872,7 @@ type jsonPatch struct {
 
 // marshalPatchData marshals an arbitrary object to YAML for use as
 // mergePatch.PatchData in Velero resource modifiers.
-func marshalPatchData(v interface{}) (string, error) {
+func marshalPatchData(v any) (string, error) {
 	b, err := yaml.Marshal(v)
 	if err != nil {
 		return "", fmt.Errorf("failed to marshal patch data: %w", err)
@@ -803,8 +893,8 @@ func (r *RestoreJobReconciler) createResourceModifiersConfigMap(ctx context.Cont
 	var rules []resourceModifierRule
 
 	// PVC adoption: allow CDI to adopt restored PVCs when the HelmRelease recreates a DV.
-	pvcPatch, err := marshalPatchData(map[string]interface{}{
-		"metadata": map[string]interface{}{
+	pvcPatch, err := marshalPatchData(map[string]any{
+		"metadata": map[string]any{
 			"annotations": map[string]string{
 				cdiAllowClaimAdoption: "true",
 			},
@@ -829,8 +919,8 @@ func (r *RestoreJobReconciler) createResourceModifiersConfigMap(ctx context.Cont
 	// Uses merge patch (null values) instead of JSON Patch remove to avoid RFC 6902
 	// failures when the fields don't exist on the PVC (e.g. statically provisioned PVCs).
 	if target.IsCopy {
-		pvcStripPatch, err := marshalPatchData(map[string]interface{}{
-			"spec": map[string]interface{}{
+		pvcStripPatch, err := marshalPatchData(map[string]any{
+			"spec": map[string]any{
 				"selector":   nil,
 				"volumeName": nil,
 			},
@@ -860,10 +950,10 @@ func (r *RestoreJobReconciler) createResourceModifiersConfigMap(ctx context.Cont
 			if vmRes.MAC != "" {
 				ovnAnnotations[ovnMACAnnotation] = vmRes.MAC
 			}
-			vmPatch, err := marshalPatchData(map[string]interface{}{
-				"spec": map[string]interface{}{
-					"template": map[string]interface{}{
-						"metadata": map[string]interface{}{
+			vmPatch, err := marshalPatchData(map[string]any{
+				"spec": map[string]any{
+					"template": map[string]any{
+						"metadata": map[string]any{
 							"annotations": ovnAnnotations,
 						},
 					},
@@ -936,14 +1026,10 @@ func (r *RestoreJobReconciler) createResourceModifiersConfigMap(ctx context.Cont
 // resolveUnderlyingResourcesForRestore returns underlying resources for symmetric
 // restore label selectors. Velero Backup annotation is used when Backup.status was empty
 // (e.g. CRD without underlyingResources in schema).
-func (r *RestoreJobReconciler) resolveUnderlyingResourcesForRestore(ctx context.Context, backup *backupsv1alpha1.Backup, veleroBackupName string) *runtime.RawExtension {
+func resolveUnderlyingResourcesForRestore(backup *backupsv1alpha1.Backup, vb *velerov1.Backup) *runtime.RawExtension {
 	if backup.Status.UnderlyingResources != nil && len(backup.Status.UnderlyingResources.Raw) > 0 {
 		return backup.Status.UnderlyingResources
 	}
-	vb := &velerov1.Backup{}
-	if err := r.Get(ctx, client.ObjectKey{Namespace: veleroNamespace, Name: veleroBackupName}, vb); err != nil {
-		return backup.Status.UnderlyingResources
-	}
 	if urJSON, ok := vb.Annotations[underlyingResourcesAnnotation]; ok && urJSON != "" {
 		return &runtime.RawExtension{Raw: []byte(urJSON)}
 	}
@@ -958,6 +1044,16 @@ var (
 	dataVolumeGVR     = schema.GroupVersionResource{Group: "cdi.kubevirt.io", Version: "v1beta1", Resource: "datavolumes"}
 )
 
+// veleroRenameSupported reports whether postRestoreRename can restore the
+// given application kind under a new name. Velero DataUpload writes volumes
+// under their original names, and only a VMInstance re-attaches them after its
+// HelmRelease is renamed: its disks keep their names and CDI adopts the restored
+// PVCs. Every other kind (a standalone VMDisk, a database operator's Cluster)
+// renders fresh volumes for the new name and comes up empty.
+func veleroRenameSupported(appKind string) bool {
+	return appKind == vmInstanceKind
+}
+
 // helmReleaseNameForApp returns the HelmRelease name for the given application
 // kind and name. Returns empty string for unsupported kinds.
 func helmReleaseNameForApp(appKind, appName string) string {
@@ -1002,8 +1098,13 @@ func shortHash(input string) string {
 //  5. Renames existing PVCs to <name>-orig-<hash> so Velero can create fresh
 //     ones via Data Movement.
 //
-// Failures in individual steps are non-fatal: missing resources are expected
-// (e.g. restore requested when app was already deleted). Each action emits
+// Missing resources are expected (e.g. restore requested when app was already
+// deleted), and a failure to suspend or halt is non-fatal. A failed rename
+// holds the restore back and is retried, since the DataVolume deletion after
+// it would hand a disk that was not kept to the restore, as
+// keepOriginalPVC=false does, and an -orig name another PVC holds fails the
+// restore. A DataVolume or a replaced PVC that cannot be deleted fails the
+// restore, since Velero would skip the claim left in place. Each action emits
 // a Kubernetes Event on the RestoreJob for observability.
 //
 // postRestoreRename renames VMInstance HelmRelease after Velero Restore completes.
@@ -1094,9 +1195,76 @@ func (r *RestoreJobReconciler) prepareForRestore(ctx context.Context, restoreJob
 	appName := backup.Spec.ApplicationRef.Name
 	appKind := backup.Spec.ApplicationRef.Kind
 	origSuffix := "-orig-" + shortHash(restoreJob.Name)
+	vmRes := restoreDisks(backup, ur)
+
+	// A VMInstance is halted below, which releases its disks; a VMDisk target is
+	// not. Renaming a PVC that a running VM still mounts leaves the original
+	// Terminating behind pvc-protection, and Velero skips restoring a PVC that
+	// still exists, so the restore would report success having moved nothing
+	// while the VM loses its disk on the next restart. Refuse before changing
+	// anything.
+	if appKind != vmInstanceKind && vmRes != nil {
+		inUse, leaving, err := r.podsMountingDisks(ctx, ns, vmRes.DataVolumes)
+		if err != nil {
+			r.Recorder.Event(restoreJob, corev1.EventTypeWarning, "PrepareForRestore",
+				fmt.Sprintf("Failed to check whether the disk is in use: %v", err))
+			return false, ctrl.Result{RequeueAfter: defaultRestoreRequeueAfter}, nil
+		}
+		if len(inUse) > 0 {
+			return false, ctrl.Result{}, fmt.Errorf(
+				"the disk is in use by %s; stop the VM that uses it, or restore that VMInstance instead, then create a new RestoreJob",
+				strings.Join(inUse, ", "))
+		}
+		if len(leaving) > 0 {
+			// Not covered by the preparation deadline, which starts once
+			// preparation changes the target; a Pod stuck terminating on a lost
+			// node would otherwise keep the job Running forever.
+			if started := restoreJob.Status.StartedAt; started != nil && time.Since(started.Time) > restorePreparationDeadline {
+				return false, ctrl.Result{}, fmt.Errorf("%s still held the disk %s after the RestoreJob started",
+					strings.Join(leaving, ", "), restorePreparationDeadline)
+			}
+			r.Recorder.Event(restoreJob, corev1.EventTypeNormal, "PrepareForRestore",
+				fmt.Sprintf("Waiting for %s to release the disk", strings.Join(leaving, ", ")))
+			return false, ctrl.Result{RequeueAfter: defaultRestoreRequeueAfter}, nil
+		}
+	}
+
+	// Refuse a taken -orig name before anything is halted or deleted, rather
+	// than fail halfway through a multi-disk rename.
+	if opts.GetKeepOriginalPVC() && vmRes != nil {
+		for _, dv := range vmRes.DataVolumes {
+			origPVC, err := r.getOrigPVC(ctx, ns, dv.DataVolumeName+origSuffix)
+			if err != nil {
+				r.Recorder.Event(restoreJob, corev1.EventTypeWarning, "PrepareForRestore",
+					fmt.Sprintf("Failed to check PVC %s: %v", dv.DataVolumeName+origSuffix, err))
+				return false, ctrl.Result{RequeueAfter: defaultRestoreRequeueAfter}, nil
+			}
+			if err := foreignOrigPVC(origPVC, restoreJob); err != nil {
+				return false, ctrl.Result{}, err
+			}
+		}
+	}
+
+	if !meta.IsStatusConditionTrue(restoreJob.Status.Conditions, restoreCondPreparationStarted) {
+		before := restoreJob.DeepCopy()
+		meta.SetStatusCondition(&restoreJob.Status.Conditions, metav1.Condition{
+			Type:    restoreCondPreparationStarted,
+			Status:  metav1.ConditionTrue,
+			Reason:  "Preparing",
+			Message: "suspending the target's HelmReleases and keeping its disks aside",
+		})
+		// Nothing has been changed yet: on a failed patch drop the in-memory
+		// condition and retry, or the failure path would report leftovers that
+		// preparation never made.
+		if err := r.Status().Patch(ctx, restoreJob, client.MergeFrom(before)); err != nil {
+			restoreJob.Status.Conditions = before.Status.Conditions
+			r.Recorder.Event(restoreJob, corev1.EventTypeWarning, "PrepareForRestore",
+				fmt.Sprintf("Failed to record that preparation started: %v", err))
+			return false, ctrl.Result{RequeueAfter: defaultRestoreRequeueAfter}, nil
+		}
+	}
 
 	// --- Step 1: Suspend HelmReleases ---
-	vmRes := getVMInstanceResources(ur)
 	hrNames := []string{}
 	if appKind == vmInstanceKind {
 		hrNames = append(hrNames, vmNamePrefix+appName)
@@ -1106,24 +1274,28 @@ func (r *RestoreJobReconciler) prepareForRestore(ctx context.Context, restoreJob
 			hrNames = append(hrNames, dv.DataVolumeName)
 		}
 	}
+	// A HelmRelease left running would have Flux and CDI recreate the
+	// DataVolume and PVC under the data mover, so a failed suspend stops here.
 	for _, hrName := range hrNames {
 		if err := r.suspendHelmRelease(ctx, ns, hrName); err != nil {
 			r.Recorder.Event(restoreJob, corev1.EventTypeWarning, "PrepareForRestore",
 				fmt.Sprintf("Failed to suspend HelmRelease %s: %v", hrName, err))
-		} else {
-			r.Recorder.Event(restoreJob, corev1.EventTypeNormal, "PrepareForRestore",
-				fmt.Sprintf("Suspended HelmRelease %s", hrName))
+			return false, ctrl.Result{RequeueAfter: defaultRestoreRequeueAfter}, nil
 		}
+		r.Recorder.Event(restoreJob, corev1.EventTypeNormal, "PrepareForRestore",
+			fmt.Sprintf("Suspended HelmRelease %s", hrName))
 	}
 
 	// --- Step 2: Halt VM and wait for shutdown ---
 	if appKind == vmInstanceKind {
 		vmName := vmNamePrefix + appName
+		// haltVirtualMachine reports a missing VM as halted, so an error here is
+		// a VM that may still be running on the disks.
 		halted, err := r.haltVirtualMachine(ctx, ns, vmName)
 		if err != nil {
 			r.Recorder.Event(restoreJob, corev1.EventTypeWarning, "PrepareForRestore",
 				fmt.Sprintf("Failed to halt VM %s: %v", vmName, err))
-			// Non-fatal: proceed even if halting fails (VM might not exist)
+			return false, ctrl.Result{RequeueAfter: defaultRestoreRequeueAfter}, nil
 		} else if !halted {
 			r.Recorder.Event(restoreJob, corev1.EventTypeNormal, "PrepareForRestore",
 				fmt.Sprintf("Waiting for VM %s to shut down", vmName))
@@ -1132,6 +1304,21 @@ func (r *RestoreJobReconciler) prepareForRestore(ctx context.Context, restoreJob
 			r.Recorder.Event(restoreJob, corev1.EventTypeNormal, "PrepareForRestore",
 				fmt.Sprintf("VM %s is halted", vmName))
 		}
+		// The VMI is gone before its launcher Pod is; renaming a PVC that Pod still
+		// mounts would leave it Terminating behind pvc-protection.
+		if vmRes != nil {
+			inUse, leaving, err := r.podsMountingDisks(ctx, ns, vmRes.DataVolumes)
+			if err != nil {
+				r.Recorder.Event(restoreJob, corev1.EventTypeWarning, "PrepareForRestore",
+					fmt.Sprintf("Failed to check whether the disks are in use: %v", err))
+				return false, ctrl.Result{RequeueAfter: defaultRestoreRequeueAfter}, nil
+			}
+			if holders := append(inUse, leaving...); len(holders) > 0 {
+				r.Recorder.Event(restoreJob, corev1.EventTypeNormal, "PrepareForRestore",
+					fmt.Sprintf("Waiting for %s to release the disks", strings.Join(holders, ", ")))
+				return false, ctrl.Result{RequeueAfter: defaultRestoreRequeueAfter}, nil
+			}
+		}
 	}
 
 	// --- Step 3: Rename PVCs to <name>-orig-<hash> ---
@@ -1143,19 +1330,77 @@ func (r *RestoreJobReconciler) prepareForRestore(ctx context.Context, restoreJob
 			if err := r.renamePVC(ctx, restoreJob, ns, dv.DataVolumeName, dv.DataVolumeName+origSuffix); err != nil {
 				r.Recorder.Event(restoreJob, corev1.EventTypeWarning, "PrepareForRestore",
 					fmt.Sprintf("Failed to keep old PVC %s: %v", dv.DataVolumeName, err))
+				return false, ctrl.Result{RequeueAfter: defaultRestoreRequeueAfter}, nil
 			}
 		}
 	}
 
 	// --- Step 4: Delete DataVolumes so CDI doesn't recreate PVCs ---
+	// A DataVolume still present makes CDI recreate its claim under the original
+	// name, which Velero then skips as an existing PVC: the restore would end
+	// Succeeded on a freshly imported disk, so nothing goes further until every
+	// DataVolume is gone.
 	if vmRes != nil {
+		var terminating []string
+		for _, dv := range vmRes.DataVolumes {
+			gone, err := r.deleteDataVolume(ctx, ns, dv.DataVolumeName)
+			if err != nil {
+				return false, ctrl.Result{}, fmt.Errorf("failed to delete DataVolume %s: %w", dv.DataVolumeName, err)
+			}
+			if !gone {
+				terminating = append(terminating, dv.DataVolumeName)
+				continue
+			}
+			r.Recorder.Event(restoreJob, corev1.EventTypeNormal, "PrepareForRestore",
+				fmt.Sprintf("Deleted DataVolume %s", dv.DataVolumeName))
+		}
+		if len(terminating) > 0 {
+			r.Recorder.Event(restoreJob, corev1.EventTypeNormal, "PrepareForRestore",
+				fmt.Sprintf("Waiting for DataVolumes %s to be deleted", strings.Join(terminating, ", ")))
+			return false, ctrl.Result{RequeueAfter: defaultRestoreRequeueAfter}, nil
+		}
+	}
+
+	// --- Step 5: Delete the PVCs a restore without keepOriginalPVC replaces ---
+	// Velero restores a PVC only by creating it: its CSI restore action skips the
+	// data mover for a PVC that already exists, and existingResourcePolicy=update
+	// cannot patch the immutable spec of a bound claim. A PVC left in place keeps
+	// its old data, and, orphaned from its DataVolume in step 4 and without the
+	// cdi.kubevirt.io/storage.populatedFor the backed-up copy carries, it makes
+	// CDI refuse the DataVolume the resumed HelmRelease creates.
+	if !opts.GetKeepOriginalPVC() && vmRes != nil {
+		var terminating []string
 		for _, dv := range vmRes.DataVolumes {
-			if err := r.deleteDataVolume(ctx, ns, dv.DataVolumeName); err != nil {
+			gone, err := r.deletePVC(ctx, ns, dv.DataVolumeName)
+			if err != nil {
+				return false, ctrl.Result{}, fmt.Errorf("failed to delete PVC %s: %w", dv.DataVolumeName, err)
+			}
+			if !gone {
+				terminating = append(terminating, dv.DataVolumeName)
+			}
+		}
+		if len(terminating) > 0 {
+			r.Recorder.Event(restoreJob, corev1.EventTypeNormal, "PrepareForRestore",
+				fmt.Sprintf("Waiting for PVCs %s to be deleted", strings.Join(terminating, ", ")))
+			return false, ctrl.Result{RequeueAfter: defaultRestoreRequeueAfter}, nil
+		}
+	}
+
+	// --- Step 6: Clear a PVC CDI recreated under the original name ---
+	// Between the rename and the DataVolume delete, CDI can recreate an empty PVC
+	// for the still-present DataVolume. Velero skips restoring a PVC that exists,
+	// so the restore would report success and leave the disk blank. The original
+	// is kept under its -orig name by now, so a PVC under the original name is
+	// such a copy and holds no data.
+	if opts.GetKeepOriginalPVC() && vmRes != nil {
+		for _, dv := range vmRes.DataVolumes {
+			clear, err := r.clearRecreatedPVC(ctx, restoreJob, ns, dv.DataVolumeName)
+			if err != nil {
 				r.Recorder.Event(restoreJob, corev1.EventTypeWarning, "PrepareForRestore",
-					fmt.Sprintf("Failed to delete DataVolume %s: %v", dv.DataVolumeName, err))
-			} else {
-				r.Recorder.Event(restoreJob, corev1.EventTypeNormal, "PrepareForRestore",
-					fmt.Sprintf("Deleted DataVolume %s", dv.DataVolumeName))
+					fmt.Sprintf("Failed to clear PVC %s: %v", dv.DataVolumeName, err))
+			}
+			if err != nil || !clear {
+				return false, ctrl.Result{RequeueAfter: defaultRestoreRequeueAfter}, nil
 			}
 		}
 	}
@@ -1164,6 +1409,169 @@ func (r *RestoreJobReconciler) prepareForRestore(ctx context.Context, restoreJob
 	return true, ctrl.Result{}, nil
 }
 
+// clearRecreatedPVC reports whether the original name of a kept disk is free
+// for Velero to restore into, and deletes a PVC found under the name; the
+// caller requeues until it is gone. Step 4 has already waited for the
+// DataVolume to be gone, so CDI cannot recreate the PVC again.
+func (r *RestoreJobReconciler) clearRecreatedPVC(ctx context.Context, restoreJob *backupsv1alpha1.RestoreJob, ns, name string) (bool, error) {
+	// Uncached: the cache can still hold the original PVC the rename just deleted.
+	pvc := &corev1.PersistentVolumeClaim{}
+	if err := r.apiReader().Get(ctx, client.ObjectKey{Namespace: ns, Name: name}, pvc); err != nil {
+		if errors.IsNotFound(err) {
+			return true, nil
+		}
+		return false, err
+	}
+	if !pvc.DeletionTimestamp.IsZero() {
+		return false, nil
+	}
+	if err := r.Delete(ctx, pvc); err != nil && !errors.IsNotFound(err) {
+		return false, err
+	}
+	r.Recorder.Event(restoreJob, corev1.EventTypeNormal, "PrepareForRestore",
+		fmt.Sprintf("Deleted PVC %s that CDI recreated after the original was kept aside", name))
+	return false, nil
+}
+
+// markPreparedRestoreFailed fails a RestoreJob whose target was already
+// prepared, and repeats the message as a Warning event, since recovering the
+// target is left to the user.
+func (r *RestoreJobReconciler) markPreparedRestoreFailed(ctx context.Context, restoreJob *backupsv1alpha1.RestoreJob, message string) (ctrl.Result, error) {
+	r.Recorder.Event(restoreJob, corev1.EventTypeWarning, "RestoreFailed", message)
+	return r.markRestoreJobFailed(ctx, restoreJob, message)
+}
+
+// restoreDisks returns the disks an in-place restore prepares. A VMDisk Backup
+// taken before its underlying resources were recorded has none, but its only
+// disk is the VMDisk itself, named as collectUnderlyingResources names it.
+func restoreDisks(backup *backupsv1alpha1.Backup, ur *runtime.RawExtension) *vmInstanceResources {
+	if vmRes := getVMInstanceResources(ur); vmRes != nil {
+		return vmRes
+	}
+	if backup.Spec.ApplicationRef.Kind != vmDiskAppKind {
+		return nil
+	}
+	name := backup.Spec.ApplicationRef.Name
+	return &vmInstanceResources{DataVolumes: []backupsv1alpha1.DataVolumeResource{{
+		DataVolumeName:  vmDiskNamePrefix + name,
+		ApplicationName: name,
+	}}}
+}
+
+// preparedRestoreLeftovers describes, for the failure message of an in-place
+// restore that fails after prepareForRestore ran, what preparation left behind.
+// Nothing is rolled back automatically: resuming a disk's HelmRelease while its
+// PVC is renamed and its DataVolume deleted would have CDI import a fresh disk
+// under the original name, which looks healthy and hides that the data sits in
+// the -orig- PVC. Preparation can fail before it reaches every step, so only a
+// HelmRelease that is suspended and an -orig- PVC that exists are named; one
+// that cannot be read is named anyway rather than hidden.
+func (r *RestoreJobReconciler) preparedRestoreLeftovers(ctx context.Context, restoreJob *backupsv1alpha1.RestoreJob, backup *backupsv1alpha1.Backup, ur *runtime.RawExtension, target restoreTarget, opts RestoreOptions) string {
+	if target.IsCopy {
+		return ""
+	}
+	vmRes := restoreDisks(backup, ur)
+	var hrs, kept []string
+	if backup.Spec.ApplicationRef.Kind == vmInstanceKind {
+		hrs = append(hrs, vmNamePrefix+backup.Spec.ApplicationRef.Name)
+	}
+	if vmRes != nil {
+		for _, dv := range vmRes.DataVolumes {
+			hrs = append(hrs, dv.DataVolumeName)
+			if opts.GetKeepOriginalPVC() {
+				kept = append(kept, dv.DataVolumeName+"-orig-"+shortHash(restoreJob.Name))
+			}
+		}
+	}
+	ns := target.Namespace
+	hrs = slices.DeleteFunc(hrs, func(name string) bool {
+		hr, err := r.Resource(helmReleaseGVR).Namespace(ns).Get(ctx, name, metav1.GetOptions{})
+		if err != nil {
+			return errors.IsNotFound(err)
+		}
+		suspended, _, _ := unstructured.NestedBool(hr.Object, "spec", "suspend")
+		return !suspended
+	})
+	kept = slices.DeleteFunc(kept, func(name string) bool {
+		err := r.apiReader().Get(ctx, client.ObjectKey{Namespace: ns, Name: name}, &corev1.PersistentVolumeClaim{})
+		return errors.IsNotFound(err)
+	})
+	if len(hrs) == 0 && len(kept) == 0 {
+		return ""
+	}
+	var parts []string
+	if len(hrs) > 0 {
+		parts = append(parts, fmt.Sprintf("suspended HelmRelease %s", strings.Join(hrs, ", ")))
+	}
+	if len(kept) > 0 {
+		parts = append(parts, fmt.Sprintf("kept the original data in PVC %s", strings.Join(kept, ", ")))
+	}
+	return "; preparation " + strings.Join(parts, " and ") + "; if Velero restored the HelmRelease it is resumed and the disk may have been recreated, so check what the disk holds before relying on it"
+}
+
+// podsMountingDisks returns "pod/<pod> (PVC <claim>)" for every Pod in ns that
+// has not terminated and mounts one of the disks' PVCs, split into Pods that
+// are running and Pods already being deleted. A terminated Pod no longer holds
+// pvc-protection, so it does not count.
+func (r *RestoreJobReconciler) podsMountingDisks(ctx context.Context, ns string, disks []backupsv1alpha1.DataVolumeResource) (inUse, leaving []string, err error) {
+	claims := make(map[string]bool, len(disks))
+	for _, dv := range disks {
+		claims[dv.DataVolumeName] = true
+	}
+	pods := &corev1.PodList{}
+	if err := r.List(ctx, pods, client.InNamespace(ns)); err != nil {
+		return nil, nil, err
+	}
+	for i := range pods.Items {
+		pod := &pods.Items[i]
+		if pod.Status.Phase == corev1.PodSucceeded || pod.Status.Phase == corev1.PodFailed {
+			continue
+		}
+		for _, v := range pod.Spec.Volumes {
+			if v.PersistentVolumeClaim == nil || !claims[v.PersistentVolumeClaim.ClaimName] {
+				continue
+			}
+			holder := fmt.Sprintf("pod/%s (PVC %s)", pod.Name, v.PersistentVolumeClaim.ClaimName)
+			if pod.DeletionTimestamp.IsZero() {
+				inUse = append(inUse, holder)
+			} else {
+				leaving = append(leaving, holder)
+			}
+		}
+	}
+	sort.Strings(inUse)
+	sort.Strings(leaving)
+	return inUse, leaving, nil
+}
+
+// veleroBackupForRestore returns the named Velero Backup and why it cannot be
+// restored, or "" when it can. Only a Completed Backup is restored: Velero
+// itself validates only that the Backup exists and its storage location is
+// usable, so a Restore from one in another phase would take the target apart
+// for nothing. A Backup that is gone comes back empty rather than nil.
+func (r *RestoreJobReconciler) veleroBackupForRestore(ctx context.Context, name string) (*velerov1.Backup, string, error) {
+	vb := &velerov1.Backup{}
+	if err := r.Get(ctx, client.ObjectKey{Namespace: veleroNamespace, Name: name}, vb); err != nil {
+		if errors.IsNotFound(err) {
+			return &velerov1.Backup{}, fmt.Sprintf("Velero Backup %s/%s not found; it may have expired", veleroNamespace, name), nil
+		}
+		return nil, "", fmt.Errorf("failed to get Velero Backup %s: %w", name, err)
+	}
+	if vb.Status.Phase != velerov1.BackupPhaseCompleted {
+		return vb, fmt.Sprintf("Velero Backup %s/%s is %q, not %q", veleroNamespace, name, vb.Status.Phase, velerov1.BackupPhaseCompleted), nil
+	}
+	return vb, "", nil
+}
+
+// restoredUnderlyingResources resolves the underlying resources of a restore
+// whose Velero Restore already exists, for naming what preparation left
+// behind. A Velero Backup that cannot be read leaves the Backup status.
+func (r *RestoreJobReconciler) restoredUnderlyingResources(ctx context.Context, backup *backupsv1alpha1.Backup, name string) *runtime.RawExtension {
+	vb := &velerov1.Backup{}
+	_ = r.Get(ctx, client.ObjectKey{Namespace: veleroNamespace, Name: name}, vb)
+	return resolveUnderlyingResourcesForRestore(backup, vb)
+}
+
 // suspendHelmRelease sets spec.suspend=true on a HelmRelease.
 func (r *RestoreJobReconciler) suspendHelmRelease(ctx context.Context, ns, name string) error {
 	hr, err := r.Resource(helmReleaseGVR).Namespace(ns).Get(ctx, name, metav1.GetOptions{})
@@ -1217,102 +1625,202 @@ func (r *RestoreJobReconciler) haltVirtualMachine(ctx context.Context, ns, vmNam
 	return false, nil
 }
 
-// deleteDataVolume deletes a DataVolume so CDI doesn't recreate the PVC after rename.
-// Uses Orphan propagation to avoid cascade-deleting the PVC that the DV owns via
-// ownerReference. Without this, keepOriginalPVC=false would silently destroy the
-// original PVC through garbage collection instead of leaving it for Velero to overwrite.
-func (r *RestoreJobReconciler) deleteDataVolume(ctx context.Context, ns, name string) error {
-	orphan := metav1.DeletePropagationOrphan
-	err := r.Resource(dataVolumeGVR).Namespace(ns).Delete(ctx, name, metav1.DeleteOptions{
-		PropagationPolicy: &orphan,
-	})
-	if err != nil && !errors.IsNotFound(err) {
-		return err
+// deleteDataVolume deletes a DataVolume so CDI doesn't recreate the PVC after
+// rename, and reports whether it is gone. Orphan propagation holds the DV behind
+// the orphan finalizer until garbage collection has released its PVC, and leaves
+// that PVC to prepareForRestore, which waits for its deletion, rather than to
+// background garbage collection, which nothing waits for before the Velero
+// Restore starts.
+func (r *RestoreJobReconciler) deleteDataVolume(ctx context.Context, ns, name string) (bool, error) {
+	dvClient := r.Resource(dataVolumeGVR).Namespace(ns)
+	dv, err := dvClient.Get(ctx, name, metav1.GetOptions{})
+	if err != nil {
+		if errors.IsNotFound(err) {
+			return true, nil
+		}
+		return false, err
 	}
-	return nil
+	if dv.GetDeletionTimestamp() == nil {
+		orphan := metav1.DeletePropagationOrphan
+		err := dvClient.Delete(ctx, name, metav1.DeleteOptions{PropagationPolicy: &orphan})
+		if err != nil && !errors.IsNotFound(err) {
+			return false, err
+		}
+	}
+	if _, err := dvClient.Get(ctx, name, metav1.GetOptions{}); err != nil {
+		if errors.IsNotFound(err) {
+			return true, nil
+		}
+		return false, err
+	}
+	return false, nil
+}
+
+// getOrigPVC returns the PVC named name, or nil when there is none. It reads
+// past the cache: a retried rename must see the -orig PVC it created, not
+// take the name for free and fail to create it again.
+func (r *RestoreJobReconciler) getOrigPVC(ctx context.Context, ns, name string) (*corev1.PersistentVolumeClaim, error) {
+	pvc := &corev1.PersistentVolumeClaim{}
+	if err := r.apiReader().Get(ctx, client.ObjectKey{Namespace: ns, Name: name}, pvc); err != nil {
+		return nil, client.IgnoreNotFound(err)
+	}
+	return pvc, nil
+}
+
+// foreignOrigPVC fails when pvc exists and restoreJob did not create it.
+// Proceeding would hand the live disk to the restore under its own name, as
+// keepOriginalPVC=false does, while the -orig name holds some other disk.
+func foreignOrigPVC(pvc *corev1.PersistentVolumeClaim, restoreJob *backupsv1alpha1.RestoreJob) error {
+	if pvc == nil || pvc.Annotations[origPVCRestoreJobUIDAnnotation] == string(restoreJob.UID) {
+		return nil
+	}
+	return fmt.Errorf("PVC %s/%s already exists and was not created by this RestoreJob, so the current disk cannot be kept under that name: "+
+		"remove that PVC or create the RestoreJob under another name", pvc.Namespace, pvc.Name)
+}
+
+// deletePVC deletes a PVC and reports whether it is gone. A claim still mounted
+// stays Terminating behind kubernetes.io/pvc-protection, and Velero would find
+// it still there.
+func (r *RestoreJobReconciler) deletePVC(ctx context.Context, ns, name string) (bool, error) {
+	key := client.ObjectKey{Namespace: ns, Name: name}
+	pvc := &corev1.PersistentVolumeClaim{}
+	if err := r.Get(ctx, key, pvc); err != nil {
+		if errors.IsNotFound(err) {
+			return true, nil
+		}
+		return false, err
+	}
+	if pvc.DeletionTimestamp == nil {
+		if err := r.Delete(ctx, pvc); err != nil && !errors.IsNotFound(err) {
+			return false, err
+		}
+	}
+	if err := r.Get(ctx, key, pvc); err != nil {
+		if errors.IsNotFound(err) {
+			return true, nil
+		}
+		return false, err
+	}
+	return false, nil
 }
 
 // renamePVC preserves an existing PVC by rebinding it under a new name.
 // The original PVC is deleted and a new one pointing to the same PV is created.
-// Missing resources are silently skipped (non-fatal).
+// Missing resources are silently skipped (non-fatal). Each step can be
+// resumed, so a rename interrupted by a controller restart completes on the
+// next reconcile.
 func (r *RestoreJobReconciler) renamePVC(ctx context.Context, restoreJob *backupsv1alpha1.RestoreJob, ns, oldName, newName string) error {
 	logger := getLogger(ctx)
 
-	// Check if already renamed
-	existingNew := &corev1.PersistentVolumeClaim{}
-	if err := r.Get(ctx, client.ObjectKey{Namespace: ns, Name: newName}, existingNew); err == nil {
-		return nil
+	newPVC, err := r.getOrigPVC(ctx, ns, newName)
+	if err != nil {
+		return err
+	}
+	if err := foreignOrigPVC(newPVC, restoreJob); err != nil {
+		return err
 	}
+	resuming := newPVC != nil
 
-	// Get the original PVC
 	oldPVC := &corev1.PersistentVolumeClaim{}
-	if err := r.Get(ctx, client.ObjectKey{Namespace: ns, Name: oldName}, oldPVC); err != nil {
-		if errors.IsNotFound(err) {
-			return nil // nothing to rename
+	if err := r.apiReader().Get(ctx, client.ObjectKey{Namespace: ns, Name: oldName}, oldPVC); err != nil {
+		if !errors.IsNotFound(err) {
+			return err
 		}
-		return err
+		oldPVC = nil
 	}
 
-	pvName := oldPVC.Spec.VolumeName
-	if pvName == "" {
+	pv := &corev1.PersistentVolume{}
+	var pvName string
+	switch {
+	case resuming:
+		pvName = newPVC.Spec.VolumeName
+	case oldPVC == nil:
+		return nil // nothing to rename
+	case oldPVC.Spec.VolumeName == "":
 		logger.Debug("PVC not bound, deleting", "name", oldName)
 		return r.Delete(ctx, oldPVC)
-	}
+	default:
+		pvName = oldPVC.Spec.VolumeName
 
-	// Patch PV reclaim policy to Retain so it survives PVC deletion
-	pv := &corev1.PersistentVolume{}
-	if err := r.Get(ctx, client.ObjectKey{Name: pvName}, pv); err != nil {
-		return fmt.Errorf("failed to get PV %s: %w", pvName, err)
-	}
-	if pv.Spec.PersistentVolumeReclaimPolicy != corev1.PersistentVolumeReclaimRetain {
-		pv.Spec.PersistentVolumeReclaimPolicy = corev1.PersistentVolumeReclaimRetain
-		if err := r.Update(ctx, pv); err != nil {
-			return fmt.Errorf("failed to set Retain policy on PV %s: %w", pvName, err)
+		// Patch PV reclaim policy to Retain so it survives PVC deletion.
+		// A policy already recorded is the one from before any rename.
+		if err := r.apiReader().Get(ctx, client.ObjectKey{Name: pvName}, pv); err != nil {
+			return fmt.Errorf("failed to get PV %s: %w", pvName, err)
+		}
+		originalPolicy, recorded := pv.Annotations[originalReclaimPolicyAnnotation]
+		if !recorded {
+			originalPolicy = string(pv.Spec.PersistentVolumeReclaimPolicy)
+			metav1.SetMetaDataAnnotation(&pv.ObjectMeta, originalReclaimPolicyAnnotation, originalPolicy)
+		}
+		if !recorded || pv.Spec.PersistentVolumeReclaimPolicy != corev1.PersistentVolumeReclaimRetain {
+			pv.Spec.PersistentVolumeReclaimPolicy = corev1.PersistentVolumeReclaimRetain
+			if err := r.Update(ctx, pv); err != nil {
+				return fmt.Errorf("failed to set Retain policy on PV %s: %w", pvName, err)
+			}
 		}
-	}
 
-	// Create the new -orig PVC first (unbound, just the object)
-	newPVC := &corev1.PersistentVolumeClaim{
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      newName,
-			Namespace: ns,
-		},
-		Spec: corev1.PersistentVolumeClaimSpec{
-			AccessModes:      oldPVC.Spec.AccessModes,
-			Resources:        oldPVC.Spec.Resources,
-			StorageClassName: oldPVC.Spec.StorageClassName,
-			VolumeMode:       oldPVC.Spec.VolumeMode,
-			VolumeName:       pvName,
-		},
-	}
-	if err := r.Create(ctx, newPVC); err != nil && !errors.IsAlreadyExists(err) {
-		return fmt.Errorf("failed to create -orig PVC %s: %w", newName, err)
-	}
-	// Re-read to get UID for the claimRef
-	if err := r.Get(ctx, client.ObjectKey{Namespace: ns, Name: newName}, newPVC); err != nil {
-		return fmt.Errorf("failed to get -orig PVC %s: %w", newName, err)
+		// Create the new -orig PVC first (unbound, just the object)
+		newPVC = &corev1.PersistentVolumeClaim{
+			ObjectMeta: metav1.ObjectMeta{
+				Name:      newName,
+				Namespace: ns,
+				Annotations: map[string]string{
+					originalReclaimPolicyAnnotation: originalPolicy,
+					origPVCRestoreJobUIDAnnotation:  string(restoreJob.UID),
+				},
+			},
+			Spec: corev1.PersistentVolumeClaimSpec{
+				AccessModes:      oldPVC.Spec.AccessModes,
+				Resources:        oldPVC.Spec.Resources,
+				StorageClassName: oldPVC.Spec.StorageClassName,
+				VolumeMode:       oldPVC.Spec.VolumeMode,
+				VolumeName:       pvName,
+			},
+		}
+		// Create fills in the UID the claimRef needs. Reading the PVC back
+		// through the cache can miss it, as it is this reconcile's own write.
+		if err := r.Create(ctx, newPVC); err != nil {
+			return fmt.Errorf("failed to create -orig PVC %s: %w", newName, err)
+		}
 	}
 
-	// Delete the original PVC
-	if err := r.Delete(ctx, oldPVC); err != nil && !errors.IsNotFound(err) {
-		return fmt.Errorf("failed to delete PVC %s: %w", oldName, err)
+	// Delete the original PVC. Only while it still claims the kept PV: after
+	// an interrupted rename, CDI may have recreated an empty one under the old
+	// name, and that one is left to the restore.
+	if oldPVC != nil && oldPVC.Spec.VolumeName == pvName {
+		if err := r.Delete(ctx, oldPVC); err != nil && !errors.IsNotFound(err) {
+			return fmt.Errorf("failed to delete PVC %s: %w", oldName, err)
+		}
 	}
 
 	// Point the PV's claimRef directly to the new -orig PVC.
 	// This is atomic — no window where the PV is Available for other PVCs to grab.
-	if err := r.Get(ctx, client.ObjectKey{Name: pvName}, pv); err != nil {
-		return fmt.Errorf("failed to re-fetch PV %s: %w", pvName, err)
-	}
-	pv.Spec.ClaimRef = &corev1.ObjectReference{
-		APIVersion: "v1",
-		Kind:       "PersistentVolumeClaim",
-		Namespace:  ns,
-		Name:       newName,
-		UID:        newPVC.UID,
-	}
-	if err := r.Update(ctx, pv); err != nil {
+	// The PV controller writes the PV too once the original PVC is gone, so
+	// the read is uncached and a conflict is retried.
+	rebound := false
+	err = retry.RetryOnConflict(retry.DefaultRetry, func() error {
+		if err := r.apiReader().Get(ctx, client.ObjectKey{Name: pvName}, pv); err != nil {
+			return err
+		}
+		if ref := pv.Spec.ClaimRef; ref != nil && ref.Namespace == ns && ref.Name == newName && ref.UID == newPVC.UID {
+			return nil
+		}
+		pv.Spec.ClaimRef = &corev1.ObjectReference{
+			APIVersion: "v1",
+			Kind:       "PersistentVolumeClaim",
+			Namespace:  ns,
+			Name:       newName,
+			UID:        newPVC.UID,
+		}
+		rebound = true
+		return r.Update(ctx, pv)
+	})
+	if err != nil {
 		return fmt.Errorf("failed to rebind PV %s to %s: %w", pvName, newName, err)
 	}
+	if !rebound {
+		return nil
+	}
 
 	r.Recorder.Event(restoreJob, corev1.EventTypeNormal, "PrepareForRestore",
 		fmt.Sprintf("Keep old PVC %s as %s (PV: %s)", oldName, newName, pvName))
@@ -1330,9 +1838,9 @@ func (r *RestoreJobReconciler) createVeleroRestore(ctx context.Context, restoreJ
 	// and labeled with the source app name.
 	// Velero's namespaceMapping handles redirecting to the target namespace;
 	// resource modifiers handle renaming when the target app name differs.
-	templateContext := map[string]interface{}{
-		"Application": map[string]interface{}{
-			"metadata": map[string]interface{}{
+	templateContext := map[string]any{
+		"Application": map[string]any{
+			"metadata": map[string]any{
 				"name":      backup.Spec.ApplicationRef.Name,
 				"namespace": backup.Namespace,
 			},
@@ -1368,7 +1876,7 @@ func (r *RestoreJobReconciler) createVeleroRestore(ctx context.Context, restoreJ
 
 	// Match backup: add OR selectors for each underlying VMDisk so restore applies the same
 	// scope as the intended backup (see createVeleroBackup).
-	if vmRes := getVMInstanceResources(ur); vmRes != nil {
+	if vmRes := getVMInstanceResources(ur); vmRes != nil && backup.Spec.ApplicationRef.Kind == vmInstanceKind {
 		for _, dv := range vmRes.DataVolumes {
 			veleroRestoreSpec.OrLabelSelectors = append(veleroRestoreSpec.OrLabelSelectors, &metav1.LabelSelector{
 				MatchLabels: map[string]string{
@@ -1389,7 +1897,7 @@ func (r *RestoreJobReconciler) createVeleroRestore(ctx context.Context, restoreJ
 	}
 	if resourceModifierCM != nil {
 		veleroRestoreSpec.ResourceModifier = &corev1.TypedLocalObjectReference{
-			APIGroup: stringPtr(""),
+			APIGroup: new(""),
 			Kind:     "ConfigMap",
 			Name:     resourceModifierCM.Name,
 		}
diff --git a/internal/backupcontroller/velerostrategy_controller_test.go b/internal/backupcontroller/velerostrategy_controller_test.go
index 7b085dbfe4..7b3c4dd8ab 100644
--- a/internal/backupcontroller/velerostrategy_controller_test.go
+++ b/internal/backupcontroller/velerostrategy_controller_test.go
@@ -3,9 +3,12 @@ package backupcontroller
 import (
 	"context"
 	"encoding/json"
+	"reflect"
+	"strings"
 	"testing"
 
 	corev1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
@@ -13,9 +16,11 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	dynamicfake "k8s.io/client-go/dynamic/fake"
 	"k8s.io/client-go/kubernetes/scheme"
+	k8stesting "k8s.io/client-go/testing"
 	"k8s.io/client-go/tools/record"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	clientfake "sigs.k8s.io/controller-runtime/pkg/client/fake"
+	"sigs.k8s.io/controller-runtime/pkg/client/interceptor"
 
 	strategyv1alpha1 "github.com/cozystack/cozystack/api/backups/strategy/v1alpha1"
 	backupsv1alpha1 "github.com/cozystack/cozystack/api/backups/v1alpha1"
@@ -108,7 +113,7 @@ func TestCreateVeleroBackup_TemplateContext(t *testing.T) {
 		},
 		Spec: backupsv1alpha1.BackupJobSpec{
 			ApplicationRef: corev1.TypedLocalObjectReference{
-				APIGroup: stringPtr(""),
+				APIGroup: new(""),
 				Kind:     "Pod",
 				Name:     "test-vm",
 			},
@@ -140,7 +145,7 @@ func TestCreateVeleroBackup_TemplateContext(t *testing.T) {
 	// Create ResolvedBackupConfig with parameters
 	resolved := &ResolvedBackupConfig{
 		StrategyRef: corev1.TypedLocalObjectReference{
-			APIGroup: stringPtr("strategy.backups.cozystack.io"),
+			APIGroup: new("strategy.backups.cozystack.io"),
 			Kind:     "Velero",
 			Name:     "velero-strategy",
 		},
@@ -218,7 +223,7 @@ func TestResolveRestoreTarget_NoTargetNamespace_InPlace(t *testing.T) {
 		Spec: backupsv1alpha1.RestoreJobSpec{
 			BackupRef: corev1.LocalObjectReference{Name: "my-backup"},
 			TargetApplicationRef: &corev1.TypedLocalObjectReference{
-				APIGroup: stringPtr("apps.cozystack.io"),
+				APIGroup: new("apps.cozystack.io"),
 				Kind:     "VMInstance",
 				Name:     "test-vm",
 			},
@@ -232,7 +237,7 @@ func TestResolveRestoreTarget_NoTargetNamespace_InPlace(t *testing.T) {
 		},
 		Spec: backupsv1alpha1.BackupSpec{
 			ApplicationRef: corev1.TypedLocalObjectReference{
-				APIGroup: stringPtr("apps.cozystack.io"),
+				APIGroup: new("apps.cozystack.io"),
 				Kind:     "VMInstance",
 				Name:     "test-vm",
 			},
@@ -275,7 +280,7 @@ func TestResolveRestoreTarget_SameTargetNamespace_InPlace(t *testing.T) {
 		},
 		Spec: backupsv1alpha1.BackupSpec{
 			ApplicationRef: corev1.TypedLocalObjectReference{
-				APIGroup: stringPtr("apps.cozystack.io"),
+				APIGroup: new("apps.cozystack.io"),
 				Kind:     "VMInstance",
 				Name:     "test-vm",
 			},
@@ -316,7 +321,7 @@ func TestResolveRestoreTarget_DifferentTargetNamespace_Copy(t *testing.T) {
 		},
 		Spec: backupsv1alpha1.BackupSpec{
 			ApplicationRef: corev1.TypedLocalObjectReference{
-				APIGroup: stringPtr("apps.cozystack.io"),
+				APIGroup: new("apps.cozystack.io"),
 				Kind:     "VMInstance",
 				Name:     "test-vm",
 			},
@@ -351,6 +356,7 @@ func newTestRestoreJobReconcilerWithDynamic(t *testing.T, dynamicObjects []runti
 	fakeClient := clientfake.NewClientBuilder().
 		WithScheme(testScheme).
 		WithObjects(objects...).
+		WithStatusSubresource(&backupsv1alpha1.RestoreJob{}).
 		Build()
 
 	dynamicClient := dynamicfake.NewSimpleDynamicClient(testScheme, dynamicObjects...)
@@ -381,6 +387,7 @@ func newTestRestoreJobReconciler(t *testing.T, objects ...client.Object) *Restor
 	fakeClient := clientfake.NewClientBuilder().
 		WithScheme(testScheme).
 		WithObjects(objects...).
+		WithStatusSubresource(&backupsv1alpha1.RestoreJob{}).
 		Build()
 
 	dynamicClient := dynamicfake.NewSimpleDynamicClient(testScheme)
@@ -400,18 +407,9 @@ func newTestRestoreJobReconciler(t *testing.T, objects ...client.Object) *Restor
 	}
 }
 
-func TestPrepareForRestore_KeepOriginalPVCFalse_SkipsRename(t *testing.T) {
-	ns := "tenant-root"
-
-	// Create a PVC that would be renamed if keepOriginalPVC were true
-	pvc := &corev1.PersistentVolumeClaim{
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      "vm-disk-ubuntu-source",
-			Namespace: ns,
-		},
-		Spec: corev1.PersistentVolumeClaimSpec{},
-	}
-
+// inPlaceVMRestoreWithoutKeep is an in-place VMInstance restore of one disk,
+// vm-disk-ubuntu-source, with keepOriginalPVC=false.
+func inPlaceVMRestoreWithoutKeep(ns string) (*backupsv1alpha1.RestoreJob, *backupsv1alpha1.Backup, *runtime.RawExtension, restoreTarget, RestoreOptions) {
 	restoreJob := &backupsv1alpha1.RestoreJob{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      "restore-test",
@@ -429,21 +427,19 @@ func TestPrepareForRestore_KeepOriginalPVCFalse_SkipsRename(t *testing.T) {
 		},
 		Spec: backupsv1alpha1.BackupSpec{
 			ApplicationRef: corev1.TypedLocalObjectReference{
-				APIGroup: stringPtr("apps.cozystack.io"),
+				APIGroup: new("apps.cozystack.io"),
 				Kind:     "VMInstance",
 				Name:     "test-vm",
 			},
 		},
 	}
 
-	// underlyingResources with a DataVolume referencing the PVC
 	urData := vmInstanceResources{
 		DataVolumes: []backupsv1alpha1.DataVolumeResource{
 			{DataVolumeName: "vm-disk-ubuntu-source", ApplicationName: "ubuntu-source"},
 		},
 	}
 	urRaw, _ := json.Marshal(urData)
-	ur := &runtime.RawExtension{Raw: urRaw}
 
 	target := restoreTarget{
 		Namespace: ns,
@@ -452,9 +448,21 @@ func TestPrepareForRestore_KeepOriginalPVCFalse_SkipsRename(t *testing.T) {
 		IsCopy:    false,
 	}
 
-	// keepOriginalPVC = false → PVCs should NOT be renamed
-	opts := RestoreOptions{
-		KeepOriginalPVC: boolPtr(false),
+	return restoreJob, backup, &runtime.RawExtension{Raw: urRaw}, target, RestoreOptions{KeepOriginalPVC: new(false)}
+}
+
+// Velero only restores a PVC it creates: one still in place keeps its old data
+// and blocks the DataVolume the HelmRelease recreates.
+func TestPrepareForRestore_KeepOriginalPVCFalse_DeletesPVC(t *testing.T) {
+	ns := "tenant-root"
+	restoreJob, backup, ur, target, opts := inPlaceVMRestoreWithoutKeep(ns)
+
+	pvc := &corev1.PersistentVolumeClaim{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "vm-disk-ubuntu-source",
+			Namespace: ns,
+		},
+		Spec: corev1.PersistentVolumeClaimSpec{},
 	}
 
 	reconciler := newTestRestoreJobReconciler(t, pvc, restoreJob, backup)
@@ -468,28 +476,335 @@ func TestPrepareForRestore_KeepOriginalPVCFalse_SkipsRename(t *testing.T) {
 		t.Fatal("expected ready=true, got false")
 	}
 
-	// Verify the original PVC still exists with its original name (not renamed)
-	origPVC := &corev1.PersistentVolumeClaim{}
-	err = reconciler.Get(ctx, client.ObjectKey{Namespace: ns, Name: "vm-disk-ubuntu-source"}, origPVC)
-	if err != nil {
-		t.Errorf("original PVC should still exist with original name when keepOriginalPVC=false, got error: %v", err)
+	err = reconciler.Get(ctx, client.ObjectKey{Namespace: ns, Name: "vm-disk-ubuntu-source"}, &corev1.PersistentVolumeClaim{})
+	if !errors.IsNotFound(err) {
+		t.Errorf("original PVC should be gone before Velero restores it when keepOriginalPVC=false, got error: %v", err)
 	}
 
-	// Verify no -orig PVC was created
 	origSuffix := "-orig-" + shortHash(restoreJob.Name)
-	renamedPVC := &corev1.PersistentVolumeClaim{}
-	err = reconciler.Get(ctx, client.ObjectKey{Namespace: ns, Name: "vm-disk-ubuntu-source" + origSuffix}, renamedPVC)
+	err = reconciler.Get(ctx, client.ObjectKey{Namespace: ns, Name: "vm-disk-ubuntu-source" + origSuffix}, &corev1.PersistentVolumeClaim{})
 	if err == nil {
 		t.Error("PVC should NOT have been renamed when keepOriginalPVC=false, but found renamed PVC")
 	}
 }
 
+func TestPrepareForRestore_KeepOriginalPVCFalse_WaitsForTerminatingPVC(t *testing.T) {
+	ns := "tenant-root"
+	restoreJob, backup, ur, target, opts := inPlaceVMRestoreWithoutKeep(ns)
+
+	pvc := &corev1.PersistentVolumeClaim{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:       "vm-disk-ubuntu-source",
+			Namespace:  ns,
+			Finalizers: []string{"kubernetes.io/pvc-protection"},
+		},
+		Spec: corev1.PersistentVolumeClaimSpec{},
+	}
+
+	reconciler := newTestRestoreJobReconciler(t, pvc, restoreJob, backup)
+
+	ctx := context.Background()
+	ready, result, err := reconciler.prepareForRestore(ctx, restoreJob, backup, ur, target, opts)
+	if err != nil {
+		t.Fatalf("prepareForRestore() error = %v", err)
+	}
+	if ready {
+		t.Fatal("expected ready=false while the PVC is still terminating, got true")
+	}
+	if result.RequeueAfter == 0 {
+		t.Error("expected a requeue while the PVC is still terminating")
+	}
+
+	stuck := &corev1.PersistentVolumeClaim{}
+	if err := reconciler.Get(ctx, client.ObjectKey{Namespace: ns, Name: "vm-disk-ubuntu-source"}, stuck); err != nil {
+		t.Fatalf("terminating PVC should still be readable: %v", err)
+	}
+	if stuck.DeletionTimestamp == nil {
+		t.Fatal("PVC should have been marked for deletion")
+	}
+	stuck.Finalizers = nil
+	if err := reconciler.Update(ctx, stuck); err != nil {
+		t.Fatalf("failed to release the PVC finalizer: %v", err)
+	}
+
+	ready, _, err = reconciler.prepareForRestore(ctx, restoreJob, backup, ur, target, opts)
+	if err != nil {
+		t.Fatalf("prepareForRestore() error = %v", err)
+	}
+	if !ready {
+		t.Fatal("expected ready=true once the PVC is gone, got false")
+	}
+}
+
+func makeUnstructuredDataVolume(name, namespace string) *unstructured.Unstructured {
+	dv := &unstructured.Unstructured{}
+	dv.SetAPIVersion("cdi.kubevirt.io/v1beta1")
+	dv.SetKind("DataVolume")
+	dv.SetName(name)
+	dv.SetNamespace(namespace)
+	return dv
+}
+
+// A DataVolume still in place makes CDI recreate the claim under its original
+// name, so the PVC must survive until the DataVolume is confirmed gone.
+func TestPrepareForRestore_KeepOriginalPVCFalse_KeepsPVCWhileDataVolumeRemains(t *testing.T) {
+	tests := []struct {
+		name      string
+		deleteErr error
+		wantErr   bool
+	}{
+		{
+			name:      "DataVolume deletion fails",
+			deleteErr: errors.NewForbidden(dataVolumeGVR.GroupResource(), "vm-disk-ubuntu-source", nil),
+			wantErr:   true,
+		},
+		{
+			name: "DataVolume deletion is still pending",
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			ns := "tenant-root"
+			restoreJob, backup, ur, target, opts := inPlaceVMRestoreWithoutKeep(ns)
+			pvc := &corev1.PersistentVolumeClaim{
+				ObjectMeta: metav1.ObjectMeta{Name: "vm-disk-ubuntu-source", Namespace: ns},
+			}
+			reconciler := newTestRestoreJobReconcilerWithDynamic(t,
+				[]runtime.Object{makeUnstructuredDataVolume("vm-disk-ubuntu-source", ns)},
+				pvc, restoreJob, backup)
+			reconciler.Interface.(*dynamicfake.FakeDynamicClient).PrependReactor("delete", "datavolumes",
+				func(k8stesting.Action) (bool, runtime.Object, error) {
+					return true, nil, tt.deleteErr
+				})
+
+			ctx := context.Background()
+			ready, result, err := reconciler.prepareForRestore(ctx, restoreJob, backup, ur, target, opts)
+			if tt.wantErr {
+				if err == nil {
+					t.Fatal("expected an error when the DataVolume cannot be deleted")
+				}
+			} else {
+				if err != nil {
+					t.Fatalf("prepareForRestore() error = %v", err)
+				}
+				if result.RequeueAfter == 0 {
+					t.Error("expected a requeue while the DataVolume is still present")
+				}
+			}
+			if ready {
+				t.Fatal("expected ready=false while the DataVolume is still present")
+			}
+
+			got := &corev1.PersistentVolumeClaim{}
+			if err := reconciler.Get(ctx, client.ObjectKeyFromObject(pvc), got); err != nil {
+				t.Fatalf("original PVC should survive while its DataVolume remains: %v", err)
+			}
+			if got.DeletionTimestamp != nil {
+				t.Error("original PVC should not be marked for deletion while its DataVolume remains")
+			}
+		})
+	}
+}
+
+// keepOriginalPVC=true must never delete the original claim, even when the
+// rename that preserves it fails and leaves it under its original name.
+func TestPrepareForRestore_KeepOriginalPVCTrue_FailedRenameKeepsPVC(t *testing.T) {
+	ns := "tenant-root"
+	restoreJob, backup, ur, target, _ := inPlaceVMRestoreWithoutKeep(ns)
+	opts := RestoreOptions{KeepOriginalPVC: new(true)}
+
+	pvc := &corev1.PersistentVolumeClaim{
+		ObjectMeta: metav1.ObjectMeta{Name: "vm-disk-ubuntu-source", Namespace: ns},
+		// The PV does not exist, so renamePVC fails before touching the claim.
+		Spec: corev1.PersistentVolumeClaimSpec{VolumeName: "pv-missing"},
+	}
+	reconciler := newTestRestoreJobReconciler(t, pvc, restoreJob, backup)
+
+	ctx := context.Background()
+	if _, _, err := reconciler.prepareForRestore(ctx, restoreJob, backup, ur, target, opts); err != nil {
+		t.Fatalf("prepareForRestore() error = %v", err)
+	}
+
+	if err := reconciler.Get(ctx, client.ObjectKeyFromObject(pvc), &corev1.PersistentVolumeClaim{}); err != nil {
+		t.Errorf("original PVC should survive a failed rename when keepOriginalPVC=true, got error: %v", err)
+	}
+}
+
+// A Backup artifact can outlive its Velero Backup, which Velero garbage-collects
+// at TTL. The restore must fail before it halts the VM or deletes its disks.
+func TestReconcileVeleroRestore_UnusableVeleroBackupTouchesNothing(t *testing.T) {
+	tests := []struct {
+		name         string
+		veleroBackup *velerov1.Backup
+		wantMessage  string
+	}{
+		{
+			name:        "Velero Backup expired",
+			wantMessage: "Velero Backup cozy-velero/vb not found",
+		},
+		{
+			name: "Velero Backup being deleted",
+			veleroBackup: &velerov1.Backup{
+				ObjectMeta: metav1.ObjectMeta{Name: "vb", Namespace: veleroNamespace},
+				Status:     velerov1.BackupStatus{Phase: velerov1.BackupPhaseDeleting},
+			},
+			wantMessage: `Velero Backup cozy-velero/vb is "Deleting"`,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			ns := "tenant-root"
+			restoreJob, backup, ur, _, opts := inPlaceVMRestoreWithoutKeep(ns)
+			rawOpts, err := json.Marshal(opts)
+			if err != nil {
+				t.Fatalf("marshal options: %v", err)
+			}
+			started := metav1.Now()
+			restoreJob.Spec.Options = &runtime.RawExtension{Raw: rawOpts}
+			restoreJob.Status = backupsv1alpha1.RestoreJobStatus{
+				Phase:     backupsv1alpha1.RestoreJobPhaseRunning,
+				StartedAt: &started,
+			}
+			backup.Spec.StrategyRef = corev1.TypedLocalObjectReference{Kind: "Velero", Name: "cozy-default-velero"}
+			backup.Spec.DriverMetadata = map[string]string{veleroBackupNameMetadataKey: "vb"}
+			backup.Status.UnderlyingResources = ur
+
+			pvc := &corev1.PersistentVolumeClaim{
+				ObjectMeta: metav1.ObjectMeta{Name: "vm-disk-ubuntu-source", Namespace: ns},
+			}
+			strategy := &strategyv1alpha1.Velero{ObjectMeta: metav1.ObjectMeta{Name: "cozy-default-velero"}}
+			objs := []client.Object{restoreJob, backup, pvc, strategy}
+			if tt.veleroBackup != nil {
+				objs = append(objs, tt.veleroBackup)
+			}
+
+			vm := &unstructured.Unstructured{}
+			vm.SetAPIVersion("kubevirt.io/v1")
+			vm.SetKind("VirtualMachine")
+			vm.SetName(vmNamePrefix + "test-vm")
+			vm.SetNamespace(ns)
+			if err := unstructured.SetNestedField(vm.Object, "Always", "spec", "runStrategy"); err != nil {
+				t.Fatalf("set runStrategy: %v", err)
+			}
+			reconciler := newTestRestoreJobReconcilerWithDynamic(t,
+				[]runtime.Object{vm, makeUnstructuredDataVolume("vm-disk-ubuntu-source", ns)})
+			testScheme := runtime.NewScheme()
+			_ = scheme.AddToScheme(testScheme)
+			_ = backupsv1alpha1.AddToScheme(testScheme)
+			_ = velerov1.AddToScheme(testScheme)
+			_ = strategyv1alpha1.AddToScheme(testScheme)
+			reconciler.Client = clientfake.NewClientBuilder().
+				WithScheme(testScheme).
+				WithObjects(objs...).
+				WithStatusSubresource(&backupsv1alpha1.RestoreJob{}).
+				Build()
+			ctx := context.Background()
+
+			if _, err := reconciler.reconcileVeleroRestore(ctx, restoreJob, backup); err != nil {
+				t.Fatalf("reconcileVeleroRestore() error = %v", err)
+			}
+
+			got := &backupsv1alpha1.RestoreJob{}
+			if err := reconciler.Get(ctx, client.ObjectKeyFromObject(restoreJob), got); err != nil {
+				t.Fatalf("get RestoreJob: %v", err)
+			}
+			if got.Status.Phase != backupsv1alpha1.RestoreJobPhaseFailed {
+				t.Fatalf("phase = %q, want %q", got.Status.Phase, backupsv1alpha1.RestoreJobPhaseFailed)
+			}
+			ready := meta.FindStatusCondition(got.Status.Conditions, "Ready")
+			if ready == nil || !strings.Contains(ready.Message, tt.wantMessage) {
+				t.Errorf("Ready condition = %+v, want a message containing %q", ready, tt.wantMessage)
+			}
+
+			if err := reconciler.Get(ctx, client.ObjectKeyFromObject(pvc), &corev1.PersistentVolumeClaim{}); err != nil {
+				t.Errorf("original PVC should survive a restore that cannot run: %v", err)
+			}
+			if _, err := reconciler.Resource(dataVolumeGVR).Namespace(ns).Get(ctx, "vm-disk-ubuntu-source", metav1.GetOptions{}); err != nil {
+				t.Errorf("DataVolume should survive a restore that cannot run: %v", err)
+			}
+			gotVM, err := reconciler.Resource(virtualMachineGVR).Namespace(ns).Get(ctx, vm.GetName(), metav1.GetOptions{})
+			if err != nil {
+				t.Fatalf("get VirtualMachine: %v", err)
+			}
+			if rs, _, _ := unstructured.NestedString(gotVM.Object, "spec", "runStrategy"); rs != "Always" {
+				t.Errorf("VirtualMachine runStrategy = %q, want it left at %q", rs, "Always")
+			}
+		})
+	}
+}
+
+func TestCollectUnderlyingResources_VMDisk(t *testing.T) {
+	// A standalone VMDisk must report its own disk as an underlying resource so
+	// the restore controller suspends the vm-disk-<name> HelmRelease and deletes
+	// its DataVolume before the data mover repopulates the PVC. Without this,
+	// prepareForRestore does nothing for a VMDisk (vmRes == nil) and Flux/CDI
+	// race the data mover over the same PVC name, wedging the restore.
+	r := &BackupJobReconciler{}
+	app := &unstructured.Unstructured{Object: map[string]interface{}{
+		"apiVersion": "apps.cozystack.io/v1alpha1",
+		"kind":       "VMDisk",
+		"metadata":   map[string]interface{}{"name": "backup-src", "namespace": "tenant-root"},
+	}}
+
+	ur, err := r.collectUnderlyingResources(context.Background(), app, "VMDisk", "tenant-root")
+	if err != nil {
+		t.Fatalf("collectUnderlyingResources returned error: %v", err)
+	}
+	res := getVMInstanceResources(ur)
+	if res == nil {
+		t.Fatal("expected non-nil underlying resources for a VMDisk, got nil (prepareForRestore would skip the HR suspend and DataVolume delete)")
+	}
+	if len(res.DataVolumes) != 1 {
+		t.Fatalf("expected exactly one DataVolume, got %d", len(res.DataVolumes))
+	}
+	if got, want := res.DataVolumes[0].DataVolumeName, "vm-disk-backup-src"; got != want {
+		t.Errorf("DataVolumeName = %q, want %q", got, want)
+	}
+	if got, want := res.DataVolumes[0].ApplicationName, "backup-src"; got != want {
+		t.Errorf("ApplicationName = %q, want %q", got, want)
+	}
+}
+
+func TestCollectUnderlyingResources_VMInstance(t *testing.T) {
+	testScheme := runtime.NewScheme()
+	_ = scheme.AddToScheme(testScheme)
+	r := &BackupJobReconciler{Client: clientfake.NewClientBuilder().WithScheme(testScheme).Build()}
+	app := &unstructured.Unstructured{Object: map[string]interface{}{
+		"apiVersion": "apps.cozystack.io/v1alpha1",
+		"kind":       "VMInstance",
+		"metadata":   map[string]interface{}{"name": "test", "namespace": "tenant-root"},
+		"spec": map[string]interface{}{
+			"disks": []interface{}{
+				map[string]interface{}{"name": "system"},
+				map[string]interface{}{"name": "data"},
+			},
+		},
+	}}
+
+	ur, err := r.collectUnderlyingResources(context.Background(), app, "VMInstance", "tenant-root")
+	if err != nil {
+		t.Fatalf("collectUnderlyingResources returned error: %v", err)
+	}
+	res := getVMInstanceResources(ur)
+	if res == nil {
+		t.Fatal("expected non-nil underlying resources for a VMInstance with disks, got nil")
+	}
+	var got []string
+	for _, dv := range res.DataVolumes {
+		got = append(got, dv.DataVolumeName+"/"+dv.ApplicationName)
+	}
+	want := []string{"vm-disk-system/system", "vm-disk-data/data"}
+	if !reflect.DeepEqual(got, want) {
+		t.Errorf("DataVolumes = %v, want %v (one per spec.disks[] entry, not the VMInstance itself)", got, want)
+	}
+}
+
 func TestResolveRestoreTarget_VMDisk_CommonRestoreOptions(t *testing.T) {
 	tests := []struct {
-		name           string
-		targetNS       string
-		wantIsCopy     bool
-		wantNamespace  string
+		name          string
+		targetNS      string
+		wantIsCopy    bool
+		wantNamespace string
 	}{
 		{
 			name:          "VMDisk in-place restore when targetNamespace is omitted",
@@ -515,7 +830,7 @@ func TestResolveRestoreTarget_VMDisk_CommonRestoreOptions(t *testing.T) {
 				Spec: backupsv1alpha1.RestoreJobSpec{
 					BackupRef: corev1.LocalObjectReference{Name: "disk-backup"},
 					TargetApplicationRef: &corev1.TypedLocalObjectReference{
-						APIGroup: stringPtr("apps.cozystack.io"),
+						APIGroup: new("apps.cozystack.io"),
 						Kind:     "VMDisk",
 						Name:     "ubuntu-source",
 					},
@@ -529,7 +844,7 @@ func TestResolveRestoreTarget_VMDisk_CommonRestoreOptions(t *testing.T) {
 				},
 				Spec: backupsv1alpha1.BackupSpec{
 					ApplicationRef: corev1.TypedLocalObjectReference{
-						APIGroup: stringPtr("apps.cozystack.io"),
+						APIGroup: new("apps.cozystack.io"),
 						Kind:     "VMDisk",
 						Name:     "ubuntu-source",
 					},
@@ -563,7 +878,7 @@ func TestResolveRestoreTarget_VMDisk_CommonRestoreOptions(t *testing.T) {
 
 func TestParseRestoreOptions_VMDiskOnlyCommonFields(t *testing.T) {
 	// Simulate a VMDisk restore where only CommonRestoreOptions fields are set
-	raw, _ := json.Marshal(map[string]interface{}{
+	raw, _ := json.Marshal(map[string]any{
 		"targetNamespace":    "tenant-copy",
 		"failIfTargetExists": true,
 	})
@@ -611,7 +926,7 @@ func TestRestoreOptions_Defaults(t *testing.T) {
 	})
 
 	t.Run("empty JSON defaults all bools to true", func(t *testing.T) {
-		raw, _ := json.Marshal(map[string]interface{}{})
+		raw, _ := json.Marshal(map[string]any{})
 		opts, err := parseRestoreOptions(&runtime.RawExtension{Raw: raw})
 		if err != nil {
 			t.Fatalf("parseRestoreOptions({}) error = %v", err)
@@ -629,7 +944,7 @@ func TestRestoreOptions_Defaults(t *testing.T) {
 	})
 
 	t.Run("explicit false overrides defaults", func(t *testing.T) {
-		raw, _ := json.Marshal(map[string]interface{}{
+		raw, _ := json.Marshal(map[string]any{
 			"failIfTargetExists":   false,
 			"keepOriginalPVC":      false,
 			"keepOriginalIpAndMac": false,
@@ -656,7 +971,7 @@ func TestResolveRestoreTarget_IsRenamed(t *testing.T) {
 		ObjectMeta: metav1.ObjectMeta{Name: "bk", Namespace: "tenant-root"},
 		Spec: backupsv1alpha1.BackupSpec{
 			ApplicationRef: corev1.TypedLocalObjectReference{
-				APIGroup: stringPtr("apps.cozystack.io"),
+				APIGroup: new("apps.cozystack.io"),
 				Kind:     "VMInstance",
 				Name:     "test-alpine",
 			},
@@ -669,7 +984,7 @@ func TestResolveRestoreTarget_IsRenamed(t *testing.T) {
 			Spec: backupsv1alpha1.RestoreJobSpec{
 				BackupRef: corev1.LocalObjectReference{Name: "bk"},
 				TargetApplicationRef: &corev1.TypedLocalObjectReference{
-					APIGroup: stringPtr("apps.cozystack.io"),
+					APIGroup: new("apps.cozystack.io"),
 					Kind:     "VMInstance",
 					Name:     "test-alpine",
 				},
@@ -689,7 +1004,7 @@ func TestResolveRestoreTarget_IsRenamed(t *testing.T) {
 			Spec: backupsv1alpha1.RestoreJobSpec{
 				BackupRef: corev1.LocalObjectReference{Name: "bk"},
 				TargetApplicationRef: &corev1.TypedLocalObjectReference{
-					APIGroup: stringPtr("apps.cozystack.io"),
+					APIGroup: new("apps.cozystack.io"),
 					Kind:     "VMInstance",
 					Name:     "test-new",
 				},
@@ -742,8 +1057,8 @@ func makeUnstructuredHelmRelease(name, namespace string, labels map[string]strin
 func TestPostRestoreRename_RenamesHelmRelease(t *testing.T) {
 	ns := "tenant-foo"
 	sourceHR := makeUnstructuredHelmRelease("vm-instance-test-alpine", ns, map[string]string{
-		appNameLabel:                 "test-alpine",
-		"app.kubernetes.io/instance": "vm-instance-test-alpine",
+		appNameLabel:                  "test-alpine",
+		"app.kubernetes.io/instance":  "vm-instance-test-alpine",
 		"helm.toolkit.fluxcd.io/name": "vm-instance-test-alpine",
 	})
 
@@ -757,7 +1072,7 @@ func TestPostRestoreRename_RenamesHelmRelease(t *testing.T) {
 		ObjectMeta: metav1.ObjectMeta{Name: "bk", Namespace: "tenant-root"},
 		Spec: backupsv1alpha1.BackupSpec{
 			ApplicationRef: corev1.TypedLocalObjectReference{
-				APIGroup: stringPtr("apps.cozystack.io"),
+				APIGroup: new("apps.cozystack.io"),
 				Kind:     "VMInstance",
 				Name:     "test-alpine",
 			},
@@ -817,7 +1132,7 @@ func TestPostRestoreRename_SkipsWhenSourceNotFound(t *testing.T) {
 		ObjectMeta: metav1.ObjectMeta{Name: "bk", Namespace: "tenant-root"},
 		Spec: backupsv1alpha1.BackupSpec{
 			ApplicationRef: corev1.TypedLocalObjectReference{
-				APIGroup: stringPtr("apps.cozystack.io"),
+				APIGroup: new("apps.cozystack.io"),
 				Kind:     "VMInstance",
 				Name:     "test-alpine",
 			},
@@ -861,7 +1176,7 @@ func TestPostRestoreRename_IdempotentWhenTargetExists(t *testing.T) {
 		ObjectMeta: metav1.ObjectMeta{Name: "bk", Namespace: "tenant-root"},
 		Spec: backupsv1alpha1.BackupSpec{
 			ApplicationRef: corev1.TypedLocalObjectReference{
-				APIGroup: stringPtr("apps.cozystack.io"),
+				APIGroup: new("apps.cozystack.io"),
 				Kind:     "VMInstance",
 				Name:     "test-alpine",
 			},
@@ -972,7 +1287,7 @@ func makeTestBackup(ns, appName, appKind string) *backupsv1alpha1.Backup {
 		ObjectMeta: metav1.ObjectMeta{Name: "bk", Namespace: ns},
 		Spec: backupsv1alpha1.BackupSpec{
 			ApplicationRef: corev1.TypedLocalObjectReference{
-				APIGroup: stringPtr("apps.cozystack.io"),
+				APIGroup: new("apps.cozystack.io"),
 				Kind:     appKind,
 				Name:     appName,
 			},
@@ -1042,7 +1357,7 @@ func TestCreateResourceModifiersConfigMap_Copy_NoOVN(t *testing.T) {
 
 	// Copy restore: keepOriginalIpAndMac=false, no OVN annotations on copy
 	opts := RestoreOptions{
-		KeepOriginalIpAndMac: boolPtr(false),
+		KeepOriginalIpAndMac: new(false),
 	}
 	ur := makeVMInstanceUR("10.0.0.5", "aa:bb:cc:dd:ee:ff", nil)
 	target := restoreTarget{Namespace: targetNS, AppName: "test-vm", AppKind: "VMInstance", IsCopy: true}
@@ -1122,6 +1437,300 @@ func TestHelmReleaseNameForApp(t *testing.T) {
 	}
 }
 
+func TestVeleroRenameSupported(t *testing.T) {
+	tests := []struct {
+		kind string
+		want bool
+	}{
+		{vmInstanceKind, true},
+		{vmDiskAppKind, false},
+		{"Postgres", false},
+		{"MariaDB", false},
+		{"ClickHouse", false},
+		{"MongoDB", false},
+		{"", false},
+	}
+	for _, tt := range tests {
+		t.Run(tt.kind, func(t *testing.T) {
+			if got := veleroRenameSupported(tt.kind); got != tt.want {
+				t.Errorf("veleroRenameSupported(%q) = %v, want %v", tt.kind, got, tt.want)
+			}
+		})
+	}
+}
+
+// TestReconcileVeleroRestore_RenameGuard covers the fix for a RestoreJob that
+// asked for a new application name via targetApplicationRef.name but whose
+// kind cannot be renamed by postRestoreRename: it used to report Succeeded
+// with the application restored under the source name.
+func TestReconcileVeleroRestore_RenameGuard(t *testing.T) {
+	const (
+		sourceNS = "tenant-src"
+		targetNS = "tenant-dst"
+	)
+
+	tests := []struct {
+		name        string
+		appKind     string
+		targetKind  string // targetApplicationRef.kind; defaults to appKind
+		targetName  string // targetApplicationRef.name; "" omits targetApplicationRef
+		targetNS    string
+		wantPhase   backupsv1alpha1.RestoreJobPhase
+		wantMessage string
+		wantMissing string // a remedy the message must not offer for this kind
+	}{
+		{
+			name:        "postgres cross-namespace rename is rejected",
+			appKind:     "Postgres",
+			targetName:  "dst",
+			targetNS:    targetNS,
+			wantPhase:   backupsv1alpha1.RestoreJobPhaseFailed,
+			wantMessage: `restoring Postgres "src" under a different name ("dst") is not supported by the Velero strategy`,
+		},
+		{
+			name:        "postgres rejection points at the engine-native strategy",
+			appKind:     "Postgres",
+			targetName:  "dst",
+			targetNS:    targetNS,
+			wantPhase:   backupsv1alpha1.RestoreJobPhaseFailed,
+			wantMessage: "engine-native strategy",
+		},
+		{
+			name:        "vmdisk cross-namespace rename is rejected",
+			appKind:     vmDiskAppKind,
+			targetName:  "dst",
+			targetNS:    targetNS,
+			wantPhase:   backupsv1alpha1.RestoreJobPhaseFailed,
+			wantMessage: `restoring VMDisk "src" under a different name ("dst") is not supported by the Velero strategy`,
+			wantMissing: "engine-native strategy",
+		},
+		{
+			name:        "vmdisk rename is rejected by the backup kind, not the target kind",
+			appKind:     vmDiskAppKind,
+			targetKind:  vmInstanceKind,
+			targetName:  "dst",
+			targetNS:    targetNS,
+			wantPhase:   backupsv1alpha1.RestoreJobPhaseFailed,
+			wantMessage: `restoring VMDisk "src" under a different name ("dst") is not supported by the Velero strategy`,
+		},
+		{
+			name:        "postgres same-namespace rename keeps the DataUpload message",
+			appKind:     "Postgres",
+			targetName:  "dst",
+			targetNS:    "",
+			wantPhase:   backupsv1alpha1.RestoreJobPhaseFailed,
+			wantMessage: "restoring to the same namespace with a different application name is not supported",
+		},
+		{
+			name:       "vminstance cross-namespace rename passes the guard",
+			appKind:    vmInstanceKind,
+			targetName: "dst",
+			targetNS:   targetNS,
+			wantPhase:  backupsv1alpha1.RestoreJobPhaseRunning,
+		},
+		{
+			name:       "vmdisk cross-namespace copy keeping the source name passes the guard",
+			appKind:    vmDiskAppKind,
+			targetName: "src",
+			targetNS:   targetNS,
+			wantPhase:  backupsv1alpha1.RestoreJobPhaseRunning,
+		},
+		{
+			name:      "vmdisk in-place restore without targetApplicationRef passes the guard",
+			appKind:   vmDiskAppKind,
+			targetNS:  "",
+			wantPhase: backupsv1alpha1.RestoreJobPhaseRunning,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			backup := &backupsv1alpha1.Backup{
+				ObjectMeta: metav1.ObjectMeta{Name: "src-sb", Namespace: sourceNS},
+				Spec: backupsv1alpha1.BackupSpec{
+					ApplicationRef: corev1.TypedLocalObjectReference{
+						APIGroup: new("apps.cozystack.io"),
+						Kind:     tt.appKind,
+						Name:     "src",
+					},
+					StrategyRef: corev1.TypedLocalObjectReference{Kind: "Velero", Name: "cozy-default-velero"},
+				},
+			}
+			restoreJob := &backupsv1alpha1.RestoreJob{
+				ObjectMeta: metav1.ObjectMeta{Name: "src-restore", Namespace: sourceNS},
+				Spec: backupsv1alpha1.RestoreJobSpec{
+					BackupRef: corev1.LocalObjectReference{Name: "src-sb"},
+				},
+			}
+			if tt.targetName != "" {
+				targetKind := tt.targetKind
+				if targetKind == "" {
+					targetKind = tt.appKind
+				}
+				restoreJob.Spec.TargetApplicationRef = &corev1.TypedLocalObjectReference{
+					APIGroup: new("apps.cozystack.io"),
+					Kind:     targetKind,
+					Name:     tt.targetName,
+				}
+			}
+			if tt.targetNS != "" {
+				raw, err := json.Marshal(RestoreOptions{CommonRestoreOptions: CommonRestoreOptions{TargetNamespace: tt.targetNS}})
+				if err != nil {
+					t.Fatalf("marshal options: %v", err)
+				}
+				restoreJob.Spec.Options = &runtime.RawExtension{Raw: raw}
+			}
+			targetNamespace := &corev1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: targetNS}}
+
+			reconciler := newTestRestoreJobReconcilerWithDynamic(t, nil, restoreJob, backup, targetNamespace)
+			reconciler.Client = newRestoreJobTestClient(t, restoreJob, backup, targetNamespace)
+			ctx := context.Background()
+
+			if _, err := reconciler.reconcileVeleroRestore(ctx, restoreJob, backup); err != nil {
+				t.Fatalf("reconcileVeleroRestore() error = %v", err)
+			}
+
+			got := &backupsv1alpha1.RestoreJob{}
+			if err := reconciler.Get(ctx, client.ObjectKeyFromObject(restoreJob), got); err != nil {
+				t.Fatalf("get RestoreJob: %v", err)
+			}
+			if got.Status.Phase != tt.wantPhase {
+				t.Fatalf("phase = %q, want %q", got.Status.Phase, tt.wantPhase)
+			}
+			if tt.wantMessage == "" {
+				return
+			}
+			ready := meta.FindStatusCondition(got.Status.Conditions, "Ready")
+			if ready == nil {
+				t.Fatalf("Ready condition missing, conditions: %+v", got.Status.Conditions)
+			}
+			if !strings.Contains(ready.Message, tt.wantMessage) {
+				t.Errorf("Ready message = %q, want it to contain %q", ready.Message, tt.wantMessage)
+			}
+			if tt.wantMissing != "" && strings.Contains(ready.Message, tt.wantMissing) {
+				t.Errorf("Ready message = %q, must not offer %q", ready.Message, tt.wantMissing)
+			}
+		})
+	}
+}
+
+// TestReconcileVeleroRestore_RenameGuard_InFlight covers a rename RestoreJob
+// that was already Running when the guard was introduced: its Velero Restore
+// has completed under the source name, so the job must fail with a message
+// saying so and release its resource-modifier ConfigMap instead of waiting
+// for the job's deletion. A VMInstance in the same state still succeeds.
+func TestReconcileVeleroRestore_RenameGuard_InFlight(t *testing.T) {
+	const (
+		sourceNS = "tenant-src"
+		targetNS = "tenant-dst"
+	)
+	tests := []struct {
+		name        string
+		appKind     string
+		wantPhase   backupsv1alpha1.RestoreJobPhase
+		wantMessage string
+	}{
+		{
+			name:        "vmdisk in-flight rename fails and names the source-name copy",
+			appKind:     vmDiskAppKind,
+			wantPhase:   backupsv1alpha1.RestoreJobPhaseFailed,
+			wantMessage: `This RestoreJob was already running, so "src" may have been restored into namespace "tenant-dst" under its source name`,
+		},
+		{
+			name:      "vminstance in-flight rename still succeeds",
+			appKind:   vmInstanceKind,
+			wantPhase: backupsv1alpha1.RestoreJobPhaseSucceeded,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			started := metav1.Now()
+			backup := &backupsv1alpha1.Backup{
+				ObjectMeta: metav1.ObjectMeta{Name: "src-sb", Namespace: sourceNS},
+				Spec: backupsv1alpha1.BackupSpec{
+					ApplicationRef: corev1.TypedLocalObjectReference{
+						APIGroup: new("apps.cozystack.io"),
+						Kind:     tt.appKind,
+						Name:     "src",
+					},
+					StrategyRef:    corev1.TypedLocalObjectReference{Kind: "Velero", Name: "cozy-default-velero"},
+					DriverMetadata: map[string]string{veleroBackupNameMetadataKey: "vb"},
+				},
+			}
+			raw, err := json.Marshal(RestoreOptions{CommonRestoreOptions: CommonRestoreOptions{TargetNamespace: targetNS}})
+			if err != nil {
+				t.Fatalf("marshal options: %v", err)
+			}
+			restoreJob := &backupsv1alpha1.RestoreJob{
+				ObjectMeta: metav1.ObjectMeta{Name: "src-restore", Namespace: sourceNS},
+				Spec: backupsv1alpha1.RestoreJobSpec{
+					BackupRef: corev1.LocalObjectReference{Name: "src-sb"},
+					TargetApplicationRef: &corev1.TypedLocalObjectReference{
+						APIGroup: new("apps.cozystack.io"),
+						Kind:     tt.appKind,
+						Name:     "dst",
+					},
+					Options: &runtime.RawExtension{Raw: raw},
+				},
+				Status: backupsv1alpha1.RestoreJobStatus{
+					Phase:     backupsv1alpha1.RestoreJobPhaseRunning,
+					StartedAt: &started,
+				},
+			}
+			owningLabels := map[string]string{
+				backupsv1alpha1.OwningJobNameLabel:      restoreJob.Name,
+				backupsv1alpha1.OwningJobNamespaceLabel: restoreJob.Namespace,
+			}
+			veleroRestore := &velerov1.Restore{
+				ObjectMeta: metav1.ObjectMeta{Name: "vr", Namespace: veleroNamespace, Labels: owningLabels},
+				Status:     velerov1.RestoreStatus{Phase: velerov1.RestorePhaseCompleted},
+			}
+			modifiers := &corev1.ConfigMap{
+				ObjectMeta: metav1.ObjectMeta{Name: "restore-modifiers-tenant-src-src-restore", Namespace: veleroNamespace, Labels: owningLabels},
+			}
+			strategy := &strategyv1alpha1.Velero{ObjectMeta: metav1.ObjectMeta{Name: "cozy-default-velero"}}
+			targetNamespace := &corev1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: targetNS}}
+
+			reconciler := newTestRestoreJobReconcilerWithDynamic(t, nil)
+			testScheme := runtime.NewScheme()
+			_ = scheme.AddToScheme(testScheme)
+			_ = backupsv1alpha1.AddToScheme(testScheme)
+			_ = velerov1.AddToScheme(testScheme)
+			_ = strategyv1alpha1.AddToScheme(testScheme)
+			reconciler.Client = clientfake.NewClientBuilder().
+				WithScheme(testScheme).
+				WithObjects(restoreJob, backup, veleroRestore, modifiers, strategy, targetNamespace).
+				WithStatusSubresource(&backupsv1alpha1.RestoreJob{}).
+				Build()
+			ctx := context.Background()
+
+			if _, err := reconciler.reconcileVeleroRestore(ctx, restoreJob, backup); err != nil {
+				t.Fatalf("reconcileVeleroRestore() error = %v", err)
+			}
+
+			got := &backupsv1alpha1.RestoreJob{}
+			if err := reconciler.Get(ctx, client.ObjectKeyFromObject(restoreJob), got); err != nil {
+				t.Fatalf("get RestoreJob: %v", err)
+			}
+			if got.Status.Phase != tt.wantPhase {
+				t.Fatalf("phase = %q, want %q", got.Status.Phase, tt.wantPhase)
+			}
+			if err := reconciler.Get(ctx, client.ObjectKeyFromObject(modifiers), &corev1.ConfigMap{}); !errors.IsNotFound(err) {
+				t.Errorf("resource-modifier ConfigMap should be deleted, get err = %v", err)
+			}
+			if tt.wantMessage == "" {
+				return
+			}
+			ready := meta.FindStatusCondition(got.Status.Conditions, "Ready")
+			if ready == nil {
+				t.Fatalf("Ready condition missing, conditions: %+v", got.Status.Conditions)
+			}
+			if !strings.Contains(ready.Message, tt.wantMessage) {
+				t.Errorf("Ready message = %q, want it to contain %q", ready.Message, tt.wantMessage)
+			}
+		})
+	}
+}
+
 func TestTargetHelmReleaseExists_VMDisk(t *testing.T) {
 	ns := "tenant-copy"
 	hr := makeUnstructuredHelmRelease("vm-disk-ubuntu-source", ns, nil)
@@ -1172,7 +1781,7 @@ func TestCreateResourceModifiersConfigMap_Copy_UsesMergePatchForPVC(t *testing.T
 	restoreJob := makeTestRestoreJob(sourceNS, "rj-copy-merge")
 	backup := makeTestBackup(sourceNS, "test-vm", "VMInstance")
 
-	opts := RestoreOptions{KeepOriginalIpAndMac: boolPtr(false)}
+	opts := RestoreOptions{KeepOriginalIpAndMac: new(false)}
 	ur := makeVMInstanceUR("", "", nil)
 	target := restoreTarget{Namespace: targetNS, AppName: "test-vm", AppKind: "VMInstance", IsCopy: true}
 
@@ -1211,3 +1820,307 @@ func containsString(s, substr string) bool {
 	}
 	return false
 }
+
+// keepPVCFixture is an in-place VMInstance restore of one disk, whose PVC
+// vm-disk-ubuntu-source is bound to PV pv-current under a Delete policy.
+type keepPVCFixture struct {
+	ns         string
+	restoreJob *backupsv1alpha1.RestoreJob
+	backup     *backupsv1alpha1.Backup
+	ur         *runtime.RawExtension
+	target     restoreTarget
+	opts       RestoreOptions
+	livePVC    *corev1.PersistentVolumeClaim
+	pv         *corev1.PersistentVolume
+	origName   string
+}
+
+func newKeepPVCFixture(t *testing.T) *keepPVCFixture {
+	t.Helper()
+	ns := "tenant-root"
+	restoreJob := &backupsv1alpha1.RestoreJob{
+		ObjectMeta: metav1.ObjectMeta{Name: "restore-test", Namespace: ns, UID: "restore-job-uid"},
+		Spec:       backupsv1alpha1.RestoreJobSpec{BackupRef: corev1.LocalObjectReference{Name: "my-backup"}},
+	}
+	backup := &backupsv1alpha1.Backup{
+		ObjectMeta: metav1.ObjectMeta{Name: "my-backup", Namespace: ns},
+		Spec: backupsv1alpha1.BackupSpec{
+			ApplicationRef: corev1.TypedLocalObjectReference{
+				APIGroup: new("apps.cozystack.io"),
+				Kind:     "VMInstance",
+				Name:     "test-vm",
+			},
+		},
+	}
+	urRaw, err := json.Marshal(vmInstanceResources{
+		DataVolumes: []backupsv1alpha1.DataVolumeResource{
+			{DataVolumeName: "vm-disk-ubuntu-source", ApplicationName: "ubuntu-source"},
+		},
+	})
+	if err != nil {
+		t.Fatal(err)
+	}
+	return &keepPVCFixture{
+		ns:         ns,
+		restoreJob: restoreJob,
+		backup:     backup,
+		ur:         &runtime.RawExtension{Raw: urRaw},
+		target:     restoreTarget{Namespace: ns, AppName: "test-vm", AppKind: "VMInstance"},
+		opts:       RestoreOptions{KeepOriginalPVC: new(true)},
+		livePVC: &corev1.PersistentVolumeClaim{
+			ObjectMeta: metav1.ObjectMeta{Name: "vm-disk-ubuntu-source", Namespace: ns, UID: "live-pvc-uid"},
+			Spec:       corev1.PersistentVolumeClaimSpec{VolumeName: "pv-current"},
+		},
+		pv: &corev1.PersistentVolume{
+			ObjectMeta: metav1.ObjectMeta{Name: "pv-current"},
+			Spec: corev1.PersistentVolumeSpec{
+				PersistentVolumeReclaimPolicy: corev1.PersistentVolumeReclaimDelete,
+				ClaimRef: &corev1.ObjectReference{
+					Kind: "PersistentVolumeClaim", Namespace: ns, Name: "vm-disk-ubuntu-source", UID: "live-pvc-uid",
+				},
+			},
+		},
+		origName: "vm-disk-ubuntu-source-orig-" + shortHash(restoreJob.Name),
+	}
+}
+
+func (f *keepPVCFixture) reconciler(t *testing.T, objects ...client.Object) *RestoreJobReconciler {
+	t.Helper()
+	dv := &unstructured.Unstructured{}
+	dv.SetAPIVersion("cdi.kubevirt.io/v1beta1")
+	dv.SetKind("DataVolume")
+	dv.SetName("vm-disk-ubuntu-source")
+	dv.SetNamespace(f.ns)
+	return newTestRestoreJobReconcilerWithDynamic(t, []runtime.Object{dv},
+		append([]client.Object{f.restoreJob, f.backup}, objects...)...)
+}
+
+func (f *keepPVCFixture) dataVolumeExists(t *testing.T, r *RestoreJobReconciler) bool {
+	t.Helper()
+	_, err := r.Resource(dataVolumeGVR).Namespace(f.ns).Get(context.Background(), "vm-disk-ubuntu-source", metav1.GetOptions{})
+	if err != nil && !errors.IsNotFound(err) {
+		t.Fatalf("get DataVolume: %v", err)
+	}
+	return err == nil
+}
+
+// A -orig PVC this RestoreJob did not create, such as one left by a deleted
+// RestoreJob of the same name, must stop the restore before the DataVolume is
+// deleted: skipping the rename would leave the live disk under its own name
+// for the restore to overwrite.
+func TestPrepareForRestore_KeepOriginalPVC_RefusesForeignOrigPVC(t *testing.T) {
+	for _, tc := range []struct {
+		name        string
+		annotations map[string]string
+	}{
+		{name: "no restore job annotation"},
+		{name: "another restore job with the same name", annotations: map[string]string{origPVCRestoreJobUIDAnnotation: "previous-restore-job-uid"}},
+	} {
+		t.Run(tc.name, func(t *testing.T) {
+			f := newKeepPVCFixture(t)
+			foreign := &corev1.PersistentVolumeClaim{
+				ObjectMeta: metav1.ObjectMeta{Name: f.origName, Namespace: f.ns, Annotations: tc.annotations},
+				Spec:       corev1.PersistentVolumeClaimSpec{VolumeName: "pv-previous"},
+			}
+			r := f.reconciler(t, f.livePVC, f.pv, foreign)
+			ctx := context.Background()
+
+			ready, _, err := r.prepareForRestore(ctx, f.restoreJob, f.backup, f.ur, f.target, f.opts)
+			if err == nil {
+				t.Errorf("prepareForRestore() = ready %v, nil error; want an error naming %s", ready, f.origName)
+			} else if !strings.Contains(err.Error(), f.origName) {
+				t.Errorf("error %q does not name the taken PVC %s", err, f.origName)
+			}
+
+			if !f.dataVolumeExists(t, r) {
+				t.Error("DataVolume was deleted although the disk could not be kept")
+			}
+			live := &corev1.PersistentVolumeClaim{}
+			if err := r.Get(ctx, client.ObjectKeyFromObject(f.livePVC), live); err != nil {
+				t.Fatalf("live PVC is gone: %v", err)
+			}
+			pv := &corev1.PersistentVolume{}
+			if err := r.Get(ctx, client.ObjectKey{Name: "pv-current"}, pv); err != nil {
+				t.Fatal(err)
+			}
+			if pv.Spec.PersistentVolumeReclaimPolicy != corev1.PersistentVolumeReclaimDelete || pv.Spec.ClaimRef.Name != f.livePVC.Name {
+				t.Errorf("PV was modified: policy %s, claim %s", pv.Spec.PersistentVolumeReclaimPolicy, pv.Spec.ClaimRef.Name)
+			}
+			got := &corev1.PersistentVolumeClaim{}
+			if err := r.Get(ctx, client.ObjectKey{Namespace: f.ns, Name: f.origName}, got); err != nil {
+				t.Fatal(err)
+			}
+			if got.Spec.VolumeName != "pv-previous" {
+				t.Errorf("foreign -orig PVC now points at %q", got.Spec.VolumeName)
+			}
+		})
+	}
+}
+
+// A rename interrupted after the -orig PVC was created must complete on the
+// next reconcile, and a rename already complete must be left alone.
+func TestPrepareForRestore_KeepOriginalPVC_ResumesOwnRename(t *testing.T) {
+	f := newKeepPVCFixture(t)
+	f.pv.Spec.PersistentVolumeReclaimPolicy = corev1.PersistentVolumeReclaimRetain
+	f.pv.Annotations = map[string]string{originalReclaimPolicyAnnotation: "Delete"}
+	own := &corev1.PersistentVolumeClaim{
+		ObjectMeta: metav1.ObjectMeta{
+			Name: f.origName, Namespace: f.ns,
+			Annotations: map[string]string{
+				origPVCRestoreJobUIDAnnotation:  string(f.restoreJob.UID),
+				originalReclaimPolicyAnnotation: "Delete",
+			},
+		},
+		Spec: corev1.PersistentVolumeClaimSpec{VolumeName: "pv-current"},
+	}
+	r := f.reconciler(t, f.livePVC, f.pv, own)
+	ctx := context.Background()
+
+	for pass := 1; pass <= 2; pass++ {
+		ready, _, err := r.prepareForRestore(ctx, f.restoreJob, f.backup, f.ur, f.target, f.opts)
+		if err != nil || !ready {
+			t.Fatalf("pass %d: prepareForRestore() = ready %v, error %v; want ready", pass, ready, err)
+		}
+		if err := r.Get(ctx, client.ObjectKeyFromObject(f.livePVC), &corev1.PersistentVolumeClaim{}); !errors.IsNotFound(err) {
+			t.Errorf("pass %d: original PVC still exists (err %v)", pass, err)
+		}
+		kept := &corev1.PersistentVolumeClaim{}
+		if err := r.Get(ctx, client.ObjectKey{Namespace: f.ns, Name: f.origName}, kept); err != nil {
+			t.Fatalf("pass %d: -orig PVC is gone: %v", pass, err)
+		}
+		pv := &corev1.PersistentVolume{}
+		if err := r.Get(ctx, client.ObjectKey{Name: "pv-current"}, pv); err != nil {
+			t.Fatal(err)
+		}
+		if ref := pv.Spec.ClaimRef; ref == nil || ref.Name != f.origName || ref.UID != kept.UID {
+			t.Errorf("pass %d: PV claimRef = %+v, want %s", pass, ref, f.origName)
+		}
+	}
+	if f.dataVolumeExists(t, r) {
+		t.Error("DataVolume was not deleted after the rename completed")
+	}
+}
+
+// The PV goes to Retain so it outlives the original PVC; the policy it had
+// must be recorded, or nobody can set it back on the -orig PVC's PV.
+func TestRenamePVC_RecordsOriginalReclaimPolicy(t *testing.T) {
+	for _, policy := range []corev1.PersistentVolumeReclaimPolicy{
+		corev1.PersistentVolumeReclaimDelete,
+		corev1.PersistentVolumeReclaimRetain,
+	} {
+		t.Run(string(policy), func(t *testing.T) {
+			f := newKeepPVCFixture(t)
+			f.pv.Spec.PersistentVolumeReclaimPolicy = policy
+			r := f.reconciler(t, f.livePVC, f.pv)
+			ctx := context.Background()
+
+			if err := r.renamePVC(ctx, f.restoreJob, f.ns, f.livePVC.Name, f.origName); err != nil {
+				t.Fatalf("renamePVC() error = %v", err)
+			}
+
+			pv := &corev1.PersistentVolume{}
+			if err := r.Get(ctx, client.ObjectKey{Name: "pv-current"}, pv); err != nil {
+				t.Fatal(err)
+			}
+			if pv.Spec.PersistentVolumeReclaimPolicy != corev1.PersistentVolumeReclaimRetain {
+				t.Errorf("PV policy = %s, want Retain while the -orig PVC holds it", pv.Spec.PersistentVolumeReclaimPolicy)
+			}
+			if got := pv.Annotations[originalReclaimPolicyAnnotation]; got != string(policy) {
+				t.Errorf("PV %s = %q, want %q", originalReclaimPolicyAnnotation, got, policy)
+			}
+			kept := &corev1.PersistentVolumeClaim{}
+			if err := r.Get(ctx, client.ObjectKey{Namespace: f.ns, Name: f.origName}, kept); err != nil {
+				t.Fatal(err)
+			}
+			if got := kept.Annotations[originalReclaimPolicyAnnotation]; got != string(policy) {
+				t.Errorf("-orig PVC %s = %q, want %q", originalReclaimPolicyAnnotation, got, policy)
+			}
+		})
+	}
+}
+
+// Any failure to keep the disk must hold the restore back before its
+// DataVolume is deleted, not only a taken -orig name, and the retry must
+// finish the rename once the cause is gone.
+func TestPrepareForRestore_KeepOriginalPVC_FailedRenameKeepsDataVolume(t *testing.T) {
+	f := newKeepPVCFixture(t)
+	r := f.reconciler(t, f.livePVC) // PV pv-current is missing
+	ctx := context.Background()
+
+	ready, result, err := r.prepareForRestore(ctx, f.restoreJob, f.backup, f.ur, f.target, f.opts)
+	if err != nil || ready || result.RequeueAfter == 0 {
+		t.Errorf("prepareForRestore() = ready %v, %+v, error %v; want a requeue without failing the restore", ready, result, err)
+	}
+	if !f.dataVolumeExists(t, r) {
+		t.Fatal("DataVolume was deleted although the disk could not be kept")
+	}
+
+	if err := r.Create(ctx, f.pv); err != nil {
+		t.Fatal(err)
+	}
+	ready, _, err = r.prepareForRestore(ctx, f.restoreJob, f.backup, f.ur, f.target, f.opts)
+	if err != nil || !ready {
+		t.Fatalf("retry: prepareForRestore() = ready %v, error %v; want ready", ready, err)
+	}
+	if err := r.Get(ctx, client.ObjectKey{Namespace: f.ns, Name: f.origName}, &corev1.PersistentVolumeClaim{}); err != nil {
+		t.Errorf("retry: -orig PVC: %v", err)
+	}
+	if f.dataVolumeExists(t, r) {
+		t.Error("retry: DataVolume was not deleted after the rename completed")
+	}
+}
+
+// laggingCacheReconciler serves every cached read from the objects as they
+// were seeded, as an informer that has not caught up with this reconcile's
+// own writes would; APIReader sees the writes.
+func (f *keepPVCFixture) laggingCacheReconciler(t *testing.T, objects ...client.Object) *RestoreJobReconciler {
+	t.Helper()
+	r := f.reconciler(t, objects...)
+	seeded := append([]client.Object{f.restoreJob, f.backup}, objects...)
+	for i, obj := range seeded {
+		seeded[i] = obj.DeepCopyObject().(client.Object)
+	}
+	cache := clientfake.NewClientBuilder().WithScheme(r.Scheme).WithObjects(seeded...).Build()
+	apiServer := r.Client.(client.WithWatch)
+	r.Client = interceptor.NewClient(apiServer, interceptor.Funcs{
+		Get: func(ctx context.Context, _ client.WithWatch, key client.ObjectKey, obj client.Object, opts ...client.GetOption) error {
+			return cache.Get(ctx, key, obj, opts...)
+		},
+	})
+	r.APIReader = apiServer
+	return r
+}
+
+// On the lab, a two-disk restore failed one disk with "failed to get -orig
+// PVC ...: not found": the PVC had just been created, and the cache had not
+// seen it yet. The rename must not depend on the cache seeing its own writes.
+func TestPrepareForRestore_KeepOriginalPVC_CacheLagsBehindWrites(t *testing.T) {
+	f := newKeepPVCFixture(t)
+	r := f.laggingCacheReconciler(t, f.livePVC, f.pv)
+	ctx := context.Background()
+
+	ready, _, err := r.prepareForRestore(ctx, f.restoreJob, f.backup, f.ur, f.target, f.opts)
+	if err != nil || !ready {
+		t.Fatalf("prepareForRestore() = ready %v, error %v; want ready", ready, err)
+	}
+	kept := &corev1.PersistentVolumeClaim{}
+	if err := r.APIReader.Get(ctx, client.ObjectKey{Namespace: f.ns, Name: f.origName}, kept); err != nil {
+		t.Fatalf("-orig PVC: %v", err)
+	}
+	if err := r.APIReader.Get(ctx, client.ObjectKeyFromObject(f.livePVC), &corev1.PersistentVolumeClaim{}); !errors.IsNotFound(err) {
+		t.Errorf("original PVC still exists (err %v)", err)
+	}
+	pv := &corev1.PersistentVolume{}
+	if err := r.APIReader.Get(ctx, client.ObjectKey{Name: "pv-current"}, pv); err != nil {
+		t.Fatal(err)
+	}
+	if ref := pv.Spec.ClaimRef; ref == nil || ref.Name != f.origName || ref.UID != kept.UID {
+		t.Errorf("PV claimRef = %+v, want %s", ref, f.origName)
+	}
+	if pv.Spec.PersistentVolumeReclaimPolicy != corev1.PersistentVolumeReclaimRetain {
+		t.Errorf("PV policy = %s, want Retain", pv.Spec.PersistentVolumeReclaimPolicy)
+	}
+	if f.dataVolumeExists(t, r) {
+		t.Error("DataVolume was not deleted after the rename completed")
+	}
+}
diff --git a/internal/backupcontroller/velerostrategy_disk_in_use_test.go b/internal/backupcontroller/velerostrategy_disk_in_use_test.go
new file mode 100644
index 0000000000..1ec72363d8
--- /dev/null
+++ b/internal/backupcontroller/velerostrategy_disk_in_use_test.go
@@ -0,0 +1,154 @@
+// SPDX-License-Identifier: Apache-2.0
+package backupcontroller
+
+import (
+	"context"
+	"encoding/json"
+	"strings"
+	"testing"
+
+	corev1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/apimachinery/pkg/runtime"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+
+	backupsv1alpha1 "github.com/cozystack/cozystack/api/backups/v1alpha1"
+)
+
+// An in-place restore of a VMDisk that a running VM mounts must be refused
+// before anything changes: renaming the PVC under the VM leaves it Terminating
+// behind pvc-protection, and Velero then skips the PVC as already present.
+func TestPrepareForRestore_VMDiskInUse(t *testing.T) {
+	const (
+		ns    = "tenant-root"
+		claim = "vm-disk-data"
+	)
+	mountingPod := func(name, claimName string, phase corev1.PodPhase) *corev1.Pod {
+		return &corev1.Pod{
+			ObjectMeta: metav1.ObjectMeta{Name: name, Namespace: ns},
+			Spec: corev1.PodSpec{
+				Containers: []corev1.Container{{Name: "compute", Image: "virt-launcher"}},
+				Volumes: []corev1.Volume{{
+					Name:         "disk",
+					VolumeSource: corev1.VolumeSource{PersistentVolumeClaim: &corev1.PersistentVolumeClaimVolumeSource{ClaimName: claimName}},
+				}},
+			},
+			Status: corev1.PodStatus{Phase: phase},
+		}
+	}
+	urRaw, _ := json.Marshal(vmInstanceResources{
+		DataVolumes: []backupsv1alpha1.DataVolumeResource{{DataVolumeName: claim, ApplicationName: "data"}},
+	})
+	ur := &runtime.RawExtension{Raw: urRaw}
+	restoreJob := &backupsv1alpha1.RestoreJob{
+		ObjectMeta: metav1.ObjectMeta{Name: "restore-disk", Namespace: ns},
+		Spec:       backupsv1alpha1.RestoreJobSpec{BackupRef: corev1.LocalObjectReference{Name: "bk"}},
+	}
+	backupOf := func(kind, name string) *backupsv1alpha1.Backup {
+		return &backupsv1alpha1.Backup{
+			ObjectMeta: metav1.ObjectMeta{Name: "bk", Namespace: ns},
+			Spec: backupsv1alpha1.BackupSpec{
+				ApplicationRef: corev1.TypedLocalObjectReference{APIGroup: new("apps.cozystack.io"), Kind: kind, Name: name},
+			},
+		}
+	}
+	pvc := &corev1.PersistentVolumeClaim{ObjectMeta: metav1.ObjectMeta{Name: claim, Namespace: ns}}
+	keep := RestoreOptions{KeepOriginalPVC: new(true)}
+
+	t.Run("a running pod that mounts the disk fails the restore and changes nothing", func(t *testing.T) {
+		backup := backupOf("VMDisk", "data")
+		hr := makeUnstructuredHelmRelease(claim, ns, nil)
+		r := newTestRestoreJobReconcilerWithDynamic(t, []runtime.Object{hr},
+			restoreJob.DeepCopy(), backup, pvc.DeepCopy(), mountingPod("virt-launcher-vm-instance-web-abcde", claim, corev1.PodRunning))
+		ctx := context.Background()
+
+		ready, _, err := r.prepareForRestore(ctx, restoreJob.DeepCopy(), backup, ur, restoreTarget{Namespace: ns, AppName: "data", AppKind: "VMDisk"}, keep)
+		if err == nil || ready {
+			t.Fatalf("prepareForRestore = ready %v, err %v; want an error for a mounted disk", ready, err)
+		}
+		if !strings.Contains(err.Error(), "pod/virt-launcher-vm-instance-web-abcde") {
+			t.Errorf("error %q does not name the pod that mounts the disk", err)
+		}
+		if err := r.Get(ctx, client.ObjectKey{Namespace: ns, Name: claim}, &corev1.PersistentVolumeClaim{}); err != nil {
+			t.Errorf("the mounted PVC must keep its name, got %v", err)
+		}
+		got, err := r.Resource(helmReleaseGVR).Namespace(ns).Get(ctx, claim, metav1.GetOptions{})
+		if err != nil {
+			t.Fatalf("get HelmRelease: %v", err)
+		}
+		if suspended, _, _ := unstructured.NestedBool(got.Object, "spec", "suspend"); suspended {
+			t.Errorf("the HelmRelease must not be suspended for a refused restore")
+		}
+	})
+
+	for _, tc := range []struct {
+		name string
+		pod  *corev1.Pod
+	}{
+		{name: "a pod that has finished does not hold the disk", pod: mountingPod("importer", claim, corev1.PodSucceeded)},
+		{name: "a pod that mounts another disk does not hold this one", pod: mountingPod("other", "vm-disk-other", corev1.PodRunning)},
+	} {
+		t.Run(tc.name, func(t *testing.T) {
+			backup := backupOf("VMDisk", "data")
+			r := newTestRestoreJobReconciler(t, restoreJob.DeepCopy(), backup, pvc.DeepCopy(), tc.pod)
+			ready, _, err := r.prepareForRestore(context.Background(), restoreJob.DeepCopy(), backup, ur,
+				restoreTarget{Namespace: ns, AppName: "data", AppKind: "VMDisk"}, RestoreOptions{KeepOriginalPVC: new(false)})
+			if err != nil || !ready {
+				t.Fatalf("prepareForRestore = ready %v, err %v; want ready", ready, err)
+			}
+		})
+	}
+
+	// A VMInstance target is halted, so its own launcher Pod is not a reason to
+	// refuse; the rename waits until that Pod has let go of the disks.
+	t.Run("a VMInstance target waits for its own launcher pod instead of being refused", func(t *testing.T) {
+		backup := backupOf("VMInstance", "web")
+		r := newTestRestoreJobReconciler(t, restoreJob.DeepCopy(), backup, pvc.DeepCopy(),
+			mountingPod("virt-launcher-vm-instance-web-abcde", claim, corev1.PodRunning))
+		ready, res, err := r.prepareForRestore(context.Background(), restoreJob.DeepCopy(), backup, ur,
+			restoreTarget{Namespace: ns, AppName: "web", AppKind: "VMInstance"}, RestoreOptions{KeepOriginalPVC: new(true)})
+		if err != nil || ready || res.RequeueAfter == 0 {
+			t.Fatalf("prepareForRestore = ready %v, requeue %v, err %v; want a requeue", ready, res.RequeueAfter, err)
+		}
+		if err := r.Get(context.Background(), client.ObjectKey{Namespace: ns, Name: claim}, &corev1.PersistentVolumeClaim{}); err != nil {
+			t.Errorf("the PVC was renamed while the launcher still mounts it: %v", err)
+		}
+	})
+
+	t.Run("a VMInstance target proceeds once no pod mounts its disks", func(t *testing.T) {
+		backup := backupOf("VMInstance", "web")
+		r := newTestRestoreJobReconciler(t, restoreJob.DeepCopy(), backup, pvc.DeepCopy())
+		ready, _, err := r.prepareForRestore(context.Background(), restoreJob.DeepCopy(), backup, ur,
+			restoreTarget{Namespace: ns, AppName: "web", AppKind: "VMInstance"}, RestoreOptions{KeepOriginalPVC: new(false)})
+		if err != nil || !ready {
+			t.Fatalf("prepareForRestore = ready %v, err %v; want ready", ready, err)
+		}
+	})
+
+	// A launcher Pod already being deleted (the VM was just stopped) releases the
+	// disk on its own, so the restore waits rather than fails.
+	t.Run("a VMDisk held by a pod being deleted waits instead of failing", func(t *testing.T) {
+		backup := backupOf("VMDisk", "data")
+		pod := mountingPod("virt-launcher-vm-instance-web-abcde", claim, corev1.PodRunning)
+		now := metav1.Now()
+		pod.DeletionTimestamp = &now
+		pod.Finalizers = []string{"kubernetes"}
+		r := newTestRestoreJobReconciler(t, restoreJob.DeepCopy(), backup, pvc.DeepCopy(), pod)
+		ready, res, err := r.prepareForRestore(context.Background(), restoreJob.DeepCopy(), backup, ur,
+			restoreTarget{Namespace: ns, AppName: "data", AppKind: "VMDisk"}, keep)
+		if err != nil || ready || res.RequeueAfter == 0 {
+			t.Fatalf("prepareForRestore = ready %v, requeue %v, err %v; want a requeue", ready, res.RequeueAfter, err)
+		}
+	})
+
+	t.Run("a pod that failed does not hold the disk", func(t *testing.T) {
+		backup := backupOf("VMDisk", "data")
+		r := newTestRestoreJobReconciler(t, restoreJob.DeepCopy(), backup, pvc.DeepCopy(), mountingPod("evicted", claim, corev1.PodFailed))
+		ready, _, err := r.prepareForRestore(context.Background(), restoreJob.DeepCopy(), backup, ur,
+			restoreTarget{Namespace: ns, AppName: "data", AppKind: "VMDisk"}, RestoreOptions{KeepOriginalPVC: new(false)})
+		if err != nil || !ready {
+			t.Fatalf("prepareForRestore = ready %v, err %v; want ready", ready, err)
+		}
+	})
+}
diff --git a/internal/backupcontroller/velerostrategy_vmdisk_restore_test.go b/internal/backupcontroller/velerostrategy_vmdisk_restore_test.go
new file mode 100644
index 0000000000..728d404060
--- /dev/null
+++ b/internal/backupcontroller/velerostrategy_vmdisk_restore_test.go
@@ -0,0 +1,870 @@
+// SPDX-License-Identifier: Apache-2.0
+package backupcontroller
+
+import (
+	"context"
+	"encoding/json"
+	"errors"
+	"strings"
+	"testing"
+	"time"
+
+	velerov1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
+	corev1 "k8s.io/api/core/v1"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	"k8s.io/apimachinery/pkg/api/meta"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	dynamicfake "k8s.io/client-go/dynamic/fake"
+	"k8s.io/client-go/kubernetes/scheme"
+	k8stesting "k8s.io/client-go/testing"
+	"k8s.io/client-go/tools/record"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+	clientfake "sigs.k8s.io/controller-runtime/pkg/client/fake"
+	"sigs.k8s.io/controller-runtime/pkg/client/interceptor"
+
+	strategyv1alpha1 "github.com/cozystack/cozystack/api/backups/strategy/v1alpha1"
+	backupsv1alpha1 "github.com/cozystack/cozystack/api/backups/v1alpha1"
+)
+
+func vmDiskTestScheme() *runtime.Scheme {
+	s := runtime.NewScheme()
+	_ = scheme.AddToScheme(s)
+	_ = backupsv1alpha1.AddToScheme(s)
+	_ = strategyv1alpha1.AddToScheme(s)
+	_ = velerov1.AddToScheme(s)
+	return s
+}
+
+func diskSelector() *metav1.LabelSelector {
+	return &metav1.LabelSelector{MatchLabels: map[string]string{"app.kubernetes.io/instance": "vm-disk-{{ .Application.metadata.name }}"}}
+}
+
+// Velero rejects a Backup or Restore that carries both labelSelector and
+// orLabelSelectors, so a VMDisk strategy written with labelSelector must not
+// get the per-disk orLabelSelectors a VMInstance needs.
+func TestCreateVeleroBackup_VMDiskKeepsStrategySelector(t *testing.T) {
+	s := vmDiskTestScheme()
+	app := &corev1.Pod{
+		ObjectMeta: metav1.ObjectMeta{Name: "data", Namespace: "tenant-root"},
+		Spec:       corev1.PodSpec{Containers: []corev1.Container{{Name: "c", Image: "i"}}},
+	}
+	mapping := &meta.RESTMapping{
+		Resource:         schema.GroupVersionResource{Version: "v1", Resource: "pods"},
+		GroupVersionKind: schema.GroupVersionKind{Version: "v1", Kind: "Pod"},
+		Scope:            meta.RESTScopeNamespace,
+	}
+	bj := &backupsv1alpha1.BackupJob{
+		ObjectMeta: metav1.ObjectMeta{Name: "bj", Namespace: "tenant-root"},
+		Spec: backupsv1alpha1.BackupJobSpec{ApplicationRef: corev1.TypedLocalObjectReference{
+			APIGroup: new("apps.cozystack.io"), Kind: vmDiskAppKind, Name: "data",
+		}},
+	}
+	strategy := &strategyv1alpha1.Velero{
+		ObjectMeta: metav1.ObjectMeta{Name: "s"},
+		Spec: strategyv1alpha1.VeleroSpec{Template: strategyv1alpha1.VeleroTemplate{
+			Spec: velerov1.BackupSpec{LabelSelector: diskSelector()},
+		}},
+	}
+	c := clientfake.NewClientBuilder().WithScheme(s).WithObjects(bj, strategy).Build()
+	r := &BackupJobReconciler{Client: c, Interface: dynamicfake.NewSimpleDynamicClient(s, app),
+		RESTMapper: &mockRESTMapper{mapping: mapping}, Scheme: s, Recorder: record.NewFakeRecorder(10)}
+
+	if err := r.createVeleroBackup(context.Background(), bj, strategy, &ResolvedBackupConfig{}); err != nil {
+		t.Fatalf("createVeleroBackup: %v", err)
+	}
+	backups := &velerov1.BackupList{}
+	if err := c.List(context.Background(), backups, client.InNamespace(veleroNamespace)); err != nil || len(backups.Items) != 1 {
+		t.Fatalf("list Velero Backups: %v (%d items)", err, len(backups.Items))
+	}
+	spec := backups.Items[0].Spec
+	if spec.LabelSelector == nil || len(spec.OrLabelSelectors) != 0 {
+		t.Fatalf("labelSelector %v, orLabelSelectors %d; want the strategy's labelSelector alone", spec.LabelSelector, len(spec.OrLabelSelectors))
+	}
+}
+
+func TestCreateVeleroRestore_VMDiskKeepsStrategySelector(t *testing.T) {
+	s := vmDiskTestScheme()
+	ns := "tenant-root"
+	backup := &backupsv1alpha1.Backup{
+		ObjectMeta: metav1.ObjectMeta{Name: "bk", Namespace: ns},
+		Spec: backupsv1alpha1.BackupSpec{ApplicationRef: corev1.TypedLocalObjectReference{
+			APIGroup: new("apps.cozystack.io"), Kind: vmDiskAppKind, Name: "data",
+		}},
+	}
+	restoreJob := &backupsv1alpha1.RestoreJob{
+		ObjectMeta: metav1.ObjectMeta{Name: "rj", Namespace: ns, UID: "uid-rj"},
+		Spec:       backupsv1alpha1.RestoreJobSpec{BackupRef: corev1.LocalObjectReference{Name: "bk"}},
+	}
+	strategy := &strategyv1alpha1.Velero{
+		ObjectMeta: metav1.ObjectMeta{Name: "s"},
+		Spec: strategyv1alpha1.VeleroSpec{Template: strategyv1alpha1.VeleroTemplate{
+			RestoreSpec: &velerov1.RestoreSpec{LabelSelector: diskSelector()},
+		}},
+	}
+	urRaw, _ := json.Marshal(vmInstanceResources{
+		DataVolumes: []backupsv1alpha1.DataVolumeResource{{DataVolumeName: "vm-disk-data", ApplicationName: "data"}},
+	})
+	c := clientfake.NewClientBuilder().WithScheme(s).WithObjects(backup, restoreJob, strategy).Build()
+	r := &RestoreJobReconciler{Client: c, Scheme: s, Recorder: record.NewFakeRecorder(10)}
+
+	if err := r.createVeleroRestore(context.Background(), restoreJob, backup, strategy, "velero-bk", &runtime.RawExtension{Raw: urRaw},
+		restoreTarget{Namespace: ns, AppName: "data", AppKind: vmDiskAppKind}, RestoreOptions{}); err != nil {
+		t.Fatalf("createVeleroRestore: %v", err)
+	}
+	restores := &velerov1.RestoreList{}
+	if err := c.List(context.Background(), restores, client.InNamespace(veleroNamespace)); err != nil || len(restores.Items) != 1 {
+		t.Fatalf("list Velero Restores: %v (%d items)", err, len(restores.Items))
+	}
+	spec := restores.Items[0].Spec
+	if spec.LabelSelector == nil || len(spec.OrLabelSelectors) != 0 {
+		t.Fatalf("labelSelector %v, orLabelSelectors %d; want the strategy's labelSelector alone", spec.LabelSelector, len(spec.OrLabelSelectors))
+	}
+}
+
+// A VMDisk Backup taken before underlying resources were recorded still
+// restores its disk prepared, and the in-use refusal still applies to it.
+func TestPrepareForRestore_VMDiskBackupWithoutUnderlyingResources(t *testing.T) {
+	const ns = "tenant-root"
+	backup := &backupsv1alpha1.Backup{
+		ObjectMeta: metav1.ObjectMeta{Name: "bk", Namespace: ns},
+		Spec: backupsv1alpha1.BackupSpec{ApplicationRef: corev1.TypedLocalObjectReference{
+			APIGroup: new("apps.cozystack.io"), Kind: vmDiskAppKind, Name: "data",
+		}},
+	}
+	restoreJob := &backupsv1alpha1.RestoreJob{
+		ObjectMeta: metav1.ObjectMeta{Name: "rj", Namespace: ns},
+		Spec:       backupsv1alpha1.RestoreJobSpec{BackupRef: corev1.LocalObjectReference{Name: "bk"}},
+	}
+	target := restoreTarget{Namespace: ns, AppName: "data", AppKind: vmDiskAppKind}
+
+	t.Run("its disk is prepared", func(t *testing.T) {
+		hr := makeUnstructuredHelmRelease("vm-disk-data", ns, nil)
+		r := newTestRestoreJobReconcilerWithDynamic(t, []runtime.Object{hr}, restoreJob.DeepCopy(), backup)
+		ready, _, err := r.prepareForRestore(context.Background(), restoreJob.DeepCopy(), backup, nil, target, RestoreOptions{KeepOriginalPVC: new(true)})
+		if err != nil || !ready {
+			t.Fatalf("prepareForRestore = ready %v, err %v; want ready", ready, err)
+		}
+		got, err := r.Resource(helmReleaseGVR).Namespace(ns).Get(context.Background(), "vm-disk-data", metav1.GetOptions{})
+		if err != nil {
+			t.Fatalf("get HelmRelease: %v", err)
+		}
+		if suspended, _, _ := unstructured.NestedBool(got.Object, "spec", "suspend"); !suspended {
+			t.Fatalf("the disk's HelmRelease was not suspended")
+		}
+	})
+
+	t.Run("a mounted disk is refused", func(t *testing.T) {
+		pod := &corev1.Pod{
+			ObjectMeta: metav1.ObjectMeta{Name: "virt-launcher-web", Namespace: ns},
+			Spec: corev1.PodSpec{
+				Containers: []corev1.Container{{Name: "compute", Image: "virt-launcher"}},
+				Volumes: []corev1.Volume{{Name: "disk", VolumeSource: corev1.VolumeSource{
+					PersistentVolumeClaim: &corev1.PersistentVolumeClaimVolumeSource{ClaimName: "vm-disk-data"},
+				}}},
+			},
+			Status: corev1.PodStatus{Phase: corev1.PodRunning},
+		}
+		r := newTestRestoreJobReconciler(t, restoreJob.DeepCopy(), backup, pod)
+		if _, _, err := r.prepareForRestore(context.Background(), restoreJob.DeepCopy(), backup, nil, target, RestoreOptions{KeepOriginalPVC: new(true)}); err == nil {
+			t.Fatalf("prepareForRestore accepted a mounted disk")
+		}
+	})
+}
+
+// Failing to list Pods must not read as "not in use": the restore waits and
+// touches nothing.
+func TestPrepareForRestore_VMDiskInUseCheckFailsClosed(t *testing.T) {
+	const ns = "tenant-root"
+	s := vmDiskTestScheme()
+	backup := &backupsv1alpha1.Backup{
+		ObjectMeta: metav1.ObjectMeta{Name: "bk", Namespace: ns},
+		Spec: backupsv1alpha1.BackupSpec{ApplicationRef: corev1.TypedLocalObjectReference{
+			APIGroup: new("apps.cozystack.io"), Kind: vmDiskAppKind, Name: "data",
+		}},
+	}
+	restoreJob := &backupsv1alpha1.RestoreJob{ObjectMeta: metav1.ObjectMeta{Name: "rj", Namespace: ns}}
+	c := clientfake.NewClientBuilder().WithScheme(s).WithObjects(backup, restoreJob).
+		WithStatusSubresource(&backupsv1alpha1.RestoreJob{}).
+		WithInterceptorFuncs(interceptor.Funcs{List: func(ctx context.Context, cl client.WithWatch, list client.ObjectList, opts ...client.ListOption) error {
+			if _, ok := list.(*corev1.PodList); ok {
+				return errors.New("pods is forbidden")
+			}
+			return cl.List(ctx, list, opts...)
+		}}).Build()
+	hr := makeUnstructuredHelmRelease("vm-disk-data", ns, nil)
+	r := &RestoreJobReconciler{Client: c, Interface: dynamicfake.NewSimpleDynamicClient(s, hr), Scheme: s, Recorder: record.NewFakeRecorder(10)}
+
+	ready, res, err := r.prepareForRestore(context.Background(), restoreJob, backup, nil,
+		restoreTarget{Namespace: ns, AppName: "data", AppKind: vmDiskAppKind}, RestoreOptions{KeepOriginalPVC: new(true)})
+	if err != nil || ready || res.RequeueAfter == 0 {
+		t.Fatalf("prepareForRestore = ready %v, requeue %v, err %v; want a requeue", ready, res.RequeueAfter, err)
+	}
+	got, err := r.Resource(helmReleaseGVR).Namespace(ns).Get(context.Background(), "vm-disk-data", metav1.GetOptions{})
+	if err != nil {
+		t.Fatalf("get HelmRelease: %v", err)
+	}
+	if suspended, _, _ := unstructured.NestedBool(got.Object, "spec", "suspend"); suspended {
+		t.Fatalf("the HelmRelease was suspended although the in-use check could not run")
+	}
+}
+
+// A restore that fails after preparation leaves the disk suspended and its data
+// in the -orig- PVC; the failure has to say so, since nothing is rolled back,
+// and must not name what preparation did not get to.
+func TestPreparedRestoreLeftovers(t *testing.T) {
+	const ns = "tenant-root"
+	restoreJob := &backupsv1alpha1.RestoreJob{ObjectMeta: metav1.ObjectMeta{Name: "rj", Namespace: ns}}
+	vmDisk := &backupsv1alpha1.Backup{Spec: backupsv1alpha1.BackupSpec{ApplicationRef: corev1.TypedLocalObjectReference{Kind: vmDiskAppKind, Name: "data"}}}
+	orig := "vm-disk-data-orig-" + shortHash("rj")
+	origPVC := &corev1.PersistentVolumeClaim{ObjectMeta: metav1.ObjectMeta{Name: orig, Namespace: ns}}
+	keep := RestoreOptions{KeepOriginalPVC: new(true)}
+	inPlace := restoreTarget{Namespace: ns}
+	ctx := context.Background()
+
+	r := newTestRestoreJobReconcilerWithDynamic(t, []runtime.Object{suspendedHelmRelease(ns, "vm-disk-data", true)}, origPVC)
+	got := r.preparedRestoreLeftovers(ctx, restoreJob, vmDisk, nil, inPlace, keep)
+	for _, want := range []string{"suspended HelmRelease vm-disk-data", "PVC " + orig} {
+		if !strings.Contains(got, want) {
+			t.Errorf("leftovers %q does not mention %q", got, want)
+		}
+	}
+	if got := r.preparedRestoreLeftovers(ctx, restoreJob, vmDisk, nil, inPlace, RestoreOptions{KeepOriginalPVC: new(false)}); strings.Contains(got, "-orig-") {
+		t.Errorf("leftovers %q names an -orig- PVC although keepOriginalPVC is off", got)
+	}
+	if got := r.preparedRestoreLeftovers(ctx, restoreJob, vmDisk, nil, restoreTarget{Namespace: ns, IsCopy: true}, keep); got != "" {
+		t.Errorf("a restore to a copy prepares nothing, got %q", got)
+	}
+
+	suspendedOnly := newTestRestoreJobReconcilerWithDynamic(t, []runtime.Object{suspendedHelmRelease(ns, "vm-disk-data", true)})
+	if got := suspendedOnly.preparedRestoreLeftovers(ctx, restoreJob, vmDisk, nil, inPlace, keep); !strings.Contains(got, "suspended HelmRelease vm-disk-data") || strings.Contains(got, "-orig-") {
+		t.Errorf("leftovers %q: want the suspended HelmRelease and no -orig- PVC, which was never created", got)
+	}
+
+	untouched := newTestRestoreJobReconcilerWithDynamic(t, []runtime.Object{makeUnstructuredHelmRelease("vm-disk-data", ns, nil)})
+	if got := untouched.preparedRestoreLeftovers(ctx, restoreJob, vmDisk, nil, inPlace, keep); got != "" {
+		t.Errorf("leftovers %q for a target preparation never changed, want none", got)
+	}
+}
+
+// Every way an in-place restore can fail once its target was prepared has to
+// name what preparation left behind.
+func TestReconcileVeleroRestore_FailureAfterPreparationNamesLeftovers(t *testing.T) {
+	const ns = "tenant-root"
+	orig := "vm-disk-data-orig-" + shortHash("rj")
+	veleroRestore := func(name string, phase velerov1.RestorePhase) *velerov1.Restore {
+		return &velerov1.Restore{
+			ObjectMeta: metav1.ObjectMeta{Name: name, Namespace: veleroNamespace, Labels: map[string]string{
+				backupsv1alpha1.OwningJobNameLabel:      "rj",
+				backupsv1alpha1.OwningJobNamespaceLabel: ns,
+			}},
+			Status: velerov1.RestoreStatus{Phase: phase},
+		}
+	}
+	failRestoreCreate := interceptor.Funcs{Create: func(ctx context.Context, cl client.WithWatch, obj client.Object, opts ...client.CreateOption) error {
+		if _, ok := obj.(*velerov1.Restore); ok {
+			return errors.New("admission webhook denied the request")
+		}
+		return cl.Create(ctx, obj, opts...)
+	}}
+
+	for _, tc := range []struct {
+		name     string
+		restores []client.Object
+		funcs    interceptor.Funcs
+		cause    string
+	}{
+		{name: "the Velero Restore partially failed", restores: []client.Object{veleroRestore("rj-a", velerov1.RestorePhasePartiallyFailed)}, cause: "PartiallyFailed"},
+		{name: "several Velero Restores own the job", restores: []client.Object{veleroRestore("rj-a", ""), veleroRestore("rj-b", "")}, cause: "multiple Velero Restores"},
+		{name: "Velero rejected the Restore", restores: []client.Object{func() client.Object {
+			vr := veleroRestore("rj-a", velerov1.RestorePhaseFailedValidation)
+			vr.Status.ValidationErrors = []string{"backup velero-bk not found"}
+			return vr
+		}()}, cause: "FailedValidation: backup velero-bk not found"},
+		{name: "the Velero Restore could not be created", funcs: failRestoreCreate, cause: "failed to create Velero Restore"},
+	} {
+		t.Run(tc.name, func(t *testing.T) {
+			s := vmDiskTestScheme()
+			started := metav1.Now()
+			restoreJob := &backupsv1alpha1.RestoreJob{
+				ObjectMeta: metav1.ObjectMeta{Name: "rj", Namespace: ns, UID: "rj-uid"},
+				Spec:       backupsv1alpha1.RestoreJobSpec{BackupRef: corev1.LocalObjectReference{Name: "bk"}},
+				Status:     backupsv1alpha1.RestoreJobStatus{Phase: backupsv1alpha1.RestoreJobPhaseRunning, StartedAt: &started},
+			}
+			backup := &backupsv1alpha1.Backup{
+				ObjectMeta: metav1.ObjectMeta{Name: "bk", Namespace: ns},
+				Spec: backupsv1alpha1.BackupSpec{
+					ApplicationRef: corev1.TypedLocalObjectReference{APIGroup: new("apps.cozystack.io"), Kind: vmDiskAppKind, Name: "data"},
+					StrategyRef:    corev1.TypedLocalObjectReference{APIGroup: new(strategyv1alpha1.GroupVersion.Group), Kind: strategyv1alpha1.VeleroStrategyKind, Name: "s"},
+					DriverMetadata: map[string]string{veleroBackupNameMetadataKey: "velero-bk"},
+				},
+			}
+			strategy := &strategyv1alpha1.Velero{ObjectMeta: metav1.ObjectMeta{Name: "s"}}
+			c := clientfake.NewClientBuilder().WithScheme(s).
+				WithObjects(append([]client.Object{restoreJob, backup, strategy, completedVeleroBackup("velero-bk")}, append(keptOrigPVC(ns), tc.restores...)...)...).
+				WithStatusSubresource(&backupsv1alpha1.RestoreJob{}).
+				WithInterceptorFuncs(tc.funcs).Build()
+			recorder := record.NewFakeRecorder(20)
+			r := &RestoreJobReconciler{Client: c, Interface: dynamicfake.NewSimpleDynamicClient(s, suspendedHelmRelease(ns, "vm-disk-data", true)), Scheme: s, Recorder: recorder}
+
+			rj := &backupsv1alpha1.RestoreJob{}
+			if err := c.Get(context.Background(), client.ObjectKey{Namespace: ns, Name: "rj"}, rj); err != nil {
+				t.Fatalf("get RestoreJob: %v", err)
+			}
+			if _, err := r.reconcileVeleroRestore(context.Background(), rj, backup); err != nil {
+				t.Fatalf("reconcileVeleroRestore: %v", err)
+			}
+			if err := c.Get(context.Background(), client.ObjectKey{Namespace: ns, Name: "rj"}, rj); err != nil {
+				t.Fatalf("get RestoreJob: %v", err)
+			}
+			if rj.Status.Phase != backupsv1alpha1.RestoreJobPhaseFailed {
+				t.Fatalf("Phase = %q, want Failed", rj.Status.Phase)
+			}
+			for _, want := range []string{tc.cause, "suspended HelmRelease vm-disk-data", "PVC " + orig} {
+				if !strings.Contains(rj.Status.Message, want) {
+					t.Errorf("message %q does not mention %q", rj.Status.Message, want)
+				}
+			}
+			warned := false
+			for len(recorder.Events) > 0 {
+				ev := <-recorder.Events
+				if strings.HasPrefix(ev, "Warning RestoreFailed") && strings.Contains(ev, orig) {
+					warned = true
+				}
+			}
+			if !warned {
+				t.Errorf("no Warning RestoreFailed event naming %s", orig)
+			}
+		})
+	}
+}
+
+func completedVeleroBackup(name string) *velerov1.Backup {
+	return &velerov1.Backup{
+		ObjectMeta: metav1.ObjectMeta{Name: name, Namespace: veleroNamespace},
+		Status:     velerov1.BackupStatus{Phase: velerov1.BackupPhaseCompleted},
+	}
+}
+
+// A Velero Backup that is gone or failed cannot be restored; the job fails
+// before preparation takes the target apart.
+func TestReconcileVeleroRestore_UnrestorableVeleroBackupFailsBeforePreparation(t *testing.T) {
+	const ns = "tenant-root"
+	for _, tc := range []struct {
+		name  string
+		vb    []client.Object
+		cause string
+	}{
+		{name: "the Velero Backup is gone", cause: "not found; it may have expired"},
+		{name: "the Velero Backup failed", vb: []client.Object{&velerov1.Backup{
+			ObjectMeta: metav1.ObjectMeta{Name: "velero-bk", Namespace: veleroNamespace},
+			Status:     velerov1.BackupStatus{Phase: velerov1.BackupPhaseFailed},
+		}}, cause: `is "Failed"`},
+	} {
+		t.Run(tc.name, func(t *testing.T) {
+			s := vmDiskTestScheme()
+			started := metav1.Now()
+			restoreJob := &backupsv1alpha1.RestoreJob{
+				ObjectMeta: metav1.ObjectMeta{Name: "rj", Namespace: ns, UID: "rj-uid"},
+				Spec:       backupsv1alpha1.RestoreJobSpec{BackupRef: corev1.LocalObjectReference{Name: "bk"}},
+				Status:     backupsv1alpha1.RestoreJobStatus{Phase: backupsv1alpha1.RestoreJobPhaseRunning, StartedAt: &started},
+			}
+			backup := &backupsv1alpha1.Backup{
+				ObjectMeta: metav1.ObjectMeta{Name: "bk", Namespace: ns},
+				Spec: backupsv1alpha1.BackupSpec{
+					ApplicationRef: corev1.TypedLocalObjectReference{APIGroup: new("apps.cozystack.io"), Kind: vmDiskAppKind, Name: "data"},
+					StrategyRef:    corev1.TypedLocalObjectReference{APIGroup: new(strategyv1alpha1.GroupVersion.Group), Kind: strategyv1alpha1.VeleroStrategyKind, Name: "s"},
+					DriverMetadata: map[string]string{veleroBackupNameMetadataKey: "velero-bk"},
+				},
+			}
+			c := clientfake.NewClientBuilder().WithScheme(s).
+				WithObjects(append([]client.Object{restoreJob, backup, &strategyv1alpha1.Velero{ObjectMeta: metav1.ObjectMeta{Name: "s"}}}, tc.vb...)...).
+				WithStatusSubresource(&backupsv1alpha1.RestoreJob{}).Build()
+			hr := makeUnstructuredHelmRelease("vm-disk-data", ns, nil)
+			r := &RestoreJobReconciler{Client: c, Interface: dynamicfake.NewSimpleDynamicClient(s, hr), Scheme: s, Recorder: record.NewFakeRecorder(10)}
+
+			rj := &backupsv1alpha1.RestoreJob{}
+			if err := c.Get(context.Background(), client.ObjectKey{Namespace: ns, Name: "rj"}, rj); err != nil {
+				t.Fatalf("get RestoreJob: %v", err)
+			}
+			if _, err := r.reconcileVeleroRestore(context.Background(), rj, backup); err != nil {
+				t.Fatalf("reconcileVeleroRestore: %v", err)
+			}
+			if err := c.Get(context.Background(), client.ObjectKey{Namespace: ns, Name: "rj"}, rj); err != nil {
+				t.Fatalf("get RestoreJob: %v", err)
+			}
+			if rj.Status.Phase != backupsv1alpha1.RestoreJobPhaseFailed || !strings.Contains(rj.Status.Message, tc.cause) {
+				t.Fatalf("phase %q, message %q; want Failed mentioning %q", rj.Status.Phase, rj.Status.Message, tc.cause)
+			}
+			got, err := r.Resource(helmReleaseGVR).Namespace(ns).Get(context.Background(), "vm-disk-data", metav1.GetOptions{})
+			if err != nil {
+				t.Fatalf("get HelmRelease: %v", err)
+			}
+			if suspended, _, _ := unstructured.NestedBool(got.Object, "spec", "suspend"); suspended {
+				t.Fatalf("the disk was prepared although its Velero Backup cannot be restored")
+			}
+		})
+	}
+}
+
+// A suspend or halt that failed must stop preparation: renaming the PVC and
+// deleting the DataVolume under a running HelmRelease or VM is the race the
+// preparation exists to prevent.
+func TestPrepareForRestore_StopsWhenSuspendOrHaltFails(t *testing.T) {
+	const ns = "tenant-root"
+	urRaw, _ := json.Marshal(vmInstanceResources{
+		DataVolumes: []backupsv1alpha1.DataVolumeResource{{DataVolumeName: "vm-disk-data", ApplicationName: "data"}},
+	})
+	ur := &runtime.RawExtension{Raw: urRaw}
+	restoreJob := &backupsv1alpha1.RestoreJob{ObjectMeta: metav1.ObjectMeta{Name: "rj", Namespace: ns}}
+	pvc := &corev1.PersistentVolumeClaim{ObjectMeta: metav1.ObjectMeta{Name: "vm-disk-data", Namespace: ns}}
+	dataVolume := &unstructured.Unstructured{}
+	dataVolume.SetAPIVersion("cdi.kubevirt.io/v1beta1")
+	dataVolume.SetKind("DataVolume")
+	dataVolume.SetName("vm-disk-data")
+	dataVolume.SetNamespace(ns)
+	vm := &unstructured.Unstructured{}
+	vm.SetAPIVersion("kubevirt.io/v1")
+	vm.SetKind("VirtualMachine")
+	vm.SetName("vm-instance-web")
+	vm.SetNamespace(ns)
+
+	for _, tc := range []struct {
+		name     string
+		kind     string
+		app      string
+		resource string
+	}{
+		{name: "the HelmRelease suspend fails", kind: vmDiskAppKind, app: "data", resource: "helmreleases"},
+		{name: "the VM halt fails", kind: vmInstanceKind, app: "web", resource: "virtualmachines"},
+	} {
+		t.Run(tc.name, func(t *testing.T) {
+			backup := &backupsv1alpha1.Backup{
+				ObjectMeta: metav1.ObjectMeta{Name: "bk", Namespace: ns},
+				Spec:       backupsv1alpha1.BackupSpec{ApplicationRef: corev1.TypedLocalObjectReference{APIGroup: new("apps.cozystack.io"), Kind: tc.kind, Name: tc.app}},
+			}
+			r := newTestRestoreJobReconcilerWithDynamic(t, []runtime.Object{
+				makeUnstructuredHelmRelease("vm-disk-data", ns, nil),
+				makeUnstructuredHelmRelease("vm-instance-web", ns, nil),
+				dataVolume.DeepCopy(), vm.DeepCopy(),
+			}, restoreJob.DeepCopy(), backup, pvc.DeepCopy())
+			r.Interface.(*dynamicfake.FakeDynamicClient).PrependReactor("update", tc.resource, func(k8stesting.Action) (bool, runtime.Object, error) {
+				return true, nil, errors.New("conflict")
+			})
+
+			ready, res, err := r.prepareForRestore(context.Background(), restoreJob.DeepCopy(), backup, ur,
+				restoreTarget{Namespace: ns, AppName: tc.app, AppKind: tc.kind}, RestoreOptions{KeepOriginalPVC: new(true)})
+			if err != nil || ready || res.RequeueAfter == 0 {
+				t.Fatalf("prepareForRestore = ready %v, requeue %v, err %v; want a requeue", ready, res.RequeueAfter, err)
+			}
+			if err := r.Get(context.Background(), client.ObjectKey{Namespace: ns, Name: "vm-disk-data"}, &corev1.PersistentVolumeClaim{}); err != nil {
+				t.Errorf("the PVC was renamed: %v", err)
+			}
+			if _, err := r.Resource(dataVolumeGVR).Namespace(ns).Get(context.Background(), "vm-disk-data", metav1.GetOptions{}); err != nil {
+				t.Errorf("the DataVolume was deleted: %v", err)
+			}
+		})
+	}
+}
+
+func TestRestoreDisks(t *testing.T) {
+	backupOf := func(kind string) *backupsv1alpha1.Backup {
+		return &backupsv1alpha1.Backup{Spec: backupsv1alpha1.BackupSpec{ApplicationRef: corev1.TypedLocalObjectReference{Kind: kind, Name: "data"}}}
+	}
+	if got := restoreDisks(backupOf(vmDiskAppKind), nil); got == nil || len(got.DataVolumes) != 1 || got.DataVolumes[0].DataVolumeName != "vm-disk-data" {
+		t.Errorf("VMDisk without underlying resources: %+v, want vm-disk-data", got)
+	}
+	for _, kind := range []string{vmInstanceKind, "Postgres"} {
+		if got := restoreDisks(backupOf(kind), nil); got != nil {
+			t.Errorf("%s without underlying resources: %+v, want none; a disk must not be derived for another kind", kind, got)
+		}
+	}
+}
+
+// Kinds other than VMDisk and VMInstance have no disks to prepare and must pass
+// through preparation untouched.
+func TestPrepareForRestore_OtherKindWithoutDisks(t *testing.T) {
+	const ns = "tenant-root"
+	backup := &backupsv1alpha1.Backup{
+		ObjectMeta: metav1.ObjectMeta{Name: "bk", Namespace: ns},
+		Spec:       backupsv1alpha1.BackupSpec{ApplicationRef: corev1.TypedLocalObjectReference{APIGroup: new("apps.cozystack.io"), Kind: "Postgres", Name: "data"}},
+	}
+	restoreJob := &backupsv1alpha1.RestoreJob{ObjectMeta: metav1.ObjectMeta{Name: "rj", Namespace: ns}}
+	r := newTestRestoreJobReconcilerWithDynamic(t, []runtime.Object{makeUnstructuredHelmRelease("vm-disk-data", ns, nil)}, restoreJob.DeepCopy(), backup)
+	ready, _, err := r.prepareForRestore(context.Background(), restoreJob.DeepCopy(), backup, nil,
+		restoreTarget{Namespace: ns, AppName: "data", AppKind: "Postgres"}, RestoreOptions{KeepOriginalPVC: new(true)})
+	if err != nil || !ready {
+		t.Fatalf("prepareForRestore = ready %v, err %v; want ready", ready, err)
+	}
+	got, err := r.Resource(helmReleaseGVR).Namespace(ns).Get(context.Background(), "vm-disk-data", metav1.GetOptions{})
+	if err != nil {
+		t.Fatalf("get HelmRelease: %v", err)
+	}
+	if suspended, _, _ := unstructured.NestedBool(got.Object, "spec", "suspend"); suspended {
+		t.Fatalf("an unrelated vm-disk-data HelmRelease was suspended")
+	}
+}
+
+func TestPreparedRestoreLeftovers_VMInstanceNamesItsHelmRelease(t *testing.T) {
+	const ns = "tenant-root"
+	restoreJob := &backupsv1alpha1.RestoreJob{ObjectMeta: metav1.ObjectMeta{Name: "rj"}}
+	backup := &backupsv1alpha1.Backup{Spec: backupsv1alpha1.BackupSpec{ApplicationRef: corev1.TypedLocalObjectReference{Kind: vmInstanceKind, Name: "web"}}}
+	urRaw, _ := json.Marshal(vmInstanceResources{
+		DataVolumes: []backupsv1alpha1.DataVolumeResource{{DataVolumeName: "vm-disk-root", ApplicationName: "root"}},
+	})
+	r := newTestRestoreJobReconcilerWithDynamic(t, []runtime.Object{suspendedHelmRelease(ns, "vm-instance-web", true), suspendedHelmRelease(ns, "vm-disk-root", true)})
+	got := r.preparedRestoreLeftovers(context.Background(), restoreJob, backup, &runtime.RawExtension{Raw: urRaw}, restoreTarget{Namespace: ns}, RestoreOptions{KeepOriginalPVC: new(true)})
+	if !strings.Contains(got, "vm-instance-web, vm-disk-root") {
+		t.Errorf("leftovers %q do not name the VM's HelmRelease and its disk's", got)
+	}
+}
+
+// CDI can recreate an empty PVC under the original name between the rename and
+// the DataVolume delete. Velero skips restoring a PVC that exists, so the
+// restore would report success with a blank disk; preparation has to clear it.
+func TestPrepareForRestore_ClearsPVCRecreatedAfterRename(t *testing.T) {
+	f := newKeepPVCFixture(t)
+	r := f.reconciler(t, f.livePVC, f.pv)
+	ctx := context.Background()
+	recreated := &corev1.PersistentVolumeClaim{ObjectMeta: metav1.ObjectMeta{Name: f.livePVC.Name, Namespace: f.ns}}
+	recreatedOnce := false
+	r.Interface.(*dynamicfake.FakeDynamicClient).PrependReactor("delete", "datavolumes", func(k8stesting.Action) (bool, runtime.Object, error) {
+		if !recreatedOnce {
+			recreatedOnce = true
+			if err := r.Create(ctx, recreated.DeepCopy()); err != nil {
+				t.Errorf("recreate PVC: %v", err)
+			}
+		}
+		return false, nil, nil
+	})
+
+	ready, res, err := r.prepareForRestore(ctx, f.restoreJob, f.backup, f.ur, f.target, f.opts)
+	if err != nil || ready || res.RequeueAfter == 0 {
+		t.Fatalf("pass 1: prepareForRestore = ready %v, requeue %v, err %v; want a requeue while the recreated PVC goes", ready, res.RequeueAfter, err)
+	}
+	if err := r.Get(ctx, client.ObjectKeyFromObject(recreated), &corev1.PersistentVolumeClaim{}); !apierrors.IsNotFound(err) {
+		t.Fatalf("the recreated PVC is still there (err %v); Velero would skip restoring it", err)
+	}
+
+	ready, _, err = r.prepareForRestore(ctx, f.restoreJob, f.backup, f.ur, f.target, f.opts)
+	if err != nil || !ready {
+		t.Fatalf("pass 2: prepareForRestore = ready %v, err %v; want ready", ready, err)
+	}
+	kept := &corev1.PersistentVolumeClaim{}
+	if err := r.Get(ctx, client.ObjectKey{Namespace: f.ns, Name: f.origName}, kept); err != nil || kept.Spec.VolumeName != "pv-current" {
+		t.Fatalf("the original disk is not kept as %s on pv-current: %+v, err %v", f.origName, kept.Spec, err)
+	}
+}
+
+// reconcilePreparedVMDisk runs reconcileVeleroRestore for an in-place VMDisk
+// restore that has no Velero Restore yet; started, when set, is the time the
+// RestoreJob recorded PreparationStarted.
+// keptOrigPVC is the -orig- PVC, bound to its retained PV, that preparation
+// leaves for the RestoreJob "rj" with UID "rj-uid".
+func keptOrigPVC(ns string) []client.Object {
+	name := "vm-disk-data-orig-" + shortHash("rj")
+	return []client.Object{
+		&corev1.PersistentVolumeClaim{
+			ObjectMeta: metav1.ObjectMeta{Name: name, Namespace: ns, Annotations: map[string]string{origPVCRestoreJobUIDAnnotation: "rj-uid"}},
+			Spec:       corev1.PersistentVolumeClaimSpec{VolumeName: "pv-data"},
+		},
+		&corev1.PersistentVolume{
+			ObjectMeta: metav1.ObjectMeta{Name: "pv-data"},
+			Spec: corev1.PersistentVolumeSpec{
+				PersistentVolumeReclaimPolicy: corev1.PersistentVolumeReclaimRetain,
+				ClaimRef:                      &corev1.ObjectReference{Namespace: ns, Name: name},
+			},
+		},
+	}
+}
+
+func reconcilePreparedVMDisk(t *testing.T, started *metav1.Time, extra ...client.Object) (*backupsv1alpha1.RestoreJob, *record.FakeRecorder) {
+	t.Helper()
+	const ns = "tenant-root"
+	s := vmDiskTestScheme()
+	now := metav1.Now()
+	restoreJob := &backupsv1alpha1.RestoreJob{
+		ObjectMeta: metav1.ObjectMeta{Name: "rj", Namespace: ns, UID: "rj-uid"},
+		Spec:       backupsv1alpha1.RestoreJobSpec{BackupRef: corev1.LocalObjectReference{Name: "bk"}},
+		Status:     backupsv1alpha1.RestoreJobStatus{Phase: backupsv1alpha1.RestoreJobPhaseRunning, StartedAt: &now},
+	}
+	hr := makeUnstructuredHelmRelease("vm-disk-data", ns, nil)
+	if started != nil {
+		hr = suspendedHelmRelease(ns, "vm-disk-data", true)
+		extra = append(extra, keptOrigPVC(ns)...)
+		restoreJob.Status.Conditions = []metav1.Condition{{
+			Type: restoreCondPreparationStarted, Status: metav1.ConditionTrue, Reason: "Preparing", LastTransitionTime: *started,
+		}}
+	}
+	backup := &backupsv1alpha1.Backup{
+		ObjectMeta: metav1.ObjectMeta{Name: "bk", Namespace: ns},
+		Spec: backupsv1alpha1.BackupSpec{
+			ApplicationRef: corev1.TypedLocalObjectReference{APIGroup: new("apps.cozystack.io"), Kind: vmDiskAppKind, Name: "data"},
+			StrategyRef:    corev1.TypedLocalObjectReference{APIGroup: new(strategyv1alpha1.GroupVersion.Group), Kind: strategyv1alpha1.VeleroStrategyKind, Name: "s"},
+			DriverMetadata: map[string]string{veleroBackupNameMetadataKey: "velero-bk"},
+		},
+	}
+	c := clientfake.NewClientBuilder().WithScheme(s).
+		WithObjects(append([]client.Object{restoreJob, backup, &strategyv1alpha1.Velero{ObjectMeta: metav1.ObjectMeta{Name: "s"}}}, extra...)...).
+		WithStatusSubresource(&backupsv1alpha1.RestoreJob{}).Build()
+	recorder := record.NewFakeRecorder(20)
+	r := &RestoreJobReconciler{Client: c, Interface: dynamicfake.NewSimpleDynamicClient(s, hr), Scheme: s, Recorder: recorder}
+	rj := &backupsv1alpha1.RestoreJob{}
+	if err := c.Get(context.Background(), client.ObjectKey{Namespace: ns, Name: "rj"}, rj); err != nil {
+		t.Fatalf("get RestoreJob: %v", err)
+	}
+	if _, err := r.reconcileVeleroRestore(context.Background(), rj, backup); err != nil {
+		t.Fatalf("reconcileVeleroRestore: %v", err)
+	}
+	if err := c.Get(context.Background(), client.ObjectKey{Namespace: ns, Name: "rj"}, rj); err != nil {
+		t.Fatalf("get RestoreJob: %v", err)
+	}
+	return rj, recorder
+}
+
+func mountingVMDiskPod(name string, deleting bool) *corev1.Pod {
+	pod := &corev1.Pod{
+		ObjectMeta: metav1.ObjectMeta{Name: name, Namespace: "tenant-root"},
+		Spec: corev1.PodSpec{
+			Containers: []corev1.Container{{Name: "compute", Image: "virt-launcher"}},
+			Volumes: []corev1.Volume{{Name: "disk", VolumeSource: corev1.VolumeSource{
+				PersistentVolumeClaim: &corev1.PersistentVolumeClaimVolumeSource{ClaimName: "vm-disk-data"},
+			}}},
+		},
+		Status: corev1.PodStatus{Phase: corev1.PodRunning},
+	}
+	if deleting {
+		now := metav1.Now()
+		pod.DeletionTimestamp = &now
+		pod.Finalizers = []string{"kubernetes"}
+	}
+	return pod
+}
+
+// Preparation spans several passes. A refusal on a later pass must say what
+// preparation already left behind, not that nothing was changed.
+func TestReconcileVeleroRestore_RefusalAfterPreparationStartedNamesLeftovers(t *testing.T) {
+	started := metav1.Now()
+	for _, tc := range []struct {
+		name  string
+		extra []client.Object
+		cause string
+	}{
+		{name: "the Velero Backup expired meanwhile", cause: "not found; it may have expired"},
+		{name: "a VM started on the disk meanwhile", extra: []client.Object{completedVeleroBackup("velero-bk"), mountingVMDiskPod("virt-launcher-web", false)}, cause: "in use by pod/virt-launcher-web"},
+	} {
+		t.Run(tc.name, func(t *testing.T) {
+			rj, recorder := reconcilePreparedVMDisk(t, &started, tc.extra...)
+			if rj.Status.Phase != backupsv1alpha1.RestoreJobPhaseFailed {
+				t.Fatalf("Phase = %q, want Failed", rj.Status.Phase)
+			}
+			for _, want := range []string{tc.cause, "suspended HelmRelease vm-disk-data", "PVC vm-disk-data-orig-" + shortHash("rj")} {
+				if !strings.Contains(rj.Status.Message, want) {
+					t.Errorf("message %q does not mention %q", rj.Status.Message, want)
+				}
+			}
+			if strings.Contains(rj.Status.Message, "nothing was changed") {
+				t.Errorf("message %q claims nothing was changed after preparation started", rj.Status.Message)
+			}
+			warned := false
+			for len(recorder.Events) > 0 {
+				if strings.HasPrefix(<-recorder.Events, "Warning RestoreFailed") {
+					warned = true
+				}
+			}
+			if !warned {
+				t.Error("no Warning RestoreFailed event")
+			}
+		})
+	}
+}
+
+// Before preparation starts, a refusal really has changed nothing and must
+// leave PreparationStarted unset.
+func TestReconcileVeleroRestore_RefusalBeforePreparationChangesNothing(t *testing.T) {
+	rj, _ := reconcilePreparedVMDisk(t, nil, completedVeleroBackup("velero-bk"), mountingVMDiskPod("virt-launcher-web", false))
+	if rj.Status.Phase != backupsv1alpha1.RestoreJobPhaseFailed || !strings.Contains(rj.Status.Message, "nothing was changed") {
+		t.Fatalf("phase %q, message %q; want Failed saying nothing was changed", rj.Status.Phase, rj.Status.Message)
+	}
+	if meta.IsStatusConditionTrue(rj.Status.Conditions, restoreCondPreparationStarted) {
+		t.Error("PreparationStarted was recorded although the restore was refused first")
+	}
+}
+
+func TestReconcileVeleroRestore_PreparationDeadline(t *testing.T) {
+	waiting := []client.Object{completedVeleroBackup("velero-bk"), mountingVMDiskPod("virt-launcher-web", true)}
+
+	t.Run("a preparation still waiting past the deadline fails and names the leftovers", func(t *testing.T) {
+		long := metav1.NewTime(time.Now().Add(-restorePreparationDeadline - time.Minute))
+		rj, _ := reconcilePreparedVMDisk(t, &long, waiting...)
+		if rj.Status.Phase != backupsv1alpha1.RestoreJobPhaseFailed || !strings.Contains(rj.Status.Message, "did not finish within") ||
+			!strings.Contains(rj.Status.Message, "suspended HelmRelease vm-disk-data") {
+			t.Fatalf("phase %q, message %q; want Failed past the deadline, naming the leftovers", rj.Status.Phase, rj.Status.Message)
+		}
+	})
+
+	t.Run("a preparation waiting within the deadline keeps running", func(t *testing.T) {
+		recent := metav1.Now()
+		rj, _ := reconcilePreparedVMDisk(t, &recent, waiting...)
+		if rj.Status.Phase != backupsv1alpha1.RestoreJobPhaseRunning {
+			t.Fatalf("Phase = %q, message %q; want Running", rj.Status.Phase, rj.Status.Message)
+		}
+	})
+}
+
+func TestPrepareForRestore_RecordsPreparationStarted(t *testing.T) {
+	f := newKeepPVCFixture(t)
+	r := f.reconciler(t, f.livePVC, f.pv)
+	if ready, _, err := r.prepareForRestore(context.Background(), f.restoreJob, f.backup, f.ur, f.target, f.opts); err != nil || !ready {
+		t.Fatalf("prepareForRestore = ready %v, err %v; want ready", ready, err)
+	}
+	got := &backupsv1alpha1.RestoreJob{}
+	if err := r.Get(context.Background(), client.ObjectKeyFromObject(f.restoreJob), got); err != nil {
+		t.Fatal(err)
+	}
+	if !meta.IsStatusConditionTrue(got.Status.Conditions, restoreCondPreparationStarted) {
+		t.Errorf("PreparationStarted not recorded: %+v", got.Status.Conditions)
+	}
+}
+
+// Step 5 waits for the DataVolume to be gone: while it exists, CDI can create
+// the PVC again after Step 5 cleared it.
+func TestPrepareForRestore_WaitsForDataVolumeGone(t *testing.T) {
+	f := newKeepPVCFixture(t)
+	r := f.reconciler(t, f.livePVC, f.pv)
+	r.Interface.(*dynamicfake.FakeDynamicClient).PrependReactor("delete", "datavolumes", func(k8stesting.Action) (bool, runtime.Object, error) {
+		return true, nil, nil
+	})
+	ready, res, err := r.prepareForRestore(context.Background(), f.restoreJob, f.backup, f.ur, f.target, f.opts)
+	if err != nil || ready || res.RequeueAfter == 0 {
+		t.Fatalf("prepareForRestore = ready %v, requeue %v, err %v; want a requeue while the DataVolume exists", ready, res.RequeueAfter, err)
+	}
+}
+
+// Without keepOriginalPVC, a VMDisk PVC left in place would be skipped by
+// Velero and, orphaned from its DataVolume, make CDI refuse the DataVolume
+// the resumed HelmRelease creates: preparation has to delete it.
+func TestPrepareForRestore_VMDiskWithoutKeepDeletesOriginalPVC(t *testing.T) {
+	const ns = "tenant-root"
+	backup := &backupsv1alpha1.Backup{
+		ObjectMeta: metav1.ObjectMeta{Name: "bk", Namespace: ns},
+		Spec: backupsv1alpha1.BackupSpec{ApplicationRef: corev1.TypedLocalObjectReference{
+			APIGroup: new("apps.cozystack.io"), Kind: vmDiskAppKind, Name: "data",
+		}},
+	}
+	restoreJob := &backupsv1alpha1.RestoreJob{
+		ObjectMeta: metav1.ObjectMeta{Name: "rj", Namespace: ns},
+		Spec:       backupsv1alpha1.RestoreJobSpec{BackupRef: corev1.LocalObjectReference{Name: "bk"}},
+	}
+	target := restoreTarget{Namespace: ns, AppName: "data", AppKind: vmDiskAppKind}
+	pvc := &corev1.PersistentVolumeClaim{ObjectMeta: metav1.ObjectMeta{Name: "vm-disk-data", Namespace: ns}}
+	r := newTestRestoreJobReconcilerWithDynamic(t,
+		[]runtime.Object{makeUnstructuredHelmRelease("vm-disk-data", ns, nil), makeUnstructuredDataVolume("vm-disk-data", ns)},
+		restoreJob.DeepCopy(), backup, pvc)
+	ctx := context.Background()
+
+	ready := false
+	for pass := 0; pass < 5 && !ready; pass++ {
+		var err error
+		if ready, _, err = r.prepareForRestore(ctx, restoreJob.DeepCopy(), backup, nil, target, RestoreOptions{KeepOriginalPVC: new(false)}); err != nil {
+			t.Fatalf("prepareForRestore: %v", err)
+		}
+	}
+	if !ready {
+		t.Fatal("preparation did not finish")
+	}
+	if err := r.Get(ctx, client.ObjectKeyFromObject(pvc), &corev1.PersistentVolumeClaim{}); !apierrors.IsNotFound(err) {
+		t.Fatalf("original PVC still present (err %v); Velero would skip restoring it", err)
+	}
+	pvcs := &corev1.PersistentVolumeClaimList{}
+	if err := r.List(ctx, pvcs, client.InNamespace(ns)); err != nil {
+		t.Fatalf("list PVCs: %v", err)
+	}
+	for _, p := range pvcs.Items {
+		t.Errorf("unexpected PVC %s left behind without keepOriginalPVC", p.Name)
+	}
+	if _, err := r.Resource(dataVolumeGVR).Namespace(ns).Get(ctx, "vm-disk-data", metav1.GetOptions{}); !apierrors.IsNotFound(err) {
+		t.Fatalf("DataVolume still present (err %v)", err)
+	}
+	hr, err := r.Resource(helmReleaseGVR).Namespace(ns).Get(ctx, "vm-disk-data", metav1.GetOptions{})
+	if err != nil {
+		t.Fatalf("get HelmRelease: %v", err)
+	}
+	if suspended, _, _ := unstructured.NestedBool(hr.Object, "spec", "suspend"); !suspended {
+		t.Fatal("the disk's HelmRelease was not suspended")
+	}
+}
+
+// A failed PreparationStarted patch must leave the target and the in-memory
+// condition untouched and retry, so a later failure does not report leftovers.
+func TestPrepareForRestore_PreparationStartedPatchFailureRetries(t *testing.T) {
+	f := newKeepPVCFixture(t)
+	r := f.reconciler(t, f.livePVC, f.pv)
+	r.Client = interceptor.NewClient(r.Client.(client.WithWatch), interceptor.Funcs{
+		SubResourcePatch: func(context.Context, client.Client, string, client.Object, client.Patch, ...client.SubResourcePatchOption) error {
+			return errors.New("the object has been modified")
+		},
+	})
+	ctx := context.Background()
+	ready, res, err := r.prepareForRestore(ctx, f.restoreJob, f.backup, f.ur, f.target, f.opts)
+	if err != nil || ready || res.RequeueAfter == 0 {
+		t.Fatalf("prepareForRestore = ready %v, requeue %v, err %v; want a retry", ready, res.RequeueAfter, err)
+	}
+	if meta.FindStatusCondition(f.restoreJob.Status.Conditions, restoreCondPreparationStarted) != nil {
+		t.Errorf("PreparationStarted kept in memory after the patch failed: %+v", f.restoreJob.Status.Conditions)
+	}
+	if err := r.Get(ctx, client.ObjectKeyFromObject(f.livePVC), &corev1.PersistentVolumeClaim{}); err != nil {
+		t.Errorf("original PVC touched although preparation did not start: %v", err)
+	}
+	if !f.dataVolumeExists(t, r) {
+		t.Error("DataVolume deleted although preparation did not start")
+	}
+}
+
+// A Pod stuck terminating holds the disk before preparation changes anything,
+// so the preparation deadline does not cover it; the wait needs its own.
+func TestPrepareForRestore_VMDiskLeavingPodWaitHasDeadline(t *testing.T) {
+	const ns = "tenant-root"
+	backup := &backupsv1alpha1.Backup{
+		ObjectMeta: metav1.ObjectMeta{Name: "bk", Namespace: ns},
+		Spec: backupsv1alpha1.BackupSpec{ApplicationRef: corev1.TypedLocalObjectReference{
+			APIGroup: new("apps.cozystack.io"), Kind: vmDiskAppKind, Name: "data",
+		}},
+	}
+	target := restoreTarget{Namespace: ns, AppName: "data", AppKind: vmDiskAppKind}
+	for _, tc := range []struct {
+		name     string
+		age      time.Duration
+		wantFail bool
+	}{
+		{name: "within the deadline it waits", age: time.Minute},
+		{name: "past the deadline it fails", age: restorePreparationDeadline + time.Minute, wantFail: true},
+	} {
+		t.Run(tc.name, func(t *testing.T) {
+			started := metav1.NewTime(time.Now().Add(-tc.age))
+			restoreJob := &backupsv1alpha1.RestoreJob{
+				ObjectMeta: metav1.ObjectMeta{Name: "rj", Namespace: ns},
+				Spec:       backupsv1alpha1.RestoreJobSpec{BackupRef: corev1.LocalObjectReference{Name: "bk"}},
+				Status:     backupsv1alpha1.RestoreJobStatus{StartedAt: &started},
+			}
+			pod := mountingVMDiskPod("virt-launcher-web", true)
+			pod.Namespace = ns
+			r := newTestRestoreJobReconcilerWithDynamic(t, []runtime.Object{makeUnstructuredHelmRelease("vm-disk-data", ns, nil)}, restoreJob.DeepCopy(), backup, pod)
+			ready, res, err := r.prepareForRestore(context.Background(), restoreJob, backup, nil, target, RestoreOptions{KeepOriginalPVC: new(true)})
+			if ready {
+				t.Fatal("prepareForRestore went ahead while a Pod still holds the disk")
+			}
+			if tc.wantFail {
+				if err == nil || !strings.Contains(err.Error(), "still held the disk") {
+					t.Fatalf("err = %v, want a failure naming the Pod that still holds the disk", err)
+				}
+				return
+			}
+			if err != nil || res.RequeueAfter == 0 {
+				t.Fatalf("requeue %v, err %v; want a requeue while within the deadline", res.RequeueAfter, err)
+			}
+		})
+	}
+}
diff --git a/internal/controller/applicationdefinition_controller.go b/internal/controller/applicationdefinition_controller.go
index 6ce252490c..0d9329e7b3 100644
--- a/internal/controller/applicationdefinition_controller.go
+++ b/internal/controller/applicationdefinition_controller.go
@@ -6,10 +6,13 @@ import (
 	"encoding/hex"
 	"encoding/json"
 	"slices"
+	"strings"
 	"sync"
 	"time"
 
 	cozyv1alpha1 "github.com/cozystack/cozystack/api/v1alpha1"
+	"github.com/cozystack/cozystack/internal/shared/appdefowner"
+	"github.com/cozystack/cozystack/pkg/config"
 
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
@@ -67,6 +70,39 @@ func (r *ApplicationDefinitionReconciler) SetupWithManager(mgr ctrl.Manager) err
 type appDefHashView struct {
 	Name string                                 `json:"name"`
 	Spec cozyv1alpha1.ApplicationDefinitionSpec `json:"spec"`
+	// Annotations holds the release.cozystack.io/* subset of the definition's
+	// metadata annotations. They belong in the hash because cozystack-api reads
+	// them once, at start-up (buildResourceFromCRD in pkg/cmd/server/start.go),
+	// and this rollout is the only thing that delivers a change in one: a
+	// definition whose whole change is an annotation would otherwise leave the
+	// running api serving the previous behaviour until its pod restarted for an
+	// unrelated reason. Only that prefix is hashed, because kubectl and Helm
+	// rewrite annotations of their own on every apply and hashing those would
+	// roll the api Deployment on every reconcile.
+	Annotations map[string]string `json:"annotations,omitempty"`
+	// Skipped marks a definition cozystack-api leaves out because another
+	// definition owns its kind. Ownership depends on creation time, which the
+	// spec does not carry, so without it a recreated owner could move ownership
+	// while the hash stays put and the API keeps serving the old owner.
+	// omitempty keeps the hash of a cluster with no duplicate kinds unchanged.
+	Skipped bool `json:"skipped,omitempty"`
+}
+
+// releaseAnnotations returns the release.cozystack.io/* annotations of a
+// definition, or nil when it carries none, so a definition without them hashes
+// exactly as it did before this field existed.
+func releaseAnnotations(annotations map[string]string) map[string]string {
+	var selected map[string]string
+	for k, v := range annotations {
+		if !strings.HasPrefix(k, config.ReleaseAnnotationPrefix) {
+			continue
+		}
+		if selected == nil {
+			selected = make(map[string]string)
+		}
+		selected[k] = v
+	}
+	return selected
 }
 
 func (r *ApplicationDefinitionReconciler) computeConfigHash(ctx context.Context) (string, error) {
@@ -77,11 +113,15 @@ func (r *ApplicationDefinitionReconciler) computeConfigHash(ctx context.Context)
 
 	slices.SortFunc(list.Items, sortAppDefs)
 
+	owners := appdefowner.Owners(list.Items)
 	views := make([]appDefHashView, 0, len(list.Items))
 	for i := range list.Items {
+		kind := list.Items[i].Spec.Application.Kind
 		views = append(views, appDefHashView{
-			Name: list.Items[i].Name,
-			Spec: list.Items[i].Spec,
+			Name:        list.Items[i].Name,
+			Spec:        list.Items[i].Spec,
+			Annotations: releaseAnnotations(list.Items[i].Annotations),
+			Skipped:     kind != "" && owners[kind] != list.Items[i].Name,
 		})
 	}
 	b, err := json.Marshal(views)
diff --git a/internal/controller/applicationdefinition_controller_test.go b/internal/controller/applicationdefinition_controller_test.go
index f3ac64375f..08e670c358 100644
--- a/internal/controller/applicationdefinition_controller_test.go
+++ b/internal/controller/applicationdefinition_controller_test.go
@@ -2,10 +2,14 @@ package controller
 
 import (
 	"context"
+	"crypto/sha256"
+	"encoding/hex"
+	"encoding/json"
 	"testing"
 	"time"
 
 	cozyv1alpha1 "github.com/cozystack/cozystack/api/v1alpha1"
+	"github.com/cozystack/cozystack/pkg/config"
 	appsv1 "k8s.io/api/apps/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -229,3 +233,112 @@ func TestApplicationDefinition_HashUnchangedSkipsPatch(t *testing.T) {
 		t.Fatalf("expected lastHandled advanced after no-op reconcile")
 	}
 }
+
+// hashWithAnnotations computes the config hash for a single ApplicationDefinition
+// carrying the given metadata annotations.
+func hashWithAnnotations(t *testing.T, annotations map[string]string) string {
+	t.Helper()
+
+	scheme := newAppDefScheme(t)
+	appDef := &cozyv1alpha1.ApplicationDefinition{
+		ObjectMeta: metav1.ObjectMeta{Name: "vm-instance", Annotations: annotations},
+	}
+	r := &ApplicationDefinitionReconciler{
+		Client: fake.NewClientBuilder().WithScheme(scheme).WithObjects(appDef).Build(),
+		Scheme: scheme,
+	}
+
+	hash, err := r.computeConfigHash(context.TODO())
+	if err != nil {
+		t.Fatalf("computeConfigHash: %v", err)
+	}
+	return hash
+}
+
+// TestApplicationDefinition_HashCoversReleaseAnnotations pins that a change
+// confined to a release.cozystack.io/* annotation moves the hash. cozystack-api
+// reads those annotations once, at start-up (pkg/cmd/server/start.go), so the
+// config-hash rollout is the only thing that makes such a change take effect.
+// A hash built from spec alone leaves the annotation inert on an existing
+// cluster until the api pod happens to restart for an unrelated reason, which
+// is indistinguishable from the change never having been delivered.
+func TestApplicationDefinition_HashCoversReleaseAnnotations(t *testing.T) {
+	bare := hashWithAnnotations(t, nil)
+	annotated := hashWithAnnotations(t, map[string]string{
+		config.HelmInstallDisableWaitAnnotation: "true",
+	})
+
+	if bare == annotated {
+		t.Fatalf("hash ignores %s: %q for both", config.HelmInstallDisableWaitAnnotation, bare)
+	}
+
+	flipped := hashWithAnnotations(t, map[string]string{
+		config.HelmInstallDisableWaitAnnotation: "false",
+	})
+	if flipped == annotated {
+		t.Fatalf("hash ignores the annotation's value: %q for both true and false", annotated)
+	}
+}
+
+// TestApplicationDefinition_HashIgnoresUnrelatedAnnotations pins the other half:
+// only the release.cozystack.io/ prefix counts. kubectl and Flux rewrite their
+// own annotations on every apply, and hashing those would roll out cozystack-api
+// on every reconcile of every ApplicationDefinition.
+func TestApplicationDefinition_HashIgnoresUnrelatedAnnotations(t *testing.T) {
+	bare := hashWithAnnotations(t, nil)
+	noisy := hashWithAnnotations(t, map[string]string{
+		"kubectl.kubernetes.io/last-applied-configuration": `{"metadata":{"name":"vm-instance"}}`,
+		"meta.helm.sh/release-name":                        "vm-instance-rd",
+	})
+
+	if bare != noisy {
+		t.Fatalf("unrelated annotations moved the hash: %q vs %q", bare, noisy)
+	}
+}
+
+// TestApplicationDefinition_HashTracksKindOwnership pins that the config hash
+// that restarts cozystack-api moves when ownership of a kind moves, even though
+// no spec changed: ownership depends on creation time, which the spec does not
+// carry. It also pins that a cluster with no duplicate kinds hashes exactly as
+// before ownership existed, so the upgrade itself does not restart the API.
+func TestApplicationDefinition_HashTracksKindOwnership(t *testing.T) {
+	scheme := newAppDefScheme(t)
+	base := time.Date(2026, 1, 1, 0, 0, 0, 0, time.UTC)
+	mk := func(name string, at time.Time) *cozyv1alpha1.ApplicationDefinition {
+		d := &cozyv1alpha1.ApplicationDefinition{ObjectMeta: metav1.ObjectMeta{Name: name, CreationTimestamp: metav1.NewTime(at)}}
+		d.Spec.Application.Kind = "Harbor"
+		return d
+	}
+	hash := func(objs ...*cozyv1alpha1.ApplicationDefinition) string {
+		b := fake.NewClientBuilder().WithScheme(scheme)
+		for _, o := range objs {
+			b = b.WithObjects(o)
+		}
+		r := &ApplicationDefinitionReconciler{Client: b.Build(), Scheme: scheme}
+		h, err := r.computeConfigHash(context.TODO())
+		if err != nil {
+			t.Fatal(err)
+		}
+		return h
+	}
+
+	// Same names, same specs; only which one was created first differs.
+	harborOwns := hash(mk("harbor", base), mk("tap-harbor", base.Add(time.Hour)))
+	tapOwns := hash(mk("harbor", base.Add(2*time.Hour)), mk("tap-harbor", base.Add(time.Hour)))
+	if harborOwns == tapOwns {
+		t.Fatal("hash did not change when ownership of the kind moved to another definition")
+	}
+
+	single := mk("harbor", base)
+	view, err := json.Marshal([]struct {
+		Name string                                 `json:"name"`
+		Spec cozyv1alpha1.ApplicationDefinitionSpec `json:"spec"`
+	}{{Name: single.Name, Spec: single.Spec}})
+	if err != nil {
+		t.Fatal(err)
+	}
+	sum := sha256.Sum256(view)
+	if got := hash(single); got != hex.EncodeToString(sum[:]) {
+		t.Fatal("hash of a cluster without duplicate kinds changed format, which would restart cozystack-api on upgrade")
+	}
+}
diff --git a/internal/controller/applicationdefinition_helmreconciler.go b/internal/controller/applicationdefinition_helmreconciler.go
index 5f4f63bd63..f9a4d89a6a 100644
--- a/internal/controller/applicationdefinition_helmreconciler.go
+++ b/internal/controller/applicationdefinition_helmreconciler.go
@@ -5,13 +5,20 @@ import (
 	"fmt"
 
 	cozyv1alpha1 "github.com/cozystack/cozystack/api/v1alpha1"
+	"github.com/cozystack/cozystack/internal/shared/appdefowner"
+	"github.com/cozystack/cozystack/pkg/config"
 	helmv2 "github.com/fluxcd/helm-controller/api/v2"
 
+	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/types"
+	"k8s.io/client-go/tools/record"
 
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/handler"
 	"sigs.k8s.io/controller-runtime/pkg/log"
+	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 )
 
 // +kubebuilder:rbac:groups=cozystack.io,resources=applicationdefinitions,verbs=get;list;watch
@@ -23,7 +30,8 @@ import (
 // with Flux's helm-controller.
 type ApplicationDefinitionHelmReconciler struct {
 	client.Client
-	Scheme *runtime.Scheme
+	Scheme   *runtime.Scheme
+	Recorder record.EventRecorder
 }
 
 func (r *ApplicationDefinitionHelmReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
@@ -36,6 +44,25 @@ func (r *ApplicationDefinitionHelmReconciler) Reconcile(ctx context.Context, req
 		return ctrl.Result{}, client.IgnoreNotFound(err)
 	}
 
+	// Only the definition that owns its kind may rewrite that kind's releases.
+	// HelmReleases are selected by kind label alone, so without this a second
+	// definition declaring the same kind would repoint every release of it at
+	// its own artifact.
+	if kind := appDef.Spec.Application.Kind; kind != "" {
+		defs := &cozyv1alpha1.ApplicationDefinitionList{}
+		if err := r.List(ctx, defs); err != nil {
+			return ctrl.Result{}, err
+		}
+		if owner := appdefowner.Owners(defs.Items)[kind]; owner != appDef.Name {
+			logger.Info("skipping HelmRelease update: application kind is owned by another definition", "appDef", appDef.Name, "kind", kind, "owner", owner)
+			if r.Recorder != nil {
+				r.Recorder.Eventf(appDef, corev1.EventTypeWarning, "KindClaimed",
+					"application kind %s is already owned by ApplicationDefinition %s; this definition does not manage its releases", kind, owner)
+			}
+			return ctrl.Result{}, nil
+		}
+	}
+
 	// Update HelmReleases related to this specific ApplicationDefinition
 	if err := r.updateHelmReleasesForAppDef(ctx, appDef); err != nil {
 		logger.Error(err, "failed to update HelmReleases for ApplicationDefinition", "appDef", appDef.Name)
@@ -48,10 +75,32 @@ func (r *ApplicationDefinitionHelmReconciler) Reconcile(ctx context.Context, req
 func (r *ApplicationDefinitionHelmReconciler) SetupWithManager(mgr ctrl.Manager) error {
 	return ctrl.NewControllerManagedBy(mgr).
 		Named("applicationdefinition-helm-reconciler").
-		For(&cozyv1alpha1.ApplicationDefinition{}).
+		Watches(&cozyv1alpha1.ApplicationDefinition{}, handler.EnqueueRequestsFromMapFunc(r.sameKindRequests)).
 		Complete(r)
 }
 
+// sameKindRequests enqueues every definition declaring the same kind as obj,
+// obj included, so that when the owner of a kind is deleted or changes kind the
+// next owner reconciles its releases without waiting for a change of its own.
+func (r *ApplicationDefinitionHelmReconciler) sameKindRequests(ctx context.Context, obj client.Object) []reconcile.Request {
+	reqs := []reconcile.Request{{NamespacedName: types.NamespacedName{Name: obj.GetName()}}}
+	appDef, ok := obj.(*cozyv1alpha1.ApplicationDefinition)
+	if !ok || appDef.Spec.Application.Kind == "" {
+		return reqs
+	}
+	defs := &cozyv1alpha1.ApplicationDefinitionList{}
+	if err := r.List(ctx, defs); err != nil {
+		log.FromContext(ctx).Error(err, "failed to list ApplicationDefinitions for kind fan-out", "kind", appDef.Spec.Application.Kind)
+		return reqs
+	}
+	for i := range defs.Items {
+		if defs.Items[i].Name != obj.GetName() && defs.Items[i].Spec.Application.Kind == appDef.Spec.Application.Kind {
+			reqs = append(reqs, reconcile.Request{NamespacedName: types.NamespacedName{Name: defs.Items[i].Name}})
+		}
+	}
+	return reqs
+}
+
 // updateHelmReleasesForAppDef updates all HelmReleases that match the application labels from ApplicationDefinition
 func (r *ApplicationDefinitionHelmReconciler) updateHelmReleasesForAppDef(ctx context.Context, appDef *cozyv1alpha1.ApplicationDefinition) error {
 	logger := log.FromContext(ctx)
@@ -163,6 +212,44 @@ func (r *ApplicationDefinitionHelmReconciler) updateHelmReleaseChart(ctx context
 		updated = true
 	}
 
+	// Check and update the readiness wait. cozystack-api reads
+	// release.cozystack.io/helm-install-disable-wait off the definition when it
+	// builds a release, and only there, so a release created before the
+	// annotation appeared keeps waiting on readiness until its Application is
+	// written through the apps API again. Where the wait is what broke, that is
+	// every existing instance of the kind at once, each looping upgrade and
+	// timeout until an operator rewrites it by hand. The definition is the
+	// source of truth in both directions, since the API rebuilds the whole spec
+	// on every write and emits DisableWait=false once the annotation is gone.
+	disableWait, err := config.ParseHelmInstallDisableWaitAnnotation(
+		appDef.Annotations[config.HelmInstallDisableWaitAnnotation],
+	)
+	if err != nil {
+		// cozystack-api refuses to start on this same value, so the cluster
+		// already has a loud signal; leave the field as it is rather than guess.
+		logger.Error(err, "Skipping HelmRelease wait update: invalid annotation",
+			"appDef", appDef.Name, "annotation", config.HelmInstallDisableWaitAnnotation)
+	} else {
+		// An absent install/upgrade block already behaves as DisableWait=false,
+		// so it is only materialised when the definition asks to disable the wait.
+		if disableWait && hrCopy.Spec.Install == nil {
+			hrCopy.Spec.Install = &helmv2.Install{}
+		}
+		if hrCopy.Spec.Install != nil && hrCopy.Spec.Install.DisableWait != disableWait {
+			logger.V(4).Info("Updating HelmRelease install wait", "name", hr.Name, "namespace", hr.Namespace, "disableWait", disableWait)
+			hrCopy.Spec.Install.DisableWait = disableWait
+			updated = true
+		}
+		if disableWait && hrCopy.Spec.Upgrade == nil {
+			hrCopy.Spec.Upgrade = &helmv2.Upgrade{}
+		}
+		if hrCopy.Spec.Upgrade != nil && hrCopy.Spec.Upgrade.DisableWait != disableWait {
+			logger.V(4).Info("Updating HelmRelease upgrade wait", "name", hr.Name, "namespace", hr.Namespace, "disableWait", disableWait)
+			hrCopy.Spec.Upgrade.DisableWait = disableWait
+			updated = true
+		}
+	}
+
 	// Check and update labels from ApplicationDefinition
 	if len(appDef.Spec.Release.Labels) > 0 {
 		if hrCopy.Labels == nil {
diff --git a/internal/controller/applicationdefinition_helmreconciler_test.go b/internal/controller/applicationdefinition_helmreconciler_test.go
index e7215067a7..898db83400 100644
--- a/internal/controller/applicationdefinition_helmreconciler_test.go
+++ b/internal/controller/applicationdefinition_helmreconciler_test.go
@@ -2,13 +2,17 @@ package controller
 
 import (
 	"context"
+	"strings"
 	"testing"
+	"time"
 
 	cozyv1alpha1 "github.com/cozystack/cozystack/api/v1alpha1"
+	"github.com/cozystack/cozystack/pkg/config"
 	helmv2 "github.com/fluxcd/helm-controller/api/v2"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/types"
+	"k8s.io/client-go/tools/record"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 )
@@ -352,3 +356,308 @@ func TestValuesFromEqual(t *testing.T) {
 		})
 	}
 }
+
+// vmInstanceRelease builds a VMInstance HelmRelease carrying the application
+// labels this reconciler selects on, with the given wait configuration.
+func vmInstanceRelease(install, upgrade *bool) *helmv2.HelmRelease {
+	hr := &helmv2.HelmRelease{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "vm-instance-web",
+			Namespace: "tenant-foo",
+			Labels: map[string]string{
+				"apps.cozystack.io/application.kind":  "VMInstance",
+				"apps.cozystack.io/application.group": "apps.cozystack.io",
+			},
+		},
+		Spec: helmv2.HelmReleaseSpec{
+			ChartRef: &helmv2.CrossNamespaceSourceReference{
+				Kind:      "ExternalArtifact",
+				Name:      "vm-instance-app",
+				Namespace: "cozy-system",
+			},
+		},
+	}
+	if install != nil {
+		hr.Spec.Install = &helmv2.Install{DisableWait: *install}
+	}
+	if upgrade != nil {
+		hr.Spec.Upgrade = &helmv2.Upgrade{DisableWait: *upgrade}
+	}
+	return hr
+}
+
+// vmInstanceAppDef builds the VMInstance ApplicationDefinition, optionally
+// carrying the disable-wait annotation.
+func vmInstanceAppDef(annotations map[string]string) *cozyv1alpha1.ApplicationDefinition {
+	return &cozyv1alpha1.ApplicationDefinition{
+		ObjectMeta: metav1.ObjectMeta{Name: "vm-instance", Annotations: annotations},
+		Spec: cozyv1alpha1.ApplicationDefinitionSpec{
+			Application: cozyv1alpha1.ApplicationDefinitionApplication{Kind: "VMInstance"},
+			Release: cozyv1alpha1.ApplicationDefinitionRelease{
+				ChartRef: &helmv2.CrossNamespaceSourceReference{
+					Kind:      "ExternalArtifact",
+					Name:      "vm-instance-app",
+					Namespace: "cozy-system",
+				},
+			},
+		},
+	}
+}
+
+func harborDef(name, artifact string, created time.Time) *cozyv1alpha1.ApplicationDefinition {
+	return &cozyv1alpha1.ApplicationDefinition{
+		ObjectMeta: metav1.ObjectMeta{Name: name, CreationTimestamp: metav1.NewTime(created)},
+		Spec: cozyv1alpha1.ApplicationDefinitionSpec{
+			Application: cozyv1alpha1.ApplicationDefinitionApplication{Kind: "Harbor"},
+			Release: cozyv1alpha1.ApplicationDefinitionRelease{
+				ChartRef: &helmv2.CrossNamespaceSourceReference{Kind: "OCIRepository", Name: artifact, Namespace: "cozy-public"},
+			},
+		},
+	}
+}
+
+func reconcileVMInstance(t *testing.T, appDef *cozyv1alpha1.ApplicationDefinition, hr *helmv2.HelmRelease) *helmv2.HelmRelease {
+	t.Helper()
+
+	scheme := newAppDefHelmScheme(t)
+	fakeClient := fake.NewClientBuilder().WithScheme(scheme).WithObjects(appDef, hr).Build()
+	r := &ApplicationDefinitionHelmReconciler{Client: fakeClient, Scheme: scheme}
+
+	if _, err := r.Reconcile(context.TODO(), reconcile.Request{
+		NamespacedName: types.NamespacedName{Name: appDef.Name},
+	}); err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+
+	got := &helmv2.HelmRelease{}
+	if err := fakeClient.Get(context.TODO(), types.NamespacedName{Name: hr.Name, Namespace: hr.Namespace}, got); err != nil {
+		t.Fatalf("get HR: %v", err)
+	}
+	return got
+}
+
+// TestAppDefHelm_DisableWaitApplied pins the drift this reconciler exists to
+// close, for the one field a running release cannot pick up on its own: a
+// HelmRelease created before the definition carried
+// release.cozystack.io/helm-install-disable-wait keeps waiting on readiness
+// until its Application is written through the apps API again. On a cluster
+// where the wait is what broke (a KubeVirt VirtualMachine the kstatus poller
+// reads as permanently InProgress), that is every existing VM, each one
+// looping upgrade and timeout, and re-writing them by hand is the operator's
+// only way out. Bring the field to what the definition asks for instead.
+func TestAppDefHelm_DisableWaitApplied(t *testing.T) {
+	no := false
+	got := reconcileVMInstance(t,
+		vmInstanceAppDef(map[string]string{config.HelmInstallDisableWaitAnnotation: "true"}),
+		vmInstanceRelease(&no, &no))
+
+	if got.Spec.Install == nil || !got.Spec.Install.DisableWait {
+		t.Fatalf("expected Install.DisableWait=true, got %+v", got.Spec.Install)
+	}
+	if got.Spec.Upgrade == nil || !got.Spec.Upgrade.DisableWait {
+		t.Fatalf("expected Upgrade.DisableWait=true, got %+v", got.Spec.Upgrade)
+	}
+}
+
+// TestAppDefHelm_DisableWaitAppliedToAbsentBlocks pins the same on a release
+// that carries no install/upgrade block at all: the field still has to land.
+func TestAppDefHelm_DisableWaitAppliedToAbsentBlocks(t *testing.T) {
+	got := reconcileVMInstance(t,
+		vmInstanceAppDef(map[string]string{config.HelmInstallDisableWaitAnnotation: "true"}),
+		vmInstanceRelease(nil, nil))
+
+	if got.Spec.Install == nil || !got.Spec.Install.DisableWait {
+		t.Fatalf("expected Install.DisableWait=true, got %+v", got.Spec.Install)
+	}
+	if got.Spec.Upgrade == nil || !got.Spec.Upgrade.DisableWait {
+		t.Fatalf("expected Upgrade.DisableWait=true, got %+v", got.Spec.Upgrade)
+	}
+}
+
+// TestAppDefHelm_DisableWaitRemoved pins the other direction, because the
+// definition is the source of truth in both: cozystack-api rebuilds the whole
+// spec on every write and emits DisableWait=false once the annotation is gone,
+// so a release left at true would drift back the moment anyone touched it.
+func TestAppDefHelm_DisableWaitRemoved(t *testing.T) {
+	yes := true
+	got := reconcileVMInstance(t, vmInstanceAppDef(nil), vmInstanceRelease(&yes, &yes))
+
+	if got.Spec.Install == nil || got.Spec.Install.DisableWait {
+		t.Fatalf("expected Install.DisableWait=false, got %+v", got.Spec.Install)
+	}
+	if got.Spec.Upgrade == nil || got.Spec.Upgrade.DisableWait {
+		t.Fatalf("expected Upgrade.DisableWait=false, got %+v", got.Spec.Upgrade)
+	}
+}
+
+// TestAppDefHelm_DisableWaitLeavesAbsentBlocksAlone pins that the false case
+// does not materialise empty install/upgrade blocks on a release that has
+// none: writing them would change nothing about the release's behaviour and
+// would make every such reconcile an update.
+func TestAppDefHelm_DisableWaitLeavesAbsentBlocksAlone(t *testing.T) {
+	got := reconcileVMInstance(t, vmInstanceAppDef(nil), vmInstanceRelease(nil, nil))
+
+	if got.Spec.Install != nil {
+		t.Fatalf("expected Install left absent, got %+v", got.Spec.Install)
+	}
+	if got.Spec.Upgrade != nil {
+		t.Fatalf("expected Upgrade left absent, got %+v", got.Spec.Upgrade)
+	}
+}
+
+// TestAppDefHelm_DisableWaitInSyncSkipsUpdate pins idempotence: a release that
+// already matches must not be written, or every reconcile of every definition
+// bumps the resourceVersion of every release it owns and wakes helm-controller.
+func TestAppDefHelm_DisableWaitInSyncSkipsUpdate(t *testing.T) {
+	yes := true
+	hr := vmInstanceRelease(&yes, &yes)
+	hr.Spec.ValuesFrom = expectedValuesFrom()
+
+	scheme := newAppDefHelmScheme(t)
+	appDef := vmInstanceAppDef(map[string]string{config.HelmInstallDisableWaitAnnotation: "true"})
+	fakeClient := fake.NewClientBuilder().WithScheme(scheme).WithObjects(appDef, hr).Build()
+
+	before := &helmv2.HelmRelease{}
+	if err := fakeClient.Get(context.TODO(), types.NamespacedName{Name: hr.Name, Namespace: hr.Namespace}, before); err != nil {
+		t.Fatalf("get HR: %v", err)
+	}
+
+	r := &ApplicationDefinitionHelmReconciler{Client: fakeClient, Scheme: scheme}
+	if _, err := r.Reconcile(context.TODO(), reconcile.Request{
+		NamespacedName: types.NamespacedName{Name: appDef.Name},
+	}); err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+
+	after := &helmv2.HelmRelease{}
+	if err := fakeClient.Get(context.TODO(), types.NamespacedName{Name: hr.Name, Namespace: hr.Namespace}, after); err != nil {
+		t.Fatalf("get HR after reconcile: %v", err)
+	}
+	if after.ResourceVersion != before.ResourceVersion {
+		t.Fatalf("release rewritten with nothing to change: %q -> %q", before.ResourceVersion, after.ResourceVersion)
+	}
+}
+
+// TestAppDefHelm_DisableWaitInvalidAnnotationLeavesReleaseAlone pins the
+// invalid-annotation branch. The parser returns false alongside its error, so
+// applying that value would switch the wait back on for every release of the
+// kind; the release must keep what it has instead.
+func TestAppDefHelm_DisableWaitInvalidAnnotationLeavesReleaseAlone(t *testing.T) {
+	yes := true
+	got := reconcileVMInstance(t,
+		vmInstanceAppDef(map[string]string{config.HelmInstallDisableWaitAnnotation: "yes"}),
+		vmInstanceRelease(&yes, &yes))
+
+	if got.Spec.Install == nil || !got.Spec.Install.DisableWait {
+		t.Fatalf("expected Install.DisableWait=true kept, got %+v", got.Spec.Install)
+	}
+	if got.Spec.Upgrade == nil || !got.Spec.Upgrade.DisableWait {
+		t.Fatalf("expected Upgrade.DisableWait=true kept, got %+v", got.Spec.Upgrade)
+	}
+}
+
+// TestAppDefHelm_DisableWaitScopedToKind pins the kind label in the selector:
+// a release of another kind in the same group must not pick up the wait
+// setting of the VMInstance definition.
+func TestAppDefHelm_DisableWaitScopedToKind(t *testing.T) {
+	no := false
+	vm := vmInstanceRelease(&no, &no)
+	other := vmInstanceRelease(&no, &no)
+	other.Name = "harbor-registry"
+	other.Labels["apps.cozystack.io/application.kind"] = "Harbor"
+
+	scheme := newAppDefHelmScheme(t)
+	appDef := vmInstanceAppDef(map[string]string{config.HelmInstallDisableWaitAnnotation: "true"})
+	fakeClient := fake.NewClientBuilder().WithScheme(scheme).WithObjects(appDef, vm, other).Build()
+
+	r := &ApplicationDefinitionHelmReconciler{Client: fakeClient, Scheme: scheme}
+	if _, err := r.Reconcile(context.TODO(), reconcile.Request{
+		NamespacedName: types.NamespacedName{Name: appDef.Name},
+	}); err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+
+	gotVM := &helmv2.HelmRelease{}
+	if err := fakeClient.Get(context.TODO(), types.NamespacedName{Name: vm.Name, Namespace: vm.Namespace}, gotVM); err != nil {
+		t.Fatalf("get VMInstance HR: %v", err)
+	}
+	if gotVM.Spec.Install == nil || !gotVM.Spec.Install.DisableWait {
+		t.Fatalf("expected VMInstance Install.DisableWait=true, got %+v", gotVM.Spec.Install)
+	}
+
+	gotOther := &helmv2.HelmRelease{}
+	if err := fakeClient.Get(context.TODO(), types.NamespacedName{Name: other.Name, Namespace: other.Namespace}, gotOther); err != nil {
+		t.Fatalf("get Harbor HR: %v", err)
+	}
+	if gotOther.Spec.Install == nil || gotOther.Spec.Install.DisableWait {
+		t.Fatalf("expected Harbor Install.DisableWait=false, got %+v", gotOther.Spec.Install)
+	}
+	if gotOther.Spec.Upgrade == nil || gotOther.Spec.Upgrade.DisableWait {
+		t.Fatalf("expected Harbor Upgrade.DisableWait=false, got %+v", gotOther.Spec.Upgrade)
+	}
+}
+
+// TestAppDefHelm_NonOwnerDoesNotRewrite pins the ownership relation: a second
+// definition declaring a kind that an older definition already owns must not
+// repoint that kind's releases at its own artifact, whatever it is named.
+func TestAppDefHelm_NonOwnerDoesNotRewrite(t *testing.T) {
+	scheme := newAppDefHelmScheme(t)
+	base := time.Date(2026, 1, 1, 0, 0, 0, 0, time.UTC)
+	owner := harborDef("harbor", "harbor-app", base)
+	// Sorts before the owner by name, so only creation order keeps it out.
+	newcomer := harborDef("a-harbor", "other-artifact", base.Add(time.Hour))
+	hr := &helmv2.HelmRelease{
+		ObjectMeta: metav1.ObjectMeta{Name: "harbor-release", Namespace: "tenant-foo", Labels: map[string]string{
+			"apps.cozystack.io/application.kind":  "Harbor",
+			"apps.cozystack.io/application.group": "apps.cozystack.io",
+		}},
+		Spec: helmv2.HelmReleaseSpec{ChartRef: &helmv2.CrossNamespaceSourceReference{Kind: "OCIRepository", Name: "harbor-app", Namespace: "cozy-public"}},
+	}
+	fakeClient := fake.NewClientBuilder().WithScheme(scheme).WithObjects(owner, newcomer, hr).Build()
+	rec := record.NewFakeRecorder(4)
+	r := &ApplicationDefinitionHelmReconciler{Client: fakeClient, Scheme: scheme, Recorder: rec}
+
+	for _, name := range []string{"a-harbor", "harbor"} {
+		if _, err := r.Reconcile(context.TODO(), reconcile.Request{NamespacedName: types.NamespacedName{Name: name}}); err != nil {
+			t.Fatalf("reconcile %s: %v", name, err)
+		}
+		got := &helmv2.HelmRelease{}
+		if err := fakeClient.Get(context.TODO(), types.NamespacedName{Name: "harbor-release", Namespace: "tenant-foo"}, got); err != nil {
+			t.Fatalf("get HR: %v", err)
+		}
+		if got.Spec.ChartRef == nil || got.Spec.ChartRef.Name != "harbor-app" {
+			t.Fatalf("after reconciling %s the release points at %+v, want the owner's harbor-app", name, got.Spec.ChartRef)
+		}
+	}
+	select {
+	case ev := <-rec.Events:
+		if !strings.Contains(ev, "KindClaimed") || !strings.Contains(ev, "harbor") {
+			t.Fatalf("unexpected event %q", ev)
+		}
+	default:
+		t.Fatal("the non-owner must get a Warning event naming the owner")
+	}
+}
+
+// TestAppDefHelm_SameKindRequests pins the watch mapping: an event on any
+// definition enqueues every definition declaring the same kind, so when the
+// owner is deleted the next one takes over without waiting for its own change.
+func TestAppDefHelm_SameKindRequests(t *testing.T) {
+	scheme := newAppDefHelmScheme(t)
+	base := time.Date(2026, 1, 1, 0, 0, 0, 0, time.UTC)
+	other := &cozyv1alpha1.ApplicationDefinition{ObjectMeta: metav1.ObjectMeta{Name: "pg"}}
+	other.Spec.Application.Kind = "Postgres"
+	fakeClient := fake.NewClientBuilder().WithScheme(scheme).
+		WithObjects(harborDef("harbor", "a", base), harborDef("tap-harbor", "b", base), other).Build()
+	r := &ApplicationDefinitionHelmReconciler{Client: fakeClient, Scheme: scheme}
+
+	deleted := harborDef("harbor", "a", base)
+	reqs := r.sameKindRequests(context.TODO(), deleted)
+	names := map[string]bool{}
+	for _, q := range reqs {
+		names[q.Name] = true
+	}
+	if !names["harbor"] || !names["tap-harbor"] || names["pg"] || len(reqs) != 2 {
+		t.Fatalf("requests = %v (%d), want harbor and tap-harbor once each", names, len(reqs))
+	}
+}
diff --git a/internal/controller/cacert/reconciler.go b/internal/controller/cacert/reconciler.go
new file mode 100644
index 0000000000..f6bd140cef
--- /dev/null
+++ b/internal/controller/cacert/reconciler.go
@@ -0,0 +1,1419 @@
+/*
+Copyright 2026 The Cozystack Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// Package cacert extracts the trust anchor of a managed application into a
+// canonical, key-free Secret the tenant can read.
+//
+// Every engine in the catalog issues a per-release CA, but the object that
+// holds ca.crt almost always holds a private key next to it: the cert-manager
+// CA Secret carries tls.key, CloudNativePG's <release>-ca carries ca.key.
+// Handing a tenant the trust anchor by granting read on one of those objects
+// hands over key material too. The consume contract is therefore one canonical
+// object per release — an Opaque Secret named "<release>.tenant-ca" holding
+// ONLY ca.crt — and this controller produces it, so a tenant learns exactly one
+// name. The dot in that name is load-bearing; see projectionSuffix.
+//
+// # The declaration is a namespaced sentinel
+//
+// A chart declares that one of its Secrets should be published to the tenant by
+// rendering a TenantProjection (internal.cozystack.io/v1alpha1) named after the
+// release. The sentinel is the reconcile unit, and its spec names the source
+// Secret and the key to lift. No tenant RBAC role grants any verb on
+// internal.cozystack.io, so a tenant cannot forge a sentinel to publish a CA of
+// their choosing. That RBAC boundary is the whole control: the group is out of
+// tenant reach, which is why the sentinel lives in it.
+//
+// # Why the owner is the sentinel, not the HelmRelease
+//
+// The lineage admission webhook decides whether the tenant may read the
+// projection, and it derives that by walking owner references up to a
+// HelmRelease (pkg/lineage/lineage.go). The projection references the sentinel;
+// the sentinel carries NO owner reference and instead the helm.toolkit.fluxcd.io/name
+// label Flux stamps on every rendered object, which the same walk resolves to
+// the HelmRelease as a fallback. So the chain
+// projection → sentinel → HelmRelease → application resolves through unmodified
+// lineage code, and the projection gets the internal.cozystack.io/tenantresource
+// label that lets the tenant read it through the tenantsecrets API.
+//
+// # What this controller does NOT decide
+//
+// It does not grant the tenant read access, and cannot. That verdict belongs to
+// the lineage admission webhook, which derives it from the ApplicationDefinition's
+// spec.secrets selectors and stamps internal.cozystack.io/tenantresource — "true"
+// or "false" — overwriting whatever the writer put there.
+//
+// This controller's side of the contract is to stamp
+// internal.cozystack.io/tenant-ca on the projection — the single engine-agnostic
+// label a definition's spec.secrets can select on — and to make sure the webhook
+// is asked again whenever those selectors change; see SelectorsDigestAnnotation.
+//
+// Until a definition actually carries that selector, projections are produced
+// and kept correct but are marked tenantresource=false, and no tenant can read
+// one. Converging the per-engine definitions is deliberately separate work.
+package cacert
+
+import (
+	"bytes"
+	"context"
+	"crypto/sha256"
+	"crypto/x509"
+	"encoding/hex"
+	"encoding/json"
+	"encoding/pem"
+	"errors"
+	"fmt"
+	"maps"
+	"reflect"
+	"regexp"
+	"sort"
+	"strings"
+	"time"
+
+	helmv2 "github.com/fluxcd/helm-controller/api/v2"
+	corev1 "k8s.io/api/core/v1"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	"k8s.io/apimachinery/pkg/api/meta"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apimachinery/pkg/types"
+	"k8s.io/client-go/tools/record"
+	"k8s.io/utils/ptr"
+	ctrl "sigs.k8s.io/controller-runtime"
+	"sigs.k8s.io/controller-runtime/pkg/builder"
+	"sigs.k8s.io/controller-runtime/pkg/cache"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/event"
+	"sigs.k8s.io/controller-runtime/pkg/handler"
+	"sigs.k8s.io/controller-runtime/pkg/log"
+	"sigs.k8s.io/controller-runtime/pkg/predicate"
+	"sigs.k8s.io/controller-runtime/pkg/reconcile"
+	crsource "sigs.k8s.io/controller-runtime/pkg/source"
+
+	internalv1alpha1 "github.com/cozystack/cozystack/api/internalapi/v1alpha1"
+	cozyv1alpha1 "github.com/cozystack/cozystack/api/v1alpha1"
+	"github.com/cozystack/cozystack/internal/shared/appdefowner"
+	appsv1alpha1 "github.com/cozystack/cozystack/pkg/apis/apps/v1alpha1"
+)
+
+const (
+	// TenantCALabel is stamped on every projection. It is the single,
+	// engine-agnostic selector an ApplicationDefinition needs in spec.secrets
+	// (matchLabels) to promote the trust anchor to a TenantSecret — no
+	// per-release name templating.
+	TenantCALabel = "internal.cozystack.io/tenant-ca"
+
+	// ManagedLabel marks a projection as controller-created. It is part of the
+	// drift check, so stripping it produces a write that puts it back, but no
+	// decision keys on it beyond that: whether a Secret at the canonical name may
+	// be overwritten is isOurProjection's call, and it does not look at this
+	// label.
+	ManagedLabel = "internal.cozystack.io/ca-cert-copy"
+
+	// SourceRefAnnotation records the "<namespace>/<name>" of the source on the
+	// projection, for traceability: `kubectl describe` shows which Secret fed
+	// the trust anchor. It is part of the drift check so a source change
+	// rewrites it, but nothing reads it to make a decision.
+	SourceRefAnnotation = "internal.cozystack.io/ca-cert-source"
+
+	// SelectorsDigestAnnotation records a digest of the ApplicationDefinition's
+	// spec.secrets at the projection's last write. It exists to force a
+	// re-admission when those selectors change.
+	//
+	// The reconciler does not decide whether a tenant may READ the projection.
+	// The lineage admission webhook does, from exactly those selectors, and it
+	// stamps its verdict — "true" or "false" — into the
+	// internal.cozystack.io/tenantresource label, overwriting whatever was there.
+	// A projection created before its definition selects
+	// internal.cozystack.io/tenant-ca is therefore marked "false".
+	//
+	// Nothing would ever fix that. When the definition later gains the selector
+	// the sentinel IS reconciled (definitions are watched), but the data, labels,
+	// source and owner have all stayed the same, so the drift check would skip
+	// the write — and with no write there is no admission, so the verdict is
+	// never revisited and the tenant stays locked out of a Secret that is now
+	// theirs. Making the selectors part of the drift check is half of closing
+	// that: they change, so exactly one write happens.
+	//
+	// The write is only half because a write is not an admission. The webhook is
+	// registered with objectSelector managed-by-cozystack DoesNotExist and stamps
+	// that marker in the same pass as the verdict, so every UPDATE after the
+	// first admission is skipped no matter how many writes are forced. The write
+	// must therefore also DROP the marker, which is what hands the projection
+	// back to the webhook; upsertProjection does that on a digest change, and the
+	// reasoning is there.
+	//
+	// Revocation is the direction that makes this load-bearing rather than tidy.
+	// A definition that stops selecting the anchor must take the tenant's access
+	// away; with the verdict frozen it stays "true" and the tenant keeps reading
+	// a trust anchor the platform withdrew.
+	//
+	// It digests spec.secrets rather than recording the definition's
+	// resourceVersion, which would be the cruder signal: resourceVersion moves on
+	// ANY edit to the definition, so every unrelated field change would rewrite
+	// every projection of that kind for no gain.
+	SelectorsDigestAnnotation = "internal.cozystack.io/ca-cert-selectors"
+
+	// managedByCozystackLabel is stamped by the lineage admission webhook. The
+	// reconciler removes it on exactly one occasion — a change to the selectors
+	// digest, which is what hands the projection back for re-admission (see
+	// upsertProjection) — and preserves it on every other write.
+	managedByCozystackLabel = "internal.cozystack.io/managed-by-cozystack"
+
+	// helmNameLabel is the Helm ownership label Flux stamps on every rendered
+	// object. On the sentinel it names the release, from which the canonical
+	// projection name is built, and it is the fallback the lineage webhook
+	// resolves the application through.
+	helmNameLabel = "helm.toolkit.fluxcd.io/name"
+
+	// caCertKey is the canonical key of the trust anchor: the default key read
+	// from a source, and the ONLY key ever written.
+	caCertKey = "ca.crt"
+
+	// certificatePEMType is the only PEM block type a trust anchor may carry.
+	// It is the type crypto/x509 writes and the one CertPool.AppendCertsFromPEM
+	// accepts, so it is what a tenant's verifier will look for.
+	certificatePEMType = "CERTIFICATE"
+
+	// projectionSuffix completes the canonical name "<release>.tenant-ca".
+	//
+	// The DOT is what separates the projection from engine CA Secrets, named
+	// <prefix><app><suffix>; Secret names are DNS-1123 subdomains, so a dot in one
+	// is legal. A release the apps API created carries none: application names are
+	// DNS-1035 labels (pkg/apis/apps/validation) and release.prefix is restricted
+	// to ^[a-z0-9-]*$ (api/v1alpha1). That guarantee stops at the API, because the
+	// release here comes from the helm.toolkit.fluxcd.io/name LABEL and a label
+	// value may carry a dot, so a hand-written HelmRelease is outside it. On the
+	// validated path the dot can only come from the <suffix> an operator or chart
+	// appends, which nothing validates at all, and a canonical name ends in
+	// ".tenant-ca" carrying that one dot, so only a suffix ending in ".tenant-ca"
+	// reaches one. A Secret there this controller does not recognise as its own is
+	// never overwritten; see isOurProjection. Do not "tidy" the dot into a dash.
+	projectionSuffix = ".tenant-ca"
+
+	// appsGroup is the API group of the aggregated application kinds, as it
+	// appears in the lineage labels.
+	appsGroup = "apps.cozystack.io"
+
+	trueValue = "true"
+
+	// resyncInterval heals a projection deleted out of band, or a name collision
+	// the operator has since cleared. The source Secret is watched, so a rotation
+	// does not wait for it; this is the slow backstop for state changes no watch
+	// delivers.
+	resyncInterval = 5 * time.Minute
+
+	// conditionReady is the single status condition the sentinel carries.
+	conditionReady = "Ready"
+
+	// sourceSecretNameField indexes TenantProjections by the source Secret names
+	// their entries reference, so a Secret event maps back to the sentinels that
+	// consume it in O(1).
+	sourceSecretNameField = ".spec.projections.sourceSecretName"
+)
+
+// Event reasons surfaced on the affected object.
+const (
+	reasonPrivateKeyRefused     = "CACertPrivateKeyRefused"
+	reasonInvalidCACert         = "CACertInvalid"
+	reasonCollision             = "CACertSecretCollision"
+	reasonCanonicalNameOccupied = "CACertCanonicalNameOccupied"
+	reasonCanonicalNameContract = "CACertCanonicalNameContract"
+)
+
+// Status condition reasons recorded on the sentinel's Ready condition. They are
+// the whole point of the sentinel: a state the old design retried silently is
+// now visible with `kubectl get tproj`.
+const (
+	reasonProjected             = "Projected"
+	reasonSourceInvalid         = "SourceInvalid"
+	reasonSourceNotFound        = "SourceNotFound"
+	reasonSourceNotReady        = "SourceNotReady"
+	reasonSourceRejected        = "SourceRejected"
+	reasonCanonicalOccupied     = "CanonicalNameOccupied"
+	reasonProjectionCollision   = "ProjectionCollision"
+	reasonProjectionTerminating = "ProjectionTerminating"
+	reasonNoRelease             = "NoRelease"
+	reasonUnsupportedProjection = "UnsupportedProjectionType"
+	reasonMultipleCACert        = "MultipleCACertProjections"
+	reasonReleaseContested      = "ReleaseContested"
+)
+
+// privateKeyHeader matches a PEM private-key header of any flavour (PKCS#1,
+// PKCS#8, EC, encrypted, OpenSSH, PGP). It is anchored to the header line and
+// case-insensitive, so it neither false-positives on certificate body text
+// that happens to contain the words "PRIVATE KEY" nor misses a lowercased
+// hand-pasted header. Identical in intent to the chart-side guard in
+// cozy-lib.tls.caCertSecret.
+//
+// It deliberately does NOT anchor on the closing "-----". Doing so reads as
+// tighter and is strictly weaker: PGP's header is
+// "-----BEGIN PGP PRIVATE KEY BLOCK-----", where BLOCK sits between "PRIVATE
+// KEY" and the dashes, so a closing anchor lets the one flavour a human is most
+// likely to paste by hand walk straight past the guard. Matching up to "PRIVATE
+// KEY" and stopping catches every flavour, and gives up nothing: the prefix is
+// already pinned to a PEM BEGIN line, which certificate body text cannot forge.
+var privateKeyHeader = regexp.MustCompile(`(?i)-----BEGIN [A-Z0-9 ]*PRIVATE KEY`)
+
+var (
+	// errPrivateKey and errNotCertificate are the two fail-closed outcomes of
+	// the write-path guard.
+	errPrivateKey     = errors.New("value carries PEM private key material")
+	errNotCertificate = errors.New("value is not a PEM certificate")
+
+	// errProjectionTerminating marks a projection still being garbage-collected
+	// — what deleting and recreating an application under the same name leaves
+	// behind. Writing to a terminating object accomplishes nothing; the
+	// reconciler waits for the collector and then creates a fresh projection.
+	errProjectionTerminating = errors.New("CA projection is terminating")
+
+	// errProjectionCollision marks a Secret at the canonical name that this
+	// controller did not create. Overwriting it could destroy live key material,
+	// so it is refused (and surfaced as an Event on the colliding object); the
+	// sentinel's status reports it rather than the reconcile failing.
+	errProjectionCollision = errors.New("canonical name occupied by a foreign Secret")
+)
+
+// Reconciler publishes the trust anchor declared by a TenantProjection sentinel
+// as a canonical, key-free "<release>.tenant-ca" Secret in the sentinel's
+// namespace.
+type Reconciler struct {
+	client.Client
+	// Reader is the manager's uncached APIReader. The source Secret and the
+	// projection are read through it, not the cache: the manager's Secret
+	// informer is metadata-only (SetupWithManager), so it holds no key material
+	// and cannot answer a data read, and the collision guard must not be fooled
+	// by a cache miss on a Secret that squats on the projection's name.
+	Reader client.Reader
+	// Recorder surfaces every refusal — key material under the lifted key, a
+	// malformed certificate, a name collision — as a Warning Event, so an
+	// otherwise silent skip is visible with `kubectl get events -n <namespace>`.
+	Recorder record.EventRecorder
+}
+
+// application identifies the application instance a release belongs to, as the
+// cozystack API stamps it on every HelmRelease it creates.
+type application struct {
+	Group string
+	Kind  string
+	Name  string
+}
+
+// +kubebuilder:rbac:groups="",resources=secrets,verbs=get;list;watch;create;update;patch;delete
+// +kubebuilder:rbac:groups="",resources=events,verbs=create;patch
+// +kubebuilder:rbac:groups=helm.toolkit.fluxcd.io,resources=helmreleases,verbs=get;list;watch
+// +kubebuilder:rbac:groups=cozystack.io,resources=applicationdefinitions,verbs=get;list;watch
+// +kubebuilder:rbac:groups=internal.cozystack.io,resources=tenantprojections,verbs=get;list;watch
+// +kubebuilder:rbac:groups=internal.cozystack.io,resources=tenantprojections/status,verbs=get;update;patch
+
+// Reconcile publishes the trust anchor declared by one TenantProjection.
+//
+// Everything that is not a transient API error resolves to a status condition
+// and, where a human must act, a Warning Event: an unpopulated source, a
+// poisoned value and a name collision must never wedge the workqueue, and must
+// never overwrite an object the controller does not own.
+func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
+	tp := &internalv1alpha1.TenantProjection{}
+	if err := r.Get(ctx, req.NamespacedName, tp); err != nil {
+		if apierrors.IsNotFound(err) {
+			// The sentinel is gone. The projection is owner-referenced to it, so
+			// the garbage collector removes it — there is no prune logic here, by
+			// design.
+			return ctrl.Result{}, nil
+		}
+		return ctrl.Result{}, fmt.Errorf("get TenantProjection: %w", err)
+	}
+	if tp.DeletionTimestamp != nil {
+		return ctrl.Result{}, nil
+	}
+
+	release := tp.Labels[helmNameLabel]
+	if release == "" {
+		// A sentinel Flux did not render carries no release, so no canonical
+		// trust-anchor name can be derived. Report it and stop; a re-render adds
+		// the label and wakes the For() watch.
+		if err := r.setReady(ctx, tp, notReady(reasonNoRelease,
+			fmt.Sprintf("sentinel carries no %s label; cannot derive the trust-anchor name", helmNameLabel))); err != nil {
+			return ctrl.Result{}, err
+		}
+		return ctrl.Result{}, nil
+	}
+
+	// The selectors digest forces the lineage webhook to re-admit the projection
+	// when the definition's spec.secrets — which decide tenant visibility —
+	// change; see SelectorsDigestAnnotation. It is not needed to project the CA
+	// itself, so a release whose HelmRelease or definition cannot be resolved is
+	// still projected, with an empty digest that fills in once they appear.
+	digest, err := r.selectorsDigestForRelease(ctx, tp.Namespace, release)
+	if err != nil {
+		return ctrl.Result{}, err
+	}
+
+	target := release + projectionSuffix
+
+	// Every CACert projection resolves to the single, release-derived canonical
+	// name, so more than one would overwrite the others on each pass — silently,
+	// and with the last entry winning while every reconcile churned the write.
+	// Refuse the whole sentinel rather than publish an arbitrary one of them. Only
+	// CACert exists today, so this is the sole way two entries can collide; a
+	// future projection type with its own target name would not.
+	caCertEntries := 0
+	for i := range tp.Spec.Projections {
+		if tp.Spec.Projections[i].Type == internalv1alpha1.ProjectionTypeCACert {
+			caCertEntries++
+		}
+	}
+	if caCertEntries > 1 {
+		// No requeue: a chart re-render fixing the declaration wakes the For()
+		// watch, and nothing self-heals a sentinel that declares two of them.
+		if err := r.setReady(ctx, tp, notReady(reasonMultipleCACert,
+			fmt.Sprintf("%d CACert projections declared; all resolve to the single canonical name %q, so none is published — declare at most one", caCertEntries, target))); err != nil {
+			return ctrl.Result{}, err
+		}
+		return ctrl.Result{}, nil
+	}
+
+	if caCertEntries == 0 {
+		// No CACert entry declares the trust anchor any more. The CRD's MinItems=1
+		// keeps a sentinel from emptying its projections list, so this is reached
+		// when a FUTURE non-CACert entry replaces the CACert one — the list stays
+		// non-empty while the anchor's declaration is gone. Withdraw a projection a
+		// previous declaration published: garbage collection only fires when the
+		// whole sentinel is pruned, so a sentinel that keeps existing with its CACert
+		// entry removed would otherwise serve a stale anchor forever. Only a
+		// projection this sentinel owns is deleted; a foreign Secret, or another
+		// sentinel's projection at the name, is left untouched.
+		if err := r.withdrawProjection(ctx, tp, target); err != nil {
+			return ctrl.Result{}, err
+		}
+	} else {
+		// Exactly one CACert entry. Refuse if another sentinel in this namespace
+		// declares one for the same release: both resolve to the single canonical
+		// name, so publishing a NEW anchor from either would silently pick an
+		// arbitrary winner and let the two flap ownership of one projection, while
+		// deleting either would garbage-collect an anchor the other still declares.
+		// Neither writes a fresh projection until the declaration lives on exactly
+		// one sentinel — a projection an earlier, uncontested reconcile already
+		// published is left in place, not deleted, because withdrawing an anchor is
+		// worse than leaving a stale one visible next to the contest condition. This
+		// mirrors the more-than-one-CACert-entry refusal above, one level up.
+		//
+		// Requeue on the resync interval, unlike the other refusals. NoRelease and
+		// MultipleCACert self-heal because the fix edits THIS sentinel, which the
+		// For() watch delivers; a contest is cleared by deleting the SIBLING
+		// sentinel, and nothing enqueues this one when a sibling changes. Without the
+		// requeue the surviving sentinel would not publish until the informer's
+		// global resync (hours), so the anchor could stay withheld long after the
+		// operator removed the duplicate.
+		other, err := r.anotherSentinelForRelease(ctx, tp, release)
+		if err != nil {
+			return ctrl.Result{}, err
+		}
+		if other != "" {
+			if err := r.setReady(ctx, tp, notReady(reasonReleaseContested,
+				fmt.Sprintf("another TenantProjection %q in this namespace declares a CACert projection for release %q; both resolve to the canonical name %q, so no new anchor is published — declare the trust anchor from exactly one sentinel", other, release, target))); err != nil {
+				return ctrl.Result{}, err
+			}
+			return ctrl.Result{RequeueAfter: resyncInterval}, nil
+		}
+	}
+
+	// The sentinel's Ready condition aggregates its projections: True only when
+	// every declared projection is published, otherwise the first failure.
+	ready := metav1.Condition{
+		Status:  metav1.ConditionTrue,
+		Reason:  reasonProjected,
+		Message: "all declared projections are published",
+	}
+	for i := range tp.Spec.Projections {
+		entry := &tp.Spec.Projections[i]
+		if entry.Type != internalv1alpha1.ProjectionTypeCACert {
+			// The CRD enum admits only CACert, so this is unreachable through the
+			// API; it stays as the explicit answer if the enum is ever widened
+			// before the code that handles the new type lands.
+			if ready.Status == metav1.ConditionTrue {
+				ready = notReady(reasonUnsupportedProjection,
+					fmt.Sprintf("projection type %q is not supported", entry.Type))
+			}
+			continue
+		}
+		cond, err := r.reconcileCACert(ctx, tp, target, digest, entry)
+		if err != nil {
+			return ctrl.Result{}, err
+		}
+		if cond.Status != metav1.ConditionTrue && ready.Status == metav1.ConditionTrue {
+			ready = cond
+		}
+	}
+
+	if err := r.setReady(ctx, tp, ready); err != nil {
+		return ctrl.Result{}, err
+	}
+	return ctrl.Result{RequeueAfter: resyncInterval}, nil
+}
+
+// reconcileCACert resolves one CACert entry's source and publishes it, returning
+// the Ready sub-state the entry contributes. A returned error is transient (the
+// caller requeues); every business outcome is a condition.
+func (r *Reconciler) reconcileCACert(ctx context.Context, tp *internalv1alpha1.TenantProjection, target, digest string, entry *internalv1alpha1.TenantProjectionEntry) (metav1.Condition, error) {
+	ns := tp.Namespace
+	sourceName := entry.SourceSecretName
+	key := strings.TrimSpace(entry.SourceKey)
+	if key == "" {
+		key = caCertKey
+	}
+
+	if sourceName == "" {
+		// The CRD pins sourceSecretName to MinLength=1, so a live apiserver rejects
+		// this at admission; an object admitted by an older CRD can still reach here.
+		// Resolve it to a condition rather than a Get: an empty name makes the
+		// apiserver return "resource name may not be empty", which is not NotFound,
+		// so it would escape the not-found branch below and wedge the reconcile on
+		// backoff with no status ever written — the silent retry the sentinel exists
+		// to make visible.
+		return notReady(reasonSourceInvalid,
+			"the projection declares an empty sourceSecretName; no source Secret can be resolved"), nil
+	}
+
+	secret := &corev1.Secret{}
+	if err := r.Reader.Get(ctx, types.NamespacedName{Namespace: ns, Name: sourceName}, secret); err != nil {
+		if apierrors.IsNotFound(err) {
+			// The declared source has not been created yet — the normal state
+			// between an application appearing and its operator minting the CA.
+			// The source is watched, so its creation wakes the reconciler; this
+			// makes the wait visible rather than silent.
+			return notReady(reasonSourceNotFound,
+				fmt.Sprintf("source Secret %q does not exist in namespace %q", sourceName, ns)), nil
+		}
+		return metav1.Condition{}, fmt.Errorf("get CA source %s/%s: %w", ns, sourceName, err)
+	}
+
+	if sourceName == target {
+		// The source itself sits at the canonical projection name — a Secret
+		// cannot be projected over itself.
+		return r.reconcileSourceAtCanonicalName(secret, target), nil
+	}
+
+	value, ok := secret.Data[key]
+	if !ok || len(bytes.TrimSpace(value)) == 0 {
+		// The source exists but the CA is not written yet — operators create the
+		// Secret before they populate it. The watch delivers the write.
+		return notReady(reasonSourceNotReady,
+			fmt.Sprintf("source Secret %q does not carry key %q yet", sourceName, key)), nil
+	}
+
+	if err := r.upsertProjection(ctx, tp, target, digest, secret, value); err != nil {
+		switch {
+		case errors.Is(err, errPrivateKey):
+			r.warn(secret, reasonPrivateKeyRefused,
+				"key %q carries PEM private key material; refusing to publish it as a trust anchor", key)
+			return notReady(reasonSourceRejected,
+				fmt.Sprintf("key %q in source Secret %q carries private key material", key, sourceName)), nil
+		case errors.Is(err, errNotCertificate):
+			r.warn(secret, reasonInvalidCACert,
+				"key %q does not carry a PEM certificate; refusing to publish it as a trust anchor", key)
+			return notReady(reasonSourceRejected,
+				fmt.Sprintf("key %q in source Secret %q does not carry a PEM certificate", key, sourceName)), nil
+		case errors.Is(err, errProjectionTerminating):
+			return notReady(reasonProjectionTerminating,
+				fmt.Sprintf("the previous projection %q is still being garbage-collected", target)), nil
+		case errors.Is(err, errProjectionCollision):
+			return notReady(reasonProjectionCollision,
+				fmt.Sprintf("a foreign Secret already occupies the projection name %q", target)), nil
+		}
+		return metav1.Condition{}, err
+	}
+	return metav1.Condition{
+		Status:  metav1.ConditionTrue,
+		Reason:  reasonProjected,
+		Message: fmt.Sprintf("published the trust anchor to %q", target),
+	}, nil
+}
+
+// withdrawProjection deletes the canonical trust-anchor Secret when the sentinel
+// no longer declares one, but ONLY when the Secret is one this sentinel owns.
+// Deleting the whole sentinel is handled by garbage collection through the owner
+// reference; this covers the narrower case of a sentinel that keeps existing with
+// its CACert declaration removed, which GC never sees. A foreign Secret at the
+// name, or a projection another sentinel owns, is never deleted.
+//
+// Ownership is decided by isOurProjection — the SAME name-match adoption uses —
+// not by an exact owner-reference match. The two must answer "ours?" the same way,
+// and "safe to overwrite" is the stronger claim: a projection this reconcile would
+// adopt and rewrite it must also be willing to withdraw. An exact match is strictly
+// too strict here, and in the wrong direction. It walks away from a projection left
+// by a previous incarnation of the application (right name, this sentinel's name in
+// the owner reference, the PREVIOUS UID) — which adoption re-homes but GC never
+// collects, so the retired anchor would stay tenant-readable forever — and from a
+// projection whose BlockOwnerDeletion flag has drifted, the very drift the adoption
+// path normalizes.
+func (r *Reconciler) withdrawProjection(ctx context.Context, tp *internalv1alpha1.TenantProjection, target string) error {
+	existing := &corev1.Secret{}
+	if err := r.Reader.Get(ctx, types.NamespacedName{Namespace: tp.Namespace, Name: target}, existing); err != nil {
+		if apierrors.IsNotFound(err) {
+			return nil
+		}
+		return fmt.Errorf("get CA projection %s/%s: %w", tp.Namespace, target, err)
+	}
+	if !isOurProjection(existing, tp) {
+		return nil
+	}
+	if err := r.Delete(ctx, existing); err != nil && !apierrors.IsNotFound(err) {
+		return fmt.Errorf("withdraw CA projection %s/%s: %w", tp.Namespace, target, err)
+	}
+	return nil
+}
+
+// anotherSentinelForRelease returns the name of a DIFFERENT sentinel in the same
+// namespace that carries the same release label and also declares a CACert
+// projection, or "" when this sentinel is the only one for the release. Two such
+// sentinels resolve to the same canonical projection name, so the reconcile refuses
+// to publish from either; see the caller.
+func (r *Reconciler) anotherSentinelForRelease(ctx context.Context, tp *internalv1alpha1.TenantProjection, release string) (string, error) {
+	list := &internalv1alpha1.TenantProjectionList{}
+	if err := r.List(ctx, list, client.InNamespace(tp.Namespace)); err != nil {
+		return "", fmt.Errorf("list TenantProjections in %s: %w", tp.Namespace, err)
+	}
+	for i := range list.Items {
+		other := &list.Items[i]
+		if other.Name == tp.Name || other.DeletionTimestamp != nil {
+			continue
+		}
+		if other.Labels[helmNameLabel] != release {
+			continue
+		}
+		for j := range other.Spec.Projections {
+			if other.Spec.Projections[j].Type == internalv1alpha1.ProjectionTypeCACert {
+				return other.Name, nil
+			}
+		}
+	}
+	return "", nil
+}
+
+// reconcileSourceAtCanonicalName handles the degenerate case where the source
+// itself sits at the canonical projection name — a Secret cannot be projected
+// over itself.
+//
+// The canonical name is chosen so that no operator the platform ships claims
+// it, so this is not reachable through any of them today. One way in is a
+// misconfiguration: a sentinel pointing sourceSecretName at
+// "<release>.tenant-ca" itself. The other is legitimate, and is why the
+// key-free branch below is a success rather than a refusal: an operator whose
+// own CA Secret is named with an appended ".tenant-ca", declared as the source
+// by its chart. Nothing validates that suffix; see projectionSuffix. The answer
+// depends entirely on content.
+//
+// A key-FREE Secret there is already the trust anchor the tenant needs: there
+// is nothing to extract, it is not the controller's to adopt, and that is a
+// silent success. A key-BEARING Secret there is the dangerous shape: the
+// canonical name is occupied by an object a tenant must never read, and no
+// projection could be written without destroying live key material. Refuse it
+// loudly — never overwrite, never adopt.
+func (r *Reconciler) reconcileSourceAtCanonicalName(src *corev1.Secret, target string) metav1.Condition {
+	for _, key := range sortedKeys(src.Data) {
+		if containsPrivateKey(string(src.Data[key])) {
+			r.warn(src, reasonCanonicalNameOccupied,
+				"the Secret %q occupies the canonical trust-anchor name and carries private key material under %q; no trust anchor is published for this release until that Secret is renamed",
+				target, key)
+			return notReady(reasonCanonicalOccupied,
+				fmt.Sprintf("the canonical name %q is occupied by a Secret carrying private key material", target))
+		}
+	}
+
+	// Key-free and already canonical: the engine publishes its own trust anchor,
+	// there is nothing to extract, and the Secret is not the controller's to
+	// adopt or rewrite.
+	//
+	// But deciding to leave it alone hands the canonical name to the tenant
+	// unexamined, and that name is a promise with a specific shape: an Opaque
+	// Secret carrying ca.crt and nothing else, which the shared write path
+	// GUARANTEES for every projection it writes. Here the object belongs to the
+	// engine, so the controller can only check it — and the one thing it must not
+	// do is skip the check and imply it passed.
+	if deviation := canonicalContractDeviation(src); deviation != "" {
+		r.warn(src, reasonCanonicalNameContract,
+			"the Secret %q occupies the canonical trust-anchor name but %s; it is left untouched, so it does not meet the clean, tenant-readable ca.crt that name promises",
+			target, deviation)
+	}
+
+	return metav1.Condition{
+		Status:  metav1.ConditionTrue,
+		Reason:  reasonProjected,
+		Message: fmt.Sprintf("the source already sits at the canonical name %q and is key-free", target),
+	}
+}
+
+// canonicalContractDeviation describes how a Secret sitting at the canonical
+// trust-anchor name departs from the contract that name carries, or "" when it
+// satisfies it. Key material is NOT its business: the caller has already refused
+// that, louder and for a different reason.
+//
+// The contract is not only about SHAPE. The name promises a clean ca.crt the
+// TENANT can read, and tenant visibility comes from the internal.cozystack.io/tenant-ca
+// label: the lineage webhook stamps tenantresource=false on a Secret that lacks it,
+// so an engine-owned anchor at the canonical name is locked away from the tenant
+// until it is labelled. A key-free Secret of the right shape but missing that label
+// is "published" only in name, so the label is checked alongside type and keys.
+//
+// All deviations are collected, not just the first, so the warning names every way
+// the object falls short in one pass.
+func canonicalContractDeviation(s *corev1.Secret) string {
+	var deviations []string
+	if s.Type != corev1.SecretTypeOpaque {
+		deviations = append(deviations, fmt.Sprintf("is of type %q rather than %q", s.Type, corev1.SecretTypeOpaque))
+	}
+	// Reuse the write path's own guard, so "is this a trust anchor?" is answered
+	// by one piece of code wherever it is asked.
+	if _, err := projectionData(s.Data[caCertKey]); err != nil {
+		deviations = append(deviations, fmt.Sprintf("its %q does not carry a usable trust anchor (%v)", caCertKey, err))
+	}
+	var extra []string
+	for _, key := range sortedKeys(s.Data) {
+		if key != caCertKey {
+			extra = append(extra, key)
+		}
+	}
+	if len(extra) > 0 {
+		deviations = append(deviations, fmt.Sprintf("carries %s besides %q", strings.Join(extra, ", "), caCertKey))
+	}
+	if s.Labels[TenantCALabel] != trueValue {
+		deviations = append(deviations, fmt.Sprintf("is missing the %q label the tenant read path selects on, so no tenant can read it", TenantCALabel))
+	}
+	return strings.Join(deviations, "; and ")
+}
+
+// sortedKeys returns a map's keys in a stable order, so an event message reads
+// the same on every reconcile rather than reshuffling with Go's map iteration.
+func sortedKeys(m map[string][]byte) []string {
+	out := make([]string, 0, len(m))
+	for k := range m {
+		out = append(out, k)
+	}
+	sort.Strings(out)
+	return out
+}
+
+// applicationDefinition returns the ApplicationDefinition for an application
+// kind, or nil when none is registered.
+//
+// The match is gated on the group as well as the kind: every
+// ApplicationDefinition describes a kind in appsGroup, and the release's own
+// group label must be that group, so requiring it keeps a release stamped with an
+// unexpected group from resolving a same-kind definition by accident.
+// ApplicationDefinition carries no group field of its own — the group is
+// invariant across all of them — so the check is against the constant. When more
+// than one definition declares the kind, the one that owns it under
+// appdefowner is returned, the same definition the chartRef reconciler and
+// cozystack-api act on, so a later definition's selectors are never read.
+func (r *Reconciler) applicationDefinition(ctx context.Context, app application) (*cozyv1alpha1.ApplicationDefinition, error) {
+	if app.Group != appsGroup {
+		return nil, nil
+	}
+	list := &cozyv1alpha1.ApplicationDefinitionList{}
+	if err := r.List(ctx, list); err != nil {
+		return nil, fmt.Errorf("list ApplicationDefinitions: %w", err)
+	}
+	owner := appdefowner.Owners(list.Items)[app.Kind]
+	for i := range list.Items {
+		if list.Items[i].Name == owner {
+			return &list.Items[i], nil
+		}
+	}
+	return nil, nil
+}
+
+// selectorsDigestForRelease resolves the release's ApplicationDefinition through
+// its HelmRelease and digests its spec.secrets. It is best-effort: a release
+// whose HelmRelease or definition is not resolvable yet gets an empty digest,
+// which fills in — forcing exactly one re-admission — once they appear. Only a
+// transient API error is returned; a not-yet-present HelmRelease or definition
+// is not one.
+func (r *Reconciler) selectorsDigestForRelease(ctx context.Context, namespace, release string) (string, error) {
+	hr := &helmv2.HelmRelease{}
+	if err := r.Get(ctx, types.NamespacedName{Namespace: namespace, Name: release}, hr); err != nil {
+		if apierrors.IsNotFound(err) {
+			return "", nil
+		}
+		return "", fmt.Errorf("get HelmRelease %s/%s: %w", namespace, release, err)
+	}
+	app, ok := applicationOf(hr)
+	if !ok {
+		return "", nil
+	}
+	def, err := r.applicationDefinition(ctx, app)
+	if err != nil {
+		return "", err
+	}
+	if def == nil {
+		return "", nil
+	}
+	return selectorsDigest(def)
+}
+
+// upsertProjection creates or refreshes the canonical trust-anchor Secret. This
+// is the only place bytes reach a projection, and the guard in projectionData
+// runs on exactly the bytes about to be written.
+func (r *Reconciler) upsertProjection(ctx context.Context, tp *internalv1alpha1.TenantProjection, target, digest string, sourceSecret *corev1.Secret, value []byte) error {
+	desired, err := projectionData(value)
+	if err != nil {
+		return err
+	}
+	owner := sentinelOwnerRef(tp)
+	ref := sourceSecret.Namespace + "/" + sourceSecret.Name
+	ns := tp.Namespace
+
+	existing := &corev1.Secret{}
+	err = r.Reader.Get(ctx, types.NamespacedName{Namespace: ns, Name: target}, existing)
+	switch {
+	case apierrors.IsNotFound(err):
+		projection := &corev1.Secret{
+			ObjectMeta: metav1.ObjectMeta{
+				Namespace: ns,
+				Name:      target,
+				Labels:    map[string]string{TenantCALabel: trueValue, ManagedLabel: trueValue},
+				Annotations: map[string]string{
+					SourceRefAnnotation:       ref,
+					SelectorsDigestAnnotation: digest,
+				},
+				OwnerReferences: []metav1.OwnerReference{owner},
+			},
+			Type: corev1.SecretTypeOpaque,
+			Data: desired,
+		}
+		if err := r.Create(ctx, projection); err != nil {
+			return fmt.Errorf("create CA projection %s/%s: %w", ns, target, err)
+		}
+		return nil
+	case err != nil:
+		return fmt.Errorf("get CA projection %s/%s: %w", ns, target, err)
+	}
+
+	// Adoption keys on the OWNER REFERENCE back to this sentinel, not on the marker
+	// label. The marker is an ordinary label any Secret writer in the namespace can
+	// forge OR STRIP, and keying adoption on it fails in the dangerous direction: an
+	// actor who strips the marker off the GENUINE projection and writes their own
+	// bytes under ca.crt would make the controller disown its own object, refuse to
+	// touch it as a "collision", and keep serving the forged anchor forever. The
+	// owner reference is the relationship this controller actually established;
+	// isOurProjection matches it by the sentinel's NAME so a delete-and-recreate of
+	// the application (same name, new UID) is still recognised as ours to re-home.
+	//
+	// Forging the owner reference does not help an attacker: it makes the object
+	// adoptable, and adoption OVERWRITES it with the genuine key-free CA and the
+	// genuine owner reference. That is the self-healing direction — the forged bytes
+	// are destroyed, not served. A Secret with NO owner reference back to this
+	// sentinel is a stranger, whatever its labels say, and is refused as a collision
+	// rather than overwritten, because it may hold live key material this controller
+	// must never destroy — and a stranger carries no owner chain to an application,
+	// so the lineage webhook cannot mark it tenantresource=true and no tenant reads
+	// it while the collision stands visible for an admin to clear.
+	//
+	// The Opaque type stays as a cheap sanity guard inside isOurProjection — every
+	// projection this controller creates is Opaque — but it is no longer
+	// load-bearing. The update path below is a read-modify-write that never writes
+	// Type, so adopting a non-Opaque Secret could not self-DoS on Secret.type's
+	// immutability; the guard just declines to treat an object of the wrong shape as
+	// one of ours.
+	if !isOurProjection(existing, tp) {
+		// A Secret of this name exists that the controller did not create.
+		// Overwriting it could destroy live key material, so refuse and surface
+		// the refusal on the colliding object itself.
+		r.warn(existing, reasonCollision,
+			"a Secret named %q already exists and was not created by the CA extraction controller; the trust anchor is not published until that Secret is removed",
+			target)
+		return errProjectionCollision
+	}
+
+	if existing.DeletionTimestamp != nil {
+		// Do not write to an object the garbage collector is already removing:
+		// the write would land and then be thrown away with it.
+		return errProjectionTerminating
+	}
+
+	// The selectors digest is part of the drift check, not decoration: it is what
+	// makes a change to spec.secrets — the selectors that decide whether the tenant
+	// may read this projection at all — produce a write. See
+	// SelectorsDigestAnnotation.
+	selectorsChanged := existing.Annotations[SelectorsDigestAnnotation] != digest
+	if maps.EqualFunc(existing.Data, desired, bytes.Equal) &&
+		existing.Labels[TenantCALabel] == trueValue &&
+		existing.Labels[ManagedLabel] == trueValue &&
+		existing.Annotations[SourceRefAnnotation] == ref &&
+		!selectorsChanged &&
+		ownedSolelyBy(existing.OwnerReferences, owner) {
+		return nil
+	}
+
+	// Merge, never replace: the lineage admission webhook stamps its own labels
+	// (managed-by-cozystack, tenantresource, application.*) on the projection, and
+	// replacing the map wholesale would strip the tenantresource label the tenant's
+	// read path depends on.
+	if existing.Labels == nil {
+		existing.Labels = map[string]string{}
+	}
+	existing.Labels[TenantCALabel] = trueValue
+	existing.Labels[ManagedLabel] = trueValue
+	if existing.Annotations == nil {
+		existing.Annotations = map[string]string{}
+	}
+	existing.Annotations[SourceRefAnnotation] = ref
+	existing.Annotations[SelectorsDigestAnnotation] = digest
+
+	if selectorsChanged {
+		// Hand the projection BACK to the lineage webhook, by dropping the marker
+		// that keeps the webhook away from it.
+		//
+		// Forcing a write is not enough, and believing it was is the hole this
+		// closes. The webhook is registered with objectSelector
+		// managed-by-cozystack DoesNotExist, and Kubernetes evaluates
+		// objectSelector against BOTH oldObject and newObject, running the webhook
+		// only if EITHER matches. The webhook stamps that marker in the same pass
+		// as its tenantresource verdict, so from the first admission onward both
+		// objects carry it, neither matches DoesNotExist, and every subsequent
+		// UPDATE is skipped — however many the digest forces. The verdict would
+		// then be frozen at whatever the CREATE-time selectors said, forever.
+		//
+		// Deleting the marker makes newObject match, so this one write is admitted
+		// and the webhook recomputes tenantresource from the CURRENT selectors and
+		// re-stamps the marker along with it. The next reconcile sees a matching
+		// digest and writes nothing, so it settles after exactly one pass.
+		//
+		// Both directions of the verdict depend on this, and the dangerous one is
+		// REVOCATION: a definition that stops selecting the trust anchor must take
+		// the tenant's read access away, and without re-admission tenantresource
+		// stays "true" and the tenant keeps reading an anchor the platform has
+		// withdrawn. Granting merely fails to arrive; revoking fails silently open.
+		//
+		// It is safe to remove: the webhook is failurePolicy Fail, so if it cannot
+		// be reached the UPDATE is rejected and the reconciler retries with
+		// backoff. The projection is never left stored without its labels.
+		//
+		// Only a SELECTOR change does this. A data rotation cannot alter the
+		// webhook's verdict, so re-admitting on one would be pure load.
+		delete(existing.Labels, managedByCozystackLabel)
+	}
+	if !ownedSolelyBy(existing.OwnerReferences, owner) {
+		// REPLACE, never append, and replace down to EXACTLY one reference.
+		//
+		// Appending is wrong twice over. The API server rejects a second reference
+		// with Controller=true outright ("Only one reference can have Controller
+		// set to true"), and a stale reference is exactly what deleting and
+		// recreating an application under the same name leaves behind — same
+		// sentinel name, new UID — so appending would wedge the reconciler on an
+		// Invalid error instead of re-homing the projection onto the live sentinel.
+		//
+		// Keeping any OTHER reference is wrong too, which is why this asks
+		// ownedSolelyBy and not hasOwner: garbage collection deletes a dependent
+		// only once EVERY owner is gone, so one extra reference outlives the
+		// sentinel and keeps the projection — a trust anchor for an application
+		// that no longer exists — readable in the tenant's namespace. Nothing
+		// legitimate co-owns a projection: this controller creates it with one
+		// owner, and the lineage webhook stamps labels, not references.
+		existing.OwnerReferences = []metav1.OwnerReference{owner}
+	}
+	// Data is REPLACED, not merged: the projection holds ca.crt and nothing else,
+	// on every write, whatever it held before.
+	//
+	// Type is deliberately NOT written. It is immutable in Kubernetes, so writing
+	// it can only ever be a no-op or an Invalid error — and the adoption gate above
+	// has already established that this object is Opaque.
+	existing.Data = desired
+	if err := r.Update(ctx, existing); err != nil {
+		return fmt.Errorf("update CA projection %s/%s: %w", ns, target, err)
+	}
+	return nil
+}
+
+// isOurProjection reports whether the Secret at the canonical name is one this
+// controller created — and so is safe to adopt and overwrite with the genuine
+// trust anchor.
+//
+// The signal is the OWNER REFERENCE back to a TenantProjection of this sentinel's
+// name, not the ManagedLabel marker. The marker is an ordinary label any Secret
+// writer in the namespace can forge or STRIP, so keying adoption on it fails in
+// the dangerous direction: stripping it off the genuine projection would make the
+// controller disown its own object and keep serving whatever bytes the same actor
+// wrote. The owner reference is the relationship this controller actually
+// established; an actor can forge one, but forging it only causes an
+// adopt-and-overwrite with the genuine key-free CA — the self-healing direction —
+// so it grants nothing.
+//
+// The reference is matched by NAME rather than by exact UID on purpose: a
+// delete-and-recreate of the application leaves the projection owner-referenced to
+// the PREVIOUS sentinel incarnation (same name, new UID) until the garbage
+// collector catches up, and that stale projection is ours to re-home, not a
+// stranger to refuse. Owner references are namespaced and a TenantProjection name
+// is unique in its namespace, so a name match is an identity match.
+//
+// The Opaque type stays as a cheap sanity guard — every projection this controller
+// creates is Opaque — but it is no longer load-bearing: the update path is a
+// read-modify-write that never writes Type, so it could not self-DoS on an adopted
+// non-Opaque Secret even without this check.
+func isOurProjection(s *corev1.Secret, tp *internalv1alpha1.TenantProjection) bool {
+	if s.Type != corev1.SecretTypeOpaque {
+		return false
+	}
+	for i := range s.OwnerReferences {
+		ref := &s.OwnerReferences[i]
+		if ref.Kind == "TenantProjection" &&
+			ref.APIVersion == internalv1alpha1.GroupVersion.String() &&
+			ref.Name == tp.Name {
+			return true
+		}
+	}
+	return false
+}
+
+// selectorsDigest digests the ApplicationDefinition's spec.secrets — the
+// selectors the lineage webhook uses to decide whether the projection is visible
+// to the tenant. It is the drift signal that forces a re-admission when tenant
+// visibility changes; see SelectorsDigestAnnotation.
+//
+// The full digest is stored, not a truncated prefix. A collision skips exactly the
+// re-admission the doc calls load-bearing — the revocation direction, where a
+// tenant would silently keep read access after a definition stopped selecting the
+// anchor — and the annotation carries no length limit, so the full hash is free
+// hardening on the path that matters most.
+func selectorsDigest(def *cozyv1alpha1.ApplicationDefinition) (string, error) {
+	encoded, err := json.Marshal(def.Spec.Secrets)
+	if err != nil {
+		return "", fmt.Errorf("digest spec.secrets of ApplicationDefinition %s: %w", def.Name, err)
+	}
+	sum := sha256.Sum256(encoded)
+	return hex.EncodeToString(sum[:]), nil
+}
+
+// projectionData builds the projection payload and is the single write-path
+// guard. It emits exactly one key — the canonical ca.crt — whose value is
+// REBUILT from the certificate blocks it validated, never copied from the
+// input. It refuses anything that carries a PEM private-key header or is not a
+// PEM certificate. Every byte written to a projection passes through here, on
+// create and on update.
+//
+// The two checks run in this order deliberately. The key guard is the one whose
+// failure is a security incident and it must own that verdict: a private key
+// wrapped in certificate armour has to be refused AS key material, with the
+// event that says so, not as a parse failure.
+//
+// Rebuilding the value from the parsed blocks — instead of cloning the input
+// once it validates — is what makes the guard airtight, and it closes a real
+// hole. The key guard above matches a PEM "-----BEGIN ... PRIVATE KEY-----"
+// header; a RAW DER or JWK private key wears no such header, so it walks past.
+// pem.Decode then SKIPS bytes before the first block and between blocks, so
+// that key never reaches the certificate loop either. A projection cloned from
+// the input would therefore hand the tenant a trust anchor with a private key
+// tucked in front of, or between, the certificates. A projection assembled only
+// from the re-encoded certificate DER cannot carry a byte the guard did not
+// parse as a certificate.
+func projectionData(value []byte) (map[string][]byte, error) {
+	if containsPrivateKey(string(value)) {
+		return nil, errPrivateKey
+	}
+	chain, err := certificateChainPEM(value)
+	if err != nil {
+		return nil, err
+	}
+	return map[string][]byte{caCertKey: chain}, nil
+}
+
+// certificateChainPEM validates that value is a PEM sequence of nothing but
+// certificates that x509 accepts, and returns those certificates re-encoded as
+// a clean PEM chain — the exact bytes the projection publishes.
+//
+// A header match is not this check, and the difference is the guard's whole
+// worth. "-----BEGIN CERTIFICATE-----" around a truncated DER prefix, around
+// base64 of an English sentence, or around nothing at all satisfies a regex and
+// is not a certificate: the projection would be handed to the tenant as a
+// vouched trust anchor carrying bytes no verifier can load. So every block is
+// DECODED and PARSED, and a value is a trust anchor only if it is certificates
+// all the way down:
+//
+//   - at least one block, because an empty value vouches for nothing;
+//   - every block of type CERTIFICATE, so a PUBLIC KEY block — parseable, and
+//     not a trust anchor — is refused with the rest;
+//   - every block accepted by x509.ParseCertificate, which is the actual claim;
+//   - nothing but PEM blocks left at the end, so a value cannot carry a
+//     certificate and then trail arbitrary bytes past the first match.
+//
+// The returned chain is assembled from the PARSED certificate DER, not from the
+// input. pem.Decode silently skips text before a block and between blocks — the
+// human-readable preamble `openssl x509 -text` emits, but also a raw DER or JWK
+// key that carries no PEM private-key header — so copying the input verbatim
+// would republish those bytes to the tenant. Re-encoding only the certificates
+// makes preamble and interstitial key material structurally unreachable; the
+// trailing-byte rejection still keeps a value from parsing as a certificate and
+// then trailing arbitrary bytes past the last block.
+func certificateChainPEM(value []byte) ([]byte, error) {
+	// "At least one block" is enforced HERE and only here: an empty value is
+	// rejected up front, which is what guarantees the loop below runs at least
+	// once, and every iteration either returns an error or parses a certificate.
+	// A counter checked afterwards would be unreachable.
+	rest := bytes.TrimSpace(value)
+	if len(rest) == 0 {
+		return nil, fmt.Errorf("%w: value is empty", errNotCertificate)
+	}
+	var chain []byte
+	for len(rest) > 0 {
+		var block *pem.Block
+		block, rest = pem.Decode(rest)
+		if block == nil {
+			return nil, fmt.Errorf("%w: value carries %d bytes that are not a PEM block", errNotCertificate, len(rest))
+		}
+		if block.Type != certificatePEMType {
+			return nil, fmt.Errorf("%w: PEM block is of type %q, want %q", errNotCertificate, block.Type, certificatePEMType)
+		}
+		if _, err := x509.ParseCertificate(block.Bytes); err != nil {
+			return nil, fmt.Errorf("%w: %v", errNotCertificate, err)
+		}
+		// Re-encode ONLY the parsed certificate DER: no PEM headers, no
+		// surrounding bytes, nothing the loop did not just verify is a
+		// certificate. This is the byte-for-byte content of the projection.
+		chain = append(chain, pem.EncodeToMemory(&pem.Block{
+			Type:  certificatePEMType,
+			Bytes: block.Bytes,
+		})...)
+		rest = bytes.TrimSpace(rest)
+	}
+	return chain, nil
+}
+
+// applicationOf reads the application identity the cozystack API stamps on every
+// HelmRelease it creates. A HelmRelease without it is not an application release.
+func applicationOf(hr *helmv2.HelmRelease) (application, bool) {
+	app := application{
+		Group: hr.Labels[appsv1alpha1.ApplicationGroupLabel],
+		Kind:  hr.Labels[appsv1alpha1.ApplicationKindLabel],
+		Name:  hr.Labels[appsv1alpha1.ApplicationNameLabel],
+	}
+	if app.Group == "" || app.Kind == "" || app.Name == "" {
+		return application{}, false
+	}
+	return app, true
+}
+
+// containsPrivateKey reports whether a PEM blob carries private key material.
+// Anchored to the header line: a certificate whose body or subject text
+// mentions "PRIVATE KEY" is not a false positive.
+func containsPrivateKey(pem string) bool {
+	return privateKeyHeader.MatchString(pem)
+}
+
+// sentinelOwnerRef builds the owner reference the projection carries back to its
+// TenantProjection sentinel. The sentinel — not the HelmRelease — is the owner:
+// the lineage webhook resolves the application by walking owner references, and
+// the sentinel's own helm.toolkit.fluxcd.io/name label carries that walk on to
+// the HelmRelease (see the package doc). Deleting the sentinel garbage-collects
+// the projection through this reference.
+func sentinelOwnerRef(tp *internalv1alpha1.TenantProjection) metav1.OwnerReference {
+	return metav1.OwnerReference{
+		APIVersion: internalv1alpha1.GroupVersion.String(),
+		Kind:       "TenantProjection",
+		Name:       tp.Name,
+		UID:        tp.UID,
+		// The projection has exactly one manager, this controller.
+		Controller: new(true),
+		// BlockOwnerDeletion stays false: the trust anchor must never hold up the
+		// teardown of the application it belongs to.
+		BlockOwnerDeletion: new(false),
+	}
+}
+
+// ownedSolelyBy reports whether refs is EXACTLY the desired controller reference
+// and nothing besides.
+//
+// Presence is not the question, and it is not enough. Kubernetes garbage
+// collection removes a dependent only once EVERY owner in its list is gone, and
+// an extra reference is something any Secret writer in the namespace can append
+// — the API server accepts it as long as it is not a second Controller=true. A
+// projection carrying one therefore SURVIVES the deletion of the sentinel it
+// vouches for, and that owner reference is the entire mechanism by which a
+// retired trust anchor is collected. The tenant would be left reading the CA of
+// an application that no longer exists.
+//
+// Requiring sole ownership turns that into drift, which the write path then
+// normalizes away by replacing the list. The cost of being wrong is one extra
+// write; the cost of accepting mere presence is a projection that outlives its
+// sentinel, permanently.
+func ownedSolelyBy(refs []metav1.OwnerReference, want metav1.OwnerReference) bool {
+	return len(refs) == 1 && hasOwner(refs, want)
+}
+
+// hasOwner reports whether refs already carries the desired CONTROLLER reference.
+//
+// Both boolean flags are part of the comparison, not only the identity fields.
+// The Controller flag is: a reference that names the right owner but is not
+// marked as the controller (hand-edited, say) leaves the projection without a
+// controlling owner, and treating it as a match would let the drift check pass
+// and never re-home it. BlockOwnerDeletion is too, for the symmetric reason:
+// sentinelOwnerRef pins it to false so the trust anchor never holds up the
+// teardown of its application, and a reference that drifts it to true — which
+// makes a foreground deletion of the sentinel block on the projection — must be
+// re-homed back to false, not accepted as already-correct.
+func hasOwner(refs []metav1.OwnerReference, want metav1.OwnerReference) bool {
+	for _, ref := range refs {
+		if ref.UID == want.UID && ref.Kind == want.Kind && ref.Name == want.Name &&
+			ref.APIVersion == want.APIVersion &&
+			ptr.Deref(ref.Controller, false) == ptr.Deref(want.Controller, false) &&
+			ptr.Deref(ref.BlockOwnerDeletion, false) == ptr.Deref(want.BlockOwnerDeletion, false) {
+			return true
+		}
+	}
+	return false
+}
+
+// notReady builds a Ready=False condition; setReady fills in the type and
+// observed generation.
+func notReady(reason, message string) metav1.Condition {
+	return metav1.Condition{
+		Status:  metav1.ConditionFalse,
+		Reason:  reason,
+		Message: message,
+	}
+}
+
+// setReady writes the Ready condition, skipping the API round-trip when nothing
+// changed so a steady projection does not churn the status on every resync.
+func (r *Reconciler) setReady(ctx context.Context, tp *internalv1alpha1.TenantProjection, cond metav1.Condition) error {
+	cond.Type = conditionReady
+	cond.ObservedGeneration = tp.Generation
+
+	updated := tp.DeepCopy()
+	updated.Status.ObservedGeneration = tp.Generation
+	meta.SetStatusCondition(&updated.Status.Conditions, cond)
+
+	if statusEqual(tp.Status, updated.Status) {
+		return nil
+	}
+	tp.Status = updated.Status
+	return r.Status().Update(ctx, tp)
+}
+
+// statusEqual reports whether two statuses are equal for the fields this
+// controller sets, ignoring the condition's lastTransitionTime so an unchanged
+// verdict is a no-op.
+func statusEqual(a, b internalv1alpha1.TenantProjectionStatus) bool {
+	if a.ObservedGeneration != b.ObservedGeneration {
+		return false
+	}
+	if len(a.Conditions) != len(b.Conditions) {
+		return false
+	}
+	for i := range a.Conditions {
+		ac, bc := a.Conditions[i], b.Conditions[i]
+		if ac.Type != bc.Type ||
+			ac.Status != bc.Status ||
+			ac.Reason != bc.Reason ||
+			ac.Message != bc.Message ||
+			ac.ObservedGeneration != bc.ObservedGeneration {
+			return false
+		}
+	}
+	return true
+}
+
+// warn records a Warning Event on obj, so a refusal is visible without reading
+// controller logs.
+func (r *Reconciler) warn(obj client.Object, reason, format string, args ...any) {
+	log.Log.Info("CA extraction refused",
+		"reason", reason, "object", obj.GetNamespace()+"/"+obj.GetName(), "detail", fmt.Sprintf(format, args...))
+	if r.Recorder != nil {
+		r.Recorder.Eventf(obj, corev1.EventTypeWarning, reason, format, args...)
+	}
+}
+
+// secretGVK types the metadata-only Secret watch. The informer holds Secret
+// metadata stubs cluster-wide, never the Data — no private key ever enters the
+// cache — and the actual bytes are read on demand through the uncached Reader.
+var secretGVK = schema.GroupVersionKind{Version: "v1", Kind: "Secret"}
+
+// secretMeta returns a PartialObjectMetadata typed as a Secret for the
+// metadata-only watch.
+func secretMeta() *metav1.PartialObjectMetadata {
+	obj := &metav1.PartialObjectMetadata{}
+	obj.SetGroupVersionKind(secretGVK)
+	return obj
+}
+
+// SetupWithManager wires the reconciler to the TenantProjection sentinels.
+//
+// The reconcile unit is the sentinel. Source Secrets are watched as metadata
+// only — the informer holds stubs, not key material — and mapped back to the
+// sentinels that reference them through a field index on
+// spec.projections.sourceSecretName; the reconcile then reads the one source it
+// needs through the uncached Reader. ApplicationDefinitions are watched so a
+// change to the selectors that decide tenant visibility takes effect without
+// waiting for the resync.
+//
+// The SAME metadata Secret cache also feeds a second mapping: the projection this
+// controller writes is itself a Secret, and an in-place rewrite of its ca.crt (a
+// tamper the owner-reference adoption gate then heals) must wake the reconciler at
+// once, not five minutes later on the resync. The projection's name is
+// "<release>.tenant-ca", which matches no sentinel's sourceSecretName, so the
+// source index never enqueues it; projectionsForOwnedProjection resolves the
+// owning sentinel from the projection's controller owner reference instead.
+// Owns(&corev1.Secret{}) would be the obvious wiring and is a TRAP here: it
+// registers against the MANAGER's cache, whose Secret informer is label-scoped to
+// the WildcardSecret replicas (below), so a projection — which carries no wildcard
+// label — is never delivered and the watch silently never fires.
+//
+// The Secret watch runs on secretMetaCache, a DEDICATED cache, NOT the manager's.
+// It cannot use the manager's cache, and the reason is a controller-runtime trap
+// rather than a preference: that cache scopes its v1/Secret informer to the
+// WildcardSecret reconciler's replicas with a label selector (see main.go), a
+// metadata informer for the same GVK routes to that same per-GVK cache
+// (delegatingByGVKCache keys on GVK, and a PartialObjectMetadata typed as Secret
+// resolves to v1/Secret), and the selector is applied to every informer in it —
+// metadata included. On the manager cache this watch would therefore silently
+// never fire for a CA source, which carries no wildcard label, and the projection
+// would appear only on the slow resync. A dedicated cache holds Secret metadata
+// stubs cluster-wide, unscoped and key-free, so every source's creation and
+// rotation wakes the reconciler at once.
+func (r *Reconciler) SetupWithManager(mgr ctrl.Manager, secretMetaCache cache.Cache) error {
+	if err := mgr.GetFieldIndexer().IndexField(context.Background(), &internalv1alpha1.TenantProjection{}, sourceSecretNameField, indexBySourceSecretName); err != nil {
+		return fmt.Errorf("index TenantProjection by source Secret name: %w", err)
+	}
+
+	return ctrl.NewControllerManagedBy(mgr).
+		Named("cacert").
+		For(&internalv1alpha1.TenantProjection{}).
+		WatchesRawSource(crsource.Kind(secretMetaCache, secretMeta(),
+			handler.TypedEnqueueRequestsFromMapFunc(r.projectionsForSourceSecret),
+		)).
+		WatchesRawSource(crsource.Kind(secretMetaCache, secretMeta(),
+			handler.TypedEnqueueRequestsFromMapFunc(r.projectionsForOwnedProjection),
+		)).
+		Watches(&cozyv1alpha1.ApplicationDefinition{},
+			handler.EnqueueRequestsFromMapFunc(r.projectionsForApplicationDefinition),
+			builder.WithPredicates(applicationDefinitionPredicate),
+		).
+		Complete(r)
+}
+
+// indexBySourceSecretName indexes a TenantProjection by the source Secret names
+// its entries reference, so a Secret event maps back to the sentinels that
+// consume it in one cache lookup. Shared by SetupWithManager's field index and
+// the tests that exercise the mapping.
+func indexBySourceSecretName(obj client.Object) []string {
+	tp, ok := obj.(*internalv1alpha1.TenantProjection)
+	if !ok {
+		return nil
+	}
+	names := make([]string, 0, len(tp.Spec.Projections))
+	for i := range tp.Spec.Projections {
+		if n := tp.Spec.Projections[i].SourceSecretName; n != "" {
+			names = append(names, n)
+		}
+	}
+	return names
+}
+
+// projectionsForSourceSecret maps a source Secret back to the sentinels that
+// consume it, so a rotation (or the source's first appearance) propagates
+// immediately. It takes the metadata stub the dedicated cache delivers, not a
+// full Secret. The field index keeps this to a single cache lookup, and a Secret
+// no sentinel references maps to nothing.
+func (r *Reconciler) projectionsForSourceSecret(ctx context.Context, obj *metav1.PartialObjectMetadata) []reconcile.Request {
+	list := &internalv1alpha1.TenantProjectionList{}
+	if err := r.List(ctx, list,
+		client.InNamespace(obj.GetNamespace()),
+		client.MatchingFields{sourceSecretNameField: obj.GetName()},
+	); err != nil {
+		log.FromContext(ctx).Error(err, "map source Secret to its TenantProjections",
+			"secret", obj.GetNamespace()+"/"+obj.GetName())
+		return nil
+	}
+	out := make([]reconcile.Request, 0, len(list.Items))
+	for i := range list.Items {
+		out = append(out, reconcile.Request{NamespacedName: types.NamespacedName{
+			Namespace: list.Items[i].Namespace, Name: list.Items[i].Name,
+		}})
+	}
+	return out
+}
+
+// projectionsForOwnedProjection maps a Secret back to the sentinel that owns it as
+// its published projection, so an in-place tamper of the canonical
+// "<release>.tenant-ca" Secret's data is corrected at once rather than waiting for
+// the slow resync. The projection's own name matches no sentinel's
+// sourceSecretName, so projectionsForSourceSecret never enqueues it; the controller
+// owner reference the projection carries is what identifies its sentinel. The
+// reference lives in the object metadata, so the metadata stub the dedicated cache
+// delivers is enough and no key material is read.
+func (r *Reconciler) projectionsForOwnedProjection(_ context.Context, obj *metav1.PartialObjectMetadata) []reconcile.Request {
+	var out []reconcile.Request
+	for _, ref := range obj.GetOwnerReferences() {
+		if ref.Kind == "TenantProjection" && ref.APIVersion == internalv1alpha1.GroupVersion.String() {
+			out = append(out, reconcile.Request{NamespacedName: types.NamespacedName{
+				Namespace: obj.GetNamespace(), Name: ref.Name,
+			}})
+		}
+	}
+	return out
+}
+
+// projectionsForApplicationDefinition maps an ApplicationDefinition change to
+// every sentinel, so a change to the spec.secrets selectors that decide tenant
+// visibility recomputes the selectors digest and re-admits a changed verdict at
+// once. It fans out unconditionally by design — a definition serves every release
+// of its kind, and this controller has no cheap index from a definition back to
+// only the sentinels of that kind. applicationDefinitionPredicate is what keeps
+// the fan-out rare: it gates the watch so only a change that can move the digest
+// reaches this mapping at all.
+func (r *Reconciler) projectionsForApplicationDefinition(ctx context.Context, _ client.Object) []reconcile.Request {
+	list := &internalv1alpha1.TenantProjectionList{}
+	if err := r.List(ctx, list); err != nil {
+		log.FromContext(ctx).Error(err, "map ApplicationDefinition to TenantProjections")
+		return nil
+	}
+	out := make([]reconcile.Request, 0, len(list.Items))
+	for i := range list.Items {
+		out = append(out, reconcile.Request{NamespacedName: types.NamespacedName{
+			Namespace: list.Items[i].Namespace, Name: list.Items[i].Name,
+		}})
+	}
+	return out
+}
+
+// applicationDefinitionPredicate gates the ApplicationDefinition watch so the
+// unconditional fan-out above fires only when it can matter. Without it, Flux's
+// periodic no-op re-apply of every *-rd definition would enqueue every sentinel in
+// the cluster on each pass; the digest drift check then suppresses the write, but
+// not the load — each such reconcile still issues several uncached reads.
+//
+// Create, delete and generic events keep the default pass-through: a definition
+// appearing or disappearing can change a verdict. An UPDATE is delivered when
+// spec.secrets changed, the exact field selectorsDigest digests, or when
+// spec.application.kind changed, since that can hand a kind to another definition
+// whose spec.secrets then decide the digest.
+var applicationDefinitionPredicate = predicate.Funcs{
+	UpdateFunc: applicationDefinitionSecretsChanged,
+}
+
+// applicationDefinitionSecretsChanged reports whether an ApplicationDefinition
+// UPDATE touched spec.secrets. A non-ApplicationDefinition event falls through as
+// delivered rather than being silently dropped.
+func applicationDefinitionSecretsChanged(e event.UpdateEvent) bool {
+	oldDef, ok := e.ObjectOld.(*cozyv1alpha1.ApplicationDefinition)
+	if !ok {
+		return true
+	}
+	newDef, ok := e.ObjectNew.(*cozyv1alpha1.ApplicationDefinition)
+	if !ok {
+		return true
+	}
+	return !reflect.DeepEqual(oldDef.Spec.Secrets, newDef.Spec.Secrets) ||
+		oldDef.Spec.Application.Kind != newDef.Spec.Application.Kind
+}
diff --git a/internal/controller/cacert/reconciler_test.go b/internal/controller/cacert/reconciler_test.go
new file mode 100644
index 0000000000..2dd0146f59
--- /dev/null
+++ b/internal/controller/cacert/reconciler_test.go
@@ -0,0 +1,1556 @@
+/*
+Copyright 2026 The Cozystack Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package cacert
+
+import (
+	"bytes"
+	"context"
+	"crypto/ecdsa"
+	"crypto/elliptic"
+	"crypto/rand"
+	"crypto/x509"
+	"crypto/x509/pkix"
+	"encoding/base64"
+	"encoding/pem"
+	"errors"
+	"math/big"
+	"strings"
+	"testing"
+	"time"
+
+	helmv2 "github.com/fluxcd/helm-controller/api/v2"
+	corev1 "k8s.io/api/core/v1"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	"k8s.io/apimachinery/pkg/api/meta"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/types"
+	"k8s.io/apimachinery/pkg/util/validation"
+	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
+	"k8s.io/client-go/tools/record"
+	"k8s.io/utils/ptr"
+	ctrl "sigs.k8s.io/controller-runtime"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/client/fake"
+	"sigs.k8s.io/controller-runtime/pkg/client/interceptor"
+	"sigs.k8s.io/controller-runtime/pkg/event"
+
+	internalv1alpha1 "github.com/cozystack/cozystack/api/internalapi/v1alpha1"
+	cozyv1alpha1 "github.com/cozystack/cozystack/api/v1alpha1"
+	appsv1alpha1 "github.com/cozystack/cozystack/pkg/apis/apps/v1alpha1"
+	corev1alpha1 "github.com/cozystack/cozystack/pkg/apis/core/v1alpha1"
+)
+
+const (
+	testNamespace = "tenant-foo"
+	// testRelease is the Helm release name — the HelmRelease the cozystack API
+	// creates for application Postgres/mydb (prefix "postgres-"). The projection
+	// is named after it; Flux stamps it on the sentinel as helm.toolkit.fluxcd.io/name.
+	testRelease    = "postgres-mydb"
+	testProjection = testRelease + projectionSuffix
+	testAppKind    = "Postgres"
+	testAppName    = "mydb"
+	testHRUID      = types.UID("11111111-2222-3333-4444-555555555555")
+
+	// testSentinel is the sentinel's name, and testOperatorCA the source it
+	// declares. The chart names both "<release>-ca" — the sentinel is a
+	// TenantProjection, the source a Secret, so the shared name is not a
+	// collision. CNPG creates the source itself with the CA private key in it.
+	testSentinel    = testRelease + "-ca"
+	testOperatorCA  = testRelease + "-ca"
+	testSentinelUID = types.UID("99999999-8888-7777-6666-555555555555")
+
+	// testKey is the private-key fixture. Unlike the certificates it stays a bare
+	// header with a stub body, and deliberately so: the key guard is a match on
+	// the PEM header line and runs BEFORE any parse, so a real key would prove
+	// nothing this does not — and a test suite that mints real private keys to
+	// check that they are refused invites someone to copy the pattern somewhere
+	// it matters.
+	testKey = "-----BEGIN RSA PRIVATE KEY-----\nMIIEowIBAAKCAQEA\n-----END RSA PRIVATE KEY-----\n"
+
+	caKeyKey = "ca.key"
+)
+
+// testCA and testCARot are REAL self-signed certificates, minted once per run.
+// The write-path guard parses what it publishes (see certificateChainPEM), so a
+// fixture has to be the thing it claims to be. testCARot is a second, distinct
+// certificate: rotation and chain tests need a value that is not equal to testCA.
+var (
+	testCA    = mustCertPEM("cozystack-test-ca")
+	testCARot = mustCertPEM("cozystack-test-ca-rotated")
+)
+
+// mustCertPEM mints a self-signed CA certificate and returns it PEM-encoded. It
+// panics rather than returning an error so the fixtures can stay package vars; a
+// failure here is a broken toolchain, not a test outcome.
+func mustCertPEM(commonName string) string {
+	key, err := ecdsa.GenerateKey(elliptic.P256(), rand.Reader)
+	if err != nil {
+		panic("generate test CA key: " + err.Error())
+	}
+	tmpl := &x509.Certificate{
+		SerialNumber:          big.NewInt(1),
+		Subject:               pkix.Name{CommonName: commonName},
+		NotBefore:             time.Now().Add(-time.Hour),
+		NotAfter:              time.Now().Add(24 * time.Hour),
+		KeyUsage:              x509.KeyUsageCertSign | x509.KeyUsageDigitalSignature,
+		IsCA:                  true,
+		BasicConstraintsValid: true,
+	}
+	der, err := x509.CreateCertificate(rand.Reader, tmpl, tmpl, &key.PublicKey, key)
+	if err != nil {
+		panic("mint test CA certificate: " + err.Error())
+	}
+	return string(pem.EncodeToMemory(&pem.Block{Type: "CERTIFICATE", Bytes: der}))
+}
+
+// mustPrivateKeyDER returns a RAW DER-encoded PKCS#8 private key, with no PEM
+// armour at all. It is the fixture for the smuggling cases: key material that
+// wears no "-----BEGIN ... PRIVATE KEY-----" header slips past the header guard,
+// and pem.Decode skips it as inter-block noise, so only a projection rebuilt from
+// the parsed certificates can keep it away from the tenant.
+func mustPrivateKeyDER() []byte {
+	key, err := ecdsa.GenerateKey(elliptic.P256(), rand.Reader)
+	if err != nil {
+		panic("generate test private key: " + err.Error())
+	}
+	der, err := x509.MarshalPKCS8PrivateKey(key)
+	if err != nil {
+		panic("marshal test private key: " + err.Error())
+	}
+	return der
+}
+
+// mustPublicKeyDER returns a DER-encoded public key, for the fixture that checks
+// a well-formed PEM block of the WRONG type is still refused.
+func mustPublicKeyDER() []byte {
+	key, err := ecdsa.GenerateKey(elliptic.P256(), rand.Reader)
+	if err != nil {
+		panic("generate test key: " + err.Error())
+	}
+	der, err := x509.MarshalPKIXPublicKey(&key.PublicKey)
+	if err != nil {
+		panic("marshal test public key: " + err.Error())
+	}
+	return der
+}
+
+func newScheme(t *testing.T) *runtime.Scheme {
+	t.Helper()
+	s := runtime.NewScheme()
+	if err := clientgoscheme.AddToScheme(s); err != nil {
+		t.Fatalf("client-go scheme: %v", err)
+	}
+	if err := helmv2.AddToScheme(s); err != nil {
+		t.Fatalf("helm scheme: %v", err)
+	}
+	if err := cozyv1alpha1.AddToScheme(s); err != nil {
+		t.Fatalf("cozystack scheme: %v", err)
+	}
+	if err := internalv1alpha1.AddToScheme(s); err != nil {
+		t.Fatalf("internal scheme: %v", err)
+	}
+	return s
+}
+
+// helmRelease builds the HelmRelease backing an application instance. The
+// cozystack API stamps the three application.* labels on every HelmRelease it
+// creates; they are what makes a HelmRelease recognisable as an application
+// release, and what the selectors-digest path resolves the definition through.
+func helmRelease() *helmv2.HelmRelease {
+	return &helmv2.HelmRelease{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      testRelease,
+			Namespace: testNamespace,
+			UID:       testHRUID,
+			Labels: map[string]string{
+				appsv1alpha1.ApplicationGroupLabel: appsGroup,
+				appsv1alpha1.ApplicationKindLabel:  testAppKind,
+				appsv1alpha1.ApplicationNameLabel:  testAppName,
+			},
+		},
+	}
+}
+
+// appDef builds the ApplicationDefinition for the Postgres kind. Its spec.secrets
+// selectors are what the selectors digest is computed from.
+func appDef() *cozyv1alpha1.ApplicationDefinition {
+	return &cozyv1alpha1.ApplicationDefinition{
+		ObjectMeta: metav1.ObjectMeta{Name: "postgres"},
+		Spec: cozyv1alpha1.ApplicationDefinitionSpec{
+			Application: cozyv1alpha1.ApplicationDefinitionApplication{
+				Kind: testAppKind, Plural: "postgreses", Singular: "postgres",
+			},
+			Release: cozyv1alpha1.ApplicationDefinitionRelease{Prefix: "postgres-"},
+		},
+	}
+}
+
+// sentinel builds the TenantProjection a chart renders: named "<release>-ca",
+// carrying the helm.toolkit.fluxcd.io/name label Flux stamps and NO owner
+// reference, declaring one CACert projection of the operator's CA Secret.
+func sentinel() *internalv1alpha1.TenantProjection {
+	return sentinelWithSource(testOperatorCA, caCertKey)
+}
+
+func sentinelWithSource(sourceName, sourceKey string) *internalv1alpha1.TenantProjection {
+	return &internalv1alpha1.TenantProjection{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      testSentinel,
+			Namespace: testNamespace,
+			UID:       testSentinelUID,
+			Labels:    map[string]string{helmNameLabel: testRelease},
+		},
+		Spec: internalv1alpha1.TenantProjectionSpec{
+			Projections: []internalv1alpha1.TenantProjectionEntry{{
+				Type:             internalv1alpha1.ProjectionTypeCACert,
+				SourceSecretName: sourceName,
+				SourceKey:        sourceKey,
+			}},
+		},
+	}
+}
+
+// operatorSecret builds a Secret an operator created in the release namespace.
+func operatorSecret(name string, data map[string][]byte) *corev1.Secret {
+	return &corev1.Secret{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      name,
+			Namespace: testNamespace,
+		},
+		Type: corev1.SecretTypeOpaque,
+		Data: data,
+	}
+}
+
+func newReconciler(c client.Client, rec record.EventRecorder) *Reconciler {
+	// The fake client has no cache, so the cached Client and the uncached Reader
+	// coincide — production splits them only so the metadata-only Secret watch
+	// holds no key material.
+	return &Reconciler{Client: c, Reader: c, Recorder: rec}
+}
+
+func newClient(t *testing.T, objs ...client.Object) client.Client {
+	t.Helper()
+	return fake.NewClientBuilder().
+		WithScheme(newScheme(t)).
+		WithStatusSubresource(&internalv1alpha1.TenantProjection{}).
+		WithObjects(objs...).
+		Build()
+}
+
+// reconcileSentinel runs one reconcile of the sentinel.
+func reconcileSentinel(t *testing.T, c client.Client) (*record.FakeRecorder, ctrl.Result, error) {
+	t.Helper()
+	rec := record.NewFakeRecorder(16)
+	res, err := newReconciler(c, rec).Reconcile(context.TODO(), ctrl.Request{
+		NamespacedName: types.NamespacedName{Namespace: testNamespace, Name: testSentinel},
+	})
+	return rec, res, err
+}
+
+func mustReconcile(t *testing.T, c client.Client) *record.FakeRecorder {
+	t.Helper()
+	rec, _, err := reconcileSentinel(t, c)
+	if err != nil {
+		t.Fatalf("reconcile: %v", err)
+	}
+	return rec
+}
+
+func getSecret(t *testing.T, c client.Client, name string) (*corev1.Secret, bool) {
+	t.Helper()
+	got := &corev1.Secret{}
+	err := c.Get(context.TODO(), types.NamespacedName{Namespace: testNamespace, Name: name}, got)
+	if apierrors.IsNotFound(err) {
+		return nil, false
+	}
+	if err != nil {
+		t.Fatalf("get secret %s: %v", name, err)
+	}
+	return got, true
+}
+
+func mustProjection(t *testing.T, c client.Client) *corev1.Secret {
+	t.Helper()
+	got, ok := getSecret(t, c, testProjection)
+	if !ok {
+		t.Fatalf("expected projection %s", testProjection)
+	}
+	return got
+}
+
+// warnings drains the fake recorder and returns the Warning events it saw.
+func warnings(t *testing.T, rec *record.FakeRecorder) []string {
+	t.Helper()
+	var out []string
+	for {
+		select {
+		case e := <-rec.Events:
+			if strings.HasPrefix(e, corev1.EventTypeWarning) {
+				out = append(out, e)
+			}
+		default:
+			return out
+		}
+	}
+}
+
+func keysOf(m map[string][]byte) []string {
+	out := make([]string, 0, len(m))
+	for k := range m {
+		out = append(out, k)
+	}
+	return out
+}
+
+// assertKeyFree pins the whole point of the controller: whatever the source
+// held, the projection holds exactly one key, ca.crt, and no key material.
+func assertKeyFree(t *testing.T, got *corev1.Secret, want string) {
+	t.Helper()
+	if got.Type != corev1.SecretTypeOpaque {
+		t.Errorf("projection type = %q, want Opaque", got.Type)
+	}
+	if len(got.Data) != 1 {
+		t.Fatalf("projection must hold exactly one key, got %v", keysOf(got.Data))
+	}
+	if string(got.Data[caCertKey]) != want {
+		t.Errorf("projection ca.crt = %q, want %q", got.Data[caCertKey], want)
+	}
+	for k, v := range got.Data {
+		if containsPrivateKey(string(v)) {
+			t.Fatalf("projection leaked private key material under %q", k)
+		}
+	}
+}
+
+// assertOwnedBySentinel pins the load-bearing ownership: the projection is owned
+// by the TenantProjection sentinel alone, which is what carries the lineage walk
+// (sentinel -> helm label -> HelmRelease -> app) and the owner-reference GC.
+func assertOwnedBySentinel(t *testing.T, proj *corev1.Secret) {
+	t.Helper()
+	if len(proj.OwnerReferences) != 1 {
+		t.Fatalf("projection must be owned by the sentinel alone, got %+v", proj.OwnerReferences)
+	}
+	o := proj.OwnerReferences[0]
+	if o.UID != testSentinelUID || o.Kind != "TenantProjection" || o.Name != testSentinel {
+		t.Errorf("projection owner = %+v, want the sentinel %s/%s", o, testSentinel, testSentinelUID)
+	}
+	if !ptr.Deref(o.Controller, false) {
+		t.Errorf("the sentinel must be the controlling owner, got %+v", o)
+	}
+}
+
+func readyCond(t *testing.T, c client.Client) metav1.Condition {
+	t.Helper()
+	tp := &internalv1alpha1.TenantProjection{}
+	if err := c.Get(context.TODO(), types.NamespacedName{Namespace: testNamespace, Name: testSentinel}, tp); err != nil {
+		t.Fatalf("get sentinel: %v", err)
+	}
+	cond := meta.FindStatusCondition(tp.Status.Conditions, conditionReady)
+	if cond == nil {
+		t.Fatalf("sentinel carries no Ready condition; status = %+v", tp.Status)
+	}
+	return *cond
+}
+
+func assertReady(t *testing.T, c client.Client, status metav1.ConditionStatus, reason string) {
+	t.Helper()
+	cond := readyCond(t, c)
+	if cond.Status != status || cond.Reason != reason {
+		t.Errorf("Ready = {status:%s reason:%s}, want {status:%s reason:%s}",
+			cond.Status, cond.Reason, status, reason)
+	}
+}
+
+// --- Reconcile: the sentinel-driven happy path and its status ---
+
+// TestReconcile_ProjectsKeyFreeCA is the core case: CNPG creates <release>-ca
+// with the CA private key in it, the sentinel declares it, and the projection
+// must lift ca.crt and nothing else, owned by the sentinel.
+func TestReconcile_ProjectsKeyFreeCA(t *testing.T) {
+	c := newClient(t, helmRelease(), appDef(), sentinel(),
+		operatorSecret(testOperatorCA, map[string][]byte{caCertKey: []byte(testCA), caKeyKey: []byte(testKey)}),
+	)
+	mustReconcile(t, c)
+
+	got := mustProjection(t, c)
+	assertKeyFree(t, got, testCA)
+	assertOwnedBySentinel(t, got)
+	if got.Labels[TenantCALabel] != trueValue {
+		t.Errorf("projection must carry the tenant-ca visibility label, got %v", got.Labels)
+	}
+	assertReady(t, c, metav1.ConditionTrue, reasonProjected)
+}
+
+// TestReconcile_SourceNotFound_StatusIsReadable is the whole point of the
+// sentinel model: a source the operator has not minted yet is a visible
+// Ready=False/SourceNotFound, not a silent requeue.
+func TestReconcile_SourceNotFound_StatusIsReadable(t *testing.T) {
+	c := newClient(t, helmRelease(), appDef(), sentinel())
+	mustReconcile(t, c)
+
+	if _, ok := getSecret(t, c, testProjection); ok {
+		t.Errorf("no projection may be published while the source is absent")
+	}
+	assertReady(t, c, metav1.ConditionFalse, reasonSourceNotFound)
+}
+
+// TestReconcile_SourceNotReady_EmptyValue pins the state between an operator
+// creating its CA Secret and populating it: the source exists but carries no
+// certificate yet.
+func TestReconcile_SourceNotReady_EmptyValue(t *testing.T) {
+	c := newClient(t, helmRelease(), appDef(), sentinel(),
+		operatorSecret(testOperatorCA, map[string][]byte{caCertKey: []byte("")}),
+	)
+	mustReconcile(t, c)
+
+	if _, ok := getSecret(t, c, testProjection); ok {
+		t.Errorf("no projection may be published before the source carries its certificate")
+	}
+	assertReady(t, c, metav1.ConditionFalse, reasonSourceNotReady)
+}
+
+// TestReconcile_EmptySourceSecretName_ReportsCondition pins that an entry with an
+// empty sourceSecretName resolves to a Ready=False condition, not a returned error.
+// The CRD now forbids the empty string (MinLength=1), but an object admitted by an
+// older CRD can still carry one.
+//
+// The threat is what the apiserver does with a Get for an empty name: it returns
+// "resource name may not be empty", which is NOT NotFound, so without a guard it
+// escapes the not-found branch and is returned from Reconcile — exponential backoff
+// forever, and because the error path returns before any status write, no Ready
+// condition is ever recorded. That is the silent retry the sentinel exists to
+// eliminate. The bare fake client masks it (an empty-name Get returns NotFound), so
+// the test installs a Get interceptor that reproduces the apiserver's BadRequest,
+// making the pre-guard reconcile wedge exactly as production would.
+func TestReconcile_EmptySourceSecretName_ReportsCondition(t *testing.T) {
+	c := fake.NewClientBuilder().
+		WithScheme(newScheme(t)).
+		WithStatusSubresource(&internalv1alpha1.TenantProjection{}).
+		WithObjects(helmRelease(), appDef(), sentinelWithSource("", caCertKey)).
+		WithInterceptorFuncs(interceptor.Funcs{
+			Get: func(ctx context.Context, c client.WithWatch, key client.ObjectKey, obj client.Object, opts ...client.GetOption) error {
+				if key.Name == "" {
+					// What the real apiserver returns, and what makes the bug bite:
+					// not NotFound, so the not-found branch does not catch it.
+					return apierrors.NewBadRequest("resource name may not be empty")
+				}
+				return c.Get(ctx, key, obj, opts...)
+			},
+		}).
+		Build()
+
+	rec := record.NewFakeRecorder(16)
+	_, err := newReconciler(c, rec).Reconcile(context.TODO(), ctrl.Request{
+		NamespacedName: types.NamespacedName{Namespace: testNamespace, Name: testSentinel},
+	})
+	if err != nil {
+		t.Fatalf("an empty sourceSecretName must resolve to a condition, not an error: %v", err)
+	}
+	if _, ok := getSecret(t, c, testProjection); ok {
+		t.Errorf("no projection may be published for an empty sourceSecretName")
+	}
+	assertReady(t, c, metav1.ConditionFalse, reasonSourceInvalid)
+}
+
+// TestReconcile_NoReleaseLabel pins that a sentinel Flux did not render — one
+// carrying no helm.toolkit.fluxcd.io/name — cannot derive a canonical name and
+// reports it rather than guessing.
+func TestReconcile_NoReleaseLabel(t *testing.T) {
+	s := sentinel()
+	delete(s.Labels, helmNameLabel)
+	c := newClient(t, s,
+		operatorSecret(testOperatorCA, map[string][]byte{caCertKey: []byte(testCA)}),
+	)
+	mustReconcile(t, c)
+
+	if _, ok := getSecret(t, c, testProjection); ok {
+		t.Errorf("a sentinel with no release label must not project anything")
+	}
+	assertReady(t, c, metav1.ConditionFalse, reasonNoRelease)
+}
+
+func TestReconcile_MissingSentinelIsNoOp(t *testing.T) {
+	c := newClient(t) // no sentinel at all
+	if _, _, err := reconcileSentinel(t, c); err != nil {
+		t.Fatalf("a missing sentinel must be a no-op, got %v", err)
+	}
+	if _, ok := getSecret(t, c, testProjection); ok {
+		t.Errorf("nothing may be created for a sentinel that does not exist")
+	}
+}
+
+func TestReconcile_DeletingSentinelIsNoOp(t *testing.T) {
+	s := sentinel()
+	s.Finalizers = []string{"cozystack.io/test-hold"} // lets the fake client retain a deleting object
+	c := newClient(t, helmRelease(), appDef(), s,
+		operatorSecret(testOperatorCA, map[string][]byte{caCertKey: []byte(testCA)}),
+	)
+	if err := c.Delete(context.TODO(), s); err != nil {
+		t.Fatalf("begin deletion: %v", err)
+	}
+	mustReconcile(t, c)
+
+	if _, ok := getSecret(t, c, testProjection); ok {
+		t.Errorf("a sentinel under deletion must not project — the GC is collecting it")
+	}
+}
+
+func TestReconcile_IsIdempotent(t *testing.T) {
+	c := newClient(t, helmRelease(), appDef(), sentinel(),
+		operatorSecret(testOperatorCA, map[string][]byte{caCertKey: []byte(testCA), caKeyKey: []byte(testKey)}),
+	)
+	mustReconcile(t, c)
+	before := mustProjection(t, c)
+
+	mustReconcile(t, c)
+	after := mustProjection(t, c)
+	if after.ResourceVersion != before.ResourceVersion {
+		t.Errorf("an unchanged reconcile must not rewrite the projection (%s -> %s)",
+			before.ResourceVersion, after.ResourceVersion)
+	}
+}
+
+// TestReconcile_MultipleCACertEntries_Rejected exercises the threat directly:
+// two CACert entries both resolve to the single canonical name. Without the
+// guard, entry 0 projects its CA and entry 1 overwrites it — a projection is
+// published (the last entry's CA) with Ready=True, and every reconcile churns
+// the write. The sentinel must publish nothing and say why instead.
+func TestReconcile_MultipleCACertEntries_Rejected(t *testing.T) {
+	s := sentinel()
+	s.Spec.Projections = append(s.Spec.Projections, internalv1alpha1.TenantProjectionEntry{
+		Type:             internalv1alpha1.ProjectionTypeCACert,
+		SourceSecretName: "second-src",
+		SourceKey:        caCertKey,
+	})
+	c := newClient(t, helmRelease(), appDef(), s,
+		operatorSecret(testOperatorCA, map[string][]byte{caCertKey: []byte(testCA)}),
+		operatorSecret("second-src", map[string][]byte{caCertKey: []byte(testCARot)}),
+	)
+	mustReconcile(t, c)
+
+	if _, ok := getSecret(t, c, testProjection); ok {
+		t.Errorf("a sentinel declaring more than one CACert projection must publish nothing")
+	}
+	assertReady(t, c, metav1.ConditionFalse, reasonMultipleCACert)
+}
+
+// TestReconcile_EntryRemoved_WithdrawsProjection exercises the withdrawal path: a
+// sentinel that stops declaring a CACert projection must have the anchor it
+// published removed. Garbage collection only fires when the whole sentinel is
+// pruned, so without an explicit delete a sentinel that keeps existing with its
+// CACert entry gated off (e.g. on tls.enabled) would serve a stale trust anchor
+// forever.
+func TestReconcile_EntryRemoved_WithdrawsProjection(t *testing.T) {
+	c := newClient(t, helmRelease(), appDef(), sentinel(),
+		operatorSecret(testOperatorCA, map[string][]byte{caCertKey: []byte(testCA), caKeyKey: []byte(testKey)}),
+	)
+	mustReconcile(t, c)
+	if _, ok := getSecret(t, c, testProjection); !ok {
+		t.Fatalf("the projection must exist while the CACert entry is declared")
+	}
+
+	// Drop the CACert entry through the internal type. The CRD's MinItems=1 forbids
+	// an empty projections list at the API server, but a chart that gates the entry
+	// — or a future non-CACert entry replacing it — leaves the sentinel with zero
+	// CACert projections while the old anchor still stands.
+	tp := &internalv1alpha1.TenantProjection{}
+	if err := c.Get(context.TODO(), types.NamespacedName{Namespace: testNamespace, Name: testSentinel}, tp); err != nil {
+		t.Fatalf("get sentinel: %v", err)
+	}
+	tp.Spec.Projections = nil
+	if err := c.Update(context.TODO(), tp); err != nil {
+		t.Fatalf("drop the CACert entry: %v", err)
+	}
+	mustReconcile(t, c)
+
+	if _, ok := getSecret(t, c, testProjection); ok {
+		t.Errorf("withdrawing the last CACert entry must delete the projection it published")
+	}
+}
+
+// TestReconcile_EntryRemoved_WithdrawsStaleUIDProjection pins that withdrawal
+// recognises a projection this sentinel owns by NAME, not by an exact owner-
+// reference match. Delete-and-recreate an application under the same name leaves a
+// projection carrying this sentinel's name in its owner reference but the PREVIOUS
+// incarnation's UID; if the live sentinel then stops declaring the anchor, an exact
+// UID match would read the retired projection as "not ours" and walk away, leaving
+// it tenant-readable forever — owner-reference GC only fires when the sentinel
+// itself is pruned. Adoption already re-homes such a stale-UID projection, so
+// withdrawal must recognise the same object.
+func TestReconcile_EntryRemoved_WithdrawsStaleUIDProjection(t *testing.T) {
+	stale := &corev1.Secret{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      testProjection,
+			Namespace: testNamespace,
+			Labels:    map[string]string{TenantCALabel: trueValue, ManagedLabel: trueValue},
+			OwnerReferences: []metav1.OwnerReference{{
+				APIVersion: internalv1alpha1.GroupVersion.String(),
+				Kind:       "TenantProjection",
+				Name:       testSentinel,
+				UID:        types.UID("dead0000-0000-0000-0000-000000000000"), // previous incarnation
+				Controller: new(true),
+			}},
+		},
+		Type: corev1.SecretTypeOpaque,
+		Data: map[string][]byte{caCertKey: []byte("STALE")},
+	}
+	// The live sentinel no longer declares a CACert projection (a future non-CACert
+	// entry replaced it), so the reconcile takes the withdrawal path.
+	s := sentinel()
+	s.Spec.Projections = nil
+	c := newClient(t, helmRelease(), appDef(), s, stale)
+	mustReconcile(t, c)
+
+	if _, ok := getSecret(t, c, testProjection); ok {
+		t.Errorf("a retired anchor owned by a stale sentinel UID must be withdrawn, not left tenant-readable forever")
+	}
+}
+
+// TestReconcile_EntryRemoved_WithdrawsDespiteBlockOwnerDeletionDrift pins that a
+// drift of the owner reference's BlockOwnerDeletion flag — the exact drift the
+// adoption path normalizes — does not defeat withdrawal. An exact owner-reference
+// match reads the drifted projection as "not ours" and no-ops; matching by name
+// withdraws it.
+func TestReconcile_EntryRemoved_WithdrawsDespiteBlockOwnerDeletionDrift(t *testing.T) {
+	c := newClient(t, helmRelease(), appDef(), sentinel(),
+		operatorSecret(testOperatorCA, map[string][]byte{caCertKey: []byte(testCA), caKeyKey: []byte(testKey)}),
+	)
+	mustReconcile(t, c)
+
+	proj := mustProjection(t, c)
+	proj.OwnerReferences[0].BlockOwnerDeletion = new(true)
+	if err := c.Update(context.TODO(), proj); err != nil {
+		t.Fatalf("set BlockOwnerDeletion drift: %v", err)
+	}
+
+	tp := &internalv1alpha1.TenantProjection{}
+	if err := c.Get(context.TODO(), types.NamespacedName{Namespace: testNamespace, Name: testSentinel}, tp); err != nil {
+		t.Fatalf("get sentinel: %v", err)
+	}
+	tp.Spec.Projections = nil
+	if err := c.Update(context.TODO(), tp); err != nil {
+		t.Fatalf("drop the CACert entry: %v", err)
+	}
+	mustReconcile(t, c)
+
+	if _, ok := getSecret(t, c, testProjection); ok {
+		t.Errorf("withdrawal must not be blocked by a BlockOwnerDeletion flag drift on the owner reference")
+	}
+}
+
+// TestReconcile_TwoSentinelsForOneRelease_Refused pins the two-sentinel guard: two
+// sentinels in one namespace carrying the same release label both resolve to the
+// single canonical name. Without the guard, whichever reconciles first publishes an
+// arbitrary CA (a silent winner) and the two flap ownership of one projection. Both
+// must refuse instead, so nothing is published until the declaration lives on
+// exactly one sentinel.
+func TestReconcile_TwoSentinelsForOneRelease_Refused(t *testing.T) {
+	second := &internalv1alpha1.TenantProjection{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      testSentinel + "-dup",
+			Namespace: testNamespace,
+			UID:       types.UID("77777777-8888-9999-aaaa-bbbbbbbbbbbb"),
+			Labels:    map[string]string{helmNameLabel: testRelease},
+		},
+		Spec: internalv1alpha1.TenantProjectionSpec{
+			Projections: []internalv1alpha1.TenantProjectionEntry{{
+				Type:             internalv1alpha1.ProjectionTypeCACert,
+				SourceSecretName: testOperatorCA,
+				SourceKey:        caCertKey,
+			}},
+		},
+	}
+	c := newClient(t, helmRelease(), appDef(), sentinel(), second,
+		operatorSecret(testOperatorCA, map[string][]byte{caCertKey: []byte(testCA), caKeyKey: []byte(testKey)}),
+	)
+	_, res, err := reconcileSentinel(t, c)
+	if err != nil {
+		t.Fatalf("reconcile: %v", err)
+	}
+
+	if _, ok := getSecret(t, c, testProjection); ok {
+		t.Errorf("two sentinels contesting one release must publish nothing, not an arbitrary winner")
+	}
+	assertReady(t, c, metav1.ConditionFalse, reasonReleaseContested)
+	// The contest is cleared by deleting the sibling, which nothing else enqueues
+	// this sentinel for, so it must requeue itself or the anchor stays withheld
+	// until the far-off global resync.
+	if res.RequeueAfter == 0 {
+		t.Errorf("a contested sentinel must requeue itself; nothing else wakes it when the sibling is removed")
+	}
+}
+
+// TestReconcile_ContestResolved_Republishes pins the recovery half of the
+// two-sentinel guard: once the operator removes the duplicate, the surviving
+// sentinel must publish its anchor. Nothing enqueues this sentinel when a sibling
+// is deleted, so the recovery rides the RequeueAfter the contested reconcile
+// returns — without it the anchor stays withheld until the global resync.
+func TestReconcile_ContestResolved_Republishes(t *testing.T) {
+	second := &internalv1alpha1.TenantProjection{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      testSentinel + "-dup",
+			Namespace: testNamespace,
+			UID:       types.UID("77777777-8888-9999-aaaa-bbbbbbbbbbbb"),
+			Labels:    map[string]string{helmNameLabel: testRelease},
+		},
+		Spec: internalv1alpha1.TenantProjectionSpec{
+			Projections: []internalv1alpha1.TenantProjectionEntry{{
+				Type:             internalv1alpha1.ProjectionTypeCACert,
+				SourceSecretName: testOperatorCA,
+				SourceKey:        caCertKey,
+			}},
+		},
+	}
+	c := newClient(t, helmRelease(), appDef(), sentinel(), second,
+		operatorSecret(testOperatorCA, map[string][]byte{caCertKey: []byte(testCA), caKeyKey: []byte(testKey)}),
+	)
+	_, res, err := reconcileSentinel(t, c)
+	if err != nil {
+		t.Fatalf("reconcile while contested: %v", err)
+	}
+	assertReady(t, c, metav1.ConditionFalse, reasonReleaseContested)
+	if res.RequeueAfter == 0 {
+		t.Fatalf("the contested reconcile must schedule its own recovery requeue")
+	}
+
+	// The operator removes the duplicate. The scheduled requeue is the only thing
+	// that brings this sentinel back — no sibling-delete watch exists.
+	if err := c.Delete(context.TODO(), second); err != nil {
+		t.Fatalf("remove the duplicate sentinel: %v", err)
+	}
+	mustReconcile(t, c)
+
+	assertKeyFree(t, mustProjection(t, c), testCA)
+	assertReady(t, c, metav1.ConditionTrue, reasonProjected)
+}
+
+// --- Reconcile: the write-path guards, exercised through a real source ---
+
+// TestReconcile_RefusesPrivateKeyUnderLiftedKey pins the reason the controller
+// exists: a source value that carries key material is refused, with an event and
+// a Ready=False status, never published.
+func TestReconcile_RefusesPrivateKeyUnderLiftedKey(t *testing.T) {
+	c := newClient(t, helmRelease(), appDef(), sentinel(),
+		operatorSecret(testOperatorCA, map[string][]byte{caCertKey: []byte(testCA + testKey)}),
+	)
+	rec := mustReconcile(t, c)
+
+	if _, ok := getSecret(t, c, testProjection); ok {
+		t.Errorf("a source carrying private key material must never be published")
+	}
+	assertReady(t, c, metav1.ConditionFalse, reasonSourceRejected)
+	if w := warnings(t, rec); len(w) == 0 || !strings.Contains(strings.Join(w, "\n"), reasonPrivateKeyRefused) {
+		t.Errorf("a private-key refusal must surface a %s Warning event, got %v", reasonPrivateKeyRefused, w)
+	}
+}
+
+func TestReconcile_RefusesNonCertificate(t *testing.T) {
+	c := newClient(t, helmRelease(), appDef(), sentinel(),
+		operatorSecret(testOperatorCA, map[string][]byte{caCertKey: []byte("not a certificate")}),
+	)
+	rec := mustReconcile(t, c)
+
+	if _, ok := getSecret(t, c, testProjection); ok {
+		t.Errorf("a source that is not a certificate must never be published")
+	}
+	assertReady(t, c, metav1.ConditionFalse, reasonSourceRejected)
+	if w := warnings(t, rec); len(w) == 0 || !strings.Contains(strings.Join(w, "\n"), reasonInvalidCACert) {
+		t.Errorf("a non-certificate refusal must surface a %s Warning event, got %v", reasonInvalidCACert, w)
+	}
+}
+
+// TestReconcile_HonoursSourceKey pins that a sentinel naming a non-default key
+// lifts from that key and still republishes under the canonical ca.crt.
+func TestReconcile_HonoursSourceKey(t *testing.T) {
+	c := newClient(t, helmRelease(), appDef(),
+		sentinelWithSource(testOperatorCA, "tls.crt"),
+		operatorSecret(testOperatorCA, map[string][]byte{"tls.crt": []byte(testCA), "tls.key": []byte(testKey)}),
+	)
+	mustReconcile(t, c)
+	assertKeyFree(t, mustProjection(t, c), testCA)
+}
+
+// --- Reconcile: ownership and collisions ---
+
+// TestReconcile_ExtraOwnerReferenceIsStripped pins that a projection is owned by
+// the sentinel ALONE — an extra owner appended by a namespace actor would keep
+// the trust anchor alive past the sentinel's deletion, so it is normalized away.
+func TestReconcile_ExtraOwnerReferenceIsStripped(t *testing.T) {
+	c := newClient(t, helmRelease(), appDef(), sentinel(),
+		operatorSecret(testOperatorCA, map[string][]byte{caCertKey: []byte(testCA), caKeyKey: []byte(testKey)}),
+	)
+	mustReconcile(t, c)
+
+	proj := mustProjection(t, c)
+	proj.OwnerReferences = append(proj.OwnerReferences, metav1.OwnerReference{
+		APIVersion: "v1", Kind: "ConfigMap", Name: "squatter",
+		UID: types.UID("aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee"),
+	})
+	if err := c.Update(context.TODO(), proj); err != nil {
+		t.Fatalf("append a second owner: %v", err)
+	}
+
+	mustReconcile(t, c)
+	assertOwnedBySentinel(t, mustProjection(t, c))
+}
+
+// TestReconcile_BlockOwnerDeletionDriftIsNormalized pins that a drift of the sole
+// owner reference's BlockOwnerDeletion flag to true is re-homed to false — the
+// trust anchor must never hold up teardown of the application it belongs to.
+func TestReconcile_BlockOwnerDeletionDriftIsNormalized(t *testing.T) {
+	c := newClient(t, helmRelease(), appDef(), sentinel(),
+		operatorSecret(testOperatorCA, map[string][]byte{caCertKey: []byte(testCA), caKeyKey: []byte(testKey)}),
+	)
+	mustReconcile(t, c)
+
+	proj := mustProjection(t, c)
+	proj.OwnerReferences[0].BlockOwnerDeletion = new(true)
+	if err := c.Update(context.TODO(), proj); err != nil {
+		t.Fatalf("set BlockOwnerDeletion drift: %v", err)
+	}
+
+	mustReconcile(t, c)
+	got := mustProjection(t, c)
+	if ptr.Deref(got.OwnerReferences[0].BlockOwnerDeletion, false) {
+		t.Errorf("BlockOwnerDeletion drift must be normalized back to false, got %+v", got.OwnerReferences[0])
+	}
+}
+
+// TestReconcile_RecreatedRelease_RehomesProjection pins that a projection left
+// owned by a stale sentinel UID — what delete-and-recreate under the same name
+// leaves behind — is re-homed onto the live sentinel.
+func TestReconcile_RecreatedRelease_RehomesProjection(t *testing.T) {
+	stale := &corev1.Secret{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      testProjection,
+			Namespace: testNamespace,
+			Labels:    map[string]string{TenantCALabel: trueValue, ManagedLabel: trueValue},
+			OwnerReferences: []metav1.OwnerReference{{
+				APIVersion: internalv1alpha1.GroupVersion.String(),
+				Kind:       "TenantProjection",
+				Name:       testSentinel,
+				UID:        types.UID("dead0000-0000-0000-0000-000000000000"), // previous incarnation
+				Controller: new(true),
+			}},
+		},
+		Type: corev1.SecretTypeOpaque,
+		Data: map[string][]byte{caCertKey: []byte("STALE")},
+	}
+	c := newClient(t, helmRelease(), appDef(), sentinel(),
+		operatorSecret(testOperatorCA, map[string][]byte{caCertKey: []byte(testCA), caKeyKey: []byte(testKey)}),
+		stale,
+	)
+	mustReconcile(t, c)
+
+	got := mustProjection(t, c)
+	assertOwnedBySentinel(t, got)
+	assertKeyFree(t, got, testCA)
+}
+
+// TestReconcile_ForeignSecretIsNeverOverwritten pins that a Secret at the
+// canonical name the controller did NOT create — which may hold live key
+// material — is left untouched, surfaced as a collision.
+func TestReconcile_ForeignSecretIsNeverOverwritten(t *testing.T) {
+	foreign := &corev1.Secret{
+		ObjectMeta: metav1.ObjectMeta{Name: testProjection, Namespace: testNamespace},
+		Type:       corev1.SecretTypeOpaque,
+		Data:       map[string][]byte{caCertKey: []byte(testCARot), caKeyKey: []byte(testKey)},
+	}
+	c := newClient(t, helmRelease(), appDef(), sentinel(),
+		operatorSecret(testOperatorCA, map[string][]byte{caCertKey: []byte(testCA), caKeyKey: []byte(testKey)}),
+		foreign,
+	)
+	rec := mustReconcile(t, c)
+
+	got := mustProjection(t, c)
+	if string(got.Data[caCertKey]) != testCARot || string(got.Data[caKeyKey]) != testKey {
+		t.Errorf("a foreign Secret must be left exactly as it was, got %v", keysOf(got.Data))
+	}
+	assertReady(t, c, metav1.ConditionFalse, reasonProjectionCollision)
+	if w := warnings(t, rec); len(w) == 0 || !strings.Contains(strings.Join(w, "\n"), reasonCollision) {
+		t.Errorf("a collision must surface a %s Warning event, got %v", reasonCollision, w)
+	}
+}
+
+// TestReconcile_NonOpaqueAtCanonicalNameIsCollision pins the adoption gate
+// against a tenant-forgeable label: a non-Opaque Secret carrying a forged marker
+// is a collision, not adopted — adopting it would make every Update fail Invalid
+// (Secret.type is immutable), letting a tenant permanently deny their own anchor.
+func TestReconcile_NonOpaqueAtCanonicalNameIsCollision(t *testing.T) {
+	forged := &corev1.Secret{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      testProjection,
+			Namespace: testNamespace,
+			Labels:    map[string]string{ManagedLabel: trueValue, TenantCALabel: trueValue},
+		},
+		Type: corev1.SecretTypeTLS,
+		Data: map[string][]byte{"tls.crt": []byte(testCARot), "tls.key": []byte(testKey)},
+	}
+	c := newClient(t, helmRelease(), appDef(), sentinel(),
+		operatorSecret(testOperatorCA, map[string][]byte{caCertKey: []byte(testCA), caKeyKey: []byte(testKey)}),
+		forged,
+	)
+	mustReconcile(t, c)
+
+	got := mustProjection(t, c)
+	if got.Type != corev1.SecretTypeTLS {
+		t.Errorf("a non-Opaque Secret must be treated as a collision and left untouched, got type %q", got.Type)
+	}
+	assertReady(t, c, metav1.ConditionFalse, reasonProjectionCollision)
+}
+
+// TestReconcile_MarkerStrippedFromOwnedProjectionIsHealed exercises the finding
+// the owner-reference adoption gate exists to close. An actor with Secret write in
+// the namespace STRIPS the controller's marker off the GENUINE projection — owner
+// reference and tenantresource verdict intact — and writes their own bytes under
+// ca.crt. Keying adoption on the strippable marker would make the controller
+// disown its own object, refuse it as a collision, and serve the forged anchor
+// forever. Keying on the owner reference heals it: the genuine CA is restored, the
+// marker is put back, and the sentinel is Ready.
+func TestReconcile_MarkerStrippedFromOwnedProjectionIsHealed(t *testing.T) {
+	const attackerCA = "-----BEGIN CERTIFICATE-----\nATTACKERATTACKERATTACKER\n-----END CERTIFICATE-----\n"
+	tampered := &corev1.Secret{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      testProjection,
+			Namespace: testNamespace,
+			// The marker is STRIPPED; the owner reference and the webhook's
+			// tenantresource verdict are left exactly as the genuine projection
+			// carried them.
+			Labels: map[string]string{
+				TenantCALabel:                       trueValue,
+				corev1alpha1.TenantResourceLabelKey: trueValue,
+			},
+			OwnerReferences: []metav1.OwnerReference{sentinelOwnerRef(sentinel())},
+		},
+		Type: corev1.SecretTypeOpaque,
+		Data: map[string][]byte{caCertKey: []byte(attackerCA)},
+	}
+	c := newClient(t, helmRelease(), appDef(), sentinel(),
+		operatorSecret(testOperatorCA, map[string][]byte{caCertKey: []byte(testCA), caKeyKey: []byte(testKey)}),
+		tampered,
+	)
+	mustReconcile(t, c)
+
+	got := mustProjection(t, c)
+	assertKeyFree(t, got, testCA) // healed to the genuine CA, not the attacker's
+	assertOwnedBySentinel(t, got)
+	if got.Labels[ManagedLabel] != trueValue {
+		t.Errorf("healing must restore the %q marker, labels=%v", ManagedLabel, got.Labels)
+	}
+	assertReady(t, c, metav1.ConditionTrue, reasonProjected)
+}
+
+// TestReconcile_ForgedMarkerWithoutOwnerRefIsCollision pins the other side of the
+// owner-reference gate: a Secret at the canonical name that carries the marker and
+// the tenant-ca label but NO owner reference back to this sentinel is a stranger,
+// not one of ours. It is refused as a collision and left untouched — never
+// overwritten, because it may hold data this controller does not own, and it
+// carries no owner chain to an application so no tenant can read it anyway.
+func TestReconcile_ForgedMarkerWithoutOwnerRefIsCollision(t *testing.T) {
+	const attackerCA = "-----BEGIN CERTIFICATE-----\nATTACKERATTACKERATTACKER\n-----END CERTIFICATE-----\n"
+	forged := &corev1.Secret{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      testProjection,
+			Namespace: testNamespace,
+			Labels:    map[string]string{ManagedLabel: trueValue, TenantCALabel: trueValue},
+		},
+		Type: corev1.SecretTypeOpaque,
+		Data: map[string][]byte{caCertKey: []byte(attackerCA)},
+	}
+	c := newClient(t, helmRelease(), appDef(), sentinel(),
+		operatorSecret(testOperatorCA, map[string][]byte{caCertKey: []byte(testCA), caKeyKey: []byte(testKey)}),
+		forged,
+	)
+	mustReconcile(t, c)
+
+	got := mustProjection(t, c)
+	if string(got.Data[caCertKey]) != attackerCA {
+		t.Errorf("a Secret with no owner reference to the sentinel must be left untouched, got %q", got.Data[caCertKey])
+	}
+	assertReady(t, c, metav1.ConditionFalse, reasonProjectionCollision)
+}
+
+// TestReconcile_SourceAtCanonicalName_KeyBearing pins the degenerate case where
+// the declared source sits at the canonical name and carries key material: no
+// projection is written over live key material, and it is surfaced loudly.
+func TestReconcile_SourceAtCanonicalName_KeyBearing(t *testing.T) {
+	src := &corev1.Secret{
+		ObjectMeta: metav1.ObjectMeta{Name: testProjection, Namespace: testNamespace},
+		Type:       corev1.SecretTypeOpaque,
+		Data:       map[string][]byte{caCertKey: []byte(testCA), caKeyKey: []byte(testKey)},
+	}
+	c := newClient(t, helmRelease(), appDef(),
+		sentinelWithSource(testProjection, caCertKey), src,
+	)
+	rec := mustReconcile(t, c)
+
+	assertReady(t, c, metav1.ConditionFalse, reasonCanonicalOccupied)
+	if w := warnings(t, rec); len(w) == 0 || !strings.Contains(strings.Join(w, "\n"), reasonCanonicalNameOccupied) {
+		t.Errorf("a key-bearing Secret at the canonical name must warn %s, got %v", reasonCanonicalNameOccupied, w)
+	}
+}
+
+// TestReconcile_SourceAtCanonicalName_KeyFree pins the benign case: a key-free
+// Secret already at the canonical name IS the tenant's trust anchor, so the
+// controller leaves it and reports Ready. Reporting Ready is not the same as the
+// tenant being able to read it: an engine-owned Secret at that name carries no
+// internal.cozystack.io/tenant-ca label, so the lineage webhook marks it
+// tenantresource=false and the tenant is locked out while the controller says
+// "published". The contract check must name that gap, and must stay silent once
+// the label is present.
+func TestReconcile_SourceAtCanonicalName_KeyFree(t *testing.T) {
+	t.Run("missing tenant-ca label warns and names it", func(t *testing.T) {
+		src := &corev1.Secret{
+			ObjectMeta: metav1.ObjectMeta{Name: testProjection, Namespace: testNamespace},
+			Type:       corev1.SecretTypeOpaque,
+			Data:       map[string][]byte{caCertKey: []byte(testCA)},
+		}
+		c := newClient(t, helmRelease(), appDef(),
+			sentinelWithSource(testProjection, caCertKey), src,
+		)
+		rec := mustReconcile(t, c)
+
+		assertReady(t, c, metav1.ConditionTrue, reasonProjected)
+		joined := strings.Join(warnings(t, rec), "\n")
+		if !strings.Contains(joined, reasonCanonicalNameContract) {
+			t.Errorf("a key-free anchor missing the tenant-ca label must warn %s, got %q", reasonCanonicalNameContract, joined)
+		}
+		if !strings.Contains(joined, TenantCALabel) {
+			t.Errorf("the contract warning must name the missing %q label the tenant is locked out by, got %q", TenantCALabel, joined)
+		}
+	})
+
+	t.Run("with the tenant-ca label the contract is met and nothing warns", func(t *testing.T) {
+		src := &corev1.Secret{
+			ObjectMeta: metav1.ObjectMeta{
+				Name:      testProjection,
+				Namespace: testNamespace,
+				Labels:    map[string]string{TenantCALabel: trueValue},
+			},
+			Type: corev1.SecretTypeOpaque,
+			Data: map[string][]byte{caCertKey: []byte(testCA)},
+		}
+		c := newClient(t, helmRelease(), appDef(),
+			sentinelWithSource(testProjection, caCertKey), src,
+		)
+		rec := mustReconcile(t, c)
+
+		assertReady(t, c, metav1.ConditionTrue, reasonProjected)
+		if w := warnings(t, rec); len(w) != 0 {
+			t.Errorf("a key-free anchor carrying the tenant-ca label meets the contract, so nothing may warn, got %v", w)
+		}
+	})
+}
+
+// TestReconcile_TerminatingProjection_WaitsForCollection pins that the reconciler
+// does not write to a projection the garbage collector is already removing.
+func TestReconcile_TerminatingProjection_WaitsForCollection(t *testing.T) {
+	terminating := &corev1.Secret{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:            testProjection,
+			Namespace:       testNamespace,
+			Labels:          map[string]string{TenantCALabel: trueValue, ManagedLabel: trueValue},
+			OwnerReferences: []metav1.OwnerReference{sentinelOwnerRef(sentinel())},
+			Finalizers:      []string{"cozystack.io/test-hold"},
+		},
+		Type: corev1.SecretTypeOpaque,
+		Data: map[string][]byte{caCertKey: []byte("STALE")},
+	}
+	c := newClient(t, helmRelease(), appDef(), sentinel(),
+		operatorSecret(testOperatorCA, map[string][]byte{caCertKey: []byte(testCA), caKeyKey: []byte(testKey)}),
+		terminating,
+	)
+	if err := c.Delete(context.TODO(), terminating); err != nil {
+		t.Fatalf("begin deletion: %v", err)
+	}
+
+	_, res, err := reconcileSentinel(t, c)
+	if err != nil {
+		t.Fatalf("a terminating projection must not error: %v", err)
+	}
+	if res.RequeueAfter == 0 {
+		t.Errorf("a terminating projection must be retried once collected, got %+v", res)
+	}
+	got := mustProjection(t, c)
+	if string(got.Data[caCertKey]) != "STALE" {
+		t.Errorf("nothing may be written to a terminating projection, got %q", got.Data[caCertKey])
+	}
+	assertReady(t, c, metav1.ConditionFalse, reasonProjectionTerminating)
+}
+
+// --- Reconcile: the selectors-digest re-admission ---
+
+// TestReconcile_SelectorChange_ReleasesTheProjectionToTheWebhook pins that a
+// change to spec.secrets hands the projection back to the lineage webhook by
+// dropping the managed-by marker, so the tenantresource verdict is recomputed.
+func TestReconcile_SelectorChange_ReleasesTheProjectionToTheWebhook(t *testing.T) {
+	c := newClient(t, helmRelease(), appDef(), sentinel(),
+		operatorSecret(testOperatorCA, map[string][]byte{caCertKey: []byte(testCA), caKeyKey: []byte(testKey)}),
+	)
+	mustReconcile(t, c)
+
+	// Stand in for the admission the real API server would have run on CREATE.
+	proj := mustProjection(t, c)
+	proj.Labels[managedByCozystackLabel] = trueValue
+	proj.Labels[corev1alpha1.TenantResourceLabelKey] = "false"
+	if err := c.Update(context.TODO(), proj); err != nil {
+		t.Fatalf("stamp admission labels: %v", err)
+	}
+
+	// The platform now grants the tenant read access to the trust anchor.
+	def := &cozyv1alpha1.ApplicationDefinition{}
+	if err := c.Get(context.TODO(), types.NamespacedName{Name: "postgres"}, def); err != nil {
+		t.Fatalf("get definition: %v", err)
+	}
+	def.Spec.Secrets.Include = []*cozyv1alpha1.ApplicationDefinitionResourceSelector{{
+		LabelSelector: metav1.LabelSelector{MatchLabels: map[string]string{TenantCALabel: trueValue}},
+	}}
+	if err := c.Update(context.TODO(), def); err != nil {
+		t.Fatalf("grant access: %v", err)
+	}
+	mustReconcile(t, c)
+
+	got := mustProjection(t, c)
+	if _, found := got.Labels[managedByCozystackLabel]; found {
+		t.Errorf("a selector change must drop %q to re-admit the projection, labels=%v",
+			managedByCozystackLabel, got.Labels)
+	}
+}
+
+// TestReconcile_UnrelatedDefinitionChange_DoesNotRewrite pins that the digest is
+// narrower than the definition's resourceVersion: an edit that cannot change
+// tenant visibility must not churn the projection.
+func TestReconcile_UnrelatedDefinitionChange_DoesNotRewrite(t *testing.T) {
+	c := newClient(t, helmRelease(), appDef(), sentinel(),
+		operatorSecret(testOperatorCA, map[string][]byte{caCertKey: []byte(testCA), caKeyKey: []byte(testKey)}),
+	)
+	mustReconcile(t, c)
+	before := mustProjection(t, c)
+
+	def := &cozyv1alpha1.ApplicationDefinition{}
+	if err := c.Get(context.TODO(), types.NamespacedName{Name: "postgres"}, def); err != nil {
+		t.Fatalf("get definition: %v", err)
+	}
+	def.Spec.Application.Plural = "postgresqls" // does not touch spec.secrets
+	if err := c.Update(context.TODO(), def); err != nil {
+		t.Fatalf("update definition: %v", err)
+	}
+	mustReconcile(t, c)
+
+	if got := mustProjection(t, c); got.ResourceVersion != before.ResourceVersion {
+		t.Errorf("an edit that cannot affect tenant visibility must not rewrite the projection")
+	}
+}
+
+// TestApplicationDefinitionPredicate_GatesOnSecrets pins the no-ENQUEUE half of the
+// same property TestReconcile_UnrelatedDefinitionChange_DoesNotRewrite pins for the
+// no-WRITE half: an edit that cannot move the selectors digest never reaches the
+// mapping, so Flux's periodic no-op re-apply of every *-rd definition does not fan
+// out to every sentinel in the cluster. Creates and deletes still fall through.
+func TestApplicationDefinitionPredicate_GatesOnSecrets(t *testing.T) {
+	base := appDef()
+	for _, tc := range []struct {
+		name   string
+		mutate func(*cozyv1alpha1.ApplicationDefinition)
+		want   bool
+	}{
+		{
+			name:   "unrelated field change is not delivered",
+			mutate: func(d *cozyv1alpha1.ApplicationDefinition) { d.Spec.Application.Plural = "postgresqls" },
+			want:   false,
+		},
+		{
+			name: "spec.secrets change is delivered",
+			mutate: func(d *cozyv1alpha1.ApplicationDefinition) {
+				d.Spec.Secrets.Include = []*cozyv1alpha1.ApplicationDefinitionResourceSelector{{
+					LabelSelector: metav1.LabelSelector{MatchLabels: map[string]string{TenantCALabel: trueValue}},
+				}}
+			},
+			want: true,
+		},
+		{
+			name:   "kind change is delivered, since it can move ownership of a kind",
+			mutate: func(d *cozyv1alpha1.ApplicationDefinition) { d.Spec.Application.Kind = "SomethingElse" },
+			want:   true,
+		},
+		{
+			name:   "identical definition is not delivered",
+			mutate: func(*cozyv1alpha1.ApplicationDefinition) {},
+			want:   false,
+		},
+	} {
+		t.Run(tc.name, func(t *testing.T) {
+			oldDef := base.DeepCopy()
+			newDef := base.DeepCopy()
+			tc.mutate(newDef)
+			got := applicationDefinitionPredicate.Update(event.UpdateEvent{ObjectOld: oldDef, ObjectNew: newDef})
+			if got != tc.want {
+				t.Errorf("predicate delivered=%v, want %v", got, tc.want)
+			}
+		})
+	}
+
+	// A definition appearing or disappearing can change a verdict, so creates and
+	// deletes must always fall through.
+	if !applicationDefinitionPredicate.Create(event.CreateEvent{Object: base}) {
+		t.Errorf("a definition create must be delivered")
+	}
+	if !applicationDefinitionPredicate.Delete(event.DeleteEvent{Object: base}) {
+		t.Errorf("a definition delete must be delivered")
+	}
+}
+
+// TestProjectionsForSourceSecret pins the watch mapping: a source Secret event
+// resolves to exactly the sentinels that reference it, in its own namespace, and
+// nothing else. A bug here (wrong namespace scope, wrong index field) presents as
+// the same "projection never appears" symptom as a dead watch, so it is pinned
+// here rather than left to the chainsaw e2e alone. It registers the real index
+// function on the fake client so the field-selector query it depends on is
+// exercised, not stubbed.
+func TestProjectionsForSourceSecret(t *testing.T) {
+	c := fake.NewClientBuilder().
+		WithScheme(newScheme(t)).
+		WithIndex(&internalv1alpha1.TenantProjection{}, sourceSecretNameField, indexBySourceSecretName).
+		WithObjects(sentinel()).
+		Build()
+	r := newReconciler(c, record.NewFakeRecorder(1))
+
+	meta := func(ns, name string) *metav1.PartialObjectMetadata {
+		m := &metav1.PartialObjectMetadata{}
+		m.SetGroupVersionKind(secretGVK)
+		m.SetNamespace(ns)
+		m.SetName(name)
+		return m
+	}
+
+	// The sentinel references testOperatorCA in testNamespace.
+	got := r.projectionsForSourceSecret(context.TODO(), meta(testNamespace, testOperatorCA))
+	if len(got) != 1 || got[0].Name != testSentinel || got[0].Namespace != testNamespace {
+		t.Errorf("a referenced source must map to its sentinel, got %+v", got)
+	}
+
+	// A Secret no sentinel references maps to nothing.
+	if got := r.projectionsForSourceSecret(context.TODO(), meta(testNamespace, "unreferenced")); len(got) != 0 {
+		t.Errorf("an unreferenced Secret must map to no sentinel, got %+v", got)
+	}
+
+	// A same-named Secret in another namespace maps to nothing: the mapping is
+	// namespace-scoped, so it never crosses a tenant boundary.
+	if got := r.projectionsForSourceSecret(context.TODO(), meta("tenant-other", testOperatorCA)); len(got) != 0 {
+		t.Errorf("a source in another namespace must not map to this sentinel, got %+v", got)
+	}
+}
+
+// TestProjectionsForOwnedProjection pins the second watch mapping: an in-place
+// tamper of the canonical "<release>.tenant-ca" Secret resolves to the sentinel
+// that owns it, so the owner-reference adoption gate heals it at once rather than
+// on the five-minute resync. The projection's own name matches no sentinel's
+// sourceSecretName, so the source-index mapping returns zero for it — which is
+// exactly why this second, owner-reference mapping is needed.
+func TestProjectionsForOwnedProjection(t *testing.T) {
+	c := fake.NewClientBuilder().
+		WithScheme(newScheme(t)).
+		WithIndex(&internalv1alpha1.TenantProjection{}, sourceSecretNameField, indexBySourceSecretName).
+		WithObjects(sentinel()).
+		Build()
+	r := newReconciler(c, record.NewFakeRecorder(1))
+
+	// The projection Secret, as the controller writes it: named "<release>.tenant-ca"
+	// and owner-referenced to the sentinel.
+	projMeta := &metav1.PartialObjectMetadata{}
+	projMeta.SetGroupVersionKind(secretGVK)
+	projMeta.SetNamespace(testNamespace)
+	projMeta.SetName(testProjection)
+	projMeta.SetOwnerReferences([]metav1.OwnerReference{sentinelOwnerRef(sentinel())})
+
+	// The owner-reference mapping resolves the owning sentinel from the projection.
+	got := r.projectionsForOwnedProjection(context.TODO(), projMeta)
+	if len(got) != 1 || got[0].Name != testSentinel || got[0].Namespace != testNamespace {
+		t.Errorf("a projection must map to its owning sentinel, got %+v", got)
+	}
+
+	// The source-index mapping, by contrast, returns nothing for the projection's
+	// own name: it is no sentinel's sourceSecretName. This is the gap the
+	// owner-reference mapping fills.
+	if got := r.projectionsForSourceSecret(context.TODO(), projMeta); len(got) != 0 {
+		t.Errorf("the projection name matches no source, so the source mapping must return nothing, got %+v", got)
+	}
+
+	// A Secret with no TenantProjection owner reference maps to no sentinel.
+	plain := &metav1.PartialObjectMetadata{}
+	plain.SetGroupVersionKind(secretGVK)
+	plain.SetNamespace(testNamespace)
+	plain.SetName(testProjection)
+	if got := r.projectionsForOwnedProjection(context.TODO(), plain); len(got) != 0 {
+		t.Errorf("a Secret owned by no sentinel must map to nothing, got %+v", got)
+	}
+}
+
+// --- Pure write-path guards (unchanged functions) ---
+
+func TestContainsPrivateKey(t *testing.T) {
+	for _, tc := range []struct {
+		name string
+		in   string
+		want bool
+	}{
+		{"pkcs1 rsa", "x\n-----BEGIN RSA PRIVATE KEY-----\n", true},
+		{"pkcs8", "-----BEGIN PRIVATE KEY-----", true},
+		{"ec", "-----BEGIN EC PRIVATE KEY-----", true},
+		{"encrypted", "-----BEGIN ENCRYPTED PRIVATE KEY-----", true},
+		{"lowercase header", "-----begin rsa private key-----", true},
+		{"openssh", "-----BEGIN OPENSSH PRIVATE KEY-----", true},
+		// PGP puts BLOCK after "PRIVATE KEY", so a guard anchored to the closing
+		// dashes never sees it. It is a private key by any reading.
+		{"pgp", "-----BEGIN PGP PRIVATE KEY BLOCK-----", true},
+		{"certificate only", testCA, false},
+		{"private key words in body", "-----BEGIN CERTIFICATE-----\nPRIVATE KEY\n-----END CERTIFICATE-----", false},
+	} {
+		t.Run(tc.name, func(t *testing.T) {
+			if got := containsPrivateKey(tc.in); got != tc.want {
+				t.Errorf("containsPrivateKey(%q) = %v, want %v", tc.in, got, tc.want)
+			}
+		})
+	}
+}
+
+// TestProjectionData pins the single write-path sanitizer: it emits exactly one
+// key and refuses anything that is not a bare certificate.
+func TestProjectionData(t *testing.T) {
+	got, err := projectionData([]byte(testCA))
+	if err != nil {
+		t.Fatalf("projectionData(cert): %v", err)
+	}
+	if len(got) != 1 || string(got[caCertKey]) != testCA {
+		t.Errorf("projectionData must emit exactly ca.crt, got %v", got)
+	}
+	if _, err := projectionData([]byte(testCA + testKey)); err == nil {
+		t.Errorf("projectionData must refuse private key material")
+	}
+	if _, err := projectionData([]byte("garbage")); err == nil {
+		t.Errorf("projectionData must refuse a non-certificate value")
+	}
+}
+
+// TestProjectionData_RefusesCertificateArmouredNonCertificate is the guard's
+// actual claim, as opposed to the one a header match can make: every case below
+// wears correct certificate armour and no key header, yet is not a certificate.
+func TestProjectionData_RefusesCertificateArmouredNonCertificate(t *testing.T) {
+	for name, value := range map[string]string{
+		"armour around truncated DER": "-----BEGIN CERTIFICATE-----\nMIIBkTCCATegAwIBAgIQ\n-----END CERTIFICATE-----\n",
+		"armour around non-base64":    "-----BEGIN CERTIFICATE-----\nROTATEDROTATEDROTATED\n-----END CERTIFICATE-----\n",
+		"armour around plain text": "-----BEGIN CERTIFICATE-----\n" +
+			base64.StdEncoding.EncodeToString([]byte("this is not a certificate, it is a sentence")) +
+			"\n-----END CERTIFICATE-----\n",
+		"header with no body":  "-----BEGIN CERTIFICATE-----\n-----END CERTIFICATE-----\n",
+		"header with no close": "-----BEGIN CERTIFICATE-----\nMIIBkTCCATegAwIBAgIQ\n",
+		"empty":                "",
+		"whitespace only":      "   \n\t\n",
+		"a public key, not a certificate": string(pem.EncodeToMemory(&pem.Block{
+			Type: "PUBLIC KEY", Bytes: mustPublicKeyDER(),
+		})),
+	} {
+		t.Run(name, func(t *testing.T) {
+			if _, err := projectionData([]byte(value)); !errors.Is(err, errNotCertificate) {
+				t.Errorf("projectionData(%q) error = %v, want errNotCertificate", value, err)
+			}
+		})
+	}
+}
+
+// TestProjectionData_AcceptsRealCertificates keeps the guard from failing closed
+// on the values it exists to publish: a single CA, and a multi-certificate chain.
+func TestProjectionData_AcceptsRealCertificates(t *testing.T) {
+	bundle := testCA + testCARot
+	for _, tc := range []struct {
+		name string
+		in   string
+		want string
+	}{
+		{"one certificate", testCA, testCA},
+		{"a chain of two", bundle, bundle},
+		{"trailing whitespace", testCA + "\n\n  \n", testCA},
+	} {
+		t.Run(tc.name, func(t *testing.T) {
+			got, err := projectionData([]byte(tc.in))
+			if err != nil {
+				t.Fatalf("projectionData(%s) = %v, want accepted", tc.name, err)
+			}
+			if string(got[caCertKey]) != tc.want {
+				t.Errorf("projectionData(%s) published %q, want the validated blocks %q", tc.name, got[caCertKey], tc.want)
+			}
+		})
+	}
+}
+
+// TestProjectionData_RefusesTrailingGarbage pins that the guard accounts for
+// EVERY byte it publishes, not just the first block it can find.
+func TestProjectionData_RefusesTrailingGarbage(t *testing.T) {
+	if _, err := projectionData([]byte(testCA + "and then some trailing bytes")); !errors.Is(err, errNotCertificate) {
+		t.Errorf("projectionData(cert+garbage) error = %v, want errNotCertificate", err)
+	}
+}
+
+// TestProjectionData_KeyGuardWinsOverTheParse pins the ORDER of the two checks: a
+// private key wrapped in certificate armour is refused as key material, not as a
+// parse failure, so the operator is told which mistake they made.
+func TestProjectionData_KeyGuardWinsOverTheParse(t *testing.T) {
+	if _, err := projectionData([]byte(testCA + testKey)); !errors.Is(err, errPrivateKey) {
+		t.Errorf("projectionData(cert+key) error = %v, want errPrivateKey", err)
+	}
+}
+
+// TestProjectionData_StripsKeyMaterialSmuggledAroundBlocks is the write path's
+// deepest guarantee: the projection is REBUILT from the certificate blocks it
+// validated, never copied from the input. A raw DER or JWK key wears no PEM
+// private-key header, so it walks past containsPrivateKey and pem.Decode skips it
+// — only re-encoding the parsed certificates makes it structurally unreachable.
+func TestProjectionData_StripsKeyMaterialSmuggledAroundBlocks(t *testing.T) {
+	derKey := mustPrivateKeyDER()
+	jwkKey := `{"kty":"EC","crv":"P-256","d":"c2VjcmV0LXByaXZhdGUta2V5LW1hdGVyaWFs"}`
+
+	concat := func(parts ...[]byte) []byte { return bytes.Join(parts, nil) }
+	for _, tc := range []struct {
+		name string
+		in   []byte
+		want string
+	}{
+		{"leading DER key", concat(derKey, []byte("\n"), []byte(testCA)), testCA},
+		{"leading JWK key", []byte(jwkKey + "\n" + testCA), testCA},
+		{"interstitial DER key", concat([]byte(testCA), derKey, []byte("\n"), []byte(testCARot)), testCA + testCARot},
+	} {
+		t.Run(tc.name, func(t *testing.T) {
+			got, err := projectionData(tc.in)
+			if err != nil {
+				t.Fatalf("projectionData(%s) = %v, want accepted and sanitized", tc.name, err)
+			}
+			if string(got[caCertKey]) != tc.want {
+				t.Errorf("projectionData(%s) published %q, want only the validated blocks %q", tc.name, got[caCertKey], tc.want)
+			}
+			if bytes.Contains(got[caCertKey], derKey) {
+				t.Errorf("projectionData(%s) leaked raw DER private-key material into the tenant projection", tc.name)
+			}
+		})
+	}
+}
+
+// TestProjectionData_DropsHumanReadablePreamble pins that the text dump
+// `openssl x509 -text` prints before each certificate is not republished.
+func TestProjectionData_DropsHumanReadablePreamble(t *testing.T) {
+	preamble := "Certificate:\n    Data:\n        Version: 3 (0x2)\n"
+	in := preamble + testCA + preamble + testCARot
+	got, err := projectionData([]byte(in))
+	if err != nil {
+		t.Fatalf("projectionData(preamble+chain) = %v, want accepted", err)
+	}
+	if string(got[caCertKey]) != testCA+testCARot {
+		t.Errorf("projectionData must publish only the certificate blocks, got %q", got[caCertKey])
+	}
+	if bytes.Contains(got[caCertKey], []byte("Certificate:")) {
+		t.Errorf("projectionData leaked human-readable preamble into the tenant projection")
+	}
+}
+
+// TestOwnedSolelyBy separates the two questions the drift check must not
+// conflate: is the sentinel among the owners, and is it the only one.
+func TestOwnedSolelyBy(t *testing.T) {
+	want := sentinelOwnerRef(sentinel())
+	other := metav1.OwnerReference{
+		APIVersion: "v1", Kind: "ConfigMap", Name: "squatter",
+		UID: types.UID("aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee"),
+	}
+	for name, tc := range map[string]struct {
+		refs []metav1.OwnerReference
+		want bool
+	}{
+		"exactly the sentinel":   {refs: []metav1.OwnerReference{want}, want: true},
+		"sentinel plus a second": {refs: []metav1.OwnerReference{want, other}},
+		"second plus sentinel":   {refs: []metav1.OwnerReference{other, want}},
+		"someone else entirely":  {refs: []metav1.OwnerReference{other}},
+		"no owners":              {refs: nil},
+	} {
+		t.Run(name, func(t *testing.T) {
+			if got := ownedSolelyBy(tc.refs, want); got != tc.want {
+				t.Errorf("ownedSolelyBy(%d refs) = %v, want %v", len(tc.refs), got, tc.want)
+			}
+		})
+	}
+}
+
+// TestProjectionNameCannotCollideWithADotFreeEngineSuffix pins the property the
+// canonical name exists to have, over the dot-free engine suffixes it samples:
+// no engine CA Secret takes the dotted "<release>.tenant-ca" name. Validation
+// elsewhere generalises this over the releases the apps API created and no
+// further, a hand-written HelmRelease being free to carry a dot in its name;
+// over suffixes nothing validates anything, so there the fixtures are the whole
+// coverage. See projectionSuffix.
+func TestProjectionNameCannotCollideWithADotFreeEngineSuffix(t *testing.T) {
+	engineSuffixes := []string{"-ca", "-ca-cert", "-cluster-ca-cert", "-clients-ca-cert", "-ssl", "-tls"}
+	prefixes := []string{"", "postgres-", "kafka-", "clickhouse-", "http-cache-"}
+	appNames := []string{
+		"foo", "foo-tenant", "foo-tenant-ca", "tenant-ca", "a", "a0-b9",
+		"mydb-tenant", "x-tenant-ca-cert", "abcdefghijklmnopqrstuvwxyz0123456789",
+	}
+
+	if !strings.HasPrefix(projectionSuffix, ".") {
+		t.Fatalf("the canonical suffix must start with a dot; it is what keeps the name "+
+			"out of reach of a dot-free engine suffix. Got %q", projectionSuffix)
+	}
+
+	for _, prefix := range prefixes {
+		for _, app := range appNames {
+			if errs := validation.IsDNS1035Label(app); len(errs) > 0 {
+				t.Fatalf("test fixture %q is not a legal application name: %v", app, errs)
+			}
+			projection := prefix + app + projectionSuffix
+			for _, otherApp := range appNames {
+				otherRelease := prefix + otherApp
+				for _, suffix := range engineSuffixes {
+					if engineName := otherRelease + suffix; engineName == projection {
+						t.Errorf("projection %q collides with the CA Secret of release %q (%q)",
+							projection, otherRelease, engineName)
+					}
+				}
+			}
+		}
+	}
+}
+
+// TestApplicationDefinition_ResolvesKindOwner pins that the definition whose
+// spec.secrets decide a release's projection is the one that owns the kind: a
+// later definition declaring the same kind, even one that sorts first by name,
+// must not be the one whose selectors are read.
+func TestApplicationDefinition_ResolvesKindOwner(t *testing.T) {
+	base := time.Date(2026, 1, 1, 0, 0, 0, 0, time.UTC)
+	owner := appDef()
+	owner.CreationTimestamp = metav1.NewTime(base)
+	shadow := appDef()
+	shadow.Name = "a-postgres-shadow"
+	shadow.CreationTimestamp = metav1.NewTime(base.Add(time.Hour))
+	c := fake.NewClientBuilder().WithScheme(newScheme(t)).WithObjects(shadow, owner).Build()
+	r := newReconciler(c, record.NewFakeRecorder(1))
+
+	got, err := r.applicationDefinition(context.TODO(), application{Group: appsGroup, Kind: testAppKind})
+	if err != nil {
+		t.Fatal(err)
+	}
+	if got == nil || got.Name != "postgres" {
+		t.Fatalf("resolved %+v, want the owner postgres", got)
+	}
+}
diff --git a/internal/controller/fluxplunger/drain.go b/internal/controller/fluxplunger/drain.go
new file mode 100644
index 0000000000..53eb93e5f7
--- /dev/null
+++ b/internal/controller/fluxplunger/drain.go
@@ -0,0 +1,239 @@
+// SPDX-License-Identifier: Apache-2.0
+
+package fluxplunger
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"time"
+
+	helmv2 "github.com/fluxcd/helm-controller/api/v2"
+	corev1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	ctrl "sigs.k8s.io/controller-runtime"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/client/apiutil"
+	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
+	"sigs.k8s.io/controller-runtime/pkg/log"
+)
+
+const (
+	// drainPollInterval is how often a drain re-reads the releases it still holds.
+	drainPollInterval = time.Second
+	// ShutdownDrainTimeoutFlag names the flag that bounds the drain; the chart
+	// passes it, derived from the pod's termination grace period.
+	ShutdownDrainTimeoutFlag = "shutdown-drain-timeout"
+)
+
+// DrainFences gives up every fence flux-plunger holds, for a flux-plunger that is
+// stopping. A live release has its recovery aborted, the suspension and the fence
+// lifted together, which leaves it as recovery found it for the next flux-plunger
+// to pick up. A release being deleted goes through reconcileTerminating until the
+// fence is gone: flux-plunger's suspension is lifted, the fence is kept until
+// helm-controller has handled the unsuspended generation, and only then lifted.
+// When ctx ends first, the fences still held are left in place and counted: the
+// next flux-plunger carries on with them, and when flux-plunger is being removed
+// the chart's pre-delete hook releases them. Reads go to the apiserver, since the
+// informer cache has stopped with the manager by now.
+func (r *FluxPlunger) DrainFences(ctx context.Context) (int, error) {
+	logger := log.FromContext(ctx)
+	var reader client.Reader = r.Client
+	if r.APIReader != nil {
+		reader = r.APIReader
+	}
+	// held is what the last listing that succeeded found; -1 until one has.
+	held := -1
+	for {
+		list := &helmv2.HelmReleaseList{}
+		if err := reader.List(ctx, list); err != nil {
+			// A failed listing is retried like any other step: on the uninstall
+			// path ending here would leave the pre-delete hook to let go of a
+			// release the drain could still have carried through its uninstall.
+			logger.Info("Could not list HelmReleases yet, retrying", "error", err.Error())
+			select {
+			case <-ctx.Done():
+				return held, ctx.Err()
+			case <-time.After(drainPollInterval):
+			}
+			continue
+		}
+		held = 0
+		for i := range list.Items {
+			hr := &list.Items[i]
+			if !controllerutil.ContainsFinalizer(hr, fenceFinalizer) {
+				continue
+			}
+			held++
+			var err error
+			if hr.DeletionTimestamp.IsZero() {
+				// The relinquishing apply drops every field flux-plunger's manager owns,
+				// so a suspension of its own goes with the fence, and one it does not own
+				// is left alone.
+				err = r.releaseFence(ctx, hr)
+			} else {
+				_, err = r.reconcileTerminating(ctx, hr)
+			}
+			if err != nil {
+				logger.Info("Could not give up a fence yet, retrying", "helmrelease", client.ObjectKeyFromObject(hr).String(), "error", err.Error())
+			}
+		}
+		if held == 0 {
+			return 0, nil
+		}
+		select {
+		case <-ctx.Done():
+			return held, ctx.Err()
+		case <-time.After(drainPollInterval):
+		}
+	}
+}
+
+const (
+	// managerStopTimeout bounds how long the manager may take to stop its
+	// controllers before the drain starts.
+	managerStopTimeout = 10 * time.Second
+	// killMargin is left between the end of the drain and the kubelet's SIGKILL.
+	// The chart's --shutdown-drain-timeout is the grace period less this and
+	// managerStopTimeout, which TestDeploymentTemplate_SubtractsTheStopAndTheMarginTheBinaryUses
+	// holds.
+	killMargin = 15 * time.Second
+	// leaseRetryPeriod is how often the leader renews its Lease.
+	leaseRetryPeriod = 5 * time.Second
+	// leaseRenewDeadline is how long a leader whose renewals fail goes on acting
+	// before it gives up; it is part of what the Lease has to outlast.
+	leaseRenewDeadline = 15 * time.Second
+	// leaseMargin is added on top of everything a stop can take.
+	leaseMargin = 20 * time.Second
+)
+
+// ApplyShutdownTimings sizes the leader Lease so the next flux-plunger cannot
+// lead while this one drains. A rollout or an eviction starts the next pod while
+// the old one is still terminating, whatever the Deployment strategy, so it is
+// the Lease, not the rollout, that keeps a single writer. The Lease is not given
+// up on stop, and it outlasts its last renewal, the renew deadline, the
+// manager's bounded stop and the drain; the price is that a new pod waits for it
+// to run out before it leads.
+func ApplyShutdownTimings(opts *ctrl.Options, drain time.Duration) {
+	stop := managerStopTimeout
+	renew := leaseRenewDeadline
+	lease := leaseRetryPeriod + renew + stop + drain + leaseMargin
+	retry := leaseRetryPeriod
+	opts.GracefulShutdownTimeout = &stop
+	opts.LeaseDuration = &lease
+	opts.RenewDeadline = &renew
+	opts.RetryPeriod = &retry
+	opts.LeaderElectionReleaseOnCancel = false
+}
+
+// drainingManager is the part of a ctrl.Manager RunManager uses.
+type drainingManager interface {
+	Start(context.Context) error
+	GetClient() client.Client
+	GetAPIReader() client.Reader
+	Elected() <-chan struct{}
+}
+
+// RunManager runs the manager, then drains flux-plunger's fences. The drain
+// reads through the manager's API reader: once the manager has stopped, its
+// informer cache is frozen and would show fences already gone. Only a
+// flux-plunger that led drains: one that never did stops while the leader goes
+// on, and the fences are the leader's. Without leader election Elected is closed
+// from the start.
+func RunManager(ctx context.Context, mgr drainingManager, drain time.Duration) error {
+	drainer := &FluxPlunger{
+		Client:    mgr.GetClient(),
+		APIReader: mgr.GetAPIReader(),
+		Recorder:  apiEventRecorder{c: mgr.GetClient()},
+	}
+	return RunThenDrain(ctx, mgr.Start, func(dctx context.Context) (int, error) {
+		select {
+		case <-mgr.Elected():
+			return drainer.DrainFences(dctx)
+		default:
+			log.FromContext(dctx).Info("Never became leader; leaving the fences to the leader")
+			return 0, nil
+		}
+	}, drain)
+}
+
+// RunThenDrain runs the manager until it stops, then drains under a deadline of
+// its own: the context run was given is cancelled by the stop signal, so the drain
+// cannot be bounded by it. A manager that failed is not drained: a lost Lease
+// means another flux-plunger leads now. A stop that overran the manager's grace
+// period is drained anyway, since a reconcile slow to notice its cancelled
+// context must not cost the fences their drain, and is still reported. A drain
+// that leaves fences behind is logged rather than turned into a failed exit,
+// since the next flux-plunger or the pre-delete hook takes them over.
+func RunThenDrain(ctx context.Context, run func(context.Context) error, drain func(context.Context) (int, error), timeout time.Duration) error {
+	runErr := run(ctx)
+	if runErr != nil && !errors.Is(runErr, context.DeadlineExceeded) {
+		return runErr
+	}
+	dctx, cancel := context.WithTimeout(context.Background(), timeout)
+	defer cancel()
+	logger := log.FromContext(ctx)
+	if left, err := drain(dctx); err != nil {
+		logger.Info("Stopped with uninstall fences still held; the next flux-plunger or the chart's pre-delete hook releases them", "held", left, "error", err.Error())
+	} else {
+		logger.Info("Released every uninstall fence before stopping")
+	}
+	return runErr
+}
+
+// apiEventRecorder writes each Event straight to the apiserver. The drain cannot
+// use the manager's recorder: the manager stops its recorder provider before
+// Start returns, after which that recorder delivers nothing.
+type apiEventRecorder struct {
+	c client.Client
+}
+
+func (r apiEventRecorder) Event(obj runtime.Object, eventtype, reason, message string) {
+	r.write(obj, eventtype, reason, message)
+}
+
+func (r apiEventRecorder) Eventf(obj runtime.Object, eventtype, reason, messageFmt string, args ...interface{}) {
+	r.write(obj, eventtype, reason, fmt.Sprintf(messageFmt, args...))
+}
+
+func (r apiEventRecorder) AnnotatedEventf(obj runtime.Object, _ map[string]string, eventtype, reason, messageFmt string, args ...interface{}) {
+	r.write(obj, eventtype, reason, fmt.Sprintf(messageFmt, args...))
+}
+
+func (r apiEventRecorder) write(obj runtime.Object, eventtype, reason, message string) {
+	logger := log.Log.WithName("drain-events")
+	o, ok := obj.(client.Object)
+	if !ok {
+		logger.Info("Cannot record an event for this object", "type", fmt.Sprintf("%T", obj), "reason", reason)
+		return
+	}
+	gvk, err := apiutil.GVKForObject(o, r.c.Scheme())
+	if err != nil {
+		logger.Info("Cannot record an event", "reason", reason, "error", err.Error())
+		return
+	}
+	now := metav1.Now()
+	ev := &corev1.Event{
+		ObjectMeta: metav1.ObjectMeta{GenerateName: o.GetName() + ".", Namespace: o.GetNamespace()},
+		InvolvedObject: corev1.ObjectReference{
+			APIVersion: gvk.GroupVersion().String(),
+			Kind:       gvk.Kind,
+			Namespace:  o.GetNamespace(),
+			Name:       o.GetName(),
+			UID:        o.GetUID(),
+		},
+		Reason:         reason,
+		Message:        message,
+		Type:           eventtype,
+		Source:         corev1.EventSource{Component: suspendFieldManager},
+		FirstTimestamp: now,
+		LastTimestamp:  now,
+		Count:          1,
+	}
+	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+	defer cancel()
+	if err := r.c.Create(ctx, ev); err != nil {
+		logger.Info("Could not record an event", "reason", reason, "error", err.Error())
+	}
+}
diff --git a/internal/controller/fluxplunger/drain_envtest_test.go b/internal/controller/fluxplunger/drain_envtest_test.go
new file mode 100644
index 0000000000..7a0f6b5d16
--- /dev/null
+++ b/internal/controller/fluxplunger/drain_envtest_test.go
@@ -0,0 +1,323 @@
+// SPDX-License-Identifier: Apache-2.0
+//go:build envtest
+
+package fluxplunger
+
+import (
+	"context"
+	"os"
+	"testing"
+	"time"
+
+	helmv2 "github.com/fluxcd/helm-controller/api/v2"
+	corev1 "k8s.io/api/core/v1"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/types"
+	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
+	ctrl "sigs.k8s.io/controller-runtime"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
+	metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
+)
+
+// fenceAndSuspend gives a release flux-plunger's recovery state: its own
+// suspension and the fence, applied together as a recovery does.
+func fenceAndSuspend(t *testing.T, ctx context.Context, cl client.Client, key types.NamespacedName) {
+	t.Helper()
+	hr := &helmv2.HelmRelease{}
+	if err := cl.Get(ctx, key, hr); err != nil {
+		t.Fatalf("get: %v", err)
+	}
+	r := &FluxPlunger{Client: cl, APIReader: cl}
+	if acquired, err := r.suspendHelmRelease(ctx, hr); err != nil || !acquired {
+		t.Fatalf("acquire: acquired=%v err=%v", acquired, err)
+	}
+}
+
+func TestEnvtest_DrainAbortsTheRecoveryOfALiveRelease(t *testing.T) {
+	ctx, cl, newRelease, stop := startFenceEnv(t)
+	defer stop()
+	key := newRelease(testName + "-drain-live")
+	fenceAndSuspend(t, ctx, cl, key)
+
+	r := &FluxPlunger{Client: cl, APIReader: cl}
+	dctx, cancel := context.WithTimeout(ctx, 10*time.Second)
+	defer cancel()
+	left, err := r.DrainFences(dctx)
+	if err != nil || left != 0 {
+		t.Fatalf("drain: left=%d err=%v", left, err)
+	}
+
+	hr := &helmv2.HelmRelease{}
+	if err := cl.Get(ctx, key, hr); err != nil {
+		t.Fatalf("get: %v", err)
+	}
+	if hr.Spec.Suspend || ownsSuspensionManagedFields(hr) {
+		t.Fatalf("drain must lift flux-plunger's suspension: suspend=%v owned=%v", hr.Spec.Suspend, ownsSuspensionManagedFields(hr))
+	}
+	if controllerutil.ContainsFinalizer(hr, fenceFinalizer) {
+		t.Fatalf("drain must lift the fence with the suspension, finalizers %v", hr.Finalizers)
+	}
+	if !controllerutil.ContainsFinalizer(hr, helmv2.HelmReleaseFinalizer) {
+		t.Fatalf("drain must leave helm-controller's finalizer, finalizers %v", hr.Finalizers)
+	}
+}
+
+// A live release left with the fence alone (a recovery interrupted between its
+// steps) is released at once, not held until the drain's deadline.
+func TestEnvtest_DrainReleasesALiveFenceWithoutASuspensionAtOnce(t *testing.T) {
+	ctx, cl, newRelease, stop := startFenceEnv(t)
+	defer stop()
+	key := newRelease(testName + "-drain-fence-only")
+	hr := &helmv2.HelmRelease{}
+	if err := cl.Get(ctx, key, hr); err != nil {
+		t.Fatalf("get: %v", err)
+	}
+	r := &FluxPlunger{Client: cl, APIReader: cl}
+	if err := r.applyRecoveryState(ctx, hr, nil, true, false); err != nil {
+		t.Fatalf("fence: %v", err)
+	}
+
+	dctx, cancel := context.WithTimeout(ctx, 20*time.Second)
+	defer cancel()
+	start := time.Now()
+	if left, err := r.DrainFences(dctx); err != nil || left != 0 {
+		t.Fatalf("drain: left=%d err=%v", left, err)
+	}
+	if took := time.Since(start); took > 5*time.Second {
+		t.Fatalf("a live fence must go at once, the drain took %v", took)
+	}
+	if err := cl.Get(ctx, key, hr); err != nil {
+		t.Fatalf("get: %v", err)
+	}
+	if controllerutil.ContainsFinalizer(hr, fenceFinalizer) {
+		t.Fatalf("the fence must go, finalizers %v", hr.Finalizers)
+	}
+}
+
+func TestEnvtest_DrainLeavesAnotherManagersSuspensionAlone(t *testing.T) {
+	ctx, cl, newRelease, stop := startFenceEnv(t)
+	defer stop()
+	key := newRelease(testName + "-drain-foreign")
+	hr := &helmv2.HelmRelease{}
+	if err := cl.Get(ctx, key, hr); err != nil {
+		t.Fatalf("get: %v", err)
+	}
+	r := &FluxPlunger{Client: cl, APIReader: cl}
+	if err := r.applyRecoveryState(ctx, hr, nil, true, false); err != nil {
+		t.Fatalf("fence: %v", err)
+	}
+	if err := cl.Get(ctx, key, hr); err != nil {
+		t.Fatalf("get: %v", err)
+	}
+	hr.Spec.Suspend = true
+	if err := cl.Update(ctx, hr, client.FieldOwner(fmOper)); err != nil {
+		t.Fatalf("operator suspend: %v", err)
+	}
+
+	dctx, cancel := context.WithTimeout(ctx, 10*time.Second)
+	defer cancel()
+	if left, err := r.DrainFences(dctx); err != nil || left != 0 {
+		t.Fatalf("drain: left=%d err=%v", left, err)
+	}
+	if err := cl.Get(ctx, key, hr); err != nil {
+		t.Fatalf("get: %v", err)
+	}
+	if controllerutil.ContainsFinalizer(hr, fenceFinalizer) {
+		t.Fatalf("the fence must go, finalizers %v", hr.Finalizers)
+	}
+	if !hr.Spec.Suspend {
+		t.Fatal("an operator's suspension must survive the drain")
+	}
+}
+
+// A rollout or an eviction starts the next flux-plunger while the old one is
+// still terminating, so two of them overlap whatever the Deployment strategy. The
+// old one must still be the only writer while it drains: it keeps the leader
+// Lease, which it does not give up, and the next one becomes leader only once
+// the Lease has run out, after the drain.
+func TestEnvtest_TheNextFluxPlungerLeadsOnlyAfterTheDrain(t *testing.T) {
+	crdDir := os.Getenv("HELMRELEASE_CRD_DIR")
+	if crdDir == "" {
+		t.Skip("set HELMRELEASE_CRD_DIR to the dir with the HelmRelease CRD")
+	}
+	env := newEnvtestEnvironment(crdDir)
+	cfg, err := env.Start()
+	if err != nil {
+		t.Fatalf("start envtest: %v", err)
+	}
+	defer func() { _ = env.Stop() }()
+	cl, err := client.New(cfg, client.Options{Scheme: clientgoscheme.Scheme})
+	if err != nil {
+		t.Fatalf("client: %v", err)
+	}
+	if err := cl.Create(context.Background(), &corev1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: testNS}}); err != nil {
+		t.Fatalf("create ns: %v", err)
+	}
+
+	// Longer than the Lease retry period, so a Lease given up on stop would be
+	// taken by the next manager while the drain still runs.
+	const drainFor = 3 * leaseRetryPeriod
+	newManager := func() ctrl.Manager {
+		opts := ctrl.Options{
+			Scheme:                  clientgoscheme.Scheme,
+			Metrics:                 metricsserver.Options{BindAddress: "0"},
+			HealthProbeBindAddress:  "0",
+			LeaderElection:          true,
+			LeaderElectionID:        "flux-plunger.cozystack.io",
+			LeaderElectionNamespace: testNS,
+		}
+		ApplyShutdownTimings(&opts, drainFor)
+		m, err := ctrl.NewManager(cfg, opts)
+		if err != nil {
+			t.Fatalf("manager: %v", err)
+		}
+		return m
+	}
+
+	old := newManager()
+	oldCtx, stopOld := context.WithCancel(context.Background())
+	var drainEnded time.Time
+	oldDone := make(chan error, 1)
+	go func() {
+		oldDone <- RunThenDrain(oldCtx, old.Start, func(ctx context.Context) (int, error) {
+			time.Sleep(drainFor)
+			drainEnded = time.Now()
+			return 0, nil
+		}, drainFor)
+	}()
+	select {
+	case <-old.Elected():
+	case <-time.After(30 * time.Second):
+		t.Fatal("the first flux-plunger never became leader")
+	}
+
+	next := newManager()
+	nextCtx, stopNext := context.WithCancel(context.Background())
+	defer stopNext()
+	go func() { _ = next.Start(nextCtx) }()
+
+	stopOld()
+	if err := <-oldDone; err != nil {
+		t.Fatalf("a clean stop must drain, not fail: %v", err)
+	}
+	if drainEnded.IsZero() {
+		t.Fatal("the stopping flux-plunger did not drain")
+	}
+	select {
+	case <-next.Elected():
+		t.Fatal("the next flux-plunger became leader while the old one was still draining")
+	default:
+	}
+
+	select {
+	case <-next.Elected():
+		if !time.Now().After(drainEnded) {
+			t.Fatal("the next flux-plunger led before the drain ended")
+		}
+	case <-time.After(2 * time.Minute):
+		t.Fatal("the next flux-plunger never became leader once the Lease ran out")
+	}
+}
+
+// A delete that helm-controller handled while flux-plunger held the suspension
+// (no uninstall, its finalizer dropped) leaves the fence as the only thing
+// keeping the release. Draining must lift the suspension and keep the fence
+// until helm-controller has handled the unsuspended generation, so the uninstall
+// runs before the release goes.
+func TestEnvtest_DrainCarriesADeleteThroughTheUninstall(t *testing.T) {
+	ctx, cl, newRelease, stop := startFenceEnv(t)
+	defer stop()
+	key := newRelease(testName + "-drain-delete")
+	fenceAndSuspend(t, ctx, cl, key)
+	hr := &helmv2.HelmRelease{}
+	if err := cl.Get(ctx, key, hr); err != nil {
+		t.Fatalf("get: %v", err)
+	}
+	if err := cl.Delete(ctx, hr); err != nil {
+		t.Fatalf("delete: %v", err)
+	}
+	if simulateHelmControllerDelete(t, ctx, cl, key) {
+		t.Fatal("helm-controller must skip the uninstall of a suspended release")
+	}
+
+	r := &FluxPlunger{Client: cl, APIReader: cl}
+	dctx, cancel := context.WithTimeout(ctx, 20*time.Second)
+	defer cancel()
+	type result struct {
+		left int
+		err  error
+	}
+	done := make(chan result, 1)
+	go func() {
+		left, err := r.DrainFences(dctx)
+		done <- result{left, err}
+	}()
+
+	// helm-controller reconciles again once the suspension is lifted. Until it
+	// has, the fence must keep the release, through any number of drain passes.
+	deadline := time.Now().Add(10 * time.Second)
+	for {
+		if err := cl.Get(ctx, key, hr); err != nil {
+			t.Fatalf("the fence must keep the release until helm-controller has handled it, got %v", err)
+		}
+		if !hr.Spec.Suspend {
+			break
+		}
+		if time.Now().After(deadline) {
+			t.Fatal("drain did not lift flux-plunger's suspension")
+		}
+		time.Sleep(100 * time.Millisecond)
+	}
+	time.Sleep(3 * drainPollInterval)
+	if err := cl.Get(ctx, key, hr); err != nil {
+		t.Fatalf("the fence must hold while helm-controller has not observed the unsuspended generation, got %v", err)
+	}
+	if !simulateHelmControllerDelete(t, ctx, cl, key) {
+		t.Fatal("with the suspension lifted, helm-controller must run the uninstall")
+	}
+
+	res := <-done
+	if res.err != nil || res.left != 0 {
+		t.Fatalf("drain: left=%d err=%v", res.left, res.err)
+	}
+	if err := cl.Get(ctx, key, hr); !apierrors.IsNotFound(err) {
+		t.Fatalf("after the uninstall the drain must lift the fence so the release is deleted, got %v", err)
+	}
+}
+
+// A helm-controller that never handles the unsuspended release must not make the
+// drain drop the fence: the next flux-plunger, or the chart's pre-delete hook when
+// flux-plunger is being removed, takes it from there.
+func TestEnvtest_DrainKeepsTheFenceWhenHelmControllerNeverAnswers(t *testing.T) {
+	ctx, cl, newRelease, stop := startFenceEnv(t)
+	defer stop()
+	key := newRelease(testName + "-drain-stalled")
+	fenceAndSuspend(t, ctx, cl, key)
+	hr := &helmv2.HelmRelease{}
+	if err := cl.Get(ctx, key, hr); err != nil {
+		t.Fatalf("get: %v", err)
+	}
+	if err := cl.Delete(ctx, hr); err != nil {
+		t.Fatalf("delete: %v", err)
+	}
+	simulateHelmControllerDelete(t, ctx, cl, key)
+
+	r := &FluxPlunger{Client: cl, APIReader: cl}
+	dctx, cancel := context.WithTimeout(ctx, 3*time.Second)
+	defer cancel()
+	left, err := r.DrainFences(dctx)
+	if err == nil || left != 1 {
+		t.Fatalf("a drain cut short must report the fence it left: left=%d err=%v", left, err)
+	}
+	if err := cl.Get(ctx, key, hr); err != nil {
+		t.Fatalf("the fence must keep the release, got %v", err)
+	}
+	if hr.Spec.Suspend {
+		t.Fatal("the drain must still have lifted flux-plunger's suspension")
+	}
+	if !controllerutil.ContainsFinalizer(hr, fenceFinalizer) {
+		t.Fatalf("the fence must stay, finalizers %v", hr.Finalizers)
+	}
+}
diff --git a/internal/controller/fluxplunger/flux_plunger.go b/internal/controller/fluxplunger/flux_plunger.go
index 44886a2cb3..fc57b405cc 100644
--- a/internal/controller/fluxplunger/flux_plunger.go
+++ b/internal/controller/fluxplunger/flux_plunger.go
@@ -2,17 +2,24 @@ package fluxplunger
 
 import (
 	"context"
+	"encoding/json"
+	"errors"
 	"fmt"
 	"sort"
 	"strconv"
 	"strings"
+	"time"
 
 	helmv2 "github.com/fluxcd/helm-controller/api/v2"
 	corev1 "k8s.io/api/core/v1"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/types"
+	"k8s.io/client-go/tools/record"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/predicate"
 )
@@ -20,74 +27,197 @@ import (
 const (
 	annotationLastProcessedVersion = "flux-plunger.cozystack.io/last-processed-version"
 	errorMessageNoDeployedReleases = "has no deployed releases"
-	fieldManager                   = "flux-client-side-apply"
+	// fieldManager owns the client-side patch of the processed-version annotation.
+	fieldManager = "flux-client-side-apply"
+	// suspendFieldManager is the server-side-apply field manager flux-plunger uses
+	// to own spec.suspend. Ownership of a suspension is decided by whether this
+	// manager owns the field in metadata.managedFields, not by an annotation: the
+	// apiserver transfers the field away the moment another writer changes
+	// spec.suspend (a resume, then a re-suspend), so a later operator suspension is
+	// never misread as flux-plunger's, while an unrelated re-apply of other fields
+	// leaves the ownership untouched (no self-disown). A write of the value the field
+	// already holds does not transfer it.
+	suspendFieldManager = "flux-plunger"
+	// fenceFinalizer holds a HelmRelease while flux-plunger's recovery has it
+	// suspended. On a delete, helm-controller v1.5.x drops its own finalizer without
+	// running the Helm uninstall if the release is suspended, and it wakes on the same
+	// event flux-plunger does, so lifting the suspension first cannot be guaranteed.
+	// This finalizer keeps the object until flux-plunger has lifted the suspension
+	// and helm-controller has reconciled the unsuspended release, which runs the
+	// uninstall. It is applied in the same server-side apply as the suspension and
+	// removed with it once a recovery completes; on a delete it outlives the
+	// suspension and is removed only once helm-controller has handled the
+	// unsuspended release (uninstallReached).
+	fenceFinalizer = "flux-plunger.cozystack.io/uninstall-fence"
+
+	// fenceRecheckInterval is how often a delete held by the fence is re-checked
+	// without waiting for an event, so a stalled helm-controller is noticed.
+	fenceRecheckInterval = time.Minute
+	// fenceHeldWarnAfter is how long a delete may be held by the fence, waiting for
+	// helm-controller to handle the unsuspended release, before it is raised as a
+	// Warning: an uninstall normally lands within seconds.
+	fenceHeldWarnAfter = 10 * time.Minute
 )
 
 // FluxPlunger watches HelmRelease resources and fixes "has no deployed releases" errors
 type FluxPlunger struct {
 	client.Client
+
+	// APIReader reads directly from the apiserver, bypassing the informer cache.
+	// The re-fetch guards below (already-suspended, terminating) must not read the
+	// cache: it lags a write or delete the apiserver has already accepted, which
+	// would defeat the pre-delete termination re-check whose whole purpose is to
+	// catch a just-arrived delete. Production wires mgr.GetAPIReader(); when nil
+	// (tests), refetch falls back to the cached client.
+	APIReader client.Reader
+
+	// Recorder emits Events so an operator can see a release flux-plunger declined
+	// to act on (an externally-owned suspension) rather than reading it out of the
+	// log. Production wires mgr.GetEventRecorderFor; nil is tolerated (tests).
+	Recorder record.EventRecorder
+
+	// owns overrides the suspension-ownership check. Production leaves it nil and
+	// uses ownsSuspensionManagedFields (the managedFields-based check, which the
+	// controller-runtime fake client cannot represent). Tests in this package
+	// inject a stand-in so the branch, ordering and requeue behaviour can be
+	// exercised on the fake client, while the managedFields check itself is pinned
+	// by a unit test on hand-crafted managedFields and by the envtest suite.
+	owns func(*helmv2.HelmRelease) bool
+
+	// now overrides the clock for tests; production leaves it nil.
+	now func() time.Time
+}
+
+func (r *FluxPlunger) clock() time.Time {
+	if r.now != nil {
+		return r.now()
+	}
+	return time.Now()
+}
+
+// recordEvent emits an Event when a Recorder is wired. The message is static so
+// the recorder's event correlator folds repeats into a single counted Event rather
+// than a flood.
+func (r *FluxPlunger) recordEvent(hr *helmv2.HelmRelease, eventType, reason, message string) {
+	if r.Recorder != nil {
+		r.Recorder.Event(hr, eventType, reason, message)
+	}
+}
+
+// recordUnsuspendFailed raises a Warning when flux-plunger holds a suspension and
+// could not clear it: the state in which a delete makes helm-controller skip the
+// uninstall and orphan the release, which an operator can see in
+// `kubectl describe helmrelease` and must be able to alert on. A conflict is not
+// such a failure: the apply is preconditioned on what was read, so any write in
+// between (helm-controller's status update included) rejects it, and the requeue
+// retries it against the new state. Nor is a stop cancelling the reconcile: the
+// drain that follows lifts the suspension.
+func (r *FluxPlunger) recordUnsuspendFailed(hr *helmv2.HelmRelease, err error) {
+	if apierrors.IsConflict(err) || errors.Is(err, context.Canceled) {
+		return
+	}
+	r.recordEvent(hr, corev1.EventTypeWarning, "UnsuspendFailed",
+		"Could not clear a suspension flux-plunger set; retrying. While it stays suspended, deleting the release skips the Helm uninstall and orphans its resources")
+}
+
+// uninstallReached reports whether helm-controller has handled a terminating
+// release in its current, unsuspended form: its finalizer is gone and it has
+// observed the latest generation, which lifting the suspension bumped. Checking the
+// finalizer alone is not enough, because helm-controller drops it without an
+// uninstall while the release is still suspended.
+func uninstallReached(hr *helmv2.HelmRelease) bool {
+	return !controllerutil.ContainsFinalizer(hr, helmv2.HelmReleaseFinalizer) &&
+		hr.Status.ObservedGeneration == hr.Generation
+}
+
+// ownsSuspension reports whether flux-plunger owns the current suspension, through
+// the injected check in tests or the managedFields check in production.
+func (r *FluxPlunger) ownsSuspension(hr *helmv2.HelmRelease) bool {
+	if r.owns != nil {
+		return r.owns(hr)
+	}
+	return ownsSuspensionManagedFields(hr)
+}
+
+// refetch reads the freshest state of a HelmRelease. It uses the uncached
+// APIReader when wired (production) so an already-suspended or termination
+// re-check sees a write or delete the apiserver has just accepted; it falls back
+// to the cached client only when no APIReader is set (tests).
+func (r *FluxPlunger) refetch(ctx context.Context, key types.NamespacedName, hr *helmv2.HelmRelease) error {
+	if r.APIReader != nil {
+		return r.APIReader.Get(ctx, key, hr)
+	}
+	return r.Get(ctx, key, hr)
 }
 
 // +kubebuilder:rbac:groups=helm.toolkit.fluxcd.io,resources=helmreleases,verbs=get;list;watch;update;patch
 // +kubebuilder:rbac:groups="",resources=secrets,verbs=get;list;delete
+// +kubebuilder:rbac:groups="",resources=events,verbs=create;patch
 
 // Reconcile handles HelmRelease resources with "has no deployed releases" error
 func (r *FluxPlunger) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
 	logger := log.FromContext(ctx)
 
-	// Get the HelmRelease
+	// Read the HelmRelease from the apiserver, not the informer cache: the
+	// already-processed guard below compares its processed-version annotation with a
+	// Secret list that is itself read from the apiserver, and a cache that has not yet
+	// seen the annotation written by the previous recovery would fail that guard and
+	// delete the next revision down.
 	hr := &helmv2.HelmRelease{}
-	if err := r.Get(ctx, req.NamespacedName, hr); err != nil {
+	if err := r.refetch(ctx, req.NamespacedName, hr); err != nil {
 		return ctrl.Result{}, client.IgnoreNotFound(err)
 	}
 
+	if !hr.DeletionTimestamp.IsZero() {
+		return r.reconcileTerminating(ctx, hr)
+	}
+
 	// Check if HelmRelease is suspended
 	if hr.Spec.Suspend {
-		logger.Info("HelmRelease is suspended, checking if we need to unsuspend")
-
-		// Get the list of Helm release secrets
-		secrets, err := r.listHelmReleaseSecrets(ctx, hr.Namespace, hr.Name)
-		if err != nil {
-			logger.Error(err, "Failed to list Helm release secrets")
-			return ctrl.Result{}, err
-		}
-
-		// If no secrets, treat latest version as 0
-		latestVersion := 0
-		if len(secrets) > 0 {
-			latestSecret := getLatestSecret(secrets)
-			latestVersion = extractVersionNumber(latestSecret.Name)
-		} else {
-			logger.Info("No Helm release secrets found while suspended, treating as version 0")
-		}
-
-		// Check if version is previous to just processed (latestVersion+1 == processedVersion)
-		// This is the ONLY condition when we unsuspend
-		shouldUnsuspend := false
-		if hr.Annotations != nil {
-			if processedVersionStr, exists := hr.Annotations[annotationLastProcessedVersion]; exists {
-				processedVersion, err := strconv.Atoi(processedVersionStr)
-				if err == nil && latestVersion+1 == processedVersion {
-					shouldUnsuspend = true
-				}
+		// Ownership is decided by which field manager owns spec.suspend (see
+		// ownsSuspension). A suspension we own but see in a fresh reconcile means
+		// recovery crashed mid-flight rather than another instance running now: only
+		// the holder of the leader Lease reconciles, a stopping instance keeps that
+		// Lease through its drain (ApplyShutdownTimings), and controller-runtime
+		// serialises reconciles per key within the one process, so there is no
+		// concurrent owner to race. Releasing it un-sticks the release and lets
+		// error-recovery start over. A suspension flux-plunger does not own belongs to
+		// an operator or another controller and must be left untouched.
+		if !r.ownsSuspension(hr) {
+			logger.Info("HelmRelease is suspended by external process, skipping")
+			// On a release flux-plunger recovered before, the suspension is most
+			// likely one an earlier flux-plunger left mid-recovery under the shared
+			// flux-client-side-apply manager, which no one will lift unless told.
+			if _, recovered := hr.Annotations[annotationLastProcessedVersion]; recovered {
+				r.recordEvent(hr, corev1.EventTypeWarning, "SuspensionNotOwned",
+					"Left a suspension flux-plunger does not own untouched on a release it has recovered before; if an earlier flux-plunger left it, resume the release (see the flux-plunger chart README)")
+			} else {
+				r.recordEvent(hr, corev1.EventTypeNormal, "SuspensionNotOwned",
+					"Left an externally-owned suspension untouched; flux-plunger only clears suspensions it set")
 			}
+			// Our fence only guards a suspension flux-plunger holds; with the
+			// suspension taken over, do not keep the release from being deleted.
+			return ctrl.Result{}, r.releaseFence(ctx, hr)
 		}
 
-		if shouldUnsuspend {
-			// Unsuspend the HelmRelease
-			logger.Info("Secret was already deleted in previous run, removing suspend", "latest", latestVersion, "processed", latestVersion+1)
-			if err := r.unsuspendHelmRelease(ctx, hr); err != nil {
-				logger.Info("Could not unsuspend HelmRelease, will retry on next reconcile", "error", err.Error())
-				return ctrl.Result{}, nil
-			}
-			return ctrl.Result{}, nil
+		logger.Info("Removing suspension owned by flux-plunger")
+		if err := r.unsuspendHelmRelease(ctx, hr); err != nil {
+			// Requeue with backoff so a stuck owned suspension is not left until the
+			// next informer resync, symmetric with the deletion and recovery paths.
+			logger.Info("Could not unsuspend HelmRelease, requeuing", "error", err.Error())
+			r.recordUnsuspendFailed(hr, err)
+			return ctrl.Result{}, err
 		}
-
-		// If not previous to processed, skip all actions
-		logger.Info("HelmRelease is suspended by external process, skipping", "latest", latestVersion)
 		return ctrl.Result{}, nil
 	}
 
+	// A fence without a suspension is left when another writer (an operator,
+	// `cozyhr resume`) set spec.suspend=false and so took the field from
+	// flux-plunger; it guards nothing any more.
+	if controllerutil.ContainsFinalizer(hr, fenceFinalizer) {
+		return ctrl.Result{}, r.releaseFence(ctx, hr)
+	}
+
 	// Check if HelmRelease has the specific error
 	if !hasNoDeployedReleasesError(hr) {
 		logger.V(1).Info("HelmRelease does not have 'has no deployed releases' error, skipping")
@@ -132,10 +262,94 @@ func (r *FluxPlunger) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Res
 
 	// Suspend the HelmRelease
 	logger.Info("Suspending HelmRelease")
-	if err := r.suspendHelmRelease(ctx, hr); err != nil {
-		// Optimistic lock conflicts are normal - FluxCD also updates HelmRelease
-		// Don't return error, just log and let controller-runtime requeue on next update
-		logger.Info("Could not suspend HelmRelease, will retry on next reconcile", "error", err.Error())
+	acquired, err := r.suspendHelmRelease(ctx, hr)
+	if err != nil {
+		// Requeue with backoff on any error, symmetric with every step below.
+		// suspendHelmRelease reports every conflict, on either apply, as not acquired
+		// (handled below), so an error reaching here is a non-conflict failure (an
+		// admission webhook rejecting the apply, or an API error) that produces no
+		// follow-up event. Swallowing it would strand a stuck release until the next
+		// informer resync.
+		logger.Info("Could not suspend HelmRelease, requeuing", "error", err.Error())
+		return ctrl.Result{}, err
+	}
+	if !acquired {
+		// The release was suspended by someone else, started terminating, or was
+		// written again between our read and our write, so flux-plunger does not own
+		// it. Do not delete its storage Secret; the write that got in between is an
+		// update event, and the next reconcile handles the release as it now is.
+		logger.Info("HelmRelease was not acquired for recovery, deferring to next reconcile")
+		r.recordEvent(hr, corev1.EventTypeNormal, "RecoveryDeferred",
+			"Deferred recovery: spec.suspend was taken by another manager or the release began terminating between read and write; will retry on the next reconcile")
+		return ctrl.Result{}, nil
+	}
+
+	// From here flux-plunger owns the suspension (acquired above). Guarantee it is
+	// released before returning from any path below: a step that fails must never
+	// leave the HelmRelease suspended, because a delete arriving on a suspended
+	// release makes helm-controller skip the uninstall and orphan the release's
+	// resources. The unsuspend is idempotent, so the happy path running it
+	// explicitly and this deferred fallback are safe together.
+	completed := false
+	defer func() {
+		if completed {
+			return
+		}
+		if err := r.unsuspendHelmRelease(ctx, hr); err != nil {
+			logger.Info("Could not clear suspension after failed recovery step, will retry on next reconcile", "error", err.Error())
+			r.recordUnsuspendFailed(hr, err)
+		}
+	}()
+
+	// Record the version we are about to reclaim BEFORE deleting its storage
+	// Secret. The "already processed" guard above keys on this annotation, so
+	// writing it first means a failed write can never authorise deleting the NEXT
+	// revision on the following requeue: on failure we return here, the deferred
+	// unsuspend clears the suspension, and the retry re-deletes the SAME revision
+	// (idempotent) instead of walking down the release history one Secret per
+	// requeue until none is left, which would itself orphan the release. That covers
+	// a failed write or delete only: the guard compares revision numbers, so it cannot
+	// tell them from a revision Helm re-creates under the same number after the
+	// delete, and such a revision is reclaimed again. Requeue with backoff on failure,
+	// symmetric with every other step.
+	logger.Info("Updating annotation with processed version", "version", latestVersion)
+	if err := r.updateProcessedVersionAnnotation(ctx, hr, latestVersion); err != nil {
+		logger.Info("Could not update annotation, requeuing", "error", err.Error())
+		return ctrl.Result{}, err
+	}
+
+	// A delete can land between acquiring the suspension and here. Deleting the
+	// storage Secret of a terminating release removes the only revision
+	// helm-controller could uninstall; it then treats the release as already gone,
+	// drops its finalizer, and orphans the resources — the exact failure this
+	// recovery exists to prevent, reached by a narrower race than the suspended one.
+	// The top-of-Reconcile check and suspendHelmRelease's re-fetch only see a delete
+	// visible earlier, so re-check immediately before the delete. On termination,
+	// leave the Secret intact and return: the deferred unsuspend clears our
+	// suspension so helm-controller runs the uninstall against the intact revision.
+	// This narrows the window to the Get-then-Delete gap but cannot fully close it —
+	// there is no HelmRelease+Secret transaction — so a delete landing in that gap is
+	// an accepted residual, the tightest a two-object check-then-act allows.
+	terminating, err := r.releaseIsTerminating(ctx, hr)
+	if err != nil {
+		logger.Info("Could not re-check deletion before deleting the storage Secret, requeuing", "error", err.Error())
+		return ctrl.Result{}, err
+	}
+	if terminating {
+		// Clear our suspension explicitly and requeue on failure. Leaving it to the
+		// log-only deferred fallback would let a failed unsuspend strand an owned
+		// suspension on a terminating release with nothing retrying it — the exact
+		// state that makes helm-controller skip the uninstall and orphan the
+		// resources. The Secret is left intact so the uninstall has a revision.
+		logger.Info("HelmRelease started terminating during recovery, clearing suspension so helm-controller can uninstall")
+		if err := r.unsuspendHelmRelease(ctx, hr); err != nil {
+			logger.Info("Could not clear suspension on terminating release, requeuing", "error", err.Error())
+			r.recordUnsuspendFailed(hr, err)
+			// The returned error requeues and retries; skip the redundant deferred attempt.
+			completed = true
+			return ctrl.Result{}, err
+		}
+		completed = true
 		return ctrl.Result{}, nil
 	}
 
@@ -146,24 +360,143 @@ func (r *FluxPlunger) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Res
 		return ctrl.Result{}, err
 	}
 
-	// Update annotation with processed version
-	logger.Info("Updating annotation with processed version", "version", latestVersion)
-	if err := r.updateProcessedVersionAnnotation(ctx, hr, latestVersion); err != nil {
-		logger.Info("Could not update annotation, will retry on next reconcile", "error", err.Error())
-		return ctrl.Result{}, nil
-	}
-
-	// Unsuspend the HelmRelease
+	// Unsuspend the HelmRelease. Force a backoff requeue on failure, symmetric with
+	// the deletion path: a persistently failing unsuspend (e.g. an admission webhook
+	// rejecting the patch) would otherwise leave the release suspended-by-plunger
+	// until the informer's periodic resync, far longer than necessary.
 	logger.Info("Unsuspending HelmRelease")
 	if err := r.unsuspendHelmRelease(ctx, hr); err != nil {
-		logger.Info("Could not unsuspend HelmRelease, will retry on next reconcile", "error", err.Error())
-		return ctrl.Result{}, nil
+		logger.Info("Could not unsuspend HelmRelease, requeuing", "error", err.Error())
+		r.recordUnsuspendFailed(hr, err)
+		// The returned error requeues and retries; skip the redundant deferred attempt.
+		completed = true
+		return ctrl.Result{}, err
 	}
 
+	completed = true
 	logger.Info("Successfully processed HelmRelease", "version", latestVersion)
 	return ctrl.Result{}, nil
 }
 
+// reconcileTerminating makes a delete of a release flux-plunger is recovering reach
+// the Helm uninstall. helm-controller v1.5.x skips the uninstall and drops its
+// finalizer for a suspended HelmRelease
+// (https://github.com/fluxcd/helm-controller/blob/v1.5.0/internal/controller/helmrelease_controller.go#L447-L475),
+// and it handles the delete on the same event flux-plunger does. The fence
+// finalizer keeps the object whichever handles it first; flux-plunger lifts its own
+// suspension, which bumps the generation and makes helm-controller reconcile the
+// unsuspended release and uninstall it, and only then lifts the fence. A terminating
+// release never begins recovery.
+func (r *FluxPlunger) reconcileTerminating(ctx context.Context, hr *helmv2.HelmRelease) (ctrl.Result, error) {
+	logger := log.FromContext(ctx)
+
+	if hr.Spec.Suspend && r.ownsSuspension(hr) {
+		logger.Info("HelmRelease is being deleted while suspended by flux-plunger, clearing suspension so uninstall can proceed")
+		if err := r.unsuspendHelmRelease(ctx, hr); err != nil {
+			logger.Info("Could not clear suspension on deleted HelmRelease, requeuing", "error", err.Error())
+			r.recordUnsuspendFailed(hr, err)
+			return ctrl.Result{}, err
+		}
+		// helm-controller's reconcile of the new generation updates the status,
+		// which wakes this controller again to lift the fence.
+		return ctrl.Result{}, nil
+	}
+
+	if hr.Spec.Suspend {
+		// Another manager's suspension: helm-controller skips the uninstall for it
+		// and leaves the release's resources in place, which a migration that
+		// suspends then deletes relies on. That is not flux-plunger's decision to
+		// override, and not a release its fence should hold. A release that
+		// carries flux-plunger's processed-version annotation was recovered before,
+		// so the suspension that skips its uninstall was not a migration's choice (an
+		// operator's hand, or one an earlier flux-plunger release left behind): that
+		// is the orphaning this controller exists to prevent, and a Warning.
+		logger.Info("HelmRelease is being deleted while suspended by another manager; helm-controller skips the uninstall")
+		if _, recovered := hr.Annotations[annotationLastProcessedVersion]; recovered {
+			r.recordEvent(hr, corev1.EventTypeWarning, "TerminatingWhileSuspended",
+				"HelmRelease is being deleted while suspended by another manager; helm-controller skips the Helm uninstall for a suspended release, so its resources are left behind")
+		} else {
+			r.recordEvent(hr, corev1.EventTypeNormal, "TerminatingWhileSuspended",
+				"HelmRelease is being deleted while suspended by another manager; helm-controller skips the Helm uninstall for a suspended release and leaves its resources in place")
+		}
+		return ctrl.Result{}, r.releaseFence(ctx, hr)
+	}
+
+	if !controllerutil.ContainsFinalizer(hr, fenceFinalizer) {
+		return ctrl.Result{}, nil
+	}
+	if uninstallReached(hr) {
+		logger.Info("helm-controller has handled the unsuspended release, lifting the uninstall fence")
+		return ctrl.Result{}, r.releaseFence(ctx, hr)
+	}
+	// Still waiting for helm-controller to handle the unsuspended release. Re-check
+	// on a timer rather than only on its next status write, which never comes if it
+	// is not running, and say so once the delete has been held past the deadline.
+	if held := r.clock().Sub(hr.DeletionTimestamp.Time); held >= fenceHeldWarnAfter {
+		logger.Info("HelmRelease delete is still held by the uninstall fence, waiting for helm-controller", "held", held.String())
+		r.recordEvent(hr, corev1.EventTypeWarning, "UninstallFenceHeld",
+			"HelmRelease delete is held by flux-plunger's uninstall fence until helm-controller handles the unsuspended release; check that helm-controller is running and reconciling it")
+	}
+	return ctrl.Result{RequeueAfter: fenceRecheckInterval}, nil
+}
+
+// releaseFence removes flux-plunger's fence finalizer by relinquishing it. Callers
+// hold no suspension of their own at this point: the relinquishing apply drops
+// every field flux-plunger's manager owns.
+func (r *FluxPlunger) releaseFence(ctx context.Context, hr *helmv2.HelmRelease) error {
+	if !controllerutil.ContainsFinalizer(hr, fenceFinalizer) {
+		return nil
+	}
+	return r.applyRecoveryState(ctx, hr, nil, false, false)
+}
+
+// ownsSuspensionManagedFields reports whether flux-plunger owns the spec.suspend
+// field via its server-side-apply field manager, recorded by the apiserver in
+// metadata.managedFields. This is the sole ownership signal, and it is exact in
+// the ways a bare annotation marker was not:
+//
+//   - An operator (or `cozyhr resume`, or the backup controller) that resumes and
+//     later re-suspends the release writes spec.suspend under its own manager, so
+//     the apiserver transfers the field away from flux-plunger and this returns
+//     false — the later suspension is never misread as ours and cleared out from
+//     under them, the one boundary this controller must never cross.
+//   - An unrelated re-apply of other spec fields (the routine reconcile of the
+//     cozystack operator or helm-controller) leaves spec.suspend's owner untouched,
+//     so flux-plunger keeps ownership of a suspension it is mid-recovery on — no
+//     self-disown, unlike keying ownership on metadata.generation.
+func ownsSuspensionManagedFields(hr *helmv2.HelmRelease) bool {
+	for _, e := range hr.ManagedFields {
+		if e.Manager == suspendFieldManager &&
+			e.Operation == metav1.ManagedFieldsOperationApply &&
+			fieldsManageSuspend(e.FieldsV1) {
+			return true
+		}
+	}
+	return false
+}
+
+// fieldsManageSuspend reports whether a managed-fields set includes spec.suspend,
+// encoded by the apiserver as {"f:spec":{"f:suspend":{}}}.
+func fieldsManageSuspend(fs *metav1.FieldsV1) bool {
+	if fs == nil || len(fs.Raw) == 0 {
+		return false
+	}
+	var top map[string]json.RawMessage
+	if err := json.Unmarshal(fs.Raw, &top); err != nil {
+		return false
+	}
+	specRaw, ok := top["f:spec"]
+	if !ok {
+		return false
+	}
+	var spec map[string]json.RawMessage
+	if err := json.Unmarshal(specRaw, &spec); err != nil {
+		return false
+	}
+	_, ok = spec["f:suspend"]
+	return ok
+}
+
 // hasNoDeployedReleasesError checks if the HelmRelease has the specific error
 func hasNoDeployedReleasesError(hr *helmv2.HelmRelease) bool {
 	for _, condition := range hr.Status.Conditions {
@@ -176,7 +509,21 @@ func hasNoDeployedReleasesError(hr *helmv2.HelmRelease) bool {
 	return false
 }
 
-// listHelmReleaseSecrets lists all Helm release secrets for a specific release
+// listHelmReleaseSecrets lists all Helm release secrets for a specific release.
+//
+// It reads through the uncached APIReader (when wired). This is not only a race
+// guard but a correctness fix: the controller's cached client (mgr.GetClient())
+// would serve this List from an informer, and the ClusterRole grants secrets only
+// get/list, NOT watch, which an informer needs to stay synced — so a cached List
+// cannot reliably reflect the cluster (stale at best, unsynced at worst, with a
+// steady stream of watch-forbidden errors). Reading directly from the apiserver via
+// the APIReader needs only get/list and sidesteps the informer entirely.
+// getLatestSecret over the result also chooses which storage Secret is deleted and
+// which version the processed annotation records, and this List runs before the
+// release is suspended, exactly when helm-controller may still be creating a
+// revision Secret — the same race the other re-reads guard against — so the direct
+// read is doubly warranted. flux-plunger deliberately does NOT cache Secrets (no
+// watch RBAC, and it would mean watching every Secret in the cluster).
 func (r *FluxPlunger) listHelmReleaseSecrets(ctx context.Context, namespace, releaseName string) ([]corev1.Secret, error) {
 	secretList := &corev1.SecretList{}
 	listOpts := []client.ListOption{
@@ -187,7 +534,11 @@ func (r *FluxPlunger) listHelmReleaseSecrets(ctx context.Context, namespace, rel
 		},
 	}
 
-	if err := r.List(ctx, secretList, listOpts...); err != nil {
+	lister := client.Reader(r.Client)
+	if r.APIReader != nil {
+		lister = r.APIReader
+	}
+	if err := lister.List(ctx, secretList, listOpts...); err != nil {
 		return nil, fmt.Errorf("failed to list secrets: %w", err)
 	}
 
@@ -240,44 +591,177 @@ func extractVersionNumber(secretName string) int {
 	return num
 }
 
-// suspendHelmRelease sets suspend to true on the HelmRelease
-func (r *FluxPlunger) suspendHelmRelease(ctx context.Context, hr *helmv2.HelmRelease) error {
+// applyRecoveryState server-side-applies the fields flux-plunger's field manager
+// owns during a recovery: spec.suspend and the fence finalizer, and nothing else.
+// Whatever the body leaves out is relinquished. value == nil omits spec.suspend
+// (when flux-plunger is its sole manager the field reverts to the unsuspended
+// default); value != nil sets it to *value. fence declares the fence finalizer;
+// metadata.finalizers is a set, so this adds or drops only flux-plunger's entry and
+// leaves helm-controller's alone. force appends client.ForceOwnership.
+//
+// The apply body is an unstructured object carrying just metadata and these
+// fields, NOT a typed HelmReleaseSpec: marshaling a typed spec would also emit
+// spec.interval ("0s", it is a required field without omitempty), and applying
+// that over a release whose interval another manager owns conflicts on
+// spec.interval and never suspends, while forcing would reset the release's
+// reconcile interval.
+func (r *FluxPlunger) applyRecoveryState(ctx context.Context, hr *helmv2.HelmRelease, value *bool, fence, force bool) error {
+	apply := &unstructured.Unstructured{}
+	apply.SetGroupVersionKind(helmv2.GroupVersion.WithKind("HelmRelease"))
+	apply.SetNamespace(hr.Namespace)
+	apply.SetName(hr.Name)
+	// Precondition every apply on the object the caller read, so a write or delete
+	// that lands after that read is rejected with a conflict and the decision is
+	// taken again on the new state. The resourceVersion covers a change: unforced,
+	// the apiserver would otherwise accept true over a foreign true as shared
+	// ownership; forced, take the field over; and a relinquish decided on a live
+	// release would remove the fence after helm-controller had already dropped its
+	// finalizer on a delete, deleting the release without an uninstall. The uid
+	// covers a release that is gone: server-side apply creates what does not exist,
+	// and only a uid mismatch stops it resurrecting an empty HelmRelease.
+	apply.SetResourceVersion(hr.ResourceVersion)
+	apply.SetUID(hr.UID)
+	if fence {
+		apply.SetFinalizers([]string{fenceFinalizer})
+	}
+	if value != nil {
+		if err := unstructured.SetNestedField(apply.Object, *value, "spec", "suspend"); err != nil {
+			return err
+		}
+	}
+	opts := []client.PatchOption{client.FieldOwner(suspendFieldManager)}
+	if force {
+		opts = append(opts, client.ForceOwnership)
+	}
+	return r.Patch(ctx, apply, client.Apply, opts...)
+}
+
+// suspendHelmRelease takes ownership of a fresh suspension via server-side apply.
+// It reports whether it acquired one: false means the release was already
+// suspended by someone else, or it started terminating after the top-of-Reconcile
+// check, so the caller must not proceed as if it owns it.
+//
+// Both applies set the fence finalizer together with the suspension, so there is
+// no moment at which flux-plunger holds a suspension a delete could slip past, and
+// both are preconditioned on the resourceVersion of the read that decided on them
+// (see applyRecoveryState), so any write landing after that read makes the apply
+// fail with a conflict rather than be absorbed.
+//
+// The apply is attempted WITHOUT force first. A fresh, unowned spec.suspend applies
+// cleanly and flux-plunger owns it. A conflict means the release changed since the
+// read, or another manager already owns the field: this repo's backup controllers
+// set spec.suspend via a dynamic-client Update (setCNPGRestoreHRSuspended /
+// setEtcdRestoreHRSuspended / velero's suspendHelmRelease), and earlier flux-plunger
+// releases owned it via a merge Patch, so a non-forced apply would 409 forever and
+// flux-plunger could never recover such a release. On conflict we re-fetch and force
+// ONLY if spec.suspend is still false: a manager owning the field at false is stale
+// ownership safe to take over, while a value of true is an ACTIVE suspension (an
+// operator's, or a backup mid-restore) that flux-plunger must never clear. A
+// conflict on the forced retry means yet another write landed after the re-read,
+// the same race as a foreign suspension seen on the re-read, so it is reported the
+// same way: not acquired, no error.
+func (r *FluxPlunger) suspendHelmRelease(ctx context.Context, hr *helmv2.HelmRelease) (bool, error) {
 	// Re-fetch the HelmRelease to get the latest state
 	key := types.NamespacedName{Namespace: hr.Namespace, Name: hr.Name}
 	latestHR := &helmv2.HelmRelease{}
-	if err := r.Get(ctx, key, latestHR); err != nil {
-		return fmt.Errorf("failed to get latest HelmRelease: %w", err)
+	if err := r.refetch(ctx, key, latestHR); err != nil {
+		return false, fmt.Errorf("failed to get latest HelmRelease: %w", err)
 	}
 
-	// If already suspended, nothing to do
+	// Never suspend a terminating release. A delete can arrive between the
+	// top-of-Reconcile deletion check and this re-fetch, and suspending a release
+	// helm-controller is about to uninstall is exactly what makes it skip the
+	// uninstall and orphan the release's resources.
+	if !latestHR.DeletionTimestamp.IsZero() {
+		return false, nil
+	}
+
+	// If already suspended, do not take ownership of a suspension we did not set.
 	if latestHR.Spec.Suspend {
-		return nil
+		return false, nil
 	}
 
-	patch := client.MergeFromWithOptions(latestHR.DeepCopy(), client.MergeFromWithOptimisticLock{})
-	latestHR.Spec.Suspend = true
+	suspendTrue := true
+	err := r.applyRecoveryState(ctx, latestHR, &suspendTrue, true, false)
+	if err == nil {
+		return true, nil
+	}
+	if !apierrors.IsConflict(err) {
+		return false, err
+	}
 
-	return r.Patch(ctx, latestHR, patch, client.FieldOwner(fieldManager))
+	// Conflict: another manager owns spec.suspend. Re-read its value and force only
+	// if it is still unsuspended (stale ownership); leave an active suspension alone.
+	// Decode into a FRESH object: client-go's Get unmarshals into the receiver without
+	// zeroing it, so a field absent from the second response (spec.suspend is
+	// omitempty) would otherwise retain the first read's value.
+	rechecked := &helmv2.HelmRelease{}
+	if err := r.refetch(ctx, key, rechecked); err != nil {
+		return false, fmt.Errorf("failed to re-fetch HelmRelease after suspend conflict: %w", err)
+	}
+	if !rechecked.DeletionTimestamp.IsZero() {
+		return false, nil
+	}
+	if rechecked.Spec.Suspend {
+		return false, nil
+	}
+	if err := r.applyRecoveryState(ctx, rechecked, &suspendTrue, true, true); err != nil {
+		if apierrors.IsConflict(err) {
+			return false, nil
+		}
+		return false, err
+	}
+	return true, nil
 }
 
-// unsuspendHelmRelease sets suspend to false on the HelmRelease
+// releaseIsTerminating re-fetches the HelmRelease and reports whether it has begun
+// terminating. Recovery calls this immediately before deleting the storage Secret
+// so a delete that landed after the earlier checks cannot make it remove the only
+// revision helm-controller could uninstall. A release that is already gone counts
+// as terminating.
+func (r *FluxPlunger) releaseIsTerminating(ctx context.Context, hr *helmv2.HelmRelease) (bool, error) {
+	key := types.NamespacedName{Namespace: hr.Namespace, Name: hr.Name}
+	latestHR := &helmv2.HelmRelease{}
+	if err := r.refetch(ctx, key, latestHR); err != nil {
+		if apierrors.IsNotFound(err) {
+			return true, nil
+		}
+		return false, fmt.Errorf("failed to get latest HelmRelease: %w", err)
+	}
+	return !latestHR.DeletionTimestamp.IsZero(), nil
+}
+
+// unsuspendHelmRelease clears a suspension flux-plunger owns by relinquishing the
+// spec.suspend field: a server-side apply that no longer declares it, which reverts
+// the field to unsuspended (flux-plunger being its only manager) and drops
+// flux-plunger's ownership. On a live release the fence goes with it. On a
+// terminating one the fence stays: helm-controller may already have dropped its
+// finalizer without an uninstall, and the fence is what keeps the object until it
+// reconciles the unsuspended release (reconcileTerminating lifts it then). A
+// release that is already gone has nothing left to clear.
+//
+// Callers already gate on ownership; the re-fetched ownership check here is
+// defense-in-depth against a future caller that forgets to, so an operator's
+// suspension, for which the apiserver has already transferred the field away from
+// flux-plunger, is never cleared by accident.
 func (r *FluxPlunger) unsuspendHelmRelease(ctx context.Context, hr *helmv2.HelmRelease) error {
-	// Re-fetch the HelmRelease to get the latest state
 	key := types.NamespacedName{Namespace: hr.Namespace, Name: hr.Name}
 	latestHR := &helmv2.HelmRelease{}
-	if err := r.Get(ctx, key, latestHR); err != nil {
+	if err := r.refetch(ctx, key, latestHR); err != nil {
+		if apierrors.IsNotFound(err) {
+			return nil
+		}
 		return fmt.Errorf("failed to get latest HelmRelease: %w", err)
 	}
 
-	// If already unsuspended, nothing to do
-	if !latestHR.Spec.Suspend {
+	// Nothing to do if flux-plunger does not own the suspension: either it is
+	// already unsuspended, or the field belongs to another manager now.
+	if !r.ownsSuspension(latestHR) {
 		return nil
 	}
 
-	patch := client.MergeFromWithOptions(latestHR.DeepCopy(), client.MergeFromWithOptimisticLock{})
-	latestHR.Spec.Suspend = false
-
-	return r.Patch(ctx, latestHR, patch, client.FieldOwner(fieldManager))
+	keepFence := !latestHR.DeletionTimestamp.IsZero() && controllerutil.ContainsFinalizer(latestHR, fenceFinalizer)
+	return r.applyRecoveryState(ctx, latestHR, nil, keepFence, false)
 }
 
 // updateProcessedVersionAnnotation updates the annotation with the processed version
@@ -285,7 +769,7 @@ func (r *FluxPlunger) updateProcessedVersionAnnotation(ctx context.Context, hr *
 	// Re-fetch the HelmRelease to get the latest state
 	key := types.NamespacedName{Namespace: hr.Namespace, Name: hr.Name}
 	latestHR := &helmv2.HelmRelease{}
-	if err := r.Get(ctx, key, latestHR); err != nil {
+	if err := r.refetch(ctx, key, latestHR); err != nil {
 		return fmt.Errorf("failed to get latest HelmRelease: %w", err)
 	}
 
@@ -299,35 +783,41 @@ func (r *FluxPlunger) updateProcessedVersionAnnotation(ctx context.Context, hr *
 	return r.Patch(ctx, latestHR, patch, client.FieldOwner(fieldManager))
 }
 
-// SetupWithManager sets up the controller with the Manager
-func (r *FluxPlunger) SetupWithManager(mgr ctrl.Manager) error {
-	// Watch HelmReleases that either:
-	// 1. Have the specific error, OR
-	// 2. Are suspended with our annotation (to handle crash recovery)
-	pred := predicate.NewPredicateFuncs(func(obj client.Object) bool {
-		hr, ok := obj.(*helmv2.HelmRelease)
-		if !ok {
-			return false
-		}
-
-		// Always process if has error
-		if hasNoDeployedReleasesError(hr) {
-			return true
-		}
-
-		// Also process suspended HelmReleases with our annotation (crash recovery)
-		if hr.Spec.Suspend && hr.Annotations != nil {
-			if _, exists := hr.Annotations[annotationLastProcessedVersion]; exists {
-				return true
-			}
-		}
-
+// watchPredicate selects the HelmReleases flux-plunger reconciles: those carrying
+// the specific error, a suspension flux-plunger owns (crash recovery, and a delete
+// arriving mid-recovery, both need to wake a reconcile), flux-plunger's fence, or
+// any suspended release that is being deleted. Kept a named method so a test can
+// pin it.
+func (r *FluxPlunger) watchPredicate(obj client.Object) bool {
+	hr, ok := obj.(*helmv2.HelmRelease)
+	if !ok {
 		return false
-	})
+	}
+	if hasNoDeployedReleasesError(hr) {
+		return true
+	}
+	if hr.Spec.Suspend && r.ownsSuspension(hr) {
+		return true
+	}
+	// The fence is lifted in response to helm-controller's status update after the
+	// uninstall, which carries neither the error nor a flux-plunger suspension.
+	if controllerutil.ContainsFinalizer(hr, fenceFinalizer) {
+		return true
+	}
+	// A suspended release being deleted skips the Helm uninstall even when the
+	// suspension is someone else's and the release is healthy: Reconcile has to see it
+	// to record TerminatingWhileSuspended.
+	if hr.Spec.Suspend && !hr.DeletionTimestamp.IsZero() {
+		return true
+	}
+	return false
+}
 
+// SetupWithManager sets up the controller with the Manager
+func (r *FluxPlunger) SetupWithManager(mgr ctrl.Manager) error {
 	return ctrl.NewControllerManagedBy(mgr).
 		Named("fluxplunger").
 		For(&helmv2.HelmRelease{}).
-		WithEventFilter(pred).
+		WithEventFilter(predicate.NewPredicateFuncs(r.watchPredicate)).
 		Complete(r)
 }
diff --git a/internal/controller/fluxplunger/flux_plunger_test.go b/internal/controller/fluxplunger/flux_plunger_test.go
new file mode 100644
index 0000000000..91dbba869a
--- /dev/null
+++ b/internal/controller/fluxplunger/flux_plunger_test.go
@@ -0,0 +1,2081 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright 2026 The Cozystack Authors.
+
+package fluxplunger
+
+import (
+	"context"
+	"errors"
+	"strings"
+	"testing"
+	"time"
+
+	helmv2 "github.com/fluxcd/helm-controller/api/v2"
+	corev1 "k8s.io/api/core/v1"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apimachinery/pkg/types"
+	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
+	"k8s.io/client-go/tools/record"
+	ctrl "sigs.k8s.io/controller-runtime"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/client/fake"
+	"sigs.k8s.io/controller-runtime/pkg/client/interceptor"
+	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
+)
+
+const (
+	testNS   = "tenant-root"
+	testName = "vm-disk-0"
+	// helm-controller's finalizer; present on every reconciled HelmRelease and
+	// required by the fake client for any object carrying a deletionTimestamp.
+	helmFinalizer = "finalizers.fluxcd.io"
+)
+
+func testScheme(t *testing.T) *runtime.Scheme {
+	t.Helper()
+	s := runtime.NewScheme()
+	if err := clientgoscheme.AddToScheme(s); err != nil {
+		t.Fatalf("add client-go scheme: %v", err)
+	}
+	if err := helmv2.AddToScheme(s); err != nil {
+		t.Fatalf("add helm scheme: %v", err)
+	}
+	return s
+}
+
+// The controller-runtime fake client does not persist metadata.managedFields, so
+// the production ownership check (ownsSuspensionManagedFields, verified by
+// TestOwnsSuspensionManagedFields and the envtest suite) cannot be exercised
+// through it. Behavioural tests inject FluxPlunger.owns with testOwns, a stand-in
+// that reads a plain annotation the fake client DOES persist, and ssaModelApply
+// maintains that annotation with the same dynamics the apiserver gives
+// managedFields: set on flux-plunger's suspend apply, dropped on its relinquish.
+const testOwnedKey = "test.fluxplunger.cozystack.io/owned"
+
+func testOwns(hr *helmv2.HelmRelease) bool {
+	return hr.Annotations[testOwnedKey] == "true"
+}
+
+// ownedFixture marks a HelmRelease as suspended and owned by flux-plunger.
+func ownedFixture(hr *helmv2.HelmRelease) *helmv2.HelmRelease {
+	hr.Spec.Suspend = true
+	if hr.Annotations == nil {
+		hr.Annotations = map[string]string{}
+	}
+	hr.Annotations[testOwnedKey] = "true"
+	return hr
+}
+
+// newPlunger builds the reconciler with the injected test ownership check.
+func newPlunger(c client.Client) *FluxPlunger {
+	return &FluxPlunger{Client: c, owns: testOwns}
+}
+
+// suspendManagedFields builds a managedFields entry for the pure-unit test of the
+// real ownership check.
+func suspendManagedFields(manager string, op metav1.ManagedFieldsOperationType) []metav1.ManagedFieldsEntry {
+	return []metav1.ManagedFieldsEntry{{
+		Manager:    manager,
+		Operation:  op,
+		APIVersion: helmv2.GroupVersion.String(),
+		FieldsType: "FieldsV1",
+		FieldsV1:   &metav1.FieldsV1{Raw: []byte(`{"f:spec":{"f:suspend":{}}}`)},
+	}}
+}
+
+// noDeployedReleasesHR builds a HelmRelease stuck with the "has no deployed
+// releases" error that flux-plunger is meant to recover.
+func noDeployedReleasesHR() *helmv2.HelmRelease {
+	return &helmv2.HelmRelease{
+		ObjectMeta: metav1.ObjectMeta{
+			Namespace:  testNS,
+			Name:       testName,
+			Finalizers: []string{helmFinalizer},
+		},
+		Status: helmv2.HelmReleaseStatus{
+			Conditions: []metav1.Condition{{
+				Type:    "Ready",
+				Status:  metav1.ConditionFalse,
+				Reason:  "InstallFailed",
+				Message: "Helm install failed: " + errorMessageNoDeployedReleases,
+			}},
+		},
+	}
+}
+
+func helmReleaseSecret(version string) *corev1.Secret {
+	return &corev1.Secret{
+		ObjectMeta: metav1.ObjectMeta{
+			Namespace: testNS,
+			Name:      "sh.helm.release.v1." + testName + "." + version,
+			Labels: map[string]string{
+				"name":  testName,
+				"owner": "helm",
+			},
+		},
+		Type: "helm.sh/release.v1",
+	}
+}
+
+func getHR(t *testing.T, c client.Client) *helmv2.HelmRelease {
+	t.Helper()
+	hr := &helmv2.HelmRelease{}
+	if err := c.Get(context.Background(), types.NamespacedName{Namespace: testNS, Name: testName}, hr); err != nil {
+		t.Fatalf("get HelmRelease: %v", err)
+	}
+	return hr
+}
+
+// expectWarning drains the recorded events and fails unless one is a Warning with
+// the given reason.
+func expectWarning(t *testing.T, rec *record.FakeRecorder, reason string) {
+	t.Helper()
+	var seen []string
+	for {
+		select {
+		case e := <-rec.Events:
+			if strings.HasPrefix(e, corev1.EventTypeWarning+" "+reason+" ") {
+				return
+			}
+			seen = append(seen, e)
+		default:
+			t.Fatalf("expected a Warning %s event, got %q", reason, seen)
+		}
+	}
+}
+
+func reconcile(t *testing.T, r *FluxPlunger) {
+	t.Helper()
+	_, _ = r.Reconcile(context.Background(), ctrl.Request{
+		NamespacedName: types.NamespacedName{Namespace: testNS, Name: testName},
+	})
+}
+
+// ssaModelApply models, on the fake client, what a real apiserver does with a
+// flux-plunger server-side apply of spec.suspend, recorded via the test ownership
+// annotation instead of managedFields (which the fake client drops): apply
+// suspend=true and set the owned annotation; on the relinquish apply (suspend
+// omitted), revert suspend to false and drop the annotation. This is exactly the
+// dynamics the build-tagged envtest suite (ssa_ownership_envtest_test.go) proves
+// against a real apiserver: an apply of true takes ownership, and a sole-owner
+// relinquish reverts to false and drops the owner. Any other patch passes through
+// unchanged.
+//
+// LIMITATION: this models NET STATE only. It treats every flux-plunger apply that
+// carries suspend=false OR omits the field as "clear the suspension", so it cannot
+// distinguish a relinquish (omit) from a forced set-false — on a real apiserver a
+// relinquish leaves a value another manager owns unchanged, while a forced apply
+// moves it. A test that depends on that distinction must assert the request SHAPE
+// via plungerApplyDetail (present/value/force), not the resulting object; a test
+// that checks only the object state is blind to it and can pass against broken code.
+func ssaModelApply(ctx context.Context, cl client.WithWatch, obj client.Object, patch client.Patch, opts ...client.PatchOption) error {
+	po := &client.PatchOptions{}
+	po.ApplyOptions(opts)
+	suspend, isPlunger := plungerApplySuspend(obj, patch, po)
+	if !isPlunger {
+		return cl.Patch(ctx, obj, patch, opts...)
+	}
+	// Model the net effect with a plain Get+Update rather than the real SSA apply:
+	// the fake client's Apply strips unmanaged fields (it would drop a finalizer off
+	// a deleting object and garbage-collect it), which is a fake-client artefact, not
+	// apiserver behaviour. Get+Update preserves finalizers and status while applying
+	// exactly the suspend/ownership transition.
+	cur := &helmv2.HelmRelease{}
+	if err := cl.Get(ctx, client.ObjectKeyFromObject(obj), cur); err != nil {
+		return err
+	}
+	if cur.Annotations == nil {
+		cur.Annotations = map[string]string{}
+	}
+	switch {
+	case suspend:
+		cur.Spec.Suspend = true
+		cur.Annotations[testOwnedKey] = "true"
+	case cur.Annotations[testOwnedKey] == "true":
+		// Relinquishing a suspension flux-plunger owns reverts it; one another
+		// manager owns keeps its value.
+		cur.Spec.Suspend = false
+		delete(cur.Annotations, testOwnedKey)
+	}
+	// The fence finalizer follows the body, and, like the apiserver, a new
+	// finalizer cannot be added to an object that is being deleted.
+	wantFence := false
+	for _, f := range obj.GetFinalizers() {
+		if f == fenceFinalizer {
+			wantFence = true
+		}
+	}
+	hasFence := controllerutil.ContainsFinalizer(cur, fenceFinalizer)
+	if wantFence && !hasFence {
+		if !cur.DeletionTimestamp.IsZero() {
+			return apierrors.NewForbidden(schema.GroupResource{Group: "helm.toolkit.fluxcd.io", Resource: "helmreleases"},
+				cur.Name, errors.New("no new finalizers can be added if the object is being deleted"))
+		}
+		controllerutil.AddFinalizer(cur, fenceFinalizer)
+	}
+	if !wantFence && hasFence {
+		controllerutil.RemoveFinalizer(cur, fenceFinalizer)
+	}
+	return cl.Update(ctx, cur)
+}
+
+// plungerApplyDetail reports the shape of a flux-plunger spec.suspend apply so a
+// test can tell whether it forces ownership: acquire attempts an unforced apply
+// (present, value true, force false) first and forces (force true) only over a
+// field re-read as false. plungerApplySuspend does not expose the force flag; this
+// does.
+func plungerApplyDetail(obj client.Object, patch client.Patch, opts []client.PatchOption) (present, value, force, ok bool) {
+	po := &client.PatchOptions{}
+	po.ApplyOptions(opts)
+	u, isU := obj.(*unstructured.Unstructured)
+	if !isU || patch.Type() != types.ApplyPatchType || po.FieldManager != suspendFieldManager {
+		return false, false, false, false
+	}
+	val, found, _ := unstructured.NestedBool(u.Object, "spec", "suspend")
+	return found, val, po.Force != nil && *po.Force, true
+}
+
+// plungerApplySuspend reports whether a patch is flux-plunger's server-side apply
+// of spec.suspend (the production applySuspend sends an unstructured body carrying
+// only spec.suspend) and, if so, the applied value (false when the field is
+// omitted — the relinquish). The failure-injection tests use it to fail exactly
+// the suspend or the unsuspend step.
+func plungerApplySuspend(obj client.Object, patch client.Patch, po *client.PatchOptions) (suspend bool, ok bool) {
+	u, isU := obj.(*unstructured.Unstructured)
+	if !isU || patch.Type() != types.ApplyPatchType || po.FieldManager != suspendFieldManager {
+		return false, false
+	}
+	val, found, _ := unstructured.NestedBool(u.Object, "spec", "suspend")
+	return found && val, true
+}
+
+// isPlungerApply is the boolean form used where the test only cares about a
+// specific applied value.
+func isPlungerApply(obj client.Object, patch client.Patch, opts []client.PatchOption, suspend bool) bool {
+	po := &client.PatchOptions{}
+	po.ApplyOptions(opts)
+	got, ok := plungerApplySuspend(obj, patch, po)
+	return ok && got == suspend
+}
+
+// TestOwnsSuspensionManagedFields pins the production ownership predicate directly
+// on hand-crafted managedFields: only flux-plunger's own Apply of spec.suspend
+// counts, not an operator Update of the same field, nor an apply that manages
+// other fields. This is the check the behavioural tests inject a stand-in for.
+func TestOwnsSuspensionManagedFields(t *testing.T) {
+	cases := []struct {
+		name string
+		mf   []metav1.ManagedFieldsEntry
+		want bool
+	}{
+		{"plunger apply owns", suspendManagedFields(suspendFieldManager, metav1.ManagedFieldsOperationApply), true},
+		// Isolates the operation conjunct: same manager as the owning case but an
+		// Update, which only the Operation==Apply term rejects.
+		{"plunger update does not count", suspendManagedFields(suspendFieldManager, metav1.ManagedFieldsOperationUpdate), false},
+		{"operator update does not count", suspendManagedFields("kubectl", metav1.ManagedFieldsOperationUpdate), false},
+		{"another manager apply does not count", suspendManagedFields("helm-controller", metav1.ManagedFieldsOperationApply), false},
+		// fieldManager (flux-client-side-apply) is a SHARED client-side manager: the
+		// earlier flux-plunger releases, platform migrations and the tenant delete hook all
+		// set spec.suspend under it, so it does NOT identify flux-plunger — its
+		// ownership must never be read as flux-plunger's.
+		{"shared client-side manager does not count", suspendManagedFields(fieldManager, metav1.ManagedFieldsOperationUpdate), false},
+		{"no managed fields", nil, false},
+		{"plunger apply of other fields", []metav1.ManagedFieldsEntry{{
+			Manager: suspendFieldManager, Operation: metav1.ManagedFieldsOperationApply,
+			FieldsType: "FieldsV1", FieldsV1: &metav1.FieldsV1{Raw: []byte(`{"f:spec":{"f:chart":{}}}`)},
+		}}, false},
+	}
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			hr := &helmv2.HelmRelease{ObjectMeta: metav1.ObjectMeta{ManagedFields: tc.mf}}
+			if got := ownsSuspensionManagedFields(hr); got != tc.want {
+				t.Fatalf("ownsSuspensionManagedFields=%v want %v", got, tc.want)
+			}
+		})
+	}
+}
+
+// The normal recovery of a stuck release must delete the latest storage Secret,
+// record the processed version and leave the HelmRelease unsuspended and no
+// longer owned by flux-plunger.
+func TestReconcile_HappyPathRecovery(t *testing.T) {
+	hr := noDeployedReleasesHR()
+	secret := helmReleaseSecret("v3")
+
+	c := fake.NewClientBuilder().WithScheme(testScheme(t)).WithObjects(hr, secret).
+		WithInterceptorFuncs(interceptor.Funcs{Patch: ssaModelApply}).Build()
+	r := newPlunger(c)
+
+	reconcile(t, r)
+
+	got := getHR(t, c)
+	if got.Spec.Suspend {
+		t.Fatalf("recovery must end unsuspended, got suspend=true")
+	}
+	if testOwns(got) {
+		t.Fatalf("recovery must relinquish ownership of the suspension")
+	}
+	if got.Annotations[annotationLastProcessedVersion] != "3" {
+		t.Fatalf("recovery must record the processed version, got %q", got.Annotations[annotationLastProcessedVersion])
+	}
+	if err := c.Get(context.Background(), types.NamespacedName{Namespace: testNS, Name: secret.Name}, &corev1.Secret{}); !apierrors.IsNotFound(err) {
+		t.Fatalf("recovery must delete the latest Helm storage Secret, got err=%v", err)
+	}
+}
+
+// If the release is suspended by someone else between flux-plunger's initial
+// read and its own suspend write, recovery must abort without deleting the
+// storage Secret: flux-plunger does not own that suspension.
+func TestReconcile_AbortsWhenSuspendedConcurrently(t *testing.T) {
+	hr := noDeployedReleasesHR()
+	secret := helmReleaseSecret("v1")
+
+	hrGets := 0
+	c := fake.NewClientBuilder().WithScheme(testScheme(t)).
+		WithObjects(hr, secret).
+		WithInterceptorFuncs(interceptor.Funcs{
+			Get: func(ctx context.Context, cl client.WithWatch, key client.ObjectKey, obj client.Object, opts ...client.GetOption) error {
+				if err := cl.Get(ctx, key, obj, opts...); err != nil {
+					return err
+				}
+				// The first Get is the top-of-reconcile read (must see suspend=false
+				// so recovery starts). The second Get is suspendHelmRelease's re-fetch:
+				// simulate an external actor having suspended it meanwhile (no plunger
+				// ownership).
+				if h, ok := obj.(*helmv2.HelmRelease); ok {
+					hrGets++
+					if hrGets == 2 {
+						h.Spec.Suspend = true
+					}
+				}
+				return nil
+			},
+			Patch: ssaModelApply,
+		}).Build()
+	r := newPlunger(c)
+
+	reconcile(t, r)
+
+	if err := c.Get(context.Background(), types.NamespacedName{Namespace: testNS, Name: secret.Name}, &corev1.Secret{}); apierrors.IsNotFound(err) {
+		t.Fatalf("recovery must not delete the storage Secret when it did not acquire the suspension")
+	}
+}
+
+// If the release starts terminating after recovery already acquired the
+// suspension (the delete lands at the pre-delete re-check), recovery must leave
+// the storage Secret intact and clear its own suspension so helm-controller can
+// uninstall the release cleanly.
+func TestReconcile_TerminatingDuringRecoveryKeepsSecretAndClearsSuspension(t *testing.T) {
+	hr := noDeployedReleasesHR()
+	secret := helmReleaseSecret("v1")
+
+	hrGets := 0
+	c := fake.NewClientBuilder().WithScheme(testScheme(t)).
+		WithObjects(hr, secret).
+		WithInterceptorFuncs(interceptor.Funcs{
+			Get: func(ctx context.Context, cl client.WithWatch, key client.ObjectKey, obj client.Object, opts ...client.GetOption) error {
+				if err := cl.Get(ctx, key, obj, opts...); err != nil {
+					return err
+				}
+				// Gets 1-3 are the top read, suspendHelmRelease's re-fetch and the
+				// annotation re-fetch (all must see a live release so recovery starts and
+				// acquires). The 4th Get is releaseIsTerminating's pre-delete re-check:
+				// simulate the delete having landed by then.
+				if h, ok := obj.(*helmv2.HelmRelease); ok {
+					hrGets++
+					if hrGets >= 4 {
+						now := metav1.Now()
+						h.DeletionTimestamp = &now
+						h.Finalizers = []string{helmFinalizer}
+					}
+				}
+				return nil
+			},
+			Patch: ssaModelApply,
+		}).Build()
+	r := newPlunger(c)
+
+	reconcile(t, r)
+
+	if err := c.Get(context.Background(), types.NamespacedName{Namespace: testNS, Name: secret.Name}, &corev1.Secret{}); apierrors.IsNotFound(err) {
+		t.Fatalf("terminating recovery must leave the storage Secret for helm-controller to uninstall")
+	}
+	got := getHR(t, c)
+	if got.Spec.Suspend {
+		t.Fatalf("terminating recovery must clear the suspension so helm-controller can uninstall, got suspend=true")
+	}
+}
+
+// If the release starts terminating during recovery and clearing the suspension
+// then fails, recovery must requeue with an error rather than return success:
+// leaving an owned suspension on a terminating release is what makes
+// helm-controller skip the uninstall and orphan the resources.
+func TestReconcile_TerminatingDuringRecoveryRequeuesOnUnsuspendFailure(t *testing.T) {
+	hr := noDeployedReleasesHR()
+	secret := helmReleaseSecret("v1")
+
+	hrGets := 0
+	unsuspendApplies := 0
+	c := fake.NewClientBuilder().WithScheme(testScheme(t)).
+		WithObjects(hr, secret).
+		WithInterceptorFuncs(interceptor.Funcs{
+			Get: func(ctx context.Context, cl client.WithWatch, key client.ObjectKey, obj client.Object, opts ...client.GetOption) error {
+				if err := cl.Get(ctx, key, obj, opts...); err != nil {
+					return err
+				}
+				if h, ok := obj.(*helmv2.HelmRelease); ok {
+					hrGets++
+					if hrGets >= 4 {
+						now := metav1.Now()
+						h.DeletionTimestamp = &now
+						h.Finalizers = []string{helmFinalizer}
+					}
+				}
+				return nil
+			},
+			Patch: func(ctx context.Context, cl client.WithWatch, obj client.Object, patch client.Patch, opts ...client.PatchOption) error {
+				if isPlungerApply(obj, patch, opts, false) {
+					unsuspendApplies++
+					return errors.New("simulated unsuspend apply failure")
+				}
+				return ssaModelApply(ctx, cl, obj, patch, opts...)
+			},
+		}).Build()
+	rec := record.NewFakeRecorder(8)
+	r := newPlunger(c)
+	r.Recorder = rec
+
+	_, err := r.Reconcile(context.Background(), ctrl.Request{NamespacedName: types.NamespacedName{Namespace: testNS, Name: testName}})
+	if err == nil {
+		t.Fatalf("a failed unsuspend on a terminating release must requeue with an error, got nil")
+	}
+	// The returned error requeues the retry, so the deferred fallback must not make a
+	// second, redundant attempt (symmetric with the final-unsuspend path).
+	if unsuspendApplies != 1 {
+		t.Fatalf("want exactly 1 unsuspend attempt on the terminating path, got %d", unsuspendApplies)
+	}
+	expectWarning(t, rec, "UnsuspendFailed")
+}
+
+// If a delete arrives between the top-of-Reconcile deletion check and the
+// re-fetch inside suspendHelmRelease, recovery must abort without suspending the
+// now-terminating release or deleting its storage Secret.
+func TestReconcile_AbortsWhenDeletedConcurrently(t *testing.T) {
+	hr := noDeployedReleasesHR()
+	secret := helmReleaseSecret("v1")
+
+	hrGets := 0
+	c := fake.NewClientBuilder().WithScheme(testScheme(t)).
+		WithObjects(hr, secret).
+		WithInterceptorFuncs(interceptor.Funcs{
+			Get: func(ctx context.Context, cl client.WithWatch, key client.ObjectKey, obj client.Object, opts ...client.GetOption) error {
+				if err := cl.Get(ctx, key, obj, opts...); err != nil {
+					return err
+				}
+				if h, ok := obj.(*helmv2.HelmRelease); ok {
+					hrGets++
+					if hrGets == 2 {
+						now := metav1.Now()
+						h.DeletionTimestamp = &now
+						h.Finalizers = []string{helmFinalizer}
+					}
+				}
+				return nil
+			},
+			Patch: ssaModelApply,
+		}).Build()
+	r := newPlunger(c)
+
+	reconcile(t, r)
+
+	got := getHR(t, c)
+	if got.Spec.Suspend {
+		t.Fatalf("recovery must not suspend a release that started terminating, got suspend=true")
+	}
+	if err := c.Get(context.Background(), types.NamespacedName{Namespace: testNS, Name: secret.Name}, &corev1.Secret{}); apierrors.IsNotFound(err) {
+		t.Fatalf("recovery must not delete the storage Secret of a release that started terminating")
+	}
+}
+
+// A HelmRelease deleted while flux-plunger owns its suspension must have that
+// suspension cleared, otherwise helm-controller v1.5.x skips the uninstall.
+func TestReconcile_DeletionClearsPlungerSuspension(t *testing.T) {
+	hr := noDeployedReleasesHR()
+	ownedFixture(hr)
+	now := metav1.Now()
+	hr.DeletionTimestamp = &now
+
+	c := fake.NewClientBuilder().WithScheme(testScheme(t)).WithObjects(hr).
+		WithInterceptorFuncs(interceptor.Funcs{Patch: ssaModelApply}).Build()
+	r := newPlunger(c)
+
+	reconcile(t, r)
+
+	got := getHR(t, c)
+	if got.Spec.Suspend {
+		t.Fatalf("suspension must be cleared on a deleted HelmRelease so uninstall can proceed, got suspend=true")
+	}
+}
+
+// flux-plunger must never begin recovery (suspend) on a HelmRelease that is
+// already terminating.
+func TestReconcile_DoesNotSuspendTerminatingHelmRelease(t *testing.T) {
+	hr := noDeployedReleasesHR()
+	now := metav1.Now()
+	hr.DeletionTimestamp = &now
+
+	secret := helmReleaseSecret("v1")
+	c := fake.NewClientBuilder().WithScheme(testScheme(t)).WithObjects(hr, secret).
+		WithInterceptorFuncs(interceptor.Funcs{Patch: ssaModelApply}).Build()
+	r := newPlunger(c)
+
+	reconcile(t, r)
+
+	got := getHR(t, c)
+	if got.Spec.Suspend {
+		t.Fatalf("flux-plunger must not suspend a terminating HelmRelease, got suspend=true")
+	}
+	if err := c.Get(context.Background(), types.NamespacedName{Namespace: testNS, Name: secret.Name}, &corev1.Secret{}); err != nil {
+		t.Fatalf("flux-plunger must not touch the Helm storage Secret of a terminating release: %v", err)
+	}
+}
+
+// A recovery step that fails after flux-plunger has suspended the release must
+// not leave it suspended, or a later delete would skip the uninstall.
+func TestReconcile_FailedStepDoesNotLeaveSuspended(t *testing.T) {
+	hr := noDeployedReleasesHR()
+	secret := helmReleaseSecret("v1")
+
+	c := fake.NewClientBuilder().WithScheme(testScheme(t)).
+		WithObjects(hr, secret).
+		WithInterceptorFuncs(interceptor.Funcs{
+			Patch: ssaModelApply,
+			Delete: func(ctx context.Context, cl client.WithWatch, obj client.Object, opts ...client.DeleteOption) error {
+				if _, ok := obj.(*corev1.Secret); ok {
+					return errors.New("simulated secret delete failure")
+				}
+				return cl.Delete(ctx, obj, opts...)
+			},
+		}).Build()
+	r := newPlunger(c)
+
+	reconcile(t, r)
+
+	got := getHR(t, c)
+	if got.Spec.Suspend {
+		t.Fatalf("a failed recovery step must clear the suspension flux-plunger owns, got suspend=true")
+	}
+}
+
+// When a recovery step fails and the deferred unsuspend fails as well, flux-plunger
+// is left holding a suspension it cannot clear: the state in which a delete orphans
+// the release. That must surface as a Warning, not only a log line.
+func TestReconcile_DeferredUnsuspendFailureEmitsWarning(t *testing.T) {
+	hr := noDeployedReleasesHR()
+	secret := helmReleaseSecret("v1")
+
+	c := fake.NewClientBuilder().WithScheme(testScheme(t)).
+		WithObjects(hr, secret).
+		WithInterceptorFuncs(interceptor.Funcs{
+			Patch: func(ctx context.Context, cl client.WithWatch, obj client.Object, patch client.Patch, opts ...client.PatchOption) error {
+				if isPlungerApply(obj, patch, opts, false) {
+					return errors.New("simulated unsuspend apply failure")
+				}
+				return ssaModelApply(ctx, cl, obj, patch, opts...)
+			},
+			Delete: func(ctx context.Context, cl client.WithWatch, obj client.Object, opts ...client.DeleteOption) error {
+				if _, ok := obj.(*corev1.Secret); ok {
+					return errors.New("simulated secret delete failure")
+				}
+				return cl.Delete(ctx, obj, opts...)
+			},
+		}).Build()
+	rec := record.NewFakeRecorder(8)
+	r := newPlunger(c)
+	r.Recorder = rec
+
+	reconcile(t, r)
+
+	expectWarning(t, rec, "UnsuspendFailed")
+}
+
+// A suspension flux-plunger owns but never recorded progress for (recovery
+// crashed right after suspending) must be released on a later reconcile.
+func TestReconcile_ReleasesOwnedSuspensionWithoutProgress(t *testing.T) {
+	hr := noDeployedReleasesHR()
+	ownedFixture(hr)
+
+	c := fake.NewClientBuilder().WithScheme(testScheme(t)).WithObjects(hr).
+		WithInterceptorFuncs(interceptor.Funcs{Patch: ssaModelApply}).Build()
+	r := newPlunger(c)
+
+	reconcile(t, r)
+
+	got := getHR(t, c)
+	if got.Spec.Suspend {
+		t.Fatalf("a suspension flux-plunger owns with no recorded progress must be released, got suspend=true")
+	}
+}
+
+// A suspension flux-plunger does not own must be left untouched even when a stale
+// processed-version annotation happens to match the latest revision: the
+// annotation is never an ownership signal, only the managedFields owner is.
+func TestReconcile_LeavesExternalSuspensionWithStaleProcessedVersion(t *testing.T) {
+	hr := noDeployedReleasesHR()
+	hr.Spec.Suspend = true // suspended by an operator: not flux-plunger-owned
+	hr.Annotations = map[string]string{annotationLastProcessedVersion: "5"}
+	secret := helmReleaseSecret("v4")
+
+	c := fake.NewClientBuilder().WithScheme(testScheme(t)).WithObjects(hr, secret).
+		WithInterceptorFuncs(interceptor.Funcs{Patch: ssaModelApply}).Build()
+	r := newPlunger(c)
+
+	reconcile(t, r)
+
+	got := getHR(t, c)
+	if !got.Spec.Suspend {
+		t.Fatalf("a stale processed-version match must not be treated as ownership; operator suspension was cleared")
+	}
+}
+
+// Recovery must delete the LATEST (highest-version) storage Secret and record its
+// version, even when several historical revision Secrets are present.
+func TestReconcile_DeletesLatestOfMultipleSecrets(t *testing.T) {
+	hr := noDeployedReleasesHR()
+	oldest := helmReleaseSecret("v1")
+	middle := helmReleaseSecret("v2")
+	latest := helmReleaseSecret("v5")
+
+	c := fake.NewClientBuilder().WithScheme(testScheme(t)).WithObjects(hr, oldest, middle, latest).
+		WithInterceptorFuncs(interceptor.Funcs{Patch: ssaModelApply}).Build()
+	r := newPlunger(c)
+
+	reconcile(t, r)
+
+	if err := c.Get(context.Background(), types.NamespacedName{Namespace: testNS, Name: latest.Name}, &corev1.Secret{}); !apierrors.IsNotFound(err) {
+		t.Fatalf("recovery must delete the latest storage Secret (v5), err=%v", err)
+	}
+	for _, s := range []*corev1.Secret{oldest, middle} {
+		if err := c.Get(context.Background(), types.NamespacedName{Namespace: testNS, Name: s.Name}, &corev1.Secret{}); err != nil {
+			t.Fatalf("recovery must not delete a non-latest Secret (%s): %v", s.Name, err)
+		}
+	}
+	got := getHR(t, c)
+	if got.Annotations[annotationLastProcessedVersion] != "5" {
+		t.Fatalf("recovery must record the latest processed version 5, got %q", got.Annotations[annotationLastProcessedVersion])
+	}
+}
+
+// A HelmRelease that does not carry the "has no deployed releases" error must be
+// left entirely alone.
+func TestReconcile_SkipsReleaseWithoutTargetError(t *testing.T) {
+	hr := noDeployedReleasesHR()
+	hr.Status.Conditions[0].Message = "Helm upgrade failed: some unrelated error"
+	secret := helmReleaseSecret("v1")
+
+	c := fake.NewClientBuilder().WithScheme(testScheme(t)).WithObjects(hr, secret).
+		WithInterceptorFuncs(interceptor.Funcs{Patch: ssaModelApply}).Build()
+	r := newPlunger(c)
+
+	reconcile(t, r)
+
+	got := getHR(t, c)
+	if got.Spec.Suspend {
+		t.Fatalf("a release without the target error must not be suspended")
+	}
+	if err := c.Get(context.Background(), types.NamespacedName{Namespace: testNS, Name: secret.Name}, &corev1.Secret{}); apierrors.IsNotFound(err) {
+		t.Fatalf("a release without the target error must not have its storage Secret deleted")
+	}
+}
+
+// A HelmRelease with the target error but no Helm storage Secrets must be skipped
+// cleanly (pins the empty-list guard, without which getLatestSecret would panic).
+func TestReconcile_SkipsWhenNoStorageSecrets(t *testing.T) {
+	hr := noDeployedReleasesHR()
+
+	c := fake.NewClientBuilder().WithScheme(testScheme(t)).WithObjects(hr).
+		WithInterceptorFuncs(interceptor.Funcs{Patch: ssaModelApply}).Build()
+	r := newPlunger(c)
+
+	reconcile(t, r) // must not panic
+
+	got := getHR(t, c)
+	if got.Spec.Suspend {
+		t.Fatalf("a release with no storage Secrets must not be suspended")
+	}
+}
+
+// The "already processed" skip-guard: once a pass reclaimed a revision and
+// recorded the processed version, the next reconcile (latestVersion+1 ==
+// processedVersion) must NOT suspend or delete another Secret.
+func TestReconcile_SkipsWhenAlreadyProcessed(t *testing.T) {
+	hr := noDeployedReleasesHR()
+	hr.Annotations = map[string]string{annotationLastProcessedVersion: "5"}
+	secret := helmReleaseSecret("v4") // 4+1 == 5 (already processed)
+
+	c := fake.NewClientBuilder().WithScheme(testScheme(t)).WithObjects(hr, secret).
+		WithInterceptorFuncs(interceptor.Funcs{Patch: ssaModelApply}).Build()
+	r := newPlunger(c)
+
+	reconcile(t, r)
+
+	got := getHR(t, c)
+	if got.Spec.Suspend {
+		t.Fatalf("an already-processed release must not be suspended again, got suspend=true")
+	}
+	if err := c.Get(context.Background(), types.NamespacedName{Namespace: testNS, Name: secret.Name}, &corev1.Secret{}); apierrors.IsNotFound(err) {
+		t.Fatalf("an already-processed release must not have another storage Secret deleted")
+	}
+}
+
+// The converse of the skip-guard: a recorded version NOT exactly one above the
+// latest surviving revision means recovery must proceed (pins the off-by-one).
+func TestReconcile_ProcessesWhenProcessedVersionDoesNotMatch(t *testing.T) {
+	hr := noDeployedReleasesHR()
+	hr.Annotations = map[string]string{annotationLastProcessedVersion: "5"}
+	secret := helmReleaseSecret("v5") // 5+1 == 6 != 5, so NOT already processed
+
+	c := fake.NewClientBuilder().WithScheme(testScheme(t)).WithObjects(hr, secret).
+		WithInterceptorFuncs(interceptor.Funcs{Patch: ssaModelApply}).Build()
+	r := newPlunger(c)
+
+	reconcile(t, r)
+
+	if err := c.Get(context.Background(), types.NamespacedName{Namespace: testNS, Name: secret.Name}, &corev1.Secret{}); !apierrors.IsNotFound(err) {
+		t.Fatalf("a non-matching processed version must not skip recovery; the latest Secret should have been deleted, err=%v", err)
+	}
+	got := getHR(t, c)
+	if got.Annotations[annotationLastProcessedVersion] != "5" {
+		t.Fatalf("recovery must record the processed version 5, got %q", got.Annotations[annotationLastProcessedVersion])
+	}
+}
+
+// Deleting a release an operator suspended (flux-plunger does not own it) must
+// leave the suspension in place: the single most safety-relevant boundary,
+// enforced by the caller gate and the ownership check inside unsuspendHelmRelease.
+func TestReconcile_LeavesExternalSuspensionOnDeletion(t *testing.T) {
+	hr := noDeployedReleasesHR()
+	hr.Spec.Suspend = true // operator-owned: not flux-plunger
+	now := metav1.Now()
+	hr.DeletionTimestamp = &now
+
+	c := fake.NewClientBuilder().WithScheme(testScheme(t)).WithObjects(hr).
+		WithInterceptorFuncs(interceptor.Funcs{Patch: ssaModelApply}).Build()
+	r := newPlunger(c)
+
+	reconcile(t, r)
+
+	got := getHR(t, c)
+	if !got.Spec.Suspend {
+		t.Fatalf("flux-plunger must not clear an operator's suspension on deletion, got suspend=false")
+	}
+}
+
+// Releasing a stuck owned suspension (crash-recovery branch) must requeue on
+// failure, uniform with the other unsuspend call sites.
+func TestReconcile_SuspendedBranchRequeuesOnUnsuspendFailure(t *testing.T) {
+	hr := noDeployedReleasesHR()
+	ownedFixture(hr)
+
+	c := fake.NewClientBuilder().WithScheme(testScheme(t)).
+		WithObjects(hr).
+		WithInterceptorFuncs(interceptor.Funcs{
+			Patch: func(ctx context.Context, cl client.WithWatch, obj client.Object, patch client.Patch, opts ...client.PatchOption) error {
+				if isPlungerApply(obj, patch, opts, false) {
+					return errors.New("simulated unsuspend apply failure")
+				}
+				return ssaModelApply(ctx, cl, obj, patch, opts...)
+			},
+		}).Build()
+	rec := record.NewFakeRecorder(8)
+	r := newPlunger(c)
+	r.Recorder = rec
+
+	_, err := r.Reconcile(context.Background(), ctrl.Request{NamespacedName: types.NamespacedName{Namespace: testNS, Name: testName}})
+	if err == nil {
+		t.Fatalf("a failed unsuspend in the crash-recovery branch must requeue with an error, got nil")
+	}
+	expectWarning(t, rec, "UnsuspendFailed")
+}
+
+// A failing processed-version annotation write must requeue with an error.
+func TestReconcile_RecoveryRequeuesOnAnnotationFailure(t *testing.T) {
+	hr := noDeployedReleasesHR()
+	secret := helmReleaseSecret("v1")
+
+	c := fake.NewClientBuilder().WithScheme(testScheme(t)).
+		WithObjects(hr, secret).
+		WithInterceptorFuncs(interceptor.Funcs{
+			Patch: func(ctx context.Context, cl client.WithWatch, obj client.Object, patch client.Patch, opts ...client.PatchOption) error {
+				// Fail only the annotation patch (a merge patch carrying the
+				// processed-version annotation), not the suspend/unsuspend applies.
+				if h, ok := obj.(*helmv2.HelmRelease); ok && patch.Type() != types.ApplyPatchType && h.Annotations[annotationLastProcessedVersion] != "" {
+					return errors.New("simulated annotation patch failure")
+				}
+				return ssaModelApply(ctx, cl, obj, patch, opts...)
+			},
+		}).Build()
+	r := newPlunger(c)
+
+	_, err := r.Reconcile(context.Background(), ctrl.Request{NamespacedName: types.NamespacedName{Namespace: testNS, Name: testName}})
+	if err == nil {
+		t.Fatalf("a failed processed-version annotation write must requeue with an error, got nil")
+	}
+}
+
+// A failing final unsuspend on the recovery path must requeue with an error.
+func TestReconcile_RecoveryRequeuesOnUnsuspendFailure(t *testing.T) {
+	hr := noDeployedReleasesHR()
+	secret := helmReleaseSecret("v1")
+
+	c := fake.NewClientBuilder().WithScheme(testScheme(t)).
+		WithObjects(hr, secret).
+		WithInterceptorFuncs(interceptor.Funcs{
+			Patch: func(ctx context.Context, cl client.WithWatch, obj client.Object, patch client.Patch, opts ...client.PatchOption) error {
+				if isPlungerApply(obj, patch, opts, false) {
+					return errors.New("simulated unsuspend apply failure")
+				}
+				return ssaModelApply(ctx, cl, obj, patch, opts...)
+			},
+		}).Build()
+	rec := record.NewFakeRecorder(8)
+	r := newPlunger(c)
+	r.Recorder = rec
+
+	_, err := r.Reconcile(context.Background(), ctrl.Request{NamespacedName: types.NamespacedName{Namespace: testNS, Name: testName}})
+	if err == nil {
+		t.Fatalf("a failed final unsuspend on the recovery path must requeue with an error, got nil")
+	}
+	expectWarning(t, rec, "UnsuspendFailed")
+}
+
+// On a terminating release owned by flux-plunger, a failed unsuspend must requeue.
+func TestReconcile_DeletionRequeuesOnUnsuspendFailure(t *testing.T) {
+	hr := noDeployedReleasesHR()
+	ownedFixture(hr)
+	now := metav1.Now()
+	hr.DeletionTimestamp = &now
+
+	c := fake.NewClientBuilder().WithScheme(testScheme(t)).
+		WithObjects(hr).
+		WithInterceptorFuncs(interceptor.Funcs{
+			Patch: func(ctx context.Context, cl client.WithWatch, obj client.Object, patch client.Patch, opts ...client.PatchOption) error {
+				if isPlungerApply(obj, patch, opts, false) {
+					return errors.New("simulated unsuspend apply failure")
+				}
+				return ssaModelApply(ctx, cl, obj, patch, opts...)
+			},
+		}).Build()
+	rec := record.NewFakeRecorder(8)
+	r := newPlunger(c)
+	r.Recorder = rec
+
+	_, err := r.Reconcile(context.Background(), ctrl.Request{NamespacedName: types.NamespacedName{Namespace: testNS, Name: testName}})
+	if err == nil {
+		t.Fatalf("a failed unsuspend on a terminating release must requeue with an error, got nil")
+	}
+	expectWarning(t, rec, "UnsuspendFailed")
+}
+
+// A suspension flux-plunger does not own must be left untouched — including one an
+// operator owns via a client-side Update of spec.suspend (managedFields shows the
+// operator, not flux-plunger). This is the misattribution boundary, closed by the
+// apiserver transferring the field away from flux-plunger (proven end to end in
+// the envtest suite, V2/V3).
+func TestReconcile_LeavesExternalSuspensionUntouched(t *testing.T) {
+	hr := noDeployedReleasesHR()
+	hr.Spec.Suspend = true // operator-owned: no test ownership marker
+
+	c := fake.NewClientBuilder().WithScheme(testScheme(t)).WithObjects(hr).
+		WithInterceptorFuncs(interceptor.Funcs{Patch: ssaModelApply}).Build()
+	r := newPlunger(c)
+
+	reconcile(t, r)
+
+	got := getHR(t, c)
+	if !got.Spec.Suspend {
+		t.Fatalf("flux-plunger must not clear a suspension it does not own, got suspend=false")
+	}
+}
+
+// A delete that lands after flux-plunger acquires the suspension but before it
+// deletes the storage Secret must abort the delete and clear the suspension.
+func TestReconcile_AbortsWhenDeletedBeforeSecretDelete(t *testing.T) {
+	hr := noDeployedReleasesHR()
+	secret := helmReleaseSecret("v1")
+
+	c := fake.NewClientBuilder().WithScheme(testScheme(t)).
+		WithObjects(hr, secret).
+		WithInterceptorFuncs(interceptor.Funcs{
+			Get: func(ctx context.Context, cl client.WithWatch, key client.ObjectKey, obj client.Object, opts ...client.GetOption) error {
+				if err := cl.Get(ctx, key, obj, opts...); err != nil {
+					return err
+				}
+				// Inject a delete once the processed-version annotation this recovery
+				// just wrote is visible: that is the releaseIsTerminating re-fetch, right
+				// before the storage Secret delete.
+				if h, ok := obj.(*helmv2.HelmRelease); ok &&
+					h.Annotations[annotationLastProcessedVersion] != "" && h.DeletionTimestamp == nil {
+					now := metav1.Now()
+					h.DeletionTimestamp = &now
+					h.Finalizers = []string{helmFinalizer}
+				}
+				return nil
+			},
+			Patch: ssaModelApply,
+		}).Build()
+	r := newPlunger(c)
+
+	reconcile(t, r)
+
+	if err := c.Get(context.Background(), types.NamespacedName{Namespace: testNS, Name: secret.Name}, &corev1.Secret{}); apierrors.IsNotFound(err) {
+		t.Fatalf("recovery must not delete the storage Secret of a release that started terminating before the delete")
+	}
+	got := getHR(t, c)
+	if got.Spec.Suspend {
+		t.Fatalf("the suspension flux-plunger acquired must be cleared once the release starts terminating, got suspend=true")
+	}
+}
+
+// The processed-version annotation is recorded BEFORE the storage Secret is
+// deleted, so a failed annotation write must leave the Secret intact.
+func TestReconcile_AnnotationFailureLeavesSecretIntact(t *testing.T) {
+	hr := noDeployedReleasesHR()
+	secret := helmReleaseSecret("v1")
+
+	c := fake.NewClientBuilder().WithScheme(testScheme(t)).
+		WithObjects(hr, secret).
+		WithInterceptorFuncs(interceptor.Funcs{
+			Patch: func(ctx context.Context, cl client.WithWatch, obj client.Object, patch client.Patch, opts ...client.PatchOption) error {
+				if h, ok := obj.(*helmv2.HelmRelease); ok && patch.Type() != types.ApplyPatchType && h.Annotations[annotationLastProcessedVersion] != "" {
+					return errors.New("simulated annotation patch failure")
+				}
+				return ssaModelApply(ctx, cl, obj, patch, opts...)
+			},
+		}).Build()
+	r := newPlunger(c)
+
+	_, err := r.Reconcile(context.Background(), ctrl.Request{NamespacedName: types.NamespacedName{Namespace: testNS, Name: testName}})
+	if err == nil {
+		t.Fatalf("a failed processed-version write must requeue with an error, got nil")
+	}
+	if getErr := c.Get(context.Background(), types.NamespacedName{Namespace: testNS, Name: secret.Name}, &corev1.Secret{}); apierrors.IsNotFound(getErr) {
+		t.Fatalf("a failed annotation write must not delete the storage Secret (annotation is recorded before the delete)")
+	}
+}
+
+// unsuspendHelmRelease's own ownership re-check (defense-in-depth for a future
+// caller that forgets the caller-side gate): with suspend=true and no flux-plunger
+// ownership, a direct call sends no apply at all and leaves the suspension. The
+// apply count is what pins the guard; a relinquish could not clear another
+// manager's value anyway, so the resulting object alone would not.
+func TestUnsuspendHelmRelease_LeavesUnownedSuspension(t *testing.T) {
+	hr := noDeployedReleasesHR()
+	hr.Spec.Suspend = true // operator-owned: no flux-plunger managedFields
+
+	applies := 0
+	c := fake.NewClientBuilder().WithScheme(testScheme(t)).WithObjects(hr).
+		WithInterceptorFuncs(interceptor.Funcs{
+			Patch: func(ctx context.Context, cl client.WithWatch, obj client.Object, patch client.Patch, opts ...client.PatchOption) error {
+				if _, _, _, ok := plungerApplyDetail(obj, patch, opts); ok {
+					applies++
+				}
+				return ssaModelApply(ctx, cl, obj, patch, opts...)
+			},
+		}).Build()
+	r := newPlunger(c)
+
+	if err := r.unsuspendHelmRelease(context.Background(), hr); err != nil {
+		t.Fatalf("unsuspendHelmRelease must not error on an unowned suspension: %v", err)
+	}
+
+	if applies != 0 {
+		t.Fatalf("unsuspendHelmRelease must not apply on a suspension flux-plunger does not own, sent %d", applies)
+	}
+	if got := getHR(t, c); !got.Spec.Suspend {
+		t.Fatalf("unsuspendHelmRelease must not clear a suspension flux-plunger does not own (callee-side guard)")
+	}
+}
+
+// The watch predicate must wake a reconcile for the error state and for a
+// flux-plunger-owned suspension, and must NOT wake for an operator-owned
+// suspension or an unrelated release. This pins both terms of the predicate,
+// which nothing exercised before (SetupWithManager was never called in a test).
+func TestWatchPredicate(t *testing.T) {
+	r := &FluxPlunger{owns: testOwns}
+	withError := noDeployedReleasesHR()
+	ownedSuspended := ownedFixture(noDeployedReleasesHR())
+	ownedSuspended.Status.Conditions = nil // no error, only an owned suspension
+	externalSuspended := noDeployedReleasesHR()
+	externalSuspended.Status.Conditions = nil
+	externalSuspended.Spec.Suspend = true // suspended, not owned
+	quiet := noDeployedReleasesHR()
+	quiet.Status.Conditions = nil // no error, not suspended
+	// Owned marker but NOT suspended and no error: isolates the hr.Spec.Suspend
+	// conjunct. Dropping it from the predicate would wake on ownsSuspension alone and
+	// this case would (wrongly) match; with it, a release that is not suspended never
+	// matches on the suspension arm.
+	ownedNotSuspended := noDeployedReleasesHR()
+	ownedNotSuspended.Status.Conditions = nil
+	ownedNotSuspended.Annotations = map[string]string{testOwnedKey: "true"}
+	// A healthy release an operator or a migration suspended, now being deleted:
+	// neither the error arm nor the owned arm matches, yet this is the orphan state the
+	// TerminatingWhileSuspended Warning exists for, so it must wake a reconcile.
+	now := metav1.Now()
+	terminatingExternal := noDeployedReleasesHR()
+	terminatingExternal.Status.Conditions = nil
+	terminatingExternal.Spec.Suspend = true
+	terminatingExternal.DeletionTimestamp = &now
+	terminatingUnsuspended := noDeployedReleasesHR()
+	terminatingUnsuspended.Status.Conditions = nil
+	terminatingUnsuspended.DeletionTimestamp = &now
+	// Only the fence: the status write helm-controller makes after the uninstall
+	// carries no other signal, and it is what lets flux-plunger lift the fence.
+	fencedOnly := fencedFixture(noDeployedReleasesHR())
+	fencedOnly.Status.Conditions = nil
+
+	cases := []struct {
+		name string
+		obj  client.Object
+		want bool
+	}{
+		{"has target error", withError, true},
+		{"owned suspension, no error", ownedSuspended, true},
+		{"external suspension is ignored", externalSuspended, false},
+		{"no error and not suspended", quiet, false},
+		{"owned marker but not suspended", ownedNotSuspended, false},
+		{"terminating under an external suspension", terminatingExternal, true},
+		{"terminating and not suspended", terminatingUnsuspended, false},
+		{"fenced by flux-plunger", fencedOnly, true},
+		{"non-HelmRelease object", &corev1.Secret{}, false},
+	}
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			if got := r.watchPredicate(tc.obj); got != tc.want {
+				t.Fatalf("watchPredicate=%v want %v", got, tc.want)
+			}
+		})
+	}
+}
+
+// On the final-unsuspend-failure path recovery sets completed=true before
+// returning the error, so the deferred fallback does NOT run a second, redundant
+// unsuspend (the requeue covers the retry). Pin that: exactly one unsuspend apply
+// is attempted. Removing the completed=true makes the deferred fallback fire and
+// this count become 2.
+func TestReconcile_FinalUnsuspendFailureDoesNotRetryDeferred(t *testing.T) {
+	hr := noDeployedReleasesHR()
+	secret := helmReleaseSecret("v1")
+
+	unsuspendApplies := 0
+	c := fake.NewClientBuilder().WithScheme(testScheme(t)).
+		WithObjects(hr, secret).
+		WithInterceptorFuncs(interceptor.Funcs{
+			Patch: func(ctx context.Context, cl client.WithWatch, obj client.Object, patch client.Patch, opts ...client.PatchOption) error {
+				if isPlungerApply(obj, patch, opts, false) {
+					unsuspendApplies++
+					return errors.New("simulated unsuspend apply failure")
+				}
+				return ssaModelApply(ctx, cl, obj, patch, opts...)
+			},
+		}).Build()
+	r := newPlunger(c)
+
+	_, _ = r.Reconcile(context.Background(), ctrl.Request{NamespacedName: types.NamespacedName{Namespace: testNS, Name: testName}})
+	if unsuspendApplies != 1 {
+		t.Fatalf("a failed final unsuspend must not trigger the deferred retry; want 1 unsuspend attempt, got %d", unsuspendApplies)
+	}
+}
+
+// The pre-delete termination re-check must read the uncached APIReader, not the
+// informer cache: the cache can lag a delete the apiserver already accepted, and a
+// termination check that misses that delete would delete the storage Secret of a
+// terminating release and orphan it. Here the cached client sees a live release
+// while the APIReader sees the delete; releaseIsTerminating must report terminating.
+func TestReleaseIsTerminating_ReadsAPIReaderNotCache(t *testing.T) {
+	cached := noDeployedReleasesHR() // cache: not terminating
+	fresh := noDeployedReleasesHR()
+	now := metav1.Now()
+	fresh.DeletionTimestamp = &now // apiserver: delete already accepted
+	fresh.Finalizers = []string{helmFinalizer}
+
+	cachedClient := fake.NewClientBuilder().WithScheme(testScheme(t)).WithObjects(cached).Build()
+	apiReader := fake.NewClientBuilder().WithScheme(testScheme(t)).WithObjects(fresh).Build()
+	r := &FluxPlunger{Client: cachedClient, APIReader: apiReader, owns: testOwns}
+
+	terminating, err := r.releaseIsTerminating(context.Background(), cached)
+	if err != nil {
+		t.Fatalf("releaseIsTerminating: %v", err)
+	}
+	if !terminating {
+		t.Fatalf("releaseIsTerminating must read the uncached APIReader (delete already accepted), not the stale cache")
+	}
+}
+
+// The already-processed guard compares the processed-version annotation against the
+// latest storage Secret, and the Secret list is read from the apiserver. If the
+// annotation came from a lagging cache instead, a reconcile right after a finished
+// recovery would see the fresh "latest" (the revision below the one just deleted)
+// but the old annotation, fail the guard, and delete that revision too — walking the
+// release history down one Secret per reconcile. Here the cache has no annotation
+// while the apiserver records processed=5 over the surviving v4: recovery must not
+// start, so no suspend apply may be sent.
+func TestReconcile_ProcessedGuardReadsAPIReaderNotCache(t *testing.T) {
+	cached := noDeployedReleasesHR() // cache: annotation write not yet observed
+	fresh := noDeployedReleasesHR()
+	fresh.Annotations = map[string]string{annotationLastProcessedVersion: "5"}
+	secret := helmReleaseSecret("v4")
+
+	applies := 0
+	cachedClient := fake.NewClientBuilder().WithScheme(testScheme(t)).WithObjects(cached, secret).
+		WithInterceptorFuncs(interceptor.Funcs{
+			Patch: func(ctx context.Context, cl client.WithWatch, obj client.Object, patch client.Patch, opts ...client.PatchOption) error {
+				if isPlungerApply(obj, patch, opts, true) {
+					applies++
+				}
+				return ssaModelApply(ctx, cl, obj, patch, opts...)
+			},
+		}).Build()
+	apiReader := fake.NewClientBuilder().WithScheme(testScheme(t)).WithObjects(fresh, secret).Build()
+	r := &FluxPlunger{Client: cachedClient, APIReader: apiReader, owns: testOwns}
+
+	reconcile(t, r)
+
+	if applies != 0 {
+		t.Fatalf("the processed guard must read the apiserver: v4 is already processed (annotation 5), yet %d suspend apply was sent", applies)
+	}
+}
+
+// The storage-Secret List chooses which revision is deleted and which version the
+// processed annotation records, so it must read the uncached APIReader like every
+// other race-sensitive read: a cache lagging a just-created revision Secret would
+// pick a stale "latest" and delete the wrong revision. Here the cache is empty while
+// the APIReader sees the Secret; listHelmReleaseSecrets must return it.
+func TestListHelmReleaseSecrets_ReadsAPIReaderNotCache(t *testing.T) {
+	secret := helmReleaseSecret("v1")
+	cachedClient := fake.NewClientBuilder().WithScheme(testScheme(t)).Build() // cache: no secret
+	apiReader := fake.NewClientBuilder().WithScheme(testScheme(t)).WithObjects(secret).Build()
+	r := &FluxPlunger{Client: cachedClient, APIReader: apiReader, owns: testOwns}
+
+	got, err := r.listHelmReleaseSecrets(context.Background(), testNS, testName)
+	if err != nil {
+		t.Fatalf("listHelmReleaseSecrets: %v", err)
+	}
+	if len(got) != 1 {
+		t.Fatalf("listHelmReleaseSecrets must read the uncached APIReader (cache is empty); got %d secrets want 1", len(got))
+	}
+}
+
+// When flux-plunger declines to touch an externally-owned suspension it must emit
+// an Event, so an operator can see and alert on it instead of grepping logs.
+func TestReconcile_EmitsEventOnExternalSuspension(t *testing.T) {
+	hr := noDeployedReleasesHR()
+	hr.Spec.Suspend = true // suspended by an operator: not flux-plunger-owned
+
+	c := fake.NewClientBuilder().WithScheme(testScheme(t)).WithObjects(hr).
+		WithInterceptorFuncs(interceptor.Funcs{Patch: ssaModelApply}).Build()
+	rec := record.NewFakeRecorder(8)
+	r := &FluxPlunger{Client: c, owns: testOwns, Recorder: rec}
+
+	reconcile(t, r)
+
+	select {
+	case e := <-rec.Events:
+		if !strings.Contains(e, "SuspensionNotOwned") {
+			t.Fatalf("expected a SuspensionNotOwned event, got %q", e)
+		}
+	default:
+		t.Fatalf("declining an externally-owned suspension must emit an Event, got none")
+	}
+}
+
+// A suspension flux-plunger does not own on a release flux-plunger has recovered
+// before is most likely one an earlier flux-plunger left mid-recovery under the
+// shared field manager: it stays suspended for good unless someone acts, so it
+// is a Warning, while one on a release flux-plunger never touched stays Normal.
+func TestReconcile_ExternalSuspensionOnARecoveredReleaseWarns(t *testing.T) {
+	for _, tc := range []struct {
+		name      string
+		recovered bool
+		want      string
+	}{
+		{"recovered before", true, corev1.EventTypeWarning},
+		{"never recovered", false, corev1.EventTypeNormal},
+	} {
+		t.Run(tc.name, func(t *testing.T) {
+			hr := noDeployedReleasesHR()
+			hr.Spec.Suspend = true
+			if tc.recovered {
+				hr.Annotations = map[string]string{annotationLastProcessedVersion: "3"}
+			}
+			c := fake.NewClientBuilder().WithScheme(testScheme(t)).WithObjects(hr).
+				WithInterceptorFuncs(interceptor.Funcs{Patch: ssaModelApply}).Build()
+			rec := record.NewFakeRecorder(8)
+			r := &FluxPlunger{Client: c, owns: testOwns, Recorder: rec}
+
+			reconcile(t, r)
+
+			select {
+			case e := <-rec.Events:
+				if !strings.HasPrefix(e, tc.want+" SuspensionNotOwned") {
+					t.Fatalf("want a %s SuspensionNotOwned event, got %q", tc.want, e)
+				}
+			default:
+				t.Fatal("no event")
+			}
+		})
+	}
+}
+
+// A non-conflict error while acquiring the suspension must requeue with an error.
+func TestReconcile_SuspendFailureRequeuesOnNonConflictError(t *testing.T) {
+	hr := noDeployedReleasesHR()
+	secret := helmReleaseSecret("v1")
+
+	c := fake.NewClientBuilder().WithScheme(testScheme(t)).
+		WithObjects(hr, secret).
+		WithInterceptorFuncs(interceptor.Funcs{
+			Patch: func(ctx context.Context, cl client.WithWatch, obj client.Object, patch client.Patch, opts ...client.PatchOption) error {
+				if isPlungerApply(obj, patch, opts, true) {
+					return errors.New("simulated transient suspend failure")
+				}
+				return ssaModelApply(ctx, cl, obj, patch, opts...)
+			},
+		}).Build()
+	r := newPlunger(c)
+
+	_, err := r.Reconcile(context.Background(), ctrl.Request{NamespacedName: types.NamespacedName{Namespace: testNS, Name: testName}})
+	if err == nil {
+		t.Fatalf("a non-conflict suspend failure must requeue with an error, got nil")
+	}
+}
+
+// A conflict on the forced retry as well means another manager wrote the release
+// again after the re-read: the same race as a foreign suspension caught on the
+// unforced attempt, so it gets the same treatment: recovery is deferred with a
+// RecoveryDeferred Event and no error, instead of a rate-limited backoff whose
+// choice depends only on which of the two applies the write collided with. That
+// write is itself an update event, so the next reconcile follows. Nothing is
+// acquired, so the storage Secret stays intact.
+func TestReconcile_ForcedAcquireConflictDefers(t *testing.T) {
+	hr := noDeployedReleasesHR()
+	secret := helmReleaseSecret("v1")
+
+	c := fake.NewClientBuilder().WithScheme(testScheme(t)).
+		WithObjects(hr, secret).
+		WithInterceptorFuncs(interceptor.Funcs{
+			Patch: func(ctx context.Context, cl client.WithWatch, obj client.Object, patch client.Patch, opts ...client.PatchOption) error {
+				// Conflict on every acquire apply, forced included: a foreign write lands
+				// before each attempt.
+				if isPlungerApply(obj, patch, opts, true) {
+					return apierrors.NewConflict(
+						schema.GroupResource{Group: "helm.toolkit.fluxcd.io", Resource: "helmreleases"},
+						testName, errors.New("the object has been modified"))
+				}
+				return ssaModelApply(ctx, cl, obj, patch, opts...)
+			},
+		}).Build()
+	rec := record.NewFakeRecorder(8)
+	r := &FluxPlunger{Client: c, owns: testOwns, Recorder: rec}
+
+	_, err := r.Reconcile(context.Background(), ctrl.Request{NamespacedName: types.NamespacedName{Namespace: testNS, Name: testName}})
+	if err != nil {
+		t.Fatalf("a conflict on the forced acquire must defer recovery, not requeue with an error: %v", err)
+	}
+	select {
+	case e := <-rec.Events:
+		if !strings.Contains(e, "RecoveryDeferred") {
+			t.Fatalf("expected a RecoveryDeferred event, got %q", e)
+		}
+	default:
+		t.Fatalf("a conflict on the forced acquire must emit RecoveryDeferred, got no event")
+	}
+	if getErr := c.Get(context.Background(), types.NamespacedName{Namespace: testNS, Name: secret.Name}, &corev1.Secret{}); apierrors.IsNotFound(getErr) {
+		t.Fatalf("a conflicted suspend acquires nothing, so it must not delete the storage Secret")
+	}
+}
+
+// A non-conflict failure of the forced acquire (an admission webhook rejecting it,
+// or an API error) produces no follow-up event, so it must requeue with an error
+// rather than be treated as a deferral.
+func TestReconcile_ForcedAcquireNonConflictErrorRequeues(t *testing.T) {
+	hr := noDeployedReleasesHR()
+	secret := helmReleaseSecret("v1")
+
+	conflicted := false
+	c := fake.NewClientBuilder().WithScheme(testScheme(t)).WithObjects(hr, secret).
+		WithInterceptorFuncs(interceptor.Funcs{
+			Patch: func(ctx context.Context, cl client.WithWatch, obj client.Object, patch client.Patch, opts ...client.PatchOption) error {
+				present, value, force, ok := plungerApplyDetail(obj, patch, opts)
+				if ok && present && value && !force && !conflicted {
+					conflicted = true
+					return apierrors.NewConflict(
+						schema.GroupResource{Group: "helm.toolkit.fluxcd.io", Resource: "helmreleases"},
+						testName, errors.New("stale ownership at false"))
+				}
+				if ok && present && value && force {
+					return apierrors.NewForbidden(
+						schema.GroupResource{Group: "helm.toolkit.fluxcd.io", Resource: "helmreleases"},
+						testName, errors.New("admission webhook denied the request"))
+				}
+				return ssaModelApply(ctx, cl, obj, patch, opts...)
+			},
+		}).Build()
+	r := newPlunger(c)
+
+	_, err := r.Reconcile(context.Background(), ctrl.Request{NamespacedName: types.NamespacedName{Namespace: testNS, Name: testName}})
+	if err == nil {
+		t.Fatalf("a non-conflict failure of the forced acquire must requeue with an error, got nil")
+	}
+}
+
+// Acquire re-fetches on conflict and forces ONLY over a field still read as false.
+// Here the conflicting write suspended the release (an operator, or a backup
+// mid-restore): the re-fetch sees suspend=true, so acquire must abort WITHOUT a
+// forced apply and must not delete the storage Secret.
+func TestReconcile_AcquireDoesNotForceActiveForeignSuspension(t *testing.T) {
+	hr := noDeployedReleasesHR()
+	secret := helmReleaseSecret("v1")
+
+	var sawForce bool
+	c := fake.NewClientBuilder().WithScheme(testScheme(t)).WithObjects(hr, secret).
+		WithInterceptorFuncs(interceptor.Funcs{
+			Patch: func(ctx context.Context, cl client.WithWatch, obj client.Object, patch client.Patch, opts ...client.PatchOption) error {
+				present, value, force, ok := plungerApplyDetail(obj, patch, opts)
+				if ok && present && value && force {
+					sawForce = true
+				}
+				// The unforced acquire loses the race: a foreign manager suspends the
+				// release, then our apply conflicts. Model both: write suspend=true to the
+				// store so the post-conflict re-fetch sees it, then return the conflict.
+				if ok && present && value && !force {
+					cur := &helmv2.HelmRelease{}
+					if err := cl.Get(ctx, client.ObjectKeyFromObject(obj), cur); err != nil {
+						return err
+					}
+					cur.Spec.Suspend = true
+					if err := cl.Update(ctx, cur); err != nil {
+						return err
+					}
+					return apierrors.NewConflict(
+						schema.GroupResource{Group: "helm.toolkit.fluxcd.io", Resource: "helmreleases"},
+						testName, errors.New("foreign suspend won the race"))
+				}
+				return ssaModelApply(ctx, cl, obj, patch, opts...)
+			},
+		}).Build()
+	r := newPlunger(c)
+
+	reconcile(t, r)
+
+	if sawForce {
+		t.Fatalf("acquire must not force over a suspension it re-read as active (true)")
+	}
+	if getErr := c.Get(context.Background(), types.NamespacedName{Namespace: testNS, Name: secret.Name}, &corev1.Secret{}); apierrors.IsNotFound(getErr) {
+		t.Fatalf("an aborted acquire must not delete the storage Secret")
+	}
+}
+
+// The complementary case: the conflict came from a manager owning spec.suspend at
+// FALSE (a backup controller that resumed, or an earlier flux-plunger release). The re-fetch
+// sees suspend=false, so acquire forces over the stale ownership and recovery
+// proceeds — the storage Secret is deleted.
+func TestReconcile_AcquireForcesStaleForeignSuspension(t *testing.T) {
+	hr := noDeployedReleasesHR()
+	secret := helmReleaseSecret("v1")
+
+	var sawForce bool
+	conflicted := false
+	c := fake.NewClientBuilder().WithScheme(testScheme(t)).WithObjects(hr, secret).
+		WithInterceptorFuncs(interceptor.Funcs{
+			Patch: func(ctx context.Context, cl client.WithWatch, obj client.Object, patch client.Patch, opts ...client.PatchOption) error {
+				present, value, force, ok := plungerApplyDetail(obj, patch, opts)
+				// The unforced acquire conflicts once (foreign manager owns the field at
+				// false); the value is left false, so the re-fetch reads false.
+				if ok && present && value && !force && !conflicted {
+					conflicted = true
+					return apierrors.NewConflict(
+						schema.GroupResource{Group: "helm.toolkit.fluxcd.io", Resource: "helmreleases"},
+						testName, errors.New("stale ownership at false"))
+				}
+				if ok && present && value && force {
+					sawForce = true
+				}
+				return ssaModelApply(ctx, cl, obj, patch, opts...)
+			},
+		}).Build()
+	r := newPlunger(c)
+
+	reconcile(t, r)
+
+	if !sawForce {
+		t.Fatalf("acquire must force over stale ownership re-read as false; no forced apply seen")
+	}
+	if getErr := c.Get(context.Background(), types.NamespacedName{Namespace: testNS, Name: secret.Name}, &corev1.Secret{}); !apierrors.IsNotFound(getErr) {
+		t.Fatalf("after forcing acquisition recovery must delete the storage Secret")
+	}
+}
+
+// Both acquire applies, the unforced first attempt and the forced retry, must carry
+// the resourceVersion of the read that decided spec.suspend was false, so the
+// apiserver rejects either with a conflict if another manager wrote the release in
+// between. Without it the unforced apply of true over a foreign true is accepted as
+// shared ownership and flux-plunger proceeds as if it had acquired a suspension a
+// restore is holding. Pin that each is preconditioned on the stored resourceVersion.
+func TestReconcile_AcquireAppliesCarryResourceVersion(t *testing.T) {
+	hr := noDeployedReleasesHR()
+	secret := helmReleaseSecret("v1")
+
+	conflicted := false
+	var sawUnforced, sawForce bool
+	c := fake.NewClientBuilder().WithScheme(testScheme(t)).WithObjects(hr, secret).
+		WithInterceptorFuncs(interceptor.Funcs{
+			Patch: func(ctx context.Context, cl client.WithWatch, obj client.Object, patch client.Patch, opts ...client.PatchOption) error {
+				present, value, force, ok := plungerApplyDetail(obj, patch, opts)
+				if ok && present && value {
+					cur := &helmv2.HelmRelease{}
+					if err := cl.Get(ctx, client.ObjectKeyFromObject(obj), cur); err != nil {
+						return err
+					}
+					if got := obj.GetResourceVersion(); got == "" || got != cur.ResourceVersion {
+						t.Fatalf("acquire apply (force=%v) must be preconditioned on the read resourceVersion %q, got %q", force, cur.ResourceVersion, got)
+					}
+					if !controllerutil.ContainsFinalizer(obj, fenceFinalizer) {
+						t.Fatalf("acquire apply (force=%v) must carry the fence finalizer, got %v", force, obj.GetFinalizers())
+					}
+				}
+				if ok && present && value && !force && !conflicted {
+					sawUnforced = true
+					conflicted = true
+					return apierrors.NewConflict(
+						schema.GroupResource{Group: "helm.toolkit.fluxcd.io", Resource: "helmreleases"},
+						testName, errors.New("stale ownership at false"))
+				}
+				if ok && present && value && force {
+					sawForce = true
+				}
+				return ssaModelApply(ctx, cl, obj, patch, opts...)
+			},
+		}).Build()
+	r := newPlunger(c)
+
+	reconcile(t, r)
+
+	if !sawUnforced || !sawForce {
+		t.Fatalf("expected an unforced then a forced acquire; unforced=%v forced=%v", sawUnforced, sawForce)
+	}
+}
+
+// A delete that lands while the unforced acquire is conflicting must stop the
+// forced retry: suspending a terminating release is what makes helm-controller skip
+// the uninstall. The re-read after the conflict sees the deletionTimestamp, so no
+// forced apply may be sent and the storage Secret stays intact.
+func TestReconcile_AcquireAbortsWhenTerminatingAfterConflict(t *testing.T) {
+	hr := noDeployedReleasesHR()
+	secret := helmReleaseSecret("v1")
+
+	var sawForce bool
+	c := fake.NewClientBuilder().WithScheme(testScheme(t)).WithObjects(hr, secret).
+		WithInterceptorFuncs(interceptor.Funcs{
+			Patch: func(ctx context.Context, cl client.WithWatch, obj client.Object, patch client.Patch, opts ...client.PatchOption) error {
+				present, value, force, ok := plungerApplyDetail(obj, patch, opts)
+				if ok && present && value && force {
+					sawForce = true
+				}
+				if ok && present && value && !force {
+					// The release is deleted (it keeps helm-controller's finalizer, so it
+					// becomes terminating) and the unforced acquire conflicts.
+					cur := &helmv2.HelmRelease{}
+					if err := cl.Get(ctx, client.ObjectKeyFromObject(obj), cur); err != nil {
+						return err
+					}
+					if err := cl.Delete(ctx, cur); err != nil {
+						return err
+					}
+					return apierrors.NewConflict(
+						schema.GroupResource{Group: "helm.toolkit.fluxcd.io", Resource: "helmreleases"},
+						testName, errors.New("stale ownership at false"))
+				}
+				return ssaModelApply(ctx, cl, obj, patch, opts...)
+			},
+		}).Build()
+	r := newPlunger(c)
+
+	reconcile(t, r)
+
+	if sawForce {
+		t.Fatalf("acquire must not force a suspension onto a release that began terminating during the conflict")
+	}
+	if getErr := c.Get(context.Background(), types.NamespacedName{Namespace: testNS, Name: secret.Name}, &corev1.Secret{}); apierrors.IsNotFound(getErr) {
+		t.Fatalf("an aborted acquire must not delete the storage Secret")
+	}
+}
+
+// A release terminating while suspended by a manager flux-plunger does NOT own is
+// the orphan state itself; flux-plunger cannot clear it but must surface it with a
+// Warning Event, not only a log line, so an operator can intervene.
+func TestReconcile_EmitsEventOnTerminatingExternalSuspension(t *testing.T) {
+	hr := noDeployedReleasesHR()
+	hr.Spec.Suspend = true // suspended by an external manager: not flux-plunger-owned
+	now := metav1.Now()
+	hr.DeletionTimestamp = &now
+
+	c := fake.NewClientBuilder().WithScheme(testScheme(t)).WithObjects(hr).
+		WithInterceptorFuncs(interceptor.Funcs{Patch: ssaModelApply}).Build()
+	rec := record.NewFakeRecorder(8)
+	r := &FluxPlunger{Client: c, owns: testOwns, Recorder: rec}
+
+	reconcile(t, r)
+
+	select {
+	case e := <-rec.Events:
+		if !strings.Contains(e, "TerminatingWhileSuspended") {
+			t.Fatalf("expected a TerminatingWhileSuspended event, got %q", e)
+		}
+	default:
+		t.Fatalf("a terminating release under an external suspension must emit an Event, got none")
+	}
+}
+
+// When recovery is deferred because the suspension was taken by another manager
+// between read and write, flux-plunger must emit an Event, symmetric with the
+// externally-owned-suspension branch, not only log.
+func TestReconcile_EmitsEventOnDeferredRecovery(t *testing.T) {
+	hr := noDeployedReleasesHR()
+	secret := helmReleaseSecret("v1")
+
+	c := fake.NewClientBuilder().WithScheme(testScheme(t)).WithObjects(hr, secret).
+		WithInterceptorFuncs(interceptor.Funcs{
+			Patch: func(ctx context.Context, cl client.WithWatch, obj client.Object, patch client.Patch, opts ...client.PatchOption) error {
+				// The unforced acquire loses the race to a foreign suspension.
+				if present, value, force, ok := plungerApplyDetail(obj, patch, opts); ok && present && value && !force {
+					cur := &helmv2.HelmRelease{}
+					if err := cl.Get(ctx, client.ObjectKeyFromObject(obj), cur); err != nil {
+						return err
+					}
+					cur.Spec.Suspend = true
+					if err := cl.Update(ctx, cur); err != nil {
+						return err
+					}
+					return apierrors.NewConflict(
+						schema.GroupResource{Group: "helm.toolkit.fluxcd.io", Resource: "helmreleases"},
+						testName, errors.New("foreign suspend won the race"))
+				}
+				return ssaModelApply(ctx, cl, obj, patch, opts...)
+			},
+		}).Build()
+	rec := record.NewFakeRecorder(8)
+	r := &FluxPlunger{Client: c, owns: testOwns, Recorder: rec}
+
+	reconcile(t, r)
+
+	select {
+	case e := <-rec.Events:
+		if !strings.Contains(e, "RecoveryDeferred") {
+			t.Fatalf("expected a RecoveryDeferred event, got %q", e)
+		}
+	default:
+		t.Fatalf("a deferred recovery must emit an Event, got none")
+	}
+}
+
+// fencedFixture marks a HelmRelease as held by flux-plunger's fence finalizer.
+func fencedFixture(hr *helmv2.HelmRelease) *helmv2.HelmRelease {
+	controllerutil.AddFinalizer(hr, fenceFinalizer)
+	return hr
+}
+
+// terminatingFixture marks a HelmRelease as deleted; the fake client keeps it only
+// while a finalizer remains.
+func terminatingFixture(hr *helmv2.HelmRelease) *helmv2.HelmRelease {
+	now := metav1.Now()
+	hr.DeletionTimestamp = &now
+	return hr
+}
+
+// hrExists reports whether the test HelmRelease is still stored.
+func hrExists(t *testing.T, c client.Client) (*helmv2.HelmRelease, bool) {
+	t.Helper()
+	hr := &helmv2.HelmRelease{}
+	err := c.Get(context.Background(), types.NamespacedName{Namespace: testNS, Name: testName}, hr)
+	if apierrors.IsNotFound(err) {
+		return nil, false
+	}
+	if err != nil {
+		t.Fatalf("get HelmRelease: %v", err)
+	}
+	return hr, true
+}
+
+// The acquire must set the fence in the same apply as the suspension, on both
+// attempts, so there is no moment at which flux-plunger holds a suspension a delete
+// could slip past. A completed recovery lifts both together.
+func TestReconcile_AcquireSetsFenceWithSuspension(t *testing.T) {
+	hr := noDeployedReleasesHR()
+	secret := helmReleaseSecret("v1")
+
+	acquires := 0
+	c := fake.NewClientBuilder().WithScheme(testScheme(t)).WithObjects(hr, secret).
+		WithInterceptorFuncs(interceptor.Funcs{
+			Patch: func(ctx context.Context, cl client.WithWatch, obj client.Object, patch client.Patch, opts ...client.PatchOption) error {
+				if present, value, _, ok := plungerApplyDetail(obj, patch, opts); ok && present && value {
+					acquires++
+					if !controllerutil.ContainsFinalizer(obj, fenceFinalizer) {
+						t.Fatalf("the acquire apply must carry the fence finalizer, got finalizers %v", obj.GetFinalizers())
+					}
+				}
+				return ssaModelApply(ctx, cl, obj, patch, opts...)
+			},
+		}).Build()
+	r := newPlunger(c)
+
+	reconcile(t, r)
+
+	if acquires == 0 {
+		t.Fatalf("expected an acquire apply")
+	}
+	got, ok := hrExists(t, c)
+	if !ok {
+		t.Fatalf("a completed recovery must leave the release in place")
+	}
+	if got.Spec.Suspend || controllerutil.ContainsFinalizer(got, fenceFinalizer) {
+		t.Fatalf("a completed recovery must lift both the suspension and the fence; suspend=%v finalizers=%v", got.Spec.Suspend, got.Finalizers)
+	}
+}
+
+// A delete on a release flux-plunger holds suspended must lift the suspension but
+// keep the fence: helm-controller may already have dropped its own finalizer
+// without an uninstall, and the fence is what keeps the object until it reconciles
+// the unsuspended release.
+func TestReconcile_TerminatingOwnedSuspensionKeepsFence(t *testing.T) {
+	hr := terminatingFixture(fencedFixture(ownedFixture(noDeployedReleasesHR())))
+	// The state observed on a live helm-controller v1.5.0 right after it handled the
+	// delete of the suspended release: its finalizer is gone and it has observed the
+	// current generation, yet nothing was uninstalled. The fence must not be lifted
+	// on that; only the suspension is.
+	hr.Finalizers = []string{fenceFinalizer}
+	hr.Generation = 3
+	hr.Status.ObservedGeneration = 3
+
+	c := fake.NewClientBuilder().WithScheme(testScheme(t)).WithObjects(hr).
+		WithInterceptorFuncs(interceptor.Funcs{Patch: ssaModelApply}).Build()
+	r := newPlunger(c)
+
+	reconcile(t, r)
+
+	got, ok := hrExists(t, c)
+	if !ok {
+		t.Fatalf("the fence must keep a terminating release until the uninstall runs")
+	}
+	if got.Spec.Suspend {
+		t.Fatalf("the suspension must be lifted so helm-controller uninstalls")
+	}
+	if !controllerutil.ContainsFinalizer(got, fenceFinalizer) {
+		t.Fatalf("the fence must stay until helm-controller has handled the unsuspended release")
+	}
+}
+
+// uninstallReached is the condition for lifting the fence: helm-controller's
+// finalizer gone AND the latest generation observed. Each conjunct on its own is
+// not enough: the finalizer is also dropped, without an uninstall, while the
+// release is suspended.
+func TestUninstallReached(t *testing.T) {
+	mk := func(helmFinalizer bool, gen, observed int64) *helmv2.HelmRelease {
+		hr := noDeployedReleasesHR()
+		hr.Finalizers = nil
+		if helmFinalizer {
+			hr.Finalizers = []string{helmv2.HelmReleaseFinalizer}
+		}
+		hr.Generation = gen
+		hr.Status.ObservedGeneration = observed
+		return hr
+	}
+	cases := []struct {
+		name string
+		hr   *helmv2.HelmRelease
+		want bool
+	}{
+		{"finalizer gone and generation observed", mk(false, 4, 4), true},
+		{"finalizer gone, unsuspended generation not yet observed", mk(false, 4, 3), false},
+		{"generation observed, finalizer still held", mk(true, 4, 4), false},
+	}
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			if got := uninstallReached(tc.hr); got != tc.want {
+				t.Fatalf("uninstallReached=%v want %v", got, tc.want)
+			}
+		})
+	}
+}
+
+// Once helm-controller has handled the unsuspended release the fence is lifted and
+// the release goes; until then it stays.
+func TestReconcile_LiftsFenceOnlyOnceUninstallReached(t *testing.T) {
+	cases := []struct {
+		name     string
+		observed int64
+		wantGone bool
+	}{
+		{"uninstall reached", 4, true},
+		{"unsuspended generation not yet observed", 3, false},
+	}
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			hr := terminatingFixture(noDeployedReleasesHR())
+			hr.Finalizers = []string{fenceFinalizer}
+			hr.Generation = 4
+			hr.Status.ObservedGeneration = tc.observed
+
+			c := fake.NewClientBuilder().WithScheme(testScheme(t)).WithObjects(hr).
+				WithInterceptorFuncs(interceptor.Funcs{Patch: ssaModelApply}).Build()
+			r := newPlunger(c)
+
+			reconcile(t, r)
+
+			if _, exists := hrExists(t, c); exists == tc.wantGone {
+				t.Fatalf("release exists=%v, want gone=%v", exists, tc.wantGone)
+			}
+		})
+	}
+}
+
+// A release being deleted under another manager's suspension is that manager's
+// decision (a migration suspends then deletes to leave the resources in place):
+// flux-plunger must not keep the object with its fence, must leave the suspension
+// alone, and records it.
+func TestReconcile_TerminatingForeignSuspensionReleasesFence(t *testing.T) {
+	hr := terminatingFixture(fencedFixture(noDeployedReleasesHR()))
+	hr.Spec.Suspend = true // not flux-plunger's
+
+	c := fake.NewClientBuilder().WithScheme(testScheme(t)).WithObjects(hr).
+		WithInterceptorFuncs(interceptor.Funcs{Patch: ssaModelApply}).Build()
+	rec := record.NewFakeRecorder(8)
+	r := &FluxPlunger{Client: c, owns: testOwns, Recorder: rec}
+
+	reconcile(t, r)
+
+	got, ok := hrExists(t, c)
+	if !ok {
+		t.Fatalf("helm-controller's finalizer still holds the release in this fixture")
+	}
+	if controllerutil.ContainsFinalizer(got, fenceFinalizer) {
+		t.Fatalf("the fence must not hold a release under another manager's suspension")
+	}
+	if !got.Spec.Suspend {
+		t.Fatalf("another manager's suspension must be left alone")
+	}
+	select {
+	case e := <-rec.Events:
+		if !strings.HasPrefix(e, corev1.EventTypeNormal+" TerminatingWhileSuspended ") {
+			t.Fatalf("expected a Normal TerminatingWhileSuspended event, got %q", e)
+		}
+	default:
+		t.Fatalf("expected a TerminatingWhileSuspended event, got none")
+	}
+}
+
+// A fenced, terminating, unsuspended release that helm-controller has not handled
+// yet is held by flux-plunger's fence. That hold must not be silent: the reconcile
+// requeues itself so it is re-checked without waiting for an event, and once the
+// delete has been held past the deadline it raises a Warning an operator can find
+// before a `kubectl delete` that never returns.
+func TestReconcile_HeldFenceRequeuesAndWarnsPastTheDeadline(t *testing.T) {
+	deletedAt := time.Date(2026, 9, 25, 10, 0, 0, 0, time.UTC)
+	cases := []struct {
+		name     string
+		since    time.Duration
+		wantWarn bool
+	}{
+		{"within the deadline", time.Minute, false},
+		{"past the deadline", fenceHeldWarnAfter + time.Minute, true},
+	}
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			hr := noDeployedReleasesHR()
+			hr.Finalizers = []string{fenceFinalizer}
+			hr.DeletionTimestamp = &metav1.Time{Time: deletedAt}
+			hr.Generation = 4
+			hr.Status.ObservedGeneration = 3 // the unsuspended generation not yet handled
+
+			c := fake.NewClientBuilder().WithScheme(testScheme(t)).WithObjects(hr).
+				WithInterceptorFuncs(interceptor.Funcs{Patch: ssaModelApply}).Build()
+			rec := record.NewFakeRecorder(8)
+			r := &FluxPlunger{Client: c, owns: testOwns, Recorder: rec,
+				now: func() time.Time { return deletedAt.Add(tc.since) }}
+
+			res, err := r.Reconcile(context.Background(), ctrl.Request{NamespacedName: types.NamespacedName{Namespace: testNS, Name: testName}})
+			if err != nil {
+				t.Fatalf("reconcile: %v", err)
+			}
+			if res.RequeueAfter <= 0 {
+				t.Fatalf("a held fence must requeue itself, got %+v", res)
+			}
+			warned := false
+			for drained := false; !drained; {
+				select {
+				case e := <-rec.Events:
+					if strings.HasPrefix(e, corev1.EventTypeWarning+" UninstallFenceHeld ") {
+						warned = true
+					}
+				default:
+					drained = true
+				}
+			}
+			if warned != tc.wantWarn {
+				t.Fatalf("UninstallFenceHeld Warning=%v, want %v", warned, tc.wantWarn)
+			}
+			if _, ok := hrExists(t, c); !ok {
+				t.Fatalf("the fence must keep holding the release; warning is not lifting it")
+			}
+		})
+	}
+}
+
+// The same terminating-under-a-foreign-suspension state is two different things.
+// A migration that suspends then deletes chose to keep the resources, so it is
+// Normal. A release flux-plunger has recovered before (it carries the
+// processed-version annotation: an operator suspended it by hand and deleted it,
+// or an earlier flux-plunger release left it suspended) is losing its uninstall by
+// accident, the failure this controller exists to prevent, so it is a Warning.
+func TestReconcile_TerminatingForeignSuspensionWarnsOnlyForAPreviouslyRecoveredRelease(t *testing.T) {
+	cases := []struct {
+		name      string
+		annotated bool
+		wantType  string
+	}{
+		{"never recovered by flux-plunger (migration)", false, corev1.EventTypeNormal},
+		{"recovered by flux-plunger before", true, corev1.EventTypeWarning},
+	}
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			hr := terminatingFixture(noDeployedReleasesHR())
+			hr.Spec.Suspend = true // not flux-plunger's
+			if tc.annotated {
+				hr.Annotations = map[string]string{annotationLastProcessedVersion: "3"}
+			}
+
+			c := fake.NewClientBuilder().WithScheme(testScheme(t)).WithObjects(hr).
+				WithInterceptorFuncs(interceptor.Funcs{Patch: ssaModelApply}).Build()
+			rec := record.NewFakeRecorder(8)
+			r := &FluxPlunger{Client: c, owns: testOwns, Recorder: rec}
+
+			reconcile(t, r)
+
+			select {
+			case e := <-rec.Events:
+				if !strings.HasPrefix(e, tc.wantType+" TerminatingWhileSuspended ") {
+					t.Fatalf("expected a %s TerminatingWhileSuspended event, got %q", tc.wantType, e)
+				}
+			default:
+				t.Fatalf("expected a TerminatingWhileSuspended event, got none")
+			}
+		})
+	}
+}
+
+// A fence left without a suspension on a live release (another writer set
+// spec.suspend=false and took the field), or a fence whose suspension another
+// manager took over, guards nothing and must be lifted, without starting a recovery.
+func TestReconcile_ReleasesUnguardingFence(t *testing.T) {
+	cases := []struct {
+		name    string
+		suspend bool
+	}{
+		{"fence without a suspension", false},
+		{"fence under another manager's suspension", true},
+	}
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			hr := fencedFixture(noDeployedReleasesHR())
+			hr.Spec.Suspend = tc.suspend
+			secret := helmReleaseSecret("v1")
+
+			c := fake.NewClientBuilder().WithScheme(testScheme(t)).WithObjects(hr, secret).
+				WithInterceptorFuncs(interceptor.Funcs{Patch: ssaModelApply}).Build()
+			r := newPlunger(c)
+
+			reconcile(t, r)
+
+			got, _ := hrExists(t, c)
+			if controllerutil.ContainsFinalizer(got, fenceFinalizer) {
+				t.Fatalf("a fence that guards nothing must be lifted")
+			}
+			if got.Spec.Suspend != tc.suspend {
+				t.Fatalf("lifting the fence must not change spec.suspend; got %v want %v", got.Spec.Suspend, tc.suspend)
+			}
+			if getErr := c.Get(context.Background(), types.NamespacedName{Namespace: testNS, Name: secret.Name}, &corev1.Secret{}); apierrors.IsNotFound(getErr) {
+				t.Fatalf("lifting a stale fence must not also run a recovery")
+			}
+		})
+	}
+}
+
+// Every apply flux-plunger sends, the relinquish included, must carry the uid and
+// resourceVersion of the object it was decided on: the resourceVersion so a write in
+// between is rejected rather than absorbed, the uid so an apply to a release that
+// has gone cannot create an empty one.
+func TestReconcile_EveryApplyCarriesPreconditions(t *testing.T) {
+	hr := noDeployedReleasesHR()
+	hr.UID = "release-uid"
+	secret := helmReleaseSecret("v1")
+
+	applies := 0
+	c := fake.NewClientBuilder().WithScheme(testScheme(t)).WithObjects(hr, secret).
+		WithInterceptorFuncs(interceptor.Funcs{
+			Patch: func(ctx context.Context, cl client.WithWatch, obj client.Object, patch client.Patch, opts ...client.PatchOption) error {
+				if _, _, _, ok := plungerApplyDetail(obj, patch, opts); ok {
+					applies++
+					cur := &helmv2.HelmRelease{}
+					if err := cl.Get(ctx, client.ObjectKeyFromObject(obj), cur); err != nil {
+						return err
+					}
+					if obj.GetUID() != "release-uid" {
+						t.Fatalf("apply must carry the release uid, got %q", obj.GetUID())
+					}
+					if obj.GetResourceVersion() == "" || obj.GetResourceVersion() != cur.ResourceVersion {
+						t.Fatalf("apply must carry the read resourceVersion %q, got %q", cur.ResourceVersion, obj.GetResourceVersion())
+					}
+				}
+				return ssaModelApply(ctx, cl, obj, patch, opts...)
+			},
+		}).Build()
+	r := newPlunger(c)
+
+	reconcile(t, r)
+
+	if applies < 2 {
+		t.Fatalf("expected the acquire and the relinquish applies, got %d", applies)
+	}
+}
+
+// Every flux-plunger apply is preconditioned on the object it was decided on, so a
+// routine write in between (helm-controller updating the status) makes the final
+// unsuspend conflict. That is retried through the requeue, not a failure to clear
+// the suspension: it must requeue, but must not raise the UnsuspendFailed Warning.
+func TestReconcile_UnsuspendConflictRequeuesWithoutWarning(t *testing.T) {
+	hr := noDeployedReleasesHR()
+	secret := helmReleaseSecret("v1")
+
+	c := fake.NewClientBuilder().WithScheme(testScheme(t)).WithObjects(hr, secret).
+		WithInterceptorFuncs(interceptor.Funcs{
+			Patch: func(ctx context.Context, cl client.WithWatch, obj client.Object, patch client.Patch, opts ...client.PatchOption) error {
+				if isPlungerApply(obj, patch, opts, false) {
+					return apierrors.NewConflict(
+						schema.GroupResource{Group: "helm.toolkit.fluxcd.io", Resource: "helmreleases"},
+						testName, errors.New("the object has been modified"))
+				}
+				return ssaModelApply(ctx, cl, obj, patch, opts...)
+			},
+		}).Build()
+	rec := record.NewFakeRecorder(8)
+	r := newPlunger(c)
+	r.Recorder = rec
+
+	_, err := r.Reconcile(context.Background(), ctrl.Request{NamespacedName: types.NamespacedName{Namespace: testNS, Name: testName}})
+	if err == nil {
+		t.Fatalf("a conflicted unsuspend must requeue with an error")
+	}
+	for drained := false; !drained; {
+		select {
+		case e := <-rec.Events:
+			if strings.Contains(e, "UnsuspendFailed") {
+				t.Fatalf("a conflicted unsuspend is retried, not a failure to clear; got %q", e)
+			}
+		default:
+			drained = true
+		}
+	}
+}
+
+// A release that is gone by the pre-delete termination re-check counts as
+// terminating: its storage Secret must be left alone and the reconcile must not
+// requeue with an error for an object no reconcile will follow.
+func TestReconcile_ReleaseGoneBeforeSecretDeleteKeepsSecret(t *testing.T) {
+	hr := noDeployedReleasesHR()
+	secret := helmReleaseSecret("v1")
+
+	c := fake.NewClientBuilder().WithScheme(testScheme(t)).WithObjects(hr, secret).
+		WithInterceptorFuncs(interceptor.Funcs{
+			Patch: func(ctx context.Context, cl client.WithWatch, obj client.Object, patch client.Patch, opts ...client.PatchOption) error {
+				if err := ssaModelApply(ctx, cl, obj, patch, opts...); err != nil {
+					return err
+				}
+				// Right after the processed-version annotation is written, the release
+				// is removed outright.
+				if h, ok := obj.(*helmv2.HelmRelease); ok && patch.Type() != types.ApplyPatchType && h.Annotations[annotationLastProcessedVersion] != "" {
+					gone := &helmv2.HelmRelease{}
+					if err := cl.Get(ctx, client.ObjectKeyFromObject(obj), gone); err != nil {
+						return err
+					}
+					gone.Finalizers = nil
+					if err := cl.Update(ctx, gone); err != nil {
+						return err
+					}
+					return client.IgnoreNotFound(cl.Delete(ctx, gone))
+				}
+				return nil
+			},
+		}).Build()
+	r := newPlunger(c)
+
+	_, err := r.Reconcile(context.Background(), ctrl.Request{NamespacedName: types.NamespacedName{Namespace: testNS, Name: testName}})
+	if err != nil {
+		t.Fatalf("a release gone before the Secret delete must not requeue with an error: %v", err)
+	}
+	if getErr := c.Get(context.Background(), types.NamespacedName{Namespace: testNS, Name: secret.Name}, &corev1.Secret{}); apierrors.IsNotFound(getErr) {
+		t.Fatalf("a release gone before the Secret delete must keep its storage Secret")
+	}
+}
+
+// A release that disappears in the middle of a recovery has nothing left to clear:
+// the unsuspend must not report a failure it will "retry", since no reconcile will
+// follow for an object that is gone.
+func TestReconcile_ReleaseGoneMidRecoveryIsNotAnUnsuspendFailure(t *testing.T) {
+	hr := noDeployedReleasesHR()
+	secret := helmReleaseSecret("v1")
+
+	c := fake.NewClientBuilder().WithScheme(testScheme(t)).WithObjects(hr, secret).
+		WithInterceptorFuncs(interceptor.Funcs{
+			Patch: ssaModelApply,
+			Delete: func(ctx context.Context, cl client.WithWatch, obj client.Object, opts ...client.DeleteOption) error {
+				if err := cl.Delete(ctx, obj, opts...); err != nil {
+					return err
+				}
+				if _, ok := obj.(*corev1.Secret); ok {
+					// The release is removed outright right after its storage Secret.
+					gone := &helmv2.HelmRelease{}
+					if err := cl.Get(ctx, types.NamespacedName{Namespace: testNS, Name: testName}, gone); err != nil {
+						return err
+					}
+					gone.Finalizers = nil
+					if err := cl.Update(ctx, gone); err != nil {
+						return err
+					}
+					return client.IgnoreNotFound(cl.Delete(ctx, gone))
+				}
+				return nil
+			},
+		}).Build()
+	rec := record.NewFakeRecorder(8)
+	r := newPlunger(c)
+	r.Recorder = rec
+
+	_, err := r.Reconcile(context.Background(), ctrl.Request{NamespacedName: types.NamespacedName{Namespace: testNS, Name: testName}})
+	if err != nil {
+		t.Fatalf("a release gone mid-recovery must not requeue with an error: %v", err)
+	}
+	for drained := false; !drained; {
+		select {
+		case e := <-rec.Events:
+			if strings.Contains(e, "UnsuspendFailed") {
+				t.Fatalf("a release gone mid-recovery is not an unsuspend failure, got %q", e)
+			}
+		default:
+			drained = true
+		}
+	}
+}
diff --git a/internal/controller/fluxplunger/hook_contract_test.go b/internal/controller/fluxplunger/hook_contract_test.go
new file mode 100644
index 0000000000..1c9b0559f2
--- /dev/null
+++ b/internal/controller/fluxplunger/hook_contract_test.go
@@ -0,0 +1,111 @@
+package fluxplunger
+
+import (
+	"os"
+	"regexp"
+	"strconv"
+	"strings"
+	"testing"
+	"time"
+)
+
+// The chart's pre-delete hook restates two of this package's names in shell and
+// go-template, where nothing ties them to the Go constants: the field manager
+// whose Apply entry owns a suspension, and the fence finalizer. A rename on
+// either side alone would leave the hook removing fences while keeping
+// suspensions, or looking for a fence nobody sets. These tests guard the
+// spellings only; what the hook's predicates mean is held by
+// hack/flux-plunger-fence-hook_test.bats.
+const (
+	hookTemplate       = "../../../packages/system/flux-plunger/templates/uninstall-fence-cleanup.yaml"
+	deploymentTemplate = "../../../packages/system/flux-plunger/templates/deployment.yaml"
+)
+
+// The binary must run the manager through RunManager, so the drain runs on stop,
+// and size the Lease with ApplyShutdownTimings, so the next flux-plunger cannot
+// lead during it; dropping either from main.go leaves every other test green.
+func TestMain_RunsTheDrainUnderTheLease(t *testing.T) {
+	raw, err := os.ReadFile("../../../cmd/flux-plunger/main.go")
+	if err != nil {
+		t.Fatalf("read main.go: %v", err)
+	}
+	for _, want := range []string{"fluxplunger.RunManager(", "fluxplunger.ApplyShutdownTimings(", "mgr.GetAPIReader()"} {
+		if !strings.Contains(string(raw), want) {
+			t.Errorf("main.go does not call %q", want)
+		}
+	}
+	if strings.Contains(string(raw), "mgr.Start(") {
+		t.Error("main.go starts the manager directly, skipping the drain")
+	}
+}
+
+// The chart must turn leader election on: without it nothing keeps the next
+// flux-plunger from writing while the old one drains.
+func TestDeploymentTemplate_EnablesLeaderElection(t *testing.T) {
+	raw, err := os.ReadFile(deploymentTemplate)
+	if err != nil {
+		t.Fatalf("read %s: %v", deploymentTemplate, err)
+	}
+	if !strings.Contains(string(raw), "- --leader-elect\n") && !strings.Contains(string(raw), "- --leader-elect=true") {
+		t.Error("deployment does not pass --leader-elect")
+	}
+}
+
+// The chart sizes the drain as the grace period less what the manager's stop and
+// the margin before SIGKILL take; both live here, so the subtraction must match.
+func TestDeploymentTemplate_SubtractsTheStopAndTheMarginTheBinaryUses(t *testing.T) {
+	raw, err := os.ReadFile(deploymentTemplate)
+	if err != nil {
+		t.Fatalf("read %s: %v", deploymentTemplate, err)
+	}
+	m := regexp.MustCompile(`--` + ShutdownDrainTimeoutFlag + `=\{\{ sub \.Values\.shutdownGracePeriodSeconds (\d+) \}\}s`).FindStringSubmatch(string(raw))
+	if m == nil {
+		t.Fatal("deployment does not derive the drain timeout from shutdownGracePeriodSeconds")
+	}
+	want := int((managerStopTimeout + killMargin) / time.Second)
+	if m[1] != strconv.Itoa(want) {
+		t.Fatalf("deployment subtracts %s, the binary needs %d (manager stop %v + margin %v)", m[1], want, managerStopTimeout, killMargin)
+	}
+}
+
+// The chart passes the drain deadline as a flag; a name the binary does not
+// define makes flux-plunger exit on start.
+func TestDeploymentTemplate_PassesTheDrainFlagTheBinaryDefines(t *testing.T) {
+	raw, err := os.ReadFile(deploymentTemplate)
+	if err != nil {
+		t.Fatalf("read %s: %v", deploymentTemplate, err)
+	}
+	if want := "- --" + ShutdownDrainTimeoutFlag + "="; !strings.Contains(string(raw), want) {
+		t.Errorf("deployment does not pass %q", want)
+	}
+}
+
+func TestHookTemplate_UsesTheControllersNames(t *testing.T) {
+	raw, err := os.ReadFile(hookTemplate)
+	if err != nil {
+		t.Fatalf("read %s: %v", hookTemplate, err)
+	}
+	hook := string(raw)
+
+	for _, want := range []string{
+		`(eq .manager "` + suspendFieldManager + `") (eq .operation "Apply")`,
+		`--field-manager ` + suspendFieldManager,
+		`fence=` + fenceFinalizer,
+	} {
+		if !strings.Contains(hook, want) {
+			t.Errorf("hook does not contain %q", want)
+		}
+	}
+
+	// Every flux-plunger finalizer literal in the templates is the controller's
+	// fence, whole: matched by the domain, so a misspelt name is caught too.
+	literals := regexp.MustCompile(`"[^"\s]*cozystack\.io/[^"\s]*"`).FindAllString(hook, -1)
+	if len(literals) == 0 {
+		t.Fatal("hook names no fence finalizer in a template")
+	}
+	for _, l := range literals {
+		if l != `"`+fenceFinalizer+`"` {
+			t.Errorf("hook template names fence %s, controller sets %q", l, fenceFinalizer)
+		}
+	}
+}
diff --git a/internal/controller/fluxplunger/shutdown_test.go b/internal/controller/fluxplunger/shutdown_test.go
new file mode 100644
index 0000000000..9ed0448927
--- /dev/null
+++ b/internal/controller/fluxplunger/shutdown_test.go
@@ -0,0 +1,265 @@
+// SPDX-License-Identifier: Apache-2.0
+
+package fluxplunger
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"testing"
+	"time"
+
+	helmv2 "github.com/fluxcd/helm-controller/api/v2"
+	corev1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/client-go/tools/record"
+	ctrl "sigs.k8s.io/controller-runtime"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/client/fake"
+	"sigs.k8s.io/controller-runtime/pkg/client/interceptor"
+	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
+)
+
+// countingReader counts List calls and fails the first failLists of them.
+type countingReader struct {
+	client.Reader
+	lists, failLists int
+}
+
+func (r *countingReader) List(ctx context.Context, list client.ObjectList, opts ...client.ListOption) error {
+	r.lists++
+	if r.lists <= r.failLists {
+		return errors.New("etcdserver: leader changed")
+	}
+	return r.Reader.List(ctx, list, opts...)
+}
+
+type stubManager struct {
+	client  client.Client
+	reader  client.Reader
+	elected chan struct{}
+}
+
+func (m stubManager) Start(context.Context) error { return nil }
+func (m stubManager) GetClient() client.Client    { return m.client }
+func (m stubManager) GetAPIReader() client.Reader { return m.reader }
+func (m stubManager) Elected() <-chan struct{}    { return m.elected }
+
+// electedChan is the Elected channel of a manager that became leader.
+func electedChan() chan struct{} {
+	c := make(chan struct{})
+	close(c)
+	return c
+}
+
+// A flux-plunger that never became leader stops while the leader goes on; its
+// drain would write next to the leader.
+func TestRunManager_DoesNotDrainWithoutHavingLed(t *testing.T) {
+	c := fake.NewClientBuilder().WithScheme(testScheme(t)).WithObjects(fencedLiveRelease()).
+		WithInterceptorFuncs(interceptor.Funcs{Patch: ssaModelApply}).Build()
+	reader := &countingReader{Reader: c}
+	if err := RunManager(context.Background(), stubManager{client: c, reader: reader, elected: make(chan struct{})}, 10*time.Second); err != nil {
+		t.Fatalf("RunManager: %v", err)
+	}
+	if reader.lists != 0 {
+		t.Fatal("a flux-plunger that never led must not drain")
+	}
+	hr := &helmv2.HelmRelease{}
+	if err := c.Get(context.Background(), client.ObjectKeyFromObject(fencedLiveRelease()), hr); err != nil {
+		t.Fatalf("get: %v", err)
+	}
+	if !controllerutil.ContainsFinalizer(hr, fenceFinalizer) {
+		t.Fatal("the leader's fence must be left to the leader")
+	}
+}
+
+func fencedLiveRelease() *helmv2.HelmRelease {
+	return &helmv2.HelmRelease{ObjectMeta: metav1.ObjectMeta{
+		Namespace: testNS, Name: testName, Finalizers: []string{fenceFinalizer},
+	}}
+}
+
+// After the manager stops its informer cache is frozen, so the drain must read
+// through the manager's API reader; a drain reading the cache would act on
+// fences already gone.
+func TestRunManager_DrainsThroughTheManagersAPIReader(t *testing.T) {
+	c := fake.NewClientBuilder().WithScheme(testScheme(t)).WithObjects(fencedLiveRelease()).
+		WithInterceptorFuncs(interceptor.Funcs{Patch: ssaModelApply}).Build()
+	reader := &countingReader{Reader: c}
+	if err := RunManager(context.Background(), stubManager{client: c, reader: reader, elected: electedChan()}, 10*time.Second); err != nil {
+		t.Fatalf("RunManager: %v", err)
+	}
+	if reader.lists == 0 {
+		t.Fatal("the drain did not read through the API reader")
+	}
+	hr := &helmv2.HelmRelease{}
+	if err := c.Get(context.Background(), client.ObjectKeyFromObject(fencedLiveRelease()), hr); err != nil {
+		t.Fatalf("get: %v", err)
+	}
+	if controllerutil.ContainsFinalizer(hr, fenceFinalizer) {
+		t.Fatalf("the drain must release the fence, finalizers %v", hr.Finalizers)
+	}
+}
+
+func TestDrainFences_RetriesAFailedListing(t *testing.T) {
+	c := fake.NewClientBuilder().WithScheme(testScheme(t)).WithObjects(fencedLiveRelease()).
+		WithInterceptorFuncs(interceptor.Funcs{Patch: ssaModelApply}).Build()
+	reader := &countingReader{Reader: c, failLists: 2}
+	r := &FluxPlunger{Client: c, APIReader: reader}
+	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+	defer cancel()
+	left, err := r.DrainFences(ctx)
+	if err != nil || left != 0 {
+		t.Fatalf("a listing that fails and then succeeds must not end the drain: left=%d err=%v lists=%d", left, err, reader.lists)
+	}
+	if reader.lists < 3 {
+		t.Fatalf("want the listing retried, lists=%d", reader.lists)
+	}
+}
+
+func TestRunThenDrain_DrainsAfterTheManagerStopsWithItsOwnDeadline(t *testing.T) {
+	stopped, drained := false, false
+	signal, cancel := context.WithCancel(context.Background())
+	run := func(ctx context.Context) error {
+		cancel() // the stop signal
+		<-ctx.Done()
+		stopped = true
+		return nil
+	}
+	drain := func(ctx context.Context) (int, error) {
+		drained = true
+		if !stopped {
+			t.Error("drain ran before the manager stopped")
+		}
+		// The signal context is cancelled by now; the drain must get time of its own.
+		if err := ctx.Err(); err != nil {
+			t.Errorf("drain context was already done: %v", err)
+		}
+		dl, ok := ctx.Deadline()
+		if !ok || time.Until(dl) > time.Minute || time.Until(dl) < 50*time.Second {
+			t.Errorf("drain deadline %v, want about a minute from now", dl)
+		}
+		return 0, nil
+	}
+
+	if err := RunThenDrain(signal, run, drain, time.Minute); err != nil {
+		t.Fatalf("RunThenDrain: %v", err)
+	}
+	if !drained {
+		t.Fatal("drain did not run")
+	}
+}
+
+// The next flux-plunger may become leader only once the old one has stopped its
+// manager and finished draining, counted from the old one's last Lease renewal.
+func TestApplyShutdownTimings_TheLeaseOutlastsTheStopAndTheDrain(t *testing.T) {
+	for _, drain := range []time.Duration{2 * time.Second, 60 * time.Second, 110 * time.Second} {
+		opts := ctrl.Options{}
+		ApplyShutdownTimings(&opts, drain)
+		if opts.LeaderElectionReleaseOnCancel {
+			t.Fatalf("drain %v: a Lease released on stop lets the next flux-plunger lead during the drain", drain)
+		}
+		if opts.GracefulShutdownTimeout == nil || opts.LeaseDuration == nil || opts.RenewDeadline == nil || opts.RetryPeriod == nil {
+			t.Fatalf("drain %v: timings left unset: %+v", drain, opts)
+		}
+		stop, lease, renew, retry := *opts.GracefulShutdownTimeout, *opts.LeaseDuration, *opts.RenewDeadline, *opts.RetryPeriod
+		if stop <= 0 {
+			t.Fatalf("drain %v: the manager's stop must be bounded, got %v", drain, stop)
+		}
+		// A leader whose renewals fail keeps acting until RenewDeadline has
+		// passed since its last renewal, so that counts too.
+		if lease <= retry+renew+stop+drain {
+			t.Fatalf("drain %v: lease %v does not outlast a renewal %v ago, a renew deadline of %v, a stop of %v and the drain", drain, lease, retry, renew, stop)
+		}
+		if !(renew < lease && time.Duration(float64(retry)*1.2) < renew) {
+			t.Fatalf("drain %v: client-go needs lease > renew > 1.2 * retry, got %v %v %v", drain, lease, renew, retry)
+		}
+	}
+}
+
+// controller-runtime reports a stop that overran GracefulShutdownTimeout as an
+// error from Start. A reconcile slow to notice its cancelled context must not
+// cost the drain the fence exists for; the exit stays non-zero.
+func TestRunThenDrain_DrainsAfterAStopThatOverranItsGracePeriod(t *testing.T) {
+	stopErr := fmt.Errorf("failed waiting for all runnables to end within grace period of 10s: %w", context.DeadlineExceeded)
+	drained := false
+	err := RunThenDrain(context.Background(),
+		func(context.Context) error { return stopErr },
+		func(context.Context) (int, error) { drained = true; return 0, nil },
+		time.Minute)
+	if !drained {
+		t.Fatal("a stop that overran its grace period must still drain")
+	}
+	if !errors.Is(err, context.DeadlineExceeded) {
+		t.Fatalf("the overrun must still be reported, got %v", err)
+	}
+}
+
+// The drain's Events cannot go through the manager's recorder, which is stopped
+// before Start returns; they are written directly.
+func TestRunManager_DrainEventsReachTheAPI(t *testing.T) {
+	now := metav1.Now()
+	hr := fencedLiveRelease()
+	hr.Spec.Suspend = true
+	hr.DeletionTimestamp = &now
+	hr.Finalizers = append(hr.Finalizers, "example.com/keep")
+	c := fake.NewClientBuilder().WithScheme(testScheme(t)).WithObjects(hr).
+		WithInterceptorFuncs(interceptor.Funcs{Patch: ssaModelApply}).Build()
+	if err := RunManager(context.Background(), stubManager{client: c, reader: c, elected: electedChan()}, 5*time.Second); err != nil {
+		t.Fatalf("RunManager: %v", err)
+	}
+	events := &corev1.EventList{}
+	if err := c.List(context.Background(), events); err != nil {
+		t.Fatalf("list events: %v", err)
+	}
+	for _, e := range events.Items {
+		if e.Reason == "TerminatingWhileSuspended" && e.InvolvedObject.Name == hr.Name && e.InvolvedObject.Namespace == hr.Namespace {
+			return
+		}
+	}
+	t.Fatalf("the drain's event did not reach the API: %+v", events.Items)
+}
+
+func TestRunThenDrain_DoesNotDrainWhenTheManagerFails(t *testing.T) {
+	boom := errors.New("boom")
+	drained := false
+	err := RunThenDrain(context.Background(),
+		func(context.Context) error { return boom },
+		func(context.Context) (int, error) { drained = true; return 0, nil },
+		time.Minute)
+	if !errors.Is(err, boom) {
+		t.Fatalf("want the manager's error, got %v", err)
+	}
+	if drained {
+		t.Fatal("a manager that failed must not be followed by a drain")
+	}
+}
+
+func TestRunThenDrain_AnIncompleteDrainIsNotAFailure(t *testing.T) {
+	err := RunThenDrain(context.Background(),
+		func(context.Context) error { return nil },
+		func(context.Context) (int, error) { return 2, context.DeadlineExceeded },
+		time.Minute)
+	if err != nil {
+		t.Fatalf("fences left for the next flux-plunger or the pre-delete hook are not an error: %v", err)
+	}
+}
+
+// A stop cancels every reconcile, so an unsuspend cut short by it is not the
+// failure the Warning reports: the drain lifts that suspension next.
+func TestRecordUnsuspendFailed_IgnoresACancelledStop(t *testing.T) {
+	rec := record.NewFakeRecorder(4)
+	r := &FluxPlunger{Recorder: rec}
+	r.recordUnsuspendFailed(fencedLiveRelease(), fmt.Errorf("apply: %w", context.Canceled))
+	select {
+	case e := <-rec.Events:
+		t.Fatalf("a cancelled stop must not raise %q", e)
+	default:
+	}
+	r.recordUnsuspendFailed(fencedLiveRelease(), errors.New("forbidden"))
+	select {
+	case <-rec.Events:
+	default:
+		t.Fatal("a real failure must still raise the Warning")
+	}
+}
diff --git a/internal/controller/fluxplunger/ssa_ownership_envtest_test.go b/internal/controller/fluxplunger/ssa_ownership_envtest_test.go
new file mode 100644
index 0000000000..0d39c5df96
--- /dev/null
+++ b/internal/controller/fluxplunger/ssa_ownership_envtest_test.go
@@ -0,0 +1,722 @@
+// SPDX-License-Identifier: Apache-2.0
+//go:build envtest
+
+// Source of truth for what the suspension fix relies on from a REAL apiserver
+// (envtest), where the controller-runtime fake client cannot stand in: it does not
+// track metadata.managedFields, and it does not enforce resourceVersion or uid
+// preconditions on server-side apply. It drives the PRODUCTION code against a
+// realistic release, one an operator owns with a non-zero spec.interval.
+//
+// Ownership: acquire without conflict and without touching spec.interval, the
+// operator transfer (misattribution boundary), no self-disown, relinquish, never
+// claiming a suspension set under the shared client-side field manager
+// (migrations, delete hook), and never acquiring an actively foreign-owned
+// suspension; ownsSuspensionManagedFields is asserted directly against
+// apiserver-produced managedFields.
+//
+// Uninstall fence (issue #4060): a delete landing during recovery reaches the Helm
+// uninstall whichever of helm-controller and flux-plunger handles it first, with
+// helm-controller v1.5.0's delete handling reproduced step for step; a delete
+// racing the unsuspend of a live release is survived; and no apply resurrects a
+// release that has gone.
+//
+// Built only under the `envtest` tag; `make test-controllers-envtest` fetches the
+// apiserver and runs it, and CI runs that target on every pull request.
+package fluxplunger
+
+import (
+	"context"
+	"os"
+	"testing"
+	"time"
+
+	helmv2 "github.com/fluxcd/helm-controller/api/v2"
+	corev1 "k8s.io/api/core/v1"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apimachinery/pkg/types"
+	"k8s.io/client-go/dynamic"
+	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
+	ctrl "sigs.k8s.io/controller-runtime"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/envtest"
+)
+
+const (
+	fmHelm = "cozystack-operator"
+	fmOper = "kubectl-patch"
+)
+
+// envtestStartTimeout replaces envtest's 20s default: CI runs these suites beside
+// three other make goals on a four-CPU runner, where kube-apiserver can take
+// longer than that to come up.
+const envtestStartTimeout = 2 * time.Minute
+
+func newEnvtestEnvironment(crdDir string) *envtest.Environment {
+	return &envtest.Environment{
+		CRDDirectoryPaths:        []string{crdDir},
+		ErrorIfCRDPathMissing:    true,
+		ControlPlaneStartTimeout: envtestStartTimeout,
+	}
+}
+
+func TestEnvtest_EnvironmentToleratesASlowControlPlaneStart(t *testing.T) {
+	if got := newEnvtestEnvironment("crds").ControlPlaneStartTimeout; got < time.Minute {
+		t.Fatalf("ControlPlaneStartTimeout = %v, want at least a minute", got)
+	}
+}
+
+func TestEnvtest_SuspendOwnership(t *testing.T) {
+	crdDir := os.Getenv("HELMRELEASE_CRD_DIR")
+	if crdDir == "" {
+		t.Skip("set HELMRELEASE_CRD_DIR to the dir with the HelmRelease CRD")
+	}
+	env := newEnvtestEnvironment(crdDir)
+	cfg, err := env.Start()
+	if err != nil {
+		t.Fatalf("start envtest: %v", err)
+	}
+	defer func() { _ = env.Stop() }()
+
+	if err := helmv2.AddToScheme(clientgoscheme.Scheme); err != nil {
+		t.Fatalf("add helm scheme: %v", err)
+	}
+	cl, err := client.New(cfg, client.Options{Scheme: clientgoscheme.Scheme})
+	if err != nil {
+		t.Fatalf("client: %v", err)
+	}
+	ctx := context.Background()
+	r := &FluxPlunger{Client: cl}
+	key := types.NamespacedName{Namespace: testNS, Name: testName}
+	get := func() *helmv2.HelmRelease {
+		h := &helmv2.HelmRelease{}
+		if err := cl.Get(ctx, key, h); err != nil {
+			t.Fatalf("get: %v", err)
+		}
+		return h
+	}
+
+	ns := &corev1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: testNS}}
+	if err := cl.Create(ctx, ns); err != nil {
+		t.Fatalf("create ns: %v", err)
+	}
+
+	// The operator establishes a realistic release via a full-object apply that owns
+	// a NON-ZERO spec.interval and does NOT set spec.suspend. This is the shape a
+	// typed-struct suspend apply conflicts with (it would emit spec.interval "0s").
+	const operatorInterval = 5 * time.Minute
+	base := &helmv2.HelmRelease{
+		TypeMeta:   metav1.TypeMeta{APIVersion: helmv2.GroupVersion.String(), Kind: "HelmRelease"},
+		ObjectMeta: metav1.ObjectMeta{Namespace: testNS, Name: testName},
+		Spec: helmv2.HelmReleaseSpec{
+			Interval: metav1.Duration{Duration: operatorInterval},
+			Chart:    &helmv2.HelmChartTemplate{Spec: helmv2.HelmChartTemplateSpec{Chart: "x", SourceRef: helmv2.CrossNamespaceObjectReference{Kind: "HelmRepository", Name: "r"}}},
+		},
+	}
+	if err := cl.Patch(ctx, base, client.Apply, client.FieldOwner(fmHelm)); err != nil {
+		t.Fatalf("operator base apply: %v", err)
+	}
+
+	// Acquire: production suspendHelmRelease must acquire WITHOUT conflicting on
+	// spec.interval, and must leave the operator's interval untouched.
+	acquired, err := r.suspendHelmRelease(ctx, get())
+	if err != nil {
+		t.Fatalf("acquire: suspendHelmRelease errored (interval conflict regression?): %v", err)
+	}
+	if !acquired {
+		t.Fatalf("acquire: suspendHelmRelease did not acquire the suspension")
+	}
+	h := get()
+	if !h.Spec.Suspend || !ownsSuspensionManagedFields(h) {
+		t.Fatalf("acquire: expected suspend=true owned by flux-plunger; suspend=%v owns=%v", h.Spec.Suspend, ownsSuspensionManagedFields(h))
+	}
+	if h.Spec.Interval.Duration != operatorInterval {
+		t.Fatalf("acquire: suspend must not touch the operator's spec.interval; got %v want %v", h.Spec.Interval.Duration, operatorInterval)
+	}
+	t.Log("acquire: acquired suspend without conflict, operator interval preserved")
+
+	// Unrelated re-apply: operator re-applies the whole object (unrelated fields), NOT touching
+	// suspend. flux-plunger must retain ownership (no self-disown).
+	base2 := &helmv2.HelmRelease{
+		TypeMeta:   metav1.TypeMeta{APIVersion: helmv2.GroupVersion.String(), Kind: "HelmRelease"},
+		ObjectMeta: metav1.ObjectMeta{Namespace: testNS, Name: testName},
+		Spec: helmv2.HelmReleaseSpec{
+			Interval: metav1.Duration{Duration: operatorInterval},
+			Chart:    &helmv2.HelmChartTemplate{Spec: helmv2.HelmChartTemplateSpec{Chart: "x2", SourceRef: helmv2.CrossNamespaceObjectReference{Kind: "HelmRepository", Name: "r"}}},
+		},
+	}
+	if err := cl.Patch(ctx, base2, client.Apply, client.FieldOwner(fmHelm)); err != nil {
+		t.Fatalf("unrelated re-apply: operator re-apply: %v", err)
+	}
+	if h = get(); !h.Spec.Suspend || !ownsSuspensionManagedFields(h) {
+		t.Fatalf("unrelated re-apply (self-disown): after unrelated operator re-apply suspend=%v owns=%v", h.Spec.Suspend, ownsSuspensionManagedFields(h))
+	}
+	t.Log("unrelated re-apply: unrelated operator re-apply did NOT disown flux-plunger's suspend")
+
+	// Operator transfer: operator resumes then re-suspends via client-side patches. The field
+	// transfers to the operator, so flux-plunger no longer owns it.
+	for _, want := range []bool{false, true} {
+		cur := get()
+		patch := client.MergeFrom(cur.DeepCopy())
+		cur.Spec.Suspend = want
+		if err := cl.Patch(ctx, cur, patch, client.FieldOwner(fmOper)); err != nil {
+			t.Fatalf("operator set suspend=%v: %v", want, err)
+		}
+	}
+	if h = get(); ownsSuspensionManagedFields(h) {
+		t.Fatalf("operator transfer (misattribution): flux-plunger still owns an operator-set suspension")
+	}
+	t.Log("operator transfer: after operator resume+resuspend, flux-plunger does NOT own the suspension")
+
+	// unsuspendHelmRelease must now be a no-op (not owned): the operator's
+	// suspension must survive.
+	if err := r.unsuspendHelmRelease(ctx, get()); err != nil {
+		t.Fatalf("unsuspend on unowned suspension errored: %v", err)
+	}
+	if h = get(); !h.Spec.Suspend {
+		t.Fatalf("boundary FAIL: flux-plunger cleared an operator's suspension")
+	}
+
+	// Relinquish: reset to a flux-plunger-owned suspension (operator resumes so the field is
+	// free), acquire, then unsuspendHelmRelease must relinquish → suspend=false,
+	// interval untouched, ownership dropped.
+	cur := get()
+	patch := client.MergeFrom(cur.DeepCopy())
+	cur.Spec.Suspend = false
+	if err := cl.Patch(ctx, cur, patch, client.FieldOwner(fmOper)); err != nil {
+		t.Fatalf("relinquish: operator resume: %v", err)
+	}
+	if acquired, err := r.suspendHelmRelease(ctx, get()); err != nil || !acquired {
+		t.Fatalf("relinquish: re-acquire: acquired=%v err=%v", acquired, err)
+	}
+	if err := r.unsuspendHelmRelease(ctx, get()); err != nil {
+		t.Fatalf("relinquish: unsuspend: %v", err)
+	}
+	h = get()
+	if h.Spec.Suspend {
+		t.Fatalf("relinquish: unsuspend did not clear the suspension")
+	}
+	if ownsSuspensionManagedFields(h) {
+		t.Fatalf("relinquish: flux-plunger still owns suspend after unsuspend")
+	}
+	if h.Spec.Interval.Duration != operatorInterval {
+		t.Fatalf("relinquish: unsuspend must not touch the operator's spec.interval; got %v", h.Spec.Interval.Duration)
+	}
+	t.Log("relinquish: unsuspend relinquished ownership, reverted suspend to false, interval preserved")
+
+	// Shared manager: a suspension set under the SHARED client-side field manager
+	// (flux-client-side-apply) must NOT be read as flux-plunger's, and
+	// unsuspendHelmRelease must leave it untouched. That manager is used by the
+	// platform migrations (cozy-proxy, cert-manager) and the tenant delete hook — and
+	// historically by earlier flux-plunger releases, which is exactly why the field
+	// manager cannot identify flux-plunger. Recognising it would let flux-plunger
+	// clear a migration's suspension (unsuspending cozy-proxy deletes
+	// cozystack-operator), so the boundary is pinned here on a real apiserver.
+	curShared := get()
+	sharedPatch := client.MergeFrom(curShared.DeepCopy())
+	curShared.Spec.Suspend = true
+	if err := cl.Patch(ctx, curShared, sharedPatch, client.FieldOwner(fieldManager)); err != nil {
+		t.Fatalf("shared manager: shared-manager suspend: %v", err)
+	}
+	if h = get(); ownsSuspensionManagedFields(h) {
+		t.Fatalf("shared manager (misattribution risk): a suspension under the shared client-side manager must NOT be read as flux-plunger's")
+	}
+	if err := r.unsuspendHelmRelease(ctx, get()); err != nil {
+		t.Fatalf("shared manager: unsuspend: %v", err)
+	}
+	if h = get(); !h.Spec.Suspend {
+		t.Fatalf("shared manager (misattribution): flux-plunger cleared a suspension set under the shared client-side manager")
+	}
+	t.Log("shared manager: a shared-client-side-manager suspension is left untouched")
+
+	// Active foreign suspension: an operator actively owns suspend=TRUE. suspendHelmRelease must NOT acquire
+	// or force it away — an active foreign suspension is never taken. The early
+	// already-suspended guard covers the common case; the re-fetch-after-conflict
+	// guard covers the race the fake-client tests pin.
+	curActive := get()
+	activePatch := client.MergeFrom(curActive.DeepCopy())
+	curActive.Spec.Suspend = true
+	if err := cl.Patch(ctx, curActive, activePatch, client.FieldOwner(fmOper)); err != nil {
+		t.Fatalf("active foreign suspension: operator suspend: %v", err)
+	}
+	acquired, err = r.suspendHelmRelease(ctx, get())
+	if err != nil {
+		t.Fatalf("active foreign suspension: suspend: %v", err)
+	}
+	if acquired {
+		t.Fatalf("active foreign suspension: acquired an actively foreign-suspended release")
+	}
+	if h = get(); !h.Spec.Suspend {
+		t.Fatalf("active foreign suspension: cleared an active foreign suspension")
+	}
+	if ownsSuspensionManagedFields(h) {
+		t.Fatalf("active foreign suspension: took ownership of an active foreign suspension")
+	}
+	t.Log("active foreign suspension: did not acquire or clear an actively foreign-owned suspension")
+}
+
+// TestEnvtest_AcquiresOverBackupOwnedSuspend pins acquiring a
+// suspension a backup controller left owned. A backup/restore controller in this repo sets
+// spec.suspend via a dynamic-client Update, taking ownership of the field. A
+// non-forced apply of spec.suspend then 409s forever; production suspendHelmRelease
+// re-fetches after the conflict, sees the field still false, and forces on acquire,
+// which must succeed without touching the operator's interval. Reverting the
+// conditional force in suspendHelmRelease turns this RED with a .spec.suspend
+// conflict.
+func TestEnvtest_AcquiresOverBackupOwnedSuspend(t *testing.T) {
+	crdDir := os.Getenv("HELMRELEASE_CRD_DIR")
+	if crdDir == "" {
+		t.Skip("set HELMRELEASE_CRD_DIR to the dir with the HelmRelease CRD")
+	}
+	env := newEnvtestEnvironment(crdDir)
+	cfg, err := env.Start()
+	if err != nil {
+		t.Fatalf("start envtest: %v", err)
+	}
+	defer func() { _ = env.Stop() }()
+
+	if err := helmv2.AddToScheme(clientgoscheme.Scheme); err != nil {
+		t.Fatalf("add helm scheme: %v", err)
+	}
+	cl, err := client.New(cfg, client.Options{Scheme: clientgoscheme.Scheme})
+	if err != nil {
+		t.Fatalf("client: %v", err)
+	}
+	dyn, err := dynamic.NewForConfig(cfg)
+	if err != nil {
+		t.Fatalf("dynamic client: %v", err)
+	}
+	gvr := schema.GroupVersionResource{Group: "helm.toolkit.fluxcd.io", Version: "v2", Resource: "helmreleases"}
+	ctx := context.Background()
+	r := &FluxPlunger{Client: cl}
+	key := types.NamespacedName{Namespace: testNS, Name: testName}
+	if err := cl.Create(ctx, &corev1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: testNS}}); err != nil {
+		t.Fatalf("create ns: %v", err)
+	}
+
+	const operatorInterval = 5 * time.Minute
+	base := &helmv2.HelmRelease{
+		TypeMeta:   metav1.TypeMeta{APIVersion: helmv2.GroupVersion.String(), Kind: "HelmRelease"},
+		ObjectMeta: metav1.ObjectMeta{Namespace: testNS, Name: testName},
+		Spec: helmv2.HelmReleaseSpec{
+			Interval: metav1.Duration{Duration: operatorInterval},
+			Chart:    &helmv2.HelmChartTemplate{Spec: helmv2.HelmChartTemplateSpec{Chart: "x", SourceRef: helmv2.CrossNamespaceObjectReference{Kind: "HelmRepository", Name: "r"}}},
+		},
+	}
+	if err := cl.Patch(ctx, base, client.Apply, client.FieldOwner("cozystack-operator")); err != nil {
+		t.Fatalf("operator base apply: %v", err)
+	}
+
+	// A backup/restore controller suspends then resumes via a dynamic-client Update,
+	// leaving spec.suspend=false but OWNED by it (operation=Update). This is the
+	// state that 409s a non-forced apply.
+	for _, v := range []bool{true, false} {
+		u, err := dyn.Resource(gvr).Namespace(testNS).Get(ctx, testName, metav1.GetOptions{})
+		if err != nil {
+			t.Fatalf("backup get: %v", err)
+		}
+		_ = unstructured.SetNestedField(u.Object, v, "spec", "suspend")
+		if _, err := dyn.Resource(gvr).Namespace(testNS).Update(ctx, u, metav1.UpdateOptions{}); err != nil {
+			t.Fatalf("backup Update suspend=%v: %v", v, err)
+		}
+	}
+
+	cur := &helmv2.HelmRelease{}
+	if err := cl.Get(ctx, key, cur); err != nil {
+		t.Fatalf("get: %v", err)
+	}
+	acquired, err := r.suspendHelmRelease(ctx, cur)
+	if err != nil {
+		t.Fatalf("backup-owned acquire: suspendHelmRelease could not acquire a backup-controller-owned spec.suspend (force missing?): %v", err)
+	}
+	if !acquired {
+		t.Fatalf("backup-owned acquire: suspendHelmRelease did not acquire")
+	}
+	got := &helmv2.HelmRelease{}
+	_ = cl.Get(ctx, key, got)
+	if !got.Spec.Suspend || !ownsSuspensionManagedFields(got) {
+		t.Fatalf("backup-owned acquire: expected suspend=true owned by flux-plunger; suspend=%v owns=%v", got.Spec.Suspend, ownsSuspensionManagedFields(got))
+	}
+	if got.Spec.Interval.Duration != operatorInterval {
+		t.Fatalf("backup-owned acquire: acquire must not touch the operator's interval; got %v", got.Spec.Interval.Duration)
+	}
+	t.Log("backup-owned acquire: force-on-acquire took spec.suspend from a dynamic-Update owner, interval preserved")
+
+	// Concurrent write: the backup controller holds the field at false and then
+	// suspends the release for real in the gap after one of acquire's reads. Both
+	// applies are preconditioned on the resourceVersion of the read that decided on
+	// them, so neither the unforced first attempt (which would otherwise record
+	// flux-plunger as a co-owner of the backup's true) nor the forced retry may take
+	// the suspension: acquire reports not acquired, without an error, and the
+	// backup's suspension keeps its owner.
+	setBackupSuspend := func(v bool) {
+		u, err := dyn.Resource(gvr).Namespace(testNS).Get(ctx, testName, metav1.GetOptions{})
+		if err != nil {
+			t.Fatalf("concurrent write: backup get: %v", err)
+		}
+		_ = unstructured.SetNestedField(u.Object, v, "spec", "suspend")
+		if _, err := dyn.Resource(gvr).Namespace(testNS).Update(ctx, u, metav1.UpdateOptions{}); err != nil {
+			t.Fatalf("concurrent write: backup Update suspend=%v: %v", v, err)
+		}
+	}
+	for _, tc := range []struct {
+		name  string
+		after int // the backup writes right after this Get of acquire
+	}{
+		{"before the unforced apply", 1},
+		{"before the forced apply", 2},
+	} {
+		setBackupSuspend(false)
+		racing := &FluxPlunger{Client: cl, APIReader: &writeAfterNthGet{Reader: cl, n: tc.after, write: func() { setBackupSuspend(true) }}}
+		start := &helmv2.HelmRelease{}
+		if err := cl.Get(ctx, key, start); err != nil {
+			t.Fatalf("concurrent write %s: get: %v", tc.name, err)
+		}
+		acquired, err := racing.suspendHelmRelease(ctx, start)
+		if err != nil || acquired {
+			t.Fatalf("concurrent write %s: acquire must report not acquired without an error; acquired=%v err=%v", tc.name, acquired, err)
+		}
+		after := &helmv2.HelmRelease{}
+		_ = cl.Get(ctx, key, after)
+		if !after.Spec.Suspend || ownsSuspensionManagedFields(after) {
+			t.Fatalf("concurrent write %s: the backup's suspension must survive unowned by flux-plunger; suspend=%v owns=%v", tc.name, after.Spec.Suspend, ownsSuspensionManagedFields(after))
+		}
+		t.Logf("concurrent write %s: acquire declined, backup's suspension kept", tc.name)
+	}
+}
+
+// writeAfterNthGet runs write right after its n-th Get returns, standing in for
+// another controller writing the object in the gap between a read and the apply
+// decided on it.
+type writeAfterNthGet struct {
+	client.Reader
+	n, calls int
+	write    func()
+}
+
+func (w *writeAfterNthGet) Get(ctx context.Context, key client.ObjectKey, obj client.Object, opts ...client.GetOption) error {
+	err := w.Reader.Get(ctx, key, obj, opts...)
+	w.calls++
+	if w.calls == w.n {
+		w.write()
+	}
+	return err
+}
+
+// simulateHelmControllerDelete stands in for helm-controller v1.5.0's
+// reconcileDelete (internal/controller/helmrelease_controller.go, the
+// deletionTimestamp branch): on a terminating HelmRelease it runs the Helm
+// uninstall only when spec.suspend is false, then removes its own finalizer either
+// way and records the observed generation. It reports whether it uninstalled. It is
+// the behaviour issue #4060 is about: a delete handled while the release is
+// suspended drops the finalizer without an uninstall.
+func simulateHelmControllerDelete(t *testing.T, ctx context.Context, cl client.Client, key types.NamespacedName) (uninstalled bool) {
+	t.Helper()
+	hr := &helmv2.HelmRelease{}
+	if err := cl.Get(ctx, key, hr); err != nil {
+		t.Fatalf("helm-controller: get: %v", err)
+	}
+	if hr.DeletionTimestamp.IsZero() {
+		t.Fatalf("helm-controller: release is not terminating")
+	}
+	uninstalled = !hr.Spec.Suspend
+	hr.Status.ObservedGeneration = hr.Generation
+	if err := cl.Status().Update(ctx, hr); err != nil {
+		t.Fatalf("helm-controller: status update: %v", err)
+	}
+	if err := cl.Get(ctx, key, hr); err != nil {
+		t.Fatalf("helm-controller: re-get: %v", err)
+	}
+	var kept []string
+	for _, f := range hr.Finalizers {
+		if f != helmv2.HelmReleaseFinalizer {
+			kept = append(kept, f)
+		}
+	}
+	if len(kept) != len(hr.Finalizers) {
+		hr.Finalizers = kept
+		if err := cl.Update(ctx, hr); err != nil {
+			t.Fatalf("helm-controller: remove finalizer: %v", err)
+		}
+	}
+	return uninstalled
+}
+
+// TestEnvtest_DeleteDuringRecoveryReachesUninstall is the regression for issue
+// #4060 itself: a delete arriving while flux-plunger holds its recovery suspension
+// must still reach the Helm uninstall. helm-controller and flux-plunger wake on the
+// same delete event, so both orders are pinned: helm-controller handling it first
+// (it sees the suspension, skips the uninstall and drops its finalizer; only
+// flux-plunger's fence finalizer keeps the object alive until the suspension is
+// lifted and the uninstall runs), and flux-plunger handling it first.
+func TestEnvtest_DeleteDuringRecoveryReachesUninstall(t *testing.T) {
+	crdDir := os.Getenv("HELMRELEASE_CRD_DIR")
+	if crdDir == "" {
+		t.Skip("set HELMRELEASE_CRD_DIR to the dir with the HelmRelease CRD")
+	}
+	env := newEnvtestEnvironment(crdDir)
+	cfg, err := env.Start()
+	if err != nil {
+		t.Fatalf("start envtest: %v", err)
+	}
+	defer func() { _ = env.Stop() }()
+	if err := helmv2.AddToScheme(clientgoscheme.Scheme); err != nil {
+		t.Fatalf("add helm scheme: %v", err)
+	}
+	cl, err := client.New(cfg, client.Options{Scheme: clientgoscheme.Scheme})
+	if err != nil {
+		t.Fatalf("client: %v", err)
+	}
+	ctx := context.Background()
+	if err := cl.Create(ctx, &corev1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: testNS}}); err != nil {
+		t.Fatalf("create ns: %v", err)
+	}
+
+	for _, tc := range []struct {
+		name      string
+		helmFirst bool
+	}{
+		{"helm-controller handles the delete first", true},
+		{"flux-plunger handles the delete first", false},
+	} {
+		t.Run(tc.name, func(t *testing.T) {
+			name := testName + map[bool]string{true: "-hc", false: "-fp"}[tc.helmFirst]
+			key := types.NamespacedName{Namespace: testNS, Name: name}
+			base := &helmv2.HelmRelease{
+				TypeMeta:   metav1.TypeMeta{APIVersion: helmv2.GroupVersion.String(), Kind: "HelmRelease"},
+				ObjectMeta: metav1.ObjectMeta{Namespace: testNS, Name: name},
+				Spec: helmv2.HelmReleaseSpec{
+					Interval: metav1.Duration{Duration: 5 * time.Minute},
+					Chart:    &helmv2.HelmChartTemplate{Spec: helmv2.HelmChartTemplateSpec{Chart: "x", SourceRef: helmv2.CrossNamespaceObjectReference{Kind: "HelmRepository", Name: "r"}}},
+				},
+			}
+			if err := cl.Patch(ctx, base, client.Apply, client.FieldOwner(fmHelm)); err != nil {
+				t.Fatalf("operator base apply: %v", err)
+			}
+			hr := &helmv2.HelmRelease{}
+			if err := cl.Get(ctx, key, hr); err != nil {
+				t.Fatalf("get: %v", err)
+			}
+			hr.Finalizers = append(hr.Finalizers, helmv2.HelmReleaseFinalizer)
+			if err := cl.Update(ctx, hr); err != nil {
+				t.Fatalf("add helm-controller finalizer: %v", err)
+			}
+
+			r := &FluxPlunger{Client: cl, APIReader: cl}
+			req := ctrl.Request{NamespacedName: key}
+			if err := cl.Get(ctx, key, hr); err != nil {
+				t.Fatalf("get: %v", err)
+			}
+			if acquired, err := r.suspendHelmRelease(ctx, hr); err != nil || !acquired {
+				t.Fatalf("acquire: acquired=%v err=%v", acquired, err)
+			}
+
+			// The delete lands inside the recovery window.
+			if err := cl.Get(ctx, key, hr); err != nil {
+				t.Fatalf("get: %v", err)
+			}
+			if err := cl.Delete(ctx, hr); err != nil {
+				t.Fatalf("delete: %v", err)
+			}
+
+			uninstalled := false
+			if tc.helmFirst {
+				uninstalled = simulateHelmControllerDelete(t, ctx, cl, key) || uninstalled
+				if err := cl.Get(ctx, key, &helmv2.HelmRelease{}); err != nil {
+					t.Fatalf("the release must survive helm-controller dropping its finalizer while suspended (fence), got %v", err)
+				}
+			}
+			if _, err := r.Reconcile(ctx, req); err != nil {
+				t.Fatalf("flux-plunger reconcile of the terminating release: %v", err)
+			}
+			// Lifting the suspension is itself an update event, so flux-plunger can
+			// reconcile again before helm-controller has seen the new generation. When
+			// helm-controller handled the delete first its finalizer is already gone;
+			// only the observed generation still lagging tells flux-plunger the
+			// uninstall has not run, so the fence must hold through this pass.
+			if _, err := r.Reconcile(ctx, req); err != nil {
+				t.Fatalf("flux-plunger reconcile racing ahead of helm-controller: %v", err)
+			}
+			if err := cl.Get(ctx, key, &helmv2.HelmRelease{}); err != nil {
+				t.Fatalf("the fence must hold until helm-controller has observed the unsuspended generation, got %v", err)
+			}
+			if !tc.helmFirst {
+				uninstalled = simulateHelmControllerDelete(t, ctx, cl, key) || uninstalled
+			} else {
+				// With the suspension lifted, helm-controller reconciles again and now
+				// runs the uninstall.
+				uninstalled = simulateHelmControllerDelete(t, ctx, cl, key) || uninstalled
+			}
+			if !uninstalled {
+				t.Fatalf("a delete arriving during recovery must reach the Helm uninstall")
+			}
+			// With the uninstall done, flux-plunger lifts its fence and the release is
+			// gone.
+			if _, err := r.Reconcile(ctx, req); err != nil {
+				t.Fatalf("flux-plunger reconcile after the uninstall: %v", err)
+			}
+			if err := cl.Get(ctx, key, &helmv2.HelmRelease{}); !apierrors.IsNotFound(err) {
+				t.Fatalf("after the uninstall flux-plunger must lift its fence so the release is deleted, got %v", err)
+			}
+			t.Logf("%s: delete during recovery reached the uninstall, release gone", tc.name)
+		})
+	}
+}
+
+// startFenceEnv starts envtest and returns a client plus a helper that creates a
+// release under helm-controller's finalizer, as helm-controller leaves every release
+// it manages.
+func startFenceEnv(t *testing.T) (context.Context, client.Client, func(name string) types.NamespacedName, func()) {
+	t.Helper()
+	crdDir := os.Getenv("HELMRELEASE_CRD_DIR")
+	if crdDir == "" {
+		t.Skip("set HELMRELEASE_CRD_DIR to the dir with the HelmRelease CRD")
+	}
+	env := newEnvtestEnvironment(crdDir)
+	cfg, err := env.Start()
+	if err != nil {
+		t.Fatalf("start envtest: %v", err)
+	}
+	if err := helmv2.AddToScheme(clientgoscheme.Scheme); err != nil {
+		t.Fatalf("add helm scheme: %v", err)
+	}
+	cl, err := client.New(cfg, client.Options{Scheme: clientgoscheme.Scheme})
+	if err != nil {
+		t.Fatalf("client: %v", err)
+	}
+	ctx := context.Background()
+	if err := cl.Create(ctx, &corev1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: testNS}}); err != nil {
+		t.Fatalf("create ns: %v", err)
+	}
+	newRelease := func(name string) types.NamespacedName {
+		key := types.NamespacedName{Namespace: testNS, Name: name}
+		base := &helmv2.HelmRelease{
+			TypeMeta:   metav1.TypeMeta{APIVersion: helmv2.GroupVersion.String(), Kind: "HelmRelease"},
+			ObjectMeta: metav1.ObjectMeta{Namespace: testNS, Name: name},
+			Spec: helmv2.HelmReleaseSpec{
+				Interval: metav1.Duration{Duration: 5 * time.Minute},
+				Chart:    &helmv2.HelmChartTemplate{Spec: helmv2.HelmChartTemplateSpec{Chart: "x", SourceRef: helmv2.CrossNamespaceObjectReference{Kind: "HelmRepository", Name: "r"}}},
+			},
+		}
+		if err := cl.Patch(ctx, base, client.Apply, client.FieldOwner(fmHelm)); err != nil {
+			t.Fatalf("operator base apply: %v", err)
+		}
+		hr := &helmv2.HelmRelease{}
+		if err := cl.Get(ctx, key, hr); err != nil {
+			t.Fatalf("get: %v", err)
+		}
+		hr.Finalizers = append(hr.Finalizers, helmv2.HelmReleaseFinalizer)
+		if err := cl.Update(ctx, hr); err != nil {
+			t.Fatalf("add helm-controller finalizer: %v", err)
+		}
+		return key
+	}
+	return ctx, cl, newRelease, func() { _ = env.Stop() }
+}
+
+// TestEnvtest_DeleteRacingUnsuspendOfLiveReleaseKeepsFence pins the window between
+// unsuspendHelmRelease's read of a still-live release and its apply, which lifts the
+// suspension and the fence together. A delete landing there that helm-controller
+// handles first (suspended, so no uninstall and its finalizer dropped) would leave
+// the fence as the last finalizer, and an unpreconditioned apply removing it would
+// delete the release without an uninstall. The apply must fail instead, and the
+// next reconcile must carry the delete through to the uninstall.
+func TestEnvtest_DeleteRacingUnsuspendOfLiveReleaseKeepsFence(t *testing.T) {
+	ctx, cl, newRelease, stop := startFenceEnv(t)
+	defer stop()
+	key := newRelease(testName + "-live")
+
+	start := &helmv2.HelmRelease{}
+	if err := cl.Get(ctx, key, start); err != nil {
+		t.Fatalf("get: %v", err)
+	}
+	if acquired, err := (&FluxPlunger{Client: cl, APIReader: cl}).suspendHelmRelease(ctx, start); err != nil || !acquired {
+		t.Fatalf("acquire: acquired=%v err=%v", acquired, err)
+	}
+
+	// The delete lands right after unsuspendHelmRelease reads the live release, and
+	// helm-controller handles it while the release is still suspended.
+	uninstalled := false
+	racing := &FluxPlunger{Client: cl, APIReader: &writeAfterNthGet{Reader: cl, n: 1, write: func() {
+		hr := &helmv2.HelmRelease{}
+		if err := cl.Get(ctx, key, hr); err != nil {
+			t.Fatalf("race: get: %v", err)
+		}
+		if err := cl.Delete(ctx, hr); err != nil {
+			t.Fatalf("race: delete: %v", err)
+		}
+		uninstalled = simulateHelmControllerDelete(t, ctx, cl, key) || uninstalled
+	}}}
+	_ = racing.unsuspendHelmRelease(ctx, start)
+
+	if err := cl.Get(ctx, key, &helmv2.HelmRelease{}); err != nil {
+		t.Fatalf("the release must survive a delete racing the live unsuspend (fence), got %v", err)
+	}
+
+	r := &FluxPlunger{Client: cl, APIReader: cl}
+	req := ctrl.Request{NamespacedName: key}
+	if _, err := r.Reconcile(ctx, req); err != nil {
+		t.Fatalf("reconcile of the terminating release: %v", err)
+	}
+	uninstalled = simulateHelmControllerDelete(t, ctx, cl, key) || uninstalled
+	if !uninstalled {
+		t.Fatalf("the delete must reach the Helm uninstall")
+	}
+	if _, err := r.Reconcile(ctx, req); err != nil {
+		t.Fatalf("reconcile after the uninstall: %v", err)
+	}
+	if err := cl.Get(ctx, key, &helmv2.HelmRelease{}); !apierrors.IsNotFound(err) {
+		t.Fatalf("after the uninstall the fence must be lifted and the release gone, got %v", err)
+	}
+}
+
+// TestEnvtest_ApplyNeverRecreatesAVanishedRelease pins that flux-plunger's apply
+// cannot resurrect a release. Server-side apply creates what does not exist, so an
+// apply decided on a read of a release that has since gone (its fence removed by
+// hand, then deleted) would otherwise create an empty HelmRelease carrying the fence.
+func TestEnvtest_ApplyNeverRecreatesAVanishedRelease(t *testing.T) {
+	ctx, cl, newRelease, stop := startFenceEnv(t)
+	defer stop()
+	key := newRelease(testName + "-ghost")
+
+	start := &helmv2.HelmRelease{}
+	if err := cl.Get(ctx, key, start); err != nil {
+		t.Fatalf("get: %v", err)
+	}
+	r := &FluxPlunger{Client: cl, APIReader: cl}
+	if acquired, err := r.suspendHelmRelease(ctx, start); err != nil || !acquired {
+		t.Fatalf("acquire: acquired=%v err=%v", acquired, err)
+	}
+	stale := &helmv2.HelmRelease{}
+	if err := cl.Get(ctx, key, stale); err != nil {
+		t.Fatalf("get: %v", err)
+	}
+
+	// The release goes for good: its finalizers are cleared by hand and it is deleted.
+	gone := stale.DeepCopy()
+	gone.Finalizers = nil
+	if err := cl.Update(ctx, gone); err != nil {
+		t.Fatalf("clear finalizers: %v", err)
+	}
+	if err := cl.Delete(ctx, gone); err != nil {
+		t.Fatalf("delete: %v", err)
+	}
+	if err := cl.Get(ctx, key, &helmv2.HelmRelease{}); !apierrors.IsNotFound(err) {
+		t.Fatalf("setup: release must be gone, got %v", err)
+	}
+
+	for _, apply := range []struct {
+		name string
+		run  func() error
+	}{
+		{"relinquish", func() error { return r.applyRecoveryState(ctx, stale, nil, false, false) }},
+		{"keep the fence", func() error { return r.applyRecoveryState(ctx, stale, nil, true, false) }},
+	} {
+		_ = apply.run()
+		if err := cl.Get(ctx, key, &helmv2.HelmRelease{}); !apierrors.IsNotFound(err) {
+			t.Fatalf("%s apply on a vanished release must not recreate it, got %v", apply.name, err)
+		}
+	}
+}
diff --git a/internal/controller/kubeovnplunger/kubeovn_plunger.go b/internal/controller/kubeovnplunger/kubeovn_plunger.go
index 5d4b3d1d0f..a45fba0739 100644
--- a/internal/controller/kubeovnplunger/kubeovn_plunger.go
+++ b/internal/controller/kubeovnplunger/kubeovn_plunger.go
@@ -64,7 +64,7 @@ func (r *KubeOVNPlunger) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.
 		if env.Name != "NODE_IPS" {
 			continue
 		}
-		for _, ip := range strings.Split(env.Value, ",") {
+		for ip := range strings.SplitSeq(env.Value, ",") {
 			iphints[ip] = ""
 		}
 		break
diff --git a/internal/controller/kubeovnplunger/metrics.go b/internal/controller/kubeovnplunger/metrics.go
index 0bdd5970fb..1330db8143 100644
--- a/internal/controller/kubeovnplunger/metrics.go
+++ b/internal/controller/kubeovnplunger/metrics.go
@@ -336,10 +336,7 @@ func (r *KubeOVNPlunger) WriteMemberMetrics(db string, snaps []ovnstatus.HealthS
 		r.metrics.memberIndex.WithLabelValues(db, cid, sid).Set(float64(s.Local.Index))
 
 		if lIdx != nil && s.Local.Index >= 0 {
-			gap := *lIdx - s.Local.Index
-			if gap < 0 {
-				gap = 0
-			}
+			gap := max(*lIdx-s.Local.Index, 0)
 			r.metrics.memberIndexGap.WithLabelValues(db, cid, sid).Set(float64(gap))
 		}
 
diff --git a/internal/controller/kubeovnplunger/metrics_test.go b/internal/controller/kubeovnplunger/metrics_test.go
new file mode 100644
index 0000000000..6db9ed08d4
--- /dev/null
+++ b/internal/controller/kubeovnplunger/metrics_test.go
@@ -0,0 +1,112 @@
+package kubeovnplunger
+
+import (
+	"strings"
+	"testing"
+
+	"github.com/cozystack/cozystack/pkg/ovnstatus"
+	"github.com/prometheus/client_golang/prometheus"
+	"github.com/prometheus/client_golang/prometheus/testutil"
+)
+
+func writeTwoMemberCluster(r *KubeOVNPlunger, db, cid, leaderSID, followerSID, leaderIP, followerIP string) {
+	snaps := []ovnstatus.HealthSnapshot{
+		{Local: ovnstatus.ServerLocalView{Leader: true, Connected: true, CID: cid, SID: leaderSID, Index: 100}},
+		{Local: ovnstatus.ServerLocalView{Connected: true, CID: cid, SID: followerSID, Index: 97}},
+	}
+	members := map[string]string{
+		leaderSID:   "ssl:" + leaderIP + ":6643",
+		followerSID: "ssl:" + followerIP + ":6643",
+	}
+	views := []ovnstatus.MemberView{
+		{FromSID: leaderSID, Members: members},
+		{FromSID: followerSID, Members: members},
+	}
+	ecv := ovnstatus.ExtendedConsensusResult{
+		ConsensusResult: ovnstatus.ConsensusResult{AllAgree: true, HasMajority: true},
+		UnionMembers:    []string{leaderSID, followerSID},
+		MembersCount:    2,
+		DistinctIPCount: 2,
+		UnexpectedIPs:   []string{"10.0.0.9"},
+	}
+	r.WriteClusterMetrics(db, snaps, ecv, 3)
+	r.WriteMemberMetrics(db, snaps, views, ecv)
+}
+
+// TestMetrics_DeleteAllForDropsOnlyThatCluster pins the series that
+// WriteClusterMetrics and WriteMemberMetrics export, and that
+// deleteAllFor removes every series of one {db,cid} while leaving the
+// other cluster's series in place.
+func TestMetrics_DeleteAllForDropsOnlyThatCluster(t *testing.T) {
+	reg := prometheus.NewRegistry()
+	r := &KubeOVNPlunger{Registry: reg, lastLeader: map[string]string{}}
+	r.initMetrics()
+
+	writeTwoMemberCluster(r, "nb", "cid-stale", "sid-a1", "sid-a2", "10.0.0.1", "10.0.0.2")
+	writeTwoMemberCluster(r, "nb", "cid-live", "sid-b1", "sid-b2", "10.0.1.1", "10.0.1.2")
+
+	names := []string{
+		"ovn_cluster_quorum",
+		"ovn_cluster_members_expected",
+		"ovn_consensus_unexpected_ip",
+		"ovn_member_connected",
+		"ovn_member_index_gap",
+	}
+	before := `
+# HELP ovn_cluster_quorum 1 if cluster has quorum, else 0
+# TYPE ovn_cluster_quorum gauge
+ovn_cluster_quorum{cid="cid-live",db="nb"} 1
+ovn_cluster_quorum{cid="cid-stale",db="nb"} 1
+# HELP ovn_cluster_members_expected Expected cluster size (replicas)
+# TYPE ovn_cluster_members_expected gauge
+ovn_cluster_members_expected{cid="cid-live",db="nb"} 3
+ovn_cluster_members_expected{cid="cid-stale",db="nb"} 3
+# HELP ovn_consensus_unexpected_ip Unexpected IP present in OVN; value fixed at 1
+# TYPE ovn_consensus_unexpected_ip gauge
+ovn_consensus_unexpected_ip{cid="cid-live",db="nb",ip="10.0.0.9"} 1
+ovn_consensus_unexpected_ip{cid="cid-stale",db="nb",ip="10.0.0.9"} 1
+# HELP ovn_member_connected 1 if local server reports connected/quorum, else 0
+# TYPE ovn_member_connected gauge
+ovn_member_connected{cid="cid-live",db="nb",ip="10.0.1.1",sid="sid-b1"} 1
+ovn_member_connected{cid="cid-live",db="nb",ip="10.0.1.2",sid="sid-b2"} 1
+ovn_member_connected{cid="cid-stale",db="nb",ip="10.0.0.1",sid="sid-a1"} 1
+ovn_member_connected{cid="cid-stale",db="nb",ip="10.0.0.2",sid="sid-a2"} 1
+# HELP ovn_member_index_gap Leader index minus local index (>=0)
+# TYPE ovn_member_index_gap gauge
+ovn_member_index_gap{cid="cid-live",db="nb",sid="sid-b1"} 0
+ovn_member_index_gap{cid="cid-live",db="nb",sid="sid-b2"} 3
+ovn_member_index_gap{cid="cid-stale",db="nb",sid="sid-a1"} 0
+ovn_member_index_gap{cid="cid-stale",db="nb",sid="sid-a2"} 3
+`
+	if err := testutil.GatherAndCompare(reg, strings.NewReader(before), names...); err != nil {
+		t.Fatalf("metrics after write:\n%v", err)
+	}
+
+	r.deleteAllFor("nb", "cid-stale")
+
+	after := `
+# HELP ovn_cluster_quorum 1 if cluster has quorum, else 0
+# TYPE ovn_cluster_quorum gauge
+ovn_cluster_quorum{cid="cid-live",db="nb"} 1
+# HELP ovn_cluster_members_expected Expected cluster size (replicas)
+# TYPE ovn_cluster_members_expected gauge
+ovn_cluster_members_expected{cid="cid-live",db="nb"} 3
+# HELP ovn_consensus_unexpected_ip Unexpected IP present in OVN; value fixed at 1
+# TYPE ovn_consensus_unexpected_ip gauge
+ovn_consensus_unexpected_ip{cid="cid-live",db="nb",ip="10.0.0.9"} 1
+# HELP ovn_member_connected 1 if local server reports connected/quorum, else 0
+# TYPE ovn_member_connected gauge
+ovn_member_connected{cid="cid-live",db="nb",ip="10.0.1.1",sid="sid-b1"} 1
+ovn_member_connected{cid="cid-live",db="nb",ip="10.0.1.2",sid="sid-b2"} 1
+# HELP ovn_member_index_gap Leader index minus local index (>=0)
+# TYPE ovn_member_index_gap gauge
+ovn_member_index_gap{cid="cid-live",db="nb",sid="sid-b1"} 0
+ovn_member_index_gap{cid="cid-live",db="nb",sid="sid-b2"} 3
+`
+	if err := testutil.GatherAndCompare(reg, strings.NewReader(after), names...); err != nil {
+		t.Fatalf("metrics after deleteAllFor(nb, cid-stale):\n%v", err)
+	}
+	if got := testutil.CollectAndCount(r.metrics.snapshotTimestampSec); got != 1 {
+		t.Errorf("snapshot timestamp series after delete = %d, want 1", got)
+	}
+}
diff --git a/internal/controller/tenantgateway/conflict.go b/internal/controller/tenantgateway/conflict.go
index 671a0c13d5..8de878bc2d 100644
--- a/internal/controller/tenantgateway/conflict.go
+++ b/internal/controller/tenantgateway/conflict.go
@@ -18,14 +18,16 @@ package tenantgateway
 
 import (
 	"context"
+	"errors"
 	"fmt"
+	"slices"
 	"sort"
 	"strings"
 
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	apimeta "k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
-	"sigs.k8s.io/controller-runtime/pkg/log"
 	gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
 	gatewayv1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2"
 
@@ -42,6 +44,19 @@ const (
 	routeKindTLS
 )
 
+// String names the kind the way the API does, for an error that has to
+// say which object a write failed on.
+func (k routeKind) String() string {
+	switch k {
+	case routeKindHTTP:
+		return "HTTPRoute"
+	case routeKindTLS:
+		return "TLSRoute"
+	default:
+		return fmt.Sprintf("route kind %d", int(k))
+	}
+}
+
 // ControllerName is the value used in HTTPRoute.Status.Parents[].ControllerName
 // for entries written by this reconciler. Distinct from any GatewayClass
 // controllerName (Cilium etc.) so multiple controllers can coexist.
@@ -59,36 +74,310 @@ type routeRef struct {
 	parentRef gatewayv1.ParentReference // exact ref the route used to attach
 }
 
-// resolveHostnameOwners groups hostnames by owner-route and decides
-// who wins when more than one route claims the same hostname.
-// Returns:
-//   - winners: hostname -> the routeRef that should produce a listener.
-//   - losers: routeRef -> []hostname for which this route is NOT the winner.
+// servableOn reports whether ref could be served on hostname h by any
+// passthrough listener this TenantGateway renders.
+//
+// The question is per route, not per hostname, and that is the whole
+// point: a claim can overlap several reserved hostnames, so "some
+// listener here admits every namespace" is true of the claim while
+// being false of the listener this particular route asked for. A
+// sectionName pins the route to one listener, and then only that
+// listener's own hostname and attach set decide.
+//
+// byHostname maps each rendered passthrough hostname to the listener
+// answering it, which carries the port it is published on and whether
+// it admits the publishing tenant alone, as the native-port ones do.
+// The caller is expected to have found at least one entry overlapping
+// h before asking; a hostname nothing answers is a different shape,
+// built by the caller with its own cause.
+//
+// sections maps a rendered passthrough listener name to the hostname it
+// answers, and holds nothing else, so a sectionName absent from it
+// names no passthrough listener. That covers two shapes and they do not
+// get the same answer. A name carrying the passthrough prefix is one
+// this controller renders the whole namespace of, so its absence is a
+// fact: the route attaches to nothing, and it is told so. A name
+// outside the prefix belongs to another listener family, the
+// HTTPS-terminate ones among them, whose set is what the caller's loop
+// is still computing; there the route is unserved for a reason this
+// function does not model, so it comes back with withdrawnNone and the
+// caller records no refusal: the route is then written Accepted like
+// any attached route, and the class controller's own entry answers for
+// the listener it named. Either way it is not
+// servable, which matters on its own, because this verdict is also
+// membership in the ownership race and a route that can never attach
+// must not take a hostname away from one that can.
+//
+// On refusal the second return says which leg failed, because the two
+// send an operator to different places and one of them can fire on a
+// route inside the tenant, where a namespace refusal would contradict
+// the object it is written on.
+func servableOn(ref routeRef, h, tenantNamespace string, byHostname map[string]passthroughListener, sections map[string]string) (bool, withdrawalCause, string) {
+	pinned := ""
+	if ref.parentRef.SectionName != nil {
+		name := string(*ref.parentRef.SectionName)
+		named, exists := sections[name]
+		if !exists {
+			// Inside the passthrough listener namespace the answer is
+			// knowable, because every listener there is rendered from
+			// this spec: a name absent from sections names none, so the
+			// route attaches to nothing whatever answers its hostname.
+			// Outside it the name belongs to a listener family this
+			// pass cannot enumerate — the terminate listeners are the
+			// output of the loop this feeds, so their names are not
+			// settled while it runs — and a refusal would be a guess.
+			if strings.HasPrefix(name, passthroughListenerPrefix) {
+				return false, withdrawnNoSuchSection, ""
+			}
+			return false, withdrawnNone, ""
+		}
+		pinned = named
+	}
+	// refusedBy is the name of a listener that matched and then turned
+	// this route away, and it is the third return because the message
+	// has to name that one. The caller's own pick is the smallest
+	// overlapping name, chosen for stable text, and on a claim covering
+	// several reserved names that is regularly a listener which would
+	// have admitted the route. Smallest is also what makes it stable
+	// here: the map iterates in no order, so without it two reconciles
+	// could name two different refusers and rewrite the condition.
+	refusedBy := ""
+	sectionAnswers := false
+	portAnswers := ref.parentRef.Port == nil
+	for rh, l := range byHostname {
+		if !hostnamesOverlap(rh, h) {
+			continue
+		}
+		if pinned != "" && rh != pinned {
+			continue
+		}
+		sectionAnswers = true
+		// A parentRef may pin the listener by port as well as by name,
+		// and Gateway API requires both to match when both are given.
+		// Without this a route naming port 443 attaches to nothing on a
+		// native-port listener and is still told it is fine.
+		if ref.parentRef.Port != nil && int32(*ref.parentRef.Port) != l.port {
+			continue
+		}
+		portAnswers = true
+		if l.tenantOnly && ref.namespace != tenantNamespace {
+			if refusedBy == "" || rh < refusedBy {
+				refusedBy = rh
+			}
+			continue
+		}
+		return true, withdrawnNone, ""
+	}
+	// Reaching here with a pinned listener that never matched the name
+	// means the sectionName is the reason, whatever the namespace is.
+	if pinned != "" && !sectionAnswers {
+		return false, withdrawnSectionMismatch, ""
+	}
+	// The name matched and the port did not. Reported apart from the
+	// sectionName case because the field the route's owner edits is a
+	// different one, and apart from the namespace case because the
+	// route may well be inside the tenant.
+	if !portAnswers {
+		return false, withdrawnPortMismatch, ""
+	}
+	return false, withdrawnForeignNamespace, refusedBy
+}
+
+// httpClaimVerdict is what an HTTPRoute's claim on one hostname earns
+// before the hostname race and the passthrough overlap are consulted.
+type httpClaimVerdict int
+
+const (
+	// httpClaimTerminates: the claim stands, and earns the terminate
+	// listener unless a passthrough listener takes the name.
+	httpClaimTerminates httpClaimVerdict = iota
+	// httpClaimServedPlain: the route selected the port-80 listener and
+	// is admitted by it, so it is served there as plain HTTP. It earns
+	// no terminate listener, which it would never attach to, and is
+	// refused nothing, because it is served exactly as it asked.
+	httpClaimServedPlain
+	// httpClaimRefused: the route attaches to no listener that could
+	// serve this hostname, for the cause carried in the returned
+	// withdrawnHostname.
+	httpClaimRefused
+)
+
+// judgeHTTPRouteClaim is servableOn's counterpart for an HTTPRoute:
+// whether this route could be served on hostname h by a listener this
+// TenantGateway renders for it. The listener in question is the HTTP-01
+// terminate listener, published on httpsListenerPort, and the refusals
+// are the ways the route can be unable to reach one.
+//
+// A sectionName naming a rendered passthrough listener pins the route
+// to a listener that forwards a stream it never terminates and takes
+// TLSRoute alone by protocol; one naming a passthrough listener this
+// Gateway does not render pins it to nothing. A wildcard hostname is one HTTP-01 can
+// terminate for nobody: the terminate listener carries a certificate
+// this controller orders through the HTTP-01 challenge, and the issuers
+// the platform accepts do not issue a wildcard through that challenge
+// (Let's Encrypt, Challenge Types: "This challenge cannot be used to
+// issue wildcard certificates"), so the order would never complete and
+// the listener would reference a Secret that never arrives; the
+// wildcard modes serve such a route from the apex-wide listener
+// instead. That refusal is a statement about the terminate listener
+// rather than about the route, so it is judged where that listener is
+// decided rather than at the top: the port-80 listener carries no
+// hostname and serves a wildcard claim like any other, and a route
+// selecting it never needed the listener HTTP-01 cannot supply. No
+// overlap is read either way, because no listener setting changes it.
+// A parentRef port
+// attaches the route to the listeners on that port alone, so a port the
+// terminate listener is not published on is judged the way servableOn
+// judges it for a TLSRoute, with the one port the Gateway answers HTTP
+// on read for what it is: the port-80 listener carries no hostname and
+// admits httpListenerNamespaces alone. A route selects it by pinning
+// its port, by naming it, or both; from one of those namespaces the
+// route is served plain, from anywhere else the listener turns it away
+// and it is told so, and a name and a port that select different
+// listeners, http with port 443 for one, select none, which Gateway API
+// requires when both are given. The solver route cert-manager writes
+// for the ACME challenge names the listener without a port, from the
+// namespace the Certificate lives in, so it is served plain.
+//
+// A sectionName outside the passthrough prefix and not http names a
+// listener family this pass is still deciding, and such a route is left
+// to terminate as any unpinned one; servableOn says why.
+//
+// Which verdict comes first matters only for a route hit by more than
+// one, and the order is the order in which the owner would have to act:
+// a listener the sectionName names is refused whatever port it sits on,
+// and a wildcard is refused only once the route is judged to want the
+// terminate listener at all.
+func judgeHTTPRouteClaim(ref routeRef, h string, tgw *gatewayv1alpha1.TenantGateway, sections map[string]string) (withdrawnHostname, httpClaimVerdict) {
+	w := withdrawnHostname{hostname: h}
+	hasSection := ref.parentRef.SectionName != nil
+	section := ""
+	if hasSection {
+		section = string(*ref.parentRef.SectionName)
+		if _, rendersIt := sections[section]; rendersIt {
+			w.section = section
+			w.cause = withdrawnKindNotAdmitted
+			return w, httpClaimRefused
+		}
+		// Inside the passthrough namespace every listener is rendered
+		// from this spec, so a name absent from sections names none,
+		// and the route attaches to nothing whatever answers its
+		// hostname; the same reading servableOn gives a TLSRoute.
+		if strings.HasPrefix(section, passthroughListenerPrefix) {
+			w.section = section
+			w.cause = withdrawnNoSuchSection
+			return w, httpClaimRefused
+		}
+	}
+	hasPort := ref.parentRef.Port != nil
+	var port int32
+	if hasPort {
+		port = int32(*ref.parentRef.Port)
+	}
+	namesHTTP := hasSection && section == httpListenerName
+	pinsHTTPPort := hasPort && port == httpListenerPort
+	switch {
+	case (namesHTTP && hasPort && !pinsHTTPPort) || (pinsHTTPPort && hasSection && !namesHTTP):
+		// The http listener is the only one on its port, so a name and
+		// a port that disagree about it select nothing.
+		w.section = section
+		w.port = port
+		w.cause = withdrawnSectionPortMismatch
+		return w, httpClaimRefused
+	case namesHTTP || pinsHTTPPort:
+		if httpListenerAdmits(tgw, ref.namespace) {
+			return w, httpClaimServedPlain
+		}
+		w.cause = withdrawnHTTPListenerNamespace
+		return w, httpClaimRefused
+	case !hasPort || port == httpsListenerPort:
+		// Reached only once the route is judged to want the terminate
+		// listener, which is the one HTTP-01 cannot carry a wildcard
+		// certificate for. The branches above take the route that
+		// asked for the port-80 listener instead, and that listener
+		// serves a claim whatever shape its hostname has.
+		if isWildcardHostname(h) {
+			w.cause = withdrawnWildcardHostname
+			return w, httpClaimRefused
+		}
+		return w, httpClaimTerminates
+	}
+	w.port = port
+	w.cause = withdrawnPortMismatch
+	return w, httpClaimRefused
+}
+
+// httpListenerAdmits reports whether the port-80 listener's namespace
+// selector admits a route from namespace.
+func httpListenerAdmits(tgw *gatewayv1alpha1.TenantGateway, namespace string) bool {
+	return slices.Contains(httpListenerNamespaces(tgw), namespace)
+}
+
+// keepsLoss reports whether a refusal for cause leaves a loss the
+// hostname race recorded on the route. A cause that describes a
+// listener answering the name makes the race beside the point, so the
+// loss goes with the hostname. A cause that says only what the route
+// asked for, a section that names no listener or a listener that
+// cannot take its kind, says nothing about who holds the name: the
+// route took nothing from anyone, and the loss to whoever did claim it
+// is as true as before.
+func keepsLoss(cause withdrawalCause) bool {
+	return cause == withdrawnNoSuchSection || cause == withdrawnKindNotAdmitted || cause == withdrawnSectionPortMismatch
+}
+
+// rankRouteRefs orders claimants the way ownership decides them:
+// cozy-* namespaces first, then by namespace and name. Shared rather
+// than inlined because a hostname a passthrough listener answers has
+// its race recounted over the TLSRoutes alone, and a second copy of
+// the order would let the two counts disagree about who won.
+func rankRouteRefs(refs []routeRef) {
+	sort.Slice(refs, func(i, j int) bool {
+		ic := strings.HasPrefix(refs[i].namespace, "cozy-")
+		jc := strings.HasPrefix(refs[j].namespace, "cozy-")
+		if ic != jc {
+			return ic // cozy-* sorts first
+		}
+		if refs[i].namespace != refs[j].namespace {
+			return refs[i].namespace < refs[j].namespace
+		}
+		return refs[i].name < refs[j].name
+	})
+}
+
+// dropLostHostname removes one hostname from a route's loser record,
+// deleting the entry when nothing is left, so an empty slice never
+// reads as "lost something".
+func dropLostHostname(losers map[routeRef][]string, ref routeRef, hostname string) {
+	if rest := slices.DeleteFunc(losers[ref], func(lost string) bool { return lost == hostname }); len(rest) > 0 {
+		losers[ref] = rest
+	} else {
+		delete(losers, ref)
+	}
+}
+
+// resolveHostnameOwners decides who wins when more than one route
+// claims the same hostname, and returns the routes that lost:
+// routeRef -> []hostname for which this route is NOT the winner.
+//
+// The winners are resolved but not returned, because ownership decides
+// route status and not what gets rendered. A hostname carries at most
+// one listener however many routes claim it, and runReconcileSteps
+// derives that from the claims themselves, so a winner of the wrong
+// kind cannot take a terminate listener away from an HTTPRoute that
+// also claimed the name.
 //
 // Rule: cozy-* namespace beats anything else; within the same priority
 // tier the route with the lexicographically smallest namespace/name
 // pair wins (deterministic).
-func resolveHostnameOwners(claims map[string][]routeRef) (map[string]routeRef, map[routeRef][]string) {
-	winners := make(map[string]routeRef, len(claims))
+func resolveHostnameOwners(claims map[string][]routeRef) map[routeRef][]string {
 	losers := make(map[routeRef][]string)
 
 	for hostname, refs := range claims {
 		if len(refs) == 0 {
 			continue
 		}
-		sort.Slice(refs, func(i, j int) bool {
-			ic := strings.HasPrefix(refs[i].namespace, "cozy-")
-			jc := strings.HasPrefix(refs[j].namespace, "cozy-")
-			if ic != jc {
-				return ic // cozy-* sorts first
-			}
-			if refs[i].namespace != refs[j].namespace {
-				return refs[i].namespace < refs[j].namespace
-			}
-			return refs[i].name < refs[j].name
-		})
+		rankRouteRefs(refs)
 		winner := refs[0]
-		winners[hostname] = winner
 		for _, lr := range refs[1:] {
 			// Same-namespace routes claiming the same hostname are
 			// not a conflict — Gateway API merges them by path /
@@ -100,7 +389,179 @@ func resolveHostnameOwners(claims map[string][]routeRef) (map[string]routeRef, m
 			losers[lr] = append(losers[lr], hostname)
 		}
 	}
-	return winners, losers
+	return losers
+}
+
+// withdrawalCause names why the controller declined to serve a
+// hostname. Named rather than inferred from an empty field, because
+// the cases read differently to an operator and the difference decides
+// where they go looking: a namespace refusal sends them to the attach
+// list, a section mismatch to the route's own parentRef.
+type withdrawalCause int
+
+const (
+	// withdrawnNone: no cause, returned alongside a servable verdict.
+	// Explicit rather than the zero value of a real cause, so that
+	// "nothing was withdrawn" cannot be read as a decision.
+	withdrawnNone withdrawalCause = iota
+	// withdrawnAnswered: a passthrough listener answers the name, so no
+	// terminate listener is rendered for it.
+	withdrawnAnswered
+	// withdrawnUnanswered: nothing answers the name at all.
+	withdrawnUnanswered
+	// withdrawnForeignNamespace: a native-port listener answers the
+	// name but admits only the tenant's own namespace, so this route
+	// cannot attach to it however the hostname resolves.
+	withdrawnForeignNamespace
+	// withdrawnSectionMismatch: the route pinned itself to a listener
+	// by sectionName, that listener exists, and it answers a different
+	// hostname. Distinct from the namespace case because it happens to
+	// routes inside the tenant too, where blaming the namespace states
+	// something the object itself contradicts.
+	withdrawnSectionMismatch
+	// withdrawnPortMismatch: the route pinned itself to a listener by
+	// parentRef.port, a listener answers its hostname, and it is
+	// published on another port. Gateway API requires a pinned port to
+	// match the selected listener, so the route attaches to nothing.
+	withdrawnPortMismatch
+	// withdrawnNoSuchSection: the route pinned itself by sectionName to
+	// a passthrough listener this Gateway does not render. Separate
+	// from withdrawnSectionMismatch, where the named listener exists
+	// and answers another hostname: there the operator moves the route
+	// or the hostname, here the name itself is wrong.
+	withdrawnNoSuchSection
+	// withdrawnKindNotAdmitted: an HTTPRoute pinned itself by
+	// sectionName to a rendered passthrough listener, which forwards a
+	// stream it never terminates and takes TLSRoute alone by protocol.
+	// The only cause that judges a route's kind, and the only one an
+	// HTTPRoute reaches through its sectionName; the section causes
+	// above are reached by TLSRoutes, whose kind a passthrough listener
+	// does take.
+	withdrawnKindNotAdmitted
+	// withdrawnWildcardHostname: an HTTPRoute claimed a wildcard under
+	// certMode http01, whose terminate listener would carry a
+	// certificate the HTTP-01 challenge cannot issue for a wildcard
+	// name. Refused before any overlap is read, because no listener
+	// setting changes it; the wildcard modes serve such a route from
+	// the apex-wide listener.
+	withdrawnWildcardHostname
+	// withdrawnHTTPListenerNamespace: an HTTPRoute selected the port-80
+	// listener, by port or by name, from a namespace that listener does
+	// not admit. The listener answered and turned the route away, the
+	// shape withdrawnForeignNamespace has on a native-port listener, kept
+	// apart because the message names a different listener and a
+	// different attach set.
+	withdrawnHTTPListenerNamespace
+	// withdrawnSectionPortMismatch: an HTTPRoute pinned a sectionName and
+	// a parentRef port that select different listeners. Gateway API
+	// requires both to match one listener when both are given, so the
+	// route attaches to nothing, whatever answers its hostname.
+	withdrawnSectionPortMismatch
+)
+
+// withdrawnHostname pairs a hostname the controller declined to serve
+// with the passthrough hostname involved, empty when the cause is that
+// nothing answers it. The pair is carried rather than the claimed name
+// alone because a wildcard entry is not derivable from the route: the
+// route claims pg.db.<apex> and the spec that took it away says
+// *.db.<apex>.
+type withdrawnHostname struct {
+	hostname   string
+	answeredBy string
+	cause      withdrawalCause
+	// section carries the sectionName that missed, for
+	// withdrawnSectionMismatch and withdrawnNoSuchSection. The message
+	// has to name it, because it is the field the route's owner edits.
+	// answeredBy then carries what the named listener does answer, and
+	// is empty for withdrawnNoSuchSection, where it answers nothing.
+	section string
+	// port carries the parentRef port that missed, for
+	// withdrawnPortMismatch only, with answeredBy naming the listener
+	// that does answer the hostname on a port of its own.
+	port int32
+}
+
+// describeWithdrawn renders the pairs in a stable order, dropping
+// repeats: one route may list a hostname twice, since Gateway API
+// declares spec.hostnames a plain array. The message is rebuilt on
+// every reconcile, so an unstable order would rewrite the condition
+// each pass and churn the route's status forever.
+//
+// Each cause is rendered separately, because a route hit by more than
+// one of them has to be told about each.
+func describeWithdrawn(hostnames []withdrawnHostname) withdrawnByCause {
+	var withListener, without, elsewhere, wrongSection, onAnotherPort, noSuchSection, refusedKind, wildcard, httpRefused, sectionPort []string
+	for _, h := range hostnames {
+		switch h.cause {
+		case withdrawnHTTPListenerNamespace:
+			httpRefused = append(httpRefused, h.hostname)
+		case withdrawnSectionPortMismatch:
+			sectionPort = append(sectionPort, fmt.Sprintf("%s (sectionName %s, port %d)", h.hostname, h.section, h.port))
+		case withdrawnWildcardHostname:
+			wildcard = append(wildcard, h.hostname)
+		case withdrawnKindNotAdmitted:
+			refusedKind = append(refusedKind, fmt.Sprintf("%s (sectionName %s)", h.hostname, h.section))
+		case withdrawnNoSuchSection:
+			noSuchSection = append(noSuchSection, fmt.Sprintf("%s (sectionName %s)", h.hostname, h.section))
+		case withdrawnSectionMismatch:
+			wrongSection = append(wrongSection, fmt.Sprintf("%s (sectionName %s answers %s)", h.hostname, h.section, h.answeredBy))
+		case withdrawnPortMismatch:
+			onAnotherPort = append(onAnotherPort, fmt.Sprintf("%s (port %d, answered on another port)", h.hostname, h.port))
+		case withdrawnUnanswered:
+			without = append(without, h.hostname)
+		case withdrawnForeignNamespace:
+			// The pair is only worth printing when it says something the
+			// hostname does not: for a wildcard claim the matched entry
+			// is a different string, for a concrete one it is the same.
+			if h.answeredBy == h.hostname {
+				elsewhere = append(elsewhere, h.hostname)
+			} else {
+				elsewhere = append(elsewhere, fmt.Sprintf("%s (matched by %s)", h.hostname, h.answeredBy))
+			}
+		case withdrawnAnswered:
+			withListener = append(withListener, fmt.Sprintf("%s (answered by %s)", h.hostname, h.answeredBy))
+		}
+	}
+	sort.Strings(withListener)
+	sort.Strings(without)
+	sort.Strings(elsewhere)
+	sort.Strings(wrongSection)
+	sort.Strings(onAnotherPort)
+	sort.Strings(noSuchSection)
+	sort.Strings(refusedKind)
+	sort.Strings(wildcard)
+	sort.Strings(httpRefused)
+	sort.Strings(sectionPort)
+	return withdrawnByCause{
+		answered:      strings.Join(slices.Compact(withListener), ", "),
+		unserved:      strings.Join(slices.Compact(without), ", "),
+		foreign:       strings.Join(slices.Compact(elsewhere), ", "),
+		mismatched:    strings.Join(slices.Compact(wrongSection), ", "),
+		wrongPort:     strings.Join(slices.Compact(onAnotherPort), ", "),
+		absentSection: strings.Join(slices.Compact(noSuchSection), ", "),
+		refusedKind:   strings.Join(slices.Compact(refusedKind), ", "),
+		wildcard:      strings.Join(slices.Compact(wildcard), ", "),
+		httpRefused:   strings.Join(slices.Compact(httpRefused), ", "),
+		sectionPort:   strings.Join(slices.Compact(sectionPort), ", "),
+	}
+}
+
+// withdrawnByCause holds one rendered hostname list per refusal cause,
+// each empty when no hostname on the route hit that cause. Named fields
+// rather than a return list: every one is a string, so a positional
+// form binds one interchangeable value per cause at the call site and a
+// swapped pair compiles.
+type withdrawnByCause struct {
+	answered      string
+	unserved      string
+	foreign       string
+	mismatched    string
+	wrongPort     string
+	absentSection string
+	refusedKind   string
+	wildcard      string
+	httpRefused   string
+	sectionPort   string
 }
 
 // updateRouteStatuses writes RouteParentStatus entries under our
@@ -110,35 +571,179 @@ func resolveHostnameOwners(claims map[string][]routeRef) (map[string]routeRef, m
 // at least one hostname race. Other controllers' entries (Cilium
 // etc.) are untouched.
 //
-// allRefs is the full set of (route, parentRef) tuples observed by
-// collectHostnameClaims — without it, multi-parentRef routes would
-// only get a status entry for whichever ref happened to win the
-// per-hostname race, dropping per-section visibility for the others.
+// attached is every (route, parentRef) tuple collectHostnameClaims
+// found on this Gateway, and claimed the subset that carried a
+// hostname. Both are needed and neither is derivable from the map of
+// claims: claimed keyed by tuple rather than by hostname is what gives
+// a multi-parentRef route an entry per ref instead of one for whichever
+// ref won the per-hostname race, and the difference between the two
+// sets is the tuples this controller has to stop having an opinion on.
+//
+// withdrawn carries the tuples the controller declined to serve. None
+// of them lost a race, so HostnameConflict would misname the cause,
+// and what separates the rest is how precisely Gateway API can name
+// the refusal. Two of Gateway API's own reasons are reached:
+// NotAllowedByListeners, where a listener matches the route and turns
+// it away, refusing its namespace, on a native-port listener or on the
+// port-80 one, or, for an HTTPRoute pinning a passthrough listener,
+// being unable to serve its kind; and NoMatchingParent, for a
+// sectionName naming a passthrough listener this Gateway does not
+// render, or a sectionName and a parentRef port that select different
+// listeners, which is what Gateway API calls a parentRef whose port or
+// section matches no listener. The rest land on
+// NoMatchingListenerHostname, which is where the residue goes rather
+// than a shape in its own right; the shapes are enumerated on the
+// withdrawalCause constants, so a cause added later cannot slip past a
+// list here that nobody updated. Reading that reason as the absence of
+// a listener is wrong for most of what reaches it: a passthrough
+// listener answers the SNI and, in the port-443 form, admits routes
+// from every namespace attached to this Gateway, and a listener a route
+// pins by the wrong sectionName or the wrong parentRef port is rendered
+// and serving, just not to this route. Either way the route condition is the only
+// object left that can say why, the listener that used to carry a
+// condition of its own having gone with it.
+//
+// A write that fails is returned, after every other route has had its
+// write, rather than logged. Returned, because the condition is the
+// only object saying why a hostname stopped being served, and a pass
+// that reports success over a lost write leaves the route reading
+// Accepted=True until the resync; failing the reconcile puts the write
+// under its own requeue. After the others, because one route's
+// conflict is no reason to leave the rest a pass behind.
 func (r *Reconciler) updateRouteStatuses(
 	ctx context.Context,
 	tgw *gatewayv1alpha1.TenantGateway,
-	allRefs map[routeRef]struct{},
+	attached map[routeRef]struct{},
+	claimed map[routeRef]struct{},
 	losers map[routeRef][]string,
+	withdrawn map[routeRef][]withdrawnHostname,
 ) error {
-	logger := log.FromContext(ctx)
+	var errs []error
 
 	// LastTransitionTime is set by apimeta.SetStatusCondition inside
 	// mergeRouteParentStatus only when the condition actually
 	// transitions; building Conditions here without it keeps the
 	// no-op reconcile no-op.
-	for ref := range allRefs {
-		if hostnames, isLoser := losers[ref]; isLoser {
-			// A route can claim multiple hostnames; conflict status
-			// takes priority over the happy path.
+	//
+	// Walked over what attached rather than over what claimed, so the
+	// two outcomes are branches of one decision and a ref cannot take
+	// both. Claiming nothing is not a stable property of a route: a
+	// TLSRoute with no spec.hostnames borrows the hostname of each
+	// passthrough listener its parentRef selects, so removing the entry
+	// behind it empties the claim set without the route changing at all,
+	// and an HTTPRoute reaches the same place by dropping its own
+	// hostnames. Judging only what claims would leave the previous
+	// pass's verdict standing over a listener set that no longer exists,
+	// which is what the whole-apex pass drops entries to avoid; the
+	// difference is that here the mode never changed. Retracting says no
+	// more than the controller can support, and it is what a route in
+	// this shape gets on a first pass, so nothing depends on which pass
+	// it arrived by.
+	for ref := range attached {
+		if _, judged := claimed[ref]; !judged {
+			if err := r.dropRouteParentStatus(ctx, ref); err != nil {
+				errs = append(errs, fmt.Errorf("drop status of unclaimed %s %s/%s: %w", ref.kind, ref.namespace, ref.name, err))
+			}
+			continue
+		}
+		lost, isLoser := losers[ref]
+		gone, isWithdrawn := withdrawn[ref]
+		if isLoser || isWithdrawn {
+			// One route can be hit by several causes on different
+			// hostnames, and Gateway API gives it a single Accepted
+			// condition, so the message carries all of them rather
+			// than whichever branch runs first. Only the reason has
+			// to choose.
+			var causes []string
+			// The reason names the shape of the refusal, and the causes
+			// below do not share one. Nothing rendering a listener for
+			// the name is NoMatchingListenerHostname, the default here
+			// and the reason a mixed set of causes settles on, because
+			// a reason true of one claim misleads about the rest. A
+			// race lost to another route reports HostnameConflict even
+			// mixed with others, because it is the half the owner can
+			// act on. A listener matching the name while refusing the
+			// route's namespace is NotAllowedByListeners, which is
+			// what Gateway API calls that case, and only when it is
+			// the whole story.
+			reason := string(gatewayv1.RouteReasonNoMatchingListenerHostname)
+			if isLoser {
+				// Sorted for the same reason describeWithdrawn sorts:
+				// the hostnames come out of a map, and a message that
+				// reorders between passes rewrites the condition, which
+				// writes status, which requeues this object through the
+				// route watch.
+				sort.Strings(lost)
+				// Compacted for the same reason describeWithdrawn
+				// compacts: spec.hostnames is a plain array, so one
+				// route may list a name twice, and the message would
+				// then say it twice.
+				causes = append(causes, fmt.Sprintf("hostname(s) %s already claimed by another route", strings.Join(slices.Compact(lost), ", ")))
+				reason = "HostnameConflict"
+			}
+			if isWithdrawn {
+				desc := describeWithdrawn(gone)
+				if desc.absentSection != "" {
+					causes = append(causes, fmt.Sprintf("hostname(s) %s pinned by sectionName to a TLS-passthrough listener this Gateway does not render", desc.absentSection))
+				}
+				if desc.refusedKind != "" {
+					causes = append(causes, fmt.Sprintf("hostname(s) %s pinned by sectionName to a TLS-passthrough listener, which terminates nothing, so no HTTPRoute is served through it", desc.refusedKind))
+				}
+				if desc.mismatched != "" {
+					causes = append(causes, fmt.Sprintf("hostname(s) %s not served through the sectionName this route names, which answers a different hostname", desc.mismatched))
+				}
+				if desc.wrongPort != "" {
+					causes = append(causes, fmt.Sprintf("hostname(s) %s not served through the parentRef port this route names, which no listener answering them is published on", desc.wrongPort))
+				}
+				if desc.answered != "" {
+					causes = append(causes, fmt.Sprintf("hostname(s) %s answered by a TLS-passthrough listener, so no HTTPS listener is rendered for them", desc.answered))
+				}
+				if desc.unserved != "" {
+					causes = append(causes, fmt.Sprintf("hostname(s) %s claimed only by a TLSRoute, which needs a passthrough listener this Gateway does not declare", desc.unserved))
+				}
+				if desc.wildcard != "" {
+					causes = append(causes, fmt.Sprintf("hostname(s) %s are wildcards, which certMode http01 cannot terminate: the HTTP-01 challenge issues no wildcard certificate, so no HTTPS listener is rendered for them", desc.wildcard))
+				}
+				if desc.sectionPort != "" {
+					causes = append(causes, fmt.Sprintf("hostname(s) %s pinned by sectionName and by parentRef port to listeners that are not one, so they select none", desc.sectionPort))
+				}
+				if desc.httpRefused != "" {
+					causes = append(causes, fmt.Sprintf("hostname(s) %s pinned to the %s listener, which admits routes from namespace(s) %s only", desc.httpRefused, httpListenerName, strings.Join(httpListenerNamespaces(tgw), ", ")))
+				}
+				if desc.foreign != "" {
+					causes = append(causes, fmt.Sprintf("hostname(s) %s served by a native-port listener that admits routes from namespace %s only", desc.foreign, tgw.Namespace))
+				}
+				// Each reason below is checked after every append rather
+				// than beside its own, and counted rather than
+				// enumerated: a reason more precise than the default is
+				// true only when its cause is the whole story, and one
+				// entry says so whatever order the appends ran in, so a
+				// cause added later cannot slip past a list nobody
+				// updated. A listener that answers the route and turns it
+				// away, refusing its namespace or unable to serve its
+				// kind, is NotAllowedByListeners; a parentRef selecting
+				// no listener, a section this Gateway does not render or
+				// a name and a port that disagree, is NoMatchingParent.
+				// One route cannot carry two of these on one hostname,
+				// so at most one of them fires.
+				if len(causes) == 1 {
+					switch {
+					case desc.foreign != "", desc.refusedKind != "", desc.httpRefused != "":
+						reason = string(gatewayv1.RouteReasonNotAllowedByListeners)
+					case desc.absentSection != "", desc.sectionPort != "":
+						reason = string(gatewayv1.RouteReasonNoMatchingParent)
+					}
+				}
+			}
 			if err := r.updateRouteParentStatus(ctx, ref, []metav1.Condition{
 				{
 					Type:    "Accepted",
 					Status:  metav1.ConditionFalse,
-					Reason:  "HostnameConflict",
-					Message: fmt.Sprintf("Hostname(s) %s already claimed by another route on TenantGateway %s/%s", strings.Join(hostnames, ", "), tgw.Namespace, tgw.Name),
+					Reason:  reason,
+					Message: fmt.Sprintf("On TenantGateway %s/%s: %s", tgw.Namespace, tgw.Name, strings.Join(causes, "; ")),
 				},
 			}); err != nil {
-				logger.Error(err, "update loser route status", "route", ref.namespace+"/"+ref.name)
+				errs = append(errs, fmt.Errorf("update status of unserved %s %s/%s: %w", ref.kind, ref.namespace, ref.name, err))
 			}
 			continue
 		}
@@ -150,10 +755,179 @@ func (r *Reconciler) updateRouteStatuses(
 				Message: fmt.Sprintf("Route attached to TenantGateway %s/%s", tgw.Namespace, tgw.Name),
 			},
 		}); err != nil {
-			logger.Error(err, "update winner route status", "route", ref.namespace+"/"+ref.name)
+			errs = append(errs, fmt.Errorf("update status of %s %s/%s: %w", ref.kind, ref.namespace, ref.name, err))
+		}
+	}
+	return errors.Join(errs...)
+}
+
+// reconcileWholeApexRouteStatuses keeps this controller's Accepted
+// condition on attached routes honest in the modes where
+// updateRouteStatuses above says nothing. collectHostnameClaims returns
+// no claims for a whole-apex mode, so that pass runs over an empty ref
+// set and neither writes nor retracts anything.
+//
+// Edge renders no TLS-passthrough listener, so every attached TLSRoute
+// pins a section that is gone and is told so. NoMatchingParent is
+// Gateway API's reason for a parentRef whose port or sectionName
+// matches no listener on the Gateway, which is what the platform's own
+// api, vm-exportproxy and cdi-uploadproxy routes now have: all three
+// pin sectionName tls-<svc>.
+//
+// The other whole-apex modes render those listeners and serve them, but
+// this controller collects no claims there and so has no basis to judge
+// any TLSRoute. It therefore owns no condition on them, and drops the
+// one it wrote while the tenant ran edge. Leaving that behind inverts
+// the problem the withdrawal exists for: a served endpoint reported as
+// matching no parent, with a message naming a class provider that no
+// longer terminates anything.
+//
+// HTTP-01 is not handled here at all: it collects claims, so
+// updateRouteStatuses has already judged every route this pass would
+// have anything to say about.
+//
+// The refusal skips a route that declares no hostnames. Under HTTP-01
+// such a route is judged on the hostname the listener it selects lends
+// it, but that substitution needs a rendered passthrough listener, and
+// these modes are exactly the ones where the route's sectionName may
+// name none. A refusal written here would then have no path back: the
+// HTTP-01 pass judges only routes that produced a claim, so a route
+// pinned to a section it renders no listener for would carry an edge
+// refusal after the tenant moved off edge. The drop does not skip it:
+// the HTTP-01 pass did judge it, on the lent name, and that verdict
+// has no other way out once the mode moves, so what edge writes on such
+// a route is no opinion rather than a refusal.
+//
+// HTTPRoutes are dropped in every whole-apex mode. Every condition this
+// controller writes on one is written under HTTP-01, where the claims
+// pass runs, and the whole-apex modes serve those routes from the
+// apex-wide listener, so a verdict left standing describes a listener
+// set that no longer exists: a wildcard refused under http01 kept
+// saying http01 could not terminate it while dns01 was serving it. The
+// redirect route this controller renders never carries an entry of its
+// own, so it is skipped rather than read.
+func (r *Reconciler) reconcileWholeApexRouteStatuses(ctx context.Context, tgw *gatewayv1alpha1.TenantGateway) error {
+	if !servesWholeApex(tgw) {
+		return nil
+	}
+	withdraw := !rendersTLSPassthrough(tgw)
+	// Collected and returned after the loop, for the reason
+	// updateRouteStatuses gives: the refusal written here is the only
+	// object saying the route attaches to nothing, so a lost write has
+	// to fail the reconcile, and one route's conflict must not leave
+	// the rest unwritten.
+	var errs []error
+
+	allowed, err := r.allowedAttachNamespaces(ctx, tgw)
+	if err != nil {
+		return err
+	}
+	routes := &gatewayv1alpha2.TLSRouteList{}
+	if err := r.List(ctx, routes); err != nil {
+		return fmt.Errorf("list TLSRoutes: %w", err)
+	}
+	for i := range routes.Items {
+		route := &routes.Items[i]
+		if _, ok := allowed[route.Namespace]; !ok {
+			continue
+		}
+		for _, parentRef := range allAttachingParentRefs(route.Spec.ParentRefs, route.Namespace, tgw) {
+			ref := routeRef{
+				kind:      routeKindTLS,
+				namespace: route.Namespace,
+				name:      route.Name,
+				parentRef: parentRef,
+			}
+			var err error
+			if withdraw && len(route.Spec.Hostnames) > 0 {
+				err = r.updateRouteParentStatus(ctx, ref, []metav1.Condition{
+					{
+						Type:    "Accepted",
+						Status:  metav1.ConditionFalse,
+						Reason:  string(gatewayv1.RouteReasonNoMatchingParent),
+						Message: fmt.Sprintf("TenantGateway %s/%s terminates TLS at its class provider and renders no TLS-passthrough listener", tgw.Namespace, tgw.Name),
+					},
+				})
+			} else {
+				err = r.dropRouteParentStatus(ctx, ref)
+			}
+			if err != nil {
+				errs = append(errs, fmt.Errorf("update status of %s %s/%s: %w", ref.kind, ref.namespace, ref.name, err))
+			}
+		}
+	}
+
+	httpRoutes := &gatewayv1.HTTPRouteList{}
+	if err := r.List(ctx, httpRoutes); err != nil {
+		return fmt.Errorf("list HTTPRoutes: %w", err)
+	}
+	for i := range httpRoutes.Items {
+		route := &httpRoutes.Items[i]
+		if _, ok := allowed[route.Namespace]; !ok {
+			continue
+		}
+		if isHTTPRedirectRoute(route, tgw) {
+			continue
+		}
+		for _, parentRef := range allAttachingParentRefs(route.Spec.ParentRefs, route.Namespace, tgw) {
+			ref := routeRef{
+				kind:      routeKindHTTP,
+				namespace: route.Namespace,
+				name:      route.Name,
+				parentRef: parentRef,
+			}
+			if err := r.dropRouteParentStatus(ctx, ref); err != nil {
+				errs = append(errs, fmt.Errorf("update status of %s %s/%s: %w", ref.kind, ref.namespace, ref.name, err))
+			}
+		}
+	}
+	return errors.Join(errs...)
+}
+
+// dropRouteParentStatus removes this controller's RouteParentStatus
+// entry for ref, leaving every other controller's entry in place. Same
+// idempotency contract as updateRouteParentStatus: the Status().Update
+// is issued only when the entry was actually there.
+func (r *Reconciler) dropRouteParentStatus(ctx context.Context, ref routeRef) error {
+	switch ref.kind {
+	case routeKindHTTP:
+		route := &gatewayv1.HTTPRoute{}
+		if err := r.Get(ctx, types.NamespacedName{Namespace: ref.namespace, Name: ref.name}, route); err != nil {
+			return fmt.Errorf("get HTTPRoute: %w", err)
+		}
+		before := route.DeepCopy()
+		removeRouteParentStatus(&route.Status.Parents, ref.parentRef)
+		if routeParentStatusEqual(before.Status.Parents, route.Status.Parents) {
+			return nil
+		}
+		return r.Status().Update(ctx, route)
+	case routeKindTLS:
+		route := &gatewayv1alpha2.TLSRoute{}
+		if err := r.Get(ctx, types.NamespacedName{Namespace: ref.namespace, Name: ref.name}, route); err != nil {
+			return fmt.Errorf("get TLSRoute: %w", err)
+		}
+		before := route.DeepCopy()
+		removeRouteParentStatus(&route.Status.Parents, ref.parentRef)
+		if routeParentStatusEqual(before.Status.Parents, route.Status.Parents) {
+			return nil
 		}
+		return r.Status().Update(ctx, route)
+	default:
+		return fmt.Errorf("unknown route kind %d for %s/%s", ref.kind, ref.namespace, ref.name)
 	}
-	return nil
+}
+
+// removeRouteParentStatus deletes the entry tagged with (ControllerName,
+// ref), the exact key mergeRouteParentStatus writes under.
+func removeRouteParentStatus(parents *[]gatewayv1.RouteParentStatus, ref gatewayv1.ParentReference) {
+	kept := (*parents)[:0]
+	for _, ps := range *parents {
+		if ps.ControllerName == ControllerName && parentRefEqual(ps.ParentRef, ref) {
+			continue
+		}
+		kept = append(kept, ps)
+	}
+	*parents = kept
 }
 
 // updateRouteParentStatus locates or creates the RouteParentStatus
@@ -195,6 +969,39 @@ func (r *Reconciler) updateRouteParentStatus(ctx context.Context, ref routeRef,
 	}
 }
 
+// routeStatusWriteError wraps the failures of the route-status steps so
+// the Reconcile wrapper can tell a write that failed there apart from a
+// desired-state step failing, without matching on message text.
+type routeStatusWriteError struct{ err error }
+
+func (e routeStatusWriteError) Error() string { return e.err.Error() }
+func (e routeStatusWriteError) Unwrap() error { return e.err }
+
+// retryableRouteWrite reports whether every failure in err is one the
+// next pass can outlive on its own: a conflict, meaning the class
+// controller wrote the same route between this pass's read and its
+// write, or a route that vanished in the same gap. Both are byproducts
+// of two writers sharing one status list, and neither says anything
+// about the tenant, so the reconcile requeues instead of pinning
+// Ready=False on the TenantGateway. Anything else — an Invalid the
+// apiserver will reject on every pass, a Forbidden — stays fatal, and
+// one fatal leaf fails the whole join: a mixed batch must not be
+// retried into silence.
+func retryableRouteWrite(err error) bool {
+	if err == nil {
+		return false
+	}
+	if u, ok := err.(interface{ Unwrap() []error }); ok {
+		for _, leaf := range u.Unwrap() {
+			if !retryableRouteWrite(leaf) {
+				return false
+			}
+		}
+		return true
+	}
+	return apierrors.IsConflict(err) || apierrors.IsNotFound(err)
+}
+
 // mergeRouteParentStatus updates or appends the RouteParentStatus
 // entry tagged with (ControllerName, ParentRef), using
 // apimeta.SetStatusCondition to preserve LastTransitionTime across
diff --git a/internal/controller/tenantgateway/conflict_test.go b/internal/controller/tenantgateway/conflict_test.go
new file mode 100644
index 0000000000..14c706ed1a
--- /dev/null
+++ b/internal/controller/tenantgateway/conflict_test.go
@@ -0,0 +1,64 @@
+/*
+Copyright 2026 The Cozystack Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package tenantgateway
+
+import (
+	"errors"
+	"fmt"
+	"testing"
+
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+)
+
+// TestRetryableRouteWrite pins the classification the Reconcile wrapper
+// requeues on: a conflict or a vanished route is a race the next pass
+// outlives, anything else is a write the apiserver will refuse forever,
+// and one fatal leaf in a joined batch must fail the whole batch rather
+// than let a permanent refusal ride along on a transient one's retry.
+func TestRetryableRouteWrite(t *testing.T) {
+	conflict := apierrors.NewConflict(schema.GroupResource{Group: "gateway.networking.k8s.io", Resource: "httproutes"}, "stuck", errors.New("the object has been modified"))
+	notFound := apierrors.NewNotFound(schema.GroupResource{Group: "gateway.networking.k8s.io", Resource: "httproutes"}, "gone")
+	invalid := apierrors.NewInvalid(schema.GroupKind{Group: "gateway.networking.k8s.io", Kind: "HTTPRoute"}, "stuck", nil)
+
+	for _, tc := range []struct {
+		name string
+		err  error
+		want bool
+	}{
+		{"nil is nothing to retry", nil, false},
+		{"conflict", conflict, true},
+		{"not found", notFound, true},
+		{"wrapped conflict", fmt.Errorf("update status of HTTPRoute tenant-foo/stuck: %w", conflict), true},
+		{"join of two races", errors.Join(
+			fmt.Errorf("update status of HTTPRoute tenant-foo/stuck: %w", conflict),
+			fmt.Errorf("update status of HTTPRoute tenant-foo/gone: %w", notFound),
+		), true},
+		{"invalid", invalid, false},
+		{"plain error", errors.New("connection refused"), false},
+		{"join with one fatal leaf", errors.Join(
+			fmt.Errorf("update status of HTTPRoute tenant-foo/stuck: %w", conflict),
+			fmt.Errorf("update status of HTTPRoute tenant-foo/full: %w", invalid),
+		), false},
+	} {
+		t.Run(tc.name, func(t *testing.T) {
+			if got := retryableRouteWrite(tc.err); got != tc.want {
+				t.Errorf("retryableRouteWrite(%v) = %v, want %v", tc.err, got, tc.want)
+			}
+		})
+	}
+}
diff --git a/internal/controller/tenantgateway/crdcel_test.go b/internal/controller/tenantgateway/crdcel_test.go
new file mode 100644
index 0000000000..7a06db1a99
--- /dev/null
+++ b/internal/controller/tenantgateway/crdcel_test.go
@@ -0,0 +1,917 @@
+/*
+Copyright 2026 The Cozystack Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package tenantgateway
+
+import (
+	"context"
+	"fmt"
+	"os"
+	"strings"
+	"testing"
+
+	apiextensions "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions"
+	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
+	apiextvalidation "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/validation"
+	"k8s.io/apiextensions-apiserver/pkg/apiserver/schema"
+	schemacel "k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel"
+	"k8s.io/apiextensions-apiserver/pkg/apiserver/schema/listtype"
+	apiservervalidation "k8s.io/apiextensions-apiserver/pkg/apiserver/validation"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/util/validation/field"
+	celconfig "k8s.io/apiserver/pkg/apis/cel"
+	"sigs.k8s.io/yaml"
+
+	gatewayv1alpha1 "github.com/cozystack/cozystack/api/gateway/v1alpha1"
+)
+
+// crdPath is the generated CRD the controller ships. The CEL rules under
+// test are compiled from the +kubebuilder:validation:XValidation markers
+// on TenantGatewaySpec, so reading the generated file (rather than
+// hand-writing the rules here) is what makes this test detect a marker
+// that silently failed to generate.
+const crdPath = "../../../packages/system/cozystack-controller/definitions/gateway.cozystack.io_tenantgateways.yaml"
+
+// admissionCheck bundles the two validators the apiserver applies to a
+// spec: the structural schema (types, pattern, minimum/maximum,
+// maxItems) and the compiled CEL rules. Both must be run to answer "is
+// this write accepted" — the constraints under test are split across
+// the two, and checking only one silently ignores half of them.
+type admissionCheck struct {
+	cel        *schemacel.Validator
+	structural *schema.Structural
+	schema     apiservervalidation.SchemaValidator
+}
+
+// v1alpha1SpecSchema returns the generated CRD's v1alpha1 spec schema,
+// failing the test when no such version carries one.
+//
+// Every caller reads a marker off this schema to prove the marker
+// generated. Searching for the version inline instead puts the
+// assertions inside the search loop, where a renamed or dropped version
+// skips the body and the test reports green having checked nothing —
+// the precise regression these tests exist to catch. Returning through
+// one helper that fails on absence makes that outcome unreachable.
+func v1alpha1SpecSchema(t *testing.T) *apiextensionsv1.JSONSchemaProps {
+	t.Helper()
+
+	raw, err := os.ReadFile(crdPath)
+	if err != nil {
+		t.Fatalf("read CRD: %v", err)
+	}
+	var crd apiextensionsv1.CustomResourceDefinition
+	if err := yaml.Unmarshal(raw, &crd); err != nil {
+		t.Fatalf("unmarshal CRD: %v", err)
+	}
+	for i := range crd.Spec.Versions {
+		v := &crd.Spec.Versions[i]
+		if v.Name != "v1alpha1" || v.Schema == nil || v.Schema.OpenAPIV3Schema == nil {
+			continue
+		}
+		if p, ok := v.Schema.OpenAPIV3Schema.Properties["spec"]; ok {
+			return &p
+		}
+	}
+	t.Fatal("v1alpha1 spec schema not found in CRD")
+	return nil
+}
+
+// declaredCertModes returns the certMode values the shipped CRD's enum
+// declares. A test that must hold for every mode reads the set from the
+// CRD rather than restating it, so a mode added to the API is put
+// through that test without anyone remembering to add it.
+func declaredCertModes(t *testing.T) map[gatewayv1alpha1.CertMode]struct{} {
+	t.Helper()
+
+	specProps := v1alpha1SpecSchema(t)
+	certMode, ok := specProps.Properties["certMode"]
+	if !ok {
+		t.Fatal("spec schema carries no certMode property")
+	}
+	if len(certMode.Enum) == 0 {
+		t.Fatal("certMode carries no enum; the Enum marker did not generate")
+	}
+	declared := map[gatewayv1alpha1.CertMode]struct{}{}
+	for _, raw := range certMode.Enum {
+		var mode string
+		if err := yaml.Unmarshal(raw.Raw, &mode); err != nil {
+			t.Fatalf("unmarshal certMode enum value %q: %v", string(raw.Raw), err)
+		}
+		declared[gatewayv1alpha1.CertMode(mode)] = struct{}{}
+	}
+	return declared
+}
+
+// specValidator compiles the spec schema the way the apiserver
+// evaluates an incoming object: structural validation plus the CEL
+// rules against the per-request runtime budget.
+//
+// This does NOT check whether the apiserver would accept the CRD in the
+// first place. Install-time cost estimation is a separate code path
+// with a separate budget, and a CRD can pass everything here while
+// being refused on install. TestCRDPassesInstallTimeValidation covers
+// that.
+func specValidator(t *testing.T) *admissionCheck {
+	t.Helper()
+
+	specProps := v1alpha1SpecSchema(t)
+	if len(specProps.XValidations) == 0 {
+		t.Fatal("spec schema carries no x-kubernetes-validations; the XValidation markers did not generate")
+	}
+	return checkFromProps(t, specProps)
+}
+
+// checkFromProps compiles one spec schema into the validators admission
+// runs. Split out from specValidator so a test can compile a modified
+// copy of the shipped schema and compare the two behaviours.
+func checkFromProps(t *testing.T, specProps *apiextensionsv1.JSONSchemaProps) *admissionCheck {
+	t.Helper()
+
+	var internal apiextensions.JSONSchemaProps
+	if err := apiextensionsv1.Convert_v1_JSONSchemaProps_To_apiextensions_JSONSchemaProps(specProps, &internal, nil); err != nil {
+		t.Fatalf("convert schema: %v", err)
+	}
+	structural, err := schema.NewStructural(&internal)
+	if err != nil {
+		t.Fatalf("structural schema: %v", err)
+	}
+	schemaValidator, _, err := apiservervalidation.NewSchemaValidator(&internal)
+	if err != nil {
+		t.Fatalf("schema validator: %v", err)
+	}
+	return &admissionCheck{
+		cel:        schemacel.NewValidator(structural, true, celconfig.PerCallLimit),
+		structural: structural,
+		schema:     schemaValidator,
+	}
+}
+
+// rejects reports whether the apiserver would refuse this spec, running
+// the structural schema and the CEL rules the same way admission does.
+func (a *admissionCheck) rejects(t *testing.T, spec map[string]any) bool {
+	t.Helper()
+	if errs := apiservervalidation.ValidateCustomResource(field.NewPath("spec"), spec, a.schema); len(errs) > 0 {
+		return true
+	}
+	errs, _ := a.cel.Validate(context.TODO(), field.NewPath("spec"), a.structural, spec, nil, celconfig.RuntimeCELCostBudget)
+	return len(errs) > 0
+}
+
+// TestSpecCELMatchesControllerValidation pins that the admission-time
+// CEL rules and the controller's validateTLSPassthroughListeners agree
+// on every case the CEL rules cover: reserved ports, duplicate ports,
+// out-of-apex hostnames, names colliding with tlsPassthroughServices, and
+// the cert modes that refuse the field outright.
+//
+// The two must not drift. CEL keeps a bad spec out of etcd so it never
+// aborts the reconcile chain; the Go check still has to reject objects
+// admitted before the rules existed. If one side stops rejecting a case
+// the other rejects, this test says so.
+//
+// The check runs the structural schema alongside the CEL rules, because
+// the constraints are split across both layers and the split is an
+// implementation detail the caller should not have to know: hostname
+// format rides on the field's pattern, the reserved-port and apex rules
+// on CEL. Asserting only one layer is how the hostname-format gap went
+// unnoticed — every malformed hostname is inside the apex, so the CEL
+// rule waves it through and only the pattern stops it.
+func TestSpecCELMatchesControllerValidation(t *testing.T) {
+	a := specValidator(t)
+
+	const apex = "foo.example.com"
+	type listener struct {
+		name string
+		port int32
+		host string
+	}
+	tests := []struct {
+		name       string
+		listeners  []listener
+		services   []string
+		certMode   gatewayv1alpha1.CertMode
+		wantReject bool
+	}{
+		{
+			name:      "http01 accepts a passthrough listener",
+			listeners: []listener{{"postgres", 5432, "postgres.foo.example.com"}},
+			certMode:  gatewayv1alpha1.CertModeHTTP01,
+		},
+		{
+			name:      "dns01 accepts a passthrough listener",
+			listeners: []listener{{"postgres", 5432, "postgres.foo.example.com"}},
+			certMode:  gatewayv1alpha1.CertModeDNS01,
+		},
+		{
+			name:      "existingSecret accepts a passthrough listener",
+			listeners: []listener{{"postgres", 5432, "postgres.foo.example.com"}},
+			certMode:  gatewayv1alpha1.CertModeExistingSecret,
+		},
+		{
+			name:       "edge refuses a passthrough listener",
+			listeners:  []listener{{"postgres", 5432, "postgres.foo.example.com"}},
+			certMode:   gatewayv1alpha1.CertModeEdge,
+			wantReject: true,
+		},
+		{
+			name:      "distinct native ports within apex",
+			listeners: []listener{{"postgres", 5432, "postgres.foo.example.com"}, {"mysql", 3306, "mysql.foo.example.com"}},
+		},
+		{
+			name:      "wildcard hostname under apex",
+			listeners: []listener{{"kafka", 9092, "*.kafka.foo.example.com"}},
+		},
+		{
+			name:      "hostname equal to apex",
+			listeners: []listener{{"pg", 5432, apex}},
+		},
+		{
+			name:       "port 443 is reserved",
+			listeners:  []listener{{"pg", 443, "pg.foo.example.com"}},
+			wantReject: true,
+		},
+		{
+			name:       "port 80 is reserved",
+			listeners:  []listener{{"pg", 80, "pg.foo.example.com"}},
+			wantReject: true,
+		},
+		{
+			name:       "duplicate port across listeners",
+			listeners:  []listener{{"pg", 5432, "pg.foo.example.com"}, {"pg2", 5432, "pg2.foo.example.com"}},
+			wantReject: true,
+		},
+		{
+			name:       "hostname outside the apex",
+			listeners:  []listener{{"pg", 5432, "pg.evil.example.com"}},
+			wantReject: true,
+		},
+		{
+			name:       "sibling domain must not pass the suffix test",
+			listeners:  []listener{{"pg", 5432, "pg.evilfoo.example.com"}},
+			wantReject: true,
+		},
+		{
+			name:       "name collides with a passthrough service",
+			listeners:  []listener{{"api", 5432, "api2.foo.example.com"}},
+			services:   []string{"api"},
+			wantReject: true,
+		},
+		// The service entry itself is the subject of these two rows.
+		// Every other row passes services well-formed or nil, so a
+		// disagreement about THIS field's syntax was invisible to the
+		// parity check the test exists to be.
+		{
+			// A multi-label entry renders sectionName tls-s3.storage,
+			// which Gateway API's own SectionName pattern accepts, so
+			// nothing here may refuse it.
+			name:       "multi-label passthrough service is accepted",
+			listeners:  nil,
+			services:   []string{"s3.storage"},
+			wantReject: false,
+		},
+		{
+			name:       "malformed passthrough service is rejected",
+			listeners:  nil,
+			services:   []string{"API_X"},
+			wantReject: true,
+		},
+		{
+			// 250 characters: valid as a DNS subdomain and inside
+			// SectionName's own 253, but the entry is not what becomes
+			// the SectionName — "tls-" + entry is, and that is 254.
+			// Accepting it renders a listener name the apiserver
+			// refuses, and the refusal takes the whole Gateway with it.
+			name:       "passthrough service too long once the tls- prefix is added",
+			listeners:  nil,
+			services:   []string{strings.Repeat("a", 250)},
+			wantReject: true,
+		},
+		// Hostname format is carried by the Pattern on the field, not
+		// by CEL, but it belongs in this table for the same reason the
+		// CEL rules do: the apex rule is a plain suffix test, so
+		// without the pattern each of these typos is within the apex,
+		// passes admission, and is caught only by the controller —
+		// after the object is already in etcd and the reconcile chain
+		// behind it has aborted.
+		{
+			name:       "underscore in hostname",
+			listeners:  []listener{{"pg", 5432, "pg_main.foo.example.com"}},
+			wantReject: true,
+		},
+		{
+			name:       "upper-case in hostname",
+			listeners:  []listener{{"pg", 5432, "PG.foo.example.com"}},
+			wantReject: true,
+		},
+		{
+			name:       "leading dash in hostname label",
+			listeners:  []listener{{"pg", 5432, "-pg.foo.example.com"}},
+			wantReject: true,
+		},
+		{
+			name:       "wildcard not in the left-most label",
+			listeners:  []listener{{"pg", 5432, "*.*.foo.example.com"}},
+			wantReject: true,
+		},
+	}
+
+	for _, tc := range tests {
+		t.Run(tc.name, func(t *testing.T) {
+			celList := make([]any, 0, len(tc.listeners))
+			goList := make([]gatewayv1alpha1.TLSPassthroughListener, 0, len(tc.listeners))
+			for _, l := range tc.listeners {
+				celList = append(celList, map[string]any{
+					"name": l.name, "port": int64(l.port), "hostname": l.host,
+				})
+				goList = append(goList, gatewayv1alpha1.TLSPassthroughListener{
+					Name: l.name, Port: l.port, Hostname: l.host,
+				})
+			}
+			spec := map[string]any{
+				"apex":                    apex,
+				"tlsPassthroughListeners": celList,
+			}
+			if tc.services != nil {
+				svcs := make([]any, 0, len(tc.services))
+				for _, s := range tc.services {
+					svcs = append(svcs, s)
+				}
+				spec["tlsPassthroughServices"] = svcs
+			}
+
+			// Left out when the row does not name one, so the rows that
+			// predate the cert-mode rule keep exercising the others with
+			// the field absent.
+			if tc.certMode != "" {
+				spec["certMode"] = string(tc.certMode)
+			}
+
+			gotCEL := a.rejects(t, spec)
+			if gotCEL != tc.wantReject {
+				t.Errorf("CEL rejected=%v, want %v", gotCEL, tc.wantReject)
+			}
+
+			gotGo := validateTLSPassthroughListeners(goList, tc.services, apex) != nil ||
+				validatePassthroughListenerCertMode(goList, tc.certMode) != nil
+			if gotGo != tc.wantReject {
+				t.Errorf("controller validation rejected=%v, want %v", gotGo, tc.wantReject)
+			}
+			if gotCEL != gotGo {
+				t.Errorf("CEL and controller disagree: CEL rejected=%v, controller rejected=%v", gotCEL, gotGo)
+			}
+		})
+	}
+}
+
+// TestEveryCertModeIsJudgedOnPassthroughListeners walks the certMode
+// enum the shipped CRD declares and requires an explicit verdict for
+// each value on whether that mode may carry tlsPassthroughListeners.
+//
+// The verdicts live in a table here rather than being read off either
+// implementation, so a mode added to the enum without a decision fails
+// this test instead of reaching a cluster. That is the failure mode the
+// table exists for: both layers refuse the field by naming the modes
+// that cannot carry it, and a mode nobody adds to those lists is
+// admitted by default, silently dropped by the renderer, and reported
+// Ready.
+func TestEveryCertModeIsJudgedOnPassthroughListeners(t *testing.T) {
+	// true means the mode renders TLS listeners a passthrough entry can
+	// sit beside. The entry has a port of its own, so the wildcard
+	// terminate listener of dns01 and existingSecret on 443 SNI-overlaps
+	// it without sharing a port, which Gateway API treats as compatible.
+	// edge renders no TLS listener at all.
+	verdicts := map[gatewayv1alpha1.CertMode]bool{
+		gatewayv1alpha1.CertModeHTTP01:         true,
+		gatewayv1alpha1.CertModeDNS01:          true,
+		gatewayv1alpha1.CertModeExistingSecret: true,
+		gatewayv1alpha1.CertModeEdge:           false,
+	}
+
+	declared := declaredCertModes(t)
+	for mode := range declared {
+		if _, ok := verdicts[mode]; !ok {
+			t.Errorf("certMode %q is in the CRD enum with no verdict here; decide whether it can carry tlsPassthroughListeners and refuse it in both layers if it cannot", mode)
+		}
+	}
+	for mode := range verdicts {
+		if _, ok := declared[mode]; !ok {
+			t.Errorf("certMode %q has a verdict here but is not in the CRD enum", mode)
+		}
+	}
+
+	a := specValidator(t)
+	const apex = "foo.example.com"
+	listeners := []gatewayv1alpha1.TLSPassthroughListener{{Name: "postgres", Port: 5432, Hostname: "postgres." + apex}}
+
+	for mode := range declared {
+		want, ok := verdicts[mode]
+		if !ok {
+			continue
+		}
+		t.Run(string(mode), func(t *testing.T) {
+			spec := map[string]any{
+				"apex":     apex,
+				"certMode": string(mode),
+				"tlsPassthroughListeners": []any{
+					map[string]any{"name": "postgres", "port": int64(5432), "hostname": "postgres." + apex},
+				},
+			}
+			if gotCEL := !a.rejects(t, spec); gotCEL != want {
+				t.Errorf("CEL accepts certMode %q with a passthrough listener = %v, want %v", mode, gotCEL, want)
+			}
+			if gotGo := validatePassthroughListenerCertMode(listeners, mode) == nil; gotGo != want {
+				t.Errorf("controller accepts certMode %q with a passthrough listener = %v, want %v", mode, gotGo, want)
+			}
+		})
+	}
+
+	// An object written before certMode existed carries no value and is
+	// served by the http01 path, so both layers must treat the absent
+	// field the way they treat http01.
+	t.Run("absent certMode", func(t *testing.T) {
+		spec := map[string]any{
+			"apex": apex,
+			"tlsPassthroughListeners": []any{
+				map[string]any{"name": "postgres", "port": int64(5432), "hostname": "postgres." + apex},
+			},
+		}
+		if a.rejects(t, spec) {
+			t.Error("CEL refuses a passthrough listener on an object with no certMode; that object is served as http01")
+		}
+		if err := validatePassthroughListenerCertMode(listeners, ""); err != nil {
+			t.Errorf("controller refuses a passthrough listener with no certMode: %v", err)
+		}
+	})
+}
+
+// TestCRDPassesInstallTimeValidation runs the validation kube-apiserver
+// applies when the CRD itself is written. It is a different budget from
+// the per-request one the other tests exercise: the install-time
+// estimator assumes the largest value each declared type permits, so an
+// unbounded string or list inside a CEL rule blows the estimate even
+// though every real object is small.
+//
+// What fails it is not an object but the CRD, on CREATE and on UPDATE
+// alike. The CRD ships in the cozystack-controller chart, so that
+// freezes the whole TenantGateway API across every cluster, fresh or
+// upgraded. No other test in this suite touches that code path, which
+// leaves the size bounds on spec.apex and spec.tlsPassthroughServices
+// with no other guard.
+func TestCRDPassesInstallTimeValidation(t *testing.T) {
+	raw, err := os.ReadFile(crdPath)
+	if err != nil {
+		t.Fatalf("read CRD: %v", err)
+	}
+	var v1crd apiextensionsv1.CustomResourceDefinition
+	if err := yaml.Unmarshal(raw, &v1crd); err != nil {
+		t.Fatalf("unmarshal CRD: %v", err)
+	}
+	// A CRD manifest on disk has no status; validation demands at least
+	// one stored version, so supply what the apiserver would have
+	// written. Without this the run fails on an unrelated status error
+	// and tells us nothing about cost.
+	v1crd.Status.StoredVersions = []string{"v1alpha1"}
+
+	var internal apiextensions.CustomResourceDefinition
+	if err := apiextensionsv1.Convert_v1_CustomResourceDefinition_To_apiextensions_CustomResourceDefinition(&v1crd, &internal, nil); err != nil {
+		t.Fatalf("convert CRD: %v", err)
+	}
+	for _, e := range apiextvalidation.ValidateCustomResourceDefinition(context.TODO(), &internal) {
+		t.Errorf("apiserver would reject this CRD: %v", e)
+	}
+}
+
+// TestTightenedConstraintsOnExistingObjects pins that every constraint
+// added to an already-shipped field is one the apiserver ratchets, so an
+// object whose stored value violates one keeps accepting writes that
+// leave that value alone. The package README states this, and stating it
+// in prose alone is how a claim drifts from the schema it describes.
+//
+// Ratcheting is on by default from Kubernetes 1.30 and the management
+// cluster requires 1.33, so this holds on every supported cluster.
+//
+// It reaches list-type errors too, and at a coarser grain than the
+// per-field ratchet: ValidateUpdate checks the incoming object's
+// list-type semantics only when the stored object passes them, for the
+// object as a whole. That is read from
+// pkg/registry/customresource/strategy.go in apiextensions-apiserver
+// v0.37.1, the version go.mod pins. So a stored duplicate does not block writes, it
+// stops every list on the resource from being checked. The duplicate
+// row below therefore stays admissible whether or not the field carries
+// a marker, which is why the marker's absence is pinned by the schema
+// assertion rather than by that row.
+//
+// The run pairs each field with the listtype validator as well, because
+// the schema validator does not implement list semantics and would call
+// a duplicate admissible whether or not the marker were there.
+func TestTightenedConstraintsOnExistingObjects(t *testing.T) {
+	a := specValidator(t)
+
+	// One character past the apex bound. A bare run of letters rather
+	// than a plausible hostname, so the row can only fail on length —
+	// the field carries no format pattern to fail on instead, and
+	// pinning ratcheting is not the place to discover that.
+	overLongApex := strings.Repeat("a", 254)
+	// One past the count bound, so the row fails on maxItems and on
+	// nothing else: every entry is a well-formed DNS-1123 subdomain.
+	overCapServices := make([]string, 0, 63)
+	for i := range 63 {
+		overCapServices = append(overCapServices, fmt.Sprintf("svc%d", i))
+	}
+
+	spec := func(apex string, services ...string) map[string]any {
+		svcs := make([]any, 0, len(services))
+		for _, s := range services {
+			svcs = append(svcs, s)
+		}
+		return map[string]any{
+			"apex":                   apex,
+			"certMode":               "http01",
+			"gatewayClassName":       "cilium",
+			"tlsPassthroughServices": svcs,
+		}
+	}
+
+	// rejectsUpdate answers what the apiserver does to a write of new
+	// over old: the schema layer with ratcheting on, then the list-type
+	// layer. The list-type ratchet lives in the caller rather than in
+	// the validator: customresource.ValidateUpdate runs the check on the
+	// incoming object only when the stored one already passes it, so the
+	// guard is reproduced here rather than exercised. Dropping it would
+	// model an apiserver that refuses writes it accepts. Reproduced
+	// means it does not track upstream, so a bump of
+	// apiextensions-apiserver past the pinned v0.37.1 is where to
+	// re-read strategy.go and confirm the shape still holds.
+	rejectsUpdate := func(newSpec, oldSpec map[string]any) bool {
+		if errs := apiservervalidation.ValidateCustomResourceUpdate(
+			field.NewPath("spec"), newSpec, oldSpec, a.schema,
+			apiservervalidation.WithRatcheting(nil),
+		); len(errs) > 0 {
+			return true
+		}
+		if oldErrs := listtype.ValidateListSetsAndMaps(field.NewPath("spec"), a.structural, oldSpec); len(oldErrs) > 0 {
+			return false
+		}
+		return len(listtype.ValidateListSetsAndMaps(field.NewPath("spec"), a.structural, newSpec)) > 0
+	}
+
+	for _, tc := range []struct {
+		name         string
+		newSpec, old map[string]any
+		wantRejected bool
+	}{{
+		name:         "over-long apex left untouched",
+		newSpec:      spec(overLongApex, "api"),
+		old:          spec(overLongApex, "api"),
+		wantRejected: false,
+	}, {
+		name:         "over-long apex introduced by this write",
+		newSpec:      spec(overLongApex, "api"),
+		old:          spec("foo.example.com", "api"),
+		wantRejected: true,
+	}, {
+		name:         "over-long service list left untouched",
+		newSpec:      spec("foo.example.com", overCapServices...),
+		old:          spec("foo.example.com", overCapServices...),
+		wantRejected: false,
+	}, {
+		name:         "over-long service list introduced by this write",
+		newSpec:      spec("foo.example.com", overCapServices...),
+		old:          spec("foo.example.com", "api"),
+		wantRejected: true,
+	}, {
+		name:         "malformed service entry left untouched",
+		newSpec:      spec("foo.example.com", "API_X"),
+		old:          spec("foo.example.com", "API_X"),
+		wantRejected: false,
+	}, {
+		name:         "malformed service entry introduced by this write",
+		newSpec:      spec("foo.example.com", "API_X"),
+		old:          spec("foo.example.com", "api"),
+		wantRejected: true,
+	}, {
+		name:         "repeated service entry stays admissible",
+		newSpec:      spec("foo.example.com", "api", "api"),
+		old:          spec("foo.example.com", "api", "api"),
+		wantRejected: false,
+	}, {
+		name:         "unique service entries",
+		newSpec:      spec("foo.example.com", "api", "vm-exportproxy"),
+		old:          spec("foo.example.com", "api", "vm-exportproxy"),
+		wantRejected: false,
+	}} {
+		t.Run(tc.name, func(t *testing.T) {
+			if got := rejectsUpdate(tc.newSpec, tc.old); got != tc.wantRejected {
+				t.Errorf("update rejected = %v, want %v", got, tc.wantRejected)
+			}
+		})
+	}
+}
+
+// TestListTypeSetWouldNotRefuseAStoredDuplicate pins why
+// tlsPassthroughServices carries no listType marker, by compiling a copy
+// of the shipped schema that does and showing what the apiserver would
+// then do.
+//
+// The reason is not that a stored duplicate would be refused on every
+// write. It would not: customresource.ValidateUpdate validates the
+// incoming object's list-type semantics only when the stored object
+// passes them, so a duplicate already in etcd is ratcheted through.
+// That guard is byte-identical across apiextensions-apiserver v0.31.1,
+// v0.35.0, v0.36.3 and the pinned v0.37.1, so it is settled behaviour
+// rather than a version quirk, but it is upstream's to change. The
+// reason is the grain of that ratchet. It is taken over the whole
+// object, not per field, so one stored duplicate stops list-type
+// validation for every list on the resource, silently and with nothing
+// on status to say so, while the controller reports the duplicate by
+// name.
+//
+// Compiled from a copy rather than asserted in prose because the claim
+// is about apiserver behaviour under a marker this repo deliberately
+// does not ship, which no other test can reach.
+func TestListTypeSetWouldNotRefuseAStoredDuplicate(t *testing.T) {
+	shipped := v1alpha1SpecSchema(t)
+	if lt := shipped.Properties["tlsPassthroughServices"].XListType; lt != nil {
+		t.Fatalf("tlsPassthroughServices ships x-kubernetes-list-type=%q; the field is meant to stay unmarked", *lt)
+	}
+
+	withSet := shipped.DeepCopy()
+	svc := withSet.Properties["tlsPassthroughServices"]
+	setType := "set"
+	svc.XListType = &setType
+	withSet.Properties["tlsPassthroughServices"] = svc
+	a := checkFromProps(t, withSet)
+
+	spec := func(certMode string, services ...string) map[string]any {
+		svcs := make([]any, 0, len(services))
+		for _, e := range services {
+			svcs = append(svcs, e)
+		}
+		return map[string]any{
+			"apex":                   "foo.example.com",
+			"certMode":               certMode,
+			"tlsPassthroughServices": svcs,
+		}
+	}
+	// The guard customresource.ValidateUpdate puts around the list-type
+	// check: the incoming object is checked only when the stored one
+	// passes. Reproduced rather than called, because the guard lives in
+	// the registry strategy and the validator it wraps is what this
+	// package can reach.
+	rejects := func(newSpec, oldSpec map[string]any) bool {
+		if errs := listtype.ValidateListSetsAndMaps(field.NewPath("spec"), a.structural, oldSpec); len(errs) > 0 {
+			return false
+		}
+		return len(listtype.ValidateListSetsAndMaps(field.NewPath("spec"), a.structural, newSpec)) > 0
+	}
+
+	if !rejects(spec("http01", "api", "api"), spec("http01", "api")) {
+		t.Error("a set marker accepted a write introducing a duplicate; the copy did not compile the marker")
+	}
+	if rejects(spec("dns01", "api", "api"), spec("http01", "api", "api")) {
+		t.Error("a stored duplicate blocked an unrelated write; the marker does not work the way the field comment used to say")
+	}
+
+	// The spillover that settles the decision: the guard is whole-object,
+	// so the same stored duplicate must also ratchet a duplicate name key
+	// through tlsPassthroughListeners, the listType=map list this
+	// resource cannot afford to lose — one bad entry in the unmarked
+	// list would switch every list's check off at once.
+	withListeners := func(s map[string]any, names ...string) map[string]any {
+		ls := make([]any, 0, len(names))
+		for _, n := range names {
+			ls = append(ls, map[string]any{"name": n, "port": int64(5432), "hostname": n + ".foo.example.com"})
+		}
+		s["tlsPassthroughListeners"] = ls
+		return s
+	}
+	if !rejects(withListeners(spec("http01", "api"), "pg", "pg"), spec("http01", "api")) {
+		t.Error("a duplicate tlsPassthroughListeners name over a clean stored object was not refused; the copy did not compile the listType=map marker")
+	}
+	if rejects(withListeners(spec("http01", "api", "api"), "pg", "pg"), spec("http01", "api", "api")) {
+		t.Error("a stored tlsPassthroughServices duplicate did not ratchet a duplicate tlsPassthroughListeners name through; the whole-object grain the field comment describes is not what the apiserver does")
+	}
+}
+
+// TestApexAcceptsUpperCaseAtCreate pins that spec.apex carries no
+// format pattern, so a tenant whose host holds upper case can still
+// have its TenantGateway created.
+//
+// The value arrives verbatim. The gateway chart writes spec.apex from
+// the namespace.cozystack.io/host label, the tenant chart writes that
+// label from spec.host, and the tenant values schema bounds host with
+// nothing but its type, so an upper-case host reaches this field.
+//
+// Admitting it is not a claim that it works. renderGateway composes
+// listener hostnames from the apex and Gateway API refuses upper case
+// in them, so that tenant's Gateway does not render either way. What a
+// pattern would change is only where the failure lands: refused at the
+// write it fails the gateway HelmRelease, admitted it is Ready=False on
+// the one Gateway. The bound is length alone for that reason, and the
+// apex is judged by the controller when this field is in use.
+//
+// Create is the path that matters and the ratcheting test cannot reach
+// it: ratcheting compares against a stored value, so it says nothing
+// about the write that creates the object.
+func TestApexAcceptsUpperCaseAtCreate(t *testing.T) {
+	a := specValidator(t)
+
+	if pattern := v1alpha1SpecSchema(t).Properties["apex"].Pattern; pattern != "" {
+		t.Errorf("spec.apex carries pattern %q; a mixed-case tenant host is refused at the write", pattern)
+	}
+
+	for _, spec := range []map[string]any{
+		{"apex": "Foo.Example.com"},
+		{"apex": "Case-Probe.foo.example.com", "tlsPassthroughServices": []any{"api"}},
+	} {
+		if a.rejects(t, spec) {
+			t.Errorf("spec %v rejected at create, want admitted", spec)
+		}
+	}
+}
+
+// TestPassthroughServiceCapFitsGatewayAPI pins that a tlsPassthroughServices
+// list filled to the schema's maxItems is one the controller can render.
+//
+// The bound belongs to the same budget as the listener one and is read
+// off the generated CRD for the same reason, but it needs its own run:
+// the two fields are bounded by separate markers and only this one is
+// reachable from chart values today, so a list the apiserver accepts
+// and the renderer refuses is a shape an operator can actually reach.
+// The rendered total is the port-80 listener plus one per entry, so a
+// bound at the Gateway API cap itself is one over what a Gateway holds.
+func TestPassthroughServiceCapFitsGatewayAPI(t *testing.T) {
+	const gatewayAPIListenerCap = 64
+
+	servicesSchema := v1alpha1SpecSchema(t).Properties["tlsPassthroughServices"]
+	if servicesSchema.MaxItems == nil {
+		t.Fatal("tlsPassthroughServices has no maxItems; the cap is unbounded")
+	}
+	maxItems := *servicesSchema.MaxItems
+
+	services := make([]string, 0, maxItems)
+	for i := range maxItems {
+		services = append(services, fmt.Sprintf("svc%d", i))
+	}
+	tgw := &gatewayv1alpha1.TenantGateway{
+		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
+		Spec: gatewayv1alpha1.TenantGatewaySpec{
+			Apex:                   "foo.example.com",
+			CertMode:               gatewayv1alpha1.CertModeHTTP01,
+			GatewayClassName:       "cilium",
+			TLSPassthroughServices: services,
+		},
+	}
+
+	r := &Reconciler{Scheme: newScheme(t)}
+	// One published app, matching the headroom the listener cap leaves,
+	// so the two fields are bounded against the same tenant.
+	gw, err := r.renderGateway(tgw, []string{"app.foo.example.com"}, nil)
+	if err != nil {
+		t.Fatalf("renderGateway at maxItems=%d: %v", maxItems, err)
+	}
+	if got := len(gw.Spec.Listeners); got > gatewayAPIListenerCap {
+		t.Errorf("maxItems=%d renders %d listeners, over the Gateway API cap of %d", maxItems, got, gatewayAPIListenerCap)
+	}
+}
+
+// TestPassthroughListenerNameUniquenessIsEnforcedBySchema pins the
+// listType=map / listMapKey=name markers.
+//
+// Name uniqueness is the one rule with no CEL equivalent and no entry
+// in the parity table — the field doc and the parity test both point at
+// these markers as the reason. Nothing else asserts they are there:
+// the per-object harness does not implement list-map semantics, so
+// dropping the markers leaves the whole suite green while duplicate
+// names become admissible, render two tls-<name> listeners, and get the
+// Gateway rejected wholesale.
+func TestPassthroughListenerNameUniquenessIsEnforcedBySchema(t *testing.T) {
+	listenersSchema := v1alpha1SpecSchema(t).Properties["tlsPassthroughListeners"]
+	if listenersSchema.XListType == nil || *listenersSchema.XListType != "map" {
+		t.Fatalf("tlsPassthroughListeners x-kubernetes-list-type=%v, want map; duplicate names would be admissible", listenersSchema.XListType)
+	}
+	if len(listenersSchema.XListMapKeys) != 1 || listenersSchema.XListMapKeys[0] != "name" {
+		t.Fatalf("tlsPassthroughListeners x-kubernetes-list-map-keys=%v, want [name]", listenersSchema.XListMapKeys)
+	}
+}
+
+// TestPassthroughListenerCapFitsGatewayAPI pins that a spec filled to
+// the schema's maxItems, on a tenant publishing one app, still renders
+// within Gateway API's 64-listener cap. The bound is read from the
+// generated CRD so raising the marker without re-checking the
+// arithmetic fails here rather than in a cluster.
+//
+// This is a bound on one field's contribution, not proof the total
+// always fits — the rendered count also grows with published hostnames
+// and passthrough services, and a tenant can exceed 64 with far fewer
+// entries than the cap. TestRenderGatewayRejectsOverListenerCap covers
+// the total.
+func TestPassthroughListenerCapFitsGatewayAPI(t *testing.T) {
+	const gatewayAPIListenerCap = 64
+
+	listenersSchema := v1alpha1SpecSchema(t).Properties["tlsPassthroughListeners"]
+	if listenersSchema.MaxItems == nil {
+		t.Fatal("tlsPassthroughListeners has no maxItems; the cap is unbounded")
+	}
+	maxItems := *listenersSchema.MaxItems
+
+	listeners := make([]gatewayv1alpha1.TLSPassthroughListener, 0, maxItems)
+	for i := range maxItems {
+		listeners = append(listeners, gatewayv1alpha1.TLSPassthroughListener{
+			Name:     fmt.Sprintf("db%d", i),
+			Port:     int32(10000 + i),
+			Hostname: fmt.Sprintf("db%d.foo.example.com", i),
+		})
+	}
+	tgw := &gatewayv1alpha1.TenantGateway{
+		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
+		Spec: gatewayv1alpha1.TenantGatewaySpec{
+			Apex:                    "foo.example.com",
+			CertMode:                gatewayv1alpha1.CertModeHTTP01,
+			GatewayClassName:        "cilium",
+			TLSPassthroughListeners: listeners,
+		},
+	}
+
+	r := &Reconciler{Scheme: newScheme(t)}
+	gw, err := r.renderGateway(tgw, []string{"app.foo.example.com"}, nil)
+	if err != nil {
+		t.Fatalf("renderGateway: %v", err)
+	}
+	if got := len(gw.Spec.Listeners); got > gatewayAPIListenerCap {
+		t.Errorf("maxItems=%d renders %d listeners, over the Gateway API cap of %d", maxItems, got, gatewayAPIListenerCap)
+	}
+}
+
+// TestRenderGatewayRejectsOverListenerCap pins the total-count guard.
+// Each individual field is bounded, but the Gateway's 64 slots are
+// shared between the port-80 listener, per-hostname HTTPS listeners,
+// passthrough services and passthrough listeners — so a spec where
+// every field is within its own cap can still overflow. Without the
+// guard the overflow surfaces as the apiserver rejecting the whole
+// Gateway, which drops every app's HTTPS listener and reports nothing
+// on the TenantGateway the tenant actually manages.
+func TestRenderGatewayRejectsOverListenerCap(t *testing.T) {
+	listeners := make([]gatewayv1alpha1.TLSPassthroughListener, 0, 62)
+	for i := range 62 {
+		listeners = append(listeners, gatewayv1alpha1.TLSPassthroughListener{
+			Name:     fmt.Sprintf("db%d", i),
+			Port:     int32(10000 + i),
+			Hostname: fmt.Sprintf("db%d.foo.example.com", i),
+		})
+	}
+	tgw := &gatewayv1alpha1.TenantGateway{
+		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
+		Spec: gatewayv1alpha1.TenantGatewaySpec{
+			Apex:                    "foo.example.com",
+			CertMode:                gatewayv1alpha1.CertModeHTTP01,
+			GatewayClassName:        "cilium",
+			TLSPassthroughListeners: listeners,
+		},
+	}
+
+	r := &Reconciler{Scheme: newScheme(t)}
+	// 1 http + 62 passthrough + 2 published hostnames = 65.
+	_, err := r.renderGateway(tgw, []string{"a.foo.example.com", "b.foo.example.com"}, nil)
+	if err == nil {
+		t.Fatal("expected an error for a 65-listener Gateway, got nil")
+	}
+	if !strings.Contains(err.Error(), "over the Gateway API cap") {
+		t.Errorf("error does not name the budget: %v", err)
+	}
+
+	// One fewer published hostname lands exactly on the cap.
+	if _, err := r.renderGateway(tgw, []string{"a.foo.example.com"}, nil); err != nil {
+		t.Errorf("64 listeners should be accepted, got %v", err)
+	}
+}
+
+// TestSpecCELAcceptsEmptyPassthroughListeners guards the has() guards
+// themselves: every rule is written to short-circuit when the optional
+// field is absent, so a spec that never mentions tlsPassthroughListeners
+// must pass. Dropping a "!has(...)" prefix would reject every existing
+// TenantGateway in the cluster on its next write.
+func TestSpecCELAcceptsEmptyPassthroughListeners(t *testing.T) {
+	a := specValidator(t)
+	for _, spec := range []map[string]any{
+		{"apex": "foo.example.com"},
+		{"apex": "foo.example.com", "tlsPassthroughServices": []any{"api"}},
+		{"apex": "foo.example.com", "tlsPassthroughListeners": []any{}},
+	} {
+		if a.rejects(t, spec) {
+			t.Errorf("spec %v was rejected, want accepted", spec)
+		}
+	}
+}
diff --git a/internal/controller/tenantgateway/mapper.go b/internal/controller/tenantgateway/mapper.go
index 7b5b72dbd5..da8fa129f8 100644
--- a/internal/controller/tenantgateway/mapper.go
+++ b/internal/controller/tenantgateway/mapper.go
@@ -82,3 +82,25 @@ func (r *Reconciler) mapRouteToTenantGateways(ctx context.Context, obj client.Ob
 	}
 	return out
 }
+
+// mapGatewayClassToTenantGateways requeues the TenantGateways on a
+// class, because GatewayClassUnsupported is judged from the class's
+// status.supportedFeatures, which a class writes after it is accepted
+// and may change on an upgrade of its controller, with nothing on the
+// TenantGateway changing.
+func (r *Reconciler) mapGatewayClassToTenantGateways(ctx context.Context, obj client.Object) []reconcile.Request {
+	list := &gatewayv1alpha1.TenantGatewayList{}
+	if err := r.List(ctx, list); err != nil {
+		log.FromContext(ctx).Error(err, "list TenantGateways for GatewayClass mapper")
+		return nil
+	}
+	var out []reconcile.Request
+	for i := range list.Items {
+		tgw := &list.Items[i]
+		if gatewayClassName(tgw) != obj.GetName() {
+			continue
+		}
+		out = append(out, reconcile.Request{NamespacedName: types.NamespacedName{Namespace: tgw.Namespace, Name: tgw.Name}})
+	}
+	return out
+}
diff --git a/internal/controller/tenantgateway/mapper_test.go b/internal/controller/tenantgateway/mapper_test.go
index 97dc2b9629..cbd2a36dba 100644
--- a/internal/controller/tenantgateway/mapper_test.go
+++ b/internal/controller/tenantgateway/mapper_test.go
@@ -18,6 +18,7 @@ package tenantgateway
 
 import (
 	"context"
+	"slices"
 	"testing"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -100,3 +101,38 @@ func TestMapRouteToTenantGateways_EmptyParentRefsReturnsNil(t *testing.T) {
 		t.Errorf("expected 0 requests, got %+v", reqs)
 	}
 }
+
+// TestMapGatewayClassToTenantGateways pins that a GatewayClass event
+// requeues exactly the TenantGateways on that class, the unset class
+// counting as cilium: GatewayClassUnsupported is read off the class's
+// status, so without the requeue a class that fills in or extends
+// supportedFeatures leaves Ready where an earlier pass put it.
+func TestMapGatewayClassToTenantGateways(t *testing.T) {
+	s := newScheme(t)
+	tgw := func(ns, class string) *gatewayv1alpha1.TenantGateway {
+		return &gatewayv1alpha1.TenantGateway{
+			ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: ns},
+			Spec:       gatewayv1alpha1.TenantGatewaySpec{Apex: ns + ".example.com", GatewayClassName: class},
+		}
+	}
+	c := fake.NewClientBuilder().WithScheme(s).WithObjects(tgw("tenant-a", "other"), tgw("tenant-b", ""), tgw("tenant-c", "cilium")).Build()
+	r := &Reconciler{Client: c, Scheme: s}
+
+	for _, tc := range []struct {
+		class string
+		want  []string
+	}{
+		{"other", []string{"tenant-a"}},
+		{"cilium", []string{"tenant-b", "tenant-c"}},
+		{"unused", nil},
+	} {
+		reqs := r.mapGatewayClassToTenantGateways(context.TODO(), &gatewayv1.GatewayClass{ObjectMeta: metav1.ObjectMeta{Name: tc.class}})
+		var got []string
+		for _, req := range reqs {
+			got = append(got, req.Namespace)
+		}
+		if !slices.Equal(got, tc.want) {
+			t.Errorf("class %s requeued %v, want %v", tc.class, got, tc.want)
+		}
+	}
+}
diff --git a/internal/controller/tenantgateway/rbac_test.go b/internal/controller/tenantgateway/rbac_test.go
new file mode 100644
index 0000000000..b7058c9e70
--- /dev/null
+++ b/internal/controller/tenantgateway/rbac_test.go
@@ -0,0 +1,109 @@
+/*
+Copyright 2026 The Cozystack Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package tenantgateway
+
+import (
+	"os"
+	"slices"
+	"testing"
+
+	rbacv1 "k8s.io/api/rbac/v1"
+	"sigs.k8s.io/yaml"
+)
+
+// clusterRolePath is the ClusterRole the cozystack-controller chart
+// ships. It is written by hand: the kubebuilder rbac markers in this
+// package document the grants but generate nothing, because
+// hack/update-codegen.sh runs controller-gen over ./api/... only and
+// writes no rbac artifact anywhere. Nothing but this test connects the
+// two.
+const clusterRolePath = "../../../packages/system/cozystack-controller/templates/rbac.yaml"
+
+// TestShippedClusterRoleNamesEveryTypeThisControllerReads pins that
+// each type this reconciler watches or reads has a rule naming its API
+// group, rather than reaching the apiserver only through the
+// read-everything rule at the foot of the ClusterRole.
+//
+// An informer that starts without a grant fails with Forbidden and
+// takes the manager down with it, and the failure arrives whenever
+// someone narrows that catch-all, long after the watch that needed it
+// was added. A rule naming the group is what survives that edit.
+//
+// Resource wildcards inside a named group are accepted: the rule
+// covering this project's own CRDs is written that way, and narrowing
+// the catch-all does not touch it. An apiGroups entry of "*" is not,
+// because it is the rule this test exists to stop the controller
+// depending on.
+//
+// The template is parsed as YAML rather than rendered, which holds
+// because it carries no Helm actions. Putting one in it, a
+// {{/* */}} comment included, means rendering the chart here instead.
+func TestShippedClusterRoleNamesEveryTypeThisControllerReads(t *testing.T) {
+	needed := []struct {
+		group    string
+		resource string
+	}{
+		{"gateway.cozystack.io", "tenantgateways"},
+		{"gateway.networking.k8s.io", "gateways"},
+		{"gateway.networking.k8s.io", "httproutes"},
+		{"gateway.networking.k8s.io", "tlsroutes"},
+		{"gateway.networking.k8s.io", "gatewayclasses"},
+		{"cert-manager.io", "certificates"},
+		{"cert-manager.io", "issuers"},
+		{"", "namespaces"},
+	}
+
+	raw, err := os.ReadFile(clusterRolePath)
+	if err != nil {
+		t.Fatalf("read ClusterRole: %v", err)
+	}
+	var role rbacv1.ClusterRole
+	if err := yaml.Unmarshal(raw, &role); err != nil {
+		t.Fatalf("unmarshal ClusterRole: %v", err)
+	}
+	if len(role.Rules) == 0 {
+		t.Fatal("ClusterRole carries no rules; the path or the document shape changed")
+	}
+
+	for _, want := range needed {
+		granted := false
+		for _, rule := range role.Rules {
+			if !slices.Contains(rule.APIGroups, want.group) {
+				continue
+			}
+			if !slices.Contains(rule.Resources, want.resource) && !slices.Contains(rule.Resources, "*") {
+				continue
+			}
+			if !slices.Contains(rule.Verbs, "*") {
+				missing := false
+				for _, verb := range []string{"get", "list", "watch"} {
+					if !slices.Contains(rule.Verbs, verb) {
+						missing = true
+					}
+				}
+				if missing {
+					continue
+				}
+			}
+			granted = true
+			break
+		}
+		if !granted {
+			t.Errorf("no rule names apiGroup %q resource %q with get/list/watch; the controller reaches it only through the read-everything rule, and narrowing that breaks the informer with Forbidden", want.group, want.resource)
+		}
+	}
+}
diff --git a/internal/controller/tenantgateway/reconciler.go b/internal/controller/tenantgateway/reconciler.go
index db35fc6205..b53998051f 100644
--- a/internal/controller/tenantgateway/reconciler.go
+++ b/internal/controller/tenantgateway/reconciler.go
@@ -26,8 +26,12 @@ package tenantgateway
 
 import (
 	"context"
+	"errors"
 	"fmt"
+	"maps"
+	"slices"
 	"sort"
+	"time"
 
 	cmv1 "github.com/cert-manager/cert-manager/pkg/apis/certmanager/v1"
 	corev1 "k8s.io/api/core/v1"
@@ -41,6 +45,7 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
+	"sigs.k8s.io/controller-runtime/pkg/handler"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 	gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
 	gatewayv1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2"
@@ -55,6 +60,65 @@ func gatewayCertificateName(tgw *gatewayv1alpha1.TenantGateway) string {
 	return tgw.Name + "-gateway-tls"
 }
 
+// wildcardListenerCertName returns the Secret name the wildcard, apex,
+// and per-child-apex HTTPS listeners reference. In DNS-01 mode this is
+// the controller-minted cert (gatewayCertificateName); in
+// existingSecret mode it is the operator-supplied Secret named in
+// Spec.WildcardSecretRef. Returns an error when existingSecret mode is
+// missing the reference — a misconfiguration that must surface as a
+// failed reconcile rather than a Gateway pointing at a nonexistent
+// Secret.
+func wildcardListenerCertName(tgw *gatewayv1alpha1.TenantGateway) (string, error) {
+	if tgw.Spec.CertMode == gatewayv1alpha1.CertModeExistingSecret {
+		if tgw.Spec.WildcardSecretRef == nil || tgw.Spec.WildcardSecretRef.Name == "" {
+			return "", fmt.Errorf("certMode=existingSecret requires spec.wildcardSecretRef.name to be set")
+		}
+		return tgw.Spec.WildcardSecretRef.Name, nil
+	}
+	return gatewayCertificateName(tgw), nil
+}
+
+// servesWholeApex reports whether the mode publishes the apex and every
+// subdomain off apex-wide listeners (wildcard cert or edge-terminated
+// HTTP), as opposed to HTTP-01's one listener per attached hostname.
+func servesWholeApex(tgw *gatewayv1alpha1.TenantGateway) bool {
+	switch tgw.Spec.CertMode {
+	case gatewayv1alpha1.CertModeDNS01, gatewayv1alpha1.CertModeExistingSecret, gatewayv1alpha1.CertModeEdge:
+		return true
+	}
+	return false
+}
+
+// rendersTLSPassthrough reports whether the mode can carry
+// TLS-passthrough listeners at all. Edge ends TLS at the class
+// provider, so its Gateway is HTTP-only and neither a passthrough
+// listener nor a TLSRoute has anything to bind to on it.
+func rendersTLSPassthrough(tgw *gatewayv1alpha1.TenantGateway) bool {
+	return tgw.Spec.CertMode != gatewayv1alpha1.CertModeEdge
+}
+
+// renderedPassthroughServices returns the tlsPassthroughServices
+// entries this mode actually turns into tls-<svc> listeners, which is
+// none under edge: TLS ends at the class provider, so the Gateway is
+// HTTP-only and carries no passthrough listener to name.
+//
+// Read by the renderer and by the cross-field checks alike, so a check
+// cannot refuse a spec over a listener the renderer was never going to
+// emit, and say the entry renders one twice while saying so.
+func renderedPassthroughServices(tgw *gatewayv1alpha1.TenantGateway) []string {
+	if !rendersTLSPassthrough(tgw) {
+		return nil
+	}
+	return tgw.Spec.TLSPassthroughServices
+}
+
+func gatewayClassName(tgw *gatewayv1alpha1.TenantGateway) string {
+	if tgw.Spec.GatewayClassName == "" {
+		return "cilium"
+	}
+	return tgw.Spec.GatewayClassName
+}
+
 // gatewayIssuerName returns the per-tenant ACME Issuer name. The
 // Issuer lives in the same namespace as the TenantGateway and is
 // referenced by every Certificate this controller renders.
@@ -72,6 +136,7 @@ const (
 // +kubebuilder:rbac:groups=gateway.cozystack.io,resources=tenantgateways/finalizers,verbs=update
 // +kubebuilder:rbac:groups=gateway.networking.k8s.io,resources=gateways;httproutes;tlsroutes,verbs=get;list;watch;create;update;patch;delete
 // +kubebuilder:rbac:groups=gateway.networking.k8s.io,resources=gateways/status;httproutes/status;tlsroutes/status,verbs=get;update;patch
+// +kubebuilder:rbac:groups=gateway.networking.k8s.io,resources=gatewayclasses,verbs=get;list;watch
 // +kubebuilder:rbac:groups=cert-manager.io,resources=certificates;issuers,verbs=get;list;watch;create;update;patch;delete
 
 // Reconciler reconciles TenantGateway resources, owning the downstream
@@ -81,6 +146,14 @@ type Reconciler struct {
 	Scheme *runtime.Scheme
 }
 
+// routeStatusRetryDelay backs the retry of a retryably-failed route
+// status write. The write that won the race lands an event on the route
+// watch and usually re-triggers the pass long before this fires; the
+// delay is the backstop for the event path failing, not the mechanism,
+// and its size only bounds how long a stale condition can outlive a
+// lost event.
+const routeStatusRetryDelay = 10 * time.Second
+
 // Reconcile renders the desired Gateway from a TenantGateway spec.
 // HTTP-01 mode: static `http` listener on port 80 (for ACME), per-app
 // HTTPS listeners are added by route-driven reconciliation in later
@@ -93,6 +166,27 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Resu
 	}
 
 	if err := r.runReconcileSteps(ctx, tgw); err != nil {
+		// A route-status write that failed retryably cost the pass
+		// nothing else: every desired-state step already ran, so the
+		// failure is not surfaced on the TenantGateway and the requeue
+		// alone retries the write. Surfacing it would pin Ready=False on
+		// the tenant for a race between two status writers, and on a
+		// fresh install could withhold the http-to-https redirect for as
+		// long as the race runs.
+		var rsw routeStatusWriteError
+		if errors.As(err, &rsw) && retryableRouteWrite(rsw.err) {
+			// Logged because the requeue is the only thing that acts on
+			// this and it says nothing: the tenant keeps reading Ready,
+			// no event is recorded, and returning a nil error opts out
+			// of the backoff that would otherwise widen the interval,
+			// so a write that fails on every pass retries at a fixed
+			// period forever with nothing anywhere to show for it. The
+			// decision above not to pin Ready=False stands; what it
+			// gives up is the condition, not the record.
+			log.FromContext(ctx).V(1).Info("route status write failed retryably, requeueing",
+				"error", rsw.err, "requeueAfter", routeStatusRetryDelay)
+			return ctrl.Result{RequeueAfter: routeStatusRetryDelay}, nil
+		}
 		// Surface the failure on the TenantGateway status so
 		// operators see something in `kubectl get tgw` rather than
 		// a silent stale Ready condition while the controller
@@ -110,27 +204,352 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Resu
 // out from Reconcile keeps the error-handling/status-update wrapper
 // in one place.
 func (r *Reconciler) runReconcileSteps(ctx context.Context, tgw *gatewayv1alpha1.TenantGateway) error {
-	claims, err := r.collectHostnameClaims(ctx, tgw)
+	// Judged before anything reads the passthrough lists. The
+	// enumeration below keys listeners by hostname, so two entries
+	// answering one name would have one of them silently dropped by a
+	// spec that is rejected only afterwards. Nothing observable depends
+	// on that ordering today, because the render fails before any route
+	// status is written; the point is that it should not have to.
+	//
+	// The controller keeps its own copy of these rules because it and
+	// the CRD roll out separately, so it cannot assume CEL was applied
+	// to what it reads.
+	if err := validatePassthroughListenerCertMode(tgw.Spec.TLSPassthroughListeners, tgw.Spec.CertMode); err != nil {
+		return err
+	}
+	if err := validateTLSPassthroughListeners(tgw.Spec.TLSPassthroughListeners, renderedPassthroughServices(tgw), tgw.Spec.Apex); err != nil {
+		return err
+	}
+
+	claims, attached, err := r.collectHostnameClaims(ctx, tgw)
 	if err != nil {
 		return fmt.Errorf("collect attached hostnames: %w", err)
 	}
-	winners, losers := resolveHostnameOwners(claims)
+	losers := resolveHostnameOwners(claims)
 
-	dynHostnames := make([]string, 0, len(winners))
-	for h := range winners {
+	// A hostname earns an HTTPS-terminate listener and a Gateway-issued
+	// certificate when an HTTPRoute claims it and no passthrough
+	// listener answers it. Both forms of passthrough count, the
+	// port-443 tlsPassthroughServices entry and the native-port
+	// tlsPassthroughListeners one. On 443 a terminate listener for the
+	// entry's own hostname is a pair Cilium conflicts, so rendering it
+	// would take both listeners down. On a native port Gateway API would
+	// serve the pair, and the rule holds as a policy: a name a passthrough
+	// listener serves is reserved to it, so an app cannot take a platform
+	// name on 443. A TLSRoute never needed the
+	// terminate listener either: its backend presents its own
+	// certificate.
+	//
+	// Asking whether any claimant is an HTTPRoute, rather than whether
+	// the winner is one, keeps a TLSRoute from starving an HTTPRoute of
+	// its listener: resolveHostnameOwners ranks by namespace and name
+	// with no notion of kind, and records same-namespace losers nowhere,
+	// so a TLSRoute that merely sorted first would take the hostname
+	// while the HTTPRoute still reported Accepted=True.
+	//
+	// Ownership still decides who is Accepted between routes: claims and
+	// the tuple sets built from them carry TLSRoutes untouched, so
+	// conflict resolution is unaffected. Their RouteParentStatus is not
+	// untouched, though: a TLSRoute is told below when no route of any
+	// kind can be served on its hostname. An HTTPRoute claiming a name no
+	// passthrough listener answers puts a terminate listener there, which
+	// the TLSRoute cannot attach to either.
+	//
+	// Two views of the listeners the spec renders, taken from one
+	// enumeration so a passthrough source added later reaches both or
+	// neither. Native-port listeners admit only the tenant's own
+	// namespace, while claims are collected from every attached
+	// namespace, so a route elsewhere can claim a name it could never
+	// attach to. The port-443 entries do not have this gap: their
+	// allowedRoutes select on the gateway label, which every attached
+	// namespace carries. byHostname is keyed by rendered hostname,
+	// sections by rendered listener name, because a route pins itself to
+	// a listener by name while a claim overlaps hostnames. Both are
+	// needed to answer whether one route can be served on one hostname.
+	// byHostname doubles as the reserved-hostname set: its keys are
+	// exactly the hostnames a passthrough listener answers.
+	rendered := passthroughListeners(tgw)
+	byHostname := make(map[string]passthroughListener, len(rendered))
+	sections := make(map[string]string, len(rendered))
+	for _, l := range rendered {
+		byHostname[l.hostname] = l
+		sections[l.section] = l.hostname
+	}
+	dynHostnames := make([]string, 0, len(claims))
+	withdrawn := map[routeRef][]withdrawnHostname{}
+	for h, refs := range claims {
+		// A TLS-passthrough listener terminates nothing: it forwards
+		// the stream it matched by SNI, so an HTTPRoute pinning one by
+		// sectionName selects a listener that cannot serve it, whatever
+		// answers its hostname, and the terminate listener rendered for
+		// the same hostname carries a content-addressed name of its
+		// own. Gateway API derives the kinds a TLS listener takes from
+		// the protocol and that is TLSRoute alone. The port-443
+		// passthrough listeners name HTTPRoute in allowedRoutes.kinds
+		// all the same, to keep every port-443 set uniform
+		// (cilium#45559), and the Gateway reports that entry back on the
+		// listener as ResolvedRefs=False/InvalidRouteKinds rather than
+		// as a grant.
+		//
+		// Nothing else is bound to tell the route. The listener lists
+		// HTTPRoute among its kinds, so whether the Gateway controller
+		// refuses the route is left to the implementation, and this
+		// condition is the refusal that does not depend on it.
+		//
+		// Such a ref then leaves the hostname before anything else is
+		// decided about it, the way a refused TLSRoute leaves the
+		// eligibility race below: ownership ranks by namespace with no
+		// notion of who can attach, so a ref this pass refused could
+		// otherwise sort first and the route that can be served is told
+		// it lost to it. A hostname whose every claimant is refused
+		// earns no terminate listener and no certificate either, which
+		// is what collectHostnameClaims filters attachable routes for.
+		// The route itself keeps whatever the race recorded, for the
+		// reason withdrawnNoSuchSection keeps it: the listener this ref
+		// named says nothing about who holds the name.
+		//
+		// Two more verdicts are reached in the same place, because each
+		// is a property of the claim itself rather than of what else
+		// claims or answers the name, so each is settled before the
+		// race and the overlap are consulted: a wildcard, which HTTP-01
+		// can terminate for nobody, and a parentRef port the terminate
+		// listener is not published on. judgeHTTPRouteClaim carries
+		// the three and says which of them keeps a loss.
+		refused := map[routeRef]struct{}{}
+		claimants := refs[:0:0]
+		// plain holds the HTTPRoutes served on the port-80 listener as
+		// they asked. They earn no terminate listener and are refused
+		// nothing, so they stay out of claimants, which is what decides
+		// both; they publish the name from their namespace all the
+		// same, so every recount below ranks them with whatever field
+		// it recounts, or a recount crowns a namespace that lost to
+		// them in the first count and drops a loss that stands.
+		plain := refs[:0:0]
+		for _, ref := range refs {
+			if ref.kind != routeKindHTTP {
+				claimants = append(claimants, ref)
+				continue
+			}
+			w, verdict := judgeHTTPRouteClaim(ref, h, tgw, sections)
+			switch verdict {
+			case httpClaimTerminates:
+				claimants = append(claimants, ref)
+			case httpClaimServedPlain:
+				plain = append(plain, ref)
+			case httpClaimRefused:
+				refused[ref] = struct{}{}
+				withdrawn[ref] = append(withdrawn[ref], w)
+				if !keepsLoss(w.cause) {
+					dropLostHostname(losers, ref, h)
+				}
+			}
+		}
+		// recount re-decides ownership of h over field plus the plain
+		// routes and clears the losses of the namespace that wins, the
+		// one statement of a rule three branches below apply: ownership
+		// was ranked once over every claimant, and each time the field
+		// shrinks, a refused claimant or the TLSRoutes an entry turned
+		// away, whoever now ranks first must not be carrying a loss to
+		// a route that is out of the race.
+		recount := func(field []routeRef) {
+			contenders := append(plain[:0:0], plain...)
+			contenders = append(contenders, field...)
+			if len(contenders) == 0 {
+				return
+			}
+			rankRouteRefs(contenders)
+			for _, ref := range contenders {
+				if ref.namespace == contenders[0].namespace {
+					dropLostHostname(losers, ref, h)
+				}
+			}
+		}
+		// Run only where a ref was refused, so an ordinary race is
+		// decided once; the branches below each recount over the field
+		// they serve, and the hostname nothing answers reaches none of
+		// them.
+		if len(refused) > 0 {
+			recount(claimants)
+		}
+		// Matched by hostname overlap rather than by string equality,
+		// because a "*.db.<apex>" entry answers every name beneath it,
+		// so each of those names is reserved to it as well.
+		//
+		// Several entries can match one claim. Reserved hostnames are
+		// pairwise non-overlapping, so a concrete claim matches at most
+		// one, but a claimed hostname is not always concrete: a route
+		// publishing "*.<apex>" covers every tlsPassthroughServices
+		// entry at once, and the shipped default carries three. An
+		// HTTPRoute's wildcard was refused above, so a wildcard reaching
+		// this point is a TLSRoute's. For the message it does not matter
+		// which match is named, only that the same one is named every
+		// pass: a name that changes between passes is a status write
+		// that requeues this object through the route watch.
+		// Lexicographic order is the cheapest total order to hand, and
+		// carries no claim that the name it picks is the most specific
+		// one.
+		//
+		// Which name is kept is a stability choice and must not decide
+		// anything else. A concrete claim overlaps exactly one reserved
+		// entry, but a wildcard claim overlaps several, and the two
+		// kinds differ in who may attach: a port-443 entry takes routes
+		// from every attached namespace, a native-port one only from
+		// the tenant. So whether a TLSRoute can attach is read off the
+		// whole overlap set below, not off the name picked here.
+		var answeredBy string
+		for rh := range byHostname {
+			if !hostnamesOverlap(rh, h) {
+				continue
+			}
+			if answeredBy == "" || rh < answeredBy {
+				answeredBy = rh
+			}
+		}
+		if answeredBy != "" {
+			// The name is reserved to the passthrough listener by the
+			// spec alone, so the HTTPRoute that expected termination
+			// gets no listener whether or not a TLSRoute is attached
+			// there and whatever its backends resolve to. Keying it on
+			// the routes instead would make the route's status follow
+			// how one implementation builds its filter chains.
+			//
+			// For that HTTPRoute the hostname also leaves the ownership
+			// race: losing it to another route is true and beside the
+			// point once nothing terminates it, and leaving the entry
+			// in would name one hostname under both causes in a single
+			// condition, sending the loser to look at a route that is
+			// not served either.
+			for _, ref := range claimants {
+				if ref.kind != routeKindHTTP {
+					continue
+				}
+				withdrawn[ref] = append(withdrawn[ref], withdrawnHostname{hostname: h, answeredBy: answeredBy, cause: withdrawnAnswered})
+				dropLostHostname(losers, ref, h)
+			}
+			// A TLSRoute pinned to another listener, refused for its
+			// namespace, or naming a port the listener does not publish
+			// attaches to nothing, and is told so here. The refused
+			// routes leave before a winner is picked, not while it is
+			// being applied: ownership ranks by namespace with no
+			// notion of eligibility, so a route this pass just refused
+			// can sort first and the one route that can attach is then
+			// told it lost to it.
+			eligible := claimants[:0:0]
+			for _, ref := range claimants {
+				if ref.kind == routeKindHTTP {
+					continue
+				}
+				servable, cause, refusedBy := servableOn(ref, h, tgw.Namespace, byHostname, sections)
+				if servable {
+					eligible = append(eligible, ref)
+					continue
+				}
+				if cause == withdrawnNone {
+					// Out of the race, but with no cause to write: this
+					// route is unserved for a reason the refusals here
+					// do not model, and inventing one would send its
+					// owner to the wrong field. Any loss the race
+					// already recorded stays: the route did claim a
+					// hostname another route holds, which is true
+					// whatever its sectionName says, and dropping it
+					// here would leave the route in neither map and
+					// falling through to Accepted=True.
+					continue
+				}
+				// answeredBy is the name this pass reports for the
+				// hostname as a whole; a refusal has to name the
+				// listener that actually turned this route away, which
+				// on a claim overlapping several reserved names is a
+				// different one.
+				w := withdrawnHostname{hostname: h, answeredBy: answeredBy, cause: cause}
+				switch cause {
+				case withdrawnNoSuchSection:
+					// answeredBy is cleared rather than left naming the
+					// listener that holds the hostname: the field says
+					// what the named section answers, and a section
+					// that does not exist answers nothing.
+					w.section = string(*ref.parentRef.SectionName)
+					w.answeredBy = ""
+				case withdrawnSectionMismatch:
+					w.section = string(*ref.parentRef.SectionName)
+					w.answeredBy = sections[w.section]
+				case withdrawnPortMismatch:
+					w.port = int32(*ref.parentRef.Port)
+				case withdrawnForeignNamespace:
+					w.answeredBy = refusedBy
+				}
+				withdrawn[ref] = append(withdrawn[ref], w)
+				// The hostname leaves this route's race with every
+				// cause reachable here but one. A section that names no
+				// listener says nothing about who holds the name: the
+				// listener the route asked for does not exist, so it
+				// took nothing from anyone, and the loss to whoever did
+				// claim it is as true as before. The other causes each
+				// describe a listener that answers the name, which is
+				// what makes the race beside the point there. keepsLoss
+				// is the one statement of that rule.
+				if !keepsLoss(cause) {
+					dropLostHostname(losers, ref, h)
+				}
+			}
+			// The race was decided with no notion of kind, so its
+			// winner may be one of the HTTPRoutes just withdrawn, and
+			// a TLSRoute would then hold a conflict naming a route
+			// this same pass declined to serve. Recount over the
+			// TLSRoutes the listener can serve, and clear what the
+			// mixed count produced.
+			recount(eligible)
+			continue
+		}
+		if !slices.ContainsFunc(claimants, func(ref routeRef) bool { return ref.kind == routeKindHTTP }) {
+			// Claimed only by TLSRoutes, and no passthrough listener
+			// answers it. No terminate listener is rendered, and a
+			// TLSRoute could not attach to one anyway, so nothing on
+			// the Gateway serves this name and nothing on the Gateway
+			// says so either. An empty answeredBy marks that shape.
+			for _, ref := range claimants {
+				w := withdrawnHostname{hostname: h, cause: withdrawnUnanswered}
+				// A route that named a listener gets told about that
+				// listener instead. Nothing answers the hostname either
+				// way, but "this Gateway declares no passthrough
+				// listener" is false to a reader who named one that is
+				// rendered, and it hides the half they can fix.
+				if ref.parentRef.SectionName != nil {
+					if answers, exists := sections[string(*ref.parentRef.SectionName)]; exists {
+						w.cause = withdrawnSectionMismatch
+						w.section = string(*ref.parentRef.SectionName)
+						w.answeredBy = answers
+					}
+				}
+				withdrawn[ref] = append(withdrawn[ref], w)
+				// Dropped for every claimant here, where the branch
+				// above keeps it for a TLSRoute that lost to another
+				// TLSRoute. The difference is whether anything is on
+				// the other side of the race: there a passthrough
+				// listener exists and carries exactly one of them, so
+				// losing means something; here nothing answers the
+				// name and every claimant is unserved for the one
+				// reason worth printing.
+				dropLostHostname(losers, ref, h)
+			}
+			continue
+		}
 		dynHostnames = append(dynHostnames, h)
 	}
 	sort.Strings(dynHostnames)
+	acceptPartlyReserved(claims, losers, withdrawn)
 
-	// allRefs is the full set of (route, parentRef) tuples that
-	// attached to this Gateway, including duplicate parentRefs from
-	// the same route. Each tuple owns its own RouteParentStatus
-	// entry per Gateway API's per-(parentRef, controllerName)
-	// status contract.
-	allRefs := map[routeRef]struct{}{}
+	// claimed is the subset of the attached (route, parentRef) tuples
+	// that carried at least one hostname into this pass, which is the
+	// subset there is a verdict to write for. Each tuple owns its own
+	// RouteParentStatus entry per Gateway API's per-(parentRef,
+	// controllerName) status contract, so duplicate parentRefs from one
+	// route are counted apart. The rest of attached is what the status
+	// pass retracts.
+	claimed := map[routeRef]struct{}{}
 	for _, refs := range claims {
 		for _, ref := range refs {
-			allRefs[ref] = struct{}{}
+			claimed[ref] = struct{}{}
 		}
 	}
 
@@ -156,13 +575,64 @@ func (r *Reconciler) runReconcileSteps(ctx context.Context, tgw *gatewayv1alpha1
 	if err := r.reconcilePerListenerCertificates(ctx, tgw, dynHostnames); err != nil {
 		return err
 	}
-	if err := r.updateRouteStatuses(ctx, tgw, allRefs, losers); err != nil {
+	// The route-status pass runs after every desired-state step that
+	// does not depend on it, the redirect first among them: the redirect
+	// is the object the whole-apex guard exists to provide, and a route
+	// status the apiserver refuses — two writers racing one route, or a
+	// status object over the parents cap — must not withhold it. The
+	// failures are collected rather than returned on the spot so the
+	// remaining steps still run, and handed back tagged so the wrapper
+	// can tell them apart from a desired-state failure.
+	if err := r.reconcileHTTPToHTTPSRedirect(ctx, tgw); err != nil {
 		return err
 	}
-	if err := r.reconcileHTTPToHTTPSRedirect(ctx, tgw); err != nil {
+	var routeStatusErrs []error
+	if err := r.updateRouteStatuses(ctx, tgw, attached, claimed, losers, withdrawn); err != nil {
+		routeStatusErrs = append(routeStatusErrs, err)
+	}
+	if err := r.reconcileWholeApexRouteStatuses(ctx, tgw); err != nil {
+		routeStatusErrs = append(routeStatusErrs, err)
+	}
+	if err := r.reconcileStatus(ctx, tgw); err != nil {
 		return err
 	}
-	return r.reconcileStatus(ctx, tgw, dynHostnames)
+	if err := errors.Join(routeStatusErrs...); err != nil {
+		return routeStatusWriteError{err: err}
+	}
+	return nil
+}
+
+// acceptPartlyReserved drops the refusal of a route whose only cause is
+// the reservation and that claims a hostname outside it, so the route
+// reads Accepted the way Gateway API accepts one whose hostnames
+// intersect at least one listener: it is served on the free names, and
+// the reserved ones get no listener.
+func acceptPartlyReserved(claims map[string][]routeRef, losers map[routeRef][]string, withdrawn map[routeRef][]withdrawnHostname) {
+	names := map[routeRef]map[string]struct{}{}
+	for h, refs := range claims {
+		for _, ref := range refs {
+			if names[ref] == nil {
+				names[ref] = map[string]struct{}{}
+			}
+			names[ref][h] = struct{}{}
+		}
+	}
+	for ref, ws := range withdrawn {
+		if _, lost := losers[ref]; lost {
+			continue
+		}
+		reserved := map[string]struct{}{}
+		for _, w := range ws {
+			if w.cause != withdrawnAnswered {
+				reserved = nil
+				break
+			}
+			reserved[w.hostname] = struct{}{}
+		}
+		if reserved != nil && len(reserved) < len(names[ref]) {
+			delete(withdrawn, ref)
+		}
+	}
 }
 
 // markFailed writes a Ready=False condition with Reason=ReconcileError
@@ -194,7 +664,17 @@ func (r *Reconciler) markFailed(ctx context.Context, tgw *gatewayv1alpha1.Tenant
 // 80 do not silently reach app backends. App-owned HTTPRoutes
 // attaching by hostname without sectionName otherwise pick up the
 // HTTP listener too — Harbor / dashboard / keycloak credentials in
-// the clear. The redirect HTTPRoute matches any host on path /.
+// the clear. The redirect HTTPRoute matches the tenant apex and its
+// subdomains on path /; it names them rather than matching every host
+// because a route in a tenant-* namespace has to declare hostnames
+// inside its own apex to pass cozystack-route-hostname-policy.
+//
+// certMode=edge is the deliberate exception: there is no https listener
+// to redirect to (TLS ends at the class provider's edge, which does that
+// redirect itself) and no narrow port-80 listener either, so the function
+// DELETES an owned redirect route instead of ensuring one. The
+// plaintext-credentials guard described above therefore does not exist in
+// that mode — the protection belongs to the edge, not to this Gateway.
 func (r *Reconciler) reconcileHTTPToHTTPSRedirect(ctx context.Context, tgw *gatewayv1alpha1.TenantGateway) error {
 	logger := log.FromContext(ctx)
 	desired, err := r.renderHTTPRedirect(tgw)
@@ -204,6 +684,28 @@ func (r *Reconciler) reconcileHTTPToHTTPSRedirect(ctx context.Context, tgw *gate
 
 	existing := &gatewayv1.HTTPRoute{}
 	getErr := r.Get(ctx, types.NamespacedName{Namespace: desired.Namespace, Name: desired.Name}, existing)
+	if tgw.Spec.CertMode == gatewayv1alpha1.CertModeEdge {
+		// Nothing listens on https here, so the redirect has nowhere
+		// to send anyone; the edge does that redirect itself. Remove
+		// an owned route left from a previous mode. A route of that
+		// name this controller does not own is left alone WITHOUT an
+		// error, unlike the takeover refusal below: edge has nothing
+		// it wants to put in its place, so there is no conflict to
+		// report.
+		switch {
+		case apierrors.IsNotFound(getErr):
+			return nil
+		case getErr != nil:
+			return fmt.Errorf("get redirect HTTPRoute for cleanup: %w", getErr)
+		case !ownedByTenantGateway(existing.OwnerReferences, tgw):
+			return nil
+		}
+		if err := r.Delete(ctx, existing); err != nil && !apierrors.IsNotFound(err) {
+			return fmt.Errorf("delete stale redirect HTTPRoute %s: %w", existing.Name, err)
+		}
+		logger.V(1).Info("deleted redirect HTTPRoute after switch to edge", "name", existing.Name, "namespace", existing.Namespace)
+		return nil
+	}
 	switch {
 	case apierrors.IsNotFound(getErr):
 		if err := r.Create(ctx, desired); err != nil {
@@ -236,36 +738,16 @@ func (r *Reconciler) reconcileHTTPToHTTPSRedirect(ctx context.Context, tgw *gate
 	return nil
 }
 
-// collectHostnameClaims lists HTTPRoutes and TLSRoutes cluster-wide
-// and returns a map of hostname -> []routeRef of routes claiming
-// it via parentRefs targeting this TenantGateway's Gateway. Routes
-// whose namespace is not allowed to attach to this Gateway are
-// filtered out — Gateway listener allowedRoutes selectors reject
-// those routes at runtime, but the reconciler must not provision
-// certs / listeners for them either (each unused cert eats LE rate
-// limits and leaks the operator's reachable hostname set). Empty
-// map in DNS-01 mode (wildcard handles everything).
-//
-// A namespace is allowed to attach when:
-//   - It is the TenantGateway's own namespace, OR
-//   - It is in Spec.AttachedNamespaces (static admin-configured
-//     attach list of cozy-* system namespaces), OR
-//   - It carries the label namespace.cozystack.io/gateway pointing
-//     at this Gateway's namespace (inheritance — apps/tenant chart
-//     writes the label on every tenant namespace, inherited or
-//     self-owning, so child tenants reach the parent Gateway).
-//
-// The third source is what makes HTTP-01 inheritance work end-to-end:
-// without it, a child tenant's HTTPRoute would be silently dropped
-// here and no per-listener Certificate would be issued — the
-// Gateway's label-based allowedRoutes selector would let the route
-// through at runtime but no listener would accept it (no matching
-// hostname), so Accepted stays False indefinitely.
-func (r *Reconciler) collectHostnameClaims(ctx context.Context, tgw *gatewayv1alpha1.TenantGateway) (map[string][]routeRef, error) {
-	if tgw.Spec.CertMode == gatewayv1alpha1.CertModeDNS01 {
-		return nil, nil
-	}
-
+// allowedAttachNamespaces returns the namespaces whose routes this
+// TenantGateway judges: its own, the static admin-configured
+// Spec.AttachedNamespaces list of cozy-* system namespaces, and every
+// namespace carrying namespace.cozystack.io/gateway pointing at this
+// Gateway's namespace. The label is what makes inheritance work — the
+// apps/tenant chart writes it on every tenant namespace, inherited or
+// self-owning, so child tenants reach the parent Gateway — and it is
+// the same label the Gateway's allowedRoutes selector reads, so the
+// two paths agree on which namespaces can attach.
+func (r *Reconciler) allowedAttachNamespaces(ctx context.Context, tgw *gatewayv1alpha1.TenantGateway) (map[string]struct{}, error) {
 	allowed := map[string]struct{}{tgw.Namespace: {}}
 	for _, ns := range tgw.Spec.AttachedNamespaces {
 		if ns == "" {
@@ -273,10 +755,6 @@ func (r *Reconciler) collectHostnameClaims(ctx context.Context, tgw *gatewayv1al
 		}
 		allowed[ns] = struct{}{}
 	}
-	// Inheritance: every namespace pointing at this Gateway via the
-	// label is also allowed. The same label drives the Gateway's
-	// allowedRoutes selector, so the two paths agree on which
-	// namespaces can attach.
 	nsList := &corev1.NamespaceList{}
 	selector := labels.SelectorFromSet(labels.Set{namespaceGatewayLabel: tgw.Namespace})
 	if err := r.List(ctx, nsList, client.MatchingLabelsSelector{Selector: selector}); err != nil {
@@ -285,18 +763,62 @@ func (r *Reconciler) collectHostnameClaims(ctx context.Context, tgw *gatewayv1al
 	for i := range nsList.Items {
 		allowed[nsList.Items[i].Name] = struct{}{}
 	}
+	return allowed, nil
+}
+
+// collectHostnameClaims lists HTTPRoutes and TLSRoutes cluster-wide
+// and returns a map of hostname -> []routeRef of routes claiming
+// it via parentRefs targeting this TenantGateway's Gateway. Routes
+// whose namespace is not allowed to attach to this Gateway are
+// filtered out — Gateway listener allowedRoutes selectors reject
+// those routes at runtime, but the reconciler must not provision
+// certs / listeners for them either (each unused cert eats LE rate
+// limits and leaks the operator's reachable hostname set). Empty
+// map in DNS-01 mode (wildcard handles everything).
+//
+// The attach set comes from allowedAttachNamespaces, and its label
+// source is what makes HTTP-01 inheritance work end-to-end: without
+// it, a child tenant's HTTPRoute would be silently dropped here and no
+// per-listener Certificate would be issued — the Gateway's label-based
+// allowedRoutes selector would let the route through at runtime but no
+// listener would accept it (no matching hostname), so Accepted stays
+// False indefinitely.
+func (r *Reconciler) collectHostnameClaims(ctx context.Context, tgw *gatewayv1alpha1.TenantGateway) (map[string][]routeRef, map[routeRef]struct{}, error) {
+	// DNS-01, existingSecret and edge all serve every hostname off
+	// apex-wide listeners, so none needs per-host listeners or claims.
+	if servesWholeApex(tgw) {
+		return nil, nil, nil
+	}
+
+	allowed, err := r.allowedAttachNamespaces(ctx, tgw)
+	if err != nil {
+		return nil, nil, err
+	}
 
 	out := map[string][]routeRef{}
+	attached := map[routeRef]struct{}{}
 
 	httpRoutes := &gatewayv1.HTTPRouteList{}
 	if err := r.List(ctx, httpRoutes); err != nil {
-		return nil, fmt.Errorf("list HTTPRoutes: %w", err)
+		return nil, nil, fmt.Errorf("list HTTPRoutes: %w", err)
 	}
 	for i := range httpRoutes.Items {
 		route := &httpRoutes.Items[i]
 		if _, ok := allowed[route.Namespace]; !ok {
 			continue
 		}
+		// The redirect route this controller renders is infrastructure,
+		// not a hostname publication, so it must not drive listener or
+		// Certificate provisioning. It names the apex and its wildcard
+		// (see renderHTTPRedirect) to satisfy the route-hostname policy.
+		//
+		// Before this route carried hostnames it contributed nothing to
+		// the claim set; skipping it here restores exactly that. Letting
+		// its hostnames through instead provisions listeners and
+		// certificates for them, which fails.
+		if isHTTPRedirectRoute(route, tgw) {
+			continue
+		}
 		matchingRefs := allAttachingParentRefs(route.Spec.ParentRefs, route.Namespace, tgw)
 		if len(matchingRefs) == 0 {
 			continue
@@ -313,6 +835,7 @@ func (r *Reconciler) collectHostnameClaims(ctx context.Context, tgw *gatewayv1al
 				name:      route.Name,
 				parentRef: matchingRef,
 			}
+			attached[ref] = struct{}{}
 			for _, h := range route.Spec.Hostnames {
 				out[string(h)] = append(out[string(h)], ref)
 			}
@@ -321,8 +844,18 @@ func (r *Reconciler) collectHostnameClaims(ctx context.Context, tgw *gatewayv1al
 
 	tlsRoutes := &gatewayv1alpha2.TLSRouteList{}
 	if err := r.List(ctx, tlsRoutes); err != nil {
-		return nil, fmt.Errorf("list TLSRoutes: %w", err)
-	}
+		return nil, nil, fmt.Errorf("list TLSRoutes: %w", err)
+	}
+	// No isHTTPRedirectRoute filter here, unlike the HTTPRoute loop
+	// above: this controller renders no TLSRoute, so there is nothing of
+	// its own to exclude. Add the equivalent guard here alongside the
+	// first controller-rendered TLSRoute, should one ever appear.
+	//
+	// The rendered passthrough listeners are what a route declaring no
+	// hostnames is served on, so they decide its claims. Same
+	// enumeration the reservation reads, for the reason it is one
+	// function: a passthrough source added later has to reach both.
+	rendered := passthroughListeners(tgw)
 	for i := range tlsRoutes.Items {
 		route := &tlsRoutes.Items[i]
 		if _, ok := allowed[route.Namespace]; !ok {
@@ -339,12 +872,72 @@ func (r *Reconciler) collectHostnameClaims(ctx context.Context, tgw *gatewayv1al
 				name:      route.Name,
 				parentRef: matchingRef,
 			}
-			for _, h := range route.Spec.Hostnames {
-				out[string(h)] = append(out[string(h)], ref)
+			attached[ref] = struct{}{}
+			for _, h := range tlsRouteClaims(route, matchingRef, rendered, tgw.Namespace) {
+				out[h] = append(out[h], ref)
 			}
 		}
 	}
-	return out, nil
+	return out, attached, nil
+}
+
+// tlsRouteClaims returns the hostnames route claims through ref.
+//
+// A route that declares spec.hostnames claims those. A route that
+// declares none claims the hostname of every rendered passthrough
+// listener ref selects, because Gateway API serves a route with no
+// hostnames on its listener's hostname (TLSRoute spec.hostnames).
+// Reading spec.hostnames alone would leave such a route out of the
+// hostname race and of every verdict keyed to a hostname. TLSRoute
+// v1alpha2 sets no minItems on the field,
+// and a route that pins its listener by sectionName has no use for it.
+// The route-hostname policy requires hostnames of a route in a tenant
+// namespace, so the shape arrives from the attached system namespaces,
+// where this platform's own routes live, or from an administrator.
+//
+// Selection follows the same function: toTLSRoutes takes a route whose
+// sectionName is absent onto every TLS listener it may attach to, and
+// one that names a listener onto that listener alone. A sectionName
+// naming no rendered passthrough listener therefore yields no claim,
+// and the route hears nothing from this controller: every refusal it
+// writes is keyed to a hostname, and neither the route nor the listener
+// it asked for supplies one.
+//
+// "May attach to" is why the unnamed case reads tenantNamespace. A
+// native-port listener admits the publishing tenant alone, so Cilium
+// never puts a route from elsewhere on it and never serves that route
+// on its hostname; lending it anyway hands the route a name its own
+// object does not carry, and the pass then refuses it for the namespace
+// while the same route is being served on a name it borrowed
+// legitimately. A route that names the listener is a different
+// question and keeps the borrow: it asked for that listener, so the
+// refusal is the answer to what it asked, and dropping the claim would
+// leave it with no verdict at all.
+//
+// parentRef.port is not read here. It does not decide which hostname a
+// route is served on, only whether the route attaches at all, which
+// servableOn answers for a substituted hostname exactly as it does for
+// a declared one.
+func tlsRouteClaims(route *gatewayv1alpha2.TLSRoute, ref gatewayv1.ParentReference, rendered []passthroughListener, tenantNamespace string) []string {
+	if len(route.Spec.Hostnames) > 0 {
+		out := make([]string, 0, len(route.Spec.Hostnames))
+		for _, h := range route.Spec.Hostnames {
+			out = append(out, string(h))
+		}
+		return out
+	}
+	named := ref.SectionName != nil
+	var out []string
+	for _, l := range rendered {
+		if named && string(*ref.SectionName) != l.section {
+			continue
+		}
+		if !named && l.tenantOnly && route.Namespace != tenantNamespace {
+			continue
+		}
+		out = append(out, l.hostname)
+	}
+	return out
 }
 
 // pickAttachingParentRef returns the first ParentRef in refs that
@@ -378,6 +971,16 @@ func allAttachingParentRefs(refs []gatewayv1.ParentReference, routeNs string, tg
 	return out
 }
 
+// parentRefAttachesTo answers the identity question alone — does this
+// parentRef name this Gateway — and deliberately does not read ref.Port,
+// though Gateway API counts the port when both it and a sectionName are
+// given. Matching it here would say less than the function's name
+// promises: whether a port pin selects a listener this Gateway actually
+// publishes is a serving verdict, and it lives with the other serving
+// verdicts in judgeHTTPRouteClaim, which refuses a route pinned to a
+// port the Gateway does not publish before the claim can reach
+// dynHostnames. A caller that needs the port answered must read that
+// verdict, not this one.
 func parentRefAttachesTo(ref gatewayv1.ParentReference, routeNs string, tgw *gatewayv1alpha1.TenantGateway) bool {
 	group := ""
 	if ref.Group != nil {
@@ -484,6 +1087,25 @@ func (r *Reconciler) reconcilePerListenerCertificates(ctx context.Context, tgw *
 	return nil
 }
 
+// isHTTPRedirectRoute reports whether a route is the http→https redirect
+// this controller renders for this TenantGateway. Used by
+// collectHostnameClaims to keep that one route out of the hostname-claim
+// set; see the comment at that call site for what it would otherwise
+// provision.
+//
+// Name and ownership are both required and each is pinned by its own
+// test: ownership alone would exclude any other controller-owned route
+// as well, and name alone would extend the exception to a route planted
+// under that name by someone else. The labels renderHTTPRedirect stamps
+// are deliberately not used, being writable by anyone who can create a
+// route. Requiring the owner reference is safe for the real route
+// because renderHTTPRedirect sets it before the route is first written.
+func isHTTPRedirectRoute(route *gatewayv1.HTTPRoute, tgw *gatewayv1alpha1.TenantGateway) bool {
+	return route.Namespace == tgw.Namespace &&
+		route.Name == httpRedirectRouteName(tgw) &&
+		ownedByTenantGateway(route.OwnerReferences, tgw)
+}
+
 func ownedByTenantGateway(refs []metav1.OwnerReference, tgw *gatewayv1alpha1.TenantGateway) bool {
 	for _, ref := range refs {
 		if ref.UID == tgw.UID && ref.Controller != nil && *ref.Controller {
@@ -554,12 +1176,8 @@ func (r *Reconciler) reconcileGateway(ctx context.Context, tgw *gatewayv1alpha1.
 // preserving foreign keys.
 func mergeLabels(existing, desired map[string]string) map[string]string {
 	out := make(map[string]string, len(existing)+len(desired))
-	for k, v := range existing {
-		out[k] = v
-	}
-	for k, v := range desired {
-		out[k] = v
-	}
+	maps.Copy(out, existing)
+	maps.Copy(out, desired)
 	return out
 }
 
@@ -577,6 +1195,32 @@ func labelsEqual(a, b map[string]string) bool {
 
 func (r *Reconciler) reconcileIssuer(ctx context.Context, tgw *gatewayv1alpha1.TenantGateway) error {
 	logger := log.FromContext(ctx)
+
+	if tgw.Spec.CertMode == gatewayv1alpha1.CertModeExistingSecret || tgw.Spec.CertMode == gatewayv1alpha1.CertModeEdge {
+		// existingSecret references an operator-supplied Secret and edge
+		// has TLS terminated upstream; neither mints an ACME Issuer.
+		// Delete any owned Issuer left from a previous http01/dns01
+		// phase so the mode switch doesn't leak ACME machinery. Same
+		// ownership-guarded cleanup contract as
+		// reconcileWildcardCertificate's HTTP-01 branch.
+		stale := &cmv1.Issuer{}
+		err := r.Get(ctx, types.NamespacedName{Namespace: tgw.Namespace, Name: gatewayIssuerName(tgw)}, stale)
+		if apierrors.IsNotFound(err) {
+			return nil
+		}
+		if err != nil {
+			return fmt.Errorf("get Issuer for cleanup: %w", err)
+		}
+		if !ownedByTenantGateway(stale.OwnerReferences, tgw) {
+			return nil
+		}
+		if err := r.Delete(ctx, stale); err != nil && !apierrors.IsNotFound(err) {
+			return fmt.Errorf("delete stale Issuer %s: %w", stale.Name, err)
+		}
+		logger.V(1).Info("deleted stale Issuer after switch to a mode without ACME", "name", stale.Name)
+		return nil
+	}
+
 	desired, err := r.renderIssuer(tgw)
 	if err != nil {
 		return fmt.Errorf("render Issuer: %w", err)
@@ -619,9 +1263,11 @@ func (r *Reconciler) reconcileWildcardCertificate(ctx context.Context, tgw *gate
 	logger := log.FromContext(ctx)
 
 	if tgw.Spec.CertMode != gatewayv1alpha1.CertModeDNS01 {
-		// HTTP-01 mode: wildcard cert must not exist. Delete any
-		// stale wildcard cert left over from a previous DNS-01
-		// reconcile so a mode toggle doesn't leak Certificates.
+		// Only DNS-01 mints a wildcard Certificate, so in every other
+		// mode that object must not exist — existingSecret references
+		// an operator-supplied Secret without one. Delete a stale
+		// Certificate left over from a previous DNS-01 reconcile so a
+		// mode toggle doesn't leak them.
 		stale := &cmv1.Certificate{}
 		err := r.Get(ctx, types.NamespacedName{Namespace: tgw.Namespace, Name: gatewayCertificateName(tgw)}, stale)
 		if apierrors.IsNotFound(err) {
@@ -636,7 +1282,7 @@ func (r *Reconciler) reconcileWildcardCertificate(ctx context.Context, tgw *gate
 		if err := r.Delete(ctx, stale); err != nil && !apierrors.IsNotFound(err) {
 			return fmt.Errorf("delete stale wildcard Certificate %s: %w", stale.Name, err)
 		}
-		logger.V(1).Info("deleted stale wildcard Certificate after switch to HTTP-01", "name", stale.Name)
+		logger.V(1).Info("deleted stale wildcard Certificate after switch away from DNS-01", "name", stale.Name)
 		return nil
 	}
 	childApexes, err := r.collectInheritingChildApexes(ctx, tgw)
@@ -683,42 +1329,141 @@ func (r *Reconciler) reconcileWildcardCertificate(ctx context.Context, tgw *gate
 // given TenantGateway. The result is owned by the TenantGateway via
 // controllerutil.SetControllerReference so cascade delete works.
 //
-// dynHostnames is the deduplicated list of hostnames pulled from
-// HTTPRoutes / TLSRoutes attached to this Gateway. In HTTP-01 mode
-// each becomes an HTTPS listener with its own per-listener cert. In
-// DNS-01 mode dynHostnames is expected to be empty (collector returns
-// nothing) — the wildcard listener handles all subdomains.
+// dynHostnames is the deduplicated list of hostnames owned by an
+// HTTPRoute attached to this Gateway. In HTTP-01 mode each becomes an
+// HTTPS listener with its own per-listener cert. In DNS-01 mode
+// dynHostnames is expected to be empty (collector returns nothing) —
+// the wildcard listener handles all subdomains. Hostnames owned by a
+// TLSRoute are excluded upstream in runReconcileSteps: they belong to a
+// passthrough listener, which terminates nothing and needs no cert.
 //
-// Every listener is gated by an unspoofable namespace selector
-// (kubernetes.io/metadata.name In [...]) so only the publishing
-// tenant namespace plus the TenantGateway.Spec.AttachedNamespaces
-// list (cozy-* platform namespaces) can attach routes. This is
+// Every listener is gated by a namespace selector, but not the same
+// one. The port-80 listener pins an unspoofable
+// kubernetes.io/metadata.name In [...] list naming the tenant
+// namespace and the ACME challenge namespace, and the native-port
+// listeners from tlsPassthroughListeners pin the same label naming the
+// tenant namespace alone. The HTTPS-terminate and port-443 passthrough
+// listeners select on namespace.cozystack.io/gateway, which the controller
+// stamps on the tenant namespace and on each
+// TenantGateway.Spec.AttachedNamespaces entry (cozy-* platform
+// namespaces), and which the tenant chart also stamps on every
+// inheriting child tenant namespace — so the attach set is the whole
+// inheriting subtree, not just the tenant plus the admin list. This is
 // Layer 1 of the security model documented in
 // packages/extra/gateway/README.md.
 func (r *Reconciler) renderGateway(tgw *gatewayv1alpha1.TenantGateway, dynHostnames []string, childApexes []string) (*gatewayv1.Gateway, error) {
+	// This function does not render from a spec it has not judged, which
+	// is a property of the function rather than of any one caller: the
+	// object it produces is refused wholesale by the apiserver when a
+	// single composed value is malformed, so returning a Gateway built
+	// from an unchecked spec has no safe reading. The reconcile path
+	// judges the same spec earlier, for a different reason given there.
+	// Cert mode first, because it refuses the field outright and a
+	// hostname or port error inside it then decides nothing.
+	if err := validatePassthroughListenerCertMode(tgw.Spec.TLSPassthroughListeners, tgw.Spec.CertMode); err != nil {
+		return nil, err
+	}
+	if err := validateTLSPassthroughListeners(tgw.Spec.TLSPassthroughListeners, renderedPassthroughServices(tgw), tgw.Spec.Apex); err != nil {
+		return nil, err
+	}
 	allowedRoutes := buildAllowedRoutes(tgw)
 	httpAllowedRoutes := buildHTTPListenerAllowedRoutes(tgw)
-	listeners := []gatewayv1.Listener{
-		{
-			Name:          "http",
-			Port:          80,
+	listeners := []gatewayv1.Listener{}
+	// The hostname-less :80 listener carries the ACME HTTP-01 challenge
+	// route and the http->https redirect, neither of which exists in edge
+	// mode, where it would only be a catch-all admitting any hostname.
+	// Leaving it out also keeps a hostname-pinned listener at index 0,
+	// which is what Cilium's first-listener-wins namespace check read
+	// before 1.19.6 (cilium#42159, fixed by cilium#45693): with the narrow
+	// :80 selector first, an inheriting tenant's route attached to no
+	// listener at all.
+	if tgw.Spec.CertMode != gatewayv1alpha1.CertModeEdge {
+		listeners = append(listeners, gatewayv1.Listener{
+			Name:          httpListenerName,
+			Port:          httpListenerPort,
 			Protocol:      gatewayv1.HTTPProtocolType,
 			AllowedRoutes: httpAllowedRoutes,
-		},
+		})
 	}
 
-	// HTTPS listeners restrict route attachment to HTTPRoute only —
-	// Layer 7 (cozystack-route-hostname-policy VAP) currently gates
-	// HTTPRoute and TLSRoute. With Gateway API v1.5.1 experimental
-	// CRDs in scope, GRPCRoute / TCPRoute / UDPRoute could otherwise
-	// attach by hostname and bypass the apex hostname check.
-	httpsAllowedRoutes := allowedRoutes.DeepCopy()
-	httpsAllowedRoutes.Kinds = []gatewayv1.RouteGroupKind{
-		{Group: ptrGroup(gatewayv1.GroupName), Kind: "HTTPRoute"},
+	// All port-443 listeners (HTTPS-terminate and TLS-passthrough) share
+	// the same kinds set so that Cilium does not collapse them into a
+	// single listener (cilium#45559: divergent allowedRoutes.kinds on the
+	// same port triggers listener merging that drops HTTPRoutes). That
+	// constraint governs only that the sets match each other, so the
+	// contents are a least-privilege choice: nothing the platform ships
+	// needs gRPC, TCP or UDP routing on port 443, so those three kinds
+	// stay out of the set.
+	//
+	// Built per listener rather than cloned from one value. A clone
+	// gives each listener its own slice header while the elements go on
+	// sharing one *Group each, so narrowing a single listener's kinds
+	// later would still reach across all of them — the same hazard the
+	// clone was added to remove, one level down.
+	port443Kinds := func() []gatewayv1.RouteGroupKind {
+		return []gatewayv1.RouteGroupKind{
+			{Group: ptrGroup(gatewayv1.GroupName), Kind: "HTTPRoute"},
+			{Group: ptrGroup(gatewayv1.GroupName), Kind: "TLSRoute"},
+		}
 	}
+	httpsAllowedRoutes := allowedRoutes.DeepCopy()
+	httpsAllowedRoutes.Kinds = port443Kinds()
 
-	if tgw.Spec.CertMode == gatewayv1alpha1.CertModeDNS01 {
-		certName := gatewayCertificateName(tgw)
+	switch tgw.Spec.CertMode {
+	case gatewayv1alpha1.CertModeEdge:
+		// TLS ends at the class provider's edge, so the apex, its
+		// wildcard and every inheriting child apex are plain HTTP
+		// listeners: same hostnames and the same label-based
+		// allowedRoutes as the HTTPS listeners of the other modes, so
+		// app HTTPRoutes attach by hostname unchanged, but no
+		// certificateRefs. HTTPRoute only: TLSRoute has nothing to
+		// carry it, and GRPCRoute stays out for parity with the HTTPS
+		// listeners. TLS-passthrough listeners are skipped below for
+		// the same reason.
+		edgeAllowedRoutes := allowedRoutes.DeepCopy()
+		edgeAllowedRoutes.Kinds = []gatewayv1.RouteGroupKind{
+			{Group: ptrGroup(gatewayv1.GroupName), Kind: "HTTPRoute"},
+		}
+		wildcardHost := gatewayv1.Hostname("*." + tgw.Spec.Apex)
+		apexHost := gatewayv1.Hostname(tgw.Spec.Apex)
+		listeners = append(listeners,
+			gatewayv1.Listener{
+				Name:          "edge",
+				Port:          80,
+				Protocol:      gatewayv1.HTTPProtocolType,
+				Hostname:      &wildcardHost,
+				AllowedRoutes: edgeAllowedRoutes,
+			},
+			gatewayv1.Listener{
+				Name:          "edge-apex",
+				Port:          80,
+				Protocol:      gatewayv1.HTTPProtocolType,
+				Hostname:      &apexHost,
+				AllowedRoutes: edgeAllowedRoutes.DeepCopy(),
+			},
+		)
+		// Same 2+N fan-out as the DNS-01 branch below, and the same
+		// 64-listener Gateway API cap applies: an operator whose child
+		// fan-out approaches it moves that subtree onto its own Gateway
+		// with tenant.spec.gateway=true.
+		for _, apex := range childApexes {
+			childWildcard := gatewayv1.Hostname("*." + apex)
+			listeners = append(listeners, gatewayv1.Listener{
+				Name:          edgeChildListenerName(apex),
+				Port:          80,
+				Protocol:      gatewayv1.HTTPProtocolType,
+				Hostname:      &childWildcard,
+				AllowedRoutes: edgeAllowedRoutes.DeepCopy(),
+			})
+		}
+	case gatewayv1alpha1.CertModeDNS01, gatewayv1alpha1.CertModeExistingSecret:
+		// Both modes serve the apex and every subdomain off a single
+		// wildcard cert. The only difference is the Secret name: DNS-01
+		// mints it; existingSecret references the operator-supplied one.
+		certName, err := wildcardListenerCertName(tgw)
+		if err != nil {
+			return nil, err
+		}
 		wildcardHost := gatewayv1.Hostname("*." + tgw.Spec.Apex)
 		apexHost := gatewayv1.Hostname(tgw.Spec.Apex)
 		listeners = append(listeners,
@@ -728,12 +1473,12 @@ func (r *Reconciler) renderGateway(tgw *gatewayv1alpha1.TenantGateway, dynHostna
 				Protocol: gatewayv1.HTTPSProtocolType,
 				Hostname: &wildcardHost,
 				TLS: &gatewayv1.ListenerTLSConfig{
-					Mode: ptrTLSMode(gatewayv1.TLSModeTerminate),
+					Mode: new(gatewayv1.TLSModeTerminate),
 					CertificateRefs: []gatewayv1.SecretObjectReference{
 						{Name: gatewayv1.ObjectName(certName)},
 					},
 				},
-				AllowedRoutes: httpsAllowedRoutes,
+				AllowedRoutes: httpsAllowedRoutes.DeepCopy(),
 			},
 			gatewayv1.Listener{
 				Name:     "https-apex",
@@ -741,12 +1486,12 @@ func (r *Reconciler) renderGateway(tgw *gatewayv1alpha1.TenantGateway, dynHostna
 				Protocol: gatewayv1.HTTPSProtocolType,
 				Hostname: &apexHost,
 				TLS: &gatewayv1.ListenerTLSConfig{
-					Mode: ptrTLSMode(gatewayv1.TLSModeTerminate),
+					Mode: new(gatewayv1.TLSModeTerminate),
 					CertificateRefs: []gatewayv1.SecretObjectReference{
 						{Name: gatewayv1.ObjectName(certName)},
 					},
 				},
-				AllowedRoutes: httpsAllowedRoutes,
+				AllowedRoutes: httpsAllowedRoutes.DeepCopy(),
 			},
 		)
 		// Per-child-apex wildcard listeners — every inheriting
@@ -769,7 +1514,7 @@ func (r *Reconciler) renderGateway(tgw *gatewayv1alpha1.TenantGateway, dynHostna
 				Protocol: gatewayv1.HTTPSProtocolType,
 				Hostname: &childWildcard,
 				TLS: &gatewayv1.ListenerTLSConfig{
-					Mode: ptrTLSMode(gatewayv1.TLSModeTerminate),
+					Mode: new(gatewayv1.TLSModeTerminate),
 					CertificateRefs: []gatewayv1.SecretObjectReference{
 						{Name: gatewayv1.ObjectName(certName)},
 					},
@@ -777,7 +1522,7 @@ func (r *Reconciler) renderGateway(tgw *gatewayv1alpha1.TenantGateway, dynHostna
 				AllowedRoutes: httpsAllowedRoutes.DeepCopy(),
 			})
 		}
-	} else {
+	default:
 		// HTTP-01 (default): per-app HTTPS listener per attached
 		// HTTPRoute / TLSRoute hostname. Names + cert refs are
 		// derived from the hostname's first label.
@@ -787,11 +1532,11 @@ func (r *Reconciler) renderGateway(tgw *gatewayv1alpha1.TenantGateway, dynHostna
 			certName := perListenerCertName(tgw, h)
 			listeners = append(listeners, gatewayv1.Listener{
 				Name:     gatewayv1.SectionName(listenerName),
-				Port:     443,
+				Port:     httpsListenerPort,
 				Protocol: gatewayv1.HTTPSProtocolType,
 				Hostname: &hostnameVal,
 				TLS: &gatewayv1.ListenerTLSConfig{
-					Mode: ptrTLSMode(gatewayv1.TLSModeTerminate),
+					Mode: new(gatewayv1.TLSModeTerminate),
 					CertificateRefs: []gatewayv1.SecretObjectReference{
 						{Name: gatewayv1.ObjectName(certName)},
 					},
@@ -803,35 +1548,99 @@ func (r *Reconciler) renderGateway(tgw *gatewayv1alpha1.TenantGateway, dynHostna
 
 	// TLS-passthrough listeners. One per service in
 	// Spec.TLSPassthroughServices, named "tls-<service>", hostname
-	// "<service>.<apex>", port 443, mode Passthrough. AllowedRoutes
-	// restrict the kinds to TLSRoute (HTTPRoute makes no sense on a
-	// Passthrough listener). The corresponding TLSRoute templates
-	// (cozystack-api, vm-exportproxy, cdi-uploadproxy) attach to
-	// these listeners by sectionName.
-	for _, svc := range tgw.Spec.TLSPassthroughServices {
+	// "<service>.<apex>", port 443, mode Passthrough. AllowedRoutes use
+	// the same port443Kinds set as the HTTPS-terminate listeners above so
+	// that Cilium does not collapse all port-443 listeners together
+	// (cilium#45559). In practice only TLSRoute attaches to a Passthrough
+	// listener, but listing HTTPRoute here is harmless — Gateway API
+	// rejects any HTTPRoute that references a Passthrough sectionName.
+	// NOTE: each tls-<svc> listener surfaces
+	// ResolvedRefs=False/InvalidRouteKinds on the raw Gateway object,
+	// because it lists a kind its own protocol does not support
+	// (cosmetic — Accepted, Programmed, traffic, and TenantGateway
+	// readiness are all unaffected). That condition is set by
+	// setListenerStatus, a different path from the route-side check
+	// cilium#45693 fixes, and that fix lands in v1.19.6 rather than
+	// waiting for 1.20. So the bump does not clear this one: it goes
+	// when the uniform-kinds workaround on port 443 goes, which is a
+	// separate cleanup.
+	// The corresponding TLSRoute templates (cozystack-api, vm-exportproxy,
+	// cdi-uploadproxy) attach to these listeners by sectionName.
+	for _, svc := range renderedPassthroughServices(tgw) {
 		host := gatewayv1.Hostname(svc + "." + tgw.Spec.Apex)
-		passthroughAllowed := *allowedRoutes
-		passthroughAllowed.Kinds = []gatewayv1.RouteGroupKind{
-			{
-				Group: ptrGroup(gatewayv1.GroupName),
-				Kind:  "TLSRoute",
-			},
-		}
+		passthroughAllowed := allowedRoutes.DeepCopy()
+		passthroughAllowed.Kinds = port443Kinds()
 		listeners = append(listeners, gatewayv1.Listener{
-			Name:     gatewayv1.SectionName("tls-" + svc),
+			Name:     gatewayv1.SectionName(passthroughListenerPrefix + svc),
 			Port:     443,
 			Protocol: gatewayv1.TLSProtocolType,
 			Hostname: &host,
 			TLS: &gatewayv1.ListenerTLSConfig{
-				Mode: ptrTLSMode(gatewayv1.TLSModePassthrough),
+				Mode: new(gatewayv1.TLSModePassthrough),
 			},
-			AllowedRoutes: &passthroughAllowed,
+			AllowedRoutes: passthroughAllowed,
 		})
 	}
 
-	className := tgw.Spec.GatewayClassName
-	if className == "" {
-		className = "cilium"
+	// Layer-4 TLS-passthrough listeners. One
+	// "tls-<name>" listener per entry in Spec.TLSPassthroughListeners,
+	// on the entry's native Port, mode Passthrough, matching the
+	// entry's per-engine SNI Hostname, rendered alongside the port-443
+	// terminate listeners. What may attach is left to the protocol
+	// rather than declared, for the reason on Kinds below. A dedicated
+	// (port, SNI) pair still yields exactly one Envoy filter chain that
+	// SNI-routes to the attaching TLSRoute's backend. No engine is wired here: the
+	// TLSRoute, certificate, and CA plumbing land in later phases.
+	for _, pl := range tgw.Spec.TLSPassthroughListeners {
+		host := gatewayv1.Hostname(pl.Hostname)
+		// Own namespace only, by the label kube-apiserver writes, and
+		// not the gateway label the :443 listeners select on. That
+		// label is stamped on every inheriting child tenant namespace,
+		// so reusing it would put a native database port within reach
+		// of the whole subtree. Narrowing costs nothing while no chart
+		// value exposes this field; once something depends on the wide
+		// form, narrowing becomes a behaviour change instead.
+		// Kinds is left unset because the protocol already says
+		// TLSRoute. Before v1.19.6, CheckGatewayRouteKindAllowed applied
+		// a listener's declared kinds to every route on the Gateway, so
+		// declaring TLSRoute here would have rejected every HTTPRoute.
+		// From that release it judges a route against the listener its
+		// sectionName or port names alone.
+		// What an unset Kinds opens is bounded by the implementation
+		// rather than by the spec: Gateway API leaves the
+		// protocol-to-kind mapping to it, and the conventional table
+		// pairs TLS with TCPRoute as well as TLSRoute. Cilium maps the
+		// TLS protocol to TLSRoute alone (getSupportedRouteKinds in
+		// operator/pkg/gateway-api/helpers.go, v1.20.2), so TLSRoute is
+		// what a TLS listener admits, and the listener pins
+		// kubernetes.io/metadata.name to the publishing tenant
+		// regardless.
+		passthroughAllowed := allowedRoutesFromValues([]string{tgw.Namespace})
+		listeners = append(listeners, gatewayv1.Listener{
+			Name:     gatewayv1.SectionName(passthroughListenerPrefix + pl.Name),
+			Port:     gatewayv1.PortNumber(pl.Port),
+			Protocol: gatewayv1.TLSProtocolType,
+			Hostname: &host,
+			TLS: &gatewayv1.ListenerTLSConfig{
+				Mode: new(gatewayv1.TLSModePassthrough),
+			},
+			AllowedRoutes: passthroughAllowed,
+		})
+	}
+
+	className := gatewayClassName(tgw)
+
+	// Gateway API caps spec.listeners at 64 and rejects the object
+	// wholesale past that — every app's HTTPS listener included. No
+	// single field can prevent it, because the total is the sum of
+	// published hostnames, passthrough services and passthrough
+	// listeners, and each is bounded on its own. Catch the sum here so
+	// the tenant gets a named budget on TenantGateway status instead of
+	// an admission error on a Gateway they do not manage.
+	if len(listeners) > maxGatewayListeners {
+		return nil, fmt.Errorf(
+			"gateway would have %d listeners, over the Gateway API cap of %d: reduce published hostnames, tlsPassthroughServices, or tlsPassthroughListeners (dns01 cert mode collapses per-hostname listeners into one wildcard listener)",
+			len(listeners), maxGatewayListeners)
 	}
 
 	gw := &gatewayv1.Gateway{
@@ -854,13 +1663,6 @@ func (r *Reconciler) renderGateway(tgw *gatewayv1alpha1.TenantGateway, dynHostna
 	return gw, nil
 }
 
-func ptrTLSMode(m gatewayv1.TLSModeType) *gatewayv1.TLSModeType {
-	return &m
-}
-
-// SetupWithManager wires the Reconciler into the controller manager
-// with For (TenantGateway as primary), Owns (Gateway and Certificate
-// as owned children), and Watches against HTTPRoute and TLSRoute so
 // collectInheritingChildApexes returns the deduplicated, sorted
 // list of apex hostnames from tenant namespaces that inherit this
 // Gateway's publishing layer. A namespace counts as inheriting when
@@ -993,8 +1795,13 @@ func (r *Reconciler) stripNamespaceGatewayLabel(ctx context.Context, name string
 	return r.Patch(ctx, ns, client.MergeFrom(before))
 }
 
-// route additions in attached namespaces re-trigger reconciliation
-// of the parent TenantGateway.
+// SetupWithManager wires the Reconciler into the controller manager
+// with For (TenantGateway as primary), Owns (Gateway, HTTPRoute,
+// Certificate and Issuer as owned children), Watches against HTTPRoute
+// and TLSRoute so route additions in attached namespaces re-trigger
+// reconciliation of the parent TenantGateway, and a Watch against
+// GatewayClass so a class that changes its supportedFeatures re-judges
+// the TenantGateways on it.
 func (r *Reconciler) SetupWithManager(mgr ctrl.Manager) error {
 	return ctrl.NewControllerManagedBy(mgr).
 		Named("tenantgateway-controller").
@@ -1011,5 +1818,9 @@ func (r *Reconciler) SetupWithManager(mgr ctrl.Manager) error {
 			&gatewayv1alpha2.TLSRoute{},
 			r.routeToTenantGateway(),
 		).
+		Watches(
+			&gatewayv1.GatewayClass{},
+			handler.EnqueueRequestsFromMapFunc(r.mapGatewayClassToTenantGateways),
+		).
 		Complete(r)
 }
diff --git a/internal/controller/tenantgateway/reconciler_test.go b/internal/controller/tenantgateway/reconciler_test.go
index c070d7e6d1..de51d74b20 100644
--- a/internal/controller/tenantgateway/reconciler_test.go
+++ b/internal/controller/tenantgateway/reconciler_test.go
@@ -18,20 +18,29 @@ package tenantgateway
 
 import (
 	"context"
+	"errors"
+	"reflect"
+	"slices"
+	"sort"
 	"strings"
 	"testing"
 
 	cmv1 "github.com/cert-manager/cert-manager/pkg/apis/certmanager/v1"
 	corev1 "k8s.io/api/core/v1"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	apimeta "k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/types"
 	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
+	"sigs.k8s.io/controller-runtime/pkg/client/interceptor"
 	gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
 	gatewayv1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2"
+	gatewayv1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1"
 
 	gatewayv1alpha1 "github.com/cozystack/cozystack/api/gateway/v1alpha1"
 )
@@ -55,6 +64,9 @@ func newScheme(t *testing.T) *runtime.Scheme {
 	if err := gatewayv1alpha2.Install(s); err != nil {
 		t.Fatalf("gateway v1alpha2 scheme: %v", err)
 	}
+	if err := gatewayv1beta1.Install(s); err != nil {
+		t.Fatalf("gateway v1beta1 scheme: %v", err)
+	}
 	if err := cmv1.AddToScheme(s); err != nil {
 		t.Fatalf("cert-manager scheme: %v", err)
 	}
@@ -157,7 +169,7 @@ func TestReconcile_IsIdempotent(t *testing.T) {
 		Build()
 
 	r := &Reconciler{Client: c, Scheme: s}
-	for i := 0; i < 2; i++ {
+	for i := range 2 {
 		if _, err := r.Reconcile(context.TODO(), ctrl.Request{
 			NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"},
 		}); err != nil {
@@ -204,6 +216,117 @@ func TestReconcile_IsIdempotent(t *testing.T) {
 	}
 }
 
+// TestReconcile_SecondPassLeavesCertManagerObjectsUntouched extends
+// the no-op contract to every cert-manager object the controller
+// owns, in both cert modes: the Issuer, the DNS-01 wildcard
+// Certificate and each HTTP-01 per-listener Certificate. The update
+// gate compares the stored spec with the freshly rendered one, so a
+// spec field the API round trip fills in differently would re-issue
+// certificates on every pass.
+func TestReconcile_SecondPassLeavesCertManagerObjectsUntouched(t *testing.T) {
+	cases := []struct {
+		name      string
+		spec      gatewayv1alpha1.TenantGatewaySpec
+		wantCerts []string
+	}{
+		{
+			name: "dns01",
+			spec: gatewayv1alpha1.TenantGatewaySpec{
+				Apex:             "foo.example.com",
+				CertMode:         gatewayv1alpha1.CertModeDNS01,
+				GatewayClassName: "cilium",
+				DNS01: &gatewayv1alpha1.DNS01Config{
+					Provider: "cloudflare",
+					Cloudflare: &gatewayv1alpha1.CloudflareDNS01{
+						APITokenSecretRef: corev1.SecretKeySelector{
+							LocalObjectReference: corev1.LocalObjectReference{Name: "cf-token"},
+							Key:                  "api-token",
+						},
+					},
+				},
+			},
+			wantCerts: []string{"*.foo.example.com"},
+		},
+		{
+			name: "http01",
+			spec: gatewayv1alpha1.TenantGatewaySpec{
+				Apex:               "foo.example.com",
+				CertMode:           gatewayv1alpha1.CertModeHTTP01,
+				GatewayClassName:   "cilium",
+				AttachedNamespaces: []string{"cozy-harbor"},
+			},
+			wantCerts: []string{"harbor.foo.example.com", "registry.foo.example.com"},
+		},
+	}
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			s := newScheme(t)
+			tgw := &gatewayv1alpha1.TenantGateway{
+				ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
+				Spec:       tc.spec,
+			}
+			c := fake.NewClientBuilder().
+				WithScheme(s).
+				WithObjects(
+					tgw,
+					httpRouteAttached("harbor", "cozy-harbor", "harbor.foo.example.com"),
+					httpRouteAttached("registry", "cozy-harbor", "registry.foo.example.com"),
+				).
+				WithStatusSubresource(tgw, &gatewayv1.Gateway{}, &gatewayv1.HTTPRoute{}).
+				Build()
+			r := &Reconciler{Client: c, Scheme: s}
+			req := ctrl.Request{NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"}}
+
+			snapshot := func() map[string]string {
+				t.Helper()
+				rvs := map[string]string{}
+				iss := &cmv1.Issuer{}
+				if err := c.Get(context.TODO(), types.NamespacedName{Name: "cozystack-gateway", Namespace: "tenant-foo"}, iss); err != nil {
+					t.Fatalf("get Issuer: %v", err)
+				}
+				rvs["Issuer/"+iss.Name] = iss.ResourceVersion
+				certs := &cmv1.CertificateList{}
+				if err := c.List(context.TODO(), certs, client.InNamespace("tenant-foo")); err != nil {
+					t.Fatalf("list Certificates: %v", err)
+				}
+				for _, cert := range certs.Items {
+					rvs["Certificate/"+cert.Name] = cert.ResourceVersion
+				}
+				return rvs
+			}
+
+			if _, err := r.Reconcile(context.TODO(), req); err != nil {
+				t.Fatalf("first reconcile: %v", err)
+			}
+			certs := &cmv1.CertificateList{}
+			if err := c.List(context.TODO(), certs, client.InNamespace("tenant-foo")); err != nil {
+				t.Fatalf("list Certificates: %v", err)
+			}
+			for _, want := range tc.wantCerts {
+				found := false
+				for _, cert := range certs.Items {
+					if containsString(cert.Spec.DNSNames, want) {
+						found = true
+						break
+					}
+				}
+				if !found {
+					t.Fatalf("no Certificate covers %q after first reconcile, got %d certs", want, len(certs.Items))
+				}
+			}
+
+			before := snapshot()
+			if _, err := r.Reconcile(context.TODO(), req); err != nil {
+				t.Fatalf("second reconcile: %v", err)
+			}
+			after := snapshot()
+			if !reflect.DeepEqual(before, after) {
+				t.Errorf("ResourceVersions moved on no-op reconcile:\nbefore=%v\nafter=%v", before, after)
+			}
+		})
+	}
+}
+
 // TestReconcile_HTTPListenerExcludesAppNamespaces pins the
 // security contract: the HTTP listener (port 80) accepts routes
 // only from the tenant namespace (controller's redirect HTTPRoute)
@@ -274,12 +397,7 @@ func TestReconcile_HTTPListenerExcludesAppNamespaces(t *testing.T) {
 }
 
 func containsString(haystack []string, needle string) bool {
-	for _, s := range haystack {
-		if s == needle {
-			return true
-		}
-	}
-	return false
+	return slices.Contains(haystack, needle)
 }
 
 // TestReconcile_LabelsAttachedNamespaces pins the controller-side
@@ -492,7 +610,7 @@ func TestReconcile_HTTPSListenerUsesGatewayLabelSelector(t *testing.T) {
 	c := fake.NewClientBuilder().
 		WithScheme(s).
 		WithObjects(tgw, route).
-		WithStatusSubresource(tgw).
+		WithStatusSubresource(tgw, &gatewayv1.HTTPRoute{}).
 		Build()
 
 	r := &Reconciler{Client: c, Scheme: s}
@@ -553,7 +671,7 @@ func TestReconcile_CertModeTransitionHTTP01ToDNS01CleansPerListenerCerts(t *test
 		},
 	}
 	route := httpRouteAttached("harbor", "cozy-harbor", "harbor.foo.example.com")
-	c := fake.NewClientBuilder().WithScheme(s).WithObjects(tgw, route).WithStatusSubresource(tgw, &gatewayv1.Gateway{}).Build()
+	c := fake.NewClientBuilder().WithScheme(s).WithObjects(tgw, route).WithStatusSubresource(tgw, &gatewayv1.Gateway{}, &gatewayv1.HTTPRoute{}).Build()
 	r := &Reconciler{Client: c, Scheme: s}
 
 	// Phase 1: HTTP-01 reconcile creates a per-listener cert.
@@ -693,7 +811,7 @@ func TestReconcile_RouteFromUnwhitelistedNamespaceIgnored(t *testing.T) {
 	c := fake.NewClientBuilder().
 		WithScheme(s).
 		WithObjects(tgw, allowed, stray).
-		WithStatusSubresource(tgw, &gatewayv1.Gateway{}).
+		WithStatusSubresource(tgw, &gatewayv1.Gateway{}, &gatewayv1.HTTPRoute{}).
 		Build()
 
 	r := &Reconciler{Client: c, Scheme: s}
@@ -788,12 +906,30 @@ func TestReconcile_RendersHTTPToHTTPSRedirectRoute(t *testing.T) {
 	}
 }
 
-// TestReconcile_GatewayUpdatePreservesForeignLabels pins the
-// label-merge contract: a Gateway carrying labels written by other
-// actors (Cilium operator, kubectl label, future controllers) keeps
-// those labels across reconciliation. Wholesale replacement would
-// drop them — Gateway is shared infra, not an operator-only field.
-func TestReconcile_GatewayUpdatePreservesForeignLabels(t *testing.T) {
+// TestReconcile_RedirectRouteDeclaresApexHostnames pins the redirect
+// route's hostnames to the tenant apex plus its wildcard. Two
+// independent reasons, and the first one is why this test must never be
+// relaxed into "hostnames may be empty":
+//
+// The route lands in a tenant-* namespace, where
+// cozystack-route-hostname-policy requires spec.hostnames to be present
+// and non-empty and to stay inside the namespace apex. A hostname-less
+// redirect is denied at admission, reconcileHTTPToHTTPSRedirect returns
+// that error, and because it runs before the status update the
+// TenantGateway never reaches Ready — so dropping these hostnames does
+// not merely widen a match, it stops reconciliation and takes the
+// plaintext protection with it.
+//
+// Second, naming the apex is what makes the redirect's coverage
+// explicit. Both entries are needed and neither is redundant: under
+// Gateway API a wildcard hostname is a suffix match that spans any
+// number of labels, so "*.foo.example.com" covers "a.foo.example.com"
+// and "a.b.foo.example.com" alike, but it does NOT cover the bare
+// "foo.example.com" — that is what the first entry is for. (The
+// HTTPRoute CRD puts it as: a match for `*.example.com` matches both
+// `test.example.com` and `foo.test.example.com`, but not
+// `example.com`.) Do not "simplify" this to the wildcard alone.
+func TestReconcile_RedirectRouteDeclaresApexHostnames(t *testing.T) {
 	s := newScheme(t)
 	tgw := &gatewayv1alpha1.TenantGateway{
 		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
@@ -804,66 +940,161 @@ func TestReconcile_GatewayUpdatePreservesForeignLabels(t *testing.T) {
 		},
 	}
 	c := fake.NewClientBuilder().WithScheme(s).WithObjects(tgw).WithStatusSubresource(tgw, &gatewayv1.Gateway{}).Build()
-	r := &Reconciler{Client: c, Scheme: s}
 
-	// First reconcile creates the Gateway.
+	r := &Reconciler{Client: c, Scheme: s}
 	if _, err := r.Reconcile(context.TODO(), ctrl.Request{
 		NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"},
 	}); err != nil {
-		t.Fatalf("first reconcile: %v", err)
+		t.Fatalf("unexpected error: %v", err)
 	}
 
-	// Simulate another actor stamping a foreign label.
-	gw := &gatewayv1.Gateway{}
-	if err := c.Get(context.TODO(), types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"}, gw); err != nil {
-		t.Fatalf("get Gateway: %v", err)
+	got := &gatewayv1.HTTPRoute{}
+	if err := c.Get(context.TODO(), types.NamespacedName{Name: "cozystack-http-redirect", Namespace: "tenant-foo"}, got); err != nil {
+		t.Fatalf("expected redirect HTTPRoute cozystack-http-redirect: %v", err)
 	}
-	if gw.Labels == nil {
-		gw.Labels = map[string]string{}
+	want := []gatewayv1.Hostname{"foo.example.com", "*.foo.example.com"}
+	if len(got.Spec.Hostnames) != len(want) {
+		t.Fatalf("redirect hostnames=%v, want %v — an empty or short list is denied by cozystack-route-hostname-policy in a tenant-* namespace", got.Spec.Hostnames, want)
 	}
-	gw.Labels["example.com/owner"] = "someone-else"
-	if err := c.Update(context.TODO(), gw); err != nil {
-		t.Fatalf("foreign label update: %v", err)
+	for i := range want {
+		if got.Spec.Hostnames[i] != want[i] {
+			t.Errorf("redirect hostnames[%d]=%q, want %q", i, got.Spec.Hostnames[i], want[i])
+		}
 	}
+}
 
-	// Second reconcile must merge, not clobber.
-	if _, err := r.Reconcile(context.TODO(), ctrl.Request{
-		NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"},
-	}); err != nil {
-		t.Fatalf("second reconcile: %v", err)
+// TestReconcile_RedirectRouteIsNotAHostnameClaim pins the other half of
+// giving the redirect route hostnames: collectHostnameClaims must skip
+// it. The two changes are inseparable — hostnames on a route that
+// parentRefs this Gateway would otherwise read as an app publishing
+// them, and in HTTP-01 mode each claim provisions an HTTPS listener plus
+// a per-listener Certificate. The "*.<apex>" entry would then ask
+// listeners and certificates for them, which fails.
+//
+// The reconcile runs with the controller's redirect as the ONLY route, so
+// anything provisioned here came from it. The positive assertions matter
+// as much as the negative ones: without them this test would pass against
+// a reconcile that did nothing at all.
+//
+// It must reconcile TWICE, and that is the whole reason this test is
+// shaped the way it is. runReconcileSteps calls collectHostnameClaims
+// before it creates the redirect route, so during the first pass
+// the redirect route does not exist yet and cannot be counted as a claim
+// no matter what the filter does. A single-reconcile version of this test
+// passes with the filter deleted — it looks like a guard and guards
+// nothing. Keep both passes.
+func TestReconcile_RedirectRouteIsNotAHostnameClaim(t *testing.T) {
+	s := newScheme(t)
+	tgw := &gatewayv1alpha1.TenantGateway{
+		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
+		Spec: gatewayv1alpha1.TenantGatewaySpec{
+			Apex:             "foo.example.com",
+			CertMode:         gatewayv1alpha1.CertModeHTTP01,
+			GatewayClassName: "cilium",
+		},
 	}
+	c := fake.NewClientBuilder().WithScheme(s).WithObjects(tgw).WithStatusSubresource(tgw, &gatewayv1.Gateway{}).Build()
 
-	got := &gatewayv1.Gateway{}
-	if err := c.Get(context.TODO(), types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"}, got); err != nil {
-		t.Fatalf("get Gateway: %v", err)
+	r := &Reconciler{Client: c, Scheme: s}
+	// First pass creates the redirect route; second pass is the one that
+	// sees it in the cluster-wide List inside collectHostnameClaims.
+	for pass := 1; pass <= 2; pass++ {
+		if _, err := r.Reconcile(context.TODO(), ctrl.Request{
+			NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"},
+		}); err != nil {
+			t.Fatalf("unexpected error on reconcile pass %d: %v", pass, err)
+		}
 	}
-	if got.Labels["example.com/owner"] != "someone-else" {
-		t.Errorf("foreign label dropped on update; labels=%v", got.Labels)
+
+	// Positive anchor: the redirect route really was rendered, with the
+	// hostnames whose exclusion is under test.
+	redirect := &gatewayv1.HTTPRoute{}
+	if err := c.Get(context.TODO(), types.NamespacedName{Name: "cozystack-http-redirect", Namespace: "tenant-foo"}, redirect); err != nil {
+		t.Fatalf("expected redirect HTTPRoute: %v", err)
 	}
-	if got.Labels["cozystack.io/managed-by"] != "cozystack-controller" {
-		t.Errorf("controller label missing; labels=%v", got.Labels)
+	if len(redirect.Spec.Hostnames) == 0 {
+		t.Fatal("redirect route has no hostnames; this test cannot prove they are excluded from claims")
+	}
+
+	gw := &gatewayv1.Gateway{}
+	if err := c.Get(context.TODO(), types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"}, gw); err != nil {
+		t.Fatalf("expected Gateway: %v", err)
+	}
+	// Positive anchor: the port-80 listener the redirect attaches to is
+	// present, so the Gateway really was reconciled.
+	var sawHTTP bool
+	for _, l := range gw.Spec.Listeners {
+		if l.Name == "http" {
+			sawHTTP = true
+			continue
+		}
+		host := ""
+		if l.Hostname != nil {
+			host = string(*l.Hostname)
+		}
+		t.Errorf("unexpected listener %q (hostname %q) provisioned from the redirect route's hostnames", l.Name, host)
+	}
+	if !sawHTTP {
+		t.Error("no http listener on the Gateway; the reconcile did not get far enough for this test to mean anything")
+	}
+
+	certs := &cmv1.CertificateList{}
+	if err := c.List(context.TODO(), certs); err != nil {
+		t.Fatalf("list Certificates: %v", err)
+	}
+	for i := range certs.Items {
+		t.Errorf("unexpected Certificate %q for %v: the redirect route's hostnames reached the claim set", certs.Items[i].Name, certs.Items[i].Spec.DNSNames)
 	}
 }
 
-// TestReconcile_OwnerReferenceOnGateway pins the lifecycle contract:
-// the rendered Gateway must carry the TenantGateway as its
-// controller-owner so cascade-delete works (deleting the TenantGateway
-// cleans up the Gateway).
-func TestReconcile_OwnerReferenceOnGateway(t *testing.T) {
+// TestReconcile_ForgedControllerLabelsStillClaimHostnames bounds the
+// exclusion above to the one object it is for.
+//
+// The claim set feeds more than certificate provisioning: it also drives
+// resolveHostnameOwners and updateRouteStatuses, which is where a route
+// losing a cross-namespace hostname race gets Accepted=False with
+// Reason=HostnameConflict. So skipping a route is not a harmless
+// self-exclusion — a route that escapes the claim set also escapes being
+// marked a loser. Keying the exclusion on labels alone would let any
+// route wearing two publicly-readable labels opt out of that, so it is
+// keyed on the namespace and name the controller renders instead, which
+// identify exactly one object.
+//
+// This route carries both controller labels and attaches to the Gateway,
+// and must still be counted: an HTTPS listener for its hostname proves
+// it reached the claim set.
+func TestReconcile_ForgedControllerLabelsStillClaimHostnames(t *testing.T) {
 	s := newScheme(t)
 	tgw := &gatewayv1alpha1.TenantGateway{
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      "cozystack",
-			Namespace: "tenant-foo",
-			UID:       "tgw-uid",
-		},
+		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
 		Spec: gatewayv1alpha1.TenantGatewaySpec{
 			Apex:             "foo.example.com",
 			CertMode:         gatewayv1alpha1.CertModeHTTP01,
 			GatewayClassName: "cilium",
 		},
 	}
-	c := fake.NewClientBuilder().WithScheme(s).WithObjects(tgw).WithStatusSubresource(tgw).Build()
+	forged := &gatewayv1.HTTPRoute{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "not-the-redirect",
+			Namespace: "tenant-foo",
+			Labels: map[string]string{
+				cozystackManagedByLabel:   cozystackManagedByValue,
+				cozystackTenantGatewayKey: "cozystack",
+			},
+		},
+		Spec: gatewayv1.HTTPRouteSpec{
+			Hostnames: []gatewayv1.Hostname{"app.foo.example.com"},
+			CommonRouteSpec: gatewayv1.CommonRouteSpec{
+				ParentRefs: []gatewayv1.ParentReference{{
+					Group: ptrGroup(gatewayv1.GroupName),
+					Kind:  ptrKind("Gateway"),
+					Name:  gatewayv1.ObjectName("cozystack"),
+				}},
+			},
+		},
+	}
+	c := fake.NewClientBuilder().WithScheme(s).WithObjects(tgw, forged).
+		WithStatusSubresource(tgw, &gatewayv1.Gateway{}, &gatewayv1.HTTPRoute{}).Build()
 
 	r := &Reconciler{Client: c, Scheme: s}
 	if _, err := r.Reconcile(context.TODO(), ctrl.Request{
@@ -872,90 +1103,132 @@ func TestReconcile_OwnerReferenceOnGateway(t *testing.T) {
 		t.Fatalf("unexpected error: %v", err)
 	}
 
-	got := &gatewayv1.Gateway{}
-	if err := c.Get(context.TODO(), types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"}, got); err != nil {
-		t.Fatalf("get Gateway: %v", err)
+	gw := &gatewayv1.Gateway{}
+	if err := c.Get(context.TODO(), types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"}, gw); err != nil {
+		t.Fatalf("expected Gateway: %v", err)
 	}
-	var owned bool
-	for _, ref := range got.OwnerReferences {
-		if ref.UID == "tgw-uid" && ref.Controller != nil && *ref.Controller {
-			owned = true
-			break
+	for _, l := range gw.Spec.Listeners {
+		if l.Hostname != nil && string(*l.Hostname) == "app.foo.example.com" {
+			return
 		}
 	}
-	if !owned {
-		t.Errorf("expected controller OwnerReference to TenantGateway uid=tgw-uid, got %+v", got.OwnerReferences)
-	}
+	t.Errorf("no listener for app.foo.example.com: a route wearing the controller's labels was excluded from hostname claims, so it also escapes HostnameConflict marking; listeners=%+v", gw.Spec.Listeners)
 }
 
-// TestReconcile_DNS01ModeRendersWildcardListener pins the opt-in DNS-01
-// branch: when CertMode=dns01 the rendered Gateway carries the
-// wildcard `https` listener for `*.<apex>` plus the `https-apex`
-// listener for the bare apex domain.
-func TestReconcile_DNS01ModeRendersWildcardListener(t *testing.T) {
+// TestReconcile_ForgedRedirectNameStillClaimsHostnames closes the other
+// half of the exclusion's identity check.
+//
+// Namespace and name alone name a slot, not an object. A route planted
+// under the reserved <tgw>-http-redirect name that this controller does
+// not own would be skipped by the exclusion, and skipping happens in
+// collectHostnameClaims, which runs before updateRouteStatuses; the
+// takeover refusal in reconcileHTTPToHTTPSRedirect only fires after
+// both. So for every reconcile the planted route would sit outside
+// conflict resolution and never be marked Accepted=False on a lost
+// hostname race, while the Gateway keeps whatever listeners an earlier
+// successful pass already created for it.
+//
+// Requiring the controller OwnerReference as well cannot fail open on
+// the real route: renderHTTPRedirect sets it through
+// SetControllerReference before the route is ever created.
+func TestReconcile_ForgedRedirectNameStillClaimsHostnames(t *testing.T) {
 	s := newScheme(t)
 	tgw := &gatewayv1alpha1.TenantGateway{
 		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
 		Spec: gatewayv1alpha1.TenantGatewaySpec{
 			Apex:             "foo.example.com",
-			CertMode:         gatewayv1alpha1.CertModeDNS01,
+			CertMode:         gatewayv1alpha1.CertModeHTTP01,
 			GatewayClassName: "cilium",
-			DNS01: &gatewayv1alpha1.DNS01Config{
-				Provider: "cloudflare",
-				Cloudflare: &gatewayv1alpha1.CloudflareDNS01{
-					APITokenSecretRef: corev1.SecretKeySelector{
-						LocalObjectReference: corev1.LocalObjectReference{Name: "cf-token"},
-						Key:                  "api-token",
-					},
-				},
+		},
+	}
+	// Same namespace and name as the controller's route, no ownerRef.
+	forged := &gatewayv1.HTTPRoute{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "cozystack-http-redirect",
+			Namespace: "tenant-foo",
+		},
+		Spec: gatewayv1.HTTPRouteSpec{
+			Hostnames: []gatewayv1.Hostname{"squat.foo.example.com"},
+			CommonRouteSpec: gatewayv1.CommonRouteSpec{
+				ParentRefs: []gatewayv1.ParentReference{{
+					Group: ptrGroup(gatewayv1.GroupName),
+					Kind:  ptrKind("Gateway"),
+					Name:  gatewayv1.ObjectName("cozystack"),
+				}},
 			},
 		},
 	}
-	c := fake.NewClientBuilder().WithScheme(s).WithObjects(tgw).WithStatusSubresource(tgw).Build()
+	c := fake.NewClientBuilder().WithScheme(s).WithObjects(tgw, forged).
+		WithStatusSubresource(tgw, &gatewayv1.Gateway{}, &gatewayv1.HTTPRoute{}).Build()
 
 	r := &Reconciler{Client: c, Scheme: s}
-	if _, err := r.Reconcile(context.TODO(), ctrl.Request{
+	// The reconcile is expected to fail on the takeover refusal. That is
+	// the loud half of the protection and it is not what this test is
+	// about; the point is what happened before it, while claims were
+	// being collected.
+	_, _ = r.Reconcile(context.TODO(), ctrl.Request{
 		NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"},
-	}); err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
+	})
 
-	got := &gatewayv1.Gateway{}
-	if err := c.Get(context.TODO(), types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"}, got); err != nil {
-		t.Fatalf("get Gateway: %v", err)
+	gw := &gatewayv1.Gateway{}
+	if err := c.Get(context.TODO(), types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"}, gw); err != nil {
+		t.Fatalf("expected Gateway: %v", err)
 	}
-	var sawWildcard, sawApex bool
-	for _, l := range got.Spec.Listeners {
-		if l.Hostname != nil && string(*l.Hostname) == "*.foo.example.com" && l.Protocol == gatewayv1.HTTPSProtocolType {
-			sawWildcard = true
-		}
-		if l.Hostname != nil && string(*l.Hostname) == "foo.example.com" && l.Protocol == gatewayv1.HTTPSProtocolType {
-			sawApex = true
+	for _, l := range gw.Spec.Listeners {
+		if l.Hostname != nil && string(*l.Hostname) == "squat.foo.example.com" {
+			return
 		}
 	}
-	if !sawWildcard {
-		t.Errorf("expected wildcard *.foo.example.com HTTPS listener in DNS-01 mode, got %+v", got.Spec.Listeners)
-	}
-	if !sawApex {
-		t.Errorf("expected apex foo.example.com HTTPS listener in DNS-01 mode, got %+v", got.Spec.Listeners)
-	}
+	t.Errorf("no listener for squat.foo.example.com: a route occupying the reserved redirect name but not owned by this TenantGateway was excluded from hostname claims, so it also escapes HostnameConflict marking; listeners=%+v", gw.Spec.Listeners)
 }
 
-// TestReconcile_HTTP01ModeNoWildcardListener pins the default branch:
-// in HTTP-01 mode the Gateway must NOT have a wildcard `*.<apex>`
-// listener (because HTTP-01 cannot issue wildcard certs). Per-app
-// listeners are added later by route-driven reconciliation.
-func TestReconcile_HTTP01ModeNoWildcardListener(t *testing.T) {
+// TestReconcile_OtherControllerOwnedRouteStillClaimsHostnames pins the
+// name half of the exclusion, which ownership alone does not cover.
+//
+// Today the redirect is the only route this controller creates, so
+// dropping the name check would not change any behaviour and no other
+// test notices. That equivalence is a property of the current code, not
+// of the check: the moment a second controller-owned route appears, an
+// ownership-only test would silently exclude it from hostname claims
+// too, which is the bug this exclusion is narrow to avoid. The route
+// here stands in for that future one.
+func TestReconcile_OtherControllerOwnedRouteStillClaimsHostnames(t *testing.T) {
 	s := newScheme(t)
 	tgw := &gatewayv1alpha1.TenantGateway{
-		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
+		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo", UID: "tgw-uid-1"},
 		Spec: gatewayv1alpha1.TenantGatewaySpec{
 			Apex:             "foo.example.com",
 			CertMode:         gatewayv1alpha1.CertModeHTTP01,
 			GatewayClassName: "cilium",
 		},
 	}
-	c := fake.NewClientBuilder().WithScheme(s).WithObjects(tgw).WithStatusSubresource(tgw).Build()
+	controller := true
+	// Owned by this TenantGateway, in its namespace, but not the redirect.
+	other := &gatewayv1.HTTPRoute{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "cozystack-some-other-route",
+			Namespace: "tenant-foo",
+			OwnerReferences: []metav1.OwnerReference{{
+				APIVersion: gatewayv1alpha1.GroupVersion.String(),
+				Kind:       "TenantGateway",
+				Name:       "cozystack",
+				UID:        "tgw-uid-1",
+				Controller: &controller,
+			}},
+		},
+		Spec: gatewayv1.HTTPRouteSpec{
+			Hostnames: []gatewayv1.Hostname{"other.foo.example.com"},
+			CommonRouteSpec: gatewayv1.CommonRouteSpec{
+				ParentRefs: []gatewayv1.ParentReference{{
+					Group: ptrGroup(gatewayv1.GroupName),
+					Kind:  ptrKind("Gateway"),
+					Name:  gatewayv1.ObjectName("cozystack"),
+				}},
+			},
+		},
+	}
+	c := fake.NewClientBuilder().WithScheme(s).WithObjects(tgw, other).
+		WithStatusSubresource(tgw, &gatewayv1.Gateway{}, &gatewayv1.HTTPRoute{}).Build()
 
 	r := &Reconciler{Client: c, Scheme: s}
 	if _, err := r.Reconcile(context.TODO(), ctrl.Request{
@@ -964,31 +1237,296 @@ func TestReconcile_HTTP01ModeNoWildcardListener(t *testing.T) {
 		t.Fatalf("unexpected error: %v", err)
 	}
 
-	got := &gatewayv1.Gateway{}
-	if err := c.Get(context.TODO(), types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"}, got); err != nil {
-		t.Fatalf("get Gateway: %v", err)
+	gw := &gatewayv1.Gateway{}
+	if err := c.Get(context.TODO(), types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"}, gw); err != nil {
+		t.Fatalf("expected Gateway: %v", err)
 	}
-	for _, l := range got.Spec.Listeners {
-		if l.Hostname != nil && string(*l.Hostname) == "*.foo.example.com" {
-			t.Errorf("HTTP-01 mode must not render wildcard listener, found %+v", l)
+	for _, l := range gw.Spec.Listeners {
+		if l.Hostname != nil && string(*l.Hostname) == "other.foo.example.com" {
+			return
 		}
 	}
+	t.Errorf("no listener for other.foo.example.com: a controller-owned route that is not the redirect was excluded from hostname claims; listeners=%+v", gw.Spec.Listeners)
 }
 
-// TestReconcile_AlwaysCreatesIssuer pins the cert-manager
-// infrastructure: every TenantGateway materialises a per-tenant
-// ACME Issuer in its namespace, regardless of certMode. The Issuer
-// is named "<tgw-name>-gateway".
-func TestReconcile_AlwaysCreatesIssuer(t *testing.T) {
-	for _, mode := range []gatewayv1alpha1.CertMode{
-		gatewayv1alpha1.CertModeHTTP01,
-		gatewayv1alpha1.CertModeDNS01,
-	} {
-		t.Run(string(mode), func(t *testing.T) {
-			s := newScheme(t)
-			tgw := &gatewayv1alpha1.TenantGateway{
-				ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
-				Spec: gatewayv1alpha1.TenantGatewaySpec{
+// TestReconcile_EmptyApexFailsWithNamedError covers the failure mode
+// that naming the apex on the redirect route introduced.
+//
+// Spec.Apex became load-bearing for admission the moment the redirect
+// started deriving hostnames from it. An empty apex renders
+// hostnames ["", "*."], and both fail the HTTPRoute CRD's minLength and
+// pattern, so the create is rejected and the reconcile dies on an
+// apiserver validation error that says nothing about which field is at
+// fault. Under HTTP-01 an empty apex reached Ready before the redirect
+// carried hostnames, so that much is a narrowing this branch closes.
+// DNS-01 and existingSecret never reached Ready on an empty apex, at
+// merge base or now: renderGateway builds its listener hostnames off
+// the same field and fails ahead of the redirect either way.
+//
+// MinLength=1 on the field is the real guard and it stops this at
+// admission. This check is the second layer, for the window where the
+// CRD in the cluster is older than the controller binary: the two are
+// rolled out separately, so the controller cannot assume the field
+// validation it needs is already present. It must fail on its own terms
+// and name the field.
+//
+// Which layer fires first depends on the cert mode; renderHTTPRedirect
+// states the condition at the guard itself. This case stays green
+// either way because the fake client does not validate against the CRD
+// schema, so read it as pinning the error text, not as evidence of
+// which layer fires.
+func TestReconcile_EmptyApexFailsWithNamedError(t *testing.T) {
+	s := newScheme(t)
+	tgw := &gatewayv1alpha1.TenantGateway{
+		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
+		Spec: gatewayv1alpha1.TenantGatewaySpec{
+			Apex:             "",
+			CertMode:         gatewayv1alpha1.CertModeHTTP01,
+			GatewayClassName: "cilium",
+		},
+	}
+	c := fake.NewClientBuilder().WithScheme(s).WithObjects(tgw).WithStatusSubresource(tgw, &gatewayv1.Gateway{}).Build()
+
+	r := &Reconciler{Client: c, Scheme: s}
+	_, err := r.Reconcile(context.TODO(), ctrl.Request{
+		NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"},
+	})
+	if err == nil {
+		t.Fatal("reconcile succeeded with an empty apex; the redirect route would be rejected by the apiserver on an unreadable schema error")
+	}
+	if !strings.Contains(err.Error(), "apex") {
+		t.Errorf("error %q does not name the offending field; an operator reading this cannot tell that spec.apex is empty", err)
+	}
+
+	// The route must not have been written with the broken hostnames.
+	got := &gatewayv1.HTTPRoute{}
+	if getErr := c.Get(context.TODO(), types.NamespacedName{Name: "cozystack-http-redirect", Namespace: "tenant-foo"}, got); getErr == nil {
+		t.Errorf("redirect HTTPRoute was created with hostnames %v despite the empty apex", got.Spec.Hostnames)
+	}
+}
+
+// TestRenderHTTPRedirect_RejectsEmptyApex pins the guard at the renderer
+// so it survives a refactor of the reconcile order above it.
+func TestRenderHTTPRedirect_RejectsEmptyApex(t *testing.T) {
+	s := newScheme(t)
+	r := &Reconciler{Scheme: s}
+	tgw := &gatewayv1alpha1.TenantGateway{
+		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
+		Spec:       gatewayv1alpha1.TenantGatewaySpec{Apex: ""},
+	}
+	if _, err := r.renderHTTPRedirect(tgw); err == nil {
+		t.Fatal("renderHTTPRedirect accepted an empty apex")
+	} else if !strings.Contains(err.Error(), "apex") {
+		t.Errorf("error %q does not name the apex field", err)
+	}
+
+	tgw.Spec.Apex = "foo.example.com"
+	if _, err := r.renderHTTPRedirect(tgw); err != nil {
+		t.Errorf("renderHTTPRedirect rejected a valid apex: %v", err)
+	}
+}
+
+// TestReconcile_GatewayUpdatePreservesForeignLabels pins the
+// label-merge contract: a Gateway carrying labels written by other
+// actors (Cilium operator, kubectl label, future controllers) keeps
+// those labels across reconciliation. Wholesale replacement would
+// drop them — Gateway is shared infra, not an operator-only field.
+func TestReconcile_GatewayUpdatePreservesForeignLabels(t *testing.T) {
+	s := newScheme(t)
+	tgw := &gatewayv1alpha1.TenantGateway{
+		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
+		Spec: gatewayv1alpha1.TenantGatewaySpec{
+			Apex:             "foo.example.com",
+			CertMode:         gatewayv1alpha1.CertModeHTTP01,
+			GatewayClassName: "cilium",
+		},
+	}
+	c := fake.NewClientBuilder().WithScheme(s).WithObjects(tgw).WithStatusSubresource(tgw, &gatewayv1.Gateway{}).Build()
+	r := &Reconciler{Client: c, Scheme: s}
+
+	// First reconcile creates the Gateway.
+	if _, err := r.Reconcile(context.TODO(), ctrl.Request{
+		NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"},
+	}); err != nil {
+		t.Fatalf("first reconcile: %v", err)
+	}
+
+	// Simulate another actor stamping a foreign label.
+	gw := &gatewayv1.Gateway{}
+	if err := c.Get(context.TODO(), types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"}, gw); err != nil {
+		t.Fatalf("get Gateway: %v", err)
+	}
+	if gw.Labels == nil {
+		gw.Labels = map[string]string{}
+	}
+	gw.Labels["example.com/owner"] = "someone-else"
+	if err := c.Update(context.TODO(), gw); err != nil {
+		t.Fatalf("foreign label update: %v", err)
+	}
+
+	// Second reconcile must merge, not clobber.
+	if _, err := r.Reconcile(context.TODO(), ctrl.Request{
+		NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"},
+	}); err != nil {
+		t.Fatalf("second reconcile: %v", err)
+	}
+
+	got := &gatewayv1.Gateway{}
+	if err := c.Get(context.TODO(), types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"}, got); err != nil {
+		t.Fatalf("get Gateway: %v", err)
+	}
+	if got.Labels["example.com/owner"] != "someone-else" {
+		t.Errorf("foreign label dropped on update; labels=%v", got.Labels)
+	}
+	if got.Labels["cozystack.io/managed-by"] != "cozystack-controller" {
+		t.Errorf("controller label missing; labels=%v", got.Labels)
+	}
+}
+
+// TestReconcile_OwnerReferenceOnGateway pins the lifecycle contract:
+// the rendered Gateway must carry the TenantGateway as its
+// controller-owner so cascade-delete works (deleting the TenantGateway
+// cleans up the Gateway).
+func TestReconcile_OwnerReferenceOnGateway(t *testing.T) {
+	s := newScheme(t)
+	tgw := &gatewayv1alpha1.TenantGateway{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "cozystack",
+			Namespace: "tenant-foo",
+			UID:       "tgw-uid",
+		},
+		Spec: gatewayv1alpha1.TenantGatewaySpec{
+			Apex:             "foo.example.com",
+			CertMode:         gatewayv1alpha1.CertModeHTTP01,
+			GatewayClassName: "cilium",
+		},
+	}
+	c := fake.NewClientBuilder().WithScheme(s).WithObjects(tgw).WithStatusSubresource(tgw).Build()
+
+	r := &Reconciler{Client: c, Scheme: s}
+	if _, err := r.Reconcile(context.TODO(), ctrl.Request{
+		NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"},
+	}); err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+
+	got := &gatewayv1.Gateway{}
+	if err := c.Get(context.TODO(), types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"}, got); err != nil {
+		t.Fatalf("get Gateway: %v", err)
+	}
+	var owned bool
+	for _, ref := range got.OwnerReferences {
+		if ref.UID == "tgw-uid" && ref.Controller != nil && *ref.Controller {
+			owned = true
+			break
+		}
+	}
+	if !owned {
+		t.Errorf("expected controller OwnerReference to TenantGateway uid=tgw-uid, got %+v", got.OwnerReferences)
+	}
+}
+
+// TestReconcile_DNS01ModeRendersWildcardListener pins the opt-in DNS-01
+// branch: when CertMode=dns01 the rendered Gateway carries the
+// wildcard `https` listener for `*.<apex>` plus the `https-apex`
+// listener for the bare apex domain.
+func TestReconcile_DNS01ModeRendersWildcardListener(t *testing.T) {
+	s := newScheme(t)
+	tgw := &gatewayv1alpha1.TenantGateway{
+		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
+		Spec: gatewayv1alpha1.TenantGatewaySpec{
+			Apex:             "foo.example.com",
+			CertMode:         gatewayv1alpha1.CertModeDNS01,
+			GatewayClassName: "cilium",
+			DNS01: &gatewayv1alpha1.DNS01Config{
+				Provider: "cloudflare",
+				Cloudflare: &gatewayv1alpha1.CloudflareDNS01{
+					APITokenSecretRef: corev1.SecretKeySelector{
+						LocalObjectReference: corev1.LocalObjectReference{Name: "cf-token"},
+						Key:                  "api-token",
+					},
+				},
+			},
+		},
+	}
+	c := fake.NewClientBuilder().WithScheme(s).WithObjects(tgw).WithStatusSubresource(tgw).Build()
+
+	r := &Reconciler{Client: c, Scheme: s}
+	if _, err := r.Reconcile(context.TODO(), ctrl.Request{
+		NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"},
+	}); err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+
+	got := &gatewayv1.Gateway{}
+	if err := c.Get(context.TODO(), types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"}, got); err != nil {
+		t.Fatalf("get Gateway: %v", err)
+	}
+	var sawWildcard, sawApex bool
+	for _, l := range got.Spec.Listeners {
+		if l.Hostname != nil && string(*l.Hostname) == "*.foo.example.com" && l.Protocol == gatewayv1.HTTPSProtocolType {
+			sawWildcard = true
+		}
+		if l.Hostname != nil && string(*l.Hostname) == "foo.example.com" && l.Protocol == gatewayv1.HTTPSProtocolType {
+			sawApex = true
+		}
+	}
+	if !sawWildcard {
+		t.Errorf("expected wildcard *.foo.example.com HTTPS listener in DNS-01 mode, got %+v", got.Spec.Listeners)
+	}
+	if !sawApex {
+		t.Errorf("expected apex foo.example.com HTTPS listener in DNS-01 mode, got %+v", got.Spec.Listeners)
+	}
+}
+
+// TestReconcile_HTTP01ModeNoWildcardListener pins the default branch:
+// in HTTP-01 mode the Gateway must NOT have a wildcard `*.<apex>`
+// listener (because HTTP-01 cannot issue wildcard certs). Per-app
+// listeners are added later by route-driven reconciliation.
+func TestReconcile_HTTP01ModeNoWildcardListener(t *testing.T) {
+	s := newScheme(t)
+	tgw := &gatewayv1alpha1.TenantGateway{
+		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
+		Spec: gatewayv1alpha1.TenantGatewaySpec{
+			Apex:             "foo.example.com",
+			CertMode:         gatewayv1alpha1.CertModeHTTP01,
+			GatewayClassName: "cilium",
+		},
+	}
+	c := fake.NewClientBuilder().WithScheme(s).WithObjects(tgw).WithStatusSubresource(tgw).Build()
+
+	r := &Reconciler{Client: c, Scheme: s}
+	if _, err := r.Reconcile(context.TODO(), ctrl.Request{
+		NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"},
+	}); err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+
+	got := &gatewayv1.Gateway{}
+	if err := c.Get(context.TODO(), types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"}, got); err != nil {
+		t.Fatalf("get Gateway: %v", err)
+	}
+	for _, l := range got.Spec.Listeners {
+		if l.Hostname != nil && string(*l.Hostname) == "*.foo.example.com" {
+			t.Errorf("HTTP-01 mode must not render wildcard listener, found %+v", l)
+		}
+	}
+}
+
+// TestReconcile_AlwaysCreatesIssuer pins the cert-manager
+// infrastructure: every TenantGateway materialises a per-tenant
+// ACME Issuer in its namespace, regardless of certMode. The Issuer
+// is named "<tgw-name>-gateway".
+func TestReconcile_AlwaysCreatesIssuer(t *testing.T) {
+	for _, mode := range []gatewayv1alpha1.CertMode{
+		gatewayv1alpha1.CertModeHTTP01,
+		gatewayv1alpha1.CertModeDNS01,
+	} {
+		t.Run(string(mode), func(t *testing.T) {
+			s := newScheme(t)
+			tgw := &gatewayv1alpha1.TenantGateway{
+				ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
+				Spec: gatewayv1alpha1.TenantGatewaySpec{
 					Apex:             "foo.example.com",
 					CertMode:         mode,
 					GatewayClassName: "cilium",
@@ -1244,7 +1782,7 @@ func TestReconcile_HTTP01CollectsHostnamesFromInheritingChildNamespaces(t *testi
 	c := fake.NewClientBuilder().
 		WithScheme(s).
 		WithObjects(tgw, nsRoot, nsChild, route).
-		WithStatusSubresource(tgw).
+		WithStatusSubresource(tgw, &gatewayv1.HTTPRoute{}).
 		Build()
 
 	r := &Reconciler{Client: c, Scheme: s}
@@ -1694,7 +2232,7 @@ func TestReconcile_HTTP01ProducesListenerForHTTPRoute(t *testing.T) {
 	c := fake.NewClientBuilder().
 		WithScheme(s).
 		WithObjects(tgw, route).
-		WithStatusSubresource(tgw).
+		WithStatusSubresource(tgw, &gatewayv1.HTTPRoute{}).
 		Build()
 
 	r := &Reconciler{Client: c, Scheme: s}
@@ -1743,7 +2281,7 @@ func TestReconcile_HTTP01ProducesCertificateForHTTPRoute(t *testing.T) {
 	c := fake.NewClientBuilder().
 		WithScheme(s).
 		WithObjects(tgw, route).
-		WithStatusSubresource(tgw).
+		WithStatusSubresource(tgw, &gatewayv1.HTTPRoute{}).
 		Build()
 
 	r := &Reconciler{Client: c, Scheme: s}
@@ -1794,7 +2332,7 @@ func TestReconcile_MultipleHTTPRoutesSameHostnameDeduplicates(t *testing.T) {
 	c := fake.NewClientBuilder().
 		WithScheme(s).
 		WithObjects(tgw, r1, r2).
-		WithStatusSubresource(tgw).
+		WithStatusSubresource(tgw, &gatewayv1.HTTPRoute{}).
 		Build()
 
 	r := &Reconciler{Client: c, Scheme: s}
@@ -1889,15 +2427,19 @@ func TestReconcile_DNS01ModeIgnoresHTTPRoutesForListeners(t *testing.T) {
 	}
 }
 
-// ControllerName is the controllerName used by this controller in
-// RouteParentStatus entries. Mirrors the constant in conflict.go.
-const testControllerName = "gateway.cozystack.io/tenantgateway-controller"
+// testControllerName is the controllerName this controller stamps into
+// RouteParentStatus entries, derived rather than restated: a helper that
+// looks for a name the controller no longer writes finds no entry, and
+// an assertion that something is absent then passes without having
+// checked anything.
+const testControllerName = string(ControllerName)
 
 // TestReconcile_ListenersHaveAllowedRoutesSelector pins Layer 1 of
 // the security model: every listener carries an AllowedRoutes
-// selector keyed on kubernetes.io/metadata.name (kube-apiserver-
-// written, unspoofable). Without this, routes from outside the
-// tenant namespace silently fail to attach (default From: Same).
+// selector, and which label it keys on follows the listener class
+// rather than being one label throughout. The body sets the classes
+// out. Without a selector at all, routes from outside the tenant
+// namespace silently fail to attach (default From: Same).
 func TestReconcile_ListenersHaveAllowedRoutesSelector(t *testing.T) {
 	s := newScheme(t)
 	tgw := &gatewayv1alpha1.TenantGateway{
@@ -1907,6 +2449,17 @@ func TestReconcile_ListenersHaveAllowedRoutesSelector(t *testing.T) {
 			CertMode:           gatewayv1alpha1.CertModeHTTP01,
 			GatewayClassName:   "cilium",
 			AttachedNamespaces: []string{"cozy-harbor", "cozy-dashboard"},
+			// Native-port layer-4 passthrough listeners are in scope
+			// for Layer 1 too, and more sharply than the HTTPS ones:
+			// they forward the raw stream to a database on its native
+			// port, so a route attaching from outside the tenant
+			// reaches the backend directly. The loop below asserts
+			// over every rendered listener, so listing them here is
+			// what keeps "tls-<name>" inside the selector guarantee.
+			TLSPassthroughServices: []string{"api"},
+			TLSPassthroughListeners: []gatewayv1alpha1.TLSPassthroughListener{
+				{Name: "postgres", Port: 5432, Hostname: "postgres.foo.example.com"},
+			},
 		},
 	}
 	c := fake.NewClientBuilder().WithScheme(s).WithObjects(tgw).WithStatusSubresource(tgw).Build()
@@ -1922,6 +2475,30 @@ func TestReconcile_ListenersHaveAllowedRoutesSelector(t *testing.T) {
 	if err := c.Get(context.TODO(), types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"}, gw); err != nil {
 		t.Fatalf("get Gateway: %v", err)
 	}
+	// The two listener classes carry two DIFFERENT selector shapes, and
+	// the split is the security model, not an inconsistency:
+	//
+	//   - "http" (:80) pins an explicit kubernetes.io/metadata.name
+	//     allow-list — the tenant namespace plus the ACME challenge
+	//     namespace. That label is written by kube-apiserver and cannot
+	//     be spoofed, which is what keeps app HTTPRoutes off :80 where
+	//     they would serve plaintext (buildHTTPListenerAllowedRoutes).
+	//   - the native-port layer-4 passthrough listeners pin the same
+	//     unspoofable label, naming the tenant namespace alone: a
+	//     database port is no place for the subtree-wide attach set
+	//     (allowedRoutesFromValues).
+	//   - the HTTPS-terminate and :443 passthrough listeners select on
+	//     the namespace.cozystack.io/gateway label, which is how child
+	//     tenants opt in to their owner's Gateway (buildAllowedRoutes).
+	//
+	// Asserting a single shape across both classes is what previously
+	// made this test vacuous: the old fixture published no hostnames and
+	// declared no passthrough, so only the "http" listener ever reached
+	// the loop and the branch covering every other listener was dead.
+	// The fixture now renders a :443 passthrough listener and a
+	// native-port one so both branches carry weight.
+	sawGatewayLabelListener := false
+	sawNativePortListener := false
 	for _, l := range gw.Spec.Listeners {
 		if l.AllowedRoutes == nil || l.AllowedRoutes.Namespaces == nil ||
 			l.AllowedRoutes.Namespaces.From == nil ||
@@ -1929,32 +2506,72 @@ func TestReconcile_ListenersHaveAllowedRoutesSelector(t *testing.T) {
 			t.Fatalf("listener %s missing Selector AllowedRoutes: %+v", l.Name, l.AllowedRoutes)
 		}
 		sel := l.AllowedRoutes.Namespaces.Selector
-		if sel == nil || len(sel.MatchExpressions) != 1 {
-			t.Fatalf("listener %s expected one MatchExpression, got %+v", l.Name, sel)
+		if sel == nil {
+			t.Fatalf("listener %s has nil selector", l.Name)
 		}
-		expr := sel.MatchExpressions[0]
-		if expr.Key != "kubernetes.io/metadata.name" {
-			t.Errorf("listener %s selector key=%q, want kubernetes.io/metadata.name", l.Name, expr.Key)
-		}
-		// http listener carries a narrower allowedRoutes (tenant ns
-		// + cert-manager challenge ns) — see TestReconcile_HTTPListenerExcludesAppNamespaces.
-		// Other listeners get the broad attached-namespaces list.
-		var want []string
+
 		if string(l.Name) == "http" {
-			want = []string{"tenant-foo", "cozy-cert-manager"}
-		} else {
-			want = []string{"tenant-foo", "cozy-harbor", "cozy-dashboard"}
-		}
-		got := expr.Values
-		if len(got) != len(want) {
-			t.Errorf("listener %s selector values=%v, want %v", l.Name, got, want)
+			if len(sel.MatchExpressions) != 1 {
+				t.Fatalf("listener %s expected one MatchExpression, got %+v", l.Name, sel)
+			}
+			expr := sel.MatchExpressions[0]
+			if expr.Key != "kubernetes.io/metadata.name" {
+				t.Errorf("listener %s selector key=%q, want kubernetes.io/metadata.name", l.Name, expr.Key)
+			}
+			want := []string{"tenant-foo", "cozy-cert-manager"}
+			got := expr.Values
+			if len(got) != len(want) {
+				t.Errorf("listener %s selector values=%v, want %v", l.Name, got, want)
+				continue
+			}
+			for i := range want {
+				if got[i] != want[i] {
+					t.Errorf("listener %s selector values[%d]=%q, want %q", l.Name, i, got[i], want[i])
+				}
+			}
 			continue
 		}
-		for i := range want {
-			if got[i] != want[i] {
-				t.Errorf("listener %s selector values[%d]=%q, want %q", l.Name, i, got[i], want[i])
+
+		// Native-port passthrough listeners are the third form: they
+		// pin the tenant's own namespace the way the port-80 listener
+		// does, so the gateway-label assertion below would be wrong
+		// for them. Keyed on the port rather than the name, because
+		// tlsPassthroughServices renders tls-<svc> on 443 and that one
+		// does carry the gateway label.
+		if l.Port != 80 && l.Port != 443 {
+			sawNativePortListener = true
+			if len(sel.MatchLabels) != 0 || len(sel.MatchExpressions) != 1 {
+				t.Errorf("listener %s on port %d selector=%+v, want one metadata.name expression", l.Name, l.Port, sel)
+				continue
 			}
+			if got := sel.MatchExpressions[0].Values; len(got) != 1 || got[0] != "tenant-foo" {
+				t.Errorf("listener %s on port %d selector values=%v, want [tenant-foo]", l.Name, l.Port, got)
+			}
+			continue
+		}
+
+		sawGatewayLabelListener = true
+		if len(sel.MatchExpressions) != 0 {
+			t.Errorf("listener %s carries MatchExpressions %+v, want the gateway-label MatchLabels form", l.Name, sel.MatchExpressions)
 		}
+		if got := sel.MatchLabels[namespaceGatewayLabel]; got != "tenant-foo" {
+			t.Errorf("listener %s selector %s=%q, want tenant-foo", l.Name, namespaceGatewayLabel, got)
+		}
+		if len(sel.MatchLabels) != 1 {
+			t.Errorf("listener %s selector MatchLabels=%+v, want exactly %s", l.Name, sel.MatchLabels, namespaceGatewayLabel)
+		}
+	}
+	// Guards the regression that made this test vacuous for its whole
+	// prior life: if the fixture stops rendering non-http listeners, the
+	// loop above silently asserts nothing about them again.
+	if !sawGatewayLabelListener {
+		t.Fatal("no non-http listener rendered; the gateway-label branch asserted nothing")
+	}
+	// Same guard for the native-port branch. It was added later and
+	// inherited none of the protection above: drop TLSPassthroughListeners
+	// from the fixture and that branch stops running without a word.
+	if !sawNativePortListener {
+		t.Fatal("no native-port listener rendered; the metadata.name branch asserted nothing")
 	}
 }
 
@@ -1962,7 +2579,9 @@ func TestReconcile_ListenersHaveAllowedRoutesSelector(t *testing.T) {
 // listener flow: each entry in TLSPassthroughServices materialises a
 // dedicated tls-<svc> listener (port 443, protocol TLS, mode
 // Passthrough) with hostname <svc>.<apex> and AllowedRoutes.Kinds
-// restricted to TLSRoute. The TLSRoute templates for cozystack-api,
+// carrying HTTPRoute and TLSRoute together, the set every port-443
+// listener declares so that Cilium does not merge them and drop the
+// HTTPRoutes. The TLSRoute templates for cozystack-api,
 // vm-exportproxy and cdi-uploadproxy attach to these by sectionName.
 func TestReconcile_TLSPassthroughListenersRendered(t *testing.T) {
 	s := newScheme(t)
@@ -2012,9 +2631,19 @@ func TestReconcile_TLSPassthroughListenersRendered(t *testing.T) {
 		if l.TLS == nil || l.TLS.Mode == nil || *l.TLS.Mode != gatewayv1.TLSModePassthrough {
 			t.Errorf("%s TLS mode is not Passthrough: %+v", l.Name, l.TLS)
 		}
-		if l.AllowedRoutes == nil || len(l.AllowedRoutes.Kinds) != 1 ||
-			l.AllowedRoutes.Kinds[0].Kind != "TLSRoute" {
-			t.Errorf("%s AllowedRoutes.Kinds restriction missing: %+v", l.Name, l.AllowedRoutes)
+		// Passthrough listeners carry the same port443Kinds set as
+		// HTTPS-terminate listeners (cilium#45559: divergent kinds
+		// collapse listeners). HTTPRoute and TLSRoute must both appear.
+		if l.AllowedRoutes == nil || len(l.AllowedRoutes.Kinds) != 2 {
+			t.Errorf("%s AllowedRoutes.Kinds restriction missing or wrong count: %+v", l.Name, l.AllowedRoutes)
+			continue
+		}
+		kindNames := map[gatewayv1.Kind]bool{}
+		for _, k := range l.AllowedRoutes.Kinds {
+			kindNames[k.Kind] = true
+		}
+		if !kindNames["HTTPRoute"] || !kindNames["TLSRoute"] {
+			t.Errorf("%s AllowedRoutes.Kinds=%v, want both HTTPRoute and TLSRoute", l.Name, l.AllowedRoutes.Kinds)
 		}
 	}
 	if len(wanted) > 0 {
@@ -2022,21 +2651,32 @@ func TestReconcile_TLSPassthroughListenersRendered(t *testing.T) {
 	}
 }
 
-// TestReconcile_StatusObservedGeneration pins observedGeneration: the
-// status field tracks .metadata.generation so operators can tell
-// whether the controller has caught up with the latest spec.
-func TestReconcile_StatusObservedGeneration(t *testing.T) {
+// TestReconcile_TLSPassthroughListenerObjects pins the layer-4
+// TLS-passthrough listener flow: each entry in
+// spec.tlsPassthroughListeners materialises exactly one "tls-<name>"
+// Gateway listener on the entry's native port with protocol TLS, mode
+// Passthrough, the entry's per-engine SNI hostname, and no declared
+// AllowedRoutes.Kinds at all, which is what leaves the allowed kind to
+// the protocol and keeps the listener out of the upstream loop that
+// judges every route on the Gateway by it. Declaring TLSRoute here
+// would read as tighter and do the opposite, so the sentence matters:
+// it is the one a future reader meets before deciding to "restrict"
+// this field. This is distinct from TestReconcile_TLSPassthroughListenersRendered,
+// which covers the older spec.tlsPassthroughServices field on
+// the shared port 443.
+func TestReconcile_TLSPassthroughListenerObjects(t *testing.T) {
 	s := newScheme(t)
 	tgw := &gatewayv1alpha1.TenantGateway{
-		ObjectMeta: metav1.ObjectMeta{
-			Name:       "cozystack",
-			Namespace:  "tenant-foo",
-			Generation: 7,
-		},
+		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
 		Spec: gatewayv1alpha1.TenantGatewaySpec{
 			Apex:             "foo.example.com",
 			CertMode:         gatewayv1alpha1.CertModeHTTP01,
 			GatewayClassName: "cilium",
+			TLSPassthroughListeners: []gatewayv1alpha1.TLSPassthroughListener{
+				{Name: "postgres", Port: 5432, Hostname: "postgres.foo.example.com"},
+				{Name: "mysql", Port: 3306, Hostname: "mysql.foo.example.com"},
+				{Name: "kafka", Port: 9092, Hostname: "*.kafka.foo.example.com"},
+			},
 		},
 	}
 	c := fake.NewClientBuilder().WithScheme(s).WithObjects(tgw).WithStatusSubresource(tgw).Build()
@@ -2048,123 +2688,167 @@ func TestReconcile_StatusObservedGeneration(t *testing.T) {
 		t.Fatalf("unexpected error: %v", err)
 	}
 
-	got := &gatewayv1alpha1.TenantGateway{}
-	if err := c.Get(context.TODO(), types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"}, got); err != nil {
-		t.Fatalf("get tgw: %v", err)
-	}
-	if got.Status.ObservedGeneration != 7 {
-		t.Errorf("Status.ObservedGeneration=%d, want 7", got.Status.ObservedGeneration)
+	gw := &gatewayv1.Gateway{}
+	if err := c.Get(context.TODO(), types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"}, gw); err != nil {
+		t.Fatalf("get Gateway: %v", err)
 	}
-}
 
-// TestReconcile_StatusListenersMirrorGateway pins
-// status.listeners — one TenantGatewayListenerStatus entry per
-// Listener on the rendered Gateway. The static `http` listener is
-// always present in HTTP-01 mode; the test asserts at least that one
-// shows up with its hostname carried through.
-func TestReconcile_StatusListenersMirrorGateway(t *testing.T) {
-	s := newScheme(t)
-	tgw := &gatewayv1alpha1.TenantGateway{
-		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
-		Spec: gatewayv1alpha1.TenantGatewaySpec{
-			Apex:               "foo.example.com",
-			CertMode:           gatewayv1alpha1.CertModeHTTP01,
-			GatewayClassName:   "cilium",
-			AttachedNamespaces: []string{"cozy-harbor"},
-		},
+	type want struct {
+		port     gatewayv1.PortNumber
+		hostname string
 	}
-	route := httpRouteAttached("harbor", "cozy-harbor", "harbor.foo.example.com")
-
-	c := fake.NewClientBuilder().
-		WithScheme(s).
-		WithObjects(tgw, route).
-		WithStatusSubresource(tgw).
-		Build()
-
-	r := &Reconciler{Client: c, Scheme: s}
-	if _, err := r.Reconcile(context.TODO(), ctrl.Request{
-		NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"},
-	}); err != nil {
-		t.Fatalf("unexpected error: %v", err)
+	wanted := map[string]want{
+		"tls-postgres": {5432, "postgres.foo.example.com"},
+		"tls-mysql":    {3306, "mysql.foo.example.com"},
+		"tls-kafka":    {9092, "*.kafka.foo.example.com"},
 	}
+	seen := map[string]int{}
+	for _, l := range gw.Spec.Listeners {
+		w, ok := wanted[string(l.Name)]
+		if !ok {
+			continue
+		}
+		seen[string(l.Name)]++
 
-	got := &gatewayv1alpha1.TenantGateway{}
-	if err := c.Get(context.TODO(), types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"}, got); err != nil {
-		t.Fatalf("get tgw: %v", err)
-	}
-	var sawHTTP, sawHarbor bool
-	for _, l := range got.Status.Listeners {
-		if l.Name == "http" {
-			sawHTTP = true
+		if l.Port != w.port {
+			t.Errorf("%s port=%d, want %d", l.Name, l.Port, w.port)
 		}
-		if l.Hostname == "harbor.foo.example.com" {
-			sawHarbor = true
-			if l.CertificateName == "" {
-				t.Errorf("expected CertificateName populated for harbor listener, got %+v", l)
-			}
+		if l.Hostname == nil || string(*l.Hostname) != w.hostname {
+			t.Errorf("%s hostname=%v, want %s", l.Name, l.Hostname, w.hostname)
+		}
+		if l.TLS == nil || l.TLS.Mode == nil || *l.TLS.Mode != gatewayv1.TLSModePassthrough {
+			t.Errorf("%s TLS mode is not Passthrough: %+v", l.Name, l.TLS)
+		}
+		// What may attach is left to the listener protocol rather than
+		// declared, and the safety of that rests on two facts this
+		// assertion holds together. The protocol is TLS, which is what
+		// makes Gateway API derive TLSRoute as the only allowed kind
+		// when the field is absent. And the field is absent, which is
+		// what keeps this listener out of the upstream loop that would
+		// otherwise reject every HTTPRoute on the Gateway. Declaring
+		// TLSRoute here reads as tighter and is the opposite.
+		if l.Protocol != gatewayv1.TLSProtocolType {
+			t.Errorf("%s protocol=%s, want TLS — the empty Kinds below is only safe because the protocol supplies the default", l.Name, l.Protocol)
+		}
+		if l.AllowedRoutes != nil && len(l.AllowedRoutes.Kinds) > 0 {
+			t.Errorf("%s declares AllowedRoutes.Kinds=%+v; a listener that declares kinds joins the upstream loop and its set decides Accepted for every route on the Gateway", l.Name, l.AllowedRoutes.Kinds)
+		}
+		// The protocol bounds WHAT may attach; the namespace selector
+		// bounds WHO may attach. Only the pair is Layer 1 — a listener
+		// open to every namespace still lets a foreign tenant SNI-route
+		// this database port.
+		// Unlike the :443 listeners, these select the publishing
+		// tenant's own namespace by kubernetes.io/metadata.name, the
+		// label kube-apiserver writes and nobody can spoof. The
+		// gateway label the :443 listeners use is stamped on every
+		// inheriting child namespace, so it would put a database port
+		// within reach of the whole tenant subtree.
+		if l.AllowedRoutes.Namespaces == nil ||
+			l.AllowedRoutes.Namespaces.From == nil ||
+			*l.AllowedRoutes.Namespaces.From != gatewayv1.NamespacesFromSelector {
+			t.Errorf("%s AllowedRoutes.Namespaces is not From: Selector: %+v", l.Name, l.AllowedRoutes)
+			continue
+		}
+		sel := l.AllowedRoutes.Namespaces.Selector
+		if sel == nil {
+			t.Errorf("%s has nil namespace selector", l.Name)
+			continue
+		}
+		if len(sel.MatchLabels) != 0 || len(sel.MatchExpressions) != 1 {
+			t.Errorf("%s selector=%+v, want exactly one metadata.name expression", l.Name, sel)
+			continue
+		}
+		expr := sel.MatchExpressions[0]
+		if expr.Key != "kubernetes.io/metadata.name" || expr.Operator != metav1.LabelSelectorOpIn {
+			t.Errorf("%s selector %s %s, want kubernetes.io/metadata.name In", l.Name, expr.Key, expr.Operator)
+		}
+		if len(expr.Values) != 1 || expr.Values[0] != "tenant-foo" {
+			t.Errorf("%s selector values=%v, want [tenant-foo] only; the gateway label would reach the whole subtree", l.Name, expr.Values)
 		}
 	}
-	if !sawHTTP {
-		t.Errorf("expected http listener in Status.Listeners, got %+v", got.Status.Listeners)
-	}
-	if !sawHarbor {
-		t.Errorf("expected harbor listener in Status.Listeners, got %+v", got.Status.Listeners)
+	for name := range wanted {
+		if seen[name] != 1 {
+			t.Errorf("listener %s rendered %d times, want exactly 1", name, seen[name])
+		}
 	}
 }
 
-// TestReconcile_StatusReadyFalseUntilGatewayProgrammed pins the
-// readiness contract: until the Gateway controller marks the
-// underlying Gateway Programmed=True, the TenantGateway carries
-// Ready=False with a non-empty Reason. Operators waiting on
-// `kubectl wait --for=condition=Ready` see real progress, not a
-// fictional green flag the moment the CR is created.
-func TestReconcile_StatusReadyFalseUntilGatewayProgrammed(t *testing.T) {
-	s := newScheme(t)
-	tgw := &gatewayv1alpha1.TenantGateway{
-		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
-		Spec: gatewayv1alpha1.TenantGatewaySpec{
-			Apex:             "foo.example.com",
-			CertMode:         gatewayv1alpha1.CertModeHTTP01,
-			GatewayClassName: "cilium",
-		},
-	}
-	c := fake.NewClientBuilder().WithScheme(s).WithObjects(tgw).WithStatusSubresource(tgw).Build()
+// tlsRouteBackendName is the Service every TLSRoute fixture forwards
+// to.
+const tlsRouteBackendName = "backend"
 
-	r := &Reconciler{Client: c, Scheme: s}
-	if _, err := r.Reconcile(context.TODO(), ctrl.Request{
-		NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"},
-	}); err != nil {
-		t.Fatalf("unexpected error: %v", err)
+// tlsRouteAttached builds a TLSRoute in ns that attaches to the
+// "cozystack" Gateway in parentNs by sectionName and claims hostname.
+// Counterpart to httpRouteAttached: a passthrough listener accepts
+// TLSRoute alone, so this is the only shape that reaches the TLSRoute
+// branch of collectHostnameClaims.
+func tlsRouteAttached(name, ns, hostname, sectionName, parentNs string) *gatewayv1alpha2.TLSRoute {
+	gwGroup := gatewayv1.Group(gatewayv1.GroupName)
+	gwKind := gatewayv1.Kind("Gateway")
+	gwNs := gatewayv1.Namespace(parentNs)
+	section := gatewayv1.SectionName(sectionName)
+	return &gatewayv1alpha2.TLSRoute{
+		ObjectMeta: metav1.ObjectMeta{Name: name, Namespace: ns},
+		Spec: gatewayv1alpha2.TLSRouteSpec{
+			CommonRouteSpec: gatewayv1.CommonRouteSpec{
+				ParentRefs: []gatewayv1.ParentReference{
+					{
+						Group:       &gwGroup,
+						Kind:        &gwKind,
+						Namespace:   &gwNs,
+						Name:        gatewayv1.ObjectName("cozystack"),
+						SectionName: &section,
+					},
+				},
+			},
+			Hostnames: []gatewayv1.Hostname{gatewayv1.Hostname(hostname)},
+			Rules: []gatewayv1alpha2.TLSRouteRule{
+				{BackendRefs: []gatewayv1alpha2.BackendRef{tlsBackendRef(tlsRouteBackendName, "")}},
+			},
+		},
 	}
+}
 
-	got := &gatewayv1alpha1.TenantGateway{}
-	if err := c.Get(context.TODO(), types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"}, got); err != nil {
-		t.Fatalf("get tgw: %v", err)
-	}
-	var ready *metav1.Condition
-	for i := range got.Status.Conditions {
-		if got.Status.Conditions[i].Type == "Ready" {
-			ready = &got.Status.Conditions[i]
-			break
-		}
-	}
-	if ready == nil {
-		t.Fatalf("expected Ready condition, got %+v", got.Status.Conditions)
-	}
-	if ready.Status != metav1.ConditionFalse {
-		t.Errorf("Ready.Status=%s, want False (Gateway not yet Programmed)", ready.Status)
+// tlsBackendRef builds a backendRef to a Service, with namespace ""
+// meaning the route's own namespace — the distinction the reference
+// rules turn on, since a ref that names no namespace can never need a
+// ReferenceGrant.
+func tlsBackendRef(name, namespace string) gatewayv1alpha2.BackendRef {
+	svcGroup := gatewayv1.Group("")
+	svcKind := gatewayv1.Kind("Service")
+	port := gatewayv1.PortNumber(443)
+	ref := gatewayv1alpha2.BackendRef{
+		BackendObjectReference: gatewayv1.BackendObjectReference{
+			Group: &svcGroup,
+			Kind:  &svcKind,
+			Name:  gatewayv1.ObjectName(name),
+			Port:  &port,
+		},
 	}
-	if ready.Reason == "" {
-		t.Errorf("expected non-empty Reason on Ready=False, got %+v", ready)
+	if namespace != "" {
+		ns := gatewayv1.Namespace(namespace)
+		ref.Namespace = &ns
 	}
+	return ref
 }
 
-// TestReconcile_StatusReadyTrueWhenGatewayProgrammed pins the green
-// path: once the Gateway controller writes Accepted=True +
-// Programmed=True on the Gateway and per-listener Accepted=True +
-// Programmed=True on each ListenerStatus, the TenantGateway flips
-// Ready=True.
-func TestReconcile_StatusReadyTrueWhenGatewayProgrammed(t *testing.T) {
+// passthroughTLSRoute is a TLSRoute attached by name to the listener a
+// tlsPassthroughServices or tlsPassthroughListeners entry renders.
+func passthroughTLSRoute(name, ns, hostname, entry string) *gatewayv1alpha2.TLSRoute {
+	return tlsRouteAttached(name, ns, hostname, passthroughListenerPrefix+entry, "tenant-foo")
+}
+
+// TestReconcile_TLSRouteOnPassthroughListenerTerminatesNothing pins the
+// only supported way to use a native-port passthrough listener: attach
+// a TLSRoute to it. A passthrough listener never terminates TLS, so the
+// backend holds the certificate for its hostname and the Gateway must
+// hold none — no HTTPS listener on 443 for that hostname, and no ACME
+// order for it.
+//
+// The listener hostname is the whole point of the entry, so the test
+// asserts on the hostname rather than on listener names, which carry a
+// content-addressed suffix.
+func TestReconcile_TLSRouteOnPassthroughListenerTerminatesNothing(t *testing.T) {
 	s := newScheme(t)
 	tgw := &gatewayv1alpha1.TenantGateway{
 		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
@@ -2172,97 +2856,93 @@ func TestReconcile_StatusReadyTrueWhenGatewayProgrammed(t *testing.T) {
 			Apex:             "foo.example.com",
 			CertMode:         gatewayv1alpha1.CertModeHTTP01,
 			GatewayClassName: "cilium",
+			TLSPassthroughListeners: []gatewayv1alpha1.TLSPassthroughListener{
+				{Name: "postgres", Port: 5432, Hostname: "postgres.foo.example.com"},
+			},
 		},
 	}
+	route := tlsRouteAttached("postgres", "tenant-foo", "postgres.foo.example.com", "tls-postgres", "tenant-foo")
+
 	c := fake.NewClientBuilder().
 		WithScheme(s).
-		WithObjects(tgw).
-		WithStatusSubresource(tgw, &gatewayv1.Gateway{}).
+		WithObjects(tgw, route).
+		WithStatusSubresource(tgw, route).
 		Build()
 
 	r := &Reconciler{Client: c, Scheme: s}
-	// First reconcile creates the Gateway; we then patch its status to
-	// simulate Cilium's controller having reconciled it, and run a
-	// second reconcile so the TenantGateway picks up the new status.
 	if _, err := r.Reconcile(context.TODO(), ctrl.Request{
 		NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"},
 	}); err != nil {
-		t.Fatalf("first reconcile: %v", err)
+		t.Fatalf("unexpected error: %v", err)
 	}
+
 	gw := &gatewayv1.Gateway{}
 	if err := c.Get(context.TODO(), types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"}, gw); err != nil {
 		t.Fatalf("get Gateway: %v", err)
 	}
-	gw.Status.Conditions = []metav1.Condition{
-		{Type: "Accepted", Status: metav1.ConditionTrue, Reason: "Accepted", LastTransitionTime: metav1.Now()},
-		{Type: "Programmed", Status: metav1.ConditionTrue, Reason: "Programmed", LastTransitionTime: metav1.Now()},
-	}
-	gw.Status.Listeners = make([]gatewayv1.ListenerStatus, 0, len(gw.Spec.Listeners))
+
+	var sawPassthrough bool
 	for _, l := range gw.Spec.Listeners {
-		gw.Status.Listeners = append(gw.Status.Listeners, gatewayv1.ListenerStatus{
-			Name: l.Name,
-			Conditions: []metav1.Condition{
-				{Type: "Accepted", Status: metav1.ConditionTrue, Reason: "Accepted", LastTransitionTime: metav1.Now()},
-				{Type: "Programmed", Status: metav1.ConditionTrue, Reason: "Programmed", LastTransitionTime: metav1.Now()},
-			},
-			SupportedKinds: []gatewayv1.RouteGroupKind{},
-		})
-	}
-	if err := c.Status().Update(context.TODO(), gw); err != nil {
-		t.Fatalf("patch Gateway status: %v", err)
+		if l.Hostname == nil || string(*l.Hostname) != "postgres.foo.example.com" {
+			continue
+		}
+		switch l.Protocol {
+		case gatewayv1.TLSProtocolType:
+			sawPassthrough = true
+			if l.Port != 5432 {
+				t.Errorf("passthrough listener %s port=%d, want 5432", l.Name, l.Port)
+			}
+		default:
+			t.Errorf("listener %s (%s, port %d) terminates postgres.foo.example.com; the backend holds that certificate, not the Gateway", l.Name, l.Protocol, l.Port)
+		}
 	}
-
-	if _, err := r.Reconcile(context.TODO(), ctrl.Request{
-		NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"},
-	}); err != nil {
-		t.Fatalf("second reconcile: %v", err)
+	if !sawPassthrough {
+		t.Errorf("no passthrough listener for postgres.foo.example.com, got %+v", gw.Spec.Listeners)
 	}
 
-	got := &gatewayv1alpha1.TenantGateway{}
-	if err := c.Get(context.TODO(), types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"}, got); err != nil {
-		t.Fatalf("get tgw: %v", err)
-	}
-	var ready *metav1.Condition
-	for i := range got.Status.Conditions {
-		if got.Status.Conditions[i].Type == "Ready" {
-			ready = &got.Status.Conditions[i]
-			break
-		}
-	}
-	if ready == nil || ready.Status != metav1.ConditionTrue {
-		t.Errorf("expected Ready=True after Gateway Programmed, got %+v", ready)
+	certs := &cmv1.CertificateList{}
+	if err := c.List(context.TODO(), certs); err != nil {
+		t.Fatalf("list certs: %v", err)
 	}
-	for _, l := range got.Status.Listeners {
-		if !l.Ready {
-			t.Errorf("expected listener %s ready=true, got %+v", l.Name, l)
+	for i := range certs.Items {
+		for _, dns := range certs.Items[i].Spec.DNSNames {
+			if dns == "postgres.foo.example.com" {
+				t.Errorf("Certificate %s orders postgres.foo.example.com; a passthrough hostname needs no Gateway certificate and the order burns an ACME rate limit", certs.Items[i].Name)
+			}
 		}
 	}
 }
 
-// TestReconcile_TwoRoutesSameHostnameCozyWins pins the conflict
-// resolution rule: when two HTTPRoutes attached to the same Gateway
-// claim the same hostname but live in different namespaces, the
-// cozy-* namespace wins and the other route gets a
-// HostnameConflict condition under our controllerName in its
-// Status.Parents.
-func TestReconcile_TwoRoutesSameHostnameCozyWins(t *testing.T) {
+// TestReconcile_TLSRouteOnPassthroughServiceTerminatesNothing is the
+// port-443 counterpart, covering the pre-existing
+// spec.tlsPassthroughServices field that the platform's own TLSRoutes
+// (cozystack-api, vm-exportproxy, cdi-uploadproxy) attach to. There the
+// terminate listener collides harder: it lands on port 443 carrying the
+// same hostname as the passthrough listener. Gateway API admits that —
+// its uniqueness rule is on (port, protocol, hostname) and the two
+// differ in protocol — and calls for both to be marked Conflicted, so
+// the hostname is served by neither. Cilium marks the pair from the
+// listener specs alone and drops it from Envoy, and the operator patch
+// that admits a wildcard beside a narrower passthrough listener keeps
+// that for an identical hostname.
+func TestReconcile_TLSRouteOnPassthroughServiceTerminatesNothing(t *testing.T) {
 	s := newScheme(t)
 	tgw := &gatewayv1alpha1.TenantGateway{
 		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
 		Spec: gatewayv1alpha1.TenantGatewaySpec{
-			Apex:               "foo.example.com",
-			CertMode:           gatewayv1alpha1.CertModeHTTP01,
-			GatewayClassName:   "cilium",
-			AttachedNamespaces: []string{"cozy-harbor", "tenant-foo"},
+			Apex:                   "foo.example.com",
+			CertMode:               gatewayv1alpha1.CertModeHTTP01,
+			GatewayClassName:       "cilium",
+			AttachedNamespaces:     []string{"cozy-api"},
+			TLSPassthroughServices: []string{"api"},
 		},
 	}
-	cozyRoute := httpRouteAttached("harbor", "cozy-harbor", "harbor.foo.example.com")
-	tenantRoute := httpRouteAttached("harbor-shadow", "tenant-foo", "harbor.foo.example.com")
+	route := tlsRouteAttached("kubernetes-api", "cozy-api", "api.foo.example.com", "tls-api", "tenant-foo")
 
 	c := fake.NewClientBuilder().
 		WithScheme(s).
-		WithObjects(tgw, cozyRoute, tenantRoute).
-		WithStatusSubresource(tgw, &gatewayv1.HTTPRoute{}).
+		WithObjects(tgw, route).
+		WithStatusSubresource(tgw, route).
 		Build()
 
 	r := &Reconciler{Client: c, Scheme: s}
@@ -2272,88 +2952,488 @@ func TestReconcile_TwoRoutesSameHostnameCozyWins(t *testing.T) {
 		t.Fatalf("unexpected error: %v", err)
 	}
 
-	// Listener / cert exist (winner served).
 	gw := &gatewayv1.Gateway{}
 	if err := c.Get(context.TODO(), types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"}, gw); err != nil {
 		t.Fatalf("get Gateway: %v", err)
 	}
-	var sawHarbor bool
+
+	var onPort443 []string
 	for _, l := range gw.Spec.Listeners {
-		if l.Hostname != nil && string(*l.Hostname) == "harbor.foo.example.com" {
-			sawHarbor = true
-			break
+		if l.Port == 443 && l.Hostname != nil && string(*l.Hostname) == "api.foo.example.com" {
+			onPort443 = append(onPort443, string(l.Name)+"/"+string(l.Protocol))
 		}
 	}
-	if !sawHarbor {
-		t.Errorf("expected harbor listener present (winner served), got %+v", gw.Spec.Listeners)
+	if len(onPort443) != 1 {
+		t.Errorf("port 443 carries %d listeners for api.foo.example.com (%v), want exactly the passthrough one; two on one port and hostname are admitted, and carry one server name into one Envoy listener", len(onPort443), onPort443)
 	}
+}
 
-	// Loser HTTPRoute carries HostnameConflict condition under our
-	// controllerName in Status.Parents.
-	got := &gatewayv1.HTTPRoute{}
-	if err := c.Get(context.TODO(), types.NamespacedName{Name: "harbor-shadow", Namespace: "tenant-foo"}, got); err != nil {
-		t.Fatalf("get loser route: %v", err)
-	}
-	var sawConflict bool
-	for _, ps := range got.Status.Parents {
-		if string(ps.ControllerName) != testControllerName {
+// TestReconcile_HTTPRouteOnPassthroughHostnameTerminatesNothing pins
+// that the hostname decides, not the route kind. A passthrough listener
+// for <svc>.<apex> is rendered from spec.tlsPassthroughServices whether
+// or not any route attaches, so an HTTPRoute claiming that hostname
+// produces the same port-443 pair a TLSRoute used to. The tenant does
+// not have to be hostile to reach it: the shipped default publishes
+// "api", "vm-exportproxy" and "cdi-uploadproxy", so an app named after
+// one of them is enough.
+// Both spec fields feed the suppressed set, and each is its own loop, so
+// each subtest pins one of them. Covering only the services leg let the
+// listeners leg be deleted with the suite still green.
+func TestReconcile_HTTPRouteOnPassthroughHostnameTerminatesNothing(t *testing.T) {
+	const hostname = "api.foo.example.com"
+	sources := []struct {
+		name      string
+		services  []string
+		listeners []gatewayv1alpha1.TLSPassthroughListener
+	}{
+		{
+			name:     "tlsPassthroughServices",
+			services: []string{"api"},
+		},
+		{
+			// Native port, so the pair would not be two listeners on
+			// one Gateway port; the name is reserved as a policy.
+			name:      "tlsPassthroughListeners",
+			listeners: []gatewayv1alpha1.TLSPassthroughListener{{Name: "api", Port: 5432, Hostname: hostname}},
+		},
+	}
+	for _, src := range sources {
+		t.Run(src.name, func(t *testing.T) {
+			s := newScheme(t)
+			tgw := &gatewayv1alpha1.TenantGateway{
+				ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
+				Spec: gatewayv1alpha1.TenantGatewaySpec{
+					Apex:                    "foo.example.com",
+					CertMode:                gatewayv1alpha1.CertModeHTTP01,
+					GatewayClassName:        "cilium",
+					TLSPassthroughServices:  src.services,
+					TLSPassthroughListeners: src.listeners,
+				},
+			}
+			route := httpRouteAttached("api", "tenant-foo", hostname)
+			claimant := passthroughTLSRoute("api-tls", "tenant-foo", hostname, "api")
+
+			c := fake.NewClientBuilder().
+				WithScheme(s).
+				WithObjects(tgw, route, claimant).
+				WithStatusSubresource(tgw, route, claimant).
+				Build()
+
+			r := &Reconciler{Client: c, Scheme: s}
+			if _, err := r.Reconcile(context.TODO(), ctrl.Request{
+				NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"},
+			}); err != nil {
+				t.Fatalf("unexpected error: %v", err)
+			}
+
+			gw := &gatewayv1.Gateway{}
+			if err := c.Get(context.TODO(), types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"}, gw); err != nil {
+				t.Fatalf("get Gateway: %v", err)
+			}
+			var passthrough bool
+			for _, l := range gw.Spec.Listeners {
+				if l.Hostname == nil || string(*l.Hostname) != hostname {
+					continue
+				}
+				if l.Protocol == gatewayv1.HTTPSProtocolType {
+					t.Errorf("listener %s terminates %s, which a passthrough listener already holds", l.Name, hostname)
+				}
+				if l.Protocol == gatewayv1.TLSProtocolType {
+					passthrough = true
+				}
+			}
+			// Assert on the protocol rather than counting listeners on
+			// the port: a spec that rendered the terminate listener and
+			// dropped the passthrough one would keep the count at one
+			// and pass a count-based check.
+			if !passthrough {
+				t.Errorf("no passthrough listener for %s, so the absence of a terminate listener proves nothing: %+v", hostname, gw.Spec.Listeners)
+			}
+
+			certs := &cmv1.CertificateList{}
+			if err := c.List(context.TODO(), certs); err != nil {
+				t.Fatalf("list certs: %v", err)
+			}
+			for i := range certs.Items {
+				for _, dns := range certs.Items[i].Spec.DNSNames {
+					if dns == hostname {
+						t.Errorf("Certificate %s orders %s, which a passthrough listener already serves", certs.Items[i].Name, hostname)
+					}
+				}
+			}
+		})
+	}
+}
+
+// listenerNamesByProtocol splits the rendered listeners carrying one
+// hostname into the terminate names and the passthrough names. Tests
+// assert on what is in each rather than on how many listeners the
+// Gateway has: a render that kept the terminate listener and dropped
+// the passthrough one leaves the count on the hostname unchanged and
+// passes a count-based check.
+func listenerNamesByProtocol(gw *gatewayv1.Gateway, hostname string) (terminate, passthrough []string) {
+	for _, l := range gw.Spec.Listeners {
+		if l.Hostname == nil || string(*l.Hostname) != hostname {
 			continue
 		}
-		for _, cond := range ps.Conditions {
-			if cond.Type == "Accepted" && cond.Status == metav1.ConditionFalse && cond.Reason == "HostnameConflict" {
-				sawConflict = true
-				break
+		switch l.Protocol {
+		case gatewayv1.HTTPSProtocolType:
+			terminate = append(terminate, string(l.Name))
+		case gatewayv1.TLSProtocolType:
+			passthrough = append(passthrough, string(l.Name))
+		}
+	}
+	return terminate, passthrough
+}
+
+// certNamesOrdering returns the names of the Certificates whose
+// DNSNames carry the hostname.
+func certNamesOrdering(certs *cmv1.CertificateList, hostname string) []string {
+	var names []string
+	for i := range certs.Items {
+		for _, dns := range certs.Items[i].Spec.DNSNames {
+			if dns == hostname {
+				names = append(names, certs.Items[i].Name)
 			}
 		}
 	}
-	if !sawConflict {
-		t.Errorf("expected HostnameConflict condition on loser route, got Status.Parents=%+v", got.Status.Parents)
+	return names
+}
+
+// TestReconcile_PassthroughServiceShedsAnExistingTerminateListenerAndCert
+// pins the upgrade shape, which the three tests above do not reach. Each
+// of those builds a client holding nothing but the TenantGateway and a
+// route, so no terminate listener and no per-listener Certificate ever
+// existed there to withdraw: they prove the suppression renders
+// correctly from empty, not that it takes away what a cluster is
+// already holding. Taking it away is the breaking half of this change.
+// A stock HTTP-01 cluster carries a terminate listener and an ACME
+// Certificate for each hostname a route published, the three shipped
+// tlsPassthroughServices names among them, and both go on the first
+// reconcile after the upgrade.
+//
+// Phase 1 builds that state through the controller, the way
+// TestReconcile_CertModeTransitionHTTP01ToDNS01CleansPerListenerCerts
+// builds its per-listener cert: with tlsPassthroughServices empty, a
+// claimed hostname earns its own terminate listener and Certificate.
+// The claim comes from an HTTPRoute because a hostname only a TLSRoute
+// claims earns neither under this code, so a TLSRoute cannot build the
+// state that has to be shed. Phase 2 adds the service and asserts both
+// are gone while the tls-api passthrough listener stands.
+func TestReconcile_PassthroughServiceShedsAnExistingTerminateListenerAndCert(t *testing.T) {
+	const hostname = "api.foo.example.com"
+	s := newScheme(t)
+	tgw := &gatewayv1alpha1.TenantGateway{
+		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
+		Spec: gatewayv1alpha1.TenantGatewaySpec{
+			Apex:             "foo.example.com",
+			CertMode:         gatewayv1alpha1.CertModeHTTP01,
+			GatewayClassName: "cilium",
+		},
 	}
+	route := httpRouteAttached("api", "tenant-foo", hostname)
+	// Present from the start: phase 1 declares no passthrough listener,
+	// so this route attaches to nothing and phase 1 still measures the
+	// terminate listener it is there to shed.
+	claimant := passthroughTLSRoute("api-tls", "tenant-foo", hostname, "api")
 
-	// Winner HTTPRoute carries Accepted=True (no conflict) under our
-	// controllerName.
-	winner := &gatewayv1.HTTPRoute{}
-	if err := c.Get(context.TODO(), types.NamespacedName{Name: "harbor", Namespace: "cozy-harbor"}, winner); err != nil {
-		t.Fatalf("get winner route: %v", err)
+	c := fake.NewClientBuilder().
+		WithScheme(s).
+		WithObjects(tgw, route, claimant).
+		WithStatusSubresource(tgw, route, claimant).
+		Build()
+	r := &Reconciler{Client: c, Scheme: s}
+	key := types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"}
+
+	// Phase 1: no passthrough service, so the hostname is terminated.
+	if _, err := r.Reconcile(context.TODO(), ctrl.Request{NamespacedName: key}); err != nil {
+		t.Fatalf("phase 1 reconcile: %v", err)
 	}
-	var sawAccepted bool
-	for _, ps := range winner.Status.Parents {
-		if string(ps.ControllerName) != testControllerName {
-			continue
+	gw := &gatewayv1.Gateway{}
+	if err := c.Get(context.TODO(), key, gw); err != nil {
+		t.Fatalf("phase 1 get Gateway: %v", err)
+	}
+	terminate, passthrough := listenerNamesByProtocol(gw, hostname)
+	if want := []string{perListenerName(hostname)}; !reflect.DeepEqual(terminate, want) {
+		t.Fatalf("phase 1 terminate listeners for %s = %v, want %v; without one there is nothing for phase 2 to shed", hostname, terminate, want)
+	}
+	if len(passthrough) != 0 {
+		t.Fatalf("phase 1 already carries passthrough listeners %v for %s, so the shed is not what phase 2 would measure", passthrough, hostname)
+	}
+	preCerts := &cmv1.CertificateList{}
+	if err := c.List(context.TODO(), preCerts); err != nil {
+		t.Fatalf("phase 1 list Certificates: %v", err)
+	}
+	if got, want := certNamesOrdering(preCerts, hostname), []string{perListenerCertName(tgw, hostname)}; !reflect.DeepEqual(got, want) {
+		t.Fatalf("phase 1 Certificates ordering %s = %v, want %v; without one there is nothing for phase 2 to collect", hostname, got, want)
+	}
+
+	// Phase 2: the upgrade. The service is declared passthrough, and
+	// the terminate listener and its Certificate must both go.
+	updated := &gatewayv1alpha1.TenantGateway{}
+	if err := c.Get(context.TODO(), key, updated); err != nil {
+		t.Fatalf("get TenantGateway: %v", err)
+	}
+	updated.Spec.TLSPassthroughServices = []string{"api"}
+	if err := c.Update(context.TODO(), updated); err != nil {
+		t.Fatalf("declare api passthrough: %v", err)
+	}
+	if _, err := r.Reconcile(context.TODO(), ctrl.Request{NamespacedName: key}); err != nil {
+		t.Fatalf("phase 2 reconcile: %v", err)
+	}
+
+	if err := c.Get(context.TODO(), key, gw); err != nil {
+		t.Fatalf("phase 2 get Gateway: %v", err)
+	}
+	terminate, passthrough = listenerNamesByProtocol(gw, hostname)
+	if len(terminate) != 0 {
+		t.Errorf("terminate listeners %v for %s survived the switch to passthrough: %+v", terminate, hostname, gw.Spec.Listeners)
+	}
+	if want := []string{passthroughListenerPrefix + "api"}; !reflect.DeepEqual(passthrough, want) {
+		t.Errorf("passthrough listeners for %s = %v, want %v; with none the absent terminate listener proves nothing", hostname, passthrough, want)
+	}
+	postCerts := &cmv1.CertificateList{}
+	if err := c.List(context.TODO(), postCerts); err != nil {
+		t.Fatalf("phase 2 list Certificates: %v", err)
+	}
+	if got := certNamesOrdering(postCerts, hostname); len(got) != 0 {
+		t.Errorf("Certificates %v still order %s, which a passthrough listener now serves", got, hostname)
+	}
+}
+
+// TestReconcile_ReservedHostnameGetsNoTerminateListener pins that a
+// name a passthrough listener answers is reserved by the spec alone:
+// the HTTPRoute claiming it gets no terminate listener and no
+// certificate, and is told why, whether or not a TLSRoute is attached
+// to the passthrough listener and whatever its backends resolve to.
+// Keying the reservation on the routes instead would tie a route's
+// status to how one implementation builds its filter chains.
+func TestReconcile_ReservedHostnameGetsNoTerminateListener(t *testing.T) {
+	const hostname = "api.foo.example.com"
+	sources := []struct {
+		name      string
+		services  []string
+		listeners []gatewayv1alpha1.TLSPassthroughListener
+	}{
+		{name: "tlsPassthroughServices", services: []string{"api"}},
+		{name: "tlsPassthroughListeners", listeners: []gatewayv1alpha1.TLSPassthroughListener{{Name: "api", Port: 5432, Hostname: hostname}}},
+	}
+	claimants := []struct {
+		name  string
+		route func() []client.Object
+	}{
+		{"no TLSRoute", func() []client.Object { return nil }},
+		{"TLSRoute whose backend does not exist", func() []client.Object {
+			return []client.Object{passthroughTLSRoute("api-tls", "tenant-foo", hostname, "api")}
+		}},
+	}
+	for _, src := range sources {
+		for _, cl := range claimants {
+			t.Run(src.name+"/"+cl.name, func(t *testing.T) {
+				s := newScheme(t)
+				tgw := &gatewayv1alpha1.TenantGateway{
+					ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
+					Spec: gatewayv1alpha1.TenantGatewaySpec{
+						Apex:                    "foo.example.com",
+						CertMode:                gatewayv1alpha1.CertModeHTTP01,
+						GatewayClassName:        "cilium",
+						TLSPassthroughServices:  src.services,
+						TLSPassthroughListeners: src.listeners,
+					},
+				}
+				route := httpRouteAttached("api", "tenant-foo", hostname)
+				c := fake.NewClientBuilder().
+					WithScheme(s).
+					WithObjects(tgw, route).
+					WithObjects(cl.route()...).
+					WithStatusSubresource(tgw, route).
+					Build()
+
+				r := &Reconciler{Client: c, Scheme: s}
+				key := types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"}
+				if _, err := r.Reconcile(context.TODO(), ctrl.Request{NamespacedName: key}); err != nil {
+					t.Fatalf("unexpected error: %v", err)
+				}
+
+				gw := &gatewayv1.Gateway{}
+				if err := c.Get(context.TODO(), key, gw); err != nil {
+					t.Fatalf("get Gateway: %v", err)
+				}
+				if terminate, _ := listenerNamesByProtocol(gw, hostname); len(terminate) != 0 {
+					t.Errorf("terminate listeners %v rendered for reserved %s: %+v", terminate, hostname, gw.Spec.Listeners)
+				}
+				certs := &cmv1.CertificateList{}
+				if err := c.List(context.TODO(), certs); err != nil {
+					t.Fatalf("list Certificates: %v", err)
+				}
+				if got := certNamesOrdering(certs, hostname); len(got) != 0 {
+					t.Errorf("Certificates %v order reserved %s", got, hostname)
+				}
+				accepted := acceptedCondition(t, c, "api", "tenant-foo")
+				if accepted.Status != metav1.ConditionFalse || accepted.Reason != string(gatewayv1.RouteReasonNoMatchingListenerHostname) || !strings.Contains(accepted.Message, "answered by a TLS-passthrough listener") {
+					t.Errorf("route on reserved %s reads Accepted=%s reason=%s: %q", hostname, accepted.Status, accepted.Reason, accepted.Message)
+				}
+			})
 		}
-		for _, cond := range ps.Conditions {
-			if cond.Type == "Accepted" && cond.Status == metav1.ConditionTrue {
-				sawAccepted = true
+	}
+}
+
+// TestReconcile_WholeApexModesReserveNothing pins where the reservation
+// stops. dns01 and existingSecret serve every name under the apex from
+// one wildcard terminate listener, which cannot be withdrawn for one
+// hostname, so an HTTPRoute on a passthrough listener's name is served
+// there on 443 and this controller writes it no refusal.
+func TestReconcile_WholeApexModesReserveNothing(t *testing.T) {
+	const hostname = "api.foo.example.com"
+	for _, mode := range []gatewayv1alpha1.CertMode{gatewayv1alpha1.CertModeDNS01, gatewayv1alpha1.CertModeExistingSecret} {
+		t.Run(string(mode), func(t *testing.T) {
+			s := newScheme(t)
+			tgw := &gatewayv1alpha1.TenantGateway{
+				ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
+				Spec: gatewayv1alpha1.TenantGatewaySpec{
+					Apex:                    "foo.example.com",
+					CertMode:                mode,
+					GatewayClassName:        "cilium",
+					WildcardSecretRef:       &corev1.LocalObjectReference{Name: "wildcard"},
+					TLSPassthroughListeners: []gatewayv1alpha1.TLSPassthroughListener{{Name: "api", Port: 6443, Hostname: hostname}},
+				},
 			}
-		}
+			if mode == gatewayv1alpha1.CertModeDNS01 {
+				tgw.Spec.DNS01 = &gatewayv1alpha1.DNS01Config{
+					Provider: "cloudflare",
+					Cloudflare: &gatewayv1alpha1.CloudflareDNS01{
+						APITokenSecretRef: corev1.SecretKeySelector{
+							LocalObjectReference: corev1.LocalObjectReference{Name: "cf-token"},
+							Key:                  "api-token",
+						},
+					},
+				}
+			}
+			route := httpRouteAttached("api", "tenant-foo", hostname)
+			c := fake.NewClientBuilder().
+				WithScheme(s).
+				WithObjects(tgw, route).
+				WithStatusSubresource(tgw, route).
+				Build()
+			r := &Reconciler{Client: c, Scheme: s}
+			key := types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"}
+			if _, err := r.Reconcile(context.TODO(), ctrl.Request{NamespacedName: key}); err != nil {
+				t.Fatalf("unexpected error: %v", err)
+			}
+			got := &gatewayv1.HTTPRoute{}
+			if err := c.Get(context.TODO(), client.ObjectKeyFromObject(route), got); err != nil {
+				t.Fatalf("get route: %v", err)
+			}
+			if cond := acceptedCondition2(got.Status.Parents); cond != nil && cond.Status != metav1.ConditionTrue {
+				t.Errorf("route served by the wildcard listener reads Accepted=%s reason=%s: %q", cond.Status, cond.Reason, cond.Message)
+			}
+			gw := &gatewayv1.Gateway{}
+			if err := c.Get(context.TODO(), key, gw); err != nil {
+				t.Fatalf("get Gateway: %v", err)
+			}
+			if !slices.ContainsFunc(gw.Spec.Listeners, func(l gatewayv1.Listener) bool {
+				return l.Name == "https" && l.Hostname != nil && string(*l.Hostname) == "*.foo.example.com"
+			}) {
+				t.Errorf("no wildcard terminate listener to serve %s: %+v", hostname, gw.Spec.Listeners)
+			}
+		})
 	}
-	if !sawAccepted {
-		t.Errorf("expected Accepted=True on winner route, got Status.Parents=%+v", winner.Status.Parents)
+}
+
+// TestHostnameCovers pins the predicate on its own terms rather than
+// through hostnamesOverlap, which is its only caller today. One leg is
+// reachable only from here: hostnamesOverlap answers identical
+// hostnames before it calls in, so the equality branch inside the
+// wildcard-vs-wildcard case never runs in production, and a mutation
+// that removes it survives every test that goes through the caller.
+// The branch stays because the predicate is documented as answering
+// "does w cover x" on its own, and a wildcard does cover itself; this
+// table is what makes that documented answer killable.
+func TestHostnameCovers(t *testing.T) {
+	for _, tc := range []struct {
+		name string
+		w, x string
+		want bool
+	}{
+		{"wildcard covers itself", "*.db.foo.example.com", "*.db.foo.example.com", true},
+		{"wildcard covers a narrower wildcard", "*.foo.example.com", "*.db.foo.example.com", true},
+		{"narrower wildcard does not cover a broader one", "*.db.foo.example.com", "*.foo.example.com", false},
+		{"wildcard covers an exact name under it", "*.foo.example.com", "db.foo.example.com", true},
+		{"wildcard does not cover its own bare suffix", "*.foo.example.com", "foo.example.com", false},
+		{"a non-wildcard covers nothing", "db.foo.example.com", "db.foo.example.com", false},
+		{"disjoint wildcards", "*.foo.example.com", "*.bar.example.com", false},
+	} {
+		t.Run(tc.name, func(t *testing.T) {
+			if got := hostnameCovers(tc.w, tc.x); got != tc.want {
+				t.Errorf("hostnameCovers(%q, %q) = %v, want %v", tc.w, tc.x, got, tc.want)
+			}
+		})
 	}
 }
 
-// TestReconcile_SameNamespaceSameHostnameNoConflict pins the dedup
-// path: two HTTPRoutes in the same namespace claiming the same
-// hostname is normal (canary, version split) — no conflict
-// condition should be raised.
-func TestReconcile_SameNamespaceSameHostnameNoConflict(t *testing.T) {
+// TestValidateTLSPassthroughListenersNamesTheSpecEntry pins that the
+// overlap error points at what the user edits.
+//
+// The two claimants reach the check from different fields, and the
+// rendered listener name is the same shape for both, so naming the
+// claimant by its rendered form sends the reader to grep the Gateway
+// for a string they never typed. The spec entry is where the fix is.
+func TestValidateTLSPassthroughListenersNamesTheSpecEntry(t *testing.T) {
+	err := validateTLSPassthroughListeners(
+		[]gatewayv1alpha1.TLSPassthroughListener{
+			{Name: "pgapi", Port: 5432, Hostname: "api.foo.example.com"},
+		},
+		[]string{"api"},
+		"foo.example.com",
+	)
+	if err == nil {
+		t.Fatal("expected an overlap error")
+	}
+	// The property is which side of the spec/render divide the message
+	// points at, so it is asserted as a pair: the field the claimant came
+	// from must appear, and the name that claimant renders into must not.
+	// The entry name on its own is not asserted, because the hostname in
+	// the same message already contains it and such a check would hold
+	// however the claimant were identified. Wording is deliberately not
+	// pinned; a reworded message that still names the field and still
+	// avoids the rendered form passes, which is the point.
+	if !strings.Contains(err.Error(), "tlsPassthroughServices") {
+		t.Errorf("error does not say which field the claiming entry came from: %v", err)
+	}
+	if strings.Contains(err.Error(), passthroughListenerPrefix+"api") {
+		t.Errorf("error names the rendered listener instead of the spec entry: %v", err)
+	}
+}
+
+// TestReconcile_WildcardPassthroughWithdrawsTheNamesBeneathIt pins that
+// the reservation follows hostname overlap, not string equality: a
+// wildcard entry answers every name under it, so declaring
+// "*.db.<apex>" as passthrough reserves everything under db.<apex>,
+// with no TLSRoute on the entry.
+//
+// Only http01 is covered. dns01 and existingSecret serve the tenant
+// from one wildcard terminate listener that cannot be withdrawn per
+// hostname, which TestReconcile_WholeApexModesReserveNothing pins.
+func TestReconcile_WildcardPassthroughWithdrawsTheNamesBeneathIt(t *testing.T) {
+	const published = "pg.db.foo.example.com"
 	s := newScheme(t)
 	tgw := &gatewayv1alpha1.TenantGateway{
 		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
 		Spec: gatewayv1alpha1.TenantGatewaySpec{
-			Apex:               "foo.example.com",
-			CertMode:           gatewayv1alpha1.CertModeHTTP01,
-			GatewayClassName:   "cilium",
-			AttachedNamespaces: []string{"cozy-harbor"},
+			Apex:             "foo.example.com",
+			CertMode:         gatewayv1alpha1.CertModeHTTP01,
+			GatewayClassName: "cilium",
+			TLSPassthroughListeners: []gatewayv1alpha1.TLSPassthroughListener{
+				{Name: "wild", Port: 5432, Hostname: "*.db.foo.example.com"},
+			},
 		},
 	}
-	r1 := httpRouteAttached("harbor-main", "cozy-harbor", "harbor.foo.example.com")
-	r2 := httpRouteAttached("harbor-canary", "cozy-harbor", "harbor.foo.example.com")
+	route := httpRouteAttached("pg", "tenant-foo", published)
 
 	c := fake.NewClientBuilder().
 		WithScheme(s).
-		WithObjects(tgw, r1, r2).
-		WithStatusSubresource(tgw, &gatewayv1.HTTPRoute{}).
+		WithObjects(tgw, route).
+		WithStatusSubresource(tgw, route).
 		Build()
 
 	r := &Reconciler{Client: c, Scheme: s}
@@ -2363,28 +3443,60 @@ func TestReconcile_SameNamespaceSameHostnameNoConflict(t *testing.T) {
 		t.Fatalf("unexpected error: %v", err)
 	}
 
-	for _, name := range []string{"harbor-main", "harbor-canary"} {
-		got := &gatewayv1.HTTPRoute{}
-		if err := c.Get(context.TODO(), types.NamespacedName{Name: name, Namespace: "cozy-harbor"}, got); err != nil {
-			t.Fatalf("get %s: %v", name, err)
+	gw := &gatewayv1.Gateway{}
+	if err := c.Get(context.TODO(), types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"}, gw); err != nil {
+		t.Fatalf("get Gateway: %v", err)
+	}
+	var wildcard bool
+	for _, l := range gw.Spec.Listeners {
+		if l.Hostname == nil {
+			continue
 		}
-		for _, ps := range got.Status.Parents {
-			if string(ps.ControllerName) != testControllerName {
-				continue
+		switch string(*l.Hostname) {
+		case "*.db.foo.example.com":
+			if l.Protocol == gatewayv1.TLSProtocolType {
+				wildcard = true
 			}
-			for _, cond := range ps.Conditions {
-				if cond.Reason == "HostnameConflict" {
-					t.Errorf("unexpected HostnameConflict on %s (same-namespace dedup is not a conflict)", name)
-				}
+		case published:
+			if l.Protocol == gatewayv1.HTTPSProtocolType {
+				t.Errorf("listener %s terminates %s, which the wildcard passthrough entry answers on the same SNI", l.Name, published)
+			}
+		}
+	}
+	// Without the wildcard listener there would be nothing to suppress,
+	// and the absence of a terminate listener would prove nothing.
+	if !wildcard {
+		t.Fatalf("no wildcard passthrough listener rendered: %+v", gw.Spec.Listeners)
+	}
+
+	certs := &cmv1.CertificateList{}
+	if err := c.List(context.TODO(), certs); err != nil {
+		t.Fatalf("list certs: %v", err)
+	}
+	for i := range certs.Items {
+		for _, dns := range certs.Items[i].Spec.DNSNames {
+			if dns == published {
+				t.Errorf("Certificate %s orders %s, which the wildcard passthrough entry answers", certs.Items[i].Name, published)
 			}
 		}
 	}
 }
 
-// TestReconcile_HTTP01DoesNotCreateWildcardCertificate pins the
-// inverse: HTTP-01 mode must NOT create the wildcard Certificate (the
-// underlying ACME challenge type can't issue wildcards).
-func TestReconcile_HTTP01DoesNotCreateWildcardCertificate(t *testing.T) {
+// TestReconcile_WithdrawnHostnameIsReportedOnTheRoute pins that a
+// route whose hostname this controller declines to serve is told so
+// under this controller's own controllerName. Withdrawing the
+// terminate listener leaves nothing on the Gateway for the route to
+// attach to, and Accepted=True would then describe a hostname the
+// controller deliberately dropped. Nothing on the Gateway says so
+// instead: the terminate listener is never rendered, so the Gateway
+// holds no record of the claim. That is what makes the route condition
+// the only place to say it.
+//
+// The reason must differ from HostnameConflict, which states that
+// another route won the same hostname. Nothing won this one.
+func TestReconcile_WithdrawnHostnameIsReportedOnTheRoute(t *testing.T) {
+	const published = "pg.db.foo.example.com"
+	const answeredBy = "*.db.foo.example.com"
 	s := newScheme(t)
 	tgw := &gatewayv1alpha1.TenantGateway{
 		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
@@ -2392,103 +3504,402 @@ func TestReconcile_HTTP01DoesNotCreateWildcardCertificate(t *testing.T) {
 			Apex:             "foo.example.com",
 			CertMode:         gatewayv1alpha1.CertModeHTTP01,
 			GatewayClassName: "cilium",
+			TLSPassthroughListeners: []gatewayv1alpha1.TLSPassthroughListener{
+				{Name: "wild", Port: 5432, Hostname: answeredBy},
+			},
 		},
 	}
-	c := fake.NewClientBuilder().WithScheme(s).WithObjects(tgw).WithStatusSubresource(tgw).Build()
+	// A second name under the same wildcard, listed after the first so
+	// that spec order and sorted order disagree.
+	const alsoPublished = "es.db.foo.example.com"
+	route := httpRouteAttached("pg", "tenant-foo", published)
+	route.Spec.Hostnames = append(route.Spec.Hostnames, alsoPublished)
+	// Both names, so both are withdrawn and the message has two to
+	// order.
+	claimant := passthroughTLSRoute("db-tls", "tenant-foo", published, "wild")
+	claimant.Spec.Hostnames = append(claimant.Spec.Hostnames, alsoPublished)
+
+	c := fake.NewClientBuilder().
+		WithScheme(s).
+		WithObjects(tgw, route, claimant).
+		WithStatusSubresource(tgw, &gatewayv1.HTTPRoute{}, &gatewayv1alpha2.TLSRoute{}).
+		Build()
 
 	r := &Reconciler{Client: c, Scheme: s}
-	if _, err := r.Reconcile(context.TODO(), ctrl.Request{
-		NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"},
-	}); err != nil {
-		t.Fatalf("unexpected error: %v", err)
+	readAccepted := func() *metav1.Condition {
+		t.Helper()
+		got := &gatewayv1.HTTPRoute{}
+		if err := c.Get(context.TODO(), types.NamespacedName{Name: "pg", Namespace: "tenant-foo"}, got); err != nil {
+			t.Fatalf("get route: %v", err)
+		}
+		var found *metav1.Condition
+		for _, ps := range got.Status.Parents {
+			if string(ps.ControllerName) != testControllerName {
+				continue
+			}
+			for i := range ps.Conditions {
+				if ps.Conditions[i].Type == "Accepted" {
+					found = &ps.Conditions[i]
+				}
+			}
+		}
+		// Without an entry of our own there is no claim to judge, and
+		// every assertion below would pass on a controller that writes
+		// no status at all.
+		if found == nil {
+			t.Fatalf("no Accepted condition under %s: %+v", testControllerName, got.Status.Parents)
+		}
+		return found
 	}
 
-	cert := &cmv1.Certificate{}
-	err := c.Get(context.TODO(), types.NamespacedName{Name: "cozystack-gateway-tls", Namespace: "tenant-foo"}, cert)
-	if err == nil {
-		t.Errorf("HTTP-01 mode rendered wildcard Certificate; should be absent")
+	// The two withdrawn hostnames come out of a map, so a single pass
+	// says nothing about stability: it could be ordered by luck. Passes
+	// are compared against each other because a message that differs
+	// between them rewrites the condition on every reconcile forever.
+	var accepted *metav1.Condition
+	for pass := range 8 {
+		if _, err := r.Reconcile(context.TODO(), ctrl.Request{
+			NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"},
+		}); err != nil {
+			t.Fatalf("pass %d: unexpected error: %v", pass, err)
+		}
+		cur := readAccepted()
+		if accepted == nil {
+			accepted = cur
+			continue
+		}
+		if cur.Message != accepted.Message {
+			t.Fatalf("message differs between reconciles, so every pass rewrites the condition:\n  pass 0: %q\n  pass %d: %q", accepted.Message, pass, cur.Message)
+		}
 	}
-}
-
-// TestReconcile_HTTPSListenersRestrictRouteKindsToHTTPRoute pins the
-// round-7 hardening: every HTTPS (TLS-terminate) listener must declare
-// AllowedRoutes.Kinds=[HTTPRoute]. Without that explicit restriction
-// Gateway API's default behaviour permits any route kind whose hostname
-// matches a listener — so a tenant carrying RBAC for GRPCRoute /
-// TCPRoute / UDPRoute could attach by hostname to a TLS-terminate
-// listener, bypassing the route-hostname VAP (which only binds to
-// HTTPRoute and TLSRoute) and serving traffic under the apex cert
-// without admission validation.
-//
-// Both certMode branches are exercised: HTTP-01 (per-app https-<label>
-// listeners) and DNS-01 (the wildcard `https` + apex `https-apex`
-// pair). The TLS-passthrough listener test elsewhere already pins
-// Kinds=[TLSRoute] for that branch; this one covers TLS-terminate.
-func TestReconcile_HTTPSListenersRestrictRouteKindsToHTTPRoute(t *testing.T) {
-	cases := []struct {
-		name string
-		tgw  *gatewayv1alpha1.TenantGateway
-		// extra objects to seed (e.g. HTTPRoute so HTTP-01 mode renders a per-app listener)
-		extra []client.Object
-	}{
-		{
-			name: "DNS-01 mode (wildcard + apex listeners)",
-			tgw: &gatewayv1alpha1.TenantGateway{
-				ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
-				Spec: gatewayv1alpha1.TenantGatewaySpec{
-					Apex:             "foo.example.com",
-					CertMode:         gatewayv1alpha1.CertModeDNS01,
-					GatewayClassName: "cilium",
-					DNS01: &gatewayv1alpha1.DNS01Config{
-						Provider: "cloudflare",
-						Cloudflare: &gatewayv1alpha1.CloudflareDNS01{
-							APITokenSecretRef: corev1.SecretKeySelector{
-								LocalObjectReference: corev1.LocalObjectReference{Name: "cf-token"},
-								Key:                  "api-token",
-							},
-						},
-					},
-				},
-			},
+	if accepted.Status != metav1.ConditionFalse {
+		t.Errorf("Accepted=%s for %s, which no listener serves", accepted.Status, published)
+	}
+	if accepted.Reason == "HostnameConflict" {
+		t.Errorf("reason HostnameConflict for %s, which lost to no route", published)
+	}
+	if !strings.Contains(accepted.Message, answeredBy) {
+		t.Errorf("message does not name the passthrough hostname answering %s: %q", published, accepted.Message)
+	}
+	// Order, not wording: both names must be there, and the smaller one
+	// first, so the message is the same on every pass.
+	smaller, larger := strings.Index(accepted.Message, alsoPublished), strings.Index(accepted.Message, published)
+	if smaller < 0 {
+		t.Fatalf("message omits withdrawn hostname %s: %q", alsoPublished, accepted.Message)
+	}
+	if larger < 0 {
+		t.Fatalf("message omits withdrawn hostname %s: %q", published, accepted.Message)
+	}
+	if smaller > larger {
+		t.Errorf("withdrawn hostnames not in a stable order: %s precedes %s in %q", published, alsoPublished, accepted.Message)
+	}
+}
+
+// TestReconcile_WithdrawnHostnameOutranksTheHostnameRace pins which
+// cause a contested hostname reports when the contest is moot. Two
+// HTTPRoutes claiming one shipped passthrough name is enough: the race
+// still has a winner and a loser, but the hostname is withdrawn, so no
+// terminate listener exists for either of them. Telling the loser its
+// hostname is "already claimed by another route" names a cause that
+// changes nothing, and sends the operator to look at a route that is
+// not being served either.
+func TestReconcile_WithdrawnHostnameOutranksTheHostnameRace(t *testing.T) {
+	const contested = "api.foo.example.com"
+	s := newScheme(t)
+	tgw := &gatewayv1alpha1.TenantGateway{
+		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
+		Spec: gatewayv1alpha1.TenantGatewaySpec{
+			Apex:                   "foo.example.com",
+			CertMode:               gatewayv1alpha1.CertModeHTTP01,
+			GatewayClassName:       "cilium",
+			AttachedNamespaces:     []string{"cozy-public", "tenant-foo"},
+			TLSPassthroughServices: []string{"api"},
 		},
-		{
-			name: "HTTP-01 mode (per-app listener from attached HTTPRoute)",
-			tgw: &gatewayv1alpha1.TenantGateway{
-				ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
-				Spec: gatewayv1alpha1.TenantGatewaySpec{
-					Apex:             "foo.example.com",
-					CertMode:         gatewayv1alpha1.CertModeHTTP01,
-					GatewayClassName: "cilium",
-				},
-			},
-			extra: []client.Object{
-				&gatewayv1.HTTPRoute{
-					ObjectMeta: metav1.ObjectMeta{Name: "harbor", Namespace: "tenant-foo"},
-					Spec: gatewayv1.HTTPRouteSpec{
-						Hostnames: []gatewayv1.Hostname{"harbor.foo.example.com"},
-						CommonRouteSpec: gatewayv1.CommonRouteSpec{
-							ParentRefs: []gatewayv1.ParentReference{
-								{
-									Group:     ptrGroup(gatewayv1.GroupName),
-									Kind:      ptrKind("Gateway"),
-									Name:      "cozystack",
-									Namespace: ptrNamespace("tenant-foo"),
-								},
-							},
-						},
-					},
-				},
-			},
+	}
+	winner := httpRouteAttached("api", "cozy-public", contested)
+	loser := httpRouteAttached("api-shadow", "tenant-foo", contested)
+	claimant := passthroughTLSRoute("api-tls", "tenant-foo", contested, "api")
+
+	c := fake.NewClientBuilder().
+		WithScheme(s).
+		WithObjects(tgw, winner, loser, claimant).
+		WithStatusSubresource(tgw, &gatewayv1.HTTPRoute{}, &gatewayv1alpha2.TLSRoute{}).
+		Build()
+
+	r := &Reconciler{Client: c, Scheme: s}
+	if _, err := r.Reconcile(context.TODO(), ctrl.Request{
+		NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"},
+	}); err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+
+	// Both routes are checked rather than the loser alone, because
+	// which one loses is resolveHostnameOwners' business and neither is
+	// served here.
+	for _, want := range []types.NamespacedName{
+		{Name: "api", Namespace: "cozy-public"},
+		{Name: "api-shadow", Namespace: "tenant-foo"},
+	} {
+		got := &gatewayv1.HTTPRoute{}
+		if err := c.Get(context.TODO(), want, got); err != nil {
+			t.Fatalf("get %s: %v", want, err)
+		}
+		var accepted *metav1.Condition
+		for _, ps := range got.Status.Parents {
+			if string(ps.ControllerName) != testControllerName {
+				continue
+			}
+			for i := range ps.Conditions {
+				if ps.Conditions[i].Type == "Accepted" {
+					accepted = &ps.Conditions[i]
+				}
+			}
+		}
+		if accepted == nil {
+			t.Fatalf("%s: no Accepted condition under %s: %+v", want, testControllerName, got.Status.Parents)
+		}
+		if accepted.Reason == "HostnameConflict" {
+			t.Errorf("%s: reported as losing the race for %s, which nothing serves: %q", want, contested, accepted.Message)
+		}
+	}
+}
+
+// acceptedCondition returns the Accepted condition an HTTPRoute got
+// under this controller's controllerName, failing the test when there
+// is none: an assertion about a condition that was never written would
+// otherwise hold on a controller that writes no status at all.
+func acceptedCondition(t *testing.T, c client.Client, name, ns string) *metav1.Condition {
+	t.Helper()
+	got := &gatewayv1.HTTPRoute{}
+	if err := c.Get(context.TODO(), types.NamespacedName{Name: name, Namespace: ns}, got); err != nil {
+		t.Fatalf("get route %s/%s: %v", ns, name, err)
+	}
+	var found *metav1.Condition
+	for _, ps := range got.Status.Parents {
+		if string(ps.ControllerName) != testControllerName {
+			continue
+		}
+		for i := range ps.Conditions {
+			if ps.Conditions[i].Type == "Accepted" {
+				found = &ps.Conditions[i]
+			}
+		}
+	}
+	if found == nil {
+		t.Fatalf("route %s/%s: no Accepted condition under %s: %+v", ns, name, testControllerName, got.Status.Parents)
+	}
+	return found
+}
+
+// TestReconcile_TLSRouteLoserOnAPassthroughHostnameKeepsItsConflict
+// pins the half of the withdrawal cleanup that does not apply to
+// TLSRoutes. Dropping a withdrawn hostname from the ownership race is
+// right for an HTTPRoute, which loses nothing it could have had once
+// no terminate listener is rendered. A TLSRoute is the passthrough
+// listener's intended user, so the race between two of them is real
+// and still has a winner: exactly one gets served, and the other has
+// to be told, or a tenant route claiming a shipped passthrough
+// hostname attaches with a clean bill of health while Cilium picks
+// between the two backends by SNI.
+func TestReconcile_TLSRouteLoserOnAPassthroughHostnameKeepsItsConflict(t *testing.T) {
+	const contested = "api.foo.example.com"
+	s := newScheme(t)
+	tgw := &gatewayv1alpha1.TenantGateway{
+		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
+		Spec: gatewayv1alpha1.TenantGatewaySpec{
+			Apex:                   "foo.example.com",
+			CertMode:               gatewayv1alpha1.CertModeHTTP01,
+			GatewayClassName:       "cilium",
+			AttachedNamespaces:     []string{"cozy-public", "tenant-bar"},
+			TLSPassthroughServices: []string{"api"},
 		},
 	}
-	for _, tc := range cases {
+	platform := tlsRouteAttached("api", "cozy-public", contested, "tls-api", "tenant-foo")
+	hijack := tlsRouteAttached("api-hijack", "tenant-bar", contested, "tls-api", "tenant-foo")
+
+	c := fake.NewClientBuilder().
+		WithScheme(s).
+		WithObjects(tgw, platform, hijack).
+		WithStatusSubresource(tgw, &gatewayv1alpha2.TLSRoute{}).
+		Build()
+
+	r := &Reconciler{Client: c, Scheme: s}
+	if _, err := r.Reconcile(context.TODO(), ctrl.Request{
+		NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"},
+	}); err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+
+	got := &gatewayv1alpha2.TLSRoute{}
+	if err := c.Get(context.TODO(), types.NamespacedName{Name: "api-hijack", Namespace: "tenant-bar"}, got); err != nil {
+		t.Fatalf("get losing TLSRoute: %v", err)
+	}
+	var accepted *metav1.Condition
+	for _, ps := range got.Status.Parents {
+		if string(ps.ControllerName) != testControllerName {
+			continue
+		}
+		for i := range ps.Conditions {
+			if ps.Conditions[i].Type == "Accepted" {
+				accepted = &ps.Conditions[i]
+			}
+		}
+	}
+	// No entry of ours means no claim was judged, and the assertion
+	// below would hold on a controller that writes nothing at all.
+	if accepted == nil {
+		t.Fatalf("no Accepted condition under %s: %+v", testControllerName, got.Status.Parents)
+	}
+	if accepted.Status != metav1.ConditionFalse || accepted.Reason != "HostnameConflict" {
+		t.Errorf("losing TLSRoute on %s reports Accepted=%s reason=%s; the winner in cozy-public is the one being served", contested, accepted.Status, accepted.Reason)
+	}
+}
+
+// TestReconcile_TLSRouteVerdictTable walks the state space the
+// withdrawal decision actually has, rather than sampling it. Three
+// consecutive defects lived in the interaction between its axes, and
+// each was found by a case nobody had written: the axes are which
+// reserved entries the claim overlaps (a port-443 service entry admits
+// routes from every attached namespace, a native-port entry only the
+// tenant) and where the route lives.
+//
+// The expectation for every row is one sentence: a TLSRoute is
+// accepted exactly when some listener answering its name would take a
+// route from its namespace.
+// noRouteHostnames marks a verdict-table row whose route declares no
+// spec.hostnames at all, the shape TLSRoute v1alpha2 permits and
+// Gateway API serves on the hostname of the listener the route
+// selects. Spelled as a name rather than left as a bare "" so a row
+// cannot be read as claiming the empty hostname.
+const noRouteHostnames = ""
+
+func TestReconcile_TLSRouteVerdictTable(t *testing.T) {
+	const apex = "foo.example.com"
+	for _, tc := range []struct {
+		name      string
+		hostname  string
+		namespace string
+		services  []string
+		listeners []gatewayv1alpha1.TLSPassthroughListener
+		section   string
+		// port pins the route by parentRef.port when non-zero, the way
+		// section pins it by name. Gateway API requires both to match
+		// the selected listener when both are given.
+		port     int32
+		accepted bool
+		// msgHas and msgLacks are checked only when set. They exist
+		// because the status alone cannot tell a refusal apart from a
+		// refusal blamed on the wrong listener: both are Accepted=False.
+		msgHas   string
+		msgLacks string
+	}{
+		{"service entry, tenant namespace", "svc." + apex, "tenant-foo",
+			[]string{"svc"}, nil, "tls-svc", 0, true, "", ""},
+		{"service entry, attached namespace", "svc." + apex, "default",
+			[]string{"svc"}, nil, "tls-svc", 0, true, "", ""},
+		{"native-port entry, tenant namespace", "pg." + apex, "tenant-foo",
+			nil, []gatewayv1alpha1.TLSPassthroughListener{{Name: "pg", Port: 5432, Hostname: "pg." + apex}}, "tls-pg", 0, true, "", ""},
+		{"native-port entry, attached namespace", "pg." + apex, "default",
+			nil, []gatewayv1alpha1.TLSPassthroughListener{{Name: "pg", Port: 5432, Hostname: "pg." + apex}}, "tls-pg", 0, false, "", ""},
+		{"wildcard over both, tenant namespace", "*." + apex, "tenant-foo",
+			[]string{"svc"}, []gatewayv1alpha1.TLSPassthroughListener{{Name: "pg", Port: 5432, Hostname: "pg." + apex}}, "tls-svc", 0, true, "", ""},
+		{"wildcard over both, attached namespace", "*." + apex, "default",
+			[]string{"svc"}, []gatewayv1alpha1.TLSPassthroughListener{{Name: "pg", Port: 5432, Hostname: "pg." + apex}}, "tls-svc", 0, true, "", ""},
+		{"wildcard over native-port only, attached namespace", "*." + apex, "default",
+			nil, []gatewayv1alpha1.TLSPassthroughListener{{Name: "pg", Port: 5432, Hostname: "pg." + apex}}, "tls-pg", 0, false, "", ""},
+		// Same claim as the row above it, differing only in the listener
+		// the route names. Eligibility is decided over every reserved
+		// hostname the claim overlaps, so the service entry makes the
+		// claim attachable somewhere, while this route asked for the
+		// native-port listener, which admits the tenant alone.
+		// The service entry is named so that it sorts BEFORE the
+		// native-port hostname: the lexicographic pick is what the
+		// message reports, so a row where the pick happens to be the
+		// refusing listener cannot tell a correct message from a wrong
+		// one.
+		{"wildcard over both, attached namespace, naming the native-port listener", "*." + apex, "default",
+			[]string{"api"}, []gatewayv1alpha1.TLSPassthroughListener{{Name: "pg", Port: 5432, Hostname: "pg." + apex}}, "tls-pg", 0, false,
+			// The listener that refused is tls-pg. Naming svc.<apex>
+			// sends the reader to a listener that would have taken this
+			// route, which is the misattribution the separate causes
+			// exist to prevent.
+			"pg." + apex, "api." + apex},
+		{"no entry answers it, tenant namespace", "gone." + apex, "tenant-foo",
+			nil, nil, "tls-gone", 0, false, "", ""},
+		// A parentRef port is the second key a route can pin itself
+		// with, and it is checked the same way the sectionName is: the
+		// listener answering the hostname has to be published on it.
+		{"native-port entry, tenant namespace, matching port", "pg." + apex, "tenant-foo",
+			nil, []gatewayv1alpha1.TLSPassthroughListener{{Name: "pg", Port: 5432, Hostname: "pg." + apex}}, "tls-pg", 5432, true, "", ""},
+		{"native-port entry, tenant namespace, port 443 names nothing", "pg." + apex, "tenant-foo",
+			nil, []gatewayv1alpha1.TLSPassthroughListener{{Name: "pg", Port: 5432, Hostname: "pg." + apex}}, "", 443, false, "port 443", ""},
+		{"service entry, tenant namespace, native port names nothing", "svc." + apex, "tenant-foo",
+			[]string{"svc"}, nil, "", 5432, false, "port 5432", ""},
+		{"service entry, tenant namespace, port 443 matches", "svc." + apex, "tenant-foo",
+			[]string{"svc"}, nil, "", 443, true, "", ""},
+		// The section names no listener this Gateway renders, so the
+		// route attaches to nothing whatever answers the hostname. The
+		// name it does carry is what the message has to print: it is
+		// the field the route's owner edits.
+		{"section names no listener, attached namespace", "svc." + apex, "default",
+			[]string{"svc"}, nil, "tls-absent", 0, false, "tls-absent", ""},
+		// Same shape from inside the publishing tenant, where a
+		// namespace refusal would state something the object itself
+		// contradicts.
+		{"section names no listener, tenant namespace", "svc." + apex, "tenant-foo",
+			[]string{"svc"}, nil, "tls-absent", 0, false, "tls-absent", ""},
+		// A route that declares no hostnames is served on the hostname
+		// of the listener it selects: ComputeHosts substitutes it
+		// (operator/pkg/model/helpers.go, v1.20.2), so the claim
+		// exists and is judged like a declared one. Pinning the listener
+		// by sectionName and leaving the hostname to it is the ordinary
+		// way to write such a route.
+		{"no hostnames, pinned to a service listener, tenant namespace", noRouteHostnames, "tenant-foo",
+			[]string{"svc"}, nil, "tls-svc", 0, true, "", ""},
+		// No sectionName either, which takes the route onto every TLS
+		// listener the Gateway carries, so the one rendered entry lends
+		// it its hostname.
+		{"no hostnames, no sectionName, tenant namespace", noRouteHostnames, "tenant-foo",
+			[]string{"svc"}, nil, "", 0, true, "", ""},
+		// The hostname it inherits belongs to a native-port listener,
+		// which admits the publishing tenant alone, so the route is
+		// refused on that name and told which listener refused it.
+		{"no hostnames, pinned to a native-port listener, attached namespace", noRouteHostnames, "default",
+			nil, []gatewayv1alpha1.TLSPassthroughListener{{Name: "pg", Port: 5432, Hostname: "pg." + apex}}, "tls-pg", 0, false, "pg." + apex, ""},
+	} {
 		t.Run(tc.name, func(t *testing.T) {
 			s := newScheme(t)
-			builder := fake.NewClientBuilder().WithScheme(s).WithObjects(tc.tgw).WithStatusSubresource(tc.tgw)
-			if len(tc.extra) > 0 {
-				builder = builder.WithObjects(tc.extra...)
+			tgw := &gatewayv1alpha1.TenantGateway{
+				ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
+				Spec: gatewayv1alpha1.TenantGatewaySpec{
+					Apex:                    apex,
+					CertMode:                gatewayv1alpha1.CertModeHTTP01,
+					GatewayClassName:        "cilium",
+					AttachedNamespaces:      []string{"default"},
+					TLSPassthroughServices:  tc.services,
+					TLSPassthroughListeners: tc.listeners,
+				},
 			}
-			c := builder.Build()
+			route := tlsRouteAttached("r", tc.namespace, tc.hostname, tc.section, "tenant-foo")
+			// An empty section means the row pins by port alone, so the
+			// parentRef must carry no sectionName rather than an empty
+			// one, which names no listener and is a different case.
+			if tc.section == "" {
+				route.Spec.ParentRefs[0].SectionName = nil
+			}
+			if tc.hostname == noRouteHostnames {
+				route.Spec.Hostnames = nil
+			}
+			if tc.port != 0 {
+				port := gatewayv1.PortNumber(tc.port)
+				route.Spec.ParentRefs[0].Port = &port
+			}
+			c := fake.NewClientBuilder().
+				WithScheme(s).
+				WithObjects(tgw, route).
+				WithStatusSubresource(tgw, route).
+				Build()
+
 			r := &Reconciler{Client: c, Scheme: s}
 			if _, err := r.Reconcile(context.TODO(), ctrl.Request{
 				NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"},
@@ -2496,599 +3907,830 @@ func TestReconcile_HTTPSListenersRestrictRouteKindsToHTTPRoute(t *testing.T) {
 				t.Fatalf("unexpected error: %v", err)
 			}
 
-			gw := &gatewayv1.Gateway{}
-			if err := c.Get(context.TODO(), types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"}, gw); err != nil {
-				t.Fatalf("get Gateway: %v", err)
+			got := &gatewayv1alpha2.TLSRoute{}
+			if err := c.Get(context.TODO(), types.NamespacedName{Name: "r", Namespace: tc.namespace}, got); err != nil {
+				t.Fatalf("get route: %v", err)
 			}
-			httpsCount := 0
-			for _, l := range gw.Spec.Listeners {
-				if l.Protocol != gatewayv1.HTTPSProtocolType {
+			var accepted *metav1.Condition
+			for _, ps := range got.Status.Parents {
+				if string(ps.ControllerName) != testControllerName {
 					continue
 				}
-				httpsCount++
-				if l.AllowedRoutes == nil || len(l.AllowedRoutes.Kinds) != 1 {
-					t.Fatalf("listener %s: expected exactly one allowed Kind, got %+v", l.Name, l.AllowedRoutes)
-				}
-				gk := l.AllowedRoutes.Kinds[0]
-				if gk.Kind != "HTTPRoute" {
-					t.Errorf("listener %s: AllowedRoutes.Kinds[0]=%q, want HTTPRoute", l.Name, gk.Kind)
+				for i := range ps.Conditions {
+					if ps.Conditions[i].Type == "Accepted" {
+						accepted = &ps.Conditions[i]
+					}
 				}
-				if gk.Group == nil || *gk.Group != gatewayv1.Group(gatewayv1.GroupName) {
-					t.Errorf("listener %s: AllowedRoutes.Kinds[0].Group=%v, want %q", l.Name, gk.Group, gatewayv1.GroupName)
+			}
+			if accepted == nil {
+				t.Fatalf("no Accepted condition under %s: %+v", testControllerName, got.Status.Parents)
+			}
+			if want := metav1.ConditionTrue; tc.accepted && accepted.Status != want {
+				t.Errorf("Accepted=%s reason=%s, want True: %q", accepted.Status, accepted.Reason, accepted.Message)
+			}
+			if tc.accepted == false && accepted.Status == metav1.ConditionTrue {
+				claimed := tc.hostname
+				if claimed == noRouteHostnames {
+					claimed = "the hostname of the listener it selects"
 				}
+				t.Errorf("Accepted=True, want False; nothing answering %s takes a route from %s", claimed, tc.namespace)
 			}
-			if httpsCount == 0 {
-				t.Fatalf("expected at least one HTTPS listener, listeners=%+v", gw.Spec.Listeners)
+			if tc.msgHas != "" && !strings.Contains(accepted.Message, tc.msgHas) {
+				t.Errorf("message does not name %s, the listener that refused: %q", tc.msgHas, accepted.Message)
+			}
+			if tc.msgLacks != "" && strings.Contains(accepted.Message, tc.msgLacks) {
+				t.Errorf("message names %s, a listener that would have admitted this route: %q", tc.msgLacks, accepted.Message)
 			}
 		})
 	}
 }
 
-// TestReconcile_DNS01IssuerRoute53Solver pins the DNS-01 + route53 path
-// (added in branch-review round 6 alongside cloudflare). The Issuer
-// must carry a dns01.route53 solver block referencing the operator-
-// supplied IAM credentials. Without coverage, a future renderer
-// refactor could regress to the cloudflare-only path the round-1 draft
-// shipped with.
-func TestReconcile_DNS01IssuerRoute53Solver(t *testing.T) {
+// TestReconcile_RefusedHTTPRouteLeavesTheHostnameToWhatCanServeIt pins
+// what a kind refusal does to the rest of the hostname. Ownership ranks
+// by namespace with no notion of who can attach, and cozy-* sorts
+// first, so a route pinned to a passthrough listener can win a name it
+// cannot be served on and the route that can is told it lost to it.
+//
+// The refused ref leaves the race, and the listener and certificate the
+// surviving claimant needs are unaffected: the refusal is about one
+// parentRef, not about the name.
+func TestReconcile_RefusedHTTPRouteLeavesTheHostnameToWhatCanServeIt(t *testing.T) {
+	const apex = "foo.example.com"
+	const hostname = "shop." + apex
 	s := newScheme(t)
 	tgw := &gatewayv1alpha1.TenantGateway{
 		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
 		Spec: gatewayv1alpha1.TenantGatewaySpec{
-			Apex:             "foo.example.com",
-			CertMode:         gatewayv1alpha1.CertModeDNS01,
-			GatewayClassName: "cilium",
-			DNS01: &gatewayv1alpha1.DNS01Config{
-				Provider: "route53",
-				Route53: &gatewayv1alpha1.Route53DNS01{
-					Region:      "us-east-1",
-					AccessKeyID: "AKIAIOSFODNN7EXAMPLE",
-					SecretAccessKeySecretRef: &corev1.SecretKeySelector{
-						LocalObjectReference: corev1.LocalObjectReference{Name: "aws-iam-secret"},
-						Key:                  "secret-access-key",
-					},
-				},
-			},
+			Apex:                   apex,
+			CertMode:               gatewayv1alpha1.CertModeHTTP01,
+			GatewayClassName:       "cilium",
+			AttachedNamespaces:     []string{"cozy-thing"},
+			TLSPassthroughServices: []string{"api"},
 		},
 	}
-	c := fake.NewClientBuilder().WithScheme(s).WithObjects(tgw).WithStatusSubresource(tgw).Build()
+	refused := httpRouteAttached("refused", "cozy-thing", hostname)
+	section := gatewayv1.SectionName(passthroughListenerPrefix + "api")
+	refused.Spec.ParentRefs[0].SectionName = &section
+	servable := httpRouteAttached("servable", "tenant-foo", hostname)
 
+	c := fake.NewClientBuilder().
+		WithScheme(s).
+		WithObjects(tgw, refused, servable).
+		WithStatusSubresource(tgw, refused, servable).
+		Build()
 	r := &Reconciler{Client: c, Scheme: s}
-	if _, err := r.Reconcile(context.TODO(), ctrl.Request{
-		NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"},
-	}); err != nil {
-		t.Fatalf("unexpected error: %v", err)
+	key := types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"}
+	if _, err := r.Reconcile(context.TODO(), ctrl.Request{NamespacedName: key}); err != nil {
+		t.Fatalf("reconcile: %v", err)
 	}
 
-	iss := &cmv1.Issuer{}
-	if err := c.Get(context.TODO(), types.NamespacedName{Name: "cozystack-gateway", Namespace: "tenant-foo"}, iss); err != nil {
-		t.Fatalf("get Issuer: %v", err)
+	if cond := acceptedCondition(t, c, "servable", "tenant-foo"); cond.Status != metav1.ConditionTrue {
+		t.Errorf("Accepted=%s reason=%s on the only route that can be served on %s: %q", cond.Status, cond.Reason, hostname, cond.Message)
 	}
-	if iss.Spec.ACME == nil || len(iss.Spec.ACME.Solvers) != 1 {
-		t.Fatalf("expected exactly one ACME solver, got %+v", iss.Spec.ACME)
+	if cond := acceptedCondition(t, c, "refused", "cozy-thing"); cond.Status != metav1.ConditionFalse {
+		t.Errorf("Accepted=%s on a route pinned to a passthrough listener: %q", cond.Status, cond.Message)
 	}
-	solver := iss.Spec.ACME.Solvers[0]
-	if solver.DNS01 == nil || solver.DNS01.Route53 == nil {
-		t.Fatalf("expected dns01.route53 solver, got %+v", solver)
+	gw := &gatewayv1.Gateway{}
+	if err := c.Get(context.TODO(), key, gw); err != nil {
+		t.Fatalf("get Gateway: %v", err)
 	}
-	r53 := solver.DNS01.Route53
-	if r53.Region != "us-east-1" {
-		t.Errorf("Route53 Region=%q, want us-east-1", r53.Region)
+	terminate, _ := listenerNamesByProtocol(gw, hostname)
+	if want := []string{perListenerName(hostname)}; !reflect.DeepEqual(terminate, want) {
+		t.Errorf("terminate listeners for %s = %v, want %v; the surviving claimant still needs one", hostname, terminate, want)
 	}
-	if r53.AccessKeyID != "AKIAIOSFODNN7EXAMPLE" {
-		t.Errorf("Route53 AccessKeyID=%q, want AKIAIOSFODNN7EXAMPLE", r53.AccessKeyID)
+	certs := &cmv1.CertificateList{}
+	if err := c.List(context.TODO(), certs); err != nil {
+		t.Fatalf("list Certificates: %v", err)
 	}
-	if r53.SecretAccessKey.Name != "aws-iam-secret" || r53.SecretAccessKey.Key != "secret-access-key" {
-		t.Errorf("Route53 SecretAccessKey ref=%+v, want name=aws-iam-secret key=secret-access-key", r53.SecretAccessKey)
+	if want := []string{perListenerCertName(tgw, hostname)}; !reflect.DeepEqual(certNamesOrdering(certs, hostname), want) {
+		t.Errorf("Certificates ordering %s = %v, want %v", hostname, certNamesOrdering(certs, hostname), want)
 	}
 }
 
-// TestReconcile_DNS01IssuerDigitalOceanSolver pins the DNS-01 +
-// digitalocean path. Mirrors the cloudflare/route53 solver tests so
-// every advertised provider has a Go-level pin.
-func TestReconcile_DNS01IssuerDigitalOceanSolver(t *testing.T) {
+// TestReconcile_HostnameClaimedOnlyByARefusedHTTPRouteEarnsNothing pins
+// the other half. A name whose every claimant this pass refused is a
+// name nothing can be served on, so rendering a terminate listener for
+// it orders an ACME certificate for a hostname no route reaches, which
+// is the cost collectHostnameClaims filters attachable routes to avoid.
+func TestReconcile_HostnameClaimedOnlyByARefusedHTTPRouteEarnsNothing(t *testing.T) {
+	const apex = "foo.example.com"
+	const hostname = "shop." + apex
 	s := newScheme(t)
 	tgw := &gatewayv1alpha1.TenantGateway{
 		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
 		Spec: gatewayv1alpha1.TenantGatewaySpec{
-			Apex:             "foo.example.com",
-			CertMode:         gatewayv1alpha1.CertModeDNS01,
-			GatewayClassName: "cilium",
-			DNS01: &gatewayv1alpha1.DNS01Config{
-				Provider: "digitalocean",
-				DigitalOcean: &gatewayv1alpha1.DigitalOceanDNS01{
-					TokenSecretRef: corev1.SecretKeySelector{
-						LocalObjectReference: corev1.LocalObjectReference{Name: "do-api-token"},
-						Key:                  "access-token",
-					},
-				},
-			},
+			Apex:                   apex,
+			CertMode:               gatewayv1alpha1.CertModeHTTP01,
+			GatewayClassName:       "cilium",
+			TLSPassthroughServices: []string{"api"},
 		},
 	}
-	c := fake.NewClientBuilder().WithScheme(s).WithObjects(tgw).WithStatusSubresource(tgw).Build()
+	refused := httpRouteAttached("refused", "tenant-foo", hostname)
+	section := gatewayv1.SectionName(passthroughListenerPrefix + "api")
+	refused.Spec.ParentRefs[0].SectionName = &section
 
+	c := fake.NewClientBuilder().
+		WithScheme(s).
+		WithObjects(tgw, refused).
+		WithStatusSubresource(tgw, refused).
+		Build()
 	r := &Reconciler{Client: c, Scheme: s}
-	if _, err := r.Reconcile(context.TODO(), ctrl.Request{
-		NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"},
-	}); err != nil {
-		t.Fatalf("unexpected error: %v", err)
+	key := types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"}
+	if _, err := r.Reconcile(context.TODO(), ctrl.Request{NamespacedName: key}); err != nil {
+		t.Fatalf("reconcile: %v", err)
 	}
 
-	iss := &cmv1.Issuer{}
-	if err := c.Get(context.TODO(), types.NamespacedName{Name: "cozystack-gateway", Namespace: "tenant-foo"}, iss); err != nil {
-		t.Fatalf("get Issuer: %v", err)
-	}
-	if iss.Spec.ACME == nil || len(iss.Spec.ACME.Solvers) != 1 {
-		t.Fatalf("expected exactly one ACME solver, got %+v", iss.Spec.ACME)
+	gw := &gatewayv1.Gateway{}
+	if err := c.Get(context.TODO(), key, gw); err != nil {
+		t.Fatalf("get Gateway: %v", err)
 	}
-	solver := iss.Spec.ACME.Solvers[0]
-	if solver.DNS01 == nil || solver.DNS01.DigitalOcean == nil {
-		t.Fatalf("expected dns01.digitalocean solver, got %+v", solver)
+	if terminate, _ := listenerNamesByProtocol(gw, hostname); len(terminate) != 0 {
+		t.Errorf("terminate listeners %v rendered for %s, whose only claimant this pass refused", terminate, hostname)
 	}
-	tok := solver.DNS01.DigitalOcean.Token
-	if tok.Name != "do-api-token" || tok.Key != "access-token" {
-		t.Errorf("DigitalOcean Token ref=%+v, want name=do-api-token key=access-token", tok)
+	certs := &cmv1.CertificateList{}
+	if err := c.List(context.TODO(), certs); err != nil {
+		t.Fatalf("list Certificates: %v", err)
+	}
+	if got := certNamesOrdering(certs, hostname); len(got) != 0 {
+		t.Errorf("Certificates %v ordered for %s, which no route reaches", got, hostname)
+	}
+	if cond := acceptedCondition(t, c, "refused", "tenant-foo"); cond.Status != metav1.ConditionFalse {
+		t.Errorf("Accepted=%s on the refused route: %q", cond.Status, cond.Message)
 	}
 }
 
-// TestReconcile_DNS01IssuerRFC2136Solver pins the DNS-01 + rfc2136
-// path (BIND-style dynamic update). The TSIG algorithm default is
-// also exercised — leaving it empty must produce HMACSHA256 in the
-// rendered solver, matching cert-manager's documented default.
-func TestReconcile_DNS01IssuerRFC2136Solver(t *testing.T) {
+// TestReconcile_HostnameLessTLSRouteShedsTheTerminateListenerAndCert
+// pins the upgrade shape for a TLSRoute that declares no hostnames. The
+// terminate listener and its certificate go because the declared entry
+// reserves the name. What the route itself adds is its verdict: it is
+// served on the hostname of the listener it pins, so it claims that
+// name and is told Accepted=True by this controller.
+//
+// Phase 1 builds the state to be shed with no passthrough listener
+// declared, the way the tlsPassthroughServices test above does. Phase 2
+// declares the native-port entry.
+func TestReconcile_HostnameLessTLSRouteShedsTheTerminateListenerAndCert(t *testing.T) {
+	const hostname = "postgres.foo.example.com"
 	s := newScheme(t)
 	tgw := &gatewayv1alpha1.TenantGateway{
 		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
 		Spec: gatewayv1alpha1.TenantGatewaySpec{
 			Apex:             "foo.example.com",
-			CertMode:         gatewayv1alpha1.CertModeDNS01,
+			CertMode:         gatewayv1alpha1.CertModeHTTP01,
 			GatewayClassName: "cilium",
-			DNS01: &gatewayv1alpha1.DNS01Config{
-				Provider: "rfc2136",
-				RFC2136: &gatewayv1alpha1.RFC2136DNS01{
-					Nameserver:  "ns1.example.test:53",
-					TSIGKeyName: "letsencrypt.example.test.",
-					// TSIGAlgorithm intentionally empty to pin the default.
-					TSIGSecretSecretRef: corev1.SecretKeySelector{
-						LocalObjectReference: corev1.LocalObjectReference{Name: "tsig-secret"},
-						Key:                  "tsig-secret-key",
-					},
-				},
-			},
 		},
 	}
-	c := fake.NewClientBuilder().WithScheme(s).WithObjects(tgw).WithStatusSubresource(tgw).Build()
+	route := httpRouteAttached("pg-http", "tenant-foo", hostname)
+	claimant := tlsRouteAttached("pg-tls", "tenant-foo", hostname, passthroughListenerPrefix+"pg", "tenant-foo")
+	// The whole point of the fixture: the route names the listener and
+	// leaves the hostname to it.
+	claimant.Spec.Hostnames = nil
 
+	c := fake.NewClientBuilder().
+		WithScheme(s).
+		WithObjects(tgw, route, claimant).
+		WithStatusSubresource(tgw, route, claimant).
+		Build()
 	r := &Reconciler{Client: c, Scheme: s}
-	if _, err := r.Reconcile(context.TODO(), ctrl.Request{
-		NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"},
-	}); err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
+	key := types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"}
 
-	iss := &cmv1.Issuer{}
-	if err := c.Get(context.TODO(), types.NamespacedName{Name: "cozystack-gateway", Namespace: "tenant-foo"}, iss); err != nil {
-		t.Fatalf("get Issuer: %v", err)
-	}
-	if iss.Spec.ACME == nil || len(iss.Spec.ACME.Solvers) != 1 {
-		t.Fatalf("expected exactly one ACME solver, got %+v", iss.Spec.ACME)
+	if _, err := r.Reconcile(context.TODO(), ctrl.Request{NamespacedName: key}); err != nil {
+		t.Fatalf("phase 1 reconcile: %v", err)
 	}
-	solver := iss.Spec.ACME.Solvers[0]
-	if solver.DNS01 == nil || solver.DNS01.RFC2136 == nil {
-		t.Fatalf("expected dns01.rfc2136 solver, got %+v", solver)
+	gw := &gatewayv1.Gateway{}
+	if err := c.Get(context.TODO(), key, gw); err != nil {
+		t.Fatalf("phase 1 get Gateway: %v", err)
 	}
-	r2136 := solver.DNS01.RFC2136
-	if r2136.Nameserver != "ns1.example.test:53" {
-		t.Errorf("RFC2136 Nameserver=%q, want ns1.example.test:53", r2136.Nameserver)
+	terminate, passthrough := listenerNamesByProtocol(gw, hostname)
+	if want := []string{perListenerName(hostname)}; !reflect.DeepEqual(terminate, want) {
+		t.Fatalf("phase 1 terminate listeners for %s = %v, want %v; without one there is nothing for phase 2 to shed", hostname, terminate, want)
 	}
-	if r2136.TSIGKeyName != "letsencrypt.example.test." {
-		t.Errorf("RFC2136 TSIGKeyName=%q, want letsencrypt.example.test.", r2136.TSIGKeyName)
+	if len(passthrough) != 0 {
+		t.Fatalf("phase 1 already carries passthrough listeners %v for %s, so the shed is not what phase 2 would measure", passthrough, hostname)
 	}
-	if r2136.TSIGAlgorithm != "HMACSHA256" {
-		t.Errorf("RFC2136 TSIGAlgorithm=%q, want HMACSHA256 (default)", r2136.TSIGAlgorithm)
+	preCerts := &cmv1.CertificateList{}
+	if err := c.List(context.TODO(), preCerts); err != nil {
+		t.Fatalf("phase 1 list Certificates: %v", err)
 	}
-	if r2136.TSIGSecret.Name != "tsig-secret" || r2136.TSIGSecret.Key != "tsig-secret-key" {
-		t.Errorf("RFC2136 TSIGSecret ref=%+v, want name=tsig-secret key=tsig-secret-key", r2136.TSIGSecret)
+	if got, want := certNamesOrdering(preCerts, hostname), []string{perListenerCertName(tgw, hostname)}; !reflect.DeepEqual(got, want) {
+		t.Fatalf("phase 1 Certificates ordering %s = %v, want %v; without one there is nothing for phase 2 to collect", hostname, got, want)
 	}
-}
 
-// TestReconcile_DNS01ProviderMissingConfigErrors pins the input-
-// validation surface added in round 6: each non-cloudflare provider
-// returns a deterministic error if the operator omits the matching
-// config block. Without these guards the controller would crash when
-// dereferencing the nil pointer (panic on a single misconfigured
-// tenant takes the controller down for the whole cluster).
-func TestReconcile_DNS01ProviderMissingConfigErrors(t *testing.T) {
-	cases := []struct {
-		name     string
-		dns01    *gatewayv1alpha1.DNS01Config
-		wantSubs string
-	}{
-		{
-			name: "route53 without route53 block",
-			dns01: &gatewayv1alpha1.DNS01Config{
-				Provider: "route53",
-			},
-			wantSubs: "dns01.route53",
-		},
-		{
-			name: "digitalocean without digitalocean block",
-			dns01: &gatewayv1alpha1.DNS01Config{
-				Provider: "digitalocean",
-			},
-			wantSubs: "dns01.digitalocean",
-		},
-		{
-			name: "rfc2136 without rfc2136 block",
-			dns01: &gatewayv1alpha1.DNS01Config{
-				Provider: "rfc2136",
-			},
-			wantSubs: "dns01.rfc2136",
-		},
-		{
-			name: "unknown provider",
-			dns01: &gatewayv1alpha1.DNS01Config{
-				Provider: "linode",
-			},
-			wantSubs: "unsupported dns01.provider",
-		},
+	updated := &gatewayv1alpha1.TenantGateway{}
+	if err := c.Get(context.TODO(), key, updated); err != nil {
+		t.Fatalf("get TenantGateway: %v", err)
 	}
-	for _, tc := range cases {
-		t.Run(tc.name, func(t *testing.T) {
-			tgw := &gatewayv1alpha1.TenantGateway{
-				ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
-				Spec: gatewayv1alpha1.TenantGatewaySpec{
-					Apex:             "foo.example.com",
-					CertMode:         gatewayv1alpha1.CertModeDNS01,
-					GatewayClassName: "cilium",
-					DNS01:            tc.dns01,
-				},
-			}
-			_, err := buildSolver(tgw)
-			if err == nil {
-				t.Fatalf("expected error for %s, got nil", tc.name)
-			}
-			if !strings.Contains(err.Error(), tc.wantSubs) {
-				t.Errorf("error=%q, want to contain %q", err.Error(), tc.wantSubs)
-			}
-		})
+	updated.Spec.TLSPassthroughListeners = []gatewayv1alpha1.TLSPassthroughListener{
+		{Name: "pg", Port: 5432, Hostname: hostname},
+	}
+	if err := c.Update(context.TODO(), updated); err != nil {
+		t.Fatalf("declare the native-port listener: %v", err)
+	}
+	if _, err := r.Reconcile(context.TODO(), ctrl.Request{NamespacedName: key}); err != nil {
+		t.Fatalf("phase 2 reconcile: %v", err)
 	}
-}
 
-func ptrNamespace(ns string) *gatewayv1.Namespace {
-	v := gatewayv1.Namespace(ns)
-	return &v
-}
+	if err := c.Get(context.TODO(), key, gw); err != nil {
+		t.Fatalf("phase 2 get Gateway: %v", err)
+	}
+	terminate, passthrough = listenerNamesByProtocol(gw, hostname)
+	if len(terminate) != 0 {
+		t.Errorf("terminate listeners %v for %s survived a TLSRoute the listener lends its hostname to: %+v", terminate, hostname, gw.Spec.Listeners)
+	}
+	if want := []string{passthroughListenerPrefix + "pg"}; !reflect.DeepEqual(passthrough, want) {
+		t.Errorf("passthrough listeners for %s = %v, want %v; with none the absent terminate listener proves nothing", hostname, passthrough, want)
+	}
+	postCerts := &cmv1.CertificateList{}
+	if err := c.List(context.TODO(), postCerts); err != nil {
+		t.Fatalf("phase 2 list Certificates: %v", err)
+	}
+	if got := certNamesOrdering(postCerts, hostname); len(got) != 0 {
+		t.Errorf("Certificates %v still order %s, which a passthrough listener now serves", got, hostname)
+	}
 
-func ptrSectionName(s string) *gatewayv1.SectionName {
-	v := gatewayv1.SectionName(s)
-	return &v
+	// Without the borrowed hostname the route would produce no claim
+	// and get no verdict from this controller.
+	cond := ourAcceptedCondition(t, c, "pg-tls", "tenant-foo")
+	if cond == nil {
+		t.Errorf("no Accepted condition under %s on the route the listener serves", testControllerName)
+	} else if cond.Status != metav1.ConditionTrue {
+		t.Errorf("Accepted=%s reason=%s on a route the passthrough listener serves: %q", cond.Status, cond.Reason, cond.Message)
+	}
+	if cond := acceptedCondition(t, c, "pg-http", "tenant-foo"); cond.Status != metav1.ConditionFalse {
+		t.Errorf("Accepted=%s on an HTTPRoute whose hostname a passthrough listener answers, so nothing terminates it: %q", cond.Status, cond.Message)
+	}
 }
 
-// TestReconcile_RefusesToTakeOverForeignGateway pins the safety
-// guard against silently rewriting a pre-existing Gateway that
-// happens to share the TenantGateway-derived name. Without the
-// ownerRef check, an operator who hand-crafted a Gateway named
-// `cozystack` in the tenant namespace would lose its config (spec
-// rewritten) AND have no cascade-delete chain back to the
-// TenantGateway (no OwnerReference established), leaving an orphan
-// after the TenantGateway is deleted.
-func TestReconcile_RefusesToTakeOverForeignGateway(t *testing.T) {
+// TestReconcile_HostnameLessTLSRoutePinnedToAnAbsentListenerGetsNoVerdict
+// pins the boundary of that substitution. The hostname a route with no
+// spec.hostnames is served on comes from the listener its sectionName
+// names, so a name this Gateway renders no listener for lends it
+// nothing: there is no hostname to judge the route on and none to
+// withdraw from anyone, and the refusals this controller writes are all
+// keyed to one. Cilium reports such a parentRef under its own
+// controllerName.
+//
+// Without the sectionName filter the route would inherit every rendered
+// passthrough hostname instead, and be told it is served on names its
+// parentRef excludes.
+func TestReconcile_HostnameLessTLSRoutePinnedToAnAbsentListenerGetsNoVerdict(t *testing.T) {
 	s := newScheme(t)
 	tgw := &gatewayv1alpha1.TenantGateway{
 		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
 		Spec: gatewayv1alpha1.TenantGatewaySpec{
-			Apex:             "foo.example.com",
-			CertMode:         gatewayv1alpha1.CertModeHTTP01,
-			GatewayClassName: "cilium",
-		},
-	}
-	// Foreign Gateway with the same NamespacedName but no OwnerReference.
-	foreign := &gatewayv1.Gateway{
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      "cozystack",
-			Namespace: "tenant-foo",
-			Labels: map[string]string{
-				"author":              "operator-by-hand",
-				"some.other/operator": "controlled",
-			},
-		},
-		Spec: gatewayv1.GatewaySpec{
-			GatewayClassName: gatewayv1.ObjectName("not-cilium"),
-			Listeners: []gatewayv1.Listener{
-				{Name: "operator-port", Port: 9999, Protocol: gatewayv1.HTTPProtocolType},
-			},
+			Apex:                   "foo.example.com",
+			CertMode:               gatewayv1alpha1.CertModeHTTP01,
+			GatewayClassName:       "cilium",
+			TLSPassthroughServices: []string{"svc"},
 		},
 	}
-	c := fake.NewClientBuilder().WithScheme(s).WithObjects(tgw, foreign).WithStatusSubresource(tgw).Build()
+	route := tlsRouteAttached("orphan", "tenant-foo", "svc.foo.example.com", passthroughListenerPrefix+"absent", "tenant-foo")
+	route.Spec.Hostnames = nil
 
+	c := fake.NewClientBuilder().
+		WithScheme(s).
+		WithObjects(tgw, route).
+		WithStatusSubresource(tgw, route).
+		Build()
 	r := &Reconciler{Client: c, Scheme: s}
-	_, err := r.Reconcile(context.TODO(), ctrl.Request{
+	if _, err := r.Reconcile(context.TODO(), ctrl.Request{
 		NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"},
-	})
-	if err == nil {
-		t.Fatalf("expected Reconcile to surface a takeover-refusal error, got nil")
-	}
-	if !strings.Contains(err.Error(), "not owned by TenantGateway") {
-		t.Errorf("expected error mentioning ownership refusal, got: %v", err)
+	}); err != nil {
+		t.Fatalf("unexpected error: %v", err)
 	}
 
-	// The foreign Gateway must NOT be modified.
-	got := &gatewayv1.Gateway{}
-	if err := c.Get(context.TODO(), types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"}, got); err != nil {
-		t.Fatalf("get Gateway: %v", err)
+	if cond := ourAcceptedCondition(t, c, "orphan", "tenant-foo"); cond != nil {
+		t.Errorf("this controller judged a route no rendered listener lends a hostname to: %s/%s %q", cond.Status, cond.Reason, cond.Message)
 	}
-	if string(got.Spec.GatewayClassName) != "not-cilium" {
-		t.Errorf("foreign Gateway.Spec was overwritten: gatewayClassName=%q, want not-cilium", got.Spec.GatewayClassName)
+}
+
+// TestReconcile_HostnameLessTLSRouteEntryIsRetractedWhenItsListenerGoes
+// pins the other end of that substitution. A route with no
+// spec.hostnames borrows its hostname from the listener its sectionName
+// names, so its claim exists only while that listener is rendered.
+// Remove the tlsPassthroughServices entry behind it and the claim goes
+// with it, which takes the route out of the set the status pass walks —
+// and the verdict written on the previous pass is then the only thing
+// left describing a listener the Gateway no longer has.
+//
+// A route that declares hostnames is not exposed to this: its claim
+// comes from its own spec and survives any listener change, so it is
+// re-judged on every pass. That difference is why the retraction is
+// keyed on attachment rather than on the claim set.
+func TestReconcile_HostnameLessTLSRouteEntryIsRetractedWhenItsListenerGoes(t *testing.T) {
+	s := newScheme(t)
+	tgw := &gatewayv1alpha1.TenantGateway{
+		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
+		Spec: gatewayv1alpha1.TenantGatewaySpec{
+			Apex:                   "foo.example.com",
+			CertMode:               gatewayv1alpha1.CertModeHTTP01,
+			GatewayClassName:       "cilium",
+			TLSPassthroughServices: []string{"svc"},
+		},
 	}
-	if len(got.Spec.Listeners) != 1 || got.Spec.Listeners[0].Port != 9999 {
-		t.Errorf("foreign Gateway listeners were overwritten: %+v", got.Spec.Listeners)
+	route := tlsRouteAttached("borrower", "tenant-foo", "svc.foo.example.com", passthroughListenerPrefix+"svc", "tenant-foo")
+	route.Spec.Hostnames = nil
+
+	c := fake.NewClientBuilder().
+		WithScheme(s).
+		WithObjects(tgw, route).
+		WithStatusSubresource(tgw, route).
+		Build()
+	r := &Reconciler{Client: c, Scheme: s}
+	req := ctrl.Request{NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"}}
+	if _, err := r.Reconcile(context.TODO(), req); err != nil {
+		t.Fatalf("unexpected error: %v", err)
 	}
-	if got.Labels["author"] != "operator-by-hand" {
-		t.Errorf("foreign label scrubbed: labels=%+v", got.Labels)
+	if cond := ourAcceptedCondition(t, c, "borrower", "tenant-foo"); cond == nil {
+		t.Fatal("the route was not judged while its listener was rendered, so the retraction below would prove nothing")
 	}
 
-	// Status condition should reflect the failure (Ready=False with
-	// the takeover error captured).
-	updated := &gatewayv1alpha1.TenantGateway{}
-	if err := c.Get(context.TODO(), types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"}, updated); err != nil {
+	live := &gatewayv1alpha1.TenantGateway{}
+	if err := c.Get(context.TODO(), req.NamespacedName, live); err != nil {
 		t.Fatalf("get TenantGateway: %v", err)
 	}
-	hasReadyFalse := false
-	for _, cond := range updated.Status.Conditions {
-		if cond.Type == "Ready" && cond.Status == metav1.ConditionFalse && cond.Reason == "ReconcileError" {
-			hasReadyFalse = true
-			break
-		}
+	live.Spec.TLSPassthroughServices = nil
+	if err := c.Update(context.TODO(), live); err != nil {
+		t.Fatalf("update TenantGateway: %v", err)
 	}
-	if !hasReadyFalse {
-		t.Errorf("expected Ready=False ReconcileError on TenantGateway status, got %+v", updated.Status.Conditions)
+	if _, err := r.Reconcile(context.TODO(), req); err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+
+	if cond := ourAcceptedCondition(t, c, "borrower", "tenant-foo"); cond != nil {
+		t.Errorf("this controller kept a verdict on a route that now selects no listener: %s/%s %q", cond.Status, cond.Reason, cond.Message)
 	}
 }
 
-// TestReconcile_RefusesToTakeOverForeignRedirectRoute pins the same
-// guard for the controller-owned http→https redirect HTTPRoute. A
-// pre-existing HTTPRoute named `<tgw>-http-redirect` could otherwise
-// be silently rewritten and orphaned.
-func TestReconcile_RefusesToTakeOverForeignRedirectRoute(t *testing.T) {
+// TestReconcile_BorrowedHostnamesStopAtListenersTheRouteCanAttachTo
+// pins which listeners lend their hostname to a route that declares
+// none. A native-port listener admits the publishing tenant alone, so
+// no route from elsewhere attaches to it or is served on its
+// hostname; a port-443 passthrough listener takes every attached
+// namespace and does lend. Borrowing from both
+// hands a route a name its own object does not carry and then refuses
+// it for the namespace, in the same pass that sheds a terminate
+// listener because the very same route is serving the name it did
+// borrow legitimately.
+//
+// The shed is asserted alongside, because it is what makes the verdict
+// mean something: without it the route would be accepted for the
+// trivial reason that it claimed nothing at all.
+func TestReconcile_BorrowedHostnamesStopAtListenersTheRouteCanAttachTo(t *testing.T) {
+	const apex = "foo.example.com"
+	const served = "api." + apex
+	const native = "pg." + apex
 	s := newScheme(t)
 	tgw := &gatewayv1alpha1.TenantGateway{
 		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
 		Spec: gatewayv1alpha1.TenantGatewaySpec{
-			Apex:             "foo.example.com",
-			CertMode:         gatewayv1alpha1.CertModeHTTP01,
-			GatewayClassName: "cilium",
-		},
-	}
-	foreign := &gatewayv1.HTTPRoute{
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      "cozystack-http-redirect",
-			Namespace: "tenant-foo",
-		},
-		Spec: gatewayv1.HTTPRouteSpec{
-			Hostnames: []gatewayv1.Hostname{"operator.foo.example.com"},
+			Apex:                   apex,
+			CertMode:               gatewayv1alpha1.CertModeHTTP01,
+			GatewayClassName:       "cilium",
+			AttachedNamespaces:     []string{"cozy-extra"},
+			TLSPassthroughServices: []string{"api"},
+			TLSPassthroughListeners: []gatewayv1alpha1.TLSPassthroughListener{
+				{Name: "pg", Port: 5432, Hostname: native},
+			},
 		},
 	}
-	c := fake.NewClientBuilder().WithScheme(s).WithObjects(tgw, foreign).WithStatusSubresource(tgw, &gatewayv1.HTTPRoute{}).Build()
+	// No hostnames and no sectionName: the route takes whatever every
+	// listener it can attach to lends it.
+	wide := tlsRouteAttached("wide", "cozy-extra", served, passthroughListenerPrefix+"api", "tenant-foo")
+	wide.Spec.Hostnames = nil
+	wide.Spec.ParentRefs[0].SectionName = nil
+	claimant := httpRouteAttachedTo("app", "cozy-extra", served, "tenant-foo")
 
+	c := fake.NewClientBuilder().
+		WithScheme(s).
+		WithObjects(tgw, wide, claimant).
+		WithStatusSubresource(tgw, wide, claimant).
+		Build()
 	r := &Reconciler{Client: c, Scheme: s}
-	_, err := r.Reconcile(context.TODO(), ctrl.Request{
-		NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"},
-	})
-	if err == nil {
-		t.Fatalf("expected Reconcile to surface a takeover-refusal error, got nil")
+	key := types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"}
+	if _, err := r.Reconcile(context.TODO(), ctrl.Request{NamespacedName: key}); err != nil {
+		t.Fatalf("unexpected error: %v", err)
 	}
-	if !strings.Contains(err.Error(), "not owned by TenantGateway") {
-		t.Errorf("expected error mentioning ownership refusal, got: %v", err)
+
+	gw := &gatewayv1.Gateway{}
+	if err := c.Get(context.TODO(), key, gw); err != nil {
+		t.Fatalf("get Gateway: %v", err)
+	}
+	terminate, passthrough := listenerNamesByProtocol(gw, served)
+	if len(passthrough) == 0 {
+		t.Fatalf("no passthrough listener answers %s, so nothing lends the route a hostname: %+v", served, gw.Spec.Listeners)
+	}
+	if len(terminate) != 0 {
+		t.Fatalf("terminate listeners %v still answer %s; the route is not serving the name it borrowed, so the verdict below would prove nothing", terminate, served)
 	}
 
-	// The foreign HTTPRoute hostnames must be preserved.
-	got := &gatewayv1.HTTPRoute{}
-	if err := c.Get(context.TODO(), types.NamespacedName{Name: "cozystack-http-redirect", Namespace: "tenant-foo"}, got); err != nil {
-		t.Fatalf("get HTTPRoute: %v", err)
+	cond := ourAcceptedCondition(t, c, "wide", "cozy-extra")
+	if cond == nil {
+		t.Fatal("no verdict on a route this controller withdrew a listener for")
 	}
-	if len(got.Spec.Hostnames) != 1 || got.Spec.Hostnames[0] != "operator.foo.example.com" {
-		t.Errorf("foreign HTTPRoute spec overwritten: %+v", got.Spec)
+	if strings.Contains(cond.Message, native) {
+		t.Errorf("the route was judged on %s, a hostname only a tenant-only listener answers and its own object never names: %s/%s %q", native, cond.Status, cond.Reason, cond.Message)
+	}
+	if cond.Status != metav1.ConditionTrue {
+		t.Errorf("Accepted=%s/%s %q; the route attached to the port-443 passthrough listener and is served there", cond.Status, cond.Reason, cond.Message)
 	}
 }
 
-// TestReconcile_RefusesToTakeOverForeignIssuer pins the takeover-
-// guard symmetry across reconcileIssuer. Same shape as the Gateway
-// and HTTPRoute guards: a foreign Issuer with the controller-derived
-// name must not have its spec silently rewritten.
-func TestReconcile_RefusesToTakeOverForeignIssuer(t *testing.T) {
+// TestReconcile_HTTPRoutePinnedToAPassthroughListenerIsRefused pins the
+// verdict on a parentRef that can never be served. A TLS-passthrough
+// listener forwards the stream it matched by SNI and terminates
+// nothing, and the kinds a TLS listener takes come from the protocol,
+// which is TLSRoute alone, so an HTTPRoute naming one by sectionName
+// selects a listener that cannot serve it; the terminate listener
+// rendered for the same hostname carries a content-addressed name of
+// its own.
+//
+// Both listener families are covered because they differ in exactly
+// the field this could have been read off. The port-443 listeners name
+// HTTPRoute in allowedRoutes.kinds to keep every port-443 set uniform
+// (cilium#45559), which the Gateway reports back as
+// ResolvedRefs=False/InvalidRouteKinds rather than as a grant, while
+// the native-port listeners declare no kinds at all. The verdict is the
+// same on both.
+//
+// Nothing else is bound to tell the route: the port-443 listeners list
+// HTTPRoute among their kinds, so whether the Gateway controller refuses
+// such a route is left to the implementation.
+//
+// A route claiming the same hostname with no sectionName is refused
+// for the reservation instead, and one naming a listener outside the
+// passthrough set is not judged by this rule at all.
+func TestReconcile_HTTPRoutePinnedToAPassthroughListenerIsRefused(t *testing.T) {
+	const apex = "foo.example.com"
 	s := newScheme(t)
 	tgw := &gatewayv1alpha1.TenantGateway{
 		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
 		Spec: gatewayv1alpha1.TenantGatewaySpec{
-			Apex:             "foo.example.com",
-			CertMode:         gatewayv1alpha1.CertModeHTTP01,
-			GatewayClassName: "cilium",
-		},
-	}
-	foreign := &cmv1.Issuer{
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      "cozystack-gateway",
-			Namespace: "tenant-foo",
-		},
-		Spec: cmv1.IssuerSpec{
-			IssuerConfig: cmv1.IssuerConfig{SelfSigned: &cmv1.SelfSignedIssuer{}},
+			Apex:                   apex,
+			CertMode:               gatewayv1alpha1.CertModeHTTP01,
+			GatewayClassName:       "cilium",
+			TLSPassthroughServices: []string{"api", "db"},
+			TLSPassthroughListeners: []gatewayv1alpha1.TLSPassthroughListener{
+				{Name: "pg", Port: 5432, Hostname: "pg." + apex},
+			},
 		},
 	}
-	c := fake.NewClientBuilder().WithScheme(s).WithObjects(tgw, foreign).WithStatusSubresource(tgw).Build()
+	pinned := httpRouteAttached("pinned", "tenant-foo", "api."+apex)
+	pinnedSection := gatewayv1.SectionName(passthroughListenerPrefix + "api")
+	pinned.Spec.ParentRefs[0].SectionName = &pinnedSection
+	unpinned := httpRouteAttached("unpinned", "tenant-foo", "api."+apex)
+	elsewhere := httpRouteAttached("elsewhere", "tenant-foo", "shop."+apex)
+	httpSection := gatewayv1.SectionName("http")
+	elsewhere.Spec.ParentRefs[0].SectionName = &httpSection
+	// A hostname a TLSRoute already carries, so this route is hit by
+	// two truths at once: the listener it pinned refuses its kind, and
+	// nothing terminates the name any more. The first is the one its
+	// owner can act on, and it has to be the reason as well as part of
+	// the message.
+	answered := httpRouteAttached("answered", "tenant-foo", "db."+apex)
+	answeredSection := gatewayv1.SectionName(passthroughListenerPrefix + "db")
+	answered.Spec.ParentRefs[0].SectionName = &answeredSection
+	claimant := passthroughTLSRoute("db-tls", "tenant-foo", "db."+apex, "db")
+	// The other listener family: no allowedRoutes.kinds at all, so the
+	// verdict cannot be coming from the HTTPRoute entry the port-443
+	// listeners carry.
+	native := httpRouteAttached("native", "tenant-foo", "pg."+apex)
+	nativeSection := gatewayv1.SectionName(passthroughListenerPrefix + "pg")
+	native.Spec.ParentRefs[0].SectionName = &nativeSection
+	// A passthrough section this Gateway does not render. The name is
+	// what the route's owner has to fix, and a TLSRoute in the same
+	// shape is told so, so an HTTPRoute is too rather than earning a
+	// terminate listener it can never attach to.
+	absent := httpRouteAttached("absent", "tenant-foo", "absent."+apex)
+	absentSection := gatewayv1.SectionName(passthroughListenerPrefix + "absent")
+	absent.Spec.ParentRefs[0].SectionName = &absentSection
 
+	c := fake.NewClientBuilder().
+		WithScheme(s).
+		WithObjects(tgw, pinned, unpinned, elsewhere, answered, native, absent, claimant).
+		WithStatusSubresource(tgw, pinned, unpinned, elsewhere, answered, native, absent, claimant).
+		Build()
 	r := &Reconciler{Client: c, Scheme: s}
-	_, err := r.Reconcile(context.TODO(), ctrl.Request{
+	if _, err := r.Reconcile(context.TODO(), ctrl.Request{
 		NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"},
-	})
-	if err == nil {
-		t.Fatalf("expected takeover refusal, got nil")
-	}
-	if !strings.Contains(err.Error(), "not owned by TenantGateway") {
-		t.Errorf("expected ownership-refusal error, got %v", err)
+	}); err != nil {
+		t.Fatalf("unexpected error: %v", err)
 	}
 
-	got := &cmv1.Issuer{}
-	if err := c.Get(context.TODO(), types.NamespacedName{Name: "cozystack-gateway", Namespace: "tenant-foo"}, got); err != nil {
-		t.Fatalf("get Issuer: %v", err)
-	}
-	if got.Spec.SelfSigned == nil {
-		t.Errorf("foreign SelfSigned Issuer was rewritten to ACME, spec=%+v", got.Spec)
+	for _, tc := range []struct {
+		name     string
+		accepted bool
+		reason   string
+		msgHas   string
+		// msgLacks is checked only when set, and only one row needs it:
+		// a route hit by two causes reports both in the message, which
+		// would leave the actionable one indistinguishable from the
+		// second and take the reason with it.
+		msgLacks string
+	}{
+		{"pinned", false, string(gatewayv1.RouteReasonNotAllowedByListeners), passthroughListenerPrefix + "api", ""},
+		{"answered", false, string(gatewayv1.RouteReasonNotAllowedByListeners), passthroughListenerPrefix + "db", "answered by"},
+		{"native", false, string(gatewayv1.RouteReasonNotAllowedByListeners), passthroughListenerPrefix + "pg", ""},
+		{"absent", false, string(gatewayv1.RouteReasonNoMatchingParent), passthroughListenerPrefix + "absent", ""},
+		{"unpinned", false, string(gatewayv1.RouteReasonNoMatchingListenerHostname), "answered by a TLS-passthrough listener", ""},
+		{"elsewhere", true, "", "", ""},
+	} {
+		cond := acceptedCondition(t, c, tc.name, "tenant-foo")
+		if tc.accepted && cond.Status != metav1.ConditionTrue {
+			t.Errorf("%s: Accepted=%s reason=%s, want True: %q", tc.name, cond.Status, cond.Reason, cond.Message)
+			continue
+		}
+		if !tc.accepted && cond.Status != metav1.ConditionFalse {
+			t.Errorf("%s: Accepted=%s, want False; a Passthrough listener admits TLSRoute alone: %q", tc.name, cond.Status, cond.Message)
+			continue
+		}
+		if tc.reason != "" && cond.Reason != tc.reason {
+			t.Errorf("%s: reason %s, want %s: %q", tc.name, cond.Reason, tc.reason, cond.Message)
+		}
+		if tc.msgHas != "" && !strings.Contains(cond.Message, tc.msgHas) {
+			t.Errorf("%s: message does not name the section the route pinned: %q", tc.name, cond.Message)
+		}
+		if tc.msgLacks != "" && strings.Contains(cond.Message, tc.msgLacks) {
+			t.Errorf("%s: message carries a second cause beside the one its owner can act on: %q", tc.name, cond.Message)
+		}
 	}
 }
 
-// TestReconcile_RefusesToTakeOverForeignWildcardCertificate pins the
-// takeover-guard for the DNS-01 wildcard Certificate path.
-func TestReconcile_RefusesToTakeOverForeignWildcardCertificate(t *testing.T) {
+// TestReconcile_WildcardClaimAttachableOnAServiceListenerIsNotRefused
+// pins that the refusal is decided by the whole overlap set, not by
+// whichever reserved name sorts first. A wildcard claim overlaps every
+// reserved hostname under the apex, and those come in two kinds: the
+// port-443 entries a route from any attached namespace can attach to,
+// and the native-port ones only the tenant can. Picking the name for
+// the message is a stability choice; letting that pick decide the
+// verdict makes the answer depend on the alphabet.
+//
+// Here the route attaches to tls-zzz on 443 and is served. The native
+// port entry sorts first only because "aa" precedes "zzz".
+func TestReconcile_WildcardClaimAttachableOnAServiceListenerIsNotRefused(t *testing.T) {
 	s := newScheme(t)
 	tgw := &gatewayv1alpha1.TenantGateway{
 		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
 		Spec: gatewayv1alpha1.TenantGatewaySpec{
-			Apex:             "foo.example.com",
-			CertMode:         gatewayv1alpha1.CertModeDNS01,
-			GatewayClassName: "cilium",
-			DNS01: &gatewayv1alpha1.DNS01Config{
-				Provider: "cloudflare",
-				Cloudflare: &gatewayv1alpha1.CloudflareDNS01{
-					APITokenSecretRef: corev1.SecretKeySelector{
-						LocalObjectReference: corev1.LocalObjectReference{Name: "cf-token"},
-						Key:                  "api-token",
-					},
-				},
+			Apex:                   "foo.example.com",
+			CertMode:               gatewayv1alpha1.CertModeHTTP01,
+			GatewayClassName:       "cilium",
+			AttachedNamespaces:     []string{"default"},
+			TLSPassthroughServices: []string{"zzz"},
+			TLSPassthroughListeners: []gatewayv1alpha1.TLSPassthroughListener{
+				{Name: "aa", Port: 5432, Hostname: "aa.foo.example.com"},
 			},
 		},
 	}
-	foreign := &cmv1.Certificate{
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      "cozystack-gateway-tls",
-			Namespace: "tenant-foo",
-		},
-		Spec: cmv1.CertificateSpec{
-			SecretName: "operator-pinned-secret",
-			DNSNames:   []string{"operator.foo.example.com"},
-		},
-	}
-	c := fake.NewClientBuilder().WithScheme(s).WithObjects(tgw, foreign).WithStatusSubresource(tgw).Build()
+	route := tlsRouteAttached("wild", "default", "*.foo.example.com", "tls-zzz", "tenant-foo")
+
+	c := fake.NewClientBuilder().
+		WithScheme(s).
+		WithObjects(tgw, route).
+		WithStatusSubresource(tgw, route).
+		Build()
 
 	r := &Reconciler{Client: c, Scheme: s}
-	_, err := r.Reconcile(context.TODO(), ctrl.Request{
+	if _, err := r.Reconcile(context.TODO(), ctrl.Request{
 		NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"},
-	})
-	if err == nil {
-		t.Fatalf("expected takeover refusal, got nil")
-	}
-	if !strings.Contains(err.Error(), "not owned by TenantGateway") {
-		t.Errorf("expected ownership-refusal error, got %v", err)
+	}); err != nil {
+		t.Fatalf("unexpected error: %v", err)
 	}
 
-	got := &cmv1.Certificate{}
-	if err := c.Get(context.TODO(), types.NamespacedName{Name: "cozystack-gateway-tls", Namespace: "tenant-foo"}, got); err != nil {
-		t.Fatalf("get Certificate: %v", err)
+	got := &gatewayv1alpha2.TLSRoute{}
+	if err := c.Get(context.TODO(), types.NamespacedName{Name: "wild", Namespace: "default"}, got); err != nil {
+		t.Fatalf("get route: %v", err)
 	}
-	if got.Spec.SecretName != "operator-pinned-secret" {
-		t.Errorf("foreign Certificate.Spec.SecretName overwritten: %q", got.Spec.SecretName)
+	var accepted *metav1.Condition
+	for _, ps := range got.Status.Parents {
+		if string(ps.ControllerName) != testControllerName {
+			continue
+		}
+		for i := range ps.Conditions {
+			if ps.Conditions[i].Type == "Accepted" {
+				accepted = &ps.Conditions[i]
+			}
+		}
+	}
+	if accepted == nil {
+		t.Fatalf("no Accepted condition under %s: %+v", testControllerName, got.Status.Parents)
+	}
+	if accepted.Status != metav1.ConditionTrue {
+		t.Errorf("route attachable on the port-443 listener reports Accepted=%s reason=%s: %q", accepted.Status, accepted.Reason, accepted.Message)
 	}
 }
 
-// TestReconcile_RefusesToTakeOverForeignPerListenerCertificate pins
-// the takeover-guard for the HTTP-01 per-listener Certificate path.
-// A pre-existing Certificate whose derived name matches our
-// hostname-keyed naming scheme must not be silently rewritten.
-func TestReconcile_RefusesToTakeOverForeignPerListenerCertificate(t *testing.T) {
+// TestReconcile_UnansweredNameDoesNotDenyAListenerTheRouteNamed pins
+// the message on a route that is unserved for two reasons at once. The
+// hostname it claims is answered by nothing, which is the branch that
+// tells an operator this Gateway declares no passthrough listener; but
+// the route also names one in its parentRef, and that listener exists.
+// Saying the Gateway declares none is false to the reader in the one
+// moment they came to check, and it hides the fixable half: the
+// listener they named answers a different hostname.
+func TestReconcile_UnansweredNameDoesNotDenyAListenerTheRouteNamed(t *testing.T) {
+	const (
+		apex   = "foo.example.com"
+		wanted = "redis." + apex
+	)
 	s := newScheme(t)
 	tgw := &gatewayv1alpha1.TenantGateway{
 		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
 		Spec: gatewayv1alpha1.TenantGatewaySpec{
-			Apex:             "foo.example.com",
+			Apex:             apex,
 			CertMode:         gatewayv1alpha1.CertModeHTTP01,
 			GatewayClassName: "cilium",
+			TLSPassthroughListeners: []gatewayv1alpha1.TLSPassthroughListener{
+				{Name: "pg", Port: 5432, Hostname: "pg." + apex},
+			},
 		},
 	}
-	route := &gatewayv1.HTTPRoute{
-		ObjectMeta: metav1.ObjectMeta{Name: "harbor", Namespace: "tenant-foo"},
-		Spec: gatewayv1.HTTPRouteSpec{
-			Hostnames: []gatewayv1.Hostname{"harbor.foo.example.com"},
-			CommonRouteSpec: gatewayv1.CommonRouteSpec{
-				ParentRefs: []gatewayv1.ParentReference{
-					{
-						Group:     ptrGroup(gatewayv1.GroupName),
-						Kind:      ptrKind("Gateway"),
-						Name:      "cozystack",
-						Namespace: ptrNamespace("tenant-foo"),
-					},
-				},
+	// Named listener rendered vs named listener absent: the message
+	// has to differ, and the second row is what keeps the first from
+	// being satisfied by naming any section at all.
+	for _, tc := range []struct {
+		name     string
+		section  string
+		msgHas   string
+		msgLacks string
+	}{
+		{"names a rendered listener that answers another hostname", "tls-pg", "tls-pg", "does not declare"},
+		{"names no rendered listener", "tls-absent", "does not declare", "tls-absent"},
+	} {
+		t.Run(tc.name, func(t *testing.T) {
+			route := tlsRouteAttached("r", "tenant-foo", wanted, tc.section, "tenant-foo")
+			c := fake.NewClientBuilder().
+				WithScheme(s).
+				WithObjects(tgw.DeepCopy(), route).
+				WithStatusSubresource(tgw, &gatewayv1alpha2.TLSRoute{}).
+				Build()
+
+			r := &Reconciler{Client: c, Scheme: s}
+			if _, err := r.Reconcile(context.TODO(), ctrl.Request{
+				NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"},
+			}); err != nil {
+				t.Fatalf("unexpected error: %v", err)
+			}
+
+			got := &gatewayv1alpha2.TLSRoute{}
+			if err := c.Get(context.TODO(), types.NamespacedName{Name: "r", Namespace: "tenant-foo"}, got); err != nil {
+				t.Fatalf("get route: %v", err)
+			}
+			accepted := acceptedCondition2(got.Status.Parents)
+			if accepted == nil {
+				t.Fatalf("no Accepted condition under %s: %+v", testControllerName, got.Status.Parents)
+			}
+			if accepted.Status != metav1.ConditionFalse {
+				t.Fatalf("Accepted=%s: nothing answers %s", accepted.Status, wanted)
+			}
+			if !strings.Contains(accepted.Message, tc.msgHas) {
+				t.Errorf("message lacks %q: %q", tc.msgHas, accepted.Message)
+			}
+			if strings.Contains(accepted.Message, tc.msgLacks) {
+				t.Errorf("message carries %q, which is not true of this route: %q", tc.msgLacks, accepted.Message)
+			}
+		})
+	}
+}
+
+// TestTenantGatewayDeepCopyDoesNotAliasPassthroughListeners pins the
+// generated deepcopy for the new field. controller-runtime hands
+// callers a DeepCopy of the cached object precisely so that a mutation
+// cannot reach the cache, and a slice that is copied by header rather
+// than by contents defeats that: writing through the copy writes
+// through the original.
+//
+// The test lives here rather than beside the type because CI runs
+// ./internal/... and ./pkg/..., never ./api/..., so a test next to the
+// generated code would never be executed. Reverting
+// zz_generated.deepcopy.go to the merge base leaves every other test in
+// this package green, which is what this one exists to stop.
+func TestTenantGatewayDeepCopyDoesNotAliasPassthroughListeners(t *testing.T) {
+	tgw := &gatewayv1alpha1.TenantGateway{
+		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
+		Spec: gatewayv1alpha1.TenantGatewaySpec{
+			Apex: "foo.example.com",
+			TLSPassthroughListeners: []gatewayv1alpha1.TLSPassthroughListener{
+				{Name: "pg", Port: 5432, Hostname: "pg.foo.example.com"},
 			},
 		},
 	}
-	// Build the expected derived per-listener cert name and pre-create
-	// a foreign Certificate at it.
-	expectedCertName := perListenerCertName(tgw, "harbor.foo.example.com")
-	foreign := &cmv1.Certificate{
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      expectedCertName,
-			Namespace: "tenant-foo",
-		},
-		Spec: cmv1.CertificateSpec{
-			SecretName: "operator-pinned-cert",
-			DNSNames:   []string{"operator-version.foo.example.com"},
+	cp := tgw.DeepCopy()
+	if len(cp.Spec.TLSPassthroughListeners) != 1 {
+		t.Fatalf("copy carries %d listeners, want 1", len(cp.Spec.TLSPassthroughListeners))
+	}
+	cp.Spec.TLSPassthroughListeners[0].Hostname = "mutated.foo.example.com"
+	cp.Spec.TLSPassthroughListeners[0].Port = 1
+	if got := tgw.Spec.TLSPassthroughListeners[0].Hostname; got != "pg.foo.example.com" {
+		t.Errorf("writing through the copy changed the original hostname to %q: the slice is shared", got)
+	}
+	if got := tgw.Spec.TLSPassthroughListeners[0].Port; got != 5432 {
+		t.Errorf("writing through the copy changed the original port to %d: the slice is shared", got)
+	}
+}
+
+// TestReconcile_LoserWithABogusSectionStillHearsItLost pins the other
+// side of the unservable-section handling. Keeping such a route out of
+// the ownership race must not also erase a loss it already recorded:
+// the route claimed a hostname another route holds, and that is true
+// whatever its sectionName says. Writing nothing for it is right;
+// deleting what the race wrote is not, because the route then falls
+// through to the happy path and reports Accepted=True.
+func TestReconcile_LoserWithABogusSectionStillHearsItLost(t *testing.T) {
+	const (
+		apex      = "foo.example.com"
+		contested = "svc." + apex
+	)
+	s := newScheme(t)
+	tgw := &gatewayv1alpha1.TenantGateway{
+		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
+		Spec: gatewayv1alpha1.TenantGatewaySpec{
+			Apex:                   apex,
+			CertMode:               gatewayv1alpha1.CertModeHTTP01,
+			GatewayClassName:       "cilium",
+			AttachedNamespaces:     []string{"default"},
+			TLSPassthroughServices: []string{"svc"},
 		},
 	}
-	c := fake.NewClientBuilder().WithScheme(s).WithObjects(tgw, route, foreign).WithStatusSubresource(tgw, &gatewayv1.HTTPRoute{}).Build()
+	// "default" sorts first, so the attachable route wins the race and
+	// the one in tenant-foo is the loser. Its section names nothing,
+	// which is what used to erase the loss.
+	winner := tlsRouteAttached("a", "default", contested, "tls-svc", "tenant-foo")
+	loser := tlsRouteAttached("b", "tenant-foo", contested, "tls-absent", "tenant-foo")
+
+	c := fake.NewClientBuilder().
+		WithScheme(s).
+		WithObjects(tgw, winner, loser).
+		WithStatusSubresource(tgw, winner, loser).
+		Build()
 
 	r := &Reconciler{Client: c, Scheme: s}
-	_, err := r.Reconcile(context.TODO(), ctrl.Request{
+	if _, err := r.Reconcile(context.TODO(), ctrl.Request{
 		NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"},
-	})
-	if err == nil {
-		t.Fatalf("expected takeover refusal, got nil")
+	}); err != nil {
+		t.Fatalf("unexpected error: %v", err)
 	}
-	if !strings.Contains(err.Error(), "not owned by TenantGateway") {
-		t.Errorf("expected ownership-refusal error, got %v", err)
+
+	read := func(name, ns string) *metav1.Condition {
+		t.Helper()
+		got := &gatewayv1alpha2.TLSRoute{}
+		if err := c.Get(context.TODO(), types.NamespacedName{Name: name, Namespace: ns}, got); err != nil {
+			t.Fatalf("get %s/%s: %v", ns, name, err)
+		}
+		cond := acceptedCondition2(got.Status.Parents)
+		if cond == nil {
+			t.Fatalf("%s/%s: no Accepted condition under %s: %+v", ns, name, testControllerName, got.Status.Parents)
+		}
+		return cond
 	}
 
-	got := &cmv1.Certificate{}
-	if err := c.Get(context.TODO(), types.NamespacedName{Name: expectedCertName, Namespace: "tenant-foo"}, got); err != nil {
-		t.Fatalf("get Certificate: %v", err)
+	// Without this the assertion below would also pass on a controller
+	// that refused both routes.
+	if w := read("a", "default"); w.Status != metav1.ConditionTrue {
+		t.Fatalf("the attachable route reports Accepted=%s reason=%s: %q", w.Status, w.Reason, w.Message)
 	}
-	if got.Spec.SecretName != "operator-pinned-cert" {
-		t.Errorf("foreign per-listener Certificate.Spec.SecretName overwritten: %q", got.Spec.SecretName)
+	l := read("b", "tenant-foo")
+	if l.Status != metav1.ConditionFalse {
+		t.Errorf("the loser reports Accepted=%s: it claimed %s, which another route holds", l.Status, contested)
+	}
+	if l.Reason != "HostnameConflict" {
+		t.Errorf("reason=%s, want HostnameConflict: the loss is what its owner can act on", l.Reason)
 	}
 }
 
-// TestReconcile_OwnerReferencesOnDownstream pins the cascade-delete
-// contract for every controller-owned downstream resource: Issuer,
-// wildcard Certificate (DNS-01 mode), per-listener Certificate
-// (HTTP-01 mode), and the http→https redirect HTTPRoute. Without an
-// OwnerReference back to the TenantGateway, kubectl delete on the CR
-// leaves orphans behind that keep eating cert-manager rate limits and
-// stale Gateway listener references.
-func TestReconcile_OwnerReferencesOnDownstream(t *testing.T) {
+// TestReconcile_UnservableSectionDoesNotTakeTheHostnameFromAWorkingRoute
+// pins the second-order half of the unknown-section gap. Leaving such a
+// route at Accepted=True is a documented choice: the controller does
+// not model that refusal and would misname the cause. Letting it into
+// the ownership race is not, because the race decides who is told they
+// lost, and a route that can never attach must not take a hostname
+// away from the one route that can.
+func TestReconcile_UnservableSectionDoesNotTakeTheHostnameFromAWorkingRoute(t *testing.T) {
+	const published = "postgres.foo.example.com"
 	s := newScheme(t)
 	tgw := &gatewayv1alpha1.TenantGateway{
 		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
 		Spec: gatewayv1alpha1.TenantGatewaySpec{
-			Apex:             "foo.example.com",
-			CertMode:         gatewayv1alpha1.CertModeHTTP01,
-			GatewayClassName: "cilium",
-		},
-	}
-	route := &gatewayv1.HTTPRoute{
-		ObjectMeta: metav1.ObjectMeta{Name: "harbor", Namespace: "tenant-foo"},
-		Spec: gatewayv1.HTTPRouteSpec{
-			Hostnames: []gatewayv1.Hostname{"harbor.foo.example.com"},
-			CommonRouteSpec: gatewayv1.CommonRouteSpec{
-				ParentRefs: []gatewayv1.ParentReference{
-					{
-						Group:     ptrGroup(gatewayv1.GroupName),
-						Kind:      ptrKind("Gateway"),
-						Name:      "cozystack",
-						Namespace: ptrNamespace("tenant-foo"),
-					},
-				},
+			Apex:               "foo.example.com",
+			CertMode:           gatewayv1alpha1.CertModeHTTP01,
+			GatewayClassName:   "cilium",
+			AttachedNamespaces: []string{"default"},
+			TLSPassthroughListeners: []gatewayv1alpha1.TLSPassthroughListener{
+				{Name: "postgres", Port: 5432, Hostname: published},
 			},
 		},
 	}
-	c := fake.NewClientBuilder().WithScheme(s).WithObjects(tgw, route).WithStatusSubresource(tgw, &gatewayv1.HTTPRoute{}).Build()
+	// "default" sorts before "tenant-foo", so this one wins the race if
+	// it is allowed into it. Its section names nothing the Gateway
+	// renders, so it cannot attach whatever the race decides.
+	ghost := tlsRouteAttached("aaa", "default", published, "tls-absent", "tenant-foo")
+	working := tlsRouteAttached("zzz", "tenant-foo", published, "tls-postgres", "tenant-foo")
+
+	c := fake.NewClientBuilder().
+		WithScheme(s).
+		WithObjects(tgw, ghost, working).
+		WithStatusSubresource(tgw, ghost, working).
+		Build()
 
 	r := &Reconciler{Client: c, Scheme: s}
 	if _, err := r.Reconcile(context.TODO(), ctrl.Request{
@@ -3097,71 +4739,126 @@ func TestReconcile_OwnerReferencesOnDownstream(t *testing.T) {
 		t.Fatalf("unexpected error: %v", err)
 	}
 
-	hasOwnerRef := func(refs []metav1.OwnerReference, ownerName string) bool {
-		for _, ref := range refs {
-			if ref.Kind == "TenantGateway" && ref.Name == ownerName && ref.Controller != nil && *ref.Controller {
-				return true
-			}
-		}
-		return false
+	got := &gatewayv1alpha2.TLSRoute{}
+	if err := c.Get(context.TODO(), types.NamespacedName{Name: "zzz", Namespace: "tenant-foo"}, got); err != nil {
+		t.Fatalf("get route: %v", err)
+	}
+	accepted := acceptedCondition2(got.Status.Parents)
+	if accepted == nil {
+		t.Fatalf("no Accepted condition under %s: %+v", testControllerName, got.Status.Parents)
 	}
+	if accepted.Status != metav1.ConditionTrue {
+		t.Errorf("the only route that can attach reports Accepted=%s reason=%s: %q", accepted.Status, accepted.Reason, accepted.Message)
+	}
+}
 
-	// Issuer
-	iss := &cmv1.Issuer{}
-	if err := c.Get(context.TODO(), types.NamespacedName{Name: "cozystack-gateway", Namespace: "tenant-foo"}, iss); err != nil {
-		t.Fatalf("get Issuer: %v", err)
+// TestReconcile_UnservableSectionDoesNotTakeAServiceHostname is the
+// port-443 half of the test above, and the half that actually exercises
+// the branch both are named for.
+//
+// On a native-port listener a foreign-namespace route is refused on the
+// namespace leg before its sectionName decides anything, so that test
+// stays green even if servableOn stops treating an unrendered section
+// as unservable. A tlsPassthroughServices listener admits every attached
+// namespace, so here the section is the only thing that can keep the
+// ghost out of the ownership race, and the working route's Accepted
+// condition is what says whether it did.
+func TestReconcile_UnservableSectionDoesNotTakeAServiceHostname(t *testing.T) {
+	const contested = "api.foo.example.com"
+	s := newScheme(t)
+	tgw := &gatewayv1alpha1.TenantGateway{
+		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
+		Spec: gatewayv1alpha1.TenantGatewaySpec{
+			Apex:                   "foo.example.com",
+			CertMode:               gatewayv1alpha1.CertModeHTTP01,
+			GatewayClassName:       "cilium",
+			AttachedNamespaces:     []string{"cozy-x"},
+			TLSPassthroughServices: []string{"api"},
+		},
 	}
-	if !hasOwnerRef(iss.OwnerReferences, "cozystack") {
-		t.Errorf("Issuer missing controller OwnerReference back to TenantGateway, got %+v", iss.OwnerReferences)
+	// "cozy-x" sorts before "tenant-foo" and the listener admits it, so
+	// the only thing standing between this route and the hostname is
+	// that tls-absent names no rendered listener.
+	ghost := tlsRouteAttached("aaa", "cozy-x", contested, "tls-absent", "tenant-foo")
+	working := tlsRouteAttached("zzz", "tenant-foo", contested, "tls-api", "tenant-foo")
+
+	c := fake.NewClientBuilder().
+		WithScheme(s).
+		WithObjects(tgw, ghost, working).
+		WithStatusSubresource(tgw, ghost, working).
+		Build()
+
+	r := &Reconciler{Client: c, Scheme: s}
+	if _, err := r.Reconcile(context.TODO(), ctrl.Request{
+		NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"},
+	}); err != nil {
+		t.Fatalf("unexpected error: %v", err)
 	}
 
-	// Per-listener Certificate (HTTP-01 mode renders one per hostname).
-	certList := &cmv1.CertificateList{}
-	if err := c.List(context.TODO(), certList); err != nil {
-		t.Fatalf("list Certificates: %v", err)
+	got := &gatewayv1alpha2.TLSRoute{}
+	if err := c.Get(context.TODO(), types.NamespacedName{Name: "zzz", Namespace: "tenant-foo"}, got); err != nil {
+		t.Fatalf("get route: %v", err)
 	}
-	if len(certList.Items) == 0 {
-		t.Fatalf("expected at least one per-listener Certificate, got 0")
+	accepted := acceptedCondition2(got.Status.Parents)
+	if accepted == nil {
+		t.Fatalf("no Accepted condition under %s: %+v", testControllerName, got.Status.Parents)
 	}
-	for _, cert := range certList.Items {
-		if !hasOwnerRef(cert.OwnerReferences, "cozystack") {
-			t.Errorf("Certificate %s missing controller OwnerReference, got %+v", cert.Name, cert.OwnerReferences)
-		}
+	if accepted.Status != metav1.ConditionTrue {
+		t.Errorf("the only route that can attach reports Accepted=%s reason=%s: %q", accepted.Status, accepted.Reason, accepted.Message)
 	}
+}
 
-	// HTTP→HTTPS redirect HTTPRoute (controller-owned).
-	redirect := &gatewayv1.HTTPRoute{}
-	if err := c.Get(context.TODO(), types.NamespacedName{Name: "cozystack-http-redirect", Namespace: "tenant-foo"}, redirect); err != nil {
-		t.Fatalf("get redirect HTTPRoute: %v", err)
-	}
-	if !hasOwnerRef(redirect.OwnerReferences, "cozystack") {
-		t.Errorf("redirect HTTPRoute missing controller OwnerReference, got %+v", redirect.OwnerReferences)
+// acceptedCondition2 returns this controller's Accepted condition from a
+// route's parent statuses, or nil when it wrote none.
+func acceptedCondition2(parents []gatewayv1.RouteParentStatus) *metav1.Condition {
+	for _, ps := range parents {
+		if string(ps.ControllerName) != testControllerName {
+			continue
+		}
+		for i := range ps.Conditions {
+			if ps.Conditions[i].Type == "Accepted" {
+				return &ps.Conditions[i]
+			}
+		}
 	}
+	return nil
 }
 
-// TestReconcile_DNS01WildcardCertOwnerReference pins the wildcard
-// Certificate's OwnerReference contract, since it's only rendered in
-// DNS-01 mode and the previous test exercises HTTP-01.
-func TestReconcile_DNS01WildcardCertOwnerReference(t *testing.T) {
+// TestReconcile_TenantTLSRouteWinsAgainstOneTheListenerRefuses pins
+// the order of the two steps on a native-port hostname. Routes from
+// outside the tenant cannot attach to such a listener, so they have to
+// leave the race before a winner is picked: ownership ranks by
+// namespace with no notion of eligibility, and "default" sorts ahead
+// of "tenant-foo". Picking the winner first hands it to a route the
+// same pass refuses, and the one route that can attach is then told it
+// lost to it.
+//
+// The neighbouring test has a single claimant, which is exactly why
+// this ordering is invisible there.
+func TestReconcile_TenantTLSRouteWinsAgainstOneTheListenerRefuses(t *testing.T) {
+	const published = "postgres.foo.example.com"
 	s := newScheme(t)
 	tgw := &gatewayv1alpha1.TenantGateway{
 		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
 		Spec: gatewayv1alpha1.TenantGatewaySpec{
-			Apex:             "foo.example.com",
-			CertMode:         gatewayv1alpha1.CertModeDNS01,
-			GatewayClassName: "cilium",
-			DNS01: &gatewayv1alpha1.DNS01Config{
-				Provider: "cloudflare",
-				Cloudflare: &gatewayv1alpha1.CloudflareDNS01{
-					APITokenSecretRef: corev1.SecretKeySelector{
-						LocalObjectReference: corev1.LocalObjectReference{Name: "cf-token"},
-						Key:                  "api-token",
-					},
-				},
+			Apex:               "foo.example.com",
+			CertMode:           gatewayv1alpha1.CertModeHTTP01,
+			GatewayClassName:   "cilium",
+			AttachedNamespaces: []string{"default"},
+			TLSPassthroughListeners: []gatewayv1alpha1.TLSPassthroughListener{
+				{Name: "postgres", Port: 5432, Hostname: published},
 			},
 		},
 	}
-	c := fake.NewClientBuilder().WithScheme(s).WithObjects(tgw).WithStatusSubresource(tgw).Build()
+	outside := tlsRouteAttached("aaa", "default", published, "tls-postgres", "tenant-foo")
+	eligible := tlsRouteAttached("zzz", "tenant-foo", published, "tls-postgres", "tenant-foo")
+
+	c := fake.NewClientBuilder().
+		WithScheme(s).
+		WithObjects(tgw, outside, eligible).
+		WithStatusSubresource(tgw, outside, eligible).
+		Build()
+
 	r := &Reconciler{Client: c, Scheme: s}
 	if _, err := r.Reconcile(context.TODO(), ctrl.Request{
 		NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"},
@@ -3169,132 +4866,290 @@ func TestReconcile_DNS01WildcardCertOwnerReference(t *testing.T) {
 		t.Fatalf("unexpected error: %v", err)
 	}
 
-	cert := &cmv1.Certificate{}
-	if err := c.Get(context.TODO(), types.NamespacedName{Name: "cozystack-gateway-tls", Namespace: "tenant-foo"}, cert); err != nil {
-		t.Fatalf("get wildcard Certificate: %v", err)
-	}
-	hasOwner := false
-	for _, ref := range cert.OwnerReferences {
-		if ref.Kind == "TenantGateway" && ref.Name == "cozystack" && ref.Controller != nil && *ref.Controller {
-			hasOwner = true
-			break
+	read := func(name, ns string) *metav1.Condition {
+		t.Helper()
+		got := &gatewayv1alpha2.TLSRoute{}
+		if err := c.Get(context.TODO(), types.NamespacedName{Name: name, Namespace: ns}, got); err != nil {
+			t.Fatalf("get %s/%s: %v", ns, name, err)
+		}
+		var found *metav1.Condition
+		for _, ps := range got.Status.Parents {
+			if string(ps.ControllerName) != testControllerName {
+				continue
+			}
+			for i := range ps.Conditions {
+				if ps.Conditions[i].Type == "Accepted" {
+					found = &ps.Conditions[i]
+				}
+			}
+		}
+		if found == nil {
+			t.Fatalf("%s/%s: no Accepted condition under %s: %+v", ns, name, testControllerName, got.Status.Parents)
 		}
+		return found
 	}
-	if !hasOwner {
-		t.Errorf("wildcard Certificate missing controller OwnerReference, got %+v", cert.OwnerReferences)
+
+	// The refused one keeps its own cause; without this the assertion
+	// below would also pass on a controller that refuses neither.
+	if refused := read("aaa", "default"); refused.Status != metav1.ConditionFalse {
+		t.Fatalf("route in default reports Accepted=%s on a listener that admits only tenant-foo", refused.Status)
+	}
+	if served := read("zzz", "tenant-foo"); served.Status != metav1.ConditionTrue {
+		t.Errorf("the only route that can attach reports Accepted=%s reason=%s: %q", served.Status, served.Reason, served.Message)
 	}
 }
 
-// TestReconcile_GatewayUpdateRestoresControllerLabel pins the inverse
-// of TestReconcile_GatewayUpdatePreservesForeignLabels: a foreign
-// actor that scrubs a controller-owned label must see it restored on
-// the next reconcile. Without this, an out-of-band tool (or a buggy
-// admission policy) could permanently strip cozystack.io/managed-by
-// and break label-based selectors that depend on it.
-func TestReconcile_GatewayUpdateRestoresControllerLabel(t *testing.T) {
+// TestReconcile_WithdrawnHostnameDoesNotTakeTheRoutesOtherNames pins
+// the scope of the reservation. A route with one reserved and one free
+// hostname still attaches through the free one, so it is Accepted, the
+// way Gateway API accepts a route whose hostnames intersect at least
+// one listener: the free name keeps its listener and certificate, the
+// reserved one gets neither.
+func TestReconcile_WithdrawnHostnameDoesNotTakeTheRoutesOtherNames(t *testing.T) {
+	const (
+		withdrawn = "api.foo.example.com"
+		served    = "app.foo.example.com"
+	)
 	s := newScheme(t)
 	tgw := &gatewayv1alpha1.TenantGateway{
 		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
 		Spec: gatewayv1alpha1.TenantGatewaySpec{
-			Apex:             "foo.example.com",
-			CertMode:         gatewayv1alpha1.CertModeHTTP01,
-			GatewayClassName: "cilium",
+			Apex:                   "foo.example.com",
+			CertMode:               gatewayv1alpha1.CertModeHTTP01,
+			GatewayClassName:       "cilium",
+			TLSPassthroughServices: []string{"api"},
 		},
 	}
-	c := fake.NewClientBuilder().WithScheme(s).WithObjects(tgw).WithStatusSubresource(tgw, &gatewayv1.Gateway{}).Build()
+	route := httpRouteAttached("both", "tenant-foo", withdrawn)
+	route.Spec.Hostnames = append(route.Spec.Hostnames, gatewayv1.Hostname(served))
+	claimant := passthroughTLSRoute("api-tls", "tenant-foo", withdrawn, "api")
+
+	c := fake.NewClientBuilder().
+		WithScheme(s).
+		WithObjects(tgw, route, claimant).
+		WithStatusSubresource(tgw, route, claimant).
+		Build()
+
 	r := &Reconciler{Client: c, Scheme: s}
 	if _, err := r.Reconcile(context.TODO(), ctrl.Request{
 		NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"},
 	}); err != nil {
-		t.Fatalf("first reconcile: %v", err)
+		t.Fatalf("unexpected error: %v", err)
+	}
+
+	accepted := acceptedCondition(t, c, "both", "tenant-foo")
+	if accepted.Status != metav1.ConditionTrue {
+		t.Errorf("route served on %s reads Accepted=%s reason=%s: %q", served, accepted.Status, accepted.Reason, accepted.Message)
 	}
 
-	// Foreign actor strips the controller-owned managed-by label.
 	gw := &gatewayv1.Gateway{}
 	if err := c.Get(context.TODO(), types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"}, gw); err != nil {
 		t.Fatalf("get Gateway: %v", err)
 	}
-	delete(gw.Labels, "cozystack.io/managed-by")
-	if err := c.Update(context.TODO(), gw); err != nil {
-		t.Fatalf("update Gateway: %v", err)
+	var servedListener, withdrawnListener bool
+	for _, l := range gw.Spec.Listeners {
+		if l.Hostname == nil || l.Protocol != gatewayv1.HTTPSProtocolType {
+			continue
+		}
+		switch string(*l.Hostname) {
+		case served:
+			servedListener = true
+		case withdrawn:
+			withdrawnListener = true
+		}
 	}
-
-	if _, err := r.Reconcile(context.TODO(), ctrl.Request{
-		NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"},
-	}); err != nil {
-		t.Fatalf("second reconcile: %v", err)
+	if !servedListener {
+		t.Errorf("no terminate listener for %s, which nothing withdrew: %+v", served, gw.Spec.Listeners)
+	}
+	if withdrawnListener {
+		t.Errorf("terminate listener for %s survived the withdrawal", withdrawn)
 	}
 
-	got := &gatewayv1.Gateway{}
-	if err := c.Get(context.TODO(), types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"}, got); err != nil {
-		t.Fatalf("get Gateway after second reconcile: %v", err)
+	// Matched by dnsNames rather than by recomputing the name with the
+	// same helper the renderer uses: that would agree with the code
+	// even if the naming scheme broke.
+	certs := &cmv1.CertificateList{}
+	if err := c.List(context.TODO(), certs, client.InNamespace("tenant-foo")); err != nil {
+		t.Fatalf("list Certificates: %v", err)
 	}
-	if got.Labels["cozystack.io/managed-by"] != "cozystack-controller" {
-		t.Errorf("controller label not restored after foreign delete: labels=%+v", got.Labels)
+	var servedCert, withdrawnCert bool
+	for _, crt := range certs.Items {
+		for _, dns := range crt.Spec.DNSNames {
+			switch dns {
+			case served:
+				servedCert = true
+			case withdrawn:
+				withdrawnCert = true
+			}
+		}
+	}
+	if !servedCert {
+		t.Errorf("no Certificate covering %s: %+v", served, certs.Items)
+	}
+	if withdrawnCert {
+		t.Errorf("Certificate covering %s survived the withdrawal", withdrawn)
 	}
 }
 
-// TestRender_HTTPListener_PinsACMEChallengeNamespace pins the literal
-// const value `acmeChallengeNamespace = "cozy-cert-manager"`. If the
-// platform ever moves cert-manager to a different namespace, this
-// test fails loudly — and it's expected to be updated together with
-// the namespace change so HTTP-01 challenge HTTPRoutes still bind.
-// Without this pin, a refactor could change the string in one place
-// (the cert-manager helm release) without updating the tenant
-// Gateway's http-listener allowedRoutes.
-func TestRender_HTTPListener_PinsACMEChallengeNamespace(t *testing.T) {
-	if acmeChallengeNamespace != "cozy-cert-manager" {
-		t.Errorf("acmeChallengeNamespace=%q, want cozy-cert-manager — if cert-manager moves, update the cozy-cert-manager helm release namespace AND this constant in lockstep, then update this test", acmeChallengeNamespace)
+// TestReconcile_WithdrawalMessageIsStableAcrossReconciles pins the
+// property the "smallest name wins" tie-breaks exist for, rather than
+// the names they pick. Both the hostname a claim is reported as
+// answered by and the listener a refusal is blamed on are chosen from a
+// map, and a map iterates in no order: without a tie-break two passes
+// would name two different entries, rewrite the condition, write
+// status, and requeue the object through the route watch forever.
+//
+// Which entry is picked is arbitrary and deliberately not asserted, so
+// reversing a comparison stays green. Taking whatever the map yields
+// first does not.
+func TestReconcile_WithdrawalMessageIsStableAcrossReconciles(t *testing.T) {
+	const apex = "foo.example.com"
+	for _, tc := range []struct {
+		name      string
+		services  []string
+		listeners []gatewayv1alpha1.TLSPassthroughListener
+		routeNS   string
+		tlsRoute  bool
+	}{
+		{
+			// Four reserved names overlap the claim, so the "answered
+			// by" line has four candidates to be unstable between.
+			name:     "answered by one of several passthrough names",
+			services: []string{"api", "zeta", "mid"},
+			listeners: []gatewayv1alpha1.TLSPassthroughListener{
+				{Name: "pg", Port: 5432, Hostname: "pg." + apex},
+			},
+			routeNS: "tenant-foo",
+		},
+		{
+			// No service entry, so both native-port listeners refuse a
+			// route from an attached namespace and the refusal has two
+			// candidates.
+			name: "refused by one of several native-port listeners",
+			listeners: []gatewayv1alpha1.TLSPassthroughListener{
+				{Name: "pg", Port: 5432, Hostname: "pg." + apex},
+				{Name: "my", Port: 3306, Hostname: "my." + apex},
+			},
+			routeNS:  "default",
+			tlsRoute: true,
+		},
+	} {
+		t.Run(tc.name, func(t *testing.T) {
+			s := newScheme(t)
+			tgw := &gatewayv1alpha1.TenantGateway{
+				ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
+				Spec: gatewayv1alpha1.TenantGatewaySpec{
+					Apex:                    apex,
+					CertMode:                gatewayv1alpha1.CertModeHTTP01,
+					GatewayClassName:        "cilium",
+					AttachedNamespaces:      []string{"default"},
+					TLSPassthroughServices:  tc.services,
+					TLSPassthroughListeners: tc.listeners,
+				},
+			}
+			var route client.Object
+			if tc.tlsRoute {
+				// No sectionName on purpose: naming one pins the answer
+				// to a single listener, which leaves the tie-break with
+				// one candidate and the subtest unable to see it.
+				tr := tlsRouteAttached("r", tc.routeNS, "*."+apex, "tls-pg", "tenant-foo")
+				tr.Spec.ParentRefs[0].SectionName = nil
+				route = tr
+			} else {
+				route = httpRouteAttached("r", tc.routeNS, "*."+apex)
+			}
+			c := fake.NewClientBuilder().
+				WithScheme(s).
+				WithObjects(tgw, route).
+				WithStatusSubresource(tgw, route).
+				Build()
+
+			r := &Reconciler{Client: c, Scheme: s}
+			var first string
+			for pass := range 20 {
+				if _, err := r.Reconcile(context.TODO(), ctrl.Request{
+					NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"},
+				}); err != nil {
+					t.Fatalf("pass %d: %v", pass, err)
+				}
+				var msg string
+				if tc.tlsRoute {
+					got := &gatewayv1alpha2.TLSRoute{}
+					if err := c.Get(context.TODO(), types.NamespacedName{Name: "r", Namespace: tc.routeNS}, got); err != nil {
+						t.Fatalf("pass %d: get route: %v", pass, err)
+					}
+					msg = acceptedMessage(got.Status.Parents)
+				} else {
+					got := &gatewayv1.HTTPRoute{}
+					if err := c.Get(context.TODO(), types.NamespacedName{Name: "r", Namespace: tc.routeNS}, got); err != nil {
+						t.Fatalf("pass %d: get route: %v", pass, err)
+					}
+					msg = acceptedMessage(got.Status.Parents)
+				}
+				if msg == "" {
+					t.Fatalf("pass %d: no Accepted condition under %s", pass, testControllerName)
+				}
+				if pass == 0 {
+					first = msg
+					continue
+				}
+				if msg != first {
+					t.Fatalf("pass %d rewrote the condition:\n  first: %q\n  now:   %q", pass, first, msg)
+				}
+			}
+		})
 	}
 }
 
-// TestReconcile_MultiParentRefRouteWritesPerRefStatus pins the
-// per-(ParentRef, ControllerName) status contract: when a single
-// HTTPRoute carries two parentRefs to the same TenantGateway Gateway
-// (different sectionNames), the controller writes one
-// RouteParentStatus entry per parentRef under its ControllerName
-// instead of overwriting one entry on each iteration. Prior behavior
-// kept only whichever parentRef came first in pickAttachingParentRef,
-// silently dropping per-section conflict signals — a regression that
-// would only surface for tenants stitching multiple sectionNames into
-// one HTTPRoute.
-func TestReconcile_MultiParentRefRouteWritesPerRefStatus(t *testing.T) {
+// acceptedMessage returns the Accepted condition message this
+// controller wrote, or "" when it wrote none.
+func acceptedMessage(parents []gatewayv1.RouteParentStatus) string {
+	for _, ps := range parents {
+		if string(ps.ControllerName) != testControllerName {
+			continue
+		}
+		for i := range ps.Conditions {
+			if ps.Conditions[i].Type == "Accepted" {
+				return ps.Conditions[i].Message
+			}
+		}
+	}
+	return ""
+}
+
+// TestReconcile_PinnedSectionMismatchIsNotCalledANamespaceRefusal pins
+// the fourth shape of "cannot be served here" apart from the third.
+// A route in the tenant's own namespace can still be unservable, by
+// naming a listener that answers a different hostname, and calling that
+// a namespace refusal produces a message contradicting itself: it tells
+// a route in tenant-foo that the listener admits tenant-foo only. The
+// status is right either way, so this asserts the reason and the text.
+func TestReconcile_PinnedSectionMismatchIsNotCalledANamespaceRefusal(t *testing.T) {
+	const (
+		apex   = "foo.example.com"
+		wanted = "pg." + apex
+	)
 	s := newScheme(t)
 	tgw := &gatewayv1alpha1.TenantGateway{
 		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
 		Spec: gatewayv1alpha1.TenantGatewaySpec{
-			Apex:             "foo.example.com",
-			CertMode:         gatewayv1alpha1.CertModeHTTP01,
-			GatewayClassName: "cilium",
-		},
-	}
-	route := &gatewayv1.HTTPRoute{
-		ObjectMeta: metav1.ObjectMeta{Name: "harbor", Namespace: "tenant-foo"},
-		Spec: gatewayv1.HTTPRouteSpec{
-			Hostnames: []gatewayv1.Hostname{"harbor.foo.example.com"},
-			CommonRouteSpec: gatewayv1.CommonRouteSpec{
-				ParentRefs: []gatewayv1.ParentReference{
-					{
-						Group:       ptrGroup(gatewayv1.GroupName),
-						Kind:        ptrKind("Gateway"),
-						Name:        "cozystack",
-						Namespace:   ptrNamespace("tenant-foo"),
-						SectionName: ptrSectionName("https-harbor-deadbeef"),
-					},
-					{
-						Group:       ptrGroup(gatewayv1.GroupName),
-						Kind:        ptrKind("Gateway"),
-						Name:        "cozystack",
-						Namespace:   ptrNamespace("tenant-foo"),
-						SectionName: ptrSectionName("http"),
-					},
-				},
+			Apex:                   apex,
+			CertMode:               gatewayv1alpha1.CertModeHTTP01,
+			GatewayClassName:       "cilium",
+			TLSPassthroughServices: []string{"svc"},
+			TLSPassthroughListeners: []gatewayv1alpha1.TLSPassthroughListener{
+				{Name: "pg", Port: 5432, Hostname: wanted},
 			},
 		},
 	}
-	c := fake.NewClientBuilder().WithScheme(s).
+	// In the tenant's own namespace on purpose: that is what makes a
+	// namespace refusal impossible and the message checkable.
+	route := tlsRouteAttached("r", "tenant-foo", wanted, "tls-svc", "tenant-foo")
+
+	c := fake.NewClientBuilder().
+		WithScheme(s).
 		WithObjects(tgw, route).
-		WithStatusSubresource(tgw, &gatewayv1.HTTPRoute{}).
+		WithStatusSubresource(tgw, &gatewayv1alpha2.TLSRoute{}).
 		Build()
 
 	r := &Reconciler{Client: c, Scheme: s}
@@ -3304,25 +5159,5522 @@ func TestReconcile_MultiParentRefRouteWritesPerRefStatus(t *testing.T) {
 		t.Fatalf("unexpected error: %v", err)
 	}
 
-	got := &gatewayv1.HTTPRoute{}
-	if err := c.Get(context.TODO(), types.NamespacedName{Name: "harbor", Namespace: "tenant-foo"}, got); err != nil {
-		t.Fatalf("get HTTPRoute: %v", err)
+	got := &gatewayv1alpha2.TLSRoute{}
+	if err := c.Get(context.TODO(), types.NamespacedName{Name: "r", Namespace: "tenant-foo"}, got); err != nil {
+		t.Fatalf("get route: %v", err)
 	}
-	ours := 0
-	sections := map[string]bool{}
+	var accepted *metav1.Condition
 	for _, ps := range got.Status.Parents {
-		if ps.ControllerName != "gateway.cozystack.io/tenantgateway-controller" {
+		if string(ps.ControllerName) != testControllerName {
 			continue
 		}
-		ours++
-		if ps.ParentRef.SectionName != nil {
-			sections[string(*ps.ParentRef.SectionName)] = true
+		for i := range ps.Conditions {
+			if ps.Conditions[i].Type == "Accepted" {
+				accepted = &ps.Conditions[i]
+			}
 		}
 	}
-	if ours != 2 {
-		t.Errorf("expected 2 RouteParentStatus entries under our ControllerName, got %d (full status=%+v)", ours, got.Status.Parents)
+	if accepted == nil {
+		t.Fatalf("no Accepted condition under %s: %+v", testControllerName, got.Status.Parents)
 	}
-	if !sections["https-harbor-deadbeef"] || !sections["http"] {
-		t.Errorf("expected status entries for both sectionNames, got %+v", sections)
+	if accepted.Status != metav1.ConditionFalse {
+		t.Fatalf("Accepted=%s: the named listener answers svc.%s, not %s", accepted.Status, apex, wanted)
+	}
+	if want := string(gatewayv1.RouteReasonNoMatchingListenerHostname); accepted.Reason != want {
+		t.Errorf("reason=%s, want %s: no listener this route pinned itself to answers the name", accepted.Reason, want)
+	}
+	if strings.Contains(accepted.Message, "namespace tenant-foo only") {
+		t.Errorf("message blames the namespace of a route that is in it: %q", accepted.Message)
+	}
+	if !strings.Contains(accepted.Message, "tls-svc") {
+		t.Errorf("message does not name the section that misses: %q", accepted.Message)
+	}
+}
+
+// TestReconcile_RefusedNamespaceDoesNotSpeakForAnUnservedName pins the
+// second half of the same rule. One TLSRoute can claim a name a
+// native-port listener refuses it and a name no listener answers at
+// all, and NotAllowedByListeners is true of only the first. Reporting
+// it for the pair sends the owner looking for a listener behind the
+// second name too, which is the failure the reason is meant to end.
+func TestReconcile_RefusedNamespaceDoesNotSpeakForAnUnservedName(t *testing.T) {
+	const (
+		nativeAt = "postgres.foo.example.com"
+		unserved = "redis.foo.example.com"
+	)
+	s := newScheme(t)
+	tgw := &gatewayv1alpha1.TenantGateway{
+		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
+		Spec: gatewayv1alpha1.TenantGatewaySpec{
+			Apex:               "foo.example.com",
+			CertMode:           gatewayv1alpha1.CertModeHTTP01,
+			GatewayClassName:   "cilium",
+			AttachedNamespaces: []string{"tenant-bar"},
+			TLSPassthroughListeners: []gatewayv1alpha1.TLSPassthroughListener{
+				{Name: "postgres", Port: 5432, Hostname: nativeAt},
+			},
+		},
+	}
+	route := tlsRouteAttached("both", "tenant-bar", nativeAt, "tls-postgres", "tenant-foo")
+	route.Spec.Hostnames = append(route.Spec.Hostnames, gatewayv1.Hostname(unserved))
+
+	c := fake.NewClientBuilder().
+		WithScheme(s).
+		WithObjects(tgw, route).
+		WithStatusSubresource(tgw, &gatewayv1alpha2.TLSRoute{}).
+		Build()
+
+	r := &Reconciler{Client: c, Scheme: s}
+	if _, err := r.Reconcile(context.TODO(), ctrl.Request{
+		NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"},
+	}); err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+
+	got := &gatewayv1alpha2.TLSRoute{}
+	if err := c.Get(context.TODO(), types.NamespacedName{Name: "both", Namespace: "tenant-bar"}, got); err != nil {
+		t.Fatalf("get route: %v", err)
+	}
+	var accepted *metav1.Condition
+	for _, ps := range got.Status.Parents {
+		if string(ps.ControllerName) != testControllerName {
+			continue
+		}
+		for i := range ps.Conditions {
+			if ps.Conditions[i].Type == "Accepted" {
+				accepted = &ps.Conditions[i]
+			}
+		}
+	}
+	if accepted == nil {
+		t.Fatalf("no Accepted condition under %s: %+v", testControllerName, got.Status.Parents)
+	}
+	if want := string(gatewayv1.RouteReasonNoMatchingListenerHostname); accepted.Reason != want {
+		t.Errorf("reason=%s, want %s: %s has no listener behind it at all", accepted.Reason, want, unserved)
+	}
+	// Both claims have to be judged, or the assertion above would hold
+	// on a controller that stopped after the refused one.
+	for _, h := range []string{nativeAt, unserved} {
+		if !strings.Contains(accepted.Message, h) {
+			t.Errorf("message does not name %s: %q", h, accepted.Message)
+		}
+	}
+}
+
+// TestReconcile_TwoRefusedRoutesHearTheRefusalNotEachOther pins the
+// drop that runs when a route is refused by a native-port listener.
+// Both routes here are outside the publishing tenant and both claim the
+// same native-port hostname, so both are refused; without the drop the
+// second is additionally told it lost the name to the first, which the
+// same pass also refused. Telling an operator to move a route out of
+// the way of one that is itself going nowhere is the failure the block
+// comment calls out, and the neighbouring test does not catch it: there
+// the race and the refusal land on different hostnames, so the drop is
+// a no-op.
+func TestReconcile_TwoRefusedRoutesHearTheRefusalNotEachOther(t *testing.T) {
+	const published = "postgres.foo.example.com"
+	s := newScheme(t)
+	tgw := &gatewayv1alpha1.TenantGateway{
+		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
+		Spec: gatewayv1alpha1.TenantGatewaySpec{
+			Apex:               "foo.example.com",
+			CertMode:           gatewayv1alpha1.CertModeHTTP01,
+			GatewayClassName:   "cilium",
+			AttachedNamespaces: []string{"cozy-public", "tenant-bar"},
+			TLSPassthroughListeners: []gatewayv1alpha1.TLSPassthroughListener{
+				{Name: "postgres", Port: 5432, Hostname: published},
+			},
+		},
+	}
+	// cozy-* ranks first, so the tenant-bar route is the loser of the
+	// original race as well as being refused.
+	first := tlsRouteAttached("pg-a", "cozy-public", published, "tls-postgres", "tenant-foo")
+	second := tlsRouteAttached("pg-b", "tenant-bar", published, "tls-postgres", "tenant-foo")
+
+	c := fake.NewClientBuilder().
+		WithScheme(s).
+		WithObjects(tgw, first, second).
+		WithStatusSubresource(tgw, first, second).
+		Build()
+
+	r := &Reconciler{Client: c, Scheme: s}
+	if _, err := r.Reconcile(context.TODO(), ctrl.Request{
+		NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"},
+	}); err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+
+	got := &gatewayv1alpha2.TLSRoute{}
+	if err := c.Get(context.TODO(), types.NamespacedName{Name: "pg-b", Namespace: "tenant-bar"}, got); err != nil {
+		t.Fatalf("get route: %v", err)
+	}
+	accepted := acceptedCondition2(got.Status.Parents)
+	if accepted == nil {
+		t.Fatalf("no Accepted condition under %s: %+v", testControllerName, got.Status.Parents)
+	}
+	if want := string(gatewayv1.RouteReasonNotAllowedByListeners); accepted.Reason != want {
+		t.Errorf("reason=%s, want %s: the listener refuses this namespace", accepted.Reason, want)
+	}
+	if strings.Contains(accepted.Message, "already claimed") {
+		t.Errorf("route is told it lost the name to another route this pass also refused: %q", accepted.Message)
+	}
+}
+
+// TestReconcile_SameNamespaceTLSRoutesDoNotConflictAfterTheRecount pins
+// the namespace comparison in the TLS recount. resolveHostnameOwners
+// records no loser between claimants sharing a namespace, and the
+// recount has to make the same comparison, or the second route in the
+// winner's namespace keeps a loss recorded by a race whose winner has
+// since been withdrawn.
+//
+// Not because two TLSRoutes on one hostname are merged. Gateway API
+// defines merging for HTTPRoute, by path and headers, and defines
+// nothing of the kind for TLSRoute: two TLSRoutes carrying one SNI
+// produce two filter chains with identical criteria and one of them is
+// served. That gap is older than the recount and is not what this pins;
+// what this pins is that the recount invents no conflict the base race
+// did not record.
+func TestReconcile_SameNamespaceTLSRoutesDoNotConflictAfterTheRecount(t *testing.T) {
+	const apex = "foo.example.com"
+	const contested = "svc." + apex
+	s := newScheme(t)
+	tgw := &gatewayv1alpha1.TenantGateway{
+		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
+		Spec: gatewayv1alpha1.TenantGatewaySpec{
+			Apex:                   apex,
+			CertMode:               gatewayv1alpha1.CertModeHTTP01,
+			GatewayClassName:       "cilium",
+			AttachedNamespaces:     []string{"cozy-public", "tenant-bar"},
+			TLSPassthroughServices: []string{"svc"},
+		},
+	}
+	// The HTTPRoute wins the original race from cozy-public and is then
+	// withdrawn, so the recount picks a TLS winner in a namespace the
+	// first race never ranked first.
+	httpWinner := httpRouteAttached("web", "cozy-public", contested)
+	aaa := tlsRouteAttached("aaa", "tenant-bar", contested, "tls-svc", "tenant-foo")
+	bbb := tlsRouteAttached("bbb", "tenant-bar", contested, "tls-svc", "tenant-foo")
+
+	c := fake.NewClientBuilder().
+		WithScheme(s).
+		WithObjects(tgw, httpWinner, aaa, bbb).
+		WithStatusSubresource(tgw, httpWinner, aaa, bbb).
+		Build()
+
+	r := &Reconciler{Client: c, Scheme: s}
+	if _, err := r.Reconcile(context.TODO(), ctrl.Request{
+		NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"},
+	}); err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+
+	for _, name := range []string{"aaa", "bbb"} {
+		got := &gatewayv1alpha2.TLSRoute{}
+		if err := c.Get(context.TODO(), types.NamespacedName{Name: name, Namespace: "tenant-bar"}, got); err != nil {
+			t.Fatalf("get %s: %v", name, err)
+		}
+		accepted := acceptedCondition2(got.Status.Parents)
+		if accepted == nil {
+			t.Fatalf("%s: no Accepted condition under %s: %+v", name, testControllerName, got.Status.Parents)
+		}
+		if accepted.Status != metav1.ConditionTrue {
+			t.Errorf("%s reports Accepted=%s reason=%s: it shares a namespace with the winner, which the base race records no loss against: %q",
+				name, accepted.Status, accepted.Reason, accepted.Message)
+		}
+	}
+}
+
+// TestReconcile_RefusedNamespaceDoesNotOutrankALostRace pins the order
+// of two causes that can land on one route at once. A TLSRoute outside
+// the tenant can lose a race on a service-listener name, which admits
+// routes from anywhere, and be refused on a native-port name in the
+// same breath. The race is the half its owner can act on, by moving or
+// dropping the other route, so the reason has to keep naming it; the
+// refusal is a property of the TenantGateway spec and is named in the
+// message either way.
+func TestReconcile_RefusedNamespaceDoesNotOutrankALostRace(t *testing.T) {
+	const (
+		contested = "api.foo.example.com"
+		nativeAt  = "postgres.foo.example.com"
+	)
+	s := newScheme(t)
+	tgw := &gatewayv1alpha1.TenantGateway{
+		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
+		Spec: gatewayv1alpha1.TenantGatewaySpec{
+			Apex:                   "foo.example.com",
+			CertMode:               gatewayv1alpha1.CertModeHTTP01,
+			GatewayClassName:       "cilium",
+			AttachedNamespaces:     []string{"cozy-public", "tenant-bar"},
+			TLSPassthroughServices: []string{"api"},
+			TLSPassthroughListeners: []gatewayv1alpha1.TLSPassthroughListener{
+				{Name: "postgres", Port: 5432, Hostname: nativeAt},
+			},
+		},
+	}
+	platform := tlsRouteAttached("api", "cozy-public", contested, "tls-api", "tenant-foo")
+	hijack := tlsRouteAttached("api-hijack", "tenant-bar", contested, "tls-api", "tenant-foo")
+	hijack.Spec.Hostnames = append(hijack.Spec.Hostnames, gatewayv1.Hostname(nativeAt))
+
+	c := fake.NewClientBuilder().
+		WithScheme(s).
+		WithObjects(tgw, platform, hijack).
+		WithStatusSubresource(tgw, &gatewayv1alpha2.TLSRoute{}).
+		Build()
+
+	r := &Reconciler{Client: c, Scheme: s}
+	if _, err := r.Reconcile(context.TODO(), ctrl.Request{
+		NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"},
+	}); err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+
+	got := &gatewayv1alpha2.TLSRoute{}
+	if err := c.Get(context.TODO(), types.NamespacedName{Name: "api-hijack", Namespace: "tenant-bar"}, got); err != nil {
+		t.Fatalf("get route: %v", err)
+	}
+	var accepted *metav1.Condition
+	for _, ps := range got.Status.Parents {
+		if string(ps.ControllerName) != testControllerName {
+			continue
+		}
+		for i := range ps.Conditions {
+			if ps.Conditions[i].Type == "Accepted" {
+				accepted = &ps.Conditions[i]
+			}
+		}
+	}
+	if accepted == nil {
+		t.Fatalf("no Accepted condition under %s: %+v", testControllerName, got.Status.Parents)
+	}
+	if accepted.Reason != "HostnameConflict" {
+		t.Errorf("reason=%s, want HostnameConflict: the route lost the race for %s, and that is the half its owner can act on", accepted.Reason, contested)
+	}
+	// Both hostnames have to be named, or the assertion above would
+	// hold on a controller that judged only one of the two claims.
+	for _, h := range []string{contested, nativeAt} {
+		if !strings.Contains(accepted.Message, h) {
+			t.Errorf("message does not name %s: %q", h, accepted.Message)
+		}
+	}
+}
+
+// TestReconcile_TLSRouteOutsideTheTenantOnANativePortHostnameIsRefused
+// pins the consequence of narrowing the native-port attach set. Those
+// listeners admit only the tenant's own namespace, while hostname
+// claims are still collected from every attached namespace, so a
+// TLSRoute elsewhere claims a name it can never attach to. Saying
+// Accepted=True there is the same silent lie the withdrawal machinery
+// exists to remove, and it is on the path of the next phase: the
+// platform's own TLSRoutes live in default.
+func TestReconcile_TLSRouteOutsideTheTenantOnANativePortHostnameIsRefused(t *testing.T) {
+	const published = "postgres.foo.example.com"
+	s := newScheme(t)
+	tgw := &gatewayv1alpha1.TenantGateway{
+		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
+		Spec: gatewayv1alpha1.TenantGatewaySpec{
+			Apex:               "foo.example.com",
+			CertMode:           gatewayv1alpha1.CertModeHTTP01,
+			GatewayClassName:   "cilium",
+			AttachedNamespaces: []string{"default"},
+			TLSPassthroughListeners: []gatewayv1alpha1.TLSPassthroughListener{
+				{Name: "postgres", Port: 5432, Hostname: published},
+			},
+		},
+	}
+	outside := tlsRouteAttached("pg", "default", published, "tls-postgres", "tenant-foo")
+
+	c := fake.NewClientBuilder().
+		WithScheme(s).
+		WithObjects(tgw, outside).
+		WithStatusSubresource(tgw, outside).
+		Build()
+
+	r := &Reconciler{Client: c, Scheme: s}
+	if _, err := r.Reconcile(context.TODO(), ctrl.Request{
+		NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"},
+	}); err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+
+	// The listener has to exist for the case to mean anything: without
+	// it the route would be unserved for an entirely different reason.
+	gw := &gatewayv1.Gateway{}
+	if err := c.Get(context.TODO(), types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"}, gw); err != nil {
+		t.Fatalf("get Gateway: %v", err)
+	}
+	var sawNativePort bool
+	for _, l := range gw.Spec.Listeners {
+		if l.Name == "tls-postgres" {
+			sawNativePort = true
+		}
+	}
+	if !sawNativePort {
+		t.Fatalf("no tls-postgres listener rendered: %+v", gw.Spec.Listeners)
+	}
+
+	got := &gatewayv1alpha2.TLSRoute{}
+	if err := c.Get(context.TODO(), types.NamespacedName{Name: "pg", Namespace: "default"}, got); err != nil {
+		t.Fatalf("get route: %v", err)
+	}
+	var accepted *metav1.Condition
+	for _, ps := range got.Status.Parents {
+		if string(ps.ControllerName) != testControllerName {
+			continue
+		}
+		for i := range ps.Conditions {
+			if ps.Conditions[i].Type == "Accepted" {
+				accepted = &ps.Conditions[i]
+			}
+		}
+	}
+	if accepted == nil {
+		t.Fatalf("no Accepted condition under %s: %+v", testControllerName, got.Status.Parents)
+	}
+	if accepted.Status == metav1.ConditionTrue {
+		t.Fatalf("route in default reports Accepted=True on a listener that admits only tenant-foo")
+	}
+	// The listener exists and matches the hostname; what it refuses is
+	// the namespace. Gateway API has a reason for exactly that, and
+	// saying NoMatchingListenerHostname instead sends the operator to
+	// look for a listener that is right there.
+	if want := string(gatewayv1.RouteReasonNotAllowedByListeners); accepted.Reason != want {
+		t.Errorf("reason=%s, want %s: the listener matches the name and refuses the namespace", accepted.Reason, want)
+	}
+	if !strings.Contains(accepted.Message, published) {
+		t.Errorf("condition does not name the hostname it refuses: reason=%s message=%q", accepted.Reason, accepted.Message)
+	}
+}
+
+// TestReconcile_TwoTLSRoutesOnAnUnansweredHostnameBothHearTheSameThing
+// pins that the race stops mattering once nothing answers the name.
+// Two TLSRoutes claiming a hostname no passthrough listener declares
+// are both unserved for the same reason, and telling the loser it lost
+// to the other sends it to look at a route that is equally unserved.
+// The reserved-hostname branch already drops the record for exactly
+// this reason; the branch for a name nothing answers has to as well.
+func TestReconcile_TwoTLSRoutesOnAnUnansweredHostnameBothHearTheSameThing(t *testing.T) {
+	const orphaned = "gone.foo.example.com"
+	s := newScheme(t)
+	tgw := &gatewayv1alpha1.TenantGateway{
+		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
+		Spec: gatewayv1alpha1.TenantGatewaySpec{
+			Apex:               "foo.example.com",
+			CertMode:           gatewayv1alpha1.CertModeHTTP01,
+			GatewayClassName:   "cilium",
+			AttachedNamespaces: []string{"cozy-public", "tenant-foo"},
+		},
+	}
+	first := tlsRouteAttached("aaa", "cozy-public", orphaned, "tls-gone", "tenant-foo")
+	second := tlsRouteAttached("zzz", "tenant-foo", orphaned, "tls-gone", "tenant-foo")
+
+	c := fake.NewClientBuilder().
+		WithScheme(s).
+		WithObjects(tgw, first, second).
+		WithStatusSubresource(tgw, first, second).
+		Build()
+
+	r := &Reconciler{Client: c, Scheme: s}
+	if _, err := r.Reconcile(context.TODO(), ctrl.Request{
+		NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"},
+	}); err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+
+	for _, want := range []types.NamespacedName{
+		{Name: "aaa", Namespace: "cozy-public"},
+		{Name: "zzz", Namespace: "tenant-foo"},
+	} {
+		got := &gatewayv1alpha2.TLSRoute{}
+		if err := c.Get(context.TODO(), want, got); err != nil {
+			t.Fatalf("get %s: %v", want, err)
+		}
+		var accepted *metav1.Condition
+		for _, ps := range got.Status.Parents {
+			if string(ps.ControllerName) != testControllerName {
+				continue
+			}
+			for i := range ps.Conditions {
+				if ps.Conditions[i].Type == "Accepted" {
+					accepted = &ps.Conditions[i]
+				}
+			}
+		}
+		if accepted == nil {
+			t.Fatalf("%s: no Accepted condition under %s: %+v", want, testControllerName, got.Status.Parents)
+		}
+		if accepted.Reason == "HostnameConflict" {
+			t.Errorf("%s: told it lost %s to another route, which is equally unserved: %q", want, orphaned, accepted.Message)
+		}
+		if n := strings.Count(accepted.Message, orphaned); n != 1 {
+			t.Errorf("%s: hostname named %d times in one condition, want 1: %q", want, n, accepted.Message)
+		}
+	}
+}
+
+// TestReconcile_TLSRouteKeepsAcceptedWhenAnHTTPRouteWinsAPassthroughName
+// pins the mixed-kind race on a passthrough hostname. Ownership ranks
+// by namespace with no notion of kind, so a cozy-* HTTPRoute outranks
+// a tenant TLSRoute for a name a passthrough listener answers. That
+// HTTPRoute is then withdrawn, because no terminate listener is
+// rendered for such a name — and the TLSRoute, which is the one the
+// passthrough listener actually serves, was left holding a conflict
+// naming a route that this same reconcile declined to serve.
+//
+// cert-manager makes the shape reachable rather than theoretical: its
+// HTTP-01 challenge route lives in cozy-cert-manager and carries the
+// hostname under validation.
+func TestReconcile_TLSRouteKeepsAcceptedWhenAnHTTPRouteWinsAPassthroughName(t *testing.T) {
+	const contested = "api.foo.example.com"
+	s := newScheme(t)
+	tgw := &gatewayv1alpha1.TenantGateway{
+		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
+		Spec: gatewayv1alpha1.TenantGatewaySpec{
+			Apex:                   "foo.example.com",
+			CertMode:               gatewayv1alpha1.CertModeHTTP01,
+			GatewayClassName:       "cilium",
+			AttachedNamespaces:     []string{"cozy-public", "tenant-foo"},
+			TLSPassthroughServices: []string{"api"},
+		},
+	}
+	// The TLSRoute is the passthrough listener's intended user; the
+	// HTTPRoute merely outranks it by namespace.
+	served := tlsRouteAttached("kubernetes-api", "tenant-foo", contested, "tls-api", "tenant-foo")
+	outranking := httpRouteAttached("challenge", "cozy-public", contested)
+
+	c := fake.NewClientBuilder().
+		WithScheme(s).
+		WithObjects(tgw, served, outranking).
+		WithStatusSubresource(tgw, served, &gatewayv1.HTTPRoute{}).
+		Build()
+
+	r := &Reconciler{Client: c, Scheme: s}
+	if _, err := r.Reconcile(context.TODO(), ctrl.Request{
+		NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"},
+	}); err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+
+	got := &gatewayv1alpha2.TLSRoute{}
+	if err := c.Get(context.TODO(), types.NamespacedName{Name: "kubernetes-api", Namespace: "tenant-foo"}, got); err != nil {
+		t.Fatalf("get served TLSRoute: %v", err)
+	}
+	var accepted *metav1.Condition
+	for _, ps := range got.Status.Parents {
+		if string(ps.ControllerName) != testControllerName {
+			continue
+		}
+		for i := range ps.Conditions {
+			if ps.Conditions[i].Type == "Accepted" {
+				accepted = &ps.Conditions[i]
+			}
+		}
+	}
+	if accepted == nil {
+		t.Fatalf("no Accepted condition under %s: %+v", testControllerName, got.Status.Parents)
+	}
+	if accepted.Status != metav1.ConditionTrue {
+		t.Errorf("the route the passthrough listener serves reports Accepted=%s reason=%s: %q", accepted.Status, accepted.Reason, accepted.Message)
+	}
+}
+
+// TestReconcile_RouteLosingOneHostnameAndWithdrawnOnAnother pins that
+// a route hit by both causes hears about both. One route can lose a
+// race for one hostname and have another withdrawn under it, and
+// Gateway API gives it a single Accepted condition to say so in, which
+// is what makes it tempting to report whichever cause is found first.
+// Reporting only the race hides the withdrawal, and the withdrawal is
+// the one fact no other object carries: no terminate listener is
+// rendered for the name, so nothing on the Gateway mentions it, while
+// the lost hostname at least still has the winning route to look at.
+func TestReconcile_RouteLosingOneHostnameAndWithdrawnOnAnother(t *testing.T) {
+	const withdrawnName = "api.foo.example.com"
+	const contestedName = "shared.foo.example.com"
+	s := newScheme(t)
+	tgw := &gatewayv1alpha1.TenantGateway{
+		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
+		Spec: gatewayv1alpha1.TenantGatewaySpec{
+			Apex:                   "foo.example.com",
+			CertMode:               gatewayv1alpha1.CertModeHTTP01,
+			GatewayClassName:       "cilium",
+			AttachedNamespaces:     []string{"cozy-public", "tenant-foo"},
+			TLSPassthroughServices: []string{"api"},
+		},
+	}
+	winner := httpRouteAttached("shared", "cozy-public", contestedName)
+	mixed := httpRouteAttached("mixed", "tenant-foo", withdrawnName)
+	mixed.Spec.Hostnames = append(mixed.Spec.Hostnames, contestedName)
+	claimant := passthroughTLSRoute("api-tls", "tenant-foo", withdrawnName, "api")
+
+	c := fake.NewClientBuilder().
+		WithScheme(s).
+		WithObjects(tgw, winner, mixed, claimant).
+		WithStatusSubresource(tgw, &gatewayv1.HTTPRoute{}, &gatewayv1alpha2.TLSRoute{}).
+		Build()
+
+	r := &Reconciler{Client: c, Scheme: s}
+	if _, err := r.Reconcile(context.TODO(), ctrl.Request{
+		NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"},
+	}); err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+
+	accepted := acceptedCondition(t, c, "mixed", "tenant-foo")
+	if accepted.Status != metav1.ConditionFalse {
+		t.Errorf("Accepted=%s while neither hostname is served", accepted.Status)
+	}
+	if !strings.Contains(accepted.Message, contestedName) {
+		t.Errorf("message omits the hostname lost to another route: %q", accepted.Message)
+	}
+	if !strings.Contains(accepted.Message, withdrawnName) {
+		t.Errorf("message omits the withdrawn hostname, which no other object reports: %q", accepted.Message)
+	}
+}
+
+// TestReconcile_LoserMessageIsStableAcrossReconciles pins the same
+// property for the race branch that describeWithdrawn pins for the
+// withdrawal branch. A route losing two hostnames has them joined into
+// its condition, and an order that comes out of a map rewrites the
+// message on every pass, which writes status, which requeues this
+// object through the route watch.
+func TestReconcile_LoserMessageIsStableAcrossReconciles(t *testing.T) {
+	s := newScheme(t)
+	tgw := &gatewayv1alpha1.TenantGateway{
+		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
+		Spec: gatewayv1alpha1.TenantGatewaySpec{
+			Apex:               "foo.example.com",
+			CertMode:           gatewayv1alpha1.CertModeHTTP01,
+			GatewayClassName:   "cilium",
+			AttachedNamespaces: []string{"cozy-public", "tenant-foo"},
+		},
+	}
+	// Five contested hostnames rather than two: the order comes out of
+	// a map, and with few enough entries a run can repeat the same
+	// order across every pass and let an unsorted join through.
+	contested := []gatewayv1.Hostname{"one.foo.example.com", "two.foo.example.com", "three.foo.example.com", "four.foo.example.com", "five.foo.example.com"}
+	winners := httpRouteAttached("held", "cozy-public", string(contested[0]))
+	winners.Spec.Hostnames = append(winners.Spec.Hostnames, contested[1:]...)
+	loser := httpRouteAttached("shadow", "tenant-foo", string(contested[0]))
+	loser.Spec.Hostnames = append(loser.Spec.Hostnames, contested[1:]...)
+
+	c := fake.NewClientBuilder().
+		WithScheme(s).
+		WithObjects(tgw, winners, loser).
+		WithStatusSubresource(tgw, &gatewayv1.HTTPRoute{}).
+		Build()
+
+	r := &Reconciler{Client: c, Scheme: s}
+	var first string
+	for pass := range 20 {
+		if _, err := r.Reconcile(context.TODO(), ctrl.Request{
+			NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"},
+		}); err != nil {
+			t.Fatalf("pass %d: unexpected error: %v", pass, err)
+		}
+		msg := acceptedCondition(t, c, "shadow", "tenant-foo").Message
+		if pass == 0 {
+			first = msg
+			continue
+		}
+		if msg != first {
+			t.Fatalf("the lost hostnames are listed in an unstable order, so every reconcile rewrites the condition:\n  pass 0: %q\n  pass %d: %q", first, pass, msg)
+		}
+	}
+}
+
+// TestReconcile_RepeatedHostnameIsNamedOnce pins that a route listing
+// one hostname twice hears about it once. Gateway API declares
+// spec.hostnames a plain array with no listType, so the duplicate is
+// admissible, and the claim map then carries the same ref twice for
+// that name. A condition that says the same thing twice reads as two
+// different problems.
+func TestReconcile_RepeatedHostnameIsNamedOnce(t *testing.T) {
+	const published = "pg.db.foo.example.com"
+	s := newScheme(t)
+	tgw := &gatewayv1alpha1.TenantGateway{
+		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
+		Spec: gatewayv1alpha1.TenantGatewaySpec{
+			Apex:             "foo.example.com",
+			CertMode:         gatewayv1alpha1.CertModeHTTP01,
+			GatewayClassName: "cilium",
+			TLSPassthroughListeners: []gatewayv1alpha1.TLSPassthroughListener{
+				{Name: "wild", Port: 5432, Hostname: "*.db.foo.example.com"},
+			},
+		},
+	}
+	route := httpRouteAttached("pg", "tenant-foo", published)
+	route.Spec.Hostnames = append(route.Spec.Hostnames, published)
+	claimant := passthroughTLSRoute("pg-tls", "tenant-foo", published, "wild")
+
+	c := fake.NewClientBuilder().
+		WithScheme(s).
+		WithObjects(tgw, route, claimant).
+		WithStatusSubresource(tgw, &gatewayv1.HTTPRoute{}, &gatewayv1alpha2.TLSRoute{}).
+		Build()
+
+	r := &Reconciler{Client: c, Scheme: s}
+	if _, err := r.Reconcile(context.TODO(), ctrl.Request{
+		NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"},
+	}); err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+
+	msg := acceptedCondition(t, c, "pg", "tenant-foo").Message
+	if n := strings.Count(msg, published); n != 1 {
+		t.Errorf("hostname named %d times in one condition, want 1: %q", n, msg)
+	}
+}
+
+// TestReconcile_RepeatedLostHostnameIsNamedOnce is the same property on
+// the other half of the message. Both halves are built from claims that
+// may carry a hostname twice, and fixing one and not the other leaves
+// the same condition inconsistent with itself.
+func TestReconcile_RepeatedLostHostnameIsNamedOnce(t *testing.T) {
+	const contested = "harbor.foo.example.com"
+	s := newScheme(t)
+	tgw := &gatewayv1alpha1.TenantGateway{
+		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
+		Spec: gatewayv1alpha1.TenantGatewaySpec{
+			Apex:               "foo.example.com",
+			CertMode:           gatewayv1alpha1.CertModeHTTP01,
+			GatewayClassName:   "cilium",
+			AttachedNamespaces: []string{"cozy-public", "tenant-foo"},
+		},
+	}
+	winner := httpRouteAttached("harbor", "cozy-public", contested)
+	loser := httpRouteAttached("harbor-shadow", "tenant-foo", contested)
+	loser.Spec.Hostnames = append(loser.Spec.Hostnames, contested)
+
+	c := fake.NewClientBuilder().
+		WithScheme(s).
+		WithObjects(tgw, winner, loser).
+		WithStatusSubresource(tgw, &gatewayv1.HTTPRoute{}).
+		Build()
+
+	r := &Reconciler{Client: c, Scheme: s}
+	if _, err := r.Reconcile(context.TODO(), ctrl.Request{
+		NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"},
+	}); err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+
+	msg := acceptedCondition(t, c, "harbor-shadow", "tenant-foo").Message
+	if n := strings.Count(msg, contested); n != 1 {
+		t.Errorf("lost hostname named %d times in one condition, want 1: %q", n, msg)
+	}
+}
+
+// TestReconcile_WildcardClaimOverlappingSeveralPassthroughNames pins
+// that the condition written for one claimed hostname overlapping more
+// than one reserved name is the same on every pass. Reserved names are
+// pairwise non-overlapping, which is why a concrete claim can match at
+// most one of them, but a claimed wildcard is not concrete and covers
+// every shipped tlsPassthroughServices entry under the apex.
+//
+// The fixture is the stock one. No tlsPassthroughListeners, the
+// shipped passthrough services, and an ordinary tenant HTTPRoute that
+// publishes a wildcard, which the hostname policy admits because it
+// ends in the tenant's own apex. Such a route is refused for the
+// wildcard before the overlap is read, so the condition names the
+// wildcard rather than a reserved entry; what the passes guard is that
+// nothing in the text is picked by map order, because each rewrite is
+// a status write that requeues the TenantGateway through the HTTPRoute
+// watch, and the controller would rewrite the condition for as long as
+// the spec stands.
+func TestReconcile_WildcardClaimOverlappingSeveralPassthroughNames(t *testing.T) {
+	s := newScheme(t)
+	tgw := &gatewayv1alpha1.TenantGateway{
+		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
+		Spec: gatewayv1alpha1.TenantGatewaySpec{
+			Apex:                   "foo.example.com",
+			CertMode:               gatewayv1alpha1.CertModeHTTP01,
+			GatewayClassName:       "cilium",
+			TLSPassthroughServices: []string{"api", "vm-exportproxy", "cdi-uploadproxy"},
+		},
+	}
+	route := httpRouteAttached("wild", "tenant-foo", "*.foo.example.com")
+
+	c := fake.NewClientBuilder().
+		WithScheme(s).
+		WithObjects(tgw, route).
+		WithStatusSubresource(tgw, &gatewayv1.HTTPRoute{}).
+		Build()
+
+	r := &Reconciler{Client: c, Scheme: s}
+	var first string
+	for pass := range 20 {
+		if _, err := r.Reconcile(context.TODO(), ctrl.Request{
+			NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"},
+		}); err != nil {
+			t.Fatalf("pass %d: unexpected error: %v", pass, err)
+		}
+		got := &gatewayv1.HTTPRoute{}
+		if err := c.Get(context.TODO(), types.NamespacedName{Name: "wild", Namespace: "tenant-foo"}, got); err != nil {
+			t.Fatalf("pass %d: get route: %v", pass, err)
+		}
+		var msg string
+		for _, ps := range got.Status.Parents {
+			if string(ps.ControllerName) != testControllerName {
+				continue
+			}
+			for i := range ps.Conditions {
+				if ps.Conditions[i].Type == "Accepted" {
+					msg = ps.Conditions[i].Message
+				}
+			}
+		}
+		// A pass that writes no condition of ours would make every
+		// comparison below trivially equal.
+		if msg == "" {
+			t.Fatalf("pass %d: no Accepted condition under %s: %+v", pass, testControllerName, got.Status.Parents)
+		}
+		if pass == 0 {
+			first = msg
+			continue
+		}
+		if msg != first {
+			t.Fatalf("the passthrough entry named for one claimed hostname is not stable, so every reconcile rewrites the condition:\n  pass 0: %q\n  pass %d: %q", first, pass, msg)
+		}
+	}
+}
+
+// TestReconcile_TLSRouteWithoutPassthroughListenerTerminatesNothing
+// covers the TLSRoute hostname that no passthrough listener claims —
+// a sectionName pointing at nothing, or a spec edited to drop the entry
+// while the route stayed. The hostname is then outside the passthrough
+// set, so only the route kind keeps it from being terminated, and this
+// is the one case that pins that half of the rule. The route cannot be
+// served either way; the point is that the Gateway does not order a
+// certificate for it.
+func TestReconcile_TLSRouteWithoutPassthroughListenerTerminatesNothing(t *testing.T) {
+	s := newScheme(t)
+	tgw := &gatewayv1alpha1.TenantGateway{
+		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
+		Spec: gatewayv1alpha1.TenantGatewaySpec{
+			Apex:             "foo.example.com",
+			CertMode:         gatewayv1alpha1.CertModeHTTP01,
+			GatewayClassName: "cilium",
+		},
+	}
+	route := tlsRouteAttached("orphan", "tenant-foo", "gone.foo.example.com", "tls-gone", "tenant-foo")
+
+	c := fake.NewClientBuilder().
+		WithScheme(s).
+		WithObjects(tgw, route).
+		WithStatusSubresource(tgw, route).
+		Build()
+
+	r := &Reconciler{Client: c, Scheme: s}
+	if _, err := r.Reconcile(context.TODO(), ctrl.Request{
+		NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"},
+	}); err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+
+	gw := &gatewayv1.Gateway{}
+	if err := c.Get(context.TODO(), types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"}, gw); err != nil {
+		t.Fatalf("get Gateway: %v", err)
+	}
+	for _, l := range gw.Spec.Listeners {
+		if l.Hostname != nil && string(*l.Hostname) == "gone.foo.example.com" {
+			t.Errorf("listener %s (%s) serves a TLSRoute-only hostname with no passthrough listener behind it", l.Name, l.Protocol)
+		}
+	}
+
+	// Rendering nothing is only half the contract. Before this rule the
+	// hostname did get a terminate listener, which Cilium then refused
+	// with ResolvedRefs=False, so the operator had one object saying the
+	// route was going nowhere. Withdrawing the listener takes that away,
+	// and the route condition is the only place left to put it back.
+	got := &gatewayv1alpha2.TLSRoute{}
+	if err := c.Get(context.TODO(), types.NamespacedName{Name: "orphan", Namespace: "tenant-foo"}, got); err != nil {
+		t.Fatalf("get route: %v", err)
+	}
+	var accepted *metav1.Condition
+	for _, ps := range got.Status.Parents {
+		if string(ps.ControllerName) != testControllerName {
+			continue
+		}
+		for i := range ps.Conditions {
+			if ps.Conditions[i].Type == "Accepted" {
+				accepted = &ps.Conditions[i]
+			}
+		}
+	}
+	if accepted == nil {
+		t.Fatalf("no Accepted condition under %s: %+v", testControllerName, got.Status.Parents)
+	}
+	if accepted.Status == metav1.ConditionTrue {
+		t.Fatalf("TLSRoute on gone.foo.example.com reports Accepted=True with no listener rendered for it and none it could attach to")
+	}
+	// The flag alone is not the deliverable. Withdrawing the listener
+	// removed the object that named the hostname, so a condition that
+	// says False without saying which name and why leaves the operator
+	// exactly where the missing listener did.
+	if !strings.Contains(accepted.Message, "gone.foo.example.com") {
+		t.Errorf("condition does not name the hostname it declines to serve: reason=%s message=%q", accepted.Reason, accepted.Message)
+	}
+
+	certs := &cmv1.CertificateList{}
+	if err := c.List(context.TODO(), certs); err != nil {
+		t.Fatalf("list certs: %v", err)
+	}
+	for i := range certs.Items {
+		for _, dns := range certs.Items[i].Spec.DNSNames {
+			if dns == "gone.foo.example.com" {
+				t.Errorf("Certificate %s orders gone.foo.example.com for a TLSRoute the Gateway never terminates", certs.Items[i].Name)
+			}
+		}
+	}
+}
+
+// TestReconcile_HTTPRouteKeepsListenerWhenTLSRouteClaimsSameHostname
+// pins that a TLSRoute cannot starve an HTTPRoute of its listener.
+//
+// resolveHostnameOwners picks one winner per hostname by namespace and
+// name, with no notion of route kind, and it records same-namespace
+// losers nowhere — so deciding what to terminate from the winner alone
+// lets a TLSRoute that merely sorts first take the hostname away from
+// an HTTPRoute that is still reported Accepted=True. The route names
+// here are chosen so the TLSRoute wins that sort.
+func TestReconcile_HTTPRouteKeepsListenerWhenTLSRouteClaimsSameHostname(t *testing.T) {
+	s := newScheme(t)
+	tgw := &gatewayv1alpha1.TenantGateway{
+		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
+		Spec: gatewayv1alpha1.TenantGatewaySpec{
+			Apex:             "foo.example.com",
+			CertMode:         gatewayv1alpha1.CertModeHTTP01,
+			GatewayClassName: "cilium",
+		},
+	}
+	tlsRoute := tlsRouteAttached("aaa-db", "tenant-foo", "app.foo.example.com", "tls-nothing", "tenant-foo")
+	httpRoute := httpRouteAttached("zzz-web", "tenant-foo", "app.foo.example.com")
+
+	c := fake.NewClientBuilder().
+		WithScheme(s).
+		WithObjects(tgw, tlsRoute, httpRoute).
+		WithStatusSubresource(tgw, tlsRoute, httpRoute).
+		Build()
+
+	r := &Reconciler{Client: c, Scheme: s}
+	if _, err := r.Reconcile(context.TODO(), ctrl.Request{
+		NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"},
+	}); err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+
+	gw := &gatewayv1.Gateway{}
+	if err := c.Get(context.TODO(), types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"}, gw); err != nil {
+		t.Fatalf("get Gateway: %v", err)
+	}
+	var terminates bool
+	for _, l := range gw.Spec.Listeners {
+		if l.Protocol == gatewayv1.HTTPSProtocolType && l.Hostname != nil && string(*l.Hostname) == "app.foo.example.com" {
+			terminates = true
+		}
+	}
+	if !terminates {
+		t.Errorf("HTTPRoute zzz-web claims app.foo.example.com and no passthrough listener does, but nothing terminates it: %+v", gw.Spec.Listeners)
+	}
+}
+
+// TestReconcile_TLSRouteGetsRouteParentStatus pins that a TLSRoute is
+// still observed by the reconciler even though it produces no listener
+// of its own: it must get a RouteParentStatus entry under our
+// ControllerName. Dropping TLSRoutes from hostname collection entirely
+// would satisfy the two tests above and silently take this with it,
+// leaving every TLSRoute without an Accepted condition.
+func TestReconcile_TLSRouteGetsRouteParentStatus(t *testing.T) {
+	s := newScheme(t)
+	tgw := &gatewayv1alpha1.TenantGateway{
+		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
+		Spec: gatewayv1alpha1.TenantGatewaySpec{
+			Apex:             "foo.example.com",
+			CertMode:         gatewayv1alpha1.CertModeHTTP01,
+			GatewayClassName: "cilium",
+			TLSPassthroughListeners: []gatewayv1alpha1.TLSPassthroughListener{
+				{Name: "postgres", Port: 5432, Hostname: "postgres.foo.example.com"},
+			},
+		},
+	}
+	route := tlsRouteAttached("postgres", "tenant-foo", "postgres.foo.example.com", "tls-postgres", "tenant-foo")
+
+	c := fake.NewClientBuilder().
+		WithScheme(s).
+		WithObjects(tgw, route).
+		WithStatusSubresource(tgw, route).
+		Build()
+
+	r := &Reconciler{Client: c, Scheme: s}
+	if _, err := r.Reconcile(context.TODO(), ctrl.Request{
+		NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"},
+	}); err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+
+	got := &gatewayv1alpha2.TLSRoute{}
+	if err := c.Get(context.TODO(), types.NamespacedName{Name: "postgres", Namespace: "tenant-foo"}, got); err != nil {
+		t.Fatalf("get TLSRoute: %v", err)
+	}
+	var accepted bool
+	for _, ps := range got.Status.Parents {
+		if ps.ControllerName != ControllerName {
+			continue
+		}
+		for _, cond := range ps.Conditions {
+			if cond.Type == string(gatewayv1.RouteConditionAccepted) && cond.Status == metav1.ConditionTrue {
+				accepted = true
+			}
+		}
+	}
+	if !accepted {
+		t.Errorf("expected Accepted=True under %s, got Status.Parents=%+v", ControllerName, got.Status.Parents)
+	}
+}
+
+// TestValidateTLSPassthroughListenersReportsApexBeforeOverlap pins the
+// order of two checks that can both fire on one entry. An out-of-apex
+// hostname is the actionable mistake; reporting the overlap instead
+// sends the reader to inspect an unrelated listener that is not the
+// problem. Asserting only that the entry is rejected would pass either
+// way, so this asserts which error comes back.
+func TestValidateTLSPassthroughListenersReportsApexBeforeOverlap(t *testing.T) {
+	// "*.example.com" covers the tls-api listener's hostname
+	// (api.foo.example.com) AND sits outside the apex foo.example.com,
+	// so both checks match this one entry. Two exact hostnames can
+	// never overlap, so the case has to use a wildcard to reach the
+	// state where the ordering is observable at all.
+	listeners := []gatewayv1alpha1.TLSPassthroughListener{
+		{Name: "pg", Port: 5432, Hostname: "*.example.com"},
+	}
+	err := validateTLSPassthroughListeners(listeners, []string{"api"}, "foo.example.com")
+	if err == nil {
+		t.Fatal("expected an error, got nil")
+	}
+	if !strings.Contains(err.Error(), "outside the tenant apex") {
+		t.Errorf("error should name the apex violation, got: %v", err)
+	}
+	if strings.Contains(err.Error(), "overlaps listener") {
+		t.Errorf("error reports the overlap instead of the apex violation: %v", err)
+	}
+}
+
+// TestRenderGatewayReportsCertModeBeforeTheFieldRules pins the order of
+// two refusals that can both fire on one spec.
+//
+// Under edge the field is refused whole, so a bad hostname inside it
+// decides nothing and naming it sends the reader to edit a value that is
+// not the reason the spec was rejected. Asserting only that the render
+// fails would pass either way, so this asserts which error comes back.
+//
+// The state is reachable only when the controller and the CRD are
+// skewed, since the CEL rule refuses the same spec at admission. That is
+// the state this copy of the rules exists for.
+func TestRenderGatewayReportsCertModeBeforeTheFieldRules(t *testing.T) {
+	tgw := &gatewayv1alpha1.TenantGateway{
+		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
+		Spec: gatewayv1alpha1.TenantGatewaySpec{
+			Apex:             "foo.example.com",
+			CertMode:         gatewayv1alpha1.CertModeEdge,
+			GatewayClassName: "cilium",
+			TLSPassthroughListeners: []gatewayv1alpha1.TLSPassthroughListener{
+				{Name: "pg", Port: 5432, Hostname: "pg.other.example.com"},
+			},
+		},
+	}
+
+	r := &Reconciler{Scheme: newScheme(t)}
+	_, err := r.renderGateway(tgw, nil, nil)
+	if err == nil {
+		t.Fatal("expected the render to fail, got nil")
+	}
+	if !strings.Contains(err.Error(), "certMode") {
+		t.Errorf("error should name the cert mode, got: %v", err)
+	}
+	if strings.Contains(err.Error(), "outside the tenant apex") {
+		t.Errorf("error reports the hostname rule instead of the cert mode: %v", err)
+	}
+}
+
+// TestRenderGatewayRefusesAnUnjudgedSpec pins the field-rule guard at
+// the top of renderGateway, which the reconcile path makes redundant and
+// nothing else was checking.
+//
+// The function claims not to render from a spec it has not judged, and
+// that claim is what keeps a Gateway built from a malformed spec out of
+// the apiserver, which refuses the whole object over one bad composed
+// value. Its sibling call is pinned by the ordering test; this one had
+// no test at all, so removing it left the suite green and the claim
+// standing.
+//
+// certMode is http01 so the cert-mode rule cannot be what refuses this,
+// which is the only way the assertion says something about the call it
+// is here for.
+func TestRenderGatewayRefusesAnUnjudgedSpec(t *testing.T) {
+	tgw := &gatewayv1alpha1.TenantGateway{
+		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
+		Spec: gatewayv1alpha1.TenantGatewaySpec{
+			Apex:             "foo.example.com",
+			CertMode:         gatewayv1alpha1.CertModeHTTP01,
+			GatewayClassName: "cilium",
+			TLSPassthroughListeners: []gatewayv1alpha1.TLSPassthroughListener{
+				{Name: "pg", Port: 5432, Hostname: "pg.other.example.com"},
+			},
+		},
+	}
+
+	r := &Reconciler{Scheme: newScheme(t)}
+	_, err := r.renderGateway(tgw, nil, nil)
+	if err == nil {
+		t.Fatal("expected renderGateway to refuse an out-of-apex hostname, got nil")
+	}
+	if !strings.Contains(err.Error(), "outside the tenant apex") {
+		t.Errorf("error does not name the rule that refused the spec: %v", err)
+	}
+}
+
+// TestValidateTLSPassthroughListenersNamesAnUnusableApex pins where an
+// apex that no listener hostname can sit inside is judged, and which
+// value the error names.
+//
+// A hostname must be a lowercase DNS name and must sit inside the apex,
+// so under an apex carrying upper case the two requirements have no
+// common solution and every entry is refused. The apex is what the
+// tenant has to change, and the containment error names the hostname —
+// a value that is not wrong — so the apex is checked first and reported
+// on its own terms.
+//
+// It is judged here rather than by a schema pattern because the apex is
+// an already-shipped field the tenant does not write directly, and a
+// pattern refuses the TenantGateway write itself: the gateway
+// HelmRelease then cannot apply and goes NotReady, where a status error
+// costs the one Gateway. An apex is only judged when the field is in
+// use, so a tenant that never declares a listener keeps the behaviour
+// it had.
+func TestValidateTLSPassthroughListenersNamesAnUnusableApex(t *testing.T) {
+	listeners := []gatewayv1alpha1.TLSPassthroughListener{
+		{Name: "postgres", Port: 5432, Hostname: "postgres.foo.example.com"},
+	}
+
+	err := validateTLSPassthroughListeners(listeners, nil, "Foo.Example.com")
+	if err == nil {
+		t.Fatal("expected a mixed-case apex to be refused, got nil")
+	}
+	if !strings.Contains(err.Error(), "Foo.Example.com") {
+		t.Errorf("error does not name the apex the tenant has to change: %v", err)
+	}
+	// The hostname is well-formed and inside the apex once case is set
+	// aside, so an error naming it sends the reader to edit the one
+	// value that is correct.
+	if strings.Contains(err.Error(), "outside the tenant apex") {
+		t.Errorf("error blames the hostname for the apex: %v", err)
+	}
+
+	// Declaring no listener leaves the apex unjudged. tlsPassthroughServices
+	// is populated here because that list is validated in the same
+	// function, so a check placed at the top rather than behind the
+	// listener count would reach a tenant that never opted into this
+	// field.
+	if err := validateTLSPassthroughListeners(nil, []string{"api"}, "Foo.Example.com"); err != nil {
+		t.Errorf("apex judged with no listener declared: %v", err)
+	}
+}
+
+// selectsByNamespaceName reports whether an allowedRoutes block admits
+// namespaces by their own name, which is how the native-port listeners
+// are narrowed to the publishing tenant. The shared port-443 listeners
+// select on the gateway label instead, so the two are told apart by
+// which selector shape they carry rather than by a value repeated here.
+func selectsByNamespaceName(t *testing.T, ar *gatewayv1.AllowedRoutes) bool {
+	t.Helper()
+	if ar == nil || ar.Namespaces == nil || ar.Namespaces.Selector == nil {
+		t.Fatal("passthrough listener renders no allowedRoutes selector")
+	}
+	for _, e := range ar.Namespaces.Selector.MatchExpressions {
+		if e.Key == "kubernetes.io/metadata.name" {
+			return true
+		}
+	}
+	return false
+}
+
+// TestPassthroughListenersMatchTheRenderedGateway pins that the
+// enumeration the reconciler reads its reserved hostnames, listener
+// sections and attach sets from lists exactly the passthrough listeners
+// renderGateway emits, under every certMode the CRD declares.
+//
+// Both are derived from the same two spec fields, and nothing but this
+// makes them derive the same set. A passthrough source the renderer
+// gains and the enumeration misses renders a listener no hostname is
+// reserved for, so the terminate listener stays and the two collide on
+// one SNI; missed the other way round, a hostname is withdrawn from
+// termination with no passthrough listener serving it. Neither surfaces
+// as a failure anywhere else.
+//
+// The mode decides the set and not merely its contents: edge ends TLS
+// at the class provider, so the Gateway carries no TLS listener and
+// every tlsPassthroughServices entry is dropped. An enumeration that
+// still lists them reserves hostnames nothing serves and withdraws them
+// from the listeners that would. Walking the CRD enum rather than a
+// list restated here puts a newly added mode through the comparison on
+// its own.
+func TestPassthroughListenersMatchTheRenderedGateway(t *testing.T) {
+	const apex = "foo.example.com"
+	services := []string{"api", "vm-exportproxy"}
+	// Edge refuses the native-port listeners, so asking for them there
+	// fails the render instead of comparing sets.
+	nativePort := []gatewayv1alpha1.TLSPassthroughListener{
+		{Name: "postgres", Port: 5432, Hostname: "postgres." + apex},
+		{Name: "kafka", Port: 9092, Hostname: "*.kafka." + apex},
+	}
+
+	// What each mode publishes, declared here rather than derived from
+	// the code under test: a mode added to the enum with no entry fails
+	// below instead of being compared against whatever it happens to do.
+	cases := map[gatewayv1alpha1.CertMode]struct {
+		listeners []gatewayv1alpha1.TLSPassthroughListener
+		// wildcardSecret supplies spec.wildcardSecretRef, which
+		// existingSecret refuses to render without.
+		wildcardSecret bool
+		want           int
+	}{
+		gatewayv1alpha1.CertModeHTTP01:         {listeners: nativePort, want: len(services) + len(nativePort)},
+		gatewayv1alpha1.CertModeDNS01:          {listeners: nativePort, want: len(services) + len(nativePort)},
+		gatewayv1alpha1.CertModeExistingSecret: {listeners: nativePort, wildcardSecret: true, want: len(services) + len(nativePort)},
+		gatewayv1alpha1.CertModeEdge:           {want: 0},
+	}
+
+	declared := declaredCertModes(t)
+	for mode := range declared {
+		if _, ok := cases[mode]; !ok {
+			t.Errorf("certMode %q is in the CRD enum with no case here; decide what it renders and compare the enumeration against it", mode)
+		}
+	}
+	for mode := range cases {
+		if _, ok := declared[mode]; !ok {
+			t.Errorf("certMode %q has a case here but is not in the CRD enum", mode)
+		}
+	}
+
+	for mode, tc := range cases {
+		if _, ok := declared[mode]; !ok {
+			continue
+		}
+		t.Run(string(mode), func(t *testing.T) {
+			tgw := &gatewayv1alpha1.TenantGateway{
+				ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
+				Spec: gatewayv1alpha1.TenantGatewaySpec{
+					Apex:                    apex,
+					CertMode:                mode,
+					GatewayClassName:        "cilium",
+					TLSPassthroughServices:  services,
+					TLSPassthroughListeners: tc.listeners,
+				},
+			}
+			if tc.wildcardSecret {
+				tgw.Spec.WildcardSecretRef = &corev1.LocalObjectReference{Name: "wildcard-tls"}
+			}
+
+			r := &Reconciler{Scheme: newScheme(t)}
+			gw, err := r.renderGateway(tgw, []string{"app." + apex}, nil)
+			if err != nil {
+				t.Fatalf("renderGateway: %v", err)
+			}
+
+			// Compared as ordered slices, not as maps: the enumeration's
+			// doc says it lists the entries in the order renderGateway
+			// emits them, and an order-blind comparison would let that
+			// sentence rot.
+			//
+			// Every field is compared, not just the two that name the
+			// listener. port and tenantOnly are what eligibility decides
+			// on, so a test that pinned the pair and skipped them would
+			// pass on exactly the drift that matters most.
+			rendered := []passthroughListener{}
+			for _, l := range gw.Spec.Listeners {
+				if l.Protocol != gatewayv1.TLSProtocolType || l.TLS == nil || l.TLS.Mode == nil || *l.TLS.Mode != gatewayv1.TLSModePassthrough {
+					continue
+				}
+				if l.Hostname == nil {
+					t.Fatalf("passthrough listener %q renders no hostname", l.Name)
+				}
+				rendered = append(rendered, passthroughListener{
+					section:  string(l.Name),
+					hostname: string(*l.Hostname),
+					port:     int32(l.Port),
+					// Read off the rendered selector rather than
+					// restated: a listener admits the tenant alone
+					// exactly when it selects by
+					// kubernetes.io/metadata.name, where the shared ones
+					// select on the gateway label.
+					tenantOnly: selectsByNamespaceName(t, l.AllowedRoutes),
+				})
+			}
+			// The rendered count is held against the mode's declared
+			// expectation before the two sides meet: agreeing with each
+			// other on a set that exercised neither spec field is what a
+			// bare comparison reports as a pass.
+			if len(rendered) != tc.want {
+				t.Fatalf("rendered %d passthrough listeners, want %d: %v", len(rendered), tc.want, rendered)
+			}
+
+			// Compared element by element rather than with
+			// reflect.DeepEqual: under a mode that renders none, an
+			// enumeration returning a nil slice gives the same answer as
+			// one returning an empty slice, and DeepEqual separates them.
+			enumerated := passthroughListeners(tgw)
+			if len(enumerated) != len(rendered) {
+				t.Fatalf("enumeration lists %d passthrough listeners, the rendered Gateway carries %d:\n enumerated %+v\n rendered   %+v", len(enumerated), len(rendered), enumerated, rendered)
+			}
+			for i := range rendered {
+				if enumerated[i] != rendered[i] {
+					t.Errorf("enumeration and rendered Gateway disagree at index %d:\n enumerated %+v\n rendered   %+v", i, enumerated[i], rendered[i])
+				}
+			}
+		})
+	}
+}
+
+// TestReconcile_ListenerAllowedRoutesNotAliased pins that every
+// rendered listener owns its AllowedRoutes.Namespaces rather than
+// sharing one struct with its siblings. The passthrough loops used to
+// shallow-copy the shared base (passthroughAllowed := *allowedRoutes),
+// which left every passthrough listener — and the base itself —
+// pointing at one RouteNamespaces value. Nothing mutated it, so the
+// aliasing was invisible; the next edit that narrowed one listener's
+// namespaces would have silently narrowed all of them, including the
+// HTTPS listeners. Distinct pointers is the invariant that makes such
+// an edit local.
+//
+// This asserts on renderGateway's return value directly rather than on
+// a Gateway fetched from the client: the fake client serialises on
+// write and rebuilds fresh pointers on read, so every listener comes
+// back with its own struct no matter how the renderer built it. Going
+// through the client here would make the test pass unconditionally.
+// Both cert modes are exercised: the branches render different
+// listener sets, and pinning only the default one let the DNS-01 pair
+// ("https" and "https-apex") share a struct undetected.
+func TestReconcile_ListenerAllowedRoutesNotAliased(t *testing.T) {
+	// The two port-443 passthrough listeners in the DNS-01 set are the
+	// class that carried the aliasing this test pins.
+	modes := []struct {
+		name                string
+		mode                gatewayv1alpha1.CertMode
+		childApexes         []string
+		passthroughListener []gatewayv1alpha1.TLSPassthroughListener
+	}{
+		{name: "HTTP01", mode: gatewayv1alpha1.CertModeHTTP01, passthroughListener: []gatewayv1alpha1.TLSPassthroughListener{
+			{Name: "postgres", Port: 5432, Hostname: "postgres.foo.example.com"},
+			{Name: "mysql", Port: 3306, Hostname: "mysql.foo.example.com"},
+		}},
+		{name: "DNS01", mode: gatewayv1alpha1.CertModeDNS01, childApexes: []string{"child.foo.example.com"}, passthroughListener: []gatewayv1alpha1.TLSPassthroughListener{
+			{Name: "postgres", Port: 5432, Hostname: "postgres.foo.example.com"},
+		}},
+	}
+	for _, m := range modes {
+		t.Run(m.name, func(t *testing.T) {
+			tgw := &gatewayv1alpha1.TenantGateway{
+				ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
+				Spec: gatewayv1alpha1.TenantGatewaySpec{
+					Apex:                    "foo.example.com",
+					CertMode:                m.mode,
+					GatewayClassName:        "cilium",
+					TLSPassthroughServices:  []string{"api", "vm-exportproxy"},
+					TLSPassthroughListeners: m.passthroughListener,
+				},
+			}
+
+			r := &Reconciler{Scheme: newScheme(t)}
+			// Two published hostnames, not one: the HTTP-01 branch
+			// renders its per-app listeners from this list, so a single
+			// entry leaves that loop emitting one listener, where no
+			// two pointers can be equal and the assertion below holds
+			// no matter how the renderer builds them.
+			gw, err := r.renderGateway(tgw, []string{"app.foo.example.com", "www.foo.example.com"}, m.childApexes)
+			if err != nil {
+				t.Fatalf("renderGateway: %v", err)
+			}
+
+			if len(gw.Spec.Listeners) < 3 {
+				t.Fatalf("expected at least 3 listeners to compare, got %d", len(gw.Spec.Listeners))
+			}
+			seen := map[*gatewayv1.RouteNamespaces]string{}
+			// Kinds is a slice, so identity is the backing array: two
+			// listeners handed the same slice header alias the same
+			// storage and an append or index-assign on one rewrites the
+			// other. Same invariant as Namespaces, different mechanism.
+			seenKinds := map[*gatewayv1.RouteGroupKind]string{}
+			seenGroups := map[*gatewayv1.Group]string{}
+			for _, l := range gw.Spec.Listeners {
+				if l.AllowedRoutes == nil || l.AllowedRoutes.Namespaces == nil {
+					t.Fatalf("listener %s has no AllowedRoutes.Namespaces", l.Name)
+				}
+				ns := l.AllowedRoutes.Namespaces
+				if other, dup := seen[ns]; dup {
+					t.Errorf("listener %s shares its AllowedRoutes.Namespaces struct with %s", l.Name, other)
+					continue
+				}
+				seen[ns] = string(l.Name)
+
+				if len(l.AllowedRoutes.Kinds) == 0 {
+					continue
+				}
+				k := &l.AllowedRoutes.Kinds[0]
+				if other, dup := seenKinds[k]; dup {
+					t.Errorf("listener %s shares its AllowedRoutes.Kinds backing array with %s", l.Name, other)
+					continue
+				}
+				seenKinds[k] = string(l.Name)
+
+				// One level further down: distinct backing arrays whose
+				// elements still point at one Group leave the same
+				// hazard for anything that writes through the pointer,
+				// so the entry has to be distinct too, not just the
+				// slice holding it.
+				for i := range l.AllowedRoutes.Kinds {
+					g := l.AllowedRoutes.Kinds[i].Group
+					if g == nil {
+						continue
+					}
+					if other, dup := seenGroups[g]; dup {
+						t.Errorf("listener %s shares the *Group of kind %s with %s", l.Name, l.AllowedRoutes.Kinds[i].Kind, other)
+					}
+					seenGroups[g] = string(l.Name)
+				}
+			}
+		})
+	}
+}
+
+// TestValidateTLSPassthroughListeners exercises the cross-field
+// validation the CRD schema alone cannot express: DNS-1123 label names
+// unique across the list and not colliding with a tlsPassthroughServices
+// entry, ports in 1..65535 unique and never a reserved Gateway port
+// (80/443), and hostnames that are exact-or-wildcard AND within the
+// tenant apex. Every rejection case is load-bearing: weakening the
+// corresponding branch in validateTLSPassthroughListeners turns the
+// matching subtest red.
+func TestValidateTLSPassthroughListeners(t *testing.T) {
+	mk := func(name string, port int32, host string) gatewayv1alpha1.TLSPassthroughListener {
+		return gatewayv1alpha1.TLSPassthroughListener{Name: name, Port: port, Hostname: host}
+	}
+	const apex = "foo.example.com"
+	tests := []struct {
+		name      string
+		listeners []gatewayv1alpha1.TLSPassthroughListener
+		services  []string
+		apex      string
+		wantErr   bool
+		// wantErrContains pins each rejection to its own rule: without it
+		// a case rejected by an earlier check still reads as a pass.
+		wantErrContains string
+	}{
+		{"empty is valid", nil, nil, apex, false, ""},
+		{"valid list", []gatewayv1alpha1.TLSPassthroughListener{
+			mk("postgres", 5432, "postgres.foo.example.com"),
+			mk("kafka", 9092, "*.kafka.foo.example.com"),
+		}, nil, apex, false, ""},
+		{"apex-exact and wildcard-at-apex hostnames valid", []gatewayv1alpha1.TLSPassthroughListener{
+			mk("apex", 5432, "foo.example.com"),
+			mk("wild", 5433, "*.foo.example.com"),
+		}, nil, apex, false, ""},
+		{"valid alongside passthrough services", []gatewayv1alpha1.TLSPassthroughListener{
+			mk("postgres", 5432, "postgres.foo.example.com"),
+		}, []string{"api", "vm-exportproxy"}, apex, false, ""},
+		{"duplicate name", []gatewayv1alpha1.TLSPassthroughListener{
+			mk("pg", 5432, "a.foo.example.com"),
+			mk("pg", 5433, "b.foo.example.com"),
+		}, nil, apex, true, "duplicate name"},
+		{"name collides with passthrough service", []gatewayv1alpha1.TLSPassthroughListener{
+			mk("api", 5432, "api.foo.example.com"),
+		}, []string{"api", "vm-exportproxy", "cdi-uploadproxy"}, apex, true, "collides with tlsPassthroughServices entry"},
+		// tlsPassthroughServices is a plain array, not a set, so the
+		// schema permits a repeat. Two identical entries render the
+		// same tls-<svc> listener name twice and the Gateway is
+		// rejected wholesale — the failure this function converts into
+		// a status error for every other shape of the same mistake.
+		{"duplicate passthrough service", nil,
+			[]string{"api", "api"}, apex, true, "duplicate entry"},
+		// Gateway API keys listeners by (port, protocol, hostname), so
+		// these are distinct and the object is accepted; the controller
+		// refuses the pair, which Cilium before 1.19.6 served only one
+		// of (cilium#42898).
+		{"same hostname on different ports", []gatewayv1alpha1.TLSPassthroughListener{
+			mk("pg", 5432, "db.foo.example.com"),
+			mk("pg2", 5433, "db.foo.example.com"),
+		}, nil, apex, true, "overlaps"},
+		// Same shape spanning both lists: the service renders
+		// api.<apex> on 443, so this listener collides on hostname
+		// while the names differ and the name checks see nothing.
+		{"hostname collides with a passthrough service listener", []gatewayv1alpha1.TLSPassthroughListener{
+			mk("pgapi", 5432, "api.foo.example.com"),
+		}, []string{"api"}, apex, true, "overlaps"},
+		// A wildcard matches any number of labels to its left, so
+		// exact-string dedup is not enough — these all resolve the same
+		// ClientHello to two listeners.
+		{"wildcard covers an exact listener hostname", []gatewayv1alpha1.TLSPassthroughListener{
+			mk("wild", 5432, "*.db.foo.example.com"),
+			mk("pg", 5433, "pg.db.foo.example.com"),
+		}, nil, apex, true, "overlaps"},
+		// Reachable from stock chart values: tlsPassthroughServices
+		// defaults to api/vm-exportproxy/cdi-uploadproxy, each
+		// rendering <svc>.<apex> on 443.
+		{"wildcard covers a shipped passthrough service hostname", []gatewayv1alpha1.TLSPassthroughListener{
+			mk("wild", 5432, "*.foo.example.com"),
+		}, []string{"api"}, apex, true, "overlaps"},
+		{"two identical wildcards on different ports", []gatewayv1alpha1.TLSPassthroughListener{
+			mk("w1", 5432, "*.db.foo.example.com"),
+			mk("w2", 5433, "*.db.foo.example.com"),
+		}, nil, apex, true, "overlaps"},
+		{"broader wildcard covers a narrower one", []gatewayv1alpha1.TLSPassthroughListener{
+			mk("broad", 5432, "*.foo.example.com"),
+			mk("narrow", 5433, "*.db.foo.example.com"),
+		}, nil, apex, true, "overlaps"},
+		// Disjoint wildcards must still be allowed — the guard rejects
+		// overlap, not wildcards.
+		{"disjoint wildcards coexist", []gatewayv1alpha1.TLSPassthroughListener{
+			mk("pg", 5432, "*.pg.foo.example.com"),
+			mk("my", 5433, "*.my.foo.example.com"),
+		}, nil, apex, false, ""},
+		// A wildcard does not match its own bare suffix.
+		{"wildcard does not cover its bare suffix", []gatewayv1alpha1.TLSPassthroughListener{
+			mk("wild", 5432, "*.db.foo.example.com"),
+			mk("bare", 5433, "db.foo.example.com"),
+		}, nil, apex, false, ""},
+		{"duplicate passthrough service alongside listeners", []gatewayv1alpha1.TLSPassthroughListener{
+			mk("postgres", 5432, "postgres.foo.example.com"),
+		}, []string{"api", "vm-exportproxy", "api"}, apex, true, "duplicate entry"},
+		{"duplicate port", []gatewayv1alpha1.TLSPassthroughListener{
+			mk("pg", 5432, "a.foo.example.com"),
+			mk("pg2", 5432, "b.foo.example.com"),
+		}, nil, apex, true, "duplicate port"},
+		{"port 443 collides with terminate", []gatewayv1alpha1.TLSPassthroughListener{
+			mk("pg", 443, "pg.foo.example.com"),
+		}, nil, apex, true, "is reserved"},
+		{"port 80 collides with http listener", []gatewayv1alpha1.TLSPassthroughListener{
+			mk("pg", 80, "pg.foo.example.com"),
+		}, nil, apex, true, "is reserved"},
+		{"port below range", []gatewayv1alpha1.TLSPassthroughListener{
+			mk("pg", 0, "pg.foo.example.com"),
+		}, nil, apex, true, "out of range"},
+		{"port above range", []gatewayv1alpha1.TLSPassthroughListener{
+			mk("pg", 65536, "pg.foo.example.com"),
+		}, nil, apex, true, "out of range"},
+		{"invalid dns-1123 name", []gatewayv1alpha1.TLSPassthroughListener{
+			mk("Postgres_DB", 5432, "pg.foo.example.com"),
+		}, nil, apex, true, "invalid name"},
+		{"invalid hostname", []gatewayv1alpha1.TLSPassthroughListener{
+			mk("pg", 5432, "not a hostname"),
+		}, nil, apex, true, "invalid hostname"},
+		{"malformed wildcard hostname", []gatewayv1alpha1.TLSPassthroughListener{
+			mk("pg", 5432, "*.*.foo.example.com"),
+		}, nil, apex, true, "invalid hostname"},
+		{"hostname outside apex", []gatewayv1alpha1.TLSPassthroughListener{
+			mk("pg", 5432, "pg.other.example.com"),
+		}, nil, apex, true, "outside the tenant apex"},
+		{"wildcard outside apex", []gatewayv1alpha1.TLSPassthroughListener{
+			mk("pg", 5432, "*.other.example.com"),
+		}, nil, apex, true, "outside the tenant apex"},
+		{"sibling-domain hostname not under apex", []gatewayv1alpha1.TLSPassthroughListener{
+			mk("pg", 5432, "evilfoo.example.com"),
+		}, nil, apex, true, "outside the tenant apex"},
+		// The two composed bounds overlap for a normal apex: the
+		// hostname overflows before the listener name does. A
+		// one-character apex separates them, so this is the only
+		// row where the listener-name bound is the rule that fires:
+		// 4+250 is over 253 while 250+1+1 stays under it.
+		{"service entry overflows the listener name but not the hostname", nil,
+			[]string{strings.Repeat("a", 250)}, "a", true, "renders listener name"},
+		// The mirror case, and the reason the hostname bound cannot live
+		// in the schema: 249 fits the field's own maxLength, and whether
+		// it fits the composed hostname depends on the apex, which CEL
+		// would have to read from a sibling field on every write.
+		{"service entry overflows the hostname but not the listener name", nil,
+			[]string{strings.Repeat("a", 249)}, apex, true, "renders hostname"},
+	}
+	for _, tc := range tests {
+		t.Run(tc.name, func(t *testing.T) {
+			err := validateTLSPassthroughListeners(tc.listeners, tc.services, tc.apex)
+			if tc.wantErr && err != nil && tc.wantErrContains != "" && !strings.Contains(err.Error(), tc.wantErrContains) {
+				t.Errorf("rejected by a different rule than the case names: want a message containing %q, got %v", tc.wantErrContains, err)
+			}
+			if tc.wantErr && err == nil {
+				t.Fatalf("expected error, got nil")
+			}
+			if !tc.wantErr && err != nil {
+				t.Fatalf("unexpected error: %v", err)
+			}
+		})
+	}
+}
+
+// TestValidatePassthroughListenerCertMode pins that only edge refuses a
+// passthrough listener.
+//
+// The wildcard terminate listener of dns01 and existingSecret sits on
+// 443 and a passthrough listener on a port of its own. Gateway API
+// treats listeners on different ports as compatible, and the shipped
+// Cilium (v1.20.2) splits the Envoy listeners per port when their SNI
+// overlaps (NeedsCrossProtocolSplit), so the two do not reach each other's
+// backend. edge renders no TLS listener for an entry to bind to.
+//
+// The empty CertMode is the Go zero value, not a mode: the CRD defaults
+// the field, so a stored object always carries one, and the render path
+// reads its absence as http01.
+func TestValidatePassthroughListenerCertMode(t *testing.T) {
+	one := []gatewayv1alpha1.TLSPassthroughListener{
+		{Name: "pg", Port: 5432, Hostname: "pg.foo.example.com"},
+	}
+	for _, tc := range []struct {
+		name      string
+		listeners []gatewayv1alpha1.TLSPassthroughListener
+		mode      gatewayv1alpha1.CertMode
+		wantErr   bool
+	}{
+		{"http01", one, gatewayv1alpha1.CertModeHTTP01, false},
+		{"dns01", one, gatewayv1alpha1.CertModeDNS01, false},
+		{"existingSecret", one, gatewayv1alpha1.CertModeExistingSecret, false},
+		{"edge renders no TLS listener", one, gatewayv1alpha1.CertModeEdge, true},
+		{"edge without listeners", nil, gatewayv1alpha1.CertModeEdge, false},
+		{"zero value is http01", one, "", false},
+	} {
+		t.Run(tc.name, func(t *testing.T) {
+			err := validatePassthroughListenerCertMode(tc.listeners, tc.mode)
+			if tc.wantErr && err == nil {
+				t.Fatal("expected error, got nil")
+			}
+			if !tc.wantErr && err != nil {
+				t.Fatalf("unexpected error: %v", err)
+			}
+		})
+	}
+}
+
+// TestReconcile_TLSPassthroughListenerCertModes proves the cert-mode
+// rule reaches the render path rather than sitting in a function nothing
+// calls: every TLS-terminating mode reconciles, edge fails.
+//
+// Every mode is given the configuration it needs to render, so the
+// cert-mode rule is the only thing that can fail the reconcile. Leaving
+// DNS01 without its solver config would fail that subtest for another
+// reason and stop testing this rule at all.
+func TestReconcile_TLSPassthroughListenerCertModes(t *testing.T) {
+	for _, tc := range []struct {
+		name    string
+		mode    gatewayv1alpha1.CertMode
+		wantErr bool
+	}{
+		{"dns01", gatewayv1alpha1.CertModeDNS01, false},
+		{"existingSecret", gatewayv1alpha1.CertModeExistingSecret, false},
+		{"http01", gatewayv1alpha1.CertModeHTTP01, false},
+		{"edge", gatewayv1alpha1.CertModeEdge, true},
+	} {
+		t.Run(tc.name, func(t *testing.T) {
+			s := newScheme(t)
+			tgw := &gatewayv1alpha1.TenantGateway{
+				ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
+				Spec: gatewayv1alpha1.TenantGatewaySpec{
+					Apex:              "foo.example.com",
+					CertMode:          tc.mode,
+					GatewayClassName:  "cilium",
+					WildcardSecretRef: &corev1.LocalObjectReference{Name: "wildcard-tls"},
+					DNS01: &gatewayv1alpha1.DNS01Config{
+						Provider: "cloudflare",
+						Cloudflare: &gatewayv1alpha1.CloudflareDNS01{
+							APITokenSecretRef: corev1.SecretKeySelector{
+								LocalObjectReference: corev1.LocalObjectReference{Name: "cf-token"},
+								Key:                  "api-token",
+							},
+						},
+					},
+					TLSPassthroughListeners: []gatewayv1alpha1.TLSPassthroughListener{
+						{Name: "postgres", Port: 5432, Hostname: "postgres.foo.example.com"},
+					},
+				},
+			}
+			c := fake.NewClientBuilder().WithScheme(s).WithObjects(tgw).WithStatusSubresource(tgw).Build()
+
+			r := &Reconciler{Client: c, Scheme: s}
+			_, err := r.Reconcile(context.TODO(), ctrl.Request{
+				NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"},
+			})
+			if tc.wantErr && err == nil {
+				t.Fatalf("expected Reconcile to fail for certMode %q, got nil", tc.mode)
+			}
+			if !tc.wantErr && err != nil {
+				t.Fatalf("unexpected Reconcile error for certMode %q: %v", tc.mode, err)
+			}
+		})
+	}
+}
+
+// TestReconcile_TLSPassthroughListenerInvalidRejected proves the
+// layer-4 passthrough validation is wired into the render path: a spec
+// with two listeners on the same port makes Reconcile fail loudly
+// rather than emitting a Gateway whose clashing listeners Gateway API
+// admits and calls for leaving Conflicted, serving nothing.
+//
+// A loud failure is only half of it, and the other half is what the
+// rules on this field are worth. These checks live in the controller,
+// not at admission, so the spec they refuse is already in etcd: the
+// object is accepted and a later reconcile is what says no. Nothing
+// keeps the bad shape out of the cluster except renderGateway refusing
+// before it writes, so the absence of a Gateway is asserted here
+// alongside the error. Returning the error after a partial write would
+// leave this test green and the cluster holding the pair.
+func TestReconcile_TLSPassthroughListenerInvalidRejected(t *testing.T) {
+	s := newScheme(t)
+	tgw := &gatewayv1alpha1.TenantGateway{
+		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
+		Spec: gatewayv1alpha1.TenantGatewaySpec{
+			Apex:             "foo.example.com",
+			CertMode:         gatewayv1alpha1.CertModeHTTP01,
+			GatewayClassName: "cilium",
+			TLSPassthroughListeners: []gatewayv1alpha1.TLSPassthroughListener{
+				{Name: "postgres", Port: 5432, Hostname: "postgres.foo.example.com"},
+				{Name: "mysql", Port: 5432, Hostname: "mysql.foo.example.com"},
+			},
+		},
+	}
+	c := fake.NewClientBuilder().WithScheme(s).WithObjects(tgw).WithStatusSubresource(tgw).Build()
+
+	r := &Reconciler{Client: c, Scheme: s}
+	if _, err := r.Reconcile(context.TODO(), ctrl.Request{
+		NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"},
+	}); err == nil {
+		t.Fatalf("expected Reconcile to fail on duplicate passthrough port, got nil")
+	}
+
+	gw := &gatewayv1.Gateway{}
+	err := c.Get(context.TODO(), types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"}, gw)
+	if err == nil {
+		t.Fatalf("refused spec still produced a Gateway with listeners %+v", gw.Spec.Listeners)
+	}
+	if !apierrors.IsNotFound(err) {
+		t.Fatalf("get Gateway: %v", err)
+	}
+}
+
+// TestReconcile_TLSPassthroughListenerPort80Rejected proves the wired
+// path rejects a passthrough listener on port 80: renderGateway always
+// renders the http listener there, so a TLS listener on 80 is a
+// protocol conflict on a shared port. Gateway API admits the pair —
+// its uniqueness rule keys on (port, protocol, hostname) — and calls
+// for leaving both listeners Conflicted, which is why the entry has to
+// be refused here instead.
+func TestReconcile_TLSPassthroughListenerPort80Rejected(t *testing.T) {
+	s := newScheme(t)
+	tgw := &gatewayv1alpha1.TenantGateway{
+		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
+		Spec: gatewayv1alpha1.TenantGatewaySpec{
+			Apex:             "foo.example.com",
+			CertMode:         gatewayv1alpha1.CertModeHTTP01,
+			GatewayClassName: "cilium",
+			TLSPassthroughListeners: []gatewayv1alpha1.TLSPassthroughListener{
+				{Name: "postgres", Port: 80, Hostname: "postgres.foo.example.com"},
+			},
+		},
+	}
+	c := fake.NewClientBuilder().WithScheme(s).WithObjects(tgw).WithStatusSubresource(tgw).Build()
+
+	r := &Reconciler{Client: c, Scheme: s}
+	if _, err := r.Reconcile(context.TODO(), ctrl.Request{
+		NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"},
+	}); err == nil {
+		t.Fatalf("expected Reconcile to fail on port-80 passthrough listener, got nil")
+	}
+}
+
+// TestReconcile_TLSPassthroughListenerNameCollidesWithService proves the
+// wired path rejects a passthrough listener whose name equals a
+// TLSPassthroughServices entry: both render a tls-<X> listener, so the
+// Gateway would carry two listeners with the same name — rejected across
+// the whole Gateway, taking every app listener for the tenant down. The
+// colliding name here ("api") is one of the shipped chart defaults.
+func TestReconcile_TLSPassthroughListenerNameCollidesWithService(t *testing.T) {
+	s := newScheme(t)
+	tgw := &gatewayv1alpha1.TenantGateway{
+		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
+		Spec: gatewayv1alpha1.TenantGatewaySpec{
+			Apex:                   "foo.example.com",
+			CertMode:               gatewayv1alpha1.CertModeHTTP01,
+			GatewayClassName:       "cilium",
+			TLSPassthroughServices: []string{"api", "vm-exportproxy", "cdi-uploadproxy"},
+			TLSPassthroughListeners: []gatewayv1alpha1.TLSPassthroughListener{
+				{Name: "api", Port: 5432, Hostname: "api.foo.example.com"},
+			},
+		},
+	}
+	c := fake.NewClientBuilder().WithScheme(s).WithObjects(tgw).WithStatusSubresource(tgw).Build()
+
+	r := &Reconciler{Client: c, Scheme: s}
+	if _, err := r.Reconcile(context.TODO(), ctrl.Request{
+		NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"},
+	}); err == nil {
+		t.Fatalf("expected Reconcile to fail on passthrough name colliding with a service, got nil")
+	} else if !strings.Contains(err.Error(), "collides with tlsPassthroughServices entry") {
+		// The fixture breaks two rules at once: the name collides and
+		// the hostname it composes is the one the same service entry
+		// renders. A bare non-nil check would pass with the collision
+		// rule gone, on the overlap refusal alone.
+		t.Errorf("error = %v, want the name-collision refusal", err)
+	}
+}
+
+// TestReconcile_TLSPassthroughListenerHostnameOutOfApexRejected proves
+// the wired path rejects a passthrough listener whose hostname is outside
+// the tenant apex. Such a listener would be rendered and then denied by
+// the cozystack-gateway-hostname-policy VAP, failing the whole Gateway on
+// the first reconcile; validating up front turns that into a clean
+// TenantGateway status error instead.
+func TestReconcile_TLSPassthroughListenerHostnameOutOfApexRejected(t *testing.T) {
+	s := newScheme(t)
+	tgw := &gatewayv1alpha1.TenantGateway{
+		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
+		Spec: gatewayv1alpha1.TenantGatewaySpec{
+			Apex:             "foo.example.com",
+			CertMode:         gatewayv1alpha1.CertModeHTTP01,
+			GatewayClassName: "cilium",
+			TLSPassthroughListeners: []gatewayv1alpha1.TLSPassthroughListener{
+				{Name: "postgres", Port: 5432, Hostname: "postgres.other-tenant.example.com"},
+			},
+		},
+	}
+	c := fake.NewClientBuilder().WithScheme(s).WithObjects(tgw).WithStatusSubresource(tgw).Build()
+
+	r := &Reconciler{Client: c, Scheme: s}
+	if _, err := r.Reconcile(context.TODO(), ctrl.Request{
+		NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"},
+	}); err == nil {
+		t.Fatalf("expected Reconcile to fail on out-of-apex passthrough hostname, got nil")
+	}
+}
+
+// TestReconcile_StatusObservedGeneration pins observedGeneration: the
+// status field tracks .metadata.generation so operators can tell
+// whether the controller has caught up with the latest spec.
+func TestReconcile_StatusObservedGeneration(t *testing.T) {
+	s := newScheme(t)
+	tgw := &gatewayv1alpha1.TenantGateway{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:       "cozystack",
+			Namespace:  "tenant-foo",
+			Generation: 7,
+		},
+		Spec: gatewayv1alpha1.TenantGatewaySpec{
+			Apex:             "foo.example.com",
+			CertMode:         gatewayv1alpha1.CertModeHTTP01,
+			GatewayClassName: "cilium",
+		},
+	}
+	c := fake.NewClientBuilder().WithScheme(s).WithObjects(tgw).WithStatusSubresource(tgw).Build()
+
+	r := &Reconciler{Client: c, Scheme: s}
+	if _, err := r.Reconcile(context.TODO(), ctrl.Request{
+		NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"},
+	}); err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+
+	got := &gatewayv1alpha1.TenantGateway{}
+	if err := c.Get(context.TODO(), types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"}, got); err != nil {
+		t.Fatalf("get tgw: %v", err)
+	}
+	if got.Status.ObservedGeneration != 7 {
+		t.Errorf("Status.ObservedGeneration=%d, want 7", got.Status.ObservedGeneration)
+	}
+}
+
+// TestReconcile_StatusListenersMirrorGateway pins
+// status.listeners — one TenantGatewayListenerStatus entry per
+// Listener on the rendered Gateway. The static `http` listener is
+// always present in HTTP-01 mode; the test asserts at least that one
+// shows up with its hostname carried through.
+func TestReconcile_StatusListenersMirrorGateway(t *testing.T) {
+	s := newScheme(t)
+	tgw := &gatewayv1alpha1.TenantGateway{
+		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
+		Spec: gatewayv1alpha1.TenantGatewaySpec{
+			Apex:               "foo.example.com",
+			CertMode:           gatewayv1alpha1.CertModeHTTP01,
+			GatewayClassName:   "cilium",
+			AttachedNamespaces: []string{"cozy-harbor"},
+		},
+	}
+	route := httpRouteAttached("harbor", "cozy-harbor", "harbor.foo.example.com")
+
+	c := fake.NewClientBuilder().
+		WithScheme(s).
+		WithObjects(tgw, route).
+		WithStatusSubresource(tgw, &gatewayv1.HTTPRoute{}).
+		Build()
+
+	r := &Reconciler{Client: c, Scheme: s}
+	if _, err := r.Reconcile(context.TODO(), ctrl.Request{
+		NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"},
+	}); err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+
+	got := &gatewayv1alpha1.TenantGateway{}
+	if err := c.Get(context.TODO(), types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"}, got); err != nil {
+		t.Fatalf("get tgw: %v", err)
+	}
+	var sawHTTP, sawHarbor bool
+	for _, l := range got.Status.Listeners {
+		if l.Name == "http" {
+			sawHTTP = true
+		}
+		if l.Hostname == "harbor.foo.example.com" {
+			sawHarbor = true
+			if l.CertificateName == "" {
+				t.Errorf("expected CertificateName populated for harbor listener, got %+v", l)
+			}
+		}
+	}
+	if !sawHTTP {
+		t.Errorf("expected http listener in Status.Listeners, got %+v", got.Status.Listeners)
+	}
+	if !sawHarbor {
+		t.Errorf("expected harbor listener in Status.Listeners, got %+v", got.Status.Listeners)
+	}
+}
+
+// TestReconcile_StatusReadyFalseUntilGatewayProgrammed pins the
+// readiness contract: until the Gateway controller marks the
+// underlying Gateway Programmed=True, the TenantGateway carries
+// Ready=False with a non-empty Reason. Operators waiting on
+// `kubectl wait --for=condition=Ready` see real progress, not a
+// fictional green flag the moment the CR is created.
+func TestReconcile_StatusReadyFalseUntilGatewayProgrammed(t *testing.T) {
+	s := newScheme(t)
+	tgw := &gatewayv1alpha1.TenantGateway{
+		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
+		Spec: gatewayv1alpha1.TenantGatewaySpec{
+			Apex:             "foo.example.com",
+			CertMode:         gatewayv1alpha1.CertModeHTTP01,
+			GatewayClassName: "cilium",
+		},
+	}
+	c := fake.NewClientBuilder().WithScheme(s).WithObjects(tgw).WithStatusSubresource(tgw).Build()
+
+	r := &Reconciler{Client: c, Scheme: s}
+	if _, err := r.Reconcile(context.TODO(), ctrl.Request{
+		NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"},
+	}); err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+
+	got := &gatewayv1alpha1.TenantGateway{}
+	if err := c.Get(context.TODO(), types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"}, got); err != nil {
+		t.Fatalf("get tgw: %v", err)
+	}
+	var ready *metav1.Condition
+	for i := range got.Status.Conditions {
+		if got.Status.Conditions[i].Type == "Ready" {
+			ready = &got.Status.Conditions[i]
+			break
+		}
+	}
+	if ready == nil {
+		t.Fatalf("expected Ready condition, got %+v", got.Status.Conditions)
+	}
+	if ready.Status != metav1.ConditionFalse {
+		t.Errorf("Ready.Status=%s, want False (Gateway not yet Programmed)", ready.Status)
+	}
+	if ready.Reason == "" {
+		t.Errorf("expected non-empty Reason on Ready=False, got %+v", ready)
+	}
+}
+
+// TestReconcile_StatusReadyTrueWhenGatewayProgrammed pins the green
+// path: once the Gateway controller writes Accepted=True +
+// Programmed=True on the Gateway and per-listener Accepted=True +
+// Programmed=True on each ListenerStatus, the TenantGateway flips
+// Ready=True.
+func TestReconcile_StatusReadyTrueWhenGatewayProgrammed(t *testing.T) {
+	s := newScheme(t)
+	tgw := &gatewayv1alpha1.TenantGateway{
+		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
+		Spec: gatewayv1alpha1.TenantGatewaySpec{
+			Apex:             "foo.example.com",
+			CertMode:         gatewayv1alpha1.CertModeHTTP01,
+			GatewayClassName: "cilium",
+		},
+	}
+	c := fake.NewClientBuilder().
+		WithScheme(s).
+		WithObjects(tgw).
+		WithStatusSubresource(tgw, &gatewayv1.Gateway{}).
+		Build()
+
+	r := &Reconciler{Client: c, Scheme: s}
+	// First reconcile creates the Gateway; we then patch its status to
+	// simulate Cilium's controller having reconciled it, and run a
+	// second reconcile so the TenantGateway picks up the new status.
+	if _, err := r.Reconcile(context.TODO(), ctrl.Request{
+		NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"},
+	}); err != nil {
+		t.Fatalf("first reconcile: %v", err)
+	}
+	gw := &gatewayv1.Gateway{}
+	if err := c.Get(context.TODO(), types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"}, gw); err != nil {
+		t.Fatalf("get Gateway: %v", err)
+	}
+	gw.Status.Conditions = []metav1.Condition{
+		{Type: "Accepted", Status: metav1.ConditionTrue, Reason: "Accepted", LastTransitionTime: metav1.Now()},
+		{Type: "Programmed", Status: metav1.ConditionTrue, Reason: "Programmed", LastTransitionTime: metav1.Now()},
+	}
+	gw.Status.Listeners = make([]gatewayv1.ListenerStatus, 0, len(gw.Spec.Listeners))
+	for _, l := range gw.Spec.Listeners {
+		gw.Status.Listeners = append(gw.Status.Listeners, gatewayv1.ListenerStatus{
+			Name: l.Name,
+			Conditions: []metav1.Condition{
+				{Type: "Accepted", Status: metav1.ConditionTrue, Reason: "Accepted", LastTransitionTime: metav1.Now()},
+				{Type: "Programmed", Status: metav1.ConditionTrue, Reason: "Programmed", LastTransitionTime: metav1.Now()},
+			},
+			SupportedKinds: []gatewayv1.RouteGroupKind{},
+		})
+	}
+	if err := c.Status().Update(context.TODO(), gw); err != nil {
+		t.Fatalf("patch Gateway status: %v", err)
+	}
+
+	if _, err := r.Reconcile(context.TODO(), ctrl.Request{
+		NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"},
+	}); err != nil {
+		t.Fatalf("second reconcile: %v", err)
+	}
+
+	got := &gatewayv1alpha1.TenantGateway{}
+	if err := c.Get(context.TODO(), types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"}, got); err != nil {
+		t.Fatalf("get tgw: %v", err)
+	}
+	var ready *metav1.Condition
+	for i := range got.Status.Conditions {
+		if got.Status.Conditions[i].Type == "Ready" {
+			ready = &got.Status.Conditions[i]
+			break
+		}
+	}
+	if ready == nil || ready.Status != metav1.ConditionTrue {
+		t.Errorf("expected Ready=True after Gateway Programmed, got %+v", ready)
+	}
+	for _, l := range got.Status.Listeners {
+		if !l.Ready {
+			t.Errorf("expected listener %s ready=true, got %+v", l.Name, l)
+		}
+	}
+}
+
+// TestReconcile_TwoRoutesSameHostnameCozyWins pins the conflict
+// resolution rule: when two HTTPRoutes attached to the same Gateway
+// claim the same hostname but live in different namespaces, the
+// cozy-* namespace wins and the other route gets a
+// HostnameConflict condition under our controllerName in its
+// Status.Parents.
+func TestReconcile_TwoRoutesSameHostnameCozyWins(t *testing.T) {
+	s := newScheme(t)
+	tgw := &gatewayv1alpha1.TenantGateway{
+		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
+		Spec: gatewayv1alpha1.TenantGatewaySpec{
+			Apex:               "foo.example.com",
+			CertMode:           gatewayv1alpha1.CertModeHTTP01,
+			GatewayClassName:   "cilium",
+			AttachedNamespaces: []string{"cozy-harbor", "tenant-foo"},
+		},
+	}
+	cozyRoute := httpRouteAttached("harbor", "cozy-harbor", "harbor.foo.example.com")
+	tenantRoute := httpRouteAttached("harbor-shadow", "tenant-foo", "harbor.foo.example.com")
+
+	c := fake.NewClientBuilder().
+		WithScheme(s).
+		WithObjects(tgw, cozyRoute, tenantRoute).
+		WithStatusSubresource(tgw, &gatewayv1.HTTPRoute{}).
+		Build()
+
+	r := &Reconciler{Client: c, Scheme: s}
+	if _, err := r.Reconcile(context.TODO(), ctrl.Request{
+		NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"},
+	}); err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+
+	// Listener / cert exist (winner served).
+	gw := &gatewayv1.Gateway{}
+	if err := c.Get(context.TODO(), types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"}, gw); err != nil {
+		t.Fatalf("get Gateway: %v", err)
+	}
+	var sawHarbor bool
+	for _, l := range gw.Spec.Listeners {
+		if l.Hostname != nil && string(*l.Hostname) == "harbor.foo.example.com" {
+			sawHarbor = true
+			break
+		}
+	}
+	if !sawHarbor {
+		t.Errorf("expected harbor listener present (winner served), got %+v", gw.Spec.Listeners)
+	}
+
+	// Loser HTTPRoute carries HostnameConflict condition under our
+	// controllerName in Status.Parents.
+	got := &gatewayv1.HTTPRoute{}
+	if err := c.Get(context.TODO(), types.NamespacedName{Name: "harbor-shadow", Namespace: "tenant-foo"}, got); err != nil {
+		t.Fatalf("get loser route: %v", err)
+	}
+	var sawConflict bool
+	for _, ps := range got.Status.Parents {
+		if string(ps.ControllerName) != testControllerName {
+			continue
+		}
+		for _, cond := range ps.Conditions {
+			if cond.Type == "Accepted" && cond.Status == metav1.ConditionFalse && cond.Reason == "HostnameConflict" {
+				sawConflict = true
+				break
+			}
+		}
+	}
+	if !sawConflict {
+		t.Errorf("expected HostnameConflict condition on loser route, got Status.Parents=%+v", got.Status.Parents)
+	}
+
+	// Winner HTTPRoute carries Accepted=True (no conflict) under our
+	// controllerName.
+	winner := &gatewayv1.HTTPRoute{}
+	if err := c.Get(context.TODO(), types.NamespacedName{Name: "harbor", Namespace: "cozy-harbor"}, winner); err != nil {
+		t.Fatalf("get winner route: %v", err)
+	}
+	var sawAccepted bool
+	for _, ps := range winner.Status.Parents {
+		if string(ps.ControllerName) != testControllerName {
+			continue
+		}
+		for _, cond := range ps.Conditions {
+			if cond.Type == "Accepted" && cond.Status == metav1.ConditionTrue {
+				sawAccepted = true
+			}
+		}
+	}
+	if !sawAccepted {
+		t.Errorf("expected Accepted=True on winner route, got Status.Parents=%+v", winner.Status.Parents)
+	}
+}
+
+// TestReconcile_SameNamespaceSameHostnameNoConflict pins the dedup
+// path: two HTTPRoutes in the same namespace claiming the same
+// hostname is normal (canary, version split) — no conflict
+// condition should be raised.
+func TestReconcile_SameNamespaceSameHostnameNoConflict(t *testing.T) {
+	s := newScheme(t)
+	tgw := &gatewayv1alpha1.TenantGateway{
+		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
+		Spec: gatewayv1alpha1.TenantGatewaySpec{
+			Apex:               "foo.example.com",
+			CertMode:           gatewayv1alpha1.CertModeHTTP01,
+			GatewayClassName:   "cilium",
+			AttachedNamespaces: []string{"cozy-harbor"},
+		},
+	}
+	r1 := httpRouteAttached("harbor-main", "cozy-harbor", "harbor.foo.example.com")
+	r2 := httpRouteAttached("harbor-canary", "cozy-harbor", "harbor.foo.example.com")
+
+	c := fake.NewClientBuilder().
+		WithScheme(s).
+		WithObjects(tgw, r1, r2).
+		WithStatusSubresource(tgw, &gatewayv1.HTTPRoute{}).
+		Build()
+
+	r := &Reconciler{Client: c, Scheme: s}
+	if _, err := r.Reconcile(context.TODO(), ctrl.Request{
+		NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"},
+	}); err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+
+	for _, name := range []string{"harbor-main", "harbor-canary"} {
+		got := &gatewayv1.HTTPRoute{}
+		if err := c.Get(context.TODO(), types.NamespacedName{Name: name, Namespace: "cozy-harbor"}, got); err != nil {
+			t.Fatalf("get %s: %v", name, err)
+		}
+		for _, ps := range got.Status.Parents {
+			if string(ps.ControllerName) != testControllerName {
+				continue
+			}
+			for _, cond := range ps.Conditions {
+				if cond.Reason == "HostnameConflict" {
+					t.Errorf("unexpected HostnameConflict on %s (same-namespace dedup is not a conflict)", name)
+				}
+			}
+		}
+	}
+}
+
+// TestReconcile_HTTP01DoesNotCreateWildcardCertificate pins the
+// inverse: HTTP-01 mode must NOT create the wildcard Certificate (the
+// underlying ACME challenge type can't issue wildcards).
+func TestReconcile_HTTP01DoesNotCreateWildcardCertificate(t *testing.T) {
+	s := newScheme(t)
+	tgw := &gatewayv1alpha1.TenantGateway{
+		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
+		Spec: gatewayv1alpha1.TenantGatewaySpec{
+			Apex:             "foo.example.com",
+			CertMode:         gatewayv1alpha1.CertModeHTTP01,
+			GatewayClassName: "cilium",
+		},
+	}
+	c := fake.NewClientBuilder().WithScheme(s).WithObjects(tgw).WithStatusSubresource(tgw).Build()
+
+	r := &Reconciler{Client: c, Scheme: s}
+	if _, err := r.Reconcile(context.TODO(), ctrl.Request{
+		NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"},
+	}); err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+
+	cert := &cmv1.Certificate{}
+	err := c.Get(context.TODO(), types.NamespacedName{Name: "cozystack-gateway-tls", Namespace: "tenant-foo"}, cert)
+	if err == nil {
+		t.Errorf("HTTP-01 mode rendered wildcard Certificate; should be absent")
+	}
+}
+
+// TestReconcile_HTTPSListenersRestrictRouteKindsToHTTPRoute pins the
+// hardening that every HTTPS (TLS-terminate) listener must declare an
+// explicit AllowedRoutes.Kinds set. Without it Gateway API's default
+// permits any route kind whose hostname matches a listener, so a tenant
+// with RBAC for GRPCRoute / TCPRoute / UDPRoute could attach and serve
+// traffic under the apex cert without admission validation.
+//
+// After the cilium#45559 fix the set is [HTTPRoute, TLSRoute] rather
+// than [HTTPRoute] alone — all port-443 listeners carry the same kinds
+// so that Cilium does not collapse them. GRPCRoute / TCPRoute / UDPRoute
+// are still excluded, preserving the original security posture.
+//
+// Both certMode branches are exercised: HTTP-01 (per-app https-<label>
+// listeners) and DNS-01 (the wildcard `https` + apex `https-apex` pair).
+func TestReconcile_HTTPSListenersRestrictRouteKindsToHTTPRoute(t *testing.T) {
+	cases := []struct {
+		name string
+		tgw  *gatewayv1alpha1.TenantGateway
+		// extra objects to seed (e.g. HTTPRoute so HTTP-01 mode renders a per-app listener)
+		extra []client.Object
+	}{
+		{
+			name: "DNS-01 mode (wildcard + apex listeners)",
+			tgw: &gatewayv1alpha1.TenantGateway{
+				ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
+				Spec: gatewayv1alpha1.TenantGatewaySpec{
+					Apex:             "foo.example.com",
+					CertMode:         gatewayv1alpha1.CertModeDNS01,
+					GatewayClassName: "cilium",
+					DNS01: &gatewayv1alpha1.DNS01Config{
+						Provider: "cloudflare",
+						Cloudflare: &gatewayv1alpha1.CloudflareDNS01{
+							APITokenSecretRef: corev1.SecretKeySelector{
+								LocalObjectReference: corev1.LocalObjectReference{Name: "cf-token"},
+								Key:                  "api-token",
+							},
+						},
+					},
+				},
+			},
+		},
+		{
+			name: "HTTP-01 mode (per-app listener from attached HTTPRoute)",
+			tgw: &gatewayv1alpha1.TenantGateway{
+				ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
+				Spec: gatewayv1alpha1.TenantGatewaySpec{
+					Apex:             "foo.example.com",
+					CertMode:         gatewayv1alpha1.CertModeHTTP01,
+					GatewayClassName: "cilium",
+				},
+			},
+			extra: []client.Object{
+				&gatewayv1.HTTPRoute{
+					ObjectMeta: metav1.ObjectMeta{Name: "harbor", Namespace: "tenant-foo"},
+					Spec: gatewayv1.HTTPRouteSpec{
+						Hostnames: []gatewayv1.Hostname{"harbor.foo.example.com"},
+						CommonRouteSpec: gatewayv1.CommonRouteSpec{
+							ParentRefs: []gatewayv1.ParentReference{
+								{
+									Group:     ptrGroup(gatewayv1.GroupName),
+									Kind:      ptrKind("Gateway"),
+									Name:      "cozystack",
+									Namespace: ptrNamespace("tenant-foo"),
+								},
+							},
+						},
+					},
+				},
+			},
+		},
+	}
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			s := newScheme(t)
+			builder := fake.NewClientBuilder().WithScheme(s).WithObjects(tc.tgw).WithStatusSubresource(tc.tgw, &gatewayv1.HTTPRoute{})
+			if len(tc.extra) > 0 {
+				builder = builder.WithObjects(tc.extra...)
+			}
+			c := builder.Build()
+			r := &Reconciler{Client: c, Scheme: s}
+			if _, err := r.Reconcile(context.TODO(), ctrl.Request{
+				NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"},
+			}); err != nil {
+				t.Fatalf("unexpected error: %v", err)
+			}
+
+			gw := &gatewayv1.Gateway{}
+			if err := c.Get(context.TODO(), types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"}, gw); err != nil {
+				t.Fatalf("get Gateway: %v", err)
+			}
+			httpsCount := 0
+			for _, l := range gw.Spec.Listeners {
+				if l.Protocol != gatewayv1.HTTPSProtocolType {
+					continue
+				}
+				httpsCount++
+				if l.AllowedRoutes == nil || len(l.AllowedRoutes.Kinds) != 2 {
+					t.Fatalf("listener %s: expected exactly 2 allowed Kinds (HTTPRoute+TLSRoute for cilium#45559), got %+v", l.Name, l.AllowedRoutes)
+				}
+				kindNames := map[gatewayv1.Kind]bool{}
+				for _, k := range l.AllowedRoutes.Kinds {
+					kindNames[k.Kind] = true
+				}
+				if !kindNames["HTTPRoute"] || !kindNames["TLSRoute"] {
+					t.Errorf("listener %s: AllowedRoutes.Kinds=%v, want both HTTPRoute and TLSRoute", l.Name, l.AllowedRoutes.Kinds)
+				}
+				for _, k := range l.AllowedRoutes.Kinds {
+					if k.Group == nil || *k.Group != gatewayv1.Group(gatewayv1.GroupName) {
+						t.Errorf("listener %s: Kind %s Group=%v, want %q", l.Name, k.Kind, k.Group, gatewayv1.GroupName)
+					}
+				}
+			}
+			if httpsCount == 0 {
+				t.Fatalf("expected at least one HTTPS listener, listeners=%+v", gw.Spec.Listeners)
+			}
+		})
+	}
+}
+
+// TestReconcile_DNS01IssuerRoute53Solver pins the DNS-01 + route53
+// path. The Issuer must carry a dns01.route53 solver block referencing
+// the operator-supplied IAM credentials. Without coverage, a future
+// renderer refactor could regress to serving cloudflare alone, which
+// is the shape this path is easiest to collapse into.
+func TestReconcile_DNS01IssuerRoute53Solver(t *testing.T) {
+	s := newScheme(t)
+	tgw := &gatewayv1alpha1.TenantGateway{
+		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
+		Spec: gatewayv1alpha1.TenantGatewaySpec{
+			Apex:             "foo.example.com",
+			CertMode:         gatewayv1alpha1.CertModeDNS01,
+			GatewayClassName: "cilium",
+			DNS01: &gatewayv1alpha1.DNS01Config{
+				Provider: "route53",
+				Route53: &gatewayv1alpha1.Route53DNS01{
+					Region:      "us-east-1",
+					AccessKeyID: "AKIAIOSFODNN7EXAMPLE",
+					SecretAccessKeySecretRef: &corev1.SecretKeySelector{
+						LocalObjectReference: corev1.LocalObjectReference{Name: "aws-iam-secret"},
+						Key:                  "secret-access-key",
+					},
+				},
+			},
+		},
+	}
+	c := fake.NewClientBuilder().WithScheme(s).WithObjects(tgw).WithStatusSubresource(tgw).Build()
+
+	r := &Reconciler{Client: c, Scheme: s}
+	if _, err := r.Reconcile(context.TODO(), ctrl.Request{
+		NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"},
+	}); err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+
+	iss := &cmv1.Issuer{}
+	if err := c.Get(context.TODO(), types.NamespacedName{Name: "cozystack-gateway", Namespace: "tenant-foo"}, iss); err != nil {
+		t.Fatalf("get Issuer: %v", err)
+	}
+	if iss.Spec.ACME == nil || len(iss.Spec.ACME.Solvers) != 1 {
+		t.Fatalf("expected exactly one ACME solver, got %+v", iss.Spec.ACME)
+	}
+	solver := iss.Spec.ACME.Solvers[0]
+	if solver.DNS01 == nil || solver.DNS01.Route53 == nil {
+		t.Fatalf("expected dns01.route53 solver, got %+v", solver)
+	}
+	r53 := solver.DNS01.Route53
+	if r53.Region != "us-east-1" {
+		t.Errorf("Route53 Region=%q, want us-east-1", r53.Region)
+	}
+	if r53.AccessKeyID != "AKIAIOSFODNN7EXAMPLE" {
+		t.Errorf("Route53 AccessKeyID=%q, want AKIAIOSFODNN7EXAMPLE", r53.AccessKeyID)
+	}
+	if r53.SecretAccessKey.Name != "aws-iam-secret" || r53.SecretAccessKey.Key != "secret-access-key" {
+		t.Errorf("Route53 SecretAccessKey ref=%+v, want name=aws-iam-secret key=secret-access-key", r53.SecretAccessKey)
+	}
+}
+
+// TestReconcile_DNS01IssuerDigitalOceanSolver pins the DNS-01 +
+// digitalocean path. Mirrors the cloudflare/route53 solver tests so
+// every advertised provider has a Go-level pin.
+func TestReconcile_DNS01IssuerDigitalOceanSolver(t *testing.T) {
+	s := newScheme(t)
+	tgw := &gatewayv1alpha1.TenantGateway{
+		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
+		Spec: gatewayv1alpha1.TenantGatewaySpec{
+			Apex:             "foo.example.com",
+			CertMode:         gatewayv1alpha1.CertModeDNS01,
+			GatewayClassName: "cilium",
+			DNS01: &gatewayv1alpha1.DNS01Config{
+				Provider: "digitalocean",
+				DigitalOcean: &gatewayv1alpha1.DigitalOceanDNS01{
+					TokenSecretRef: corev1.SecretKeySelector{
+						LocalObjectReference: corev1.LocalObjectReference{Name: "do-api-token"},
+						Key:                  "access-token",
+					},
+				},
+			},
+		},
+	}
+	c := fake.NewClientBuilder().WithScheme(s).WithObjects(tgw).WithStatusSubresource(tgw).Build()
+
+	r := &Reconciler{Client: c, Scheme: s}
+	if _, err := r.Reconcile(context.TODO(), ctrl.Request{
+		NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"},
+	}); err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+
+	iss := &cmv1.Issuer{}
+	if err := c.Get(context.TODO(), types.NamespacedName{Name: "cozystack-gateway", Namespace: "tenant-foo"}, iss); err != nil {
+		t.Fatalf("get Issuer: %v", err)
+	}
+	if iss.Spec.ACME == nil || len(iss.Spec.ACME.Solvers) != 1 {
+		t.Fatalf("expected exactly one ACME solver, got %+v", iss.Spec.ACME)
+	}
+	solver := iss.Spec.ACME.Solvers[0]
+	if solver.DNS01 == nil || solver.DNS01.DigitalOcean == nil {
+		t.Fatalf("expected dns01.digitalocean solver, got %+v", solver)
+	}
+	tok := solver.DNS01.DigitalOcean.Token
+	if tok.Name != "do-api-token" || tok.Key != "access-token" {
+		t.Errorf("DigitalOcean Token ref=%+v, want name=do-api-token key=access-token", tok)
+	}
+}
+
+// TestReconcile_DNS01IssuerRFC2136Solver pins the DNS-01 + rfc2136
+// path (BIND-style dynamic update). The TSIG algorithm default is
+// also exercised — leaving it empty must produce HMACSHA256 in the
+// rendered solver, matching cert-manager's documented default.
+func TestReconcile_DNS01IssuerRFC2136Solver(t *testing.T) {
+	s := newScheme(t)
+	tgw := &gatewayv1alpha1.TenantGateway{
+		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
+		Spec: gatewayv1alpha1.TenantGatewaySpec{
+			Apex:             "foo.example.com",
+			CertMode:         gatewayv1alpha1.CertModeDNS01,
+			GatewayClassName: "cilium",
+			DNS01: &gatewayv1alpha1.DNS01Config{
+				Provider: "rfc2136",
+				RFC2136: &gatewayv1alpha1.RFC2136DNS01{
+					Nameserver:  "ns1.example.test:53",
+					TSIGKeyName: "letsencrypt.example.test.",
+					// TSIGAlgorithm intentionally empty to pin the default.
+					TSIGSecretSecretRef: corev1.SecretKeySelector{
+						LocalObjectReference: corev1.LocalObjectReference{Name: "tsig-secret"},
+						Key:                  "tsig-secret-key",
+					},
+				},
+			},
+		},
+	}
+	c := fake.NewClientBuilder().WithScheme(s).WithObjects(tgw).WithStatusSubresource(tgw).Build()
+
+	r := &Reconciler{Client: c, Scheme: s}
+	if _, err := r.Reconcile(context.TODO(), ctrl.Request{
+		NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"},
+	}); err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+
+	iss := &cmv1.Issuer{}
+	if err := c.Get(context.TODO(), types.NamespacedName{Name: "cozystack-gateway", Namespace: "tenant-foo"}, iss); err != nil {
+		t.Fatalf("get Issuer: %v", err)
+	}
+	if iss.Spec.ACME == nil || len(iss.Spec.ACME.Solvers) != 1 {
+		t.Fatalf("expected exactly one ACME solver, got %+v", iss.Spec.ACME)
+	}
+	solver := iss.Spec.ACME.Solvers[0]
+	if solver.DNS01 == nil || solver.DNS01.RFC2136 == nil {
+		t.Fatalf("expected dns01.rfc2136 solver, got %+v", solver)
+	}
+	r2136 := solver.DNS01.RFC2136
+	if r2136.Nameserver != "ns1.example.test:53" {
+		t.Errorf("RFC2136 Nameserver=%q, want ns1.example.test:53", r2136.Nameserver)
+	}
+	if r2136.TSIGKeyName != "letsencrypt.example.test." {
+		t.Errorf("RFC2136 TSIGKeyName=%q, want letsencrypt.example.test.", r2136.TSIGKeyName)
+	}
+	if r2136.TSIGAlgorithm != "HMACSHA256" {
+		t.Errorf("RFC2136 TSIGAlgorithm=%q, want HMACSHA256 (default)", r2136.TSIGAlgorithm)
+	}
+	if r2136.TSIGSecret.Name != "tsig-secret" || r2136.TSIGSecret.Key != "tsig-secret-key" {
+		t.Errorf("RFC2136 TSIGSecret ref=%+v, want name=tsig-secret key=tsig-secret-key", r2136.TSIGSecret)
+	}
+}
+
+// TestReconcile_DNS01ProviderMissingConfigErrors pins the input-
+// validation surface: each non-cloudflare provider returns a
+// deterministic error if the operator omits the matching config block.
+// Without these guards the controller would crash when dereferencing
+// the nil pointer (panic on a single misconfigured tenant takes the
+// controller down for the whole cluster).
+func TestReconcile_DNS01ProviderMissingConfigErrors(t *testing.T) {
+	cases := []struct {
+		name     string
+		dns01    *gatewayv1alpha1.DNS01Config
+		wantSubs string
+	}{
+		{
+			name: "route53 without route53 block",
+			dns01: &gatewayv1alpha1.DNS01Config{
+				Provider: "route53",
+			},
+			wantSubs: "dns01.route53",
+		},
+		{
+			name: "digitalocean without digitalocean block",
+			dns01: &gatewayv1alpha1.DNS01Config{
+				Provider: "digitalocean",
+			},
+			wantSubs: "dns01.digitalocean",
+		},
+		{
+			name: "rfc2136 without rfc2136 block",
+			dns01: &gatewayv1alpha1.DNS01Config{
+				Provider: "rfc2136",
+			},
+			wantSubs: "dns01.rfc2136",
+		},
+		{
+			name: "unknown provider",
+			dns01: &gatewayv1alpha1.DNS01Config{
+				Provider: "linode",
+			},
+			wantSubs: "unsupported dns01.provider",
+		},
+	}
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			tgw := &gatewayv1alpha1.TenantGateway{
+				ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
+				Spec: gatewayv1alpha1.TenantGatewaySpec{
+					Apex:             "foo.example.com",
+					CertMode:         gatewayv1alpha1.CertModeDNS01,
+					GatewayClassName: "cilium",
+					DNS01:            tc.dns01,
+				},
+			}
+			_, err := buildSolver(tgw)
+			if err == nil {
+				t.Fatalf("expected error for %s, got nil", tc.name)
+			}
+			if !strings.Contains(err.Error(), tc.wantSubs) {
+				t.Errorf("error=%q, want to contain %q", err.Error(), tc.wantSubs)
+			}
+		})
+	}
+}
+
+// TestBuildSolver_CertlessModesRejected pins the contract guard on the two
+// modes that mint no Issuer: reconcileIssuer never calls buildSolver for
+// them, and a future caller that does must get a named error rather than
+// fall through to the unknown-certMode default.
+func TestBuildSolver_CertlessModesRejected(t *testing.T) {
+	for _, mode := range []gatewayv1alpha1.CertMode{
+		gatewayv1alpha1.CertModeExistingSecret,
+		gatewayv1alpha1.CertModeEdge,
+	} {
+		t.Run(string(mode), func(t *testing.T) {
+			tgw := &gatewayv1alpha1.TenantGateway{
+				ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
+				Spec: gatewayv1alpha1.TenantGatewaySpec{
+					Apex:             "foo.example.com",
+					CertMode:         mode,
+					GatewayClassName: "cilium",
+				},
+			}
+			_, err := buildSolver(tgw)
+			if err == nil {
+				t.Fatalf("expected an error for certMode=%s, got nil", mode)
+			}
+			if !strings.Contains(err.Error(), string(mode)) {
+				t.Errorf("error=%q, want it to name certMode=%s", err.Error(), mode)
+			}
+		})
+	}
+}
+
+func ptrNamespace(ns string) *gatewayv1.Namespace {
+	v := gatewayv1.Namespace(ns)
+	return &v
+}
+
+func ptrSectionName(s string) *gatewayv1.SectionName {
+	v := gatewayv1.SectionName(s)
+	return &v
+}
+
+// TestReconcile_RefusesToTakeOverForeignGateway pins the safety
+// guard against silently rewriting a pre-existing Gateway that
+// happens to share the TenantGateway-derived name. Without the
+// ownerRef check, an operator who hand-crafted a Gateway named
+// `cozystack` in the tenant namespace would lose its config (spec
+// rewritten) AND have no cascade-delete chain back to the
+// TenantGateway (no OwnerReference established), leaving an orphan
+// after the TenantGateway is deleted.
+func TestReconcile_RefusesToTakeOverForeignGateway(t *testing.T) {
+	s := newScheme(t)
+	tgw := &gatewayv1alpha1.TenantGateway{
+		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
+		Spec: gatewayv1alpha1.TenantGatewaySpec{
+			Apex:             "foo.example.com",
+			CertMode:         gatewayv1alpha1.CertModeHTTP01,
+			GatewayClassName: "cilium",
+		},
+	}
+	// Foreign Gateway with the same NamespacedName but no OwnerReference.
+	foreign := &gatewayv1.Gateway{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "cozystack",
+			Namespace: "tenant-foo",
+			Labels: map[string]string{
+				"author":              "operator-by-hand",
+				"some.other/operator": "controlled",
+			},
+		},
+		Spec: gatewayv1.GatewaySpec{
+			GatewayClassName: gatewayv1.ObjectName("not-cilium"),
+			Listeners: []gatewayv1.Listener{
+				{Name: "operator-port", Port: 9999, Protocol: gatewayv1.HTTPProtocolType},
+			},
+		},
+	}
+	c := fake.NewClientBuilder().WithScheme(s).WithObjects(tgw, foreign).WithStatusSubresource(tgw).Build()
+
+	r := &Reconciler{Client: c, Scheme: s}
+	_, err := r.Reconcile(context.TODO(), ctrl.Request{
+		NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"},
+	})
+	if err == nil {
+		t.Fatalf("expected Reconcile to surface a takeover-refusal error, got nil")
+	}
+	if !strings.Contains(err.Error(), "not owned by TenantGateway") {
+		t.Errorf("expected error mentioning ownership refusal, got: %v", err)
+	}
+
+	// The foreign Gateway must NOT be modified.
+	got := &gatewayv1.Gateway{}
+	if err := c.Get(context.TODO(), types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"}, got); err != nil {
+		t.Fatalf("get Gateway: %v", err)
+	}
+	if string(got.Spec.GatewayClassName) != "not-cilium" {
+		t.Errorf("foreign Gateway.Spec was overwritten: gatewayClassName=%q, want not-cilium", got.Spec.GatewayClassName)
+	}
+	if len(got.Spec.Listeners) != 1 || got.Spec.Listeners[0].Port != 9999 {
+		t.Errorf("foreign Gateway listeners were overwritten: %+v", got.Spec.Listeners)
+	}
+	if got.Labels["author"] != "operator-by-hand" {
+		t.Errorf("foreign label scrubbed: labels=%+v", got.Labels)
+	}
+
+	// Status condition should reflect the failure (Ready=False with
+	// the takeover error captured).
+	updated := &gatewayv1alpha1.TenantGateway{}
+	if err := c.Get(context.TODO(), types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"}, updated); err != nil {
+		t.Fatalf("get TenantGateway: %v", err)
+	}
+	hasReadyFalse := false
+	for _, cond := range updated.Status.Conditions {
+		if cond.Type == "Ready" && cond.Status == metav1.ConditionFalse && cond.Reason == "ReconcileError" {
+			hasReadyFalse = true
+			break
+		}
+	}
+	if !hasReadyFalse {
+		t.Errorf("expected Ready=False ReconcileError on TenantGateway status, got %+v", updated.Status.Conditions)
+	}
+}
+
+// TestReconcile_RefusesToTakeOverForeignRedirectRoute pins the same
+// guard for the controller-owned http→https redirect HTTPRoute. A
+// pre-existing HTTPRoute named `<tgw>-http-redirect` could otherwise
+// be silently rewritten and orphaned.
+func TestReconcile_RefusesToTakeOverForeignRedirectRoute(t *testing.T) {
+	s := newScheme(t)
+	tgw := &gatewayv1alpha1.TenantGateway{
+		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
+		Spec: gatewayv1alpha1.TenantGatewaySpec{
+			Apex:             "foo.example.com",
+			CertMode:         gatewayv1alpha1.CertModeHTTP01,
+			GatewayClassName: "cilium",
+		},
+	}
+	foreign := &gatewayv1.HTTPRoute{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "cozystack-http-redirect",
+			Namespace: "tenant-foo",
+		},
+		Spec: gatewayv1.HTTPRouteSpec{
+			Hostnames: []gatewayv1.Hostname{"operator.foo.example.com"},
+		},
+	}
+	c := fake.NewClientBuilder().WithScheme(s).WithObjects(tgw, foreign).WithStatusSubresource(tgw, &gatewayv1.HTTPRoute{}).Build()
+
+	r := &Reconciler{Client: c, Scheme: s}
+	_, err := r.Reconcile(context.TODO(), ctrl.Request{
+		NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"},
+	})
+	if err == nil {
+		t.Fatalf("expected Reconcile to surface a takeover-refusal error, got nil")
+	}
+	if !strings.Contains(err.Error(), "not owned by TenantGateway") {
+		t.Errorf("expected error mentioning ownership refusal, got: %v", err)
+	}
+
+	// The foreign HTTPRoute hostnames must be preserved.
+	got := &gatewayv1.HTTPRoute{}
+	if err := c.Get(context.TODO(), types.NamespacedName{Name: "cozystack-http-redirect", Namespace: "tenant-foo"}, got); err != nil {
+		t.Fatalf("get HTTPRoute: %v", err)
+	}
+	if len(got.Spec.Hostnames) != 1 || got.Spec.Hostnames[0] != "operator.foo.example.com" {
+		t.Errorf("foreign HTTPRoute spec overwritten: %+v", got.Spec)
+	}
+}
+
+// TestReconcile_RefusesToTakeOverForeignIssuer pins the takeover-
+// guard symmetry across reconcileIssuer. Same shape as the Gateway
+// and HTTPRoute guards: a foreign Issuer with the controller-derived
+// name must not have its spec silently rewritten.
+func TestReconcile_RefusesToTakeOverForeignIssuer(t *testing.T) {
+	s := newScheme(t)
+	tgw := &gatewayv1alpha1.TenantGateway{
+		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
+		Spec: gatewayv1alpha1.TenantGatewaySpec{
+			Apex:             "foo.example.com",
+			CertMode:         gatewayv1alpha1.CertModeHTTP01,
+			GatewayClassName: "cilium",
+		},
+	}
+	foreign := &cmv1.Issuer{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "cozystack-gateway",
+			Namespace: "tenant-foo",
+		},
+		Spec: cmv1.IssuerSpec{
+			IssuerConfig: cmv1.IssuerConfig{SelfSigned: &cmv1.SelfSignedIssuer{}},
+		},
+	}
+	c := fake.NewClientBuilder().WithScheme(s).WithObjects(tgw, foreign).WithStatusSubresource(tgw).Build()
+
+	r := &Reconciler{Client: c, Scheme: s}
+	_, err := r.Reconcile(context.TODO(), ctrl.Request{
+		NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"},
+	})
+	if err == nil {
+		t.Fatalf("expected takeover refusal, got nil")
+	}
+	if !strings.Contains(err.Error(), "not owned by TenantGateway") {
+		t.Errorf("expected ownership-refusal error, got %v", err)
+	}
+
+	got := &cmv1.Issuer{}
+	if err := c.Get(context.TODO(), types.NamespacedName{Name: "cozystack-gateway", Namespace: "tenant-foo"}, got); err != nil {
+		t.Fatalf("get Issuer: %v", err)
+	}
+	if got.Spec.SelfSigned == nil {
+		t.Errorf("foreign SelfSigned Issuer was rewritten to ACME, spec=%+v", got.Spec)
+	}
+}
+
+// TestReconcile_RefusesToTakeOverForeignWildcardCertificate pins the
+// takeover-guard for the DNS-01 wildcard Certificate path.
+func TestReconcile_RefusesToTakeOverForeignWildcardCertificate(t *testing.T) {
+	s := newScheme(t)
+	tgw := &gatewayv1alpha1.TenantGateway{
+		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
+		Spec: gatewayv1alpha1.TenantGatewaySpec{
+			Apex:             "foo.example.com",
+			CertMode:         gatewayv1alpha1.CertModeDNS01,
+			GatewayClassName: "cilium",
+			DNS01: &gatewayv1alpha1.DNS01Config{
+				Provider: "cloudflare",
+				Cloudflare: &gatewayv1alpha1.CloudflareDNS01{
+					APITokenSecretRef: corev1.SecretKeySelector{
+						LocalObjectReference: corev1.LocalObjectReference{Name: "cf-token"},
+						Key:                  "api-token",
+					},
+				},
+			},
+		},
+	}
+	foreign := &cmv1.Certificate{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "cozystack-gateway-tls",
+			Namespace: "tenant-foo",
+		},
+		Spec: cmv1.CertificateSpec{
+			SecretName: "operator-pinned-secret",
+			DNSNames:   []string{"operator.foo.example.com"},
+		},
+	}
+	c := fake.NewClientBuilder().WithScheme(s).WithObjects(tgw, foreign).WithStatusSubresource(tgw).Build()
+
+	r := &Reconciler{Client: c, Scheme: s}
+	_, err := r.Reconcile(context.TODO(), ctrl.Request{
+		NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"},
+	})
+	if err == nil {
+		t.Fatalf("expected takeover refusal, got nil")
+	}
+	if !strings.Contains(err.Error(), "not owned by TenantGateway") {
+		t.Errorf("expected ownership-refusal error, got %v", err)
+	}
+
+	got := &cmv1.Certificate{}
+	if err := c.Get(context.TODO(), types.NamespacedName{Name: "cozystack-gateway-tls", Namespace: "tenant-foo"}, got); err != nil {
+		t.Fatalf("get Certificate: %v", err)
+	}
+	if got.Spec.SecretName != "operator-pinned-secret" {
+		t.Errorf("foreign Certificate.Spec.SecretName overwritten: %q", got.Spec.SecretName)
+	}
+}
+
+// TestReconcile_RefusesToTakeOverForeignPerListenerCertificate pins
+// the takeover-guard for the HTTP-01 per-listener Certificate path.
+// A pre-existing Certificate whose derived name matches our
+// hostname-keyed naming scheme must not be silently rewritten.
+func TestReconcile_RefusesToTakeOverForeignPerListenerCertificate(t *testing.T) {
+	s := newScheme(t)
+	tgw := &gatewayv1alpha1.TenantGateway{
+		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
+		Spec: gatewayv1alpha1.TenantGatewaySpec{
+			Apex:             "foo.example.com",
+			CertMode:         gatewayv1alpha1.CertModeHTTP01,
+			GatewayClassName: "cilium",
+		},
+	}
+	route := &gatewayv1.HTTPRoute{
+		ObjectMeta: metav1.ObjectMeta{Name: "harbor", Namespace: "tenant-foo"},
+		Spec: gatewayv1.HTTPRouteSpec{
+			Hostnames: []gatewayv1.Hostname{"harbor.foo.example.com"},
+			CommonRouteSpec: gatewayv1.CommonRouteSpec{
+				ParentRefs: []gatewayv1.ParentReference{
+					{
+						Group:     ptrGroup(gatewayv1.GroupName),
+						Kind:      ptrKind("Gateway"),
+						Name:      "cozystack",
+						Namespace: ptrNamespace("tenant-foo"),
+					},
+				},
+			},
+		},
+	}
+	// Build the expected derived per-listener cert name and pre-create
+	// a foreign Certificate at it.
+	expectedCertName := perListenerCertName(tgw, "harbor.foo.example.com")
+	foreign := &cmv1.Certificate{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      expectedCertName,
+			Namespace: "tenant-foo",
+		},
+		Spec: cmv1.CertificateSpec{
+			SecretName: "operator-pinned-cert",
+			DNSNames:   []string{"operator-version.foo.example.com"},
+		},
+	}
+	c := fake.NewClientBuilder().WithScheme(s).WithObjects(tgw, route, foreign).WithStatusSubresource(tgw, &gatewayv1.HTTPRoute{}).Build()
+
+	r := &Reconciler{Client: c, Scheme: s}
+	_, err := r.Reconcile(context.TODO(), ctrl.Request{
+		NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"},
+	})
+	if err == nil {
+		t.Fatalf("expected takeover refusal, got nil")
+	}
+	if !strings.Contains(err.Error(), "not owned by TenantGateway") {
+		t.Errorf("expected ownership-refusal error, got %v", err)
+	}
+
+	got := &cmv1.Certificate{}
+	if err := c.Get(context.TODO(), types.NamespacedName{Name: expectedCertName, Namespace: "tenant-foo"}, got); err != nil {
+		t.Fatalf("get Certificate: %v", err)
+	}
+	if got.Spec.SecretName != "operator-pinned-cert" {
+		t.Errorf("foreign per-listener Certificate.Spec.SecretName overwritten: %q", got.Spec.SecretName)
+	}
+}
+
+// TestReconcile_OwnerReferencesOnDownstream pins the cascade-delete
+// contract for every controller-owned downstream resource: Issuer,
+// wildcard Certificate (DNS-01 mode), per-listener Certificate
+// (HTTP-01 mode), and the http→https redirect HTTPRoute. Without an
+// OwnerReference back to the TenantGateway, kubectl delete on the CR
+// leaves orphans behind that keep eating cert-manager rate limits and
+// stale Gateway listener references.
+func TestReconcile_OwnerReferencesOnDownstream(t *testing.T) {
+	s := newScheme(t)
+	tgw := &gatewayv1alpha1.TenantGateway{
+		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
+		Spec: gatewayv1alpha1.TenantGatewaySpec{
+			Apex:             "foo.example.com",
+			CertMode:         gatewayv1alpha1.CertModeHTTP01,
+			GatewayClassName: "cilium",
+		},
+	}
+	route := &gatewayv1.HTTPRoute{
+		ObjectMeta: metav1.ObjectMeta{Name: "harbor", Namespace: "tenant-foo"},
+		Spec: gatewayv1.HTTPRouteSpec{
+			Hostnames: []gatewayv1.Hostname{"harbor.foo.example.com"},
+			CommonRouteSpec: gatewayv1.CommonRouteSpec{
+				ParentRefs: []gatewayv1.ParentReference{
+					{
+						Group:     ptrGroup(gatewayv1.GroupName),
+						Kind:      ptrKind("Gateway"),
+						Name:      "cozystack",
+						Namespace: ptrNamespace("tenant-foo"),
+					},
+				},
+			},
+		},
+	}
+	c := fake.NewClientBuilder().WithScheme(s).WithObjects(tgw, route).WithStatusSubresource(tgw, &gatewayv1.HTTPRoute{}).Build()
+
+	r := &Reconciler{Client: c, Scheme: s}
+	if _, err := r.Reconcile(context.TODO(), ctrl.Request{
+		NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"},
+	}); err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+
+	hasOwnerRef := func(refs []metav1.OwnerReference, ownerName string) bool {
+		for _, ref := range refs {
+			if ref.Kind == "TenantGateway" && ref.Name == ownerName && ref.Controller != nil && *ref.Controller {
+				return true
+			}
+		}
+		return false
+	}
+
+	// Issuer
+	iss := &cmv1.Issuer{}
+	if err := c.Get(context.TODO(), types.NamespacedName{Name: "cozystack-gateway", Namespace: "tenant-foo"}, iss); err != nil {
+		t.Fatalf("get Issuer: %v", err)
+	}
+	if !hasOwnerRef(iss.OwnerReferences, "cozystack") {
+		t.Errorf("Issuer missing controller OwnerReference back to TenantGateway, got %+v", iss.OwnerReferences)
+	}
+
+	// Per-listener Certificate (HTTP-01 mode renders one per hostname).
+	certList := &cmv1.CertificateList{}
+	if err := c.List(context.TODO(), certList); err != nil {
+		t.Fatalf("list Certificates: %v", err)
+	}
+	if len(certList.Items) == 0 {
+		t.Fatalf("expected at least one per-listener Certificate, got 0")
+	}
+	for _, cert := range certList.Items {
+		if !hasOwnerRef(cert.OwnerReferences, "cozystack") {
+			t.Errorf("Certificate %s missing controller OwnerReference, got %+v", cert.Name, cert.OwnerReferences)
+		}
+	}
+
+	// HTTP→HTTPS redirect HTTPRoute (controller-owned).
+	redirect := &gatewayv1.HTTPRoute{}
+	if err := c.Get(context.TODO(), types.NamespacedName{Name: "cozystack-http-redirect", Namespace: "tenant-foo"}, redirect); err != nil {
+		t.Fatalf("get redirect HTTPRoute: %v", err)
+	}
+	if !hasOwnerRef(redirect.OwnerReferences, "cozystack") {
+		t.Errorf("redirect HTTPRoute missing controller OwnerReference, got %+v", redirect.OwnerReferences)
+	}
+}
+
+// TestReconcile_DNS01WildcardCertOwnerReference pins the wildcard
+// Certificate's OwnerReference contract, since it's only rendered in
+// DNS-01 mode and the previous test exercises HTTP-01.
+func TestReconcile_DNS01WildcardCertOwnerReference(t *testing.T) {
+	s := newScheme(t)
+	tgw := &gatewayv1alpha1.TenantGateway{
+		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
+		Spec: gatewayv1alpha1.TenantGatewaySpec{
+			Apex:             "foo.example.com",
+			CertMode:         gatewayv1alpha1.CertModeDNS01,
+			GatewayClassName: "cilium",
+			DNS01: &gatewayv1alpha1.DNS01Config{
+				Provider: "cloudflare",
+				Cloudflare: &gatewayv1alpha1.CloudflareDNS01{
+					APITokenSecretRef: corev1.SecretKeySelector{
+						LocalObjectReference: corev1.LocalObjectReference{Name: "cf-token"},
+						Key:                  "api-token",
+					},
+				},
+			},
+		},
+	}
+	c := fake.NewClientBuilder().WithScheme(s).WithObjects(tgw).WithStatusSubresource(tgw).Build()
+	r := &Reconciler{Client: c, Scheme: s}
+	if _, err := r.Reconcile(context.TODO(), ctrl.Request{
+		NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"},
+	}); err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+
+	cert := &cmv1.Certificate{}
+	if err := c.Get(context.TODO(), types.NamespacedName{Name: "cozystack-gateway-tls", Namespace: "tenant-foo"}, cert); err != nil {
+		t.Fatalf("get wildcard Certificate: %v", err)
+	}
+	hasOwner := false
+	for _, ref := range cert.OwnerReferences {
+		if ref.Kind == "TenantGateway" && ref.Name == "cozystack" && ref.Controller != nil && *ref.Controller {
+			hasOwner = true
+			break
+		}
+	}
+	if !hasOwner {
+		t.Errorf("wildcard Certificate missing controller OwnerReference, got %+v", cert.OwnerReferences)
+	}
+}
+
+// TestReconcile_GatewayUpdateRestoresControllerLabel pins the inverse
+// of TestReconcile_GatewayUpdatePreservesForeignLabels: a foreign
+// actor that scrubs a controller-owned label must see it restored on
+// the next reconcile. Without this, an out-of-band tool (or a buggy
+// admission policy) could permanently strip cozystack.io/managed-by
+// and break label-based selectors that depend on it.
+func TestReconcile_GatewayUpdateRestoresControllerLabel(t *testing.T) {
+	s := newScheme(t)
+	tgw := &gatewayv1alpha1.TenantGateway{
+		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
+		Spec: gatewayv1alpha1.TenantGatewaySpec{
+			Apex:             "foo.example.com",
+			CertMode:         gatewayv1alpha1.CertModeHTTP01,
+			GatewayClassName: "cilium",
+		},
+	}
+	c := fake.NewClientBuilder().WithScheme(s).WithObjects(tgw).WithStatusSubresource(tgw, &gatewayv1.Gateway{}).Build()
+	r := &Reconciler{Client: c, Scheme: s}
+	if _, err := r.Reconcile(context.TODO(), ctrl.Request{
+		NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"},
+	}); err != nil {
+		t.Fatalf("first reconcile: %v", err)
+	}
+
+	// Foreign actor strips the controller-owned managed-by label.
+	gw := &gatewayv1.Gateway{}
+	if err := c.Get(context.TODO(), types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"}, gw); err != nil {
+		t.Fatalf("get Gateway: %v", err)
+	}
+	delete(gw.Labels, "cozystack.io/managed-by")
+	if err := c.Update(context.TODO(), gw); err != nil {
+		t.Fatalf("update Gateway: %v", err)
+	}
+
+	if _, err := r.Reconcile(context.TODO(), ctrl.Request{
+		NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"},
+	}); err != nil {
+		t.Fatalf("second reconcile: %v", err)
+	}
+
+	got := &gatewayv1.Gateway{}
+	if err := c.Get(context.TODO(), types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"}, got); err != nil {
+		t.Fatalf("get Gateway after second reconcile: %v", err)
+	}
+	if got.Labels["cozystack.io/managed-by"] != "cozystack-controller" {
+		t.Errorf("controller label not restored after foreign delete: labels=%+v", got.Labels)
+	}
+}
+
+// TestRender_HTTPListener_PinsACMEChallengeNamespace pins the literal
+// const value `acmeChallengeNamespace = "cozy-cert-manager"`. If the
+// platform ever moves cert-manager to a different namespace, this
+// test fails loudly — and it's expected to be updated together with
+// the namespace change so HTTP-01 challenge HTTPRoutes still bind.
+// Without this pin, a refactor could change the string in one place
+// (the cert-manager helm release) without updating the tenant
+// Gateway's http-listener allowedRoutes.
+func TestRender_HTTPListener_PinsACMEChallengeNamespace(t *testing.T) {
+	if acmeChallengeNamespace != "cozy-cert-manager" {
+		t.Errorf("acmeChallengeNamespace=%q, want cozy-cert-manager — if cert-manager moves, update the cozy-cert-manager helm release namespace AND this constant in lockstep, then update this test", acmeChallengeNamespace)
+	}
+}
+
+// TestReconcile_MultiParentRefRouteWritesPerRefStatus pins the
+// per-(ParentRef, ControllerName) status contract: when a single
+// HTTPRoute carries two parentRefs to the same TenantGateway Gateway
+// (different sectionNames), the controller writes one
+// RouteParentStatus entry per parentRef under its ControllerName
+// instead of overwriting one entry on each iteration. Prior behavior
+// kept only whichever parentRef came first in pickAttachingParentRef,
+// silently dropping per-section conflict signals — a regression that
+// would only surface for tenants stitching multiple sectionNames into
+// one HTTPRoute.
+func TestReconcile_MultiParentRefRouteWritesPerRefStatus(t *testing.T) {
+	s := newScheme(t)
+	tgw := &gatewayv1alpha1.TenantGateway{
+		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
+		Spec: gatewayv1alpha1.TenantGatewaySpec{
+			Apex:             "foo.example.com",
+			CertMode:         gatewayv1alpha1.CertModeHTTP01,
+			GatewayClassName: "cilium",
+		},
+	}
+	route := &gatewayv1.HTTPRoute{
+		ObjectMeta: metav1.ObjectMeta{Name: "harbor", Namespace: "tenant-foo"},
+		Spec: gatewayv1.HTTPRouteSpec{
+			Hostnames: []gatewayv1.Hostname{"harbor.foo.example.com"},
+			CommonRouteSpec: gatewayv1.CommonRouteSpec{
+				ParentRefs: []gatewayv1.ParentReference{
+					{
+						Group:       ptrGroup(gatewayv1.GroupName),
+						Kind:        ptrKind("Gateway"),
+						Name:        "cozystack",
+						Namespace:   ptrNamespace("tenant-foo"),
+						SectionName: ptrSectionName("https-harbor-deadbeef"),
+					},
+					{
+						Group:       ptrGroup(gatewayv1.GroupName),
+						Kind:        ptrKind("Gateway"),
+						Name:        "cozystack",
+						Namespace:   ptrNamespace("tenant-foo"),
+						SectionName: ptrSectionName("http"),
+					},
+				},
+			},
+		},
+	}
+	c := fake.NewClientBuilder().WithScheme(s).
+		WithObjects(tgw, route).
+		WithStatusSubresource(tgw, &gatewayv1.HTTPRoute{}).
+		Build()
+
+	r := &Reconciler{Client: c, Scheme: s}
+	if _, err := r.Reconcile(context.TODO(), ctrl.Request{
+		NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"},
+	}); err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+
+	got := &gatewayv1.HTTPRoute{}
+	if err := c.Get(context.TODO(), types.NamespacedName{Name: "harbor", Namespace: "tenant-foo"}, got); err != nil {
+		t.Fatalf("get HTTPRoute: %v", err)
+	}
+	ours := 0
+	sections := map[string]bool{}
+	for _, ps := range got.Status.Parents {
+		if ps.ControllerName != "gateway.cozystack.io/tenantgateway-controller" {
+			continue
+		}
+		ours++
+		if ps.ParentRef.SectionName != nil {
+			sections[string(*ps.ParentRef.SectionName)] = true
+		}
+	}
+	if ours != 2 {
+		t.Errorf("expected 2 RouteParentStatus entries under our ControllerName, got %d (full status=%+v)", ours, got.Status.Parents)
+	}
+	if !sections["https-harbor-deadbeef"] || !sections["http"] {
+		t.Errorf("expected status entries for both sectionNames, got %+v", sections)
+	}
+}
+
+// TestReconcile_ExistingSecretModeRendersWildcardListenerWithSecretRef
+// pins the existingSecret path: the Gateway gets the same wildcard +
+// apex HTTPS listeners as DNS-01 mode, but their CertificateRefs point
+// at the operator-supplied Secret named in Spec.WildcardSecretRef
+// instead of a controller-minted cert.
+func TestReconcile_ExistingSecretModeRendersWildcardListenerWithSecretRef(t *testing.T) {
+	s := newScheme(t)
+	tgw := &gatewayv1alpha1.TenantGateway{
+		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
+		Spec: gatewayv1alpha1.TenantGatewaySpec{
+			Apex:              "foo.example.com",
+			CertMode:          gatewayv1alpha1.CertModeExistingSecret,
+			GatewayClassName:  "cilium",
+			WildcardSecretRef: &corev1.LocalObjectReference{Name: "wildcard-tls"},
+		},
+	}
+	c := fake.NewClientBuilder().WithScheme(s).WithObjects(tgw).WithStatusSubresource(tgw).Build()
+
+	r := &Reconciler{Client: c, Scheme: s}
+	if _, err := r.Reconcile(context.TODO(), ctrl.Request{
+		NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"},
+	}); err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+
+	got := &gatewayv1.Gateway{}
+	if err := c.Get(context.TODO(), types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"}, got); err != nil {
+		t.Fatalf("get Gateway: %v", err)
+	}
+	var sawWildcard, sawApex bool
+	for _, l := range got.Spec.Listeners {
+		if l.Protocol != gatewayv1.HTTPSProtocolType || l.Hostname == nil {
+			continue
+		}
+		switch string(*l.Hostname) {
+		case "*.foo.example.com":
+			sawWildcard = true
+		case "foo.example.com":
+			sawApex = true
+		default:
+			continue
+		}
+		if l.TLS == nil || len(l.TLS.CertificateRefs) != 1 ||
+			string(l.TLS.CertificateRefs[0].Name) != "wildcard-tls" {
+			t.Errorf("listener %s must reference the operator Secret wildcard-tls, got %+v", *l.Hostname, l.TLS)
+		}
+	}
+	if !sawWildcard {
+		t.Errorf("expected wildcard *.foo.example.com HTTPS listener in existingSecret mode, got %+v", got.Spec.Listeners)
+	}
+	if !sawApex {
+		t.Errorf("expected apex foo.example.com HTTPS listener in existingSecret mode, got %+v", got.Spec.Listeners)
+	}
+}
+
+// TestReconcile_ExistingSecretModeCreatesNoIssuerOrCertificate pins the
+// "no minting" contract: existingSecret mode references a pre-existing
+// Secret, so the controller must not create a cert-manager Issuer or
+// any Certificate.
+func TestReconcile_ExistingSecretModeCreatesNoIssuerOrCertificate(t *testing.T) {
+	s := newScheme(t)
+	tgw := &gatewayv1alpha1.TenantGateway{
+		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
+		Spec: gatewayv1alpha1.TenantGatewaySpec{
+			Apex:              "foo.example.com",
+			CertMode:          gatewayv1alpha1.CertModeExistingSecret,
+			GatewayClassName:  "cilium",
+			WildcardSecretRef: &corev1.LocalObjectReference{Name: "wildcard-tls"},
+		},
+	}
+	c := fake.NewClientBuilder().WithScheme(s).WithObjects(tgw).WithStatusSubresource(tgw).Build()
+
+	r := &Reconciler{Client: c, Scheme: s}
+	if _, err := r.Reconcile(context.TODO(), ctrl.Request{
+		NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"},
+	}); err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+
+	if err := c.Get(context.TODO(), types.NamespacedName{Name: "cozystack-gateway", Namespace: "tenant-foo"}, &cmv1.Issuer{}); err == nil {
+		t.Errorf("existingSecret mode must not create an Issuer")
+	}
+	certs := &cmv1.CertificateList{}
+	if err := c.List(context.TODO(), certs); err != nil {
+		t.Fatalf("list certs: %v", err)
+	}
+	if len(certs.Items) != 0 {
+		t.Errorf("existingSecret mode must not create any Certificate, got %d", len(certs.Items))
+	}
+}
+
+// TestReconcile_ExistingSecretModeMissingSecretRefFails pins the
+// fail-fast: CertMode=existingSecret without a WildcardSecretRef is a
+// misconfiguration. Reconcile must return an error and the
+// TenantGateway must carry Ready=False.
+func TestReconcile_ExistingSecretModeMissingSecretRefFails(t *testing.T) {
+	s := newScheme(t)
+	tgw := &gatewayv1alpha1.TenantGateway{
+		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
+		Spec: gatewayv1alpha1.TenantGatewaySpec{
+			Apex:             "foo.example.com",
+			CertMode:         gatewayv1alpha1.CertModeExistingSecret,
+			GatewayClassName: "cilium",
+		},
+	}
+	c := fake.NewClientBuilder().WithScheme(s).WithObjects(tgw).WithStatusSubresource(tgw).Build()
+
+	r := &Reconciler{Client: c, Scheme: s}
+	if _, err := r.Reconcile(context.TODO(), ctrl.Request{
+		NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"},
+	}); err == nil {
+		t.Fatalf("expected error when WildcardSecretRef is missing in existingSecret mode")
+	}
+
+	got := &gatewayv1alpha1.TenantGateway{}
+	if err := c.Get(context.TODO(), types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"}, got); err != nil {
+		t.Fatalf("get tgw: %v", err)
+	}
+	var readyFalse bool
+	for _, cond := range got.Status.Conditions {
+		if cond.Type == "Ready" && cond.Status == metav1.ConditionFalse {
+			readyFalse = true
+		}
+	}
+	if !readyFalse {
+		t.Errorf("expected Ready=False condition after failed reconcile, got %+v", got.Status.Conditions)
+	}
+}
+
+// TestReconcile_CertModeTransitionHTTP01ToExistingSecretCleansCertsAndIssuer
+// pins the mode-switch cleanup: flipping from HTTP-01 to existingSecret
+// must reclaim the per-tenant ACME Issuer and any per-listener
+// Certificate left behind, so no orphaned ACME machinery lingers.
+func TestReconcile_CertModeTransitionHTTP01ToExistingSecretCleansCertsAndIssuer(t *testing.T) {
+	s := newScheme(t)
+	tgw := &gatewayv1alpha1.TenantGateway{
+		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
+		Spec: gatewayv1alpha1.TenantGatewaySpec{
+			Apex:               "foo.example.com",
+			CertMode:           gatewayv1alpha1.CertModeHTTP01,
+			GatewayClassName:   "cilium",
+			AttachedNamespaces: []string{"cozy-harbor"},
+		},
+	}
+	route := httpRouteAttached("harbor", "cozy-harbor", "harbor.foo.example.com")
+	c := fake.NewClientBuilder().WithScheme(s).WithObjects(tgw, route).WithStatusSubresource(tgw, &gatewayv1.Gateway{}, &gatewayv1.HTTPRoute{}).Build()
+	r := &Reconciler{Client: c, Scheme: s}
+
+	// Phase 1: HTTP-01 reconcile creates an Issuer + per-listener cert.
+	if _, err := r.Reconcile(context.TODO(), ctrl.Request{
+		NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"},
+	}); err != nil {
+		t.Fatalf("phase 1 reconcile: %v", err)
+	}
+	if err := c.Get(context.TODO(), types.NamespacedName{Name: "cozystack-gateway", Namespace: "tenant-foo"}, &cmv1.Issuer{}); err != nil {
+		t.Fatalf("expected Issuer after HTTP-01 phase: %v", err)
+	}
+	preCerts := &cmv1.CertificateList{}
+	if err := c.List(context.TODO(), preCerts); err != nil {
+		t.Fatalf("phase 1 list certs: %v", err)
+	}
+	if len(preCerts.Items) == 0 {
+		t.Fatalf("expected a per-listener cert after HTTP-01 phase")
+	}
+
+	// Phase 2: flip to existingSecret. Issuer + per-listener certs gone.
+	updated := &gatewayv1alpha1.TenantGateway{}
+	if err := c.Get(context.TODO(), types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"}, updated); err != nil {
+		t.Fatalf("get tgw: %v", err)
+	}
+	updated.Spec.CertMode = gatewayv1alpha1.CertModeExistingSecret
+	updated.Spec.WildcardSecretRef = &corev1.LocalObjectReference{Name: "wildcard-tls"}
+	if err := c.Update(context.TODO(), updated); err != nil {
+		t.Fatalf("flip certMode: %v", err)
+	}
+	if _, err := r.Reconcile(context.TODO(), ctrl.Request{
+		NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"},
+	}); err != nil {
+		t.Fatalf("phase 2 reconcile: %v", err)
+	}
+
+	if err := c.Get(context.TODO(), types.NamespacedName{Name: "cozystack-gateway", Namespace: "tenant-foo"}, &cmv1.Issuer{}); err == nil {
+		t.Errorf("Issuer leaked after switch to existingSecret")
+	}
+	postCerts := &cmv1.CertificateList{}
+	if err := c.List(context.TODO(), postCerts); err != nil {
+		t.Fatalf("phase 2 list certs: %v", err)
+	}
+	if len(postCerts.Items) != 0 {
+		t.Errorf("per-listener certs leaked after switch to existingSecret: %d remain", len(postCerts.Items))
+	}
+}
+
+// TestReconcile_CertModeTransitionDNS01ToExistingSecretCleansWildcardCert
+// pins the symmetric DNS-01 cleanup: the controller-minted wildcard
+// Certificate from a prior DNS-01 phase must be deleted when switching
+// to existingSecret (the operator now owns the cert material).
+func TestReconcile_CertModeTransitionDNS01ToExistingSecretCleansWildcardCert(t *testing.T) {
+	s := newScheme(t)
+	tgw := &gatewayv1alpha1.TenantGateway{
+		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
+		Spec: gatewayv1alpha1.TenantGatewaySpec{
+			Apex:             "foo.example.com",
+			CertMode:         gatewayv1alpha1.CertModeDNS01,
+			GatewayClassName: "cilium",
+			DNS01: &gatewayv1alpha1.DNS01Config{
+				Provider: "cloudflare",
+				Cloudflare: &gatewayv1alpha1.CloudflareDNS01{
+					APITokenSecretRef: corev1.SecretKeySelector{
+						LocalObjectReference: corev1.LocalObjectReference{Name: "cf-token"},
+						Key:                  "api-token",
+					},
+				},
+			},
+		},
+	}
+	c := fake.NewClientBuilder().WithScheme(s).WithObjects(tgw).WithStatusSubresource(tgw, &gatewayv1.Gateway{}).Build()
+	r := &Reconciler{Client: c, Scheme: s}
+
+	if _, err := r.Reconcile(context.TODO(), ctrl.Request{
+		NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"},
+	}); err != nil {
+		t.Fatalf("phase 1 reconcile: %v", err)
+	}
+	if err := c.Get(context.TODO(), types.NamespacedName{Name: "cozystack-gateway-tls", Namespace: "tenant-foo"}, &cmv1.Certificate{}); err != nil {
+		t.Fatalf("expected wildcard cert in DNS-01 phase: %v", err)
+	}
+
+	updated := &gatewayv1alpha1.TenantGateway{}
+	if err := c.Get(context.TODO(), types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"}, updated); err != nil {
+		t.Fatalf("get tgw: %v", err)
+	}
+	updated.Spec.CertMode = gatewayv1alpha1.CertModeExistingSecret
+	updated.Spec.DNS01 = nil
+	updated.Spec.WildcardSecretRef = &corev1.LocalObjectReference{Name: "wildcard-tls"}
+	if err := c.Update(context.TODO(), updated); err != nil {
+		t.Fatalf("flip certMode: %v", err)
+	}
+	if _, err := r.Reconcile(context.TODO(), ctrl.Request{
+		NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"},
+	}); err != nil {
+		t.Fatalf("phase 2 reconcile: %v", err)
+	}
+
+	if err := c.Get(context.TODO(), types.NamespacedName{Name: "cozystack-gateway-tls", Namespace: "tenant-foo"}, &cmv1.Certificate{}); err == nil {
+		t.Errorf("wildcard cert leaked after switch to existingSecret")
+	}
+}
+
+// TestReconcile_ExistingSecretModeKeepsHTTPRedirectAndPassthrough pins
+// that switching off ACME does not regress the non-cert listeners: the
+// http→https redirect HTTPRoute and TLS-passthrough listeners must
+// still render in existingSecret mode.
+func TestReconcile_ExistingSecretModeKeepsHTTPRedirectAndPassthrough(t *testing.T) {
+	s := newScheme(t)
+	tgw := &gatewayv1alpha1.TenantGateway{
+		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
+		Spec: gatewayv1alpha1.TenantGatewaySpec{
+			Apex:                   "foo.example.com",
+			CertMode:               gatewayv1alpha1.CertModeExistingSecret,
+			GatewayClassName:       "cilium",
+			WildcardSecretRef:      &corev1.LocalObjectReference{Name: "wildcard-tls"},
+			TLSPassthroughServices: []string{"api"},
+		},
+	}
+	c := fake.NewClientBuilder().WithScheme(s).WithObjects(tgw).WithStatusSubresource(tgw).Build()
+
+	r := &Reconciler{Client: c, Scheme: s}
+	if _, err := r.Reconcile(context.TODO(), ctrl.Request{
+		NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"},
+	}); err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+
+	if err := c.Get(context.TODO(), types.NamespacedName{Name: "cozystack-http-redirect", Namespace: "tenant-foo"}, &gatewayv1.HTTPRoute{}); err != nil {
+		t.Errorf("expected http→https redirect HTTPRoute in existingSecret mode: %v", err)
+	}
+
+	gw := &gatewayv1.Gateway{}
+	if err := c.Get(context.TODO(), types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"}, gw); err != nil {
+		t.Fatalf("get Gateway: %v", err)
+	}
+	var sawPassthrough bool
+	for _, l := range gw.Spec.Listeners {
+		if string(l.Name) == "tls-api" && l.Protocol == gatewayv1.TLSProtocolType &&
+			l.TLS != nil && l.TLS.Mode != nil && *l.TLS.Mode == gatewayv1.TLSModePassthrough {
+			sawPassthrough = true
+		}
+	}
+	if !sawPassthrough {
+		t.Errorf("expected tls-api passthrough listener in existingSecret mode, got %+v", gw.Spec.Listeners)
+	}
+}
+
+// TestReconcile_Port443ListenersShareKinds is a regression test for
+// cilium#45559 / cozystack#3070. It pins two distinct security contracts
+// that must hold simultaneously across all three cert modes:
+//
+//  1. ANTI-COLLAPSE (cilium#45559): every port-443 listener must carry
+//     IDENTICAL allowedRoutes.kinds. Divergent kinds cause Cilium to
+//     merge all port-443 listeners into one, silently dropping the
+//     HTTPRoutes that were accepted by the HTTPS-terminate listeners.
+//
+//  2. FORBIDDEN KINDS: GRPCRoute, TCPRoute, and UDPRoute must NEVER
+//     appear in any port-443 listener's kinds set. cilium#45559 governs
+//     only that the sets match each other, so this is least privilege:
+//     nothing the platform ships needs gRPC, TCP or UDP routing on port
+//
+//  443. TCPRoute and UDPRoute also carry no hostname and no admission
+//     rule gates them, so admitting them would let a tenant serve
+//     arbitrary traffic under the apex cert without admission control.
+//     GRPCRoute hostnames are gated by the cozystack-route-hostname-policy
+//     VAP wherever the kind attaches; port 443 excludes it because nothing
+//     the platform ships needs gRPC routing there.
+//
+//  3. NON-EMPTY: no port-443 listener may have nil or empty
+//     allowedRoutes.kinds. An empty set means Gateway API defaults to all
+//     route kinds — the same security hole as explicitly listing
+//     GRPCRoute/TCPRoute/UDPRoute.
+//
+// The canonical kinds set is exactly [HTTPRoute, TLSRoute] (both in the
+// gateway.networking.k8s.io group). Gateway API rejects any HTTPRoute
+// that targets a Passthrough sectionName at route-attach time, so listing
+// HTTPRoute on TLS-passthrough listeners does not widen the actual attach
+// surface — it only satisfies the Cilium same-port same-kinds invariant.
+//
+// All three cert modes are exercised because they produce different sets of
+// port-443 listeners:
+//   - HTTP-01: per-app HTTPS listener (from HTTPRoute) + TLS-passthrough.
+//   - DNS-01:  wildcard + apex + per-child-apex HTTPS listeners + TLS-passthrough.
+//   - existingSecret: same listener topology as DNS-01, operator-supplied cert.
+func TestReconcile_Port443ListenersShareKinds(t *testing.T) {
+	// canonicalPort443Kinds is the expected sorted "group/kind" key for
+	// every port-443 listener. Sorted so reflect.DeepEqual is order-independent.
+	canonicalPort443Kinds := []string{
+		gatewayv1.GroupName + "/HTTPRoute",
+		gatewayv1.GroupName + "/TLSRoute",
+	}
+	sort.Strings(canonicalPort443Kinds)
+
+	// kindsKey normalises a RouteGroupKind slice to a sorted []string so
+	// all subsequent comparisons are order-independent.
+	kindsKey := func(kinds []gatewayv1.RouteGroupKind) []string {
+		out := make([]string, 0, len(kinds))
+		for _, k := range kinds {
+			g := ""
+			if k.Group != nil {
+				g = string(*k.Group)
+			}
+			out = append(out, g+"/"+string(k.Kind))
+		}
+		sort.Strings(out)
+		return out
+	}
+
+	// assertPort443Contract sweeps every port-443 listener in gw and
+	// verifies the three contracts above, reporting all failures via t.
+	assertPort443Contract := func(t *testing.T, gw *gatewayv1.Gateway) {
+		t.Helper()
+		// Swept by whether the listener declares kinds at all, not by
+		// port, because that was the shape of the check before v1.19.6:
+		// CheckGatewayRouteKindAllowed walked every listener on the
+		// Gateway with no port and no sectionName filter, skipped the
+		// ones whose kinds were empty, and overwrote the route's
+		// Accepted condition on each of the rest, so the last listener
+		// decided. v1.19.6 narrows the walk to the listener the
+		// parentRef names, which makes this sweep stricter than the
+		// shipped release requires rather than wrong for it; it goes
+		// with the uniform-kinds workaround.
+		var declared []gatewayv1.Listener
+		for _, l := range gw.Spec.Listeners {
+			if l.AllowedRoutes != nil && len(l.AllowedRoutes.Kinds) > 0 {
+				declared = append(declared, l)
+			}
+			// Contract 3 stays port-scoped: a port-443 listener that
+			// declares nothing would inherit every kind and bypass the
+			// route-hostname VAP.
+			if l.Port == 443 && (l.AllowedRoutes == nil || len(l.AllowedRoutes.Kinds) == 0) {
+				t.Errorf("listener %q on 443: allowedRoutes.kinds is nil/empty — Gateway API defaults to all kinds, which bypasses the route-hostname VAP", l.Name)
+			}
+		}
+		if len(declared) < 2 {
+			t.Fatalf("expected at least 2 listeners declaring kinds (terminate + passthrough), got %d: %+v", len(declared), gw.Spec.Listeners)
+		}
+
+		var referenceKey []string
+		for i, l := range declared {
+
+			got := kindsKey(l.AllowedRoutes.Kinds)
+
+			// Contract 1: identical across all port-443 listeners.
+			if i == 0 {
+				referenceKey = got
+			} else if !reflect.DeepEqual(got, referenceKey) {
+				t.Errorf("listener[%d] %q kinds %v differ from listener[0] kinds %v — divergent kinds re-trigger cilium#45559 listener collapse", i, l.Name, got, referenceKey)
+			}
+
+			// Contract 1+2: must equal the canonical set exactly.
+			if !reflect.DeepEqual(got, canonicalPort443Kinds) {
+				t.Errorf("listener[%d] %q: got kinds %v, want canonical %v", i, l.Name, got, canonicalPort443Kinds)
+			}
+
+			// Contract 2: forbidden kinds must never appear by name.
+			kindSet := map[string]bool{}
+			for _, k := range l.AllowedRoutes.Kinds {
+				kindSet[string(k.Kind)] = true
+			}
+			for _, forbidden := range []string{"GRPCRoute", "TCPRoute", "UDPRoute"} {
+				if kindSet[forbidden] {
+					t.Errorf("listener[%d] %q: forbidden kind %q present — port-443 listeners serve HTTPRoute and TLSRoute only", i, l.Name, forbidden)
+				}
+			}
+		}
+	}
+
+	cases := []struct {
+		name    string
+		tgw     *gatewayv1alpha1.TenantGateway
+		objects []client.Object
+	}{
+		{
+			// HTTP-01: per-app HTTPS listener driven by attached HTTPRoute,
+			// plus TLS-passthrough for "api". Two port-443 listeners total.
+			name: "HTTP-01",
+			tgw: &gatewayv1alpha1.TenantGateway{
+				ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
+				Spec: gatewayv1alpha1.TenantGatewaySpec{
+					Apex:                   "foo.example.com",
+					CertMode:               gatewayv1alpha1.CertModeHTTP01,
+					GatewayClassName:       "cilium",
+					AttachedNamespaces:     []string{"cozy-harbor"},
+					TLSPassthroughServices: []string{"api"},
+					// A native-port entry is part of the fixture because the
+					// upstream check is port-blind: without one the sweep below
+					// has nothing outside 443 to look at.
+					TLSPassthroughListeners: []gatewayv1alpha1.TLSPassthroughListener{
+						{Name: "pg", Port: 5432, Hostname: "pg.foo.example.com"},
+					},
+				},
+			},
+			objects: []client.Object{
+				httpRouteAttached("harbor", "cozy-harbor", "harbor.foo.example.com"),
+			},
+		},
+		{
+			// DNS-01: wildcard + apex + per-child-apex HTTPS listeners rendered
+			// from the wildcard cert, plus TLS-passthrough for "api". The child
+			// namespace (tenant-foo-alice, with namespace.cozystack.io/gateway
+			// and namespace.cozystack.io/host labels) causes collectInheritingChildApexes
+			// to emit a *.alice.foo.example.com listener, giving us 4 port-443 listeners
+			// in total — the broadest surface for this regression.
+			name: "DNS-01",
+			tgw: &gatewayv1alpha1.TenantGateway{
+				ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
+				Spec: gatewayv1alpha1.TenantGatewaySpec{
+					Apex:                   "foo.example.com",
+					CertMode:               gatewayv1alpha1.CertModeDNS01,
+					GatewayClassName:       "cilium",
+					TLSPassthroughServices: []string{"api"},
+					DNS01: &gatewayv1alpha1.DNS01Config{
+						Provider: "cloudflare",
+						Cloudflare: &gatewayv1alpha1.CloudflareDNS01{
+							APITokenSecretRef: corev1.SecretKeySelector{
+								LocalObjectReference: corev1.LocalObjectReference{Name: "cf-token"},
+								Key:                  "api-token",
+							},
+						},
+					},
+				},
+			},
+			objects: []client.Object{
+				// Helm-owned labels on own + child namespaces so
+				// collectInheritingChildApexes picks up the child apex.
+				&corev1.Namespace{
+					ObjectMeta: metav1.ObjectMeta{
+						Name: "tenant-foo",
+						Labels: map[string]string{
+							"namespace.cozystack.io/host":    "foo.example.com",
+							"namespace.cozystack.io/gateway": "tenant-foo",
+						},
+					},
+				},
+				&corev1.Namespace{
+					ObjectMeta: metav1.ObjectMeta{
+						Name: "tenant-foo-alice",
+						Labels: map[string]string{
+							"namespace.cozystack.io/host":    "alice.foo.example.com",
+							"namespace.cozystack.io/gateway": "tenant-foo",
+						},
+					},
+				},
+				// Route in child namespace — seeds a realistic scenario even
+				// though DNS-01 collectHostnameClaims returns nil (wildcard
+				// handles all hostnames).
+				httpRouteAttached("harbor", "tenant-foo-alice", "harbor.alice.foo.example.com"),
+			},
+		},
+		{
+			// existingSecret: same listener topology as DNS-01 but referencing
+			// the operator-supplied wildcard Secret. The child namespace produces
+			// the same *.alice.foo.example.com listener for 4 port-443 listeners.
+			name: "existingSecret",
+			tgw: &gatewayv1alpha1.TenantGateway{
+				ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
+				Spec: gatewayv1alpha1.TenantGatewaySpec{
+					Apex:                   "foo.example.com",
+					CertMode:               gatewayv1alpha1.CertModeExistingSecret,
+					GatewayClassName:       "cilium",
+					TLSPassthroughServices: []string{"api"},
+					WildcardSecretRef:      &corev1.LocalObjectReference{Name: "wildcard-tls"},
+				},
+			},
+			objects: []client.Object{
+				&corev1.Namespace{
+					ObjectMeta: metav1.ObjectMeta{
+						Name: "tenant-foo",
+						Labels: map[string]string{
+							"namespace.cozystack.io/host":    "foo.example.com",
+							"namespace.cozystack.io/gateway": "tenant-foo",
+						},
+					},
+				},
+				&corev1.Namespace{
+					ObjectMeta: metav1.ObjectMeta{
+						Name: "tenant-foo-alice",
+						Labels: map[string]string{
+							"namespace.cozystack.io/host":    "alice.foo.example.com",
+							"namespace.cozystack.io/gateway": "tenant-foo",
+						},
+					},
+				},
+				httpRouteAttached("harbor", "tenant-foo-alice", "harbor.alice.foo.example.com"),
+			},
+		},
+	}
+
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			s := newScheme(t)
+			builder := fake.NewClientBuilder().
+				WithScheme(s).
+				WithObjects(tc.tgw).
+				WithStatusSubresource(tc.tgw, &gatewayv1.HTTPRoute{})
+			if len(tc.objects) > 0 {
+				builder = builder.WithObjects(tc.objects...)
+			}
+			c := builder.Build()
+
+			r := &Reconciler{Client: c, Scheme: s}
+			if _, err := r.Reconcile(context.TODO(), ctrl.Request{
+				NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"},
+			}); err != nil {
+				t.Fatalf("unexpected error: %v", err)
+			}
+
+			gw := &gatewayv1.Gateway{}
+			if err := c.Get(context.TODO(), types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"}, gw); err != nil {
+				t.Fatalf("get Gateway: %v", err)
+			}
+
+			assertPort443Contract(t, gw)
+		})
+	}
+}
+
+// TestReconcile_ExistingSecretModeRendersChildApexListenerWithOperatorSecret
+// pins the inheritance shape in existingSecret mode: like DNS-01, the
+// controller renders a `*.<child-apex>` listener for every inheriting
+// child tenant, all referencing the single operator-supplied Secret.
+//
+// This is a deliberately-degraded behavior worth pinning: unlike DNS-01
+// (where the controller mints a wildcard cert with child-apex SANs), in
+// existingSecret mode nothing extends the operator's static Secret, so a
+// `*.<apex>` cert does NOT cover `*.<child-apex>` and child subdomains
+// will present the parent cert. The MVP scopes operator-wildcard to the
+// root tenant for exactly this reason (see packages/extra/gateway
+// README). Pinning what gets rendered here means a future change to
+// child-apex handling cannot silently regress it.
+func TestReconcile_ExistingSecretModeRendersChildApexListenerWithOperatorSecret(t *testing.T) {
+	s := newScheme(t)
+	tgw := &gatewayv1alpha1.TenantGateway{
+		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-root"},
+		Spec: gatewayv1alpha1.TenantGatewaySpec{
+			Apex:              "example.org",
+			CertMode:          gatewayv1alpha1.CertModeExistingSecret,
+			GatewayClassName:  "cilium",
+			WildcardSecretRef: &corev1.LocalObjectReference{Name: "wildcard-tls"},
+		},
+	}
+	nsRoot := &corev1.Namespace{
+		ObjectMeta: metav1.ObjectMeta{
+			Name: "tenant-root",
+			Labels: map[string]string{
+				"namespace.cozystack.io/host":    "example.org",
+				"namespace.cozystack.io/gateway": "tenant-root",
+			},
+		},
+	}
+	nsAlice := &corev1.Namespace{
+		ObjectMeta: metav1.ObjectMeta{
+			Name: "tenant-root-alice",
+			Labels: map[string]string{
+				"namespace.cozystack.io/host":    "alice.example.org",
+				"namespace.cozystack.io/gateway": "tenant-root",
+			},
+		},
+	}
+	c := fake.NewClientBuilder().
+		WithScheme(s).
+		WithObjects(tgw, nsRoot, nsAlice).
+		WithStatusSubresource(tgw).
+		Build()
+
+	r := &Reconciler{Client: c, Scheme: s}
+	if _, err := r.Reconcile(context.TODO(), ctrl.Request{
+		NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-root"},
+	}); err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+
+	gw := &gatewayv1.Gateway{}
+	if err := c.Get(context.TODO(), types.NamespacedName{Name: "cozystack", Namespace: "tenant-root"}, gw); err != nil {
+		t.Fatalf("get Gateway: %v", err)
+	}
+
+	var sawChild bool
+	for i := range gw.Spec.Listeners {
+		l := &gw.Spec.Listeners[i]
+		if l.Hostname == nil || string(*l.Hostname) != "*.alice.example.org" {
+			continue
+		}
+		sawChild = true
+		if l.Protocol != gatewayv1.HTTPSProtocolType {
+			t.Errorf("child listener: expected HTTPS protocol, got %s", l.Protocol)
+		}
+		if l.TLS == nil || len(l.TLS.CertificateRefs) != 1 ||
+			string(l.TLS.CertificateRefs[0].Name) != "wildcard-tls" {
+			t.Errorf("child listener must reference the operator Secret wildcard-tls, got %+v", l.TLS)
+		}
+	}
+	if !sawChild {
+		t.Errorf("expected per-child-apex listener *.alice.example.org in existingSecret mode, got %+v", gw.Spec.Listeners)
+	}
+}
+
+// TestReconcile_EdgeModeRendersPlainHTTPListeners pins the edge cert
+// mode, where TLS ends upstream of the Gateway (a Cloudflare Tunnel
+// class terminates at the Cloudflare edge). The Gateway carries the
+// apex, its wildcard and every inheriting child apex as plain HTTP
+// listeners so app HTTPRoutes attach by hostname exactly as they do to
+// the HTTPS listeners in the other modes; nothing carries a
+// certificateRef; TLS-passthrough services are not rendered because a
+// TLS listener cannot be served by an HTTP-only edge; and no Issuer,
+// Certificate or http->https redirect route is minted, since none of
+// them has anything to do.
+func TestReconcile_EdgeModeRendersPlainHTTPListeners(t *testing.T) {
+	s := newScheme(t)
+	tgw := &gatewayv1alpha1.TenantGateway{
+		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-root"},
+		Spec: gatewayv1alpha1.TenantGatewaySpec{
+			Apex:                   "example.org",
+			CertMode:               gatewayv1alpha1.CertModeEdge,
+			GatewayClassName:       "cloudflare-tunnel",
+			TLSPassthroughServices: []string{"api", "vm-exportproxy"},
+		},
+	}
+	child := &corev1.Namespace{ObjectMeta: metav1.ObjectMeta{
+		Name: "tenant-alice",
+		Labels: map[string]string{
+			namespaceGatewayLabel:         "tenant-root",
+			"namespace.cozystack.io/host": "alice.example.org",
+		},
+	}}
+	c := fake.NewClientBuilder().WithScheme(s).WithObjects(tgw, child).WithStatusSubresource(tgw, &gatewayv1.Gateway{}).Build()
+
+	r := &Reconciler{Client: c, Scheme: s}
+	if _, err := r.Reconcile(context.TODO(), ctrl.Request{
+		NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-root"},
+	}); err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+
+	gw := &gatewayv1.Gateway{}
+	if err := c.Get(context.TODO(), types.NamespacedName{Name: "cozystack", Namespace: "tenant-root"}, gw); err != nil {
+		t.Fatalf("get Gateway: %v", err)
+	}
+	if gw.Spec.GatewayClassName != "cloudflare-tunnel" {
+		t.Errorf("gatewayClassName=%q, want cloudflare-tunnel", gw.Spec.GatewayClassName)
+	}
+	byHost := map[string]gatewayv1.Listener{}
+	for _, l := range gw.Spec.Listeners {
+		if l.Protocol != gatewayv1.HTTPProtocolType {
+			t.Errorf("edge mode must render HTTP listeners only, got %s listener %q", l.Protocol, l.Name)
+		}
+		if l.TLS != nil {
+			t.Errorf("edge mode listener %q must carry no TLS config, got %+v", l.Name, l.TLS)
+		}
+		if l.Hostname == nil {
+			// A hostname-less listener admits every host, and Cilium
+			// before 1.19.6 read only the first listener when deciding
+			// whether a namespace may attach (cilium#42159), so one
+			// sitting at index 0 with the narrow ACME selector detached
+			// every inheriting tenant's route.
+			t.Errorf("edge mode must render no hostname-less listener, got %q", l.Name)
+			continue
+		}
+		byHost[string(*l.Hostname)] = l
+	}
+	for _, host := range []string{"*.example.org", "example.org", "*.alice.example.org"} {
+		l, ok := byHost[host]
+		if !ok {
+			t.Errorf("expected an HTTP listener for %s, got %+v", host, gw.Spec.Listeners)
+			continue
+		}
+		if l.AllowedRoutes == nil || l.AllowedRoutes.Namespaces == nil || l.AllowedRoutes.Namespaces.Selector == nil ||
+			l.AllowedRoutes.Namespaces.Selector.MatchLabels[namespaceGatewayLabel] != "tenant-root" {
+			t.Errorf("listener %s must admit routes by the %s label so inheriting tenants attach, got %+v", host, namespaceGatewayLabel, l.AllowedRoutes)
+		}
+		if len(l.AllowedRoutes.Kinds) != 1 || l.AllowedRoutes.Kinds[0].Kind != "HTTPRoute" {
+			t.Errorf("listener %s must admit HTTPRoute only, got %+v", host, l.AllowedRoutes.Kinds)
+		}
+	}
+
+	issuers := &cmv1.IssuerList{}
+	if err := c.List(context.TODO(), issuers, client.InNamespace("tenant-root")); err != nil {
+		t.Fatalf("list Issuers: %v", err)
+	}
+	if len(issuers.Items) != 0 {
+		t.Errorf("edge mode must mint no Issuer, got %d", len(issuers.Items))
+	}
+	certs := &cmv1.CertificateList{}
+	if err := c.List(context.TODO(), certs, client.InNamespace("tenant-root")); err != nil {
+		t.Fatalf("list Certificates: %v", err)
+	}
+	if len(certs.Items) != 0 {
+		t.Errorf("edge mode must mint no Certificate, got %d", len(certs.Items))
+	}
+	redirect := &gatewayv1.HTTPRoute{}
+	if err := c.Get(context.TODO(), types.NamespacedName{Name: "cozystack-http-redirect", Namespace: "tenant-root"}, redirect); !apierrors.IsNotFound(err) {
+		t.Errorf("edge mode must not render the http->https redirect route, got err=%v", err)
+	}
+}
+
+// TestReconcile_SwitchToEdgeModeCleansACMEMachinery pins the mode
+// transition: a TenantGateway that already ran in HTTP-01 mode carries
+// an Issuer, per-listener Certificates and the redirect route. Moving it
+// to edge must delete all three, or the tenant keeps ACME machinery
+// (and Let's Encrypt renewals) it can no longer use.
+func TestReconcile_SwitchToEdgeModeCleansACMEMachinery(t *testing.T) {
+	s := newScheme(t)
+	tgw := &gatewayv1alpha1.TenantGateway{
+		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
+		Spec: gatewayv1alpha1.TenantGatewaySpec{
+			Apex:             "foo.example.com",
+			CertMode:         gatewayv1alpha1.CertModeHTTP01,
+			GatewayClassName: "cilium",
+		},
+	}
+	route := &gatewayv1.HTTPRoute{
+		ObjectMeta: metav1.ObjectMeta{Name: "harbor", Namespace: "tenant-foo"},
+		Spec: gatewayv1.HTTPRouteSpec{
+			CommonRouteSpec: gatewayv1.CommonRouteSpec{ParentRefs: []gatewayv1.ParentReference{{Name: "cozystack"}}},
+			Hostnames:       []gatewayv1.Hostname{"harbor.foo.example.com"},
+		},
+	}
+	c := fake.NewClientBuilder().WithScheme(s).WithObjects(tgw, route).WithStatusSubresource(tgw, &gatewayv1.Gateway{}, &gatewayv1.HTTPRoute{}).Build()
+	r := &Reconciler{Client: c, Scheme: s}
+	req := ctrl.Request{NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"}}
+	if _, err := r.Reconcile(context.TODO(), req); err != nil {
+		t.Fatalf("http01 reconcile: %v", err)
+	}
+	certs := &cmv1.CertificateList{}
+	if err := c.List(context.TODO(), certs, client.InNamespace("tenant-foo")); err != nil || len(certs.Items) == 0 {
+		t.Fatalf("precondition: expected a per-listener Certificate in http01 mode, got %d (err=%v)", len(certs.Items), err)
+	}
+
+	if err := c.Get(context.TODO(), req.NamespacedName, tgw); err != nil {
+		t.Fatalf("get tgw: %v", err)
+	}
+	tgw.Spec.CertMode = gatewayv1alpha1.CertModeEdge
+	if err := c.Update(context.TODO(), tgw); err != nil {
+		t.Fatalf("update tgw: %v", err)
+	}
+	if _, err := r.Reconcile(context.TODO(), req); err != nil {
+		t.Fatalf("edge reconcile: %v", err)
+	}
+
+	if err := c.List(context.TODO(), certs, client.InNamespace("tenant-foo")); err != nil {
+		t.Fatalf("list Certificates: %v", err)
+	}
+	if len(certs.Items) != 0 {
+		t.Errorf("per-listener Certificates must be removed on the switch to edge, got %d", len(certs.Items))
+	}
+	issuer := &cmv1.Issuer{}
+	if err := c.Get(context.TODO(), types.NamespacedName{Name: gatewayIssuerName(tgw), Namespace: "tenant-foo"}, issuer); !apierrors.IsNotFound(err) {
+		t.Errorf("Issuer must be removed on the switch to edge, got err=%v", err)
+	}
+	redirect := &gatewayv1.HTTPRoute{}
+	if err := c.Get(context.TODO(), types.NamespacedName{Name: "cozystack-http-redirect", Namespace: "tenant-foo"}, redirect); !apierrors.IsNotFound(err) {
+		t.Errorf("redirect route must be removed on the switch to edge, got err=%v", err)
+	}
+	gw := &gatewayv1.Gateway{}
+	if err := c.Get(context.TODO(), req.NamespacedName, gw); err != nil {
+		t.Fatalf("get Gateway: %v", err)
+	}
+	for _, l := range gw.Spec.Listeners {
+		if l.Protocol == gatewayv1.HTTPSProtocolType {
+			t.Errorf("HTTPS listener %q must not survive the switch to edge", l.Name)
+		}
+	}
+}
+
+// TestReconcile_SwitchToEdgeModeWithdrawsTLSRouteAcceptance pins the
+// route side of that transition. Edge renders no TLS-passthrough
+// listener, so a TLSRoute pinned to one — the platform's own api,
+// vm-exportproxy and cdi-uploadproxy endpoints all are — can no longer
+// attach to anything on this Gateway. collectHostnameClaims returns no
+// claims for a whole-apex mode, so the acceptance this controller wrote
+// while the tenant ran HTTP-01 stands on a route that is no longer
+// served unless the switch withdraws it, and whoever debugs the dead
+// endpoint reads it as proof the route is fine.
+func TestReconcile_SwitchToEdgeModeWithdrawsTLSRouteAcceptance(t *testing.T) {
+	s := newScheme(t)
+	tgw := &gatewayv1alpha1.TenantGateway{
+		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-root"},
+		Spec: gatewayv1alpha1.TenantGatewaySpec{
+			Apex:                   "example.org",
+			CertMode:               gatewayv1alpha1.CertModeHTTP01,
+			GatewayClassName:       "cilium",
+			AttachedNamespaces:     []string{"default"},
+			TLSPassthroughServices: []string{"api"},
+		},
+	}
+	section := gatewayv1.SectionName("tls-api")
+	parentNs := gatewayv1.Namespace("tenant-root")
+	route := &gatewayv1alpha2.TLSRoute{
+		ObjectMeta: metav1.ObjectMeta{Name: "kubernetes-api", Namespace: "default"},
+		Spec: gatewayv1alpha2.TLSRouteSpec{
+			CommonRouteSpec: gatewayv1.CommonRouteSpec{ParentRefs: []gatewayv1.ParentReference{{
+				Group:       ptrGroup(gatewayv1.GroupName),
+				Kind:        ptrKind("Gateway"),
+				Name:        "cozystack",
+				Namespace:   &parentNs,
+				SectionName: &section,
+			}}},
+			Hostnames: []gatewayv1alpha2.Hostname{"api.example.org"},
+		},
+	}
+	// A route from a namespace that may not attach here: the switch
+	// must not start writing status onto routes this controller never
+	// judged, or any namespace in the cluster could make it write.
+	foreign := route.DeepCopy()
+	foreign.ObjectMeta = metav1.ObjectMeta{Name: "kubernetes-api", Namespace: "tenant-bob"}
+	c := fake.NewClientBuilder().
+		WithScheme(s).
+		WithObjects(tgw, route, foreign).
+		WithStatusSubresource(tgw, &gatewayv1.Gateway{}, &gatewayv1alpha2.TLSRoute{}).
+		Build()
+
+	r := &Reconciler{Client: c, Scheme: s}
+	req := ctrl.Request{NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-root"}}
+	if _, err := r.Reconcile(context.TODO(), req); err != nil {
+		t.Fatalf("http01 reconcile: %v", err)
+	}
+	if cond := ourAcceptedCondition(t, c, "kubernetes-api", "default"); cond == nil || cond.Status != metav1.ConditionTrue {
+		t.Fatalf("precondition: expected Accepted=True in http01 mode, got %+v", cond)
+	}
+
+	if err := c.Get(context.TODO(), req.NamespacedName, tgw); err != nil {
+		t.Fatalf("get tgw: %v", err)
+	}
+	tgw.Spec.CertMode = gatewayv1alpha1.CertModeEdge
+	if err := c.Update(context.TODO(), tgw); err != nil {
+		t.Fatalf("update tgw: %v", err)
+	}
+	if _, err := r.Reconcile(context.TODO(), req); err != nil {
+		t.Fatalf("edge reconcile: %v", err)
+	}
+
+	gw := &gatewayv1.Gateway{}
+	if err := c.Get(context.TODO(), req.NamespacedName, gw); err != nil {
+		t.Fatalf("get Gateway: %v", err)
+	}
+	for _, l := range gw.Spec.Listeners {
+		if l.Protocol == gatewayv1.TLSProtocolType {
+			t.Fatalf("precondition: edge must render no TLS-passthrough listener, got %q", l.Name)
+		}
+	}
+
+	cond := ourAcceptedCondition(t, c, "kubernetes-api", "default")
+	if cond == nil {
+		t.Fatalf("expected this controller to keep judging the route it stamped, found no Accepted condition")
+	}
+	if cond.Status != metav1.ConditionFalse || cond.Reason != "NoMatchingParent" {
+		t.Errorf("Accepted=%s reason=%q, want False/NoMatchingParent — the pinned listener is gone", cond.Status, cond.Reason)
+	}
+	if got := ourAcceptedCondition(t, c, "kubernetes-api", "tenant-bob"); got != nil {
+		t.Errorf("route from a namespace that may not attach got a condition from this controller: %+v", got)
+	}
+
+	// Withdrawal joins the same idempotency contract as every other
+	// status write here: a quiescent reconcile must not bump the
+	// resourceVersion, or the Owns/Watches re-trigger never settles.
+	before := &gatewayv1alpha2.TLSRoute{}
+	if err := c.Get(context.TODO(), types.NamespacedName{Name: "kubernetes-api", Namespace: "default"}, before); err != nil {
+		t.Fatalf("get TLSRoute: %v", err)
+	}
+	if _, err := r.Reconcile(context.TODO(), req); err != nil {
+		t.Fatalf("second edge reconcile: %v", err)
+	}
+	after := &gatewayv1alpha2.TLSRoute{}
+	if err := c.Get(context.TODO(), types.NamespacedName{Name: "kubernetes-api", Namespace: "default"}, after); err != nil {
+		t.Fatalf("get TLSRoute: %v", err)
+	}
+	if before.ResourceVersion != after.ResourceVersion {
+		t.Errorf("second edge reconcile rewrote the route status (resourceVersion %s -> %s)", before.ResourceVersion, after.ResourceVersion)
+	}
+}
+
+// TestReconcile_LeavingEdgeForAWildcardModeClearsTheWithdrawal is the
+// mirror of the test above. dns01 and existingSecret render the
+// TLS-passthrough listeners again and serve them, but collect no
+// hostname claims, so updateRouteStatuses stays silent there and cannot
+// undo the withdrawal edge wrote. Left standing it inverts the defect
+// the withdrawal exists for: a served endpoint reporting that it matches
+// no parent, naming a class provider that no longer terminates anything.
+func TestReconcile_LeavingEdgeForAWildcardModeClearsTheWithdrawal(t *testing.T) {
+	for _, tc := range []struct {
+		name string
+		back func(*gatewayv1alpha1.TenantGateway)
+	}{
+		{"dns01", func(g *gatewayv1alpha1.TenantGateway) {
+			g.Spec.CertMode = gatewayv1alpha1.CertModeDNS01
+			g.Spec.DNS01 = &gatewayv1alpha1.DNS01Config{
+				Provider:   "cloudflare",
+				Cloudflare: &gatewayv1alpha1.CloudflareDNS01{APITokenSecretRef: corev1.SecretKeySelector{LocalObjectReference: corev1.LocalObjectReference{Name: "cf"}, Key: "api-token"}},
+			}
+		}},
+		{"existingSecret", func(g *gatewayv1alpha1.TenantGateway) {
+			g.Spec.CertMode = gatewayv1alpha1.CertModeExistingSecret
+			g.Spec.WildcardSecretRef = &corev1.LocalObjectReference{Name: "wildcard-tls"}
+		}},
+	} {
+		t.Run(tc.name, func(t *testing.T) {
+			s := newScheme(t)
+			tgw := &gatewayv1alpha1.TenantGateway{
+				ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-root"},
+				Spec: gatewayv1alpha1.TenantGatewaySpec{
+					Apex:                   "example.org",
+					CertMode:               gatewayv1alpha1.CertModeEdge,
+					GatewayClassName:       "cloudflare-tunnel",
+					AttachedNamespaces:     []string{"default"},
+					TLSPassthroughServices: []string{"api"},
+				},
+			}
+			section := gatewayv1.SectionName("tls-api")
+			parentNs := gatewayv1.Namespace("tenant-root")
+			route := &gatewayv1alpha2.TLSRoute{
+				ObjectMeta: metav1.ObjectMeta{Name: "kubernetes-api", Namespace: "default"},
+				Spec: gatewayv1alpha2.TLSRouteSpec{
+					CommonRouteSpec: gatewayv1.CommonRouteSpec{ParentRefs: []gatewayv1.ParentReference{{
+						Group:       ptrGroup(gatewayv1.GroupName),
+						Kind:        ptrKind("Gateway"),
+						Name:        "cozystack",
+						Namespace:   &parentNs,
+						SectionName: &section,
+					}}},
+					Hostnames: []gatewayv1alpha2.Hostname{"api.example.org"},
+				},
+			}
+			c := fake.NewClientBuilder().
+				WithScheme(s).
+				WithObjects(tgw, route).
+				WithStatusSubresource(tgw, &gatewayv1.Gateway{}, &gatewayv1alpha2.TLSRoute{}).
+				Build()
+
+			r := &Reconciler{Client: c, Scheme: s}
+			req := ctrl.Request{NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-root"}}
+			if _, err := r.Reconcile(context.TODO(), req); err != nil {
+				t.Fatalf("edge reconcile: %v", err)
+			}
+			if cond := ourAcceptedCondition(t, c, "kubernetes-api", "default"); cond == nil || cond.Status != metav1.ConditionFalse {
+				t.Fatalf("precondition: expected the withdrawal in edge mode, got %+v", cond)
+			}
+
+			if err := c.Get(context.TODO(), req.NamespacedName, tgw); err != nil {
+				t.Fatalf("get tgw: %v", err)
+			}
+			tc.back(tgw)
+			if err := c.Update(context.TODO(), tgw); err != nil {
+				t.Fatalf("update tgw: %v", err)
+			}
+			if _, err := r.Reconcile(context.TODO(), req); err != nil {
+				t.Fatalf("%s reconcile: %v", tc.name, err)
+			}
+
+			gw := &gatewayv1.Gateway{}
+			if err := c.Get(context.TODO(), req.NamespacedName, gw); err != nil {
+				t.Fatalf("get Gateway: %v", err)
+			}
+			var passthrough bool
+			for _, l := range gw.Spec.Listeners {
+				if l.Protocol == gatewayv1.TLSProtocolType {
+					passthrough = true
+				}
+			}
+			if !passthrough {
+				t.Fatalf("precondition: %s must render the tls-api listener again, got %+v", tc.name, gw.Spec.Listeners)
+			}
+			if cond := ourAcceptedCondition(t, c, "kubernetes-api", "default"); cond != nil {
+				t.Errorf("the withdrawal must not survive a switch back to %s, got %+v", tc.name, cond)
+			}
+
+			before := &gatewayv1alpha2.TLSRoute{}
+			if err := c.Get(context.TODO(), types.NamespacedName{Name: "kubernetes-api", Namespace: "default"}, before); err != nil {
+				t.Fatalf("get TLSRoute: %v", err)
+			}
+			if _, err := r.Reconcile(context.TODO(), req); err != nil {
+				t.Fatalf("second %s reconcile: %v", tc.name, err)
+			}
+			after := &gatewayv1alpha2.TLSRoute{}
+			if err := c.Get(context.TODO(), types.NamespacedName{Name: "kubernetes-api", Namespace: "default"}, after); err != nil {
+				t.Fatalf("get TLSRoute: %v", err)
+			}
+			if before.ResourceVersion != after.ResourceVersion {
+				t.Errorf("retraction must be idempotent, resourceVersion %s -> %s", before.ResourceVersion, after.ResourceVersion)
+			}
+		})
+	}
+}
+
+// TestReconcile_HostnameLessTLSRouteIsNotWithdrawn pins why the
+// whole-apex pass leaves a route with no spec.hostnames alone, which is
+// not that the controller never judges one. Under http01 it does: the
+// route is judged on the hostname the listener its sectionName names
+// lends it, the way Gateway API serves it. What decides the skip
+// is the leg where that lends nothing. A route pinned to a section this
+// Gateway renders no listener for produces no claim under http01
+// either, so a refusal written on it under edge would have no pass that
+// could ever retract it.
+//
+// Both legs run the same transition: edge writes nothing, then http01
+// says whatever it can. The route carries no rules, which keeps the
+// second leg about the section alone — a route that attaches and
+// forwards nowhere is still attached, and Gateway API reports that
+// under ResolvedRefs rather than under Accepted.
+func TestReconcile_HostnameLessTLSRouteIsNotWithdrawn(t *testing.T) {
+	for _, tc := range []struct {
+		name string
+		// section is the listener the route pins itself to; rendered
+		// says whether the Gateway carries one under that name.
+		section  string
+		rendered bool
+	}{
+		{"section names a rendered listener", "tls-api", true},
+		{"section names no rendered listener", "tls-absent", false},
+	} {
+		t.Run(tc.name, func(t *testing.T) {
+			s := newScheme(t)
+			tgw := &gatewayv1alpha1.TenantGateway{
+				ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-root"},
+				Spec: gatewayv1alpha1.TenantGatewaySpec{
+					Apex:                   "example.org",
+					CertMode:               gatewayv1alpha1.CertModeEdge,
+					GatewayClassName:       "cloudflare-tunnel",
+					AttachedNamespaces:     []string{"default"},
+					TLSPassthroughServices: []string{"api"},
+				},
+			}
+			section := gatewayv1.SectionName(tc.section)
+			parentNs := gatewayv1.Namespace("tenant-root")
+			route := &gatewayv1alpha2.TLSRoute{
+				ObjectMeta: metav1.ObjectMeta{Name: "kubernetes-api", Namespace: "default"},
+				Spec: gatewayv1alpha2.TLSRouteSpec{
+					CommonRouteSpec: gatewayv1.CommonRouteSpec{ParentRefs: []gatewayv1.ParentReference{{
+						Group:       ptrGroup(gatewayv1.GroupName),
+						Kind:        ptrKind("Gateway"),
+						Name:        "cozystack",
+						Namespace:   &parentNs,
+						SectionName: &section,
+					}}},
+				},
+			}
+			c := fake.NewClientBuilder().
+				WithScheme(s).
+				WithObjects(tgw, route).
+				WithStatusSubresource(tgw, &gatewayv1.Gateway{}, &gatewayv1alpha2.TLSRoute{}).
+				Build()
+
+			r := &Reconciler{Client: c, Scheme: s}
+			req := ctrl.Request{NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-root"}}
+			if _, err := r.Reconcile(context.TODO(), req); err != nil {
+				t.Fatalf("edge reconcile: %v", err)
+			}
+			if cond := ourAcceptedCondition(t, c, "kubernetes-api", "default"); cond != nil {
+				t.Errorf("a route the edge pass cannot retract must not be withdrawn either, got %+v", cond)
+			}
+
+			if err := c.Get(context.TODO(), req.NamespacedName, tgw); err != nil {
+				t.Fatalf("get tgw: %v", err)
+			}
+			tgw.Spec.CertMode = gatewayv1alpha1.CertModeHTTP01
+			if err := c.Update(context.TODO(), tgw); err != nil {
+				t.Fatalf("update tgw: %v", err)
+			}
+			if _, err := r.Reconcile(context.TODO(), req); err != nil {
+				t.Fatalf("http01 reconcile: %v", err)
+			}
+			cond := ourAcceptedCondition(t, c, "kubernetes-api", "default")
+			if !tc.rendered {
+				if cond != nil {
+					t.Errorf("http01 judges only routes a rendered listener lends a hostname to, got %+v", cond)
+				}
+				return
+			}
+			if cond == nil {
+				t.Fatalf("http01 must judge a route the listener it pins lends its hostname to")
+			}
+			if cond.Status != metav1.ConditionTrue {
+				t.Errorf("Accepted=%s reason=%s on a route attached to the listener it named: %q", cond.Status, cond.Reason, cond.Message)
+			}
+		})
+	}
+}
+
+// TestRemoveRouteParentStatus pins the key the retraction deletes on.
+// RouteParentStatus is keyed by (ParentRef, ControllerName): a route may
+// attach through several parentRefs, one per sectionName, and each owns
+// its own entry. Deleting on ControllerName alone would take a sibling
+// section's status with it, and any other controller's entry is not ours
+// to touch at all.
+func TestRemoveRouteParentStatus(t *testing.T) {
+	api := gatewayv1.SectionName("tls-api")
+	exportproxy := gatewayv1.SectionName("tls-vm-exportproxy")
+	refFor := func(section *gatewayv1.SectionName) gatewayv1.ParentReference {
+		return gatewayv1.ParentReference{Name: "cozystack", SectionName: section}
+	}
+	parents := []gatewayv1.RouteParentStatus{
+		{ControllerName: ControllerName, ParentRef: refFor(&api)},
+		{ControllerName: ControllerName, ParentRef: refFor(&exportproxy)},
+		{ControllerName: "io.cilium/gateway-controller", ParentRef: refFor(&api)},
+	}
+
+	removeRouteParentStatus(&parents, refFor(&api))
+
+	if len(parents) != 2 {
+		t.Fatalf("expected exactly the tls-api entry of this controller to go, got %+v", parents)
+	}
+	var sawSibling, sawForeign bool
+	for _, ps := range parents {
+		switch {
+		case ps.ControllerName == ControllerName && *ps.ParentRef.SectionName == exportproxy:
+			sawSibling = true
+		case ps.ControllerName != ControllerName:
+			sawForeign = true
+		default:
+			t.Errorf("unexpected surviving entry %+v", ps)
+		}
+	}
+	if !sawSibling {
+		t.Errorf("the tls-vm-exportproxy entry owns its own parentRef and must survive")
+	}
+	if !sawForeign {
+		t.Errorf("another controller's entry must survive")
+	}
+}
+
+// ourAcceptedCondition returns the Accepted condition this controller
+// wrote on the named TLSRoute, or nil when it wrote none.
+func ourAcceptedCondition(t *testing.T, c client.Client, name, ns string) *metav1.Condition {
+	t.Helper()
+	got := &gatewayv1alpha2.TLSRoute{}
+	if err := c.Get(context.TODO(), types.NamespacedName{Name: name, Namespace: ns}, got); err != nil {
+		t.Fatalf("get TLSRoute %s/%s: %v", ns, name, err)
+	}
+	for _, ps := range got.Status.Parents {
+		if string(ps.ControllerName) != testControllerName {
+			continue
+		}
+		for i := range ps.Conditions {
+			if ps.Conditions[i].Type == "Accepted" {
+				return &ps.Conditions[i]
+			}
+		}
+	}
+	return nil
+}
+
+// TestReconcile_EdgeListenersAdmitTheACMEChallengeNamespace pins the one
+// route that reaches an edge Gateway from outside the tenant tree. With no
+// listener named "http" the cluster-wide ClusterIssuer drops its
+// sectionName pin (packages/system/cert-manager-issuers), so the challenge
+// HTTPRoute cert-manager publishes in its own namespace — ClusterIssuer
+// solver resources land in --cluster-resource-namespace, which is
+// cozy-cert-manager here — attaches by hostname instead. It gets in because
+// the controller labels every AttachedNamespaces entry with the same
+// namespace.cozystack.io/gateway label the edge listeners select on, and
+// the platform ships cozy-cert-manager on that list. Without this the
+// HTTP-01 path would be dead on an edge Gateway with nothing saying why.
+func TestReconcile_EdgeListenersAdmitTheACMEChallengeNamespace(t *testing.T) {
+	s := newScheme(t)
+	tgw := &gatewayv1alpha1.TenantGateway{
+		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-root"},
+		Spec: gatewayv1alpha1.TenantGatewaySpec{
+			Apex:               "example.org",
+			CertMode:           gatewayv1alpha1.CertModeEdge,
+			GatewayClassName:   "cloudflare-tunnel",
+			AttachedNamespaces: []string{acmeChallengeNamespace},
+		},
+	}
+	challengeNS := &corev1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: acmeChallengeNamespace}}
+	c := fake.NewClientBuilder().WithScheme(s).WithObjects(tgw, challengeNS).WithStatusSubresource(tgw, &gatewayv1.Gateway{}).Build()
+
+	r := &Reconciler{Client: c, Scheme: s}
+	if _, err := r.Reconcile(context.TODO(), ctrl.Request{
+		NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-root"},
+	}); err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+
+	got := &corev1.Namespace{}
+	if err := c.Get(context.TODO(), types.NamespacedName{Name: acmeChallengeNamespace}, got); err != nil {
+		t.Fatalf("get challenge namespace: %v", err)
+	}
+	if got.Labels[namespaceGatewayLabel] != "tenant-root" {
+		t.Fatalf("challenge namespace must carry %s=tenant-root, got %v", namespaceGatewayLabel, got.Labels)
+	}
+
+	gw := &gatewayv1.Gateway{}
+	if err := c.Get(context.TODO(), types.NamespacedName{Name: "cozystack", Namespace: "tenant-root"}, gw); err != nil {
+		t.Fatalf("get Gateway: %v", err)
+	}
+	for i := range gw.Spec.Listeners {
+		l := &gw.Spec.Listeners[i]
+		sel, err := metav1.LabelSelectorAsSelector(l.AllowedRoutes.Namespaces.Selector)
+		if err != nil {
+			t.Fatalf("listener %s: bad selector: %v", l.Name, err)
+		}
+		if !sel.Matches(labels.Set(got.Labels)) {
+			t.Errorf("listener %s does not admit the ACME challenge namespace (selector %s, labels %v)", l.Name, sel, got.Labels)
+		}
+		var admitsHTTPRoute bool
+		for _, k := range l.AllowedRoutes.Kinds {
+			if k.Kind == "HTTPRoute" {
+				admitsHTTPRoute = true
+			}
+		}
+		if !admitsHTTPRoute {
+			t.Errorf("listener %s must admit HTTPRoute so the challenge route can attach, got %+v", l.Name, l.AllowedRoutes.Kinds)
+		}
+	}
+}
+
+// TestReconcile_EdgeModeLeavesAForeignRedirectRouteAlone pins the
+// ownership guard on the one path in this controller that DELETES a route
+// rather than writing one. Edge mode removes the redirect HTTPRoute it
+// owns, because nothing listens on https for it to point at; an HTTPRoute
+// of the same name that the controller never created belongs to whoever
+// did, and must survive. Note the contract differs from the http01 path on
+// the same object: there a foreign route is a takeover refusal and fails
+// the reconcile, here it is simply left alone, because edge has nothing it
+// wants to put in its place.
+func TestReconcile_EdgeModeLeavesAForeignRedirectRouteAlone(t *testing.T) {
+	s := newScheme(t)
+	tgw := &gatewayv1alpha1.TenantGateway{
+		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
+		Spec: gatewayv1alpha1.TenantGatewaySpec{
+			Apex:             "foo.example.com",
+			CertMode:         gatewayv1alpha1.CertModeEdge,
+			GatewayClassName: "cloudflare-tunnel",
+		},
+	}
+	foreign := &gatewayv1.HTTPRoute{
+		ObjectMeta: metav1.ObjectMeta{Name: "cozystack-http-redirect", Namespace: "tenant-foo"},
+		Spec: gatewayv1.HTTPRouteSpec{
+			Hostnames: []gatewayv1.Hostname{"operator.foo.example.com"},
+		},
+	}
+	c := fake.NewClientBuilder().WithScheme(s).WithObjects(tgw, foreign).WithStatusSubresource(tgw, &gatewayv1.Gateway{}).Build()
+
+	r := &Reconciler{Client: c, Scheme: s}
+	if _, err := r.Reconcile(context.TODO(), ctrl.Request{
+		NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"},
+	}); err != nil {
+		t.Fatalf("edge reconcile must not fail on a foreign redirect route: %v", err)
+	}
+
+	got := &gatewayv1.HTTPRoute{}
+	if err := c.Get(context.TODO(), types.NamespacedName{Name: "cozystack-http-redirect", Namespace: "tenant-foo"}, got); err != nil {
+		t.Fatalf("the foreign HTTPRoute must survive the switch to edge: %v", err)
+	}
+	if len(got.Spec.Hostnames) != 1 || string(got.Spec.Hostnames[0]) != "operator.foo.example.com" {
+		t.Errorf("the foreign HTTPRoute must be untouched, got %+v", got.Spec)
+	}
+}
+
+// TestReconcile_SwitchingBackFromEdgeRestoresTheACMEShape pins the way out
+// of edge, which is the likelier operational move: an operator who lists a
+// class in edgeTerminatedClasses by mistake takes it back out. The Gateway
+// must lose its plain-HTTP apex listeners and regain the narrow :80
+// listener, the redirect route the edge branch deleted must come back, and
+// the Issuer must be minted again — none of which is exercised by the
+// forward direction, where each of those is a delete.
+func TestReconcile_SwitchingBackFromEdgeRestoresTheACMEShape(t *testing.T) {
+	s := newScheme(t)
+	tgw := &gatewayv1alpha1.TenantGateway{
+		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
+		Spec: gatewayv1alpha1.TenantGatewaySpec{
+			Apex:             "foo.example.com",
+			CertMode:         gatewayv1alpha1.CertModeEdge,
+			GatewayClassName: "cloudflare-tunnel",
+		},
+	}
+	c := fake.NewClientBuilder().WithScheme(s).WithObjects(tgw).WithStatusSubresource(tgw, &gatewayv1.Gateway{}).Build()
+	r := &Reconciler{Client: c, Scheme: s}
+	req := ctrl.Request{NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"}}
+	if _, err := r.Reconcile(context.TODO(), req); err != nil {
+		t.Fatalf("edge reconcile: %v", err)
+	}
+	if err := c.Get(context.TODO(), types.NamespacedName{Name: "cozystack-http-redirect", Namespace: "tenant-foo"}, &gatewayv1.HTTPRoute{}); !apierrors.IsNotFound(err) {
+		t.Fatalf("precondition: edge must leave no redirect route, got err=%v", err)
+	}
+
+	if err := c.Get(context.TODO(), req.NamespacedName, tgw); err != nil {
+		t.Fatalf("get tgw: %v", err)
+	}
+	tgw.Spec.CertMode = gatewayv1alpha1.CertModeHTTP01
+	tgw.Spec.GatewayClassName = "cilium"
+	if err := c.Update(context.TODO(), tgw); err != nil {
+		t.Fatalf("switch back: %v", err)
+	}
+	if _, err := r.Reconcile(context.TODO(), req); err != nil {
+		t.Fatalf("http01 reconcile: %v", err)
+	}
+
+	gw := &gatewayv1.Gateway{}
+	if err := c.Get(context.TODO(), req.NamespacedName, gw); err != nil {
+		t.Fatalf("get Gateway: %v", err)
+	}
+	var sawNarrowHTTP bool
+	for i := range gw.Spec.Listeners {
+		l := &gw.Spec.Listeners[i]
+		if l.Name == "http" && l.Hostname == nil {
+			sawNarrowHTTP = true
+		}
+		if strings.HasPrefix(string(l.Name), "edge") {
+			t.Errorf("edge listener %q survived the switch back", l.Name)
+		}
+	}
+	if !sawNarrowHTTP {
+		t.Errorf("the narrow :80 listener must come back, got %+v", gw.Spec.Listeners)
+	}
+	if err := c.Get(context.TODO(), types.NamespacedName{Name: "cozystack-http-redirect", Namespace: "tenant-foo"}, &gatewayv1.HTTPRoute{}); err != nil {
+		t.Errorf("the redirect route must be recreated on the way back: %v", err)
+	}
+	if err := c.Get(context.TODO(), types.NamespacedName{Name: gatewayIssuerName(tgw), Namespace: "tenant-foo"}, &cmv1.Issuer{}); err != nil {
+		t.Errorf("the ACME Issuer must be minted again on the way back: %v", err)
+	}
+}
+
+// TestReconcile_SectionNamingNoRenderedListenerIsNoMatchingParent pins
+// the reason, which the table above does not read.
+//
+// Gateway API defines NoMatchingParent for a parentRef whose port or
+// sectionName matches no listener on the Gateway, and that is exactly
+// this shape: the route named a tls-* listener, this controller renders
+// every listener in that namespace, and it renders no such one. The
+// residual reason NoMatchingListenerHostname would say the opposite of
+// what happened here, since a listener does answer the hostname.
+func TestReconcile_SectionNamingNoRenderedListenerIsNoMatchingParent(t *testing.T) {
+	const apex = "foo.example.com"
+	s := newScheme(t)
+	tgw := &gatewayv1alpha1.TenantGateway{
+		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
+		Spec: gatewayv1alpha1.TenantGatewaySpec{
+			Apex:                   apex,
+			CertMode:               gatewayv1alpha1.CertModeHTTP01,
+			GatewayClassName:       "cilium",
+			TLSPassthroughServices: []string{"svc"},
+		},
+	}
+	route := tlsRouteAttached("r", "tenant-foo", "svc."+apex, "tls-typo", "tenant-foo")
+	c := fake.NewClientBuilder().
+		WithScheme(s).
+		WithObjects(tgw, route).
+		WithStatusSubresource(tgw, route).
+		Build()
+
+	r := &Reconciler{Client: c, Scheme: s}
+	if _, err := r.Reconcile(context.TODO(), ctrl.Request{
+		NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"},
+	}); err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+
+	got := &gatewayv1alpha2.TLSRoute{}
+	if err := c.Get(context.TODO(), types.NamespacedName{Name: "r", Namespace: "tenant-foo"}, got); err != nil {
+		t.Fatalf("get route: %v", err)
+	}
+	accepted := acceptedCondition2(got.Status.Parents)
+	if accepted == nil {
+		t.Fatalf("no Accepted condition under %s: %+v", testControllerName, got.Status.Parents)
+	}
+	if accepted.Status != metav1.ConditionFalse {
+		t.Errorf("Accepted=%s, want False: a route pinned to tls-typo attaches to nothing", accepted.Status)
+	}
+	if want := string(gatewayv1.RouteReasonNoMatchingParent); accepted.Reason != want {
+		t.Errorf("reason=%s, want %s: %q", accepted.Reason, want, accepted.Message)
+	}
+	if !strings.Contains(accepted.Message, "tls-typo") {
+		t.Errorf("message does not name the sectionName the route carries: %q", accepted.Message)
+	}
+}
+
+// TestReconcile_SectionNamingATerminateListenerKeepsItsSilence pins the
+// other half of the same rule. A sectionName outside the tls- namespace
+// names a listener family this controller does not enumerate here, so
+// it holds no opinion and leaves the verdict to the class controller,
+// which is the one that knows whether that listener took the route.
+func TestReconcile_SectionNamingATerminateListenerKeepsItsSilence(t *testing.T) {
+	const apex = "foo.example.com"
+	s := newScheme(t)
+	tgw := &gatewayv1alpha1.TenantGateway{
+		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
+		Spec: gatewayv1alpha1.TenantGatewaySpec{
+			Apex:                   apex,
+			CertMode:               gatewayv1alpha1.CertModeHTTP01,
+			GatewayClassName:       "cilium",
+			TLSPassthroughServices: []string{"svc"},
+		},
+	}
+	route := tlsRouteAttached("r", "tenant-foo", "svc."+apex, perListenerName("svc."+apex), "tenant-foo")
+	c := fake.NewClientBuilder().
+		WithScheme(s).
+		WithObjects(tgw, route).
+		WithStatusSubresource(tgw, route).
+		Build()
+
+	r := &Reconciler{Client: c, Scheme: s}
+	if _, err := r.Reconcile(context.TODO(), ctrl.Request{
+		NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"},
+	}); err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+
+	got := &gatewayv1alpha2.TLSRoute{}
+	if err := c.Get(context.TODO(), types.NamespacedName{Name: "r", Namespace: "tenant-foo"}, got); err != nil {
+		t.Fatalf("get route: %v", err)
+	}
+	accepted := acceptedCondition2(got.Status.Parents)
+	if accepted == nil {
+		t.Fatalf("no Accepted condition under %s: %+v", testControllerName, got.Status.Parents)
+	}
+	if accepted.Reason == string(gatewayv1.RouteReasonNoMatchingParent) {
+		t.Errorf("reason=%s: a section outside the tls- namespace is not this controller's to refuse: %q", accepted.Reason, accepted.Message)
+	}
+}
+
+// TestReconcile_EdgeModeIgnoresADuplicatePassthroughService pins that
+// the cross-field checks judge only what the mode renders.
+//
+// Edge terminates TLS at the class provider, so renderGateway drops
+// tlsPassthroughServices and emits no tls-<svc> listener for any entry.
+// Judging the field anyway refuses the whole spec over a listener that
+// was never going to exist, and the message says the entry "would
+// render the tls-api Gateway listener twice" when it renders none. The
+// refusal aborts runReconcileSteps, so the tenant loses its Gateway,
+// its Issuer and every certificate over a field the mode ignores.
+func TestReconcile_EdgeModeIgnoresADuplicatePassthroughService(t *testing.T) {
+	s := newScheme(t)
+	tgw := &gatewayv1alpha1.TenantGateway{
+		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
+		Spec: gatewayv1alpha1.TenantGatewaySpec{
+			Apex:                   "foo.example.com",
+			CertMode:               gatewayv1alpha1.CertModeEdge,
+			GatewayClassName:       "cloudflare-tunnel",
+			TLSPassthroughServices: []string{"api", "api"},
+		},
+	}
+	c := fake.NewClientBuilder().WithScheme(s).WithObjects(tgw).WithStatusSubresource(tgw, &gatewayv1.Gateway{}).Build()
+
+	r := &Reconciler{Client: c, Scheme: s}
+	if _, err := r.Reconcile(context.TODO(), ctrl.Request{
+		NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"},
+	}); err != nil {
+		t.Fatalf("edge mode renders no tls-<svc> listener, so a repeated entry collides with nothing: %v", err)
+	}
+
+	gw := &gatewayv1.Gateway{}
+	if err := c.Get(context.TODO(), types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"}, gw); err != nil {
+		t.Fatalf("get Gateway: %v", err)
+	}
+	for _, l := range gw.Spec.Listeners {
+		if strings.HasPrefix(string(l.Name), passthroughListenerPrefix) {
+			t.Errorf("edge mode rendered passthrough listener %q; the duplicate check was judging a real collision after all", l.Name)
+		}
+	}
+}
+
+// TestReconcile_WildcardHTTPRouteHostnameIsRefusedUnderHTTP01 pins what
+// an HTTPRoute claiming a wildcard earns under certMode http01: no
+// terminate listener, no Certificate, and Accepted=False naming the
+// wildcard. The terminate listener rendered for a claim carries a
+// certificate this controller orders through HTTP-01, and the issuers
+// the platform accepts do not issue a wildcard through that challenge
+// (Let's Encrypt, Challenge Types: "This challenge cannot be used to
+// issue wildcard certificates"), so the order could never complete and
+// the listener would hold a Secret that never arrives. Before the
+// refusal the claim reached the renderer and produced a listener name
+// the shipped CRD refuses, failing the whole Gateway write, which the
+// renderer test pins on its own; this test pins the reconcile's side.
+//
+// The second row is the overlap shape: the wildcard covers the shipped
+// api.<apex> entry and a TLSRoute claims the same wildcard, which is the
+// one arrangement that used to leave the wildcard on the HTTPRoute. The
+// third row puts a concrete name beside the wildcard on one route, so
+// the refusal is shown to be per hostname rather than per route. The
+// fourth adds a second HTTPRoute from an attached cozy-* namespace
+// claiming the same wildcard, which the race ranks ahead of the tenant
+// route: the loss must not survive on a name no route can be served
+// on, or the owner is sent to fight over it.
+func TestReconcile_WildcardHTTPRouteHostnameIsRefusedUnderHTTP01(t *testing.T) {
+	const apex = "foo.example.com"
+	nameRule, _ := gatewayListenerRules(t)
+	for _, tc := range []struct {
+		name      string
+		hostnames []string
+		services  []string
+		// tlsWildcard adds a TLSRoute claiming the wildcard, pinned to
+		// the first service entry and forwarding somewhere.
+		tlsWildcard bool
+		// rival adds an HTTPRoute in cozy-shop claiming the wildcard.
+		rival bool
+		// kept is the concrete hostname that must still earn its
+		// terminate listener and Certificate, empty when none.
+		kept string
+		// plainVia selects the port-80 listener, by parentRef port or
+		// by sectionName. That listener is rendered with no hostname,
+		// so it attaches a wildcard route and serves it in plaintext:
+		// the route earns no terminate listener and no certificate,
+		// like every row here, and is not refused either.
+		plainVia string
+	}{
+		{"wildcard under the apex, nothing overlapping", []string{"*.apps." + apex}, nil, false, false, "", ""},
+		{"wildcard over the shipped entry, TLSRoute claiming the same wildcard", []string{"*." + apex}, []string{"api"}, true, false, "", ""},
+		{"wildcard beside a concrete name on one route", []string{"*." + apex, "harbor." + apex}, nil, false, false, "harbor." + apex, ""},
+		{"wildcard lost to a route in another namespace", []string{"*." + apex}, nil, false, true, "", ""},
+		{"wildcard selecting the plain-HTTP listener by port", []string{"*.apps." + apex}, nil, false, false, "", "port"},
+		{"wildcard selecting the plain-HTTP listener by name", []string{"*.apps." + apex}, nil, false, false, "", "section"},
+	} {
+		t.Run(tc.name, func(t *testing.T) {
+			s := newScheme(t)
+			tgw := &gatewayv1alpha1.TenantGateway{
+				ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
+				Spec: gatewayv1alpha1.TenantGatewaySpec{
+					Apex:                   apex,
+					CertMode:               gatewayv1alpha1.CertModeHTTP01,
+					GatewayClassName:       "cilium",
+					TLSPassthroughServices: tc.services,
+				},
+			}
+			wildcard := tc.hostnames[0]
+			route := httpRouteAttached("wild", "tenant-foo", wildcard)
+			for _, h := range tc.hostnames[1:] {
+				route.Spec.Hostnames = append(route.Spec.Hostnames, gatewayv1.Hostname(h))
+			}
+			switch tc.plainVia {
+			case "port":
+				port := gatewayv1.PortNumber(httpListenerPort)
+				route.Spec.ParentRefs[0].Port = &port
+			case "section":
+				section := gatewayv1.SectionName(httpListenerName)
+				route.Spec.ParentRefs[0].SectionName = &section
+			}
+			objs := []client.Object{tgw, route}
+			if tc.tlsWildcard {
+				claimant := passthroughTLSRoute("wild-tls", "tenant-foo", wildcard, tc.services[0])
+				objs = append(objs, claimant)
+			}
+			if tc.rival {
+				tgw.Spec.AttachedNamespaces = []string{"cozy-shop"}
+				objs = append(objs, httpRouteAttached("rival", "cozy-shop", wildcard))
+			}
+			c := fake.NewClientBuilder().
+				WithScheme(s).
+				WithObjects(objs...).
+				WithStatusSubresource(tgw, &gatewayv1.HTTPRoute{}, &gatewayv1alpha2.TLSRoute{}).
+				Build()
+
+			r := &Reconciler{Client: c, Scheme: s}
+			key := types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"}
+			if _, err := r.Reconcile(context.TODO(), ctrl.Request{NamespacedName: key}); err != nil {
+				t.Fatalf("unexpected error: %v", err)
+			}
+
+			gw := &gatewayv1.Gateway{}
+			if err := c.Get(context.TODO(), key, gw); err != nil {
+				t.Fatalf("get Gateway: %v", err)
+			}
+			for _, l := range gw.Spec.Listeners {
+				if !nameRule.MatchString(string(l.Name)) {
+					t.Errorf("listener %q is not a name the shipped Gateway CRD admits; the apiserver refuses the whole Gateway for it", l.Name)
+				}
+			}
+			if terminate, _ := listenerNamesByProtocol(gw, wildcard); len(terminate) != 0 {
+				t.Errorf("terminate listeners %v rendered for %s, which HTTP-01 cannot issue a certificate for", terminate, wildcard)
+			}
+			certs := &cmv1.CertificateList{}
+			if err := c.List(context.TODO(), certs); err != nil {
+				t.Fatalf("list Certificates: %v", err)
+			}
+			if got := certNamesOrdering(certs, wildcard); len(got) != 0 {
+				t.Errorf("Certificates %v ordered for %s, an order HTTP-01 cannot complete", got, wildcard)
+			}
+			if tc.kept != "" {
+				if terminate, _ := listenerNamesByProtocol(gw, tc.kept); !reflect.DeepEqual(terminate, []string{perListenerName(tc.kept)}) {
+					t.Errorf("terminate listeners for %s = %v, want %v; the refusal is per hostname, not per route", tc.kept, terminate, []string{perListenerName(tc.kept)})
+				}
+				if got, want := certNamesOrdering(certs, tc.kept), []string{perListenerCertName(tgw, tc.kept)}; !reflect.DeepEqual(got, want) {
+					t.Errorf("Certificates for %s = %v, want %v", tc.kept, got, want)
+				}
+			}
+
+			cond := acceptedCondition(t, c, "wild", "tenant-foo")
+			if tc.plainVia != "" {
+				if cond.Status != metav1.ConditionTrue {
+					t.Fatalf("Accepted=%s/%s %q: the port-80 listener carries no hostname, so it attaches this route and Cilium serves it plaintext; the refusal belongs to the terminate listener, which this route did not ask for", cond.Status, cond.Reason, cond.Message)
+				}
+				return
+			}
+			if cond.Status != metav1.ConditionFalse {
+				t.Fatalf("Accepted=%s, want False: a wildcard nothing here can terminate is reported as served: %q", cond.Status, cond.Message)
+			}
+			if cond.Reason != string(gatewayv1.RouteReasonNoMatchingListenerHostname) {
+				t.Errorf("reason %s, want %s: %q", cond.Reason, gatewayv1.RouteReasonNoMatchingListenerHostname, cond.Message)
+			}
+			if !strings.Contains(cond.Message, wildcard) {
+				t.Errorf("message does not name the wildcard %s: %q", wildcard, cond.Message)
+			}
+			if !strings.Contains(cond.Message, "wildcard") {
+				t.Errorf("message does not say the hostname is refused for being a wildcard: %q", cond.Message)
+			}
+			if strings.Contains(cond.Message, "answered by") {
+				t.Errorf("message blames the passthrough overlap for a name HTTP-01 could never have terminated: %q", cond.Message)
+			}
+			if strings.Contains(cond.Message, "already claimed") {
+				t.Errorf("message carries a lost race over a name no route can be served on: %q", cond.Message)
+			}
+			if tc.kept != "" && strings.Contains(cond.Message, tc.kept) {
+				t.Errorf("message names %s, which is served: %q", tc.kept, cond.Message)
+			}
+			if tc.tlsWildcard {
+				got := &gatewayv1alpha2.TLSRoute{}
+				if err := c.Get(context.TODO(), types.NamespacedName{Name: "wild-tls", Namespace: "tenant-foo"}, got); err != nil {
+					t.Fatalf("get TLSRoute: %v", err)
+				}
+				tls := acceptedCondition2(got.Status.Parents)
+				if tls == nil || tls.Status != metav1.ConditionTrue {
+					t.Errorf("TLSRoute claiming the wildcard is served on the listener's own name and must stay Accepted=True, got %+v", tls)
+				}
+			}
+		})
+	}
+}
+
+// TestReconcile_RetryableRouteStatusWriteRequeuesWithoutFailing pins the
+// transient half of the route-status contract: a conflict on one route's
+// status write means the class controller wrote the same route between
+// this pass's read and its write, so the pass is requeued and the write
+// retried, but the reconcile itself did not fail — every desired-state
+// step already ran. Failing the tenant for that race would pin
+// Ready=False on the TenantGateway over a condition the next pass lands
+// on its own, and on a fresh install it would withhold the
+// http-to-https redirect for as long as the race runs. Every other
+// route is still written on the same pass, because one route's conflict
+// is no reason to leave the others a pass behind.
+func TestReconcile_RetryableRouteStatusWriteRequeuesWithoutFailing(t *testing.T) {
+	const apex = "foo.example.com"
+	s := newScheme(t)
+	tgw := &gatewayv1alpha1.TenantGateway{
+		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
+		Spec: gatewayv1alpha1.TenantGatewaySpec{
+			Apex:             apex,
+			CertMode:         gatewayv1alpha1.CertModeHTTP01,
+			GatewayClassName: "cilium",
+		},
+	}
+	stuck := httpRouteAttached("stuck", "tenant-foo", "stuck."+apex)
+	other := httpRouteAttached("other", "tenant-foo", "other."+apex)
+	c := fake.NewClientBuilder().
+		WithScheme(s).
+		WithObjects(tgw, stuck, other).
+		WithStatusSubresource(tgw, stuck, other).
+		WithInterceptorFuncs(interceptor.Funcs{
+			SubResourceUpdate: func(ctx context.Context, cl client.Client, subResourceName string, obj client.Object, opts ...client.SubResourceUpdateOption) error {
+				if route, isRoute := obj.(*gatewayv1.HTTPRoute); isRoute && route.Name == "stuck" {
+					return apierrors.NewConflict(gatewayv1.Resource("httproutes"), route.Name, errors.New("the object has been modified"))
+				}
+				return cl.SubResource(subResourceName).Update(ctx, obj, opts...)
+			},
+		}).
+		Build()
+
+	r := &Reconciler{Client: c, Scheme: s}
+	key := types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"}
+	result, err := r.Reconcile(context.TODO(), ctrl.Request{NamespacedName: key})
+	if err != nil {
+		t.Fatalf("a conflicted route status write must not fail the reconcile, got %v", err)
+	}
+	if result.RequeueAfter <= 0 {
+		t.Error("result.RequeueAfter = 0, want a retry: nothing else retries the condition if the route event is lost")
+	}
+
+	// The other route's status landed on the same pass.
+	cond := acceptedCondition(t, c, "other", "tenant-foo")
+	if cond.Status != metav1.ConditionTrue {
+		t.Errorf("other route Accepted=%s, want True: one route's conflict left the rest unwritten: %q", cond.Status, cond.Message)
+	}
+	// The listener the routes claim is rendered regardless: the write
+	// that failed is downstream of the Gateway.
+	gw := &gatewayv1.Gateway{}
+	if err := c.Get(context.TODO(), key, gw); err != nil {
+		t.Fatalf("get Gateway: %v", err)
+	}
+	if terminate, _ := listenerNamesByProtocol(gw, "stuck."+apex); len(terminate) != 1 {
+		t.Errorf("terminate listeners for stuck.%s = %v, want one; the Gateway render is not what failed", apex, terminate)
+	}
+	// The redirect exists: the route-status pass runs after it, so a
+	// conflict there cannot withhold it.
+	redirect := &gatewayv1.HTTPRoute{}
+	if err := c.Get(context.TODO(), types.NamespacedName{Name: "cozystack-http-redirect", Namespace: "tenant-foo"}, redirect); err != nil {
+		t.Errorf("redirect HTTPRoute missing after a retryable status failure: %v", err)
+	}
+	// The failure is not on the TenantGateway: a race between two status
+	// writers says nothing about the tenant. GatewayNotAccepted is the
+	// fake-client baseline (no class controller accepts the Gateway);
+	// what must not appear is a ReconcileError carrying this write.
+	got := &gatewayv1alpha1.TenantGateway{}
+	if err := c.Get(context.TODO(), key, got); err != nil {
+		t.Fatalf("get TenantGateway: %v", err)
+	}
+	if ready := apimeta.FindStatusCondition(got.Status.Conditions, "Ready"); ready != nil && ready.Reason == "ReconcileError" {
+		t.Errorf("TenantGateway Ready = %+v, want no ReconcileError from a retryable route status write", ready)
+	}
+}
+
+// TestReconcile_FatalRouteStatusWriteFailsTheReconcile pins the other
+// half: a route-status write the apiserver will reject on every pass —
+// an Invalid, against a conflict's one-pass race — still fails the
+// reconcile and lands on the TenantGateway, because nothing retries it
+// into success and the condition it could not write is the only object
+// saying why a hostname stopped being served.
+func TestReconcile_FatalRouteStatusWriteFailsTheReconcile(t *testing.T) {
+	const apex = "foo.example.com"
+	s := newScheme(t)
+	tgw := &gatewayv1alpha1.TenantGateway{
+		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
+		Spec: gatewayv1alpha1.TenantGatewaySpec{
+			Apex:             apex,
+			CertMode:         gatewayv1alpha1.CertModeHTTP01,
+			GatewayClassName: "cilium",
+		},
+	}
+	stuck := httpRouteAttached("stuck", "tenant-foo", "stuck."+apex)
+	c := fake.NewClientBuilder().
+		WithScheme(s).
+		WithObjects(tgw, stuck).
+		WithStatusSubresource(tgw, stuck).
+		WithInterceptorFuncs(interceptor.Funcs{
+			SubResourceUpdate: func(ctx context.Context, cl client.Client, subResourceName string, obj client.Object, opts ...client.SubResourceUpdateOption) error {
+				if route, isRoute := obj.(*gatewayv1.HTTPRoute); isRoute && route.Name == "stuck" {
+					return apierrors.NewInvalid(gatewayv1.SchemeGroupVersion.WithKind("HTTPRoute").GroupKind(), route.Name, nil)
+				}
+				return cl.SubResource(subResourceName).Update(ctx, obj, opts...)
+			},
+		}).
+		Build()
+
+	r := &Reconciler{Client: c, Scheme: s}
+	key := types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"}
+	_, err := r.Reconcile(context.TODO(), ctrl.Request{NamespacedName: key})
+	if err == nil {
+		t.Fatalf("reconcile succeeded with a route status write refused permanently; nothing retries the condition into success")
+	}
+	if !strings.Contains(err.Error(), "tenant-foo/stuck") {
+		t.Errorf("error = %v, want one naming the route whose status write failed", err)
+	}
+	// The redirect still landed, because the route-status pass runs
+	// after it: even a permanent status failure cannot withhold it.
+	redirect := &gatewayv1.HTTPRoute{}
+	if err := c.Get(context.TODO(), types.NamespacedName{Name: "cozystack-http-redirect", Namespace: "tenant-foo"}, redirect); err != nil {
+		t.Errorf("redirect HTTPRoute missing after a fatal status failure: %v", err)
+	}
+	got := &gatewayv1alpha1.TenantGateway{}
+	if err := c.Get(context.TODO(), key, got); err != nil {
+		t.Fatalf("get TenantGateway: %v", err)
+	}
+	ready := apimeta.FindStatusCondition(got.Status.Conditions, "Ready")
+	if ready == nil || ready.Status != metav1.ConditionFalse || ready.Reason != "ReconcileError" {
+		t.Errorf("TenantGateway Ready = %+v, want False/ReconcileError carrying the failed write", ready)
+	}
+}
+
+// TestReconcile_RedirectLandsBeforeAnyRouteStatus pins the step order
+// rather than its consequence. Collecting the route-status failures
+// already keeps the pass going, so today the redirect would land whether
+// it ran before the status pass or after it, and the two tests above
+// cannot tell the two mechanisms apart. The order is what survives a
+// later status step that returns on the spot instead of collecting: the
+// redirect is the object the whole-apex guard exists to provide, and on
+// a fresh install it is the only thing serving port 80.
+func TestReconcile_RedirectLandsBeforeAnyRouteStatus(t *testing.T) {
+	const apex = "foo.example.com"
+	s := newScheme(t)
+	tgw := &gatewayv1alpha1.TenantGateway{
+		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
+		Spec: gatewayv1alpha1.TenantGatewaySpec{
+			Apex:             apex,
+			CertMode:         gatewayv1alpha1.CertModeHTTP01,
+			GatewayClassName: "cilium",
+		},
+	}
+	route := httpRouteAttached("app", "tenant-foo", "app."+apex)
+	var order []string
+	c := fake.NewClientBuilder().
+		WithScheme(s).
+		WithObjects(tgw, route).
+		WithStatusSubresource(tgw, route).
+		WithInterceptorFuncs(interceptor.Funcs{
+			Create: func(ctx context.Context, cl client.WithWatch, obj client.Object, opts ...client.CreateOption) error {
+				if hr, isRoute := obj.(*gatewayv1.HTTPRoute); isRoute && hr.Name == "cozystack-http-redirect" {
+					order = append(order, "redirect")
+				}
+				return cl.Create(ctx, obj, opts...)
+			},
+			SubResourceUpdate: func(ctx context.Context, cl client.Client, subResourceName string, obj client.Object, opts ...client.SubResourceUpdateOption) error {
+				if hr, isRoute := obj.(*gatewayv1.HTTPRoute); isRoute && hr.Name == route.Name {
+					order = append(order, "route status")
+				}
+				return cl.SubResource(subResourceName).Update(ctx, obj, opts...)
+			},
+		}).
+		Build()
+
+	r := &Reconciler{Client: c, Scheme: s}
+	if _, err := r.Reconcile(context.TODO(), ctrl.Request{NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"}}); err != nil {
+		t.Fatalf("reconcile: %v", err)
+	}
+	if len(order) != 2 {
+		t.Fatalf("writes = %v, want the redirect creation and one route status write; the measurement did not happen", order)
+	}
+	if order[0] != "redirect" {
+		t.Errorf("writes = %v, want the redirect first: a route status must not be able to run ahead of it", order)
+	}
+}
+
+// TestReconcile_RetryableTLSRouteWithdrawalWriteRequeuesWithoutFailing is
+// the same retryable contract on the other status path: under a
+// whole-apex mode the TLSRoute conditions are written by
+// reconcileWholeApexRouteStatuses rather than by updateRouteStatuses,
+// and a conflict there requeues without failing the reconcile just the
+// same. The edge shape is used because it is the one that writes a
+// refusal there.
+func TestReconcile_RetryableTLSRouteWithdrawalWriteRequeuesWithoutFailing(t *testing.T) {
+	const apex = "example.org"
+	s := newScheme(t)
+	tgw := &gatewayv1alpha1.TenantGateway{
+		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-root"},
+		Spec: gatewayv1alpha1.TenantGatewaySpec{
+			Apex:                   apex,
+			CertMode:               gatewayv1alpha1.CertModeEdge,
+			GatewayClassName:       "cloudflare-tunnel",
+			TLSPassthroughServices: []string{"api"},
+		},
+	}
+	stuck := tlsRouteAttached("stuck", "tenant-root", "api."+apex, "tls-api", "tenant-root")
+	other := tlsRouteAttached("other", "tenant-root", "other."+apex, "tls-api", "tenant-root")
+	c := fake.NewClientBuilder().
+		WithScheme(s).
+		WithObjects(tgw, stuck, other).
+		WithStatusSubresource(tgw, stuck, other).
+		WithInterceptorFuncs(interceptor.Funcs{
+			SubResourceUpdate: func(ctx context.Context, cl client.Client, subResourceName string, obj client.Object, opts ...client.SubResourceUpdateOption) error {
+				if route, isRoute := obj.(*gatewayv1alpha2.TLSRoute); isRoute && route.Name == "stuck" {
+					return apierrors.NewConflict(gatewayv1alpha2.Resource("tlsroutes"), route.Name, errors.New("the object has been modified"))
+				}
+				return cl.SubResource(subResourceName).Update(ctx, obj, opts...)
+			},
+		}).
+		Build()
+
+	r := &Reconciler{Client: c, Scheme: s}
+	key := types.NamespacedName{Name: "cozystack", Namespace: "tenant-root"}
+	result, err := r.Reconcile(context.TODO(), ctrl.Request{NamespacedName: key})
+	if err != nil {
+		t.Fatalf("a conflicted TLSRoute status write must not fail the reconcile, got %v", err)
+	}
+	if result.RequeueAfter <= 0 {
+		t.Error("result.RequeueAfter = 0, want a retry: nothing else retries the refusal if the route event is lost")
+	}
+	got := &gatewayv1alpha2.TLSRoute{}
+	if err := c.Get(context.TODO(), types.NamespacedName{Name: "other", Namespace: "tenant-root"}, got); err != nil {
+		t.Fatalf("get other route: %v", err)
+	}
+	cond := acceptedCondition2(got.Status.Parents)
+	if cond == nil || cond.Status != metav1.ConditionFalse || cond.Reason != "NoMatchingParent" {
+		t.Errorf("other route condition = %+v, want Accepted=False/NoMatchingParent written on the same pass", cond)
+	}
+}
+
+// TestReconcile_HTTPRoutePinnedToAPortEarnsAListenerOnlyOn443 pins that
+// an HTTPRoute's parentRef.port is read the way a TLSRoute's is: Gateway
+// API attaches a port-pinned route to the listeners on that port alone,
+// and the terminate listener this controller renders for an HTTPRoute
+// hostname sits on 443, so a route pinning any other port attaches to
+// no listener the render would give it. Rendering one anyway ordered a
+// certificate for a route that attaches to nothing, and the route read
+// Accepted=True from a controller that had put nothing in its path.
+//
+// Port 80 is the one other port the Gateway answers HTTP on. Its
+// listener carries no hostname and admits the publishing tenant alone,
+// so a route from that namespace selecting it, by port or by name, is
+// served there as plain HTTP and gets neither a terminate listener nor
+// a refusal, while one from an attached namespace is turned away by
+// that listener and told so. A name and a port that select different
+// listeners select none, which Gateway API calls NoMatchingParent.
+func TestReconcile_HTTPRoutePinnedToAPortEarnsAListenerOnlyOn443(t *testing.T) {
+	const apex = "foo.example.com"
+	const hostname = "shop." + apex
+	for _, tc := range []struct {
+		name      string
+		namespace string
+		// port pins the parentRef port when non-zero; section pins the
+		// sectionName when set. Naming the http listener selects the
+		// same listener port 80 does, so it takes the same verdict.
+		port     int32
+		section  string
+		listener bool
+		accepted bool
+		// reason and msgHas are checked on a refused row: the reason
+		// names the shape of the refusal and the message has to carry
+		// the value its owner would act on.
+		reason string
+		msgHas string
+	}{
+		{"port 443 is the terminate listener's port", "tenant-foo", 443, "", true, true, "", ""},
+		{"a native port no listener answering the hostname is published on", "tenant-foo", 5432, "", false, false, string(gatewayv1.RouteReasonNoMatchingListenerHostname), "port 5432"},
+		{"a port nothing on the Gateway is published on", "cozy-shop", 8443, "", false, false, string(gatewayv1.RouteReasonNoMatchingListenerHostname), "port 8443"},
+		{"port 80 from the publishing tenant is served plain", "tenant-foo", 80, "", false, true, "", ""},
+		{"port 80 from an attached namespace is refused by the http listener", "cozy-shop", 80, "", false, false, string(gatewayv1.RouteReasonNotAllowedByListeners), "tenant-foo"},
+		{"sectionName http without a port from the publishing tenant is served plain", "tenant-foo", 0, httpListenerName, false, true, "", ""},
+		{"sectionName http without a port from an attached namespace is refused by the http listener", "cozy-shop", 0, httpListenerName, false, false, string(gatewayv1.RouteReasonNotAllowedByListeners), "tenant-foo"},
+		{"sectionName http with port 443 selects no listener", "tenant-foo", 443, httpListenerName, false, false, string(gatewayv1.RouteReasonNoMatchingParent), "port 443"},
+		{"port 80 with a sectionName that is not http selects no listener", "tenant-foo", 80, "https-shop-deadbeef", false, false, string(gatewayv1.RouteReasonNoMatchingParent), "port 80"},
+	} {
+		t.Run(tc.name, func(t *testing.T) {
+			s := newScheme(t)
+			tgw := &gatewayv1alpha1.TenantGateway{
+				ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
+				Spec: gatewayv1alpha1.TenantGatewaySpec{
+					Apex:               apex,
+					CertMode:           gatewayv1alpha1.CertModeHTTP01,
+					GatewayClassName:   "cilium",
+					AttachedNamespaces: []string{"cozy-shop"},
+					TLSPassthroughListeners: []gatewayv1alpha1.TLSPassthroughListener{
+						{Name: "pg", Port: 5432, Hostname: "pg." + apex},
+					},
+				},
+			}
+			route := httpRouteAttached("shop", tc.namespace, hostname)
+			if tc.port != 0 {
+				port := gatewayv1.PortNumber(tc.port)
+				route.Spec.ParentRefs[0].Port = &port
+			}
+			if tc.section != "" {
+				section := gatewayv1.SectionName(tc.section)
+				route.Spec.ParentRefs[0].SectionName = &section
+			}
+			c := fake.NewClientBuilder().
+				WithScheme(s).
+				WithObjects(tgw, route).
+				WithStatusSubresource(tgw, route).
+				Build()
+
+			r := &Reconciler{Client: c, Scheme: s}
+			key := types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"}
+			if _, err := r.Reconcile(context.TODO(), ctrl.Request{NamespacedName: key}); err != nil {
+				t.Fatalf("unexpected error: %v", err)
+			}
+
+			gw := &gatewayv1.Gateway{}
+			if err := c.Get(context.TODO(), key, gw); err != nil {
+				t.Fatalf("get Gateway: %v", err)
+			}
+			certs := &cmv1.CertificateList{}
+			if err := c.List(context.TODO(), certs); err != nil {
+				t.Fatalf("list Certificates: %v", err)
+			}
+			terminate, _ := listenerNamesByProtocol(gw, hostname)
+			ordered := certNamesOrdering(certs, hostname)
+			if tc.listener {
+				if !reflect.DeepEqual(terminate, []string{perListenerName(hostname)}) {
+					t.Errorf("terminate listeners for %s = %v, want %v", hostname, terminate, []string{perListenerName(hostname)})
+				}
+				if !reflect.DeepEqual(ordered, []string{perListenerCertName(tgw, hostname)}) {
+					t.Errorf("Certificates for %s = %v, want %v", hostname, ordered, []string{perListenerCertName(tgw, hostname)})
+				}
+			} else {
+				if len(terminate) != 0 {
+					t.Errorf("terminate listeners %v rendered for %s, which this parentRef never attaches to", terminate, hostname)
+				}
+				if len(ordered) != 0 {
+					t.Errorf("Certificates %v ordered for %s on the strength of a route that attaches to nothing on 443", ordered, hostname)
+				}
+			}
+
+			cond := acceptedCondition(t, c, "shop", tc.namespace)
+			if tc.accepted {
+				if cond.Status != metav1.ConditionTrue {
+					t.Errorf("Accepted=%s reason=%s, want True: %q", cond.Status, cond.Reason, cond.Message)
+				}
+				return
+			}
+			if cond.Status != metav1.ConditionFalse {
+				t.Fatalf("Accepted=%s, want False: a route this parentRef attaches nowhere is reported as served by a listener on 443: %q", cond.Status, cond.Message)
+			}
+			if cond.Reason != tc.reason {
+				t.Errorf("reason %s, want %s: %q", cond.Reason, tc.reason, cond.Message)
+			}
+			if !strings.Contains(cond.Message, tc.msgHas) {
+				t.Errorf("message does not carry %q, the value the route's owner would act on: %q", tc.msgHas, cond.Message)
+			}
+		})
+	}
+}
+
+// wholeApexModes are the certMode switches a TenantGateway can make away
+// from http01, each with the spec the mode needs to render. Shared by
+// the tests that pin what a switch does to the conditions http01 wrote.
+var wholeApexModes = []struct {
+	name string
+	to   func(*gatewayv1alpha1.TenantGateway)
+}{
+	{"dns01", func(g *gatewayv1alpha1.TenantGateway) {
+		g.Spec.CertMode = gatewayv1alpha1.CertModeDNS01
+		g.Spec.DNS01 = &gatewayv1alpha1.DNS01Config{
+			Provider:   "cloudflare",
+			Cloudflare: &gatewayv1alpha1.CloudflareDNS01{APITokenSecretRef: corev1.SecretKeySelector{LocalObjectReference: corev1.LocalObjectReference{Name: "cf"}, Key: "api-token"}},
+		}
+	}},
+	{"existingSecret", func(g *gatewayv1alpha1.TenantGateway) {
+		g.Spec.CertMode = gatewayv1alpha1.CertModeExistingSecret
+		g.Spec.WildcardSecretRef = &corev1.LocalObjectReference{Name: "wildcard-tls"}
+	}},
+	{"edge", func(g *gatewayv1alpha1.TenantGateway) {
+		g.Spec.CertMode = gatewayv1alpha1.CertModeEdge
+	}},
+}
+
+// TestReconcile_LeavingHTTP01ForAWholeApexModeClearsAHostnameLessTLSRouteVerdict
+// pins that the condition http01 writes on a TLSRoute declaring no
+// hostnames does not outlive the mode. Under http01 such a route claims
+// the hostname of the listener it pins and is judged on it; the
+// whole-apex modes collect no claims, so that pass falls silent, and
+// the retraction pass used to skip a hostname-less route in both
+// directions. The skip protects the write direction, where a refusal
+// written under edge would have no path back; the drop direction has no
+// such hazard, and skipping it left a served route under dns01 carrying
+// an http01 verdict, and a route edge cannot serve at all carrying
+// Accepted=True.
+func TestReconcile_LeavingHTTP01ForAWholeApexModeClearsAHostnameLessTLSRouteVerdict(t *testing.T) {
+	for _, mode := range wholeApexModes {
+		t.Run(mode.name, func(t *testing.T) {
+			s := newScheme(t)
+			tgw := &gatewayv1alpha1.TenantGateway{
+				ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
+				Spec: gatewayv1alpha1.TenantGatewaySpec{
+					Apex:                   "foo.example.com",
+					CertMode:               gatewayv1alpha1.CertModeHTTP01,
+					GatewayClassName:       "cilium",
+					TLSPassthroughServices: []string{"api"},
+				},
+			}
+			claimant := passthroughTLSRoute("api-tls", "tenant-foo", "api.foo.example.com", "api")
+			claimant.Spec.Hostnames = nil
+			c := fake.NewClientBuilder().
+				WithScheme(s).
+				WithObjects(tgw, claimant).
+				WithStatusSubresource(tgw, claimant).
+				Build()
+			r := &Reconciler{Client: c, Scheme: s}
+			req := ctrl.Request{NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"}}
+			if _, err := r.Reconcile(context.TODO(), req); err != nil {
+				t.Fatalf("http01 reconcile: %v", err)
+			}
+			if cond := ourAcceptedCondition(t, c, "api-tls", "tenant-foo"); cond == nil || cond.Status != metav1.ConditionTrue {
+				t.Fatalf("precondition: http01 must judge the hostname-less route on the listener's name, got %+v", cond)
+			}
+
+			if err := c.Get(context.TODO(), req.NamespacedName, tgw); err != nil {
+				t.Fatalf("get tgw: %v", err)
+			}
+			mode.to(tgw)
+			if err := c.Update(context.TODO(), tgw); err != nil {
+				t.Fatalf("update tgw: %v", err)
+			}
+			if _, err := r.Reconcile(context.TODO(), req); err != nil {
+				t.Fatalf("%s reconcile: %v", mode.name, err)
+			}
+			if cond := ourAcceptedCondition(t, c, "api-tls", "tenant-foo"); cond != nil {
+				t.Errorf("the http01 verdict must not survive the switch to %s, got %+v", mode.name, cond)
+			}
+		})
+	}
+}
+
+// TestReconcile_LeavingHTTP01ForAWholeApexModeClearsHTTPRouteConditions
+// is the same contract for HTTPRoutes. Every condition this controller
+// writes on an HTTPRoute is written under http01, where the claims pass
+// runs; the whole-apex modes serve those routes from the apex-wide
+// listener and collect no claims, so nothing rewrote the entry and a
+// wildcard refused under http01 kept reading that http01 cannot
+// terminate it while dns01 was serving it.
+func TestReconcile_LeavingHTTP01ForAWholeApexModeClearsHTTPRouteConditions(t *testing.T) {
+	const apex = "foo.example.com"
+	for _, mode := range wholeApexModes {
+		t.Run(mode.name, func(t *testing.T) {
+			s := newScheme(t)
+			tgw := &gatewayv1alpha1.TenantGateway{
+				ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
+				Spec: gatewayv1alpha1.TenantGatewaySpec{
+					Apex:             apex,
+					CertMode:         gatewayv1alpha1.CertModeHTTP01,
+					GatewayClassName: "cilium",
+				},
+			}
+			refused := httpRouteAttached("wild", "tenant-foo", "*."+apex)
+			served := httpRouteAttached("harbor", "tenant-foo", "harbor."+apex)
+			c := fake.NewClientBuilder().
+				WithScheme(s).
+				WithObjects(tgw, refused, served).
+				WithStatusSubresource(tgw, refused, served).
+				Build()
+			r := &Reconciler{Client: c, Scheme: s}
+			req := ctrl.Request{NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"}}
+			if _, err := r.Reconcile(context.TODO(), req); err != nil {
+				t.Fatalf("http01 reconcile: %v", err)
+			}
+			if cond := acceptedCondition(t, c, "wild", "tenant-foo"); cond.Status != metav1.ConditionFalse {
+				t.Fatalf("precondition: http01 must refuse the wildcard, got %+v", cond)
+			}
+			if cond := acceptedCondition(t, c, "harbor", "tenant-foo"); cond.Status != metav1.ConditionTrue {
+				t.Fatalf("precondition: http01 must accept the concrete name, got %+v", cond)
+			}
+
+			if err := c.Get(context.TODO(), req.NamespacedName, tgw); err != nil {
+				t.Fatalf("get tgw: %v", err)
+			}
+			mode.to(tgw)
+			if err := c.Update(context.TODO(), tgw); err != nil {
+				t.Fatalf("update tgw: %v", err)
+			}
+			if _, err := r.Reconcile(context.TODO(), req); err != nil {
+				t.Fatalf("%s reconcile: %v", mode.name, err)
+			}
+			for _, name := range []string{"wild", "harbor"} {
+				got := &gatewayv1.HTTPRoute{}
+				if err := c.Get(context.TODO(), types.NamespacedName{Name: name, Namespace: "tenant-foo"}, got); err != nil {
+					t.Fatalf("get route %s: %v", name, err)
+				}
+				if cond := acceptedCondition2(got.Status.Parents); cond != nil {
+					t.Errorf("%s: the http01 condition must not survive the switch to %s, got %+v", name, mode.name, cond)
+				}
+			}
+		})
+	}
+}
+
+// TestReconcile_PlainServedRouteHoldsTheNameInEveryRecount pins that a
+// route served on the port-80 listener is in the hostname race on the
+// same footing as one served by a terminate listener, in the recounts
+// as well as in the first count. Ownership is decided once over every
+// claimant, and recounted wherever the field shrinks: a refused
+// claimant, or the TLSRoutes a passthrough entry turned away. A route
+// left out of the recount while still in the race lets the recount
+// crown the wrong namespace and drop a loss the first count recorded,
+// so a third route arriving in a third namespace flipped the loser to
+// Accepted=True.
+// Every row here must read the same as the control row.
+func TestReconcile_PlainServedRouteHoldsTheNameInEveryRecount(t *testing.T) {
+	const apex = "foo.example.com"
+	const hostname = "app." + apex
+	for _, tc := range []struct {
+		name string
+		// refusedThird adds a route in tenant-foo-baz pinned to a
+		// passthrough section this Gateway does not render, which is
+		// refused before the race and keeps its loss.
+		refusedThird bool
+	}{
+		{"control", false},
+		{"a refused route in a third namespace", true},
+	} {
+		t.Run(tc.name, func(t *testing.T) {
+			s := newScheme(t)
+			tgw := &gatewayv1alpha1.TenantGateway{
+				ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
+				Spec: gatewayv1alpha1.TenantGatewaySpec{
+					Apex:               apex,
+					CertMode:           gatewayv1alpha1.CertModeHTTP01,
+					GatewayClassName:   "cilium",
+					AttachedNamespaces: []string{"tenant-foo-bar", "tenant-foo-baz"},
+				},
+			}
+			// tenant-foo sorts ahead of tenant-foo-bar, so the plain
+			// route wins the first count and the app route records the
+			// loss the rows below must not lose.
+			plain := httpRouteAttached("plain", "tenant-foo", hostname)
+			port := gatewayv1.PortNumber(80)
+			plain.Spec.ParentRefs[0].Port = &port
+			app := httpRouteAttached("app", "tenant-foo-bar", hostname)
+			objs := []client.Object{tgw, plain, app}
+			if tc.refusedThird {
+				third := httpRouteAttached("third", "tenant-foo-baz", hostname)
+				section := gatewayv1.SectionName(passthroughListenerPrefix + "nope")
+				third.Spec.ParentRefs[0].SectionName = &section
+				objs = append(objs, third)
+			}
+			c := fake.NewClientBuilder().
+				WithScheme(s).
+				WithObjects(objs...).
+				WithStatusSubresource(tgw, &gatewayv1.HTTPRoute{}).
+				Build()
+			r := &Reconciler{Client: c, Scheme: s}
+			if _, err := r.Reconcile(context.TODO(), ctrl.Request{
+				NamespacedName: types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"},
+			}); err != nil {
+				t.Fatalf("unexpected error: %v", err)
+			}
+			if cond := acceptedCondition(t, c, "plain", "tenant-foo"); cond.Status != metav1.ConditionTrue {
+				t.Errorf("plain: Accepted=%s reason=%s, want True; it won the name: %q", cond.Status, cond.Reason, cond.Message)
+			}
+			cond := acceptedCondition(t, c, "app", "tenant-foo-bar")
+			if cond.Status != metav1.ConditionFalse || cond.Reason != "HostnameConflict" {
+				t.Errorf("app: Accepted=%s reason=%s, want False/HostnameConflict; the plain route in tenant-foo holds the name: %q", cond.Status, cond.Reason, cond.Message)
+			}
+		})
+	}
+}
+
+// programGateway writes the status a Gateway controller writes once it
+// has accepted and programmed the Gateway and every listener.
+func programGateway(t *testing.T, c client.Client, key types.NamespacedName) {
+	t.Helper()
+	gw := &gatewayv1.Gateway{}
+	if err := c.Get(context.TODO(), key, gw); err != nil {
+		t.Fatalf("get Gateway %s: %v", key, err)
+	}
+	ok := func(typ string) metav1.Condition {
+		return metav1.Condition{Type: typ, Status: metav1.ConditionTrue, Reason: typ, LastTransitionTime: metav1.Now()}
+	}
+	gw.Status.Conditions = []metav1.Condition{ok("Accepted"), ok("Programmed")}
+	gw.Status.Listeners = nil
+	for _, l := range gw.Spec.Listeners {
+		gw.Status.Listeners = append(gw.Status.Listeners, gatewayv1.ListenerStatus{
+			Name:           l.Name,
+			Conditions:     []metav1.Condition{ok("Accepted"), ok("Programmed")},
+			SupportedKinds: []gatewayv1.RouteGroupKind{},
+		})
+	}
+	if err := c.Status().Update(context.TODO(), gw); err != nil {
+		t.Fatalf("program Gateway %s: %v", key, err)
+	}
+}
+
+func readyCondition(t *testing.T, c client.Client, key types.NamespacedName) *metav1.Condition {
+	t.Helper()
+	got := &gatewayv1alpha1.TenantGateway{}
+	if err := c.Get(context.TODO(), key, got); err != nil {
+		t.Fatalf("get TenantGateway: %v", err)
+	}
+	for i := range got.Status.Conditions {
+		if got.Status.Conditions[i].Type == "Ready" {
+			return &got.Status.Conditions[i]
+		}
+	}
+	t.Fatalf("no Ready condition on %+v", got.Status)
+	return nil
+}
+
+// TestReconcile_ReadyNamesAClassThatCannotServePassthrough pins the
+// portability contract: a GatewayClass declares what it supports in
+// status.supportedFeatures, and a TenantGateway rendering passthrough
+// listeners on one that lacks TLSRoute reports it rather than reading
+// Ready on listeners nothing will serve. A class that declares nothing
+// is not judged, since older implementations do not fill the field in.
+func TestReconcile_ReadyNamesAClassThatCannotServePassthrough(t *testing.T) {
+	apiListener := []gatewayv1alpha1.TLSPassthroughListener{{Name: "api", Port: 6443, Hostname: "api.foo.example.com"}}
+	noTLSRoute := []gatewayv1.FeatureName{"Gateway", "HTTPRoute"}
+	for _, tc := range []struct {
+		name      string
+		features  []gatewayv1.FeatureName
+		mode      gatewayv1alpha1.CertMode
+		services  []string
+		listeners []gatewayv1alpha1.TLSPassthroughListener
+		noClass   bool
+		wantClass bool
+	}{
+		{"class without TLSRoute, passthrough listener", noTLSRoute, gatewayv1alpha1.CertModeHTTP01, nil, apiListener, false, true},
+		{"class without TLSRoute, passthrough services", noTLSRoute, gatewayv1alpha1.CertModeHTTP01, []string{"api"}, nil, false, true},
+		{"class with TLSRoute", []gatewayv1.FeatureName{"Gateway", "HTTPRoute", "TLSRoute"}, gatewayv1alpha1.CertModeHTTP01, []string{"vm-exportproxy"}, apiListener, false, false},
+		{"class declaring nothing", nil, gatewayv1alpha1.CertModeHTTP01, []string{"vm-exportproxy"}, apiListener, false, false},
+		{"class without TLSRoute, no passthrough", noTLSRoute, gatewayv1alpha1.CertModeHTTP01, nil, nil, false, false},
+		// edge renders no passthrough listener, so the class has nothing
+		// it could fail to serve.
+		{"class without TLSRoute, edge", noTLSRoute, gatewayv1alpha1.CertModeEdge, []string{"api"}, nil, false, false},
+		// A class that does not exist is a misspelled name, which shows
+		// as GatewayNotAccepted rather than as a missing feature.
+		{"no such class", nil, gatewayv1alpha1.CertModeHTTP01, nil, apiListener, true, false},
+	} {
+		t.Run(tc.name, func(t *testing.T) {
+			s := newScheme(t)
+			tgw := &gatewayv1alpha1.TenantGateway{
+				ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
+				Spec: gatewayv1alpha1.TenantGatewaySpec{
+					Apex:                    "foo.example.com",
+					CertMode:                tc.mode,
+					GatewayClassName:        "other",
+					TLSPassthroughServices:  tc.services,
+					TLSPassthroughListeners: tc.listeners,
+				},
+			}
+			class := &gatewayv1.GatewayClass{
+				ObjectMeta: metav1.ObjectMeta{Name: "other"},
+				Spec:       gatewayv1.GatewayClassSpec{ControllerName: "example.com/other"},
+			}
+			for _, f := range tc.features {
+				class.Status.SupportedFeatures = append(class.Status.SupportedFeatures, gatewayv1.SupportedFeature{Name: f})
+			}
+			objs := []client.Object{tgw}
+			if !tc.noClass {
+				objs = append(objs, class)
+			}
+			c := fake.NewClientBuilder().WithScheme(s).WithObjects(objs...).WithStatusSubresource(tgw, &gatewayv1.Gateway{}).Build()
+			r := &Reconciler{Client: c, Scheme: s}
+			key := types.NamespacedName{Name: "cozystack", Namespace: "tenant-foo"}
+			if _, err := r.Reconcile(context.TODO(), ctrl.Request{NamespacedName: key}); err != nil {
+				t.Fatalf("first reconcile: %v", err)
+			}
+			programGateway(t, c, key)
+			if _, err := r.Reconcile(context.TODO(), ctrl.Request{NamespacedName: key}); err != nil {
+				t.Fatalf("second reconcile: %v", err)
+			}
+			ready := readyCondition(t, c, key)
+			if got := ready.Reason == "GatewayClassUnsupported"; got != tc.wantClass {
+				t.Errorf("Ready=%s reason=%s (%s), want the class refusal: %v", ready.Status, ready.Reason, ready.Message, tc.wantClass)
+			}
+			if tc.wantClass && (ready.Status != metav1.ConditionFalse || !strings.Contains(ready.Message, "TLSRoute") || !strings.Contains(ready.Message, "other")) {
+				t.Errorf("refusal must be Ready=False naming the class and the feature: %+v", ready)
+			}
+		})
+	}
+}
+
+// TestClassLacksTLSRoute_GetErrorFailsTheReconcile pins that a failed
+// GatewayClass read is returned rather than read as "not judged": a
+// transient API error must not turn into a Ready verdict.
+func TestClassLacksTLSRoute_GetErrorFailsTheReconcile(t *testing.T) {
+	s := newScheme(t)
+	tgw := &gatewayv1alpha1.TenantGateway{
+		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
+		Spec: gatewayv1alpha1.TenantGatewaySpec{
+			Apex:                   "foo.example.com",
+			CertMode:               gatewayv1alpha1.CertModeHTTP01,
+			TLSPassthroughServices: []string{"api"},
+		},
+	}
+	c := fake.NewClientBuilder().WithScheme(s).
+		WithInterceptorFuncs(interceptor.Funcs{
+			Get: func(ctx context.Context, cl client.WithWatch, key client.ObjectKey, obj client.Object, opts ...client.GetOption) error {
+				if _, isClass := obj.(*gatewayv1.GatewayClass); isClass {
+					return errors.New("apiserver unavailable")
+				}
+				return cl.Get(ctx, key, obj, opts...)
+			},
+		}).
+		Build()
+	r := &Reconciler{Client: c, Scheme: s}
+	if _, err := r.classLacksTLSRoute(context.TODO(), tgw); err == nil {
+		t.Fatal("classLacksTLSRoute swallowed a failed GatewayClass read")
 	}
 }
diff --git a/internal/controller/tenantgateway/renderers.go b/internal/controller/tenantgateway/renderers.go
index 9d6de727d1..fbcb910c27 100644
--- a/internal/controller/tenantgateway/renderers.go
+++ b/internal/controller/tenantgateway/renderers.go
@@ -26,6 +26,7 @@ import (
 	cmv1 "github.com/cert-manager/cert-manager/pkg/apis/certmanager/v1"
 	cmmetav1 "github.com/cert-manager/cert-manager/pkg/apis/meta/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/util/validation"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 	gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
 
@@ -76,14 +77,30 @@ func acmeServerForIssuer(name gatewayv1alpha1.IssuerName) (string, error) {
 	}
 }
 
-// acmeChallengeNamespace is the namespace cert-manager publishes
-// HTTP-01 challenge HTTPRoutes from. Hardcoded to the cozystack
-// platform default; if you ever move cert-manager out of cozy-cert-
-// manager, add a TenantGateway spec field to override this.
+// httpRedirectRouteName returns the name of the controller-owned
+// http→https redirect HTTPRoute for this TenantGateway. Shared by the
+// renderer and by collectHostnameClaims, which excludes exactly this
+// route from the hostname-claim set, so the two must agree on the name.
+func httpRedirectRouteName(tgw *gatewayv1alpha1.TenantGateway) string {
+	return tgw.Name + "-http-redirect"
+}
+
+// acmeChallengeNamespace is where cert-manager itself runs. Hardcoded to
+// the cozystack platform default; if you ever move cert-manager out of
+// cozy-cert-manager, add a TenantGateway spec field to override this.
+//
+// It is not where the HTTP-01 solver HTTPRoute appears: cert-manager
+// creates the Challenge, and with it the solver route, in the
+// Certificate's own namespace, which for these per-listener certs is the
+// tenant namespace. That namespace is already on the port-80 allow list
+// on its own account, so this entry is belt and braces.
 const acmeChallengeNamespace = "cozy-cert-manager"
 
-// buildAllowedRoutes computes the AllowedRoutes block applied to
-// HTTPS / TLS-passthrough listeners: a label selector matching
+// buildAllowedRoutes computes the AllowedRoutes block the
+// HTTPS-terminate and port-443 passthrough listeners carry. The
+// native-port listeners from tlsPassthroughListeners do not: they take
+// a narrower one from allowedRoutesFromValues, naming the publishing
+// tenant's namespace alone. It is a label selector matching
 // namespace.cozystack.io/gateway = <tgw.Namespace>. Every namespace
 // carrying that label attaches to this Gateway. The label has two
 // writers:
@@ -118,28 +135,55 @@ func buildAllowedRoutes(tgw *gatewayv1alpha1.TenantGateway) *gatewayv1.AllowedRo
 }
 
 // buildHTTPListenerAllowedRoutes returns a strictly narrower
-// allowedRoutes for the port-80 listener: only the tenant namespace
-// (the controller-owned http→https redirect HTTPRoute lives there)
-// and the cert-manager challenge namespace (HTTP-01 ACME challenges
-// publish a transient HTTPRoute under /.well-known/acme-challenge/).
+// allowedRoutes for the port-80 listener: only the tenant namespace,
+// where both the controller-owned http→https redirect HTTPRoute and
+// cert-manager's transient HTTP-01 solver route under
+// /.well-known/acme-challenge/ live, plus the namespace cert-manager
+// itself runs in (see acmeChallengeNamespace).
 //
 // Why: app HTTPRoutes (harbor, keycloak, dashboard, bucket) attach
-// by hostname with no sectionName, so without this narrower filter
-// they would also bind to the HTTP listener — Gateway API
-// tie-breaks merged routes by creationTimestamp, so an app route
-// created before the controller's redirect would silently serve
-// plaintext on port 80 and leak credentials. Restricting the HTTP
-// listener's allowedRoutes namespaces excludes the cozy-* / tenant-*
-// namespaces apps live in, while keeping cert-manager's challenge
-// namespace open so ACME still completes.
+// by hostname with no sectionName, so any of them the filter admits
+// reaches the HTTP listener and can serve plaintext there. The filter
+// keeps out the ones published from elsewhere; an app in the Gateway's
+// own namespace is admitted and is not covered by this. Restricting the HTTP
+// listener's allowedRoutes namespaces keeps out routes from the other
+// cozy-* namespaces and from inheriting child tenants. The Gateway's
+// own namespace stays open, because the redirect and the ACME solver
+// route both live there, and so does acmeChallengeNamespace.
 func buildHTTPListenerAllowedRoutes(tgw *gatewayv1alpha1.TenantGateway) *gatewayv1.AllowedRoutes {
+	return allowedRoutesFromValues(httpListenerNamespaces(tgw))
+}
+
+// httpListenerNamespaces is the attach set of the port-80 listener. The
+// claims pass reads it to tell a route that selects that listener and
+// is admitted by it from one that selects it and is not, and the render
+// reads it to write the selector, so the two cannot disagree.
+func httpListenerNamespaces(tgw *gatewayv1alpha1.TenantGateway) []string {
 	values := []string{tgw.Namespace}
 	if acmeChallengeNamespace != tgw.Namespace {
 		values = append(values, acmeChallengeNamespace)
 	}
-	return allowedRoutesFromValues(values)
+	return values
 }
 
+// The ports the Gateway's own HTTP listeners are published on. The
+// port-80 listener carries the ACME challenge route and the redirect,
+// and the HTTP-01 terminate listener rendered for each claimed hostname
+// sits on 443. A route that pins a parentRef port is attached to the
+// listeners on that port alone, so these are what such a pin is judged
+// against.
+const (
+	httpListenerName  = "http"
+	httpListenerPort  = 80
+	httpsListenerPort = 443
+)
+
+// wildcardLabel stands in for a leading "*" in the names derived from a
+// hostname. Gateway API admits "*." as the first label of a listener or
+// route hostname and refuses "*" in a listener name, and a Certificate
+// object name is a DNS-1123 subdomain that refuses it too.
+const wildcardLabel = "wildcard"
+
 func allowedRoutesFromValues(values []string) *gatewayv1.AllowedRoutes {
 	from := gatewayv1.NamespacesFromSelector
 	return &gatewayv1.AllowedRoutes{
@@ -159,7 +203,8 @@ func allowedRoutesFromValues(values []string) *gatewayv1.AllowedRoutes {
 }
 
 // hostnameFirstLabel returns the first DNS label of a hostname (the
-// part before the first '.'), normalised to lowercase. The lowercase
+// part before the first '.'), normalised to lowercase, with a wildcard
+// label rewritten to wildcardLabel. The lowercase
 // pass is defensive: Gateway listener names and Certificate object
 // names both must satisfy RFC 1123 (lowercase), so an upper-case
 // input hostname like `HARBOR.foo.example.com` would otherwise
@@ -167,12 +212,22 @@ func allowedRoutesFromValues(values []string) *gatewayv1.AllowedRoutes {
 // Gateway API admission webhook normalises hostnames already, but
 // running ToLower here matches what hostnameSuffix does and keeps
 // the contract local.
+//
+// The wildcard rewrite is the same contract on the other character the
+// hostname rule admits and the name rules do not. A name built from
+// "*" is refused by the apiserver, and refused for the whole Gateway
+// rather than for the one listener, so every other listener on it
+// stops converging. The rewrite reaches no name that was admissible
+// before it: "*" is the one label it touches, and the suffix hashes
+// the whole hostname, asterisk included, so a hostname whose first
+// label is the word itself still gets a name of its own.
 func hostnameFirstLabel(hostname string) string {
 	hostname = strings.ToLower(hostname)
-	if i := strings.Index(hostname, "."); i >= 0 {
-		return hostname[:i]
+	label, _, _ := strings.Cut(hostname, ".")
+	if label == "*" {
+		return wildcardLabel
 	}
-	return hostname
+	return label
 }
 
 // hostnameSuffix returns a short stable suffix derived from the full
@@ -186,12 +241,444 @@ func hostnameSuffix(hostname string) string {
 	return hex.EncodeToString(sum[:4])
 }
 
+// passthroughListenerPrefix is the "tls-" prefix both passthrough
+// render loops (TLSPassthroughServices and TLSPassthroughListeners) put
+// in front of their identifier to form the Gateway listener name.
+// Hoisted to a const so the collision check below and the two render
+// sites can never drift apart.
+const passthroughListenerPrefix = "tls-"
+
+// isReservedGatewayPort reports whether port is one renderGateway always
+// occupies with its own listeners: 80 (the http listener carrying the
+// ACME challenge and the http->https redirect) and 443 (the
+// HTTPS-terminate listeners and the port-443 TLSPassthroughServices
+// listeners). A native-port passthrough listener must avoid both: a TLS
+// listener on port 80 alongside the HTTP listener, or on 443 alongside a
+// terminate listener for the same hostname, is a protocol conflict.
+// Gateway API admits either — its listener uniqueness rule keys on
+// (port, protocol, hostname), so differing protocols are distinct — and
+// calls for the conflict to surface as Conflicted on both listeners,
+// which then serve nothing. Cilium marks such a pair Conflicted from the
+// listener specs alone (listenerPairConflict in
+// operator/pkg/gateway-api/status_listener.go, v1.20.2). Rejecting the
+// entry up front turns either into a per-field error on TenantGateway
+// status instead.
+//
+// A function rather than a package-level set: the ports are a property
+// of what renderGateway emits, so nothing should be able to write to
+// them from another file.
+func isReservedGatewayPort(port int32) bool {
+	return port == httpListenerPort || port == httpsListenerPort
+}
+
+// maxGatewayListeners mirrors the MaxItems Gateway API declares on
+// Gateway.spec.listeners. Exceeding it fails admission on the whole
+// Gateway, so renderGateway checks the assembled total against it.
+const maxGatewayListeners = 64
+
+// maxGatewayNameLength is the bound Gateway API puts on both a listener
+// name (SectionName) and a listener hostname. Named once because the
+// rendered values this package builds have to fit it, and the fields
+// they are built from are bounded separately from their sum.
+const maxGatewayNameLength = 253
+
+// validatePassthroughListenerCertMode refuses passthrough listeners
+// under edge, which ends TLS at the class provider and renders no TLS
+// listener for an entry to bind to.
+//
+// It judges the field against a sibling field rather than against
+// itself, which is why it is separate from
+// validateTLSPassthroughListeners. The wildcard "*.<apex>" terminate
+// listener of dns01 and existingSecret SNI-overlaps every entry, but on
+// another port: Gateway API treats listeners on different ports as
+// compatible, and the shipped Cilium (v1.20.2) gives each port its own
+// Envoy listener when their SNI overlaps (NeedsCrossProtocolSplit in
+// operator/pkg/model/model.go), so neither reaches the other's backend.
+//
+// Relaxing or tightening this means editing two copies, this one and
+// the matching CEL rule on TenantGatewaySpec.
+func validatePassthroughListenerCertMode(listeners []gatewayv1alpha1.TLSPassthroughListener, mode gatewayv1alpha1.CertMode) error {
+	if len(listeners) == 0 {
+		return nil
+	}
+	if rendersPassthroughListeners(mode) {
+		return nil
+	}
+	return fmt.Errorf("tlsPassthroughListeners: unsupported with certMode %q; edge terminates TLS at the class provider and renders no TLS listener at all", mode)
+}
+
+// rendersPassthroughListeners reports whether a certificate mode renders
+// the listeners a tlsPassthroughListeners entry can sit beside.
+//
+// Stated as the set that can rather than the set that cannot, so a mode
+// added to the CertMode enum is refused until someone rules on it. The
+// empty value is http01: the field is optional and an object written
+// before certMode existed carries none, and the render path reads that
+// same absence as http01.
+func rendersPassthroughListeners(mode gatewayv1alpha1.CertMode) bool {
+	switch mode {
+	case gatewayv1alpha1.CertModeHTTP01, gatewayv1alpha1.CertModeDNS01, gatewayv1alpha1.CertModeExistingSecret, "":
+		return true
+	}
+	return false
+}
+
+// passthroughListener is one listener the spec renders on its own,
+// before a single route is collected: "<svc>.<apex>" for each
+// TLSPassthroughServices entry and the declared Hostname of each
+// TLSPassthroughListeners entry. Both come from the spec with no route
+// involved, so the set is known before any claim is collected.
+//
+// A hostname one of these answers is reserved: none of them may also
+// get an HTTPS-terminate listener, and the reason differs by field
+// only in which layer refuses.
+//
+// A TLSPassthroughServices entry shares port 443 with the terminate
+// listeners. A wildcard terminate listener beside it is served: the
+// operator image this repo ships accepts an HTTPS and a TLS-passthrough
+// listener on one port when the passthrough hostname is strictly
+// narrower (packages/system/cilium/images/cilium-operator/patches), and
+// Envoy selects the exact server name before the wildcard. A terminate
+// listener for the entry's own hostname is not narrower but identical.
+// Envoy cannot hold two filter chains with one match, so Cilium marks
+// both Conflicted and neither serves.
+//
+// A TLSPassthroughListeners entry sits on its own port, where Gateway
+// API would serve it beside a terminate listener for the same name on
+// 443. The reservation holds there as a policy: a name a passthrough
+// listener serves stays with it, so an app cannot take a platform name
+// on 443. It is read off the spec alone, not off the routes on
+// the entry, so a route's status does not follow how one
+// implementation builds its filter chains.
+//
+// The cost is that an HTTPRoute claiming a hostname declared here gets
+// no listener. Nothing hostile is needed to reach that:
+// tlsPassthroughServices is a chart value shipped defaulted to api,
+// vm-exportproxy and cdi-uploadproxy, so a tenant app named after one of
+// them collides with a platform default.
+// updateRouteStatuses reports it on the route as Accepted=False with
+// NoMatchingListenerHostname naming the passthrough hostname that
+// answers the claim, unless the route also claims a name outside the
+// reservation, which is served.
+//
+// The caller matches a claimed hostname against these by overlap
+// rather than by equality, because a "*.db.<apex>" entry answers
+// "pg.db.<apex>" exactly as an explicit entry would.
+type passthroughListener struct {
+	// section is the rendered Gateway listener name, which is also the
+	// sectionName a route pins itself to.
+	section string
+	// hostname is the SNI the listener answers.
+	hostname string
+	// port is the Gateway port the listener is published on: 443 for a
+	// TLSPassthroughServices entry, the declared native port otherwise.
+	// A route may pin itself to a listener by port as well as by name,
+	// so the eligibility check needs it.
+	port int32
+	// tenantOnly reports whether the listener admits the publishing
+	// tenant's namespace alone. The native-port listeners do; the
+	// port-443 ones select on the gateway label, which every attached
+	// namespace carries.
+	tenantOnly bool
+}
+
+// passthroughListeners enumerates them: one per rendered
+// TLSPassthroughServices entry on port 443, then one per
+// TLSPassthroughListeners entry on its native port, in the order
+// renderGateway emits them.
+//
+// Rendered, not declared: the port-443 entries are the ones the mode
+// actually turns into listeners, which is none under edge. Reading the
+// spec field instead would name a tls-<svc> hostname on a Gateway that
+// carries no listener answering it, withdrawing the hostname from the
+// terminate listener that would have.
+//
+// One walk of the two spec fields rather than one per question. The
+// reconciler needs the reserved hostnames, the section a route attaches
+// by, and the attach set, and deriving each by its own walk is how a
+// third passthrough source gets added to one and missed by the others,
+// with nothing to catch the divergence.
+func passthroughListeners(tgw *gatewayv1alpha1.TenantGateway) []passthroughListener {
+	services := renderedPassthroughServices(tgw)
+	out := make([]passthroughListener, 0, len(services)+len(tgw.Spec.TLSPassthroughListeners))
+	for _, svc := range services {
+		out = append(out, passthroughListener{
+			section:  passthroughListenerPrefix + svc,
+			hostname: svc + "." + tgw.Spec.Apex,
+			port:     443,
+		})
+	}
+	for _, pl := range tgw.Spec.TLSPassthroughListeners {
+		out = append(out, passthroughListener{
+			section:    passthroughListenerPrefix + pl.Name,
+			hostname:   pl.Hostname,
+			port:       pl.Port,
+			tenantOnly: true,
+		})
+	}
+	return out
+}
+
+// validateTLSPassthroughListeners enforces the cross-field invariants on
+// spec.tlsPassthroughListeners that the CRD schema cannot express on its
+// own: DNS-1123 label names unique across the list AND not colliding
+// with a name that spec.tlsPassthroughServices already renders as a
+// tls-<svc> listener; ports in 1..65535, unique across the list, and
+// never one of the reserved Gateway ports (80/443); and hostnames that
+// are a syntactically valid exact RFC 1123 domain or left-most-label
+// wildcard AND fall within the tenant apex. It returns a descriptive
+// error on the first violation so the reconcile fails loudly — markFailed
+// surfaces it on the TenantGateway status — rather than emitting a
+// Gateway with a duplicate, clashing, or out-of-apex listener that the
+// Gateway API (or the cozystack-gateway-hostname-policy VAP) would then
+// reject wholesale, taking every other listener (including every app's
+// HTTP/HTTPS listener) down with it.
+//
+// passthroughServices is tgw.Spec.TLSPassthroughServices: the port-443
+// passthrough list whose rendered tls-<svc> names share the listener
+// namespace with this list. Both loops use passthroughListenerPrefix, so
+// a raw name == svc comparison is exactly a rendered-name collision.
+// apex is tgw.Spec.Apex, the hostname suffix every listener on the tenant
+// Gateway must fall under.
+func validateTLSPassthroughListeners(listeners []gatewayv1alpha1.TLSPassthroughListener, passthroughServices []string, apex string) error {
+	serviceNames := make(map[string]struct{}, len(passthroughServices))
+	for _, svc := range passthroughServices {
+		// A repeated entry renders the same tls-<svc> listener name
+		// twice, and Gateway API rejects the object for duplicate
+		// listener names — the same wholesale failure this function
+		// exists to convert into a status error. The schema does not
+		// catch it: the field is a plain array, not a set.
+		if _, dup := serviceNames[svc]; dup {
+			return fmt.Errorf("tlsPassthroughServices: duplicate entry %q; it would render the %s%s Gateway listener twice", svc, passthroughListenerPrefix, svc)
+		}
+		serviceNames[svc] = struct{}{}
+	}
+	// Judged only once an entry exists to be judged by it, and named
+	// for the value that is wrong. A hostname has to be a lowercase DNS
+	// name and has to fall within the apex, so an apex that is not
+	// itself one leaves every entry unsatisfiable, and the containment
+	// error names the hostname, which is not the value the tenant can
+	// change: the apex reaches this CR verbatim from a namespace label
+	// that may carry upper case. On a cluster whose CRD carries the
+	// containment CEL rule that error is admission's, since the rule
+	// compares bytes as well and refuses the write, failing the gateway
+	// HelmRelease. This check is reached where the CRD lags the
+	// controller, and there it costs the one Gateway and names the
+	// apex. Guarded on the count so a tenant that never declares a
+	// listener is unaffected: the entries above are validated in this
+	// same function.
+	if len(listeners) > 0 {
+		if errs := validation.IsDNS1123Subdomain(apex); len(errs) > 0 {
+			return fmt.Errorf("tlsPassthroughListeners: tenant apex %q is not a lowercase DNS name (%s), so no listener hostname can sit within it", apex, strings.Join(errs, "; "))
+		}
+	}
+
+	seenNames := make(map[string]struct{}, len(listeners))
+	seenPorts := make(map[int32]struct{}, len(listeners))
+	// Seeded with the hostnames the port-443 service listeners already
+	// occupy (<svc>.<apex>, matching renderGateway) so the check below
+	// spans both lists: a listener entry can collide with a service
+	// hostname while their names differ, which the name checks miss.
+	// source names the claimant the way the user wrote it, not the way
+	// it renders: an error that says tls-api sends the reader looking
+	// through the Gateway for a name they never typed, while the entry
+	// they have to edit sits in the TenantGateway spec.
+	type claimedHostname struct{ hostname, source string }
+	seenHostnames := make([]claimedHostname, 0, len(listeners)+len(passthroughServices))
+	for _, svc := range passthroughServices {
+		// Checked here as well as by the field's pattern, and by the
+		// same rule: an entry becomes a sectionName, so the bound is
+		// Gateway API's SectionName rather than a single DNS label.
+		// Without this the two layers disagree about this field and the
+		// parity test cannot see it, since a malformed entry reaching
+		// the renderer produces a listener name the apiserver refuses
+		// and takes the whole Gateway with it.
+		if errs := validation.IsDNS1123Subdomain(svc); len(errs) > 0 {
+			return fmt.Errorf("tlsPassthroughServices: invalid entry %q: %s", svc, strings.Join(errs, "; "))
+		}
+		// Checked on the composed values rather than on the entry,
+		// because neither component's own bound constrains the sum: an
+		// entry inside SectionName's 253 still overflows it once the
+		// tls- prefix is added, and an entry inside its own bound still
+		// overflows the hostname once the apex is appended. Both
+		// overflows render an object the apiserver refuses whole, so
+		// the Gateway loses every listener rather than this one.
+		if n := passthroughListenerPrefix + svc; len(n) > maxGatewayNameLength {
+			return fmt.Errorf("tlsPassthroughServices: entry %q renders listener name %q, %d characters over the %d Gateway API allows", svc, n, len(n)-maxGatewayNameLength, maxGatewayNameLength)
+		}
+		if h := svc + "." + apex; len(h) > maxGatewayNameLength {
+			return fmt.Errorf("tlsPassthroughServices: entry %q renders hostname %q, %d characters over the %d Gateway API allows", svc, h, len(h)-maxGatewayNameLength, maxGatewayNameLength)
+		}
+		seenHostnames = append(seenHostnames, claimedHostname{svc + "." + apex, fmt.Sprintf("tlsPassthroughServices entry %q", svc)})
+	}
+	for _, l := range listeners {
+		if errs := validation.IsDNS1123Label(l.Name); len(errs) > 0 {
+			return fmt.Errorf("tlsPassthroughListeners: invalid name %q: %s", l.Name, strings.Join(errs, "; "))
+		}
+		if _, dup := seenNames[l.Name]; dup {
+			return fmt.Errorf("tlsPassthroughListeners: duplicate name %q", l.Name)
+		}
+		if _, clash := serviceNames[l.Name]; clash {
+			return fmt.Errorf("tlsPassthroughListeners: name %q collides with tlsPassthroughServices entry %q; both render a %s%s Gateway listener", l.Name, l.Name, passthroughListenerPrefix, l.Name)
+		}
+		seenNames[l.Name] = struct{}{}
+
+		if l.Port < 1 || l.Port > 65535 {
+			return fmt.Errorf("tlsPassthroughListeners: listener %q port %d out of range 1..65535", l.Name, l.Port)
+		}
+		if isReservedGatewayPort(l.Port) {
+			return fmt.Errorf("tlsPassthroughListeners: listener %q port %d is reserved for the Gateway's http (80) and terminate (443) listeners; use the engine's native port", l.Name, l.Port)
+		}
+		// One listener per port is a phase-1 narrowing, not a Gateway
+		// API requirement: TLS listeners are distinct by the (port,
+		// protocol, hostname) triple, so several passthrough listeners
+		// could share a port and be selected by SNI — the port-443
+		// tls-<svc> listeners above already do exactly that. It is
+		// narrowed here because the field's purpose is the engine's
+		// native port, where a second listener means two engines
+		// answering on one port and the SNI deciding which, and
+		// nothing downstream (routing, certificates) exists yet to
+		// make that configuration testable. Lifting it means removing
+		// this check and the matching CEL rule in the CRD, which is a
+		// schema change with no field or type change, so the shape stays
+		// available once the later phases land.
+		if _, dup := seenPorts[l.Port]; dup {
+			return fmt.Errorf("tlsPassthroughListeners: duplicate port %d (listener %q)", l.Port, l.Name)
+		}
+		seenPorts[l.Port] = struct{}{}
+
+		if errs := validatePassthroughHostname(l.Hostname); len(errs) > 0 {
+			return fmt.Errorf("tlsPassthroughListeners: listener %q invalid hostname %q: %s", l.Name, l.Hostname, strings.Join(errs, "; "))
+		}
+		if !hostnameWithinApex(l.Hostname, apex) {
+			return fmt.Errorf("tlsPassthroughListeners: listener %q hostname %q is outside the tenant apex %q; it must equal the apex or be a subdomain of it (the cozystack-gateway-hostname-policy VAP rejects out-of-apex listener hostnames, failing the whole Gateway)", l.Name, l.Hostname, apex)
+		}
+
+		// Two listeners sharing a hostname on different ports are
+		// distinct to Gateway API — listeners are keyed by (port,
+		// protocol, hostname) — and the object is accepted. Cilium
+		// before 1.19.6 routed passthrough by SNI without
+		// distinguishing the port (cilium#42898), so only one of them
+		// worked, a raw stream forwarded to the wrong backend with
+		// Accepted and Programmed both true. From 1.19.6 (cilium#44889,
+		// backported by cilium#46826) a Gateway with two routed
+		// passthrough ports gets an Envoy listener per port
+		// (NeedsPerPortTLSPassthroughListeners in
+		// operator/pkg/model/model.go), so the shipped 1.20.2 no longer
+		// needs this refusal; lifting it is tracked in cozystack/cozystack#4765.
+		//
+		// Checked after the apex test on purpose: an out-of-apex
+		// hostname that also happens to overlap should report the apex
+		// violation, which names the actual mistake.
+		for _, claimed := range seenHostnames {
+			if !hostnamesOverlap(l.Hostname, claimed.hostname) {
+				continue
+			}
+			return fmt.Errorf("tlsPassthroughListeners: listener %q hostname %q overlaps %s hostname %q; two passthrough listeners may not match the same ClientHello SNI, even on different ports", l.Name, l.Hostname, claimed.source, claimed.hostname)
+		}
+		seenHostnames = append(seenHostnames, claimedHostname{l.Hostname, fmt.Sprintf("listener %q", l.Name)})
+	}
+	return nil
+}
+
+// hostnamesOverlap reports whether two listener hostnames can match the
+// same ClientHello SNI. Exact-string equality is not enough: a wildcard
+// matches any number of labels to its left, per Gateway API's Hostname
+// contract, so "*.foo.example.com" covers both "api.foo.example.com"
+// and "a.b.foo.example.com" — and covers "*.db.foo.example.com" too.
+// A wildcard does NOT match the bare suffix itself ("*.foo.example.com"
+// does not match "foo.example.com"), which is why the exact leg tests
+// for the leading dot.
+//
+// This matters because the caller rejects overlapping hostnames. An exact-match
+// check would let a single "*.<apex>" entry silently shadow the
+// tls-<svc> listeners the chart ships by default (api, vm-exportproxy,
+// cdi-uploadproxy all render <svc>.<apex>), which is the exact failure
+// the check exists to prevent, reachable from stock values.
+func hostnamesOverlap(a, b string) bool {
+	if a == b {
+		return true
+	}
+	return hostnameCovers(a, b) || hostnameCovers(b, a)
+}
+
+// isWildcardHostname reports whether h is a left-most-label wildcard,
+// the one shape of wildcard the Gateway API hostname rule admits.
+func isWildcardHostname(h string) bool {
+	return strings.HasPrefix(h, "*.")
+}
+
+// hostnameCovers reports whether wildcard hostname w matches hostname x.
+// Returns false when w is not a wildcard; the equality case is handled
+// by the caller.
+func hostnameCovers(w, x string) bool {
+	suffix, ok := strings.CutPrefix(w, "*.")
+	if !ok {
+		return false
+	}
+	// One suffix test answers x whether or not x is itself a wildcard:
+	// "*.<inner>" ends with ".<suffix>" exactly when <inner> equals or
+	// sits under <suffix>, the "*." prefix being inert to the test. A
+	// separate wildcard branch computed the same answer twice.
+	return strings.HasSuffix(x, "."+suffix)
+}
+
+// validatePassthroughHostname accepts an exact RFC 1123 hostname or a
+// left-most-label wildcard ("*.example.com"), matching the shape the
+// Gateway API allows for a listener hostname.
+func validatePassthroughHostname(hostname string) []string {
+	if strings.HasPrefix(hostname, "*.") {
+		return validation.IsWildcardDNS1123Subdomain(hostname)
+	}
+	return validation.IsDNS1123Subdomain(hostname)
+}
+
+// hostnameWithinApex reports whether an exact or wildcard listener
+// hostname falls within the tenant apex: it must equal the apex or be a
+// subdomain of it. This mirrors the cozystack-gateway-hostname-policy
+// ValidatingAdmissionPolicy (packages/system/cozystack-basics), whose
+// CEL allows a listener hostname iff it equals the namespace host label
+// or ends with "." + that label, with both operands lowercased first and
+// with an absent or empty label allowing everything. Neither leg is
+// modelled here: this comparison is byte-exact, and an apex no listener
+// hostname can sit within is refused by validateTLSPassthroughListeners
+// before anything reaches this test. A wildcard such as "*.db.<apex>"
+// satisfies the suffix test and is accepted, exactly as the VAP accepts
+// it. Rejecting an out-of-apex hostname here converts a wholesale Gateway
+// rejection (the VAP denies the whole object on the first reconcile,
+// taking every listener down) into a clear per-field error on the
+// TenantGateway status. The leading "." in the suffix prevents a
+// sibling-domain false match ("evilfoo.example.com" is not under
+// "foo.example.com").
+//
+// It mirrors the VAP's shape, not its input: the VAP reads the
+// namespace's namespace.cozystack.io/host label, this reads
+// tgw.Spec.Apex. They are expected to be the same value — the tenant
+// chart writes both from the same computed host, and layers 4 and 5 of
+// the security model (packages/extra/gateway/README.md) restrict who
+// may change either — but nothing in this function enforces it. If they
+// ever diverge, this pre-check passes and the VAP still denies the
+// whole Gateway, which is the outcome the pre-check exists to convert
+// into a clean per-field status error.
+func hostnameWithinApex(hostname, apex string) bool {
+	return hostname == apex || strings.HasSuffix(hostname, "."+apex)
+}
+
 // perListenerName produces the Gateway listener name for a per-app
 // HTTPS listener: "https-<first-label>-<8-hex>". The hex suffix is a
 // 32-bit prefix of sha256(hostname), which makes collision between
 // two distinct hostnames a 1-in-2^32 event — well below any
 // realistic chart load. The first-label prefix is kept for
 // human readability when reading Gateway.spec.listeners.
+//
+// Do not truncate. Listener.name is a SectionName, capped at 253, not at
+// the 63 of a DNS label: gateway-api v1.4.1 declares MaxLength=253 on the
+// type, and the CRD bundle this repo ships carries maxLength: 253 on
+// spec.listeners[].name. The longest name the builders here produce is a
+// 12-character prefix plus a DNS label (≤63) plus a dash and 8 hex, so
+// ≤84 — already inside the cap. Truncating would shorten names that are
+// valid today, and renaming a listener on a live Gateway is a delete plus
+// a create.
 func perListenerName(hostname string) string {
 	return "https-" + hostnameFirstLabel(hostname) + "-" + hostnameSuffix(hostname)
 }
@@ -206,6 +693,12 @@ func childListenerName(childApex string) gatewayv1.SectionName {
 	return gatewayv1.SectionName("https-child-" + hostnameFirstLabel(childApex) + "-" + hostnameSuffix(childApex))
 }
 
+// edgeChildListenerName is childListenerName's counterpart for the
+// plain-HTTP per-child-apex listener rendered in edge mode.
+func edgeChildListenerName(childApex string) gatewayv1.SectionName {
+	return gatewayv1.SectionName("edge-child-" + hostnameFirstLabel(childApex) + "-" + hostnameSuffix(childApex))
+}
+
 // perListenerCertName produces the cert-manager Certificate name for
 // a per-listener cert: "<tgw>-<first-label>-<8-hex>-tls".
 func perListenerCertName(tgw *gatewayv1alpha1.TenantGateway, hostname string) string {
@@ -360,6 +853,13 @@ func buildSolver(tgw *gatewayv1alpha1.TenantGateway) (*cmacmev1.ACMEChallengeSol
 			return nil, fmt.Errorf("unsupported dns01.provider=%q (supported: cloudflare, route53, digitalocean, rfc2136)", tgw.Spec.DNS01.Provider)
 		}
 
+	case gatewayv1alpha1.CertModeExistingSecret, gatewayv1alpha1.CertModeEdge:
+		// Neither mode mints an Issuer, so reconcileIssuer never calls
+		// buildSolver for them. Guard defensively so a future caller
+		// gets a clear contract error instead of silently falling
+		// through to the unknown-certMode default below.
+		return nil, fmt.Errorf("certMode=%s does not use an ACME solver", tgw.Spec.CertMode)
+
 	default:
 		return nil, fmt.Errorf("unknown certMode=%q", tgw.Spec.CertMode)
 	}
@@ -380,8 +880,8 @@ func buildSolver(tgw *gatewayv1alpha1.TenantGateway) (*cmacmev1.ACMEChallengeSol
 func (r *Reconciler) renderWildcardCertificate(tgw *gatewayv1alpha1.TenantGateway, childApexes []string) (*cmv1.Certificate, error) {
 	dnsNames := []string{tgw.Spec.Apex, "*." + tgw.Spec.Apex}
 	seen := map[string]struct{}{
-		tgw.Spec.Apex:           {},
-		"*." + tgw.Spec.Apex:    {},
+		tgw.Spec.Apex:        {},
+		"*." + tgw.Spec.Apex: {},
 	}
 	for _, apex := range childApexes {
 		if apex == "" {
@@ -435,19 +935,37 @@ func ptrKind(k string) *gatewayv1.Kind {
 	return &kk
 }
 
-// renderHTTPRedirect builds the HTTPRoute that catches every hostname
-// on the Gateway's HTTP listener and 301-redirects to HTTPS. Without
-// this, app-owned HTTPRoutes that attach to the Gateway by hostname
-// (no sectionName) silently serve plaintext on port 80 — the legacy
-// nginx Ingress flow had ssl-redirect: "true" enabled by default; the
-// new TenantGateway path replicates that contract here.
+// renderHTTPRedirect builds the HTTPRoute that catches the tenant apex
+// and its subdomains on the Gateway's HTTP listener and 301-redirects
+// them to HTTPS. Without this, app-owned HTTPRoutes that attach to the
+// Gateway by hostname (no sectionName) silently serve plaintext on port
+// 80 — the legacy nginx Ingress flow had ssl-redirect: "true" enabled by
+// default; the new TenantGateway path replicates that contract here.
 func (r *Reconciler) renderHTTPRedirect(tgw *gatewayv1alpha1.TenantGateway) (*gatewayv1.HTTPRoute, error) {
+	// Spec.Apex carries MinLength=1, so admission normally rejects an
+	// empty value before it reaches here. Check anyway: the CRD and this
+	// binary are rolled out separately, and against an older CRD an empty
+	// apex would render hostnames "" and "*.", both of which fail the
+	// HTTPRoute schema. That surfaces as an apiserver validation error
+	// naming the route rather than the field, which is a poor thing to
+	// hand an operator.
+	//
+	// This wins the race in HTTP-01 without tlsPassthroughServices: the
+	// listener set is built from route hostnames alone there, so however
+	// many routes are attached, reconcileGateway never reads the apex
+	// ahead of this point. DNS-01 and existingSecret render an apex
+	// listener, and any tlsPassthroughServices entry builds
+	// "<service>.<apex>", so in those the operator meets the equivalent
+	// schema error against the Gateway first.
+	if tgw.Spec.Apex == "" {
+		return nil, fmt.Errorf("spec.apex is empty on TenantGateway %s/%s: the http-to-https redirect route derives its hostnames from the apex and cannot be rendered without one", tgw.Namespace, tgw.Name)
+	}
 	section := gatewayv1.SectionName("http")
 	scheme := "https"
 	statusCode := 301
 	route := &gatewayv1.HTTPRoute{
 		ObjectMeta: metav1.ObjectMeta{
-			Name:      tgw.Name + "-http-redirect",
+			Name:      httpRedirectRouteName(tgw),
 			Namespace: tgw.Namespace,
 			Labels: map[string]string{
 				cozystackManagedByLabel:   cozystackManagedByValue,
@@ -455,6 +973,39 @@ func (r *Reconciler) renderHTTPRedirect(tgw *gatewayv1alpha1.TenantGateway) (*ga
 			},
 		},
 		Spec: gatewayv1.HTTPRouteSpec{
+			// The apex and its wildcard, rather than no hostnames at
+			// all. This route lives in a tenant-* namespace, where
+			// cozystack-route-hostname-policy requires spec.hostnames
+			// to be present, non-empty and inside the namespace apex;
+			// a hostname-less route is denied at admission and takes
+			// this whole reconcile down with it.
+			//
+			// Both entries are load-bearing. A wildcard hostname is a
+			// suffix match spanning any number of labels, so
+			// "*.<apex>" covers every subdomain at every depth, but it
+			// does not cover the bare "<apex>", hence the plain apex
+			// first.
+			//
+			// Naming them costs no coverage, and the other half of
+			// this change is why: the port-80 listener admits routes
+			// only from this namespace and cert-manager's, and the
+			// tightened cozystack-route-hostname-policy requires every
+			// route here to declare hostnames inside the apex. So any
+			// host published from this namespace is already one of
+			// these two.
+			//
+			// An inheriting child cannot widen that set either.
+			// cozystack-gateway-hostname-policy compares every listener
+			// against the host label of the Gateway's own namespace, so
+			// a child apex outside it never gets its listener: the
+			// Gateway write carrying it is refused at admission whole,
+			// in reconcileGateway and before this route is rendered. A
+			// child apex under this one passes that check, and the
+			// wildcard above already covers it.
+			Hostnames: []gatewayv1.Hostname{
+				gatewayv1.Hostname(tgw.Spec.Apex),
+				gatewayv1.Hostname("*." + tgw.Spec.Apex),
+			},
 			CommonRouteSpec: gatewayv1.CommonRouteSpec{
 				ParentRefs: []gatewayv1.ParentReference{
 					{
diff --git a/internal/controller/tenantgateway/renderers_test.go b/internal/controller/tenantgateway/renderers_test.go
new file mode 100644
index 0000000000..d7c60d40ae
--- /dev/null
+++ b/internal/controller/tenantgateway/renderers_test.go
@@ -0,0 +1,205 @@
+/*
+Copyright 2026 The Cozystack Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package tenantgateway
+
+import (
+	"bytes"
+	"errors"
+	"io"
+	"os"
+	"regexp"
+	"testing"
+
+	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/util/validation"
+	utilyaml "k8s.io/apimachinery/pkg/util/yaml"
+	gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
+
+	gatewayv1alpha1 "github.com/cozystack/cozystack/api/gateway/v1alpha1"
+)
+
+// gatewayCRDBundlePath is the Gateway API bundle the platform installs,
+// which is what admits or refuses the Gateway this controller writes.
+const gatewayCRDBundlePath = "../../../packages/system/gateway-api-crds/templates/crds-experimental.yaml"
+
+// gatewayListenerRules returns the patterns the shipped Gateway CRD puts
+// on spec.listeners[].name and spec.listeners[].hostname. They are read
+// from the bundle rather than restated here, so a re-vendored bundle is
+// what the renderer is judged against, and a rule the bundle no longer
+// carries fails here rather than being tested against a stale copy.
+func gatewayListenerRules(t *testing.T) (name, hostname *regexp.Regexp) {
+	t.Helper()
+	raw, err := os.ReadFile(gatewayCRDBundlePath)
+	if err != nil {
+		t.Fatalf("read Gateway API bundle: %v", err)
+	}
+	dec := utilyaml.NewYAMLOrJSONDecoder(bytes.NewReader(raw), 4096)
+	for {
+		var crd apiextensionsv1.CustomResourceDefinition
+		err := dec.Decode(&crd)
+		if errors.Is(err, io.EOF) {
+			break
+		}
+		if err != nil {
+			t.Fatalf("decode Gateway API bundle: %v", err)
+		}
+		if crd.Name != "gateways.gateway.networking.k8s.io" {
+			continue
+		}
+		for i := range crd.Spec.Versions {
+			v := &crd.Spec.Versions[i]
+			if v.Name != "v1" || v.Schema == nil || v.Schema.OpenAPIV3Schema == nil {
+				continue
+			}
+			listeners := v.Schema.OpenAPIV3Schema.Properties["spec"].Properties["listeners"]
+			if listeners.Items == nil || listeners.Items.Schema == nil {
+				t.Fatal("Gateway v1 spec.listeners carries no item schema")
+			}
+			props := listeners.Items.Schema.Properties
+			if props["name"].Pattern == "" || props["hostname"].Pattern == "" {
+				t.Fatalf("Gateway v1 listener name or hostname carries no pattern: name=%q hostname=%q", props["name"].Pattern, props["hostname"].Pattern)
+			}
+			return regexp.MustCompile(props["name"].Pattern), regexp.MustCompile(props["hostname"].Pattern)
+		}
+	}
+	t.Fatal("Gateway v1 listener schema not found in the bundle")
+	return nil, nil
+}
+
+// TestRenderGateway_ListenerNamesAreAdmissibleForEveryRouteHostname pins
+// the renderer's own invariant against the shipped CRD: every hostname
+// the listener hostname rule admits renders to a listener name the
+// listener name rule admits and to a Certificate name the apiserver
+// takes. The two rules differ in one place, the leading "*." a hostname
+// may carry and a name may not, and the name used to be built from the
+// hostname's first label verbatim, so a wildcard hostname produced a
+// name the apiserver refused and took the whole Gateway write with it.
+// The fake client validates no pattern, which is why the rule is read
+// from the bundle and applied here.
+func TestRenderGateway_ListenerNamesAreAdmissibleForEveryRouteHostname(t *testing.T) {
+	nameRule, hostnameRule := gatewayListenerRules(t)
+	// Positive control on the rules as read: a pattern that admitted
+	// the asterisk, or a hostname rule that refused the wildcard, would
+	// leave every assertion below unable to fail for the reason it is
+	// written.
+	if nameRule.MatchString("https-*-06a3e25d") {
+		t.Fatalf("listener name rule %q admits an asterisk; the bundle no longer carries the rule this test exists for", nameRule)
+	}
+	if !hostnameRule.MatchString("*.foo.example.com") {
+		t.Fatalf("listener hostname rule %q refuses a wildcard; the row that decides this test is unreachable", hostnameRule)
+	}
+
+	s := newScheme(t)
+	tgw := &gatewayv1alpha1.TenantGateway{
+		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"},
+		Spec: gatewayv1alpha1.TenantGatewaySpec{
+			Apex:             "foo.example.com",
+			CertMode:         gatewayv1alpha1.CertModeHTTP01,
+			GatewayClassName: "cilium",
+		},
+	}
+	// A concrete hostname whose first label is the word the wildcard is
+	// rewritten to sits beside the wildcard, so that the two cannot
+	// share a name: the suffix hashes the whole hostname, asterisk
+	// included.
+	hostnames := []string{
+		"*.foo.example.com",
+		"*.apps.foo.example.com",
+		"wildcard.foo.example.com",
+		"harbor.foo.example.com",
+		"foo.example.com",
+	}
+	for _, h := range hostnames {
+		if !hostnameRule.MatchString(h) {
+			t.Fatalf("fixture hostname %q is not one the listener hostname rule admits", h)
+		}
+	}
+	r := &Reconciler{Scheme: s}
+	gw, err := r.renderGateway(tgw, hostnames, nil)
+	if err != nil {
+		t.Fatalf("renderGateway: %v", err)
+	}
+
+	seen := map[string]string{}
+	rendered := map[string]bool{}
+	for _, l := range gw.Spec.Listeners {
+		name := string(l.Name)
+		if !nameRule.MatchString(name) {
+			t.Errorf("listener %q is not a name the shipped Gateway CRD admits (%s)", name, nameRule)
+		}
+		if prev, dup := seen[name]; dup {
+			t.Errorf("listener name %q rendered twice, for %q and %q", name, prev, hostnameOf(l.Hostname))
+		}
+		seen[name] = hostnameOf(l.Hostname)
+		if l.Hostname != nil {
+			rendered[string(*l.Hostname)] = true
+		}
+		if l.TLS == nil {
+			continue
+		}
+		for _, ref := range l.TLS.CertificateRefs {
+			if errs := validation.IsDNS1123Subdomain(string(ref.Name)); len(errs) > 0 {
+				t.Errorf("listener %q references Secret %q, which is not a name the apiserver takes: %v", name, ref.Name, errs)
+			}
+		}
+	}
+	for _, h := range hostnames {
+		if !rendered[h] {
+			t.Errorf("no listener rendered for %q; a hostname dropped on the floor passes the name checks trivially", h)
+		}
+		if errs := validation.IsDNS1123Subdomain(perListenerCertName(tgw, h)); len(errs) > 0 {
+			t.Errorf("Certificate name for %q is %q, which the apiserver refuses: %v", h, perListenerCertName(tgw, h), errs)
+		}
+	}
+	if got, want := perListenerName("*.foo.example.com"), "https-wildcard-06a3e25d"; got != want {
+		t.Errorf("perListenerName(*.foo.example.com) = %q, want %q: the label is rewritten and the hash of the whole hostname stays", got, want)
+	}
+}
+
+func hostnameOf(h *gatewayv1.Hostname) string {
+	if h == nil {
+		return ""
+	}
+	return string(*h)
+}
+
+// TestPerListenerName_KeepsEveryNameThatWasAlreadyAdmissible pins the
+// names concrete hostnames render to, byte for byte. A listener is
+// addressed by its name: a route pins one by sectionName, and renaming
+// a listener on a live Gateway is a delete and a create, with every
+// route on it detached in between. Making the wildcard admissible must
+// therefore move no name that already was, and this table is what says
+// so on upgrade.
+func TestPerListenerName_KeepsEveryNameThatWasAlreadyAdmissible(t *testing.T) {
+	tgw := &gatewayv1alpha1.TenantGateway{ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: "tenant-foo"}}
+	for _, tc := range []struct{ hostname, listener, cert string }{
+		{"harbor.foo.example.com", "https-harbor-760d5a8a", "cozystack-harbor-760d5a8a-tls"},
+		{"api.foo.example.com", "https-api-0d0905b9", "cozystack-api-0d0905b9-tls"},
+		{"HARBOR.foo.example.com", "https-harbor-760d5a8a", "cozystack-harbor-760d5a8a-tls"},
+		{"wildcard.foo.example.com", "https-wildcard-21b97197", "cozystack-wildcard-21b97197-tls"},
+		{"shop.alice.foo.example.com", "https-shop-187a7b66", "cozystack-shop-187a7b66-tls"},
+		{"foo.example.com", "https-foo-45a335de", "cozystack-foo-45a335de-tls"},
+	} {
+		if got := perListenerName(tc.hostname); got != tc.listener {
+			t.Errorf("perListenerName(%q) = %q, want %q; a changed name detaches every route pinned to the old one", tc.hostname, got, tc.listener)
+		}
+		if got := perListenerCertName(tgw, tc.hostname); got != tc.cert {
+			t.Errorf("perListenerCertName(%q) = %q, want %q; a changed name orders a new certificate and orphans the old Secret", tc.hostname, got, tc.cert)
+		}
+	}
+}
diff --git a/internal/controller/tenantgateway/status.go b/internal/controller/tenantgateway/status.go
index 0f95200459..6ffb7a28c8 100644
--- a/internal/controller/tenantgateway/status.go
+++ b/internal/controller/tenantgateway/status.go
@@ -19,7 +19,9 @@ package tenantgateway
 import (
 	"context"
 	"fmt"
+	"slices"
 
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
@@ -33,11 +35,7 @@ import (
 // state of the rendered Gateway (Gateway.Status.Listeners +
 // Gateway.Status.Conditions). Operators reading `kubectl get tgw`
 // see real readiness, not a fictional always-True flag.
-func (r *Reconciler) reconcileStatus(
-	ctx context.Context,
-	tgw *gatewayv1alpha1.TenantGateway,
-	dynHostnames []string,
-) error {
+func (r *Reconciler) reconcileStatus(ctx context.Context, tgw *gatewayv1alpha1.TenantGateway) error {
 	gw := &gatewayv1.Gateway{}
 	if err := r.Get(ctx, types.NamespacedName{Namespace: tgw.Namespace, Name: tgw.Name}, gw); err != nil {
 		return fmt.Errorf("get Gateway for status: %w", err)
@@ -68,8 +66,21 @@ func (r *Reconciler) reconcileStatus(
 
 	gwAccepted, gwProgrammed := gatewayConditionStatus(gw.Status.Conditions)
 
+	unsupported, err := r.classLacksTLSRoute(ctx, tgw)
+	if err != nil {
+		return err
+	}
+
 	var ready metav1.Condition
 	switch {
+	case unsupported:
+		ready = metav1.Condition{
+			Type:               "Ready",
+			Status:             metav1.ConditionFalse,
+			ObservedGeneration: tgw.Generation,
+			Reason:             "GatewayClassUnsupported",
+			Message:            fmt.Sprintf("GatewayClass %s does not list TLSRoute in status.supportedFeatures, so nothing serves the TLS-passthrough listeners this TenantGateway renders", gatewayClassName(tgw)),
+		}
 	case !gwAccepted:
 		ready = metav1.Condition{
 			Type:               "Ready",
@@ -116,6 +127,30 @@ func (r *Reconciler) reconcileStatus(
 	return r.Status().Update(ctx, tgw)
 }
 
+// classLacksTLSRoute reports whether the spec renders TLS-passthrough
+// listeners on a GatewayClass that declares it does not serve TLSRoute.
+// A class that declares no features at all, or that does not exist, is
+// not judged: status.supportedFeatures is how a class says what it
+// serves, and implementations predating the field leave it empty.
+func (r *Reconciler) classLacksTLSRoute(ctx context.Context, tgw *gatewayv1alpha1.TenantGateway) (bool, error) {
+	if len(renderedPassthroughServices(tgw)) == 0 && (len(tgw.Spec.TLSPassthroughListeners) == 0 || !rendersPassthroughListeners(tgw.Spec.CertMode)) {
+		return false, nil
+	}
+	class := &gatewayv1.GatewayClass{}
+	if err := r.Get(ctx, types.NamespacedName{Name: gatewayClassName(tgw)}, class); err != nil {
+		if apierrors.IsNotFound(err) {
+			return false, nil
+		}
+		return false, fmt.Errorf("get GatewayClass %s: %w", gatewayClassName(tgw), err)
+	}
+	if len(class.Status.SupportedFeatures) == 0 {
+		return false, nil
+	}
+	return !slices.ContainsFunc(class.Status.SupportedFeatures, func(f gatewayv1.SupportedFeature) bool {
+		return f.Name == "TLSRoute"
+	}), nil
+}
+
 // indexListenerStatus turns Gateway.Status.Listeners into a name→status
 // map for O(1) lookup per spec listener.
 func indexListenerStatus(in []gatewayv1.ListenerStatus) map[string]gatewayv1.ListenerStatus {
diff --git a/internal/controller/tenantlogrouting/reconciler.go b/internal/controller/tenantlogrouting/reconciler.go
new file mode 100644
index 0000000000..65618f4b2a
--- /dev/null
+++ b/internal/controller/tenantlogrouting/reconciler.go
@@ -0,0 +1,165 @@
+/*
+Copyright 2026 The Cozystack Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// Package tenantlogrouting keeps the node fluent-bit's tenant log routes in
+// step with the namespaces that declare them.
+//
+// The monitoring-agents chart builds its routes with a Helm lookup of every
+// Namespace's namespace.cozystack.io/monitoring label (see
+// packages/system/monitoring-agents/templates/_tenant-log-routes.tpl).
+// helm-controller only upgrades a release when its chart or values digest
+// changes, and lookup results are part of neither, so a tenant that turns
+// monitoring on would get no route, and a removed one would keep its route,
+// until some unrelated change upgraded the release. This reconciler closes
+// that gap: it digests the label across all namespaces and, when the digest
+// moves, requests a forced upgrade of the release, which re-runs the lookup.
+//
+// The digest covers every namespace carrying the label, whatever its value,
+// rather than repeating the chart's selection (non-empty and not
+// global.target). A superset can only cost an upgrade that renders the same
+// config, while a copy of the rule could drift from the chart and miss one.
+// For the same reason a release that carries no digest yet is forced once on
+// first sight: that also covers a namespace labelled between the install
+// render and the first sweep.
+package tenantlogrouting
+
+import (
+	"context"
+	"crypto/sha256"
+	"encoding/hex"
+	"sort"
+	"strings"
+
+	helmv2 "github.com/fluxcd/helm-controller/api/v2"
+	fluxmeta "github.com/fluxcd/pkg/apis/meta"
+	corev1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/types"
+	ctrl "sigs.k8s.io/controller-runtime"
+	"sigs.k8s.io/controller-runtime/pkg/builder"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/event"
+	"sigs.k8s.io/controller-runtime/pkg/handler"
+	"sigs.k8s.io/controller-runtime/pkg/log"
+	"sigs.k8s.io/controller-runtime/pkg/predicate"
+	"sigs.k8s.io/controller-runtime/pkg/reconcile"
+)
+
+const (
+	// MonitoringLabel is written by the apps/tenant chart and names the tenant
+	// whose monitoring stack a namespace reports to.
+	MonitoringLabel = "namespace.cozystack.io/monitoring"
+
+	// DigestAnnotation records, on the HelmRelease, the digest the last forced
+	// upgrade was requested for. It is compared instead of requestedAt, which
+	// anyone running `flux reconcile` overwrites, so that a manual reconcile
+	// does not make the next sweep force one more upgrade.
+	DigestAnnotation = "monitoring.cozystack.io/log-routing-digest"
+)
+
+// Release is the node-agent HelmRelease whose fluent-bit config carries the
+// routes (packages/core/platform/sources/monitoring-agents.yaml).
+var Release = types.NamespacedName{Namespace: "cozy-monitoring", Name: "monitoring-agents"}
+
+// Reconciler requests a forced upgrade of Release whenever the set of
+// namespace monitoring labels changes.
+type Reconciler struct {
+	client.Client
+}
+
+// +kubebuilder:rbac:groups="",resources=namespaces,verbs=get;list;watch
+// +kubebuilder:rbac:groups=helm.toolkit.fluxcd.io,resources=helmreleases,verbs=get;list;watch;patch
+
+func (r *Reconciler) Reconcile(ctx context.Context, _ ctrl.Request) (ctrl.Result, error) {
+	logger := log.FromContext(ctx)
+
+	hr := &helmv2.HelmRelease{}
+	if err := r.Get(ctx, Release, hr); err != nil {
+		return ctrl.Result{}, client.IgnoreNotFound(err)
+	}
+
+	namespaces := &corev1.NamespaceList{}
+	if err := r.List(ctx, namespaces); err != nil {
+		return ctrl.Result{}, err
+	}
+	digest := Digest(namespaces.Items)
+	if hr.GetAnnotations()[DigestAnnotation] == digest {
+		return ctrl.Result{}, nil
+	}
+
+	patch := client.MergeFrom(hr.DeepCopy())
+	annotations := hr.GetAnnotations()
+	if annotations == nil {
+		annotations = map[string]string{}
+	}
+	// helm-controller runs a forced upgrade when forceAt equals requestedAt and
+	// differs from the last one it handled; the digest serves as both tokens.
+	annotations[DigestAnnotation] = digest
+	annotations[fluxmeta.ReconcileRequestAnnotation] = digest
+	annotations[fluxmeta.ForceRequestAnnotation] = digest
+	hr.SetAnnotations(annotations)
+	if err := r.Patch(ctx, hr, patch); err != nil {
+		return ctrl.Result{}, err
+	}
+	logger.Info("namespace monitoring labels changed, forcing an upgrade of the node agents", "release", Release.String(), "digest", digest)
+	return ctrl.Result{}, nil
+}
+
+// Digest hashes the monitoring label of every namespace that carries it, in
+// namespace order, so it moves exactly when a namespace gains the label,
+// loses it, changes its value, or is deleted.
+func Digest(namespaces []corev1.Namespace) string {
+	pairs := make([]string, 0, len(namespaces))
+	for i := range namespaces {
+		if target, ok := namespaces[i].Labels[MonitoringLabel]; ok {
+			pairs = append(pairs, namespaces[i].Name+"="+target)
+		}
+	}
+	sort.Strings(pairs)
+	sum := sha256.Sum256([]byte(strings.Join(pairs, "\n")))
+	return hex.EncodeToString(sum[:8])
+}
+
+// sweep coalesces every event into one reconcile: the digest spans all
+// namespaces, so there is nothing per-object to reconcile.
+var sweep = reconcile.Request{NamespacedName: Release}
+
+func (r *Reconciler) SetupWithManager(mgr ctrl.Manager) error {
+	toSweep := handler.EnqueueRequestsFromMapFunc(func(context.Context, client.Object) []reconcile.Request {
+		return []reconcile.Request{sweep}
+	})
+	labelled := func(o client.Object) bool {
+		_, ok := o.GetLabels()[MonitoringLabel]
+		return ok
+	}
+	monitoringLabelChanged := predicate.Funcs{
+		CreateFunc: func(e event.CreateEvent) bool { return labelled(e.Object) },
+		DeleteFunc: func(e event.DeleteEvent) bool { return labelled(e.Object) },
+		UpdateFunc: func(e event.UpdateEvent) bool {
+			oldValue, oldOK := e.ObjectOld.GetLabels()[MonitoringLabel]
+			newValue, newOK := e.ObjectNew.GetLabels()[MonitoringLabel]
+			return oldOK != newOK || oldValue != newValue
+		},
+		GenericFunc: func(event.GenericEvent) bool { return false },
+	}
+	isRelease := predicate.NewPredicateFuncs(func(o client.Object) bool {
+		return o.GetNamespace() == Release.Namespace && o.GetName() == Release.Name
+	})
+	return ctrl.NewControllerManagedBy(mgr).
+		Named("tenantlogrouting-controller").
+		Watches(&corev1.Namespace{}, toSweep, builder.WithPredicates(monitoringLabelChanged)).
+		Watches(&helmv2.HelmRelease{}, toSweep, builder.WithPredicates(isRelease)).
+		Complete(r)
+}
diff --git a/internal/controller/tenantlogrouting/reconciler_test.go b/internal/controller/tenantlogrouting/reconciler_test.go
new file mode 100644
index 0000000000..ee6fdb9030
--- /dev/null
+++ b/internal/controller/tenantlogrouting/reconciler_test.go
@@ -0,0 +1,171 @@
+/*
+Copyright 2026 The Cozystack Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package tenantlogrouting
+
+import (
+	"context"
+	"testing"
+
+	helmv2 "github.com/fluxcd/helm-controller/api/v2"
+	fluxmeta "github.com/fluxcd/pkg/apis/meta"
+	corev1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/client/fake"
+)
+
+func namespace(name string, labels map[string]string) *corev1.Namespace {
+	return &corev1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: name, Labels: labels}}
+}
+
+func monitoredBy(target string) map[string]string {
+	return map[string]string{MonitoringLabel: target}
+}
+
+func release(annotations map[string]string) *helmv2.HelmRelease {
+	return &helmv2.HelmRelease{ObjectMeta: metav1.ObjectMeta{
+		Name:        Release.Name,
+		Namespace:   Release.Namespace,
+		Annotations: annotations,
+	}}
+}
+
+func newReconciler(t *testing.T, objs ...client.Object) *Reconciler {
+	t.Helper()
+	scheme := runtime.NewScheme()
+	if err := corev1.AddToScheme(scheme); err != nil {
+		t.Fatal(err)
+	}
+	if err := helmv2.AddToScheme(scheme); err != nil {
+		t.Fatal(err)
+	}
+	return &Reconciler{Client: fake.NewClientBuilder().WithScheme(scheme).WithObjects(objs...).Build()}
+}
+
+func reconcileOnce(t *testing.T, r *Reconciler) *helmv2.HelmRelease {
+	t.Helper()
+	if _, err := r.Reconcile(context.Background(), sweep); err != nil {
+		t.Fatalf("Reconcile: %v", err)
+	}
+	hr := &helmv2.HelmRelease{}
+	if err := r.Get(context.Background(), Release, hr); err != nil {
+		t.Fatalf("get release: %v", err)
+	}
+	return hr
+}
+
+func assertForced(t *testing.T, hr *helmv2.HelmRelease, digest string) {
+	t.Helper()
+	for _, key := range []string{DigestAnnotation, fluxmeta.ReconcileRequestAnnotation, fluxmeta.ForceRequestAnnotation} {
+		if got := hr.Annotations[key]; got != digest {
+			t.Errorf("annotation %s = %q, want %q", key, got, digest)
+		}
+	}
+}
+
+func TestReconcile_ForcesUpgradeOnFirstSight(t *testing.T) {
+	nsA := namespace("tenant-a", monitoredBy("tenant-a"))
+	r := newReconciler(t, release(map[string]string{"cozyhr.cozystack.io/values-files": "values.yaml"}), nsA)
+
+	hr := reconcileOnce(t, r)
+
+	assertForced(t, hr, Digest([]corev1.Namespace{*nsA}))
+	if hr.Annotations["cozyhr.cozystack.io/values-files"] != "values.yaml" {
+		t.Errorf("unrelated annotation was dropped: %v", hr.Annotations)
+	}
+}
+
+func TestReconcile_LeavesReleaseAloneWhileLabelsAreUnchanged(t *testing.T) {
+	nsA := namespace("tenant-a", monitoredBy("tenant-a"))
+	digest := Digest([]corev1.Namespace{*nsA})
+	// A manual `flux reconcile` has since replaced the request tokens; the
+	// recorded digest still matches, so no further upgrade may be forced.
+	r := newReconciler(t, release(map[string]string{
+		DigestAnnotation:                    digest,
+		fluxmeta.ReconcileRequestAnnotation: "manual",
+		fluxmeta.ForceRequestAnnotation:     "manual",
+	}), nsA)
+	before := reconcileOnce(t, r).ResourceVersion
+
+	hr := reconcileOnce(t, r)
+
+	if hr.ResourceVersion != before {
+		t.Errorf("release was patched although no label changed")
+	}
+	if hr.Annotations[fluxmeta.ForceRequestAnnotation] != "manual" {
+		t.Errorf("forceAt = %q, want the manual token left in place", hr.Annotations[fluxmeta.ForceRequestAnnotation])
+	}
+}
+
+func TestReconcile_ForcesUpgradeWhenATenantTurnsMonitoringOn(t *testing.T) {
+	nsA := namespace("tenant-a", monitoredBy("tenant-root"))
+	r := newReconciler(t, release(nil), nsA)
+	stale := reconcileOnce(t, r).Annotations[DigestAnnotation]
+
+	nsA.Labels[MonitoringLabel] = "tenant-a"
+	if err := r.Update(context.Background(), nsA); err != nil {
+		t.Fatal(err)
+	}
+	hr := reconcileOnce(t, r)
+
+	if hr.Annotations[DigestAnnotation] == stale {
+		t.Fatalf("digest did not move after tenant-a turned monitoring on")
+	}
+	assertForced(t, hr, Digest([]corev1.Namespace{*nsA}))
+}
+
+func TestReconcile_ForcesUpgradeWhenARoutedNamespaceIsDeleted(t *testing.T) {
+	nsA := namespace("tenant-a", monitoredBy("tenant-a"))
+	nsB := namespace("tenant-b", monitoredBy("tenant-b"))
+	r := newReconciler(t, release(nil), nsA, nsB)
+	reconcileOnce(t, r)
+
+	if err := r.Delete(context.Background(), nsB); err != nil {
+		t.Fatal(err)
+	}
+	hr := reconcileOnce(t, r)
+
+	assertForced(t, hr, Digest([]corev1.Namespace{*nsA}))
+}
+
+func TestReconcile_NoReleaseIsNotAnError(t *testing.T) {
+	r := newReconciler(t, namespace("tenant-a", monitoredBy("tenant-a")))
+	if _, err := r.Reconcile(context.Background(), sweep); err != nil {
+		t.Fatalf("Reconcile without the release: %v", err)
+	}
+}
+
+func TestDigest_IgnoresNamespacesWithoutTheLabel(t *testing.T) {
+	labelled := []corev1.Namespace{*namespace("tenant-a", monitoredBy("tenant-a"))}
+	withOthers := append([]corev1.Namespace{*namespace("cozy-system", nil)}, labelled...)
+	if Digest(labelled) != Digest(withOthers) {
+		t.Errorf("an unlabelled namespace moved the digest")
+	}
+}
+
+func TestDigest_DependsOnValueNotOrder(t *testing.T) {
+	a := *namespace("tenant-a", monitoredBy("tenant-a"))
+	b := *namespace("tenant-b", monitoredBy("tenant-root"))
+	if Digest([]corev1.Namespace{a, b}) != Digest([]corev1.Namespace{b, a}) {
+		t.Errorf("digest depends on list order")
+	}
+	emptied := *namespace("tenant-b", monitoredBy(""))
+	if Digest([]corev1.Namespace{a, b}) == Digest([]corev1.Namespace{a, emptied}) {
+		t.Errorf("emptying a label did not move the digest")
+	}
+}
diff --git a/internal/controller/tenantquota/pool.go b/internal/controller/tenantquota/pool.go
new file mode 100644
index 0000000000..d00700eb8d
--- /dev/null
+++ b/internal/controller/tenantquota/pool.go
@@ -0,0 +1,215 @@
+/*
+Copyright 2026 The Cozystack Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// Package tenantquota implements hierarchical (recursive) resource quotas for
+// the Cozystack tenant tree. A tenant's declared quota is the budget for its
+// whole sub-tree: a child tenant that declares its own quota carves a fixed
+// slice out of its parent's budget, while a child without a quota shares the
+// parent's remaining pool.
+//
+// The model and the "a label-selector spans many namespaces whose usage is
+// aggregated for a shared budget" mechanism are adapted from OpenShift's
+// ClusterResourceQuota controllers:
+//   - github.com/openshift/api (quota/v1)
+//   - github.com/openshift/library-go (pkg/quota/clusterquotamapping)
+//   - github.com/openshift/cluster-policy-controller (pkg/quota/clusterquotareconciliation)
+//   - github.com/openshift/apiserver-library-go (pkg/admission/quota/clusterresourcequota)
+//
+// Copyright Red Hat, Inc. and the OpenShift Authors; licensed under the Apache
+// License, Version 2.0. Like those controllers, the per-namespace quota
+// arithmetic is delegated to the upstream Kubernetes quota helpers
+// (k8s.io/apiserver/pkg/quota/v1) rather than reimplemented.
+package tenantquota
+
+import (
+	"sort"
+	"strings"
+
+	corev1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/api/resource"
+	quota "k8s.io/apiserver/pkg/quota/v1"
+)
+
+// rootTenantNamespace is the namespace of the cluster's root tenant, which is
+// its own parent in the hierarchy.
+const rootTenantNamespace = "tenant-root"
+
+// tenantNamespacePrefix is the common prefix of every tenant namespace.
+const tenantNamespacePrefix = "tenant-"
+
+// Tenant is a snapshot of one tenant in the hierarchy: the namespace it owns
+// and its declared resourceQuotas. A nil/empty Declared marks an unbounded
+// tenant, which draws from the pool of its nearest bounded ancestor.
+type Tenant struct {
+	Namespace string
+	Declared  corev1.ResourceList
+}
+
+// parentNamespace returns the namespace owned by the parent of the tenant that
+// owns ns, or "" for the root tenant and non-tenant namespaces.
+//
+// The hierarchy is encoded in the namespace name by the tenant chart: a tenant
+// "x" created in namespace P owns namespace computeTenantNamespace(P, x) — i.e.
+// P + "-" + x, or "tenant-x" directly under root — so the parent namespace is
+// recovered by stripping the trailing "-x" segment.
+func parentNamespace(ns string) string {
+	if ns == rootTenantNamespace || !strings.HasPrefix(ns, tenantNamespacePrefix) {
+		return ""
+	}
+	segments := strings.Split(ns, "-")
+	if len(segments) == 2 {
+		return rootTenantNamespace
+	}
+	return strings.Join(segments[:len(segments)-1], "-")
+}
+
+// poolRootOf returns the namespace of the nearest ancestor tenant (inclusive of
+// ns itself) that declares a quota — the "pool root" whose budget governs ns.
+// It returns "" when no ancestor is bounded, meaning ns is governed by no pool.
+func poolRootOf(ns string, declaredByNS map[string]corev1.ResourceList) string {
+	for cur := ns; cur != ""; cur = parentNamespace(cur) {
+		if len(declaredByNS[cur]) > 0 {
+			return cur
+		}
+	}
+	return ""
+}
+
+// Pool is a budget shared by a set of namespaces: the pool root's own namespace
+// plus every unbounded descendant whose nearest bounded ancestor is the root.
+// Bounded sub-tenants are not members — they form their own pools — but their
+// declared quota is carved out of this pool's budget.
+type Pool struct {
+	Root      string
+	Budget    corev1.ResourceList // the root tenant's declared quota
+	CarvedOut corev1.ResourceList // sum of bounded sub-tenant reservations charged here
+	Available corev1.ResourceList // max(Budget-CarvedOut, 0), shared by Members
+	Members   []string            // namespaces that draw from Available
+}
+
+// ComputePools derives the pool structure for a snapshot of tenants. Each
+// bounded tenant becomes a pool root; every namespace is assigned to its
+// nearest bounded ancestor's pool; each bounded sub-tenant's declared quota is
+// charged as a carve-out against its parent pool.
+func ComputePools(tenants []Tenant) map[string]*Pool {
+	declaredByNS := make(map[string]corev1.ResourceList, len(tenants))
+	allNS := make([]string, 0, len(tenants))
+	for _, t := range tenants {
+		allNS = append(allNS, t.Namespace)
+		if len(t.Declared) > 0 {
+			declaredByNS[t.Namespace] = t.Declared
+		}
+	}
+	sort.Strings(allNS)
+
+	pools := make(map[string]*Pool, len(declaredByNS))
+	for ns, declared := range declaredByNS {
+		pools[ns] = &Pool{
+			Root:      ns,
+			Budget:    declared.DeepCopy(),
+			CarvedOut: corev1.ResourceList{},
+		}
+	}
+
+	// Membership: every namespace draws from its nearest bounded ancestor's
+	// pool (a bounded tenant's own namespace draws from its own pool).
+	for _, ns := range allNS {
+		if root := poolRootOf(ns, declaredByNS); root != "" {
+			pools[root].Members = append(pools[root].Members, ns)
+		}
+	}
+
+	// Carve-outs: a bounded sub-tenant reserves its declared budget out of the
+	// pool of its parent's nearest bounded ancestor.
+	for ns, declared := range declaredByNS {
+		if parentPool := poolRootOf(parentNamespace(ns), declaredByNS); parentPool != "" {
+			pools[parentPool].CarvedOut = quota.Add(pools[parentPool].CarvedOut, declared)
+		}
+	}
+
+	for _, p := range pools {
+		// Restrict Available to the resources the budget actually bounds. A child
+		// may carve out a resource its parent leaves unbounded (allowed at
+		// admission); without this mask SubtractWithNonNegativeResult would
+		// surface that resource as 0 — clamping the parent pool to zero of a
+		// resource the parent never limited and blocking its workloads.
+		p.Available = quota.Mask(quota.SubtractWithNonNegativeResult(p.Budget, p.CarvedOut), quota.ResourceNames(p.Budget))
+		sort.Strings(p.Members)
+	}
+	return pools
+}
+
+// Overcommitted reports the resources whose carve-outs exceed the pool budget,
+// i.e. where sub-tenants have collectively been promised more than the root
+// tenant owns. This should be prevented at admission, but a parent quota that
+// is lowered after children exist can still produce it, so the controller
+// surfaces it.
+//
+// Only resources the budget actually constrains are considered: a child that
+// bounds a resource its parent leaves unbounded is allowed at admission, and an
+// unbounded budget can never be overcommitted, so such resources must not be
+// reported here.
+func (p *Pool) Overcommitted() corev1.ResourceList {
+	over := quota.Subtract(p.CarvedOut, p.Budget)
+	result := corev1.ResourceList{}
+	for name, qty := range over {
+		if _, bounded := p.Budget[name]; !bounded {
+			continue
+		}
+		if qty.Sign() > 0 {
+			result[name] = qty
+		}
+	}
+	return result
+}
+
+// EnforcedHard computes the per-namespace ResourceQuota hard limit that keeps
+// member namespace ns within its pool: the pool's available budget minus what
+// every other member is currently using. Restricted to the resources the pool
+// budget actually constrains.
+//
+// This realises the shared pool at runtime with plain per-namespace
+// ResourceQuotas. It is eventually consistent: concurrent admission across
+// members can briefly overshoot before the controller re-clamps — the trade-off
+// OpenShift's reconciler has and closes with its admission plugin.
+func (p *Pool) EnforcedHard(ns string, usedByNS map[string]corev1.ResourceList) corev1.ResourceList {
+	othersUsed := corev1.ResourceList{}
+	for _, member := range p.Members {
+		if member == ns {
+			continue
+		}
+		othersUsed = quota.Add(othersUsed, usedByNS[member])
+	}
+	hard := quota.SubtractWithNonNegativeResult(p.Available, othersUsed)
+	return quota.Mask(hard, quota.ResourceNames(p.Available))
+}
+
+// ScaleResourceList returns rl scaled by percent (e.g. percent=120 grows every
+// quantity by 20%). It is used to apply the temporary upgrade buffer that keeps
+// pre-existing workloads admissible while operators right-size their quotas
+// after this feature is rolled out.
+func ScaleResourceList(rl corev1.ResourceList, percent int64) corev1.ResourceList {
+	if percent == 100 || len(rl) == 0 {
+		return rl.DeepCopy()
+	}
+	out := make(corev1.ResourceList, len(rl))
+	for name, qty := range rl {
+		// MilliValue keeps sub-unit precision (e.g. CPU millicores) intact.
+		milli := qty.MilliValue() * percent / 100
+		out[name] = *resource.NewMilliQuantity(milli, qty.Format)
+	}
+	return out
+}
diff --git a/internal/controller/tenantquota/pool_test.go b/internal/controller/tenantquota/pool_test.go
new file mode 100644
index 0000000000..8648d95724
--- /dev/null
+++ b/internal/controller/tenantquota/pool_test.go
@@ -0,0 +1,226 @@
+/*
+Copyright 2026 The Cozystack Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package tenantquota
+
+import (
+	"testing"
+
+	corev1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/api/resource"
+)
+
+func rl(pairs map[string]string) corev1.ResourceList {
+	if pairs == nil {
+		return nil
+	}
+	out := corev1.ResourceList{}
+	for k, v := range pairs {
+		out[corev1.ResourceName(k)] = resource.MustParse(v)
+	}
+	return out
+}
+
+func quantityEqual(t *testing.T, got corev1.ResourceList, name, want string) {
+	t.Helper()
+	q := got[corev1.ResourceName(name)]
+	w := resource.MustParse(want)
+	if q.Cmp(w) != 0 {
+		t.Fatalf("%s = %s, want %s", name, q.String(), w.String())
+	}
+}
+
+func TestParentNamespace(t *testing.T) {
+	cases := map[string]string{
+		"tenant-root":        "",
+		"tenant-foo":         "tenant-root",
+		"tenant-foo-bar":     "tenant-foo",
+		"tenant-foo-bar-baz": "tenant-foo-bar",
+		"not-a-tenant":       "",
+	}
+	for in, want := range cases {
+		if got := parentNamespace(in); got != want {
+			t.Errorf("parentNamespace(%q) = %q, want %q", in, got, want)
+		}
+	}
+}
+
+func TestComputePools_CarveOut(t *testing.T) {
+	// tenant-foo (cpu 10) with a bounded child bar (cpu 4) and an unbounded
+	// child qux. foo's pool: budget 10, carved 4, available 6, members
+	// {tenant-foo, tenant-foo-qux}. bar's pool: budget 4, available 4,
+	// members {tenant-foo-bar}.
+	pools := ComputePools([]Tenant{
+		{Namespace: "tenant-foo", Declared: rl(map[string]string{"cpu": "10"})},
+		{Namespace: "tenant-foo-bar", Declared: rl(map[string]string{"cpu": "4"})},
+		{Namespace: "tenant-foo-qux", Declared: nil},
+	})
+
+	foo, ok := pools["tenant-foo"]
+	if !ok {
+		t.Fatal("expected a pool rooted at tenant-foo")
+	}
+	quantityEqual(t, foo.Budget, "cpu", "10")
+	quantityEqual(t, foo.CarvedOut, "cpu", "4")
+	quantityEqual(t, foo.Available, "cpu", "6")
+	if len(foo.Members) != 2 || foo.Members[0] != "tenant-foo" || foo.Members[1] != "tenant-foo-qux" {
+		t.Fatalf("foo.Members = %v, want [tenant-foo tenant-foo-qux]", foo.Members)
+	}
+
+	bar, ok := pools["tenant-foo-bar"]
+	if !ok {
+		t.Fatal("expected a pool rooted at tenant-foo-bar")
+	}
+	quantityEqual(t, bar.Available, "cpu", "4")
+	if len(bar.Members) != 1 || bar.Members[0] != "tenant-foo-bar" {
+		t.Fatalf("bar.Members = %v, want [tenant-foo-bar]", bar.Members)
+	}
+}
+
+func TestComputePools_SharedPoolNoChildQuota(t *testing.T) {
+	// foo (cpu 10) with an unbounded child bar => they share the budget of 10.
+	pools := ComputePools([]Tenant{
+		{Namespace: "tenant-foo", Declared: rl(map[string]string{"cpu": "10"})},
+		{Namespace: "tenant-foo-bar", Declared: nil},
+	})
+	foo := pools["tenant-foo"]
+	if foo == nil {
+		t.Fatal("expected pool at tenant-foo")
+	}
+	quantityEqual(t, foo.Available, "cpu", "10")
+	if len(foo.Members) != 2 {
+		t.Fatalf("foo.Members = %v, want both foo and foo-bar", foo.Members)
+	}
+	if _, ok := pools["tenant-foo-bar"]; ok {
+		t.Fatalf("unbounded child must not form its own pool")
+	}
+}
+
+func TestComputePools_NestedUnboundedIntermediary(t *testing.T) {
+	// foo (cpu 10) -> bar (unbounded) -> baz (cpu 4, bounded).
+	// baz forms its own pool and carves 4 out of foo's pool (its nearest
+	// bounded ancestor is foo, through the unbounded bar).
+	pools := ComputePools([]Tenant{
+		{Namespace: "tenant-foo", Declared: rl(map[string]string{"cpu": "10"})},
+		{Namespace: "tenant-foo-bar", Declared: nil},
+		{Namespace: "tenant-foo-bar-baz", Declared: rl(map[string]string{"cpu": "4"})},
+	})
+	foo := pools["tenant-foo"]
+	quantityEqual(t, foo.CarvedOut, "cpu", "4")
+	quantityEqual(t, foo.Available, "cpu", "6")
+	// foo's pool members: foo itself and the unbounded bar (baz is its own pool).
+	if len(foo.Members) != 2 {
+		t.Fatalf("foo.Members = %v, want foo and foo-bar", foo.Members)
+	}
+	baz := pools["tenant-foo-bar-baz"]
+	if baz == nil {
+		t.Fatal("expected pool at tenant-foo-bar-baz")
+	}
+	quantityEqual(t, baz.Available, "cpu", "4")
+}
+
+// TestComputePools_CarveOutUnboundedResourceDoesNotClamp: a child carving a
+// resource its parent does not bound must not make that resource appear in the
+// parent pool's Available/EnforcedHard — otherwise the parent would be clamped
+// to zero of a resource it never limited.
+func TestComputePools_CarveOutUnboundedResourceDoesNotClamp(t *testing.T) {
+	pools := ComputePools([]Tenant{
+		{Namespace: "tenant-foo", Declared: rl(map[string]string{"cpu": "4"})},
+		{Namespace: "tenant-foo-bar", Declared: rl(map[string]string{"memory": "1Gi"})},
+	})
+	foo := pools["tenant-foo"]
+	if _, ok := foo.Available[corev1.ResourceName("memory")]; ok {
+		t.Fatalf("memory must not appear in Available (parent does not bound it), got %v", foo.Available)
+	}
+	quantityEqual(t, foo.Available, "cpu", "4")
+	hard := foo.EnforcedHard("tenant-foo", nil)
+	if _, ok := hard[corev1.ResourceName("memory")]; ok {
+		t.Fatalf("EnforcedHard must not clamp a resource the parent does not bound, got %v", hard)
+	}
+}
+
+func TestPoolEnforcedHard(t *testing.T) {
+	pools := ComputePools([]Tenant{
+		{Namespace: "tenant-foo", Declared: rl(map[string]string{"cpu": "10"})},
+		{Namespace: "tenant-foo-bar", Declared: nil},
+	})
+	foo := pools["tenant-foo"]
+	used := map[string]corev1.ResourceList{
+		"tenant-foo":     rl(map[string]string{"cpu": "3"}),
+		"tenant-foo-bar": rl(map[string]string{"cpu": "2"}),
+	}
+	// foo's own namespace may use available(10) - others(bar=2) = 8.
+	gotFoo := foo.EnforcedHard("tenant-foo", used)
+	quantityEqual(t, gotFoo, "cpu", "8")
+	// bar may use 10 - foo's 3 = 7.
+	gotBar := foo.EnforcedHard("tenant-foo-bar", used)
+	quantityEqual(t, gotBar, "cpu", "7")
+}
+
+func TestPoolEnforcedHard_ClampsAtZero(t *testing.T) {
+	pools := ComputePools([]Tenant{
+		{Namespace: "tenant-foo", Declared: rl(map[string]string{"cpu": "10"})},
+		{Namespace: "tenant-foo-bar", Declared: nil},
+	})
+	foo := pools["tenant-foo"]
+	used := map[string]corev1.ResourceList{
+		"tenant-foo-bar": rl(map[string]string{"cpu": "100"}), // overshoot
+	}
+	got := foo.EnforcedHard("tenant-foo", used)
+	quantityEqual(t, got, "cpu", "0")
+}
+
+func TestPoolOvercommitted(t *testing.T) {
+	// foo (cpu 10) with two bounded children summing to 11 => overcommitted by 1.
+	pools := ComputePools([]Tenant{
+		{Namespace: "tenant-foo", Declared: rl(map[string]string{"cpu": "10"})},
+		{Namespace: "tenant-foo-bar", Declared: rl(map[string]string{"cpu": "6"})},
+		{Namespace: "tenant-foo-baz", Declared: rl(map[string]string{"cpu": "5"})},
+	})
+	over := pools["tenant-foo"].Overcommitted()
+	quantityEqual(t, over, "cpu", "1")
+	// A within-budget pool reports nothing.
+	pools2 := ComputePools([]Tenant{
+		{Namespace: "tenant-foo", Declared: rl(map[string]string{"cpu": "10"})},
+		{Namespace: "tenant-foo-bar", Declared: rl(map[string]string{"cpu": "4"})},
+	})
+	if over2 := pools2["tenant-foo"].Overcommitted(); len(over2) != 0 {
+		t.Fatalf("expected no overcommit, got %v", over2)
+	}
+}
+
+// TestPoolOvercommitted_IgnoresUnboundedResource: a child that bounds a resource
+// its parent leaves unbounded is allowed at admission, so the parent pool must
+// not be reported as overcommitted on that resource (an unbounded budget cannot
+// be overcommitted).
+func TestPoolOvercommitted_IgnoresUnboundedResource(t *testing.T) {
+	pools := ComputePools([]Tenant{
+		{Namespace: "tenant-foo", Declared: rl(map[string]string{"cpu": "10"})},
+		{Namespace: "tenant-foo-bar", Declared: rl(map[string]string{"memory": "8Gi"})},
+	})
+	if over := pools["tenant-foo"].Overcommitted(); len(over) != 0 {
+		t.Fatalf("expected no overcommit for a resource the parent does not bound, got %v", over)
+	}
+}
+
+func TestScaleResourceList(t *testing.T) {
+	got := ScaleResourceList(rl(map[string]string{"cpu": "10", "memory": "20Gi"}), 120)
+	quantityEqual(t, got, "cpu", "12")
+	quantityEqual(t, got, "memory", "24Gi")
+	// 100% is a no-op copy.
+	same := ScaleResourceList(rl(map[string]string{"cpu": "10"}), 100)
+	quantityEqual(t, same, "cpu", "10")
+}
diff --git a/internal/controller/tenantquota/reconciler.go b/internal/controller/tenantquota/reconciler.go
new file mode 100644
index 0000000000..dddd0fbacf
--- /dev/null
+++ b/internal/controller/tenantquota/reconciler.go
@@ -0,0 +1,294 @@
+/*
+Copyright 2026 The Cozystack Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package tenantquota
+
+import (
+	"context"
+	"strings"
+	"time"
+
+	helmv2 "github.com/fluxcd/helm-controller/api/v2"
+	corev1 "k8s.io/api/core/v1"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/types"
+	"k8s.io/client-go/tools/record"
+	ctrl "sigs.k8s.io/controller-runtime"
+	"sigs.k8s.io/controller-runtime/pkg/builder"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
+	"sigs.k8s.io/controller-runtime/pkg/handler"
+	"sigs.k8s.io/controller-runtime/pkg/log"
+	"sigs.k8s.io/controller-runtime/pkg/predicate"
+	"sigs.k8s.io/controller-runtime/pkg/reconcile"
+
+	appsv1alpha1 "github.com/cozystack/cozystack/pkg/apis/apps/v1alpha1"
+)
+
+const (
+	// tenantKind gates which Applications participate in hierarchical quotas.
+	tenantKind = "Tenant"
+	// chartQuotaName is the per-namespace ResourceQuota the tenant chart renders
+	// from tenant.spec.resourceQuotas (the tenant's declared budget).
+	chartQuotaName = "tenant-quota"
+	// allocatedQuotaName is the controller-owned ResourceQuota that tightens a
+	// namespace down to its share of the parent pool. Kubernetes enforces the
+	// most restrictive of all ResourceQuotas in a namespace, so this binds
+	// whenever it is below the chart quota, without the controller fighting Flux
+	// over the chart-owned object.
+	allocatedQuotaName = "tenant-quota-allocated"
+	// managedByLabel marks the controller-owned ResourceQuotas so they can be
+	// listed and garbage-collected.
+	managedByLabel = "quota.cozystack.io/managed-by"
+	managedByValue = "tenant-quota-controller"
+	// resyncInterval bounds how stale the shared-pool clamp can get if a usage
+	// update is ever missed.
+	resyncInterval = 60 * time.Second
+)
+
+// sweepKey coalesces every watch event into a single full-tree reconcile, since
+// a quota pool spans many namespaces and any change can affect siblings.
+var sweepKey = reconcile.Request{NamespacedName: types.NamespacedName{Name: "tenantquota-sweep"}}
+
+// Reconciler enforces hierarchical tenant quotas at runtime. It is the
+// reconciliation half of the design adapted from OpenShift's ClusterResourceQuota
+// controllers (see the package doc); the declaration-time gate lives in the
+// aggregated apiserver (pkg/registry/apps/application).
+type Reconciler struct {
+	client.Client
+	Scheme   *runtime.Scheme
+	Recorder record.EventRecorder
+	// BufferPercent temporarily inflates every pool budget (e.g. 120 = +20%) so
+	// that tenants already over a freshly-introduced quota keep running while
+	// operators right-size. 0 or 100 disables the buffer.
+	BufferPercent int64
+}
+
+func (r *Reconciler) bufferPercent() int64 {
+	if r.BufferPercent <= 0 {
+		return 100
+	}
+	return r.BufferPercent
+}
+
+// Reconcile rebuilds the whole tenant-quota picture: it reads every tenant's
+// declared budget and current usage, computes the pools, and writes one
+// controller-owned ResourceQuota per pool-member namespace clamping it to its
+// fair share of the pool. Pools that need no tightening beyond the chart-owned
+// quota (a lone tenant with no sub-tenants) are left untouched.
+func (r *Reconciler) Reconcile(ctx context.Context, _ ctrl.Request) (ctrl.Result, error) {
+	logger := log.FromContext(ctx)
+
+	tenants, usedByNS, existing, err := r.snapshot(ctx)
+	if err != nil {
+		return ctrl.Result{}, err
+	}
+
+	pools := ComputePools(tenants)
+
+	desired := map[string]corev1.ResourceList{}
+	for _, p := range pools {
+		if over := p.Overcommitted(); len(over) > 0 {
+			logger.Info("tenant quota pool is overcommitted by sub-tenant carve-outs", "pool", p.Root, "overcommit", over)
+			r.recordOvercommit(ctx, p.Root, over)
+		}
+		// A pool with no carve-outs and a single member is fully covered by the
+		// chart-rendered tenant-quota already; the controller adds nothing.
+		if len(p.CarvedOut) == 0 && len(p.Members) <= 1 {
+			continue
+		}
+		buffered := &Pool{
+			Root:      p.Root,
+			Available: ScaleResourceList(p.Available, r.bufferPercent()),
+			Members:   p.Members,
+		}
+		for _, ns := range p.Members {
+			if existing[ns] {
+				desired[ns] = buffered.EnforcedHard(ns, usedByNS)
+			}
+		}
+	}
+
+	for ns, hard := range desired {
+		if err := r.upsertAllocatedQuota(ctx, ns, hard); err != nil {
+			// A transient namespace race must not wedge the whole sweep.
+			logger.Error(err, "failed to apply allocated quota", "namespace", ns)
+		}
+	}
+	if err := r.gcAllocatedQuotas(ctx, desired); err != nil {
+		logger.Error(err, "failed to garbage-collect stale allocated quotas")
+	}
+
+	return ctrl.Result{RequeueAfter: resyncInterval}, nil
+}
+
+// snapshot reads the whole picture in one pass: the tenant namespaces (from
+// tenant HelmReleases), each tenant's declared budget, current usage per
+// namespace, and the set of existing namespaces.
+//
+// A tenant's declared budget is taken from its chart-rendered "tenant-quota"
+// ResourceQuota (`.spec.hard`), not from the raw tenant.spec.resourceQuotas
+// values. The chart expands the shorthand values into the real quota resource
+// names and applies the cluster's request/limit allocation ratios
+// (cozy-lib.resources.flatten); reading the rendered object keeps the
+// controller's allocated quota in exactly the same key space, so the two
+// quotas compose correctly and the controller never has to replicate that
+// (cluster-configurable) transformation.
+func (r *Reconciler) snapshot(ctx context.Context) (tenants []Tenant, usedByNS map[string]corev1.ResourceList, existing map[string]bool, err error) {
+	releases := &helmv2.HelmReleaseList{}
+	if err = r.List(ctx, releases, client.MatchingLabels{appsv1alpha1.ApplicationKindLabel: tenantKind}); err != nil {
+		return nil, nil, nil, err
+	}
+
+	quotas := &corev1.ResourceQuotaList{}
+	if err = r.List(ctx, quotas); err != nil {
+		return nil, nil, nil, err
+	}
+	declaredByNS := map[string]corev1.ResourceList{}
+	usedByNS = map[string]corev1.ResourceList{}
+	for i := range quotas.Items {
+		rq := &quotas.Items[i]
+		// Multiple ResourceQuotas in a namespace each report the same usage for
+		// a given resource, so usage is merged with a per-resource max (not a
+		// sum) to avoid double counting.
+		usedByNS[rq.Namespace] = maxResourceList(usedByNS[rq.Namespace], rq.Status.Used)
+		if rq.Name == chartQuotaName {
+			declaredByNS[rq.Namespace] = rq.Spec.Hard
+		}
+	}
+
+	nsList := &corev1.NamespaceList{}
+	if err = r.List(ctx, nsList); err != nil {
+		return nil, nil, nil, err
+	}
+	existing = make(map[string]bool, len(nsList.Items))
+	for i := range nsList.Items {
+		existing[nsList.Items[i].Name] = true
+	}
+
+	tenants = make([]Tenant, 0, len(releases.Items))
+	for i := range releases.Items {
+		hr := &releases.Items[i]
+		ns := ownedNamespace(hr.Namespace, strings.TrimPrefix(hr.Name, tenantNamespacePrefix))
+		tenants = append(tenants, Tenant{Namespace: ns, Declared: declaredByNS[ns]})
+	}
+	return tenants, usedByNS, existing, nil
+}
+
+func (r *Reconciler) upsertAllocatedQuota(ctx context.Context, namespace string, hard corev1.ResourceList) error {
+	rq := &corev1.ResourceQuota{ObjectMeta: metav1.ObjectMeta{Name: allocatedQuotaName, Namespace: namespace}}
+	_, err := controllerutil.CreateOrUpdate(ctx, r.Client, rq, func() error {
+		if rq.Labels == nil {
+			rq.Labels = map[string]string{}
+		}
+		rq.Labels[managedByLabel] = managedByValue
+		rq.Labels["internal.cozystack.io/managed-by-cozystack"] = ""
+		rq.Spec.Hard = hard
+		return nil
+	})
+	return err
+}
+
+// gcAllocatedQuotas deletes controller-owned ResourceQuotas in namespaces that
+// are no longer pool members (e.g. a tenant gained its own quota, or was
+// deleted).
+func (r *Reconciler) gcAllocatedQuotas(ctx context.Context, desired map[string]corev1.ResourceList) error {
+	managed := &corev1.ResourceQuotaList{}
+	if err := r.List(ctx, managed, client.MatchingLabels{managedByLabel: managedByValue}); err != nil {
+		return err
+	}
+	for i := range managed.Items {
+		m := &managed.Items[i]
+		if _, keep := desired[m.Namespace]; keep {
+			continue
+		}
+		if err := r.Delete(ctx, m); err != nil && !apierrors.IsNotFound(err) {
+			return err
+		}
+	}
+	return nil
+}
+
+func (r *Reconciler) recordOvercommit(ctx context.Context, rootNamespace string, over corev1.ResourceList) {
+	if r.Recorder == nil {
+		return
+	}
+	ns := &corev1.Namespace{}
+	if err := r.Get(ctx, types.NamespacedName{Name: rootNamespace}, ns); err != nil {
+		return
+	}
+	r.Recorder.Eventf(ns, corev1.EventTypeWarning, "QuotaOvercommitted",
+		"sub-tenant quotas exceed this tenant's budget by %s; lower a sub-tenant quota or raise this tenant's quota", resourceListString(over))
+}
+
+// SetupWithManager wires the controller. Every relevant change (a tenant
+// HelmRelease, a namespace, or a tenant ResourceQuota whose usage moved)
+// coalesces into one full-tree sweep.
+func (r *Reconciler) SetupWithManager(mgr ctrl.Manager) error {
+	toSweep := handler.EnqueueRequestsFromMapFunc(func(context.Context, client.Object) []reconcile.Request {
+		return []reconcile.Request{sweepKey}
+	})
+	tenantReleases := predicate.NewPredicateFuncs(func(o client.Object) bool {
+		return o.GetLabels()[appsv1alpha1.ApplicationKindLabel] == tenantKind
+	})
+	tenantQuotas := predicate.NewPredicateFuncs(func(o client.Object) bool {
+		return o.GetName() == chartQuotaName || o.GetName() == allocatedQuotaName
+	})
+	return ctrl.NewControllerManagedBy(mgr).
+		Named("tenantquota-controller").
+		Watches(&helmv2.HelmRelease{}, toSweep, builder.WithPredicates(tenantReleases)).
+		Watches(&corev1.Namespace{}, toSweep).
+		Watches(&corev1.ResourceQuota{}, toSweep, builder.WithPredicates(tenantQuotas)).
+		Complete(r)
+}
+
+// ownedNamespace maps a tenant HelmRelease (name "<prefix><app>" in namespace
+// hrNamespace) to the namespace that tenant owns. It mirrors
+// REST.computeTenantNamespace in the aggregated apiserver.
+func ownedNamespace(hrNamespace, appName string) string {
+	switch {
+	case hrNamespace == rootTenantNamespace && appName == "root":
+		return rootTenantNamespace
+	case hrNamespace == rootTenantNamespace:
+		return tenantNamespacePrefix + appName
+	default:
+		return hrNamespace + "-" + appName
+	}
+}
+
+// maxResourceList returns the per-resource maximum of a and b.
+func maxResourceList(a, b corev1.ResourceList) corev1.ResourceList {
+	out := corev1.ResourceList{}
+	for k, v := range a {
+		out[k] = v.DeepCopy()
+	}
+	for k, v := range b {
+		if cur, ok := out[k]; !ok || v.Cmp(cur) > 0 {
+			out[k] = v.DeepCopy()
+		}
+	}
+	return out
+}
+
+func resourceListString(rl corev1.ResourceList) string {
+	parts := make([]string, 0, len(rl))
+	for k, v := range rl {
+		parts = append(parts, string(k)+"="+v.String())
+	}
+	return strings.Join(parts, ", ")
+}
diff --git a/internal/controller/tenantquota/reconciler_test.go b/internal/controller/tenantquota/reconciler_test.go
new file mode 100644
index 0000000000..5f19ed1b12
--- /dev/null
+++ b/internal/controller/tenantquota/reconciler_test.go
@@ -0,0 +1,229 @@
+/*
+Copyright 2026 The Cozystack Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package tenantquota
+
+import (
+	"context"
+	"testing"
+
+	helmv2 "github.com/fluxcd/helm-controller/api/v2"
+	corev1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/api/resource"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/types"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/client/fake"
+
+	appsv1alpha1 "github.com/cozystack/cozystack/pkg/apis/apps/v1alpha1"
+)
+
+// tenantHR builds a tenant HelmRelease named "<prefix><app>" in namespace,
+// carrying the kind label the controller selects on. Its values are irrelevant
+// to the controller (the declared budget is read from the chart-rendered
+// ResourceQuota, not the values), so they are omitted.
+func tenantHR(appName, namespace string) *helmv2.HelmRelease {
+	return &helmv2.HelmRelease{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      tenantNamespacePrefix + appName,
+			Namespace: namespace,
+			Labels:    map[string]string{appsv1alpha1.ApplicationKindLabel: tenantKind},
+		},
+	}
+}
+
+func ns(name string) *corev1.Namespace {
+	return &corev1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: name}}
+}
+
+func resourceList(pairs map[string]string) corev1.ResourceList {
+	if pairs == nil {
+		return nil
+	}
+	out := corev1.ResourceList{}
+	for k, v := range pairs {
+		out[corev1.ResourceName(k)] = resource.MustParse(v)
+	}
+	return out
+}
+
+// chartQuota builds the chart-rendered "tenant-quota" ResourceQuota for a
+// bounded tenant: spec.hard is the declared budget, status.used the current
+// usage.
+func chartQuota(namespace string, hard, used map[string]string) *corev1.ResourceQuota {
+	return &corev1.ResourceQuota{
+		ObjectMeta: metav1.ObjectMeta{Name: chartQuotaName, Namespace: namespace},
+		Spec:       corev1.ResourceQuotaSpec{Hard: resourceList(hard)},
+		Status:     corev1.ResourceQuotaStatus{Used: resourceList(used)},
+	}
+}
+
+// usageQuota seeds an arbitrary ResourceQuota that only reports usage, used to
+// give an unbounded (no chart-quota) member some current usage.
+func usageQuota(namespace, name string, used map[string]string) *corev1.ResourceQuota {
+	return &corev1.ResourceQuota{
+		ObjectMeta: metav1.ObjectMeta{Name: name, Namespace: namespace},
+		Status:     corev1.ResourceQuotaStatus{Used: resourceList(used)},
+	}
+}
+
+func newReconciler(t *testing.T, objs ...client.Object) (*Reconciler, client.Client) {
+	t.Helper()
+	scheme := runtime.NewScheme()
+	if err := corev1.AddToScheme(scheme); err != nil {
+		t.Fatalf("corev1 scheme: %v", err)
+	}
+	if err := helmv2.AddToScheme(scheme); err != nil {
+		t.Fatalf("helmv2 scheme: %v", err)
+	}
+	c := fake.NewClientBuilder().WithScheme(scheme).WithObjects(objs...).Build()
+	return &Reconciler{Client: c, Scheme: scheme}, c
+}
+
+func allocatedHard(t *testing.T, c client.Client, namespace, resourceName string) (string, bool) {
+	t.Helper()
+	rq := &corev1.ResourceQuota{}
+	if err := c.Get(context.Background(), types.NamespacedName{Namespace: namespace, Name: allocatedQuotaName}, rq); err != nil {
+		return "", false
+	}
+	q, ok := rq.Spec.Hard[corev1.ResourceName(resourceName)]
+	if !ok {
+		return "", false
+	}
+	return q.String(), true
+}
+
+// TestReconcile_LoneTenantIsNoOp: a tenant with a quota but no sub-tenants is
+// already fully enforced by its chart quota, so the controller writes nothing.
+func TestReconcile_LoneTenantIsNoOp(t *testing.T) {
+	r, c := newReconciler(t,
+		tenantHR("foo", "tenant-root"),
+		ns("tenant-foo"),
+		chartQuota("tenant-foo", map[string]string{"cpu": "10"}, nil),
+	)
+	if _, err := r.Reconcile(context.Background(), sweepKey); err != nil {
+		t.Fatalf("reconcile: %v", err)
+	}
+	if _, ok := allocatedHard(t, c, "tenant-foo", "cpu"); ok {
+		t.Fatalf("lone tenant must not get a controller-owned allocated quota")
+	}
+}
+
+// TestReconcile_SharedPool: foo (cpu 10) with an unbounded child bar. They share
+// the budget, so both members get an allocated quota clamping them to it.
+func TestReconcile_SharedPool(t *testing.T) {
+	r, c := newReconciler(t,
+		tenantHR("foo", "tenant-root"),
+		tenantHR("bar", "tenant-foo"),
+		ns("tenant-foo"), ns("tenant-foo-bar"),
+		chartQuota("tenant-foo", map[string]string{"cpu": "10"}, nil),
+	)
+	if _, err := r.Reconcile(context.Background(), sweepKey); err != nil {
+		t.Fatalf("reconcile: %v", err)
+	}
+	if got, ok := allocatedHard(t, c, "tenant-foo", "cpu"); !ok || got != "10" {
+		t.Fatalf("tenant-foo allocated cpu = %q (ok=%v), want 10", got, ok)
+	}
+	if got, ok := allocatedHard(t, c, "tenant-foo-bar", "cpu"); !ok || got != "10" {
+		t.Fatalf("tenant-foo-bar allocated cpu = %q (ok=%v), want 10", got, ok)
+	}
+}
+
+// TestReconcile_SharedPoolWithUsage: usage in one member shrinks the other
+// member's clamp so their sum stays within the pool budget.
+func TestReconcile_SharedPoolWithUsage(t *testing.T) {
+	r, c := newReconciler(t,
+		tenantHR("foo", "tenant-root"),
+		tenantHR("bar", "tenant-foo"),
+		ns("tenant-foo"), ns("tenant-foo-bar"),
+		chartQuota("tenant-foo", map[string]string{"cpu": "10"}, map[string]string{"cpu": "4"}),
+		usageQuota("tenant-foo-bar", "some-quota", map[string]string{"cpu": "3"}),
+	)
+	if _, err := r.Reconcile(context.Background(), sweepKey); err != nil {
+		t.Fatalf("reconcile: %v", err)
+	}
+	if got, _ := allocatedHard(t, c, "tenant-foo", "cpu"); got != "7" { // 10 - bar's 3
+		t.Fatalf("tenant-foo allocated cpu = %q, want 7", got)
+	}
+	if got, _ := allocatedHard(t, c, "tenant-foo-bar", "cpu"); got != "6" { // 10 - foo's 4
+		t.Fatalf("tenant-foo-bar allocated cpu = %q, want 6", got)
+	}
+}
+
+// TestReconcile_CarveOut: foo (cpu 10) with a bounded child bar (cpu 4). foo's
+// own namespace is clamped to the residual 6; bar is a lone pool already
+// enforced by its own chart quota, so it gets nothing extra.
+func TestReconcile_CarveOut(t *testing.T) {
+	r, c := newReconciler(t,
+		tenantHR("foo", "tenant-root"),
+		tenantHR("bar", "tenant-foo"),
+		ns("tenant-foo"), ns("tenant-foo-bar"),
+		chartQuota("tenant-foo", map[string]string{"cpu": "10"}, nil),
+		chartQuota("tenant-foo-bar", map[string]string{"cpu": "4"}, nil),
+	)
+	if _, err := r.Reconcile(context.Background(), sweepKey); err != nil {
+		t.Fatalf("reconcile: %v", err)
+	}
+	if got, _ := allocatedHard(t, c, "tenant-foo", "cpu"); got != "6" { // 10 - 4 carve-out
+		t.Fatalf("tenant-foo allocated cpu = %q, want 6", got)
+	}
+	if _, ok := allocatedHard(t, c, "tenant-foo-bar", "cpu"); ok {
+		t.Fatalf("bounded lone child tenant-foo-bar must not get an allocated quota")
+	}
+}
+
+// TestReconcile_Buffer: the upgrade buffer inflates the enforced clamp.
+func TestReconcile_Buffer(t *testing.T) {
+	r, c := newReconciler(t,
+		tenantHR("foo", "tenant-root"),
+		tenantHR("bar", "tenant-foo"),
+		ns("tenant-foo"), ns("tenant-foo-bar"),
+		chartQuota("tenant-foo", map[string]string{"cpu": "10"}, nil),
+	)
+	r.BufferPercent = 120
+	if _, err := r.Reconcile(context.Background(), sweepKey); err != nil {
+		t.Fatalf("reconcile: %v", err)
+	}
+	if got, _ := allocatedHard(t, c, "tenant-foo", "cpu"); got != "12" { // 10 * 120%
+		t.Fatalf("tenant-foo allocated cpu = %q, want 12", got)
+	}
+}
+
+// TestReconcile_GarbageCollect: a stale allocated quota in a namespace that is
+// no longer enforced is removed.
+func TestReconcile_GarbageCollect(t *testing.T) {
+	stale := &corev1.ResourceQuota{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      allocatedQuotaName,
+			Namespace: "tenant-gone",
+			Labels:    map[string]string{managedByLabel: managedByValue},
+		},
+	}
+	r, c := newReconciler(t,
+		tenantHR("foo", "tenant-root"),
+		ns("tenant-foo"), ns("tenant-gone"),
+		chartQuota("tenant-foo", map[string]string{"cpu": "10"}, nil),
+		stale,
+	)
+	if _, err := r.Reconcile(context.Background(), sweepKey); err != nil {
+		t.Fatalf("reconcile: %v", err)
+	}
+	rq := &corev1.ResourceQuota{}
+	if err := c.Get(context.Background(), types.NamespacedName{Namespace: "tenant-gone", Name: allocatedQuotaName}, rq); err == nil {
+		t.Fatalf("stale allocated quota in tenant-gone should have been garbage-collected")
+	}
+}
diff --git a/internal/controller/testdata/datavolume-http-404.json b/internal/controller/testdata/datavolume-http-404.json
new file mode 100644
index 0000000000..080e11dc3d
--- /dev/null
+++ b/internal/controller/testdata/datavolume-http-404.json
@@ -0,0 +1,62 @@
+{
+  "apiVersion": "cdi.kubevirt.io/v1beta1",
+  "kind": "DataVolume",
+  "metadata": {
+    "annotations": {
+      "cdi.kubevirt.io/storage.usePopulator": "true",
+      "vm-disk.cozystack.io/optical": "false"
+    },
+    "labels": {
+      "app.kubernetes.io/instance": "vm-disk-test",
+      "app.kubernetes.io/managed-by": "Helm"
+    },
+    "name": "vm-disk-test",
+    "namespace": "default"
+  },
+  "spec": {
+    "contentType": "kubevirt",
+    "source": {
+      "http": {
+        "url": "https://images.example.com/missing.img"
+      }
+    },
+    "storage": {
+      "resources": {
+        "requests": {
+          "storage": "1Gi"
+        }
+      },
+      "storageClassName": "replicated"
+    }
+  },
+  "status": {
+    "claimName": "vm-disk-test",
+    "conditions": [
+      {
+        "lastHeartbeatTime": "2026-09-30T13:19:48Z",
+        "lastTransitionTime": "2026-09-30T13:19:32Z",
+        "message": "target PVC vm-disk-test Pending and [prime-9ea0ceb1-e03b-48fa-9944-3de75e766f6b] : Unable to connect to http data source: expected status code 200, got 404. Status: 404 Not Found",
+        "reason": "Pending",
+        "status": "False",
+        "type": "Bound"
+      },
+      {
+        "lastHeartbeatTime": "2026-10-07T14:50:42Z",
+        "lastTransitionTime": "2026-09-30T13:19:32Z",
+        "status": "False",
+        "type": "Ready"
+      },
+      {
+        "lastHeartbeatTime": "2026-10-07T14:50:42Z",
+        "lastTransitionTime": "2026-10-07T14:50:42Z",
+        "message": "Unable to connect to http data source: expected status code 200, got 404. Status: 404 Not Found",
+        "reason": "Error",
+        "status": "False",
+        "type": "Running"
+      }
+    ],
+    "phase": "ImportInProgress",
+    "progress": "N/A",
+    "restartCount": 1988
+  }
+}
diff --git a/internal/controller/wildcardsecret/reconciler.go b/internal/controller/wildcardsecret/reconciler.go
new file mode 100644
index 0000000000..7758fd48b0
--- /dev/null
+++ b/internal/controller/wildcardsecret/reconciler.go
@@ -0,0 +1,603 @@
+/*
+Copyright 2026 The Cozystack Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// Package wildcardsecret replicates the operator-provided wildcard TLS
+// Secret into the tenant namespaces that terminate TLS, so per-tenant
+// ingress controllers and Gateways can serve it from their own namespace
+// without any cross-namespace Secret read.
+//
+// The root-tenant MVP wired the root tenant to an operator-supplied
+// wildcard Secret: only the Secret NAME rides the platform values channel
+// (never the key material), the root ingress controller serves it via
+// --default-ssl-certificate, and the root Gateway references it in
+// certMode=existingSecret. That MVP is same-namespace only. Child tenants
+// run their own ingress controller / Gateway in their own namespace under
+// a default-deny policy, so the one operator Secret must be replicated
+// into each tenant namespace that owns a termination point.
+//
+// This controller does that replication with no extra operator input: it
+// reads the same platform values channel the consumers read
+// (cozy-system/cozystack-values), takes the wildcard Secret name from
+// _cluster.wildcard-secret-name, the publishing namespace from
+// _cluster.expose-ingress, and mirrors that Secret into every tenant
+// namespace that owns a termination point. A namespace owning a Gateway
+// counts as one only while something there still terminates TLS: a
+// TenantGateway carries certMode=edge when the class it selected ends TLS
+// at the provider's edge, and a namespace whose Gateways are all at the
+// edge has no consumer for the replica, so it does not get one. That is a
+// statement about the REPLICA and not about the namespace being key-free —
+// see ownsTerminationPoint for what stays behind. Because the source is
+// derived
+// from the same value that makes the consumers reference it, the replica
+// is created whenever the consumers expect it — no manual labelling, and
+// no window where a child controller references a Secret that will never
+// exist. Clearing _cluster.wildcard-secret-name (disabling the feature) is
+// the only path that prunes EVERY replica; moving a tenant onto an
+// edge-terminated class prunes that tenant's replica alone. A values channel
+// that is absent
+// or unreadable, or a source Secret that is merely missing or mistyped,
+// leaves existing replicas in place — so a transient gap, a delete+recreate
+// rotation, or a misconfiguration never drops tenant TLS.
+//
+// Cache footprint: the manager's Secret informer is scoped (see
+// SecretCacheByObject, wired in cmd/cozystack-controller/main.go) to the
+// managed replicas and the values channel only — never every Secret in the
+// cluster. Most reads in Reconcile are served from the cache to keep apiserver
+// load down: the watched values channel, the namespace list, and the managed-
+// replica prune list. Only two reads go through the uncached APIReader — the
+// dynamic-source Get (the source's name is not in the scoped cache) and the
+// foreign-collision check (a colliding Secret carries no CopyLabel, so its
+// labels are absent from the scoped cache). The source is not watched; an
+// in-place rotation is picked up by the periodic resync (sourceResyncInterval).
+//
+// Invariant preserved from the MVP: the wildcard is deliberately
+// distributed to tenant namespaces, but no tenant RBAC is widened — every
+// consumer reads only its own-namespace copy. The replica does carry the
+// wildcard private key into each terminating tenant namespace; that is the
+// same exposure as the per-host ACME Secret it replaces (which already
+// lived there), except the key is now shared across tenants.
+package wildcardsecret
+
+import (
+	"bytes"
+	"context"
+	"errors"
+	"fmt"
+	"maps"
+	"time"
+
+	corev1 "k8s.io/api/core/v1"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/fields"
+	"k8s.io/apimachinery/pkg/labels"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/types"
+	utilerrors "k8s.io/apimachinery/pkg/util/errors"
+	"k8s.io/client-go/tools/record"
+	ctrl "sigs.k8s.io/controller-runtime"
+	"sigs.k8s.io/controller-runtime/pkg/cache"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/handler"
+	"sigs.k8s.io/controller-runtime/pkg/log"
+	"sigs.k8s.io/controller-runtime/pkg/reconcile"
+	sigsyaml "sigs.k8s.io/yaml"
+
+	gatewayv1alpha1 "github.com/cozystack/cozystack/api/gateway/v1alpha1"
+)
+
+const (
+	// platformValues* identify the system-scope values channel the
+	// platform writes (packages/core/platform/templates/apps.yaml). The
+	// controller reads the wildcard source identity from it.
+	platformValuesNamespace = "cozy-system"
+	platformValuesName      = "cozystack-values"
+	platformValuesKey       = "values.yaml"
+
+	// CopyLabel marks a Secret as a controller-managed replica. The
+	// reconciler only ever updates or deletes Secrets bearing this label,
+	// so a user Secret that happens to share the name is never touched. It
+	// is also the cache scope (see SecretCacheByObject).
+	CopyLabel = "cozystack.io/wildcard-secret-copy"
+
+	// SourceRefAnnotation records the "<namespace>/<name>" of the source
+	// on every replica for traceability.
+	SourceRefAnnotation = "cozystack.io/wildcard-secret-source"
+
+	// ingressOwnerLabel / gatewayOwnerLabel name the tenant namespace
+	// labels written by the apps/tenant chart. A value pointing at an
+	// ancestor means the namespace merely inherits and does not run its
+	// own controller / Gateway. Label equality with the namespace's own
+	// name is therefore necessary for owning a termination point, and for
+	// the ingress label it is also sufficient; for the Gateway label it is
+	// not, since a Gateway on an edge-terminated class terminates nothing
+	// — ownsTerminationPoint has the rest of the rule.
+	ingressOwnerLabel = "namespace.cozystack.io/ingress"
+	gatewayOwnerLabel = "namespace.cozystack.io/gateway"
+
+	// defaultPublishingNamespace is the fallback publishing namespace when
+	// the values channel does not carry expose-ingress.
+	defaultPublishingNamespace = "tenant-root"
+
+	// sourceResyncInterval bounds how stale a tenant replica can be after
+	// the operator rotates the source Secret in place. The source is not
+	// watched (it is not cached — see SecretCacheByObject), so the active
+	// reconcile re-reads it on this cadence to propagate a rotation or pick
+	// up the source first appearing. The publishing tenant serves the
+	// source directly with no lag; only the replicated tenants see up to
+	// this delay, which is immaterial for certificate rotation (the
+	// previous certificate stays valid well past it).
+	sourceResyncInterval = 5 * time.Minute
+)
+
+var (
+	// configKey is the singleton reconcile key. Every watched event maps
+	// to it; Reconcile re-reads the platform values channel and performs a
+	// full sync, so the request payload itself is irrelevant.
+	configKey = types.NamespacedName{Namespace: platformValuesNamespace, Name: platformValuesName}
+
+	// errForeignCollision marks the one non-retryable per-namespace
+	// outcome: a Secret of the target name already exists and is not a
+	// managed replica. It is skipped, never requeued — retrying cannot
+	// help and must not clobber a user Secret.
+	errForeignCollision = errors.New("a non-managed Secret of the same name exists")
+)
+
+// Reconciler replicates the operator wildcard Secret into tenant
+// termination namespaces.
+type Reconciler struct {
+	client.Client
+	// Reader is the manager's uncached APIReader. It is used only for the two
+	// reads the scoped cache cannot serve — the operator source (dynamic name,
+	// not in the cache) and the foreign-collision check (a colliding Secret
+	// carries no CopyLabel, so its labels are absent from the cache). Every
+	// other read (the values channel, namespaces, and managed replicas) goes
+	// through the embedded cached Client to keep apiserver load down.
+	Reader client.Reader
+	// Scheme is kept for construction symmetry with the other reconcilers
+	// in this manager (all built with Client+Scheme in main.go). It is
+	// intentionally unused here: replicas are tracked by label and
+	// annotation, not owner references — a cross-namespace owner reference
+	// (replica in a tenant namespace, source elsewhere) would be invalid.
+	Scheme *runtime.Scheme
+	// Recorder surfaces a Warning Event when a foreign Secret collision
+	// makes the controller skip a namespace, so the otherwise-silent skip
+	// is visible via `kubectl get events -n <namespace>` without reading
+	// controller logs.
+	Recorder record.EventRecorder
+}
+
+// platformValues is the subset of the _cluster channel this controller
+// needs: which Secret is the operator wildcard, and which namespace
+// publishes it.
+type platformValues struct {
+	Cluster struct {
+		// WildcardSecretName is a pointer so an ABSENT key (nil) — a
+		// partial or older values channel — is distinguishable from an
+		// explicitly empty value (a deliberate disable). Only the explicit
+		// empty prunes; absence keeps replicas.
+		WildcardSecretName *string `json:"wildcard-secret-name"`
+		ExposeIngress      string  `json:"expose-ingress"`
+	} `json:"_cluster"`
+}
+
+// +kubebuilder:rbac:groups="",resources=secrets,verbs=get;list;watch;create;update;patch;delete
+// +kubebuilder:rbac:groups="",resources=namespaces,verbs=get;list;watch
+// +kubebuilder:rbac:groups=gateway.cozystack.io,resources=tenantgateways,verbs=get;list;watch
+
+// Reconcile performs a full sync: it reads the wildcard source identity
+// from the platform values channel, mirrors the source into every tenant
+// namespace that owns a termination point, and prunes replicas that no
+// longer belong. Only an explicit disable (channel present, empty wildcard
+// name) prunes everything; an absent channel or an absent/non-TLS source
+// keeps existing replicas. While the feature is active the result requeues
+// on sourceResyncInterval so an in-place source rotation propagates even
+// though the source is not watched.
+func (r *Reconciler) Reconcile(ctx context.Context, _ ctrl.Request) (ctrl.Result, error) {
+	logger := log.FromContext(ctx)
+
+	name, pubNS, present, err := r.readConfig(ctx)
+	if err != nil {
+		return ctrl.Result{}, err
+	}
+	if !present {
+		// The platform values channel is absent or unreadable, so the
+		// desired state is unknown. Keep existing replicas — a transient
+		// loss of the channel must not drop tenant TLS cluster-wide. The
+		// channel is watched, so its reappearance re-triggers; no requeue.
+		logger.Info("platform values channel absent or unreadable; keeping existing replicas")
+		return ctrl.Result{}, nil
+	}
+	if name == "" {
+		// Feature explicitly disabled: the channel is present and the
+		// operator cleared the wildcard name → tear every replica down.
+		// This is the ONLY destructive, prune-everything path. The channel
+		// is watched, so a re-enable re-triggers; no requeue.
+		return ctrl.Result{}, r.pruneCopies(ctx, nil, "", "")
+	}
+
+	// Feature active. The source is not cached/watched (its name is
+	// dynamic), so from here the result requeues on sourceResyncInterval to
+	// pick up an in-place rotation or the source first appearing.
+	src := &corev1.Secret{}
+	err = r.Reader.Get(ctx, types.NamespacedName{Namespace: pubNS, Name: name}, src)
+	switch {
+	case apierrors.IsNotFound(err):
+		// Named but absent: not yet created, mid-rotation, or the publishing
+		// namespace was misresolved (the overloaded expose-ingress — see
+		// readConfig). Keep existing replicas and poll. Name the resolved
+		// namespace prominently so an operator can tell a one-off "not
+		// created yet" from a persistent split-deployment misconfiguration
+		// (where the source lives in a different namespace than expose-
+		// ingress resolves to) — otherwise the feature would silently no-op.
+		logger.Info("wildcard source Secret not found in the resolved publishing namespace; keeping existing replicas and retrying — if this persists, verify expose-ingress resolves to the namespace that holds the source",
+			"publishingNamespace", pubNS, "sourceName", name)
+		return ctrl.Result{RequeueAfter: sourceResyncInterval}, nil
+	case err != nil:
+		return ctrl.Result{}, fmt.Errorf("get source secret %s/%s: %w", pubNS, name, err)
+	}
+	if src.Type != corev1.SecretTypeTLS {
+		// Misconfigured source type — keep replicas, poll for a fix.
+		logger.Info("wildcard source is not a kubernetes.io/tls Secret; keeping existing replicas",
+			"secret", pubNS+"/"+name, "type", src.Type)
+		return ctrl.Result{RequeueAfter: sourceResyncInterval}, nil
+	}
+
+	targets, err := r.terminationNamespaces(ctx, pubNS)
+	if err != nil {
+		return ctrl.Result{}, err
+	}
+
+	var errs []error
+	for _, ns := range targets {
+		if err := r.upsertCopy(ctx, src, ns); err != nil {
+			// A foreign-Secret collision is terminal for that namespace —
+			// skip it, do not requeue on it. Any other error is transient,
+			// so aggregate and return it for a back-off requeue.
+			if errors.Is(err, errForeignCollision) {
+				logger.Info("skipping wildcard replica: a non-managed Secret of the same name exists", "namespace", ns)
+				continue
+			}
+			errs = append(errs, err)
+		}
+	}
+	if err := r.pruneCopies(ctx, targets, pubNS, name); err != nil {
+		errs = append(errs, err)
+	}
+	if err := utilerrors.NewAggregate(errs); err != nil {
+		// Surface transient errors for an immediate back-off requeue; the
+		// periodic resync is the steady-state fallback.
+		return ctrl.Result{}, err
+	}
+	return ctrl.Result{RequeueAfter: sourceResyncInterval}, nil
+}
+
+// readConfig returns the wildcard source name, the publishing namespace,
+// and whether the platform values channel was present and readable. An
+// absent or unreadable channel — or a present channel that omits the
+// wildcard-secret-name key — returns present=false (desired state unknown
+// → the caller keeps existing replicas), which is deliberately distinct
+// from a present channel carrying an explicitly empty name (an explicit
+// disable that prunes).
+//
+// The publishing namespace is read from _cluster.expose-ingress. NOTE:
+// packages/core/platform/templates/apps.yaml documents that expose-ingress
+// is overloaded — it is simultaneously an ingressClassName and the
+// publishing namespace, and the two coincide only in the default
+// deployment (tenant-root). This controller relies on the publishing-
+// namespace meaning, matching the MVP ingress/gateway consumers. If a
+// future deployment ever splits the two (a separate
+// _cluster.gateway-namespace key, as that comment anticipates), this read
+// must follow it. Until then a split would make the source resolve in the
+// wrong namespace and surface as a NotFound source — which Reconcile
+// handles non-destructively (replicas are kept, never pruned, on absence)
+// and logs a warning naming the namespace it looked in.
+func (r *Reconciler) readConfig(ctx context.Context) (name, namespace string, present bool, err error) {
+	values := &corev1.Secret{}
+	err = r.Get(ctx, configKey, values)
+	if apierrors.IsNotFound(err) {
+		return "", "", false, nil
+	}
+	if err != nil {
+		return "", "", false, fmt.Errorf("get platform values: %w", err)
+	}
+	raw, ok := values.Data[platformValuesKey]
+	if !ok {
+		return "", "", false, nil
+	}
+	var pv platformValues
+	if err := sigsyaml.Unmarshal(raw, &pv); err != nil {
+		// A malformed channel is surfaced as an error (Reconcile bails
+		// before any prune and requeues), never as a disable.
+		return "", "", false, fmt.Errorf("parse platform values: %w", err)
+	}
+	if pv.Cluster.WildcardSecretName == nil {
+		// The wildcard-secret-name key is absent (a partial or older
+		// values channel). Desired state is unknown → present=false so the
+		// caller keeps existing replicas; this is never a disable. The
+		// platform always writes the key, so this guards a misrender.
+		return "", "", false, nil
+	}
+	ns := pv.Cluster.ExposeIngress
+	if ns == "" {
+		ns = defaultPublishingNamespace
+	}
+	return *pv.Cluster.WildcardSecretName, ns, true, nil
+}
+
+// terminationNamespaces returns every tenant namespace that owns a TLS
+// termination point, excluding the publishing namespace (the operator
+// Secret already lives there and must not be overwritten by a replica).
+func (r *Reconciler) terminationNamespaces(ctx context.Context, sourceNS string) ([]string, error) {
+	list := &corev1.NamespaceList{}
+	if err := r.List(ctx, list); err != nil {
+		return nil, fmt.Errorf("list namespaces: %w", err)
+	}
+	var out []string
+	for i := range list.Items {
+		ns := &list.Items[i]
+		if ns.Name == sourceNS {
+			continue
+		}
+		if ns.DeletionTimestamp != nil {
+			// The namespace is terminating (a tenant teardown). Its owner
+			// labels linger until GC completes, but the API server forbids
+			// creating a replica in a Terminating namespace; skip it so a
+			// routine tenant deletion does not produce a burst of
+			// forbidden-error requeues.
+			continue
+		}
+		terminates, err := r.ownsTerminationPoint(ctx, ns)
+		if err != nil {
+			return nil, err
+		}
+		if terminates {
+			out = append(out, ns.Name)
+		}
+	}
+	return out, nil
+}
+
+// ownsTerminationPoint reports whether a namespace runs its own ingress
+// controller or Gateway — true exactly when an owner label equals the
+// namespace's own name. A Gateway owner terminates nothing when the class
+// it selected ends TLS at its provider's edge: its listeners are plain HTTP
+// and reference no Secret, so the replicated wildcard has no consumer left
+// there and is pruned on the next reconcile. That prunes the REPLICA, not
+// every key in the namespace: the TenantGateway controller deletes the
+// Certificate objects on the switch, and cert-manager ships here with
+// enableCertificateOwnerRef: false, so each cert's own Secret stays behind
+// unreferenced — the same leftover every other mode transition produces.
+// The mode is read off the
+// tenant's own TenantGateway rather than a cluster-wide value, because the
+// class is a per-tenant choice. A namespace whose TenantGateway cannot be
+// read is treated as terminating, so a transient API error never prunes a
+// key a Gateway may still be serving.
+func (r *Reconciler) ownsTerminationPoint(ctx context.Context, ns *corev1.Namespace) (bool, error) {
+	if ns.Labels[ingressOwnerLabel] == ns.Name {
+		return true, nil
+	}
+	if ns.Labels[gatewayOwnerLabel] != ns.Name {
+		return false, nil
+	}
+	list := &gatewayv1alpha1.TenantGatewayList{}
+	if err := r.List(ctx, list, client.InNamespace(ns.Name)); err != nil {
+		// true alongside the error, so the safe answer does not depend on
+		// the caller aborting: whoever later decides to carry on past a
+		// per-namespace read failure keeps the key rather than pruning it.
+		return true, fmt.Errorf("list TenantGateways in %s: %w", ns.Name, err)
+	}
+	// The question is whether ANY Gateway in this namespace terminates TLS,
+	// not whether some object happens to be at the edge: one stale or
+	// hand-made TenantGateway on an edge class must not withdraw the key
+	// from a namespace whose other Gateway is still serving it. An empty
+	// list keeps the key for the same reason as a read failure above — the
+	// namespace carries the owner label, so something there is expected to
+	// terminate even if its TenantGateway has not appeared yet.
+	if len(list.Items) == 0 {
+		return true, nil
+	}
+	for i := range list.Items {
+		if list.Items[i].Spec.CertMode != gatewayv1alpha1.CertModeEdge {
+			return true, nil
+		}
+	}
+	return false, nil
+}
+
+// upsertCopy creates or refreshes the replica of src in namespace ns. It
+// returns errForeignCollision (wrapped) when a Secret of the same name
+// exists that the controller does not own, so a pre-existing user Secret
+// is preserved. The existence check goes through the uncached Reader so a
+// foreign Secret (absent from the replica-scoped cache) is still seen.
+func (r *Reconciler) upsertCopy(ctx context.Context, src *corev1.Secret, ns string) error {
+	existing := &corev1.Secret{}
+	err := r.Reader.Get(ctx, types.NamespacedName{Namespace: ns, Name: src.Name}, existing)
+	switch {
+	case apierrors.IsNotFound(err):
+		replica := &corev1.Secret{
+			ObjectMeta: metav1.ObjectMeta{
+				Namespace:   ns,
+				Name:        src.Name,
+				Labels:      map[string]string{CopyLabel: "true"},
+				Annotations: map[string]string{SourceRefAnnotation: sourceRef(src)},
+			},
+			Type: src.Type,
+			Data: cloneData(src.Data),
+		}
+		if err := r.Create(ctx, replica); err != nil {
+			return fmt.Errorf("create replica in %s: %w", ns, err)
+		}
+		return nil
+	case err != nil:
+		return fmt.Errorf("get replica in %s: %w", ns, err)
+	}
+
+	if existing.Labels[CopyLabel] != "true" {
+		// Surface the skip as a Warning Event on the colliding Secret (which
+		// lives in the affected namespace), so an operator sees it via
+		// `kubectl get events -n <ns>` rather than only in controller logs.
+		if r.Recorder != nil {
+			r.Recorder.Eventf(existing, corev1.EventTypeWarning, "WildcardReplicaSkipped",
+				"a Secret named %q already exists and is not managed by the wildcard-secret controller; the operator wildcard certificate is not served in this namespace until that Secret is removed", src.Name)
+		}
+		return fmt.Errorf("%w: %s/%s", errForeignCollision, ns, src.Name)
+	}
+
+	desired := cloneData(src.Data)
+	if maps.EqualFunc(existing.Data, desired, bytes.Equal) &&
+		existing.Annotations[SourceRefAnnotation] == sourceRef(src) {
+		return nil
+	}
+	// Re-assert the marker label, the data, and the back-reference so the
+	// replica's managed-by invariant is explicit even after an update.
+	if existing.Labels == nil {
+		existing.Labels = map[string]string{}
+	}
+	existing.Labels[CopyLabel] = "true"
+	if existing.Annotations == nil {
+		existing.Annotations = map[string]string{}
+	}
+	existing.Annotations[SourceRefAnnotation] = sourceRef(src)
+	existing.Data = desired
+	if err := r.Update(ctx, existing); err != nil {
+		return fmt.Errorf("update replica in %s: %w", ns, err)
+	}
+	return nil
+}
+
+// pruneCopies deletes every managed replica that is not the current source
+// name in a kept namespace. With keep == nil (or sourceName == "") it
+// removes all managed replicas — used when the feature is off or the
+// source is gone. It NEVER deletes the Secret at the source location
+// (sourceNS/sourceName), even if that Secret carries the copy label: the
+// source namespace is excluded from keep, so without this guard a stale
+// replica sitting at the source slot (e.g. after the publishing namespace
+// switched to a former target) would be the very Secret the controller
+// reads as its source, and deleting it would flap the source.
+func (r *Reconciler) pruneCopies(ctx context.Context, keep []string, sourceNS, sourceName string) error {
+	list := &corev1.SecretList{}
+	if err := r.List(ctx, list, client.MatchingLabels{CopyLabel: "true"}); err != nil {
+		return fmt.Errorf("list wildcard replicas: %w", err)
+	}
+	keepSet := make(map[string]struct{}, len(keep))
+	for _, ns := range keep {
+		keepSet[ns] = struct{}{}
+	}
+	var errs []error
+	for i := range list.Items {
+		replica := &list.Items[i]
+		if sourceName != "" && replica.Namespace == sourceNS && replica.Name == sourceName {
+			continue
+		}
+		if _, kept := keepSet[replica.Namespace]; kept && replica.Name == sourceName {
+			continue
+		}
+		if err := r.Delete(ctx, replica); err != nil && !apierrors.IsNotFound(err) {
+			errs = append(errs, fmt.Errorf("delete stale replica %s/%s: %w", replica.Namespace, replica.Name, err))
+		}
+	}
+	return utilerrors.NewAggregate(errs)
+}
+
+func sourceRef(src *corev1.Secret) string {
+	return src.Namespace + "/" + src.Name
+}
+
+func cloneData(in map[string][]byte) map[string][]byte {
+	out := make(map[string][]byte, len(in))
+	for k, v := range in {
+		b := make([]byte, len(v))
+		copy(b, v)
+		out[k] = b
+	}
+	return out
+}
+
+// SecretCacheByObject returns the cache scoping the cozystack-controller
+// manager must apply to corev1.Secret so this controller does not cache
+// every Secret in the cluster. It caches only what must be WATCHED:
+// managed replicas (CopyLabel, in any namespace) and the platform values
+// channel (cozy-system/cozystack-values). The operator source Secret is
+// deliberately NOT cached — its name is dynamic, so it cannot be scoped by
+// selector; it is read via the uncached APIReader and its rotation is
+// picked up by the periodic resync. The values channel carries no tenant
+// private keys, so the only key material the cache holds is the replicas',
+// which already exist in tenant namespaces.
+func SecretCacheByObject() cache.ByObject {
+	return cache.ByObject{
+		Namespaces: map[string]cache.Config{
+			cache.AllNamespaces: {
+				LabelSelector: labels.SelectorFromSet(labels.Set{CopyLabel: "true"}),
+			},
+			platformValuesNamespace: {
+				FieldSelector: fields.OneTermEqualSelector("metadata.name", platformValuesName),
+			},
+		},
+	}
+}
+
+// watchedTypes returns the object kinds whose events enqueue the config
+// key, in the order SetupWithManager registers them:
+//
+//   - Secret — replica self-heal and feature enable/disable. The
+//     manager's Secret cache is scoped (SecretCacheByObject) to managed
+//     replicas plus the values channel, so this watch only ever delivers
+//     those two.
+//   - Namespace — a tenant gains or loses a termination point.
+//   - TenantGateway — a namespace stops being a termination point the
+//     moment its TenantGateway moves onto an edge-terminated class, and
+//     that object is what this controller reads to decide. Without the
+//     watch the withdrawal waits for the periodic resync, leaving the
+//     wildcard private key in a namespace that no longer serves it for
+//     up to sourceResyncInterval.
+//
+// The operator source Secret is deliberately absent: its name is dynamic
+// so the cache cannot scope it, and its rotation is picked up by the
+// result requeue in Reconcile.
+//
+// The set is a function rather than a chain of builder calls because the
+// builder exposes nothing about what it watched, so a dropped watch is
+// invisible to a test that goes through SetupWithManager.
+func watchedTypes() []client.Object {
+	return []client.Object{
+		&corev1.Secret{},
+		&corev1.Namespace{},
+		&gatewayv1alpha1.TenantGateway{},
+	}
+}
+
+// SetupWithManager wires the reconciler as a singleton: every event from
+// every type in watchedTypes maps to the one config key.
+func (r *Reconciler) SetupWithManager(mgr ctrl.Manager) error {
+	toSingleton := handler.EnqueueRequestsFromMapFunc(enqueueConfigKey)
+	b := ctrl.NewControllerManagedBy(mgr).Named("wildcardsecret")
+	for _, obj := range watchedTypes() {
+		b = b.Watches(obj, toSingleton)
+	}
+	return b.Complete(r)
+}
+
+// enqueueConfigKey maps every watched event to the single config key, so
+// any relevant change — a managed replica edited or deleted out of band,
+// the values channel toggling the feature, a namespace gaining or losing a
+// termination point, or a TenantGateway changing the class its tenant is
+// on — triggers one full resync. The manager's Secret cache
+// is scoped (SecretCacheByObject) to replicas + the values channel, so the
+// Secret watch only ever delivers those; this mapper needs no filtering.
+func enqueueConfigKey(context.Context, client.Object) []reconcile.Request {
+	return []reconcile.Request{{NamespacedName: configKey}}
+}
diff --git a/internal/controller/wildcardsecret/reconciler_test.go b/internal/controller/wildcardsecret/reconciler_test.go
new file mode 100644
index 0000000000..56f9901c13
--- /dev/null
+++ b/internal/controller/wildcardsecret/reconciler_test.go
@@ -0,0 +1,1138 @@
+/*
+Copyright 2026 The Cozystack Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package wildcardsecret
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"slices"
+	"strings"
+	"testing"
+
+	corev1 "k8s.io/api/core/v1"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/types"
+	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
+	"k8s.io/client-go/tools/record"
+	ctrl "sigs.k8s.io/controller-runtime"
+	"sigs.k8s.io/controller-runtime/pkg/cache"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/client/apiutil"
+	"sigs.k8s.io/controller-runtime/pkg/client/fake"
+	"sigs.k8s.io/controller-runtime/pkg/client/interceptor"
+
+	gatewayv1alpha1 "github.com/cozystack/cozystack/api/gateway/v1alpha1"
+)
+
+func newScheme(t *testing.T) *runtime.Scheme {
+	t.Helper()
+	s := runtime.NewScheme()
+	if err := clientgoscheme.AddToScheme(s); err != nil {
+		t.Fatalf("client-go scheme: %v", err)
+	}
+	if err := gatewayv1alpha1.AddToScheme(s); err != nil {
+		t.Fatalf("tenantgateway scheme: %v", err)
+	}
+	return s
+}
+
+// configSecret builds the platform values channel Secret
+// (cozy-system/cozystack-values) carrying the wildcard source name and the
+// publishing namespace, exactly as packages/core/platform writes it.
+func configSecret(wildcardName, exposeIngress string) *corev1.Secret {
+	values := fmt.Sprintf("_cluster:\n  expose-ingress: %q\n  wildcard-secret-name: %q\n", exposeIngress, wildcardName)
+	return &corev1.Secret{
+		ObjectMeta: metav1.ObjectMeta{Namespace: platformValuesNamespace, Name: platformValuesName},
+		Type:       corev1.SecretTypeOpaque,
+		Data:       map[string][]byte{platformValuesKey: []byte(values)},
+	}
+}
+
+// tlsSecret builds an operator wildcard TLS Secret. Unlike the earlier
+// label-driven model, the source carries no marker — it is identified
+// purely by the name/namespace named in the platform values channel.
+func tlsSecret(ns, name string, data map[string][]byte) *corev1.Secret {
+	return &corev1.Secret{
+		ObjectMeta: metav1.ObjectMeta{Name: name, Namespace: ns},
+		Type:       corev1.SecretTypeTLS,
+		Data:       data,
+	}
+}
+
+// terminationNS builds a tenant namespace that owns a termination point of
+// the given kind ("ingress" or "gateway"): the owner label equals the
+// namespace's own name, which is how the tenant chart marks ownership.
+func terminationNS(name, kind string) *corev1.Namespace {
+	labels := map[string]string{ingressOwnerLabel: "", gatewayOwnerLabel: ""}
+	switch kind {
+	case "ingress":
+		labels[ingressOwnerLabel] = name
+	case "gateway":
+		labels[gatewayOwnerLabel] = name
+	}
+	return &corev1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: name, Labels: labels}}
+}
+
+// inheritingNS builds a tenant namespace that does NOT own a termination
+// point — its owner labels point at an ancestor, not itself.
+func inheritingNS(name, owner string) *corev1.Namespace {
+	return &corev1.Namespace{ObjectMeta: metav1.ObjectMeta{
+		Name:   name,
+		Labels: map[string]string{ingressOwnerLabel: owner, gatewayOwnerLabel: ""},
+	}}
+}
+
+// newReconciler builds a reconciler whose cached Client and uncached
+// Reader are both the fake client (the fake has no cache, so the two
+// coincide in tests — exactly what production does for correctness, minus
+// the staleness the cache could introduce).
+func newReconciler(t *testing.T, c client.Client) *Reconciler {
+	t.Helper()
+	return &Reconciler{Client: c, Reader: c, Scheme: newScheme(t), Recorder: record.NewFakeRecorder(16)}
+}
+
+func runReconcile(t *testing.T, c client.Client) error {
+	t.Helper()
+	_, err := newReconciler(t, c).Reconcile(context.TODO(), ctrl.Request{NamespacedName: configKey})
+	return err
+}
+
+func mustReconcile(t *testing.T, c client.Client) {
+	t.Helper()
+	if err := runReconcile(t, c); err != nil {
+		t.Fatalf("reconcile: %v", err)
+	}
+}
+
+func getSecret(t *testing.T, c client.Client, ns, name string) (*corev1.Secret, bool) {
+	t.Helper()
+	got := &corev1.Secret{}
+	err := c.Get(context.TODO(), types.NamespacedName{Namespace: ns, Name: name}, got)
+	if apierrors.IsNotFound(err) {
+		return nil, false
+	}
+	if err != nil {
+		t.Fatalf("get secret %s/%s: %v", ns, name, err)
+	}
+	return got, true
+}
+
+// TestReconcile_ReplicatesIntoTerminationNamespacesOnly pins the core
+// behavior: the operator wildcard Secret named in the values channel is
+// mirrored into exactly the tenant namespaces that own a TLS termination
+// point, never into inheriting namespaces, and never over the source.
+func TestReconcile_ReplicatesIntoTerminationNamespacesOnly(t *testing.T) {
+	s := newScheme(t)
+	c := fake.NewClientBuilder().WithScheme(s).WithObjects(
+		configSecret("wildcard-tls", "tenant-root"),
+		tlsSecret("tenant-root", "wildcard-tls", map[string][]byte{"tls.crt": []byte("CRT"), "tls.key": []byte("KEY")}),
+		terminationNS("tenant-foo", "ingress"),
+		terminationNS("tenant-bar", "gateway"),
+		inheritingNS("tenant-baz", "tenant-root"),
+	).Build()
+	mustReconcile(t, c)
+
+	for _, ns := range []string{"tenant-foo", "tenant-bar"} {
+		cp, ok := getSecret(t, c, ns, "wildcard-tls")
+		if !ok {
+			t.Fatalf("expected a wildcard copy in %s", ns)
+		}
+		if string(cp.Data["tls.crt"]) != "CRT" || string(cp.Data["tls.key"]) != "KEY" {
+			t.Errorf("copy in %s has wrong data: %v", ns, cp.Data)
+		}
+		if cp.Type != corev1.SecretTypeTLS {
+			t.Errorf("copy in %s has wrong type %q", ns, cp.Type)
+		}
+	}
+	if _, ok := getSecret(t, c, "tenant-baz", "wildcard-tls"); ok {
+		t.Errorf("inheriting namespace tenant-baz must not receive a copy")
+	}
+	src, ok := getSecret(t, c, "tenant-root", "wildcard-tls")
+	if !ok {
+		t.Fatalf("source secret disappeared")
+	}
+	if _, isCopy := src.Labels[CopyLabel]; isCopy {
+		t.Errorf("source secret must not be marked as a copy")
+	}
+}
+
+// TestReconcile_CopyCarriesMarkers pins that a replica is tagged as a
+// managed copy with a back-reference to its source.
+func TestReconcile_CopyCarriesMarkers(t *testing.T) {
+	s := newScheme(t)
+	c := fake.NewClientBuilder().WithScheme(s).WithObjects(
+		configSecret("wildcard-tls", "tenant-root"),
+		tlsSecret("tenant-root", "wildcard-tls", map[string][]byte{"tls.crt": []byte("C")}),
+		terminationNS("tenant-foo", "ingress"),
+	).Build()
+	mustReconcile(t, c)
+
+	cp, ok := getSecret(t, c, "tenant-foo", "wildcard-tls")
+	if !ok {
+		t.Fatalf("expected copy in tenant-foo")
+	}
+	if cp.Labels[CopyLabel] != "true" {
+		t.Errorf("copy must carry %s=true, labels=%v", CopyLabel, cp.Labels)
+	}
+	if got := cp.Annotations[SourceRefAnnotation]; got != "tenant-root/wildcard-tls" {
+		t.Errorf("copy must reference its source, got %q", got)
+	}
+}
+
+// TestReconcile_RotationPropagatesToCopies pins that updating the source
+// data re-syncs every existing copy.
+func TestReconcile_RotationPropagatesToCopies(t *testing.T) {
+	s := newScheme(t)
+	c := fake.NewClientBuilder().WithScheme(s).WithObjects(
+		configSecret("wildcard-tls", "tenant-root"),
+		tlsSecret("tenant-root", "wildcard-tls", map[string][]byte{"tls.crt": []byte("OLD")}),
+		terminationNS("tenant-foo", "ingress"),
+	).Build()
+	mustReconcile(t, c)
+
+	live := &corev1.Secret{}
+	if err := c.Get(context.TODO(), types.NamespacedName{Namespace: "tenant-root", Name: "wildcard-tls"}, live); err != nil {
+		t.Fatalf("get source: %v", err)
+	}
+	live.Data["tls.crt"] = []byte("NEW")
+	if err := c.Update(context.TODO(), live); err != nil {
+		t.Fatalf("rotate source: %v", err)
+	}
+	mustReconcile(t, c)
+
+	cp, _ := getSecret(t, c, "tenant-foo", "wildcard-tls")
+	if string(cp.Data["tls.crt"]) != "NEW" {
+		t.Errorf("rotation did not propagate, got %q", cp.Data["tls.crt"])
+	}
+	// The update path must preserve the managed-by marker so the replica
+	// stays prunable and is never mistaken for a foreign Secret.
+	if cp.Labels[CopyLabel] != "true" {
+		t.Errorf("update must preserve %s on the replica, labels=%v", CopyLabel, cp.Labels)
+	}
+}
+
+// TestReconcile_PrunesCopyWhenNamespaceStopsTerminating pins cleanup when
+// a namespace no longer owns a termination point.
+func TestReconcile_PrunesCopyWhenNamespaceStopsTerminating(t *testing.T) {
+	s := newScheme(t)
+	c := fake.NewClientBuilder().WithScheme(s).WithObjects(
+		configSecret("wildcard-tls", "tenant-root"),
+		tlsSecret("tenant-root", "wildcard-tls", map[string][]byte{"tls.crt": []byte("C")}),
+		terminationNS("tenant-foo", "ingress"),
+	).Build()
+	mustReconcile(t, c)
+	if _, ok := getSecret(t, c, "tenant-foo", "wildcard-tls"); !ok {
+		t.Fatalf("precondition: expected copy in tenant-foo")
+	}
+
+	ns := &corev1.Namespace{}
+	if err := c.Get(context.TODO(), types.NamespacedName{Name: "tenant-foo"}, ns); err != nil {
+		t.Fatalf("get ns: %v", err)
+	}
+	ns.Labels[ingressOwnerLabel] = "tenant-root"
+	if err := c.Update(context.TODO(), ns); err != nil {
+		t.Fatalf("update ns: %v", err)
+	}
+	mustReconcile(t, c)
+
+	if _, ok := getSecret(t, c, "tenant-foo", "wildcard-tls"); ok {
+		t.Errorf("copy in tenant-foo must be pruned once it stops terminating TLS")
+	}
+}
+
+// TestReconcile_SourceDeletedKeepsReplicas pins the non-destructive
+// contract: deleting the source Secret while the wildcard name is still
+// configured must NOT tear replicas down — that would drop TLS across
+// every tenant on a transient absence, a delete+recreate rotation, or a
+// misresolved publishing namespace. Teardown happens only on an explicit
+// disable (empty wildcard name), covered by DisablingViaConfig.
+func TestReconcile_SourceDeletedKeepsReplicas(t *testing.T) {
+	s := newScheme(t)
+	src := tlsSecret("tenant-root", "wildcard-tls", map[string][]byte{"tls.crt": []byte("C")})
+	c := fake.NewClientBuilder().WithScheme(s).WithObjects(
+		configSecret("wildcard-tls", "tenant-root"), src,
+		terminationNS("tenant-foo", "ingress"), terminationNS("tenant-bar", "gateway"),
+	).Build()
+	mustReconcile(t, c)
+
+	if err := c.Delete(context.TODO(), src); err != nil {
+		t.Fatalf("delete source: %v", err)
+	}
+	mustReconcile(t, c)
+
+	for _, ns := range []string{"tenant-foo", "tenant-bar"} {
+		if _, ok := getSecret(t, c, ns, "wildcard-tls"); !ok {
+			t.Errorf("copy in %s must be kept while the source is transiently absent", ns)
+		}
+	}
+}
+
+// TestReconcile_ReplicaSelfHealsAfterDeletion pins that a replica deleted
+// out-of-band is recreated. The security posture ("each consumer reads
+// only its own-namespace copy") depends on the replica actually existing.
+// In production a replica deletion is delivered by the scoped Secret-cache
+// watch (replicas carry CopyLabel, so they are in the cache scope) and
+// mapped to the singleton via enqueueConfigKey (covered by
+// TestEnqueueConfigKey); this test asserts the resulting reconcile body
+// restores the replica.
+func TestReconcile_ReplicaSelfHealsAfterDeletion(t *testing.T) {
+	s := newScheme(t)
+	c := fake.NewClientBuilder().WithScheme(s).WithObjects(
+		configSecret("wildcard-tls", "tenant-root"),
+		tlsSecret("tenant-root", "wildcard-tls", map[string][]byte{"tls.crt": []byte("C")}),
+		terminationNS("tenant-foo", "ingress"),
+	).Build()
+	mustReconcile(t, c)
+
+	cp, ok := getSecret(t, c, "tenant-foo", "wildcard-tls")
+	if !ok {
+		t.Fatalf("precondition: expected a replica in tenant-foo")
+	}
+	if err := c.Delete(context.TODO(), cp); err != nil {
+		t.Fatalf("delete replica: %v", err)
+	}
+	mustReconcile(t, c)
+
+	if _, ok := getSecret(t, c, "tenant-foo", "wildcard-tls"); !ok {
+		t.Errorf("a deleted replica must be recreated on the next reconcile")
+	}
+}
+
+// TestReconcile_PublishingNamespaceNeverSelfReplicates pins the
+// load-bearing exclusion: the publishing namespace owns its own ingress
+// controller (its owner label equals its own name), so without the
+// sourceNS exclusion the controller would try to "replicate" the source
+// over itself. The source Secret must be left untouched — never relabeled
+// as a managed copy and never modified.
+func TestReconcile_PublishingNamespaceNeverSelfReplicates(t *testing.T) {
+	s := newScheme(t)
+	// tenant-root carries its own ingress-owner label, so ownsTerminationPoint
+	// would be true for it.
+	root := &corev1.Namespace{ObjectMeta: metav1.ObjectMeta{
+		Name:   "tenant-root",
+		Labels: map[string]string{ingressOwnerLabel: "tenant-root", gatewayOwnerLabel: ""},
+	}}
+	c := fake.NewClientBuilder().WithScheme(s).WithObjects(
+		configSecret("wildcard-tls", "tenant-root"),
+		tlsSecret("tenant-root", "wildcard-tls", map[string][]byte{"tls.crt": []byte("SRC")}),
+		root,
+		terminationNS("tenant-foo", "ingress"),
+	).Build()
+	mustReconcile(t, c)
+
+	src, ok := getSecret(t, c, "tenant-root", "wildcard-tls")
+	if !ok {
+		t.Fatalf("source secret disappeared")
+	}
+	if _, isCopy := src.Labels[CopyLabel]; isCopy {
+		t.Errorf("the source must never be relabeled as a managed copy")
+	}
+	if string(src.Data["tls.crt"]) != "SRC" {
+		t.Errorf("the source data must be left untouched, got %q", src.Data["tls.crt"])
+	}
+	if _, ok := getSecret(t, c, "tenant-foo", "wildcard-tls"); !ok {
+		t.Errorf("a genuine child namespace must still receive its replica")
+	}
+}
+
+// TestReconcile_DisablingViaConfigPrunesAllCopies pins the disable path:
+// clearing _cluster.wildcard-secret-name (operator disables the feature)
+// must tear every replica down. The values channel is in the Secret cache
+// scope, so this edit is watched and re-triggers a reconcile, and the
+// present-channel/empty-name path prunes every replica.
+func TestReconcile_DisablingViaConfigPrunesAllCopies(t *testing.T) {
+	s := newScheme(t)
+	c := fake.NewClientBuilder().WithScheme(s).WithObjects(
+		configSecret("wildcard-tls", "tenant-root"),
+		tlsSecret("tenant-root", "wildcard-tls", map[string][]byte{"tls.crt": []byte("C")}),
+		terminationNS("tenant-foo", "ingress"),
+	).Build()
+	mustReconcile(t, c)
+	if _, ok := getSecret(t, c, "tenant-foo", "wildcard-tls"); !ok {
+		t.Fatalf("precondition: expected copy in tenant-foo")
+	}
+
+	// Operator clears the wildcard name in the values channel.
+	cfg := &corev1.Secret{}
+	if err := c.Get(context.TODO(), configKey, cfg); err != nil {
+		t.Fatalf("get config: %v", err)
+	}
+	cfg.Data[platformValuesKey] = []byte("_cluster:\n  expose-ingress: \"tenant-root\"\n  wildcard-secret-name: \"\"\n")
+	if err := c.Update(context.TODO(), cfg); err != nil {
+		t.Fatalf("disable: %v", err)
+	}
+	mustReconcile(t, c)
+
+	if _, ok := getSecret(t, c, "tenant-foo", "wildcard-tls"); ok {
+		t.Errorf("replicas must be pruned once the feature is disabled")
+	}
+}
+
+// TestReconcile_DisableDeletesCopyAtSourceLocation pins the inverse of the
+// active-path source-slot guard: on an explicit disable (empty name) the
+// controller reads no source, so a copy-labelled Secret sitting at the old
+// source location IS removed along with every other replica. A genuine
+// operator source is never copy-labelled, so an un-labelled Secret is never
+// touched — this guards against a future "always protect the source slot"
+// tightening silently breaking disable-prune.
+func TestReconcile_DisableDeletesCopyAtSourceLocation(t *testing.T) {
+	s := newScheme(t)
+	copyAtSource := &corev1.Secret{
+		ObjectMeta: metav1.ObjectMeta{
+			Name: "wildcard-tls", Namespace: "tenant-root",
+			Labels: map[string]string{CopyLabel: "true"},
+		},
+		Type: corev1.SecretTypeTLS,
+		Data: map[string][]byte{"tls.crt": []byte("STALE")},
+	}
+	copyInChild := &corev1.Secret{
+		ObjectMeta: metav1.ObjectMeta{
+			Name: "wildcard-tls", Namespace: "tenant-foo",
+			Labels: map[string]string{CopyLabel: "true"},
+		},
+		Type: corev1.SecretTypeTLS,
+		Data: map[string][]byte{"tls.crt": []byte("C")},
+	}
+	userSecret := &corev1.Secret{
+		ObjectMeta: metav1.ObjectMeta{Name: "app-config", Namespace: "tenant-bar"},
+		Type:       corev1.SecretTypeOpaque,
+		Data:       map[string][]byte{"k": []byte("v")},
+	}
+	c := fake.NewClientBuilder().WithScheme(s).WithObjects(
+		configSecret("", "tenant-root"), // disabled: explicit empty wildcard name
+		copyAtSource, copyInChild, userSecret,
+	).Build()
+	mustReconcile(t, c)
+
+	if _, ok := getSecret(t, c, "tenant-root", "wildcard-tls"); ok {
+		t.Errorf("disable must delete a copy-labelled Secret even at the source location")
+	}
+	if _, ok := getSecret(t, c, "tenant-foo", "wildcard-tls"); ok {
+		t.Errorf("disable must delete child replicas")
+	}
+	if _, ok := getSecret(t, c, "tenant-bar", "app-config"); !ok {
+		t.Errorf("disable must never touch an un-labelled user Secret")
+	}
+}
+
+// TestReconcile_RenamedSourcePrunesOldReplicas pins that pointing the
+// values channel at a different Secret name removes the old-named replicas
+// and creates new-named ones.
+func TestReconcile_RenamedSourcePrunesOldReplicas(t *testing.T) {
+	s := newScheme(t)
+	c := fake.NewClientBuilder().WithScheme(s).WithObjects(
+		configSecret("wildcard-tls", "tenant-root"),
+		tlsSecret("tenant-root", "wildcard-tls", map[string][]byte{"tls.crt": []byte("A")}),
+		tlsSecret("tenant-root", "wildcard-tls-2", map[string][]byte{"tls.crt": []byte("B")}),
+		terminationNS("tenant-foo", "ingress"),
+	).Build()
+	mustReconcile(t, c)
+	if _, ok := getSecret(t, c, "tenant-foo", "wildcard-tls"); !ok {
+		t.Fatalf("precondition: expected copy named wildcard-tls")
+	}
+
+	cfg := &corev1.Secret{}
+	if err := c.Get(context.TODO(), configKey, cfg); err != nil {
+		t.Fatalf("get config: %v", err)
+	}
+	cfg.Data[platformValuesKey] = []byte("_cluster:\n  expose-ingress: \"tenant-root\"\n  wildcard-secret-name: \"wildcard-tls-2\"\n")
+	if err := c.Update(context.TODO(), cfg); err != nil {
+		t.Fatalf("rename: %v", err)
+	}
+	mustReconcile(t, c)
+
+	if _, ok := getSecret(t, c, "tenant-foo", "wildcard-tls"); ok {
+		t.Errorf("old-named replica must be pruned after a source rename")
+	}
+	cp, ok := getSecret(t, c, "tenant-foo", "wildcard-tls-2")
+	if !ok || string(cp.Data["tls.crt"]) != "B" {
+		t.Errorf("new-named replica must be created from the renamed source, got %v ok=%v", cp, ok)
+	}
+}
+
+// TestReconcile_DoesNotOverwriteForeignSecret pins safety: a pre-existing
+// Secret of the same name the controller does not own must never be
+// clobbered, the collision must not requeue, and it must not block
+// replication into the other namespaces.
+func TestReconcile_DoesNotOverwriteForeignSecret(t *testing.T) {
+	s := newScheme(t)
+	foreign := &corev1.Secret{
+		ObjectMeta: metav1.ObjectMeta{Name: "wildcard-tls", Namespace: "tenant-foo"},
+		Type:       corev1.SecretTypeTLS,
+		Data:       map[string][]byte{"tls.crt": []byte("FOREIGN")},
+	}
+	c := fake.NewClientBuilder().WithScheme(s).WithObjects(
+		configSecret("wildcard-tls", "tenant-root"),
+		tlsSecret("tenant-root", "wildcard-tls", map[string][]byte{"tls.crt": []byte("SRC")}),
+		foreign,
+		terminationNS("tenant-foo", "ingress"),
+		terminationNS("tenant-bar", "gateway"),
+	).Build()
+
+	if err := runReconcile(t, c); err != nil {
+		t.Fatalf("a foreign collision must not requeue (return error): %v", err)
+	}
+	got, _ := getSecret(t, c, "tenant-foo", "wildcard-tls")
+	if string(got.Data["tls.crt"]) != "FOREIGN" {
+		t.Errorf("foreign secret was overwritten: %q", got.Data["tls.crt"])
+	}
+	if _, ok := getSecret(t, c, "tenant-bar", "wildcard-tls"); !ok {
+		t.Errorf("foreign collision must not block replication into tenant-bar")
+	}
+}
+
+// TestReconcile_ForeignCollisionEmitsWarningEvent pins that a skipped
+// foreign-Secret collision is surfaced as a Warning Event on the colliding
+// Secret (which lives in the affected namespace), so the otherwise-silent
+// skip is visible via `kubectl get events -n <ns>`.
+func TestReconcile_ForeignCollisionEmitsWarningEvent(t *testing.T) {
+	s := newScheme(t)
+	foreign := &corev1.Secret{
+		ObjectMeta: metav1.ObjectMeta{Name: "wildcard-tls", Namespace: "tenant-foo"},
+		Type:       corev1.SecretTypeTLS,
+		Data:       map[string][]byte{"tls.crt": []byte("FOREIGN")},
+	}
+	c := fake.NewClientBuilder().WithScheme(s).WithObjects(
+		configSecret("wildcard-tls", "tenant-root"),
+		tlsSecret("tenant-root", "wildcard-tls", map[string][]byte{"tls.crt": []byte("SRC")}),
+		foreign,
+		terminationNS("tenant-foo", "ingress"),
+	).Build()
+
+	rec := record.NewFakeRecorder(16)
+	r := &Reconciler{Client: c, Reader: c, Scheme: s, Recorder: rec}
+	if _, err := r.Reconcile(context.TODO(), ctrl.Request{NamespacedName: configKey}); err != nil {
+		t.Fatalf("reconcile must not fail on a foreign collision: %v", err)
+	}
+
+	select {
+	case e := <-rec.Events:
+		if !strings.Contains(e, "Warning") || !strings.Contains(e, "WildcardReplicaSkipped") {
+			t.Errorf("expected a Warning WildcardReplicaSkipped event, got %q", e)
+		}
+	default:
+		t.Errorf("expected a Warning event on the foreign collision, got none")
+	}
+}
+
+// TestReconcile_TransientWriteErrorRequeues pins that a non-collision write
+// failure is surfaced (so controller-runtime requeues), while a healthy
+// namespace in the same pass still gets its replica.
+func TestReconcile_TransientWriteErrorRequeues(t *testing.T) {
+	s := newScheme(t)
+	base := fake.NewClientBuilder().WithScheme(s).WithObjects(
+		configSecret("wildcard-tls", "tenant-root"),
+		tlsSecret("tenant-root", "wildcard-tls", map[string][]byte{"tls.crt": []byte("C")}),
+		terminationNS("tenant-foo", "ingress"),
+		terminationNS("tenant-bar", "gateway"),
+	).Build()
+	c := interceptor.NewClient(base, interceptor.Funcs{
+		Create: func(ctx context.Context, cl client.WithWatch, obj client.Object, opts ...client.CreateOption) error {
+			if obj.GetNamespace() == "tenant-foo" {
+				return fmt.Errorf("synthetic transient error")
+			}
+			return cl.Create(ctx, obj, opts...)
+		},
+	})
+
+	if err := runReconcile(t, c); err == nil {
+		t.Fatalf("a transient write error must be returned so the work is requeued")
+	}
+	if _, ok := getSecret(t, c, "tenant-bar", "wildcard-tls"); !ok {
+		t.Errorf("a transient error in one namespace must not block another")
+	}
+}
+
+// TestReconcile_NonTLSSourceIsNotPropagated pins that a source named in the
+// channel but not of type kubernetes.io/tls is ignored.
+func TestReconcile_NonTLSSourceIsNotPropagated(t *testing.T) {
+	s := newScheme(t)
+	c := fake.NewClientBuilder().WithScheme(s).WithObjects(
+		configSecret("wildcard-tls", "tenant-root"),
+		&corev1.Secret{
+			ObjectMeta: metav1.ObjectMeta{Name: "wildcard-tls", Namespace: "tenant-root"},
+			Type:       corev1.SecretTypeOpaque,
+			Data:       map[string][]byte{"foo": []byte("bar")},
+		},
+		terminationNS("tenant-foo", "ingress"),
+	).Build()
+	mustReconcile(t, c)
+
+	if _, ok := getSecret(t, c, "tenant-foo", "wildcard-tls"); ok {
+		t.Errorf("a non-TLS source must not be propagated")
+	}
+}
+
+// TestReconcile_NoPlatformValuesKeepsExistingReplicas pins that a
+// transient loss of the platform values channel does NOT prune replicas.
+// Channel absence means "desired state unknown", which is deliberately
+// distinct from an explicit disable (channel present, empty wildcard
+// name). Without this distinction a platform re-render or a brief delete
+// of cozystack-values would drop tenant TLS cluster-wide.
+func TestReconcile_NoPlatformValuesKeepsExistingReplicas(t *testing.T) {
+	s := newScheme(t)
+	c := fake.NewClientBuilder().WithScheme(s).WithObjects(
+		configSecret("wildcard-tls", "tenant-root"),
+		tlsSecret("tenant-root", "wildcard-tls", map[string][]byte{"tls.crt": []byte("C")}),
+		terminationNS("tenant-foo", "ingress"),
+	).Build()
+	mustReconcile(t, c)
+	if _, ok := getSecret(t, c, "tenant-foo", "wildcard-tls"); !ok {
+		t.Fatalf("precondition: expected a replica in tenant-foo")
+	}
+
+	// Simulate a transient loss of the platform values channel.
+	cfg := &corev1.Secret{}
+	if err := c.Get(context.TODO(), configKey, cfg); err != nil {
+		t.Fatalf("get config: %v", err)
+	}
+	if err := c.Delete(context.TODO(), cfg); err != nil {
+		t.Fatalf("delete config: %v", err)
+	}
+	mustReconcile(t, c)
+
+	if _, ok := getSecret(t, c, "tenant-foo", "wildcard-tls"); !ok {
+		t.Errorf("existing replicas must be preserved when the values channel is transiently absent")
+	}
+}
+
+// TestReconcile_SkipsTerminatingNamespace pins that a termination-owning
+// namespace being deleted (DeletionTimestamp set) is skipped: the API
+// server forbids creating a replica in a Terminating namespace, and the
+// owner labels linger until GC, so without the skip every tenant teardown
+// would produce forbidden-error requeue churn. A healthy sibling still
+// gets its replica.
+func TestReconcile_SkipsTerminatingNamespace(t *testing.T) {
+	s := newScheme(t)
+	dying := terminationNS("tenant-dying", "ingress")
+	now := metav1.Now()
+	dying.DeletionTimestamp = &now
+	dying.Finalizers = []string{"kubernetes"} // the fake client requires a finalizer alongside a DeletionTimestamp
+	c := fake.NewClientBuilder().WithScheme(s).WithObjects(
+		configSecret("wildcard-tls", "tenant-root"),
+		tlsSecret("tenant-root", "wildcard-tls", map[string][]byte{"tls.crt": []byte("C")}),
+		dying,
+		terminationNS("tenant-foo", "ingress"),
+	).Build()
+
+	if err := runReconcile(t, c); err != nil {
+		t.Fatalf("reconcile must not error on a terminating namespace: %v", err)
+	}
+	if _, ok := getSecret(t, c, "tenant-dying", "wildcard-tls"); ok {
+		t.Errorf("must not create a replica in a terminating namespace")
+	}
+	if _, ok := getSecret(t, c, "tenant-foo", "wildcard-tls"); !ok {
+		t.Errorf("a healthy sibling must still receive its replica")
+	}
+}
+
+// TestReconcile_MissingWildcardKeyKeepsReplicas pins that a values channel
+// which omits the wildcard-secret-name key entirely (a partial or older
+// render) is treated as "desired state unknown" — replicas kept — not as
+// an explicit disable. Only an explicitly empty value prunes.
+func TestReconcile_MissingWildcardKeyKeepsReplicas(t *testing.T) {
+	s := newScheme(t)
+	c := fake.NewClientBuilder().WithScheme(s).WithObjects(
+		configSecret("wildcard-tls", "tenant-root"),
+		tlsSecret("tenant-root", "wildcard-tls", map[string][]byte{"tls.crt": []byte("C")}),
+		terminationNS("tenant-foo", "ingress"),
+	).Build()
+	mustReconcile(t, c)
+	if _, ok := getSecret(t, c, "tenant-foo", "wildcard-tls"); !ok {
+		t.Fatalf("precondition: expected a replica in tenant-foo")
+	}
+
+	// Swap the channel to one that has _cluster but no wildcard-secret-name.
+	cfg := &corev1.Secret{}
+	if err := c.Get(context.TODO(), configKey, cfg); err != nil {
+		t.Fatalf("get config: %v", err)
+	}
+	cfg.Data[platformValuesKey] = []byte("_cluster:\n  expose-ingress: \"tenant-root\"\n")
+	if err := c.Update(context.TODO(), cfg); err != nil {
+		t.Fatalf("update config: %v", err)
+	}
+	mustReconcile(t, c)
+
+	if _, ok := getSecret(t, c, "tenant-foo", "wildcard-tls"); !ok {
+		t.Errorf("a channel missing the wildcard-secret-name key must keep replicas, not prune")
+	}
+}
+
+// TestReconcile_NeverPrunesSecretAtSourceLocation pins that a copy-labelled
+// Secret sitting at the source location is never pruned — even though the
+// source namespace is excluded from the keep set. The controller reads
+// that Secret as its source, so deleting it would flap the source. This
+// guards the unusual case of a stale replica occupying the source slot
+// after a publishing-namespace switch.
+func TestReconcile_NeverPrunesSecretAtSourceLocation(t *testing.T) {
+	s := newScheme(t)
+	sourceWithCopyLabel := &corev1.Secret{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "wildcard-tls",
+			Namespace: "tenant-root",
+			Labels:    map[string]string{CopyLabel: "true"},
+		},
+		Type: corev1.SecretTypeTLS,
+		Data: map[string][]byte{"tls.crt": []byte("SRC")},
+	}
+	c := fake.NewClientBuilder().WithScheme(s).WithObjects(
+		configSecret("wildcard-tls", "tenant-root"),
+		sourceWithCopyLabel,
+		terminationNS("tenant-foo", "ingress"),
+	).Build()
+	mustReconcile(t, c)
+
+	if _, ok := getSecret(t, c, "tenant-root", "wildcard-tls"); !ok {
+		t.Errorf("a Secret at the source location must never be pruned, even with the copy label")
+	}
+	// And a genuine child still gets its replica.
+	if _, ok := getSecret(t, c, "tenant-foo", "wildcard-tls"); !ok {
+		t.Errorf("a genuine child namespace must still receive its replica")
+	}
+}
+
+// TestReconcile_PublishingNamespaceMismatchKeepsAndRequeues pins the
+// split-deployment trap: when expose-ingress resolves to a namespace that
+// does not hold the source, the source read NotFounds. The reconciler must
+// NOT replicate (no source data) and must NOT touch the real source, but it
+// must keep requeueing so the feature recovers if the namespace becomes
+// correct — rather than erroring or pruning.
+func TestReconcile_PublishingNamespaceMismatchKeepsAndRequeues(t *testing.T) {
+	s := newScheme(t)
+	c := fake.NewClientBuilder().WithScheme(s).WithObjects(
+		// expose-ingress points at "other-ns", but the source lives in tenant-root.
+		configSecret("wildcard-tls", "other-ns"),
+		tlsSecret("tenant-root", "wildcard-tls", map[string][]byte{"tls.crt": []byte("SRC")}),
+		terminationNS("tenant-foo", "ingress"),
+	).Build()
+
+	res, err := newReconciler(t, c).Reconcile(context.TODO(), ctrl.Request{NamespacedName: configKey})
+	if err != nil {
+		t.Fatalf("mismatch reconcile must not error: %v", err)
+	}
+	if res.RequeueAfter <= 0 {
+		t.Errorf("a mismatched publishing namespace must keep requeueing, got %v", res.RequeueAfter)
+	}
+	if _, ok := getSecret(t, c, "tenant-foo", "wildcard-tls"); ok {
+		t.Errorf("no replica must be created when the source is not found in the resolved namespace")
+	}
+	src, ok := getSecret(t, c, "tenant-root", "wildcard-tls")
+	if !ok || string(src.Data["tls.crt"]) != "SRC" {
+		t.Errorf("the real source in tenant-root must be left untouched, got %v ok=%v", src, ok)
+	}
+}
+
+// TestSecretCacheByObject_ScopesToReplicasAndConfig pins the cache scope so
+// a future change cannot silently widen the cozystack-controller Secret
+// informer back to every cluster Secret. Only managed replicas (CopyLabel,
+// any namespace) and the values channel (cozy-system/cozystack-values) may
+// be cached; the operator source and arbitrary tenant Secrets must not.
+func TestSecretCacheByObject_ScopesToReplicasAndConfig(t *testing.T) {
+	by := SecretCacheByObject()
+
+	all, ok := by.Namespaces[cache.AllNamespaces]
+	if !ok {
+		t.Fatalf("expected an all-namespaces cache config")
+	}
+	if all.LabelSelector == nil || all.LabelSelector.String() != CopyLabel+"=true" {
+		t.Errorf("all-namespaces config must select only managed replicas, got %v", all.LabelSelector)
+	}
+
+	cfg, ok := by.Namespaces[platformValuesNamespace]
+	if !ok {
+		t.Fatalf("expected a %s cache config for the values channel", platformValuesNamespace)
+	}
+	if cfg.FieldSelector == nil || cfg.FieldSelector.String() != "metadata.name="+platformValuesName {
+		t.Errorf("%s config must select only the values channel, got %v", platformValuesNamespace, cfg.FieldSelector)
+	}
+}
+
+// TestWatchedTypes pins what SetupWithManager watches. The builder
+// exposes nothing about its watches, so a dropped one leaves both Go
+// suites green while the behaviour it carried silently degrades to the
+// periodic resync — for TenantGateway that means the wildcard private
+// key sits in a namespace that stopped terminating TLS for up to
+// sourceResyncInterval.
+func TestWatchedTypes(t *testing.T) {
+	s := newScheme(t)
+	want := map[string]bool{"Secret": false, "Namespace": false, "TenantGateway": false}
+	for _, obj := range watchedTypes() {
+		gvk, err := apiutil.GVKForObject(obj, s)
+		if err != nil {
+			t.Fatalf("GVK for %T: %v", obj, err)
+		}
+		seen, expected := want[gvk.Kind]
+		if !expected {
+			t.Errorf("unexpected watched kind %s — a new watch needs its own reason here", gvk.Kind)
+			continue
+		}
+		if seen {
+			t.Errorf("kind %s watched twice", gvk.Kind)
+		}
+		want[gvk.Kind] = true
+	}
+	for kind, seen := range want {
+		if !seen {
+			t.Errorf("%s is not watched; its events would only reach the reconciler on the next resync", kind)
+		}
+	}
+}
+
+// TestEnqueueConfigKey pins the watch wiring: every delivered event (a
+// replica change, a values-channel change, a namespace change) maps to the
+// single config key, so the reconcile body — which self-heal, prune, and
+// rotation all run through — is actually triggered.
+func TestEnqueueConfigKey(t *testing.T) {
+	obj := &corev1.Secret{ObjectMeta: metav1.ObjectMeta{Namespace: "tenant-foo", Name: "wildcard-tls"}}
+	reqs := enqueueConfigKey(context.TODO(), obj)
+	if len(reqs) != 1 || reqs[0].NamespacedName != configKey {
+		t.Errorf("every watched event must enqueue the config key, got %+v", reqs)
+	}
+}
+
+// TestOwnsTerminationPoint is the direct table test for the gate that
+// decides the whole replication set: a namespace owns a termination point
+// exactly when an owner label equals its own name (it runs its own
+// controller/Gateway), not when the label points at an ancestor.
+func TestOwnsTerminationPoint(t *testing.T) {
+	cases := []struct {
+		name   string
+		labels map[string]string
+		tgw    *gatewayv1alpha1.TenantGateway
+		want   bool
+	}{
+		{"owns ingress", map[string]string{ingressOwnerLabel: "tenant-foo"}, nil, true},
+		{"owns gateway, no TenantGateway yet", map[string]string{gatewayOwnerLabel: "tenant-foo"}, nil, true},
+		{"owns gateway, terminating class", map[string]string{gatewayOwnerLabel: "tenant-foo"}, terminatingTenantGateway("tenant-foo"), true},
+		{"owns gateway, edge class", map[string]string{gatewayOwnerLabel: "tenant-foo"}, edgeTenantGateway("tenant-foo"), false},
+		// tenant.spec.ingress + tenant.spec.gateway put both labels on one
+		// namespace: the ingress controller there still terminates TLS
+		// locally, so an edge Gateway next to it must not withdraw the key.
+		{"owns both, edge gateway", map[string]string{ingressOwnerLabel: "tenant-foo", gatewayOwnerLabel: "tenant-foo"}, edgeTenantGateway("tenant-foo"), true},
+		{"inherits ingress from ancestor", map[string]string{ingressOwnerLabel: "tenant-root"}, nil, false},
+		{"empty owner labels", map[string]string{ingressOwnerLabel: "", gatewayOwnerLabel: ""}, nil, false},
+		{"no labels at all", nil, nil, false},
+	}
+	for _, tc := range cases {
+		ns := &corev1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: "tenant-foo", Labels: tc.labels}}
+		builder := fake.NewClientBuilder().WithScheme(newScheme(t)).WithObjects(ns)
+		if tc.tgw != nil {
+			builder = builder.WithObjects(tc.tgw)
+		}
+		r := &Reconciler{Client: builder.Build()}
+		got, err := r.ownsTerminationPoint(context.TODO(), ns)
+		if err != nil {
+			t.Fatalf("%s: %v", tc.name, err)
+		}
+		if got != tc.want {
+			t.Errorf("%s: ownsTerminationPoint = %v, want %v", tc.name, got, tc.want)
+		}
+	}
+}
+
+// TestReconcile_RequeuesWhileActiveOnly pins the resync contract: because
+// the source is not watched, an active reconcile must requeue so an
+// in-place source rotation propagates; a disabled reconcile must NOT
+// requeue (the watched values channel re-triggers on re-enable).
+func TestReconcile_RequeuesWhileActiveOnly(t *testing.T) {
+	s := newScheme(t)
+	c := fake.NewClientBuilder().WithScheme(s).WithObjects(
+		configSecret("wildcard-tls", "tenant-root"),
+		tlsSecret("tenant-root", "wildcard-tls", map[string][]byte{"tls.crt": []byte("C")}),
+		terminationNS("tenant-foo", "ingress"),
+	).Build()
+
+	res, err := newReconciler(t, c).Reconcile(context.TODO(), ctrl.Request{NamespacedName: configKey})
+	if err != nil {
+		t.Fatalf("active reconcile: %v", err)
+	}
+	if res.RequeueAfter <= 0 {
+		t.Errorf("an active reconcile must requeue to catch source rotation, got %v", res.RequeueAfter)
+	}
+
+	// Disable and reconcile again: no requeue (the channel watch re-triggers).
+	cfg := &corev1.Secret{}
+	if err := c.Get(context.TODO(), configKey, cfg); err != nil {
+		t.Fatalf("get config: %v", err)
+	}
+	cfg.Data[platformValuesKey] = []byte("_cluster:\n  expose-ingress: \"tenant-root\"\n  wildcard-secret-name: \"\"\n")
+	if err := c.Update(context.TODO(), cfg); err != nil {
+		t.Fatalf("disable: %v", err)
+	}
+	res, err = newReconciler(t, c).Reconcile(context.TODO(), ctrl.Request{NamespacedName: configKey})
+	if err != nil {
+		t.Fatalf("disabled reconcile: %v", err)
+	}
+	// Assert the zero Result: neither an immediate requeue nor a scheduled
+	// one. Comparing against ctrl.Result{} covers both the (deprecated)
+	// Requeue flag and RequeueAfter without naming the deprecated field.
+	if res != (ctrl.Result{}) {
+		t.Errorf("a disabled reconcile must not requeue at all, got %+v", res)
+	}
+}
+
+// TestReconcile_ReadsRouteToCacheExceptSourceAndCollision pins which reads go
+// through the cached Client and which go through the uncached APIReader. The
+// values channel, the namespace list, and the managed-replica prune list are
+// cacheable (the manager scopes them into its cache via SecretCacheByObject),
+// so they must use the cached Client to keep apiserver load down. The two
+// reads the scoped cache cannot serve — the dynamic-name source Get and the
+// foreign-collision existence check — must stay on the uncached APIReader,
+// otherwise the controller would miss the operator source and any non-managed
+// Secret colliding with a replica name. Wiring the two clients as distinct
+// interceptors over a shared store lets the test observe the routing directly.
+func TestReconcile_ReadsRouteToCacheExceptSourceAndCollision(t *testing.T) {
+	s := newScheme(t)
+	base := fake.NewClientBuilder().WithScheme(s).WithObjects(
+		configSecret("wildcard-tls", "tenant-root"),
+		tlsSecret("tenant-root", "wildcard-tls", map[string][]byte{"tls.crt": []byte("C")}),
+		terminationNS("tenant-foo", "ingress"),
+	).Build()
+
+	var cachedGets, cachedLists, uncachedGets, uncachedLists []string
+	cached := interceptor.NewClient(base, interceptor.Funcs{
+		Get: func(ctx context.Context, cl client.WithWatch, key client.ObjectKey, obj client.Object, opts ...client.GetOption) error {
+			cachedGets = append(cachedGets, key.String())
+			return cl.Get(ctx, key, obj, opts...)
+		},
+		List: func(ctx context.Context, cl client.WithWatch, list client.ObjectList, opts ...client.ListOption) error {
+			cachedLists = append(cachedLists, fmt.Sprintf("%T", list))
+			return cl.List(ctx, list, opts...)
+		},
+	})
+	uncached := interceptor.NewClient(base, interceptor.Funcs{
+		Get: func(ctx context.Context, cl client.WithWatch, key client.ObjectKey, obj client.Object, opts ...client.GetOption) error {
+			uncachedGets = append(uncachedGets, key.String())
+			return cl.Get(ctx, key, obj, opts...)
+		},
+		List: func(ctx context.Context, cl client.WithWatch, list client.ObjectList, opts ...client.ListOption) error {
+			uncachedLists = append(uncachedLists, fmt.Sprintf("%T", list))
+			return cl.List(ctx, list, opts...)
+		},
+	})
+
+	r := &Reconciler{Client: cached, Reader: uncached, Scheme: s, Recorder: record.NewFakeRecorder(16)}
+	if _, err := r.Reconcile(context.TODO(), ctrl.Request{NamespacedName: configKey}); err != nil {
+		t.Fatalf("reconcile: %v", err)
+	}
+
+	const (
+		valuesKey    = platformValuesNamespace + "/" + platformValuesName
+		sourceKey    = "tenant-root/wildcard-tls"
+		collisionKey = "tenant-foo/wildcard-tls"
+	)
+
+	// Cacheable reads must hit the cached Client, never the APIReader.
+	if !sliceHas(cachedGets, valuesKey) {
+		t.Errorf("values channel must be read from the cache, cachedGets=%v", cachedGets)
+	}
+	if sliceHas(uncachedGets, valuesKey) {
+		t.Errorf("values channel must not bypass the cache, uncachedGets=%v", uncachedGets)
+	}
+	if !sliceHas(cachedLists, "*v1.NamespaceList") {
+		t.Errorf("namespaces must be listed from the cache, cachedLists=%v", cachedLists)
+	}
+	if !sliceHas(cachedLists, "*v1.SecretList") {
+		t.Errorf("managed replicas must be listed from the cache, cachedLists=%v", cachedLists)
+	}
+	if len(uncachedLists) != 0 {
+		t.Errorf("no List must bypass the cache, uncachedLists=%v", uncachedLists)
+	}
+
+	// The two reads the scoped cache cannot serve must stay on the APIReader.
+	if !sliceHas(uncachedGets, sourceKey) {
+		t.Errorf("dynamic-name source must be read via the uncached APIReader, uncachedGets=%v", uncachedGets)
+	}
+	if sliceHas(cachedGets, sourceKey) {
+		t.Errorf("source must not be read from the cache, cachedGets=%v", cachedGets)
+	}
+	if !sliceHas(uncachedGets, collisionKey) {
+		t.Errorf("foreign-collision check must use the uncached APIReader, uncachedGets=%v", uncachedGets)
+	}
+	if sliceHas(cachedGets, collisionKey) {
+		t.Errorf("foreign-collision check must not be read from the cache, cachedGets=%v", cachedGets)
+	}
+}
+
+func sliceHas(s []string, v string) bool {
+	return slices.Contains(s, v)
+}
+
+// edgeTenantGateway builds the TenantGateway a tenant on an edge-terminated
+// class ends up with: the gateway chart resolves the class, reads the
+// platform's list of edge-terminated classes, and stamps certMode here.
+// This controller reads that object rather than a cluster-wide value,
+// because the class is a per-tenant choice.
+func edgeTenantGateway(ns string) *gatewayv1alpha1.TenantGateway {
+	return &gatewayv1alpha1.TenantGateway{
+		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: ns},
+		Spec: gatewayv1alpha1.TenantGatewaySpec{
+			Apex:             "example.org",
+			CertMode:         gatewayv1alpha1.CertModeEdge,
+			GatewayClassName: "cloudflare-tunnel",
+		},
+	}
+}
+
+func terminatingTenantGateway(ns string) *gatewayv1alpha1.TenantGateway {
+	return &gatewayv1alpha1.TenantGateway{
+		ObjectMeta: metav1.ObjectMeta{Name: "cozystack", Namespace: ns},
+		Spec: gatewayv1alpha1.TenantGatewaySpec{
+			Apex:             "example.org",
+			CertMode:         gatewayv1alpha1.CertModeDNS01,
+			GatewayClassName: "cilium",
+		},
+	}
+}
+
+// TestReconcile_EdgeTenantGetsNoWildcardReplica pins the per-tenant rule:
+// one tenant on an edge-terminated class holds no key while its neighbour
+// on a terminating class keeps its replica, out of the same reconcile.
+// The earlier cluster-wide switch could not express this pair at all.
+func TestReconcile_EdgeTenantGetsNoWildcardReplica(t *testing.T) {
+	s := newScheme(t)
+	c := fake.NewClientBuilder().WithScheme(s).WithObjects(
+		configSecret("wildcard-tls", "tenant-root"),
+		tlsSecret("tenant-root", "wildcard-tls", map[string][]byte{"tls.crt": []byte("CRT"), "tls.key": []byte("KEY")}),
+		terminationNS("tenant-edge", "gateway"), edgeTenantGateway("tenant-edge"),
+		terminationNS("tenant-cilium", "gateway"), terminatingTenantGateway("tenant-cilium"),
+		terminationNS("tenant-ingress", "ingress"),
+	).Build()
+	mustReconcile(t, c)
+
+	if _, ok := getSecret(t, c, "tenant-edge", "wildcard-tls"); ok {
+		t.Errorf("a tenant on an edge-terminated class must hold no wildcard replica")
+	}
+	for _, ns := range []string{"tenant-cilium", "tenant-ingress"} {
+		if _, ok := getSecret(t, c, ns, "wildcard-tls"); !ok {
+			t.Errorf("%s still terminates TLS locally and must keep its replica", ns)
+		}
+	}
+}
+
+// TestReconcile_MovingATenantToEdgePrunesOnlyItsReplica pins the transition
+// and its scope: the neighbour's key stays where it is.
+func TestReconcile_MovingATenantToEdgePrunesOnlyItsReplica(t *testing.T) {
+	s := newScheme(t)
+	c := fake.NewClientBuilder().WithScheme(s).WithObjects(
+		configSecret("wildcard-tls", "tenant-root"),
+		tlsSecret("tenant-root", "wildcard-tls", map[string][]byte{"tls.crt": []byte("CRT"), "tls.key": []byte("KEY")}),
+		terminationNS("tenant-edge", "gateway"), terminatingTenantGateway("tenant-edge"),
+		terminationNS("tenant-cilium", "gateway"), terminatingTenantGateway("tenant-cilium"),
+	).Build()
+	mustReconcile(t, c)
+	if _, ok := getSecret(t, c, "tenant-edge", "wildcard-tls"); !ok {
+		t.Fatalf("precondition: expected a replica before the move")
+	}
+
+	tgw := &gatewayv1alpha1.TenantGateway{}
+	if err := c.Get(context.TODO(), types.NamespacedName{Name: "cozystack", Namespace: "tenant-edge"}, tgw); err != nil {
+		t.Fatalf("get TenantGateway: %v", err)
+	}
+	tgw.Spec.CertMode = gatewayv1alpha1.CertModeEdge
+	tgw.Spec.GatewayClassName = "cloudflare-tunnel"
+	if err := c.Update(context.TODO(), tgw); err != nil {
+		t.Fatalf("move the tenant onto the edge class: %v", err)
+	}
+	mustReconcile(t, c)
+
+	if _, ok := getSecret(t, c, "tenant-edge", "wildcard-tls"); ok {
+		t.Errorf("the moved tenant's replica must be pruned")
+	}
+	if _, ok := getSecret(t, c, "tenant-cilium", "wildcard-tls"); !ok {
+		t.Errorf("the neighbour's replica must survive")
+	}
+}
+
+// TestReconcile_GatewayNamespaceWithoutATenantGatewayKeepsItsReplica pins
+// the conservative default: a Gateway owner whose TenantGateway is absent
+// (created out of band, or mid-install) counts as terminating, so a missing
+// object never prunes key material.
+func TestReconcile_GatewayNamespaceWithoutATenantGatewayKeepsItsReplica(t *testing.T) {
+	s := newScheme(t)
+	c := fake.NewClientBuilder().WithScheme(s).WithObjects(
+		configSecret("wildcard-tls", "tenant-root"),
+		tlsSecret("tenant-root", "wildcard-tls", map[string][]byte{"tls.crt": []byte("CRT"), "tls.key": []byte("KEY")}),
+		terminationNS("tenant-bar", "gateway"),
+	).Build()
+	mustReconcile(t, c)
+
+	if _, ok := getSecret(t, c, "tenant-bar", "wildcard-tls"); !ok {
+		t.Errorf("a Gateway namespace with no TenantGateway must keep its replica")
+	}
+}
+
+// TestOwnsTerminationPointKeepsTheKeyWhenTenantGatewayCannotBeRead pins the
+// value the error path returns, not just the fact that it errors. A read
+// failure must answer "still terminating", so the key survives no matter
+// what the caller decides to do with the error — today it aborts the
+// reconcile, and the next person to make it skip the namespace instead
+// would otherwise prune live key material on a transient API blip.
+func TestOwnsTerminationPointKeepsTheKeyWhenTenantGatewayCannotBeRead(t *testing.T) {
+	s := newScheme(t)
+	ns := &corev1.Namespace{ObjectMeta: metav1.ObjectMeta{
+		Name:   "tenant-bar",
+		Labels: map[string]string{gatewayOwnerLabel: "tenant-bar"},
+	}}
+	base := fake.NewClientBuilder().WithScheme(s).WithObjects(ns).Build()
+	c := interceptor.NewClient(base, interceptor.Funcs{
+		List: func(ctx context.Context, cl client.WithWatch, list client.ObjectList, opts ...client.ListOption) error {
+			if _, ok := list.(*gatewayv1alpha1.TenantGatewayList); ok {
+				return errors.New("apiserver unavailable")
+			}
+			return cl.List(ctx, list, opts...)
+		},
+	})
+
+	r := &Reconciler{Client: c}
+	terminates, err := r.ownsTerminationPoint(context.TODO(), ns)
+	if err == nil {
+		t.Fatalf("expected the read failure to be surfaced")
+	}
+	if !terminates {
+		t.Errorf("a namespace whose TenantGateway cannot be read must count as terminating, so its key is kept")
+	}
+}
+
+// TestOwnsTerminationPointKeepsTheKeyWhileAnyGatewayTerminates pins the
+// question the controller is actually asking. A namespace holding two
+// TenantGateways — a stale or hand-made one on an edge class next to the
+// chart-rendered one that still terminates — must keep its wildcard: the
+// key is withdrawn only when NOTHING there terminates any more.
+func TestOwnsTerminationPointKeepsTheKeyWhileAnyGatewayTerminates(t *testing.T) {
+	s := newScheme(t)
+	ns := &corev1.Namespace{ObjectMeta: metav1.ObjectMeta{
+		Name:   "tenant-foo",
+		Labels: map[string]string{gatewayOwnerLabel: "tenant-foo"},
+	}}
+	stale := edgeTenantGateway("tenant-foo")
+	stale.Name = "leftover"
+	canonical := terminatingTenantGateway("tenant-foo")
+
+	c := fake.NewClientBuilder().WithScheme(s).WithObjects(ns, stale, canonical).Build()
+	r := &Reconciler{Client: c}
+	terminates, err := r.ownsTerminationPoint(context.TODO(), ns)
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+	if !terminates {
+		t.Errorf("a namespace with a still-terminating Gateway must keep its key, whatever else sits next to it")
+	}
+}
diff --git a/internal/controller/workloadmonitor_controller.go b/internal/controller/workloadmonitor_controller.go
index 35906a874d..2bcd136559 100644
--- a/internal/controller/workloadmonitor_controller.go
+++ b/internal/controller/workloadmonitor_controller.go
@@ -3,25 +3,40 @@ package controller
 import (
 	"context"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"io"
+	"maps"
 	"net/http"
 	"net/url"
 	"sort"
 	"strconv"
 	"strings"
+	"sync"
 	"time"
 
+	"k8s.io/apimachinery/pkg/api/equality"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	"k8s.io/apimachinery/pkg/api/meta"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/types"
+	"k8s.io/apimachinery/pkg/util/validation"
+	"k8s.io/apimachinery/pkg/util/wait"
+	toolscache "k8s.io/client-go/tools/cache"
+	"k8s.io/client-go/tools/record"
 	"k8s.io/client-go/util/retry"
+	"k8s.io/client-go/util/workqueue"
 	"k8s.io/utils/pointer"
 	ctrl "sigs.k8s.io/controller-runtime"
+	"sigs.k8s.io/controller-runtime/pkg/cache"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/handler"
 	"sigs.k8s.io/controller-runtime/pkg/log"
+	"sigs.k8s.io/controller-runtime/pkg/manager"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
+	"sigs.k8s.io/controller-runtime/pkg/source"
 
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
@@ -45,6 +60,9 @@ const (
 	vmSelectService = "vmselect-shortterm"
 	vmSelectPort    = "8481"
 	vmSelectPath    = "/select/0/prometheus"
+	// Resource keys reported on bucket Workloads.
+	resourceS3StorageBytes         = "s3-storage-bytes"
+	resourceS3PhysicalStorageBytes = "s3-physical-storage-bytes"
 )
 
 // prometheusHTTPClient is a dedicated HTTP client for Prometheus queries,
@@ -54,7 +72,290 @@ var prometheusHTTPClient = &http.Client{Timeout: 10 * time.Second}
 // WorkloadMonitorReconciler reconciles a WorkloadMonitor object
 type WorkloadMonitorReconciler struct {
 	client.Client
-	Scheme *runtime.Scheme
+	Scheme   *runtime.Scheme
+	Recorder record.EventRecorder
+	// SeaweedfsMetricsEndpoint, when non-empty, is the base URL of the
+	// Prometheus-compatible query API to fetch SeaweedFS bucket size metrics
+	// from, instead of discovering the monitoring stack via the
+	// namespace.cozystack.io/monitoring label. Used when SeaweedFS and the
+	// stack that scrapes it run outside this cluster.
+	SeaweedfsMetricsEndpoint string
+	// DataVolumeReader reads CDI DataVolumes. Nil until the DataVolume informer
+	// has synced; until then a monitor keeps its stored DataVolume verdict.
+	DataVolumeReader client.Reader
+	dataVolumeMu     sync.RWMutex
+	// dataVolumeWatchSyncing is set while the DataVolume watch is started and
+	// its reader is not installed yet. The source replays every DataVolume to
+	// the handler in that window, and a reconcile it queues must be requeued:
+	// nothing queues it again once the reader is in place.
+	dataVolumeWatchSyncing bool
+	// dataVolumeWatchStarted is set once Watch has started the DataVolume
+	// source. A started Kind source adds an event handler to the informer and
+	// never removes it, so a retry waits for the sync instead of watching again.
+	dataVolumeWatchStarted bool
+	// reconciled is closed by the first Reconcile. controller-runtime starts the
+	// workers only after the controller has started its sources
+	// (pkg/internal/controller/controller.go, Controller.Start), so from then on
+	// Watch starts a new source itself instead of queueing it for Start.
+	reconciled     chan struct{}
+	reconciledOnce sync.Once
+}
+
+const (
+	// dataVolumeAPIPollInterval is how often the controller looks for the
+	// DataVolume kind until CDI is installed.
+	dataVolumeAPIPollInterval = 30 * time.Second
+	// dataVolumeSyncTimeout bounds the wait for the DataVolume informer to sync.
+	// A reconcile context has no deadline, so a reader installed on an informer
+	// that never syncs would park every WorkloadMonitor reconcile for good.
+	dataVolumeSyncTimeout = time.Minute
+	dataVolumeSyncRequeue = 5 * time.Second
+)
+
+var errDataVolumeWatchSyncing = errors.New("the DataVolume watch has not synced yet")
+
+func (r *WorkloadMonitorReconciler) dataVolumeReader() (client.Reader, error) {
+	r.dataVolumeMu.RLock()
+	defer r.dataVolumeMu.RUnlock()
+	if r.DataVolumeReader == nil && r.dataVolumeWatchSyncing {
+		return nil, errDataVolumeWatchSyncing
+	}
+	return r.DataVolumeReader, nil
+}
+
+func (r *WorkloadMonitorReconciler) reconciledCh() chan struct{} {
+	r.dataVolumeMu.Lock()
+	defer r.dataVolumeMu.Unlock()
+	if r.reconciled == nil {
+		r.reconciled = make(chan struct{})
+	}
+	return r.reconciled
+}
+
+func (r *WorkloadMonitorReconciler) setDataVolumeWatchSyncing(syncing bool) {
+	r.dataVolumeMu.Lock()
+	defer r.dataVolumeMu.Unlock()
+	r.dataVolumeWatchSyncing = syncing
+}
+
+var dataVolumeGVK = schema.GroupVersionKind{Group: "cdi.kubevirt.io", Version: "v1beta1", Kind: "DataVolume"}
+
+// dataVolumeInFlightPhases are the DataVolumePhase values in which CDI still has
+// work to do on the disk (containerized-data-importer-api pkg/apis/core/v1beta1).
+// A phase outside this set counts as settled, so a CDI release that adds or
+// renames a phase cannot turn working disks non-operational; the price is that
+// a renamed in-flight phase reads as settled until this list follows it.
+// PendingPopulation and WaitForFirstConsumer are where a disk on a
+// WaitForFirstConsumer class rests until a VM consumes it, so neither is in
+// flight. UploadReady is in flight although it lasts until someone uploads:
+// CDI holds it from the moment the upload server is ready until the transfer
+// succeeds (pkg/controller/datavolume/upload-controller.go), so it covers an
+// empty disk and a half-uploaded one alike.
+// Paused is where a multi-stage (checkpoint) import waits for its next
+// checkpoint, which only an outside actor supplies; the
+// vm-disk chart renders no checkpoint source, so no disk of it gets there.
+var dataVolumeInFlightPhases = map[string]bool{
+	"Pending":                           true,
+	"PVCBound":                          true,
+	"ImportScheduled":                   true,
+	"ImportInProgress":                  true,
+	"CloneScheduled":                    true,
+	"CloneInProgress":                   true,
+	"SnapshotForSmartCloneInProgress":   true,
+	"CloneFromSnapshotSourceInProgress": true,
+	"SmartClonePVCInProgress":           true,
+	"CSICloneInProgress":                true,
+	"PrepClaimInProgress":               true,
+	"RebindInProgress":                  true,
+	"ExpansionInProgress":               true,
+	"NamespaceTransferInProgress":       true,
+	"UploadScheduled":                   true,
+	"UploadReady":                       true,
+}
+
+// isDataVolumeReady reports whether CDI is done with the disk. Failed and
+// Unknown are not ready, and neither is a DataVolume without a phase: CDI
+// leaves one there when it could not render the PVC spec.
+func isDataVolumeReady(dv *unstructured.Unstructured) bool {
+	phase, _, _ := unstructured.NestedString(dv.Object, "status", "phase")
+	switch phase {
+	case "", "Failed", "Unknown":
+		return false
+	}
+	return !dataVolumeInFlightPhases[phase]
+}
+
+// dataVolumeFailureMessage returns why the DataVolume's pod is not running, or
+// "" when nothing says so. A source that keeps failing (404, DNS) never moves
+// the phase off ImportInProgress, because CDI only fails the import on a fatal
+// error and restarts the pod otherwise (updateStatusPhase in
+// pkg/controller/datavolume/import-controller.go). The Running condition holds
+// the clean error text: CDI keeps it through the back-off between restarts and
+// clears it while the pod runs, and Bound repeats it behind PVC details.
+// Unknown is not a failure, so only False is read. For a host-assisted clone
+// CDI joins the target and source messages as "<target> and <source>"
+// (updateWithTargetNotRunning in pkg/controller/datavolume/conditions.go), so
+// empty halves are dropped instead of reporting " and ".
+func dataVolumeFailureMessage(dv *unstructured.Unstructured) string {
+	conditions, _, _ := unstructured.NestedSlice(dv.Object, "status", "conditions")
+	for _, c := range conditions {
+		cond, ok := c.(map[string]any)
+		if !ok || cond["type"] != "Running" || cond["status"] != "False" {
+			continue
+		}
+		message, _ := cond["message"].(string)
+		var parts []string
+		for _, part := range strings.Split(message, " and ") {
+			if part != "" {
+				parts = append(parts, part)
+			}
+		}
+		return strings.Join(parts, " and ")
+	}
+	return ""
+}
+
+// dataVolumeAPIServed treats a NoMatch as not served and returns any other
+// discovery error, so the caller retries instead of concluding CDI is absent.
+func dataVolumeAPIServed(mapper meta.RESTMapper) (bool, error) {
+	_, err := mapper.RESTMapping(dataVolumeGVK.GroupKind(), dataVolumeGVK.Version)
+	if meta.IsNoMatchError(err) {
+		return false, nil
+	}
+	return err == nil, err
+}
+
+type sourceWatcher interface {
+	Watch(src source.Source) error
+}
+
+// tryStartDataVolumeWatch registers the DataVolume watch and reader once the
+// kind is served, and reports whether it did. The reader is set only after the
+// informer has synced: the cache blocks a List on an unsynced informer until
+// the caller's context ends. The source is started once, on the manager's
+// context, and a call that times out leaves it running for the next call to
+// wait on.
+func (r *WorkloadMonitorReconciler) tryStartDataVolumeWatch(ctx context.Context, mapper meta.RESTMapper, c sourceWatcher, informers cache.Cache, syncTimeout time.Duration) (bool, error) {
+	served, err := dataVolumeAPIServed(mapper)
+	if err != nil || !served {
+		return false, err
+	}
+	dv := &unstructured.Unstructured{}
+	dv.SetGroupVersionKind(dataVolumeGVK)
+	if !r.dataVolumeWatchStarted {
+		src := source.Kind[client.Object](informers, dv,
+			handler.EnqueueRequestsFromMapFunc(mapObjectToMonitor(client.Object(dv), r.Client)))
+		r.setDataVolumeWatchSyncing(true)
+		if err := c.Watch(src); err != nil {
+			r.setDataVolumeWatchSyncing(false)
+			return false, fmt.Errorf("watching DataVolumes: %w", err)
+		}
+		r.dataVolumeWatchStarted = true
+	}
+	syncCtx, cancel := context.WithTimeout(ctx, syncTimeout)
+	defer cancel()
+	informer, err := informers.GetInformer(syncCtx, dv)
+	if err == nil && !toolscache.WaitForCacheSync(syncCtx.Done(), informer.HasSynced) {
+		err = syncCtx.Err()
+	}
+	if ctxErr := ctx.Err(); ctxErr != nil {
+		return false, ctxErr
+	}
+	if err != nil {
+		return false, fmt.Errorf("waiting for the DataVolume informer to sync: %w", err)
+	}
+	r.dataVolumeMu.Lock()
+	// The manager's client reads unstructured objects straight from the API
+	// server; the cache shares the informer the watch above starts.
+	r.DataVolumeReader = informers
+	r.dataVolumeWatchSyncing = false
+	r.dataVolumeMu.Unlock()
+	// A reconcile that ran before the watch started kept its stored verdict and
+	// was not requeued, and the source's replay cannot deliver a DataVolume
+	// deleted while the controller was down.
+	if err := c.Watch(source.Func(r.enqueueMonitorsWithDataVolumeVerdict)); err != nil {
+		return false, fmt.Errorf("queueing monitors with a DataVolume verdict: %w", err)
+	}
+	return true, nil
+}
+
+func (r *WorkloadMonitorReconciler) enqueueMonitorsWithDataVolumeVerdict(ctx context.Context, queue workqueue.TypedRateLimitingInterface[reconcile.Request]) error {
+	var monitors cozyv1alpha1.WorkloadMonitorList
+	if err := r.List(ctx, &monitors); err != nil {
+		return err
+	}
+	for i := range monitors.Items {
+		if monitors.Items[i].Status.Message != "" {
+			queue.Add(reconcile.Request{NamespacedName: client.ObjectKeyFromObject(&monitors.Items[i])})
+		}
+	}
+	return nil
+}
+
+// watchDataVolumes adds the DataVolume watch once the first reconcile has run
+// and the kind is served, checking discovery again every interval until it is.
+// Starting on the first reconcile rather than on the next tick keeps a disk
+// created right after a controller restart from reading populated until then.
+func (r *WorkloadMonitorReconciler) watchDataVolumes(ctx context.Context, mapper meta.RESTMapper, c sourceWatcher, informers cache.Cache, interval time.Duration) {
+	select {
+	case <-ctx.Done():
+		return
+	case <-r.reconciledCh():
+	}
+	logger := log.FromContext(ctx)
+	// The condition never returns an error, so the poll ends only when the
+	// watch is added or the manager stops.
+	_ = wait.PollUntilContextCancel(ctx, interval, true, func(ctx context.Context) (bool, error) {
+		done, err := r.tryStartDataVolumeWatch(ctx, mapper, c, informers, dataVolumeSyncTimeout)
+		if err != nil {
+			logger.Error(err, "Unable to start the DataVolume watch, retrying")
+		}
+		return done, nil
+	})
+}
+
+// dataVolumesMessage names every DataVolume the monitor selects that is not
+// ready, with its phase, and is empty when there is none; notReady holds their
+// names. A NoMatch from the reader counts as no DataVolumes. read is false when
+// the DataVolumes could not be read: no reader yet, or a failed List.
+func (r *WorkloadMonitorReconciler) dataVolumesMessage(ctx context.Context, monitor *cozyv1alpha1.WorkloadMonitor) (message string, notReady map[string]bool, read bool, err error) {
+	reader, err := r.dataVolumeReader()
+	if reader == nil {
+		return "", nil, false, err
+	}
+	list := &unstructured.UnstructuredList{}
+	list.SetGroupVersionKind(dataVolumeGVK.GroupVersion().WithKind(dataVolumeGVK.Kind + "List"))
+	if err := reader.List(
+		ctx,
+		list,
+		client.InNamespace(monitor.Namespace),
+		client.MatchingLabels(monitor.Spec.Selector),
+	); err != nil {
+		if meta.IsNoMatchError(err) {
+			return "", nil, true, nil
+		}
+		return "", nil, false, err
+	}
+	var stuck []string
+	notReady = map[string]bool{}
+	for i := range list.Items {
+		dv := &list.Items[i]
+		if isDataVolumeReady(dv) {
+			continue
+		}
+		notReady[dv.GetName()] = true
+		phase, _, _ := unstructured.NestedString(dv.Object, "status", "phase")
+		entry := fmt.Sprintf("DataVolume %s is %s", dv.GetName(), phase)
+		if phase == "" {
+			entry = fmt.Sprintf("DataVolume %s has no phase", dv.GetName())
+		}
+		if cause := dataVolumeFailureMessage(dv); cause != "" {
+			entry += ": " + cause
+		}
+		stuck = append(stuck, entry)
+	}
+	sort.Strings(stuck)
+	return strings.Join(stuck, "; "), notReady, true, nil
 }
 
 // +kubebuilder:rbac:groups=cozystack.io,resources=workloadmonitors,verbs=get;list;watch;create;update;patch;delete
@@ -64,7 +365,9 @@ type WorkloadMonitorReconciler struct {
 // +kubebuilder:rbac:groups=core,resources=pods,verbs=get;list;watch
 // +kubebuilder:rbac:groups=core,resources=persistentvolumeclaims,verbs=get;list;watch
 // +kubebuilder:rbac:groups=core,resources=namespaces,verbs=get
+// +kubebuilder:rbac:groups=core,resources=events,verbs=create;patch
 // +kubebuilder:rbac:groups=objectstorage.k8s.io,resources=bucketclaims,verbs=get;list;watch
+// +kubebuilder:rbac:groups=cdi.kubevirt.io,resources=datavolumes,verbs=get;list;watch
 
 // isBucketClaimReady checks if the BucketClaim has been provisioned.
 func (r *WorkloadMonitorReconciler) isBucketClaimReady(bc *cosiv1alpha1.BucketClaim) bool {
@@ -135,21 +438,49 @@ func updateOwnerReferences(obj metav1.Object, monitor client.Object) {
 	obj.SetOwnerReferences(owners)
 }
 
+// ParseMetricsEndpointURL validates an administrator-supplied metrics endpoint
+// URL and normalizes it to a base without a trailing slash, so that appending
+// /api/v1/query never doubles or drops a slash. Userinfo is allowed: net/http
+// turns it into basic auth on every request.
+func ParseMetricsEndpointURL(raw string) (string, error) {
+	u, err := url.Parse(raw)
+	if err != nil {
+		return "", err
+	}
+	if u.Scheme != "http" && u.Scheme != "https" {
+		return "", fmt.Errorf("scheme must be http or https, got %q", u.Scheme)
+	}
+	if u.Host == "" {
+		return "", fmt.Errorf("URL must be absolute with a host")
+	}
+	if u.RawQuery != "" || u.Fragment != "" {
+		return "", fmt.Errorf("URL must not carry a query string or fragment")
+	}
+	return strings.TrimRight(u.String(), "/"), nil
+}
+
 // resolvePrometheusURL returns the Prometheus-compatible API base URL for the given namespace.
-// It reads the namespace.cozystack.io/monitoring label to find the monitoring namespace,
-// then constructs the vmselect URL. Returns empty string if monitoring is not configured.
-func (r *WorkloadMonitorReconciler) resolvePrometheusURL(ctx context.Context, namespace string) string {
-	logger := log.FromContext(ctx)
+// The SeaweedfsMetricsEndpoint override, when configured, takes precedence; otherwise the
+// namespace.cozystack.io/monitoring label names the monitoring namespace and the well-known
+// vmselect URL inside it is constructed. Returns empty string if monitoring is not configured.
+func (r *WorkloadMonitorReconciler) resolvePrometheusURL(ctx context.Context, namespace string) (string, error) {
+	if r.SeaweedfsMetricsEndpoint != "" {
+		return r.SeaweedfsMetricsEndpoint, nil
+	}
 	ns := &corev1.Namespace{}
 	if err := r.Get(ctx, types.NamespacedName{Name: namespace}, ns); err != nil {
-		logger.V(1).Info("Failed to read namespace for monitoring resolution", "namespace", namespace, "error", err)
-		return ""
+		// The namespace is the monitor's own, so NotFound only happens while
+		// it is being deleted; there is no monitoring to resolve then.
+		if apierrors.IsNotFound(err) {
+			return "", nil
+		}
+		return "", fmt.Errorf("reading namespace %s: %w", namespace, err)
 	}
 	monitoringNS := ns.Labels[namespaceMonitoringLabel]
 	if monitoringNS == "" {
-		return ""
+		return "", nil
 	}
-	return fmt.Sprintf("http://%s.%s.svc:%s%s", vmSelectService, monitoringNS, vmSelectPort, vmSelectPath)
+	return fmt.Sprintf("http://%s.%s.svc:%s%s", vmSelectService, monitoringNS, vmSelectPort, vmSelectPath), nil
 }
 
 // bucketMetrics holds size metrics for a single bucket, keyed by metric name.
@@ -164,18 +495,21 @@ type bucketMetrics struct {
 // bucket names in a single Prometheus query and returns them keyed by bucket
 // name. The query is scoped to only the requested buckets to avoid fetching
 // metrics for buckets belonging to other WorkloadMonitors.
-func (r *WorkloadMonitorReconciler) queryAllBucketMetrics(ctx context.Context, prometheusBaseURL string, bucketNames []string) map[string]*bucketMetrics {
+//
+// Any failure to obtain a well-formed answer is returned as an error, never as
+// an empty result: the sizes feed billing, and the caller must be able to tell
+// "the endpoint said the bucket is empty" apart from "the endpoint could not
+// be queried".
+func (r *WorkloadMonitorReconciler) queryAllBucketMetrics(ctx context.Context, prometheusBaseURL string, bucketNames []string) (map[string]*bucketMetrics, error) {
 	result := make(map[string]*bucketMetrics)
 	if prometheusBaseURL == "" || len(bucketNames) == 0 {
-		return result
+		return result, nil
 	}
-	logger := log.FromContext(ctx)
 
 	query := fmt.Sprintf(`{__name__=~"SeaweedFS_s3_bucket_(size|physical_size)_bytes",bucket=~"%s"}`, strings.Join(bucketNames, "|"))
 	u, err := url.Parse(strings.TrimRight(prometheusBaseURL, "/") + "/api/v1/query")
 	if err != nil {
-		logger.Error(err, "Failed to parse Prometheus URL")
-		return result
+		return nil, fmt.Errorf("parsing Prometheus URL: %w", err)
 	}
 	u.RawQuery = url.Values{"query": {query}}.Encode()
 
@@ -184,26 +518,22 @@ func (r *WorkloadMonitorReconciler) queryAllBucketMetrics(ctx context.Context, p
 
 	req, err := http.NewRequestWithContext(httpCtx, http.MethodGet, u.String(), nil)
 	if err != nil {
-		logger.Error(err, "Failed to create Prometheus request")
-		return result
+		return nil, fmt.Errorf("creating Prometheus request: %w", err)
 	}
 
 	resp, err := prometheusHTTPClient.Do(req)
 	if err != nil {
-		logger.V(1).Info("Failed to query Prometheus for bucket metrics", "error", err)
-		return result
+		return nil, fmt.Errorf("querying Prometheus: %w", err)
 	}
 	defer resp.Body.Close()
 
 	if resp.StatusCode != http.StatusOK {
-		logger.V(1).Info("Prometheus returned non-OK status for bucket metrics", "status", resp.StatusCode)
-		return result
+		return nil, fmt.Errorf("Prometheus returned status %d", resp.StatusCode)
 	}
 
 	body, err := io.ReadAll(io.LimitReader(resp.Body, 4<<20))
 	if err != nil {
-		logger.Error(err, "Failed to read Prometheus response")
-		return result
+		return nil, fmt.Errorf("reading Prometheus response: %w", err)
 	}
 
 	var promResp struct {
@@ -216,11 +546,10 @@ func (r *WorkloadMonitorReconciler) queryAllBucketMetrics(ctx context.Context, p
 		} `json:"data"`
 	}
 	if err := json.Unmarshal(body, &promResp); err != nil {
-		logger.Error(err, "Failed to parse Prometheus response")
-		return result
+		return nil, fmt.Errorf("parsing Prometheus response: %w", err)
 	}
 	if promResp.Status != "success" {
-		return result
+		return nil, fmt.Errorf("Prometheus query finished with status %q", promResp.Status)
 	}
 
 	for _, r := range promResp.Data.Result {
@@ -255,7 +584,7 @@ func (r *WorkloadMonitorReconciler) queryAllBucketMetrics(ctx context.Context, p
 		}
 	}
 
-	return result
+	return result, nil
 }
 
 // reconcileBucketClaimForMonitor creates or updates a Workload object for the given BucketClaim and WorkloadMonitor.
@@ -274,20 +603,6 @@ func (r *WorkloadMonitorReconciler) reconcileBucketClaimForMonitor(
 		},
 	}
 
-	resources := make(map[string]resource.Quantity)
-
-	// Look up pre-fetched bucket metrics by the SeaweedFS bucket name.
-	// bc.Status.BucketName is the COSI Bucket name, which the COSI driver
-	// uses directly as the SeaweedFS bucket name.
-	if bm, ok := allMetrics[bc.Status.BucketName]; ok {
-		if bm.HasLogical {
-			resources["s3-storage-bytes"] = *resource.NewQuantity(bm.LogicalSize, resource.BinarySI)
-		}
-		if bm.HasPhysical {
-			resources["s3-physical-storage-bytes"] = *resource.NewQuantity(bm.PhysicalSize, resource.BinarySI)
-		}
-	}
-
 	monitorLabels := r.getMonitorLabels(monitor)
 	_, err := ctrl.CreateOrUpdate(ctx, r.Client, workload, func() error {
 		updateOwnerReferences(workload.GetObjectMeta(), &bc)
@@ -296,13 +611,42 @@ func (r *WorkloadMonitorReconciler) reconcileBucketClaimForMonitor(
 			workload.Labels = make(map[string]string)
 		}
 		// Apply monitor-level labels first so source-object labels can override on conflict
-		for k, v := range monitorLabels {
-			workload.Labels[k] = v
+		maps.Copy(workload.Labels, monitorLabels)
+		maps.Copy(workload.Labels, bc.Labels)
+		workload.Labels[workloadMonitorLabel] = monitor.Name
+
+		delete(workload.Labels, "workloads.cozystack.io/bucket-class")
+		if bc.Spec.BucketClassName != "" {
+			if errs := validation.IsValidLabelValue(bc.Spec.BucketClassName); len(errs) == 0 {
+				workload.Labels["workloads.cozystack.io/bucket-class"] = bc.Spec.BucketClassName
+			} else {
+				logger.Info("Skipping bucket-class label: not a valid label value",
+					"bucketClaim", bc.Name, "bucketClassName", bc.Spec.BucketClassName, "errors", errs)
+			}
 		}
-		for k, v := range bc.Labels {
-			workload.Labels[k] = v
+
+		// Start from the sizes already recorded on the Workload: when the
+		// metrics endpoint is unreachable or reports nothing for this bucket,
+		// the last known good values must survive rather than collapse to
+		// "no size", which billing would read as an empty bucket.
+		resources := make(map[string]resource.Quantity)
+		for _, key := range []string{resourceS3StorageBytes, resourceS3PhysicalStorageBytes} {
+			if q, ok := workload.Status.Resources[key]; ok {
+				resources[key] = q
+			}
+		}
+
+		// Look up pre-fetched bucket metrics by the SeaweedFS bucket name.
+		// bc.Status.BucketName is the COSI Bucket name, which the COSI driver
+		// uses directly as the SeaweedFS bucket name.
+		if bm, ok := allMetrics[bc.Status.BucketName]; ok {
+			if bm.HasLogical {
+				resources[resourceS3StorageBytes] = *resource.NewQuantity(bm.LogicalSize, resource.BinarySI)
+			}
+			if bm.HasPhysical {
+				resources[resourceS3PhysicalStorageBytes] = *resource.NewQuantity(bm.PhysicalSize, resource.BinarySI)
+			}
 		}
-		workload.Labels[workloadMonitorLabel] = monitor.Name
 
 		workload.Status.Kind = monitor.Spec.Kind
 		workload.Status.Type = monitor.Spec.Type
@@ -364,12 +708,8 @@ func (r *WorkloadMonitorReconciler) reconcileServiceForMonitor(
 		if workload.Labels == nil {
 			workload.Labels = make(map[string]string)
 		}
-		for k, v := range monitorLabels {
-			workload.Labels[k] = v
-		}
-		for k, v := range svc.Labels {
-			workload.Labels[k] = v
-		}
+		maps.Copy(workload.Labels, monitorLabels)
+		maps.Copy(workload.Labels, svc.Labels)
 		workload.Labels[workloadMonitorLabel] = monitor.Name
 
 		// Fill Workload status fields:
@@ -389,10 +729,15 @@ func (r *WorkloadMonitorReconciler) reconcileServiceForMonitor(
 }
 
 // reconcilePVCForMonitor creates or updates a Workload object for the given PVC and WorkloadMonitor.
+// A PVC whose controller is a DataVolume in notReadyDataVolumes is not
+// operational however it is bound; when the DataVolumes could not be read,
+// such a PVC keeps the verdict its Workload already carries.
 func (r *WorkloadMonitorReconciler) reconcilePVCForMonitor(
 	ctx context.Context,
 	monitor *cozyv1alpha1.WorkloadMonitor,
 	pvc corev1.PersistentVolumeClaim,
+	notReadyDataVolumes map[string]bool,
+	dataVolumesRead bool,
 ) error {
 	logger := log.FromContext(ctx)
 	workload := &cozyv1alpha1.Workload{
@@ -407,7 +752,7 @@ func (r *WorkloadMonitorReconciler) reconcilePVCForMonitor(
 
 	for resourceName, resourceQuantity := range pvc.Status.Capacity {
 		storageClass := "default"
-		if pvc.Spec.StorageClassName != nil || *pvc.Spec.StorageClassName == "" {
+		if pvc.Spec.StorageClassName != nil && *pvc.Spec.StorageClassName != "" {
 			storageClass = *pvc.Spec.StorageClassName
 		}
 		resourceLabel := fmt.Sprintf("%s.storageclass.storage.k8s.io/requests.%s", storageClass, resourceName.String())
@@ -423,19 +768,26 @@ func (r *WorkloadMonitorReconciler) reconcilePVCForMonitor(
 		if workload.Labels == nil {
 			workload.Labels = make(map[string]string)
 		}
-		for k, v := range monitorLabels {
-			workload.Labels[k] = v
-		}
-		for k, v := range pvc.Labels {
-			workload.Labels[k] = v
-		}
+		maps.Copy(workload.Labels, monitorLabels)
+		maps.Copy(workload.Labels, pvc.Labels)
 		workload.Labels[workloadMonitorLabel] = monitor.Name
 
 		// Fill Workload status fields:
 		workload.Status.Kind = monitor.Spec.Kind
 		workload.Status.Type = monitor.Spec.Type
 		workload.Status.Resources = resources
-		workload.Status.Operational = r.isPVCReady(&pvc)
+		operational := r.isPVCReady(&pvc)
+		if owner := metav1.GetControllerOf(&pvc); owner != nil && owner.Kind == dataVolumeGVK.Kind && owner.APIVersion == dataVolumeGVK.GroupVersion().String() {
+			switch {
+			case !dataVolumesRead:
+				if workload.ResourceVersion != "" {
+					operational = workload.Status.Operational
+				}
+			case notReadyDataVolumes[owner.Name]:
+				operational = false
+			}
+		}
+		workload.Status.Operational = operational
 
 		return nil
 	})
@@ -505,18 +857,12 @@ func (r *WorkloadMonitorReconciler) reconcilePodForMonitor(
 		if workload.Labels == nil {
 			workload.Labels = make(map[string]string)
 		}
-		for k, v := range monitorLabels {
-			workload.Labels[k] = v
-		}
-		for k, v := range pod.Labels {
-			workload.Labels[k] = v
-		}
+		maps.Copy(workload.Labels, monitorLabels)
+		maps.Copy(workload.Labels, pod.Labels)
 		workload.Labels[workloadMonitorLabel] = monitor.Name
 
 		// Add workload meta to labels
-		for k, v := range metaLabels {
-			workload.Labels[k] = v
-		}
+		maps.Copy(workload.Labels, metaLabels)
 
 		// Fill Workload status fields:
 		workload.Status.Kind = monitor.Spec.Kind
@@ -538,6 +884,7 @@ func (r *WorkloadMonitorReconciler) reconcilePodForMonitor(
 // 1. It reconciles WorkloadMonitor objects themselves (create/update/delete).
 // 2. It also reconciles Pod events mapped to WorkloadMonitor via label selector.
 func (r *WorkloadMonitorReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
+	r.reconciledOnce.Do(func() { close(r.reconciledCh()) })
 	logger := log.FromContext(ctx)
 
 	// Fetch the WorkloadMonitor object if it exists
@@ -578,6 +925,21 @@ func (r *WorkloadMonitorReconciler) Reconcile(ctx context.Context, req ctrl.Requ
 		}
 	}
 
+	dataVolumesMessage, notReadyDataVolumes, dataVolumesRead, dataVolumesErr := r.dataVolumesMessage(ctx, monitor)
+	// The sync window is expected; an error here would count as a
+	// reconcile failure for every monitor in the cluster while it lasts.
+	dataVolumeWatchSyncing := errors.Is(dataVolumesErr, errDataVolumeWatchSyncing)
+	if dataVolumeWatchSyncing {
+		dataVolumesErr = nil
+	}
+	if dataVolumesErr != nil {
+		logger.Error(dataVolumesErr, "Unable to read DataVolumes for WorkloadMonitor, keeping the last DataVolume verdict", "monitor", monitor.Name)
+		if r.Recorder != nil {
+			r.Recorder.Eventf(monitor, corev1.EventTypeWarning, "DataVolumesUnavailable",
+				"Failed to read DataVolumes, keeping the last DataVolume verdict: %v", dataVolumesErr)
+		}
+	}
+
 	pvcList := &corev1.PersistentVolumeClaimList{}
 	if err := r.List(
 		ctx,
@@ -590,7 +952,7 @@ func (r *WorkloadMonitorReconciler) Reconcile(ctx context.Context, req ctrl.Requ
 	}
 
 	for _, pvc := range pvcList.Items {
-		if err := r.reconcilePVCForMonitor(ctx, monitor, pvc); err != nil {
+		if err := r.reconcilePVCForMonitor(ctx, monitor, pvc, notReadyDataVolumes, dataVolumesRead); err != nil {
 			logger.Error(err, "Failed to reconcile Workload for PVC", "PVC", pvc.Name)
 			continue
 		}
@@ -628,15 +990,31 @@ func (r *WorkloadMonitorReconciler) Reconcile(ctx context.Context, req ctrl.Requ
 		return ctrl.Result{}, err
 	}
 
+	var bucketMetricsErr error
 	if len(bucketClaimList.Items) > 0 {
-		bucketPromURL := r.resolvePrometheusURL(ctx, monitor.Namespace)
 		var bucketNames []string
 		for _, bc := range bucketClaimList.Items {
 			if bc.Status.BucketName != "" {
 				bucketNames = append(bucketNames, bc.Status.BucketName)
 			}
 		}
-		allBucketMetrics := r.queryAllBucketMetrics(ctx, bucketPromURL, bucketNames)
+		var allBucketMetrics map[string]*bucketMetrics
+		bucketPromURL, err := r.resolvePrometheusURL(ctx, monitor.Namespace)
+		if err == nil {
+			allBucketMetrics, err = r.queryAllBucketMetrics(ctx, bucketPromURL, bucketNames)
+		}
+		if err != nil {
+			// Never let a metrics failure degrade into "bucket size = 0":
+			// the Workloads below are still reconciled, but they keep their
+			// last known sizes, and the failure is surfaced via an event,
+			// the log, and the returned error.
+			bucketMetricsErr = fmt.Errorf("fetching bucket size metrics: %w", err)
+			logger.Error(bucketMetricsErr, "Retaining last known bucket sizes", "monitor", monitor.Name)
+			if r.Recorder != nil {
+				r.Recorder.Eventf(monitor, corev1.EventTypeWarning, "BucketMetricsUnavailable",
+					"Failed to fetch bucket size metrics, retaining last known values: %v", err)
+			}
+		}
 		for _, bc := range bucketClaimList.Items {
 			if err := r.reconcileBucketClaimForMonitor(ctx, monitor, bc, allBucketMetrics); err != nil {
 				logger.Error(err, "Failed to reconcile Workload for BucketClaim", "BucketClaim", bc.Name)
@@ -655,6 +1033,7 @@ func (r *WorkloadMonitorReconciler) Reconcile(ctx context.Context, req ctrl.Requ
 		if err := r.Get(ctx, req.NamespacedName, fresh); err != nil {
 			return err
 		}
+		stored := fresh.Status.DeepCopy()
 		fresh.Status.ObservedReplicas = observedReplicas
 		fresh.Status.AvailableReplicas = availableReplicas
 
@@ -665,6 +1044,22 @@ func (r *WorkloadMonitorReconciler) Reconcile(ctx context.Context, req ctrl.Requ
 		if fresh.Spec.MinReplicas != nil && availableReplicas < *fresh.Spec.MinReplicas {
 			fresh.Status.Operational = pointer.Bool(false)
 		}
+		// Only the DataVolume check writes Message and Reason, so the stored ones
+		// are the last DataVolume verdict: kept while no reader is installed yet, so a
+		// controller restart does not report a stuck disk as ready.
+		if dataVolumesRead {
+			fresh.Status.Message = dataVolumesMessage
+			fresh.Status.Reason = ""
+			if dataVolumesMessage != "" {
+				fresh.Status.Reason = cozyv1alpha1.WorkloadMonitorReasonDataVolumeNotReady
+			}
+		}
+		if fresh.Status.Message != "" {
+			fresh.Status.Operational = pointer.Bool(false)
+		}
+		if equality.Semantic.DeepEqual(stored, &fresh.Status) {
+			return nil
+		}
 		return r.Status().Update(ctx, fresh)
 	})
 	if err != nil {
@@ -672,6 +1067,17 @@ func (r *WorkloadMonitorReconciler) Reconcile(ctx context.Context, req ctrl.Requ
 		return ctrl.Result{}, err
 	}
 
+	// Returning the metrics or DataVolume error makes the failure count in
+	// controller-runtime's reconcile error metrics and retries with backoff
+	// instead of quietly waiting for the next periodic requeue.
+	if bucketMetricsErr != nil || dataVolumesErr != nil {
+		return ctrl.Result{}, errors.Join(bucketMetricsErr, dataVolumesErr)
+	}
+
+	if dataVolumeWatchSyncing {
+		return ctrl.Result{RequeueAfter: dataVolumeSyncRequeue}, nil
+	}
+
 	// Requeue periodically if there are BucketClaims to keep sizes up to date.
 	// Bucket sizes come from Prometheus metrics that update every 60s.
 	if len(bucketClaimList.Items) > 0 {
@@ -683,7 +1089,7 @@ func (r *WorkloadMonitorReconciler) Reconcile(ctx context.Context, req ctrl.Requ
 
 // SetupWithManager registers our controller with the Manager and sets up watches.
 func (r *WorkloadMonitorReconciler) SetupWithManager(mgr ctrl.Manager) error {
-	return ctrl.NewControllerManagedBy(mgr).
+	builder := ctrl.NewControllerManagedBy(mgr).
 		// Watch WorkloadMonitor objects
 		For(&cozyv1alpha1.WorkloadMonitor{}).
 		// Also watch Pod objects and map them back to WorkloadMonitor if labels match
@@ -702,8 +1108,20 @@ func (r *WorkloadMonitorReconciler) SetupWithManager(mgr ctrl.Manager) error {
 			handler.EnqueueRequestsFromMapFunc(mapObjectToMonitor(&cosiv1alpha1.BucketClaim{}, r.Client)),
 		).
 		// Watch for changes to Workload objects we create (owned by WorkloadMonitor)
-		Owns(&cozyv1alpha1.Workload{}).
-		Complete(r)
+		Owns(&cozyv1alpha1.Workload{})
+	c, err := builder.Build(r)
+	if err != nil {
+		return err
+	}
+
+	// A watch on a kind whose CRD is absent never syncs, and controller-runtime
+	// does not start a controller with unsynced caches. CDI ships with the IaaS
+	// bundle only and can be installed while this controller is running, so
+	// the DataVolume watch is added once the kind appears rather than at setup.
+	return mgr.Add(manager.RunnableFunc(func(ctx context.Context) error {
+		r.watchDataVolumes(ctx, mgr.GetRESTMapper(), c, mgr.GetCache(), dataVolumeAPIPollInterval)
+		return nil
+	}))
 }
 
 func mapObjectToMonitor[T client.Object](_ T, c client.Client) func(ctx context.Context, obj client.Object) []reconcile.Request {
@@ -749,7 +1167,7 @@ func (r *WorkloadMonitorReconciler) getWorkloadMetadata(obj client.Object) map[s
 	if instanceType, ok := annotations["kubevirt.io/cluster-instancetype-name"]; ok {
 		labels["workloads.cozystack.io/kubevirt-vmi-instance-type"] = instanceType
 	}
-	if instanceProfile, ok := annotations["kubevirt.io/cluster-instanceprofile-name"]; ok {
+	if instanceProfile, ok := annotations["kubevirt.io/cluster-preference-name"]; ok {
 		labels["workloads.cozystack.io/kubevirt-vmi-instance-profile"] = instanceProfile
 	}
 	return labels
diff --git a/internal/controller/workloadmonitor_controller_test.go b/internal/controller/workloadmonitor_controller_test.go
index 374660f235..12ebfb2e9f 100644
--- a/internal/controller/workloadmonitor_controller_test.go
+++ b/internal/controller/workloadmonitor_controller_test.go
@@ -2,20 +2,38 @@ package controller
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"net/http"
 	"net/http/httptest"
+	"os"
+	"slices"
 	"strings"
 	"testing"
+	"time"
 
 	cozyv1alpha1 "github.com/cozystack/cozystack/api/v1alpha1"
 	corev1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/api/meta"
+	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/types"
+	"k8s.io/apimachinery/pkg/util/wait"
+	toolscache "k8s.io/client-go/tools/cache"
+	"k8s.io/client-go/tools/record"
+	"k8s.io/client-go/util/workqueue"
+	"k8s.io/utils/ptr"
 	cosiv1alpha1 "sigs.k8s.io/container-object-storage-interface-api/apis/objectstorage/v1alpha1"
+	"sigs.k8s.io/controller-runtime/pkg/cache/informertest"
+	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
+	"sigs.k8s.io/controller-runtime/pkg/client/interceptor"
+	"sigs.k8s.io/controller-runtime/pkg/controller/controllertest"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
+	"sigs.k8s.io/controller-runtime/pkg/source"
 )
 
 func TestReconcile_OperationalStatusPersisted(t *testing.T) {
@@ -461,6 +479,206 @@ func TestReconcileBucketClaimCreatesWorkload(t *testing.T) {
 	}
 }
 
+func TestReconcileBucketClaim_BucketClassLabelPropagated(t *testing.T) {
+	s := newTestScheme()
+
+	monitor := &cozyv1alpha1.WorkloadMonitor{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "my-bucket",
+			Namespace: "tenant-demo",
+		},
+		Spec: cozyv1alpha1.WorkloadMonitorSpec{
+			Kind: "bucket",
+			Type: "s3",
+			Selector: map[string]string{
+				"app.kubernetes.io/instance": "my-bucket",
+			},
+		},
+	}
+
+	bc := &cosiv1alpha1.BucketClaim{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "my-bucket",
+			Namespace: "tenant-demo",
+			Labels: map[string]string{
+				"app.kubernetes.io/instance": "my-bucket",
+			},
+		},
+		Spec: cosiv1alpha1.BucketClaimSpec{
+			BucketClassName: "seaweedfs-encrypted",
+			Protocols:       []cosiv1alpha1.Protocol{cosiv1alpha1.ProtocolS3},
+		},
+		Status: cosiv1alpha1.BucketClaimStatus{
+			BucketReady: true,
+			BucketName:  "cosi-abc123",
+		},
+	}
+
+	fakeClient := fake.NewClientBuilder().
+		WithScheme(s).
+		WithObjects(monitor, bc).
+		WithStatusSubresource(monitor).
+		Build()
+
+	reconciler := &WorkloadMonitorReconciler{Client: fakeClient, Scheme: s}
+	req := reconcile.Request{NamespacedName: types.NamespacedName{
+		Name:      "my-bucket",
+		Namespace: "tenant-demo",
+	}}
+
+	_, err := reconciler.Reconcile(context.TODO(), req)
+	if err != nil {
+		t.Fatalf("Reconcile returned error: %v", err)
+	}
+
+	workload := &cozyv1alpha1.Workload{}
+	err = fakeClient.Get(context.TODO(), types.NamespacedName{
+		Name:      "bucket-my-bucket",
+		Namespace: "tenant-demo",
+	}, workload)
+	if err != nil {
+		t.Fatalf("expected Workload to be created, got error: %v", err)
+	}
+
+	got := workload.Labels["workloads.cozystack.io/bucket-class"]
+	if got != "seaweedfs-encrypted" {
+		t.Errorf("expected workloads.cozystack.io/bucket-class=%q, got %q", "seaweedfs-encrypted", got)
+	}
+}
+
+func TestReconcileBucketClaim_InvalidBucketClassSkipsLabel(t *testing.T) {
+	s := newTestScheme()
+
+	monitor := &cozyv1alpha1.WorkloadMonitor{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "my-bucket",
+			Namespace: "tenant-demo",
+		},
+		Spec: cozyv1alpha1.WorkloadMonitorSpec{
+			Kind: "bucket",
+			Type: "s3",
+			Selector: map[string]string{
+				"app.kubernetes.io/instance": "my-bucket",
+			},
+		},
+	}
+
+	overlong := strings.Repeat("a", 64)
+	bc := &cosiv1alpha1.BucketClaim{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "my-bucket",
+			Namespace: "tenant-demo",
+			Labels: map[string]string{
+				"app.kubernetes.io/instance": "my-bucket",
+			},
+		},
+		Spec: cosiv1alpha1.BucketClaimSpec{
+			BucketClassName: overlong,
+			Protocols:       []cosiv1alpha1.Protocol{cosiv1alpha1.ProtocolS3},
+		},
+		Status: cosiv1alpha1.BucketClaimStatus{
+			BucketReady: true,
+			BucketName:  "cosi-abc123",
+		},
+	}
+
+	fakeClient := fake.NewClientBuilder().
+		WithScheme(s).
+		WithObjects(monitor, bc).
+		WithStatusSubresource(monitor).
+		Build()
+
+	reconciler := &WorkloadMonitorReconciler{Client: fakeClient, Scheme: s}
+	req := reconcile.Request{NamespacedName: types.NamespacedName{
+		Name:      "my-bucket",
+		Namespace: "tenant-demo",
+	}}
+
+	_, err := reconciler.Reconcile(context.TODO(), req)
+	if err != nil {
+		t.Fatalf("Reconcile returned error: %v", err)
+	}
+
+	workload := &cozyv1alpha1.Workload{}
+	err = fakeClient.Get(context.TODO(), types.NamespacedName{
+		Name:      "bucket-my-bucket",
+		Namespace: "tenant-demo",
+	}, workload)
+	if err != nil {
+		t.Fatalf("expected Workload to be created despite invalid bucket class, got error: %v", err)
+	}
+
+	if v, ok := workload.Labels["workloads.cozystack.io/bucket-class"]; ok {
+		t.Errorf("expected bucket-class label to be skipped for an invalid label value, got %q", v)
+	}
+}
+
+func TestReconcileBucketClaim_InvalidBucketClassDropsStaleLabel(t *testing.T) {
+	s := newTestScheme()
+
+	monitor := &cozyv1alpha1.WorkloadMonitor{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "my-bucket",
+			Namespace: "tenant-demo",
+		},
+		Spec: cozyv1alpha1.WorkloadMonitorSpec{
+			Kind: "bucket",
+			Type: "s3",
+			Selector: map[string]string{
+				"app.kubernetes.io/instance": "my-bucket",
+			},
+		},
+	}
+
+	overlong := strings.Repeat("a", 64)
+	bc := &cosiv1alpha1.BucketClaim{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "my-bucket",
+			Namespace: "tenant-demo",
+			Labels: map[string]string{
+				"app.kubernetes.io/instance":          "my-bucket",
+				"workloads.cozystack.io/bucket-class": "seaweedfs-encrypted",
+			},
+		},
+		Spec: cosiv1alpha1.BucketClaimSpec{
+			BucketClassName: overlong,
+			Protocols:       []cosiv1alpha1.Protocol{cosiv1alpha1.ProtocolS3},
+		},
+		Status: cosiv1alpha1.BucketClaimStatus{
+			BucketReady: true,
+			BucketName:  "cosi-abc123",
+		},
+	}
+
+	fakeClient := fake.NewClientBuilder().
+		WithScheme(s).
+		WithObjects(monitor, bc).
+		WithStatusSubresource(monitor).
+		Build()
+
+	reconciler := &WorkloadMonitorReconciler{Client: fakeClient, Scheme: s}
+	req := reconcile.Request{NamespacedName: types.NamespacedName{
+		Name:      "my-bucket",
+		Namespace: "tenant-demo",
+	}}
+
+	if _, err := reconciler.Reconcile(context.TODO(), req); err != nil {
+		t.Fatalf("Reconcile returned error: %v", err)
+	}
+
+	workload := &cozyv1alpha1.Workload{}
+	if err := fakeClient.Get(context.TODO(), types.NamespacedName{
+		Name:      "bucket-my-bucket",
+		Namespace: "tenant-demo",
+	}, workload); err != nil {
+		t.Fatalf("expected Workload to be created, got error: %v", err)
+	}
+
+	if v, ok := workload.Labels["workloads.cozystack.io/bucket-class"]; ok {
+		t.Errorf("expected stale bucket-class label to be dropped, got %q", v)
+	}
+}
+
 func TestReconcileBucketClaimNotReady(t *testing.T) {
 	s := newTestScheme()
 
@@ -660,7 +878,10 @@ func TestQueryAllBucketMetrics(t *testing.T) {
 	defer srv.Close()
 
 	reconciler := &WorkloadMonitorReconciler{}
-	metrics := reconciler.queryAllBucketMetrics(context.TODO(), srv.URL, []string{"bucket-aaa", "bucket-bbb"})
+	metrics, err := reconciler.queryAllBucketMetrics(context.TODO(), srv.URL, []string{"bucket-aaa", "bucket-bbb"})
+	if err != nil {
+		t.Fatalf("queryAllBucketMetrics returned error: %v", err)
+	}
 
 	bm, ok := metrics["bucket-aaa"]
 	if !ok {
@@ -692,7 +913,10 @@ func TestQueryAllBucketMetricsEmpty(t *testing.T) {
 	defer srv.Close()
 
 	reconciler := &WorkloadMonitorReconciler{}
-	metrics := reconciler.queryAllBucketMetrics(context.TODO(), srv.URL, []string{"bucket-aaa", "bucket-bbb"})
+	metrics, err := reconciler.queryAllBucketMetrics(context.TODO(), srv.URL, []string{"bucket-aaa", "bucket-bbb"})
+	if err != nil {
+		t.Fatalf("queryAllBucketMetrics returned error: %v", err)
+	}
 	if len(metrics) != 0 {
 		t.Errorf("expected empty metrics, got %d", len(metrics))
 	}
@@ -705,21 +929,84 @@ func TestQueryAllBucketMetricsServerError(t *testing.T) {
 	defer srv.Close()
 
 	reconciler := &WorkloadMonitorReconciler{}
-	metrics := reconciler.queryAllBucketMetrics(context.TODO(), srv.URL, []string{"bucket-aaa", "bucket-bbb"})
-	if len(metrics) != 0 {
-		t.Errorf("expected empty metrics on error, got %d", len(metrics))
+	_, err := reconciler.queryAllBucketMetrics(context.TODO(), srv.URL, []string{"bucket-aaa", "bucket-bbb"})
+	if err == nil {
+		t.Error("expected error on server failure, got nil")
 	}
 }
 
 func TestQueryAllBucketMetricsNoURL(t *testing.T) {
 	reconciler := &WorkloadMonitorReconciler{}
-	metrics := reconciler.queryAllBucketMetrics(context.TODO(), "", nil)
+	metrics, err := reconciler.queryAllBucketMetrics(context.TODO(), "", nil)
+	if err != nil {
+		t.Fatalf("queryAllBucketMetrics returned error: %v", err)
+	}
 	if len(metrics) != 0 {
 		t.Errorf("expected empty metrics when URL is empty, got %d", len(metrics))
 	}
 }
 
-func TestResolvePrometheusURL(t *testing.T) {
+func TestQueryAllBucketMetricsPathPrefixAndUserinfo(t *testing.T) {
+	var gotPath, gotUser, gotPass string
+	var gotOK bool
+	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		gotPath = r.URL.Path
+		gotUser, gotPass, gotOK = r.BasicAuth()
+		fmt.Fprint(w, `{"status":"success","data":{"resultType":"vector","result":[]}}`)
+	}))
+	defer srv.Close()
+
+	reconciler := &WorkloadMonitorReconciler{}
+	// Trailing slash on the base URL must not produce a double slash before
+	// /api/v1/query, and userinfo must arrive as basic auth.
+	baseURL := strings.Replace(srv.URL, "http://", "http://billing:hunter2@", 1) + "/path/to/prometheus/"
+	if _, err := reconciler.queryAllBucketMetrics(context.TODO(), baseURL, []string{"bucket-aaa"}); err != nil {
+		t.Fatalf("queryAllBucketMetrics returned error: %v", err)
+	}
+
+	if gotPath != "/path/to/prometheus/api/v1/query" {
+		t.Errorf("expected path prefix preserved, got %q", gotPath)
+	}
+	if !gotOK || gotUser != "billing" || gotPass != "hunter2" {
+		t.Errorf("expected basic auth billing/hunter2 from userinfo, got %q/%q ok=%v", gotUser, gotPass, gotOK)
+	}
+}
+
+func TestParseMetricsEndpointURL(t *testing.T) {
+	valid := map[string]string{
+		"https://vm.example.com":                       "https://vm.example.com",
+		"https://vm.example.com/":                      "https://vm.example.com",
+		"https://vm.example.com:8427/vm/prometheus":    "https://vm.example.com:8427/vm/prometheus",
+		"https://user:pass@vm.example.com/prometheus":  "https://user:pass@vm.example.com/prometheus",
+		"http://vm.example.com/select/0/prometheus///": "http://vm.example.com/select/0/prometheus",
+	}
+	for raw, want := range valid {
+		got, err := ParseMetricsEndpointURL(raw)
+		if err != nil {
+			t.Errorf("ParseMetricsEndpointURL(%q) returned error: %v", raw, err)
+			continue
+		}
+		if got != want {
+			t.Errorf("ParseMetricsEndpointURL(%q) = %q, want %q", raw, got, want)
+		}
+	}
+
+	invalid := []string{
+		"",
+		"vm.example.com/prometheus",
+		"ftp://vm.example.com",
+		"https://",
+		"https://vm.example.com/prometheus?query=up",
+		"https://vm.example.com/prometheus#frag",
+	}
+	for _, raw := range invalid {
+		if got, err := ParseMetricsEndpointURL(raw); err == nil {
+			t.Errorf("ParseMetricsEndpointURL(%q) = %q, want error", raw, got)
+		}
+	}
+}
+
+func TestResolvePrometheusURLFromLabel(t *testing.T) {
 	s := newTestScheme()
 
 	ns := &corev1.Namespace{
@@ -737,7 +1024,10 @@ func TestResolvePrometheusURL(t *testing.T) {
 		Build()
 
 	reconciler := &WorkloadMonitorReconciler{Client: fakeClient, Scheme: s}
-	url := reconciler.resolvePrometheusURL(context.TODO(), "tenant-demo")
+	url, err := reconciler.resolvePrometheusURL(context.TODO(), "tenant-demo")
+	if err != nil {
+		t.Fatalf("resolvePrometheusURL returned error: %v", err)
+	}
 
 	expected := "http://vmselect-shortterm.tenant-root.svc:8481/select/0/prometheus"
 	if url != expected {
@@ -760,13 +1050,48 @@ func TestResolvePrometheusURLNoLabel(t *testing.T) {
 		Build()
 
 	reconciler := &WorkloadMonitorReconciler{Client: fakeClient, Scheme: s}
-	url := reconciler.resolvePrometheusURL(context.TODO(), "tenant-demo")
+	url, err := reconciler.resolvePrometheusURL(context.TODO(), "tenant-demo")
+	if err != nil {
+		t.Fatalf("resolvePrometheusURL returned error: %v", err)
+	}
 
 	if url != "" {
 		t.Errorf("expected empty URL when no monitoring label, got %q", url)
 	}
 }
 
+func TestResolvePrometheusURLEndpointOverrideWinsOverLabel(t *testing.T) {
+	s := newTestScheme()
+
+	ns := &corev1.Namespace{
+		ObjectMeta: metav1.ObjectMeta{
+			Name: "tenant-demo",
+			Labels: map[string]string{
+				"namespace.cozystack.io/monitoring": "tenant-root",
+			},
+		},
+	}
+
+	fakeClient := fake.NewClientBuilder().
+		WithScheme(s).
+		WithObjects(ns).
+		Build()
+
+	reconciler := &WorkloadMonitorReconciler{
+		Client:                   fakeClient,
+		Scheme:                   s,
+		SeaweedfsMetricsEndpoint: "https://vm.example.com/path/to/prometheus",
+	}
+	url, err := reconciler.resolvePrometheusURL(context.TODO(), "tenant-demo")
+	if err != nil {
+		t.Fatalf("resolvePrometheusURL returned error: %v", err)
+	}
+
+	if url != "https://vm.example.com/path/to/prometheus" {
+		t.Errorf("expected the endpoint override to win over label discovery, got %q", url)
+	}
+}
+
 func TestReconcileBucketClaimRequeuesWhenBucketsExist(t *testing.T) {
 	s := newTestScheme()
 
@@ -846,3 +1171,1265 @@ func TestReconcileBucketClaimRequeuesWhenBucketsExist(t *testing.T) {
 		t.Errorf("expected empty resources without monitoring, got %v", workload.Status.Resources)
 	}
 }
+
+// newBucketFixture returns a plain namespace, a bucket WorkloadMonitor, and a
+// ready BucketClaim named my-bucket whose SeaweedFS bucket is cosi-abc123.
+func newBucketFixture() (*corev1.Namespace, *cozyv1alpha1.WorkloadMonitor, *cosiv1alpha1.BucketClaim) {
+	ns := &corev1.Namespace{
+		ObjectMeta: metav1.ObjectMeta{
+			Name: "tenant-demo",
+		},
+	}
+	monitor := &cozyv1alpha1.WorkloadMonitor{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "my-bucket",
+			Namespace: "tenant-demo",
+		},
+		Spec: cozyv1alpha1.WorkloadMonitorSpec{
+			Kind: "bucket",
+			Type: "s3",
+			Selector: map[string]string{
+				"app.kubernetes.io/instance": "my-bucket",
+			},
+		},
+	}
+	bc := &cosiv1alpha1.BucketClaim{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "my-bucket",
+			Namespace: "tenant-demo",
+			Labels: map[string]string{
+				"app.kubernetes.io/instance": "my-bucket",
+			},
+		},
+		Spec: cosiv1alpha1.BucketClaimSpec{
+			BucketClassName: "seaweedfs",
+			Protocols:       []cosiv1alpha1.Protocol{cosiv1alpha1.ProtocolS3},
+		},
+		Status: cosiv1alpha1.BucketClaimStatus{
+			BucketReady: true,
+			BucketName:  "cosi-abc123",
+		},
+	}
+	return ns, monitor, bc
+}
+
+func TestReconcileBucketMetricsFromEndpointOverride(t *testing.T) {
+	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		if r.URL.Path != "/vm/select/0/prometheus/api/v1/query" {
+			t.Errorf("unexpected query path %q", r.URL.Path)
+		}
+		fmt.Fprint(w, `{"status":"success","data":{"resultType":"vector","result":[
+			{"metric":{"__name__":"SeaweedFS_s3_bucket_size_bytes","bucket":"cosi-abc123"},"value":[1713000000,"4096"]}
+		]}}`)
+	}))
+	defer srv.Close()
+
+	s := newTestScheme()
+	ns, monitor, bc := newBucketFixture()
+
+	fakeClient := fake.NewClientBuilder().
+		WithScheme(s).
+		WithObjects(ns, monitor, bc).
+		WithStatusSubresource(monitor).
+		Build()
+
+	reconciler := &WorkloadMonitorReconciler{
+		Client:                   fakeClient,
+		Scheme:                   s,
+		SeaweedfsMetricsEndpoint: srv.URL + "/vm/select/0/prometheus",
+	}
+	req := reconcile.Request{NamespacedName: types.NamespacedName{
+		Name:      "my-bucket",
+		Namespace: "tenant-demo",
+	}}
+	if _, err := reconciler.Reconcile(context.TODO(), req); err != nil {
+		t.Fatalf("Reconcile returned error: %v", err)
+	}
+
+	workload := &cozyv1alpha1.Workload{}
+	if err := fakeClient.Get(context.TODO(), types.NamespacedName{
+		Name:      "bucket-my-bucket",
+		Namespace: "tenant-demo",
+	}, workload); err != nil {
+		t.Fatalf("Failed to get Workload: %v", err)
+	}
+
+	q, ok := workload.Status.Resources["s3-storage-bytes"]
+	if !ok {
+		t.Fatal("expected s3-storage-bytes from the overridden endpoint")
+	}
+	if q.Value() != 4096 {
+		t.Errorf("expected s3-storage-bytes=4096, got %d", q.Value())
+	}
+}
+
+func TestReconcileRetainsLastKnownSizesOnQueryFailure(t *testing.T) {
+	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		w.WriteHeader(http.StatusBadGateway)
+	}))
+	defer srv.Close()
+
+	s := newTestScheme()
+	ns, monitor, bc := newBucketFixture()
+
+	// A Workload from a previous successful reconcile already carries sizes.
+	workload := &cozyv1alpha1.Workload{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "bucket-my-bucket",
+			Namespace: "tenant-demo",
+		},
+		Status: cozyv1alpha1.WorkloadStatus{
+			Kind: "bucket",
+			Type: "s3",
+			Resources: map[string]resource.Quantity{
+				"s3-storage-bytes":          *resource.NewQuantity(4096, resource.BinarySI),
+				"s3-physical-storage-bytes": *resource.NewQuantity(8192, resource.BinarySI),
+			},
+		},
+	}
+
+	fakeClient := fake.NewClientBuilder().
+		WithScheme(s).
+		WithObjects(ns, monitor, bc, workload).
+		WithStatusSubresource(monitor).
+		Build()
+
+	reconciler := &WorkloadMonitorReconciler{
+		Client:                   fakeClient,
+		Scheme:                   s,
+		SeaweedfsMetricsEndpoint: srv.URL,
+	}
+	req := reconcile.Request{NamespacedName: types.NamespacedName{
+		Name:      "my-bucket",
+		Namespace: "tenant-demo",
+	}}
+
+	// The failure must be loud: the reconcile returns an error instead of
+	// pretending the buckets are empty.
+	if _, err := reconciler.Reconcile(context.TODO(), req); err == nil {
+		t.Error("expected Reconcile to return an error when the metrics endpoint fails")
+	}
+
+	updated := &cozyv1alpha1.Workload{}
+	if err := fakeClient.Get(context.TODO(), types.NamespacedName{
+		Name:      "bucket-my-bucket",
+		Namespace: "tenant-demo",
+	}, updated); err != nil {
+		t.Fatalf("Failed to get Workload: %v", err)
+	}
+
+	q, ok := updated.Status.Resources["s3-storage-bytes"]
+	if !ok || q.Value() != 4096 {
+		t.Errorf("expected last known s3-storage-bytes=4096 retained, got %v (present=%v)", q.Value(), ok)
+	}
+	qp, ok := updated.Status.Resources["s3-physical-storage-bytes"]
+	if !ok || qp.Value() != 8192 {
+		t.Errorf("expected last known s3-physical-storage-bytes=8192 retained, got %v (present=%v)", qp.Value(), ok)
+	}
+}
+
+func TestReconcileRetainsLastKnownSizesWhenBucketMissingFromResult(t *testing.T) {
+	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		fmt.Fprint(w, `{"status":"success","data":{"resultType":"vector","result":[]}}`)
+	}))
+	defer srv.Close()
+
+	s := newTestScheme()
+	ns, monitor, bc := newBucketFixture()
+
+	workload := &cozyv1alpha1.Workload{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "bucket-my-bucket",
+			Namespace: "tenant-demo",
+		},
+		Status: cozyv1alpha1.WorkloadStatus{
+			Kind: "bucket",
+			Type: "s3",
+			Resources: map[string]resource.Quantity{
+				"s3-storage-bytes": *resource.NewQuantity(4096, resource.BinarySI),
+			},
+		},
+	}
+
+	fakeClient := fake.NewClientBuilder().
+		WithScheme(s).
+		WithObjects(ns, monitor, bc, workload).
+		WithStatusSubresource(monitor).
+		Build()
+
+	reconciler := &WorkloadMonitorReconciler{
+		Client:                   fakeClient,
+		Scheme:                   s,
+		SeaweedfsMetricsEndpoint: srv.URL,
+	}
+	req := reconcile.Request{NamespacedName: types.NamespacedName{
+		Name:      "my-bucket",
+		Namespace: "tenant-demo",
+	}}
+	if _, err := reconciler.Reconcile(context.TODO(), req); err != nil {
+		t.Fatalf("Reconcile returned error: %v", err)
+	}
+
+	updated := &cozyv1alpha1.Workload{}
+	if err := fakeClient.Get(context.TODO(), types.NamespacedName{
+		Name:      "bucket-my-bucket",
+		Namespace: "tenant-demo",
+	}, updated); err != nil {
+		t.Fatalf("Failed to get Workload: %v", err)
+	}
+
+	q, ok := updated.Status.Resources["s3-storage-bytes"]
+	if !ok || q.Value() != 4096 {
+		t.Errorf("expected last known s3-storage-bytes=4096 retained when series is absent, got %v (present=%v)", q.Value(), ok)
+	}
+}
+
+func TestGetWorkloadMetadata(t *testing.T) {
+	tests := []struct {
+		name        string
+		annotations map[string]string
+		expected    map[string]string
+	}{
+		{
+			name:        "nil annotations returns empty map",
+			annotations: nil,
+			expected:    map[string]string{},
+		},
+		{
+			// KubeVirt stamps the VM preference (which carries the guest OS
+			// profile, e.g. Windows) under kubevirt.io/cluster-preference-name.
+			// This value is taken verbatim from a real Windows VMInstance
+			// virt-launcher pod on a live cluster.
+			name: "instance profile from cluster-preference-name annotation",
+			annotations: map[string]string{
+				"kubevirt.io/cluster-preference-name": "windows.2k22.virtio",
+			},
+			expected: map[string]string{
+				"workloads.cozystack.io/kubevirt-vmi-instance-profile": "windows.2k22.virtio",
+			},
+		},
+		{
+			name: "instance type from cluster-instancetype-name annotation",
+			annotations: map[string]string{
+				"kubevirt.io/cluster-instancetype-name": "cx1.large",
+			},
+			expected: map[string]string{
+				"workloads.cozystack.io/kubevirt-vmi-instance-type": "cx1.large",
+			},
+		},
+		{
+			name: "both instance type and profile propagate",
+			annotations: map[string]string{
+				"kubevirt.io/cluster-instancetype-name": "cx1.large",
+				"kubevirt.io/cluster-preference-name":   "windows.2k22.virtio",
+			},
+			expected: map[string]string{
+				"workloads.cozystack.io/kubevirt-vmi-instance-type":    "cx1.large",
+				"workloads.cozystack.io/kubevirt-vmi-instance-profile": "windows.2k22.virtio",
+			},
+		},
+		{
+			// KubeVirt never stamps kubevirt.io/cluster-instanceprofile-name, so
+			// reading it must not yield a profile label.
+			name: "nonexistent cluster-instanceprofile-name annotation is ignored",
+			annotations: map[string]string{
+				"kubevirt.io/cluster-instanceprofile-name": "windows.2k22.virtio",
+			},
+			expected: map[string]string{},
+		},
+	}
+
+	r := &WorkloadMonitorReconciler{}
+	for _, tc := range tests {
+		t.Run(tc.name, func(t *testing.T) {
+			pod := &corev1.Pod{
+				ObjectMeta: metav1.ObjectMeta{Annotations: tc.annotations},
+			}
+			got := r.getWorkloadMetadata(pod)
+			if len(got) != len(tc.expected) {
+				t.Fatalf("expected %d labels, got %d (%v)", len(tc.expected), len(got), got)
+			}
+			for k, v := range tc.expected {
+				if gv, ok := got[k]; !ok || gv != v {
+					t.Errorf("expected label %q=%q, got %q", k, v, gv)
+				}
+			}
+		})
+	}
+}
+
+func TestReconcile_PVCStorageClassResourceKey(t *testing.T) {
+	cases := []struct {
+		name         string
+		storageClass *string
+		wantKey      string
+	}{
+		{"unset falls back to default", nil, "default.storageclass.storage.k8s.io/requests.storage"},
+		{"empty falls back to default", ptr.To(""), "default.storageclass.storage.k8s.io/requests.storage"},
+		{"explicit class is kept", ptr.To("replicated"), "replicated.storageclass.storage.k8s.io/requests.storage"},
+	}
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			scheme := newTestScheme()
+			monitor := &cozyv1alpha1.WorkloadMonitor{
+				ObjectMeta: metav1.ObjectMeta{Name: "test-monitor", Namespace: "default"},
+				Spec: cozyv1alpha1.WorkloadMonitorSpec{
+					Selector: map[string]string{"app": "test"},
+					Kind:     "postgres",
+					Type:     "postgres",
+				},
+			}
+			pvc := &corev1.PersistentVolumeClaim{
+				ObjectMeta: metav1.ObjectMeta{
+					Name:      "data",
+					Namespace: "default",
+					Labels:    map[string]string{"app": "test"},
+				},
+				Spec: corev1.PersistentVolumeClaimSpec{StorageClassName: tc.storageClass},
+				Status: corev1.PersistentVolumeClaimStatus{
+					Phase:    corev1.ClaimBound,
+					Capacity: corev1.ResourceList{corev1.ResourceStorage: resource.MustParse("10Gi")},
+				},
+			}
+			fakeClient := fake.NewClientBuilder().
+				WithScheme(scheme).
+				WithObjects(monitor, pvc).
+				WithStatusSubresource(monitor).
+				Build()
+
+			reconciler := &WorkloadMonitorReconciler{Client: fakeClient, Scheme: scheme}
+			req := reconcile.Request{NamespacedName: types.NamespacedName{Name: "test-monitor", Namespace: "default"}}
+			if _, err := reconciler.Reconcile(context.TODO(), req); err != nil {
+				t.Fatalf("Reconcile returned error: %v", err)
+			}
+
+			workload := &cozyv1alpha1.Workload{}
+			if err := fakeClient.Get(context.TODO(), types.NamespacedName{Name: "pvc-data", Namespace: "default"}, workload); err != nil {
+				t.Fatalf("Failed to get Workload: %v", err)
+			}
+			if len(workload.Status.Resources) != 1 {
+				t.Fatalf("expected one resource entry, got %v", workload.Status.Resources)
+			}
+			if _, ok := workload.Status.Resources[tc.wantKey]; !ok {
+				t.Errorf("expected resource key %q, got %v", tc.wantKey, workload.Status.Resources)
+			}
+		})
+	}
+}
+
+func newDataVolume(name string, labels map[string]string, phase *string) *unstructured.Unstructured {
+	dv := &unstructured.Unstructured{}
+	dv.SetGroupVersionKind(dataVolumeGVK)
+	dv.SetName(name)
+	dv.SetNamespace("default")
+	dv.SetLabels(labels)
+	if phase != nil {
+		dv.Object["status"] = map[string]any{"phase": *phase}
+	}
+	return dv
+}
+
+func reconcileDataVolumeMonitor(t *testing.T, withReader bool, listErr error, dvs ...client.Object) *cozyv1alpha1.WorkloadMonitor {
+	t.Helper()
+	s := newTestScheme()
+	monitor := &cozyv1alpha1.WorkloadMonitor{
+		ObjectMeta: metav1.ObjectMeta{Name: "vm-disk-test", Namespace: "default"},
+		Spec: cozyv1alpha1.WorkloadMonitorSpec{
+			Selector:    map[string]string{"app.kubernetes.io/instance": "vm-disk-test"},
+			MinReplicas: ptr.To[int32](0),
+		},
+	}
+	builder := fake.NewClientBuilder().
+		WithScheme(s).
+		WithObjects(append([]client.Object{monitor}, dvs...)...).
+		WithStatusSubresource(monitor)
+	if listErr != nil {
+		builder = builder.WithInterceptorFuncs(interceptor.Funcs{
+			List: func(ctx context.Context, c client.WithWatch, list client.ObjectList, opts ...client.ListOption) error {
+				if u, ok := list.(*unstructured.UnstructuredList); ok && u.GroupVersionKind().Group == dataVolumeGVK.Group {
+					return listErr
+				}
+				return c.List(ctx, list, opts...)
+			},
+		})
+	}
+	fakeClient := builder.Build()
+
+	reconciler := &WorkloadMonitorReconciler{Client: fakeClient, Scheme: s}
+	if withReader {
+		reconciler.DataVolumeReader = fakeClient
+	}
+	req := reconcile.Request{NamespacedName: types.NamespacedName{Name: monitor.Name, Namespace: monitor.Namespace}}
+	if _, err := reconciler.Reconcile(context.TODO(), req); err != nil {
+		t.Fatalf("Reconcile returned error: %v", err)
+	}
+	updated := &cozyv1alpha1.WorkloadMonitor{}
+	if err := fakeClient.Get(context.TODO(), req.NamespacedName, updated); err != nil {
+		t.Fatalf("Failed to get updated WorkloadMonitor: %v", err)
+	}
+	if updated.Status.Operational == nil {
+		t.Fatal("Expected Operational to be set, got nil")
+	}
+	return updated
+}
+
+func TestReconcile_DataVolumePhaseDecidesOperational(t *testing.T) {
+	selected := map[string]string{"app.kubernetes.io/instance": "vm-disk-test"}
+	phase := func(p string) *string { return &p }
+
+	cases := []struct {
+		name        string
+		phase       *string
+		operational bool
+	}{
+		{"Pending", phase("Pending"), false},
+		{"PVCBound", phase("PVCBound"), false},
+		{"ImportScheduled", phase("ImportScheduled"), false},
+		{"ImportInProgress", phase("ImportInProgress"), false},
+		{"CloneScheduled", phase("CloneScheduled"), false},
+		{"CloneInProgress", phase("CloneInProgress"), false},
+		{"SnapshotForSmartCloneInProgress", phase("SnapshotForSmartCloneInProgress"), false},
+		{"CloneFromSnapshotSourceInProgress", phase("CloneFromSnapshotSourceInProgress"), false},
+		{"SmartClonePVCInProgress", phase("SmartClonePVCInProgress"), false},
+		{"CSICloneInProgress", phase("CSICloneInProgress"), false},
+		{"PrepClaimInProgress", phase("PrepClaimInProgress"), false},
+		{"RebindInProgress", phase("RebindInProgress"), false},
+		{"ExpansionInProgress", phase("ExpansionInProgress"), false},
+		{"NamespaceTransferInProgress", phase("NamespaceTransferInProgress"), false},
+		{"UploadScheduled", phase("UploadScheduled"), false},
+		{"UploadReady", phase("UploadReady"), false},
+		{"failed", phase("Failed"), false},
+		{"unknown", phase("Unknown"), false},
+		{"status without phase", phase(""), false},
+		{"no status at all", nil, false},
+		{"succeeded", phase("Succeeded"), true},
+		{"waiting for the consuming VM", phase("PendingPopulation"), true},
+		{"wait for first consumer", phase("WaitForFirstConsumer"), true},
+		{"paused multi-stage import", phase("Paused"), true},
+		{"phase this controller does not know", phase("SomeFutureCDIPhase"), true},
+	}
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			dv := newDataVolume("vm-disk-test", selected, tc.phase)
+			got := reconcileDataVolumeMonitor(t, true, nil, dv)
+			if *got.Status.Operational != tc.operational {
+				t.Errorf("Operational = %v, want %v", *got.Status.Operational, tc.operational)
+			}
+		})
+	}
+}
+
+func TestReconcile_DataVolumeMessageNamesTheDiskAndPhase(t *testing.T) {
+	selected := map[string]string{"app.kubernetes.io/instance": "vm-disk-test"}
+	phase := func(p string) *string { return &p }
+	cases := []struct {
+		name  string
+		phase *string
+		want  string
+	}{
+		{"in flight", phase("ImportInProgress"), "DataVolume vm-disk-test is ImportInProgress"},
+		{"failed", phase("Failed"), "DataVolume vm-disk-test is Failed"},
+		{"no phase", nil, "DataVolume vm-disk-test has no phase"},
+		{"settled", phase("Succeeded"), ""},
+	}
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			got := reconcileDataVolumeMonitor(t, true, nil, newDataVolume("vm-disk-test", selected, tc.phase))
+			if got.Status.Message != tc.want {
+				t.Errorf("Message = %q, want %q", got.Status.Message, tc.want)
+			}
+			wantReason := ""
+			if tc.want != "" {
+				wantReason = cozyv1alpha1.WorkloadMonitorReasonDataVolumeNotReady
+			}
+			if got.Status.Reason != wantReason {
+				t.Errorf("Reason = %q, want %q", got.Status.Reason, wantReason)
+			}
+		})
+	}
+}
+
+func withRunningCondition(dv *unstructured.Unstructured, status, reason, message string) *unstructured.Unstructured {
+	_ = unstructured.SetNestedSlice(dv.Object, []any{map[string]any{
+		"type":    "Running",
+		"status":  status,
+		"reason":  reason,
+		"message": message,
+	}}, "status", "conditions")
+	return dv
+}
+
+func TestReconcile_DataVolumeMessageCarriesTheImporterError(t *testing.T) {
+	selected := map[string]string{"app.kubernetes.io/instance": "vm-disk-test"}
+	phase := func(p string) *string { return &p }
+	// Running conditions CDI v1.64 wrote for importers that kept failing; only
+	// the host name is changed. v1.66 builds the condition the same way for a
+	// single-container importer.
+	const (
+		http404 = "Unable to connect to http data source: expected status code 200, got 404. Status: 404 Not Found"
+		noHost  = `Unable to connect to http data source: HTTP request errored: Get "http://image.example.invalid/disk.img": dial tcp: lookup image.example.invalid on 10.96.0.10:53: no such host`
+	)
+	cases := []struct {
+		name                    string
+		phase                   *string
+		status, reason, message string
+		want                    string
+	}{
+		{"404 from the source", phase("ImportInProgress"), "False", "Error", http404,
+			"DataVolume vm-disk-test is ImportInProgress: " + http404},
+		{"unresolvable host", phase("ImportInProgress"), "False", "Error", noHost,
+			"DataVolume vm-disk-test is ImportInProgress: " + noHost},
+		{"unschedulable importer", phase("ImportScheduled"), "False", "Unschedulable", "Importer pod cannot be scheduled",
+			"DataVolume vm-disk-test is ImportScheduled: Importer pod cannot be scheduled"},
+		{"fatal checksum error", phase("Failed"), "False", "ChecksumError", "checksum mismatch",
+			"DataVolume vm-disk-test is Failed: checksum mismatch"},
+		{"no phase", nil, "False", "Error", http404,
+			"DataVolume vm-disk-test has no phase: " + http404},
+		{"importer not started yet", phase("ImportScheduled"), "False", "", "",
+			"DataVolume vm-disk-test is ImportScheduled"},
+		{"importer running", phase("ImportInProgress"), "True", "Pod is running", "transferring",
+			"DataVolume vm-disk-test is ImportInProgress"},
+		{"source state unknown", phase("CloneInProgress"), "Unknown", "Pending and Unknown", "Pod Pending and source state unknown",
+			"DataVolume vm-disk-test is CloneInProgress"},
+		{"clone pods both waiting without a message", phase("CloneInProgress"), "False", "ContainerCreating and ContainerCreating", " and ",
+			"DataVolume vm-disk-test is CloneInProgress"},
+		{"only the source pod has a message", phase("CloneInProgress"), "False", "ContainerCreating and Error", " and source unreachable",
+			"DataVolume vm-disk-test is CloneInProgress: source unreachable"},
+		{"both clone pods have a message", phase("CloneInProgress"), "False", "Pending and Pending", "Pod Pending and Pod Pending",
+			"DataVolume vm-disk-test is CloneInProgress: Pod Pending and Pod Pending"},
+		{"populated", phase("Succeeded"), "False", "Completed", "Import Complete", ""},
+	}
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			dv := withRunningCondition(newDataVolume("vm-disk-test", selected, tc.phase), tc.status, tc.reason, tc.message)
+			got := reconcileDataVolumeMonitor(t, true, nil, dv)
+			if got.Status.Message != tc.want {
+				t.Errorf("Message = %q, want %q", got.Status.Message, tc.want)
+			}
+		})
+	}
+
+	t.Run("only the Running condition is read", func(t *testing.T) {
+		dv := withRunningCondition(newDataVolume("vm-disk-test", selected, phase("ImportInProgress")), "True", "Pod is running", "")
+		conditions, _, _ := unstructured.NestedSlice(dv.Object, "status", "conditions")
+		conditions = append([]any{map[string]any{
+			"type": "Bound", "status": "False", "reason": "Pending",
+			"message": "target PVC vm-disk-test Pending and [prime-1] : " + http404,
+		}}, conditions...)
+		_ = unstructured.SetNestedSlice(dv.Object, conditions, "status", "conditions")
+		got := reconcileDataVolumeMonitor(t, true, nil, dv)
+		if want := "DataVolume vm-disk-test is ImportInProgress"; got.Status.Message != want {
+			t.Errorf("Message = %q, want %q", got.Status.Message, want)
+		}
+	})
+}
+
+// The fixture is a DataVolume read off a CDI v1.64 cluster after its importer
+// had restarted 1988 times on a 404; only names and the URL are changed. For a
+// single-container importer failing like this one, the pinned v1.66 differs
+// only in requiring every container to run before it reports Running=True.
+func TestReconcile_LiveStuckImportNamesTheSourceError(t *testing.T) {
+	raw, err := os.ReadFile("testdata/datavolume-http-404.json")
+	if err != nil {
+		t.Fatal(err)
+	}
+	dv := &unstructured.Unstructured{}
+	if err := dv.UnmarshalJSON(raw); err != nil {
+		t.Fatal(err)
+	}
+	got := reconcileDataVolumeMonitor(t, true, nil, dv)
+	const want = "DataVolume vm-disk-test is ImportInProgress: Unable to connect to http data source: expected status code 200, got 404. Status: 404 Not Found"
+	if *got.Status.Operational || got.Status.Message != want {
+		t.Errorf("Operational=%v Message=%q, want false and %q", *got.Status.Operational, got.Status.Message, want)
+	}
+}
+
+func TestReconcile_PopulatedDataVolumeClearsTheLastVerdict(t *testing.T) {
+	s := newTestScheme()
+	selector := map[string]string{"app.kubernetes.io/instance": "vm-disk-test"}
+	monitor := &cozyv1alpha1.WorkloadMonitor{
+		ObjectMeta: metav1.ObjectMeta{Name: "vm-disk-test", Namespace: "default"},
+		Spec:       cozyv1alpha1.WorkloadMonitorSpec{Selector: selector, MinReplicas: ptr.To[int32](0)},
+		Status: cozyv1alpha1.WorkloadMonitorStatus{
+			Operational: ptr.To(false),
+			Message:     "DataVolume vm-disk-test is ImportInProgress",
+			Reason:      cozyv1alpha1.WorkloadMonitorReasonDataVolumeNotReady,
+		},
+	}
+	done := "Succeeded"
+	fakeClient := fake.NewClientBuilder().
+		WithScheme(s).
+		WithObjects(monitor, newDataVolume("vm-disk-test", selector, &done)).
+		WithStatusSubresource(monitor).
+		Build()
+	reconciler := &WorkloadMonitorReconciler{Client: fakeClient, Scheme: s, DataVolumeReader: fakeClient}
+	req := reconcile.Request{NamespacedName: types.NamespacedName{Name: monitor.Name, Namespace: monitor.Namespace}}
+	if _, err := reconciler.Reconcile(context.TODO(), req); err != nil {
+		t.Fatalf("Reconcile returned error: %v", err)
+	}
+	got := &cozyv1alpha1.WorkloadMonitor{}
+	if err := fakeClient.Get(context.TODO(), req.NamespacedName, got); err != nil {
+		t.Fatal(err)
+	}
+	if got.Status.Operational == nil || !*got.Status.Operational || got.Status.Message != "" || got.Status.Reason != "" {
+		t.Errorf("Operational=%v Message=%q Reason=%q, want true and both cleared", got.Status.Operational, got.Status.Message, got.Status.Reason)
+	}
+}
+
+func TestReconcile_OneDataVolumeInFlightOutweighsSettledOnes(t *testing.T) {
+	selected := map[string]string{"app.kubernetes.io/instance": "vm-disk-test"}
+	done, busy := "Succeeded", "ImportInProgress"
+	got := reconcileDataVolumeMonitor(t, true, nil,
+		newDataVolume("a", selected, &done),
+		newDataVolume("b", selected, &busy),
+	)
+	if *got.Status.Operational {
+		t.Error("Operational = true with one DataVolume still importing, want false")
+	}
+}
+
+// reversedReader lists in reverse, because a cache List guarantees no order.
+type reversedReader struct{ client.Reader }
+
+func (r reversedReader) List(ctx context.Context, list client.ObjectList, opts ...client.ListOption) error {
+	if err := r.Reader.List(ctx, list, opts...); err != nil {
+		return err
+	}
+	items, err := meta.ExtractList(list)
+	if err != nil {
+		return err
+	}
+	slices.Reverse(items)
+	return meta.SetList(list, items)
+}
+
+func TestDataVolumesMessage_DoesNotDependOnListOrder(t *testing.T) {
+	selected := map[string]string{"app.kubernetes.io/instance": "vm-disk-test"}
+	busy, failed := "ImportInProgress", "Failed"
+	monitor := &cozyv1alpha1.WorkloadMonitor{
+		ObjectMeta: metav1.ObjectMeta{Name: "vm-disk-test", Namespace: "default"},
+		Spec:       cozyv1alpha1.WorkloadMonitorSpec{Selector: selected},
+	}
+	fakeClient := fake.NewClientBuilder().WithScheme(newTestScheme()).
+		WithObjects(newDataVolume("a", selected, &busy), newDataVolume("b", selected, &failed)).
+		Build()
+	const want = "DataVolume a is ImportInProgress; DataVolume b is Failed"
+	for _, reader := range []client.Reader{fakeClient, reversedReader{fakeClient}} {
+		r := &WorkloadMonitorReconciler{DataVolumeReader: reader}
+		got, _, _, err := r.dataVolumesMessage(context.Background(), monitor)
+		if err != nil || got != want {
+			t.Errorf("message = %q, %v; want %q", got, err, want)
+		}
+	}
+}
+
+func TestReconcile_DataVolumeOutsideSelectorIgnored(t *testing.T) {
+	busy := "ImportInProgress"
+	got := reconcileDataVolumeMonitor(t, true, nil,
+		newDataVolume("other", map[string]string{"app.kubernetes.io/instance": "other"}, &busy),
+	)
+	if !*got.Status.Operational {
+		t.Error("Operational = false from a DataVolume the selector does not match, want true")
+	}
+}
+
+func TestReconcile_NoDataVolumesKeepsOperational(t *testing.T) {
+	got := reconcileDataVolumeMonitor(t, true, nil)
+	if !*got.Status.Operational {
+		t.Error("Operational = false with no DataVolumes and minReplicas 0, want true")
+	}
+}
+
+func TestReconcile_DataVolumeKindNotServedIsNoDataVolumes(t *testing.T) {
+	noMatch := &meta.NoKindMatchError{GroupKind: dataVolumeGVK.GroupKind(), SearchedVersions: []string{dataVolumeGVK.Version}}
+	got := reconcileDataVolumeMonitor(t, true, noMatch)
+	if !*got.Status.Operational {
+		t.Error("Operational = false when the DataVolume kind is not served, want true")
+	}
+}
+
+// reconcileWithUnreadableDataVolumes reconciles a monitor that selects one
+// ready pod while every DataVolume List fails, or while withReader is false;
+// syncing marks the DataVolume watch as started and not yet synced.
+func reconcileWithUnreadableDataVolumes(t *testing.T, withReader, syncing bool, status cozyv1alpha1.WorkloadMonitorStatus) (*cozyv1alpha1.WorkloadMonitor, reconcile.Result, error) {
+	t.Helper()
+	got, result, _, err := reconcileWithUnreadableDataVolumesEvents(t, withReader, syncing, status)
+	return got, result, err
+}
+
+func reconcileWithUnreadableDataVolumesEvents(t *testing.T, withReader, syncing bool, status cozyv1alpha1.WorkloadMonitorStatus) (*cozyv1alpha1.WorkloadMonitor, reconcile.Result, []string, error) {
+	t.Helper()
+	s := newTestScheme()
+	selector := map[string]string{"app.kubernetes.io/instance": "m"}
+	monitor := &cozyv1alpha1.WorkloadMonitor{
+		ObjectMeta: metav1.ObjectMeta{Name: "m", Namespace: "default"},
+		Spec:       cozyv1alpha1.WorkloadMonitorSpec{Selector: selector, MinReplicas: ptr.To[int32](1)},
+		Status:     status,
+	}
+	pod := &corev1.Pod{
+		ObjectMeta: metav1.ObjectMeta{Name: "m-0", Namespace: "default", Labels: selector},
+		Status: corev1.PodStatus{Conditions: []corev1.PodCondition{
+			{Type: corev1.PodReady, Status: corev1.ConditionTrue},
+		}},
+	}
+	fakeClient := fake.NewClientBuilder().
+		WithScheme(s).
+		WithObjects(monitor, pod).
+		WithStatusSubresource(monitor).
+		WithInterceptorFuncs(interceptor.Funcs{
+			List: func(ctx context.Context, c client.WithWatch, list client.ObjectList, opts ...client.ListOption) error {
+				if _, ok := list.(*unstructured.UnstructuredList); ok {
+					return fmt.Errorf("apiserver unavailable")
+				}
+				return c.List(ctx, list, opts...)
+			},
+		}).
+		Build()
+	recorder := record.NewFakeRecorder(10)
+	reconciler := &WorkloadMonitorReconciler{Client: fakeClient, Scheme: s, Recorder: recorder}
+	if withReader {
+		reconciler.DataVolumeReader = fakeClient
+	}
+	reconciler.dataVolumeWatchSyncing = syncing
+	req := reconcile.Request{NamespacedName: types.NamespacedName{Name: "m", Namespace: "default"}}
+	result, err := reconciler.Reconcile(context.TODO(), req)
+	updated := &cozyv1alpha1.WorkloadMonitor{}
+	if gerr := fakeClient.Get(context.TODO(), req.NamespacedName, updated); gerr != nil {
+		t.Fatalf("Failed to get updated WorkloadMonitor: %v", gerr)
+	}
+	close(recorder.Events)
+	var events []string
+	for e := range recorder.Events {
+		events = append(events, e)
+	}
+	return updated, result, events, err
+}
+
+func TestReconcile_DataVolumeListErrorStillPublishesStatus(t *testing.T) {
+	got, _, events, err := reconcileWithUnreadableDataVolumesEvents(t, true, false, cozyv1alpha1.WorkloadMonitorStatus{})
+	if err == nil {
+		t.Error("Reconcile returned nil on a DataVolume list failure, want the error so the request is retried")
+	}
+	if len(events) != 1 || !strings.HasPrefix(events[0], "Warning DataVolumesUnavailable ") || !strings.Contains(events[0], "apiserver unavailable") {
+		t.Errorf("events = %q, want one Warning DataVolumesUnavailable event carrying the List error", events)
+	}
+	if got.Status.ObservedReplicas != 1 || got.Status.AvailableReplicas != 1 {
+		t.Errorf("replicas observed=%d available=%d, want 1 and 1", got.Status.ObservedReplicas, got.Status.AvailableReplicas)
+	}
+	if got.Status.Operational == nil || !*got.Status.Operational || got.Status.Message != "" {
+		t.Errorf("Operational=%v Message=%q, want a monitor with no DataVolume verdict to stay operational", got.Status.Operational, got.Status.Message)
+	}
+}
+
+func TestReconcile_UnreadDataVolumesKeepTheLastVerdict(t *testing.T) {
+	const stuck = "DataVolume m is ImportInProgress"
+	for _, withReader := range []bool{true, false} {
+		t.Run(fmt.Sprintf("reader=%v", withReader), func(t *testing.T) {
+			got, _, _ := reconcileWithUnreadableDataVolumes(t, withReader, false, cozyv1alpha1.WorkloadMonitorStatus{
+				Operational: ptr.To(false),
+				Message:     stuck,
+				Reason:      cozyv1alpha1.WorkloadMonitorReasonDataVolumeNotReady,
+			})
+			if got.Status.ObservedReplicas != 1 || got.Status.AvailableReplicas != 1 {
+				t.Errorf("replicas observed=%d available=%d, want 1 and 1", got.Status.ObservedReplicas, got.Status.AvailableReplicas)
+			}
+			if got.Status.Operational == nil || *got.Status.Operational || got.Status.Message != stuck || got.Status.Reason != cozyv1alpha1.WorkloadMonitorReasonDataVolumeNotReady {
+				t.Errorf("Operational=%v Message=%q, want false and %q", got.Status.Operational, got.Status.Message, stuck)
+			}
+		})
+	}
+}
+
+func TestReconcile_SyncingDataVolumeWatchPublishesAndRequeues(t *testing.T) {
+	const stuck = "DataVolume m is Failed"
+	got, result, events, err := reconcileWithUnreadableDataVolumesEvents(t, false, true, cozyv1alpha1.WorkloadMonitorStatus{
+		Operational: ptr.To(false),
+		Message:     stuck,
+		Reason:      cozyv1alpha1.WorkloadMonitorReasonDataVolumeNotReady,
+	})
+	if err != nil || result.RequeueAfter <= 0 || len(events) != 0 {
+		t.Errorf("Reconcile = %+v, %v, events %q while the DataVolume watch syncs, want a requeue, no error and no event: the window is expected, not a failure", result, err, events)
+	}
+	if got.Status.ObservedReplicas != 1 || got.Status.AvailableReplicas != 1 {
+		t.Errorf("replicas observed=%d available=%d, want 1 and 1", got.Status.ObservedReplicas, got.Status.AvailableReplicas)
+	}
+	if got.Status.Operational == nil || *got.Status.Operational || got.Status.Message != stuck {
+		t.Errorf("Operational=%v Message=%q, want false and %q", got.Status.Operational, got.Status.Message, stuck)
+	}
+}
+
+func TestReconcile_NoDataVolumeReaderSkipsDataVolumes(t *testing.T) {
+	busy := "ImportInProgress"
+	got := reconcileDataVolumeMonitor(t, false, nil,
+		newDataVolume("vm-disk-test", map[string]string{"app.kubernetes.io/instance": "vm-disk-test"}, &busy),
+	)
+	if !*got.Status.Operational {
+		t.Error("Operational = false without a DataVolume reader, want true")
+	}
+}
+
+func TestDataVolumeAPIServed(t *testing.T) {
+	empty := meta.NewDefaultRESTMapper(nil)
+	served, err := dataVolumeAPIServed(empty)
+	if err != nil || served {
+		t.Errorf("empty mapper: served=%v err=%v, want false, nil", served, err)
+	}
+
+	withCDI := meta.NewDefaultRESTMapper(nil)
+	withCDI.Add(dataVolumeGVK, meta.RESTScopeNamespace)
+	served, err = dataVolumeAPIServed(withCDI)
+	if err != nil || !served {
+		t.Errorf("mapper with DataVolume: served=%v err=%v, want true, nil", served, err)
+	}
+}
+
+type failingRESTMapper struct{ meta.RESTMapper }
+
+func (failingRESTMapper) RESTMapping(schema.GroupKind, ...string) (*meta.RESTMapping, error) {
+	return nil, fmt.Errorf("discovery unavailable")
+}
+
+func TestDataVolumeAPIServed_DiscoveryErrorIsReturned(t *testing.T) {
+	served, err := dataVolumeAPIServed(failingRESTMapper{meta.NewDefaultRESTMapper(nil)})
+	if err == nil || served {
+		t.Errorf("served=%v err=%v, want false and the discovery error", served, err)
+	}
+}
+
+// startingWatcher starts every source it is given, as a controller that has
+// already started its sources does.
+type startingWatcher struct {
+	sources []source.Source
+	err     error
+	// onWatch runs when Watch is called, before the source starts.
+	onWatch func()
+	queue   workqueue.TypedRateLimitingInterface[reconcile.Request]
+}
+
+func (w *startingWatcher) Watch(src source.Source) error {
+	if w.onWatch != nil {
+		w.onWatch()
+	}
+	if w.err != nil {
+		return w.err
+	}
+	w.sources = append(w.sources, src)
+	if w.queue == nil {
+		w.queue = workqueue.NewTypedRateLimitingQueue(workqueue.DefaultTypedControllerRateLimiter[reconcile.Request]())
+	}
+	return src.Start(context.Background(), w.queue)
+}
+
+func readerOf(r *WorkloadMonitorReconciler) client.Reader {
+	r.dataVolumeMu.RLock()
+	defer r.dataVolumeMu.RUnlock()
+	return r.DataVolumeReader
+}
+
+func watchReconciler() *WorkloadMonitorReconciler {
+	s := newTestScheme()
+	return &WorkloadMonitorReconciler{Client: fake.NewClientBuilder().WithScheme(s).Build(), Scheme: s}
+}
+
+// kindSources leaves out the source that queues the monitors once the reader
+// is installed.
+func (w *startingWatcher) kindSources() int {
+	n := 0
+	for _, src := range w.sources {
+		if _, ok := src.(source.Func); !ok {
+			n++
+		}
+	}
+	return n
+}
+
+func servedMapper() meta.RESTMapper {
+	mapper := meta.NewDefaultRESTMapper(nil)
+	mapper.Add(dataVolumeGVK, meta.RESTScopeNamespace)
+	return mapper
+}
+
+// fakeDataVolumeInformer also fills the lazily built fields of FakeInformers,
+// which is not safe for concurrent use while the source reads them.
+func fakeDataVolumeInformer(t *testing.T, informers *informertest.FakeInformers) *controllertest.FakeInformer {
+	t.Helper()
+	dv := &unstructured.Unstructured{}
+	dv.SetGroupVersionKind(dataVolumeGVK)
+	fi, err := informers.FakeInformerFor(context.Background(), dv)
+	if err != nil {
+		t.Fatal(err)
+	}
+	return fi
+}
+
+// dataVolumeInformers seeds the DataVolume informer, because FakeInformers
+// creates every informer it builds itself already synced.
+func dataVolumeInformers(synced bool) (*informertest.FakeInformers, *controllertest.FakeInformer) {
+	fi := controllertest.NewFakeInformer()
+	if synced {
+		fi.Synced()
+	}
+	return &informertest.FakeInformers{
+		InformersByGVK: map[schema.GroupVersionKind]toolscache.SharedIndexInformer{dataVolumeGVK: fi},
+	}, fi
+}
+
+func TestTryStartDataVolumeWatch_WaitsUntilTheKindIsServed(t *testing.T) {
+	r := watchReconciler()
+	w := &startingWatcher{}
+	mapper := meta.NewDefaultRESTMapper(nil)
+	informers := &informertest.FakeInformers{}
+	fakeDataVolumeInformer(t, informers)
+
+	done, err := r.tryStartDataVolumeWatch(context.Background(), mapper, w, informers, time.Second)
+	if err != nil || done {
+		t.Fatalf("before CDI: done=%v err=%v, want false, nil", done, err)
+	}
+	if w.kindSources() != 0 || readerOf(r) != nil {
+		t.Fatalf("before CDI: %d watches, reader %v; want none", len(w.sources), readerOf(r))
+	}
+
+	mapper.Add(dataVolumeGVK, meta.RESTScopeNamespace)
+	done, err = r.tryStartDataVolumeWatch(context.Background(), mapper, w, informers, time.Second)
+	if err != nil || !done {
+		t.Fatalf("after CDI: done=%v err=%v, want true, nil", done, err)
+	}
+	if w.kindSources() != 1 || readerOf(r) == nil {
+		t.Fatalf("after CDI: %d watches, reader %v; want one watch and a reader", len(w.sources), readerOf(r))
+	}
+}
+
+// Before the controller has started its sources, Watch only queues a source,
+// so the watch waits for the first reconcile. It starts right after it rather than on
+// the next discovery poll, so a disk created just after a restart is not read
+// as populated for a whole poll interval.
+func TestWatchDataVolumes_StartsOnTheFirstReconcile(t *testing.T) {
+	s := newTestScheme()
+	monitor := &cozyv1alpha1.WorkloadMonitor{
+		ObjectMeta: metav1.ObjectMeta{Name: "m", Namespace: "default"},
+		Spec:       cozyv1alpha1.WorkloadMonitorSpec{MinReplicas: ptr.To[int32](0)},
+	}
+	fakeClient := fake.NewClientBuilder().WithScheme(s).WithObjects(monitor).WithStatusSubresource(monitor).Build()
+	r := &WorkloadMonitorReconciler{Client: fakeClient, Scheme: s}
+	informers := &informertest.FakeInformers{}
+	fakeDataVolumeInformer(t, informers)
+	ctx := t.Context()
+	go r.watchDataVolumes(ctx, servedMapper(), &startingWatcher{}, informers, time.Hour)
+
+	time.Sleep(100 * time.Millisecond)
+	if readerOf(r) != nil {
+		t.Fatal("the DataVolume reader was installed before the first reconcile")
+	}
+	if _, err := r.Reconcile(ctx, reconcile.Request{NamespacedName: types.NamespacedName{Name: "m", Namespace: "default"}}); err != nil {
+		t.Fatalf("Reconcile: %v", err)
+	}
+	err := wait.PollUntilContextTimeout(ctx, 10*time.Millisecond, 5*time.Second, true, func(context.Context) (bool, error) {
+		return readerOf(r) != nil, nil
+	})
+	if err != nil {
+		t.Fatal("the DataVolume reader was not installed after the first reconcile, within a fraction of the poll interval")
+	}
+}
+
+func TestTryStartDataVolumeWatch_UnsyncedSourceLeavesNoReaderAndRetries(t *testing.T) {
+	r := watchReconciler()
+	w := &startingWatcher{}
+	informers, fi := dataVolumeInformers(false)
+
+	for attempt := 0; attempt < 3; attempt++ {
+		done, err := r.tryStartDataVolumeWatch(context.Background(), servedMapper(), w, informers, 50*time.Millisecond)
+		if err == nil || done || readerOf(r) != nil {
+			t.Fatalf("informer never synced: done=%v err=%v reader=%v, want an error, not done, no reader", done, err, readerOf(r))
+		}
+	}
+
+	fi.Synced()
+
+	done, err := r.tryStartDataVolumeWatch(context.Background(), servedMapper(), w, informers, time.Second)
+	if err != nil || !done || readerOf(r) == nil {
+		t.Fatalf("retry after sync: done=%v err=%v reader=%v, want done and a reader", done, err, readerOf(r))
+	}
+	// Every started source adds an event handler to the informer for good, so
+	// a retry must wait on the source it already has.
+	if w.kindSources() != 1 {
+		t.Fatalf("got %d watches over four attempts, want the first source reused", len(w.sources))
+	}
+}
+
+// A stopping manager ends the sync wait, which says nothing about the informer.
+func TestTryStartDataVolumeWatch_StoppingManagerLeavesNoReader(t *testing.T) {
+	r := watchReconciler()
+	informers, _ := dataVolumeInformers(false)
+	ctx, cancel := context.WithCancel(context.Background())
+	cancel()
+	done, err := r.tryStartDataVolumeWatch(ctx, servedMapper(), &startingWatcher{}, informers, time.Second)
+	if done || readerOf(r) != nil {
+		t.Fatalf("done=%v reader=%v, want no reader when the manager is stopping", done, readerOf(r))
+	}
+	if !errors.Is(err, context.Canceled) || strings.Contains(err.Error(), "%!") {
+		t.Errorf("err = %q, want context.Canceled and nothing formatted from a nil error", err)
+	}
+}
+
+// The source replays every DataVolume to the handler as soon as Watch starts
+// it, before the reader is installed. A reconcile in that window must be
+// retried, or the events that queued it are lost.
+func TestTryStartDataVolumeWatch_ReconcileBeforeTheReaderIsRetried(t *testing.T) {
+	for _, synced := range []bool{true, false} {
+		t.Run(fmt.Sprintf("synced=%v", synced), func(t *testing.T) {
+			r := watchReconciler()
+			informers, _ := dataVolumeInformers(synced)
+			monitor := &cozyv1alpha1.WorkloadMonitor{ObjectMeta: metav1.ObjectMeta{Name: "m", Namespace: "default"}}
+			var errDuringWatch error
+			w := &startingWatcher{}
+			w.onWatch = func() {
+				if len(w.sources) == 0 {
+					_, _, _, errDuringWatch = r.dataVolumesMessage(context.Background(), monitor)
+				}
+			}
+			_, _ = r.tryStartDataVolumeWatch(context.Background(), servedMapper(), w, informers, 50*time.Millisecond)
+			if errDuringWatch == nil {
+				t.Error("reading DataVolumes while the watch syncs returned no error, want one so the reconcile is retried")
+			}
+			// The started source keeps delivering events after a sync timeout,
+			// so a reconcile between attempts has to be retried as well.
+			if _, _, _, err := r.dataVolumesMessage(context.Background(), monitor); !synced && !errors.Is(err, errDataVolumeWatchSyncing) {
+				t.Errorf("after a sync timeout: %v, want errDataVolumeWatchSyncing until the reader is installed", err)
+			}
+		})
+	}
+}
+
+// A reconcile before the watch starts sees no reader and keeps the stored
+// verdict, and the source's replay cannot deliver a DataVolume deleted while
+// the controller was down, so installing the reader must queue the monitors
+// that hold a verdict.
+func TestTryStartDataVolumeWatch_StoredVerdictIsRecomputedOnceTheReaderIsInstalled(t *testing.T) {
+	s := newTestScheme()
+	stuck := &cozyv1alpha1.WorkloadMonitor{
+		ObjectMeta: metav1.ObjectMeta{Name: "stuck", Namespace: "default"},
+		Spec: cozyv1alpha1.WorkloadMonitorSpec{
+			Selector:    map[string]string{"app.kubernetes.io/instance": "stuck"},
+			MinReplicas: ptr.To[int32](0),
+		},
+		Status: cozyv1alpha1.WorkloadMonitorStatus{
+			Operational: ptr.To(false),
+			Message:     "DataVolume stuck is ImportInProgress",
+			Reason:      cozyv1alpha1.WorkloadMonitorReasonDataVolumeNotReady,
+		},
+	}
+	noVerdict := &cozyv1alpha1.WorkloadMonitor{
+		ObjectMeta: metav1.ObjectMeta{Name: "no-verdict", Namespace: "default"},
+		Spec:       cozyv1alpha1.WorkloadMonitorSpec{MinReplicas: ptr.To[int32](0)},
+		Status:     cozyv1alpha1.WorkloadMonitorStatus{Operational: ptr.To(true)},
+	}
+	fakeClient := fake.NewClientBuilder().WithScheme(s).
+		WithObjects(stuck, noVerdict).WithStatusSubresource(stuck, noVerdict).Build()
+	r := &WorkloadMonitorReconciler{Client: fakeClient, Scheme: s}
+	req := reconcile.Request{NamespacedName: types.NamespacedName{Name: "stuck", Namespace: "default"}}
+	if _, err := r.Reconcile(context.Background(), req); err != nil {
+		t.Fatalf("Reconcile before the watch: %v", err)
+	}
+
+	informers := &informertest.FakeInformers{}
+	fakeDataVolumeInformer(t, informers)
+	w := &startingWatcher{}
+	w.onWatch = func() {
+		if len(w.sources) == 1 && readerOf(r) == nil {
+			t.Error("monitors queued before the reader is installed would reconcile without it")
+		}
+	}
+	done, err := r.tryStartDataVolumeWatch(context.Background(), servedMapper(), w, informers, time.Second)
+	if err != nil || !done {
+		t.Fatalf("done=%v err=%v, want the reader installed", done, err)
+	}
+	var queued []reconcile.Request
+	for w.queue.Len() > 0 {
+		item, _ := w.queue.Get()
+		queued = append(queued, item)
+		w.queue.Done(item)
+	}
+	if len(queued) != 1 || queued[0] != req {
+		t.Fatalf("queued %v, want only the monitor holding a DataVolume verdict", queued)
+	}
+	if _, err := r.Reconcile(context.Background(), queued[0]); err != nil {
+		t.Fatalf("Reconcile after the reader: %v", err)
+	}
+	got := &cozyv1alpha1.WorkloadMonitor{}
+	if err := fakeClient.Get(context.Background(), req.NamespacedName, got); err != nil {
+		t.Fatal(err)
+	}
+	if got.Status.Operational == nil || !*got.Status.Operational || got.Status.Message != "" || got.Status.Reason != "" {
+		t.Errorf("Operational=%v Message=%q Reason=%q, want the verdict of the deleted DataVolume cleared", got.Status.Operational, got.Status.Message, got.Status.Reason)
+	}
+}
+
+func TestTryStartDataVolumeWatch_FailedMonitorListIsRetried(t *testing.T) {
+	s := newTestScheme()
+	monitor := &cozyv1alpha1.WorkloadMonitor{
+		ObjectMeta: metav1.ObjectMeta{Name: "m", Namespace: "default"},
+		Status:     cozyv1alpha1.WorkloadMonitorStatus{Message: "DataVolume m is Failed"},
+	}
+	listFails := true
+	fakeClient := fake.NewClientBuilder().WithScheme(s).WithObjects(monitor).WithInterceptorFuncs(interceptor.Funcs{
+		List: func(ctx context.Context, c client.WithWatch, list client.ObjectList, opts ...client.ListOption) error {
+			if listFails {
+				return fmt.Errorf("apiserver unavailable")
+			}
+			return c.List(ctx, list, opts...)
+		},
+	}).Build()
+	r := &WorkloadMonitorReconciler{Client: fakeClient, Scheme: s}
+	informers := &informertest.FakeInformers{}
+	fakeDataVolumeInformer(t, informers)
+	w := &startingWatcher{}
+	done, err := r.tryStartDataVolumeWatch(context.Background(), servedMapper(), w, informers, time.Second)
+	if err == nil || done {
+		t.Fatalf("done=%v err=%v, want an error and a retry: a monitor left unqueued keeps a stale verdict", done, err)
+	}
+
+	listFails = false
+	done, err = r.tryStartDataVolumeWatch(context.Background(), servedMapper(), w, informers, time.Second)
+	if err != nil || !done || w.kindSources() != 1 || w.queue.Len() != 1 {
+		t.Fatalf("retry: done=%v err=%v kind sources=%d queued=%d, want done, the source reused and the monitor queued", done, err, w.kindSources(), w.queue.Len())
+	}
+}
+
+func TestTryStartDataVolumeWatch_DiscoveryErrorRetries(t *testing.T) {
+	r := &WorkloadMonitorReconciler{}
+	w := &startingWatcher{}
+	done, err := r.tryStartDataVolumeWatch(context.Background(), failingRESTMapper{meta.NewDefaultRESTMapper(nil)}, w, &informertest.FakeInformers{}, time.Second)
+	if err == nil || done || len(w.sources) != 0 || readerOf(r) != nil {
+		t.Fatalf("done=%v err=%v watches=%d reader=%v, want an error and nothing registered", done, err, len(w.sources), readerOf(r))
+	}
+}
+
+func TestTryStartDataVolumeWatch_FailedWatchLeavesNoReader(t *testing.T) {
+	r := &WorkloadMonitorReconciler{}
+	w := &startingWatcher{err: fmt.Errorf("watch failed")}
+	done, err := r.tryStartDataVolumeWatch(context.Background(), servedMapper(), w, &informertest.FakeInformers{}, time.Second)
+	if err == nil || done || readerOf(r) != nil {
+		t.Fatalf("done=%v err=%v reader=%v, want an error, not done, no reader", done, err, readerOf(r))
+	}
+}
+
+// While the DataVolume watch syncs, every monitor is requeued every few
+// seconds, so a pass that changes nothing must not write status.
+func TestReconcile_UnchangedStatusIsNotWritten(t *testing.T) {
+	settled := cozyv1alpha1.WorkloadMonitorStatus{Operational: ptr.To(true), AvailableReplicas: 1, ObservedReplicas: 1}
+	for _, tc := range []struct {
+		name   string
+		status cozyv1alpha1.WorkloadMonitorStatus
+		writes int
+	}{
+		{"unchanged", settled, 0},
+		{"changed", cozyv1alpha1.WorkloadMonitorStatus{Operational: ptr.To(true)}, 1},
+	} {
+		t.Run(tc.name, func(t *testing.T) {
+			s := newTestScheme()
+			selector := map[string]string{"app.kubernetes.io/instance": "m"}
+			monitor := &cozyv1alpha1.WorkloadMonitor{
+				ObjectMeta: metav1.ObjectMeta{Name: "m", Namespace: "default"},
+				Spec:       cozyv1alpha1.WorkloadMonitorSpec{Selector: selector, MinReplicas: ptr.To[int32](1)},
+				Status:     tc.status,
+			}
+			pod := &corev1.Pod{
+				ObjectMeta: metav1.ObjectMeta{Name: "m-0", Namespace: "default", Labels: selector},
+				Status: corev1.PodStatus{Conditions: []corev1.PodCondition{
+					{Type: corev1.PodReady, Status: corev1.ConditionTrue},
+				}},
+			}
+			writes := 0
+			fakeClient := fake.NewClientBuilder().
+				WithScheme(s).
+				WithObjects(monitor, pod).
+				WithStatusSubresource(monitor).
+				WithInterceptorFuncs(interceptor.Funcs{
+					SubResourceUpdate: func(ctx context.Context, c client.Client, subResourceName string, obj client.Object, opts ...client.SubResourceUpdateOption) error {
+						if _, ok := obj.(*cozyv1alpha1.WorkloadMonitor); ok {
+							writes++
+						}
+						return c.SubResource(subResourceName).Update(ctx, obj, opts...)
+					},
+				}).
+				Build()
+			r := &WorkloadMonitorReconciler{Client: fakeClient, Scheme: s, dataVolumeWatchSyncing: true}
+			result, err := r.Reconcile(context.TODO(), reconcile.Request{NamespacedName: types.NamespacedName{Name: "m", Namespace: "default"}})
+			if err != nil || result.RequeueAfter <= 0 {
+				t.Fatalf("Reconcile = %+v, %v, want a requeue while the watch syncs", result, err)
+			}
+			if writes != tc.writes {
+				t.Errorf("got %d status writes, want %d", writes, tc.writes)
+			}
+		})
+	}
+}
+
+// CDI copies the DataVolume labels onto the PVC it creates and makes the
+// DataVolume its controller, so the monitor also publishes a Workload for the
+// PVC. Bound alone would read it operational mid-import.
+func TestReconcile_PVCOfANotReadyDataVolumeIsNotOperational(t *testing.T) {
+	selector := map[string]string{"app.kubernetes.io/instance": "vm-disk-test"}
+	for _, tc := range []struct {
+		name       string
+		phase      string
+		reader     bool
+		stored     *bool
+		controlled bool
+		// ownerGVK replaces the DataVolume GVK in the PVC's controller reference.
+		ownerGVK *schema.GroupVersionKind
+		want     bool
+	}{
+		{name: "importing", phase: "ImportInProgress", reader: true, controlled: true, want: false},
+		{name: "populated", phase: "Succeeded", reader: true, controlled: true, want: true},
+		{name: "not owned by the DataVolume", phase: "ImportInProgress", reader: true, want: true},
+		{name: "controller of another kind", phase: "ImportInProgress", reader: true, controlled: true, ownerGVK: &schema.GroupVersionKind{Group: dataVolumeGVK.Group, Version: dataVolumeGVK.Version, Kind: "DataSource"}, want: true},
+		{name: "DataVolume kind of another group", phase: "ImportInProgress", reader: true, controlled: true, ownerGVK: &schema.GroupVersionKind{Group: "example.com", Version: "v1", Kind: dataVolumeGVK.Kind}, want: true},
+		{name: "unread keeps the stored verdict", phase: "Succeeded", stored: ptr.To(false), controlled: true, want: false},
+		{name: "unread and new reads bind state", phase: "ImportInProgress", controlled: true, want: true},
+	} {
+		t.Run(tc.name, func(t *testing.T) {
+			s := newTestScheme()
+			monitor := &cozyv1alpha1.WorkloadMonitor{
+				ObjectMeta: metav1.ObjectMeta{Name: "vm-disk-test", Namespace: "default"},
+				Spec:       cozyv1alpha1.WorkloadMonitorSpec{Selector: selector, MinReplicas: ptr.To[int32](0)},
+			}
+			dv := newDataVolume("vm-disk-test", selector, &tc.phase)
+			dv.SetUID("dv-uid")
+			pvc := &corev1.PersistentVolumeClaim{
+				ObjectMeta: metav1.ObjectMeta{Name: "vm-disk-test", Namespace: "default", Labels: selector},
+				Spec:       corev1.PersistentVolumeClaimSpec{StorageClassName: ptr.To("replicated")},
+				Status:     corev1.PersistentVolumeClaimStatus{Phase: corev1.ClaimBound},
+			}
+			if tc.controlled {
+				gvk := dataVolumeGVK
+				if tc.ownerGVK != nil {
+					gvk = *tc.ownerGVK
+				}
+				pvc.OwnerReferences = []metav1.OwnerReference{*metav1.NewControllerRef(dv, gvk)}
+			}
+			objs := []client.Object{monitor, dv, pvc}
+			if tc.stored != nil {
+				objs = append(objs, &cozyv1alpha1.Workload{
+					ObjectMeta: metav1.ObjectMeta{Name: "pvc-vm-disk-test", Namespace: "default"},
+					Status:     cozyv1alpha1.WorkloadStatus{Operational: *tc.stored},
+				})
+			}
+			fakeClient := fake.NewClientBuilder().WithScheme(s).WithObjects(objs...).WithStatusSubresource(monitor).Build()
+			r := &WorkloadMonitorReconciler{Client: fakeClient, Scheme: s}
+			if tc.reader {
+				r.DataVolumeReader = fakeClient
+			}
+			if _, err := r.Reconcile(context.TODO(), reconcile.Request{NamespacedName: types.NamespacedName{Name: "vm-disk-test", Namespace: "default"}}); err != nil {
+				t.Fatalf("Reconcile: %v", err)
+			}
+			workload := &cozyv1alpha1.Workload{}
+			if err := fakeClient.Get(context.TODO(), types.NamespacedName{Name: "pvc-vm-disk-test", Namespace: "default"}, workload); err != nil {
+				t.Fatalf("Failed to get the PVC Workload: %v", err)
+			}
+			if workload.Status.Operational != tc.want {
+				t.Errorf("PVC Workload Operational = %v, want %v", workload.Status.Operational, tc.want)
+			}
+		})
+	}
+}
diff --git a/internal/cozyvaluesreplicator/cozyvaluesreplicator.go b/internal/cozyvaluesreplicator/cozyvaluesreplicator.go
index 5f6215a732..c17f074c2c 100644
--- a/internal/cozyvaluesreplicator/cozyvaluesreplicator.go
+++ b/internal/cozyvaluesreplicator/cozyvaluesreplicator.go
@@ -18,6 +18,7 @@ package cozyvaluesreplicator
 
 import (
 	"context"
+	"maps"
 
 	corev1 "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
@@ -237,9 +238,7 @@ func (r *SecretReplicatorReconciler) Reconcile(ctx context.Context, req ctrl.Req
 	_, err := controllerutil.CreateOrUpdate(ctx, r.Client, replicatedSecret, func() error {
 		// Copy the secret data and type from the source
 		replicatedSecret.Data = make(map[string][]byte)
-		for k, v := range originalSecret.Data {
-			replicatedSecret.Data[k] = v
-		}
+		maps.Copy(replicatedSecret.Data, originalSecret.Data)
 		replicatedSecret.Type = originalSecret.Type
 
 		// Copy labels and annotations from source (if any)
@@ -247,17 +246,13 @@ func (r *SecretReplicatorReconciler) Reconcile(ctx context.Context, req ctrl.Req
 			if replicatedSecret.Labels == nil {
 				replicatedSecret.Labels = make(map[string]string)
 			}
-			for k, v := range originalSecret.Labels {
-				replicatedSecret.Labels[k] = v
-			}
+			maps.Copy(replicatedSecret.Labels, originalSecret.Labels)
 		}
 		if originalSecret.Annotations != nil {
 			if replicatedSecret.Annotations == nil {
 				replicatedSecret.Annotations = make(map[string]string)
 			}
-			for k, v := range originalSecret.Annotations {
-				replicatedSecret.Annotations[k] = v
-			}
+			maps.Copy(replicatedSecret.Annotations, originalSecret.Annotations)
 		}
 
 		return nil
diff --git a/internal/crdinstall/install_test.go b/internal/crdinstall/install_test.go
index f20114b1ee..8ab04d20dc 100644
--- a/internal/crdinstall/install_test.go
+++ b/internal/crdinstall/install_test.go
@@ -21,6 +21,7 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
+	"slices"
 	"strings"
 	"testing"
 	"time"
@@ -63,13 +64,7 @@ func TestWriteEmbeddedManifests(t *testing.T) {
 		"cozystack.io_packagesources.yaml",
 	}
 	for _, expected := range expectedFiles {
-		found := false
-		for _, actual := range yamlFiles {
-			if actual == expected {
-				found = true
-				break
-			}
-		}
+		found := slices.Contains(yamlFiles, expected)
 		if !found {
 			t.Errorf("expected file %q not found in output, got %v", expected, yamlFiles)
 		}
@@ -179,8 +174,8 @@ func establishedInterceptor() interceptor.Funcs {
 				return nil
 			}
 			if u.GetKind() == "CustomResourceDefinition" {
-				_ = unstructured.SetNestedSlice(u.Object, []interface{}{
-					map[string]interface{}{
+				_ = unstructured.SetNestedSlice(u.Object, []any{
+					map[string]any{
 						"type":   "Established",
 						"status": "True",
 					},
diff --git a/internal/crdinstall/manifests/cozystack.io_packagesources.yaml b/internal/crdinstall/manifests/cozystack.io_packagesources.yaml
index 1d0037dfd4..e3b2b41eee 100644
--- a/internal/crdinstall/manifests/cozystack.io_packagesources.yaml
+++ b/internal/crdinstall/manifests/cozystack.io_packagesources.yaml
@@ -105,6 +105,64 @@ spec:
                                 items:
                                   type: string
                                 type: array
+                              healthCheckExprs:
+                                description: |-
+                                  HealthCheckExprs maps to HelmReleaseSpec.HealthCheckExprs — CEL health
+                                  expressions for the custom resource(s) this component renders, so the
+                                  HelmRelease reports Ready only when the CR is actually healthy. OpenAPI
+                                  validates only the struct shape, so mistakes surface in helm-controller,
+                                  and they do not all fail the same way:
+                                    - An expression that does not parse, an empty current expression, or
+                                      two entries for the same group and kind stall the HelmRelease with
+                                      reason InvalidCELExpression before any Helm action runs.
+                                    - An expression that errors on the object, such as a read of a
+                                      misspelled field or a non-boolean result, does not end the wait: the
+                                      CR reads as Unknown on every poll, and the Helm action waits out its
+                                      timeout with the CEL error in the message. Reading a status field
+                                      errors this way, even inside has(), until the CR's controller writes
+                                      a status; the wait goes on and can still succeed once it does.
+                                    - A current expression that evaluates cleanly but never becomes true,
+                                      such as a comparison against the wrong value, leaves the CR
+                                      InProgress, and the Helm action waits out its timeout with no CEL
+                                      error to point at the expression.
+                                    - A group or kind that does not match the CR the chart renders leaves
+                                      the expressions unused, and that CR is judged by the built-in
+                                      kstatus rules instead.
+                                  A CR whose CRD is not installed fails the Helm action before any wait,
+                                  whatever these expressions say.
+                                items:
+                                  description: CustomHealthCheck defines the health
+                                    check for custom resources.
+                                  properties:
+                                    apiVersion:
+                                      description: APIVersion of the custom resource
+                                        under evaluation.
+                                      type: string
+                                    current:
+                                      description: |-
+                                        Current is the CEL expression that determines if the status
+                                        of the custom resource has reached the desired state.
+                                      type: string
+                                    failed:
+                                      description: |-
+                                        Failed is the CEL expression that determines if the status
+                                        of the custom resource has failed to reach the desired state.
+                                      type: string
+                                    inProgress:
+                                      description: |-
+                                        InProgress is the CEL expression that determines if the status
+                                        of the custom resource has not yet reached the desired state.
+                                      type: string
+                                    kind:
+                                      description: Kind of the custom resource under
+                                        evaluation.
+                                      type: string
+                                  required:
+                                  - apiVersion
+                                  - current
+                                  - kind
+                                  type: object
+                                type: array
                               namespace:
                                 description: Namespace is the Kubernetes namespace
                                   where the release will be installed
@@ -131,6 +189,17 @@ spec:
                                 - Create
                                 - CreateReplace
                                 type: string
+                              waitStrategy:
+                                description: |-
+                                  WaitStrategy maps to HelmReleaseSpec.WaitStrategy.Name — a deliberate
+                                  scalar simplification of the upstream {name} object. One of poller|legacy.
+                                  When healthCheckExprs is set and this is empty, the generated HelmRelease
+                                  defaults to poller, because healthCheckExprs are only evaluated under the
+                                  poller wait strategy.
+                                enum:
+                                - poller
+                                - legacy
+                                type: string
                             type: object
                           libraries:
                             description: |-
diff --git a/internal/fluxcontract/snapshot_shape_test.go b/internal/fluxcontract/snapshot_shape_test.go
new file mode 100644
index 0000000000..4f2f5d19f0
--- /dev/null
+++ b/internal/fluxcontract/snapshot_shape_test.go
@@ -0,0 +1,780 @@
+// Package fluxcontract holds contract tests for upstream Flux types this
+// repository reads through kubectl rather than through the Go API.
+//
+// A shell script that pulls a field out of a Kubernetes object with
+// `kubectl -o jsonpath` depends on the serialized shape of an upstream Go
+// struct, and nothing in the shell layer can observe that dependency. Rename
+// the field upstream and the expression stops matching: kubectl prints
+// nothing, exits zero, and the caller reads the empty output as an answer
+// about the object rather than as a question that no longer parses.
+//
+// The test for that cannot live in the shell layer either. Pointing an
+// expression at a document written by the same test proves the reader can read
+// that document and nothing else, because a rename moves neither side.
+//
+// So this file supplies neither half. The expression comes from the shell
+// library that ships it, obtained by sourcing that library, and the object is
+// built from the upstream type at the version go.mod pins. What is left to
+// assert is that the one still finds the other.
+//
+// One test does that. The rest exist because the expression does not travel to
+// kubectl directly: it goes through a shell variable that one library assigns
+// and the caller expands, and every step of that indirection can fail without
+// saying so, including the way this file resolves the value in the first place.
+package fluxcontract
+
+import (
+	"bufio"
+	"bytes"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"io"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"regexp"
+	"strings"
+	"testing"
+
+	helmv2 "github.com/fluxcd/helm-controller/api/v2"
+	utilyaml "k8s.io/apimachinery/pkg/util/yaml"
+	"k8s.io/client-go/util/jsonpath"
+	"sigs.k8s.io/yaml"
+)
+
+const (
+	// The shell library that owns the expression, and the script that runs it.
+	guardLibrary = "../../hack/e2e-chainsaw/_lib/remediation-guard.sh"
+	guardCaller  = "../../hack/e2e-chainsaw/_lib/run-kubernetes.sh"
+
+	// The Chainsaw suites, one directory each, which may call the guard from a
+	// script step.
+	chainsawSuites = "../../hack/e2e-chainsaw"
+
+	sharedName = "HELMRELEASE_HISTORY_JSONPATH"
+)
+
+// The name followed by an `=`, wherever it appears and however indented. Named
+// after what it matches rather than what it is used to find: an occurrence is
+// not an assignment, a comment mentioning one counts, and a message built on
+// this has to say occurrence or it claims more than the pattern saw.
+//
+// Derived from the const rather than spelled out, so that a rename carries the
+// pattern with it. A literal here survives the rename as a search for a name
+// nothing assigns any more, which finds nothing and reads as a pass, while the
+// failure message goes on interpolating the const and naming the new one. The
+// refuse case below still spells the name out, so a rename that reaches only
+// half the file arrives as that case going red rather than as a pin that
+// quietly stopped looking.
+var nameFollowedByEquals = regexp.MustCompile(regexp.QuoteMeta(sharedName) + `=`)
+
+// The function the guard's result comes from, and the local handed to it.
+//
+// The read is found through this call rather than by looking for a well-formed
+// read anywhere in the file. Those are different assertions: the second is
+// satisfied by any read that takes the shared expansion, including one the
+// guard never consumes, so a second assignment overwriting the consumed local
+// with a literal jsonpath leaves the pin green over exactly the unpinned
+// expression it exists to forbid. Anchoring on the call names the one read
+// whose expression reaches upstream.
+//
+// The `if` prefix, the negation, and the quoting of the argument are left
+// free, because this script mixes forms that behave identically. Each is a
+// case in the accept table below.
+//
+// The reach is one named caller, the Chainsaw suites, and calls that pass a
+// local. Any other script that reads history for the guard, or a caller passing
+// a substitution written out in the argument, is outside what this sees. Neither
+// exists today (the bats tests hand the guard literal input and read no
+// history), and the rule for authors is prose rather than a pattern:
+// docs/agents/e2e-testing.md tells them to take the expression from the shared
+// name.
+var guardConsumers = regexp.MustCompile(
+	`(?m)^[ \t]*(?:if[ \t]+)?(?:![ \t]*)?helmrelease_has_remediation_cycle[ \t]+"?\$\{?([A-Za-z_][A-Za-z0-9_]*)`)
+
+// sharedReadBy builds the read that fills one named local: a line-starting
+// assignment to that exact name, taking its value from a kubectl call that
+// passes the expansion of the shared name as its jsonpath. The call may go
+// through _cozy_guard_kubectl, the caller's bounded wrapper, which hands its
+// arguments to kubectl unchanged.
+//
+// The `$` is load-bearing rather than decorative. Matching the bare name would
+// accept `jsonpath=HELMRELEASE_HISTORY_JSONPATH`, which kubectl reads as a
+// template with no braces and echoes back verbatim. That output is not empty,
+// so the script's own empty-history backstop stays quiet while carrying no
+// status the cycle check can match, which is this file's whole subject
+// arriving with the pin green over it.
+//
+// The spelling of `-o` and the quoting of the substitution are left free, for
+// the reason above. So is a `timeout` bound in front of kubectl, which limits
+// how long the read may hang and not what it reads. Each is a case in the
+// accept table below, so that "free" is enforced rather than announced. The
+// bound is spelled out rather than admitted as any text before kubectl,
+// because `$(echo kubectl ...)` names the expansion without running it and
+// hands the guard the command line as text. Nor is it admitted in front of the
+// wrapper: timeout runs a program, the wrapper is a shell function, and that
+// read fails every time. The name ends at a blank, so a command that only
+// starts with either name is not taken for it. A spelling absent from that
+// table is one nobody checked, not one known to be rejected.
+//
+// A form this pattern does not cover reddens rather than passing: the caller
+// test fails with the pattern printed. So the list is a record of what was
+// checked and not a contract, and a rewrite outside it costs a red in the same
+// run rather than a pin that quietly stops asserting. That is why `readonly`,
+// `export` and `local` prefixes are not accepted here and need no case: each
+// fails loudly and visibly. `local` would not survive sourcing anyway, and
+// `declare` is not portable to the dash and busybox shells this runs under.
+//
+// The quoting of the expansion is not among them, and is not pinned either.
+// Quoting the substitution wraps its result; the expansion inside still has to
+// carry its own quotes, or the space in `{range .status.history[*]}` splits
+// the argument and kubectl is handed a truncated template. That is left
+// unpinned because it fails loudly: kubectl rejects the fragment, the variable
+// comes back empty, and the script's empty-history check exits 1. The `$` is
+// pinned because dropping it fails quietly instead, returning the name as its
+// own text and passing every check downstream. What earns a pin here is the
+// silence of the failure, not its severity.
+//
+// An accept case is a form a maintainer may rewrite the read into, so a case
+// that changes behaviour would document a broken rewrite as legitimate.
+// The trailing `\b` ends the name. Without it a read left pointing at a retired
+// `..._OLD` or `..._V1` beside the shared name matches on the prefix and
+// satisfies the pin while expanding to something else entirely. Both spellings
+// leak that way, not the braceless one alone: the `{` here is optional and no
+// closing `}` is required after the name, so nothing bounds it but this. Both
+// are in the refuse table, because covering only the spelling that looks
+// unterminated is how a later rewrite reopens the other one.
+func sharedReadBy(local string) *regexp.Regexp {
+	return regexp.MustCompile(`(?m)^[ \t]*` + regexp.QuoteMeta(local) +
+		`="?\$\((?:(?:timeout[ \t]+(?:-k[ \t]+[0-9]+[smhd]?[ \t]+)?[0-9]+[smhd]?[ \t]+)?kubectl|_cozy_guard_kubectl)[ \t][^)]*jsonpath=[^)]*\$\{?` + sharedName + `\b`)
+}
+
+// localFollowedByEquals counts occurrences of one named local followed by an
+// `=`. One read matching the shared form says nothing about a second assignment
+// to the same name: the shell takes the last one, the pattern takes any one,
+// and the two need not be the same statement. Requiring a single occurrence is
+// what makes the matched read the read that runs.
+//
+// Named after what it matches, like the sibling pattern above and for the same
+// reason: an occurrence is not an assignment. Deliberately not anchored to the
+// start of a line. An anchor here would have to enumerate the ways an
+// assignment can begin somewhere other than column one, and each spelling it
+// missed would be a second assignment counted as none: `export`, `readonly` and
+// anything after a `;` all run, and all leave the count at one. That is
+// reimplementing enough of the shell to decide what an assignment is, which
+// this file refuses to do elsewhere for the same reason. Counting occurrences
+// instead errs toward two where there is one, and a miscount in that direction
+// reddens.
+//
+// The leading `\b` keeps a longer name ending in this one, `prev_history` for
+// `history`, from being counted as it.
+func localFollowedByEquals(local string) *regexp.Regexp {
+	return regexp.MustCompile(`\b` + regexp.QuoteMeta(local) + `=`)
+}
+
+func readGuardFile(t *testing.T, path string) []byte {
+	t.Helper()
+	src, err := os.ReadFile(filepath.Clean(path))
+	if err != nil {
+		t.Fatalf("reading %s: %v", path, err)
+	}
+	return src
+}
+
+// The snippet that resolves the library's value. The path goes in as an
+// argument rather than into the script text, so no quoting of it can change
+// what the snippet does. `|| exit 1` is what makes a broken library reach the
+// error branch at all: without it the trailing printf is the last command, so a
+// library that fails to source still exits 0 and the failure arrives only as a
+// value that happens to look wrong.
+//
+// The leading `unset` is what keeps the answer coming from the library rather
+// than from whoever ran the test. `go test` hands the child its own
+// environment, so a shell that exported this name has already answered the
+// question the snippet asks: a library that stopped assigning it would print
+// the inherited value, the empty check below would not fire, and the pin would
+// go on passing over a guard that reads nothing. That is the silent retirement
+// this file refuses elsewhere, arriving through the environment instead of
+// through the source.
+const sourceAndPrint = `unset ` + sharedName + `; . "$1" || exit 1; printf %s "${` + sharedName + `-}"`
+
+// sourcedExpression returns the value the shell ends up with after sourcing the
+// guard library, which is the value the guard passes to kubectl.
+//
+// This runs `sh` from a Go test, which is unusual here and deliberate. Reading
+// the assignment as text means reimplementing enough of the shell to decide
+// which text is the assignment, and every such approximation is wrong at some
+// spelling: an `export`, an indent inside a function, a second assignment later
+// in the file. Sourcing gets last-assignment-wins, `export`, `readonly` and
+// top-level indentation for free, because the thing resolving them is the shell
+// rather than a guess about it. What it does not get is an assignment inside a
+// function: sourcing defines the function without calling it, so the value
+// comes back empty and the empty check below fails, which is the right answer
+// for a library that no longer sets the variable it exports.
+//
+// A missing `sh` fails rather than skips. A skip prints in verbose output and
+// reads as a pass in the summary, so an environment without a shell would
+// retire this pin silently, which is the failure mode the whole file exists to
+// prevent. Anything that cannot run `sh` cannot run the script being pinned.
+func sourcedExpression(t *testing.T) string {
+	t.Helper()
+
+	if _, err := exec.LookPath("sh"); err != nil {
+		t.Fatalf("sh not found (%v), so the guard's own expression cannot be resolved. "+
+			"This fails rather than skips: a skipped pin reads as a passing one.", err)
+	}
+
+	out, err := exec.Command("sh", "-c", sourceAndPrint, "sh", guardLibrary).Output()
+	if err != nil {
+		// Output() puts the shell's own complaint in ExitError.Stderr, and %v on
+		// that error prints only the exit status. This path runs exactly when
+		// something is wrong, so dropping the one sentence that says what would
+		// leave the reader with the class and not the cause.
+		detail := ""
+		var ee *exec.ExitError
+		if errors.As(err, &ee) && len(ee.Stderr) > 0 {
+			detail = ": " + strings.TrimSpace(string(ee.Stderr))
+		}
+		t.Fatalf("sourcing %s: %v%s. The library has to be sourceable on its own, since the "+
+			"e2e script sources it the same way.", guardLibrary, err, detail)
+	}
+
+	expr := string(out)
+	if expr == "" {
+		t.Fatalf("sourcing %s leaves %s empty. If the guard reads release history another way "+
+			"now, this test has to follow it there. If it stopped reading history at all, the "+
+			"e2e remediation guard asserts nothing.", guardLibrary, sharedName)
+	}
+	return expr
+}
+
+// The carrier for sourceAndPrint. It runs the snippet against libraries written
+// here rather than against the shipped one, because what is under test is the
+// snippet itself and not anything about the guard: a fixture is the right
+// instrument for that and the wrong one for the contract next door.
+//
+// The snippet is one line and every piece of it fails green when removed, so
+// each piece gets a case and no case covers for another. Sourcing: without it
+// the value comes back empty rather than as the library's, which the second
+// case, wanting empty, reads as success. Unsetting: without it the inherited
+// value answers in place of a library that assigns nothing, which the first
+// case, whose library does assign, never sees. Exiting on a failed source:
+// without it a library that assigns the name and then fails still prints the
+// value and returns 0, which both other cases read as an ordinary success.
+func TestSourcingTakesTheLibrarysValueNotAnInheritedOne(t *testing.T) {
+	const inherited = "{.inherited}"
+
+	write := func(t *testing.T, body string) string {
+		t.Helper()
+		path := filepath.Join(t.TempDir(), "lib.sh")
+		if err := os.WriteFile(path, []byte(body), 0o600); err != nil {
+			t.Fatalf("writing the throwaway library: %v", err)
+		}
+		return path
+	}
+
+	// Returns what the snippet printed and whether it failed, because one case
+	// is about the failure and the others are about the value.
+	run := func(t *testing.T, path string) (string, error) {
+		t.Helper()
+		cmd := exec.Command("sh", "-c", sourceAndPrint, "sh", path)
+		cmd.Env = append(os.Environ(), sharedName+"="+inherited)
+		out, err := cmd.Output()
+		return string(out), err
+	}
+
+	mustRun := func(t *testing.T, path string) string {
+		t.Helper()
+		out, err := run(t, path)
+		if err != nil {
+			t.Fatalf("running the snippet: %v", err)
+		}
+		return out
+	}
+
+	t.Run("a library that assigns the name wins over the environment", func(t *testing.T) {
+		got := mustRun(t, write(t, sharedName+"='{.fromLibrary}'\n"))
+		if got != "{.fromLibrary}" {
+			t.Errorf("got %q, want the library's value; an inherited value must not reach the caller", got)
+		}
+	})
+
+	t.Run("a library that stops assigning the name comes back empty", func(t *testing.T) {
+		if got := mustRun(t, write(t, "# this library no longer assigns it\n")); got != "" {
+			t.Errorf("got %q, want empty. A value here is the environment answering for the "+
+				"library, which retires the pin without failing it.", got)
+		}
+	})
+
+	// The assignment comes before the failure deliberately. A library that
+	// breaks before assigning is caught by the empty value; one that breaks
+	// after has already supplied a value that looks entirely correct, so the
+	// exit status is the only thing left that knows the library is broken.
+	t.Run("a library that fails after assigning the name fails the snippet", func(t *testing.T) {
+		path := write(t, sharedName+"='{.fromLibrary}'\nthis_command_does_not_exist\n")
+		out, err := run(t, path)
+		if err == nil {
+			t.Errorf("the snippet returned 0 and printed %q for a library that failed to source. "+
+				"Sourcing has to fail the snippet, or a library that half-ran is indistinguishable "+
+				"from one that ran.", out)
+		}
+	})
+}
+
+// A HelmRelease whose history carries the statuses the guard reads. Built from
+// the upstream types, so a renamed or retyped field is a compile error here
+// before it is a silent empty read against a live cluster.
+func helmReleaseWithHistory() *helmv2.HelmRelease {
+	return &helmv2.HelmRelease{
+		Status: helmv2.HelmReleaseStatus{
+			History: helmv2.Snapshots{
+				{Version: 2, Status: "deployed"},
+				{Version: 1, Status: "uninstalled"},
+			},
+		},
+	}
+}
+
+// The only test here whose subject is upstream rather than the text of a shell
+// script: the expression the guard ships, run over the upstream type through
+// JSON the way kubectl runs it. Serialization is the point, since the struct's
+// json tags are what an expression actually sees.
+//
+// Only the match is asserted. How kubectl's printer behaves on a path that is
+// absent is kubectl's own configuration, not part of the Flux contract, and
+// guessing at it here would put the expectation and the fixture back in the
+// same hands.
+func TestGuardExpressionReadsUpstreamHistoryStatuses(t *testing.T) {
+	raw, err := json.Marshal(helmReleaseWithHistory())
+	if err != nil {
+		t.Fatalf("marshalling HelmRelease: %v", err)
+	}
+	var generic any
+	if err := json.Unmarshal(raw, &generic); err != nil {
+		t.Fatalf("unmarshalling HelmRelease: %v", err)
+	}
+
+	expr := sourcedExpression(t)
+
+	jp := jsonpath.New("guard")
+	if err := jp.Parse(expr); err != nil {
+		t.Fatalf("parsing the guard's expression %q: %v", expr, err)
+	}
+	var out strings.Builder
+	if err := jp.Execute(&out, generic); err != nil {
+		t.Fatalf("running the guard's expression %q over an upstream HelmRelease: %v. "+
+			"The serialized shape no longer satisfies the expression.", expr, err)
+	}
+
+	var got []string
+	for line := range strings.SplitSeq(out.String(), "\n") {
+		if line != "" {
+			got = append(got, line)
+		}
+	}
+	want := []string{"deployed", "uninstalled"}
+	if len(got) != len(want) {
+		t.Fatalf("expression %q returned %q, want one line per Snapshot status %q",
+			expr, out.String(), want)
+	}
+	for i := range want {
+		if got[i] != want[i] {
+			t.Errorf("status %d: got %q, want %q", i, got[i], want[i])
+		}
+	}
+}
+
+// The value the caller hands the guard comes from a read of the expansion of
+// the shared name. Naming it without expanding it, naming it only in a comment
+// beside a rewritten read, or filling the consumed local somewhere else leaves
+// the guard running an expression nothing here checked.
+func TestGuardCallerReferencesTheSharedExpansion(t *testing.T) {
+	t.Run("the call", func(t *testing.T) {
+		for _, tc := range []struct{ spelling, line, local string }{
+			{"in an if", `  if helmrelease_has_remediation_cycle "${history_statuses}"; then`, "history_statuses"},
+			{"negated", `  if ! helmrelease_has_remediation_cycle "${history_statuses}"; then`, "history_statuses"},
+			{"bare call", `  helmrelease_has_remediation_cycle "${hr_history}"`, "hr_history"},
+			{"braceless expansion", `  if helmrelease_has_remediation_cycle "$history_statuses"; then`, "history_statuses"},
+		} {
+			t.Run(tc.spelling, func(t *testing.T) {
+				m := guardConsumers.FindStringSubmatch(tc.line)
+				if m == nil {
+					t.Fatalf("a legitimate call was not taken as one: %s", tc.line)
+				}
+				if m[1] != tc.local {
+					t.Errorf("read the consumed local as %q, want %q, from: %s", m[1], tc.local, tc.line)
+				}
+			})
+		}
+
+		t.Run("refuses a commented-out call", func(t *testing.T) {
+			line := `  # if helmrelease_has_remediation_cycle "${history_statuses}"; then`
+			if guardConsumers.MatchString(line) {
+				t.Errorf("taken as a call to the guard: %s", line)
+			}
+		})
+	})
+
+	t.Run("the read", func(t *testing.T) {
+		t.Run("refuses", func(t *testing.T) {
+			for _, tc := range []struct{ flaw, local, line string }{
+				{"name not expanded", "h", `  h=$(kubectl get hr -o"jsonpath=HELMRELEASE_HISTORY_JSONPATH")`},
+				{"name only in a trailing comment", "h", `  h=$(kubectl get hr -o"jsonpath={.status.gone}") # was ${HELMRELEASE_HISTORY_JSONPATH}`},
+				{"the read is commented out", "history_statuses", `  # history_statuses=$(kubectl get hr -o"jsonpath=${HELMRELEASE_HISTORY_JSONPATH}")`},
+				{"another local carries the shared read", "history_statuses", `  example=$(kubectl get hr -o"jsonpath=${HELMRELEASE_HISTORY_JSONPATH}")`},
+				{"a longer name starting with the shared one", "history_statuses", `  history_statuses=$(kubectl get hr -o"jsonpath=$HELMRELEASE_HISTORY_JSONPATH_OLD")`},
+				{"the same, braced", "history_statuses", `  history_statuses=$(kubectl get hr -o"jsonpath=${HELMRELEASE_HISTORY_JSONPATH_OLD}")`},
+				{"kubectl only an argument", "history_statuses", `  history_statuses=$(echo kubectl get hr -o"jsonpath=${HELMRELEASE_HISTORY_JSONPATH}")`},
+				{"the same, behind a timeout", "history_statuses", `  history_statuses=$(timeout 30 echo kubectl get hr -o"jsonpath=${HELMRELEASE_HISTORY_JSONPATH}")`},
+				{"a timeout in front of the wrapper, which it cannot run", "_history", `  _history=$(timeout 30 _cozy_guard_kubectl get hr -o"jsonpath=${HELMRELEASE_HISTORY_JSONPATH}")`},
+				{"a command whose name only starts with kubectl", "history_statuses", `  history_statuses=$(kubectlx get hr -o"jsonpath=${HELMRELEASE_HISTORY_JSONPATH}")`},
+				{"a function whose name only starts with the wrapper's", "_history", `  _history=$(_cozy_guard_kubectl_v2 get hr -o"jsonpath=${HELMRELEASE_HISTORY_JSONPATH}")`},
+			} {
+				t.Run(tc.flaw, func(t *testing.T) {
+					if sharedReadBy(tc.local).MatchString(tc.line) {
+						t.Errorf("taken as the read filling %s: %s", tc.local, tc.line)
+					}
+				})
+			}
+		})
+
+		// A refuse case has to be a form the shell would not run as the read,
+		// the mirror of the rule for accept cases. A legitimate rewrite listed
+		// there would pin the pattern's narrowness as though it were the intent.
+		t.Run("accepts", func(t *testing.T) {
+			for _, tc := range []struct{ spelling, local, line string }{
+				{"plain kubectl", "history_statuses", `  history_statuses=$(kubectl get hr -o"jsonpath=${HELMRELEASE_HISTORY_JSONPATH}")`},
+				{"quoted substitution", "history_statuses", `  history_statuses="$(kubectl get hr -ojsonpath="${HELMRELEASE_HISTORY_JSONPATH}")"`},
+				{"local renamed", "hr_history", `  hr_history=$(kubectl get hr -o"jsonpath=${HELMRELEASE_HISTORY_JSONPATH}")`},
+				{"spaced -o", "history_statuses", `  history_statuses=$(kubectl get hr -o jsonpath="${HELMRELEASE_HISTORY_JSONPATH}")`},
+				{"braceless expansion", "history_statuses", `  history_statuses=$(kubectl get hr -o"jsonpath=$HELMRELEASE_HISTORY_JSONPATH")`},
+				{"shipped form: through the bounded wrapper, continued", "_history", "  _history=$(_cozy_guard_kubectl get hr -n \"$_ns\" \"${_hr}\" \\\n    -o\"jsonpath=${HELMRELEASE_HISTORY_JSONPATH}\") || _read_rc=$?"},
+				{"bounded by timeout", "statuses", `  statuses=$(timeout 30 kubectl get hr -o jsonpath="$HELMRELEASE_HISTORY_JSONPATH")`},
+				{"bounded with a kill grace", "statuses", `  statuses=$(timeout -k 5 30s kubectl get hr -o jsonpath="$HELMRELEASE_HISTORY_JSONPATH")`},
+			} {
+				t.Run(tc.spelling, func(t *testing.T) {
+					if !sharedReadBy(tc.local).MatchString(tc.line) {
+						t.Errorf("a legitimate read was not taken as the read filling %s: %s", tc.local, tc.line)
+					}
+				})
+			}
+		})
+
+		// The case the shared-read pattern cannot answer on its own: a legitimate
+		// read, then a second one filling the same local with a literal the
+		// shell hands the guard. Matching a read says the file contains one;
+		// counting occurrences is what says the one it contains is the one that
+		// runs.
+		//
+		// One spelling per way an assignment can begin off column one, because
+		// an anchored count sees none of them and reports the single occurrence
+		// it was going to report anyway.
+		t.Run("a second assignment is not hidden by the first", func(t *testing.T) {
+			const first = "  history_statuses=$(kubectl get hr -o\"jsonpath=${HELMRELEASE_HISTORY_JSONPATH}\")\n"
+			for _, tc := range []struct{ spelling, second string }{
+				{"on its own line", "  history_statuses=$(kubectl get hr -o\"jsonpath={.statusz}\")\n"},
+				{"export prefix", "  export history_statuses=$(kubectl get hr -o\"jsonpath={.statusz}\")\n"},
+				{"readonly prefix", "  readonly history_statuses=$(kubectl get hr -o\"jsonpath={.statusz}\")\n"},
+				{"after a semicolon", "  : ; history_statuses=$(kubectl get hr -o\"jsonpath={.statusz}\")\n"},
+			} {
+				t.Run(tc.spelling, func(t *testing.T) {
+					overwritten := []byte(first + tc.second)
+					if !sharedReadBy("history_statuses").Match(overwritten) {
+						t.Fatal("the legitimate first read stopped matching, so this case no longer shows what it was written for")
+					}
+					if n := len(localFollowedByEquals("history_statuses").FindAll(overwritten, -1)); n != 2 {
+						t.Errorf("counted %d occurrences of the consumed local followed by =, want 2", n)
+					}
+				})
+			}
+
+			t.Run("a longer name ending in the consumed one is not counted", func(t *testing.T) {
+				line := []byte("  prev_history_statuses=$(kubectl get hr -o\"jsonpath={.statusz}\")\n")
+				if n := len(localFollowedByEquals("history_statuses").FindAll(line, -1)); n != 0 {
+					t.Errorf("counted %d occurrences, want 0: a different local must not read as this one", n)
+				}
+			})
+		})
+	})
+
+	src := readGuardFile(t, guardCaller)
+
+	consumers := guardConsumers.FindAllSubmatchIndex(src, -1)
+	if len(consumers) == 0 {
+		t.Fatalf("%s never calls helmrelease_has_remediation_cycle with an expanded local, so there "+
+			"is no read for this pin to follow. Either the caller stopped running the guard, or it "+
+			"calls it in a shape %s cannot see.", guardCaller, guardConsumers)
+	}
+
+	assertConsumedLocalsTakeTheSharedRead(t, guardCaller, src, consumers)
+}
+
+func assertConsumedLocalsTakeTheSharedRead(t testing.TB, path string, src []byte, consumers [][]int) {
+	t.Helper()
+	for _, m := range consumers {
+		local := string(src[m[2]:m[3]])
+		n := len(localFollowedByEquals(local).FindAll(src, -1))
+		if n != 1 {
+			t.Errorf("%s writes %s, the local it hands the guard, followed by = %d times; want "+
+				"exactly one. The count is of occurrences, so a comment mentioning one counts too; "+
+				"what it looks for is a second assignment, which the shell would take instead of "+
+				"the one this pin matched, putting an unpinned expression in front of the guard.",
+				path, local, n)
+			continue
+		}
+		if !sharedReadBy(local).Match(src) {
+			t.Errorf("%s fills %s, the local it hands the guard, in a shape that does not take its "+
+				"expression from %s. The pattern is the exact form accepted: %s. Either the read "+
+				"stopped using the shared assignment, or it uses it in a shape the pattern cannot "+
+				"see.", path, local, sharedName, sharedReadBy(local))
+			continue
+		}
+		if !sharedReadPrecedes(src, m) {
+			t.Errorf("%s fills %s from %s only after handing it to the guard, so the guard runs "+
+				"on whatever the local held before the read.", path, local, sharedName)
+		}
+	}
+}
+
+// sharedReadPrecedes reports whether the shared read of the local consumed by
+// the guard call m starts before that call. m holds the call's offsets as
+// FindAllSubmatchIndex returns them, so the call is placed where it matched and
+// not wherever its text first appears, a comment included. Text order stands
+// in for run order, which holds for a read and a call in one straight-line
+// block, as in every caller this file reads today.
+func sharedReadPrecedes(src []byte, m []int) bool {
+	read := sharedReadBy(string(src[m[2]:m[3]])).FindIndex(src)
+	return read != nil && read[0] < m[0]
+}
+
+// A Chainsaw suite that sources the guard library from a script step is a
+// caller too, and one this file would otherwise never read: the pin above names
+// one script, so a suite writing the jsonpath out as a literal runs an
+// expression nothing here checked.
+//
+// Every suite is read rather than a named one, because the next suite to adopt
+// the guard is the likeliest place for a copied literal and naming suites here
+// would need the same edit that introduces it. A suite cannot assign the shared
+// name either: its script sources the library first, so its own assignment
+// lands afterwards and replaces the value the upstream test resolved.
+//
+// Both sets are asserted non-empty. A glob that stops matching, or suites that
+// all stop calling the guard, leave the loop with nothing to check, and that
+// reads exactly like a pass.
+func TestChainsawSuitesReadHistoryThroughTheSharedName(t *testing.T) {
+	var suites []string
+	for _, pattern := range []string{"chainsaw-test.yaml", "chainsaw-test.yml"} {
+		found, err := filepath.Glob(filepath.Join(chainsawSuites, "*", pattern))
+		if err != nil {
+			t.Fatalf("globbing the Chainsaw suites: %v", err)
+		}
+		suites = append(suites, found...)
+	}
+	if len(suites) == 0 {
+		t.Fatalf("no Chainsaw suites found under %s, so this test asserted nothing", chainsawSuites)
+	}
+
+	// Each script step runs in a shell of its own, so the read the guard sees is
+	// the one in its own step. Checked against the whole file, a read in one
+	// step would satisfy a call in another, and an unrelated assignment of the
+	// same local elsewhere would fail a correct one.
+	t.Run("a read in another step does not count", func(t *testing.T) {
+		steps := scriptSteps(t, "fixture", []byte(`spec:
+  steps:
+  - try:
+    - script:
+        content: |
+          statuses=$(kubectl get hr -o "jsonpath=${HELMRELEASE_HISTORY_JSONPATH}")
+--- # a separator may carry a comment
+spec:
+  steps:
+  - try:
+    - script:
+        content: |
+          helmrelease_has_remediation_cycle "$statuses"
+`))
+		if len(steps) != 2 {
+			t.Fatalf("split the fixture into %d script steps, want 2", len(steps))
+		}
+		rec := &errorRecorder{TB: t}
+		if n := checkSuiteSteps(rec, "fixture", steps); n != 1 {
+			t.Fatalf("counted %d guard callers in the fixture, want 1", n)
+		}
+		if len(rec.errs) == 0 {
+			t.Error("a guard call whose only read sits in another step passed the check")
+		}
+	})
+
+	// The read has to come before the call: one after it fills the local only
+	// once the guard has already run, on an empty or unset value.
+	t.Run("a read after the guard call does not count", func(t *testing.T) {
+		const read = "statuses=$(kubectl get hr -o \"jsonpath=${HELMRELEASE_HISTORY_JSONPATH}\")\n"
+		const call = "helmrelease_has_remediation_cycle \"$statuses\"\n"
+		for _, tc := range []struct {
+			name, step string
+			want       bool
+		}{
+			{"read first", read + call, true},
+			{"call first", call + read, false},
+			// The call's own text in a comment above the read is not the call.
+			{"call text in a comment first", "# then " + call + read + call, true},
+		} {
+			ms := guardConsumers.FindAllSubmatchIndex([]byte(tc.step), -1)
+			if len(ms) != 1 {
+				t.Fatalf("%s: found %d guard calls, want 1", tc.name, len(ms))
+			}
+			m := ms[0]
+			if got := sharedReadPrecedes([]byte(tc.step), m); got != tc.want {
+				t.Errorf("%s: sharedReadPrecedes = %v, want %v", tc.name, got, tc.want)
+			}
+			// The same step through the suite check, so the order test is
+			// one the check runs and not only a property of the helper.
+			rec := &errorRecorder{TB: t}
+			checkSuiteSteps(rec, "fixture", []string{tc.step})
+			if refused := len(rec.errs) > 0; refused == tc.want {
+				t.Errorf("%s: the suite check refused the step = %v, want %v: %v", tc.name, refused, !tc.want, rec.errs)
+			}
+		}
+	})
+
+	callers := 0
+	for _, path := range suites {
+		src := readGuardFile(t, path)
+		if n := len(nameFollowedByEquals.FindAll(src, -1)); n != 0 {
+			t.Errorf("%s writes %s followed by = %d times; only %s may assign it. A suite sources "+
+				"the library before its own lines run, so its assignment replaces the value the "+
+				"upstream test checked.", path, sharedName, n, guardLibrary)
+		}
+		callers += checkSuiteSteps(t, path, scriptSteps(t, path, src))
+	}
+	if callers == 0 {
+		t.Fatalf("no Chainsaw suite under %s calls helmrelease_has_remediation_cycle with an "+
+			"expanded local, so this test asserted nothing. If no suite runs the guard any more, "+
+			"this test goes with it.", chainsawSuites)
+	}
+}
+
+// The content of every script step in a Chainsaw file, wherever it sits: try,
+// catch, finally, or a nested operation.
+func scriptSteps(t testing.TB, path string, src []byte) []string {
+	t.Helper()
+	var steps []string
+	var walk func(any)
+	walk = func(node any) {
+		switch v := node.(type) {
+		case map[string]any:
+			if script, ok := v["script"].(map[string]any); ok {
+				if content, ok := script["content"].(string); ok {
+					steps = append(steps, content)
+				}
+			}
+			for _, child := range v {
+				walk(child)
+			}
+		case []any:
+			for _, child := range v {
+				walk(child)
+			}
+		}
+	}
+	// The reader splits on a separator line that carries a comment too, which a
+	// pattern for a bare `---` would leave inside one document, and Unmarshal
+	// reads only the first document it is given.
+	docs := utilyaml.NewYAMLReader(bufio.NewReader(bytes.NewReader(src)))
+	for {
+		doc, err := docs.Read()
+		if errors.Is(err, io.EOF) {
+			break
+		}
+		if err != nil {
+			t.Fatalf("splitting %s into documents: %v", path, err)
+		}
+		var tree any
+		if err := yaml.Unmarshal(doc, &tree); err != nil {
+			t.Fatalf("parsing %s: %v", path, err)
+		}
+		walk(tree)
+	}
+	return steps
+}
+
+// checkSuiteSteps holds each script step that calls the guard to its own read,
+// since every step runs in a shell of its own, and returns how many did.
+func checkSuiteSteps(t testing.TB, path string, steps []string) int {
+	t.Helper()
+	callers := 0
+	for _, step := range steps {
+		consumers := guardConsumers.FindAllSubmatchIndex([]byte(step), -1)
+		if len(consumers) == 0 {
+			continue
+		}
+		callers++
+		assertConsumedLocalsTakeTheSharedRead(t, path, []byte(step), consumers)
+	}
+	return callers
+}
+
+// errorRecorder collects Errorf calls instead of failing, so a subtest can
+// assert that a check reports a fixture it must refuse.
+type errorRecorder struct {
+	testing.TB
+	errs []string
+}
+
+func (r *errorRecorder) Errorf(format string, args ...any) {
+	r.errs = append(r.errs, fmt.Sprintf(format, args...))
+}
+
+// No shell library but the one that owns the name assigns it. Sourcing the
+// owning library resolves what that library ends up with, and cannot see a
+// later one overwriting the name: the caller sources the owning library first,
+// so an assignment in one sourced after it lands afterwards and wins.
+//
+// The check is wider than that reasoning. It reads every library beside the
+// owning one, including those this caller never sources, because which ones it
+// sources is a property of the caller today and not of the name. Widening it
+// costs nothing here and stops the check from having to be revisited when a
+// caller adds a source line, which is the edit most likely to introduce the
+// assignment this forbids.
+//
+// The set is asserted non-empty before it is used. A glob that stops matching
+// turns "no sibling assigns the name" into a statement about nothing, and that
+// reads exactly like a pass.
+func TestGuardNoSiblingLibraryAssignsTheSharedName(t *testing.T) {
+	t.Run("refuses", func(t *testing.T) {
+		line := `  HELMRELEASE_HISTORY_JSONPATH='{range .status.history[*]}{.version}{"\n"}{end}'`
+		if !nameFollowedByEquals.MatchString(line) {
+			t.Errorf("a shadowing assignment went unseen: %s", line)
+		}
+	})
+
+	t.Run("accepts", func(t *testing.T) {
+		line := `  history_statuses=$(kubectl get hr -o"jsonpath=${HELMRELEASE_HISTORY_JSONPATH}")`
+		if nameFollowedByEquals.MatchString(line) {
+			t.Errorf("a plain read was taken as an assignment: %s", line)
+		}
+	})
+
+	siblings, err := filepath.Glob(filepath.Join(filepath.Dir(guardLibrary), "*.sh"))
+	if err != nil {
+		t.Fatalf("globbing the shell libraries: %v", err)
+	}
+	checked := 0
+	for _, path := range siblings {
+		if filepath.Clean(path) == filepath.Clean(guardLibrary) {
+			continue
+		}
+		checked++
+		src := readGuardFile(t, path)
+		if n := len(nameFollowedByEquals.FindAll(src, -1)); n != 0 {
+			t.Errorf("%s writes %s followed by = %d times; only %s may assign it. The count is "+
+				"of occurrences, so a comment mentioning one counts too; what it looks for is an "+
+				"assignment in a library sourced after the one that owns the name, which would "+
+				"replace the value this file checked.", path, sharedName, n, guardLibrary)
+		}
+	}
+	if checked == 0 {
+		t.Fatalf("no sibling libraries found next to %s, so this test asserted nothing", guardLibrary)
+	}
+}
diff --git a/internal/fluxinstall/install.go b/internal/fluxinstall/install.go
index 4ae6f4cb4e..d16d7d8541 100644
--- a/internal/fluxinstall/install.go
+++ b/internal/fluxinstall/install.go
@@ -272,9 +272,9 @@ func injectKubernetesServiceEnv(objects []*unstructured.Unstructured) error {
 }
 
 // updateContainersEnv updates environment variables for a slice of containers.
-func updateContainersEnv(containers []interface{}, kubernetesHost, kubernetesPort string) []interface{} {
+func updateContainersEnv(containers []any, kubernetesHost, kubernetesPort string) []any {
 	for i, container := range containers {
-		containerMap, ok := container.(map[string]interface{})
+		containerMap, ok := container.(map[string]any)
 		if !ok {
 			continue
 		}
@@ -285,7 +285,7 @@ func updateContainersEnv(containers []interface{}, kubernetesHost, kubernetesPor
 		}
 
 		if !found {
-			env = []interface{}{}
+			env = []any{}
 		}
 
 		// Update or add KUBERNETES_SERVICE_HOST
@@ -311,10 +311,10 @@ func updateContainersEnv(containers []interface{}, kubernetesHost, kubernetesPor
 }
 
 // setEnvVar updates or adds an environment variable in the env slice.
-func setEnvVar(env []interface{}, name, value string) []interface{} {
+func setEnvVar(env []any, name, value string) []any {
 	// Check if variable already exists
 	for i, envVar := range env {
-		envVarMap, ok := envVar.(map[string]interface{})
+		envVarMap, ok := envVar.(map[string]any)
 		if !ok {
 			continue
 		}
@@ -328,7 +328,7 @@ func setEnvVar(env []interface{}, name, value string) []interface{} {
 	}
 
 	// Add new variable
-	env = append(env, map[string]interface{}{
+	env = append(env, map[string]any{
 		"name":  name,
 		"value": value,
 	})
diff --git a/internal/fluxinstall/manifests/fluxcd-tenants.yaml b/internal/fluxinstall/manifests/fluxcd-tenants.yaml
deleted file mode 100644
index 744fb78ebb..0000000000
--- a/internal/fluxinstall/manifests/fluxcd-tenants.yaml
+++ /dev/null
@@ -1,102 +0,0 @@
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    app.kubernetes.io/name: flux-tenants
-    app.kubernetes.io/part-of: flux
-    app.kubernetes.io/version: v2.8.0
-    sharding.fluxcd.io/role: shard
-  name: flux-tenants
-  namespace: cozy-fluxcd
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app.kubernetes.io/name: flux-tenants
-  strategy:
-    type: Recreate
-  template:
-    metadata:
-      annotations:
-        cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
-        prometheus.io/scrape: "true"
-      labels:
-        app.kubernetes.io/name: flux-tenants
-    spec:
-      affinity:
-        nodeAffinity:
-          requiredDuringSchedulingIgnoredDuringExecution:
-            nodeSelectorTerms:
-              - matchExpressions:
-                  - key: kubernetes.io/os
-                    operator: In
-                    values:
-                      - linux
-      containers:
-        - args:
-            - --watch-all-namespaces
-            - --log-level=info
-            - --log-encoding=json
-            - --enable-leader-election=false
-            - --metrics-addr=:9795
-            - --health-addr=:9796
-            - --watch-label-selector=sharding.fluxcd.io/key=tenants
-            - --concurrent=5
-            - --requeue-dependency=30s
-            - --feature-gates=ExternalArtifact=true
-          env:
-            - name: RUNTIME_NAMESPACE
-              valueFrom:
-                fieldRef:
-                  fieldPath: metadata.namespace
-            - name: GOMEMLIMIT
-              valueFrom:
-                resourceFieldRef:
-                  resource: limits.memory
-            - name: TUF_ROOT
-              value: /tmp/.sigstore
-          image: "ghcr.io/fluxcd/helm-controller:v1.5.0"
-          imagePullPolicy: IfNotPresent
-          livenessProbe:
-            httpGet:
-              path: /healthz
-              port: healthz
-          name: helm-controller
-          ports:
-            - containerPort: 9795
-              name: http-prom
-              protocol: TCP
-            - containerPort: 9796
-              name: healthz
-              protocol: TCP
-          readinessProbe:
-            httpGet:
-              path: /readyz
-              port: healthz
-          resources:
-            limits:
-              memory: 1Gi
-            requests:
-              cpu: 100m
-              memory: 64Mi
-          securityContext:
-            allowPrivilegeEscalation: false
-            capabilities:
-              drop:
-                - ALL
-            readOnlyRootFilesystem: true
-            runAsNonRoot: true
-            seccompProfile:
-              type: RuntimeDefault
-          volumeMounts:
-            - mountPath: /tmp
-              name: tmp
-      priorityClassName: system-cluster-critical
-      securityContext:
-        fsGroup: 1337
-      serviceAccountName: flux
-      terminationGracePeriodSeconds: 60
-      volumes:
-        - emptyDir: {}
-          name: tmp
diff --git a/internal/fluxinstall/manifests/fluxcd.yaml b/internal/fluxinstall/manifests/fluxcd.yaml
index 401614644c..42bf4f81b5 100644
--- a/internal/fluxinstall/manifests/fluxcd.yaml
+++ b/internal/fluxinstall/manifests/fluxcd.yaml
@@ -8209,6 +8209,7 @@ spec:
             - --storage-path=/data
             - --storage-adv-addr=flux.$(RUNTIME_NAMESPACE).svc
             - --events-addr=http://localhost:9690
+            - --concurrent=20
           env:
             - name: SOURCE_CONTROLLER_LOCALHOST
               value: localhost:9790
@@ -8251,7 +8252,7 @@ spec:
             limits:
               memory: 1Gi
             requests:
-              cpu: 100m
+              cpu: 500m
               memory: 64Mi
           securityContext:
             allowPrivilegeEscalation: false
diff --git a/internal/fluxshardoperator/config.go b/internal/fluxshardoperator/config.go
new file mode 100644
index 0000000000..04f9dcd246
--- /dev/null
+++ b/internal/fluxshardoperator/config.go
@@ -0,0 +1,156 @@
+package fluxshardoperator
+
+import (
+	"fmt"
+	"strconv"
+	"strings"
+
+	corev1 "k8s.io/api/core/v1"
+)
+
+const (
+	// ShardKeyLabel is the Flux sharding label helm-controller shards select on.
+	// One label => exactly one owning shard, no overlap and no gap by construction.
+	ShardKeyLabel = "sharding.fluxcd.io/key"
+
+	// LegacyShardKey is the single-bucket value every tenant HelmRelease carried
+	// before sharding (reconciled by the hand-rolled flux-tenants Deployment).
+	// HelmReleases are still born with this value (ApplicationDefinition
+	// release.labels and chart templates stamp it); the webhook rewrites it to
+	// the tenant's shard at admission and the placement controller relabels any
+	// stragglers.
+	LegacyShardKey = "tenants"
+
+	// TenantShardLabel records the tenant->shard assignment on the tenant
+	// namespace so the webhook can resolve it cheaply at admission time.
+	// HelmRelease labels remain the source of truth for index rebuilds.
+	TenantShardLabel = "internal.cozystack.io/flux-shard"
+
+	// ApplicationKindLabel identifies the Application kind a HelmRelease was
+	// rendered from; parent tenant HelmReleases carry kind "Tenant".
+	ApplicationKindLabel = "apps.cozystack.io/application.kind"
+
+	// TenantKind is the Application kind of parent tenant HelmReleases.
+	TenantKind = "Tenant"
+
+	// ManagedByLabel marks Deployments provisioned by this operator.
+	ManagedByLabel = "app.kubernetes.io/managed-by"
+
+	// ManagedByValue is the value of ManagedByLabel on operator-owned objects.
+	ManagedByValue = "flux-shard-operator"
+
+	// FieldOwner is the server-side apply field manager of this operator.
+	FieldOwner = "flux-shard-operator"
+
+	// FluxDeploymentName is the all-in-one flux Deployment the shard
+	// helm-controllers are cloned from.
+	FluxDeploymentName = "flux"
+
+	// LegacyTenantsDeploymentName is the hand-rolled tenant shard retired by
+	// this operator once no HelmRelease carries the legacy shard key.
+	LegacyTenantsDeploymentName = "flux-tenants"
+
+	// HelmControllerContainerName is the container cloned from the flux
+	// Deployment.
+	HelmControllerContainerName = "helm-controller"
+
+	shardPrefix           = "shard"
+	shardDeploymentPrefix = "helm-controller-"
+)
+
+// ShardCountAuto is the --shard-count value that enables automatic sizing
+// from the tenant HelmRelease count.
+const ShardCountAuto = "auto"
+
+// Config carries the operator-wide settings shared by the placement
+// controller, the shard provisioner and the admission webhook.
+type Config struct {
+	// FluxNamespace is the namespace the flux-aio Deployment and the shard
+	// Deployments live in.
+	FluxNamespace string
+	// ShardCount is the explicit number of helm-controller shards to provision
+	// and distribute tenants over. Ignored when AutoShardCount is set.
+	ShardCount int
+	// AutoShardCount sizes the shard count automatically from the tenant
+	// HelmRelease count (see Config.EffectiveShardCount).
+	AutoShardCount bool
+	// ShardConcurrent is the --concurrent value for each shard.
+	ShardConcurrent int
+	// RebalanceThreshold is the (maxLoad-minLoad)/avgLoad ratio above which the
+	// placement controller starts moving tenants between shards.
+	RebalanceThreshold float64
+	// PinnedTenants maps a tenant namespace (e.g. "tenant-bigone") to a shard
+	// name (e.g. "shard3"); pinned tenants are excluded from rebalancing.
+	PinnedTenants map[string]string
+	// ShardResources overrides the helm-controller container resources cloned
+	// from flux-aio. Empty fields inherit the cloned values.
+	ShardResources corev1.ResourceRequirements
+}
+
+// ShardName returns the canonical shard key value for index i (shard0..).
+func ShardName(i int) string {
+	return shardPrefix + strconv.Itoa(i)
+}
+
+// ShardDeploymentName returns the Deployment name for shard index i.
+func ShardDeploymentName(i int) string {
+	return shardDeploymentPrefix + ShardName(i)
+}
+
+// ParseShardIndex parses a canonical shard key value ("shard<i>") back into
+// its index. Non-canonical values (including the legacy "tenants" bucket)
+// return ok=false.
+func ParseShardIndex(s string) (int, bool) {
+	rest, found := strings.CutPrefix(s, shardPrefix)
+	if !found || rest == "" {
+		return 0, false
+	}
+	i, err := strconv.Atoi(rest)
+	if err != nil || i < 0 || ShardName(i) != s {
+		return 0, false
+	}
+	return i, true
+}
+
+// ParseShardDeploymentIndex parses a shard Deployment name back into its
+// shard index.
+func ParseShardDeploymentIndex(name string) (int, bool) {
+	rest, found := strings.CutPrefix(name, shardDeploymentPrefix)
+	if !found {
+		return 0, false
+	}
+	return ParseShardIndex(rest)
+}
+
+// ParseShardCount parses the --shard-count flag value: "auto" enables
+// automatic sizing, otherwise a positive integer is an explicit shard count.
+func ParseShardCount(s string) (count int, auto bool, err error) {
+	if strings.EqualFold(strings.TrimSpace(s), ShardCountAuto) {
+		return 0, true, nil
+	}
+	n, convErr := strconv.Atoi(strings.TrimSpace(s))
+	if convErr != nil || n < 1 {
+		return 0, false, fmt.Errorf("invalid shard count %q: must be %q or a positive integer", s, ShardCountAuto)
+	}
+	return n, false, nil
+}
+
+// ParsePinnedTenants parses the --pinned-tenants flag value
+// ("tenant-a=shard1,tenant-b=shard0") into a map.
+func ParsePinnedTenants(s string) (map[string]string, error) {
+	pinned := map[string]string{}
+	if s == "" {
+		return pinned, nil
+	}
+	for pair := range strings.SplitSeq(s, ",") {
+		k, v, found := strings.Cut(strings.TrimSpace(pair), "=")
+		if !found || k == "" {
+			return nil, fmt.Errorf("invalid pinned tenant entry %q, expected <tenant-namespace>=<shard>", pair)
+		}
+		if _, ok := ParseShardIndex(v); !ok {
+			return nil, fmt.Errorf("invalid shard %q for pinned tenant %q", v, k)
+		}
+		pinned[k] = v
+	}
+	return pinned, nil
+}
diff --git a/internal/fluxshardoperator/config_fuzz_test.go b/internal/fluxshardoperator/config_fuzz_test.go
new file mode 100644
index 0000000000..525baa48bd
--- /dev/null
+++ b/internal/fluxshardoperator/config_fuzz_test.go
@@ -0,0 +1,91 @@
+package fluxshardoperator
+
+import "testing"
+
+// FuzzParseShardIndex checks that parsing an arbitrary shard-key value never
+// panics and that a successful parse round-trips: if ParseShardIndex accepts a
+// string it must be the canonical name of the index it returns.
+func FuzzParseShardIndex(f *testing.F) {
+	for _, seed := range []string{"", "shard0", "shard10", "shard-1", "shard00", "tenants", "shard", "shardx", "shard 1"} {
+		f.Add(seed)
+	}
+	f.Fuzz(func(t *testing.T, s string) {
+		i, ok := ParseShardIndex(s)
+		if !ok {
+			return
+		}
+		if i < 0 {
+			t.Fatalf("ParseShardIndex(%q) returned ok with negative index %d", s, i)
+		}
+		if got := ShardName(i); got != s {
+			t.Fatalf("ParseShardIndex(%q)=%d but ShardName(%d)=%q, not a round-trip", s, i, i, got)
+		}
+	})
+}
+
+// FuzzShardNameRoundTrip checks the inverse direction: every canonical name
+// produced by ShardName must parse back to the same non-negative index.
+func FuzzShardNameRoundTrip(f *testing.F) {
+	for _, seed := range []int{0, 1, 9, 10, 128, 1000} {
+		f.Add(seed)
+	}
+	f.Fuzz(func(t *testing.T, i int) {
+		if i < 0 {
+			return // negative indices are not valid shards; ShardName is only defined for i >= 0
+		}
+		got, ok := ParseShardIndex(ShardName(i))
+		if !ok || got != i {
+			t.Fatalf("ShardName(%d) did not round-trip: ParseShardIndex=%d ok=%v", i, got, ok)
+		}
+	})
+}
+
+// FuzzParseShardCount checks that the --shard-count flag parser never panics and
+// upholds its contract: a successful non-auto parse yields a positive count, and
+// the auto sentinel yields count 0.
+func FuzzParseShardCount(f *testing.F) {
+	for _, seed := range []string{"", "auto", "AUTO", " auto ", "0", "1", "-1", "3", "  5  ", "abc", "9999999999999999999"} {
+		f.Add(seed)
+	}
+	f.Fuzz(func(t *testing.T, s string) {
+		count, auto, err := ParseShardCount(s)
+		if err != nil {
+			return
+		}
+		if auto {
+			if count != 0 {
+				t.Fatalf("ParseShardCount(%q): auto=true must yield count 0, got %d", s, count)
+			}
+			return
+		}
+		if count < 1 {
+			t.Fatalf("ParseShardCount(%q): non-auto success must yield count >= 1, got %d", s, count)
+		}
+	})
+}
+
+// FuzzParsePinnedTenants checks that the --pinned-tenants flag parser never
+// panics and that every entry in a successful parse is well-formed: a non-empty
+// tenant key mapped to a value that is itself a valid shard name.
+func FuzzParsePinnedTenants(f *testing.F) {
+	for _, seed := range []string{
+		"", "a=shard0", "a=shard0,b=shard1", " a = shard0 ", "a=", "=shard0",
+		"a=shardx", "a", "a=shard0,", ",", "a=shard0,b",
+	} {
+		f.Add(seed)
+	}
+	f.Fuzz(func(t *testing.T, s string) {
+		pinned, err := ParsePinnedTenants(s)
+		if err != nil {
+			return
+		}
+		for k, v := range pinned {
+			if k == "" {
+				t.Fatalf("ParsePinnedTenants(%q) produced an empty tenant key", s)
+			}
+			if _, ok := ParseShardIndex(v); !ok {
+				t.Fatalf("ParsePinnedTenants(%q) mapped %q to invalid shard %q", s, k, v)
+			}
+		}
+	})
+}
diff --git a/internal/fluxshardoperator/controller.go b/internal/fluxshardoperator/controller.go
new file mode 100644
index 0000000000..1de887ac52
--- /dev/null
+++ b/internal/fluxshardoperator/controller.go
@@ -0,0 +1,372 @@
+package fluxshardoperator
+
+import (
+	"context"
+	"fmt"
+	"maps"
+	"sort"
+	"strings"
+	"time"
+
+	appsv1 "k8s.io/api/apps/v1"
+	"k8s.io/apimachinery/pkg/api/errors"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apimachinery/pkg/types"
+	utilerrors "k8s.io/apimachinery/pkg/util/errors"
+	ctrl "sigs.k8s.io/controller-runtime"
+	"sigs.k8s.io/controller-runtime/pkg/builder"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/event"
+	"sigs.k8s.io/controller-runtime/pkg/handler"
+	"sigs.k8s.io/controller-runtime/pkg/log"
+	"sigs.k8s.io/controller-runtime/pkg/predicate"
+	"sigs.k8s.io/controller-runtime/pkg/reconcile"
+)
+
+const (
+	// movesPerSync caps how many tenants change shards in one reconcile so a
+	// backfill or rebalance never floods a target shard with an ADD burst.
+	movesPerSync = 5
+	// requeueShort is the pause between paced move batches.
+	requeueShort = 15 * time.Second
+	// resyncPeriod is the steady-state drift check interval.
+	resyncPeriod = time.Minute
+	// rebalanceCooldown is the per-tenant pause between rebalance moves so the
+	// controller cannot thrash a tenant back and forth.
+	rebalanceCooldown = 10 * time.Minute
+)
+
+// PlacementReconciler owns the tenant->shard assignment. It watches tenant
+// HelmReleases and namespaces as metadata only, rebuilds its view from labels
+// on every sync (restart-safe by construction), records each tenant's
+// assignment on its namespace, and self-heals HelmRelease shard labels to
+// match.
+//
+// All events collapse into one singleton reconcile request, so a noisy stream
+// of label changes dedupes into sequential full syncs over ~10^3 metadata
+// stubs.
+//
+// +kubebuilder:rbac:groups=helm.toolkit.fluxcd.io,resources=helmreleases,verbs=get;list;watch;patch
+// +kubebuilder:rbac:groups="",resources=namespaces,verbs=get;list;watch;patch
+type PlacementReconciler struct {
+	client.Client
+	Config *Config
+
+	// now is the clock, replaceable in tests.
+	now func() time.Time
+	// lastMoved gates rebalance moves per tenant. In-memory only: after a
+	// restart the worst case is one rebalance move happening sooner than the
+	// cooldown, which is harmless.
+	lastMoved map[string]time.Time
+}
+
+// SetupWithManager registers the placement controller.
+func (r *PlacementReconciler) SetupWithManager(mgr ctrl.Manager) error {
+	if r.now == nil {
+		r.now = time.Now
+	}
+	r.lastMoved = map[string]time.Time{}
+
+	toSingleton := handler.EnqueueRequestsFromMapFunc(func(context.Context, client.Object) []reconcile.Request {
+		return []reconcile.Request{{NamespacedName: types.NamespacedName{Name: "placement"}}}
+	})
+
+	return ctrl.NewControllerManagedBy(mgr).
+		Named("flux-shard-placement").
+		WatchesMetadata(HelmReleaseMeta(), toSingleton, builder.WithPredicates(metadataChanged())).
+		WatchesMetadata(NamespaceMeta(), toSingleton, builder.WithPredicates(tenantNamespace(), metadataChanged())).
+		// Shard Deployment readiness gates reassignments; react to it directly
+		// instead of waiting for the next requeue.
+		Watches(&appsv1.Deployment{}, toSingleton, builder.WithPredicates(r.shardDeployment())).
+		Complete(r)
+}
+
+// shardDeployment passes operator-managed shard Deployments.
+func (r *PlacementReconciler) shardDeployment() predicate.Predicate {
+	return predicate.NewPredicateFuncs(func(obj client.Object) bool {
+		return obj.GetNamespace() == r.Config.FluxNamespace &&
+			obj.GetLabels()[ManagedByLabel] == ManagedByValue
+	})
+}
+
+// metadataChanged ignores updates that change neither labels nor deletion
+// state — in particular the resourceVersion bumps from helm-controller's
+// status-patch firehose.
+func metadataChanged() predicate.Predicate {
+	return predicate.Funcs{
+		UpdateFunc: func(e event.UpdateEvent) bool {
+			if e.ObjectOld == nil || e.ObjectNew == nil {
+				return true
+			}
+			return !maps.Equal(e.ObjectOld.GetLabels(), e.ObjectNew.GetLabels()) ||
+				e.ObjectOld.GetDeletionTimestamp().IsZero() != e.ObjectNew.GetDeletionTimestamp().IsZero()
+		},
+	}
+}
+
+// tenantNamespace passes only tenant namespaces.
+func tenantNamespace() predicate.Predicate {
+	return predicate.NewPredicateFuncs(func(obj client.Object) bool {
+		return strings.HasPrefix(obj.GetName(), "tenant-")
+	})
+}
+
+// tenantView is the gathered state of one tenant.
+type tenantView struct {
+	info     TenantInfo
+	hrs      []*metav1.PartialObjectMetadata
+	nsExists bool
+	nsLabel  string
+}
+
+// Reconcile performs one full placement sync.
+func (r *PlacementReconciler) Reconcile(ctx context.Context, _ ctrl.Request) (ctrl.Result, error) {
+	logger := log.FromContext(ctx)
+
+	views, err := r.gather(ctx)
+	if err != nil {
+		return ctrl.Result{}, err
+	}
+
+	tenants := make([]TenantInfo, 0, len(views))
+	totalHRs := 0
+	for _, v := range views {
+		tenants = append(tenants, v.info)
+		totalHRs += v.info.Weight
+	}
+
+	readyShards, currentShards, err := r.observeShards(ctx)
+	if err != nil {
+		return ctrl.Result{}, err
+	}
+	shardCount := r.Config.EffectiveShardCount(totalHRs, len(views), currentShards)
+
+	desired := ComputePlacement(PlacementInput{
+		Tenants:            tenants,
+		ShardCount:         shardCount,
+		Pinned:             r.Config.PinnedTenants,
+		RebalanceThreshold: r.Config.RebalanceThreshold,
+		CanRebalance: func(tenant string) bool {
+			return r.now().Sub(r.lastMoved[tenant]) >= rebalanceCooldown
+		},
+	})
+
+	pending, errs := r.apply(ctx, views, desired, readyShards)
+
+	r.report(views, desired, shardCount, totalHRs, pending)
+	r.pruneCooldowns(views)
+
+	if len(errs) > 0 {
+		return ctrl.Result{}, utilerrors.NewAggregate(errs)
+	}
+	if pending > 0 {
+		logger.V(1).Info("placement sync paced", "pendingMoves", pending)
+		return ctrl.Result{RequeueAfter: requeueShort}, nil
+	}
+	return ctrl.Result{RequeueAfter: resyncPeriod}, nil
+}
+
+// gather lists tenant HelmReleases and namespaces (metadata only) and groups
+// them per tenant.
+func (r *PlacementReconciler) gather(ctx context.Context) (map[string]*tenantView, error) {
+	hrs := HelmReleaseMetaList()
+	if err := r.List(ctx, hrs, client.HasLabels{ShardKeyLabel}); err != nil {
+		return nil, fmt.Errorf("listing HelmReleases: %w", err)
+	}
+	nss := NamespaceMetaList()
+	if err := r.List(ctx, nss); err != nil {
+		return nil, fmt.Errorf("listing namespaces: %w", err)
+	}
+
+	nsByName := make(map[string]*metav1.PartialObjectMetadata, len(nss.Items))
+	for i := range nss.Items {
+		nsByName[nss.Items[i].Name] = &nss.Items[i]
+	}
+
+	views := map[string]*tenantView{}
+	for i := range hrs.Items {
+		hr := &hrs.Items[i]
+		tenantNS, ok := TenantNamespaceForHR(hr)
+		if !ok {
+			continue
+		}
+		v := views[tenantNS]
+		if v == nil {
+			v = &tenantView{info: TenantInfo{Namespace: tenantNS}}
+			views[tenantNS] = v
+		}
+		v.hrs = append(v.hrs, hr)
+		v.info.Weight++
+	}
+
+	for tenantNS, v := range views {
+		if ns := nsByName[tenantNS]; ns != nil {
+			v.nsExists = true
+			v.info.Deleting = !ns.DeletionTimestamp.IsZero()
+			v.nsLabel = ns.Labels[TenantShardLabel]
+		}
+		// The recorded assignment (namespace label) wins; HR labels are the
+		// fallback source of truth when no assignment is recorded yet.
+		if _, ok := ParseShardIndex(v.nsLabel); ok {
+			v.info.Current = v.nsLabel
+		} else {
+			v.info.Current = majorityShard(v.hrs)
+		}
+	}
+	return views, nil
+}
+
+// majorityShard returns the most common canonical shard value among the
+// tenant's HelmRelease labels, tie-break lowest shard index. Legacy "tenants"
+// and unparseable values count as unassigned.
+func majorityShard(hrs []*metav1.PartialObjectMetadata) string {
+	counts := map[int]int{}
+	for _, hr := range hrs {
+		if idx, ok := ParseShardIndex(hr.GetLabels()[ShardKeyLabel]); ok {
+			counts[idx]++
+		}
+	}
+	best, bestCount := -1, 0
+	for idx, c := range counts {
+		if c > bestCount || (c == bestCount && best >= 0 && idx < best) {
+			best, bestCount = idx, c
+		}
+	}
+	if best < 0 {
+		return ""
+	}
+	return ShardName(best)
+}
+
+// observeShards reports which shard Deployments currently have a ready
+// replica, and how many shards are provisioned (the auto-sizing hysteresis
+// anchor). Reassignments only target ready shards, so a backfill can never
+// hand tenants to a shard whose helm-controller is not actually running (e.g.
+// crashlooping after a bad clone) — the safe-online-migration guarantee.
+func (r *PlacementReconciler) observeShards(ctx context.Context) (map[string]bool, int, error) {
+	deps := &appsv1.DeploymentList{}
+	if err := r.List(ctx, deps, client.InNamespace(r.Config.FluxNamespace),
+		client.MatchingLabels{ManagedByLabel: ManagedByValue}); err != nil {
+		return nil, 0, fmt.Errorf("listing shard Deployments: %w", err)
+	}
+	ready := map[string]bool{}
+	count := 0
+	for i := range deps.Items {
+		if idx, ok := ParseShardDeploymentIndex(deps.Items[i].Name); ok {
+			ready[ShardName(idx)] = deps.Items[i].Status.ReadyReplicas > 0
+			if idx+1 > count {
+				count = idx + 1
+			}
+		}
+	}
+	return ready, count, nil
+}
+
+// apply pushes the desired assignment out, pacing tenant reassignments and
+// self-healing label stragglers without limit. Reassignments whose target
+// shard is not ready are deferred. Returns the number of reassignments left
+// for the next batch.
+func (r *PlacementReconciler) apply(ctx context.Context, views map[string]*tenantView, desired map[string]string, readyShards map[string]bool) (int, []error) {
+	logger := log.FromContext(ctx)
+
+	names := make([]string, 0, len(views))
+	for name := range views {
+		names = append(names, name)
+	}
+	sort.Strings(names)
+
+	budget := movesPerSync
+	pending := 0
+	var errs []error
+	for _, tenantNS := range names {
+		v := views[tenantNS]
+		target := desired[tenantNS]
+		if target == "" {
+			continue
+		}
+		moved := v.info.Current != target
+		if moved {
+			if budget == 0 || !readyShards[target] {
+				pending++
+				continue
+			}
+			budget--
+		}
+		if err := r.stamp(ctx, v, target); err != nil {
+			errs = append(errs, err)
+			continue
+		}
+		// Cooldown and metrics record successful moves only: a failed patch
+		// must neither delay the retry nor count twice.
+		if moved {
+			r.lastMoved[tenantNS] = r.now()
+			movesCounter.Inc()
+			logger.Info("reassigning tenant", "tenant", tenantNS, "from", v.info.Current, "to", target, "weight", v.info.Weight)
+		}
+	}
+	return pending, errs
+}
+
+// stamp records the assignment on the tenant namespace and relabels every
+// HelmRelease of the tenant that does not carry it yet. Patches the namespace
+// first so the webhook hands out the new shard before the HRs settle.
+func (r *PlacementReconciler) stamp(ctx context.Context, v *tenantView, target string) error {
+	var errs []error
+	if v.nsExists && v.nsLabel != target {
+		if err := r.patchLabel(ctx, NamespaceGVK, "", v.info.Namespace, TenantShardLabel, target); err != nil {
+			errs = append(errs, fmt.Errorf("namespace %s: %w", v.info.Namespace, err))
+		}
+	}
+	for _, hr := range v.hrs {
+		if hr.GetLabels()[ShardKeyLabel] == target {
+			continue
+		}
+		if err := r.patchLabel(ctx, HelmReleaseGVK, hr.GetNamespace(), hr.GetName(), ShardKeyLabel, target); err != nil {
+			errs = append(errs, fmt.Errorf("helmrelease %s/%s: %w", hr.GetNamespace(), hr.GetName(), err))
+		}
+	}
+	return utilerrors.NewAggregate(errs)
+}
+
+// patchLabel merge-patches a single label on an object, touching nothing else.
+func (r *PlacementReconciler) patchLabel(ctx context.Context, gvk schema.GroupVersionKind, namespace, name, label, value string) error {
+	obj := &metav1.PartialObjectMetadata{}
+	obj.SetGroupVersionKind(gvk)
+	obj.SetNamespace(namespace)
+	obj.SetName(name)
+	patch := fmt.Sprintf(`{"metadata":{"labels":{%q:%q}}}`, label, value)
+	err := r.Patch(ctx, obj, client.RawPatch(types.MergePatchType, []byte(patch)))
+	if errors.IsNotFound(err) {
+		return nil
+	}
+	return err
+}
+
+// report refreshes the telemetry gauges.
+func (r *PlacementReconciler) report(views map[string]*tenantView, desired map[string]string, shardCount, totalHRs, pending int) {
+	shardLoadGauge.Reset()
+	load := map[string]int{}
+	for i := range shardCount {
+		load[ShardName(i)] = 0
+	}
+	for tenantNS, shard := range desired {
+		load[shard] += views[tenantNS].info.Weight
+	}
+	for shard, l := range load {
+		shardLoadGauge.WithLabelValues(shard).Set(float64(l))
+	}
+	tenantsGauge.Set(float64(len(views)))
+	helmReleasesGauge.Set(float64(totalHRs))
+	pendingMovesGauge.Set(float64(pending))
+	recommendedShardsGauge.Set(float64(RecommendedShardCount(totalHRs, len(views))))
+}
+
+// pruneCooldowns drops cooldown entries for tenants that no longer exist.
+func (r *PlacementReconciler) pruneCooldowns(views map[string]*tenantView) {
+	for tenant := range r.lastMoved {
+		if _, ok := views[tenant]; !ok {
+			delete(r.lastMoved, tenant)
+		}
+	}
+}
diff --git a/internal/fluxshardoperator/gvk.go b/internal/fluxshardoperator/gvk.go
new file mode 100644
index 0000000000..7081d89731
--- /dev/null
+++ b/internal/fluxshardoperator/gvk.go
@@ -0,0 +1,51 @@
+package fluxshardoperator
+
+import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+)
+
+// The operator never decodes HelmRelease specs or statuses: it watches and
+// patches metadata only (labels, deletionTimestamp), so the cache holds tiny
+// metadata stubs instead of full objects and does not decode the
+// helm-controller status-patch firehose.
+
+// HelmReleaseGVK is the GroupVersionKind of Flux HelmReleases.
+var HelmReleaseGVK = schema.GroupVersionKind{
+	Group:   "helm.toolkit.fluxcd.io",
+	Version: "v2",
+	Kind:    "HelmRelease",
+}
+
+// NamespaceGVK is the GroupVersionKind of core Namespaces.
+var NamespaceGVK = schema.GroupVersionKind{Version: "v1", Kind: "Namespace"}
+
+// HelmReleaseMeta returns a PartialObjectMetadata typed as a HelmRelease.
+func HelmReleaseMeta() *metav1.PartialObjectMetadata {
+	obj := &metav1.PartialObjectMetadata{}
+	obj.SetGroupVersionKind(HelmReleaseGVK)
+	return obj
+}
+
+// HelmReleaseMetaList returns a PartialObjectMetadataList typed as a
+// HelmReleaseList.
+func HelmReleaseMetaList() *metav1.PartialObjectMetadataList {
+	list := &metav1.PartialObjectMetadataList{}
+	list.SetGroupVersionKind(HelmReleaseGVK.GroupVersion().WithKind("HelmReleaseList"))
+	return list
+}
+
+// NamespaceMeta returns a PartialObjectMetadata typed as a Namespace.
+func NamespaceMeta() *metav1.PartialObjectMetadata {
+	obj := &metav1.PartialObjectMetadata{}
+	obj.SetGroupVersionKind(NamespaceGVK)
+	return obj
+}
+
+// NamespaceMetaList returns a PartialObjectMetadataList typed as a
+// NamespaceList.
+func NamespaceMetaList() *metav1.PartialObjectMetadataList {
+	list := &metav1.PartialObjectMetadataList{}
+	list.SetGroupVersionKind(NamespaceGVK.GroupVersion().WithKind("NamespaceList"))
+	return list
+}
diff --git a/internal/fluxshardoperator/metrics.go b/internal/fluxshardoperator/metrics.go
new file mode 100644
index 0000000000..75002534eb
--- /dev/null
+++ b/internal/fluxshardoperator/metrics.go
@@ -0,0 +1,49 @@
+package fluxshardoperator
+
+import (
+	"github.com/prometheus/client_golang/prometheus"
+	"sigs.k8s.io/controller-runtime/pkg/metrics"
+)
+
+var (
+	shardLoadGauge = prometheus.NewGaugeVec(prometheus.GaugeOpts{
+		Name: "cozy_flux_shard_load",
+		Help: "Number of tenant HelmReleases assigned to each helm-controller shard.",
+	}, []string{"shard"})
+
+	tenantsGauge = prometheus.NewGauge(prometheus.GaugeOpts{
+		Name: "cozy_flux_shard_tenants",
+		Help: "Number of tenants known to the placement controller.",
+	})
+
+	helmReleasesGauge = prometheus.NewGauge(prometheus.GaugeOpts{
+		Name: "cozy_flux_shard_helmreleases",
+		Help: "Number of tenant HelmReleases known to the placement controller.",
+	})
+
+	pendingMovesGauge = prometheus.NewGauge(prometheus.GaugeOpts{
+		Name: "cozy_flux_shard_pending_moves",
+		Help: "Number of tenants whose assignment differs from the desired placement (backfill or rebalance in progress).",
+	})
+
+	recommendedShardsGauge = prometheus.NewGauge(prometheus.GaugeOpts{
+		Name: "cozy_flux_shard_recommended_count",
+		Help: "Autosizing recommendation for the shard count (v1 surfaces it only, enforcement is manual via values).",
+	})
+
+	movesCounter = prometheus.NewCounter(prometheus.CounterOpts{
+		Name: "cozy_flux_shard_moves_total",
+		Help: "Total number of tenant shard reassignments performed.",
+	})
+)
+
+func init() {
+	metrics.Registry.MustRegister(
+		shardLoadGauge,
+		tenantsGauge,
+		helmReleasesGauge,
+		pendingMovesGauge,
+		recommendedShardsGauge,
+		movesCounter,
+	)
+}
diff --git a/internal/fluxshardoperator/placement.go b/internal/fluxshardoperator/placement.go
new file mode 100644
index 0000000000..49f81bc16c
--- /dev/null
+++ b/internal/fluxshardoperator/placement.go
@@ -0,0 +1,253 @@
+package fluxshardoperator
+
+import (
+	"sort"
+)
+
+// TenantInfo is the placement view of one tenant.
+type TenantInfo struct {
+	// Namespace is the tenant namespace ("tenant-<id>") and the placement key.
+	Namespace string
+	// Weight is the tenant's HelmRelease count (parent + children). Shards are
+	// balanced by weight, not by raw tenant count.
+	Weight int
+	// Current is the tenant's current assignment: a canonical "shard<i>" value
+	// or "" when unassigned (never assigned, or still on the legacy "tenants"
+	// bucket).
+	Current string
+	// Deleting tenants (namespace deletionTimestamp set) are never moved; an
+	// unassigned deleting tenant is still assigned once so an owning shard can
+	// finish its teardown and remove finalizers.
+	Deleting bool
+}
+
+// PlacementInput is everything ComputePlacement needs to produce a desired
+// assignment.
+type PlacementInput struct {
+	Tenants    []TenantInfo
+	ShardCount int
+	// Pinned maps tenant namespace -> shard name; pinned tenants bypass
+	// least-loaded assignment and are excluded from rebalancing. Pins to
+	// non-existent shards (index >= ShardCount) are ignored.
+	Pinned map[string]string
+	// RebalanceThreshold is the (maxLoad-minLoad)/avgLoad ratio above which
+	// rebalance moves are produced. <= 0 disables rebalancing.
+	RebalanceThreshold float64
+	// CanRebalance gates rebalance moves per tenant (move cooldown). nil means
+	// no gate. It is consulted for rebalance moves only — first assignments and
+	// forced moves (scale-down, pin) always go through.
+	CanRebalance func(tenantNamespace string) bool
+}
+
+// ComputePlacement returns the desired tenant->shard assignment.
+//
+// Strategy is greedy least-loaded by weight (deterministic: with uniform
+// weights, N tenants over N shards land exactly 1 per shard), with minimal
+// movement on rescale:
+//   - tenants whose current shard still exists keep it (scale-up never touches
+//     settled tenants; scale-down only moves tenants of removed shards);
+//   - unassigned tenants (and tenants of removed shards) are placed
+//     least-loaded-first, heaviest tenants first;
+//   - a bounded rebalance pass then moves tenants from the most- to the
+//     least-loaded shard while it strictly reduces the spread and the spread
+//     exceeds RebalanceThreshold, preferring the smallest tenant that achieves
+//     the reduction (cheaper handoff).
+func ComputePlacement(in PlacementInput) map[string]string {
+	k := max(in.ShardCount, 1)
+
+	assign := make(map[string]string, len(in.Tenants))
+	load := make([]int, k)
+	members := make([][]TenantInfo, k)
+
+	place := func(t TenantInfo, idx int) {
+		assign[t.Namespace] = ShardName(idx)
+		load[idx] += t.Weight
+		members[idx] = append(members[idx], t)
+	}
+
+	// Deterministic processing order.
+	tenants := make([]TenantInfo, len(in.Tenants))
+	copy(tenants, in.Tenants)
+	sort.Slice(tenants, func(i, j int) bool { return tenants[i].Namespace < tenants[j].Namespace })
+
+	var unassigned []TenantInfo
+	for _, t := range tenants {
+		if pin, ok := in.Pinned[t.Namespace]; ok && !t.Deleting {
+			if idx, ok := ParseShardIndex(pin); ok && idx < k {
+				place(t, idx)
+				continue
+			}
+		}
+		if idx, ok := ParseShardIndex(t.Current); ok {
+			if idx < k {
+				place(t, idx)
+				continue
+			}
+			if t.Deleting {
+				// Never move a deleting tenant, even off a removed shard: the
+				// provisioner keeps the shard Deployment until it drains.
+				assign[t.Namespace] = t.Current
+				continue
+			}
+		}
+		unassigned = append(unassigned, t)
+	}
+
+	// Heaviest first (LPT) gives the better balance when backfilling many
+	// tenants at once; name tie-break keeps it deterministic.
+	sort.Slice(unassigned, func(i, j int) bool {
+		if unassigned[i].Weight != unassigned[j].Weight {
+			return unassigned[i].Weight > unassigned[j].Weight
+		}
+		return unassigned[i].Namespace < unassigned[j].Namespace
+	})
+	for _, t := range unassigned {
+		place(t, argminLoad(load))
+	}
+
+	rebalance(in, k, assign, load, members)
+	return assign
+}
+
+// rebalance moves tenants from the most-loaded to the least-loaded shard while
+// the spread exceeds the threshold and a strictly improving move exists.
+func rebalance(in PlacementInput, k int, assign map[string]string, load []int, members [][]TenantInfo) {
+	if k < 2 || in.RebalanceThreshold <= 0 {
+		return
+	}
+	total := 0
+	for _, l := range load {
+		total += l
+	}
+	if total == 0 {
+		return
+	}
+	avg := float64(total) / float64(k)
+
+	for iter := 0; iter < len(in.Tenants); iter++ {
+		maxIdx, minIdx := argmaxLoad(load), argminLoad(load)
+		spread := load[maxIdx] - load[minIdx]
+		if float64(spread)/avg <= in.RebalanceThreshold {
+			return
+		}
+
+		// Pick the move that most reduces the spread between the two shards;
+		// among equal reductions prefer the smaller tenant (cheaper handoff).
+		best := -1
+		bestSpread, bestWeight := spread, 0
+		for i, t := range members[maxIdx] {
+			if t.Deleting || t.Weight == 0 {
+				continue
+			}
+			// Honor only pins ComputePlacement itself honors: a pin to a
+			// non-existent shard is ignored at placement time, so it must not
+			// make the tenant sticky here either.
+			if pin, pinned := in.Pinned[t.Namespace]; pinned {
+				if idx, ok := ParseShardIndex(pin); ok && idx < k {
+					continue
+				}
+			}
+			if in.CanRebalance != nil && !in.CanRebalance(t.Namespace) {
+				continue
+			}
+			newSpread := abs((load[maxIdx] - t.Weight) - (load[minIdx] + t.Weight))
+			if newSpread < bestSpread || (newSpread == bestSpread && best >= 0 && t.Weight < bestWeight) {
+				best, bestSpread, bestWeight = i, newSpread, t.Weight
+			}
+		}
+		if best < 0 || bestSpread >= spread {
+			return
+		}
+
+		t := members[maxIdx][best]
+		members[maxIdx] = append(members[maxIdx][:best:best], members[maxIdx][best+1:]...)
+		members[minIdx] = append(members[minIdx], t)
+		load[maxIdx] -= t.Weight
+		load[minIdx] += t.Weight
+		assign[t.Namespace] = ShardName(minIdx)
+	}
+}
+
+// argminLoad returns the least-loaded shard index, tie-break lowest index.
+func argminLoad(load []int) int {
+	idx := 0
+	for i, l := range load {
+		if l < load[idx] {
+			idx = i
+		}
+	}
+	return idx
+}
+
+// argmaxLoad returns the most-loaded shard index, tie-break lowest index.
+func argmaxLoad(load []int) int {
+	idx := 0
+	for i, l := range load {
+		if l > load[idx] {
+			idx = i
+		}
+	}
+	return idx
+}
+
+func abs(v int) int {
+	if v < 0 {
+		return -v
+	}
+	return v
+}
+
+// Autosizing parameters: shards are sized by HelmRelease count, capped by
+// tenant count (more shards than tenants is useless). The 100 HR/shard target
+// leaves headroom for tenants growing their HelmRelease count without an
+// immediate reshard. Hysteresis keeps K stable around the boundaries: scale up
+// eagerly once a shard runs 20% over target, scale down lazily only when
+// shards run at well under half the target.
+const (
+	hrTargetPerShard  = 100
+	maxAutoShards     = 16
+	scaleUpPerShard   = hrTargetPerShard * 1.2
+	scaleDownPerShard = hrTargetPerShard * 0.6
+)
+
+// RecommendedShardCount is the raw autosizing formula:
+// K = clamp(ceil(H / hrTargetPerShard), 1, min(maxAutoShards, T)).
+func RecommendedShardCount(helmReleases, tenants int) int {
+	k := max((helmReleases+hrTargetPerShard-1)/hrTargetPerShard, 1)
+	limit := maxAutoShards
+	if tenants > 0 && tenants < limit {
+		limit = tenants
+	}
+	if k > limit {
+		k = limit
+	}
+	return k
+}
+
+// EffectiveShardCount resolves the shard count for this sync. Explicit
+// configuration wins; in auto mode the recommendation is applied with
+// hysteresis anchored on the currently provisioned shard count, so K does not
+// flap when the HelmRelease count hovers around a sizing boundary. A
+// structurally over-provisioned tail (more shards than tenants after tenant
+// deletions) is left alone until the load condition triggers — idle shards
+// watch zero objects and cost next to nothing.
+func (c *Config) EffectiveShardCount(helmReleases, tenants, currentShards int) int {
+	if !c.AutoShardCount {
+		if c.ShardCount < 1 {
+			return 1
+		}
+		return c.ShardCount
+	}
+	desired := RecommendedShardCount(helmReleases, tenants)
+	if currentShards < 1 || desired == currentShards {
+		return max(desired, currentShards)
+	}
+	perShard := float64(helmReleases) / float64(currentShards)
+	if desired > currentShards && perShard > scaleUpPerShard {
+		return desired
+	}
+	if desired < currentShards && perShard < scaleDownPerShard {
+		return desired
+	}
+	return currentShards
+}
diff --git a/internal/fluxshardoperator/placement_test.go b/internal/fluxshardoperator/placement_test.go
new file mode 100644
index 0000000000..9f7460832d
--- /dev/null
+++ b/internal/fluxshardoperator/placement_test.go
@@ -0,0 +1,302 @@
+package fluxshardoperator
+
+import (
+	"fmt"
+	"testing"
+)
+
+func loadsOf(assign map[string]string, tenants []TenantInfo, k int) []int {
+	load := make([]int, k)
+	for _, t := range tenants {
+		if idx, ok := ParseShardIndex(assign[t.Namespace]); ok && idx < k {
+			load[idx] += t.Weight
+		}
+	}
+	return load
+}
+
+func TestComputePlacementNOverNIsOnePerShard(t *testing.T) {
+	// The N-over-N guarantee from the design plan: uniform weights, N tenants
+	// across N shards => exactly 1 per shard. Deterministic, not probabilistic.
+	const n = 4
+	var tenants []TenantInfo
+	for i := range n {
+		tenants = append(tenants, TenantInfo{Namespace: fmt.Sprintf("tenant-%c", 'a'+i), Weight: 7})
+	}
+	assign := ComputePlacement(PlacementInput{Tenants: tenants, ShardCount: n})
+	used := map[string]bool{}
+	for _, s := range assign {
+		if used[s] {
+			t.Fatalf("shard %s assigned twice: %v", s, assign)
+		}
+		used[s] = true
+	}
+	if len(used) != n {
+		t.Fatalf("expected %d distinct shards, got %v", n, assign)
+	}
+}
+
+func TestComputePlacementLegacyBackfillBalances(t *testing.T) {
+	// Tenants still on the legacy "tenants" bucket arrive as Current=""
+	// (unassigned) and must spread by weight.
+	tenants := []TenantInfo{
+		{Namespace: "tenant-big", Weight: 80},
+		{Namespace: "tenant-a", Weight: 10},
+		{Namespace: "tenant-b", Weight: 10},
+		{Namespace: "tenant-c", Weight: 10},
+		{Namespace: "tenant-d", Weight: 10},
+		{Namespace: "tenant-e", Weight: 10},
+		{Namespace: "tenant-f", Weight: 10},
+		{Namespace: "tenant-g", Weight: 10},
+		{Namespace: "tenant-h", Weight: 10},
+	}
+	assign := ComputePlacement(PlacementInput{Tenants: tenants, ShardCount: 2, RebalanceThreshold: 0.25})
+	load := loadsOf(assign, tenants, 2)
+	if abs(load[0]-load[1]) > 20 {
+		t.Fatalf("unbalanced backfill: loads %v, assign %v", load, assign)
+	}
+}
+
+func TestComputePlacementKeepsSettledTenantsOnScaleUp(t *testing.T) {
+	// Scale-up must not touch tenants already at/under target; rebalance pulls
+	// from the most-loaded shard only.
+	tenants := []TenantInfo{
+		{Namespace: "tenant-a", Weight: 10, Current: "shard0"},
+		{Namespace: "tenant-b", Weight: 10, Current: "shard0"},
+		{Namespace: "tenant-c", Weight: 10, Current: "shard1"},
+	}
+	assign := ComputePlacement(PlacementInput{Tenants: tenants, ShardCount: 3, RebalanceThreshold: 0.25})
+	if assign["tenant-c"] != "shard1" {
+		t.Fatalf("settled tenant on the least-loaded shard moved: %v", assign)
+	}
+	moved := 0
+	for _, tn := range []string{"tenant-a", "tenant-b"} {
+		if assign[tn] != "shard0" {
+			moved++
+			if assign[tn] != "shard2" {
+				t.Fatalf("tenant %s moved to %s, expected the new shard2", tn, assign[tn])
+			}
+		}
+	}
+	if moved != 1 {
+		t.Fatalf("expected exactly 1 tenant pulled to the new shard, got %d: %v", moved, assign)
+	}
+}
+
+func TestComputePlacementScaleDownMovesOnlyRemovedShards(t *testing.T) {
+	tenants := []TenantInfo{
+		{Namespace: "tenant-a", Weight: 10, Current: "shard0"},
+		{Namespace: "tenant-b", Weight: 10, Current: "shard1"},
+		{Namespace: "tenant-c", Weight: 10, Current: "shard2"},
+		{Namespace: "tenant-d", Weight: 10, Current: "shard3"},
+	}
+	assign := ComputePlacement(PlacementInput{Tenants: tenants, ShardCount: 2})
+	if assign["tenant-a"] != "shard0" || assign["tenant-b"] != "shard1" {
+		t.Fatalf("tenants on surviving shards must stay: %v", assign)
+	}
+	for _, tn := range []string{"tenant-c", "tenant-d"} {
+		if idx, ok := ParseShardIndex(assign[tn]); !ok || idx >= 2 {
+			t.Fatalf("tenant %s not redistributed to a surviving shard: %v", tn, assign)
+		}
+	}
+}
+
+func TestComputePlacementPinnedTenant(t *testing.T) {
+	tenants := []TenantInfo{
+		{Namespace: "tenant-whale", Weight: 100, Current: "shard0"},
+		{Namespace: "tenant-a", Weight: 1},
+	}
+	assign := ComputePlacement(PlacementInput{
+		Tenants:    tenants,
+		ShardCount: 4,
+		Pinned:     map[string]string{"tenant-whale": "shard3"},
+	})
+	if assign["tenant-whale"] != "shard3" {
+		t.Fatalf("pinned tenant not on its shard: %v", assign)
+	}
+
+	// A pin to a non-existent shard is ignored, the current assignment wins.
+	assign = ComputePlacement(PlacementInput{
+		Tenants:    tenants,
+		ShardCount: 2,
+		Pinned:     map[string]string{"tenant-whale": "shard3"},
+	})
+	if assign["tenant-whale"] != "shard0" {
+		t.Fatalf("invalid pin must fall back to current assignment: %v", assign)
+	}
+}
+
+func TestComputePlacementRebalanceIgnoresInvalidPins(t *testing.T) {
+	tenants := []TenantInfo{
+		{Namespace: "tenant-anchor", Weight: 25, Current: "shard0"},
+		{Namespace: "tenant-pinned", Weight: 15, Current: "shard0"},
+		{Namespace: "tenant-c", Weight: 10, Current: "shard1"},
+	}
+	assign := ComputePlacement(PlacementInput{
+		Tenants:            tenants,
+		ShardCount:         2,
+		RebalanceThreshold: 0.25,
+		// The pin points at a shard that does not exist at this K; initial
+		// placement already ignores it, so rebalance must not treat the
+		// tenant as sticky either.
+		Pinned: map[string]string{"tenant-pinned": "shard5"},
+		// Veto the unpinned candidate so the invalidly pinned tenant is the
+		// only move that can fix the spread.
+		CanRebalance: func(ns string) bool { return ns == "tenant-pinned" },
+	})
+	if assign["tenant-pinned"] != "shard1" {
+		t.Fatalf("invalidly pinned tenant must participate in rebalance: %v", assign)
+	}
+}
+
+func TestComputePlacementDeletingTenants(t *testing.T) {
+	// A deleting tenant on a removed shard stays put (the provisioner waits
+	// for the drain); an unassigned deleting tenant still gets an owner so its
+	// teardown can finish.
+	tenants := []TenantInfo{
+		{Namespace: "tenant-gone", Weight: 5, Current: "shard3", Deleting: true},
+		{Namespace: "tenant-dying", Weight: 5, Deleting: true},
+		{Namespace: "tenant-a", Weight: 5, Current: "shard0"},
+	}
+	assign := ComputePlacement(PlacementInput{Tenants: tenants, ShardCount: 2})
+	if assign["tenant-gone"] != "shard3" {
+		t.Fatalf("deleting tenant must never move: %v", assign)
+	}
+	if idx, ok := ParseShardIndex(assign["tenant-dying"]); !ok || idx >= 2 {
+		t.Fatalf("unassigned deleting tenant must still get an owning shard: %v", assign)
+	}
+}
+
+func TestComputePlacementRebalanceRespectsCooldownAndThreshold(t *testing.T) {
+	tenants := []TenantInfo{
+		{Namespace: "tenant-a", Weight: 30, Current: "shard0"},
+		{Namespace: "tenant-b", Weight: 30, Current: "shard0"},
+		{Namespace: "tenant-c", Weight: 10, Current: "shard1"},
+	}
+
+	// Below threshold: nothing moves.
+	assign := ComputePlacement(PlacementInput{Tenants: tenants, ShardCount: 2, RebalanceThreshold: 2.0})
+	for _, tn := range []string{"tenant-a", "tenant-b", "tenant-c"} {
+		if assign[tn] != map[string]string{"tenant-a": "shard0", "tenant-b": "shard0", "tenant-c": "shard1"}[tn] {
+			t.Fatalf("no move expected below threshold: %v", assign)
+		}
+	}
+
+	// Above threshold: one 30-weight tenant moves from shard0 to shard1,
+	// loads become [30, 40] and the spread drops within reach of the average.
+	assign = ComputePlacement(PlacementInput{Tenants: tenants, ShardCount: 2, RebalanceThreshold: 0.25})
+	load := loadsOf(assign, tenants, 2)
+	if load[0] != 30 || load[1] != 40 {
+		t.Fatalf("expected one 30-weight tenant to move, got loads %v: %v", load, assign)
+	}
+
+	// Cooldown vetoes every candidate: nothing moves.
+	assign = ComputePlacement(PlacementInput{
+		Tenants:            tenants,
+		ShardCount:         2,
+		RebalanceThreshold: 0.25,
+		CanRebalance:       func(string) bool { return false },
+	})
+	if assign["tenant-a"] != "shard0" || assign["tenant-b"] != "shard0" {
+		t.Fatalf("cooldown must block rebalance moves: %v", assign)
+	}
+}
+
+func TestParseShardIndex(t *testing.T) {
+	cases := []struct {
+		in  string
+		idx int
+		ok  bool
+	}{
+		{"shard0", 0, true},
+		{"shard12", 12, true},
+		{"shard", 0, false},
+		{"shard-1", 0, false},
+		{"shard01", 0, false},
+		{"tenants", 0, false},
+		{"", 0, false},
+	}
+	for _, c := range cases {
+		idx, ok := ParseShardIndex(c.in)
+		if ok != c.ok || (ok && idx != c.idx) {
+			t.Errorf("ParseShardIndex(%q) = %d,%v, want %d,%v", c.in, idx, ok, c.idx, c.ok)
+		}
+	}
+}
+
+func TestRecommendedShardCount(t *testing.T) {
+	cases := []struct {
+		hrs, tenants, want int
+	}{
+		{15, 3, 1},     // small cluster
+		{81, 13, 1},    // C5 anchor: comfortable on one shard
+		{946, 128, 10}, // C1 anchor: ceil(946/100) = 10
+		{5000, 128, 16},
+		{500, 2, 2}, // capped by tenant count
+		{0, 0, 1},
+	}
+	for _, c := range cases {
+		if got := RecommendedShardCount(c.hrs, c.tenants); got != c.want {
+			t.Errorf("RecommendedShardCount(%d, %d) = %d, want %d", c.hrs, c.tenants, got, c.want)
+		}
+	}
+}
+
+func TestEffectiveShardCount(t *testing.T) {
+	explicit := &Config{ShardCount: 7}
+	if got := explicit.EffectiveShardCount(5000, 128, 2); got != 7 {
+		t.Fatalf("explicit shard count must win, got %d", got)
+	}
+
+	auto := &Config{AutoShardCount: true}
+	cases := []struct {
+		desc                  string
+		hrs, tenants, current int
+		want                  int
+	}{
+		{"fresh install goes straight to the recommendation", 250, 10, 0, 3},
+		{"stable at the recommendation", 150, 10, 2, 2},
+		{"holds below the scale-up threshold", 110, 10, 1, 1}, // 110/1 <= 120
+		{"scales up eagerly past the threshold", 130, 10, 1, 2},
+		{"holds above the scale-down threshold", 110, 10, 2, 2},          // 55*2: desired 2 == current
+		{"holds while shards are moderately underloaded", 130, 10, 2, 2}, // desired 2 == current
+		{"scales down lazily when well under target", 90, 10, 2, 1},      // 45/shard < 60
+		{"keeps current when underloaded but above floor", 99, 10, 1, 1},
+	}
+	for _, c := range cases {
+		if got := auto.EffectiveShardCount(c.hrs, c.tenants, c.current); got != c.want {
+			t.Errorf("%s: EffectiveShardCount(%d, %d, %d) = %d, want %d",
+				c.desc, c.hrs, c.tenants, c.current, got, c.want)
+		}
+	}
+}
+
+func TestParseShardCount(t *testing.T) {
+	if _, auto, err := ParseShardCount("auto"); err != nil || !auto {
+		t.Fatalf("auto must parse: auto=%v err=%v", auto, err)
+	}
+	if n, auto, err := ParseShardCount("7"); err != nil || auto || n != 7 {
+		t.Fatalf("explicit count must parse: n=%d auto=%v err=%v", n, auto, err)
+	}
+	for _, bad := range []string{"", "0", "-1", "many"} {
+		if _, _, err := ParseShardCount(bad); err == nil {
+			t.Errorf("ParseShardCount(%q) must fail", bad)
+		}
+	}
+}
+
+func TestParsePinnedTenants(t *testing.T) {
+	pinned, err := ParsePinnedTenants("tenant-a=shard1, tenant-b=shard0")
+	if err != nil {
+		t.Fatal(err)
+	}
+	if pinned["tenant-a"] != "shard1" || pinned["tenant-b"] != "shard0" {
+		t.Fatalf("unexpected parse result: %v", pinned)
+	}
+	if _, err := ParsePinnedTenants("tenant-a=tenants"); err == nil {
+		t.Fatal("non-canonical shard value must be rejected")
+	}
+	if _, err := ParsePinnedTenants("tenant-a"); err == nil {
+		t.Fatal("missing shard value must be rejected")
+	}
+}
diff --git a/internal/fluxshardoperator/provisioner.go b/internal/fluxshardoperator/provisioner.go
new file mode 100644
index 0000000000..5a35561a72
--- /dev/null
+++ b/internal/fluxshardoperator/provisioner.go
@@ -0,0 +1,438 @@
+package fluxshardoperator
+
+import (
+	"context"
+	"fmt"
+	"maps"
+	"strconv"
+	"strings"
+	"time"
+
+	appsv1 "k8s.io/api/apps/v1"
+	corev1 "k8s.io/api/core/v1"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/types"
+	ctrl "sigs.k8s.io/controller-runtime"
+	"sigs.k8s.io/controller-runtime/pkg/builder"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/handler"
+	"sigs.k8s.io/controller-runtime/pkg/log"
+	"sigs.k8s.io/controller-runtime/pkg/predicate"
+	"sigs.k8s.io/controller-runtime/pkg/reconcile"
+)
+
+// provisionRetry is the pause before re-checking a blocked step (flux
+// Deployment not found yet, shard or legacy Deployment still draining).
+const provisionRetry = 30 * time.Second
+
+// ShardSetReconciler provisions one helm-controller Deployment per shard,
+// cloned from the flux-aio "flux" Deployment's helm-controller container and
+// sanitised for standalone use. The image and feature-gates are inherited from
+// flux-aio automatically, so shards stay version-synced with no manual bump.
+//
+// It also prunes shard Deployments beyond ShardCount once they drain, and
+// retires the legacy hand-rolled flux-tenants Deployment once no HelmRelease
+// carries the legacy "tenants" shard key.
+//
+// +kubebuilder:rbac:groups=apps,resources=deployments,verbs=get;list;watch;create;update;patch;delete
+type ShardSetReconciler struct {
+	client.Client
+	Config *Config
+}
+
+// SetupWithManager registers the shard provisioner.
+func (r *ShardSetReconciler) SetupWithManager(mgr ctrl.Manager) error {
+	toSingleton := handler.EnqueueRequestsFromMapFunc(func(context.Context, client.Object) []reconcile.Request {
+		return []reconcile.Request{{NamespacedName: types.NamespacedName{Name: "shardset"}}}
+	})
+
+	return ctrl.NewControllerManagedBy(mgr).
+		Named("flux-shard-set").
+		Watches(&appsv1.Deployment{}, toSingleton, builder.WithPredicates(r.relevantDeployment())).
+		// HelmRelease label changes drive the drain checks (shard prune and
+		// flux-tenants retirement).
+		WatchesMetadata(HelmReleaseMeta(), toSingleton, builder.WithPredicates(metadataChanged())).
+		Complete(r)
+}
+
+// relevantDeployment passes the flux-aio source Deployment, the legacy
+// flux-tenants Deployment and the operator-managed shards.
+func (r *ShardSetReconciler) relevantDeployment() predicate.Predicate {
+	return predicate.NewPredicateFuncs(func(obj client.Object) bool {
+		if obj.GetNamespace() != r.Config.FluxNamespace {
+			return false
+		}
+		if obj.GetName() == FluxDeploymentName || obj.GetName() == LegacyTenantsDeploymentName {
+			return true
+		}
+		return obj.GetLabels()[ManagedByLabel] == ManagedByValue
+	})
+}
+
+// Reconcile converges the shard runtime.
+func (r *ShardSetReconciler) Reconcile(ctx context.Context, _ ctrl.Request) (ctrl.Result, error) {
+	logger := log.FromContext(ctx)
+
+	flux := &appsv1.Deployment{}
+	err := r.Get(ctx, types.NamespacedName{Namespace: r.Config.FluxNamespace, Name: FluxDeploymentName}, flux)
+	if apierrors.IsNotFound(err) {
+		logger.Info("flux Deployment not found yet, waiting", "namespace", r.Config.FluxNamespace)
+		return ctrl.Result{RequeueAfter: provisionRetry}, nil
+	}
+	if err != nil {
+		return ctrl.Result{}, fmt.Errorf("getting flux Deployment: %w", err)
+	}
+
+	shardCount, err := r.effectiveShardCount(ctx)
+	if err != nil {
+		return ctrl.Result{}, err
+	}
+
+	for i := range shardCount {
+		desired, err := BuildShardDeployment(flux, i, r.Config)
+		if err != nil {
+			return ctrl.Result{}, err
+		}
+		if err := r.Patch(ctx, desired, client.Apply, client.FieldOwner(FieldOwner), client.ForceOwnership); err != nil {
+			return ctrl.Result{}, fmt.Errorf("applying %s: %w", desired.Name, err)
+		}
+	}
+
+	blocked := false
+
+	pruneBlocked, err := r.pruneExtraShards(ctx, shardCount)
+	if err != nil {
+		return ctrl.Result{}, err
+	}
+	blocked = blocked || pruneBlocked
+
+	legacyBlocked, err := r.retireLegacy(ctx)
+	if err != nil {
+		return ctrl.Result{}, err
+	}
+	blocked = blocked || legacyBlocked
+
+	if blocked {
+		return ctrl.Result{RequeueAfter: provisionRetry}, nil
+	}
+	return ctrl.Result{}, nil
+}
+
+// effectiveShardCount resolves the shard count for this sync: the configured
+// value, or in auto mode the recommendation with hysteresis anchored on the
+// currently provisioned shards (see Config.EffectiveShardCount).
+//
+// Sizing counts every key-labeled HelmRelease, while the placement controller
+// distributes only tenant-attributable ones — so this K can run slightly
+// ahead of what placement fills. The error direction is intentional: worst
+// case is an idle shard, never an overloaded one.
+func (r *ShardSetReconciler) effectiveShardCount(ctx context.Context) (int, error) {
+	if !r.Config.AutoShardCount {
+		return r.Config.EffectiveShardCount(0, 0, 0), nil
+	}
+
+	hrs := HelmReleaseMetaList()
+	if err := r.List(ctx, hrs, client.HasLabels{ShardKeyLabel}); err != nil {
+		return 0, fmt.Errorf("listing HelmReleases: %w", err)
+	}
+	tenants := map[string]struct{}{}
+	for i := range hrs.Items {
+		if tenantNS, ok := TenantNamespaceForHR(&hrs.Items[i]); ok {
+			tenants[tenantNS] = struct{}{}
+		}
+	}
+
+	deps := &appsv1.DeploymentList{}
+	if err := r.List(ctx, deps, client.InNamespace(r.Config.FluxNamespace),
+		client.MatchingLabels{ManagedByLabel: ManagedByValue}); err != nil {
+		return 0, fmt.Errorf("listing shard Deployments: %w", err)
+	}
+	current := 0
+	for i := range deps.Items {
+		if idx, ok := ParseShardDeploymentIndex(deps.Items[i].Name); ok && idx+1 > current {
+			current = idx + 1
+		}
+	}
+
+	return r.Config.EffectiveShardCount(len(hrs.Items), len(tenants), current), nil
+}
+
+// pruneExtraShards deletes operator-managed shard Deployments beyond the
+// effective shard count once no HelmRelease points at them anymore. Returns
+// true while a drain is still in progress.
+func (r *ShardSetReconciler) pruneExtraShards(ctx context.Context, shardCount int) (bool, error) {
+	logger := log.FromContext(ctx)
+
+	deps := &appsv1.DeploymentList{}
+	if err := r.List(ctx, deps, client.InNamespace(r.Config.FluxNamespace),
+		client.MatchingLabels{ManagedByLabel: ManagedByValue}); err != nil {
+		return false, fmt.Errorf("listing shard Deployments: %w", err)
+	}
+
+	blocked := false
+	for i := range deps.Items {
+		dep := &deps.Items[i]
+		idx, ok := ParseShardDeploymentIndex(dep.Name)
+		if !ok || idx < shardCount {
+			continue
+		}
+		drained, err := r.drained(ctx, ShardName(idx))
+		if err != nil {
+			return false, err
+		}
+		if !drained {
+			blocked = true
+			continue
+		}
+		logger.Info("pruning drained shard Deployment", "deployment", dep.Name)
+		if err := client.IgnoreNotFound(r.Delete(ctx, dep)); err != nil {
+			return false, fmt.Errorf("deleting %s: %w", dep.Name, err)
+		}
+	}
+	return blocked, nil
+}
+
+// retireLegacy deletes the hand-rolled flux-tenants Deployment once the
+// placement controller has relabeled every HelmRelease off the legacy
+// "tenants" bucket. Returns true while the backfill is still draining it.
+func (r *ShardSetReconciler) retireLegacy(ctx context.Context) (bool, error) {
+	logger := log.FromContext(ctx)
+
+	legacy := &appsv1.Deployment{}
+	err := r.Get(ctx, types.NamespacedName{Namespace: r.Config.FluxNamespace, Name: LegacyTenantsDeploymentName}, legacy)
+	if apierrors.IsNotFound(err) {
+		return false, nil
+	}
+	if err != nil {
+		return false, fmt.Errorf("getting %s Deployment: %w", LegacyTenantsDeploymentName, err)
+	}
+
+	drained, err := r.drained(ctx, LegacyShardKey)
+	if err != nil {
+		return false, err
+	}
+	if !drained {
+		return true, nil
+	}
+	logger.Info("no HelmReleases left on the legacy tenants shard, retiring Deployment",
+		"deployment", LegacyTenantsDeploymentName)
+	if err := client.IgnoreNotFound(r.Delete(ctx, legacy)); err != nil {
+		return false, fmt.Errorf("deleting %s: %w", LegacyTenantsDeploymentName, err)
+	}
+	return false, nil
+}
+
+// drained reports whether no HelmRelease carries the given shard key anymore.
+func (r *ShardSetReconciler) drained(ctx context.Context, shardKey string) (bool, error) {
+	hrs := HelmReleaseMetaList()
+	if err := r.List(ctx, hrs, client.MatchingLabels{ShardKeyLabel: shardKey}); err != nil {
+		return false, fmt.Errorf("listing HelmReleases with %s=%s: %w", ShardKeyLabel, shardKey, err)
+	}
+	return len(hrs.Items) == 0, nil
+}
+
+// mergeResourceList overlays the configured quantities onto the cloned ones,
+// keeping cloned entries the overrides do not name.
+func mergeResourceList(dst *corev1.ResourceList, overrides corev1.ResourceList) {
+	if len(overrides) == 0 {
+		return
+	}
+	if *dst == nil {
+		*dst = corev1.ResourceList{}
+	}
+	maps.Copy(*dst, overrides)
+}
+
+// BuildShardDeployment clones the helm-controller container out of the
+// flux-aio Deployment and sanitises it into a standalone single-shard
+// Deployment:
+//
+//   - hostNetwork off (flux-aio is hostNetwork:true; N shard pods would
+//     collide on host ports 9795/9796), DNS policy back to ClusterFirst;
+//   - only the helm-controller container is kept out of the all-in-one pod;
+//   - --events-addr is dropped (it points at the notification-controller on
+//     localhost, which does not exist in a standalone pod);
+//   - --watch-label-selector is replaced with this shard's key selector;
+//   - --concurrent and resources come from the operator values;
+//   - SOURCE_*_LOCALHOST env wiring and tolerations for bootstrapping
+//     CNI-less nodes are flux-aio specifics and are removed (the hand-rolled
+//     flux-tenants shard had neither);
+//   - the required podAntiAffinity cloned from flux-aio (which keeps its own
+//     replicas off one node) is dropped, since it targets
+//     app.kubernetes.io/name=flux and would otherwise leave every shard
+//     Pending on a single-node cluster;
+//   - the corporate-proxy env inherited from flux-aio is dropped, in both the
+//     upper- and lower-case spellings (HTTP_PROXY/HTTPS_PROXY/NO_PROXY): a
+//     standalone shard needs no external egress, and behind an unreachable
+//     proxy a stalled startup call leaves the manager never serving /healthz,
+//     so the liveness probe crashloops the pod;
+//   - a startupProbe is derived from the liveness handler (generous failure
+//     budget, liveness handler and TimeoutSeconds inherited) so a slow but
+//     progressing start is not killed by the short inherited liveness window.
+func BuildShardDeployment(flux *appsv1.Deployment, idx int, cfg *Config) (*appsv1.Deployment, error) {
+	var src *corev1.Container
+	for i := range flux.Spec.Template.Spec.Containers {
+		if flux.Spec.Template.Spec.Containers[i].Name == HelmControllerContainerName {
+			src = &flux.Spec.Template.Spec.Containers[i]
+			break
+		}
+	}
+	if src == nil {
+		return nil, fmt.Errorf("container %q not found in Deployment %s/%s",
+			HelmControllerContainerName, flux.Namespace, flux.Name)
+	}
+
+	podSpec := flux.Spec.Template.Spec.DeepCopy()
+	hc := src.DeepCopy()
+
+	selectorArg := "--watch-label-selector=" + ShardKeyLabel + "=" + ShardName(idx)
+	concurrentArg := "--concurrent=" + strconv.Itoa(cfg.ShardConcurrent)
+	args := make([]string, 0, len(hc.Args))
+	haveSelector, haveConcurrent := false, false
+	for _, arg := range hc.Args {
+		switch {
+		case strings.HasPrefix(arg, "--events-addr"):
+			continue
+		case strings.HasPrefix(arg, "--watch-label-selector"):
+			args, haveSelector = append(args, selectorArg), true
+		case strings.HasPrefix(arg, "--concurrent"):
+			args, haveConcurrent = append(args, concurrentArg), true
+		default:
+			args = append(args, arg)
+		}
+	}
+	if !haveSelector {
+		args = append(args, selectorArg)
+	}
+	if !haveConcurrent {
+		args = append(args, concurrentArg)
+	}
+	hc.Args = args
+
+	env := make([]corev1.EnvVar, 0, len(hc.Env))
+	for _, e := range hc.Env {
+		switch e.Name {
+		// Localhost cross-container wiring of the all-in-one pod.
+		case "SOURCE_CONTROLLER_LOCALHOST", "SOURCE_WATCHER_LOCALHOST":
+			continue
+		// The installer injects the node-local apiserver endpoint (e.g. Talos
+		// KubePrism localhost:7445) into hostNetwork workloads
+		// (internal/fluxinstall injectKubernetesServiceEnv). The sanitised pod
+		// is not hostNetwork, so it must fall back to the in-cluster defaults.
+		case "KUBERNETES_SERVICE_HOST", "KUBERNETES_SERVICE_PORT":
+			continue
+		// Corporate-proxy env inherited from flux-aio. A standalone shard needs
+		// no external egress: source-controller does artifact fetching and
+		// cosign/TUF verification, and every hop the shard makes is in-cluster
+		// (artifacts advertise as flux.$(RUNTIME_NAMESPACE).svc, guest-cluster
+		// apiservers are reached over .svc kubeconfigs). NO_PROXY=.svc covers
+		// those, but not the management apiserver: the KUBERNETES_SERVICE_HOST
+		// case above makes the shard fall back to the kubelet-injected
+		// ClusterIP, a bare IP that no .svc suffix matches, so that startup
+		// call is the one that stalls through an unreachable proxy and leaves
+		// the manager never serving /healthz until the liveness probe
+		// crashloops the pod. Dropping the proxy env (and the then-pointless
+		// NO_PROXY) keeps every hop direct. A HelmRelease targeting a remote
+		// cluster via spec.kubeConfig reachable only through the proxy is the
+		// one theoretical exception; cozystack guest-cluster apiservers are
+		// in-cluster, so this does not apply here.
+		case "HTTP_PROXY", "HTTPS_PROXY", "NO_PROXY",
+			"http_proxy", "https_proxy", "no_proxy":
+			continue
+		}
+		env = append(env, e)
+	}
+	hc.Env = env
+
+	// Merge per resource name so an unset value inherits the cloned one, as
+	// the flag help documents — replacing the whole block would drop e.g. a
+	// cloned cpu limit when only a memory limit is configured.
+	mergeResourceList(&hc.Resources.Requests, cfg.ShardResources.Requests)
+	mergeResourceList(&hc.Resources.Limits, cfg.ShardResources.Limits)
+
+	// Guard startup with a startupProbe derived from the liveness handler.
+	// Without it the inherited ~30s liveness window kills a controller that is
+	// still syncing caches (a slow start on a large cluster, or a transient
+	// dependency), turning any slow start into an unrecoverable crashloop. The
+	// generous startup budget defers liveness until the manager is serving,
+	// then liveness still catches a wedged running pod. Only the budget fields
+	// are normalised; the liveness handler and its TimeoutSeconds are inherited,
+	// so a controller whose /healthz is slow under load keeps the same tolerance
+	// at startup as at runtime (overriding TimeoutSeconds down could make the
+	// startup probe stricter than liveness and recreate the crashloop).
+	if hc.LivenessProbe != nil && hc.StartupProbe == nil {
+		sp := hc.LivenessProbe.DeepCopy()
+		sp.InitialDelaySeconds = 0
+		sp.PeriodSeconds = 10
+		sp.SuccessThreshold = 1
+		sp.FailureThreshold = 30
+		hc.StartupProbe = sp
+	}
+
+	mounted := map[string]bool{}
+	for _, m := range hc.VolumeMounts {
+		mounted[m.Name] = true
+	}
+	volumes := make([]corev1.Volume, 0, len(podSpec.Volumes))
+	for _, v := range podSpec.Volumes {
+		if mounted[v.Name] {
+			volumes = append(volumes, v)
+		}
+	}
+	podSpec.Volumes = volumes
+
+	podSpec.Containers = []corev1.Container{*hc}
+	podSpec.InitContainers = nil
+	podSpec.HostNetwork = false
+	podSpec.DNSPolicy = corev1.DNSClusterFirst
+	podSpec.Tolerations = nil
+	// flux-aio carries a required podAntiAffinity on
+	// app.kubernetes.io/name=flux to keep its own replicas apart. Cloned onto a
+	// shard pod it becomes a hard rule against running on the flux-aio node, so
+	// on a single schedulable node every shard stays Pending and the tenant
+	// plane stalls. The legacy flux-tenants shard had none. Drop it while
+	// keeping any benign nodeAffinity (e.g. the os=linux constraint).
+	if podSpec.Affinity != nil {
+		podSpec.Affinity.PodAntiAffinity = nil
+	}
+
+	name := ShardDeploymentName(idx)
+	labels := map[string]string{
+		"app.kubernetes.io/name":    name,
+		"app.kubernetes.io/part-of": "flux",
+		"sharding.fluxcd.io/role":   "shard",
+		ManagedByLabel:              ManagedByValue,
+	}
+	if version := flux.Labels["app.kubernetes.io/version"]; version != "" {
+		labels["app.kubernetes.io/version"] = version
+	}
+
+	return &appsv1.Deployment{
+		TypeMeta: metav1.TypeMeta{APIVersion: appsv1.SchemeGroupVersion.String(), Kind: "Deployment"},
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      name,
+			Namespace: cfg.FluxNamespace,
+			Labels:    labels,
+		},
+		Spec: appsv1.DeploymentSpec{
+			Replicas: new(int32(1)),
+			// helm-controller runs with leader election disabled, so two pods
+			// of one shard must never overlap during a rollout.
+			Strategy: appsv1.DeploymentStrategy{Type: appsv1.RecreateDeploymentStrategyType},
+			Selector: &metav1.LabelSelector{
+				MatchLabels: map[string]string{"app.kubernetes.io/name": name},
+			},
+			Template: corev1.PodTemplateSpec{
+				ObjectMeta: metav1.ObjectMeta{
+					Labels: map[string]string{"app.kubernetes.io/name": name},
+					Annotations: map[string]string{
+						"cluster-autoscaler.kubernetes.io/safe-to-evict": "true",
+						"prometheus.io/scrape":                           "true",
+					},
+				},
+				Spec: *podSpec,
+			},
+		},
+	}, nil
+}
diff --git a/internal/fluxshardoperator/provisioner_test.go b/internal/fluxshardoperator/provisioner_test.go
new file mode 100644
index 0000000000..96ad34ff00
--- /dev/null
+++ b/internal/fluxshardoperator/provisioner_test.go
@@ -0,0 +1,346 @@
+package fluxshardoperator
+
+import (
+	"slices"
+	"testing"
+
+	appsv1 "k8s.io/api/apps/v1"
+	corev1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/api/resource"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/util/intstr"
+)
+
+// fluxAIODeployment models the relevant shape of the flux-aio "flux"
+// Deployment generated by timoni (internal/fluxinstall/manifests/fluxcd.yaml).
+func fluxAIODeployment() *appsv1.Deployment {
+	return &appsv1.Deployment{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "flux",
+			Namespace: "cozy-fluxcd",
+			Labels: map[string]string{
+				"app.kubernetes.io/name":    "flux",
+				"app.kubernetes.io/version": "v2.8.0",
+			},
+		},
+		Spec: appsv1.DeploymentSpec{
+			Template: corev1.PodTemplateSpec{
+				Spec: corev1.PodSpec{
+					HostNetwork:        true,
+					DNSPolicy:          corev1.DNSClusterFirstWithHostNet,
+					ServiceAccountName: "flux",
+					PriorityClassName:  "system-cluster-critical",
+					Tolerations: []corev1.Toleration{
+						{Key: "node.kubernetes.io/not-ready", Operator: corev1.TolerationOpExists},
+					},
+					// flux-aio pins itself off one node and to linux nodes; the
+					// required podAntiAffinity targets app.kubernetes.io/name=flux
+					// (internal/fluxinstall/manifests/fluxcd.yaml).
+					Affinity: &corev1.Affinity{
+						NodeAffinity: &corev1.NodeAffinity{
+							RequiredDuringSchedulingIgnoredDuringExecution: &corev1.NodeSelector{
+								NodeSelectorTerms: []corev1.NodeSelectorTerm{{
+									MatchExpressions: []corev1.NodeSelectorRequirement{{
+										Key:      "kubernetes.io/os",
+										Operator: corev1.NodeSelectorOpIn,
+										Values:   []string{"linux"},
+									}},
+								}},
+							},
+						},
+						PodAntiAffinity: &corev1.PodAntiAffinity{
+							RequiredDuringSchedulingIgnoredDuringExecution: []corev1.PodAffinityTerm{{
+								LabelSelector: &metav1.LabelSelector{
+									MatchExpressions: []metav1.LabelSelectorRequirement{{
+										Key:      "app.kubernetes.io/name",
+										Operator: metav1.LabelSelectorOpIn,
+										Values:   []string{"flux"},
+									}},
+								},
+								TopologyKey: "kubernetes.io/hostname",
+							}},
+						},
+					},
+					Volumes: []corev1.Volume{
+						{Name: "tmp", VolumeSource: corev1.VolumeSource{EmptyDir: &corev1.EmptyDirVolumeSource{}}},
+						{Name: "data", VolumeSource: corev1.VolumeSource{EmptyDir: &corev1.EmptyDirVolumeSource{}}},
+					},
+					Containers: []corev1.Container{
+						{Name: "source-controller", Image: "ghcr.io/fluxcd/source-controller:v1.8.0"},
+						{
+							Name:  "helm-controller",
+							Image: "ghcr.io/fluxcd/helm-controller:v1.5.0",
+							Args: []string{
+								"--watch-all-namespaces",
+								"--log-level=info",
+								"--enable-leader-election=false",
+								"--metrics-addr=:9795",
+								"--health-addr=:9796",
+								"--watch-label-selector=!sharding.fluxcd.io/key",
+								"--concurrent=5",
+								"--requeue-dependency=30s",
+								"--events-addr=http://localhost:9690",
+								"--feature-gates=ExternalArtifact=true",
+							},
+							Env: []corev1.EnvVar{
+								{Name: "SOURCE_CONTROLLER_LOCALHOST", Value: "localhost:9790"},
+								{Name: "SOURCE_WATCHER_LOCALHOST", Value: "localhost:9691"},
+								// Injected by the installer into hostNetwork
+								// workloads (Talos KubePrism endpoint).
+								{Name: "KUBERNETES_SERVICE_HOST", Value: "localhost"},
+								{Name: "KUBERNETES_SERVICE_PORT", Value: "7445"},
+								{Name: "RUNTIME_NAMESPACE", ValueFrom: &corev1.EnvVarSource{
+									FieldRef: &corev1.ObjectFieldSelector{FieldPath: "metadata.namespace"},
+								}},
+								{Name: "TUF_ROOT", Value: "/tmp/.sigstore"},
+								// Corporate-proxy env present on flux-aio in
+								// proxied installs (operator/patch level, not the
+								// installer, which injects only KUBERNETES_SERVICE_*);
+								// harmless there, hangs a standalone shard at startup.
+								{Name: "HTTP_PROXY", Value: "http://proxy.example:3128"},
+								{Name: "HTTPS_PROXY", Value: "http://proxy.example:3128"},
+								{Name: "NO_PROXY", Value: ".svc"},
+								{Name: "http_proxy", Value: "http://proxy.example:3128"},
+								{Name: "https_proxy", Value: "http://proxy.example:3128"},
+								{Name: "no_proxy", Value: ".svc"},
+							},
+							VolumeMounts: []corev1.VolumeMount{{Name: "tmp", MountPath: "/tmp"}},
+							// flux-aio ships helm-controller with a bare httpGet
+							// liveness probe: no timing fields at all, so the
+							// kube-apiserver defaults (~30s window) apply. The
+							// startupProbe must inherit this handler and its unset
+							// TimeoutSeconds and only normalise the startup budget.
+							LivenessProbe: &corev1.Probe{
+								ProbeHandler: corev1.ProbeHandler{
+									HTTPGet: &corev1.HTTPGetAction{
+										Path: "/healthz",
+										Port: intstr.FromString("healthz-hc"),
+									},
+								},
+							},
+						},
+						{Name: "notification-controller", Image: "ghcr.io/fluxcd/notification-controller:v1.8.0"},
+					},
+				},
+			},
+		},
+	}
+}
+
+func TestBuildShardDeployment(t *testing.T) {
+	cfg := &Config{
+		FluxNamespace:   "cozy-fluxcd",
+		ShardCount:      3,
+		ShardConcurrent: 9,
+		ShardResources: corev1.ResourceRequirements{
+			Requests: corev1.ResourceList{corev1.ResourceCPU: resource.MustParse("100m")},
+			Limits:   corev1.ResourceList{corev1.ResourceMemory: resource.MustParse("1Gi")},
+		},
+	}
+
+	flux := fluxAIODeployment()
+	// Capture the source liveness probe verbatim so the startupProbe assertions
+	// can check inheritance against what flux-aio actually ships, rather than
+	// against a hardcoded value baked into the test.
+	var srcLiveness *corev1.Probe
+	for i := range flux.Spec.Template.Spec.Containers {
+		if flux.Spec.Template.Spec.Containers[i].Name == "helm-controller" {
+			srcLiveness = flux.Spec.Template.Spec.Containers[i].LivenessProbe.DeepCopy()
+		}
+	}
+
+	dep, err := BuildShardDeployment(flux, 2, cfg)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if dep.Name != "helm-controller-shard2" || dep.Namespace != "cozy-fluxcd" {
+		t.Fatalf("unexpected object meta: %s/%s", dep.Namespace, dep.Name)
+	}
+	if dep.Labels[ManagedByLabel] != ManagedByValue {
+		t.Fatalf("managed-by label missing: %v", dep.Labels)
+	}
+	if dep.Labels["app.kubernetes.io/version"] != "v2.8.0" {
+		t.Fatalf("version label not inherited from flux-aio: %v", dep.Labels)
+	}
+	if dep.Spec.Strategy.Type != appsv1.RecreateDeploymentStrategyType {
+		t.Fatalf("shard rollout must be Recreate, got %s", dep.Spec.Strategy.Type)
+	}
+	if *dep.Spec.Replicas != 1 {
+		t.Fatalf("expected 1 replica, got %d", *dep.Spec.Replicas)
+	}
+
+	ps := dep.Spec.Template.Spec
+	if ps.HostNetwork || ps.DNSPolicy != corev1.DNSClusterFirst {
+		t.Fatalf("host networking must be sanitised away: hostNetwork=%v dnsPolicy=%s", ps.HostNetwork, ps.DNSPolicy)
+	}
+	if len(ps.Tolerations) != 0 {
+		t.Fatalf("flux-aio bootstrap tolerations must be dropped: %v", ps.Tolerations)
+	}
+	if ps.Affinity != nil && ps.Affinity.PodAntiAffinity != nil {
+		t.Fatalf("inherited pod anti-affinity must be stripped so shards can co-locate with flux-aio: %v",
+			ps.Affinity.PodAntiAffinity)
+	}
+	if ps.Affinity == nil || ps.Affinity.NodeAffinity == nil {
+		t.Fatalf("benign nodeAffinity (e.g. os=linux) must be preserved: %+v", ps.Affinity)
+	}
+	if ps.ServiceAccountName != "flux" || ps.PriorityClassName != "system-cluster-critical" {
+		t.Fatalf("flux pod identity must be inherited: sa=%s prio=%s", ps.ServiceAccountName, ps.PriorityClassName)
+	}
+	if len(ps.Containers) != 1 || ps.Containers[0].Name != "helm-controller" {
+		t.Fatalf("only the helm-controller container must survive: %v", ps.Containers)
+	}
+	if len(ps.Volumes) != 1 || ps.Volumes[0].Name != "tmp" {
+		t.Fatalf("only volumes mounted by helm-controller must survive: %v", ps.Volumes)
+	}
+
+	hc := ps.Containers[0]
+	if hc.Image != "ghcr.io/fluxcd/helm-controller:v1.5.0" {
+		t.Fatalf("image must be inherited from flux-aio: %s", hc.Image)
+	}
+	if !slices.Contains(hc.Args, "--watch-label-selector=sharding.fluxcd.io/key=shard2") {
+		t.Fatalf("shard watch selector missing: %v", hc.Args)
+	}
+	if !slices.Contains(hc.Args, "--concurrent=9") {
+		t.Fatalf("concurrent override missing: %v", hc.Args)
+	}
+	if !slices.Contains(hc.Args, "--feature-gates=ExternalArtifact=true") {
+		t.Fatalf("unrelated args must be preserved: %v", hc.Args)
+	}
+	for _, arg := range hc.Args {
+		if arg == "--watch-label-selector=!sharding.fluxcd.io/key" ||
+			arg == "--concurrent=5" ||
+			arg == "--events-addr=http://localhost:9690" {
+			t.Fatalf("unsanitised arg leaked through: %s", arg)
+		}
+	}
+
+	for _, e := range hc.Env {
+		switch e.Name {
+		case "SOURCE_CONTROLLER_LOCALHOST", "SOURCE_WATCHER_LOCALHOST":
+			t.Fatalf("localhost cross-container env leaked through: %s", e.Name)
+		case "KUBERNETES_SERVICE_HOST", "KUBERNETES_SERVICE_PORT":
+			// A non-hostNetwork pod dialing the node-local KubePrism endpoint
+			// crashloops on "dial tcp [::1]:7445: connect: connection refused".
+			t.Fatalf("node-local apiserver endpoint env leaked through: %s", e.Name)
+		case "HTTP_PROXY", "HTTPS_PROXY", "NO_PROXY",
+			"http_proxy", "https_proxy", "no_proxy":
+			// A standalone shard behind an unreachable proxy hangs at startup
+			// and crashloops before it ever serves /healthz.
+			t.Fatalf("corporate-proxy env leaked through: %s", e.Name)
+		}
+	}
+	envNames := make([]string, 0, len(hc.Env))
+	for _, e := range hc.Env {
+		envNames = append(envNames, e.Name)
+	}
+	if !slices.Contains(envNames, "RUNTIME_NAMESPACE") || !slices.Contains(envNames, "TUF_ROOT") {
+		t.Fatalf("regular env must be preserved: %v", envNames)
+	}
+
+	if hc.Resources.Limits.Memory().String() != "1Gi" {
+		t.Fatalf("resources override not applied: %v", hc.Resources)
+	}
+
+	if hc.StartupProbe == nil {
+		t.Fatal("startupProbe must be added so a slow start is not liveness-killed into a crashloop")
+	}
+	// Handler inherited from liveness verbatim.
+	if hc.StartupProbe.HTTPGet == nil || hc.StartupProbe.HTTPGet.Path != "/healthz" {
+		t.Fatalf("startupProbe must reuse the liveness /healthz handler: %+v", hc.StartupProbe)
+	}
+	// Assert the complete normalised startup budget, not just FailureThreshold:
+	// a threshold check alone still passes if PeriodSeconds later regresses to 1,
+	// which would silently restore a short crashloop window.
+	if hc.StartupProbe.InitialDelaySeconds != 0 ||
+		hc.StartupProbe.PeriodSeconds != 10 ||
+		hc.StartupProbe.SuccessThreshold != 1 ||
+		hc.StartupProbe.FailureThreshold != 30 {
+		t.Fatalf("startupProbe budget not normalised to the expected contract "+
+			"(delay=0 period=10 success=1 failure=30): %+v", hc.StartupProbe)
+	}
+	// TimeoutSeconds is inherited from the source liveness probe, never forced.
+	// flux-aio ships a bare probe (TimeoutSeconds 0), so a stray
+	// sp.TimeoutSeconds = N would diverge from the source and fail here.
+	if hc.StartupProbe.TimeoutSeconds != srcLiveness.TimeoutSeconds {
+		t.Fatalf("startupProbe must inherit the liveness TimeoutSeconds (%d), got %d",
+			srcLiveness.TimeoutSeconds, hc.StartupProbe.TimeoutSeconds)
+	}
+	// The startupProbe must be a DeepCopy of the liveness probe, never an alias.
+	// If it aliased, normalising the startup FailureThreshold to 30 would also
+	// stamp 30 onto liveness, producing exactly the never-failing liveness probe
+	// this change exists to avoid.
+	if hc.LivenessProbe == hc.StartupProbe {
+		t.Fatal("startupProbe must be a DeepCopy of liveness, not an alias sharing its backing probe")
+	}
+	if hc.LivenessProbe.FailureThreshold != srcLiveness.FailureThreshold {
+		t.Fatalf("liveness FailureThreshold was clobbered by the startup budget "+
+			"(alias regression): source=%d live=%d", srcLiveness.FailureThreshold, hc.LivenessProbe.FailureThreshold)
+	}
+}
+
+func TestBuildShardDeploymentInheritsResourcesWhenUnset(t *testing.T) {
+	flux := fluxAIODeployment()
+	flux.Spec.Template.Spec.Containers[1].Resources = corev1.ResourceRequirements{
+		Requests: corev1.ResourceList{corev1.ResourceCPU: resource.MustParse("123m")},
+	}
+	dep, err := BuildShardDeployment(flux, 0, &Config{FluxNamespace: "cozy-fluxcd", ShardConcurrent: 5})
+	if err != nil {
+		t.Fatal(err)
+	}
+	if dep.Spec.Template.Spec.Containers[0].Resources.Requests.Cpu().String() != "123m" {
+		t.Fatalf("cloned resources must be kept when no override is configured: %v",
+			dep.Spec.Template.Spec.Containers[0].Resources)
+	}
+}
+
+func TestBuildShardDeploymentMergesPartialResourceOverrides(t *testing.T) {
+	flux := fluxAIODeployment()
+	flux.Spec.Template.Spec.Containers[1].Resources = corev1.ResourceRequirements{
+		Requests: corev1.ResourceList{
+			corev1.ResourceCPU:    resource.MustParse("123m"),
+			corev1.ResourceMemory: resource.MustParse("32Mi"),
+		},
+		Limits: corev1.ResourceList{corev1.ResourceCPU: resource.MustParse("500m")},
+	}
+	cfg := &Config{
+		FluxNamespace:   "cozy-fluxcd",
+		ShardConcurrent: 5,
+		ShardResources: corev1.ResourceRequirements{
+			Limits: corev1.ResourceList{corev1.ResourceMemory: resource.MustParse("1Gi")},
+		},
+	}
+	dep, err := BuildShardDeployment(flux, 0, cfg)
+	if err != nil {
+		t.Fatal(err)
+	}
+	res := dep.Spec.Template.Spec.Containers[0].Resources
+	if res.Requests.Cpu().String() != "123m" || res.Requests.Memory().String() != "32Mi" {
+		t.Fatalf("cloned requests must survive a limits-only override: %v", res)
+	}
+	if res.Limits.Cpu().String() != "500m" {
+		t.Fatalf("cloned cpu limit must survive a memory-only limits override: %v", res)
+	}
+	if res.Limits.Memory().String() != "1Gi" {
+		t.Fatalf("configured memory limit must be applied: %v", res)
+	}
+}
+
+func TestBuildShardDeploymentMissingContainer(t *testing.T) {
+	flux := fluxAIODeployment()
+	flux.Spec.Template.Spec.Containers = flux.Spec.Template.Spec.Containers[:1]
+	if _, err := BuildShardDeployment(flux, 0, &Config{FluxNamespace: "cozy-fluxcd"}); err == nil {
+		t.Fatal("expected an error when the helm-controller container is missing")
+	}
+}
+
+func TestParseShardDeploymentIndex(t *testing.T) {
+	if idx, ok := ParseShardDeploymentIndex("helm-controller-shard4"); !ok || idx != 4 {
+		t.Fatalf("ParseShardDeploymentIndex(helm-controller-shard4) = %d,%v", idx, ok)
+	}
+	for _, name := range []string{"helm-controller-shard", "flux-tenants", "helm-controller-tenants"} {
+		if _, ok := ParseShardDeploymentIndex(name); ok {
+			t.Fatalf("ParseShardDeploymentIndex(%s) must fail", name)
+		}
+	}
+}
diff --git a/internal/fluxshardoperator/tenant.go b/internal/fluxshardoperator/tenant.go
new file mode 100644
index 0000000000..5fc3e7afb1
--- /dev/null
+++ b/internal/fluxshardoperator/tenant.go
@@ -0,0 +1,38 @@
+package fluxshardoperator
+
+import (
+	"strings"
+
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+// TenantNamespaceForHR derives the owning tenant's namespace from HelmRelease
+// metadata alone. The tenant namespace is the unit of placement: all
+// HelmReleases resolving to the same tenant namespace carry the same shard
+// label.
+//
+// Rules (mirroring the tenant chart's "tenant.name" helper):
+//   - A parent tenant HelmRelease (label apps.cozystack.io/application.kind=Tenant,
+//     name "tenant-<x>") released in tenant-root owns namespace "tenant-<x>";
+//     released in any other tenant namespace it owns "<release-namespace>-<x>"
+//     (nested tenants).
+//   - Any other HelmRelease in a "tenant-*" namespace belongs to the tenant of
+//     that namespace.
+//
+// ok=false means the object cannot be attributed to a tenant.
+func TenantNamespaceForHR(obj metav1.Object) (string, bool) {
+	name, namespace := obj.GetName(), obj.GetNamespace()
+	if !strings.HasPrefix(namespace, "tenant-") {
+		return "", false
+	}
+	if obj.GetLabels()[ApplicationKindLabel] == TenantKind {
+		if suffix, found := strings.CutPrefix(name, "tenant-"); found && suffix != "" {
+			if namespace == "tenant-root" {
+				// Includes the root tenant itself: tenant-root/tenant-root.
+				return name, true
+			}
+			return namespace + "-" + suffix, true
+		}
+	}
+	return namespace, true
+}
diff --git a/internal/fluxshardoperator/tenant_test.go b/internal/fluxshardoperator/tenant_test.go
new file mode 100644
index 0000000000..3070c17a0a
--- /dev/null
+++ b/internal/fluxshardoperator/tenant_test.go
@@ -0,0 +1,71 @@
+package fluxshardoperator
+
+import (
+	"testing"
+
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+func hrMeta(namespace, name string, labels map[string]string) *metav1.PartialObjectMetadata {
+	return &metav1.PartialObjectMetadata{
+		ObjectMeta: metav1.ObjectMeta{Namespace: namespace, Name: name, Labels: labels},
+	}
+}
+
+func TestTenantNamespaceForHR(t *testing.T) {
+	tenantLabels := map[string]string{ApplicationKindLabel: TenantKind}
+	cases := []struct {
+		desc      string
+		obj       *metav1.PartialObjectMetadata
+		want      string
+		wantFound bool
+	}{
+		{
+			desc:      "child module in tenant namespace",
+			obj:       hrMeta("tenant-foo", "etcd", map[string]string{ApplicationKindLabel: "Etcd"}),
+			want:      "tenant-foo",
+			wantFound: true,
+		},
+		{
+			desc:      "user app in nested tenant namespace",
+			obj:       hrMeta("tenant-foo-bar", "postgres-db1", map[string]string{ApplicationKindLabel: "Postgres"}),
+			want:      "tenant-foo-bar",
+			wantFound: true,
+		},
+		{
+			desc:      "parent tenant HR in tenant-root",
+			obj:       hrMeta("tenant-root", "tenant-foo", tenantLabels),
+			want:      "tenant-foo",
+			wantFound: true,
+		},
+		{
+			desc:      "parent HR of a nested tenant",
+			obj:       hrMeta("tenant-foo", "tenant-bar", tenantLabels),
+			want:      "tenant-foo-bar",
+			wantFound: true,
+		},
+		{
+			desc:      "the root tenant itself",
+			obj:       hrMeta("tenant-root", "tenant-root", tenantLabels),
+			want:      "tenant-root",
+			wantFound: true,
+		},
+		{
+			desc:      "HR outside tenant namespaces",
+			obj:       hrMeta("cozy-system", "whatever", nil),
+			wantFound: false,
+		},
+		{
+			desc:      "tenant-kind HR without tenant- name prefix falls back to namespace",
+			obj:       hrMeta("tenant-foo", "oddball", tenantLabels),
+			want:      "tenant-foo",
+			wantFound: true,
+		},
+	}
+	for _, c := range cases {
+		got, found := TenantNamespaceForHR(c.obj)
+		if found != c.wantFound || got != c.want {
+			t.Errorf("%s: TenantNamespaceForHR() = %q,%v, want %q,%v", c.desc, got, found, c.want, c.wantFound)
+		}
+	}
+}
diff --git a/internal/fluxshardoperator/webhook.go b/internal/fluxshardoperator/webhook.go
new file mode 100644
index 0000000000..769f40a45c
--- /dev/null
+++ b/internal/fluxshardoperator/webhook.go
@@ -0,0 +1,109 @@
+package fluxshardoperator
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"net/http"
+	"strings"
+
+	"gomodules.xyz/jsonpatch/v2"
+	admissionv1 "k8s.io/api/admission/v1"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/types"
+	ctrl "sigs.k8s.io/controller-runtime"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/log"
+	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
+)
+
+// WebhookPath is the HTTP path the shard-stamping webhook is served on.
+const WebhookPath = "/mutate-helmrelease-shard"
+
+// ShardWebhook stamps the owning tenant's shard onto every tenant HelmRelease
+// at CREATE time, so each HelmRelease is born on the correct shard regardless
+// of creation path (API-created, tenant chart children, "extra" HelmReleases
+// rendered inside other releases).
+//
+// It is registered with operations: ["CREATE"] and failurePolicy: Ignore only:
+// helm-controller status patches are a firehose, so UPDATE is never
+// intercepted, and a webhook outage must degrade to the catch-all path (the
+// HelmRelease keeps its legacy "tenants" key until the placement controller
+// relabels it) instead of blocking creation.
+//
+// UPDATE does not need interception: the only full-object writer of tenant
+// HelmReleases is the cozystack-api Update handler, which carries the live
+// shard label over (pkg/registry/apps/application/rest.go); helm-controller
+// itself applies child HelmReleases with server-side apply, which leaves
+// labels owned by other field managers untouched.
+type ShardWebhook struct {
+	// Reader resolves tenant namespaces; backed by the manager's metadata
+	// cache, so lookups are in-memory.
+	Reader client.Reader
+}
+
+// SetupWithManager registers the admission handler on the webhook server of
+// every replica (webhooks are not leader-gated).
+func (h *ShardWebhook) SetupWithManager(mgr ctrl.Manager) error {
+	mgr.GetWebhookServer().Register(WebhookPath, &admission.Webhook{Handler: h})
+	return nil
+}
+
+// Handle stamps the recorded shard assignment onto a newly created
+// HelmRelease. Every miss is permissive: correctness is restored by the
+// placement controller, the webhook only removes the handoff gap.
+func (h *ShardWebhook) Handle(ctx context.Context, req admission.Request) admission.Response {
+	if req.Operation != admissionv1.Create {
+		return admission.Allowed("only CREATE is mutated")
+	}
+
+	obj := &metav1.PartialObjectMetadata{}
+	if err := json.Unmarshal(req.Object.Raw, obj); err != nil {
+		return admission.Errored(http.StatusBadRequest, fmt.Errorf("decoding object metadata: %w", err))
+	}
+	// Admission objects may omit metadata.namespace before defaulting.
+	if obj.Namespace == "" {
+		obj.Namespace = req.Namespace
+	}
+
+	tenantNS, ok := TenantNamespaceForHR(obj)
+	if !ok {
+		return admission.Allowed("not a tenant HelmRelease")
+	}
+
+	ns := NamespaceMeta()
+	if err := h.Reader.Get(ctx, types.NamespacedName{Name: tenantNS}, ns); err != nil {
+		if apierrors.IsNotFound(err) {
+			// Rare: the tenant namespace is not created yet (e.g. the parent
+			// tenant HelmRelease arrives before its chart renders the
+			// namespace). The placement controller assigns on first sight.
+			return admission.Allowed("tenant namespace not found, deferring to the placement controller")
+		}
+		log.FromContext(ctx).Error(err, "resolving tenant namespace", "tenant", tenantNS)
+		return admission.Allowed("tenant namespace lookup failed, deferring to the placement controller")
+	}
+
+	shard := ns.Labels[TenantShardLabel]
+	if _, ok := ParseShardIndex(shard); !ok {
+		return admission.Allowed("tenant has no recorded shard assignment yet")
+	}
+
+	if obj.Labels[ShardKeyLabel] == shard {
+		return admission.Allowed("already on the assigned shard")
+	}
+
+	// JSON Patch "add" both creates and overwrites object members.
+	var op jsonpatch.JsonPatchOperation
+	if obj.Labels == nil {
+		op = jsonpatch.NewOperation("add", "/metadata/labels", map[string]string{ShardKeyLabel: shard})
+	} else {
+		op = jsonpatch.NewOperation("add", "/metadata/labels/"+escapeJSONPointer(ShardKeyLabel), shard)
+	}
+	return admission.Patched("stamped shard "+shard+" for tenant "+tenantNS, op)
+}
+
+// escapeJSONPointer escapes a JSON pointer path segment (RFC 6901).
+func escapeJSONPointer(s string) string {
+	return strings.NewReplacer("~", "~0", "/", "~1").Replace(s)
+}
diff --git a/internal/fluxshardoperator/webhook_test.go b/internal/fluxshardoperator/webhook_test.go
new file mode 100644
index 0000000000..95d0867698
--- /dev/null
+++ b/internal/fluxshardoperator/webhook_test.go
@@ -0,0 +1,133 @@
+package fluxshardoperator
+
+import (
+	"context"
+	"encoding/json"
+	"testing"
+
+	admissionv1 "k8s.io/api/admission/v1"
+	corev1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
+	"sigs.k8s.io/controller-runtime/pkg/client/fake"
+	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
+)
+
+func webhookWithNamespaces(t *testing.T, namespaces ...*corev1.Namespace) *ShardWebhook {
+	t.Helper()
+	scheme := runtime.NewScheme()
+	if err := clientgoscheme.AddToScheme(scheme); err != nil {
+		t.Fatal(err)
+	}
+	builder := fake.NewClientBuilder().WithScheme(scheme)
+	for _, ns := range namespaces {
+		builder = builder.WithObjects(ns)
+	}
+	return &ShardWebhook{Reader: builder.Build()}
+}
+
+func createRequest(t *testing.T, namespace, name string, labels map[string]string) admission.Request {
+	t.Helper()
+	raw, err := json.Marshal(map[string]any{
+		"apiVersion": "helm.toolkit.fluxcd.io/v2",
+		"kind":       "HelmRelease",
+		"metadata": map[string]any{
+			"namespace": namespace,
+			"name":      name,
+			"labels":    labels,
+		},
+		"spec": map[string]any{"interval": "5m"},
+	})
+	if err != nil {
+		t.Fatal(err)
+	}
+	return admission.Request{
+		AdmissionRequest: admissionv1.AdmissionRequest{
+			Operation: admissionv1.Create,
+			Namespace: namespace,
+			Object:    runtime.RawExtension{Raw: raw},
+		},
+	}
+}
+
+func nsWithShard(name, shard string) *corev1.Namespace {
+	ns := &corev1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: name}}
+	if shard != "" {
+		ns.Labels = map[string]string{TenantShardLabel: shard}
+	}
+	return ns
+}
+
+func TestShardWebhookStampsAssignedShard(t *testing.T) {
+	h := webhookWithNamespaces(t, nsWithShard("tenant-foo", "shard1"))
+	resp := h.Handle(context.Background(),
+		createRequest(t, "tenant-foo", "postgres-db1", map[string]string{ShardKeyLabel: LegacyShardKey}))
+	if !resp.Allowed {
+		t.Fatalf("response not allowed: %v", resp)
+	}
+	if len(resp.Patches) != 1 {
+		t.Fatalf("expected exactly one patch, got %v", resp.Patches)
+	}
+	p := resp.Patches[0]
+	if p.Operation != "add" || p.Path != "/metadata/labels/sharding.fluxcd.io~1key" || p.Value != "shard1" {
+		t.Fatalf("unexpected patch: %+v", p)
+	}
+}
+
+func TestShardWebhookParentTenantHR(t *testing.T) {
+	// The parent HR of nested tenant "bar" under "tenant-foo" must be stamped
+	// with tenant-foo-bar's shard, not tenant-foo's.
+	h := webhookWithNamespaces(t,
+		nsWithShard("tenant-foo", "shard0"),
+		nsWithShard("tenant-foo-bar", "shard2"),
+	)
+	resp := h.Handle(context.Background(), createRequest(t, "tenant-foo", "tenant-bar", map[string]string{
+		ShardKeyLabel:        LegacyShardKey,
+		ApplicationKindLabel: TenantKind,
+	}))
+	if len(resp.Patches) != 1 || resp.Patches[0].Value != "shard2" {
+		t.Fatalf("expected stamp of the nested tenant's shard2: %+v", resp.Patches)
+	}
+}
+
+func TestShardWebhookMisses(t *testing.T) {
+	h := webhookWithNamespaces(t,
+		nsWithShard("tenant-unassigned", ""),
+		nsWithShard("tenant-bogus", "tenants"),
+	)
+	cases := []struct {
+		desc string
+		req  admission.Request
+	}{
+		{"namespace not found", createRequest(t, "tenant-ghost", "app", map[string]string{ShardKeyLabel: LegacyShardKey})},
+		{"no assignment recorded", createRequest(t, "tenant-unassigned", "app", map[string]string{ShardKeyLabel: LegacyShardKey})},
+		{"non-canonical assignment ignored", createRequest(t, "tenant-bogus", "app", map[string]string{ShardKeyLabel: LegacyShardKey})},
+		{"non-tenant namespace", createRequest(t, "cozy-system", "app", map[string]string{ShardKeyLabel: LegacyShardKey})},
+	}
+	for _, c := range cases {
+		resp := h.Handle(context.Background(), c.req)
+		if !resp.Allowed || len(resp.Patches) != 0 {
+			t.Errorf("%s: expected permissive no-op, got allowed=%v patches=%v", c.desc, resp.Allowed, resp.Patches)
+		}
+	}
+}
+
+func TestShardWebhookIgnoresNonCreate(t *testing.T) {
+	h := webhookWithNamespaces(t, nsWithShard("tenant-foo", "shard1"))
+	req := createRequest(t, "tenant-foo", "app", map[string]string{ShardKeyLabel: LegacyShardKey})
+	req.Operation = admissionv1.Update
+	resp := h.Handle(context.Background(), req)
+	if !resp.Allowed || len(resp.Patches) != 0 {
+		t.Fatalf("UPDATE must never be mutated: %v", resp)
+	}
+}
+
+func TestShardWebhookAlreadyCorrect(t *testing.T) {
+	h := webhookWithNamespaces(t, nsWithShard("tenant-foo", "shard1"))
+	resp := h.Handle(context.Background(),
+		createRequest(t, "tenant-foo", "app", map[string]string{ShardKeyLabel: "shard1"}))
+	if !resp.Allowed || len(resp.Patches) != 0 {
+		t.Fatalf("correctly labeled HR must pass untouched: %v", resp)
+	}
+}
diff --git a/internal/lineagecontrollerwebhook/appdef_validator.go b/internal/lineagecontrollerwebhook/appdef_validator.go
new file mode 100644
index 0000000000..6cb9d0c7d8
--- /dev/null
+++ b/internal/lineagecontrollerwebhook/appdef_validator.go
@@ -0,0 +1,94 @@
+package lineagecontrollerwebhook
+
+import (
+	"context"
+	"fmt"
+	"net/http"
+
+	admissionv1 "k8s.io/api/admission/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
+
+	cozyv1alpha1 "github.com/cozystack/cozystack/api/v1alpha1"
+	"github.com/cozystack/cozystack/internal/shared/appdefowner"
+)
+
+// ApplicationDefinitionKindValidatorPath is where the kind-uniqueness check is
+// served; the chart's ValidatingWebhookConfiguration points at it.
+const ApplicationDefinitionKindValidatorPath = "/validate-applicationdefinition"
+
+// ApplicationDefinitionKindValidator refuses an ApplicationDefinition that
+// declares an application kind another definition already declares, so a
+// second definition for a kind fails loudly when it is applied instead of
+// sitting next to the first one. It is the feedback layer, not the guarantee:
+// the webhook is registered with failurePolicy Ignore, so an outage of the
+// webhook never blocks a platform install or upgrade, and appdefowner decides
+// which definition manages a kind whatever reaches the cluster.
+type ApplicationDefinitionKindValidator struct {
+	reader  client.Reader
+	decoder admission.Decoder
+}
+
+// NewApplicationDefinitionKindValidator builds the validator over reader,
+// normally the manager's cached client.
+func NewApplicationDefinitionKindValidator(reader client.Reader, scheme *runtime.Scheme) *ApplicationDefinitionKindValidator {
+	return &ApplicationDefinitionKindValidator{reader: reader, decoder: admission.NewDecoder(scheme)}
+}
+
+// Handle implements admission.Handler.
+func (v *ApplicationDefinitionKindValidator) Handle(ctx context.Context, req admission.Request) admission.Response {
+	def := &cozyv1alpha1.ApplicationDefinition{}
+	if err := v.decoder.DecodeRaw(req.Object, def); err != nil {
+		return admission.Errored(http.StatusBadRequest, err)
+	}
+	kind := def.Spec.Application.Kind
+	if req.Operation == admissionv1.Update {
+		old := &cozyv1alpha1.ApplicationDefinition{}
+		if err := v.decoder.DecodeRaw(req.OldObject, old); err != nil {
+			return admission.Errored(http.StatusBadRequest, err)
+		}
+		// A definition that keeps its kind is not claiming anything new. This
+		// also lets a duplicate that predates the check keep upgrading.
+		if old.Spec.Application.Kind == kind {
+			return admission.Allowed("")
+		}
+	}
+	defs := &cozyv1alpha1.ApplicationDefinitionList{}
+	if err := v.reader.List(ctx, defs); err != nil {
+		// An error answer is a verdict that refuses the request, and
+		// failurePolicy Ignore only covers a webhook that does not answer. The
+		// check is feedback, not the guarantee, so let the request through and
+		// say so.
+		return admission.Allowed("").WithWarnings(fmt.Sprintf("application kind uniqueness was not checked: list ApplicationDefinitions: %v", err))
+	}
+	if kind == "" || !claimedByOther(defs.Items, def) {
+		return admission.Allowed("")
+	}
+	return admission.Denied(fmt.Sprintf("application kind %s is already owned by ApplicationDefinition %s; delete that definition first to hand the kind over, or declare a different kind", kind, appdefowner.Owners(defs.Items)[kind]))
+}
+
+// claimedByOther reports whether a definition other than def declares def's
+// kind. A definition from the same Helm release does not count: a release that
+// renames its definition object creates the new one before it deletes the old
+// one, and refusing that would fail the upgrade carrying the rename.
+func claimedByOther(defs []cozyv1alpha1.ApplicationDefinition, def *cozyv1alpha1.ApplicationDefinition) bool {
+	for i := range defs {
+		other := &defs[i]
+		if other.Name == def.Name || other.Spec.Application.Kind != def.Spec.Application.Kind {
+			continue
+		}
+		if sameHelmRelease(other, def) {
+			continue
+		}
+		return true
+	}
+	return false
+}
+
+func sameHelmRelease(a, b *cozyv1alpha1.ApplicationDefinition) bool {
+	const name, namespace = "meta.helm.sh/release-name", "meta.helm.sh/release-namespace"
+	an := a.GetAnnotations()[name]
+	return an != "" && an == b.GetAnnotations()[name] &&
+		a.GetAnnotations()[namespace] == b.GetAnnotations()[namespace]
+}
diff --git a/internal/lineagecontrollerwebhook/appdef_validator_test.go b/internal/lineagecontrollerwebhook/appdef_validator_test.go
new file mode 100644
index 0000000000..bbb49eceff
--- /dev/null
+++ b/internal/lineagecontrollerwebhook/appdef_validator_test.go
@@ -0,0 +1,124 @@
+package lineagecontrollerwebhook
+
+import (
+	"context"
+	"encoding/json"
+	"strings"
+	"testing"
+
+	admissionv1 "k8s.io/api/admission/v1"
+	"k8s.io/apimachinery/pkg/api/errors"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/client/fake"
+	"sigs.k8s.io/controller-runtime/pkg/client/interceptor"
+	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
+
+	cozyv1alpha1 "github.com/cozystack/cozystack/api/v1alpha1"
+)
+
+func appDef(name, kind string) *cozyv1alpha1.ApplicationDefinition {
+	d := &cozyv1alpha1.ApplicationDefinition{
+		TypeMeta:   metav1.TypeMeta{APIVersion: "cozystack.io/v1alpha1", Kind: "ApplicationDefinition"},
+		ObjectMeta: metav1.ObjectMeta{Name: name},
+	}
+	d.Spec.Application.Kind = kind
+	return d
+}
+
+func admissionReq(t *testing.T, op admissionv1.Operation, obj, old *cozyv1alpha1.ApplicationDefinition) admission.Request {
+	t.Helper()
+	raw, err := json.Marshal(obj)
+	if err != nil {
+		t.Fatal(err)
+	}
+	req := admission.Request{AdmissionRequest: admissionv1.AdmissionRequest{Operation: op, Name: obj.Name, Object: runtime.RawExtension{Raw: raw}}}
+	if old != nil {
+		oldRaw, err := json.Marshal(old)
+		if err != nil {
+			t.Fatal(err)
+		}
+		req.OldObject = runtime.RawExtension{Raw: oldRaw}
+	}
+	return req
+}
+
+func TestAppDefKindValidator(t *testing.T) {
+	scheme := newWebhookScheme(t)
+	existing := appDef("redis", "Redis")
+	cl := fake.NewClientBuilder().WithScheme(scheme).WithObjects(existing, appDef("shadow", "Redis")).Build()
+	v := NewApplicationDefinitionKindValidator(cl, scheme)
+
+	cases := []struct {
+		name    string
+		req     admission.Request
+		allowed bool
+	}{
+		{"create with a kind another definition owns is refused", admissionReq(t, admissionv1.Create, appDef("tap-redis", "Redis"), nil), false},
+		{"create with a free kind is allowed", admissionReq(t, admissionv1.Create, appDef("pg", "Postgres"), nil), true},
+		{"update of the owner itself is allowed", admissionReq(t, admissionv1.Update, appDef("redis", "Redis"), appDef("redis", "Redis")), true},
+		// A duplicate that predates the check keeps upgrading; ownership, not
+		// admission, keeps it from managing the kind's releases.
+		{"update of a pre-existing duplicate that keeps its kind is allowed", admissionReq(t, admissionv1.Update, appDef("shadow", "Redis"), appDef("shadow", "Redis")), true},
+		{"update switching to a claimed kind is refused", admissionReq(t, admissionv1.Update, appDef("pg", "Redis"), appDef("pg", "Postgres")), false},
+	}
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			resp := v.Handle(context.TODO(), tc.req)
+			if resp.Allowed != tc.allowed {
+				t.Fatalf("allowed = %v, want %v (%v)", resp.Allowed, tc.allowed, resp.Result)
+			}
+		})
+	}
+}
+
+func helmOwned(d *cozyv1alpha1.ApplicationDefinition, release string) *cozyv1alpha1.ApplicationDefinition {
+	d.Annotations = map[string]string{"meta.helm.sh/release-name": release, "meta.helm.sh/release-namespace": "cozy-system"}
+	return d
+}
+
+// A Helm release that renames its definition object creates the new one before
+// it deletes the old one, so both briefly declare the kind. Refusing that would
+// fail the platform upgrade that carries the rename.
+func TestAppDefKindValidatorAllowsRenameWithinOneHelmRelease(t *testing.T) {
+	scheme := newWebhookScheme(t)
+	cl := fake.NewClientBuilder().WithScheme(scheme).WithObjects(helmOwned(appDef("redis", "Redis"), "redis-rd")).Build()
+	v := NewApplicationDefinitionKindValidator(cl, scheme)
+
+	if resp := v.Handle(context.TODO(), admissionReq(t, admissionv1.Create, helmOwned(appDef("redis-v2", "Redis"), "redis-rd"), nil)); !resp.Allowed {
+		t.Fatalf("rename within one Helm release refused: %v", resp.Result)
+	}
+	resp := v.Handle(context.TODO(), admissionReq(t, admissionv1.Create, helmOwned(appDef("tap-redis", "Redis"), "tap-redis-rd"), nil))
+	if resp.Allowed {
+		t.Fatal("a definition from another Helm release must still be refused")
+	}
+	otherNS := helmOwned(appDef("redis-elsewhere", "Redis"), "redis-rd")
+	otherNS.Annotations["meta.helm.sh/release-namespace"] = "tenant-foo"
+	if resp := v.Handle(context.TODO(), admissionReq(t, admissionv1.Create, otherNS, nil)); resp.Allowed {
+		t.Fatal("a release of the same name in another namespace is a different release and must be refused")
+	}
+	if !strings.Contains(resp.Result.Message, "redis") {
+		t.Fatalf("the refusal must name the definition that declares the kind, got %q", resp.Result.Message)
+	}
+}
+
+// The check is feedback, not the guarantee, so failing to read the existing
+// definitions must let the request through rather than refuse it: a 500 answer
+// is a verdict, which failurePolicy Ignore does not cover.
+func TestAppDefKindValidatorFailsOpenOnListError(t *testing.T) {
+	scheme := newWebhookScheme(t)
+	cl := interceptor.NewClient(fake.NewClientBuilder().WithScheme(scheme).Build(), interceptor.Funcs{
+		List: func(context.Context, client.WithWatch, client.ObjectList, ...client.ListOption) error {
+			return errors.NewServiceUnavailable("cache not started")
+		},
+	})
+	v := NewApplicationDefinitionKindValidator(cl, scheme)
+	resp := v.Handle(context.TODO(), admissionReq(t, admissionv1.Create, appDef("tap-redis", "Redis"), nil))
+	if !resp.Allowed {
+		t.Fatalf("a failed read must not refuse the request: %v", resp.Result)
+	}
+	if len(resp.Warnings) == 0 {
+		t.Fatal("letting a request through unchecked must say so in a warning")
+	}
+}
diff --git a/internal/lineagecontrollerwebhook/controller.go b/internal/lineagecontrollerwebhook/controller.go
index 42bdb39644..69d6c17403 100644
--- a/internal/lineagecontrollerwebhook/controller.go
+++ b/internal/lineagecontrollerwebhook/controller.go
@@ -4,6 +4,7 @@ import (
 	"context"
 
 	cozyv1alpha1 "github.com/cozystack/cozystack/api/v1alpha1"
+	"github.com/cozystack/cozystack/internal/shared/appdefowner"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 )
@@ -26,18 +27,22 @@ func (c *LineageControllerWebhook) Reconcile(ctx context.Context, req ctrl.Reque
 	cfg := &runtimeConfig{
 		appCRDMap: make(map[appRef]*cozyv1alpha1.ApplicationDefinition),
 	}
+	owners := appdefowner.Owners(crds.Items)
 	for _, crd := range crds.Items {
 		appRef := appRef{
 			"apps.cozystack.io",
 			crd.Spec.Application.Kind,
 		}
 
-		newRef := crd
-		if _, exists := cfg.appCRDMap[appRef]; exists {
-			l.Info("duplicate app mapping detected; ignoring subsequent entry", "key", appRef)
-		} else {
-			cfg.appCRDMap[appRef] = &newRef
+		if crd.Spec.Application.Kind == "" {
+			continue
+		}
+		if owners[crd.Spec.Application.Kind] != crd.Name {
+			l.Info("duplicate app mapping detected; the kind is owned by another definition", "key", appRef, "ignored", crd.Name, "owner", owners[crd.Spec.Application.Kind])
+			continue
 		}
+		newRef := crd
+		cfg.appCRDMap[appRef] = &newRef
 	}
 	c.config.Store(cfg)
 	return ctrl.Result{}, nil
diff --git a/internal/lineagecontrollerwebhook/controller_test.go b/internal/lineagecontrollerwebhook/controller_test.go
index f3224e5549..cd44b061a7 100644
--- a/internal/lineagecontrollerwebhook/controller_test.go
+++ b/internal/lineagecontrollerwebhook/controller_test.go
@@ -3,6 +3,7 @@ package lineagecontrollerwebhook
 import (
 	"context"
 	"testing"
+	"time"
 
 	cozyv1alpha1 "github.com/cozystack/cozystack/api/v1alpha1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -87,38 +88,43 @@ func TestReconcile_BuildsAppCRDMapByKind(t *testing.T) {
 	}
 }
 
-// TestReconcile_DuplicateKindKeepsFirst pins the duplicate handling:
-// when two ApplicationDefinitions have the same Application.Kind, the
-// reconciler keeps the first one and logs about the duplicate. (Order
-// is whatever the API returns; the test just asserts uniqueness.)
-func TestReconcile_DuplicateKindKeepsFirst(t *testing.T) {
+// TestReconcile_DuplicateKindKeepsOwner pins the duplicate handling: when two
+// ApplicationDefinitions declare the same Application.Kind, the lineage map
+// keeps the owner under the shared rule (created first, then by name), the same
+// definition cozystack-api and the chartRef reconciler treat as the owner. The
+// newcomer is tried on both sides of the owner by name, so neither a first-wins
+// nor a last-wins walk of the list can pass.
+func TestReconcile_DuplicateKindKeepsOwner(t *testing.T) {
 	scheme := newWebhookScheme(t)
-
-	first := &cozyv1alpha1.ApplicationDefinition{
-		ObjectMeta: metav1.ObjectMeta{Name: "harbor"},
-		Spec: cozyv1alpha1.ApplicationDefinitionSpec{
-			Application: cozyv1alpha1.ApplicationDefinitionApplication{Kind: "Harbor"},
-		},
-	}
-	dup := &cozyv1alpha1.ApplicationDefinition{
-		ObjectMeta: metav1.ObjectMeta{Name: "harbor-shadow"},
-		Spec: cozyv1alpha1.ApplicationDefinitionSpec{
-			Application: cozyv1alpha1.ApplicationDefinitionApplication{Kind: "Harbor"},
-		},
-	}
-
-	fakeClient := fake.NewClientBuilder().
-		WithScheme(scheme).
-		WithObjects(first, dup).
-		Build()
-
-	w := &LineageControllerWebhook{Client: fakeClient, Scheme: scheme}
-	if _, err := w.Reconcile(context.TODO(), ctrl.Request{}); err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	cfg := w.config.Load().(*runtimeConfig)
-	if len(cfg.appCRDMap) != 1 {
-		t.Fatalf("expected exactly one Harbor entry (duplicate dropped), got %d", len(cfg.appCRDMap))
+	base := time.Date(2026, 1, 1, 0, 0, 0, 0, time.UTC)
+
+	for _, newcomerName := range []string{"a-harbor-shadow", "z-harbor-shadow"} {
+		t.Run(newcomerName, func(t *testing.T) {
+			owner := &cozyv1alpha1.ApplicationDefinition{
+				ObjectMeta: metav1.ObjectMeta{Name: "harbor", CreationTimestamp: metav1.NewTime(base)},
+				Spec: cozyv1alpha1.ApplicationDefinitionSpec{
+					Application: cozyv1alpha1.ApplicationDefinitionApplication{Kind: "Harbor"},
+				},
+			}
+			newcomer := &cozyv1alpha1.ApplicationDefinition{
+				ObjectMeta: metav1.ObjectMeta{Name: newcomerName, CreationTimestamp: metav1.NewTime(base.Add(time.Hour))},
+				Spec: cozyv1alpha1.ApplicationDefinitionSpec{
+					Application: cozyv1alpha1.ApplicationDefinitionApplication{Kind: "Harbor"},
+				},
+			}
+			fakeClient := fake.NewClientBuilder().WithScheme(scheme).WithObjects(owner, newcomer).Build()
+
+			w := &LineageControllerWebhook{Client: fakeClient, Scheme: scheme}
+			if _, err := w.Reconcile(context.TODO(), ctrl.Request{}); err != nil {
+				t.Fatalf("unexpected error: %v", err)
+			}
+			cfg := w.config.Load().(*runtimeConfig)
+			if len(cfg.appCRDMap) != 1 {
+				t.Fatalf("expected exactly one Harbor entry (duplicate dropped), got %d", len(cfg.appCRDMap))
+			}
+			if got := cfg.appCRDMap[appRef{"apps.cozystack.io", "Harbor"}]; got == nil || got.Name != "harbor" {
+				t.Fatalf("expected the owner harbor, got %+v", got)
+			}
+		})
 	}
 }
diff --git a/internal/lineagecontrollerwebhook/types.go b/internal/lineagecontrollerwebhook/types.go
index f423ae95be..7455178eb5 100644
--- a/internal/lineagecontrollerwebhook/types.go
+++ b/internal/lineagecontrollerwebhook/types.go
@@ -3,7 +3,9 @@ package lineagecontrollerwebhook
 import (
 	"sync"
 	"sync/atomic"
+	"time"
 
+	"github.com/cozystack/cozystack/pkg/lineage"
 	"k8s.io/apimachinery/pkg/api/meta"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/dynamic"
@@ -11,13 +13,20 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 )
 
+// ownerCacheTTL is how long an owner object is reused across admissions. The
+// lineage labels depend only on owner kinds and names, but the scheduling class
+// is read from the application's spec, so a change to it reaches new Pods up to
+// this long after it is made.
+const ownerCacheTTL = 60 * time.Second
+
 // +kubebuilder:webhook:path=/mutate-lineage,mutating=true,failurePolicy=Fail,sideEffects=None,groups="",resources=pods,secrets,services,persistentvolumeclaims,verbs=create;update,versions=v1,name=mlineage.cozystack.io,admissionReviewVersions={v1}
 type LineageControllerWebhook struct {
 	client.Client
-	Scheme    *runtime.Scheme
-	decoder   admission.Decoder
-	dynClient dynamic.Interface
-	mapper    meta.RESTMapper
-	config    atomic.Value
-	initOnce  sync.Once
+	Scheme     *runtime.Scheme
+	decoder    admission.Decoder
+	dynClient  dynamic.Interface
+	mapper     meta.RESTMapper
+	config     atomic.Value
+	initOnce   sync.Once
+	ownerCache *lineage.ObjectCache
 }
diff --git a/internal/lineagecontrollerwebhook/webhook.go b/internal/lineagecontrollerwebhook/webhook.go
index cf871fb046..ea8b0d01ba 100644
--- a/internal/lineagecontrollerwebhook/webhook.go
+++ b/internal/lineagecontrollerwebhook/webhook.go
@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"maps"
 	"strings"
 
 	"github.com/cozystack/cozystack/pkg/lineage"
@@ -13,6 +14,7 @@ import (
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
+	utiljson "k8s.io/apimachinery/pkg/util/json"
 	"k8s.io/client-go/dynamic"
 	"k8s.io/client-go/rest"
 	ctrl "sigs.k8s.io/controller-runtime"
@@ -21,10 +23,10 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 
+	schedulerapi "github.com/cozystack/cozystack-scheduler/pkg/apis/v1alpha1"
 	cozyv1alpha1 "github.com/cozystack/cozystack/api/v1alpha1"
 	appsv1alpha1 "github.com/cozystack/cozystack/pkg/apis/apps/v1alpha1"
 	corev1alpha1 "github.com/cozystack/cozystack/pkg/apis/core/v1alpha1"
-	schedulerapi "github.com/cozystack/cozystack-scheduler/pkg/apis/v1alpha1"
 )
 
 var (
@@ -73,6 +75,8 @@ func (h *LineageControllerWebhook) SetupWithManagerAsWebhook(mgr ctrl.Manager) e
 		return err
 	}
 
+	h.ownerCache = lineage.NewObjectCache(ownerCacheTTL)
+
 	h.initConfig()
 	// Register HTTP path -> handler.
 	mgr.GetWebhookServer().Register("/mutate-lineage", &admission.Webhook{Handler: h})
@@ -101,6 +105,14 @@ func (h *LineageControllerWebhook) Handle(ctx context.Context, req admission.Req
 		return admission.Errored(400, fmt.Errorf("decode object: %w", err))
 	}
 
+	// The objectSelector skips objects carrying the managed label, but on UPDATE
+	// it matches if either the old or the new object does. Pods go on, since
+	// every Pod admission also needs applySchedulingClass.
+	if obj.GetKind() != "Pod" && hasAllLineageLabels(obj) {
+		logger.V(1).Info("object already carries lineage labels, skipping owner walk")
+		return admission.Allowed("lineage labels already present")
+	}
+
 	owner, err := h.getOwner(ctx, obj)
 	switch {
 	case err != nil && errors.Is(err, AncestryAmbiguous):
@@ -133,11 +145,11 @@ func (h *LineageControllerWebhook) Handle(ctx context.Context, req admission.Req
 }
 
 func (h *LineageControllerWebhook) getOwner(ctx context.Context, o *unstructured.Unstructured) (*unstructured.Unstructured, error) {
-	owners := lineage.WalkOwnershipGraph(ctx, h.dynClient, h.mapper, h, o)
+	owners := lineage.WalkOwnershipGraphWithCache(ctx, h.dynClient, h.mapper, h, h.ownerCache, o)
 	if len(owners) == 0 {
 		return nil, NoAncestors
 	}
-	obj, err := owners[0].GetUnstructured(ctx, h.dynClient, h.mapper)
+	obj, err := owners[0].GetUnstructuredCached(ctx, h.dynClient, h.mapper, h.ownerCache)
 	if err != nil {
 		return nil, err
 	}
@@ -195,14 +207,37 @@ func (h *LineageControllerWebhook) applyLabels(o *unstructured.Unstructured, lab
 	if existing == nil {
 		existing = make(map[string]string)
 	}
-	for k, v := range labels {
-		existing[k] = v
-	}
+	maps.Copy(existing, labels)
 	o.SetLabels(existing)
 }
 
-// applySchedulingClass injects schedulerName and scheduling-class annotation
-// into Pods whose namespace carries the scheduler.cozystack.io/scheduling-class label.
+// hasAllLineageLabels needs every key computeLabels writes, not just
+// ManagedObjectKey: an UPDATE can carry a partial set written by another client,
+// and the tenantsecret registry filters on TenantResourceLabelKey.
+func hasAllLineageLabels(o *unstructured.Unstructured) bool {
+	labels := o.GetLabels()
+	if labels == nil {
+		return false
+	}
+	if labels[ManagedObjectKey] != "true" {
+		return false
+	}
+	for _, k := range []string{ManagerGroupKey, ManagerKindKey, ManagerNameKey, corev1alpha1.TenantResourceLabelKey} {
+		if _, ok := labels[k]; !ok {
+			return false
+		}
+	}
+	return true
+}
+
+// applySchedulingClass injects schedulerName, scheduling-class annotation, and
+// scheduling-class label into Pods whose namespace carries the
+// scheduler.cozystack.io/scheduling-class label.
+//
+// The label (in addition to the annotation) lets SchedulingClass authors write
+// podAffinity rules whose labelSelector matches pods across applications that
+// share the same class.
+//
 // If the referenced SchedulingClass CR does not exist (e.g. the scheduler
 // package is not installed), the injection is silently skipped so that pods
 // are not left Pending.
@@ -254,6 +289,13 @@ func (h *LineageControllerWebhook) applySchedulingClass(ctx context.Context, obj
 	annotations[schedulerapi.SchedulingClassAnnotation] = schedulingClass
 	obj.SetAnnotations(annotations)
 
+	podLabels := obj.GetLabels()
+	if podLabels == nil {
+		podLabels = make(map[string]string)
+	}
+	podLabels[schedulerapi.SchedulingClassLabel] = schedulingClass
+	obj.SetLabels(podLabels)
+
 	return nil
 }
 
@@ -282,5 +324,7 @@ func (h *LineageControllerWebhook) decodeUnstructured(req admission.Request, out
 	if len(req.Object.Raw) == 0 {
 		return errors.New("empty admission object")
 	}
-	return json.Unmarshal(req.Object.Raw, &out.Object)
+	// encoding/json would turn every number into float64, and an int64 above
+	// 2^53 would come back altered in the patch computed against req.Object.Raw.
+	return utiljson.Unmarshal(req.Object.Raw, &out.Object)
 }
diff --git a/internal/lineagecontrollerwebhook/webhook_test.go b/internal/lineagecontrollerwebhook/webhook_test.go
new file mode 100644
index 0000000000..d0d0fb791b
--- /dev/null
+++ b/internal/lineagecontrollerwebhook/webhook_test.go
@@ -0,0 +1,462 @@
+package lineagecontrollerwebhook
+
+import (
+	"context"
+	"encoding/json"
+	"sort"
+	"strings"
+	"testing"
+
+	schedulerapi "github.com/cozystack/cozystack-scheduler/pkg/apis/v1alpha1"
+	cozyv1alpha1 "github.com/cozystack/cozystack/api/v1alpha1"
+	corev1alpha1 "github.com/cozystack/cozystack/pkg/apis/core/v1alpha1"
+	admissionv1 "k8s.io/api/admission/v1"
+	corev1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/api/meta"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	dynamicfake "k8s.io/client-go/dynamic/fake"
+	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
+	"sigs.k8s.io/controller-runtime/pkg/client/fake"
+	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
+)
+
+const podWithNumericFields = `{
+  "apiVersion": "v1",
+  "kind": "Pod",
+  "metadata": {
+    "name": "harbor-demo-core-0",
+    "namespace": "tenant-demo",
+    "labels": {"helm.toolkit.fluxcd.io/name": "harbor-demo"},
+    "annotations": {"existing": "kept"}
+  },
+  "spec": {
+    "terminationGracePeriodSeconds": 30,
+    "activeDeadlineSeconds": 9007199254740993,
+    "containers": [{
+      "name": "core",
+      "image": "goharbor/harbor-core:v2.11.0",
+      "ports": [{"containerPort": 8080, "protocol": "TCP"}],
+      "resources": {
+        "limits": {"cpu": "500m", "memory": "512Mi"},
+        "requests": {"cpu": "0.1", "memory": "128Mi"}
+      }
+    }]
+  }
+}`
+
+func newHandleTestWebhook(t *testing.T) *LineageControllerWebhook {
+	t.Helper()
+	scheme := newWebhookScheme(t)
+	if err := clientgoscheme.AddToScheme(scheme); err != nil {
+		t.Fatalf("add client-go scheme: %v", err)
+	}
+	ns := &corev1.Namespace{ObjectMeta: metav1.ObjectMeta{
+		Name:   "tenant-demo",
+		Labels: map[string]string{schedulerapi.SchedulingClassLabel: "gpu"},
+	}}
+
+	hrGVK := schema.GroupVersionKind{Group: "helm.toolkit.fluxcd.io", Version: "v2", Kind: "HelmRelease"}
+	appGVK := schema.GroupVersionKind{Group: "apps.cozystack.io", Version: "v1alpha1", Kind: "Harbor"}
+	scGVK := schema.GroupVersionKind{Group: schedulerapi.Group, Version: schedulerapi.Version, Kind: "SchedulingClass"}
+	mapper := meta.NewDefaultRESTMapper(nil)
+	mapper.Add(hrGVK, meta.RESTScopeNamespace)
+	mapper.Add(appGVK, meta.RESTScopeNamespace)
+
+	obj := func(gvk schema.GroupVersionKind, namespace, name string, labels map[string]string) *unstructured.Unstructured {
+		u := &unstructured.Unstructured{}
+		u.SetGroupVersionKind(gvk)
+		u.SetNamespace(namespace)
+		u.SetName(name)
+		u.SetLabels(labels)
+		return u
+	}
+	dyn := dynamicfake.NewSimpleDynamicClient(runtime.NewScheme(),
+		obj(hrGVK, "tenant-demo", "harbor-demo", map[string]string{
+			ManagerKindKey:  "Harbor",
+			ManagerGroupKey: "apps.cozystack.io",
+			ManagerNameKey:  "demo",
+		}),
+		obj(appGVK, "tenant-demo", "demo", nil),
+		obj(scGVK, "", "gpu", nil),
+	)
+
+	w := &LineageControllerWebhook{
+		Client:    fake.NewClientBuilder().WithScheme(scheme).WithObjects(ns).Build(),
+		Scheme:    scheme,
+		dynClient: dyn,
+		mapper:    mapper,
+	}
+	w.initConfig()
+	return w
+}
+
+// TestHandle_PatchTouchesOnlyLineageAndScheduling pins that the JSON
+// patch computed from the re-marshalled Pod contains the lineage labels
+// and scheduler fields and nothing else: numbers the webhook never
+// touched, including an int64 beyond float64 precision, must not show
+// up as replace operations.
+func TestHandle_PatchTouchesOnlyLineageAndScheduling(t *testing.T) {
+	w := newHandleTestWebhook(t)
+
+	resp := w.Handle(context.Background(), admission.Request{AdmissionRequest: admissionv1.AdmissionRequest{
+		Kind:      metav1.GroupVersionKind{Version: "v1", Kind: "Pod"},
+		Namespace: "tenant-demo",
+		Name:      "harbor-demo-core-0",
+		Operation: admissionv1.Create,
+		Object:    runtime.RawExtension{Raw: []byte(podWithNumericFields)},
+	}})
+
+	if !resp.Allowed {
+		t.Fatalf("expected allowed response, got %+v", resp.Result)
+	}
+
+	want := map[string]any{
+		"add /metadata/labels/internal.cozystack.io~1managed-by-cozystack":   "true",
+		"add /metadata/labels/apps.cozystack.io~1application.group":          "apps.cozystack.io",
+		"add /metadata/labels/apps.cozystack.io~1application.kind":           "Harbor",
+		"add /metadata/labels/apps.cozystack.io~1application.name":           "demo",
+		"add /metadata/labels/internal.cozystack.io~1tenantresource":         "false",
+		"add /metadata/annotations/scheduler.cozystack.io~1scheduling-class": "gpu",
+		"add /metadata/labels/scheduler.cozystack.io~1scheduling-class":      "gpu",
+		"add /spec/schedulerName":                                            schedulerapi.SchedulerName,
+	}
+
+	got := map[string]any{}
+	var keys []string
+	for _, p := range resp.Patches {
+		k := p.Operation + " " + p.Path
+		got[k] = p.Value
+		keys = append(keys, k)
+	}
+	sort.Strings(keys)
+	if len(resp.Patches) != len(want) {
+		t.Errorf("expected %d patch operations, got %d: %v", len(want), len(resp.Patches), keys)
+	}
+	for k, v := range want {
+		if got[k] != v {
+			t.Errorf("patch %q = %#v, want %#v", k, got[k], v)
+		}
+	}
+	for _, p := range resp.Patches {
+		if _, ok := want[p.Operation+" "+p.Path]; !ok {
+			t.Errorf("unexpected patch operation %s %s = %#v", p.Operation, p.Path, p.Value)
+		}
+	}
+}
+
+// TestHandle_ReadmissionShortCircuit pins which UPDATEs skip the owner walk.
+// Every object points at the harbor-demo HelmRelease but names a stale
+// application, so an object that goes through the walk gets its labels
+// rewritten, and one that skips it gets no patch at all.
+func TestHandle_ReadmissionShortCircuit(t *testing.T) {
+	fullLabels := func() map[string]string {
+		return map[string]string{
+			"helm.toolkit.fluxcd.io/name":       "harbor-demo",
+			ManagedObjectKey:                    "true",
+			ManagerGroupKey:                     "apps.cozystack.io",
+			ManagerKindKey:                      "Harbor",
+			ManagerNameKey:                      "stale",
+			corev1alpha1.TenantResourceLabelKey: "false",
+		}
+	}
+	escape := func(k string) string {
+		return "/metadata/labels/" + strings.ReplaceAll(k, "/", "~1")
+	}
+
+	tests := []struct {
+		name   string
+		kind   string
+		labels func() map[string]string
+		// wantPatches lists "op path" entries that must appear; nil means the
+		// response must carry no patch at all.
+		wantPatches []string
+	}{
+		{
+			name:   "secret with every lineage label skips the walk",
+			kind:   "Secret",
+			labels: fullLabels,
+		},
+		{
+			name:        "pod with every lineage label still gets the scheduling fields",
+			kind:        "Pod",
+			labels:      fullLabels,
+			wantPatches: []string{"add /spec/schedulerName", "replace " + escape(ManagerNameKey)},
+		},
+		{
+			name: "secret marked unmanaged goes through the walk",
+			kind: "Secret",
+			labels: func() map[string]string {
+				l := fullLabels()
+				l[ManagedObjectKey] = "false"
+				return l
+			},
+			wantPatches: []string{"replace " + escape(ManagedObjectKey), "replace " + escape(ManagerNameKey)},
+		},
+		{
+			name: "secret missing the application kind goes through the walk",
+			kind: "Secret",
+			labels: func() map[string]string {
+				l := fullLabels()
+				delete(l, ManagerKindKey)
+				return l
+			},
+			wantPatches: []string{"add " + escape(ManagerKindKey), "replace " + escape(ManagerNameKey)},
+		},
+		{
+			name: "secret missing the tenantresource label goes through the walk",
+			kind: "Secret",
+			labels: func() map[string]string {
+				l := fullLabels()
+				delete(l, corev1alpha1.TenantResourceLabelKey)
+				return l
+			},
+			wantPatches: []string{"add " + escape(corev1alpha1.TenantResourceLabelKey), "replace " + escape(ManagerNameKey)},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			w := newHandleTestWebhook(t)
+			w.config.Store(&runtimeConfig{appCRDMap: map[appRef]*cozyv1alpha1.ApplicationDefinition{
+				{"apps.cozystack.io", "Harbor"}: {Spec: cozyv1alpha1.ApplicationDefinitionSpec{
+					Application: cozyv1alpha1.ApplicationDefinitionApplication{Kind: "Harbor"},
+				}},
+			}})
+
+			obj := &unstructured.Unstructured{}
+			obj.SetAPIVersion("v1")
+			obj.SetKind(tt.kind)
+			obj.SetNamespace("tenant-demo")
+			obj.SetName("harbor-demo-core")
+			obj.SetLabels(tt.labels())
+			if tt.kind == "Pod" {
+				obj.Object["spec"] = map[string]any{"containers": []any{map[string]any{"name": "core", "image": "core"}}}
+			}
+			raw, err := json.Marshal(obj)
+			if err != nil {
+				t.Fatalf("marshal object: %v", err)
+			}
+
+			resp := w.Handle(context.Background(), admission.Request{AdmissionRequest: admissionv1.AdmissionRequest{
+				Kind:      metav1.GroupVersionKind{Version: "v1", Kind: tt.kind},
+				Namespace: "tenant-demo",
+				Name:      "harbor-demo-core",
+				Operation: admissionv1.Update,
+				Object:    runtime.RawExtension{Raw: raw},
+				OldObject: runtime.RawExtension{Raw: raw},
+			}})
+			if !resp.Allowed {
+				t.Fatalf("expected allowed response, got %+v", resp.Result)
+			}
+
+			got := map[string]bool{}
+			var keys []string
+			for _, p := range resp.Patches {
+				k := p.Operation + " " + p.Path
+				got[k] = true
+				keys = append(keys, k)
+			}
+			sort.Strings(keys)
+			if tt.wantPatches == nil {
+				if len(resp.Patches) != 0 {
+					t.Errorf("expected no patch, got %v", keys)
+				}
+				return
+			}
+			for _, k := range tt.wantPatches {
+				if !got[k] {
+					t.Errorf("missing patch %q, got %v", k, keys)
+				}
+			}
+		})
+	}
+}
+
+const testSchedulingClass = "co-region-test"
+
+// newSchedulingClassCR builds an unstructured SchedulingClass CR the fake
+// dynamic client can serve.
+func newSchedulingClassCR(name string) *unstructured.Unstructured {
+	u := &unstructured.Unstructured{}
+	u.SetGroupVersionKind(schema.GroupVersionKind{
+		Group:   schedulerapi.Group,
+		Version: schedulerapi.Version,
+		Kind:    "SchedulingClass",
+	})
+	u.SetName(name)
+	return u
+}
+
+// newWebhookTestEnv builds a LineageControllerWebhook wired with fakes,
+// pre-populated with a Namespace carrying the scheduling-class label and a
+// SchedulingClass CR by that name.
+func newWebhookTestEnv(t *testing.T, namespace string, classOnNamespace string, classExists bool) *LineageControllerWebhook {
+	t.Helper()
+
+	testScheme := runtime.NewScheme()
+	_ = clientgoscheme.AddToScheme(testScheme)
+
+	ns := &corev1.Namespace{
+		ObjectMeta: metav1.ObjectMeta{
+			Name: namespace,
+		},
+	}
+	if classOnNamespace != "" {
+		ns.Labels = map[string]string{
+			schedulerapi.SchedulingClassLabel: classOnNamespace,
+		}
+	}
+
+	c := fake.NewClientBuilder().
+		WithScheme(testScheme).
+		WithObjects(ns).
+		Build()
+
+	gvr := schema.GroupVersionResource{
+		Group:    schedulerapi.Group,
+		Version:  schedulerapi.Version,
+		Resource: schedulerapi.Resource,
+	}
+
+	dynObjs := []runtime.Object{}
+	if classExists {
+		dynObjs = append(dynObjs, newSchedulingClassCR(classOnNamespace))
+	}
+	dyn := dynamicfake.NewSimpleDynamicClientWithCustomListKinds(
+		testScheme,
+		map[schema.GroupVersionResource]string{gvr: "SchedulingClassList"},
+		dynObjs...,
+	)
+
+	return &LineageControllerWebhook{
+		Client:    c,
+		Scheme:    testScheme,
+		dynClient: dyn,
+	}
+}
+
+// newPod returns a minimal unstructured Pod for mutation tests.
+func newPod(namespace, name string) *unstructured.Unstructured {
+	u := &unstructured.Unstructured{}
+	u.SetGroupVersionKind(schema.GroupVersionKind{Version: "v1", Kind: "Pod"})
+	u.SetNamespace(namespace)
+	u.SetName(name)
+	return u
+}
+
+func TestApplySchedulingClass_SetsLabelAnnotationAndSchedulerName(t *testing.T) {
+	ctx := context.Background()
+	h := newWebhookTestEnv(t, "tenant-acme", testSchedulingClass, true)
+	pod := newPod("tenant-acme", "db-0")
+
+	if err := h.applySchedulingClass(ctx, pod, nil, "tenant-acme"); err != nil {
+		t.Fatalf("applySchedulingClass returned error: %v", err)
+	}
+
+	gotLabel := pod.GetLabels()[schedulerapi.SchedulingClassLabel]
+	if gotLabel != testSchedulingClass {
+		t.Errorf("expected pod label %s=%s, got %q", schedulerapi.SchedulingClassLabel, testSchedulingClass, gotLabel)
+	}
+
+	gotAnnotation := pod.GetAnnotations()[schedulerapi.SchedulingClassAnnotation]
+	if gotAnnotation != testSchedulingClass {
+		t.Errorf("expected pod annotation %s=%s, got %q", schedulerapi.SchedulingClassAnnotation, testSchedulingClass, gotAnnotation)
+	}
+
+	gotSched, _, _ := unstructured.NestedString(pod.Object, "spec", "schedulerName")
+	if gotSched != schedulerapi.SchedulerName {
+		t.Errorf("expected pod spec.schedulerName=%s, got %q", schedulerapi.SchedulerName, gotSched)
+	}
+}
+
+func TestApplySchedulingClass_PreservesExistingLabels(t *testing.T) {
+	ctx := context.Background()
+	h := newWebhookTestEnv(t, "tenant-acme", testSchedulingClass, true)
+	pod := newPod("tenant-acme", "db-0")
+	pod.SetLabels(map[string]string{
+		"app.kubernetes.io/name": "postgres",
+		"role":                   "primary",
+	})
+
+	if err := h.applySchedulingClass(ctx, pod, nil, "tenant-acme"); err != nil {
+		t.Fatalf("applySchedulingClass returned error: %v", err)
+	}
+
+	labels := pod.GetLabels()
+	if labels[schedulerapi.SchedulingClassLabel] != testSchedulingClass {
+		t.Errorf("scheduling-class label not set")
+	}
+	if labels["app.kubernetes.io/name"] != "postgres" {
+		t.Errorf("existing label app.kubernetes.io/name was clobbered: %q", labels["app.kubernetes.io/name"])
+	}
+	if labels["role"] != "primary" {
+		t.Errorf("existing label role was clobbered: %q", labels["role"])
+	}
+}
+
+func TestApplySchedulingClass_NonPodIsNoOp(t *testing.T) {
+	ctx := context.Background()
+	h := newWebhookTestEnv(t, "tenant-acme", testSchedulingClass, true)
+
+	svc := &unstructured.Unstructured{}
+	svc.SetGroupVersionKind(schema.GroupVersionKind{Version: "v1", Kind: "Service"})
+	svc.SetNamespace("tenant-acme")
+	svc.SetName("svc-0")
+
+	if err := h.applySchedulingClass(ctx, svc, nil, "tenant-acme"); err != nil {
+		t.Fatalf("applySchedulingClass returned error: %v", err)
+	}
+
+	if _, ok := svc.GetLabels()[schedulerapi.SchedulingClassLabel]; ok {
+		t.Errorf("non-Pod object should not be mutated")
+	}
+	if _, ok := svc.GetAnnotations()[schedulerapi.SchedulingClassAnnotation]; ok {
+		t.Errorf("non-Pod object should not be mutated")
+	}
+}
+
+func TestApplySchedulingClass_NoClassOnNamespaceIsNoOp(t *testing.T) {
+	ctx := context.Background()
+	h := newWebhookTestEnv(t, "tenant-acme", "", false)
+	pod := newPod("tenant-acme", "db-0")
+
+	if err := h.applySchedulingClass(ctx, pod, nil, "tenant-acme"); err != nil {
+		t.Fatalf("applySchedulingClass returned error: %v", err)
+	}
+
+	if _, ok := pod.GetLabels()[schedulerapi.SchedulingClassLabel]; ok {
+		t.Errorf("pod label should not be set when namespace has no scheduling-class label")
+	}
+	if _, ok := pod.GetAnnotations()[schedulerapi.SchedulingClassAnnotation]; ok {
+		t.Errorf("pod annotation should not be set when namespace has no scheduling-class label")
+	}
+	if sched, _, _ := unstructured.NestedString(pod.Object, "spec", "schedulerName"); sched != "" {
+		t.Errorf("pod spec.schedulerName should not be set when namespace has no scheduling-class label, got %q", sched)
+	}
+}
+
+func TestApplySchedulingClass_MissingClassCRSkipsInjection(t *testing.T) {
+	ctx := context.Background()
+	// Namespace carries the label, but the SchedulingClass CR is NOT created.
+	h := newWebhookTestEnv(t, "tenant-acme", testSchedulingClass, false)
+	pod := newPod("tenant-acme", "db-0")
+
+	if err := h.applySchedulingClass(ctx, pod, nil, "tenant-acme"); err != nil {
+		t.Fatalf("applySchedulingClass returned error: %v", err)
+	}
+
+	// Defensive behavior: pod must not be left referencing a non-existent
+	// scheduler, otherwise it would stay Pending forever.
+	if _, ok := pod.GetLabels()[schedulerapi.SchedulingClassLabel]; ok {
+		t.Errorf("pod label should not be set when SchedulingClass CR is missing")
+	}
+	if _, ok := pod.GetAnnotations()[schedulerapi.SchedulingClassAnnotation]; ok {
+		t.Errorf("pod annotation should not be set when SchedulingClass CR is missing")
+	}
+	if sched, _, _ := unstructured.NestedString(pod.Object, "spec", "schedulerName"); sched != "" {
+		t.Errorf("pod spec.schedulerName should not be set when SchedulingClass CR is missing, got %q", sched)
+	}
+}
diff --git a/internal/manifestutil/crd.go b/internal/manifestutil/crd.go
index 08468d1b02..7291df6505 100644
--- a/internal/manifestutil/crd.go
+++ b/internal/manifestutil/crd.go
@@ -45,19 +45,38 @@ func WaitForCRDsEstablished(ctx context.Context, k8sClient client.Client, crdNam
 	ticker := time.NewTicker(500 * time.Millisecond)
 	defer ticker.Stop()
 
+	// The CRD named if the wait is cut short. Until a poll observes the set
+	// nothing is known about which one lags, so the first of it stands in;
+	// after that it holds the CRD the last poll stopped on.
+	pendingCRD := crdNames[0]
+
+	// Cancellation leaves the loop from two places and reads the same from
+	// both, which is the point rather than an accident. When the deadline and
+	// a tick come ready together, select picks between them at random, so any
+	// difference between the two exits would reach the operator at random too.
+	cancelled := func() error {
+		return fmt.Errorf("context cancelled while waiting for CRD %q to be established: %w", pendingCRD, ctx.Err())
+	}
+
 	for {
-		select {
-		case <-ctx.Done():
-			return fmt.Errorf("context cancelled while waiting for CRDs to be established: %w", ctx.Err())
-		default:
+		// Polling a dead context spends a Get to learn nothing: a client
+		// refuses it, and the refusal would land on the first name in the list
+		// whichever CRD is actually lagging, renaming what gets reported.
+		if ctx.Err() != nil {
+			return cancelled()
 		}
 
 		allEstablished := true
-		var pendingCRD string
 		for _, name := range crdNames {
 			crd := &unstructured.Unstructured{}
 			crd.SetGroupVersionKind(crdGVK)
 			if err := k8sClient.Get(ctx, types.NamespacedName{Name: name}, crd); err != nil {
+				// The poll was entered on a live context, so this is the CRD
+				// it stopped on and not whichever name a blanket refusal
+				// reached first. A context dying inside the poll still lands
+				// here and does record the first name to fail: this branch
+				// cannot tell a refused request from a CRD status, which is
+				// the wider problem it has for RBAC and connection errors too.
 				allEstablished = false
 				pendingCRD = name
 				break
@@ -72,7 +91,7 @@ func WaitForCRDsEstablished(ctx context.Context, k8sClient client.Client, crdNam
 
 			established := false
 			for _, c := range conditions {
-				cond, ok := c.(map[string]interface{})
+				cond, ok := c.(map[string]any)
 				if !ok {
 					continue
 				}
@@ -97,7 +116,7 @@ func WaitForCRDsEstablished(ctx context.Context, k8sClient client.Client, crdNam
 
 		select {
 		case <-ctx.Done():
-			return fmt.Errorf("context cancelled while waiting for CRD %q to be established: %w", pendingCRD, ctx.Err())
+			return cancelled()
 		case <-ticker.C:
 		}
 	}
diff --git a/internal/manifestutil/crd_test.go b/internal/manifestutil/crd_test.go
index 5d0463532d..f83165f2e6 100644
--- a/internal/manifestutil/crd_test.go
+++ b/internal/manifestutil/crd_test.go
@@ -18,7 +18,10 @@ package manifestutil
 
 import (
 	"context"
+	"errors"
+	"fmt"
 	"strings"
+	"sync/atomic"
 	"testing"
 	"time"
 
@@ -34,25 +37,25 @@ import (
 
 func TestCollectCRDNames(t *testing.T) {
 	objects := []*unstructured.Unstructured{
-		{Object: map[string]interface{}{
+		{Object: map[string]any{
 			"apiVersion": "v1",
 			"kind":       "Namespace",
-			"metadata":   map[string]interface{}{"name": "test-ns"},
+			"metadata":   map[string]any{"name": "test-ns"},
 		}},
-		{Object: map[string]interface{}{
+		{Object: map[string]any{
 			"apiVersion": "apiextensions.k8s.io/v1",
 			"kind":       "CustomResourceDefinition",
-			"metadata":   map[string]interface{}{"name": "packages.cozystack.io"},
+			"metadata":   map[string]any{"name": "packages.cozystack.io"},
 		}},
-		{Object: map[string]interface{}{
+		{Object: map[string]any{
 			"apiVersion": "apps/v1",
 			"kind":       "Deployment",
-			"metadata":   map[string]interface{}{"name": "test-deploy"},
+			"metadata":   map[string]any{"name": "test-deploy"},
 		}},
-		{Object: map[string]interface{}{
+		{Object: map[string]any{
 			"apiVersion": "apiextensions.k8s.io/v1",
 			"kind":       "CustomResourceDefinition",
-			"metadata":   map[string]interface{}{"name": "packagesources.cozystack.io"},
+			"metadata":   map[string]any{"name": "packagesources.cozystack.io"},
 		}},
 	}
 
@@ -70,15 +73,15 @@ func TestCollectCRDNames(t *testing.T) {
 
 func TestCollectCRDNames_ignoresWrongAPIVersion(t *testing.T) {
 	objects := []*unstructured.Unstructured{
-		{Object: map[string]interface{}{
+		{Object: map[string]any{
 			"apiVersion": "apiextensions.k8s.io/v1",
 			"kind":       "CustomResourceDefinition",
-			"metadata":   map[string]interface{}{"name": "real.crd.io"},
+			"metadata":   map[string]any{"name": "real.crd.io"},
 		}},
-		{Object: map[string]interface{}{
+		{Object: map[string]any{
 			"apiVersion": "apiextensions.k8s.io/v1beta1",
 			"kind":       "CustomResourceDefinition",
-			"metadata":   map[string]interface{}{"name": "legacy.crd.io"},
+			"metadata":   map[string]any{"name": "legacy.crd.io"},
 		}},
 	}
 
@@ -93,10 +96,10 @@ func TestCollectCRDNames_ignoresWrongAPIVersion(t *testing.T) {
 
 func TestCollectCRDNames_noCRDs(t *testing.T) {
 	objects := []*unstructured.Unstructured{
-		{Object: map[string]interface{}{
+		{Object: map[string]any{
 			"apiVersion": "v1",
 			"kind":       "Namespace",
-			"metadata":   map[string]interface{}{"name": "test"},
+			"metadata":   map[string]any{"name": "test"},
 		}},
 	}
 
@@ -115,10 +118,10 @@ func TestWaitForCRDsEstablished_success(t *testing.T) {
 	}
 
 	// Create a CRD object in the fake client
-	crd := &unstructured.Unstructured{Object: map[string]interface{}{
+	crd := &unstructured.Unstructured{Object: map[string]any{
 		"apiVersion": "apiextensions.k8s.io/v1",
 		"kind":       "CustomResourceDefinition",
-		"metadata":   map[string]interface{}{"name": "packages.cozystack.io"},
+		"metadata":   map[string]any{"name": "packages.cozystack.io"},
 	}}
 
 	fakeClient := fake.NewClientBuilder().
@@ -134,8 +137,8 @@ func TestWaitForCRDsEstablished_success(t *testing.T) {
 					return nil
 				}
 				if u.GetKind() == "CustomResourceDefinition" {
-					_ = unstructured.SetNestedSlice(u.Object, []interface{}{
-						map[string]interface{}{
+					_ = unstructured.SetNestedSlice(u.Object, []any{
+						map[string]any{
 							"type":   "Established",
 							"status": "True",
 						},
@@ -165,10 +168,10 @@ func TestWaitForCRDsEstablished_timeout(t *testing.T) {
 	}
 
 	// CRD exists but never gets Established condition
-	crd := &unstructured.Unstructured{Object: map[string]interface{}{
+	crd := &unstructured.Unstructured{Object: map[string]any{
 		"apiVersion": "apiextensions.k8s.io/v1",
 		"kind":       "CustomResourceDefinition",
-		"metadata":   map[string]interface{}{"name": "packages.cozystack.io"},
+		"metadata":   map[string]any{"name": "packages.cozystack.io"},
 	}}
 
 	fakeClient := fake.NewClientBuilder().
@@ -187,6 +190,274 @@ func TestWaitForCRDsEstablished_timeout(t *testing.T) {
 	if !strings.Contains(err.Error(), "packages.cozystack.io") {
 		t.Errorf("error should mention stuck CRD name, got: %v", err)
 	}
+	// The only deadline-driven test here, so it is the only one that can catch
+	// the cause being reported as something other than what ended the wait.
+	if !errors.Is(err, context.DeadlineExceeded) {
+		t.Errorf("error should wrap the deadline cause, got: %v", err)
+	}
+}
+
+// crdObject builds a CustomResourceDefinition for the fake client. Passing nil
+// conditions leaves status unset, which is one of the two shapes the wait reads
+// as "not established yet"; the other is a status carrying conditions that do
+// not include an established one.
+func crdObject(name string, conditions []any) *unstructured.Unstructured {
+	obj := map[string]any{
+		"apiVersion": "apiextensions.k8s.io/v1",
+		"kind":       "CustomResourceDefinition",
+		"metadata":   map[string]any{"name": name},
+	}
+	if conditions != nil {
+		obj["status"] = map[string]any{"conditions": conditions}
+	}
+	return &unstructured.Unstructured{Object: obj}
+}
+
+func establishedConditions() []any {
+	return []any{map[string]any{"type": "Established", "status": "True"}}
+}
+
+func unestablishedConditions() []any {
+	return []any{map[string]any{"type": "NamesAccepted", "status": "True"}}
+}
+
+// cancellationScheme returns the scheme the cancellation tests share.
+func cancellationScheme(t *testing.T) *runtime.Scheme {
+	t.Helper()
+	scheme := runtime.NewScheme()
+	if err := apiextensionsv1.AddToScheme(scheme); err != nil {
+		t.Fatalf("failed to add apiextensions to scheme: %v", err)
+	}
+	return scheme
+}
+
+// assertCancelled checks the whole message, not just the CRD in it. The point
+// of the fix is that every way out of the wait reports cancellation the same
+// way, so a second message that happens to carry a name is still the defect;
+// comparing the text is what makes that observable to a test.
+func assertCancelled(t *testing.T, err error, wantCRD string) {
+	t.Helper()
+	if err == nil {
+		t.Fatal("WaitForCRDsEstablished() expected error on cancelled context, got nil")
+	}
+	want := fmt.Sprintf("context cancelled while waiting for CRD %q to be established: %v", wantCRD, context.Canceled)
+	if err.Error() != want {
+		t.Errorf("error = %q, want %q", err.Error(), want)
+	}
+	// Callers wrap this error again, so the cause has to survive for anyone
+	// matching on it rather than on the text.
+	if !errors.Is(err, context.Canceled) {
+		t.Errorf("error should wrap the context cause, got: %v", err)
+	}
+}
+
+// TestWaitForCRDsEstablished_cancelledBeforeFirstPoll covers the interleaving
+// the timeout test above cannot reach: the context is already cancelled when
+// the function is entered, so no poll ever observes the set and the name in
+// the message can only be the one the wait starts with. The client answers
+// regardless of the context, so a wait that polled anyway would settle on the
+// second CRD and be visible here rather than passing by accident.
+func TestWaitForCRDsEstablished_cancelledBeforeFirstPoll(t *testing.T) {
+	log.SetLogger(zap.New(zap.UseDevMode(true)))
+
+	fakeClient := fake.NewClientBuilder().
+		WithScheme(cancellationScheme(t)).
+		WithObjects(
+			crdObject("established.cozystack.io", establishedConditions()),
+			crdObject("packages.cozystack.io", nil),
+		).
+		Build()
+
+	ctx, cancel := context.WithCancel(context.Background())
+	ctx = log.IntoContext(ctx, log.FromContext(context.Background()))
+	cancel()
+
+	err := WaitForCRDsEstablished(ctx, fakeClient, []string{"established.cozystack.io", "packages.cozystack.io"})
+	assertCancelled(t, err, "established.cozystack.io")
+}
+
+// TestWaitForCRDsEstablished_cancelledMidPollNamesUncheckedCRD pins which CRD
+// the message names when the deadline lands inside a poll. The poll walks past
+// one CRD it confirms established and is cut off on the next, which is the one
+// whose state is genuinely unknown and the one worth reporting. A third name
+// behind it keeps "the first Get to fail" apart from "the last one tried",
+// which two CRDs cannot tell apart.
+func TestWaitForCRDsEstablished_cancelledMidPollNamesUncheckedCRD(t *testing.T) {
+	log.SetLogger(zap.New(zap.UseDevMode(true)))
+
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
+	ctx = log.IntoContext(ctx, log.FromContext(context.Background()))
+
+	// The first Get is served, so the first CRD is confirmed established. The
+	// deadline then lands on the second, the way it would against a live
+	// client: cancelled first, refused second.
+	gets := 0
+	fakeClient := fake.NewClientBuilder().
+		WithScheme(cancellationScheme(t)).
+		WithObjects(
+			crdObject("established.cozystack.io", establishedConditions()),
+			crdObject("packages.cozystack.io", nil),
+			crdObject("later.cozystack.io", nil),
+		).
+		WithInterceptorFuncs(interceptor.Funcs{
+			Get: func(ctx context.Context, c client.WithWatch, key client.ObjectKey, obj client.Object, opts ...client.GetOption) error {
+				gets++
+				if gets > 1 {
+					cancel()
+					return context.Canceled
+				}
+				if err := ctx.Err(); err != nil {
+					return err
+				}
+				return c.Get(ctx, key, obj, opts...)
+			},
+		}).
+		Build()
+
+	err := WaitForCRDsEstablished(ctx, fakeClient, []string{"established.cozystack.io", "packages.cozystack.io", "later.cozystack.io"})
+	assertCancelled(t, err, "packages.cozystack.io")
+}
+
+// TestWaitForCRDsEstablished_cancelledAfterPollKeepsName pins that the name a
+// completed poll settled on survives the wait that follows it. The two cases
+// are the two shapes of "not established yet", which the loop records from
+// different branches.
+func TestWaitForCRDsEstablished_cancelledAfterPollKeepsName(t *testing.T) {
+	log.SetLogger(zap.New(zap.UseDevMode(true)))
+
+	for _, tc := range []struct {
+		name       string
+		conditions []any
+	}{
+		{name: "status absent", conditions: nil},
+		{name: "no established condition", conditions: unestablishedConditions()},
+	} {
+		t.Run(tc.name, func(t *testing.T) {
+			ctx, cancel := context.WithCancel(context.Background())
+			defer cancel()
+			ctx = log.IntoContext(ctx, log.FromContext(context.Background()))
+
+			// Both Gets are served, so the poll completes and settles on the
+			// second CRD. The context then dies while the loop waits for a tick.
+			gets := 0
+			fakeClient := fake.NewClientBuilder().
+				WithScheme(cancellationScheme(t)).
+				WithObjects(
+					crdObject("established.cozystack.io", establishedConditions()),
+					crdObject("packages.cozystack.io", tc.conditions),
+				).
+				WithInterceptorFuncs(interceptor.Funcs{
+					Get: func(ctx context.Context, c client.WithWatch, key client.ObjectKey, obj client.Object, opts ...client.GetOption) error {
+						if err := ctx.Err(); err != nil {
+							return err
+						}
+						err := c.Get(ctx, key, obj, opts...)
+						gets++
+						if gets == 2 {
+							cancel()
+						}
+						return err
+					},
+				}).
+				Build()
+
+			err := WaitForCRDsEstablished(ctx, fakeClient, []string{"established.cozystack.io", "packages.cozystack.io"})
+			assertCancelled(t, err, "packages.cozystack.io")
+		})
+	}
+}
+
+// reenteringContext forces the loop to start an iteration on a context that is
+// already cancelled. Against a real context that needs the bottom select to
+// have taken the tick while both cases were ready, which is a coin toss no test
+// can hold still. Done stays open for the single read that select makes in the
+// iteration where cancellation lands, so the tick wins by construction; every
+// read after that returns a closed channel, so the next iteration sees a
+// context cancelled through both Done and Err, the way a real one is. The
+// standard library guarantees that pairing rather than merely happening to
+// provide it: cancelCtx.Err reads <-c.Done() before returning a non-nil error.
+type reenteringContext struct {
+	context.Context
+	dead    *atomic.Bool
+	tickWon *atomic.Bool
+	open    chan struct{}
+	closed  chan struct{}
+}
+
+func newReenteringContext(parent context.Context) reenteringContext {
+	closed := make(chan struct{})
+	close(closed)
+	return reenteringContext{
+		Context: parent,
+		dead:    &atomic.Bool{},
+		tickWon: &atomic.Bool{},
+		open:    make(chan struct{}),
+		closed:  closed,
+	}
+}
+
+func (c reenteringContext) Done() <-chan struct{} {
+	if c.dead.Load() && !c.tickWon.CompareAndSwap(false, true) {
+		return c.closed
+	}
+	return c.open
+}
+
+func (c reenteringContext) Err() error {
+	if c.dead.Load() && c.tickWon.Load() {
+		return context.Canceled
+	}
+	return nil
+}
+
+// TestWaitForCRDsEstablished_cancelledOnLoopReentryKeepsName pins that the CRD
+// name survives into the next iteration. One poll completes and settles on the
+// second CRD, the context dies during the wait, and the loop re-enters and
+// leaves through the check at the top. That check has no poll of its own to
+// take a name from, so the one it reports has to be the one carried over.
+func TestWaitForCRDsEstablished_cancelledOnLoopReentryKeepsName(t *testing.T) {
+	log.SetLogger(zap.New(zap.UseDevMode(true)))
+
+	base := log.IntoContext(context.Background(), log.FromContext(context.Background()))
+	reCtx := newReenteringContext(base)
+
+	gets := 0
+	fakeClient := fake.NewClientBuilder().
+		WithScheme(cancellationScheme(t)).
+		WithObjects(
+			crdObject("established.cozystack.io", establishedConditions()),
+			crdObject("packages.cozystack.io", nil),
+		).
+		WithInterceptorFuncs(interceptor.Funcs{
+			Get: func(ctx context.Context, c client.WithWatch, key client.ObjectKey, obj client.Object, opts ...client.GetOption) error {
+				if err := ctx.Err(); err != nil {
+					return err
+				}
+				err := c.Get(ctx, key, obj, opts...)
+				gets++
+				if gets == 2 {
+					reCtx.dead.Store(true)
+				}
+				return err
+			},
+		}).
+		Build()
+
+	// The double answers Done from a fixed script, so a loop that stops reading
+	// it the expected number of times never leaves. Bound the call: a hang here
+	// costs the whole package's CI timeout, a failure costs one line.
+	done := make(chan error, 1)
+	go func() {
+		done <- WaitForCRDsEstablished(reCtx, fakeClient, []string{"established.cozystack.io", "packages.cozystack.io"})
+	}()
+
+	select {
+	case err := <-done:
+		assertCancelled(t, err, "packages.cozystack.io")
+	case <-time.After(5 * time.Second):
+		t.Fatal("WaitForCRDsEstablished() never returned: the loop stopped taking the cancellation exits this fixture scripts")
+	}
 }
 
 func TestWaitForCRDsEstablished_empty(t *testing.T) {
@@ -199,4 +470,3 @@ func TestWaitForCRDsEstablished_empty(t *testing.T) {
 		t.Fatalf("WaitForCRDsEstablished() with empty names should return nil, got: %v", err)
 	}
 }
-
diff --git a/internal/marketplace/collision/collision.go b/internal/marketplace/collision/collision.go
new file mode 100644
index 0000000000..4c1937766c
--- /dev/null
+++ b/internal/marketplace/collision/collision.go
@@ -0,0 +1,102 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright 2025 The Cozystack Authors.
+
+// Package collision detects when a tapped repository would shadow a core
+// component. Tapped repositories keep their own declared names (there is no
+// community. namespacing), so a PackageSource name that clashes with an
+// existing component must be a hard error rather than a silent overwrite. The
+// same checks run on the CLI tap path and in the operator materializer, so this
+// logic lives in one place. An ApplicationDefinition kind that clashes is not
+// checked here: internal/shared/appdefowner keeps the existing definition in
+// charge of the kind, and the ApplicationDefinition admission check refuses the
+// second one.
+package collision
+
+import (
+	"context"
+	"fmt"
+
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+
+	cozyv1alpha1 "github.com/cozystack/cozystack/api/v1alpha1"
+	"github.com/cozystack/cozystack/internal/marketplace/tapconst"
+)
+
+// Owns reports whether an object (a PackageSource or the registration Package)
+// belongs to the given tap source, identified by BOTH the marketplace-tap label
+// and the source annotation. Keying on the label alone is not enough: a leftover
+// object from an earlier tap keeps the label, so a later tap that reuses the
+// name would otherwise adopt or delete an object it did not create. A foreign
+// object of the same name is never owned.
+func Owns(obj metav1.Object, sourceName string) bool {
+	// An empty sourceName (a PackageSource with no SourceRef) must never match a
+	// label-only object, whose absent annotation also reads as "": that would
+	// delete or adopt an object this source does not own.
+	return sourceName != "" &&
+		obj.GetLabels()[tapconst.Label] == "true" &&
+		obj.GetAnnotations()[tapconst.SourceAnnotation] == sourceName
+}
+
+// ManagedRegistration reports whether an object is the given tap source's
+// auto-created registration Package that the operator still manages: owned by the
+// source AND still at the auto default (empty variant). A Package a user pinned to
+// a variant via `cozypkg add` sheds its tap markers, and the empty-variant clause
+// is a second line of defence. It takes the variant separately so both a typed
+// *Package and an unstructured Package (the dashboard-disconnect path) call the
+// one predicate, and no path can diverge on which Package is the operator's to
+// manage.
+func ManagedRegistration(obj metav1.Object, sourceName, variant string) bool {
+	return Owns(obj, sourceName) && variant == ""
+}
+
+// PrivilegedConfirmed reports whether the privileged install components of a
+// Package may be installed. It is false only for a Package that still carries the
+// marketplace-tap label: such a Package is a tap auto-registration created without
+// any operator confirmation, so the component that performs the install (the
+// Package reconciler) must refuse its privileged components and not mark their
+// namespaces privileged. `cozypkg add --allow-privileged` sheds the label
+// (pinRegistrationToUser), which is the operator's confirmation, and a platform
+// Package never carries the label, so both are permitted. Placing the check here,
+// at the install site, closes the window in which a tap materializer guard would
+// otherwise race the Package reconciler.
+func PrivilegedConfirmed(pkg metav1.Object) bool {
+	return pkg.GetLabels()[tapconst.Label] != "true"
+}
+
+// PrivilegedInstallComponents lists the names of the given variant's
+// install-marked components that request privileged access. Both the CLI
+// (cozypkg add) and the operator's tap materializer gate on it, so it lives here
+// as the single shared definition.
+func PrivilegedInstallComponents(ps *cozyv1alpha1.PackageSource, variant string) []string {
+	var out []string
+	for i := range ps.Spec.Variants {
+		if ps.Spec.Variants[i].Name != variant {
+			continue
+		}
+		for _, c := range ps.Spec.Variants[i].Components {
+			if c.Install != nil && c.Install.Privileged {
+				out = append(out, c.Name)
+			}
+		}
+	}
+	return out
+}
+
+// PackageSourceName returns an error if a PackageSource named name already
+// exists and is not the given tap source's own materialization.
+func PackageSourceName(ctx context.Context, cl client.Client, name, sourceName string) error {
+	existing := &cozyv1alpha1.PackageSource{}
+	err := cl.Get(ctx, client.ObjectKey{Name: name}, existing)
+	if apierrors.IsNotFound(err) {
+		return nil
+	}
+	if err != nil {
+		return fmt.Errorf("failed to check for an existing PackageSource %q: %w", name, err)
+	}
+	if Owns(existing, sourceName) {
+		return nil
+	}
+	return fmt.Errorf("a PackageSource named %q already exists and is not managed by this repository; choose a name that does not conflict with a core component", name)
+}
diff --git a/internal/marketplace/collision/collision_test.go b/internal/marketplace/collision/collision_test.go
new file mode 100644
index 0000000000..f29e220fc1
--- /dev/null
+++ b/internal/marketplace/collision/collision_test.go
@@ -0,0 +1,108 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright 2025 The Cozystack Authors.
+
+package collision
+
+import (
+	"context"
+	"testing"
+
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
+	"sigs.k8s.io/controller-runtime/pkg/client/fake"
+
+	cozyv1alpha1 "github.com/cozystack/cozystack/api/v1alpha1"
+	"github.com/cozystack/cozystack/internal/marketplace/tapconst"
+)
+
+func scheme(t *testing.T) *runtime.Scheme {
+	t.Helper()
+	s := runtime.NewScheme()
+	if err := clientgoscheme.AddToScheme(s); err != nil {
+		t.Fatal(err)
+	}
+	if err := cozyv1alpha1.AddToScheme(s); err != nil {
+		t.Fatal(err)
+	}
+	return s
+}
+
+func TestPackageSourceName(t *testing.T) {
+	s := scheme(t)
+
+	// A foreign (official) PackageSource of the same name blocks the tap.
+	official := &cozyv1alpha1.PackageSource{ObjectMeta: metav1.ObjectMeta{Name: "acme.hello"}}
+	cl := fake.NewClientBuilder().WithScheme(s).WithObjects(official).Build()
+	if err := PackageSourceName(context.Background(), cl, "acme.hello", "tap-acme-hello"); err == nil {
+		t.Error("expected a collision error against a foreign PackageSource of the same name")
+	}
+
+	// This tap's own PackageSource (same label + source annotation) is not a
+	// collision: a re-tap must be idempotent.
+	own := &cozyv1alpha1.PackageSource{ObjectMeta: metav1.ObjectMeta{
+		Name:        "acme.hello",
+		Labels:      map[string]string{tapconst.Label: "true"},
+		Annotations: map[string]string{tapconst.SourceAnnotation: "tap-acme-hello"},
+	}}
+	clOwn := fake.NewClientBuilder().WithScheme(s).WithObjects(own).Build()
+	if err := PackageSourceName(context.Background(), clOwn, "acme.hello", "tap-acme-hello"); err != nil {
+		t.Errorf("a re-tap of the same source must not collide, got %v", err)
+	}
+
+	// A tap from a different source claiming the same name is a collision.
+	if err := PackageSourceName(context.Background(), clOwn, "acme.hello", "tap-other-source"); err == nil {
+		t.Error("expected a collision error when a different source claims a name owned by another tap")
+	}
+
+	// No existing PackageSource: no collision.
+	clEmpty := fake.NewClientBuilder().WithScheme(s).Build()
+	if err := PackageSourceName(context.Background(), clEmpty, "acme.hello", "tap-acme-hello"); err != nil {
+		t.Errorf("no existing PackageSource must not collide, got %v", err)
+	}
+}
+
+func TestOwnsEmptySourceNeverMatchesLabelOnly(t *testing.T) {
+	// A PackageSource with no SourceRef yields sourceName "". A label-only object
+	// (no source annotation, which also reads as "") must NOT be reported as owned,
+	// or a delete/adopt keyed on Owns would hit an object this source never created.
+	labelOnly := &cozyv1alpha1.Package{ObjectMeta: metav1.ObjectMeta{
+		Name:   "x",
+		Labels: map[string]string{tapconst.Label: "true"},
+	}}
+	if Owns(labelOnly, "") {
+		t.Error("Owns(labelOnly, \"\") must be false")
+	}
+	// A properly annotated object with a real source is still owned.
+	owned := &cozyv1alpha1.Package{ObjectMeta: metav1.ObjectMeta{
+		Name:        "x",
+		Labels:      map[string]string{tapconst.Label: "true"},
+		Annotations: map[string]string{tapconst.SourceAnnotation: "tap-a"},
+	}}
+	if !Owns(owned, "tap-a") {
+		t.Error("Owns(owned, \"tap-a\") must be true")
+	}
+}
+
+func TestManagedRegistration(t *testing.T) {
+	auto := &cozyv1alpha1.Package{ObjectMeta: metav1.ObjectMeta{
+		Labels:      map[string]string{tapconst.Label: "true"},
+		Annotations: map[string]string{tapconst.SourceAnnotation: "tap-a"},
+	}}
+	if !ManagedRegistration(auto, "tap-a", auto.Spec.Variant) {
+		t.Error("owned + empty variant must be a managed registration")
+	}
+	pinned := auto.DeepCopy()
+	pinned.Spec.Variant = "full"
+	if ManagedRegistration(pinned, "tap-a", pinned.Spec.Variant) {
+		t.Error("a pinned (non-empty variant) Package is not managed")
+	}
+	foreign := auto.DeepCopy()
+	foreign.Annotations[tapconst.SourceAnnotation] = "tap-other"
+	if ManagedRegistration(foreign, "tap-a", foreign.Spec.Variant) {
+		t.Error("a Package owned by another source is not managed")
+	}
+	if ManagedRegistration(auto, "", auto.Spec.Variant) {
+		t.Error("empty sourceName must never match")
+	}
+}
diff --git a/internal/marketplace/naming/naming.go b/internal/marketplace/naming/naming.go
new file mode 100644
index 0000000000..ec3bf6b058
--- /dev/null
+++ b/internal/marketplace/naming/naming.go
@@ -0,0 +1,31 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright 2025 The Cozystack Authors.
+
+// Package naming holds the single definition of the per-component artifact name
+// that the PackageSource reconciler generates. The marketplace Tap resource,
+// the cozypkg validator, and the tap materializer all resolve a component to
+// its ApplicationDefinition through this name, so it lives in one place to keep
+// them from drifting apart.
+package naming
+
+import "strings"
+
+// ArtifactName reproduces the assembled-artifact name the PackageSource
+// reconciler emits per (packageSource, variant, component). The reconciler
+// replaces dots with dashes in ALL THREE segments (Kubernetes object names
+// forbid dots), so this must too — a third-party variant or component name may
+// legitimately contain a dot. It must match the reconciler's own naming in
+// internal/operator/packagesource_reconciler.go.
+func ArtifactName(packageSourceName, variant, component string) string {
+	return ArtifactPrefix(packageSourceName, variant) + "-" +
+		strings.ReplaceAll(component, ".", "-")
+}
+
+// ArtifactPrefix is the per-(packageSource, variant) prefix of ArtifactName,
+// i.e. ArtifactName without the trailing component segment. It is the shared
+// helper ArtifactName builds on, and lets a caller resolve the prefix once when
+// it iterates several components of the same variant.
+func ArtifactPrefix(packageSourceName, variant string) string {
+	return strings.ReplaceAll(packageSourceName, ".", "-") + "-" +
+		strings.ReplaceAll(variant, ".", "-")
+}
diff --git a/internal/marketplace/naming/naming_test.go b/internal/marketplace/naming/naming_test.go
new file mode 100644
index 0000000000..982441160b
--- /dev/null
+++ b/internal/marketplace/naming/naming_test.go
@@ -0,0 +1,60 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright 2025 The Cozystack Authors.
+
+package naming
+
+import (
+	"fmt"
+	"strings"
+	"testing"
+)
+
+// referenceArtifactName is the formula the PackageSource reconciler uses
+// (internal/operator/packagesource_reconciler.go): dots replaced by dashes in
+// every segment. ArtifactName must match it exactly, or the marketplace
+// catalog and the validator silently mis-link components to their
+// ApplicationDefinitions.
+func referenceArtifactName(ps, variant, component string) string {
+	return fmt.Sprintf("%s-%s-%s",
+		strings.ReplaceAll(ps, ".", "-"),
+		strings.ReplaceAll(variant, ".", "-"),
+		strings.ReplaceAll(component, ".", "-"))
+}
+
+func TestArtifactNameMatchesReconciler(t *testing.T) {
+	cases := [][3]string{
+		{"cozystack.postgres-application", "default", "postgres"},
+		// Dotted variant and component: the case the earlier single-segment
+		// implementation got wrong.
+		{"community.org.repo", "v1.0", "my.app"},
+		{"community.acme.stack", "isp-hosted", "edge.gateway"},
+	}
+	for _, c := range cases {
+		got := ArtifactName(c[0], c[1], c[2])
+		want := referenceArtifactName(c[0], c[1], c[2])
+		if got != want {
+			t.Errorf("ArtifactName(%q,%q,%q) = %q, want %q", c[0], c[1], c[2], got, want)
+		}
+		if strings.Contains(got, ".") {
+			t.Errorf("ArtifactName(%q,%q,%q) = %q still contains a dot", c[0], c[1], c[2], got)
+		}
+	}
+}
+
+func TestArtifactPrefixIsArtifactNameWithoutComponent(t *testing.T) {
+	cases := [][3]string{
+		{"example.hello", "default", "hello"},
+		{"community.org.repo", "v1.0", "my.app"},
+	}
+	for _, c := range cases {
+		prefix := ArtifactPrefix(c[0], c[1])
+		full := ArtifactName(c[0], c[1], c[2])
+		want := prefix + "-" + strings.ReplaceAll(c[2], ".", "-")
+		if full != want {
+			t.Errorf("ArtifactName(%q,%q,%q)=%q, but prefix %q + component != it", c[0], c[1], c[2], full, prefix)
+		}
+		if strings.Contains(prefix, ".") {
+			t.Errorf("ArtifactPrefix(%q,%q)=%q still contains a dot", c[0], c[1], prefix)
+		}
+	}
+}
diff --git a/internal/marketplace/tapconst/tapconst.go b/internal/marketplace/tapconst/tapconst.go
new file mode 100644
index 0000000000..b88b99bf05
--- /dev/null
+++ b/internal/marketplace/tapconst/tapconst.go
@@ -0,0 +1,34 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright 2025 The Cozystack Authors.
+
+// Package tapconst holds the label, annotation, and finalizer keys shared
+// between the marketplace API (which creates a community tap's Flux source) and
+// the operator's tap materializer (which turns that source into PackageSources).
+// They live here so the two sides can never drift on a load-bearing key.
+package tapconst
+
+const (
+	// Label marks a Flux source (and the PackageSources materialized from it) as
+	// belonging to a tap. It is load-bearing: the untap/disconnect guard, the
+	// tapped-vs-official badge, and idempotent re-tap all key on this marker
+	// (not on a name prefix), because a tapped repository keeps its own declared
+	// name. It lives here as the single definition shared by every side.
+	Label = "apps.cozystack.io/marketplace-tap"
+	// NameAnnotation records the tap's own OCIRepository object name, set when a
+	// tap is connected, so the dashboard orphan-disconnect can find the source.
+	NameAnnotation = "apps.cozystack.io/tap-name"
+	// SourceAnnotation links a materialized PackageSource back to its tap's Flux
+	// source name, so the source's finalizer can clean them up and a re-tap can
+	// recognise its own PackageSources.
+	SourceAnnotation = "apps.cozystack.io/tap-source"
+	// MaterializedRevisionAnnotation records the artifact revision last
+	// materialized, so an unchanged revision is not re-pulled.
+	MaterializedRevisionAnnotation = "apps.cozystack.io/materialized-revision"
+	// MaterializeErrorAnnotation records why the last materialization failed
+	// (e.g. a name collision with a core component), so the failure surfaces on
+	// the Tap resource and dashboard instead of only in the operator log.
+	MaterializeErrorAnnotation = "apps.cozystack.io/tap-error"
+	// Finalizer keeps the OCIRepository until its materialized PackageSources
+	// are cleaned up.
+	Finalizer = "apps.cozystack.io/tap-materializer"
+)
diff --git a/internal/migrationcontroller/credentials_projector.go b/internal/migrationcontroller/credentials_projector.go
new file mode 100644
index 0000000000..7e4a5ddc99
--- /dev/null
+++ b/internal/migrationcontroller/credentials_projector.go
@@ -0,0 +1,139 @@
+// SPDX-License-Identifier: Apache-2.0
+
+package migrationcontroller
+
+import (
+	"context"
+	"fmt"
+
+	corev1 "k8s.io/api/core/v1"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/types"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+
+	migrationv1alpha1 "github.com/cozystack/cozystack/api/migration/v1alpha1"
+)
+
+// ProjectionError is a typed error so the reconciler can tell a misconfiguration
+// that needs a human (a Secret owned by someone else) from an API hiccup that
+// will clear on its own.
+type ProjectionError struct {
+	Reason  string
+	Message string
+}
+
+func (e *ProjectionError) Error() string { return e.Message }
+
+// projectCredentials writes a Source's credentials into the Secret shape
+// Forklift's Provider consumes, and returns the Secret's name.
+//
+// Tenants cannot create Secrets in Cozystack (core.cozystack.io/tenantsecrets is
+// read-only at every access level), so a credentialsSecretRef field would be
+// unsatisfiable for the audience this API is for: the credentials arrive on the
+// Source's spec and the controller materializes them. The exposure class is the
+// same one the managed databases that still take a values-supplied credential
+// carry (the postgres and mariadb apps take no `users[].password`; the other
+// engines still do).
+//
+// The projected Secret is labelled as ours and the projector refuses to write a
+// pre-existing Secret that is not, so a name collision can never clobber a
+// tenant's own object — it surfaces as a terminal condition instead.
+func projectCredentials(ctx context.Context, c client.Client, src *migrationv1alpha1.VMImportSource) (string, error) {
+	return projectSecret(ctx, c, src, credentialsSecretName(src.Name), src.Spec.Credentials)
+}
+
+// projectSecret materializes one credential set into a Secret of the given
+// name. Shared by the provider connection and by each host override, which
+// carries its own ESXi account for the same reason: the engine authenticates
+// that connection on the host itself.
+func projectSecret(
+	ctx context.Context,
+	c client.Client,
+	src *migrationv1alpha1.VMImportSource,
+	name string,
+	creds migrationv1alpha1.ProviderCredentials,
+) (string, error) {
+	desired := map[string][]byte{
+		"user":     []byte(creds.Username),
+		"password": []byte(creds.Password),
+	}
+	// The engine's vSphere validation wants `user`, `password`, and then either
+	// a `cacert` or `insecureSkipVerify` parseable as a boolean. Without one of
+	// the latter two it marks the provider's secret invalid and never attempts
+	// a connection — a state that looks like a credentials problem and is not.
+	// Verified against the vendored engine's own validation on a live cluster.
+	if creds.CACert != "" {
+		desired["cacert"] = []byte(creds.CACert)
+	}
+	if creds.InsecureSkipVerify {
+		desired["insecureSkipVerify"] = []byte("true")
+	}
+
+	existing := &corev1.Secret{}
+	err := c.Get(ctx, types.NamespacedName{Namespace: src.Namespace, Name: name}, existing)
+	switch {
+	case apierrors.IsNotFound(err):
+		secret := &corev1.Secret{
+			ObjectMeta: metav1.ObjectMeta{
+				Name:      name,
+				Namespace: src.Namespace,
+				Labels: map[string]string{
+					migrationv1alpha1.ManagedByLabel: migrationv1alpha1.ManagedByValue,
+				},
+				// Forklift matches a provider's Secret by this label when it
+				// re-reads credentials after a Provider edit.
+				Annotations: map[string]string{
+					"createdForProviderType": string(src.Spec.Type),
+				},
+				OwnerReferences: []metav1.OwnerReference{
+					ownerRef(migrationv1alpha1.GroupVersion.WithKind("VMImportSource"), src.Name, src.UID),
+				},
+			},
+			Type: corev1.SecretTypeOpaque,
+			Data: desired,
+		}
+		if err := c.Create(ctx, secret); err != nil {
+			if apierrors.IsAlreadyExists(err) {
+				// Lost a race with another reconcile; the next pass adopts it.
+				return name, &ProjectionError{Reason: migrationv1alpha1.ReasonCredentialsMissing, Message: "credentials Secret is being created"}
+			}
+			return "", err
+		}
+		return name, nil
+
+	case err != nil:
+		return "", err
+	}
+
+	if existing.Labels[migrationv1alpha1.ManagedByLabel] != migrationv1alpha1.ManagedByValue {
+		return "", &ProjectionError{
+			Reason: migrationv1alpha1.ReasonCredentialsMissing,
+			Message: fmt.Sprintf(
+				"Secret %q already exists in this namespace and is not managed by the migration controller; "+
+					"rename the VMImportSource or remove the Secret", name),
+		}
+	}
+
+	if secretDataEqual(existing.Data, desired) {
+		return name, nil
+	}
+	existing.Data = desired
+	if err := c.Update(ctx, existing); err != nil {
+		return "", err
+	}
+	return name, nil
+}
+
+func secretDataEqual(a, b map[string][]byte) bool {
+	if len(a) != len(b) {
+		return false
+	}
+	for k, av := range a {
+		bv, ok := b[k]
+		if !ok || string(av) != string(bv) {
+			return false
+		}
+	}
+	return true
+}
diff --git a/internal/migrationcontroller/forklift.go b/internal/migrationcontroller/forklift.go
new file mode 100644
index 0000000000..81de409e2e
--- /dev/null
+++ b/internal/migrationcontroller/forklift.go
@@ -0,0 +1,156 @@
+// SPDX-License-Identifier: Apache-2.0
+
+// Package migrationcontroller reconciles the forklift.cozystack.io API group:
+// VMImportSource connections and the VMImportTask operations that run over them.
+//
+// Forklift, KubeVirt and CDI objects are handled as unstructured rather than
+// through generated types. That is deliberate: those projects' Go modules are
+// heavy transitive dependencies, Cozystack drives only a handful of their
+// fields, and Forklift in particular is an optional package that may not be
+// installed at all — an unstructured client degrades to a clean NotFound
+// instead of forcing the scheme to carry types for CRDs that are absent.
+package migrationcontroller
+
+import (
+	"strings"
+
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apimachinery/pkg/types"
+)
+
+// Forklift's API group. Cozystack pins the operator package to v2.11.x, which
+// serves v1beta1 for every kind used here.
+const (
+	forkliftGroup   = "forklift.konveyor.io"
+	forkliftVersion = "v1beta1"
+)
+
+// Forklift kinds this controller creates or reads.
+var (
+	providerGVK   = forkliftGVK("Provider")
+	hostGVK       = forkliftGVK("Host")
+	planGVK       = forkliftGVK("Plan")
+	migrationGVK  = forkliftGVK("Migration")
+	networkMapGVK = forkliftGVK("NetworkMap")
+	storageMapGVK = forkliftGVK("StorageMap")
+)
+
+// KubeVirt and CDI kinds this controller reads and cleans up. The
+// VirtualMachine Forklift creates is never started: it is read for the source
+// VM's shape (CPU, memory, firmware, disk order) and then discarded. The one
+// thing it does not carry is which networks and datastores the VM uses, which
+// is why the maps are built from the inventory instead (see sourceTopology).
+var (
+	virtualMachineGVK = schema.GroupVersionKind{Group: "kubevirt.io", Version: "v1", Kind: "VirtualMachine"}
+	dataVolumeGVK     = schema.GroupVersionKind{Group: "cdi.kubevirt.io", Version: "v1beta1", Kind: "DataVolume"}
+)
+
+// Cozystack application kinds the controller produces. These are projections
+// over HelmReleases: creating one through the aggregated API is exactly what a
+// tenant does in the dashboard, so the controller takes the same path rather
+// than writing HelmReleases behind the projection's back.
+var (
+	vmDiskGVK     = appsGVK("VMDisk")
+	vmInstanceGVK = appsGVK("VMInstance")
+)
+
+func forkliftGVK(kind string) schema.GroupVersionKind {
+	return schema.GroupVersionKind{Group: forkliftGroup, Version: forkliftVersion, Kind: kind}
+}
+
+func appsGVK(kind string) schema.GroupVersionKind {
+	return schema.GroupVersionKind{Group: "apps.cozystack.io", Version: "v1alpha1", Kind: kind}
+}
+
+// newForkliftObject returns an empty unstructured object of the given kind,
+// ready to Get into or to fill in and Create.
+func newObject(gvk schema.GroupVersionKind) *unstructured.Unstructured {
+	u := &unstructured.Unstructured{}
+	u.SetGroupVersionKind(gvk)
+	return u
+}
+
+// sourceProviderName is the name of the Forklift Provider that stands for a
+// VMImportSource. It is derived from the Source rather than random so a
+// reconcile after a controller restart finds the same object.
+func sourceProviderName(sourceName string) string {
+	return "vmimport-" + sourceName
+}
+
+// destinationProviderName is the name of the Forklift Provider that stands for
+// this cluster. Forklift models the local cluster as an "openshift"-type
+// provider with an empty URL; the type name is Forklift's, not a statement
+// about what Cozystack runs on.
+func destinationProviderName(sourceName string) string {
+	return "vmimport-" + sourceName + "-destination"
+}
+
+// credentialsSecretName is the name of the Secret the controller projects a
+// Source's credentials into for Forklift to consume.
+func credentialsSecretName(sourceName string) string {
+	return "vmimport-" + sourceName + "-credentials"
+}
+
+// hostOverrideName is the name of the Forklift Host that redirects the disk
+// transfer for one ESXi host, and of the Secret carrying that host's account.
+func hostOverrideName(sourceName, hostID string) string {
+	return "vmimport-" + sourceName + "-host-" + sanitizeName(hostID)
+}
+
+// planName is the name of the Forklift Plan that migrates one source VM for a
+// task. One Plan per VM keeps a single VM's failure from stalling its siblings.
+func planName(taskName, vmID string) string {
+	return taskName + "-" + sanitizeName(vmID)
+}
+
+// mapName is the name of the Network/StorageMap a task owns. Both maps are
+// per-task: their content is identical for every VM in the task.
+func mapName(taskName string) string {
+	return "vmimport-" + taskName
+}
+
+// sanitizeName turns a provider-side identifier (`vm-1234`, and on other
+// providers a UUID or a path) into something usable as a Kubernetes name
+// segment. Managed-object references are already lowercase alphanumerics with
+// dashes, but the API must not depend on that.
+func sanitizeName(in string) string {
+	out := make([]rune, 0, len(in))
+	for _, r := range in {
+		switch {
+		case r >= 'a' && r <= 'z', r >= '0' && r <= '9', r == '-':
+			out = append(out, r)
+		case r >= 'A' && r <= 'Z':
+			out = append(out, r+('a'-'A'))
+		default:
+			out = append(out, '-')
+		}
+	}
+	// A leading or trailing dash is not a valid name segment.
+	trimmed := strings.Trim(string(out), "-")
+	if trimmed == "" {
+		return "unnamed"
+	}
+	if len(trimmed) > 40 {
+		trimmed = strings.Trim(trimmed[:40], "-")
+	}
+	return trimmed
+}
+
+// ownerRef returns a controller owner reference for the given object. Every
+// piece of migration scaffolding carries one, so deleting the owning Source or
+// Task garbage-collects it; the imported VMDisks and VMInstances deliberately
+// carry none, which is what makes them outlive the task that produced them.
+func ownerRef(gvk schema.GroupVersionKind, name string, uid types.UID) metav1.OwnerReference {
+	controller := true
+	blockOwnerDeletion := true
+	return metav1.OwnerReference{
+		APIVersion:         gvk.GroupVersion().String(),
+		Kind:               gvk.Kind,
+		Name:               name,
+		UID:                uid,
+		Controller:         &controller,
+		BlockOwnerDeletion: &blockOwnerDeletion,
+	}
+}
diff --git a/internal/migrationcontroller/forklift_objects.go b/internal/migrationcontroller/forklift_objects.go
new file mode 100644
index 0000000000..6705bf8437
--- /dev/null
+++ b/internal/migrationcontroller/forklift_objects.go
@@ -0,0 +1,521 @@
+// SPDX-License-Identifier: Apache-2.0
+
+package migrationcontroller
+
+import (
+	"context"
+	"fmt"
+	"maps"
+	"strings"
+
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apimachinery/pkg/types"
+
+	migrationv1alpha1 "github.com/cozystack/cozystack/api/migration/v1alpha1"
+)
+
+// taskOwnership returns the labels and owner reference every piece of a task's
+// Forklift scaffolding carries. The labels let the controller watch Migrations
+// and map them back without trusting a label an unrelated object might set; the
+// owner reference is what makes deleting the task take the scaffolding with it.
+func taskOwnership(task *migrationv1alpha1.VMImportTask) (map[string]string, metav1.OwnerReference) {
+	return map[string]string{
+		migrationv1alpha1.ManagedByLabel:           migrationv1alpha1.ManagedByValue,
+		migrationv1alpha1.OwningTaskNameLabel:      task.Name,
+		migrationv1alpha1.OwningTaskNamespaceLabel: task.Namespace,
+	}, ownerRef(
+		migrationv1alpha1.GroupVersion.WithKind("VMImportTask"), task.Name, task.UID)
+}
+
+// outputMarkers are the labels every object a task produces carries: which
+// task made it, and for which source VM. Labels rather than owner references,
+// because outputs are meant to outlive the task that created them.
+func outputMarkers(task *migrationv1alpha1.VMImportTask, vmID string) map[string]string {
+	return map[string]string{
+		migrationv1alpha1.OutputTaskUIDLabel: string(task.UID),
+		migrationv1alpha1.OutputVMIDLabel:    sanitizeName(vmID),
+	}
+}
+
+// stampOutput writes the markers onto an object being created, preserving any
+// labels already set on it.
+func stampOutput(obj metav1.Object, task *migrationv1alpha1.VMImportTask, vmID string) {
+	labels := obj.GetLabels()
+	if labels == nil {
+		labels = map[string]string{}
+	}
+	maps.Copy(labels, outputMarkers(task, vmID))
+	obj.SetLabels(labels)
+}
+
+// isOwnOutput reports whether an existing object is this task's own earlier
+// output for this source VM, rather than something that merely shares its name.
+// Absence of the marker is the answer that matters: it means a tenant object is
+// standing where an output would go, which is a collision and never a resume.
+func isOwnOutput(obj metav1.Object, task *migrationv1alpha1.VMImportTask, vmID string) bool {
+	labels := obj.GetLabels()
+	if labels == nil {
+		return false
+	}
+	return labels[migrationv1alpha1.OutputTaskUIDLabel] == string(task.UID) &&
+		labels[migrationv1alpha1.OutputVMIDLabel] == sanitizeName(vmID)
+}
+
+// providerRefs is the source/destination pair every Forklift object in a task
+// points at. Both live in the task's namespace, because a Source does.
+func providerRefs(task *migrationv1alpha1.VMImportTask, src *migrationv1alpha1.VMImportSource) map[string]any {
+	return map[string]any{
+		"source": map[string]any{
+			"name":      sourceProviderName(src.Name),
+			"namespace": task.Namespace,
+		},
+		"destination": map[string]any{
+			"name":      destinationProviderName(src.Name),
+			"namespace": task.Namespace,
+		},
+	}
+}
+
+// ensureMaps creates the NetworkMap and StorageMap a Plan requires. Both start
+// empty — Forklift will not validate a Plan without them — and populateMaps
+// fills them in from what the inventory says each VM actually uses, one VM at a
+// time as its reconcile reaches this point.
+func (r *VMImportTaskReconciler) ensureMaps(
+	ctx context.Context,
+	task *migrationv1alpha1.VMImportTask,
+	src *migrationv1alpha1.VMImportSource,
+	storageClass string,
+) error {
+	labels, owner := taskOwnership(task)
+	name := mapName(task.Name)
+
+	for _, gvk := range []struct {
+		gvk schema.GroupVersionKind
+	}{{networkMapGVK}, {storageMapGVK}} {
+		existing := newObject(gvk.gvk)
+		err := r.Get(ctx, types.NamespacedName{Namespace: task.Namespace, Name: name}, existing)
+		if err == nil {
+			continue
+		}
+		if !apierrors.IsNotFound(err) {
+			return err
+		}
+		obj := newObject(gvk.gvk)
+		obj.SetName(name)
+		obj.SetNamespace(task.Namespace)
+		obj.SetLabels(labels)
+		obj.SetOwnerReferences([]metav1.OwnerReference{owner})
+		spec := map[string]any{
+			"provider": providerRefs(task, src),
+			"map":      []any{},
+		}
+		if err := unstructured.SetNestedMap(obj.Object, spec, "spec"); err != nil {
+			return err
+		}
+		if err := r.Create(ctx, obj); err != nil && !apierrors.IsAlreadyExists(err) {
+			return err
+		}
+	}
+
+	// The storage class is not part of the map until a datastore is known, but
+	// it must be recorded somewhere the next pass can read it: the map's own
+	// annotation is the natural place, and it keeps the class immutable for the
+	// task's lifetime even if the cluster default changes mid-import.
+	sm := newObject(storageMapGVK)
+	if err := r.Get(ctx, types.NamespacedName{Namespace: task.Namespace, Name: name}, sm); err != nil {
+		return err
+	}
+	annotations := sm.GetAnnotations()
+	if annotations == nil {
+		annotations = map[string]string{}
+	}
+	if annotations[storageClassAnnotation] == storageClass {
+		return nil
+	}
+	annotations[storageClassAnnotation] = storageClass
+	sm.SetAnnotations(annotations)
+	return r.Update(ctx, sm)
+}
+
+// storageClassAnnotation records the resolved StorageClass on the task's
+// StorageMap, so mappings learned later all land on the same class.
+const storageClassAnnotation = "forklift.cozystack.io/storage-class"
+
+// forkliftPowerStateOff is Forklift's `off` target power state
+// (plan.TargetPowerStateOff upstream). Spelled out rather than imported: the
+// controller deliberately builds Forklift objects as unstructured data and
+// takes no compile-time dependency on the Forklift API module.
+const forkliftPowerStateOff = "off"
+
+// createPlan renders the Forklift Plan that migrates one VM.
+//
+// Raw copy (skipGuestConversion) is the only mode v1 offers, and it is the one
+// that needs no privileged pod anywhere: Forklift emits a CDI DataVolume with a
+// VDDK source and CDI's own importer — which satisfies the restricted Pod
+// Security Standard — moves the bytes. Guest conversion needs a node-level
+// seccomp profile and arrives as a separate, additive option.
+func (r *VMImportTaskReconciler) createPlan(
+	ctx context.Context,
+	task *migrationv1alpha1.VMImportTask,
+	src *migrationv1alpha1.VMImportSource,
+	req *migrationv1alpha1.VMImportRequest,
+) error {
+	labels, owner := taskOwnership(task)
+	obj := newObject(planGVK)
+	obj.SetName(planName(task.Name, req.ID))
+	obj.SetNamespace(task.Namespace)
+	obj.SetLabels(labels)
+	obj.SetOwnerReferences([]metav1.OwnerReference{owner})
+
+	spec := map[string]any{
+		"skipGuestConversion": true,
+		"provider":            providerRefs(task, src),
+		"map": map[string]any{
+			"network": map[string]any{
+				"name":      mapName(task.Name),
+				"namespace": task.Namespace,
+			},
+			"storage": map[string]any{
+				"name":      mapName(task.Name),
+				"namespace": task.Namespace,
+			},
+		},
+		// The destination is always the task's own namespace. There is no
+		// field for anything else: an import lands where the object that
+		// asked for it lives, which removes the whole class of
+		// cross-namespace coercion bugs.
+		"targetNamespace": task.Namespace,
+		"vms": []any{
+			map[string]any{
+				"id": req.ID,
+				// Keep the machine Forklift builds powered off. Left unset,
+				// Forklift matches the source's pre-migration power state, so
+				// migrating a running VM — every VM in a production cutover —
+				// yields a target that boots the moment the transfer finishes.
+				// That is a duplicate of a live machine on the network, and it
+				// starts a guest on the very volume the handoff is about to
+				// re-point. The VMInstance this controller builds is what
+				// starts the imported guest, on the tenant's terms.
+				"targetPowerState": forkliftPowerStateOff,
+			},
+		},
+	}
+	if err := unstructured.SetNestedMap(obj.Object, spec, "spec"); err != nil {
+		return err
+	}
+	if err := r.Create(ctx, obj); err != nil && !apierrors.IsAlreadyExists(err) {
+		return err
+	}
+	return nil
+}
+
+// ensureMigration creates the Migration that runs a validated Plan. A Plan
+// describes the work; a Migration is the instruction to do it.
+func (r *VMImportTaskReconciler) ensureMigration(
+	ctx context.Context,
+	task *migrationv1alpha1.VMImportTask,
+	plan string,
+) (*unstructured.Unstructured, error) {
+	existing := newObject(migrationGVK)
+	err := r.Get(ctx, types.NamespacedName{Namespace: task.Namespace, Name: plan}, existing)
+	if err == nil {
+		return existing, nil
+	}
+	if !apierrors.IsNotFound(err) {
+		return nil, err
+	}
+
+	labels, owner := taskOwnership(task)
+	obj := newObject(migrationGVK)
+	obj.SetName(plan)
+	obj.SetNamespace(task.Namespace)
+	obj.SetLabels(labels)
+	obj.SetOwnerReferences([]metav1.OwnerReference{owner})
+	spec := map[string]any{
+		"plan": map[string]any{
+			"name":      plan,
+			"namespace": task.Namespace,
+		},
+	}
+	if err := unstructured.SetNestedMap(obj.Object, spec, "spec"); err != nil {
+		return nil, err
+	}
+	if err := r.Create(ctx, obj); err != nil && !apierrors.IsAlreadyExists(err) {
+		return nil, err
+	}
+	// Return the object as created; its status appears on a later pass.
+	return obj, nil
+}
+
+// populateMaps adds one VM's networks and datastores to the task's maps.
+//
+// The topology comes from Forklift's inventory, because it exists nowhere else:
+// a Plan's validation conditions name the VMs that are unmapped, never what
+// they are unmapped to. The maps accumulate across the task's VMs — each pass
+// adds only what is missing — so the task ends up with one entry per distinct
+// network and datastore however many machines share them.
+//
+// Networks all map to the pod network. That is not a placeholder: the map
+// shapes the interfaces of the KubeVirt VM Forklift creates, and this
+// controller discards that VM unstarted — the imported machine's networking
+// comes from the VMInstance it builds instead, which attaches to the pod
+// network. When a richer network placement design lands, this is where a
+// tenant-specified mapping would be honoured.
+//
+// Returns true when it changed something, so the caller waits for Forklift to
+// re-validate rather than racing ahead.
+func (r *VMImportTaskReconciler) populateMaps(
+	ctx context.Context,
+	task *migrationv1alpha1.VMImportTask,
+	src *migrationv1alpha1.VMImportSource,
+	req *migrationv1alpha1.VMImportRequest,
+) (bool, error) {
+	networks, datastores, err := r.sourceTopology(ctx, task, src, req)
+	if err != nil {
+		return false, err
+	}
+	if len(networks) == 0 && len(datastores) == 0 {
+		return false, nil
+	}
+
+	name := mapName(task.Name)
+	changed := false
+
+	if len(networks) > 0 {
+		nm := newObject(networkMapGVK)
+		if err := r.Get(ctx, types.NamespacedName{Namespace: task.Namespace, Name: name}, nm); err != nil {
+			return false, err
+		}
+		entries, _, _ := unstructured.NestedSlice(nm.Object, "spec", "map")
+		added := false
+		for _, id := range networks {
+			if hasSourceID(entries, id) {
+				continue
+			}
+			entries = append(entries, map[string]any{
+				"source":      map[string]any{"id": id},
+				"destination": map[string]any{"type": "pod"},
+			})
+			added = true
+		}
+		if added {
+			if err := unstructured.SetNestedSlice(nm.Object, entries, "spec", "map"); err != nil {
+				return false, err
+			}
+			if err := r.Update(ctx, nm); err != nil {
+				return false, err
+			}
+			changed = true
+		}
+	}
+
+	if len(datastores) > 0 {
+		sm := newObject(storageMapGVK)
+		if err := r.Get(ctx, types.NamespacedName{Namespace: task.Namespace, Name: name}, sm); err != nil {
+			return false, err
+		}
+		storageClass := sm.GetAnnotations()[storageClassAnnotation]
+		if storageClass == "" {
+			return false, fmt.Errorf("StorageMap %s/%s carries no resolved storage class", task.Namespace, name)
+		}
+		entries, _, _ := unstructured.NestedSlice(sm.Object, "spec", "map")
+		added := false
+		for _, id := range datastores {
+			if hasSourceID(entries, id) {
+				continue
+			}
+			entries = append(entries, map[string]any{
+				"source":      map[string]any{"id": id},
+				"destination": map[string]any{"storageClass": storageClass},
+			})
+			added = true
+		}
+		if added {
+			if err := unstructured.SetNestedSlice(sm.Object, entries, "spec", "map"); err != nil {
+				return false, err
+			}
+			if err := r.Update(ctx, sm); err != nil {
+				return false, err
+			}
+			changed = true
+		}
+	}
+
+	return changed, nil
+}
+
+// sourceTopology asks Forklift's inventory which networks and datastores one
+// VM actually uses.
+//
+// This is the only place the answer exists. Forklift's Plan conditions name the
+// VMs that are unmapped, not what they are unmapped to, and no Forklift custom
+// resource carries a VM's network or datastore IDs — see the comment on
+// inventoryClient for the source references.
+//
+// Scoped to a single VM on purpose. Reading the whole task here would tie every
+// VM's fate to every other one: a single mistyped managed-object reference — the
+// likeliest error on this API — would fail the VM being reconciled with a
+// message naming a different machine, where a missing VM is meant to fail alone
+// while its siblings proceed. It is also what keeps the cost linear: one GET per
+// VM per pass rather than one per VM *for* every VM, repeated on every requeue
+// while anything is still transferring.
+func (r *VMImportTaskReconciler) sourceTopology(
+	ctx context.Context,
+	task *migrationv1alpha1.VMImportTask,
+	src *migrationv1alpha1.VMImportSource,
+	req *migrationv1alpha1.VMImportRequest,
+) (networks, datastores []string, err error) {
+	if r.Inventory == nil {
+		return nil, nil, fmt.Errorf("no inventory client configured; the network and storage maps cannot be built")
+	}
+
+	// The inventory addresses providers by UID, so the Provider object this
+	// task's Source produced has to be read for it.
+	provider := newObject(providerGVK)
+	if err := r.Get(ctx, types.NamespacedName{
+		Namespace: task.Namespace, Name: sourceProviderName(src.Name),
+	}, provider); err != nil {
+		return nil, nil, err
+	}
+	uid := string(provider.GetUID())
+	if uid == "" {
+		return nil, nil, fmt.Errorf("source Provider %s/%s has no UID yet", task.Namespace, sourceProviderName(src.Name))
+	}
+
+	vm, err := r.Inventory.VM(ctx, uid, req.ID)
+	if err != nil {
+		return nil, nil, err
+	}
+	return vm.networkIDs(), vm.datastoreIDs(), nil
+}
+
+func hasSourceID(entries []any, id string) bool {
+	for _, raw := range entries {
+		entry, ok := raw.(map[string]any)
+		if !ok {
+			continue
+		}
+		existing, _, _ := unstructured.NestedString(entry, "source", "id")
+		if existing == id {
+			return true
+		}
+		name, _, _ := unstructured.NestedString(entry, "source", "name")
+		if name == id {
+			return true
+		}
+	}
+	return false
+}
+
+// planCriticalCondition returns Forklift's own words for why a Plan cannot run,
+// or empty if nothing is critically wrong. Unmapped references are excluded:
+// those are not failures, they are what populateMaps resolves.
+func planCriticalCondition(plan *unstructured.Unstructured) string {
+	conditions, _, _ := unstructured.NestedSlice(plan.Object, "status", "conditions")
+	var critical []string
+	for _, raw := range conditions {
+		cond, ok := raw.(map[string]any)
+		if !ok {
+			continue
+		}
+		status, _, _ := unstructured.NestedString(cond, "status")
+		category, _, _ := unstructured.NestedString(cond, "category")
+		ctype, _, _ := unstructured.NestedString(cond, "type")
+		message, _, _ := unstructured.NestedString(cond, "message")
+		if status != "True" || category != "Critical" {
+			continue
+		}
+		if strings.Contains(ctype, "NotMapped") {
+			continue
+		}
+		critical = append(critical, fmt.Sprintf("%s: %s", ctype, message))
+	}
+	if len(critical) == 0 {
+		return ""
+	}
+	return strings.Join(critical, "; ")
+}
+
+// planReady reports whether Forklift considers the Plan runnable.
+func planReady(plan *unstructured.Unstructured) bool {
+	conditions, _, _ := unstructured.NestedSlice(plan.Object, "status", "conditions")
+	for _, raw := range conditions {
+		cond, ok := raw.(map[string]any)
+		if !ok {
+			continue
+		}
+		ctype, _, _ := unstructured.NestedString(cond, "type")
+		status, _, _ := unstructured.NestedString(cond, "status")
+		if ctype == "Ready" && status == "True" {
+			return true
+		}
+	}
+	return false
+}
+
+// migrationProgress reads a Migration's status: whether the transfer finished,
+// how far along it is, and the failure text if it failed.
+func migrationProgress(migration *unstructured.Unstructured) (done bool, progress int32, failure string) {
+	vms, _, _ := unstructured.NestedSlice(migration.Object, "status", "vms")
+	if len(vms) == 0 {
+		return false, 0, ""
+	}
+	vm, ok := vms[0].(map[string]any)
+	if !ok {
+		return false, 0, ""
+	}
+
+	if reasons, found, _ := unstructured.NestedStringSlice(vm, "error", "reasons"); found && len(reasons) > 0 {
+		return false, 0, strings.Join(reasons, "; ")
+	}
+	phase, _, _ := unstructured.NestedString(vm, "phase")
+	if phase == "Failed" {
+		return false, 0, "the migration engine reported the transfer as failed"
+	}
+
+	// Progress is a completed/total pair per pipeline step, counted in MiB.
+	// Prefer the disk-transfer step, because averaging a four-step pipeline
+	// reads 25% before a byte has moved — but fall back to the sum over every
+	// step that reports a total, since the step names are not part of any
+	// contract and a release that renames them would otherwise peg progress at
+	// zero for the whole transfer.
+	var completed, total int64
+	var namedCompleted, namedTotal int64
+	pipeline, _, _ := unstructured.NestedSlice(vm, "pipeline")
+	for _, raw := range pipeline {
+		step, ok := raw.(map[string]any)
+		if !ok {
+			continue
+		}
+		c, _, _ := unstructured.NestedInt64(step, "progress", "completed")
+		t, _, _ := unstructured.NestedInt64(step, "progress", "total")
+		if t <= 0 {
+			continue
+		}
+		completed += c
+		total += t
+		if name, _, _ := unstructured.NestedString(step, "name"); strings.Contains(strings.ToLower(name), "disktransfer") {
+			namedCompleted += c
+			namedTotal += t
+		}
+	}
+	switch {
+	case namedTotal > 0:
+		progress = int32(namedCompleted * 100 / namedTotal)
+	case total > 0:
+		progress = int32(completed * 100 / total)
+	}
+
+	// Either signal means the transfer is over: the phase the engine settles
+	// on, or the completion timestamp it stamps.
+	if phase == "Completed" {
+		return true, 100, ""
+	}
+	if ts, found, _ := unstructured.NestedString(vm, "completed"); found && ts != "" {
+		return true, 100, ""
+	}
+	return false, progress, ""
+}
diff --git a/internal/migrationcontroller/handoff.go b/internal/migrationcontroller/handoff.go
new file mode 100644
index 0000000000..7e25d409be
--- /dev/null
+++ b/internal/migrationcontroller/handoff.go
@@ -0,0 +1,909 @@
+// SPDX-License-Identifier: Apache-2.0
+
+package migrationcontroller
+
+import (
+	"context"
+	"fmt"
+	"maps"
+	"sort"
+
+	corev1 "k8s.io/api/core/v1"
+	storagev1 "k8s.io/api/storage/v1"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	"k8s.io/apimachinery/pkg/api/meta"
+	"k8s.io/apimachinery/pkg/api/resource"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/apimachinery/pkg/types"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/log"
+
+	migrationv1alpha1 "github.com/cozystack/cozystack/api/migration/v1alpha1"
+)
+
+// populatedForAnnotation is what makes the handoff free.
+//
+// CDI reads it as pure data: a string compare against the DataVolume's name,
+// with no provenance check and no requirement that CDI ever saw the claim
+// before, which is exactly why a controller may stamp it on a claim CDI has
+// never met. It is evaluated before claim adoption in both the validating
+// webhook and the import controller's work check, so it needs neither the
+// DataVolumeClaimAdoption feature gate nor any annotation on the DataVolume —
+// Cozystack's CDI configuration stays untouched.
+//
+// This is not a novel bet: it is the same primitive Cozystack's Velero VM
+// restore path already depends on in production.
+const populatedForAnnotation = "cdi.kubevirt.io/storage.populatedFor"
+
+// Helm ownership metadata. The DataVolume is created before the VMDisk that
+// will own it, so it must already look like part of that release or Helm
+// refuses to adopt it and the release collides with its own volume.
+const (
+	helmManagedByLabel        = "app.kubernetes.io/managed-by"
+	helmManagedByValue        = "Helm"
+	helmReleaseNameAnnotation = "meta.helm.sh/release-name"
+	helmReleaseNsAnnotation   = "meta.helm.sh/release-namespace"
+)
+
+// vmDiskReleasePrefix is how a VMDisk's name becomes its Helm release, and
+// therefore the name of its DataVolume and PVC. The vm-disk chart names its
+// DataVolume after the release, and vm-instance references disks as
+// `vm-disk-<name>`, so this prefix is part of the platform's contract rather
+// than a convention this controller invents.
+const vmDiskReleasePrefix = "vm-disk-"
+
+// outputs names what an import produced for one source VM.
+type outputs struct {
+	VMInstance string
+	Disks      []string
+}
+
+// fulfill converts a finished transfer into Cozystack objects.
+//
+// Forklift's output is a KubeVirt VirtualMachine over CDI-populated claims,
+// which is not what a Cozystack tenant manages. This turns it into VMDisks and
+// a VMInstance without copying a byte: each transferred volume is re-pointed
+// into the claim its VMDisk expects, and CDI is told the claim is already
+// populated. The VirtualMachine Forklift built is read for the source VM's
+// shape and then discarded — it is never started.
+//
+// Returns nil when more passes are needed, and a validationError for a
+// terminal problem the tenant must fix.
+func (r *VMImportTaskReconciler) fulfill(
+	ctx context.Context,
+	task *migrationv1alpha1.VMImportTask,
+	req *migrationv1alpha1.VMImportRequest,
+) (*outputs, error) {
+	logger := log.FromContext(ctx)
+
+	vm, err := r.findForkliftVM(ctx, task, req)
+	if err != nil {
+		return nil, err
+	}
+	if vm == nil {
+		// Already cleaned up: the outputs of a previous pass are authoritative.
+		if prev := findVMStatus(task.Status.VMs, req.ID); prev != nil && prev.VMInstance != "" {
+			return &outputs{VMInstance: prev.VMInstance, Disks: prev.Disks}, nil
+		}
+		// Status may be behind the cluster: dying between deleting the
+		// scaffolding VM and writing the status leaves finished outputs with
+		// nothing recording them. They carry this task's markers, so ask the
+		// cluster rather than failing an import that in fact succeeded.
+		reclaimed, err := r.reclaimOutputs(ctx, task, req)
+		if err != nil {
+			return nil, err
+		}
+		if reclaimed != nil {
+			// A controller predating settleReclaimPolicy deleted the VM before
+			// settling anything, so these volumes may still be on Retain.
+			settled, err := r.settleReclaimPolicies(ctx, task, req.ID, reclaimed.Disks, nil)
+			if err != nil || !settled {
+				return nil, err
+			}
+			logger.Info("reclaimed outputs recorded by no status", "vm", req.ID, "instance", reclaimed.VMInstance)
+			return reclaimed, nil
+		}
+		return nil, &validationError{
+			reason:  migrationv1alpha1.ReasonTransferFailed,
+			message: fmt.Sprintf("the transfer completed but no imported VM was found for %s", req.ID),
+		}
+	}
+
+	name := req.Name
+	if name == "" {
+		name = sanitizeName(vm.GetName())
+	}
+
+	claims := forkliftVMClaims(vm)
+	if len(claims) == 0 {
+		return nil, &validationError{
+			reason:  migrationv1alpha1.ReasonTransferFailed,
+			message: fmt.Sprintf("the imported VM %s has no volumes to adopt", vm.GetName()),
+		}
+	}
+
+	diskNames := make([]string, 0, len(claims))
+	for i, claim := range claims {
+		diskName := fmt.Sprintf("%s-disk-%d", name, i)
+		diskNames = append(diskNames, diskName)
+		if err := r.adoptVolume(ctx, task, req.ID, claim, diskName); err != nil {
+			return nil, err
+		}
+	}
+	settled, err := r.settleReclaimPolicies(ctx, task, req.ID, diskNames, claims)
+	if err != nil || !settled {
+		return nil, err
+	}
+
+	// The VMInstance is created only once every disk is in place, its volume
+	// policy included, so a tenant never sees an instance referencing a disk
+	// that does not exist yet, and an import failing past this point leaves
+	// disks that clean up after themselves like any other.
+	if err := r.createVMInstance(ctx, task, req, name, vm, diskNames); err != nil {
+		return nil, err
+	}
+
+	// The scaffolding VM goes last: while it exists, KubeVirt's own garbage
+	// collection could still reach the claims through its owner references.
+	if err := r.Delete(ctx, vm); err != nil && !apierrors.IsNotFound(err) {
+		return nil, err
+	}
+	logger.Info("imported VM fulfilled", "vm", name, "disks", len(diskNames))
+
+	return &outputs{VMInstance: name, Disks: diskNames}, nil
+}
+
+// findForkliftVM locates the VirtualMachine Forklift created for this source VM.
+//
+// The link is Forklift's `plan` label, and its value is the Plan's **UID**, not
+// its name — so the Plan has to be read to learn what to match against. Getting
+// this wrong does not fail loudly: the lookup simply never matches, the
+// transferred disk is never adopted, and the task sits in Creating forever.
+func (r *VMImportTaskReconciler) findForkliftVM(
+	ctx context.Context,
+	task *migrationv1alpha1.VMImportTask,
+	req *migrationv1alpha1.VMImportRequest,
+) (*unstructured.Unstructured, error) {
+	name := planName(task.Name, req.ID)
+
+	plan := newObject(planGVK)
+	err := r.Get(ctx, types.NamespacedName{Namespace: task.Namespace, Name: name}, plan)
+	if err != nil {
+		if apierrors.IsNotFound(err) || meta.IsNoMatchError(err) {
+			return nil, nil
+		}
+		return nil, err
+	}
+	planUID := string(plan.GetUID())
+
+	list := &unstructured.UnstructuredList{}
+	list.SetGroupVersionKind(virtualMachineGVK.GroupVersion().WithKind("VirtualMachineList"))
+	if err := r.List(ctx, list, client.InNamespace(task.Namespace)); err != nil {
+		if apierrors.IsNotFound(err) || meta.IsNoMatchError(err) {
+			return nil, nil
+		}
+		return nil, err
+	}
+	for i := range list.Items {
+		item := &list.Items[i]
+		labels := item.GetLabels()
+		if planUID != "" && (labels["plan"] == planUID || labels["migration"] == planUID) {
+			return item, nil
+		}
+		// Some Forklift versions stamp the name instead; accept either rather
+		// than depending on which one this release happens to use.
+		if labels["plan"] == name || labels["migration"] == name {
+			return item, nil
+		}
+	}
+	return nil, nil
+}
+
+// forkliftVMClaims returns the claim names backing the imported VM, in the
+// source VM's own disk order — which is the order the guest's firmware expects
+// to boot from, so it must be preserved rather than sorted.
+func forkliftVMClaims(vm *unstructured.Unstructured) []string {
+	volumes, _, _ := unstructured.NestedSlice(vm.Object, "spec", "template", "spec", "volumes")
+	claims := make([]string, 0, len(volumes))
+	for _, raw := range volumes {
+		vol, ok := raw.(map[string]any)
+		if !ok {
+			continue
+		}
+		if name, found, _ := unstructured.NestedString(vol, "dataVolume", "name"); found && name != "" {
+			claims = append(claims, name)
+			continue
+		}
+		if name, found, _ := unstructured.NestedString(vol, "persistentVolumeClaim", "claimName"); found && name != "" {
+			claims = append(claims, name)
+		}
+	}
+	return claims
+}
+
+// sourceFirmware translates the boot configuration of the VM Forklift built
+// into the vm-instance `firmware` block, or returns nil when the source says
+// nothing and the instance profile's own default should stand.
+//
+// Forklift copies the source's firmware onto the VirtualMachine it creates, so
+// this is the source's boot mode as the migration engine understood it — read
+// from the object the handoff already holds rather than from a second inventory
+// lookup. Carrying it across is not cosmetic: a UEFI guest rendered with a BIOS
+// bootloader imports "successfully" and then does not boot, which is why the
+// vm-instance firmware field (cozystack/cozystack#3002) is a merge-order
+// dependency of this controller.
+func sourceFirmware(vm *unstructured.Unstructured) map[string]any {
+	base := []string{"spec", "template", "spec", "domain", "firmware", "bootloader"}
+
+	if efi, found, _ := unstructured.NestedMap(vm.Object, append(base, "efi")...); found {
+		fw := map[string]any{"bootloader": "uefi"}
+		// secureBoot is reported by the source; persistent NVRAM is not, and is
+		// deliberately left to the tenant — it pins the VM to a node.
+		if sb, ok := efi["secureBoot"].(bool); ok && sb {
+			fw["secureBoot"] = true
+		}
+		return fw
+	}
+	// `efi: {}` renders as an empty map, but a malformed value under the key
+	// still means EFI was asked for; treat presence as the answer.
+	if _, present, _ := unstructured.NestedFieldNoCopy(vm.Object, append(base, "efi")...); present {
+		return map[string]any{"bootloader": "uefi"}
+	}
+	if _, present, _ := unstructured.NestedFieldNoCopy(vm.Object, append(base, "bios")...); present {
+		return map[string]any{"bootloader": "bios"}
+	}
+	return nil
+}
+
+// ahciPorts is how many disks the SATA bus can carry: the q35 machine type
+// KubeVirt renders gives its AHCI controller six ports, no more.
+const ahciPorts = 6
+
+// importedDiskBus picks the bus for one imported disk by its position.
+//
+// The import copies the guest verbatim (skipGuestConversion in createPlan), so
+// it arrives with the drivers it had under VMware and no virtio among them. On
+// a virtio disk such a guest does not boot at all: Linux stalls in the initramfs
+// with no root device, Windows stops at 0x7B. AHCI is inbox everywhere, so the
+// disk that has to be readable before the guest's own modules are available
+// goes on SATA.
+//
+// Past the AHCI port count the rest fall back to virtio. That is a deliberate
+// trade rather than a failure: only the boot disk must be reachable from the
+// initramfs, and once Linux has mounted the root it loads virtio_blk like any
+// other module. A Windows guest instead sees those disks appear once virtio-win
+// is installed, which is recoverable, where an unbootable import is not.
+//
+// When guest conversion arrives as its own option it should hand back virtio
+// for converted VMs, since virt-v2v installs the very drivers this works around.
+func importedDiskBus(index int) string {
+	if index < ahciPorts {
+		return "sata"
+	}
+	return "virtio"
+}
+
+// reclaimOutputs finds this task's finished outputs for one VM when its status
+// does not name them, and returns nil when there are none.
+//
+// The window it covers is narrow and real: the scaffolding VirtualMachine is
+// deleted before the status write that records what was produced, so a crash
+// between the two leaves a healthy VMInstance and its disks with nothing
+// pointing at them. Without this the next pass reports Failed on a machine that
+// works. The markers make the lookup exact — the task's UID and the source VM
+// ID — so this can never adopt a tenant's object or another task's.
+func (r *VMImportTaskReconciler) reclaimOutputs(
+	ctx context.Context,
+	task *migrationv1alpha1.VMImportTask,
+	req *migrationv1alpha1.VMImportRequest,
+) (*outputs, error) {
+	markers := client.MatchingLabels(outputMarkers(task, req.ID))
+
+	instances := &unstructured.UnstructuredList{}
+	instances.SetGroupVersionKind(vmInstanceGVK)
+	if err := r.List(ctx, instances, client.InNamespace(task.Namespace), markers); err != nil {
+		return nil, err
+	}
+	if len(instances.Items) == 0 {
+		return nil, nil
+	}
+
+	disks := &unstructured.UnstructuredList{}
+	disks.SetGroupVersionKind(vmDiskGVK)
+	if err := r.List(ctx, disks, client.InNamespace(task.Namespace), markers); err != nil {
+		return nil, err
+	}
+	names := make([]string, 0, len(disks.Items))
+	for i := range disks.Items {
+		names = append(names, disks.Items[i].GetName())
+	}
+	// Disk order is what the VMInstance's own disk list records, and a label
+	// query returns no order at all, so sort for a stable status.
+	sort.Strings(names)
+
+	return &outputs{VMInstance: instances.Items[0].GetName(), Disks: names}, nil
+}
+
+// adoptVolume moves one transferred volume under the name a VMDisk expects,
+// then creates the VMDisk over it. No data is copied: the PersistentVolume is
+// retained and re-bound, which is the whole point of the exercise.
+func (r *VMImportTaskReconciler) adoptVolume(
+	ctx context.Context,
+	task *migrationv1alpha1.VMImportTask,
+	vmID string,
+	sourceClaim string,
+	diskName string,
+) error {
+	target := vmDiskReleasePrefix + diskName
+
+	// Idempotency, but only over this task's own work. A claim of the right
+	// name that this task did not create is a tenant's disk standing where an
+	// output goes: treating it as a finished pass would attach stale data to
+	// the instance and leave the freshly transferred claim owned by the
+	// scaffolding VM, to be collected the moment that VM is deleted.
+	existing := &corev1.PersistentVolumeClaim{}
+	err := r.Get(ctx, types.NamespacedName{Namespace: task.Namespace, Name: target}, existing)
+	if err == nil {
+		if !isOwnOutput(existing, task, vmID) {
+			return &validationError{
+				reason: migrationv1alpha1.ReasonOutputExists,
+				message: fmt.Sprintf(
+					"a PersistentVolumeClaim named %q already exists in this namespace and was not created by this import; "+
+						"the import will not overwrite it — choose another name for VM %s", target, vmID),
+			}
+		}
+		return r.ensureVMDisk(ctx, task, vmID, diskName, existing)
+	}
+	if !apierrors.IsNotFound(err) {
+		return err
+	}
+
+	pvc := &corev1.PersistentVolumeClaim{}
+	if err := r.Get(ctx, types.NamespacedName{Namespace: task.Namespace, Name: sourceClaim}, pvc); err != nil {
+		return err
+	}
+	if pvc.Spec.VolumeName == "" {
+		return &validationError{
+			reason:  migrationv1alpha1.ReasonTransferFailed,
+			message: fmt.Sprintf("transferred claim %q is not bound to a volume", sourceClaim),
+		}
+	}
+
+	pv := &corev1.PersistentVolume{}
+	if err := r.Get(ctx, types.NamespacedName{Name: pvc.Spec.VolumeName}, pv); err != nil {
+		return err
+	}
+
+	// Order matters here, and getting it wrong destroys data rather than
+	// merely wasting time.
+	//
+	// First, orphan the claim. Forklift drives the transfer through CDI's
+	// volume populator, so the transferred disk arrives as a *populated claim*
+	// with no DataVolume of its own — and Forklift puts an ownerReference to
+	// the VirtualMachine it built on that claim, deliberately, so an abandoned
+	// migration cleans itself up. The consequence is that anything deleting
+	// that VM takes the disk with it, and garbage collection is fast enough to
+	// win any race against a copy: on the original implementation it removed
+	// the claim 357 ms after the VM went, long before a clone could finish.
+	// Clearing the reference unconditionally is what makes the rest of this
+	// function safe to reorder.
+	if err := clearOwnerReferences(ctx, r.Client, task.Namespace, sourceClaim); err != nil {
+		return err
+	}
+
+	// Then remove any DataVolume that does own the claim. Deleting a claim
+	// while its DataVolume still exists makes CDI recreate the claim and
+	// provision a second volume, re-running the entire import — the exact
+	// duplicate copy this design exists to remove. Observed on a live cluster.
+	if err := r.deleteOwningDataVolume(ctx, task.Namespace, sourceClaim); err != nil {
+		return err
+	}
+
+	// Retain carries the data through the swap: from the moment the
+	// transferred claim is deleted until claimRef names its replacement, the
+	// volume is Released, and under Delete the provisioner reclaims it on the
+	// spot. It is held for that window only: settleReclaimPolicy hands back
+	// the class's own policy once the volume answers to its VMDisk alone.
+	if pv.Spec.PersistentVolumeReclaimPolicy != corev1.PersistentVolumeReclaimRetain {
+		pv.Spec.PersistentVolumeReclaimPolicy = corev1.PersistentVolumeReclaimRetain
+		if err := r.Update(ctx, pv); err != nil {
+			return err
+		}
+	}
+
+	// volumeMode and accessModes are copied from the volume rather than
+	// defaulted. Pre-binding through volumeName bypasses the volumeMode match
+	// check, so a claim that assumes Filesystem against a Block volume binds
+	// anyway and fails much later, at mount time, with a message that points
+	// nowhere near here. Also observed live.
+	replacement := &corev1.PersistentVolumeClaim{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      target,
+			Namespace: task.Namespace,
+			Labels: func() map[string]string {
+				l := map[string]string{
+					migrationv1alpha1.ManagedByLabel: migrationv1alpha1.ManagedByValue,
+				}
+				maps.Copy(l, outputMarkers(task, vmID))
+				return l
+			}(),
+			Annotations: map[string]string{
+				populatedForAnnotation: target,
+			},
+		},
+		Spec: corev1.PersistentVolumeClaimSpec{
+			AccessModes:      pv.Spec.AccessModes,
+			VolumeMode:       pv.Spec.VolumeMode,
+			VolumeName:       pv.Name,
+			StorageClassName: &pv.Spec.StorageClassName,
+			Resources: corev1.VolumeResourceRequirements{
+				Requests: corev1.ResourceList{
+					corev1.ResourceStorage: pv.Spec.Capacity[corev1.ResourceStorage],
+				},
+			},
+		},
+	}
+	if err := r.Create(ctx, replacement); err != nil && !apierrors.IsAlreadyExists(err) {
+		return err
+	}
+
+	// Release the old claim, then hand the volume to the new one. Rewriting
+	// claimRef including the UID is what makes this atomic: there is no window
+	// in which the volume is Available for an unrelated claim to grab.
+	old := &corev1.PersistentVolumeClaim{}
+	if err := r.Get(ctx, types.NamespacedName{Namespace: task.Namespace, Name: sourceClaim}, old); err == nil {
+		if err := r.Delete(ctx, old); err != nil && !apierrors.IsNotFound(err) {
+			return err
+		}
+	} else if !apierrors.IsNotFound(err) {
+		return err
+	}
+
+	bound := &corev1.PersistentVolumeClaim{}
+	if err := r.Get(ctx, types.NamespacedName{Namespace: task.Namespace, Name: target}, bound); err != nil {
+		return err
+	}
+	if err := r.Get(ctx, types.NamespacedName{Name: pv.Name}, pv); err != nil {
+		return err
+	}
+	pv.Spec.ClaimRef = &corev1.ObjectReference{
+		Kind:       "PersistentVolumeClaim",
+		APIVersion: "v1",
+		Namespace:  bound.Namespace,
+		Name:       bound.Name,
+		UID:        bound.UID,
+	}
+	if err := r.Update(ctx, pv); err != nil {
+		return err
+	}
+
+	if err := r.createDataVolume(ctx, task, diskName, bound); err != nil {
+		return err
+	}
+	return r.ensureVMDisk(ctx, task, vmID, diskName, bound)
+}
+
+// settleReclaimPolicies settles every disk of one source VM, and reports
+// whether all of them are done. sourceClaims, when known, is index-aligned
+// with diskNames.
+func (r *VMImportTaskReconciler) settleReclaimPolicies(
+	ctx context.Context,
+	task *migrationv1alpha1.VMImportTask,
+	vmID string,
+	diskNames []string,
+	sourceClaims []string,
+) (bool, error) {
+	all := true
+	for i, diskName := range diskNames {
+		source := ""
+		if i < len(sourceClaims) {
+			source = sourceClaims[i]
+		}
+		settled, err := r.settleReclaimPolicy(ctx, task, vmID, diskName, source)
+		if err != nil {
+			return false, err
+		}
+		all = all && settled
+	}
+	return all, nil
+}
+
+// settleReclaimPolicy gives an adopted volume back the reclaim policy its
+// StorageClass declares, once nothing but its VMDisk can release it.
+//
+// Past the swap, Retain protects nothing and leaks a volume per imported disk:
+// deleting the VMDisk removes its DataVolume, garbage collection takes the
+// claim through the owner reference CDI set when it adopted it, and the volume
+// is left Released with its backing storage, where no tenant can see or delete
+// it. Every disk a tenant creates directly carries its class's policy, and an
+// imported one has to end up the same.
+//
+// Until the handoff is provably over this reports false and touches nothing.
+// Over means: the claim and the volume are each Bound to the other, as the PV
+// controller reports it rather than as claimRef was written, so no release is
+// still in flight; the transferred claim is gone; and the claim's one owner is
+// the DataVolume of the VMDisk release, so the only deletion that can reach
+// the volume is the VMDisk's own.
+func (r *VMImportTaskReconciler) settleReclaimPolicy(
+	ctx context.Context,
+	task *migrationv1alpha1.VMImportTask,
+	vmID string,
+	diskName string,
+	sourceClaim string,
+) (bool, error) {
+	target := vmDiskReleasePrefix + diskName
+	waiting := func(what string) (bool, error) {
+		log.FromContext(ctx).V(1).Info("imported volume not settled yet", "disk", diskName, "waitingFor", what)
+		return false, nil
+	}
+
+	claim := &corev1.PersistentVolumeClaim{}
+	if err := r.Get(ctx, types.NamespacedName{Namespace: task.Namespace, Name: target}, claim); err != nil {
+		if apierrors.IsNotFound(err) {
+			return waiting("the replacement claim")
+		}
+		return false, err
+	}
+	if !isOwnOutput(claim, task, vmID) {
+		return waiting("a claim created by this import")
+	}
+	if claim.Status.Phase != corev1.ClaimBound || claim.Spec.VolumeName == "" {
+		return waiting("the replacement claim to bind")
+	}
+
+	pv := &corev1.PersistentVolume{}
+	if err := r.Get(ctx, types.NamespacedName{Name: claim.Spec.VolumeName}, pv); err != nil {
+		if apierrors.IsNotFound(err) {
+			return waiting("the volume")
+		}
+		return false, err
+	}
+	ref := pv.Spec.ClaimRef
+	if pv.Status.Phase != corev1.VolumeBound || ref == nil ||
+		ref.UID != claim.UID || ref.Namespace != claim.Namespace || ref.Name != claim.Name {
+		return waiting("the volume to bind to the replacement claim")
+	}
+
+	if sourceClaim != "" && sourceClaim != target {
+		old := &corev1.PersistentVolumeClaim{}
+		err := r.Get(ctx, types.NamespacedName{Namespace: task.Namespace, Name: sourceClaim}, old)
+		if err == nil {
+			return waiting("the transferred claim to be deleted")
+		}
+		if !apierrors.IsNotFound(err) {
+			return false, err
+		}
+	}
+
+	dv := newObject(dataVolumeGVK)
+	if err := r.Get(ctx, types.NamespacedName{Namespace: task.Namespace, Name: target}, dv); err != nil {
+		if apierrors.IsNotFound(err) || meta.IsNoMatchError(err) {
+			return waiting("the VMDisk DataVolume")
+		}
+		return false, err
+	}
+	owners := claim.OwnerReferences
+	if len(owners) != 1 || owners[0].Kind != dataVolumeGVK.Kind || owners[0].Name != target ||
+		owners[0].UID != dv.GetUID() || owners[0].Controller == nil || !*owners[0].Controller {
+		return waiting("CDI to adopt the claim into the VMDisk DataVolume")
+	}
+
+	disk := newObject(vmDiskGVK)
+	if err := r.Get(ctx, types.NamespacedName{Namespace: task.Namespace, Name: diskName}, disk); err != nil {
+		if apierrors.IsNotFound(err) {
+			return waiting("the VMDisk")
+		}
+		return false, err
+	}
+	if !isOwnOutput(disk, task, vmID) {
+		return waiting("a VMDisk created by this import")
+	}
+
+	policy, err := r.classReclaimPolicy(ctx, pv.Spec.StorageClassName)
+	if err != nil {
+		return false, err
+	}
+	if pv.Spec.PersistentVolumeReclaimPolicy != policy {
+		pv.Spec.PersistentVolumeReclaimPolicy = policy
+		if err := r.Update(ctx, pv); err != nil {
+			return false, err
+		}
+		log.FromContext(ctx).Info("restored the reclaim policy of an imported volume",
+			"disk", diskName, "volume", pv.Name, "policy", policy)
+	}
+	return true, nil
+}
+
+// classReclaimPolicy is the policy a volume of this class would have been
+// provisioned with. A class that is gone, or that names none, gets Delete:
+// the API's own default for a dynamically provisioned volume.
+func (r *VMImportTaskReconciler) classReclaimPolicy(ctx context.Context, className string) (corev1.PersistentVolumeReclaimPolicy, error) {
+	if className == "" {
+		return corev1.PersistentVolumeReclaimDelete, nil
+	}
+	sc := &storagev1.StorageClass{}
+	if err := r.Get(ctx, types.NamespacedName{Name: className}, sc); err != nil {
+		if apierrors.IsNotFound(err) {
+			return corev1.PersistentVolumeReclaimDelete, nil
+		}
+		return "", err
+	}
+	if sc.ReclaimPolicy == nil || *sc.ReclaimPolicy == "" {
+		return corev1.PersistentVolumeReclaimDelete, nil
+	}
+	return *sc.ReclaimPolicy, nil
+}
+
+// deleteOwningDataVolume removes the DataVolume that owns a claim, and waits
+// for it to actually be gone before the caller touches the claim.
+func (r *VMImportTaskReconciler) deleteOwningDataVolume(ctx context.Context, namespace, claim string) error {
+	dv := newObject(dataVolumeGVK)
+	err := r.Get(ctx, types.NamespacedName{Namespace: namespace, Name: claim}, dv)
+	if apierrors.IsNotFound(err) || meta.IsNoMatchError(err) {
+		return nil
+	}
+	if err != nil {
+		return err
+	}
+	// Orphan the claim first: without this, deleting the DataVolume takes the
+	// claim with it through the controller owner reference CDI set.
+	if err := clearOwnerReferences(ctx, r.Client, namespace, claim); err != nil {
+		return err
+	}
+	if err := r.Delete(ctx, dv); err != nil && !apierrors.IsNotFound(err) {
+		return err
+	}
+	return nil
+}
+
+func clearOwnerReferences(ctx context.Context, c client.Client, namespace, name string) error {
+	pvc := &corev1.PersistentVolumeClaim{}
+	if err := c.Get(ctx, types.NamespacedName{Namespace: namespace, Name: name}, pvc); err != nil {
+		if apierrors.IsNotFound(err) {
+			return nil
+		}
+		return err
+	}
+	if len(pvc.OwnerReferences) == 0 {
+		return nil
+	}
+	pvc.OwnerReferences = nil
+	return c.Update(ctx, pvc)
+}
+
+// createDataVolume creates the DataVolume the VMDisk release will adopt. Its
+// spec is deliberately minimal and its source is blank: the claim beside it
+// already carries the data and the populatedFor annotation, so CDI short
+// circuits population instead of fetching anything.
+func (r *VMImportTaskReconciler) createDataVolume(
+	ctx context.Context,
+	task *migrationv1alpha1.VMImportTask,
+	diskName string,
+	pvc *corev1.PersistentVolumeClaim,
+) error {
+	name := vmDiskReleasePrefix + diskName
+	existing := newObject(dataVolumeGVK)
+	err := r.Get(ctx, types.NamespacedName{Namespace: task.Namespace, Name: name}, existing)
+	if err == nil {
+		return nil
+	}
+	if !apierrors.IsNotFound(err) {
+		return err
+	}
+
+	size := pvc.Spec.Resources.Requests[corev1.ResourceStorage]
+	dv := newObject(dataVolumeGVK)
+	dv.SetName(name)
+	dv.SetNamespace(task.Namespace)
+	dv.SetLabels(map[string]string{
+		// Both of these matter: the instance label is what the vm-disk chart
+		// stamps, and the Helm label is what lets the release adopt the object
+		// instead of colliding with it.
+		"app.kubernetes.io/instance": name,
+		helmManagedByLabel:           helmManagedByValue,
+	})
+	dv.SetAnnotations(map[string]string{
+		helmReleaseNameAnnotation:      name,
+		helmReleaseNsAnnotation:        task.Namespace,
+		"vm-disk.cozystack.io/optical": "false",
+	})
+	spec := map[string]any{
+		"contentType": "kubevirt",
+		"source": map[string]any{
+			"blank": map[string]any{},
+		},
+		"storage": map[string]any{
+			"resources": map[string]any{
+				"requests": map[string]any{
+					"storage": size.String(),
+				},
+			},
+		},
+	}
+	if pvc.Spec.StorageClassName != nil && *pvc.Spec.StorageClassName != "" {
+		storage, _, _ := unstructured.NestedMap(spec, "storage")
+		storage["storageClassName"] = *pvc.Spec.StorageClassName
+		spec["storage"] = storage
+	}
+	if err := unstructured.SetNestedMap(dv.Object, spec, "spec"); err != nil {
+		return err
+	}
+	if err := r.Create(ctx, dv); err != nil && !apierrors.IsAlreadyExists(err) {
+		return err
+	}
+	return nil
+}
+
+// ensureVMDisk creates the tenant-facing VMDisk over an adopted volume. It
+// carries no owner reference to the task on purpose: this object is the point
+// of the whole operation and must outlive the operation that produced it.
+func (r *VMImportTaskReconciler) ensureVMDisk(
+	ctx context.Context,
+	task *migrationv1alpha1.VMImportTask,
+	vmID string,
+	diskName string,
+	pvc *corev1.PersistentVolumeClaim,
+) error {
+	existing := newObject(vmDiskGVK)
+	err := r.Get(ctx, types.NamespacedName{Namespace: task.Namespace, Name: diskName}, existing)
+	if err == nil {
+		if !isOwnOutput(existing, task, vmID) {
+			return &validationError{
+				reason: migrationv1alpha1.ReasonOutputExists,
+				message: fmt.Sprintf(
+					"a VMDisk named %q already exists in this namespace and was not created by this import; "+
+						"the import will not overwrite it — choose another name for VM %s", diskName, vmID),
+			}
+		}
+		return nil
+	}
+	if !apierrors.IsNotFound(err) {
+		return err
+	}
+
+	size := pvc.Spec.Resources.Requests[corev1.ResourceStorage]
+	obj := newObject(vmDiskGVK)
+	obj.SetName(diskName)
+	obj.SetNamespace(task.Namespace)
+	stampOutput(obj, task, vmID)
+	spec := map[string]any{
+		"storage": size.String(),
+		"optical": false,
+	}
+	if pvc.Spec.StorageClassName != nil && *pvc.Spec.StorageClassName != "" {
+		spec["storageClass"] = *pvc.Spec.StorageClassName
+	}
+	if err := unstructured.SetNestedMap(obj.Object, spec, "spec"); err != nil {
+		return err
+	}
+	if err := r.Create(ctx, obj); err != nil && !apierrors.IsAlreadyExists(err) {
+		return err
+	}
+	return nil
+}
+
+// createVMInstance builds the tenant-facing VM over the imported disks.
+//
+// When the tenant named no instance type the source VM's own CPU and memory are
+// carried across as explicit resources, so an import never silently resizes a
+// guest to fit a catalog size.
+func (r *VMImportTaskReconciler) createVMInstance(
+	ctx context.Context,
+	task *migrationv1alpha1.VMImportTask,
+	req *migrationv1alpha1.VMImportRequest,
+	name string,
+	vm *unstructured.Unstructured,
+	diskNames []string,
+) error {
+	existing := newObject(vmInstanceGVK)
+	err := r.Get(ctx, types.NamespacedName{Namespace: task.Namespace, Name: name}, existing)
+	if err == nil {
+		// Only this task's own instance counts as a finished pass. Anything
+		// else of that name belongs to the tenant, and an import never
+		// overwrites or silently adopts one.
+		if !isOwnOutput(existing, task, req.ID) {
+			return &validationError{
+				reason: migrationv1alpha1.ReasonOutputExists,
+				message: fmt.Sprintf(
+					"a VMInstance named %q already exists in this namespace and was not created by this import; "+
+						"the import will not overwrite it — choose another name for VM %s", name, req.ID),
+			}
+		}
+		return nil
+	}
+	if !apierrors.IsNotFound(err) {
+		return err
+	}
+
+	disks := make([]any, 0, len(diskNames))
+	for i, d := range diskNames {
+		disks = append(disks, map[string]any{"name": d, "bus": importedDiskBus(i)})
+	}
+
+	spec := map[string]any{
+		"disks": disks,
+		// Halted, not Always: a freshly imported guest may need its network or
+		// drivers adjusted, and booting it the instant the import finishes can
+		// put a second copy of a still-running production machine on the
+		// network. Starting it is one click, and it is the tenant's call.
+		"runStrategy": "Halted",
+	}
+	if req.InstanceType != "" {
+		spec["instanceType"] = req.InstanceType
+	} else {
+		cores, sockets, memory := sourceVMResources(vm)
+		resources := map[string]any{}
+		if cores != "" {
+			resources["cpu"] = cores
+		}
+		if sockets != "" {
+			resources["sockets"] = sockets
+		}
+		if memory != "" {
+			resources["memory"] = memory
+		}
+		if len(resources) > 0 {
+			spec["resources"] = resources
+			// An empty instance type is what tells the chart to use the
+			// explicit resources instead of a catalog size.
+			spec["instanceType"] = ""
+		}
+	}
+	if req.InstanceProfile != "" {
+		spec["instanceProfile"] = req.InstanceProfile
+	}
+
+	// Carry the source's boot mode across. Without it a UEFI guest is rendered
+	// with the profile's default bootloader and does not boot.
+	if fw := sourceFirmware(vm); fw != nil {
+		spec["firmware"] = fw
+	}
+
+	obj := newObject(vmInstanceGVK)
+	obj.SetName(name)
+	obj.SetNamespace(task.Namespace)
+	stampOutput(obj, task, req.ID)
+	if err := unstructured.SetNestedMap(obj.Object, spec, "spec"); err != nil {
+		return err
+	}
+	if err := r.Create(ctx, obj); err != nil && !apierrors.IsAlreadyExists(err) {
+		return err
+	}
+	return nil
+}
+
+// sourceVMResources reads the CPU topology and memory Forklift derived from the
+// source VM's inventory record.
+//
+// Cores and sockets are carried across separately rather than multiplied into
+// one number: vm-instance maps `resources.cpu` to domain.cpu.cores and
+// `resources.sockets` to domain.cpu.sockets, and refuses to render at all
+// unless both are set alongside memory. Collapsing the topology would both
+// misreport it to the guest and fail the chart.
+func sourceVMResources(vm *unstructured.Unstructured) (cores, sockets, memory string) {
+	base := []string{"spec", "template", "spec", "domain", "cpu"}
+	if n, found, _ := unstructured.NestedInt64(vm.Object, append(base, "cores")...); found && n > 0 {
+		cores = fmt.Sprintf("%d", n)
+	}
+	if n, found, _ := unstructured.NestedInt64(vm.Object, append(base, "sockets")...); found && n > 0 {
+		sockets = fmt.Sprintf("%d", n)
+	}
+	// A source that reports cores but no socket count is a single-socket
+	// machine; saying so explicitly is what lets the chart render.
+	if cores != "" && sockets == "" {
+		sockets = "1"
+	}
+	for _, path := range [][]string{
+		{"spec", "template", "spec", "domain", "memory", "guest"},
+		{"spec", "template", "spec", "domain", "resources", "requests", "memory"},
+	} {
+		if value, found, _ := unstructured.NestedString(vm.Object, path...); found && value != "" {
+			if _, err := resource.ParseQuantity(value); err == nil {
+				memory = value
+				break
+			}
+		}
+	}
+	return cores, sockets, memory
+}
diff --git a/internal/migrationcontroller/host_prune_test.go b/internal/migrationcontroller/host_prune_test.go
new file mode 100644
index 0000000000..9d01f924e2
--- /dev/null
+++ b/internal/migrationcontroller/host_prune_test.go
@@ -0,0 +1,111 @@
+// SPDX-License-Identifier: Apache-2.0
+
+package migrationcontroller
+
+import (
+	"context"
+	"testing"
+
+	corev1 "k8s.io/api/core/v1"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/apimachinery/pkg/types"
+	"k8s.io/client-go/tools/record"
+	clientfake "sigs.k8s.io/controller-runtime/pkg/client/fake"
+
+	migrationv1alpha1 "github.com/cozystack/cozystack/api/migration/v1alpha1"
+)
+
+// hostOverride builds the Host and Secret pair the controller creates for one
+// entry, as an earlier reconcile would have left them.
+func hostOverride(src *migrationv1alpha1.VMImportSource, id string) (*unstructured.Unstructured, *corev1.Secret) {
+	name := hostOverrideName(src.Name, id)
+	owner := ownerRef(migrationv1alpha1.GroupVersion.WithKind("VMImportSource"), src.Name, src.UID)
+
+	host := newObject(hostGVK)
+	host.SetName(name)
+	host.SetNamespace(src.Namespace)
+	host.SetLabels(map[string]string{migrationv1alpha1.ManagedByLabel: migrationv1alpha1.ManagedByValue})
+	host.SetOwnerReferences([]metav1.OwnerReference{owner})
+
+	secret := &corev1.Secret{ObjectMeta: metav1.ObjectMeta{
+		Name:            name,
+		Namespace:       src.Namespace,
+		Labels:          map[string]string{migrationv1alpha1.ManagedByLabel: migrationv1alpha1.ManagedByValue},
+		OwnerReferences: []metav1.OwnerReference{owner},
+	}}
+	return host, secret
+}
+
+// A Source is editable, so an override can be dropped after it was created. A
+// Host left behind is not inert — Forklift keeps routing that ESXi host's
+// transfers through the address it names — and its credentials would otherwise
+// outlive the decision to stop using them.
+func TestEditingASourceRemovesTheHostsItNoLongerLists(t *testing.T) {
+	s := testScheme(t)
+	src := vsphereSource("vcenter", "tenant-foo")
+	src.Spec.Hosts = []migrationv1alpha1.HostOverride{{
+		ID:      "host-10",
+		Address: "192.0.2.29",
+		Credentials: migrationv1alpha1.ProviderCredentials{
+			Username: "root", Password: "x", InsecureSkipVerify: true,
+		},
+	}}
+
+	keptHost, keptSecret := hostOverride(src, "host-10")
+	goneHost, goneSecret := hostOverride(src, "host-99")
+
+	c := clientfake.NewClientBuilder().WithScheme(s).
+		WithObjects(src, keptHost, keptSecret, goneHost, goneSecret).Build()
+	r := &VMImportSourceReconciler{Client: c, Scheme: s, Recorder: record.NewFakeRecorder(10)}
+
+	if err := r.pruneHosts(context.Background(), src); err != nil {
+		t.Fatalf("pruneHosts: %v", err)
+	}
+
+	gone := types.NamespacedName{Namespace: "tenant-foo", Name: hostOverrideName("vcenter", "host-99")}
+	if err := c.Get(context.Background(), gone, newObject(hostGVK)); !apierrors.IsNotFound(err) {
+		t.Errorf("the dropped Host survived (err %v); it would keep redirecting transfers", err)
+	}
+	if err := c.Get(context.Background(), gone, &corev1.Secret{}); !apierrors.IsNotFound(err) {
+		t.Errorf("the dropped Host's credentials survived (err %v)", err)
+	}
+
+	kept := types.NamespacedName{Namespace: "tenant-foo", Name: hostOverrideName("vcenter", "host-10")}
+	if err := c.Get(context.Background(), kept, newObject(hostGVK)); err != nil {
+		t.Errorf("the still-listed Host was removed: %v", err)
+	}
+	if err := c.Get(context.Background(), kept, &corev1.Secret{}); err != nil {
+		t.Errorf("the still-listed Host's credentials were removed: %v", err)
+	}
+}
+
+// The label says this controller made the object, not that it made it for this
+// Source. Two Sources in one namespace must not delete each other's Hosts.
+func TestPruningLeavesAnotherSourcesHostsAlone(t *testing.T) {
+	s := testScheme(t)
+	mine := vsphereSource("vcenter", "tenant-foo")
+	theirs := vsphereSource("other", "tenant-foo")
+	theirs.UID = types.UID("other-uid")
+
+	theirHost, theirSecret := hostOverride(theirs, "host-10")
+
+	c := clientfake.NewClientBuilder().WithScheme(s).
+		WithObjects(mine, theirs, theirHost, theirSecret).Build()
+	r := &VMImportSourceReconciler{Client: c, Scheme: s, Recorder: record.NewFakeRecorder(10)}
+
+	// `mine` lists no hosts at all, so an ownership-blind prune would take the
+	// other Source's Host with it.
+	if err := r.pruneHosts(context.Background(), mine); err != nil {
+		t.Fatalf("pruneHosts: %v", err)
+	}
+
+	name := types.NamespacedName{Namespace: "tenant-foo", Name: hostOverrideName("other", "host-10")}
+	if err := c.Get(context.Background(), name, newObject(hostGVK)); err != nil {
+		t.Errorf("another Source's Host was deleted: %v", err)
+	}
+	if err := c.Get(context.Background(), name, &corev1.Secret{}); err != nil {
+		t.Errorf("another Source's credentials were deleted: %v", err)
+	}
+}
diff --git a/internal/migrationcontroller/inventory.go b/internal/migrationcontroller/inventory.go
new file mode 100644
index 0000000000..d56bec2da2
--- /dev/null
+++ b/internal/migrationcontroller/inventory.go
@@ -0,0 +1,262 @@
+// SPDX-License-Identifier: Apache-2.0
+
+package migrationcontroller
+
+import (
+	"context"
+	"crypto/tls"
+	"crypto/x509"
+	"encoding/json"
+	"fmt"
+	"net/http"
+	"os"
+	"sync"
+	"time"
+
+	corev1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/types"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+)
+
+// The controller reads the source's topology from Forklift's inventory service
+// rather than from Forklift's custom resources, because the resources do not
+// carry it.
+//
+// The tempting shortcut is to let Forklift tell you what is missing: a Plan
+// whose maps do not cover a VM publishes VMNetworksNotMapped/VMStorageNotMapped
+// with the offenders in `items`. But those items are the *VM* references, not
+// the networks or datastores — `pkg/controller/plan/validation.go:940,960`
+// appends `ref.String()` of the VM, rendered `id:vm-1234 name:'web-01'`
+// (`pkg/apis/forklift/v1beta1/ref/ref.go:29` at v2.11.5). The network and
+// datastore IDs a map entry needs appear on no Forklift CR at all, and map
+// resolution is an exact-ID lookup with no wildcard to fall back on
+// (`adapter/vsphere/validator.go:80,116`). A map built by parsing that text
+// resolves to nothing and the task waits in Validating forever.
+//
+// So this is a real HTTP client with a bearer token. It stays inside the "no
+// second vSphere client" boundary: it never talks to vCenter, only to Forklift,
+// and what it reads is Forklift's own view of the source.
+const (
+	// inventoryTokenFile is the projected ServiceAccount token the inventory
+	// service authenticates. Re-read per call: it rotates.
+	inventoryTokenFile = "/var/run/secrets/kubernetes.io/serviceaccount/token" // #nosec G101 -- path, not a credential
+
+	// inventoryCASecret holds the CA that signed the inventory's serving
+	// certificate. Verifying against it is what lets this client run without
+	// InsecureSkipVerify: the certificate carries the service DNS names as SANs.
+	inventoryCASecret = "forklift-inventory-serving-cert"
+	inventoryCAKey    = "ca.crt"
+)
+
+// inventoryRef is Forklift's reference shape: a kind and the provider's own ID.
+type inventoryRef struct {
+	Kind string `json:"kind"`
+	ID   string `json:"id"`
+}
+
+// inventoryVM is the subset of a vSphere VM record this controller consumes.
+type inventoryVM struct {
+	ID         string         `json:"id"`
+	Name       string         `json:"name"`
+	Firmware   string         `json:"firmware"`
+	PowerState string         `json:"powerState"`
+	Networks   []inventoryRef `json:"networks"`
+	Disks      []struct {
+		Datastore inventoryRef `json:"datastore"`
+	} `json:"disks"`
+}
+
+// datastoreIDs returns the distinct datastores backing the VM's disks.
+func (v *inventoryVM) datastoreIDs() []string {
+	seen := map[string]bool{}
+	var out []string
+	for _, d := range v.Disks {
+		if d.Datastore.ID == "" || seen[d.Datastore.ID] {
+			continue
+		}
+		seen[d.Datastore.ID] = true
+		out = append(out, d.Datastore.ID)
+	}
+	return out
+}
+
+// networkIDs returns the distinct networks the VM's interfaces attach to.
+func (v *inventoryVM) networkIDs() []string {
+	seen := map[string]bool{}
+	var out []string
+	for _, n := range v.Networks {
+		if n.ID == "" || seen[n.ID] {
+			continue
+		}
+		seen[n.ID] = true
+		out = append(out, n.ID)
+	}
+	return out
+}
+
+// NewInventoryClient builds the client the task reconciler reads topology with.
+// The reader must be uncached — the CA secret lives in Forklift's namespace,
+// which this controller does not watch.
+func NewInventoryClient(baseURL, namespace string, reader client.Reader) *inventoryClient {
+	return &inventoryClient{BaseURL: baseURL, Namespace: namespace, Reader: reader}
+}
+
+// inventoryClient reads VM records from Forklift's inventory REST service.
+type inventoryClient struct {
+	// BaseURL is the inventory service root, e.g.
+	// https://forklift-inventory.cozy-forklift.svc:8443
+	BaseURL string
+	// Namespace is where the CA secret lives — the Forklift namespace.
+	Namespace string
+	// Reader fetches the CA secret. Nil disables verification setup and makes
+	// every call fail, which is the safe default for a misconfigured client.
+	Reader client.Reader
+	// TokenFile overrides the projected token path in tests.
+	TokenFile string
+
+	mu   sync.Mutex
+	http *http.Client
+}
+
+// notFoundError marks a VM the provider's inventory does not have, so the
+// caller can report it as a tenant-visible "no such VM" rather than retrying.
+type notFoundError struct{ vmID string }
+
+func (e *notFoundError) Error() string {
+	return fmt.Sprintf("VM %q is not present in the source inventory", e.vmID)
+}
+
+// inventoryVMRef is the abbreviated record the list endpoint returns: enough to
+// name a machine in a picker, without paying for the full record of every VM in
+// the source.
+type inventoryVMRef struct {
+	ID   string `json:"id"`
+	Name string `json:"name"`
+	// Path is the VM's inventory path, which is what distinguishes two machines
+	// that share a name in different folders.
+	Path string `json:"path"`
+}
+
+// VMs lists every VM the provider's inventory holds.
+func (c *inventoryClient) VMs(ctx context.Context, providerUID string) ([]inventoryVMRef, error) {
+	resp, err := c.get(ctx, fmt.Sprintf("%s/providers/vsphere/%s/vms", c.BaseURL, providerUID))
+	if err != nil {
+		return nil, err
+	}
+	defer func() { _ = resp.Body.Close() }()
+
+	if resp.StatusCode != http.StatusOK {
+		return nil, fmt.Errorf("Forklift inventory returned %s listing VMs", resp.Status)
+	}
+
+	var vms []inventoryVMRef
+	if err := json.NewDecoder(resp.Body).Decode(&vms); err != nil {
+		return nil, fmt.Errorf("decoding the inventory VM list: %w", err)
+	}
+	return vms, nil
+}
+
+// get issues an authenticated GET. The token is read per call because it
+// rotates, and the caller owns the response body.
+func (c *inventoryClient) get(ctx context.Context, url string) (*http.Response, error) {
+	httpClient, err := c.client(ctx)
+	if err != nil {
+		return nil, err
+	}
+	token, err := c.token()
+	if err != nil {
+		return nil, err
+	}
+
+	req, err := http.NewRequestWithContext(ctx, http.MethodGet, url, nil)
+	if err != nil {
+		return nil, err
+	}
+	req.Header.Set("Authorization", "Bearer "+token)
+	req.Header.Set("Accept", "application/json")
+
+	resp, err := httpClient.Do(req)
+	if err != nil {
+		return nil, fmt.Errorf("querying Forklift inventory: %w", err)
+	}
+	return resp, nil
+}
+
+// VM fetches one VM record by the provider's UID and the VM's managed-object ID.
+func (c *inventoryClient) VM(ctx context.Context, providerUID, vmID string) (*inventoryVM, error) {
+	resp, err := c.get(ctx, fmt.Sprintf("%s/providers/vsphere/%s/vms/%s", c.BaseURL, providerUID, vmID))
+	if err != nil {
+		return nil, err
+	}
+	defer func() { _ = resp.Body.Close() }()
+
+	switch resp.StatusCode {
+	case http.StatusOK:
+	case http.StatusNotFound:
+		return nil, &notFoundError{vmID: vmID}
+	default:
+		return nil, fmt.Errorf("Forklift inventory returned %s for VM %q", resp.Status, vmID)
+	}
+
+	vm := &inventoryVM{}
+	if err := json.NewDecoder(resp.Body).Decode(vm); err != nil {
+		return nil, fmt.Errorf("decoding the inventory record for VM %q: %w", vmID, err)
+	}
+	return vm, nil
+}
+
+// client builds the HTTPS client, trusting the CA that signed the inventory's
+// serving certificate. Built once and reused.
+//
+// Guarded because one client is shared by both reconcilers, which run on
+// separate goroutines: an unsynchronized check-then-assign races on the first
+// call, leaking the loser's client and failing under -race. A mutex rather than
+// sync.Once deliberately — construction reads a Secret and can fail while
+// Forklift is still coming up, and Once would latch that failure forever, where
+// this simply builds again on the next call.
+func (c *inventoryClient) client(ctx context.Context) (*http.Client, error) {
+	c.mu.Lock()
+	defer c.mu.Unlock()
+
+	if c.http != nil {
+		return c.http, nil
+	}
+	if c.Reader == nil {
+		return nil, fmt.Errorf("inventory client has no reader for the %s secret", inventoryCASecret)
+	}
+
+	secret := &corev1.Secret{}
+	if err := c.Reader.Get(ctx, types.NamespacedName{
+		Namespace: c.Namespace, Name: inventoryCASecret,
+	}, secret); err != nil {
+		return nil, fmt.Errorf("reading the Forklift inventory CA: %w", err)
+	}
+	ca, ok := secret.Data[inventoryCAKey]
+	if !ok || len(ca) == 0 {
+		return nil, fmt.Errorf("secret %s/%s carries no %s", c.Namespace, inventoryCASecret, inventoryCAKey)
+	}
+	pool := x509.NewCertPool()
+	if !pool.AppendCertsFromPEM(ca) {
+		return nil, fmt.Errorf("the %s in %s/%s is not a valid PEM bundle", inventoryCAKey, c.Namespace, inventoryCASecret)
+	}
+
+	c.http = &http.Client{
+		Timeout: 30 * time.Second,
+		Transport: &http.Transport{
+			TLSClientConfig: &tls.Config{RootCAs: pool, MinVersion: tls.VersionTLS12},
+		},
+	}
+	return c.http, nil
+}
+
+func (c *inventoryClient) token() (string, error) {
+	path := c.TokenFile
+	if path == "" {
+		path = inventoryTokenFile
+	}
+	b, err := os.ReadFile(path) // #nosec G304 -- fixed path, or a test override
+	if err != nil {
+		return "", fmt.Errorf("reading the ServiceAccount token for the inventory call: %w", err)
+	}
+	return string(b), nil
+}
diff --git a/internal/migrationcontroller/inventory_publish.go b/internal/migrationcontroller/inventory_publish.go
new file mode 100644
index 0000000000..f33c4a8975
--- /dev/null
+++ b/internal/migrationcontroller/inventory_publish.go
@@ -0,0 +1,96 @@
+// SPDX-License-Identifier: Apache-2.0
+
+package migrationcontroller
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"sort"
+
+	corev1 "k8s.io/api/core/v1"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	"k8s.io/apimachinery/pkg/types"
+	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
+
+	migrationv1alpha1 "github.com/cozystack/cozystack/api/migration/v1alpha1"
+)
+
+// The VM picker in the console needs to offer machine names while writing
+// managed-object references, and only Forklift's inventory knows the mapping.
+// The aggregated API that serves dropdowns lists Kubernetes objects with a
+// dynamic client and has no way to speak HTTPS to the inventory, nor should it
+// grow one: that would put the source's credentials path in a second component.
+// So this controller — which already holds an inventory client — publishes the
+// list, and the option provider reads it back as an ordinary object.
+//
+// The list lives in its own ConfigMap rather than on the Source's status. A
+// status carrying thousands of entries is rewritten on every refresh and wakes
+// everything watching the Source; a separate object is read only by the thing
+// that needs it, and an ownerReference still has it deleted with the Source.
+// maxPublishedVMs bounds the object. A vCenter with more machines than this is
+// past the point where a dropdown is the right interface anyway, and an
+// unbounded write is not something to put in etcd on a timer.
+const maxPublishedVMs = 5000
+
+// publishInventory refreshes the source's VM list. A failure here never fails
+// the Source: the connection is what the Source reports on, and an inventory
+// that is briefly unavailable should degrade the picker, not the status.
+func (r *VMImportSourceReconciler) publishInventory(ctx context.Context, src *migrationv1alpha1.VMImportSource) error {
+	if r.Inventory == nil {
+		return nil
+	}
+
+	provider := newObject(providerGVK)
+	if err := r.Get(ctx, types.NamespacedName{
+		Namespace: src.Namespace, Name: sourceProviderName(src.Name),
+	}, provider); err != nil {
+		return err
+	}
+	uid := string(provider.GetUID())
+	if uid == "" {
+		return fmt.Errorf("source Provider %s/%s has no UID yet", src.Namespace, sourceProviderName(src.Name))
+	}
+
+	vms, err := r.Inventory.VMs(ctx, uid)
+	if err != nil {
+		return err
+	}
+
+	// Sorted by name so the dropdown is stable across refreshes and the
+	// truncation, when it happens, is at least predictable.
+	sort.Slice(vms, func(i, j int) bool { return vms[i].Name < vms[j].Name })
+	truncated := len(vms) > maxPublishedVMs
+	if truncated {
+		vms = vms[:maxPublishedVMs]
+	}
+
+	published := make([]migrationv1alpha1.PublishedVM, 0, len(vms))
+	for _, vm := range vms {
+		published = append(published, migrationv1alpha1.PublishedVM{ID: vm.ID, Name: vm.Name, Path: vm.Path})
+	}
+	encoded, err := json.Marshal(published)
+	if err != nil {
+		return err
+	}
+
+	cm := &corev1.ConfigMap{}
+	cm.Name = migrationv1alpha1.InventoryConfigMapName(src.Name)
+	cm.Namespace = src.Namespace
+	_, err = controllerutil.CreateOrUpdate(ctx, r.Client, cm, func() error {
+		if cm.Annotations == nil {
+			cm.Annotations = map[string]string{}
+		}
+		if truncated {
+			cm.Annotations[migrationv1alpha1.InventoryTruncatedAnnotation] = "true"
+		} else {
+			delete(cm.Annotations, migrationv1alpha1.InventoryTruncatedAnnotation)
+		}
+		cm.Data = map[string]string{migrationv1alpha1.InventoryVMsKey: string(encoded)}
+		return controllerutil.SetControllerReference(src, cm, r.Scheme)
+	})
+	if err != nil && !apierrors.IsAlreadyExists(err) {
+		return err
+	}
+	return nil
+}
diff --git a/internal/migrationcontroller/inventory_scope_test.go b/internal/migrationcontroller/inventory_scope_test.go
new file mode 100644
index 0000000000..585247cf10
--- /dev/null
+++ b/internal/migrationcontroller/inventory_scope_test.go
@@ -0,0 +1,119 @@
+// SPDX-License-Identifier: Apache-2.0
+
+package migrationcontroller
+
+import (
+	"context"
+	"encoding/pem"
+	"net/http"
+	"net/http/httptest"
+	"os"
+	"path/filepath"
+	"strings"
+	"sync"
+	"testing"
+
+	corev1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/types"
+	"k8s.io/client-go/tools/record"
+	clientfake "sigs.k8s.io/controller-runtime/pkg/client/fake"
+
+	migrationv1alpha1 "github.com/cozystack/cozystack/api/migration/v1alpha1"
+)
+
+// inventoryHarness stands up a TLS inventory the client will actually verify,
+// wiring the server's own certificate in as the CA the controller trusts.
+func inventoryHarness(t *testing.T, handler http.HandlerFunc) (*httptest.Server, *corev1.Secret, string) {
+	t.Helper()
+
+	srv := httptest.NewTLSServer(handler)
+	t.Cleanup(srv.Close)
+
+	ca := pem.EncodeToMemory(&pem.Block{Type: "CERTIFICATE", Bytes: srv.Certificate().Raw})
+	secret := &corev1.Secret{
+		ObjectMeta: metav1.ObjectMeta{Name: inventoryCASecret, Namespace: "cozy-forklift"},
+		Data:       map[string][]byte{inventoryCAKey: ca},
+	}
+
+	tokenFile := filepath.Join(t.TempDir(), "token")
+	if err := os.WriteFile(tokenFile, []byte("test-token"), 0o600); err != nil {
+		t.Fatalf("writing the token file: %v", err)
+	}
+	return srv, secret, tokenFile
+}
+
+// Reading the whole task here would tie every VM's fate to every other one: one
+// mistyped managed-object reference is the likeliest error on this API, and it
+// would fail the VM being reconciled with a message naming a different machine,
+// where a missing VM is meant to fail alone. It is also what keeps the cost
+// linear rather than quadratic in the number of VMs, on every pass, for as long
+// as anything is still transferring.
+func TestSourceTopologyAsksOnlyAboutTheVMBeingReconciled(t *testing.T) {
+	var mu sync.Mutex
+	var asked []string
+
+	srv, caSecret, tokenFile := inventoryHarness(t, func(w http.ResponseWriter, r *http.Request) {
+		mu.Lock()
+		asked = append(asked, r.URL.Path)
+		mu.Unlock()
+
+		if strings.HasSuffix(r.URL.Path, "/vms/vm-2") {
+			w.Header().Set("Content-Type", "application/json")
+			_, _ = w.Write([]byte(`{"id":"vm-2","name":"web-02",
+			  "networks":[{"kind":"Network","id":"net-b"}],
+			  "disks":[{"datastore":{"kind":"Datastore","id":"ds-b"}}]}`))
+			return
+		}
+		// Every other VM of the task is absent from the inventory. If the
+		// implementation walks the whole spec, this is what turns one tenant
+		// typo into a task-wide failure — so the count assert below is the
+		// real subject of this test.
+		w.WriteHeader(http.StatusNotFound)
+	})
+
+	s := testScheme(t)
+	tk := task("import", "tenant-foo", "vcenter", "replicated",
+		migrationv1alpha1.VMImportRequest{ID: "vm-1", Name: "web-01"},
+		migrationv1alpha1.VMImportRequest{ID: "vm-2", Name: "web-02"},
+		migrationv1alpha1.VMImportRequest{ID: "vm-3", Name: "web-03"},
+	)
+	src := readySource("vcenter", "tenant-foo")
+
+	provider := newObject(providerGVK)
+	provider.SetName(sourceProviderName("vcenter"))
+	provider.SetNamespace("tenant-foo")
+	provider.SetUID(types.UID("provider-uid"))
+
+	c := clientfake.NewClientBuilder().WithScheme(s).
+		WithObjects(tk, src, provider, caSecret).Build()
+	r := &VMImportTaskReconciler{
+		Client:   c,
+		Scheme:   s,
+		Recorder: record.NewFakeRecorder(10),
+		Inventory: &inventoryClient{
+			BaseURL: srv.URL, Namespace: "cozy-forklift", Reader: c, TokenFile: tokenFile,
+		},
+	}
+
+	nets, stores, err := r.sourceTopology(context.Background(), tk, src,
+		&migrationv1alpha1.VMImportRequest{ID: "vm-2", Name: "web-02"})
+	if err != nil {
+		t.Fatalf("sourceTopology: %v", err)
+	}
+	if len(nets) != 1 || nets[0] != "net-b" {
+		t.Errorf("networks = %v, want [net-b]", nets)
+	}
+	if len(stores) != 1 || stores[0] != "ds-b" {
+		t.Errorf("datastores = %v, want [ds-b]", stores)
+	}
+
+	mu.Lock()
+	defer mu.Unlock()
+	if len(asked) != 1 {
+		t.Fatalf("issued %d inventory calls for one VM (%v); a task of N VMs would cost N×N per pass", len(asked), asked)
+	}
+	if !strings.HasSuffix(asked[0], "/vms/vm-2") {
+		t.Errorf("asked about %q, want the VM being reconciled", asked[0])
+	}
+}
diff --git a/internal/migrationcontroller/reclaim_test.go b/internal/migrationcontroller/reclaim_test.go
new file mode 100644
index 0000000000..b88fed0c06
--- /dev/null
+++ b/internal/migrationcontroller/reclaim_test.go
@@ -0,0 +1,91 @@
+// SPDX-License-Identifier: Apache-2.0
+
+package migrationcontroller
+
+import (
+	"context"
+	"testing"
+
+	"k8s.io/apimachinery/pkg/types"
+	"k8s.io/client-go/tools/record"
+	clientfake "sigs.k8s.io/controller-runtime/pkg/client/fake"
+
+	migrationv1alpha1 "github.com/cozystack/cozystack/api/migration/v1alpha1"
+)
+
+// The window this covers: the scaffolding VirtualMachine is deleted before the
+// status write that records what the import produced, so dying between the two
+// leaves a healthy VMInstance and its disks with nothing pointing at them. The
+// old behaviour reported Failed on a machine that works.
+func TestReclaimOutputsFindsWhatStatusNeverRecorded(t *testing.T) {
+	s := testScheme(t)
+	tk := task("import", "tenant-foo", "vcenter", "replicated",
+		migrationv1alpha1.VMImportRequest{ID: "vm-1", Name: "web-01"})
+	tk.UID = types.UID("task-uid")
+	// Status knows nothing: this is exactly the crash being recovered from.
+	tk.Status.VMs = nil
+
+	instance := newObject(vmInstanceGVK)
+	instance.SetName("web-01")
+	instance.SetNamespace("tenant-foo")
+	instance.SetLabels(outputMarkers(tk, "vm-1"))
+
+	disk0 := newObject(vmDiskGVK)
+	disk0.SetName("web-01-disk-0")
+	disk0.SetNamespace("tenant-foo")
+	disk0.SetLabels(outputMarkers(tk, "vm-1"))
+
+	disk1 := newObject(vmDiskGVK)
+	disk1.SetName("web-01-disk-1")
+	disk1.SetNamespace("tenant-foo")
+	disk1.SetLabels(outputMarkers(tk, "vm-1"))
+
+	// Another task's output of a similar shape must not be reclaimed: the
+	// markers are what make this a lookup rather than a guess.
+	otherTask := task("other", "tenant-foo", "vcenter", "replicated")
+	otherTask.UID = types.UID("other-uid")
+	stray := newObject(vmInstanceGVK)
+	stray.SetName("web-99")
+	stray.SetNamespace("tenant-foo")
+	stray.SetLabels(outputMarkers(otherTask, "vm-1"))
+
+	c := clientfake.NewClientBuilder().WithScheme(s).
+		WithObjects(tk, instance, disk0, disk1, stray).Build()
+	r := &VMImportTaskReconciler{Client: c, Scheme: s, Recorder: record.NewFakeRecorder(10)}
+
+	got, err := r.reclaimOutputs(context.Background(), tk,
+		&migrationv1alpha1.VMImportRequest{ID: "vm-1", Name: "web-01"})
+	if err != nil {
+		t.Fatalf("reclaimOutputs: %v", err)
+	}
+	if got == nil {
+		t.Fatal("reclaimed nothing; the import would be reported Failed with its outputs healthy")
+	}
+	if got.VMInstance != "web-01" {
+		t.Errorf("VMInstance = %q, want web-01", got.VMInstance)
+	}
+	if len(got.Disks) != 2 || got.Disks[0] != "web-01-disk-0" || got.Disks[1] != "web-01-disk-1" {
+		t.Errorf("disks = %v, want them in order", got.Disks)
+	}
+}
+
+// With no marked outputs there is nothing to reclaim, and saying so is what
+// lets the caller report the real failure instead of inventing a success.
+func TestReclaimOutputsFindsNothingWhenThereIsNothing(t *testing.T) {
+	s := testScheme(t)
+	tk := task("import", "tenant-foo", "vcenter", "replicated",
+		migrationv1alpha1.VMImportRequest{ID: "vm-1", Name: "web-01"})
+	tk.UID = types.UID("task-uid")
+
+	c := clientfake.NewClientBuilder().WithScheme(s).WithObjects(tk).Build()
+	r := &VMImportTaskReconciler{Client: c, Scheme: s, Recorder: record.NewFakeRecorder(10)}
+
+	got, err := r.reclaimOutputs(context.Background(), tk,
+		&migrationv1alpha1.VMImportRequest{ID: "vm-1", Name: "web-01"})
+	if err != nil {
+		t.Fatalf("reclaimOutputs: %v", err)
+	}
+	if got != nil {
+		t.Errorf("reclaimed %+v out of nowhere", got)
+	}
+}
diff --git a/internal/migrationcontroller/settle_reclaim_policy_test.go b/internal/migrationcontroller/settle_reclaim_policy_test.go
new file mode 100644
index 0000000000..27d04480cc
--- /dev/null
+++ b/internal/migrationcontroller/settle_reclaim_policy_test.go
@@ -0,0 +1,505 @@
+// SPDX-License-Identifier: Apache-2.0
+
+package migrationcontroller
+
+import (
+	"context"
+	"testing"
+
+	corev1 "k8s.io/api/core/v1"
+	storagev1 "k8s.io/api/storage/v1"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	"k8s.io/apimachinery/pkg/api/resource"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/apimachinery/pkg/types"
+	"k8s.io/client-go/tools/record"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+	clientfake "sigs.k8s.io/controller-runtime/pkg/client/fake"
+
+	migrationv1alpha1 "github.com/cozystack/cozystack/api/migration/v1alpha1"
+)
+
+const (
+	settleNS     = "tenant-foo"
+	settleDisk   = "web-01-disk-0"
+	settleTarget = vmDiskReleasePrefix + settleDisk
+	settlePV     = "pv-1"
+	settleDVUID  = types.UID("vmdisk-dv-uid")
+	settleClaimU = types.UID("replacement-claim-uid")
+)
+
+func classWithPolicy(name string, policy *corev1.PersistentVolumeReclaimPolicy) *storagev1.StorageClass {
+	sc := storageClass(name, storagev1.VolumeBindingImmediate, false)
+	sc.ReclaimPolicy = policy
+	return sc
+}
+
+// settledHandoff is the cluster once the swap is over: the replacement claim
+// and the volume are bound to each other, CDI has adopted the claim into the
+// VMDisk's DataVolume, and the VMDisk exists. Only the reclaim policy is still
+// the one the swap needed.
+func settledHandoff(tk *migrationv1alpha1.VMImportTask) (*corev1.PersistentVolume, *corev1.PersistentVolumeClaim, *unstructured.Unstructured, *unstructured.Unstructured) {
+	controller := true
+	claim := &corev1.PersistentVolumeClaim{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      settleTarget,
+			Namespace: settleNS,
+			UID:       settleClaimU,
+			Labels:    outputMarkers(tk, "vm-1"),
+			OwnerReferences: []metav1.OwnerReference{{
+				APIVersion: "cdi.kubevirt.io/v1beta1",
+				Kind:       "DataVolume",
+				Name:       settleTarget,
+				UID:        settleDVUID,
+				Controller: &controller,
+			}},
+		},
+		Spec:   corev1.PersistentVolumeClaimSpec{VolumeName: settlePV},
+		Status: corev1.PersistentVolumeClaimStatus{Phase: corev1.ClaimBound},
+	}
+	pv := &corev1.PersistentVolume{
+		ObjectMeta: metav1.ObjectMeta{Name: settlePV},
+		Spec: corev1.PersistentVolumeSpec{
+			StorageClassName:              "replicated",
+			PersistentVolumeReclaimPolicy: corev1.PersistentVolumeReclaimRetain,
+			ClaimRef: &corev1.ObjectReference{
+				Kind: "PersistentVolumeClaim", APIVersion: "v1",
+				Namespace: settleNS, Name: settleTarget, UID: settleClaimU,
+			},
+		},
+		Status: corev1.PersistentVolumeStatus{Phase: corev1.VolumeBound},
+	}
+	dv := newObject(dataVolumeGVK)
+	dv.SetName(settleTarget)
+	dv.SetNamespace(settleNS)
+	dv.SetUID(settleDVUID)
+
+	disk := newObject(vmDiskGVK)
+	disk.SetName(settleDisk)
+	disk.SetNamespace(settleNS)
+	stampOutput(disk, tk, "vm-1")
+	return pv, claim, dv, disk
+}
+
+func reclaimPolicyOf(t *testing.T, c client.Client) corev1.PersistentVolumeReclaimPolicy {
+	t.Helper()
+	pv := &corev1.PersistentVolume{}
+	if err := c.Get(context.Background(), types.NamespacedName{Name: settlePV}, pv); err != nil {
+		t.Fatalf("get pv: %v", err)
+	}
+	return pv.Spec.PersistentVolumeReclaimPolicy
+}
+
+// The leak this closes: an imported disk kept Retain for good, so deleting its
+// VMDisk left the volume Released with its backing storage, billed and
+// invisible to the tenant. Once the handoff is over the volume must carry what
+// its class says, like any disk created directly.
+func TestSettleRestoresTheClassReclaimPolicy(t *testing.T) {
+	deletePolicy := corev1.PersistentVolumeReclaimDelete
+	retainPolicy := corev1.PersistentVolumeReclaimRetain
+	cases := []struct {
+		name  string
+		class *storagev1.StorageClass
+		want  corev1.PersistentVolumeReclaimPolicy
+	}{
+		{"class says Delete", classWithPolicy("replicated", &deletePolicy), corev1.PersistentVolumeReclaimDelete},
+		// A class that asks for Retain keeps it: the policy restored is the
+		// class's, not an opinion of this controller.
+		{"class says Retain", classWithPolicy("replicated", &retainPolicy), corev1.PersistentVolumeReclaimRetain},
+		{"class names no policy", classWithPolicy("replicated", nil), corev1.PersistentVolumeReclaimDelete},
+		{"class is gone", nil, corev1.PersistentVolumeReclaimDelete},
+	}
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			s := testScheme(t)
+			tk := task("import", settleNS, "vcenter", "replicated")
+			pv, claim, dv, disk := settledHandoff(tk)
+			objs := []client.Object{tk, pv, claim, dv, disk}
+			if tc.class != nil {
+				objs = append(objs, tc.class)
+			}
+			c := clientfake.NewClientBuilder().WithScheme(s).WithObjects(objs...).Build()
+			r := &VMImportTaskReconciler{Client: c, Scheme: s, Recorder: record.NewFakeRecorder(10)}
+
+			settled, err := r.settleReclaimPolicy(context.Background(), tk, "vm-1", settleDisk, "forklift-claim")
+			if err != nil {
+				t.Fatalf("settleReclaimPolicy: %v", err)
+			}
+			if !settled {
+				t.Fatal("a finished handoff was reported as unsettled; the task would never complete")
+			}
+			if got := reclaimPolicyOf(t, c); got != tc.want {
+				t.Errorf("reclaim policy = %q, want %q", got, tc.want)
+			}
+		})
+	}
+}
+
+// The controller is re-entered on every requeue and after every restart; a
+// settled volume must not be rewritten on each pass.
+func TestSettleIsIdempotent(t *testing.T) {
+	s := testScheme(t)
+	tk := task("import", settleNS, "vcenter", "replicated")
+	pv, claim, dv, disk := settledHandoff(tk)
+	deletePolicy := corev1.PersistentVolumeReclaimDelete
+	c := clientfake.NewClientBuilder().WithScheme(s).
+		WithObjects(tk, pv, claim, dv, disk, classWithPolicy("replicated", &deletePolicy)).Build()
+	r := &VMImportTaskReconciler{Client: c, Scheme: s, Recorder: record.NewFakeRecorder(10)}
+
+	if _, err := r.settleReclaimPolicy(context.Background(), tk, "vm-1", settleDisk, ""); err != nil {
+		t.Fatalf("first pass: %v", err)
+	}
+	first := &corev1.PersistentVolume{}
+	if err := c.Get(context.Background(), types.NamespacedName{Name: settlePV}, first); err != nil {
+		t.Fatalf("get pv: %v", err)
+	}
+
+	settled, err := r.settleReclaimPolicy(context.Background(), tk, "vm-1", settleDisk, "")
+	if err != nil {
+		t.Fatalf("second pass: %v", err)
+	}
+	if !settled {
+		t.Error("a volume already settled was reported as unsettled on the next pass")
+	}
+	second := &corev1.PersistentVolume{}
+	if err := c.Get(context.Background(), types.NamespacedName{Name: settlePV}, second); err != nil {
+		t.Fatalf("get pv: %v", err)
+	}
+	if second.ResourceVersion != first.ResourceVersion {
+		t.Error("the second pass rewrote a volume that was already settled")
+	}
+}
+
+// Every state in which something other than the VMDisk could still release the
+// volume must keep Retain. Each case breaks exactly one condition of a finished
+// handoff; restoring Delete in any of them is the data loss Retain exists for.
+func TestSettleKeepsRetainWhileTheHandoffIsOpen(t *testing.T) {
+	cases := []struct {
+		name       string
+		mutate     func(pv *corev1.PersistentVolume, claim *corev1.PersistentVolumeClaim) []client.Object
+		mutateDisk func(disk *unstructured.Unstructured)
+		skipDV     bool
+		skipDisk   bool
+	}{
+		{
+			// A claim of the right name that this import did not create is a
+			// tenant's disk; its volume's policy is not this controller's to
+			// rewrite, whatever state the rest of the handoff is in.
+			name: "replacement claim not created by this import",
+			mutate: func(_ *corev1.PersistentVolume, claim *corev1.PersistentVolumeClaim) []client.Object {
+				claim.Labels = outputMarkers(task("other", settleNS, "vcenter", "replicated"), "vm-1")
+				return nil
+			},
+		},
+		{
+			name: "replacement claim not bound yet",
+			mutate: func(_ *corev1.PersistentVolume, claim *corev1.PersistentVolumeClaim) []client.Object {
+				claim.Status.Phase = corev1.ClaimPending
+				return nil
+			},
+		},
+		{
+			// claimRef was written, but the PV controller has not caught up:
+			// a stale view of the claim is exactly when it would reclaim.
+			name: "volume still Released",
+			mutate: func(pv *corev1.PersistentVolume, _ *corev1.PersistentVolumeClaim) []client.Object {
+				pv.Status.Phase = corev1.VolumeReleased
+				return nil
+			},
+		},
+		{
+			name: "claimRef still names the transferred claim",
+			mutate: func(pv *corev1.PersistentVolume, _ *corev1.PersistentVolumeClaim) []client.Object {
+				pv.Spec.ClaimRef.Name = "forklift-claim"
+				pv.Spec.ClaimRef.UID = "forklift-claim-uid"
+				return nil
+			},
+		},
+		{
+			// The name alone proves nothing: a claim deleted and recreated
+			// under the same name is a different claim to the PV controller.
+			name: "claimRef names the replacement claim with a stale UID",
+			mutate: func(pv *corev1.PersistentVolume, _ *corev1.PersistentVolumeClaim) []client.Object {
+				pv.Spec.ClaimRef.UID = "a-previous-claim-uid"
+				return nil
+			},
+		},
+		{
+			name: "transferred claim still exists",
+			mutate: func(_ *corev1.PersistentVolume, _ *corev1.PersistentVolumeClaim) []client.Object {
+				return []client.Object{&corev1.PersistentVolumeClaim{
+					ObjectMeta: metav1.ObjectMeta{Name: "forklift-claim", Namespace: settleNS},
+					Spec:       corev1.PersistentVolumeClaimSpec{VolumeName: settlePV},
+				}}
+			},
+		},
+		{
+			name: "CDI has not adopted the claim yet",
+			mutate: func(_ *corev1.PersistentVolume, claim *corev1.PersistentVolumeClaim) []client.Object {
+				claim.OwnerReferences = nil
+				return nil
+			},
+		},
+		{
+			// An owner besides the VMDisk's DataVolume is a deletion that is
+			// not the tenant's — the scaffolding VM being the obvious one.
+			name: "claim has another owner",
+			mutate: func(_ *corev1.PersistentVolume, claim *corev1.PersistentVolumeClaim) []client.Object {
+				claim.OwnerReferences = append(claim.OwnerReferences, metav1.OwnerReference{
+					APIVersion: "kubevirt.io/v1", Kind: "VirtualMachine", Name: "test-vm", UID: "vm-uid",
+				})
+				return nil
+			},
+		},
+		{
+			// A plain owner reference does not make the DataVolume the claim's
+			// controller, so CDI has not adopted it.
+			name: "DataVolume owns the claim without controlling it",
+			mutate: func(_ *corev1.PersistentVolume, claim *corev1.PersistentVolumeClaim) []client.Object {
+				notController := false
+				claim.OwnerReferences[0].Controller = &notController
+				return nil
+			},
+		},
+		{
+			name: "owner reference points at a previous DataVolume",
+			mutate: func(_ *corev1.PersistentVolume, claim *corev1.PersistentVolumeClaim) []client.Object {
+				claim.OwnerReferences[0].UID = "an-older-dv-uid"
+				return nil
+			},
+		},
+		{
+			name:   "VMDisk DataVolume missing",
+			mutate: func(*corev1.PersistentVolume, *corev1.PersistentVolumeClaim) []client.Object { return nil },
+			skipDV: true,
+		},
+		{
+			name:     "VMDisk missing",
+			mutate:   func(*corev1.PersistentVolume, *corev1.PersistentVolumeClaim) []client.Object { return nil },
+			skipDisk: true,
+		},
+		{
+			// A VMDisk of the right name that another import or the tenant
+			// created is not the release this volume was handed to.
+			name:   "VMDisk not created by this import",
+			mutate: func(*corev1.PersistentVolume, *corev1.PersistentVolumeClaim) []client.Object { return nil },
+			mutateDisk: func(disk *unstructured.Unstructured) {
+				disk.SetLabels(outputMarkers(task("other", settleNS, "vcenter", "replicated"), "vm-1"))
+			},
+		},
+	}
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			s := testScheme(t)
+			tk := task("import", settleNS, "vcenter", "replicated")
+			pv, claim, dv, disk := settledHandoff(tk)
+			extra := tc.mutate(pv, claim)
+			if tc.mutateDisk != nil {
+				tc.mutateDisk(disk)
+			}
+			deletePolicy := corev1.PersistentVolumeReclaimDelete
+			objs := []client.Object{tk, pv, claim, classWithPolicy("replicated", &deletePolicy)}
+			if !tc.skipDV {
+				objs = append(objs, dv)
+			}
+			if !tc.skipDisk {
+				objs = append(objs, disk)
+			}
+			objs = append(objs, extra...)
+			c := clientfake.NewClientBuilder().WithScheme(s).WithObjects(objs...).Build()
+			r := &VMImportTaskReconciler{Client: c, Scheme: s, Recorder: record.NewFakeRecorder(10)}
+
+			settled, err := r.settleReclaimPolicy(context.Background(), tk, "vm-1", settleDisk, "forklift-claim")
+			if err != nil {
+				t.Fatalf("settleReclaimPolicy: %v", err)
+			}
+			if settled {
+				t.Error("reported settled while the handoff is still open")
+			}
+			if got := reclaimPolicyOf(t, c); got != corev1.PersistentVolumeReclaimRetain {
+				t.Errorf("reclaim policy = %q while the handoff is open, want Retain", got)
+			}
+		})
+	}
+}
+
+// End to end over fulfill: the first pass performs the swap and must leave the
+// volume on Retain, with no instance yet and the task still Creating. Once the
+// PV controller and CDI have done their part, the next pass restores the class
+// policy and only then finishes the import, so a VMDisk deleted afterwards
+// takes its volume with it.
+func TestFulfillRestoresTheReclaimPolicyBeforeFinishing(t *testing.T) {
+	ctx := context.Background()
+	s := testScheme(t)
+	req := migrationv1alpha1.VMImportRequest{ID: "vm-1", Name: "web-01"}
+	tk := task("import", settleNS, "vcenter", "replicated", req)
+
+	plan := newObject(planGVK)
+	plan.SetName(planName("import", "vm-1"))
+	plan.SetNamespace(settleNS)
+	plan.SetUID("plan-uid")
+
+	vm := newObject(virtualMachineGVK)
+	vm.SetName("test-vm")
+	vm.SetNamespace(settleNS)
+	vm.SetLabels(map[string]string{"plan": "plan-uid"})
+	if err := unstructured.SetNestedSlice(vm.Object, []interface{}{
+		map[string]interface{}{"name": "disk0", "dataVolume": map[string]interface{}{"name": "forklift-claim"}},
+	}, "spec", "template", "spec", "volumes"); err != nil {
+		t.Fatalf("build vm: %v", err)
+	}
+
+	transferred := &corev1.PersistentVolumeClaim{
+		ObjectMeta: metav1.ObjectMeta{Name: "forklift-claim", Namespace: settleNS},
+		Spec: corev1.PersistentVolumeClaimSpec{
+			VolumeName: settlePV,
+			Resources: corev1.VolumeResourceRequirements{
+				Requests: corev1.ResourceList{corev1.ResourceStorage: resource.MustParse("16Gi")},
+			},
+		},
+		Status: corev1.PersistentVolumeClaimStatus{Phase: corev1.ClaimBound},
+	}
+	pv := &corev1.PersistentVolume{
+		ObjectMeta: metav1.ObjectMeta{Name: settlePV},
+		Spec: corev1.PersistentVolumeSpec{
+			StorageClassName:              "replicated",
+			PersistentVolumeReclaimPolicy: corev1.PersistentVolumeReclaimDelete,
+			Capacity:                      corev1.ResourceList{corev1.ResourceStorage: resource.MustParse("16Gi")},
+			ClaimRef: &corev1.ObjectReference{
+				Kind: "PersistentVolumeClaim", APIVersion: "v1",
+				Namespace: settleNS, Name: "forklift-claim",
+			},
+		},
+		Status: corev1.PersistentVolumeStatus{Phase: corev1.VolumeBound},
+	}
+	deletePolicy := corev1.PersistentVolumeReclaimDelete
+	c := clientfake.NewClientBuilder().WithScheme(s).
+		WithObjects(tk, plan, vm, transferred, pv, classWithPolicy("replicated", &deletePolicy)).Build()
+	r := &VMImportTaskReconciler{Client: c, Scheme: s, Recorder: record.NewFakeRecorder(10)}
+
+	out, err := r.fulfill(ctx, tk, &req)
+	if err != nil {
+		t.Fatalf("first pass: %v", err)
+	}
+	if out != nil {
+		t.Fatal("the first pass finished the import with the volume still on the swap's Retain")
+	}
+	if got := reclaimPolicyOf(t, c); got != corev1.PersistentVolumeReclaimRetain {
+		t.Fatalf("reclaim policy during the swap = %q, want Retain", got)
+	}
+	if err := c.Get(ctx, types.NamespacedName{Namespace: settleNS, Name: "web-01"}, newObject(vmInstanceGVK)); !apierrors.IsNotFound(err) {
+		t.Errorf("a VMInstance exists over a disk that is not settled (err %v)", err)
+	}
+	if err := c.Get(ctx, types.NamespacedName{Namespace: settleNS, Name: "test-vm"}, newObject(virtualMachineGVK)); err != nil {
+		t.Errorf("the scaffolding VM was removed before the disks settled: %v", err)
+	}
+
+	// What the PV controller and CDI do between the two passes.
+	claim := &corev1.PersistentVolumeClaim{}
+	if err := c.Get(ctx, types.NamespacedName{Namespace: settleNS, Name: settleTarget}, claim); err != nil {
+		t.Fatalf("get replacement claim: %v", err)
+	}
+	dv := newObject(dataVolumeGVK)
+	if err := c.Get(ctx, types.NamespacedName{Namespace: settleNS, Name: settleTarget}, dv); err != nil {
+		t.Fatalf("get VMDisk DataVolume: %v", err)
+	}
+	controller := true
+	claim.OwnerReferences = []metav1.OwnerReference{{
+		APIVersion: "cdi.kubevirt.io/v1beta1", Kind: "DataVolume",
+		Name: settleTarget, UID: dv.GetUID(), Controller: &controller,
+	}}
+	if err := c.Update(ctx, claim); err != nil {
+		t.Fatalf("adopt replacement claim: %v", err)
+	}
+	claim.Status.Phase = corev1.ClaimBound
+	if err := c.Status().Update(ctx, claim); err != nil {
+		t.Fatalf("bind replacement claim: %v", err)
+	}
+	gotPV := &corev1.PersistentVolume{}
+	if err := c.Get(ctx, types.NamespacedName{Name: settlePV}, gotPV); err != nil {
+		t.Fatalf("get pv: %v", err)
+	}
+	gotPV.Status.Phase = corev1.VolumeBound
+	if err := c.Status().Update(ctx, gotPV); err != nil {
+		t.Fatalf("bind pv: %v", err)
+	}
+
+	out, err = r.fulfill(ctx, tk, &req)
+	if err != nil {
+		t.Fatalf("second pass: %v", err)
+	}
+	if out == nil {
+		t.Fatal("the second pass did not finish an import whose handoff is over")
+	}
+	if got := reclaimPolicyOf(t, c); got != corev1.PersistentVolumeReclaimDelete {
+		t.Errorf("reclaim policy after the import = %q, want the class's Delete — deleting the VMDisk would leak the volume", got)
+	}
+	if err := c.Get(ctx, types.NamespacedName{Namespace: settleNS, Name: "web-01"}, newObject(vmInstanceGVK)); err != nil {
+		t.Errorf("VMInstance was not created once the disks settled: %v", err)
+	}
+	if err := c.Get(ctx, types.NamespacedName{Namespace: settleNS, Name: "test-vm"}, newObject(virtualMachineGVK)); !apierrors.IsNotFound(err) {
+		t.Errorf("the scaffolding VM survived a finished import (err %v)", err)
+	}
+}
+
+// The recovery path: a controller predating settlement deleted the scaffolding
+// VM and died before writing the status, so fulfill finds no VM and no status
+// entry, only this task's marked VMInstance and VMDisk. Those volumes may still
+// be on the swap's Retain, and recovering the outputs must settle them first,
+// or the import is recorded as finished with the leak it was meant to close.
+func TestFulfillSettlesReclaimedOutputs(t *testing.T) {
+	cases := []struct {
+		name       string
+		open       bool
+		wantOut    bool
+		wantPolicy corev1.PersistentVolumeReclaimPolicy
+	}{
+		{"handoff still open", true, false, corev1.PersistentVolumeReclaimRetain},
+		{"handoff finished", false, true, corev1.PersistentVolumeReclaimDelete},
+	}
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			ctx := context.Background()
+			s := testScheme(t)
+			req := migrationv1alpha1.VMImportRequest{ID: "vm-1", Name: "web-01"}
+			tk := task("import", settleNS, "vcenter", "replicated", req)
+			// Status knows nothing and no Plan or VM is left to find.
+			tk.Status.VMs = nil
+
+			pv, claim, dv, disk := settledHandoff(tk)
+			if tc.open {
+				// CDI has not adopted the claim yet.
+				claim.OwnerReferences = nil
+			}
+			instance := newObject(vmInstanceGVK)
+			instance.SetName("web-01")
+			instance.SetNamespace(settleNS)
+			stampOutput(instance, tk, "vm-1")
+
+			deletePolicy := corev1.PersistentVolumeReclaimDelete
+			c := clientfake.NewClientBuilder().WithScheme(s).
+				WithObjects(tk, pv, claim, dv, disk, instance, classWithPolicy("replicated", &deletePolicy)).Build()
+			r := &VMImportTaskReconciler{Client: c, Scheme: s, Recorder: record.NewFakeRecorder(10)}
+
+			out, err := r.fulfill(ctx, tk, &req)
+			if err != nil {
+				t.Fatalf("fulfill: %v", err)
+			}
+			if !tc.wantOut && out != nil {
+				t.Errorf("recovered outputs %+v while their volume is still on the swap's Retain", out)
+			}
+			if tc.wantOut {
+				if out == nil {
+					t.Fatal("recovered nothing from a finished handoff; the task would never complete")
+				}
+				if out.VMInstance != "web-01" || len(out.Disks) != 1 || out.Disks[0] != settleDisk {
+					t.Errorf("outputs = %+v, want web-01 over %s", out, settleDisk)
+				}
+			}
+			if got := reclaimPolicyOf(t, c); got != tc.wantPolicy {
+				t.Errorf("reclaim policy = %q, want %q", got, tc.wantPolicy)
+			}
+		})
+	}
+}
diff --git a/internal/migrationcontroller/vmimportsource_controller.go b/internal/migrationcontroller/vmimportsource_controller.go
new file mode 100644
index 0000000000..ccbed63670
--- /dev/null
+++ b/internal/migrationcontroller/vmimportsource_controller.go
@@ -0,0 +1,437 @@
+// SPDX-License-Identifier: Apache-2.0
+
+package migrationcontroller
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"strings"
+	"time"
+
+	corev1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/api/equality"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	"k8s.io/apimachinery/pkg/api/meta"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/types"
+	"k8s.io/client-go/tools/record"
+	ctrl "sigs.k8s.io/controller-runtime"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/log"
+
+	migrationv1alpha1 "github.com/cozystack/cozystack/api/migration/v1alpha1"
+)
+
+// ConnectionRequeue is how often a Source is re-examined while its Forklift
+// Provider has not settled. Short enough that a corrected endpoint or password
+// is noticed quickly, long enough that a permanently wrong one does not flood
+// the apiserver.
+const ConnectionRequeue = 30 * time.Second
+
+// VMImportSourceReconciler turns a VMImportSource into the Forklift objects a
+// migration needs: a credentials Secret and the source/destination Provider
+// pair. It never contacts the provider itself — Forklift's Provider controller
+// performs the connection test and publishes the result, so this reconciler
+// mirrors that verdict onto the Source rather than shipping a second vSphere
+// client that could disagree with the one doing the actual work.
+type VMImportSourceReconciler struct {
+	client.Client
+	Scheme   *runtime.Scheme
+	Recorder record.EventRecorder
+
+	// VDDKImage is the operator-supplied VMware Virtual Disk Development Kit
+	// image. It is platform configuration, never a tenant value: naming an
+	// image the cluster will run is not a tenant's decision, and this one is
+	// built from a proprietary SDK that Cozystack cannot ship or mirror. Empty
+	// means the VMware path is unavailable, which a vSphere Source reports on
+	// its own status instead of failing somewhere deep in a transfer.
+	VDDKImage string
+
+	// Inventory reads Forklift's view of the source so the machine list can be
+	// published for the console's VM picker. This is still not a second vSphere
+	// client: it asks Forklift what Forklift already discovered. Nil disables
+	// publishing, and the picker then simply offers nothing.
+	Inventory *inventoryClient
+}
+
+func (r *VMImportSourceReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
+	logger := log.FromContext(ctx)
+
+	src := &migrationv1alpha1.VMImportSource{}
+	if err := r.Get(ctx, req.NamespacedName, src); err != nil {
+		if apierrors.IsNotFound(err) {
+			return ctrl.Result{}, nil
+		}
+		return ctrl.Result{}, err
+	}
+
+	// A vSphere source is unusable without the VDDK image, and saying so here
+	// is the whole point: the tenant learns the VMware path is not configured
+	// when they register the connection, not when a 200 GiB transfer dies.
+	if src.Spec.Type == migrationv1alpha1.ProviderVSphere && r.VDDKImage == "" {
+		return r.fail(ctx, src, migrationv1alpha1.ReasonVDDKNotConfigured,
+			"VMware import requires the platform administrator to configure a VDDK image "+
+				"(vmImport.vddkImage in the platform values); until then the vSphere import "+
+				"path is unavailable")
+	}
+
+	secretName, err := projectCredentials(ctx, r.Client, src)
+	if err != nil {
+		if perr, ok := errors.AsType[*ProjectionError](err); ok {
+			return r.fail(ctx, src, perr.Reason, perr.Message)
+		}
+		return ctrl.Result{}, err
+	}
+
+	if err := r.ensureProviders(ctx, src, secretName); err != nil {
+		// Forklift's absence is a state to report, not a failure to retry
+		// silently. Returning it as an error means the reconcile never reaches
+		// the status write below, so the Source keeps whatever condition it had
+		// — which is actively misleading once the operator fixes the thing the
+		// old condition complained about. Seen on a live cluster: a Source went
+		// on claiming VDDKNotConfigured long after a VDDK image was configured,
+		// because every pass died here before saying anything.
+		if meta.IsNoMatchError(err) {
+			return r.fail(ctx, src, migrationv1alpha1.ReasonForkliftNotInstalled,
+				"the migration engine is not installed in this cluster: enable the "+
+					"forklift-operator and forklift packages")
+		}
+		return ctrl.Result{}, err
+	}
+
+	// Host overrides come after the Provider they attach to: Forklift resolves
+	// a Host against its provider, so creating one first only produces an
+	// object that cannot validate yet.
+	if err := r.ensureHosts(ctx, src); err != nil {
+		if perr, ok := errors.AsType[*ProjectionError](err); ok {
+			return r.fail(ctx, src, perr.Reason, perr.Message)
+		}
+		return ctrl.Result{}, err
+	}
+
+	// Mirror Forklift's own verdict. Until its Provider controller has run, the
+	// Source stays not-ready with a reason that says so rather than claiming a
+	// connection nobody has tested.
+	ready, reason, message, err := r.providerVerdict(ctx, src)
+	if err != nil {
+		return ctrl.Result{}, err
+	}
+	if ready {
+		if err := r.setReady(ctx, src, metav1.ConditionTrue, migrationv1alpha1.ReasonConnected, message); err != nil {
+			return ctrl.Result{}, err
+		}
+		logger.V(1).Info("VMImportSource ready", "name", src.Name)
+		// Refresh the machine list on the same beat. A failure is logged and
+		// dropped rather than returned: the Source reports on the connection,
+		// and an inventory that is briefly unavailable should cost the picker
+		// its contents, not turn a working source not-ready.
+		if err := r.publishInventory(ctx, src); err != nil {
+			logger.V(1).Info("could not publish the source inventory", "name", src.Name, "error", err.Error())
+		}
+		// Re-check periodically: a connection that worked at registration can
+		// stop working, and a task that starts then would fail confusingly.
+		return ctrl.Result{RequeueAfter: 10 * time.Minute}, nil
+	}
+	if err := r.setReady(ctx, src, metav1.ConditionFalse, reason, message); err != nil {
+		return ctrl.Result{}, err
+	}
+	return ctrl.Result{RequeueAfter: ConnectionRequeue}, nil
+}
+
+// ensureProviders creates or updates the source and destination Providers. The
+// destination is Forklift's model of the local cluster: an "openshift"-type
+// provider with an empty URL, which is Forklift's own naming and says nothing
+// about what Cozystack runs on.
+func (r *VMImportSourceReconciler) ensureProviders(ctx context.Context, src *migrationv1alpha1.VMImportSource, secretName string) error {
+	owner := ownerRef(migrationv1alpha1.GroupVersion.WithKind("VMImportSource"), src.Name, src.UID)
+
+	sourceSpec := map[string]any{
+		"type": string(src.Spec.Type),
+		"url":  src.Spec.URL,
+		"secret": map[string]any{
+			"name":      secretName,
+			"namespace": src.Namespace,
+		},
+	}
+	if src.Spec.Type == migrationv1alpha1.ProviderVSphere && r.VDDKImage != "" {
+		sourceSpec["settings"] = map[string]any{
+			"vddkInitImage": r.VDDKImage,
+		}
+	}
+	if err := r.applyProvider(ctx, src, sourceProviderName(src.Name), sourceSpec, owner); err != nil {
+		return err
+	}
+
+	destSpec := map[string]any{
+		"type":   "openshift",
+		"url":    "",
+		"secret": map[string]any{},
+	}
+	return r.applyProvider(ctx, src, destinationProviderName(src.Name), destSpec, owner)
+}
+
+// ensureHosts materializes one Forklift Host per spec.hosts entry, redirecting
+// the disk transfer away from the address vCenter advertises.
+//
+// Each host needs its own Secret: the ESXi host authenticates the transfer
+// connection itself rather than honouring the vCenter session, and Forklift
+// connection-tests the pair before any Plan referencing that host can run.
+func (r *VMImportSourceReconciler) ensureHosts(ctx context.Context, src *migrationv1alpha1.VMImportSource) error {
+	owner := ownerRef(migrationv1alpha1.GroupVersion.WithKind("VMImportSource"), src.Name, src.UID)
+
+	for i := range src.Spec.Hosts {
+		h := &src.Spec.Hosts[i]
+		name := hostOverrideName(src.Name, h.ID)
+
+		secretName, err := projectSecret(ctx, r.Client, src, name, h.Credentials)
+		if err != nil {
+			return err
+		}
+
+		spec := map[string]any{
+			"id":        h.ID,
+			"ipAddress": h.Address,
+			"provider": map[string]any{
+				"name":      sourceProviderName(src.Name),
+				"namespace": src.Namespace,
+			},
+			"secret": map[string]any{
+				"name":      secretName,
+				"namespace": src.Namespace,
+			},
+		}
+
+		existing := newObject(hostGVK)
+		err = r.Get(ctx, types.NamespacedName{Namespace: src.Namespace, Name: name}, existing)
+		if apierrors.IsNotFound(err) {
+			obj := newObject(hostGVK)
+			obj.SetName(name)
+			obj.SetNamespace(src.Namespace)
+			obj.SetLabels(map[string]string{
+				migrationv1alpha1.ManagedByLabel: migrationv1alpha1.ManagedByValue,
+			})
+			obj.SetOwnerReferences([]metav1.OwnerReference{owner})
+			if err := unstructured.SetNestedMap(obj.Object, spec, "spec"); err != nil {
+				return err
+			}
+			if err := r.Create(ctx, obj); err != nil && !apierrors.IsAlreadyExists(err) {
+				return err
+			}
+			continue
+		}
+		if err != nil {
+			return err
+		}
+		current, _, _ := unstructured.NestedMap(existing.Object, "spec")
+		if specEqual(current, spec) {
+			continue
+		}
+		if err := unstructured.SetNestedMap(existing.Object, spec, "spec"); err != nil {
+			return err
+		}
+		if err := r.Update(ctx, existing); err != nil {
+			return err
+		}
+	}
+	return r.pruneHosts(ctx, src)
+}
+
+// pruneHosts removes the Hosts and projected Secrets of overrides the source no
+// longer lists.
+//
+// A Source is editable, so an override can be dropped after it was created.
+// Creating and updating alone would leave the old Host in place, and a Host is
+// not inert: Forklift keeps routing that ESXi host's transfers through the
+// address it names, so a stale one silently redirects traffic to somewhere the
+// tenant has removed from the spec — and its credentials outlive the decision
+// to stop using them, until the whole Source is deleted.
+//
+// Ownership is checked rather than assumed. The label alone says this
+// controller made the object, not that it made it for this Source, and two
+// Sources in one namespace would otherwise delete each other's Hosts.
+func (r *VMImportSourceReconciler) pruneHosts(ctx context.Context, src *migrationv1alpha1.VMImportSource) error {
+	wanted := make(map[string]bool, len(src.Spec.Hosts))
+	for i := range src.Spec.Hosts {
+		wanted[hostOverrideName(src.Name, src.Spec.Hosts[i].ID)] = true
+	}
+
+	hosts := &unstructured.UnstructuredList{}
+	hosts.SetGroupVersionKind(hostGVK)
+	if err := r.List(ctx, hosts,
+		client.InNamespace(src.Namespace),
+		client.MatchingLabels{migrationv1alpha1.ManagedByLabel: migrationv1alpha1.ManagedByValue},
+	); err != nil {
+		// Forklift's CRDs can be absent; that is not this reconcile's problem.
+		if meta.IsNoMatchError(err) {
+			return nil
+		}
+		return err
+	}
+
+	for i := range hosts.Items {
+		host := &hosts.Items[i]
+		name := host.GetName()
+		if wanted[name] || !ownedBy(host, src) {
+			continue
+		}
+		if err := r.Delete(ctx, host); err != nil && !apierrors.IsNotFound(err) {
+			return err
+		}
+		// The projected credentials share the Host's name. They carry an owner
+		// reference to the Source, so leaving them would keep them alive for as
+		// long as the Source itself.
+		secret := &corev1.Secret{}
+		secret.Name = name
+		secret.Namespace = src.Namespace
+		if err := r.Delete(ctx, secret); err != nil && !apierrors.IsNotFound(err) {
+			return err
+		}
+	}
+	return nil
+}
+
+// ownedBy reports whether this Source is the object's owner, by UID rather than
+// by name: names are reused, and a recreated Source is a different object.
+func ownedBy(obj metav1.Object, src *migrationv1alpha1.VMImportSource) bool {
+	for _, ref := range obj.GetOwnerReferences() {
+		if ref.UID == src.UID {
+			return true
+		}
+	}
+	return false
+}
+
+func (r *VMImportSourceReconciler) applyProvider(
+	ctx context.Context,
+	src *migrationv1alpha1.VMImportSource,
+	name string,
+	spec map[string]any,
+	owner metav1.OwnerReference,
+) error {
+	existing := newObject(providerGVK)
+	err := r.Get(ctx, types.NamespacedName{Namespace: src.Namespace, Name: name}, existing)
+	if apierrors.IsNotFound(err) {
+		obj := newObject(providerGVK)
+		obj.SetName(name)
+		obj.SetNamespace(src.Namespace)
+		obj.SetLabels(map[string]string{
+			migrationv1alpha1.ManagedByLabel: migrationv1alpha1.ManagedByValue,
+		})
+		obj.SetOwnerReferences([]metav1.OwnerReference{owner})
+		if err := unstructured.SetNestedMap(obj.Object, spec, "spec"); err != nil {
+			return err
+		}
+		if err := r.Create(ctx, obj); err != nil && !apierrors.IsAlreadyExists(err) {
+			return err
+		}
+		return nil
+	}
+	if err != nil {
+		return err
+	}
+
+	current, _, _ := unstructured.NestedMap(existing.Object, "spec")
+	if specEqual(current, spec) {
+		return nil
+	}
+	if err := unstructured.SetNestedMap(existing.Object, spec, "spec"); err != nil {
+		return err
+	}
+	return r.Update(ctx, existing)
+}
+
+// providerVerdict reads the source Provider's conditions. Forklift publishes a
+// Ready condition once it has authenticated and read the inventory; anything
+// else is reported verbatim so a tenant sees Forklift's own words about their
+// endpoint rather than a paraphrase.
+func (r *VMImportSourceReconciler) providerVerdict(ctx context.Context, src *migrationv1alpha1.VMImportSource) (bool, string, string, error) {
+	provider := newObject(providerGVK)
+	err := r.Get(ctx, types.NamespacedName{Namespace: src.Namespace, Name: sourceProviderName(src.Name)}, provider)
+	if apierrors.IsNotFound(err) {
+		return false, migrationv1alpha1.ReasonConnectionFailed, "the Forklift Provider has not been created yet", nil
+	}
+	if err != nil {
+		if meta.IsNoMatchError(err) {
+			return false, migrationv1alpha1.ReasonForkliftNotInstalled,
+				"the migration engine is not installed in this cluster: enable the " +
+					"forklift-operator and forklift packages", nil
+		}
+		return false, "", "", err
+	}
+
+	conditions, _, _ := unstructured.NestedSlice(provider.Object, "status", "conditions")
+	var critical []string
+	for _, raw := range conditions {
+		cond, ok := raw.(map[string]any)
+		if !ok {
+			continue
+		}
+		ctype, _, _ := unstructured.NestedString(cond, "type")
+		status, _, _ := unstructured.NestedString(cond, "status")
+		category, _, _ := unstructured.NestedString(cond, "category")
+		message, _, _ := unstructured.NestedString(cond, "message")
+
+		if ctype == "Ready" && status == "True" {
+			return true, migrationv1alpha1.ReasonConnected, "the provider endpoint answered and its inventory is readable", nil
+		}
+		if status == "True" && (category == "Critical" || category == "Error") {
+			critical = append(critical, fmt.Sprintf("%s: %s", ctype, message))
+		}
+	}
+	if len(critical) > 0 {
+		return false, migrationv1alpha1.ReasonConnectionFailed, strings.Join(critical, "; "), nil
+	}
+	return false, migrationv1alpha1.ReasonConnectionFailed, "waiting for Forklift to test the connection", nil
+}
+
+func (r *VMImportSourceReconciler) fail(ctx context.Context, src *migrationv1alpha1.VMImportSource, reason, message string) (ctrl.Result, error) {
+	if err := r.setReady(ctx, src, metav1.ConditionFalse, reason, message); err != nil {
+		return ctrl.Result{}, err
+	}
+	return ctrl.Result{RequeueAfter: ConnectionRequeue}, nil
+}
+
+func (r *VMImportSourceReconciler) setReady(ctx context.Context, src *migrationv1alpha1.VMImportSource, status metav1.ConditionStatus, reason, message string) error {
+	cond := metav1.Condition{
+		Type:               migrationv1alpha1.SourceReadyCondition,
+		Status:             status,
+		Reason:             reason,
+		Message:            message,
+		ObservedGeneration: src.Generation,
+	}
+	if !conditionChanged(src.Status.Conditions, cond) && src.Status.ObservedGeneration == src.Generation {
+		return nil
+	}
+	meta.SetStatusCondition(&src.Status.Conditions, cond)
+	src.Status.ObservedGeneration = src.Generation
+	return r.Status().Update(ctx, src)
+}
+
+// conditionChanged reports whether setting cond would change anything the
+// reader can see. Without this the reconciler would write status on every
+// requeue, and a not-ready Source would rewrite its condition twice a minute
+// forever.
+func conditionChanged(existing []metav1.Condition, cond metav1.Condition) bool {
+	current := meta.FindStatusCondition(existing, cond.Type)
+	if current == nil {
+		return true
+	}
+	return current.Status != cond.Status ||
+		current.Reason != cond.Reason ||
+		current.Message != cond.Message ||
+		current.ObservedGeneration != cond.ObservedGeneration
+}
+
+func specEqual(a, b map[string]any) bool {
+	return equality.Semantic.DeepEqual(a, b)
+}
+
+func (r *VMImportSourceReconciler) SetupWithManager(mgr ctrl.Manager) error {
+	return ctrl.NewControllerManagedBy(mgr).
+		For(&migrationv1alpha1.VMImportSource{}).
+		Named("vmimportsource").
+		Complete(r)
+}
diff --git a/internal/migrationcontroller/vmimportsource_controller_test.go b/internal/migrationcontroller/vmimportsource_controller_test.go
new file mode 100644
index 0000000000..3aa5d75fef
--- /dev/null
+++ b/internal/migrationcontroller/vmimportsource_controller_test.go
@@ -0,0 +1,347 @@
+// SPDX-License-Identifier: Apache-2.0
+package migrationcontroller
+
+import (
+	"context"
+	"strings"
+	"testing"
+
+	corev1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/api/meta"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/types"
+	"k8s.io/client-go/kubernetes/scheme"
+	"k8s.io/client-go/tools/record"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+	clientfake "sigs.k8s.io/controller-runtime/pkg/client/fake"
+	"sigs.k8s.io/controller-runtime/pkg/client/interceptor"
+	"sigs.k8s.io/controller-runtime/pkg/reconcile"
+
+	migrationv1alpha1 "github.com/cozystack/cozystack/api/migration/v1alpha1"
+)
+
+func testScheme(t *testing.T) *runtime.Scheme {
+	t.Helper()
+	s := runtime.NewScheme()
+	if err := scheme.AddToScheme(s); err != nil {
+		t.Fatalf("add client-go scheme: %v", err)
+	}
+	if err := migrationv1alpha1.AddToScheme(s); err != nil {
+		t.Fatalf("add migration scheme: %v", err)
+	}
+	// Forklift, KubeVirt and CDI objects are unstructured at runtime, so the
+	// fake client needs both the object and list kinds registered to serve them.
+	s.AddKnownTypeWithName(providerGVK, &unstructured.Unstructured{})
+	s.AddKnownTypeWithName(providerGVK.GroupVersion().WithKind("ProviderList"), &unstructured.UnstructuredList{})
+	s.AddKnownTypeWithName(planGVK, &unstructured.Unstructured{})
+	s.AddKnownTypeWithName(planGVK.GroupVersion().WithKind("PlanList"), &unstructured.UnstructuredList{})
+	s.AddKnownTypeWithName(migrationGVK, &unstructured.Unstructured{})
+	s.AddKnownTypeWithName(migrationGVK.GroupVersion().WithKind("MigrationList"), &unstructured.UnstructuredList{})
+	s.AddKnownTypeWithName(networkMapGVK, &unstructured.Unstructured{})
+	s.AddKnownTypeWithName(networkMapGVK.GroupVersion().WithKind("NetworkMapList"), &unstructured.UnstructuredList{})
+	s.AddKnownTypeWithName(storageMapGVK, &unstructured.Unstructured{})
+	s.AddKnownTypeWithName(storageMapGVK.GroupVersion().WithKind("StorageMapList"), &unstructured.UnstructuredList{})
+	s.AddKnownTypeWithName(dataVolumeGVK, &unstructured.Unstructured{})
+	s.AddKnownTypeWithName(dataVolumeGVK.GroupVersion().WithKind("DataVolumeList"), &unstructured.UnstructuredList{})
+	s.AddKnownTypeWithName(virtualMachineGVK, &unstructured.Unstructured{})
+	s.AddKnownTypeWithName(virtualMachineGVK.GroupVersion().WithKind("VirtualMachineList"), &unstructured.UnstructuredList{})
+	s.AddKnownTypeWithName(vmDiskGVK, &unstructured.Unstructured{})
+	s.AddKnownTypeWithName(vmDiskGVK.GroupVersion().WithKind("VMDiskList"), &unstructured.UnstructuredList{})
+	s.AddKnownTypeWithName(vmInstanceGVK, &unstructured.Unstructured{})
+	s.AddKnownTypeWithName(vmInstanceGVK.GroupVersion().WithKind("VMInstanceList"), &unstructured.UnstructuredList{})
+	return s
+}
+
+func vsphereSource(name, namespace string) *migrationv1alpha1.VMImportSource {
+	return &migrationv1alpha1.VMImportSource{
+		ObjectMeta: metav1.ObjectMeta{Name: name, Namespace: namespace, UID: types.UID(name + "-uid")},
+		Spec: migrationv1alpha1.VMImportSourceSpec{
+			Type: migrationv1alpha1.ProviderVSphere,
+			URL:  "https://vcenter.example.com/sdk",
+			Credentials: migrationv1alpha1.ProviderCredentials{
+				Username: "migration@vsphere.local",
+				Password: "hunter2",
+				CACert:   "-----BEGIN CERTIFICATE-----\nMIIB\n-----END CERTIFICATE-----\n",
+			},
+		},
+	}
+}
+
+// TestSourceWithoutVDDKIsUnavailableNotBroken locks in the policy that a
+// missing VDDK image is reported on the object at registration time. The whole
+// point is that the tenant learns the VMware path is unconfigured before a
+// transfer starts, so this must never silently create a Provider.
+func TestSourceWithoutVDDKIsUnavailableNotBroken(t *testing.T) {
+	s := testScheme(t)
+	src := vsphereSource("vcenter", "tenant-foo")
+	c := clientfake.NewClientBuilder().WithScheme(s).
+		WithObjects(src).WithStatusSubresource(src).Build()
+
+	r := &VMImportSourceReconciler{Client: c, Scheme: s, Recorder: record.NewFakeRecorder(10), VDDKImage: ""}
+	if _, err := r.Reconcile(context.Background(), reconcile.Request{
+		NamespacedName: types.NamespacedName{Namespace: "tenant-foo", Name: "vcenter"},
+	}); err != nil {
+		t.Fatalf("reconcile: %v", err)
+	}
+
+	got := &migrationv1alpha1.VMImportSource{}
+	if err := c.Get(context.Background(), types.NamespacedName{Namespace: "tenant-foo", Name: "vcenter"}, got); err != nil {
+		t.Fatalf("get source: %v", err)
+	}
+	cond := meta.FindStatusCondition(got.Status.Conditions, migrationv1alpha1.SourceReadyCondition)
+	if cond == nil {
+		t.Fatal("expected a Ready condition")
+	}
+	if cond.Status != metav1.ConditionFalse {
+		t.Errorf("Ready = %s, want False", cond.Status)
+	}
+	if cond.Reason != migrationv1alpha1.ReasonVDDKNotConfigured {
+		t.Errorf("reason = %q, want %q", cond.Reason, migrationv1alpha1.ReasonVDDKNotConfigured)
+	}
+
+	provider := newObject(providerGVK)
+	err := c.Get(context.Background(), types.NamespacedName{Namespace: "tenant-foo", Name: sourceProviderName("vcenter")}, provider)
+	if err == nil {
+		t.Error("a Provider was created even though no VDDK image is configured")
+	}
+}
+
+// TestSourceProjectsCredentialsAndProviders asserts the happy path materializes
+// exactly what Forklift needs, and that the credentials never require the
+// tenant to have created a Secret.
+func TestSourceProjectsCredentialsAndProviders(t *testing.T) {
+	s := testScheme(t)
+	src := vsphereSource("vcenter", "tenant-foo")
+	c := clientfake.NewClientBuilder().WithScheme(s).
+		WithObjects(src).WithStatusSubresource(src).Build()
+
+	r := &VMImportSourceReconciler{
+		Client: c, Scheme: s, Recorder: record.NewFakeRecorder(10),
+		VDDKImage: "registry.example.com/vddk:8.0.3",
+	}
+	if _, err := r.Reconcile(context.Background(), reconcile.Request{
+		NamespacedName: types.NamespacedName{Namespace: "tenant-foo", Name: "vcenter"},
+	}); err != nil {
+		t.Fatalf("reconcile: %v", err)
+	}
+
+	secret := &corev1.Secret{}
+	if err := c.Get(context.Background(), types.NamespacedName{
+		Namespace: "tenant-foo", Name: credentialsSecretName("vcenter"),
+	}, secret); err != nil {
+		t.Fatalf("credentials Secret was not projected: %v", err)
+	}
+	if got := string(secret.Data["user"]); got != "migration@vsphere.local" {
+		t.Errorf("user = %q", got)
+	}
+	if got := string(secret.Data["password"]); got != "hunter2" {
+		t.Errorf("password was not projected")
+	}
+	if secret.Labels[migrationv1alpha1.ManagedByLabel] != migrationv1alpha1.ManagedByValue {
+		t.Error("projected Secret is missing the managed-by label that protects it from being adopted by mistake")
+	}
+
+	provider := newObject(providerGVK)
+	if err := c.Get(context.Background(), types.NamespacedName{
+		Namespace: "tenant-foo", Name: sourceProviderName("vcenter"),
+	}, provider); err != nil {
+		t.Fatalf("source Provider was not created: %v", err)
+	}
+	image, _, _ := unstructured.NestedString(provider.Object, "spec", "settings", "vddkInitImage")
+	if image != "registry.example.com/vddk:8.0.3" {
+		t.Errorf("vddkInitImage = %q, want the operator-configured image", image)
+	}
+	ns, _, _ := unstructured.NestedString(provider.Object, "spec", "secret", "namespace")
+	if ns != "tenant-foo" {
+		t.Errorf("secret namespace = %q, want the source's own namespace", ns)
+	}
+
+	dest := newObject(providerGVK)
+	if err := c.Get(context.Background(), types.NamespacedName{
+		Namespace: "tenant-foo", Name: destinationProviderName("vcenter"),
+	}, dest); err != nil {
+		t.Fatalf("destination Provider was not created: %v", err)
+	}
+}
+
+// TestProjectorRefusesForeignSecret is the guard that keeps a name collision
+// from destroying a tenant's own object: a pre-existing Secret without our
+// label is reported, never overwritten.
+func TestProjectorRefusesForeignSecret(t *testing.T) {
+	s := testScheme(t)
+	src := vsphereSource("vcenter", "tenant-foo")
+	foreign := &corev1.Secret{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      credentialsSecretName("vcenter"),
+			Namespace: "tenant-foo",
+		},
+		Data: map[string][]byte{"something": []byte("precious")},
+	}
+	c := clientfake.NewClientBuilder().WithScheme(s).
+		WithObjects(src, foreign).WithStatusSubresource(src).Build()
+
+	r := &VMImportSourceReconciler{
+		Client: c, Scheme: s, Recorder: record.NewFakeRecorder(10),
+		VDDKImage: "registry.example.com/vddk:8.0.3",
+	}
+	if _, err := r.Reconcile(context.Background(), reconcile.Request{
+		NamespacedName: types.NamespacedName{Namespace: "tenant-foo", Name: "vcenter"},
+	}); err != nil {
+		t.Fatalf("reconcile: %v", err)
+	}
+
+	kept := &corev1.Secret{}
+	if err := c.Get(context.Background(), types.NamespacedName{
+		Namespace: "tenant-foo", Name: credentialsSecretName("vcenter"),
+	}, kept); err != nil {
+		t.Fatalf("get secret: %v", err)
+	}
+	if string(kept.Data["something"]) != "precious" {
+		t.Fatal("a pre-existing Secret was overwritten by the projector")
+	}
+
+	got := &migrationv1alpha1.VMImportSource{}
+	if err := c.Get(context.Background(), types.NamespacedName{Namespace: "tenant-foo", Name: "vcenter"}, got); err != nil {
+		t.Fatalf("get source: %v", err)
+	}
+	cond := meta.FindStatusCondition(got.Status.Conditions, migrationv1alpha1.SourceReadyCondition)
+	if cond == nil || cond.Status != metav1.ConditionFalse {
+		t.Fatal("expected the source to report itself not ready")
+	}
+	if !strings.Contains(cond.Message, "not managed by the migration controller") {
+		t.Errorf("message does not explain the collision: %q", cond.Message)
+	}
+}
+
+// TestSourceReportsMissingForkliftInsteadOfLoopingOnAnError locks in a
+// live-only finding. When the Forklift CRDs are absent, creating a Provider
+// fails with a no-match error. Returning that as a reconcile error means the
+// pass never reaches the status write, so the Source keeps whatever condition
+// it had last — which on the cluster meant a Source insisting VDDKNotConfigured
+// long after a VDDK image had been configured, while the controller hot-looped.
+func TestSourceReportsMissingForkliftInsteadOfLoopingOnAnError(t *testing.T) {
+	s := testScheme(t)
+	src := vsphereSource("vcenter", "tenant-foo")
+
+	// The error has to be the one a real apiserver produces for an absent CRD:
+	// a RESTMapper NoKindMatchError. Simply leaving the kind out of the fake
+	// client's scheme yields runtime.notRegisteredErr instead, which
+	// meta.IsNoMatchError does not recognise — so a test built that way would
+	// pass against the wrong error and prove nothing about production.
+	noMatch := &meta.NoKindMatchError{
+		GroupKind:        providerGVK.GroupKind(),
+		SearchedVersions: []string{providerGVK.Version},
+	}
+	c := clientfake.NewClientBuilder().WithScheme(s).
+		WithObjects(src).WithStatusSubresource(src).
+		WithInterceptorFuncs(interceptor.Funcs{
+			Get: func(ctx context.Context, cl client.WithWatch, key client.ObjectKey, obj client.Object, opts ...client.GetOption) error {
+				if obj.GetObjectKind().GroupVersionKind() == providerGVK {
+					return noMatch
+				}
+				return cl.Get(ctx, key, obj, opts...)
+			},
+		}).Build()
+
+	r := &VMImportSourceReconciler{
+		Client: c, Scheme: s, Recorder: record.NewFakeRecorder(10),
+		VDDKImage: "registry.example.com/vddk:8.0.3",
+	}
+	if _, err := r.Reconcile(context.Background(), reconcile.Request{
+		NamespacedName: types.NamespacedName{Namespace: "tenant-foo", Name: "vcenter"},
+	}); err != nil {
+		t.Fatalf("a cluster without Forklift must not produce a reconcile error: %v", err)
+	}
+
+	got := &migrationv1alpha1.VMImportSource{}
+	if err := c.Get(context.Background(), types.NamespacedName{Namespace: "tenant-foo", Name: "vcenter"}, got); err != nil {
+		t.Fatalf("get source: %v", err)
+	}
+	cond := meta.FindStatusCondition(got.Status.Conditions, migrationv1alpha1.SourceReadyCondition)
+	if cond == nil {
+		t.Fatal("expected a Ready condition explaining why the source is unusable")
+	}
+	if cond.Reason != migrationv1alpha1.ReasonForkliftNotInstalled {
+		t.Errorf("reason = %q, want %q", cond.Reason, migrationv1alpha1.ReasonForkliftNotInstalled)
+	}
+}
+
+// TestSourceMirrorsForkliftVerdict asserts the Source reports Forklift's own
+// conclusion rather than assuming a connection nobody tested.
+func TestSourceMirrorsForkliftVerdict(t *testing.T) {
+	cases := []struct {
+		name       string
+		conditions []any
+		wantReady  metav1.ConditionStatus
+		wantInMsg  string
+	}{
+		{
+			name:       "no conditions yet",
+			conditions: nil,
+			wantReady:  metav1.ConditionFalse,
+			wantInMsg:  "waiting for Forklift",
+		},
+		{
+			name: "forklift says ready",
+			conditions: []any{
+				map[string]any{"type": "Ready", "status": "True"},
+			},
+			wantReady: metav1.ConditionTrue,
+		},
+		{
+			name: "forklift reports a critical problem",
+			conditions: []any{
+				map[string]any{
+					"type": "ConnectionTestFailed", "status": "True",
+					"category": "Critical", "message": "host is unreachable",
+				},
+			},
+			wantReady: metav1.ConditionFalse,
+			wantInMsg: "host is unreachable",
+		},
+	}
+
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			s := testScheme(t)
+			src := vsphereSource("vcenter", "tenant-foo")
+			provider := newObject(providerGVK)
+			provider.SetName(sourceProviderName("vcenter"))
+			provider.SetNamespace("tenant-foo")
+			if tc.conditions != nil {
+				if err := unstructured.SetNestedSlice(provider.Object, tc.conditions, "status", "conditions"); err != nil {
+					t.Fatalf("set conditions: %v", err)
+				}
+			}
+			c := clientfake.NewClientBuilder().WithScheme(s).
+				WithObjects(src, provider).WithStatusSubresource(src).Build()
+
+			r := &VMImportSourceReconciler{
+				Client: c, Scheme: s, Recorder: record.NewFakeRecorder(10),
+				VDDKImage: "registry.example.com/vddk:8.0.3",
+			}
+			if _, err := r.Reconcile(context.Background(), reconcile.Request{
+				NamespacedName: types.NamespacedName{Namespace: "tenant-foo", Name: "vcenter"},
+			}); err != nil {
+				t.Fatalf("reconcile: %v", err)
+			}
+
+			got := &migrationv1alpha1.VMImportSource{}
+			if err := c.Get(context.Background(), types.NamespacedName{Namespace: "tenant-foo", Name: "vcenter"}, got); err != nil {
+				t.Fatalf("get source: %v", err)
+			}
+			cond := meta.FindStatusCondition(got.Status.Conditions, migrationv1alpha1.SourceReadyCondition)
+			if cond == nil {
+				t.Fatal("expected a Ready condition")
+			}
+			if cond.Status != tc.wantReady {
+				t.Errorf("Ready = %s, want %s (message %q)", cond.Status, tc.wantReady, cond.Message)
+			}
+			if tc.wantInMsg != "" && !strings.Contains(cond.Message, tc.wantInMsg) {
+				t.Errorf("message = %q, want it to contain %q", cond.Message, tc.wantInMsg)
+			}
+		})
+	}
+}
diff --git a/internal/migrationcontroller/vmimporttask_controller.go b/internal/migrationcontroller/vmimporttask_controller.go
new file mode 100644
index 0000000000..24a0312f20
--- /dev/null
+++ b/internal/migrationcontroller/vmimporttask_controller.go
@@ -0,0 +1,618 @@
+// SPDX-License-Identifier: Apache-2.0
+
+package migrationcontroller
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"sort"
+	"strings"
+	"time"
+
+	storagev1 "k8s.io/api/storage/v1"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	"k8s.io/apimachinery/pkg/api/meta"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/types"
+	"k8s.io/client-go/tools/record"
+	ctrl "sigs.k8s.io/controller-runtime"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
+	"sigs.k8s.io/controller-runtime/pkg/log"
+
+	migrationv1alpha1 "github.com/cozystack/cozystack/api/migration/v1alpha1"
+)
+
+// TransferRequeue is the polling interval while disks are moving. Forklift
+// updates its Migration status as the transfer progresses and this controller
+// mirrors it; a watch on Migration drives most updates, and this is the
+// backstop for the case where the watch is not established (Forklift absent at
+// startup, CRDs installed later).
+const TransferRequeue = 20 * time.Second
+
+// defaultStorageClassAnnotation marks the cluster's default StorageClass.
+const defaultStorageClassAnnotation = "storageclass.kubernetes.io/is-default-class"
+
+// VMImportTaskReconciler drives one import operation: it renders the Forklift
+// objects that perform the transfer, mirrors their progress onto the task, and
+// converts each finished transfer into a Cozystack VMDisk and VMInstance.
+//
+// The scaffolding it creates (maps, Plans, Migrations) is owned by the task and
+// disappears with it. The outputs are deliberately not owned by anything, which
+// is what lets a tenant delete a finished task without losing the machines it
+// imported.
+type VMImportTaskReconciler struct {
+	client.Client
+	Scheme   *runtime.Scheme
+	Recorder record.EventRecorder
+	// Inventory reads the source's topology from Forklift's inventory service.
+	// The network and datastore IDs a Plan's maps need appear on no Forklift
+	// custom resource, so there is no way to build those maps without it.
+	Inventory *inventoryClient
+}
+
+func (r *VMImportTaskReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
+	logger := log.FromContext(ctx)
+
+	task := &migrationv1alpha1.VMImportTask{}
+	if err := r.Get(ctx, req.NamespacedName, task); err != nil {
+		if apierrors.IsNotFound(err) {
+			return ctrl.Result{}, nil
+		}
+		return ctrl.Result{}, err
+	}
+
+	if !task.DeletionTimestamp.IsZero() {
+		return r.finalize(ctx, task)
+	}
+	// Claimed before any scaffolding is created, so a task deleted mid-transfer
+	// still gets its volumes cleaned up.
+	if !controllerutil.ContainsFinalizer(task, migrationv1alpha1.TaskFinalizer) {
+		controllerutil.AddFinalizer(task, migrationv1alpha1.TaskFinalizer)
+		if err := r.Update(ctx, task); err != nil {
+			if apierrors.IsConflict(err) {
+				return ctrl.Result{Requeue: true}, nil
+			}
+			return ctrl.Result{}, err
+		}
+	}
+
+	// A finished task is a record, not a workload. Re-running validation or
+	// re-creating scaffolding for it would resurrect Forklift objects a tenant
+	// has already seen disappear.
+	if task.Status.Phase.IsTerminal() {
+		return ctrl.Result{}, nil
+	}
+
+	src := &migrationv1alpha1.VMImportSource{}
+	err := r.Get(ctx, types.NamespacedName{Namespace: task.Namespace, Name: task.Spec.SourceRef.Name}, src)
+	if apierrors.IsNotFound(err) {
+		return r.pending(ctx, task, migrationv1alpha1.ReasonSourceNotReady,
+			fmt.Sprintf("VMImportSource %q does not exist in this namespace", task.Spec.SourceRef.Name))
+	}
+	if err != nil {
+		return ctrl.Result{}, err
+	}
+	if !meta.IsStatusConditionTrue(src.Status.Conditions, migrationv1alpha1.SourceReadyCondition) {
+		reason, message := sourceNotReadyDetail(src)
+		return r.pending(ctx, task, reason, message)
+	}
+
+	// Resolve and vet the storage class before anything is created. A
+	// WaitForFirstConsumer class does not fail the import, it hangs it: nothing
+	// consumes the claim while CDI populates it, so the transfer waits forever.
+	// Failing here costs a tenant one edit; not failing here costs them a
+	// support ticket.
+	storageClass, err := r.resolveStorageClass(ctx, task)
+	if err != nil {
+		var verr *validationError
+		if asValidationError(err, &verr) {
+			return r.terminalFail(ctx, task, verr.reason, verr.message)
+		}
+		return ctrl.Result{}, err
+	}
+
+	if task.Status.StartedAt == nil {
+		now := metav1.Now()
+		task.Status.StartedAt = &now
+	}
+
+	// A conflict here is two passes racing on the same map, not a failure: the
+	// next pass reads the newer object and re-applies. Returning it as an error
+	// re-queues with backoff and logs a stack trace for something that is
+	// ordinary optimistic concurrency.
+	if err := r.ensureMaps(ctx, task, src, storageClass); apierrors.IsConflict(err) {
+		return ctrl.Result{Requeue: true}, nil
+	} else if err != nil {
+		// Forklift's CRDs can vanish under a running task — the operand is
+		// removed, or this is the window before the Source's recheck notices.
+		// reconcileVM already reports that as Pending; without the same here
+		// the reconcile returns an error and hot-loops with nothing written for
+		// a tenant to read.
+		if meta.IsNoMatchError(err) {
+			return r.pending(ctx, task, migrationv1alpha1.ReasonForkliftNotInstalled,
+				"Forklift is not installed in this cluster")
+		}
+		return ctrl.Result{}, err
+	}
+
+	statuses := make([]migrationv1alpha1.VMImportStatus, 0, len(task.Spec.VMs))
+	requeue := false
+	for i := range task.Spec.VMs {
+		vmStatus, again, err := r.reconcileVM(ctx, task, src, &task.Spec.VMs[i])
+		if err != nil {
+			return ctrl.Result{}, err
+		}
+		requeue = requeue || again
+		statuses = append(statuses, vmStatus)
+	}
+
+	task.Status.VMs = statuses
+	task.Status.Phase = aggregatePhase(statuses)
+	task.Status.ObservedGeneration = task.Generation
+
+	if task.Status.Phase.IsTerminal() && task.Status.CompletedAt == nil {
+		now := metav1.Now()
+		task.Status.CompletedAt = &now
+		task.Status.Message = terminalMessage(statuses)
+		if task.Status.Phase == migrationv1alpha1.VMImportTaskPhaseSucceeded {
+			r.Recorder.Eventf(task, "Normal", "Imported", "imported %d VM(s)", len(statuses))
+		} else {
+			r.Recorder.Eventf(task, "Warning", "ImportFailed", "%s", task.Status.Message)
+		}
+	}
+
+	if err := r.Status().Update(ctx, task); err != nil {
+		if apierrors.IsConflict(err) {
+			return ctrl.Result{Requeue: true}, nil
+		}
+		return ctrl.Result{}, err
+	}
+
+	logger.V(1).Info("reconciled VMImportTask", "phase", task.Status.Phase, "vms", len(statuses))
+	if requeue {
+		return ctrl.Result{RequeueAfter: TransferRequeue}, nil
+	}
+	return ctrl.Result{}, nil
+}
+
+// reconcileVM advances one VM of the task: it creates the Plan and Migration
+// that move its disks, mirrors their progress, and once the transfer is done
+// converts the result into Cozystack objects. The bool reports whether this VM
+// still needs watching.
+func (r *VMImportTaskReconciler) reconcileVM(
+	ctx context.Context,
+	task *migrationv1alpha1.VMImportTask,
+	src *migrationv1alpha1.VMImportSource,
+	req *migrationv1alpha1.VMImportRequest,
+) (migrationv1alpha1.VMImportStatus, bool, error) {
+	status := migrationv1alpha1.VMImportStatus{
+		ID:   req.ID,
+		Name: req.Name,
+	}
+	// Carry forward what a previous pass established, so a completed VM keeps
+	// its output names even after its Forklift objects are gone.
+	if prev := findVMStatus(task.Status.VMs, req.ID); prev != nil {
+		status = *prev
+		if status.Phase.IsTerminal() {
+			return status, false, nil
+		}
+	}
+
+	// Refuse to overwrite anything a tenant already has, and refuse it before
+	// spending a transfer on it. Checked every pass rather than once, because a
+	// name can be taken while a transfer runs, and per VM rather than per task:
+	// one VM whose name is occupied does not stop its siblings from finishing.
+	if collision, err := r.outputCollision(ctx, task, req); err != nil {
+		return status, false, err
+	} else if collision != "" {
+		status.Phase = migrationv1alpha1.VMImportTaskPhaseFailed
+		status.Reason = migrationv1alpha1.ReasonOutputExists
+		status.Message = collision
+		return status, false, nil
+	}
+
+	plan := newObject(planGVK)
+	name := planName(task.Name, req.ID)
+	err := r.Get(ctx, types.NamespacedName{Namespace: task.Namespace, Name: name}, plan)
+	if apierrors.IsNotFound(err) {
+		if err := r.createPlan(ctx, task, src, req); err != nil {
+			return status, false, err
+		}
+		status.Phase = migrationv1alpha1.VMImportTaskPhaseValidating
+		status.Message = "waiting for Forklift to validate the source VM"
+		return status, true, nil
+	}
+	if err != nil {
+		if meta.IsNoMatchError(err) {
+			status.Phase = migrationv1alpha1.VMImportTaskPhasePending
+			status.Message = "Forklift is not installed in this cluster"
+			return status, true, nil
+		}
+		return status, false, err
+	}
+
+	// Forklift validates the VM reference, the maps and the provider for us and
+	// says what is wrong in its own words. Surfacing that verbatim beats
+	// re-implementing its checks: the inventory this controller queries answers
+	// what a VM uses, never whether Forklift will accept the Plan.
+	if critical := planCriticalCondition(plan); critical != "" {
+		status.Phase = migrationv1alpha1.VMImportTaskPhaseFailed
+		status.Reason = migrationv1alpha1.ReasonPlanRejected
+		status.Message = critical
+		return status, false, nil
+	}
+
+	// Fill the maps from this VM's actual topology, read out of Forklift's
+	// inventory. This cannot be done from the Plan's own conditions: those name
+	// the VMs that are unmapped, never the networks or datastores they use.
+	// Scoped to this VM so a bad reference fails it alone (see sourceTopology).
+	if learned, err := r.populateMaps(ctx, task, src, req); err != nil {
+		if nf, ok := errors.AsType[*notFoundError](err); ok {
+			status.Phase = migrationv1alpha1.VMImportTaskPhaseFailed
+			status.Reason = migrationv1alpha1.ReasonVMNotFound
+			status.Message = nf.Error()
+			return status, false, nil
+		}
+		return status, false, err
+	} else if learned {
+		status.Phase = migrationv1alpha1.VMImportTaskPhaseValidating
+		status.Message = "completing the network and storage maps from the source inventory"
+		return status, true, nil
+	}
+
+	if !planReady(plan) {
+		status.Phase = migrationv1alpha1.VMImportTaskPhaseValidating
+		status.Message = "waiting for Forklift to validate the plan"
+		return status, true, nil
+	}
+
+	migration, err := r.ensureMigration(ctx, task, name)
+	if err != nil {
+		return status, false, err
+	}
+
+	done, progress, message := migrationProgress(migration)
+	status.Progress = progress
+	switch {
+	case message != "" && !done:
+		status.Phase = migrationv1alpha1.VMImportTaskPhaseFailed
+		status.Reason = migrationv1alpha1.ReasonTransferFailed
+		status.Message = message
+		return status, false, nil
+	case !done:
+		status.Phase = migrationv1alpha1.VMImportTaskPhaseTransferring
+		status.Message = ""
+		return status, true, nil
+	}
+
+	// The transfer is finished. Everything from here is local: adopt the
+	// volumes into VMDisks, build a VMInstance over them, and discard the
+	// KubeVirt VM Forklift made along the way.
+	status.Phase = migrationv1alpha1.VMImportTaskPhaseCreating
+	outputs, err := r.fulfill(ctx, task, req)
+	if err != nil {
+		var verr *validationError
+		if asValidationError(err, &verr) {
+			status.Phase = migrationv1alpha1.VMImportTaskPhaseFailed
+			status.Reason = verr.reason
+			status.Message = verr.message
+			return status, false, nil
+		}
+		return status, false, err
+	}
+	if outputs == nil {
+		status.Message = "creating the imported disks and instance"
+		return status, true, nil
+	}
+
+	status.Phase = migrationv1alpha1.VMImportTaskPhaseSucceeded
+	status.Progress = 100
+	status.VMInstance = outputs.VMInstance
+	status.Disks = outputs.Disks
+	status.Message = ""
+	return status, false, nil
+}
+
+// resolveStorageClass returns the class every disk of this task is imported
+// onto, and rejects one that cannot complete an import.
+func (r *VMImportTaskReconciler) resolveStorageClass(ctx context.Context, task *migrationv1alpha1.VMImportTask) (string, error) {
+	name := task.Spec.StorageClass
+	origin := "spec.storageClass"
+	if name == "" {
+		list := &storagev1.StorageClassList{}
+		if err := r.List(ctx, list); err != nil {
+			return "", err
+		}
+		for i := range list.Items {
+			if list.Items[i].Annotations[defaultStorageClassAnnotation] == "true" {
+				name = list.Items[i].Name
+				origin = "the cluster default StorageClass"
+				break
+			}
+		}
+		if name == "" {
+			return "", &validationError{
+				reason:  migrationv1alpha1.ReasonStorageClassNotImmediate,
+				message: "no storageClass was given and this cluster has no default StorageClass",
+			}
+		}
+	}
+
+	sc := &storagev1.StorageClass{}
+	if err := r.Get(ctx, types.NamespacedName{Name: name}, sc); err != nil {
+		if apierrors.IsNotFound(err) {
+			return "", &validationError{
+				reason:  migrationv1alpha1.ReasonStorageClassNotImmediate,
+				message: fmt.Sprintf("StorageClass %q (%s) does not exist", name, origin),
+			}
+		}
+		return "", err
+	}
+	if sc.VolumeBindingMode != nil && *sc.VolumeBindingMode == storagev1.VolumeBindingWaitForFirstConsumer {
+		return "", &validationError{
+			reason: migrationv1alpha1.ReasonStorageClassNotImmediate,
+			message: fmt.Sprintf(
+				"StorageClass %q (%s) binds WaitForFirstConsumer, which deadlocks an import: "+
+					"nothing consumes the volume while it is being populated. Create a new task "+
+					"naming a class with volumeBindingMode Immediate in spec.storageClass — this "+
+					"task is terminal and spec.storageClass is immutable, so editing it will not "+
+					"restart the import", name, origin),
+		}
+	}
+	return name, nil
+}
+
+// outputCollision reports a tenant object standing where this VM's output goes,
+// or "" when the name is free or already holds this task's own earlier output.
+//
+// The distinction is the whole point. Without it every resume is a guess, and
+// both guesses are destructive: treating a tenant's object as its own attaches
+// stale data while the fresh transfer is collected with the scaffolding VM,
+// and treating its own output as a collision terminally fails an import that
+// actually succeeded. The marker isOwnOutput reads is written by stampOutput on
+// everything this controller creates.
+func (r *VMImportTaskReconciler) outputCollision(
+	ctx context.Context,
+	task *migrationv1alpha1.VMImportTask,
+	req *migrationv1alpha1.VMImportRequest,
+) (string, error) {
+	if req.Name == "" {
+		// The instance is named after the imported VM, which is not known
+		// until the transfer finishes; the handoff checks it then.
+		return "", nil
+	}
+	existing := newObject(vmInstanceGVK)
+	err := r.Get(ctx, types.NamespacedName{Namespace: task.Namespace, Name: req.Name}, existing)
+	if err == nil {
+		if isOwnOutput(existing, task, req.ID) {
+			return "", nil
+		}
+		return fmt.Sprintf("a VMInstance named %q already exists in this namespace and was not created by "+
+			"this import; the import will not overwrite it — choose another name for VM %s", req.Name, req.ID), nil
+	}
+	if !apierrors.IsNotFound(err) && !meta.IsNoMatchError(err) {
+		return "", err
+	}
+	return "", nil
+}
+
+func (r *VMImportTaskReconciler) pending(ctx context.Context, task *migrationv1alpha1.VMImportTask, reason, message string) (ctrl.Result, error) {
+	task.Status.Phase = migrationv1alpha1.VMImportTaskPhasePending
+	task.Status.Message = message
+	task.Status.ObservedGeneration = task.Generation
+	meta.SetStatusCondition(&task.Status.Conditions, metav1.Condition{
+		Type:               migrationv1alpha1.TaskValidatedCondition,
+		Status:             metav1.ConditionFalse,
+		Reason:             reason,
+		Message:            message,
+		ObservedGeneration: task.Generation,
+	})
+	if err := r.Status().Update(ctx, task); err != nil && !apierrors.IsConflict(err) {
+		return ctrl.Result{}, err
+	}
+	return ctrl.Result{RequeueAfter: ConnectionRequeue}, nil
+}
+
+// finalize removes the transfer volumes the engine created for this task, then
+// releases the task for deletion.
+//
+// The engine creates its DataVolumes with no owner references — it tracks them
+// by label instead — so deleting the task takes the Plan with it and leaves the
+// volume behind, still retrying the transfer against the source. Nothing else
+// ever collects it.
+//
+// Only the engine's own volumes match: they carry its `plan` label, while the
+// disks an import produces are created by this controller with Helm metadata
+// and no such label. A failure here releases the task anyway, because a task
+// that cannot be deleted is worse than a volume that has to be removed by hand,
+// and the leftover is named in the log either way.
+func (r *VMImportTaskReconciler) finalize(ctx context.Context, task *migrationv1alpha1.VMImportTask) (ctrl.Result, error) {
+	logger := log.FromContext(ctx)
+
+	if controllerutil.ContainsFinalizer(task, migrationv1alpha1.TaskFinalizer) {
+		if err := r.deleteTransferVolumes(ctx, task); err != nil {
+			logger.Error(err, "could not remove every transfer volume; releasing the task regardless",
+				"task", task.Name, "namespace", task.Namespace)
+		}
+		controllerutil.RemoveFinalizer(task, migrationv1alpha1.TaskFinalizer)
+		if err := r.Update(ctx, task); err != nil {
+			if apierrors.IsConflict(err) || apierrors.IsNotFound(err) {
+				return ctrl.Result{}, nil
+			}
+			return ctrl.Result{}, err
+		}
+	}
+	return ctrl.Result{}, nil
+}
+
+// deleteTransferVolumes removes the DataVolumes the engine created for this
+// task's Plans. The Plans are still present: they are owned by the task, and
+// garbage collection only reaches them once the task itself is gone.
+func (r *VMImportTaskReconciler) deleteTransferVolumes(ctx context.Context, task *migrationv1alpha1.VMImportTask) error {
+	logger := log.FromContext(ctx)
+
+	for i := range task.Spec.VMs {
+		plan := newObject(planGVK)
+		err := r.Get(ctx, types.NamespacedName{
+			Namespace: task.Namespace, Name: planName(task.Name, task.Spec.VMs[i].ID),
+		}, plan)
+		if err != nil {
+			if apierrors.IsNotFound(err) || meta.IsNoMatchError(err) {
+				continue
+			}
+			return err
+		}
+		uid := string(plan.GetUID())
+		if uid == "" {
+			continue
+		}
+
+		list := &unstructured.UnstructuredList{}
+		list.SetGroupVersionKind(dataVolumeGVK.GroupVersion().WithKind("DataVolumeList"))
+		if err := r.List(ctx, list,
+			client.InNamespace(task.Namespace),
+			client.MatchingLabels{"plan": uid},
+		); err != nil {
+			if meta.IsNoMatchError(err) {
+				return nil
+			}
+			return err
+		}
+		for j := range list.Items {
+			dv := &list.Items[j]
+			if err := r.Delete(ctx, dv); err != nil && !apierrors.IsNotFound(err) {
+				return err
+			}
+			logger.Info("removed the engine's transfer volume", "dataVolume", dv.GetName(), "vm", task.Spec.VMs[i].ID)
+		}
+	}
+	return nil
+}
+
+func (r *VMImportTaskReconciler) terminalFail(ctx context.Context, task *migrationv1alpha1.VMImportTask, reason, message string) (ctrl.Result, error) {
+	now := metav1.Now()
+	task.Status.Phase = migrationv1alpha1.VMImportTaskPhaseFailed
+	task.Status.Message = message
+	task.Status.CompletedAt = &now
+	task.Status.ObservedGeneration = task.Generation
+	meta.SetStatusCondition(&task.Status.Conditions, metav1.Condition{
+		Type:               migrationv1alpha1.TaskValidatedCondition,
+		Status:             metav1.ConditionFalse,
+		Reason:             reason,
+		Message:            message,
+		ObservedGeneration: task.Generation,
+	})
+	r.Recorder.Eventf(task, "Warning", reason, "%s", message)
+	if err := r.Status().Update(ctx, task); err != nil && !apierrors.IsConflict(err) {
+		return ctrl.Result{}, err
+	}
+	return ctrl.Result{}, nil
+}
+
+// aggregatePhase folds per-VM phases into the task's own. A task is only
+// Succeeded when every VM is, and Failed only once no VM can still progress —
+// one failed VM does not stop its siblings from finishing.
+func aggregatePhase(statuses []migrationv1alpha1.VMImportStatus) migrationv1alpha1.VMImportTaskPhase {
+	if len(statuses) == 0 {
+		return migrationv1alpha1.VMImportTaskPhasePending
+	}
+	var succeeded, failed int
+	phase := migrationv1alpha1.VMImportTaskPhasePending
+	rank := map[migrationv1alpha1.VMImportTaskPhase]int{
+		migrationv1alpha1.VMImportTaskPhasePending:      0,
+		migrationv1alpha1.VMImportTaskPhaseValidating:   1,
+		migrationv1alpha1.VMImportTaskPhaseTransferring: 2,
+		migrationv1alpha1.VMImportTaskPhaseCreating:     3,
+	}
+	for _, s := range statuses {
+		switch s.Phase {
+		case migrationv1alpha1.VMImportTaskPhaseSucceeded:
+			succeeded++
+		case migrationv1alpha1.VMImportTaskPhaseFailed:
+			failed++
+		default:
+			if rank[s.Phase] >= rank[phase] {
+				phase = s.Phase
+			}
+		}
+	}
+	switch {
+	case succeeded == len(statuses):
+		return migrationv1alpha1.VMImportTaskPhaseSucceeded
+	case succeeded+failed == len(statuses):
+		return migrationv1alpha1.VMImportTaskPhaseFailed
+	default:
+		return phase
+	}
+}
+
+func terminalMessage(statuses []migrationv1alpha1.VMImportStatus) string {
+	var failed []string
+	for _, s := range statuses {
+		if s.Phase == migrationv1alpha1.VMImportTaskPhaseFailed {
+			failed = append(failed, fmt.Sprintf("%s: %s", s.ID, s.Message))
+		}
+	}
+	if len(failed) == 0 {
+		return fmt.Sprintf("imported %d VM(s)", len(statuses))
+	}
+	sort.Strings(failed)
+	return fmt.Sprintf("%d of %d VM(s) failed — %s", len(failed), len(statuses), strings.Join(failed, "; "))
+}
+
+func findVMStatus(statuses []migrationv1alpha1.VMImportStatus, id string) *migrationv1alpha1.VMImportStatus {
+	for i := range statuses {
+		if statuses[i].ID == id {
+			return &statuses[i]
+		}
+	}
+	return nil
+}
+
+func sourceNotReadyDetail(src *migrationv1alpha1.VMImportSource) (string, string) {
+	cond := meta.FindStatusCondition(src.Status.Conditions, migrationv1alpha1.SourceReadyCondition)
+	if cond == nil {
+		return migrationv1alpha1.ReasonSourceNotReady,
+			fmt.Sprintf("VMImportSource %q has not been reconciled yet", src.Name)
+	}
+	return migrationv1alpha1.ReasonSourceNotReady,
+		fmt.Sprintf("VMImportSource %q is not ready (%s): %s", src.Name, cond.Reason, cond.Message)
+}
+
+// validationError is a terminal, tenant-visible misconfiguration: retrying it
+// unchanged cannot help, so the task fails with the reason attached instead of
+// requeueing forever.
+type validationError struct {
+	reason  string
+	message string
+}
+
+func (e *validationError) Error() string { return e.message }
+
+func asValidationError(err error, target **validationError) bool {
+	return errors.As(err, target)
+}
+
+func (r *VMImportTaskReconciler) SetupWithManager(mgr ctrl.Manager) error {
+	// Deliberately no watch on Forklift's Migration, even though it is what
+	// drives a task's progress.
+	//
+	// Forklift is an optional package. A watch on a kind whose CRD is absent
+	// never syncs its cache, and controller-runtime will not start a controller
+	// whose caches have not synced — so on a cluster without Forklift the whole
+	// task controller stays down and the manager never reports ready. Observed
+	// on a live cluster: the pod sat at 0/1 indefinitely, logging "if kind is a
+	// CRD, it should be installed before calling Start" every ten seconds.
+	//
+	// Polling instead costs at most TransferRequeue of latency on a transfer
+	// measured in minutes, and it works whether Forklift is installed before
+	// this controller, after it, or never.
+	return ctrl.NewControllerManagedBy(mgr).
+		For(&migrationv1alpha1.VMImportTask{}).
+		Named("vmimporttask").
+		Complete(r)
+}
diff --git a/internal/migrationcontroller/vmimporttask_controller_test.go b/internal/migrationcontroller/vmimporttask_controller_test.go
new file mode 100644
index 0000000000..e2c1230abb
--- /dev/null
+++ b/internal/migrationcontroller/vmimporttask_controller_test.go
@@ -0,0 +1,885 @@
+// SPDX-License-Identifier: Apache-2.0
+package migrationcontroller
+
+import (
+	"context"
+	"encoding/json"
+	"reflect"
+	"strings"
+	"testing"
+
+	corev1 "k8s.io/api/core/v1"
+	storagev1 "k8s.io/api/storage/v1"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	"k8s.io/apimachinery/pkg/api/resource"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/apimachinery/pkg/types"
+	"k8s.io/client-go/tools/record"
+	clientfake "sigs.k8s.io/controller-runtime/pkg/client/fake"
+	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
+	"sigs.k8s.io/controller-runtime/pkg/reconcile"
+
+	migrationv1alpha1 "github.com/cozystack/cozystack/api/migration/v1alpha1"
+)
+
+func storageClass(name string, mode storagev1.VolumeBindingMode, isDefault bool) *storagev1.StorageClass {
+	sc := &storagev1.StorageClass{
+		ObjectMeta:        metav1.ObjectMeta{Name: name},
+		VolumeBindingMode: &mode,
+	}
+	if isDefault {
+		sc.Annotations = map[string]string{defaultStorageClassAnnotation: "true"}
+	}
+	return sc
+}
+
+func readySource(name, namespace string) *migrationv1alpha1.VMImportSource {
+	src := vsphereSource(name, namespace)
+	src.Status.Conditions = []metav1.Condition{{
+		Type:               migrationv1alpha1.SourceReadyCondition,
+		Status:             metav1.ConditionTrue,
+		Reason:             migrationv1alpha1.ReasonConnected,
+		Message:            "ok",
+		LastTransitionTime: metav1.Now(),
+	}}
+	return src
+}
+
+func task(name, namespace, source, class string, vms ...migrationv1alpha1.VMImportRequest) *migrationv1alpha1.VMImportTask {
+	return &migrationv1alpha1.VMImportTask{
+		ObjectMeta: metav1.ObjectMeta{Name: name, Namespace: namespace, UID: types.UID(name + "-uid")},
+		Spec: migrationv1alpha1.VMImportTaskSpec{
+			SourceRef:    corev1.LocalObjectReference{Name: source},
+			VMs:          vms,
+			StorageClass: class,
+		},
+	}
+}
+
+// TestTaskRejectsWaitForFirstConsumer is the check that turns a hang into a
+// message. A WaitForFirstConsumer class does not fail an import, it deadlocks
+// it: nothing consumes the claim while CDI populates it. Failing at validation
+// costs one edit; not failing costs a support ticket and a stuck transfer.
+func TestTaskRejectsWaitForFirstConsumer(t *testing.T) {
+	s := testScheme(t)
+	src := readySource("vcenter", "tenant-foo")
+	tk := task("import", "tenant-foo", "vcenter", "local",
+		migrationv1alpha1.VMImportRequest{ID: "vm-1", Name: "web-01"})
+	c := clientfake.NewClientBuilder().WithScheme(s).
+		WithObjects(src, tk, storageClass("local", storagev1.VolumeBindingWaitForFirstConsumer, true)).
+		WithStatusSubresource(src, tk).Build()
+
+	r := &VMImportTaskReconciler{Client: c, Scheme: s, Recorder: record.NewFakeRecorder(10)}
+	if _, err := r.Reconcile(context.Background(), reconcile.Request{
+		NamespacedName: types.NamespacedName{Namespace: "tenant-foo", Name: "import"},
+	}); err != nil {
+		t.Fatalf("reconcile: %v", err)
+	}
+
+	got := &migrationv1alpha1.VMImportTask{}
+	if err := c.Get(context.Background(), types.NamespacedName{Namespace: "tenant-foo", Name: "import"}, got); err != nil {
+		t.Fatalf("get task: %v", err)
+	}
+	if got.Status.Phase != migrationv1alpha1.VMImportTaskPhaseFailed {
+		t.Errorf("phase = %q, want Failed", got.Status.Phase)
+	}
+	if !strings.Contains(got.Status.Message, "WaitForFirstConsumer") {
+		t.Errorf("message does not name the binding mode: %q", got.Status.Message)
+	}
+	// Nothing may have been created: a task that cannot succeed must not leave
+	// Forklift objects behind for a tenant to wonder about.
+	plan := newObject(planGVK)
+	if err := c.Get(context.Background(), types.NamespacedName{
+		Namespace: "tenant-foo", Name: planName("import", "vm-1"),
+	}, plan); err == nil {
+		t.Error("a Plan was created for a task that failed validation")
+	}
+}
+
+// TestTaskWaitsForUnreadySource asserts a task does not start work while its
+// connection is unusable, and says which connection and why.
+func TestTaskWaitsForUnreadySource(t *testing.T) {
+	s := testScheme(t)
+	src := vsphereSource("vcenter", "tenant-foo") // no Ready condition
+	tk := task("import", "tenant-foo", "vcenter", "replicated",
+		migrationv1alpha1.VMImportRequest{ID: "vm-1", Name: "web-01"})
+	c := clientfake.NewClientBuilder().WithScheme(s).
+		WithObjects(src, tk).WithStatusSubresource(src, tk).Build()
+
+	r := &VMImportTaskReconciler{Client: c, Scheme: s, Recorder: record.NewFakeRecorder(10)}
+	if _, err := r.Reconcile(context.Background(), reconcile.Request{
+		NamespacedName: types.NamespacedName{Namespace: "tenant-foo", Name: "import"},
+	}); err != nil {
+		t.Fatalf("reconcile: %v", err)
+	}
+
+	got := &migrationv1alpha1.VMImportTask{}
+	if err := c.Get(context.Background(), types.NamespacedName{Namespace: "tenant-foo", Name: "import"}, got); err != nil {
+		t.Fatalf("get task: %v", err)
+	}
+	if got.Status.Phase != migrationv1alpha1.VMImportTaskPhasePending {
+		t.Errorf("phase = %q, want Pending", got.Status.Phase)
+	}
+	if !strings.Contains(got.Status.Message, "vcenter") {
+		t.Errorf("message does not name the source: %q", got.Status.Message)
+	}
+}
+
+// TestTaskRefusesToOverwriteExistingInstance locks in that the controller never
+// takes over a tenant's object. An import that would clobber a running VM must
+// stop and say so.
+func TestTaskRefusesToOverwriteExistingInstance(t *testing.T) {
+	s := testScheme(t)
+	src := readySource("vcenter", "tenant-foo")
+	tk := task("import", "tenant-foo", "vcenter", "replicated",
+		migrationv1alpha1.VMImportRequest{ID: "vm-1", Name: "web-01"})
+	occupied := newObject(vmInstanceGVK)
+	occupied.SetName("web-01")
+	occupied.SetNamespace("tenant-foo")
+
+	c := clientfake.NewClientBuilder().WithScheme(s).
+		WithObjects(src, tk, occupied, storageClass("replicated", storagev1.VolumeBindingImmediate, false)).
+		WithStatusSubresource(src, tk).Build()
+
+	r := &VMImportTaskReconciler{Client: c, Scheme: s, Recorder: record.NewFakeRecorder(10)}
+	if _, err := r.Reconcile(context.Background(), reconcile.Request{
+		NamespacedName: types.NamespacedName{Namespace: "tenant-foo", Name: "import"},
+	}); err != nil {
+		t.Fatalf("reconcile: %v", err)
+	}
+
+	got := &migrationv1alpha1.VMImportTask{}
+	if err := c.Get(context.Background(), types.NamespacedName{Namespace: "tenant-foo", Name: "import"}, got); err != nil {
+		t.Fatalf("get task: %v", err)
+	}
+	if got.Status.Phase != migrationv1alpha1.VMImportTaskPhaseFailed {
+		t.Errorf("phase = %q, want Failed", got.Status.Phase)
+	}
+	if !strings.Contains(got.Status.Message, "already exists") {
+		t.Errorf("message does not explain the collision: %q", got.Status.Message)
+	}
+}
+
+// TestAggregatePhase covers the fold from per-VM phases to the task's own. The
+// property that matters: one failed VM must not stop its siblings, and the task
+// only reaches a terminal phase when nothing can still progress.
+func TestAggregatePhase(t *testing.T) {
+	p := func(phases ...migrationv1alpha1.VMImportTaskPhase) []migrationv1alpha1.VMImportStatus {
+		out := make([]migrationv1alpha1.VMImportStatus, 0, len(phases))
+		for i, ph := range phases {
+			out = append(out, migrationv1alpha1.VMImportStatus{ID: string(rune('a' + i)), Phase: ph})
+		}
+		return out
+	}
+	cases := []struct {
+		name string
+		in   []migrationv1alpha1.VMImportStatus
+		want migrationv1alpha1.VMImportTaskPhase
+	}{
+		{"empty", nil, migrationv1alpha1.VMImportTaskPhasePending},
+		{"all succeeded", p(migrationv1alpha1.VMImportTaskPhaseSucceeded, migrationv1alpha1.VMImportTaskPhaseSucceeded), migrationv1alpha1.VMImportTaskPhaseSucceeded},
+		{"all failed", p(migrationv1alpha1.VMImportTaskPhaseFailed), migrationv1alpha1.VMImportTaskPhaseFailed},
+		{"mixed terminal is failed", p(migrationv1alpha1.VMImportTaskPhaseSucceeded, migrationv1alpha1.VMImportTaskPhaseFailed), migrationv1alpha1.VMImportTaskPhaseFailed},
+		{
+			"one failed while another transfers keeps going",
+			p(migrationv1alpha1.VMImportTaskPhaseFailed, migrationv1alpha1.VMImportTaskPhaseTransferring),
+			migrationv1alpha1.VMImportTaskPhaseTransferring,
+		},
+		{
+			"furthest-along non-terminal wins",
+			p(migrationv1alpha1.VMImportTaskPhaseValidating, migrationv1alpha1.VMImportTaskPhaseCreating),
+			migrationv1alpha1.VMImportTaskPhaseCreating,
+		},
+	}
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			if got := aggregatePhase(tc.in); got != tc.want {
+				t.Errorf("aggregatePhase = %q, want %q", got, tc.want)
+			}
+		})
+	}
+}
+
+// TestAdoptVolumeReplicatesVolumeModeAndAccessModes locks in a constraint that
+// only a live cluster revealed. Pre-binding through volumeName bypasses the
+// volumeMode match check, so a claim that silently defaults to Filesystem
+// against a Block volume *binds anyway* and fails much later at attach time
+// with a message pointing nowhere near the cause. The replacement claim must
+// therefore copy the volume's own modes rather than assume a default.
+func TestAdoptVolumeReplicatesVolumeModeAndAccessModes(t *testing.T) {
+	block := corev1.PersistentVolumeBlock
+	s := testScheme(t)
+	tk := task("import", "tenant-foo", "vcenter", "replicated")
+
+	pv := &corev1.PersistentVolume{
+		ObjectMeta: metav1.ObjectMeta{Name: "pv-1"},
+		Spec: corev1.PersistentVolumeSpec{
+			AccessModes:                   []corev1.PersistentVolumeAccessMode{corev1.ReadWriteMany},
+			VolumeMode:                    &block,
+			StorageClassName:              "replicated",
+			PersistentVolumeReclaimPolicy: corev1.PersistentVolumeReclaimDelete,
+			Capacity:                      corev1.ResourceList{corev1.ResourceStorage: resource.MustParse("20Gi")},
+		},
+	}
+	transferred := &corev1.PersistentVolumeClaim{
+		ObjectMeta: metav1.ObjectMeta{Name: "forklift-claim", Namespace: "tenant-foo"},
+		Spec: corev1.PersistentVolumeClaimSpec{
+			VolumeName: "pv-1",
+			Resources: corev1.VolumeResourceRequirements{
+				Requests: corev1.ResourceList{corev1.ResourceStorage: resource.MustParse("20Gi")},
+			},
+		},
+	}
+	c := clientfake.NewClientBuilder().WithScheme(s).WithObjects(pv, transferred, tk).Build()
+	r := &VMImportTaskReconciler{Client: c, Scheme: s, Recorder: record.NewFakeRecorder(10)}
+
+	if err := r.adoptVolume(context.Background(), tk, "vm-1", "forklift-claim", "web-01-disk-0"); err != nil {
+		t.Fatalf("adoptVolume: %v", err)
+	}
+
+	adopted := &corev1.PersistentVolumeClaim{}
+	if err := c.Get(context.Background(), types.NamespacedName{
+		Namespace: "tenant-foo", Name: "vm-disk-web-01-disk-0",
+	}, adopted); err != nil {
+		t.Fatalf("replacement claim was not created: %v", err)
+	}
+	if adopted.Spec.VolumeMode == nil || *adopted.Spec.VolumeMode != corev1.PersistentVolumeBlock {
+		t.Errorf("volumeMode = %v, want Block copied from the volume", adopted.Spec.VolumeMode)
+	}
+	if len(adopted.Spec.AccessModes) != 1 || adopted.Spec.AccessModes[0] != corev1.ReadWriteMany {
+		t.Errorf("accessModes = %v, want ReadWriteMany copied from the volume", adopted.Spec.AccessModes)
+	}
+	if adopted.Spec.VolumeName != "pv-1" {
+		t.Errorf("volumeName = %q, want the claim pre-bound to the retained volume", adopted.Spec.VolumeName)
+	}
+	if adopted.Annotations[populatedForAnnotation] != "vm-disk-web-01-disk-0" {
+		t.Errorf("populatedFor = %q, want it to equal the DataVolume name",
+			adopted.Annotations[populatedForAnnotation])
+	}
+
+	// Retain is not advice during the swap: between deleting the transferred
+	// claim and re-pointing claimRef the volume is Released, and under Delete
+	// the provisioner would reclaim it. settleReclaimPolicy lifts it later.
+	gotPV := &corev1.PersistentVolume{}
+	if err := c.Get(context.Background(), types.NamespacedName{Name: "pv-1"}, gotPV); err != nil {
+		t.Fatalf("get pv: %v", err)
+	}
+	if gotPV.Spec.PersistentVolumeReclaimPolicy != corev1.PersistentVolumeReclaimRetain {
+		t.Errorf("reclaim policy = %q, want Retain", gotPV.Spec.PersistentVolumeReclaimPolicy)
+	}
+	if gotPV.Spec.ClaimRef == nil || gotPV.Spec.ClaimRef.Name != "vm-disk-web-01-disk-0" {
+		t.Fatalf("claimRef was not re-pointed: %+v", gotPV.Spec.ClaimRef)
+	}
+	if gotPV.Spec.ClaimRef.UID != adopted.UID {
+		t.Error("claimRef carries no UID, leaving a window where another claim could bind the volume")
+	}
+
+	// The DataVolume the VMDisk release will adopt must exist and must not
+	// re-fetch anything: a blank source is what makes the handoff free.
+	dv := newObject(dataVolumeGVK)
+	if err := c.Get(context.Background(), types.NamespacedName{
+		Namespace: "tenant-foo", Name: "vm-disk-web-01-disk-0",
+	}, dv); err != nil {
+		t.Fatalf("DataVolume was not created: %v", err)
+	}
+	if _, found, _ := unstructured.NestedMap(dv.Object, "spec", "source", "blank"); !found {
+		t.Error("DataVolume source is not blank; the handoff would trigger a second copy")
+	}
+	if dv.GetAnnotations()[helmReleaseNameAnnotation] != "vm-disk-web-01-disk-0" {
+		t.Error("DataVolume lacks Helm ownership metadata, so the VMDisk release would collide with it")
+	}
+
+	// And the tenant-facing object, with no owner reference to the task: that
+	// is what lets a finished task be deleted without losing the disk.
+	disk := newObject(vmDiskGVK)
+	if err := c.Get(context.Background(), types.NamespacedName{
+		Namespace: "tenant-foo", Name: "web-01-disk-0",
+	}, disk); err != nil {
+		t.Fatalf("VMDisk was not created: %v", err)
+	}
+	if len(disk.GetOwnerReferences()) != 0 {
+		t.Error("VMDisk carries an owner reference; deleting the task would destroy the imported disk")
+	}
+}
+
+// TestAdoptVolumeRemovesOwningDataVolumeFirst locks in the second live-only
+// finding. Deleting a claim while its DataVolume still exists makes CDI
+// recreate the claim and provision a second volume, re-running the whole
+// import — the exact duplicate copy this design exists to remove.
+func TestAdoptVolumeRemovesOwningDataVolumeFirst(t *testing.T) {
+	s := testScheme(t)
+	tk := task("import", "tenant-foo", "vcenter", "replicated")
+
+	pv := &corev1.PersistentVolume{
+		ObjectMeta: metav1.ObjectMeta{Name: "pv-1"},
+		Spec: corev1.PersistentVolumeSpec{
+			StorageClassName: "replicated",
+			Capacity:         corev1.ResourceList{corev1.ResourceStorage: resource.MustParse("10Gi")},
+		},
+	}
+	// The transferred claim as CDI leaves it: owned by its DataVolume.
+	controller := true
+	transferred := &corev1.PersistentVolumeClaim{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "forklift-claim",
+			Namespace: "tenant-foo",
+			OwnerReferences: []metav1.OwnerReference{{
+				APIVersion: "cdi.kubevirt.io/v1beta1",
+				Kind:       "DataVolume",
+				Name:       "forklift-claim",
+				UID:        "dv-uid",
+				Controller: &controller,
+			}},
+		},
+		Spec: corev1.PersistentVolumeClaimSpec{
+			VolumeName: "pv-1",
+			Resources: corev1.VolumeResourceRequirements{
+				Requests: corev1.ResourceList{corev1.ResourceStorage: resource.MustParse("10Gi")},
+			},
+		},
+	}
+	forkliftDV := newObject(dataVolumeGVK)
+	forkliftDV.SetName("forklift-claim")
+	forkliftDV.SetNamespace("tenant-foo")
+
+	c := clientfake.NewClientBuilder().WithScheme(s).
+		WithObjects(pv, transferred, forkliftDV, tk).Build()
+	r := &VMImportTaskReconciler{Client: c, Scheme: s, Recorder: record.NewFakeRecorder(10)}
+
+	if err := r.adoptVolume(context.Background(), tk, "vm-1", "forklift-claim", "web-01-disk-0"); err != nil {
+		t.Fatalf("adoptVolume: %v", err)
+	}
+
+	gone := newObject(dataVolumeGVK)
+	err := c.Get(context.Background(), types.NamespacedName{Namespace: "tenant-foo", Name: "forklift-claim"}, gone)
+	if err == nil {
+		t.Fatal("the transferring DataVolume still exists; CDI would recreate the claim and run a second full copy")
+	}
+
+	oldClaim := &corev1.PersistentVolumeClaim{}
+	if err := c.Get(context.Background(), types.NamespacedName{
+		Namespace: "tenant-foo", Name: "forklift-claim",
+	}, oldClaim); err == nil {
+		t.Error("the original claim was left behind")
+	}
+}
+
+// TestAdoptVolumeIsIdempotent asserts a second pass over an already-adopted
+// disk is a no-op rather than a second swap: the controller is re-entered on
+// every requeue and after every restart.
+func TestAdoptVolumeIsIdempotent(t *testing.T) {
+	s := testScheme(t)
+	tk := task("import", "tenant-foo", "vcenter", "replicated")
+	already := &corev1.PersistentVolumeClaim{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "vm-disk-web-01-disk-0",
+			Namespace: "tenant-foo",
+			// The markers are what make this a resume rather than a collision:
+			// an unmarked claim of the same name belongs to the tenant.
+			Labels: map[string]string{
+				migrationv1alpha1.OutputTaskUIDLabel: "import-uid",
+				migrationv1alpha1.OutputVMIDLabel:    "vm-1",
+			},
+		},
+		Spec: corev1.PersistentVolumeClaimSpec{
+			VolumeName: "pv-1",
+			Resources: corev1.VolumeResourceRequirements{
+				Requests: corev1.ResourceList{corev1.ResourceStorage: resource.MustParse("20Gi")},
+			},
+		},
+	}
+	c := clientfake.NewClientBuilder().WithScheme(s).WithObjects(already, tk).Build()
+	r := &VMImportTaskReconciler{Client: c, Scheme: s, Recorder: record.NewFakeRecorder(10)}
+
+	// The source claim is deliberately absent: a second pass must not need it.
+	if err := r.adoptVolume(context.Background(), tk, "vm-1", "forklift-claim", "web-01-disk-0"); err != nil {
+		t.Fatalf("second pass over an adopted disk failed: %v", err)
+	}
+	disk := newObject(vmDiskGVK)
+	if err := c.Get(context.Background(), types.NamespacedName{
+		Namespace: "tenant-foo", Name: "web-01-disk-0",
+	}, disk); err != nil {
+		t.Fatalf("VMDisk was not created on the second pass: %v", err)
+	}
+}
+
+// TestSourceVMResources asserts the source VM's shape is read off the object
+// Forklift already built, which is why no inventory client is needed.
+func TestSourceVMResources(t *testing.T) {
+	vm := newObject(virtualMachineGVK)
+	if err := unstructured.SetNestedMap(vm.Object, map[string]any{
+		"cores":   int64(2),
+		"sockets": int64(2),
+	}, "spec", "template", "spec", "domain", "cpu"); err != nil {
+		t.Fatalf("set cpu: %v", err)
+	}
+	if err := unstructured.SetNestedField(vm.Object, "8Gi",
+		"spec", "template", "spec", "domain", "memory", "guest"); err != nil {
+		t.Fatalf("set memory: %v", err)
+	}
+
+	// Cores and sockets stay separate. vm-instance maps them to
+	// domain.cpu.cores and domain.cpu.sockets and refuses to render unless both
+	// are present, so multiplying them into one number both loses the topology
+	// and fails the chart — observed live: "Either instanceType or resources
+	// (cpu, sockets, memory) must be specified".
+	cores, sockets, memory := sourceVMResources(vm)
+	if cores != "2" {
+		t.Errorf("cores = %q, want 2", cores)
+	}
+	if sockets != "2" {
+		t.Errorf("sockets = %q, want 2", sockets)
+	}
+	if memory != "8Gi" {
+		t.Errorf("memory = %q, want 8Gi", memory)
+	}
+}
+
+// A source that reports cores but no socket count is single-socket. Saying so
+// explicitly is what lets the chart render at all.
+func TestSourceVMResourcesDefaultsSingleSocket(t *testing.T) {
+	vm := newObject(virtualMachineGVK)
+	if err := unstructured.SetNestedField(vm.Object, int64(4),
+		"spec", "template", "spec", "domain", "cpu", "cores"); err != nil {
+		t.Fatalf("set cores: %v", err)
+	}
+	cores, sockets, _ := sourceVMResources(vm)
+	if cores != "4" || sockets != "1" {
+		t.Errorf("cores/sockets = %q/%q, want 4/1", cores, sockets)
+	}
+}
+
+// TestMigrationProgressReadsTheTransferStep asserts progress reflects the disk
+// transfer rather than an average over every pipeline step, which would report
+// a four-step pipeline as 25% done before any data moved.
+func TestMigrationProgressReadsTheTransferStep(t *testing.T) {
+	m := newObject(migrationGVK)
+	if err := unstructured.SetNestedSlice(m.Object, []any{
+		map[string]any{
+			"id": "vm-1",
+			"pipeline": []any{
+				map[string]any{
+					"name":     "Initialize",
+					"progress": map[string]any{"completed": int64(1), "total": int64(1)},
+				},
+				map[string]any{
+					"name":     "DiskTransfer",
+					"progress": map[string]any{"completed": int64(3), "total": int64(10)},
+				},
+			},
+		},
+	}, "status", "vms"); err != nil {
+		t.Fatalf("set vms: %v", err)
+	}
+
+	done, progress, failure := migrationProgress(m)
+	if done {
+		t.Error("migration reported done with no completion timestamp")
+	}
+	if failure != "" {
+		t.Errorf("unexpected failure: %q", failure)
+	}
+	if progress != 30 {
+		t.Errorf("progress = %d, want 30", progress)
+	}
+}
+
+// TestMigrationProgressFallsBackWhenStepsAreUnnamed guards against pegging
+// progress at zero for a whole transfer. The pipeline step names are not part
+// of any contract, and a release that renames them would silently break a
+// name-only match — so an unrecognised pipeline still has to report something.
+func TestMigrationProgressFallsBackWhenStepsAreUnnamed(t *testing.T) {
+	m := newObject(migrationGVK)
+	if err := unstructured.SetNestedSlice(m.Object, []any{
+		map[string]any{
+			"id": "vm-1",
+			"pipeline": []any{
+				map[string]any{
+					"name":     "SomeFutureStepName",
+					"progress": map[string]any{"completed": int64(4096), "total": int64(16384)},
+				},
+			},
+		},
+	}, "status", "vms"); err != nil {
+		t.Fatalf("set vms: %v", err)
+	}
+	_, progress, _ := migrationProgress(m)
+	if progress != 25 {
+		t.Errorf("progress = %d, want 25 from the unnamed step", progress)
+	}
+}
+
+// TestMigrationProgressAcceptsCompletedPhase asserts the phase the engine
+// settles on is treated as terminal. Waiting only on a completion timestamp
+// would leave a finished transfer stuck in Transferring.
+func TestMigrationProgressAcceptsCompletedPhase(t *testing.T) {
+	m := newObject(migrationGVK)
+	if err := unstructured.SetNestedSlice(m.Object, []any{
+		map[string]any{"id": "vm-1", "phase": "Completed"},
+	}, "status", "vms"); err != nil {
+		t.Fatalf("set vms: %v", err)
+	}
+	done, progress, failure := migrationProgress(m)
+	if !done {
+		t.Error("a Completed phase must count as done")
+	}
+	if progress != 100 || failure != "" {
+		t.Errorf("progress = %d, failure = %q", progress, failure)
+	}
+}
+
+// TestAdoptVolumeOrphansAClaimWithNoDataVolume is the populator path, which is
+// the path Forklift actually takes: the transferred disk arrives as a populated
+// claim with no DataVolume, carrying an ownerReference to the VirtualMachine
+// Forklift built. Anything that later deletes that VM takes the disk with it,
+// and garbage collection wins any race against a copy — so the reference has to
+// be cleared even though there is no DataVolume to trigger the cleanup.
+func TestAdoptVolumeOrphansAClaimWithNoDataVolume(t *testing.T) {
+	s := testScheme(t)
+	tk := task("import", "tenant-foo", "vcenter", "replicated")
+
+	pv := &corev1.PersistentVolume{
+		ObjectMeta: metav1.ObjectMeta{Name: "pv-1"},
+		Spec: corev1.PersistentVolumeSpec{
+			StorageClassName: "replicated",
+			Capacity:         corev1.ResourceList{corev1.ResourceStorage: resource.MustParse("16Gi")},
+		},
+	}
+	blockOwnerDeletion := true
+	notController := false
+	populated := &corev1.PersistentVolumeClaim{
+		ObjectMeta: metav1.ObjectMeta{
+			// Forklift's own naming: <plan>-vm-<id>-<random>.
+			Name:      "import-vm-1234-pdbdm",
+			Namespace: "tenant-foo",
+			OwnerReferences: []metav1.OwnerReference{{
+				APIVersion:         "kubevirt.io/v1",
+				Kind:               "VirtualMachine",
+				Name:               "test-vm",
+				UID:                "vm-uid",
+				Controller:         &notController,
+				BlockOwnerDeletion: &blockOwnerDeletion,
+			}},
+		},
+		Spec: corev1.PersistentVolumeClaimSpec{
+			VolumeName: "pv-1",
+			Resources: corev1.VolumeResourceRequirements{
+				Requests: corev1.ResourceList{corev1.ResourceStorage: resource.MustParse("16Gi")},
+			},
+		},
+	}
+	// Deliberately no DataVolume: that is what the populator path looks like.
+	c := clientfake.NewClientBuilder().WithScheme(s).WithObjects(pv, populated, tk).Build()
+	r := &VMImportTaskReconciler{Client: c, Scheme: s, Recorder: record.NewFakeRecorder(10)}
+
+	if err := r.adoptVolume(context.Background(), tk, "vm-1", "import-vm-1234-pdbdm", "web-01-disk-0"); err != nil {
+		t.Fatalf("adoptVolume on the populator path: %v", err)
+	}
+
+	adopted := &corev1.PersistentVolumeClaim{}
+	if err := c.Get(context.Background(), types.NamespacedName{
+		Namespace: "tenant-foo", Name: "vm-disk-web-01-disk-0",
+	}, adopted); err != nil {
+		t.Fatalf("replacement claim was not created: %v", err)
+	}
+	if len(adopted.OwnerReferences) != 0 {
+		t.Error("the adopted claim carries an owner reference; deleting the Forklift VM would destroy the disk")
+	}
+	gotPV := &corev1.PersistentVolume{}
+	if err := c.Get(context.Background(), types.NamespacedName{Name: "pv-1"}, gotPV); err != nil {
+		t.Fatalf("get pv: %v", err)
+	}
+	if gotPV.Spec.PersistentVolumeReclaimPolicy != corev1.PersistentVolumeReclaimRetain {
+		t.Error("the volume was not retained for the swap")
+	}
+}
+
+// TestMigrationProgressSurfacesForkliftErrors asserts a failed transfer carries
+// Forklift's own words rather than a paraphrase.
+func TestMigrationProgressSurfacesForkliftErrors(t *testing.T) {
+	m := newObject(migrationGVK)
+	if err := unstructured.SetNestedSlice(m.Object, []any{
+		map[string]any{
+			"id": "vm-1",
+			"error": map[string]any{
+				"reasons": []any{"vddk: failed to open disk"},
+			},
+		},
+	}, "status", "vms"); err != nil {
+		t.Fatalf("set vms: %v", err)
+	}
+	done, _, failure := migrationProgress(m)
+	if done {
+		t.Error("a failed migration must not report done")
+	}
+	if !strings.Contains(failure, "failed to open disk") {
+		t.Errorf("failure = %q, want Forklift's own reason", failure)
+	}
+}
+
+// The topology comes out of an inventory record, and this is the shape the
+// inventory actually returns — verified against a live Forklift v2.11.5
+// inventory service on 2026-08-31, where a vSphere VM reported
+// networks:[{kind:Network,id:"HaNetwork-..."}] and
+// disks:[{...,datastore:{kind:Datastore,id:"61f94272-..."}}].
+//
+// An earlier revision read these from the Plan's VMNetworksNotMapped /
+// VMStorageNotMapped conditions instead. That cannot work: those conditions
+// carry the VM's own reference, not the network or datastore, so the map was
+// built from parsed VM names and never resolved. The test that covered it
+// asserted bare IDs Forklift never emits and so locked in the wrong contract.
+func TestInventoryVMYieldsNetworksAndDatastores(t *testing.T) {
+	const record = `{
+	  "id": "86",
+	  "name": "sample-vm",
+	  "firmware": "efi",
+	  "powerState": "poweredOff",
+	  "networks": [{"kind": "Network", "id": "HaNetwork-Cluster Example"}],
+	  "disks": [
+	    {"datastore": {"kind": "Datastore", "id": "61f94272-8f3a3584-b45f-00005e005301"}},
+	    {"datastore": {"kind": "Datastore", "id": "61f94272-8f3a3584-b45f-00005e005301"}}
+	  ]
+	}`
+
+	vm := &inventoryVM{}
+	if err := json.Unmarshal([]byte(record), vm); err != nil {
+		t.Fatalf("decoding the inventory record: %v", err)
+	}
+	if vm.Firmware != "efi" || vm.PowerState != "poweredOff" {
+		t.Errorf("firmware/power = %q/%q", vm.Firmware, vm.PowerState)
+	}
+	if got := vm.networkIDs(); len(got) != 1 || got[0] != "HaNetwork-Cluster Example" {
+		t.Errorf("networkIDs = %v", got)
+	}
+	// Two disks on one datastore yield one map entry, not two.
+	if got := vm.datastoreIDs(); len(got) != 1 || got[0] != "61f94272-8f3a3584-b45f-00005e005301" {
+		t.Errorf("datastoreIDs = %v", got)
+	}
+}
+
+// A Plan that does not pin the target power state lets Forklift match the
+// source's: a production cutover migrates running machines, so the imported VM
+// would boot the instant the transfer finished — a duplicate of a live machine
+// on the network, started on the very volume the handoff is about to re-point.
+func TestPlanKeepsTheImportedVMPoweredOff(t *testing.T) {
+	s := testScheme(t)
+	tk := task("import", "tenant-foo", "vcenter", "replicated")
+	src := readySource("vcenter", "tenant-foo")
+	c := clientfake.NewClientBuilder().WithScheme(s).WithObjects(tk, src).Build()
+	r := &VMImportTaskReconciler{Client: c, Scheme: s, Recorder: record.NewFakeRecorder(10)}
+
+	req := &migrationv1alpha1.VMImportRequest{ID: "vm-1234"}
+	if err := r.createPlan(context.Background(), tk, src, req); err != nil {
+		t.Fatalf("createPlan: %v", err)
+	}
+
+	plan := newObject(planGVK)
+	if err := c.Get(context.Background(), types.NamespacedName{
+		Namespace: "tenant-foo", Name: planName("import", "vm-1234"),
+	}, plan); err != nil {
+		t.Fatalf("Plan was not created: %v", err)
+	}
+	vms, _, _ := unstructured.NestedSlice(plan.Object, "spec", "vms")
+	if len(vms) != 1 {
+		t.Fatalf("spec.vms = %d entries, want 1", len(vms))
+	}
+	entry, _ := vms[0].(map[string]any)
+	got, _, _ := unstructured.NestedString(entry, "targetPowerState")
+	if got != "off" {
+		t.Errorf("targetPowerState = %q, want \"off\" — Forklift would boot the migrated guest before the handoff", got)
+	}
+}
+
+// The source's boot mode has to reach the VMInstance. A UEFI guest rendered
+// with a BIOS bootloader imports "successfully" and then does not boot, which
+// is the whole reason the vm-instance firmware field is a merge-order
+// dependency of this controller.
+func TestSourceFirmwareIsCarriedAcross(t *testing.T) {
+	cases := []struct {
+		name string
+		set  func(vm *unstructured.Unstructured)
+		want map[string]any
+	}{
+		{"efi", func(vm *unstructured.Unstructured) {
+			_ = unstructured.SetNestedMap(vm.Object, map[string]any{},
+				"spec", "template", "spec", "domain", "firmware", "bootloader", "efi")
+		}, map[string]any{"bootloader": "uefi"}},
+		{"efi with secureBoot", func(vm *unstructured.Unstructured) {
+			_ = unstructured.SetNestedField(vm.Object, true,
+				"spec", "template", "spec", "domain", "firmware", "bootloader", "efi", "secureBoot")
+		}, map[string]any{"bootloader": "uefi", "secureBoot": true}},
+		{"bios", func(vm *unstructured.Unstructured) {
+			_ = unstructured.SetNestedMap(vm.Object, map[string]any{},
+				"spec", "template", "spec", "domain", "firmware", "bootloader", "bios")
+		}, map[string]any{"bootloader": "bios"}},
+		// Nothing on the source means nothing written: the instance profile's
+		// own default stands rather than being overridden with a guess.
+		{"no firmware at all", func(vm *unstructured.Unstructured) {}, nil},
+	}
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			vm := newObject(virtualMachineGVK)
+			tc.set(vm)
+			got := sourceFirmware(vm)
+			if !reflect.DeepEqual(got, tc.want) {
+				t.Errorf("sourceFirmware = %v, want %v", got, tc.want)
+			}
+		})
+	}
+}
+
+// The boot disk of a guest copied verbatim out of VMware has to sit on a bus
+// that guest can already read, or the import "succeeds" into a VM that stalls
+// in its initramfs with no root device.
+func TestImportedDisksPreferTheInboxBus(t *testing.T) {
+	for i := range ahciPorts {
+		if got := importedDiskBus(i); got != "sata" {
+			t.Errorf("disk %d: bus = %q, want sata", i, got)
+		}
+	}
+	// Past the controller's port count SATA has nowhere to put the disk, and a
+	// data disk may fall back: by then the guest is running off its own root
+	// and can load the driver itself.
+	if got := importedDiskBus(ahciPorts); got != "virtio" {
+		t.Errorf("disk %d: bus = %q, want virtio", ahciPorts, got)
+	}
+}
+
+// The failure this marker exists to stop: a first import half-succeeds, the
+// tenant deletes the VMInstance but keeps the disks, and retries under the same
+// name. Without an identity check the leftover claim reads as this task's own
+// finished work, adoptVolume early-returns, and the freshly transferred claim
+// keeps its ownerRef to the scaffolding VM — which fulfill then deletes, taking
+// the new transfer with it. The import reports success over stale data.
+func TestAdoptVolumeRefusesAClaimItDidNotCreate(t *testing.T) {
+	s := testScheme(t)
+	tk := task("import", "tenant-foo", "vcenter", "replicated")
+	foreign := &corev1.PersistentVolumeClaim{
+		ObjectMeta: metav1.ObjectMeta{Name: "vm-disk-web-01-disk-0", Namespace: "tenant-foo"},
+		Spec: corev1.PersistentVolumeClaimSpec{
+			VolumeName: "pv-1",
+			Resources: corev1.VolumeResourceRequirements{
+				Requests: corev1.ResourceList{corev1.ResourceStorage: resource.MustParse("20Gi")},
+			},
+		},
+	}
+	c := clientfake.NewClientBuilder().WithScheme(s).WithObjects(foreign, tk).Build()
+	r := &VMImportTaskReconciler{Client: c, Scheme: s, Recorder: record.NewFakeRecorder(10)}
+
+	err := r.adoptVolume(context.Background(), tk, "vm-1", "forklift-claim", "web-01-disk-0")
+	if err == nil {
+		t.Fatal("adoptVolume accepted a claim this task never created; the transfer would be garbage-collected")
+	}
+	var verr *validationError
+	if !asValidationError(err, &verr) {
+		t.Fatalf("error = %v, want a tenant-visible validationError", err)
+	}
+	if verr.reason != migrationv1alpha1.ReasonOutputExists {
+		t.Errorf("reason = %q, want %q", verr.reason, migrationv1alpha1.ReasonOutputExists)
+	}
+}
+
+// A claim carrying another task's marker is just as foreign as an unmarked one:
+// names are reused, so the UID is what decides.
+func TestAdoptVolumeRefusesAnotherTasksOutput(t *testing.T) {
+	s := testScheme(t)
+	tk := task("import", "tenant-foo", "vcenter", "replicated")
+	other := &corev1.PersistentVolumeClaim{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "vm-disk-web-01-disk-0",
+			Namespace: "tenant-foo",
+			Labels: map[string]string{
+				migrationv1alpha1.OutputTaskUIDLabel: "some-older-task-uid",
+				migrationv1alpha1.OutputVMIDLabel:    "vm-1",
+			},
+		},
+		Spec: corev1.PersistentVolumeClaimSpec{VolumeName: "pv-1"},
+	}
+	c := clientfake.NewClientBuilder().WithScheme(s).WithObjects(other, tk).Build()
+	r := &VMImportTaskReconciler{Client: c, Scheme: s, Recorder: record.NewFakeRecorder(10)}
+
+	if err := r.adoptVolume(context.Background(), tk, "vm-1", "forklift-claim", "web-01-disk-0"); err == nil {
+		t.Fatal("adoptVolume adopted an output belonging to a different task")
+	}
+}
+
+// A deleted task must take the engine's transfer volumes with it. They carry no
+// owner reference — the engine tracks them by label — so deleting the task
+// removes the Plan and leaves the volume behind, still retrying the transfer
+// against the source with nothing left to collect it. Observed live: 37 minutes
+// and 8 restarts after its task was gone.
+//
+// The outputs must survive the same sweep, which is the other half of the test:
+// they are what the tenant keeps.
+func TestFinalizerRemovesTransferVolumesButNotOutputs(t *testing.T) {
+	s := testScheme(t)
+	tk := task("import", "tenant-foo", "vcenter", "replicated",
+		migrationv1alpha1.VMImportRequest{ID: "vm-1", Name: "web-01"})
+	tk.Finalizers = []string{migrationv1alpha1.TaskFinalizer}
+	now := metav1.Now()
+	tk.DeletionTimestamp = &now
+
+	plan := newObject(planGVK)
+	plan.SetName(planName("import", "vm-1"))
+	plan.SetNamespace("tenant-foo")
+	plan.SetUID(types.UID("plan-uid-1"))
+
+	transfer := newObject(dataVolumeGVK)
+	transfer.SetName("import-vm-1-abcde")
+	transfer.SetNamespace("tenant-foo")
+	transfer.SetLabels(map[string]string{"plan": "plan-uid-1", "vmID": "vm-1"})
+
+	// The imported disk: created by this controller, carries Helm metadata and
+	// no engine label, and must be left alone.
+	output := newObject(dataVolumeGVK)
+	output.SetName("vm-disk-web-01-disk-0")
+	output.SetNamespace("tenant-foo")
+	output.SetLabels(map[string]string{"app.kubernetes.io/instance": "vm-disk-web-01-disk-0"})
+
+	c := clientfake.NewClientBuilder().WithScheme(s).
+		WithObjects(tk, plan, transfer, output).Build()
+	r := &VMImportTaskReconciler{Client: c, Scheme: s, Recorder: record.NewFakeRecorder(10)}
+
+	if _, err := r.finalize(context.Background(), tk); err != nil {
+		t.Fatalf("finalize: %v", err)
+	}
+
+	got := newObject(dataVolumeGVK)
+	err := c.Get(context.Background(), types.NamespacedName{
+		Namespace: "tenant-foo", Name: "import-vm-1-abcde",
+	}, got)
+	if !apierrors.IsNotFound(err) {
+		t.Errorf("the engine's transfer volume survived the task, got err %v — it would keep retrying forever", err)
+	}
+
+	if err := c.Get(context.Background(), types.NamespacedName{
+		Namespace: "tenant-foo", Name: "vm-disk-web-01-disk-0",
+	}, newObject(dataVolumeGVK)); err != nil {
+		t.Errorf("the imported disk was removed with the task: %v", err)
+	}
+
+	if controllerutil.ContainsFinalizer(tk, migrationv1alpha1.TaskFinalizer) {
+		t.Error("the finalizer was not released; the task would never delete")
+	}
+}
+
+// Outputs must carry the marker, or the checks above can never recognise them
+// on a later pass and every resume becomes a collision.
+func TestAdoptedOutputsCarryTheTaskMarker(t *testing.T) {
+	tk := task("import", "tenant-foo", "vcenter", "replicated")
+	obj := newObject(vmDiskGVK)
+	stampOutput(obj, tk, "vm-1")
+
+	if !isOwnOutput(obj, tk, "vm-1") {
+		t.Error("a freshly stamped output is not recognised as this task's own")
+	}
+	if isOwnOutput(obj, tk, "vm-2") {
+		t.Error("an output for one source VM is recognised as another's")
+	}
+	other := task("import", "tenant-foo", "vcenter", "replicated")
+	other.UID = "different-uid"
+	if isOwnOutput(obj, other, "vm-1") {
+		t.Error("an output is recognised as belonging to a different task")
+	}
+}
diff --git a/internal/operator/package_reconciler.go b/internal/operator/package_reconciler.go
index f5b16aac28..c03da6edb3 100644
--- a/internal/operator/package_reconciler.go
+++ b/internal/operator/package_reconciler.go
@@ -18,18 +18,27 @@ package operator
 
 import (
 	"context"
+	"errors"
 	"fmt"
+	"slices"
 	"strings"
 	"time"
 
 	cozyv1alpha1 "github.com/cozystack/cozystack/api/v1alpha1"
+	"github.com/cozystack/cozystack/internal/marketplace/collision"
+	"github.com/cozystack/cozystack/pkg/config"
 	helmv2 "github.com/fluxcd/helm-controller/api/v2"
+	appsv1 "k8s.io/api/apps/v1"
+	batchv1 "k8s.io/api/batch/v1"
 	corev1 "k8s.io/api/core/v1"
+	apiequality "k8s.io/apimachinery/pkg/api/equality"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/api/meta"
+	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/types"
+	corev1ac "k8s.io/client-go/applyconfigurations/core/v1"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/client/apiutil"
@@ -44,6 +53,15 @@ const (
 	AnnotationSkipCozystackValues = "operator.cozystack.io/skip-cozystack-values"
 	// SecretCozystackValues is the name of the secret containing cluster and namespace configuration
 	SecretCozystackValues = "cozystack-values"
+	// SystemDefaultsLimitRangeName is the LimitRange the reconciler maintains in every
+	// system namespace to default container memory requests and limits.
+	SystemDefaultsLimitRangeName = "cozystack-system-defaults"
+	// packageControllerFieldOwner is the server-side-apply field manager used for every
+	// cluster object the Package reconciler owns outright.
+	packageControllerFieldOwner = "cozystack-package-controller"
+	// managedByLabel marks the objects this reconciler owns outright, so a same-named
+	// object it did not create can be told apart and left alone.
+	managedByLabel = "app.kubernetes.io/managed-by"
 )
 
 // parseCRDPolicy maps ComponentInstall.UpgradeCRDs to a helmv2.CRDsPolicy.
@@ -59,12 +77,26 @@ func parseCRDPolicy(install *cozyv1alpha1.ComponentInstall) helmv2.CRDsPolicy {
 // PackageReconciler reconciles Package resources
 type PackageReconciler struct {
 	client.Client
+	// APIReader reads straight from the API server, bypassing the manager's cache.
+	// Used for memory-policy ownership and state reads, and the workload scan behind the system defaults
+	// LimitRange: routing that through the cached client would start cluster-wide informers
+	// and cost the operator far more memory than the LimitRange saves. Optional —
+	// when nil the scan falls back to Client, which is what the unit tests use.
+	APIReader                 client.Reader
 	Scheme                    *runtime.Scheme
 	HelmReleaseInterval       time.Duration
 	HelmReleaseRetryInterval  time.Duration
 	HelmReleaseInstallTimeout time.Duration
 	HelmReleaseUpgradeTimeout time.Duration
 	HelmReleaseMaxHistory     int
+	// SystemNamespaceMemoryLimit is the default container memory limit applied through a
+	// LimitRange in every system namespace. A zero quantity disables the LimitRange and
+	// removes any the reconciler previously created.
+	SystemNamespaceMemoryLimit resource.Quantity
+	// SystemNamespaceMemoryRequest is the matching default container memory request. It
+	// must be set whenever the limit is, because Kubernetes otherwise defaults each
+	// request to the limit and reserves that much at schedule time.
+	SystemNamespaceMemoryRequest resource.Quantity
 }
 
 // buildHelmReleaseSpec assembles the Spec applied to every generated
@@ -72,7 +104,7 @@ type PackageReconciler struct {
 // attempts; Interval polls healthy releases.
 func (r *PackageReconciler) buildHelmReleaseSpec(componentInstall *cozyv1alpha1.ComponentInstall, artifactName string) helmv2.HelmReleaseSpec {
 	maxHistory := r.HelmReleaseMaxHistory
-	return helmv2.HelmReleaseSpec{
+	spec := helmv2.HelmReleaseSpec{
 		Interval:   metav1.Duration{Duration: r.HelmReleaseInterval},
 		MaxHistory: &maxHistory,
 		ChartRef: &helmv2.CrossNamespaceSourceReference{
@@ -96,6 +128,14 @@ func (r *PackageReconciler) buildHelmReleaseSpec(componentInstall *cozyv1alpha1.
 			CRDs: parseCRDPolicy(componentInstall),
 		},
 	}
+	// kstatus readiness (issue #2642): gate the release on the CR(s) it renders.
+	// ResolveWaitStrategy couples the default — expressions imply poller when no
+	// strategy is set, since healthCheckExprs are only evaluated under poller.
+	if componentInstall != nil {
+		spec.HealthCheckExprs = componentInstall.HealthCheckExprs
+		spec.WaitStrategy = config.ResolveWaitStrategy(componentInstall.WaitStrategy, len(componentInstall.HealthCheckExprs) > 0)
+	}
+	return spec
 }
 
 // +kubebuilder:rbac:groups=cozystack.io,resources=packages,verbs=get;list;watch;create;update;patch;delete
@@ -103,20 +143,35 @@ func (r *PackageReconciler) buildHelmReleaseSpec(componentInstall *cozyv1alpha1.
 // +kubebuilder:rbac:groups=cozystack.io,resources=packagesources,verbs=get;list;watch
 // +kubebuilder:rbac:groups=helm.toolkit.fluxcd.io,resources=helmreleases,verbs=get;list;watch;create;update;patch;delete
 // +kubebuilder:rbac:groups=core,resources=namespaces,verbs=get;list;watch;create;update;patch
+// +kubebuilder:rbac:groups=core,resources=limitranges,verbs=get;list;watch;create;update;patch;delete
+// +kubebuilder:rbac:groups=core,resources=pods,verbs=get;list;watch
+// +kubebuilder:rbac:groups=apps,resources=deployments;statefulsets;daemonsets,verbs=get;list;watch
+// +kubebuilder:rbac:groups=batch,resources=cronjobs;jobs,verbs=get;list;watch
 
 // Reconcile is part of the main kubernetes reconciliation loop
-func (r *PackageReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
+func (r *PackageReconciler) Reconcile(ctx context.Context, req ctrl.Request) (result ctrl.Result, reconcileErr error) {
 	logger := log.FromContext(ctx)
 
 	pkg := &cozyv1alpha1.Package{}
 	if err := r.Get(ctx, req.NamespacedName, pkg); err != nil {
 		if apierrors.IsNotFound(err) {
-			// Resource not found, return (ownerReference will handle cleanup)
-			return ctrl.Result{}, nil
+			// The final Package deletion must also retire its namespace defaults.
+			return ctrl.Result{}, r.cleanupUnusedMemoryDefaults(ctx)
 		}
 		return ctrl.Result{}, err
 	}
 
+	// Safety scans and administrator acknowledgements must progress on a quiet cluster
+	// too. Keep this bounded instead of adding cluster-wide workload informers.
+	defer func() {
+		if reconcileErr == nil && (result.RequeueAfter == 0 || result.RequeueAfter > 5*time.Minute) {
+			result.RequeueAfter = 5 * time.Minute
+		}
+	}()
+	if err := r.cleanupUnusedMemoryDefaults(ctx); err != nil {
+		logger.Error(err, "failed to clean up unused system memory defaults")
+	}
+
 	// Get PackageSource with the same name
 	packageSource := &cozyv1alpha1.PackageSource{}
 	if err := r.Get(ctx, types.NamespacedName{Name: pkg.Name}, packageSource); err != nil {
@@ -194,6 +249,7 @@ func (r *PackageReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct
 
 	// Create HelmReleases for components with Install section
 	helmReleaseCount := 0
+	var skippedPrivileged []string
 	for _, component := range variant.Components {
 		// Skip components without Install section
 		if component.Install == nil {
@@ -208,6 +264,18 @@ func (r *PackageReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct
 			}
 		}
 
+		// Refuse an unconfirmed privileged install here, at the install site,
+		// rather than in the tap materializer where the guard races this
+		// reconciler. A tap auto-registration Package carries the marketplace-tap
+		// label and is created without confirmation; `cozypkg add --allow-privileged`
+		// sheds the label, which is the operator's confirmation. A platform Package
+		// never carries the label and is unaffected.
+		if component.Install.Privileged && !collision.PrivilegedConfirmed(pkg) {
+			logger.Info("skipping unconfirmed privileged component", "package", pkg.Name, "component", component.Name)
+			skippedPrivileged = append(skippedPrivileged, component.Name)
+			continue
+		}
+
 		// Build artifact name: <packagesource>-<variant>-<componentname> (with dots replaced by dashes)
 		artifactName := fmt.Sprintf("%s-%s-%s",
 			strings.ReplaceAll(packageSource.Name, ".", "-"),
@@ -346,6 +414,19 @@ func (r *PackageReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct
 	}
 
 	// Update status with success message
+	if len(skippedPrivileged) > 0 {
+		meta.SetStatusCondition(&pkg.Status.Conditions, metav1.Condition{
+			Type:    "Ready",
+			Status:  metav1.ConditionFalse,
+			Reason:  "PrivilegedNotConfirmed",
+			Message: fmt.Sprintf("privileged install component(s) %v are not confirmed; register with 'cozypkg add --allow-privileged'", skippedPrivileged),
+		})
+		if err := r.Status().Update(ctx, pkg); err != nil {
+			return ctrl.Result{}, err
+		}
+		return ctrl.Result{}, nil
+	}
+
 	message := fmt.Sprintf("reconciliation succeeded, generated %d helmrelease(s)", helmReleaseCount)
 	meta.SetStatusCondition(&pkg.Status.Conditions, metav1.Condition{
 		Type:    "Ready",
@@ -519,13 +600,7 @@ func (r *PackageReconciler) buildDependsOn(ctx context.Context, pkg *cozyv1alpha
 	if len(variant.DependsOn) > 0 {
 		for _, depPackageName := range variant.DependsOn {
 			// Check if dependency is in IgnoreDependencies
-			ignore := false
-			for _, ignoreDep := range pkg.Spec.IgnoreDependencies {
-				if ignoreDep == depPackageName {
-					ignore = true
-					break
-				}
-			}
+			ignore := slices.Contains(pkg.Spec.IgnoreDependencies, depPackageName)
 			if ignore {
 				logger.V(1).Info("ignoring dependency", "package", pkg.Name, "dependency", depPackageName)
 				continue
@@ -596,13 +671,7 @@ func (r *PackageReconciler) updateDependenciesStatus(ctx context.Context, pkg *c
 	if len(variant.DependsOn) > 0 {
 		for _, depPackageName := range variant.DependsOn {
 			// Check if dependency is in IgnoreDependencies
-			ignore := false
-			for _, ignoreDep := range pkg.Spec.IgnoreDependencies {
-				if ignoreDep == depPackageName {
-					ignore = true
-					break
-				}
-			}
+			ignore := slices.Contains(pkg.Spec.IgnoreDependencies, depPackageName)
 			if ignore {
 				logger.V(1).Info("ignoring dependency", "package", pkg.Name, "dependency", depPackageName)
 				continue
@@ -664,13 +733,7 @@ func (r *PackageReconciler) areDependenciesReady(pkg *cozyv1alpha1.Package, vari
 
 	for _, depPackageName := range variant.DependsOn {
 		// Check if dependency is in IgnoreDependencies
-		ignore := false
-		for _, ignoreDep := range pkg.Spec.IgnoreDependencies {
-			if ignoreDep == depPackageName {
-				ignore = true
-				break
-			}
-		}
+		ignore := slices.Contains(pkg.Spec.IgnoreDependencies, depPackageName)
 		if ignore {
 			continue
 		}
@@ -728,13 +791,7 @@ func (r *PackageReconciler) updateDependentPackagesDependencies(ctx context.Cont
 		dependsOn := false
 		for _, dep := range variant.DependsOn {
 			// Check if dependency is in IgnoreDependencies
-			ignore := false
-			for _, ignoreDep := range pkg.Spec.IgnoreDependencies {
-				if ignoreDep == dep {
-					ignore = true
-					break
-				}
-			}
+			ignore := slices.Contains(pkg.Spec.IgnoreDependencies, dep)
 			if ignore {
 				continue
 			}
@@ -770,6 +827,18 @@ func (r *PackageReconciler) updateDependentPackagesDependencies(ctx context.Cont
 // component installed in it.
 func (r *PackageReconciler) reconcileNamespaces(ctx context.Context, pkg *cozyv1alpha1.Package, variant *cozyv1alpha1.Variant) error {
 	logger := log.FromContext(ctx)
+	limitRangeDisabled := r.SystemNamespaceMemoryLimit.IsZero()
+	if limitRangeDisabled {
+		// Disabled is global, unlike targetNamespaces below, which belongs only to the
+		// Package currently reconciling. Sweep by the ownership label once here so a
+		// namespace whose component or Package disappeared is still reached, then keep
+		// the per-namespace path out of the way.
+		if err := r.deleteManagedSystemDefaultsLimitRanges(ctx); err != nil {
+			// The LimitRange is opportunistic hardening. Its cleanup must not stop the
+			// Package's namespaces and components from reconciling; retry on the next pass.
+			logger.Error(err, "failed to remove managed system defaults LimitRanges while the feature is disabled")
+		}
+	}
 
 	// Collect namespaces from this Package's components
 	targetNamespaces := make(map[string]struct{})
@@ -797,6 +866,8 @@ func (r *PackageReconciler) reconcileNamespaces(ctx context.Context, pkg *cozyv1
 
 	// Create or update all namespaces
 	for nsName := range targetNamespaces {
+		isSystem := !strings.HasPrefix(nsName, "tenant-")
+
 		namespace := &corev1.Namespace{
 			ObjectMeta: metav1.ObjectMeta{
 				Name:   nsName,
@@ -807,7 +878,7 @@ func (r *PackageReconciler) reconcileNamespaces(ctx context.Context, pkg *cozyv1
 			},
 		}
 
-		if !strings.HasPrefix(nsName, "tenant-") {
+		if isSystem {
 			namespace.Labels["cozystack.io/system"] = "true"
 		}
 
@@ -820,11 +891,538 @@ func (r *PackageReconciler) reconcileNamespaces(ctx context.Context, pkg *cozyv1
 			return fmt.Errorf("failed to reconcile namespace %s: %w", nsName, err)
 		}
 		logger.Info("reconciled namespace", "name", nsName, "privileged", privileged[nsName])
+
+		// Cleanup excludes deleting Packages; their remaining reconciliation must
+		// not reinstate a retired policy or consume an acknowledgement.
+		if isSystem && !limitRangeDisabled && pkg.DeletionTimestamp.IsZero() {
+			// Logged and stepped over rather than returned. The LimitRange is
+			// opportunistic hardening against the Talos OOM handler's victim
+			// selection; a namespace that does not get one is back to the
+			// behaviour of every release before it. Failing the Package reconcile
+			// instead would leave the namespace's components uninstalled, making
+			// the hardening more disruptive than the problem it mitigates.
+			if err := r.reconcileSystemDefaultsLimitRange(ctx, nsName); err != nil {
+				logger.Error(err, "failed to reconcile system defaults LimitRange", "namespace", nsName)
+			}
+		}
 	}
 
 	return nil
 }
 
+// deleteManagedSystemDefaultsLimitRanges removes every LimitRange owned by this feature,
+// including objects in namespaces no active Package targets anymore. The selector keeps the
+// cluster-wide List narrow; the label check inside the loop is a second guard against a client
+// that does not honor selectors. Delete failures are aggregated so one namespace cannot keep
+// stale defaults in every namespace that follows it in the List.
+func (r *PackageReconciler) deleteManagedSystemDefaultsLimitRanges(ctx context.Context) error {
+	managed := &corev1.LimitRangeList{}
+	selector := client.MatchingLabels{managedByLabel: packageControllerFieldOwner}
+	if err := r.List(ctx, managed, selector); err != nil {
+		return fmt.Errorf("failed to list managed system defaults LimitRanges: %w", err)
+	}
+
+	var deleteErrs []error
+	for i := range managed.Items {
+		lr := &managed.Items[i]
+		if lr.Labels[managedByLabel] != packageControllerFieldOwner {
+			continue
+		}
+		if err := r.deleteSystemDefaultsLimitRange(ctx, lr.Namespace); err != nil {
+			deleteErrs = append(deleteErrs, fmt.Errorf("failed to delete managed LimitRange %s/%s: %w", lr.Namespace, lr.Name, err))
+		}
+	}
+	return errors.Join(deleteErrs...)
+}
+
+// reconcileSystemDefaultsLimitRange maintains the LimitRange that gives every container
+// in a system namespace a default memory request and limit.
+//
+// The Talos userspace OOM handler (v1.12+) selects its victim by ranking cgroups with
+// `memory_max.hasValue() ? 0.0 : {Besteffort: 1.0, Burstable: 0.5, ...}[class] *
+// memory_current`, and discards every cgroup that scores zero. A pod whose containers all
+// carry a memory limit has memory.max set on its cgroup, scores zero, and is never
+// selected. A pod without one stays a candidate however little memory it is using and
+// whatever actually caused the pressure — victim selection is decoupled from the trigger.
+// System components are overwhelmingly the pods without limits, so they were the ones
+// being killed on behalf of tenant workloads that were the real source of the pressure.
+//
+// Defaulting a limit across system namespaces takes those components out of the candidate
+// set. Tenant namespaces are skipped because the tenant chart owns LimitRange policy
+// there: packages/apps/tenant ships tenant-range-limits, which defaults container memory
+// to 128Mi in every tenant namespace that declares resourceQuotas. Handing a second,
+// system-owned LimitRange to those namespaces would layer a competing default on top of
+// the chart's own, so the operator stays out.
+//
+// The limit is a ceiling rather than a reservation, so it is set well above real usage —
+// the point is that memory.max exists, not that it binds. It must still stay above the
+// largest memory request in any system namespace, because a defaulted limit below a
+// container's own request is rejected at admission; findRequestAboveDefaultLimit is the
+// guard for that and the long comment there explains why it is needed in this repo.
+func (r *PackageReconciler) reconcileSystemDefaultsLimitRange(ctx context.Context, nsName string) error {
+	logger := log.FromContext(ctx)
+
+	// Disabled: drop a LimitRange left over from an earlier configuration so the knob
+	// stays reversible.
+	if r.SystemNamespaceMemoryLimit.IsZero() {
+		return r.deleteSystemDefaultsLimitRange(ctx, nsName)
+	}
+
+	// Ownership decisions use a fresh read; writes also carry an object precondition.
+	existing := &corev1.LimitRange{}
+	err := r.memoryPolicyReader().Get(ctx, types.NamespacedName{Name: SystemDefaultsLimitRangeName, Namespace: nsName}, existing)
+	if err != nil && !apierrors.IsNotFound(err) {
+		return fmt.Errorf("failed to read the system defaults LimitRange in namespace %s: %w", nsName, err)
+	}
+	existingOwned := err == nil && existing.Labels[managedByLabel] == packageControllerFieldOwner
+	if err == nil && !existingOwned {
+		// The name itself is occupied by an object we do not own. Its spec does not
+		// have to mention memory: even a cpu-only object cannot coexist with the
+		// desired LimitRange under the same Kubernetes object key, and replacing its
+		// atomic Limits list would destroy the administrator's policy.
+		logger.Info("leaving the system defaults LimitRange unmanaged: its name is already held by an object this reconciler does not own",
+			"namespace", nsName,
+			"limitRange", existing.Name)
+		return nil
+	}
+
+	// Another LimitRange already governing container memory here makes this namespace one
+	// to stay out of, for the same reason tenant namespaces are excluded: LimitRanger
+	// applies defaults from every LimitRange in the namespace and then validates the pod
+	// against every one, and nothing orders them. Adding a second default leaves which one
+	// wins to the order the plugin happens to iterate, so a container's ceiling moves
+	// between the administrator's value and this one for reasons no chart author can see —
+	// exactly the hazard cited above to keep this reconciler out of tenant namespaces, and
+	// it does not stop being one because the namespace is a system namespace.
+	//
+	// A max is the sharper half. This reconciler writes a default and no max, so an
+	// administrator's LimitRange carrying a container memory max below the configured
+	// default has every container that declares no limit of its own rejected: the default
+	// is written first, then validated against the max it exceeds. That takes out a whole
+	// namespace, and it reaches kube-system, which this feature enters for
+	// cozystack-scheduler and which is the namespace an administrator's or a
+	// distribution's own LimitRange is likeliest to be sitting in.
+	//
+	// Logged on every reconcile that finds one rather than only when something is written.
+	// The disabled path's quietness is about writes — an apiserver call and an audit entry
+	// per namespace per reconcile — and a log line is neither. Silence here would leave a
+	// deliberately unprotected namespace indistinguishable from a broken one.
+	governing, err := r.foreignContainerMemoryPolicy(ctx, nsName)
+	if err != nil {
+		return err
+	}
+	if governing != "" {
+		logger.Info("leaving this namespace's container memory default alone: another LimitRange already governs memory; "+
+			"adding this default could make admission order-dependent or violate that policy",
+			"namespace", nsName,
+			"limitRange", governing)
+		// Withdraw rather than sit beside it. Anything this reconciler wrote earlier is
+		// half of the ambiguity being described, and the label guard inside keeps this
+		// from touching an object it does not own.
+		return r.deleteSystemDefaultsLimitRange(ctx, nsName)
+	}
+
+	// Templates expose dormant workloads; Pods also expose requests admitted before
+	// the default existed or during LimitRanger informer lag. Neither can reveal a
+	// future pod rejected before persistence, so lowering and observed blockers need
+	// durable acknowledgement rather than treating an empty scan as permission.
+	blocker, err := r.findRequestAboveDefaultLimit(ctx, nsName)
+	if err != nil {
+		logger.Error(err, "skipping the system defaults LimitRange: could not read the namespace's pods and workloads", "namespace", nsName)
+		return nil
+	}
+	allowed, err := r.authorizeMemoryDefault(ctx, nsName, existing, blocker)
+	if err != nil {
+		return err
+	}
+	if !allowed {
+		return r.deleteSystemDefaultsLimitRange(ctx, nsName)
+	}
+
+	desired := r.systemDefaultsLimitRange(nsName, r.SystemNamespaceMemoryLimit)
+
+	// Equivalent quantities avoid a LimitRange write even when notation differs.
+	// Namespace safety state may already have been persisted above.
+	if apiequality.Semantic.DeepEqual(existing.Spec, desired.Spec) &&
+		existing.Labels[managedByLabel] == desired.Labels[managedByLabel] {
+		return nil
+	}
+
+	if !existingOwned {
+		// Create is conditional on absence. SSA without force could still adopt a
+		// concurrently created foreign object with compatible fields.
+		return r.Create(ctx, desired, client.FieldOwner(packageControllerFieldOwner))
+	}
+	// SSA checks resourceVersion too: changing ownership between the read and write
+	// produces a conflict instead of overwriting an administrator's replacement.
+	return r.Apply(ctx, systemDefaultsLimitRangeApplyConfiguration(desired).
+		WithResourceVersion(existing.ResourceVersion),
+		client.FieldOwner(packageControllerFieldOwner), client.ForceOwnership)
+}
+
+// systemDefaultsLimitRangeApplyConfiguration restates the LimitRange as the apply
+// configuration Client.Apply takes.
+//
+// The typed object stays the source of truth because it is what the spec comparison above
+// and the tests read; this is the last step before the wire. Every field the reconciler
+// sets is copied here, so a field added to systemDefaultsLimitRange and not to this
+// function would be applied as absent rather than failing to compile — the two are short
+// and adjacent for that reason.
+func systemDefaultsLimitRangeApplyConfiguration(lr *corev1.LimitRange) *corev1ac.LimitRangeApplyConfiguration {
+	items := make([]*corev1ac.LimitRangeItemApplyConfiguration, 0, len(lr.Spec.Limits))
+	for _, item := range lr.Spec.Limits {
+		items = append(items, corev1ac.LimitRangeItem().
+			WithType(item.Type).
+			WithDefault(item.Default).
+			WithDefaultRequest(item.DefaultRequest))
+	}
+	return corev1ac.LimitRange(lr.Name, lr.Namespace).
+		WithLabels(lr.Labels).
+		WithSpec(corev1ac.LimitRangeSpec().WithLimits(items...))
+}
+
+// foreignContainerMemoryPolicy names a LimitRange in the namespace, other than the one this
+// reconciler maintains, that already constrains container memory — or "" when there is none.
+//
+// Narrow on the resource and deliberately broad on everything else. This reconciler writes
+// only container memory, so a LimitRange bounding cpu or storage is no business of its own
+// and coexists; read any wider, the guard would become a blanket opt-out that an unrelated
+// cpu policy could trip, and a namespace would lose its memory default over it.
+//
+// Within memory, though, every field and both scopes count, because the alternative does not
+// work. An earlier version of this checked the container default and max only, on the theory
+// that those are the fields our own default and defaultRequest can collide with. They are not
+// the whole set: a container min above the defaultRequest rejects the pod, and so does a
+// maxLimitRequestRatio, since a 32Gi default against a 32Mi defaultRequest is a ratio of
+// 1024:1 and no sane cap allows it.
+//
+// The Pod scope is what settles the argument, because there the collision is not decidable
+// here at all. Whether a per-container default of 32Gi breaches a Pod-scoped max depends on
+// how many containers the pod has, and the pods in question do not exist yet. Any arithmetic
+// this function does about them is a guess, and a guess in this direction costs a namespace
+// its entire pod admission. So the rule is ownership rather than arithmetic: if something
+// else in this namespace already has an opinion about container memory, the namespace is not
+// ours to default. That is the same rule the tenant-namespace exclusion rests on.
+//
+// Foreign-policy Lists use the LimitRange cache. Ownership and Namespace state
+// Gets use APIReader, as do the workload scans; no workload informer is needed.
+func (r *PackageReconciler) foreignContainerMemoryPolicy(ctx context.Context, nsName string) (string, error) {
+	present := &corev1.LimitRangeList{}
+	if err := r.List(ctx, present, client.InNamespace(nsName)); err != nil {
+		return "", fmt.Errorf("failed to list LimitRanges in namespace %s: %w", nsName, err)
+	}
+	for i := range present.Items {
+		lr := &present.Items[i]
+		// Ours is the object carrying our own field-manager label, not merely the object
+		// carrying our name. The name is not reserved, and skipping on the name alone
+		// meant an administrator's LimitRange that happened to be called
+		// cozystack-system-defaults was invisible to this guard and then overwritten by
+		// the forced apply below — LimitRangeSpec.Limits is an atomic list, so that
+		// replaces every item in it, taking their max and their cpu policy with it. The
+		// delete path has always keyed on the label for exactly this reason.
+		if lr.Name == SystemDefaultsLimitRangeName && lr.Labels[managedByLabel] == packageControllerFieldOwner {
+			continue
+		}
+		for _, item := range lr.Spec.Limits {
+			if constrainsMemory(item) {
+				return lr.Name, nil
+			}
+		}
+	}
+	return "", nil
+}
+
+// constrainsMemory reports whether a LimitRange item expresses any policy about memory.
+//
+// Only Container and Pod items can constrain pod admission. Kubernetes accepts other scopes,
+// including a PersistentVolumeClaim item that mentions memory alongside its required storage
+// bound, but those quantities are not applied to pods. Within the pod-affecting scopes, every
+// field is read: the list below is the complete set of quantity maps a LimitRangeItem carries.
+func constrainsMemory(item corev1.LimitRangeItem) bool {
+	if item.Type != corev1.LimitTypeContainer && item.Type != corev1.LimitTypePod {
+		return false
+	}
+
+	for _, quantities := range []corev1.ResourceList{
+		item.Default, item.DefaultRequest, item.Max, item.Min, item.MaxLimitRequestRatio,
+	} {
+		if _, ok := quantities[corev1.ResourceMemory]; ok {
+			return true
+		}
+	}
+	return false
+}
+
+// deleteSystemDefaultsLimitRange removes the LimitRange this reconciler maintains,
+// treating an already-absent one as success.
+//
+// The fresh Get in front of the Delete is what makes the disabled state quiet. Disabled is
+// a steady state, not a one-off: with the limit set to 0 this runs for every system
+// namespace on every Package reconcile, and issuing the Delete unconditionally meant a
+// write attempt and a swallowed 404 per namespace per reconcile, forever, all of it in the
+// audit log. Nearly every one of those reconciles finds nothing to delete.
+func (r *PackageReconciler) deleteSystemDefaultsLimitRange(ctx context.Context, nsName string) error {
+	logger := log.FromContext(ctx)
+
+	stale := &corev1.LimitRange{}
+	err := r.memoryPolicyReader().Get(ctx, types.NamespacedName{Name: SystemDefaultsLimitRangeName, Namespace: nsName}, stale)
+	switch {
+	case apierrors.IsNotFound(err):
+		return nil
+	case err != nil:
+		return fmt.Errorf("failed to read the system defaults LimitRange in namespace %s: %w", nsName, err)
+	}
+
+	// Deleting by name alone would take an administrator's own object with it. The name
+	// is not reserved: nothing stops somebody creating a cozystack-system-defaults
+	// LimitRange by hand, and turning the knob off would then silently remove policy the
+	// operator never wrote. Only objects carrying this reconciler's managed-by label are
+	// its to delete; anything else is left where it is, which is also the right answer if
+	// the name is ever taken over by another component.
+	//
+	// The enabled path follows the same ownership rule. Its initial Get treats any
+	// unlabelled same-named object as foreign before inspecting the spec, so ForceOwnership
+	// is never used to adopt or overwrite it.
+	if stale.Labels[managedByLabel] != packageControllerFieldOwner {
+		// Left alone, and said out loud. This is the right call on an object this
+		// reconciler did not write, but it is also reached when its own object has had the
+		// label stripped, and there is no way to tell those apart. In the second case the
+		// namespace is left holding a default nothing will ever remove, so an operator who
+		// disabled the feature or watched it withdraw needs to see why one namespace did
+		// not follow.
+		logger.Info("not removing a LimitRange of this reconciler's name that it does not own; "+
+			"it carries no "+managedByLabel+"="+packageControllerFieldOwner+" label, so it is either an "+
+			"administrator's object or one of ours whose label was removed, and the two cannot be "+
+			"told apart here",
+			"namespace", nsName,
+			"limitRange", stale.Name)
+		return nil
+	}
+
+	if err := r.rememberMemoryDefault(ctx, stale); err != nil {
+		return err
+	}
+	if err := r.Delete(ctx, stale, client.Preconditions{UID: &stale.UID, ResourceVersion: &stale.ResourceVersion}); err != nil && !apierrors.IsNotFound(err) {
+		return err
+	}
+	return nil
+}
+
+// memoryRequestBlocker names the container that makes the configured default limit
+// unsafe to apply in a namespace.
+type memoryRequestBlocker struct {
+	// workload is the object the request was read from, written as Kind/name:
+	// "Pod/vmselect-0" for a live pod, "Deployment/vmselect" for a pod template. The
+	// kind is part of the value rather than implied, because it tells an operator
+	// reading the log which object to go and change — a pod whose request a mutating
+	// webhook raised after admission is a different problem from a template that
+	// declares the request outright.
+	workload  string
+	container string
+	request   resource.Quantity
+}
+
+// findRequestAboveDefaultLimit reports visible request-above-default blockers.
+// Raw templates cover dormant Deployments/StatefulSets/DaemonSets/CronJobs/Jobs;
+// Pods cover custom controllers and requests injected before this policy existed.
+// LimitRanger already filled limits on admitted Pods, so their hasLimit bit is not
+// provenance. Lowering is therefore guarded independently by persisted policy state.
+//
+// A future CR-created pod, or a RequestsOnly VPA mutation rejected at admission,
+// leaves nothing this scan can read. An administrator acknowledging a hold must
+// check those sources too. Default RequestsAndLimits VPA scales the limit together
+// with the request after LimitRanger, preserving their relationship.
+//
+// Scan failures leave the policy unchanged. Visible blockers withdraw it and create
+// a durable hold; an empty scan alone never releases that hold.
+func (r *PackageReconciler) findRequestAboveDefaultLimit(ctx context.Context, nsName string) (*memoryRequestBlocker, error) {
+	reader := r.APIReader
+	if reader == nil {
+		reader = r.Client
+	}
+
+	var worst *memoryRequestBlocker
+	// consider folds one pod spec into the running maximum. Sources below are scanned in
+	// a fixed order and the comparison is strict, so equal requests keep the first source
+	// scanned and which object gets named is deterministic rather than list-order luck.
+	consider := func(spec *corev1.PodSpec, workload string) {
+		// Init containers are defaulted by LimitRanger on the same terms.
+		for _, containers := range [][]corev1.Container{spec.InitContainers, spec.Containers} {
+			for _, c := range containers {
+				if _, hasLimit := c.Resources.Limits[corev1.ResourceMemory]; hasLimit {
+					continue
+				}
+				request, ok := c.Resources.Requests[corev1.ResourceMemory]
+				if !ok || request.Cmp(r.SystemNamespaceMemoryLimit) <= 0 {
+					continue
+				}
+				if worst == nil || request.Cmp(worst.request) > 0 {
+					worst = &memoryRequestBlocker{workload: workload, container: c.Name, request: request}
+				}
+			}
+		}
+	}
+
+	// Templates first, so that a workload and its own running pods — which declare the
+	// same request — are reported as the workload. That is the object an operator has to
+	// edit, and unlike a pod name it survives the next roll. A live pod outranks its own
+	// template only when its request is strictly larger, which is exactly the case the
+	// template cannot show: a webhook-injected request.
+	//
+	// ReplicaSets are deliberately absent, and the reason covers only the ones a Deployment
+	// owns. A live one is a copy of its Deployment's template, already covered above, while
+	// the older revisions a Deployment keeps carry superseded templates that no scale-up
+	// will ever instantiate — only an explicit rollout undo brings one back. Scanning them
+	// would withhold the default from a whole namespace over a request replaced releases ago.
+	//
+	// An ownerless ReplicaSet is genuinely out of scope rather than covered by that
+	// argument: at replicas 0 it has no pods to be seen through and no Deployment template
+	// standing in for it, so a request above the ceiling in one is invisible here and its
+	// first pod would be rejected on scale-up. Nothing in this tree ships a bare
+	// ReplicaSet, which is why this is a gap left open rather than a sixth List.
+	deployments := &appsv1.DeploymentList{}
+	if err := reader.List(ctx, deployments, client.InNamespace(nsName)); err != nil {
+		return nil, fmt.Errorf("failed to list deployments in namespace %s: %w", nsName, err)
+	}
+	for i := range deployments.Items {
+		d := &deployments.Items[i]
+		consider(&d.Spec.Template.Spec, "Deployment/"+d.Name)
+	}
+
+	statefulSets := &appsv1.StatefulSetList{}
+	if err := reader.List(ctx, statefulSets, client.InNamespace(nsName)); err != nil {
+		return nil, fmt.Errorf("failed to list statefulsets in namespace %s: %w", nsName, err)
+	}
+	for i := range statefulSets.Items {
+		s := &statefulSets.Items[i]
+		consider(&s.Spec.Template.Spec, "StatefulSet/"+s.Name)
+	}
+
+	daemonSets := &appsv1.DaemonSetList{}
+	if err := reader.List(ctx, daemonSets, client.InNamespace(nsName)); err != nil {
+		return nil, fmt.Errorf("failed to list daemonsets in namespace %s: %w", nsName, err)
+	}
+	for i := range daemonSets.Items {
+		d := &daemonSets.Items[i]
+		consider(&d.Spec.Template.Spec, "DaemonSet/"+d.Name)
+	}
+
+	// A CronJob is scanned whether or not it is suspended: suspend is the same kind of
+	// dormancy as replicas: 0, undone by the same kind of human action, and exempting it
+	// would leave the gap this scan exists to close open for one kind.
+	cronJobs := &batchv1.CronJobList{}
+	if err := reader.List(ctx, cronJobs, client.InNamespace(nsName)); err != nil {
+		return nil, fmt.Errorf("failed to list cronjobs in namespace %s: %w", nsName, err)
+	}
+	for i := range cronJobs.Items {
+		cj := &cronJobs.Items[i]
+		consider(&cj.Spec.JobTemplate.Spec.Template.Spec, "CronJob/"+cj.Name)
+	}
+
+	// Jobs are named separately from their owners because not every Job has one: a Helm
+	// hook or a migration Job is created standalone, and a Job with spec.suspend has no
+	// pods to scan yet. A Job that has already completed or given up is skipped for the
+	// same reason a terminated pod is — it will never create another pod.
+	jobs := &batchv1.JobList{}
+	if err := reader.List(ctx, jobs, client.InNamespace(nsName)); err != nil {
+		return nil, fmt.Errorf("failed to list jobs in namespace %s: %w", nsName, err)
+	}
+	finishedJobUIDs := make(map[types.UID]struct{})
+	for i := range jobs.Items {
+		j := &jobs.Items[i]
+		if jobFinished(j) {
+			// API-server objects always carry a UID. Ignore an empty one defensively so
+			// malformed test or synthetic objects cannot match empty owner references.
+			if j.UID != "" {
+				finishedJobUIDs[j.UID] = struct{}{}
+			}
+			continue
+		}
+		consider(&j.Spec.Template.Spec, "Job/"+j.Name)
+	}
+
+	pods := &corev1.PodList{}
+	if err := reader.List(ctx, pods, client.InNamespace(nsName)); err != nil {
+		return nil, fmt.Errorf("failed to list pods in namespace %s: %w", nsName, err)
+	}
+	for i := range pods.Items {
+		pod := &pods.Items[i]
+		// A pod that ran to completion is never recreated from this spec, so its
+		// request cannot block anything.
+		//
+		// Failed is not the same and is deliberately still scanned. An eviction or a node
+		// crash leaves a Failed carcass holding the same oversized request that its
+		// controller will recreate, and applying the default meanwhile would reject the
+		// replacement. A failed child of a finished Job is the exception: that Job will not
+		// create another pod, so keeping its carcass as evidence would contradict skipping
+		// the finished template above. Match the controlling Job by UID rather than name so
+		// a recreated Job with the same name cannot inherit the old Job's terminal state.
+		// A non-controlling owner reference is not enough: another controller may still
+		// replace that pod.
+		//
+		// Ownerless Failed pods still count. Some will never return, so this can withhold
+		// hardening longer than necessary, but there is no definitive controller state to
+		// distinguish those from a bare pod somebody will recreate. Withholding too long
+		// costs hardening; applying too early can reject the workload.
+		if pod.Status.Phase == corev1.PodSucceeded {
+			continue
+		}
+		if pod.Status.Phase == corev1.PodFailed {
+			ownedByFinishedJob := false
+			owner := metav1.GetControllerOf(pod)
+			if owner != nil && owner.APIVersion == batchv1.SchemeGroupVersion.String() && owner.Kind == "Job" {
+				if _, ok := finishedJobUIDs[owner.UID]; ok {
+					ownedByFinishedJob = true
+				}
+			}
+			if ownedByFinishedJob {
+				continue
+			}
+		}
+		consider(&pod.Spec, "Pod/"+pod.Name)
+	}
+
+	return worst, nil
+}
+
+// jobFinished reports whether a Job has run to completion or given up. Either way it will
+// never create another pod, so its template cannot block admission of anything.
+func jobFinished(job *batchv1.Job) bool {
+	for _, c := range job.Status.Conditions {
+		if c.Status != corev1.ConditionTrue {
+			continue
+		}
+		if c.Type == batchv1.JobComplete || c.Type == batchv1.JobFailed {
+			return true
+		}
+	}
+	return false
+}
+
+// systemDefaultsLimitRange builds the LimitRange applied to a system namespace.
+//
+// defaultLimit is passed explicitly so callers and tests can state the desired ceiling while
+// the reconciler supplies the independently configured default request.
+func (r *PackageReconciler) systemDefaultsLimitRange(nsName string, defaultLimit resource.Quantity) *corev1.LimitRange {
+	return &corev1.LimitRange{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      SystemDefaultsLimitRangeName,
+			Namespace: nsName,
+			// Stamped so the disabled path can tell this object apart from an
+			// administrator's own LimitRange that happens to carry the same name;
+			// see deleteSystemDefaultsLimitRange.
+			Labels: map[string]string{managedByLabel: packageControllerFieldOwner},
+		},
+		Spec: corev1.LimitRangeSpec{
+			Limits: []corev1.LimitRangeItem{{
+				Type:           corev1.LimitTypeContainer,
+				Default:        corev1.ResourceList{corev1.ResourceMemory: defaultLimit},
+				DefaultRequest: corev1.ResourceList{corev1.ResourceMemory: r.SystemNamespaceMemoryRequest},
+			}},
+		},
+	}
+}
+
 // resolvePrivilegedNamespaces checks all PackageSources and their corresponding Packages
 // to determine which of the given namespaces require the privileged PodSecurity level.
 // A namespace is privileged if ANY active Package has a component with privileged: true in it.
@@ -877,7 +1475,10 @@ func (r *PackageReconciler) resolvePrivilegedNamespaces(ctx context.Context, nam
 			if _, relevant := namespaces[component.Install.Namespace]; !relevant {
 				continue
 			}
-			if component.Install.Privileged {
+			// Same confirmation gate as the install loop: an unconfirmed tap
+			// registration's privileged component must not raise its namespace to
+			// the privileged PodSecurity level.
+			if component.Install.Privileged && collision.PrivilegedConfirmed(pkg) {
 				result[component.Install.Namespace] = true
 			}
 		}
@@ -888,8 +1489,33 @@ func (r *PackageReconciler) resolvePrivilegedNamespaces(ctx context.Context, nam
 
 // createOrUpdateNamespace creates or updates a namespace using server-side apply.
 func (r *PackageReconciler) createOrUpdateNamespace(ctx context.Context, namespace *corev1.Namespace) error {
-	namespace.SetGroupVersionKind(corev1.SchemeGroupVersion.WithKind("Namespace"))
-	return r.Patch(ctx, namespace, client.Apply, client.FieldOwner("cozystack-package-controller"), client.ForceOwnership)
+	desired := corev1ac.Namespace(namespace.Name).
+		WithLabels(namespace.Labels).
+		WithAnnotations(namespace.Annotations)
+	return r.Apply(ctx, desired, client.FieldOwner(packageControllerFieldOwner), client.ForceOwnership)
+}
+
+// componentInstallable reports whether a variant component should have a
+// HelmRelease for this Package: it has an Install section, is not disabled via
+// the Package spec, and, if it requests privileged access, the Package has
+// confirmed that privilege (a tap auto-registration has not). This is the same
+// decision the install loop makes before creating a HelmRelease; cleanup must
+// use it too, or a component the install loop refuses stays "desired" and its
+// existing HelmRelease is left for the helm-controller to upgrade to a chart
+// revision that only just became privileged.
+func componentInstallable(pkg *cozyv1alpha1.Package, component cozyv1alpha1.Component) bool {
+	if component.Install == nil {
+		return false
+	}
+	if pkgComponent, ok := pkg.Spec.Components[component.Name]; ok {
+		if pkgComponent.Enabled != nil && !*pkgComponent.Enabled {
+			return false
+		}
+	}
+	if component.Install.Privileged && !collision.PrivilegedConfirmed(pkg) {
+		return false
+	}
+	return true
 }
 
 // cleanupOrphanedHelmReleases removes HelmReleases that are no longer needed
@@ -899,17 +1525,10 @@ func (r *PackageReconciler) cleanupOrphanedHelmReleases(ctx context.Context, pkg
 	// Build map of desired HelmRelease names (from components with Install)
 	desiredReleases := make(map[types.NamespacedName]bool)
 	for _, component := range variant.Components {
-		if component.Install == nil {
+		if !componentInstallable(pkg, component) {
 			continue
 		}
 
-		// Check if component is disabled via Package spec
-		if pkgComponent, ok := pkg.Spec.Components[component.Name]; ok {
-			if pkgComponent.Enabled != nil && !*pkgComponent.Enabled {
-				continue
-			}
-		}
-
 		namespace := component.Install.Namespace
 		if namespace == "" {
 			// Skip components with empty namespace (they shouldn't exist anyway)
@@ -1006,13 +1625,7 @@ func (r *PackageReconciler) SetupWithManager(mgr ctrl.Manager) error {
 					// Check if this variant depends on updatedPkg
 					for _, dep := range variant.DependsOn {
 						// Check if dependency is in IgnoreDependencies
-						ignore := false
-						for _, ignoreDep := range pkg.Spec.IgnoreDependencies {
-							if ignoreDep == dep {
-								ignore = true
-								break
-							}
-						}
+						ignore := slices.Contains(pkg.Spec.IgnoreDependencies, dep)
 						if ignore {
 							continue
 						}
diff --git a/internal/operator/package_reconciler_memory.go b/internal/operator/package_reconciler_memory.go
new file mode 100644
index 0000000000..fdc4d91a9f
--- /dev/null
+++ b/internal/operator/package_reconciler_memory.go
@@ -0,0 +1,270 @@
+/*
+Copyright 2026 The Cozystack Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package operator
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"strings"
+
+	cozyv1alpha1 "github.com/cozystack/cozystack/api/v1alpha1"
+
+	corev1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/api/resource"
+	"k8s.io/apimachinery/pkg/types"
+	"k8s.io/apimachinery/pkg/util/uuid"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/log"
+)
+
+const (
+	// MemoryStateAnnotation is operator-owned state on the cluster-scoped Namespace,
+	// separate from the LimitRange so withdrawing the default does not erase the hold.
+	MemoryStateAnnotation = "operator.cozystack.io/system-memory-state"
+	// MemoryAcknowledgementAnnotation is set by a cluster administrator to the hold's
+	// acknowledgement value after checking the sources of future pods.
+	MemoryAcknowledgementAnnotation = "operator.cozystack.io/system-memory-ack"
+	memoryStateFieldOwner           = packageControllerFieldOwner + "-memory-state"
+)
+
+// memoryDefaultState remembers policy decisions, not an inventory of live pods.
+// A missing pod cannot distinguish removal of its controller from a recreation gap.
+type memoryDefaultState struct {
+	Version   int    `json:"version"`
+	LastLimit string `json:"lastLimit,omitempty"`
+	Hold      string `json:"hold,omitempty"`
+	Target    string `json:"target,omitempty"`
+	Reason    string `json:"reason,omitempty"`
+}
+
+func (s memoryDefaultState) acknowledgement() string {
+	return s.Hold + ":" + s.Target
+}
+
+func (r *PackageReconciler) memoryPolicyReader() client.Reader {
+	if r.APIReader != nil {
+		return r.APIReader
+	}
+	return r.Client
+}
+
+// readMemoryDefaultState fails closed on corrupt or newer state. In particular, it
+// never interprets an unreadable hold as permission to write a default.
+func (r *PackageReconciler) readMemoryDefaultState(ctx context.Context, nsName string) (*corev1.Namespace, memoryDefaultState, error) {
+	ns := &corev1.Namespace{}
+	if err := r.memoryPolicyReader().Get(ctx, types.NamespacedName{Name: nsName}, ns); err != nil {
+		return nil, memoryDefaultState{}, err
+	}
+	state := memoryDefaultState{Version: 1}
+	if raw, ok := ns.Annotations[MemoryStateAnnotation]; ok {
+		state = memoryDefaultState{}
+		if err := json.Unmarshal([]byte(raw), &state); err != nil {
+			return ns, state, fmt.Errorf("invalid system memory state in namespace %s: %w", nsName, err)
+		}
+		if state.Version != 1 || (state.Hold == "") != (state.Target == "") {
+			return ns, state, fmt.Errorf("unsupported or incomplete system memory state in namespace %s", nsName)
+		}
+		for _, value := range []string{state.LastLimit, state.Target} {
+			if value == "" {
+				continue
+			}
+			q, err := resource.ParseQuantity(value)
+			if err != nil || q.Sign() <= 0 {
+				return ns, state, fmt.Errorf("invalid system memory quantity %q in namespace %s", value, nsName)
+			}
+		}
+	}
+	return ns, state, nil
+}
+
+// writeMemoryDefaultState uses a separate field manager and optimistic locking:
+// the normal Namespace apply must neither prune the state nor race an admin ack.
+func (r *PackageReconciler) writeMemoryDefaultState(ctx context.Context, ns *corev1.Namespace, state memoryDefaultState, consumeAck bool) error {
+	raw, err := json.Marshal(state)
+	if err != nil {
+		return err
+	}
+	if ns.Annotations[MemoryStateAnnotation] == string(raw) && (!consumeAck || ns.Annotations[MemoryAcknowledgementAnnotation] == "") {
+		return nil
+	}
+	before := ns.DeepCopy()
+	if ns.Annotations == nil {
+		ns.Annotations = make(map[string]string)
+	}
+	ns.Annotations[MemoryStateAnnotation] = string(raw)
+	if consumeAck {
+		delete(ns.Annotations, MemoryAcknowledgementAnnotation)
+	}
+	return r.Patch(ctx, ns, client.MergeFromWithOptions(before, client.MergeFromWithOptimisticLock{}), client.FieldOwner(memoryStateFieldOwner))
+}
+
+// rememberMemoryDefault preserves the old default before deletion, including the
+// first disable of an object written by a version without Namespace state.
+func (r *PackageReconciler) rememberMemoryDefault(ctx context.Context, lr *corev1.LimitRange) error {
+	ns, state, err := r.readMemoryDefaultState(ctx, lr.Namespace)
+	if err != nil {
+		// Corrupt state still prevents any later default. Disabling must remain
+		// possible without first repairing that state.
+		if ns != nil {
+			return nil
+		}
+		return err
+	}
+	limit := memoryDefaultLimit(lr)
+	if limit.IsZero() || (state.LastLimit != "" && limit.Cmp(resource.MustParse(state.LastLimit)) <= 0) {
+		return nil
+	}
+	state.LastLimit = limit.String()
+	return r.writeMemoryDefaultState(ctx, ns, state, false)
+}
+
+func memoryDefaultLimit(lr *corev1.LimitRange) resource.Quantity {
+	for _, item := range lr.Spec.Limits {
+		if item.Type == corev1.LimitTypeContainer {
+			return item.Default[corev1.ResourceMemory]
+		}
+	}
+	return resource.Quantity{}
+}
+
+// authorizeMemoryDefault records the decision before any LimitRange write. An ack
+// permits only this hold and this target; it never overrides a visible blocker.
+// All observed blockers are held durably, including templates: deletion of a
+// template alone is no stronger proof of user intent than deletion of a Pod.
+func (r *PackageReconciler) authorizeMemoryDefault(ctx context.Context, nsName string, existing *corev1.LimitRange, blocker *memoryRequestBlocker) (bool, error) {
+	ns, state, err := r.readMemoryDefaultState(ctx, nsName)
+	if err != nil {
+		return false, err
+	}
+	if old := memoryDefaultLimit(existing); old.Sign() > 0 {
+		if state.LastLimit == "" || old.Cmp(resource.MustParse(state.LastLimit)) > 0 {
+			state.LastLimit = old.String()
+		}
+	}
+	target := r.SystemNamespaceMemoryLimit.String()
+	reason := ""
+	if state.LastLimit != "" {
+		last := resource.MustParse(state.LastLimit) // validated when reading state
+		if r.SystemNamespaceMemoryLimit.Cmp(last) < 0 {
+			reason = "lowering a previously applied default requires checking future pod specifications"
+		}
+	}
+	if blocker != nil {
+		reason = fmt.Sprintf("%s container %s requests %s without a memory limit", blocker.workload, blocker.container, blocker.request.String())
+	}
+	sameTarget := false
+	if state.Target != "" {
+		previousTarget := resource.MustParse(state.Target)
+		sameTarget = previousTarget.Cmp(r.SystemNamespaceMemoryLimit) == 0
+	}
+	if (state.Hold != "" && !sameTarget) || (state.Hold == "" && reason != "") {
+		state.Hold = string(uuid.NewUUID())
+		state.Target = target
+		state.Reason = reason
+		if state.Reason == "" {
+			state.Reason = "a previous hold remains unresolved"
+		}
+	}
+	if state.Hold != "" {
+		if blocker == nil && ns.Annotations[MemoryAcknowledgementAnnotation] == state.acknowledgement() {
+			state.Hold, state.Target, state.Reason = "", "", ""
+		} else {
+			if err := r.writeMemoryDefaultState(ctx, ns, state, blocker != nil); err != nil {
+				return false, err
+			}
+			log.FromContext(ctx).Info("withholding the default container memory limit until explicitly acknowledged",
+				"namespace", nsName, "configuredLimit", target, "reason", state.Reason,
+				"acknowledgementAnnotation", MemoryAcknowledgementAnnotation, "acknowledgement", state.acknowledgement(),
+				"currentBlocker", blocker != nil)
+			return false, nil
+		}
+	}
+	// Record before apply. A crash between these writes is conservative: it can
+	// demand an extra acknowledgement, but cannot forget a ceiling already used.
+	state.LastLimit = target
+	if err := r.writeMemoryDefaultState(ctx, ns, state, true); err != nil {
+		return false, err
+	}
+	return true, nil
+}
+
+// cleanupUnusedMemoryDefaults removes only this feature's objects from namespaces
+// no active Package targets. Decisions consider all Packages sharing a namespace;
+// Namespace state survives removal, including disable/re-enable and retargeting.
+func (r *PackageReconciler) cleanupUnusedMemoryDefaults(ctx context.Context) error {
+	if r.SystemNamespaceMemoryLimit.IsZero() {
+		return r.deleteManagedSystemDefaultsLimitRanges(ctx)
+	}
+	managed := &corev1.LimitRangeList{}
+	if err := r.List(ctx, managed, client.MatchingLabels{managedByLabel: packageControllerFieldOwner}); err != nil {
+		return err
+	}
+	if len(managed.Items) == 0 {
+		return nil
+	}
+	packages := &cozyv1alpha1.PackageList{}
+	if err := r.List(ctx, packages); err != nil {
+		return err
+	}
+	sources := &cozyv1alpha1.PackageSourceList{}
+	if err := r.List(ctx, sources); err != nil {
+		return err
+	}
+	byName := make(map[string]*cozyv1alpha1.PackageSource, len(sources.Items))
+	for i := range sources.Items {
+		byName[sources.Items[i].Name] = &sources.Items[i]
+	}
+	active := make(map[string]bool)
+	for _, pkg := range packages.Items {
+		if !pkg.DeletionTimestamp.IsZero() {
+			continue
+		}
+		source := byName[pkg.Name]
+		if source == nil {
+			continue
+		}
+		variantName := pkg.Spec.Variant
+		if variantName == "" {
+			variantName = "default"
+		}
+		for _, variant := range source.Spec.Variants {
+			if variant.Name != variantName {
+				continue
+			}
+			for _, component := range variant.Components {
+				if component.Install == nil || strings.HasPrefix(component.Install.Namespace, "tenant-") {
+					continue
+				}
+				if setting, ok := pkg.Spec.Components[component.Name]; ok && setting.Enabled != nil && !*setting.Enabled {
+					continue
+				}
+				active[component.Install.Namespace] = true
+			}
+		}
+	}
+	var firstErr error
+	for _, lr := range managed.Items {
+		if lr.Name != SystemDefaultsLimitRangeName || lr.Labels[managedByLabel] != packageControllerFieldOwner || active[lr.Namespace] {
+			continue
+		}
+		if err := r.deleteSystemDefaultsLimitRange(ctx, lr.Namespace); err != nil && firstErr == nil {
+			firstErr = err
+		}
+	}
+	return firstErr
+}
diff --git a/internal/operator/package_reconciler_memory_test.go b/internal/operator/package_reconciler_memory_test.go
new file mode 100644
index 0000000000..3becbb899c
--- /dev/null
+++ b/internal/operator/package_reconciler_memory_test.go
@@ -0,0 +1,530 @@
+/*
+Copyright 2026 The Cozystack Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package operator
+
+import (
+	"context"
+	"fmt"
+	"reflect"
+	"testing"
+	"time"
+
+	cozyv1alpha1 "github.com/cozystack/cozystack/api/v1alpha1"
+	helmv2 "github.com/fluxcd/helm-controller/api/v2"
+	corev1 "k8s.io/api/core/v1"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	"k8s.io/apimachinery/pkg/api/resource"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/types"
+	corev1ac "k8s.io/client-go/applyconfigurations/core/v1"
+	ctrl "sigs.k8s.io/controller-runtime"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/client/interceptor"
+)
+
+func memoryReconciler(cl client.Client, limit string) *PackageReconciler {
+	return &PackageReconciler{Client: cl, APIReader: cl,
+		SystemNamespaceMemoryLimit:   resource.MustParse(limit),
+		SystemNamespaceMemoryRequest: resource.MustParse("32Mi")}
+}
+
+func memoryReconcile(t *testing.T, cl client.Client, limit string) memoryDefaultState {
+	t.Helper()
+	// A new reconciler on every call models controller restart: only API state survives.
+	r := memoryReconciler(cl, limit)
+	if err := r.reconcileSystemDefaultsLimitRange(t.Context(), "cozy-monitoring"); err != nil {
+		t.Fatal(err)
+	}
+	_, state, err := r.readMemoryDefaultState(t.Context(), "cozy-monitoring")
+	if err != nil {
+		t.Fatal(err)
+	}
+	return state
+}
+
+func acknowledgeMemory(t *testing.T, cl client.Client, value string) {
+	t.Helper()
+	ns := &corev1.Namespace{}
+	if err := cl.Get(t.Context(), types.NamespacedName{Name: "cozy-monitoring"}, ns); err != nil {
+		t.Fatal(err)
+	}
+	if ns.Annotations == nil {
+		ns.Annotations = map[string]string{}
+	}
+	ns.Annotations[MemoryAcknowledgementAnnotation] = value
+	if err := cl.Update(t.Context(), ns); err != nil {
+		t.Fatal(err)
+	}
+}
+
+func requireMemoryHeld(t *testing.T, cl client.Client, state memoryDefaultState) {
+	t.Helper()
+	if state.Hold == "" || limitRangeExists(t, cl, "cozy-monitoring") {
+		t.Fatalf("expected a durable hold without a LimitRange, got %+v", state)
+	}
+}
+
+func TestMemoryLoweringSurvivesDefaultedPodDisappearanceAndRestart(t *testing.T) {
+	for _, init := range []bool{false, true} {
+		t.Run(fmt.Sprintf("init=%v", init), func(t *testing.T) {
+			cl := memoryTestClientBuilder(limitRangeScheme(t)).Build()
+			memoryReconcile(t, cl, "32Gi")
+			// This is a persisted Pod after actual admission defaulting. A fake client
+			// cannot execute LimitRanger; the live acceptance test verifies that step.
+			pod := systemPod("database-1", "8Gi", "32Gi")
+			if init {
+				pod.Spec.InitContainers = pod.Spec.Containers
+				pod.Spec.Containers = []corev1.Container{{Name: "main"}}
+			}
+			if err := cl.Create(t.Context(), pod); err != nil {
+				t.Fatal(err)
+			}
+			held := memoryReconcile(t, cl, "4Gi")
+			requireMemoryHeld(t, cl, held)
+			if held.LastLimit != "32Gi" {
+				t.Fatalf("forgot previous admission default: %+v", held)
+			}
+			if err := cl.Delete(t.Context(), pod); err != nil {
+				t.Fatal(err)
+			}
+			after := memoryReconcile(t, cl, "4Gi")
+			requireMemoryHeld(t, cl, after)
+			if after.Hold != held.Hold {
+				t.Fatal("restart or empty scan changed the hold")
+			}
+			// The replacement can now be admitted without the unsafe namespace default.
+			pod.ResourceVersion = ""
+			pod.Spec = systemPodSpec("database-1", "8Gi", "")
+			if err := cl.Create(t.Context(), pod); err != nil {
+				t.Fatal(err)
+			}
+			acknowledgeMemory(t, cl, after.acknowledgement())
+			requireMemoryHeld(t, cl, memoryReconcile(t, cl, "4Gi"))
+			// An ack cannot waive this concrete request-above-default failure.
+			ns := &corev1.Namespace{}
+			if err := cl.Get(t.Context(), types.NamespacedName{Name: "cozy-monitoring"}, ns); err != nil {
+				t.Fatal(err)
+			}
+			if ns.Annotations[MemoryAcknowledgementAnnotation] != "" {
+				t.Fatal("invalid acknowledgement was retained")
+			}
+		})
+	}
+}
+
+func TestMemoryAcknowledgementIsBoundToHoldAndValue(t *testing.T) {
+	cl := memoryTestClientBuilder(limitRangeScheme(t)).Build()
+	memoryReconcile(t, cl, "32Gi")
+	first := memoryReconcile(t, cl, "4Gi")
+	acknowledgeMemory(t, cl, first.acknowledgement())
+	second := memoryReconcile(t, cl, "2Gi")
+	requireMemoryHeld(t, cl, second)
+	if second.Hold == first.Hold || second.Target != "2Gi" {
+		t.Fatalf("target change did not rotate hold: %+v", second)
+	}
+	// Returning to the old value cannot resurrect the old approval either.
+	third := memoryReconcile(t, cl, "4Gi")
+	requireMemoryHeld(t, cl, third)
+	if third.Hold == first.Hold {
+		t.Fatal("reused a previous hold generation")
+	}
+	acknowledgeMemory(t, cl, third.acknowledgement())
+	released := memoryReconcile(t, cl, "4294967296")
+	if released.Hold != "" || !limitRangeExists(t, cl, "cozy-monitoring") {
+		t.Fatalf("matching acknowledgement did not release: %+v", released)
+	}
+	if got := limitRangeDefaultMemory(t, cl, "cozy-monitoring"); got.Cmp(resource.MustParse("4Gi")) != 0 {
+		t.Fatalf("applied %s", got.String())
+	}
+	// A newly observed blocker at the same value needs a new acknowledgement.
+	pod := systemPod("new-controller", "8Gi", "")
+	if err := cl.Create(t.Context(), pod); err != nil {
+		t.Fatal(err)
+	}
+	newHold := memoryReconcile(t, cl, "4Gi")
+	requireMemoryHeld(t, cl, newHold)
+	if err := cl.Delete(t.Context(), pod); err != nil {
+		t.Fatal(err)
+	}
+	acknowledgeMemory(t, cl, third.acknowledgement())
+	requireMemoryHeld(t, cl, memoryReconcile(t, cl, "4Gi"))
+}
+
+func TestMemoryBlockerRemovalRequiresAcknowledgement(t *testing.T) {
+	for _, fixture := range []client.Object{
+		systemPod("pod", "8Gi", ""),
+		systemDeployment("deployment", 0, "8Gi", ""),
+		systemStatefulSet("statefulset", 0, "8Gi", ""),
+		systemDaemonSet("daemonset", "8Gi", ""),
+		systemCronJob("cronjob", "8Gi", ""),
+		systemJob("job", "8Gi", ""),
+	} {
+		t.Run(fmt.Sprintf("%T", fixture), func(t *testing.T) {
+			cl := memoryTestClientBuilder(limitRangeScheme(t)).WithObjects(fixture).Build()
+			held := memoryReconcile(t, cl, "4Gi")
+			requireMemoryHeld(t, cl, held)
+			if err := cl.Delete(t.Context(), fixture); err != nil {
+				t.Fatal(err)
+			}
+			requireMemoryHeld(t, cl, memoryReconcile(t, cl, "4Gi"))
+			acknowledgeMemory(t, cl, held.acknowledgement())
+			if memoryReconcile(t, cl, "4Gi").Hold != "" || !limitRangeExists(t, cl, "cozy-monitoring") {
+				t.Fatal("explicit recovery failed")
+			}
+		})
+	}
+}
+
+func TestMemoryTemplateRemediationDoesNotBypassHold(t *testing.T) {
+	deployment := systemDeployment("database", 0, "8Gi", "")
+	cl := memoryTestClientBuilder(limitRangeScheme(t)).WithObjects(deployment).Build()
+	held := memoryReconcile(t, cl, "4Gi")
+	current := deployment.DeepCopy()
+	if err := cl.Get(t.Context(), client.ObjectKeyFromObject(current), current); err != nil {
+		t.Fatal(err)
+	}
+	current.Spec.Template.Spec.Containers[0].Resources.Limits = corev1.ResourceList{corev1.ResourceMemory: resource.MustParse("10Gi")}
+	if err := cl.Update(t.Context(), current); err != nil {
+		t.Fatal(err)
+	}
+	requireMemoryHeld(t, cl, memoryReconcile(t, cl, "4Gi"))
+	acknowledgeMemory(t, cl, held.acknowledgement())
+	if memoryReconcile(t, cl, "4Gi").Hold != "" {
+		t.Fatal("remediated template could not be acknowledged")
+	}
+	if err := cl.Get(t.Context(), client.ObjectKeyFromObject(current), current); err != nil {
+		t.Fatal(err)
+	}
+	if got := current.Spec.Template.Spec.Containers[0].Resources.Limits.Memory(); got.Cmp(resource.MustParse("10Gi")) != 0 {
+		t.Fatal("explicit container limit changed")
+	}
+}
+
+func TestMemoryDisablePreservesHistoryAndHolds(t *testing.T) {
+	for _, heldFirst := range []bool{false, true} {
+		t.Run(fmt.Sprintf("held=%v", heldFirst), func(t *testing.T) {
+			cl := memoryTestClientBuilder(limitRangeScheme(t)).Build()
+			memoryReconcile(t, cl, "32Gi")
+			if heldFirst {
+				memoryReconcile(t, cl, "4Gi")
+			}
+			if err := memoryReconciler(cl, "0").deleteManagedSystemDefaultsLimitRanges(t.Context()); err != nil {
+				t.Fatal(err)
+			}
+			if limitRangeExists(t, cl, "cozy-monitoring") {
+				t.Fatal("disable left the default")
+			}
+			requireMemoryHeld(t, cl, memoryReconcile(t, cl, "4Gi"))
+		})
+	}
+}
+
+func TestMemoryStateSurvivesNamespaceApply(t *testing.T) {
+	cl := memoryTestClientBuilder(limitRangeScheme(t)).Build()
+	memoryReconcile(t, cl, "32Gi")
+	held := memoryReconcile(t, cl, "4Gi")
+	acknowledgeMemory(t, cl, held.acknowledgement())
+	ns := &corev1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: "cozy-monitoring",
+		Labels:      map[string]string{"cozystack.io/system": "true"},
+		Annotations: map[string]string{"helm.sh/resource-policy": "keep"}}}
+	if err := memoryReconciler(cl, "4Gi").createOrUpdateNamespace(t.Context(), ns); err != nil {
+		t.Fatal(err)
+	}
+	if got := memoryReconcile(t, cl, "4Gi"); got.Hold != "" {
+		t.Fatalf("namespace SSA lost the acknowledgement/state: %+v", got)
+	}
+}
+
+func TestMemoryCorruptStateNeverAuthorizesDefault(t *testing.T) {
+	for _, raw := range []string{"", "null", "{}", "{", `{"version":2}`, `{"version":1,"lastLimit":"invalid"}`, `{"version":1,"hold":"a"}`} {
+		t.Run(raw, func(t *testing.T) {
+			ns := &corev1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: "cozy-monitoring", Annotations: map[string]string{MemoryStateAnnotation: raw}}}
+			cl := memoryTestClientBuilder(limitRangeScheme(t)).Build()
+			if err := cl.Get(t.Context(), client.ObjectKeyFromObject(ns), ns); err != nil {
+				t.Fatal(err)
+			}
+			ns.Annotations = map[string]string{MemoryStateAnnotation: raw}
+			if err := cl.Update(t.Context(), ns); err != nil {
+				t.Fatal(err)
+			}
+			if err := memoryReconciler(cl, "4Gi").reconcileSystemDefaultsLimitRange(t.Context(), ns.Name); err == nil {
+				t.Fatal("corrupt state accepted")
+			}
+			if limitRangeExists(t, cl, ns.Name) {
+				t.Fatal("default written despite corrupt state")
+			}
+		})
+	}
+}
+
+func TestMemoryStateWriteFailureDoesNotWithdrawOrApply(t *testing.T) {
+	pod := systemPod("database", "8Gi", "")
+	cl := memoryTestClientBuilder(limitRangeScheme(t)).WithObjects(pod).WithInterceptorFuncs(interceptor.Funcs{
+		Patch: func(_ context.Context, _ client.WithWatch, obj client.Object, _ client.Patch, _ ...client.PatchOption) error {
+			return apierrors.NewConflict(corev1.Resource("namespaces"), obj.GetName(), fmt.Errorf("changed by administrator"))
+		},
+	}).Build()
+	if err := memoryReconciler(cl, "4Gi").reconcileSystemDefaultsLimitRange(t.Context(), "cozy-monitoring"); !apierrors.IsConflict(err) {
+		t.Fatalf("got %v, want conflict", err)
+	}
+	if limitRangeExists(t, cl, "cozy-monitoring") {
+		t.Fatal("default written before durable decision")
+	}
+}
+
+func TestMemoryAcknowledgementCannotWaiveForeignPolicy(t *testing.T) {
+	cl := memoryTestClientBuilder(limitRangeScheme(t)).Build()
+	memoryReconcile(t, cl, "32Gi")
+	held := memoryReconcile(t, cl, "4Gi")
+	foreign := &corev1.LimitRange{ObjectMeta: metav1.ObjectMeta{Name: "admin", Namespace: "cozy-monitoring"},
+		Spec: corev1.LimitRangeSpec{Limits: []corev1.LimitRangeItem{{Type: corev1.LimitTypeContainer,
+			Max: corev1.ResourceList{corev1.ResourceMemory: resource.MustParse("1Gi")}}}}}
+	if err := cl.Create(t.Context(), foreign); err != nil {
+		t.Fatal(err)
+	}
+	acknowledgeMemory(t, cl, held.acknowledgement())
+	requireMemoryHeld(t, cl, memoryReconcile(t, cl, "4Gi"))
+}
+
+func TestMemoryPolicyCreateDoesNotAdoptConcurrentForeignObject(t *testing.T) {
+	cl := memoryTestClientBuilder(limitRangeScheme(t)).WithInterceptorFuncs(interceptor.Funcs{
+		Create: func(ctx context.Context, c client.WithWatch, obj client.Object, opts ...client.CreateOption) error {
+			if _, ok := obj.(*corev1.LimitRange); ok {
+				foreign := obj.DeepCopyObject().(*corev1.LimitRange)
+				foreign.Labels = map[string]string{managedByLabel: "administrator"}
+				if err := c.Create(ctx, foreign); err != nil {
+					return err
+				}
+			}
+			return c.Create(ctx, obj, opts...)
+		},
+	}).Build()
+	err := memoryReconciler(cl, "4Gi").reconcileSystemDefaultsLimitRange(t.Context(), "cozy-monitoring")
+	if !apierrors.IsAlreadyExists(err) {
+		t.Fatalf("got %v, want concurrent create conflict", err)
+	}
+	lr := &corev1.LimitRange{}
+	if err := cl.Get(t.Context(), types.NamespacedName{Name: SystemDefaultsLimitRangeName, Namespace: "cozy-monitoring"}, lr); err != nil {
+		t.Fatal(err)
+	}
+	if lr.Labels[managedByLabel] != "administrator" {
+		t.Fatal("foreign LimitRange was adopted")
+	}
+}
+
+func TestMemoryPolicyUpdateChecksFreshOwnershipVersion(t *testing.T) {
+	scheme := limitRangeScheme(t)
+	lr := memoryReconciler(nil, "4Gi").systemDefaultsLimitRange("cozy-monitoring", resource.MustParse("4Gi"))
+	cl := memoryTestClientBuilder(scheme).WithObjects(lr).WithInterceptorFuncs(interceptor.Funcs{
+		Apply: func(ctx context.Context, c client.WithWatch, obj runtime.ApplyConfiguration, opts ...client.ApplyOption) error {
+			apply := obj.(*corev1ac.LimitRangeApplyConfiguration)
+			if apply.ResourceVersion == nil || *apply.ResourceVersion == "" {
+				t.Fatal("owned apply lacks resourceVersion precondition")
+			}
+			current := &corev1.LimitRange{}
+			if err := c.Get(ctx, types.NamespacedName{Name: *apply.Name, Namespace: *apply.Namespace}, current); err != nil {
+				return err
+			}
+			current.Labels[managedByLabel] = "administrator"
+			if err := c.Update(ctx, current); err != nil {
+				return err
+			}
+			return c.Apply(ctx, obj, opts...)
+		},
+	}).Build()
+	err := memoryReconciler(cl, "32Gi").reconcileSystemDefaultsLimitRange(t.Context(), "cozy-monitoring")
+	if !apierrors.IsConflict(err) {
+		t.Fatalf("got %v, want resourceVersion conflict", err)
+	}
+}
+
+func TestMemoryPolicyDeleteDoesNotRemoveReplacement(t *testing.T) {
+	lr := memoryReconciler(nil, "4Gi").systemDefaultsLimitRange("cozy-monitoring", resource.MustParse("4Gi"))
+	lr.UID = "original"
+	cl := memoryTestClientBuilder(limitRangeScheme(t)).WithObjects(lr).WithInterceptorFuncs(interceptor.Funcs{
+		Delete: func(ctx context.Context, c client.WithWatch, obj client.Object, opts ...client.DeleteOption) error {
+			if err := c.Delete(ctx, obj); err != nil {
+				return err
+			}
+			replacement := lr.DeepCopy()
+			replacement.UID = "replacement"
+			replacement.ResourceVersion = ""
+			replacement.Labels[managedByLabel] = "administrator"
+			if err := c.Create(ctx, replacement); err != nil {
+				return err
+			}
+			return c.Delete(ctx, obj, opts...)
+		},
+	}).Build()
+	if err := memoryReconciler(cl, "0").deleteSystemDefaultsLimitRange(t.Context(), "cozy-monitoring"); !apierrors.IsConflict(err) {
+		t.Fatalf("got %v, want delete precondition conflict", err)
+	}
+	if !limitRangeExists(t, cl, "cozy-monitoring") {
+		t.Fatal("administrator's replacement was deleted")
+	}
+}
+
+func TestMemoryCleanupWaitsForLastPackageTarget(t *testing.T) {
+	scheme := limitRangeScheme(t)
+	if err := cozyv1alpha1.AddToScheme(scheme); err != nil {
+		t.Fatal(err)
+	}
+	objects := []client.Object{}
+	for _, name := range []string{"first", "second"} {
+		objects = append(objects,
+			&cozyv1alpha1.Package{ObjectMeta: metav1.ObjectMeta{Name: name}},
+			&cozyv1alpha1.PackageSource{ObjectMeta: metav1.ObjectMeta{Name: name}, Spec: cozyv1alpha1.PackageSourceSpec{
+				Variants: []cozyv1alpha1.Variant{{Name: "default", Components: []cozyv1alpha1.Component{{Name: "component", Install: &cozyv1alpha1.ComponentInstall{Namespace: "cozy-monitoring"}}}}}}})
+	}
+	cl := memoryTestClientBuilder(scheme).WithObjects(objects...).Build()
+	memoryReconcile(t, cl, "32Gi")
+	for i, name := range []string{"first", "second"} {
+		if err := cl.Delete(t.Context(), &cozyv1alpha1.Package{ObjectMeta: metav1.ObjectMeta{Name: name}}); err != nil {
+			t.Fatal(err)
+		}
+		if err := memoryReconciler(cl, "32Gi").cleanupUnusedMemoryDefaults(t.Context()); err != nil {
+			t.Fatal(err)
+		}
+		if limitRangeExists(t, cl, "cozy-monitoring") != (i == 0) {
+			t.Fatalf("wrong cleanup after removing %s", name)
+		}
+	}
+	// Reinstalling after removal still remembers the larger default.
+	requireMemoryHeld(t, cl, memoryReconcile(t, cl, "4Gi"))
+}
+
+func TestMemoryReconcileSchedulesQuietClusterEvaluation(t *testing.T) {
+	scheme := limitRangeScheme(t)
+	if err := cozyv1alpha1.AddToScheme(scheme); err != nil {
+		t.Fatal(err)
+	}
+	if err := helmv2.AddToScheme(scheme); err != nil {
+		t.Fatal(err)
+	}
+	pkg := &cozyv1alpha1.Package{ObjectMeta: metav1.ObjectMeta{Name: "test"}}
+	source := &cozyv1alpha1.PackageSource{ObjectMeta: metav1.ObjectMeta{Name: "test"}, Spec: cozyv1alpha1.PackageSourceSpec{Variants: []cozyv1alpha1.Variant{{Name: "default"}}}}
+	cl := memoryTestClientBuilder(scheme).WithStatusSubresource(pkg).WithObjects(pkg, source).Build()
+	r := memoryReconciler(cl, "32Gi")
+	r.Scheme = scheme
+	result, err := r.Reconcile(t.Context(), ctrl.Request{NamespacedName: types.NamespacedName{Name: pkg.Name}})
+	if err != nil {
+		t.Fatal(err)
+	}
+	if result.RequeueAfter <= 0 || result.RequeueAfter > 5*time.Minute {
+		t.Fatalf("no bounded reevaluation: %+v", result)
+	}
+}
+
+func TestMemoryDisableStillWorksWithCorruptSafetyState(t *testing.T) {
+	cl := memoryTestClientBuilder(limitRangeScheme(t)).Build()
+	memoryReconcile(t, cl, "32Gi")
+	ns := &corev1.Namespace{}
+	if err := cl.Get(t.Context(), types.NamespacedName{Name: "cozy-monitoring"}, ns); err != nil {
+		t.Fatal(err)
+	}
+	ns.Annotations[MemoryStateAnnotation] = "null"
+	if err := cl.Update(t.Context(), ns); err != nil {
+		t.Fatal(err)
+	}
+	if err := memoryReconciler(cl, "0").deleteManagedSystemDefaultsLimitRanges(t.Context()); err != nil {
+		t.Fatal(err)
+	}
+	if limitRangeExists(t, cl, ns.Name) {
+		t.Fatal("corrupt state prevented disable")
+	}
+	if err := memoryReconciler(cl, "4Gi").reconcileSystemDefaultsLimitRange(t.Context(), ns.Name); err == nil {
+		t.Fatal("reenable discarded corrupt state")
+	}
+	if limitRangeExists(t, cl, ns.Name) {
+		t.Fatal("reenable bypassed invalid state")
+	}
+}
+
+func TestMemoryDeletingPackageDoesNotReinstatePolicy(t *testing.T) {
+	for _, shared := range []bool{false, true} {
+		for _, held := range []bool{false, true} {
+			t.Run(fmt.Sprintf("shared=%t/held=%t", shared, held), func(t *testing.T) {
+				scheme := limitRangeScheme(t)
+				if err := cozyv1alpha1.AddToScheme(scheme); err != nil {
+					t.Fatal(err)
+				}
+				if err := helmv2.AddToScheme(scheme); err != nil {
+					t.Fatal(err)
+				}
+				now := metav1.Now()
+				pkg := &cozyv1alpha1.Package{ObjectMeta: metav1.ObjectMeta{
+					Name: "retiring", UID: "retiring-uid", Finalizers: []string{"foregroundDeletion"}, DeletionTimestamp: &now,
+				}}
+				source := &cozyv1alpha1.PackageSource{ObjectMeta: metav1.ObjectMeta{Name: pkg.Name}, Spec: cozyv1alpha1.PackageSourceSpec{
+					Variants: []cozyv1alpha1.Variant{{Name: "default", Components: []cozyv1alpha1.Component{{Name: "component", Install: &cozyv1alpha1.ComponentInstall{Namespace: "cozy-monitoring"}}}}},
+				}}
+				builder := memoryTestClientBuilder(scheme).WithStatusSubresource(pkg).WithObjects(pkg, source)
+				if shared {
+					active := &cozyv1alpha1.Package{ObjectMeta: metav1.ObjectMeta{Name: "active", UID: "active-uid"}}
+					activeSource := source.DeepCopy()
+					activeSource.Name = active.Name
+					builder.WithObjects(active, activeSource)
+				}
+				cl := builder.Build()
+				memoryReconcile(t, cl, "32Gi")
+				limit := "32Gi"
+				if held {
+					limit = "4Gi"
+					state := memoryReconcile(t, cl, limit)
+					acknowledgeMemory(t, cl, state.acknowledgement())
+				}
+				nsKey := types.NamespacedName{Name: "cozy-monitoring"}
+				before := &corev1.Namespace{}
+				if err := cl.Get(t.Context(), nsKey, before); err != nil {
+					t.Fatal(err)
+				}
+				r := memoryReconciler(cl, limit)
+				r.Scheme = scheme
+				for range 2 {
+					if _, err := r.Reconcile(t.Context(), ctrl.Request{NamespacedName: types.NamespacedName{Name: pkg.Name}}); err != nil {
+						t.Fatal(err)
+					}
+					if got, want := limitRangeExists(t, cl, nsKey.Name), shared && !held; got != want {
+						t.Fatalf("policy exists after deleting Package reconcile = %t; want %t", got, want)
+					}
+					after := &corev1.Namespace{}
+					if err := cl.Get(t.Context(), nsKey, after); err != nil {
+						t.Fatal(err)
+					}
+					for _, key := range []string{MemoryStateAnnotation, MemoryAcknowledgementAnnotation} {
+						if !reflect.DeepEqual(before.Annotations[key], after.Annotations[key]) {
+							t.Fatalf("deleting Package changed %s", key)
+						}
+					}
+				}
+				if shared {
+					if _, err := r.Reconcile(t.Context(), ctrl.Request{NamespacedName: types.NamespacedName{Name: "active"}}); err != nil {
+						t.Fatal(err)
+					}
+					if !limitRangeExists(t, cl, nsKey.Name) {
+						t.Fatal("remaining active Package cannot apply its policy")
+					}
+				} else {
+					// A later reinstall must retain the larger default's history.
+					state := memoryReconcile(t, cl, "2Gi")
+					requireMemoryHeld(t, cl, state)
+				}
+			})
+		}
+	}
+}
diff --git a/internal/operator/package_reconciler_privileged_test.go b/internal/operator/package_reconciler_privileged_test.go
new file mode 100644
index 0000000000..73966c992b
--- /dev/null
+++ b/internal/operator/package_reconciler_privileged_test.go
@@ -0,0 +1,127 @@
+package operator
+
+import (
+	"context"
+	"testing"
+
+	cozyv1alpha1 "github.com/cozystack/cozystack/api/v1alpha1"
+	"github.com/cozystack/cozystack/internal/marketplace/tapconst"
+	helmv2 "github.com/fluxcd/helm-controller/api/v2"
+	corev1 "k8s.io/api/core/v1"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/types"
+	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
+	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
+	ctrl "sigs.k8s.io/controller-runtime"
+	"sigs.k8s.io/controller-runtime/pkg/client/fake"
+)
+
+func privScheme() *runtime.Scheme {
+	s := runtime.NewScheme()
+	utilruntime.Must(clientgoscheme.AddToScheme(s))
+	utilruntime.Must(cozyv1alpha1.AddToScheme(s))
+	utilruntime.Must(helmv2.AddToScheme(s))
+	return s
+}
+
+func privPS() *cozyv1alpha1.PackageSource {
+	return &cozyv1alpha1.PackageSource{
+		ObjectMeta: metav1.ObjectMeta{Name: "demo.app"},
+		Spec: cozyv1alpha1.PackageSourceSpec{Variants: []cozyv1alpha1.Variant{{
+			Name: "default",
+			Components: []cozyv1alpha1.Component{{Name: "op", Path: "sys/op",
+				Install: &cozyv1alpha1.ComponentInstall{Namespace: "cozy-op", Privileged: true}}},
+		}}},
+	}
+}
+
+func TestPackageReconcilerRefusesUnconfirmedPrivileged(t *testing.T) {
+	pkg := &cozyv1alpha1.Package{ObjectMeta: metav1.ObjectMeta{Name: "demo.app", Labels: map[string]string{tapconst.Label: "true"}}}
+	cl := fake.NewClientBuilder().WithScheme(privScheme()).WithObjects(pkg, privPS()).WithStatusSubresource(&cozyv1alpha1.Package{}).Build()
+	r := &PackageReconciler{Client: cl, Scheme: privScheme()}
+	if _, err := r.Reconcile(context.Background(), ctrl.Request{NamespacedName: types.NamespacedName{Name: "demo.app"}}); err != nil {
+		t.Fatalf("reconcile: %v", err)
+	}
+	var hrs helmv2.HelmReleaseList
+	if err := cl.List(context.Background(), &hrs); err != nil {
+		t.Fatal(err)
+	}
+	for _, hr := range hrs.Items {
+		if hr.Labels["cozystack.io/privileged"] == "true" {
+			t.Errorf("unconfirmed tap registration must not create a privileged HelmRelease: %s/%s", hr.Namespace, hr.Name)
+		}
+	}
+	var ns corev1.Namespace
+	if err := cl.Get(context.Background(), types.NamespacedName{Name: "cozy-op"}, &ns); err == nil {
+		if ns.Labels["pod-security.kubernetes.io/enforce"] == "privileged" {
+			t.Error("namespace must not be raised to privileged for an unconfirmed registration")
+		}
+	}
+	var got cozyv1alpha1.Package
+	if err := cl.Get(context.Background(), types.NamespacedName{Name: "demo.app"}, &got); err != nil {
+		t.Fatal(err)
+	}
+	found := false
+	for _, c := range got.Status.Conditions {
+		if c.Reason == "PrivilegedNotConfirmed" {
+			found = true
+		}
+	}
+	if !found {
+		t.Error("expected a PrivilegedNotConfirmed condition")
+	}
+}
+
+func TestPackageReconcilerInstallsConfirmedPrivileged(t *testing.T) {
+	pkg := &cozyv1alpha1.Package{ObjectMeta: metav1.ObjectMeta{Name: "demo.app"}, Spec: cozyv1alpha1.PackageSpec{Variant: "default"}}
+	cl := fake.NewClientBuilder().WithScheme(privScheme()).WithObjects(pkg, privPS()).WithStatusSubresource(&cozyv1alpha1.Package{}).Build()
+	r := &PackageReconciler{Client: cl, Scheme: privScheme()}
+	if _, err := r.Reconcile(context.Background(), ctrl.Request{NamespacedName: types.NamespacedName{Name: "demo.app"}}); err != nil {
+		t.Fatalf("reconcile: %v", err)
+	}
+	var hrs helmv2.HelmReleaseList
+	if err := cl.List(context.Background(), &hrs); err != nil {
+		t.Fatal(err)
+	}
+	priv := false
+	for _, hr := range hrs.Items {
+		if hr.Labels["cozystack.io/privileged"] == "true" {
+			priv = true
+		}
+	}
+	if !priv {
+		t.Error("a confirmed (non-tap) Package must install its privileged HelmRelease")
+	}
+}
+
+// A tap auto-registration whose component was benign when it first installed (a
+// HelmRelease exists) but flips to privileged in a later source revision: the
+// install loop refuses the now-privileged component, and cleanup must remove the
+// lingering HelmRelease so the helm-controller does not upgrade it to the
+// newly-privileged chart revision the tap's ExternalArtifact now points at.
+// Without excluding unconfirmed-privileged components from the desired set,
+// cleanup keeps the HelmRelease and the guarded install happens via the upgrade.
+func TestPackageReconcilerRemovesLingeringPrivilegedHelmRelease(t *testing.T) {
+	pkg := &cozyv1alpha1.Package{ObjectMeta: metav1.ObjectMeta{Name: "demo.app", Labels: map[string]string{tapconst.Label: "true"}}}
+	existing := &helmv2.HelmRelease{ObjectMeta: metav1.ObjectMeta{
+		Name:      "op",
+		Namespace: "cozy-op",
+		Labels:    map[string]string{"cozystack.io/package": "demo.app"},
+	}}
+	cl := fake.NewClientBuilder().WithScheme(privScheme()).
+		WithObjects(pkg, privPS(), existing).
+		WithStatusSubresource(&cozyv1alpha1.Package{}).Build()
+	r := &PackageReconciler{Client: cl, Scheme: privScheme()}
+	if _, err := r.Reconcile(context.Background(), ctrl.Request{NamespacedName: types.NamespacedName{Name: "demo.app"}}); err != nil {
+		t.Fatalf("reconcile: %v", err)
+	}
+	var hr helmv2.HelmRelease
+	err := cl.Get(context.Background(), types.NamespacedName{Name: "op", Namespace: "cozy-op"}, &hr)
+	if err == nil {
+		t.Error("cleanup must delete the lingering HelmRelease of an unconfirmed privileged component")
+	} else if !apierrors.IsNotFound(err) {
+		t.Fatalf("unexpected error checking HelmRelease: %v", err)
+	}
+}
diff --git a/internal/operator/package_reconciler_test.go b/internal/operator/package_reconciler_test.go
index e6b1e4bcbe..c9923e7dc7 100644
--- a/internal/operator/package_reconciler_test.go
+++ b/internal/operator/package_reconciler_test.go
@@ -17,15 +17,31 @@ limitations under the License.
 package operator
 
 import (
+	"context"
 	"encoding/json"
+	"fmt"
 	"os"
 	"path/filepath"
+	"reflect"
+	"strings"
 	"testing"
 	"time"
 
 	cozyv1alpha1 "github.com/cozystack/cozystack/api/v1alpha1"
 	helmv2 "github.com/fluxcd/helm-controller/api/v2"
+	"github.com/fluxcd/pkg/apis/kustomize"
+	appsv1 "k8s.io/api/apps/v1"
+	batchv1 "k8s.io/api/batch/v1"
+	corev1 "k8s.io/api/core/v1"
 	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	"k8s.io/apimachinery/pkg/api/resource"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/types"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/client/fake"
+	"sigs.k8s.io/controller-runtime/pkg/client/interceptor"
 	"sigs.k8s.io/yaml"
 )
 
@@ -122,10 +138,11 @@ func TestBuildHelmReleaseSpec(t *testing.T) {
 	if spec.Install.Strategy.RetryInterval == nil || spec.Install.Strategy.RetryInterval.Duration != 17*time.Second {
 		t.Errorf("Install.Strategy.RetryInterval = %v, want 17s", spec.Install.Strategy.RetryInterval)
 	}
-	// Remediation must remain nil: helm-controller's XValidation rule rejects
-	// Strategy.Name=RetryOnFailure with RetryInterval set alongside a
-	// Remediation entry, so a future "for safety" re-introduction of
-	// Remediation{Retries: -1} would silently break every HR.
+	// Remediation must remain nil: retries are driven solely by
+	// Strategy.Name=RetryOnFailure with an explicit RetryInterval.
+	// Re-introducing Remediation{Retries: -1} "for safety" would add a
+	// second, conflicting retry mechanism alongside the strategy retry
+	// path.
 	if spec.Install.Remediation != nil {
 		t.Errorf("Install.Remediation = %+v, want nil", spec.Install.Remediation)
 	}
@@ -156,6 +173,41 @@ func TestBuildHelmReleaseSpec(t *testing.T) {
 // TestBuildHelmReleaseSpecZeroMaxHistory pins that MaxHistory=0 (unlimited
 // history per Helm semantics) survives the spec build — i.e. is set as a
 // non-nil pointer to 0 rather than dropped or replaced with a default.
+// buildHelmReleaseSpec threads the kstatus readiness knobs from ComponentInstall
+// (issue #2642) onto the generated HelmRelease, coupling the poller default when
+// healthCheckExprs are present but no wait strategy was set.
+func TestBuildHelmReleaseSpecHealthCheckExprs(t *testing.T) {
+	r := &PackageReconciler{HelmReleaseMaxHistory: 7}
+	exprs := []kustomize.CustomHealthCheck{{
+		APIVersion: "postgresql.cnpg.io/v1",
+		Kind:       "Cluster",
+	}}
+
+	// exprs present, no explicit strategy -> poller (coupled default)
+	spec := r.buildHelmReleaseSpec(&cozyv1alpha1.ComponentInstall{HealthCheckExprs: exprs}, "x")
+	if len(spec.HealthCheckExprs) != 1 || spec.HealthCheckExprs[0].Kind != "Cluster" {
+		t.Fatalf("HealthCheckExprs not threaded: %+v", spec.HealthCheckExprs)
+	}
+	if spec.WaitStrategy == nil || spec.WaitStrategy.Name != helmv2.WaitStrategyPoller {
+		t.Errorf("WaitStrategy = %+v, want poller (coupled default)", spec.WaitStrategy)
+	}
+
+	// explicit legacy honored even with exprs
+	spec = r.buildHelmReleaseSpec(&cozyv1alpha1.ComponentInstall{HealthCheckExprs: exprs, WaitStrategy: "legacy"}, "x")
+	if spec.WaitStrategy == nil || spec.WaitStrategy.Name != helmv2.WaitStrategyLegacy {
+		t.Errorf("WaitStrategy = %+v, want legacy", spec.WaitStrategy)
+	}
+
+	// no exprs, no strategy -> unset (flux default)
+	spec = r.buildHelmReleaseSpec(&cozyv1alpha1.ComponentInstall{}, "x")
+	if spec.WaitStrategy != nil {
+		t.Errorf("WaitStrategy = %+v, want nil", spec.WaitStrategy)
+	}
+	if spec.HealthCheckExprs != nil {
+		t.Errorf("HealthCheckExprs = %+v, want nil", spec.HealthCheckExprs)
+	}
+}
+
 func TestBuildHelmReleaseSpecZeroMaxHistory(t *testing.T) {
 	r := &PackageReconciler{HelmReleaseMaxHistory: 0}
 	spec := r.buildHelmReleaseSpec(nil, "x")
@@ -167,6 +219,18 @@ func TestBuildHelmReleaseSpecZeroMaxHistory(t *testing.T) {
 	}
 }
 
+// NOTE: a TestBuildHelmReleaseSpecNoForceOrDriftDetection once lived here, claiming to
+// guard the postgres autoscaler's apply invariant. It was removed as misattributed:
+// buildHelmReleaseSpec below builds PLATFORM Package HelmReleases, whereas the tenant
+// Postgres Application HelmRelease is built in pkg/registry/apps/application/rest.go. The
+// autoscaler's real invariant is that the tenant HelmRelease applies CLIENT-SIDE (so
+// helm-controller patches the CNPG Cluster from the previous-vs-new rendered manifest
+// without consulting live state, the constant spec.instances seed yields no patch, and
+// KEDA's /scale value survives) —
+// server-side apply IS a HelmRelease knob (Install/Upgrade.ServerSideApply, set from the
+// release.cozystack.io/helm-server-side-apply annotation), and it is guarded by
+// pkg/registry/apps/application/rest_serversideapply_test.go, not here.
+
 // TestPackageSourceCRDHasUpgradeCRDsEnum guards the generated CRD schema: the
 // invalid-value case from the spec is enforced at the API server via a
 // kubebuilder enum marker, not in the reconciler. If someone drops the marker
@@ -232,3 +296,1644 @@ func TestPackageSourceCRDHasUpgradeCRDsEnum(t *testing.T) {
 		}
 	}
 }
+
+// TestGoldenImageHelmReleasesWaitForImport builds the HelmRelease spec from
+// each shipped golden image catalog. Its DataVolumes start importing at
+// install, and without the gate the release is Ready before any image exists.
+func TestGoldenImageHelmReleasesWaitForImport(t *testing.T) {
+	want := []kustomize.CustomHealthCheck{{
+		APIVersion: "cdi.kubevirt.io/v1beta1",
+		Kind:       "DataVolume",
+		HealthCheckExpressions: kustomize.HealthCheckExpressions{
+			Failed:  "has(status.phase) && status.phase == 'Failed'",
+			Current: "has(status.phase) && status.phase == 'Succeeded'",
+		},
+	}}
+	for _, component := range []string{"vm-default-images", "kubernetes-worker-image"} {
+		t.Run(component, func(t *testing.T) {
+			path := filepath.Join("..", "..", "packages", "core", "platform", "sources", component+".yaml")
+			data, err := os.ReadFile(path)
+			if err != nil {
+				t.Fatalf("read %s: %v", path, err)
+			}
+			var ps cozyv1alpha1.PackageSource
+			if err := yaml.Unmarshal(data, &ps); err != nil {
+				t.Fatalf("unmarshal %s: %v", path, err)
+			}
+
+			var install *cozyv1alpha1.ComponentInstall
+			for _, v := range ps.Spec.Variants {
+				for _, c := range v.Components {
+					if c.Name == component {
+						install = c.Install
+					}
+				}
+			}
+			if install == nil {
+				t.Fatalf("%s: component %s has no install block", path, component)
+			}
+
+			spec := (&PackageReconciler{}).buildHelmReleaseSpec(install, "x")
+
+			if !reflect.DeepEqual(spec.HealthCheckExprs, want) {
+				t.Errorf("HealthCheckExprs = %+v, want %+v", spec.HealthCheckExprs, want)
+			}
+			if spec.WaitStrategy == nil || spec.WaitStrategy.Name != helmv2.WaitStrategyPoller {
+				t.Errorf("WaitStrategy = %+v, want poller: the expressions are not evaluated under any other strategy", spec.WaitStrategy)
+			}
+		})
+	}
+}
+
+// Memory policy state lives on a Namespace, which fake clients do not create
+// implicitly when a namespaced fixture is added.
+func memoryTestClientBuilder(scheme *runtime.Scheme) *fake.ClientBuilder {
+	objects := []client.Object{}
+	for _, name := range []string{"cozy-monitoring", "cozy-metallb", "cozy-active", "cozy-orphaned", "cozy-first", "cozy-second"} {
+		objects = append(objects, &corev1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: name}})
+	}
+	return fake.NewClientBuilder().WithScheme(scheme).WithObjects(objects...)
+}
+
+func TestSystemDefaultsLimitRange(t *testing.T) {
+	r := &PackageReconciler{
+		SystemNamespaceMemoryLimit:   resource.MustParse("4Gi"),
+		SystemNamespaceMemoryRequest: resource.MustParse("32Mi"),
+	}
+
+	lr := r.systemDefaultsLimitRange("cozy-metallb", r.SystemNamespaceMemoryLimit)
+
+	if lr.Name != SystemDefaultsLimitRangeName {
+		t.Errorf("name = %q, want %q", lr.Name, SystemDefaultsLimitRangeName)
+	}
+	if lr.Namespace != "cozy-metallb" {
+		t.Errorf("namespace = %q, want cozy-metallb", lr.Namespace)
+	}
+	if len(lr.Spec.Limits) != 1 {
+		t.Fatalf("len(limits) = %d, want 1", len(lr.Spec.Limits))
+	}
+
+	item := lr.Spec.Limits[0]
+	if item.Type != corev1.LimitTypeContainer {
+		t.Errorf("type = %q, want Container", item.Type)
+	}
+
+	// The default limit is what puts memory.max on the pod cgroup, which is the only
+	// thing that removes a pod from the Talos OOM handler's victim set.
+	if got := item.Default[corev1.ResourceMemory]; got.Cmp(resource.MustParse("4Gi")) != 0 {
+		t.Errorf("default memory = %s, want 4Gi", got.String())
+	}
+	// defaultRequest must be present and small. If it were omitted, Kubernetes would
+	// default each request to the limit and reserve 4Gi per system container.
+	got := item.DefaultRequest[corev1.ResourceMemory]
+	if got.Cmp(resource.MustParse("32Mi")) != 0 {
+		t.Errorf("defaultRequest memory = %s, want 32Mi", got.String())
+	}
+	if wantMax := item.Default[corev1.ResourceMemory]; got.Cmp(wantMax) > 0 {
+		t.Errorf("defaultRequest %s exceeds default %s; the API server rejects such a LimitRange",
+			got.String(), wantMax.String())
+	}
+
+	// Only memory is defaulted. A default CPU limit would throttle system components.
+	if _, ok := item.Default[corev1.ResourceCPU]; ok {
+		t.Error("default sets a CPU limit; only memory should be defaulted")
+	}
+	if _, ok := item.DefaultRequest[corev1.ResourceCPU]; ok {
+		t.Error("defaultRequest sets a CPU request; only memory should be defaulted")
+	}
+}
+
+func TestReconcileSystemDefaultsLimitRangeDisabledRemovesStale(t *testing.T) {
+	scheme := runtime.NewScheme()
+	if err := corev1.AddToScheme(scheme); err != nil {
+		t.Fatalf("add corev1 to scheme: %v", err)
+	}
+
+	// Built through the same constructor the operator applies with, so the object
+	// carries the managed-by label the disabled path keys on.
+	existing := (&PackageReconciler{}).systemDefaultsLimitRange("cozy-metallb", resource.MustParse("4Gi"))
+
+	var deletes int
+	cl := memoryTestClientBuilder(scheme).WithObjects(existing).
+		WithInterceptorFuncs(interceptor.Funcs{
+			Delete: func(ctx context.Context, c client.WithWatch, obj client.Object, opts ...client.DeleteOption) error {
+				deletes++
+				return c.Delete(ctx, obj, opts...)
+			},
+		}).Build()
+
+	// Zero limit means the knob is disabled; a LimitRange from an earlier
+	// configuration must be removed so the setting is reversible.
+	r := &PackageReconciler{Client: cl, Scheme: scheme}
+
+	if err := r.reconcileSystemDefaultsLimitRange(t.Context(), "cozy-metallb"); err != nil {
+		t.Fatalf("reconcile: %v", err)
+	}
+
+	err := cl.Get(t.Context(), types.NamespacedName{
+		Name:      SystemDefaultsLimitRangeName,
+		Namespace: "cozy-metallb",
+	}, &corev1.LimitRange{})
+	if !apierrors.IsNotFound(err) {
+		t.Fatalf("LimitRange still present after disable (err = %v)", err)
+	}
+	if deletes != 1 {
+		t.Fatalf("%d deletes to remove one LimitRange, want 1", deletes)
+	}
+
+	// Disabled is a steady state: this runs for every system namespace on every
+	// Package reconcile. Reconciling again with nothing to delete must stay a no-op
+	// and must not issue a DELETE whose 404 is then swallowed — that is one write
+	// attempt per namespace per reconcile, forever, and all of it in the audit log.
+	if err := r.reconcileSystemDefaultsLimitRange(t.Context(), "cozy-metallb"); err != nil {
+		t.Fatalf("reconcile on absent LimitRange: %v", err)
+	}
+	if deletes != 1 {
+		t.Errorf("%d deletes after reconciling an already-empty namespace, want the original 1; "+
+			"the disabled path must read before it writes", deletes)
+	}
+}
+
+// The name is not reserved. Nothing stops an administrator creating a LimitRange called
+// cozystack-system-defaults by hand, and deleting by name alone would have turning the knob
+// off silently remove policy this operator never wrote. The managed-by label is what
+// separates the two, and it is also the answer if the name is ever taken over by another
+// component.
+func TestReconcileSystemDefaultsLimitRangeDisabledLeavesAForeignObjectAlone(t *testing.T) {
+	scheme := runtime.NewScheme()
+	if err := corev1.AddToScheme(scheme); err != nil {
+		t.Fatalf("add corev1 to scheme: %v", err)
+	}
+
+	foreign := &corev1.LimitRange{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      SystemDefaultsLimitRangeName,
+			Namespace: "cozy-metallb",
+			Labels:    map[string]string{"app.kubernetes.io/managed-by": "some-admin"},
+		},
+		Spec: corev1.LimitRangeSpec{
+			Limits: []corev1.LimitRangeItem{{
+				Type:    corev1.LimitTypeContainer,
+				Default: corev1.ResourceList{corev1.ResourceMemory: resource.MustParse("1Mi")},
+			}},
+		},
+	}
+	cl := memoryTestClientBuilder(scheme).WithObjects(foreign).Build()
+
+	r := &PackageReconciler{Client: cl, Scheme: scheme}
+
+	if err := r.reconcileSystemDefaultsLimitRange(t.Context(), "cozy-metallb"); err != nil {
+		t.Fatalf("reconcile: %v", err)
+	}
+
+	got := &corev1.LimitRange{}
+	if err := cl.Get(t.Context(), types.NamespacedName{
+		Name:      SystemDefaultsLimitRangeName,
+		Namespace: "cozy-metallb",
+	}, got); err != nil {
+		t.Fatalf("a LimitRange this operator did not create was deleted when the knob was disabled: %v", err)
+	}
+	if len(got.Spec.Limits) != 1 || got.Spec.Limits[0].Default.Memory().Cmp(resource.MustParse("1Mi")) != 0 {
+		t.Errorf("foreign LimitRange spec = %+v, want it untouched", got.Spec.Limits)
+	}
+}
+
+// limitRangeScheme builds the scheme the LimitRange reconcile tests share. The scan reads
+// workload pod templates as well as pods, so apps/v1 and batch/v1 have to be registered —
+// the operator gets them from clientgoscheme.AddToScheme in main.go.
+func limitRangeScheme(t *testing.T) *runtime.Scheme {
+	t.Helper()
+	scheme := runtime.NewScheme()
+	if err := corev1.AddToScheme(scheme); err != nil {
+		t.Fatalf("add corev1 to scheme: %v", err)
+	}
+	if err := appsv1.AddToScheme(scheme); err != nil {
+		t.Fatalf("add appsv1 to scheme: %v", err)
+	}
+	if err := batchv1.AddToScheme(scheme); err != nil {
+		t.Fatalf("add batchv1 to scheme: %v", err)
+	}
+	return scheme
+}
+
+// systemPodSpec builds the pod spec every fixture in these tests shares: one container
+// carrying the given memory request and, when limit is non-empty, its own memory limit.
+//
+// The container is named after the object that carries it, so a test asserting which
+// container was reported cannot pass by accident when every fixture carries an
+// identically named container.
+func systemPodSpec(name, request, limit string) corev1.PodSpec {
+	requirements := corev1.ResourceRequirements{
+		Requests: corev1.ResourceList{corev1.ResourceMemory: resource.MustParse(request)},
+	}
+	if limit != "" {
+		requirements.Limits = corev1.ResourceList{corev1.ResourceMemory: resource.MustParse(limit)}
+	}
+	return corev1.PodSpec{
+		Containers: []corev1.Container{{Name: name + "-app", Resources: requirements}},
+	}
+}
+
+// systemPod builds a running pod with a single container carrying the given memory request
+// and, when limit is non-empty, its own memory limit.
+func systemPod(name, request, limit string) *corev1.Pod {
+	return &corev1.Pod{
+		ObjectMeta: metav1.ObjectMeta{Name: name, Namespace: "cozy-monitoring"},
+		Spec:       systemPodSpec(name, request, limit),
+		Status:     corev1.PodStatus{Phase: corev1.PodRunning},
+	}
+}
+
+// systemDeployment builds a Deployment whose pod template carries the given request.
+// replicas is set for real rather than left nil, so a case named for a scaled-to-zero
+// workload is actually scaled to zero.
+func systemDeployment(name string, replicas int32, request, limit string) *appsv1.Deployment {
+	return &appsv1.Deployment{
+		ObjectMeta: metav1.ObjectMeta{Name: name, Namespace: "cozy-monitoring"},
+		Spec: appsv1.DeploymentSpec{
+			Replicas: &replicas,
+			Selector: &metav1.LabelSelector{MatchLabels: map[string]string{"app": name}},
+			Template: corev1.PodTemplateSpec{
+				ObjectMeta: metav1.ObjectMeta{Labels: map[string]string{"app": name}},
+				Spec:       systemPodSpec(name, request, limit),
+			},
+		},
+	}
+}
+
+// systemStatefulSet builds a StatefulSet whose pod template carries the given request.
+func systemStatefulSet(name string, replicas int32, request, limit string) *appsv1.StatefulSet {
+	return &appsv1.StatefulSet{
+		ObjectMeta: metav1.ObjectMeta{Name: name, Namespace: "cozy-monitoring"},
+		Spec: appsv1.StatefulSetSpec{
+			Replicas: &replicas,
+			Selector: &metav1.LabelSelector{MatchLabels: map[string]string{"app": name}},
+			Template: corev1.PodTemplateSpec{
+				ObjectMeta: metav1.ObjectMeta{Labels: map[string]string{"app": name}},
+				Spec:       systemPodSpec(name, request, limit),
+			},
+		},
+	}
+}
+
+// systemDaemonSet builds a DaemonSet whose pod template carries the given request.
+func systemDaemonSet(name, request, limit string) *appsv1.DaemonSet {
+	return &appsv1.DaemonSet{
+		ObjectMeta: metav1.ObjectMeta{Name: name, Namespace: "cozy-monitoring"},
+		Spec: appsv1.DaemonSetSpec{
+			Selector: &metav1.LabelSelector{MatchLabels: map[string]string{"app": name}},
+			Template: corev1.PodTemplateSpec{
+				ObjectMeta: metav1.ObjectMeta{Labels: map[string]string{"app": name}},
+				Spec:       systemPodSpec(name, request, limit),
+			},
+		},
+	}
+}
+
+// systemCronJob builds a CronJob whose job template carries the given request. A CronJob
+// between runs has no pods at all, which is the state the pod scan cannot see.
+func systemCronJob(name, request, limit string) *batchv1.CronJob {
+	return &batchv1.CronJob{
+		ObjectMeta: metav1.ObjectMeta{Name: name, Namespace: "cozy-monitoring"},
+		Spec: batchv1.CronJobSpec{
+			Schedule: "0 * * * *",
+			JobTemplate: batchv1.JobTemplateSpec{
+				Spec: batchv1.JobSpec{
+					Template: corev1.PodTemplateSpec{Spec: systemPodSpec(name, request, limit)},
+				},
+			},
+		},
+	}
+}
+
+// systemJob builds a Job whose pod template carries the given request.
+func systemJob(name, request, limit string) *batchv1.Job {
+	return &batchv1.Job{
+		ObjectMeta: metav1.ObjectMeta{Name: name, Namespace: "cozy-monitoring"},
+		Spec: batchv1.JobSpec{
+			Template: corev1.PodTemplateSpec{Spec: systemPodSpec(name, request, limit)},
+		},
+	}
+}
+
+func limitRangeExists(t *testing.T, cl client.Client, ns string) bool {
+	t.Helper()
+	err := cl.Get(t.Context(), types.NamespacedName{
+		Name:      SystemDefaultsLimitRangeName,
+		Namespace: ns,
+	}, &corev1.LimitRange{})
+	if err == nil {
+		return true
+	}
+	if apierrors.IsNotFound(err) {
+		return false
+	}
+	t.Fatalf("get LimitRange: %v", err)
+	return false
+}
+
+// limitRangeDefaultMemory returns the default container memory limit the operator has
+// applied in ns.
+func limitRangeDefaultMemory(t *testing.T, cl client.Client, ns string) resource.Quantity {
+	t.Helper()
+	lr := &corev1.LimitRange{}
+	if err := cl.Get(t.Context(), types.NamespacedName{
+		Name:      SystemDefaultsLimitRangeName,
+		Namespace: ns,
+	}, lr); err != nil {
+		t.Fatalf("get LimitRange in %s: %v", ns, err)
+	}
+	if len(lr.Spec.Limits) != 1 {
+		t.Fatalf("len(limits) = %d, want 1", len(lr.Spec.Limits))
+	}
+	return lr.Spec.Limits[0].Default[corev1.ResourceMemory]
+}
+
+// The mirror case, and the one that keeps the guard from being a blanket opt-out:
+// LimitRanger never defaults a container that already declares a memory limit, so a
+// large request paired with its own limit cannot be broken by the LimitRange and must
+// not stop the rest of the namespace being protected.
+func TestReconcileSystemDefaultsLimitRangeAppliesWhenLargeRequestCarriesItsOwnLimit(t *testing.T) {
+	scheme := limitRangeScheme(t)
+
+	cl := memoryTestClientBuilder(scheme).
+		WithObjects(systemPod("vmstorage-0", "8Gi", "8Gi")).Build()
+
+	r := &PackageReconciler{
+		Client:                       cl,
+		APIReader:                    cl,
+		Scheme:                       scheme,
+		SystemNamespaceMemoryLimit:   resource.MustParse("4Gi"),
+		SystemNamespaceMemoryRequest: resource.MustParse("32Mi"),
+	}
+
+	if err := r.reconcileSystemDefaultsLimitRange(t.Context(), "cozy-monitoring"); err != nil {
+		t.Fatalf("reconcile: %v", err)
+	}
+
+	if !limitRangeExists(t, cl, "cozy-monitoring") {
+		t.Fatal("LimitRange withheld from a namespace whose only large request declares its own limit")
+	}
+}
+
+// A namespace whose pods cannot be read is a namespace where neither applying nor
+// retracting is a decision the operator is entitled to make, so it must do neither —
+// and it must not report failure either, or a transient API error would fail the whole
+// Package reconcile.
+// A read the scan needs and cannot get is not evidence that applying is safe: every list
+// the scan makes has to fail closed, or the guard becomes a coin toss the first time one
+// kind is unreadable. Each kind gets its own case, because a single unreadable kind is the
+// realistic failure — an RBAC rule that was never extended, a CRD-less API surface, one
+// request that times out — and a scan that swallowed the error for that one kind would
+// still look green on every other.
+func TestReconcileSystemDefaultsLimitRangeSkipsWhenTheScanCannotRead(t *testing.T) {
+	scheme := limitRangeScheme(t)
+	unreadable := []struct {
+		name string
+		list client.ObjectList
+	}{
+		{name: "pods", list: &corev1.PodList{}},
+		{name: "deployments", list: &appsv1.DeploymentList{}},
+		{name: "statefulsets", list: &appsv1.StatefulSetList{}},
+		{name: "daemonsets", list: &appsv1.DaemonSetList{}},
+		{name: "cronjobs", list: &batchv1.CronJobList{}},
+		{name: "jobs", list: &batchv1.JobList{}},
+	}
+	for _, tt := range unreadable {
+		for _, policy := range []string{"owned", "absent", "held-with-ack"} {
+			t.Run(tt.name+"/"+policy, func(t *testing.T) {
+				inject := false
+				injectedFailures := 0
+				cl := memoryTestClientBuilder(scheme).WithInterceptorFuncs(interceptor.Funcs{
+					List: func(ctx context.Context, c client.WithWatch, list client.ObjectList, opts ...client.ListOption) error {
+						if inject && reflect.TypeOf(list) == reflect.TypeOf(tt.list) {
+							injectedFailures++
+							return apierrors.NewServiceUnavailable("etcd leader changed")
+						}
+						return c.List(ctx, list, opts...)
+					},
+				}).Build()
+				if policy == "owned" {
+					// Mere existence cannot distinguish an untouched policy from a blind apply.
+					sentinel := memoryReconciler(cl, "1Mi").systemDefaultsLimitRange("cozy-monitoring", resource.MustParse("1Mi"))
+					if err := cl.Create(t.Context(), sentinel); err != nil {
+						t.Fatal(err)
+					}
+				}
+				if policy == "held-with-ack" {
+					memoryReconcile(t, cl, "32Gi")
+					state := memoryReconcile(t, cl, "4Gi")
+					acknowledgeMemory(t, cl, state.acknowledgement())
+				}
+				beforeNamespace := &corev1.Namespace{}
+				key := types.NamespacedName{Name: "cozy-monitoring"}
+				if err := cl.Get(t.Context(), key, beforeNamespace); err != nil {
+					t.Fatal(err)
+				}
+				beforePolicy := &corev1.LimitRange{}
+				policyKey := types.NamespacedName{Namespace: key.Name, Name: SystemDefaultsLimitRangeName}
+				if err := cl.Get(t.Context(), policyKey, beforePolicy); err != nil && !apierrors.IsNotFound(err) {
+					t.Fatal(err)
+				}
+
+				inject = true
+				if err := memoryReconciler(cl, "4Gi").reconcileSystemDefaultsLimitRange(t.Context(), key.Name); err != nil {
+					t.Fatalf("an unreadable %s list must not fail reconciliation: %v", tt.name, err)
+				}
+				if injectedFailures != 1 {
+					t.Fatalf("injected scan failures = %d; want 1", injectedFailures)
+				}
+				afterPolicy := &corev1.LimitRange{}
+				err := cl.Get(t.Context(), policyKey, afterPolicy)
+				if policy == "owned" {
+					if err != nil {
+						t.Fatalf("existing policy withdrawn after failed scan: %v", err)
+					}
+					if !reflect.DeepEqual(beforePolicy, afterPolicy) {
+						t.Error("existing policy changed after failed scan")
+					}
+				} else if !apierrors.IsNotFound(err) {
+					t.Errorf("absent policy created after failed scan: %v", err)
+				}
+				afterNamespace := &corev1.Namespace{}
+				if err := cl.Get(t.Context(), key, afterNamespace); err != nil {
+					t.Fatal(err)
+				}
+				if !reflect.DeepEqual(beforeNamespace, afterNamespace) {
+					t.Error("failed scan changed Namespace safety state or consumed acknowledgement")
+				}
+			})
+		}
+	}
+}
+
+// scanRecordingClient builds a fake client that records which kinds a reconcile listed and
+// counts the writes it made, so a test can prove which half of the scan ran rather than
+// merely that it reached the same answer.
+func scanRecordingClient(scheme *runtime.Scheme, listed *[]string, writes *int, objects ...client.Object) client.WithWatch {
+	return memoryTestClientBuilder(scheme).WithObjects(objects...).
+		WithInterceptorFuncs(interceptor.Funcs{
+			List: func(ctx context.Context, c client.WithWatch, list client.ObjectList, opts ...client.ListOption) error {
+				*listed = append(*listed, fmt.Sprintf("%T", list))
+				return c.List(ctx, list, opts...)
+			},
+			Patch: func(ctx context.Context, c client.WithWatch, obj client.Object, patch client.Patch, opts ...client.PatchOption) error {
+				if _, ok := obj.(*corev1.LimitRange); ok {
+					*writes++
+				}
+				return c.Patch(ctx, obj, patch, opts...)
+			},
+			Apply: func(ctx context.Context, c client.WithWatch, obj runtime.ApplyConfiguration, opts ...client.ApplyOption) error {
+				*writes++
+				return c.Apply(ctx, obj, opts...)
+			},
+		}).Build()
+}
+
+func listedKind(listed []string, kind string) bool {
+	for _, l := range listed {
+		if strings.Contains(l, kind) {
+			return true
+		}
+	}
+	return false
+}
+
+// The comparison guarding that write has to be semantic rather than structural, or a
+// LimitRange written in a different but equivalent notation would re-apply on every
+// reconcile — invisible in a test that only looked at the resulting object, since every one
+// of those applies produces the same object.
+//
+// The fixture writes the same two quantities in plain bytes: 4294967296 is 4Gi and 33554432
+// is 32Mi, but they parse as DecimalSI where the configured values are BinarySI, so the
+// quantities differ in both format and cached string while comparing equal. Suffixed
+// notation would not do: an API round trip canonicalises 4096Mi to 4Gi, which is
+// structurally identical to the configured value and would pin nothing.
+func TestReconcileSystemDefaultsLimitRangeDoesNotReapplyEquivalentQuantities(t *testing.T) {
+	scheme := limitRangeScheme(t)
+
+	// Carries the managed-by label, because this fixture stands for an object the
+	// reconciler wrote itself; without it the case would be re-applied over the missing
+	// label and stop saying anything about how quantities compare.
+	settled := &corev1.LimitRange{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      SystemDefaultsLimitRangeName,
+			Namespace: "cozy-monitoring",
+			Labels:    map[string]string{managedByLabel: packageControllerFieldOwner},
+		},
+		Spec: corev1.LimitRangeSpec{
+			Limits: []corev1.LimitRangeItem{{
+				Type:           corev1.LimitTypeContainer,
+				Default:        corev1.ResourceList{corev1.ResourceMemory: resource.MustParse("4294967296")},
+				DefaultRequest: corev1.ResourceList{corev1.ResourceMemory: resource.MustParse("33554432")},
+			}},
+		},
+	}
+
+	var listed []string
+	var writes int
+	cl := scanRecordingClient(scheme, &listed, &writes, settled)
+
+	r := &PackageReconciler{
+		Client:                       cl,
+		APIReader:                    cl,
+		Scheme:                       scheme,
+		SystemNamespaceMemoryLimit:   resource.MustParse("4Gi"),
+		SystemNamespaceMemoryRequest: resource.MustParse("32Mi"),
+	}
+
+	if err := r.reconcileSystemDefaultsLimitRange(t.Context(), "cozy-monitoring"); err != nil {
+		t.Fatalf("reconcile: %v", err)
+	}
+
+	if writes != 0 {
+		t.Errorf("%d writes against 4294967296/33554432, which is the configured 4Gi/32Mi in plain bytes; "+
+			"the spec comparison must be semantic, not structural", writes)
+	}
+}
+
+// ForceOwnership requires an owned object. Conditional Create on the absent path
+// returns AlreadyExists for a concurrent foreign object instead of adopting it.
+func TestReconcileSystemDefaultsLimitRangeForcesOnlyAnOwnedObject(t *testing.T) {
+	scheme := limitRangeScheme(t)
+
+	for _, tt := range []struct {
+		name      string
+		seed      client.Object
+		wantForce bool
+	}{
+		{name: "create path is non-force"},
+		{
+			name: "owned update is forced",
+			seed: (&PackageReconciler{
+				SystemNamespaceMemoryRequest: resource.MustParse("32Mi"),
+			}).systemDefaultsLimitRange("cozy-monitoring", resource.MustParse("4Gi")),
+			wantForce: true,
+		},
+	} {
+		t.Run(tt.name, func(t *testing.T) {
+			builder := memoryTestClientBuilder(scheme)
+			if tt.seed != nil {
+				builder = builder.WithObjects(tt.seed)
+			}
+
+			var applyCalls int
+			var gotOptions client.ApplyOptions
+			cl := builder.WithInterceptorFuncs(interceptor.Funcs{
+				Apply: func(ctx context.Context, c client.WithWatch, obj runtime.ApplyConfiguration, opts ...client.ApplyOption) error {
+					applyCalls++
+					gotOptions.ApplyOptions(opts)
+					return c.Apply(ctx, obj, opts...)
+				},
+			}).Build()
+
+			r := &PackageReconciler{
+				Client:                       cl,
+				APIReader:                    cl,
+				Scheme:                       scheme,
+				SystemNamespaceMemoryLimit:   resource.MustParse("32Gi"),
+				SystemNamespaceMemoryRequest: resource.MustParse("32Mi"),
+			}
+			if err := r.reconcileSystemDefaultsLimitRange(t.Context(), "cozy-monitoring"); err != nil {
+				t.Fatalf("reconcile: %v", err)
+			}
+
+			if !tt.wantForce {
+				if applyCalls != 0 {
+					t.Fatal("absent object must use conditional Create, not SSA")
+				}
+				if !limitRangeExists(t, cl, "cozy-monitoring") {
+					t.Fatal("Create did not write the LimitRange")
+				}
+				return
+			}
+			if applyCalls != 1 {
+				t.Fatalf("Apply calls = %d, want 1", applyCalls)
+			}
+			gotForce := gotOptions.Force != nil && *gotOptions.Force
+			if gotForce != tt.wantForce {
+				t.Errorf("ForceOwnership = %v, want %v", gotForce, tt.wantForce)
+			}
+			if gotOptions.FieldManager != packageControllerFieldOwner {
+				t.Errorf("field manager = %q, want %q", gotOptions.FieldManager, packageControllerFieldOwner)
+			}
+		})
+	}
+}
+
+// The tenant boundary. It is one strings.HasPrefix, and everything downstream of it depends
+// on it holding: packages/apps/tenant ships tenant-range-limits, which defaults container
+// memory to 128Mi in every tenant namespace with resourceQuotas. A system LimitRange landing
+// beside it would leave two LimitRanges defaulting the same containers, and which one wins
+// is decided by the order LimitRanger happens to iterate them — neither chart controls that,
+// so a tenant container's default memory limit would move between 128Mi and 4Gi with nothing
+// in the tree changing.
+//
+// The system namespace in the same run is the positive control: without it the test would
+// still pass if LimitRanges stopped being written anywhere at all.
+func TestReconcileNamespacesLeavesTenantNamespacesAlone(t *testing.T) {
+	scheme := limitRangeScheme(t)
+	if err := cozyv1alpha1.AddToScheme(scheme); err != nil {
+		t.Fatalf("add cozyv1alpha1 to scheme: %v", err)
+	}
+
+	cl := memoryTestClientBuilder(scheme).Build()
+
+	r := &PackageReconciler{
+		Client:                       cl,
+		APIReader:                    cl,
+		Scheme:                       scheme,
+		SystemNamespaceMemoryLimit:   resource.MustParse("4Gi"),
+		SystemNamespaceMemoryRequest: resource.MustParse("32Mi"),
+	}
+
+	pkg := &cozyv1alpha1.Package{ObjectMeta: metav1.ObjectMeta{Name: "platform"}}
+	variant := &cozyv1alpha1.Variant{
+		Name: "default",
+		Components: []cozyv1alpha1.Component{
+			{Name: "metallb", Install: &cozyv1alpha1.ComponentInstall{Namespace: "cozy-metallb"}},
+			{Name: "tenant", Install: &cozyv1alpha1.ComponentInstall{Namespace: "tenant-root"}},
+		},
+	}
+
+	if err := r.reconcileNamespaces(t.Context(), pkg, variant); err != nil {
+		t.Fatalf("reconcileNamespaces: %v", err)
+	}
+
+	if limitRangeExists(t, cl, "tenant-root") {
+		t.Error("system defaults LimitRange written into a tenant namespace; it would compete with " +
+			"the tenant chart's tenant-range-limits for the same containers")
+	}
+	if !limitRangeExists(t, cl, "cozy-metallb") {
+		t.Fatal("no LimitRange in the system namespace either, so the tenant assertion above proves nothing")
+	}
+
+	tenantNS := &corev1.Namespace{}
+	if err := cl.Get(t.Context(), types.NamespacedName{Name: "tenant-root"}, tenantNS); err != nil {
+		t.Fatalf("tenant namespace was not created: %v", err)
+	}
+	if got, ok := tenantNS.Labels["cozystack.io/system"]; ok {
+		t.Errorf("tenant namespace carries cozystack.io/system = %q; the same boundary gates both", got)
+	}
+}
+
+// Disable is global even though namespace reconciliation starts from one Package's target
+// set. A stale managed object in a namespace that left that set must be swept, while the
+// managed-by label keeps a same-named administrator object outside the delete boundary.
+func TestReconcileNamespacesDisabledSweepsManagedLimitRanges(t *testing.T) {
+	scheme := limitRangeScheme(t)
+	if err := cozyv1alpha1.AddToScheme(scheme); err != nil {
+		t.Fatalf("add cozyv1alpha1 to scheme: %v", err)
+	}
+
+	builder := &PackageReconciler{}
+	active := builder.systemDefaultsLimitRange("cozy-active", resource.MustParse("4Gi"))
+	orphaned := builder.systemDefaultsLimitRange("cozy-orphaned", resource.MustParse("4Gi"))
+	foreign := &corev1.LimitRange{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      SystemDefaultsLimitRangeName,
+			Namespace: "cozy-foreign",
+			Labels:    map[string]string{managedByLabel: "some-admin"},
+		},
+	}
+
+	var deletes int
+	var perNamespaceGets int
+	cl := memoryTestClientBuilder(scheme).WithObjects(active, orphaned, foreign).
+		WithInterceptorFuncs(interceptor.Funcs{
+			Get: func(ctx context.Context, c client.WithWatch, key client.ObjectKey, obj client.Object, opts ...client.GetOption) error {
+				if _, ok := obj.(*corev1.LimitRange); ok {
+					perNamespaceGets++
+				}
+				return c.Get(ctx, key, obj, opts...)
+			},
+			Delete: func(ctx context.Context, c client.WithWatch, obj client.Object, opts ...client.DeleteOption) error {
+				deletes++
+				return c.Delete(ctx, obj, opts...)
+			},
+		}).Build()
+
+	r := &PackageReconciler{Client: cl, APIReader: cl, Scheme: scheme}
+	pkg := &cozyv1alpha1.Package{ObjectMeta: metav1.ObjectMeta{Name: "platform"}}
+	variant := &cozyv1alpha1.Variant{
+		Name: "default",
+		Components: []cozyv1alpha1.Component{{
+			Name:    "active",
+			Install: &cozyv1alpha1.ComponentInstall{Namespace: "cozy-active"},
+		}},
+	}
+
+	if err := r.reconcileNamespaces(t.Context(), pkg, variant); err != nil {
+		t.Fatalf("reconcileNamespaces: %v", err)
+	}
+	if perNamespaceGets != 2 {
+		t.Errorf("disabled reconcile made %d ownership reads, want one fresh read per managed object", perNamespaceGets)
+	}
+	if deletes != 2 {
+		t.Errorf("deleted %d LimitRanges, want the 2 managed objects", deletes)
+	}
+	if limitRangeExists(t, cl, "cozy-active") {
+		t.Error("managed LimitRange in the active target namespace survived disable")
+	}
+	if limitRangeExists(t, cl, "cozy-orphaned") {
+		t.Error("managed LimitRange outside the active target set survived disable")
+	}
+	if !limitRangeExists(t, cl, "cozy-foreign") {
+		t.Error("same-named LimitRange without the operator's ownership label was deleted")
+	}
+}
+
+// One failed deletion must not stop the sweep before it reaches the remaining namespaces.
+// The helper returns the aggregate so the caller can log it, while still removing every
+// object the API server lets it remove on this pass.
+func TestDeleteManagedSystemDefaultsLimitRangesContinuesAfterDeleteFailure(t *testing.T) {
+	scheme := limitRangeScheme(t)
+	builder := &PackageReconciler{}
+	first := builder.systemDefaultsLimitRange("cozy-first", resource.MustParse("4Gi"))
+	second := builder.systemDefaultsLimitRange("cozy-second", resource.MustParse("4Gi"))
+
+	var deleteCalls int
+	var failedKey, deletedKey types.NamespacedName
+	cl := memoryTestClientBuilder(scheme).WithObjects(first, second).
+		WithInterceptorFuncs(interceptor.Funcs{
+			Delete: func(ctx context.Context, c client.WithWatch, obj client.Object, opts ...client.DeleteOption) error {
+				deleteCalls++
+				key := client.ObjectKeyFromObject(obj)
+				if deleteCalls == 1 {
+					failedKey = key
+					return apierrors.NewForbidden(corev1.Resource("limitranges"), obj.GetName(), fmt.Errorf("denied by policy"))
+				}
+				deletedKey = key
+				return c.Delete(ctx, obj, opts...)
+			},
+		}).Build()
+
+	r := &PackageReconciler{Client: cl, APIReader: cl, Scheme: scheme}
+	err := r.deleteManagedSystemDefaultsLimitRanges(t.Context())
+	if err == nil {
+		t.Fatal("sweep returned nil after a managed LimitRange deletion failed")
+	}
+	if deleteCalls != 2 {
+		t.Fatalf("sweep attempted %d deletes, want 2; a failed delete must not stop the loop", deleteCalls)
+	}
+	if failedKey.Name == "" || !strings.Contains(err.Error(), failedKey.Namespace+"/"+failedKey.Name) {
+		t.Errorf("error %q does not identify the LimitRange whose deletion failed", err)
+	}
+	if err := cl.Get(t.Context(), failedKey, &corev1.LimitRange{}); err != nil {
+		t.Fatalf("the object whose deletion failed disappeared: %v", err)
+	}
+	if err := cl.Get(t.Context(), deletedKey, &corev1.LimitRange{}); !apierrors.IsNotFound(err) {
+		t.Fatalf("the object after the failed deletion was not removed (err = %v)", err)
+	}
+}
+
+// LimitRange cleanup is opportunistic and must not stop namespace creation when its
+// cluster-wide List is temporarily unavailable.
+func TestReconcileNamespacesSurvivesDisabledLimitRangeSweepFailure(t *testing.T) {
+	scheme := limitRangeScheme(t)
+	if err := cozyv1alpha1.AddToScheme(scheme); err != nil {
+		t.Fatalf("add cozyv1alpha1 to scheme: %v", err)
+	}
+
+	cl := memoryTestClientBuilder(scheme).
+		WithInterceptorFuncs(interceptor.Funcs{
+			List: func(ctx context.Context, c client.WithWatch, list client.ObjectList, opts ...client.ListOption) error {
+				if _, ok := list.(*corev1.LimitRangeList); ok {
+					return apierrors.NewServiceUnavailable("etcd leader changed")
+				}
+				return c.List(ctx, list, opts...)
+			},
+		}).Build()
+
+	r := &PackageReconciler{Client: cl, APIReader: cl, Scheme: scheme}
+	pkg := &cozyv1alpha1.Package{ObjectMeta: metav1.ObjectMeta{Name: "platform"}}
+	variant := &cozyv1alpha1.Variant{
+		Name: "default",
+		Components: []cozyv1alpha1.Component{{
+			Name:    "active",
+			Install: &cozyv1alpha1.ComponentInstall{Namespace: "cozy-active"},
+		}},
+	}
+
+	if err := r.reconcileNamespaces(t.Context(), pkg, variant); err != nil {
+		t.Fatalf("a failed LimitRange sweep must not fail namespace reconciliation: %v", err)
+	}
+	if err := cl.Get(t.Context(), types.NamespacedName{Name: "cozy-active"}, &corev1.Namespace{}); err != nil {
+		t.Fatalf("namespace was not created after the LimitRange sweep failed: %v", err)
+	}
+}
+
+// The load-bearing containment property: this feature is opportunistic hardening, so no
+// failure inside it may stop a system namespace being reconciled. A namespace that never
+// appears leaves its components uninstalled, which is worse than the unbounded memory the
+// LimitRange is there to bound.
+func TestReconcileNamespacesSurvivesLimitRangeFailure(t *testing.T) {
+	scheme := limitRangeScheme(t)
+	if err := cozyv1alpha1.AddToScheme(scheme); err != nil {
+		t.Fatalf("add cozyv1alpha1 to scheme: %v", err)
+	}
+
+	var rejected int
+	cl := memoryTestClientBuilder(scheme).
+		WithInterceptorFuncs(interceptor.Funcs{
+			Create: func(ctx context.Context, c client.WithWatch, obj client.Object, opts ...client.CreateOption) error {
+				if _, ok := obj.(*corev1.LimitRange); ok {
+					rejected++
+					return apierrors.NewForbidden(
+						corev1.Resource("limitranges"), SystemDefaultsLimitRangeName,
+						fmt.Errorf("denied by policy"))
+				}
+				return c.Create(ctx, obj, opts...)
+			},
+		}).Build()
+
+	r := &PackageReconciler{
+		Client:                       cl,
+		APIReader:                    cl,
+		Scheme:                       scheme,
+		SystemNamespaceMemoryLimit:   resource.MustParse("4Gi"),
+		SystemNamespaceMemoryRequest: resource.MustParse("32Mi"),
+	}
+
+	pkg := &cozyv1alpha1.Package{ObjectMeta: metav1.ObjectMeta{Name: "platform"}}
+	variant := &cozyv1alpha1.Variant{
+		Name: "default",
+		Components: []cozyv1alpha1.Component{{
+			Name:    "metallb",
+			Install: &cozyv1alpha1.ComponentInstall{Namespace: "cozy-metallb"},
+		}},
+	}
+
+	if err := r.reconcileNamespaces(t.Context(), pkg, variant); err != nil {
+		t.Fatalf("a rejected LimitRange must not fail namespace reconciliation: %v", err)
+	}
+	if rejected != 1 {
+		t.Fatalf("injected LimitRange Create failures = %d, want 1", rejected)
+	}
+
+	ns := &corev1.Namespace{}
+	if err := cl.Get(t.Context(), types.NamespacedName{Name: "cozy-metallb"}, ns); err != nil {
+		t.Fatalf("namespace was not created: %v", err)
+	}
+	if ns.Labels["cozystack.io/system"] != "true" {
+		t.Errorf("system label = %q, want true", ns.Labels["cozystack.io/system"])
+	}
+}
+
+func TestFindRequestAboveDefaultLimit(t *testing.T) {
+	scheme := limitRangeScheme(t)
+	controller := true
+
+	terminated := systemPod("migrate-once", "8Gi", "")
+	terminated.Status.Phase = corev1.PodSucceeded
+
+	// Failed is NOT skipped, and needs its own fixture to pin that. An eviction or a
+	// node crash leaves one of these holding the oversized request, its controller
+	// recreates it, and dropping the ceiling meanwhile rejects the replacement for good.
+	crashed := systemPod("crashed-once", "9Gi", "")
+	crashed.Status.Phase = corev1.PodFailed
+
+	initHeavy := systemPod("with-init", "16Mi", "")
+	initHeavy.Spec.InitContainers = []corev1.Container{{
+		Name: "prepare",
+		Resources: corev1.ResourceRequirements{
+			Requests: corev1.ResourceList{corev1.ResourceMemory: resource.MustParse("6Gi")},
+		},
+	}}
+
+	finishedJob := systemJob("migrated-once", "8Gi", "")
+	finishedJob.UID = types.UID("migrated-once-uid")
+	finishedJob.Status.Conditions = []batchv1.JobCondition{{
+		Type:   batchv1.JobComplete,
+		Status: corev1.ConditionTrue,
+	}}
+	failedFinishedJobPod := systemPod("migrated-once-failed", "9Gi", "")
+	failedFinishedJobPod.Status.Phase = corev1.PodFailed
+	failedFinishedJobPod.OwnerReferences = []metav1.OwnerReference{{
+		APIVersion: "batch/v1",
+		Kind:       "Job",
+		Name:       finishedJob.Name,
+		UID:        finishedJob.UID,
+		Controller: &controller,
+	}}
+	nonControllingFinishedJobPod := systemPod("mentions-migrated-once", "10Gi", "")
+	nonControllingFinishedJobPod.Status.Phase = corev1.PodFailed
+	nonControllingFinishedJobPod.OwnerReferences = []metav1.OwnerReference{{
+		APIVersion: "batch/v1",
+		Kind:       "Job",
+		Name:       finishedJob.Name,
+		UID:        finishedJob.UID,
+	}}
+
+	failedJob := systemJob("gave-up", "8Gi", "")
+	failedJob.UID = types.UID("gave-up-uid")
+	failedJob.Status.Conditions = []batchv1.JobCondition{{
+		Type:   batchv1.JobFailed,
+		Status: corev1.ConditionTrue,
+	}}
+	failedFailedJobPod := systemPod("gave-up-failed", "9Gi", "")
+	failedFailedJobPod.Status.Phase = corev1.PodFailed
+	failedFailedJobPod.OwnerReferences = []metav1.OwnerReference{{
+		APIVersion: "batch/v1",
+		Kind:       "Job",
+		Name:       failedJob.Name,
+		UID:        failedJob.UID,
+		Controller: &controller,
+	}}
+
+	activeJob := systemJob("retrying-migration", "1Gi", "")
+	activeJob.UID = types.UID("retrying-migration-uid")
+	failedActiveJobPod := systemPod("retrying-migration-failed", "9Gi", "")
+	failedActiveJobPod.Status.Phase = corev1.PodFailed
+	failedActiveJobPod.OwnerReferences = []metav1.OwnerReference{{
+		APIVersion: "batch/v1",
+		Kind:       "Job",
+		Name:       activeJob.Name,
+		UID:        activeJob.UID,
+		Controller: &controller,
+	}}
+
+	suspended := true
+	suspendedCronJob := systemCronJob("suspended-backup", "7Gi", "")
+	suspendedCronJob.Spec.Suspend = &suspended
+
+	tests := []struct {
+		name    string
+		objects []client.Object
+		want    *memoryRequestBlocker
+	}{
+		{
+			name:    "no request above the limit",
+			objects: []client.Object{systemPod("metallb-speaker", "512Mi", "")},
+		},
+		{
+			name:    "a request equal to the limit is admissible",
+			objects: []client.Object{systemPod("exactly-at", "4Gi", "")},
+		},
+		{
+			// A pod that ran to completion is never recreated from this spec,
+			// so it cannot block admission of anything.
+			name:    "a succeeded pod does not count",
+			objects: []client.Object{terminated},
+		},
+		{
+			// A Failed pod does count. It is frequently the only surviving
+			// evidence that the namespace must keep its default withheld, because
+			// the shape this scan looks for cannot be admitted once the namespace
+			// has settled, so an evicted carcass is all that is left to find.
+			name:    "a failed pod still counts",
+			objects: []client.Object{crashed},
+			want: &memoryRequestBlocker{
+				workload:  "Pod/crashed-once",
+				container: "crashed-once-app",
+				request:   resource.MustParse("9Gi"),
+			},
+		},
+		{
+			// LimitRanger defaults init containers on the same terms as
+			// regular ones, so the scan has to look at both.
+			name:    "an init container counts",
+			objects: []client.Object{initHeavy},
+			want: &memoryRequestBlocker{
+				workload:  "Pod/with-init",
+				container: "prepare",
+				request:   resource.MustParse("6Gi"),
+			},
+		},
+		{
+			// Three offenders, and the largest is deliberately neither the first
+			// nor the last one the scan sees: pods are listed in name order, so
+			// vmselect-0 sits in the middle. Together with asserting all three
+			// reported fields, that is what pins the comparison — keeping the
+			// first, the last or the smallest offender instead of the largest
+			// each names a different pod and quantity here.
+			name: "the largest offender is reported",
+			objects: []client.Object{
+				systemPod("vmagent-0", "5Gi", ""),
+				systemPod("vmselect-0", "9Gi", ""),
+				systemPod("vmstorage-0", "6Gi", ""),
+			},
+			want: &memoryRequestBlocker{
+				workload:  "Pod/vmselect-0",
+				container: "vmselect-0-app",
+				request:   resource.MustParse("9Gi"),
+			},
+		},
+		{
+			// The gap a pod-only scan leaves: at replicas: 0 there is no pod to
+			// find, so the namespace looks safe, and the request reappears at the
+			// moment somebody scales the workload up and its pod is rejected.
+			name:    "a scaled-to-zero deployment counts",
+			objects: []client.Object{systemDeployment("vmalert", 0, "8Gi", "")},
+			want: &memoryRequestBlocker{
+				workload:  "Deployment/vmalert",
+				container: "vmalert-app",
+				request:   resource.MustParse("8Gi"),
+			},
+		},
+		{
+			name:    "a scaled-to-zero statefulset counts",
+			objects: []client.Object{systemStatefulSet("vmstorage", 0, "8Gi", "")},
+			want: &memoryRequestBlocker{
+				workload:  "StatefulSet/vmstorage",
+				container: "vmstorage-app",
+				request:   resource.MustParse("8Gi"),
+			},
+		},
+		{
+			// A DaemonSet has no replica count to zero out, but it has no pods
+			// either while no node matches it, and its template is still what the
+			// next matching node instantiates.
+			name:    "a daemonset template counts",
+			objects: []client.Object{systemDaemonSet("node-exporter", "6Gi", "")},
+			want: &memoryRequestBlocker{
+				workload:  "DaemonSet/node-exporter",
+				container: "node-exporter-app",
+				request:   resource.MustParse("6Gi"),
+			},
+		},
+		{
+			// A CronJob between runs has no pods at all, and the next schedule
+			// creates one from this template.
+			name:    "a cronjob between runs counts",
+			objects: []client.Object{systemCronJob("backup", "7Gi", "")},
+			want: &memoryRequestBlocker{
+				workload:  "CronJob/backup",
+				container: "backup-app",
+				request:   resource.MustParse("7Gi"),
+			},
+		},
+		{
+			// suspend is the same dormancy as replicas: 0 and is undone the same
+			// way, so it does not earn an exemption the Deployment case does not get.
+			name:    "a suspended cronjob counts",
+			objects: []client.Object{suspendedCronJob},
+			want: &memoryRequestBlocker{
+				workload:  "CronJob/suspended-backup",
+				container: "suspended-backup-app",
+				request:   resource.MustParse("7Gi"),
+			},
+		},
+		{
+			// A Job created standalone — a Helm hook, a migration — has no owner
+			// whose template would cover it, and one with spec.suspend has no pods
+			// yet either.
+			name:    "a job that has not run counts",
+			objects: []client.Object{systemJob("migrate", "5Gi", "")},
+			want: &memoryRequestBlocker{
+				workload:  "Job/migrate",
+				container: "migrate-app",
+				request:   resource.MustParse("5Gi"),
+			},
+		},
+		{
+			// A completed Job never creates another pod, for the same reason a
+			// terminated pod is skipped.
+			name:    "a finished job does not count",
+			objects: []client.Object{finishedJob},
+		},
+		{
+			// The failed child cannot outlive the finished Job as evidence: the
+			// controller has definitively stopped and will not replace it.
+			name:    "a failed pod owned by a finished job does not count",
+			objects: []client.Object{finishedJob, failedFinishedJobPod},
+		},
+		{
+			// Exhausting the Job's retries is just as terminal as completing it:
+			// neither its template nor its last failed child can create another pod.
+			name:    "a failed pod owned by a job that gave up does not count",
+			objects: []client.Object{failedJob, failedFailedJobPod},
+		},
+		{
+			// An owner reference that does not mark the Job as this pod's controller
+			// says nothing about whether another controller will replace the pod.
+			name:    "a non-controlling finished job reference does not hide a failed pod",
+			objects: []client.Object{finishedJob, nonControllingFinishedJobPod},
+			want: &memoryRequestBlocker{
+				workload:  "Pod/mentions-migrated-once",
+				container: "mentions-migrated-once-app",
+				request:   resource.MustParse("10Gi"),
+			},
+		},
+		{
+			// A failed child of an unfinished Job is still the only evidence of
+			// admission-time mutation that may recur on the next retry.
+			name:    "a failed pod owned by an unfinished job still counts",
+			objects: []client.Object{activeJob, failedActiveJobPod},
+			want: &memoryRequestBlocker{
+				workload:  "Pod/retrying-migration-failed",
+				container: "retrying-migration-failed-app",
+				request:   resource.MustParse("9Gi"),
+			},
+		},
+		{
+			// A running workload appears twice, as a template and as pods. One
+			// blocker comes back, and it names the workload: that is the object an
+			// operator has to edit, and it outlives the pod names.
+			name: "a workload and its own pods are reported once, as the workload",
+			objects: []client.Object{
+				systemDeployment("vmselect", 2, "8Gi", ""),
+				systemPod("vmselect-6d4b", "8Gi", ""),
+			},
+			want: &memoryRequestBlocker{
+				workload:  "Deployment/vmselect",
+				container: "vmselect-app",
+				request:   resource.MustParse("8Gi"),
+			},
+		},
+		{
+			// The mirror case, and why live pods are still scanned. Not because
+			// a webhook raised the request after the template was rendered:
+			// LimitRanger defaults the limit before any webhook or policy plugin
+			// runs, so a pod one of them touched arrives here already carrying a
+			// limit and is skipped. What is left is a pod admitted before the
+			// LimitRange existed, or one its controller built from a custom
+			// resource no template in this scan can show — either can ask for
+			// more than any template in the namespace admits to.
+			name: "a request raised on the live pod outranks its template",
+			objects: []client.Object{
+				systemDeployment("vmselect", 2, "5Gi", ""),
+				systemPod("vmselect-6d4b", "9Gi", ""),
+			},
+			want: &memoryRequestBlocker{
+				workload:  "Pod/vmselect-6d4b",
+				container: "vmselect-6d4b-app",
+				request:   resource.MustParse("9Gi"),
+			},
+		},
+		{
+			// Every kind the scan reads, all of them under the limit: the
+			// LimitRange has to stay applicable in the ordinary case.
+			name: "workloads below the limit do not block",
+			objects: []client.Object{
+				systemDeployment("grafana", 1, "512Mi", ""),
+				systemStatefulSet("vlogs", 1, "1Gi", ""),
+				systemDaemonSet("node-exporter", "64Mi", ""),
+				systemCronJob("backup", "256Mi", ""),
+				systemJob("migrate", "128Mi", ""),
+				systemPod("grafana-6d4b", "512Mi", ""),
+			},
+		},
+		{
+			// LimitRanger never defaults a container that declares its own memory
+			// limit, in a template exactly as in a pod.
+			name:    "a template request that carries its own limit does not count",
+			objects: []client.Object{systemDeployment("vmstorage", 1, "8Gi", "8Gi")},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			cl := memoryTestClientBuilder(scheme).WithObjects(tt.objects...).Build()
+			r := &PackageReconciler{
+				Client:                     cl,
+				APIReader:                  cl,
+				Scheme:                     scheme,
+				SystemNamespaceMemoryLimit: resource.MustParse("4Gi"),
+			}
+
+			got, err := r.findRequestAboveDefaultLimit(t.Context(), "cozy-monitoring")
+			if err != nil {
+				t.Fatalf("findRequestAboveDefaultLimit: %v", err)
+			}
+
+			if tt.want == nil {
+				if got != nil {
+					t.Fatalf("reported %s container %s (%s) as blocking; nothing should block here",
+						got.workload, got.container, got.request.String())
+				}
+				return
+			}
+			if got == nil {
+				t.Fatal("no blocker reported; a container that cannot be admitted under the default was missed")
+			}
+			if got.workload != tt.want.workload || got.container != tt.want.container ||
+				got.request.Cmp(tt.want.request) != 0 {
+				t.Errorf("blocker = %s container %s (%s), want %s container %s (%s)",
+					got.workload, got.container, got.request.String(),
+					tt.want.workload, tt.want.container, tt.want.request.String())
+			}
+		})
+	}
+}
+
+// foreignLimitRange builds an administrator's own LimitRange, constraining whichever
+// resource and limit kind the case is about.
+func foreignLimitRange(name string, limitType corev1.LimitType, field, resourceName, value string) *corev1.LimitRange {
+	item := corev1.LimitRangeItem{Type: limitType}
+	quantities := corev1.ResourceList{corev1.ResourceName(resourceName): resource.MustParse(value)}
+	switch field {
+	case "default":
+		item.Default = quantities
+	case "defaultRequest":
+		item.DefaultRequest = quantities
+	case "max":
+		item.Max = quantities
+	case "min":
+		item.Min = quantities
+	case "ratio":
+		item.MaxLimitRequestRatio = quantities
+	}
+	return &corev1.LimitRange{
+		ObjectMeta: metav1.ObjectMeta{Name: name, Namespace: "cozy-monitoring"},
+		Spec:       corev1.LimitRangeSpec{Limits: []corev1.LimitRangeItem{item}},
+	}
+}
+
+// Two LimitRanges defaulting container memory in one namespace leave the effective ceiling
+// to the order LimitRanger iterates them, which is the hazard this feature cites to keep
+// itself out of tenant namespaces. It does not stop being one in a system namespace.
+func TestReconcileSystemDefaultsLimitRangeStaysOutOfANamespaceAnotherLimitRangeGoverns(t *testing.T) {
+	scheme := limitRangeScheme(t)
+
+	admin := foreignLimitRange("platform-defaults", corev1.LimitTypeContainer, "default", "memory", "512Mi")
+	var listed []string
+	var writes int
+	cl := scanRecordingClient(scheme, &listed, &writes, admin)
+
+	r := &PackageReconciler{
+		Client:                       cl,
+		APIReader:                    cl,
+		Scheme:                       scheme,
+		SystemNamespaceMemoryLimit:   resource.MustParse("32Gi"),
+		SystemNamespaceMemoryRequest: resource.MustParse("32Mi"),
+	}
+
+	if err := r.reconcileSystemDefaultsLimitRange(t.Context(), "cozy-monitoring"); err != nil {
+		t.Fatalf("reconcile: %v", err)
+	}
+
+	err := cl.Get(t.Context(), types.NamespacedName{
+		Name:      SystemDefaultsLimitRangeName,
+		Namespace: "cozy-monitoring",
+	}, &corev1.LimitRange{})
+	if !apierrors.IsNotFound(err) {
+		t.Errorf("wrote a second container memory default beside %q (err = %v)", admin.Name, err)
+	}
+	if writes != 0 {
+		t.Errorf("%d writes into a namespace another LimitRange already governs, want none", writes)
+	}
+}
+
+// The sharper half of the same guard. This reconciler writes a default and no max, so an
+// administrator's max below the configured default would have every container that declares
+// no limit of its own rejected: the default is written first, then validated against the max
+// it exceeds. That takes out the whole namespace, and it reaches kube-system.
+func TestReconcileSystemDefaultsLimitRangeStaysUnderAForeignContainerMemoryMax(t *testing.T) {
+	scheme := limitRangeScheme(t)
+
+	admin := foreignLimitRange("tight-ceiling", corev1.LimitTypeContainer, "max", "memory", "2Gi")
+	cl := memoryTestClientBuilder(scheme).WithObjects(admin).Build()
+
+	r := &PackageReconciler{
+		Client:                       cl,
+		APIReader:                    cl,
+		Scheme:                       scheme,
+		SystemNamespaceMemoryLimit:   resource.MustParse("32Gi"),
+		SystemNamespaceMemoryRequest: resource.MustParse("32Mi"),
+	}
+
+	if err := r.reconcileSystemDefaultsLimitRange(t.Context(), "cozy-monitoring"); err != nil {
+		t.Fatalf("reconcile: %v", err)
+	}
+
+	err := cl.Get(t.Context(), types.NamespacedName{
+		Name:      SystemDefaultsLimitRangeName,
+		Namespace: "cozy-monitoring",
+	}, &corev1.LimitRange{})
+	if !apierrors.IsNotFound(err) {
+		t.Errorf("defaulted 32Gi into a namespace capped at 2Gi, which rejects every container "+
+			"that declares no limit of its own (err = %v)", err)
+	}
+}
+
+// A foreign LimitRange appearing after this one was already applied has to be resolved by
+// withdrawing, not by sitting beside it: the object this reconciler wrote is half of the
+// ambiguity, so leaving it is leaving the hazard.
+func TestReconcileSystemDefaultsLimitRangeWithdrawsWhenAForeignPolicyAppears(t *testing.T) {
+	scheme := limitRangeScheme(t)
+
+	ours := (&PackageReconciler{
+		SystemNamespaceMemoryRequest: resource.MustParse("32Mi"),
+	}).systemDefaultsLimitRange("cozy-monitoring", resource.MustParse("32Gi"))
+	admin := foreignLimitRange("platform-defaults", corev1.LimitTypeContainer, "default", "memory", "512Mi")
+	cl := memoryTestClientBuilder(scheme).WithObjects(ours, admin).Build()
+
+	r := &PackageReconciler{
+		Client:                       cl,
+		APIReader:                    cl,
+		Scheme:                       scheme,
+		SystemNamespaceMemoryLimit:   resource.MustParse("32Gi"),
+		SystemNamespaceMemoryRequest: resource.MustParse("32Mi"),
+	}
+
+	if err := r.reconcileSystemDefaultsLimitRange(t.Context(), "cozy-monitoring"); err != nil {
+		t.Fatalf("reconcile: %v", err)
+	}
+
+	err := cl.Get(t.Context(), types.NamespacedName{
+		Name:      SystemDefaultsLimitRangeName,
+		Namespace: "cozy-monitoring",
+	}, &corev1.LimitRange{})
+	if !apierrors.IsNotFound(err) {
+		t.Errorf("kept its own default beside %q (err = %v)", admin.Name, err)
+	}
+
+	// The administrator's object is not this reconciler's to touch, in either direction.
+	if err := cl.Get(t.Context(), types.NamespacedName{
+		Name:      admin.Name,
+		Namespace: "cozy-monitoring",
+	}, &corev1.LimitRange{}); err != nil {
+		t.Errorf("removed the administrator's own LimitRange: %v", err)
+	}
+}
+
+// The guard is narrow on the resource and broad on everything else, and both halves need
+// pinning. A LimitRange bounding cpu is no business of this reconciler and must coexist,
+// or the guard becomes a blanket opt-out any unrelated policy can trip.
+func TestReconcileSystemDefaultsLimitRangeIgnoresLimitRangesThatDoNotTouchMemory(t *testing.T) {
+	scheme := limitRangeScheme(t)
+	pvcPolicy := foreignLimitRange("pvc-policy", corev1.LimitTypePersistentVolumeClaim, "max", "memory", "2Gi")
+	pvcPolicy.Spec.Limits[0].Max[corev1.ResourceStorage] = resource.MustParse("1Ti")
+
+	for _, tc := range []struct {
+		name    string
+		foreign *corev1.LimitRange
+	}{
+		{"container cpu default", foreignLimitRange("cpu-policy", corev1.LimitTypeContainer, "default", "cpu", "500m")},
+		{"container cpu max", foreignLimitRange("cpu-ceiling", corev1.LimitTypeContainer, "max", "cpu", "2")},
+		{"pod cpu max", foreignLimitRange("pod-cpu", corev1.LimitTypePod, "max", "cpu", "4")},
+		{"persistent volume claim memory max", pvcPolicy},
+	} {
+		t.Run(tc.name, func(t *testing.T) {
+			cl := memoryTestClientBuilder(scheme).WithObjects(tc.foreign).Build()
+
+			r := &PackageReconciler{
+				Client:                       cl,
+				APIReader:                    cl,
+				Scheme:                       scheme,
+				SystemNamespaceMemoryLimit:   resource.MustParse("32Gi"),
+				SystemNamespaceMemoryRequest: resource.MustParse("32Mi"),
+			}
+
+			if err := r.reconcileSystemDefaultsLimitRange(t.Context(), "cozy-monitoring"); err != nil {
+				t.Fatalf("reconcile: %v", err)
+			}
+
+			if got := limitRangeDefaultMemory(t, cl, "cozy-monitoring"); got.Cmp(resource.MustParse("32Gi")) != 0 {
+				t.Errorf("default memory = %s, want the configured 32Gi; %q says nothing about memory "+
+					"and must not withhold it", got.String(), tc.foreign.Name)
+			}
+		})
+	}
+}
+
+// The other half. Every memory-bearing field withholds, at either scope, because each one
+// can reject the pods this reconciler's own default and defaultRequest would produce:
+//
+//   - a container max below the default, or a min above the defaultRequest, rejects directly;
+//   - a maxLimitRequestRatio rejects because 32Gi against 32Mi is a ratio of 1024:1;
+//   - a Pod-scoped bound cannot even be evaluated here, since whether a per-container default
+//     breaches it depends on how many containers a pod that does not exist yet will have.
+//
+// The last one is why this is an ownership rule and not arithmetic. Checking only the fields
+// whose collision is computable leaves the namespace-wide rejection reachable through the
+// fields whose collision is not.
+func TestReconcileSystemDefaultsLimitRangeWithholdsForAnyForeignMemoryPolicy(t *testing.T) {
+	scheme := limitRangeScheme(t)
+
+	for _, tc := range []struct {
+		name    string
+		foreign *corev1.LimitRange
+	}{
+		{"container memory default", foreignLimitRange("mem-default", corev1.LimitTypeContainer, "default", "memory", "512Mi")},
+		{"container memory defaultRequest", foreignLimitRange("mem-defreq", corev1.LimitTypeContainer, "defaultRequest", "memory", "64Mi")},
+		{"container memory max", foreignLimitRange("mem-max", corev1.LimitTypeContainer, "max", "memory", "2Gi")},
+		{"container memory min", foreignLimitRange("mem-min", corev1.LimitTypeContainer, "min", "memory", "128Mi")},
+		{"container memory ratio", foreignLimitRange("mem-ratio", corev1.LimitTypeContainer, "ratio", "memory", "4")},
+		{"pod memory max", foreignLimitRange("pod-mem-max", corev1.LimitTypePod, "max", "memory", "2Gi")},
+		{"pod memory min", foreignLimitRange("pod-mem-min", corev1.LimitTypePod, "min", "memory", "1Gi")},
+	} {
+		t.Run(tc.name, func(t *testing.T) {
+			cl := memoryTestClientBuilder(scheme).WithObjects(tc.foreign).Build()
+
+			r := &PackageReconciler{
+				Client:                       cl,
+				APIReader:                    cl,
+				Scheme:                       scheme,
+				SystemNamespaceMemoryLimit:   resource.MustParse("32Gi"),
+				SystemNamespaceMemoryRequest: resource.MustParse("32Mi"),
+			}
+
+			if err := r.reconcileSystemDefaultsLimitRange(t.Context(), "cozy-monitoring"); err != nil {
+				t.Fatalf("reconcile: %v", err)
+			}
+
+			err := cl.Get(t.Context(), types.NamespacedName{
+				Name:      SystemDefaultsLimitRangeName,
+				Namespace: "cozy-monitoring",
+			}, &corev1.LimitRange{})
+			if !apierrors.IsNotFound(err) {
+				t.Errorf("wrote a container memory default beside %q, which already constrains memory (err = %v)",
+					tc.foreign.Name, err)
+			}
+		})
+	}
+}
+
+// Identity is the managed-by label, not the name. The name is not reserved, so an
+// administrator's LimitRange can legitimately be called cozystack-system-defaults. This
+// fixture deliberately says nothing about memory: a differently named cpu policy coexists,
+// but an object holding this exact name cannot coexist, and the forced apply must not replace
+// its atomic Limits list merely because the memory-policy guard has no reason to notice it.
+func TestReconcileSystemDefaultsLimitRangeDoesNotOverwriteAForeignObjectSharingItsName(t *testing.T) {
+	scheme := limitRangeScheme(t)
+
+	foreign := &corev1.LimitRange{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      SystemDefaultsLimitRangeName,
+			Namespace: "kube-system",
+			// No managed-by label: this is not ours.
+		},
+		Spec: corev1.LimitRangeSpec{
+			Limits: []corev1.LimitRangeItem{{
+				Type:    corev1.LimitTypeContainer,
+				Default: corev1.ResourceList{corev1.ResourceCPU: resource.MustParse("200m")},
+			}},
+		},
+	}
+	cl := memoryTestClientBuilder(scheme).WithObjects(foreign).Build()
+
+	r := &PackageReconciler{
+		Client:                       cl,
+		APIReader:                    cl,
+		Scheme:                       scheme,
+		SystemNamespaceMemoryLimit:   resource.MustParse("32Gi"),
+		SystemNamespaceMemoryRequest: resource.MustParse("32Mi"),
+	}
+
+	if err := r.reconcileSystemDefaultsLimitRange(t.Context(), "kube-system"); err != nil {
+		t.Fatalf("reconcile: %v", err)
+	}
+
+	got := &corev1.LimitRange{}
+	if err := cl.Get(t.Context(), types.NamespacedName{
+		Name:      SystemDefaultsLimitRangeName,
+		Namespace: "kube-system",
+	}, got); err != nil {
+		t.Fatalf("get: %v", err)
+	}
+	if len(got.Spec.Limits) != 1 {
+		t.Fatalf("len(limits) = %d, want the administrator's single item untouched", len(got.Spec.Limits))
+	}
+	if _, ok := got.Spec.Limits[0].Default[corev1.ResourceCPU]; !ok {
+		t.Errorf("the administrator's cpu default was replaced; spec = %+v", got.Spec.Limits[0])
+	}
+	if _, ok := got.Spec.Limits[0].Default[corev1.ResourceMemory]; ok {
+		t.Errorf("the operator's memory default was merged into the administrator's object; spec = %+v", got.Spec.Limits[0])
+	}
+	if got.Labels[managedByLabel] == packageControllerFieldOwner {
+		t.Errorf("stamped this reconciler's managed-by label onto an object it did not create, "+
+			"which would then let the disable path delete it; labels = %v", got.Labels)
+	}
+}
+
+// A same-named LimitRange without this reconciler's label is ambiguous by construction: it is
+// either an administrator's object, or one of ours whose label was removed, and nothing here
+// can tell those apart. The two mistakes are not symmetric. Adopting it means the disable path
+// later deletes an administrator's policy, silently. Leaving it means a namespace keeps a
+// default this reconciler no longer manages, which still carries the memory.max the feature
+// exists to provide and is now said out loud in the log.
+//
+// So the ambiguous object is treated as foreign: not overwritten, not adopted, not deleted.
+// This replaces an earlier case that asserted the label was re-stamped, which was the adopting
+// behaviour, before it was clear that the same code path reaches an administrator's object.
+func TestReconcileSystemDefaultsLimitRangeLeavesAnUnlabelledSameNamedObjectAlone(t *testing.T) {
+	scheme := limitRangeScheme(t)
+
+	stripped := (&PackageReconciler{
+		SystemNamespaceMemoryRequest: resource.MustParse("32Mi"),
+	}).systemDefaultsLimitRange("cozy-monitoring", resource.MustParse("4Gi"))
+	stripped.Labels = nil
+
+	var listed []string
+	var writes int
+	cl := scanRecordingClient(scheme, &listed, &writes, stripped)
+
+	r := &PackageReconciler{
+		Client:                       cl,
+		APIReader:                    cl,
+		Scheme:                       scheme,
+		SystemNamespaceMemoryLimit:   resource.MustParse("32Gi"),
+		SystemNamespaceMemoryRequest: resource.MustParse("32Mi"),
+	}
+
+	if err := r.reconcileSystemDefaultsLimitRange(t.Context(), "cozy-monitoring"); err != nil {
+		t.Fatalf("reconcile: %v", err)
+	}
+
+	got := &corev1.LimitRange{}
+	if err := cl.Get(t.Context(), types.NamespacedName{
+		Name:      SystemDefaultsLimitRangeName,
+		Namespace: "cozy-monitoring",
+	}, got); err != nil {
+		t.Fatalf("the ambiguous object was deleted: %v", err)
+	}
+	if d := got.Spec.Limits[0].Default[corev1.ResourceMemory]; d.Cmp(resource.MustParse("4Gi")) != 0 {
+		t.Errorf("default memory = %s, want the object left at its own 4Gi rather than rewritten to 32Gi", d.String())
+	}
+	if got.Labels[managedByLabel] == packageControllerFieldOwner {
+		t.Error("adopted the object by stamping the managed-by label; the disable path would then delete it")
+	}
+	if writes != 0 {
+		t.Errorf("%d writes against an object of ambiguous ownership, want none", writes)
+	}
+}
+
+// The shape this default cannot be applied over, and what happens instead.
+//
+// A container requesting more than the configured limit with no limit of its own would be
+// defaulted that limit and then rejected for requesting more than it, so the namespace is
+// left without a default rather than given one that stops its pods. Withholding fails in the
+// safe direction: no memory.max is how every release before this behaved, while a default
+// below a request is a namespace that cannot start the workload at all.
+func TestReconcileSystemDefaultsLimitRangeWithholdsFromAnOversizedRequest(t *testing.T) {
+	scheme := limitRangeScheme(t)
+
+	for _, tc := range []struct {
+		name    string
+		seeded  bool
+		blocker client.Object
+	}{
+		{"nothing written yet", false, systemPod("keycloak-db-1", "8Gi", "")},
+		{"a default already written, which has to be withdrawn", true, systemPod("keycloak-db-1", "8Gi", "")},
+		{"the blocker is a workload template with no pods", false, systemDeployment("vmstorage", 0, "9Gi", "")},
+	} {
+		t.Run(tc.name, func(t *testing.T) {
+			objects := []client.Object{tc.blocker}
+			if tc.seeded {
+				objects = append(objects, (&PackageReconciler{
+					SystemNamespaceMemoryRequest: resource.MustParse("32Mi"),
+				}).systemDefaultsLimitRange("cozy-monitoring", resource.MustParse("4Gi")))
+			}
+			cl := memoryTestClientBuilder(scheme).WithObjects(objects...).Build()
+
+			r := &PackageReconciler{
+				Client:                       cl,
+				APIReader:                    cl,
+				Scheme:                       scheme,
+				SystemNamespaceMemoryLimit:   resource.MustParse("4Gi"),
+				SystemNamespaceMemoryRequest: resource.MustParse("32Mi"),
+			}
+
+			if err := r.reconcileSystemDefaultsLimitRange(t.Context(), "cozy-monitoring"); err != nil {
+				t.Fatalf("reconcile: %v", err)
+			}
+
+			err := cl.Get(t.Context(), types.NamespacedName{
+				Name:      SystemDefaultsLimitRangeName,
+				Namespace: "cozy-monitoring",
+			}, &corev1.LimitRange{})
+			if !apierrors.IsNotFound(err) {
+				t.Errorf("namespace holds a default beside a request above it, which rejects that "+
+					"workload at admission (err = %v)", err)
+			}
+		})
+	}
+}
+
+// Deleting a Pod can be a controller recreation gap. An empty scan cannot release its hold.
+func TestReconcileSystemDefaultsLimitRangeHoldsAfterTheOversizedRequestDisappears(t *testing.T) {
+	scheme := limitRangeScheme(t)
+
+	blocker := systemPod("keycloak-db-1", "8Gi", "")
+	cl := memoryTestClientBuilder(scheme).WithObjects(blocker).Build()
+
+	r := &PackageReconciler{
+		Client:                       cl,
+		APIReader:                    cl,
+		Scheme:                       scheme,
+		SystemNamespaceMemoryLimit:   resource.MustParse("4Gi"),
+		SystemNamespaceMemoryRequest: resource.MustParse("32Mi"),
+	}
+
+	if err := r.reconcileSystemDefaultsLimitRange(t.Context(), "cozy-monitoring"); err != nil {
+		t.Fatalf("reconcile while withheld: %v", err)
+	}
+	if err := cl.Get(t.Context(), types.NamespacedName{
+		Name:      SystemDefaultsLimitRangeName,
+		Namespace: "cozy-monitoring",
+	}, &corev1.LimitRange{}); !apierrors.IsNotFound(err) {
+		t.Fatalf("expected the namespace withheld, got err = %v", err)
+	}
+
+	if err := cl.Delete(t.Context(), blocker); err != nil {
+		t.Fatalf("delete the blocker: %v", err)
+	}
+	if err := r.reconcileSystemDefaultsLimitRange(t.Context(), "cozy-monitoring"); err != nil {
+		t.Fatalf("reconcile after the blocker went: %v", err)
+	}
+	if limitRangeExists(t, cl, "cozy-monitoring") {
+		t.Fatal("empty scan silently released the memory hold")
+	}
+}
diff --git a/internal/operator/packagesource_privileged_test.go b/internal/operator/packagesource_privileged_test.go
new file mode 100644
index 0000000000..ace1b4bc7a
--- /dev/null
+++ b/internal/operator/packagesource_privileged_test.go
@@ -0,0 +1,100 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright 2025 The Cozystack Authors.
+
+package operator
+
+import (
+	"context"
+	"testing"
+
+	sourcewatcherv1beta1 "github.com/fluxcd/source-watcher/api/v2/v1beta1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/types"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/client/fake"
+
+	cozyv1alpha1 "github.com/cozystack/cozystack/api/v1alpha1"
+	"github.com/cozystack/cozystack/internal/marketplace/naming"
+	"github.com/cozystack/cozystack/internal/marketplace/tapconst"
+)
+
+// tapPrivilegedPS builds a PackageSource whose default variant has one
+// privileged component ("op") and one benign component ("web"). When tap is
+// true the source carries the marketplace-tap label, marking it a tap-managed
+// source whose privileged content is withheld until the registration is
+// confirmed.
+func tapPrivilegedPS(tap bool) *cozyv1alpha1.PackageSource {
+	ps := &cozyv1alpha1.PackageSource{
+		ObjectMeta: metav1.ObjectMeta{Name: "demo.app"},
+		Spec: cozyv1alpha1.PackageSourceSpec{
+			SourceRef: &cozyv1alpha1.PackageSourceRef{Kind: "OCIRepository", Name: "tap-demo-app", Namespace: "cozy-system"},
+			Variants: []cozyv1alpha1.Variant{{
+				Name: "default",
+				Components: []cozyv1alpha1.Component{
+					{Name: "op", Path: "sys/op", Install: &cozyv1alpha1.ComponentInstall{Namespace: "cozy-op", Privileged: true}},
+					{Name: "web", Path: "apps/web", Install: &cozyv1alpha1.ComponentInstall{Namespace: "cozy-web"}},
+				},
+			}},
+		},
+	}
+	if tap {
+		ps.Labels = map[string]string{tapconst.Label: "true"}
+	}
+	return ps
+}
+
+func agArtifactNames(t *testing.T, cl client.Client) map[string]bool {
+	t.Helper()
+	var ag sourcewatcherv1beta1.ArtifactGenerator
+	if err := cl.Get(context.Background(), types.NamespacedName{Name: "demo.app", Namespace: "cozy-system"}, &ag); err != nil {
+		t.Fatalf("get ArtifactGenerator: %v", err)
+	}
+	names := map[string]bool{}
+	for _, oa := range ag.Spec.OutputArtifacts {
+		names[oa.Name] = true
+	}
+	return names
+}
+
+// The ExternalArtifact is what the helm-controller upgrades a HelmRelease from,
+// independently of the Package reconciler. Withholding the privileged
+// component's artifact until the registration is confirmed narrows the window in
+// which unconfirmed privileged content could reach the cluster. The benign
+// component's artifact is always produced (it carries the catalog registration),
+// and a non-tap (platform) source is never gated.
+func TestReconcileArtifactGeneratorsWithholdsUnconfirmedPrivileged(t *testing.T) {
+	opName := naming.ArtifactName("demo.app", "default", "op")
+	webName := naming.ArtifactName("demo.app", "default", "web")
+
+	cases := []struct {
+		name      string
+		tapSource bool
+		pkg       *cozyv1alpha1.Package
+		wantOp    bool
+	}{
+		{"tap source, no registration Package", true, nil, false},
+		{"tap source, unconfirmed registration", true, &cozyv1alpha1.Package{ObjectMeta: metav1.ObjectMeta{Name: "demo.app", Labels: map[string]string{tapconst.Label: "true"}}}, false},
+		{"tap source, confirmed registration", true, &cozyv1alpha1.Package{ObjectMeta: metav1.ObjectMeta{Name: "demo.app"}}, true},
+		{"non-tap platform source", false, nil, true},
+	}
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			objs := []client.Object{tapPrivilegedPS(tc.tapSource)}
+			if tc.pkg != nil {
+				objs = append(objs, tc.pkg)
+			}
+			cl := fake.NewClientBuilder().WithScheme(testScheme(t)).WithObjects(objs...).Build()
+			r := &PackageSourceReconciler{Client: cl, Scheme: testScheme(t)}
+			if err := r.reconcileArtifactGenerators(context.Background(), tapPrivilegedPS(tc.tapSource)); err != nil {
+				t.Fatalf("reconcileArtifactGenerators: %v", err)
+			}
+			names := agArtifactNames(t, cl)
+			if !names[webName] {
+				t.Errorf("benign component artifact %q must always be produced", webName)
+			}
+			if names[opName] != tc.wantOp {
+				t.Errorf("privileged component artifact %q: produced=%v, want %v", opName, names[opName], tc.wantOp)
+			}
+		})
+	}
+}
diff --git a/internal/operator/packagesource_reconciler.go b/internal/operator/packagesource_reconciler.go
index e79370bdd7..49241c9766 100644
--- a/internal/operator/packagesource_reconciler.go
+++ b/internal/operator/packagesource_reconciler.go
@@ -19,9 +19,15 @@ package operator
 import (
 	"context"
 	"fmt"
+	"maps"
+	"strconv"
 	"strings"
+	"time"
 
 	cozyv1alpha1 "github.com/cozystack/cozystack/api/v1alpha1"
+	"github.com/cozystack/cozystack/internal/marketplace/collision"
+	"github.com/cozystack/cozystack/internal/marketplace/naming"
+	"github.com/cozystack/cozystack/internal/marketplace/tapconst"
 	sourcewatcherv1beta1 "github.com/fluxcd/source-watcher/api/v2/v1beta1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/api/meta"
@@ -31,9 +37,70 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/client/apiutil"
+	"sigs.k8s.io/controller-runtime/pkg/handler"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 )
 
+// Constants tuning the workaround for fluxcd/pkg#934 (patch.Helper split-write
+// race in source-watcher v2.1.0). See the block comment on
+// maybeRecoverArtifactGenerator for the mechanism.
+//
+// Version-skew note. Comments in this file reference upstream source-watcher
+// internals by exact file:line (e.g. `drift.go:52`, `controller.go:164/254`).
+// Those anchors are for the DEPLOYED source-watcher binary, currently pinned
+// to v2.1.0 at `internal/fluxinstall/manifests/fluxcd.yaml`. The Go module
+// dependency in `go.mod` (`github.com/fluxcd/source-watcher/api/v2 v2.0.3`)
+// only pulls the CRD types package — behavioural code lives in the deployed
+// binary. When the flux distribution bumps source-watcher, re-verify the
+// line anchors AND the watch predicate (`ReconcileRequestedPredicate`) and
+// drift-detection heuristics against the new version — those are the
+// load-bearing upstream assumptions this workaround stands on.
+//
+// The schedule is deliberately conservative:
+//
+//   - `stuckGracePeriod = 30s` — source-watcher normally settles an
+//     ArtifactGenerator in under 10s once it takes the drifted branch, so a
+//     30s Unknown window comfortably distinguishes a real stall from a
+//     legitimate in-flight rebuild.
+//   - `initialBackoff = 30s`, `maxBackoff = 4m`, `maxRecoveryAttempts = 5` —
+//     exponential 30s + 60s + 2m + 4m + 4m gives ~11.5m of total budget
+//     before we give up, safely inside the 15m upstream HelmRelease install
+//     timeout so a real stall surfaces as SourceWatcherStalled rather than
+//     silently timing out an install.
+//
+// HA note: the retry driver stores its state (attempt counter, last-force
+// timestamp) as annotations on the ArtifactGenerator itself, so a single
+// replica converges deterministically. Running cozystack-operator with
+// multiple replicas WITHOUT leader election will let both replicas race on
+// annotation writes, corrupting the counter and the elapsed-time math. Deploy
+// this operator with `--leader-elect=true` (or replicas=1).
+const (
+	stuckGracePeriod    = 30 * time.Second
+	initialBackoff      = 30 * time.Second
+	maxBackoff          = 4 * time.Minute
+	maxRecoveryAttempts = 5
+
+	annotationFluxRequestedAt  = "reconcile.fluxcd.io/requestedAt"
+	annotationRecoveryAttempts = "cozystack.io/source-watcher-recovery-attempts"
+	annotationLastRecoveryAt   = "cozystack.io/source-watcher-last-recovery-at"
+	// annotationVerifiedGeneration records the last AG generation for which a
+	// rebuild was forced after source-watcher first reported it Ready; see
+	// verifyArtifactGeneratorGeneration.
+	annotationVerifiedGeneration = "cozystack.io/source-watcher-verified-generation"
+
+	reasonAwaitingRecovery = "AwaitingSourceWatcherRecovery"
+	reasonSourceWatcherBad = "SourceWatcherStalled"
+	// reasonRecoveryForced is the Reason we stamp on the AG's Ready condition
+	// when forcing drift. Kept as a constant because updateStatus needs to
+	// recognise its own writes reflecting back through the Owns() watch and
+	// skip the not-stuck / clearRecoveryTracking path for them (see B2 in
+	// lexfrei's review on PR #3182).
+	reasonRecoveryForced = "SourceWatcherRecoveryForced"
+)
+
+// nowFunc is overridable in tests; production code always uses time.Now.
+var nowFunc = time.Now
+
 // PackageSourceReconciler reconciles PackageSource resources
 type PackageSourceReconciler struct {
 	client.Client
@@ -57,19 +124,32 @@ func (r *PackageSourceReconciler) Reconcile(ctx context.Context, req ctrl.Reques
 		return ctrl.Result{}, err
 	}
 
+	// Skip work on objects that are already being torn down. Without this
+	// guard the retry driver could keep writing annotations to an
+	// ArtifactGenerator whose owning PackageSource is about to be garbage
+	// collected, and Status().Update below would leave a misleading
+	// "AwaitingSourceWatcherRecovery" condition on a doomed object.
+	// ownerReference cascade takes care of the actual AG cleanup.
+	if !packageSource.DeletionTimestamp.IsZero() {
+		return ctrl.Result{}, nil
+	}
+
 	// Generate ArtifactGenerator for package source
 	if err := r.reconcileArtifactGenerators(ctx, packageSource); err != nil {
 		logger.Error(err, "failed to reconcile ArtifactGenerator")
 		return ctrl.Result{}, err
 	}
 
-	// Update PackageSource status (variants and conditions from ArtifactGenerator)
-	if err := r.updateStatus(ctx, packageSource); err != nil {
-		logger.Error(err, "failed to update status")
-		// Don't return error, status update is not critical
-	}
-
-	return ctrl.Result{}, nil
+	// Update PackageSource status (variants and conditions from ArtifactGenerator).
+	// The status update may schedule a follow-up reconcile via RequeueAfter when
+	// it detects a source-watcher status-patch stall and needs to wait for the
+	// next backoff window; that Result is honoured on the way out. `now` is
+	// threaded down as a single sample so the whole reconcile agrees on one
+	// wall-clock reading. Errors from updateStatus are propagated so
+	// controller-runtime's exponential backoff can retry transient failures —
+	// swallowing them would drop force-drift or backoff-schedule writes on the
+	// floor and leave the retry driver in a stale state.
+	return r.updateStatus(ctx, packageSource, nowFunc())
 }
 
 // reconcileArtifactGenerators generates a single ArtifactGenerator for the package source
@@ -91,6 +171,28 @@ func (r *PackageSourceReconciler) reconcileArtifactGenerators(ctx context.Contex
 	// Collect all OutputArtifacts
 	outputArtifacts := []sourcewatcherv1beta1.OutputArtifact{}
 
+	// Withhold a tap source's PRIVILEGED component artifacts until the registration
+	// Package is confirmed, so the helm-controller has no privileged content to
+	// upgrade a HelmRelease from. This narrows, but does not fully close, the window
+	// in which a benign component flipped to privileged in a new revision could be
+	// materialised by source-watcher before this reconciler removes it from the
+	// generator (see issue #4359); the Package reconciler's install-site and
+	// cleanup gates are the other best-effort layers. The registration Package
+	// shares the PackageSource's name; `cozypkg add --allow-privileged` sheds the
+	// tap label on it, and a Package watch re-runs this generation. Non-tap
+	// (platform) sources carry no marketplace-tap label and are never gated.
+	privilegedConfirmed := true
+	if packageSource.GetLabels()[tapconst.Label] == "true" {
+		privilegedConfirmed = false
+		var regPkg cozyv1alpha1.Package
+		err := r.Get(ctx, types.NamespacedName{Name: packageSource.Name}, &regPkg)
+		if err == nil {
+			privilegedConfirmed = collision.PrivilegedConfirmed(&regPkg)
+		} else if !apierrors.IsNotFound(err) {
+			return err
+		}
+	}
+
 	// Process all variants and their components
 	for _, variant := range packageSource.Spec.Variants {
 		// Build library map for this variant
@@ -119,6 +221,14 @@ func (r *PackageSourceReconciler) reconcileArtifactGenerators(ctx context.Contex
 
 			logger.V(1).Info("processing component", "packageSource", packageSource.Name, "variant", variant.Name, "component", component.Name, "path", component.Path)
 
+			// Withhold a privileged component's artifact until the registration is
+			// confirmed, so the helm-controller has no content to upgrade a
+			// HelmRelease to. See privilegedConfirmed above.
+			if component.Install != nil && component.Install.Privileged && !privilegedConfirmed {
+				logger.Info("withholding privileged component artifact until registration is confirmed", "packageSource", packageSource.Name, "variant", variant.Name, "component", component.Name)
+				continue
+			}
+
 			// Extract component name from path (last component)
 			componentPathName := r.getPackageNameFromPath(component.Path)
 			if componentPathName == "" {
@@ -160,12 +270,11 @@ func (r *PackageSourceReconciler) reconcileArtifactGenerators(ctx context.Contex
 				})
 			}
 
-			// Artifact name: <packagesource>-<variant>-<componentname>
-			// Replace dots with dashes to comply with Kubernetes naming requirements
-			artifactName := fmt.Sprintf("%s-%s-%s",
-				strings.ReplaceAll(packageSource.Name, ".", "-"),
-				strings.ReplaceAll(variant.Name, ".", "-"),
-				strings.ReplaceAll(component.Name, ".", "-"))
+			// Artifact name: <packagesource>-<variant>-<componentname>, dots
+			// replaced by dashes to comply with Kubernetes naming. This is the
+			// single definition shared with the marketplace backend and the
+			// validator via internal/marketplace/naming.
+			artifactName := naming.ArtifactName(packageSource.Name, variant.Name, component.Name)
 
 			outputArtifacts = append(outputArtifacts, sourcewatcherv1beta1.OutputArtifact{
 				Name: artifactName,
@@ -327,8 +436,14 @@ func (r *PackageSourceReconciler) createOrUpdate(ctx context.Context, obj client
 	return r.Patch(ctx, obj, client.Apply, client.FieldOwner("cozystack-packagesource-controller"))
 }
 
-// updateStatus updates PackageSource status (variants and conditions from ArtifactGenerator)
-func (r *PackageSourceReconciler) updateStatus(ctx context.Context, packageSource *cozyv1alpha1.PackageSource) error {
+// updateStatus updates PackageSource status (variants and conditions from
+// ArtifactGenerator). It may return a Result with RequeueAfter set when the
+// ArtifactGenerator's upstream Ready condition is stuck and the reconciler is
+// driving source-watcher through a bounded requeue schedule; see
+// maybeRecoverArtifactGenerator for the strategy. `now` is passed by the
+// caller so every time-sensitive check inside this reconcile agrees on the
+// same wall-clock reading.
+func (r *PackageSourceReconciler) updateStatus(ctx context.Context, packageSource *cozyv1alpha1.PackageSource, now time.Time) (ctrl.Result, error) {
 	logger := log.FromContext(ctx)
 
 	// Update variants in status from spec
@@ -342,12 +457,13 @@ func (r *PackageSourceReconciler) updateStatus(ctx context.Context, packageSourc
 	if packageSource.Spec.SourceRef == nil {
 		// Set status to unknown if SourceRef is not set
 		meta.SetStatusCondition(&packageSource.Status.Conditions, metav1.Condition{
-			Type:    "Ready",
-			Status:  metav1.ConditionUnknown,
-			Reason:  "SourceRefNotSet",
-			Message: "SourceRef is not configured",
+			Type:               "Ready",
+			Status:             metav1.ConditionUnknown,
+			Reason:             "SourceRefNotSet",
+			Message:            "SourceRef is not configured",
+			ObservedGeneration: packageSource.Generation,
 		})
-		return r.Status().Update(ctx, packageSource)
+		return ctrl.Result{}, r.Status().Update(ctx, packageSource)
 	}
 
 	// Get ArtifactGenerator
@@ -361,27 +477,106 @@ func (r *PackageSourceReconciler) updateStatus(ctx context.Context, packageSourc
 		if apierrors.IsNotFound(err) {
 			// ArtifactGenerator not found, set status to unknown
 			meta.SetStatusCondition(&packageSource.Status.Conditions, metav1.Condition{
-				Type:    "Ready",
-				Status:  metav1.ConditionUnknown,
-				Reason:  "ArtifactGeneratorNotFound",
-				Message: "ArtifactGenerator not found",
+				Type:               "Ready",
+				Status:             metav1.ConditionUnknown,
+				Reason:             "ArtifactGeneratorNotFound",
+				Message:            "ArtifactGenerator not found",
+				ObservedGeneration: packageSource.Generation,
 			})
-			return r.Status().Update(ctx, packageSource)
+			return ctrl.Result{}, r.Status().Update(ctx, packageSource)
 		}
-		return fmt.Errorf("failed to get ArtifactGenerator: %w", err)
+		return ctrl.Result{}, fmt.Errorf("failed to get ArtifactGenerator: %w", err)
 	}
 
 	// Find Ready condition in ArtifactGenerator
 	readyCondition := meta.FindStatusCondition(ag.Status.Conditions, "Ready")
+
+	// Route to the recovery state machine if any of the following holds:
+	//
+	//   (a) the AG's Ready condition carries our own reasonRecoveryForced
+	//       marker (Owns(&ArtifactGenerator{}) re-firing on the writes
+	//       from forceArtifactGeneratorDrift, or a still-un-reacted force
+	//       from a previous reconcile);
+	//   (b) recovery is already in progress (attempts > 0) and source-
+	//       watcher has moved off our marker into Progressing
+	//       (Ready=Unknown on the current generation) — the rebuild write
+	//       cycle after taking the drifted branch;
+	//   (c) the AG has been sitting in the fluxcd/pkg#934 stall signature
+	//       (Inventory populated + digest set + Ready=Unknown / absent past
+	//       grace) — the classic first-time stuck-detection path.
+	//
+	// All three funnel into maybeRecoverArtifactGenerator so its
+	// decideRecovery state machine is the single arbiter of "wait vs
+	// re-force vs give up". Splitting (a) and (b) into a separate
+	// wait-forever helper would trap us in a tight requeue loop if
+	// source-watcher never responds — the state machine's Wait branch is
+	// bounded by the same backoff schedule that drives Force, so
+	// exhaustion always surfaces SourceWatcherStalled honestly.
+	//
+	// Signals for (a) and (b) are exact: reasonRecoveryForced is only ever
+	// written by forceArtifactGeneratorDrift, so any Ready condition
+	// carrying it is necessarily our own reflection; the attempts counter
+	// is only ever set by that same function. Neither is observable from
+	// outside this reconciler.
+	//
+	// Asymmetric ObservedGeneration handling — deliberate, not oversight.
+	// `isProgressingInRecovery` requires `ObservedGeneration == Generation`
+	// so a Progressing condition left over from a previous spec cycle does
+	// NOT match the pattern (the AG is being rebuilt against fresh spec —
+	// no need to hold tracking around a stale Progressing). `isOwnMarker`
+	// does NOT check ObservedGeneration on purpose: if we wrote our
+	// marker at gen=N and the user then edits PS spec so AG.generation=N+1,
+	// our marker sits with `condition.ObservedGeneration=N`. That marker
+	// is stale, but we must still route through the state machine on it
+	// rather than falling into the not-stuck / clearRecoveryTracking
+	// branch — otherwise the copy-through path would leak our synthetic
+	// Ready=False/SourceWatcherRecoveryForced onto the PackageSource
+	// (exactly the B2 bug this whole gate exists to prevent).
+	// source-watcher's GenerationChangedPredicate fires on the AG's own
+	// generation bump, so the rebuild is triggered regardless of our
+	// marker's staleness — one wasted attempt in the worst case, and the
+	// state machine's Wait branch usually absorbs it without incrementing.
+	attempts, _ := readRecoveryTracking(ag)
+	isOwnMarker := readyCondition != nil && readyCondition.Reason == reasonRecoveryForced
+	isProgressingInRecovery := attempts > 0 && readyCondition != nil &&
+		readyCondition.Status == metav1.ConditionUnknown &&
+		readyCondition.ObservedGeneration == ag.Generation
+	if isOwnMarker || isProgressingInRecovery || artifactGeneratorStuck(ag, readyCondition, now) {
+		logger.V(1).Info("routing to recovery state machine",
+			"packageSource", packageSource.Name,
+			"artifactGenerator", ag.Name,
+			"attempts", attempts,
+			"ownMarker", isOwnMarker,
+			"progressingInRecovery", isProgressingInRecovery)
+		return r.maybeRecoverArtifactGenerator(ctx, packageSource, ag, readyCondition, now)
+	}
+
+	// AG is not stuck and not mid-recovery — clear any recovery-tracking
+	// annotations left behind by a previous stuck cycle, then either
+	// surface the missing-Ready case or copy the real condition through.
+	if err := r.clearRecoveryTracking(ctx, ag); err != nil {
+		logger.Error(err, "failed to clear recovery tracking annotations", "artifactGenerator", ag.Name)
+		// Non-fatal: annotations are best-effort bookkeeping.
+	}
+
 	if readyCondition == nil {
 		// No Ready condition in ArtifactGenerator, set status to unknown
 		meta.SetStatusCondition(&packageSource.Status.Conditions, metav1.Condition{
-			Type:    "Ready",
-			Status:  metav1.ConditionUnknown,
-			Reason:  "ArtifactGeneratorNotReady",
-			Message: "ArtifactGenerator Ready condition not found",
+			Type:               "Ready",
+			Status:             metav1.ConditionUnknown,
+			Reason:             "ArtifactGeneratorNotReady",
+			Message:            "ArtifactGenerator Ready condition not found",
+			ObservedGeneration: packageSource.Generation,
 		})
-		return r.Status().Update(ctx, packageSource)
+		// Fresh AG with no Ready yet — if source-watcher doesn't act within
+		// the grace period, artifactGeneratorStuck will fire on the next
+		// reconcile. Schedule that reconcile explicitly so we don't sit
+		// waiting for an AG-status change that may never come.
+		return ctrl.Result{RequeueAfter: agFollowUpDelay(ag.CreationTimestamp.Time, now)}, r.Status().Update(ctx, packageSource)
+	}
+
+	if needsGenerationVerification(ag, readyCondition) {
+		return r.verifyArtifactGeneratorGeneration(ctx, packageSource, ag, now)
 	}
 
 	// Copy Ready condition from ArtifactGenerator to PackageSource
@@ -399,7 +594,523 @@ func (r *PackageSourceReconciler) updateStatus(ctx context.Context, packageSourc
 		"status", readyCondition.Status,
 		"reason", readyCondition.Reason)
 
-	return r.Status().Update(ctx, packageSource)
+	// If we just copied Ready=Unknown across, the artifactGeneratorStuck
+	// predicate will fire once the grace period elapses. Without an
+	// explicit RequeueAfter here, this reconciler would wait for a fresh
+	// AG-status change to re-fire via the Owns() watch — and if
+	// source-watcher's next write is the one lost to the fluxcd/pkg#934
+	// split-patch race (i.e., exactly the scenario this workaround exists
+	// for), no such change will land and we would sit dormant until the
+	// 10h informer resync. Schedule a follow-up reconcile at grace-period
+	// expiry so the recovery driver can take over. On Ready=True/False,
+	// the AG has resolved and no explicit follow-up is needed.
+	result := ctrl.Result{}
+	if readyCondition.Status == metav1.ConditionUnknown {
+		result.RequeueAfter = agFollowUpDelay(readyCondition.LastTransitionTime.Time, now)
+	}
+	return result, r.Status().Update(ctx, packageSource)
+}
+
+// agFollowUpDelay returns how long to wait before re-reconciling an AG whose
+// Ready=Unknown state is still within the grace period. Anchor is the last
+// state transition (or AG creation, when no Ready condition exists yet). The
+// result is at least one second so we never schedule a zero-delay requeue
+// tight loop when the grace period has just elapsed.
+func agFollowUpDelay(transitionOrCreation time.Time, now time.Time) time.Duration {
+	remaining := transitionOrCreation.Add(stuckGracePeriod).Sub(now)
+	if remaining < time.Second {
+		return time.Second
+	}
+	return remaining
+}
+
+// needsGenerationVerification reports whether source-watcher has just claimed
+// a successful build of an AG generation this operator has not yet verified.
+//
+// source-watcher builds from the spec it read when its reconcile started, but
+// its final status patch re-reads the live object and stamps Ready with the
+// live generation (fluxcd/source-watcher#384). When this operator changes the
+// spec mid-build, the AG ends up Ready on the new generation with artifacts
+// from the old one, and detectDrift never rebuilds it. Nothing in the AG
+// status tells the two apart, so every generation that reaches Ready=True is
+// rebuilt once. An unchanged spec rebuilds to the same digest, leaving the
+// ExternalArtifacts and their HelmReleases untouched.
+//
+// Generation 1 is exempt: the race needs a spec change during a build.
+//
+// TODO(remove once fluxcd/source-watcher#384 is fixed and rolled out).
+func needsGenerationVerification(ag *sourcewatcherv1beta1.ArtifactGenerator, ready *metav1.Condition) bool {
+	if ag.Generation <= 1 || ready.Status != metav1.ConditionTrue || ready.ObservedGeneration != ag.Generation {
+		return false
+	}
+	return ag.Annotations[annotationVerifiedGeneration] != strconv.FormatInt(ag.Generation, 10)
+}
+
+// verifyArtifactGeneratorGeneration forces the one rebuild described on
+// needsGenerationVerification through the fluxcd/pkg#934 force-drift path, so
+// the follow-up reconciles are driven by maybeRecoverArtifactGenerator and the
+// synthetic Ready=False never reaches the PackageSource. It starts a fresh
+// attempt budget, since a counter left by an earlier stall may have survived
+// the best-effort clearRecoveryTracking. The verified generation is recorded
+// after the force: if that write fails, the next Ready=True costs one more
+// rebuild rather than a skipped one.
+func (r *PackageSourceReconciler) verifyArtifactGeneratorGeneration(ctx context.Context, packageSource *cozyv1alpha1.PackageSource, ag *sourcewatcherv1beta1.ArtifactGenerator, now time.Time) (ctrl.Result, error) {
+	if err := r.forceArtifactGeneratorDrift(ctx, ag, now, 1); err != nil {
+		return ctrl.Result{}, fmt.Errorf("failed to force ArtifactGenerator rebuild: %w", err)
+	}
+	patchBase := ag.DeepCopy()
+	ag.Annotations[annotationVerifiedGeneration] = strconv.FormatInt(ag.Generation, 10)
+	if err := r.Patch(ctx, ag, client.MergeFrom(patchBase)); err != nil {
+		return ctrl.Result{}, fmt.Errorf("failed to record verified ArtifactGenerator generation: %w", err)
+	}
+	meta.SetStatusCondition(&packageSource.Status.Conditions, metav1.Condition{
+		Type:   "Ready",
+		Status: metav1.ConditionUnknown,
+		Reason: reasonAwaitingRecovery,
+		Message: fmt.Sprintf(
+			"rebuilding ArtifactGenerator generation %d once, since source-watcher may have built it from the previous spec (fluxcd/source-watcher#384).",
+			ag.Generation,
+		),
+		ObservedGeneration: packageSource.Generation,
+	})
+	if err := r.Status().Update(ctx, packageSource); err != nil {
+		return ctrl.Result{}, err
+	}
+	log.FromContext(ctx).Info("forced ArtifactGenerator rebuild to verify generation",
+		"packageSource", packageSource.Name, "artifactGenerator", ag.Name, "generation", ag.Generation)
+	return ctrl.Result{RequeueAfter: backoffFor(1)}, nil
+}
+
+// maybeRecoverArtifactGenerator advances the bounded-recovery schedule for an
+// AG whose Ready condition is stuck in the fluxcd/pkg#934 window (Inventory
+// and ObservedSourcesDigest persisted on the current spec generation, Ready
+// condition write lost to the split patch). It forces source-watcher onto its
+// drifted-branch reconcile by patching Ready=False on the AG's status
+// subresource with exponential backoff and — after maxRecoveryAttempts
+// fruitless attempts — surfaces the failure as PackageSource.Ready=False with
+// reason SourceWatcherStalled so an operator can intervene.
+//
+// Why forcing Ready=False AND bumping requestedAt together works: the two
+// signals are complementary — neither alone is enough.
+//
+//   - The status write (Ready=False, reason=SourceWatcherRecoveryForced) is
+//     what source-watcher v2.1.0's detectDrift
+//     (internal/controller/artifactgenerator_drift.go:52) treats as drift =
+//     "NotReady", promoting the reconcile past the no-drift early-return at
+//     controller.go:164 that traps a lost-Ready-condition state.
+//   - The annotation write (reconcile.fluxcd.io/requestedAt = now) is what
+//     ReconcileRequestedPredicate on source-watcher's ArtifactGenerator
+//     watch keys on to enqueue that reconcile in the first place. A
+//     status-only patch changes neither the AG's generation nor the
+//     requestedAt annotation, so it never triggers a watch event — the AG
+//     would sit until the periodic self-requeue (hardcoded to 1h),
+//     well outside the 15m HR install timeout.
+//
+// On successful rebuild source-watcher writes Ready=True at
+// controller.go:254; on a genuine rebuild failure it writes Ready=False
+// with a real reason. Either way an honest condition from upstream
+// replaces our synthetic False, and our Owns(&ArtifactGenerator{}) watch
+// fires this reconciler to copy the resolved condition onto the
+// PackageSource.
+//
+// The recovery state (attempt count + last-force timestamp) lives on the
+// AG itself as annotations so it survives operator restarts. The counter
+// is NOT reset on a fresh Ready.LastTransitionTime — source-watcher's
+// Progressing write during rebuild always advances that timestamp, and a
+// reset there would make the SourceWatcherStalled give-up unreachable
+// under the very race this driver targets. The canonical reset is the
+// natural clearRecoveryTracking on updateStatus's not-stuck path, once
+// source-watcher lands a definitive Ready=True or Ready=False with a
+// real upstream reason.
+//
+// TODO(remove once fluxcd/pkg#934 and fluxcd/source-watcher#384 are both
+// fixed and rolled out): verifyArtifactGeneratorGeneration drives its rebuild
+// through this driver, so it goes only together with that verification. Then
+// updateStatus can copy the AG's Ready condition through unconditionally.
+func (r *PackageSourceReconciler) maybeRecoverArtifactGenerator(ctx context.Context, packageSource *cozyv1alpha1.PackageSource, ag *sourcewatcherv1beta1.ArtifactGenerator, ready *metav1.Condition, now time.Time) (ctrl.Result, error) {
+	logger := log.FromContext(ctx)
+
+	// The attempt counter is intentionally NOT reset here on a fresh
+	// Ready.LastTransitionTime. source-watcher's response to a forced drift
+	// includes a Ready=Unknown (Progressing) write before the rebuild
+	// completes; that transition's timestamp is always newer than
+	// lastRecoveryAt, and resetting on it would make the give-up budget
+	// unreachable under the very race this driver targets — force → Progressing
+	// → reset → force → Progressing → reset → forever. Instead, the unified
+	// Owns()-re-entrancy gate in updateStatus routes those Progressing
+	// transitions back through this same maybeRecoverArtifactGenerator so
+	// decideRecovery holds tracking through Wait until either source-watcher
+	// resolves the AG or the attempt budget exhausts. The natural
+	// clearRecoveryTracking on the not-stuck path (Ready=True from
+	// source-watcher, or Ready=False with an upstream reason) is the
+	// canonical reset. The trade-off — an operator restart between a prior
+	// give-up and a genuine fresh stall would preserve the stale counter —
+	// is contained by the leader-election requirement documented on the
+	// constants block.
+	attempts, lastRecoveryAt := readRecoveryTracking(ag)
+	decision := decideRecovery(attempts, lastRecoveryAt, now)
+
+	switch decision.action {
+	case recoveryActionGiveUp:
+		message := fmt.Sprintf(
+			"ArtifactGenerator %s/%s has not been rebuilt through %d force-drift attempts; "+
+				"source-watcher is not recovering (see fluxcd/pkg#934 and fluxcd/source-watcher#384). "+
+				"An operator must restart source-watcher or manually inspect the ArtifactGenerator.",
+			ag.Namespace, ag.Name, maxRecoveryAttempts,
+		)
+		meta.SetStatusCondition(&packageSource.Status.Conditions, metav1.Condition{
+			Type:               "Ready",
+			Status:             metav1.ConditionFalse,
+			Reason:             reasonSourceWatcherBad,
+			Message:            message,
+			ObservedGeneration: packageSource.Generation,
+		})
+		logger.Info("source-watcher stalled after bounded force-drift attempts; surfacing PackageSource Ready=False",
+			"packageSource", packageSource.Name, "artifactGenerator", ag.Name, "attempts", attempts)
+		return ctrl.Result{}, r.Status().Update(ctx, packageSource)
+
+	case recoveryActionWait:
+		meta.SetStatusCondition(&packageSource.Status.Conditions, metav1.Condition{
+			Type:   "Ready",
+			Status: metav1.ConditionUnknown,
+			Reason: reasonAwaitingRecovery,
+			Message: fmt.Sprintf(
+				"force-drift %d/%d issued, waiting for source-watcher to rebuild the ArtifactGenerator.",
+				attempts, maxRecoveryAttempts,
+			),
+			ObservedGeneration: packageSource.Generation,
+		})
+		if err := r.Status().Update(ctx, packageSource); err != nil {
+			return ctrl.Result{}, err
+		}
+		return ctrl.Result{RequeueAfter: decision.wait}, nil
+
+	case recoveryActionForce:
+		nextAttempt := attempts + 1
+		if err := r.forceArtifactGeneratorDrift(ctx, ag, now, nextAttempt); err != nil {
+			return ctrl.Result{}, fmt.Errorf("failed to force ArtifactGenerator drift: %w", err)
+		}
+		meta.SetStatusCondition(&packageSource.Status.Conditions, metav1.Condition{
+			Type:   "Ready",
+			Status: metav1.ConditionUnknown,
+			Reason: reasonAwaitingRecovery,
+			Message: fmt.Sprintf(
+				"forced drift on AG.status.conditions[Ready]=False (attempt %d/%d) so source-watcher rebuilds.",
+				nextAttempt, maxRecoveryAttempts,
+			),
+			ObservedGeneration: packageSource.Generation,
+		})
+		if err := r.Status().Update(ctx, packageSource); err != nil {
+			return ctrl.Result{}, err
+		}
+		logger.Info("forced source-watcher drift via AG status Ready=False patch",
+			"packageSource", packageSource.Name, "artifactGenerator", ag.Name, "attempt", nextAttempt)
+		return ctrl.Result{RequeueAfter: backoffFor(nextAttempt)}, nil
+
+	default:
+		// Force a loud failure if a new recoveryAction is ever added without
+		// a matching case here — a silent return would leave the PackageSource
+		// Ready condition frozen at whatever value it had before this call.
+		// controller-runtime v0.15+ recovers panics inside Reconcile by
+		// default (Options.RecoverPanic), so this manifests as a requeue with
+		// a logged stack trace rather than a crash-loop; if that default is
+		// ever flipped off in SetupWithManager, this needs to become an
+		// error return instead.
+		panic(fmt.Sprintf("unhandled recoveryAction %d", decision.action))
+	}
+}
+
+// artifactGeneratorStuck detects the fluxcd/pkg#934 stall signature: artifacts
+// are demonstrably produced (Inventory populated and ObservedSourcesDigest set)
+// on the current spec generation, yet the Ready condition is either missing or
+// has been sitting in Unknown longer than stuckGracePeriod. The grace period
+// keeps this predicate off the fast path during a normal in-flight rebuild;
+// only genuinely quiescent AGs land here.
+//
+// Ready=True and Ready=False are BOTH pass-through (return false) — the retry
+// driver only runs on the specific stuck-Unknown case. A real regeneration
+// failure surfaces as Ready=False and is copied through unchanged.
+func artifactGeneratorStuck(ag *sourcewatcherv1beta1.ArtifactGenerator, ready *metav1.Condition, now time.Time) bool {
+	if len(ag.Status.Inventory) == 0 {
+		return false
+	}
+	if ag.Status.ObservedSourcesDigest == "" {
+		return false
+	}
+	if ready == nil {
+		// Ready condition entirely absent: this is the half-persisted case the
+		// PR was written for. Wait out the grace period from AG creation before
+		// intervening so we don't fight a fresh-install AG that just hasn't
+		// been touched yet.
+		return ag.CreationTimestamp.Time.Add(stuckGracePeriod).Before(now)
+	}
+	if ready.Status != metav1.ConditionUnknown {
+		return false
+	}
+	if ready.ObservedGeneration != ag.Generation {
+		return false
+	}
+	// Only intervene if Unknown has held for the grace period; otherwise source
+	// -watcher is legitimately mid-rebuild and will settle on its own.
+	return ready.LastTransitionTime.Time.Add(stuckGracePeriod).Before(now)
+}
+
+// recoveryAction enumerates what maybeRecoverArtifactGenerator should do given
+// the current retry state.
+type recoveryAction int
+
+const (
+	recoveryActionForce  recoveryAction = iota // enough time elapsed — issue a fresh force-drift status patch
+	recoveryActionWait                         // in backoff window — schedule a follow-up reconcile at wait
+	recoveryActionGiveUp                       // exceeded maxRecoveryAttempts — surface as Ready=False
+)
+
+type recoveryDecision struct {
+	action recoveryAction
+	wait   time.Duration
+}
+
+// decideRecovery is the pure decision function driving maybeRecoverArtifactGenerator.
+// Split out so it can be unit-tested without a cluster.
+//
+// The exhaustion branch (`attempts >= maxRecoveryAttempts`) also respects the
+// final backoff window before switching to GiveUp. Without that gate, the
+// Owns()-watch re-fire from the N-th force-drift's own writes triggers a
+// reconcile milliseconds later, `decideRecovery` sees `attempts == max` and
+// returns GiveUp immediately — preempting the response window the final
+// force was supposed to grant source-watcher and collapsing the documented
+// budget from ~11.5m (30s+60s+2m+4m+4m) down to ~7.5m (30s+60s+2m+4m). The
+// wait branch here holds until the full final backoff has elapsed, so the
+// last nudge actually gets its chance to succeed (Owns → Ready=True copy-
+// through) before the driver surfaces SourceWatcherStalled.
+func decideRecovery(attempts int, lastRecoveryAt time.Time, now time.Time) recoveryDecision {
+	if attempts >= maxRecoveryAttempts {
+		elapsed := now.Sub(lastRecoveryAt)
+		needed := backoffFor(maxRecoveryAttempts)
+		if elapsed < needed {
+			return recoveryDecision{action: recoveryActionWait, wait: needed - elapsed}
+		}
+		return recoveryDecision{action: recoveryActionGiveUp}
+	}
+	if attempts == 0 {
+		return recoveryDecision{action: recoveryActionForce}
+	}
+	elapsed := now.Sub(lastRecoveryAt)
+	needed := backoffFor(attempts)
+	if elapsed >= needed {
+		return recoveryDecision{action: recoveryActionForce}
+	}
+	return recoveryDecision{action: recoveryActionWait, wait: needed - elapsed}
+}
+
+// backoffFor returns the backoff duration to wait AFTER the Nth force before
+// the (N+1)th. Attempts are 1-indexed. Exponential up to maxBackoff.
+func backoffFor(attempt int) time.Duration {
+	if attempt < 1 {
+		attempt = 1
+	}
+	d := initialBackoff
+	for i := 1; i < attempt; i++ {
+		d *= 2
+		if d >= maxBackoff {
+			return maxBackoff
+		}
+	}
+	return d
+}
+
+// forceArtifactGeneratorDrift writes Ready=False on the AG's status subresource
+// to trigger source-watcher's drifted-branch reconcile (see the block comment
+// on maybeRecoverArtifactGenerator for why this is what actually recovers a
+// stuck AG). Then updates our tracking annotations so the retry loop can back
+// off.
+//
+// Two subresources are patched — status for the Ready condition, metadata for
+// the annotations — because status is a separate endpoint and cannot be
+// combined with metadata in a single PATCH. Order is: status first, then
+// metadata. If the status patch fails, we return the error and leave both the
+// caller's `ag` and the apiserver untouched. If the status patch succeeds but
+// the annotations patch fails, we still return an error — the retry loop will
+// pick up on the next reconcile and, because source-watcher already got the
+// Ready=False signal from the successful status write, the extra force-drift
+// on that retry is benign (source-watcher is already mid-rebuild).
+//
+// JSON merge patch semantics — honest trade-off. `client.MergeFrom` produces
+// a JSON merge patch, which replaces arrays in full per RFC 7396 (custom
+// resources like ArtifactGenerator do not carry the `patchStrategy: merge`
+// / `patchMergeKey` markers that would enable strategic-merge-patch
+// per-element merging on Kubernetes-native APIs). Consequences:
+//
+//   - If source-watcher writes a fresh Reconciling condition between our
+//     Get (in updateStatus, several stack frames up) and this status Patch,
+//     our patch REPLACES the entire status.conditions array with the array
+//     we hold locally — Reconciling gets transiently wiped.
+//     source-watcher restores it on its next reconcile (which our
+//     requestedAt bump in step 2 is about to trigger), so the wipe is
+//     short-lived. Downstream tooling watching for Reconciling (Grafana
+//     panels, alertmanager rules) may still observe the momentary absence.
+//   - Similarly, any other condition source-watcher added concurrently
+//     (e.g. a custom Stalled marker in future versions) would be wiped.
+//     Currently source-watcher v2.1.0 only writes Ready and Reconciling,
+//     so the blast radius is Reconciling only.
+//
+// A full fix would require server-side apply with per-condition field
+// ownership, at the cost of introducing SSA into the operator's write
+// path. Not doing it here because the transient wipe is acceptable in
+// this workaround's scope; if a future refactor moves the operator to
+// SSA globally, this call should migrate too.
+//
+// On success, `ag.Status.Conditions` and `ag.Annotations` reflect the
+// persisted state so the caller can re-read the same pointer. On any Patch
+// failure the corresponding field is rolled back to its pre-call value.
+func (r *PackageSourceReconciler) forceArtifactGeneratorDrift(ctx context.Context, ag *sourcewatcherv1beta1.ArtifactGenerator, now time.Time, nextAttempt int) error {
+	logger := log.FromContext(ctx)
+	// Step 1: patch AG.status.conditions[Ready]=False. This is the signal
+	// source-watcher's detectDrift picks up as `NotReady` drift.
+	statusBase := ag.DeepCopy()
+	priorConditions := cloneConditions(ag.Status.Conditions)
+	meta.SetStatusCondition(&ag.Status.Conditions, metav1.Condition{
+		Type:               "Ready",
+		Status:             metav1.ConditionFalse,
+		Reason:             reasonRecoveryForced,
+		Message:            "cozystack-operator forced drift; source-watcher will rebuild",
+		ObservedGeneration: ag.Generation,
+	})
+	if err := r.Status().Patch(ctx, ag, client.MergeFrom(statusBase)); err != nil {
+		ag.Status.Conditions = priorConditions
+		return fmt.Errorf("status patch to force drift: %w", err)
+	}
+
+	// Step 2: bump `reconcile.fluxcd.io/requestedAt` alongside the tracking
+	// annotations. Both parts are load-bearing:
+	//
+	// - source-watcher v2.1.0 registers the ArtifactGenerator watch with
+	//   `predicate.Or(GenerationChangedPredicate, ReconcileRequestedPredicate)`
+	//   (source-watcher `artifactgenerator_manager.go` in the v2.1.0 pinned
+	//   distribution). A status-only patch changes neither the generation
+	//   nor the requestedAt annotation, so it does NOT enqueue a reconcile.
+	//   The only fallback is the AG's periodic self-requeue, hardcoded to
+	//   `time.Hour` — well outside the 15m HR install timeout this driver
+	//   exists to beat.
+	// - The Ready=False write from step 1 is what source-watcher's
+	//   `detectDrift` keys on once it does reconcile (drift.go:52,
+	//   `IsFalse(Ready)` → `NotReady` drift → drifted branch → MarkTrue).
+	//
+	// Together: the annotation triggers the reconcile, the status condition
+	// makes that reconcile take the drifted branch and rebuild. Either alone
+	// is a no-op.
+	//
+	// If this metadata patch fails, the status write from step 1 has already
+	// taken effect, but source-watcher will not have been enqueued yet. The
+	// retry loop notices on the next reconcile and re-issues both parts —
+	// benign, source-watcher is not doing anything with the stale Ready=False
+	// alone.
+	metadataBase := ag.DeepCopy()
+	priorAnnotations := cloneAnnotations(ag.Annotations)
+	if ag.Annotations == nil {
+		ag.Annotations = map[string]string{}
+	}
+	nowStr := now.UTC().Format(time.RFC3339Nano)
+	ag.Annotations[annotationFluxRequestedAt] = nowStr
+	ag.Annotations[annotationRecoveryAttempts] = strconv.Itoa(nextAttempt)
+	ag.Annotations[annotationLastRecoveryAt] = nowStr
+	if err := r.Patch(ctx, ag, client.MergeFrom(metadataBase)); err != nil {
+		ag.Annotations = priorAnnotations
+		// The status patch already landed, so source-watcher sees our
+		// Ready=False. If this metadata patch keeps failing on retry,
+		// the recovery tracking annotations never persist to the
+		// apiserver — every subsequent reconcile reads attempts=0 and
+		// re-forces from scratch instead of accumulating toward
+		// SourceWatcherStalled. Log loudly so operators can spot a
+		// metadata-write-only apiserver malfunction.
+		logger.Error(err, "recovery tracking metadata patch failed after successful status patch — "+
+			"source-watcher has been nudged but the attempt counter did not advance; "+
+			"if this repeats persistently, force-drift will loop without ever giving up",
+			"artifactGenerator", ag.Name,
+			"intendedAttempts", nextAttempt)
+		return fmt.Errorf("metadata patch to update recovery tracking: %w", err)
+	}
+	return nil
+}
+
+// clearRecoveryTracking removes our bookkeeping annotations once the AG is
+// healthy again.
+//
+// Same success/failure contract as forceArtifactGeneratorDrift: on success
+// `ag.Annotations` matches the persisted state; on Patch failure the caller's
+// annotations are rolled back to their pre-call values.
+func (r *PackageSourceReconciler) clearRecoveryTracking(ctx context.Context, ag *sourcewatcherv1beta1.ArtifactGenerator) error {
+	if ag.Annotations == nil {
+		return nil
+	}
+	_, hasAttempts := ag.Annotations[annotationRecoveryAttempts]
+	_, hasLast := ag.Annotations[annotationLastRecoveryAt]
+	if !hasAttempts && !hasLast {
+		return nil
+	}
+	patchBase := ag.DeepCopy()
+	priorAnnotations := cloneAnnotations(ag.Annotations)
+	delete(ag.Annotations, annotationRecoveryAttempts)
+	delete(ag.Annotations, annotationLastRecoveryAt)
+	if err := r.Patch(ctx, ag, client.MergeFrom(patchBase)); err != nil {
+		ag.Annotations = priorAnnotations
+		return err
+	}
+	return nil
+}
+
+// cloneConditions returns a shallow copy of a conditions slice suitable for
+// rollback on Patch failure. Each metav1.Condition holds only value-typed
+// fields (strings, ints, Time), so a shallow slice copy is sufficient.
+func cloneConditions(src []metav1.Condition) []metav1.Condition {
+	if src == nil {
+		return nil
+	}
+	dst := make([]metav1.Condition, len(src))
+	copy(dst, src)
+	return dst
+}
+
+// cloneAnnotations returns a shallow copy suitable for rollback on Patch
+// failure. A shallow copy is enough because annotation values are plain
+// strings, which are immutable in Go; there is no shared mutable state to
+// deep-copy. Nil in → nil out (preserved as a distinct sentinel from an empty
+// map so the caller sees exactly the same state it started with).
+func cloneAnnotations(src map[string]string) map[string]string {
+	if src == nil {
+		return nil
+	}
+	dst := make(map[string]string, len(src))
+	maps.Copy(dst, src)
+	return dst
+}
+
+// readRecoveryTracking pulls the retry-attempt counter and last-force timestamp
+// off the AG. Missing/malformed annotations are treated as "no prior attempts"
+// so a corrupted counter can't wedge the retry loop.
+func readRecoveryTracking(ag *sourcewatcherv1beta1.ArtifactGenerator) (attempts int, lastRecoveryAt time.Time) {
+	if ag.Annotations == nil {
+		return 0, time.Time{}
+	}
+	if raw, ok := ag.Annotations[annotationRecoveryAttempts]; ok {
+		if parsed, err := strconv.Atoi(raw); err == nil && parsed >= 0 {
+			attempts = parsed
+		}
+	}
+	if raw, ok := ag.Annotations[annotationLastRecoveryAt]; ok {
+		if parsed, err := time.Parse(time.RFC3339Nano, raw); err == nil {
+			lastRecoveryAt = parsed
+		}
+	}
+	return attempts, lastRecoveryAt
+}
+
+// mapPackageToSource enqueues the PackageSource that shares a Package's name, so
+// confirming a registration (which sheds the marketplace-tap label on the
+// Package) re-runs artifact generation and materialises the now-confirmed
+// privileged components.
+func mapPackageToSource(_ context.Context, obj client.Object) []ctrl.Request {
+	return []ctrl.Request{{NamespacedName: types.NamespacedName{Name: obj.GetName()}}}
 }
 
 // SetupWithManager sets up the controller with the Manager.
@@ -408,6 +1119,6 @@ func (r *PackageSourceReconciler) SetupWithManager(mgr ctrl.Manager) error {
 		Named("cozystack-packagesource").
 		For(&cozyv1alpha1.PackageSource{}).
 		Owns(&sourcewatcherv1beta1.ArtifactGenerator{}).
+		Watches(&cozyv1alpha1.Package{}, handler.EnqueueRequestsFromMapFunc(mapPackageToSource)).
 		Complete(r)
 }
-
diff --git a/internal/operator/packagesource_reconciler_test.go b/internal/operator/packagesource_reconciler_test.go
new file mode 100644
index 0000000000..62a4d633da
--- /dev/null
+++ b/internal/operator/packagesource_reconciler_test.go
@@ -0,0 +1,1773 @@
+/*
+Copyright 2025 The Cozystack Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package operator
+
+import (
+	"context"
+	"errors"
+	"reflect"
+	"strconv"
+	"testing"
+	"time"
+
+	cozyv1alpha1 "github.com/cozystack/cozystack/api/v1alpha1"
+	sourcewatcherv1beta1 "github.com/fluxcd/source-watcher/api/v2/v1beta1"
+	"k8s.io/apimachinery/pkg/api/meta"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/types"
+	ctrl "sigs.k8s.io/controller-runtime"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/client/fake"
+	"sigs.k8s.io/controller-runtime/pkg/client/interceptor"
+)
+
+// referenceTime is a fixed anchor for time-sensitive tests; every duration in
+// the assertions is expressed as an offset from it so the tests read as
+// "given the AG was last touched at reference-8s, and now is reference, ...".
+var referenceTime = time.Date(2026, 7, 3, 12, 0, 0, 0, time.UTC)
+
+// agFixture builds an ArtifactGenerator with a fixed .metadata.generation and
+// creation timestamp so tests can exercise the Generation and grace-period
+// branches of artifactGeneratorStuck without a full apiserver round-trip.
+func agFixture(gen int64, createdOffset time.Duration, status sourcewatcherv1beta1.ArtifactGeneratorStatus) *sourcewatcherv1beta1.ArtifactGenerator {
+	return &sourcewatcherv1beta1.ArtifactGenerator{
+		ObjectMeta: metav1.ObjectMeta{
+			Generation:        gen,
+			CreationTimestamp: metav1.NewTime(referenceTime.Add(createdOffset)),
+		},
+		Status: status,
+	}
+}
+
+// TestArtifactGeneratorStuck locks in detection of the fluxcd/pkg#934 split
+// -write stall. The predicate must fire ONLY when artifacts are demonstrably
+// produced on the current generation AND the Ready condition has been sitting
+// in Unknown longer than the grace period (or is missing on an old-enough AG).
+// Ready=True and Ready=False must both pass through untouched — the retry
+// driver only runs for the stuck-Unknown case, and a real regeneration failure
+// (Ready=False) must never be papered over.
+func TestArtifactGeneratorStuck(t *testing.T) {
+	nonEmptyInventory := []sourcewatcherv1beta1.ExternalArtifactReference{
+		{Name: "one", Namespace: "cozy-system", Digest: "sha256:aaa"},
+	}
+	const observedDigest = "sha256:0e7"
+
+	// beyondGrace: how far into Unknown the AG has been before we'll intervene.
+	beyondGrace := stuckGracePeriod + 5*time.Second
+
+	tests := []struct {
+		name string
+		ag   *sourcewatcherv1beta1.ArtifactGenerator
+		want bool
+	}{
+		{
+			name: "fresh ArtifactGenerator with nothing observed yet",
+			ag:   agFixture(1, -time.Hour, sourcewatcherv1beta1.ArtifactGeneratorStatus{}),
+			want: false,
+		},
+		{
+			name: "inventory present but sources not yet observed",
+			ag: agFixture(1, -time.Hour, sourcewatcherv1beta1.ArtifactGeneratorStatus{
+				Inventory: nonEmptyInventory,
+			}),
+			want: false,
+		},
+		{
+			name: "sources observed but inventory empty",
+			ag: agFixture(1, -time.Hour, sourcewatcherv1beta1.ArtifactGeneratorStatus{
+				ObservedSourcesDigest: observedDigest,
+			}),
+			want: false,
+		},
+		{
+			name: "artifacts produced, Ready condition absent, AG within grace period — do NOT intervene yet",
+			ag: agFixture(1, -5*time.Second, sourcewatcherv1beta1.ArtifactGeneratorStatus{
+				Inventory:             nonEmptyInventory,
+				ObservedSourcesDigest: observedDigest,
+			}),
+			want: false,
+		},
+		{
+			name: "artifacts produced, Ready condition absent, AG older than grace period — intervene",
+			ag: agFixture(1, -beyondGrace, sourcewatcherv1beta1.ArtifactGeneratorStatus{
+				Inventory:             nonEmptyInventory,
+				ObservedSourcesDigest: observedDigest,
+			}),
+			want: true,
+		},
+		{
+			name: "artifacts produced, Ready=Unknown within grace period — legitimate in-flight rebuild, do NOT intervene",
+			ag: agFixture(1, -time.Hour, sourcewatcherv1beta1.ArtifactGeneratorStatus{
+				Inventory:             nonEmptyInventory,
+				ObservedSourcesDigest: observedDigest,
+				Conditions: []metav1.Condition{{
+					Type:               "Ready",
+					Status:             metav1.ConditionUnknown,
+					Reason:             "Progressing",
+					Message:            "Reconciliation in progress",
+					ObservedGeneration: 1,
+					LastTransitionTime: metav1.NewTime(referenceTime.Add(-5 * time.Second)),
+				}},
+			}),
+			want: false,
+		},
+		{
+			name: "artifacts produced, Ready=Unknown beyond grace period on current Generation — the stuck-status case",
+			ag: agFixture(1, -time.Hour, sourcewatcherv1beta1.ArtifactGeneratorStatus{
+				Inventory:             nonEmptyInventory,
+				ObservedSourcesDigest: observedDigest,
+				Conditions: []metav1.Condition{{
+					Type:               "Ready",
+					Status:             metav1.ConditionUnknown,
+					Reason:             "Progressing",
+					Message:            "Reconciliation in progress",
+					ObservedGeneration: 1,
+					LastTransitionTime: metav1.NewTime(referenceTime.Add(-beyondGrace)),
+				}},
+			}),
+			want: true,
+		},
+		{
+			name: "artifacts observed on a PRIOR Generation (spec was updated) — do NOT intervene, condition is legitimately stale",
+			ag: agFixture(2, -time.Hour, sourcewatcherv1beta1.ArtifactGeneratorStatus{
+				Inventory:             nonEmptyInventory,
+				ObservedSourcesDigest: observedDigest,
+				Conditions: []metav1.Condition{{
+					Type:               "Ready",
+					Status:             metav1.ConditionUnknown,
+					Reason:             "Progressing",
+					Message:            "Reconciliation in progress",
+					ObservedGeneration: 1,
+					LastTransitionTime: metav1.NewTime(referenceTime.Add(-beyondGrace)),
+				}},
+			}),
+			want: false,
+		},
+		{
+			name: "upstream Ready=True — pass through the real condition, do NOT intervene",
+			ag: agFixture(1, -time.Hour, sourcewatcherv1beta1.ArtifactGeneratorStatus{
+				Inventory:             nonEmptyInventory,
+				ObservedSourcesDigest: observedDigest,
+				Conditions: []metav1.Condition{{
+					Type:               "Ready",
+					Status:             metav1.ConditionTrue,
+					Reason:             "Succeeded",
+					ObservedGeneration: 1,
+					LastTransitionTime: metav1.NewTime(referenceTime.Add(-beyondGrace)),
+				}},
+			}),
+			want: false,
+		},
+		{
+			name: "upstream Ready=False — real failure, must NOT be masked",
+			ag: agFixture(1, -time.Hour, sourcewatcherv1beta1.ArtifactGeneratorStatus{
+				Inventory:             nonEmptyInventory,
+				ObservedSourcesDigest: observedDigest,
+				Conditions: []metav1.Condition{{
+					Type:               "Ready",
+					Status:             metav1.ConditionFalse,
+					Reason:             "SourceRefFailed",
+					Message:            "cannot fetch source",
+					ObservedGeneration: 1,
+					LastTransitionTime: metav1.NewTime(referenceTime.Add(-beyondGrace)),
+				}},
+			}),
+			want: false,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			ready := meta.FindStatusCondition(tt.ag.Status.Conditions, "Ready")
+			got := artifactGeneratorStuck(tt.ag, ready, referenceTime)
+			if got != tt.want {
+				t.Errorf("artifactGeneratorStuck() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}
+
+// TestDecideRecovery locks in the bounded-retry state machine that drives
+// source-watcher out of the stuck window. First attempt forces immediately;
+// the N-th subsequent attempt waits backoffFor(N) since the last force before
+// firing again; after maxRecoveryAttempts fruitless attempts we surface
+// Ready=False. Wait durations are asserted for exact equality because
+// decideRecovery is deterministic (`needed - elapsed`) — a loose bound would
+// silently miss a backoff-schedule regression.
+func TestDecideRecovery(t *testing.T) {
+	tests := []struct {
+		name           string
+		attempts       int
+		lastRecoveryAt time.Time
+		now            time.Time
+		wantAction     recoveryAction
+		wantWait       time.Duration // 0 means don't check (Force / GiveUp branches ignore wait)
+	}{
+		{
+			name:       "first-ever detection — force immediately",
+			attempts:   0,
+			now:        referenceTime,
+			wantAction: recoveryActionForce,
+		},
+		{
+			name:           "backoff not yet elapsed after attempt 1 — wait",
+			attempts:       1,
+			lastRecoveryAt: referenceTime.Add(-10 * time.Second),
+			now:            referenceTime,
+			wantAction:     recoveryActionWait,
+			wantWait:       20 * time.Second, // initialBackoff (30s) minus elapsed 10s
+		},
+		{
+			name:           "backoff elapsed after attempt 1 — force",
+			attempts:       1,
+			lastRecoveryAt: referenceTime.Add(-45 * time.Second),
+			now:            referenceTime,
+			wantAction:     recoveryActionForce,
+		},
+		{
+			name:           "backoff after attempt 3 (2m) — wait 90s",
+			attempts:       3,
+			lastRecoveryAt: referenceTime.Add(-30 * time.Second),
+			now:            referenceTime,
+			wantAction:     recoveryActionWait,
+			wantWait:       90 * time.Second, // backoffFor(3)=2m minus elapsed 30s
+		},
+		{
+			name:       "attempts exhausted with elapsed >> final backoff — give up",
+			attempts:   maxRecoveryAttempts,
+			now:        referenceTime,
+			wantAction: recoveryActionGiveUp,
+		},
+		{
+			name:       "attempts exceeded — still give up",
+			attempts:   maxRecoveryAttempts + 3,
+			now:        referenceTime,
+			wantAction: recoveryActionGiveUp,
+		},
+		{
+			// lexfrei's follow-up: without holding the final backoff window,
+			// the Owns()-watch re-fire from the N-th force-drift's own
+			// writes preempts the response window and give-up fires within
+			// milliseconds of the last force. Budget collapses to ~7.5m
+			// instead of the documented ~11.5m. This case pins the fix:
+			// attempts=max but no time elapsed since the final force,
+			// expect Wait for the full backoffFor(maxRecoveryAttempts).
+			name:           "attempts exhausted but final backoff not elapsed — wait, do not give up",
+			attempts:       maxRecoveryAttempts,
+			lastRecoveryAt: referenceTime.Add(-time.Second),
+			now:            referenceTime,
+			wantAction:     recoveryActionWait,
+			wantWait:       backoffFor(maxRecoveryAttempts) - time.Second,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got := decideRecovery(tt.attempts, tt.lastRecoveryAt, tt.now)
+			if got.action != tt.wantAction {
+				t.Fatalf("action = %v, want %v", got.action, tt.wantAction)
+			}
+			if tt.wantWait > 0 && got.wait != tt.wantWait {
+				t.Errorf("wait = %v, want %v", got.wait, tt.wantWait)
+			}
+		})
+	}
+}
+
+// TestBackoffFor pins the exponential-with-cap schedule so a future edit that
+// silently doubles the ceiling or drops the exponent gets caught here.
+func TestBackoffFor(t *testing.T) {
+	// initialBackoff=30s, maxBackoff=4m. Expected: 30s, 60s, 120s, 240s, 240s, 240s, ...
+	tests := []struct {
+		attempt int
+		want    time.Duration
+	}{
+		{0, 30 * time.Second},  // clamped to attempt=1
+		{1, 30 * time.Second},
+		{2, 60 * time.Second},
+		{3, 120 * time.Second},
+		{4, 240 * time.Second},
+		{5, 240 * time.Second},
+		{10, 240 * time.Second},
+	}
+	for _, tt := range tests {
+		t.Run(strconv.Itoa(tt.attempt), func(t *testing.T) {
+			got := backoffFor(tt.attempt)
+			if got != tt.want {
+				t.Errorf("backoffFor(%d) = %v, want %v", tt.attempt, got, tt.want)
+			}
+		})
+	}
+}
+
+// TestReadRecoveryTracking verifies that a corrupted or malformed retry-tracking
+// annotation cannot wedge the retry loop by producing a nonsensical counter —
+// missing, empty, non-numeric, or negative values must all read back as
+// "no prior attempts".
+func TestReadRecoveryTracking(t *testing.T) {
+	fixed := referenceTime.UTC().Format(time.RFC3339Nano)
+
+	tests := []struct {
+		name        string
+		annotations map[string]string
+		wantAttempt int
+		wantTimeSet bool
+	}{
+		{
+			name:        "no annotations",
+			annotations: nil,
+			wantAttempt: 0,
+			wantTimeSet: false,
+		},
+		{
+			name: "valid attempt + valid timestamp",
+			annotations: map[string]string{
+				annotationRecoveryAttempts: "3",
+				annotationLastRecoveryAt:   fixed,
+			},
+			wantAttempt: 3,
+			wantTimeSet: true,
+		},
+		{
+			name: "corrupt attempt counter — read as zero",
+			annotations: map[string]string{
+				annotationRecoveryAttempts: "not-a-number",
+				annotationLastRecoveryAt:   fixed,
+			},
+			wantAttempt: 0,
+			wantTimeSet: true,
+		},
+		{
+			name: "negative attempt — clamped to zero",
+			annotations: map[string]string{
+				annotationRecoveryAttempts: "-5",
+			},
+			wantAttempt: 0,
+			wantTimeSet: false,
+		},
+		{
+			name: "corrupt timestamp — read as zero time",
+			annotations: map[string]string{
+				annotationRecoveryAttempts: "2",
+				annotationLastRecoveryAt:   "not-a-date",
+			},
+			wantAttempt: 2,
+			wantTimeSet: false,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			ag := &sourcewatcherv1beta1.ArtifactGenerator{
+				ObjectMeta: metav1.ObjectMeta{Annotations: tt.annotations},
+			}
+			attempt, ts := readRecoveryTracking(ag)
+			if attempt != tt.wantAttempt {
+				t.Errorf("attempt = %d, want %d", attempt, tt.wantAttempt)
+			}
+			if tt.wantTimeSet && ts.IsZero() {
+				t.Error("timestamp is zero, want set")
+			}
+			if !tt.wantTimeSet && !ts.IsZero() {
+				t.Errorf("timestamp = %v, want zero", ts)
+			}
+		})
+	}
+}
+
+// TestCloneAnnotations pins the "shallow copy, nil in / nil out" contract that
+// the rollback path in forceArtifactGeneratorDrift / clearRecoveryTracking
+// depends on. If a future refactor "normalises" nil to an empty map, the
+// rollback would leave the caller with an empty map instead of the original
+// nil, subtly changing observable state in downstream code that treats
+// annotations == nil as a distinct signal.
+func TestCloneAnnotations(t *testing.T) {
+	t.Run("nil in, nil out", func(t *testing.T) {
+		if got := cloneAnnotations(nil); got != nil {
+			t.Errorf("cloneAnnotations(nil) = %v, want nil", got)
+		}
+	})
+	t.Run("empty in, non-nil empty out", func(t *testing.T) {
+		got := cloneAnnotations(map[string]string{})
+		if got == nil {
+			t.Error("cloneAnnotations(empty) returned nil, want empty map")
+		}
+		if len(got) != 0 {
+			t.Errorf("cloneAnnotations(empty) len = %d, want 0", len(got))
+		}
+	})
+	t.Run("populated in, independent copy out", func(t *testing.T) {
+		src := map[string]string{"a": "1", "b": "2"}
+		got := cloneAnnotations(src)
+		if len(got) != 2 || got["a"] != "1" || got["b"] != "2" {
+			t.Errorf("cloneAnnotations(populated) = %v, want copy of %v", got, src)
+		}
+		// Mutation-independence: modifying the source must not touch the copy.
+		src["a"] = "changed"
+		if got["a"] != "1" {
+			t.Errorf("clone was aliased to source; got[a]=%q after src[a]=changed", got["a"])
+		}
+	})
+}
+
+// testScheme is a shared scheme with the CRDs both reconciler test suites need.
+func testScheme(t *testing.T) *runtime.Scheme {
+	t.Helper()
+	s := runtime.NewScheme()
+	if err := cozyv1alpha1.AddToScheme(s); err != nil {
+		t.Fatalf("cozyv1alpha1.AddToScheme: %v", err)
+	}
+	if err := sourcewatcherv1beta1.AddToScheme(s); err != nil {
+		t.Fatalf("sourcewatcherv1beta1.AddToScheme: %v", err)
+	}
+	return s
+}
+
+// newAG builds a minimal ArtifactGenerator suitable for fake-client tests.
+func newAG(annotations map[string]string) *sourcewatcherv1beta1.ArtifactGenerator {
+	return &sourcewatcherv1beta1.ArtifactGenerator{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:        "example",
+			Namespace:   "cozy-system",
+			Annotations: annotations,
+		},
+	}
+}
+
+// TestForceArtifactGeneratorDrift_Success asserts that on a successful
+// force-drift call:
+//   - the AG's status.conditions[Ready] is set to False in the apiserver (this
+//     is the signal source-watcher's detectDrift keys on),
+//   - the tracking annotations land on the caller's `ag` AND in the apiserver,
+//   - the same in-memory `ag` reflects both mutations (mutation contract).
+//
+// This locks in the two-subresource shape (status patch + metadata patch) and
+// the mutation contract documented on the function.
+func TestForceArtifactGeneratorDrift_Success(t *testing.T) {
+	ag := newAG(nil)
+	c := fake.NewClientBuilder().WithScheme(testScheme(t)).WithStatusSubresource(ag).WithObjects(ag).Build()
+	r := &PackageSourceReconciler{Client: c, Scheme: testScheme(t)}
+
+	if err := r.forceArtifactGeneratorDrift(context.Background(), ag, referenceTime, 2); err != nil {
+		t.Fatalf("forceArtifactGeneratorDrift: %v", err)
+	}
+
+	// In-memory ag: Ready=False + tracking annotations reflect the writes.
+	ready := meta.FindStatusCondition(ag.Status.Conditions, "Ready")
+	if ready == nil || ready.Status != metav1.ConditionFalse || ready.Reason != reasonRecoveryForced {
+		t.Fatalf("ag.Status Ready condition = %+v, want False/%s", ready, reasonRecoveryForced)
+	}
+	if got := ag.Annotations[annotationRecoveryAttempts]; got != "2" {
+		t.Errorf("ag.Annotations[%s] = %q, want 2", annotationRecoveryAttempts, got)
+	}
+	if got := ag.Annotations[annotationLastRecoveryAt]; got == "" {
+		t.Errorf("ag.Annotations[%s] not set", annotationLastRecoveryAt)
+	}
+	// B1 (lexfrei): the requestedAt annotation MUST also be set — it is the
+	// signal source-watcher's ReconcileRequestedPredicate keys on to enqueue
+	// a reconcile. Without it the status patch alone is a no-op for up to
+	// the AG's 1h self-requeue interval.
+	if got := ag.Annotations[annotationFluxRequestedAt]; got == "" {
+		t.Errorf("ag.Annotations[%s] not set — source-watcher will not enqueue a reconcile", annotationFluxRequestedAt)
+	}
+
+	// apiserver reflects both writes.
+	persisted := &sourcewatcherv1beta1.ArtifactGenerator{}
+	if err := c.Get(context.Background(), client.ObjectKeyFromObject(ag), persisted); err != nil {
+		t.Fatalf("Get after force-drift: %v", err)
+	}
+	persistedReady := meta.FindStatusCondition(persisted.Status.Conditions, "Ready")
+	if persistedReady == nil || persistedReady.Status != metav1.ConditionFalse {
+		t.Errorf("persisted AG Ready condition = %+v, want False", persistedReady)
+	}
+	for _, k := range []string{annotationFluxRequestedAt, annotationRecoveryAttempts, annotationLastRecoveryAt} {
+		if _, ok := persisted.Annotations[k]; !ok {
+			t.Errorf("persisted AG missing annotation %s", k)
+		}
+	}
+}
+
+// TestForceArtifactGeneratorDrift_StatusPatchFailure_Rollback drives the
+// status-patch failure branch: an interceptor errors on SubResourcePatch.
+// The caller's `ag` must be untouched (both conditions and annotations) and
+// no metadata patch should have been issued.
+func TestForceArtifactGeneratorDrift_StatusPatchFailure_Rollback(t *testing.T) {
+	ag := newAG(map[string]string{"unrelated": "value"})
+	baseClient := fake.NewClientBuilder().WithScheme(testScheme(t)).WithStatusSubresource(ag).WithObjects(ag).Build()
+	metadataPatches := 0
+	failing := interceptor.NewClient(baseClient, interceptor.Funcs{
+		Patch: func(ctx context.Context, c client.WithWatch, obj client.Object, patch client.Patch, opts ...client.PatchOption) error {
+			metadataPatches++
+			return c.Patch(ctx, obj, patch, opts...)
+		},
+		SubResourcePatch: func(_ context.Context, _ client.Client, _ string, _ client.Object, _ client.Patch, _ ...client.SubResourcePatchOption) error {
+			return errors.New("simulated status patch failure")
+		},
+	})
+	r := &PackageSourceReconciler{Client: failing, Scheme: testScheme(t)}
+
+	if err := r.forceArtifactGeneratorDrift(context.Background(), ag, referenceTime, 3); err == nil {
+		t.Fatal("forceArtifactGeneratorDrift succeeded, want error")
+	}
+	if ready := meta.FindStatusCondition(ag.Status.Conditions, "Ready"); ready != nil {
+		t.Errorf("ag.Status Ready condition = %+v after failed status patch, want unset (rolled back)", ready)
+	}
+	if _, ok := ag.Annotations[annotationRecoveryAttempts]; ok {
+		t.Errorf("tracking annotation leaked despite status-patch failure: %v", ag.Annotations)
+	}
+	if metadataPatches != 0 {
+		t.Errorf("metadata patch issued %d times despite status-patch failure, want 0", metadataPatches)
+	}
+	if ag.Annotations["unrelated"] != "value" {
+		t.Errorf("pre-existing annotation lost: %v", ag.Annotations)
+	}
+}
+
+// TestForceArtifactGeneratorDrift_MetadataPatchFailure_RollbackAnnotations
+// drives the second-step failure: status patch succeeds, metadata patch fails.
+// Ready=False must remain in the caller's `ag` (successfully persisted) but
+// the tracking annotations must roll back to pre-call state so the counter
+// doesn't advance without landing in the apiserver.
+func TestForceArtifactGeneratorDrift_MetadataPatchFailure_RollbackAnnotations(t *testing.T) {
+	ag := newAG(map[string]string{"unrelated": "value"})
+	baseClient := fake.NewClientBuilder().WithScheme(testScheme(t)).WithStatusSubresource(ag).WithObjects(ag).Build()
+	failing := interceptor.NewClient(baseClient, interceptor.Funcs{
+		Patch: func(_ context.Context, _ client.WithWatch, _ client.Object, _ client.Patch, _ ...client.PatchOption) error {
+			return errors.New("simulated metadata patch failure")
+		},
+	})
+	r := &PackageSourceReconciler{Client: failing, Scheme: testScheme(t)}
+
+	if err := r.forceArtifactGeneratorDrift(context.Background(), ag, referenceTime, 4); err == nil {
+		t.Fatal("forceArtifactGeneratorDrift succeeded, want error from metadata patch")
+	}
+	// Status patch already landed, so ag.Status.Conditions carries Ready=False
+	// even though the operation as a whole errored.
+	ready := meta.FindStatusCondition(ag.Status.Conditions, "Ready")
+	if ready == nil || ready.Status != metav1.ConditionFalse {
+		t.Errorf("ag.Status Ready condition = %+v, want False (status patch succeeded)", ready)
+	}
+	// Annotations must roll back — the counter never advanced in apiserver so
+	// leaving it locally advanced would desync the caller's view. Both the
+	// tracking annotations AND the requestedAt bump (added for B1) must be
+	// symmetrically rolled back — otherwise source-watcher would see a bumped
+	// requestedAt with no matching backoff-state on our side.
+	if _, ok := ag.Annotations[annotationRecoveryAttempts]; ok {
+		t.Errorf("tracking annotation not rolled back after metadata patch failure: %v", ag.Annotations)
+	}
+	if _, ok := ag.Annotations[annotationFluxRequestedAt]; ok {
+		t.Errorf("requestedAt annotation not rolled back after metadata patch failure: %v", ag.Annotations)
+	}
+	if ag.Annotations["unrelated"] != "value" {
+		t.Errorf("pre-existing annotation lost: %v", ag.Annotations)
+	}
+}
+
+// TestForceArtifactGeneratorDrift_MetadataPatchFailure_RollbackRestoresPriorBump
+// exercises the subtle case where prior tracking annotations were set by an
+// EARLIER force-drift and the current metadata patch fails. Rollback must
+// restore prior values, not delete them.
+func TestForceArtifactGeneratorDrift_MetadataPatchFailure_RollbackRestoresPriorBump(t *testing.T) {
+	priorTimestamp := referenceTime.Add(-time.Minute).UTC().Format(time.RFC3339Nano)
+	ag := newAG(map[string]string{
+		annotationRecoveryAttempts: "1",
+		annotationLastRecoveryAt:   priorTimestamp,
+	})
+	baseClient := fake.NewClientBuilder().WithScheme(testScheme(t)).WithStatusSubresource(ag).WithObjects(ag).Build()
+	failing := interceptor.NewClient(baseClient, interceptor.Funcs{
+		Patch: func(_ context.Context, _ client.WithWatch, _ client.Object, _ client.Patch, _ ...client.PatchOption) error {
+			return errors.New("simulated metadata patch failure")
+		},
+	})
+	r := &PackageSourceReconciler{Client: failing, Scheme: testScheme(t)}
+
+	if err := r.forceArtifactGeneratorDrift(context.Background(), ag, referenceTime, 2); err == nil {
+		t.Fatal("force-drift succeeded, want error")
+	}
+	if got := ag.Annotations[annotationRecoveryAttempts]; got != "1" {
+		t.Errorf("annotationRecoveryAttempts = %q after rollback, want prior value 1", got)
+	}
+	if got := ag.Annotations[annotationLastRecoveryAt]; got != priorTimestamp {
+		t.Errorf("annotationLastRecoveryAt = %q after rollback, want prior %q", got, priorTimestamp)
+	}
+}
+
+// TestClearRecoveryTracking_Noop asserts that if the AG has no tracking
+// annotations, we don't issue a Patch at all — otherwise every healthy
+// reconcile would generate a no-op write.
+func TestClearRecoveryTracking_Noop(t *testing.T) {
+	ag := newAG(map[string]string{"unrelated": "value"})
+	baseClient := fake.NewClientBuilder().WithScheme(testScheme(t)).WithObjects(ag).Build()
+	patchCount := 0
+	watched := interceptor.NewClient(baseClient, interceptor.Funcs{
+		Patch: func(ctx context.Context, c client.WithWatch, obj client.Object, patch client.Patch, opts ...client.PatchOption) error {
+			patchCount++
+			return c.Patch(ctx, obj, patch, opts...)
+		},
+	})
+	r := &PackageSourceReconciler{Client: watched, Scheme: testScheme(t)}
+
+	if err := r.clearRecoveryTracking(context.Background(), ag); err != nil {
+		t.Fatalf("clearRecoveryTracking: %v", err)
+	}
+	if patchCount != 0 {
+		t.Errorf("clearRecoveryTracking issued %d Patch calls, want 0", patchCount)
+	}
+}
+
+// TestClearRecoveryTracking_PatchFailure_Rollback drives the failure branch and
+// asserts the tracking annotations are restored on the caller's `ag`.
+func TestClearRecoveryTracking_PatchFailure_Rollback(t *testing.T) {
+	original := map[string]string{
+		annotationRecoveryAttempts: "3",
+		annotationLastRecoveryAt:   referenceTime.UTC().Format(time.RFC3339Nano),
+		"unrelated":               "value",
+	}
+	ag := newAG(cloneAnnotations(original))
+	baseClient := fake.NewClientBuilder().WithScheme(testScheme(t)).WithObjects(ag).Build()
+	failing := interceptor.NewClient(baseClient, interceptor.Funcs{
+		Patch: func(_ context.Context, _ client.WithWatch, _ client.Object, _ client.Patch, _ ...client.PatchOption) error {
+			return errors.New("simulated Patch failure")
+		},
+	})
+	r := &PackageSourceReconciler{Client: failing, Scheme: testScheme(t)}
+
+	if err := r.clearRecoveryTracking(context.Background(), ag); err == nil {
+		t.Fatal("clearRecoveryTracking succeeded, want error")
+	}
+	if len(ag.Annotations) != len(original) {
+		t.Fatalf("ag.Annotations size = %d, want %d after rollback", len(ag.Annotations), len(original))
+	}
+	for k, v := range original {
+		if ag.Annotations[k] != v {
+			t.Errorf("ag.Annotations[%s] = %q, want %q after rollback", k, ag.Annotations[k], v)
+		}
+	}
+}
+
+// TestReconcile_DeletionTimestamp_EarlyReturn asserts that a PackageSource
+// carrying a deletionTimestamp does not have its status touched and does not
+// trigger any writes to its ArtifactGenerator's annotations — the retry driver
+// must not keep chasing an object that's already on its way out.
+func TestReconcile_DeletionTimestamp_EarlyReturn(t *testing.T) {
+	now := metav1.NewTime(referenceTime)
+	ps := &cozyv1alpha1.PackageSource{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:              "doomed",
+			Namespace:         "cozy-system",
+			DeletionTimestamp: &now,
+			Finalizers:        []string{"cozystack.io/pretend"},
+		},
+		Spec: cozyv1alpha1.PackageSourceSpec{},
+	}
+	ag := newAG(map[string]string{annotationRecoveryAttempts: "2"})
+
+	writes := 0
+	base := fake.NewClientBuilder().WithScheme(testScheme(t)).WithObjects(ps, ag).Build()
+	watched := interceptor.NewClient(base, interceptor.Funcs{
+		Patch: func(ctx context.Context, c client.WithWatch, obj client.Object, patch client.Patch, opts ...client.PatchOption) error {
+			writes++
+			return c.Patch(ctx, obj, patch, opts...)
+		},
+		Update: func(ctx context.Context, c client.WithWatch, obj client.Object, opts ...client.UpdateOption) error {
+			writes++
+			return c.Update(ctx, obj, opts...)
+		},
+		SubResourcePatch: func(ctx context.Context, c client.Client, subResourceName string, obj client.Object, patch client.Patch, opts ...client.SubResourcePatchOption) error {
+			writes++
+			return c.SubResource(subResourceName).Patch(ctx, obj, patch, opts...)
+		},
+		SubResourceUpdate: func(ctx context.Context, c client.Client, subResourceName string, obj client.Object, opts ...client.SubResourceUpdateOption) error {
+			writes++
+			return c.SubResource(subResourceName).Update(ctx, obj, opts...)
+		},
+	})
+	r := &PackageSourceReconciler{Client: watched, Scheme: testScheme(t)}
+
+	res, err := r.Reconcile(context.Background(), ctrl.Request{
+		NamespacedName: types.NamespacedName{Name: ps.Name, Namespace: ps.Namespace},
+	})
+	if err != nil {
+		t.Fatalf("Reconcile: %v", err)
+	}
+	if res.RequeueAfter != 0 {
+		t.Errorf("Reconcile scheduled RequeueAfter=%v on a deleted object, want 0", res.RequeueAfter)
+	}
+	if writes != 0 {
+		t.Errorf("Reconcile issued %d writes on a deleted object, want 0", writes)
+	}
+}
+
+// TestUpdateStatus_UnknownWithinGrace_SchedulesFollowUp locks in the fix for
+// the dormancy bug caught on a test cluster: when Ready=Unknown but grace hasn't elapsed
+// yet, artifactGeneratorStuck returns false, we fall through to the copy path
+// and — without an explicit RequeueAfter — the reconciler would sleep until
+// the AG's next status change (which may never come if it's exactly the
+// split-patch race we exist to fix) or the 10h informer resync. This test
+// asserts we schedule a follow-up reconcile at grace-period expiry so the
+// recovery driver can take over.
+func TestUpdateStatus_UnknownWithinGrace_SchedulesFollowUp(t *testing.T) {
+	// Ready=Unknown, transitioned 10s ago — grace is 30s, so 20s remaining.
+	transitionAt := referenceTime.Add(-10 * time.Second)
+	ps := &cozyv1alpha1.PackageSource{
+		ObjectMeta: metav1.ObjectMeta{Name: "example", Namespace: "cozy-system", Generation: 1},
+		Spec: cozyv1alpha1.PackageSourceSpec{
+			SourceRef: &cozyv1alpha1.PackageSourceRef{
+				Name:      "src",
+				Kind:      "OCIRepository",
+				Namespace: "cozy-system",
+			},
+		},
+	}
+	ag := &sourcewatcherv1beta1.ArtifactGenerator{
+		ObjectMeta: metav1.ObjectMeta{
+			Name: "example", Namespace: "cozy-system", Generation: 1,
+			CreationTimestamp: metav1.NewTime(referenceTime.Add(-time.Hour)),
+		},
+		Status: sourcewatcherv1beta1.ArtifactGeneratorStatus{
+			Inventory: []sourcewatcherv1beta1.ExternalArtifactReference{
+				{Name: "one", Namespace: "cozy-system", Digest: "sha256:aaa"},
+			},
+			ObservedSourcesDigest: "sha256:0e7",
+			Conditions: []metav1.Condition{{
+				Type:               "Ready",
+				Status:             metav1.ConditionUnknown,
+				Reason:             "Progressing",
+				Message:            "Reconciliation in progress",
+				ObservedGeneration: 1,
+				LastTransitionTime: metav1.NewTime(transitionAt),
+			}},
+		},
+	}
+	c := fake.NewClientBuilder().WithScheme(testScheme(t)).WithStatusSubresource(ps, ag).WithObjects(ps, ag).Build()
+	r := &PackageSourceReconciler{Client: c, Scheme: testScheme(t)}
+
+	res, err := r.updateStatus(context.Background(), ps, referenceTime)
+	if err != nil {
+		t.Fatalf("updateStatus: %v", err)
+	}
+	// remaining = transitionAt + stuckGracePeriod - now = -10s + 30s = 20s
+	if res.RequeueAfter != 20*time.Second {
+		t.Errorf("RequeueAfter = %v, want 20s (remaining grace after 10s elapsed)", res.RequeueAfter)
+	}
+}
+
+// TestUpdateStatus_MissingReadyWithinGrace_SchedulesFollowUp — same dormancy
+// fix but for the ready==nil branch: a fresh AG with no Ready condition yet
+// must also schedule a follow-up so the operator notices when grace elapses.
+func TestUpdateStatus_MissingReadyWithinGrace_SchedulesFollowUp(t *testing.T) {
+	createdAt := referenceTime.Add(-5 * time.Second) // 25s remaining on grace
+	ps := &cozyv1alpha1.PackageSource{
+		ObjectMeta: metav1.ObjectMeta{Name: "example", Namespace: "cozy-system", Generation: 1},
+		Spec: cozyv1alpha1.PackageSourceSpec{
+			SourceRef: &cozyv1alpha1.PackageSourceRef{
+				Name:      "src",
+				Kind:      "OCIRepository",
+				Namespace: "cozy-system",
+			},
+		},
+	}
+	ag := &sourcewatcherv1beta1.ArtifactGenerator{
+		ObjectMeta: metav1.ObjectMeta{
+			Name: "example", Namespace: "cozy-system", Generation: 1,
+			CreationTimestamp: metav1.NewTime(createdAt),
+		},
+		Status: sourcewatcherv1beta1.ArtifactGeneratorStatus{}, // no Ready
+	}
+	c := fake.NewClientBuilder().WithScheme(testScheme(t)).WithStatusSubresource(ps, ag).WithObjects(ps, ag).Build()
+	r := &PackageSourceReconciler{Client: c, Scheme: testScheme(t)}
+
+	res, err := r.updateStatus(context.Background(), ps, referenceTime)
+	if err != nil {
+		t.Fatalf("updateStatus: %v", err)
+	}
+	if res.RequeueAfter != 25*time.Second {
+		t.Errorf("RequeueAfter = %v, want 25s", res.RequeueAfter)
+	}
+}
+
+// TestAgFollowUpDelay pins the follow-up-delay computation, including the
+// one-second floor that prevents a zero-delay tight loop when the anchor is
+// right at or beyond grace expiry.
+func TestAgFollowUpDelay(t *testing.T) {
+	tests := []struct {
+		name         string
+		anchorOffset time.Duration
+		want         time.Duration
+	}{
+		{"anchor 10s ago — grace has 20s left", -10 * time.Second, 20 * time.Second},
+		{"anchor 5s ago — grace has 25s left", -5 * time.Second, 25 * time.Second},
+		{"anchor right at grace expiry — floor to 1s", -stuckGracePeriod, time.Second},
+		{"anchor past grace expiry — floor to 1s", -2 * stuckGracePeriod, time.Second},
+		{"anchor now — full grace remaining", 0, stuckGracePeriod},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got := agFollowUpDelay(referenceTime.Add(tt.anchorOffset), referenceTime)
+			if got != tt.want {
+				t.Errorf("agFollowUpDelay(offset=%v) = %v, want %v", tt.anchorOffset, got, tt.want)
+			}
+		})
+	}
+}
+
+// stuckAG builds an ArtifactGenerator in the fluxcd/pkg#934 stall signature:
+// Inventory populated, ObservedSourcesDigest set, Ready=Unknown on the current
+// generation, LastTransitionTime old enough to clear the grace period. Used by
+// the maybeRecoverArtifactGenerator tests below.
+func stuckAG(t *testing.T, annotations map[string]string, readyTransition time.Time) *sourcewatcherv1beta1.ArtifactGenerator {
+	t.Helper()
+	return &sourcewatcherv1beta1.ArtifactGenerator{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:        "example",
+			Namespace:   "cozy-system",
+			Generation:  1,
+			Annotations: annotations,
+		},
+		Status: sourcewatcherv1beta1.ArtifactGeneratorStatus{
+			Inventory: []sourcewatcherv1beta1.ExternalArtifactReference{
+				{Name: "one", Namespace: "cozy-system", Digest: "sha256:aaa"},
+			},
+			ObservedSourcesDigest: "sha256:0e7",
+			Conditions: []metav1.Condition{{
+				Type:               "Ready",
+				Status:             metav1.ConditionUnknown,
+				Reason:             "Progressing",
+				Message:            "Reconciliation in progress",
+				ObservedGeneration: 1,
+				LastTransitionTime: metav1.NewTime(readyTransition),
+			}},
+		},
+	}
+}
+
+// TestMaybeRecoverArtifactGenerator_ForceBranch pins the first-time-stuck path:
+// no prior tracking annotations, so decideRecovery returns Force, we patch
+// Ready=False on the AG's status, update tracking annotations, and set the
+// PackageSource to Unknown/AwaitingSourceWatcherRecovery with a RequeueAfter
+// equal to backoffFor(1).
+func TestMaybeRecoverArtifactGenerator_ForceBranch(t *testing.T) {
+	ps := &cozyv1alpha1.PackageSource{
+		ObjectMeta: metav1.ObjectMeta{Name: "example", Namespace: "cozy-system", Generation: 1},
+	}
+	ag := stuckAG(t, nil, referenceTime.Add(-2*time.Minute))
+	c := fake.NewClientBuilder().WithScheme(testScheme(t)).WithStatusSubresource(ps, ag).WithObjects(ps, ag).Build()
+	r := &PackageSourceReconciler{Client: c, Scheme: testScheme(t)}
+
+	ready := meta.FindStatusCondition(ag.Status.Conditions, "Ready")
+	res, err := r.maybeRecoverArtifactGenerator(context.Background(), ps, ag, ready, referenceTime)
+	if err != nil {
+		t.Fatalf("maybeRecoverArtifactGenerator: %v", err)
+	}
+	if res.RequeueAfter != backoffFor(1) {
+		t.Errorf("RequeueAfter = %v, want %v", res.RequeueAfter, backoffFor(1))
+	}
+
+	// AG status.Ready must be False in apiserver.
+	persistedAG := &sourcewatcherv1beta1.ArtifactGenerator{}
+	if err := c.Get(context.Background(), client.ObjectKeyFromObject(ag), persistedAG); err != nil {
+		t.Fatalf("Get AG: %v", err)
+	}
+	agReady := meta.FindStatusCondition(persistedAG.Status.Conditions, "Ready")
+	if agReady == nil || agReady.Status != metav1.ConditionFalse {
+		t.Errorf("AG Ready in apiserver = %+v, want False", agReady)
+	}
+	if persistedAG.Annotations[annotationRecoveryAttempts] != "1" {
+		t.Errorf("AG %s annotation = %q, want 1", annotationRecoveryAttempts, persistedAG.Annotations[annotationRecoveryAttempts])
+	}
+
+	// PackageSource must be Unknown/AwaitingSourceWatcherRecovery in apiserver.
+	persistedPS := &cozyv1alpha1.PackageSource{}
+	if err := c.Get(context.Background(), client.ObjectKeyFromObject(ps), persistedPS); err != nil {
+		t.Fatalf("Get PS: %v", err)
+	}
+	psReady := meta.FindStatusCondition(persistedPS.Status.Conditions, "Ready")
+	if psReady == nil || psReady.Status != metav1.ConditionUnknown || psReady.Reason != reasonAwaitingRecovery {
+		t.Errorf("PS Ready = %+v, want Unknown/%s", psReady, reasonAwaitingRecovery)
+	}
+}
+
+// TestMaybeRecoverArtifactGenerator_WaitBranch pins the in-backoff-window path:
+// prior attempt exists, backoff not yet elapsed, so decideRecovery returns
+// Wait and we do NOT touch the AG's status/annotations — only the PackageSource
+// gets Unknown/AwaitingSourceWatcherRecovery and RequeueAfter set to the
+// remaining backoff.
+func TestMaybeRecoverArtifactGenerator_WaitBranch(t *testing.T) {
+	priorForceAt := referenceTime.Add(-10 * time.Second) // 20s remaining on initialBackoff=30s
+	ps := &cozyv1alpha1.PackageSource{
+		ObjectMeta: metav1.ObjectMeta{Name: "example", Namespace: "cozy-system", Generation: 1},
+	}
+	ag := stuckAG(t, map[string]string{
+		annotationRecoveryAttempts: "1",
+		annotationLastRecoveryAt:   priorForceAt.UTC().Format(time.RFC3339Nano),
+	}, referenceTime.Add(-2*time.Minute))
+	c := fake.NewClientBuilder().WithScheme(testScheme(t)).WithStatusSubresource(ps, ag).WithObjects(ps, ag).Build()
+	agWriteCount := 0
+	watched := interceptor.NewClient(c, interceptor.Funcs{
+		Patch: func(ctx context.Context, cli client.WithWatch, obj client.Object, patch client.Patch, opts ...client.PatchOption) error {
+			if _, ok := obj.(*sourcewatcherv1beta1.ArtifactGenerator); ok {
+				agWriteCount++
+			}
+			return cli.Patch(ctx, obj, patch, opts...)
+		},
+		SubResourcePatch: func(ctx context.Context, cli client.Client, sub string, obj client.Object, patch client.Patch, opts ...client.SubResourcePatchOption) error {
+			if _, ok := obj.(*sourcewatcherv1beta1.ArtifactGenerator); ok {
+				agWriteCount++
+			}
+			return cli.SubResource(sub).Patch(ctx, obj, patch, opts...)
+		},
+	})
+	r := &PackageSourceReconciler{Client: watched, Scheme: testScheme(t)}
+
+	ready := meta.FindStatusCondition(ag.Status.Conditions, "Ready")
+	res, err := r.maybeRecoverArtifactGenerator(context.Background(), ps, ag, ready, referenceTime)
+	if err != nil {
+		t.Fatalf("maybeRecoverArtifactGenerator: %v", err)
+	}
+	if res.RequeueAfter != 20*time.Second {
+		t.Errorf("RequeueAfter = %v, want 20s", res.RequeueAfter)
+	}
+	if agWriteCount != 0 {
+		t.Errorf("wait branch wrote %d times to AG, want 0", agWriteCount)
+	}
+	persistedPS := &cozyv1alpha1.PackageSource{}
+	if err := c.Get(context.Background(), client.ObjectKeyFromObject(ps), persistedPS); err != nil {
+		t.Fatalf("Get PS: %v", err)
+	}
+	psReady := meta.FindStatusCondition(persistedPS.Status.Conditions, "Ready")
+	if psReady == nil || psReady.Reason != reasonAwaitingRecovery {
+		t.Errorf("PS Ready = %+v, want reason %s", psReady, reasonAwaitingRecovery)
+	}
+}
+
+// TestMaybeRecoverArtifactGenerator_GiveUpBranch pins the exhaustion path:
+// attempts equals maxRecoveryAttempts, so we surface the failure as
+// PackageSource Ready=False/SourceWatcherStalled and schedule no follow-up
+// reconcile (an operator must intervene). The AG is left untouched.
+func TestMaybeRecoverArtifactGenerator_GiveUpBranch(t *testing.T) {
+	ps := &cozyv1alpha1.PackageSource{
+		ObjectMeta: metav1.ObjectMeta{Name: "example", Namespace: "cozy-system", Generation: 1},
+	}
+	priorForceAt := referenceTime.Add(-time.Hour).UTC().Format(time.RFC3339Nano)
+	ag := stuckAG(t, map[string]string{
+		annotationRecoveryAttempts: strconv.Itoa(maxRecoveryAttempts),
+		annotationLastRecoveryAt:   priorForceAt,
+	}, referenceTime.Add(-time.Hour)) // last transition BEFORE lastRecoveryAt so reset-counter doesn't fire
+	c := fake.NewClientBuilder().WithScheme(testScheme(t)).WithStatusSubresource(ps, ag).WithObjects(ps, ag).Build()
+	r := &PackageSourceReconciler{Client: c, Scheme: testScheme(t)}
+
+	ready := meta.FindStatusCondition(ag.Status.Conditions, "Ready")
+	res, err := r.maybeRecoverArtifactGenerator(context.Background(), ps, ag, ready, referenceTime)
+	if err != nil {
+		t.Fatalf("maybeRecoverArtifactGenerator: %v", err)
+	}
+	if res.RequeueAfter != 0 {
+		t.Errorf("RequeueAfter = %v, want 0 (give-up path stops rescheduling)", res.RequeueAfter)
+	}
+	persistedPS := &cozyv1alpha1.PackageSource{}
+	if err := c.Get(context.Background(), client.ObjectKeyFromObject(ps), persistedPS); err != nil {
+		t.Fatalf("Get PS: %v", err)
+	}
+	psReady := meta.FindStatusCondition(persistedPS.Status.Conditions, "Ready")
+	if psReady == nil || psReady.Status != metav1.ConditionFalse || psReady.Reason != reasonSourceWatcherBad {
+		t.Errorf("PS Ready = %+v, want False/%s", psReady, reasonSourceWatcherBad)
+	}
+}
+
+// TestMaybeRecoverArtifactGenerator_DoesNotResetCounterOnFreshTransition pins
+// the fix for lexfrei's B3: source-watcher writes Ready=Unknown (Progressing)
+// as it takes the drifted branch after our force, and that transition's
+// LastTransitionTime is always newer than lastRecoveryAt. A reset-counter
+// heuristic that keys on that comparison would restart the budget on every
+// Progressing write, making the SourceWatcherStalled give-up unreachable
+// under the very race this driver targets. Assertion: with attempts already
+// at maxRecoveryAttempts, we go straight to GiveUp even when Ready has just
+// been touched — the natural clearRecoveryTracking on the not-stuck path is
+// the only counter reset, and the unified own-marker / progressing-in-recovery
+// gate in updateStatus holds tracking through Progressing by routing back
+// through this same maybeRecoverArtifactGenerator's Wait branch.
+func TestMaybeRecoverArtifactGenerator_DoesNotResetCounterOnFreshTransition(t *testing.T) {
+	priorForceAt := referenceTime.Add(-time.Hour)
+	freshTransitionAt := referenceTime.Add(-2 * time.Minute) // AFTER priorForceAt — must NOT reset
+	ps := &cozyv1alpha1.PackageSource{
+		ObjectMeta: metav1.ObjectMeta{Name: "example", Namespace: "cozy-system", Generation: 1},
+	}
+	ag := stuckAG(t, map[string]string{
+		annotationRecoveryAttempts: strconv.Itoa(maxRecoveryAttempts),
+		annotationLastRecoveryAt:   priorForceAt.UTC().Format(time.RFC3339Nano),
+	}, freshTransitionAt)
+	c := fake.NewClientBuilder().WithScheme(testScheme(t)).WithStatusSubresource(ps, ag).WithObjects(ps, ag).Build()
+	r := &PackageSourceReconciler{Client: c, Scheme: testScheme(t)}
+
+	ready := meta.FindStatusCondition(ag.Status.Conditions, "Ready")
+	res, err := r.maybeRecoverArtifactGenerator(context.Background(), ps, ag, ready, referenceTime)
+	if err != nil {
+		t.Fatalf("maybeRecoverArtifactGenerator: %v", err)
+	}
+	// Give-up path returns no RequeueAfter (operator must intervene).
+	if res.RequeueAfter != 0 {
+		t.Errorf("RequeueAfter = %v, want 0 — give-up should not schedule a follow-up", res.RequeueAfter)
+	}
+	persistedPS := &cozyv1alpha1.PackageSource{}
+	if err := c.Get(context.Background(), client.ObjectKeyFromObject(ps), persistedPS); err != nil {
+		t.Fatalf("Get PS: %v", err)
+	}
+	psReady := meta.FindStatusCondition(persistedPS.Status.Conditions, "Ready")
+	if psReady == nil || psReady.Status != metav1.ConditionFalse || psReady.Reason != reasonSourceWatcherBad {
+		t.Errorf("PS Ready = %+v, want False/%s — reset would have taken the Force branch instead", psReady, reasonSourceWatcherBad)
+	}
+}
+
+// TestUpdateStatus_OwnMarkerHoldsTrackingViaStateMachine pins lexfrei's B2
+// fix: when the AG's Ready condition carries our own reasonRecoveryForced
+// marker (our previous forceArtifactGeneratorDrift write reflecting back
+// through the Owns() watch), updateStatus must (a) NOT clear the
+// recovery-tracking annotations we just wrote, and (b) NOT copy the
+// synthetic Ready=False through to the PackageSource. It routes through the
+// unified own-marker / progressing-in-recovery / stuck gate into
+// maybeRecoverArtifactGenerator, and — because we are inside the backoff
+// window — the state machine's Wait branch keeps the PS in
+// Unknown/AwaitingSourceWatcherRecovery with a follow-up requeue.
+func TestUpdateStatus_OwnMarkerHoldsTrackingViaStateMachine(t *testing.T) {
+	ps := &cozyv1alpha1.PackageSource{
+		ObjectMeta: metav1.ObjectMeta{Name: "example", Namespace: "cozy-system", Generation: 1},
+		Spec: cozyv1alpha1.PackageSourceSpec{
+			SourceRef: &cozyv1alpha1.PackageSourceRef{Name: "src", Kind: "OCIRepository", Namespace: "cozy-system"},
+		},
+	}
+	forceAt := referenceTime.Add(-5 * time.Second)
+	ag := &sourcewatcherv1beta1.ArtifactGenerator{
+		ObjectMeta: metav1.ObjectMeta{
+			Name: "example", Namespace: "cozy-system", Generation: 1,
+			CreationTimestamp: metav1.NewTime(referenceTime.Add(-time.Hour)),
+			Annotations: map[string]string{
+				annotationRecoveryAttempts: "1",
+				annotationLastRecoveryAt:   forceAt.UTC().Format(time.RFC3339Nano),
+			},
+		},
+		Status: sourcewatcherv1beta1.ArtifactGeneratorStatus{
+			Inventory: []sourcewatcherv1beta1.ExternalArtifactReference{
+				{Name: "one", Namespace: "cozy-system", Digest: "sha256:aaa"},
+			},
+			ObservedSourcesDigest: "sha256:0e7",
+			Conditions: []metav1.Condition{{
+				Type:               "Ready",
+				Status:             metav1.ConditionFalse,
+				Reason:             reasonRecoveryForced,
+				Message:            "cozystack-operator forced drift",
+				ObservedGeneration: 1,
+				LastTransitionTime: metav1.NewTime(forceAt),
+			}},
+		},
+	}
+	c := fake.NewClientBuilder().WithScheme(testScheme(t)).WithStatusSubresource(ps, ag).WithObjects(ps, ag).Build()
+	agWrites := 0
+	watched := interceptor.NewClient(c, interceptor.Funcs{
+		Patch: func(ctx context.Context, cli client.WithWatch, obj client.Object, patch client.Patch, opts ...client.PatchOption) error {
+			if _, ok := obj.(*sourcewatcherv1beta1.ArtifactGenerator); ok {
+				agWrites++
+			}
+			return cli.Patch(ctx, obj, patch, opts...)
+		},
+	})
+	r := &PackageSourceReconciler{Client: watched, Scheme: testScheme(t)}
+
+	res, err := r.updateStatus(context.Background(), ps, referenceTime)
+	if err != nil {
+		t.Fatalf("updateStatus: %v", err)
+	}
+	// The routing goes through maybeRecoverArtifactGenerator's Wait branch:
+	// decideRecovery(attempts=1, lastRecoveryAt=referenceTime-5s, now=referenceTime)
+	// → elapsed 5s, backoffFor(1)=30s → wait 25s. Exact equality catches
+	// silent backoff-schedule regressions.
+	if res.RequeueAfter != 25*time.Second {
+		t.Errorf("RequeueAfter = %v, want 25s (backoffFor(1)=30s minus 5s elapsed)", res.RequeueAfter)
+	}
+	if agWrites != 0 {
+		t.Errorf("clearRecoveryTracking wrote to AG %d times — tracking must be held while our own marker is visible", agWrites)
+	}
+	// AG's recovery-tracking annotations must still be intact.
+	persistedAG := &sourcewatcherv1beta1.ArtifactGenerator{}
+	if err := c.Get(context.Background(), client.ObjectKeyFromObject(ag), persistedAG); err != nil {
+		t.Fatalf("Get AG: %v", err)
+	}
+	if got := persistedAG.Annotations[annotationRecoveryAttempts]; got != "1" {
+		t.Errorf("AG %s = %q after own-marker reconcile, want 1 (held)", annotationRecoveryAttempts, got)
+	}
+	// PS must be Unknown/AwaitingSourceWatcherRecovery — NOT False/SourceWatcherRecoveryForced.
+	persistedPS := &cozyv1alpha1.PackageSource{}
+	if err := c.Get(context.Background(), client.ObjectKeyFromObject(ps), persistedPS); err != nil {
+		t.Fatalf("Get PS: %v", err)
+	}
+	psReady := meta.FindStatusCondition(persistedPS.Status.Conditions, "Ready")
+	if psReady == nil || psReady.Status != metav1.ConditionUnknown || psReady.Reason != reasonAwaitingRecovery {
+		t.Errorf("PS Ready = %+v, want Unknown/%s — synthetic marker must not leak to PS status", psReady, reasonAwaitingRecovery)
+	}
+}
+
+// TestUpdateStatus_ProgressingDuringRecoveryHoldsTracking pins lexfrei's B2
+// fix for the second Owns()-re-entrancy path: source-watcher writes
+// Ready=Unknown/Progressing after taking the drifted branch and before
+// finalising the rebuild. That transition arrives via the Owns() watch, and
+// if we cleared tracking on it the attempts counter would never accumulate.
+// Assertion: with tracking annotations present (attempts>0) and Ready=Unknown
+// visible on the current generation, updateStatus routes through the unified
+// own-marker / progressing-in-recovery gate into maybeRecoverArtifactGenerator
+// so the state machine holds tracking through Wait instead of clearing it.
+func TestUpdateStatus_ProgressingDuringRecoveryHoldsTracking(t *testing.T) {
+	ps := &cozyv1alpha1.PackageSource{
+		ObjectMeta: metav1.ObjectMeta{Name: "example", Namespace: "cozy-system", Generation: 1},
+		Spec: cozyv1alpha1.PackageSourceSpec{
+			SourceRef: &cozyv1alpha1.PackageSourceRef{Name: "src", Kind: "OCIRepository", Namespace: "cozy-system"},
+		},
+	}
+	forceAt := referenceTime.Add(-10 * time.Second)
+	progressingAt := referenceTime.Add(-3 * time.Second) // Newer than forceAt
+	ag := &sourcewatcherv1beta1.ArtifactGenerator{
+		ObjectMeta: metav1.ObjectMeta{
+			Name: "example", Namespace: "cozy-system", Generation: 1,
+			CreationTimestamp: metav1.NewTime(referenceTime.Add(-time.Hour)),
+			Annotations: map[string]string{
+				annotationRecoveryAttempts: "2",
+				annotationLastRecoveryAt:   forceAt.UTC().Format(time.RFC3339Nano),
+			},
+		},
+		Status: sourcewatcherv1beta1.ArtifactGeneratorStatus{
+			Inventory: []sourcewatcherv1beta1.ExternalArtifactReference{
+				{Name: "one", Namespace: "cozy-system", Digest: "sha256:aaa"},
+			},
+			ObservedSourcesDigest: "sha256:0e7",
+			Conditions: []metav1.Condition{{
+				Type:               "Ready",
+				Status:             metav1.ConditionUnknown,
+				Reason:             "Progressing",
+				Message:            "Reconciliation in progress",
+				ObservedGeneration: 1,
+				LastTransitionTime: metav1.NewTime(progressingAt),
+			}},
+		},
+	}
+	c := fake.NewClientBuilder().WithScheme(testScheme(t)).WithStatusSubresource(ps, ag).WithObjects(ps, ag).Build()
+	agWrites := 0
+	watched := interceptor.NewClient(c, interceptor.Funcs{
+		Patch: func(ctx context.Context, cli client.WithWatch, obj client.Object, patch client.Patch, opts ...client.PatchOption) error {
+			if _, ok := obj.(*sourcewatcherv1beta1.ArtifactGenerator); ok {
+				agWrites++
+			}
+			return cli.Patch(ctx, obj, patch, opts...)
+		},
+	})
+	r := &PackageSourceReconciler{Client: watched, Scheme: testScheme(t)}
+
+	if _, err := r.updateStatus(context.Background(), ps, referenceTime); err != nil {
+		t.Fatalf("updateStatus: %v", err)
+	}
+	if agWrites != 0 {
+		t.Errorf("tracking cleared during recovery Progressing — attempts=2 wrote to AG %d times, want 0", agWrites)
+	}
+	persistedAG := &sourcewatcherv1beta1.ArtifactGenerator{}
+	if err := c.Get(context.Background(), client.ObjectKeyFromObject(ag), persistedAG); err != nil {
+		t.Fatalf("Get AG: %v", err)
+	}
+	if got := persistedAG.Annotations[annotationRecoveryAttempts]; got != "2" {
+		t.Errorf("AG %s = %q, want 2 (held through Progressing)", annotationRecoveryAttempts, got)
+	}
+}
+
+// TestUpdateStatus_ReadyTrueClearsTracking pins the canonical reset: once
+// source-watcher writes Ready=True (recovery succeeded), the not-stuck path
+// clears the recovery-tracking annotations and copies the real condition
+// through. This is the only counter reset that remains after B3.
+func TestUpdateStatus_ReadyTrueClearsTracking(t *testing.T) {
+	ps := &cozyv1alpha1.PackageSource{
+		ObjectMeta: metav1.ObjectMeta{Name: "example", Namespace: "cozy-system", Generation: 1},
+		Spec: cozyv1alpha1.PackageSourceSpec{
+			SourceRef: &cozyv1alpha1.PackageSourceRef{Name: "src", Kind: "OCIRepository", Namespace: "cozy-system"},
+		},
+	}
+	ag := &sourcewatcherv1beta1.ArtifactGenerator{
+		ObjectMeta: metav1.ObjectMeta{
+			Name: "example", Namespace: "cozy-system", Generation: 1,
+			CreationTimestamp: metav1.NewTime(referenceTime.Add(-time.Hour)),
+			Annotations: map[string]string{
+				annotationRecoveryAttempts: "3",
+				annotationLastRecoveryAt:   referenceTime.Add(-time.Minute).UTC().Format(time.RFC3339Nano),
+			},
+		},
+		Status: sourcewatcherv1beta1.ArtifactGeneratorStatus{
+			Inventory: []sourcewatcherv1beta1.ExternalArtifactReference{
+				{Name: "one", Namespace: "cozy-system", Digest: "sha256:aaa"},
+			},
+			ObservedSourcesDigest: "sha256:0e7",
+			Conditions: []metav1.Condition{{
+				Type:               "Ready",
+				Status:             metav1.ConditionTrue,
+				Reason:             "Succeeded",
+				ObservedGeneration: 1,
+				LastTransitionTime: metav1.NewTime(referenceTime.Add(-time.Second)),
+			}},
+		},
+	}
+	c := fake.NewClientBuilder().WithScheme(testScheme(t)).WithStatusSubresource(ps, ag).WithObjects(ps, ag).Build()
+	r := &PackageSourceReconciler{Client: c, Scheme: testScheme(t)}
+
+	if _, err := r.updateStatus(context.Background(), ps, referenceTime); err != nil {
+		t.Fatalf("updateStatus: %v", err)
+	}
+	persistedAG := &sourcewatcherv1beta1.ArtifactGenerator{}
+	if err := c.Get(context.Background(), client.ObjectKeyFromObject(ag), persistedAG); err != nil {
+		t.Fatalf("Get AG: %v", err)
+	}
+	if _, ok := persistedAG.Annotations[annotationRecoveryAttempts]; ok {
+		t.Errorf("recovery-attempts annotation still present after Ready=True: %v", persistedAG.Annotations)
+	}
+	persistedPS := &cozyv1alpha1.PackageSource{}
+	if err := c.Get(context.Background(), client.ObjectKeyFromObject(ps), persistedPS); err != nil {
+		t.Fatalf("Get PS: %v", err)
+	}
+	psReady := meta.FindStatusCondition(persistedPS.Status.Conditions, "Ready")
+	if psReady == nil || psReady.Status != metav1.ConditionTrue {
+		t.Errorf("PS Ready = %+v, want True (copied through from AG)", psReady)
+	}
+}
+
+// TestUpdateStatus_OwnMarkerStale_TriggersRetry regression-tests the
+// source-watcher-unresponsive path that an earlier iteration of this driver
+// tripped on: after we force-drift, source-watcher never enqueues (network
+// partition, missing predicate, pod dead), and our previous force's marker
+// keeps reflecting back via Owns(). If updateStatus routed that into a
+// perpetual "await" helper the recovery would tight-loop forever and
+// SourceWatcherStalled would be unreachable. Asserted here: past
+// backoffFor(attempts), the state machine issues another force (bumps
+// attempts, re-stamps requestedAt) rather than idling.
+func TestUpdateStatus_OwnMarkerStale_TriggersRetry(t *testing.T) {
+	// attempts=1, lastRecoveryAt=referenceTime-60s. backoffFor(1)=30s, so
+	// 60s > 30s → decideRecovery must Force again.
+	forceAt := referenceTime.Add(-60 * time.Second)
+	ps := &cozyv1alpha1.PackageSource{
+		ObjectMeta: metav1.ObjectMeta{Name: "example", Namespace: "cozy-system", Generation: 1},
+		Spec: cozyv1alpha1.PackageSourceSpec{
+			SourceRef: &cozyv1alpha1.PackageSourceRef{Name: "src", Kind: "OCIRepository", Namespace: "cozy-system"},
+		},
+	}
+	ag := &sourcewatcherv1beta1.ArtifactGenerator{
+		ObjectMeta: metav1.ObjectMeta{
+			Name: "example", Namespace: "cozy-system", Generation: 1,
+			CreationTimestamp: metav1.NewTime(referenceTime.Add(-time.Hour)),
+			Annotations: map[string]string{
+				annotationRecoveryAttempts: "1",
+				annotationLastRecoveryAt:   forceAt.UTC().Format(time.RFC3339Nano),
+				annotationFluxRequestedAt:  forceAt.UTC().Format(time.RFC3339Nano),
+			},
+		},
+		Status: sourcewatcherv1beta1.ArtifactGeneratorStatus{
+			Inventory: []sourcewatcherv1beta1.ExternalArtifactReference{
+				{Name: "one", Namespace: "cozy-system", Digest: "sha256:aaa"},
+			},
+			ObservedSourcesDigest: "sha256:0e7",
+			Conditions: []metav1.Condition{{
+				Type:               "Ready",
+				Status:             metav1.ConditionFalse,
+				Reason:             reasonRecoveryForced,
+				Message:            "cozystack-operator forced drift (source-watcher never responded)",
+				ObservedGeneration: 1,
+				LastTransitionTime: metav1.NewTime(forceAt),
+			}},
+		},
+	}
+	c := fake.NewClientBuilder().WithScheme(testScheme(t)).WithStatusSubresource(ps, ag).WithObjects(ps, ag).Build()
+	r := &PackageSourceReconciler{Client: c, Scheme: testScheme(t)}
+
+	if _, err := r.updateStatus(context.Background(), ps, referenceTime); err != nil {
+		t.Fatalf("updateStatus: %v", err)
+	}
+	// attempts must have incremented from 1 → 2.
+	persistedAG := &sourcewatcherv1beta1.ArtifactGenerator{}
+	if err := c.Get(context.Background(), client.ObjectKeyFromObject(ag), persistedAG); err != nil {
+		t.Fatalf("Get AG: %v", err)
+	}
+	if got := persistedAG.Annotations[annotationRecoveryAttempts]; got != "2" {
+		t.Errorf("AG %s = %q, want 2 — stale own-marker must escalate through Force, not idle", annotationRecoveryAttempts, got)
+	}
+	// requestedAt must have been re-stamped to a fresh timestamp so
+	// source-watcher's next reconcile-request predicate fires.
+	if got := persistedAG.Annotations[annotationFluxRequestedAt]; got == forceAt.UTC().Format(time.RFC3339Nano) {
+		t.Errorf("AG %s = %q — must be re-stamped on retry", annotationFluxRequestedAt, got)
+	}
+}
+
+// TestUpdateStatus_OwnMarkerAttemptsExhausted_GivesUp regression-tests the
+// endpoint of the retry loop: with attempts=maxRecoveryAttempts and our own
+// marker still reflecting back (source-watcher never reacted through the
+// whole budget), updateStatus must surface Ready=False /
+// SourceWatcherStalled on the PackageSource instead of looping forever.
+func TestUpdateStatus_OwnMarkerAttemptsExhausted_GivesUp(t *testing.T) {
+	forceAt := referenceTime.Add(-10 * time.Minute) // well past any backoff
+	ps := &cozyv1alpha1.PackageSource{
+		ObjectMeta: metav1.ObjectMeta{Name: "example", Namespace: "cozy-system", Generation: 1},
+		Spec: cozyv1alpha1.PackageSourceSpec{
+			SourceRef: &cozyv1alpha1.PackageSourceRef{Name: "src", Kind: "OCIRepository", Namespace: "cozy-system"},
+		},
+	}
+	ag := &sourcewatcherv1beta1.ArtifactGenerator{
+		ObjectMeta: metav1.ObjectMeta{
+			Name: "example", Namespace: "cozy-system", Generation: 1,
+			CreationTimestamp: metav1.NewTime(referenceTime.Add(-time.Hour)),
+			Annotations: map[string]string{
+				annotationRecoveryAttempts: strconv.Itoa(maxRecoveryAttempts),
+				annotationLastRecoveryAt:   forceAt.UTC().Format(time.RFC3339Nano),
+			},
+		},
+		Status: sourcewatcherv1beta1.ArtifactGeneratorStatus{
+			Inventory: []sourcewatcherv1beta1.ExternalArtifactReference{
+				{Name: "one", Namespace: "cozy-system", Digest: "sha256:aaa"},
+			},
+			ObservedSourcesDigest: "sha256:0e7",
+			Conditions: []metav1.Condition{{
+				Type:               "Ready",
+				Status:             metav1.ConditionFalse,
+				Reason:             reasonRecoveryForced,
+				ObservedGeneration: 1,
+				LastTransitionTime: metav1.NewTime(forceAt),
+			}},
+		},
+	}
+	c := fake.NewClientBuilder().WithScheme(testScheme(t)).WithStatusSubresource(ps, ag).WithObjects(ps, ag).Build()
+	r := &PackageSourceReconciler{Client: c, Scheme: testScheme(t)}
+
+	res, err := r.updateStatus(context.Background(), ps, referenceTime)
+	if err != nil {
+		t.Fatalf("updateStatus: %v", err)
+	}
+	if res.RequeueAfter != 0 {
+		t.Errorf("RequeueAfter = %v on give-up, want 0 (operator must intervene)", res.RequeueAfter)
+	}
+	persistedPS := &cozyv1alpha1.PackageSource{}
+	if err := c.Get(context.Background(), client.ObjectKeyFromObject(ps), persistedPS); err != nil {
+		t.Fatalf("Get PS: %v", err)
+	}
+	psReady := meta.FindStatusCondition(persistedPS.Status.Conditions, "Ready")
+	if psReady == nil || psReady.Status != metav1.ConditionFalse || psReady.Reason != reasonSourceWatcherBad {
+		t.Errorf("PS Ready = %+v, want False/%s — unresponsive source-watcher must eventually surface as stalled", psReady, reasonSourceWatcherBad)
+	}
+}
+
+// TestUpdateStatus_OwnMarkerAttemptsExhaustedButFinalBackoffPending pins
+// lexfrei's follow-up on the give-up path: the Owns()-watch re-fire from the
+// 5th force-drift's own writes triggers a reconcile milliseconds after the
+// force. Without the "hold final backoff window" gate in decideRecovery,
+// that re-fire would see `attempts >= maxRecoveryAttempts` and immediately
+// return GiveUp, preempting the 4-minute response window the last nudge
+// was supposed to grant source-watcher — effective time-to-give-up
+// collapses from the documented ~11.5m to ~7.5m. Assertion: with
+// attempts=maxRecoveryAttempts AND lastRecoveryAt=now-eps (the exact shape
+// of the re-fire on the 5th force's own writes), updateStatus must return
+// Wait with RequeueAfter equal to the remaining backoffFor(maxRecoveryAttempts),
+// NOT GiveUp.
+func TestUpdateStatus_OwnMarkerAttemptsExhaustedButFinalBackoffPending(t *testing.T) {
+	// Simulate the moment right after the 5th force landed: attempts=max,
+	// lastRecoveryAt=now-eps, marker still on the AG.
+	forceAt := referenceTime.Add(-time.Second)
+	ps := &cozyv1alpha1.PackageSource{
+		ObjectMeta: metav1.ObjectMeta{Name: "example", Namespace: "cozy-system", Generation: 1},
+		Spec: cozyv1alpha1.PackageSourceSpec{
+			SourceRef: &cozyv1alpha1.PackageSourceRef{Name: "src", Kind: "OCIRepository", Namespace: "cozy-system"},
+		},
+	}
+	ag := &sourcewatcherv1beta1.ArtifactGenerator{
+		ObjectMeta: metav1.ObjectMeta{
+			Name: "example", Namespace: "cozy-system", Generation: 1,
+			CreationTimestamp: metav1.NewTime(referenceTime.Add(-time.Hour)),
+			Annotations: map[string]string{
+				annotationRecoveryAttempts: strconv.Itoa(maxRecoveryAttempts),
+				annotationLastRecoveryAt:   forceAt.UTC().Format(time.RFC3339Nano),
+			},
+		},
+		Status: sourcewatcherv1beta1.ArtifactGeneratorStatus{
+			Inventory: []sourcewatcherv1beta1.ExternalArtifactReference{
+				{Name: "one", Namespace: "cozy-system", Digest: "sha256:aaa"},
+			},
+			ObservedSourcesDigest: "sha256:0e7",
+			Conditions: []metav1.Condition{{
+				Type:               "Ready",
+				Status:             metav1.ConditionFalse,
+				Reason:             reasonRecoveryForced,
+				ObservedGeneration: 1,
+				LastTransitionTime: metav1.NewTime(forceAt),
+			}},
+		},
+	}
+	c := fake.NewClientBuilder().WithScheme(testScheme(t)).WithStatusSubresource(ps, ag).WithObjects(ps, ag).Build()
+	r := &PackageSourceReconciler{Client: c, Scheme: testScheme(t)}
+
+	res, err := r.updateStatus(context.Background(), ps, referenceTime)
+	if err != nil {
+		t.Fatalf("updateStatus: %v", err)
+	}
+	wantWait := backoffFor(maxRecoveryAttempts) - time.Second
+	if res.RequeueAfter != wantWait {
+		t.Errorf("RequeueAfter = %v, want %v — final backoff window must not be preempted", res.RequeueAfter, wantWait)
+	}
+	// PS must still be Unknown/AwaitingSourceWatcherRecovery, NOT False/SourceWatcherStalled.
+	persistedPS := &cozyv1alpha1.PackageSource{}
+	if err := c.Get(context.Background(), client.ObjectKeyFromObject(ps), persistedPS); err != nil {
+		t.Fatalf("Get PS: %v", err)
+	}
+	psReady := meta.FindStatusCondition(persistedPS.Status.Conditions, "Ready")
+	if psReady == nil || psReady.Status != metav1.ConditionUnknown || psReady.Reason != reasonAwaitingRecovery {
+		t.Errorf("PS Ready = %+v, want Unknown/%s — give-up must wait for final backoff to elapse", psReady, reasonAwaitingRecovery)
+	}
+}
+
+// TestReconcileArtifactGeneratorsLayersValuesFiles pins how a component's
+// valuesFiles become copy operations: every file lands on the same
+// values.yaml, the first one replacing the chart's own values and each later
+// one merged on top in declaration order, so a later file wins on conflicting
+// keys.
+func TestReconcileArtifactGeneratorsLayersValuesFiles(t *testing.T) {
+	ps := &cozyv1alpha1.PackageSource{
+		ObjectMeta: metav1.ObjectMeta{Name: "demo.app"},
+		Spec: cozyv1alpha1.PackageSourceSpec{
+			SourceRef: &cozyv1alpha1.PackageSourceRef{Kind: "OCIRepository", Name: "demo-app", Namespace: "cozy-system"},
+			Variants: []cozyv1alpha1.Variant{{
+				Name: "default",
+				Components: []cozyv1alpha1.Component{{
+					Name:        "web",
+					Path:        "apps/web",
+					ValuesFiles: []string{"values.yaml", "values-ha.yaml", "values-site.yaml"},
+				}},
+			}},
+		},
+	}
+	cl := fake.NewClientBuilder().WithScheme(testScheme(t)).WithObjects(ps.DeepCopy()).Build()
+	r := &PackageSourceReconciler{Client: cl, Scheme: testScheme(t)}
+	if err := r.reconcileArtifactGenerators(context.Background(), ps); err != nil {
+		t.Fatalf("reconcileArtifactGenerators: %v", err)
+	}
+
+	var ag sourcewatcherv1beta1.ArtifactGenerator
+	if err := cl.Get(context.Background(), types.NamespacedName{Name: "demo.app", Namespace: "cozy-system"}, &ag); err != nil {
+		t.Fatalf("get ArtifactGenerator: %v", err)
+	}
+	if len(ag.Spec.OutputArtifacts) != 1 {
+		t.Fatalf("OutputArtifacts = %d, want 1", len(ag.Spec.OutputArtifacts))
+	}
+	want := []sourcewatcherv1beta1.CopyOperation{
+		{From: "@demo-app/apps/web/**", To: "@artifact/web/"},
+		{From: "@demo-app/apps/web/values.yaml", To: "@artifact/web/values.yaml", Strategy: "Overwrite"},
+		{From: "@demo-app/apps/web/values-ha.yaml", To: "@artifact/web/values.yaml", Strategy: "Merge"},
+		{From: "@demo-app/apps/web/values-site.yaml", To: "@artifact/web/values.yaml", Strategy: "Merge"},
+	}
+	if got := ag.Spec.OutputArtifacts[0].Copy; !reflect.DeepEqual(got, want) {
+		t.Errorf("Copy =\n%+v\nwant\n%+v", got, want)
+	}
+}
+
+// builtAG returns a PackageSource and an ArtifactGenerator on the given
+// generation whose Ready condition reports a finished build.
+func builtAG(gen int64, readyStatus metav1.ConditionStatus, readyGen int64, annotations map[string]string) (*cozyv1alpha1.PackageSource, *sourcewatcherv1beta1.ArtifactGenerator) {
+	ps := &cozyv1alpha1.PackageSource{
+		ObjectMeta: metav1.ObjectMeta{Name: "example", Namespace: "cozy-system", Generation: 1},
+		Spec: cozyv1alpha1.PackageSourceSpec{
+			SourceRef: &cozyv1alpha1.PackageSourceRef{Name: "src", Kind: "OCIRepository", Namespace: "cozy-system"},
+		},
+	}
+	ag := &sourcewatcherv1beta1.ArtifactGenerator{
+		ObjectMeta: metav1.ObjectMeta{
+			Name: "example", Namespace: "cozy-system", Generation: gen,
+			CreationTimestamp: metav1.NewTime(referenceTime.Add(-time.Hour)),
+			Annotations:       annotations,
+		},
+		Status: sourcewatcherv1beta1.ArtifactGeneratorStatus{
+			Inventory: []sourcewatcherv1beta1.ExternalArtifactReference{
+				{Name: "one", Namespace: "cozy-system", Digest: "sha256:aaa"},
+			},
+			ObservedSourcesDigest: "sha256:0e7",
+			Conditions: []metav1.Condition{{
+				Type:               "Ready",
+				Status:             readyStatus,
+				Reason:             "Succeeded",
+				ObservedGeneration: readyGen,
+				LastTransitionTime: metav1.NewTime(referenceTime.Add(-time.Second)),
+			}},
+		},
+	}
+	return ps, ag
+}
+
+// TestUpdateStatus_ReadyOnUnverifiedGeneration_ForcesRebuild pins the guard
+// against the source-watcher race where a build started on generation N-1
+// finishes after the spec moved to N and still records N as observed: the
+// first Ready=True on a spec generation the operator changed forces one
+// rebuild and records that generation as verified.
+func TestUpdateStatus_ReadyOnUnverifiedGeneration_ForcesRebuild(t *testing.T) {
+	cases := []struct {
+		name        string
+		gen         int64
+		annotations map[string]string
+	}{
+		{"first spec change", 2, nil},
+		{"later spec change", 3, map[string]string{annotationVerifiedGeneration: "2"}},
+	}
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			testReadyOnUnverifiedGenerationForcesRebuild(t, tc.gen, tc.annotations)
+		})
+	}
+}
+
+func testReadyOnUnverifiedGenerationForcesRebuild(t *testing.T, gen int64, annotations map[string]string) {
+	ps, ag := builtAG(gen, metav1.ConditionTrue, gen, annotations)
+	c := fake.NewClientBuilder().WithScheme(testScheme(t)).WithStatusSubresource(ps, ag).WithObjects(ps, ag).Build()
+	r := &PackageSourceReconciler{Client: c, Scheme: testScheme(t)}
+
+	res, err := r.updateStatus(context.Background(), ps, referenceTime)
+	if err != nil {
+		t.Fatalf("updateStatus: %v", err)
+	}
+	if res.RequeueAfter != backoffFor(1) {
+		t.Errorf("RequeueAfter = %v, want %v", res.RequeueAfter, backoffFor(1))
+	}
+
+	persistedAG := &sourcewatcherv1beta1.ArtifactGenerator{}
+	if err := c.Get(context.Background(), client.ObjectKeyFromObject(ag), persistedAG); err != nil {
+		t.Fatalf("Get AG: %v", err)
+	}
+	agReady := meta.FindStatusCondition(persistedAG.Status.Conditions, "Ready")
+	if agReady == nil || agReady.Status != metav1.ConditionFalse || agReady.Reason != reasonRecoveryForced {
+		t.Errorf("AG Ready = %+v, want False/%s", agReady, reasonRecoveryForced)
+	}
+	if persistedAG.Annotations[annotationFluxRequestedAt] == "" {
+		t.Errorf("requestedAt not bumped: %v", persistedAG.Annotations)
+	}
+	if got, want := persistedAG.Annotations[annotationVerifiedGeneration], strconv.FormatInt(gen, 10); got != want {
+		t.Errorf("verified generation = %q, want %q", got, want)
+	}
+
+	persistedPS := &cozyv1alpha1.PackageSource{}
+	if err := c.Get(context.Background(), client.ObjectKeyFromObject(ps), persistedPS); err != nil {
+		t.Fatalf("Get PS: %v", err)
+	}
+	psReady := meta.FindStatusCondition(persistedPS.Status.Conditions, "Ready")
+	if psReady == nil || psReady.Status != metav1.ConditionUnknown || psReady.Reason != reasonAwaitingRecovery {
+		t.Errorf("PS Ready = %+v, want Unknown/%s", psReady, reasonAwaitingRecovery)
+	}
+}
+
+// TestUpdateStatus_VerificationSkipped covers every state where the forced
+// rebuild must not happen, so a verified or never-changed generator is not
+// rebuilt on every reconcile and a failed or in-flight build is left to
+// source-watcher.
+func TestUpdateStatus_VerificationSkipped(t *testing.T) {
+	cases := []struct {
+		name        string
+		gen         int64
+		status      metav1.ConditionStatus
+		readyGen    int64
+		annotations map[string]string
+	}{
+		{"generation already verified", 2, metav1.ConditionTrue, 2, map[string]string{annotationVerifiedGeneration: "2"}},
+		{"spec never changed after creation", 1, metav1.ConditionTrue, 1, nil},
+		{"build failed", 2, metav1.ConditionFalse, 2, nil},
+		{"source-watcher has not caught up with the spec", 3, metav1.ConditionTrue, 2, map[string]string{annotationVerifiedGeneration: "2"}},
+	}
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			ps, ag := builtAG(tc.gen, tc.status, tc.readyGen, tc.annotations)
+			c := fake.NewClientBuilder().WithScheme(testScheme(t)).WithStatusSubresource(ps, ag).WithObjects(ps, ag).Build()
+			r := &PackageSourceReconciler{Client: c, Scheme: testScheme(t)}
+
+			if _, err := r.updateStatus(context.Background(), ps, referenceTime); err != nil {
+				t.Fatalf("updateStatus: %v", err)
+			}
+			persistedAG := &sourcewatcherv1beta1.ArtifactGenerator{}
+			if err := c.Get(context.Background(), client.ObjectKeyFromObject(ag), persistedAG); err != nil {
+				t.Fatalf("Get AG: %v", err)
+			}
+			if _, ok := persistedAG.Annotations[annotationFluxRequestedAt]; ok {
+				t.Errorf("rebuild forced: %v", persistedAG.Annotations)
+			}
+			persistedPS := &cozyv1alpha1.PackageSource{}
+			if err := c.Get(context.Background(), client.ObjectKeyFromObject(ps), persistedPS); err != nil {
+				t.Fatalf("Get PS: %v", err)
+			}
+			psReady := meta.FindStatusCondition(persistedPS.Status.Conditions, "Ready")
+			if psReady == nil || psReady.Status != tc.status {
+				t.Errorf("PS Ready = %+v, want %s copied through", psReady, tc.status)
+			}
+		})
+	}
+}
+
+// TestUpdateStatus_VerifiedRebuildSettles walks the forced rebuild to its end:
+// once source-watcher reports Ready=True again, the recovery bookkeeping is
+// cleared and the condition is copied through without another rebuild.
+func TestUpdateStatus_VerifiedRebuildSettles(t *testing.T) {
+	forcedAt := referenceTime.Add(-10 * time.Second).UTC().Format(time.RFC3339Nano)
+	ps, ag := builtAG(2, metav1.ConditionTrue, 2, map[string]string{
+		annotationVerifiedGeneration: "2",
+		annotationRecoveryAttempts:   "1",
+		annotationLastRecoveryAt:     forcedAt,
+		annotationFluxRequestedAt:    forcedAt,
+	})
+	c := fake.NewClientBuilder().WithScheme(testScheme(t)).WithStatusSubresource(ps, ag).WithObjects(ps, ag).Build()
+	r := &PackageSourceReconciler{Client: c, Scheme: testScheme(t)}
+
+	res, err := r.updateStatus(context.Background(), ps, referenceTime)
+	if err != nil {
+		t.Fatalf("updateStatus: %v", err)
+	}
+	if res.RequeueAfter != 0 {
+		t.Errorf("RequeueAfter = %v, want none", res.RequeueAfter)
+	}
+	persistedAG := &sourcewatcherv1beta1.ArtifactGenerator{}
+	if err := c.Get(context.Background(), client.ObjectKeyFromObject(ag), persistedAG); err != nil {
+		t.Fatalf("Get AG: %v", err)
+	}
+	if _, ok := persistedAG.Annotations[annotationRecoveryAttempts]; ok {
+		t.Errorf("recovery tracking not cleared: %v", persistedAG.Annotations)
+	}
+	if got := persistedAG.Annotations[annotationFluxRequestedAt]; got != forcedAt {
+		t.Errorf("requestedAt = %q, want %q (no second rebuild)", got, forcedAt)
+	}
+}
+
+// TestUpdateStatus_VerificationForceFailure_LeavesGenerationUnverified pins
+// the ordering the verification relies on: a generation is marked verified
+// only after the rebuild was forced, so a failed force is retried instead of
+// being recorded as done.
+func TestUpdateStatus_VerificationForceFailure_LeavesGenerationUnverified(t *testing.T) {
+	ps, ag := builtAG(2, metav1.ConditionTrue, 2, nil)
+	baseClient := fake.NewClientBuilder().WithScheme(testScheme(t)).WithStatusSubresource(ps, ag).WithObjects(ps, ag).Build()
+	failing := interceptor.NewClient(baseClient, interceptor.Funcs{
+		SubResourcePatch: func(_ context.Context, _ client.Client, _ string, _ client.Object, _ client.Patch, _ ...client.SubResourcePatchOption) error {
+			return errors.New("simulated status patch failure")
+		},
+	})
+	r := &PackageSourceReconciler{Client: failing, Scheme: testScheme(t)}
+
+	if _, err := r.updateStatus(context.Background(), ps, referenceTime); err == nil {
+		t.Fatal("updateStatus succeeded, want error from the forced rebuild")
+	}
+	persistedAG := &sourcewatcherv1beta1.ArtifactGenerator{}
+	if err := baseClient.Get(context.Background(), client.ObjectKeyFromObject(ag), persistedAG); err != nil {
+		t.Fatalf("Get AG: %v", err)
+	}
+	if _, ok := persistedAG.Annotations[annotationVerifiedGeneration]; ok {
+		t.Errorf("generation marked verified although the rebuild was never forced: %v", persistedAG.Annotations)
+	}
+	persistedPS := &cozyv1alpha1.PackageSource{}
+	if err := baseClient.Get(context.Background(), client.ObjectKeyFromObject(ps), persistedPS); err != nil {
+		t.Fatalf("Get PS: %v", err)
+	}
+	if psReady := meta.FindStatusCondition(persistedPS.Status.Conditions, "Ready"); psReady != nil {
+		t.Errorf("PS Ready = %+v, want unset: the unverified Ready=True must not be copied through", psReady)
+	}
+}
+
+// TestUpdateStatus_VerificationIgnoresStaleRecoveryCounter pins that the
+// verification rebuild starts its own attempt budget: clearing a counter left
+// by an earlier stall is best-effort, and inheriting it could leave the
+// verification a single backoff window before SourceWatcherStalled.
+func TestUpdateStatus_VerificationIgnoresStaleRecoveryCounter(t *testing.T) {
+	ps, ag := builtAG(2, metav1.ConditionTrue, 2, map[string]string{
+		annotationRecoveryAttempts: "4",
+		annotationLastRecoveryAt:   referenceTime.Add(-time.Hour).UTC().Format(time.RFC3339Nano),
+	})
+	baseClient := fake.NewClientBuilder().WithScheme(testScheme(t)).WithStatusSubresource(ps, ag).WithObjects(ps, ag).Build()
+	patches := 0
+	failing := interceptor.NewClient(baseClient, interceptor.Funcs{
+		Patch: func(ctx context.Context, c client.WithWatch, obj client.Object, patch client.Patch, opts ...client.PatchOption) error {
+			patches++
+			if patches == 1 {
+				return errors.New("simulated failure clearing recovery tracking")
+			}
+			return c.Patch(ctx, obj, patch, opts...)
+		},
+	})
+	r := &PackageSourceReconciler{Client: failing, Scheme: testScheme(t)}
+
+	res, err := r.updateStatus(context.Background(), ps, referenceTime)
+	if err != nil {
+		t.Fatalf("updateStatus: %v", err)
+	}
+	if res.RequeueAfter != backoffFor(1) {
+		t.Errorf("RequeueAfter = %v, want %v", res.RequeueAfter, backoffFor(1))
+	}
+	persistedAG := &sourcewatcherv1beta1.ArtifactGenerator{}
+	if err := baseClient.Get(context.Background(), client.ObjectKeyFromObject(ag), persistedAG); err != nil {
+		t.Fatalf("Get AG: %v", err)
+	}
+	if got := persistedAG.Annotations[annotationRecoveryAttempts]; got != "1" {
+		t.Errorf("recovery attempts = %q, want \"1\"", got)
+	}
+}
+
+// TestUpdateStatus_VerificationMarkFailure_RebuildsAgain covers the other
+// half of that ordering: when the rebuild was forced but recording the
+// generation failed, the next Ready=True forces the rebuild again.
+func TestUpdateStatus_VerificationMarkFailure_RebuildsAgain(t *testing.T) {
+	ps, ag := builtAG(2, metav1.ConditionTrue, 2, nil)
+	baseClient := fake.NewClientBuilder().WithScheme(testScheme(t)).WithStatusSubresource(ps, ag).WithObjects(ps, ag).Build()
+	failMark := true
+	failing := interceptor.NewClient(baseClient, interceptor.Funcs{
+		Patch: func(ctx context.Context, c client.WithWatch, obj client.Object, patch client.Patch, opts ...client.PatchOption) error {
+			if _, marking := obj.GetAnnotations()[annotationVerifiedGeneration]; marking && failMark {
+				return errors.New("simulated metadata patch failure")
+			}
+			return c.Patch(ctx, obj, patch, opts...)
+		},
+	})
+	r := &PackageSourceReconciler{Client: failing, Scheme: testScheme(t)}
+
+	if _, err := r.updateStatus(context.Background(), ps, referenceTime); err == nil {
+		t.Fatal("updateStatus succeeded, want error from recording the verified generation")
+	}
+	persistedAG := &sourcewatcherv1beta1.ArtifactGenerator{}
+	if err := baseClient.Get(context.Background(), client.ObjectKeyFromObject(ag), persistedAG); err != nil {
+		t.Fatalf("Get AG: %v", err)
+	}
+	if _, ok := persistedAG.Annotations[annotationVerifiedGeneration]; ok {
+		t.Fatalf("verified generation persisted despite the failed patch: %v", persistedAG.Annotations)
+	}
+	firstForce := persistedAG.Annotations[annotationFluxRequestedAt]
+	if firstForce == "" {
+		t.Fatalf("rebuild was not forced before the mark: %v", persistedAG.Annotations)
+	}
+
+	// source-watcher finishes the forced rebuild and reports Ready=True again.
+	meta.SetStatusCondition(&persistedAG.Status.Conditions, metav1.Condition{
+		Type: "Ready", Status: metav1.ConditionTrue, Reason: "Succeeded", ObservedGeneration: 2,
+	})
+	if err := baseClient.Status().Update(context.Background(), persistedAG); err != nil {
+		t.Fatalf("Update AG status: %v", err)
+	}
+	failMark = false
+	if _, err := r.updateStatus(context.Background(), ps, referenceTime.Add(time.Minute)); err != nil {
+		t.Fatalf("second updateStatus: %v", err)
+	}
+	if err := baseClient.Get(context.Background(), client.ObjectKeyFromObject(ag), persistedAG); err != nil {
+		t.Fatalf("Get AG: %v", err)
+	}
+	if got := persistedAG.Annotations[annotationFluxRequestedAt]; got == firstForce {
+		t.Errorf("requestedAt = %q unchanged, want a second forced rebuild", got)
+	}
+	if got := persistedAG.Annotations[annotationVerifiedGeneration]; got != "2" {
+		t.Errorf("verified generation = %q, want \"2\"", got)
+	}
+}
diff --git a/internal/operator/tapmaterializer_artifact.go b/internal/operator/tapmaterializer_artifact.go
new file mode 100644
index 0000000000..98f310d2d1
--- /dev/null
+++ b/internal/operator/tapmaterializer_artifact.go
@@ -0,0 +1,192 @@
+/*
+Copyright 2025 The Cozystack Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package operator
+
+import (
+	"archive/tar"
+	"bufio"
+	"bytes"
+	"compress/gzip"
+	"crypto/sha256"
+	"encoding/hex"
+	"fmt"
+	"io"
+	"os"
+	"path/filepath"
+	"strings"
+
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	utilyaml "k8s.io/apimachinery/pkg/util/yaml"
+	"sigs.k8s.io/yaml"
+
+	cozyv1alpha1 "github.com/cozystack/cozystack/api/v1alpha1"
+)
+
+// maxArtifactBytes bounds the decompressed size of a tapped artifact so a
+// malicious or corrupt tarball cannot exhaust memory or disk.
+const maxArtifactBytes = 256 << 20 // 256 MiB
+
+// verifyAndExtract checks that data hashes to expectedDigest (a Flux
+// "sha256:<hex>" digest), then extracts the gzipped tarball into destDir. It
+// rejects path traversal and caps the total extracted size. A digest mismatch
+// is a hard error so a tampered artifact is never materialized.
+func verifyAndExtract(data []byte, expectedDigest, destDir string) error {
+	// Fail closed: this handles untrusted remote content, so an absent digest is
+	// an error, not a reason to skip verification.
+	if expectedDigest == "" {
+		return fmt.Errorf("refusing to extract a tap artifact with no digest to verify against")
+	}
+	sum := sha256.Sum256(data)
+	got := "sha256:" + hex.EncodeToString(sum[:])
+	if got != expectedDigest {
+		return fmt.Errorf("artifact digest mismatch: got %s, want %s", got, expectedDigest)
+	}
+
+	gz, err := gzip.NewReader(bytes.NewReader(data))
+	if err != nil {
+		return fmt.Errorf("open gzip: %w", err)
+	}
+	defer func() { _ = gz.Close() }()
+
+	tr := tar.NewReader(gz)
+	var written int64
+	for {
+		hdr, err := tr.Next()
+		if err == io.EOF {
+			break
+		}
+		if err != nil {
+			return fmt.Errorf("read tar: %w", err)
+		}
+		// Fail closed on any ".." anywhere in the entry name, before the name
+		// reaches a path operation. safeJoin below is the authoritative check
+		// (it also resolves the joined path back against destDir), but that
+		// guard lives behind a call boundary and CodeQL's go/zipslip barrier
+		// does not follow it, so the same rejection is spelled out here. A
+		// chart artifact has no legitimate entry with ".." in its name.
+		if strings.Contains(hdr.Name, "..") {
+			return fmt.Errorf("tar entry %q contains a path-traversal segment", hdr.Name)
+		}
+		target, err := safeJoin(destDir, hdr.Name)
+		if err != nil {
+			return err
+		}
+		switch hdr.Typeflag {
+		case tar.TypeDir:
+			if err := os.MkdirAll(target, 0o755); err != nil {
+				return err
+			}
+		case tar.TypeReg:
+			if err := os.MkdirAll(filepath.Dir(target), 0o755); err != nil {
+				return err
+			}
+			written += hdr.Size
+			if written > maxArtifactBytes {
+				return fmt.Errorf("artifact exceeds %d bytes", maxArtifactBytes)
+			}
+			f, err := os.OpenFile(target, os.O_CREATE|os.O_WRONLY|os.O_TRUNC, 0o644)
+			if err != nil {
+				return err
+			}
+			if _, err := io.CopyN(f, tr, hdr.Size); err != nil {
+				_ = f.Close()
+				return err
+			}
+			_ = f.Close()
+		default:
+			// Skip symlinks, devices, etc.: an app artifact needs only files.
+		}
+	}
+	return nil
+}
+
+// safeJoin joins name under base, rejecting entries that escape base. It
+// rejects any ".." component outright (the traversal marker) and, as a second
+// guard, confirms the resolved path stays within base.
+func safeJoin(base, name string) (string, error) {
+	if name == ".." || strings.HasPrefix(name, "../") || strings.Contains(name, "/../") || strings.HasSuffix(name, "/..") {
+		return "", fmt.Errorf("tar entry %q contains a path-traversal segment", name)
+	}
+	target := filepath.Join(base, name)
+	rel, err := filepath.Rel(base, target)
+	if err != nil || rel == ".." || strings.HasPrefix(rel, ".."+string(os.PathSeparator)) {
+		return "", fmt.Errorf("tar entry %q escapes the extraction directory", name)
+	}
+	return target, nil
+}
+
+// parsePackageSourcesFromTree walks an extracted artifact and strict-decodes
+// every PackageSource manifest it finds. It splits multi-document YAML with the
+// apimachinery reader, which honours block scalars (a naive `^---$` split would
+// fracture a document whose values contain such a line).
+func parsePackageSourcesFromTree(root string) ([]cozyv1alpha1.PackageSource, error) {
+	var out []cozyv1alpha1.PackageSource
+	err := filepath.WalkDir(root, func(path string, d os.DirEntry, err error) error {
+		if err != nil {
+			return err
+		}
+		if d.IsDir() || (!strings.HasSuffix(path, ".yaml") && !strings.HasSuffix(path, ".yml")) {
+			return nil
+		}
+		data, e := os.ReadFile(path)
+		if e != nil {
+			return nil
+		}
+		reader := utilyaml.NewYAMLReader(bufio.NewReader(bytes.NewReader(data)))
+		for {
+			doc, rerr := reader.Read()
+			if rerr == io.EOF {
+				break
+			}
+			if rerr != nil {
+				return fmt.Errorf("%s: read YAML: %w", filepath.Base(path), rerr)
+			}
+			if len(bytes.TrimSpace(doc)) == 0 {
+				continue
+			}
+			var tm metav1.TypeMeta
+			if err := yaml.Unmarshal(doc, &tm); err != nil || tm.Kind != "PackageSource" {
+				continue
+			}
+			var ps cozyv1alpha1.PackageSource
+			if err := yaml.UnmarshalStrict(doc, &ps); err != nil {
+				return fmt.Errorf("%s: decode PackageSource: %w", filepath.Base(path), err)
+			}
+			out = append(out, ps)
+		}
+		return nil
+	})
+	return out, err
+}
+
+// rewriteForMaterialize prepares a PackageSource pulled from a tapped artifact
+// for apply: it keeps the repository's own declared name (no community rename)
+// and repoints its sourceRef at the tap's Flux source, clearing server-set
+// metadata for a clean apply. The caller stamps the tap marker label/annotation.
+func rewriteForMaterialize(ps *cozyv1alpha1.PackageSource, sourceName, sourceNamespace, sourcePath string) {
+	ps.SetResourceVersion("")
+	ps.SetUID("")
+	if sourcePath == "" {
+		sourcePath = "/"
+	}
+	ps.Spec.SourceRef = &cozyv1alpha1.PackageSourceRef{
+		Kind:      "OCIRepository",
+		Name:      sourceName,
+		Namespace: sourceNamespace,
+		Path:      sourcePath,
+	}
+}
diff --git a/internal/operator/tapmaterializer_artifact_test.go b/internal/operator/tapmaterializer_artifact_test.go
new file mode 100644
index 0000000000..5b37e4e103
--- /dev/null
+++ b/internal/operator/tapmaterializer_artifact_test.go
@@ -0,0 +1,158 @@
+/*
+Copyright 2025 The Cozystack Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package operator
+
+import (
+	"archive/tar"
+	"bytes"
+	"compress/gzip"
+	"crypto/sha256"
+	"encoding/hex"
+	"testing"
+)
+
+// tarGz builds an in-memory gzipped tarball from name->content entries and
+// returns the bytes plus their Flux-style digest.
+func tarGz(t *testing.T, files map[string]string) ([]byte, string) {
+	t.Helper()
+	var buf bytes.Buffer
+	gz := gzip.NewWriter(&buf)
+	tw := tar.NewWriter(gz)
+	for name, content := range files {
+		if err := tw.WriteHeader(&tar.Header{Name: name, Mode: 0o644, Size: int64(len(content)), Typeflag: tar.TypeReg}); err != nil {
+			t.Fatal(err)
+		}
+		if _, err := tw.Write([]byte(content)); err != nil {
+			t.Fatal(err)
+		}
+	}
+	if err := tw.Close(); err != nil {
+		t.Fatal(err)
+	}
+	if err := gz.Close(); err != nil {
+		t.Fatal(err)
+	}
+	data := buf.Bytes()
+	sum := sha256.Sum256(data)
+	return data, "sha256:" + hex.EncodeToString(sum[:])
+}
+
+const samplePS = `apiVersion: cozystack.io/v1alpha1
+kind: PackageSource
+metadata:
+  name: example.hello
+spec:
+  variants:
+    - name: default
+      components:
+        - name: hello
+          path: apps/hello
+`
+
+func TestVerifyAndExtractAndParse(t *testing.T) {
+	data, digest := tarGz(t, map[string]string{
+		"packages/core/platform/sources/hello.yaml": samplePS,
+		"packages/apps/hello/Chart.yaml":            "apiVersion: v2\nname: hello\nversion: 0.1.0\n",
+	})
+	dir := t.TempDir()
+	if err := verifyAndExtract(data, digest, dir); err != nil {
+		t.Fatalf("verifyAndExtract: %v", err)
+	}
+	pss, err := parsePackageSourcesFromTree(dir)
+	if err != nil {
+		t.Fatalf("parse: %v", err)
+	}
+	if len(pss) != 1 || pss[0].Name != "example.hello" {
+		t.Fatalf("expected 1 PackageSource example.hello, got %+v", pss)
+	}
+}
+
+func TestVerifyAndExtractRequiresDigest(t *testing.T) {
+	data, _ := tarGz(t, map[string]string{"packages/x.yaml": "a: b\n"})
+	if err := verifyAndExtract(data, "", t.TempDir()); err == nil {
+		t.Fatal("expected an error when no digest is provided (fail closed)")
+	}
+}
+
+func TestParsePackageSourcesHandlesBlockScalar(t *testing.T) {
+	// A PackageSource whose values contain a line that looks like a document
+	// separator must not be fractured by the splitter.
+	ps := `apiVersion: cozystack.io/v1alpha1
+kind: PackageSource
+metadata:
+  name: example.notes
+  annotations:
+    note: |
+      first line
+      ---
+      after a separator-looking line
+spec:
+  variants:
+    - name: default
+      components:
+        - name: app
+          path: apps/app
+`
+	dir := t.TempDir()
+	data, digest := tarGz(t, map[string]string{"packages/core/platform/sources/notes.yaml": ps})
+	if err := verifyAndExtract(data, digest, dir); err != nil {
+		t.Fatal(err)
+	}
+	pss, err := parsePackageSourcesFromTree(dir)
+	if err != nil {
+		t.Fatalf("parse: %v", err)
+	}
+	if len(pss) != 1 || pss[0].Name != "example.notes" {
+		t.Fatalf("expected 1 PackageSource despite the block scalar, got %+v", pss)
+	}
+}
+
+func TestVerifyAndExtractDigestMismatch(t *testing.T) {
+	data, _ := tarGz(t, map[string]string{"packages/x.yaml": "a: b\n"})
+	if err := verifyAndExtract(data, "sha256:"+hex.EncodeToString(make([]byte, 32)), t.TempDir()); err == nil {
+		t.Fatal("expected digest mismatch error")
+	}
+}
+
+func TestVerifyAndExtractRejectsTraversal(t *testing.T) {
+	// Both a leading ".." and one buried mid-path have to be rejected: an
+	// entry that walks back out of a subdirectory lands outside destDir just
+	// the same, and filepath.Join collapses it before any escape is visible.
+	for _, name := range []string{
+		"../escape.yaml",
+		"packages/../../escape.yaml",
+		"packages/sub/../../../escape.yaml",
+	} {
+		data, digest := tarGz(t, map[string]string{name: "a: b\n"})
+		if err := verifyAndExtract(data, digest, t.TempDir()); err == nil {
+			t.Fatalf("entry %q: expected path-traversal rejection", name)
+		}
+	}
+}
+
+func TestParsePackageSourcesRejectsMalformed(t *testing.T) {
+	dir := t.TempDir()
+	data, digest := tarGz(t, map[string]string{
+		"bad.yaml": "apiVersion: cozystack.io/v1alpha1\nkind: PackageSource\nmetadata:\n  name: x\nspec:\n  bogusUnknown: true\n",
+	})
+	if err := verifyAndExtract(data, digest, dir); err != nil {
+		t.Fatal(err)
+	}
+	if _, err := parsePackageSourcesFromTree(dir); err == nil {
+		t.Fatal("expected strict-decode error for unknown field")
+	}
+}
diff --git a/internal/operator/tapmaterializer_reconciler.go b/internal/operator/tapmaterializer_reconciler.go
new file mode 100644
index 0000000000..0903230047
--- /dev/null
+++ b/internal/operator/tapmaterializer_reconciler.go
@@ -0,0 +1,473 @@
+/*
+Copyright 2025 The Cozystack Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package operator
+
+import (
+	"context"
+	"fmt"
+	"io"
+	"net"
+	"net/http"
+	neturl "net/url"
+	"os"
+	"strings"
+	"time"
+
+	sourcev1 "github.com/fluxcd/source-controller/api/v1"
+	corev1 "k8s.io/api/core/v1"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/types"
+	"k8s.io/client-go/tools/record"
+	ctrl "sigs.k8s.io/controller-runtime"
+	"sigs.k8s.io/controller-runtime/pkg/builder"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
+	"sigs.k8s.io/controller-runtime/pkg/log"
+	"sigs.k8s.io/controller-runtime/pkg/predicate"
+
+	cozyv1alpha1 "github.com/cozystack/cozystack/api/v1alpha1"
+	"github.com/cozystack/cozystack/internal/marketplace/collision"
+	"github.com/cozystack/cozystack/internal/marketplace/tapconst"
+)
+
+const (
+	tapFieldOwner  = "cozystack-tap-materializer"
+	tapWaitRequeue = 20 * time.Second
+	tapFetchLimit  = maxArtifactBytes
+)
+
+// TapMaterializerReconciler watches community-tap OCIRepositories and
+// materializes the PackageSource(s) their artifact carries, so a tap connected
+// from the dashboard becomes installable without the API pulling the artifact.
+type TapMaterializerReconciler struct {
+	client.Client
+	Scheme *runtime.Scheme
+	// Recorder surfaces materialization failures (e.g. a name collision with a
+	// core component) as Events on the tap source. Optional; nil disables Events.
+	Recorder record.EventRecorder
+	// Fetch downloads a Flux artifact tarball. Defaults to HTTP; overridable in tests.
+	Fetch func(ctx context.Context, url string) ([]byte, error)
+}
+
+func (r *TapMaterializerReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
+	logger := log.FromContext(ctx)
+
+	var repo sourcev1.OCIRepository
+	if err := r.Get(ctx, req.NamespacedName, &repo); err != nil {
+		return ctrl.Result{}, client.IgnoreNotFound(err)
+	}
+	if repo.Labels[tapconst.Label] != "true" {
+		return ctrl.Result{}, nil
+	}
+
+	// Deletion: clean up materialized PackageSources, then release the finalizer.
+	if !repo.DeletionTimestamp.IsZero() {
+		if controllerutil.ContainsFinalizer(&repo, tapconst.Finalizer) {
+			if err := r.deleteMaterialized(ctx, repo.Name); err != nil {
+				return ctrl.Result{}, err
+			}
+			controllerutil.RemoveFinalizer(&repo, tapconst.Finalizer)
+			if err := r.Update(ctx, &repo); err != nil {
+				return ctrl.Result{}, err
+			}
+		}
+		return ctrl.Result{}, nil
+	}
+
+	if !controllerutil.ContainsFinalizer(&repo, tapconst.Finalizer) {
+		controllerutil.AddFinalizer(&repo, tapconst.Finalizer)
+		if err := r.Update(ctx, &repo); err != nil {
+			return ctrl.Result{}, err
+		}
+		return ctrl.Result{RequeueAfter: time.Second}, nil
+	}
+
+	art := repo.Status.Artifact
+	if art == nil || art.URL == "" || art.Digest == "" {
+		// Source not pulled yet (or digest not yet reported); wait for
+		// source-controller. Requiring the digest keeps materialization
+		// fail-closed on the integrity check.
+		return ctrl.Result{RequeueAfter: tapWaitRequeue}, nil
+	}
+	if repo.Annotations[tapconst.MaterializedRevisionAnnotation] == art.Revision {
+		return ctrl.Result{}, nil
+	}
+
+	fetch := r.Fetch
+	if fetch == nil {
+		fetch = httpFetch
+	}
+	// The artifact URL is a cluster-DNS name (flux.<ns>.svc/...). cozystack-operator
+	// runs with hostNetwork, so it resolves against the host's DNS, not CoreDNS,
+	// and that name does not resolve. Rewrite the host to the Service ClusterIP,
+	// which a hostNetwork pod can reach directly; on any failure fall back to the
+	// original URL so clusters where DNS does work are unaffected.
+	data, err := fetch(ctx, r.resolveArtifactURL(ctx, art.URL))
+	if err != nil {
+		return ctrl.Result{}, fmt.Errorf("fetch artifact for tap %s: %w", repo.Name, err)
+	}
+
+	tmp, err := os.MkdirTemp("", "tap-materialize-")
+	if err != nil {
+		return ctrl.Result{}, err
+	}
+	defer func() { _ = os.RemoveAll(tmp) }()
+	if err := verifyAndExtract(data, art.Digest, tmp); err != nil {
+		return ctrl.Result{}, fmt.Errorf("extract artifact for tap %s: %w", repo.Name, err)
+	}
+	sources, err := parsePackageSourcesFromTree(tmp)
+	if err != nil {
+		return ctrl.Result{}, fmt.Errorf("parse artifact for tap %s: %w", repo.Name, err)
+	}
+
+	// A tapped repository keeps its own declared name. Refuse the whole
+	// materialization if any declared name clashes with a core component (or
+	// another tap), surfacing the reason on the source instead of silently
+	// overwriting an official PackageSource via ForceOwnership.
+	for i := range sources {
+		if err := collision.PackageSourceName(ctx, r.Client, sources[i].GetName(), repo.Name); err != nil {
+			return r.failMaterialize(ctx, &repo, err)
+		}
+	}
+
+	applied := make(map[string]bool, len(sources))
+	for i := range sources {
+		ps := sources[i].DeepCopy()
+		origPath := "/"
+		if ps.Spec.SourceRef != nil && ps.Spec.SourceRef.Path != "" {
+			origPath = ps.Spec.SourceRef.Path
+		}
+		rewriteForMaterialize(ps, repo.Name, repo.Namespace, origPath)
+		if ps.Labels == nil {
+			ps.Labels = map[string]string{}
+		}
+		ps.Labels[tapconst.Label] = "true"
+		if ps.Annotations == nil {
+			ps.Annotations = map[string]string{}
+		}
+		ps.Annotations[tapconst.SourceAnnotation] = repo.Name
+		if err := r.Patch(ctx, ps, client.Apply, client.FieldOwner(tapFieldOwner), client.ForceOwnership); err != nil {
+			return ctrl.Result{}, fmt.Errorf("materialize PackageSource %s: %w", ps.GetName(), err)
+		}
+		// Register the repository's apps on connect (not on a later `cozypkg
+		// add`) via a tap-managed Package whose install-marked components (the
+		// ApplicationDefinition registrations) deploy so the apps appear in the
+		// catalog, mirroring how the platform ships a Package per built-in app.
+		// The app components carry no install block and are instantiated per user
+		// resource. Privileged install components are refused for a tap-labelled
+		// (unconfirmed) Package on several best-effort layers: the Package
+		// reconciler skips their HelmRelease and prunes a lingering one at the
+		// install site, and the PackageSource reconciler withholds their
+		// ExternalArtifact (collision.PrivilegedConfirmed). A benign component
+		// flipped to privileged in a new revision can still be materialised by
+		// source-watcher before these observe the flip; fully closing that race
+		// needs the catalog registration decoupled from install (issue #4359).
+		if err := r.ensureRegistration(ctx, ps, &repo); err != nil {
+			return ctrl.Result{}, fmt.Errorf("register apps for %s: %w", ps.GetName(), err)
+		}
+		applied[ps.GetName()] = true
+		logger.Info("materialized PackageSource from tap", "name", ps.GetName(), "tap", repo.Name)
+	}
+	if len(sources) == 0 {
+		logger.Info("tap artifact carried no PackageSource", "tap", repo.Name, "revision", art.Revision)
+	}
+	// Materialization succeeded: clear any collision error from a prior revision.
+	delete(repo.Annotations, tapconst.MaterializeErrorAnnotation)
+
+	// Prune PackageSources this tap materialized from an earlier revision that
+	// the current artifact no longer contains (including a rename when the
+	// single/multi package count flips), so a removed package leaves the
+	// catalog. Installed Packages are left in place.
+	if err := r.pruneMaterialized(ctx, repo.Name, applied); err != nil {
+		return ctrl.Result{}, err
+	}
+
+	// Stamp the revision so an unchanged artifact is not re-pulled every resync.
+	if repo.Annotations == nil {
+		repo.Annotations = map[string]string{}
+	}
+	repo.Annotations[tapconst.MaterializedRevisionAnnotation] = art.Revision
+	if err := r.Update(ctx, &repo); err != nil {
+		return ctrl.Result{}, err
+	}
+	return ctrl.Result{}, nil
+}
+
+// failMaterialize records a materialization failure (e.g. a name collision with
+// a core component) on the tap source so it surfaces on the Tap resource and the
+// dashboard, and emits a warning Event. It deliberately does not stamp the
+// materialized revision, so a corrected artifact (which carries a new revision)
+// is retried; a collision does not otherwise self-resolve, so it returns without
+// requeueing to avoid a hot loop.
+func (r *TapMaterializerReconciler) failMaterialize(ctx context.Context, repo *sourcev1.OCIRepository, cause error) (ctrl.Result, error) {
+	if repo.Annotations == nil {
+		repo.Annotations = map[string]string{}
+	}
+	repo.Annotations[tapconst.MaterializeErrorAnnotation] = cause.Error()
+	if r.Recorder != nil {
+		r.Recorder.Event(repo, corev1.EventTypeWarning, "MaterializeFailed", cause.Error())
+	}
+	if err := r.Update(ctx, repo); err != nil {
+		return ctrl.Result{}, err
+	}
+	log.FromContext(ctx).Info("tap materialization blocked", "tap", repo.Name, "reason", cause.Error())
+	return ctrl.Result{}, nil
+}
+
+// registrationOwnerRef builds the ownerReference from a registration Package to
+// its PackageSource, so the Package is garbage-collected if the PackageSource is
+// deleted directly.
+func registrationOwnerRef(ps *cozyv1alpha1.PackageSource) metav1.OwnerReference {
+	return metav1.OwnerReference{
+		APIVersion: cozyv1alpha1.GroupVersion.String(),
+		Kind:       "PackageSource",
+		Name:       ps.GetName(),
+		UID:        ps.GetUID(),
+	}
+}
+
+// autoRegisterSkipReason returns why a PackageSource's apps cannot be
+// auto-registered on connect, or "" when they can. Only a source with no
+// "default" variant is skipped (nothing to register by default). Privileged
+// components are NOT a reason to skip: the source is registered and its
+// privileged components are refused at install time (collision.PrivilegedConfirmed)
+// until the operator confirms with 'cozypkg add --allow-privileged'.
+func autoRegisterSkipReason(ps *cozyv1alpha1.PackageSource) string {
+	if !hasDefaultVariant(ps) {
+		return `it declares no "default" variant; register it manually with 'cozypkg add'`
+	}
+	return ""
+}
+
+// warnNotAutoRegistered records on the source, as a Warning Event, that a
+// materialized PackageSource's apps were not auto-registered, with the reason.
+// This Event is the immediate, human-facing signal.
+func (r *TapMaterializerReconciler) warnNotAutoRegistered(repo *sourcev1.OCIRepository, ps *cozyv1alpha1.PackageSource, reason string) {
+	if r.Recorder != nil {
+		r.Recorder.Event(repo, corev1.EventTypeWarning, "AppsNotAutoRegistered",
+			fmt.Sprintf("PackageSource %s: %s", ps.GetName(), reason))
+	}
+}
+
+// hasDefaultVariant reports whether the PackageSource declares a variant named
+// "default".
+func hasDefaultVariant(ps *cozyv1alpha1.PackageSource) bool {
+	for i := range ps.Spec.Variants {
+		if ps.Spec.Variants[i].Name == "default" {
+			return true
+		}
+	}
+	return false
+}
+
+// deleteMaterialized removes every PackageSource materialized from the given tap
+// source, and each one's tap-managed registration Package. A user's own Package
+// (no tap label) is left in place.
+func (r *TapMaterializerReconciler) deleteMaterialized(ctx context.Context, sourceName string) error {
+	return r.pruneMaterialized(ctx, sourceName, nil)
+}
+
+// pruneMaterialized deletes the PackageSources materialized from sourceName
+// except those whose names are in keep (nil keep deletes all of them).
+func (r *TapMaterializerReconciler) pruneMaterialized(ctx context.Context, sourceName string, keep map[string]bool) error {
+	var list cozyv1alpha1.PackageSourceList
+	if err := r.List(ctx, &list, client.MatchingLabels{tapconst.Label: "true"}); err != nil {
+		return err
+	}
+	for i := range list.Items {
+		ps := &list.Items[i]
+		if ps.Annotations[tapconst.SourceAnnotation] != sourceName || keep[ps.Name] {
+			continue
+		}
+		// Delete the registration Package BEFORE the PackageSource. If the
+		// Package delete fails transiently, the PackageSource is still present so
+		// the next reconcile lists it and retries; deleting the PackageSource
+		// first would leave a stranded Package no later pass can find.
+		if err := r.deleteRegistrationPackage(ctx, ps.Name, sourceName); err != nil {
+			return err
+		}
+		if err := r.Delete(ctx, ps); err != nil && client.IgnoreNotFound(err) != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+// deleteRegistrationPackage removes the tap-managed registration Package for a
+// PackageSource, but only when it is a managed registration of the given source
+// (owned AND still at the auto default variant), so a Package a later tap created
+// under a reused name, or one a user pinned to a variant, is never deleted by an
+// earlier tap's teardown.
+func (r *TapMaterializerReconciler) deleteRegistrationPackage(ctx context.Context, name, sourceName string) error {
+	// Delete only a Package this source still manages, leaving a user's own or
+	// pinned Package (markers shed) in place. Teardown races the handover that
+	// `cozypkg add --allow-privileged` performs (an Update that sheds the tap
+	// markers): were it to land between the Get and the Delete, a plain
+	// owned-delete would remove the just-confirmed user Package. Re-read and
+	// re-classify on a conflict, and delete only the exact object classified via a
+	// UID + ResourceVersion precondition, the same guard the untap and dashboard
+	// delete paths use.
+	for attempt := 0; ; attempt++ {
+		var pkg cozyv1alpha1.Package
+		if err := r.Get(ctx, types.NamespacedName{Name: name}, &pkg); err != nil {
+			return client.IgnoreNotFound(err)
+		}
+		if !collision.ManagedRegistration(&pkg, sourceName, pkg.Spec.Variant) {
+			return nil
+		}
+		err := r.Delete(ctx, &pkg, client.Preconditions{UID: &pkg.UID, ResourceVersion: &pkg.ResourceVersion})
+		if err == nil || apierrors.IsNotFound(err) {
+			return nil
+		}
+		if apierrors.IsConflict(err) && attempt < 4 {
+			continue
+		}
+		return err
+	}
+}
+
+// resolveArtifactURL rewrites a cluster-DNS artifact host (e.g.
+// flux.cozy-fluxcd.svc) to the backing Service's ClusterIP, so the hostNetwork
+// operator pod can reach it without CoreDNS. It fails open: any parse/lookup
+// problem (non-cluster host, Service missing, headless/empty ClusterIP) returns
+// the original URL unchanged, so this only ever adds a reachable path.
+//
+// Failing open here is safe ONLY because integrity is enforced downstream:
+// verifyAndExtract rejects an absent or mismatched digest (see
+// tapmaterializer_artifact.go). Resolving to the wrong host therefore yields a
+// digest-mismatch error, never a silent content substitution. If the digest
+// handling is ever relaxed, this fail-open must be revisited.
+func (r *TapMaterializerReconciler) resolveArtifactURL(ctx context.Context, rawURL string) string {
+	logger := log.FromContext(ctx)
+	u, err := neturl.Parse(rawURL)
+	if err != nil {
+		return rawURL
+	}
+	svc, ns, ok := parseClusterServiceHost(u.Hostname())
+	if !ok {
+		return rawURL
+	}
+	var service corev1.Service
+	if err := r.Get(ctx, types.NamespacedName{Name: svc, Namespace: ns}, &service); err != nil {
+		logger.V(1).Info("artifact host not resolved to ClusterIP; using DNS name", "host", u.Hostname(), "err", err.Error())
+		return rawURL
+	}
+	ip := service.Spec.ClusterIP
+	if ip == "" || ip == corev1.ClusterIPNone {
+		return rawURL
+	}
+	rewritten, err := rewriteURLHost(rawURL, ip)
+	if err != nil {
+		return rawURL
+	}
+	return rewritten
+}
+
+// parseClusterServiceHost recognises an in-cluster Service DNS name of the form
+// <service>.<namespace>.svc or <service>.<namespace>.svc.cluster.local and
+// returns the service and namespace.
+func parseClusterServiceHost(host string) (service, namespace string, ok bool) {
+	host = strings.TrimSuffix(host, ".")
+	labels := strings.Split(host, ".")
+	// <svc>.<ns>.svc[.cluster.local]
+	if len(labels) < 3 || labels[2] != "svc" {
+		return "", "", false
+	}
+	if len(labels) > 3 {
+		rest := strings.Join(labels[3:], ".")
+		if rest != "cluster.local" {
+			return "", "", false
+		}
+	}
+	if labels[0] == "" || labels[1] == "" {
+		return "", "", false
+	}
+	return labels[0], labels[1], true
+}
+
+// rewriteURLHost replaces the host of rawURL with newHost, preserving scheme,
+// port, path and query.
+func rewriteURLHost(rawURL, newHost string) (string, error) {
+	u, err := neturl.Parse(rawURL)
+	if err != nil {
+		return "", err
+	}
+	if port := u.Port(); port != "" {
+		u.Host = net.JoinHostPort(newHost, port)
+	} else {
+		u.Host = newHost
+	}
+	return u.String(), nil
+}
+
+// httpFetch downloads a Flux artifact tarball, bounded in size and time.
+func httpFetch(ctx context.Context, url string) ([]byte, error) {
+	ctx, cancel := context.WithTimeout(ctx, 2*time.Minute)
+	defer cancel()
+	req, err := http.NewRequestWithContext(ctx, http.MethodGet, url, nil)
+	if err != nil {
+		return nil, err
+	}
+	resp, err := http.DefaultClient.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	defer func() { _ = resp.Body.Close() }()
+	if resp.StatusCode != http.StatusOK {
+		return nil, fmt.Errorf("unexpected status %s fetching %s", resp.Status, url)
+	}
+	return io.ReadAll(io.LimitReader(resp.Body, tapFetchLimit+1))
+}
+
+// SetupWithManager wires the reconciler to community-tap OCIRepositories only.
+func (r *TapMaterializerReconciler) SetupWithManager(mgr ctrl.Manager) error {
+	isTap := predicate.NewPredicateFuncs(func(o client.Object) bool {
+		return o.GetLabels()[tapconst.Label] == "true"
+	})
+	return ctrl.NewControllerManagedBy(mgr).
+		Named("cozystack-tap-materializer").
+		For(&sourcev1.OCIRepository{}, builder.WithPredicates(isTap)).
+		Complete(r)
+}
+
+// ensureRegistration creates the tap-managed registration Package for a
+// materialized PackageSource so its apps appear in the catalog, unless the source
+// has no "default" variant (nothing to register), in which case a Warning Event
+// says why. Privileged components are not gated here: the Package reconciler
+// refuses them for an unconfirmed tap Package at the install site. The Package is
+// created only when absent; an existing registration, or a user's own or pinned
+// Package, is left as is.
+func (r *TapMaterializerReconciler) ensureRegistration(ctx context.Context, ps *cozyv1alpha1.PackageSource, repo *sourcev1.OCIRepository) error {
+	if skip := autoRegisterSkipReason(ps); skip != "" {
+		r.warnNotAutoRegistered(repo, ps, "not auto-registered because "+skip)
+		return nil
+	}
+	pkg := &cozyv1alpha1.Package{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:            ps.GetName(),
+			Labels:          map[string]string{tapconst.Label: "true"},
+			Annotations:     map[string]string{tapconst.SourceAnnotation: repo.Name},
+			OwnerReferences: []metav1.OwnerReference{registrationOwnerRef(ps)},
+		},
+	}
+	if err := r.Create(ctx, pkg); err != nil && !apierrors.IsAlreadyExists(err) {
+		return err
+	}
+	return nil
+}
diff --git a/internal/operator/tapmaterializer_reconciler_test.go b/internal/operator/tapmaterializer_reconciler_test.go
new file mode 100644
index 0000000000..36d219ef2f
--- /dev/null
+++ b/internal/operator/tapmaterializer_reconciler_test.go
@@ -0,0 +1,521 @@
+/*
+Copyright 2025 The Cozystack Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package operator
+
+import (
+	"context"
+	"testing"
+
+	fluxmeta "github.com/fluxcd/pkg/apis/meta"
+	sourcev1 "github.com/fluxcd/source-controller/api/v1"
+	corev1 "k8s.io/api/core/v1"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/types"
+	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
+	"k8s.io/client-go/tools/record"
+	ctrl "sigs.k8s.io/controller-runtime"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/client/fake"
+	"sigs.k8s.io/controller-runtime/pkg/client/interceptor"
+	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
+
+	cozyv1alpha1 "github.com/cozystack/cozystack/api/v1alpha1"
+	"github.com/cozystack/cozystack/internal/marketplace/collision"
+	"github.com/cozystack/cozystack/internal/marketplace/tapconst"
+)
+
+func tapScheme(t *testing.T) *runtime.Scheme {
+	t.Helper()
+	scheme := runtime.NewScheme()
+	if err := sourcev1.AddToScheme(scheme); err != nil {
+		t.Fatal(err)
+	}
+	if err := cozyv1alpha1.AddToScheme(scheme); err != nil {
+		t.Fatal(err)
+	}
+	return scheme
+}
+
+func tapRepo(finalizer bool) *sourcev1.OCIRepository {
+	repo := &sourcev1.OCIRepository{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "tap-foo-bar",
+			Namespace: "cozy-system",
+			Labels:    map[string]string{tapconst.Label: "true"},
+		},
+		Spec: sourcev1.OCIRepositorySpec{URL: "oci://ghcr.io/foo/bar"},
+	}
+	if finalizer {
+		repo.Finalizers = []string{tapconst.Finalizer}
+	}
+	return repo
+}
+
+func req() ctrl.Request {
+	return ctrl.Request{NamespacedName: types.NamespacedName{Name: "tap-foo-bar", Namespace: "cozy-system"}}
+}
+
+func TestParseClusterServiceHost(t *testing.T) {
+	cases := []struct {
+		host    string
+		svc, ns string
+		ok      bool
+	}{
+		{"flux.cozy-fluxcd.svc", "flux", "cozy-fluxcd", true},
+		{"flux.cozy-fluxcd.svc.cluster.local", "flux", "cozy-fluxcd", true},
+		{"flux.cozy-fluxcd.svc.", "flux", "cozy-fluxcd", true},
+		{"source-controller.flux-system.svc", "source-controller", "flux-system", true},
+		{"example.com", "", "", false},
+		{"flux.cozy-fluxcd", "", "", false},
+		{"flux.cozy-fluxcd.svc.example.com", "", "", false},
+		{"10.96.0.1", "", "", false},
+		{".cozy-fluxcd.svc", "", "", false},
+	}
+	for _, c := range cases {
+		svc, ns, ok := parseClusterServiceHost(c.host)
+		if ok != c.ok || svc != c.svc || ns != c.ns {
+			t.Errorf("parseClusterServiceHost(%q) = (%q,%q,%v), want (%q,%q,%v)", c.host, svc, ns, ok, c.svc, c.ns, c.ok)
+		}
+	}
+}
+
+func TestRewriteURLHost(t *testing.T) {
+	cases := []struct{ in, ip, want string }{
+		{"http://flux.cozy-fluxcd.svc/gitrepository/a/b.tar.gz", "10.96.1.2", "http://10.96.1.2/gitrepository/a/b.tar.gz"},
+		{"http://flux.cozy-fluxcd.svc:9090/x?rev=1", "10.96.1.2", "http://10.96.1.2:9090/x?rev=1"},
+	}
+	for _, c := range cases {
+		got, err := rewriteURLHost(c.in, c.ip)
+		if err != nil || got != c.want {
+			t.Errorf("rewriteURLHost(%q,%q) = %q,%v; want %q", c.in, c.ip, got, err, c.want)
+		}
+	}
+}
+
+func TestResolveArtifactURL(t *testing.T) {
+	scheme := runtime.NewScheme()
+	_ = clientgoscheme.AddToScheme(scheme)
+	svc := &corev1.Service{
+		ObjectMeta: metav1.ObjectMeta{Name: "flux", Namespace: "cozy-fluxcd"},
+		Spec:       corev1.ServiceSpec{ClusterIP: "10.96.7.7"},
+	}
+	headless := &corev1.Service{
+		ObjectMeta: metav1.ObjectMeta{Name: "flux", Namespace: "headless-ns"},
+		Spec:       corev1.ServiceSpec{ClusterIP: corev1.ClusterIPNone},
+	}
+	cl := fake.NewClientBuilder().WithScheme(scheme).WithObjects(svc, headless).Build()
+	r := &TapMaterializerReconciler{Client: cl, Scheme: scheme}
+
+	// ClusterIP service: host rewritten to the IP.
+	if got := r.resolveArtifactURL(context.Background(), "http://flux.cozy-fluxcd.svc/a/b.tar.gz"); got != "http://10.96.7.7/a/b.tar.gz" {
+		t.Errorf("expected rewrite to ClusterIP, got %q", got)
+	}
+	// Service missing: fall back to the original URL.
+	orig := "http://flux.other-ns.svc/a/b.tar.gz"
+	if got := r.resolveArtifactURL(context.Background(), orig); got != orig {
+		t.Errorf("expected fallback for missing service, got %q", got)
+	}
+	// Headless (no ClusterIP): fall back.
+	head := "http://flux.headless-ns.svc/a/b.tar.gz"
+	if got := r.resolveArtifactURL(context.Background(), head); got != head {
+		t.Errorf("expected fallback for headless service, got %q", got)
+	}
+	// Non-cluster host: untouched.
+	ext := "http://example.com/a/b.tar.gz"
+	if got := r.resolveArtifactURL(context.Background(), ext); got != ext {
+		t.Errorf("expected external host untouched, got %q", got)
+	}
+}
+
+func TestReconcileAddsFinalizer(t *testing.T) {
+	scheme := tapScheme(t)
+	cl := fake.NewClientBuilder().WithScheme(scheme).WithObjects(tapRepo(false)).Build()
+	r := &TapMaterializerReconciler{Client: cl, Scheme: scheme}
+
+	res, err := r.Reconcile(context.Background(), req())
+	if err != nil {
+		t.Fatalf("reconcile: %v", err)
+	}
+	if res.RequeueAfter <= 0 {
+		t.Errorf("expected a requeue after adding the finalizer")
+	}
+	var got sourcev1.OCIRepository
+	if err := cl.Get(context.Background(), req().NamespacedName, &got); err != nil {
+		t.Fatal(err)
+	}
+	if !controllerutil.ContainsFinalizer(&got, tapconst.Finalizer) {
+		t.Errorf("finalizer not added")
+	}
+}
+
+func TestReconcileWaitsForArtifact(t *testing.T) {
+	scheme := tapScheme(t)
+	cl := fake.NewClientBuilder().WithScheme(scheme).WithObjects(tapRepo(true)).Build()
+	r := &TapMaterializerReconciler{Client: cl, Scheme: scheme}
+
+	res, err := r.Reconcile(context.Background(), req())
+	if err != nil {
+		t.Fatalf("reconcile: %v", err)
+	}
+	if res.RequeueAfter <= 0 {
+		t.Errorf("expected a requeue-after while waiting for the artifact, got %+v", res)
+	}
+}
+
+func TestReconcileIgnoresUnlabeled(t *testing.T) {
+	scheme := tapScheme(t)
+	repo := tapRepo(false)
+	repo.Labels = nil // not a tap
+	cl := fake.NewClientBuilder().WithScheme(scheme).WithObjects(repo).Build()
+	r := &TapMaterializerReconciler{Client: cl, Scheme: scheme}
+
+	res, err := r.Reconcile(context.Background(), req())
+	if err != nil || res.RequeueAfter != 0 {
+		t.Fatalf("unlabeled source must be ignored, got res=%+v err=%v", res, err)
+	}
+	var got sourcev1.OCIRepository
+	_ = cl.Get(context.Background(), req().NamespacedName, &got)
+	if controllerutil.ContainsFinalizer(&got, tapconst.Finalizer) {
+		t.Errorf("must not add a finalizer to a non-tap source")
+	}
+}
+
+func TestDeleteMaterialized(t *testing.T) {
+	scheme := tapScheme(t)
+	mine := &cozyv1alpha1.PackageSource{ObjectMeta: metav1.ObjectMeta{
+		Name:        "foo.bar",
+		Labels:      map[string]string{tapconst.Label: "true"},
+		Annotations: map[string]string{tapconst.SourceAnnotation: "tap-foo-bar"},
+	}}
+	other := &cozyv1alpha1.PackageSource{ObjectMeta: metav1.ObjectMeta{
+		Name:        "baz.qux",
+		Labels:      map[string]string{tapconst.Label: "true"},
+		Annotations: map[string]string{tapconst.SourceAnnotation: "tap-baz-qux"},
+	}}
+	cl := fake.NewClientBuilder().WithScheme(scheme).WithObjects(mine, other).Build()
+	r := &TapMaterializerReconciler{Client: cl, Scheme: scheme}
+
+	if err := r.deleteMaterialized(context.Background(), "tap-foo-bar"); err != nil {
+		t.Fatalf("deleteMaterialized: %v", err)
+	}
+	if err := cl.Get(context.Background(), client.ObjectKey{Name: "foo.bar"}, &cozyv1alpha1.PackageSource{}); !apierrors.IsNotFound(err) {
+		t.Errorf("expected foo.bar deleted, got %v", err)
+	}
+	if err := cl.Get(context.Background(), client.ObjectKey{Name: "baz.qux"}, &cozyv1alpha1.PackageSource{}); err != nil {
+		t.Errorf("expected baz.qux kept, got %v", err)
+	}
+}
+
+func TestPruneMaterializedKeepsCurrentSet(t *testing.T) {
+	scheme := tapScheme(t)
+	src := "tap-foo-bar"
+	keepPS := &cozyv1alpha1.PackageSource{ObjectMeta: metav1.ObjectMeta{
+		Name:        "foo.bar",
+		Labels:      map[string]string{tapconst.Label: "true"},
+		Annotations: map[string]string{tapconst.SourceAnnotation: src},
+	}}
+	stalePS := &cozyv1alpha1.PackageSource{ObjectMeta: metav1.ObjectMeta{
+		Name:        "foo.removed",
+		Labels:      map[string]string{tapconst.Label: "true"},
+		Annotations: map[string]string{tapconst.SourceAnnotation: src},
+	}}
+	cl := fake.NewClientBuilder().WithScheme(scheme).WithObjects(keepPS, stalePS).Build()
+	r := &TapMaterializerReconciler{Client: cl, Scheme: scheme}
+
+	// The new revision still contains foo.bar but not foo.removed.
+	if err := r.pruneMaterialized(context.Background(), src, map[string]bool{"foo.bar": true}); err != nil {
+		t.Fatalf("pruneMaterialized: %v", err)
+	}
+	if err := cl.Get(context.Background(), client.ObjectKey{Name: "foo.bar"}, &cozyv1alpha1.PackageSource{}); err != nil {
+		t.Errorf("expected kept PS to survive, got %v", err)
+	}
+	if err := cl.Get(context.Background(), client.ObjectKey{Name: "foo.removed"}, &cozyv1alpha1.PackageSource{}); !apierrors.IsNotFound(err) {
+		t.Errorf("expected stale PS pruned, got %v", err)
+	}
+}
+
+// deleteRegistrationPackage must not remove a Package that a concurrent
+// `cozypkg add --allow-privileged` handover confirmed to the user. The handover
+// (an Update that sheds the tap markers and pins a variant) is simulated to land
+// between the Get and the Delete of the first attempt; the UID + ResourceVersion
+// precondition then makes that Delete conflict, and on the retry the Package no
+// longer classifies as managed and must survive. Without the precondition the
+// delete removes the just-confirmed user Package by name.
+func TestDeleteRegistrationPackageLosesRaceToHandover(t *testing.T) {
+	scheme := tapScheme(t)
+	src := "tap-foo-bar"
+	managed := &cozyv1alpha1.Package{ObjectMeta: metav1.ObjectMeta{
+		Name:        "foo.bar",
+		Labels:      map[string]string{tapconst.Label: "true"},
+		Annotations: map[string]string{tapconst.SourceAnnotation: src},
+	}}
+	base := fake.NewClientBuilder().WithScheme(scheme).WithObjects(managed).Build()
+	handedOver := false
+	cl := interceptor.NewClient(base, interceptor.Funcs{
+		Delete: func(ctx context.Context, c client.WithWatch, obj client.Object, opts ...client.DeleteOption) error {
+			if !handedOver {
+				handedOver = true
+				var live cozyv1alpha1.Package
+				if err := c.Get(ctx, types.NamespacedName{Name: "foo.bar"}, &live); err != nil {
+					return err
+				}
+				delete(live.Labels, tapconst.Label)
+				delete(live.Annotations, tapconst.SourceAnnotation)
+				live.Spec.Variant = "default"
+				if err := c.Update(ctx, &live); err != nil {
+					return err
+				}
+			}
+			return c.Delete(ctx, obj, opts...)
+		},
+	})
+	r := &TapMaterializerReconciler{Client: cl, Scheme: scheme}
+
+	if err := r.deleteRegistrationPackage(context.Background(), "foo.bar", src); err != nil {
+		t.Fatalf("deleteRegistrationPackage: %v", err)
+	}
+	var got cozyv1alpha1.Package
+	if err := cl.Get(context.Background(), types.NamespacedName{Name: "foo.bar"}, &got); err != nil {
+		t.Fatalf("the handed-over user Package must survive teardown, got %v", err)
+	}
+	if got.Labels[tapconst.Label] == "true" {
+		t.Error("expected the tap marker shed by the handover to remain shed")
+	}
+}
+
+func TestHasDefaultVariant(t *testing.T) {
+	with := &cozyv1alpha1.PackageSource{Spec: cozyv1alpha1.PackageSourceSpec{
+		Variants: []cozyv1alpha1.Variant{{Name: "big"}, {Name: "default"}},
+	}}
+	if !hasDefaultVariant(with) {
+		t.Error("expected a default variant to be detected")
+	}
+	without := &cozyv1alpha1.PackageSource{Spec: cozyv1alpha1.PackageSourceSpec{
+		Variants: []cozyv1alpha1.Variant{{Name: "only"}, {Name: "second"}},
+	}}
+	if hasDefaultVariant(without) {
+		t.Error("expected no default variant")
+	}
+	if hasDefaultVariant(&cozyv1alpha1.PackageSource{}) {
+		t.Error("expected no default variant for an empty source")
+	}
+}
+
+func TestPrivilegedInstallComponents(t *testing.T) {
+	ps := &cozyv1alpha1.PackageSource{Spec: cozyv1alpha1.PackageSourceSpec{
+		Variants: []cozyv1alpha1.Variant{{
+			Name: "default",
+			Components: []cozyv1alpha1.Component{
+				{Name: "app", Install: &cozyv1alpha1.ComponentInstall{Namespace: "x"}},
+				{Name: "op", Install: &cozyv1alpha1.ComponentInstall{Namespace: "x", Privileged: true}},
+				{Name: "noinstall"},
+			},
+		}},
+	}}
+	got := collision.PrivilegedInstallComponents(ps, "default")
+	if len(got) != 1 || got[0] != "op" {
+		t.Errorf("expected [op], got %v", got)
+	}
+	if len(collision.PrivilegedInstallComponents(ps, "missing")) != 0 {
+		t.Error("expected no components for a missing variant")
+	}
+}
+
+// TestReconcileRegistersApps asserts the happy path: a materialized tap creates
+// a tap-managed registration Package so the repository's apps register in the
+// catalog on connect, without a manual `cozypkg add`.
+func TestReconcileRegistersApps(t *testing.T) {
+	scheme := tapScheme(t)
+	data, digest := tarGz(t, map[string]string{
+		// samplePS declares PackageSource "example.hello" with a default variant.
+		"packages/core/platform/sources/hello.yaml": samplePS,
+	})
+	repo := tapRepo(true)
+	cl := fake.NewClientBuilder().WithScheme(scheme).
+		WithObjects(repo).
+		WithStatusSubresource(&sourcev1.OCIRepository{}).
+		Build()
+
+	var live sourcev1.OCIRepository
+	if err := cl.Get(context.Background(), req().NamespacedName, &live); err != nil {
+		t.Fatal(err)
+	}
+	live.Status.Artifact = &fluxmeta.Artifact{URL: "http://example.com/a.tar.gz", Digest: digest, Revision: "rev1"}
+	if err := cl.Status().Update(context.Background(), &live); err != nil {
+		t.Fatal(err)
+	}
+
+	r := &TapMaterializerReconciler{
+		Client: cl,
+		Scheme: scheme,
+		Fetch:  func(context.Context, string) ([]byte, error) { return data, nil },
+	}
+	if _, err := r.Reconcile(context.Background(), req()); err != nil {
+		t.Fatalf("reconcile: %v", err)
+	}
+
+	// The PackageSource is materialized under its declared name.
+	if err := cl.Get(context.Background(), client.ObjectKey{Name: "example.hello"}, &cozyv1alpha1.PackageSource{}); err != nil {
+		t.Fatalf("PackageSource not materialized: %v", err)
+	}
+	// A tap-managed registration Package was created for it.
+	var pkg cozyv1alpha1.Package
+	if err := cl.Get(context.Background(), client.ObjectKey{Name: "example.hello"}, &pkg); err != nil {
+		t.Fatalf("registration Package not created: %v", err)
+	}
+	if pkg.GetLabels()[tapconst.Label] != "true" {
+		t.Errorf("registration Package must be tap-managed (labelled), got %v", pkg.GetLabels())
+	}
+	if pkg.GetAnnotations()[tapconst.SourceAnnotation] != repo.Name {
+		t.Errorf("registration Package must record its source, got %v", pkg.GetAnnotations())
+	}
+	// Variant is left empty so the Package reconciler resolves it to "default"
+	// deterministically, rather than pinning whichever variant was listed first.
+	if pkg.Spec.Variant != "" {
+		t.Errorf("registration Package must leave Variant empty, got %q", pkg.Spec.Variant)
+	}
+	// Owned by its PackageSource so a direct delete of the PackageSource GCs it.
+	if len(pkg.OwnerReferences) != 1 || pkg.OwnerReferences[0].Kind != "PackageSource" || pkg.OwnerReferences[0].Name != "example.hello" {
+		t.Errorf("registration Package must own-ref its PackageSource, got %+v", pkg.OwnerReferences)
+	}
+}
+
+// materializerFor builds a reconciler whose Fetch returns whatever *cur points
+// at, so a test can flip the artifact between reconciles.
+func materializerFor(scheme *runtime.Scheme, cl client.Client, rec record.EventRecorder, cur *[]byte) *TapMaterializerReconciler {
+	return &TapMaterializerReconciler{
+		Client:   cl,
+		Scheme:   scheme,
+		Recorder: rec,
+		Fetch:    func(context.Context, string) ([]byte, error) { return *cur, nil },
+	}
+}
+
+// setArtifact points the OCIRepository at a new artifact digest/revision so the
+// next reconcile re-materializes.
+func setArtifact(t *testing.T, cl client.Client, digest, rev string) {
+	t.Helper()
+	var live sourcev1.OCIRepository
+	if err := cl.Get(context.Background(), req().NamespacedName, &live); err != nil {
+		t.Fatal(err)
+	}
+	live.Status.Artifact = &fluxmeta.Artifact{URL: "http://example.com/a.tar.gz", Digest: digest, Revision: rev}
+	if err := cl.Status().Update(context.Background(), &live); err != nil {
+		t.Fatal(err)
+	}
+}
+
+// TestReconcileLeavesUnmarkedPackage: an unmarked Package of the same name (a
+// user's `cozypkg add`, or one from before this version) means registration is
+// already satisfied. The reconcile must NOT error (which would hot-loop the whole
+// tap and re-pull the artifact every backoff), NOT adopt it, and NOT delete it;
+// the revision is stamped so the loop does not recur.
+func TestReconcileLeavesUnmarkedPackage(t *testing.T) {
+	scheme := tapScheme(t)
+	data, digest := tarGz(t, map[string]string{"packages/core/platform/sources/hello.yaml": samplePS})
+	userPkg := &cozyv1alpha1.Package{ObjectMeta: metav1.ObjectMeta{Name: "example.hello"}}
+	cur := data
+	cl := fake.NewClientBuilder().WithScheme(scheme).
+		WithObjects(tapRepo(true), userPkg).WithStatusSubresource(&sourcev1.OCIRepository{}).Build()
+	r := materializerFor(scheme, cl, record.NewFakeRecorder(10), &cur)
+
+	setArtifact(t, cl, digest, "rev1")
+	if _, err := r.Reconcile(context.Background(), req()); err != nil {
+		t.Fatalf("an existing user Package must not fail the reconcile: %v", err)
+	}
+	var pkg cozyv1alpha1.Package
+	if err := cl.Get(context.Background(), client.ObjectKey{Name: "example.hello"}, &pkg); err != nil {
+		t.Fatalf("the user's Package must be left in place: %v", err)
+	}
+	if pkg.GetLabels()[tapconst.Label] == "true" {
+		t.Error("the user's Package must NOT be adopted (stamped with the tap label)")
+	}
+	// Revision stamped => no hot re-pull loop.
+	var got sourcev1.OCIRepository
+	if err := cl.Get(context.Background(), req().NamespacedName, &got); err != nil {
+		t.Fatal(err)
+	}
+	if got.Annotations[tapconst.MaterializedRevisionAnnotation] != "rev1" {
+		t.Errorf("revision must be stamped so the reconcile does not hot-loop, got %q", got.Annotations[tapconst.MaterializedRevisionAnnotation])
+	}
+}
+
+// TestReconcileBlocksNameCollision asserts that when a tapped artifact declares
+// a PackageSource name already owned by a core component, the materializer
+// refuses: it does not overwrite the foreign object, records the reason on the
+// source, and does not stamp the revision (so a corrected artifact retries).
+func TestReconcileBlocksNameCollision(t *testing.T) {
+	scheme := tapScheme(t)
+	data, digest := tarGz(t, map[string]string{
+		// samplePS declares PackageSource "example.hello".
+		"packages/core/platform/sources/hello.yaml": samplePS,
+	})
+	repo := tapRepo(true)
+	// A core PackageSource of the same name, without the tap marker.
+	foreign := &cozyv1alpha1.PackageSource{ObjectMeta: metav1.ObjectMeta{Name: "example.hello"}}
+	cl := fake.NewClientBuilder().WithScheme(scheme).
+		WithObjects(repo, foreign).
+		WithStatusSubresource(&sourcev1.OCIRepository{}).
+		Build()
+
+	// Report a ready artifact so the reconciler proceeds to materialize.
+	var live sourcev1.OCIRepository
+	if err := cl.Get(context.Background(), req().NamespacedName, &live); err != nil {
+		t.Fatal(err)
+	}
+	live.Status.Artifact = &fluxmeta.Artifact{URL: "http://example.com/a.tar.gz", Digest: digest, Revision: "rev1"}
+	if err := cl.Status().Update(context.Background(), &live); err != nil {
+		t.Fatal(err)
+	}
+
+	rec := record.NewFakeRecorder(10)
+	r := &TapMaterializerReconciler{
+		Client:   cl,
+		Scheme:   scheme,
+		Recorder: rec,
+		Fetch:    func(context.Context, string) ([]byte, error) { return data, nil },
+	}
+
+	res, err := r.Reconcile(context.Background(), req())
+	if err != nil {
+		t.Fatalf("reconcile returned an error instead of surfacing the collision: %v", err)
+	}
+	if res.RequeueAfter != 0 {
+		t.Errorf("a collision must not hot-loop; got requeue %v", res.RequeueAfter)
+	}
+
+	var got sourcev1.OCIRepository
+	if err := cl.Get(context.Background(), req().NamespacedName, &got); err != nil {
+		t.Fatal(err)
+	}
+	if got.Annotations[tapconst.MaterializeErrorAnnotation] == "" {
+		t.Error("expected a materialize-error annotation recording the collision")
+	}
+	if got.Annotations[tapconst.MaterializedRevisionAnnotation] == "rev1" {
+		t.Error("a blocked materialization must not stamp the revision (so a corrected artifact retries)")
+	}
+
+	var ps cozyv1alpha1.PackageSource
+	if err := cl.Get(context.Background(), client.ObjectKey{Name: "example.hello"}, &ps); err != nil {
+		t.Fatal(err)
+	}
+	if ps.GetLabels()[tapconst.Label] == "true" {
+		t.Error("the collision check must not overwrite the foreign PackageSource")
+	}
+}
diff --git a/internal/securitygroupcontroller/cilium.go b/internal/securitygroupcontroller/cilium.go
new file mode 100644
index 0000000000..61a1e09503
--- /dev/null
+++ b/internal/securitygroupcontroller/cilium.go
@@ -0,0 +1,104 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright 2026 The Cozystack Authors.
+
+package securitygroupcontroller
+
+import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+)
+
+// CiliumNetworkPolicy is a metadata-only, in-tree mirror of the cilium.io/v2
+// CiliumNetworkPolicy resource. The securitygroup-controller only reads a
+// policy's marker label, its attachments annotation and its finalizers — never
+// the spec — so this mirror deliberately omits the spec entirely, keeping the
+// controller binary free of the full Cilium module. Importing it would tie this
+// project's k8s.io libraries to Cilium's: Go builds with the higher of the two
+// required versions, so a Cilium release built on a newer Kubernetes would drag
+// them forward, and one built on an older Kubernetes would have to compile
+// against ours.
+//
+// NEVER Update an object of this type: a PUT would serialize it without a spec
+// and wipe the real policy's rules. Finalizer changes go through MergeFrom
+// patches, which carry only the changed fields.
+type CiliumNetworkPolicy struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+}
+
+// CiliumNetworkPolicyList is a list of CiliumNetworkPolicy objects.
+type CiliumNetworkPolicyList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+	Items           []CiliumNetworkPolicy `json:"items"`
+}
+
+var ciliumGroupVersion = schema.GroupVersion{Group: "cilium.io", Version: "v2"}
+
+// AddToScheme registers the in-tree CiliumNetworkPolicy mirror so the
+// controller-runtime client can list and patch the backing policies.
+func AddToScheme(scheme *runtime.Scheme) error {
+	scheme.AddKnownTypes(ciliumGroupVersion,
+		&CiliumNetworkPolicy{},
+		&CiliumNetworkPolicyList{},
+	)
+	metav1.AddToGroupVersion(scheme, ciliumGroupVersion)
+	return nil
+}
+
+// DeepCopyInto copies the receiver into out.
+func (in *CiliumNetworkPolicy) DeepCopyInto(out *CiliumNetworkPolicy) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
+}
+
+// DeepCopy returns a deep copy of the receiver.
+func (in *CiliumNetworkPolicy) DeepCopy() *CiliumNetworkPolicy {
+	if in == nil {
+		return nil
+	}
+	out := new(CiliumNetworkPolicy)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject returns a deep copy of the receiver as a runtime.Object.
+func (in *CiliumNetworkPolicy) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto copies the receiver into out.
+func (in *CiliumNetworkPolicyList) DeepCopyInto(out *CiliumNetworkPolicyList) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ListMeta.DeepCopyInto(&out.ListMeta)
+	if in.Items != nil {
+		out.Items = make([]CiliumNetworkPolicy, len(in.Items))
+		for i := range in.Items {
+			in.Items[i].DeepCopyInto(&out.Items[i])
+		}
+	}
+}
+
+// DeepCopy returns a deep copy of the receiver.
+func (in *CiliumNetworkPolicyList) DeepCopy() *CiliumNetworkPolicyList {
+	if in == nil {
+		return nil
+	}
+	out := new(CiliumNetworkPolicyList)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject returns a deep copy of the receiver as a runtime.Object.
+func (in *CiliumNetworkPolicyList) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
diff --git a/internal/securitygroupcontroller/reconciler.go b/internal/securitygroupcontroller/reconciler.go
new file mode 100644
index 0000000000..c628f39911
--- /dev/null
+++ b/internal/securitygroupcontroller/reconciler.go
@@ -0,0 +1,339 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright 2026 The Cozystack Authors.
+
+// Package securitygroupcontroller maintains SecurityGroup membership labels.
+//
+// A SecurityGroup (served by cozystack-api as a projection over a marked
+// CiliumNetworkPolicy) owns a membership label securitygroup.sdn.cozystack.io/
+// <name>. The backing policy's endpointSelector matches that label, so the
+// policy applies to exactly the pods carrying it. This controller is the only
+// writer of those labels: for each marked policy it stamps the membership label
+// onto the pods of the applications listed in the policy's attachments
+// annotation, and removes it when an application is detached or the
+// SecurityGroup is deleted.
+//
+// The controller never trusts the attachment list to pick pods directly: it
+// resolves each attachment to the lineage labels the lineage webhook stamps on
+// managed-app pods (apps.cozystack.io/application.{group,kind,name}) and only
+// ever labels pods that already carry those labels in the SecurityGroup's own
+// namespace. That, plus single-key merge patches, keeps a tenant-driven
+// cluster-wide pod-label writer from reaching pods a tenant could not otherwise
+// address.
+package securitygroupcontroller
+
+import (
+	"context"
+	"encoding/json"
+	"time"
+
+	corev1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/labels"
+	"k8s.io/apimachinery/pkg/types"
+	ctrl "sigs.k8s.io/controller-runtime"
+	"sigs.k8s.io/controller-runtime/pkg/builder"
+	"sigs.k8s.io/controller-runtime/pkg/cache"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
+	"sigs.k8s.io/controller-runtime/pkg/handler"
+	"sigs.k8s.io/controller-runtime/pkg/log"
+	"sigs.k8s.io/controller-runtime/pkg/predicate"
+	"sigs.k8s.io/controller-runtime/pkg/reconcile"
+
+	sdnv1alpha1 "github.com/cozystack/cozystack/pkg/apis/sdn/v1alpha1"
+)
+
+const (
+	// sgLabelKey marks the CiliumNetworkPolicy objects owned by the SecurityGroup
+	// API. It mirrors the constant in pkg/registry/sdn/securitygroup.
+	sgLabelKey   = "sdn.cozystack.io/securitygroup"
+	sgLabelValue = "true"
+
+	// attachmentsAnnotation holds the SecurityGroup's attachments as a JSON array
+	// of ApplicationReference. It mirrors the constant the REST storage writes.
+	attachmentsAnnotation = "sdn.cozystack.io/attachments"
+
+	// membershipFinalizer guards the backing policy so the controller can strip
+	// the membership labels off member pods before the policy disappears. Shared
+	// with the REST storage, which re-asserts it on write.
+	membershipFinalizer = sdnv1alpha1.MembershipFinalizer
+
+	// appGroupLabelKey, appKindLabelKey and appNameLabelKey are the lineage
+	// labels the lineage webhook stamps on managed-app pods. Mirrored here to
+	// keep the controller from depending on internal/lineagecontrollerwebhook.
+	appGroupLabelKey = "apps.cozystack.io/application.group"
+	appKindLabelKey  = "apps.cozystack.io/application.kind"
+	appNameLabelKey  = "apps.cozystack.io/application.name"
+
+	defaultAppGroup = "apps.cozystack.io"
+
+	// managedByLabel marks pods the lineage webhook manages — the only pods that
+	// can ever be SecurityGroup members. The manager caches only these pods.
+	managedByLabel = "internal.cozystack.io/managed-by-cozystack"
+
+	// membershipResyncInterval bounds how long membership can stay diverged if a
+	// pod event is ever missed or raced. A successful reconcile requeues itself
+	// after this interval as a safety net on top of the prompt, event-driven pod
+	// watch — far tighter than the manager's default SyncPeriod.
+	membershipResyncInterval = 10 * time.Minute
+)
+
+// CacheByObject bounds the manager's informers: pods are cached only when
+// managed by Cozystack (the only pods that can be members) and
+// CiliumNetworkPolicies only when SecurityGroup-owned, keeping the controller's
+// cache small in a busy cluster. A managed pod never loses the managed-by label,
+// so scoping by it cannot hide a pod whose membership must later be removed.
+func CacheByObject() map[client.Object]cache.ByObject {
+	return map[client.Object]cache.ByObject{
+		&corev1.Pod{}:          {Label: labels.SelectorFromSet(labels.Set{managedByLabel: "true"})},
+		&CiliumNetworkPolicy{}: {Label: labels.SelectorFromSet(labels.Set{sgLabelKey: sgLabelValue})},
+	}
+}
+
+// membershipLabelKey returns the membership label key for a SecurityGroup name.
+func membershipLabelKey(name string) string {
+	return sdnv1alpha1.MembershipLabelPrefix + name
+}
+
+// appLabels projects an ApplicationReference into the lineage labels that select
+// the referenced application's pods. It mirrors the REST storage so the
+// controller resolves attachments to exactly the pods the projection targets.
+func appLabels(ref sdnv1alpha1.ApplicationReference) map[string]string {
+	group := ref.APIGroup
+	if group == "" {
+		group = defaultAppGroup
+	}
+	return map[string]string{
+		appGroupLabelKey: group,
+		appKindLabelKey:  ref.Kind,
+		appNameLabelKey:  ref.Name,
+	}
+}
+
+// decodeAttachments parses the attachments annotation. A missing value yields
+// nil; a malformed value is treated as empty (so a bad annotation cannot wedge
+// the reconciler) but is logged, since silently swallowing it hides a real
+// defect in whatever wrote the annotation.
+func decodeAttachments(ctx context.Context, s string) []sdnv1alpha1.ApplicationReference {
+	if s == "" {
+		return nil
+	}
+	var refs []sdnv1alpha1.ApplicationReference
+	if err := json.Unmarshal([]byte(s), &refs); err != nil {
+		log.FromContext(ctx).Error(err, "ignoring malformed attachments annotation", "annotation", attachmentsAnnotation)
+		return nil
+	}
+	return refs
+}
+
+// Reconciler keeps SecurityGroup membership labels in sync with attachments.
+type Reconciler struct {
+	client.Client
+}
+
+// +kubebuilder:rbac:groups="",resources=pods,verbs=get;list;watch;patch
+// +kubebuilder:rbac:groups=cilium.io,resources=ciliumnetworkpolicies,verbs=get;list;watch;patch
+
+// Reconcile brings a single SecurityGroup's membership labels to the desired
+// state: the union of its attachments' pods carries the membership label, and
+// nothing else does.
+func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
+	logger := log.FromContext(ctx)
+
+	cnp := &CiliumNetworkPolicy{}
+	if err := r.Get(ctx, req.NamespacedName, cnp); err != nil {
+		return ctrl.Result{}, client.IgnoreNotFound(err)
+	}
+	// Only act on SecurityGroup-owned policies; a marker-less policy reaching the
+	// queue (e.g. a label flip) is none of this controller's business.
+	if cnp.Labels[sgLabelKey] != sgLabelValue {
+		return ctrl.Result{}, nil
+	}
+
+	ns := cnp.Namespace
+	key := membershipLabelKey(cnp.Name)
+
+	// Deletion: strip the membership label off every member pod, then drop the
+	// finalizer so the policy can be garbage-collected.
+	if !cnp.DeletionTimestamp.IsZero() {
+		if controllerutil.ContainsFinalizer(cnp, membershipFinalizer) {
+			if err := r.stripMembership(ctx, ns, key); err != nil {
+				return ctrl.Result{}, err
+			}
+			if err := r.removeFinalizer(ctx, cnp); err != nil {
+				return ctrl.Result{}, err
+			}
+			logger.V(1).Info("released SecurityGroup membership", "securitygroup", cnp.Name, "namespace", ns)
+		}
+		return ctrl.Result{}, nil
+	}
+
+	if err := r.ensureFinalizer(ctx, cnp); err != nil {
+		return ctrl.Result{}, err
+	}
+
+	// Desired members: pods matching any attachment's lineage labels in this
+	// namespace. Resolving through lineage labels — not the attachment list
+	// directly — is the boundary that stops a SecurityGroup from labeling pods a
+	// tenant could not otherwise select.
+	desired := map[string]struct{}{}
+	for _, app := range decodeAttachments(ctx, cnp.Annotations[attachmentsAnnotation]) {
+		pods := &corev1.PodList{}
+		if err := r.List(ctx, pods, client.InNamespace(ns), client.MatchingLabels(appLabels(app))); err != nil {
+			return ctrl.Result{}, err
+		}
+		for i := range pods.Items {
+			if err := r.addMembership(ctx, &pods.Items[i], key); err != nil {
+				return ctrl.Result{}, err
+			}
+			desired[pods.Items[i].Name] = struct{}{}
+		}
+	}
+
+	// Current members: pods carrying the membership label. Any that are no longer
+	// desired (the app was detached) get the label removed.
+	current := &corev1.PodList{}
+	if err := r.List(ctx, current, client.InNamespace(ns), client.MatchingLabels{key: ""}); err != nil {
+		return ctrl.Result{}, err
+	}
+	for i := range current.Items {
+		if _, ok := desired[current.Items[i].Name]; ok {
+			continue
+		}
+		if err := r.removeMembership(ctx, &current.Items[i], key); err != nil {
+			return ctrl.Result{}, err
+		}
+	}
+
+	// Re-queue a periodic resync as a safety net. The pod watch is the prompt
+	// path — a new managed-app pod fires mapPodToSGs and re-reconciles within
+	// milliseconds. But desired/current are computed from the cached lister, so
+	// if a pod's membership ever fails to converge from an event (a missed or
+	// raced informer delivery, an add/remove patch lost to a transient API
+	// error swallowed by a later success, etc.) this bounded resync re-lists
+	// from a now-current cache and repairs it without waiting for the manager's
+	// hours-long default SyncPeriod. It is cheap (one reconcile per SecurityGroup
+	// per interval) and keeps membership eventually consistent regardless of
+	// event delivery.
+	return ctrl.Result{RequeueAfter: membershipResyncInterval}, nil
+}
+
+// stripMembership removes the membership label from every pod that carries it in
+// the namespace. Used on SecurityGroup deletion.
+func (r *Reconciler) stripMembership(ctx context.Context, ns, key string) error {
+	pods := &corev1.PodList{}
+	if err := r.List(ctx, pods, client.InNamespace(ns), client.MatchingLabels{key: ""}); err != nil {
+		return err
+	}
+	for i := range pods.Items {
+		if err := r.removeMembership(ctx, &pods.Items[i], key); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+// addMembership stamps the membership label onto a pod with a single-key merge
+// patch, so it never clobbers another SecurityGroup's label or the pod's lineage
+// labels.
+func (r *Reconciler) addMembership(ctx context.Context, pod *corev1.Pod, key string) error {
+	if _, ok := pod.Labels[key]; ok {
+		return nil
+	}
+	patch := client.MergeFrom(pod.DeepCopy())
+	if pod.Labels == nil {
+		pod.Labels = map[string]string{}
+	}
+	pod.Labels[key] = ""
+	return r.Patch(ctx, pod, patch)
+}
+
+// removeMembership clears the membership label off a pod with a single-key merge
+// patch.
+func (r *Reconciler) removeMembership(ctx context.Context, pod *corev1.Pod, key string) error {
+	if _, ok := pod.Labels[key]; !ok {
+		return nil
+	}
+	patch := client.MergeFrom(pod.DeepCopy())
+	delete(pod.Labels, key)
+	return r.Patch(ctx, pod, patch)
+}
+
+// ensureFinalizer adds the membership finalizer to the backing policy. The
+// finalizer is changed through a merge patch, never an Update, so the policy's
+// spec is left untouched.
+func (r *Reconciler) ensureFinalizer(ctx context.Context, cnp *CiliumNetworkPolicy) error {
+	if controllerutil.ContainsFinalizer(cnp, membershipFinalizer) {
+		return nil
+	}
+	patch := client.MergeFrom(cnp.DeepCopy())
+	controllerutil.AddFinalizer(cnp, membershipFinalizer)
+	return r.Patch(ctx, cnp, patch)
+}
+
+// removeFinalizer drops the membership finalizer from the backing policy.
+func (r *Reconciler) removeFinalizer(ctx context.Context, cnp *CiliumNetworkPolicy) error {
+	patch := client.MergeFrom(cnp.DeepCopy())
+	controllerutil.RemoveFinalizer(cnp, membershipFinalizer)
+	return r.Patch(ctx, cnp, patch)
+}
+
+// mapPodToSGs maps a managed-app pod to the SecurityGroups whose attachments
+// include that pod's application, so a freshly-created pod is labeled promptly.
+func (r *Reconciler) mapPodToSGs(ctx context.Context, obj client.Object) []reconcile.Request {
+	pod, ok := obj.(*corev1.Pod)
+	if !ok {
+		return nil
+	}
+	// Only pods carrying an application identity can ever be members.
+	if pod.Labels[appNameLabelKey] == "" {
+		return nil
+	}
+
+	cnps := &CiliumNetworkPolicyList{}
+	if err := r.List(ctx, cnps, client.InNamespace(pod.Namespace), client.MatchingLabels{sgLabelKey: sgLabelValue}); err != nil {
+		// Returning no requests is the right signal here, but a transient List
+		// error would otherwise be invisible — a pod update could be missed
+		// until the next periodic resync with no trace. Log it.
+		log.FromContext(ctx).Error(err, "failed to list SecurityGroup policies for pod mapping", "pod", pod.Name, "namespace", pod.Namespace)
+		return nil
+	}
+
+	var reqs []reconcile.Request
+	for i := range cnps.Items {
+		for _, app := range decodeAttachments(ctx, cnps.Items[i].Annotations[attachmentsAnnotation]) {
+			if appMatchesPod(app, pod.Labels) {
+				reqs = append(reqs, reconcile.Request{NamespacedName: types.NamespacedName{
+					Namespace: cnps.Items[i].Namespace,
+					Name:      cnps.Items[i].Name,
+				}})
+				break
+			}
+		}
+	}
+	return reqs
+}
+
+// appMatchesPod reports whether a pod carries all of an attachment's lineage
+// labels.
+func appMatchesPod(ref sdnv1alpha1.ApplicationReference, podLabels map[string]string) bool {
+	for k, v := range appLabels(ref) {
+		if podLabels[k] != v {
+			return false
+		}
+	}
+	return true
+}
+
+// SetupWithManager wires the controller: it reconciles marked
+// CiliumNetworkPolicies and watches managed-app pods to enqueue the
+// SecurityGroups they belong to.
+func (r *Reconciler) SetupWithManager(mgr ctrl.Manager) error {
+	markerOnly := predicate.NewPredicateFuncs(func(o client.Object) bool {
+		return o.GetLabels()[sgLabelKey] == sgLabelValue
+	})
+	return ctrl.NewControllerManagedBy(mgr).
+		Named("securitygroup-membership").
+		For(&CiliumNetworkPolicy{}, builder.WithPredicates(markerOnly)).
+		Watches(&corev1.Pod{}, handler.EnqueueRequestsFromMapFunc(r.mapPodToSGs)).
+		Complete(r)
+}
diff --git a/internal/securitygroupcontroller/reconciler_test.go b/internal/securitygroupcontroller/reconciler_test.go
new file mode 100644
index 0000000000..d3ce6e23a6
--- /dev/null
+++ b/internal/securitygroupcontroller/reconciler_test.go
@@ -0,0 +1,318 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright 2026 The Cozystack Authors.
+
+package securitygroupcontroller
+
+import (
+	"context"
+	"encoding/json"
+	"maps"
+	"testing"
+
+	corev1 "k8s.io/api/core/v1"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/types"
+	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
+	ctrl "sigs.k8s.io/controller-runtime"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/client/fake"
+	"sigs.k8s.io/controller-runtime/pkg/client/interceptor"
+
+	sdnv1alpha1 "github.com/cozystack/cozystack/pkg/apis/sdn/v1alpha1"
+)
+
+const ns = "tenant-root"
+
+func appRef(kind, name string) sdnv1alpha1.ApplicationReference {
+	return sdnv1alpha1.ApplicationReference{APIGroup: defaultAppGroup, Kind: kind, Name: name}
+}
+
+func newReconciler(t *testing.T, objs ...client.Object) (*Reconciler, client.Client) {
+	t.Helper()
+	scheme := runtime.NewScheme()
+	if err := clientgoscheme.AddToScheme(scheme); err != nil {
+		t.Fatalf("add client-go scheme: %v", err)
+	}
+	if err := AddToScheme(scheme); err != nil {
+		t.Fatalf("add cilium mirror: %v", err)
+	}
+	fc := fake.NewClientBuilder().WithScheme(scheme).WithObjects(objs...).Build()
+	return &Reconciler{Client: fc}, fc
+}
+
+// sg builds a marked CiliumNetworkPolicy with the given attachments annotation.
+func sg(name string, finalizer bool, attachments ...sdnv1alpha1.ApplicationReference) *CiliumNetworkPolicy {
+	ann := map[string]string{}
+	if len(attachments) > 0 {
+		b, _ := json.Marshal(attachments)
+		ann[attachmentsAnnotation] = string(b)
+	}
+	cnp := &CiliumNetworkPolicy{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:        name,
+			Namespace:   ns,
+			Labels:      map[string]string{sgLabelKey: sgLabelValue},
+			Annotations: ann,
+		},
+	}
+	if finalizer {
+		cnp.Finalizers = []string{membershipFinalizer}
+	}
+	return cnp
+}
+
+// pod builds a managed pod carrying the lineage labels of the given application.
+func pod(name, namespace string, ref sdnv1alpha1.ApplicationReference, extra map[string]string) *corev1.Pod {
+	l := map[string]string{managedByLabel: "true"}
+	maps.Copy(l, appLabels(ref))
+	maps.Copy(l, extra)
+	return &corev1.Pod{ObjectMeta: metav1.ObjectMeta{Name: name, Namespace: namespace, Labels: l}}
+}
+
+func doReconcile(t *testing.T, r *Reconciler, name string) {
+	t.Helper()
+	if _, err := r.Reconcile(context.Background(), ctrl.Request{NamespacedName: types.NamespacedName{Namespace: ns, Name: name}}); err != nil {
+		t.Fatalf("Reconcile(%s): %v", name, err)
+	}
+}
+
+func hasMembership(t *testing.T, c client.Client, podName, namespace, key string) bool {
+	t.Helper()
+	p := &corev1.Pod{}
+	if err := c.Get(context.Background(), types.NamespacedName{Namespace: namespace, Name: podName}, p); err != nil {
+		t.Fatalf("get pod %s/%s: %v", namespace, podName, err)
+	}
+	_, ok := p.Labels[key]
+	return ok
+}
+
+func TestStampsMembershipOnMatchingPods(t *testing.T) {
+	db := appRef("Postgres", "db")
+	r, c := newReconciler(t,
+		sg("sg-db", false, db),
+		pod("db-0", ns, db, nil),
+		pod("web-0", ns, appRef("Kubernetes", "web"), nil),
+	)
+	doReconcile(t, r, "sg-db")
+
+	key := membershipLabelKey("sg-db")
+	if !hasMembership(t, c, "db-0", ns, key) {
+		t.Fatalf("matching pod db-0 was not stamped with %q", key)
+	}
+	if hasMembership(t, c, "web-0", ns, key) {
+		t.Fatalf("non-matching pod web-0 was stamped with %q", key)
+	}
+}
+
+func TestRemovesMembershipOnDetach(t *testing.T) {
+	key := membershipLabelKey("sg-db")
+	// The pod already carries the membership label, but the group now has no
+	// attachments — the controller must remove it.
+	r, c := newReconciler(t,
+		sg("sg-db", true),
+		pod("db-0", ns, appRef("Postgres", "db"), map[string]string{key: ""}),
+	)
+	doReconcile(t, r, "sg-db")
+
+	if hasMembership(t, c, "db-0", ns, key) {
+		t.Fatalf("membership label was not removed after detach")
+	}
+}
+
+func TestTwoSecurityGroupsCoexistOnOnePod(t *testing.T) {
+	db := appRef("Postgres", "db")
+	r, c := newReconciler(t,
+		sg("sg-a", true, db),
+		sg("sg-b", true, db),
+		pod("db-0", ns, db, nil),
+	)
+	doReconcile(t, r, "sg-a")
+	doReconcile(t, r, "sg-b")
+
+	keyA, keyB := membershipLabelKey("sg-a"), membershipLabelKey("sg-b")
+	if !hasMembership(t, c, "db-0", ns, keyA) || !hasMembership(t, c, "db-0", ns, keyB) {
+		t.Fatalf("both group labels should be present on the shared pod")
+	}
+
+	// Deleting sg-a must remove only its own label, leaving sg-b's intact.
+	cnpA := &CiliumNetworkPolicy{}
+	if err := c.Get(context.Background(), types.NamespacedName{Namespace: ns, Name: "sg-a"}, cnpA); err != nil {
+		t.Fatalf("get sg-a: %v", err)
+	}
+	if err := c.Delete(context.Background(), cnpA); err != nil {
+		t.Fatalf("delete sg-a: %v", err)
+	}
+	doReconcile(t, r, "sg-a")
+
+	if hasMembership(t, c, "db-0", ns, keyA) {
+		t.Fatalf("sg-a label should be gone after deletion")
+	}
+	if !hasMembership(t, c, "db-0", ns, keyB) {
+		t.Fatalf("sg-b label must survive sg-a deletion")
+	}
+}
+
+func TestFinalizerCleanupOnDelete(t *testing.T) {
+	db := appRef("Postgres", "db")
+	r, c := newReconciler(t,
+		sg("sg-db", true, db),
+		pod("db-0", ns, db, nil),
+	)
+	doReconcile(t, r, "sg-db")
+	key := membershipLabelKey("sg-db")
+	if !hasMembership(t, c, "db-0", ns, key) {
+		t.Fatalf("precondition: pod should be stamped")
+	}
+
+	cnp := &CiliumNetworkPolicy{}
+	if err := c.Get(context.Background(), types.NamespacedName{Namespace: ns, Name: "sg-db"}, cnp); err != nil {
+		t.Fatalf("get sg-db: %v", err)
+	}
+	if err := c.Delete(context.Background(), cnp); err != nil {
+		t.Fatalf("delete sg-db: %v", err)
+	}
+	// The finalizer keeps the policy around until the controller cleans up.
+	doReconcile(t, r, "sg-db")
+
+	if hasMembership(t, c, "db-0", ns, key) {
+		t.Fatalf("membership label not cleaned up on delete")
+	}
+	if err := c.Get(context.Background(), types.NamespacedName{Namespace: ns, Name: "sg-db"}, cnp); !apierrors.IsNotFound(err) {
+		t.Fatalf("policy not garbage-collected after finalizer removal: err=%v", err)
+	}
+}
+
+func TestOtherNamespaceUntouched(t *testing.T) {
+	db := appRef("Postgres", "db")
+	r, c := newReconciler(t,
+		sg("sg-db", true, db),
+		pod("db-0", ns, db, nil),
+		pod("db-0", "other-tenant", db, nil),
+	)
+	doReconcile(t, r, "sg-db")
+
+	key := membershipLabelKey("sg-db")
+	if !hasMembership(t, c, "db-0", ns, key) {
+		t.Fatalf("in-namespace pod should be stamped")
+	}
+	if hasMembership(t, c, "db-0", "other-tenant", key) {
+		t.Fatalf("pod in another namespace must never be stamped")
+	}
+}
+
+func TestEnsuresFinalizer(t *testing.T) {
+	r, c := newReconciler(t, sg("sg-db", false, appRef("Postgres", "db")))
+	doReconcile(t, r, "sg-db")
+
+	cnp := &CiliumNetworkPolicy{}
+	if err := c.Get(context.Background(), types.NamespacedName{Namespace: ns, Name: "sg-db"}, cnp); err != nil {
+		t.Fatalf("get sg-db: %v", err)
+	}
+	if len(cnp.Finalizers) != 1 || cnp.Finalizers[0] != membershipFinalizer {
+		t.Fatalf("finalizer not ensured: %+v", cnp.Finalizers)
+	}
+}
+
+func TestReconcileRequeuesSoARacedPodStillConverges(t *testing.T) {
+	// Safety net: the desired set is computed from the cached lister, so if a
+	// member pod is ever not yet visible to the cache when a reconcile runs, the
+	// reconcile must still request a resync rather than give up — otherwise that
+	// pod could stay unlabelled until an unrelated event. Here the first pod List
+	// is forced to return nothing (the pod "not yet cached"); the reconcile must
+	// not label it but must requeue, and a follow-up reconcile (pod now visible)
+	// must converge.
+	db := appRef("Postgres", "db")
+	scheme := runtime.NewScheme()
+	if err := clientgoscheme.AddToScheme(scheme); err != nil {
+		t.Fatalf("add client-go scheme: %v", err)
+	}
+	if err := AddToScheme(scheme); err != nil {
+		t.Fatalf("add cilium mirror: %v", err)
+	}
+	listCalls := 0
+	c := fake.NewClientBuilder().WithScheme(scheme).
+		WithObjects(sg("sg-db", true, db), pod("db-0", ns, db, nil)).
+		WithInterceptorFuncs(interceptor.Funcs{
+			List: func(ctx context.Context, cl client.WithWatch, list client.ObjectList, opts ...client.ListOption) error {
+				if err := cl.List(ctx, list, opts...); err != nil {
+					return err
+				}
+				// Hide the pod from the first pod List only (the desired-set list
+				// of the first reconcile), simulating a not-yet-synced cache.
+				if pl, ok := list.(*corev1.PodList); ok {
+					listCalls++
+					if listCalls == 1 {
+						pl.Items = nil
+					}
+				}
+				return nil
+			},
+		}).Build()
+	r := &Reconciler{Client: c}
+	key := membershipLabelKey("sg-db")
+
+	res, err := r.Reconcile(context.Background(), ctrl.Request{NamespacedName: types.NamespacedName{Namespace: ns, Name: "sg-db"}})
+	if err != nil {
+		t.Fatalf("first Reconcile: %v", err)
+	}
+	if hasMembership(t, c, "db-0", ns, key) {
+		t.Fatalf("precondition: pod should not be labelled while invisible to the cache")
+	}
+	if res.RequeueAfter <= 0 {
+		t.Fatalf("reconcile must requeue a resync so a raced/missed pod still converges; got RequeueAfter=%v", res.RequeueAfter)
+	}
+
+	if _, err := r.Reconcile(context.Background(), ctrl.Request{NamespacedName: types.NamespacedName{Namespace: ns, Name: "sg-db"}}); err != nil {
+		t.Fatalf("second Reconcile: %v", err)
+	}
+	if !hasMembership(t, c, "db-0", ns, key) {
+		t.Fatalf("pod should be labelled once visible to the cache")
+	}
+}
+
+func TestMapPodToSGs(t *testing.T) {
+	db := appRef("Postgres", "db")
+	r, _ := newReconciler(t,
+		sg("sg-db", true, db),
+		sg("sg-other", true, appRef("Kubernetes", "web")),
+	)
+
+	// A pod of the attached app enqueues exactly its SecurityGroup.
+	reqs := r.mapPodToSGs(context.Background(), pod("db-0", ns, db, nil))
+	if len(reqs) != 1 || reqs[0].Name != "sg-db" {
+		t.Fatalf("mapPodToSGs(db-0) = %+v, want [sg-db]", reqs)
+	}
+
+	// A pod with no application identity enqueues nothing.
+	bare := &corev1.Pod{ObjectMeta: metav1.ObjectMeta{Name: "bare", Namespace: ns}}
+	if reqs := r.mapPodToSGs(context.Background(), bare); len(reqs) != 0 {
+		t.Fatalf("mapPodToSGs(bare) = %+v, want none", reqs)
+	}
+}
+
+func TestDecodeAttachments(t *testing.T) {
+	ctx := context.Background()
+
+	if got := decodeAttachments(ctx, ""); got != nil {
+		t.Fatalf("decodeAttachments(empty) = %+v, want nil", got)
+	}
+
+	// A malformed annotation must be treated as empty (nil), not crash the
+	// reconciler. The error is logged, not returned.
+	if got := decodeAttachments(ctx, "{not json"); got != nil {
+		t.Fatalf("decodeAttachments(malformed) = %+v, want nil", got)
+	}
+
+	// A well-formed annotation round-trips.
+	refs := []sdnv1alpha1.ApplicationReference{appRef("Postgres", "db")}
+	encoded, err := json.Marshal(refs)
+	if err != nil {
+		t.Fatalf("marshal: %v", err)
+	}
+	got := decodeAttachments(ctx, string(encoded))
+	if len(got) != 1 || got[0].Kind != "Postgres" || got[0].Name != "db" {
+		t.Fatalf("decodeAttachments(valid) = %+v, want one Postgres/db ref", got)
+	}
+}
diff --git a/internal/shared/appdefowner/appdefowner.go b/internal/shared/appdefowner/appdefowner.go
new file mode 100644
index 0000000000..b9261b1351
--- /dev/null
+++ b/internal/shared/appdefowner/appdefowner.go
@@ -0,0 +1,48 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright 2025 The Cozystack Authors.
+
+// Package appdefowner decides which ApplicationDefinition owns an application
+// kind when more than one declares it. The Go consumers that map a kind back to
+// a definition (the cozystack-api resource registry and its restart hash, the
+// HelmRelease chartRef reconciler, the lineage webhook and the CA projection
+// reconciler) use this one rule, so they settle on the same definition.
+//
+// The definition created first owns the kind; creation time ties are broken by
+// name. Creation time has one-second resolution, so only a definition created
+// in a later second is reliably kept out; within one second the name decides.
+// A definition that arrives later with a kind already in use therefore does not
+// take over the releases the earlier one backs.
+package appdefowner
+
+import (
+	cozyv1alpha1 "github.com/cozystack/cozystack/api/v1alpha1"
+)
+
+// Owners maps every non-empty application kind to the name of the definition
+// that owns it. The result does not depend on the order of defs.
+func Owners(defs []cozyv1alpha1.ApplicationDefinition) map[string]string {
+	owners := make(map[string]string)
+	owner := make(map[string]*cozyv1alpha1.ApplicationDefinition)
+	for i := range defs {
+		d := &defs[i]
+		kind := d.Spec.Application.Kind
+		if kind == "" {
+			continue
+		}
+		if cur, ok := owner[kind]; !ok || before(d, cur) {
+			owner[kind] = d
+		}
+	}
+	for kind, d := range owner {
+		owners[kind] = d.Name
+	}
+	return owners
+}
+
+func before(a, b *cozyv1alpha1.ApplicationDefinition) bool {
+	at, bt := a.CreationTimestamp.Time, b.CreationTimestamp.Time
+	if !at.Equal(bt) {
+		return at.Before(bt)
+	}
+	return a.Name < b.Name
+}
diff --git a/internal/shared/appdefowner/appdefowner_test.go b/internal/shared/appdefowner/appdefowner_test.go
new file mode 100644
index 0000000000..f705a42c2d
--- /dev/null
+++ b/internal/shared/appdefowner/appdefowner_test.go
@@ -0,0 +1,45 @@
+package appdefowner
+
+import (
+	"testing"
+	"time"
+
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	cozyv1alpha1 "github.com/cozystack/cozystack/api/v1alpha1"
+)
+
+func def(name, kind string, created time.Time) cozyv1alpha1.ApplicationDefinition {
+	d := cozyv1alpha1.ApplicationDefinition{ObjectMeta: metav1.ObjectMeta{Name: name, CreationTimestamp: metav1.NewTime(created)}}
+	d.Spec.Application.Kind = kind
+	return d
+}
+
+func TestOwnersOldestDefinitionWins(t *testing.T) {
+	base := time.Date(2026, 1, 1, 0, 0, 0, 0, time.UTC)
+	// The newcomer sorts first by name, so a name-only rule would hand it the kind.
+	owners := Owners([]cozyv1alpha1.ApplicationDefinition{
+		def("aaa-newcomer", "Redis", base.Add(time.Hour)),
+		def("redis", "Redis", base),
+	})
+	if got := owners["Redis"]; got != "redis" {
+		t.Fatalf("owner of Redis = %q, want the older definition %q", got, "redis")
+	}
+}
+
+func TestOwnersTieBrokenByName(t *testing.T) {
+	ts := time.Date(2026, 1, 1, 0, 0, 0, 0, time.UTC)
+	for _, order := range [][]string{{"b", "a"}, {"a", "b"}} {
+		owners := Owners([]cozyv1alpha1.ApplicationDefinition{def(order[0], "Redis", ts), def(order[1], "Redis", ts)})
+		if got := owners["Redis"]; got != "a" {
+			t.Fatalf("input order %v: owner = %q, want %q regardless of list order", order, got, "a")
+		}
+	}
+}
+
+func TestOwnersSkipsEmptyKind(t *testing.T) {
+	owners := Owners([]cozyv1alpha1.ApplicationDefinition{def("x", "", time.Now())})
+	if _, ok := owners[""]; ok {
+		t.Fatal("a definition with no kind must not own the empty kind")
+	}
+}
diff --git a/internal/sse/server.go b/internal/sse/server.go
index 60d983f57c..0c55032ec2 100644
--- a/internal/sse/server.go
+++ b/internal/sse/server.go
@@ -232,8 +232,8 @@ func (c *client) pump() {
 
 func writeSSE(w http.ResponseWriter, msg string) {
 	// Split on lines; each needs its own "data:" field per the SSE spec
-	lines := strings.Split(strings.TrimRight(msg, "\n"), "\n")
-	for _, ln := range lines {
+	lines := strings.SplitSeq(strings.TrimRight(msg, "\n"), "\n")
+	for ln := range lines {
 		fmt.Fprintf(w, "data: %s\n", ln)
 	}
 	fmt.Fprint(w, "\n")
diff --git a/internal/template/template.go b/internal/template/template.go
index 9c877c2007..31cefafbb4 100644
--- a/internal/template/template.go
+++ b/internal/template/template.go
@@ -38,6 +38,15 @@ func Template[T any](obj *T, templateContext map[string]any) (*T, error) {
 	return &out, nil
 }
 
+// String renders a single template string against the context and surfaces any
+// parse or execute error. Template walks a struct's string leaves and, by
+// design, leaves a leaf unchanged when its template fails; a caller that gates
+// on the rendered value — a strategy precondition, an artifact URI — needs the
+// error instead, so it can fail loud rather than act on a half-rendered string.
+func String(in string, templateContext map[string]any) (string, error) {
+	return template(in, templateContext)
+}
+
 func mapAtStrings(v any, f func(string) string) any {
 	switch x := v.(type) {
 	case map[string]any:
diff --git a/packages/apps/bucket/Makefile b/packages/apps/bucket/Makefile
index 1e35bd5346..efe8f33817 100644
--- a/packages/apps/bucket/Makefile
+++ b/packages/apps/bucket/Makefile
@@ -1,5 +1,9 @@
 include ../../../hack/package.mk
 
+.PHONY: test
+test:
+	helm unittest .
+
 generate:
 	cozyvalues-gen -m 'bucket' -v values.yaml -s values.schema.json -r README.md -g ../../../api/apps/v1alpha1/bucket/types.go
 	../../../hack/update-crd.sh
diff --git a/packages/apps/bucket/README.md b/packages/apps/bucket/README.md
index 982225ceb0..13e52d1082 100644
--- a/packages/apps/bucket/README.md
+++ b/packages/apps/bucket/README.md
@@ -4,10 +4,11 @@
 
 ### Parameters
 
-| Name                   | Description                                                                | Type                | Value   |
-| ---------------------- | -------------------------------------------------------------------------- | ------------------- | ------- |
-| `locking`              | Provisions bucket from the `-lock` BucketClass (with object lock enabled). | `bool`              | `false` |
-| `storagePool`          | Selects a specific BucketClass by storage pool name.                       | `string`            | `""`    |
-| `users`                | Users configuration map.                                                   | `map[string]object` | `{}`    |
-| `users[name].readonly` | Whether the user has read-only access.                                     | `bool`              | `false` |
+| Name                   | Description                                                                                                                                              | Type                | Value   |
+| ---------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------- | ------- |
+| `locking`              | Provisions bucket from the `-lock` BucketClass (with object lock enabled).                                                                               | `bool`              | `false` |
+| `storagePool`          | Selects a specific BucketClass by storage pool name.                                                                                                     | `string`            | `""`    |
+| `ui`                   | Deploys the web UI (s3manager) with its Service and its Ingress or HTTPRoute at `<bucket>.<tenant host>`. Set to `false` to run the bucket without them. | `bool`              | `true`  |
+| `users`                | Users configuration map.                                                                                                                                 | `map[string]object` | `{}`    |
+| `users[name].readonly` | Whether the user has read-only access.                                                                                                                   | `bool`              | `false` |
 
diff --git a/packages/apps/bucket/templates/dashboard-resourcemap.yaml b/packages/apps/bucket/templates/dashboard-resourcemap.yaml
index 82a51e1634..11a033aec8 100644
--- a/packages/apps/bucket/templates/dashboard-resourcemap.yaml
+++ b/packages/apps/bucket/templates/dashboard-resourcemap.yaml
@@ -12,6 +12,7 @@ rules:
   - {{ $.Release.Name }}-{{ $name }}-credentials
   {{- end }}
   verbs: ["get", "list", "watch"]
+{{- if .Values.ui }}
 - apiGroups:
   - networking.k8s.io
   resources:
@@ -19,6 +20,7 @@ rules:
   resourceNames:
   - {{ .Release.Name }}-ui
   verbs: ["get", "list", "watch"]
+{{- end }}
 ---
 kind: RoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
diff --git a/packages/apps/bucket/templates/helmrelease.yaml b/packages/apps/bucket/templates/helmrelease.yaml
index acaf8cc0b6..7efa174678 100644
--- a/packages/apps/bucket/templates/helmrelease.yaml
+++ b/packages/apps/bucket/templates/helmrelease.yaml
@@ -23,3 +23,4 @@ spec:
   values:
     bucketName: {{ .Release.Name }}
     users: {{ .Values.users | toJson }}
+    ui: {{ .Values.ui }}
diff --git a/packages/apps/bucket/templates/hooks/cleanup-acme.yaml b/packages/apps/bucket/templates/hooks/cleanup-acme.yaml
new file mode 100644
index 0000000000..94814a2c1e
--- /dev/null
+++ b/packages/apps/bucket/templates/hooks/cleanup-acme.yaml
@@ -0,0 +1,170 @@
+---
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: {{ .Release.Name }}-cleanup-acme
+  labels:
+    app.kubernetes.io/instance: {{ .Release.Name }}
+  annotations:
+    "helm.sh/hook": post-delete
+    "helm.sh/hook-weight": "10"
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+spec:
+  # Bound the whole cleanup: never let a stuck finalizer or a hung API call
+  # leave this post-delete hook running indefinitely and block the uninstall.
+  activeDeadlineSeconds: 120
+  backoffLimit: 0
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/instance: {{ .Release.Name }}
+        policy.cozystack.io/allow-to-apiserver: "true"
+    spec:
+      serviceAccountName: {{ .Release.Name }}-cleanup-acme
+      restartPolicy: Never
+      securityContext:
+        runAsNonRoot: true
+        runAsUser: 65534
+        runAsGroup: 65534
+        seccompProfile:
+          type: RuntimeDefault
+      containers:
+        - name: cleanup
+          image: docker.io/clastix/kubectl:v1.32
+          securityContext:
+            allowPrivilegeEscalation: false
+            readOnlyRootFilesystem: true
+            capabilities:
+              drop: ["ALL"]
+          resources:
+            requests:
+              cpu: 10m
+              memory: 64Mi
+            limits:
+              cpu: 200m
+              memory: 128Mi
+          env:
+            - name: HOME
+              value: /tmp
+          command:
+            - /bin/sh
+            - -c
+            - |
+              echo "Cleaning up orphaned cert-manager ACME resources for {{ .Release.Name }}..."
+              # This release's TLS host. The bucket-system chart renders its
+              # Ingress / Certificate for "<bucketName>.<_namespace.host>", and
+              # bucketName is set to .Release.Name in the HelmRelease. cert-manager
+              # stamps this exact value onto its Challenge .spec.dnsName and onto
+              # the orphaned solver Ingress .spec.rules[].host, so the host is the
+              # one reliable per-release identifier for ACME solver objects (they
+              # carry no app/release label of their own).
+              HOST="{{ .Release.Name }}.{{ .Values._namespace.host }}"
+              # None of the calls below carries --request-timeout. A non-zero
+              # value makes kubectl skip its in-cluster credentials: client-go
+              # consults them only while the assembled config still equals the
+              # default, and the flag lands in that config. Every call then goes
+              # to localhost:8080 and is refused, which here is worse than
+              # failing -- each one is guarded by `|| echo WARNING`, so the hook
+              # exits 0, prints "ACME cleanup complete.", and hook-succeeded
+              # deletes the Job carrying those warnings (#4288). The whole
+              # cleanup stays bounded by activeDeadlineSeconds above.
+              # Delete the per-bucket Certificate/Order/Challenge. cert-manager
+              # then cascade-removes the cm-acme-http-solver-* solver objects it
+              # owns. The release's TLS Certificate is named after the secret it
+              # populates ({{ .Release.Name }}-ui-tls).
+              kubectl delete certificate {{ .Release.Name }}-ui-tls -n {{ .Release.Namespace }} --ignore-not-found --wait=false \
+                || echo "WARNING: cert-manager cleanup failed for {{ .Release.Name }}; orphaned ACME resources may remain" >&2
+              # Orders are owned by the Certificate and are removed by the cascade
+              # above; Challenges carry no labels and are reaped by the
+              # host-scoped .spec.dnsName sweep below. There is therefore no
+              # reliable label selector for Order/Challenge, so we do not attempt
+              # a label-based delete here.
+              #
+              # Release-scoped solver sweep. We deliberately do NOT delete
+              # ingress/service/pod objects namespace-wide by the
+              # acme.cert-manager.io/http01-solver=true label: that label is set
+              # on EVERY app's solver objects in this shared tenant namespace, so
+              # a blanket delete would tear down sibling apps' in-flight ACME
+              # challenges. Instead we scope by HOST, which is unique to this
+              # release, so we only ever touch our own solver objects.
+              #
+              # Delete Challenges for our host (cascades the solver
+              # Ingress/Service/Pod they own).
+              challenges="$(kubectl get challenge -n {{ .Release.Namespace }} -o jsonpath="{range .items[?(@.spec.dnsName=='$HOST')]}{.metadata.name} {end}")" \
+                || { echo "WARNING: failed to list challenges for {{ .Release.Name }}; orphaned ACME resources may remain" >&2; challenges=""; }
+              for ch in $challenges; do
+                kubectl delete challenge -n {{ .Release.Namespace }} "$ch" --ignore-not-found --wait=false \
+                  || echo "WARNING: failed to delete challenge $ch for {{ .Release.Name }}; orphaned ACME resources may remain" >&2
+              done
+              # Delete any orphaned solver Ingress for our host (no live owner
+              # left to cascade it). Its solver Service/Pod are owned by a
+              # Challenge and are cascade-deleted with it; truly owner-less
+              # solver Service/Pod with no matching Challenge are not expected
+              # and are not swept namespace-wide.
+              ingresses="$(kubectl get ingress -n {{ .Release.Namespace }} -l acme.cert-manager.io/http01-solver=true -o jsonpath="{range .items[?(@.spec.rules[0].host=='$HOST')]}{.metadata.name} {end}")" \
+                || { echo "WARNING: failed to list solver ingresses for {{ .Release.Name }}; orphaned ACME resources may remain" >&2; ingresses=""; }
+              for ing in $ingresses; do
+                kubectl delete ingress -n {{ .Release.Namespace }} "$ing" --ignore-not-found --wait=false \
+                  || echo "WARNING: failed to delete solver ingress $ing for {{ .Release.Name }}; orphaned ACME resources may remain" >&2
+              done
+              echo "ACME cleanup complete."
+          volumeMounts:
+            - name: tmp
+              mountPath: /tmp
+      volumes:
+        - name: tmp
+          emptyDir: {}
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ .Release.Name }}-cleanup-acme
+  labels:
+    app.kubernetes.io/instance: {{ .Release.Name }}
+  annotations:
+    "helm.sh/hook": post-delete
+    "helm.sh/hook-weight": "0"
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: {{ .Release.Name }}-cleanup-acme
+  labels:
+    app.kubernetes.io/instance: {{ .Release.Name }}
+  annotations:
+    "helm.sh/hook": post-delete
+    "helm.sh/hook-weight": "5"
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+rules:
+  - apiGroups: ["cert-manager.io"]
+    resources: ["certificates"]
+    verbs: ["get", "list", "delete"]
+  - apiGroups: ["acme.cert-manager.io"]
+    resources: ["orders", "challenges"]
+    verbs: ["get", "list", "delete"]
+  # Needed to list+delete this release's orphaned http01 solver Ingress objects
+  # by host. Services/Pods are intentionally omitted: the solver Service/Pod are
+  # owned by their Challenge and cascade-delete with it, so we never delete them
+  # directly (and thus never sweep them namespace-wide).
+  - apiGroups: ["networking.k8s.io"]
+    resources: ["ingresses"]
+    verbs: ["get", "list", "delete"]
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: {{ .Release.Name }}-cleanup-acme
+  labels:
+    app.kubernetes.io/instance: {{ .Release.Name }}
+  annotations:
+    "helm.sh/hook": post-delete
+    "helm.sh/hook-weight": "5"
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: {{ .Release.Name }}-cleanup-acme
+subjects:
+  - kind: ServiceAccount
+    name: {{ .Release.Name }}-cleanup-acme
diff --git a/packages/apps/bucket/tests/cleanup_acme_test.yaml b/packages/apps/bucket/tests/cleanup_acme_test.yaml
new file mode 100644
index 0000000000..0de27fae77
--- /dev/null
+++ b/packages/apps/bucket/tests/cleanup_acme_test.yaml
@@ -0,0 +1,181 @@
+suite: bucket post-delete ACME cleanup hook
+templates:
+  - templates/hooks/cleanup-acme.yaml
+
+release:
+  name: my-bucket
+  namespace: tenant-root
+
+set:
+  _namespace:
+    host: example.org
+
+tests:
+  - it: renders only the expected cleanup hook objects (Job, SA, Role, RoleBinding)
+    asserts:
+      - hasDocuments:
+          count: 4
+
+  - it: renders a post-delete cleanup Job with the expected name and SA
+    documentIndex: 0
+    asserts:
+      - equal:
+          path: kind
+          value: Job
+      - equal:
+          path: metadata.name
+          value: my-bucket-cleanup-acme
+      - equal:
+          path: metadata.annotations["helm.sh/hook"]
+          value: post-delete
+      - equal:
+          path: spec.template.spec.serviceAccountName
+          value: my-bucket-cleanup-acme
+      - equal:
+          path: spec.template.spec.restartPolicy
+          value: Never
+      - equal:
+          path: spec.template.metadata.labels["policy.cozystack.io/allow-to-apiserver"]
+          value: "true"
+      # Bounded execution so a stuck hook can't block the uninstall.
+      - equal:
+          path: spec.activeDeadlineSeconds
+          value: 120
+      - equal:
+          path: spec.backoffLimit
+          value: 0
+      # Security hardening contract the PR relies on.
+      - equal:
+          path: spec.template.spec.securityContext.runAsNonRoot
+          value: true
+      - equal:
+          path: spec.template.spec.containers[0].securityContext.readOnlyRootFilesystem
+          value: true
+      - equal:
+          path: spec.template.spec.containers[0].securityContext.allowPrivilegeEscalation
+          value: false
+      - equal:
+          path: spec.template.spec.containers[0].securityContext.capabilities.drop[0]
+          value: ALL
+      - equal:
+          path: spec.template.spec.securityContext.seccompProfile.type
+          value: RuntimeDefault
+
+  - it: deletes release-scoped cert-manager resources with a host-scoped solver sweep
+    documentIndex: 0
+    asserts:
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: "kubectl delete certificate my-bucket-ui-tls -n tenant-root"
+      # Orders are removed by the Certificate cascade and Challenges by the
+      # host-scoped dnsName sweep. cert-manager puts no usable label on either
+      # (Challenges are unlabeled; certificate-name is an annotation on Orders),
+      # so the hook must NOT attempt a label-based order/challenge delete.
+      - notMatchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: "delete order,challenge"
+      - notMatchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: "delete .*-l app.kubernetes.io/instance=my-bucket"
+      # Host derived from <release>.<_namespace.host> == my-bucket.example.org
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: 'HOST="my-bucket\.example\.org"'
+      # Host-scoped challenge sweep filtering on .spec.dnsName == our host
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: "kubectl get challenge -n tenant-root -o jsonpath=.*@.spec.dnsName=='\\$HOST'"
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: 'kubectl delete challenge -n tenant-root "\$ch" --ignore-not-found'
+      # Host-scoped orphaned solver Ingress sweep filtering on rules[0].host
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: "kubectl get ingress -n tenant-root -l acme.cert-manager.io/http01-solver=true -o jsonpath=.*@.spec.rules\\[0\\].host=='\\$HOST'"
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: 'kubectl delete ingress -n tenant-root "\$ing" --ignore-not-found'
+      # NO namespace-wide blanket solver sweep
+      - notMatchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: "kubectl delete ingress,svc,pod"
+      - notMatchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: "delete .*-l acme.cert-manager.io/http01-solver=true"
+
+  - it: sets resource requests and limits on the cleanup container
+    documentIndex: 0
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].resources.requests.cpu
+          value: 10m
+      - equal:
+          path: spec.template.spec.containers[0].resources.requests.memory
+          value: 64Mi
+      - equal:
+          path: spec.template.spec.containers[0].resources.limits.cpu
+          value: 200m
+      - equal:
+          path: spec.template.spec.containers[0].resources.limits.memory
+          value: 128Mi
+
+  - it: creates a ServiceAccount for the cleanup job
+    documentIndex: 1
+    asserts:
+      - equal:
+          path: kind
+          value: ServiceAccount
+      - equal:
+          path: metadata.name
+          value: my-bucket-cleanup-acme
+
+  - it: grants RBAC limited to cert-manager and acme resources
+    documentIndex: 2
+    asserts:
+      - equal:
+          path: kind
+          value: Role
+      - contains:
+          path: rules
+          content:
+            apiGroups: ["cert-manager.io"]
+            resources: ["certificates"]
+            verbs: ["get", "list", "delete"]
+      - contains:
+          path: rules
+          content:
+            apiGroups: ["acme.cert-manager.io"]
+            resources: ["orders", "challenges"]
+            verbs: ["get", "list", "delete"]
+      # Ingresses re-added: we list+delete this release's orphaned solver
+      # Ingress objects by host.
+      - contains:
+          path: rules
+          content:
+            apiGroups: ["networking.k8s.io"]
+            resources: ["ingresses"]
+            verbs: ["get", "list", "delete"]
+      # Services/Pods stay OUT: solver Service/Pod cascade-delete with their
+      # owning Challenge, so the hook never deletes them directly.
+      - notContains:
+          path: rules
+          content:
+            apiGroups: [""]
+            resources: ["services", "pods"]
+            verbs: ["get", "list", "delete"]
+      - lengthEqual:
+          path: rules
+          count: 3
+
+  - it: binds the Role to the cleanup ServiceAccount
+    documentIndex: 3
+    asserts:
+      - equal:
+          path: kind
+          value: RoleBinding
+      - equal:
+          path: roleRef.name
+          value: my-bucket-cleanup-acme
+      - equal:
+          path: subjects[0].name
+          value: my-bucket-cleanup-acme
diff --git a/packages/apps/bucket/tests/ui_toggle_test.yaml b/packages/apps/bucket/tests/ui_toggle_test.yaml
new file mode 100644
index 0000000000..eb90cc8863
--- /dev/null
+++ b/packages/apps/bucket/tests/ui_toggle_test.yaml
@@ -0,0 +1,50 @@
+suite: bucket ui flag
+templates:
+  - templates/helmrelease.yaml
+  - templates/dashboard-resourcemap.yaml
+
+release:
+  name: bucket-my-bucket
+  namespace: tenant-root
+
+tests:
+  - it: passes ui through to the bucket-system release, enabled by default
+    template: templates/helmrelease.yaml
+    asserts:
+      - equal:
+          path: spec.values.ui
+          value: true
+
+  - it: passes ui=false through to the bucket-system release
+    template: templates/helmrelease.yaml
+    set:
+      ui: false
+    asserts:
+      - equal:
+          path: spec.values.ui
+          value: false
+
+  - it: grants dashboard read access to the UI Ingress by default
+    template: templates/dashboard-resourcemap.yaml
+    documentIndex: 0
+    asserts:
+      - contains:
+          path: rules
+          content:
+            apiGroups: ["networking.k8s.io"]
+            resources: ["ingresses"]
+            resourceNames: ["bucket-my-bucket-ui"]
+            verbs: ["get", "list", "watch"]
+
+  - it: drops the Ingress rule when ui is false
+    template: templates/dashboard-resourcemap.yaml
+    documentIndex: 0
+    set:
+      ui: false
+    asserts:
+      - lengthEqual:
+          path: rules
+          count: 1
+      - notContains:
+          path: rules[0].resources
+          content: ingresses
diff --git a/packages/apps/bucket/values.schema.json b/packages/apps/bucket/values.schema.json
index d302842cdb..249169395a 100644
--- a/packages/apps/bucket/values.schema.json
+++ b/packages/apps/bucket/values.schema.json
@@ -10,7 +10,15 @@
     "storagePool": {
       "description": "Selects a specific BucketClass by storage pool name.",
       "type": "string",
-      "default": ""
+      "default": "",
+      "x-cozystack-options": {
+        "source": "storagepool"
+      }
+    },
+    "ui": {
+      "description": "Deploys the web UI (s3manager) with its Service and its Ingress or HTTPRoute at `\u003cbucket\u003e.\u003ctenant host\u003e`. Set to `false` to run the bucket without them.",
+      "type": "boolean",
+      "default": true
     },
     "users": {
       "description": "Users configuration map.",
diff --git a/packages/apps/bucket/values.yaml b/packages/apps/bucket/values.yaml
index df284df79a..3b79909fc5 100644
--- a/packages/apps/bucket/values.yaml
+++ b/packages/apps/bucket/values.yaml
@@ -2,8 +2,12 @@
 locking: false
 
 ## @param {string} [storagePool] - Selects a specific BucketClass by storage pool name.
+## @x-cozystack-options {source: storagepool}
 storagePool: ""
 
+## @param {bool} ui=true - Deploys the web UI (s3manager) with its Service and its Ingress or HTTPRoute at `<bucket>.<tenant host>`. Set to `false` to run the bucket without them.
+ui: true
+
 ## @typedef {struct} User - Bucket user configuration.
 ## @field {bool} [readonly] - Whether the user has read-only access.
 
diff --git a/packages/apps/clickhouse/.helmignore b/packages/apps/clickhouse/.helmignore
index 1ea0ae84fb..3de7d4a58e 100644
--- a/packages/apps/clickhouse/.helmignore
+++ b/packages/apps/clickhouse/.helmignore
@@ -1,3 +1,4 @@
 .helmignore
 /logos
 /Makefile
+/hack
diff --git a/packages/apps/clickhouse/Makefile b/packages/apps/clickhouse/Makefile
index 8360c3f531..e536080553 100644
--- a/packages/apps/clickhouse/Makefile
+++ b/packages/apps/clickhouse/Makefile
@@ -7,14 +7,18 @@ generate:
 	cozyvalues-gen -m 'clickhouse' -v values.yaml -s values.schema.json -r README.md -g ../../../api/apps/v1alpha1/clickhouse/types.go
 	../../../hack/update-crd.sh
 
+update:
+	hack/update-versions.sh
+	make generate
+
+.PHONY: test
 test:
 	helm unittest .
 
 image:
 	docker buildx build images/clickhouse-backup \
 		$(call image-tags,clickhouse-backup,$(CLICKHOUSE_BACKUP_TAG)) \
-		--cache-from type=registry,ref=$(REGISTRY)/clickhouse-backup:latest \
-		--cache-to type=inline \
+		$(call cache-args,clickhouse-backup) \
 		--metadata-file images/clickhouse-backup.json \
 		$(BUILDX_ARGS)
 	echo "$(REGISTRY)/clickhouse-backup:$(IMAGE_TAG)@$$(yq e '."containerimage.digest"' images/clickhouse-backup.json -o json -r)" \
@@ -22,8 +26,7 @@ image:
 	rm -f images/clickhouse-backup.json
 	docker buildx build images/altinity-clickhouse-backup \
 		$(call image-tags,altinity-clickhouse-backup,$(CLICKHOUSE_BACKUP_TAG)) \
-		--cache-from type=registry,ref=$(REGISTRY)/altinity-clickhouse-backup:latest \
-		--cache-to type=inline \
+		$(call cache-args,altinity-clickhouse-backup) \
 		--metadata-file images/altinity-clickhouse-backup.json \
 		$(BUILDX_ARGS)
 	echo "$(REGISTRY)/altinity-clickhouse-backup:$(IMAGE_TAG)@$$(yq e '."containerimage.digest"' images/altinity-clickhouse-backup.json -o json -r)" \
diff --git a/packages/apps/clickhouse/README.md b/packages/apps/clickhouse/README.md
index 03b602ac05..02d2dbb9e2 100644
--- a/packages/apps/clickhouse/README.md
+++ b/packages/apps/clickhouse/README.md
@@ -108,16 +108,17 @@ chart-emitted CronJob renders only when `backup.schedule` is non-empty.
 
 ### Common parameters
 
-| Name               | Description                                                                                                                          | Type       | Value      |
-| ------------------ | ------------------------------------------------------------------------------------------------------------------------------------ | ---------- | ---------- |
-| `replicas`         | Number of ClickHouse replicas.                                                                                                       | `int`      | `2`        |
-| `shards`           | Number of ClickHouse shards.                                                                                                         | `int`      | `1`        |
-| `resources`        | Explicit CPU and memory configuration for each ClickHouse replica. When omitted, the preset defined in `resourcesPreset` is applied. | `object`   | `{}`       |
-| `resources.cpu`    | CPU available to each replica.                                                                                                       | `quantity` | `""`       |
-| `resources.memory` | Memory (RAM) available to each replica.                                                                                              | `quantity` | `""`       |
-| `resourcesPreset`  | Default sizing preset used when `resources` is omitted.                                                                              | `string`   | `t1.small` |
-| `size`             | Persistent Volume Claim size available for application data.                                                                         | `quantity` | `10Gi`     |
-| `storageClass`     | StorageClass used to store the data.                                                                                                 | `string`   | `""`       |
+| Name               | Description                                                                                                                                                                                                                                                                                  | Type       | Value      |
+| ------------------ | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------- | ---------- |
+| `replicas`         | Number of ClickHouse replicas.                                                                                                                                                                                                                                                               | `int`      | `2`        |
+| `shards`           | Number of ClickHouse shards.                                                                                                                                                                                                                                                                 | `int`      | `1`        |
+| `resources`        | Explicit CPU and memory configuration for each ClickHouse replica. When omitted, the preset defined in `resourcesPreset` is applied.                                                                                                                                                         | `object`   | `{}`       |
+| `resources.cpu`    | CPU available to each replica.                                                                                                                                                                                                                                                               | `quantity` | `""`       |
+| `resources.memory` | Memory (RAM) available to each replica.                                                                                                                                                                                                                                                      | `quantity` | `""`       |
+| `resourcesPreset`  | Default sizing preset used when `resources` is omitted.                                                                                                                                                                                                                                      | `string`   | `t1.small` |
+| `size`             | Persistent Volume Claim size available for application data.                                                                                                                                                                                                                                 | `quantity` | `10Gi`     |
+| `storageClass`     | StorageClass used to store the data.                                                                                                                                                                                                                                                         | `string`   | `""`       |
+| `version`          | ClickHouse major.minor version to deploy. Applies to both the ClickHouse server and ClickHouse Keeper images. Downgrading to an older major is unsafe (ClickHouse cannot read data written by a newer server and Keeper snapshots are not backward compatible) — only increase this value. | `string`   | `v24.9`    |
 
 
 ### Application-specific parameters
@@ -133,27 +134,30 @@ chart-emitted CronJob renders only when `backup.schedule` is non-empty.
 
 ### Backup parameters
 
-| Name                                            | Description                                                                                                                                                                                                                                                                                                                                                                                                  | Type     | Value                                                  |
-| ----------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | -------- | ------------------------------------------------------ |
-| `backup`                                        | Backup configuration.                                                                                                                                                                                                                                                                                                                                                                                        | `object` | `{}`                                                   |
-| `backup.enabled`                                | Enable backup integration. Materialises the chart-emitted `<release>-backup-s3` Secret consumed by the Altinity backup strategy and, when `schedule` is non-empty, also renders the legacy chart-managed CronJob.                                                                                                                                                                                            | `bool`   | `false`                                                |
-| `backup.useSystemBucket`                        | Opt-in: when true, the chart-emitted `<release>-backup-s3` Secret is skipped and the `clickhouse-backup` sidecar reads bucket coordinates + S3 credentials from the platform-projected `cozy-backups-creds` Secret. `S3_PATH` is set to `<namespace>/<release>` for cross-tenant isolation. Use together with the platform `cozy-default` BackupClass — tenants do not need to fill any `s3*` field below. | `bool`   | `false`                                                |
-| `backup.s3Region`                               | DEPRECATED. Per-tenant S3 configuration is being phased out in favour of the platform-managed `cozy-default` BackupClass. Optional now so tenants on `useSystemBucket: true` can omit it.                                                                                                                                                                                                                    | `string` | `us-east-1`                                            |
-| `backup.s3Bucket`                               | DEPRECATED. Optional; see `s3Region`.                                                                                                                                                                                                                                                                                                                                                                        | `string` | `s3.example.org/clickhouse-backups`                    |
-| `backup.endpoint`                               | DEPRECATED. S3 endpoint URL for the legacy chart-emitted sidecar.                                                                                                                                                                                                                                                                                                                                            | `string` | `""`                                                   |
-| `backup.s3PathOverride`                         | DEPRECATED. Object-key prefix inside the legacy `s3Bucket`; the new platform flow scopes by namespace automatically.                                                                                                                                                                                                                                                                                         | `string` | `""`                                                   |
-| `backup.schedule`                               | Legacy. Cron schedule for the chart-emitted CronJob that runs the dump+restic backup. Empty (default) skips the legacy CronJob; recommended when a `BackupClass` + `Plan` from `backups.cozystack.io` already drives backup orchestration via the Altinity strategy.                                                                                                                                         | `string` | `""`                                                   |
-| `backup.cleanupStrategy`                        | Legacy. Restic retention policy passed to the legacy CronJob (`restic forget …`). Unused by the Altinity strategy.                                                                                                                                                                                                                                                                                         | `string` | `--keep-last=3 --keep-daily=3 --keep-within-weekly=1m` |
-| `backup.s3AccessKey`                            | DEPRECATED. Tenants no longer supply S3 keys; the platform-managed Bucket Secret is the source of truth. Optional now so `useSystemBucket: true` tenants can omit it.                                                                                                                                                                                                                                        | `string` | `<your-access-key>`                                    |
-| `backup.s3SecretKey`                            | DEPRECATED. Optional; see `s3AccessKey`.                                                                                                                                                                                                                                                                                                                                                                     | `string` | `<your-secret-key>`                                    |
-| `backup.resticPassword`                         | Legacy. Password for Restic backup encryption used by the legacy CronJob. Unused by the Altinity strategy.                                                                                                                                                                                                                                                                                                   | `string` | `<password>`                                           |
-| `backup.s3CredentialsSecret`                    | DEPRECATED. Pre-existing Secret reference for the legacy chart-emitted sidecar. The platform flow projects `cozy-backups-creds` instead.                                                                                                                                                                                                                                                                     | `object` | `{}`                                                   |
-| `backup.s3CredentialsSecret.name`               | Name of the Secret in the application namespace. Empty means the chart materialises `<release>-backup-s3` from the legacy `s3*` fields.                                                                                                                                                                                                                                                                      | `string` | `""`                                                   |
-| `backup.s3CredentialsSecret.bucketKey`          | Key in the Secret holding the bucket name. Defaults to `bucketName`.                                                                                                                                                                                                                                                                                                                                         | `string` | `""`                                                   |
-| `backup.s3CredentialsSecret.endpointKey`        | Key in the Secret holding the S3 endpoint URL. Defaults to `endpoint`.                                                                                                                                                                                                                                                                                                                                       | `string` | `""`                                                   |
-| `backup.s3CredentialsSecret.regionKey`          | Key in the Secret holding the S3 region. Defaults to `region`.                                                                                                                                                                                                                                                                                                                                               | `string` | `""`                                                   |
-| `backup.s3CredentialsSecret.accessKeyIDKey`     | Key in the Secret holding the access key ID. Defaults to `accessKey`.                                                                                                                                                                                                                                                                                                                                        | `string` | `""`                                                   |
-| `backup.s3CredentialsSecret.secretAccessKeyKey` | Key in the Secret holding the secret access key. Defaults to `secretKey`.                                                                                                                                                                                                                                                                                                                                    | `string` | `""`                                                   |
+| Name                                            | Description                                                                                                                                                                                                                                                                                                                                                                                                                                            | Type     | Value                                                  |
+| ----------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | -------- | ------------------------------------------------------ |
+| `backup`                                        | Backup configuration.                                                                                                                                                                                                                                                                                                                                                                                                                                  | `object` | `{}`                                                   |
+| `backup.enabled`                                | Enable backup integration. Materialises the chart-emitted `<release>-backup-s3` Secret consumed by the Altinity backup strategy and, when `schedule` is non-empty, also renders the legacy chart-managed CronJob.                                                                                                                                                                                                                                      | `bool`   | `false`                                                |
+| `backup.useSystemBucket`                        | Opt-in: when true, the chart-emitted `<release>-backup-s3` Secret is skipped and the `clickhouse-backup` sidecar reads bucket coordinates + S3 credentials from the platform-projected `cozy-backups-creds` Secret. `S3_PATH` is set to `<namespace>/<release>` for cross-tenant isolation. Use together with the platform `cozy-default` BackupClass — tenants do not need to fill any `s3*` field below.                                           | `bool`   | `false`                                                |
+| `backup.s3Region`                               | DEPRECATED. Per-tenant S3 configuration is being phased out in favour of the platform-managed `cozy-default` BackupClass. Optional now so tenants on `useSystemBucket: true` can omit it.                                                                                                                                                                                                                                                              | `string` | `us-east-1`                                            |
+| `backup.s3Bucket`                               | DEPRECATED. Optional; see `s3Region`.                                                                                                                                                                                                                                                                                                                                                                                                                  | `string` | `s3.example.org/clickhouse-backups`                    |
+| `backup.endpoint`                               | DEPRECATED. S3 endpoint URL for the legacy chart-emitted sidecar.                                                                                                                                                                                                                                                                                                                                                                                      | `string` | `""`                                                   |
+| `backup.s3PathOverride`                         | DEPRECATED. Object-key prefix inside the legacy `s3Bucket`; the new platform flow scopes by namespace automatically.                                                                                                                                                                                                                                                                                                                                   | `string` | `""`                                                   |
+| `backup.schedule`                               | Legacy. Cron schedule for the chart-emitted CronJob that runs the dump+restic backup. Empty (default) skips the legacy CronJob; recommended when a `BackupClass` + `Plan` from `backups.cozystack.io` already drives backup orchestration via the Altinity strategy.                                                                                                                                                                                   | `string` | `""`                                                   |
+| `backup.cleanupStrategy`                        | Legacy. Restic retention policy passed to the legacy CronJob (`restic forget …`). Unused by the Altinity strategy.                                                                                                                                                                                                                                                                                                                                   | `string` | `--keep-last=3 --keep-daily=3 --keep-within-weekly=1m` |
+| `backup.s3AccessKey`                            | DEPRECATED. Tenants no longer supply S3 keys; the platform-managed Bucket Secret is the source of truth. Optional now so `useSystemBucket: true` tenants can omit it.                                                                                                                                                                                                                                                                                  | `string` | `<your-access-key>`                                    |
+| `backup.s3SecretKey`                            | DEPRECATED. Optional; see `s3AccessKey`.                                                                                                                                                                                                                                                                                                                                                                                                               | `string` | `<your-secret-key>`                                    |
+| `backup.resticPassword`                         | Legacy. Password for Restic backup encryption used by the legacy CronJob. Unused by the Altinity strategy.                                                                                                                                                                                                                                                                                                                                             | `string` | `<password>`                                           |
+| `backup.s3CredentialsSecret`                    | DEPRECATED. Pre-existing Secret reference for the legacy chart-emitted sidecar. The platform flow projects `cozy-backups-creds` instead.                                                                                                                                                                                                                                                                                                               | `object` | `{}`                                                   |
+| `backup.s3CredentialsSecret.name`               | Name of the Secret in the application namespace. Empty means the chart materialises `<release>-backup-s3` from the legacy `s3*` fields.                                                                                                                                                                                                                                                                                                                | `string` | `""`                                                   |
+| `backup.s3CredentialsSecret.bucketKey`          | Key in the Secret holding the bucket name. Defaults to `bucketName`.                                                                                                                                                                                                                                                                                                                                                                                   | `string` | `""`                                                   |
+| `backup.s3CredentialsSecret.endpointKey`        | Key in the Secret holding the S3 endpoint URL. Defaults to `endpoint`.                                                                                                                                                                                                                                                                                                                                                                                 | `string` | `""`                                                   |
+| `backup.s3CredentialsSecret.regionKey`          | Key in the Secret holding the S3 region. Defaults to `region`.                                                                                                                                                                                                                                                                                                                                                                                         | `string` | `""`                                                   |
+| `backup.s3CredentialsSecret.accessKeyIDKey`     | Key in the Secret holding the access key ID. Defaults to `accessKey`.                                                                                                                                                                                                                                                                                                                                                                                  | `string` | `""`                                                   |
+| `backup.s3CredentialsSecret.secretAccessKeyKey` | Key in the Secret holding the secret access key. Defaults to `secretKey`.                                                                                                                                                                                                                                                                                                                                                                              | `string` | `""`                                                   |
+| `backup.endpointCA`                             | CA bundle the sidecar trusts when the S3 endpoint's certificate is signed by a private CA (e.g. Cozystack's in-cluster SeaweedFS). Applies to both the per-tenant and the `useSystemBucket` flow, and to the `clickhouse-backup` sidecar only — the legacy `schedule` CronJob writes to S3 through restic and does not consume it, so a private-CA endpoint combined with `schedule` still fails TLS. Use the BackupClass flow for such an endpoint. | `object` | `{}`                                                   |
+| `backup.endpointCA.name`                        | Name of the Secret in the application namespace. Empty (default) mounts nothing and leaves the sidecar on the system trust store only.                                                                                                                                                                                                                                                                                                                 | `string` | `""`                                                   |
+| `backup.endpointCA.key`                         | Key inside the Secret holding the PEM CA bundle. Defaults to `ca.crt`.                                                                                                                                                                                                                                                                                                                                                                                 | `string` | `ca.crt`                                               |
 
 
 ### ClickHouse Keeper parameters
@@ -172,7 +176,7 @@ chart-emitted CronJob renders only when `backup.schedule` is non-empty.
 ### resources and resourcesPreset
 
 `resources` sets explicit CPU and memory configurations for each replica.
-When left empty, the preset defined in `resourcesPreset` is applied.
+Every resource it leaves unset is taken from the preset defined in `resourcesPreset`.
 
 ```yaml
 resources:
diff --git a/packages/apps/clickhouse/files/versions.yaml b/packages/apps/clickhouse/files/versions.yaml
new file mode 100644
index 0000000000..1828b4fb40
--- /dev/null
+++ b/packages/apps/clickhouse/files/versions.yaml
@@ -0,0 +1,3 @@
+"v25.8": "25.8.32.4"
+"v25.3": "25.3.14.14"
+"v24.9": "24.9.2.42"
diff --git a/packages/apps/clickhouse/hack/update-versions.sh b/packages/apps/clickhouse/hack/update-versions.sh
new file mode 100755
index 0000000000..415a7c73c4
--- /dev/null
+++ b/packages/apps/clickhouse/hack/update-versions.sh
@@ -0,0 +1,173 @@
+#!/usr/bin/env bash
+#
+# Regenerate the ClickHouse version map (files/versions.yaml) and the version
+# enum in values.yaml from the Docker Hub tags of clickhouse/clickhouse-server
+# and clickhouse/clickhouse-keeper. Run via `make update`.
+#
+# Portable to stock macOS (bash 3.2, BSD awk/sort): no associative arrays and
+# no `awk -v` with embedded newlines. For tests, CH_SERVER_TAGS_FILE /
+# CH_KEEPER_TAGS_FILE inject the tag lists offline and VALUES_FILE /
+# VERSIONS_FILE redirect the outputs.
+
+set -o errexit
+set -o nounset
+set -o pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+CLICKHOUSE_DIR="$(cd "${SCRIPT_DIR}/.." && pwd)"
+VALUES_FILE="${VALUES_FILE:-${CLICKHOUSE_DIR}/values.yaml}"
+VERSIONS_FILE="${VERSIONS_FILE:-${CLICKHOUSE_DIR}/files/versions.yaml}"
+SERVER_REPO="clickhouse/clickhouse-server"
+KEEPER_REPO="clickhouse/clickhouse-keeper"
+
+# Major.minor lines to publish, newest first. Overridable for tests.
+: "${CH_SUPPORTED_MAJORS:=25.8 25.3 24.9}"
+
+# Numeric sort of X.Y.Z.W tags — portable across BSD and GNU sort (no -V).
+version_sort() { sort -t. -k1,1n -k2,2n -k3,3n -k4,4n; }
+
+# Emit every X.Y.Z.W tag of a Docker Hub repo, byte-collated and unique.
+# Overridable offline via a file named by $2 (a variable name).
+fetch_tags() {
+  local repo="$1" file_var="$2" file
+  file="${!file_var:-}"
+  if [ -n "$file" ]; then
+    grep -E '^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$' "$file" | LC_ALL=C sort -u
+    return
+  fi
+  # skopeo reads the registry v2 /tags/list, which returns the full tag set.
+  # (Docker Hub's own v2 API caps anonymous pagination at 1000 entries and then
+  # returns an error page with no `.results`, silently truncating the list.)
+  # skopeo is already required by the repo's build-deps and is how the sibling
+  # generators (postgres, redis, mongodb, opensearch, kubernetes) fetch tags.
+  command -v skopeo >/dev/null 2>&1 || { echo "Error: skopeo is required to fetch tags" >&2; exit 1; }
+  command -v jq >/dev/null 2>&1 || { echo "Error: jq is required to fetch tags" >&2; exit 1; }
+  skopeo list-tags "docker://docker.io/${repo}" \
+    | jq -r '.Tags[]' \
+    | grep -E '^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$' | LC_ALL=C sort -u
+}
+
+echo "Resolving ClickHouse versions..." >&2
+SERVER_TAGS="$(fetch_tags "$SERVER_REPO" CH_SERVER_TAGS_FILE)"
+KEEPER_TAGS="$(fetch_tags "$KEEPER_REPO" CH_KEEPER_TAGS_FILE)"
+
+# Tags present in BOTH images. comm walks its inputs in byte order, so they
+# must be byte-collated (fetch_tags emits `LC_ALL=C sort -u`, and comm itself
+# runs under LC_ALL=C); a version collation would silently drop common tags at
+# every X.9 -> X.10 boundary.
+COMMON_TAGS="$(LC_ALL=C comm -12 <(printf '%s\n' "$SERVER_TAGS") <(printf '%s\n' "$KEEPER_TAGS"))"
+[ -n "$COMMON_TAGS" ] || { echo "Error: no tag common to ${SERVER_REPO} and ${KEEPER_REPO}" >&2; exit 1; }
+
+# Determine the default major from the current values.yaml. Dropping the
+# current default's major from CH_SUPPORTED_MAJORS would silently change the
+# default image, so it is a hard error rather than a fallback to the newest.
+# With no current default (first-time bootstrap) the newest major is used.
+CURRENT_DEFAULT="$(awk '/^version:[[:space:]]/ {print $2; exit}' "$VALUES_FILE" 2>/dev/null || true)"
+if [ -n "$CURRENT_DEFAULT" ]; then
+  case " $CH_SUPPORTED_MAJORS " in
+    *" ${CURRENT_DEFAULT#v} "*) DEFAULT_VERSION="$CURRENT_DEFAULT" ;;
+    *) echo "Error: current default ${CURRENT_DEFAULT} is not in CH_SUPPORTED_MAJORS (${CH_SUPPORTED_MAJORS}); refusing to silently change the default" >&2; exit 1 ;;
+  esac
+else
+  DEFAULT_VERSION="v${CH_SUPPORTED_MAJORS%% *}"
+fi
+
+# The default major is frozen to the exact tag it already ships, read from the
+# committed versions.yaml, so a regeneration never changes the default image.
+# The freeze follows whichever major is the default — there is no hardcoded
+# major. An empty result (bootstrap, or the default not yet mapped) means the
+# default takes the latest common patch like any other line.
+FROZEN_DEFAULT_TAG="$(grep -F "\"${DEFAULT_VERSION}\": " "$VERSIONS_FILE" 2>/dev/null | sed -E 's/.*: *"([^"]+)".*/\1/' | head -n1 || true)"
+
+# Resolve each configured major to one tag: the default freezes to its shipped
+# tag (if still available), every other line takes its latest common patch. A
+# configured major with no common tag is a hard error raised BEFORE any file is
+# written, so a partial Docker Hub result never drops a supported version or
+# leaves a half-updated tree.
+MAJORS=()
+TAGS=()
+for mm in $CH_SUPPORTED_MAJORS; do
+  key="v${mm}"
+  mm_re="${mm//./\\.}"
+  latest="$(printf '%s\n' "$COMMON_TAGS" | grep -E "^${mm_re}\.[0-9]+\.[0-9]+$" | version_sort | tail -n1 || true)"
+  if [ "$key" = "$DEFAULT_VERSION" ] && [ -n "$FROZEN_DEFAULT_TAG" ]; then
+    if printf '%s\n' "$COMMON_TAGS" | grep -qx "$FROZEN_DEFAULT_TAG"; then
+      tag="$FROZEN_DEFAULT_TAG"
+    else
+      # Never silently move the default image. If the frozen tag has genuinely
+      # left the registry, fail and let a maintainer re-pin files/versions.yaml
+      # deliberately.
+      echo "Error: frozen default tag ${FROZEN_DEFAULT_TAG} for ${key} is not available in both images; refusing to move the default. Re-pin files/versions.yaml deliberately if the default must change." >&2
+      exit 1
+    fi
+  elif [ -n "$latest" ]; then
+    tag="$latest"
+  else
+    echo "Error: no tag found for configured version ${mm} in both images" >&2
+    exit 1
+  fi
+  MAJORS+=("$key")
+  TAGS+=("$tag")
+  echo "Resolved ${key} -> ${tag}" >&2
+done
+
+# Build both artifacts in temp files and move them into place only once both
+# are ready, so a failure mid-run leaves the committed files untouched.
+TMP_VERSIONS="$(mktemp)"
+TMP_BLOCK="$(mktemp)"
+TMP_VALUES="$(mktemp)"
+trap 'rm -f "$TMP_VERSIONS" "$TMP_BLOCK" "$TMP_VALUES"' EXIT
+
+i=0
+while [ "$i" -lt "${#MAJORS[@]}" ]; do
+  printf '"%s": "%s"\n' "${MAJORS[$i]}" "${TAGS[$i]}" >> "$TMP_VERSIONS"
+  i=$((i + 1))
+done
+
+# The values.yaml @enum/@param block, built in a file (avoids `awk -v` with
+# embedded newlines, which BSD awk rejects).
+{
+  echo "## @enum {string} Version"
+  i=0
+  while [ "$i" -lt "${#MAJORS[@]}" ]; do
+    echo "## @value ${MAJORS[$i]}"
+    i=$((i + 1))
+  done
+  echo ""
+  echo "## @param {Version} version - ClickHouse major.minor version to deploy. Applies to both the ClickHouse server and ClickHouse Keeper images. Downgrading to an older major is unsafe (ClickHouse cannot read data written by a newer server and Keeper snapshots are not backward compatible) — only increase this value."
+  echo "version: ${DEFAULT_VERSION}"
+} > "$TMP_BLOCK"
+
+# Splice the block into values.yaml with pure bash: replace an existing version
+# section, or insert before the Application-specific section. The section is
+# bounded — it ends at the `version:` line, or at the first line that is not a
+# recognised section member — so a malformed input (enum header without a
+# `version:` line) does not swallow the rest of the file.
+replaced=0
+in_section=0
+while IFS= read -r line || [ -n "$line" ]; do
+  case "$line" in
+    "## @enum {string} Version")
+      cat "$TMP_BLOCK" >> "$TMP_VALUES"; in_section=1; replaced=1; continue ;;
+  esac
+  if [ "$in_section" -eq 1 ]; then
+    case "$line" in
+      version:*) in_section=0; continue ;;
+      "## @value"*|"## @param"*|"") continue ;;
+      *) in_section=0 ;;
+    esac
+  fi
+  if [ "$replaced" -eq 0 ] && [ "$line" = "## @section Application-specific parameters" ]; then
+    cat "$TMP_BLOCK" >> "$TMP_VALUES"; echo "" >> "$TMP_VALUES"; replaced=1
+  fi
+  printf '%s\n' "$line" >> "$TMP_VALUES"
+done < "$VALUES_FILE"
+
+[ "$replaced" -eq 1 ] || { echo "Error: could not place the version block in $VALUES_FILE" >&2; exit 1; }
+
+mv "$TMP_VERSIONS" "$VERSIONS_FILE"
+mv "$TMP_VALUES" "$VALUES_FILE"
+# mktemp creates 0600 files and mv preserves that mode; restore the normal
+# world-readable mode so the committed files are not left at 0600.
+chmod 0644 "$VERSIONS_FILE" "$VALUES_FILE"
+echo "Updated $VERSIONS_FILE and $VALUES_FILE (default ${DEFAULT_VERSION})" >&2
diff --git a/packages/apps/clickhouse/images/altinity-clickhouse-backup.tag b/packages/apps/clickhouse/images/altinity-clickhouse-backup.tag
index 6de39da578..73c1764be0 100644
--- a/packages/apps/clickhouse/images/altinity-clickhouse-backup.tag
+++ b/packages/apps/clickhouse/images/altinity-clickhouse-backup.tag
@@ -1 +1 @@
-ghcr.io/cozystack/cozystack/altinity-clickhouse-backup:0.0.0@sha256:65d15779d062680ddb69210c1dfaf8920ea4be2beb069d028bcb5934870a4d72
+ghcr.io/cozystack/cozystack/altinity-clickhouse-backup:v1.6.0@sha256:e890d78cd83968bdff9a36c9ca4312afc05e138af486e476da0a935f81f9b7a7
diff --git a/packages/apps/clickhouse/images/altinity-clickhouse-backup/Dockerfile b/packages/apps/clickhouse/images/altinity-clickhouse-backup/Dockerfile
index 08d7850910..07611649c7 100644
--- a/packages/apps/clickhouse/images/altinity-clickhouse-backup/Dockerfile
+++ b/packages/apps/clickhouse/images/altinity-clickhouse-backup/Dockerfile
@@ -1 +1 @@
-FROM altinity/clickhouse-backup:2.6.32
+FROM altinity/clickhouse-backup:2.7.4@sha256:51aa3ee4d7835d04cfb44cd75320334d52f34081c46cb9852bcb27c38181bb5d
diff --git a/packages/apps/clickhouse/images/clickhouse-backup.tag b/packages/apps/clickhouse/images/clickhouse-backup.tag
index 1633ce8036..2ba1bf36f4 100644
--- a/packages/apps/clickhouse/images/clickhouse-backup.tag
+++ b/packages/apps/clickhouse/images/clickhouse-backup.tag
@@ -1 +1 @@
-ghcr.io/cozystack/cozystack/clickhouse-backup:0.0.0@sha256:3faf7a4cebf390b9053763107482de175aa0fdb88c1e77424fd81100b1c3a205
+ghcr.io/cozystack/cozystack/clickhouse-backup:v1.6.0@sha256:8efef62d59fb82d39544823f81a797c2b9ac130a50241fee48e701161ce2670d
diff --git a/packages/apps/clickhouse/images/clickhouse-backup/Dockerfile b/packages/apps/clickhouse/images/clickhouse-backup/Dockerfile
index 482a16a16b..9c4467fb63 100644
--- a/packages/apps/clickhouse/images/clickhouse-backup/Dockerfile
+++ b/packages/apps/clickhouse/images/clickhouse-backup/Dockerfile
@@ -1,2 +1,2 @@
-FROM clickhouse/clickhouse-server:24.8.4-alpine
+FROM clickhouse/clickhouse-server:24.8.4-alpine@sha256:f21e0f9eb18715db90e0b7ca808f36e7418af8126afff1a96163798978adaf17
 RUN apk add --no-cache restic uuidgen
diff --git a/packages/apps/clickhouse/templates/_keeper.tpl b/packages/apps/clickhouse/templates/_keeper.tpl
new file mode 100644
index 0000000000..c0deb1cac9
--- /dev/null
+++ b/packages/apps/clickhouse/templates/_keeper.tpl
@@ -0,0 +1,10 @@
+{{- define "clickhouse.keeperName" -}}
+{{- $lastReplica := sub (int .Values.clickhouseKeeper.replicas) 1 -}}
+{{- $name := printf "%s-keeper" .Release.Name -}}
+{{- if gt (len (printf "chk-%s-deploy-confd-cluster1-0-%d" $name $lastReplica)) 63 -}}
+{{- $suffix := printf "-%s-keeper" (trunc 6 (sha256sum .Release.Name)) -}}
+{{- $room := sub 63 (len (printf "chk-%s-deploy-confd-cluster1-0-%d" $suffix $lastReplica)) -}}
+{{- $name = printf "%s%s" (trimSuffix "-" (trunc (int $room) .Release.Name)) $suffix -}}
+{{- end -}}
+{{- $name -}}
+{{- end -}}
diff --git a/packages/apps/clickhouse/templates/_versions.tpl b/packages/apps/clickhouse/templates/_versions.tpl
new file mode 100644
index 0000000000..ff4b989989
--- /dev/null
+++ b/packages/apps/clickhouse/templates/_versions.tpl
@@ -0,0 +1,7 @@
+{{- define "clickhouse.versionMap" }}
+{{- $versionMap := .Files.Get "files/versions.yaml" | fromYaml }}
+{{- if not (hasKey $versionMap .Values.version) }}
+    {{- printf `ClickHouse version %s is not supported, allowed versions are %s` $.Values.version (keys $versionMap | sortAlpha) | fail }}
+{{- end }}
+{{- index $versionMap .Values.version }}
+{{- end }}
diff --git a/packages/apps/clickhouse/templates/backup-script.yaml b/packages/apps/clickhouse/templates/backup-script.yaml
index d804008ffa..1caff64f8d 100644
--- a/packages/apps/clickhouse/templates/backup-script.yaml
+++ b/packages/apps/clickhouse/templates/backup-script.yaml
@@ -18,7 +18,7 @@ stringData:
     
     JOB_ID="job-$(uuidgen|cut -f1 -d-)"
     TABLE_LIST=$(clickhouse-client --host "$CLICKHOUSE_HOST" -q 'SHOW TABLES;' | grep -v '^.inner.' || true)
-    echo DB_LIST=$(echo "$TABLE_LIST" | shuf) # shuffle list
+    DB_LIST=$(echo "$TABLE_LIST" | shuf) # shuffle list
     echo "Job ID: $JOB_ID"
     echo "Target repo: $REPO_PREFIX"
     echo "Cleanup strategy: $CLEANUP_STRATEGY"
diff --git a/packages/apps/clickhouse/templates/chkeeper.yaml b/packages/apps/clickhouse/templates/chkeeper.yaml
index 42d88af4d9..9385812599 100644
--- a/packages/apps/clickhouse/templates/chkeeper.yaml
+++ b/packages/apps/clickhouse/templates/chkeeper.yaml
@@ -4,7 +4,7 @@
 apiVersion: "clickhouse-keeper.altinity.com/v1"
 kind: "ClickHouseKeeperInstallation"
 metadata:
-  name: "{{ .Release.Name }}-keeper"
+  name: {{ include "clickhouse.keeperName" $ | quote }}
   annotations:
     prometheus.io/port: "7000"
     prometheus.io/scrape: "true"
@@ -57,13 +57,16 @@ spec:
           containers:
             - name: clickhouse-keeper
               imagePullPolicy: IfNotPresent
-              image: clickhouse/clickhouse-keeper:24.9.2.42
+              image: clickhouse/clickhouse-keeper:{{ include "clickhouse.versionMap" $ }}
               resources: {{- include "cozy-lib.resources.defaultingSanitize" (list .Values.clickhouseKeeper.resourcesPreset .Values.resources $) | nindent 20 }}  
           securityContext:
             fsGroup: 101
 
     volumeClaimTemplates:
       - name: default
+        metadata:
+          labels:
+            app.kubernetes.io/instance: "{{ .Release.Name }}"
         spec:
           accessModes:
             - ReadWriteOnce
diff --git a/packages/apps/clickhouse/templates/clickhouse.yaml b/packages/apps/clickhouse/templates/clickhouse.yaml
index 084e4ff3b7..827b5d5794 100644
--- a/packages/apps/clickhouse/templates/clickhouse.yaml
+++ b/packages/apps/clickhouse/templates/clickhouse.yaml
@@ -94,11 +94,10 @@ spec:
     zookeeper:
       nodes:
         {{- $replicas := int .Values.clickhouseKeeper.replicas }}
-        {{- $release := .Release.Name }}
+        {{- $keeper := include "clickhouse.keeperName" $ }}
         {{- $namespace := .Release.Namespace }}
-        {{- $clusterDomain := .Values.clusterDomain }}
         {{- range $i := until $replicas }}
-        - host: "chk-{{ $release }}-keeper-cluster1-0-{{ $i }}.{{ $namespace }}.svc.{{ $clusterDomain }}"
+        - host: "chk-{{ $keeper }}-cluster1-0-{{ $i }}.{{ $namespace }}.svc.{{ $clusterDomain }}"
           port: 2181
         {{- end }}
     {{- end }}
@@ -142,7 +141,7 @@ spec:
                   topologyKey: "kubernetes.io/hostname"
           containers:
             - name: clickhouse
-              image: clickhouse/clickhouse-server:24.9.2.42
+              image: clickhouse/clickhouse-server:{{ include "clickhouse.versionMap" $ }}
               resources: {{- include "cozy-lib.resources.defaultingSanitize" (list .Values.resourcesPreset .Values.resources $) | nindent 16 }}
               volumeMounts:
                 - name: data-volume-template
@@ -170,6 +169,19 @@ spec:
 {{- $accessKeyKey := "accessKey" }}
 {{- $secretKeyKey := "secretKey" }}
 {{- $s3Path := default .Release.Name .Values.backup.s3PathOverride }}
+{{- /*
+  Optional CA bundle for an S3 endpoint signed by a private CA. Independent of
+  which Secret carries the credentials, so it composes with the per-tenant, the
+  bring-your-own-Secret and the useSystemBucket flows alike.
+*/}}
+{{- $endpointCAName := "" }}
+{{- $endpointCAKey := "ca.crt" }}
+{{- with .Values.backup.endpointCA }}
+{{- if .name }}
+{{- $endpointCAName = .name }}
+{{- if .key }}{{ $endpointCAKey = .key }}{{ end }}
+{{- end }}
+{{- end }}
 {{- if .Values.backup.useSystemBucket }}
 {{- if .Values.backup.s3PathOverride }}
 {{- fail "clickhouse: backup.s3PathOverride is incompatible with backup.useSystemBucket=true. The platform flow scopes the S3 path to <namespace>/<release> automatically; clear s3PathOverride or disable useSystemBucket. To restore from another release's prefix, use a backups.cozystack.io/RestoreJob with spec.targetApplicationRef." }}
@@ -285,14 +297,38 @@ spec:
                 {{- $secretOptional := .Values.backup.useSystemBucket }}
                 - name: S3_BUCKET
                   valueFrom: { secretKeyRef: { name: {{ $sidecarSecretName | quote }}, key: {{ $bucketKey | quote }}{{ if $secretOptional }}, optional: true{{ end }} } }
+                {{- /*
+                  clickhouse-backup's aws-sdk-go-v2 client rejects a scheme-less
+                  S3_ENDPOINT ("was not a valid URI"). On the useSystemBucket flow
+                  the projected cozy-backups-creds.endpoint is a bare host, so
+                  prepend https:// (the platform's CNPG endpoint helper does the
+                  same). Legacy / BYO-Secret endpoints are tenant-supplied with
+                  their own scheme and are consumed verbatim.
+                */}}
+                {{- if .Values.backup.useSystemBucket }}
+                - name: S3_ENDPOINT_HOST
+                  valueFrom: { secretKeyRef: { name: {{ $sidecarSecretName | quote }}, key: {{ $endpointKey | quote }}, optional: true } }
+                - name: S3_ENDPOINT
+                  value: "https://$(S3_ENDPOINT_HOST)"
+                {{- else }}
                 - name: S3_ENDPOINT
-                  valueFrom: { secretKeyRef: { name: {{ $sidecarSecretName | quote }}, key: {{ $endpointKey | quote }}{{ if $secretOptional }}, optional: true{{ end }} } }
+                  valueFrom: { secretKeyRef: { name: {{ $sidecarSecretName | quote }}, key: {{ $endpointKey | quote }} } }
+                {{- end }}
                 - name: S3_REGION
                   valueFrom: { secretKeyRef: { name: {{ $sidecarSecretName | quote }}, key: {{ $regionKey | quote }}{{ if $secretOptional }}, optional: true{{ end }} } }
                 - name: S3_ACCESS_KEY
                   valueFrom: { secretKeyRef: { name: {{ $sidecarSecretName | quote }}, key: {{ $accessKeyKey | quote }}{{ if $secretOptional }}, optional: true{{ end }} } }
                 - name: S3_SECRET_KEY
                   valueFrom: { secretKeyRef: { name: {{ $sidecarSecretName | quote }}, key: {{ $secretKeyKey | quote }}{{ if $secretOptional }}, optional: true{{ end }} } }
+{{- if $endpointCAName }}
+                # Trust the mounted private-CA bundle for the S3 endpoint (see
+                # the `backup.endpointCA` field in values.yaml). SSL_CERT_DIR,
+                # not AWS_CA_BUNDLE: Go reads it in addition to the system store,
+                # so a private and a public endpoint both verify, whereas
+                # AWS_CA_BUNDLE replaces the trust pool and breaks public S3.
+                - name: SSL_CERT_DIR
+                  value: /etc/ssl/cozy-s3-ca:/etc/ssl/certs
+{{- end }}
               resources:
                 requests:
                   cpu: 10m
@@ -303,6 +339,11 @@ spec:
               volumeMounts:
                 - name: data-volume-template
                   mountPath: /var/lib/clickhouse
+{{- if $endpointCAName }}
+                - name: backup-s3-ca
+                  mountPath: /etc/ssl/cozy-s3-ca
+                  readOnly: true
+{{- end }}
               securityContext:
                 # clickhouse-server stores data under /var/lib/clickhouse with
                 # uid=101 / mode 0750 (alpine clickhouse-server image's
@@ -325,6 +366,20 @@ spec:
                 runAsGroup: 0
                 seccompProfile:
                   type: RuntimeDefault
+{{- if $endpointCAName }}
+          # Private-CA bundle for the backup sidecar, projected as ca.crt for
+          # SSL_CERT_DIR above. Not optional on purpose: a missing Secret holds
+          # the whole ClickHouse Pod in ContainerCreating (naming the Secret in
+          # `kubectl describe`) rather than mounting an empty trust dir and
+          # failing later inside clickhouse-backup with an opaque x509 error.
+          volumes:
+            - name: backup-s3-ca
+              secret:
+                secretName: {{ $endpointCAName | quote }}
+                items:
+                  - key: {{ $endpointCAKey | quote }}
+                    path: ca.crt
+{{- end }}
 {{- end }}
     serviceTemplates:
       - name: svc-template
diff --git a/packages/apps/clickhouse/templates/hooks/cleanup-pvc.yaml b/packages/apps/clickhouse/templates/hooks/cleanup-pvc.yaml
new file mode 100644
index 0000000000..e7127a2a9e
--- /dev/null
+++ b/packages/apps/clickhouse/templates/hooks/cleanup-pvc.yaml
@@ -0,0 +1,110 @@
+---
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: "{{ .Release.Name }}-cleanup"
+  labels:
+    app.kubernetes.io/instance: "{{ .Release.Name }}"
+  annotations:
+    "helm.sh/hook": post-delete
+    "helm.sh/hook-weight": "10"
+    # before-hook-creation only (no hook-succeeded): keep a failed cleanup Job
+    # and its logs around for post-mortem. The RBAC objects below DO carry
+    # hook-succeeded so they are reclaimed after a successful uninstall.
+    "helm.sh/hook-delete-policy": before-hook-creation
+spec:
+  activeDeadlineSeconds: 270
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/instance: "{{ .Release.Name }}"
+        policy.cozystack.io/allow-to-apiserver: "true"
+    spec:
+      serviceAccountName: "{{ .Release.Name }}-cleanup"
+      restartPolicy: Never
+      terminationGracePeriodSeconds: 10
+      securityContext:
+        runAsNonRoot: true
+        runAsUser: 65534
+        runAsGroup: 65534
+        seccompProfile:
+          type: RuntimeDefault
+      containers:
+        - name: cleanup
+          image: docker.io/clastix/kubectl:v1.32
+          securityContext:
+            allowPrivilegeEscalation: false
+            readOnlyRootFilesystem: true
+            capabilities:
+              drop: ["ALL"]
+          env:
+            - name: HOME
+              value: /tmp
+          resources:
+            requests:
+              cpu: 10m
+              memory: 64Mi
+            limits:
+              cpu: 200m
+              memory: 128Mi
+          command:
+            - /bin/sh
+            - -c
+            - |
+              set -eu
+              echo "Deleting orphaned PVCs for {{ .Release.Name }}..."
+              if ! kubectl delete pvc -n {{ .Release.Namespace }} -l app.kubernetes.io/instance={{ .Release.Name }} --ignore-not-found --wait=true --timeout=120s; then
+                echo "ERROR: PVC cleanup failed for {{ .Release.Name }}; orphaned PVCs may remain" >&2
+                exit 1
+              fi
+              echo "PVC cleanup complete."
+          volumeMounts:
+            - name: tmp
+              mountPath: /tmp
+      volumes:
+        - name: tmp
+          emptyDir: {}
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: "{{ .Release.Name }}-cleanup"
+  labels:
+    app.kubernetes.io/instance: "{{ .Release.Name }}"
+  annotations:
+    "helm.sh/hook": post-delete
+    "helm.sh/hook-weight": "0"
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: "{{ .Release.Name }}-cleanup"
+  labels:
+    app.kubernetes.io/instance: "{{ .Release.Name }}"
+  annotations:
+    "helm.sh/hook": post-delete
+    "helm.sh/hook-weight": "5"
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+rules:
+  - apiGroups: [""]
+    resources: ["persistentvolumeclaims"]
+    verbs: ["get", "list", "watch", "delete"]
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: "{{ .Release.Name }}-cleanup"
+  labels:
+    app.kubernetes.io/instance: "{{ .Release.Name }}"
+  annotations:
+    "helm.sh/hook": post-delete
+    "helm.sh/hook-weight": "5"
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: "{{ .Release.Name }}-cleanup"
+subjects:
+  - kind: ServiceAccount
+    name: "{{ .Release.Name }}-cleanup"
diff --git a/packages/apps/clickhouse/tests/backup_api_contract_test.yaml b/packages/apps/clickhouse/tests/backup_api_contract_test.yaml
new file mode 100644
index 0000000000..2d148132a1
--- /dev/null
+++ b/packages/apps/clickhouse/tests/backup_api_contract_test.yaml
@@ -0,0 +1,99 @@
+suite: clickhouse-backup sidecar API contract (port and credential wiring)
+
+# The contract between the chart and the cozy-default-altinity backup strategy:
+# the strategy Pod reaches the in-Pod clickhouse-backup HTTP API on the named
+# port ch-backup-api, authenticating with the credentials in the chart-emitted
+# <release>-backup-api-auth Secret. A chart bump that renames the container,
+# moves the port, or repoints either secretKeyRef breaks every ClickHouse
+# BackupJob, and surfaces only as 401s or a connection refused at backup time.
+#
+# The e2e suite also checks this wiring on the operator-created Pod and admitted
+# Secret. These render assertions add an earlier, chart-owned failure signal on
+# every pull request; they do not replace the live operator/API integration.
+#
+# The e2e Test keeps its own reason to exist: it proves a backup-enabled
+# ClickHouse actually reaches a ready replica, which no amount of rendering can.
+
+templates:
+  - templates/clickhouse.yaml
+  - templates/backup-api-auth-secret.yaml
+
+release:
+  name: ch-test
+  namespace: tenant-test
+
+set:
+  _cluster: {}
+
+tests:
+  - it: "sidecar exposes the API on the named port the strategy dials"
+    template: templates/clickhouse.yaml
+    documentSelector:
+      path: kind
+      value: ClickHouseInstallation
+    set:
+      backup:
+        enabled: true
+    asserts:
+      - contains:
+          path: spec.templates.podTemplates[0].spec.containers[?(@.name=='clickhouse-backup')].ports
+          content:
+            name: ch-backup-api
+            containerPort: 7171
+            protocol: TCP
+
+  - it: "sidecar authenticates from the chart-emitted auth Secret"
+    template: templates/clickhouse.yaml
+    documentSelector:
+      path: kind
+      value: ClickHouseInstallation
+    set:
+      backup:
+        enabled: true
+    asserts:
+      - contains:
+          path: spec.templates.podTemplates[0].spec.containers[?(@.name=='clickhouse-backup')].env
+          content:
+            name: API_USERNAME
+            valueFrom:
+              secretKeyRef:
+                name: ch-test-backup-api-auth
+                key: username
+      - contains:
+          path: spec.templates.podTemplates[0].spec.containers[?(@.name=='clickhouse-backup')].env
+          content:
+            name: API_PASSWORD
+            valueFrom:
+              secretKeyRef:
+                name: ch-test-backup-api-auth
+                key: password
+
+  - it: "the auth Secret carries both keys the sidecar reads"
+    template: templates/backup-api-auth-secret.yaml
+    set:
+      backup:
+        enabled: true
+    asserts:
+      - isKind:
+          of: Secret
+      - equal:
+          path: metadata.name
+          value: ch-test-backup-api-auth
+      # stringData, not data: the apiserver converts one to the other on
+      # admission, so the live object the e2e suite inspects has `data` while
+      # the rendered manifest has `stringData`. Asserting the rendered shape is
+      # the point of testing here rather than there.
+      - equal:
+          path: stringData.username
+          value: backup
+      - isNotNullOrEmpty:
+          path: stringData.password
+
+  - it: "no auth Secret when backups are off"
+    template: templates/backup-api-auth-secret.yaml
+    set:
+      backup:
+        enabled: false
+    asserts:
+      - hasDocuments:
+          count: 0
diff --git a/packages/apps/clickhouse/tests/backup_api_password_persistence_test.yaml b/packages/apps/clickhouse/tests/backup_api_password_persistence_test.yaml
new file mode 100644
index 0000000000..281dedd7e2
--- /dev/null
+++ b/packages/apps/clickhouse/tests/backup_api_password_persistence_test.yaml
@@ -0,0 +1,68 @@
+suite: clickhouse-backup API password persistence across reconciles
+
+# The chart mints the backup API password once and then preserves it, by looking
+# up its own previously-rendered Secret. Both halves matter and they are
+# different code paths:
+#   - no existing Secret  -> generate a fresh password;
+#   - existing Secret     -> reuse it, because rotating on every re-render leaves
+#                            a window where the sidecar and the strategy Pod
+#                            disagree and every backup 401s.
+#
+# The second path is reachable here only because helm-unittest can fake the API
+# the chart looks up (kubernetesProvider). Without that, `lookup` returns nothing
+# outside a cluster, only the generate path renders, and the preserve path -- the
+# one with the failure mode -- is covered by nothing short of a live upgrade.
+#
+# This is the pattern, not the exception: the same lookup-preserve shape guards
+# an immutable PVC storageClass in harbor and the adopt-in-place migrations in
+# seaweedfs. Anywhere a chart reads existing cluster state to decide what to
+# render, this is how the other branch gets tested.
+
+templates:
+  - templates/backup-api-auth-secret.yaml
+
+release:
+  name: ch-test
+  namespace: tenant-test
+
+set:
+  _cluster: {}
+  backup:
+    enabled: true
+
+tests:
+  - it: "mints a password when none exists yet"
+    asserts:
+      - equal:
+          path: stringData.username
+          value: backup
+      - exists:
+          path: stringData.password
+      # Not asserting the value: it is random by design. Asserting its length
+      # would pin randAlphaNum's argument, which is not the contract.
+      - notEqual:
+          path: stringData.password
+          value: ""
+
+  - it: "preserves the existing password rather than rotating it"
+    kubernetesProvider:
+      scheme:
+        "v1/Secret":
+          gvr:
+            version: "v1"
+            resource: "secrets"
+          namespaced: true
+      objects:
+        - kind: Secret
+          apiVersion: v1
+          metadata:
+            name: ch-test-backup-api-auth
+            namespace: tenant-test
+          data:
+            # base64 of "backup" and "preserved-password"
+            username: YmFja3Vw
+            password: cHJlc2VydmVkLXBhc3N3b3Jk
+    asserts:
+      - equal:
+          path: stringData.password
+          value: preserved-password
diff --git a/packages/apps/clickhouse/tests/backup_test.yaml b/packages/apps/clickhouse/tests/backup_test.yaml
index 36db80f2c2..66eda4dc8c 100644
--- a/packages/apps/clickhouse/tests/backup_test.yaml
+++ b/packages/apps/clickhouse/tests/backup_test.yaml
@@ -15,6 +15,7 @@ templates:
   - templates/clickhouse.yaml
   - templates/backup-strategy-secret.yaml
   - templates/backup-secret.yaml
+  - templates/backup-script.yaml
 
 release:
   name: ch-test
@@ -34,6 +35,13 @@ tests:
         enabled: true
         useSystemBucket: true
     asserts:
+      - matchRegex:
+          # The tag tracks the cozystack release version (re-pinned by
+          # release-prep), so pin the cozystack-built repository rather than
+          # the volatile tag. The upstream altinity version lives in the image
+          # Dockerfile.
+          path: spec.templates.podTemplates[0].spec.containers[?(@.name=="clickhouse-backup")].image
+          pattern: '^ghcr\.io/cozystack/cozystack/altinity-clickhouse-backup:'
       - equal:
           path: spec.templates.podTemplates[0].spec.containers[?(@.name=="clickhouse-backup")].env[?(@.name=="S3_PATH")].value
           value: tenant-test/ch-test
@@ -46,6 +54,17 @@ tests:
       - equal:
           path: spec.templates.podTemplates[0].spec.containers[?(@.name=="clickhouse-backup")].env[?(@.name=="S3_SECRET_KEY")].valueFrom.secretKeyRef.name
           value: cozy-backups-creds
+      # The projected endpoint is a bare host; clickhouse-backup needs a URI, so
+      # the chart prepends https:// via env-var expansion on this flow.
+      - equal:
+          path: spec.templates.podTemplates[0].spec.containers[?(@.name=="clickhouse-backup")].env[?(@.name=="S3_ENDPOINT_HOST")].valueFrom.secretKeyRef.name
+          value: cozy-backups-creds
+      - equal:
+          path: spec.templates.podTemplates[0].spec.containers[?(@.name=="clickhouse-backup")].env[?(@.name=="S3_ENDPOINT_HOST")].valueFrom.secretKeyRef.key
+          value: endpoint
+      - equal:
+          path: spec.templates.podTemplates[0].spec.containers[?(@.name=="clickhouse-backup")].env[?(@.name=="S3_ENDPOINT")].value
+          value: https://$(S3_ENDPOINT_HOST)
 
   - it: "useSystemBucket=true: S3_FORCE_PATH_STYLE is sourced from cozy-backups-creds, not hardcoded"
     template: templates/clickhouse.yaml
@@ -103,10 +122,145 @@ tests:
         documentSelector:
           path: kind
           value: ClickHouseInstallation
+      # Legacy endpoint is tenant-supplied (already carries a scheme), read verbatim
+      # from the Secret with no https:// prepend and no S3_ENDPOINT_HOST indirection.
+      - equal:
+          path: spec.templates.podTemplates[0].spec.containers[?(@.name=="clickhouse-backup")].env[?(@.name=="S3_ENDPOINT")].valueFrom.secretKeyRef.name
+          value: ch-test-backup-s3
+        template: templates/clickhouse.yaml
+        documentSelector:
+          path: kind
+          value: ClickHouseInstallation
+      - notExists:
+          path: spec.templates.podTemplates[0].spec.containers[?(@.name=="clickhouse-backup")].env[?(@.name=="S3_ENDPOINT_HOST")]
+        template: templates/clickhouse.yaml
+        documentSelector:
+          path: kind
+          value: ClickHouseInstallation
       - hasDocuments:
           count: 1
         template: templates/backup-strategy-secret.yaml
 
+  # endpointCA: the CA bundle that lets the sidecar verify an S3 endpoint signed
+  # by a private CA (cozystack's in-cluster SeaweedFS). Three contracts, and the
+  # negative one matters most: an unset endpointCA must add no env, no mount and
+  # no volume, so the default rendering is untouched by this feature.
+  - it: "endpointCA unset: no CA env, mount or volume is rendered"
+    template: templates/clickhouse.yaml
+    documentSelector:
+      path: kind
+      value: ClickHouseInstallation
+    set:
+      backup:
+        enabled: true
+    asserts:
+      - notExists:
+          path: spec.templates.podTemplates[0].spec.containers[?(@.name=="clickhouse-backup")].env[?(@.name=="SSL_CERT_DIR")]
+      - notExists:
+          path: spec.templates.podTemplates[0].spec.containers[?(@.name=="clickhouse-backup")].volumeMounts[?(@.name=="backup-s3-ca")]
+      - notExists:
+          path: spec.templates.podTemplates[0].spec.volumes
+
+  - it: "endpointCA set: sidecar gets SSL_CERT_DIR, the CA mount and the Secret volume"
+    template: templates/clickhouse.yaml
+    documentSelector:
+      path: kind
+      value: ClickHouseInstallation
+    set:
+      backup:
+        enabled: true
+        endpointCA:
+          name: my-s3-ca
+    asserts:
+      # SSL_CERT_DIR (not AWS_CA_BUNDLE): Go reads it IN ADDITION to the system
+      # trust store, so a release with a private CA still reaches public S3.
+      # AWS_CA_BUNDLE replaces the pool and breaks that (measured against
+      # altinity/clickhouse-backup:2.7.4).
+      - equal:
+          path: spec.templates.podTemplates[0].spec.containers[?(@.name=="clickhouse-backup")].env[?(@.name=="SSL_CERT_DIR")].value
+          value: /etc/ssl/cozy-s3-ca:/etc/ssl/certs
+      - notExists:
+          path: spec.templates.podTemplates[0].spec.containers[?(@.name=="clickhouse-backup")].env[?(@.name=="AWS_CA_BUNDLE")]
+      # The mount path must be SSL_CERT_DIR's FIRST entry (a mountPath is a
+      # single directory, never a colon list) or the tool scans an empty dir.
+      # The second entry, /etc/ssl/certs, is the image's own system dir.
+      - equal:
+          path: spec.templates.podTemplates[0].spec.containers[?(@.name=="clickhouse-backup")].volumeMounts[?(@.name=="backup-s3-ca")].mountPath
+          value: /etc/ssl/cozy-s3-ca
+      - equal:
+          path: spec.templates.podTemplates[0].spec.volumes[?(@.name=="backup-s3-ca")].secret.secretName
+          value: my-s3-ca
+      # Default key, projected under the fixed filename SSL_CERT_DIR scans.
+      - equal:
+          path: spec.templates.podTemplates[0].spec.volumes[?(@.name=="backup-s3-ca")].secret.items[0].key
+          value: ca.crt
+      - equal:
+          path: spec.templates.podTemplates[0].spec.volumes[?(@.name=="backup-s3-ca")].secret.items[0].path
+          value: ca.crt
+      # The CA is the sidecar's business only — the server container must not
+      # get the mount.
+      - notExists:
+          path: spec.templates.podTemplates[0].spec.containers[?(@.name=="clickhouse")].volumeMounts[?(@.name=="backup-s3-ca")]
+
+  - it: "endpointCA.key: a custom key is still projected as ca.crt"
+    template: templates/clickhouse.yaml
+    documentSelector:
+      path: kind
+      value: ClickHouseInstallation
+    set:
+      backup:
+        enabled: true
+        endpointCA:
+          name: my-s3-ca
+          key: tls-bundle.pem
+    asserts:
+      - equal:
+          path: spec.templates.podTemplates[0].spec.volumes[?(@.name=="backup-s3-ca")].secret.items[0].key
+          value: tls-bundle.pem
+      - equal:
+          path: spec.templates.podTemplates[0].spec.volumes[?(@.name=="backup-s3-ca")].secret.items[0].path
+          value: ca.crt
+
+  # endpointCA composes with the platform flow: cozy-backups-creds carries the
+  # credentials while the CA arrives separately, so a useSystemBucket release
+  # can target the in-cluster SeaweedFS endpoint too.
+  - it: "endpointCA composes with useSystemBucket"
+    template: templates/clickhouse.yaml
+    documentSelector:
+      path: kind
+      value: ClickHouseInstallation
+    set:
+      backup:
+        enabled: true
+        useSystemBucket: true
+        endpointCA:
+          name: my-s3-ca
+    asserts:
+      - equal:
+          path: spec.templates.podTemplates[0].spec.containers[?(@.name=="clickhouse-backup")].env[?(@.name=="SSL_CERT_DIR")].value
+          value: /etc/ssl/cozy-s3-ca:/etc/ssl/certs
+      - equal:
+          path: spec.templates.podTemplates[0].spec.containers[?(@.name=="clickhouse-backup")].env[?(@.name=="S3_BUCKET")].valueFrom.secretKeyRef.name
+          value: cozy-backups-creds
+
+  # backup.enabled=false renders no sidecar at all, so the CA must not leak a
+  # volume onto the Pod either.
+  - it: "endpointCA set but backup disabled: nothing is rendered"
+    template: templates/clickhouse.yaml
+    documentSelector:
+      path: kind
+      value: ClickHouseInstallation
+    set:
+      backup:
+        enabled: false
+        endpointCA:
+          name: my-s3-ca
+    asserts:
+      - notExists:
+          path: spec.templates.podTemplates[0].spec.volumes
+      - notExists:
+          path: spec.templates.podTemplates[0].spec.containers[?(@.name=="clickhouse-backup")]
+
   - it: "s3PathOverride + useSystemBucket: render fails fast"
     template: templates/clickhouse.yaml
     set:
@@ -117,3 +271,24 @@ tests:
     asserts:
       - failedTemplate:
           errorMessage: "clickhouse: backup.s3PathOverride is incompatible with backup.useSystemBucket=true. The platform flow scopes the S3 path to <namespace>/<release> automatically; clear s3PathOverride or disable useSystemBucket. To restore from another release's prefix, use a backups.cozystack.io/RestoreJob with spec.targetApplicationRef."
+
+  # Regression for #3758. The legacy per-instance backup script's retention
+  # cleanup loop iterates $DB_LIST, which must be assigned from the table list.
+  # A prior `echo DB_LIST=$(...)` typo left DB_LIST unset, so the cleanup loop
+  # ran zero iterations and `restic forget`/`restic prune` never executed —
+  # snapshots accumulated in object storage forever while the Job still
+  # reported success. Assert the assignment is present and the echo typo is gone.
+  - it: "legacy backup script: DB_LIST is assigned so retention cleanup runs (#3758)"
+    template: templates/backup-script.yaml
+    set:
+      backup:
+        enabled: true
+        schedule: "0 3 * * *"
+        useSystemBucket: false
+    asserts:
+      - matchRegex:
+          path: stringData["backup.sh"]
+          pattern: '(?m)^\s*DB_LIST=\$\(echo "\$TABLE_LIST"'
+      - notMatchRegex:
+          path: stringData["backup.sh"]
+          pattern: 'echo DB_LIST='
diff --git a/packages/apps/clickhouse/tests/cleanup_pvc_test.yaml b/packages/apps/clickhouse/tests/cleanup_pvc_test.yaml
new file mode 100644
index 0000000000..37b77cc85d
--- /dev/null
+++ b/packages/apps/clickhouse/tests/cleanup_pvc_test.yaml
@@ -0,0 +1,103 @@
+suite: post-delete PVC cleanup hook
+
+# Verifies the post-delete hook that deletes orphaned PVCs left behind by the
+# clickhouse-keeper-operator (and the ClickHouse operator), which do not delete
+# data PVCs when their CR is removed. The cleanup Job selects PVCs by the
+# release-scoped label app.kubernetes.io/instance, which is set on both the
+# keeper volumeClaimTemplates and the main ClickHouse data/log volumeClaimTemplates.
+
+release:
+  name: ch-test
+  namespace: tenant-test
+
+set:
+  _cluster:
+    cluster-domain: cluster.local
+
+templates:
+  - templates/hooks/cleanup-pvc.yaml
+
+tests:
+  - it: "renders a post-delete cleanup Job scoped to the release"
+    documentSelector:
+      path: kind
+      value: Job
+    asserts:
+      - equal:
+          path: metadata.name
+          value: ch-test-cleanup
+      - equal:
+          path: metadata.annotations["helm.sh/hook"]
+          value: post-delete
+      - equal:
+          # before-hook-creation only (no hook-succeeded): a failed cleanup Job
+          # must survive so its logs are inspectable instead of being reaped.
+          path: metadata.annotations["helm.sh/hook-delete-policy"]
+          value: before-hook-creation
+      - equal:
+          path: spec.template.spec.serviceAccountName
+          value: ch-test-cleanup
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: 'kubectl delete pvc -n tenant-test -l app\.kubernetes\.io/instance=ch-test'
+      - matchRegex:
+          # The hook must surface kubectl failures (exit 1), not mask them.
+          path: spec.template.spec.containers[0].command[2]
+          pattern: 'exit 1'
+
+  - it: "grants get/list/watch/delete on persistentvolumeclaims"
+    documentSelector:
+      path: kind
+      value: Role
+    asserts:
+      - equal:
+          # RBAC artifacts are reclaimed on a successful uninstall (unlike the
+          # Job, which is kept for post-mortem on failure).
+          path: metadata.annotations["helm.sh/hook-delete-policy"]
+          value: before-hook-creation,hook-succeeded
+      - equal:
+          path: rules[0].apiGroups[0]
+          value: ""
+      - equal:
+          path: rules[0].resources[0]
+          value: persistentvolumeclaims
+      - equal:
+          path: rules[0].verbs
+          value:
+            - get
+            - list
+            - watch
+            - delete
+
+  - it: "bounds the cleanup Job so a claim that will not go cannot hang the uninstall"
+    documentSelector:
+      path: kind
+      value: Job
+    asserts:
+      - equal:
+          path: spec.activeDeadlineSeconds
+          value: 270
+      - equal:
+          path: spec.template.spec.terminationGracePeriodSeconds
+          value: 10
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: 'kubectl delete pvc -n tenant-test -l app\.kubernetes\.io/instance=ch-test --ignore-not-found --wait=true --timeout=120s'
+      - notMatchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: '--request-timeout='
+
+  - it: "binds the cleanup ServiceAccount to the cleanup Role"
+    documentSelector:
+      path: kind
+      value: RoleBinding
+    asserts:
+      - equal:
+          path: roleRef.name
+          value: ch-test-cleanup
+      - equal:
+          path: subjects[0].kind
+          value: ServiceAccount
+      - equal:
+          path: subjects[0].name
+          value: ch-test-cleanup
diff --git a/packages/apps/clickhouse/tests/keeper_name_test.yaml b/packages/apps/clickhouse/tests/keeper_name_test.yaml
new file mode 100644
index 0000000000..13c135202a
--- /dev/null
+++ b/packages/apps/clickhouse/tests/keeper_name_test.yaml
@@ -0,0 +1,152 @@
+suite: keeper name budget
+
+set:
+  _cluster:
+    cluster-domain: cluster.local
+
+tests:
+  - it: "keeps <release>-keeper for a short release name"
+    release:
+      name: ch-test
+      namespace: tenant-test
+    asserts:
+      - equal:
+          path: metadata.name
+          value: ch-test-keeper
+        template: templates/chkeeper.yaml
+        documentSelector:
+          path: kind
+          value: ClickHouseKeeperInstallation
+      - equal:
+          path: spec.configuration.zookeeper.nodes[0].host
+          value: chk-ch-test-keeper-cluster1-0-0.tenant-test.svc.cluster.local
+        template: templates/clickhouse.yaml
+        documentSelector:
+          path: kind
+          value: ClickHouseInstallation
+
+  - it: "keeps <release>-keeper when the confd volume name lands exactly on 63 characters"
+    release:
+      name: clickhouse-abcdefghijklmno
+      namespace: tenant-test
+    asserts:
+      - equal:
+          path: metadata.name
+          value: clickhouse-abcdefghijklmno-keeper
+        template: templates/chkeeper.yaml
+        documentSelector:
+          path: kind
+          value: ClickHouseKeeperInstallation
+      - equal:
+          path: spec.configuration.zookeeper.nodes[2].host
+          value: chk-clickhouse-abcdefghijklmno-keeper-cluster1-0-2.tenant-test.svc.cluster.local
+        template: templates/clickhouse.yaml
+        documentSelector:
+          path: kind
+          value: ClickHouseInstallation
+
+  - it: "shortens the name one character past the budget and keeps the ClickHouse side in step"
+    release:
+      name: clickhouse-abcdefghijklmnop
+      namespace: tenant-test
+    asserts:
+      - equal:
+          path: metadata.name
+          value: clickhouse-abcdefgh-be3a98-keeper
+        template: templates/chkeeper.yaml
+        documentSelector:
+          path: kind
+          value: ClickHouseKeeperInstallation
+      - matchRegex:
+          path: metadata.name
+          pattern: ^[a-z0-9-]{1,33}$
+        template: templates/chkeeper.yaml
+        documentSelector:
+          path: kind
+          value: ClickHouseKeeperInstallation
+      - equal:
+          path: spec.configuration.zookeeper.nodes[0].host
+          value: chk-clickhouse-abcdefgh-be3a98-keeper-cluster1-0-0.tenant-test.svc.cluster.local
+        template: templates/clickhouse.yaml
+        documentSelector:
+          path: kind
+          value: ClickHouseInstallation
+      - equal:
+          path: spec.configuration.zookeeper.nodes[2].host
+          value: chk-clickhouse-abcdefgh-be3a98-keeper-cluster1-0-2.tenant-test.svc.cluster.local
+        template: templates/clickhouse.yaml
+        documentSelector:
+          path: kind
+          value: ClickHouseInstallation
+
+  - it: "leaves the pod label, the scrape and the monitor on <release>-keeper when the name is shortened"
+    release:
+      name: clickhouse-abcdefghijklmnop
+      namespace: tenant-test
+    asserts:
+      - equal:
+          path: spec.templates.podTemplates[0].metadata.labels.app
+          value: clickhouse-abcdefghijklmnop-keeper
+        template: templates/chkeeper.yaml
+        documentSelector:
+          path: kind
+          value: ClickHouseKeeperInstallation
+      - equal:
+          path: spec.selector.matchLabels.app
+          value: clickhouse-abcdefghijklmnop-keeper
+        template: templates/chkeeper.yaml
+        documentSelector:
+          path: kind
+          value: VMPodScrape
+      - equal:
+          path: spec.selector.app
+          value: clickhouse-abcdefghijklmnop-keeper
+        template: templates/workloadmonitor.yaml
+        documentSelector:
+          path: metadata.name
+          value: clickhouse-abcdefghijklmnop-keeper
+
+  - it: "does not end the truncated prefix with a dash"
+    release:
+      name: clickhouse-abcdefg-hijklmnop
+      namespace: tenant-test
+    templates:
+      - templates/chkeeper.yaml
+    documentSelector:
+      path: kind
+      value: ClickHouseKeeperInstallation
+    asserts:
+      - equal:
+          path: metadata.name
+          value: clickhouse-abcdefg-0c8860-keeper
+
+  - it: "fits a very long release name into the same budget"
+    release:
+      name: clickhouse-very-long-application-name-here
+      namespace: tenant-test
+    templates:
+      - templates/chkeeper.yaml
+    documentSelector:
+      path: kind
+      value: ClickHouseKeeperInstallation
+    asserts:
+      - equal:
+          path: metadata.name
+          value: clickhouse-very-lon-94e5b4-keeper
+
+  - it: "gives a two-digit replica index one more character of room"
+    release:
+      name: clickhouse-abcdefghijklmno
+      namespace: tenant-test
+    set:
+      clickhouseKeeper:
+        replicas: 11
+    templates:
+      - templates/chkeeper.yaml
+    documentSelector:
+      path: kind
+      value: ClickHouseKeeperInstallation
+    asserts:
+      - equal:
+          path: metadata.name
+          value: clickhouse-abcdefg-8d42f8-keeper
diff --git a/packages/apps/clickhouse/tests/version_test.yaml b/packages/apps/clickhouse/tests/version_test.yaml
new file mode 100644
index 0000000000..8482a48d7e
--- /dev/null
+++ b/packages/apps/clickhouse/tests/version_test.yaml
@@ -0,0 +1,84 @@
+suite: version selection
+
+# The chart pins a single ClickHouse version, shared by the server and the
+# Keeper images, resolved from files/versions.yaml via the version enum.
+# The default must stay 24.9.2.42 so existing installations are not bumped
+# to a new major on upgrade.
+
+release:
+  name: ch-test
+  namespace: tenant-test
+
+set:
+  _cluster:
+    cluster-domain: cluster.local
+
+tests:
+  - it: "default version v24.9 renders 24.9.2.42 on the ClickHouse server"
+    templates:
+      - templates/clickhouse.yaml
+    documentSelector:
+      path: kind
+      value: ClickHouseInstallation
+    asserts:
+      - equal:
+          path: spec.templates.podTemplates[0].spec.containers[0].image
+          value: clickhouse/clickhouse-server:24.9.2.42
+
+  - it: "default version v24.9 renders 24.9.2.42 on the Keeper"
+    templates:
+      - templates/chkeeper.yaml
+    documentSelector:
+      path: kind
+      value: ClickHouseKeeperInstallation
+    asserts:
+      - equal:
+          path: spec.templates.podTemplates[0].spec.containers[0].image
+          value: clickhouse/clickhouse-keeper:24.9.2.42
+
+  # Upgrade lines assert the major.minor only (the patch is regenerated from
+  # Docker Hub by update-versions.sh and would otherwise drift the test); the
+  # frozen default above keeps its exact-tag assertion.
+  - it: "version v25.8 selects a 25.8 tag for both server and Keeper"
+    set:
+      version: v25.8
+    asserts:
+      - matchRegex:
+          path: spec.templates.podTemplates[0].spec.containers[0].image
+          pattern: "^clickhouse/clickhouse-server:25\\.8\\."
+        template: templates/clickhouse.yaml
+        documentSelector:
+          path: kind
+          value: ClickHouseInstallation
+      - matchRegex:
+          path: spec.templates.podTemplates[0].spec.containers[0].image
+          pattern: "^clickhouse/clickhouse-keeper:25\\.8\\."
+        template: templates/chkeeper.yaml
+        documentSelector:
+          path: kind
+          value: ClickHouseKeeperInstallation
+
+  - it: "version v25.3 selects a 25.3 tag on the server"
+    set:
+      version: v25.3
+    templates:
+      - templates/clickhouse.yaml
+    documentSelector:
+      path: kind
+      value: ClickHouseInstallation
+    asserts:
+      - matchRegex:
+          path: spec.templates.podTemplates[0].spec.containers[0].image
+          pattern: "^clickhouse/clickhouse-server:25\\.3\\."
+
+  # An unsupported version is rejected — by the schema enum first, and by the
+  # versionMap fail as defense-in-depth. Match either so the assertion is not
+  # tied to Helm's exact JSON-schema error phrasing.
+  - it: "an unsupported version is rejected"
+    set:
+      version: v1.0
+    templates:
+      - templates/clickhouse.yaml
+    asserts:
+      - failedTemplate:
+          errorPattern: "(must be one of|is not supported)"
diff --git a/packages/apps/clickhouse/values.schema.json b/packages/apps/clickhouse/values.schema.json
index b7df3aabce..11f30580f5 100644
--- a/packages/apps/clickhouse/values.schema.json
+++ b/packages/apps/clickhouse/values.schema.json
@@ -122,6 +122,19 @@
           "rule": "self == oldSelf",
           "message": "storageClass is immutable"
         }
+      ],
+      "x-cozystack-options": {
+        "source": "storageclass"
+      }
+    },
+    "version": {
+      "description": "ClickHouse major.minor version to deploy. Applies to both the ClickHouse server and ClickHouse Keeper images. Downgrading to an older major is unsafe (ClickHouse cannot read data written by a newer server and Keeper snapshots are not backward compatible) — only increase this value.",
+      "type": "string",
+      "default": "v24.9",
+      "enum": [
+        "v25.8",
+        "v25.3",
+        "v24.9"
       ]
     },
     "logStorageSize": {
@@ -184,6 +197,23 @@
           "type": "string",
           "default": ""
         },
+        "endpointCA": {
+          "description": "CA bundle the sidecar trusts when the S3 endpoint's certificate is signed by a private CA (e.g. Cozystack's in-cluster SeaweedFS). Applies to both the per-tenant and the `useSystemBucket` flow, and to the `clickhouse-backup` sidecar only — the legacy `schedule` CronJob writes to S3 through restic and does not consume it, so a private-CA endpoint combined with `schedule` still fails TLS. Use the BackupClass flow for such an endpoint.",
+          "type": "object",
+          "default": {},
+          "properties": {
+            "key": {
+              "description": "Key inside the Secret holding the PEM CA bundle. Defaults to `ca.crt`.",
+              "type": "string",
+              "default": "ca.crt"
+            },
+            "name": {
+              "description": "Name of the Secret in the application namespace. Empty (default) mounts nothing and leaves the sidecar on the system trust store only.",
+              "type": "string",
+              "default": ""
+            }
+          }
+        },
         "resticPassword": {
           "description": "Legacy. Password for Restic backup encryption used by the legacy CronJob. Unused by the Altinity strategy.",
           "type": "string",
diff --git a/packages/apps/clickhouse/values.yaml b/packages/apps/clickhouse/values.yaml
index e2b5c7c246..29d93f8148 100644
--- a/packages/apps/clickhouse/values.yaml
+++ b/packages/apps/clickhouse/values.yaml
@@ -72,8 +72,17 @@ size: 10Gi
 
 ## @param {string} storageClass - StorageClass used to store the data.
 ## @immutable
+## @x-cozystack-options {source: storageclass}
 storageClass: ""
 
+## @enum {string} Version
+## @value v25.8
+## @value v25.3
+## @value v24.9
+
+## @param {Version} version - ClickHouse major.minor version to deploy. Applies to both the ClickHouse server and ClickHouse Keeper images. Downgrading to an older major is unsafe (ClickHouse cannot read data written by a newer server and Keeper snapshots are not backward compatible) — only increase this value.
+version: v24.9
+
 ##
 ## @section Application-specific parameters
 ##
@@ -111,6 +120,10 @@ users: {}
 ## @field {string} [accessKeyIDKey] - Key in the Secret holding the access key ID. Defaults to `accessKey`.
 ## @field {string} [secretAccessKeyKey] - Key in the Secret holding the secret access key. Defaults to `secretKey`.
 
+## @typedef {struct} EndpointCA - Reference to a Secret holding a PEM-encoded CA bundle the `clickhouse-backup` sidecar should trust when reaching an S3 endpoint that serves a certificate signed by a private CA. Cozystack's in-cluster SeaweedFS (`seaweedfs-s3.<tenant>:8333`) is the common case: it serves TLS signed by the self-signed "SeaweedFS CA", which no system trust store contains. Leave `name` empty for a publicly-trusted endpoint. The Secret must live in the application namespace; copy `ca.crt` out of the seaweedfs CA Secret (`seaweedfs-ca-cert` in the tenant that hosts seaweedfs) to populate it. The bundle is mounted into the sidecar and added to its trust store via `SSL_CERT_DIR`, which *adds* to the system CA set rather than replacing it, so a release configured this way still reaches publicly-trusted endpoints.
+## @field {string} [name] - Name of the Secret in the application namespace. Empty (default) mounts nothing and leaves the sidecar on the system trust store only.
+## @field {string} [key] - Key inside the Secret holding the PEM CA bundle. Defaults to `ca.crt`.
+
 ## @typedef {struct} Backup - Backup configuration.
 ## @field {bool} enabled - Enable backup integration. Materialises the chart-emitted `<release>-backup-s3` Secret consumed by the Altinity backup strategy and, when `schedule` is non-empty, also renders the legacy chart-managed CronJob.
 ## @field {bool} [useSystemBucket] - Opt-in: when true, the chart-emitted `<release>-backup-s3` Secret is skipped and the `clickhouse-backup` sidecar reads bucket coordinates + S3 credentials from the platform-projected `cozy-backups-creds` Secret. `S3_PATH` is set to `<namespace>/<release>` for cross-tenant isolation. Use together with the platform `cozy-default` BackupClass — tenants do not need to fill any `s3*` field below.
@@ -124,6 +137,7 @@ users: {}
 ## @field {string} [s3SecretKey] - DEPRECATED. Optional; see `s3AccessKey`.
 ## @field {string} [resticPassword] - Legacy. Password for Restic backup encryption used by the legacy CronJob. Unused by the Altinity strategy.
 ## @field {S3CredentialsSecret} [s3CredentialsSecret] - DEPRECATED. Pre-existing Secret reference for the legacy chart-emitted sidecar. The platform flow projects `cozy-backups-creds` instead.
+## @field {EndpointCA} [endpointCA] - CA bundle the sidecar trusts when the S3 endpoint's certificate is signed by a private CA (e.g. Cozystack's in-cluster SeaweedFS). Applies to both the per-tenant and the `useSystemBucket` flow, and to the `clickhouse-backup` sidecar only — the legacy `schedule` CronJob writes to S3 through restic and does not consume it, so a private-CA endpoint combined with `schedule` still fails TLS. Use the BackupClass flow for such an endpoint.
 
 ## @param {Backup} backup - Backup configuration.
 backup:
@@ -145,6 +159,9 @@ backup:
     regionKey: ""
     accessKeyIDKey: ""
     secretAccessKeyKey: ""
+  endpointCA:
+    name: ""
+    key: "ca.crt"
 
 ##
 ## @section ClickHouse Keeper parameters
diff --git a/packages/apps/foundationdb/Makefile b/packages/apps/foundationdb/Makefile
index 60f9c50c49..32f6c69d6d 100644
--- a/packages/apps/foundationdb/Makefile
+++ b/packages/apps/foundationdb/Makefile
@@ -2,4 +2,7 @@ include ../../../hack/package.mk
 
 generate:
 	cozyvalues-gen -m 'foundationdb' -v values.yaml -s values.schema.json -r README.md -g ../../../api/apps/v1alpha1/foundationdb/types.go
-	../../../hack/update-crd.sh
\ No newline at end of file
+	../../../hack/update-crd.sh
+
+test:
+	helm unittest .
diff --git a/packages/apps/foundationdb/templates/dashboard-resourcemap.yaml b/packages/apps/foundationdb/templates/dashboard-resourcemap.yaml
index ea37876951..4126f0e690 100644
--- a/packages/apps/foundationdb/templates/dashboard-resourcemap.yaml
+++ b/packages/apps/foundationdb/templates/dashboard-resourcemap.yaml
@@ -1,4 +1,3 @@
-{{- if .Values.monitoring.enabled }}
 ---
 apiVersion: v1
 kind: ConfigMap
@@ -11,6 +10,9 @@ metadata:
     app.cozystack.io/type: dashboard-resourcemap
 data:
   resources: |
+    - apiVersion: v1
+      kind: ConfigMap
+      name: {{ .Release.Name }}-config
     - apiVersion: apps.foundationdb.org/v1beta2
       kind: FoundationDBCluster
       name: {{ .Release.Name }}
@@ -19,4 +21,28 @@ data:
       kind: FoundationDBBackup
       name: {{ .Release.Name }}-backup
     {{- end }}
-{{- end }}
\ No newline at end of file
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: {{ .Release.Name }}-dashboard-resources
+rules:
+- apiGroups:
+  - ""
+  resources:
+  - configmaps
+  resourceNames:
+  - {{ .Release.Name }}-config
+  - {{ .Release.Name }}-resourcemap
+  verbs: ["get", "list", "watch"]
+---
+kind: RoleBinding
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: {{ .Release.Name }}-dashboard-resources
+subjects:
+{{ include "cozy-lib.rbac.subjectsForTenantAndAccessLevel" (list "use" .Release.Namespace) }}
+roleRef:
+  kind: Role
+  name: {{ .Release.Name }}-dashboard-resources
+  apiGroup: rbac.authorization.k8s.io
diff --git a/packages/apps/foundationdb/tests/dashboard-resourcemap_test.yaml b/packages/apps/foundationdb/tests/dashboard-resourcemap_test.yaml
new file mode 100644
index 0000000000..215b1e9a63
--- /dev/null
+++ b/packages/apps/foundationdb/tests/dashboard-resourcemap_test.yaml
@@ -0,0 +1,85 @@
+suite: foundationdb tenant configuration access
+templates:
+  - templates/dashboard-resourcemap.yaml
+release:
+  name: foundationdb-example
+  namespace: tenant-example
+tests:
+  - it: grants read access only to this cluster configuration and resource map
+    documentSelector: &role
+      path: kind
+      value: Role
+    asserts: &configAccess
+      - equal:
+          path: rules
+          value:
+            - apiGroups: [""]
+              resources: [configmaps]
+              resourceNames: [foundationdb-example-config, foundationdb-example-resourcemap]
+              verbs: [get, list, watch]
+
+  - it: keeps configuration accessible with monitoring disabled
+    set:
+      monitoring.enabled: false
+    documentSelector: *role
+    asserts: *configAccess
+
+  - it: binds the configuration role to tenant users and administrators
+    documentSelector:
+      path: kind
+      value: RoleBinding
+    asserts:
+      - equal:
+          path: roleRef
+          value:
+            kind: Role
+            name: foundationdb-example-dashboard-resources
+            apiGroup: rbac.authorization.k8s.io
+      - equal:
+          path: subjects
+          value:
+            - kind: ServiceAccount
+              name: tenant-example
+              namespace: tenant-example
+            - kind: Group
+              name: tenant-example-admin
+              apiGroup: rbac.authorization.k8s.io
+            - kind: Group
+              name: tenant-example-super-admin
+              apiGroup: rbac.authorization.k8s.io
+            - kind: Group
+              name: tenant-example-use
+              apiGroup: rbac.authorization.k8s.io
+            - kind: ServiceAccount
+              name: tenant-root
+              namespace: tenant-root
+            - kind: Group
+              name: tenant-root-admin
+              apiGroup: rbac.authorization.k8s.io
+            - kind: Group
+              name: tenant-root-super-admin
+              apiGroup: rbac.authorization.k8s.io
+            - kind: Group
+              name: tenant-root-use
+              apiGroup: rbac.authorization.k8s.io
+
+  - it: includes the configuration in the existing resource map
+    documentSelector:
+      path: kind
+      value: ConfigMap
+    asserts:
+      - matchRegex:
+          path: data.resources
+          pattern: "apiVersion: v1\n  kind: ConfigMap\n  name: foundationdb-example-config"
+
+  - it: renders only the existing map and the two access objects
+    asserts:
+      - hasDocuments:
+          count: 3
+
+  - it: keeps the resource map available with monitoring disabled
+    set:
+      monitoring.enabled: false
+    asserts:
+      - hasDocuments:
+          count: 3
diff --git a/packages/apps/foundationdb/values.schema.json b/packages/apps/foundationdb/values.schema.json
index 35c60fa353..4c22a1d320 100644
--- a/packages/apps/foundationdb/values.schema.json
+++ b/packages/apps/foundationdb/values.schema.json
@@ -111,7 +111,10 @@
               "rule": "self == oldSelf",
               "message": "storageClass is immutable"
             }
-          ]
+          ],
+          "x-cozystack-options": {
+            "source": "storageclass"
+          }
         }
       }
     },
diff --git a/packages/apps/foundationdb/values.yaml b/packages/apps/foundationdb/values.yaml
index a1c62a948b..b9ea431061 100644
--- a/packages/apps/foundationdb/values.yaml
+++ b/packages/apps/foundationdb/values.yaml
@@ -37,6 +37,7 @@ cluster:
 ## @field {quantity} size - Size of persistent volumes for each instance.
 ## @field {string} storageClass - Storage class (if not set, uses cluster default).
 ## @immutable
+## @x-cozystack-options {source: storageclass}
 
 ## @param {Storage} storage - Storage configuration.
 storage:
diff --git a/packages/apps/harbor/Chart.yaml b/packages/apps/harbor/Chart.yaml
index 8b6f59daca..27b9c78b37 100644
--- a/packages/apps/harbor/Chart.yaml
+++ b/packages/apps/harbor/Chart.yaml
@@ -4,4 +4,4 @@ description: Managed Harbor container registry
 icon: /logos/harbor.svg
 type: application
 version: 0.0.0 # Placeholder, the actual version will be automatically set during the build process
-appVersion: "2.14.2"
+appVersion: "2.15.1"
diff --git a/packages/apps/harbor/Makefile b/packages/apps/harbor/Makefile
index 43c2599856..24e5a071c9 100644
--- a/packages/apps/harbor/Makefile
+++ b/packages/apps/harbor/Makefile
@@ -2,6 +2,10 @@ NAME=harbor
 
 include ../../../hack/package.mk
 
+.PHONY: test
+test:
+	helm unittest .
+
 generate:
 	cozyvalues-gen -m 'harbor' -v values.yaml -s values.schema.json -r README.md -g ../../../api/apps/v1alpha1/harbor/types.go
 	../../../hack/update-crd.sh
diff --git a/packages/apps/harbor/README.md b/packages/apps/harbor/README.md
index d5c6b5fdb4..7a036d7a0a 100644
--- a/packages/apps/harbor/README.md
+++ b/packages/apps/harbor/README.md
@@ -2,16 +2,29 @@
 
 Harbor is an open-source trusted cloud-native registry project that stores, signs, and scans content.
 
+## Prerequisites
+
+The Cozystack Harbor app stores its registry data exclusively in S3-compatible object storage: the chart pins the registry backend to S3 and exposes no filesystem option. That bucket is provisioned through COSI (`objectstorage.k8s.io`) from a SeaweedFS deployment, so before deploying Harbor the tenant must have SeaweedFS available — enabled on the same tenant or inherited from a parent tenant (the resolved class is propagated down the tenant tree, surfaced as the `namespace.cozystack.io/seaweedfs` namespace label).
+
+Enable it by setting `seaweedfs: true` on the tenant (or a parent tenant):
+
+```yaml
+seaweedfs: true
+```
+
+Without object storage in the tenant chain, Harbor cannot provision its registry bucket: the `<release>-registry` `BucketClaim`/`BucketAccess` never produces the `<release>-registry-bucket` credentials secret, so the Harbor `HelmRelease` stays unreconciled, waiting on `BucketInfo`.
+
 > `storageClass` is annotated as immutable in the chart schema — see [`docs/storage-immutability.md`](../../../docs/storage-immutability.md) for the contract and which consumers enforce it.
 
 ## Parameters
 
 ### Common parameters
 
-| Name           | Description                                                                                  | Type     | Value |
-| -------------- | -------------------------------------------------------------------------------------------- | -------- | ----- |
-| `host`         | Hostname for external access to Harbor (defaults to 'harbor' subdomain for the tenant host). | `string` | `""`  |
-| `storageClass` | StorageClass used to store the data.                                                         | `string` | `""`  |
+| Name                  | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | Type       | Value |
+| --------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ---------- | ----- |
+| `host`                | Hostname for external access to Harbor (defaults to 'harbor' subdomain for the tenant host).                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | `string`   | `""`  |
+| `managementWhitelist` | IP addresses or CIDR ranges allowed to reach the Harbor web portal and API. `/v2/` and `/service/token`, which `docker login`, image pulls and pushes use, are not restricted by this list. For the portal and API it replaces the tenant ingress `whitelist` rather than narrowing it, and it is matched against the client address the ingress controller sees, which is a proxy or a forwarded header rather than the real client when something in front of the controller rewrites it. Empty allows every address. Requires Ingress publishing; rejected when the tenant publishes through Gateway API. | `[]string` | `[]`  |
+| `storageClass`        | StorageClass used to store the data.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | `string`   | `""`  |
 
 
 ### Component configuration
diff --git a/packages/apps/harbor/templates/dashboard-resourcemap.yaml b/packages/apps/harbor/templates/dashboard-resourcemap.yaml
index f8d91a6127..89416d9e64 100644
--- a/packages/apps/harbor/templates/dashboard-resourcemap.yaml
+++ b/packages/apps/harbor/templates/dashboard-resourcemap.yaml
@@ -23,6 +23,7 @@ rules:
   - ingresses
   resourceNames:
   - {{ .Release.Name }}-ingress
+  - {{ .Release.Name }}-registry-ingress
   verbs: ["get", "list", "watch"]
 - apiGroups:
   - cozystack.io
diff --git a/packages/apps/harbor/templates/harbor.yaml b/packages/apps/harbor/templates/harbor.yaml
index 72bfa61a4c..453ef2253d 100644
--- a/packages/apps/harbor/templates/harbor.yaml
+++ b/packages/apps/harbor/templates/harbor.yaml
@@ -1,4 +1,4 @@
-{{- $host := .Values._namespace.host }}
+{{- $host := include "cozy-lib.ns-host-required" . }}
 {{- $harborHost := .Values.host | default (printf "%s.%s" .Release.Name $host) }}
 
 {{- $existingSecret := lookup "v1" "Secret" .Release.Namespace (printf "%s-credentials" .Release.Name) }}
@@ -23,6 +23,46 @@
   {{- end }}
 {{- end }}
 
+{{- /*
+  storageClassName on a PVC is immutable, and a StatefulSet's volumeClaimTemplate
+  cannot be patched at all. The upstream chart renders both the jobservice PVC and
+  the trivy VCT without a storageClassName unless one is passed, so on first install
+  the default-StorageClass admission stamps the cluster default onto the live object.
+  To avoid an immutable-field rejection on upgrade we keep the rendered value equal
+  to the live one: preserve an existing object's storageClassName, and only fall back
+  to the configured storageClass for a fresh install. See issue #2368.
+
+  A live object pinned to an explicit "" (no dynamic provisioning) must round-trip
+  too: upstream maps the "-" sentinel back to storageClassName: "", so forward "-"
+  rather than letting "" collapse to an omitted field. An object carrying no
+  storageClassName key at all keeps the empty fallback so the field stays omitted,
+  matching the live object.
+*/}}
+{{- $jobservicePvc := lookup "v1" "PersistentVolumeClaim" .Release.Namespace (printf "%s-jobservice" .Release.Name) }}
+{{- $jobserviceStorageClass := .Values.storageClass }}
+{{- if $jobservicePvc }}
+  {{- $jobserviceSpec := $jobservicePvc.spec | default dict }}
+  {{- if hasKey $jobserviceSpec "storageClassName" }}
+    {{- $jobserviceStorageClass = $jobserviceSpec.storageClassName | default "-" }}
+  {{- else }}
+    {{- $jobserviceStorageClass = "" }}
+  {{- end }}
+{{- end }}
+
+{{- /* The trivy StatefulSet's VCT is named "data", so its PVCs are
+       data-<release>-trivy-0..N; the class is identical across ordinals, so the
+       first ordinal is representative. */}}
+{{- $trivyPvc := lookup "v1" "PersistentVolumeClaim" .Release.Namespace (printf "data-%s-trivy-0" .Release.Name) }}
+{{- $trivyStorageClass := .Values.storageClass }}
+{{- if $trivyPvc }}
+  {{- $trivySpec := $trivyPvc.spec | default dict }}
+  {{- if hasKey $trivySpec "storageClassName" }}
+    {{- $trivyStorageClass = $trivySpec.storageClassName | default "-" }}
+  {{- else }}
+    {{- $trivyStorageClass = "" }}
+  {{- end }}
+{{- end }}
+
 apiVersion: v1
 kind: Secret
 metadata:
@@ -49,10 +89,38 @@ spec:
     namespace: cozy-system
   interval: 5m
   timeout: 15m
+  {{- /* This nested release owns the whole harbor workload: the Deployments,
+         the inline RedisFailover and its volume. Flux's default install
+         strategy remediates a failed install by uninstalling, and install
+         remediation is an uninstall in every case Flux offers, so a first
+         install that goes over budget is torn down between attempts and the
+         next one re-provisions the redis PVC and re-runs the master election
+         from zero. It goes over budget on a busy runner: harbor-core blocks on
+         redis, and the nginx Deployment reaches the default
+         progressDeadlineSeconds of 600s, which Flux reads as a stalled
+         resource and fails the install early. RetryOnFailure keeps the
+         manifests applied and retries the failed release, so the convergence
+         already under way continues instead of restarting. Both actions carry
+         the strategy because the controller performs that retry as an upgrade
+         and the retry's own failure would otherwise fall through to upgrade
+         remediation. The cost is that a genuine upgrade failure retries rather
+         than rolls back, which gives up no stable safety net: with retries: -1
+         and the default strategy, upgrade remediation already rolled back and
+         retried without end. The remediation blocks stay because an absent
+         release consults install and an out-of-sync one consults upgrade, both
+         by retry count rather than by strategy. The parent release that
+         renders this one already carries the same strategy, stamped by the
+         apiserver that builds it from the Application. */}}
   install:
+    strategy:
+      name: RetryOnFailure
+      retryInterval: 30s
     remediation:
       retries: -1
   upgrade:
+    strategy:
+      name: RetryOnFailure
+      retryInterval: 30s
     remediation:
       retries: -1
   valuesFrom:
@@ -108,16 +176,25 @@ spec:
             bucket: {{ .Release.Name }}-registry
             secure: false
             v4auth: true
-        {{- if .Values.trivy.enabled }}
+        {{- if or $jobserviceStorageClass .Values.trivy.enabled }}
         persistentVolumeClaim:
+          {{- with $jobserviceStorageClass }}
+          jobservice:
+            jobLog:
+              storageClass: {{ . | quote }}
+          {{- end }}
+          {{- if .Values.trivy.enabled }}
           trivy:
             size: {{ .Values.trivy.size }}
-            {{- with .Values.storageClass }}
-            storageClass: {{ . }}
+            {{- with $trivyStorageClass }}
+            storageClass: {{ . | quote }}
             {{- end }}
+          {{- end }}
         {{- end }}
+      nginx:
+        resources: {{- include "cozy-lib.resources.defaultingSanitize" (list "t1.small" (dict) $) | nindent 10 }}
       portal:
-        resources: {{- include "cozy-lib.resources.defaultingSanitize" (list "t1.nano" (dict) $) | nindent 10 }}
+        resources: {{- include "cozy-lib.resources.defaultingSanitize" (list "t1.micro" (dict) $) | nindent 10 }}
       core:
         {{- if and $tokenKey $tokenCert }}
         tokenKey: {{ $tokenKey | quote }}
diff --git a/packages/apps/harbor/templates/hooks/cleanup.yaml b/packages/apps/harbor/templates/hooks/cleanup.yaml
new file mode 100644
index 0000000000..444ece8764
--- /dev/null
+++ b/packages/apps/harbor/templates/hooks/cleanup.yaml
@@ -0,0 +1,238 @@
+{{- $harborHost := .Values.host | default (printf "%s.%s" .Release.Name .Values._namespace.host) }}
+---
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: {{ .Release.Name }}-cleanup
+  labels:
+    app.kubernetes.io/instance: {{ .Release.Name }}
+  annotations:
+    "helm.sh/hook": post-delete
+    "helm.sh/hook-weight": "10"
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+spec:
+  # One retry — not the Kubernetes default of six, and not zero. Every delete
+  # below is idempotent and carries --ignore-not-found, so a second attempt
+  # re-issues an API call rather than re-running any logic, and one short
+  # backoff is what separates a transient apiserver error from a real one.
+  # That distinction is the whole point here: this hook's failures become
+  # visible for the first time with this change, and a signal that fires on
+  # noise stops being read — including on the day it is right. Six is the far
+  # end of the same mistake: the Job would spend about ten minutes backing off
+  # across seven pods, outlasting the hook timeout, and Helm would report that
+  # timeout instead of the hook's own error. Load-bearing only since the script
+  # gained a non-zero exit; before that the script could not report one.
+  backoffLimit: 1
+  activeDeadlineSeconds: 270
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/instance: {{ .Release.Name }}
+        policy.cozystack.io/allow-to-apiserver: "true"
+    spec:
+      serviceAccountName: {{ .Release.Name }}-cleanup
+      restartPolicy: Never
+      terminationGracePeriodSeconds: 10
+      securityContext:
+        runAsNonRoot: true
+        runAsUser: 65534
+        runAsGroup: 65534
+        seccompProfile:
+          type: RuntimeDefault
+      containers:
+        - name: cleanup
+          # Digest-pinned (immutable) and routed through the cluster images
+          # registry via cozy-lib.image, so mirrored / air-gapped installs
+          # resolve it and an upstream retag cannot change what runs at
+          # uninstall. The tag+digest is refreshed by the "clastix/kubectl"
+          # custom Renovate manager in .github/renovate.json (the helm-values
+          # manager is disabled repo-wide), so this pin does not silently age.
+          image: {{ include "cozy-lib.image" (list "clastix/kubectl:v1.32@sha256:b9ef7d8dbe65bcc81a46c09b8dc7543103055021c4f43287bf59e92a8f4fe05c" $) }}
+          securityContext:
+            allowPrivilegeEscalation: false
+            readOnlyRootFilesystem: true
+            capabilities:
+              drop: ["ALL"]
+          resources:
+            requests:
+              cpu: 10m
+              memory: 64Mi
+            limits:
+              cpu: 200m
+              memory: 128Mi
+          env:
+            - name: HOME
+              value: /tmp
+          command:
+            - /bin/sh
+            - -c
+            - |
+              set -u
+              # A delete that did not happen must reach Helm as a non-zero exit.
+              # Otherwise the hook-succeeded delete policy garbage-collects this
+              # Job and the pod that carried the only account of the failure, and
+              # an uninstall that left resources behind is indistinguishable from
+              # one that had nothing to reclaim. Failures are counted and the
+              # exit code is set at the end rather than with `set -e`, so a
+              # failure in the PVC sweep does not skip the ACME sweep below it.
+              # An object that is already gone is not a failure: every delete
+              # below passes --ignore-not-found, which exits 0 in that case, so
+              # re-running this hook over an already-clean namespace still
+              # succeeds. Cost: on failure the Job and its pods stay in the
+              # namespace, which is the point — they hold the log. Nothing
+              # collects them on its own: before-hook-creation deletes the
+              # previous copy only when this hook runs again, and a post-delete
+              # hook runs only on an uninstall. They stay until a release of
+              # this name is installed and uninstalled again, or until the
+              # namespace goes.
+              failures=0
+              fail() {
+                failures=$((failures + 1))
+                echo "ERROR: $*" >&2
+              }
+
+              # Harbor's jobservice and trivy PVCs are annotated with
+              # helm.sh/resource-policy: keep by the upstream subchart
+              # (persistence.resourcePolicy: keep), so Helm/Flux deliberately
+              # leave them behind on uninstall. The subchart runs as the
+              # "{{ .Release.Name }}-system" HelmRelease, so both PVCs carry the
+              # label release={{ .Release.Name }}-system: jobservice via the
+              # chart's "harbor.labels" helper, and trivy's StatefulSet PVC via
+              # "harbor.legacy.labels". We must select on "release" (not
+              # app.kubernetes.io/instance) because the trivy PVC does NOT carry
+              # app.kubernetes.io/instance, so an instance-label sweep would
+              # silently miss trivy (enabled by default). CNPG (db) and Redis
+              # PVCs use different label schemes and the registry is on S3, so
+              # this selector matches only those two kept PVCs.
+              echo "Deleting orphaned PVCs for {{ .Release.Name }}-system..."
+              kubectl delete pvc -n {{ .Release.Namespace }} \
+                -l release={{ .Release.Name }}-system --ignore-not-found --wait=true --timeout=120s \
+                || fail "failed to delete PVCs matching release={{ .Release.Name }}-system in {{ .Release.Namespace }}; orphaned PVCs may remain"
+
+              # Remove the cert-manager Certificate owned by this release's
+              # Ingress so an in-flight http01 challenge does not leave a
+              # dangling cm-acme-http-solver-* Pod/Service/Ingress behind.
+              # Deleting the release's Certificate (deterministic name
+              # "{{ .Release.Name }}-ingress-tls") triggers cert-manager to
+              # cascade-delete the Orders, Challenges and solver
+              # Pod/Service/Ingress objects it owns via owner references.
+              # We delete only the Certificate by name: Orders/Challenges have
+              # hash-suffixed names, so a by-name delete of those kinds would
+              # be a no-op (the host-scoped sweep below covers them instead).
+              # In Gateway mode no per-app Ingress or "-ingress-tls"
+              # Certificate is rendered, so this delete is simply a no-op there
+              # and the dnsName-scoped sweep below still handles http01.
+              echo "Deleting ACME Certificate for {{ .Release.Name }}-ingress..."
+              kubectl delete certificate -n {{ .Release.Namespace }} \
+                {{ .Release.Name }}-ingress-tls --ignore-not-found \
+                || fail "failed to delete Certificate {{ .Release.Namespace }}/{{ .Release.Name }}-ingress-tls; orphaned ACME resources may remain"
+
+              # Belt-and-braces sweep for ACME http01 solver objects that
+              # cert-manager may have orphaned (e.g. the Certificate was
+              # already gone, so deleting it above did not cascade). We scope
+              # STRICTLY to THIS release's TLS host ("$HOST") instead of a
+              # namespace-wide acme.cert-manager.io/http01-solver=true label
+              # sweep: a Cozystack tenant namespace can host many apps and
+              # cert-manager sets that label on every app's solver objects, so
+              # a blanket sweep would delete sibling apps' in-flight ACME
+              # challenge solvers. Filtering Challenges by .spec.dnsName and
+              # solver Ingresses by .spec.rules[0].host keeps us to objects
+              # issued for this release's single Harbor host only.
+              HOST="{{ $harborHost }}"
+              echo "Sweeping orphaned ACME http01 solvers for host $HOST..."
+              # Each listing is captured before it is iterated. Iterating
+              # $(kubectl get ...) directly cannot distinguish a failed listing
+              # from an empty one: both leave the loop with nothing to do, so a
+              # sweep that never got to look reads exactly like a sweep that
+              # found nothing to sweep. kubectl's own diagnostic is left on
+              # stderr for the same reason — it is the only account of why the
+              # listing failed.
+              if challenges=$(kubectl get challenge -n {{ .Release.Namespace }} \
+                -o jsonpath="{range .items[?(@.spec.dnsName=='$HOST')]}{.metadata.name} {end}"); then
+                for ch in $challenges; do
+                  kubectl delete challenge -n {{ .Release.Namespace }} "$ch" --ignore-not-found \
+                    || fail "failed to delete Challenge {{ .Release.Namespace }}/$ch for host $HOST; orphaned solver may remain"
+                done
+              else
+                fail "failed to list Challenges in {{ .Release.Namespace }} for host $HOST; orphaned ACME solvers may remain"
+              fi
+              if solvers=$(kubectl get ingress -n {{ .Release.Namespace }} \
+                -l acme.cert-manager.io/http01-solver=true \
+                -o jsonpath="{range .items[?(@.spec.rules[0].host=='$HOST')]}{.metadata.name} {end}"); then
+                for ing in $solvers; do
+                  kubectl delete ingress -n {{ .Release.Namespace }} "$ing" --ignore-not-found \
+                    || fail "failed to delete solver Ingress {{ .Release.Namespace }}/$ing for host $HOST; orphaned solver may remain"
+                done
+              else
+                fail "failed to list solver Ingresses in {{ .Release.Namespace }} for host $HOST; orphaned ACME solvers may remain"
+              fi
+
+              if [ "$failures" -ne 0 ]; then
+                echo "Cleanup FAILED for {{ .Release.Name }}: $failures operation(s) did not complete; see the errors above." >&2
+                exit 1
+              fi
+              echo "Cleanup complete."
+          volumeMounts:
+            - name: tmp
+              mountPath: /tmp
+      volumes:
+        - name: tmp
+          emptyDir: {}
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ .Release.Name }}-cleanup
+  labels:
+    app.kubernetes.io/instance: {{ .Release.Name }}
+  annotations:
+    "helm.sh/hook": post-delete
+    helm.sh/hook-weight: "0"
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: {{ .Release.Name }}-cleanup
+  labels:
+    app.kubernetes.io/instance: {{ .Release.Name }}
+  annotations:
+    "helm.sh/hook": post-delete
+    "helm.sh/hook-weight": "5"
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+rules:
+  - apiGroups: [""]
+    resources: ["persistentvolumeclaims"]
+    verbs: ["get", "list", "watch", "delete"]
+  - apiGroups: ["cert-manager.io"]
+    resources: ["certificates"]
+    verbs: ["get", "list", "watch", "delete"]
+  # Only Challenges are touched directly (the host-scoped sweep lists and
+  # deletes them); Orders are cascade-deleted by cert-manager itself when the
+  # Certificate is removed, so the hook needs no RBAC for them.
+  - apiGroups: ["acme.cert-manager.io"]
+    resources: ["challenges"]
+    verbs: ["get", "list", "watch", "delete"]
+  # We list ACME http01 solver Ingresses (filtered by this release's host)
+  # and delete the orphaned ones by name.
+  - apiGroups: ["networking.k8s.io"]
+    resources: ["ingresses"]
+    verbs: ["get", "list", "watch", "delete"]
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: {{ .Release.Name }}-cleanup
+  labels:
+    app.kubernetes.io/instance: {{ .Release.Name }}
+  annotations:
+    "helm.sh/hook": post-delete
+    helm.sh/hook-weight: "5"
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: {{ .Release.Name }}-cleanup
+subjects:
+  - kind: ServiceAccount
+    name: {{ .Release.Name }}-cleanup
diff --git a/packages/apps/harbor/templates/httproute.yaml b/packages/apps/harbor/templates/httproute.yaml
index 335d224d8f..4d32ea8285 100644
--- a/packages/apps/harbor/templates/httproute.yaml
+++ b/packages/apps/harbor/templates/httproute.yaml
@@ -1,7 +1,10 @@
 {{- $gateway := .Values._namespace.gateway | default "" }}
-{{- $host := .Values._namespace.host }}
+{{- $host := include "cozy-lib.ns-host-required" . }}
 {{- $harborHost := .Values.host | default (printf "%s.%s" .Release.Name $host) }}
 {{- if $gateway }}
+{{- if .Values.managementWhitelist }}
+{{- fail "managementWhitelist is enforced by ingress-nginx and has no effect on an HTTPRoute; clear it or publish this tenant through Ingress" }}
+{{- end }}
 apiVersion: gateway.networking.k8s.io/v1
 kind: HTTPRoute
 metadata:
diff --git a/packages/apps/harbor/templates/ingress.yaml b/packages/apps/harbor/templates/ingress.yaml
index a8ac6463e5..895a5b28d1 100644
--- a/packages/apps/harbor/templates/ingress.yaml
+++ b/packages/apps/harbor/templates/ingress.yaml
@@ -1,31 +1,59 @@
+{{- define "harbor.ingress.proxyAnnotations" -}}
+nginx.ingress.kubernetes.io/proxy-body-size: "0"
+nginx.ingress.kubernetes.io/proxy-read-timeout: "900"
+nginx.ingress.kubernetes.io/proxy-send-timeout: "900"
+nginx.ingress.kubernetes.io/ssl-redirect: "true"
+nginx.ingress.kubernetes.io/backend-protocol: "HTTP"
+{{- end }}
 {{- $ingress := .Values._namespace.ingress }}
 {{- $gateway := .Values._namespace.gateway | default "" }}
-{{- $host := .Values._namespace.host }}
+{{- $host := include "cozy-lib.ns-host-required" . }}
 {{- $harborHost := .Values.host | default (printf "%s.%s" .Release.Name $host) }}
 {{- $solver := (index .Values._cluster "solver") | default "http01" }}
 {{- $clusterIssuer := (index .Values._cluster "issuer-name") | default "letsencrypt-prod" }}
+{{- $wildcardSecret := (index .Values._cluster "wildcard-secret-name") | default "" }}
 {{- if not $gateway }}
+{{- /* ingress-nginx reads an empty whitelist-source-range as no annotation
+       and serves the portal to everyone, and one unparseable entry turns the
+       whole location into a 503. The values schema cannot validate list
+       items, so the check lives here. IPv6 is matched by character set only;
+       a malformed IPv6 entry still fails closed in the controller. */}}
+{{- $octet := "(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])" }}
+{{- $ipv4 := printf "^%s(\\.%s){3}(/(3[0-2]|[12]?[0-9]))?$" $octet $octet }}
+{{- $ipv6 := "^[0-9A-Fa-f.]*:[0-9A-Fa-f:.]*(/(12[0-8]|1[01][0-9]|[1-9]?[0-9]))?$" }}
+{{- range .Values.managementWhitelist }}
+{{- if not (or (regexMatch $ipv4 (toString .)) (regexMatch $ipv6 (toString .))) }}
+{{- fail (printf "managementWhitelist entry %q is not an IP address or CIDR range" (toString .)) }}
+{{- end }}
+{{- end }}
 ---
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: {{ .Release.Name }}-ingress
   annotations:
-    nginx.ingress.kubernetes.io/proxy-body-size: "0"
-    nginx.ingress.kubernetes.io/proxy-read-timeout: "900"
-    nginx.ingress.kubernetes.io/proxy-send-timeout: "900"
-    nginx.ingress.kubernetes.io/ssl-redirect: "true"
-    nginx.ingress.kubernetes.io/backend-protocol: "HTTP"
+    {{- include "harbor.ingress.proxyAnnotations" . | nindent 4 }}
+    {{- with .Values.managementWhitelist }}
+    nginx.ingress.kubernetes.io/whitelist-source-range: {{ join "," . | quote }}
+    {{- end }}
+    {{- /* Operator wildcard mode: nginx serves the default SSL cert, so skip per-host ACME. */}}
+    {{- if not $wildcardSecret }}
     {{- if eq $solver "http01" }}
     acme.cert-manager.io/http01-ingress-ingressclassname: {{ $ingress }}
     {{- end }}
     cert-manager.io/cluster-issuer: {{ $clusterIssuer }}
+    {{- end }}
 spec:
   ingressClassName: {{ $ingress }}
   tls:
     - hosts:
         - {{ $harborHost | quote }}
+      {{- /* Operator wildcard mode: no per-host secret — ingress-nginx falls
+             back to the default SSL certificate while the tls section keeps
+             the HTTP-to-HTTPS redirect enforced. */}}
+      {{- if not $wildcardSecret }}
       secretName: {{ .Release.Name }}-ingress-tls
+      {{- end }}
   rules:
     - host: {{ $harborHost | quote }}
       http:
@@ -37,4 +65,40 @@ spec:
                 name: {{ .Release.Name }}
                 port:
                   number: 80
+{{- /* whitelist-source-range is scoped to the locations of the Ingress that
+       carries it, so the registry API and its token endpoint stay open on a
+       second Ingress for the same host. /service/notifications is left behind
+       the whitelist: it only takes internal job callbacks. The certificate is
+       shared without the cert-manager annotations, otherwise ingress-shim
+       sees two owners for one Certificate. */}}
+{{- if .Values.managementWhitelist }}
+---
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: {{ .Release.Name }}-registry-ingress
+  annotations:
+    {{- include "harbor.ingress.proxyAnnotations" . | nindent 4 }}
+spec:
+  ingressClassName: {{ $ingress }}
+  tls:
+    - hosts:
+        - {{ $harborHost | quote }}
+      {{- if not $wildcardSecret }}
+      secretName: {{ .Release.Name }}-ingress-tls
+      {{- end }}
+  rules:
+    - host: {{ $harborHost | quote }}
+      http:
+        paths:
+          {{- range list "/v2" "/service/token" }}
+          - path: {{ . }}
+            pathType: Prefix
+            backend:
+              service:
+                name: {{ $.Release.Name }}
+                port:
+                  number: 80
+          {{- end }}
+{{- end }}
 {{- end }}
diff --git a/packages/apps/harbor/tests/cleanup_hook_test.yaml b/packages/apps/harbor/tests/cleanup_hook_test.yaml
new file mode 100644
index 0000000000..535380e5a1
--- /dev/null
+++ b/packages/apps/harbor/tests/cleanup_hook_test.yaml
@@ -0,0 +1,290 @@
+suite: harbor post-delete cleanup hook
+templates:
+  - templates/hooks/cleanup.yaml
+
+release:
+  name: harbor-test
+  namespace: tenant-root
+
+# The cleanup hook scopes its ACME solver sweep to this release's TLS host,
+# which defaults to "<release>.<_namespace.host>".
+#
+# The template renders a Job, a ServiceAccount, a Role and a RoleBinding, each
+# unique by kind, so every test names the one it wants instead of counting
+# positions. Document indices are assigned in template source order rather than
+# the kind-sorted order `helm template` prints, which makes them easy to get
+# wrong by reading the rendered output, and a document added ahead silently
+# shifts every later index onto the wrong object.
+set:
+  _namespace:
+    host: example.org
+
+tests:
+  - it: renders the cleanup Job as a post-delete hook
+    documentSelector:
+      path: kind
+      value: Job
+    asserts:
+      - equal:
+          path: kind
+          value: Job
+      - equal:
+          path: metadata.name
+          value: harbor-test-cleanup
+      - equal:
+          path: metadata.annotations["helm.sh/hook"]
+          value: post-delete
+      - equal:
+          path: spec.template.spec.serviceAccountName
+          value: harbor-test-cleanup
+      # The script exits non-zero when a delete or a listing failed, so the Job
+      # can now fail. Under the Kubernetes default of 6 it would back off across
+      # seven pods for about ten minutes and outlast the hook timeout, and Helm
+      # would report that timeout instead of the hook's own error.
+      - equal:
+          path: spec.backoffLimit
+          value: 1
+      # Pinned exactly, because the whole point of the non-zero exit is that the
+      # failed Job survives to be read. Adding hook-failed here hands the Job
+      # straight back to Helm to delete on failure, destroying the only account
+      # of what was left behind — and until this assert existed, that one-line
+      # reversal left this chart's whole suite green, because nothing else here
+      # read the annotation.
+      - equal:
+          path: metadata.annotations["helm.sh/hook-delete-policy"]
+          value: before-hook-creation,hook-succeeded
+
+  - it: targets both kept PVCs (jobservice + trivy) via the shared release label and ACME objects
+    documentSelector:
+      path: kind
+      value: Job
+    asserts:
+      # The upstream Harbor subchart runs as the "<release>-system"
+      # HelmRelease. Its kept PVCs must be selected by release=<release>-system:
+      # jobservice carries it via "harbor.labels", and trivy's StatefulSet PVC
+      # carries it via "harbor.legacy.labels". The trivy PVC does NOT carry
+      # app.kubernetes.io/instance, so selecting on that label would silently
+      # miss trivy (which is enabled by default).
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: kubectl delete pvc[\s\S]*-l release=harbor-test-system
+      # Guard against regressing to the instance label, which misses trivy.
+      - notMatchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: app.kubernetes.io/instance=harbor-test-system
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: harbor-test-ingress-tls
+
+  - it: scopes the ACME solver sweep to this release's TLS host
+    documentSelector:
+      path: kind
+      value: Job
+    asserts:
+      # The solver sweep must be scoped to this release's host, not a
+      # namespace-wide label sweep, so sibling apps' in-flight challenges in
+      # the shared tenant namespace are never touched.
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: HOST="harbor-test\.example\.org"
+      # Challenges are filtered by .spec.dnsName == $HOST.
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: \@\.spec\.dnsName==.\$HOST
+      # Solver Ingresses are filtered by .spec.rules[0].host == $HOST.
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: \@\.spec\.rules\[0\]\.host==.\$HOST
+      # There must be NO namespace-wide blanket delete that targets every
+      # object carrying the http01-solver label. The label may still appear
+      # in the scoped `kubectl get ingress -l ...` selector, but it must
+      # never be used in a `kubectl delete` against the whole namespace.
+      - notMatchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: kubectl delete[^\n]*-l acme.cert-manager.io/http01-solver=true
+
+  - it: bounds the cleanup Job so a claim that will not go cannot hang the uninstall
+    documentSelector:
+      path: kind
+      value: Job
+    asserts:
+      - equal:
+          path: spec.activeDeadlineSeconds
+          value: 270
+      - equal:
+          path: spec.template.spec.terminationGracePeriodSeconds
+          value: 10
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: '-l release=harbor-test-system --ignore-not-found --wait=true --timeout=120s'
+      - notMatchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: '--request-timeout='
+
+  - it: pins the cleanup image by digest and routes it through the images registry
+    documentSelector:
+      path: kind
+      value: Job
+    asserts:
+      # The image must be digest-pinned (immutable) rather than a moving tag,
+      # and must NOT hardcode docker.io so a mirrored/air-gapped registry can be
+      # prefixed via cozy-lib.image. Asserted by pattern (not an exact digest)
+      # so a Renovate tag/digest bump does not break the test.
+      - matchRegex:
+          path: spec.template.spec.containers[0].image
+          pattern: ^clastix/kubectl:v[0-9]+\.[0-9]+(\.[0-9]+)?@sha256:[0-9a-f]{64}$
+      - notMatchRegex:
+          path: spec.template.spec.containers[0].image
+          pattern: docker\.io
+
+  - it: prefixes the cleanup image with the cluster images registry when set
+    documentSelector:
+      path: kind
+      value: Job
+    set:
+      _cluster:
+        images-registry: registry.example.com
+    asserts:
+      # A mirrored / air-gapped install resolves the image from the internal
+      # registry; the digest pin is preserved.
+      - matchRegex:
+          path: spec.template.spec.containers[0].image
+          pattern: ^registry\.example\.com/clastix/kubectl:v[0-9]+\.[0-9]+(\.[0-9]+)?@sha256:[0-9a-f]{64}$
+
+  - it: leaves no leading slash when the images registry is empty (default)
+    documentSelector:
+      path: kind
+      value: Job
+    asserts:
+      # With images-registry defaulting to "", the rendered ref must still be a
+      # valid image reference (no leading "/") so a standard install resolves it.
+      # The "^clastix" anchor proves there is no leading slash and no registry.
+      - matchRegex:
+          path: spec.template.spec.containers[0].image
+          pattern: ^clastix/kubectl:v[0-9]+\.[0-9]+(\.[0-9]+)?@sha256:[0-9a-f]{64}$
+      - notMatchRegex:
+          path: spec.template.spec.containers[0].image
+          pattern: ^/
+
+  - it: does not emit a double slash when the images registry has a trailing slash
+    documentSelector:
+      path: kind
+      value: Job
+    set:
+      _cluster:
+        images-registry: registry.example.com/
+    asserts:
+      # A misconfigured registry with a trailing "/" must not yield
+      # "registry.example.com//clastix/..." — the helper trims it.
+      - matchRegex:
+          path: spec.template.spec.containers[0].image
+          pattern: ^registry\.example\.com/clastix/kubectl:v[0-9]+\.[0-9]+(\.[0-9]+)?@sha256:[0-9a-f]{64}$
+      - notMatchRegex:
+          path: spec.template.spec.containers[0].image
+          pattern: //
+
+  - it: sets resource requests and limits on the cleanup container
+    documentSelector:
+      path: kind
+      value: Job
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].resources.requests.cpu
+          value: 10m
+      - equal:
+          path: spec.template.spec.containers[0].resources.requests.memory
+          value: 64Mi
+      - equal:
+          path: spec.template.spec.containers[0].resources.limits.cpu
+          value: 200m
+      - equal:
+          path: spec.template.spec.containers[0].resources.limits.memory
+          value: 128Mi
+
+  - it: creates a ServiceAccount for the cleanup job
+    documentSelector:
+      path: kind
+      value: ServiceAccount
+    asserts:
+      - equal:
+          path: kind
+          value: ServiceAccount
+      - equal:
+          path: metadata.name
+          value: harbor-test-cleanup
+
+  - it: grants RBAC for PVCs and cert-manager ACME resources
+    documentSelector:
+      path: kind
+      value: Role
+    asserts:
+      - equal:
+          path: kind
+          value: Role
+      - equal:
+          path: metadata.name
+          value: harbor-test-cleanup
+      - contains:
+          path: rules
+          content:
+            apiGroups: [""]
+            resources: ["persistentvolumeclaims"]
+            verbs: ["get", "list", "watch", "delete"]
+      - contains:
+          path: rules
+          content:
+            apiGroups: ["cert-manager.io"]
+            resources: ["certificates"]
+            verbs: ["get", "list", "watch", "delete"]
+      # Only "challenges" are granted: the host-scoped sweep lists/deletes
+      # them, while Orders are cascade-deleted by cert-manager itself when the
+      # Certificate is removed, so the hook needs no RBAC for orders.
+      - contains:
+          path: rules
+          content:
+            apiGroups: ["acme.cert-manager.io"]
+            resources: ["challenges"]
+            verbs: ["get", "list", "watch", "delete"]
+      - notContains:
+          path: rules
+          content:
+            apiGroups: ["acme.cert-manager.io"]
+            resources: ["orders", "challenges"]
+            verbs: ["get", "list", "watch", "delete"]
+      # We list+delete orphaned http01 solver Ingresses by name, so we need
+      # get/list/delete on networking.k8s.io ingresses.
+      - contains:
+          path: rules
+          content:
+            apiGroups: ["networking.k8s.io"]
+            resources: ["ingresses"]
+            verbs: ["get", "list", "watch", "delete"]
+      # The hook must not grant services/pods: solver Pods/Services cascade
+      # from the Challenge/Certificate and are never deleted directly.
+      - notContains:
+          path: rules
+          content:
+            apiGroups: [""]
+            resources: ["services"]
+            verbs: ["get", "list", "watch", "delete"]
+      - notContains:
+          path: rules
+          content:
+            apiGroups: [""]
+            resources: ["pods"]
+            verbs: ["get", "list", "watch", "delete"]
+
+  - it: binds the Role to the cleanup ServiceAccount
+    documentSelector:
+      path: kind
+      value: RoleBinding
+    asserts:
+      - equal:
+          path: kind
+          value: RoleBinding
+      - equal:
+          path: roleRef.name
+          value: harbor-test-cleanup
+      - equal:
+          path: subjects[0].name
+          value: harbor-test-cleanup
diff --git a/packages/apps/harbor/tests/host_guard_harbor_cr_test.yaml b/packages/apps/harbor/tests/host_guard_harbor_cr_test.yaml
new file mode 100644
index 0000000000..c1022c061e
--- /dev/null
+++ b/packages/apps/harbor/tests/host_guard_harbor_cr_test.yaml
@@ -0,0 +1,39 @@
+suite: harbor CR (harbor.yaml) guards an empty apex in isolation
+templates:
+  - templates/harbor.yaml
+
+release:
+  name: harbor
+  namespace: tenant-root
+
+# Isolated to templates/harbor.yaml so reverting its own guard reddens this
+# suite even though sibling templates guard the same apex.
+
+tests:
+  - it: fails when _namespace is injected with an empty host and no host override
+    set:
+      _namespace:
+        host: ""
+        ingress: tenant-root
+      _cluster:
+        issuer-name: letsencrypt-prod
+        solver: http01
+    asserts:
+      - failedTemplate:
+          errorMessage: "the tenant apex (_namespace.host) is empty and this app sets no host override, so its ingress hostname would be malformed. Set tenant.spec.host on this tenant, inherit it from a parent that has host set, or set this app's host value."
+
+  - it: renders the credentials Secret URL from the apex when it is set
+    set:
+      _namespace:
+        host: example.org
+        ingress: tenant-root
+      _cluster:
+        issuer-name: letsencrypt-prod
+        solver: http01
+    documentSelector:
+      path: kind
+      value: Secret
+    asserts:
+      - equal:
+          path: stringData.url
+          value: https://harbor.example.org
diff --git a/packages/apps/harbor/tests/host_guard_httproute_test.yaml b/packages/apps/harbor/tests/host_guard_httproute_test.yaml
new file mode 100644
index 0000000000..76f8119cf2
--- /dev/null
+++ b/packages/apps/harbor/tests/host_guard_httproute_test.yaml
@@ -0,0 +1,29 @@
+suite: harbor HTTPRoute guards an empty apex in isolation
+templates:
+  - templates/httproute.yaml
+
+release:
+  name: harbor
+  namespace: tenant-root
+
+tests:
+  - it: fails when _namespace is injected with an empty host and no host override
+    set:
+      _namespace:
+        host: ""
+        ingress: tenant-root
+        gateway: tenant-root
+    asserts:
+      - failedTemplate:
+          errorMessage: "the tenant apex (_namespace.host) is empty and this app sets no host override, so its ingress hostname would be malformed. Set tenant.spec.host on this tenant, inherit it from a parent that has host set, or set this app's host value."
+
+  - it: renders the HTTPRoute hostname from the apex when it is set
+    set:
+      _namespace:
+        host: example.org
+        ingress: tenant-root
+        gateway: tenant-root
+    asserts:
+      - equal:
+          path: spec.hostnames[0]
+          value: harbor.example.org
diff --git a/packages/apps/harbor/tests/host_guard_test.yaml b/packages/apps/harbor/tests/host_guard_test.yaml
new file mode 100644
index 0000000000..5a90ca65bf
--- /dev/null
+++ b/packages/apps/harbor/tests/host_guard_test.yaml
@@ -0,0 +1,55 @@
+suite: harbor fails to render its ingress when the tenant apex is empty
+templates:
+  - templates/ingress.yaml
+
+release:
+  name: harbor
+  namespace: tenant-root
+
+# harbor composes its public hostname as <release>.<_namespace.host>. When the
+# tenant apex is empty and no per-app host override is set, that used to emit a
+# malformed "harbor." host silently. cozy-lib.ns-host-required now fails the
+# render instead. Rendering with a valid apex must still succeed.
+
+tests:
+  - it: fails when _namespace.host is empty and no host override is set
+    set:
+      _namespace:
+        host: ""
+        ingress: tenant-root
+        gateway: ""
+      _cluster:
+        issuer-name: letsencrypt-prod
+        solver: http01
+    asserts:
+      - failedTemplate:
+          errorMessage: "the tenant apex (_namespace.host) is empty and this app sets no host override, so its ingress hostname would be malformed. Set tenant.spec.host on this tenant, inherit it from a parent that has host set, or set this app's host value."
+
+  - it: renders when a host override is set even though the apex is empty
+    set:
+      host: harbor.custom.example
+      _namespace:
+        host: ""
+        ingress: tenant-root
+        gateway: ""
+      _cluster:
+        issuer-name: letsencrypt-prod
+        solver: http01
+    asserts:
+      - equal:
+          path: spec.rules[0].host
+          value: harbor.custom.example
+
+  - it: renders normally when the apex is set
+    set:
+      _namespace:
+        host: example.org
+        ingress: tenant-root
+        gateway: ""
+      _cluster:
+        issuer-name: letsencrypt-prod
+        solver: http01
+    asserts:
+      - equal:
+          path: spec.rules[0].host
+          value: harbor.example.org
diff --git a/packages/apps/harbor/tests/ingress_management_whitelist_test.yaml b/packages/apps/harbor/tests/ingress_management_whitelist_test.yaml
new file mode 100644
index 0000000000..b5d14fd7ed
--- /dev/null
+++ b/packages/apps/harbor/tests/ingress_management_whitelist_test.yaml
@@ -0,0 +1,273 @@
+suite: harbor managementWhitelist restricts everything but the registry paths
+templates:
+  - templates/ingress.yaml
+  - templates/httproute.yaml
+  - templates/dashboard-resourcemap.yaml
+
+release:
+  name: harbor
+  namespace: tenant-root
+
+set:
+  _namespace:
+    host: example.org
+    ingress: tenant-root
+    gateway: ""
+  _cluster:
+    issuer-name: letsencrypt-prod
+    solver: http01
+
+tests:
+  - it: renders the single Ingress unchanged when the list is empty
+    template: templates/ingress.yaml
+    asserts:
+      - hasDocuments:
+          count: 1
+      - equal:
+          path: metadata
+          value:
+            name: harbor-ingress
+            annotations:
+              nginx.ingress.kubernetes.io/proxy-body-size: "0"
+              nginx.ingress.kubernetes.io/proxy-read-timeout: "900"
+              nginx.ingress.kubernetes.io/proxy-send-timeout: "900"
+              nginx.ingress.kubernetes.io/ssl-redirect: "true"
+              nginx.ingress.kubernetes.io/backend-protocol: "HTTP"
+              acme.cert-manager.io/http01-ingress-ingressclassname: tenant-root
+              cert-manager.io/cluster-issuer: letsencrypt-prod
+      - equal:
+          path: spec
+          value:
+            ingressClassName: tenant-root
+            tls:
+              - hosts:
+                  - harbor.example.org
+                secretName: harbor-ingress-tls
+            rules:
+              - host: harbor.example.org
+                http:
+                  paths:
+                    - path: /
+                      pathType: Prefix
+                      backend:
+                        service:
+                          name: harbor
+                          port:
+                            number: 80
+
+  - it: splits into a management and a registry Ingress when the list is set
+    template: templates/ingress.yaml
+    set:
+      managementWhitelist:
+        - 192.0.2.0/24
+    asserts:
+      - hasDocuments:
+          count: 2
+
+  - it: restricts the management Ingress to the listed ranges
+    template: templates/ingress.yaml
+    documentSelector:
+      path: metadata.name
+      value: harbor-ingress
+    set:
+      managementWhitelist:
+        - 192.0.2.0/24
+        - 198.51.100.7/32
+    asserts:
+      - equal:
+          path: metadata.annotations["nginx.ingress.kubernetes.io/whitelist-source-range"]
+          value: 192.0.2.0/24,198.51.100.7/32
+      - equal:
+          path: metadata.annotations["cert-manager.io/cluster-issuer"]
+          value: letsencrypt-prod
+      - equal:
+          path: spec.rules[0].http.paths
+          value:
+            - path: /
+              pathType: Prefix
+              backend:
+                service:
+                  name: harbor
+                  port:
+                    number: 80
+
+  - it: accepts bare addresses and ranges of both families
+    template: templates/ingress.yaml
+    documentSelector:
+      path: metadata.name
+      value: harbor-ingress
+    set:
+      managementWhitelist:
+        - 203.0.113.9
+        - 0.0.0.0/0
+        - 2001:db8::1
+        - 2001:db8::/32
+        - ::ffff:192.0.2.1/128
+    asserts:
+      - equal:
+          path: metadata.annotations["nginx.ingress.kubernetes.io/whitelist-source-range"]
+          value: 203.0.113.9,0.0.0.0/0,2001:db8::1,2001:db8::/32,::ffff:192.0.2.1/128
+
+  - it: refuses an empty entry, which ingress-nginx would read as no restriction
+    template: templates/ingress.yaml
+    set:
+      managementWhitelist:
+        - ""
+    asserts:
+      - failedTemplate:
+          errorPattern: 'managementWhitelist entry "" is not an IP address or CIDR range'
+
+  - it: refuses a whitespace-only entry
+    template: templates/ingress.yaml
+    set:
+      managementWhitelist:
+        - " "
+    asserts:
+      - failedTemplate:
+          errorPattern: 'managementWhitelist entry " " is not'
+
+  - it: refuses a prefix length out of range
+    template: templates/ingress.yaml
+    set:
+      managementWhitelist:
+        - 10.0.0.0/99
+    asserts:
+      - failedTemplate:
+          errorPattern: 'managementWhitelist entry "10.0.0.0/99" is not'
+
+  - it: refuses an IPv4 octet out of range
+    template: templates/ingress.yaml
+    set:
+      managementWhitelist:
+        - 192.0.2.256
+    asserts:
+      - failedTemplate:
+          errorPattern: 'managementWhitelist entry "192.0.2.256" is not'
+
+  - it: refuses a hostname
+    template: templates/ingress.yaml
+    set:
+      managementWhitelist:
+        - not-an-ip
+    asserts:
+      - failedTemplate:
+          errorPattern: 'managementWhitelist entry "not-an-ip" is not'
+
+  - it: refuses two ranges packed into one entry
+    template: templates/ingress.yaml
+    set:
+      managementWhitelist:
+        - 192.0.2.0/24,198.51.100.0/24
+    asserts:
+      - failedTemplate:
+          errorPattern: 'managementWhitelist entry "192.0.2.0/24,198.51.100.0/24" is not'
+
+  - it: refuses a bad entry mixed with good ones
+    template: templates/ingress.yaml
+    set:
+      managementWhitelist:
+        - 192.0.2.0/24
+        - 2001:db8::/129
+    asserts:
+      - failedTemplate:
+          errorPattern: 'managementWhitelist entry "2001:db8::/129" is not'
+
+  - it: serves the registry API and token endpoint from an unrestricted Ingress on the same host and certificate
+    template: templates/ingress.yaml
+    documentSelector:
+      path: metadata.name
+      value: harbor-registry-ingress
+    set:
+      managementWhitelist:
+        - 192.0.2.0/24
+    asserts:
+      - equal:
+          path: metadata.annotations
+          value:
+            nginx.ingress.kubernetes.io/proxy-body-size: "0"
+            nginx.ingress.kubernetes.io/proxy-read-timeout: "900"
+            nginx.ingress.kubernetes.io/proxy-send-timeout: "900"
+            nginx.ingress.kubernetes.io/ssl-redirect: "true"
+            nginx.ingress.kubernetes.io/backend-protocol: "HTTP"
+      - equal:
+          path: spec
+          value:
+            ingressClassName: tenant-root
+            tls:
+              - hosts:
+                  - harbor.example.org
+                secretName: harbor-ingress-tls
+            rules:
+              - host: harbor.example.org
+                http:
+                  paths:
+                    - path: /v2
+                      pathType: Prefix
+                      backend:
+                        service:
+                          name: harbor
+                          port:
+                            number: 80
+                    - path: /service/token
+                      pathType: Prefix
+                      backend:
+                        service:
+                          name: harbor
+                          port:
+                            number: 80
+
+  - it: leaves the registry Ingress without a secretName in wildcard mode
+    template: templates/ingress.yaml
+    documentSelector:
+      path: metadata.name
+      value: harbor-registry-ingress
+    set:
+      managementWhitelist:
+        - 192.0.2.0/24
+      _cluster:
+        wildcard-secret-name: wildcard-tls
+    asserts:
+      - equal:
+          path: spec.tls
+          value:
+            - hosts:
+                - harbor.example.org
+
+  - it: refuses a whitelist in Gateway API mode instead of dropping it
+    template: templates/httproute.yaml
+    set:
+      managementWhitelist:
+        - 192.0.2.0/24
+      _namespace:
+        gateway: tenant-root
+    asserts:
+      - failedTemplate:
+          errorPattern: managementWhitelist
+
+  - it: renders the HTTPRoute in Gateway API mode without a whitelist
+    template: templates/httproute.yaml
+    set:
+      _namespace:
+        gateway: tenant-root
+    asserts:
+      - equal:
+          path: kind
+          value: HTTPRoute
+
+  - it: lets the dashboard read both Ingress objects
+    template: templates/dashboard-resourcemap.yaml
+    documentSelector:
+      path: kind
+      value: Role
+    asserts:
+      - contains:
+          path: rules
+          content:
+            apiGroups:
+              - networking.k8s.io
+            resources:
+              - ingresses
+            resourceNames:
+              - harbor-ingress
+              - harbor-registry-ingress
+            verbs: ["get", "list", "watch"]
diff --git a/packages/apps/harbor/tests/ingress_wildcard_test.yaml b/packages/apps/harbor/tests/ingress_wildcard_test.yaml
new file mode 100644
index 0000000000..aa73013ca3
--- /dev/null
+++ b/packages/apps/harbor/tests/ingress_wildcard_test.yaml
@@ -0,0 +1,53 @@
+suite: harbor ingress wildcard mode drops per-host ACME
+templates:
+  - templates/ingress.yaml
+
+release:
+  name: harbor
+  namespace: tenant-root
+
+# harbor gates its Ingress on an empty _namespace.gateway. In wildcard
+# mode the cert-manager + http01 annotations and the per-host tls
+# secretName are dropped (the tls section stays so the HTTPS redirect
+# keeps working against the default SSL certificate); the other nginx
+# annotations stay.
+
+tests:
+  - it: drops cert-manager annotation and tls secretName when wildcard secret is set
+    set:
+      _namespace:
+        host: example.org
+        ingress: tenant-root
+        gateway: ""
+      _cluster:
+        issuer-name: letsencrypt-prod
+        solver: http01
+        wildcard-secret-name: wildcard-tls
+    asserts:
+      - equal:
+          path: kind
+          value: Ingress
+      - notExists:
+          path: metadata.annotations["cert-manager.io/cluster-issuer"]
+      - exists:
+          path: spec.tls
+      - notExists:
+          path: spec.tls[0].secretName
+      - exists:
+          path: metadata.annotations["nginx.ingress.kubernetes.io/proxy-body-size"]
+
+  - it: keeps cert-manager annotation and tls secretName without wildcard secret
+    set:
+      _namespace:
+        host: example.org
+        ingress: tenant-root
+        gateway: ""
+      _cluster:
+        issuer-name: letsencrypt-prod
+        solver: http01
+    asserts:
+      - equal:
+          path: metadata.annotations["cert-manager.io/cluster-issuer"]
+          value: letsencrypt-prod
+      - exists:
+          path: spec.tls[0].secretName
diff --git a/packages/apps/harbor/tests/install_retry_test.yaml b/packages/apps/harbor/tests/install_retry_test.yaml
new file mode 100644
index 0000000000..703e626bd1
--- /dev/null
+++ b/packages/apps/harbor/tests/install_retry_test.yaml
@@ -0,0 +1,76 @@
+suite: nested system HelmRelease install retry strategy
+
+release:
+  name: harbor
+  namespace: tenant-test
+
+# helm-unittest renders every template in the chart, so the platform-injected
+# globals consumed by the ingress/httproute/bucket templates must be supplied
+# even though only templates/harbor.yaml is asserted on.
+set:
+  _namespace:
+    host: example.org
+    ingress: nginx
+    gateway: ""
+    seaweedfs: seaweedfs
+  _cluster:
+    solver: http01
+
+# templates/harbor.yaml renders a Secret, this HelmRelease and three
+# WorkloadMonitors, so the release is selected by kind rather than by document
+# index: a template gaining a document ahead of it moves the index onto another
+# object, and these asserts would then red for a reason that has nothing to do
+# with the strategy they exist to pin. The selector names what it wants, so it
+# keeps pointing at the release wherever the release ends up, and a selector
+# that matches nothing fails loudly rather than quietly matching the wrong
+# document.
+tests:
+  # The workload lives in this nested release: the harbor Deployments, the
+  # inline RedisFailover and its PVC. Install remediation is an uninstall in
+  # every case Flux offers, so under the default strategy an install that goes
+  # over budget deletes all of it, and the next attempt re-provisions the redis
+  # volume and re-runs the master election from zero.
+  - it: retries a failed install instead of uninstalling the harbor workload
+    template: templates/harbor.yaml
+    documentSelector:
+      path: kind
+      value: HelmRelease
+    asserts:
+      - equal:
+          path: spec.install.strategy.name
+          value: RetryOnFailure
+      - equal:
+          path: spec.install.strategy.retryInterval
+          value: 30s
+
+  # The controller performs the retry of a failed install as an upgrade, so
+  # without a strategy here that retry's own failure falls through to upgrade
+  # remediation instead of retrying again.
+  - it: carries the strategy on the upgrade action the retry runs as
+    template: templates/harbor.yaml
+    documentSelector:
+      path: kind
+      value: HelmRelease
+    asserts:
+      - equal:
+          path: spec.upgrade.strategy.name
+          value: RetryOnFailure
+      - equal:
+          path: spec.upgrade.strategy.retryInterval
+          value: 30s
+
+  # The strategy governs a failed release. An absent release and an out-of-sync
+  # one take different branches, which consult the retry count instead and stop
+  # acting once it is exhausted.
+  - it: keeps unlimited retries for the branches the strategy does not reach
+    template: templates/harbor.yaml
+    documentSelector:
+      path: kind
+      value: HelmRelease
+    asserts:
+      - equal:
+          path: spec.install.remediation.retries
+          value: -1
+      - equal:
+          path: spec.upgrade.remediation.retries
+          value: -1
diff --git a/packages/apps/harbor/tests/jobservice_storageclass_test.yaml b/packages/apps/harbor/tests/jobservice_storageclass_test.yaml
new file mode 100644
index 0000000000..293ef9cddc
--- /dev/null
+++ b/packages/apps/harbor/tests/jobservice_storageclass_test.yaml
@@ -0,0 +1,76 @@
+suite: jobservice storageClass propagation
+
+release:
+  name: harbor
+  namespace: tenant-test
+
+# Regression test for issue #2368: the jobservice PVC must receive the
+# configured storageClass so it is created with an explicit storageClassName
+# instead of relying on the default-StorageClass admission. Because PVC
+# storageClassName is immutable, the template preserves an existing PVC's
+# class when one is found; under `helm template`/unittest the cluster lookup
+# returns empty, so these cases exercise the fresh-install fallback path.
+#
+# The rendered HelmRelease carries the values that the cozy-harbor chart forwards
+# to the upstream harbor subchart. templates/harbor.yaml also renders a Secret and
+# three WorkloadMonitors, so the release is selected by kind rather than by
+# document index: a template gaining a document ahead of it moves the index onto
+# another object, and a selector that matches nothing fails loudly instead of
+# quietly asserting against the wrong document.
+# helm-unittest renders every template in the chart, so the platform-injected
+# globals consumed by the ingress/httproute/bucket templates must be supplied
+# even though only templates/harbor.yaml is asserted on.
+set:
+  _namespace:
+    host: example.org
+    ingress: nginx
+    gateway: ""
+    seaweedfs: seaweedfs
+  _cluster:
+    solver: http01
+
+tests:
+  - it: forwards storageClass to jobservice jobLog on a fresh install
+    template: templates/harbor.yaml
+    documentSelector:
+      path: kind
+      value: HelmRelease
+    set:
+      storageClass: local-3rep
+    asserts:
+      - equal:
+          path: spec.values.harbor.persistence.persistentVolumeClaim.jobservice.jobLog.storageClass
+          value: local-3rep
+
+  - it: still forwards storageClass to trivy alongside jobservice
+    template: templates/harbor.yaml
+    documentSelector:
+      path: kind
+      value: HelmRelease
+    set:
+      storageClass: local-3rep
+    asserts:
+      - equal:
+          path: spec.values.harbor.persistence.persistentVolumeClaim.trivy.storageClass
+          value: local-3rep
+
+  - it: omits the jobservice block when storageClass is unset
+    template: templates/harbor.yaml
+    documentSelector:
+      path: kind
+      value: HelmRelease
+    asserts:
+      - notExists:
+          path: spec.values.harbor.persistence.persistentVolumeClaim.jobservice
+
+  - it: emits no persistentVolumeClaim block when storageClass is unset and trivy is disabled
+    template: templates/harbor.yaml
+    documentSelector:
+      path: kind
+      value: HelmRelease
+    set:
+      trivy:
+        enabled: false
+    asserts:
+      - notExists:
+          path: spec.values.harbor.persistence.persistentVolumeClaim
diff --git a/packages/apps/harbor/values.schema.json b/packages/apps/harbor/values.schema.json
index 47f1794792..5427370ecd 100644
--- a/packages/apps/harbor/values.schema.json
+++ b/packages/apps/harbor/values.schema.json
@@ -7,6 +7,14 @@
       "type": "string",
       "default": ""
     },
+    "managementWhitelist": {
+      "description": "IP addresses or CIDR ranges allowed to reach the Harbor web portal and API. `/v2/` and `/service/token`, which `docker login`, image pulls and pushes use, are not restricted by this list. For the portal and API it replaces the tenant ingress `whitelist` rather than narrowing it, and it is matched against the client address the ingress controller sees, which is a proxy or a forwarded header rather than the real client when something in front of the controller rewrites it. Empty allows every address. Requires Ingress publishing; rejected when the tenant publishes through Gateway API.",
+      "type": "array",
+      "default": [],
+      "items": {
+        "type": "string"
+      }
+    },
     "storageClass": {
       "description": "StorageClass used to store the data.",
       "type": "string",
@@ -16,7 +24,10 @@
           "rule": "self == oldSelf",
           "message": "storageClass is immutable"
         }
-      ]
+      ],
+      "x-cozystack-options": {
+        "source": "storageclass"
+      }
     },
     "core": {
       "description": "Core API server configuration.",
diff --git a/packages/apps/harbor/values.yaml b/packages/apps/harbor/values.yaml
index db23fbcf98..364871884b 100644
--- a/packages/apps/harbor/values.yaml
+++ b/packages/apps/harbor/values.yaml
@@ -5,8 +5,12 @@
 ## @param {string} [host] - Hostname for external access to Harbor (defaults to 'harbor' subdomain for the tenant host).
 host: ""
 
+## @param {[]string} [managementWhitelist] - IP addresses or CIDR ranges allowed to reach the Harbor web portal and API. `/v2/` and `/service/token`, which `docker login`, image pulls and pushes use, are not restricted by this list. For the portal and API it replaces the tenant ingress `whitelist` rather than narrowing it, and it is matched against the client address the ingress controller sees, which is a proxy or a forwarded header rather than the real client when something in front of the controller rewrites it. Empty allows every address. Requires Ingress publishing; rejected when the tenant publishes through Gateway API.
+managementWhitelist: []
+
 ## @param {string} storageClass - StorageClass used to store the data.
 ## @immutable
+## @x-cozystack-options {source: storageclass}
 storageClass: ""
 
 ##
diff --git a/packages/apps/http-cache/Chart.yaml b/packages/apps/http-cache/Chart.yaml
deleted file mode 100644
index bbd4f3a281..0000000000
--- a/packages/apps/http-cache/Chart.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-apiVersion: v2
-name: http-cache
-description: Layer7 load balancer and caching service
-icon: /logos/nginx.svg
-type: application
-version: 0.0.0 # Placeholder, the actual version will be automatically set during the build process
-appVersion: "1.25.3"
diff --git a/packages/apps/http-cache/Makefile b/packages/apps/http-cache/Makefile
deleted file mode 100644
index 2d401cf78d..0000000000
--- a/packages/apps/http-cache/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-NGINX_CACHE_TAG = $(shell awk '$$1 == "version:" {print $$2}' Chart.yaml)
-
-include ../../../hack/common-envs.mk
-include ../../../hack/package.mk
-
-image: image-nginx
-
-image-nginx:
-	docker buildx build images/nginx-cache \
-		$(call image-tags,nginx-cache,$(NGINX_CACHE_TAG)) \
-		--cache-from type=registry,ref=$(REGISTRY)/nginx-cache:latest \
-		--cache-to type=inline \
-		--metadata-file images/nginx-cache.json \
-		$(BUILDX_ARGS)
-	echo "$(REGISTRY)/nginx-cache:$(IMAGE_TAG)@$$(yq e '."containerimage.digest"' images/nginx-cache.json -o json -r)" \
-		> images/nginx-cache.tag
-	rm -f images/nginx-cache.json
-
-generate:
-	cozyvalues-gen -m 'httpcache' -v values.yaml -s values.schema.json -r README.md -g ../../../api/apps/v1alpha1/httpcache/types.go
-	../../../hack/update-crd.sh
-
-update:
-	tag=$$(git ls-remote --tags --sort="v:refname" https://github.com/chrislim2888/IP2Location-C-Library | awk -F'[/^]' 'END{print $$3}') && \
-	sed -i "/^ARG IP2LOCATION_C_VERSION=/ s/=.*/=$$tag/" images/nginx/Dockerfile
-	tag=$$(git ls-remote --tags --sort="v:refname" https://github.com/ip2location/ip2proxy-c | awk -F'[/^]' 'END{print $$3}') && \
-	sed -i "/^ARG IP2PROXY_C_VERSION=/ s/=.*/=$$tag/" images/nginx/Dockerfile
-	tag=$$(git ls-remote --tags --sort="v:refname" https://github.com/ip2location/ip2location-nginx | awk -F'[/^]' 'END{print $$3}') && \
-	sed -i "/^ARG IP2LOCATION_NGINX_VERSION=/ s/=.*/=$$tag/" images/nginx/Dockerfile
-	tag=$$(git ls-remote --tags --sort="v:refname" https://github.com/ip2location/ip2proxy-nginx | awk -F'[/^]' 'END{print $$3}') && \
-	sed -i "/^ARG IP2PROXY_NGINX_VERSION=/ s/=.*/=$$tag/" images/nginx/Dockerfile
-	tag=$$(git ls-remote --tags --sort="v:refname" https://github.com/nginx/nginx | awk -F'[/^]' 'END{print $$3}' | awk -F- '{print $$2}') && \
-	sed -i "/^ARG NGINX_VERSION=/ s/=.*/=$$tag/" images/nginx/Dockerfile
-	tag=$$(git ls-remote --tags --sort="v:refname" https://github.com/nginx-modules/ngx_cache_purge | awk -F'[/^]' 'END{print $$3}') && \
-	sed -i "/^ARG NGINX_CACHE_PURGE_VERSION=/ s/=.*/=$$tag/" images/nginx/Dockerfile
-	tag=$$(git ls-remote --tags --sort="v:refname" https://github.com/vozlt/nginx-module-vts | awk -F'[/^]' 'END{print $$3}' | sed 's/^v//') && \
-	sed -i "/^ARG NGINX_VTS_VERSION=/ s/=.*/=$$tag/" images/nginx/Dockerfile
-	tag=$$(git ls-remote --tags --sort="v:refname" https://github.com/51Degrees/Device-Detection | awk -F'[/^]' 'END{print $$3}' | sed 's/^v//') && \
-	sed -i "/^ARG FIFTYONEDEGREES_NGINX_VERSION=/ s/=.*/=$$tag/" images/nginx/Dockerfile
diff --git a/packages/apps/http-cache/README.md b/packages/apps/http-cache/README.md
deleted file mode 100644
index 930e36e058..0000000000
--- a/packages/apps/http-cache/README.md
+++ /dev/null
@@ -1,142 +0,0 @@
-# Managed Nginx-based HTTP Cache Service
-
-The Nginx-based HTTP caching service is designed to optimize web traffic and enhance web application performance.
-This service combines custom-built Nginx instances with HAProxy for efficient caching and load balancing.
-
-## Deployment information
-
-The Nginx instances include the following modules and features:
-
-- VTS module for statistics
-- Integration with ip2location
-- Integration with ip2proxy
-- Support for 51Degrees
-- Cache purge functionality
-
-HAproxy plays a vital role in this setup by directing incoming traffic to specific Nginx instances based on a consistent hash calculated from the URL. Each Nginx instance includes a Persistent Volume Claim (PVC) for storing cached content, ensuring fast and reliable access to frequently used resources.
-
-## Deployment Details
-
-The deployment architecture is illustrated in the diagram below:
-
-```
-
-          ┌─────────┐
-          │ metallb │ arp announce
-          └────┬────┘
-               │
-               │
-       ┌───────▼───────────────────────────┐
-       │  kubernetes service               │  node
-       │ (externalTrafficPolicy: Local)    │  level
-       └──────────┬────────────────────────┘
-                  │
-                  │
-             ┌────▼────┐  ┌─────────┐
-             │ haproxy │  │ haproxy │   loadbalancer
-             │ (active)│  │ (backup)│      layer
-             └────┬────┘  └─────────┘
-                  │
-                  │ balance uri whole
-                  │ hash-type consistent
-           ┌──────┴──────┬──────────────┐
-       ┌───▼───┐     ┌───▼───┐      ┌───▼───┐ caching
-       │ nginx │     │ nginx │      │ nginx │  layer
-       └───┬───┘     └───┬───┘      └───┬───┘
-           │             │              │
-      ┌────┴───────┬─────┴────┬─────────┴──┐
-      │            │          │            │
-  ┌───▼────┐  ┌────▼───┐  ┌───▼────┐  ┌────▼───┐
-  │ origin │  │ origin │  │ origin │  │ origin │
-  └────────┘  └────────┘  └────────┘  └────────┘
-
-```
-
-## Known issues
-
-- VTS module shows wrong upstream response time, [github.com/vozlt/nginx-module-vts#198](https://github.com/vozlt/nginx-module-vts/issues/198)
-
-> `storageClass` is annotated as immutable in the chart schema — see [`docs/storage-immutability.md`](../../../docs/storage-immutability.md) for the contract and which consumers enforce it.
-
-## Parameters
-
-### Common parameters
-
-| Name           | Description                                                  | Type       | Value   |
-| -------------- | ------------------------------------------------------------ | ---------- | ------- |
-| `size`         | Persistent Volume Claim size available for application data. | `quantity` | `10Gi`  |
-| `storageClass` | StorageClass used to store the data.                         | `string`   | `""`    |
-| `external`     | Enable external access from outside the cluster.             | `bool`     | `false` |
-
-
-### Application-specific parameters
-
-| Name        | Description                                      | Type       | Value |
-| ----------- | ------------------------------------------------ | ---------- | ----- |
-| `endpoints` | Endpoints configuration, as a list of <ip:port>. | `[]string` | `[]`  |
-
-
-### HAProxy parameters
-
-| Name                       | Description                                                                                              | Type       | Value     |
-| -------------------------- | -------------------------------------------------------------------------------------------------------- | ---------- | --------- |
-| `haproxy`                  | HAProxy configuration.                                                                                   | `object`   | `{}`      |
-| `haproxy.replicas`         | Number of HAProxy replicas.                                                                              | `int`      | `2`       |
-| `haproxy.resources`        | Explicit CPU and memory configuration. When omitted, the preset defined in `resourcesPreset` is applied. | `object`   | `{}`      |
-| `haproxy.resources.cpu`    | CPU available to each replica.                                                                           | `quantity` | `""`      |
-| `haproxy.resources.memory` | Memory (RAM) available to each replica.                                                                  | `quantity` | `""`      |
-| `haproxy.resourcesPreset`  | Default sizing preset used when `resources` is omitted.                                                  | `string`   | `t1.nano` |
-
-
-### Nginx parameters
-
-| Name                     | Description                                                                                              | Type       | Value     |
-| ------------------------ | -------------------------------------------------------------------------------------------------------- | ---------- | --------- |
-| `nginx`                  | Nginx configuration.                                                                                     | `object`   | `{}`      |
-| `nginx.replicas`         | Number of Nginx replicas.                                                                                | `int`      | `2`       |
-| `nginx.resources`        | Explicit CPU and memory configuration. When omitted, the preset defined in `resourcesPreset` is applied. | `object`   | `{}`      |
-| `nginx.resources.cpu`    | CPU available to each replica.                                                                           | `quantity` | `""`      |
-| `nginx.resources.memory` | Memory (RAM) available to each replica.                                                                  | `quantity` | `""`      |
-| `nginx.resourcesPreset`  | Default sizing preset used when `resources` is omitted.                                                  | `string`   | `t1.nano` |
-
-
-## Parameter examples and reference
-
-### resources and resourcesPreset
-
-`resources` sets explicit CPU and memory configurations for each replica.
-When left empty, the preset defined in `resourcesPreset` is applied.
-
-```yaml
-resources:
-  cpu: 4000m
-  memory: 4Gi
-```
-
-`resourcesPreset` sets named CPU and memory configurations for each replica.
-This setting is ignored if the corresponding `resources` value is set.
-
-| Preset name | CPU    | memory  |
-|-------------|--------|---------|
-| `nano`      | `250m` | `128Mi` |
-| `micro`     | `500m` | `256Mi` |
-| `small`     | `1`    | `512Mi` |
-| `medium`    | `1`    | `1Gi`   |
-| `large`     | `2`    | `2Gi`   |
-| `xlarge`    | `4`    | `4Gi`   |
-| `2xlarge`   | `8`    | `8Gi`   |
-
-
-### endpoints
-
-`endpoints` is a flat list of IP addresses:
-
-```yaml
-endpoints:
-  - 10.100.3.1:80
-  - 10.100.3.11:80
-  - 10.100.3.2:80
-  - 10.100.3.12:80
-  - 10.100.3.3:80
-  - 10.100.3.13:80
-```
diff --git a/packages/apps/http-cache/images/nginx-cache.tag b/packages/apps/http-cache/images/nginx-cache.tag
deleted file mode 100644
index b08a374e93..0000000000
--- a/packages/apps/http-cache/images/nginx-cache.tag
+++ /dev/null
@@ -1 +0,0 @@
-ghcr.io/cozystack/cozystack/nginx-cache:0.0.0@sha256:d397781152ab9123b11b8191d92eba7a0d2faa376aa2c15ddeb67842a9b59bab
diff --git a/packages/apps/http-cache/images/nginx-cache/Dockerfile b/packages/apps/http-cache/images/nginx-cache/Dockerfile
deleted file mode 100644
index 2425acf792..0000000000
--- a/packages/apps/http-cache/images/nginx-cache/Dockerfile
+++ /dev/null
@@ -1,181 +0,0 @@
-FROM ubuntu:22.04 AS stage
-
-ARG NGINX_VERSION=1.25.3
-ARG IP2LOCATION_C_VERSION=8.6.1
-ARG IP2PROXY_C_VERSION=4.1.2
-ARG IP2LOCATION_NGINX_VERSION=8.6.0
-ARG IP2PROXY_NGINX_VERSION=8.1.1
-ARG FIFTYONEDEGREES_NGINX_VERSION=3.2.21.1
-ARG NGINX_CACHE_PURGE_VERSION=2.5.3
-ARG NGINX_VTS_VERSION=0.2.2
-
-ARG TARGETOS
-ARG TARGETARCH
-
-# Install required packages for development
-RUN apt update -q \
- && apt install -yq --no-install-recommends \
-    ca-certificates \
-    unzip \
-    automake \
-    build-essential \
-    libtool \
-    libpcre3 \
-    libpcre3-dev \
-    libssl-dev \
-    libgd-dev \
-    zlib1g-dev \
-    gcc \
-    make \
-    git \
-    wget \
-    curl \
-    checkinstall
-
-# Download sources
-RUN mkdir ip2location \
- && curl -sS -L https://github.com/chrislim2888/IP2Location-C-Library/archive/refs/tags/${IP2LOCATION_C_VERSION}.tar.gz \
- | tar -C ip2location -xzvf- --strip=1
-
-RUN mkdir ip2proxy \
- && curl -sS -L https://github.com/ip2location/ip2proxy-c/archive/refs/tags/${IP2PROXY_C_VERSION}.tar.gz \
- | tar -C ip2proxy -xzvf- --strip=1
-
-RUN mkdir ip2mod-location \
- && curl -sS -L https://github.com/ip2location/ip2location-nginx/archive/refs/tags/${IP2LOCATION_NGINX_VERSION}.tar.gz \
- | tar -C ip2mod-location -xzvf- --strip=1
-
-RUN mkdir ip2mod-proxy \
- && curl -sS -L https://github.com/ip2location/ip2proxy-nginx/archive/refs/tags/${IP2PROXY_NGINX_VERSION}.tar.gz \
- | tar -C ip2mod-proxy -xzvf- --strip=1
-
-RUN mkdir cache-purge-module \
- && curl -sS -L https://github.com/nginx-modules/ngx_cache_purge/archive/refs/tags/${NGINX_CACHE_PURGE_VERSION}.tar.gz \
- | tar -C cache-purge-module -xzvf- --strip=1
-
-RUN mkdir nginx-module-vts \
- && curl -sS -L https://github.com/vozlt/nginx-module-vts/archive/refs/tags/v${NGINX_VTS_VERSION}.tar.gz \
- | tar -C nginx-module-vts -xzvf- --strip=1
-
-RUN mkdir nginx \
- && curl -sS -L https://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz \
- | tar -C nginx -xzvf- --strip=1
-
-# Compile C Library for IP2Location module
-WORKDIR /ip2location
-RUN autoreconf -i -v --force
-RUN ./configure
-RUN make
-RUN checkinstall \
-  -D \
-  --install=no \
-  --default \
-  --pkgname=ip2location-c \
-  --pkgversion=${IP2LOCATION_C_VERSION} \
-  --pkgarch=${TARGETARCH} \
-  --pkggroup=lib \
-  --pkgsource="https://github.com/chrislim2888/IP2Location-C-Library" \
-  --maintainer="Eduard Generalov <eduard@generalov.net>" \
-  --requires=librtmp1 \
-  --autodoinst=no \
-  --deldoc=yes \
-  --deldesc=yes \
-  --delspec=yes \
-  --backup=no \
-  make install
-
-WORKDIR /ip2location/data
-RUN perl ip-country.pl
-
-WORKDIR /ip2location/test
-RUN ./test-IP2Location
-
-# Compile C Library for IP2Proxy module
-WORKDIR /ip2proxy
-RUN autoreconf -i -v --force
-RUN ./configure
-RUN make
-RUN checkinstall \
-  -D \
-  --install=no \
-  --default \
-  --pkgname=ip2proxy-c \
-  --pkgversion=${IP2PROXY_C_VERSION} \
-  --pkgarch=${TARGETARCH} \
-  --pkggroup=lib \
-  --pkgsource="https://github.com/ip2location/ip2proxy-c" \
-  --maintainer="Eduard Generalov <eduard@generalov.net>" \
-  --requires=librtmp1 \
-  --autodoinst=no \
-  --deldoc=yes \
-  --deldesc=yes \
-  --delspec=yes \
-  --backup=no \
-  make install
-
-# Compile Nginx
-WORKDIR /nginx
-RUN ./configure \
-  --with-compat \
-  --prefix=/usr/share/nginx \
-  --sbin-path=/usr/bin/nginx \
-  --with-http_ssl_module \
-  --conf-path=/etc/nginx/nginx.conf \
-  --http-log-path=/var/log/nginx/access.log \
-  --error-log-path=/var/log/nginx/error.log \
-  --lock-path=/var/lock/nginx.lock \
-  --pid-path=/run/nginx.pid \
-  --modules-path=/usr/lib/nginx/modules \
-  --http-client-body-temp-path=/var/lib/nginx/body \
-  --http-fastcgi-temp-path=/var/lib/nginx/fastcgi \
-  --http-proxy-temp-path=/var/lib/nginx/proxy \
-  --http-scgi-temp-path=/var/lib/nginx/scgi \
-  --http-uwsgi-temp-path=/var/lib/nginx/uwsgi \
-  --with-http_realip_module \
-  --with-http_stub_status_module \
-  --with-stream \
-  --add-module=../nginx-module-vts \
-  --add-module=../cache-purge-module \
-  --add-dynamic-module=../ip2mod-proxy \
-  --add-dynamic-module=../ip2mod-location \
-  --with-compat
-
-RUN make modules
-RUN make -j 8
-RUN checkinstall \
-  -D \
-  --install=no \
-  --default \
-  --pkgname=nginx \
-  --pkgversion=$VERS \
-  --pkgarch=${TARGETARCH} \
-  --pkggroup=web \
-  --provides=nginx \
-  --requires=ip2location-c,ip2proxy-c,libssl3,libc-bin,libc6,libzstd1,libpcre++0v5,libpcre16-3,libpcre2-8-0,libpcre3,libpcre32-3,libpcrecpp0v5,libmaxminddb0 \
-  --autodoinst=no \
-  --deldoc=yes \
-  --deldesc=yes \
-  --delspec=yes \
-  --backup=no \
-  make install
-
-RUN mkdir /packages \
- && mv /*/*.deb /packages/
-
-FROM ubuntu:22.04
-COPY --from=stage /packages /packages
-COPY nginx-reloader.sh /usr/bin/nginx-reloader.sh
-
-RUN set -x \
- && groupadd --system --gid 101 nginx \
- && useradd --system --gid nginx --no-create-home --home /nonexistent --comment "nginx user" --shell /bin/false --uid 101 nginx \
- && apt update -q \
- && apt install -yq --no-install-recommends --no-install-suggests gnupg1 ca-certificates inotify-tools \
- && apt install -y /packages/*.deb \
- && rm -rf /var/lib/apt/lists/* \
- && mkdir -p /var/lib/nginx /var/log/nginx \
- && ln -sf /dev/stdout /var/log/nginx/access.log \
- && ln -sf /dev/stderr /var/log/nginx/error.log \
- && chown -R nginx: /var/lib/nginx /var/log/nginx
-
-ENTRYPOINT ["/usr/bin/nginx", "-g", "daemon off;"]
diff --git a/packages/apps/http-cache/images/nginx-cache/nginx-reloader.sh b/packages/apps/http-cache/images/nginx-cache/nginx-reloader.sh
deleted file mode 100755
index 2f0f87b6f7..0000000000
--- a/packages/apps/http-cache/images/nginx-cache/nginx-reloader.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-set -e
-
-cleanup() {
-  echo "Received termination signal. Exiting..."
-  exit 0
-}
-
-trap cleanup INT
-while true; do
-  inotifywait -s -e close_write,attrib --include 'reload' /data >/dev/null
-  nginx -s reload
-done
diff --git a/packages/apps/http-cache/logos/nginx.svg b/packages/apps/http-cache/logos/nginx.svg
deleted file mode 100644
index 3a1efce051..0000000000
--- a/packages/apps/http-cache/logos/nginx.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<svg width="144" height="144" viewBox="0 0 144 144" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="144" height="144" rx="24" fill="url(#paint0_linear_681_2825)"/>
-<path d="M26.0026 37.8588C26.0026 60.919 26.0026 83.9814 26.0026 107.046C25.973 108.323 26.1996 109.593 26.6692 110.783C27.1387 111.972 27.8418 113.056 28.7374 113.972C30.4539 115.659 32.7 116.709 35.1009 116.948C37.5019 117.187 39.9126 116.6 41.931 115.284C43.282 114.371 44.3881 113.143 45.1527 111.707C45.9174 110.271 46.3175 108.671 46.3181 107.046C46.3181 90.3528 46.2861 73.6597 46.3181 56.9666C61.6168 75.1889 76.9474 93.3856 92.31 111.557C94.4444 113.708 97.0875 115.291 99.997 116.162C102.906 117.032 105.989 117.162 108.962 116.539C111.061 116.128 112.973 115.057 114.415 113.485C115.857 111.913 116.754 109.921 116.974 107.804C117.009 84.2681 117.009 60.7343 116.974 37.2025C116.754 34.6907 115.595 32.3522 113.726 30.6486C111.858 28.945 109.415 28 106.881 28C104.346 28 101.903 28.945 100.035 30.6486C98.1663 32.3522 97.0074 34.6907 96.7869 37.2025C96.7869 54.1632 96.6844 71.1048 96.7869 88.0591C81.7616 70.4358 66.9219 52.6596 51.9543 34.9725C49.981 32.4554 47.3685 30.5073 44.3863 29.3291C41.4041 28.1509 38.1599 27.7852 34.9883 28.2698C32.5857 28.5359 30.3583 29.6493 28.7099 31.4084C27.0615 33.1675 26.101 35.4559 26.0026 37.8588Z" fill="white"/>
-<defs>
-<linearGradient id="paint0_linear_681_2825" x1="10" y1="15.5" x2="144" y2="131.5" gradientUnits="userSpaceOnUse">
-<stop stop-color="#00C54A"/>
-<stop offset="1" stop-color="#019639"/>
-</linearGradient>
-</defs>
-</svg>
diff --git a/packages/apps/http-cache/templates/haproxy/configmap.yaml b/packages/apps/http-cache/templates/haproxy/configmap.yaml
deleted file mode 100644
index 4012649dec..0000000000
--- a/packages/apps/http-cache/templates/haproxy/configmap.yaml
+++ /dev/null
@@ -1,106 +0,0 @@
-{{- define "backendoptions" }}
-{{- if eq . "http" }}
-mode http
-option forwardfor
-balance uri whole
-hash-type consistent
-retry-on conn-failure 503
-retries 2
-option redispatch 1
-default-server observe layer7 error-limit 10 on-error mark-down check
-{{- else if eq . "tcp" }}
-mode tcp
-balance roundrobin
-default-server observe layer4 error-limit 10 on-error mark-down check
-{{- else if eq . "tcp-with-proxy" }}
-mode tcp
-balance roundrobin
-default-server observe layer4 error-limit 10 on-error mark-down check send-proxy-v2
-{{- else }}
-{{- fail (printf "mode %s is not supported" .) }}
-{{- end }}
-{{- end }}
-
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ .Release.Name }}-haproxy
-  labels:
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-data:
-  haproxy.cfg: |
-    defaults
-        mode    tcp
-        option  dontlognull
-        timeout http-request    10s
-        timeout queue           20s
-        timeout connect         5s
-        timeout client          5m
-        timeout server          5m
-        timeout tunnel          5m
-        timeout http-keep-alive 10s
-        timeout check           10s
-
-    frontend http
-        bind :::8080 v4v6
-        mode http
-        {{- if $.Values.whitelistHTTP }}
-        {{- with $.Values.whitelist }}
-        acl whitelist src{{ range . }} {{ . }}{{ end }}
-        {{- end }}
-        acl all src 0.0.0.0
-        tcp-request content accept if whitelist
-        tcp-request content reject
-        {{- end }}
-        tcp-request content set-dst-port int(80)
-
-        # match real IP from cloudflare
-        acl from_cf src -f /usr/local/etc/haproxy/CF_ips.lst
-        acl cf_ip_hdr req.hdr(CF-Connecting-IP) -m found
-        http-request set-header X-Forwarded-For %[req.hdr(CF-Connecting-IP)] if from_cf cf_ip_hdr
-
-        # overwrite real IP header from anywhere else
-        http-request set-header X-Forwarded-For %[src] if !from_cf
-
-        default_backend http
-
-    backend http
-        mode http
-        balance uri whole
-        hash-type consistent
-        retry-on conn-failure 503
-        retries 2
-        option redispatch 1
-        default-server observe layer7 error-limit 10 on-error mark-down
-
-        {{- range $i, $e := until (int $.Values.nginx.replicas) }}
-        server cache{{ $i }} {{ $.Release.Name }}-nginx-cache-{{ $i }}:80 check
-        {{- end }}
-        {{- range $i, $e := $.Values.endpoints }} 
-        server origin{{ $i }} {{ $e }} backup
-        {{- end }}
-  # https://developers.cloudflare.com/support/troubleshooting/restoring-visitor-ips/restoring-original-visitor-ips/
-  CF_ips.lst: |
-    173.245.48.0/20
-    103.21.244.0/22
-    103.22.200.0/22
-    103.31.4.0/22
-    141.101.64.0/18
-    108.162.192.0/18
-    190.93.240.0/20
-    188.114.96.0/20
-    197.234.240.0/22
-    198.41.128.0/17
-    162.158.0.0/15
-    104.16.0.0/13
-    104.24.0.0/14
-    172.64.0.0/13
-    131.0.72.0/22
-    2400:cb00::/32
-    2606:4700::/32
-    2803:f800::/32
-    2405:b500::/32
-    2405:8100::/32
-    2a06:98c0::/29
-    2c0f:f248::/32
diff --git a/packages/apps/http-cache/templates/haproxy/deployment.yaml b/packages/apps/http-cache/templates/haproxy/deployment.yaml
deleted file mode 100644
index 5ff3abf6e0..0000000000
--- a/packages/apps/http-cache/templates/haproxy/deployment.yaml
+++ /dev/null
@@ -1,46 +0,0 @@
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ .Release.Name }}-haproxy
-  labels:
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-spec:
-  replicas: {{ .Values.haproxy.replicas }}
-  selector:
-    matchLabels:
-      app: {{ .Release.Name }}-haproxy
-  template:
-    metadata:
-      labels:
-        app: {{ .Release.Name }}-haproxy
-      annotations:
-        checksum/config: {{ include (print $.Template.BasePath "/haproxy/configmap.yaml") . | sha256sum }}
-    spec:
-      affinity:
-        podAntiAffinity:
-          preferredDuringSchedulingIgnoredDuringExecution:
-          - weight: 1
-            podAffinityTerm:
-              labelSelector:
-                matchExpressions:
-                - key: app
-                  operator: In
-                  values:
-                  - {{ .Release.Name }}-haproxy
-              topologyKey: kubernetes.io/hostname
-      containers:
-      - image: haproxy:latest
-        name: haproxy
-        resources: {{- include "cozy-lib.resources.defaultingSanitize" (list .Values.haproxy.resourcesPreset .Values.haproxy.resources $) | nindent 10 }}
-        ports:
-        - containerPort: 8080
-          name: http
-        volumeMounts:
-        - mountPath: /usr/local/etc/haproxy
-          name: config
-      volumes:
-      - configMap:
-          name: {{ .Release.Name }}-haproxy
-        name: config
diff --git a/packages/apps/http-cache/templates/haproxy/service.yaml b/packages/apps/http-cache/templates/haproxy/service.yaml
deleted file mode 100644
index 9286a8b5e2..0000000000
--- a/packages/apps/http-cache/templates/haproxy/service.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ .Release.Name }}-haproxy
-  labels:
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-spec:
-  type: {{ ternary "LoadBalancer" "ClusterIP" .Values.external }}
-  {{- if .Values.external }}
-  externalTrafficPolicy: Local
-    {{- if (include "cozy-lib.network.disableLoadBalancerNodePorts" $ | fromYaml) }}
-  allocateLoadBalancerNodePorts: false
-    {{- end }}
-  {{- end }}
-  selector:
-    app: {{ .Release.Name }}-haproxy
-  ports:
-  - name: http
-    protocol: TCP
-    port: 80
-    targetPort: http
diff --git a/packages/apps/http-cache/templates/nginx/configmap.yaml b/packages/apps/http-cache/templates/nginx/configmap.yaml
deleted file mode 100644
index fdce537146..0000000000
--- a/packages/apps/http-cache/templates/nginx/configmap.yaml
+++ /dev/null
@@ -1,162 +0,0 @@
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ $.Release.Name }}-nginx-cache
-  labels:
-    app.kubernetes.io/instance: {{ $.Release.Name }}
-    app.kubernetes.io/managed-by: {{ $.Release.Service }}
-data:
-  nginx.conf: |
-    user  nginx;
-    worker_processes  2;
-    
-    error_log  /var/log/nginx/error.log notice;
-    pid        /var/run/nginx.pid;
-    
-    #load_module /usr/lib/nginx/modules/ngx_http_ip2location_module.so;
-    #load_module /usr/lib/nginx/modules/ngx_http_ip2proxy_module.so;
-
-    events {
-        use epoll;
-        multi_accept on;
-        worker_connections  10240;
-    }
-    
-    http {
-        include       /etc/nginx/mime.types;
-        default_type  application/octet-stream;
-
-        vhost_traffic_status_zone;
-    
-        log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
-                          '$status $body_bytes_sent "$http_referer" '
-                          '"$http_user_agent" "$http_x_forwarded_for"';
-    
-        access_log  /var/log/nginx/access.log  main;
-    
-        sendfile        on;
-        tcp_nopush     on;
-    
-        keepalive_timeout  65;
-    
-        gzip  on;
-
-        proxy_cache_path /data/cache levels=1:2 keys_zone=mycache:400m max_size=100g
-                         inactive=30d use_temp_path=off;
-    
-        #ip2location_database /data/dbs/ip2location.bin;
-        #ip2location_proxy_recursive	on;
-        #ip2location_proxy	10.0.0.0/8;
-
-        #ip2proxy_database /data/dbs/ip2proxy.bin;
-        #ip2proxy_proxy_recursive on;
-        #ip2proxy_proxy 10.0.0.0/8;
-
-        server {
-            listen *:10253;
-            server_name _;
-
-            vhost_traffic_status_bypass_limit on;
-            vhost_traffic_status_bypass_stats on;
-
-            location /health {
-                access_log off;
-                add_header 'Content-Type' 'text/plain';
-                return 200 "healthy\n";
-            }
-        
-            location /metrics {
-                vhost_traffic_status_display;
-                vhost_traffic_status_display_format prometheus;
-            }
-        }
-
-        upstream origin_servers {
-            {{- range $num, $ep := $.Values.endpoints }} 
-            server {{ $ep }};
-            {{- end }}
-        }
-
-        # URL shorter:
-        # / --> /
-        # /a --> /a
-        # /a/b --> /a/*
-        map $uri $shorten_url {
-            ~^/$ /;
-            ~^/([^/]+)$ /$1; 
-            ~^/([^/]+)/.*$ /$1/*;
-        }
-
-        # URL shortener:
-        # Example: / --> /
-        # Example: /a --> /a
-        # Example: /a/ --> /a
-        # Example: /a/b --> /a/*
-        map $uri $shorten_url {
-            ~^/$ /;
-            ~^/([^/]+)$ /$1;
-            ~^/([^/]+)/$ /$1;
-            ~^/([^/]+)/.*$ /$1/*;
-        }
-
-        server {
-            listen *:80;
-            server_name _;
-            vhost_traffic_status_filter_by_host on;
-
-            #vhost_traffic_status_filter_by_set_key $host country::$ip2location_country_short;
-            vhost_traffic_status_filter_by_set_key $shorten_url url::$host;
-
-            proxy_cache mycache;
-            proxy_cache_revalidate on;
-            proxy_cache_lock on;
-            proxy_cache_key $scheme$http_host$request_uri;
-            proxy_cache_purge PURGE from all;
-            cache_purge_response_type json;
-        
-            proxy_cache_valid 200 1h;
-            proxy_cache_use_stale error timeout updating http_500 http_502 http_503 http_504;
-
-            proxy_cache_background_update on;
-
-            proxy_connect_timeout 400ms;
-            proxy_next_upstream error timeout http_500 http_502 http_503 http_504;
-        
-            location / {
-                proxy_set_header Host $http_host;
-
-                ## debug
-                add_header X-Cache-Status $upstream_cache_status;
-                #add_header X-Cache-Node $hostname;
-                #add_header X-Cache-Key $scheme$http_host$request_uri;
-
-                proxy_set_header X-Real-IP $remote_addr;
-                real_ip_header $real_ip_header;
-                real_ip_recursive on;
-                proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-
-                #proxy_set_header X-Anonymous-Type $ip2proxy_proxy_type;
-                #proxy_set_header X-Country $ip2location_country_short;
-
-                #proxy_set_header X-Country-Code $ip2location_country_short;
-                #proxy_set_header X-Country-Name $ip2location_country_long;
-                #proxy_set_header X-GeoIP-Region $ip2location_region;
-                #proxy_set_header X-GeoIP-City $ip2location_city;
-                #proxy_set_header X-Geoip-Country $ip2location_country_short;
-                #proxy_set_header X-Geoip-Latitude $ip2location_latitude;
-                #proxy_set_header X-Geoip-Longitude $ip2location_longitude;
-                #proxy_set_header X-GeoIP-ISP $ip2location_isp;
-                ##proxy_set_header X-GeoIP-Postal-Code $ip2location_zipcode;
-                ##proxy_set_header X-Geoip-Timezone $ip2location_timezone;
-                ##proxy_set_header X-Geoip-Asn $ip2location_asn;
-
-                proxy_hide_header Pragma;
-                proxy_hide_header Expires;
-
-                # to backends
-                proxy_pass http://origin_servers;
-                proxy_buffering on;
-            }
-        }
-    }
diff --git a/packages/apps/http-cache/templates/nginx/deployment.yaml b/packages/apps/http-cache/templates/nginx/deployment.yaml
deleted file mode 100644
index 9ee4e69dda..0000000000
--- a/packages/apps/http-cache/templates/nginx/deployment.yaml
+++ /dev/null
@@ -1,151 +0,0 @@
----
-apiVersion: policy/v1
-kind: PodDisruptionBudget
-metadata:
-  name: {{ $.Release.Name }}-nginx-cache
-  labels:
-    app.kubernetes.io/instance: {{ $.Release.Name }}
-    app.kubernetes.io/managed-by: {{ $.Release.Service }}
-spec:
-  maxUnavailable: 1
-  selector:
-    matchLabels:
-      app: {{ $.Release.Name }}-nginx-cache
-{{- range $i := until (int $.Values.nginx.replicas) }}
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ $.Release.Name }}-nginx-cache-{{ $i }}
-  labels:
-    app.kubernetes.io/instance: {{ $.Release.Name }}
-    app.kubernetes.io/managed-by: {{ $.Release.Service }}
-spec:
-  selector:
-    matchLabels:
-      app: {{ $.Release.Name }}-nginx-cache
-      instance: "{{ $i }}"
-  template:
-    metadata:
-      labels:
-        app: {{ $.Release.Name }}-nginx-cache
-        instance: "{{ $i }}"
-      annotations:
-        checksum/config: {{ include (print $.Template.BasePath "/nginx/configmap.yaml") $ | sha256sum }}
-    spec:
-      imagePullSecrets:
-      - name: {{ $.Release.Name }}-regsecret
-      affinity:
-        podAntiAffinity:
-          requiredDuringSchedulingIgnoredDuringExecution:
-          - labelSelector:
-              matchExpressions:
-              - key: app
-                operator: In
-                values:
-                - {{ $.Release.Name }}-nginx-cache
-              - key: instance
-                operator: NotIn
-                values:
-                - "{{ $i }}"
-            topologyKey: kubernetes.io/hostname
-      shareProcessNamespace: true
-      containers:
-      - name: nginx
-        resources: {{- include "cozy-lib.resources.defaultingSanitize" (list $.Values.nginx.resourcesPreset $.Values.nginx.resources $) | nindent 10 }}
-        image: "{{ $.Files.Get "images/nginx-cache.tag" | trim }}"
-        readinessProbe:
-          httpGet:
-            path: /healthz
-            port: metrics
-          initialDelaySeconds: 5
-          periodSeconds: 5
-        livenessProbe:
-          httpGet:
-            path: /healthz
-            port: metrics
-          failureThreshold: 1
-          periodSeconds: 10
-        ports:
-        - containerPort: 80
-          name: http
-        - containerPort: 8087
-          name: cache
-        - containerPort: 10253
-          name: metrics
-        volumeMounts:
-        - mountPath: /etc/nginx/nginx.conf
-          name: config
-          subPath: nginx.conf
-        - mountPath: /data
-          name: data
-        - mountPath: /run
-          name: run
-      - name: reloader
-        image: "{{ $.Files.Get "images/nginx-cache.tag" | trim }}"
-        command: ["/usr/bin/nginx-reloader.sh"]
-        resources:
-          limits:
-            cpu: 50m
-            memory: 50Mi
-          requests:
-            cpu: 50m
-            memory: 50Mi
-        #command: ["sleep", "infinity"]
-        volumeMounts:
-        - mountPath: /etc/nginx/nginx.conf
-          name: config
-          subPath: nginx.conf
-        - mountPath: /data
-          name: data
-        - mountPath: /run
-          name: run
-      volumes:
-      - name: config
-        configMap:
-          name: {{ $.Release.Name }}-nginx-cache
-      - name: data
-        persistentVolumeClaim:
-          claimName: {{ $.Release.Name }}-nginx-cache-{{ $i }}
-      - name: run
-        emptyDir: {}
----
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: {{ $.Release.Name }}-nginx-cache-{{ $i }}
-  labels:
-    app.kubernetes.io/instance: {{ $.Release.Name }}
-    app.kubernetes.io/managed-by: {{ $.Release.Service }}
-spec:
-  accessModes: [ "ReadWriteOnce" ]
-  resources:
-    requests:
-      storage: "{{ $.Values.size }}"
-  {{- with $.Values.storageClass }}
-  storageClassName: {{ . }}
-  {{- end }}
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ $.Release.Name }}-nginx-cache-{{ $i }}
-  labels:
-    app: {{ $.Release.Name }}-nginx-cache
-    app.kubernetes.io/instance: {{ $.Release.Name }}
-    app.kubernetes.io/managed-by: {{ $.Release.Service }}
-spec:
-  type: ClusterIP
-  selector:
-    app: {{ $.Release.Name }}-nginx-cache
-    instance: "{{ $i }}"
-  ports:
-    - name: http
-      protocol: TCP
-      port: 80
-      targetPort: http
-    - name: metrics
-      protocol: TCP
-      port: 10253
-      targetPort: metrics
-{{- end }}
diff --git a/packages/apps/http-cache/templates/nginx/nginx-scrape.yaml b/packages/apps/http-cache/templates/nginx/nginx-scrape.yaml
deleted file mode 100644
index 8e5f233101..0000000000
--- a/packages/apps/http-cache/templates/nginx/nginx-scrape.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
----
-apiVersion: operator.victoriametrics.com/v1beta1
-kind: VMServiceScrape
-metadata:
-  name: nginx-cache
-spec:
-  jobLabel: jobLabel
-  namespaceSelector:
-    matchNames:
-    - infra-nginx-cache
-  endpoints:
-  - path: /metrics
-    port: metrics
-    honorLabels: true
-    relabelConfigs:
-    - replacement: nginx-cache
-      targetLabel: job
-    - source_labels: [__meta_kubernetes_service_name]
-      target_label: instance
-    - sourceLabels: [__meta_kubernetes_pod_node_name]
-      targetLabel: node
-    - targetLabel: tier
-      replacement: cluster
-  selector:
-    matchLabels:
-      app: {{ $.Release.Name }}-nginx-cache
diff --git a/packages/apps/http-cache/templates/workloadmonitor.yaml b/packages/apps/http-cache/templates/workloadmonitor.yaml
deleted file mode 100644
index a38a395afb..0000000000
--- a/packages/apps/http-cache/templates/workloadmonitor.yaml
+++ /dev/null
@@ -1,43 +0,0 @@
----
-apiVersion: cozystack.io/v1alpha1
-kind: WorkloadMonitor
-metadata:
-  name: {{ $.Release.Name }}-haproxy
-  labels:
-    workloads.cozystack.io/resource-preset: {{ .Values.haproxy.resourcesPreset | quote }}
-spec:
-  replicas: {{ .Values.haproxy.replicas }}
-  minReplicas: 1
-  kind: http-cache
-  type: http-cache
-  selector:
-    app: {{ $.Release.Name }}-haproxy
-  version: {{ $.Chart.Version }}
----
-apiVersion: cozystack.io/v1alpha1
-kind: WorkloadMonitor
-metadata:
-  name: {{ $.Release.Name }}-nginx
-  labels:
-    workloads.cozystack.io/resource-preset: {{ .Values.nginx.resourcesPreset | quote }}
-spec:
-  replicas: {{ .Values.nginx.replicas }}
-  minReplicas: 1
-  kind: http-cache
-  type: http-cache
-  selector:
-    app: {{ $.Release.Name }}-nginx-cache
-  version: {{ $.Chart.Version }}
----
-apiVersion: cozystack.io/v1alpha1
-kind: WorkloadMonitor
-metadata:
-  name: {{ $.Release.Name }}
-spec:
-  replicas: {{ .Values.replicas }}
-  minReplicas: 1
-  kind: http-cache
-  type: http-cache
-  selector:
-    app.kubernetes.io/instance: {{ $.Release.Name }}
-  version: {{ $.Chart.Version }}
diff --git a/packages/apps/http-cache/values.schema.json b/packages/apps/http-cache/values.schema.json
deleted file mode 100644
index 89873ffa98..0000000000
--- a/packages/apps/http-cache/values.schema.json
+++ /dev/null
@@ -1,250 +0,0 @@
-{
-  "title": "Chart Values",
-  "type": "object",
-  "properties": {
-    "size": {
-      "description": "Persistent Volume Claim size available for application data.",
-      "default": "10Gi",
-      "pattern": "^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$",
-      "anyOf": [
-        {
-          "type": "integer"
-        },
-        {
-          "type": "string"
-        }
-      ],
-      "x-kubernetes-int-or-string": true
-    },
-    "storageClass": {
-      "description": "StorageClass used to store the data.",
-      "type": "string",
-      "default": "",
-      "x-kubernetes-validations": [
-        {
-          "rule": "self == oldSelf",
-          "message": "storageClass is immutable"
-        }
-      ]
-    },
-    "external": {
-      "description": "Enable external access from outside the cluster.",
-      "type": "boolean",
-      "default": false
-    },
-    "endpoints": {
-      "description": "Endpoints configuration, as a list of \u003cip:port\u003e.",
-      "type": "array",
-      "default": [],
-      "items": {
-        "type": "string"
-      }
-    },
-    "haproxy": {
-      "description": "HAProxy configuration.",
-      "type": "object",
-      "default": {},
-      "required": [
-        "replicas",
-        "resourcesPreset"
-      ],
-      "properties": {
-        "replicas": {
-          "description": "Number of HAProxy replicas.",
-          "type": "integer",
-          "default": 2
-        },
-        "resources": {
-          "description": "Explicit CPU and memory configuration. When omitted, the preset defined in `resourcesPreset` is applied.",
-          "type": "object",
-          "default": {},
-          "properties": {
-            "cpu": {
-              "description": "CPU available to each replica.",
-              "pattern": "^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$",
-              "anyOf": [
-                {
-                  "type": "integer"
-                },
-                {
-                  "type": "string"
-                }
-              ],
-              "x-kubernetes-int-or-string": true
-            },
-            "memory": {
-              "description": "Memory (RAM) available to each replica.",
-              "pattern": "^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$",
-              "anyOf": [
-                {
-                  "type": "integer"
-                },
-                {
-                  "type": "string"
-                }
-              ],
-              "x-kubernetes-int-or-string": true
-            }
-          }
-        },
-        "resourcesPreset": {
-          "description": "Default sizing preset used when `resources` is omitted.",
-          "type": "string",
-          "default": "t1.nano",
-          "enum": [
-            "t1.nano",
-            "t1.micro",
-            "t1.small",
-            "t1.medium",
-            "t1.large",
-            "t1.xlarge",
-            "t1.2xlarge",
-            "t1.4xlarge",
-            "c1.nano",
-            "c1.micro",
-            "c1.small",
-            "c1.medium",
-            "c1.large",
-            "c1.xlarge",
-            "c1.2xlarge",
-            "c1.4xlarge",
-            "s1.nano",
-            "s1.micro",
-            "s1.small",
-            "s1.medium",
-            "s1.large",
-            "s1.xlarge",
-            "s1.2xlarge",
-            "s1.4xlarge",
-            "u1.nano",
-            "u1.micro",
-            "u1.small",
-            "u1.medium",
-            "u1.large",
-            "u1.xlarge",
-            "u1.2xlarge",
-            "u1.4xlarge",
-            "m1.nano",
-            "m1.micro",
-            "m1.small",
-            "m1.medium",
-            "m1.large",
-            "m1.xlarge",
-            "m1.2xlarge",
-            "m1.4xlarge",
-            "nano",
-            "micro",
-            "small",
-            "medium",
-            "large",
-            "xlarge",
-            "2xlarge"
-          ]
-        }
-      }
-    },
-    "nginx": {
-      "description": "Nginx configuration.",
-      "type": "object",
-      "default": {},
-      "required": [
-        "replicas",
-        "resourcesPreset"
-      ],
-      "properties": {
-        "replicas": {
-          "description": "Number of Nginx replicas.",
-          "type": "integer",
-          "default": 2
-        },
-        "resources": {
-          "description": "Explicit CPU and memory configuration. When omitted, the preset defined in `resourcesPreset` is applied.",
-          "type": "object",
-          "default": {},
-          "properties": {
-            "cpu": {
-              "description": "CPU available to each replica.",
-              "pattern": "^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$",
-              "anyOf": [
-                {
-                  "type": "integer"
-                },
-                {
-                  "type": "string"
-                }
-              ],
-              "x-kubernetes-int-or-string": true
-            },
-            "memory": {
-              "description": "Memory (RAM) available to each replica.",
-              "pattern": "^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$",
-              "anyOf": [
-                {
-                  "type": "integer"
-                },
-                {
-                  "type": "string"
-                }
-              ],
-              "x-kubernetes-int-or-string": true
-            }
-          }
-        },
-        "resourcesPreset": {
-          "description": "Default sizing preset used when `resources` is omitted.",
-          "type": "string",
-          "default": "t1.nano",
-          "enum": [
-            "t1.nano",
-            "t1.micro",
-            "t1.small",
-            "t1.medium",
-            "t1.large",
-            "t1.xlarge",
-            "t1.2xlarge",
-            "t1.4xlarge",
-            "c1.nano",
-            "c1.micro",
-            "c1.small",
-            "c1.medium",
-            "c1.large",
-            "c1.xlarge",
-            "c1.2xlarge",
-            "c1.4xlarge",
-            "s1.nano",
-            "s1.micro",
-            "s1.small",
-            "s1.medium",
-            "s1.large",
-            "s1.xlarge",
-            "s1.2xlarge",
-            "s1.4xlarge",
-            "u1.nano",
-            "u1.micro",
-            "u1.small",
-            "u1.medium",
-            "u1.large",
-            "u1.xlarge",
-            "u1.2xlarge",
-            "u1.4xlarge",
-            "m1.nano",
-            "m1.micro",
-            "m1.small",
-            "m1.medium",
-            "m1.large",
-            "m1.xlarge",
-            "m1.2xlarge",
-            "m1.4xlarge",
-            "nano",
-            "micro",
-            "small",
-            "medium",
-            "large",
-            "xlarge",
-            "2xlarge"
-          ]
-        }
-      }
-    }
-  }
-}
diff --git a/packages/apps/http-cache/values.yaml b/packages/apps/http-cache/values.yaml
deleted file mode 100644
index 2b81bbf343..0000000000
--- a/packages/apps/http-cache/values.yaml
+++ /dev/null
@@ -1,111 +0,0 @@
-##
-## @section Common parameters
-##
-
-## @param {quantity} size - Persistent Volume Claim size available for application data.
-size: 10Gi
-
-## @param {string} storageClass - StorageClass used to store the data.
-## @immutable
-storageClass: ""
-
-## @param {bool} external - Enable external access from outside the cluster.
-external: false
-
-##
-## @section Application-specific parameters
-##
-
-## @param {[]string} endpoints - Endpoints configuration, as a list of <ip:port>.
-endpoints: []
-## Example:
-## endpoints:
-##   - 10.100.3.1:80
-##   - 10.100.3.11:80
-##   - 10.100.3.2:80
-##   - 10.100.3.12:80
-##   - 10.100.3.3:80
-##   - 10.100.3.13:80
-
-##
-## @section HAProxy parameters
-##
-
-## @typedef {struct} Resources - Explicit CPU and memory configuration for each replica.
-## @field {quantity} [cpu] - CPU available to each replica.
-## @field {quantity} [memory] - Memory (RAM) available to each replica.
-
-## @enum {string} ResourcesPreset - Default sizing preset.
-## @value t1.nano
-## @value t1.micro
-## @value t1.small
-## @value t1.medium
-## @value t1.large
-## @value t1.xlarge
-## @value t1.2xlarge
-## @value t1.4xlarge
-## @value c1.nano
-## @value c1.micro
-## @value c1.small
-## @value c1.medium
-## @value c1.large
-## @value c1.xlarge
-## @value c1.2xlarge
-## @value c1.4xlarge
-## @value s1.nano
-## @value s1.micro
-## @value s1.small
-## @value s1.medium
-## @value s1.large
-## @value s1.xlarge
-## @value s1.2xlarge
-## @value s1.4xlarge
-## @value u1.nano
-## @value u1.micro
-## @value u1.small
-## @value u1.medium
-## @value u1.large
-## @value u1.xlarge
-## @value u1.2xlarge
-## @value u1.4xlarge
-## @value m1.nano
-## @value m1.micro
-## @value m1.small
-## @value m1.medium
-## @value m1.large
-## @value m1.xlarge
-## @value m1.2xlarge
-## @value m1.4xlarge
-## @value nano
-## @value micro
-## @value small
-## @value medium
-## @value large
-## @value xlarge
-## @value 2xlarge
-
-## @typedef {struct} HAProxy - HAProxy configuration.
-## @field {int} replicas - Number of HAProxy replicas.
-## @field {Resources} [resources] - Explicit CPU and memory configuration. When omitted, the preset defined in `resourcesPreset` is applied.
-## @field {ResourcesPreset} resourcesPreset - Default sizing preset used when `resources` is omitted.
-
-## @param {HAProxy} haproxy - HAProxy configuration.
-haproxy:
-  replicas: 2
-  resources: {}
-  resourcesPreset: "t1.nano"
-
-##
-## @section Nginx parameters
-##
-
-## @typedef {struct} Nginx - Nginx configuration.
-## @field {int} replicas - Number of Nginx replicas.
-## @field {Resources} [resources] - Explicit CPU and memory configuration. When omitted, the preset defined in `resourcesPreset` is applied.
-## @field {ResourcesPreset} resourcesPreset - Default sizing preset used when `resources` is omitted.
-
-## @param {Nginx} nginx - Nginx configuration.
-nginx:
-  replicas: 2
-  resources: {}
-  resourcesPreset: "t1.nano"
diff --git a/packages/apps/kafka/Chart.yaml b/packages/apps/kafka/Chart.yaml
index 6136729b68..7acada07ee 100644
--- a/packages/apps/kafka/Chart.yaml
+++ b/packages/apps/kafka/Chart.yaml
@@ -4,4 +4,4 @@ description: Managed Kafka service
 icon: /logos/kafka.svg
 type: application
 version: 0.0.0 # Placeholder, the actual version will be automatically set during the build process
-appVersion: "3.7.0"
+appVersion: "3.9.0"
diff --git a/packages/apps/kafka/Makefile b/packages/apps/kafka/Makefile
index ef71391b36..741d018b3b 100644
--- a/packages/apps/kafka/Makefile
+++ b/packages/apps/kafka/Makefile
@@ -1,9 +1,6 @@
 include ../../../hack/package.mk
 PRESET_ENUM := ["nano","micro","small","medium","large","xlarge","2xlarge"]
 
-test:
-	helm unittest .
-
 generate:
 	cozyvalues-gen -m 'kafka' -v values.yaml -s values.schema.json -r README.md -g ../../../api/apps/v1alpha1/kafka/types.go
 	../../../hack/update-crd.sh
diff --git a/packages/apps/kafka/README.md b/packages/apps/kafka/README.md
index 274bfe2163..3691eabca6 100644
--- a/packages/apps/kafka/README.md
+++ b/packages/apps/kafka/README.md
@@ -1,7 +1,5 @@
 # Managed Kafka Service
 
-> Both `kafka.storageClass` and `zookeeper.storageClass` are annotated as immutable in the chart schema — see [`docs/storage-immutability.md`](../../../docs/storage-immutability.md) for the contract and which consumers enforce it.
-
 ## Parameters
 
 ### Common parameters
@@ -11,45 +9,33 @@
 | `external`    | Enable external access from outside the cluster.                                                                                                                                                                                                                                                                                                                                                    | `bool`   | `false` |
 | `tls`         | TLS configuration. Strimzi manages the cluster PKI automatically (no cert-manager is involved for this chart): the operator auto-creates `<release>-cluster-ca-cert` and `<release>-clients-ca-cert` secrets, both exposed for client trust setup. The internal TLS listener on 9093 is always on; this toggle only controls the external listener on 9094.                                         | `object` | `{}`    |
 | `tls.enabled` | Enable TLS on the external listener. When unset, inherits the value of `external` (TLS is on when external access is enabled). Warning: setting this to false while external is true exposes Kafka over plaintext on a public IP via LoadBalancer. Strimzi does not provide authentication on this listener unless SCRAM, mTLS, or OAuth is separately configured. Use only in controlled networks. | `*bool`  | `null`  |
+| `version`     | Kafka version to deploy. Upgrade-only: once a cluster's KRaft metadata is at a given version, Strimzi refuses an in-place downgrade, so lowering this on a running cluster (e.g. v3.9 back to v3.8) leaves the Kafka CR stuck in a reconcile error. Pick the target version at creation and only ever raise it.                                                                                     | `string` | `v3.9`  |
 
 
 ### Application-specific parameters
 
-| Name                   | Description           | Type       | Value |
-| ---------------------- | --------------------- | ---------- | ----- |
-| `topics`               | Topics configuration. | `[]object` | `[]`  |
-| `topics[i].name`       | Topic name.           | `string`   | `""`  |
-| `topics[i].partitions` | Number of partitions. | `int`      | `0`   |
-| `topics[i].replicas`   | Number of replicas.   | `int`      | `0`   |
-| `topics[i].config`     | Topic configuration.  | `object`   | `{}`  |
+| Name                   | Description           | Type       | Value  |
+| ---------------------- | --------------------- | ---------- | ------ |
+| `topics`               | Topics configuration. | `[]object` | `[]`   |
+| `topics[i].name`       | Topic name.           | `string`   | `""`   |
+| `topics[i].partitions` | Number of partitions. | `int`      | `0`    |
+| `topics[i].replicas`   | Number of replicas.   | `int`      | `0`    |
+| `topics[i].config`     | Topic configuration.  | `*object`  | `null` |
 
 
 ### Kafka configuration
 
-| Name                     | Description                                                                                              | Type       | Value      |
-| ------------------------ | -------------------------------------------------------------------------------------------------------- | ---------- | ---------- |
-| `kafka`                  | Kafka configuration.                                                                                     | `object`   | `{}`       |
-| `kafka.replicas`         | Number of Kafka replicas.                                                                                | `int`      | `3`        |
-| `kafka.resources`        | Explicit CPU and memory configuration. When omitted, the preset defined in `resourcesPreset` is applied. | `object`   | `{}`       |
-| `kafka.resources.cpu`    | CPU available to each replica.                                                                           | `quantity` | `""`       |
-| `kafka.resources.memory` | Memory (RAM) available to each replica.                                                                  | `quantity` | `""`       |
-| `kafka.resourcesPreset`  | Default sizing preset used when `resources` is omitted.                                                  | `string`   | `c1.small` |
-| `kafka.size`             | Persistent Volume size for Kafka.                                                                        | `quantity` | `10Gi`     |
-| `kafka.storageClass`     | StorageClass used to store the Kafka data.                                                               | `string`   | `""`       |
-
-
-### ZooKeeper configuration
-
-| Name                         | Description                                                                                              | Type       | Value      |
-| ---------------------------- | -------------------------------------------------------------------------------------------------------- | ---------- | ---------- |
-| `zookeeper`                  | ZooKeeper configuration.                                                                                 | `object`   | `{}`       |
-| `zookeeper.replicas`         | Number of ZooKeeper replicas.                                                                            | `int`      | `3`        |
-| `zookeeper.resources`        | Explicit CPU and memory configuration. When omitted, the preset defined in `resourcesPreset` is applied. | `object`   | `{}`       |
-| `zookeeper.resources.cpu`    | CPU available to each replica.                                                                           | `quantity` | `""`       |
-| `zookeeper.resources.memory` | Memory (RAM) available to each replica.                                                                  | `quantity` | `""`       |
-| `zookeeper.resourcesPreset`  | Default sizing preset used when `resources` is omitted.                                                  | `string`   | `c1.small` |
-| `zookeeper.size`             | Persistent Volume size for ZooKeeper.                                                                    | `quantity` | `5Gi`      |
-| `zookeeper.storageClass`     | StorageClass used to store the ZooKeeper data.                                                           | `string`   | `""`       |
+| Name                          | Description                                                                                              | Type       | Value      |
+| ----------------------------- | -------------------------------------------------------------------------------------------------------- | ---------- | ---------- |
+| `kafka`                       | Kafka configuration.                                                                                     | `object`   | `{}`       |
+| `kafka.replicas`              | Number of Kafka replicas.                                                                                | `int`      | `3`        |
+| `kafka.resources`             | Explicit CPU and memory configuration. When omitted, the preset defined in `resourcesPreset` is applied. | `object`   | `{}`       |
+| `kafka.resources.cpu`         | CPU available to each replica.                                                                           | `quantity` | `""`       |
+| `kafka.resources.memory`      | Memory (RAM) available to each replica.                                                                  | `quantity` | `""`       |
+| `kafka.resourcesPreset`       | Default sizing preset used when `resources` is omitted.                                                  | `string`   | `c1.small` |
+| `kafka.size`                  | Persistent Volume size for Kafka.                                                                        | `quantity` | `10Gi`     |
+| `kafka.storageClass`          | StorageClass used to store the Kafka data.                                                               | `string`   | `""`       |
+| `kafka.controllerStorageSize` | Persistent Volume size for KRaft controller metadata (used during ZK-to-KRaft migration).                | `quantity` | `5Gi`      |
 
 
 ## Parameter examples and reference
@@ -57,7 +43,7 @@
 ### resources and resourcesPreset
 
 `resources` sets explicit CPU and memory configurations for each replica.
-When left empty, the preset defined in `resourcesPreset` is applied.
+Every resource it leaves unset is taken from the preset defined in `resourcesPreset`.
 
 ```yaml
 resources:
@@ -68,14 +54,10 @@ resources:
 `resourcesPreset` sets named CPU and memory configurations for each replica.
 This setting is ignored if the corresponding `resources` value is set.
 
-Presets follow a cloud-style `<series>.<size>` naming convention. Five series cover the full CPU-to-memory ratio range (`t1` 1:0.5, `c1` 1:1, `s1` 1:2, `u1` 1:4, `m1` 1:8) and each series ships eight sizes (`nano` through `4xlarge`). The legacy flat names (`nano`, `micro`, `small`, `medium`, `large`, `xlarge`, `2xlarge`) remain accepted as deprecated aliases of their 1:1 instance-type equivalents.
+Presets follow a cloud-style `<series>.<size>` naming convention. Five series cover the full CPU-to-memory ratio range (`t1` 1:0.5, `c1` 1:1, `s1` 1:2, `u1` 1:4, `m1` 1:8) and each series ships eight sizes (`nano` through `4xlarge`). The legacy flat names (`nano`, `micro`, `small`, `medium`, `large`, `xlarge`, `2xlarge`) remain accepted as deprecated aliases and keep their original sizes, which do not follow one series: `nano` through `small` equal the `t1` sizes of the same name, while `medium` equals `c1.small` rather than `c1.medium`.
 
 See [`docs/operations/resource-presets.md`](../../../docs/operations/resource-presets.md) for the full size matrix and the legacy-to-instance-type mapping.
 
-### Authentication
-
-This chart does not configure listener authentication. When TLS is enabled on the external listener, clients can connect without credentials. To require authentication, use Strimzi's `KafkaUser` resource with an appropriate `authentication` type (`tls`, `scram-sha-512`, or `oauth`) outside this chart. See the [Strimzi documentation on KafkaUser](https://strimzi.io/docs/operators/latest/overview.html#security-options_str) for details.
-
 ### topics
 
 ```yaml
@@ -94,3 +76,47 @@ topics:
     partitions: 1
     replicas: 3
 ```
+
+## ZooKeeper to KRaft Migration
+
+The chart is pure KRaft — it ships a Kafka CR annotated `strimzi.io/kraft: enabled` with no `spec.zookeeper` block. The broker and controller `KafkaNodePool` resources are **not** regular chart manifests: they are created and reconciled by the migration Job (a `pre-install,pre-upgrade` Helm hook) on every install and upgrade. This is deliberate. The hook has to create the pools and walk Strimzi's migration state machine *before* the main release apply, and a resource a hook creates cannot also be a normal chart manifest without Helm failing the migrating upgrade — its 3-way merge finds the pool in the new manifest and live in the cluster but absent from the previous (ZooKeeper) revision, and aborts with `original object KafkaNodePool ... not found`, leaving the release stuck `failed` even though the cluster migrated fine. Keeping the pools hook-owned avoids that whole class of conflict.
+
+Existing ZooKeeper-based instances are migrated automatically on the next chart upgrade. The Job is idempotent and safe to re-run.
+
+### How it works
+
+1. The Job runs on install and upgrade. It first ensures both `KafkaNodePool`s exist (creating or updating them), then decides what to do from the Kafka CR.
+2. It inspects the Kafka CR: a genuine NotFound means a fresh install (the pools are ensured and the main apply creates the KRaft Kafka CR — nothing to migrate); a CR already annotated `strimzi.io/kraft=enabled` or in `status.kafkaMetadataState: KRaft` means done; any other read error aborts (fail closed) rather than risk driving a live ZooKeeper cluster. Otherwise (typically `ZooKeeper` state) it migrates.
+3. For a migrating cluster the broker pool is named exactly `kafka` — Strimzi derives broker and PVC names as `<cluster>-<pool>-<id>`, so only that name reuses the existing `<cluster>-kafka-N` brokers and their data in place — while the controller pool pins its node IDs above the broker range (`strimzi.io/next-node-ids`) so the broker pool keeps `[0..replicas-1]` and Strimzi cannot hand the existing broker IDs to the fresh controllers (which would recreate the brokers empty and orphan the data). Fresh clusters use the release-hashed `b-<hash>` broker pool instead.
+4. It annotates the Kafka CR with `strimzi.io/node-pools=enabled` and `strimzi.io/kraft=migration`, then polls `status.kafkaMetadataState` and waits for the migration to reach `KRaftPostMigration | PreKRaft | KRaft`.
+5. Only once that safe state is reached does it flip the annotation to `strimzi.io/kraft=enabled` and wait until the state reaches `KRaft`; if the wait times out in an intermediate state the Job aborts (`exit 1`) so Helm fails the upgrade and the next reconcile retries from where the migration left off.
+6. When the Job succeeds, the main release apply settles the KRaft Kafka CR, which already matches the migrated state.
+
+### Observability and escape hatches
+
+- Tail the Job logs to follow migration progress: `kubectl logs -n <namespace> job/<release>-kafka-migration`
+- Monitor `status.kafkaMetadataState` on the Kafka CR directly.
+- Until the cluster reaches `PreKRaft`, Strimzi's `rollback` annotation stays available as a manual escape hatch: `kubectl annotate kafka <release> strimzi.io/kraft=rollback --overwrite` (back to `KRaftDualWriting`), then `strimzi.io/kraft=disabled` to return to `ZooKeeper`; then delete the failed Job and retry. Past `PreKRaft` the state machine accepts only `enabled`.
+
+### Multiple Kafka clusters per namespace
+
+Fresh KRaft clusters can coexist in one namespace: each one's node pools get short, release-hashed names (`b-<hash>` for brokers, `c-<hash>` for controllers), unique because `KafkaNodePool` object names are namespace-unique and each release hashes differently, while every pod/PVC/Service is already prefixed by the (unique) cluster name. The hash keeps the pool name a fixed length rather than embedding the release name — which Strimzi already prepends as the cluster name — so the derived `<cluster>-<pool>-<id>` pod hostname stays within Kubernetes' 63-character limit even for long release names. So you can deploy any number of new Kafka instances side by side.
+
+The ZooKeeper→KRaft migration path is more constrained, but still fully automatic. To adopt an existing cluster's `<cluster>-kafka-N` brokers and their data in place, the broker pool must be named exactly `kafka`, and that fixed name is namespace-unique — so co-namespaced ZooKeeper clusters cannot all migrate at once, they must serialize on the `kafka` name (Strimzi's own guidance is one Kafka per namespace for this reason — [strimzi/strimzi-kafka-operator discussions/11120](https://github.com/orgs/strimzi/discussions/11120)). The migration hook handles that serialization automatically: whichever cluster's upgrade wins the `kafka` name (claimed atomically via `kubectl create`) migrates in place; a cluster that loses the race fails its hook and its next reconcile retries. Once a migrated cluster sees other ZooKeeper clusters still waiting, it frees the name — it stands up its own `b-<hash>` broker pool, drains all data off the `kafka`-pool brokers with a Cruise Control `KafkaRebalance` (`mode: remove-brokers`, done online, no downtime), deletes the drained `kafka` pool, and the next waiting cluster's retry adopts the freed name. The last cluster to migrate keeps `kafka`. So N co-namespaced ZooKeeper clusters all reach KRaft with no manual steps — sequentially, and with one full data drain per cluster except the last. Cruise Control is enabled only for the drain and removed after. Fresh KRaft clusters are never involved in any of this.
+
+### Deletion and PVC retention
+
+Both node pools set `deleteClaim: false`, so deleting a Kafka release intentionally leaves its data PVCs (`data-0-<cluster>-<pool>-N`) behind — this protects data across the migration and against accidental deletion. The trade-off is that the PVCs keep consuming tenant quota until removed by hand, and recreating a same-named Kafka rebinds the stale volumes, whose on-disk cluster id will not match the new cluster (`InconsistentClusterIdException`, CrashLoop). To truly start over, delete the leftover PVCs before recreating: `kubectl -n <namespace> delete pvc -l strimzi.io/cluster=<release>`.
+
+### No downgrade across the KRaft boundary
+
+Migration to KRaft is a point of no return once the cluster passes `PreKRaft` (before that, the escape hatch above still works). After it, Strimzi has no KRaft→ZooKeeper rollback, so neither lowering the `version` field on a running cluster nor rolling the whole app back to a pre-KRaft chart is supported: rolling the chart back would re-render the `spec.zookeeper` objects over live KRaft storage and drop the `strimzi.io/kraft` / `strimzi.io/node-pools` annotations — that does not restore ZooKeeper, it **damages** the Kafka cluster. Take a backup first, and never downgrade the kafka app or the platform once a cluster has reached KRaft (`strimzi.io/kraft=enabled`).
+
+**This chart release is a mandatory stop on the upgrade path.** A cluster that skips it arrives at a future Strimzi (0.46+) still on ZooKeeper, and 0.46 removed the ZooKeeper→KRaft migration entirely — there is then no supported path off ZooKeeper. Make sure every Kafka in the platform has reached KRaft on this release before upgrading past it.
+
+Budget a maintenance window of **up to a few hours per instance**: the in-place migration is tens of minutes (broker rolling restarts), and when several Kafkas share a namespace each one but the last also drains its full dataset off the shared `kafka` pool via a Cruise Control rebalance to free the name, which scales with data size.
+
+### Important notes
+
+- **Strimzi 0.45 is the last version supporting ZooKeeper.** Future Strimzi releases only support KRaft.
+- The `kafka.controllerStorageSize` parameter controls PV size for the new KRaft controller nodes (default: `5Gi`).
diff --git a/packages/apps/kafka/files/versions.yaml b/packages/apps/kafka/files/versions.yaml
new file mode 100644
index 0000000000..caf329aee3
--- /dev/null
+++ b/packages/apps/kafka/files/versions.yaml
@@ -0,0 +1,2 @@
+"v3.9": "3.9.0"
+"v3.8": "3.8.1"
diff --git a/packages/apps/kafka/templates/_jvm.tpl b/packages/apps/kafka/templates/_jvm.tpl
new file mode 100644
index 0000000000..6b541ef63b
--- /dev/null
+++ b/packages/apps/kafka/templates/_jvm.tpl
@@ -0,0 +1,20 @@
+{{- /*
+  JAVA_TOOL_OPTIONS for a Strimzi-managed container, from its resource limits.
+  The JDK 17 in the Strimzi images cannot see the container limits on kernels
+  built without CONFIG_MEMCG_V1 (JDK-8347811) and sizes itself from the host:
+  Strimzi's heap probe then hands every broker up to a 5Gi heap. Every java in
+  the container reads this variable, the probe included, so Strimzi's own
+  heap rules work again. jvmOptions -XX would not do: Strimzi moves those into
+  KAFKA_JVM_PERFORMANCE_OPTS, and kafka-run-class.sh drops its G1 tuning when
+  that variable is set. ActiveProcessorCount only when the chart sets a CPU
+  limit: a default a LimitRange adds at admission is not visible here, and
+  Strimzi template env takes no resourceFieldRef, so such a JVM still counts
+  the host CPUs.
+*/ -}}
+{{- define "kafka.javaToolOptions" -}}
+{{- $opts := list (printf "-XX:MaxRAM=%d" (include "cozy-lib.resources.toFloat" .memory | float64 | int64)) -}}
+{{- with .cpu -}}
+{{- $opts = append $opts (printf "-XX:ActiveProcessorCount=%d" (include "cozy-lib.resources.toFloat" . | float64 | ceil | int64)) -}}
+{{- end -}}
+{{- join " " $opts -}}
+{{- end -}}
diff --git a/packages/apps/kafka/templates/_versions.tpl b/packages/apps/kafka/templates/_versions.tpl
new file mode 100644
index 0000000000..30c63b3ef3
--- /dev/null
+++ b/packages/apps/kafka/templates/_versions.tpl
@@ -0,0 +1,159 @@
+{{- define "kafka.versionMap" }}
+{{- $versionMap := .Files.Get "files/versions.yaml" | fromYaml }}
+{{- if not (hasKey $versionMap .Values.version) }}
+    {{- printf `Kafka version %s is not supported, allowed versions are %v` $.Values.version (keys $versionMap | sortAlpha) | fail }}
+{{- end }}
+{{- index $versionMap .Values.version }}
+{{- end }}
+
+{{- /*
+  Short, namespace-unique node-pool names.
+
+  Strimzi derives every node (pod) and PVC name as <cluster>-<pool>-<id>, and the
+  cluster name is the release name. Naming a pool "<release>-controller" would
+  write the release name twice and blow the 63-character pod-hostname budget for
+  long-but-admission-legal release names. Instead a pool name is a short
+  deterministic token — a role letter plus an 8-hex digest of the release — which
+  is unique within the namespace (each release hashes differently) and adds a
+  fixed ~10 characters regardless of release length. The broker pool of a
+  MIGRATED cluster is the one exception: it stays exactly "kafka" to adopt the
+  existing <cluster>-kafka-N brokers and their data (see kafka.brokerPoolName).
+*/ -}}
+{{- define "kafka.poolHash" -}}
+{{- substr 0 8 (sha256sum .Release.Name) -}}
+{{- end -}}
+
+{{- /*
+  The controller pool name is a pure function of the release — no adoption/
+  self-ownership lookup like kafka.brokerPoolName has, on purpose. A KRaft
+  controller pool is ALWAYS created new: a fresh install makes one, and a
+  ZooKeeper cluster has no controller pool to adopt (KRaft controllers do not
+  exist under ZooKeeper). So there is never a pre-existing, differently-named
+  controller pool for this name to preserve — the broker's "kafka"-adoption
+  branch has no controller analogue because the underlying situation it handles
+  (live brokers to reuse in place) has no controller counterpart. No released
+  chart ships a controller pool under any other name, so no upgrade renames one.
+*/ -}}
+{{- define "kafka.controllerPoolName" -}}
+{{- printf "c-%s" (include "kafka.poolHash" .) -}}
+{{- end -}}
+
+{{- /*
+  KRaft controller quorum — fixed at creation, never re-derived on a day-2 edit.
+
+  The quorum must be static: Strimzi 0.45 cannot scale a controller node pool, so
+  flipping it (e.g. because a tenant raised kafka.replicas from 1 to 3) would wedge
+  the reconcile or lose the metadata quorum. So the size is pinned once: if the
+  controller pool already exists, keep its current replica count; only on first
+  creation is it computed — one controller for a single-node cluster
+  (kafka.replicas <= 1), three otherwise (odd quorum).
+
+  An empty lookup is safe here. Helm propagates any non-NotFound read error and
+  FAILS the whole render (see pkg/engine/lookup_func.go: only apierrors.IsNotFound
+  returns an empty result, every other error is returned and aborts template
+  execution), so a transient apiserver/RBAC miss makes the reconcile retry rather
+  than silently recompute a live quorum. An empty result therefore means a genuine
+  first creation or a client-side render (helm template/unittest) that is never
+  applied — either way, computing the initial value is correct.
+*/ -}}
+{{- define "kafka.controllerReplicas" -}}
+{{- $existing := lookup "kafka.strimzi.io/v1beta2" "KafkaNodePool" .Release.Namespace (include "kafka.controllerPoolName" .) -}}
+{{- $pinned := dig "spec" "replicas" 0 ($existing | default dict) -}}
+{{- if $pinned -}}{{ int $pinned }}{{- else if le (int .Values.kafka.replicas) 1 -}}1{{- else -}}3{{- end -}}
+{{- end -}}
+
+{{- /*
+  Broker KafkaNodePool name — a short release-hashed token for fresh installs so
+  several Kafka clusters can coexist in one namespace, but exactly "kafka" for a
+  cluster being migrated from ZooKeeper.
+
+  Strimzi derives node and PVC names as <cluster>-<pool>-<id>. A fresh KRaft
+  cluster has no prior state to preserve, so its broker pool is named "b-<hash>"
+  — unique within the namespace (each release hashes differently), letting
+  multiple fresh clusters live side by side without doubling the release name
+  into every pod hostname. A pre-node-pool ZooKeeper cluster, however, has
+  brokers "<cluster>-kafka-N", and only a pool named exactly "kafka" adopts those
+  brokers (and their PVCs) in place during migration.
+
+  Resolution (lookup runs at render time, before the pre-upgrade migration Job):
+   - this cluster already owns a "kafka" pool          -> "kafka"    (migrated, steady state)
+   - this cluster already owns a "b-<hash>" pool       -> "b-<hash>" (fresh, steady state)
+   - an existing non-KRaft CR with no release pool yet -> "kafka"    (classic ZK about to migrate)
+   - nothing exists                                    -> "b-<hash>" (fresh install)
+
+  Safety of the lookup: Helm propagates any non-NotFound read error and fails the
+  whole render (pkg/engine/lookup_func.go returns an empty result only on
+  apierrors.IsNotFound), so a transient apiserver/RBAC miss makes the reconcile
+  retry — it never silently resolves a live migrated cluster to "b-<hash>" and
+  lets a later upgrade prune the "kafka" pool. An empty lookup means genuine
+  absence: a real fresh install, or a client-side render (helm template/unittest)
+  that is never applied.
+
+  Because "kafka" is a fixed, namespace-unique name, co-namespaced ZooKeeper->KRaft
+  migrations run one at a time: while another cluster owns the "kafka" pool, this
+  cluster's render fails closed and its HelmRelease retries. The migration hook
+  drains the first cluster off the shared pool with a Cruise Control rebalance and
+  frees the name, then the waiting cluster retries into it — so every co-namespaced
+  Kafka reaches KRaft, not just the first (strimzi/strimzi-kafka-operator
+  discussions/11120). Fresh KRaft clusters are never affected. lookup returns
+  nothing during `helm template`, so unit tests resolve to the fresh "b-<hash>"
+  default.
+*/ -}}
+{{- define "kafka.brokerPoolName" -}}
+{{- $release := .Release.Name -}}
+{{- $ns := .Release.Namespace -}}
+{{- $brokerFresh := printf "b-%s" (include "kafka.poolHash" .) -}}
+{{- $name := $brokerFresh -}}
+{{- $kp := lookup "kafka.strimzi.io/v1beta2" "KafkaNodePool" $ns "kafka" -}}
+{{- $kpOwner := "" -}}
+{{- if $kp -}}{{- $kpOwner = dig "metadata" "labels" "strimzi.io/cluster" "" $kp -}}{{- end -}}
+{{- if and $kp (eq $kpOwner $release) -}}
+  {{- /* Migrated, steady state: this cluster owns the adopted "kafka" pool. */ -}}
+  {{- $name = "kafka" -}}
+{{- else -}}
+  {{- $existingCR := lookup "kafka.strimzi.io/v1beta2" "Kafka" $ns $release -}}
+  {{- $ownBrokerPool := lookup "kafka.strimzi.io/v1beta2" "KafkaNodePool" $ns $brokerFresh -}}
+  {{- $kraftAnn := "" -}}
+  {{- if $existingCR -}}{{- $kraftAnn = dig "metadata" "annotations" "strimzi.io/kraft" "" $existingCR -}}{{- end -}}
+  {{- if $ownBrokerPool -}}
+    {{- /* Fresh KRaft cluster, steady state: it already owns its "b-<hash>" pool. */ -}}
+    {{- $name = $brokerFresh -}}
+  {{- else if and $existingCR (ne $kraftAnn "enabled") -}}
+    {{- /* Classic ZooKeeper cluster about to migrate: adopt its brokers as "kafka". */ -}}
+    {{- if and $kp (ne $kpOwner "") (ne $kpOwner $release) -}}
+      {{- fail (printf "Kafka %q is waiting to migrate: namespace %q still has the shared \"kafka\" broker pool owned by cluster %q, which is migrating first. Strimzi node pool names are namespace-unique, so co-namespaced ZooKeeper->KRaft migrations run one at a time (see strimzi/strimzi-kafka-operator discussions/11120): %q drains off the shared pool and frees the name, then this HelmRelease retries into it automatically — no manual action needed. Fresh KRaft clusters are unaffected." $release $ns $kpOwner $kpOwner) -}}
+    {{- end -}}
+    {{- $name = "kafka" -}}
+  {{- end -}}
+  {{- /* else: fresh install (no CR, no own pool) -> "b-<hash>". A transient read
+         error can't reach here silently: Helm propagates every non-NotFound error
+         and fails the render, so an empty lookup means genuine absence (a real
+         fresh install, or a client-side helm-template render that is never
+         applied), never a flaked read of a live migrated cluster's "kafka" pool. */ -}}
+{{- end -}}
+{{- $name -}}
+{{- end -}}
+
+{{- /*
+  Guard the 63-char DNS-1123 label budget for KRaft node (pod) hostnames.
+
+  Strimzi derives node names as <cluster>-<pool>-<id>. The short hashed pool
+  names keep this well under budget for almost every release name, but the very
+  longest admission-legal names (a release near the 53-char Helm limit) can still
+  push the derived controller node name a few characters over 63, at which point
+  Strimzi cannot create the pod and the KRaft control plane silently never comes
+  up. Fail the render early with an actionable message instead. The controller
+  pool is checked because its node ids run highest.
+*/ -}}
+{{- define "kafka.assertNameLength" -}}
+{{- $release := .Release.Name -}}
+{{- $pool := include "kafka.controllerPoolName" . -}}
+{{- $controllerReplicas := int (include "kafka.controllerReplicas" .) -}}
+{{- /* Highest node id under Strimzi's contiguous per-cluster id assignment. */ -}}
+{{- $maxId := sub (add (int .Values.kafka.replicas) $controllerReplicas) 1 -}}
+{{- $node := printf "%s-%s-%d" $release $pool $maxId -}}
+{{- if gt (len $node) 63 -}}
+{{- $over := sub (len $node) 63 -}}
+{{- fail (printf "kafka: release %q is too long — the derived KRaft controller node name %q is %d characters, over the 63-character Kubernetes DNS-1123 label limit for pod hostnames. Shorten the Kafka application name by at least %d character(s)." $release $node (len $node) $over) -}}
+{{- end -}}
+{{- end -}}
diff --git a/packages/apps/kafka/templates/dashboard-resourcemap.yaml b/packages/apps/kafka/templates/dashboard-resourcemap.yaml
index 4284bd8940..ed6ab74529 100644
--- a/packages/apps/kafka/templates/dashboard-resourcemap.yaml
+++ b/packages/apps/kafka/templates/dashboard-resourcemap.yaml
@@ -28,7 +28,7 @@ rules:
   - workloadmonitors
   resourceNames:
   - {{ .Release.Name }}
-  - {{ $.Release.Name }}-zookeeper
+  - {{ .Release.Name }}-controller
   verbs: ["get", "list", "watch"]
 ---
 kind: RoleBinding
diff --git a/packages/apps/kafka/templates/hooks/delete.yaml b/packages/apps/kafka/templates/hooks/delete.yaml
new file mode 100644
index 0000000000..e54c5b716b
--- /dev/null
+++ b/packages/apps/kafka/templates/hooks/delete.yaml
@@ -0,0 +1,188 @@
+---
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: "{{ .Release.Name }}-pre-delete"
+  labels:
+    app.kubernetes.io/instance: "{{ .Release.Name }}"
+  annotations:
+    "helm.sh/hook": pre-delete
+    "helm.sh/hook-weight": "10"
+    # No hook-succeeded: the script exits 0 on the degraded path too, where the
+    # finalizer outlived the 180s wait and the only record that it did is this
+    # Job's log. Deleting on success takes that record seconds after it is
+    # written, leaving an operator with a namespace that will not finalize and
+    # nothing to read. ttlSecondsAfterFinished reclaims it on a timescale a
+    # human can act within instead.
+    "helm.sh/hook-delete-policy": before-hook-creation
+spec:
+  ttlSecondsAfterFinished: 3600
+  # 270 + terminationGracePeriodSeconds 10 stays under helm-controller's 300s
+  # default, and leaves 90s over the 180s wait below for scheduling and the
+  # image pull. That headroom is the part to keep in mind when either number is
+  # tuned: a deadline that fires mid-wait kills the Job, and with
+  # backoffLimit: 0 the hook returns non-zero, which is the wedged uninstall the
+  # deliberate exit 0 on the timeout branch exists to avoid. Raise this and the
+  # wait together, or not at all.
+  activeDeadlineSeconds: 270
+  backoffLimit: 0
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/instance: "{{ .Release.Name }}"
+        policy.cozystack.io/allow-to-apiserver: "true"
+    spec:
+      serviceAccountName: "{{ .Release.Name }}-pre-delete"
+      restartPolicy: Never
+      terminationGracePeriodSeconds: 10
+      securityContext:
+        runAsNonRoot: true
+        runAsUser: 65534
+        runAsGroup: 65534
+        seccompProfile:
+          type: RuntimeDefault
+      containers:
+        - name: cleanup
+          image: '{{ include "cozy-lib.image" (list "clastix/kubectl:v1.32@sha256:b9ef7d8dbe65bcc81a46c09b8dc7543103055021c4f43287bf59e92a8f4fe05c" $) }}'
+          securityContext:
+            allowPrivilegeEscalation: false
+            readOnlyRootFilesystem: true
+            capabilities:
+              drop: ["ALL"]
+          resources:
+            requests:
+              cpu: 10m
+              memory: 64Mi
+            limits:
+              cpu: 200m
+              memory: 128Mi
+          env:
+            - name: HOME
+              value: /tmp
+          command:
+            - /bin/sh
+            - -c
+            - |
+              set -eu
+              echo "Deleting KafkaTopics for {{ .Release.Name }} before the topic-operator is removed"
+              # The call carries no request timeout, deliberately. Any non-zero
+              # value for that flag makes kubectl skip its in-cluster
+              # credentials: client-go consults them only while the assembled
+              # config still equals the default, and the flag lands in that
+              # config. kubectl then talks to its built-in default cluster,
+              # localhost:8080, is refused, and this script reads the refusal as
+              # a failed delete and exits 1 -- which returns from Uninstall.Run
+              # before anything is removed and wedges every uninstall of this
+              # release. It leaves no trace in the rendered manifest; only a live
+              # uninstall shows it (#4276). The call is bounded by --timeout
+              # above for the watch and by activeDeadlineSeconds for the whole
+              # Job, the shape packages/apps/tenant/templates/cleanup-job.yaml
+              # uses and documents.
+              if ! out=$(kubectl -n {{ .Release.Namespace }} delete kafkatopics.kafka.strimzi.io \
+                    -l 'strimzi.io/cluster={{ .Release.Name }}' \
+                    --ignore-not-found=true \
+                    --wait=true \
+                    --timeout=180s 2>&1); then
+                printf '%s\n' "${out}"
+                case "${out}" in
+                  *"the server doesn't have a resource type"*|*"no matches for kind"*)
+                    echo "KafkaTopic CRD absent; nothing to delete" ;;
+                  *"timed out waiting for the condition"*)
+                    echo "WARNING: topics still hold the strimzi.io/topic-operator finalizer after 180s." >&2
+                    echo "WARNING: leaving them behind so the uninstall can finish; clear the finalizer by hand." >&2 ;;
+                  *)
+                    echo "ERROR: deleting KafkaTopics failed: ${out}" >&2; exit 1 ;;
+                esac
+              else
+                printf '%s\n' "${out}"
+              fi
+
+              # The migration hook creates the node pools with kubectl apply, so
+              # they are not in the release manifest and the uninstall does not
+              # remove them, and each pool owns the StrimziPodSet that runs its
+              # brokers. After the topics, because the topic operator clears
+              # their finalizers through those brokers; also after the timeout
+              # branch above, since this is the last chance to remove them.
+              # --wait=false: the pods go by garbage collection, and waiting
+              # would spend the headroom the deadline above leaves. No request
+              # timeout either, for the reason given on the topic call.
+              echo "Deleting KafkaNodePools for {{ .Release.Name }}"
+              if ! out=$(kubectl -n {{ .Release.Namespace }} delete kafkanodepools.kafka.strimzi.io \
+                    -l 'strimzi.io/cluster={{ .Release.Name }}' \
+                    --ignore-not-found=true \
+                    --wait=false 2>&1); then
+                printf '%s\n' "${out}"
+                case "${out}" in
+                  *"the server doesn't have a resource type"*|*"no matches for kind"*)
+                    echo "KafkaNodePool CRD absent; nothing to delete" ;;
+                  *)
+                    # Non-zero, unlike the topic timeout: once the uninstall
+                    # completes, Helm never runs this hook for the release
+                    # again, so a pool left now keeps its brokers for good.
+                    # Failing stops the uninstall before it deletes anything,
+                    # and helm-controller retries it.
+                    echo "ERROR: deleting KafkaNodePools failed: ${out}" >&2; exit 1 ;;
+                esac
+              else
+                printf '%s\n' "${out}"
+              fi
+          volumeMounts:
+            - name: tmp
+              mountPath: /tmp
+      volumes:
+        - name: tmp
+          emptyDir: {}
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: "{{ .Release.Name }}-pre-delete"
+  labels:
+    app.kubernetes.io/instance: "{{ .Release.Name }}"
+  annotations:
+    "helm.sh/hook": pre-delete
+    "helm.sh/hook-weight": "0"
+    # hook-succeeded, unlike the Job above: the Job reclaims itself through
+    # ttlSecondsAfterFinished, this has no such clock and would otherwise
+    # outlive the release. Reaping runs only once the Job is terminal, which
+    # activeDeadlineSeconds guarantees happens first.
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: "{{ .Release.Name }}-pre-delete"
+  labels:
+    app.kubernetes.io/instance: "{{ .Release.Name }}"
+  annotations:
+    "helm.sh/hook": pre-delete
+    "helm.sh/hook-weight": "5"
+    # Reaped with the ServiceAccount above, for the reason recorded there.
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+rules:
+  - apiGroups: ["kafka.strimzi.io"]
+    resources: ["kafkatopics"]
+    verbs: ["get", "list", "watch", "delete"]
+  - apiGroups: ["kafka.strimzi.io"]
+    resources: ["kafkanodepools"]
+    verbs: ["list", "delete"]
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: "{{ .Release.Name }}-pre-delete"
+  labels:
+    app.kubernetes.io/instance: "{{ .Release.Name }}"
+  annotations:
+    "helm.sh/hook": pre-delete
+    "helm.sh/hook-weight": "5"
+    # Reaped with the ServiceAccount above, for the reason recorded there.
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: "{{ .Release.Name }}-pre-delete"
+subjects:
+  - kind: ServiceAccount
+    name: "{{ .Release.Name }}-pre-delete"
+    namespace: "{{ .Release.Namespace }}"
diff --git a/packages/apps/kafka/templates/kafka.yaml b/packages/apps/kafka/templates/kafka.yaml
index 49876bacf7..167a43b05d 100644
--- a/packages/apps/kafka/templates/kafka.yaml
+++ b/packages/apps/kafka/templates/kafka.yaml
@@ -12,8 +12,11 @@
   Internal TLS listener (port 9093) is always on; Strimzi manages the PKI.
   Null detection uses `kindIs "invalid"` (canonical pattern) — see _tls.tpl.
 */ -}}
+{{- include "kafka.assertNameLength" . -}}
 {{- $tlsEnabled := include "kafka.tls.enabled" . | trim -}}
 {{- $showExternal := .Values.external -}}
+{{- $kafkaVersion := include "kafka.versionMap" . -}}
+{{- $entityOperatorMemory := "512Mi" -}}
 apiVersion: kafka.strimzi.io/v1beta2
 kind: Kafka
 metadata:
@@ -21,10 +24,12 @@ metadata:
   labels:
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
+  annotations:
+    strimzi.io/node-pools: enabled
+    strimzi.io/kraft: enabled
 spec:
   kafka:
-    replicas: {{ .Values.kafka.replicas }}
-    resources: {{- include "cozy-lib.resources.defaultingSanitize" (list .Values.kafka.resourcesPreset .Values.kafka.resources $) | nindent 6 }}
+    version: {{ $kafkaVersion }}
     listeners:
       - name: plain
         port: 9092
@@ -60,36 +65,6 @@ spec:
       default.replication.factor: 3
       min.insync.replicas: 2
       {{- end }}
-    storage:
-      type: jbod
-      volumes:
-      - id: 0
-        type: persistent-claim
-        {{- with .Values.kafka.size }}
-        size: {{ . }}
-        {{- end }}
-        {{- with .Values.kafka.storageClass }}
-        class: {{ . }}
-        {{- end }}
-        deleteClaim: true
-    metricsConfig:
-      type: jmxPrometheusExporter
-      valueFrom:
-        configMapKeyRef:
-          name: {{ .Release.Name }}-metrics
-          key: kafka-metrics-config.yml
-  zookeeper:
-    replicas: {{ .Values.zookeeper.replicas }}
-    resources: {{- include "cozy-lib.resources.defaultingSanitize" (list .Values.zookeeper.resourcesPreset .Values.zookeeper.resources $) | nindent 6 }}
-    storage:
-      type: persistent-claim
-      {{- with .Values.zookeeper.size }}
-      size: {{ . }}
-      {{- end }}
-      {{- with .Values.kafka.storageClass }}
-      class: {{ . }}
-      {{- end }}
-      deleteClaim: true
     metricsConfig:
       type: jmxPrometheusExporter
       valueFrom:
@@ -97,8 +72,26 @@ spec:
           name: {{ .Release.Name }}-metrics
           key: kafka-metrics-config.yml
   entityOperator:
-    topicOperator: {}
-    userOperator: {}
+    # Tenant namespaces ship a LimitRange that defaults containers to 128Mi.
+    # The topic-operator and user-operator are JVM processes and OOMKill at
+    # that default, leaving the entity-operator in CrashLoopBackOff so
+    # KafkaTopics/KafkaUsers never reconcile. Set explicit resources so they
+    # don't inherit the namespace default. JAVA_TOOL_OPTIONS: see
+    # kafka.javaToolOptions.
+    topicOperator:
+      resources:
+        requests:
+          cpu: 100m
+          memory: 256Mi
+        limits:
+          memory: {{ $entityOperatorMemory }}
+    userOperator:
+      resources:
+        requests:
+          cpu: 100m
+          memory: 256Mi
+        limits:
+          memory: {{ $entityOperatorMemory }}
     template:
       # `pod` accepts metadata + a flat set of pod-spec fields
       # (enableServiceLinks, securityContext, affinity, …) directly.
@@ -110,3 +103,11 @@ spec:
           labels:
             policy.cozystack.io/allow-to-apiserver: "true"
         enableServiceLinks: false
+      topicOperatorContainer:
+        env:
+          - name: JAVA_TOOL_OPTIONS
+            value: {{ include "kafka.javaToolOptions" (dict "memory" $entityOperatorMemory) | quote }}
+      userOperatorContainer:
+        env:
+          - name: JAVA_TOOL_OPTIONS
+            value: {{ include "kafka.javaToolOptions" (dict "memory" $entityOperatorMemory) | quote }}
diff --git a/packages/apps/kafka/templates/metrics-configmap.yaml b/packages/apps/kafka/templates/metrics-configmap.yaml
index da2a15dab1..e00bd87ec0 100644
--- a/packages/apps/kafka/templates/metrics-configmap.yaml
+++ b/packages/apps/kafka/templates/metrics-configmap.yaml
@@ -165,34 +165,3 @@ data:
     - pattern: "kafka.server<type=broker-metadata-metrics><>(.+):"
       name: kafka_server_brokermetadatametrics_$1
       type: GAUGE
-  zookeeper-metrics-config.yml: |
-    # See https://github.com/prometheus/jmx_exporter for more info about JMX Prometheus Exporter metrics
-    lowercaseOutputName: true
-    rules:
-    # replicated Zookeeper
-    - pattern: "org.apache.ZooKeeperService<name0=ReplicatedServer_id(\\d+)><>(\\w+)"
-      name: "zookeeper_$2"
-      type: GAUGE
-    - pattern: "org.apache.ZooKeeperService<name0=ReplicatedServer_id(\\d+), name1=replica.(\\d+)><>(\\w+)"
-      name: "zookeeper_$3"
-      type: GAUGE
-      labels:
-        replicaId: "$2"
-    - pattern: "org.apache.ZooKeeperService<name0=ReplicatedServer_id(\\d+), name1=replica.(\\d+), name2=(\\w+)><>(Packets\\w+)"
-      name: "zookeeper_$4"
-      type: COUNTER
-      labels:
-        replicaId: "$2"
-        memberType: "$3"
-    - pattern: "org.apache.ZooKeeperService<name0=ReplicatedServer_id(\\d+), name1=replica.(\\d+), name2=(\\w+)><>(\\w+)"
-      name: "zookeeper_$4"
-      type: GAUGE
-      labels:
-        replicaId: "$2"
-        memberType: "$3"
-    - pattern: "org.apache.ZooKeeperService<name0=ReplicatedServer_id(\\d+), name1=replica.(\\d+), name2=(\\w+), name3=(\\w+)><>(\\w+)"
-      name: "zookeeper_$4_$5"
-      type: GAUGE
-      labels:
-        replicaId: "$2"
-        memberType: "$3"
diff --git a/packages/apps/kafka/templates/migration-hook.yaml b/packages/apps/kafka/templates/migration-hook.yaml
new file mode 100644
index 0000000000..9877f699b4
--- /dev/null
+++ b/packages/apps/kafka/templates/migration-hook.yaml
@@ -0,0 +1,530 @@
+{{- /*
+  Node pools are managed entirely by this hook, NOT by a regular chart manifest.
+
+  Reason: an in-place ZooKeeper->KRaft migration must create the broker and
+  controller KafkaNodePools BEFORE the main release apply (Strimzi has to walk
+  the migration state machine while the old ZooKeeper Kafka CR is still live).
+  If the pools were also regular chart manifests, Helm's main apply would try to
+  reconcile a resource that exists in the cluster but was absent from the
+  previous (ZooKeeper) release revision, and fail the upgrade with
+  "original object KafkaNodePool ... not found" — leaving the HelmRelease stuck
+  in a failed state even though the Kafka cluster migrated fine. Keeping the
+  pools out of the main manifest and applying them here (idempotently, on every
+  install and upgrade) avoids that whole class of Helm 3-way-merge conflict.
+
+  Multiple ZooKeeper Kafkas per namespace: only a pool named exactly "kafka"
+  adopts a ZooKeeper cluster's existing <cluster>-kafka-N brokers in place, and
+  that name is namespace-unique, so migrations serialize on it. To let every
+  co-namespaced cluster reach KRaft, a cluster that took "kafka" and finds other
+  ZooKeeper clusters still waiting frees the name after migrating: it stands up
+  its own release-hashed "b-<hash>" broker pool, drains all data off the "kafka"
+  pool brokers with a Cruise Control KafkaRebalance, deletes the "kafka" pool,
+  and the next waiting cluster's retry grabs the freed name. The last one to
+  migrate keeps "kafka". Cruise Control is enabled only for the drain and removed
+  after (kafka.yaml never sets spec.cruiseControl, so Helm does not fight it).
+*/ -}}
+{{- $controllerReplicas := include "kafka.controllerReplicas" . }}
+{{- $brokerPool := include "kafka.brokerPoolName" . }}
+{{- $freshBrokerPool := printf "b-%s" (include "kafka.poolHash" .) }}
+{{- $cruiseControlMemory := "1Gi" }}
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ .Release.Name }}-kafka-migration
+  annotations:
+    helm.sh/hook: pre-install,pre-upgrade
+    helm.sh/hook-weight: "1"
+    helm.sh/hook-delete-policy: before-hook-creation
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: {{ .Release.Name }}-kafka-migration
+  annotations:
+    helm.sh/hook: pre-install,pre-upgrade
+    helm.sh/hook-weight: "1"
+    helm.sh/hook-delete-policy: before-hook-creation
+rules:
+- apiGroups: ["kafka.strimzi.io"]
+  # kafkanodepools: delete is needed to remove the drained "kafka" pool when
+  # freeing the name; kafkarebalances drive the Cruise Control drain.
+  resources: ["kafkas", "kafkanodepools", "kafkarebalances"]
+  verbs: ["get", "list", "watch", "create", "patch", "update", "delete"]
+- apiGroups: [""]
+  # The drained "kafka" pool's PVCs (deleteClaim:false keeps them) are removed
+  # once empty, so freeing the name does not leak storage. "watch" is needed
+  # because `kubectl delete` waits on a watch by default — without it the delete
+  # still succeeds but logs noisy "cannot watch persistentvolumeclaims" errors.
+  resources: ["persistentvolumeclaims"]
+  verbs: ["get", "list", "watch", "delete"]
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: {{ .Release.Name }}-kafka-migration
+  annotations:
+    helm.sh/hook: pre-install,pre-upgrade
+    helm.sh/hook-weight: "1"
+    helm.sh/hook-delete-policy: before-hook-creation
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: {{ .Release.Name }}-kafka-migration
+subjects:
+  - kind: ServiceAccount
+    name: {{ .Release.Name }}-kafka-migration
+    namespace: {{ .Release.Namespace | quote }}
+---
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: {{ .Release.Name }}-kafka-migration
+  annotations:
+    helm.sh/hook: pre-install,pre-upgrade
+    helm.sh/hook-weight: "2"
+    # Only before-hook-creation: keep the previous (possibly failed) Job and its
+    # pod logs around for a post-mortem until the next attempt recreates it.
+    helm.sh/hook-delete-policy: before-hook-creation
+spec:
+  backoffLimit: 0
+  # Freeing the "kafka" name drains the whole dataset off the old brokers with a
+  # Cruise Control rebalance, which can take hours on a large cluster. The Job
+  # deadline must cover that; if it is exceeded the Job is killed, Helm fails the
+  # upgrade, and the next reconcile re-runs this Job, which resumes from where it
+  # left off (every phase below is idempotent). The release's helm timeout must
+  # exceed this deadline or the migration is aborted before it can finish.
+  activeDeadlineSeconds: 21600
+  template:
+    metadata:
+      labels:
+        policy.cozystack.io/allow-to-apiserver: "true"
+    spec:
+      serviceAccountName: {{ .Release.Name }}-kafka-migration
+      restartPolicy: Never
+      containers:
+        - name: kubectl
+          image: {{ include "cozy-lib.image" (list "clastix/kubectl:v1.32@sha256:b9ef7d8dbe65bcc81a46c09b8dc7543103055021c4f43287bf59e92a8f4fe05c" $) }}
+          command: [sh, -ec]
+          args:
+            - |
+              set -eu
+
+              ns={{ .Release.Namespace | quote }}
+              name={{ .Release.Name | quote }}
+              brokerPool={{ $brokerPool | quote }}
+              freshBrokerPool={{ $freshBrokerPool | quote }}
+              rebalance="${name}-drain-kafka"
+              # Fully qualify the resources: the plural "kafkas" also exists in
+              # this chart's own apps.cozystack.io group, so a bare "kafka" could
+              # resolve to the tenant kind, which this hook's Role does not grant.
+              kafka=kafkas.kafka.strimzi.io
+              np=kafkanodepools.kafka.strimzi.io
+              kr=kafkarebalances.kafka.strimzi.io
+
+              # Every apply here passes --openapi-patch=false. Without it, applying
+              # an object that already exists makes kubectl download the cluster's
+              # whole OpenAPI v2 document only to learn that a custom resource
+              # takes a JSON merge patch: about 300Mi with the platform's CRDs,
+              # while this container runs under a tenant LimitRange default of
+              # 128Mi. With it kubectl builds the same merge patch from the
+              # last-applied annotation. Not --server-side: fields that
+              # "kubectl create" set on the "kafka" pool stay co-owned by that
+              # manager, so a server-side apply would never remove them.
+              # ---- Node-pool manifests (broker pool reused for the create-CAS) ----
+              broker_manifest=$(cat <<MANIFEST
+              apiVersion: kafka.strimzi.io/v1beta2
+              kind: KafkaNodePool
+              metadata:
+                # "kafka" for a cluster migrating from ZooKeeper (only that name
+                # adopts the existing <cluster>-kafka-N brokers and their data in
+                # place); "b-<hash>" for a fresh cluster. Resolved at render time
+                # by kafka.brokerPoolName.
+                name: ${brokerPool}
+                namespace: ${ns}
+                labels:
+                  strimzi.io/cluster: ${name}
+                  app.kubernetes.io/managed-by: Helm
+                annotations:
+                  meta.helm.sh/release-name: ${name}
+                  meta.helm.sh/release-namespace: ${ns}
+              spec:
+                replicas: {{ .Values.kafka.replicas }}
+                roles:
+                  - broker
+                resources: {{- include "cozy-lib.resources.defaultingSanitize" (list .Values.kafka.resourcesPreset .Values.kafka.resources $) | nindent 18 }}
+                # A pool template replaces spec.kafka.template whole, for every
+                # pool here: nothing set on the Kafka CR's template reaches these
+                # pods (KafkaPool.java at 0.45.1-rc1: https://github.com/strimzi/strimzi-kafka-operator/blob/0.45.1-rc1/cluster-operator/src/main/java/io/strimzi/operator/cluster/model/KafkaPool.java#L196-L218).
+                template:
+                  kafkaContainer:
+                    env:
+                      - name: JAVA_TOOL_OPTIONS
+                        value: {{ include "kafka.javaToolOptions" (include "cozy-lib.resources.defaultingSanitize" (list .Values.kafka.resourcesPreset .Values.kafka.resources $) | fromYaml).limits | quote }}
+                storage:
+                  type: jbod
+                  volumes:
+                  - id: 0
+                    type: persistent-claim
+                    {{- with .Values.kafka.size }}
+                    size: {{ . }}
+                    {{- end }}
+                    {{- with .Values.kafka.storageClass }}
+                    class: {{ . }}
+                    {{- end }}
+                    # deleteClaim:false is load-bearing here. Strimzi's PvcReconciler
+                    # deletes a pool's PVCs when the pool is removed, so with
+                    # deleteClaim:true the drain's deletion of the "kafka" pool (and
+                    # a plain pool teardown) would destroy the tenant's data instead
+                    # of leaving the volumes to be adopted / cleaned up deliberately.
+                    deleteClaim: false
+              MANIFEST
+              )
+
+              controller_manifest=$(cat <<MANIFEST
+              apiVersion: kafka.strimzi.io/v1beta2
+              kind: KafkaNodePool
+              metadata:
+                name: {{ include "kafka.controllerPoolName" . }}
+                namespace: ${ns}
+                labels:
+                  strimzi.io/cluster: ${name}
+                  app.kubernetes.io/managed-by: Helm
+                annotations:
+                  meta.helm.sh/release-name: ${name}
+                  meta.helm.sh/release-namespace: ${ns}
+                  # Pin controller node IDs above the broker range so the adopting
+                  # "kafka" broker pool keeps [0..replicas-1] and reuses the
+                  # existing <cluster>-kafka-N brokers and their PVCs in place.
+                  # Without this Strimzi hands the controller pool the lowest free
+                  # IDs — the broker IDs — recreating brokers empty and orphaning
+                  # the tenant's data.
+                  strimzi.io/next-node-ids: "[{{ .Values.kafka.replicas }}-999]"
+              spec:
+                replicas: {{ $controllerReplicas }}
+                roles:
+                  - controller
+                resources: {{- include "cozy-lib.resources.defaultingSanitize" (list .Values.kafka.resourcesPreset .Values.kafka.resources $) | nindent 18 }}
+                template:
+                  kafkaContainer:
+                    env:
+                      - name: JAVA_TOOL_OPTIONS
+                        value: {{ include "kafka.javaToolOptions" (include "cozy-lib.resources.defaultingSanitize" (list .Values.kafka.resourcesPreset .Values.kafka.resources $) | fromYaml).limits | quote }}
+                storage:
+                  type: jbod
+                  volumes:
+                  - id: 0
+                    type: persistent-claim
+                    size: {{ .Values.kafka.controllerStorageSize | default "5Gi" }}
+                    {{- with .Values.kafka.storageClass }}
+                    class: {{ . }}
+                    {{- end }}
+                    kraftMetadata: shared
+                    deleteClaim: false
+              MANIFEST
+              )
+
+              # ---- Ensure both node pools exist ----
+              # Broker pool ownership FIRST, before any apply, so a "kafka" pool
+              # owned by another cluster aborts without mutating anything. For a
+              # fresh cluster the name is the release-unique "b-<hash>" and there
+              # is no collision — a plain apply is safe. For a cluster migrating
+              # from ZooKeeper the name is the namespace-unique "kafka"; enforce
+              # one migration per namespace ATOMICALLY. A plain read-then-apply
+              # would race: two ZooKeeper Kafkas in one namespace upgraded
+              # together could both observe no owner and both apply, the second
+              # silently re-parenting the first's brokers. Instead, when the pool
+              # is absent, "kubectl create" is the atomic arbiter: exactly one
+              # concurrent creator wins; the loser's create fails, re-reads the
+              # owner, and aborts (fail fast — it retries once the winner frees
+              # the name).
+              if [ "$brokerPool" = "kafka" ]; then
+                if ! owner=$(kubectl -n "$ns" get "$np" kafka --ignore-not-found -o jsonpath='{.metadata.labels.strimzi\.io/cluster}' 2>&1); then
+                  echo "ERROR: reading the \"kafka\" node pool owner label failed: $owner" >&2
+                  exit 1
+                fi
+                if [ -z "$owner" ]; then
+                  echo "Creating broker pool \"kafka\"..."
+                  if echo "$broker_manifest" | kubectl create -f - 2>/tmp/createerr; then
+                    owner="$name"
+                  else
+                    if ! owner=$(kubectl -n "$ns" get "$np" kafka --ignore-not-found -o jsonpath='{.metadata.labels.strimzi\.io/cluster}' 2>&1); then
+                      echo "ERROR: re-reading the \"kafka\" node pool owner after create failure failed: $owner" >&2
+                      exit 1
+                    fi
+                    if [ -z "$owner" ]; then
+                      echo "ERROR: creating broker pool \"kafka\" failed: $(cat /tmp/createerr)" >&2
+                      exit 1
+                    fi
+                  fi
+                fi
+                if [ "$owner" != "$name" ]; then
+                  echo "ERROR: KafkaNodePool 'kafka' in namespace '$ns' already belongs to cluster '$owner'." >&2
+                  echo "Its ZooKeeper->KRaft migration is in progress and will free the name when done; this cluster's upgrade will retry and proceed then. (Strimzi node pool names are namespace-unique, so migrations serialize on the \"kafka\" name.)" >&2
+                  exit 1
+                fi
+              fi
+              echo "Ensuring broker KafkaNodePool \"$brokerPool\" exists..."
+              echo "$broker_manifest" | kubectl apply --openapi-patch=false -f -
+
+              echo "Ensuring controller KafkaNodePool exists..."
+              echo "$controller_manifest" | kubectl apply --openapi-patch=false -f -
+
+              # ---- Decide what to do from the Kafka CR ----
+              # Fail closed. --ignore-not-found makes kubectl exit 0 with empty
+              # output on a genuine NotFound (fresh install: the Kafka CR is
+              # created by the main release apply, after this hook) and exit
+              # non-zero only on a real error (apiserver/RBAC/timeout).
+              if ! found=$(kubectl -n "$ns" get "$kafka" "$name" --ignore-not-found -o name 2>&1); then
+                echo "ERROR: reading Kafka CR failed: $found" >&2
+                exit 1
+              fi
+              if [ -z "$found" ]; then
+                echo "No existing Kafka CR — fresh install. Node pools ensured; the main release apply will create the KRaft Kafka CR. Nothing to migrate."
+                exit 0
+              fi
+
+              # Read the current KRaft annotation / metadata state (fail closed).
+              if ! kraft=$(kubectl -n "$ns" get "$kafka" "$name" -o jsonpath='{.metadata.annotations.strimzi\.io/kraft}' 2>&1); then
+                echo "ERROR: reading the strimzi.io/kraft annotation failed: $kraft" >&2
+                exit 1
+              fi
+              if ! state=$(kubectl -n "$ns" get "$kafka" "$name" -o jsonpath='{.status.kafkaMetadataState}' 2>&1); then
+                echo "ERROR: reading kafkaMetadataState failed: $state" >&2
+                exit 1
+              fi
+              echo "Current strimzi.io/kraft='${kraft}', kafkaMetadataState='${state}'."
+
+              # ---- Migrate a ZooKeeper cluster (skip if already KRaft) ----
+              if [ "$kraft" != "enabled" ] && [ "$state" != "KRaft" ]; then
+                # Enabling node pools is idempotent. Only issue kraft=migration
+                # from a genuine pre-migration state: on a retry the cluster may
+                # already be at PreKRaft/KRaftPostMigration, where re-annotating
+                # "migration" is an invalid backward transition Strimzi rejects.
+                echo "Enabling node pools on the Kafka CR..."
+                kubectl -n "$ns" annotate "$kafka" "$name" strimzi.io/node-pools=enabled --overwrite
+                case "$state" in
+                  KRaftMigration|KRaftDualWriting|KRaftPostMigration|PreKRaft|KRaft)
+                    echo "Migration already past the ZooKeeper phase (state: $state); not re-issuing kraft=migration." ;;
+                  *)
+                    echo "Starting KRaft migration (kraft=migration)..."
+                    kubectl -n "$ns" annotate "$kafka" "$name" strimzi.io/kraft=migration --overwrite ;;
+                esac
+
+                echo "Waiting for migration to reach KRaftPostMigration..."
+                migration_ready=false
+                for i in $(seq 1 240); do
+                  state=$(kubectl -n "$ns" get "$kafka" "$name" -o jsonpath='{.status.kafkaMetadataState}' || echo "")
+                  case "$state" in
+                    KRaftPostMigration|PreKRaft|KRaft)
+                      echo "Reached state: $state"
+                      migration_ready=true
+                      break
+                      ;;
+                    *)
+                      echo "[$i/240] State: ${state}, waiting..."
+                      sleep 5
+                      ;;
+                  esac
+                done
+
+                # Strimzi only permits strimzi.io/kraft=enabled once the cluster
+                # has reached KRaftPostMigration. Applying it earlier — while
+                # brokers still depend on ZooKeeper — is unsafe and irreversible.
+                # If the wait timed out in an intermediate state, abort without
+                # finalising so Helm fails the upgrade and the next reconcile
+                # retries from where the migration left off.
+                if [ "$migration_ready" != "true" ]; then
+                  echo "ERROR: migration did not reach KRaftPostMigration (last state: ${state:-unknown})."
+                  echo "Refusing to apply strimzi.io/kraft=enabled in an unsafe state."
+                  exit 1
+                fi
+
+                echo "Finalising migration to KRaft..."
+                kubectl -n "$ns" annotate "$kafka" "$name" strimzi.io/kraft=enabled --overwrite
+
+                echo "Waiting for KRaft state..."
+                migrated=false
+                for i in $(seq 1 120); do
+                  state=$(kubectl -n "$ns" get "$kafka" "$name" -o jsonpath='{.status.kafkaMetadataState}' || echo "")
+                  if [ "$state" = "KRaft" ]; then
+                    echo "Migration complete."
+                    migrated=true
+                    break
+                  fi
+                  echo "[$i/120] State: ${state}, waiting..."
+                  sleep 5
+                done
+                if [ "$migrated" != "true" ]; then
+                  echo "ERROR: migration did not complete in time."
+                  exit 1
+                fi
+              else
+                echo "Kafka is already KRaft — no migration needed."
+              fi
+
+              # ---- Free the "kafka" name for the next waiting cluster ----
+              # Only relevant if THIS cluster ended up owning the shared "kafka"
+              # pool (a migrated ZooKeeper cluster). If other ZooKeeper Kafkas
+              # remain in the namespace, drain this cluster off "kafka" onto its
+              # release-hashed "b-<hash>" pool and delete "kafka" so the next one
+              # can adopt the name. Every step is idempotent so a killed Job
+              # resumes on retry.
+              if [ "$brokerPool" != "kafka" ]; then
+                echo "This cluster runs on \"$brokerPool\" (not the shared \"kafka\" pool); nothing to free."
+                exit 0
+              fi
+              # Reading fails open if the pipeline swallows the kubectl error: an
+              # empty list is indistinguishable from a failed read, and both would
+              # count 0 and keep the pool, stranding any co-namespaced ZK cluster
+              # still waiting. Capture the read status separately, like the drain
+              # read below.
+              if ! others_raw=$(kubectl -n "$ns" get "$kafka" -o jsonpath='{range .items[*]}{.metadata.name}={.metadata.annotations.strimzi\.io/kraft}{"\n"}{end}' 2>&1); then
+                echo "ERROR: could not list Kafka CRs in $ns to decide whether to free the \"kafka\" pool: $others_raw" >&2
+                exit 1
+              fi
+              others=$(printf '%s\n' "$others_raw" | awk -F= -v me="$name" '$1!="" && $1!=me && $2!="enabled"{c++} END{print c+0}')
+              if [ "$others" -eq 0 ]; then
+                echo "No other ZooKeeper Kafka clusters in $ns; keeping the \"kafka\" pool. Done."
+                exit 0
+              fi
+              echo "$others other ZooKeeper Kafka cluster(s) remain in $ns; freeing the \"kafka\" pool name..."
+
+              # F1: stand up this cluster's own release-hashed broker pool with
+              # node IDs pinned high, clear of the existing broker/controller IDs.
+              echo "Creating target broker pool \"$freshBrokerPool\"..."
+              cat <<POOL | kubectl apply --openapi-patch=false -f -
+              apiVersion: kafka.strimzi.io/v1beta2
+              kind: KafkaNodePool
+              metadata:
+                name: ${freshBrokerPool}
+                namespace: ${ns}
+                labels:
+                  strimzi.io/cluster: ${name}
+                  app.kubernetes.io/managed-by: Helm
+                annotations:
+                  meta.helm.sh/release-name: ${name}
+                  meta.helm.sh/release-namespace: ${ns}
+                  strimzi.io/next-node-ids: "[1000-1099]"
+              spec:
+                replicas: {{ .Values.kafka.replicas }}
+                roles:
+                  - broker
+                resources: {{- include "cozy-lib.resources.defaultingSanitize" (list .Values.kafka.resourcesPreset .Values.kafka.resources $) | nindent 18 }}
+                template:
+                  kafkaContainer:
+                    env:
+                      - name: JAVA_TOOL_OPTIONS
+                        value: {{ include "kafka.javaToolOptions" (include "cozy-lib.resources.defaultingSanitize" (list .Values.kafka.resourcesPreset .Values.kafka.resources $) | fromYaml).limits | quote }}
+                storage:
+                  type: jbod
+                  volumes:
+                  - id: 0
+                    type: persistent-claim
+                    {{- with .Values.kafka.size }}
+                    size: {{ . }}
+                    {{- end }}
+                    {{- with .Values.kafka.storageClass }}
+                    class: {{ . }}
+                    {{- end }}
+                    deleteClaim: false
+              POOL
+
+              # F2: enable Cruise Control just for the drain (kafka.yaml never sets
+              # spec.cruiseControl, so Helm's apply does not remove it). Give it
+              # explicit resources: Cruise Control is a JVM, and a tenant namespace
+              # LimitRange defaults containers to 128Mi, which OOMs it before it
+              # can produce a proposal (same reason the entity-operator carries
+              # explicit resources in kafka.yaml). JAVA_TOOL_OPTIONS: see
+              # kafka.javaToolOptions.
+              echo "Enabling Cruise Control for the drain..."
+              {{- $ccEnv := list (dict "name" "JAVA_TOOL_OPTIONS" "value" (include "kafka.javaToolOptions" (dict "memory" $cruiseControlMemory))) }}
+              {{- $ccResources := dict "requests" (dict "cpu" "200m" "memory" "768Mi") "limits" (dict "memory" $cruiseControlMemory) }}
+              {{- $ccPatch := dict "spec" (dict "cruiseControl" (dict "resources" $ccResources "template" (dict "cruiseControlContainer" (dict "env" $ccEnv)))) }}
+              kubectl -n "$ns" patch "$kafka" "$name" --type merge -p '{{ $ccPatch | toJson }}'
+
+              # F3: drain all partitions off the "kafka" pool broker IDs.
+              kafkaIds=$(kubectl -n "$ns" get "$np" kafka -o jsonpath='{.status.nodeIds}' 2>/dev/null || echo "")
+              if [ -z "$kafkaIds" ] || [ "$kafkaIds" = "[]" ]; then
+                echo "ERROR: could not read the \"kafka\" pool node IDs; refusing to drain blindly." >&2
+                exit 1
+              fi
+              echo "Draining brokers $kafkaIds via Cruise Control rebalance..."
+              cat <<REB | kubectl apply --openapi-patch=false -f -
+              apiVersion: kafka.strimzi.io/v1beta2
+              kind: KafkaRebalance
+              metadata:
+                name: ${rebalance}
+                namespace: ${ns}
+                labels:
+                  strimzi.io/cluster: ${name}
+              spec:
+                mode: remove-brokers
+                brokers: ${kafkaIds}
+                # This drain is a mandatory broker evacuation — the "kafka" pool
+                # is being removed no matter what — so it must not be blocked by
+                # Cruise Control's capacity hard goals. Under a small resources
+                # preset CC's capacity MODEL can briefly over-estimate CPU from
+                # noisy samples (e.g. a broker rolling for an unrelated reason) and
+                # reject the proposal with CpuCapacityGoal even when real CPU is
+                # near idle. skipHardGoalCheck lets the evacuation proceed.
+                skipHardGoalCheck: true
+              REB
+
+              rebalanced=false
+              for i in $(seq 1 2000); do
+                st=$(kubectl -n "$ns" get "$kr" "$rebalance" -o jsonpath='{.status.conditions[*].type}' 2>/dev/null || echo "")
+                case " $st " in
+                  *" Ready "*)
+                    echo "Rebalance complete."
+                    rebalanced=true
+                    break ;;
+                  *" ProposalReady "*)
+                    echo "[$i] Proposal ready; approving..."
+                    kubectl -n "$ns" annotate "$kr" "$rebalance" strimzi.io/rebalance=approve --overwrite || true
+                    sleep 15 ;;
+                  *" NotReady "*)
+                    # A NotReady rebalance is not treated as terminal. Cruise
+                    # Control rejects proposals transiently while it settles: a
+                    # just-enabled CC is unreachable for a minute or two (its pod
+                    # and cruise-control-certs Secret are still coming up —
+                    # CruiseControlRetriableConnectionException), and its capacity
+                    # model can briefly over-estimate load from noisy samples and
+                    # trip an optimization goal even with skipHardGoalCheck. Both
+                    # clear once CC's metric windows age out, so refresh the
+                    # proposal (recompute against current metrics) and keep
+                    # polling. This also covers resume: a re-run of the Job finds a
+                    # stale NotReady rebalance and refreshes it instead of reading
+                    # its old failure forever. Only the loop timeout below is
+                    # terminal — then the Job fails and the next reconcile retries.
+                    reason=$(kubectl -n "$ns" get "$kr" "$rebalance" -o jsonpath='{.status.conditions[*].reason}' 2>/dev/null || echo "")
+                    echo "[$i] Rebalance NotReady (${reason}); refreshing the proposal and waiting for Cruise Control to settle..."
+                    kubectl -n "$ns" annotate "$kr" "$rebalance" strimzi.io/rebalance=refresh --overwrite || true
+                    sleep 15 ;;
+                  *)
+                    echo "[$i] Rebalance state: '${st}', waiting..."
+                    sleep 15 ;;
+                esac
+              done
+              if [ "$rebalanced" != "true" ]; then
+                echo "ERROR: rebalance did not complete within the Job deadline; will resume on the next retry."
+                exit 1
+              fi
+
+              # F4/F5: the drained "kafka" brokers now hold no partitions — remove
+              # the pool and its (now empty) PVCs. After this the render-time
+              # kafka.brokerPoolName resolves to "$freshBrokerPool" (this cluster
+              # owns it), so the cluster stays there on every future reconcile.
+              echo "Deleting the drained \"kafka\" pool and its PVCs..."
+              kubectl -n "$ns" delete "$np" kafka --ignore-not-found
+              for id in $(echo "$kafkaIds" | tr -d '[] ' | tr ',' ' '); do
+                kubectl -n "$ns" delete pvc "data-0-${name}-kafka-${id}" --ignore-not-found
+              done
+
+              # F6: tear Cruise Control back down and clean up the rebalance CR.
+              echo "Removing Cruise Control and the rebalance CR..."
+              kubectl -n "$ns" patch "$kafka" "$name" --type json -p '[{"op":"remove","path":"/spec/cruiseControl"}]' 2>/dev/null || true
+              kubectl -n "$ns" delete "$kr" "$rebalance" --ignore-not-found
+
+              echo "Freed the \"kafka\" pool name; this cluster now runs on \"$freshBrokerPool\". The next waiting cluster's retry will adopt it."
+              exit 0
diff --git a/packages/apps/kafka/templates/workloadmonitor.yaml b/packages/apps/kafka/templates/workloadmonitor.yaml
index ba58333edd..6c32983b10 100644
--- a/packages/apps/kafka/templates/workloadmonitor.yaml
+++ b/packages/apps/kafka/templates/workloadmonitor.yaml
@@ -1,3 +1,5 @@
+{{- $controllerReplicas := include "kafka.controllerReplicas" . }}
+{{- $brokerPool := include "kafka.brokerPoolName" . }}
 ---
 apiVersion: cozystack.io/v1alpha1
 kind: WorkloadMonitor
@@ -9,26 +11,26 @@ spec:
   replicas: {{ .Values.kafka.replicas }}
   minReplicas: 1
   kind: kafka
-  type: kafka
+  type: kafka-broker
   selector:
     app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/name: kafka
+    strimzi.io/pool-name: {{ $brokerPool }}
   version: {{ $.Chart.Version }}
-
 ---
-
 apiVersion: cozystack.io/v1alpha1
 kind: WorkloadMonitor
 metadata:
-  name: {{ $.Release.Name }}-zookeeper
+  name: {{ $.Release.Name }}-controller
   labels:
-    workloads.cozystack.io/resource-preset: {{ .Values.zookeeper.resourcesPreset | quote }}
+    workloads.cozystack.io/resource-preset: {{ .Values.kafka.resourcesPreset | quote }}
 spec:
-  replicas: {{ .Values.zookeeper.replicas }}
+  replicas: {{ $controllerReplicas }}
   minReplicas: 1
   kind: kafka
-  type: zookeeper
+  type: kafka-controller
   selector:
     app.kubernetes.io/instance: {{ $.Release.Name }}
-    app.kubernetes.io/name: zookeeper
+    app.kubernetes.io/name: kafka
+    strimzi.io/pool-name: {{ include "kafka.controllerPoolName" . }}
   version: {{ $.Chart.Version }}
diff --git a/packages/apps/kafka/tests/dashboard-resourcemap_test.yaml b/packages/apps/kafka/tests/dashboard-resourcemap_test.yaml
index 9539574e7c..ace053c58e 100644
--- a/packages/apps/kafka/tests/dashboard-resourcemap_test.yaml
+++ b/packages/apps/kafka/tests/dashboard-resourcemap_test.yaml
@@ -60,6 +60,16 @@ tests:
     set:
       external: false
     asserts:
+      # Anchor the rule before asserting about it. notContains passes whenever
+      # its path resolves to something that lacks the content, and a different
+      # rule at [0] qualifies, so reordering the Role would leave this green
+      # while the external bootstrap Service came back on the rule it names.
+      # A rule has no name to pin, so the anchor is the Service this rule must
+      # keep.
+      - contains:
+          path: rules[0].resourceNames
+          content: test-kafka-kafka-bootstrap
+        documentIndex: 0
       - notContains:
           path: rules[0].resourceNames
           content: test-kafka-kafka-external-bootstrap
@@ -103,7 +113,7 @@ tests:
           content: test-kafka-cluster-ca-cert
         documentIndex: 0
 
-  # Role grants access to workloadmonitors
+  # Role grants access to broker and controller workloadmonitors
   - it: grants access to WorkloadMonitor
     release:
       name: test-kafka
@@ -113,11 +123,26 @@ tests:
           path: rules[2].resourceNames
           content: test-kafka
         documentIndex: 0
+      - contains:
+          path: rules[2].resourceNames
+          content: test-kafka-controller
+        documentIndex: 0
       - equal:
           path: rules[2].apiGroups[0]
           value: cozystack.io
         documentIndex: 0
 
+  # KRaft: no ZooKeeper WorkloadMonitor is referenced
+  - it: does not reference zookeeper workloadmonitor
+    release:
+      name: test-kafka
+      namespace: tenant-test
+    asserts:
+      - notContains:
+          path: rules[2].resourceNames
+          content: test-kafka-zookeeper
+        documentIndex: 0
+
   # External bootstrap service absent when external=false, regardless of tls.enabled
   - it: does not grant access to external bootstrap service when tls.enabled=true and external=false
     release:
@@ -128,6 +153,16 @@ tests:
       tls:
         enabled: true
     asserts:
+      # Anchor the rule before asserting about it. notContains passes whenever
+      # its path resolves to something that lacks the content, and a different
+      # rule at [0] qualifies, so reordering the Role would leave this green
+      # while the external bootstrap Service came back on the rule it names.
+      # A rule has no name to pin, so the anchor is the Service this rule must
+      # keep.
+      - contains:
+          path: rules[0].resourceNames
+          content: test-kafka-kafka-bootstrap
+        documentIndex: 0
       - notContains:
           path: rules[0].resourceNames
           content: test-kafka-kafka-external-bootstrap
@@ -143,6 +178,16 @@ tests:
       tls:
         enabled: false
     asserts:
+      # Anchor the rule before asserting about it. notContains passes whenever
+      # its path resolves to something that lacks the content, and a different
+      # rule at [0] qualifies, so reordering the Role would leave this green
+      # while the external bootstrap Service came back on the rule it names.
+      # A rule has no name to pin, so the anchor is the Service this rule must
+      # keep.
+      - contains:
+          path: rules[0].resourceNames
+          content: test-kafka-kafka-bootstrap
+        documentIndex: 0
       - notContains:
           path: rules[0].resourceNames
           content: test-kafka-kafka-external-bootstrap
diff --git a/packages/apps/kafka/tests/delete_test.yaml b/packages/apps/kafka/tests/delete_test.yaml
new file mode 100644
index 0000000000..d6feced7aa
--- /dev/null
+++ b/packages/apps/kafka/tests/delete_test.yaml
@@ -0,0 +1,173 @@
+suite: Kafka pre-delete cleanup
+
+templates:
+  - templates/hooks/delete.yaml
+
+release:
+  name: kafka-test
+  namespace: tenant-test
+
+tests:
+  - it: deletes release-scoped KafkaTopics before removing the topic-operator
+    asserts:
+      - hasDocuments:
+          count: 4
+      - isKind:
+          of: Job
+        documentIndex: 0
+      - equal:
+          path: metadata.name
+          value: kafka-test-pre-delete
+        documentIndex: 0
+      - equal:
+          path: metadata.annotations["helm.sh/hook"]
+          value: pre-delete
+        documentIndex: 0
+      - equal:
+          path: spec.activeDeadlineSeconds
+          value: 270
+        documentIndex: 0
+      - equal:
+          path: spec.backoffLimit
+          value: 0
+        documentIndex: 0
+      # The hook exits 0 on the degraded path as well as the clean one, so
+      # hook-succeeded would delete the Job holding the only account of a
+      # finalizer that outlived the wait. Pinned here because the difference is
+      # invisible until someone is debugging a namespace that will not finalize.
+      - equal:
+          path: metadata.annotations["helm.sh/hook-delete-policy"]
+          value: before-hook-creation
+        documentIndex: 0
+      - equal:
+          path: spec.ttlSecondsAfterFinished
+          value: 3600
+        documentIndex: 0
+      # Both quotes are part of the pattern. Unanchored, this matches a selector
+      # widened to the sibling release kafka-test2 or to kafka-test-topics, so
+      # it would pin nothing about scoping.
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: "-l 'strimzi\\.io/cluster=kafka-test'"
+        documentIndex: 0
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: "--wait=true"
+        documentIndex: 0
+      # A non-zero --request-timeout makes kubectl ignore its in-cluster
+      # credentials: client-go consults them only while the assembled config
+      # still equals the default, and the flag lands in that config. The call
+      # then goes to localhost:8080, is refused, and the hook exits 1, which
+      # wedges every uninstall of the release (#4276). Nothing in the rendered
+      # manifest looks wrong, so this assertion is the only thing standing
+      # between that flag and another cluster-only failure. The pattern needs
+      # the "=": the script's own comment names the flag, and matching the bare
+      # name would fail on the explanation rather than on a real use.
+      - notMatchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: "--request-timeout="
+        documentIndex: 0
+      # Pinned by shape, not by literal: Renovate rewrites both the tag and the
+      # digest under packages/.+/templates/hooks/.+\.yaml and nothing rewrites
+      # tests/, so a literal of either turns the next bump red for no defect.
+      # What matters is that the ref stays pinned by digest at all. Same shape
+      # as harbor's cleanup_hook_test.yaml and mariadb's
+      # cleanup_pvc_hook_test.yaml. The leading ^ also covers the empty
+      # images-registry case, where a bare leading slash would be an unpullable
+      # ref that only surfaces at uninstall time.
+      - matchRegex:
+          path: spec.template.spec.containers[0].image
+          pattern: ^clastix/kubectl:v[0-9]+\.[0-9]+(\.[0-9]+)?@sha256:[0-9a-f]{64}$
+        documentIndex: 0
+      - isKind:
+          of: ServiceAccount
+        documentIndex: 1
+      # Pinned as an asymmetry, not as a value: the Job above carries no
+      # hook-succeeded because the script exits 0 on the degraded path too and
+      # its log is the only record that a finalizer outlived the wait, while
+      # these three have no ttlSecondsAfterFinished and without a terminal
+      # policy would sit in the tenant namespace for the life of the cluster,
+      # still granting delete over every KafkaTopic in it. Reaping them cannot
+      # strand a running pod: helm reaps on hook-succeeded only once the Job is
+      # terminal, and activeDeadlineSeconds 270 ends it inside the uninstall
+      # hook timeout, HelmReleaseSpec.Timeout, 5m by default. hook-failed adds
+      # nothing, since a failing hook already reaps the earlier successful ones
+      # under hook-succeeded.
+      - equal:
+          path: metadata.annotations["helm.sh/hook-delete-policy"]
+          value: before-hook-creation,hook-succeeded
+        documentIndex: 1
+      - isKind:
+          of: Role
+        documentIndex: 2
+      - equal:
+          path: metadata.annotations["helm.sh/hook-delete-policy"]
+          value: before-hook-creation,hook-succeeded
+        documentIndex: 2
+      - contains:
+          path: rules
+          content:
+            apiGroups: ["kafka.strimzi.io"]
+            resources: ["kafkatopics"]
+            verbs: ["get", "list", "watch", "delete"]
+        documentIndex: 2
+      - isKind:
+          of: RoleBinding
+        documentIndex: 3
+      - equal:
+          path: metadata.annotations["helm.sh/hook-delete-policy"]
+          value: before-hook-creation,hook-succeeded
+        documentIndex: 3
+      - equal:
+          path: roleRef.name
+          value: kafka-test-pre-delete
+        documentIndex: 3
+      - equal:
+          path: subjects[0].name
+          value: kafka-test-pre-delete
+        documentIndex: 3
+
+  - it: deletes release-scoped KafkaNodePools after the KafkaTopics
+    asserts:
+      # The migration hook creates the pools with kubectl apply, so they are
+      # not in the release manifest and helm uninstall never removes them. Each
+      # pool owns its StrimziPodSet, so a pool left behind keeps its brokers
+      # running after the release is gone.
+      #
+      # One pattern pins three things at once: the pools go after the topics
+      # (the topic operator needs live brokers to clear its finalizers), the
+      # selector names this release only (both quotes are part of it, as in the
+      # topic pin above), and the call does not wait, so the deadline
+      # arithmetic on the Job is unchanged.
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: "(?s)delete kafkatopics\\.kafka\\.strimzi\\.io .*delete kafkanodepools\\.kafka\\.strimzi\\.io \\\\\\s+-l 'strimzi\\.io/cluster=kafka-test' \\\\\\s+--ignore-not-found=true \\\\\\s+--wait=false"
+        documentIndex: 0
+      # list and delete are what a label-selected delete issues; nothing here
+      # waits on or reads a single pool.
+      - contains:
+          path: rules
+          content:
+            apiGroups: ["kafka.strimzi.io"]
+            resources: ["kafkanodepools"]
+            verbs: ["list", "delete"]
+        documentIndex: 2
+      - lengthEqual:
+          path: rules
+          count: 2
+        documentIndex: 2
+
+  - it: prefixes the hook image with the cluster images registry when set
+    set:
+      _cluster:
+        images-registry: registry.example.com
+    asserts:
+      # A mirrored or air-gapped install resolves the image from the internal
+      # registry, and the digest pin survives the prefixing. Unasserted until
+      # now, so nothing would have caught the hook being the one image in this
+      # chart that ignored the override: at uninstall time a pull failure here
+      # means the topics keep their finalizer and the namespace does not go.
+      - matchRegex:
+          path: spec.template.spec.containers[0].image
+          pattern: ^registry\.example\.com/clastix/kubectl:v[0-9]+\.[0-9]+(\.[0-9]+)?@sha256:[0-9a-f]{64}$
+        documentIndex: 0
diff --git a/packages/apps/kafka/tests/entityoperator_template_test.yaml b/packages/apps/kafka/tests/entityoperator_template_test.yaml
index 95b7921387..b179400130 100644
--- a/packages/apps/kafka/tests/entityoperator_template_test.yaml
+++ b/packages/apps/kafka/tests/entityoperator_template_test.yaml
@@ -20,3 +20,15 @@ tests:
       # the phantom template.spec key must not reappear
       - notExists:
           path: spec.entityOperator.template.spec
+
+  - it: topic-operator and user-operator set explicit resources (avoid 128Mi LimitRange OOM)
+    release:
+      name: test-kafka
+      namespace: tenant-test
+    asserts:
+      - equal:
+          path: spec.entityOperator.topicOperator.resources.limits.memory
+          value: 512Mi
+      - equal:
+          path: spec.entityOperator.userOperator.resources.limits.memory
+          value: 512Mi
diff --git a/packages/apps/kafka/tests/jvm_sizing_test.yaml b/packages/apps/kafka/tests/jvm_sizing_test.yaml
new file mode 100644
index 0000000000..26a065d179
--- /dev/null
+++ b/packages/apps/kafka/tests/jvm_sizing_test.yaml
@@ -0,0 +1,97 @@
+suite: Kafka JVMs are sized from their container limits
+
+templates:
+  - templates/migration-hook.yaml
+  - templates/kafka.yaml
+
+release:
+  name: test-kafka
+  namespace: tenant-test
+
+tests:
+  - it: passes the default preset limits to every node pool JVM
+    template: templates/migration-hook.yaml
+    documentIndex: 3
+    asserts:
+      - matchRegex:
+          path: spec.template.spec.containers[0].args[0]
+          pattern: "release-namespace: \\$\\{ns\\}\\s+spec:\\s+replicas: \\d+\\s+roles:\\s+- broker\\s+resources:\\s+limits:(\\s+\\S+: \\S+)+\\s+requests:(\\s+\\S+: \\S+)+(\\s+#[^\\n]*)*\\s+template:\\s+kafkaContainer:\\s+env:\\s+- name: JAVA_TOOL_OPTIONS\\s+value: \"-XX:MaxRAM=1073741824 -XX:ActiveProcessorCount=1\"\\s+storage:"
+      - matchRegex:
+          path: spec.template.spec.containers[0].args[0]
+          pattern: "roles:\\s+- controller\\s+resources:\\s+limits:(\\s+\\S+: \\S+)+\\s+requests:(\\s+\\S+: \\S+)+(\\s+#[^\\n]*)*\\s+template:\\s+kafkaContainer:\\s+env:\\s+- name: JAVA_TOOL_OPTIONS\\s+value: \"-XX:MaxRAM=1073741824 -XX:ActiveProcessorCount=1\"\\s+storage:"
+      - matchRegex:
+          path: spec.template.spec.containers[0].args[0]
+          pattern: "next-node-ids: \"\\[1000-1099\\]\"\\s+spec:\\s+replicas: \\d+\\s+roles:\\s+- broker\\s+resources:\\s+limits:(\\s+\\S+: \\S+)+\\s+requests:(\\s+\\S+: \\S+)+(\\s+#[^\\n]*)*\\s+template:\\s+kafkaContainer:\\s+env:\\s+- name: JAVA_TOOL_OPTIONS\\s+value: \"-XX:MaxRAM=1073741824 -XX:ActiveProcessorCount=1\"\\s+storage:"
+
+  # Strimzi moves jvmOptions -XX into KAFKA_JVM_PERFORMANCE_OPTS, and
+  # kafka-run-class.sh then drops its G1 settings.
+  - it: leaves the node pool JVM options to Strimzi and Kafka
+    template: templates/migration-hook.yaml
+    documentIndex: 3
+    asserts:
+      - notMatchRegex:
+          path: spec.template.spec.containers[0].args[0]
+          pattern: "jvmOptions"
+
+  - it: rounds a fractional CPU limit up
+    template: templates/migration-hook.yaml
+    documentIndex: 3
+    set:
+      kafka.resources:
+        cpu: 2500m
+        memory: 3Gi
+    asserts:
+      - matchRegex:
+          path: spec.template.spec.containers[0].args[0]
+          pattern: "roles:\\s+- controller\\s+resources:\\s+limits:(\\s+\\S+: \\S+)+\\s+requests:(\\s+\\S+: \\S+)+(\\s+#[^\\n]*)*\\s+template:\\s+kafkaContainer:\\s+env:\\s+- name: JAVA_TOOL_OPTIONS\\s+value: \"-XX:MaxRAM=3221225472 -XX:ActiveProcessorCount=3\"\\s+storage:"
+
+  - it: takes the limits, not the requests, when the allocation ratios shrink the requests
+    template: templates/migration-hook.yaml
+    documentIndex: 3
+    set:
+      _cluster:
+        cpu-allocation-ratio: "4"
+        memory-allocation-ratio: "2"
+      kafka.resources:
+        cpu: "2"
+        memory: 2Gi
+    asserts:
+      - matchRegex:
+          path: spec.template.spec.containers[0].args[0]
+          pattern: "release-namespace: \\$\\{ns\\}\\s+spec:\\s+replicas: \\d+\\s+roles:\\s+- broker\\s+resources:\\s+limits:(\\s+\\S+: \\S+)+\\s+requests:(\\s+\\S+: \\S+)+(\\s+#[^\\n]*)*\\s+template:\\s+kafkaContainer:\\s+env:\\s+- name: JAVA_TOOL_OPTIONS\\s+value: \"-XX:MaxRAM=2147483648 -XX:ActiveProcessorCount=2\"\\s+storage:"
+      - matchRegex:
+          path: spec.template.spec.containers[0].args[0]
+          pattern: "roles:\\s+- controller\\s+resources:\\s+limits:(\\s+\\S+: \\S+)+\\s+requests:(\\s+\\S+: \\S+)+(\\s+#[^\\n]*)*\\s+template:\\s+kafkaContainer:\\s+env:\\s+- name: JAVA_TOOL_OPTIONS\\s+value: \"-XX:MaxRAM=2147483648 -XX:ActiveProcessorCount=2\"\\s+storage:"
+      - matchRegex:
+          path: spec.template.spec.containers[0].args[0]
+          pattern: "next-node-ids: \"\\[1000-1099\\]\"\\s+spec:\\s+replicas: \\d+\\s+roles:\\s+- broker\\s+resources:\\s+limits:(\\s+\\S+: \\S+)+\\s+requests:(\\s+\\S+: \\S+)+(\\s+#[^\\n]*)*\\s+template:\\s+kafkaContainer:\\s+env:\\s+- name: JAVA_TOOL_OPTIONS\\s+value: \"-XX:MaxRAM=2147483648 -XX:ActiveProcessorCount=2\"\\s+storage:"
+
+  # The whole patch, closing brace included: a merge patch kubectl cannot
+  # parse fails the hook before the drain starts.
+  - it: passes the drain-time Cruise Control memory limit to its JVM
+    template: templates/migration-hook.yaml
+    documentIndex: 3
+    asserts:
+      - matchRegex:
+          path: spec.template.spec.containers[0].args[0]
+          pattern: "\\-\\-type\\ merge\\ \\-p\\ '\\{\"spec\":\\{\"cruiseControl\":\\{\"resources\":\\{\"limits\":\\{\"memory\":\"1Gi\"\\},\"requests\":\\{\"cpu\":\"200m\",\"memory\":\"768Mi\"\\}\\},\"template\":\\{\"cruiseControlContainer\":\\{\"env\":\\[\\{\"name\":\"JAVA_TOOL_OPTIONS\",\"value\":\"\\-XX:MaxRAM=1073741824\"\\}\\]\\}\\}\\}\\}\\}'\n"
+
+  - it: passes the entity operator memory limit to its JVMs
+    template: templates/kafka.yaml
+    asserts:
+      - equal:
+          path: spec.entityOperator.topicOperator.resources.limits.memory
+          value: 512Mi
+      - equal:
+          path: spec.entityOperator.template.topicOperatorContainer.env
+          value:
+            - name: JAVA_TOOL_OPTIONS
+              value: -XX:MaxRAM=536870912
+      - equal:
+          path: spec.entityOperator.userOperator.resources.limits.memory
+          value: 512Mi
+      - equal:
+          path: spec.entityOperator.template.userOperatorContainer.env
+          value:
+            - name: JAVA_TOOL_OPTIONS
+              value: -XX:MaxRAM=536870912
diff --git a/packages/apps/kafka/tests/kafka_test.yaml b/packages/apps/kafka/tests/kafka_test.yaml
index bcc8415f5b..dc3f406ab3 100644
--- a/packages/apps/kafka/tests/kafka_test.yaml
+++ b/packages/apps/kafka/tests/kafka_test.yaml
@@ -4,11 +4,11 @@ templates:
   - templates/kafka.yaml
 
 tests:
-  ###################
-  # Basic rendering #
-  ###################
+  ##########################
+  # KRaft mode (new inst.) #
+  ##########################
 
-  - it: renders Kafka CR
+  - it: renders Kafka CR with KRaft annotations for new instance
     release:
       name: test-kafka
       namespace: tenant-test
@@ -17,8 +17,14 @@ tests:
           count: 1
       - isKind:
           of: Kafka
+      - equal:
+          path: metadata.annotations["strimzi.io/kraft"]
+          value: enabled
+      - equal:
+          path: metadata.annotations["strimzi.io/node-pools"]
+          value: enabled
 
-  - it: sets correct CR name
+  - it: sets correct name and labels
     release:
       name: my-kafka
       namespace: tenant-test
@@ -26,6 +32,69 @@ tests:
       - equal:
           path: metadata.name
           value: my-kafka
+      - equal:
+          path: metadata.labels["app.kubernetes.io/instance"]
+          value: my-kafka
+
+  ##########################
+  # Version                #
+  ##########################
+
+  - it: sets Kafka version from version map (default v3.9)
+    release:
+      name: test-kafka
+      namespace: tenant-test
+    asserts:
+      - equal:
+          path: spec.kafka.version
+          value: "3.9.0"
+
+  - it: resolves v3.8 version
+    release:
+      name: test-kafka
+      namespace: tenant-test
+    set:
+      version: "v3.8"
+    asserts:
+      - equal:
+          path: spec.kafka.version
+          value: "3.8.1"
+
+  ##########################
+  # No ZooKeeper / node-pool managed fields #
+  ##########################
+
+  - it: does not include zookeeper section for new instance
+    release:
+      name: test-kafka
+      namespace: tenant-test
+    asserts:
+      - notExists:
+          path: spec.zookeeper
+
+  - it: does not include replicas in Kafka CR (managed by KafkaNodePool)
+    release:
+      name: test-kafka
+      namespace: tenant-test
+    asserts:
+      - notExists:
+          path: spec.kafka.replicas
+
+  - it: does not include storage in Kafka CR (managed by KafkaNodePool)
+    release:
+      name: test-kafka
+      namespace: tenant-test
+    asserts:
+      - notExists:
+          path: spec.kafka.storage
+
+  - it: does not include resources in Kafka CR (managed by KafkaNodePool)
+    release:
+      name: test-kafka
+      namespace: tenant-test
+    asserts:
+      - notExists:
+          path: spec.kafka.resources
 
   #####################
   # Internal listeners #
@@ -83,7 +152,7 @@ tests:
             type: loadbalancer
             tls: true
 
-  - it: creates external loadbalancer listener when external is true
+  - it: creates external loadbalancer listener with tls when external is true
     release:
       name: test-kafka
       namespace: tenant-test
@@ -98,18 +167,28 @@ tests:
             type: loadbalancer
             tls: true
 
-  - it: has exactly 2 listeners when external is false
+  - it: configures internal listeners by default and omits external
     release:
       name: test-kafka
       namespace: tenant-test
-    set:
-      external: false
     asserts:
+      - equal:
+          path: spec.kafka.listeners[0].name
+          value: plain
+      - equal:
+          path: spec.kafka.listeners[0].type
+          value: internal
+      - equal:
+          path: spec.kafka.listeners[1].name
+          value: tls
+      - equal:
+          path: spec.kafka.listeners[1].type
+          value: internal
       - lengthEqual:
           path: spec.kafka.listeners
           count: 2
 
-  - it: has exactly 3 listeners when external is true
+  - it: adds loadbalancer external listener when external is true
     release:
       name: test-kafka
       namespace: tenant-test
@@ -119,3 +198,88 @@ tests:
       - lengthEqual:
           path: spec.kafka.listeners
           count: 3
+      - equal:
+          path: spec.kafka.listeners[2].name
+          value: external
+      - equal:
+          path: spec.kafka.listeners[2].type
+          value: loadbalancer
+
+  ##########################
+  # Replication config     #
+  ##########################
+
+  - it: sets replication factor 1 for single replica
+    release:
+      name: test-kafka
+      namespace: tenant-test
+    set:
+      kafka:
+        replicas: 1
+    asserts:
+      - equal:
+          path: spec.kafka.config["offsets.topic.replication.factor"]
+          value: 1
+      - equal:
+          path: spec.kafka.config["min.insync.replicas"]
+          value: 1
+
+  - it: sets replication factor 2 for two replicas
+    release:
+      name: test-kafka
+      namespace: tenant-test
+    set:
+      kafka:
+        replicas: 2
+    asserts:
+      - equal:
+          path: spec.kafka.config["offsets.topic.replication.factor"]
+          value: 2
+
+  - it: sets replication factor 3 for three or more replicas
+    release:
+      name: test-kafka
+      namespace: tenant-test
+    set:
+      kafka:
+        replicas: 5
+    asserts:
+      - equal:
+          path: spec.kafka.config["offsets.topic.replication.factor"]
+          value: 3
+      - equal:
+          path: spec.kafka.config["min.insync.replicas"]
+          value: 2
+
+  ##########################
+  # Entity Operator        #
+  ##########################
+
+  - it: includes entity operator with topic and user operators
+    release:
+      name: test-kafka
+      namespace: tenant-test
+    asserts:
+      - exists:
+          path: spec.entityOperator.topicOperator
+      - exists:
+          path: spec.entityOperator.userOperator
+
+  ##########################
+  # Metrics                #
+  ##########################
+
+  - it: configures JMX Prometheus metrics
+    release:
+      name: test-kafka
+      namespace: tenant-test
+    asserts:
+      - equal:
+          path: spec.kafka.metricsConfig.type
+          value: jmxPrometheusExporter
+      - equal:
+          path: spec.kafka.metricsConfig.valueFrom.configMapKeyRef.name
+          value: test-kafka-metrics
+      - equal:
+          path: spec.kafka.metricsConfig.valueFrom.configMapKeyRef.key
+          value: kafka-metrics-config.yml
diff --git a/packages/apps/kafka/tests/metrics-configmap_test.yaml b/packages/apps/kafka/tests/metrics-configmap_test.yaml
new file mode 100644
index 0000000000..dec7a4619f
--- /dev/null
+++ b/packages/apps/kafka/tests/metrics-configmap_test.yaml
@@ -0,0 +1,53 @@
+suite: Metrics ConfigMap tests
+
+templates:
+  - templates/metrics-configmap.yaml
+
+tests:
+  - it: creates ConfigMap with kafka metrics
+    release:
+      name: test-kafka
+      namespace: tenant-test
+    asserts:
+      - isKind:
+          of: ConfigMap
+      - equal:
+          path: metadata.name
+          value: test-kafka-metrics
+      - exists:
+          path: data["kafka-metrics-config.yml"]
+
+  - it: includes KRaft metrics in kafka config
+    release:
+      name: test-kafka
+      namespace: tenant-test
+    asserts:
+      - matchRegex:
+          path: data["kafka-metrics-config.yml"]
+          pattern: raft-metrics
+
+  - it: does not include zookeeper metrics
+    release:
+      name: test-kafka
+      namespace: tenant-test
+    asserts:
+      - notExists:
+          path: data["zookeeper-metrics-config.yml"]
+
+  - it: includes KRaft channel metrics
+    release:
+      name: test-kafka
+      namespace: tenant-test
+    asserts:
+      - matchRegex:
+          path: data["kafka-metrics-config.yml"]
+          pattern: raft-channel-metrics
+
+  - it: includes broker metadata metrics
+    release:
+      name: test-kafka
+      namespace: tenant-test
+    asserts:
+      - matchRegex:
+          path: data["kafka-metrics-config.yml"]
+          pattern: broker-metadata-metrics
diff --git a/packages/apps/kafka/tests/migration-hook_test.yaml b/packages/apps/kafka/tests/migration-hook_test.yaml
new file mode 100644
index 0000000000..36255fab43
--- /dev/null
+++ b/packages/apps/kafka/tests/migration-hook_test.yaml
@@ -0,0 +1,462 @@
+suite: Migration pre-upgrade hook tests
+
+templates:
+  - templates/migration-hook.yaml
+
+tests:
+  - it: renders SA + Role + RoleBinding + Job
+    release:
+      name: test-kafka
+      namespace: tenant-test
+    asserts:
+      - hasDocuments:
+          count: 4
+      - isKind:
+          of: ServiceAccount
+        documentIndex: 0
+      - isKind:
+          of: Role
+        documentIndex: 1
+      - isKind:
+          of: RoleBinding
+        documentIndex: 2
+      - isKind:
+          of: Job
+        documentIndex: 3
+
+  # The pools are managed by this hook, not a regular manifest, so the hook must
+  # also run on a fresh install (pre-install) — otherwise a brand-new KRaft
+  # cluster would come up with no node pools.
+  - it: tags all resources as pre-install + pre-upgrade hooks
+    release:
+      name: test-kafka
+      namespace: tenant-test
+    asserts:
+      - equal:
+          path: metadata.annotations["helm.sh/hook"]
+          value: pre-install,pre-upgrade
+        documentIndex: 0
+      - equal:
+          path: metadata.annotations["helm.sh/hook"]
+          value: pre-install,pre-upgrade
+        documentIndex: 1
+      - equal:
+          path: metadata.annotations["helm.sh/hook"]
+          value: pre-install,pre-upgrade
+        documentIndex: 2
+      - equal:
+          path: metadata.annotations["helm.sh/hook"]
+          value: pre-install,pre-upgrade
+        documentIndex: 3
+
+  - it: names all resources with the release prefix
+    release:
+      name: test-kafka
+      namespace: tenant-test
+    asserts:
+      - equal:
+          path: metadata.name
+          value: test-kafka-kafka-migration
+        documentIndex: 0
+      - equal:
+          path: metadata.name
+          value: test-kafka-kafka-migration
+        documentIndex: 3
+
+  - it: grants permission to patch kafkas and kafkanodepools
+    release:
+      name: test-kafka
+      namespace: tenant-test
+    asserts:
+      - contains:
+          path: rules[0].apiGroups
+          content: kafka.strimzi.io
+        documentIndex: 1
+      - contains:
+          path: rules[0].resources
+          content: kafkas
+        documentIndex: 1
+      - contains:
+          path: rules[0].resources
+          content: kafkanodepools
+        documentIndex: 1
+      - contains:
+          path: rules[0].verbs
+          content: patch
+        documentIndex: 1
+      - contains:
+          path: rules[0].verbs
+          content: create
+        documentIndex: 1
+      # Name-freeing needs to drive rebalances, delete the drained pool, and
+      # clean up its PVCs.
+      - contains:
+          path: rules[0].resources
+          content: kafkarebalances
+        documentIndex: 1
+      - contains:
+          path: rules[0].verbs
+          content: delete
+        documentIndex: 1
+      - contains:
+          path: rules[1].resources
+          content: persistentvolumeclaims
+        documentIndex: 1
+
+  # When it holds the shared "kafka" pool and other ZooKeeper clusters remain,
+  # the hook drains all data onto its own "b-<hash>" pool via a Cruise Control
+  # KafkaRebalance and only then deletes the "kafka" pool — so the name frees for
+  # the next cluster without losing data.
+  - it: frees the kafka pool name by draining via a rebalance
+    release:
+      name: test-kafka
+      namespace: tenant-test
+    asserts:
+      - matchRegex:
+          path: spec.template.spec.containers[0].args[0]
+          pattern: 'other ZooKeeper Kafka cluster'
+        documentIndex: 3
+      - matchRegex:
+          path: spec.template.spec.containers[0].args[0]
+          pattern: 'kind: KafkaRebalance'
+        documentIndex: 3
+      - matchRegex:
+          path: spec.template.spec.containers[0].args[0]
+          pattern: 'mode: remove-brokers'
+        documentIndex: 3
+      # A mandatory broker evacuation must not be blocked by capacity hard goals.
+      - matchRegex:
+          path: spec.template.spec.containers[0].args[0]
+          pattern: 'skipHardGoalCheck: true'
+        documentIndex: 3
+      - matchRegex:
+          path: spec.template.spec.containers[0].args[0]
+          pattern: 'next-node-ids: "\[1000-1099\]"'
+        documentIndex: 3
+      # The pool is deleted only after the rebalance is Ready — never before.
+      - matchRegex:
+          path: spec.template.spec.containers[0].args[0]
+          pattern: 'Rebalance complete[\s\S]*delete "\$np" kafka'
+        documentIndex: 3
+
+  # The hook creates the broker pool under the render-resolved name
+  # (kafka.brokerPoolName): "kafka" for a migrating ZooKeeper cluster, "b-<hash>"
+  # for a fresh one. The manifest references the shell var so both resolve here.
+  - it: creates the broker node pool under the resolved pool name
+    release:
+      name: test-kafka
+      namespace: tenant-test
+    asserts:
+      - matchRegex:
+          path: spec.template.spec.containers[0].args[0]
+          pattern: 'name: \$\{brokerPool\}'
+        documentIndex: 3
+      - matchRegex:
+          path: spec.template.spec.containers[0].args[0]
+          pattern: "roles:\\n +- broker"
+        documentIndex: 3
+
+  # Fresh install (no live lookup): the broker pool resolves to the
+  # release-unique "b-<hash>", so multiple fresh Kafkas coexist in a namespace.
+  - it: resolves the broker pool to b-<hash> for a fresh install
+    release:
+      name: test-kafka
+      namespace: tenant-test
+    asserts:
+      - matchRegex:
+          path: spec.template.spec.containers[0].args[0]
+          pattern: 'brokerPool="b-[0-9a-f]{8}"'
+        documentIndex: 3
+
+  # CRITICAL adoption invariant: a cluster migrating from ZooKeeper (an existing
+  # Kafka CR without kraft=enabled) must resolve the broker pool to exactly
+  # "kafka" so Strimzi reuses the existing <cluster>-kafka-N brokers and PVCs.
+  - it: resolves the broker pool to kafka for a migrating ZooKeeper cluster
+    release:
+      name: test-kafka
+      namespace: tenant-test
+    kubernetesProvider:
+      scheme:
+        "kafka.strimzi.io/v1beta2/Kafka":
+          gvr:
+            group: kafka.strimzi.io
+            version: v1beta2
+            resource: kafkas
+          namespaced: true
+      objects:
+        - apiVersion: kafka.strimzi.io/v1beta2
+          kind: Kafka
+          metadata:
+            name: test-kafka
+            namespace: tenant-test
+    asserts:
+      - matchRegex:
+          path: spec.template.spec.containers[0].args[0]
+          pattern: 'brokerPool="kafka"'
+        documentIndex: 3
+
+  # Render-time serialization of co-namespaced migrations: while a "kafka" pool is
+  # owned by a DIFFERENT cluster that is migrating first, kafka.brokerPoolName
+  # fails this ZooKeeper cluster's render so its HelmRelease retries until the
+  # first cluster drains off the shared pool and frees the name (the hook's
+  # runtime create-CAS is the second line of defense).
+  - it: fails the render when a foreign cluster still owns the kafka pool
+    release:
+      name: test-kafka
+      namespace: tenant-test
+    kubernetesProvider:
+      scheme:
+        "kafka.strimzi.io/v1beta2/Kafka":
+          gvr:
+            group: kafka.strimzi.io
+            version: v1beta2
+            resource: kafkas
+          namespaced: true
+        "kafka.strimzi.io/v1beta2/KafkaNodePool":
+          gvr:
+            group: kafka.strimzi.io
+            version: v1beta2
+            resource: kafkanodepools
+          namespaced: true
+      objects:
+        - apiVersion: kafka.strimzi.io/v1beta2
+          kind: Kafka
+          metadata:
+            name: test-kafka
+            namespace: tenant-test
+        - apiVersion: kafka.strimzi.io/v1beta2
+          kind: KafkaNodePool
+          metadata:
+            name: kafka
+            namespace: tenant-test
+            labels:
+              strimzi.io/cluster: other-cluster
+    asserts:
+      - failedTemplate:
+          errorPattern: "broker pool owned by cluster .* migrating first"
+
+  # The controller pool the hook creates must use the short hashed name
+  # kafka.controllerPoolName, in lockstep with every selector helper.
+  - it: creates the controller node pool with the release-hashed name
+    release:
+      name: test-kafka
+      namespace: tenant-test
+    asserts:
+      - matchRegex:
+          path: spec.template.spec.containers[0].args[0]
+          pattern: 'name: c-[0-9a-f]{8}\n'
+        documentIndex: 3
+      - matchRegex:
+          path: spec.template.spec.containers[0].args[0]
+          pattern: "roles:\\n +- controller"
+        documentIndex: 3
+
+  # CRITICAL: the hook creates the broker and controller pools together, so the
+  # controller pool must pin its node IDs above the broker range. Otherwise
+  # Strimzi hands it the existing broker IDs [0..replicas-1], recreating brokers
+  # empty and orphaning the tenant's data (reproduced live on Strimzi 0.45).
+  - it: pins the hook-created controller pool's node IDs above the broker range
+    release:
+      name: test-kafka
+      namespace: tenant-test
+    set:
+      kafka:
+        replicas: 3
+    asserts:
+      - matchRegex:
+          path: spec.template.spec.containers[0].args[0]
+          pattern: 'strimzi.io/next-node-ids: "\[3-999\]"'
+        documentIndex: 3
+
+  # The migration Job must never apply strimzi.io/kraft=enabled unless the
+  # cluster actually reached KRaftPostMigration — flipping it earlier is unsafe
+  # and irreversible. Guard the finalize step behind an explicit readiness flag
+  # that aborts (exit 1) on timeout, so Helm fails and the next reconcile retries.
+  - it: guards the KRaft finalize step behind a reached-safe-state check
+    release:
+      name: test-kafka
+      namespace: tenant-test
+    asserts:
+      - matchRegex:
+          path: spec.template.spec.containers[0].args[0]
+          pattern: "migration_ready=false"
+        documentIndex: 3
+      - matchRegex:
+          path: spec.template.spec.containers[0].args[0]
+          pattern: 'if \[ "\$migration_ready" != "true" \]; then'
+        documentIndex: 3
+      - matchRegex:
+          path: spec.template.spec.containers[0].args[0]
+          pattern: "Refusing to apply strimzi.io/kraft=enabled in an unsafe state"
+        documentIndex: 3
+
+  # Fail closed: a real read error (non-zero from the --ignore-not-found get)
+  # must abort, never be mistaken for a fresh install.
+  - it: fails closed on non-NotFound errors reading the Kafka CR
+    release:
+      name: test-kafka
+      namespace: tenant-test
+    asserts:
+      - matchRegex:
+          path: spec.template.spec.containers[0].args[0]
+          pattern: 'if ! found=\$\(kubectl .* --ignore-not-found -o name'
+        documentIndex: 3
+      - matchRegex:
+          path: spec.template.spec.containers[0].args[0]
+          pattern: "ERROR: reading Kafka CR failed"
+        documentIndex: 3
+
+  # Idempotent: on a retry the cluster may already be past ZooKeeper; do not
+  # re-issue kraft=migration (an invalid backward transition Strimzi rejects).
+  - it: does not re-issue kraft=migration once past the ZooKeeper phase
+    release:
+      name: test-kafka
+      namespace: tenant-test
+    asserts:
+      - matchRegex:
+          path: spec.template.spec.containers[0].args[0]
+          pattern: "KRaftMigration\\|KRaftDualWriting\\|KRaftPostMigration\\|PreKRaft\\|KRaft\\)"
+        documentIndex: 3
+      - matchRegex:
+          path: spec.template.spec.containers[0].args[0]
+          pattern: "not re-issuing kraft=migration"
+        documentIndex: 3
+
+  # ATOMIC one-migration-per-namespace guard: an absent "kafka" pool is created
+  # via `kubectl create` (the atomic arbiter of a concurrent race), and a "kafka"
+  # pool owned by another cluster is refused.
+  - it: guards the shared kafka pool name atomically via create, refusing a foreign owner
+    release:
+      name: test-kafka
+      namespace: tenant-test
+    asserts:
+      - matchRegex:
+          path: spec.template.spec.containers[0].args[0]
+          pattern: 'if \[ "\$brokerPool" = "kafka" \]; then'
+        documentIndex: 3
+      - matchRegex:
+          path: spec.template.spec.containers[0].args[0]
+          pattern: 'kubectl create -f -'
+        documentIndex: 3
+      - matchRegex:
+          path: spec.template.spec.containers[0].args[0]
+          pattern: "already belongs to cluster"
+        documentIndex: 3
+
+  # The bare plural "kafkas" is ambiguous (also apps.cozystack.io); the hook must
+  # fully qualify the Strimzi resource or it can hit the tenant kind and Forbidden.
+  - it: fully qualifies the Strimzi Kafka and KafkaNodePool resources
+    release:
+      name: test-kafka
+      namespace: tenant-test
+    asserts:
+      - matchRegex:
+          path: spec.template.spec.containers[0].args[0]
+          pattern: "kafka=kafkas\\.kafka\\.strimzi\\.io"
+        documentIndex: 3
+      - matchRegex:
+          path: spec.template.spec.containers[0].args[0]
+          pattern: "np=kafkanodepools\\.kafka\\.strimzi\\.io"
+        documentIndex: 3
+      - notMatchRegex:
+          path: spec.template.spec.containers[0].args[0]
+          pattern: 'annotate kafka "'
+        documentIndex: 3
+
+  # NotFound must be structural (--ignore-not-found), never a stderr substring
+  # match that a stray "... not found" error could trip into skipping a live ZK.
+  - it: classifies NotFound structurally, not by stderr substring
+    release:
+      name: test-kafka
+      namespace: tenant-test
+    asserts:
+      - matchRegex:
+          path: spec.template.spec.containers[0].args[0]
+          pattern: "--ignore-not-found"
+        documentIndex: 3
+      - notMatchRegex:
+          path: spec.template.spec.containers[0].args[0]
+          pattern: "grep -qiE.*not.*found"
+        documentIndex: 3
+
+  # A KRaft-native / already-migrated CR (kraft=enabled) must be a no-op, never
+  # driven backwards into kraft=migration.
+  - it: treats a kraft=enabled cluster as done
+    release:
+      name: test-kafka
+      namespace: tenant-test
+    asserts:
+      - matchRegex:
+          path: spec.template.spec.containers[0].args[0]
+          pattern: 'if \[ "\$kraft" != "enabled" \] && \[ "\$state" != "KRaft" \]'
+        documentIndex: 3
+      - matchRegex:
+          path: spec.template.spec.containers[0].args[0]
+          pattern: "Kafka is already KRaft"
+        documentIndex: 3
+
+  # Preserve failed-Job logs for a post-mortem: only before-hook-creation, never
+  # hook-succeeded (which would delete the previous attempt's pod logs).
+  - it: keeps only before-hook-creation on the Job hook-delete-policy
+    release:
+      name: test-kafka
+      namespace: tenant-test
+    asserts:
+      - equal:
+          path: metadata.annotations["helm.sh/hook-delete-policy"]
+          value: before-hook-creation
+        documentIndex: 3
+
+  # The kubectl image is routed through the cluster registry helper and digest-pinned.
+  - it: pins the hook image by digest through the images registry
+    release:
+      name: test-kafka
+      namespace: tenant-test
+    asserts:
+      - matchRegex:
+          path: spec.template.spec.containers[0].image
+          pattern: "^clastix/kubectl:v[0-9]+\\.[0-9]+(\\.[0-9]+)?@sha256:[0-9a-f]{64}$"
+        documentIndex: 3
+
+  - it: prefixes the hook image with a configured images-registry
+    release:
+      name: test-kafka
+      namespace: tenant-test
+    set:
+      _cluster:
+        images-registry: registry.example.com
+    asserts:
+      - matchRegex:
+          path: spec.template.spec.containers[0].image
+          pattern: "^registry\\.example\\.com/clastix/kubectl:v[0-9]+\\.[0-9]+(\\.[0-9]+)?@sha256:[0-9a-f]{64}$"
+        documentIndex: 3
+
+  # The hook-created pools govern the Kafka pods for the whole lifecycle. They
+  # must carry resources or a tenant LimitRange defaults the JVMs to 128Mi and
+  # they OOM, stalling the migration.
+  - it: sets resources on both node pools
+    release:
+      name: test-kafka
+      namespace: tenant-test
+    asserts:
+      - matchRegex:
+          path: spec.template.spec.containers[0].args[0]
+          pattern: "roles:\\s+- broker[\\s\\S]*?resources:\\s+limits:"
+        documentIndex: 3
+      - matchRegex:
+          path: spec.template.spec.containers[0].args[0]
+          pattern: "roles:\\s+- controller[\\s\\S]*?resources:\\s+limits:"
+        documentIndex: 3
+
+  - it: applies without the OpenAPI patch lookup, so an upgrade fits the tenant LimitRange default
+    release:
+      name: test-kafka
+      namespace: tenant-test
+    documentIndex: 3
+    asserts:
+      - notMatchRegex:
+          path: spec.template.spec.containers[0].args[0]
+          pattern: "kubectl[^|\\n]* apply (-f|--filename|--server-side)"
+      - matchRegex:
+          path: spec.template.spec.containers[0].args[0]
+          pattern: "echo \"\\$broker_manifest\" \\| kubectl apply --openapi-patch=false -f -\\n[\\s\\S]*echo \"\\$controller_manifest\" \\| kubectl apply --openapi-patch=false -f -\\n[\\s\\S]*<<POOL \\| kubectl apply --openapi-patch=false -f -\\n[\\s\\S]*<<REB \\| kubectl apply --openapi-patch=false -f -\\n"
diff --git a/packages/apps/kafka/tests/topics_test.yaml b/packages/apps/kafka/tests/topics_test.yaml
new file mode 100644
index 0000000000..4f7a19b6c1
--- /dev/null
+++ b/packages/apps/kafka/tests/topics_test.yaml
@@ -0,0 +1,98 @@
+suite: Kafka topic tests
+
+templates:
+  - templates/topics.yaml
+
+tests:
+  - it: renders no topics when topics list is empty
+    release:
+      name: test-kafka
+      namespace: tenant-test
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  - it: creates KafkaTopic for each topic
+    release:
+      name: test-kafka
+      namespace: tenant-test
+    set:
+      topics:
+        - name: orders
+          partitions: 6
+          replicas: 3
+          config:
+            cleanup.policy: compact
+        - name: events
+          partitions: 12
+          replicas: 3
+          config:
+            retention.ms: "86400000"
+    asserts:
+      - hasDocuments:
+          count: 2
+      - isKind:
+          of: KafkaTopic
+        documentIndex: 0
+      - isKind:
+          of: KafkaTopic
+        documentIndex: 1
+
+  - it: sets topic name and cluster label
+    release:
+      name: my-kafka
+      namespace: tenant-test
+    set:
+      topics:
+        - name: my-topic
+          partitions: 3
+          replicas: 1
+          config: {}
+    asserts:
+      - equal:
+          path: spec.topicName
+          value: my-topic
+      - equal:
+          path: metadata.labels["strimzi.io/cluster"]
+          value: my-kafka
+
+  - it: sets partitions and replicas
+    release:
+      name: test-kafka
+      namespace: tenant-test
+    set:
+      topics:
+        - name: t1
+          partitions: 12
+          replicas: 3
+          config: {}
+    asserts:
+      - equal:
+          path: spec.partitions
+          value: 12
+      - equal:
+          path: spec.replicas
+          value: 3
+
+  - it: accepts a topic without config and omits spec.config
+    release:
+      name: test-kafka
+      namespace: tenant-test
+    set:
+      topics:
+        - name: test-topic
+          partitions: 1
+          replicas: 1
+    asserts:
+      - hasDocuments:
+          count: 1
+      - isKind:
+          of: KafkaTopic
+      - equal:
+          path: metadata.name
+          value: test-kafka-test-topic
+      - equal:
+          path: spec.topicName
+          value: test-topic
+      - notExists:
+          path: spec.config
diff --git a/packages/apps/kafka/tests/versions_test.yaml b/packages/apps/kafka/tests/versions_test.yaml
new file mode 100644
index 0000000000..c1128b7510
--- /dev/null
+++ b/packages/apps/kafka/tests/versions_test.yaml
@@ -0,0 +1,29 @@
+suite: Name-length guard
+
+# kafka.assertNameLength is invoked from kafka.yaml (the always-rendered Kafka
+# CR), so a release name whose derived KRaft controller node name would exceed
+# the 63-char DNS-1123 pod-hostname limit fails the whole render early with an
+# actionable message, instead of Strimzi silently never bringing the pod up.
+templates:
+  - templates/kafka.yaml
+
+tests:
+  - it: fails the render when the release name exceeds the 63-char controller node budget
+    release:
+      # "kafka-" + 47 chars = 53; derived controller node <release>-c-<hash>-<id>
+      # is 66 characters, over the limit.
+      name: kafka-01234567890123456789012345678901234567890123456
+      namespace: tenant-test
+    asserts:
+      - failedTemplate:
+          errorPattern: "over the 63-character"
+
+  - it: renders normally for a release name within budget
+    release:
+      name: test-kafka
+      namespace: tenant-test
+    asserts:
+      - hasDocuments:
+          count: 1
+      - isKind:
+          of: Kafka
diff --git a/packages/apps/kafka/tests/workloadmonitor_test.yaml b/packages/apps/kafka/tests/workloadmonitor_test.yaml
index b4a268da05..1db6f06347 100644
--- a/packages/apps/kafka/tests/workloadmonitor_test.yaml
+++ b/packages/apps/kafka/tests/workloadmonitor_test.yaml
@@ -1,70 +1,142 @@
-suite: Kafka WorkloadMonitor replica paths
-
-# Regression cover for the fix that split the WorkloadMonitor replica
-# source from a single phantom `.Values.replicas` (which does not exist in
-# this chart's values — kafka and zookeeper carry their own counts) into the
-# correct `.Values.kafka.replicas` and `.Values.zookeeper.replicas`. Before
-# the fix both monitors rendered `replicas:` empty, so the workload-monitor
-# controller never knew the expected replica count.
+suite: WorkloadMonitor tests
 
 templates:
   - templates/workloadmonitor.yaml
 
 tests:
-  - it: kafka and zookeeper monitors read their own replica counts
+  ##################################
+  # Pool layout (always separated) #
+  ##################################
+
+  - it: renders broker and controller WorkloadMonitors
     release:
       name: test-kafka
       namespace: tenant-test
-    set:
-      kafka:
-        replicas: 5
-      zookeeper:
-        replicas: 2
     asserts:
       - hasDocuments:
           count: 2
-      # doc 0 — kafka monitor
-      - documentIndex: 0
-        equal:
+      - isKind:
+          of: WorkloadMonitor
+        documentIndex: 0
+      - isKind:
+          of: WorkloadMonitor
+        documentIndex: 1
+
+  - it: names broker monitor as the release and controller monitor with -controller suffix
+    release:
+      name: test-kafka
+      namespace: tenant-test
+    asserts:
+      - equal:
           path: metadata.name
           value: test-kafka
-      - documentIndex: 0
-        equal:
-          path: spec.type
-          value: kafka
-      - documentIndex: 0
-        equal:
-          path: spec.replicas
-          value: 5
-      # doc 1 — zookeeper monitor
-      - documentIndex: 1
-        equal:
+        documentIndex: 0
+      - equal:
           path: metadata.name
-          value: test-kafka-zookeeper
-      - documentIndex: 1
-        equal:
+          value: test-kafka-controller
+        documentIndex: 1
+
+  - it: sets broker monitor type to kafka-broker with pool-name selector
+    release:
+      name: test-kafka
+      namespace: tenant-test
+    asserts:
+      - equal:
           path: spec.type
-          value: zookeeper
-      - documentIndex: 1
-        equal:
-          path: spec.replicas
-          value: 2
+          value: kafka-broker
+        documentIndex: 0
+      - matchRegex:
+          path: spec.selector["strimzi.io/pool-name"]
+          pattern: ^b-[0-9a-f]{8}$
+        documentIndex: 0
 
-  - it: replica counts stay independent (kafka != zookeeper)
+  - it: sets controller monitor type to kafka-controller with pool-name selector
+    release:
+      name: test-kafka
+      namespace: tenant-test
+    asserts:
+      - equal:
+          path: spec.type
+          value: kafka-controller
+        documentIndex: 1
+      - matchRegex:
+          path: spec.selector["strimzi.io/pool-name"]
+          pattern: ^c-[0-9a-f]{8}$
+        documentIndex: 1
+
+  ##################################
+  # Replicas                       #
+  ##################################
+
+  - it: broker monitor replicas track kafka.replicas
     release:
       name: test-kafka
       namespace: tenant-test
     set:
       kafka:
-        replicas: 7
-      zookeeper:
-        replicas: 3
+        replicas: 5
     asserts:
-      - documentIndex: 0
-        equal:
+      - equal:
           path: spec.replicas
-          value: 7
-      - documentIndex: 1
-        equal:
+          value: 5
+        documentIndex: 0
+
+  - it: controller monitor has 3 replicas when kafka.replicas >= 2
+    release:
+      name: test-kafka
+      namespace: tenant-test
+    set:
+      kafka:
+        replicas: 5
+    asserts:
+      - equal:
           path: spec.replicas
           value: 3
+        documentIndex: 1
+
+  - it: controller monitor falls back to 1 replica when kafka.replicas <= 1
+    release:
+      name: test-kafka
+      namespace: tenant-test
+    set:
+      kafka:
+        replicas: 1
+    asserts:
+      - equal:
+          path: spec.replicas
+          value: 1
+        documentIndex: 1
+
+  ##################################
+  # Common fields                  #
+  ##################################
+
+  - it: sets kind=kafka and minReplicas=1 on both monitors
+    release:
+      name: test-kafka
+      namespace: tenant-test
+    asserts:
+      - equal:
+          path: spec.kind
+          value: kafka
+        documentIndex: 0
+      - equal:
+          path: spec.minReplicas
+          value: 1
+        documentIndex: 0
+      - equal:
+          path: spec.kind
+          value: kafka
+        documentIndex: 1
+      - equal:
+          path: spec.minReplicas
+          value: 1
+        documentIndex: 1
+
+  - it: does not render a zookeeper WorkloadMonitor
+    release:
+      name: test-kafka
+      namespace: tenant-test
+    asserts:
+      - hasDocuments:
+          count: 2
diff --git a/packages/apps/kafka/values.schema.json b/packages/apps/kafka/values.schema.json
index 233f6dbc69..6cdf872939 100644
--- a/packages/apps/kafka/values.schema.json
+++ b/packages/apps/kafka/values.schema.json
@@ -1,6 +1,11 @@
 {
   "title": "Chart Values",
   "type": "object",
+  "x-cozystack-name": {
+    "type": "string",
+    "description": "Kafka cluster name. The KRaft controller pods are named `kafka-\u003cname\u003e-c-\u003chash\u003e-\u003cid\u003e` with an 8-character hash, and that pod hostname must fit the 63-character DNS-1123 label limit even for the smallest cluster.",
+    "maxLength": 44
+  },
   "properties": {
     "external": {
       "description": "Enable external access from outside the cluster.",
@@ -18,6 +23,15 @@
         }
       }
     },
+    "version": {
+      "description": "Kafka version to deploy. Upgrade-only: once a cluster's KRaft metadata is at a given version, Strimzi refuses an in-place downgrade, so lowering this on a running cluster (e.g. v3.9 back to v3.8) leaves the Kafka CR stuck in a reconcile error. Pick the target version at creation and only ever raise it.",
+      "type": "string",
+      "default": "v3.9",
+      "enum": [
+        "v3.9",
+        "v3.8"
+      ]
+    },
     "topics": {
       "description": "Topics configuration.",
       "type": "array",
@@ -25,7 +39,6 @@
       "items": {
         "type": "object",
         "required": [
-          "config",
           "name",
           "partitions",
           "replicas"
@@ -62,101 +75,9 @@
         "storageClass"
       ],
       "properties": {
-        "replicas": {
-          "description": "Number of Kafka replicas.",
-          "type": "integer",
-          "default": 3
-        },
-        "resources": {
-          "description": "Explicit CPU and memory configuration. When omitted, the preset defined in `resourcesPreset` is applied.",
-          "type": "object",
-          "default": {},
-          "properties": {
-            "cpu": {
-              "description": "CPU available to each replica.",
-              "pattern": "^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$",
-              "anyOf": [
-                {
-                  "type": "integer"
-                },
-                {
-                  "type": "string"
-                }
-              ],
-              "x-kubernetes-int-or-string": true
-            },
-            "memory": {
-              "description": "Memory (RAM) available to each replica.",
-              "pattern": "^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$",
-              "anyOf": [
-                {
-                  "type": "integer"
-                },
-                {
-                  "type": "string"
-                }
-              ],
-              "x-kubernetes-int-or-string": true
-            }
-          }
-        },
-        "resourcesPreset": {
-          "description": "Default sizing preset used when `resources` is omitted.",
-          "type": "string",
-          "default": "c1.small",
-          "enum": [
-            "t1.nano",
-            "t1.micro",
-            "t1.small",
-            "t1.medium",
-            "t1.large",
-            "t1.xlarge",
-            "t1.2xlarge",
-            "t1.4xlarge",
-            "c1.nano",
-            "c1.micro",
-            "c1.small",
-            "c1.medium",
-            "c1.large",
-            "c1.xlarge",
-            "c1.2xlarge",
-            "c1.4xlarge",
-            "s1.nano",
-            "s1.micro",
-            "s1.small",
-            "s1.medium",
-            "s1.large",
-            "s1.xlarge",
-            "s1.2xlarge",
-            "s1.4xlarge",
-            "u1.nano",
-            "u1.micro",
-            "u1.small",
-            "u1.medium",
-            "u1.large",
-            "u1.xlarge",
-            "u1.2xlarge",
-            "u1.4xlarge",
-            "m1.nano",
-            "m1.micro",
-            "m1.small",
-            "m1.medium",
-            "m1.large",
-            "m1.xlarge",
-            "m1.2xlarge",
-            "m1.4xlarge",
-            "nano",
-            "micro",
-            "small",
-            "medium",
-            "large",
-            "xlarge",
-            "2xlarge"
-          ]
-        },
-        "size": {
-          "description": "Persistent Volume size for Kafka.",
-          "default": "10Gi",
+        "controllerStorageSize": {
+          "description": "Persistent Volume size for KRaft controller metadata (used during ZK-to-KRaft migration).",
+          "default": "5Gi",
           "pattern": "^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$",
           "anyOf": [
             {
@@ -168,32 +89,8 @@
           ],
           "x-kubernetes-int-or-string": true
         },
-        "storageClass": {
-          "description": "StorageClass used to store the Kafka data.",
-          "type": "string",
-          "default": "",
-          "x-kubernetes-validations": [
-            {
-              "rule": "self == oldSelf",
-              "message": "storageClass is immutable"
-            }
-          ]
-        }
-      }
-    },
-    "zookeeper": {
-      "description": "ZooKeeper configuration.",
-      "type": "object",
-      "default": {},
-      "required": [
-        "replicas",
-        "resourcesPreset",
-        "size",
-        "storageClass"
-      ],
-      "properties": {
         "replicas": {
-          "description": "Number of ZooKeeper replicas.",
+          "description": "Number of Kafka replicas.",
           "type": "integer",
           "default": 3
         },
@@ -285,8 +182,8 @@
           ]
         },
         "size": {
-          "description": "Persistent Volume size for ZooKeeper.",
-          "default": "5Gi",
+          "description": "Persistent Volume size for Kafka.",
+          "default": "10Gi",
           "pattern": "^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$",
           "anyOf": [
             {
@@ -299,7 +196,7 @@
           "x-kubernetes-int-or-string": true
         },
         "storageClass": {
-          "description": "StorageClass used to store the ZooKeeper data.",
+          "description": "StorageClass used to store the Kafka data.",
           "type": "string",
           "default": "",
           "x-kubernetes-validations": [
@@ -307,7 +204,10 @@
               "rule": "self == oldSelf",
               "message": "storageClass is immutable"
             }
-          ]
+          ],
+          "x-cozystack-options": {
+            "source": "storageclass"
+          }
         }
       }
     }
diff --git a/packages/apps/kafka/values.yaml b/packages/apps/kafka/values.yaml
index 63908874dc..17d6d91660 100644
--- a/packages/apps/kafka/values.yaml
+++ b/packages/apps/kafka/values.yaml
@@ -1,3 +1,6 @@
+## @name {string} - Kafka cluster name. The KRaft controller pods are named `kafka-<name>-c-<hash>-<id>` with an 8-character hash, and that pod hostname must fit the 63-character DNS-1123 label limit even for the smallest cluster.
+## @maxLength 44
+
 ##
 ## @section Common parameters
 ##
@@ -11,6 +14,13 @@ external: false
 ## @param {TLS} tls - TLS configuration. Strimzi manages the cluster PKI automatically (no cert-manager is involved for this chart): the operator auto-creates `<release>-cluster-ca-cert` and `<release>-clients-ca-cert` secrets, both exposed for client trust setup. The internal TLS listener on 9093 is always on; this toggle only controls the external listener on 9094.
 tls: {}
 
+## @enum {string} Version - Kafka version to deploy.
+## @value v3.9
+## @value v3.8
+
+## @param {Version} version - Kafka version to deploy. Upgrade-only: once a cluster's KRaft metadata is at a given version, Strimzi refuses an in-place downgrade, so lowering this on a running cluster (e.g. v3.9 back to v3.8) leaves the Kafka CR stuck in a reconcile error. Pick the target version at creation and only ever raise it.
+version: "v3.9"
+
 ##
 ## @section Application-specific parameters
 ##
@@ -19,7 +29,7 @@ tls: {}
 ## @field {string} name - Topic name.
 ## @field {int} partitions - Number of partitions.
 ## @field {int} replicas - Number of replicas.
-## @field {object} config - Topic configuration.
+## @field {*object} [config] - Topic configuration.
 
 ## @param {[]Topic} topics - Topics configuration.
 topics: []
@@ -103,6 +113,8 @@ topics: []
 ## @field {quantity} size - Persistent Volume size for Kafka.
 ## @field {string} storageClass - StorageClass used to store the Kafka data.
 ## @immutable
+## @x-cozystack-options {source: storageclass}
+## @field {quantity} [controllerStorageSize] - Persistent Volume size for KRaft controller metadata (used during ZK-to-KRaft migration).
 
 ## @param {Kafka} kafka - Kafka configuration.
 kafka:
@@ -111,23 +123,4 @@ kafka:
   resourcesPreset: "c1.small"
   size: 10Gi
   storageClass: ""
-
-##
-## @section ZooKeeper configuration
-##
-
-## @typedef {struct} ZooKeeper - ZooKeeper configuration.
-## @field {int} replicas - Number of ZooKeeper replicas.
-## @field {Resources} [resources] - Explicit CPU and memory configuration. When omitted, the preset defined in `resourcesPreset` is applied.
-## @field {ResourcesPreset} resourcesPreset - Default sizing preset used when `resources` is omitted.
-## @field {quantity} size - Persistent Volume size for ZooKeeper.
-## @field {string} storageClass - StorageClass used to store the ZooKeeper data.
-## @immutable
-
-## @param {ZooKeeper} zookeeper - ZooKeeper configuration.
-zookeeper:
-  replicas: 3
-  resources: {}
-  resourcesPreset: "c1.small"
-  size: 5Gi
-  storageClass: ""
+  controllerStorageSize: 5Gi
diff --git a/packages/apps/kubernetes-nodes/.helmignore b/packages/apps/kubernetes-nodes/.helmignore
new file mode 100644
index 0000000000..cdada66736
--- /dev/null
+++ b/packages/apps/kubernetes-nodes/.helmignore
@@ -0,0 +1,5 @@
+.helmignore
+/logos
+/Makefile
+/hack
+/images/*/*
diff --git a/packages/apps/kubernetes-nodes/Chart.yaml b/packages/apps/kubernetes-nodes/Chart.yaml
new file mode 100644
index 0000000000..8460d4a678
--- /dev/null
+++ b/packages/apps/kubernetes-nodes/Chart.yaml
@@ -0,0 +1,7 @@
+apiVersion: v2
+name: kubernetes-nodes
+description: Worker node pool for a managed Kubernetes cluster
+icon: /logos/kubernetes.svg
+type: application
+version: 0.0.0 # Placeholder, the actual version will be automatically set during the build process
+appVersion: 1.32.6
diff --git a/packages/apps/kubernetes-nodes/Makefile b/packages/apps/kubernetes-nodes/Makefile
new file mode 100644
index 0000000000..701d81eaa9
--- /dev/null
+++ b/packages/apps/kubernetes-nodes/Makefile
@@ -0,0 +1,26 @@
+include ../../../hack/package.mk
+
+.PHONY: test generate update
+
+test:
+	helm unittest .
+
+generate:
+	cozyvalues-gen -m 'kubernetesnodes' -v values.yaml -s values.schema.json -r README.md -g ../../../api/apps/v1alpha1/kubernetesnodes/types.go
+	../../../hack/update-crd.sh
+
+# Keep the worker-image inputs (Talos<->Kubernetes support matrix and the
+# kubectl.tag used by the talos-reconcile Job) in lockstep with the parent
+# kubernetes chart. They are copied, not symlinked, so `helm package` bundles
+# them; run this after the parent chart's `make update`.
+#
+# _talosconfigtemplate.tpl is not copied from anywhere: the parent chart no
+# longer carries worker node pools, so this chart owns the worker machine
+# config outright. It stays here because the TalosConfigTemplate it renders is
+# content-hash named and both consumers in this chart - nodegroup.yaml, which
+# writes bootstrap.configRef, and talos-reconcile-job.yaml, which creates the
+# object - have to hash the same bytes.
+update:
+	cp ../kubernetes/files/versions.yaml files/versions.yaml
+	cp ../kubernetes/images/kubectl.tag images/kubectl.tag
+	$(MAKE) generate
diff --git a/packages/apps/kubernetes-nodes/README.md b/packages/apps/kubernetes-nodes/README.md
new file mode 100644
index 0000000000..a2bb3ddc46
--- /dev/null
+++ b/packages/apps/kubernetes-nodes/README.md
@@ -0,0 +1,115 @@
+# Kubernetes Worker Node Pool
+
+`kubernetes-nodes` manages a single worker node pool for a managed Kubernetes
+cluster. It is the worker half of the Kubernetes-app split (see
+[cozystack/community#8](https://github.com/cozystack/community/pull/8)): the
+control plane lives in the `kubernetes` chart, and each pool is a separate
+`kubernetes-nodes` release attached to a parent cluster by name.
+
+A `KubernetesNodes` CR named `<cluster>-<pool>` (e.g. `myk8s-md0`) provisions a
+`MachineDeployment` + `KubevirtMachineTemplate` + `MachineHealthCheck` wired to
+the parent cluster `kubernetes-<cluster>` in the same namespace, plus a
+`talos-reconcile` Job that produces the pool's `TalosConfigTemplate`.
+
+## Parameters
+
+### Linkage
+
+| Name      | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                      | Type     | Value |
+| --------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------- | ----- |
+| `cluster` | Name of the parent Kubernetes cluster (the `Kubernetes` CR) in the same namespace this node pool attaches to. Required. The pool's CAPI objects are wired to the parent cluster `kubernetes-<cluster>`; the KubernetesNodes CR must be named `<cluster>-<pool>`. The pool name (the part after `<cluster>-`) must not collide with a nodeGroup still managed by the parent kubernetes chart (e.g. the default `md0`), or the render fails on ownership conflict. | `string` | `""`  |
+
+
+### Common Parameters
+
+| Name           | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | Type     | Value        |
+| -------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------- | ------------ |
+| `storageClass` | StorageClass for the worker node system disk. When empty, the cluster default applies. Worker VMs live-migrate, so their disks need ReadWriteMany — the RWX access mode is supplied by the chosen StorageClass's CDI StorageProfile — and linstor-csi rejects RWX volumes that are not on a DRBD-backed StorageClass, so prefer a replicated/DRBD class. On an `osImage.builtin` pool this field also decides whether the pool renders at all: CDI takes the storage-layer clone path only when the worker disk and the golden share a StorageClass, and falls back to a host-assisted copy over the pod network across classes, so the chart refuses a pool whose class differs from its golden's. Leaving it empty resolves to the cluster's default StorageClass, and the same comparison is made against that. On a `builtin` pool the resolved class is then written onto the worker disk rather than left for the cluster to fill in at bind time, so a pool that has already cloned keeps binding on the class its disks are on even after an admin moves the default annotation; on the HTTP path an empty class is still left to the cluster. | `string` | `replicated` |
+
+
+### Pool Sizing
+
+| Name                           | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | Type       | Value       |
+| ------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------- | ----------- |
+| `minReplicas`                  | Minimum number of replicas in this pool. Used as the cluster-autoscaler floor.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | `int`      | `0`         |
+| `maxReplicas`                  | Maximum number of replicas in this pool. Used as the cluster-autoscaler ceiling.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | `int`      | `10`        |
+| `instanceType`                 | Virtual machine instance type.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | `string`   | `u1.medium` |
+| `diskSize`                     | System disk size for the worker VM. Carries the Talos OS image, kubelet state, containerd image cache, and any local-path PVCs. How the OS image reaches the disk follows this pool's `osImage`: the default and `osImage.factory` stream the Image Factory raw artifact in over HTTP, while `osImage.builtin` makes the disk a storage-layer CDI clone of a shared golden image, with no HTTP fetch. A `builtin` pool must keep diskSize at or above the golden's storage size (6Gi in the shipped worker image catalog), because a CDI clone target cannot be smaller than its source -- the chart rejects a smaller value at render time rather than letting the clone stall. Sizing a `builtin` pool also has to allow for transient headroom the finished disk does not show: CDI populates a larger target by cloning the golden at the source size and then growing it, so a worker being provisioned occupies a temporary clone PVC at the golden's size on top of this diskSize, and both are multiplied by the replica count of a replicated StorageClass. The golden itself is a separate one-time cost for the whole cluster, not a per-worker one. So the peak is the golden, plus `diskSize + golden storage` for each worker cloning at that moment. A pool whose storage backend cannot spare that peak does not fail: the clone waits for space, the VM never boots, and the reason is visible only in the storage layer's own events.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | `quantity` | `20Gi`      |
+| `roles`                        | List of node roles. Each role `r` labels nodes with `node-role.kubernetes.io/<r>`. Use `[ingress-nginx]` for a pool that hosts the tenant ingress-nginx controller.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | `[]string` | `[]`        |
+| `resources`                    | Explicit CPU and memory for each worker node, as an alternative to `instanceType` sizing. Optional: when omitted, the node is sized by `instanceType`. When both `cpu` and `memory` are set, they take precedence and `instanceType` is ignored (the instancetype is omitted from the VM, since KubeVirt cannot override an instancetype's CPU/memory). Set both `cpu` and `memory` together or neither; setting only one is rejected at render time.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | `object`   | `{}`        |
+| `resources.cpu`                | Number of vCPU cores for each worker VM, as a whole number such as `2`. On the `kubevirt` substrate the value becomes the VM's integer `domain.cpu.cores`, so millicore, fractional and negative quantities, and counts above 4294967295, are rejected at render time; an unquoted `0` is treated as unset. On the `proxmox` substrate a millicore or fractional quantity is rounded up to whole cores.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | `quantity` | `""`        |
+| `resources.memory`             | Memory (RAM) available.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | `quantity` | `""`        |
+| `podCpuLimit`                  | CPU limit for the worker VM's virt-launcher `compute` container, which is the ceiling the guest vCPU threads, the QEMU emulator thread and the IO threads share. Distinct from `resources.cpu`, which sizes the guest itself. Cannot be combined with `instanceType` sizing: KubeVirt refuses a VM that references an instancetype and also sets `domain.resources.limits.cpu`, so the chart rejects that combination at render time. Sizing the pool by `resources` (both `cpu` and `memory`) is what drops the instancetype from the VM, which is where the limit is usable. When unset, KubeVirt derives the limit from the guest vCPU count in any namespace carrying a ResourceQuota that limits CPU, so a worker sized at N vCPUs runs under a ceiling of N with the emulation overhead taken out of the same N. Setting a value declares the limit on the VM directly, which is both what lands it on the container and what stops KubeVirt deriving one. It moves the CPU request with it: KubeVirt copies a declared CPU limit into the CPU request when the VM declares no request of its own, so a pool that sets only this field asks the scheduler for its whole ceiling instead of the fraction of the vCPU count it asked for before, and a ceiling the nodes cannot spare leaves the workers Pending on `Insufficient cpu`. Pair it with `podCpuRequest` to move the ceiling without moving the request. Zero means no ceiling at all rather than the tightest one, since the kubelet turns a zero CPU limit into no CFS quota while the declared key still stops KubeVirt deriving one — but it is only accepted together with `podCpuRequest: 0`, because KubeVirt keeps deriving a request from the vCPU count when the VM declares none and a request above a declared limit of zero is rejected when the worker's Pod is created. A negative value is refused at render time. Changing it rolls the pool, because the worker VM template is named by a hash of its content. Keep in sync with the parent kubernetes chart.                                                                                                                                                                               | `quantity` | `""`        |
+| `podCpuRequest`                | CPU request for the worker VM's virt-launcher `compute` container, which is what the scheduler reserves for a worker on its host and what weights it against neighbours on a contended one. Distinct from `resources.cpu`, which sizes the guest itself. It exists to be paired with `podCpuLimit`: KubeVirt copies a declared CPU limit into the request when the VM declares no request, so raising the ceiling alone raises what every worker in the pool asks the scheduler for, and this field is what holds the request still while the ceiling moves. Cannot be combined with `instanceType` sizing, for the same reason as `podCpuLimit`: KubeVirt refuses a VM that references an instancetype and also sets `domain.resources.requests.cpu`, so the chart rejects that combination at render time, as it does a value above `podCpuLimit`. Usable without a limit, where it only changes the scheduler's weighting: KubeVirt still derives the ceiling from the guest vCPU count in any namespace carrying a ResourceQuota that limits CPU, so keep the request at or below that count. A request above that derived ceiling is refused only when the worker's Pod is created, and deliberately not at render time: the ceiling exists only where such a ResourceQuota does, so refusing here would take away a configuration that works in a namespace without one. Zero is accepted on its own and reserves nothing, but zero beside a `podCpuLimit` is refused, because KubeVirt cannot tell an explicit zero request from an absent one and replaces both with the limit — which is the outcome this field exists to avoid, arrived at silently. A negative value is refused as well. When unset, KubeVirt computes the request from the guest vCPU count and the cluster CPU allocation ratio. Changing it rolls the pool, because the worker VM template is named by a hash of its content. Keep in sync with the parent kubernetes chart.                                                                                                                                                                                                                                                                    | `quantity` | `""`        |
+| `gpus`                         | List of GPUs to attach (NVIDIA driver requires at least 4 GiB RAM).                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | `[]object` | `[]`        |
+| `gpus[i].name`                 | Name of GPU, such as "nvidia.com/AD102GL_L40S".                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | `string`   | `""`        |
+| `kernelModules`                | Kernel modules loaded on every worker in this pool, emitted as Talos `machine.kernel.modules`. A Talos system extension installs a module but does not load it, so an extension-provided driver needs its modules declared here. Leave unset to let the chart decide: a pool holding at least one `nvidia.com/*` GPU gets `nvidia` (with `NVreg_NvLinkDisable=1`, which the gpu-operator driver container applies on non-Talos workers; on Talos that container has to be turned off or it clashes with the system extension, and nothing then mounts the ConfigMap carrying the parameter), `nvidia_uvm`, `nvidia_drm`, `nvidia_modeset` (that order — Talos loads the list in sequence and the last three depend on the first), and any other pool gets nothing. Set a non-empty list to replace the chart's choice entirely, or `[]` to opt out and emit no modules even on a GPU pool. The field carries no default, and unset is not the same value as `[]`: a generated parameter table that shows `[]` in its Default column is printing what it prints for any array with no default, not the effective value — leaving the field out selects the automatic set, writing `[]` disables it. The module still has to be in the image, and which extensions the image carries is the pool's schematic: a GPU pool points `osImage.factory.schematicID` (or `osImage.builtin.schematicID`) at a schematic with the NVIDIA extensions, and on Blackwell (GB202) that must be the open-kernel-modules extension. The automatic set keys on the `nvidia.com/` resource prefix alone and nothing cross-checks it against that schematic; on Talos v1.13 a declared module the image does not ship leaves its controller retrying rather than failing the boot, so the symptom is a missing driver, not a dead node. This value is part of the worker machine config, whose content hash names the `TalosConfigTemplate`, so changing it rolls every existing worker in the pool rather than only affecting nodes created later. The automatic set is itself such a change, on the upgrade that introduces this field, for every existing pool that holds an `nvidia.com/*` GPU and leaves the field unset: that pool rolls. | `[]object` | `[]`        |
+| `kernelModules[i].name`        | Module name as `modprobe` takes it, e.g. `nvidia_uvm`.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | `string`   | `""`        |
+| `kernelModules[i].parameters`  | Module parameters, each as a bare `key=value` string.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | `[]string` | `[]`        |
+| `kubelet`                      | Kubelet resource reservations for this pool.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    | `object`   | `{}`        |
+| `kubelet.systemReservedMemory` | Memory reserved for host OS. Auto-computed from instanceType if empty.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | `string`   | `""`        |
+| `kubelet.kubeReservedMemory`   | Memory reserved for kubelet and container runtime. Auto-computed from instanceType if empty.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    | `string`   | `""`        |
+| `kubelet.systemReservedCpu`    | CPU reserved for host OS. Auto-computed from instanceType if empty.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | `string`   | `""`        |
+| `kubelet.kubeReservedCpu`      | CPU reserved for kubelet and container runtime. Auto-computed from instanceType if empty.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       | `string`   | `""`        |
+| `kubelet.evictionHardMemory`   | Hard eviction threshold for memory (absolute like 200Mi or percentage like 7%).                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | `string`   | `7%`        |
+| `kubelet.evictionSoftMemory`   | Soft eviction threshold for memory (absolute like 1Gi or percentage like 10%).                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | `string`   | `10%`       |
+| `logSerialConsole`             | Stream each worker VM's guest serial console into a `guest-console-log` container beside virt-launcher, readable with `kubectl logs`. The only view of a worker that stalls during boot before Talos apid answers, when neither a Node nor a certificate request exists to diagnose from. Two costs the field name does not show. Changing the value rolls the pool, because it is part of the worker VM template whose name is a hash of its content -- including the stuck VM whose console was wanted, so it buys visibility into the next boot rather than the current one. And it overrides the platform's cluster-wide `disableSerialConsoleLog`, set because that container has been seen holding virt-launcher in `PodInitializing` (kubevirt/kubevirt#15989), which would take the pool down rather than explain it -- so check that virt-launcher Pods reach Running after enabling it.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | `bool`     | `false`     |
+| `maxUnhealthy`                 | Maximum number of unhealthy nodes tolerated in this pool before remediation is paused. The MachineHealthCheck admission webhook accepts either a bare integer ("0", "1", ...) or a percentage ("0%", "50%"); bare numeric strings are rejected, so the safer default is a percentage. Drop to "0%" once the pool is stable. Watch how a percentage behaves in a small group: the MachineHealthCheck controller scales it against the number of machines the check covers and rounds down, then remediates only while the unhealthy count is at or below that result. At "50%" a group of one therefore never remediates, because half of one rounds down to zero, and a group of two remediates one unhealthy machine but not two.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              | `string`   | `50%`       |
+| `nodeStartupTimeout`           | Maximum time a Machine is allowed to spend reaching the Ready condition before it is remediated. Raise for slow first boots (Talos image fetch from factory.talos.dev or a busy storage class on the kubevirt-csi PVC populator). The MachineHealthCheck measures it from the later of the Machine's creation and its InfrastructureReady transition, so the clock restarts when the infrastructure reports ready: a worker gets this long for the disk image import and the VM to come up, and then this long again for the guest to boot and its kubelet to register with the tenant apiserver. Either leg stretches on a host under load, and a Machine remediated here is deleted before it ever joins, so its replacement starts the same sequence from the beginning.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | `string`   | `20m`       |
+| `readyUnknownTimeout`          | How long a worker Node may report `Ready=Unknown` before the MachineHealthCheck remediates the Machine, which for a KubeVirt worker means deleting the VM. `Ready=Unknown` is what the node lifecycle controller writes once it stops hearing from a kubelet, on a grace period of its own, so the wall clock from a guest going quiet to a deleted worker is this value plus that grace period. A guest starved of CPU stops answering long before it is dead, so a value of a few tens of seconds deletes workers that would have come back on their own. Validated at render time like maxNodeProvisionTime: the CAPI webhook does not check these timeouts, and a zero or negative value would remediate the moment the condition flips. Keep in sync with the parent kubernetes chart.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | `string`   | `5m`        |
+| `readyFalseTimeout`            | How long a worker Node may report `Ready=False` before the MachineHealthCheck remediates the Machine. A Node that has registered but has no working CNI yet reports `Ready=False`, so this value is the whole budget a first boot gets for the CNI rollout to reach that node, and a worker deleted mid-rollout takes the rollout with it while its replacement starts over. Raising it delays replacing a worker that is genuinely dead, but not rescheduling its workload: Pods leave an unreachable Node on the node lifecycle controller's taint-based eviction and the toleration that carries, not on this timer. Validated at render time like maxNodeProvisionTime: the CAPI webhook does not check these timeouts, and a zero or negative value would remediate the moment the condition flips. Keep in sync with the parent kubernetes chart.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | `string`   | `10m`       |
+| `maxNodeProvisionTime`         | How long the cluster-autoscaler waits for a newly created worker to register as a Node before it treats that machine as long-unregistered. Rendered onto this pool's MachineDeployment as the `cluster.x-k8s.io/autoscaling-options-maxnodeprovisiontime` annotation, which overrides the autoscaler's built-in default for this pool only. Two things change when the timer fires, and both make a slow join worse rather than better: the machine stops counting towards the pool's upcoming capacity, so the autoscaler asks for a replacement for capacity that is already on its way, and the machine becomes eligible for removal. Size it above the slowest join a healthy worker can take, counting the Talos image import, the guest boot and the CNI rollout. Accepted as a whole number of seconds, minutes or hours ("30m", "1h30m"), which is narrower than Go's duration syntax on purpose: the autoscaler ignores a value it cannot parse and falls back to its own default without failing, and the narrower shape cannot express a value that overflows the parser or a fraction it rounds to zero. The canonical form a duration serializes back to ("20m0s", "1h0m0s") is accepted. Keep in sync with the parent kubernetes chart.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | `string`   | `30m`       |
+
+
+### Kubernetes Version
+
+| Name      | Description                                                                                                                                                                                                                                                                                                               | Type     | Value   |
+| --------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------- | ------- |
+| `version` | Kubernetes major.minor version the pool joins. Must not be ahead of the parent cluster's minor (workers may not lead the apiserver); it may lag behind during a rolling upgrade -- bump the parent Kubernetes CR first, then each pool -- and must satisfy the Talos<->Kubernetes support matrix against `talos.version`. | `string` | `v1.35` |
+
+
+### Talos Worker Image
+
+| Name                              | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              | Type      | Value                                                              |
+| --------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------- | ------------------------------------------------------------------ |
+| `osImage`                         | Worker OS image source for this pool. Default (omitted): import over HTTP from the `talos.*` Image Factory. Set `osImage.builtin` to clone a golden from the opt-in worker image catalog instead. Editing this on an existing pool re-images that pool.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | `object`  | `{}`                                                               |
+| `osImage.builtin`                 | Clone a golden image from the worker image catalog. Requires a StorageClass whose volumes are reachable from any node, in practice a replicated/DRBD class: the clone is a storage-layer copy, and on a node-pinned class its two ends land on unrelated nodes -- the golden binds where CDI imported it, a worker disk where its VM is scheduled.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       | `*object` | `null`                                                             |
+| `osImage.builtin.schematicID`     | Talos schematic ID of the golden to clone. Defaults to `talos.schematicID`.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              | `string`  | `""`                                                               |
+| `osImage.builtin.version`         | Talos version of the golden to clone. Defaults to `talos.version`.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       | `string`  | `""`                                                               |
+| `osImage.factory`                 | Import from an Image Factory / mirror (default).                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | `*object` | `null`                                                             |
+| `osImage.factory.version`         | Talos version. Defaults to `talos.version`.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              | `string`  | `""`                                                               |
+| `osImage.factory.schematicID`     | Talos schematic ID. Defaults to `talos.schematicID`.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | `string`  | `""`                                                               |
+| `osImage.factory.imageFactoryURL` | Base URL of the Image Factory serving the boot raw image. Defaults to `talos.imageFactoryURL`. No trailing slash. NOTE: this redirects only the worker boot-disk import; the in-guest upgrade installer image is always sourced from `talos.installerRepository`, so an air-gapped pool must also have `talos.installerRepository` pointed at a reachable registry.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | `string`  | `""`                                                               |
+| `talos`                           | Talos worker image configuration. Keep in sync with the parent cluster's `talos`.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        | `object`  | `{}`                                                               |
+| `talos.version`                   | Default Talos release for this pool's worker OS image and in-guest installer. The pool can pin its own release via `osImage.builtin.version` or `osImage.factory.version`; when `osImage` omits it, this value applies. Both ways in are checked against the chart's Talos<->Kubernetes support matrix, against whichever release the pool actually resolves to, so an override cannot slip past a check `talos.version` would have failed. The matrix rejects a pairing it lists as unsupported; it lists the Talos minors this chart ships and passes any other minor unchecked, so pointing either field at a Talos release the chart does not know about is the operator's call, not a checked one. Whichever release applies is interpolated into an image URL and a DataVolume name, so it must be a full `vMAJOR.MINOR.PATCH` release, optionally with a pre-release suffix -- the render refuses anything else, a minor-only `v1.13` included. The values schema types this as a bare string, so a malformed one is accepted by the CR and fails the pool's HelmRelease instead. | `string`  | `v1.13.6`                                                          |
+| `talos.schematicID`               | Talos image-factory schematic ID. Defaults to the cozystack-tested vanilla schematic. Operators using custom schematics (system extensions, kernel args) override here. The pool can pin its own via `osImage.builtin.schematicID` or `osImage.factory.schematicID`; when `osImage` omits it, this value applies. Whichever of the two applies is interpolated into an image URL and a DataVolume name, so it must be a plain lowercase alphanumeric identifier -- the render refuses anything else. A custom schematic on `osImage.builtin` also needs its own catalog entry, since the golden is named from the schematic ID.                                                                                                                                                                                                                                                                                                                                                                                                                                                          | `string`  | `ce4c980550dd2ab1b17bbf2b08801c7eb59418eafe8f279833297925d67c7515` |
+| `talos.imageFactoryURL`           | Default base URL of the Talos Image Factory that serves the worker OS disk image (the `openstack-amd64.raw.xz` raw artifact streamed in by CDI over HTTP). Applies only when this pool imports over HTTP — the default and `osImage.factory`, which overrides it via `osImage.factory.imageFactoryURL`. A pool on `osImage.builtin` clones a golden image from the worker image catalog and does not use this field at all. Defaults to the public factory. Point at a self-hosted Image Factory, a caching mirror, or an internal HTTP file server for air-gapped, rate-limited, or flaky-egress environments. No trailing slash. It is interpolated into the worker DataVolume source URL, so on those HTTP paths it must be a plain `http(s)` URL and the render refuses anything else; a pool on `osImage.builtin` builds no such URL and is not held to it, so blanking this field there is legal.                                                                                                                                                                                | `string`  | `https://factory.talos.dev`                                        |
+| `talos.installerRepository`       | OCI repository prefix for the Talos installer image used by the in-guest `talos-reconcile` upgrade Job. Resolved as `<installerRepository>/<schematicID>:<version>` against whatever this pool's `osImage` pins, falling back to `talos.schematicID` and `talos.version` — so the installer matches the OS the pool actually booted. The prefix itself has no `osImage.*` override, so an air-gapped pool needs it pointed at a reachable registry as well. Defaults to the public factory's installer path. Override for air-gapped or mirrored registries. No trailing slash.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        | `string`  | `factory.talos.dev/installer`                                      |
+| `talos.registryMirrors`           | Talos `machine.registries.mirrors` passthrough for worker nodes: a map of upstream registry host to `{ endpoints: [ ... ] }`. Empty by default, so workers pull container images (the Talos `kubelet` image included) directly from the upstream registry. Point a host such as `ghcr.io` at an in-cluster pull-through mirror for air-gapped, rate-limited, or flaky-egress environments so a worker's boot does not depend on live public egress. Talos still falls back to the upstream registry unless a host also sets `skipFallback: true`, so a mirror alone does not enforce air-gap. This value is part of the worker machine config, whose content hash names the TalosConfigTemplate, so changing it rolls every existing worker in the pool rather than only affecting nodes created later.                                                                                                                                                                                                                                                                                  | `object`  | `{}`                                                               |
+| `talos.imageFactoryCA`            | Complete PEM certificate block(s) CDI must trust when importing this pool's worker OS disk image over HTTPS — the no-osImage default and `osImage.factory` path. Empty by default, so the importer uses only its system trust store, which is what the public factory needs. Set this when the factory in use (`imageFactoryURL` or `osImage.factory.imageFactoryURL`) is a self-hosted factory or mirror served by an internal CA, which the importer otherwise rejects with `x509: certificate signed by unknown authority`. The chart renders it into a ConfigMap in the release namespace — CDI requires certConfigMap to sit alongside the DataVolume — and references that from the worker DataVolume's `source.http.certConfigMap`; CDI appends it to the system pool rather than replacing it, so a publicly-trusted endpoint verifies either way. A pool on `osImage.builtin` clones a golden image and builds no HTTP source, so this field has no effect there.                                                                                                         | `string`  | `""`                                                               |
+
+
+### Substrate
+
+| Name                     | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       | Type       | Value      |
+| ------------------------ | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------- | ---------- |
+| `substrate`              | Which infrastructure provider backs this pool's worker VMs. `kubevirt` runs them inside this cluster on KubeVirt, sized by `instanceType` and booted from a Talos disk image CDI streams from the image factory. `proxmox` runs them on an external Proxmox VE cluster through capmox, sized by `resources`, and cloned from a Talos VM template that already exists on the hypervisor. The two substrates take different Talos platform images and different sizing inputs, so switching an existing pool is refused: the chart reads the live MachineDeployment's template kind and fails the render rather than rolling every worker to the other hypervisor and deleting the template the draining MachineSet still references. Create a new pool on the other substrate and scale this one down.                                                             | `string`   | `kubevirt` |
+| `proxmox`                | Proxmox substrate settings.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       | `object`   | `{}`       |
+| `proxmox.templateTags`   | Tags identifying the Talos VM template to clone. capmox matches a template when its tag set is EQUAL to this list, not when it contains it, so every tag on the template must be listed here — a missing one yields `found 0 VM templates with tags ...` while the tags are plainly present. The template has to carry this pool's `talos.schematicID` at `talos.version` in the nocloud flavour, with the Proxmox guest agent enabled for the `qemu-guest-agent` extension of the default schematic; `hack/proxmox-talos-template.sh` builds it from these values and prints the tags to list here. Do not build it from the platform release's `nocloud-amd64.raw.xz`: that is the bare-metal node image, whose `zfs` extension keeps a VM from finishing its boot sequence and reboots it at the Talos boot timeout. Required when `substrate` is `proxmox`. | `[]string` | `[]`       |
+| `proxmox.full`           | Full clone rather than linked. Default is a linked clone: it costs kilobytes at creation instead of the whole disk, because a ZFS-backed linked clone writes only its own increment (measured: 8K against 10.2G for the same worker full-cloned onto a `sparse 0` pool). The cost is that the clone holds the template's base snapshot, so the template cannot be rotated while any linked clone still references it — which is what the consolidation CronJob resolves 24h after creation. Set true for a pool that must be independent of the template from the first second.                                                                                                                                                                                                                                                                                 | `bool`     | `false`    |
+| `proxmox.network`        | NIC configuration.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | `object`   | `{}`       |
+| `proxmox.network.bridge` | Proxmox bridge the VM NIC attaches to (e.g. `vmbr0`). Required when `substrate` is `proxmox`.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | `string`   | `""`       |
+| `proxmox.network.vlan`   | L2 VLAN tag. Omitted when unset.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | `int`      | `0`        |
+| `proxmox.network.mtu`    | NIC MTU. Omitted when unset.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | `int`      | `0`        |
+| `proxmox.storage`        | Proxmox storage for the cloned disk; needs `full: true`. A target storage is a full-clone parameter — a linked clone always lives on the template's storage, and Proxmox refuses the pair — so the render refuses it too. Empty keeps the template's storage.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | `string`   | `""`       |
+| `proxmox.pool`           | Proxmox resource pool the worker VMs are added to. Set the same pool on every node pool of a tenant cluster and grant the tenant's tokens their privileges on `/pool/<name>`: that is the one ACL path that follows every VM capmox creates, replacements included. The pool must exist on the hypervisor; capmox does not create it. Empty adds the workers to no pool.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | `string`   | `""`       |
+| `proxmox.dnsServers`     | Nameservers written into the worker machineconfig. On kubevirt the workers use the management cluster's CoreDNS, which they reach over the pod network; an off-cluster Proxmox worker cannot, so it needs reachable resolvers of its own. Required when `substrate` is `proxmox`. Keep in sync with the parent kubernetes chart's `proxmox.dnsServers`.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | `[]string` | `[]`       |
+
+
+### Images
+
+| Name             | Description                                                                                                    | Type     | Value |
+| ---------------- | -------------------------------------------------------------------------------------------------------------- | -------- | ----- |
+| `images`         | Optional image overrides for air-gapped or rate-limited registries.                                            | `object` | `{}`  |
+| `images.kubectl` | Image used by the talos-reconcile and pre-delete unpin Jobs (kubectl). Empty falls back to images/kubectl.tag. | `string` | `""`  |
+
diff --git a/packages/apps/http-cache/charts/cozy-lib b/packages/apps/kubernetes-nodes/charts/cozy-lib
similarity index 100%
rename from packages/apps/http-cache/charts/cozy-lib
rename to packages/apps/kubernetes-nodes/charts/cozy-lib
diff --git a/packages/apps/kubernetes-nodes/files/versions.yaml b/packages/apps/kubernetes-nodes/files/versions.yaml
new file mode 100644
index 0000000000..aa5252921c
--- /dev/null
+++ b/packages/apps/kubernetes-nodes/files/versions.yaml
@@ -0,0 +1,5 @@
+"v1.35": "v1.35.6"
+"v1.34": "v1.34.9"
+"v1.33": "v1.33.13"
+"v1.32": "v1.32.13"
+"v1.31": "v1.31.14"
diff --git a/packages/apps/kubernetes-nodes/images/kubectl.tag b/packages/apps/kubernetes-nodes/images/kubectl.tag
new file mode 100644
index 0000000000..80d1e903c9
--- /dev/null
+++ b/packages/apps/kubernetes-nodes/images/kubectl.tag
@@ -0,0 +1 @@
+docker.io/alpine/k8s:1.33.4@sha256:b0523f0a244ddc4c8e055aa335c040d3d78b3ead5528f4544395f7f9f69c7b68
diff --git a/packages/apps/kubernetes-nodes/logos/kubernetes.svg b/packages/apps/kubernetes-nodes/logos/kubernetes.svg
new file mode 100644
index 0000000000..ac4e9a6400
--- /dev/null
+++ b/packages/apps/kubernetes-nodes/logos/kubernetes.svg
@@ -0,0 +1,10 @@
+<svg width="144" height="144" viewBox="0 0 144 144" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="144" height="144" rx="24" fill="url(#paint0_linear_681_2845)"/>
+<path d="M71.9968 19C70.3039 19.0002 68.9312 20.5322 68.9314 22.4221C68.9314 22.4511 68.9373 22.4788 68.9379 22.5076C68.9354 22.7644 68.9231 23.0737 68.9314 23.2973C68.9717 24.3873 69.2082 25.2216 69.3506 26.2258C69.6084 28.3752 69.8245 30.1569 69.6912 31.813C69.5615 32.4375 69.1037 33.0086 68.6956 33.4056L68.6235 34.7086C66.7839 34.8617 64.9319 35.1421 63.0821 35.5641C55.1226 37.3798 48.2695 41.4991 43.052 47.0609C42.7134 46.8288 42.1211 46.4019 41.945 46.2712C41.3977 46.3454 40.8445 46.5151 40.1241 46.0935C38.7522 45.1657 37.5028 43.8851 35.991 42.3424C35.2982 41.6044 34.7966 40.9018 33.9735 40.1904C33.7866 40.0289 33.5014 39.8104 33.2923 39.6442C32.6489 39.1288 31.89 38.86 31.157 38.8348C30.2147 38.8024 29.3075 39.1725 28.7138 39.9206C27.6584 41.2506 27.9963 43.2833 29.4671 44.4614C29.482 44.4734 29.4979 44.4827 29.5129 44.4943C29.715 44.6589 29.9625 44.8698 30.1483 45.0076C31.0217 45.6555 31.8195 45.9872 32.6897 46.5015C34.5231 47.6391 36.043 48.5823 37.2486 49.7196C37.7194 50.2237 37.8016 51.1122 37.8643 51.4964L38.8468 52.3782C33.5872 60.3308 31.153 70.1539 32.5915 80.1627L31.3077 80.5378C30.9693 80.9768 30.4912 81.6676 29.9911 81.8738C28.4138 82.3729 26.6387 82.5562 24.4956 82.7819C23.4894 82.866 22.6213 82.8158 21.5546 83.0188C21.3198 83.0635 20.9927 83.1491 20.7358 83.2097C20.7269 83.2116 20.7186 83.2142 20.7096 83.2162C20.6956 83.2195 20.6772 83.2263 20.6638 83.2294C18.857 83.668 17.6963 85.3365 18.0699 86.9805C18.4437 88.6248 20.2086 89.6248 22.0262 89.2312C22.0393 89.2282 22.0584 89.2277 22.072 89.2246C22.0926 89.2199 22.1106 89.2099 22.131 89.2049C22.3844 89.149 22.7019 89.0868 22.9236 89.0272C23.9723 88.7451 24.7318 88.3306 25.6746 87.9677C27.7029 87.2368 29.3828 86.6262 31.0195 86.3883C31.703 86.3345 32.4232 86.812 32.7814 87.0134L34.1177 86.7831C37.1926 96.3613 43.6366 104.103 51.7963 108.961L51.2396 110.303C51.4403 110.824 51.6616 111.53 51.5121 112.045C50.9171 113.595 49.898 115.231 48.7374 117.055C48.1755 117.898 47.6004 118.552 47.0934 119.516C46.972 119.747 46.8175 120.102 46.7004 120.346C45.9125 122.039 46.4904 123.99 48.0038 124.722C49.5268 125.459 51.4171 124.682 52.2352 122.985C52.2364 122.982 52.2406 122.98 52.2417 122.978C52.2426 122.976 52.2409 122.973 52.2417 122.971C52.3582 122.731 52.5233 122.415 52.6216 122.188C53.056 121.189 53.2005 120.332 53.5059 119.365C54.317 117.318 54.7626 115.17 55.8791 113.832C56.1849 113.466 56.6833 113.325 57.2001 113.186L57.8944 111.922C65.008 114.665 72.9705 115.402 80.9245 113.587C82.7391 113.173 84.4908 112.637 86.1843 111.994C86.3794 112.342 86.742 113.011 86.8393 113.179C87.3644 113.351 87.9377 113.439 88.4047 114.133C89.2401 115.567 89.8114 117.263 90.5073 119.312C90.8128 120.279 90.9638 121.136 91.3981 122.136C91.4971 122.363 91.6614 122.684 91.778 122.925C92.5944 124.628 94.4907 125.407 96.0159 124.669C97.5292 123.937 98.1077 121.986 97.3194 120.293C97.2023 120.049 97.0412 119.695 96.9198 119.464C96.4127 118.499 95.8377 117.852 95.2758 117.009C94.1152 115.185 93.1526 113.67 92.5575 112.12C92.3087 111.32 92.5995 110.823 92.7933 110.303C92.6772 110.17 92.4288 109.414 92.2824 109.059C100.762 104.029 107.017 95.9985 109.955 86.7239C110.351 86.7865 111.041 86.9091 111.265 86.9542C111.726 86.6487 112.149 86.2501 112.981 86.3159C114.617 86.5537 116.297 87.1645 118.326 87.8953C119.268 88.2581 120.028 88.6793 121.077 88.9614C121.298 89.021 121.616 89.0766 121.869 89.1325C121.889 89.1375 121.908 89.1475 121.928 89.1522C121.942 89.1553 121.961 89.1558 121.974 89.1588C123.792 89.552 125.557 88.5526 125.93 86.9081C126.303 85.2641 125.143 83.5952 123.336 83.157C123.074 83.097 122.701 82.995 122.446 82.9465C121.379 82.7435 120.511 82.7935 119.505 82.7095C117.361 82.4839 115.586 82.3004 114.009 81.8014C113.366 81.5507 112.908 80.7819 112.686 80.4655L111.448 80.1035C112.09 75.438 111.917 70.5825 110.806 65.7243C109.685 60.8208 107.704 56.3361 105.062 52.3848C105.379 52.0948 105.979 51.5612 106.149 51.4043C106.199 50.8517 106.156 50.2722 106.725 49.6603C107.931 48.523 109.451 47.5799 111.284 46.4423C112.154 45.9279 112.959 45.5964 113.832 44.9484C114.03 44.8019 114.299 44.5699 114.507 44.4022C115.977 43.2237 116.316 41.1911 115.26 39.8614C114.204 38.5317 112.159 38.4065 110.688 39.585C110.479 39.7516 110.195 39.9688 110.007 40.1312C109.184 40.8426 108.676 41.5452 107.983 42.2832C106.471 43.8259 105.222 45.113 103.85 46.0409C103.255 46.3885 102.385 46.2682 101.99 46.2449L100.824 47.0806C94.1753 40.0763 85.1235 35.5982 75.3766 34.7283C75.3494 34.3179 75.3137 33.5761 75.3046 33.3529C74.9056 32.9693 74.4235 32.6418 74.3024 31.813C74.1691 30.1569 74.3917 28.3752 74.6496 26.2258C74.7919 25.2216 75.0284 24.3873 75.0688 23.2973C75.078 23.0495 75.0632 22.69 75.0622 22.4221C75.062 20.5322 73.6898 18.9998 71.9968 19ZM68.1585 42.8886L67.248 59.0447L67.1825 59.0776C67.1214 60.5229 65.9375 61.677 64.4839 61.677C63.8884 61.677 63.3388 61.4849 62.8922 61.1571L62.866 61.1703L49.6807 51.7794C53.7331 47.7759 58.9164 44.8172 64.89 43.4546C65.9812 43.2056 67.0719 43.0209 68.1585 42.8886ZM75.8417 42.8886C82.8159 43.7504 89.2657 46.9232 94.2081 51.786L81.108 61.1176L81.0621 61.0979C79.8994 61.9512 78.2611 61.7394 77.3548 60.5978C76.9835 60.1301 76.7887 59.5801 76.7653 59.0249L76.7522 59.0184L75.8417 42.8886ZM44.8991 57.814L56.9382 68.633L56.9251 68.6988C58.0117 69.6479 58.172 71.2949 57.2657 72.4368C56.8944 72.9045 56.3975 73.2182 55.8639 73.3647L55.8508 73.4173L40.4188 77.8923C39.6334 70.6765 41.3261 63.6621 44.8991 57.814ZM99.0094 57.8206C100.798 60.7336 102.153 63.9871 102.959 67.5143C103.756 70.9991 103.956 74.4778 103.627 77.8397L88.1166 73.3515L88.1035 73.2857C86.7145 72.9043 85.8609 71.4848 86.1843 70.0611C86.3168 69.4778 86.6249 68.9844 87.0423 68.6198L87.0358 68.5869L99.0094 57.8206ZM69.5274 69.4688H74.4596L77.5251 73.3186L76.4247 78.1226L71.9968 80.2614L67.5558 78.1161L66.4554 73.312L69.5274 69.4688ZM85.3393 82.6437C85.5489 82.6331 85.7576 82.652 85.9616 82.6898L85.9878 82.6569L101.95 85.3682C99.6142 91.9624 95.144 97.675 89.1711 101.498L82.9747 86.4606L82.9944 86.4343C82.4252 85.1055 82.9948 83.5472 84.3044 82.9135C84.6397 82.7513 84.99 82.6614 85.3393 82.6437ZM58.5298 82.7095C59.748 82.7267 60.8406 83.5761 61.1237 84.822C61.2562 85.4052 61.1917 85.9831 60.973 86.4935L61.0189 86.5527L54.888 101.439C49.1559 97.7432 44.5904 92.2099 42.1481 85.4208L57.9731 82.7227L57.9993 82.7556C58.1763 82.7229 58.3558 82.7071 58.5298 82.7095ZM71.8986 89.2312C72.3229 89.2155 72.7534 89.303 73.1627 89.501C73.6992 89.7606 74.1136 90.1692 74.3745 90.6592H74.4334L82.2346 104.821C81.2221 105.162 80.1813 105.454 79.1167 105.697C73.1505 107.058 67.2032 106.645 61.818 104.802L69.5995 90.6658H69.6126C70.0795 89.7888 70.965 89.2656 71.8986 89.2312Z" fill="white" stroke="white" stroke-width="0.25"/>
+<defs>
+<linearGradient id="paint0_linear_681_2845" x1="10" y1="15.5" x2="144" y2="131.5" gradientUnits="userSpaceOnUse">
+<stop stop-color="#4D87FF"/>
+<stop offset="1" stop-color="#0547D0"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/packages/apps/kubernetes-nodes/templates/NOTES.txt b/packages/apps/kubernetes-nodes/templates/NOTES.txt
new file mode 100644
index 0000000000..197b45006f
--- /dev/null
+++ b/packages/apps/kubernetes-nodes/templates/NOTES.txt
@@ -0,0 +1,18 @@
+Worker node pool "{{ include "kubernetes-nodes.groupName" . }}" for cluster "{{ .Values.cluster }}".
+
+This pool is a separate release from the control plane. Three operational notes:
+
+1. Deletion order. Deleting the parent Kubernetes cluster while this pool still
+   exists leaves the pool release trying to recreate CAPI objects against a
+   cluster that is being torn down. Delete the KubernetesNodes pools first, then
+   the parent Kubernetes cluster.
+
+2. Version skew. Keep this pool's `version` and `talos.*` in sync with the parent
+   Kubernetes cluster. A pool on a Kubernetes/Talos combination the parent does
+   not run can produce workers the control plane will not admit.
+
+3. Pool name. The pool name (the part after `<cluster>-` in the KubernetesNodes
+   name) must not collide with a nodeGroup still managed by the parent kubernetes
+   chart — most importantly the implicit default `md0`. A collision makes this
+   release fail on a Helm ownership conflict against the parent-owned objects.
+   The chart guards this at render time with a clear error.
diff --git a/packages/apps/kubernetes-nodes/templates/_helpers.tpl b/packages/apps/kubernetes-nodes/templates/_helpers.tpl
new file mode 100644
index 0000000000..56286b2785
--- /dev/null
+++ b/packages/apps/kubernetes-nodes/templates/_helpers.tpl
@@ -0,0 +1,621 @@
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "kubernetes.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "kubernetes.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Common labels
+*/}}
+{{- define "kubernetes.labels" -}}
+helm.sh/chart: {{ include "kubernetes.chart" . }}
+{{ include "kubernetes.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "kubernetes.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "kubernetes.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}
+
+{{/*
+DNS domain used INSIDE the tenant cluster (kubelet --cluster-domain,
+apiserver --service-cluster-ip-range FQDNs, CoreDNS authoritative zone).
+Pinned to Kamaji's default `networkProfile.clusterDomain`. Kept identical to
+the parent kubernetes chart so the worker machineconfig this chart applies
+matches the control plane it joins.
+
+Distinct from .Values._cluster["cluster-domain"], which is the MANAGEMENT
+cluster domain (e.g. cozy.local) where the Kamaji control plane lives.
+*/}}
+{{- define "kubernetes.tenantClusterDomain" -}}
+cluster.local
+{{- end }}
+
+{{/*
+Effective Talos `machine.kernel.modules` list for this worker pool.
+
+Takes a context carrying .group and .groupName, returns a YAML list (empty
+output when there is nothing to load, so the caller can gate the whole
+`kernel:` block on it).
+
+A Talos system extension ships a kernel module but does not load it — that is
+`machine.kernel.modules`' job. The NVIDIA extensions are the case that made
+this surface necessary: without the modules the driver never initialises, and
+the failure is silent all the way down (the VM has the PCI device, the node
+advertises no GPU, nothing logs an error).
+
+Three-state contract on the pool's `kernelModules`:
+
+  unset      the chart decides. A pool holding at least one `nvidia.com/*`
+             GPU gets the NVIDIA set below; anything else gets nothing.
+  non-empty  taken verbatim, replacing whatever the chart would have picked.
+  []         explicit opt-out — emit no `kernel` block even on a GPU pool.
+
+The `[]` state is why the field has no entry in values.yaml at all: a default
+of `[]` there would collapse "unset" into "opted out" on every pool and make
+the automatic NVIDIA set unreachable, and a bare `kernelModules:` (null) fails
+values.schema.json validation under helm-unittest, which sees the null before
+Helm's coalescing drops it.
+
+`NVreg_NvLinkDisable=1` on the `nvidia` module mirrors what the platform already
+does for tenant clusters through the gpu-operator driver container, which
+writes exactly that one line into the `nvidia-kernel-module-params` ConfigMap
+(packages/system/gpu-operator, kernelModuleConfig.content). Cozystack passes
+individual GPUs into worker VMs WITHOUT the NVSwitches, so the driver would
+otherwise wait forever for an NVLink fabric that can never come up, leaving
+Fabric State "In Progress" and failing every CUDA call with "system not yet
+initialized". On Talos the driver comes from a system extension instead, and the
+operator's driver container has to be turned off or the two clash. Once it is
+off, nothing mounts that ConfigMap and the machine config is the only place left
+to carry the parameter. A no-op on a PCIe card with no NVLink.
+
+Module order is the order Talos' own NVIDIA documentation prescribes and the
+order validated against a production GB202 passthrough node: `nvidia` first
+(the others depend on it), then `nvidia_uvm` (CUDA unified memory, needed by
+any workload using the CUDA runtime), then `nvidia_drm` and `nvidia_modeset`.
+Talos loads them in list order, so this is not cosmetic.
+
+This only covers loading a module the OS already carries. Which extension
+supplies it is the pool's schematic (kubernetes-nodes.resolveOsImage) and is
+not derivable from the pool — on Blackwell (GB202) specifically it has to be
+the open-kernel-modules extension, since the proprietary one loads, creates
+`/dev/nvidia0`, and then finds no devices.
+*/}}
+{{- define "kubernetes-nodes.kernelModules" -}}
+{{- $group := .group -}}
+{{- $groupName := .groupName -}}
+{{- $modules := list -}}
+{{- if kindIs "slice" $group.kernelModules -}}
+{{- /* The emitted list is REBUILT from validated fields rather than passed through
+         from the user's dict. Validating `.name` and `.parameters` and then emitting
+         the raw item would let any other key ride along: `- {name: dummy, evil: "$(...)"}`
+         reached the heredoc verbatim, because `toYaml` copies whatever is there and
+         nothing upstream prunes it — `items` in values.schema.json carries no
+         `additionalProperties: false`, and the aggregated apiserver wires that schema
+         into defaulting only (pkg/registry/apps/application/rest_defaulting.go), with
+         no pruning or validation on Create/Update. Allowlisting by construction closes
+         that whole class instead of enumerating the fields it happens to know about.
+
+         Why any of this is needed: the machine config is written through the reconcile
+         Job's `cat <<EOF` heredoc with an UNQUOTED delimiter, which the script needs so
+         ${RELEASE} and friends expand, and which therefore expands everything else in
+         the block too. A module name of `nvidia$(id)` would run `id` inside the
+         talos-reconcile pod, whose ServiceAccount can write TalosConfigTemplates and
+         read Talos secrets. The values come from a tenant-facing CR, so this render is
+         the last gate.
+
+         Only the USER-SUPPLIED list is checked; the automatic NVIDIA set below is valid
+         by construction. */}}
+{{-   range $group.kernelModules -}}
+{{-     $name := .name | default "" | toString -}}
+{{-     if not (regexMatch `^[a-z0-9_-]+$` $name) -}}
+{{-       fail (printf "nodeGroup %q: invalid kernelModules name %q — must be a kernel module name matching ^[a-z0-9_-]+$ (e.g. nvidia_uvm)" $groupName $name) -}}
+{{-     end -}}
+{{-     $params := list -}}
+{{-     range .parameters | default list -}}
+{{-       $param := . | toString -}}
+{{- /* Two checks, because RE2's `\s` and `[:cntrl:]` are ASCII-only: a deny class
+         built from them lets U+2028 and U+2029 through, `toYaml` writes either raw,
+         and Helm's YAML parser reads it as a line break that ends the Job's
+         `command` block scalar early. `[:graph:]` pins the parameter to printable
+         ASCII, which closes every non-ASCII break at once; the second check then
+         removes what the heredoc would expand. */ -}}
+{{-       if not (and (regexMatch `^[[:graph:]]+$` $param) (regexMatch `^[^$\x60\\'\"]+$` $param)) -}}
+{{-         fail (printf "nodeGroup %q: invalid kernelModules parameter %q on module %q — must be printable ASCII with no whitespace, and must not contain $, a backtick, a backslash or quotes (e.g. NVreg_EnableGpuFirmware=1, or the semicolon-separated NVreg_RegistryDwords=PowerMizerEnable=0x1;PerfLevelSrc=0x2222)" $groupName $param $name) -}}
+{{-       end -}}
+{{-       $params = append $params $param -}}
+{{-     end -}}
+{{-     $module := dict "name" $name -}}
+{{-     if $params -}}
+{{-       $_ := set $module "parameters" $params -}}
+{{-     end -}}
+{{-     $modules = append $modules $module -}}
+{{-   end -}}
+{{- else -}}
+{{-   range $group.gpus | default list -}}
+{{-     if hasPrefix "nvidia.com/" (.name | default "") -}}
+{{-       $modules = list (dict "name" "nvidia" "parameters" (list "NVreg_NvLinkDisable=1")) (dict "name" "nvidia_uvm") (dict "name" "nvidia_drm") (dict "name" "nvidia_modeset") -}}
+{{-     end -}}
+{{-   end -}}
+{{- end -}}
+{{- if $modules -}}
+{{ toYaml $modules }}
+{{- end -}}
+{{- end }}
+
+{{/*
+Reconstruct the parent CAPI cluster name from the linkage value.
+
+The pool attaches to the parent Kubernetes CR named .Values.cluster, whose
+HelmRelease (and therefore CAPI Cluster / KamajiControlPlane / KubevirtCluster
+and every worker object it owns) is `kubernetes-<cluster>`. This chart does
+NOT use its own .Release.Name for CAPI wiring — the pool lives in a separate
+HelmRelease from the control plane, so every reference that the monolithic
+chart made through $.Release.Name is reconstructed here as kubernetes-<cluster>
+instead. Linkage is by name convention (mirrors vm-instance -> vm-disk), not
+ownerReference or lookup-gated render.
+*/}}
+{{- define "kubernetes-nodes.clusterName" -}}
+{{- if not .Values.cluster -}}
+{{- fail "kubernetes-nodes: .Values.cluster is required — set it to the parent Kubernetes CR name so the pool attaches to cluster kubernetes-<cluster>" -}}
+{{- end -}}
+{{- /* clusterName is the parent cluster's HelmRelease/object name: the CAPI
+       Cluster and KamajiControlPlane are named after it, and every worker
+       object this chart renders (KMT/MD/MHC names, MachineDeployment
+       spec.clusterName, the version-guard lookup) must reference it. The
+       aggregated API names a Kubernetes cluster's release `kubernetes-<cluster>`,
+       which is the default and keeps every existing pool byte-identical. A
+       wrapper whose cluster release name does NOT follow that convention —
+       the ComputePlane module fixes its cluster release to `computeplane-cluster`
+       to satisfy the admin-kubeconfig Secret contract — sets clusterReleaseName
+       so its pools attach to the right cluster. See kubernetes-nodes.groupName:
+       .Values.cluster still drives the release-name prefix and error messages. */}}
+{{- .Values.clusterReleaseName | default (printf "kubernetes-%s" .Values.cluster) -}}
+{{- end -}}
+
+{{/*
+The node-group name for this pool, derived from the release name.
+
+A KubernetesNodes CR is named <cluster>-<pool> and gets the release prefix
+`kubernetes-nodes-`, so the release name is `kubernetes-nodes-<cluster>-<pool>`.
+The group name is the <pool> suffix. Enforcing the `<cluster>-` segment keeps
+every rendered object named `kubernetes-<cluster>-<pool>` — byte-identical to
+what the monolithic chart rendered for the same group — and prevents two
+clusters in one namespace from colliding on a pool named e.g. `md0`.
+*/}}
+{{- define "kubernetes-nodes.groupName" -}}
+{{- $prefix := printf "kubernetes-nodes-%s-" .Values.cluster -}}
+{{- if not (hasPrefix $prefix .Release.Name) -}}
+{{- fail (printf "kubernetes-nodes: release name %q must start with %q — name the KubernetesNodes CR <cluster>-<pool> (cluster=%q)" .Release.Name $prefix .Values.cluster) -}}
+{{- end -}}
+{{- trimPrefix $prefix .Release.Name -}}
+{{- end -}}
+
+{{/*
+Fail early with a clear message if this pool's MachineDeployment already exists
+under a different Helm release — i.e. the pool name collides with a nodeGroup
+still managed by the parent kubernetes chart (most likely the default `md0`).
+Without this guard the collision surfaces as a cryptic Helm "invalid ownership
+metadata" error at install time. Inert under `helm template`/unittest (lookup
+returns nil with no cluster) and a no-op during the Phase 2b adoption
+migration, which re-annotates the MachineDeployment onto this release before
+it reconciles.
+*/}}
+{{- define "kubernetes-nodes.assertNoForeignPool" -}}
+{{- $clusterName := include "kubernetes-nodes.clusterName" . -}}
+{{- $groupName := include "kubernetes-nodes.groupName" . -}}
+{{- $mdName := printf "%s-%s" $clusterName $groupName -}}
+{{- $existing := lookup "cluster.x-k8s.io/v1beta1" "MachineDeployment" .Release.Namespace $mdName -}}
+{{- if $existing -}}
+{{- $owner := dig "annotations" "meta.helm.sh/release-name" "" $existing.metadata -}}
+{{- if and $owner (ne $owner .Release.Name) -}}
+{{- fail (printf "kubernetes-nodes: MachineDeployment %q in namespace %q is already managed by release %q, not this pool release %q — the pool name collides with a nodeGroup still managed by the parent kubernetes chart. Rename the pool or remove it from the parent Kubernetes CR's nodeGroups first." $mdName .Release.Namespace $owner .Release.Name) -}}
+{{- end -}}
+{{- /* clusterName-drift guard. The release name kubernetes-nodes-<cluster>-<pool>
+       does not encode where <cluster> ends and <pool> begins: for one release
+       name several (.Values.cluster, pool) splits reconstruct the SAME object
+       name kubernetes-<cluster>-<pool>, so an operator who edits spec.cluster to
+       another such value (its immutability is enforced only by the dashboard,
+       not the aggregated apiserver, see docs/storage-immutability.md) does not
+       prune or delete a single worker VM, but silently flips spec.clusterName
+       and the pool WorkloadMonitor selector. CAPI rejects the immutable
+       MachineDeployment.spec.clusterName Update loudly; the WorkloadMonitor
+       drift is the silent half. Refuse the render when our reconstructed
+       clusterName disagrees with the live object's, and name the value to
+       restore. Inert offline (lookup nil). */}}
+{{- $liveCluster := dig "spec" "clusterName" "" $existing -}}
+{{- if and $liveCluster (ne $liveCluster $clusterName) -}}
+{{- fail (printf "kubernetes-nodes: MachineDeployment %q in namespace %q has spec.clusterName %q but this pool release renders clusterName %q: .Values.cluster was changed after the pool was created, and it is immutable. Object names still collide so no worker VM is pruned, but the pool's WorkloadMonitor selector would silently drift off its machines. Restore spec.cluster to %q on this pool's HelmRelease." $mdName .Release.Namespace $liveCluster $clusterName (trimPrefix "kubernetes-" $liveCluster)) -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{- /*
+kubernetes-nodes.assertParentVersion fails the render only when the pool's
+Kubernetes minor version is AHEAD of the parent cluster's. Workers must not run a
+kubelet ahead of the apiserver (unsupported skew), but a worker minor lagging the
+control plane is supported (up to n-3 upstream) and is the normal state during a
+rolling upgrade — the parent Kubernetes CR is bumped first, then each pool. A
+symmetric equality check would flip every pool of a cluster to render-failure the
+moment the parent is bumped, blocking all pool operations until each pool is
+hand-edited, so the check is directional. The split removed the single `version`
+that used to feed both control plane and workers. Looks up the parent
+KamajiControlPlane (named like the reconstructed clusterName) and compares its
+spec.version minor against .Values.version. Skipped when the lookup is empty
+(helm template / unittest, or the parent not yet present) so it validates only
+against a real cluster and never blocks offline rendering.
+*/}}
+{{- define "kubernetes-nodes.assertParentVersion" -}}
+{{- $clusterName := include "kubernetes-nodes.clusterName" . -}}
+{{- $kcp := lookup "controlplane.cluster.x-k8s.io/v1alpha1" "KamajiControlPlane" .Release.Namespace $clusterName -}}
+{{- if $kcp -}}
+{{- $parentVer := dig "spec" "version" "" $kcp -}}
+{{- if $parentVer -}}
+{{- $parentMinor := regexFind "v?[0-9]+\\.[0-9]+" $parentVer -}}
+{{- $poolMinor := regexFind "v?[0-9]+\\.[0-9]+" (.Values.version | toString) -}}
+{{- if and $parentMinor $poolMinor -}}
+{{- $parentNorm := printf "%s.0" (trimPrefix "v" $parentMinor) -}}
+{{- $poolNorm := printf "%s.0" (trimPrefix "v" $poolMinor) -}}
+{{- if semverCompare (printf "> %s" $parentNorm) $poolNorm -}}
+{{- fail (printf "kubernetes-nodes: pool version %q is ahead of parent cluster %q version %q — a worker kubelet may not run ahead of the apiserver. A worker minor may lag the control plane (rolling upgrade) but not lead it; set .version to at most the parent Kubernetes CR's minor." (.Values.version | toString) $clusterName $parentVer) -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{- /*
+kubernetes-nodes.assertTalosSupportsKubernetes fails the render when a Talos
+release is paired with a Kubernetes minor outside that Talos minor's support
+window. Each Talos minor supports a bounded window of Kubernetes minors; running
+a kubelet outside it produces a silently broken Talos+kubelet combination that no
+HelmRelease condition can detect, so the render is where it has to be caught.
+Source: https://docs.siderolabs.com/talos/v1.13/getting-started/support-matrix
+
+A named template rather than an inline block because the pool resolves TWO Talos
+versions and both reach a worker. `talos.version` is the pool default, and
+`image.builtin.version` / `image.factory.version` override it for the boot disk
+AND for the in-guest installer the reconcile Job writes. Checking only the first
+leaves an asymmetry a reader would not expect: a known-bad pairing set through
+`talos.version` is rejected, while the same pairing reached through an
+`image.*.version` override renders clean. The matrix literal lives here, once, so
+the two call sites cannot drift apart.
+
+A Talos minor the matrix does not list passes. That is deliberate and unchanged:
+the matrix is a hand-maintained table, and failing closed on it would block every
+operator who moves to a newer Talos before this file is updated. What the guard
+promises is that a pairing it KNOWS to be bad is refused, not that every pairing
+is known.
+
+Arguments: talosVersion, kubernetesVersion, remedy (what the operator should
+change, appended to the message).
+*/}}
+{{- define "kubernetes-nodes.assertTalosSupportsKubernetes" -}}
+{{- $talosK8sSupportMatrix := dict
+      "v1.13" (list "v1.31" "v1.32" "v1.33" "v1.34" "v1.35" "v1.36")
+-}}
+{{- $talosMinor := regexFind "^v[0-9]+\\.[0-9]+" (.talosVersion | toString) -}}
+{{- with index $talosK8sSupportMatrix $talosMinor -}}
+{{-   if not (has ($.kubernetesVersion | toString) .) -}}
+{{-     fail (printf "Kubernetes %s is not supported by Talos %s. Supported versions: %v. %s" ($.kubernetesVersion | toString) ($.talosVersion | toString) . $.remedy) -}}
+{{-   end -}}
+{{- end -}}
+{{- end -}}
+
+{{- /*
+kubernetes-nodes.resolveOsImage resolves this pool's `osImage` selection down to
+the three strings that reach a rendered manifest -- a schematic, a Talos release
+and an Image Factory URL -- plus whether the boot disk is a clone of a golden or
+an HTTP import.
+
+Two templates need that answer: nodegroup.yaml builds the worker disk source from
+it, and talos-reconcile-job.yaml builds the in-guest installer reference from it.
+They must agree, because a disk booted from one Talos flavor and an installer
+pinned to another is exactly the silently-broken pairing this chart's support
+matrix was factored out to prevent, and it would surface only as a node that
+upgrades itself onto the wrong OS. So the resolution lives here once rather than
+being mirrored by hand in both files.
+
+The result comes back through the caller's `out` dict rather than as text,
+because four values have to return and a delimited string would need parsing at
+both call sites.
+
+The three format checks live here too, for the same reason. The values are
+tenant-controlled strings that land unquoted in a KubevirtMachineTemplate and in
+a DataVolume name, and the schema types all three as a bare string and cannot
+narrow them: the pinned cozyvalues-gen derives `pattern` from the value TYPE
+(quantity) and has no annotation for a custom one. So the check is at render
+time, which is where this chart already validates the kubelet reservation fields
+for the same class of hazard. The resolved values are checked, not just the
+overridden ones -- an override and the pool default reach the same interpolation.
+The patterns accept every form the chart ships and every form a Talos Image
+Factory produces (a 64-character hex schematic, a vN.N.N release, an http(s) URL)
+and reject the bytes that would break out of a YAML scalar.
+
+Arguments: osImage (the pool's .Values.osImage), talos (.Values.talos), out (the
+dict the result is written into), groupName (named in every error message).
+*/ -}}
+{{- define "kubernetes-nodes.resolveOsImage" -}}
+{{- $img := .osImage | default dict -}}
+{{- if and (hasKey $img "builtin") (hasKey $img "factory") -}}
+{{-   fail (printf "nodeGroup %q: set only one of osImage.builtin or osImage.factory" .groupName) -}}
+{{- end -}}
+{{- /* hasKey, not truthiness: builtin/factory may be present but empty ({} means
+       "clone / import with the pool's talos.* defaults"), and Go templates treat
+       an empty map as false. */ -}}
+{{- $schematicID := .talos.schematicID -}}
+{{- $version := .talos.version -}}
+{{- $factoryURL := .talos.imageFactoryURL -}}
+{{- $clone := false -}}
+{{- if hasKey $img "builtin" -}}
+{{-   $builtin := $img.builtin | default dict -}}
+{{-   $clone = true -}}
+{{-   $schematicID = $builtin.schematicID | default .talos.schematicID -}}
+{{-   $version = $builtin.version | default .talos.version -}}
+{{- else if hasKey $img "factory" -}}
+{{-   $factory := $img.factory | default dict -}}
+{{-   $schematicID = $factory.schematicID | default .talos.schematicID -}}
+{{-   $version = $factory.version | default .talos.version -}}
+{{-   $factoryURL = $factory.imageFactoryURL | default .talos.imageFactoryURL -}}
+{{- end -}}
+{{- if not (regexMatch "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$" ($schematicID | toString)) -}}
+{{-   fail (printf "nodeGroup %q: Talos schematicID %q is not a plain lowercase alphanumeric identifier. It is interpolated into the worker DataVolume name and the image URL, so it must carry no whitespace, path separators or YAML metacharacters." .groupName ($schematicID | toString)) -}}
+{{- end -}}
+{{- if not (regexMatch "^v[0-9]+\\.[0-9]+\\.[0-9]+(-[0-9a-z.]+)?$" ($version | toString)) -}}
+{{-   fail (printf "nodeGroup %q: Talos version %q is not a vMAJOR.MINOR.PATCH release. It is interpolated into the worker DataVolume name and the image URL, so it must carry no whitespace or YAML metacharacters." .groupName ($version | toString)) -}}
+{{- end -}}
+{{- /* Only the paths that build an HTTP source URL are held to this. A builtin
+       pool clones a golden PVC: its DataVolume carries source.pvc and no
+       source.http at all, so imageFactoryURL is never interpolated into
+       anything it renders. Validating it there refused a value the pool does
+       not consume, and the operator it refused is the one the feature is for --
+       somebody moving to osImage.builtin to stop depending on the Factory is
+       exactly the person likely to blank imageFactoryURL, and the message they
+       got named a source URL this path never builds. The field is a bare string
+       in values.schema.json and in the cozyrds openAPISchema, so an empty or
+       malformed one reaches the render rather than being rejected at admission.
+       The check itself stays exactly as strict for osImage.factory and for the
+       no-osImage default, which are the two arms that do interpolate it. */ -}}
+{{- if not $clone -}}
+{{-   if not (regexMatch "^https?://[A-Za-z0-9._~:/?#\\[\\]@!&'()*+,;=%-]+$" ($factoryURL | toString)) -}}
+{{-     fail (printf "nodeGroup %q: imageFactoryURL %q is not a plain http(s) URL. It is interpolated into the worker DataVolume source URL, so it must carry no whitespace, backtick, dollar sign or YAML metacharacters." .groupName ($factoryURL | toString)) -}}
+{{-   end -}}
+{{- end -}}
+{{- $_ := set .out "schematicID" $schematicID -}}
+{{- $_ := set .out "version" $version -}}
+{{- $_ := set .out "imageFactoryURL" $factoryURL -}}
+{{- $_ := set .out "clone" $clone -}}
+{{- end -}}
+
+{{/*
+Name of the ConfigMap carrying the CA bundle CDI verifies the Talos Image
+Factory against. Shared by the ConfigMap itself (templates/image-factory-ca.yaml)
+and the DataVolume that references it through source.http.certConfigMap
+(templates/nodegroup.yaml), so the two cannot drift.
+
+Deliberately free of a content hash: CDI resolves certConfigMap by name at
+import time, so a stable name lets a CA rotation land by updating the object
+in place. A hashed name would instead require the DataVolume — and therefore
+the whole KubevirtMachineTemplate, which is immutable — to be rebuilt.
+*/}}
+{{- define "kubernetes-nodes.talosImageFactoryCAConfigMapName" -}}
+{{- printf "%s-talos-factory-ca" .Release.Name | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Validated .Values.talos.imageFactoryCA: renders the trimmed PEM when the value
+is set, and nothing at all when it is empty. Callers therefore gate on it with
+`if`, and an unset value leaves the render byte-for-byte as before — required,
+because the DataVolume source it joins is hashed into the
+KubevirtMachineTemplate name.
+
+The PEM guards live in cozy-lib.tls.validateCACert: the value is emitted
+verbatim into a ConfigMap readable by anything that can read the namespace, so
+it must be complete certificate blocks and nothing else, and must never carry
+a private key.
+
+Note what neither side does: a Helm template has no x509 parser, so a body
+spelled in base64 characters passes however meaningless. CDI reports such a
+bundle at import time — AppendCertsFromPEM simply adds nothing and verification
+still fails.
+*/}}
+{{- define "kubernetes-nodes.talosImageFactoryCA" -}}
+{{- $ca := printf "%v" (default "" .Values.talos.imageFactoryCA) -}}
+{{- if ne (trim $ca) "" -}}
+{{-   include "cozy-lib.tls.validateCACert" (dict "caCert" $ca "field" "talos.imageFactoryCA") -}}
+{{-   trim $ca -}}
+{{- end -}}
+{{- end }}
+
+{{- /*
+Name of the cluster's default StorageClass, or the empty string when there is
+none (and always under `helm template`, which has no cluster to read).
+
+An empty storageClass is a documented, schema-valid setting on both a worker pool
+and a worker image catalog entry, and it means "the cluster default". Without
+resolving it the golden-versus-pool StorageClass comparison simply skips whenever
+either side is empty, which is the one corner where skipping is worst: CDI then
+falls back to a host-assisted copy over the pod network, silently, and that copy
+is the transfer the clone path exists to remove.
+
+Both the current annotation and its beta predecessor count, because clusters
+provisioned years apart carry different ones and Kubernetes still honours both.
+
+More than one class may carry the annotation at once. Kubernetes permits that --
+it is the normal state midway through swapping a cluster's default -- and
+resolves it by taking the most recently created, so this does the same. Emitting
+every match instead concatenates their names into a class that does not exist,
+and the comparison below then rejects a pool whose class matches the default
+that is actually in force. Timestamps are RFC3339 in UTC, so comparing them as
+strings is comparing them chronologically.
+*/ -}}
+{{- define "kubernetes-nodes.defaultStorageClassName" -}}
+{{- $classes := lookup "storage.k8s.io/v1" "StorageClass" "" "" -}}
+{{- $name := "" -}}
+{{- $createdAt := "" -}}
+{{- range (dig "items" (list) ($classes | default dict)) -}}
+{{-   $annotations := dig "metadata" "annotations" (dict) . -}}
+{{-   if or (eq (dig "storageclass.kubernetes.io/is-default-class" "" $annotations | toString) "true") (eq (dig "storageclass.beta.kubernetes.io/is-default-class" "" $annotations | toString) "true") -}}
+{{-     $at := dig "metadata" "creationTimestamp" "" . | toString -}}
+{{-     if or (not $name) (gt $at $createdAt) -}}
+{{-       $name = dig "metadata" "name" "" . | toString -}}
+{{-       $createdAt = $at -}}
+{{-     end -}}
+{{-   end -}}
+{{- end -}}
+{{- $name -}}
+{{- end -}}
+
+{{- /*
+Validates and returns a duration destined for a consumer that does not reject
+a bad value: the cluster-autoscaler parses its annotation with
+time.ParseDuration and silently falls back to its built-in default on a value
+it cannot parse, and the CAPI webhook does not validate unhealthyConditions
+timeouts at all, so a zero or negative one applies and remediates a Machine the
+moment its condition flips. The values schema types these fields as strings and
+stops there, which lets "30" and "-5m" reach the template. The accepted shape
+is narrower than Go's duration grammar on purpose, because that grammar also
+admits a value large enough to overflow the parser -- the silent fallback again
+-- and a fraction small enough to round to zero. The first segment must be
+positive; later segments may be zero, so the canonical rendering of a duration
+("20m0s", "1h0m0s" -- what metav1.Duration serializes to) round-trips. Every
+string this admits parses to a positive duration.
+*/ -}}
+{{- define "kubernetes.positiveDuration" -}}
+{{- $value := toString .value -}}
+{{- if not (regexMatch "^[1-9][0-9]{0,4}[smh]([0-9]{1,5}[smh]){0,2}$" $value) -}}
+{{-   fail (printf "%s must be a whole number of s, m or h (e.g. 30m, 1h30m), got %q" .field $value) -}}
+{{- end -}}
+{{- $value -}}
+{{- end -}}
+
+{{- /*
+  Nameservers are addresses, so each entry is checked to be one.
+
+  The reason it is checked rather than escaped: this value is written into the
+  reconcile Job's unquoted heredoc, where the shell expands what it finds, and
+  `quote` there is YAML quoting that does nothing about $(...) or backticks. The
+  other tenant-controlled values that reach the same heredoc — talos.version,
+  talos.schematicID, talos.installerRepository, talos.registryMirrors — are
+  shell-escaped instead, as the INVARIANT comment beside them says. An address
+  admits neither approach's failure mode: it has no metacharacters to escape.
+  Checking also catches the ordinary mistake of writing a hostname where Talos
+  takes only an IP.
+
+  IPv6 is matched on its character set rather than its full grammar. What this
+  guard owes is a bound on which bytes may reach the shell, not a verdict on
+  whether every zero-run is written correctly, and the apiserver rejects a
+  malformed address anyway.
+*/ -}}
+{{- define "kubernetes-nodes.assertDnsServersAreAddresses" -}}
+{{- $v4 := `^((25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])\.){3}(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])$` -}}
+{{- range $i, $e := (default (list) .Values.proxmox.dnsServers) -}}
+{{- $s := $e | toString -}}
+{{- if not (or (regexMatch $v4 $s) (and (contains ":" $s) (regexMatch `^[0-9A-Fa-f:]+$` $s))) -}}
+{{- fail (printf "proxmox.dnsServers[%d] is %q: entries must be IPv4 or IPv6 addresses. Talos takes addresses here, and this list is written into a shell heredoc, so anything else is both invalid for Talos and unsafe to interpolate." $i $s) -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{- /*
+  Two ways a pool can end up on the wrong substrate, both silent, both guarded
+  here against the live cluster rather than against the `## @immutable` marker,
+  which is dashboard-only.
+
+  Switching an existing pool rolls every worker to the other hypervisor and, on
+  the way, drops the machine template the draining MachineSet still references:
+  the retention loop in nodegroup.yaml looks up only the kind the new substrate
+  uses, so the old kind stops being rendered and Helm deletes it — exactly the
+  failure that loop exists to prevent.
+
+  A pool that disagrees with its parent is the other one. The README says the
+  two must match; nothing checked it. A proxmox pool under a KubeVirt cluster
+  gets machines no ProxmoxCluster owns, and its workers never join.
+
+  Inert offline, like assertNoForeignPool and assertParentVersion above.
+*/ -}}
+{{- define "kubernetes-nodes.assertSubstrateMatches" -}}
+{{- $clusterName := include "kubernetes-nodes.clusterName" . -}}
+{{- $groupName := include "kubernetes-nodes.groupName" . -}}
+{{- $isProxmox := eq (.Values.substrate | default "kubevirt") "proxmox" -}}
+{{- $wantTemplateKind := ternary "ProxmoxMachineTemplate" "KubevirtMachineTemplate" $isProxmox -}}
+{{- $wantClusterKind := ternary "ProxmoxCluster" "KubevirtCluster" $isProxmox -}}
+{{- $md := lookup "cluster.x-k8s.io/v1beta1" "MachineDeployment" .Release.Namespace (printf "%s-%s" $clusterName $groupName) -}}
+{{- if $md -}}
+{{- $liveKind := dig "spec" "template" "spec" "infrastructureRef" "kind" "" $md -}}
+{{- if and $liveKind (ne $liveKind $wantTemplateKind) -}}
+{{- fail (printf "kubernetes-nodes: pool %q already runs %s workers and substrate is now %q, which renders a %s. Switching rolls every worker to the other hypervisor and drops the template the draining MachineSet still references. Create a new pool on the other substrate and scale this one down instead." $groupName $liveKind (.Values.substrate | default "kubevirt") $wantTemplateKind) -}}
+{{- end -}}
+{{- end -}}
+{{- $cluster := lookup "cluster.x-k8s.io/v1beta1" "Cluster" .Release.Namespace $clusterName -}}
+{{- if $cluster -}}
+{{- $parentKind := dig "spec" "infrastructureRef" "kind" "" $cluster -}}
+{{- if and $parentKind (ne $parentKind $wantClusterKind) -}}
+{{- fail (printf "kubernetes-nodes: pool %q is set to substrate %q but its parent cluster %q runs on %s. A pool's substrate must match its cluster's: its machines would be owned by no infrastructure cluster and its workers would never join." $groupName (.Values.substrate | default "kubevirt") $clusterName $parentKind) -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+This pool's node group — the SINGLE assembly of the dict that feeds every
+consumer in this chart:
+
+  * nodegroup.yaml, which renders the KubevirtMachineTemplate and the
+    MachineDeployment (and hashes the former into its name);
+  * talos-reconcile-job.yaml, which renders the TalosConfigTemplate spec and
+    hashes it into the name the Job applies it under.
+
+Emitted as YAML and read back with `fromYaml` at each call site. A Helm
+template cannot return a dict and a Helm variable cannot cross a file
+boundary, so this round-trip is what lets one assembly serve two files.
+
+Why it has to be one assembly. The TalosConfigTemplate name is a hash of the
+spec this dict renders, and two templates have to agree on that name: the Job
+creates the object, the MachineDeployment's bootstrap.configRef points at it.
+Assembling the dict twice makes them agree only by coincidence of the keys the
+spec helper happens to read — drop a key on one side (`gpus`, say) and the two
+names diverge, CAPI blocks on "templates do not exist" forever and no worker is
+ever created. Sharing the *rendering* is not enough; the input has to be shared
+too. Every value the pool exposes belongs here, or the consumer that reads
+it hashes a different group than the one that does not.
+
+kernelModules carries no entry in values.yaml, so the key is absent unless the
+operator set it, and `dict` keeps it nil. It survives the round-trip as null,
+which kubernetes-nodes.kernelModules reads as "unset", as opposed to an explicit
+empty list that opts the pool out. Defaulting it to `list` here would collapse
+the two.
+*/}}
+{{- define "kubernetes-nodes.group" -}}
+{{- dict
+      "minReplicas" .Values.minReplicas
+      "maxReplicas" .Values.maxReplicas
+      "instanceType" .Values.instanceType
+      "diskSize" .Values.diskSize
+      "storageClass" .Values.storageClass
+      "osImage" .Values.osImage
+      "roles" .Values.roles
+      "resources" .Values.resources
+      "gpus" .Values.gpus
+      "kubelet" .Values.kubelet
+      "logSerialConsole" .Values.logSerialConsole
+      "podCpuLimit" .Values.podCpuLimit
+      "podCpuRequest" .Values.podCpuRequest
+      "kernelModules" .Values.kernelModules
+      "proxmox" .Values.proxmox
+    | toYaml -}}
+{{- end -}}
diff --git a/packages/apps/kubernetes-nodes/templates/_resources.tpl b/packages/apps/kubernetes-nodes/templates/_resources.tpl
new file mode 100644
index 0000000000..bb518b9ee2
--- /dev/null
+++ b/packages/apps/kubernetes-nodes/templates/_resources.tpl
@@ -0,0 +1,12 @@
+{{/*
+Convert a CPU quantity string (e.g. "100m", "0.5", "1", "4") to millicores.
+Returns a number string: "100", "500", "1000", "4000".
+*/}}
+{{- define "kubernetes.cpuToMillicores" -}}
+{{-   $str := . | toString -}}
+{{-   if hasSuffix "m" $str -}}
+{{-     trimSuffix "m" $str -}}
+{{-   else -}}
+{{-     mulf ($str | float64) 1000.0 | int | toString -}}
+{{-   end -}}
+{{- end -}}
diff --git a/packages/apps/kubernetes-nodes/templates/_talosconfigtemplate.tpl b/packages/apps/kubernetes-nodes/templates/_talosconfigtemplate.tpl
new file mode 100644
index 0000000000..0061d4d26b
--- /dev/null
+++ b/packages/apps/kubernetes-nodes/templates/_talosconfigtemplate.tpl
@@ -0,0 +1,296 @@
+{{- /*
+  Talos worker machine config for one node group, rendered as the `spec:`
+  block of a TalosConfigTemplate.
+
+  Single source of truth for that spec, shared by the two consumers that have
+  to agree on it byte-for-byte:
+
+    * the talos-reconcile Job, which embeds it in the heredoc it
+      `kubectl apply`s once the runtime inputs (apiserver Service ClusterIP,
+      Talos CA, tenant Kubernetes CA, management CoreDNS ClusterIP) exist;
+    * the MachineDeployment, which points
+      spec.template.spec.bootstrap.configRef at the TalosConfigTemplate named
+      after a hash of this spec.
+
+  Why the hash. TalosConfigTemplate.spec is immutable — the
+  vtalosconfigtemplate.cluster.x-k8s.io webhook rejects any mutation with
+  "TalosConfigTemplate.Spec is immutable" — so the object can never be updated
+  in place. Applying it under a fixed name means that once it exists, no change
+  to the rendered machine config can ever reach the cluster: the apply is
+  denied server-side and the stale spec stays (cozystack/cozystack#3515,
+  observed with machine.network.searchDomains after a clusterDomain
+  correction; the same holds for certSANs, machine.registries, nameservers and
+  any future field). Naming the template after a content hash — the idiom
+  KubevirtMachineTemplate already uses in this chart — turns a content change
+  into a NEW template instead of a rejected mutation, and CAPI propagates it
+  the way it is meant to: a new MachineSet rolls the workers onto the new
+  bootstrap config.
+
+  The `${...}` placeholders are shell variables the Job expands at apply time,
+  and are deliberately NOT part of the hash: the CA certificates, the Service
+  ClusterIP, the CoreDNS ClusterIP and the Talos/bootstrap tokens are runtime
+  facts of an already-provisioned cluster rather than chart inputs. Hashing
+  them would roll every worker on a certificate rotation or a Service
+  re-address.
+
+  Input: a dict with `root` (the chart root context) and `group` (the node
+  group's values — instanceType / resources / gpus / kubelet / osImage /
+  kernelModules). Everything else
+  is derived here rather than passed in, so the two call sites cannot drift
+  apart and compute different hashes for the same node group.
+*/}}
+{{- define "kubernetes.talosConfigTemplateSpec" -}}
+{{- $root := .root }}
+{{- $group := .group }}
+{{- $kubeletVersion := include "kubernetes.versionMap" $root | trim }}
+{{- /* Resolve this pool's worker image (schematicID, version) from .Values.osImage
+       — the same selection templates/nodegroup.yaml uses for the boot disk — so the
+       in-guest Talos installer image matches the OS this pool actually booted.
+       Defaults to the pool's talos.*; a pool with osImage.builtin / osImage.factory
+       pins its own flavor and version so an in-guest upgrade does not flip it back to
+       the pool default. */}}
+{{- /* Shared with nodegroup.yaml's boot-disk source rather than mirrored here:
+       a disk booted from one Talos flavor and an installer pinned to another is
+       the silently-broken pairing this chart's support matrix was factored out
+       to prevent, and two hand-kept copies of the resolution are how the two
+       drift apart. The helper also carries the format checks, so this file no
+       longer depends on the other one aborting the shared render first. */}}
+{{- $resolvedImage := dict }}
+{{- include "kubernetes-nodes.resolveOsImage" (dict
+      "osImage" $group.osImage
+      "talos" $root.Values.talos
+      "out" $resolvedImage
+      "groupName" (include "kubernetes-nodes.groupName" $root)) }}
+{{- $talosSchematicID := $resolvedImage.schematicID }}
+{{- $talosVersion := $resolvedImage.version }}
+{{- $podCIDR := "10.243.0.0/16" }}
+{{- $serviceCIDR := "10.95.0.0/16" }}
+{{- $dnsDomain := include "kubernetes.tenantClusterDomain" $root }}
+{{- /* Management cluster DNS domain. Tenant Kubernetes workers run as
+       KubeVirt VMs inside the management cluster's pod network and need
+       to resolve management-cluster service short names ("<svc>.<ns>.svc")
+       the same way an Ubuntu+kubeadm worker did via cloud-init DHCP. The
+       kubevirt-csi NFS mount path is the load-bearing case: kubelet on
+       the worker host calls `mount.nfs linstor-csi-nfs.cozy-linstor.svc`
+       (no domain suffix), and without searchDomains in /etc/resolv.conf
+       the host resolver hands that name to management CoreDNS verbatim
+       and gets NXDOMAIN.
+
+       Distinct from tenantClusterDomain ("cluster.local"), which is the
+       *tenant* kubelet --cluster-dns zone. This value is the
+       *management* cluster-domain, sourced from .Values._cluster
+       (populated by cozystack-controller from the platform config). */}}
+{{- $mgmtClusterDomain := (index ($root.Values._cluster | default dict) "cluster-domain") | default "cozy.local" }}
+{{- /* Kubelet reservations, mirroring the computation the MachineDeployment
+       side validates: auto-computed system/kube reserved memory = 5% of
+       effective memory clamped to [256Mi, 1Gi]; auto-computed system/kube
+       reserved CPU = 5% of effective CPU clamped to [50m, 500m].
+       instanceType lookup is optional — operators that override
+       resources.cpu / resources.memory on the nodeGroup get those, otherwise
+       the chart falls back to the same static-defaults pair the
+       MachineDeployment validator uses on a no-instanceType setup. */}}
+{{- $instanceType := dict }}
+{{- if $group.instanceType }}
+{{-   $instanceType = lookup "instancetype.kubevirt.io/v1beta1" "VirtualMachineClusterInstancetype" "" $group.instanceType }}
+{{-   $instanceType = $instanceType | default dict }}
+{{- end }}
+{{- $effectiveMemory := "" }}
+{{- if and $group.resources $group.resources.memory }}
+{{-   $effectiveMemory = $group.resources.memory | toString }}
+{{- else if and $instanceType $instanceType.spec $instanceType.spec.memory $instanceType.spec.memory.guest }}
+{{-   $effectiveMemory = $instanceType.spec.memory.guest | toString }}
+{{- end }}
+{{- $effectiveCpu := "" }}
+{{- if and $group.resources $group.resources.cpu }}
+{{-   $effectiveCpu = $group.resources.cpu | toString }}
+{{- else if and $instanceType $instanceType.spec $instanceType.spec.cpu $instanceType.spec.cpu.guest }}
+{{-   $effectiveCpu = $instanceType.spec.cpu.guest | toString }}
+{{- end }}
+{{- $autoReservedMi := 256 }}
+{{- if $effectiveMemory }}
+{{-   $effectiveMemMi := divf (include "cozy-lib.resources.toFloat" $effectiveMemory | float64) 1048576.0 | int }}
+{{-   $fivePercentMi := mulf ($effectiveMemMi | float64) 0.05 | int }}
+{{-   $autoReservedMi = min (max $fivePercentMi 256) 1024 }}
+{{- end }}
+{{- $autoReservedMillicores := 50 }}
+{{- if $effectiveCpu }}
+{{-   $effectiveCpuMillicores := include "kubernetes.cpuToMillicores" $effectiveCpu | int }}
+{{-   $fivePercentMillis := mulf ($effectiveCpuMillicores | float64) 0.05 | int }}
+{{-   $autoReservedMillicores = min (max $fivePercentMillis 50) 500 }}
+{{- end }}
+{{- $kubeletOverride := $group.kubelet | default dict }}
+{{- $systemReservedMemory := $kubeletOverride.systemReservedMemory | default (printf "%dMi" $autoReservedMi) }}
+{{- $kubeReservedMemory := $kubeletOverride.kubeReservedMemory | default (printf "%dMi" $autoReservedMi) }}
+{{- $systemReservedCpu := $kubeletOverride.systemReservedCpu | default (printf "%dm" $autoReservedMillicores) }}
+{{- $kubeReservedCpu := $kubeletOverride.kubeReservedCpu | default (printf "%dm" $autoReservedMillicores) }}
+{{- $evictionHardMemory := $kubeletOverride.evictionHardMemory | default "7%" }}
+{{- $evictionSoftMemory := $kubeletOverride.evictionSoftMemory | default "10%" -}}
+{{- /* The spec proper. Everything above only computes inputs; nothing above
+       this line may emit output, or the leading newline lands in the caller's
+       heredoc and in the hash. */ -}}
+spec:
+  template:
+    spec:
+      generateType: none
+      talosVersion: "{{ $talosVersion | replace "\\" "\\\\" | replace "$" "\\$" | replace "`" "\\`" }}"
+      {{- /* INVARIANT (cozystack/cozystack#3513): the data block below is emitted from the unquoted `TCT_MANIFEST="$(cat <<EOF` heredoc in the talos-reconcile Job, so it is subject to shell parameter expansion and command substitution at Job runtime. Every tenant-controlled free-form value interpolated into it must therefore be either shell-escaped for backslash, dollar and backtick (as talosVersion here and registryMirrors below are) or render-time pattern-validated to exclude those bytes (as the kubelet reservation fields are in nodegroup.yaml). A new such field added here without one of the two silently reopens command injection into a host-cluster Pod. Note: an asterisk-slash sequence inside this Helm comment closes it early and breaks the render, so the kubelet field names are spelled out here rather than written as globs. This is a Helm comment: it is stripped at render, so its own text never reaches the heredoc. */}}
+      data: |
+        version: v1alpha1
+        persist: true
+        machine:
+          type: worker
+          token: ${TALOS_TOKEN}
+          network:
+            # Management CoreDNS as the worker's host
+            # resolver, plus management cluster search
+            # domains so partial names like
+            # "linstor-csi-nfs.cozy-linstor.svc" resolve
+            # the same way they do on Ubuntu+kubeadm
+            # workers in main (which got these via
+            # cloud-init/DHCP). Without searchDomains the
+            # kubevirt-csi NFS mount fails NXDOMAIN
+            # because mount.nfs hands the partial name
+            # to the resolver verbatim and management
+            # CoreDNS only knows full FQDNs.
+            #
+            # Tenant in-cluster pods are not affected:
+            # dnsPolicy: ClusterFirst routes them through
+            # kubelet --cluster-dns (tenant CoreDNS).
+            # This block only configures host-side
+            # resolution (kubelet mount syscalls, image
+            # pulls, pods opted out of cluster DNS).
+            nameservers:
+              {{- /* A kubevirt worker resolves through the management
+                    cluster's CoreDNS over the pod network. A proxmox
+                    worker is off-cluster and cannot reach that
+                    ClusterIP any more than it can reach the
+                    apiserver's, so it carries its own resolvers. */}}
+              {{- if eq ($root.Values.substrate | default "kubevirt") "proxmox" }}
+              {{- range $root.Values.proxmox.dnsServers }}
+              - {{ . | quote }}
+              {{- end }}
+              {{- else }}
+              - ${COREDNS_IP}
+              {{- end }}
+            searchDomains:
+              - svc.{{ $mgmtClusterDomain }}
+              - {{ $mgmtClusterDomain }}
+              {{- if ne $mgmtClusterDomain "cluster.local" }}
+              - svc.cluster.local
+              - cluster.local
+              {{- end }}
+            extraHostEntries:
+              - ip: ${SVC_IP}
+                aliases:
+                  - ${RELEASE}.${NS}.svc
+                  - ${RELEASE}.${NS}.svc.{{ $dnsDomain }}
+          ca:
+            crt: ${TALOS_CA_B64}
+          {{- if $group.gpus }}
+          # GPU node-groups: label every node `gpu=on` so
+          # HAMi's hami-device-plugin DaemonSet (nodeSelector
+          # gpu=on) schedules and advertises nvidia.com/gpu.
+          # Without the label the plugin stays at DESIRED=0
+          # and no GPUs are exposed to the tenant. Mirrors
+          # main's kubeadm config (kubeletExtraArgs node-
+          # labels: "gpu=on") so HAMi behaviour is identical
+          # before and after the Talos worker rollover.
+          nodeLabels:
+            gpu: "on"
+          {{- end }}
+          {{- /* Emitted only when the pool resolves to a non-empty list, so a
+                 pool without modules renders the machine config it rendered
+                 before this field existed. */}}
+          {{- $kernelModules := include "kubernetes-nodes.kernelModules" (dict "group" $group "groupName" (include "kubernetes-nodes.groupName" $root)) }}
+          {{- if $kernelModules }}
+          kernel:
+            modules:
+              {{- $kernelModules | nindent 14 }}
+          {{- end }}
+          kubelet:
+            image: ghcr.io/siderolabs/kubelet:{{ $kubeletVersion }}
+            {{- /* Without this the kubelet never applies the
+                  node.cloudprovider.kubernetes.io/uninitialized
+                  taint, the Proxmox cloud-controller-manager
+                  never gets to initialise the Node, and the
+                  topology.kubernetes.io/{region,zone} labels are
+                  never set. The CSI node plugin then exits
+                  fatally on "Failed to get region or zone for
+                  node", so the tenant ends up with a
+                  StorageClass and no way to attach a volume.
+                  The kubevirt path has no cloud provider and
+                  must not carry the flag: it would taint every
+                  worker with nothing to remove the taint. */}}
+            {{- if eq ($root.Values.substrate | default "kubevirt") "proxmox" }}
+            extraArgs:
+              cloud-provider: external
+            {{- end }}
+            extraConfig:
+              systemReserved:
+                cpu: "{{ $systemReservedCpu }}"
+                memory: "{{ $systemReservedMemory }}"
+              kubeReserved:
+                cpu: "{{ $kubeReservedCpu }}"
+                memory: "{{ $kubeReservedMemory }}"
+              evictionHard:
+                memory.available: "{{ $evictionHardMemory }}"
+                nodefs.available: "10%"
+                imagefs.available: "15%"
+                nodefs.inodesFree: "5%"
+              evictionSoft:
+                memory.available: "{{ $evictionSoftMemory }}"
+                nodefs.available: "15%"
+                imagefs.available: "20%"
+              evictionSoftGracePeriod:
+                memory.available: "1m30s"
+                nodefs.available: "1m30s"
+                imagefs.available: "1m30s"
+              evictionMinimumReclaim:
+                memory.available: "256Mi"
+          install:
+            disk: /dev/vda
+            image: {{ $root.Values.talos.installerRepository | trimSuffix "/" | replace "\\" "\\\\" | replace "$" "\\$" | replace "`" "\\`" }}/{{ $talosSchematicID | replace "\\" "\\\\" | replace "$" "\\$" | replace "`" "\\`" }}:{{ $talosVersion | replace "\\" "\\\\" | replace "$" "\\$" | replace "`" "\\`" }}
+            wipe: false
+          features:
+            rbac: true
+            kubePrism:
+              enabled: false
+          {{- with $root.Values.talos.registryMirrors }}
+          registries:
+            mirrors:
+              {{- /* registryMirrors is free-form tenant-facing input rendered into the unquoted reconcile-Job heredoc, so the value is escaped (backslash, dollar, backtick) to render as a literal and never be shell-expanded or command-substituted at Job runtime. This is a Helm comment: it is stripped at render, so its own text never reaches the heredoc. See cozystack/cozystack#3513. */}}
+              {{- toYaml . | replace "\\" "\\\\" | replace "$" "\\$" | replace "`" "\\`" | nindent 14 }}
+          {{- end }}
+        cluster:
+          id: ${CLUSTER_ID}
+          secret: ${CLUSTER_SECRET}
+          controlPlane:
+            endpoint: https://${RELEASE}.${NS}.svc:6443
+          clusterName: ${RELEASE}
+          network:
+            dnsDomain: {{ $dnsDomain }}
+            podSubnets:
+              - {{ $podCIDR }}
+            serviceSubnets:
+              - {{ $serviceCIDR }}
+          token: ${BOOTSTRAP_TOKEN}
+          ca:
+            crt: ${K8S_CA_B64}
+          discovery:
+            enabled: true
+            registries:
+              kubernetes:
+                disabled: true
+              service:
+                disabled: true
+{{- end }}
+
+{{- /*
+  Content hash of the TalosConfigTemplate spec, truncated the same way the
+  KubevirtMachineTemplate hash in this chart is. Takes the same dict as
+  kubernetes.talosConfigTemplateSpec, so the Job that creates the template and
+  the MachineDeployment that references it always agree on the name.
+*/}}
+{{- define "kubernetes.talosConfigTemplateHash" -}}
+{{- include "kubernetes.talosConfigTemplateSpec" . | sha256sum | trunc 6 -}}
+{{- end }}
diff --git a/packages/apps/kubernetes-nodes/templates/_versions.tpl b/packages/apps/kubernetes-nodes/templates/_versions.tpl
new file mode 100644
index 0000000000..fcd4cee178
--- /dev/null
+++ b/packages/apps/kubernetes-nodes/templates/_versions.tpl
@@ -0,0 +1,7 @@
+{{- define "kubernetes.versionMap" }}
+{{- $versionMap := .Files.Get "files/versions.yaml" | fromYaml }}
+{{- if not (hasKey $versionMap .Values.version) }}
+    {{- printf `Kubernetes version %s is not supported, allowed versions are %s` $.Values.version (keys $versionMap) | fail }}
+{{- end }}
+{{- index $versionMap .Values.version }}
+{{- end }}
diff --git a/packages/apps/kubernetes-nodes/templates/dashboard-resourcemap.yaml b/packages/apps/kubernetes-nodes/templates/dashboard-resourcemap.yaml
new file mode 100644
index 0000000000..c438fe7b0a
--- /dev/null
+++ b/packages/apps/kubernetes-nodes/templates/dashboard-resourcemap.yaml
@@ -0,0 +1,25 @@
+{{- $clusterName := include "kubernetes-nodes.clusterName" . }}
+{{- $groupName := include "kubernetes-nodes.groupName" . }}
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: {{ .Release.Name }}-dashboard-resources
+rules:
+- apiGroups:
+  - cozystack.io
+  resources:
+  - workloadmonitors
+  resourceNames:
+  - {{ $clusterName }}-{{ $groupName }}
+  verbs: ["get", "list", "watch"]
+---
+kind: RoleBinding
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: {{ .Release.Name }}-dashboard-resources
+subjects:
+{{ include "cozy-lib.rbac.subjectsForTenantAndAccessLevel" (list "use" .Release.Namespace) }}
+roleRef:
+  kind: Role
+  name: {{ .Release.Name }}-dashboard-resources
+  apiGroup: rbac.authorization.k8s.io
diff --git a/packages/apps/kubernetes-nodes/templates/image-factory-ca.yaml b/packages/apps/kubernetes-nodes/templates/image-factory-ca.yaml
new file mode 100644
index 0000000000..46a4611a19
--- /dev/null
+++ b/packages/apps/kubernetes-nodes/templates/image-factory-ca.yaml
@@ -0,0 +1,43 @@
+{{- /*
+CA bundle CDI verifies the Talos Image Factory against while importing a
+worker's OS disk image.
+
+Why this object exists: workers on the HTTP path (the no-osImage default and
+osImage.factory) boot from a raw disk image CDI streams from the pool's Image
+Factory. That endpoint is documented for self-hosted factories and mirrors in
+air-gapped or flaky-egress environments, but such an endpoint is typically
+served with a certificate from an internal CA — and the importer, trusting only
+its system store, refuses it with "x509: certificate signed by unknown
+authority". The DataVolume API has carried source.http.certConfigMap for
+exactly this since the beginning; this chart just had no way to fill it in.
+
+Rendered only on the HTTP import path with the value set. A pool on
+osImage.builtin clones a golden image and builds no source.http, so it gets no
+ConfigMap even with the field set, and an unset value renders nothing at all.
+
+Namespace is the release namespace by omission, which is what CDI requires:
+"secretRef and certConfigMap must be in the same namespace as the DataVolume".
+
+The key name is arbitrary — CDI mounts the whole ConfigMap into the importer's
+cert directory and reads every file in it — so ca.pem follows the upstream
+example in kubevirt/containerized-data-importer manifests/example/cert-configmap.yaml.
+*/}}
+{{- $resolved := dict -}}
+{{- include "kubernetes-nodes.resolveOsImage" (dict
+      "osImage" .Values.osImage
+      "talos" .Values.talos
+      "out" $resolved
+      "groupName" (include "kubernetes-nodes.groupName" .)) -}}
+{{- if not $resolved.clone }}
+{{- with (include "kubernetes-nodes.talosImageFactoryCA" $) }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "kubernetes-nodes.talosImageFactoryCAConfigMapName" $ }}
+  labels:
+    {{- include "kubernetes.labels" $ | nindent 4 }}
+data:
+  ca.pem: |
+    {{- . | nindent 4 }}
+{{- end }}
+{{- end }}
diff --git a/packages/apps/kubernetes-nodes/templates/nodegroup.yaml b/packages/apps/kubernetes-nodes/templates/nodegroup.yaml
new file mode 100644
index 0000000000..9060f97a35
--- /dev/null
+++ b/packages/apps/kubernetes-nodes/templates/nodegroup.yaml
@@ -0,0 +1,1114 @@
+{{- /*
+  Worker node pool for a managed Kubernetes cluster.
+
+  This chart is the second half of the Kubernetes-app split (cozystack/community#8):
+  the control plane (Cluster / KamajiControlPlane / KubevirtCluster / PKI) lives in
+  the `kubernetes` chart, and each worker pool is a separate `kubernetes-nodes`
+  release. The pool objects (KubevirtMachineTemplate, MachineDeployment,
+  MachineHealthCheck, worker WorkloadMonitor) and the talos-reconcile Job that
+  produces the pool's TalosConfigTemplate are rendered here, wired to the parent
+  cluster `kubernetes-<cluster>` by name convention (see _helpers.tpl). Every
+  reference the monolithic chart made through $.Release.Name is reconstructed here
+  as the parent clusterName so the objects are byte-identical to what the parent
+  rendered for the same group — the KubevirtMachineTemplate is content-hash-named,
+  so any drift would roll every live worker VM.
+
+  Talos -> Kubernetes support matrix, against the pool default. The pool can also
+  reach a different Talos release through osImage.builtin.version /
+  osImage.factory.version, and that override is checked against the same matrix at
+  the point it is resolved, below. Both call sites share one table, in
+  templates/_helpers.tpl.
+*/}}
+{{- include "kubernetes-nodes.assertTalosSupportsKubernetes" (dict
+      "talosVersion" .Values.talos.version
+      "kubernetesVersion" .Values.version
+      "remedy" "Bump 'version' or set talos.version explicitly.") }}
+{{- $clusterName := include "kubernetes-nodes.clusterName" . }}
+{{- $groupName := include "kubernetes-nodes.groupName" . }}
+{{- include "kubernetes-nodes.assertNoForeignPool" . }}
+{{- include "kubernetes-nodes.assertParentVersion" . }}
+{{- include "kubernetes-nodes.assertSubstrateMatches" . }}
+{{- $kubevirtmachinetemplateNames := list }}
+{{- /* Substrate selects which infrastructure provider renders this pool's
+       machine template. Everything downstream of the template — autoscaler
+       capacity annotations, kubelet reservations, MachineDeployment,
+       MachineHealthCheck, WorkloadMonitor, the talos-reconcile Job — is
+       substrate-agnostic and rendered once, so the two paths differ only in
+       the template object and the infrastructureRef that points at it. */}}
+{{- $substrate := .Values.substrate | default "kubevirt" }}
+{{- if not (has $substrate (list "kubevirt" "proxmox")) }}
+{{-   fail (printf "substrate %q is not supported; use \"kubevirt\" or \"proxmox\"" $substrate) }}
+{{- end }}
+{{- $isProxmox := eq $substrate "proxmox" }}
+{{- if $isProxmox }}
+{{- /* Proxmox has no equivalent of a VirtualMachineClusterInstancetype, so the
+         instancetype lookup that normally supplies effective CPU and memory has
+         nothing to read. Those two numbers are not cosmetic: the kubelet
+         reservations and the cluster-autoscaler capacity annotations are both
+         derived from them, and a pool that cannot state them would be scheduled
+         against invented capacity. Require them explicitly rather than let the
+         defaults silently produce a mis-sized pool. */}}
+{{-   if not (and $.Values.resources $.Values.resources.cpu $.Values.resources.memory) }}
+{{-     fail "substrate proxmox requires resources.cpu and resources.memory: there is no instanceType to size the pool from" }}
+{{-   end }}
+{{-   if not $.Values.proxmox.templateTags }}
+{{-     fail "substrate proxmox requires proxmox.templateTags: capmox clones a VM template and has no image URL to fall back on" }}
+{{-   end }}
+{{-   if not $.Values.proxmox.network.bridge }}
+{{-     fail "substrate proxmox requires proxmox.network.bridge" }}
+{{-   end }}
+{{-   if not $.Values.proxmox.dnsServers }}
+{{-     fail "substrate proxmox requires proxmox.dnsServers: an off-cluster worker cannot resolve through the management cluster's CoreDNS" }}
+{{-   end }}
+{{- /* osImage decides where a KubeVirt worker's system disk comes from, and a
+         Proxmox worker's disk does not come from there at all: capmox clones a
+         VM template that already carries Talos. Half of the field would still
+         appear to work, which is the reason to refuse it rather than ignore it
+         — osImage.factory.version reaches the machineconfig's installer image,
+         so a pool could set it, see the Job change, and be running a different
+         Talos than it asked for, with the boot image still whatever the
+         template holds. osImage.builtin, a CDI clone of a golden image, has no
+         meaning here at all. The installer target is settable on this substrate
+         through talos.version, which does reach it. */}}
+{{-   if $.Values.osImage }}
+{{-     fail "substrate proxmox does not take osImage: the worker disk is cloned from the Proxmox VM template, not imported from an image source. Set the Talos the template carries, and use talos.version / talos.schematicID for the in-guest installer target." }}
+{{-   end }}
+{{- /* A target storage is a full-clone parameter. A linked clone always lives on
+      the template's storage, and both Proxmox and capmox's CRD refuse the pair;
+      refusing it here names the two values instead of an object the operator
+      never wrote. */}}
+{{-   if and $.Values.proxmox.storage (not $.Values.proxmox.full) }}
+{{-     fail "proxmox.storage needs full: true: a target storage is a full-clone parameter, and a linked clone always lives on the template's storage" }}
+{{-   end }}
+{{- /* KubeVirt-only knobs. Accepting them silently on Proxmox would let a pool
+         believe it had asked for something the substrate cannot deliver. */}}
+{{-   if $.Values.gpus }}
+{{-     fail "gpus is a kubevirt-only field; pass GPUs through on the Proxmox template instead" }}
+{{-   end }}
+{{-   if $.Values.logSerialConsole }}
+{{-     fail "logSerialConsole is a kubevirt-only field; use the Proxmox serial console on the VM" }}
+{{-   end }}
+{{-   if or (not (kindIs "invalid" $.Values.podCpuLimit)) (not (kindIs "invalid" $.Values.podCpuRequest)) }}
+{{-     fail "podCpuLimit/podCpuRequest size the virt-launcher pod and are kubevirt-only" }}
+{{-   end }}
+{{- end }}
+{{- /* On kubevirt, resources.cpu is emitted verbatim into domain.cpu.cores,
+       an integer in the KubevirtMachineTemplate CRD and a uint32 in
+       KubeVirt, and the same raw value decides below whether the
+       instancetype matcher is dropped. A quantity such as 500m counts as
+       sizing there and is then refused by the CRD, so a value that cannot
+       be a core count stops here. Proxmox needs no such check: it converts
+       the quantity to millicores and rounds up to whole cores.
+
+       The value is decoded as YAML, the way `cores: <raw>` is, so +2, 2.0
+       or 1e1 pass as the integers they decode to, and a leading-zero
+       spelling passes as whatever YAML reads it as. A bare numeric zero
+       is left alone: it is falsy, so the pool renders without domain.cpu
+       and is sized by its instancetype. */}}
+{{- $cpuValue := (.Values.resources | default dict).cpu }}
+{{- if and (not $isProxmox) (not (kindIs "invalid" $cpuValue)) (not (and (not (kindIs "string" $cpuValue)) (eq (float64 $cpuValue) 0.0))) }}
+{{-   $cpu := printf "%v" $cpuValue }}
+{{-   $cores := (printf "v: %s" $cpu | fromYaml).v }}
+{{-   $isNumber := or (kindIs "int" $cores) (kindIs "int64" $cores) (kindIs "float64" $cores) }}
+{{-   if not (and $isNumber (gt (float64 $cores) 0.0) (lt (float64 $cores) 4294967296.0) (eq (floor $cores) (float64 $cores))) }}
+{{-     fail (printf "nodeGroup %s: resources.cpu (%s) must be a whole number of vCPU cores between 1 and 4294967295, such as 2. On the kubevirt substrate it becomes the worker VM's domain.cpu.cores, which KubeVirt declares as an unsigned 32-bit integer, so a millicore or fractional quantity cannot size the guest. Set a core count, or remove the field." $groupName $cpu) }}
+{{-   end }}
+{{- end }}
+{{- /* Assembled once in _helpers.tpl and read back here and in
+       talos-reconcile-job.yaml, so the TalosConfigTemplate name this file
+       hashes into configRef and the one the Job hashes into TCT_NAME cannot
+       be computed from different inputs. */}}
+{{- $group := include "kubernetes-nodes.group" . | fromYaml }}
+{{- define "proxmoxmachinetemplate" -}}
+spec:
+  {{- /* Talos carries qemu-guest-agent only when its schematic adds it, and
+        never a cloud-init status file, while capmox blocks a Machine on both
+        probes until they answer. Left on, the VM boots, joins nothing, and the
+        provider reports
+        "error waiting for agent: the operation has timed out" forever. This is
+        the same class of problem the KubeVirt path solves with
+        virtualMachineBootstrapCheck.checkStrategy: none for its SSH probe —
+        capmox's own CRD names TalOS in the skipCloudInitStatus description. */}}
+  checks:
+    skipQemuGuestAgent: true
+    skipCloudInitStatus: true
+  {{- /* capmox clones an existing VM template; it has no image URL to fetch, so
+        the Talos image is not a chart input the way it is on KubeVirt. The
+        template must carry the nocloud platform image, NOT the openstack one
+        the KubeVirt path uses: capmox injects bootstrap data as a nocloud ISO,
+        and an openstack image ignores it exactly as silently as a nocloud image
+        ignores configdrive.
+
+        Nor is it the platform release's nocloud-amd64.raw.xz, the bare-metal
+        node image: its zfs extension's service waits for a /dev/zfs no VM has,
+        the boot sequence never completes, and Talos reboots the guest each time
+        the boot timeout runs out. The template carries this pool's
+        talos.schematicID at talos.version, the same build as the installer the
+        machineconfig names. The default schematic's qemu-guest-agent service
+        waits the same way for the agent's virtio port, so the template has the
+        agent enabled. hack/proxmox-talos-template.sh builds it that way.
+
+        matchTags is set equality, not containment. capmox sorts both sides and
+        compares them with slices.Equal, so a template tagged
+        {a,b,c} is invisible to a selector listing {a,b}, and the error says
+        "found 0 VM templates" rather than pointing at the extra tag. */}}
+  templateSelector:
+    matchTags:
+      {{- range .group.proxmox.templateTags }}
+      - {{ . | quote }}
+      {{- end }}
+  full: {{ .group.proxmox.full }}
+  numSockets: 1
+  {{- /* divf takes its arguments in order, and a pipeline would feed the
+        millicores in as the divisor: `x | divf 1000.0` is 1000/x, which
+        silently sizes every pool at one core. */}}
+  numCores: {{ ceil (divf (include "kubernetes.cpuToMillicores" .group.resources.cpu | float64) 1000.0) | int }}
+  memoryMiB: {{ divf (include "cozy-lib.resources.toFloat" .group.resources.memory | float64) 1048576.0 | ceil | int }}
+  {{- with .group.proxmox.storage }}
+  storage: {{ . | quote }}
+  {{- end }}
+  {{- with .group.proxmox.pool }}
+  pool: {{ . | quote }}
+  {{- end }}
+  network:
+    default:
+      bridge: {{ .group.proxmox.network.bridge | quote }}
+      model: virtio
+      {{- with .group.proxmox.network.vlan }}
+      vlan: {{ . }}
+      {{- end }}
+      {{- with .group.proxmox.network.mtu }}
+      mtu: {{ . }}
+      {{- end }}
+{{- end }}
+{{- define "kubevirtmachinetemplate" -}}
+spec:
+  {{- /* Talos has no SSH; use 'none' so CAPK does not block Machine.Ready
+        on an SSH probe that will never succeed. The Machine reaches Ready
+        once kubelet registers with the tenant apiserver via standard CSR. */}}
+  virtualMachineBootstrapCheck:
+    checkStrategy: none
+  virtualMachineTemplate:
+    metadata:
+      namespace: {{ $.Release.Namespace }}
+      labels:
+        {{- range .group.roles }}
+        node-role.kubernetes.io/{{ . }}: ""
+        {{- end }}
+    spec:
+      {{- /* Explicit resources take precedence over instanceType. When a node
+             group is sized by resources (both cpu and memory set), the
+             instancetype is omitted from the VM: KubeVirt rejects a
+             VirtualMachine that references an instancetype and also overrides
+             either domain.cpu or domain.memory. */}}
+      {{- $sizedByResources := and .group.resources .group.resources.cpu .group.resources.memory }}
+      {{- if and .group.instanceType (not $sizedByResources) }}
+      instancetype:
+        kind: VirtualMachineClusterInstancetype
+        name: {{ .group.instanceType }}
+      {{- end }}
+      runStrategy: Always
+      dataVolumeTemplates:
+      {{- /* This pool selects its worker OS image source via .Values.osImage (the
+             WorkerImage union in values.yaml); every field defaults to the pool's
+             talos.*:
+               * osImage omitted / osImage.factory — import the raw image over HTTP from
+                 the Talos Image Factory (or a mirror): one download per worker.
+               * osImage.builtin — CDI storage-layer clone of a golden image in the
+                 opt-in worker image catalog (packages/system/kubernetes-worker-image)
+                 in cozy-public, named talos-worker-<schematicID>-<version>. A clone
+                 is a CSI copy, so N workers no longer each stream the OS image across
+                 the pod network — the source of the kubernetes-* e2e node-join flake
+                 (cozystack/cozystack#3231) and a per-worker Factory dependency.
+
+             The disk-system source is derived purely from .Values.osImage, so it is
+             deterministic across re-renders: with osImage omitted a pool renders
+             byte-identically to the pre-feature chart (its workers do not roll on
+             upgrade), and there is no cluster-state-driven flip to guard against.
+             Because the source is content-hashed into the KubevirtMachineTemplate
+             name (see the KMT block below), intentionally changing .Values.osImage on an
+             existing pool reimages that pool — expected, like editing any
+             workload's image. lookup() is empty under `helm template`, so a builtin
+             pool's golden must be mocked in unit tests. */}}
+      {{- $resolved := dict }}
+      {{- include "kubernetes-nodes.resolveOsImage" (dict
+            "osImage" .group.osImage
+            "talos" $.Values.talos
+            "out" $resolved
+            "groupName" .groupName) }}
+      {{- $reqSchematicID := $resolved.schematicID }}
+      {{- $reqVersion := $resolved.version }}
+      {{- $reqFactoryURL := $resolved.imageFactoryURL }}
+      {{- $useClone := $resolved.clone }}
+      {{- /* The guard at the top of this file keys on .Values.talos.version. An
+             image override moves the Talos release this pool actually boots and
+             installs, so re-run the same matrix against the resolved version;
+             without this a pool could keep a supported talos.version and still
+             boot a Talos minor whose kubelet window excludes .Values.version,
+             which is exactly the silently-broken pairing the guard exists to
+             refuse. No-op when osImage pins nothing, since the resolved version is
+             then the one already checked above. */}}
+      {{- if ne ($reqVersion | toString) ($.Values.talos.version | toString) }}
+      {{-   include "kubernetes-nodes.assertTalosSupportsKubernetes" (dict
+              "talosVersion" $reqVersion
+              "kubernetesVersion" $.Values.version
+              "remedy" (printf "nodeGroup %s reaches this Talos release through its osImage override, not through talos.version. Bump 'version', change the osImage version, or drop the override so the pool follows talos.version." .groupName)) }}
+      {{- end }}
+      {{- $httpURL := printf "%s/image/%s/%s/openstack-amd64.raw.xz" ($reqFactoryURL | trimSuffix "/") $reqSchematicID $reqVersion }}
+      {{- $goldenName := printf "talos-worker-%s-%s" $reqSchematicID $reqVersion }}
+      {{- /* A builtin pool whose golden is absent, failed to import, or on a
+             StorageClass the worker disk cannot CSI-clone from fails loudly here
+             rather than degrading silently. And because a CDI clone target must be
+             at least as large as its source, a worker diskSize below the golden's
+             storage would fail the clone at runtime — reject it at render when the
+             golden's size is known.
+
+             What `lookup` returning nothing means differs by guard, and the
+             difference is worth knowing before running any of this offline. The
+             phase, StorageClass and size guards read fields of a golden that was
+             found, so an empty lookup makes them no-ops. The absence guard below is
+             the opposite: an empty lookup IS its failure condition. So a pool on
+             osImage.builtin cannot be rendered by anything that has no cluster to
+             read -- `helm template`, `helm lint`, a dashboard preview -- and its
+             unit tests have to mock the golden through kubernetesProvider. That is
+             the price of failing loudly instead of degrading into an HTTP import
+             nobody asked for. */}}
+      {{- /* The pool's effective StorageClass, resolved once inside the clone branch
+             and read twice: by the cross-class guard, and by the disk template that
+             renders storageClassName. Empty on the HTTP path, where the disk
+             template keeps its original two-level fallback. */}}
+      {{- $cloneWorkerSC := "" }}
+      {{- $cloneWorkerSCFromDefault := false }}
+      {{- $cloneDefaultSC := "" }}
+      {{- if $useClone }}
+      {{- /* Has this pool already got a worker disk cloned from this golden?
+
+             The two guards below abort the ENTIRE KubernetesNodes HelmRelease —
+             every resource, not just the disk — and for a pool whose workers all
+             cloned months ago that price buys nothing: replica changes, kubelet
+             retuning and MachineHealthCheck timeouts have no stake in the golden,
+             and no CR edit is needed to trigger the abort, only the next periodic
+             reconcile. The comment below rejects exactly that blast radius for a
+             mid-import golden; applying the same reasoning to a golden that is
+             absent or Failed is what it costs to be consistent.
+
+             So the loud failure stays where it is the only signal — a pool still
+             waiting for its first disk — and a pool that is past that point is
+             left to CDI, which reports a source it cannot clone on the pending
+             DataVolume of the worker that actually needs one.
+
+             The disk names itself as its pool, and the match is on that rather than
+             on the disk's own name. CAPK names a worker disk
+             disk-system-<clusterName>-<groupName>-<machine id>, and a name prefix
+             cannot separate pool md0 from pool md0-gpu: the sibling's disks start
+             with md0's prefix, so a sibling that had cloned would answer for a pool
+             that never had, and suppress both guards while md0's new workers point
+             at a source that is gone. An annotation carrying the exact pool is
+             unambiguous and costs nothing, since the disk template already carries
+             one naming the golden. */}}
+      {{-   $poolID := printf "%s-%s" .clusterName .groupName }}
+      {{-   $poolCloned := false }}
+      {{-   $poolDiskName := "" }}
+      {{-   range (dig "items" (list) ((lookup "cdi.kubevirt.io/v1beta1" "DataVolume" $.Release.Namespace "") | default dict)) }}
+      {{-     if and (eq (dig "metadata" "annotations" "kubernetes-worker-image.cozystack.io/pool" "" . | toString) $poolID)
+                     (eq (dig "metadata" "annotations" "kubernetes-worker-image.cozystack.io/golden" "" . | toString) $goldenName)
+                     (eq (dig "status" "phase" "" . | toString) "Succeeded") }}
+      {{-       $poolCloned = true }}
+      {{-       $poolDiskName = dig "metadata" "name" "" . | toString }}
+      {{-     end }}
+      {{-   end }}
+      {{- /* Resolve the pool's class here rather than inside the guard, because the
+             guard is not its only reader: the disk template renders storageClassName
+             from it too, and the two disagreeing is how a pool at storageClass ""
+             passed the comparison on the class its existing disks are bound to and
+             then bound its next disk on whatever the cluster default had become by
+             then -- taking the host-assisted copy the guard exists to refuse, with
+             the guard reporting no drift.
+
+             A pool that declares no class took the default in force when ITS disks
+             were bound, exactly as the golden did, so it reads that class back from
+             its own bound PVC. Substituting today's default instead means an admin
+             moving storageclass.kubernetes.io/is-default-class -- which the
+             resolver's own comment calls the normal state midway through a swap --
+             fails the whole release of a pool whose disks are all on the right class
+             and which changed nothing. Only a pool with no disk yet resolves to
+             today's default, which is the class its first clone will actually get. */}}
+      {{-   $cloneWorkerSC = .group.storageClass | default $.Values.storageClass | toString }}
+      {{-   if and (not $cloneWorkerSC) $poolDiskName }}
+      {{-     $poolPVC := lookup "v1" "PersistentVolumeClaim" $.Release.Namespace $poolDiskName }}
+      {{-     if $poolPVC }}
+      {{-       $cloneWorkerSC = dig "spec" "storageClassName" "" $poolPVC | toString }}
+      {{-     end }}
+      {{-   end }}
+      {{-   if not $cloneWorkerSC }}
+      {{-     $cloneDefaultSC = include "kubernetes-nodes.defaultStorageClassName" $ }}
+      {{-     $cloneWorkerSC = $cloneDefaultSC }}
+      {{-     $cloneWorkerSCFromDefault = true }}
+      {{-   end }}
+      {{- /* CDI clones the golden's PVC, so a golden whose DataVolume is gone
+             (CDI garbage collection, a PVC restored on its own) is still a
+             source, and only the absence of both is refused. With no DataVolume
+             the guards below read an empty spec and fall through to that PVC. */}}
+      {{-   $goldenDV := lookup "cdi.kubevirt.io/v1beta1" "DataVolume" "cozy-public" $goldenName }}
+      {{-   if and (not $goldenDV) (not (lookup "v1" "PersistentVolumeClaim" "cozy-public" $goldenName)) }}
+      {{-     if not $poolCloned }}
+      {{-       fail (printf "nodeGroup %q: osImage.builtin requested golden image %q not found in cozy-public, neither as a DataVolume nor as a PVC — enable the cozystack.kubernetes-worker-image catalog via bundles.enabledPackages with a matching (schematicID, version) entry, or switch this pool to osImage.factory." .groupName $goldenName) }}
+      {{-     end }}
+      {{-   else }}
+      {{- /* Fail only on the golden's terminal failure phase, not on "not yet
+             Succeeded". A golden mid-import is transient: CDI holds the worker
+             DataVolume until the source is populated, which is the correct
+             behaviour and recovers unattended. Hard-failing the render there would
+             abort the ENTIRE KubernetesNodes HelmRelease — every resource, not just
+             this disk — for every pool pinned to that golden, blocking unrelated
+             scale operations for the length of an import. Only Failed, which
+             never recovers without operator action, justifies that blast radius.
+             Falling back to the HTTP import is deliberately not an option either: it
+             would make disk-system's source depend on cluster state, so the source —
+             and with it the content-hashed KubevirtMachineTemplate name — would flip
+             once the golden went Ready and roll every worker in the pool. */}}
+      {{-     $goldenPhase := dig "status" "phase" "" $goldenDV | toString }}
+      {{-     if and (eq $goldenPhase "Failed") (not $poolCloned) }}
+      {{-       fail (printf "nodeGroup %q: golden DataVolume %q in cozy-public failed to import (phase Failed) — cloning it would block this pool's workers indefinitely. Check the importer pod in cozy-public, then delete the DataVolume to retry the import." .groupName $goldenName) }}
+      {{-     end }}
+      {{- /* CDI takes the storage-layer CSI-clone path only when source and target
+             share a StorageClass; across classes it silently falls back to a
+             host-assisted copy over the pod network — exactly the per-worker
+             network transfer osImage.builtin exists to avoid (#3231). Reject the
+             case we can prove. An empty class on either side means "the cluster
+             default", which is resolvable against a live cluster and is resolved
+             here: leaving it unresolved is what let the one corner that CANNOT be
+             a clone — a pool at storageClass "" whose golden is on an explicit
+             class — pass unchecked. With no cluster to read (helm template) both
+             stay empty and the comparison is skipped, as before. This rules out
+             the guaranteed-host-assisted case, not every one: a matching
+             StorageClass still leaves the strategy to the CDI StorageProfile,
+             which the worker DataVolume inherits. */}}
+      {{-     $workerSC := $cloneWorkerSC }}
+      {{-     $goldenSC := dig "spec" "storage" "storageClassName" "" $goldenDV | toString }}
+      {{- /* A golden that declares no class is not on "the cluster default" as it
+             stands today -- it is on whatever default was in force when CDI bound
+             its PVC, and that PVC keeps the concrete class after the cluster's
+             default moves on. Reading the spec alone would substitute today's
+             default for it and then either wave through a cross-class copy or
+             refuse a pool that does match. The PVC is the authority; CDI names it
+             after the DataVolume, and status.claimName says so explicitly when it
+             is set. */}}
+      {{-     if not $goldenSC }}
+      {{-       $goldenPVCName := dig "status" "claimName" $goldenName $goldenDV | toString }}
+      {{-       $goldenPVC := lookup "v1" "PersistentVolumeClaim" "cozy-public" $goldenPVCName }}
+      {{-       if $goldenPVC }}
+      {{-         $goldenSC = dig "spec" "storageClassName" "" $goldenPVC | toString }}
+      {{-       end }}
+      {{-     end }}
+      {{-     $defaultSC := $cloneDefaultSC }}
+      {{-     $resolvedFromDefault := $cloneWorkerSCFromDefault }}
+      {{-     if not $goldenSC }}
+      {{-       if not $defaultSC }}{{- $defaultSC = include "kubernetes-nodes.defaultStorageClassName" $ }}{{- end }}
+      {{-       $goldenSC = $defaultSC }}
+      {{-       $resolvedFromDefault = true }}
+      {{-     end }}
+      {{-     if and $workerSC $goldenSC (ne $workerSC $goldenSC) }}
+      {{- /* Only mention the cluster default when a side was actually resolved from
+             it. On two explicit differing classes -- what the shipped defaults
+             produce -- the sentence otherwise reports a lookup the render never
+             made, and reports it as the empty string. */}}
+      {{-       $defaultNote := "" }}
+      {{-       if $resolvedFromDefault }}
+      {{-         $defaultNote = printf " An empty storageClass was resolved to the cluster default StorageClass %q." $defaultSC }}
+      {{-       end }}
+      {{-       fail (printf "nodeGroup %q: storageClass %q differs from golden image %q storageClass %q — CDI cannot CSI-clone across StorageClasses and would fall back to a host-assisted copy over the pod network.%s Neither side can be moved in place: this golden's class is fixed for its lifetime, because a DataVolume spec cannot be patched, and the pool's storageClass is immutable on an existing pool. So add a NEW kubernetes-worker-image catalog entry with a different (schematicID, version) on storageClass %q (kubernetesWorkerImage.images in the cozystack-platform Package values) and point this pool's osImage.builtin at it; or, once no pool clones this golden, delete it and let the catalog recreate it on that class. Switching this pool to osImage.factory also resolves it." .groupName $workerSC $goldenName $goldenSC $defaultNote $workerSC) }}
+      {{-     end }}
+      {{-     $goldenStorage := dig "spec" "storage" "resources" "requests" "storage" "" $goldenDV }}
+      {{- /* Same authority argument as the class one line up: a golden whose spec
+             states no size still has a bound PVC that states the allocated one, and
+             that is the size a clone target has to meet. Reading only the spec made
+             this guard skip on a golden it could in fact size, and made the skip
+             itself unobservable -- the term could be forced either way with no test
+             noticing, which is how it survived a mutation pass. */}}
+      {{-     if not $goldenStorage }}
+      {{-       $goldenPVCName := dig "status" "claimName" $goldenName $goldenDV | toString }}
+      {{-       $goldenSizePVC := lookup "v1" "PersistentVolumeClaim" "cozy-public" $goldenPVCName }}
+      {{-       if $goldenSizePVC }}
+      {{-         $goldenStorage = dig "spec" "resources" "requests" "storage" "" $goldenSizePVC }}
+      {{-       end }}
+      {{-     end }}
+      {{-     if $goldenStorage }}
+      {{-       $workerDisk := .group.diskSize | default "20Gi" | toString }}
+      {{-       $workerBytes := include "cozy-lib.resources.toFloat" $workerDisk | float64 }}
+      {{-       $goldenBytes := include "cozy-lib.resources.toFloat" ($goldenStorage | toString) | float64 }}
+      {{-       if lt $workerBytes $goldenBytes }}
+      {{-         fail (printf "nodeGroup %q: diskSize %s is smaller than golden image %q storage %s — a CDI clone target must be at least the source size. Raise diskSize to %s or larger." .groupName $workerDisk $goldenName ($goldenStorage | toString) ($goldenStorage | toString)) }}
+      {{-       end }}
+      {{-     end }}
+      {{-   end }}
+      {{- end }}
+      - metadata:
+          name: disk-system
+          {{- /* usePopulator=false stays ONLY on the HTTP/import path: it preserves
+                 the legacy import behaviour and keeps an image-omitted DV — hence the
+                 KMT hash — byte-identical to the pre-feature render, so those workers
+                 never roll on upgrade. The clone path omits it so CDI's populator
+                 performs a storage-layer CSI clone of the golden (verified on a
+                 LINSTOR-backed cluster: temp PVC CSI-cloned + resized, no
+                 host-assisted upload pod) instead of a slower pod-network copy. */}}
+          {{- if $useClone }}
+          {{- /* Names the golden this disk was cloned from. A golden is referenced
+                 only from inside a VM dataVolumeTemplates source, so before this
+                 there was no query that told an operator which pools still pin
+                 `talos-worker-<id>-<ver>` -- and a pool on `builtin: {}` does not
+                 name it in its own CR either, because the schematic and version
+                 come from talos.* defaults. With this the answer is one read:
+
+                   kubectl get datavolume -A -o jsonpath=\
+                     '{range .items[?(@.metadata.annotations.kubernetes-worker-image\
+                     \.cozystack\.io/golden=="talos-worker-<id>-<ver>")]}\
+                     {.metadata.namespace}/{.metadata.name}{"\n"}{end}'
+
+                 An annotation rather than a label because a schematic ID is 64
+                 characters and a label value stops at 63. */}}
+          annotations:
+            kubernetes-worker-image.cozystack.io/golden: {{ $goldenName | quote }}
+            kubernetes-worker-image.cozystack.io/pool: {{ printf "%s-%s" .clusterName .groupName | quote }}
+          {{- else }}
+          annotations:
+            cdi.kubevirt.io/storage.usePopulator: "false"
+          {{- end }}
+        spec:
+          {{- /* Use the openstack/configdrive Talos image: KubeVirt CAPK
+                injects bootstrap data via cloudInitConfigDrive (OpenStack
+                metadata service shape), and the openstack platform image
+                is the one that reads it. The nocloud-amd64 image silently
+                ignores configdrive and never applies the machineconfig. */}}
+          source:
+          {{- if $useClone }}
+            pvc:
+              namespace: cozy-public
+              name: {{ $goldenName | quote }}
+          {{- else }}
+            http:
+              {{- /* Deliberately unquoted. This is the pre-feature render for a pool
+                     with `osImage` omitted, and the KubevirtMachineTemplate is named by
+                     a hash of its own content -- quoting the scalar changes those
+                     bytes and rolls every live worker on upgrade. The components are
+                     validated above instead, which is what makes an unquoted scalar
+                     safe here. The clone path's name below is quoted because no
+                     existing worker renders it. */}}
+              url: {{ $httpURL }}
+              {{- /* Only when talos.imageFactoryCA is set: a self-hosted factory
+                    served with a certificate from an internal CA. CDI appends the
+                    bundle to the system pool instead of replacing it, so a
+                    publicly-trusted endpoint verifies either way. The ConfigMap
+                    is rendered by templates/image-factory-ca.yaml. certConfigMap
+                    is a field of source.http only, so the clone path above never
+                    carries it. */}}
+              {{- if (include "kubernetes-nodes.talosImageFactoryCA" $) }}
+              certConfigMap: {{ include "kubernetes-nodes.talosImageFactoryCAConfigMapName" $ }}
+              {{- end }}
+          {{- end }}
+          storage:
+            resources:
+              requests:
+                storage: {{ .group.diskSize | default "20Gi" | quote }}
+            {{- /*
+              Worker VMs live-migrate, so their disks need ReadWriteMany. The
+              RWX access mode is supplied by the chosen StorageClass's CDI
+              StorageProfile — it is not set on the DataVolume here. linstor-csi
+              rejects RWX volumes that are not on a DRBD-backed StorageClass, so
+              an empty nodeGroup storageClass falls back to the application-level
+              storageClass (a replicated/DRBD class) instead of the cluster
+              default, which may be a non-DRBD class that the CSI driver would
+              reject. Both empty still omits the field so the cluster default
+              applies.
+
+              A builtin pool instead renders the class the guard above resolved for
+              it. Omitting the field there would let the disk bind on whatever the
+              cluster default is at bind time, and CDI takes the storage-layer path
+              only when source and target share a class -- so a default that moved
+              after the pool's earlier disks were bound turns the next clone into a
+              host-assisted copy over the pod network, the transfer the guard exists
+              to refuse, while the guard reports no drift because it compared the
+              class those earlier disks sit on. With both levels empty and no cluster
+              to resolve against the field is still omitted, so the HTTP path renders
+              exactly as before and the KubevirtMachineTemplate hash named after it
+              does not move.
+            */}}
+            {{- with $cloneWorkerSC | default (.group.storageClass | default $.Values.storageClass) }}
+            storageClassName: {{ . | quote }}
+            {{- end }}
+      template:
+        metadata:
+          annotations:
+            kubevirt.io/allow-pod-bridge-network-live-migration: "true"
+          labels:
+            {{- /* The VM pod is intentionally attributed to the parent Kubernetes
+                   application (kind Kubernetes, name <cluster>), not to this
+                   KubernetesNodes release: these labels are part of the byte-identical
+                   render the adoption migration relies on, and lineage/quota accounting
+                   for worker VMs stays under the cluster they belong to. */}}
+            apps.cozystack.io/application.group: apps.cozystack.io
+            apps.cozystack.io/application.kind: Kubernetes
+            apps.cozystack.io/application.name: {{ .clusterName | trimPrefix "kubernetes-" | quote }}
+            {{- range .group.roles }}
+            node-role.kubernetes.io/{{ . }}: ""
+            {{- end }}
+            cluster.x-k8s.io/deployment-name: {{ .clusterName }}-{{ .groupName }}
+        spec:
+          {{- if .Values._cluster.scheduling }}
+          {{- $rawConstraints := get .Values._cluster.scheduling "globalAppTopologySpreadConstraints" }}
+          {{- if $rawConstraints }}
+          {{- $rawConstraints | fromYaml | toYaml | nindent 10 }}
+            labelSelector:
+              matchLabels:
+                cluster.x-k8s.io/cluster-name: {{ .clusterName }}
+          {{- end }}
+          {{- end }}
+          domain:
+            {{- if and .group.resources .group.resources.cpu }}
+            cpu:
+              threads: 1
+              cores: {{ .group.resources.cpu }}
+              sockets: 1
+            {{- end }}
+            devices:
+              {{- if .group.gpus }}
+              gpus:
+              {{- range $i, $gpu := .group.gpus }}
+              - name: gpu{{ add $i 1 }}
+                deviceName: {{ $gpu.name }}
+              {{- end }}
+              {{- end }}
+              disks:
+              - name: system
+                disk:
+                  bus: virtio
+                  pciAddress: 0000:07:00.0
+                blockSize:
+                  custom:
+                    logical: 512
+                    physical: 4096
+              interfaces:
+              - name: default
+                bridge: {}
+              {{- /* Opt-in, and rendered only when true. The enclosing
+                    KubevirtMachineTemplate is content-hash named, so emitting
+                    this key for a pool that did not ask for it renames the
+                    template and rolls every live worker VM. An explicit false
+                    therefore renders the same nothing as an absent field
+                    rather than KubeVirt's tri-state false. */}}
+              {{- if .group.logSerialConsole }}
+              logSerialConsole: true
+              {{- end }}
+            {{- if and .group.resources .group.resources.memory }}
+            memory:
+              guest: {{ .group.resources.memory }}
+            {{- end }}
+            resources:
+              {{/* 2Gi is enough: persistent DataVolumes are not counted as pod ephemeral storage */}}
+              {{- $podResources := include "cozy-lib.resources.sanitize" (list (dict "ephemeral-storage" "2Gi") $) }}
+              {{- /* Either side of the pair, and only for a pool that asked
+                    for it. KubeVirt derives both from the guest vCPU count, and
+                    each key declared here displaces one derivation: the limit
+                    stops it deriving a ceiling, the request stops its VMI
+                    defaulter (setDefaultResourceRequests) copying that declared
+                    ceiling into the request. A pool declaring only the limit
+                    therefore moves both. The enclosing KubevirtMachineTemplate
+                    is content-hash named, so a pool that sets neither has to
+                    render the same bytes it did before these fields existed,
+                    down to the whitespace.
+
+                    Presence, not truth: zero is a quantity the schema accepts
+                    and a pool can mean it, so `with` would drop a deliberate
+                    choice as though nothing had been set. Which zeroes are
+                    coherent is settled by the guards further down, not here. */}}
+              {{- if not (kindIs "invalid" .group.podCpuLimit) }}
+              {{- $limited := $podResources | fromYaml }}
+              {{- $_ := set $limited.limits "cpu" (toString .group.podCpuLimit) }}
+              {{- $podResources = toYaml $limited }}
+              {{- end }}
+              {{- if not (kindIs "invalid" .group.podCpuRequest) }}
+              {{- $requested := $podResources | fromYaml }}
+              {{- $_ := set $requested.requests "cpu" (toString .group.podCpuRequest) }}
+              {{- $podResources = toYaml $requested }}
+              {{- end }}
+              {{- $podResources | nindent 14 }}
+          evictionStrategy: External
+          volumes:
+          - name: system
+            dataVolume:
+              name: disk-system
+          networks:
+          - name: default
+            pod: {}
+{{- end }}
+{{- /* instanceType and explicit resources are alternative sizing sources, and
+       explicit resources win. KubeVirt rejects a VirtualMachine that references
+       an instancetype while also overriding either domain.cpu or domain.memory,
+       so when a group is sized by resources (both cpu and memory set) the
+       instancetype is omitted from the VM (see the VM spec above) and the lookup
+       below is skipped — a stale instancetype name cannot fail an otherwise
+       valid, resource-sized group. Explicit resources are all-or-nothing: a
+       partial spec (only one of cpu/memory) would emit one domain override
+       alongside the instancetype, which KubeVirt rejects, so it fails here with
+       a clear render-time error instead of a late admission rejection. */}}
+{{- $hasCpu := and $group.resources $group.resources.cpu }}
+{{- $hasMem := and $group.resources $group.resources.memory }}
+{{- if and $group.instanceType (or (and $hasCpu (not $hasMem)) (and $hasMem (not $hasCpu))) }}
+{{-   fail (printf "nodeGroup %s: set both resources.cpu and resources.memory, or neither" $groupName) }}
+{{- end }}
+{{- /* Presence, not truth, for both fields below: zero is a quantity the
+       schema accepts, and a guard keyed on truthiness would wave through
+       exactly the value it exists to catch. */}}
+{{- $hasPodCpuLimit := not (kindIs "invalid" $group.podCpuLimit) }}
+{{- $hasPodCpuRequest := not (kindIs "invalid" $group.podCpuRequest) }}
+{{- /* Same conflict class, other field: podCpuLimit renders
+       domain.resources.limits.cpu, and a VM that carries an instancetype and
+       that key is refused by KubeVirt's instancetype applier, which reports it
+       as a conflict rather than resolving it. The pool has to be sized by
+       resources for the limit to be usable at all, since that is what drops
+       the instancetype from the VM. */}}
+{{- if and $hasPodCpuLimit $group.instanceType (not (and $hasCpu $hasMem)) }}
+{{-   fail (printf "nodeGroup %s: podCpuLimit cannot be combined with instanceType sizing, because KubeVirt rejects a VirtualMachine that references an instancetype and also sets domain.resources.limits.cpu. Set both resources.cpu and resources.memory, which drops the instancetype from the VM, or drop podCpuLimit." $groupName) }}
+{{- end }}
+{{- /* Other side of the pair, same conflict and the same check upstream: the
+       instancetype applier reports domain.resources.requests.cpu alongside the
+       limit rather than resolving either. */}}
+{{- if and $hasPodCpuRequest $group.instanceType (not (and $hasCpu $hasMem)) }}
+{{-   fail (printf "nodeGroup %s: podCpuRequest cannot be combined with instanceType sizing, because KubeVirt rejects a VirtualMachine that references an instancetype and also sets domain.resources.requests.cpu. Set both resources.cpu and resources.memory, which drops the instancetype from the VM, or drop podCpuRequest." $groupName) }}
+{{- end }}
+{{- /* The rest of the value domain, decided in one place rather than one edge
+       at a time. Both fields are quantities and the generated schema admits a
+       leading minus and a zero as readily as a sane value, so what each class
+       does has to be settled here:
+
+       negative -- never reaches a running Pod, the API server rejects the
+       quantity outright;
+
+       zero limit -- removes the ceiling rather than being the tightest one:
+       the kubelet turns a zero CPU limit into no CFS quota at all, and
+       declaring the key stops KubeVirt deriving one. But it only reaches a
+       Pod paired with a zero request, and that is not a style preference.
+       API server validation refuses a request above a limit that exists, and
+       zero is a limit that exists, while KubeVirt keeps deriving a request
+       from the vCPU count whenever the VM declares none -- the defaulter that
+       would have copied the limit across does not fire, because the limit is
+       itself zero. So a lone zero limit renders a Pod that is rejected on
+       creation, and is refused here instead;
+
+       zero request beside a non-zero limit -- looks like "reserve nothing
+       under this ceiling" and does the opposite. KubeVirt's defaulter tests
+       the request with IsZero, which an explicit zero satisfies exactly as an
+       absent key does, so it overwrites the zero with the limit and the worker
+       asks for the whole ceiling. That is the failure this pair exists to
+       avoid, so it is refused rather than documented;
+
+       zero request alone -- the defaulter does not fire without a limit, so it
+       survives and means what it says. Allowed.
+
+       Comparisons are on the converted numbers, not on the strings that spell
+       them: 1500m against 2 is not a string comparison. */}}
+{{- if and $hasPodCpuLimit (lt (include "cozy-lib.resources.toFloat" $group.podCpuLimit | float64) 0.0) }}
+{{-   fail (printf "nodeGroup %s: podCpuLimit (%v) must not be negative" $groupName $group.podCpuLimit) }}
+{{- end }}
+{{- if and $hasPodCpuRequest (lt (include "cozy-lib.resources.toFloat" $group.podCpuRequest | float64) 0.0) }}
+{{-   fail (printf "nodeGroup %s: podCpuRequest (%v) must not be negative" $groupName $group.podCpuRequest) }}
+{{- end }}
+{{- if and $hasPodCpuLimit (not $hasPodCpuRequest) (eq (include "cozy-lib.resources.toFloat" $group.podCpuLimit | float64) 0.0) }}
+{{-   fail (printf "nodeGroup %s: podCpuLimit 0 needs podCpuRequest 0 beside it. A zero limit removes the ceiling, but KubeVirt still derives a CPU request from the guest vCPU count when the VM declares none, and a request above a declared limit of zero is rejected when the worker's Pod is created." $groupName) }}
+{{- end }}
+{{- if and $hasPodCpuRequest $hasPodCpuLimit }}
+{{-   $requestF := include "cozy-lib.resources.toFloat" $group.podCpuRequest | float64 }}
+{{-   $limitF := include "cozy-lib.resources.toFloat" $group.podCpuLimit | float64 }}
+{{-   if and (eq $requestF 0.0) (ne $limitF 0.0) }}
+{{-     fail (printf "nodeGroup %s: podCpuRequest 0 beside a podCpuLimit does not reserve nothing. KubeVirt replaces a zero CPU request with the declared limit (%v), so the worker would ask the scheduler for its whole ceiling, which is what podCpuRequest exists to prevent. Give podCpuRequest a non-zero value, or drop it and accept the same outcome deliberately." $groupName $group.podCpuLimit) }}
+{{-   end }}
+{{-   if gt $requestF $limitF }}
+{{-     fail (printf "nodeGroup %s: podCpuRequest (%v) exceeds podCpuLimit (%v), and a container cannot request more CPU than its limit" $groupName $group.podCpuRequest $group.podCpuLimit) }}
+{{-   end }}
+{{- end }}
+{{/* Resolve instanceType once per group — reused for kubelet reservations and capacity annotations. */}}
+{{- $instanceType := dict }}
+{{- if and $group.instanceType (not (and $hasCpu $hasMem)) }}
+{{-   $instanceType = (lookup "instancetype.kubevirt.io/v1beta1" "VirtualMachineClusterInstancetype" "" $group.instanceType) }}
+{{-   if not $instanceType }}
+{{-     fail (printf "nodeGroup %s: specified instanceType %q not found in cluster" $groupName $group.instanceType) }}
+{{-   end }}
+{{- end }}
+{{/* Compute kubelet reservations: explicit resources.memory/cpu wins over instanceType spec.
+     Auto-computed system/kube reserved memory = 5% of effective memory, clamped to [256Mi, 1Gi].
+     Auto-computed system/kube reserved CPU = 5% of effective CPU, clamped to [50m, 500m]. */}}
+{{- $effectiveMemory := "" }}
+{{- if and $group.resources $group.resources.memory }}
+{{-   $effectiveMemory = $group.resources.memory | toString }}
+{{- else if and $instanceType $instanceType.spec $instanceType.spec.memory $instanceType.spec.memory.guest }}
+{{-   $effectiveMemory = $instanceType.spec.memory.guest | toString }}
+{{- end }}
+{{- $effectiveCpu := "" }}
+{{- if and $group.resources $group.resources.cpu }}
+{{-   $effectiveCpu = $group.resources.cpu | toString }}
+{{- else if and $instanceType $instanceType.spec $instanceType.spec.cpu $instanceType.spec.cpu.guest }}
+{{-   $effectiveCpu = $instanceType.spec.cpu.guest | toString }}
+{{- end }}
+{{- $autoReservedMi := 256 }}
+{{- if $effectiveMemory }}
+{{-   $effectiveMemMi := divf (include "cozy-lib.resources.toFloat" $effectiveMemory | float64) 1048576.0 | int }}
+{{-   $fivePercentMi := mulf ($effectiveMemMi | float64) 0.05 | int }}
+{{-   $autoReservedMi = min (max $fivePercentMi 256) 1024 }}
+{{- end }}
+{{- $autoReservedMillicores := 50 }}
+{{- if $effectiveCpu }}
+{{-   $effectiveCpuMillicores := include "kubernetes.cpuToMillicores" $effectiveCpu | int }}
+{{-   $fivePercentMillis := mulf ($effectiveCpuMillicores | float64) 0.05 | int }}
+{{-   $autoReservedMillicores = min (max $fivePercentMillis 50) 500 }}
+{{- end }}
+{{- $kubeletOverride := $group.kubelet | default dict }}
+{{- $systemReservedMemory := $kubeletOverride.systemReservedMemory | default (printf "%dMi" $autoReservedMi) }}
+{{- $kubeReservedMemory := $kubeletOverride.kubeReservedMemory | default (printf "%dMi" $autoReservedMi) }}
+{{- $systemReservedCpu := $kubeletOverride.systemReservedCpu | default (printf "%dm" $autoReservedMillicores) }}
+{{- $kubeReservedCpu := $kubeletOverride.kubeReservedCpu | default (printf "%dm" $autoReservedMillicores) }}
+{{- $evictionHardMemory := $kubeletOverride.evictionHardMemory | default "7%" }}
+{{- $evictionSoftMemory := $kubeletOverride.evictionSoftMemory | default "10%" }}
+{{/* Validate reservation field formats (user-supplied values only; computed defaults are valid by construction). */}}
+{{- $validations := list
+      (dict "key" "systemReservedMemory" "value" $kubeletOverride.systemReservedMemory "pattern" `^[0-9]+(\.[0-9]+)?([eE][+-]?[0-9]+)?(Ki|Mi|Gi|Ti|Pi|Ei|k|M|G|T|P|E)?$` "hint" "a valid Kubernetes memory quantity (e.g. 128Mi, 1Gi, 1e9, 500e6)")
+      (dict "key" "kubeReservedMemory"   "value" $kubeletOverride.kubeReservedMemory   "pattern" `^[0-9]+(\.[0-9]+)?([eE][+-]?[0-9]+)?(Ki|Mi|Gi|Ti|Pi|Ei|k|M|G|T|P|E)?$` "hint" "a valid Kubernetes memory quantity (e.g. 128Mi, 1Gi, 1e9, 500e6)")
+      (dict "key" "systemReservedCpu"    "value" $kubeletOverride.systemReservedCpu    "pattern" `^([0-9]+m|[0-9]+(\.[0-9]+)?)$`                                                              "hint" "a valid Kubernetes CPU quantity (integer millicores like 100m, or decimal cores like 0.5, 1)")
+      (dict "key" "kubeReservedCpu"      "value" $kubeletOverride.kubeReservedCpu      "pattern" `^([0-9]+m|[0-9]+(\.[0-9]+)?)$`                                                              "hint" "a valid Kubernetes CPU quantity (integer millicores like 100m, or decimal cores like 0.5, 1)")
+}}
+{{- range $validations }}
+{{-   if and .value (not (regexMatch .pattern (.value | toString))) }}
+{{-     fail (printf "nodeGroup %s: invalid %s value %q — must be %s" $groupName .key (.value | toString) .hint) }}
+{{-   end }}
+{{- end }}
+{{/* Validate that user-supplied reservation values are positive (non-zero) */}}
+{{- range $_, $entry := list (dict "key" "systemReservedMemory" "value" $kubeletOverride.systemReservedMemory) (dict "key" "kubeReservedMemory" "value" $kubeletOverride.kubeReservedMemory) }}
+{{-   if $entry.value }}
+{{-     $bytes := include "cozy-lib.resources.toFloat" ($entry.value | toString) | float64 }}
+{{-     if le $bytes 0.0 }}
+{{-       fail (printf "nodeGroup %s: %s must be a positive value, got %s" $groupName $entry.key ($entry.value | toString)) }}
+{{-     end }}
+{{-   end }}
+{{- end }}
+{{- range $_, $entry := list (dict "key" "systemReservedCpu" "value" $kubeletOverride.systemReservedCpu) (dict "key" "kubeReservedCpu" "value" $kubeletOverride.kubeReservedCpu) }}
+{{-   if $entry.value }}
+{{-     $cpuMillis := include "kubernetes.cpuToMillicores" $entry.value | float64 }}
+{{-     if le $cpuMillis 0.0 }}
+{{-       fail (printf "nodeGroup %s: %s must be a positive value, got %s" $groupName $entry.key ($entry.value | toString)) }}
+{{-     end }}
+{{-   end }}
+{{- end }}
+{{/* Validate absolute eviction threshold formats before converting */}}
+{{- if not (hasSuffix "%" $evictionHardMemory) }}
+{{-   if not (regexMatch `^[0-9]+(\.[0-9]+)?([eE][+-]?[0-9]+)?(Ki|Mi|Gi|Ti|Pi|Ei|k|M|G|T|P|E)?$` $evictionHardMemory) }}
+{{-     fail (printf "nodeGroup %s: invalid evictionHardMemory value %q — must be a percentage (e.g. 7%%) or a valid Kubernetes memory quantity (e.g. 500Mi, 1Gi, 1e9)" $groupName $evictionHardMemory) }}
+{{-   end }}
+{{- end }}
+{{- if not (hasSuffix "%" $evictionSoftMemory) }}
+{{-   if not (regexMatch `^[0-9]+(\.[0-9]+)?([eE][+-]?[0-9]+)?(Ki|Mi|Gi|Ti|Pi|Ei|k|M|G|T|P|E)?$` $evictionSoftMemory) }}
+{{-     fail (printf "nodeGroup %s: invalid evictionSoftMemory value %q — must be a percentage (e.g. 10%%) or a valid Kubernetes memory quantity (e.g. 500Mi, 1Gi, 1e9)" $groupName $evictionSoftMemory) }}
+{{-   end }}
+{{- end }}
+{{- if and (hasSuffix "%" $evictionHardMemory) (hasSuffix "%" $evictionSoftMemory) }}
+{{-   $hardPctStr := trimSuffix "%" $evictionHardMemory }}
+{{-   $softPctStr := trimSuffix "%" $evictionSoftMemory }}
+{{-   if not (regexMatch `^[0-9]+(\.[0-9]+)?$` $hardPctStr) }}
+{{-     fail (printf "nodeGroup %s: evictionHardMemory percentage value %q is not a valid number" $groupName $hardPctStr) }}
+{{-   end }}
+{{-   if not (regexMatch `^[0-9]+(\.[0-9]+)?$` $softPctStr) }}
+{{-     fail (printf "nodeGroup %s: evictionSoftMemory percentage value %q is not a valid number" $groupName $softPctStr) }}
+{{-   end }}
+{{-   $hardPct := $hardPctStr | float64 }}
+{{-   $softPct := $softPctStr | float64 }}
+{{-   if le $hardPct 0.0 }}
+{{-     fail (printf "nodeGroup %s: evictionHardMemory percentage must be greater than 0 and at most 100, got %s%%" $groupName $hardPctStr) }}
+{{-   end }}
+{{-   if gt $hardPct 100.0 }}
+{{-     fail (printf "nodeGroup %s: evictionHardMemory percentage must be greater than 0 and at most 100, got %s%%" $groupName $hardPctStr) }}
+{{-   end }}
+{{-   if le $softPct 0.0 }}
+{{-     fail (printf "nodeGroup %s: evictionSoftMemory percentage must be greater than 0 and at most 100, got %s%%" $groupName $softPctStr) }}
+{{-   end }}
+{{-   if gt $softPct 100.0 }}
+{{-     fail (printf "nodeGroup %s: evictionSoftMemory percentage must be greater than 0 and at most 100, got %s%%" $groupName $softPctStr) }}
+{{-   end }}
+{{-   if ge $hardPct $softPct }}
+{{-     fail (printf "nodeGroup %s: evictionHardMemory (%s) must be strictly less than evictionSoftMemory (%s)" $groupName $evictionHardMemory $evictionSoftMemory) }}
+{{-   end }}
+{{- else if and (not (hasSuffix "%" $evictionHardMemory)) (not (hasSuffix "%" $evictionSoftMemory)) }}
+{{-   $hardBytes := include "cozy-lib.resources.toFloat" $evictionHardMemory | float64 }}
+{{-   $softBytes := include "cozy-lib.resources.toFloat" $evictionSoftMemory | float64 }}
+{{-   if ge $hardBytes $softBytes }}
+{{-     fail (printf "nodeGroup %s: evictionHardMemory (%s) must be strictly less than evictionSoftMemory (%s)" $groupName $evictionHardMemory $evictionSoftMemory) }}
+{{-   end }}
+{{- else }}
+{{-   fail (printf "nodeGroup %s: evictionHardMemory (%s) and evictionSoftMemory (%s) must use the same unit type (both percentage or both absolute)" $groupName $evictionHardMemory $evictionSoftMemory) }}
+{{- end }}
+{{/* Resolve eviction hard threshold to bytes for arithmetic.
+     Percentage is relative to effective node memory; absolute values are used as-is. */}}
+{{- $evictionHardBytes := 0.0 }}
+{{- if $effectiveMemory }}
+{{-   if hasSuffix "%" $evictionHardMemory }}
+{{-     $evictionPct := trimSuffix "%" $evictionHardMemory | float64 }}
+{{-     $evictionHardBytes = mulf (include "cozy-lib.resources.toFloat" $effectiveMemory | float64) (divf $evictionPct 100.0) }}
+{{-   else }}
+{{-     $evictionHardBytes = include "cozy-lib.resources.toFloat" $evictionHardMemory | float64 }}
+{{-   end }}
+{{- end }}
+{{/* Validate that total reserved memory (system + kube + eviction) does not exceed effective node memory */}}
+{{- if $effectiveMemory }}
+{{-   $sysBytes := include "cozy-lib.resources.toFloat" $systemReservedMemory | float64 }}
+{{-   $kubeBytes := include "cozy-lib.resources.toFloat" $kubeReservedMemory | float64 }}
+{{-   $totalReservedBytes := addf (addf $sysBytes $kubeBytes) $evictionHardBytes }}
+{{-   $effectiveMemBytes := include "cozy-lib.resources.toFloat" $effectiveMemory | float64 }}
+{{-   if ge $totalReservedBytes $effectiveMemBytes }}
+{{-     fail (printf "nodeGroup %s: total reserved memory (systemReservedMemory=%s + kubeReservedMemory=%s + evictionHardMemory=%s) must be less than effective node memory (%s)" $groupName $systemReservedMemory $kubeReservedMemory $evictionHardMemory $effectiveMemory) }}
+{{-   end }}
+{{- end }}
+{{/* Validate that total reserved CPU does not exceed effective node CPU */}}
+{{- if $effectiveCpu }}
+{{-   $sysCpuMillis := include "kubernetes.cpuToMillicores" $systemReservedCpu | float64 }}
+{{-   $kubeCpuMillis := include "kubernetes.cpuToMillicores" $kubeReservedCpu | float64 }}
+{{-   $totalCpuMillis := addf $sysCpuMillis $kubeCpuMillis }}
+{{-   $effectiveCpuMillicoresV := include "kubernetes.cpuToMillicores" $effectiveCpu | int }}
+{{-   $effectiveCpuMillis := float64 $effectiveCpuMillicoresV }}
+{{-   if ge $totalCpuMillis $effectiveCpuMillis }}
+{{-     fail (printf "nodeGroup %s: total reserved CPU (systemReservedCpu=%s + kubeReservedCpu=%s) must be less than effective node CPU (%s cores)" $groupName $systemReservedCpu $kubeReservedCpu $effectiveCpu) }}
+{{-   end }}
+{{- end }}
+{{/* Guard: explicit kubelet overrides require effective memory for validation */}}
+{{- if not $effectiveMemory }}
+{{-   $hasOverride := or $kubeletOverride.systemReservedMemory $kubeletOverride.kubeReservedMemory $kubeletOverride.evictionHardMemory $kubeletOverride.evictionSoftMemory }}
+{{-   if $hasOverride }}
+{{-     fail (printf "nodeGroup %s: kubelet memory reservations require effective memory to validate — set resources.memory or instanceType" $groupName) }}
+{{-   end }}
+{{- end }}
+{{/* Guard: explicit kubelet CPU overrides require effective CPU for validation */}}
+{{- if not $effectiveCpu }}
+{{-   $hasCpuOverride := or $kubeletOverride.systemReservedCpu $kubeletOverride.kubeReservedCpu }}
+{{-   if $hasCpuOverride }}
+{{-     fail (printf "nodeGroup %s: cannot validate kubelet CPU reservations without effective CPU — set resources.cpu or a valid instanceType" $groupName) }}
+{{-   end }}
+{{- end }}
+---
+{{- /* TalosConfigTemplate is not rendered here — the chart cannot produce a
+       valid Talos worker machineconfig at Helm template time because three of
+       the inputs (apiserver Service ClusterIP, Talos CA, Kamaji-issued tenant
+       CA) are created asynchronously. The main-phase Job in
+       templates/talos-reconcile-job.yaml waits for those inputs and produces
+       the TalosConfigTemplate with a KamajiControlPlane ownerReference for
+       natural GC. The MachineDeployment below references the TCT name; CAPI's
+       Machine controller blocks on its absence and unblocks the moment the Job
+       applies it.
+
+       The name it references carries a hash of the rendered machine config,
+       computed here from the same named template the Job renders into its
+       heredoc, because TalosConfigTemplate.spec is immutable and can only ever
+       be created, never updated — see _talosconfigtemplate.tpl. */}}
+{{- $talosConfigTemplateName := printf "%s-%s-%s" $clusterName $groupName (include "kubernetes.talosConfigTemplateHash" (dict "root" $ "group" $group)) }}
+---
+{{- $context := deepCopy $ }}
+{{- $_ := set $context "group" $group }}
+{{- $_ := set $context "groupName" $groupName }}
+{{- $_ := set $context "clusterName" $clusterName }}
+{{- /* These variables hold either kind despite their names. The content hash
+       below is taken over the rendered template, so the names reach nothing
+       outside this block. */}}
+{{- $machineTemplateKind := ternary "ProxmoxMachineTemplate" "KubevirtMachineTemplate" $isProxmox }}
+{{- $kubevirtmachinetemplate := include (ternary "proxmoxmachinetemplate" "kubevirtmachinetemplate" $isProxmox) $context }}
+{{- $kubevirtmachinetemplateHash := $kubevirtmachinetemplate | sha256sum | trunc 6 }}
+{{- $kubevirtmachinetemplateName := printf "%s-%s-%s" $clusterName $groupName $kubevirtmachinetemplateHash }}
+{{- $kubevirtmachinetemplateNames = append $kubevirtmachinetemplateNames $kubevirtmachinetemplateName }}
+apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
+kind: {{ $machineTemplateKind }}
+metadata:
+  name: {{ $clusterName }}-{{ $groupName }}-{{ $kubevirtmachinetemplateHash }}
+  namespace: {{ $.Release.Namespace }}
+spec:
+  template:
+    {{- $kubevirtmachinetemplate | nindent 4 }}
+---
+apiVersion: cluster.x-k8s.io/v1beta1
+kind: MachineDeployment
+metadata:
+  name: {{ $clusterName }}-{{ $groupName }}
+  namespace: {{ $.Release.Namespace }}
+  annotations:
+    cluster.x-k8s.io/cluster-api-autoscaler-node-group-min-size: "{{ $group.minReplicas }}"
+    cluster.x-k8s.io/cluster-api-autoscaler-node-group-max-size: "{{ $group.maxReplicas }}"
+    cluster.x-k8s.io/autoscaling-options-maxnodeprovisiontime: {{ include "kubernetes.positiveDuration" (dict "field" "maxNodeProvisionTime" "value" $.Values.maxNodeProvisionTime) | quote }}
+    {{- if $effectiveMemory }}
+    {{-   $sysBytes := include "cozy-lib.resources.toFloat" $systemReservedMemory | float64 }}
+    {{-   $kubeBytes := include "cozy-lib.resources.toFloat" $kubeReservedMemory | float64 }}
+    {{-   $totalReservedBytes := addf (addf $sysBytes $kubeBytes) $evictionHardBytes }}
+    {{-   $allocatableBytes := subf (include "cozy-lib.resources.toFloat" $effectiveMemory | float64) $totalReservedBytes }}
+    {{-   $allocatableMi := divf $allocatableBytes 1048576.0 | floor }}
+    capacity.cluster-autoscaler.kubernetes.io/memory: "{{ $allocatableMi }}Mi"
+    {{- end }}
+    {{- if $effectiveCpu }}
+    {{-   $sysCpuMillisA := include "kubernetes.cpuToMillicores" $systemReservedCpu | float64 }}
+    {{-   $kubeCpuMillisA := include "kubernetes.cpuToMillicores" $kubeReservedCpu | float64 }}
+    {{-   $effectiveCpuMillicoresA := include "kubernetes.cpuToMillicores" $effectiveCpu | int }}
+    {{-   $effectiveCpuMillisA := float64 $effectiveCpuMillicoresA }}
+    {{-   $allocatableCpuMillis := subf $effectiveCpuMillisA (addf $sysCpuMillisA $kubeCpuMillisA) }}
+    {{-   $allocatableCpuMillisInt := $allocatableCpuMillis | ceil | int }}
+    capacity.cluster-autoscaler.kubernetes.io/cpu: "{{ $allocatableCpuMillisInt }}m"
+    {{- end }}
+spec:
+  clusterName: {{ $clusterName }}
+  # `spec.replicas` is intentionally omitted so the field is owned by
+  # the cluster-autoscaler alone. Two independent CAPI mechanisms —
+  # not Server-Side-Apply field managers — carry the guarantee:
+  #   1. Create: the MachineDeployment defaulting webhook seeds
+  #      `spec.replicas` from the `cluster-api-autoscaler-node-group-
+  #      min-size` annotation (see
+  #      https://cluster-api.sigs.k8s.io/tasks/automated-machine-management/autoscaling).
+  #   2. Update: `calculateMachineDeploymentReplicas` preserves the
+  #      existing live value (`oldMD.Spec.Replicas`) whenever the
+  #      incoming spec has `replicas: nil`, clamping into
+  #      `[min, max]` if it drifts outside — so a cluster the
+  #      autoscaler holds above min-size is not drained by a
+  #      `helm upgrade` that would otherwise re-render this field.
+  # Flux helm-controller applies this chart through the Helm SDK
+  # three-way merge (not SSA), so field-manager ownership is not the
+  # mechanism at play. The chart guarantee reduces to "leave the
+  # field out of the rendered manifest and let CAPI's update-time
+  # defaulting keep the live value stable". Emitting a chart-managed
+  # `replicas: N` here (as this chart did before
+  # cozystack/cozystack#3231) drains workers on every `helm upgrade`
+  # action until the autoscaler notices unschedulable Pods and
+  # scales back up — a real disruption window on every routine
+  # platform bump.
+  strategy:
+    rollingUpdate:
+      maxSurge: {{ $group.maxReplicas }}
+      maxUnavailable: 1
+    type: RollingUpdate
+  selector:
+    matchLabels:
+      cluster.x-k8s.io/cluster-name: {{ $clusterName }}
+      cluster.x-k8s.io/deployment-name: {{ $clusterName }}-{{ $groupName }}
+  template:
+    metadata:
+      labels:
+        cluster.x-k8s.io/cluster-name: {{ $clusterName }}
+        cluster.x-k8s.io/deployment-name: {{ $clusterName }}-{{ $groupName }}
+        {{- range $group.roles }}
+        node-role.kubernetes.io/{{ . }}: ""
+        {{- end }}
+    spec:
+      bootstrap:
+        configRef:
+          apiVersion: bootstrap.cluster.x-k8s.io/v1alpha3
+          kind: TalosConfigTemplate
+          name: {{ $talosConfigTemplateName }}
+          namespace: {{ $.Release.Namespace }}
+      clusterName: {{ $clusterName }}
+      infrastructureRef:
+        apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
+        kind: {{ $machineTemplateKind }}
+        name: {{ $clusterName }}-{{ $groupName }}-{{ $kubevirtmachinetemplateHash }}
+        namespace: {{ $.Release.Namespace }}
+      version: {{ include "kubernetes.versionMap" $}}
+---
+apiVersion: cluster.x-k8s.io/v1beta1
+kind: MachineHealthCheck
+metadata:
+  name: {{ $clusterName }}-{{ $groupName }}
+  namespace: {{ $.Release.Namespace }}
+spec:
+  clusterName: {{ $clusterName }}
+  {{- /* MHC spec.maxUnhealthy is an IntOrString. CAPI admission accepts a
+         bare integer (0, 1, ...) or a percentage string ("0%", "50%"), but
+         rejects a quoted plain integer ("0"). Quote only when the operator
+         supplied a percentage; otherwise render the value as a bare int so
+         the admission webhook is happy with the chart-default "0". */}}
+  {{- $maxUnhealthy := toString $.Values.maxUnhealthy }}
+  {{- $muSource := "maxUnhealthy" }}
+  {{- if hasSuffix "%" $maxUnhealthy }}
+  {{-   if not (regexMatch "^[0-9]+%$" $maxUnhealthy) }}
+  {{-     fail (printf "%s must be a bare integer (e.g. 0, 1) or an integer percentage (e.g. 50%%), got %q" $muSource $maxUnhealthy) }}
+  {{-   end }}
+  maxUnhealthy: {{ $maxUnhealthy | quote }}
+  {{- else if regexMatch "^[0-9]+$" $maxUnhealthy }}
+  maxUnhealthy: {{ $maxUnhealthy | int }}
+  {{- else }}
+  {{-   fail (printf "%s must be a bare integer (e.g. 0, 1) or an integer percentage (e.g. 50%%), got %q" $muSource $maxUnhealthy) }}
+  {{- end }}
+  nodeStartupTimeout: {{ $.Values.nodeStartupTimeout }}
+  selector:
+    matchLabels:
+      cluster.x-k8s.io/cluster-name: {{ $clusterName }}
+      cluster.x-k8s.io/deployment-name: {{ $clusterName }}-{{ $groupName }}
+  unhealthyConditions:
+  - type: Ready
+    status: Unknown
+    timeout: {{ include "kubernetes.positiveDuration" (dict "field" "readyUnknownTimeout" "value" $.Values.readyUnknownTimeout) | quote }}
+  - type: Ready
+    status: "False"
+    timeout: {{ include "kubernetes.positiveDuration" (dict "field" "readyFalseTimeout" "value" $.Values.readyFalseTimeout) | quote }}
+---
+apiVersion: cozystack.io/v1alpha1
+kind: WorkloadMonitor
+metadata:
+  name: {{ $clusterName }}-{{ $groupName }}
+  namespace: {{ $.Release.Namespace }}
+spec:
+  {{- /* The controller counts PODS matching the selector below and reports
+         Operational=false while fewer than minReplicas of them are ready. On
+         kubevirt those Pods exist — they are the virt-launcher Pods, and the
+         VMI template carries the deployment-name label further down. A proxmox
+         worker is a VM on another machine with no Pod here at all, so the count
+         is always zero and any minReplicas above zero would pin the pool, and
+         through the lineage labels its whole application, to WorkloadsReady=False
+         while every node is healthy. The object still renders: the dashboard and
+         the lineage read it. What it cannot carry on proxmox is a threshold
+         counted in Pods. */}}
+  {{- if ne ($.Values.substrate | default "kubevirt") "proxmox" }}
+  minReplicas: {{ $group.minReplicas }}
+  {{- end }}
+  kind: kubernetes
+  type: worker
+  selector:
+    cluster.x-k8s.io/cluster-name: {{ $clusterName }}
+    cluster.x-k8s.io/deployment-name: {{ $clusterName }}-{{ $groupName }}
+    cluster.x-k8s.io/role: worker
+  version: {{ $.Chart.Version }}
+---
+{{- /*
+We must preserve all previous KubevirtMachineTemplates for THIS pool until a
+MachineSet stops referencing them. Scoped by the meta.helm.sh/release-name
+annotation to this pool's own release, so sibling kubernetes-nodes releases in
+the same namespace never re-emit and fight over each other's templates. A bare
+name prefix is unsafe here: pool "gpu" would match sibling "gpu-large"'s
+hash-named KMTs; the release-name annotation is exact.
+*/ -}}
+{{- /* The lookup follows the substrate: on a Proxmox pool the live templates
+       are ProxmoxMachineTemplates, and looking for the KubeVirt kind would
+       find nothing and quietly drop templates a MachineSet still references,
+       deleting the infrastructure reference out from under running workers. */}}
+{{- $mss := (lookup "cluster.x-k8s.io/v1beta1" "MachineSet" $.Release.Namespace "").items }}
+{{- $oldKubevirtmachinetemplates := dict }}
+{{- range $kmt := (lookup "infrastructure.cluster.x-k8s.io/v1alpha1" $machineTemplateKind $.Release.Namespace "").items }}
+{{- range $or := $kmt.metadata.ownerReferences }}
+{{- if and (eq $or.kind "Cluster") (eq $or.name $clusterName) (eq (dig "annotations" "meta.helm.sh/release-name" "" $kmt.metadata) $.Release.Name) }}
+{{- range $ms := $mss }}
+{{- if and (eq $ms.spec.template.spec.infrastructureRef.kind $machineTemplateKind) (eq $ms.spec.template.spec.infrastructureRef.name $kmt.metadata.name) }}
+{{- if not (has $kmt.metadata.name $kubevirtmachinetemplateNames) }}
+{{- $oldKubevirtmachinetemplates = merge $oldKubevirtmachinetemplates (dict $kmt.metadata.name $kmt) }}
+{{- end }}
+{{- end }}
+{{- end }}
+{{- end }}
+{{- end }}
+{{- end }}
+
+{{- range $oldKubevirtmachinetemplates }}
+---
+apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
+kind: {{ $machineTemplateKind }}
+metadata:
+  name: {{ .metadata.name }}
+  namespace: {{ .metadata.namespace }}
+spec:
+  {{- .spec | toYaml | nindent 2 }}
+{{- end }}
diff --git a/packages/apps/kubernetes-nodes/templates/pre-delete-unpin.yaml b/packages/apps/kubernetes-nodes/templates/pre-delete-unpin.yaml
new file mode 100644
index 0000000000..770741be34
--- /dev/null
+++ b/packages/apps/kubernetes-nodes/templates/pre-delete-unpin.yaml
@@ -0,0 +1,210 @@
+{{- /* Migration 56 adopts pre-split worker objects into this release and pins
+       them with helm.sh/resource-policy=keep so the parent kubernetes chart's
+       control-plane-only re-render does not prune them during the transition.
+       That keep annotation is required only for the transition window; left in
+       place it makes an adopted pool leak its MachineDeployment / MachineHealth-
+       Check / WorkloadMonitor / KubevirtMachineTemplates on uninstall (Helm
+       skips keep-annotated resources), an asymmetry vs a natively-created pool.
+
+       This pre-delete hook strips the annotation from this release's own worker
+       objects just before uninstall, so Helm then deletes them cleanly. It runs
+       ONLY on delete (never on upgrade), so it cannot race the parent's first
+       control-plane-only re-render. For a natively-created pool (no keep
+       annotation) the annotate-remove is a harmless no-op. */}}
+{{- $clusterName := include "kubernetes-nodes.clusterName" . }}
+{{- $groupName := include "kubernetes-nodes.groupName" . }}
+{{- $base := printf "%s-%s" $clusterName $groupName }}
+{{- $kubectlImage := default ($.Files.Get "images/kubectl.tag" | trim) $.Values.images.kubectl }}
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ .Release.Name }}-unpin
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "kubernetes.labels" . | nindent 4 }}
+  annotations:
+    helm.sh/hook: pre-delete
+    helm.sh/hook-weight: "-5"
+    helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: {{ .Release.Name }}-unpin
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "kubernetes.labels" . | nindent 4 }}
+  annotations:
+    helm.sh/hook: pre-delete
+    helm.sh/hook-weight: "-5"
+    helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
+rules:
+  # MD/MHC/WorkloadMonitor names are known at render time ({{ $base }}), so the
+  # hook can only touch this pool's own objects, not sibling pools or other
+  # clusters sharing the tenant namespace.
+  - apiGroups: ["cluster.x-k8s.io"]
+    resources: ["machinedeployments", "machinehealthchecks"]
+    resourceNames: ["{{ $base }}"]
+    verbs: ["get", "patch"]
+  - apiGroups: ["cozystack.io"]
+    resources: ["workloadmonitors"]
+    resourceNames: ["{{ $base }}"]
+    verbs: ["get", "patch"]
+  # KubevirtMachineTemplates are hash-suffixed, so their names are not known at
+  # render time; list is needed to discover them and cannot be resourceName-scoped.
+  - apiGroups: ["infrastructure.cluster.x-k8s.io"]
+    resources: ["kubevirtmachinetemplates"]
+    verbs: ["get", "list", "patch"]
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: {{ .Release.Name }}-unpin
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "kubernetes.labels" . | nindent 4 }}
+  annotations:
+    helm.sh/hook: pre-delete
+    helm.sh/hook-weight: "-5"
+    helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: {{ .Release.Name }}-unpin
+subjects:
+  - kind: ServiceAccount
+    name: {{ .Release.Name }}-unpin
+    namespace: {{ .Release.Namespace }}
+---
+{{- /* The tenant-root chart installs a default-deny egress policy on every pod
+       in the tenant namespace; allow this Job to reach the management-cluster
+       apiserver (in-cluster API, IP-based, no DNS needed). Additive to the
+       tenant default-deny, scoped to the unpin pod label only. */}}
+apiVersion: cilium.io/v2
+kind: CiliumNetworkPolicy
+metadata:
+  name: {{ .Release.Name }}-unpin
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "kubernetes.labels" . | nindent 4 }}
+  annotations:
+    helm.sh/hook: pre-delete
+    helm.sh/hook-weight: "-5"
+    helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
+spec:
+  endpointSelector:
+    matchLabels:
+      cozystack.io/kubernetes-nodes-unpin: "{{ .Release.Name }}"
+  egress:
+    - toEntities:
+        - kube-apiserver
+---
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: {{ .Release.Name }}-unpin
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "kubernetes.labels" . | nindent 4 }}
+  annotations:
+    helm.sh/hook: pre-delete
+    helm.sh/hook-weight: "0"
+    # before-hook-creation (not hook-succeeded) so a failed run keeps its logs
+    # for debugging. Helm does not track hook resources as release members, so
+    # after `helm uninstall` a finished hook Job is NOT torn down with the
+    # release and would leak into the tenant namespace, one per deleted pool.
+    # ttlSecondsAfterFinished (below) is what actually reaps it.
+    helm.sh/hook-delete-policy: before-hook-creation
+spec:
+  # Garbage-collect the finished Job and its pod: a succeeded run is reaped after
+  # a day, a failed run keeps its logs that long for debugging. Without this the
+  # hook Job leaks per deleted pool per namespace, since Helm never owns it.
+  ttlSecondsAfterFinished: 86400
+  activeDeadlineSeconds: 300
+  backoffLimit: 3
+  template:
+    metadata:
+      labels:
+        {{- include "kubernetes.labels" . | nindent 8 }}
+        cozystack.io/kubernetes-nodes-unpin: "{{ .Release.Name }}"
+    spec:
+      restartPolicy: OnFailure
+      serviceAccountName: {{ .Release.Name }}-unpin
+      containers:
+        - name: unpin
+          image: "{{ $kubectlImage }}"
+          command: ["/bin/sh", "-c"]
+          args:
+            - |
+              set -eu
+              NS="{{ .Release.Namespace }}"
+              BASE="{{ $base }}"
+              echo "removing helm.sh/resource-policy from adopted worker objects for ${BASE}"
+              # unpin <resource> — remove the keep annotation only if present.
+              # --ignore-not-found folds absence (object already gone) into the
+              # same empty-output no-op branch as "present but unannotated" (a
+              # natively-created pool) — exactly the semantics this hook wants.
+              # A non-zero exit can then only be a real failure (RBAC/apiserver/
+              # conversion webhook), which set -e turns into a failed Job:
+              # backoffLimit/activeDeadlineSeconds bound the retries and the
+              # failed Job keeps its logs. Failures are NOT swallowed — a
+              # failure read as "absent" would skip the unpin, report success,
+              # and leak the keep-annotated objects (and their VMs) past the
+              # uninstall. stderr stays on the Job log, never in $pol: kubectl
+              # warns on successful reads (API deprecation, throttling), and a
+              # captured warning would fake a "pinned" state.
+              unpin() {
+                r=$1
+                pol=$(kubectl -n "${NS}" get "${r}" --ignore-not-found \
+                  -o jsonpath='{.metadata.annotations.helm\.sh/resource-policy}')
+                [ -n "${pol}" ] || return 0
+                kubectl -n "${NS}" annotate "${r}" "helm.sh/resource-policy-"
+              }
+              unpin "machinedeployment.cluster.x-k8s.io/${BASE}"
+              unpin "machinehealthcheck.cluster.x-k8s.io/${BASE}"
+              unpin "workloadmonitor.cozystack.io/${BASE}"
+              # Discover this pool's hash-suffixed KMTs. An API/RBAC failure here
+              # must fail the Job (set -e), not masquerade as an empty result and
+              # silently leak the keep-annotated templates on uninstall, the same
+              # "Failures are NOT swallowed" contract unpin() above holds. The one
+              # tolerated failure is a missing KubevirtMachineTemplate CRD: during a
+              # management-cluster CAPI teardown, or an already-Terminating
+              # namespace, the CRD can be gone, and there is then provably nothing
+              # to unpin -- failing would wedge the HR finalizer (backoffLimit
+              # exhausted) on a resource type that no longer exists. Distinguish it
+              # by kubectl's two deterministic RESTMapper messages (mirrors
+              # migration 56 list_kmts), never by a message that merely contains
+              # "not found". stderr is folded into the captured output only because
+              # the strict <BASE>-<6hex> grep below cannot match a kubectl warning
+              # line, so a success-path deprecation warning is harmlessly filtered.
+              if ! kmts=$(kubectl -n "${NS}" get kubevirtmachinetemplate.infrastructure.cluster.x-k8s.io \
+                       -o jsonpath='{range .items[*]}{.metadata.name}{"\n"}{end}' 2>&1); then
+                case "${kmts}" in
+                  *"the server doesn't have a resource type"*|*"no matches for kind"*)
+                    echo "KubevirtMachineTemplate CRD absent; nothing to unpin"; kmts="" ;;
+                  *)
+                    echo "ERROR: listing KubevirtMachineTemplates failed: ${kmts}" >&2; exit 1 ;;
+                esac
+              fi
+              for kmt in $(printf '%s\n' "${kmts}" | grep -E "^${BASE}-[0-9a-f]{6}$" || true); do
+                unpin "kubevirtmachinetemplate.infrastructure.cluster.x-k8s.io/${kmt}"
+              done
+              echo "unpin done"
+          securityContext:
+            allowPrivilegeEscalation: false
+            capabilities:
+              drop:
+                - ALL
+            readOnlyRootFilesystem: true
+            runAsNonRoot: true
+            runAsUser: 65532
+            seccompProfile:
+              type: RuntimeDefault
+          resources:
+            requests:
+              cpu: 10m
+              memory: 32Mi
+            limits:
+              cpu: 100m
+              memory: 128Mi
diff --git a/packages/apps/kubernetes-nodes/templates/talos-reconcile-job.yaml b/packages/apps/kubernetes-nodes/templates/talos-reconcile-job.yaml
new file mode 100644
index 0000000000..1f578d4d26
--- /dev/null
+++ b/packages/apps/kubernetes-nodes/templates/talos-reconcile-job.yaml
@@ -0,0 +1,401 @@
+{{- if eq (.Values.substrate | default "kubevirt") "proxmox" }}
+{{- include "kubernetes-nodes.assertDnsServersAreAddresses" . }}
+{{- end }}
+{{- /*
+  Main-phase Job (NOT a Helm hook) that produces this pool's TalosConfigTemplate
+  and patches the parent KamajiControlPlane.spec.network.certSANs with the live
+  apiserver Service ClusterIP.
+
+  The ClusterIP certSAN is a best-effort extra, not a worker-join requirement:
+  Talos workers dial the apiserver by DNS name (endpoint https://<release>.<ns>.svc
+  plus extraHostEntries below), so a cluster with zero pools — which never runs
+  this Job — is fine without the IP in the cert. A parent upgrade array-replaces
+  certSANs back to the two DNS names (a KamajiControlPlane merge-patch limitation
+  that predates the split); the next pool reconcile re-adds the ClusterIP. If a
+  future consumer ever needs the IP SAN on a pool-less control plane, that patch
+  belongs in the control-plane (kubernetes) chart, not here.
+
+  The Talos worker machineconfig needs values that only exist AFTER the parent
+  control-plane release has applied: the apiserver Service ClusterIP (emitted by
+  Kamaji), the Talos-CA Secret (issued by cert-manager from the parent's Talos
+  PKI), and the Kubernetes-CA Secret (generated by Kamaji). A Helm `lookup` for
+  any of these races on every fresh install, so this Job blocks until all four
+  inputs are observably present, then `kubectl apply`s the TalosConfigTemplate
+  (idempotent) with an ownerReference to the parent KamajiControlPlane so it is
+  garbage-collected on the parent's uninstall.
+
+  Cross-release ordering. The Job reads objects owned by the PARENT `kubernetes`
+  release (Service, Secrets, KamajiControlPlane named kubernetes-<cluster>). No
+  hard per-tenant dependsOn is possible across the two HelmReleases, so ordering
+  is handled at runtime by this Job's ~10-minute input-wait loop plus the
+  release.cozystack.io/helm-install-disable-wait annotation on the pool's
+  ApplicationDefinition.
+
+  Churn-free across upgrades. The Job is immutable, so it carries a content-hash
+  name suffix; an identical render yields the same name and Helm no-ops it. The
+  applied TalosConfigTemplate is itself content-hash named
+  (kubernetes-<cluster>-<group>-<hash of its spec>, referenced by
+  MachineDeployment.bootstrap.configRef — see _talosconfigtemplate.tpl for why),
+  so an unchanged render re-applies a byte-identical TCT under the same name: a
+  CAPI no-op that never rolls workers.
+*/}}
+{{- $clusterName := include "kubernetes-nodes.clusterName" . }}
+{{- $groupName := include "kubernetes-nodes.groupName" . }}
+{{- $dnsDomain := include "kubernetes.tenantClusterDomain" $ }}
+{{- /* The TalosConfigTemplate spec is immutable, so it can only ever be
+       created — never updated — and its name therefore carries a hash of the
+       machine config it holds (see _talosconfigtemplate.tpl). nodegroup.yaml
+       computes the same name for
+       MachineDeployment.spec.template.spec.bootstrap.configRef.
+
+       Both sides read the group from the same helper rather than each
+       assembling its own dict: the spec helper reads a subset of the keys, so
+       two assemblies would agree only by coincidence of that subset, and a key
+       dropped on one side alone would point the MachineDeployment at a
+       template this Job never creates. */}}
+{{- $group := include "kubernetes-nodes.group" $ | fromYaml }}
+{{- $tctArgs := dict "root" $ "group" $group }}
+{{- $tctSpec := include "kubernetes.talosConfigTemplateSpec" $tctArgs }}
+{{- $tctName := printf "%s-%s-%s" $clusterName $groupName (include "kubernetes.talosConfigTemplateHash" $tctArgs) }}
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ .Release.Name }}-talos-reconcile
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "kubernetes.labels" . | nindent 4 }}
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: {{ .Release.Name }}-talos-reconcile
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "kubernetes.labels" . | nindent 4 }}
+rules:
+  - apiGroups: [""]
+    resources: ["services"]
+    resourceNames: ["{{ $clusterName }}"]
+    verbs: ["get"]
+  - apiGroups: [""]
+    resources: ["secrets"]
+    resourceNames:
+      - "{{ $clusterName }}-talos-secrets"
+      - "{{ $clusterName }}-talos-ca"
+      - "{{ $clusterName }}-ca"
+    verbs: ["get"]
+  - apiGroups: ["controlplane.cluster.x-k8s.io"]
+    resources: ["kamajicontrolplanes"]
+    resourceNames: ["{{ $clusterName }}"]
+    verbs: ["get", "patch"]
+  {{- /* Split by verb because RBAC matches resourceNames on the verbs that name
+         an object and not on create, which has no name yet. Reading and writing
+         are pinned to this pool's own template: several clusters can share a
+         tenant namespace, and a Job that could patch a sibling pool's
+         TalosConfigTemplate could rewrite the machineconfig its next workers
+         boot. The name is the content-hash one the Job applies: a server-side
+         apply of a template that does not exist yet is still a PATCH on that
+         name, so a rule naming anything else leaves the Job Forbidden. Create
+         stays unnamed because RBAC gives no way to narrow it. */}}
+  - apiGroups: ["bootstrap.cluster.x-k8s.io"]
+    resources: ["talosconfigtemplates"]
+    resourceNames: [{{ $tctName | quote }}]
+    verbs: ["get", "patch", "update"]
+  - apiGroups: ["bootstrap.cluster.x-k8s.io"]
+    resources: ["talosconfigtemplates"]
+    verbs: ["create"]
+  {{- /* delete is separate and named: CABPT's validating webhook rejects any
+         change to spec, so a genuinely changed render can only be applied by
+         replacing the object.
+         Restricting it to this pool's own template keeps the Job unable to
+         remove anyone else's. */}}
+  - apiGroups: ["bootstrap.cluster.x-k8s.io"]
+    resources: ["talosconfigtemplates"]
+    resourceNames: [{{ $tctName | quote }}]
+    verbs: ["delete"]
+---
+{{- /* The tenant-root chart installs a default-deny egress policy on every
+       pod in the tenant namespace; without an explicit allow, this Job
+       cannot reach the management-cluster apiserver to read the Service
+       ClusterIP / Secrets / KamajiControlPlane it has to reconcile. Cilium
+       policies are additive, so this rule layers on top of the tenant
+       default-deny without weakening it for anything else. Endpoint
+       selector is scoped to pods carrying the reconcile label only. */}}
+apiVersion: cilium.io/v2
+kind: CiliumNetworkPolicy
+metadata:
+  name: {{ .Release.Name }}-talos-reconcile
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "kubernetes.labels" . | nindent 4 }}
+spec:
+  endpointSelector:
+    matchLabels:
+      cozystack.io/talos-reconcile: "{{ .Release.Name }}"
+  egress:
+    - toEntities:
+        - kube-apiserver
+    - toEndpoints:
+        - matchLabels:
+            "k8s:io.kubernetes.pod.namespace": kube-system
+            "k8s:k8s-app": kube-dns
+      toPorts:
+        - ports:
+            - port: "53"
+              protocol: UDP
+            - port: "53"
+              protocol: TCP
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: {{ .Release.Name }}-talos-reconcile
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "kubernetes.labels" . | nindent 4 }}
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: {{ .Release.Name }}-talos-reconcile
+subjects:
+  - kind: ServiceAccount
+    name: {{ .Release.Name }}-talos-reconcile
+    namespace: {{ .Release.Namespace }}
+---
+{{- /* Cluster-scoped read on the management CoreDNS Service so the Job
+       can look up its ClusterIP at runtime and inject it into the worker
+       machineconfig as a host-level nameserver. resourceNames pins the
+       grant to the single well-known Service name kube-dns. */}}
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: {{ .Release.Namespace }}-{{ .Release.Name }}-talos-reconcile-coredns
+  labels:
+    {{- include "kubernetes.labels" . | nindent 4 }}
+rules:
+  - apiGroups: [""]
+    resources: ["services"]
+    resourceNames: ["kube-dns"]
+    verbs: ["get"]
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: {{ .Release.Namespace }}-{{ .Release.Name }}-talos-reconcile-coredns
+  labels:
+    {{- include "kubernetes.labels" . | nindent 4 }}
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: {{ .Release.Namespace }}-{{ .Release.Name }}-talos-reconcile-coredns
+subjects:
+  - kind: ServiceAccount
+    name: {{ .Release.Name }}-talos-reconcile
+    namespace: {{ .Release.Namespace }}
+{{- /* Job spec rendered through a named template so the Job name can carry
+       a content hash of the whole spec. $.Release is the pool release (used for
+       the SA it runs as and its network-policy label); .clusterName targets the
+       parent control-plane objects (Service/Secrets/KCP/TCT). */}}
+{{- define "kubernetes-nodes.talos-reconcile-job-spec" -}}
+spec:
+  backoffLimit: 30
+  ttlSecondsAfterFinished: 600
+  template:
+    metadata:
+      labels:
+        cozystack.io/talos-reconcile: {{ $.Release.Name | quote }}
+    spec:
+      restartPolicy: OnFailure
+      serviceAccountName: {{ $.Release.Name }}-talos-reconcile
+      containers:
+        - name: kubectl
+          image: "{{ .kubectlImage }}"
+          env:
+            - name: RELEASE
+              value: {{ .clusterName | quote }}
+            - name: NS
+              value: {{ $.Release.Namespace | quote }}
+            - name: GROUP_NAME
+              value: {{ .groupName | quote }}
+            {{- /* Content-hash name of the TalosConfigTemplate this Job
+                   applies. Computed by the chart (not by the Job) so the
+                   MachineDeployment's bootstrap.configRef in nodegroup.yaml
+                   resolves to the exact same name. */}}
+            - name: TCT_NAME
+              value: {{ .tctName | quote }}
+            - name: TALOS_TOKEN
+              valueFrom:
+                secretKeyRef:
+                  name: {{ .clusterName }}-talos-secrets
+                  key: token
+            - name: CLUSTER_ID
+              valueFrom:
+                secretKeyRef:
+                  name: {{ .clusterName }}-talos-secrets
+                  key: clusterId
+            - name: CLUSTER_SECRET
+              valueFrom:
+                secretKeyRef:
+                  name: {{ .clusterName }}-talos-secrets
+                  key: clusterSecret
+            - name: BOOTSTRAP_TOKEN
+              valueFrom:
+                secretKeyRef:
+                  name: {{ .clusterName }}-talos-secrets
+                  key: bootstrapToken
+          command:
+            - sh
+            - -ec
+            - |
+              {{- /* The wording differs per substrate because the address does:
+                     a ClusterIP on kubevirt, the Service's LoadBalancer address
+                     on proxmox. */}}
+              {{- if eq ($.Values.substrate | default "kubevirt") "proxmox" }}
+              echo "[$(date -u +%H:%M:%S)] talos-reconcile/${GROUP_NAME}: waiting for apiserver Service LoadBalancer address, Talos CA, K8s CA, management CoreDNS"
+              {{- else }}
+              echo "[$(date -u +%H:%M:%S)] talos-reconcile/${GROUP_NAME}: waiting for Service ClusterIP, Talos CA, K8s CA, management CoreDNS"
+              {{- end }}
+              for i in $(seq 1 120); do
+                {{- /* Which address the workers must resolve the apiserver to.
+                      On kubevirt they are Pods in this cluster and the ClusterIP
+                      works. On proxmox they are VMs off-cluster, for which a
+                      ClusterIP is unroutable — the control-plane release
+                      publishes the Service instead, and its LoadBalancer address
+                      is the one that has to reach the guests. */}}
+                {{- if eq ($.Values.substrate | default "kubevirt") "proxmox" }}
+                SVC_IP=$(kubectl -n "$NS" get svc "$RELEASE" -o jsonpath='{.status.loadBalancer.ingress[0].ip}' 2>/dev/null || true)
+                {{- else }}
+                SVC_IP=$(kubectl -n "$NS" get svc "$RELEASE" -o jsonpath='{.spec.clusterIP}' 2>/dev/null || true)
+                {{- end }}
+                TALOS_CA_B64=$(kubectl -n "$NS" get secret "${RELEASE}-talos-ca" -o jsonpath='{.data.tls\.crt}' 2>/dev/null || true)
+                K8S_CA_B64=$(kubectl -n "$NS" get secret "${RELEASE}-ca" -o jsonpath='{.data.ca\.crt}' 2>/dev/null || true)
+                COREDNS_IP=$(kubectl -n kube-system get svc kube-dns -o jsonpath='{.spec.clusterIP}' 2>/dev/null || true)
+                if [ -n "$SVC_IP" ] && [ -n "$TALOS_CA_B64" ] && [ -n "$K8S_CA_B64" ] && [ -n "$COREDNS_IP" ]; then
+                  break
+                fi
+                sleep 5
+              done
+              if [ -z "$SVC_IP" ] || [ -z "$TALOS_CA_B64" ] || [ -z "$K8S_CA_B64" ] || [ -z "$COREDNS_IP" ]; then
+                echo "[$(date -u +%H:%M:%S)] timed out waiting for lookup inputs (svc='$SVC_IP' talos-ca=$([ -n "$TALOS_CA_B64" ] && echo ok) k8s-ca=$([ -n "$K8S_CA_B64" ] && echo ok) coredns='$COREDNS_IP')"
+                exit 1
+              fi
+              echo "[$(date -u +%H:%M:%S)] inputs ready (svc=${SVC_IP} coredns=${COREDNS_IP})"
+
+              # Patch KamajiControlPlane.spec.network.certSANs so the apiserver
+              # TLS cert covers the live Service ClusterIP that Talos workers
+              # dial. JSON-merge-patch is array-replace semantics, which is what
+              # we want here — Kamaji owns the full SAN list.
+              kubectl -n "$NS" patch kamajicontrolplane "$RELEASE" --type=merge --patch "$(
+                cat <<JSON
+              {"spec":{"network":{"certSANs":["${RELEASE}.${NS}.svc","${RELEASE}.${NS}.svc.{{ .dnsDomain }}","${SVC_IP}"]}}}
+              JSON
+              )"
+
+              KCP_UID=$(kubectl -n "$NS" get kamajicontrolplane "$RELEASE" -o jsonpath='{.metadata.uid}')
+
+              # Apply the TalosConfigTemplate. ownerReference back to the parent
+              # KamajiControlPlane makes the standard Kubernetes garbage collector
+              # clean it up when the parent cluster is deleted.
+              #
+              # The name carries a hash of the chart inputs to the spec below, so
+              # a machine-config change made through values lands on a NEW
+              # template instead of being rejected by the immutability webhook.
+              #
+              # Both applies below are server-side, which keeps the merge in the
+              # apiserver. A client-side apply pulls the full OpenAPI schema down
+              # to build the merge patch, ~290Mi RSS against a management cluster
+              # carrying a few hundred CRDs, over this container's 256Mi limit.
+              # Only the merge path pays that, so a create survives where an
+              # update is OOMKilled.
+              # --force-conflicts keeps this Job authoritative over an object an
+              # earlier client-side apply created.
+              {{- /* Held in a variable, not a file: the container runs with
+                     readOnlyRootFilesystem, so there is nowhere to write one.
+                     One variable also means the replace below applies exactly
+                     what the first attempt did. */}}
+              TCT_MANIFEST="$(cat <<EOF
+              apiVersion: bootstrap.cluster.x-k8s.io/v1alpha3
+              kind: TalosConfigTemplate
+              metadata:
+                name: ${TCT_NAME}
+                namespace: ${NS}
+                ownerReferences:
+                  - apiVersion: controlplane.cluster.x-k8s.io/v1alpha1
+                    kind: KamajiControlPlane
+                    name: ${RELEASE}
+                    uid: ${KCP_UID}
+                    controller: true
+                    blockOwnerDeletion: true
+              {{- .tctSpec | nindent 14 }}
+              EOF
+              )"
+
+              # CABPT's validating webhook rejects any change to spec
+              # (TalosConfigTemplate.Spec is immutable). A values change moves the
+              # name, but the ${...} runtime inputs are kept out of the hash, so
+              # one of them changing -- the apiserver address is the one that
+              # moves in practice -- renders a different spec under the same
+              # name, and apply fails. The object then has to be replaced rather
+              # than patched. Existing Machines are unaffected:
+              # their bootstrap data was rendered when they joined. Only Machines
+              # created afterwards read the new template, which is the intent.
+              #
+              # Every other apply failure still stops the Job. Matching on the
+              # message is narrow on purpose: an apply rejected for its content (a
+              # schema error, say) would be rejected again on the re-create, and a
+              # delete before it would leave the pool with no template at all,
+              # unable to scale until the render is fixed. A replace itself does
+              # not roll the pool: Machines reference the template by name, and
+              # a runtime input is not part of the name.
+              if ! APPLY_OUT="$(printf '%s\n' "$TCT_MANIFEST" | kubectl apply --server-side --force-conflicts -f - 2>&1)"; then
+                case "$APPLY_OUT" in
+                  *"is immutable"*)
+                    echo "[$(date -u +%H:%M:%S)] TalosConfigTemplate ${TCT_NAME} spec changed; replacing the immutable object"
+                    kubectl delete talosconfigtemplate "${TCT_NAME}" -n "$NS"
+                    printf '%s\n' "$TCT_MANIFEST" | kubectl apply --server-side --force-conflicts -f -
+                    ;;
+                  *)
+                    echo "$APPLY_OUT" >&2
+                    exit 1
+                    ;;
+                esac
+              fi
+              echo "[$(date -u +%H:%M:%S)] TalosConfigTemplate ${TCT_NAME} applied"
+          resources:
+            requests:
+              cpu: 10m
+              memory: 64Mi
+            limits:
+              cpu: 100m
+              memory: 256Mi
+          securityContext:
+            allowPrivilegeEscalation: false
+            capabilities:
+              drop:
+                - ALL
+            readOnlyRootFilesystem: true
+            runAsNonRoot: true
+            runAsUser: 65532
+            seccompProfile:
+              type: RuntimeDefault
+{{- end }}
+{{- $jobContext := deepCopy $ }}
+{{- $_ := set $jobContext "groupName" $groupName }}
+{{- $_ := set $jobContext "clusterName" $clusterName }}
+{{- $_ := set $jobContext "dnsDomain" $dnsDomain }}
+{{- $_ := set $jobContext "tctName" $tctName }}
+{{- $_ := set $jobContext "tctSpec" $tctSpec }}
+{{- $_ := set $jobContext "kubectlImage" (default ($.Files.Get "images/kubectl.tag" | trim) $.Values.images.kubectl) }}
+{{- $jobSpec := include "kubernetes-nodes.talos-reconcile-job-spec" $jobContext }}
+{{- $jobHash := $jobSpec | sha256sum | trunc 6 }}
+{{- $jobName := printf "%s-talos-reconcile-%s" $.Release.Name $groupName | trunc 56 | trimSuffix "-" }}
+---
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: {{ $jobName }}-{{ $jobHash }}
+  namespace: {{ $.Release.Namespace }}
+  labels:
+    {{- include "kubernetes.labels" $ | nindent 4 }}
+{{ $jobSpec }}
diff --git a/packages/apps/kubernetes-nodes/tests/__snapshot__/render_snapshot_test.yaml.snap b/packages/apps/kubernetes-nodes/tests/__snapshot__/render_snapshot_test.yaml.snap
new file mode 100644
index 0000000000..281fc12386
--- /dev/null
+++ b/packages/apps/kubernetes-nodes/tests/__snapshot__/render_snapshot_test.yaml.snap
@@ -0,0 +1,465 @@
+matches the golden render of a GPU pool:
+  1: |
+    apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
+    kind: KubevirtMachineTemplate
+    metadata:
+      name: kubernetes-myk8s-md0-8ed0ab
+      namespace: tenant-test
+    spec:
+      template:
+        spec:
+          virtualMachineBootstrapCheck:
+            checkStrategy: none
+          virtualMachineTemplate:
+            metadata:
+              labels: null
+              namespace: tenant-test
+            spec:
+              dataVolumeTemplates:
+                - metadata:
+                    annotations:
+                      cdi.kubevirt.io/storage.usePopulator: "false"
+                    name: disk-system
+                  spec:
+                    source:
+                      http:
+                        url: https://factory.talos.dev/image/ce4c980550dd2ab1b17bbf2b08801c7eb59418eafe8f279833297925d67c7515/v1.13.6/openstack-amd64.raw.xz
+                    storage:
+                      resources:
+                        requests:
+                          storage: 20Gi
+                      storageClassName: replicated
+              runStrategy: Always
+              template:
+                metadata:
+                  annotations:
+                    kubevirt.io/allow-pod-bridge-network-live-migration: "true"
+                  labels:
+                    apps.cozystack.io/application.group: apps.cozystack.io
+                    apps.cozystack.io/application.kind: Kubernetes
+                    apps.cozystack.io/application.name: myk8s
+                    cluster.x-k8s.io/deployment-name: kubernetes-myk8s-md0
+                spec:
+                  domain:
+                    cpu:
+                      cores: 4
+                      sockets: 1
+                      threads: 1
+                    devices:
+                      disks:
+                        - blockSize:
+                            custom:
+                              logical: 512
+                              physical: 4096
+                          disk:
+                            bus: virtio
+                            pciAddress: "0000:07:00.0"
+                          name: system
+                      gpus:
+                        - deviceName: nvidia.com/AD102GL_L40S
+                          name: gpu1
+                      interfaces:
+                        - bridge: {}
+                          name: default
+                    memory:
+                      guest: 8Gi
+                    resources:
+                      limits:
+                        ephemeral-storage: 2Gi
+                      requests:
+                        ephemeral-storage: "53687091"
+                  evictionStrategy: External
+                  networks:
+                    - name: default
+                      pod: {}
+                  volumes:
+                    - dataVolume:
+                        name: disk-system
+                      name: system
+  2: |
+    apiVersion: cluster.x-k8s.io/v1beta1
+    kind: MachineDeployment
+    metadata:
+      annotations:
+        capacity.cluster-autoscaler.kubernetes.io/cpu: 3600m
+        capacity.cluster-autoscaler.kubernetes.io/memory: 6800Mi
+        cluster.x-k8s.io/autoscaling-options-maxnodeprovisiontime: 30m
+        cluster.x-k8s.io/cluster-api-autoscaler-node-group-max-size: "3"
+        cluster.x-k8s.io/cluster-api-autoscaler-node-group-min-size: "0"
+      name: kubernetes-myk8s-md0
+      namespace: tenant-test
+    spec:
+      clusterName: kubernetes-myk8s
+      selector:
+        matchLabels:
+          cluster.x-k8s.io/cluster-name: kubernetes-myk8s
+          cluster.x-k8s.io/deployment-name: kubernetes-myk8s-md0
+      strategy:
+        rollingUpdate:
+          maxSurge: 3
+          maxUnavailable: 1
+        type: RollingUpdate
+      template:
+        metadata:
+          labels:
+            cluster.x-k8s.io/cluster-name: kubernetes-myk8s
+            cluster.x-k8s.io/deployment-name: kubernetes-myk8s-md0
+        spec:
+          bootstrap:
+            configRef:
+              apiVersion: bootstrap.cluster.x-k8s.io/v1alpha3
+              kind: TalosConfigTemplate
+              name: kubernetes-myk8s-md0-940c60
+              namespace: tenant-test
+          clusterName: kubernetes-myk8s
+          infrastructureRef:
+            apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
+            kind: KubevirtMachineTemplate
+            name: kubernetes-myk8s-md0-8ed0ab
+            namespace: tenant-test
+          version: v1.35.6
+  3: |
+    apiVersion: cluster.x-k8s.io/v1beta1
+    kind: MachineHealthCheck
+    metadata:
+      name: kubernetes-myk8s-md0
+      namespace: tenant-test
+    spec:
+      clusterName: kubernetes-myk8s
+      maxUnhealthy: 50%
+      nodeStartupTimeout: 20m
+      selector:
+        matchLabels:
+          cluster.x-k8s.io/cluster-name: kubernetes-myk8s
+          cluster.x-k8s.io/deployment-name: kubernetes-myk8s-md0
+      unhealthyConditions:
+        - status: Unknown
+          timeout: 5m
+          type: Ready
+        - status: "False"
+          timeout: 10m
+          type: Ready
+  4: |
+    apiVersion: cozystack.io/v1alpha1
+    kind: WorkloadMonitor
+    metadata:
+      name: kubernetes-myk8s-md0
+      namespace: tenant-test
+    spec:
+      kind: kubernetes
+      minReplicas: 0
+      selector:
+        cluster.x-k8s.io/cluster-name: kubernetes-myk8s
+        cluster.x-k8s.io/deployment-name: kubernetes-myk8s-md0
+        cluster.x-k8s.io/role: worker
+      type: worker
+      version: 0.0.0
+matches the golden render of a kubelet-override pool:
+  1: |
+    apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
+    kind: KubevirtMachineTemplate
+    metadata:
+      name: kubernetes-myk8s-md0-2d362e
+      namespace: tenant-test
+    spec:
+      template:
+        spec:
+          virtualMachineBootstrapCheck:
+            checkStrategy: none
+          virtualMachineTemplate:
+            metadata:
+              labels: null
+              namespace: tenant-test
+            spec:
+              dataVolumeTemplates:
+                - metadata:
+                    annotations:
+                      cdi.kubevirt.io/storage.usePopulator: "false"
+                    name: disk-system
+                  spec:
+                    source:
+                      http:
+                        url: https://factory.talos.dev/image/ce4c980550dd2ab1b17bbf2b08801c7eb59418eafe8f279833297925d67c7515/v1.13.6/openstack-amd64.raw.xz
+                    storage:
+                      resources:
+                        requests:
+                          storage: 20Gi
+                      storageClassName: replicated
+              runStrategy: Always
+              template:
+                metadata:
+                  annotations:
+                    kubevirt.io/allow-pod-bridge-network-live-migration: "true"
+                  labels:
+                    apps.cozystack.io/application.group: apps.cozystack.io
+                    apps.cozystack.io/application.kind: Kubernetes
+                    apps.cozystack.io/application.name: myk8s
+                    cluster.x-k8s.io/deployment-name: kubernetes-myk8s-md0
+                spec:
+                  domain:
+                    cpu:
+                      cores: 2
+                      sockets: 1
+                      threads: 1
+                    devices:
+                      disks:
+                        - blockSize:
+                            custom:
+                              logical: 512
+                              physical: 4096
+                          disk:
+                            bus: virtio
+                            pciAddress: "0000:07:00.0"
+                          name: system
+                      interfaces:
+                        - bridge: {}
+                          name: default
+                    memory:
+                      guest: 4Gi
+                    resources:
+                      limits:
+                        ephemeral-storage: 2Gi
+                      requests:
+                        ephemeral-storage: "53687091"
+                  evictionStrategy: External
+                  networks:
+                    - name: default
+                      pod: {}
+                  volumes:
+                    - dataVolume:
+                        name: disk-system
+                      name: system
+  2: |
+    apiVersion: cluster.x-k8s.io/v1beta1
+    kind: MachineDeployment
+    metadata:
+      annotations:
+        capacity.cluster-autoscaler.kubernetes.io/cpu: 1800m
+        capacity.cluster-autoscaler.kubernetes.io/memory: 2867Mi
+        cluster.x-k8s.io/autoscaling-options-maxnodeprovisiontime: 30m
+        cluster.x-k8s.io/cluster-api-autoscaler-node-group-max-size: "3"
+        cluster.x-k8s.io/cluster-api-autoscaler-node-group-min-size: "0"
+      name: kubernetes-myk8s-md0
+      namespace: tenant-test
+    spec:
+      clusterName: kubernetes-myk8s
+      selector:
+        matchLabels:
+          cluster.x-k8s.io/cluster-name: kubernetes-myk8s
+          cluster.x-k8s.io/deployment-name: kubernetes-myk8s-md0
+      strategy:
+        rollingUpdate:
+          maxSurge: 3
+          maxUnavailable: 1
+        type: RollingUpdate
+      template:
+        metadata:
+          labels:
+            cluster.x-k8s.io/cluster-name: kubernetes-myk8s
+            cluster.x-k8s.io/deployment-name: kubernetes-myk8s-md0
+        spec:
+          bootstrap:
+            configRef:
+              apiVersion: bootstrap.cluster.x-k8s.io/v1alpha3
+              kind: TalosConfigTemplate
+              name: kubernetes-myk8s-md0-db97de
+              namespace: tenant-test
+          clusterName: kubernetes-myk8s
+          infrastructureRef:
+            apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
+            kind: KubevirtMachineTemplate
+            name: kubernetes-myk8s-md0-2d362e
+            namespace: tenant-test
+          version: v1.35.6
+  3: |
+    apiVersion: cluster.x-k8s.io/v1beta1
+    kind: MachineHealthCheck
+    metadata:
+      name: kubernetes-myk8s-md0
+      namespace: tenant-test
+    spec:
+      clusterName: kubernetes-myk8s
+      maxUnhealthy: 50%
+      nodeStartupTimeout: 20m
+      selector:
+        matchLabels:
+          cluster.x-k8s.io/cluster-name: kubernetes-myk8s
+          cluster.x-k8s.io/deployment-name: kubernetes-myk8s-md0
+      unhealthyConditions:
+        - status: Unknown
+          timeout: 5m
+          type: Ready
+        - status: "False"
+          timeout: 10m
+          type: Ready
+  4: |
+    apiVersion: cozystack.io/v1alpha1
+    kind: WorkloadMonitor
+    metadata:
+      name: kubernetes-myk8s-md0
+      namespace: tenant-test
+    spec:
+      kind: kubernetes
+      minReplicas: 0
+      selector:
+        cluster.x-k8s.io/cluster-name: kubernetes-myk8s
+        cluster.x-k8s.io/deployment-name: kubernetes-myk8s-md0
+        cluster.x-k8s.io/role: worker
+      type: worker
+      version: 0.0.0
+matches the golden render of the pool objects:
+  1: |
+    apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
+    kind: KubevirtMachineTemplate
+    metadata:
+      name: kubernetes-myk8s-md0-a6ac3e
+      namespace: tenant-test
+    spec:
+      template:
+        spec:
+          virtualMachineBootstrapCheck:
+            checkStrategy: none
+          virtualMachineTemplate:
+            metadata:
+              labels:
+                node-role.kubernetes.io/ingress-nginx: ""
+              namespace: tenant-test
+            spec:
+              dataVolumeTemplates:
+                - metadata:
+                    annotations:
+                      cdi.kubevirt.io/storage.usePopulator: "false"
+                    name: disk-system
+                  spec:
+                    source:
+                      http:
+                        url: https://factory.talos.dev/image/ce4c980550dd2ab1b17bbf2b08801c7eb59418eafe8f279833297925d67c7515/v1.13.6/openstack-amd64.raw.xz
+                    storage:
+                      resources:
+                        requests:
+                          storage: 20Gi
+                      storageClassName: replicated
+              runStrategy: Always
+              template:
+                metadata:
+                  annotations:
+                    kubevirt.io/allow-pod-bridge-network-live-migration: "true"
+                  labels:
+                    apps.cozystack.io/application.group: apps.cozystack.io
+                    apps.cozystack.io/application.kind: Kubernetes
+                    apps.cozystack.io/application.name: myk8s
+                    cluster.x-k8s.io/deployment-name: kubernetes-myk8s-md0
+                    node-role.kubernetes.io/ingress-nginx: ""
+                spec:
+                  domain:
+                    cpu:
+                      cores: 2
+                      sockets: 1
+                      threads: 1
+                    devices:
+                      disks:
+                        - blockSize:
+                            custom:
+                              logical: 512
+                              physical: 4096
+                          disk:
+                            bus: virtio
+                            pciAddress: "0000:07:00.0"
+                          name: system
+                      interfaces:
+                        - bridge: {}
+                          name: default
+                    memory:
+                      guest: 4Gi
+                    resources:
+                      limits:
+                        ephemeral-storage: 2Gi
+                      requests:
+                        ephemeral-storage: "53687091"
+                  evictionStrategy: External
+                  networks:
+                    - name: default
+                      pod: {}
+                  volumes:
+                    - dataVolume:
+                        name: disk-system
+                      name: system
+  2: |
+    apiVersion: cluster.x-k8s.io/v1beta1
+    kind: MachineDeployment
+    metadata:
+      annotations:
+        capacity.cluster-autoscaler.kubernetes.io/cpu: 1800m
+        capacity.cluster-autoscaler.kubernetes.io/memory: 3297Mi
+        cluster.x-k8s.io/autoscaling-options-maxnodeprovisiontime: 30m
+        cluster.x-k8s.io/cluster-api-autoscaler-node-group-max-size: "3"
+        cluster.x-k8s.io/cluster-api-autoscaler-node-group-min-size: "0"
+      name: kubernetes-myk8s-md0
+      namespace: tenant-test
+    spec:
+      clusterName: kubernetes-myk8s
+      selector:
+        matchLabels:
+          cluster.x-k8s.io/cluster-name: kubernetes-myk8s
+          cluster.x-k8s.io/deployment-name: kubernetes-myk8s-md0
+      strategy:
+        rollingUpdate:
+          maxSurge: 3
+          maxUnavailable: 1
+        type: RollingUpdate
+      template:
+        metadata:
+          labels:
+            cluster.x-k8s.io/cluster-name: kubernetes-myk8s
+            cluster.x-k8s.io/deployment-name: kubernetes-myk8s-md0
+            node-role.kubernetes.io/ingress-nginx: ""
+        spec:
+          bootstrap:
+            configRef:
+              apiVersion: bootstrap.cluster.x-k8s.io/v1alpha3
+              kind: TalosConfigTemplate
+              name: kubernetes-myk8s-md0-ffdbe1
+              namespace: tenant-test
+          clusterName: kubernetes-myk8s
+          infrastructureRef:
+            apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
+            kind: KubevirtMachineTemplate
+            name: kubernetes-myk8s-md0-a6ac3e
+            namespace: tenant-test
+          version: v1.35.6
+  3: |
+    apiVersion: cluster.x-k8s.io/v1beta1
+    kind: MachineHealthCheck
+    metadata:
+      name: kubernetes-myk8s-md0
+      namespace: tenant-test
+    spec:
+      clusterName: kubernetes-myk8s
+      maxUnhealthy: 50%
+      nodeStartupTimeout: 20m
+      selector:
+        matchLabels:
+          cluster.x-k8s.io/cluster-name: kubernetes-myk8s
+          cluster.x-k8s.io/deployment-name: kubernetes-myk8s-md0
+      unhealthyConditions:
+        - status: Unknown
+          timeout: 5m
+          type: Ready
+        - status: "False"
+          timeout: 10m
+          type: Ready
+  4: |
+    apiVersion: cozystack.io/v1alpha1
+    kind: WorkloadMonitor
+    metadata:
+      name: kubernetes-myk8s-md0
+      namespace: tenant-test
+    spec:
+      kind: kubernetes
+      minReplicas: 0
+      selector:
+        cluster.x-k8s.io/cluster-name: kubernetes-myk8s
+        cluster.x-k8s.io/deployment-name: kubernetes-myk8s-md0
+        cluster.x-k8s.io/role: worker
+      type: worker
+      version: 0.0.0
diff --git a/packages/apps/kubernetes-nodes/tests/cluster_release_name_test.yaml b/packages/apps/kubernetes-nodes/tests/cluster_release_name_test.yaml
new file mode 100644
index 0000000000..0721bdf8da
--- /dev/null
+++ b/packages/apps/kubernetes-nodes/tests/cluster_release_name_test.yaml
@@ -0,0 +1,97 @@
+suite: clusterReleaseName override wires the pool to a non-conventional parent
+
+# The pool chart normally derives the parent cluster as kubernetes-<cluster>,
+# the aggregated API's HelmRelease naming convention, and every rendered object
+# (KMT/MD/MHC names, MachineDeployment spec.clusterName, the WorkloadMonitor
+# selector) is keyed off it. A wrapper whose cluster release name is off that
+# convention — the ComputePlane module fixes its cluster release to
+# computeplane-cluster for the admin-kubeconfig Secret contract — cannot be
+# reached by that derivation, so it sets clusterReleaseName explicitly. These
+# cases pin both directions: the override retargets every reference, and the
+# default (no override) stays byte-identical to what the API produces.
+#
+# instanceType is "" with explicit resources for the same reason as the snapshot
+# suite: the instancetype-sized branch resolves via lookup, which returns nil
+# under helm unittest.
+
+templates:
+  - templates/nodegroup.yaml
+
+set:
+  _cluster:
+    cluster-domain: cozy.local
+  version: "v1.35"
+  minReplicas: 0
+  maxReplicas: 3
+  instanceType: ""
+  diskSize: 20Gi
+  storageClass: replicated
+  roles:
+    - ingress-nginx
+  resources:
+    cpu: "2"
+    memory: 4Gi
+
+tests:
+  - it: retargets every object name and CAPI reference when clusterReleaseName is set
+    release:
+      name: kubernetes-nodes-computeplane-cluster-md0
+      namespace: tenant-alice
+    set:
+      cluster: computeplane-cluster
+      clusterReleaseName: computeplane-cluster
+    asserts:
+      # MachineDeployment: object name and the CAPI cluster it attaches to
+      - equal:
+          path: metadata.name
+          value: computeplane-cluster-md0
+        documentSelector:
+          path: kind
+          value: MachineDeployment
+      - equal:
+          path: spec.clusterName
+          value: computeplane-cluster
+        documentSelector:
+          path: kind
+          value: MachineDeployment
+      # KubevirtMachineTemplate name is content-hash-suffixed; assert the prefix
+      - matchRegex:
+          path: metadata.name
+          pattern: ^computeplane-cluster-md0-[0-9a-f]{6}$
+        documentSelector:
+          path: kind
+          value: KubevirtMachineTemplate
+      # MachineHealthCheck object name
+      - equal:
+          path: metadata.name
+          value: computeplane-cluster-md0
+        documentSelector:
+          path: kind
+          value: MachineHealthCheck
+      # No object retains the derived kubernetes-<cluster> name
+      - notMatchRegex:
+          path: metadata.name
+          pattern: ^kubernetes-computeplane-cluster
+        documentSelector:
+          path: kind
+          value: MachineDeployment
+
+  - it: derives kubernetes-<cluster> when clusterReleaseName is unset (API path unchanged)
+    release:
+      name: kubernetes-nodes-myk8s-md0
+      namespace: tenant-test
+    set:
+      cluster: myk8s
+    asserts:
+      - equal:
+          path: metadata.name
+          value: kubernetes-myk8s-md0
+        documentSelector:
+          path: kind
+          value: MachineDeployment
+      - equal:
+          path: spec.clusterName
+          value: kubernetes-myk8s
+        documentSelector:
+          path: kind
+          value: MachineDeployment
diff --git a/packages/apps/kubernetes-nodes/tests/clustername_drift_test.yaml b/packages/apps/kubernetes-nodes/tests/clustername_drift_test.yaml
new file mode 100644
index 0000000000..57c4f79ff3
--- /dev/null
+++ b/packages/apps/kubernetes-nodes/tests/clustername_drift_test.yaml
@@ -0,0 +1,128 @@
+suite: worker pool clusterName-drift guard (assertNoForeignPool)
+
+# assertNoForeignPool reconstructs the pool MachineDeployment name
+# kubernetes-<cluster>-<pool> and looks it up. Beyond the pre-existing
+# foreign-owner branch, it refuses the render when a live MD of that name is
+# owned by this release but its spec.clusterName disagrees with the clusterName
+# this pool renders: that is the fingerprint of a post-create .Values.cluster
+# edit (immutable, but only dashboard-enforced) that keeps object names
+# identical while silently drifting the WorkloadMonitor selector. A matching
+# clusterName renders normally; offline (nil lookup) the guard is inert.
+#
+# The scheme registers every kind nodegroup.yaml looks up (KamajiControlPlane
+# for assertParentVersion; MachineDeployment for this guard; MachineSet and
+# KubevirtMachineTemplate for the preserve-KMT LIST) so the fake client does
+# not error once a provider is set. The parent KamajiControlPlane sits at
+# v1.34.9 and the pool at v1.34 so assertParentVersion passes and the render
+# reaches this guard.
+templates:
+  - templates/nodegroup.yaml
+release:
+  name: kubernetes-nodes-myk8s-md0
+  namespace: tenant-test
+set:
+  cluster: myk8s
+  _cluster:
+    cluster-domain: cozy.local
+  version: "v1.34"
+  minReplicas: 0
+  maxReplicas: 3
+  instanceType: ""
+  diskSize: 20Gi
+  storageClass: replicated
+  roles:
+    - ingress-nginx
+  resources:
+    cpu: "2"
+    memory: 4Gi
+tests:
+  - it: refuses to render when the live MachineDeployment clusterName drifts from this pool
+    kubernetesProvider:
+      scheme: &scheme
+        "controlplane.cluster.x-k8s.io/v1alpha1/KamajiControlPlane":
+          gvr:
+            group: "controlplane.cluster.x-k8s.io"
+            version: "v1alpha1"
+            resource: "kamajicontrolplanes"
+          namespaced: true
+        "cluster.x-k8s.io/v1beta1/MachineDeployment":
+          gvr:
+            group: "cluster.x-k8s.io"
+            version: "v1beta1"
+            resource: "machinedeployments"
+          namespaced: true
+        "cluster.x-k8s.io/v1beta1/MachineSet":
+          gvr:
+            group: "cluster.x-k8s.io"
+            version: "v1beta1"
+            resource: "machinesets"
+          namespaced: true
+        "infrastructure.cluster.x-k8s.io/v1alpha1/KubevirtMachineTemplate":
+          gvr:
+            group: "infrastructure.cluster.x-k8s.io"
+            version: "v1alpha1"
+            resource: "kubevirtmachinetemplates"
+          namespaced: true
+      objects:
+        - &kcp
+          kind: KamajiControlPlane
+          apiVersion: controlplane.cluster.x-k8s.io/v1alpha1
+          metadata:
+            name: kubernetes-myk8s
+            namespace: tenant-test
+          spec:
+            version: v1.34.9
+        - &schemeMachineSet
+          kind: MachineSet
+          apiVersion: cluster.x-k8s.io/v1beta1
+          metadata:
+            name: scheme-registration-only
+            namespace: scheme-registration-only
+          spec:
+            template:
+              spec:
+                infrastructureRef:
+                  kind: KubevirtMachineTemplate
+                  name: none
+        - &schemeKmt
+          kind: KubevirtMachineTemplate
+          apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
+          metadata:
+            name: scheme-registration-only
+            namespace: scheme-registration-only
+          spec: {}
+        - kind: MachineDeployment
+          apiVersion: cluster.x-k8s.io/v1beta1
+          metadata:
+            name: kubernetes-myk8s-md0
+            namespace: tenant-test
+            annotations:
+              meta.helm.sh/release-name: kubernetes-nodes-myk8s-md0
+          spec:
+            clusterName: kubernetes-otherowner
+    asserts:
+      - failedTemplate:
+          errorPattern: "spec.clusterName"
+
+  - it: renders when the live MachineDeployment clusterName matches this pool
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - *kcp
+        - *schemeMachineSet
+        - *schemeKmt
+        - kind: MachineDeployment
+          apiVersion: cluster.x-k8s.io/v1beta1
+          metadata:
+            name: kubernetes-myk8s-md0
+            namespace: tenant-test
+            annotations:
+              meta.helm.sh/release-name: kubernetes-nodes-myk8s-md0
+          spec:
+            clusterName: kubernetes-myk8s
+    asserts:
+      - documentSelector:
+          path: kind
+          value: MachineDeployment
+        exists:
+          path: metadata.name
diff --git a/packages/apps/kubernetes-nodes/tests/kernel_modules_test.yaml b/packages/apps/kubernetes-nodes/tests/kernel_modules_test.yaml
new file mode 100644
index 0000000000..aaf39cedb9
--- /dev/null
+++ b/packages/apps/kubernetes-nodes/tests/kernel_modules_test.yaml
@@ -0,0 +1,243 @@
+suite: worker kernel modules (machine.kernel.modules) tests
+
+# A Talos system extension installs a kernel module but does not load it. Loading
+# is `machine.kernel.modules`' job, and until this field existed the chart emitted
+# no such block and no values key could add one — a GPU pool came up with the
+# NVIDIA extension present, the module never loaded, and nothing reported it: the
+# VM held the PCI device, the node advertised no GPU, no component logged an error.
+# Found in production on Cozystack 1.6.0 (cozystack/cozystack#3563).
+#
+# The TalosConfigTemplate is not a rendered object — the chart emits a Job whose
+# container command carries the TCT as a string literal that the Job applies at
+# runtime, so the machine config is reached through matchRegex on that literal.
+#
+# The patterns below pin absolute indentation (`\n {10}kernel:` and so on) rather
+# than `\s+`, because indentation is the failure mode worth guarding: `modules:` one
+# level out is still valid YAML, is still accepted by the apiserver, and silently
+# loads nothing. If the Job's shell script is ever reindented as a whole, these
+# counts move with it — read them off the rendered `data: |` block, do not relax
+# them to `\s+`.
+
+templates:
+  - templates/talos-reconcile-job.yaml
+release:
+  name: kubernetes-nodes-myk8s-md0
+  namespace: tenant-test
+set:
+  cluster: myk8s
+  _cluster:
+    cluster-domain: cozy.local
+  version: "v1.35"
+  minReplicas: 0
+  maxReplicas: 3
+  instanceType: ""
+  diskSize: 20Gi
+  storageClass: replicated
+  roles: []
+  resources:
+    cpu: "4"
+    memory: 8Gi
+
+tests:
+  - it: emits the NVIDIA module set, in dependency order, for an nvidia.com GPU pool
+    set:
+      gpus:
+        - name: nvidia.com/GB202_RTX_PRO_6000
+    asserts:
+      # `nvidia` must come first (the other three depend on it) and `nvidia_uvm`
+      # must be present or any CUDA workload fails on unified memory. Talos loads
+      # the list in order, so this pins the order, not just the set.
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: '\n {10}kernel:\n {12}modules:\n {14}- name: nvidia\n {14}  parameters:\n {14}  - NVreg_NvLinkDisable=1\n {14}- name: nvidia_uvm\n {14}- name: nvidia_drm\n {14}- name: nvidia_modeset\n'
+        documentSelector:
+          path: kind
+          value: Job
+
+  - it: emits no kernel block for a pool with neither GPUs nor kernelModules
+    set:
+      gpus: []
+    asserts:
+      # The machine config of an ordinary pool must be exactly what it was before
+      # this field existed. Anything emitted here changes the config every existing
+      # worker would be reconciled to, for no reason. `kernel` appears nowhere else
+      # in the machine config, so the bare token is a sound guard.
+      - notMatchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: 'kernel:'
+        documentSelector:
+          path: kind
+          value: Job
+
+  - it: takes an explicit kernelModules list verbatim, including parameters
+    set:
+      gpus: []
+      kernelModules:
+        - name: br_netfilter
+          parameters:
+            - nf_conntrack_helper=0
+        - name: dummy
+    asserts:
+      # Nothing about the field is NVIDIA-specific, and `parameters` has to survive
+      # the round trip through the machine config.
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: '\n {10}kernel:\n {12}modules:\n {14}- name: br_netfilter\n {14}  parameters:\n {14}  - nf_conntrack_helper=0\n {14}- name: dummy\n'
+        documentSelector:
+          path: kind
+          value: Job
+
+  - it: lets an explicit list replace the NVIDIA default on a GPU pool
+    set:
+      gpus:
+        - name: nvidia.com/GB202_RTX_PRO_6000
+      kernelModules:
+        - name: nvidia
+        - name: nvidia_uvm
+    asserts:
+      # Replaces, does not merge: an operator who lists a subset gets the subset.
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: '\n {10}kernel:\n {12}modules:\n {14}- name: nvidia\n {14}- name: nvidia_uvm\n {10}kubelet:\n'
+        documentSelector:
+          path: kind
+          value: Job
+      - notMatchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: 'nvidia_drm'
+        documentSelector:
+          path: kind
+          value: Job
+
+  - it: treats an explicit empty kernelModules list as an opt-out on a GPU pool
+    set:
+      gpus:
+        - name: nvidia.com/GB202_RTX_PRO_6000
+      kernelModules: []
+    asserts:
+      # `[]` is distinguishable from unset and means "emit nothing". This is why the
+      # field is undefaulted in values.yaml — a `[]` default there would turn every
+      # pool into an opt-out and make the NVIDIA default dead code.
+      - notMatchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: 'kernel:'
+        documentSelector:
+          path: kind
+          value: Job
+      # The gpu=on label is independent of the modules and must survive the opt-out.
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: 'nodeLabels:\s*\n\s+gpu: "on"'
+        documentSelector:
+          path: kind
+          value: Job
+
+  - it: does not assume NVIDIA for a GPU pool from another vendor
+    set:
+      gpus:
+        - name: amd.com/gpu
+    asserts:
+      # The automatic set is keyed on the `nvidia.com/` resource prefix, not on the
+      # mere presence of `gpus`. Loading nvidia modules on an AMD node would be a
+      # guess with no basis; such a pool declares its own list.
+      - notMatchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: 'kernel:'
+        documentSelector:
+          path: kind
+          value: Job
+
+  # These values reach the unquoted `cat <<EOF` heredoc in the Job's shell script,
+  # so a `$(...)` in them would execute inside the talos-reconcile pod, whose
+  # ServiceAccount can write TalosConfigTemplates and read Talos secrets. They come from a tenant-facing CR, and cozyvalues-gen has no
+  # `pattern` vocabulary, so the render is the only place left to stop them.
+  - it: rejects a module name that could inject shell into the reconcile Job
+    set:
+      gpus: []
+      kernelModules:
+        - name: nvidia$(id)
+    asserts:
+      - failedTemplate:
+          errorPattern: 'invalid kernelModules name "nvidia\$\(id\)"'
+
+  - it: rejects a module parameter that could inject shell into the reconcile Job
+    set:
+      gpus: []
+      kernelModules:
+        - name: nvidia
+          parameters:
+            - "opt=$(cat /etc/passwd)"
+    asserts:
+      - failedTemplate:
+          errorPattern: 'invalid kernelModules parameter'
+
+  # RE2's `\s` and `[:cntrl:]` are ASCII-only, so a deny class built from them
+  # alone passes U+2028 and U+2029. `toYaml` writes either raw inside a quoted
+  # scalar, and Helm's YAML parser reads it as a line break that ends the Job's
+  # `command` block scalar early and hands what follows to the manifest parser.
+  # The refusal has to come from the guard, not from that manifest happening not
+  # to parse, so these assert the kernelModules message rather than any failure.
+  - it: rejects a module parameter carrying a Unicode line separator
+    set:
+      gpus: []
+      kernelModules:
+        - name: nvidia
+          parameters:
+            - "a=1\u2028EOF\u2028id>/tmp/x"
+    asserts:
+      - failedTemplate:
+          errorPattern: 'invalid kernelModules parameter'
+
+  - it: rejects a module parameter carrying a Unicode paragraph separator
+    set:
+      gpus: []
+      kernelModules:
+        - name: nvidia
+          parameters:
+            - "a=1\u2029EOF\u2029id>/tmp/x"
+    asserts:
+      - failedTemplate:
+          errorPattern: 'invalid kernelModules parameter'
+
+  - it: drops an unvalidated extra key on a kernelModules item
+    set:
+      gpus: []
+      kernelModules:
+        - name: dummy
+          evil: "$(touch /tmp/pwned)"
+    asserts:
+      # The emitted list is rebuilt from validated fields, so an unknown key cannot
+      # reach the shell even though nothing prunes it upstream: `items` in
+      # values.schema.json has no `additionalProperties: false`, and the aggregated
+      # apiserver wires that schema into defaulting only, with no validation on write.
+      - notMatchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: 'evil|touch /tmp/pwned'
+        documentSelector:
+          path: kind
+          value: Job
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: '\n {10}kernel:\n {12}modules:\n {14}- name: dummy\n'
+        documentSelector:
+          path: kind
+          value: Job
+
+  - it: accepts a semicolon-separated module parameter
+    set:
+      gpus: []
+      kernelModules:
+        - name: nvidia
+          parameters:
+            - NVreg_RegistryDwords=PowerMizerEnable=0x1;PerfLevelSrc=0x2222
+    asserts:
+      # NVIDIA's documented multi-value form is semicolon-separated, and `;` is inert
+      # inside an unquoted heredoc. An allowlist that omitted it rejected a legitimate
+      # parameter, so this class denies what the shell expands rather than permitting
+      # a fixed set.
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: '\n {14}  - NVreg_RegistryDwords=PowerMizerEnable=0x1;PerfLevelSrc=0x2222\n'
+        documentSelector:
+          path: kind
+          value: Job
diff --git a/packages/apps/kubernetes-nodes/tests/kubelet_reservation_test.yaml b/packages/apps/kubernetes-nodes/tests/kubelet_reservation_test.yaml
new file mode 100644
index 0000000000..57ae0b476c
--- /dev/null
+++ b/packages/apps/kubernetes-nodes/tests/kubelet_reservation_test.yaml
@@ -0,0 +1,77 @@
+suite: kubelet reservation validation
+
+# The kubelet-reservation branch (quantity-format regexes, positive-value and
+# eviction-threshold invariants) moved verbatim from the parent chart into
+# nodegroup.yaml. These failure-path guards reject malformed input at render
+# time before a broken machineconfig reaches a worker. Ported from the parent
+# chart's kubelet_reservation_test.
+
+templates:
+  - templates/nodegroup.yaml
+
+release:
+  name: kubernetes-nodes-myk8s-md0
+  namespace: tenant-test
+
+set:
+  cluster: myk8s
+  _cluster:
+    cluster-domain: cozy.local
+  version: "v1.35"
+  minReplicas: 0
+  maxReplicas: 3
+  instanceType: ""
+  diskSize: 20Gi
+  storageClass: replicated
+  roles: []
+  resources:
+    cpu: "2"
+    memory: 4Gi
+
+tests:
+  - it: accepts valid kubelet reservation overrides
+    set:
+      kubelet:
+        systemReservedMemory: 512Mi
+        kubeReservedMemory: 512Mi
+        systemReservedCpu: 100m
+        kubeReservedCpu: 100m
+        evictionHardMemory: 5%
+        evictionSoftMemory: 8%
+    asserts:
+      - hasDocuments:
+          count: 4
+
+  - it: rejects an invalid kubelet memory quantity
+    set:
+      kubelet:
+        systemReservedMemory: "not-a-quantity"
+    asserts:
+      - failedTemplate:
+          errorPattern: "invalid systemReservedMemory value"
+
+  - it: rejects an invalid kubelet cpu quantity
+    set:
+      kubelet:
+        systemReservedCpu: "abc"
+    asserts:
+      - failedTemplate:
+          errorPattern: "invalid systemReservedCpu value"
+
+  - it: rejects evictionHard >= evictionSoft (percentage)
+    set:
+      kubelet:
+        evictionHardMemory: "12%"
+        evictionSoftMemory: "10%"
+    asserts:
+      - failedTemplate:
+          errorPattern: "must be strictly less than evictionSoftMemory"
+
+  - it: rejects mixed-unit eviction thresholds
+    set:
+      kubelet:
+        evictionHardMemory: "500Mi"
+        evictionSoftMemory: "10%"
+    asserts:
+      - failedTemplate:
+          errorPattern: "must use the same unit type"
diff --git a/packages/apps/kubernetes-nodes/tests/max_node_provision_time_test.yaml b/packages/apps/kubernetes-nodes/tests/max_node_provision_time_test.yaml
new file mode 100644
index 0000000000..1cb6d51fae
--- /dev/null
+++ b/packages/apps/kubernetes-nodes/tests/max_node_provision_time_test.yaml
@@ -0,0 +1,128 @@
+suite: cluster-autoscaler maxNodeProvisionTime annotation
+
+# The autoscaler reads its per-node-group option overrides off the same object
+# as the min/max-size annotations, under the key
+# `<CAPI group>/autoscaling-options-<lowercased option name>`. Both halves are
+# easy to get wrong and neither fails loudly: a misspelled key is simply not an
+# option the autoscaler knows, and a duration it cannot parse is discarded in
+# favour of its own default. Either way the pool silently keeps the built-in
+# provision timeout instead of the configured one.
+
+templates:
+  - templates/nodegroup.yaml
+
+release:
+  name: kubernetes-nodes-myk8s-md0
+  namespace: tenant-test
+
+set:
+  cluster: myk8s
+  _cluster:
+    cluster-domain: cozy.local
+  version: "v1.35"
+  minReplicas: 0
+  maxReplicas: 3
+  instanceType: ""
+  diskSize: 20Gi
+  storageClass: replicated
+  roles:
+    - ingress-nginx
+  resources:
+    cpu: "2"
+    memory: 4Gi
+
+tests:
+  - it: annotates the MachineDeployment with the chart-default provision time
+    documentSelector:
+      path: kind
+      value: MachineDeployment
+    asserts:
+      - equal:
+          path: metadata.annotations["cluster.x-k8s.io/autoscaling-options-maxnodeprovisiontime"]
+          value: "30m"
+
+  - it: passes a configured provision time through verbatim
+    set:
+      maxNodeProvisionTime: "45m"
+    documentSelector:
+      path: kind
+      value: MachineDeployment
+    asserts:
+      - equal:
+          path: metadata.annotations["cluster.x-k8s.io/autoscaling-options-maxnodeprovisiontime"]
+          value: "45m"
+
+  - it: accepts a compound Go duration
+    set:
+      maxNodeProvisionTime: "1h30m"
+    documentSelector:
+      path: kind
+      value: MachineDeployment
+    asserts:
+      - equal:
+          path: metadata.annotations["cluster.x-k8s.io/autoscaling-options-maxnodeprovisiontime"]
+          value: "1h30m"
+
+  - it: accepts the canonical Go rendering of a duration
+    set:
+      maxNodeProvisionTime: "1h0m0s"
+    documentSelector:
+      path: kind
+      value: MachineDeployment
+    asserts:
+      - equal:
+          path: metadata.annotations["cluster.x-k8s.io/autoscaling-options-maxnodeprovisiontime"]
+          value: "1h0m0s"
+
+  - it: accepts a zero tail segment, which metav1.Duration serializes
+    set:
+      maxNodeProvisionTime: "20m0s"
+    documentSelector:
+      path: kind
+      value: MachineDeployment
+    asserts:
+      - equal:
+          path: metadata.annotations["cluster.x-k8s.io/autoscaling-options-maxnodeprovisiontime"]
+          value: "20m0s"
+
+  - it: rejects a provision time carrying no unit
+    set:
+      maxNodeProvisionTime: "30"
+    asserts:
+      - failedTemplate:
+          errorMessage: 'maxNodeProvisionTime must be a whole number of s, m or h (e.g. 30m, 1h30m), got "30"'
+
+  - it: rejects a unit the Go duration parser does not know
+    set:
+      maxNodeProvisionTime: "30min"
+    asserts:
+      - failedTemplate:
+          errorMessage: 'maxNodeProvisionTime must be a whole number of s, m or h (e.g. 30m, 1h30m), got "30min"'
+
+  - it: rejects a negative provision time
+    set:
+      maxNodeProvisionTime: "-30m"
+    asserts:
+      - failedTemplate:
+          errorMessage: 'maxNodeProvisionTime must be a whole number of s, m or h (e.g. 30m, 1h30m), got "-30m"'
+
+  - it: rejects a zero provision time, which the duration parser accepts
+    set:
+      maxNodeProvisionTime: "0s"
+    asserts:
+      - failedTemplate:
+          errorMessage: 'maxNodeProvisionTime must be a whole number of s, m or h (e.g. 30m, 1h30m), got "0s"'
+
+  - it: rejects a duration too large for the parser to represent
+    set:
+      maxNodeProvisionTime: "9999999h"
+    asserts:
+      - failedTemplate:
+          errorMessage: 'maxNodeProvisionTime must be a whole number of s, m or h (e.g. 30m, 1h30m), got "9999999h"'
+
+  - it: rejects a fraction that the parser rounds down to zero
+    set:
+      maxNodeProvisionTime: "0.1ns"
+    asserts:
+      - failedTemplate:
+          errorMessage: 'maxNodeProvisionTime must be a whole number of s, m or h (e.g. 30m, 1h30m), got "0.1ns"'
diff --git a/packages/apps/kubernetes-nodes/tests/mhc_rendering_test.yaml b/packages/apps/kubernetes-nodes/tests/mhc_rendering_test.yaml
new file mode 100644
index 0000000000..92603df9b0
--- /dev/null
+++ b/packages/apps/kubernetes-nodes/tests/mhc_rendering_test.yaml
@@ -0,0 +1,80 @@
+suite: MachineHealthCheck maxUnhealthy int-vs-percent rendering
+
+# CAPI MachineHealthCheck admission accepts spec.maxUnhealthy as an IntOrString
+# but rejects a bare numeric STRING ("0"): a percentage must be a quoted string
+# and a count must be an unquoted int. nodegroup.yaml renders it as
+#   maxUnhealthy: {{ if hasSuffix "%" ... }}{{ . | quote }}{{ else }}{{ . | int }}{{ end }}
+# Ported from the parent chart's mhc_rendering_test after the pool moved to
+# kubernetes-nodes.
+
+templates:
+  - templates/nodegroup.yaml
+
+release:
+  name: kubernetes-nodes-myk8s-md0
+  namespace: tenant-test
+
+set:
+  cluster: myk8s
+  _cluster:
+    cluster-domain: cozy.local
+  version: "v1.35"
+  minReplicas: 0
+  maxReplicas: 3
+  instanceType: ""
+  diskSize: 20Gi
+  storageClass: replicated
+  roles:
+    - ingress-nginx
+  resources:
+    cpu: "2"
+    memory: 4Gi
+
+tests:
+  - it: renders a percentage maxUnhealthy as a quoted string
+    set:
+      maxUnhealthy: "50%"
+    documentSelector:
+      path: kind
+      value: MachineHealthCheck
+    asserts:
+      - equal:
+          path: spec.maxUnhealthy
+          value: "50%"
+
+  - it: renders a bare-integer maxUnhealthy as an unquoted int
+    set:
+      maxUnhealthy: "0"
+    documentSelector:
+      path: kind
+      value: MachineHealthCheck
+    asserts:
+      - equal:
+          path: spec.maxUnhealthy
+          value: 0
+
+  - it: passes nodeStartupTimeout through verbatim
+    set:
+      maxUnhealthy: "50%"
+      nodeStartupTimeout: "20m"
+    documentSelector:
+      path: kind
+      value: MachineHealthCheck
+    asserts:
+      - equal:
+          path: spec.nodeStartupTimeout
+          value: "20m"
+
+  - it: rejects a non-integer percentage maxUnhealthy
+    set:
+      maxUnhealthy: "50.5%"
+    asserts:
+      - failedTemplate:
+          errorPattern: "must be a bare integer"
+
+  - it: rejects a decimal maxUnhealthy
+    set:
+      maxUnhealthy: "1.5"
+    asserts:
+      - failedTemplate:
+          errorPattern: "must be a bare integer"
diff --git a/packages/apps/kubernetes-nodes/tests/mhc_timeouts_test.yaml b/packages/apps/kubernetes-nodes/tests/mhc_timeouts_test.yaml
new file mode 100644
index 0000000000..ecea4ec2e5
--- /dev/null
+++ b/packages/apps/kubernetes-nodes/tests/mhc_timeouts_test.yaml
@@ -0,0 +1,138 @@
+suite: MachineHealthCheck timeouts
+
+# Each entry pairs a Node condition with the time that condition may hold
+# before the Machine is remediated, and the two entries are not
+# interchangeable: `Ready=Unknown` is a worker that stopped answering, and
+# `Ready=False` is a worker that answered and said it is not ready. Asserting
+# the whole entry rather than an indexed timeout is what makes a swapped pair
+# fail here instead of on a live cluster.
+#
+# Both timeouts pass through the same render guard as maxNodeProvisionTime,
+# and they need it for a different reason than the annotation does: the CAPI
+# webhook validates nodeStartupTimeout but not unhealthyConditions timeouts, so
+# a zero or negative timeout applies silently and remediates a Machine the
+# moment its condition flips. The reject cases pin the guard on each field by
+# its own name, so wiring one field through the other's check fails here.
+#
+# `nodeStartupTimeout` bounds the phase before any of that: it is the window a
+# Machine has to produce a Node at all, and the unhealthyConditions entries are
+# evaluated only once one exists. Its default is pinned here because the parity
+# gate compares this chart against its counterpart, so a default moved in both
+# at once passes there and only fails on this assertion.
+
+templates:
+  - templates/nodegroup.yaml
+
+release:
+  name: kubernetes-nodes-myk8s-md0
+  namespace: tenant-test
+
+set:
+  cluster: myk8s
+  _cluster:
+    cluster-domain: cozy.local
+  version: "v1.35"
+  minReplicas: 0
+  maxReplicas: 3
+  instanceType: ""
+  diskSize: 20Gi
+  storageClass: replicated
+  roles:
+    - ingress-nginx
+  resources:
+    cpu: "2"
+    memory: 4Gi
+
+tests:
+  - it: renders both chart-default condition timeouts
+    documentSelector:
+      path: kind
+      value: MachineHealthCheck
+    asserts:
+      - contains:
+          path: spec.unhealthyConditions
+          content:
+            type: Ready
+            status: Unknown
+            timeout: "5m"
+      - contains:
+          path: spec.unhealthyConditions
+          content:
+            type: Ready
+            status: "False"
+            timeout: "10m"
+      - lengthEqual:
+          path: spec.unhealthyConditions
+          count: 2
+
+  - it: passes configured condition timeouts through verbatim
+    set:
+      readyUnknownTimeout: "90s"
+      readyFalseTimeout: "25m"
+    documentSelector:
+      path: kind
+      value: MachineHealthCheck
+    asserts:
+      - contains:
+          path: spec.unhealthyConditions
+          content:
+            type: Ready
+            status: Unknown
+            timeout: "90s"
+      - contains:
+          path: spec.unhealthyConditions
+          content:
+            type: Ready
+            status: "False"
+            timeout: "25m"
+
+  - it: renders the chart-default nodeStartupTimeout
+    documentSelector:
+      path: kind
+      value: MachineHealthCheck
+    asserts:
+      - equal:
+          path: spec.nodeStartupTimeout
+          value: "20m"
+
+  - it: accepts the canonical Go rendering of a condition timeout
+    set:
+      readyUnknownTimeout: "20m0s"
+      readyFalseTimeout: "1h0m0s"
+    documentSelector:
+      path: kind
+      value: MachineHealthCheck
+    asserts:
+      - contains:
+          path: spec.unhealthyConditions
+          content:
+            type: Ready
+            status: Unknown
+            timeout: "20m0s"
+      - contains:
+          path: spec.unhealthyConditions
+          content:
+            type: Ready
+            status: "False"
+            timeout: "1h0m0s"
+
+  - it: rejects a condition timeout carrying no unit
+    set:
+      readyUnknownTimeout: "90"
+    asserts:
+      - failedTemplate:
+          errorMessage: 'readyUnknownTimeout must be a whole number of s, m or h (e.g. 30m, 1h30m), got "90"'
+
+  - it: rejects a zero condition timeout, which would remediate instantly
+    set:
+      readyFalseTimeout: "0s"
+    asserts:
+      - failedTemplate:
+          errorMessage: 'readyFalseTimeout must be a whole number of s, m or h (e.g. 30m, 1h30m), got "0s"'
+
+  - it: rejects a negative condition timeout, which would remediate instantly
+    set:
+      readyUnknownTimeout: "-5m"
+    asserts:
+      - failedTemplate:
+          errorMessage: 'readyUnknownTimeout must be a whole number of s, m or h (e.g. 30m, 1h30m), got "-5m"'
diff --git a/packages/apps/kubernetes-nodes/tests/nodegroup_test.yaml b/packages/apps/kubernetes-nodes/tests/nodegroup_test.yaml
new file mode 100644
index 0000000000..e14bb480d0
--- /dev/null
+++ b/packages/apps/kubernetes-nodes/tests/nodegroup_test.yaml
@@ -0,0 +1,147 @@
+suite: worker node pool rendering
+templates:
+  - templates/nodegroup.yaml
+release:
+  name: kubernetes-nodes-myk8s-md0
+  namespace: tenant-test
+set:
+  cluster: myk8s
+  _cluster:
+    cluster-domain: cozy.local
+  version: "v1.35"
+  minReplicas: 0
+  maxReplicas: 3
+  instanceType: ""
+  diskSize: 20Gi
+  storageClass: replicated
+  roles:
+    - ingress-nginx
+  resources:
+    cpu: "2"
+    memory: 4Gi
+tests:
+  - it: names the MachineDeployment after the parent cluster and pool
+    documentSelector:
+      path: kind
+      value: MachineDeployment
+    asserts:
+      - equal:
+          path: metadata.name
+          value: kubernetes-myk8s-md0
+      - equal:
+          path: spec.clusterName
+          value: kubernetes-myk8s
+
+  - it: wires the MachineDeployment to the parent CAPI cluster via labels
+    documentSelector:
+      path: kind
+      value: MachineDeployment
+    asserts:
+      - equal:
+          path: spec.selector.matchLabels["cluster.x-k8s.io/cluster-name"]
+          value: kubernetes-myk8s
+      - equal:
+          path: spec.template.metadata.labels["cluster.x-k8s.io/deployment-name"]
+          value: kubernetes-myk8s-md0
+      - equal:
+          path: spec.template.metadata.labels["node-role.kubernetes.io/ingress-nginx"]
+          value: ""
+
+  - it: carries both cluster-autoscaler node-group size annotations and omits replicas
+    documentSelector:
+      path: kind
+      value: MachineDeployment
+    asserts:
+      - equal:
+          path: metadata.annotations["cluster.x-k8s.io/cluster-api-autoscaler-node-group-min-size"]
+          value: "0"
+      - equal:
+          path: metadata.annotations["cluster.x-k8s.io/cluster-api-autoscaler-node-group-max-size"]
+          value: "3"
+      - notExists:
+          path: spec.replicas
+
+  # The TalosConfigTemplate spec is immutable, so the object can only ever be
+  # created, never updated: the name carries a content hash of the machine config
+  # it holds (cozystack/cozystack#3515). The Job in talos-reconcile-job.yaml
+  # applies it under the same name — see the TCT_NAME assertion below.
+  - it: points the MachineDeployment bootstrap at the pool TalosConfigTemplate
+    documentSelector:
+      path: kind
+      value: MachineDeployment
+    asserts:
+      - equal:
+          path: spec.template.spec.bootstrap.configRef.name
+          value: kubernetes-myk8s-md0-ffdbe1
+      - matchRegex:
+          path: spec.template.spec.bootstrap.configRef.name
+          pattern: ^kubernetes-myk8s-md0-[0-9a-f]{6}$
+      - equal:
+          path: spec.template.spec.bootstrap.configRef.kind
+          value: TalosConfigTemplate
+
+  # Paired with the GPU-shaped test in talos_reconcile_job_test.yaml: a
+  # machine-config change rotates the name, and both templates must rotate it
+  # to the same value. See that file for why the fixture carries a truthy
+  # `gpus` rather than reusing the all-falsy defaults above.
+  - it: a machine-config change rotates the name the MachineDeployment references
+    documentSelector:
+      path: kind
+      value: MachineDeployment
+    set:
+      gpus:
+        - name: nvidia.com/GH200
+    asserts:
+      # Same literal as the paired test in talos_reconcile_job_test.yaml.
+      - equal:
+          path: spec.template.spec.bootstrap.configRef.name
+          value: kubernetes-myk8s-md0-0f8081
+
+  - it: names the KubevirtMachineTemplate with the parent cluster prefix and a content hash
+    documentSelector:
+      path: kind
+      value: KubevirtMachineTemplate
+    asserts:
+      - matchRegex:
+          path: metadata.name
+          pattern: ^kubernetes-myk8s-md0-[0-9a-f]{6}$
+
+  - it: emits a worker WorkloadMonitor selecting the pool
+    documentSelector:
+      path: kind
+      value: WorkloadMonitor
+    asserts:
+      - equal:
+          path: spec.type
+          value: worker
+      - equal:
+          path: spec.selector["cluster.x-k8s.io/cluster-name"]
+          value: kubernetes-myk8s
+---
+suite: worker node pool validation
+templates:
+  - templates/nodegroup.yaml
+tests:
+  - it: fails when cluster is not set
+    release:
+      name: kubernetes-nodes-myk8s-md0
+      namespace: tenant-test
+    set:
+      cluster: ""
+      _cluster:
+        cluster-domain: cozy.local
+    asserts:
+      - failedTemplate:
+          errorMessage: "kubernetes-nodes: .Values.cluster is required — set it to the parent Kubernetes CR name so the pool attaches to cluster kubernetes-<cluster>"
+
+  - it: fails when the release name is not prefixed with the cluster name
+    release:
+      name: kubernetes-nodes-wrong-md0
+      namespace: tenant-test
+    set:
+      cluster: myk8s
+      _cluster:
+        cluster-domain: cozy.local
+    asserts:
+      - failedTemplate:
+          errorMessage: 'kubernetes-nodes: release name "kubernetes-nodes-wrong-md0" must start with "kubernetes-nodes-myk8s-" — name the KubernetesNodes CR <cluster>-<pool> (cluster="myk8s")'
diff --git a/packages/apps/kubernetes-nodes/tests/parent_version_skew_test.yaml b/packages/apps/kubernetes-nodes/tests/parent_version_skew_test.yaml
new file mode 100644
index 0000000000..eea52482d3
--- /dev/null
+++ b/packages/apps/kubernetes-nodes/tests/parent_version_skew_test.yaml
@@ -0,0 +1,127 @@
+suite: parent version skew guard (assertParentVersion)
+
+# assertParentVersion looks up the parent KamajiControlPlane by the reconstructed
+# clusterName (kubernetes-<cluster>) and fails the render only when the pool minor
+# is AHEAD of the parent minor. A worker minor lagging the control plane is the
+# normal rolling-upgrade state (parent bumped first) and must render. The mocked
+# KamajiControlPlane sits at v1.34.9; the scheme also registers the other kinds
+# nodegroup.yaml LISTs (MachineSet, KubevirtMachineTemplate) and looks up
+# (MachineDeployment) so the fake client does not error once a provider is set.
+templates:
+  - templates/nodegroup.yaml
+release:
+  name: kubernetes-nodes-myk8s-md0
+  namespace: tenant-test
+set:
+  cluster: myk8s
+  _cluster:
+    cluster-domain: cozy.local
+  minReplicas: 0
+  maxReplicas: 3
+  instanceType: ""
+  diskSize: 20Gi
+  storageClass: replicated
+  roles:
+    - ingress-nginx
+  resources:
+    cpu: "2"
+    memory: 4Gi
+tests:
+  - it: fails when the pool minor is ahead of the parent apiserver minor
+    set:
+      version: "v1.35"
+    kubernetesProvider:
+      scheme: &scheme
+        "controlplane.cluster.x-k8s.io/v1alpha1/KamajiControlPlane":
+          gvr:
+            group: "controlplane.cluster.x-k8s.io"
+            version: "v1alpha1"
+            resource: "kamajicontrolplanes"
+          namespaced: true
+        "cluster.x-k8s.io/v1beta1/MachineDeployment":
+          gvr:
+            group: "cluster.x-k8s.io"
+            version: "v1beta1"
+            resource: "machinedeployments"
+          namespaced: true
+        "cluster.x-k8s.io/v1beta1/MachineSet":
+          gvr:
+            group: "cluster.x-k8s.io"
+            version: "v1beta1"
+            resource: "machinesets"
+          namespaced: true
+        "infrastructure.cluster.x-k8s.io/v1alpha1/KubevirtMachineTemplate":
+          gvr:
+            group: "infrastructure.cluster.x-k8s.io"
+            version: "v1alpha1"
+            resource: "kubevirtmachinetemplates"
+          namespaced: true
+      objects: &parentObjects
+        - kind: KamajiControlPlane
+          apiVersion: controlplane.cluster.x-k8s.io/v1alpha1
+          metadata:
+            name: kubernetes-myk8s
+            namespace: tenant-test
+          spec:
+            version: v1.34.9
+        # helm-unittest only registers a LIST kind for a GVK that has at least one
+        # object. nodegroup.yaml LISTs MachineSet and KubevirtMachineTemplate in the
+        # release namespace (the preserve-KMT block); register both by planting a
+        # throwaway object in an unrelated namespace so the tenant-test LIST stays
+        # empty and the preserve block is a no-op.
+        - kind: MachineSet
+          apiVersion: cluster.x-k8s.io/v1beta1
+          metadata:
+            name: scheme-registration-only
+            namespace: scheme-registration-only
+          spec:
+            template:
+              spec:
+                infrastructureRef:
+                  kind: KubevirtMachineTemplate
+                  name: none
+        - kind: KubevirtMachineTemplate
+          apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
+          metadata:
+            name: scheme-registration-only
+            namespace: scheme-registration-only
+          spec: {}
+    asserts:
+      - failedTemplate:
+          errorPattern: "is ahead of parent cluster"
+
+  - it: renders when the pool minor lags the parent (supported rolling-upgrade skew)
+    set:
+      version: "v1.33"
+    kubernetesProvider:
+      scheme: *scheme
+      objects: *parentObjects
+    asserts:
+      - documentSelector:
+          path: kind
+          value: MachineDeployment
+        exists:
+          path: metadata.name
+
+  - it: renders when the pool minor equals the parent minor
+    set:
+      version: "v1.34"
+    kubernetesProvider:
+      scheme: *scheme
+      objects: *parentObjects
+    asserts:
+      - documentSelector:
+          path: kind
+          value: MachineDeployment
+        exists:
+          path: metadata.name
+
+  - it: renders offline when the parent KamajiControlPlane is not present (skip branch)
+    set:
+      version: "v1.35"
+    asserts:
+      - documentSelector:
+          path: kind
+          value: MachineDeployment
+        exists:
+          path: metadata.name
diff --git a/packages/apps/kubernetes-nodes/tests/pod_cpu_limit_test.yaml b/packages/apps/kubernetes-nodes/tests/pod_cpu_limit_test.yaml
new file mode 100644
index 0000000000..d7fdb5bd90
--- /dev/null
+++ b/packages/apps/kubernetes-nodes/tests/pod_cpu_limit_test.yaml
@@ -0,0 +1,104 @@
+suite: worker pool pod CPU limit
+
+# Mirror of the parent kubernetes chart's suite, on the pool-shaped values of
+# this chart. `podCpuLimit` is the only knob that sets
+# `domain.resources.limits.cpu` on a worker VM. KubeVirt otherwise derives that
+# limit from the guest vCPU count whenever the namespace carries a ResourceQuota
+# that limits CPU, and it stops deriving as soon as the VMI declares the limit
+# itself. It is not only the ceiling that moves: KubeVirt copies a declared CPU
+# limit into an undeclared CPU request, so a pool that sets this field alone
+# requests its whole ceiling.
+
+templates:
+  - templates/nodegroup.yaml
+release:
+  name: kubernetes-nodes-myk8s-md0
+  namespace: tenant-test
+set:
+  cluster: myk8s
+  _cluster:
+    cluster-domain: cozy.local
+  version: "v1.35"
+  minReplicas: 0
+  maxReplicas: 3
+  instanceType: ""
+  diskSize: 20Gi
+  storageClass: replicated
+  roles:
+    - ingress-nginx
+# Sizing is set per case rather than here, because helm-unittest merges a
+# case's `set` into these values and a case that needs an unsized pool cannot
+# take cpu/memory back out again.
+tests:
+  - it: renders the CPU limit the pool asks for onto the worker VM
+    set:
+      resources:
+        cpu: "2"
+        memory: 4Gi
+      podCpuLimit: 3
+    documentSelector:
+      path: kind
+      value: KubevirtMachineTemplate
+    asserts:
+      - equal:
+          path: spec.template.spec.virtualMachineTemplate.spec.template.spec.domain.resources.limits.cpu
+          value: "3"
+      # This field renders one key. What the container ends up requesting is
+      # then KubeVirt's copy of the limit rather than anything the chart wrote.
+      - notExists:
+          path: spec.template.spec.virtualMachineTemplate.spec.template.spec.domain.resources.requests.cpu
+      - equal:
+          path: spec.template.spec.virtualMachineTemplate.spec.template.spec.domain.resources.limits.ephemeral-storage
+          value: "2Gi"
+      - equal:
+          path: spec.template.spec.virtualMachineTemplate.spec.template.spec.domain.resources.requests.ephemeral-storage
+          value: "53687091"
+
+  - it: accepts a fractional quantity
+    set:
+      resources:
+        cpu: "2"
+        memory: 4Gi
+      podCpuLimit: 1500m
+    documentSelector:
+      path: kind
+      value: KubevirtMachineTemplate
+    asserts:
+      - equal:
+          path: spec.template.spec.virtualMachineTemplate.spec.template.spec.domain.resources.limits.cpu
+          value: "1500m"
+
+  - it: leaves the limit to KubeVirt when the pool sets none
+    set:
+      resources:
+        cpu: "2"
+        memory: 4Gi
+    documentSelector:
+      path: kind
+      value: KubevirtMachineTemplate
+    asserts:
+      # Absent, not empty: the KubevirtMachineTemplate is content-hash named, so
+      # a `cpu:` key rendered for a pool that asked for nothing would rename the
+      # template and roll every live worker VM of the pool on upgrade. The
+      # render-parity gate compares those bytes against the parent chart.
+      - notExists:
+          path: spec.template.spec.virtualMachineTemplate.spec.template.spec.domain.resources.limits.cpu
+      - equal:
+          path: spec.template.spec.virtualMachineTemplate.spec.template.spec.domain.resources.limits.ephemeral-storage
+          value: "2Gi"
+
+  # KubeVirt's instancetype applier reports domain.resources.limits.cpu as a
+  # conflict instead of resolving it, so a VM carrying both is refused at
+  # admission with no Machine and no explanation on the CR. Sizing a pool by
+  # resources is what drops the instancetype from the VM, which is why the limit
+  # is only usable there.
+  - it: refuses the limit on a pool still sized by its instancetype
+    set:
+      instanceType: u1.medium
+      podCpuLimit: 3
+    asserts:
+      # Matched on the message, not on "some render error": a pool carrying half
+      # a size trips the neighbouring resources.cpu / resources.memory guard
+      # first, so a bare failedTemplate here would pass on the wrong error.
+      - failedTemplate:
+          errorPattern: 'nodeGroup md0: podCpuLimit cannot be combined with instanceType sizing'
diff --git a/packages/apps/kubernetes-nodes/tests/pod_cpu_request_test.yaml b/packages/apps/kubernetes-nodes/tests/pod_cpu_request_test.yaml
new file mode 100644
index 0000000000..af5d710411
--- /dev/null
+++ b/packages/apps/kubernetes-nodes/tests/pod_cpu_request_test.yaml
@@ -0,0 +1,293 @@
+suite: worker pool pod CPU request
+
+# Mirror of the parent kubernetes chart's suite, on the pool-shaped values of
+# this chart. `podCpuRequest` is the only knob that sets
+# `domain.resources.requests.cpu` on a worker VM, and it is the other half of
+# `podCpuLimit`: KubeVirt copies a declared CPU limit into the request when the
+# VM declares none, so without this field the ceiling and the scheduler
+# reservation cannot be moved apart.
+
+templates:
+  - templates/nodegroup.yaml
+release:
+  name: kubernetes-nodes-myk8s-md0
+  namespace: tenant-test
+set:
+  cluster: myk8s
+  _cluster:
+    cluster-domain: cozy.local
+  version: "v1.35"
+  minReplicas: 0
+  maxReplicas: 3
+  instanceType: ""
+  diskSize: 20Gi
+  storageClass: replicated
+  roles:
+    - ingress-nginx
+# Sizing is set per case rather than here, because helm-unittest merges a
+# case's `set` into these values and a case that needs an unsized pool cannot
+# take cpu/memory back out again.
+tests:
+  - it: renders both sides of the pair when the pool sets both
+    set:
+      resources:
+        cpu: "2"
+        memory: 4Gi
+      podCpuLimit: 3
+      podCpuRequest: 200m
+    documentSelector:
+      path: kind
+      value: KubevirtMachineTemplate
+    asserts:
+      - equal:
+          path: spec.template.spec.virtualMachineTemplate.spec.template.spec.domain.resources.requests.cpu
+          value: "200m"
+      # The point of the pair: the ceiling moved and the reservation did not
+      # follow it.
+      - equal:
+          path: spec.template.spec.virtualMachineTemplate.spec.template.spec.domain.resources.limits.cpu
+          value: "3"
+      - equal:
+          path: spec.template.spec.virtualMachineTemplate.spec.template.spec.domain.resources.limits.ephemeral-storage
+          value: "2Gi"
+      - equal:
+          path: spec.template.spec.virtualMachineTemplate.spec.template.spec.domain.resources.requests.ephemeral-storage
+          value: "53687091"
+
+  # Allowed, and it does not pull a limit in with it: KubeVirt keeps deriving
+  # the ceiling from the guest vCPU count, and only the scheduler weighting
+  # moves. The reverse -- a limit with no request -- is what moves both, which
+  # is why the pair is not symmetric.
+  - it: accepts a request on its own and renders no limit beside it
+    set:
+      resources:
+        cpu: "2"
+        memory: 4Gi
+      podCpuRequest: 1
+    documentSelector:
+      path: kind
+      value: KubevirtMachineTemplate
+    asserts:
+      - equal:
+          path: spec.template.spec.virtualMachineTemplate.spec.template.spec.domain.resources.requests.cpu
+          value: "1"
+      - notExists:
+          path: spec.template.spec.virtualMachineTemplate.spec.template.spec.domain.resources.limits.cpu
+
+  - it: accepts a fractional quantity
+    set:
+      resources:
+        cpu: "2"
+        memory: 4Gi
+      podCpuLimit: 1500m
+      podCpuRequest: 100m
+    documentSelector:
+      path: kind
+      value: KubevirtMachineTemplate
+    asserts:
+      - equal:
+          path: spec.template.spec.virtualMachineTemplate.spec.template.spec.domain.resources.requests.cpu
+          value: "100m"
+
+  - it: leaves the request to KubeVirt when the pool sets none
+    set:
+      resources:
+        cpu: "2"
+        memory: 4Gi
+    documentSelector:
+      path: kind
+      value: KubevirtMachineTemplate
+    asserts:
+      # Absent, not empty: the KubevirtMachineTemplate is content-hash named, so
+      # a `cpu:` key rendered for a pool that asked for nothing would rename the
+      # template and roll every live worker VM of the pool on upgrade. The
+      # render-parity gate compares those bytes against the parent chart.
+      - notExists:
+          path: spec.template.spec.virtualMachineTemplate.spec.template.spec.domain.resources.requests.cpu
+      - equal:
+          path: spec.template.spec.virtualMachineTemplate.spec.template.spec.domain.resources.requests.ephemeral-storage
+          value: "53687091"
+
+  # KubeVirt's instancetype applier reports domain.resources.requests.cpu as a
+  # conflict in the same check that reports the limit, so a VM carrying both is
+  # refused at admission with no Machine and no explanation on the CR.
+  - it: refuses the request on a pool still sized by its instancetype
+    set:
+      instanceType: u1.medium
+      podCpuRequest: 200m
+    asserts:
+      # Matched on the message, not on "some render error": a pool carrying half
+      # a size trips the neighbouring resources.cpu / resources.memory guard
+      # first, so a bare failedTemplate here would pass on the wrong error.
+      - failedTemplate:
+          errorPattern: 'nodeGroup md0: podCpuRequest cannot be combined with instanceType sizing'
+
+  # Rejected here rather than by API server validation on the worker's Pod,
+  # which is two objects away from the CR that named the values.
+  - it: refuses a request above its own limit
+    set:
+      resources:
+        cpu: "2"
+        memory: 4Gi
+      podCpuLimit: 1500m
+      podCpuRequest: 2
+    asserts:
+      - failedTemplate:
+          errorPattern: 'nodeGroup md0: podCpuRequest \(2\) exceeds podCpuLimit \(1500m\)'
+
+  # Zero on its own means what it says: no limit is declared, so KubeVirt's
+  # defaulter does not fire, and the rendered zero survives to the container as
+  # a reservation of nothing. A block keyed on truthiness would drop it and
+  # render the pool's deliberate choice as though it had chosen nothing.
+  - it: renders a request of zero rather than treating it as unset
+    set:
+      resources:
+        cpu: "2"
+        memory: 4Gi
+      podCpuRequest: 0
+    documentSelector:
+      path: kind
+      value: KubevirtMachineTemplate
+    asserts:
+      - equal:
+          path: spec.template.spec.virtualMachineTemplate.spec.template.spec.domain.resources.requests.cpu
+          value: "0"
+
+  # The pair that reads as "reserve nothing under this ceiling" and does the
+  # opposite: KubeVirt's defaulter tests the request with IsZero, which an
+  # explicit zero satisfies exactly as an absent key does, so it overwrites the
+  # zero with the limit and the worker asks for its whole ceiling. Refused
+  # rather than documented, because nothing later reports it.
+  - it: refuses a request of zero beside a limit
+    set:
+      resources:
+        cpu: "2"
+        memory: 4Gi
+      podCpuLimit: 3
+      podCpuRequest: 0
+    asserts:
+      - failedTemplate:
+          errorPattern: 'nodeGroup md0: podCpuRequest 0 beside a podCpuLimit does not reserve nothing'
+
+  # A zero limit on its own does not reach a Pod. It removes the ceiling, but
+  # KubeVirt keeps deriving a request from the vCPU count when the VM declares
+  # none -- the defaulter that would have copied the limit across does not fire
+  # precisely because the limit is zero -- and API server validation refuses a
+  # request above a limit that exists, zero being a limit that exists.
+  - it: refuses a zero limit with no request beside it
+    set:
+      resources:
+        cpu: "2"
+        memory: 4Gi
+      podCpuLimit: 0
+    asserts:
+      - failedTemplate:
+          errorPattern: 'nodeGroup md0: podCpuLimit 0 needs podCpuRequest 0 beside it'
+
+  # Both zero is the one shape a zero limit reaches a Pod in: no ceiling and no
+  # reservation, with nothing for the defaulter to copy and nothing for
+  # validation to refuse.
+  - it: accepts a zero request beside a zero limit
+    set:
+      resources:
+        cpu: "2"
+        memory: 4Gi
+      podCpuLimit: 0
+      podCpuRequest: 0
+    documentSelector:
+      path: kind
+      value: KubevirtMachineTemplate
+    asserts:
+      - equal:
+          path: spec.template.spec.virtualMachineTemplate.spec.template.spec.domain.resources.requests.cpu
+          value: "0"
+      - equal:
+          path: spec.template.spec.virtualMachineTemplate.spec.template.spec.domain.resources.limits.cpu
+          value: "0"
+
+  # The schema's quantity pattern admits a leading minus, so both fields have
+  # to refuse it here; the request-versus-limit comparison does not catch it,
+  # because a negative is below any ceiling.
+  - it: refuses a negative request
+    set:
+      resources:
+        cpu: "2"
+        memory: 4Gi
+      podCpuLimit: 3
+      podCpuRequest: -1
+    asserts:
+      - failedTemplate:
+          errorPattern: 'nodeGroup md0: podCpuRequest \(-1\) must not be negative'
+
+  - it: refuses a negative limit
+    set:
+      resources:
+        cpu: "2"
+        memory: 4Gi
+      podCpuLimit: -1
+    asserts:
+      - failedTemplate:
+          errorPattern: 'nodeGroup md0: podCpuLimit \(-1\) must not be negative'
+
+  # A limit of zero is not the tightest ceiling but no ceiling at all -- the
+  # kubelet turns a zero CPU limit into no CFS quota. What refuses this pair is
+  # not the ceiling being small, it is the API server's rule that a request
+  # cannot exceed a limit that exists, zero included.
+  - it: sees a limit of zero when comparing the pair
+    set:
+      resources:
+        cpu: "2"
+        memory: 4Gi
+      podCpuLimit: 0
+      podCpuRequest: 200m
+    asserts:
+      - failedTemplate:
+          errorPattern: 'nodeGroup md0: podCpuRequest \(200m\) exceeds podCpuLimit \(0\)'
+
+  # Same guard, a unit the comparison used to be blind to: the chart library's
+  # quantity converter dropped the micro and nano suffixes, and a value it does
+  # not recognise converts to zero, which made the comparison read 0 against 0
+  # and wave the pair through.
+  - it: refuses a request above its own limit in the micro range
+    set:
+      resources:
+        cpu: "2"
+        memory: 4Gi
+      podCpuLimit: 50u
+      podCpuRequest: 100u
+    asserts:
+      - failedTemplate:
+          errorPattern: 'nodeGroup md0: podCpuRequest \(100u\) exceeds podCpuLimit \(50u\)'
+
+  - it: accepts a request equal to its limit
+    set:
+      resources:
+        cpu: "2"
+        memory: 4Gi
+      podCpuLimit: 2
+      podCpuRequest: 2
+    documentSelector:
+      path: kind
+      value: KubevirtMachineTemplate
+    asserts:
+      - equal:
+          path: spec.template.spec.virtualMachineTemplate.spec.template.spec.domain.resources.requests.cpu
+          value: "2"
+
+  # The comparison is between quantities, not between the strings that spell
+  # them: "500m" sorts after "1" and would be refused by a lexical guard, while
+  # half a CPU under a ceiling of one is the ordinary case this field is for.
+  - it: accepts a milli request under an integer limit
+    set:
+      resources:
+        cpu: "2"
+        memory: 4Gi
+      podCpuLimit: 1
+      podCpuRequest: 500m
+    documentSelector:
+      path: kind
+      value: KubevirtMachineTemplate
+    asserts:
+      - equal:
+          path: spec.template.spec.virtualMachineTemplate.spec.template.spec.domain.resources.requests.cpu
+          value: "500m"
diff --git a/packages/apps/kubernetes-nodes/tests/pre_delete_unpin_test.yaml b/packages/apps/kubernetes-nodes/tests/pre_delete_unpin_test.yaml
new file mode 100644
index 0000000000..7608658340
--- /dev/null
+++ b/packages/apps/kubernetes-nodes/tests/pre_delete_unpin_test.yaml
@@ -0,0 +1,116 @@
+suite: pre-delete unpin hook
+templates:
+  - templates/pre-delete-unpin.yaml
+release:
+  name: kubernetes-nodes-myk8s-md0
+  namespace: tenant-test
+set:
+  cluster: myk8s
+  _cluster:
+    cluster-domain: cozy.local
+  version: "v1.35"
+  minReplicas: 0
+  maxReplicas: 3
+  instanceType: ""
+  diskSize: 20Gi
+  storageClass: replicated
+  roles:
+    - ingress-nginx
+  resources:
+    cpu: "2"
+    memory: 4Gi
+tests:
+  - it: renders the unpin Job as a pre-delete hook
+    documentSelector:
+      path: kind
+      value: Job
+    asserts:
+      - equal:
+          path: metadata.name
+          value: kubernetes-nodes-myk8s-md0-unpin
+      - equal:
+          path: metadata.annotations["helm.sh/hook"]
+          value: pre-delete
+      - equal:
+          path: metadata.annotations["helm.sh/hook-delete-policy"]
+          value: before-hook-creation
+      - equal:
+          path: spec.activeDeadlineSeconds
+          value: 300
+      # Helm does not own hook resources, so the finished Job must self-reap or it
+      # leaks into the tenant namespace after every pool uninstall.
+      - equal:
+          path: spec.ttlSecondsAfterFinished
+          value: 86400
+      - equal:
+          path: spec.template.spec.serviceAccountName
+          value: kubernetes-nodes-myk8s-md0-unpin
+
+  - it: tolerates a missing KubevirtMachineTemplate CRD instead of wedging the finalizer
+    documentSelector:
+      path: kind
+      value: Job
+    asserts:
+      # KMT discovery must distinguish a missing CRD (skip: nothing to unpin)
+      # from a real API/RBAC failure (exit 1). During a management-cluster CAPI
+      # teardown or a Terminating namespace the CRD can be gone; failing there
+      # would exhaust backoffLimit and wedge the HR finalizer on a resource type
+      # that no longer exists.
+      - matchRegex:
+          path: spec.template.spec.containers[0].args[0]
+          pattern: "the server doesn't have a resource type"
+      - matchRegex:
+          path: spec.template.spec.containers[0].args[0]
+          pattern: "CRD absent; nothing to unpin"
+
+  - it: runs the unpin Job pod PSS-restricted
+    documentSelector:
+      path: kind
+      value: Job
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].securityContext.runAsNonRoot
+          value: true
+      - equal:
+          path: spec.template.spec.containers[0].securityContext.allowPrivilegeEscalation
+          value: false
+      - equal:
+          path: spec.template.spec.containers[0].securityContext.readOnlyRootFilesystem
+          value: true
+      - contains:
+          path: spec.template.spec.containers[0].securityContext.capabilities.drop
+          content: ALL
+
+  - it: grants only release-scoped patch RBAC for the adopted worker objects
+    documentSelector:
+      path: kind
+      value: Role
+    asserts:
+      - equal:
+          path: metadata.name
+          value: kubernetes-nodes-myk8s-md0-unpin
+      - notContains:
+          path: rules
+          content:
+            apiGroups: ["*"]
+            resources: ["*"]
+            verbs: ["*"]
+
+  - it: allows egress to the apiserver for the unpin pod
+    documentSelector:
+      path: kind
+      value: CiliumNetworkPolicy
+    asserts:
+      - equal:
+          path: metadata.annotations["helm.sh/hook"]
+          value: pre-delete
+      - equal:
+          path: spec.endpointSelector.matchLabels["cozystack.io/kubernetes-nodes-unpin"]
+          value: kubernetes-nodes-myk8s-md0
+      # Assert the egress destination itself, not just that the policy selects the
+      # unpin pod: without this an egress regression could leave the uninstall hook
+      # unable to reach the apiserver to patch worker objects, and the test would
+      # still pass.
+      - equal:
+          path: spec.egress[0].toEntities[0]
+          value: kube-apiserver
diff --git a/packages/apps/kubernetes-nodes/tests/registry_mirrors_test.yaml b/packages/apps/kubernetes-nodes/tests/registry_mirrors_test.yaml
new file mode 100644
index 0000000000..cb3ec9073b
--- /dev/null
+++ b/packages/apps/kubernetes-nodes/tests/registry_mirrors_test.yaml
@@ -0,0 +1,82 @@
+suite: worker registry mirrors (talos.registryMirrors)
+
+# The kubernetes-nodes worker pool pulls the same ghcr.io/siderolabs/kubelet image
+# as the parent kubernetes chart and its talos values are kept in sync with it, so
+# it carries the same talos.registryMirrors knob rendered into the worker
+# TalosConfigTemplate's machine.registries.mirrors. Empty by default (byte-identical
+# render); a set value routes worker image pulls through a mirror. Free-form
+# tenant-facing input is shell-escaped because it is emitted into the reconcile-Job's
+# unquoted `cat <<EOF | kubectl apply` heredoc. See cozystack/cozystack#3513.
+
+templates:
+  - templates/talos-reconcile-job.yaml
+release:
+  name: kubernetes-nodes-myk8s-md0
+  namespace: tenant-test
+set:
+  cluster: myk8s
+  _cluster:
+    cluster-domain: cozy.local
+  version: "v1.35"
+  minReplicas: 0
+  maxReplicas: 3
+  instanceType: ""
+  diskSize: 20Gi
+  storageClass: replicated
+  roles:
+    - ingress-nginx
+  resources:
+    cpu: "2"
+    memory: 4Gi
+
+tests:
+  - it: default renders no machine-level mirrors block
+    asserts:
+      - notMatchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: 'mirrors:'
+        documentSelector:
+          path: kind
+          value: Job
+
+  - it: talos.registryMirrors renders machine.registries.mirrors into the worker TalosConfigTemplate
+    set:
+      talos:
+        registryMirrors:
+          ghcr.io:
+            endpoints:
+              - http://ghcr-mirror.kube-system.svc
+    asserts:
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: 'mirrors:'
+        documentSelector:
+          path: kind
+          value: Job
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: 'ghcr\.io:'
+        documentSelector:
+          path: kind
+          value: Job
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: 'http://ghcr-mirror\.kube-system\.svc'
+        documentSelector:
+          path: kind
+          value: Job
+
+  - it: registryMirrors values are shell-escaped so they cannot execute in the reconcile-Job heredoc
+    set:
+      talos:
+        registryMirrors:
+          ghcr.io:
+            endpoints:
+              - http://mirror$(id)
+    asserts:
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: 'http://mirror\\\$\(id\)'
+        documentSelector:
+          path: kind
+          value: Job
diff --git a/packages/apps/kubernetes-nodes/tests/render_snapshot_test.yaml b/packages/apps/kubernetes-nodes/tests/render_snapshot_test.yaml
new file mode 100644
index 0000000000..4e51d0f934
--- /dev/null
+++ b/packages/apps/kubernetes-nodes/tests/render_snapshot_test.yaml
@@ -0,0 +1,76 @@
+suite: worker node pool golden render snapshot
+
+# Freezes the full rendered pool (KubevirtMachineTemplate, MachineDeployment,
+# MachineHealthCheck, worker WorkloadMonitor) for a representative node group.
+# In PR-2a this render was proven byte-identical to the monolithic kubernetes
+# chart's output via tests/render-parity.sh; PR-2b removed the pool from the
+# parent, so cross-chart parity can no longer run. This snapshot takes over as
+# the drift guard: any change to the rendered pool objects (which would rename
+# the content-hashed KubevirtMachineTemplate and churn live worker VMs on
+# upgrade) fails here until the snapshot is regenerated deliberately with
+# `helm unittest -u`.
+#
+# Coverage note: every case sets instanceType: "" with explicit resources,
+# because the instancetype-sized branch resolves the VirtualMachineClusterInstancetype
+# via `lookup`, which returns nil under helm unittest. The default (u1.medium)
+# shape is therefore not pinned here; the e2e exercises that branch on a real
+# cluster.
+
+templates:
+  - templates/nodegroup.yaml
+
+release:
+  name: kubernetes-nodes-myk8s-md0
+  namespace: tenant-test
+
+set:
+  cluster: myk8s
+  _cluster:
+    cluster-domain: cozy.local
+  version: "v1.35"
+  minReplicas: 0
+  maxReplicas: 3
+  instanceType: ""
+  diskSize: 20Gi
+  storageClass: replicated
+  roles:
+    - ingress-nginx
+  resources:
+    cpu: "2"
+    memory: 4Gi
+
+tests:
+  - it: matches the golden render of the pool objects
+    asserts:
+      - matchSnapshot: {}
+
+  # GPU and kubelet-override branches live on in nodegroup.yaml after the split
+  # and are content-hash inputs to the KubevirtMachineTemplate; pin them too so
+  # a change to either branch that would rename the KMT (and roll live GPU or
+  # kubelet-tuned worker VMs) fails here. Value sets mirror the PR-2a parity gate.
+  - it: matches the golden render of a GPU pool
+    set:
+      roles: []
+      resources:
+        cpu: "4"
+        memory: 8Gi
+      gpus:
+        - name: nvidia.com/AD102GL_L40S
+    asserts:
+      - matchSnapshot: {}
+
+  - it: matches the golden render of a kubelet-override pool
+    set:
+      roles: []
+      resources:
+        cpu: "2"
+        memory: 4Gi
+      kubelet:
+        systemReservedMemory: 512Mi
+        kubeReservedMemory: 512Mi
+        systemReservedCpu: 100m
+        kubeReservedCpu: 100m
+        evictionHardMemory: 5%
+        evictionSoftMemory: 8%
+    asserts:
+      - matchSnapshot: {}
diff --git a/packages/apps/kubernetes-nodes/tests/resources_cpu_test.yaml b/packages/apps/kubernetes-nodes/tests/resources_cpu_test.yaml
new file mode 100644
index 0000000000..9c65c3d457
--- /dev/null
+++ b/packages/apps/kubernetes-nodes/tests/resources_cpu_test.yaml
@@ -0,0 +1,296 @@
+suite: worker pool resources.cpu
+
+# resources.cpu is typed as a quantity, but on the kubevirt substrate it lands
+# in the worker VM's domain.cpu.cores, which KubeVirt declares as uint32 and
+# the KubevirtMachineTemplate CRD as an integer. Only a whole number of cores
+# has a meaning there, and the same value decides whether the instancetype
+# matcher is dropped, so a value that cannot be one stops the render. Values
+# that already rendered a working pool keep rendering the same bytes: the
+# template name is a hash of its content, so any change would roll the pool.
+
+templates:
+  - templates/nodegroup.yaml
+release:
+  name: kubernetes-nodes-myk8s-md0
+  namespace: tenant-test
+set:
+  cluster: myk8s
+  _cluster:
+    cluster-domain: cozy.local
+  version: "v1.35"
+  minReplicas: 0
+  maxReplicas: 3
+  instanceType: ""
+  diskSize: 20Gi
+  storageClass: replicated
+tests:
+  - it: renders a quoted whole number as an integer core count
+    set:
+      resources:
+        cpu: "2"
+        memory: 4Gi
+    documentSelector:
+      path: kind
+      value: KubevirtMachineTemplate
+    asserts:
+      - equal:
+          path: spec.template.spec.virtualMachineTemplate.spec.template.spec.domain.cpu.cores
+          value: 2
+
+  - it: renders an unquoted integer as the same core count
+    set:
+      resources:
+        cpu: 4
+        memory: 4Gi
+    documentSelector:
+      path: kind
+      value: KubevirtMachineTemplate
+    asserts:
+      - equal:
+          path: spec.template.spec.virtualMachineTemplate.spec.template.spec.domain.cpu.cores
+          value: 4
+
+  - it: renders a whole float as an integer core count
+    set:
+      resources:
+        cpu: 2.0
+        memory: 4Gi
+    documentSelector:
+      path: kind
+      value: KubevirtMachineTemplate
+    asserts:
+      - equal:
+          path: spec.template.spec.virtualMachineTemplate.spec.template.spec.domain.cpu.cores
+          value: 2
+
+  # The quantity grammar spells one whole number several ways, and each has
+  # always rendered: YAML decodes the emitted value to the integer.
+  - it: renders a quoted whole decimal as the same core count
+    set:
+      resources:
+        cpu: "2.0"
+        memory: 4Gi
+    documentSelector:
+      path: kind
+      value: KubevirtMachineTemplate
+    asserts:
+      - equal:
+          path: spec.template.spec.virtualMachineTemplate.spec.template.spec.domain.cpu.cores
+          value: 2
+
+  - it: renders an explicit plus sign as the same core count
+    set:
+      resources:
+        cpu: "+2"
+        memory: 4Gi
+    documentSelector:
+      path: kind
+      value: KubevirtMachineTemplate
+    asserts:
+      - equal:
+          path: spec.template.spec.virtualMachineTemplate.spec.template.spec.domain.cpu.cores
+          value: 2
+
+  - it: renders an exponent spelling as the core count it decodes to
+    set:
+      resources:
+        cpu: "1e1"
+        memory: 4Gi
+    documentSelector:
+      path: kind
+      value: KubevirtMachineTemplate
+    asserts:
+      - equal:
+          path: spec.template.spec.virtualMachineTemplate.spec.template.spec.domain.cpu.cores
+          value: 10
+
+  # Both ends of the range the error message promises.
+  - it: renders the smallest core count
+    set:
+      resources:
+        cpu: "1"
+        memory: 4Gi
+    documentSelector:
+      path: kind
+      value: KubevirtMachineTemplate
+    asserts:
+      - equal:
+          path: spec.template.spec.virtualMachineTemplate.spec.template.spec.domain.cpu.cores
+          value: 1
+
+  - it: renders the largest core count uint32 can hold
+    set:
+      resources:
+        cpu: "4294967295"
+        memory: 4Gi
+    documentSelector:
+      path: kind
+      value: KubevirtMachineTemplate
+    asserts:
+      - equal:
+          path: spec.template.spec.virtualMachineTemplate.spec.template.spec.domain.cpu.cores
+          value: 4294967295
+
+  - it: refuses a millicore quantity
+    set:
+      resources:
+        cpu: 500m
+        memory: 4Gi
+    asserts:
+      - failedTemplate:
+          errorPattern: 'nodeGroup md0: resources.cpu \(500m\) must be a whole number of vCPU cores between 1 and 4294967295'
+
+  - it: refuses a millicore spelling of whole cores
+    set:
+      resources:
+        cpu: 2000m
+        memory: 4Gi
+    asserts:
+      - failedTemplate:
+          errorPattern: 'nodeGroup md0: resources.cpu \(2000m\) must be a whole number of vCPU cores between 1 and 4294967295'
+
+  - it: refuses a fractional core count
+    set:
+      resources:
+        cpu: "1.5"
+        memory: 4Gi
+    asserts:
+      - failedTemplate:
+          errorPattern: 'nodeGroup md0: resources.cpu \(1.5\) must be a whole number of vCPU cores between 1 and 4294967295'
+
+  # An unquoted zero is falsy, so it has always rendered as if the field were
+  # unset: no domain.cpu, sizing left to the instancetype. The template name
+  # below is what the chart rendered for it before this guard existed.
+  - it: keeps rendering an unquoted zero as an unset field
+    set:
+      resources:
+        cpu: 0
+        memory: 4Gi
+    documentSelector:
+      path: kind
+      value: KubevirtMachineTemplate
+    asserts:
+      - notExists:
+          path: spec.template.spec.virtualMachineTemplate.spec.template.spec.domain.cpu
+      - equal:
+          path: metadata.name
+          value: kubernetes-myk8s-md0-28d812
+
+  # A quoted zero is truthy, so it never took the unset path. It was refused
+  # before this guard existed as well, by the kubelet CPU reservation check,
+  # which cannot fit any reservation into an effective CPU of zero cores.
+  - it: refuses a quoted zero
+    set:
+      resources:
+        cpu: "0"
+        memory: 4Gi
+    asserts:
+      - failedTemplate:
+          errorPattern: 'nodeGroup md0: resources.cpu \(0\) must be a whole number of vCPU cores between 1 and 4294967295'
+
+  # The schema's quantity pattern admits a leading minus.
+  - it: refuses a negative core count
+    set:
+      resources:
+        cpu: "-2"
+        memory: 4Gi
+    asserts:
+      - failedTemplate:
+          errorPattern: 'nodeGroup md0: resources.cpu \(-2\) must be a whole number of vCPU cores between 1 and 4294967295'
+
+  # A leading zero is emitted verbatim, as it always was, and YAML reads 010
+  # as octal. The template name is what the chart rendered for it before this
+  # guard existed, so a pool sized this way does not roll.
+  - it: keeps rendering a leading zero byte-identically
+    set:
+      resources:
+        cpu: "010"
+        memory: 4Gi
+    documentSelector:
+      path: kind
+      value: KubevirtMachineTemplate
+    asserts:
+      - equal:
+          path: metadata.name
+          value: kubernetes-myk8s-md0-ce2335
+
+  # KubeVirt declares cores as uint32, so a count past its ceiling cannot size
+  # the guest even though it is a whole number.
+  - it: refuses a core count past the uint32 ceiling
+    set:
+      resources:
+        cpu: "4294967296"
+        memory: 4Gi
+    asserts:
+      - failedTemplate:
+          errorPattern: 'nodeGroup md0: resources.cpu \(4294967296\) must be a whole number of vCPU cores between 1 and 4294967295'
+
+  - it: refuses an exponent spelling past the uint32 ceiling
+    set:
+      resources:
+        cpu: "1e10"
+        memory: 4Gi
+    asserts:
+      - failedTemplate:
+          errorPattern: 'nodeGroup md0: resources.cpu \(1e10\) must be a whole number of vCPU cores between 1 and 4294967295'
+
+  - it: leaves domain.cpu out when resources.cpu is unset
+    set:
+      resources:
+        memory: 4Gi
+    documentSelector:
+      path: kind
+      value: KubevirtMachineTemplate
+    asserts:
+      - notExists:
+          path: spec.template.spec.virtualMachineTemplate.spec.template.spec.domain.cpu
+
+  - it: lets a whole core count replace the instancetype matcher
+    set:
+      instanceType: u1.medium
+      resources:
+        cpu: "2"
+        memory: 4Gi
+    documentSelector:
+      path: kind
+      value: KubevirtMachineTemplate
+    asserts:
+      - notExists:
+          path: spec.template.spec.virtualMachineTemplate.spec.instancetype
+      - equal:
+          path: spec.template.spec.virtualMachineTemplate.spec.template.spec.domain.cpu.cores
+          value: 2
+
+  # The case the precedence rule got wrong: the raw string was truthy, so the
+  # matcher was dropped for a value that cannot size the VM.
+  - it: refuses a millicore quantity beside an instanceType instead of dropping the matcher
+    set:
+      instanceType: u1.medium
+      resources:
+        cpu: 500m
+        memory: 4Gi
+    asserts:
+      - failedTemplate:
+          errorPattern: 'nodeGroup md0: resources.cpu \(500m\) must be a whole number of vCPU cores between 1 and 4294967295'
+
+  # Proxmox converts the quantity to millicores and rounds up, so a millicore
+  # value is a valid size there and the kubevirt-only guard must not see it.
+  - it: leaves a millicore quantity to the proxmox substrate
+    set:
+      substrate: proxmox
+      proxmox:
+        templateTags: [capmox-template, talos]
+        full: true
+        network:
+          bridge: vmbr0
+        dnsServers: ["8.8.8.8"]
+      resources:
+        cpu: 500m
+        memory: 4Gi
+    documentSelector:
+      path: kind
+      value: ProxmoxMachineTemplate
+    asserts:
+      - equal:
+          path: spec.template.spec.numCores
+          value: 1
diff --git a/packages/apps/kubernetes-nodes/tests/serial_console_log_test.yaml b/packages/apps/kubernetes-nodes/tests/serial_console_log_test.yaml
new file mode 100644
index 0000000000..1a86b7ae7e
--- /dev/null
+++ b/packages/apps/kubernetes-nodes/tests/serial_console_log_test.yaml
@@ -0,0 +1,64 @@
+suite: worker pool guest serial console logging
+
+# A worker that stalls inside the guest before Talos apid answers leaves no
+# trace anywhere the platform can reach: no Node, no certificate request, and
+# talosctl itself needs the apid that never came up. The guest serial console
+# is the only surface that shows that window, and KubeVirt exposes it only when
+# the VMI asks for it: with logSerialConsole set, virt-launcher gains a
+# guest-console-log container whose log is readable from the management cluster
+# with no in-guest cooperation at all.
+#
+# The field must stay absent unless asked for. The KubevirtMachineTemplate is
+# content-hash named, so a byte that appears unconditionally renames the
+# template and rolls every live worker VM on upgrade; an explicit false must
+# render the same nothing as an unset field for the same reason.
+
+templates:
+  - templates/nodegroup.yaml
+release:
+  name: kubernetes-nodes-myk8s-md0
+  namespace: tenant-test
+set:
+  cluster: myk8s
+  _cluster:
+    cluster-domain: cozy.local
+  version: "v1.35"
+  minReplicas: 0
+  maxReplicas: 3
+  instanceType: ""
+  diskSize: 20Gi
+  storageClass: replicated
+  roles:
+    - ingress-nginx
+  resources:
+    cpu: "2"
+    memory: 4Gi
+tests:
+  - it: omits the field by default so the template hash is unchanged
+    documentSelector:
+      path: kind
+      value: KubevirtMachineTemplate
+    asserts:
+      - notExists:
+          path: spec.template.spec.virtualMachineTemplate.spec.template.spec.domain.devices.logSerialConsole
+
+  - it: omits the field when explicitly disabled
+    set:
+      logSerialConsole: false
+    documentSelector:
+      path: kind
+      value: KubevirtMachineTemplate
+    asserts:
+      - notExists:
+          path: spec.template.spec.virtualMachineTemplate.spec.template.spec.domain.devices.logSerialConsole
+
+  - it: asks KubeVirt for the guest console log when enabled
+    set:
+      logSerialConsole: true
+    documentSelector:
+      path: kind
+      value: KubevirtMachineTemplate
+    asserts:
+      - equal:
+          path: spec.template.spec.virtualMachineTemplate.spec.template.spec.domain.devices.logSerialConsole
+          value: true
diff --git a/packages/apps/kubernetes-nodes/tests/substrate_branches_test.yaml b/packages/apps/kubernetes-nodes/tests/substrate_branches_test.yaml
new file mode 100644
index 0000000000..854d9e13f2
--- /dev/null
+++ b/packages/apps/kubernetes-nodes/tests/substrate_branches_test.yaml
@@ -0,0 +1,174 @@
+suite: substrate branches in the pool render
+
+# Every `if substrate` in this chart, asserted on BOTH sides: the SVC_IP source
+# (the LoadBalancer address on proxmox, the ClusterIP on kubevirt — a KubeVirt
+# pool waiting for a LoadBalancer address on a ClusterIP Service would never
+# write its TalosConfigTemplate) and the nameservers (the pool's own on proxmox,
+# none on kubevirt, where the workers reach the management CoreDNS).
+#
+# The sizing case uses 1500m and 8G, where ceil and floor disagree; at 4 CPUs
+# and 8Gi they agree, and the rounding values.yaml promises would go unpinned.
+templates:
+  - templates/nodegroup.yaml
+  - templates/talos-reconcile-job.yaml
+release:
+  name: kubernetes-nodes-myk8s-md0
+  namespace: tenant-test
+set: &base
+  cluster: myk8s
+  _cluster:
+    cluster-domain: cozy.local
+  version: "v1.35"
+  minReplicas: 2
+  maxReplicas: 3
+  instanceType: ""
+  diskSize: 20Gi
+  storageClass: replicated
+  roles:
+    - ingress-nginx
+  resources:
+    cpu: "2"
+    memory: 4Gi
+tests:
+  - it: kubevirt takes the apiserver Service ClusterIP
+    template: templates/talos-reconcile-job.yaml
+    documentSelector:
+      path: kind
+      value: Job
+    asserts:
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: 'SVC_IP=\$\(kubectl -n "\$NS" get svc "\$RELEASE" -o jsonpath=''\{\.spec\.clusterIP\}'''
+      - notMatchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: 'loadBalancer\.ingress'
+
+  - it: proxmox takes the Service LoadBalancer address, which is what an off-cluster VM can reach
+    set: &proxmox
+      substrate: proxmox
+      proxmox:
+        templateTags: [talos]
+        network:
+          bridge: vmbr0
+        dnsServers: ["10.0.0.1"]
+    template: templates/talos-reconcile-job.yaml
+    documentSelector:
+      path: kind
+      value: Job
+    asserts:
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: 'SVC_IP=\$\(kubectl -n "\$NS" get svc "\$RELEASE" -o jsonpath=''\{\.status\.loadBalancer\.ingress\[0\]\.ip\}'''
+      # kube-dns is still read with {.spec.clusterIP}; what must not appear on
+      # proxmox is the apiserver Service being read that way.
+      - notMatchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: 'SVC_IP=\$\(kubectl -n "\$NS" get svc "\$RELEASE" -o jsonpath=''\{\.spec\.clusterIP\}'''
+
+  - it: kubevirt workers resolve through the management cluster CoreDNS
+    template: templates/talos-reconcile-job.yaml
+    documentSelector:
+      path: kind
+      value: Job
+    asserts:
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: 'nameservers:\s*\n\s*- \$\{COREDNS_IP\}'
+
+  - it: proxmox workers carry their own resolvers, because that ClusterIP is unroutable for them
+    set: *proxmox
+    template: templates/talos-reconcile-job.yaml
+    documentSelector:
+      path: kind
+      value: Job
+    asserts:
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: 'nameservers:\s*\n\s*- "10\.0\.0\.1"'
+      - notMatchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: 'nameservers:\s*\n\s*- \$\{COREDNS_IP\}'
+
+  - it: rounds fractional CPU up, because a VM cannot have 1.5 cores
+    set:
+      substrate: proxmox
+      proxmox:
+        templateTags: [talos]
+        network:
+          bridge: vmbr0
+        dnsServers: ["10.0.0.1"]
+      resources:
+        cpu: "1500m"
+        memory: "8G"
+    template: templates/nodegroup.yaml
+    documentSelector:
+      path: kind
+      value: ProxmoxMachineTemplate
+    asserts:
+      # floor would give 1 core and 7629 MiB; both numbers are chosen to differ.
+      - equal:
+          path: spec.template.spec.numCores
+          value: 2
+      - equal:
+          path: spec.template.spec.memoryMiB
+          value: 7630
+
+  # osImage picks where a KubeVirt worker's disk comes from. A Proxmox worker's
+  # disk is a clone of the VM template, so the field cannot be honoured — but
+  # half of it looks as if it were: osImage.factory.version reaches the
+  # machineconfig's installer image and changes the Job, while the boot image
+  # stays whatever the template carries. Refused rather than ignored for that
+  # reason.
+  - it: and still takes it on kubevirt
+    set:
+      osImage:
+        factory:
+          version: v1.12.6
+    template: templates/nodegroup.yaml
+    documentSelector:
+      path: kind
+      value: MachineDeployment
+    asserts:
+      - exists:
+          path: metadata.name
+
+  - it: the worker monitor keeps its Pod threshold on kubevirt
+    template: templates/nodegroup.yaml
+    documentSelector:
+      path: kind
+      value: WorkloadMonitor
+    asserts:
+      - equal:
+          path: spec.minReplicas
+          value: 2
+
+  - it: and drops it on proxmox, where there are no Pods to count
+    set: *proxmox
+    template: templates/nodegroup.yaml
+    documentSelector:
+      path: kind
+      value: WorkloadMonitor
+    asserts:
+      # The controller lists Pods matching the selector and reports
+      # Operational=false below minReplicas. A proxmox worker has no Pod here,
+      # so any threshold pins the pool to false while its nodes are healthy.
+      - notExists:
+          path: spec.minReplicas
+      - exists:
+          path: spec.selector
+
+  - it: refuses osImage on proxmox, where the disk comes from the template
+    set:
+      substrate: proxmox
+      proxmox:
+        templateTags: [talos]
+        network:
+          bridge: vmbr0
+        dnsServers: ["10.0.0.1"]
+      osImage:
+        factory:
+          version: v1.12.6
+    template: templates/nodegroup.yaml
+    asserts:
+      - failedTemplate:
+          errorPattern: "substrate proxmox does not take osImage"
diff --git a/packages/apps/kubernetes-nodes/tests/substrate_proxmox_clone_test.yaml b/packages/apps/kubernetes-nodes/tests/substrate_proxmox_clone_test.yaml
new file mode 100644
index 0000000000..fdc563150f
--- /dev/null
+++ b/packages/apps/kubernetes-nodes/tests/substrate_proxmox_clone_test.yaml
@@ -0,0 +1,74 @@
+suite: proxmox worker disks default to linked clones
+# `full` decides whether capmox copies the template's disk or clones it. Nothing
+# fails when it is wrong: the pool comes up, the workers join, and each one
+# quietly costs the whole template instead of the increment — measured on a ZFS
+# store at 10.2 GiB against 8 KiB. That is the shape of default worth pinning,
+# because the cluster looks correct either way.
+#
+# `storage` is a full-clone parameter: a linked clone always lives on the
+# template's storage, and Proxmox refuses the pair. The chart refuses it at
+# render time, naming both values.
+templates:
+  - templates/nodegroup.yaml
+release:
+  name: kubernetes-nodes-myk8s-md0
+  namespace: tenant-test
+set:
+  cluster: myk8s
+  _cluster:
+    cluster-domain: cozy.local
+  version: "v1.35"
+  minReplicas: 0
+  maxReplicas: 3
+  instanceType: ""
+  resources:
+    cpu: 4
+    memory: 8Gi
+  substrate: proxmox
+  proxmox:
+    templateTags: [capmox-template, talos]
+    network:
+      bridge: vmbr0
+    dnsServers: ["8.8.8.8"]
+tests:
+  - it: clones rather than copies unless told otherwise
+    documentSelector:
+      path: kind
+      value: ProxmoxMachineTemplate
+    asserts:
+      - equal:
+          path: spec.template.spec.full
+          value: false
+
+  - it: still copies the disk when an operator asks for an independent one
+    documentSelector:
+      path: kind
+      value: ProxmoxMachineTemplate
+    set:
+      proxmox:
+        full: true
+    asserts:
+      - equal:
+          path: spec.template.spec.full
+          value: true
+
+  - it: refuses a target storage for a linked clone
+    set:
+      proxmox:
+        storage: main-pool
+    asserts:
+      - failedTemplate:
+          errorPattern: "proxmox.storage needs full: true"
+
+  - it: passes the target storage through for a full clone
+    documentSelector:
+      path: kind
+      value: ProxmoxMachineTemplate
+    set:
+      proxmox:
+        full: true
+        storage: main-pool
+    asserts:
+      - equal:
+          path: spec.template.spec.storage
+          value: main-pool
diff --git a/packages/apps/kubernetes-nodes/tests/substrate_proxmox_guards_test.yaml b/packages/apps/kubernetes-nodes/tests/substrate_proxmox_guards_test.yaml
new file mode 100644
index 0000000000..819145f2b8
--- /dev/null
+++ b/packages/apps/kubernetes-nodes/tests/substrate_proxmox_guards_test.yaml
@@ -0,0 +1,47 @@
+suite: proxmox substrate refuses what it cannot invent
+# Two guards that fire on the ABSENCE of a field, so the suite omits both and
+# each test supplies the other one back. helm-unittest merges per-test `set`
+# into the suite defaults rather than replacing them, so a suite that declared
+# either field could never take it away again — the same reason the sizing
+# guard lives in its own suite.
+#
+# Both failures are silent without the guard rather than loud: a worker with no
+# bridge never gets an interface, and one pointed at the management cluster's
+# CoreDNS resolves nothing from outside it. The chart stopping is the cheapest
+# place to learn that.
+templates:
+  - templates/nodegroup.yaml
+release:
+  name: kubernetes-nodes-myk8s-md0
+  namespace: tenant-test
+set:
+  cluster: myk8s
+  _cluster:
+    cluster-domain: cozy.local
+  version: "v1.35"
+  minReplicas: 0
+  maxReplicas: 3
+  instanceType: ""
+  resources:
+    cpu: 4
+    memory: 8Gi
+  substrate: proxmox
+  proxmox:
+    templateTags: [capmox-template, talos]
+tests:
+  - it: refuses a pool with no bridge to attach the worker to
+    set:
+      proxmox:
+        dnsServers: ["8.8.8.8"]
+    asserts:
+      - failedTemplate:
+          errorMessage: "substrate proxmox requires proxmox.network.bridge"
+
+  - it: refuses resolvers it would otherwise borrow from the management cluster
+    set:
+      proxmox:
+        network:
+          bridge: vmbr0
+    asserts:
+      - failedTemplate:
+          errorMessage: "substrate proxmox requires proxmox.dnsServers: an off-cluster worker cannot resolve through the management cluster's CoreDNS"
diff --git a/packages/apps/kubernetes-nodes/tests/substrate_proxmox_pool_test.yaml b/packages/apps/kubernetes-nodes/tests/substrate_proxmox_pool_test.yaml
new file mode 100644
index 0000000000..978b0aeda1
--- /dev/null
+++ b/packages/apps/kubernetes-nodes/tests/substrate_proxmox_pool_test.yaml
@@ -0,0 +1,46 @@
+suite: proxmox workers join the tenant's resource pool
+# A Proxmox ACL that follows every VM capmox creates — replacements included — is
+# one on a resource pool. `proxmox.pool` puts the workers into it; empty adds
+# them to none, which is what the chart did before the field existed.
+templates:
+  - templates/nodegroup.yaml
+release:
+  name: kubernetes-nodes-myk8s-md0
+  namespace: tenant-test
+set:
+  cluster: myk8s
+  _cluster:
+    cluster-domain: cozy.local
+  version: "v1.35"
+  minReplicas: 0
+  maxReplicas: 3
+  instanceType: ""
+  resources:
+    cpu: 4
+    memory: 8Gi
+  substrate: proxmox
+  proxmox:
+    templateTags: [capmox-template, talos]
+    network:
+      bridge: vmbr0
+    dnsServers: ["8.8.8.8"]
+tests:
+  - it: adds the workers to the pool the tenant's tokens are scoped to
+    documentSelector:
+      path: kind
+      value: ProxmoxMachineTemplate
+    set:
+      proxmox:
+        pool: tenant-a
+    asserts:
+      - equal:
+          path: spec.template.spec.pool
+          value: tenant-a
+
+  - it: adds them to no pool when none is named
+    documentSelector:
+      path: kind
+      value: ProxmoxMachineTemplate
+    asserts:
+      - notExists:
+          path: spec.template.spec.pool
diff --git a/packages/apps/kubernetes-nodes/tests/substrate_proxmox_retention_test.yaml b/packages/apps/kubernetes-nodes/tests/substrate_proxmox_retention_test.yaml
new file mode 100644
index 0000000000..83aea2e348
--- /dev/null
+++ b/packages/apps/kubernetes-nodes/tests/substrate_proxmox_retention_test.yaml
@@ -0,0 +1,94 @@
+suite: old machine templates survive a rerender on proxmox
+
+# A MachineSet draining its last workers still references the template those
+# workers were created from. If the render stops emitting it, Helm deletes the
+# infrastructureRef out from under them. The retention loop exists for that, and
+# it looks templates up BY KIND — so on a proxmox pool it has to look for
+# ProxmoxMachineTemplate. Pinned here because pinning the lookup back to the
+# KubeVirt kind left all 99 tests green: no proxmox case reached that loop.
+templates:
+  - templates/nodegroup.yaml
+release:
+  name: kubernetes-nodes-myk8s-md0
+  namespace: tenant-test
+set:
+  cluster: myk8s
+  _cluster:
+    cluster-domain: cozy.local
+  version: "v1.35"
+  minReplicas: 0
+  maxReplicas: 3
+  instanceType: ""
+  diskSize: 20Gi
+  storageClass: replicated
+  roles:
+    - ingress-nginx
+  resources:
+    cpu: "2"
+    memory: 4Gi
+  substrate: proxmox
+  proxmox:
+    templateTags: [talos]
+    network:
+      bridge: vmbr0
+    dnsServers: ["10.0.0.1"]
+tests:
+  - it: keeps a ProxmoxMachineTemplate a MachineSet still references
+    kubernetesProvider:
+      scheme:
+        "cluster.x-k8s.io/v1beta1/MachineDeployment":
+          gvr: {group: "cluster.x-k8s.io", version: "v1beta1", resource: "machinedeployments"}
+          namespaced: true
+        "cluster.x-k8s.io/v1beta1/Cluster":
+          gvr: {group: "cluster.x-k8s.io", version: "v1beta1", resource: "clusters"}
+          namespaced: true
+        "cluster.x-k8s.io/v1beta1/MachineSet":
+          gvr: {group: "cluster.x-k8s.io", version: "v1beta1", resource: "machinesets"}
+          namespaced: true
+        "infrastructure.cluster.x-k8s.io/v1alpha1/ProxmoxMachineTemplate":
+          gvr: {group: "infrastructure.cluster.x-k8s.io", version: "v1alpha1", resource: "proxmoxmachinetemplates"}
+          namespaced: true
+        "infrastructure.cluster.x-k8s.io/v1alpha1/KubevirtMachineTemplate":
+          gvr: {group: "infrastructure.cluster.x-k8s.io", version: "v1alpha1", resource: "kubevirtmachinetemplates"}
+          namespaced: true
+      objects:
+        - kind: Cluster
+          apiVersion: cluster.x-k8s.io/v1beta1
+          metadata: {name: kubernetes-myk8s, namespace: tenant-test}
+          spec:
+            infrastructureRef: {kind: ProxmoxCluster, name: kubernetes-myk8s}
+        - kind: ProxmoxMachineTemplate
+          apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
+          metadata:
+            name: kubernetes-myk8s-md0-0ld0ld
+            namespace: tenant-test
+            annotations:
+              meta.helm.sh/release-name: kubernetes-nodes-myk8s-md0
+            ownerReferences:
+              - kind: Cluster
+                apiVersion: cluster.x-k8s.io/v1beta1
+                name: kubernetes-myk8s
+                uid: "00000000-0000-0000-0000-000000000000"
+          spec:
+            template:
+              spec:
+                sourceNode: prox-home
+        - kind: MachineSet
+          apiVersion: cluster.x-k8s.io/v1beta1
+          metadata: {name: kubernetes-myk8s-md0-draining, namespace: tenant-test}
+          spec:
+            template:
+              spec:
+                infrastructureRef:
+                  kind: ProxmoxMachineTemplate
+                  name: kubernetes-myk8s-md0-0ld0ld
+        - kind: KubevirtMachineTemplate
+          apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
+          metadata: {name: scheme-registration-only, namespace: scheme-registration-only}
+          spec: {}
+    asserts:
+      - containsDocument:
+          apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
+          kind: ProxmoxMachineTemplate
+          name: kubernetes-myk8s-md0-0ld0ld
+          any: true
diff --git a/packages/apps/kubernetes-nodes/tests/substrate_proxmox_sizing_test.yaml b/packages/apps/kubernetes-nodes/tests/substrate_proxmox_sizing_test.yaml
new file mode 100644
index 0000000000..1a23d3d3ca
--- /dev/null
+++ b/packages/apps/kubernetes-nodes/tests/substrate_proxmox_sizing_test.yaml
@@ -0,0 +1,31 @@
+suite: proxmox substrate requires explicit sizing
+# Its own suite because the guard fires on the ABSENCE of `resources`, and
+# helm-unittest merges per-test `set` into the suite defaults rather than
+# replacing them — a suite that declares sizing cannot take it away again.
+# Blanking the fields is not the same case: values.schema.json rejects an empty
+# quantity before the template ever runs.
+templates:
+  - templates/nodegroup.yaml
+release:
+  name: kubernetes-nodes-myk8s-md0
+  namespace: tenant-test
+set:
+  cluster: myk8s
+  _cluster:
+    cluster-domain: cozy.local
+  version: "v1.35"
+  minReplicas: 0
+  maxReplicas: 3
+  instanceType: ""
+  substrate: proxmox
+  proxmox:
+    templateTags: [capmox-template, talos]
+    full: true
+    network:
+      bridge: vmbr0
+    dnsServers: ["8.8.8.8"]
+tests:
+  - it: refuses a pool it cannot size, instead of inventing capacity
+    asserts:
+      - failedTemplate:
+          errorMessage: "substrate proxmox requires resources.cpu and resources.memory: there is no instanceType to size the pool from"
diff --git a/packages/apps/kubernetes-nodes/tests/substrate_proxmox_test.yaml b/packages/apps/kubernetes-nodes/tests/substrate_proxmox_test.yaml
new file mode 100644
index 0000000000..0eed8f4014
--- /dev/null
+++ b/packages/apps/kubernetes-nodes/tests/substrate_proxmox_test.yaml
@@ -0,0 +1,133 @@
+suite: proxmox substrate
+# The substrate switch has to change exactly two things and nothing else: the
+# machine template object and every reference to it. The default path is covered
+# by the render snapshot, so what is asserted here is the Proxmox path plus the
+# guards that stop a pool asking the substrate for something it cannot do.
+templates:
+  - templates/nodegroup.yaml
+release:
+  name: kubernetes-nodes-myk8s-md0
+  namespace: tenant-test
+set:
+  cluster: myk8s
+  _cluster:
+    cluster-domain: cozy.local
+  version: "v1.35"
+  minReplicas: 0
+  maxReplicas: 3
+  instanceType: ""
+  roles:
+    - ingress-nginx
+  resources:
+    cpu: "4"
+    memory: 8Gi
+  substrate: proxmox
+  proxmox:
+    templateTags:
+      - capmox-template
+      - cozystack
+      - talos
+      - talos-v1.13.6
+    full: true
+    network:
+      bridge: vmbr0
+    storage: ""
+    dnsServers: ["8.8.8.8"]
+tests:
+  - it: renders a ProxmoxMachineTemplate instead of a KubevirtMachineTemplate
+    documentSelector:
+      path: kind
+      value: ProxmoxMachineTemplate
+    asserts:
+      - isKind:
+          of: ProxmoxMachineTemplate
+
+  - it: skips both capmox probes, which Talos can never answer
+    documentSelector:
+      path: kind
+      value: ProxmoxMachineTemplate
+    asserts:
+      - equal:
+          path: spec.template.spec.checks.skipQemuGuestAgent
+          value: true
+      - equal:
+          path: spec.template.spec.checks.skipCloudInitStatus
+          value: true
+
+  - it: passes the template tags through verbatim, since capmox compares the set
+    documentSelector:
+      path: kind
+      value: ProxmoxMachineTemplate
+    asserts:
+      - equal:
+          path: spec.template.spec.templateSelector.matchTags
+          value:
+            - capmox-template
+            - cozystack
+            - talos
+            - talos-v1.13.6
+
+  - it: sizes the VM from resources, the only sizing source Proxmox has
+    documentSelector:
+      path: kind
+      value: ProxmoxMachineTemplate
+    asserts:
+      - equal:
+          path: spec.template.spec.numCores
+          value: 4
+      - equal:
+          path: spec.template.spec.memoryMiB
+          value: 8192
+      - equal:
+          path: spec.template.spec.network.default.bridge
+          value: vmbr0
+
+  - it: points the MachineDeployment at the Proxmox template
+    documentSelector:
+      path: kind
+      value: MachineDeployment
+    asserts:
+      - equal:
+          path: spec.template.spec.infrastructureRef.kind
+          value: ProxmoxMachineTemplate
+
+  - it: still renders the MachineHealthCheck, which is substrate-agnostic
+    documentSelector:
+      path: kind
+      value: MachineHealthCheck
+    asserts:
+      - isKind:
+          of: MachineHealthCheck
+
+  - it: still renders the WorkloadMonitor, which is substrate-agnostic
+    documentSelector:
+      path: kind
+      value: WorkloadMonitor
+    asserts:
+      - isKind:
+          of: WorkloadMonitor
+
+  - it: rejects a pool with no template tags, because capmox has no image URL
+    set:
+      proxmox:
+        templateTags: []
+        dnsServers: ["8.8.8.8"]
+        network:
+          bridge: vmbr0
+    asserts:
+      - failedTemplate:
+          errorMessage: "substrate proxmox requires proxmox.templateTags: capmox clones a VM template and has no image URL to fall back on"
+
+  - it: rejects kubevirt-only knobs rather than accepting them silently
+    set:
+      logSerialConsole: true
+    asserts:
+      - failedTemplate:
+          errorMessage: "logSerialConsole is a kubevirt-only field; use the Proxmox serial console on the VM"
+
+  - it: rejects an unknown substrate
+    set:
+      substrate: vsphere
+    asserts:
+      - failedTemplate:
+          errorMessage: 'substrate "vsphere" is not supported; use "kubevirt" or "proxmox"'
diff --git a/packages/apps/kubernetes-nodes/tests/substrate_switch_guard_test.yaml b/packages/apps/kubernetes-nodes/tests/substrate_switch_guard_test.yaml
new file mode 100644
index 0000000000..8adb3f9e10
--- /dev/null
+++ b/packages/apps/kubernetes-nodes/tests/substrate_switch_guard_test.yaml
@@ -0,0 +1,147 @@
+suite: substrate switch guard (assertSubstrateMatches)
+
+# Two silent failures, both of them only visible against the live cluster.
+#
+# Switching an existing pool rolls every worker to the other hypervisor and, on
+# the way, Helm deletes the machine template the draining MachineSet still
+# references: the retention loop looks up only the kind the NEW substrate uses,
+# so the old one stops being rendered. That is the failure the loop exists to
+# prevent, reached from the other side.
+#
+# A pool whose substrate differs from its parent cluster's is the second one.
+# The README says the two must match and nothing enforced it; such a pool gets
+# machines that no infrastructure cluster owns.
+#
+# The `## @immutable` marker on the value is dashboard-only, which is why both
+# checks read the live object. Offline they are inert, like the other guards.
+templates:
+  - templates/nodegroup.yaml
+release:
+  name: kubernetes-nodes-myk8s-md0
+  namespace: tenant-test
+set:
+  cluster: myk8s
+  _cluster:
+    cluster-domain: cozy.local
+  version: "v1.35"
+  minReplicas: 0
+  maxReplicas: 3
+  instanceType: ""
+  diskSize: 20Gi
+  storageClass: replicated
+  roles:
+    - ingress-nginx
+  resources:
+    cpu: "2"
+    memory: 4Gi
+tests:
+  - it: refuses to switch a pool that already runs KubeVirt workers
+    set:
+      substrate: proxmox
+      proxmox:
+        templateTags: [talos]
+        network:
+          bridge: vmbr0
+        dnsServers: ["10.0.0.1"]
+    kubernetesProvider:
+      scheme: &scheme
+        "cluster.x-k8s.io/v1beta1/MachineDeployment":
+          gvr: {group: "cluster.x-k8s.io", version: "v1beta1", resource: "machinedeployments"}
+          namespaced: true
+        "cluster.x-k8s.io/v1beta1/Cluster":
+          gvr: {group: "cluster.x-k8s.io", version: "v1beta1", resource: "clusters"}
+          namespaced: true
+        "cluster.x-k8s.io/v1beta1/MachineSet":
+          gvr: {group: "cluster.x-k8s.io", version: "v1beta1", resource: "machinesets"}
+          namespaced: true
+        "infrastructure.cluster.x-k8s.io/v1alpha1/KubevirtMachineTemplate":
+          gvr: {group: "infrastructure.cluster.x-k8s.io", version: "v1alpha1", resource: "kubevirtmachinetemplates"}
+          namespaced: true
+        "infrastructure.cluster.x-k8s.io/v1alpha1/ProxmoxMachineTemplate":
+          gvr: {group: "infrastructure.cluster.x-k8s.io", version: "v1alpha1", resource: "proxmoxmachinetemplates"}
+          namespaced: true
+      objects:
+        - kind: MachineDeployment
+          apiVersion: cluster.x-k8s.io/v1beta1
+          metadata:
+            name: kubernetes-myk8s-md0
+            namespace: tenant-test
+            annotations:
+              meta.helm.sh/release-name: kubernetes-nodes-myk8s-md0
+          spec:
+            clusterName: kubernetes-myk8s
+            template:
+              spec:
+                infrastructureRef:
+                  kind: KubevirtMachineTemplate
+                  name: kubernetes-myk8s-md0-abc123
+        - &schemeOnlyMs
+          kind: MachineSet
+          apiVersion: cluster.x-k8s.io/v1beta1
+          metadata: {name: scheme-registration-only, namespace: scheme-registration-only}
+          spec:
+            template:
+              spec:
+                infrastructureRef: {kind: KubevirtMachineTemplate, name: none}
+        - &schemeOnlyKmt
+          kind: KubevirtMachineTemplate
+          apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
+          metadata: {name: scheme-registration-only, namespace: scheme-registration-only}
+          spec: {}
+        - &schemeOnlyPmt
+          kind: ProxmoxMachineTemplate
+          apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
+          metadata: {name: scheme-registration-only, namespace: scheme-registration-only}
+          spec: {}
+    asserts:
+      - failedTemplate:
+          errorPattern: "already runs KubevirtMachineTemplate workers"
+
+  - it: refuses a proxmox pool under a KubeVirt cluster
+    set:
+      substrate: proxmox
+      proxmox:
+        templateTags: [talos]
+        network:
+          bridge: vmbr0
+        dnsServers: ["10.0.0.1"]
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - &kubevirtParent
+          kind: Cluster
+          apiVersion: cluster.x-k8s.io/v1beta1
+          metadata: {name: kubernetes-myk8s, namespace: tenant-test}
+          spec:
+            infrastructureRef:
+              kind: KubevirtCluster
+              name: kubernetes-myk8s
+        - *schemeOnlyMs
+        - *schemeOnlyKmt
+        - *schemeOnlyPmt
+    asserts:
+      - failedTemplate:
+          errorPattern: "parent cluster \"kubernetes-myk8s\" runs on KubevirtCluster"
+
+  - it: renders when the pool agrees with its parent
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - *kubevirtParent
+        - *schemeOnlyMs
+        - *schemeOnlyKmt
+        - *schemeOnlyPmt
+    asserts:
+      - documentSelector:
+          path: kind
+          value: MachineDeployment
+        exists:
+          path: metadata.name
+
+  - it: renders offline, where there is nothing to compare against
+    asserts:
+      - documentSelector:
+          path: kind
+          value: MachineDeployment
+        exists:
+          path: metadata.name
diff --git a/packages/apps/kubernetes-nodes/tests/talos_image_factory_ca_test.yaml b/packages/apps/kubernetes-nodes/tests/talos_image_factory_ca_test.yaml
new file mode 100644
index 0000000000..b259d13ad1
--- /dev/null
+++ b/packages/apps/kubernetes-nodes/tests/talos_image_factory_ca_test.yaml
@@ -0,0 +1,383 @@
+suite: talos.imageFactoryCA — trusting a self-hosted image factory
+
+# Covers the opt-in CA bundle CDI verifies the Talos Image Factory against.
+#
+# Two properties matter and are pinned separately below:
+#
+#  1. UNSET IS UNCHANGED. The overwhelming majority of pools point at the
+#     public factory and must render exactly as before — no ConfigMap, and no
+#     certConfigMap key on the DataVolume. An importer given an empty
+#     certConfigMap would mount nothing and fall back to the system pool anyway,
+#     but the object diff would still rename the content-hashed
+#     KubevirtMachineTemplate and roll every live worker. The full-render side
+#     of that invariant is pinned by tests/render_snapshot_test.yaml, whose
+#     stored snapshot predates this feature.
+#
+#  2. THE TWO SIDES AGREE. The ConfigMap's name and the DataVolume's
+#     certConfigMap both come from kubernetes-nodes.talosImageFactoryCAConfigMapName,
+#     so they cannot drift; the assertions compare them against the same literal
+#     to catch a helper edit that changes only one call site.
+#
+# The clone path (osImage.builtin) builds no source.http at all, so it must
+# render neither the reference nor the ConfigMap — pinned below.
+#
+# The fail-closed cases pin the shared cozy-lib.tls.validateCACert guard as
+# reached through this chart's field name. They exist because the value is
+# emitted verbatim into a ConfigMap that anything able to read the namespace
+# can read: a pasted keypair must be refused outright, not published. The
+# guard's own edge cases (PGP key headers, base64-alphabet bodies, numeric
+# coercion) are pinned in packages/tests/cozy-lib-tests.
+#
+# The certificate below is a throwaway self-signed CA generated for this suite;
+# it certifies nothing and expires far out so the fixture never rots.
+
+templates:
+  - templates/image-factory-ca.yaml
+  - templates/nodegroup.yaml
+
+release:
+  name: kubernetes-nodes-myk8s-md0
+  namespace: tenant-test
+
+set:
+  cluster: myk8s
+  _cluster:
+    cluster-domain: cozy.local
+  version: "v1.35"
+  minReplicas: 1
+  maxReplicas: 3
+  instanceType: u1.medium
+  diskSize: 20Gi
+  storageClass: replicated
+  roles: [ingress-nginx]
+
+kubernetesProvider:
+  scheme:
+    "instancetype.kubevirt.io/v1beta1/VirtualMachineClusterInstancetype":
+      gvr: {group: instancetype.kubevirt.io, version: v1beta1, resource: virtualmachineclusterinstancetypes}
+      namespaced: false
+    "cluster.x-k8s.io/v1beta1/MachineSet":
+      gvr: {group: cluster.x-k8s.io, version: v1beta1, resource: machinesets}
+      namespaced: true
+    "infrastructure.cluster.x-k8s.io/v1alpha1/KubevirtMachineTemplate":
+      gvr: {group: infrastructure.cluster.x-k8s.io, version: v1alpha1, resource: kubevirtmachinetemplates}
+      namespaced: true
+    "cdi.kubevirt.io/v1beta1/DataVolume":
+      gvr: {group: cdi.kubevirt.io, version: v1beta1, resource: datavolumes}
+      namespaced: true
+    "storage.k8s.io/v1/StorageClass":
+      gvr: {group: storage.k8s.io, version: v1, resource: storageclasses}
+      namespaced: false
+  objects:
+    - kind: VirtualMachineClusterInstancetype
+      apiVersion: instancetype.kubevirt.io/v1beta1
+      metadata: {name: u1.medium}
+    - kind: StorageClass
+      apiVersion: storage.k8s.io/v1
+      metadata: {name: replicated}
+    - kind: MachineSet
+      apiVersion: cluster.x-k8s.io/v1beta1
+      metadata: {name: ignored-ms, namespace: tenant-test}
+      spec: {template: {spec: {infrastructureRef: {kind: Other, name: ignored}}}}
+    - kind: KubevirtMachineTemplate
+      apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
+      metadata: {name: ignored-kmt, namespace: tenant-test}
+    # The golden for the default talos.*, so the osImage.builtin cases have a
+    # populated source to clone.
+    - kind: DataVolume
+      apiVersion: cdi.kubevirt.io/v1beta1
+      metadata:
+        name: talos-worker-ce4c980550dd2ab1b17bbf2b08801c7eb59418eafe8f279833297925d67c7515-v1.13.6
+        namespace: cozy-public
+      spec:
+        storage:
+          resources:
+            requests:
+              storage: 6Gi
+          storageClassName: replicated
+      status:
+        phase: Succeeded
+
+tests:
+  ###############################################
+  # Unset: byte-for-byte the previous render    #
+  ###############################################
+  - it: renders no ConfigMap when the field is unset
+    templates:
+      - templates/image-factory-ca.yaml
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  - it: leaves certConfigMap off the DataVolume when the field is unset
+    templates:
+      - templates/nodegroup.yaml
+    asserts:
+      - notExists:
+          path: spec.template.spec.virtualMachineTemplate.spec.dataVolumeTemplates[0].spec.source.http.certConfigMap
+        documentSelector: {path: kind, value: KubevirtMachineTemplate}
+
+  - it: treats a whitespace-only value as unset rather than rendering an empty bundle
+    templates:
+      - templates/image-factory-ca.yaml
+    set:
+      # A trailing newline left by an editor must not produce a ConfigMap whose
+      # only content is whitespace — CDI would mount it, read no certificate,
+      # and fail verification with a far less obvious message.
+      talos.imageFactoryCA: "  \n  "
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  ###############################################
+  # Set: ConfigMap + reference, names agreeing  #
+  ###############################################
+  - it: renders the CA ConfigMap when the field is set
+    templates:
+      - templates/image-factory-ca.yaml
+    set:
+      talos.imageFactoryCA: |
+        -----BEGIN CERTIFICATE-----
+        MIIBkDCCATWgAwIBAgIUYQvjA+rtcpuJZ414ETcZjPLYYHEwCgYIKoZIzj0EAwIw
+        HDEaMBgGA1UEAwwRY296eXN0YWNrLXRlc3QtY2EwIBcNMjYwODEzMTQzNTM4WhgP
+        MjEyNjA3MjAxNDM1MzhaMBwxGjAYBgNVBAMMEWNvenlzdGFjay10ZXN0LWNhMFkw
+        EwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEkYVY3hFc1GJaDFRqOkUoZV6IqFW6GsbI
+        qoQgvEq3KYAZcmrb2ZbP2LsCyCojMOEzoF5d1RJc41lQeXv9eS4ERKNTMFEwHQYD
+        VR0OBBYEFKbTnhLk/2Bb2jRjDyZic0F1ZYSPMB8GA1UdIwQYMBaAFKbTnhLk/2Bb
+        2jRjDyZic0F1ZYSPMA8GA1UdEwEB/wQFMAMBAf8wCgYIKoZIzj0EAwIDSQAwRgIh
+        ANa5qSwy8bEa4lCFsYEgmtNm4EJ3wWlwzqLrotemRkILAiEAjH8pB4pNvmyRTkI0
+        uDdynL2YtgHPfcQVfBb98CKq7yI=
+        -----END CERTIFICATE-----
+    asserts:
+      - hasDocuments:
+          count: 1
+      - isKind:
+          of: ConfigMap
+      - equal:
+          path: metadata.name
+          value: kubernetes-nodes-myk8s-md0-talos-factory-ca
+      # The key name is free — CDI reads every file in the mounted directory —
+      # but it must exist and carry the certificate, not an empty string.
+      - matchRegex:
+          path: data["ca.pem"]
+          pattern: "^-----BEGIN CERTIFICATE-----"
+      - matchRegex:
+          path: data["ca.pem"]
+          pattern: "-----END CERTIFICATE-----\\s*$"
+
+  - it: points the DataVolume at that ConfigMap by the same name
+    templates:
+      - templates/nodegroup.yaml
+    set:
+      talos.imageFactoryCA: |
+        -----BEGIN CERTIFICATE-----
+        MIIBkDCCATWgAwIBAgIUYQvjA+rtcpuJZ414ETcZjPLYYHEwCgYIKoZIzj0EAwIw
+        HDEaMBgGA1UEAwwRY296eXN0YWNrLXRlc3QtY2EwIBcNMjYwODEzMTQzNTM4WhgP
+        MjEyNjA3MjAxNDM1MzhaMBwxGjAYBgNVBAMMEWNvenlzdGFjay10ZXN0LWNhMFkw
+        EwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEkYVY3hFc1GJaDFRqOkUoZV6IqFW6GsbI
+        qoQgvEq3KYAZcmrb2ZbP2LsCyCojMOEzoF5d1RJc41lQeXv9eS4ERKNTMFEwHQYD
+        VR0OBBYEFKbTnhLk/2Bb2jRjDyZic0F1ZYSPMB8GA1UdIwQYMBaAFKbTnhLk/2Bb
+        2jRjDyZic0F1ZYSPMA8GA1UdEwEB/wQFMAMBAf8wCgYIKoZIzj0EAwIDSQAwRgIh
+        ANa5qSwy8bEa4lCFsYEgmtNm4EJ3wWlwzqLrotemRkILAiEAjH8pB4pNvmyRTkI0
+        uDdynL2YtgHPfcQVfBb98CKq7yI=
+        -----END CERTIFICATE-----
+    asserts:
+      - equal:
+          path: spec.template.spec.virtualMachineTemplate.spec.dataVolumeTemplates[0].spec.source.http.certConfigMap
+          value: kubernetes-nodes-myk8s-md0-talos-factory-ca
+        documentSelector: {path: kind, value: KubevirtMachineTemplate}
+      # The URL is untouched by the CA plumbing: trusting a factory and choosing
+      # one are separate decisions, and a pool may set either alone.
+      - matchRegex:
+          path: spec.template.spec.virtualMachineTemplate.spec.dataVolumeTemplates[0].spec.source.http.url
+          pattern: "openstack-amd64\\.raw\\.xz$"
+        documentSelector: {path: kind, value: KubevirtMachineTemplate}
+
+  - it: accepts a chain of more than one certificate
+    templates:
+      - templates/image-factory-ca.yaml
+    set:
+      # An internal PKI usually presents intermediate + root, so a multi-block
+      # bundle is the common case rather than an edge one.
+      talos.imageFactoryCA: |
+        -----BEGIN CERTIFICATE-----
+        MIIBkDCCATWgAwIBAgIUYQvjA+rtcpuJZ414ETcZjPLYYHEwCgYIKoZIzj0EAwIw
+        HDEaMBgGA1UEAwwRY296eXN0YWNrLXRlc3QtY2EwIBcNMjYwODEzMTQzNTM4WhgP
+        MjEyNjA3MjAxNDM1MzhaMBwxGjAYBgNVBAMMEWNvenlzdGFjay10ZXN0LWNhMFkw
+        EwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEkYVY3hFc1GJaDFRqOkUoZV6IqFW6GsbI
+        qoQgvEq3KYAZcmrb2ZbP2LsCyCojMOEzoF5d1RJc41lQeXv9eS4ERKNTMFEwHQYD
+        VR0OBBYEFKbTnhLk/2Bb2jRjDyZic0F1ZYSPMB8GA1UdIwQYMBaAFKbTnhLk/2Bb
+        2jRjDyZic0F1ZYSPMA8GA1UdEwEB/wQFMAMBAf8wCgYIKoZIzj0EAwIDSQAwRgIh
+        ANa5qSwy8bEa4lCFsYEgmtNm4EJ3wWlwzqLrotemRkILAiEAjH8pB4pNvmyRTkI0
+        uDdynL2YtgHPfcQVfBb98CKq7yI=
+        -----END CERTIFICATE-----
+        -----BEGIN CERTIFICATE-----
+        MIIBkDCCATWgAwIBAgIUYQvjA+rtcpuJZ414ETcZjPLYYHEwCgYIKoZIzj0EAwIw
+        HDEaMBgGA1UEAwwRY296eXN0YWNrLXRlc3QtY2EwIBcNMjYwODEzMTQzNTM4WhgP
+        MjEyNjA3MjAxNDM1MzhaMBwxGjAYBgNVBAMMEWNvenlzdGFjay10ZXN0LWNhMFkw
+        EwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEkYVY3hFc1GJaDFRqOkUoZV6IqFW6GsbI
+        qoQgvEq3KYAZcmrb2ZbP2LsCyCojMOEzoF5d1RJc41lQeXv9eS4ERKNTMFEwHQYD
+        VR0OBBYEFKbTnhLk/2Bb2jRjDyZic0F1ZYSPMB8GA1UdIwQYMBaAFKbTnhLk/2Bb
+        2jRjDyZic0F1ZYSPMA8GA1UdEwEB/wQFMAMBAf8wCgYIKoZIzj0EAwIDSQAwRgIh
+        ANa5qSwy8bEa4lCFsYEgmtNm4EJ3wWlwzqLrotemRkILAiEAjH8pB4pNvmyRTkI0
+        uDdynL2YtgHPfcQVfBb98CKq7yI=
+        -----END CERTIFICATE-----
+    asserts:
+      - hasDocuments:
+          count: 1
+      - isKind:
+          of: ConfigMap
+
+  ###############################################
+  # Clone path: the field has no effect         #
+  ###############################################
+  # certConfigMap belongs to source.http, and a builtin pool renders source.pvc
+  # instead — the reference must not appear there, and neither should the
+  # ConfigMap it would have pointed at.
+  - it: renders no ConfigMap for a pool cloning a golden image
+    templates:
+      - templates/image-factory-ca.yaml
+    set:
+      osImage:
+        builtin: {}
+      talos.imageFactoryCA: |
+        -----BEGIN CERTIFICATE-----
+        MIIBkDCCATWgAwIBAgIUYQvjA+rtcpuJZ414ETcZjPLYYHEwCgYIKoZIzj0EAwIw
+        HDEaMBgGA1UEAwwRY296eXN0YWNrLXRlc3QtY2EwIBcNMjYwODEzMTQzNTM4WhgP
+        MjEyNjA3MjAxNDM1MzhaMBwxGjAYBgNVBAMMEWNvenlzdGFjay10ZXN0LWNhMFkw
+        EwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEkYVY3hFc1GJaDFRqOkUoZV6IqFW6GsbI
+        qoQgvEq3KYAZcmrb2ZbP2LsCyCojMOEzoF5d1RJc41lQeXv9eS4ERKNTMFEwHQYD
+        VR0OBBYEFKbTnhLk/2Bb2jRjDyZic0F1ZYSPMB8GA1UdIwQYMBaAFKbTnhLk/2Bb
+        2jRjDyZic0F1ZYSPMA8GA1UdEwEB/wQFMAMBAf8wCgYIKoZIzj0EAwIDSQAwRgIh
+        ANa5qSwy8bEa4lCFsYEgmtNm4EJ3wWlwzqLrotemRkILAiEAjH8pB4pNvmyRTkI0
+        uDdynL2YtgHPfcQVfBb98CKq7yI=
+        -----END CERTIFICATE-----
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  - it: leaves the clone source untouched when the field is set on a builtin pool
+    templates:
+      - templates/nodegroup.yaml
+    set:
+      osImage:
+        builtin: {}
+      talos.imageFactoryCA: |
+        -----BEGIN CERTIFICATE-----
+        MIIBkDCCATWgAwIBAgIUYQvjA+rtcpuJZ414ETcZjPLYYHEwCgYIKoZIzj0EAwIw
+        HDEaMBgGA1UEAwwRY296eXN0YWNrLXRlc3QtY2EwIBcNMjYwODEzMTQzNTM4WhgP
+        MjEyNjA3MjAxNDM1MzhaMBwxGjAYBgNVBAMMEWNvenlzdGFjay10ZXN0LWNhMFkw
+        EwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEkYVY3hFc1GJaDFRqOkUoZV6IqFW6GsbI
+        qoQgvEq3KYAZcmrb2ZbP2LsCyCojMOEzoF5d1RJc41lQeXv9eS4ERKNTMFEwHQYD
+        VR0OBBYEFKbTnhLk/2Bb2jRjDyZic0F1ZYSPMB8GA1UdIwQYMBaAFKbTnhLk/2Bb
+        2jRjDyZic0F1ZYSPMA8GA1UdEwEB/wQFMAMBAf8wCgYIKoZIzj0EAwIDSQAwRgIh
+        ANa5qSwy8bEa4lCFsYEgmtNm4EJ3wWlwzqLrotemRkILAiEAjH8pB4pNvmyRTkI0
+        uDdynL2YtgHPfcQVfBb98CKq7yI=
+        -----END CERTIFICATE-----
+    asserts:
+      - equal:
+          path: spec.template.spec.virtualMachineTemplate.spec.dataVolumeTemplates[0].spec.source.pvc.name
+          value: talos-worker-ce4c980550dd2ab1b17bbf2b08801c7eb59418eafe8f279833297925d67c7515-v1.13.6
+        documentSelector: {path: kind, value: KubevirtMachineTemplate}
+      - notExists:
+          path: spec.template.spec.virtualMachineTemplate.spec.dataVolumeTemplates[0].spec.source.http
+        documentSelector: {path: kind, value: KubevirtMachineTemplate}
+
+  ###############################################
+  # Fail-closed guards (cozy-lib.tls.validateCACert) #
+  ###############################################
+  # Both templates gate on the same validating helper, but a full render aborts
+  # on the FIRST failing template — nodegroup.yaml, which helm renders before
+  # image-factory-ca.yaml — so these cases assert there, on the error an
+  # operator would actually see. The rules themselves (which inputs are
+  # refused, and why) are pinned at the helper in packages/tests/cozy-lib-tests.
+  - it: refuses a private key
+    templates:
+      - templates/nodegroup.yaml
+    set:
+      talos.imageFactoryCA: |
+        -----BEGIN EC PRIVATE KEY-----
+        MHcCAQEEexampleprivatekeymaterialthatmustnotreachaconfigmap000000
+        -----END EC PRIVATE KEY-----
+    asserts:
+      - failedTemplate:
+          errorMessage: "cozy-lib.tls.validateCACert: talos.imageFactoryCA must not contain private key material"
+
+  - it: refuses a certificate bundle that also carries a private key
+    templates:
+      - templates/nodegroup.yaml
+    set:
+      # The realistic accident: `cat ca.pem key.pem` into the field. A valid
+      # leading certificate must not let the trailing key through.
+      talos.imageFactoryCA: |
+        -----BEGIN CERTIFICATE-----
+        MIIBkDCCATWgAwIBAgIUYQvjA+rtcpuJZ414ETcZjPLYYHEwCgYIKoZIzj0EAwIw
+        HDEaMBgGA1UEAwwRY296eXN0YWNrLXRlc3QtY2EwIBcNMjYwODEzMTQzNTM4WhgP
+        MjEyNjA3MjAxNDM1MzhaMBwxGjAYBgNVBAMMEWNvenlzdGFjay10ZXN0LWNhMFkw
+        EwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEkYVY3hFc1GJaDFRqOkUoZV6IqFW6GsbI
+        qoQgvEq3KYAZcmrb2ZbP2LsCyCojMOEzoF5d1RJc41lQeXv9eS4ERKNTMFEwHQYD
+        VR0OBBYEFKbTnhLk/2Bb2jRjDyZic0F1ZYSPMB8GA1UdIwQYMBaAFKbTnhLk/2Bb
+        2jRjDyZic0F1ZYSPMA8GA1UdEwEB/wQFMAMBAf8wCgYIKoZIzj0EAwIDSQAwRgIh
+        ANa5qSwy8bEa4lCFsYEgmtNm4EJ3wWlwzqLrotemRkILAiEAjH8pB4pNvmyRTkI0
+        uDdynL2YtgHPfcQVfBb98CKq7yI=
+        -----END CERTIFICATE-----
+        -----BEGIN PRIVATE KEY-----
+        MIIExamplePrivateKeyThatMustNotBePublishedIntoAConfigMap00000000
+        -----END PRIVATE KEY-----
+    asserts:
+      - failedTemplate:
+          errorMessage: "cozy-lib.tls.validateCACert: talos.imageFactoryCA must not contain private key material"
+
+  - it: refuses input that is not a certificate
+    templates:
+      - templates/nodegroup.yaml
+    set:
+      talos.imageFactoryCA: "this is not a certificate at all"
+    asserts:
+      - failedTemplate:
+          errorMessage: "cozy-lib.tls.validateCACert: talos.imageFactoryCA must contain a complete PEM certificate block (BEGIN/END CERTIFICATE)"
+
+  - it: refuses certificate armour with no closing line
+    templates:
+      - templates/nodegroup.yaml
+    set:
+      # A truncated paste carries the BEGIN line, so a header-only check would
+      # admit it and mount a bundle CDI can make no use of.
+      talos.imageFactoryCA: |
+        -----BEGIN CERTIFICATE-----
+        MIIBkDCCATWgAwIBAgIUYQvjA+rtcpuJZ414ETcZjPLYYHEwCgYIKoZIzj0EAwIw
+    asserts:
+      - failedTemplate:
+          errorMessage: "cozy-lib.tls.validateCACert: talos.imageFactoryCA must contain a complete PEM certificate block (BEGIN/END CERTIFICATE)"
+
+  - it: refuses a certificate wrapped in openssl's human-readable preamble
+    templates:
+      - templates/nodegroup.yaml
+    set:
+      # What `openssl x509 -text` prints above the block. The value is emitted
+      # verbatim, so leading bytes would ride into the ConfigMap.
+      talos.imageFactoryCA: |
+        Certificate:
+            Data:
+                Version: 3 (0x2)
+        -----BEGIN CERTIFICATE-----
+        MIIBkDCCATWgAwIBAgIUYQvjA+rtcpuJZ414ETcZjPLYYHEwCgYIKoZIzj0EAwIw
+        HDEaMBgGA1UEAwwRY296eXN0YWNrLXRlc3QtY2EwIBcNMjYwODEzMTQzNTM4WhgP
+        MjEyNjA3MjAxNDM1MzhaMBwxGjAYBgNVBAMMEWNvenlzdGFjay10ZXN0LWNhMFkw
+        EwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEkYVY3hFc1GJaDFRqOkUoZV6IqFW6GsbI
+        qoQgvEq3KYAZcmrb2ZbP2LsCyCojMOEzoF5d1RJc41lQeXv9eS4ERKNTMFEwHQYD
+        VR0OBBYEFKbTnhLk/2Bb2jRjDyZic0F1ZYSPMB8GA1UdIwQYMBaAFKbTnhLk/2Bb
+        2jRjDyZic0F1ZYSPMA8GA1UdEwEB/wQFMAMBAf8wCgYIKoZIzj0EAwIDSQAwRgIh
+        ANa5qSwy8bEa4lCFsYEgmtNm4EJ3wWlwzqLrotemRkILAiEAjH8pB4pNvmyRTkI0
+        uDdynL2YtgHPfcQVfBb98CKq7yI=
+        -----END CERTIFICATE-----
+    asserts:
+      - failedTemplate:
+          errorMessage: "cozy-lib.tls.validateCACert: talos.imageFactoryCA must contain a complete PEM certificate block (BEGIN/END CERTIFICATE)"
+
+  # Not covered here, because it cannot reach the template: a non-string value
+  # (an unquoted numeric scalar, say) is rejected by values.schema.json before
+  # rendering starts — "at '/talos/imageFactoryCA': got number, want string".
+  # The helper still coerces to string so it fails with its own message in any
+  # context where the schema is not applied; that path is pinned in
+  # packages/tests/cozy-lib-tests.
diff --git a/packages/apps/kubernetes-nodes/tests/talos_reconcile_job_test.yaml b/packages/apps/kubernetes-nodes/tests/talos_reconcile_job_test.yaml
new file mode 100644
index 0000000000..2e70b822d7
--- /dev/null
+++ b/packages/apps/kubernetes-nodes/tests/talos_reconcile_job_test.yaml
@@ -0,0 +1,80 @@
+suite: talos-reconcile Job TalosConfigTemplate name
+
+# TalosConfigTemplate.spec is immutable (webhook
+# vtalosconfigtemplate.cluster.x-k8s.io), so the object can only ever be created,
+# never updated: applied under a fixed name it freezes this pool's worker machine
+# config at first creation and every later change is rejected server-side
+# (cozystack/cozystack#3515). The name therefore carries a content hash of the
+# rendered spec.
+#
+# The literal below must stay identical to the MachineDeployment
+# bootstrap.configRef assertion in nodegroup_test.yaml — helm-unittest cannot
+# compare two templates in one assertion, and a divergence leaves CAPI blocked on
+# "templates do not exist" with no worker ever created.
+
+templates:
+  - templates/talos-reconcile-job.yaml
+release:
+  name: kubernetes-nodes-myk8s-md0
+  namespace: tenant-test
+set:
+  cluster: myk8s
+  _cluster:
+    cluster-domain: cozy.local
+  version: "v1.35"
+  minReplicas: 0
+  maxReplicas: 3
+  instanceType: ""
+  diskSize: 20Gi
+  storageClass: replicated
+  roles:
+    - ingress-nginx
+  resources:
+    cpu: "2"
+    memory: 4Gi
+  gpus: []
+  kubelet: {}
+
+tests:
+  - it: applies the TalosConfigTemplate under that same hashed name
+    documentSelector:
+      path: kind
+      value: Job
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].env[?(@.name=="TCT_NAME")].value
+          value: kubernetes-myk8s-md0-ffdbe1
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: 'name: \$\{TCT_NAME\}'
+      # ... and never the fixed <release>-<group> name, which is what the
+      # immutability webhook rejected on every reconcile after the first.
+      - notMatchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: 'name: \$\{RELEASE\}-\$\{GROUP_NAME\}'
+
+  # A GPU node group adds `nodeLabels: {gpu: "on"}` to the machine config, so
+  # the spec — and therefore the name — differs from the pair above. Two things
+  # are pinned here. First, the propagation that was impossible before the fix:
+  # new content lands on a NEW template instead of a rejected mutation, and CAPI
+  # rolls the workers onto it. Second, and the reason the fixture is GPU-shaped
+  # rather than another falsy default: the baseline above renders with
+  # instanceType "", gpus [] and kubelet {}, all falsy, so it cannot tell apart
+  # a group dict that carries those keys from one that omits them. The name is a
+  # hash of the spec these values render, and the Job and the MachineDeployment
+  # must compute it from the same dict — assembling it twice would let a dropped
+  # key diverge the two names invisibly and leave CAPI blocked on "templates do
+  # not exist" with no worker ever created. Truthy `gpus` makes such a
+  # divergence fail here.
+  - it: a machine-config change rotates the name the Job applies
+    documentSelector:
+      path: kind
+      value: Job
+    set:
+      gpus:
+        - name: nvidia.com/GH200
+    asserts:
+      # Same literal as the paired test in nodegroup_test.yaml.
+      - equal:
+          path: spec.template.spec.containers[0].env[?(@.name=="TCT_NAME")].value
+          value: kubernetes-myk8s-md0-0f8081
diff --git a/packages/apps/kubernetes-nodes/tests/talos_reconcile_server_side_apply_test.yaml b/packages/apps/kubernetes-nodes/tests/talos_reconcile_server_side_apply_test.yaml
new file mode 100644
index 0000000000..8d3cab1f25
--- /dev/null
+++ b/packages/apps/kubernetes-nodes/tests/talos_reconcile_server_side_apply_test.yaml
@@ -0,0 +1,47 @@
+suite: worker TalosConfigTemplate is applied server-side
+
+# The reconcile Job runs under a 256Mi limit. A client-side apply builds its merge
+# patch from the cluster's full OpenAPI schema, which costs ~290Mi RSS against a
+# management cluster carrying a few hundred CRDs, so the Job is OOMKilled on every
+# reconcile that updates an existing TalosConfigTemplate -- that is, on every chart
+# upgrade, while the create on first install stays cheap and hides the fault.
+
+templates:
+  - templates/talos-reconcile-job.yaml
+release:
+  name: kubernetes-nodes-myk8s-md0
+  namespace: tenant-test
+set:
+  cluster: myk8s
+  _cluster:
+    cluster-domain: cozy.local
+  version: "v1.35"
+  minReplicas: 0
+  maxReplicas: 3
+  instanceType: ""
+  diskSize: 20Gi
+  storageClass: replicated
+  roles:
+    - ingress-nginx
+  resources:
+    cpu: "2"
+    memory: 4Gi
+
+tests:
+  - it: applies the TalosConfigTemplate server-side
+    asserts:
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: 'kubectl apply --server-side --force-conflicts -f -'
+        documentSelector:
+          path: kind
+          value: Job
+
+  - it: never falls back to a client-side apply
+    asserts:
+      - notMatchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: 'kubectl apply -f -'
+        documentSelector:
+          path: kind
+          value: Job
diff --git a/packages/apps/kubernetes-nodes/tests/talos_tct_immutable_test.yaml b/packages/apps/kubernetes-nodes/tests/talos_tct_immutable_test.yaml
new file mode 100644
index 0000000000..27f69ef446
--- /dev/null
+++ b/packages/apps/kubernetes-nodes/tests/talos_tct_immutable_test.yaml
@@ -0,0 +1,103 @@
+suite: TalosConfigTemplate replacement on an immutable spec
+# CABPT's validating webhook rejects any change to spec, so the Job's kubectl
+# apply fails the moment any input the render depends on genuinely changes —
+# the apiserver address being the one that moves in practice. What is pinned
+# here is that the Job replaces it, that it only does so for that specific
+# failure, and that it may delete nothing else.
+templates:
+  - templates/talos-reconcile-job.yaml
+release:
+  name: kubernetes-nodes-myk8s-md0
+  namespace: tenant-test
+set:
+  cluster: myk8s
+  _cluster:
+    cluster-domain: cozy.local
+  version: "v1.35"
+tests:
+  - it: replaces the template when the apiserver reports it immutable
+    documentSelector:
+      path: kind
+      value: Job
+    asserts:
+      # Anchored to the case label: the comment above it and the echo inside the
+      # branch both contain the words, so matching them anywhere would stay green
+      # with the label turned into `*)`, deleting the template on any error.
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: '(?m)^\s*\*"is immutable"\*\)\s*$'
+      # The target in full: a delete naming anything but the template this Job
+      # applies would take out a sibling pool's, or the pre-hash one the
+      # outgoing MachineSet still references, and a prefix match would not see
+      # it.
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: 'kubectl delete talosconfigtemplate "\$\{TCT_NAME\}" -n "\$NS"'
+
+  # Any other apply error must stop the Job: a delete followed by a create that
+  # fails for the same reason would leave the pool with no template at all.
+  - it: still fails the Job on any other apply error
+    documentSelector:
+      path: kind
+      value: Job
+    asserts:
+      # Anchored to the `*)` branch. A bare `exit 1` pattern passes on the one
+      # the input-timeout path already has near the top of the script, so it
+      # stays green with this branch's `exit 1` deleted.
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: '(?s)\*\)\s*\n\s*echo "\$APPLY_OUT" >&2\s*\n\s*exit 1'
+
+  - it: may delete only this pool's own template
+    documentSelector:
+      path: kind
+      value: Role
+    asserts:
+      # The name is this pool's content-hash one. Which hash is not pinned here:
+      # that it equals the name the Job applies and the MachineDeployment
+      # references is hack/check-talosconfigtemplate-name-agreement.bats' job.
+      - matchRegex:
+          path: rules[?(@.resources[0] == "talosconfigtemplates" && @.verbs[0] == "delete")].resourceNames[0]
+          pattern: '^kubernetes-myk8s-md0-[0-9a-f]{6}$'
+      - lengthEqual:
+          path: rules[?(@.resources[0] == "talosconfigtemplates" && @.verbs[0] == "delete")].resourceNames
+          count: 1
+      # delete must stay bound to this pool's own template: an unnamed rule
+      # carrying it, alone or folded into the unnamed create, would let the Job
+      # remove a sibling pool's template.
+      - notContains:
+          path: rules
+          content:
+            apiGroups: ["bootstrap.cluster.x-k8s.io"]
+            resources: ["talosconfigtemplates"]
+            verbs: ["delete"]
+      - notContains:
+          path: rules
+          content:
+            apiGroups: ["bootstrap.cluster.x-k8s.io"]
+            resources: ["talosconfigtemplates"]
+            verbs: ["create", "delete"]
+
+  # Several clusters can share a tenant namespace, so an unnamed get/patch/update
+  # would let this Job rewrite a sibling pool's machineconfig. create cannot be
+  # narrowed by RBAC and stays unnamed.
+  - it: may read and write only this pool's own template
+    documentSelector:
+      path: kind
+      value: Role
+    asserts:
+      # The name is this pool's content-hash one. Which hash is not pinned here:
+      # that it equals the name the Job applies and the MachineDeployment
+      # references is hack/check-talosconfigtemplate-name-agreement.bats' job.
+      - matchRegex:
+          path: rules[?(@.resources[0] == "talosconfigtemplates" && @.verbs[0] == "get")].resourceNames[0]
+          pattern: '^kubernetes-myk8s-md0-[0-9a-f]{6}$'
+      - lengthEqual:
+          path: rules[?(@.resources[0] == "talosconfigtemplates" && @.verbs[0] == "get")].resourceNames
+          count: 1
+      - notContains:
+          path: rules
+          content:
+            apiGroups: ["bootstrap.cluster.x-k8s.io"]
+            resources: ["talosconfigtemplates"]
+            verbs: ["get", "create", "patch", "update"]
diff --git a/packages/apps/kubernetes-nodes/tests/talos_worker_config_test.yaml b/packages/apps/kubernetes-nodes/tests/talos_worker_config_test.yaml
new file mode 100644
index 0000000000..47b14dcd12
--- /dev/null
+++ b/packages/apps/kubernetes-nodes/tests/talos_worker_config_test.yaml
@@ -0,0 +1,104 @@
+suite: Talos worker machineconfig (GPU labels + kubelet reservations)
+
+# The worker TalosConfigTemplate is not rendered directly by helm — the pool's
+# reconcile Job (templates/talos-reconcile-job.yaml) carries the machineconfig
+# as a string literal in its container command and applies it at runtime. These
+# assert on the rendered Job script:
+#   - GPU pools must inject nodeLabels gpu=on so HAMi's device plugin
+#     (nodeSelector gpu=on) schedules and advertises nvidia.com/gpu;
+#   - kubelet reservation overrides must reach the machineconfig kubelet config.
+# Ported from the parent chart's gpu_node_labels_test / kubelet_reservation_test.
+
+templates:
+  - templates/talos-reconcile-job.yaml
+
+release:
+  name: kubernetes-nodes-myk8s-md0
+  namespace: tenant-test
+
+set:
+  cluster: myk8s
+  _cluster:
+    cluster-domain: cozy.local
+  version: "v1.35"
+  minReplicas: 0
+  maxReplicas: 10
+  instanceType: ""
+  diskSize: 20Gi
+  storageClass: replicated
+  roles: []
+  resources:
+    cpu: "8"
+    memory: 16Gi
+
+tests:
+  - it: labels GPU pools with gpu=on
+    set:
+      gpus:
+        - name: nvidia.com/GH200
+    documentSelector:
+      path: kind
+      value: Job
+    asserts:
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: 'nodeLabels:\s*\n\s+gpu: "on"'
+
+  - it: does not label non-GPU pools with gpu=on
+    set:
+      gpus: []
+    documentSelector:
+      path: kind
+      value: Job
+    asserts:
+      - notMatchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: 'gpu: "on"'
+
+  - it: applies kubelet reservation overrides in the machineconfig
+    set:
+      gpus: []
+      kubelet:
+        systemReservedMemory: 512Mi
+        kubeReservedMemory: 512Mi
+        systemReservedCpu: 100m
+        kubeReservedCpu: 100m
+    documentSelector:
+      path: kind
+      value: Job
+    asserts:
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: 'systemReserved:\s*\n\s+cpu: "100m"\s*\n\s+memory: "512Mi"'
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: 'kubeReserved:\s*\n\s+cpu: "100m"\s*\n\s+memory: "512Mi"'
+
+  # On proxmox the worker kubelet runs with an external cloud provider: the
+  # node is tainted uninitialized until the cloud-controller-manager clears it
+  # and applies the topology labels the CSI node plugin needs. On kubevirt no
+  # controller would ever clear that taint, so the flag must not be there.
+  - it: runs the kubelet with an external cloud provider on proxmox
+    set:
+      substrate: proxmox
+      proxmox:
+        templateTags: [capmox-template, talos]
+        network:
+          bridge: vmbr0
+        dnsServers: ["8.8.8.8"]
+    documentSelector:
+      path: kind
+      value: Job
+    asserts:
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: 'extraArgs:\s*\n\s+cloud-provider: external'
+
+  - it: leaves the kubevirt kubelet without a cloud provider, so no node is tainted for nothing
+    documentSelector:
+      path: kind
+      value: Job
+    asserts:
+      - notMatchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: 'cloud-provider: external'
diff --git a/packages/apps/kubernetes-nodes/tests/worker_image_cloned_pool_test.yaml b/packages/apps/kubernetes-nodes/tests/worker_image_cloned_pool_test.yaml
new file mode 100644
index 0000000000..1bc4adb8a3
--- /dev/null
+++ b/packages/apps/kubernetes-nodes/tests/worker_image_cloned_pool_test.yaml
@@ -0,0 +1,219 @@
+suite: osImage.builtin golden guards on a pool that has already cloned
+
+# The absence and Failed guards abort the ENTIRE KubernetesNodes HelmRelease, and
+# for a pool whose workers all cloned long ago that price buys nothing: replica
+# changes, kubelet retuning and MachineHealthCheck timeouts have no stake in the
+# golden, and no CR edit is needed to trigger the abort — the next periodic
+# reconcile does it. So the loud failure is scoped to a pool still waiting for
+# its first disk.
+#
+# Separate suite because the fixture is the whole point: helm-unittest merges a
+# per-test kubernetesProvider into the suite-level objects rather than replacing
+# them, so a cluster that already holds this pool's cloned disk cannot be
+# expressed inside the sibling suite.
+
+templates:
+  - templates/nodegroup.yaml
+
+release:
+  name: kubernetes-nodes-myk8s-md0
+  namespace: tenant-test
+
+set:
+  cluster: myk8s
+  _cluster:
+    cluster-domain: cozy.local
+  version: "v1.35"
+  minReplicas: 1
+  maxReplicas: 3
+  instanceType: u1.medium
+  diskSize: 20Gi
+  storageClass: replicated
+  roles: [ingress-nginx]
+
+kubernetesProvider:
+  scheme:
+    "instancetype.kubevirt.io/v1beta1/VirtualMachineClusterInstancetype":
+      gvr: {group: instancetype.kubevirt.io, version: v1beta1, resource: virtualmachineclusterinstancetypes}
+      namespaced: false
+    "cluster.x-k8s.io/v1beta1/MachineSet":
+      gvr: {group: cluster.x-k8s.io, version: v1beta1, resource: machinesets}
+      namespaced: true
+    "infrastructure.cluster.x-k8s.io/v1alpha1/KubevirtMachineTemplate":
+      gvr: {group: infrastructure.cluster.x-k8s.io, version: v1alpha1, resource: kubevirtmachinetemplates}
+      namespaced: true
+    "cdi.kubevirt.io/v1beta1/DataVolume":
+      gvr: {group: cdi.kubevirt.io, version: v1beta1, resource: datavolumes}
+      namespaced: true
+    "storage.k8s.io/v1/StorageClass":
+      gvr: {group: storage.k8s.io, version: v1, resource: storageclasses}
+      namespaced: false
+  objects:
+    - kind: VirtualMachineClusterInstancetype
+      apiVersion: instancetype.kubevirt.io/v1beta1
+      metadata: {name: u1.medium}
+    - kind: MachineSet
+      apiVersion: cluster.x-k8s.io/v1beta1
+      metadata: {name: ignored-ms, namespace: tenant-test}
+      spec: {template: {spec: {infrastructureRef: {kind: Other, name: ignored}}}}
+    - kind: KubevirtMachineTemplate
+      apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
+      metadata: {name: ignored-kmt, namespace: tenant-test}
+    - kind: StorageClass
+      apiVersion: storage.k8s.io/v1
+      metadata: {name: replicated}
+    # This pool's own worker disk, cloned and populated. Each disk names its pool
+    # in an annotation; CAPK's own name for it is
+    # disk-system-<clusterName>-<groupName>-<machine id>.
+    - kind: DataVolume
+      apiVersion: cdi.kubevirt.io/v1beta1
+      metadata:
+        name: disk-system-kubernetes-myk8s-md0-abcde
+        namespace: tenant-test
+        annotations:
+          kubernetes-worker-image.cozystack.io/golden: talos-worker-gone-v1.0.0
+          kubernetes-worker-image.cozystack.io/pool: kubernetes-myk8s-md0
+      status: {phase: Succeeded}
+    # Another pool of the same cluster, cloned from the golden that later failed.
+    # Its existence must not speak for md0.
+    - kind: DataVolume
+      apiVersion: cdi.kubevirt.io/v1beta1
+      metadata:
+        name: disk-system-kubernetes-myk8s-md1-abcde
+        namespace: tenant-test
+        annotations:
+          kubernetes-worker-image.cozystack.io/golden: talos-worker-failed-v1.0.0
+          kubernetes-worker-image.cozystack.io/pool: kubernetes-myk8s-md1
+      status: {phase: Succeeded}
+    # The sibling whose NAME starts with this pool's: disk-system-kubernetes-myk8s-md0-gpu-*
+    # carries the disk-system-kubernetes-myk8s-md0- prefix. Matching on the name
+    # would let md0-gpu answer for md0.
+    - kind: DataVolume
+      apiVersion: cdi.kubevirt.io/v1beta1
+      metadata:
+        name: disk-system-kubernetes-myk8s-md0-gpu-abcde
+        namespace: tenant-test
+        annotations:
+          kubernetes-worker-image.cozystack.io/golden: talos-worker-sibling-v1.0.0
+          kubernetes-worker-image.cozystack.io/pool: kubernetes-myk8s-md0-gpu
+      status: {phase: Succeeded}
+    - kind: DataVolume
+      apiVersion: cdi.kubevirt.io/v1beta1
+      metadata: {name: talos-worker-sibling-v1.0.0, namespace: cozy-public}
+      spec:
+        storage:
+          resources: {requests: {storage: 6Gi}}
+          storageClassName: replicated
+      status: {phase: Failed}
+    # md0's disk against a third golden, still importing: not yet proof that this
+    # pool is past needing the source.
+    - kind: DataVolume
+      apiVersion: cdi.kubevirt.io/v1beta1
+      metadata:
+        name: disk-system-kubernetes-myk8s-md0-fghij
+        namespace: tenant-test
+        annotations:
+          kubernetes-worker-image.cozystack.io/golden: talos-worker-pending-v1.0.0
+          kubernetes-worker-image.cozystack.io/pool: kubernetes-myk8s-md0
+      status: {phase: CloneInProgress}
+    - kind: DataVolume
+      apiVersion: cdi.kubevirt.io/v1beta1
+      metadata: {name: talos-worker-failed-v1.0.0, namespace: cozy-public}
+      spec:
+        storage:
+          resources: {requests: {storage: 6Gi}}
+          storageClassName: replicated
+      status: {phase: Failed}
+    # md0's own disk against a golden that failed only later. This is the case the
+    # gate exists for: the pool is whole, needs nothing from the source, and its
+    # release must not abort on the next reconcile.
+    - kind: DataVolume
+      apiVersion: cdi.kubevirt.io/v1beta1
+      metadata:
+        name: disk-system-kubernetes-myk8s-md0-klmno
+        namespace: tenant-test
+        annotations:
+          kubernetes-worker-image.cozystack.io/golden: talos-worker-brokelater-v1.0.0
+          kubernetes-worker-image.cozystack.io/pool: kubernetes-myk8s-md0
+      status: {phase: Succeeded}
+    - kind: DataVolume
+      apiVersion: cdi.kubevirt.io/v1beta1
+      metadata: {name: talos-worker-brokelater-v1.0.0, namespace: cozy-public}
+      spec:
+        storage:
+          resources: {requests: {storage: 6Gi}}
+          storageClassName: replicated
+      status: {phase: Failed}
+    - kind: DataVolume
+      apiVersion: cdi.kubevirt.io/v1beta1
+      metadata: {name: talos-worker-pending-v1.0.0, namespace: cozy-public}
+      spec:
+        storage:
+          resources: {requests: {storage: 6Gi}}
+          storageClassName: replicated
+      status: {phase: Failed}
+
+tests:
+  - it: renders when the golden is gone but this pool already cloned it
+    set:
+      osImage:
+        builtin:
+          schematicID: gone
+          version: v1.0.0
+    asserts:
+      - equal:
+          path: spec.template.spec.virtualMachineTemplate.spec.dataVolumeTemplates[0].spec.source.pvc.name
+          value: talos-worker-gone-v1.0.0
+        documentSelector: {path: kind, value: KubevirtMachineTemplate}
+
+  # Only another pool cloned this one, so md0 is still waiting for a first disk
+  # and the loud failure is the right signal.
+  - it: still fails on a Failed golden when only another pool has cloned it
+    set:
+      osImage:
+        builtin:
+          schematicID: failed
+          version: v1.0.0
+    asserts:
+      - failedTemplate:
+          errorPattern: 'golden DataVolume "talos-worker-failed-v1\.0\.0" in cozy-public failed to import'
+
+  # This pool has a disk against that golden, but the clone has not finished, so
+  # it is not yet evidence that the pool can do without the source.
+  - it: still fails on a Failed golden when this pool's own clone is unfinished
+    set:
+      osImage:
+        builtin:
+          schematicID: pending
+          version: v1.0.0
+    asserts:
+      - failedTemplate:
+          errorPattern: 'golden DataVolume "talos-worker-pending-v1\.0\.0" in cozy-public failed to import'
+
+  # The Failed guard's own gate, which nothing above reaches: the golden is
+  # Failed AND this pool already cloned it, so the render proceeds. Without this
+  # case the (not $poolCloned) conjunct can be deleted and the suite stays green.
+  - it: renders when the golden went Failed after this pool had already cloned it
+    set:
+      osImage:
+        builtin:
+          schematicID: brokelater
+          version: v1.0.0
+    asserts:
+      - equal:
+          path: spec.template.spec.virtualMachineTemplate.spec.dataVolumeTemplates[0].spec.source.pvc.name
+          value: talos-worker-brokelater-v1.0.0
+        documentSelector: {path: kind, value: KubevirtMachineTemplate}
+
+  # A sibling pool whose name this pool's name is a prefix of. md0-gpu cloned the
+  # golden and md0 never did, so md0 is still waiting for a first disk and the
+  # guard must fire. Matching disks by name prefix passes this case wrongly.
+  - it: does not let a sibling pool whose name shares this pool's prefix answer for it
+    set:
+      osImage:
+        builtin:
+          schematicID: sibling
+          version: v1.0.0
+    asserts:
+      - failedTemplate:
+          errorPattern: 'golden DataVolume "talos-worker-sibling-v1\.0\.0" in cozy-public failed to import'
diff --git a/packages/apps/kubernetes-nodes/tests/worker_image_default_storageclass_test.yaml b/packages/apps/kubernetes-nodes/tests/worker_image_default_storageclass_test.yaml
new file mode 100644
index 0000000000..f016597fcd
--- /dev/null
+++ b/packages/apps/kubernetes-nodes/tests/worker_image_default_storageclass_test.yaml
@@ -0,0 +1,158 @@
+suite: osImage.builtin cross-StorageClass guard against a cluster default class
+
+# The sibling suite worker_image_source_test.yaml runs against a cluster with no
+# default StorageClass, which is the arm where an empty class on either side stays
+# unresolvable and the comparison is skipped. This one supplies a default class, so
+# the empty side resolves and the comparison is made. It is a separate suite
+# because helm-unittest merges a per-test kubernetesProvider into the suite-level
+# objects rather than replacing them, so one file cannot present two different
+# clusters.
+
+templates:
+  - templates/nodegroup.yaml
+
+release:
+  name: kubernetes-nodes-myk8s-md0
+  namespace: tenant-test
+
+set:
+  cluster: myk8s
+  _cluster:
+    cluster-domain: cozy.local
+  version: "v1.35"
+  minReplicas: 1
+  maxReplicas: 3
+  instanceType: u1.medium
+  diskSize: 20Gi
+  roles: [ingress-nginx]
+
+kubernetesProvider:
+  scheme:
+    "instancetype.kubevirt.io/v1beta1/VirtualMachineClusterInstancetype":
+      gvr: {group: instancetype.kubevirt.io, version: v1beta1, resource: virtualmachineclusterinstancetypes}
+      namespaced: false
+    "cluster.x-k8s.io/v1beta1/MachineSet":
+      gvr: {group: cluster.x-k8s.io, version: v1beta1, resource: machinesets}
+      namespaced: true
+    "infrastructure.cluster.x-k8s.io/v1alpha1/KubevirtMachineTemplate":
+      gvr: {group: infrastructure.cluster.x-k8s.io, version: v1alpha1, resource: kubevirtmachinetemplates}
+      namespaced: true
+    "cdi.kubevirt.io/v1beta1/DataVolume":
+      gvr: {group: cdi.kubevirt.io, version: v1beta1, resource: datavolumes}
+      namespaced: true
+    "storage.k8s.io/v1/StorageClass":
+      gvr: {group: storage.k8s.io, version: v1, resource: storageclasses}
+      namespaced: false
+    "v1/PersistentVolumeClaim":
+      gvr: {group: "", version: v1, resource: persistentvolumeclaims}
+      namespaced: true
+  objects:
+    - kind: VirtualMachineClusterInstancetype
+      apiVersion: instancetype.kubevirt.io/v1beta1
+      metadata: {name: u1.medium}
+    - kind: MachineSet
+      apiVersion: cluster.x-k8s.io/v1beta1
+      metadata: {name: ignored-ms, namespace: tenant-test}
+      spec: {template: {spec: {infrastructureRef: {kind: Other, name: ignored}}}}
+    - kind: KubevirtMachineTemplate
+      apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
+      metadata: {name: ignored-kmt, namespace: tenant-test}
+    - kind: StorageClass
+      apiVersion: storage.k8s.io/v1
+      metadata:
+        name: replicated
+        annotations:
+          storageclass.kubernetes.io/is-default-class: "true"
+    - kind: StorageClass
+      apiVersion: storage.k8s.io/v1
+      metadata: {name: local}
+    # A golden on the cluster default: its spec carries no storageClassName.
+    - kind: DataVolume
+      apiVersion: cdi.kubevirt.io/v1beta1
+      metadata: {name: talos-worker-nosc-v1.0.0, namespace: cozy-public}
+      spec:
+        storage:
+          resources: {requests: {storage: 6Gi}}
+      status: {phase: Succeeded}
+    # A golden that declares no class in its spec but whose PVC was bound to an
+    # explicit one -- what a golden created before the cluster's default moved
+    # looks like. The spec says nothing; the PVC is the authority.
+    - kind: DataVolume
+      apiVersion: cdi.kubevirt.io/v1beta1
+      metadata: {name: talos-worker-pvcclass-v1.0.0, namespace: cozy-public}
+      spec:
+        storage:
+          resources: {requests: {storage: 6Gi}}
+      status: {phase: Succeeded, claimName: talos-worker-pvcclass-v1.0.0}
+    - kind: PersistentVolumeClaim
+      apiVersion: v1
+      metadata: {name: talos-worker-pvcclass-v1.0.0, namespace: cozy-public}
+      spec: {storageClassName: local}
+    # The golden for the chart's default talos.*, on an explicit class.
+    - kind: DataVolume
+      apiVersion: cdi.kubevirt.io/v1beta1
+      metadata:
+        name: talos-worker-ce4c980550dd2ab1b17bbf2b08801c7eb59418eafe8f279833297925d67c7515-v1.13.6
+        namespace: cozy-public
+      spec:
+        storage:
+          resources: {requests: {storage: 6Gi}}
+          storageClassName: replicated
+      status: {phase: Succeeded}
+
+tests:
+  # Guaranteed NOT to be a clone, and the case an unresolved empty class waved
+  # through: the pool is on an explicit class, the golden is on the cluster
+  # default, and the two differ. CDI would fall back to the host-assisted copy
+  # over the pod network — silently, which is the transfer this feature removes.
+  - it: fails when the golden takes a cluster default class the pool does not use
+    set:
+      storageClass: local
+      osImage:
+        builtin:
+          schematicID: nosc
+          version: v1.0.0
+    asserts:
+      - failedTemplate:
+          errorPattern: 'storageClass "local" differs from golden image "talos-worker-nosc-v1\.0\.0" storageClass "replicated"'
+
+  # The same resolution from the other side: an empty POOL class landing on the
+  # class the golden already sits on is a clone, not a refusal.
+  - it: clones when an empty pool storageClass resolves to the golden's class
+    set:
+      storageClass: ""
+      osImage:
+        builtin: {}
+    asserts:
+      - equal:
+          path: spec.template.spec.virtualMachineTemplate.spec.dataVolumeTemplates[0].spec.source.pvc.name
+          value: talos-worker-ce4c980550dd2ab1b17bbf2b08801c7eb59418eafe8f279833297925d67c7515-v1.13.6
+        documentSelector: {path: kind, value: KubevirtMachineTemplate}
+
+  # Both sides empty and both resolving to the same default is still a clone.
+  - it: clones when both the pool and the golden are on the cluster default
+    set:
+      storageClass: ""
+      osImage:
+        builtin:
+          schematicID: nosc
+          version: v1.0.0
+    asserts:
+      - equal:
+          path: spec.template.spec.virtualMachineTemplate.spec.dataVolumeTemplates[0].spec.source.pvc.name
+          value: talos-worker-nosc-v1.0.0
+        documentSelector: {path: kind, value: KubevirtMachineTemplate}
+
+  # Reading the spec alone would call this golden "on the cluster default", which
+  # is `replicated` here, and clone it for a `replicated` pool. Its PVC is on
+  # `local`, so that clone would silently be a host-assisted copy.
+  - it: takes a blank-spec golden's class from its PVC, not from today's default
+    set:
+      storageClass: replicated
+      osImage:
+        builtin:
+          schematicID: pvcclass
+          version: v1.0.0
+    asserts:
+      - failedTemplate:
+          errorPattern: 'storageClass "replicated" differs from golden image "talos-worker-pvcclass-v1\.0\.0" storageClass "local"'
diff --git a/packages/apps/kubernetes-nodes/tests/worker_image_frozen_storageclass_test.yaml b/packages/apps/kubernetes-nodes/tests/worker_image_frozen_storageclass_test.yaml
new file mode 100644
index 0000000000..4077d3dd49
--- /dev/null
+++ b/packages/apps/kubernetes-nodes/tests/worker_image_frozen_storageclass_test.yaml
@@ -0,0 +1,312 @@
+suite: osImage.builtin compares frozen classes for a pool that has already cloned
+
+# Resolving an empty storageClass made the cross-class comparison possible, and
+# then made its two sides different in kind: the golden's came from its bound PVC
+# and could not move, the pool's came from today's cluster default and could. An
+# admin moving storageclass.kubernetes.io/is-default-class then failed the whole
+# release of a pool whose disks were all on the right class and which had changed
+# nothing.
+#
+# This cluster is mid-swap: the default annotation now sits on `fast-nvme`, while
+# the golden and one pool's disks were bound back when it sat on `replicated`.
+
+templates:
+  - templates/nodegroup.yaml
+
+release:
+  name: kubernetes-nodes-myk8s-md0
+  namespace: tenant-test
+
+set:
+  cluster: myk8s
+  _cluster:
+    cluster-domain: cozy.local
+  version: "v1.35"
+  minReplicas: 1
+  maxReplicas: 3
+  instanceType: u1.medium
+  diskSize: 20Gi
+  storageClass: ""
+  roles: [ingress-nginx]
+
+kubernetesProvider:
+  scheme:
+    "instancetype.kubevirt.io/v1beta1/VirtualMachineClusterInstancetype":
+      gvr: {group: instancetype.kubevirt.io, version: v1beta1, resource: virtualmachineclusterinstancetypes}
+      namespaced: false
+    "cluster.x-k8s.io/v1beta1/MachineSet":
+      gvr: {group: cluster.x-k8s.io, version: v1beta1, resource: machinesets}
+      namespaced: true
+    "infrastructure.cluster.x-k8s.io/v1alpha1/KubevirtMachineTemplate":
+      gvr: {group: infrastructure.cluster.x-k8s.io, version: v1alpha1, resource: kubevirtmachinetemplates}
+      namespaced: true
+    "cdi.kubevirt.io/v1beta1/DataVolume":
+      gvr: {group: cdi.kubevirt.io, version: v1beta1, resource: datavolumes}
+      namespaced: true
+    "storage.k8s.io/v1/StorageClass":
+      gvr: {group: storage.k8s.io, version: v1, resource: storageclasses}
+      namespaced: false
+    "v1/PersistentVolumeClaim":
+      gvr: {group: "", version: v1, resource: persistentvolumeclaims}
+      namespaced: true
+  objects:
+    - kind: VirtualMachineClusterInstancetype
+      apiVersion: instancetype.kubevirt.io/v1beta1
+      metadata: {name: u1.medium}
+    - kind: MachineSet
+      apiVersion: cluster.x-k8s.io/v1beta1
+      metadata: {name: ignored-ms, namespace: tenant-test}
+      spec: {template: {spec: {infrastructureRef: {kind: Other, name: ignored}}}}
+    - kind: KubevirtMachineTemplate
+      apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
+      metadata: {name: ignored-kmt, namespace: tenant-test}
+    # The class the golden and md0's disks were bound on, no longer the default.
+    - kind: StorageClass
+      apiVersion: storage.k8s.io/v1
+      metadata: {name: replicated, creationTimestamp: "2026-01-01T00:00:00Z"}
+    # Today's default, moved here after both were bound.
+    - kind: StorageClass
+      apiVersion: storage.k8s.io/v1
+      metadata:
+        name: fast-nvme
+        creationTimestamp: "2026-06-01T00:00:00Z"
+        annotations:
+          storageclass.kubernetes.io/is-default-class: "true"
+    - kind: DataVolume
+      apiVersion: cdi.kubevirt.io/v1beta1
+      metadata: {name: talos-worker-aaa-v1.13.6, namespace: cozy-public}
+      spec:
+        storage:
+          resources: {requests: {storage: 6Gi}}
+          storageClassName: replicated
+      status: {phase: Succeeded}
+    # md0's own worker disk, cloned while `replicated` was still the default, and
+    # its PVC, which is where the class it actually sits on is recorded.
+    - kind: DataVolume
+      apiVersion: cdi.kubevirt.io/v1beta1
+      metadata:
+        name: disk-system-kubernetes-myk8s-md0-abcde
+        namespace: tenant-test
+        annotations:
+          kubernetes-worker-image.cozystack.io/golden: talos-worker-aaa-v1.13.6
+          kubernetes-worker-image.cozystack.io/pool: kubernetes-myk8s-md0
+      status: {phase: Succeeded}
+    - kind: PersistentVolumeClaim
+      apiVersion: v1
+      metadata: {name: disk-system-kubernetes-myk8s-md0-abcde, namespace: tenant-test}
+      spec: {storageClassName: replicated}
+    # A golden nobody has cloned yet, for the not-yet-cloned arm.
+    - kind: DataVolume
+      apiVersion: cdi.kubevirt.io/v1beta1
+      metadata: {name: talos-worker-fresh-v1.13.6, namespace: cozy-public}
+      spec:
+        storage:
+          resources: {requests: {storage: 6Gi}}
+          storageClassName: replicated
+      status: {phase: Succeeded}
+    # The same arm, but on today's default, so the comparison passes and the render
+    # reaches the disk template.
+    - kind: DataVolume
+      apiVersion: cdi.kubevirt.io/v1beta1
+      metadata: {name: talos-worker-onnvme-v1.13.6, namespace: cozy-public}
+      spec:
+        storage:
+          resources: {requests: {storage: 6Gi}}
+          storageClassName: fast-nvme
+      status: {phase: Succeeded}
+    # A golden whose spec states BOTH a class and a size, while its PVC states
+    # different ones. The spec is what the catalog declared and what a new clone is
+    # measured against, so it has to win; the PVC is consulted only when the spec is
+    # silent.
+    - kind: DataVolume
+      apiVersion: cdi.kubevirt.io/v1beta1
+      metadata: {name: talos-worker-specwins-v1.13.6, namespace: cozy-public}
+      spec:
+        storage:
+          resources: {requests: {storage: 6Gi}}
+          storageClassName: replicated
+      status: {phase: Succeeded, claimName: talos-worker-specwins-v1.13.6}
+    - kind: PersistentVolumeClaim
+      apiVersion: v1
+      metadata: {name: talos-worker-specwins-v1.13.6, namespace: cozy-public}
+      spec:
+        storageClassName: local
+        resources: {requests: {storage: 20Gi}}
+    # A golden on `local`, and a disk of this pool cloned from it whose PVC says
+    # `replicated`. A pool that declares its class outright is authoritative -- the
+    # field is immutable, so the declaration is already frozen -- and the PVC must
+    # not overrule it.
+    - kind: DataVolume
+      apiVersion: cdi.kubevirt.io/v1beta1
+      metadata: {name: talos-worker-onlocal-v1.13.6, namespace: cozy-public}
+      spec:
+        storage:
+          resources: {requests: {storage: 6Gi}}
+          storageClassName: local
+      status: {phase: Succeeded}
+    - kind: DataVolume
+      apiVersion: cdi.kubevirt.io/v1beta1
+      metadata:
+        name: disk-system-kubernetes-myk8s-md0-fghij
+        namespace: tenant-test
+        annotations:
+          kubernetes-worker-image.cozystack.io/golden: talos-worker-onlocal-v1.13.6
+          kubernetes-worker-image.cozystack.io/pool: kubernetes-myk8s-md0
+      status: {phase: Succeeded}
+    - kind: PersistentVolumeClaim
+      apiVersion: v1
+      metadata: {name: disk-system-kubernetes-myk8s-md0-fghij, namespace: tenant-test}
+      spec: {storageClassName: replicated}
+    # A golden whose spec states no size at all; its PVC states the allocated one.
+    - kind: DataVolume
+      apiVersion: cdi.kubevirt.io/v1beta1
+      metadata: {name: talos-worker-sizefrompvc-v1.13.6, namespace: cozy-public}
+      spec:
+        storage:
+          storageClassName: replicated
+      status: {phase: Succeeded, claimName: talos-worker-sizefrompvc-v1.13.6}
+    - kind: PersistentVolumeClaim
+      apiVersion: v1
+      metadata: {name: talos-worker-sizefrompvc-v1.13.6, namespace: cozy-public}
+      spec:
+        storageClassName: replicated
+        resources: {requests: {storage: 6Gi}}
+
+tests:
+  # The repro. Nothing about this pool or its catalog entry changed; only the
+  # cluster's default annotation moved. Its disks are on `replicated`, the golden
+  # is on `replicated`, and the render must proceed.
+  - it: renders a cloned pool at empty storageClass after the cluster default moved
+    set:
+      osImage:
+        builtin:
+          schematicID: aaa
+          version: v1.13.6
+    asserts:
+      - equal:
+          path: spec.template.spec.virtualMachineTemplate.spec.dataVolumeTemplates[0].spec.source.pvc.name
+          value: talos-worker-aaa-v1.13.6
+        documentSelector: {path: kind, value: KubevirtMachineTemplate}
+      # And the disk binds on the class the guard just compared. Leaving the field
+      # out here passed the guard and then bound the next disk on `fast-nvme`, one
+      # class away from the golden, which is the host-assisted copy the guard is
+      # there to refuse.
+      - equal:
+          path: spec.template.spec.virtualMachineTemplate.spec.dataVolumeTemplates[0].spec.storage.storageClassName
+          value: replicated
+        documentSelector: {path: kind, value: KubevirtMachineTemplate}
+
+  # A pool with no disk yet has no frozen class to read, so it renders today's
+  # default -- the class its first clone really will land on, and the one the
+  # guard compared to let it through.
+  - it: renders today's default class for a builtin pool that has not cloned yet
+    set:
+      osImage:
+        builtin:
+          schematicID: onnvme
+          version: v1.13.6
+    asserts:
+      - equal:
+          path: spec.template.spec.virtualMachineTemplate.spec.dataVolumeTemplates[0].spec.storage.storageClassName
+          value: fast-nvme
+        documentSelector: {path: kind, value: KubevirtMachineTemplate}
+
+  # The HTTP path is untouched by any of this: with both levels of storageClass
+  # empty it still omits the field, which is what keeps the pre-feature render --
+  # and the KubevirtMachineTemplate hash named after it -- byte-identical, so a
+  # pool that never adopts osImage does not re-image on upgrade.
+  - it: leaves storageClassName out on the HTTP path at an empty storageClass
+    asserts:
+      - notExists:
+          path: spec.template.spec.virtualMachineTemplate.spec.dataVolumeTemplates[0].spec.storage.storageClassName
+        documentSelector: {path: kind, value: KubevirtMachineTemplate}
+
+  # And the guard is not simply switched off for a cloned pool: a pool with no
+  # disk yet is compared against today's default, which is the class its first
+  # clone would really land on, so this one is refused.
+  - it: still refuses a pool that has not cloned when today's default differs from the golden
+    set:
+      osImage:
+        builtin:
+          schematicID: fresh
+          version: v1.13.6
+    asserts:
+      - failedTemplate:
+          errorPattern: 'storageClass "fast-nvme" differs from golden image "talos-worker-fresh-v1\.13\.6" storageClass "replicated"'
+
+  # That message resolved a side from the default, so it says so and names it.
+  - it: names the cluster default when a side was resolved from it
+    set:
+      osImage:
+        builtin:
+          schematicID: fresh
+          version: v1.13.6
+    asserts:
+      - failedTemplate:
+          errorPattern: 'An empty storageClass was resolved to the cluster default StorageClass "fast-nvme"'
+
+  # With both sides explicit nothing was resolved from the default, and the
+  # sentence is absent rather than reporting an empty lookup. The two sentences
+  # it used to sit between are adjacent here.
+  - it: does not name a cluster default it never consulted
+    set:
+      storageClass: local
+      osImage:
+        builtin:
+          schematicID: fresh
+          version: v1.13.6
+    asserts:
+      - failedTemplate:
+          errorPattern: 'host-assisted copy over the pod network\. Neither side can be moved in place'
+
+  # The size floor reads the PVC when the DataVolume spec omits a size, so a
+  # golden it could size no longer slips past unmeasured.
+  - it: takes the golden size from its PVC when the DataVolume spec omits it
+    set:
+      diskSize: 1Gi
+      storageClass: replicated
+      osImage:
+        builtin:
+          schematicID: sizefrompvc
+          version: v1.13.6
+    asserts:
+      - failedTemplate:
+          errorPattern: 'diskSize 1Gi is smaller than golden image "talos-worker-sizefrompvc-v1\.13\.6" storage 6Gi'
+
+  # The PVC is a fallback, not an override. This golden declares `replicated` and
+  # 6Gi while its PVC says `local` and 20Gi; the render must use the declared pair,
+  # so a `replicated` pool at 10Gi goes through. Reading the PVC unconditionally
+  # would refuse it twice over, on the class and on the size.
+  - it: prefers the golden's declared class and size over its PVC
+    set:
+      storageClass: replicated
+      diskSize: 10Gi
+      osImage:
+        builtin:
+          schematicID: specwins
+          version: v1.13.6
+    asserts:
+      - equal:
+          path: spec.template.spec.virtualMachineTemplate.spec.dataVolumeTemplates[0].spec.source.pvc.name
+          value: talos-worker-specwins-v1.13.6
+        documentSelector: {path: kind, value: KubevirtMachineTemplate}
+
+  # And the same precedence on the pool's side: a pool that names its class is
+  # compared on that, not on what its existing disks happen to sit on.
+  - it: prefers the pool's declared class over its own cloned disk's PVC
+    set:
+      storageClass: local
+      osImage:
+        builtin:
+          schematicID: onlocal
+          version: v1.13.6
+    asserts:
+      - equal:
+          path: spec.template.spec.virtualMachineTemplate.spec.dataVolumeTemplates[0].spec.source.pvc.name
+          value: talos-worker-onlocal-v1.13.6
+        documentSelector: {path: kind, value: KubevirtMachineTemplate}
+      # The declaration reaches the disk too, not just the comparison.
+      - equal:
+          path: spec.template.spec.virtualMachineTemplate.spec.dataVolumeTemplates[0].spec.storage.storageClassName
+          value: local
+        documentSelector: {path: kind, value: KubevirtMachineTemplate}
diff --git a/packages/apps/kubernetes-nodes/tests/worker_image_golden_pvc_only_test.yaml b/packages/apps/kubernetes-nodes/tests/worker_image_golden_pvc_only_test.yaml
new file mode 100644
index 0000000000..98734df899
--- /dev/null
+++ b/packages/apps/kubernetes-nodes/tests/worker_image_golden_pvc_only_test.yaml
@@ -0,0 +1,116 @@
+suite: osImage.builtin accepts a golden that exists only as a PVC
+
+# CDI clones the golden's PVC, not its DataVolume, so a golden whose DataVolume
+# is gone -- garbage-collected under dataVolumeTTLSeconds, or a PVC restored on
+# its own -- is still a valid clone source. vm-disk accepts it; a worker pool
+# has to as well. The StorageClass and size guards read the PVC in that case,
+# so a PVC-only golden is not a way around them.
+
+templates:
+  - templates/nodegroup.yaml
+
+release:
+  name: kubernetes-nodes-myk8s-md0
+  namespace: tenant-test
+
+set:
+  cluster: myk8s
+  _cluster:
+    cluster-domain: cozy.local
+  version: "v1.35"
+  minReplicas: 1
+  maxReplicas: 3
+  instanceType: u1.medium
+  diskSize: 20Gi
+  storageClass: replicated
+  roles: [ingress-nginx]
+
+kubernetesProvider:
+  scheme:
+    "instancetype.kubevirt.io/v1beta1/VirtualMachineClusterInstancetype":
+      gvr: {group: instancetype.kubevirt.io, version: v1beta1, resource: virtualmachineclusterinstancetypes}
+      namespaced: false
+    "cluster.x-k8s.io/v1beta1/MachineSet":
+      gvr: {group: cluster.x-k8s.io, version: v1beta1, resource: machinesets}
+      namespaced: true
+    "infrastructure.cluster.x-k8s.io/v1alpha1/KubevirtMachineTemplate":
+      gvr: {group: infrastructure.cluster.x-k8s.io, version: v1alpha1, resource: kubevirtmachinetemplates}
+      namespaced: true
+    "cdi.kubevirt.io/v1beta1/DataVolume":
+      gvr: {group: cdi.kubevirt.io, version: v1beta1, resource: datavolumes}
+      namespaced: true
+    "storage.k8s.io/v1/StorageClass":
+      gvr: {group: storage.k8s.io, version: v1, resource: storageclasses}
+      namespaced: false
+    "v1/PersistentVolumeClaim":
+      gvr: {group: "", version: v1, resource: persistentvolumeclaims}
+      namespaced: true
+  objects:
+    - kind: VirtualMachineClusterInstancetype
+      apiVersion: instancetype.kubevirt.io/v1beta1
+      metadata: {name: u1.medium}
+    - kind: MachineSet
+      apiVersion: cluster.x-k8s.io/v1beta1
+      metadata: {name: ignored-ms, namespace: tenant-test}
+      spec: {template: {spec: {infrastructureRef: {kind: Other, name: ignored}}}}
+    - kind: KubevirtMachineTemplate
+      apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
+      metadata: {name: ignored-kmt, namespace: tenant-test}
+    - kind: StorageClass
+      apiVersion: storage.k8s.io/v1
+      metadata: {name: replicated}
+    # Registers the DataVolume LIST kind; no golden DataVolume exists in this file.
+    - kind: DataVolume
+      apiVersion: cdi.kubevirt.io/v1beta1
+      metadata: {name: unrelated, namespace: tenant-test}
+    - kind: PersistentVolumeClaim
+      apiVersion: v1
+      metadata: {name: talos-worker-pvconly-v1.13.6, namespace: cozy-public}
+      spec:
+        storageClassName: replicated
+        resources: {requests: {storage: 6Gi}}
+
+tests:
+  - it: clones a golden that has a PVC and no DataVolume
+    set:
+      osImage:
+        builtin:
+          schematicID: pvconly
+          version: v1.13.6
+    asserts:
+      - equal:
+          path: spec.template.spec.virtualMachineTemplate.spec.dataVolumeTemplates[0].spec.source.pvc.name
+          value: talos-worker-pvconly-v1.13.6
+        documentSelector: {path: kind, value: KubevirtMachineTemplate}
+
+  - it: still refuses a golden that has neither a DataVolume nor a PVC
+    set:
+      osImage:
+        builtin:
+          schematicID: missing
+          version: v1.13.6
+    asserts:
+      - failedTemplate:
+          errorPattern: 'golden image "talos-worker-missing-v1\.13\.6" not found in cozy-public'
+
+  - it: compares the pool storageClass against the PVC-only golden's
+    set:
+      storageClass: local
+      osImage:
+        builtin:
+          schematicID: pvconly
+          version: v1.13.6
+    asserts:
+      - failedTemplate:
+          errorPattern: 'storageClass "local" differs from golden image "talos-worker-pvconly-v1\.13\.6" storageClass "replicated"'
+
+  - it: compares the pool diskSize against the PVC-only golden's size
+    set:
+      diskSize: 4Gi
+      osImage:
+        builtin:
+          schematicID: pvconly
+          version: v1.13.6
+    asserts:
+      - failedTemplate:
+          errorPattern: 'diskSize 4Gi is smaller than golden image "talos-worker-pvconly-v1\.13\.6" storage 6Gi'
diff --git a/packages/apps/kubernetes-nodes/tests/worker_image_installer_test.yaml b/packages/apps/kubernetes-nodes/tests/worker_image_installer_test.yaml
new file mode 100644
index 0000000000..0d40fcc5ad
--- /dev/null
+++ b/packages/apps/kubernetes-nodes/tests/worker_image_installer_test.yaml
@@ -0,0 +1,60 @@
+suite: per-pool worker image — in-guest upgrade installer
+
+# The talos-reconcile Job builds the pool's install.image from the pool's
+# resolved (schematicID, version) — osImage.builtin / osImage.factory, or the pool's
+# talos.* when omitted — so an in-guest upgrade reinstalls the OS the pool
+# actually booted rather than flipping it back to the pool default.
+
+templates:
+  - templates/talos-reconcile-job.yaml
+
+release:
+  name: kubernetes-nodes-myk8s-md0
+  namespace: tenant-test
+
+set:
+  cluster: myk8s
+  _cluster:
+    cluster-domain: cozy.local
+  version: "v1.35"
+  minReplicas: 1
+  maxReplicas: 3
+  instanceType: ""
+  diskSize: 20Gi
+  storageClass: replicated
+  roles: [ingress-nginx]
+  resources:
+    cpu: "8"
+    memory: 16Gi
+
+tests:
+  - it: install.image pins the pool's own schematicID/version
+    set:
+      osImage:
+        factory:
+          schematicID: deadbeef
+          version: v1.14.0
+    asserts:
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: 'image: factory\.talos\.dev/installer/deadbeef:v1\.14\.0'
+        documentSelector: {path: kind, value: Job}
+
+  - it: install.image falls back to the pool talos.* when image is omitted
+    asserts:
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: 'image: factory\.talos\.dev/installer/ce4c980550dd2ab1b17bbf2b08801c7eb59418eafe8f279833297925d67c7515:v1\.13\.6'
+        documentSelector: {path: kind, value: Job}
+
+  - it: install.image pins a builtin pool's schematicID/version
+    set:
+      osImage:
+        builtin:
+          schematicID: cafebabe
+          version: v1.15.0
+    asserts:
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: 'image: factory\.talos\.dev/installer/cafebabe:v1\.15\.0'
+        documentSelector: {path: kind, value: Job}
diff --git a/packages/apps/kubernetes-nodes/tests/worker_image_source_test.yaml b/packages/apps/kubernetes-nodes/tests/worker_image_source_test.yaml
new file mode 100644
index 0000000000..2794e824b9
--- /dev/null
+++ b/packages/apps/kubernetes-nodes/tests/worker_image_source_test.yaml
@@ -0,0 +1,466 @@
+suite: per-pool worker image source (osImage.builtin / osImage.factory)
+
+# Exercises the disk-system source selection in templates/nodegroup.yaml:
+#   - osImage omitted / osImage.factory -> HTTP import from the Image Factory;
+#   - osImage.builtin                 -> CDI clone of the golden DataVolume in
+#                                      cozy-public (talos-worker-<schematicID>-<version>).
+# The golden DataVolume and the CAPI LIST kinds are mocked via kubernetesProvider;
+# lookup() is otherwise empty under `helm template`. The default talos.* is
+# schematicID ce4c98…/v1.13.6, so the default golden name is
+# talos-worker-ce4c980550dd2ab1b17bbf2b08801c7eb59418eafe8f279833297925d67c7515-v1.13.6.
+#
+# The no-worker-roll invariant (an image-omitted pool must render a
+# KubevirtMachineTemplate whose content-hash name is unchanged by this feature) is
+# pinned by tests/render_snapshot_test.yaml, whose stored snapshot predates it.
+
+templates:
+  - templates/nodegroup.yaml
+
+release:
+  name: kubernetes-nodes-myk8s-md0
+  namespace: tenant-test
+
+set:
+  cluster: myk8s
+  _cluster:
+    cluster-domain: cozy.local
+  version: "v1.35"
+  minReplicas: 1
+  maxReplicas: 3
+  instanceType: u1.medium
+  diskSize: 20Gi
+  storageClass: replicated
+  roles: [ingress-nginx]
+
+kubernetesProvider:
+  scheme:
+    "instancetype.kubevirt.io/v1beta1/VirtualMachineClusterInstancetype":
+      gvr: {group: instancetype.kubevirt.io, version: v1beta1, resource: virtualmachineclusterinstancetypes}
+      namespaced: false
+    "cluster.x-k8s.io/v1beta1/MachineSet":
+      gvr: {group: cluster.x-k8s.io, version: v1beta1, resource: machinesets}
+      namespaced: true
+    "infrastructure.cluster.x-k8s.io/v1alpha1/KubevirtMachineTemplate":
+      gvr: {group: infrastructure.cluster.x-k8s.io, version: v1alpha1, resource: kubevirtmachinetemplates}
+      namespaced: true
+    "cdi.kubevirt.io/v1beta1/DataVolume":
+      gvr: {group: cdi.kubevirt.io, version: v1beta1, resource: datavolumes}
+      namespaced: true
+    # The cross-class guard resolves an empty storageClass on either side against
+    # the cluster's default StorageClass, so the LIST kind has to be registered
+    # even for the cases that declare no StorageClass object.
+    "storage.k8s.io/v1/StorageClass":
+      gvr: {group: storage.k8s.io, version: v1, resource: storageclasses}
+      namespaced: false
+  objects:
+    - kind: VirtualMachineClusterInstancetype
+      apiVersion: instancetype.kubevirt.io/v1beta1
+      metadata: {name: u1.medium}
+    # A non-default StorageClass, so the LIST kind is registered with the fake
+    # client and this cluster has NO default class -- the arm where an empty
+    # storageClass on either side stays unresolvable and the comparison is
+    # skipped. The default-class arm gets its own provider below.
+    - kind: StorageClass
+      apiVersion: storage.k8s.io/v1
+      metadata: {name: replicated}
+    # Dummy CAPI objects so the MachineSet / KubevirtMachineTemplate LIST kinds
+    # (old-template-preservation loop) are registered with the fake client.
+    - kind: MachineSet
+      apiVersion: cluster.x-k8s.io/v1beta1
+      metadata: {name: ignored-ms, namespace: tenant-test}
+      spec: {template: {spec: {infrastructureRef: {kind: Other, name: ignored}}}}
+    - kind: KubevirtMachineTemplate
+      apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
+      metadata: {name: ignored-kmt, namespace: tenant-test}
+    # The golden for the default talos.* (present and populated, so builtin clones
+    # succeed). storage 6Gi and storageClassName replicated mirror the catalog
+    # defaults, giving the diskSize>=golden and same-StorageClass guards real values
+    # to compare against; phase Succeeded satisfies the readiness gate.
+    - kind: DataVolume
+      apiVersion: cdi.kubevirt.io/v1beta1
+      metadata:
+        name: talos-worker-ce4c980550dd2ab1b17bbf2b08801c7eb59418eafe8f279833297925d67c7515-v1.13.6
+        namespace: cozy-public
+      spec:
+        storage:
+          resources:
+            requests:
+              storage: 6Gi
+          storageClassName: replicated
+      status:
+        phase: Succeeded
+    # A golden mid-import: transient, so the render proceeds and CDI holds the
+    # worker DataVolume until the source is populated.
+    - kind: DataVolume
+      apiVersion: cdi.kubevirt.io/v1beta1
+      metadata:
+        name: talos-worker-importing-v1.0.0
+        namespace: cozy-public
+      spec:
+        storage:
+          resources:
+            requests:
+              storage: 6Gi
+          storageClassName: replicated
+      status:
+        phase: ImportInProgress
+    # A golden whose import terminally failed: never recovers on its own, so the
+    # render fails rather than pinning workers to a source that will never populate.
+    - kind: DataVolume
+      apiVersion: cdi.kubevirt.io/v1beta1
+      metadata:
+        name: talos-worker-failed-v1.0.0
+        namespace: cozy-public
+      spec:
+        storage:
+          resources:
+            requests:
+              storage: 6Gi
+          storageClassName: replicated
+      status:
+        phase: Failed
+    # A populated golden that declares no storage request at all. The size guard
+    # reads spec.storage.resources.requests.storage, so its presence gate is the
+    # branch that decides between comparing and skipping; without a fixture the
+    # term could be deleted and every case would stay green.
+    - kind: DataVolume
+      apiVersion: cdi.kubevirt.io/v1beta1
+      metadata: {name: talos-worker-nostorage-v1.0.0, namespace: cozy-public}
+      status: {phase: Succeeded}
+    # A populated golden with no storageClassName (cluster default), for the
+    # skip-when-unresolvable arm of the StorageClass guard.
+    - kind: DataVolume
+      apiVersion: cdi.kubevirt.io/v1beta1
+      metadata:
+        name: talos-worker-nosc-v1.0.0
+        namespace: cozy-public
+      spec:
+        storage:
+          resources:
+            requests:
+              storage: 6Gi
+      status:
+        phase: Succeeded
+
+tests:
+  - it: osImage omitted imports over HTTP from the pool talos.* factory (back-compat)
+    asserts:
+      - equal:
+          path: spec.template.spec.virtualMachineTemplate.spec.dataVolumeTemplates[0].spec.source.http.url
+          value: https://factory.talos.dev/image/ce4c980550dd2ab1b17bbf2b08801c7eb59418eafe8f279833297925d67c7515/v1.13.6/openstack-amd64.raw.xz
+        documentSelector: {path: kind, value: KubevirtMachineTemplate}
+      - equal:
+          path: spec.template.spec.virtualMachineTemplate.spec.dataVolumeTemplates[0].metadata.annotations
+          value:
+            cdi.kubevirt.io/storage.usePopulator: "false"
+        documentSelector: {path: kind, value: KubevirtMachineTemplate}
+
+  - it: empty osImage.factory imports over HTTP from the pool talos.* factory
+    set:
+      osImage:
+        factory: {}
+    asserts:
+      - equal:
+          path: spec.template.spec.virtualMachineTemplate.spec.dataVolumeTemplates[0].spec.source.http.url
+          value: https://factory.talos.dev/image/ce4c980550dd2ab1b17bbf2b08801c7eb59418eafe8f279833297925d67c7515/v1.13.6/openstack-amd64.raw.xz
+        documentSelector: {path: kind, value: KubevirtMachineTemplate}
+
+  - it: osImage.factory overrides import from the given mirror / schematic / version
+    set:
+      osImage:
+        factory:
+          imageFactoryURL: https://mirror.internal
+          schematicID: deadbeef
+          version: v1.14.0
+    asserts:
+      - equal:
+          path: spec.template.spec.virtualMachineTemplate.spec.dataVolumeTemplates[0].spec.source.http.url
+          value: https://mirror.internal/image/deadbeef/v1.14.0/openstack-amd64.raw.xz
+        documentSelector: {path: kind, value: KubevirtMachineTemplate}
+
+  - it: empty osImage.builtin clones the pool-default golden and omits usePopulator
+    set:
+      osImage:
+        builtin: {}
+    asserts:
+      - equal:
+          path: spec.template.spec.virtualMachineTemplate.spec.dataVolumeTemplates[0].spec.source.pvc.namespace
+          value: cozy-public
+        documentSelector: {path: kind, value: KubevirtMachineTemplate}
+      - equal:
+          path: spec.template.spec.virtualMachineTemplate.spec.dataVolumeTemplates[0].spec.source.pvc.name
+          value: talos-worker-ce4c980550dd2ab1b17bbf2b08801c7eb59418eafe8f279833297925d67c7515-v1.13.6
+        documentSelector: {path: kind, value: KubevirtMachineTemplate}
+      # usePopulator=false is what pins the legacy import behaviour, so the clone
+      # path must not carry it; the golden annotation replaces it there.
+      - notExists:
+          path: spec.template.spec.virtualMachineTemplate.spec.dataVolumeTemplates[0].metadata.annotations["cdi.kubevirt.io/storage.usePopulator"]
+        documentSelector: {path: kind, value: KubevirtMachineTemplate}
+      # And the clone names its source, so an operator can find every pool still
+      # pinning a golden before deleting it.
+      - equal:
+          path: spec.template.spec.virtualMachineTemplate.spec.dataVolumeTemplates[0].metadata.annotations["kubernetes-worker-image.cozystack.io/golden"]
+          value: talos-worker-ce4c980550dd2ab1b17bbf2b08801c7eb59418eafe8f279833297925d67c7515-v1.13.6
+        documentSelector: {path: kind, value: KubevirtMachineTemplate}
+
+  - it: osImage.builtin with an explicit schematicID/version clones that golden
+    set:
+      osImage:
+        builtin:
+          schematicID: ce4c980550dd2ab1b17bbf2b08801c7eb59418eafe8f279833297925d67c7515
+          version: v1.13.6
+    asserts:
+      - equal:
+          path: spec.template.spec.virtualMachineTemplate.spec.dataVolumeTemplates[0].spec.source.pvc.name
+          value: talos-worker-ce4c980550dd2ab1b17bbf2b08801c7eb59418eafe8f279833297925d67c7515-v1.13.6
+        documentSelector: {path: kind, value: KubevirtMachineTemplate}
+
+  - it: osImage.builtin fails the render when the requested golden is absent
+    set:
+      osImage:
+        builtin:
+          schematicID: doesnotexist
+          version: v9.9.9
+    asserts:
+      - failedTemplate:
+          errorPattern: 'osImage\.builtin requested golden image "talos-worker-doesnotexist-v9\.9\.9" not found in cozy-public'
+
+  - it: setting both osImage.builtin and osImage.factory fails the render
+    set:
+      osImage:
+        builtin: {}
+        factory: {}
+    asserts:
+      - failedTemplate:
+          errorPattern: 'set only one of osImage\.builtin or osImage\.factory'
+
+  - it: osImage.builtin fails when the worker diskSize is smaller than the golden storage
+    set:
+      diskSize: 4Gi
+      osImage:
+        builtin: {}
+    asserts:
+      - failedTemplate:
+          errorPattern: 'diskSize 4Gi is smaller than golden image .* storage 6Gi'
+
+  # A golden mid-import must NOT fail the render: a helm fail() aborts the whole
+  # KubernetesNodes HelmRelease of every pool pinned to that golden, which would
+  # block unrelated scale operations for the length of an import. CDI holds the
+  # worker DataVolume until the source populates, so rendering the clone is correct.
+  - it: osImage.builtin still clones while the golden is mid-import
+    set:
+      osImage:
+        builtin:
+          schematicID: importing
+          version: v1.0.0
+    asserts:
+      - equal:
+          path: spec.template.spec.virtualMachineTemplate.spec.dataVolumeTemplates[0].spec.source.pvc.name
+          value: talos-worker-importing-v1.0.0
+        documentSelector: {path: kind, value: KubevirtMachineTemplate}
+
+  # Terminal failure is the one phase worth aborting the render for: it never
+  # recovers without operator action, so cloning would block workers forever.
+  - it: osImage.builtin fails the render when the golden import terminally failed
+    set:
+      osImage:
+        builtin:
+          schematicID: failed
+          version: v1.0.0
+    asserts:
+      - failedTemplate:
+          errorPattern: 'golden DataVolume "talos-worker-failed-v1\.0\.0" in cozy-public failed to import \(phase Failed\)'
+
+  # Cross-StorageClass clone: CDI would silently fall back to a host-assisted copy
+  # over the pod network, the exact transfer osImage.builtin exists to avoid.
+  - it: osImage.builtin fails when the pool storageClass differs from the golden's
+    set:
+      storageClass: local
+      osImage:
+        builtin: {}
+    asserts:
+      - failedTemplate:
+          errorPattern: 'storageClass "local" differs from golden image .* storageClass "replicated"'
+
+  - it: osImage.builtin clones when the pool storageClass matches the golden's
+    set:
+      storageClass: replicated
+      osImage:
+        builtin: {}
+    asserts:
+      - equal:
+          path: spec.template.spec.virtualMachineTemplate.spec.dataVolumeTemplates[0].spec.source.pvc.name
+          value: talos-worker-ce4c980550dd2ab1b17bbf2b08801c7eb59418eafe8f279833297925d67c7515-v1.13.6
+        documentSelector: {path: kind, value: KubevirtMachineTemplate}
+
+  # The mirror of the case below, from the pool side: an empty POOL class with no
+  # default class to resolve it against stays unresolvable, so the comparison is
+  # skipped rather than guessed. Without this case the $workerSC presence term can
+  # be deleted and the suite stays green.
+  - it: osImage.builtin clones when an empty pool storageClass cannot be resolved
+    set:
+      storageClass: ""
+      osImage:
+        builtin: {}
+    asserts:
+      - equal:
+          path: spec.template.spec.virtualMachineTemplate.spec.dataVolumeTemplates[0].spec.source.pvc.name
+          value: talos-worker-ce4c980550dd2ab1b17bbf2b08801c7eb59418eafe8f279833297925d67c7515-v1.13.6
+        documentSelector: {path: kind, value: KubevirtMachineTemplate}
+
+  # A golden with no storageClassName means "the cluster default". With no default
+  # class to resolve it against, the comparison stays unresolvable and the guard
+  # skips rather than guessing a mismatch.
+  - it: osImage.builtin clones when the golden has no explicit storageClass and the cluster has no default
+    set:
+      storageClass: local
+      osImage:
+        builtin:
+          schematicID: nosc
+          version: v1.0.0
+    asserts:
+      - equal:
+          path: spec.template.spec.virtualMachineTemplate.spec.dataVolumeTemplates[0].spec.source.pvc.name
+          value: talos-worker-nosc-v1.0.0
+        documentSelector: {path: kind, value: KubevirtMachineTemplate}
+
+  # The size guard's presence gate. A golden that declares no storage request has
+  # no size to compare against, so a pool below the usual floor still renders --
+  # the guard skips rather than treating "unknown" as zero or as a failure.
+  - it: osImage.builtin clones a golden that declares no storage request, whatever the pool diskSize
+    set:
+      diskSize: 1Gi
+      osImage:
+        builtin:
+          schematicID: nostorage
+          version: v1.0.0
+    asserts:
+      - equal:
+          path: spec.template.spec.virtualMachineTemplate.spec.dataVolumeTemplates[0].spec.source.pvc.name
+          value: talos-worker-nostorage-v1.0.0
+        documentSelector: {path: kind, value: KubevirtMachineTemplate}
+
+  # Tenant-controlled strings reach an unquoted YAML scalar in the KMT, so they are
+  # pattern-checked at render. The values below are the shapes that break out of a
+  # scalar, not merely odd ones.
+  - it: a schematicID carrying a newline is refused before it reaches the KMT
+    set:
+      osImage:
+        builtin:
+          schematicID: "abc\ninjected: true"
+    asserts:
+      - failedTemplate:
+          errorPattern: 'is not a plain lowercase alphanumeric identifier'
+
+  - it: a version carrying a YAML metacharacter is refused
+    set:
+      osImage:
+        factory:
+          version: "v1.13.6: evil"
+    asserts:
+      - failedTemplate:
+          errorPattern: 'is not a vMAJOR\.MINOR\.PATCH release'
+
+  - it: an imageFactoryURL carrying whitespace is refused
+    set:
+      osImage:
+        factory:
+          imageFactoryURL: "https://mirror.internal x"
+    asserts:
+      - failedTemplate:
+          errorPattern: 'is not a plain http\(s\) URL'
+
+  # A backtick or dollar sign in the URL would also survive into the reconcile
+  # Job's unquoted heredoc if the field ever reached it, so they are refused here
+  # as well rather than relying on that Job's escaping alone.
+  - it: an imageFactoryURL carrying a shell metacharacter is refused
+    set:
+      osImage:
+        factory:
+          imageFactoryURL: "https://mirror.internal/$(id)"
+    asserts:
+      - failedTemplate:
+          errorPattern: 'is not a plain http\(s\) URL'
+
+  # A minor-only version is schema-valid and renders an artifact path the Image
+  # Factory does not publish, so the import 404s and the installer tag does not
+  # exist -- a failure that surfaces in the guest rather than at render.
+  - it: a Talos version without a patch segment is refused
+    set:
+      osImage:
+        factory:
+          version: "v1.13"
+    asserts:
+      - failedTemplate:
+          errorPattern: 'Talos version "v1\.13" is not a vMAJOR\.MINOR\.PATCH release'
+
+  # A pre-release keeps all three segments and stays accepted.
+  - it: a pre-release Talos version is accepted
+    set:
+      osImage:
+        factory:
+          version: "v1.14.0-alpha.0"
+    asserts:
+      - equal:
+          path: spec.template.spec.virtualMachineTemplate.spec.dataVolumeTemplates[0].spec.source.http.url
+          value: https://factory.talos.dev/image/ce4c980550dd2ab1b17bbf2b08801c7eb59418eafe8f279833297925d67c7515/v1.14.0-alpha.0/openstack-amd64.raw.xz
+        documentSelector: {path: kind, value: KubevirtMachineTemplate}
+
+  # And the legitimate 64-character hex schematic the Image Factory actually
+  # issues is accepted, so the guard is not merely rejecting everything.
+  - it: a real 64-character hex schematicID is accepted
+    set:
+      osImage:
+        factory:
+          schematicID: ce4c980550dd2ab1b17bbf2b08801c7eb59418eafe8f279833297925d67c7515
+          version: v1.13.6
+    asserts:
+      - equal:
+          path: spec.template.spec.virtualMachineTemplate.spec.dataVolumeTemplates[0].spec.source.http.url
+          value: https://factory.talos.dev/image/ce4c980550dd2ab1b17bbf2b08801c7eb59418eafe8f279833297925d67c7515/v1.13.6/openstack-amd64.raw.xz
+        documentSelector: {path: kind, value: KubevirtMachineTemplate}
+
+  # A builtin pool never builds a source URL -- its DataVolume carries source.pvc
+  # and no source.http -- so imageFactoryURL is not an input on that path and is
+  # not held to the URL pattern. Before this the check ran before the branch and
+  # refused a field the pool does not consume, which landed on exactly the
+  # operator moving to builtin to stop depending on the Factory.
+  - it: a builtin pool renders with a blanked imageFactoryURL
+    set:
+      osImage:
+        builtin: {}
+      talos:
+        imageFactoryURL: ""
+    asserts:
+      - equal:
+          path: spec.template.spec.virtualMachineTemplate.spec.dataVolumeTemplates[0].spec.source.pvc.name
+          value: talos-worker-ce4c980550dd2ab1b17bbf2b08801c7eb59418eafe8f279833297925d67c7515-v1.13.6
+        documentSelector: {path: kind, value: KubevirtMachineTemplate}
+      - notExists:
+          path: spec.template.spec.virtualMachineTemplate.spec.dataVolumeTemplates[0].spec.source.http
+        documentSelector: {path: kind, value: KubevirtMachineTemplate}
+
+  # Same for a malformed one: the value is unreachable from the clone path, so
+  # refusing it would be refusing a field this render never reads.
+  - it: a builtin pool renders with a malformed imageFactoryURL
+    set:
+      osImage:
+        builtin: {}
+      talos:
+        imageFactoryURL: "not a url"
+    asserts:
+      - equal:
+          path: spec.template.spec.virtualMachineTemplate.spec.dataVolumeTemplates[0].spec.source.pvc.name
+          value: talos-worker-ce4c980550dd2ab1b17bbf2b08801c7eb59418eafe8f279833297925d67c7515-v1.13.6
+        documentSelector: {path: kind, value: KubevirtMachineTemplate}
+
+  # The no-osImage default DOES interpolate it, so it stays refused there. This
+  # is the arm a running cluster is already on, and the sibling cases above must
+  # not be read as relaxing it.
+  - it: a pool with osImage omitted still refuses a malformed imageFactoryURL
+    set:
+      talos:
+        imageFactoryURL: "not a url"
+    asserts:
+      - failedTemplate:
+          errorPattern: 'is not a plain http\(s\) URL'
diff --git a/packages/apps/kubernetes-nodes/tests/worker_image_two_default_classes_test.yaml b/packages/apps/kubernetes-nodes/tests/worker_image_two_default_classes_test.yaml
new file mode 100644
index 0000000000..1c30a2d2cf
--- /dev/null
+++ b/packages/apps/kubernetes-nodes/tests/worker_image_two_default_classes_test.yaml
@@ -0,0 +1,116 @@
+suite: osImage.builtin default-StorageClass selection with two defaults
+
+# Kubernetes permits more than one StorageClass to carry the default annotation --
+# it is the normal state midway through swapping a cluster's default -- and picks
+# the most recently created. Returning every match instead concatenated their
+# names into a class that does not exist, and the clone guard then rejected a pool
+# whose class matched the default actually in force.
+
+templates:
+  - templates/nodegroup.yaml
+
+release:
+  name: kubernetes-nodes-myk8s-md0
+  namespace: tenant-test
+
+set:
+  cluster: myk8s
+  _cluster:
+    cluster-domain: cozy.local
+  version: "v1.35"
+  minReplicas: 1
+  maxReplicas: 3
+  instanceType: u1.medium
+  diskSize: 20Gi
+  storageClass: ""
+  roles: [ingress-nginx]
+  osImage:
+    builtin: {}
+
+kubernetesProvider:
+  scheme:
+    "instancetype.kubevirt.io/v1beta1/VirtualMachineClusterInstancetype":
+      gvr: {group: instancetype.kubevirt.io, version: v1beta1, resource: virtualmachineclusterinstancetypes}
+      namespaced: false
+    "cluster.x-k8s.io/v1beta1/MachineSet":
+      gvr: {group: cluster.x-k8s.io, version: v1beta1, resource: machinesets}
+      namespaced: true
+    "infrastructure.cluster.x-k8s.io/v1alpha1/KubevirtMachineTemplate":
+      gvr: {group: infrastructure.cluster.x-k8s.io, version: v1alpha1, resource: kubevirtmachinetemplates}
+      namespaced: true
+    "cdi.kubevirt.io/v1beta1/DataVolume":
+      gvr: {group: cdi.kubevirt.io, version: v1beta1, resource: datavolumes}
+      namespaced: true
+    "storage.k8s.io/v1/StorageClass":
+      gvr: {group: storage.k8s.io, version: v1, resource: storageclasses}
+      namespaced: false
+  objects:
+    - kind: VirtualMachineClusterInstancetype
+      apiVersion: instancetype.kubevirt.io/v1beta1
+      metadata: {name: u1.medium}
+    - kind: MachineSet
+      apiVersion: cluster.x-k8s.io/v1beta1
+      metadata: {name: ignored-ms, namespace: tenant-test}
+      spec: {template: {spec: {infrastructureRef: {kind: Other, name: ignored}}}}
+    - kind: KubevirtMachineTemplate
+      apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
+      metadata: {name: ignored-kmt, namespace: tenant-test}
+    # The outgoing default, created first.
+    - kind: StorageClass
+      apiVersion: storage.k8s.io/v1
+      metadata:
+        name: old
+        creationTimestamp: "2026-01-01T00:00:00Z"
+        annotations:
+          storageclass.kubernetes.io/is-default-class: "true"
+    # The incoming one, created later, and therefore the one in force.
+    - kind: StorageClass
+      apiVersion: storage.k8s.io/v1
+      metadata:
+        name: new
+        creationTimestamp: "2026-06-01T00:00:00Z"
+        annotations:
+          storageclass.kubernetes.io/is-default-class: "true"
+    - kind: DataVolume
+      apiVersion: cdi.kubevirt.io/v1beta1
+      metadata:
+        name: talos-worker-ce4c980550dd2ab1b17bbf2b08801c7eb59418eafe8f279833297925d67c7515-v1.13.6
+        namespace: cozy-public
+      spec:
+        storage:
+          resources: {requests: {storage: 6Gi}}
+          storageClassName: new
+      status: {phase: Succeeded}
+
+tests:
+  # The pool declares no class, so it resolves to the default in force -- `new`,
+  # which is what the golden sits on. Concatenating both defaults would produce
+  # `oldnew` and refuse this pool.
+  - it: resolves an empty pool storageClass to the most recently created default
+    asserts:
+      - equal:
+          path: spec.template.spec.virtualMachineTemplate.spec.dataVolumeTemplates[0].spec.source.pvc.name
+          value: talos-worker-ce4c980550dd2ab1b17bbf2b08801c7eb59418eafe8f279833297925d67c7515-v1.13.6
+        documentSelector: {path: kind, value: KubevirtMachineTemplate}
+      # The same resolved name reaches the disk, so the class the render picked and
+      # the class the disk binds on cannot diverge. Concatenation would surface here
+      # as `oldnew` rather than only as a refused pool.
+      - equal:
+          path: spec.template.spec.virtualMachineTemplate.spec.dataVolumeTemplates[0].spec.storage.storageClassName
+          value: new
+        documentSelector: {path: kind, value: KubevirtMachineTemplate}
+
+  # A pool pointed at a golden that does not exist stops at the absence guard,
+  # before any class is compared. That the resolved default is reported as a real
+  # class rather than a concatenation is pinned by the case above, where forcing
+  # the resolver to concatenate reddens that one and nothing else; this case only
+  # holds the earlier guard in place.
+  - it: refuses a pool whose golden is absent before comparing any class
+    set:
+      osImage:
+        builtin:
+          schematicID: elsewhere
+          version: v1.0.0
+    asserts:
+      - failedTemplate:
+          errorPattern: 'requested golden image "talos-worker-elsewhere-v1\.0\.0" not found'
diff --git a/packages/apps/kubernetes-nodes/values.schema.json b/packages/apps/kubernetes-nodes/values.schema.json
new file mode 100644
index 0000000000..bdb6b8620c
--- /dev/null
+++ b/packages/apps/kubernetes-nodes/values.schema.json
@@ -0,0 +1,419 @@
+{
+  "title": "Chart Values",
+  "type": "object",
+  "properties": {
+    "cluster": {
+      "description": "Name of the parent Kubernetes cluster (the `Kubernetes` CR) in the same namespace this node pool attaches to. Required. The pool's CAPI objects are wired to the parent cluster `kubernetes-\u003ccluster\u003e`; the KubernetesNodes CR must be named `\u003ccluster\u003e-\u003cpool\u003e`. The pool name (the part after `\u003ccluster\u003e-`) must not collide with a nodeGroup still managed by the parent kubernetes chart (e.g. the default `md0`), or the render fails on ownership conflict.",
+      "type": "string",
+      "default": "",
+      "x-kubernetes-validations": [
+        {
+          "rule": "self == oldSelf",
+          "message": "cluster is immutable"
+        }
+      ]
+    },
+    "storageClass": {
+      "description": "StorageClass for the worker node system disk. When empty, the cluster default applies. Worker VMs live-migrate, so their disks need ReadWriteMany — the RWX access mode is supplied by the chosen StorageClass's CDI StorageProfile — and linstor-csi rejects RWX volumes that are not on a DRBD-backed StorageClass, so prefer a replicated/DRBD class. On an `osImage.builtin` pool this field also decides whether the pool renders at all: CDI takes the storage-layer clone path only when the worker disk and the golden share a StorageClass, and falls back to a host-assisted copy over the pod network across classes, so the chart refuses a pool whose class differs from its golden's. Leaving it empty resolves to the cluster's default StorageClass, and the same comparison is made against that. On a `builtin` pool the resolved class is then written onto the worker disk rather than left for the cluster to fill in at bind time, so a pool that has already cloned keeps binding on the class its disks are on even after an admin moves the default annotation; on the HTTP path an empty class is still left to the cluster.",
+      "type": "string",
+      "default": "replicated",
+      "x-kubernetes-validations": [
+        {
+          "rule": "self == oldSelf",
+          "message": "storageClass is immutable"
+        }
+      ],
+      "x-cozystack-options": {
+        "source": "storageclass"
+      }
+    },
+    "minReplicas": {
+      "description": "Minimum number of replicas in this pool. Used as the cluster-autoscaler floor.",
+      "type": "integer",
+      "default": 0
+    },
+    "maxReplicas": {
+      "description": "Maximum number of replicas in this pool. Used as the cluster-autoscaler ceiling.",
+      "type": "integer",
+      "default": 10
+    },
+    "instanceType": {
+      "description": "Virtual machine instance type.",
+      "type": "string",
+      "default": "u1.medium",
+      "x-cozystack-options": {
+        "source": "instancetype"
+      }
+    },
+    "diskSize": {
+      "description": "System disk size for the worker VM. Carries the Talos OS image, kubelet state, containerd image cache, and any local-path PVCs. How the OS image reaches the disk follows this pool's `osImage`: the default and `osImage.factory` stream the Image Factory raw artifact in over HTTP, while `osImage.builtin` makes the disk a storage-layer CDI clone of a shared golden image, with no HTTP fetch. A `builtin` pool must keep diskSize at or above the golden's storage size (6Gi in the shipped worker image catalog), because a CDI clone target cannot be smaller than its source -- the chart rejects a smaller value at render time rather than letting the clone stall. Sizing a `builtin` pool also has to allow for transient headroom the finished disk does not show: CDI populates a larger target by cloning the golden at the source size and then growing it, so a worker being provisioned occupies a temporary clone PVC at the golden's size on top of this diskSize, and both are multiplied by the replica count of a replicated StorageClass. The golden itself is a separate one-time cost for the whole cluster, not a per-worker one. So the peak is the golden, plus `diskSize + golden storage` for each worker cloning at that moment. A pool whose storage backend cannot spare that peak does not fail: the clone waits for space, the VM never boots, and the reason is visible only in the storage layer's own events.",
+      "default": "20Gi",
+      "pattern": "^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$",
+      "anyOf": [
+        {
+          "type": "integer"
+        },
+        {
+          "type": "string"
+        }
+      ],
+      "x-kubernetes-int-or-string": true
+    },
+    "roles": {
+      "description": "List of node roles. Each role `r` labels nodes with `node-role.kubernetes.io/\u003cr\u003e`. Use `[ingress-nginx]` for a pool that hosts the tenant ingress-nginx controller.",
+      "type": "array",
+      "default": [],
+      "items": {
+        "type": "string"
+      }
+    },
+    "resources": {
+      "description": "Explicit CPU and memory for each worker node, as an alternative to `instanceType` sizing. Optional: when omitted, the node is sized by `instanceType`. When both `cpu` and `memory` are set, they take precedence and `instanceType` is ignored (the instancetype is omitted from the VM, since KubeVirt cannot override an instancetype's CPU/memory). Set both `cpu` and `memory` together or neither; setting only one is rejected at render time.",
+      "type": "object",
+      "default": {},
+      "properties": {
+        "cpu": {
+          "description": "Number of vCPU cores for each worker VM, as a whole number such as `2`. On the `kubevirt` substrate the value becomes the VM's integer `domain.cpu.cores`, so millicore, fractional and negative quantities, and counts above 4294967295, are rejected at render time; an unquoted `0` is treated as unset. On the `proxmox` substrate a millicore or fractional quantity is rounded up to whole cores.",
+          "pattern": "^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$",
+          "anyOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "type": "string"
+            }
+          ],
+          "x-kubernetes-int-or-string": true
+        },
+        "memory": {
+          "description": "Memory (RAM) available.",
+          "pattern": "^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$",
+          "anyOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "type": "string"
+            }
+          ],
+          "x-kubernetes-int-or-string": true
+        }
+      }
+    },
+    "podCpuLimit": {
+      "description": "CPU limit for the worker VM's virt-launcher `compute` container, which is the ceiling the guest vCPU threads, the QEMU emulator thread and the IO threads share. Distinct from `resources.cpu`, which sizes the guest itself. Cannot be combined with `instanceType` sizing: KubeVirt refuses a VM that references an instancetype and also sets `domain.resources.limits.cpu`, so the chart rejects that combination at render time. Sizing the pool by `resources` (both `cpu` and `memory`) is what drops the instancetype from the VM, which is where the limit is usable. When unset, KubeVirt derives the limit from the guest vCPU count in any namespace carrying a ResourceQuota that limits CPU, so a worker sized at N vCPUs runs under a ceiling of N with the emulation overhead taken out of the same N. Setting a value declares the limit on the VM directly, which is both what lands it on the container and what stops KubeVirt deriving one. It moves the CPU request with it: KubeVirt copies a declared CPU limit into the CPU request when the VM declares no request of its own, so a pool that sets only this field asks the scheduler for its whole ceiling instead of the fraction of the vCPU count it asked for before, and a ceiling the nodes cannot spare leaves the workers Pending on `Insufficient cpu`. Pair it with `podCpuRequest` to move the ceiling without moving the request. Zero means no ceiling at all rather than the tightest one, since the kubelet turns a zero CPU limit into no CFS quota while the declared key still stops KubeVirt deriving one — but it is only accepted together with `podCpuRequest: 0`, because KubeVirt keeps deriving a request from the vCPU count when the VM declares none and a request above a declared limit of zero is rejected when the worker's Pod is created. A negative value is refused at render time. Changing it rolls the pool, because the worker VM template is named by a hash of its content. Keep in sync with the parent kubernetes chart.",
+      "pattern": "^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$",
+      "anyOf": [
+        {
+          "type": "integer"
+        },
+        {
+          "type": "string"
+        }
+      ],
+      "x-kubernetes-int-or-string": true
+    },
+    "podCpuRequest": {
+      "description": "CPU request for the worker VM's virt-launcher `compute` container, which is what the scheduler reserves for a worker on its host and what weights it against neighbours on a contended one. Distinct from `resources.cpu`, which sizes the guest itself. It exists to be paired with `podCpuLimit`: KubeVirt copies a declared CPU limit into the request when the VM declares no request, so raising the ceiling alone raises what every worker in the pool asks the scheduler for, and this field is what holds the request still while the ceiling moves. Cannot be combined with `instanceType` sizing, for the same reason as `podCpuLimit`: KubeVirt refuses a VM that references an instancetype and also sets `domain.resources.requests.cpu`, so the chart rejects that combination at render time, as it does a value above `podCpuLimit`. Usable without a limit, where it only changes the scheduler's weighting: KubeVirt still derives the ceiling from the guest vCPU count in any namespace carrying a ResourceQuota that limits CPU, so keep the request at or below that count. A request above that derived ceiling is refused only when the worker's Pod is created, and deliberately not at render time: the ceiling exists only where such a ResourceQuota does, so refusing here would take away a configuration that works in a namespace without one. Zero is accepted on its own and reserves nothing, but zero beside a `podCpuLimit` is refused, because KubeVirt cannot tell an explicit zero request from an absent one and replaces both with the limit — which is the outcome this field exists to avoid, arrived at silently. A negative value is refused as well. When unset, KubeVirt computes the request from the guest vCPU count and the cluster CPU allocation ratio. Changing it rolls the pool, because the worker VM template is named by a hash of its content. Keep in sync with the parent kubernetes chart.",
+      "pattern": "^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$",
+      "anyOf": [
+        {
+          "type": "integer"
+        },
+        {
+          "type": "string"
+        }
+      ],
+      "x-kubernetes-int-or-string": true
+    },
+    "gpus": {
+      "description": "List of GPUs to attach (NVIDIA driver requires at least 4 GiB RAM).",
+      "type": "array",
+      "default": [],
+      "items": {
+        "type": "object",
+        "required": [
+          "name"
+        ],
+        "properties": {
+          "name": {
+            "description": "Name of GPU, such as \"nvidia.com/AD102GL_L40S\".",
+            "type": "string",
+            "x-cozystack-options": {
+              "source": "gpu"
+            }
+          }
+        }
+      }
+    },
+    "kernelModules": {
+      "description": "Kernel modules loaded on every worker in this pool, emitted as Talos `machine.kernel.modules`. A Talos system extension installs a module but does not load it, so an extension-provided driver needs its modules declared here. Leave unset to let the chart decide: a pool holding at least one `nvidia.com/*` GPU gets `nvidia` (with `NVreg_NvLinkDisable=1`, which the gpu-operator driver container applies on non-Talos workers; on Talos that container has to be turned off or it clashes with the system extension, and nothing then mounts the ConfigMap carrying the parameter), `nvidia_uvm`, `nvidia_drm`, `nvidia_modeset` (that order — Talos loads the list in sequence and the last three depend on the first), and any other pool gets nothing. Set a non-empty list to replace the chart's choice entirely, or `[]` to opt out and emit no modules even on a GPU pool. The field carries no default, and unset is not the same value as `[]`: a generated parameter table that shows `[]` in its Default column is printing what it prints for any array with no default, not the effective value — leaving the field out selects the automatic set, writing `[]` disables it. The module still has to be in the image, and which extensions the image carries is the pool's schematic: a GPU pool points `osImage.factory.schematicID` (or `osImage.builtin.schematicID`) at a schematic with the NVIDIA extensions, and on Blackwell (GB202) that must be the open-kernel-modules extension. The automatic set keys on the `nvidia.com/` resource prefix alone and nothing cross-checks it against that schematic; on Talos v1.13 a declared module the image does not ship leaves its controller retrying rather than failing the boot, so the symptom is a missing driver, not a dead node. This value is part of the worker machine config, whose content hash names the `TalosConfigTemplate`, so changing it rolls every existing worker in the pool rather than only affecting nodes created later. The automatic set is itself such a change, on the upgrade that introduces this field, for every existing pool that holds an `nvidia.com/*` GPU and leaves the field unset: that pool rolls.",
+      "type": "array",
+      "items": {
+        "type": "object",
+        "required": [
+          "name"
+        ],
+        "properties": {
+          "name": {
+            "description": "Module name as `modprobe` takes it, e.g. `nvidia_uvm`.",
+            "type": "string"
+          },
+          "parameters": {
+            "description": "Module parameters, each as a bare `key=value` string.",
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          }
+        }
+      }
+    },
+    "kubelet": {
+      "description": "Kubelet resource reservations for this pool.",
+      "type": "object",
+      "default": {},
+      "properties": {
+        "evictionHardMemory": {
+          "description": "Hard eviction threshold for memory (absolute like 200Mi or percentage like 7%).",
+          "type": "string",
+          "default": "7%"
+        },
+        "evictionSoftMemory": {
+          "description": "Soft eviction threshold for memory (absolute like 1Gi or percentage like 10%).",
+          "type": "string",
+          "default": "10%"
+        },
+        "kubeReservedCpu": {
+          "description": "CPU reserved for kubelet and container runtime. Auto-computed from instanceType if empty.",
+          "type": "string"
+        },
+        "kubeReservedMemory": {
+          "description": "Memory reserved for kubelet and container runtime. Auto-computed from instanceType if empty.",
+          "type": "string"
+        },
+        "systemReservedCpu": {
+          "description": "CPU reserved for host OS. Auto-computed from instanceType if empty.",
+          "type": "string"
+        },
+        "systemReservedMemory": {
+          "description": "Memory reserved for host OS. Auto-computed from instanceType if empty.",
+          "type": "string"
+        }
+      }
+    },
+    "logSerialConsole": {
+      "description": "Stream each worker VM's guest serial console into a `guest-console-log` container beside virt-launcher, readable with `kubectl logs`. The only view of a worker that stalls during boot before Talos apid answers, when neither a Node nor a certificate request exists to diagnose from. Two costs the field name does not show. Changing the value rolls the pool, because it is part of the worker VM template whose name is a hash of its content -- including the stuck VM whose console was wanted, so it buys visibility into the next boot rather than the current one. And it overrides the platform's cluster-wide `disableSerialConsoleLog`, set because that container has been seen holding virt-launcher in `PodInitializing` (kubevirt/kubevirt#15989), which would take the pool down rather than explain it -- so check that virt-launcher Pods reach Running after enabling it.",
+      "type": "boolean",
+      "default": false
+    },
+    "maxUnhealthy": {
+      "description": "Maximum number of unhealthy nodes tolerated in this pool before remediation is paused. The MachineHealthCheck admission webhook accepts either a bare integer (\"0\", \"1\", ...) or a percentage (\"0%\", \"50%\"); bare numeric strings are rejected, so the safer default is a percentage. Drop to \"0%\" once the pool is stable. Watch how a percentage behaves in a small group: the MachineHealthCheck controller scales it against the number of machines the check covers and rounds down, then remediates only while the unhealthy count is at or below that result. At \"50%\" a group of one therefore never remediates, because half of one rounds down to zero, and a group of two remediates one unhealthy machine but not two.",
+      "type": "string",
+      "default": "50%"
+    },
+    "nodeStartupTimeout": {
+      "description": "Maximum time a Machine is allowed to spend reaching the Ready condition before it is remediated. Raise for slow first boots (Talos image fetch from factory.talos.dev or a busy storage class on the kubevirt-csi PVC populator). The MachineHealthCheck measures it from the later of the Machine's creation and its InfrastructureReady transition, so the clock restarts when the infrastructure reports ready: a worker gets this long for the disk image import and the VM to come up, and then this long again for the guest to boot and its kubelet to register with the tenant apiserver. Either leg stretches on a host under load, and a Machine remediated here is deleted before it ever joins, so its replacement starts the same sequence from the beginning.",
+      "type": "string",
+      "default": "20m"
+    },
+    "readyUnknownTimeout": {
+      "description": "How long a worker Node may report `Ready=Unknown` before the MachineHealthCheck remediates the Machine, which for a KubeVirt worker means deleting the VM. `Ready=Unknown` is what the node lifecycle controller writes once it stops hearing from a kubelet, on a grace period of its own, so the wall clock from a guest going quiet to a deleted worker is this value plus that grace period. A guest starved of CPU stops answering long before it is dead, so a value of a few tens of seconds deletes workers that would have come back on their own. Validated at render time like maxNodeProvisionTime: the CAPI webhook does not check these timeouts, and a zero or negative value would remediate the moment the condition flips. Keep in sync with the parent kubernetes chart.",
+      "type": "string",
+      "default": "5m"
+    },
+    "readyFalseTimeout": {
+      "description": "How long a worker Node may report `Ready=False` before the MachineHealthCheck remediates the Machine. A Node that has registered but has no working CNI yet reports `Ready=False`, so this value is the whole budget a first boot gets for the CNI rollout to reach that node, and a worker deleted mid-rollout takes the rollout with it while its replacement starts over. Raising it delays replacing a worker that is genuinely dead, but not rescheduling its workload: Pods leave an unreachable Node on the node lifecycle controller's taint-based eviction and the toleration that carries, not on this timer. Validated at render time like maxNodeProvisionTime: the CAPI webhook does not check these timeouts, and a zero or negative value would remediate the moment the condition flips. Keep in sync with the parent kubernetes chart.",
+      "type": "string",
+      "default": "10m"
+    },
+    "maxNodeProvisionTime": {
+      "description": "How long the cluster-autoscaler waits for a newly created worker to register as a Node before it treats that machine as long-unregistered. Rendered onto this pool's MachineDeployment as the `cluster.x-k8s.io/autoscaling-options-maxnodeprovisiontime` annotation, which overrides the autoscaler's built-in default for this pool only. Two things change when the timer fires, and both make a slow join worse rather than better: the machine stops counting towards the pool's upcoming capacity, so the autoscaler asks for a replacement for capacity that is already on its way, and the machine becomes eligible for removal. Size it above the slowest join a healthy worker can take, counting the Talos image import, the guest boot and the CNI rollout. Accepted as a whole number of seconds, minutes or hours (\"30m\", \"1h30m\"), which is narrower than Go's duration syntax on purpose: the autoscaler ignores a value it cannot parse and falls back to its own default without failing, and the narrower shape cannot express a value that overflows the parser or a fraction it rounds to zero. The canonical form a duration serializes back to (\"20m0s\", \"1h0m0s\") is accepted. Keep in sync with the parent kubernetes chart.",
+      "type": "string",
+      "default": "30m"
+    },
+    "version": {
+      "description": "Kubernetes major.minor version the pool joins. Must not be ahead of the parent cluster's minor (workers may not lead the apiserver); it may lag behind during a rolling upgrade -- bump the parent Kubernetes CR first, then each pool -- and must satisfy the Talos\u003c-\u003eKubernetes support matrix against `talos.version`.",
+      "type": "string",
+      "default": "v1.35",
+      "enum": [
+        "v1.35",
+        "v1.34",
+        "v1.33",
+        "v1.32",
+        "v1.31"
+      ]
+    },
+    "osImage": {
+      "description": "Worker OS image source for this pool. Default (omitted): import over HTTP from the `talos.*` Image Factory. Set `osImage.builtin` to clone a golden from the opt-in worker image catalog instead. Editing this on an existing pool re-images that pool.",
+      "type": "object",
+      "default": {},
+      "properties": {
+        "builtin": {
+          "description": "Clone a golden image from the worker image catalog. Requires a StorageClass whose volumes are reachable from any node, in practice a replicated/DRBD class: the clone is a storage-layer copy, and on a node-pinned class its two ends land on unrelated nodes -- the golden binds where CDI imported it, a worker disk where its VM is scheduled.",
+          "type": "object",
+          "properties": {
+            "schematicID": {
+              "description": "Talos schematic ID of the golden to clone. Defaults to `talos.schematicID`.",
+              "type": "string"
+            },
+            "version": {
+              "description": "Talos version of the golden to clone. Defaults to `talos.version`.",
+              "type": "string"
+            }
+          }
+        },
+        "factory": {
+          "description": "Import from an Image Factory / mirror (default).",
+          "type": "object",
+          "properties": {
+            "imageFactoryURL": {
+              "description": "Base URL of the Image Factory serving the boot raw image. Defaults to `talos.imageFactoryURL`. No trailing slash. NOTE: this redirects only the worker boot-disk import; the in-guest upgrade installer image is always sourced from `talos.installerRepository`, so an air-gapped pool must also have `talos.installerRepository` pointed at a reachable registry.",
+              "type": "string"
+            },
+            "schematicID": {
+              "description": "Talos schematic ID. Defaults to `talos.schematicID`.",
+              "type": "string"
+            },
+            "version": {
+              "description": "Talos version. Defaults to `talos.version`.",
+              "type": "string"
+            }
+          }
+        }
+      }
+    },
+    "talos": {
+      "description": "Talos worker image configuration. Keep in sync with the parent cluster's `talos`.",
+      "type": "object",
+      "default": {},
+      "required": [
+        "imageFactoryURL",
+        "installerRepository",
+        "registryMirrors",
+        "schematicID",
+        "version"
+      ],
+      "properties": {
+        "imageFactoryCA": {
+          "description": "Complete PEM certificate block(s) CDI must trust when importing this pool's worker OS disk image over HTTPS — the no-osImage default and `osImage.factory` path. Empty by default, so the importer uses only its system trust store, which is what the public factory needs. Set this when the factory in use (`imageFactoryURL` or `osImage.factory.imageFactoryURL`) is a self-hosted factory or mirror served by an internal CA, which the importer otherwise rejects with `x509: certificate signed by unknown authority`. The chart renders it into a ConfigMap in the release namespace — CDI requires certConfigMap to sit alongside the DataVolume — and references that from the worker DataVolume's `source.http.certConfigMap`; CDI appends it to the system pool rather than replacing it, so a publicly-trusted endpoint verifies either way. A pool on `osImage.builtin` clones a golden image and builds no HTTP source, so this field has no effect there.",
+          "type": "string",
+          "default": ""
+        },
+        "imageFactoryURL": {
+          "description": "Default base URL of the Talos Image Factory that serves the worker OS disk image (the `openstack-amd64.raw.xz` raw artifact streamed in by CDI over HTTP). Applies only when this pool imports over HTTP — the default and `osImage.factory`, which overrides it via `osImage.factory.imageFactoryURL`. A pool on `osImage.builtin` clones a golden image from the worker image catalog and does not use this field at all. Defaults to the public factory. Point at a self-hosted Image Factory, a caching mirror, or an internal HTTP file server for air-gapped, rate-limited, or flaky-egress environments. No trailing slash. It is interpolated into the worker DataVolume source URL, so on those HTTP paths it must be a plain `http(s)` URL and the render refuses anything else; a pool on `osImage.builtin` builds no such URL and is not held to it, so blanking this field there is legal.",
+          "type": "string",
+          "default": "https://factory.talos.dev"
+        },
+        "installerRepository": {
+          "description": "OCI repository prefix for the Talos installer image used by the in-guest `talos-reconcile` upgrade Job. Resolved as `\u003cinstallerRepository\u003e/\u003cschematicID\u003e:\u003cversion\u003e` against whatever this pool's `osImage` pins, falling back to `talos.schematicID` and `talos.version` — so the installer matches the OS the pool actually booted. The prefix itself has no `osImage.*` override, so an air-gapped pool needs it pointed at a reachable registry as well. Defaults to the public factory's installer path. Override for air-gapped or mirrored registries. No trailing slash.",
+          "type": "string",
+          "default": "factory.talos.dev/installer"
+        },
+        "registryMirrors": {
+          "description": "Talos `machine.registries.mirrors` passthrough for worker nodes: a map of upstream registry host to `{ endpoints: [ ... ] }`. Empty by default, so workers pull container images (the Talos `kubelet` image included) directly from the upstream registry. Point a host such as `ghcr.io` at an in-cluster pull-through mirror for air-gapped, rate-limited, or flaky-egress environments so a worker's boot does not depend on live public egress. Talos still falls back to the upstream registry unless a host also sets `skipFallback: true`, so a mirror alone does not enforce air-gap. This value is part of the worker machine config, whose content hash names the TalosConfigTemplate, so changing it rolls every existing worker in the pool rather than only affecting nodes created later.",
+          "type": "object",
+          "default": {},
+          "x-kubernetes-preserve-unknown-fields": true
+        },
+        "schematicID": {
+          "description": "Talos image-factory schematic ID. Defaults to the cozystack-tested vanilla schematic. Operators using custom schematics (system extensions, kernel args) override here. The pool can pin its own via `osImage.builtin.schematicID` or `osImage.factory.schematicID`; when `osImage` omits it, this value applies. Whichever of the two applies is interpolated into an image URL and a DataVolume name, so it must be a plain lowercase alphanumeric identifier -- the render refuses anything else. A custom schematic on `osImage.builtin` also needs its own catalog entry, since the golden is named from the schematic ID.",
+          "type": "string",
+          "default": "ce4c980550dd2ab1b17bbf2b08801c7eb59418eafe8f279833297925d67c7515"
+        },
+        "version": {
+          "description": "Default Talos release for this pool's worker OS image and in-guest installer. The pool can pin its own release via `osImage.builtin.version` or `osImage.factory.version`; when `osImage` omits it, this value applies. Both ways in are checked against the chart's Talos\u003c-\u003eKubernetes support matrix, against whichever release the pool actually resolves to, so an override cannot slip past a check `talos.version` would have failed. The matrix rejects a pairing it lists as unsupported; it lists the Talos minors this chart ships and passes any other minor unchecked, so pointing either field at a Talos release the chart does not know about is the operator's call, not a checked one. Whichever release applies is interpolated into an image URL and a DataVolume name, so it must be a full `vMAJOR.MINOR.PATCH` release, optionally with a pre-release suffix -- the render refuses anything else, a minor-only `v1.13` included. The values schema types this as a bare string, so a malformed one is accepted by the CR and fails the pool's HelmRelease instead.",
+          "type": "string",
+          "default": "v1.13.6"
+        }
+      }
+    },
+    "substrate": {
+      "description": "Which infrastructure provider backs this pool's worker VMs. `kubevirt` runs them inside this cluster on KubeVirt, sized by `instanceType` and booted from a Talos disk image CDI streams from the image factory. `proxmox` runs them on an external Proxmox VE cluster through capmox, sized by `resources`, and cloned from a Talos VM template that already exists on the hypervisor. The two substrates take different Talos platform images and different sizing inputs, so switching an existing pool is refused: the chart reads the live MachineDeployment's template kind and fails the render rather than rolling every worker to the other hypervisor and deleting the template the draining MachineSet still references. Create a new pool on the other substrate and scale this one down.",
+      "type": "string",
+      "default": "kubevirt",
+      "x-kubernetes-validations": [
+        {
+          "rule": "self == oldSelf",
+          "message": "substrate is immutable"
+        }
+      ]
+    },
+    "proxmox": {
+      "description": "Proxmox substrate settings.",
+      "type": "object",
+      "default": {},
+      "required": [
+        "network"
+      ],
+      "properties": {
+        "dnsServers": {
+          "description": "Nameservers written into the worker machineconfig. On kubevirt the workers use the management cluster's CoreDNS, which they reach over the pod network; an off-cluster Proxmox worker cannot, so it needs reachable resolvers of its own. Required when `substrate` is `proxmox`. Keep in sync with the parent kubernetes chart's `proxmox.dnsServers`.",
+          "type": "array",
+          "default": [],
+          "items": {
+            "type": "string"
+          }
+        },
+        "full": {
+          "description": "Full clone rather than linked. Default is a linked clone: it costs kilobytes at creation instead of the whole disk, because a ZFS-backed linked clone writes only its own increment (measured: 8K against 10.2G for the same worker full-cloned onto a `sparse 0` pool). The cost is that the clone holds the template's base snapshot, so the template cannot be rotated while any linked clone still references it — which is what the consolidation CronJob resolves 24h after creation. Set true for a pool that must be independent of the template from the first second.",
+          "type": "boolean",
+          "default": false
+        },
+        "network": {
+          "description": "NIC configuration.",
+          "type": "object",
+          "default": {},
+          "required": [
+            "bridge"
+          ],
+          "properties": {
+            "bridge": {
+              "description": "Proxmox bridge the VM NIC attaches to (e.g. `vmbr0`). Required when `substrate` is `proxmox`.",
+              "type": "string",
+              "default": ""
+            },
+            "mtu": {
+              "description": "NIC MTU. Omitted when unset.",
+              "type": "integer"
+            },
+            "vlan": {
+              "description": "L2 VLAN tag. Omitted when unset.",
+              "type": "integer"
+            }
+          }
+        },
+        "pool": {
+          "description": "Proxmox resource pool the worker VMs are added to. Set the same pool on every node pool of a tenant cluster and grant the tenant's tokens their privileges on `/pool/\u003cname\u003e`: that is the one ACL path that follows every VM capmox creates, replacements included. The pool must exist on the hypervisor; capmox does not create it. Empty adds the workers to no pool.",
+          "type": "string",
+          "default": ""
+        },
+        "storage": {
+          "description": "Proxmox storage for the cloned disk; needs `full: true`. A target storage is a full-clone parameter — a linked clone always lives on the template's storage, and Proxmox refuses the pair — so the render refuses it too. Empty keeps the template's storage.",
+          "type": "string",
+          "default": ""
+        },
+        "templateTags": {
+          "description": "Tags identifying the Talos VM template to clone. capmox matches a template when its tag set is EQUAL to this list, not when it contains it, so every tag on the template must be listed here — a missing one yields `found 0 VM templates with tags ...` while the tags are plainly present. The template has to carry this pool's `talos.schematicID` at `talos.version` in the nocloud flavour, with the Proxmox guest agent enabled for the `qemu-guest-agent` extension of the default schematic; `hack/proxmox-talos-template.sh` builds it from these values and prints the tags to list here. Do not build it from the platform release's `nocloud-amd64.raw.xz`: that is the bare-metal node image, whose `zfs` extension keeps a VM from finishing its boot sequence and reboots it at the Talos boot timeout. Required when `substrate` is `proxmox`.",
+          "type": "array",
+          "default": [],
+          "items": {
+            "type": "string"
+          }
+        }
+      }
+    },
+    "images": {
+      "description": "Optional image overrides for air-gapped or rate-limited registries.",
+      "type": "object",
+      "default": {},
+      "properties": {
+        "kubectl": {
+          "description": "Image used by the talos-reconcile and pre-delete unpin Jobs (kubectl). Empty falls back to images/kubectl.tag.",
+          "type": "string",
+          "default": ""
+        }
+      }
+    }
+  }
+}
diff --git a/packages/apps/kubernetes-nodes/values.yaml b/packages/apps/kubernetes-nodes/values.yaml
new file mode 100644
index 0000000000..4780f004e4
--- /dev/null
+++ b/packages/apps/kubernetes-nodes/values.yaml
@@ -0,0 +1,197 @@
+##
+## @section Linkage
+##
+
+## @param {string} cluster - Name of the parent Kubernetes cluster (the `Kubernetes` CR) in the same namespace this node pool attaches to. Required. The pool's CAPI objects are wired to the parent cluster `kubernetes-<cluster>`; the KubernetesNodes CR must be named `<cluster>-<pool>`. The pool name (the part after `<cluster>-`) must not collide with a nodeGroup still managed by the parent kubernetes chart (e.g. the default `md0`), or the render fails on ownership conflict.
+## @immutable
+cluster: ""
+
+# Internal wiring value `clusterReleaseName` (consumed by kubernetes-nodes.clusterName
+# in templates/_helpers.tpl) is deliberately NOT declared here and NOT a @param:
+# it must stay out of the public KubernetesNodes API (values.schema.json / CRD /
+# README), and cozyvalues-gen rejects a values.yaml key with no schema entry. It
+# is the parent cluster's HelmRelease/object name this pool's CAPI objects attach
+# to; when unset the helper derives it as `kubernetes-<cluster>`, the aggregated
+# API's naming convention, so every pool created through the API is unaffected. A
+# wrapper whose cluster release is named off that convention passes it in the
+# child HelmRelease values directly: the ComputePlane module fixes its cluster
+# release to `computeplane-cluster` (the admin-kubeconfig Secret contract) and
+# sets clusterReleaseName: computeplane-cluster so its pools attach correctly.
+
+##
+## @section Common Parameters
+##
+
+## @param {string} storageClass - StorageClass for the worker node system disk. When empty, the cluster default applies. Worker VMs live-migrate, so their disks need ReadWriteMany — the RWX access mode is supplied by the chosen StorageClass's CDI StorageProfile — and linstor-csi rejects RWX volumes that are not on a DRBD-backed StorageClass, so prefer a replicated/DRBD class. On an `osImage.builtin` pool this field also decides whether the pool renders at all: CDI takes the storage-layer clone path only when the worker disk and the golden share a StorageClass, and falls back to a host-assisted copy over the pod network across classes, so the chart refuses a pool whose class differs from its golden's. Leaving it empty resolves to the cluster's default StorageClass, and the same comparison is made against that. On a `builtin` pool the resolved class is then written onto the worker disk rather than left for the cluster to fill in at bind time, so a pool that has already cloned keeps binding on the class its disks are on even after an admin moves the default annotation; on the HTTP path an empty class is still left to the cluster.
+## @x-cozystack-options {source: storageclass}
+## @immutable
+storageClass: replicated
+
+##
+## @section Pool Sizing
+##
+
+## @typedef {struct} Resources - Explicit CPU and memory configuration for a node.
+## @field {quantity} [cpu] - Number of vCPU cores for each worker VM, as a whole number such as `2`. On the `kubevirt` substrate the value becomes the VM's integer `domain.cpu.cores`, so millicore, fractional and negative quantities, and counts above 4294967295, are rejected at render time; an unquoted `0` is treated as unset. On the `proxmox` substrate a millicore or fractional quantity is rounded up to whole cores.
+## @field {quantity} [memory] - Memory (RAM) available.
+
+## @typedef {struct} GPU - GPU configuration.
+## @field {string} name - Name of GPU, such as "nvidia.com/AD102GL_L40S".
+## @x-cozystack-options {source: gpu}
+
+## @typedef {struct} KernelModule - Kernel module loaded on the worker at boot.
+## @field {string} name - Module name as `modprobe` takes it, e.g. `nvidia_uvm`.
+## @field {[]string} [parameters] - Module parameters, each as a bare `key=value` string.
+
+## @typedef {struct} Kubelet - Kubelet resource reservations for worker nodes.
+## @field {string} [systemReservedMemory] - Memory reserved for host OS. Auto-computed from instanceType if empty.
+## @field {string} [kubeReservedMemory] - Memory reserved for kubelet and container runtime. Auto-computed from instanceType if empty.
+## @field {string} [systemReservedCpu] - CPU reserved for host OS. Auto-computed from instanceType if empty.
+## @field {string} [kubeReservedCpu] - CPU reserved for kubelet and container runtime. Auto-computed from instanceType if empty.
+## @field {string} [evictionHardMemory]="7%" - Hard eviction threshold for memory (absolute like 200Mi or percentage like 7%).
+## @field {string} [evictionSoftMemory]="10%" - Soft eviction threshold for memory (absolute like 1Gi or percentage like 10%).
+
+## @param {int} minReplicas=0 - Minimum number of replicas in this pool. Used as the cluster-autoscaler floor.
+minReplicas: 0
+
+## @param {int} maxReplicas=10 - Maximum number of replicas in this pool. Used as the cluster-autoscaler ceiling.
+maxReplicas: 10
+
+## @param {string} instanceType="u1.medium" - Virtual machine instance type.
+## @x-cozystack-options {source: instancetype}
+instanceType: u1.medium
+
+## @param {quantity} diskSize="20Gi" - System disk size for the worker VM. Carries the Talos OS image, kubelet state, containerd image cache, and any local-path PVCs. How the OS image reaches the disk follows this pool's `osImage`: the default and `osImage.factory` stream the Image Factory raw artifact in over HTTP, while `osImage.builtin` makes the disk a storage-layer CDI clone of a shared golden image, with no HTTP fetch. A `builtin` pool must keep diskSize at or above the golden's storage size (6Gi in the shipped worker image catalog), because a CDI clone target cannot be smaller than its source -- the chart rejects a smaller value at render time rather than letting the clone stall. Sizing a `builtin` pool also has to allow for transient headroom the finished disk does not show: CDI populates a larger target by cloning the golden at the source size and then growing it, so a worker being provisioned occupies a temporary clone PVC at the golden's size on top of this diskSize, and both are multiplied by the replica count of a replicated StorageClass. The golden itself is a separate one-time cost for the whole cluster, not a per-worker one. So the peak is the golden, plus `diskSize + golden storage` for each worker cloning at that moment. A pool whose storage backend cannot spare that peak does not fail: the clone waits for space, the VM never boots, and the reason is visible only in the storage layer's own events.
+diskSize: 20Gi
+
+## @param {[]string} roles - List of node roles. Each role `r` labels nodes with `node-role.kubernetes.io/<r>`. Use `[ingress-nginx]` for a pool that hosts the tenant ingress-nginx controller.
+roles: []
+
+## @param {Resources} [resources] - Explicit CPU and memory for each worker node, as an alternative to `instanceType` sizing. Optional: when omitted, the node is sized by `instanceType`. When both `cpu` and `memory` are set, they take precedence and `instanceType` is ignored (the instancetype is omitted from the VM, since KubeVirt cannot override an instancetype's CPU/memory). Set both `cpu` and `memory` together or neither; setting only one is rejected at render time.
+resources: {}
+
+## @param {quantity} [podCpuLimit] - CPU limit for the worker VM's virt-launcher `compute` container, which is the ceiling the guest vCPU threads, the QEMU emulator thread and the IO threads share. Distinct from `resources.cpu`, which sizes the guest itself. Cannot be combined with `instanceType` sizing: KubeVirt refuses a VM that references an instancetype and also sets `domain.resources.limits.cpu`, so the chart rejects that combination at render time. Sizing the pool by `resources` (both `cpu` and `memory`) is what drops the instancetype from the VM, which is where the limit is usable. When unset, KubeVirt derives the limit from the guest vCPU count in any namespace carrying a ResourceQuota that limits CPU, so a worker sized at N vCPUs runs under a ceiling of N with the emulation overhead taken out of the same N. Setting a value declares the limit on the VM directly, which is both what lands it on the container and what stops KubeVirt deriving one. It moves the CPU request with it: KubeVirt copies a declared CPU limit into the CPU request when the VM declares no request of its own, so a pool that sets only this field asks the scheduler for its whole ceiling instead of the fraction of the vCPU count it asked for before, and a ceiling the nodes cannot spare leaves the workers Pending on `Insufficient cpu`. Pair it with `podCpuRequest` to move the ceiling without moving the request. Zero means no ceiling at all rather than the tightest one, since the kubelet turns a zero CPU limit into no CFS quota while the declared key still stops KubeVirt deriving one — but it is only accepted together with `podCpuRequest: 0`, because KubeVirt keeps deriving a request from the vCPU count when the VM declares none and a request above a declared limit of zero is rejected when the worker's Pod is created. A negative value is refused at render time. Changing it rolls the pool, because the worker VM template is named by a hash of its content. Keep in sync with the parent kubernetes chart.
+
+## @param {quantity} [podCpuRequest] - CPU request for the worker VM's virt-launcher `compute` container, which is what the scheduler reserves for a worker on its host and what weights it against neighbours on a contended one. Distinct from `resources.cpu`, which sizes the guest itself. It exists to be paired with `podCpuLimit`: KubeVirt copies a declared CPU limit into the request when the VM declares no request, so raising the ceiling alone raises what every worker in the pool asks the scheduler for, and this field is what holds the request still while the ceiling moves. Cannot be combined with `instanceType` sizing, for the same reason as `podCpuLimit`: KubeVirt refuses a VM that references an instancetype and also sets `domain.resources.requests.cpu`, so the chart rejects that combination at render time, as it does a value above `podCpuLimit`. Usable without a limit, where it only changes the scheduler's weighting: KubeVirt still derives the ceiling from the guest vCPU count in any namespace carrying a ResourceQuota that limits CPU, so keep the request at or below that count. A request above that derived ceiling is refused only when the worker's Pod is created, and deliberately not at render time: the ceiling exists only where such a ResourceQuota does, so refusing here would take away a configuration that works in a namespace without one. Zero is accepted on its own and reserves nothing, but zero beside a `podCpuLimit` is refused, because KubeVirt cannot tell an explicit zero request from an absent one and replaces both with the limit — which is the outcome this field exists to avoid, arrived at silently. A negative value is refused as well. When unset, KubeVirt computes the request from the guest vCPU count and the cluster CPU allocation ratio. Changing it rolls the pool, because the worker VM template is named by a hash of its content. Keep in sync with the parent kubernetes chart.
+
+## @param {[]GPU} gpus - List of GPUs to attach (NVIDIA driver requires at least 4 GiB RAM).
+gpus: []
+
+## @param {[]KernelModule} [kernelModules] - Kernel modules loaded on every worker in this pool, emitted as Talos `machine.kernel.modules`. A Talos system extension installs a module but does not load it, so an extension-provided driver needs its modules declared here. Leave unset to let the chart decide: a pool holding at least one `nvidia.com/*` GPU gets `nvidia` (with `NVreg_NvLinkDisable=1`, which the gpu-operator driver container applies on non-Talos workers; on Talos that container has to be turned off or it clashes with the system extension, and nothing then mounts the ConfigMap carrying the parameter), `nvidia_uvm`, `nvidia_drm`, `nvidia_modeset` (that order — Talos loads the list in sequence and the last three depend on the first), and any other pool gets nothing. Set a non-empty list to replace the chart's choice entirely, or `[]` to opt out and emit no modules even on a GPU pool. The field carries no default, and unset is not the same value as `[]`: a generated parameter table that shows `[]` in its Default column is printing what it prints for any array with no default, not the effective value — leaving the field out selects the automatic set, writing `[]` disables it. The module still has to be in the image, and which extensions the image carries is the pool's schematic: a GPU pool points `osImage.factory.schematicID` (or `osImage.builtin.schematicID`) at a schematic with the NVIDIA extensions, and on Blackwell (GB202) that must be the open-kernel-modules extension. The automatic set keys on the `nvidia.com/` resource prefix alone and nothing cross-checks it against that schematic; on Talos v1.13 a declared module the image does not ship leaves its controller retrying rather than failing the boot, so the symptom is a missing driver, not a dead node. This value is part of the worker machine config, whose content hash names the `TalosConfigTemplate`, so changing it rolls every existing worker in the pool rather than only affecting nodes created later. The automatic set is itself such a change, on the upgrade that introduces this field, for every existing pool that holds an `nvidia.com/*` GPU and leaves the field unset: that pool rolls.
+
+## @param {Kubelet} [kubelet] - Kubelet resource reservations for this pool.
+kubelet: {}
+
+## @param {bool} logSerialConsole=false - Stream each worker VM's guest serial console into a `guest-console-log` container beside virt-launcher, readable with `kubectl logs`. The only view of a worker that stalls during boot before Talos apid answers, when neither a Node nor a certificate request exists to diagnose from. Two costs the field name does not show. Changing the value rolls the pool, because it is part of the worker VM template whose name is a hash of its content -- including the stuck VM whose console was wanted, so it buys visibility into the next boot rather than the current one. And it overrides the platform's cluster-wide `disableSerialConsoleLog`, set because that container has been seen holding virt-launcher in `PodInitializing` (kubevirt/kubevirt#15989), which would take the pool down rather than explain it -- so check that virt-launcher Pods reach Running after enabling it.
+logSerialConsole: false
+
+## @param {string} maxUnhealthy="50%" - Maximum number of unhealthy nodes tolerated in this pool before remediation is paused. The MachineHealthCheck admission webhook accepts either a bare integer ("0", "1", ...) or a percentage ("0%", "50%"); bare numeric strings are rejected, so the safer default is a percentage. Drop to "0%" once the pool is stable. Watch how a percentage behaves in a small group: the MachineHealthCheck controller scales it against the number of machines the check covers and rounds down, then remediates only while the unhealthy count is at or below that result. At "50%" a group of one therefore never remediates, because half of one rounds down to zero, and a group of two remediates one unhealthy machine but not two.
+maxUnhealthy: "50%"
+
+## @param {string} nodeStartupTimeout="20m" - Maximum time a Machine is allowed to spend reaching the Ready condition before it is remediated. Raise for slow first boots (Talos image fetch from factory.talos.dev or a busy storage class on the kubevirt-csi PVC populator). The MachineHealthCheck measures it from the later of the Machine's creation and its InfrastructureReady transition, so the clock restarts when the infrastructure reports ready: a worker gets this long for the disk image import and the VM to come up, and then this long again for the guest to boot and its kubelet to register with the tenant apiserver. Either leg stretches on a host under load, and a Machine remediated here is deleted before it ever joins, so its replacement starts the same sequence from the beginning.
+nodeStartupTimeout: "20m"
+
+## @param {string} readyUnknownTimeout="5m" - How long a worker Node may report `Ready=Unknown` before the MachineHealthCheck remediates the Machine, which for a KubeVirt worker means deleting the VM. `Ready=Unknown` is what the node lifecycle controller writes once it stops hearing from a kubelet, on a grace period of its own, so the wall clock from a guest going quiet to a deleted worker is this value plus that grace period. A guest starved of CPU stops answering long before it is dead, so a value of a few tens of seconds deletes workers that would have come back on their own. Validated at render time like maxNodeProvisionTime: the CAPI webhook does not check these timeouts, and a zero or negative value would remediate the moment the condition flips. Keep in sync with the parent kubernetes chart.
+readyUnknownTimeout: "5m"
+
+## @param {string} readyFalseTimeout="10m" - How long a worker Node may report `Ready=False` before the MachineHealthCheck remediates the Machine. A Node that has registered but has no working CNI yet reports `Ready=False`, so this value is the whole budget a first boot gets for the CNI rollout to reach that node, and a worker deleted mid-rollout takes the rollout with it while its replacement starts over. Raising it delays replacing a worker that is genuinely dead, but not rescheduling its workload: Pods leave an unreachable Node on the node lifecycle controller's taint-based eviction and the toleration that carries, not on this timer. Validated at render time like maxNodeProvisionTime: the CAPI webhook does not check these timeouts, and a zero or negative value would remediate the moment the condition flips. Keep in sync with the parent kubernetes chart.
+readyFalseTimeout: "10m"
+
+## @param {string} maxNodeProvisionTime="30m" - How long the cluster-autoscaler waits for a newly created worker to register as a Node before it treats that machine as long-unregistered. Rendered onto this pool's MachineDeployment as the `cluster.x-k8s.io/autoscaling-options-maxnodeprovisiontime` annotation, which overrides the autoscaler's built-in default for this pool only. Two things change when the timer fires, and both make a slow join worse rather than better: the machine stops counting towards the pool's upcoming capacity, so the autoscaler asks for a replacement for capacity that is already on its way, and the machine becomes eligible for removal. Size it above the slowest join a healthy worker can take, counting the Talos image import, the guest boot and the CNI rollout. Accepted as a whole number of seconds, minutes or hours ("30m", "1h30m"), which is narrower than Go's duration syntax on purpose: the autoscaler ignores a value it cannot parse and falls back to its own default without failing, and the narrower shape cannot express a value that overflows the parser or a fraction it rounds to zero. The canonical form a duration serializes back to ("20m0s", "1h0m0s") is accepted. Keep in sync with the parent kubernetes chart.
+maxNodeProvisionTime: "30m"
+
+##
+## @section Kubernetes Version
+##
+
+## @enum {string} Version
+## @value v1.35
+## @value v1.34
+## @value v1.33
+## @value v1.32
+## @value v1.31
+
+## @param {Version} version - Kubernetes major.minor version the pool joins. Must not be ahead of the parent cluster's minor (workers may not lead the apiserver); it may lag behind during a rolling upgrade -- bump the parent Kubernetes CR first, then each pool -- and must satisfy the Talos<->Kubernetes support matrix against `talos.version`.
+version: "v1.35"
+
+##
+## @section Talos Worker Image
+##
+
+## @typedef {struct} WorkerImageBuiltin - Boot this pool's workers by CDI clone of a golden image from the opt-in worker image catalog (packages/system/kubernetes-worker-image) in cozy-public. The catalog package must be enabled (bundles.enabledPackages) and hold a matching (schematicID, version) entry, otherwise the render fails. A clone is a storage-layer CSI copy, so N workers no longer each stream the OS image over HTTP. Pair this with a StorageClass whose volumes are reachable from any node -- in practice a replicated/DRBD class. The copy runs between two volumes that a node-pinned class requires to be co-located, and nothing here arranges that: the golden in cozy-public has no consumer, so it binds as soon as it imports, on whichever node CDI's importer landed on, while a worker disk binds where its VM is scheduled. The platform also ships `cloneStrategyOverride: csi-clone`, which rules out the host-assisted `copy` strategy that would cross nodes. What a node-pinned class (`allowRemoteVolumeAccess: false`, WaitForFirstConsumer) actually does here has not been measured, so treat `builtin` on one as unsupported rather than slow.
+## @field {string} [schematicID] - Talos schematic ID of the golden to clone. Defaults to `talos.schematicID`.
+## @field {string} [version] - Talos version of the golden to clone. Defaults to `talos.version`.
+
+## @typedef {struct} WorkerImageFactory - Boot this pool's workers by importing the Talos OS image over HTTP from an Image Factory (public, self-hosted, or caching mirror). This is the bring-your-own path and the default when `osImage` is omitted.
+## @field {string} [version] - Talos version. Defaults to `talos.version`.
+## @field {string} [schematicID] - Talos schematic ID. Defaults to `talos.schematicID`.
+## @field {string} [imageFactoryURL] - Base URL of the Image Factory serving the boot raw image. Defaults to `talos.imageFactoryURL`. No trailing slash. NOTE: this redirects only the worker boot-disk import; the in-guest upgrade installer image is always sourced from `talos.installerRepository`, so an air-gapped pool must also have `talos.installerRepository` pointed at a reachable registry.
+
+## @typedef {struct} WorkerImage - Worker OS image source for this pool. Set exactly one of `builtin` or `factory`; when the whole field is omitted the workers import over HTTP using the pool's `talos.*` defaults (equivalent to an empty `factory`). The disk-system source is derived entirely from this field, so a pool with `osImage` omitted renders identically to a chart without this feature — adopting the feature never rolls existing workers. Editing this field on an existing pool changes the rendered source and therefore re-images (rolls) that pool, the same as changing any other image reference.
+## @field {*WorkerImageBuiltin} [builtin] - Clone a golden image from the worker image catalog. Requires a StorageClass whose volumes are reachable from any node, in practice a replicated/DRBD class: the clone is a storage-layer copy, and on a node-pinned class its two ends land on unrelated nodes -- the golden binds where CDI imported it, a worker disk where its VM is scheduled.
+## @field {*WorkerImageFactory} [factory] - Import from an Image Factory / mirror (default).
+
+## @param {WorkerImage} [osImage] - Worker OS image source for this pool. Default (omitted): import over HTTP from the `talos.*` Image Factory. Set `osImage.builtin` to clone a golden from the opt-in worker image catalog instead. Editing this on an existing pool re-images that pool.
+osImage: {}
+
+## @typedef {struct} Talos - Talos worker image configuration.
+## @field {string} version - Default Talos release for this pool's worker OS image and in-guest installer. The pool can pin its own release via `osImage.builtin.version` or `osImage.factory.version`; when `osImage` omits it, this value applies. Both ways in are checked against the chart's Talos<->Kubernetes support matrix, against whichever release the pool actually resolves to, so an override cannot slip past a check `talos.version` would have failed. The matrix rejects a pairing it lists as unsupported; it lists the Talos minors this chart ships and passes any other minor unchecked, so pointing either field at a Talos release the chart does not know about is the operator's call, not a checked one. Whichever release applies is interpolated into an image URL and a DataVolume name, so it must be a full `vMAJOR.MINOR.PATCH` release, optionally with a pre-release suffix -- the render refuses anything else, a minor-only `v1.13` included. The values schema types this as a bare string, so a malformed one is accepted by the CR and fails the pool's HelmRelease instead.
+## @field {string} schematicID - Talos image-factory schematic ID. Defaults to the cozystack-tested vanilla schematic. Operators using custom schematics (system extensions, kernel args) override here. The pool can pin its own via `osImage.builtin.schematicID` or `osImage.factory.schematicID`; when `osImage` omits it, this value applies. Whichever of the two applies is interpolated into an image URL and a DataVolume name, so it must be a plain lowercase alphanumeric identifier -- the render refuses anything else. A custom schematic on `osImage.builtin` also needs its own catalog entry, since the golden is named from the schematic ID.
+## @field {string} imageFactoryURL - Default base URL of the Talos Image Factory that serves the worker OS disk image (the `openstack-amd64.raw.xz` raw artifact streamed in by CDI over HTTP). Applies only when this pool imports over HTTP — the default and `osImage.factory`, which overrides it via `osImage.factory.imageFactoryURL`. A pool on `osImage.builtin` clones a golden image from the worker image catalog and does not use this field at all. Defaults to the public factory. Point at a self-hosted Image Factory, a caching mirror, or an internal HTTP file server for air-gapped, rate-limited, or flaky-egress environments. No trailing slash. It is interpolated into the worker DataVolume source URL, so on those HTTP paths it must be a plain `http(s)` URL and the render refuses anything else; a pool on `osImage.builtin` builds no such URL and is not held to it, so blanking this field there is legal.
+## @field {string} installerRepository - OCI repository prefix for the Talos installer image used by the in-guest `talos-reconcile` upgrade Job. Resolved as `<installerRepository>/<schematicID>:<version>` against whatever this pool's `osImage` pins, falling back to `talos.schematicID` and `talos.version` — so the installer matches the OS the pool actually booted. The prefix itself has no `osImage.*` override, so an air-gapped pool needs it pointed at a reachable registry as well. Defaults to the public factory's installer path. Override for air-gapped or mirrored registries. No trailing slash.
+## @field {object} registryMirrors - Talos `machine.registries.mirrors` passthrough for worker nodes: a map of upstream registry host to `{ endpoints: [ ... ] }`. Empty by default, so workers pull container images (the Talos `kubelet` image included) directly from the upstream registry. Point a host such as `ghcr.io` at an in-cluster pull-through mirror for air-gapped, rate-limited, or flaky-egress environments so a worker's boot does not depend on live public egress. Talos still falls back to the upstream registry unless a host also sets `skipFallback: true`, so a mirror alone does not enforce air-gap. This value is part of the worker machine config, whose content hash names the TalosConfigTemplate, so changing it rolls every existing worker in the pool rather than only affecting nodes created later.
+## @field {string} [imageFactoryCA] - Complete PEM certificate block(s) CDI must trust when importing this pool's worker OS disk image over HTTPS — the no-osImage default and `osImage.factory` path. Empty by default, so the importer uses only its system trust store, which is what the public factory needs. Set this when the factory in use (`imageFactoryURL` or `osImage.factory.imageFactoryURL`) is a self-hosted factory or mirror served by an internal CA, which the importer otherwise rejects with `x509: certificate signed by unknown authority`. The chart renders it into a ConfigMap in the release namespace — CDI requires certConfigMap to sit alongside the DataVolume — and references that from the worker DataVolume's `source.http.certConfigMap`; CDI appends it to the system pool rather than replacing it, so a publicly-trusted endpoint verifies either way. A pool on `osImage.builtin` clones a golden image and builds no HTTP source, so this field has no effect there.
+
+## @param {Talos} talos - Talos worker image configuration. Keep in sync with the parent cluster's `talos`.
+talos:
+  version: "v1.13.6"
+  schematicID: "ce4c980550dd2ab1b17bbf2b08801c7eb59418eafe8f279833297925d67c7515"
+  imageFactoryURL: "https://factory.talos.dev"
+  installerRepository: "factory.talos.dev/installer"
+  registryMirrors: {}
+  imageFactoryCA: ""
+
+##
+## @section Substrate
+##
+
+## @param {string} substrate="kubevirt" - Which infrastructure provider backs this pool's worker VMs. `kubevirt` runs them inside this cluster on KubeVirt, sized by `instanceType` and booted from a Talos disk image CDI streams from the image factory. `proxmox` runs them on an external Proxmox VE cluster through capmox, sized by `resources`, and cloned from a Talos VM template that already exists on the hypervisor. The two substrates take different Talos platform images and different sizing inputs, so switching an existing pool is refused: the chart reads the live MachineDeployment's template kind and fails the render rather than rolling every worker to the other hypervisor and deleting the template the draining MachineSet still references. Create a new pool on the other substrate and scale this one down.
+## @immutable
+substrate: kubevirt
+
+## @typedef {struct} ProxmoxNetwork - Network attachment for a Proxmox worker VM.
+## @field {string} bridge - Proxmox bridge the VM NIC attaches to (e.g. `vmbr0`). Required when `substrate` is `proxmox`.
+## @field {int} [vlan] - L2 VLAN tag. Omitted when unset.
+## @field {int} [mtu] - NIC MTU. Omitted when unset.
+
+## @typedef {struct} Proxmox - Proxmox substrate settings. Ignored unless `substrate` is `proxmox`.
+## @field {[]string} templateTags - Tags identifying the Talos VM template to clone. capmox matches a template when its tag set is EQUAL to this list, not when it contains it, so every tag on the template must be listed here — a missing one yields `found 0 VM templates with tags ...` while the tags are plainly present. The template has to carry this pool's `talos.schematicID` at `talos.version` in the nocloud flavour, with the Proxmox guest agent enabled for the `qemu-guest-agent` extension of the default schematic; `hack/proxmox-talos-template.sh` builds it from these values and prints the tags to list here. Do not build it from the platform release's `nocloud-amd64.raw.xz`: that is the bare-metal node image, whose `zfs` extension keeps a VM from finishing its boot sequence and reboots it at the Talos boot timeout. Required when `substrate` is `proxmox`.
+## @field {bool} [full] - Full clone rather than linked. Default is a linked clone: it costs kilobytes at creation instead of the whole disk, because a ZFS-backed linked clone writes only its own increment (measured: 8K against 10.2G for the same worker full-cloned onto a `sparse 0` pool). The cost is that the clone holds the template's base snapshot, so the template cannot be rotated while any linked clone still references it — which is what the consolidation CronJob resolves 24h after creation. Set true for a pool that must be independent of the template from the first second.
+## @field {ProxmoxNetwork} network - NIC configuration.
+## @field {string} [storage] - Proxmox storage for the cloned disk; needs `full: true`. A target storage is a full-clone parameter — a linked clone always lives on the template's storage, and Proxmox refuses the pair — so the render refuses it too. Empty keeps the template's storage.
+## @field {string} [pool] - Proxmox resource pool the worker VMs are added to. Set the same pool on every node pool of a tenant cluster and grant the tenant's tokens their privileges on `/pool/<name>`: that is the one ACL path that follows every VM capmox creates, replacements included. The pool must exist on the hypervisor; capmox does not create it. Empty adds the workers to no pool.
+## @field {[]string} dnsServers - Nameservers written into the worker machineconfig. On kubevirt the workers use the management cluster's CoreDNS, which they reach over the pod network; an off-cluster Proxmox worker cannot, so it needs reachable resolvers of its own. Required when `substrate` is `proxmox`. Keep in sync with the parent kubernetes chart's `proxmox.dnsServers`.
+
+## @param {Proxmox} proxmox - Proxmox substrate settings.
+proxmox:
+  templateTags: []
+  full: false
+  # vlan and mtu stay absent rather than null: the schema types them as
+  # integers, so a null default fails validation for every pool that does
+  # not set them.
+  network:
+    bridge: ""
+  storage: ""
+  pool: ""
+  dnsServers: []
+
+##
+## @section Images
+##
+
+## @typedef {struct} Images - Optional image overrides for chart-internal helpers.
+## @field {string} [kubectl] - Image used by the talos-reconcile and pre-delete unpin Jobs (kubectl). Empty falls back to images/kubectl.tag.
+
+## @param {Images} images - Optional image overrides for air-gapped or rate-limited registries.
+images:
+  kubectl: ""
diff --git a/packages/apps/kubernetes/.gitignore b/packages/apps/kubernetes/.gitignore
new file mode 100644
index 0000000000..59ec0d5365
--- /dev/null
+++ b/packages/apps/kubernetes/.gitignore
@@ -0,0 +1 @@
+images/kubevirt-csi-driver/kubevirt-csi-driver
diff --git a/packages/apps/kubernetes/Makefile b/packages/apps/kubernetes/Makefile
index 28331a7f16..e3a70869dd 100644
--- a/packages/apps/kubernetes/Makefile
+++ b/packages/apps/kubernetes/Makefile
@@ -8,7 +8,6 @@ include ../../../hack/package.mk
 
 test:
 	helm unittest .
-	bash tests/containerd-config-path-test.sh
 
 generate:
 	cozyvalues-gen -m 'kubernetes' -v values.yaml -s values.schema.json -r README.md -g ../../../api/apps/v1alpha1/kubernetes/types.go
@@ -18,28 +17,22 @@ update:
 	hack/update-versions.sh
 	make generate
 
-image: image-ubuntu-container-disk image-kubevirt-cloud-provider image-kubevirt-csi-driver image-cluster-autoscaler
+image: image-kubevirt-cloud-provider image-kubevirt-csi-driver image-cluster-autoscaler image-talos-csr-signer
 
-image-ubuntu-container-disk:
-	$(foreach ver,$(KUBERNETES_VERSIONS), \
-		docker buildx build images/ubuntu-container-disk \
-			--build-arg KUBERNETES_VERSION=$(ver) \
-			--tag $(REGISTRY)/ubuntu-container-disk:$(ver)-$(IMAGE_TAG) \
-			$(if $(filter 1,$(PUBLISH_VERSIONED)),--tag $(REGISTRY)/ubuntu-container-disk:$(ver)) \
-			--cache-from type=registry,ref=$(REGISTRY)/ubuntu-container-disk:$(ver) \
-			--cache-to type=inline \
-			--metadata-file images/ubuntu-container-disk-$(ver).json \
-			$(BUILDX_ARGS) && \
-		echo "$(REGISTRY)/ubuntu-container-disk:$(ver)-$(IMAGE_TAG)@$$(yq e '."containerimage.digest"' images/ubuntu-container-disk-$(ver).json -o json -r)" \
-			> images/ubuntu-container-disk-$(ver).tag && \
-		rm -f images/ubuntu-container-disk-$(ver).json; \
-	)
+image-talos-csr-signer:
+	docker buildx build images/talos-csr-signer \
+		$(call image-tags,talos-csr-signer,$(KUBERNETES_PKG_TAG)) \
+		$(call cache-args,talos-csr-signer) \
+		--metadata-file images/talos-csr-signer.json \
+		$(BUILDX_ARGS)
+	echo "$(REGISTRY)/talos-csr-signer:$(IMAGE_TAG)@$$(yq e '."containerimage.digest"' images/talos-csr-signer.json -o json -r)" \
+		> images/talos-csr-signer.tag
+	rm -f images/talos-csr-signer.json
 
 image-kubevirt-cloud-provider:
 	docker buildx build images/kubevirt-cloud-provider \
 		$(call image-tags,kubevirt-cloud-provider,$(KUBERNETES_PKG_TAG)) \
-		--cache-from type=registry,ref=$(REGISTRY)/kubevirt-cloud-provider:latest \
-		--cache-to type=inline \
+		$(call cache-args,kubevirt-cloud-provider) \
 		--metadata-file images/kubevirt-cloud-provider.json \
 		$(BUILDX_ARGS)
 	echo "$(REGISTRY)/kubevirt-cloud-provider:$(IMAGE_TAG)@$$(yq e '."containerimage.digest"' images/kubevirt-cloud-provider.json -o json -r)" \
@@ -49,8 +42,7 @@ image-kubevirt-cloud-provider:
 image-kubevirt-csi-driver:
 	docker buildx build images/kubevirt-csi-driver \
 		$(call image-tags,kubevirt-csi-driver,$(KUBERNETES_PKG_TAG)) \
-		--cache-from type=registry,ref=$(REGISTRY)/kubevirt-csi-driver:latest \
-		--cache-to type=inline \
+		$(call cache-args,kubevirt-csi-driver) \
 		--metadata-file images/kubevirt-csi-driver.json \
 		$(BUILDX_ARGS)
 	echo "$(REGISTRY)/kubevirt-csi-driver:$(IMAGE_TAG)@$$(yq e '."containerimage.digest"' images/kubevirt-csi-driver.json -o json -r)" \
@@ -63,8 +55,7 @@ image-kubevirt-csi-driver:
 image-cluster-autoscaler:
 	docker buildx build images/cluster-autoscaler \
 		$(call image-tags,cluster-autoscaler,$(KUBERNETES_PKG_TAG)) \
-		--cache-from type=registry,ref=$(REGISTRY)/cluster-autoscaler:latest \
-		--cache-to type=inline \
+		$(call cache-args,cluster-autoscaler) \
 		--metadata-file images/cluster-autoscaler.json \
 		$(BUILDX_ARGS)
 	echo "$(REGISTRY)/cluster-autoscaler:$(IMAGE_TAG)@$$(yq e '."containerimage.digest"' images/cluster-autoscaler.json -o json -r)" \
diff --git a/packages/apps/kubernetes/README.md b/packages/apps/kubernetes/README.md
index 1912419f02..a186da9778 100644
--- a/packages/apps/kubernetes/README.md
+++ b/packages/apps/kubernetes/README.md
@@ -12,7 +12,7 @@ Within a tenant cluster, users can take advantage of LoadBalancer services and e
 The control-plane operates within containers, while the worker nodes are deployed as virtual machines, all seamlessly managed by the application.
 
 Kubernetes version in tenant clusters is independent of Kubernetes in the management cluster.
-Users can select the supported patch versions from 1.30 to 1.35.
+Users can select the supported patch versions from 1.31 to 1.35.
 
 ## Why Use a Managed Kubernetes Cluster?
 
@@ -58,7 +58,7 @@ Deploying it involves the following components:
     Each control plane pod includes essential components like `kube-apiserver`, `controller-manager`, and `scheduler`,
     allowing for efficient multi-tenancy and resource utilization.
 
--   **Etcd Cluster**: A dedicated etcd cluster is deployed using Ænix's [etcd-operator](https://github.com/aenix-io/etcd-operator).
+-   **Etcd Cluster**: A dedicated etcd cluster is deployed using the cozystack [etcd-operator](https://github.com/cozystack/etcd-operator) (`etcd-operator.cozystack.io/v1alpha2`).
     It provides reliable and scalable key-value storage for the Kubernetes control plane.
 
 -   **Worker Nodes**: Virtual Machines are provisioned to serve as worker nodes using KubeVirt.
@@ -78,51 +78,91 @@ See the reference for components utilized in this service:
 - [github.com/clastix/kamaji](https://github.com/clastix/kamaji)
 - [KubeVirt](https://kubevirt.io/)
 - [github.com/kubevirt/kubevirt](https://github.com/kubevirt/kubevirt)
-- [github.com/aenix-io/etcd-operator](https://github.com/aenix-io/etcd-operator)
+- [github.com/cozystack/etcd-operator](https://github.com/cozystack/etcd-operator)
 - [Kubernetes Cluster API](https://cluster-api.sigs.k8s.io/)
 - [github.com/kubernetes-sigs/cluster-api-provider-kubevirt](https://github.com/kubernetes-sigs/cluster-api-provider-kubevirt)
 - [github.com/kubevirt/csi-driver](https://github.com/kubevirt/csi-driver)
 
 ## Breaking Changes
 
-- **`ephemeralStorage` renamed to `diskSize`** (v1.4): The `nodeGroups[name].ephemeralStorage` field has been renamed to `nodeGroups[name].diskSize` to better reflect its purpose (persistent disk for kubelet and containerd data). Existing clusters are migrated transparently by platform migration 41 during the pre-upgrade hook — no manual action is required. Newly written values should use `diskSize`. Existing VMs will be automatically rolling-updated via CAPI when the new values are applied. State persists across same-VM reboots (virt-launcher restart, guest reboot, node failure); VM replacement by CAPI (e.g. nodeGroup field change, MachineHealthCheck remediation) provisions a fresh PVC.
+- **`ephemeralStorage` renamed to `diskSize`** (v1.4): The `nodeGroups[name].ephemeralStorage` field has been renamed to `nodeGroups[name].diskSize`. Existing clusters are migrated transparently by platform migration 41 during the pre-upgrade hook — no manual action is required. Newly written values should use `diskSize`. Existing VMs are rolling-updated via CAPI when the new values are applied. With the Talos worker rollover in this release the field now sizes the **single system disk** (Talos OS image streamed from `factory.talos.dev`, kubelet state, containerd image cache, local-path PVCs) — the pre-Talos `disk-kubelet` PVC layout was removed. State on that single disk persists across same-VM reboots (virt-launcher restart, guest reboot, node failure); VM replacement by CAPI (e.g. nodeGroup field change, MachineHealthCheck remediation) provisions a fresh disk.
 
-> The top-level `storageClass` field is annotated as immutable in the chart schema — see [`docs/storage-immutability.md`](../../../docs/storage-immutability.md) for the contract and which consumers enforce it. The per-node-group `nodeGroups[name].storageClass` field is intentionally **not** annotated immutable: it is optional and undefaulted, so a strict `self == oldSelf` rule would block any future attempt to set it on an existing node group.
+- **Air-gapped tenant workers (Phase 1 Talos rollover)**: tenant worker bootstrap moves from Ubuntu containerDisk + kubeadm to a Talos OS disk image fetched over HTTP by CDI and a `.../installer/...` installer reference. Both sources are now overridable — set `talos.imageFactoryURL` (default `https://factory.talos.dev`) to a self-hosted Image Factory, a caching mirror, or an internal HTTP file server, and `talos.installerRepository` (default `factory.talos.dev/installer`) to a mirrored registry. The Helm-rendered `*-patch-containerd` Secret that previously plumbed the platform-wide `registries.mirrors` config to tenant workers (via the kubeadm template's containerd certs.d mount) has no consumer in the Talos machineconfig and was removed in this release; **in-guest container-image pulls** (pods pulling from registries inside the tenant cluster) still honour no per-tenant `registries.mirrors` override until Phase 2 restores it via `machine.registries.mirrors` knobs. So a strict-egress tenant can now mirror the Talos OS image and installer, but rate-limited in-guest registry pulls remain a Phase 2 follow-up — file an issue if you depend on this and it is not yet landed.
+
+- **Worker MachineHealthCheck remediation is now enabled by default** (Phase 1 Talos rollover): the worker MHC `maxUnhealthy` moved from a hard-coded `0` (remediation effectively **off**) to a configurable `nodeHealthCheck.maxUnhealthy` defaulting to `"50%"`. CAPI now auto-remediates (deletes and replaces) unhealthy worker Machines while at least 50% of a group stays healthy. `"50%"` deliberately leaves headroom for transient unhealthy nodes during the kubeadm→Talos rollover and slow first boots from `factory.talos.dev`; set `nodeHealthCheck.maxUnhealthy: "0%"` to keep the previous remediation-off behaviour until your fleet is stable on Talos workers.
+
+- **GitOps-managed tenant `Kubernetes` CRs must bump `spec.version` in Git** (Phase 1 Talos rollover): platform migration 46 patches live `kuberneteses.apps.cozystack.io` objects from `v1.30` to `v1.31` (v1.30 left the Talos↔Kubernetes support matrix). When the tenant `Kubernetes` CR is reconciled from Git (Flux/Argo), the next source reconcile re-applies `version: v1.30` over migration 46's patch, which then trips the chart's `_versions.tpl` guard and the HelmRelease fails. Update `spec.version` to `v1.31` (or newer) in your Git source before/with the platform upgrade. Tenants managed via the API or dashboard need no action — migration 46 handles them.
+
+- **Remote-accessible LINSTOR StorageClasses are auto-propagated to tenants** (v1.5): infra-cluster LINSTOR StorageClasses whose `linstor.csi.linbit.com/allowRemoteVolumeAccess` is not `"false"` are created inside each tenant under the same name (provisioned by `csi.kubevirt.io`). **Upgrade caveat:** delete any *manually created* tenant StorageClass whose name collides with a propagated infra class (e.g. a hand-made `replicated`) before upgrading, or the propagated class cannot be created and the tenant CSI release will not converge. Infra classes that must stay node-local need `allowRemoteVolumeAccess: "false"` set explicitly — an absent annotation is treated as remote-accessible. Propagation is evaluated at HelmRelease render time, so classes added or removed on the infra cluster after a tenant exists propagate only on that tenant's next reconcile.
+
+- **Worker pools split into `KubernetesNodes` (Phase 2)**: `spec.nodeGroups`, `spec.nodeHealthCheck` and `spec.maxNodeProvisionTime` are removed from the `Kubernetes` CR — worker pools are now separate `KubernetesNodes` resources (one HelmRelease per pool; see the `kubernetes-nodes` chart), on which `spec.cluster` and `spec.storageClass` are immutable (`self == oldSelf`). Existing pools are adopted automatically on upgrade by platform migration 56 with no worker-VM churn. Consequences: (1) the `Kubernetes` CR's `WorkloadsReady` condition is now **control-plane-only** — worker health is reported on each `KubernetesNodes` resource, so a dashboard or `kubectl wait` watching the parent no longer reflects worker readiness; (2) enabling `addons.ingressNginx` now requires a pool carrying `roles: [ingress-nginx]` (the implicit default `md0` is gone — without such a pool the controller DaemonSet schedules nothing); (3) do **not** edit `Kubernetes` CRs during a platform upgrade — a mid-window parent render can transiently fail Helm ownership validation while migration 56 re-annotates worker objects, and self-heals once the new chart artifact lands; (4) when deleting a cluster, delete its `KubernetesNodes` pools **before** the parent `Kubernetes` resource, so each pool's pre-delete unpin hook can run while the tenant apiserver and the CAPI CRDs still exist — deleting the parent first can leave the pool release reconciling CAPI objects against a cluster that is being torn down (in the pre-split monolith the pools were part of the parent release and died with it; they are now separate resources with their own lifecycle); (5) the removed fields (`nodeGroups`, `nodeHealthCheck`, `maxNodeProvisionTime`) are still **accepted and stored** on an already-upgraded `Kubernetes` CR — the adoption migration deliberately leaves them in place rather than rewriting parent values mid-upgrade — but they have **no effect**: editing them (for example scaling via `spec.nodeGroups.<pool>.minReplicas`) does nothing, and the API returns an admission warning pointing you at the `KubernetesNodes` resources. A cluster name is also capped at 32 characters so every pool's `KubernetesNodes` release name fits the 53-character Helm limit. ComputePlane clusters (the `computeplane` module) are affected the same way: their worker pools are rendered as separate per-pool `KubernetesNodes` releases too (materialised directly by the module rather than adopted), so the same pool-name length limit applies to their `nodeGroups` keys.
+
+- **`controlPlane.apiServer.extraArgs` refuses flags the tenant control plane owns** (Kamaji 26.9.4-edge): the tenant control plane now sets a list of kube-apiserver flags itself and drops an `extraArgs` entry naming one, where the previous build let the entry win. The entry stops taking effect once the new build reconciles the control plane, whatever the chart renders. Two of those flags have a field the control plane renders them from, and the chart moves an entry written as `--flag=value` into it while the field is empty: `--enable-admission-plugins` into `controlPlane.apiServer.admissionControllers`, `--kubelet-preferred-address-types` into `controlPlane.kubelet.preferredAddressTypes`. The KamajiControlPlane CRD accepts only the plugin names it lists, so a plugin outside that list that the apiserver leaves off by default can no longer be enabled, and a moved name outside it fails when the KamajiControlPlane is applied, with an error that names it, rather than at render. The chart refuses to render any other entry naming one of the flags, so a tenant carrying one stops reconciling until the entry is removed; the description of `controlPlane.apiServer.extraArgs` lists the flags. The same Kamaji update passes every `extraArgs` entry to the apiserver, so repeats of a flag no longer collapse to the last one: naming the kube feature gates both bare and `kube:`-prefixed across entries, or giving two `--emulated-version` entries that name kube, now stops the apiserver from starting. The chart refuses neither, in any `spec.oidc.mode`: both reach the apiserver as written. Keep one spelling for kube gate terms and one kube emulated version.
+
+> The top-level `storageClass` field is annotated as immutable in the chart schema — see [`docs/storage-immutability.md`](../../../docs/storage-immutability.md) for the contract and which consumers enforce it. The per-pool worker `storageClass` now lives on the `KubernetesNodes` resource (see the `kubernetes-nodes` chart).
+
+## Proxmox substrate: credentials, privileges and tenant scope
+
+On `substrate: proxmox` two components authenticate to the hypervisor, and both run in the management cluster, in the tenant's namespace: the CSI controller (`<release>-pcsi-controller`) and the cloud-controller-manager (`<release>-pccm`). The tenant cluster gets the CSI node plugin, the CSIDriver object and the storage classes, none of which carry a credential. `proxmox.csi.credentialsSecretName` and `proxmox.ccm.credentialsSecretName` name Secrets in the management cluster with the keys `url`, `token_id`, `token_secret` and `region`; the tenant cannot read them, and nothing copies them into the tenant cluster.
+
+Keeping the token out of the tenant is half of the isolation. The tenant is cluster-admin of its own cluster, and the controllers act on what the tenant's objects tell them: the CSI controller attaches the disk a PV's `volumeHandle` names to the VM a node's ID names, and deletes the disk a PV names, with no check that either belongs to this cluster. Under the privileges the upstream charts document — granted on `/` — one tenant's objects can make the controller attach, detach or delete another tenant's disks. The per-cluster volume owner id (`vm-<id>-pvc-…`) makes leftovers attributable; it does not scope anything.
+
+What contains it is one Proxmox ACL per tenant, on a resource pool. Create a pool for the tenant on the hypervisor, set `proxmox.pool` to its name on every `KubernetesNodes` pool of the tenant's cluster — capmox adds each worker VM to it as it is cloned, replacements included, so the ACL follows every VM without being granted again — and give the tenant's tokens their privileges on that pool and on a storage dedicated to the tenant:
+
+| Component | Privileges | Path |
+|---|---|---|
+| CSI controller | `VM.Audit`, `VM.Config.Disk` | `/pool/<proxmox.pool>` |
+| CSI controller | `Datastore.Allocate`, `Datastore.AllocateSpace`, `Datastore.Audit` | `/storage/<the tenant's storage>`: `Datastore.Allocate` on a storage reaches every volume on it |
+| CCM | `VM.Audit`, `VM.GuestAgent.Audit` | `/pool/<proxmox.pool>`: a NotReady node whose VM the token cannot see is reported as gone, and the CCM deletes it |
+| CCM | `Sys.Audit` | `/` |
+
+Grant these to the user that owns the tokens as well as to the tokens themselves: Proxmox caps a privilege-separated token at its user's permissions, so a token whose user holds nothing has nothing, whatever its own ACL says. `pveum user token permissions <user> <token> --path /pool/<proxmox.pool>` shows the set that actually applies.
+
+A storage shared between tenants cannot be scoped: `Datastore.Allocate` on it is what deletes volumes and also what lets any volume on it be attached. Without `proxmox.pool` there is no VM-level scope either: a token that reaches the tenant's VMs then reaches every VM on the hypervisor. What the pool-and-storage scope still leaves open is the tenant's own disks, which the tenant can attach, detach and delete through the controller — the same reach a cluster-admin of the tenant has anyway.
+
+`proxmox.insecure` defaults to `false`: the controllers verify the hypervisor's certificate. A stock Proxmox VE install serves a self-signed one, so either set `insecure: true` for it or install a certificate the management cluster trusts.
 
 ## Parameters
 
 ### Common Parameters
 
-| Name           | Description                          | Type     | Value        |
-| -------------- | ------------------------------------ | -------- | ------------ |
-| `storageClass` | StorageClass used to store the data. | `string` | `replicated` |
+| Name           | Description                                                                                                                              | Type     | Value        |
+| -------------- | ---------------------------------------------------------------------------------------------------------------------------------------- | -------- | ------------ |
+| `storageClass` | Default StorageClass inside the tenant cluster. Remote-accessible LINSTOR classes are auto-propagated to the tenant under the same name. | `string` | `replicated` |
 
 
 ### Application-specific Parameters
 
-| Name                                            | Description                                                                                                                                                                                                                                                                                                                                                                  | Type                | Value       |
-| ----------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------- | ----------- |
-| `nodeGroups`                                    | Worker nodes configuration map.                                                                                                                                                                                                                                                                                                                                              | `map[string]object` | `{...}`     |
-| `nodeGroups[name].minReplicas`                  | Minimum number of replicas.                                                                                                                                                                                                                                                                                                                                                  | `int`               | `0`         |
-| `nodeGroups[name].maxReplicas`                  | Maximum number of replicas.                                                                                                                                                                                                                                                                                                                                                  | `int`               | `10`        |
-| `nodeGroups[name].instanceType`                 | Virtual machine instance type.                                                                                                                                                                                                                                                                                                                                               | `string`            | `u1.medium` |
-| `nodeGroups[name].diskSize`                     | Persistent disk size for kubelet and containerd data.                                                                                                                                                                                                                                                                                                                        | `quantity`          | `20Gi`      |
-| `nodeGroups[name].storageClass`                 | StorageClass for worker node persistent disks. When empty, uses the management cluster default StorageClass (the one annotated storageclass.kubernetes.io/is-default-class: true). NOTE: deliberately not marked immutable — the field is optional and undefaulted, so a strict `self == oldSelf` rule would block any future attempt to set it on an existing node group. | `string`            | `""`        |
-| `nodeGroups[name].roles`                        | List of node roles.                                                                                                                                                                                                                                                                                                                                                          | `[]string`          | `[]`        |
-| `nodeGroups[name].resources`                    | CPU and memory resources for each worker node.                                                                                                                                                                                                                                                                                                                               | `object`            | `{}`        |
-| `nodeGroups[name].resources.cpu`                | CPU available.                                                                                                                                                                                                                                                                                                                                                               | `quantity`          | `""`        |
-| `nodeGroups[name].resources.memory`             | Memory (RAM) available.                                                                                                                                                                                                                                                                                                                                                      | `quantity`          | `""`        |
-| `nodeGroups[name].gpus`                         | List of GPUs to attach (NVIDIA driver requires at least 4 GiB RAM).                                                                                                                                                                                                                                                                                                          | `[]object`          | `[]`        |
-| `nodeGroups[name].gpus[i].name`                 | Name of GPU, such as "nvidia.com/AD102GL_L40S".                                                                                                                                                                                                                                                                                                                              | `string`            | `""`        |
-| `nodeGroups[name].kubelet`                      | Kubelet resource reservations for this node group.                                                                                                                                                                                                                                                                                                                           | `object`            | `{}`        |
-| `nodeGroups[name].kubelet.systemReservedMemory` | Memory reserved for host OS. Auto-computed from instanceType if empty.                                                                                                                                                                                                                                                                                                       | `string`            | `""`        |
-| `nodeGroups[name].kubelet.kubeReservedMemory`   | Memory reserved for kubelet and container runtime. Auto-computed from instanceType if empty.                                                                                                                                                                                                                                                                                 | `string`            | `""`        |
-| `nodeGroups[name].kubelet.systemReservedCpu`    | CPU reserved for host OS. Auto-computed from instanceType if empty.                                                                                                                                                                                                                                                                                                          | `string`            | `""`        |
-| `nodeGroups[name].kubelet.kubeReservedCpu`      | CPU reserved for kubelet and container runtime. Auto-computed from instanceType if empty.                                                                                                                                                                                                                                                                                    | `string`            | `""`        |
-| `nodeGroups[name].kubelet.evictionHardMemory`   | Hard eviction threshold for memory (absolute like 200Mi or percentage like 7%).                                                                                                                                                                                                                                                                                              | `string`            | `7%`        |
-| `nodeGroups[name].kubelet.evictionSoftMemory`   | Soft eviction threshold for memory (absolute like 1Gi or percentage like 10%).                                                                                                                                                                                                                                                                                               | `string`            | `10%`       |
-| `version`                                       | Kubernetes major.minor version to deploy                                                                                                                                                                                                                                                                                                                                     | `string`            | `v1.35`     |
-| `host`                                          | External hostname for Kubernetes cluster. Defaults to `<cluster-name>.<tenant-host>` if empty.                                                                                                                                                                                                                                                                               | `string`            | `""`        |
+| Name      | Description                                                                                    | Type     | Value   |
+| --------- | ---------------------------------------------------------------------------------------------- | -------- | ------- |
+| `version` | Kubernetes major.minor version to deploy                                                       | `string` | `v1.35` |
+| `host`    | External hostname for Kubernetes cluster. Defaults to `<cluster-name>.<tenant-host>` if empty. | `string` | `""`    |
+
+
+### Substrate
+
+| Name                                          | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    | Type       | Value      |
+| --------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------- | ---------- |
+| `substrate`                                   | Which infrastructure provider backs this cluster's worker VMs. `kubevirt` runs them inside this cluster; `proxmox` runs them on an external Proxmox VE cluster through capmox. The control plane is Kamaji either way — this selects the infrastructure half only. Must match the `substrate` of every KubernetesNodes pool attached to this cluster: the pools reference this cluster's infrastructure object by kind, and a mismatch leaves their Machines unreconciled. Switching an existing cluster is not supported; create a new one. | `string`   | `kubevirt` |
+| `proxmox`                                     | Proxmox substrate settings.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    | `object`   | `{}`       |
+| `proxmox.allowedNodes`                        | Proxmox nodes capmox may place VMs on. Empty means every node in the Proxmox cluster.                                                                                                                                                                                                                                                                                                                                                                                                                                                          | `[]string` | `[]`       |
+| `proxmox.dnsServers`                          | Nameservers written into each worker's network config. Required by the ProxmoxCluster schema.                                                                                                                                                                                                                                                                                                                                                                                                                                                  | `[]string` | `[]`       |
+| `proxmox.insecure`                            | Skip verification of the Proxmox API server certificate in the CCM and the CSI controller, both of which run in the management cluster. Default false: the certificate is verified unless an operator turns that off. A stock Proxmox VE install serves a self-signed one, so set true for it, or install a certificate the management cluster trusts.                                                                                                                                                                                         | `bool`     | `false`    |
+| `proxmox.ipv4Config`                          | Address pool for workers. capmox assigns static addresses and has no DHCP mode, so this is required rather than optional.                                                                                                                                                                                                                                                                                                                                                                                                                      | `object`   | `{}`       |
+| `proxmox.ipv4Config.addresses`                | Ranges or CIDRs, e.g. `["10.0.0.120-10.0.0.170"]`. capmox turns these into an InClusterIPPool, so they must not overlap any DHCP range on the same L2 or two workers will answer to one address.                                                                                                                                                                                                                                                                                                                                               | `[]string` | `[]`       |
+| `proxmox.ipv4Config.gateway`                  | Default gateway for the workers.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | `string`   | `""`       |
+| `proxmox.ipv4Config.prefix`                   | Netmask prefix length.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | `int`      | `24`       |
+| `proxmox.ccm`                                 | Proxmox cloud-controller-manager settings.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | `object`   | `{}`       |
+| `proxmox.ccm.credentialsSecretName`           | Secret in THIS namespace holding the controller's Proxmox API credentials under the keys `url`, `token_id`, `token_secret` and `region`. May name the same Secret as `csi.credentialsSecretName`; it is a separate knob so the two can hold separate tokens, since this one only reads VM inventory while the driver attaches and detaches disks.                                                                                                                                                                                              | `string`   | `""`       |
+| `proxmox.csi`                                 | Proxmox CSI driver settings.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   | `object`   | `{}`       |
+| `proxmox.csi.enabled`                         | Install the driver. Without it a Proxmox-backed tenant has no way to provision PersistentVolumes at all.                                                                                                                                                                                                                                                                                                                                                                                                                                       | `bool`     | `true`     |
+| `proxmox.csi.credentialsSecretName`           | Secret in THIS namespace holding the driver's Proxmox API credentials under the keys `url`, `token_id`, `token_secret` and `region`. The parent chart composes them into the controller's config file here, in the management cluster; nothing reaches the tenant, and no token is written into a rendered manifest. Distinct from the capmox credentials on purpose: the driver attaches and detaches disks, which is a different blast radius from creating VMs.                                                                             | `string`   | `""`       |
+| `proxmox.csi.storageClasses`                  | StorageClasses to create in the tenant.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        | `[]object` | `[]`       |
+| `proxmox.csi.storageClasses[i].name`          | StorageClass name inside the tenant cluster.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   | `string`   | `""`       |
+| `proxmox.csi.storageClasses[i].storage`       | Proxmox storage id the volumes are created on (as it appears in `pvesm status`).                                                                                                                                                                                                                                                                                                                                                                                                                                                               | `string`   | `""`       |
+| `proxmox.csi.storageClasses[i].fstype`        | Filesystem the driver formats volumes with: ext4 or xfs.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       | `string`   | `""`       |
+| `proxmox.csi.storageClasses[i].ssd`           | Mark volumes as SSD-backed, which changes the discard/cache defaults Proxmox applies.                                                                                                                                                                                                                                                                                                                                                                                                                                                          | `bool`     | `false`    |
+| `proxmox.csi.storageClasses[i].reclaimPolicy` | Delete or Retain.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              | `string`   | `""`       |
 
 
 ### Cluster Addons
@@ -133,7 +173,7 @@ See the reference for components utilized in this service:
 | `addons.certManager`                          | Cert-manager addon.                                                                                                                                                            | `object`   | `{}`      |
 | `addons.certManager.enabled`                  | Enable cert-manager.                                                                                                                                                           | `bool`     | `false`   |
 | `addons.certManager.valuesOverride`           | Custom Helm values overrides.                                                                                                                                                  | `object`   | `{}`      |
-| `addons.cilium`                               | Cilium CNI plugin.                                                                                                                                                             | `object`   | `{}`      |
+| `addons.cilium`                               | Cilium CNI plugin. Always installed as the tenant cluster's CNI; this section only overrides its Helm values.                                                                  | `object`   | `{}`      |
 | `addons.cilium.valuesOverride`                | Custom Helm values overrides.                                                                                                                                                  | `object`   | `{}`      |
 | `addons.gatewayAPI`                           | Gateway API addon.                                                                                                                                                             | `object`   | `{}`      |
 | `addons.gatewayAPI.enabled`                   | Enable Gateway API.                                                                                                                                                            | `bool`     | `false`   |
@@ -148,18 +188,15 @@ See the reference for components utilized in this service:
 | `addons.hami`                                 | HAMi GPU virtualization middleware.                                                                                                                                            | `object`   | `{}`      |
 | `addons.hami.enabled`                         | Enable HAMi (requires GPU Operator).                                                                                                                                           | `bool`     | `false`   |
 | `addons.hami.valuesOverride`                  | Custom Helm values overrides.                                                                                                                                                  | `object`   | `{}`      |
-| `addons.fluxcd`                               | FluxCD GitOps operator.                                                                                                                                                        | `object`   | `{}`      |
-| `addons.fluxcd.enabled`                       | Enable FluxCD.                                                                                                                                                                 | `bool`     | `false`   |
-| `addons.fluxcd.valuesOverride`                | Custom Helm values overrides.                                                                                                                                                  | `object`   | `{}`      |
 | `addons.monitoringAgents`                     | Monitoring agents.                                                                                                                                                             | `object`   | `{}`      |
 | `addons.monitoringAgents.enabled`             | Enable monitoring agents.                                                                                                                                                      | `bool`     | `false`   |
 | `addons.monitoringAgents.valuesOverride`      | Custom Helm values overrides.                                                                                                                                                  | `object`   | `{}`      |
-| `addons.verticalPodAutoscaler`                | Vertical Pod Autoscaler.                                                                                                                                                       | `object`   | `{}`      |
+| `addons.verticalPodAutoscaler`                | Vertical Pod Autoscaler. Installed and removed together with addons.monitoringAgents.enabled; this section only overrides its Helm values.                                     | `object`   | `{}`      |
 | `addons.verticalPodAutoscaler.valuesOverride` | Custom Helm values overrides.                                                                                                                                                  | `object`   | `{}`      |
 | `addons.velero`                               | Velero backup/restore addon.                                                                                                                                                   | `object`   | `{}`      |
 | `addons.velero.enabled`                       | Enable Velero.                                                                                                                                                                 | `bool`     | `false`   |
 | `addons.velero.valuesOverride`                | Custom Helm values overrides.                                                                                                                                                  | `object`   | `{}`      |
-| `addons.coredns`                              | CoreDNS addon.                                                                                                                                                                 | `object`   | `{}`      |
+| `addons.coredns`                              | CoreDNS addon. Always installed as the tenant cluster's DNS; this section only overrides its Helm values.                                                                      | `object`   | `{}`      |
 | `addons.coredns.valuesOverride`               | Custom Helm values overrides.                                                                                                                                                  | `object`   | `{}`      |
 | `addons.ouroboros`                            | Hairpin-NAT fix for ingress-nginx with PROXY-protocol.                                                                                                                         | `object`   | `{}`      |
 | `addons.ouroboros.enabled`                    | Enable ouroboros. Requires addons.ingressNginx.enabled (chart-render fail otherwise). Only useful when PROXY-protocol is wired on the tenant ingress-nginx via valuesOverride. | `bool`     | `false`   |
@@ -168,33 +205,68 @@ See the reference for components utilized in this service:
 
 ### Kubernetes Control Plane Configuration
 
-| Name                                                | Description                                                                                   | Type       | Value       |
-| --------------------------------------------------- | --------------------------------------------------------------------------------------------- | ---------- | ----------- |
-| `controlPlane`                                      | Kubernetes control-plane configuration.                                                       | `object`   | `{}`        |
-| `controlPlane.replicas`                             | Number of control-plane replicas.                                                             | `int`      | `2`         |
-| `controlPlane.apiServer`                            | API Server configuration.                                                                     | `object`   | `{}`        |
-| `controlPlane.apiServer.resources`                  | CPU and memory resources for API Server.                                                      | `object`   | `{}`        |
-| `controlPlane.apiServer.resources.cpu`              | CPU available.                                                                                | `quantity` | `""`        |
-| `controlPlane.apiServer.resources.memory`           | Memory (RAM) available.                                                                       | `quantity` | `""`        |
-| `controlPlane.apiServer.resourcesPreset`            | Preset if `resources` omitted.                                                                | `string`   | `c1.medium` |
-| `controlPlane.controllerManager`                    | Controller Manager configuration.                                                             | `object`   | `{}`        |
-| `controlPlane.controllerManager.resources`          | CPU and memory resources for Controller Manager.                                              | `object`   | `{}`        |
-| `controlPlane.controllerManager.resources.cpu`      | CPU available.                                                                                | `quantity` | `""`        |
-| `controlPlane.controllerManager.resources.memory`   | Memory (RAM) available.                                                                       | `quantity` | `""`        |
-| `controlPlane.controllerManager.resourcesPreset`    | Preset if `resources` omitted.                                                                | `string`   | `t1.micro`  |
-| `controlPlane.scheduler`                            | Scheduler configuration.                                                                      | `object`   | `{}`        |
-| `controlPlane.scheduler.resources`                  | CPU and memory resources for Scheduler.                                                       | `object`   | `{}`        |
-| `controlPlane.scheduler.resources.cpu`              | CPU available.                                                                                | `quantity` | `""`        |
-| `controlPlane.scheduler.resources.memory`           | Memory (RAM) available.                                                                       | `quantity` | `""`        |
-| `controlPlane.scheduler.resourcesPreset`            | Preset if `resources` omitted.                                                                | `string`   | `t1.micro`  |
-| `controlPlane.konnectivity`                         | Konnectivity configuration.                                                                   | `object`   | `{}`        |
-| `controlPlane.konnectivity.server`                  | Konnectivity Server configuration.                                                            | `object`   | `{}`        |
-| `controlPlane.konnectivity.server.resources`        | CPU and memory resources for Konnectivity.                                                    | `object`   | `{}`        |
-| `controlPlane.konnectivity.server.resources.cpu`    | CPU available.                                                                                | `quantity` | `""`        |
-| `controlPlane.konnectivity.server.resources.memory` | Memory (RAM) available.                                                                       | `quantity` | `""`        |
-| `controlPlane.konnectivity.server.resourcesPreset`  | Preset if `resources` omitted.                                                                | `string`   | `t1.micro`  |
-| `images`                                            | Optional image overrides for air-gapped or rate-limited registries.                           | `object`   | `{}`        |
-| `images.waitForKubeconfig`                          | Image used by the wait-for-kubeconfig init container. Empty falls back to images/busybox.tag. | `string`   | `""`        |
+| Name                                                | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | Type       | Value       |
+| --------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------- | ----------- |
+| `controlPlane`                                      | Kubernetes control-plane configuration.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | `object`   | `{}`        |
+| `controlPlane.replicas`                             | Number of control-plane replicas.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | `int`      | `2`         |
+| `controlPlane.apiServer`                            | API Server configuration.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    | `object`   | `{}`        |
+| `controlPlane.apiServer.resources`                  | CPU and memory resources for API Server.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | `object`   | `{}`        |
+| `controlPlane.apiServer.resources.cpu`              | CPU available.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | `quantity` | `""`        |
+| `controlPlane.apiServer.resources.memory`           | Memory (RAM) available.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | `quantity` | `""`        |
+| `controlPlane.apiServer.resourcesPreset`            | Preset if `resources` omitted.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | `string`   | `c1.medium` |
+| `controlPlane.apiServer.extraArgs`                  | Extra command-line flags appended to the tenant kube-apiserver, passed through to KamajiControlPlane `spec.apiServer.extraArgs`. For OIDC use `spec.oidc.mode` — this passthrough is the escape hatch for unrelated apiserver flags. The tenant control plane sets each of the following flags itself and drops an entry naming one before the apiserver sees it. The chart moves an `--enable-admission-plugins=` entry into `controlPlane.apiServer.admissionControllers` and a `--kubelet-preferred-address-types=` entry into `controlPlane.kubelet.preferredAddressTypes` while that field is empty, and refuses any other entry naming one of them: `--advertise-address`, `--client-ca-file`, `--enable-admission-plugins`, `--service-cluster-ip-range`, `--kubelet-client-certificate`, `--kubelet-client-key`, `--kubelet-preferred-address-types`, `--proxy-client-cert-file`, `--proxy-client-key-file`, `--requestheader-allowed-names`, `--requestheader-client-ca-file`, `--secure-port`, `--service-account-key-file`, `--service-account-signing-key-file`, `--tls-cert-file`, `--tls-private-key-file`, `--etcd-servers`, `--etcd-cafile`, `--etcd-certfile`, `--etcd-keyfile`, `--etcd-prefix`, `--etcd-compaction-interval`, `--egress-selector-config-file`. When `spec.oidc.mode` is not `None` the chart also renders OIDC flags here, reads what you have written on them, and refuses some combinations outright; `docs/oidc-tenant.md` carries which flags, which combinations, and why. Do NOT add legacy `--oidc-*` flags here when `spec.oidc.mode` is not `None`; the chart injects `--authentication-config` and the apiserver refuses to boot with both. Empty by default (no change to current behavior). | `[]string` | `[]`        |
+| `controlPlane.apiServer.admissionControllers`       | Admission plugins the tenant kube-apiserver enables, passed through to KamajiControlPlane `spec.admissionControllers`, which the control plane renders as `--enable-admission-plugins`. A non-empty list replaces the control plane's default set instead of adding to it. The kube-apiserver enables these plugins in addition to its own default ones, so leaving a plugin out does not turn it off; to turn one off, name it in `--disable-admission-plugins` in `controlPlane.apiServer.extraArgs` and keep it out of this list, since the apiserver refuses to start with a plugin in both, and the control plane's default set names several. Empty by default, which keeps that default set, taken from the TenantControlPlane CRD: CertificateApproval, CertificateSigning, CertificateSubjectRestriction, DefaultIngressClass, DefaultStorageClass, DefaultTolerationSeconds, LimitRanger, MutatingAdmissionWebhook, NamespaceLifecycle, PersistentVolumeClaimResize, Priority, ResourceQuota, RuntimeClass, ServiceAccount, StorageObjectInUseProtection, TaintNodesByCondition, ValidatingAdmissionWebhook. `NodeRestriction` is not in it.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       | `[]string` | `[]`        |
+| `controlPlane.apiServer.extraVolumes`               | Extra volumes added to the control-plane Deployment, passed through to KamajiControlPlane `spec.deployment.extraVolumes`. Use to mount a ConfigMap or Secret holding an AuthenticationConfiguration file referenced by `extraArgs`. Each item is a core/v1 Volume, but because the control-plane pod runs on the management cluster only `configMap` and `secret` sources are allowed (host-reaching sources like `hostPath`/`csi` and token-projection via `projected` are rejected); each volume must have a unique, non-empty name and exactly one source. The names `talos-ca` and `talos-tls-cert` are reserved by the chart. Empty by default.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | `[]object` | `[]`        |
+| `controlPlane.apiServer.extraVolumeMounts`          | Extra volume mounts added to the tenant kube-apiserver container, passed through to KamajiControlPlane `spec.apiServer.extraVolumeMounts`. Each `name` must reference a volume declared in `extraVolumes`; the chart-managed talos secret volumes cannot be mounted. Each item is a core/v1 VolumeMount. Empty by default.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   | `[]object` | `[]`        |
+| `controlPlane.controllerManager`                    | Controller Manager configuration.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | `object`   | `{}`        |
+| `controlPlane.controllerManager.resources`          | CPU and memory resources for Controller Manager.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | `object`   | `{}`        |
+| `controlPlane.controllerManager.resources.cpu`      | CPU available.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | `quantity` | `""`        |
+| `controlPlane.controllerManager.resources.memory`   | Memory (RAM) available.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | `quantity` | `""`        |
+| `controlPlane.controllerManager.resourcesPreset`    | Preset if `resources` omitted.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | `string`   | `t1.micro`  |
+| `controlPlane.scheduler`                            | Scheduler configuration.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | `object`   | `{}`        |
+| `controlPlane.scheduler.resources`                  | CPU and memory resources for Scheduler.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | `object`   | `{}`        |
+| `controlPlane.scheduler.resources.cpu`              | CPU available.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | `quantity` | `""`        |
+| `controlPlane.scheduler.resources.memory`           | Memory (RAM) available.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | `quantity` | `""`        |
+| `controlPlane.scheduler.resourcesPreset`            | Preset if `resources` omitted.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | `string`   | `t1.micro`  |
+| `controlPlane.konnectivity`                         | Konnectivity configuration.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | `object`   | `{}`        |
+| `controlPlane.konnectivity.server`                  | Konnectivity Server configuration.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | `object`   | `{}`        |
+| `controlPlane.konnectivity.server.resources`        | CPU and memory resources for Konnectivity.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   | `object`   | `{}`        |
+| `controlPlane.konnectivity.server.resources.cpu`    | CPU available.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | `quantity` | `""`        |
+| `controlPlane.konnectivity.server.resources.memory` | Memory (RAM) available.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | `quantity` | `""`        |
+| `controlPlane.konnectivity.server.resourcesPreset`  | Preset if `resources` omitted.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | `string`   | `t1.micro`  |
+| `controlPlane.kubelet`                              | Kubelet connection settings.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | `object`   | `{}`        |
+| `controlPlane.kubelet.preferredAddressTypes`        | Node address types the tenant kube-apiserver tries, in order, when it connects to a kubelet, passed through to KamajiControlPlane `spec.kubelet.preferredAddressTypes`, which the control plane renders as `--kubelet-preferred-address-types`. The KamajiControlPlane CRD rejects a repeated name. Empty by default, which renders `InternalIP`, `ExternalIP`, or the list of a `--kubelet-preferred-address-types=` entry in `controlPlane.apiServer.extraArgs` when there is one.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | `[]string` | `[]`        |
+| `images`                                            | Optional image overrides for air-gapped or rate-limited registries.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | `object`   | `{}`        |
+| `images.waitForKubeconfig`                          | Image used by the wait-for-kubeconfig init container. Empty falls back to images/busybox.tag.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | `string`   | `""`        |
+| `images.kubectl`                                    | Image used by the bootstrap-token tenant Job (kubectl). Empty falls back to images/kubectl.tag.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              | `string`   | `""`        |
+| `images.talosCsrSigner`                             | Image used by the talos-csr-signer sidecar in the Kamaji control plane. Empty falls back to images/talos-csr-signer.tag.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | `string`   | `""`        |
+
+
+### Talos Worker Image
+
+| Name                        | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   | Type     | Value                                                              |
+| --------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------- | ------------------------------------------------------------------ |
+| `talos`                     | Talos worker image configuration.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | `object` | `{}`                                                               |
+| `talos.version`             | Talos release used for worker OS image and installer. Must satisfy the chart's Talos<->Kubernetes support matrix against the chosen `version`.                                                                                                                                                                                                                                                                                                                                                                                                                                                | `string` | `v1.13.6`                                                          |
+| `talos.schematicID`         | Talos image-factory schematic ID. Defaults to the cozystack-tested vanilla schematic. Operators using custom schematics (system extensions, kernel args) override here.                                                                                                                                                                                                                                                                                                                                                                                                                       | `string` | `ce4c980550dd2ab1b17bbf2b08801c7eb59418eafe8f279833297925d67c7515` |
+| `talos.imageFactoryURL`     | Base URL of the Talos Image Factory that serves the worker OS disk image (the `openstack-amd64.raw.xz` raw artifact streamed in by CDI over HTTP). Defaults to the public factory. Point at a self-hosted Image Factory, a caching mirror, or an internal HTTP file server for air-gapped, rate-limited, or flaky-egress environments. No trailing slash.                                                                                                                                                                                                                                     | `string` | `https://factory.talos.dev`                                        |
+| `talos.installerRepository` | OCI repository prefix for the Talos installer image used by the in-guest `talos-reconcile` upgrade Job. Resolved as `<installerRepository>/<schematicID>:<version>`. Defaults to the public factory's installer path. Override for air-gapped or mirrored registries. No trailing slash.                                                                                                                                                                                                                                                                                                      | `string` | `factory.talos.dev/installer`                                      |
+| `talos.registryMirrors`     | Talos `machine.registries.mirrors` passthrough for worker nodes: a map of upstream registry host to `{ endpoints: [ ... ] }`. Empty by default, so workers pull container images (the Talos `kubelet` image included) directly from the upstream registry. Point a host such as `ghcr.io` at an in-cluster pull-through mirror for air-gapped, rate-limited, or flaky-egress environments so a worker's boot does not depend on live public egress. Talos still falls back to the upstream registry unless a host also sets `skipFallback: true`, so a mirror alone does not enforce air-gap. | `object` | `{}`                                                               |
+
+
+### OIDC
+
+| Name                               | Description                                                                                                                                                                                                                                                                                                                                       | Type       | Value  |
+| ---------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------- | ------ |
+| `oidc`                             | OIDC authentication and per-user RBAC for the tenant kube-apiserver. See docs/oidc-tenant.md for the operator guide.                                                                                                                                                                                                                              | `object`   | `{}`   |
+| `oidc.mode`                        | Identity mode. `None`: no OIDC, only the static admin kubeconfig works. `System`: trust the platform Keycloak realm (`cozy` by default) via a per-cluster public client with audience binding; zero-config default. `CustomConfig`: trust a tenant-supplied issuer directly (BYO); `cozy` is not in the path.                                     | `string`   | `None` |
+| `oidc.customConfig`                | Tenant-supplied AuthenticationConfiguration; consumed only when `mode: CustomConfig`.                                                                                                                                                                                                                                                             | `object`   | `{}`   |
+| `oidc.customConfig.config`         | Inline AuthenticationConfiguration YAML (`apiserver.config.k8s.io/v1beta1`). The chart writes the value verbatim into a Secret mounted at `/etc/kubernetes/authentication-config/config.yaml` on the kube-apiserver. Mutually exclusive with `secretRef.name`.                                                                                    | `string`   | `""`   |
+| `oidc.customConfig.secretRef`      | Reference to an existing Secret in the tenant namespace carrying the `AuthenticationConfiguration`.                                                                                                                                                                                                                                               | `object`   | `{}`   |
+| `oidc.customConfig.secretRef.name` | Name of an existing Secret in the tenant (release) namespace whose `config.yaml` key holds an `apiserver.config.k8s.io/v1beta1` `AuthenticationConfiguration`. Mutually exclusive with `customConfig.config`.                                                                                                                                     | `string`   | `""`   |
+| `oidc.users`                       | Users granted access to the tenant cluster; each entry produces one ClusterRoleBinding inside the tenant cluster. Works for both `System` and `CustomConfig` modes.                                                                                                                                                                               | `[]object` | `[]`   |
+| `oidc.users[i].email`              | Email address matched against the `email` claim from the issuer. Used verbatim as the `User:` subject in the ClusterRoleBinding inside the tenant cluster. The `email` claim is a built-in OIDC scope requested explicitly by the chart-generated `kubectl oidc-login` kubeconfig; every conformant OIDC provider (cozy realm included) emits it. | `string`   | `""`   |
+| `oidc.users[i].role`               | Role to bind: `admin` maps to `ClusterRole/cluster-admin`, `view` maps to `ClusterRole/view`.                                                                                                                                                                                                                                                     | `string`   | `{}`   |
 
 
 ## Parameter examples and reference
@@ -202,7 +274,7 @@ See the reference for components utilized in this service:
 ### resources and resourcesPreset
 
 `resources` sets explicit CPU and memory configurations for each replica.
-When left empty, the preset defined in `resourcesPreset` is applied.
+Every resource it leaves unset is taken from the preset defined in `resourcesPreset`.
 
 ```yaml
 resources:
@@ -213,9 +285,15 @@ resources:
 `resourcesPreset` sets named CPU and memory configurations for each replica.
 This setting is ignored if the corresponding `resources` value is set.
 
-Presets follow a cloud-style `<series>.<size>` naming convention. Five series cover the full CPU-to-memory ratio range (`t1` 1:0.5, `c1` 1:1, `s1` 1:2, `u1` 1:4, `m1` 1:8) and each series ships eight sizes (`nano` through `4xlarge`). The legacy flat names (`nano`, `micro`, `small`, `medium`, `large`, `xlarge`, `2xlarge`) remain accepted as deprecated aliases of their 1:1 instance-type equivalents.
-
-See [`docs/operations/resource-presets.md`](../../../docs/operations/resource-presets.md) for the full size matrix and the legacy-to-instance-type mapping.
+| Preset name | CPU    | memory  |
+|-------------|--------|---------|
+| `nano`      | `250m` | `128Mi` |
+| `micro`     | `500m` | `256Mi` |
+| `small`     | `1`    | `512Mi` |
+| `medium`    | `1`    | `1Gi`   |
+| `large`     | `2`    | `2Gi`   |
+| `xlarge`    | `4`    | `4Gi`   |
+| `2xlarge`   | `8`    | `8Gi`   |
 
 ### instanceType Resources
 
@@ -293,63 +371,6 @@ The following instanceType resources are provided by Cozystack:
 | `u1.small`       | 1     | 2Gi    |
 | `u1.xlarge`      | 4     | 16Gi   |
 
-### Kubelet Resource Reservations
-
-Each node group supports a `kubelet` object that configures how much memory and CPU the kubelet reserves for the host OS and the Kubernetes/system components running on the worker node.
-
-When `systemReservedMemory` or `kubeReservedMemory` are left empty, they are **auto-computed** using the following formula:
-
-1. Determine the **effective memory** of the node:
-   - If `resources.memory` is explicitly set, use that value.
-   - Otherwise, look up the `instanceType` and use its `memory.guest` value.
-   - If neither is available, the reservation falls back to the minimum (256Mi).
-2. Calculate **5%** of the effective memory (in MiB, rounded down).
-3. **Clamp** the result to the range **[256Mi, 1Gi]**:
-   - Nodes with 5 GiB or less get the minimum 256Mi reservation.
-   - Nodes with 20 GiB or more get the maximum 1Gi reservation.
-
-Both `systemReservedMemory` and `kubeReservedMemory` receive the same auto-computed value by default.
-
-CPU reservations (`systemReservedCpu`, `kubeReservedCpu`) follow the same pattern: **5%** of effective CPU, clamped to **[50m, 500m]**. Both are auto-computed when left empty.
-
-#### Kubelet Defaults
-
-| Parameter | Default | Description |
-| --- | --- | --- |
-| `systemReservedMemory` | auto-computed | Memory reserved for host OS |
-| `kubeReservedMemory` | auto-computed | Memory reserved for kubelet and container runtime |
-| `systemReservedCpu` | auto-computed | CPU reserved for host OS |
-| `kubeReservedCpu` | auto-computed | CPU reserved for kubelet and container runtime |
-| `evictionHardMemory` | `7%` | Hard eviction threshold for memory |
-| `evictionSoftMemory` | `10%` | Soft eviction threshold for memory |
-| `evictionSoftGracePeriod` | `1m30s` *(hardcoded)* | Duration a soft eviction threshold must be breached before triggering eviction |
-| `evictionMinimumReclaim` | `256Mi` *(hardcoded)* | Minimum amount of memory reclaimed per eviction action |
-
-Eviction thresholds can be specified as percentages (e.g., `7%`) or absolute values (e.g., `200Mi`). Both thresholds must use the same unit type. The hard threshold must be strictly less than the soft threshold.
-
-The `evictionSoftGracePeriod` and `evictionMinimumReclaim` parameters are currently hardcoded in the chart template and cannot be overridden through values.
-
-#### Capacity Annotation
-
-When kubelet resource reservations are configured, both the `capacity.cluster-autoscaler.kubernetes.io/memory` and `capacity.cluster-autoscaler.kubernetes.io/cpu` annotations on MachineDeployments report **allocatable** values instead of total node resources. Memory allocatable subtracts system-reserved, kube-reserved, and eviction-hard. CPU allocatable subtracts system-reserved and kube-reserved. This aligns the annotations with the values the cluster autoscaler uses in its scaling calculations.
-
-Upgrading from a version without this feature may cause the autoscaler to see reduced per-node capacity after the annotations are updated, which can trigger additional scale-up operations. No action is typically required — the new values reflect the actual memory available for workload scheduling.
-
-> **Note:** When neither `resources.memory` nor `instanceType` is set, eviction thresholds (default 7% hard / 10% soft) are still enforced by the kubelet at runtime, but the capacity annotation is not rendered. Without this annotation, the cluster-autoscaler has no visibility into these reservations and may over-schedule the node until evictions fire.
-
-#### Example: Override kubelet reservations
-
-```yaml
-nodeGroups:
-  md0:
-    instanceType: "u1.large"
-    kubelet:
-      systemReservedMemory: "256Mi"
-      kubeReservedMemory: "256Mi"
-      evictionHardMemory: "500Mi"
-      evictionSoftMemory: "1Gi"
-```
-
 ### U Series: Universal
 
 The U Series is quite neutral and provides resources for
diff --git a/packages/apps/kubernetes/files/versions.yaml b/packages/apps/kubernetes/files/versions.yaml
index 58942b97e6..aa5252921c 100644
--- a/packages/apps/kubernetes/files/versions.yaml
+++ b/packages/apps/kubernetes/files/versions.yaml
@@ -1,6 +1,5 @@
-"v1.35": "v1.35.1"
-"v1.34": "v1.34.4"
-"v1.33": "v1.33.8"
-"v1.32": "v1.32.12"
+"v1.35": "v1.35.6"
+"v1.34": "v1.34.9"
+"v1.33": "v1.33.13"
+"v1.32": "v1.32.13"
 "v1.31": "v1.31.14"
-"v1.30": "v1.30.14"
diff --git a/packages/apps/kubernetes/images/cluster-autoscaler.tag b/packages/apps/kubernetes/images/cluster-autoscaler.tag
index d9fd9a5288..c9a4369e23 100644
--- a/packages/apps/kubernetes/images/cluster-autoscaler.tag
+++ b/packages/apps/kubernetes/images/cluster-autoscaler.tag
@@ -1 +1 @@
-ghcr.io/cozystack/cozystack/cluster-autoscaler:0.0.0@sha256:e9d0aa7e651b03a6713b380101a61832818a91b5f989da9754f58693898c4056
+ghcr.io/cozystack/cozystack/cluster-autoscaler:v1.6.0@sha256:d188f395a31e37ea09bfa91e45d7ce1606b7459192a437fa66bb760ffb5f17d2
diff --git a/packages/apps/kubernetes/images/cluster-autoscaler/Dockerfile b/packages/apps/kubernetes/images/cluster-autoscaler/Dockerfile
index 7f9ff89636..8437bf81fa 100644
--- a/packages/apps/kubernetes/images/cluster-autoscaler/Dockerfile
+++ b/packages/apps/kubernetes/images/cluster-autoscaler/Dockerfile
@@ -1,8 +1,9 @@
 # Source: https://raw.githubusercontent.com/kubernetes/autoscaler/refs/heads/master/cluster-autoscaler/Dockerfile.amd64
-ARG builder_image=docker.io/library/golang:1.23.4
+ARG builder_image=docker.io/library/golang:1.27@sha256:3680233e3204827fbdc66088528ae6d4b3d034f51d03a99d454f6de034888244
 ARG BASEIMAGE=gcr.io/distroless/static:nonroot-${TARGETARCH}
 
-FROM ${builder_image} AS builder
+FROM --platform=$BUILDPLATFORM ${builder_image} AS builder
+ARG GOPROXY
 
 ARG TARGETOS
 ARG TARGETARCH
@@ -16,6 +17,22 @@ RUN git clone https://github.com/kubernetes/autoscaler /src/autoscaler \
 WORKDIR /src/autoscaler/cluster-autoscaler
 COPY fix-downscale.diff /fix-downscale.diff
 RUN git apply /fix-downscale.diff
+
+# go build never compiles a _test.go, so nothing else runs the tests of the
+# packages the patch touches. Each package is tested from its own directory,
+# below the clone root because the patch names paths from there: that finds
+# the module it belongs to, and an empty list runs nothing.
+# The list is read into a variable first: a for loop drops the exit status
+# of a command substitution, so a patch git cannot read would leave the list
+# empty and the step green.
+# The stage sets GOOS and GOARCH to the target for the whole stage, so the
+# tests drop them: a test binary built for another architecture cannot run
+# on the build host without emulation.
+RUN cd /src/autoscaler && files=$(git apply --numstat /fix-downscale.diff) || exit 1; \
+    for dir in $(printf '%s\n' "$files" | cut -f3 | grep '\.go$' | xargs -r -n1 dirname | sort -u); do \
+      (cd "$dir" && env -u GOOS -u GOARCH go test .) || exit 1; \
+    done
+
 RUN make build
 
 FROM $BASEIMAGE
diff --git a/packages/apps/kubernetes/images/cluster-autoscaler/fix-downscale.diff b/packages/apps/kubernetes/images/cluster-autoscaler/fix-downscale.diff
index 94c680bc1e..bb5461a770 100644
--- a/packages/apps/kubernetes/images/cluster-autoscaler/fix-downscale.diff
+++ b/packages/apps/kubernetes/images/cluster-autoscaler/fix-downscale.diff
@@ -1,13 +1,210 @@
+diff --git a/cluster-autoscaler/cloudprovider/clusterapi/clusterapi_nodegroup_test.go b/cluster-autoscaler/cloudprovider/clusterapi/clusterapi_nodegroup_test.go
+index 962ac11..5a10bde 100644
+--- a/cluster-autoscaler/cloudprovider/clusterapi/clusterapi_nodegroup_test.go
++++ b/cluster-autoscaler/cloudprovider/clusterapi/clusterapi_nodegroup_test.go
+@@ -241,11 +241,6 @@ func TestNodeGroupIncreaseSizeErrors(t *testing.T) {
+ 		delta:       -1,
+ 		initial:     3,
+ 		errorMsg:    "size increase must be positive",
+-	}, {
+-		description: "errors because initial+delta > maxSize",
+-		delta:       8,
+-		initial:     3,
+-		errorMsg:    "size increase too large - desired:11 max:10",
+ 	}}
+ 
+ 	test := func(t *testing.T, tc *testCase, testConfig *testConfig) {
+@@ -768,6 +763,58 @@ func TestNodeGroupDeleteNodes(t *testing.T) {
+ 	})
+ }
+ 
++// A group can stand above its max size, for one when the annotation is
++// lowered under it, and deleting a node from it must not be refused as an
++// increase.
++func TestNodeGroupDeleteNodesAboveMaxSize(t *testing.T) {
++	test := func(t *testing.T, testConfig *testConfig) {
++		controller, stop := mustCreateTestController(t, testConfig)
++		defer stop()
++
++		nodegroups, err := controller.nodeGroups()
++		if err != nil {
++			t.Fatalf("unexpected error: %v", err)
++		}
++
++		if l := len(nodegroups); l != 1 {
++			t.Fatalf("expected 1 nodegroup, got %d", l)
++		}
++
++		ng := nodegroups[0].(*nodegroup)
++		if err := ng.DeleteNodes(testConfig.nodes[:1]); err != nil {
++			t.Fatalf("unexpected error: %v", err)
++		}
++
++		gvr, err := ng.scalableResource.GroupVersionResource()
++		if err != nil {
++			t.Fatalf("unexpected error: %v", err)
++		}
++
++		scalableResource, err := ng.machineController.managementScaleClient.Scales(testConfig.spec.namespace).
++			Get(context.TODO(), gvr.GroupResource(), ng.scalableResource.Name(), metav1.GetOptions{})
++		if err != nil {
++			t.Fatalf("unexpected error: %v", err)
++		}
++
++		if scalableResource.Spec.Replicas != 3 {
++			t.Errorf("expected 3, got %v", scalableResource.Spec.Replicas)
++		}
++	}
++
++	annotations := map[string]string{
++		nodeGroupMinSizeAnnotationKey: "1",
++		nodeGroupMaxSizeAnnotationKey: "2",
++	}
++
++	t.Run("MachineSet", func(t *testing.T) {
++		test(t, createMachineSetTestConfig(RandomString(6), RandomString(6), RandomString(6), 4, annotations, nil))
++	})
++
++	t.Run("MachineDeployment", func(t *testing.T) {
++		test(t, createMachineDeploymentTestConfig(RandomString(6), RandomString(6), RandomString(6), 4, annotations, nil))
++	})
++}
++
+ func TestNodeGroupMachineSetDeleteNodesWithMismatchedNodes(t *testing.T) {
+ 	test := func(t *testing.T, expected int, testConfigs []*testConfig) {
+ 		testConfig0, testConfig1 := testConfigs[0], testConfigs[1]
+@@ -1631,3 +1678,103 @@ func TestNodeGroupGetOptions(t *testing.T) {
+ 		})
+ 	}
+ }
++
++// A group can stand below its min size, for one when the annotation is
++// raised over it, and adding a node to it must not be refused as a
++// decrease: the refusal backs the group off, which also stops the min-size
++// enforcement from lifting it.
++func TestNodeGroupIncreaseSizeBelowMinSize(t *testing.T) {
++	test := func(t *testing.T, testConfig *testConfig) {
++		controller, stop := mustCreateTestController(t, testConfig)
++		defer stop()
++
++		nodegroups, err := controller.nodeGroups()
++		if err != nil {
++			t.Fatalf("unexpected error: %v", err)
++		}
++
++		if l := len(nodegroups); l != 1 {
++			t.Fatalf("expected 1 nodegroup, got %d", l)
++		}
++
++		ng := nodegroups[0].(*nodegroup)
++		if err := ng.IncreaseSize(1); err != nil {
++			t.Fatalf("unexpected error: %v", err)
++		}
++
++		gvr, err := ng.scalableResource.GroupVersionResource()
++		if err != nil {
++			t.Fatalf("unexpected error: %v", err)
++		}
++
++		scalableResource, err := ng.machineController.managementScaleClient.Scales(testConfig.spec.namespace).
++			Get(context.TODO(), gvr.GroupResource(), ng.scalableResource.Name(), metav1.GetOptions{})
++		if err != nil {
++			t.Fatalf("unexpected error: %v", err)
++		}
++
++		if scalableResource.Spec.Replicas != 2 {
++			t.Errorf("expected 2, got %v", scalableResource.Spec.Replicas)
++		}
++	}
++
++	annotations := map[string]string{
++		nodeGroupMinSizeAnnotationKey: "3",
++		nodeGroupMaxSizeAnnotationKey: "10",
++	}
++
++	t.Run("MachineSet", func(t *testing.T) {
++		test(t, createMachineSetTestConfig(RandomString(6), RandomString(6), RandomString(6), 1, annotations, nil))
++	})
++
++	t.Run("MachineDeployment", func(t *testing.T) {
++		test(t, createMachineDeploymentTestConfig(RandomString(6), RandomString(6), RandomString(6), 1, annotations, nil))
++	})
++}
++
++func TestNodeGroupSetSizeRefusesDecreaseBelowMinSize(t *testing.T) {
++	test := func(t *testing.T, desired int, testConfig *testConfig) {
++		controller, stop := mustCreateTestController(t, testConfig)
++		defer stop()
++
++		nodegroups, err := controller.nodeGroups()
++		if err != nil {
++			t.Fatalf("unexpected error: %v", err)
++		}
++
++		if l := len(nodegroups); l != 1 {
++			t.Fatalf("expected 1 nodegroup, got %d", l)
++		}
++
++		ng := nodegroups[0].(*nodegroup)
++		err = ng.scalableResource.SetSize(desired)
++		if err == nil {
++			t.Fatal("expected an error")
++		}
++		if !strings.Contains(err.Error(), fmt.Sprintf("size decrease too large - desired:%d min:3", desired)) {
++			t.Errorf("unexpected error: %v", err)
++		}
++	}
++
++	annotations := map[string]string{
++		nodeGroupMinSizeAnnotationKey: "3",
++		nodeGroupMaxSizeAnnotationKey: "10",
++	}
++
++	for _, tc := range []struct {
++		description string
++		initial     int
++		desired     int
++	}{
++		{"from above min size", 4, 2},
++		{"from below min size", 2, 1},
++	} {
++		t.Run(tc.description+"/MachineSet", func(t *testing.T) {
++			test(t, tc.desired, createMachineSetTestConfig(RandomString(6), RandomString(6), RandomString(6), tc.initial, annotations, nil))
++		})
++
++		t.Run(tc.description+"/MachineDeployment", func(t *testing.T) {
++			test(t, tc.desired, createMachineDeploymentTestConfig(RandomString(6), RandomString(6), RandomString(6), tc.initial, annotations, nil))
++		})
++	}
++}
 diff --git a/cluster-autoscaler/cloudprovider/clusterapi/clusterapi_unstructured.go b/cluster-autoscaler/cloudprovider/clusterapi/clusterapi_unstructured.go
-index 4eec0e4bf..f28fd9241 100644
+index f374dc7..0e4e469 100644
 --- a/cluster-autoscaler/cloudprovider/clusterapi/clusterapi_unstructured.go
 +++ b/cluster-autoscaler/cloudprovider/clusterapi/clusterapi_unstructured.go
-@@ -106,8 +106,6 @@ func (r unstructuredScalableResource) Replicas() (int, error) {
+@@ -106,13 +106,6 @@ func (r unstructuredScalableResource) Replicas() (int, error) {
+ }
  
  func (r unstructuredScalableResource) SetSize(nreplicas int) error {
- 	switch {
+-	switch {
 -	case nreplicas > r.maxSize:
 -		return fmt.Errorf("size increase too large - desired:%d max:%d", nreplicas, r.maxSize)
- 	case nreplicas < r.minSize:
- 		return fmt.Errorf("size decrease too large - desired:%d min:%d", nreplicas, r.minSize)
+-	case nreplicas < r.minSize:
+-		return fmt.Errorf("size decrease too large - desired:%d min:%d", nreplicas, r.minSize)
+-	}
+-
+ 	gvr, err := r.GroupVersionResource()
+ 	if err != nil {
+ 		return err
+@@ -127,6 +120,12 @@ func (r unstructuredScalableResource) SetSize(nreplicas int) error {
+ 		return fmt.Errorf("unknown %s %s/%s", r.Kind(), r.Namespace(), r.Name())
  	}
+ 
++	// Only a decrease is refused below min size: a group standing under it
++	// has to be able to grow toward it one step at a time.
++	if nreplicas < r.minSize && nreplicas < int(s.Spec.Replicas) {
++		return fmt.Errorf("size decrease too large - desired:%d min:%d", nreplicas, r.minSize)
++	}
++
+ 	s.Spec.Replicas = int32(nreplicas)
+ 	_, updateErr := r.controller.managementScaleClient.Scales(r.Namespace()).Update(context.TODO(), gvr.GroupResource(), s, metav1.UpdateOptions{})
+ 
diff --git a/packages/apps/kubernetes/images/kubectl.tag b/packages/apps/kubernetes/images/kubectl.tag
new file mode 100644
index 0000000000..80d1e903c9
--- /dev/null
+++ b/packages/apps/kubernetes/images/kubectl.tag
@@ -0,0 +1 @@
+docker.io/alpine/k8s:1.33.4@sha256:b0523f0a244ddc4c8e055aa335c040d3d78b3ead5528f4544395f7f9f69c7b68
diff --git a/packages/apps/kubernetes/images/kubevirt-cloud-provider.tag b/packages/apps/kubernetes/images/kubevirt-cloud-provider.tag
index ca661f3ab8..4c0395201a 100644
--- a/packages/apps/kubernetes/images/kubevirt-cloud-provider.tag
+++ b/packages/apps/kubernetes/images/kubevirt-cloud-provider.tag
@@ -1 +1 @@
-ghcr.io/cozystack/cozystack/kubevirt-cloud-provider:0.0.0@sha256:dee69d15fa8616aa6a1e5a67fc76370e7698a7f58b25e30650eb39c9fb826de8
+ghcr.io/cozystack/cozystack/kubevirt-cloud-provider:v1.6.0@sha256:f005b99041d191eed9dde98f9f6691ba2d0cbfa1b3b0b2fe4b32cc0fdba74acf
diff --git a/packages/apps/kubernetes/images/kubevirt-cloud-provider/Dockerfile b/packages/apps/kubernetes/images/kubevirt-cloud-provider/Dockerfile
index 58a4d03907..babf176b61 100644
--- a/packages/apps/kubernetes/images/kubevirt-cloud-provider/Dockerfile
+++ b/packages/apps/kubernetes/images/kubevirt-cloud-provider/Dockerfile
@@ -1,5 +1,6 @@
 # Source: https://github.com/kubevirt/cloud-provider-kubevirt/blob/main/build/images/kubevirt-cloud-controller-manager/Dockerfile
-FROM golang:1.20.6 AS builder
+FROM --platform=$BUILDPLATFORM golang:1.27@sha256:3680233e3204827fbdc66088528ae6d4b3d034f51d03a99d454f6de034888244 AS builder
+ARG GOPROXY
 
 ARG TARGETOS
 ARG TARGETARCH
@@ -19,6 +20,20 @@ RUN go get 'k8s.io/endpointslice/util@v0.28' 'k8s.io/apiserver@v0.28'
 RUN go mod tidy
 RUN go mod vendor
 
+# go build never compiles a _test.go, so nothing else runs the tests of the
+# packages the patches touch. Each package is tested from its own directory:
+# that finds the module it belongs to, and an empty list runs nothing.
+# The list is read into a variable first: a for loop drops the exit status
+# of a command substitution, so a patch git cannot read would leave the list
+# empty and the step green.
+# The stage sets GOOS and GOARCH to the target for the whole stage, so the
+# tests drop them: a test binary built for another architecture cannot run
+# on the build host without emulation.
+RUN files=$(git apply --numstat /patches/*.diff) || exit 1; \
+    for dir in $(printf '%s\n' "$files" | cut -f3 | grep '\.go$' | xargs -r -n1 dirname | sort -u); do \
+      (cd "$dir" && env -u GOOS -u GOARCH go test -mod=vendor .) || exit 1; \
+    done
+
 RUN CGO_ENABLED=0 go build -mod=vendor -ldflags="-s -w" -o bin/kubevirt-cloud-controller-manager ./cmd/kubevirt-cloud-controller-manager
 
 FROM scratch
diff --git a/packages/apps/kubernetes/images/kubevirt-cloud-provider/patches/vmi-informer.diff b/packages/apps/kubernetes/images/kubevirt-cloud-provider/patches/vmi-informer.diff
new file mode 100644
index 0000000000..e300bf4585
--- /dev/null
+++ b/packages/apps/kubernetes/images/kubevirt-cloud-provider/patches/vmi-informer.diff
@@ -0,0 +1,429 @@
+diff --git a/pkg/controller/kubevirteps/kubevirteps_controller.go b/pkg/controller/kubevirteps/kubevirteps_controller.go
+index 8af51fbe8..e8f1a4488 100644
+--- a/pkg/controller/kubevirteps/kubevirteps_controller.go
++++ b/pkg/controller/kubevirteps/kubevirteps_controller.go
+@@ -12,12 +12,15 @@ import (
+ 	apiequality "k8s.io/apimachinery/pkg/api/equality"
+ 	k8serrors "k8s.io/apimachinery/pkg/api/errors"
+ 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
++	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
++	"k8s.io/apimachinery/pkg/labels"
+ 	"k8s.io/apimachinery/pkg/runtime"
+ 	"k8s.io/apimachinery/pkg/runtime/schema"
+ 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
+ 	"k8s.io/apimachinery/pkg/util/sets"
+ 	"k8s.io/apimachinery/pkg/util/wait"
+ 	"k8s.io/client-go/dynamic"
++	"k8s.io/client-go/dynamic/dynamicinformer"
+ 	"k8s.io/client-go/informers"
+ 	"k8s.io/client-go/kubernetes"
+ 	"k8s.io/client-go/tools/cache"
+@@ -31,8 +34,19 @@ import (
+ 
+ const (
+ 	ControllerName = controllerName("kubevirt_eps_controller")
++
++	// A periodic resync re-reconciles every LoadBalancer Service even if an event was
++	// missed, so infra EndpointSlices cannot stay stale indefinitely.
++	defaultResyncPeriod = 5 * time.Minute
++
++	// clusterNameLabel is set by CAPK on the VMIs backing a tenant cluster. It is used to
++	// avoid selecting VMIs that do not belong to this cluster when falling back to all VMIs.
++	clusterNameLabel = "cluster.x-k8s.io/cluster-name"
+ )
+ 
++var vmiGVR = kubevirtv1.VirtualMachineInstanceGroupVersionKind.GroupVersion().
++	WithResource("virtualmachineinstances")
++
+ type controllerName string
+ 
+ func (c controllerName) dashed() string {
+@@ -49,9 +63,10 @@ type Controller struct {
+ 	tenantFactory    informers.SharedInformerFactory
+ 	tenantEPSTracker tenantEPSTracker
+ 
+-	infraClient  kubernetes.Interface
+-	infraDynamic dynamic.Interface
+-	infraFactory informers.SharedInformerFactory
++	infraClient         kubernetes.Interface
++	infraDynamic        dynamic.Interface
++	infraFactory        informers.SharedInformerFactory
++	infraDynamicFactory dynamicinformer.DynamicSharedInformerFactory
+ 
+ 	infraNamespace       string
+ 	clusterName          string
+@@ -67,8 +82,11 @@ func NewKubevirtEPSController(
+ 	infraNamespace string,
+ 	clusterName string,
+ ) *Controller {
+-	tenantFactory := informers.NewSharedInformerFactory(tenantClient, 0)
+-	infraFactory := informers.NewSharedInformerFactoryWithOptions(infraClient, 0, informers.WithNamespace(infraNamespace))
++	tenantFactory := informers.NewSharedInformerFactory(tenantClient, defaultResyncPeriod)
++	infraFactory := informers.NewSharedInformerFactoryWithOptions(infraClient, defaultResyncPeriod,
++		informers.WithNamespace(infraNamespace))
++	infraDynamicFactory := dynamicinformer.NewFilteredDynamicSharedInformerFactory(infraDynamic,
++		defaultResyncPeriod, infraNamespace, nil)
+ 	queue := workqueue.NewRateLimitingQueue(workqueue.DefaultControllerRateLimiter())
+ 
+ 	return &Controller{
+@@ -78,6 +96,7 @@ func NewKubevirtEPSController(
+ 		infraClient:          infraClient,
+ 		infraDynamic:         infraDynamic,
+ 		infraFactory:         infraFactory,
++		infraDynamicFactory:  infraDynamicFactory,
+ 		infraNamespace:       infraNamespace,
+ 		clusterName:          clusterName,
+ 		queue:                queue,
+@@ -236,9 +255,84 @@ func (c *Controller) Init() error {
+ 		return err
+ 	}
+ 
++	// The desired infra endpoints of a LoadBalancer Service are derived from the VMIs backing the
++	// tenant nodes, so a VMI appearing, disappearing or changing its address must trigger a
++	// reconciliation. Without this, EndpointSlices keep pointing at VMIs that no longer exist
++	// (for example after a MachineDeployment rollout or a cluster-autoscaler scale down) and the
++	// LoadBalancer blackholes the share of the traffic hashed onto those dead addresses.
++	_, err = c.infraDynamicFactory.ForResource(vmiGVR).Informer().AddEventHandler(cache.ResourceEventHandlerFuncs{
++		AddFunc: func(obj interface{}) {
++			c.enqueueLoadBalancerServices(fmt.Sprintf("VMI added: %s", vmiKey(obj)))
++		},
++		UpdateFunc: func(oldObj, newObj interface{}) {
++			if vmiEndpointFingerprint(oldObj) == vmiEndpointFingerprint(newObj) {
++				return
++			}
++			c.enqueueLoadBalancerServices(fmt.Sprintf("VMI updated: %s", vmiKey(newObj)))
++		},
++		DeleteFunc: func(obj interface{}) {
++			if tombstone, ok := obj.(cache.DeletedFinalStateUnknown); ok {
++				obj = tombstone.Obj
++			}
++			c.enqueueLoadBalancerServices(fmt.Sprintf("VMI deleted: %s", vmiKey(obj)))
++		},
++	})
++	if err != nil {
++		return err
++	}
++
+ 	return nil
+ }
+ 
++func vmiKey(obj interface{}) string {
++	u, ok := obj.(*unstructured.Unstructured)
++	if !ok {
++		return "<unknown>"
++	}
++	return u.GetNamespace() + "/" + u.GetName()
++}
++
++// vmiEndpointFingerprint returns the parts of a VMI that influence the endpoints derived from it:
++// the cluster it belongs to, the infra node it runs on, its phase and the address of its "default"
++// interface. Any other update, and a running VMI sees many, cannot change an EndpointSlice.
++func vmiEndpointFingerprint(obj interface{}) string {
++	u, ok := obj.(*unstructured.Unstructured)
++	if !ok {
++		return ""
++	}
++	vmi := &kubevirtv1.VirtualMachineInstance{}
++	if err := runtime.DefaultUnstructuredConverter.FromUnstructured(u.Object, vmi); err != nil {
++		// Fall back to the resource version so an unparsable update is never silently dropped.
++		return u.GetResourceVersion()
++	}
++	ip := ""
++	for _, i := range vmi.Status.Interfaces {
++		if i.Name == "default" {
++			ip = i.IP
++			break
++		}
++	}
++	return fmt.Sprintf("%s|%s|%s|%s", u.GetLabels()[clusterNameLabel], vmi.Status.NodeName, vmi.Status.Phase, ip)
++}
++
++// enqueueLoadBalancerServices requeues the LoadBalancer Services of this cluster only: the infra
++// namespace can hold the Services of other tenant clusters, which reconcile would skip anyway.
++func (c *Controller) enqueueLoadBalancerServices(reason string) {
++	svcs, err := c.infraFactory.Core().V1().Services().Lister().Services(c.infraNamespace).
++		List(labels.SelectorFromSet(labels.Set{kubevirt.TenantClusterNameLabelKey: c.clusterName}))
++	if err != nil {
++		klog.Errorf("Failed to list Services in namespace %s: %v", c.infraNamespace, err)
++		return
++	}
++	for _, svc := range svcs {
++		if svc.Spec.Type != v1.ServiceTypeLoadBalancer {
++			continue
++		}
++		klog.Infof("%s, requeuing Service: %v/%v", reason, svc.Namespace, svc.Name)
++		c.queue.Add(newRequest(UpdateReq, svc, nil))
++	}
++}
++
+ // getInfraServiceForEPS returns the Service in the infra cluster associated with the given EndpointSlice.
+ // It does this by reading the "kubernetes.io/service-name" label from the EndpointSlice, which should correspond
+ // to the Service name. If not found or if the Service doesn't exist, it returns nil.
+@@ -276,10 +370,12 @@ func (c *Controller) Run(numWorkers int, stopCh <-chan struct{}, controllerManag
+ 
+ 	c.tenantFactory.Start(stopCh)
+ 	c.infraFactory.Start(stopCh)
++	c.infraDynamicFactory.Start(stopCh)
+ 
+ 	if !cache.WaitForNamedCacheSync(ControllerName.String(), stopCh,
+ 		c.infraFactory.Core().V1().Services().Informer().HasSynced,
+-		c.tenantFactory.Discovery().V1().EndpointSlices().Informer().HasSynced) {
++		c.tenantFactory.Discovery().V1().EndpointSlices().Informer().HasSynced,
++		c.infraDynamicFactory.ForResource(vmiGVR).Informer().HasSynced) {
+ 		return
+ 	}
+ 
+@@ -868,17 +964,45 @@ func (c *Controller) getDesiredEndpoints(service *v1.Service, tenantSlices []*di
+ func (c *Controller) getAllVMIEndpoints() []*discovery.Endpoint {
+ 	var endpoints []*discovery.Endpoint
+ 
+-	// List all VMIs in the infra namespace
+-	vmiList, err := c.infraDynamic.
+-		Resource(kubevirtv1.VirtualMachineInstanceGroupVersionKind.GroupVersion().WithResource("virtualmachineinstances")).
+-		Namespace(c.infraNamespace).
++	// List every VMI of the infra namespace, then keep only the ones of this cluster. An infra
++	// namespace can hold more than one tenant cluster, as well as plain VirtualMachines, and those
++	// VMIs do not serve this Service's NodePort: selecting them would add endpoints that blackhole
++	// the traffic, or route it to another tenant.
++	vmiList, err := c.infraDynamic.Resource(vmiGVR).Namespace(c.infraNamespace).
+ 		List(context.TODO(), metav1.ListOptions{})
+ 	if err != nil {
+ 		klog.Errorf("Failed to list VMIs in namespace %q: %v", c.infraNamespace, err)
+ 		return endpoints
+ 	}
+ 
+-	for _, obj := range vmiList.Items {
++	items := vmiList.Items
++	if c.clusterName != "" {
++		mine := make([]unstructured.Unstructured, 0, len(items))
++		anyLabelled := false
++		for i := range items {
++			name, found := items[i].GetLabels()[clusterNameLabel]
++			if !found {
++				continue
++			}
++			anyLabelled = true
++			if name == c.clusterName {
++				mine = append(mine, items[i])
++			}
++		}
++		// Widen to every VMI only when NONE of them carries the label: the VMIs are then not
++		// managed by CAPK (or by an older version of it) and there is no way to tell the clusters
++		// apart, so returning nothing would take the LoadBalancer down. As soon as some VMIs are
++		// labelled, an empty selection is a legitimate answer -- this cluster currently has no
++		// node -- and must not be widened to the VMIs of another cluster.
++		if anyLabelled {
++			items = mine
++		} else {
++			klog.Warningf("No VMI carries %q in namespace %s, selecting every VMI of the namespace",
++				clusterNameLabel, c.infraNamespace)
++		}
++	}
++
++	for _, obj := range items {
+ 		vmi := &kubevirtv1.VirtualMachineInstance{}
+ 		err = runtime.DefaultUnstructuredConverter.FromUnstructured(obj.Object, vmi)
+ 		if err != nil {
+@@ -916,7 +1040,8 @@ func (c *Controller) getAllVMIEndpoints() []*discovery.Endpoint {
+ 		}
+ 	}
+ 
+-	klog.Infof("Fallback: created %d endpoints from all VMIs in namespace %s", len(endpoints), c.infraNamespace)
++	klog.Infof("Fallback: created %d endpoints from the VMIs of cluster %q in namespace %s",
++		len(endpoints), c.clusterName, c.infraNamespace)
+ 	return endpoints
+ }
+ 
+diff --git a/pkg/controller/kubevirteps/kubevirteps_controller_test.go b/pkg/controller/kubevirteps/kubevirteps_controller_test.go
+index 17608fa10..8fa76678b 100644
+--- a/pkg/controller/kubevirteps/kubevirteps_controller_test.go
++++ b/pkg/controller/kubevirteps/kubevirteps_controller_test.go
+@@ -965,3 +965,188 @@ var _ = g.Describe("getDesiredEndpoints", func() {
+ 		Expect(endpoints).To(HaveLen(0), "Expected no endpoints due to missing NodeName or IP")
+ 	})
+ })
++
++func createUnstructuredVMIForCluster(name, nodeName, ip, clusterName string) *unstructured.Unstructured {
++	vmi := createUnstructuredVMINode(name, nodeName, ip)
++	if clusterName != "" {
++		vmi.SetLabels(map[string]string{clusterNameLabel: clusterName})
++	}
++	return vmi
++}
++
++var _ = g.Describe("KubevirtEPSController VMI tracking", func() {
++
++	createVMI := func(t *testKubevirtEPSController, vmi *unstructured.Unstructured) {
++		_, err := t.infraDynamic.Resource(vmiGVR).Namespace(infraNamespace).
++			Create(context.TODO(), vmi, metav1.CreateOptions{})
++		Expect(err).To(BeNil())
++	}
++
++	g.It("Should only select the VMIs of its own cluster when falling back to all VMIs", func() {
++		t := setupTestKubevirtEPSController()
++		// "test-cluster" is the cluster name the controller is created with.
++		createVMI(t, createUnstructuredVMIForCluster("mine-1", "infra-1", "10.0.0.1", "test-cluster"))
++		createVMI(t, createUnstructuredVMIForCluster("mine-2", "infra-2", "10.0.0.2", "test-cluster"))
++		createVMI(t, createUnstructuredVMIForCluster("other", "infra-3", "10.0.0.3", "another-cluster"))
++
++		endpoints := t.controller.getAllVMIEndpoints()
++
++		Expect(endpoints).To(HaveLen(2), "Only the VMIs of test-cluster should be selected")
++		var addresses []string
++		for _, e := range endpoints {
++			addresses = append(addresses, e.Addresses[0])
++		}
++		Expect(addresses).To(ConsistOf("10.0.0.1", "10.0.0.2"))
++		Expect(addresses).ToNot(ContainElement("10.0.0.3"), "A VMI of another cluster must never be an endpoint")
++	})
++
++	g.It("Should keep selecting every VMI when none carries the cluster label", func() {
++		t := setupTestKubevirtEPSController()
++		createVMI(t, createUnstructuredVMIForCluster("unlabelled-1", "infra-1", "10.0.0.1", ""))
++		createVMI(t, createUnstructuredVMIForCluster("unlabelled-2", "infra-2", "10.0.0.2", ""))
++
++		endpoints := t.controller.getAllVMIEndpoints()
++
++		Expect(endpoints).To(HaveLen(2), "Unlabelled VMIs must still be selected, so the LB does not lose every endpoint")
++	})
++
++	g.It("Should return no endpoint when only another cluster's VMIs are present", func() {
++		t := setupTestKubevirtEPSController()
++		// The controller's cluster is "test-cluster" and has no VMI right now (scaled to zero, or
++		// every VMI being replaced by a rollout), while another tenant cluster of the same infra
++		// namespace does have some. Widening to every VMI here would publish the other cluster's
++		// addresses as this Service's endpoints.
++		createVMI(t, createUnstructuredVMIForCluster("other-1", "infra-1", "10.0.0.1", "another-cluster"))
++		createVMI(t, createUnstructuredVMIForCluster("other-2", "infra-2", "10.0.0.2", "another-cluster"))
++
++		endpoints := t.controller.getAllVMIEndpoints()
++
++		Expect(endpoints).To(BeEmpty(),
++			"An empty selection is legitimate and must not be widened to another cluster's VMIs")
++	})
++
++	g.It("Should ignore the unlabelled VMIs when some VMIs carry the cluster label", func() {
++		t := setupTestKubevirtEPSController()
++		createVMI(t, createUnstructuredVMIForCluster("mine", "infra-1", "10.0.0.1", "test-cluster"))
++		// A standalone VirtualMachine of the same namespace, not part of any tenant cluster.
++		createVMI(t, createUnstructuredVMIForCluster("standalone", "infra-2", "10.0.0.2", ""))
++
++		endpoints := t.controller.getAllVMIEndpoints()
++
++		Expect(endpoints).To(HaveLen(1))
++		Expect(endpoints[0].Addresses).To(ConsistOf("10.0.0.1"))
++	})
++
++	// startTracking starts the informers the VMI event handlers rely on, with a LoadBalancer Service
++	// of this cluster and one of another cluster, and returns once the initial events, want of them,
++	// have been drained from the queue.
++	startTracking := func(t *testKubevirtEPSController, stop chan struct{}, want int) {
++		for _, svc := range []*v1.Service{
++			createInfraServiceLB("lb-svc", "tenant-svc", "test-cluster",
++				v1.ServicePort{Name: "http", Port: 80, Protocol: v1.ProtocolTCP, TargetPort: intstr.FromInt32(30000)},
++				v1.ServiceExternalTrafficPolicyCluster),
++			createInfraServiceLB("other-lb-svc", "tenant-svc", "another-cluster",
++				v1.ServicePort{Name: "http", Port: 80, Protocol: v1.ProtocolTCP, TargetPort: intstr.FromInt32(30001)},
++				v1.ServiceExternalTrafficPolicyCluster),
++		} {
++			_, err := t.infraClient.CoreV1().Services(infraNamespace).Create(context.TODO(), svc, metav1.CreateOptions{})
++			Expect(err).To(BeNil())
++		}
++
++		// Services first, so that the add event of a VMI already present finds them in the lister.
++		t.controller.infraFactory.Start(stop)
++		Expect(cache.WaitForCacheSync(stop,
++			t.controller.infraFactory.Core().V1().Services().Informer().HasSynced)).To(BeTrue())
++		t.controller.infraDynamicFactory.Start(stop)
++		Expect(cache.WaitForCacheSync(stop,
++			t.controller.infraDynamicFactory.ForResource(vmiGVR).Informer().HasSynced)).To(BeTrue())
++
++		Eventually(func() int { return t.controller.queue.Len() }, "10s", "20ms").Should(Equal(want))
++		drainQueue(t)
++	}
++
++	updateVMI := func(t *testKubevirtEPSController, name string, mutate func(*unstructured.Unstructured)) {
++		vmi, err := t.infraDynamic.Resource(vmiGVR).Namespace(infraNamespace).
++			Get(context.TODO(), name, metav1.GetOptions{})
++		Expect(err).To(BeNil())
++		mutate(vmi)
++		_, err = t.infraDynamic.Resource(vmiGVR).Namespace(infraNamespace).
++			Update(context.TODO(), vmi, metav1.UpdateOptions{})
++		Expect(err).To(BeNil())
++	}
++
++	expectRequeueOf := func(t *testKubevirtEPSController, why string) {
++		Eventually(func() int { return t.controller.queue.Len() }, "10s", "20ms").Should(Equal(1), why)
++		item, _ := t.controller.queue.Get()
++		t.controller.queue.Done(item)
++		Expect(item.(*Request).Obj.(*v1.Service).Name).To(Equal("lb-svc"),
++			"Only the Service of this cluster should be requeued")
++		Consistently(func() int { return t.controller.queue.Len() }, "200ms", "20ms").Should(BeZero())
++	}
++
++	expectNoRequeue := func(t *testKubevirtEPSController, why string) {
++		Consistently(func() int { return t.controller.queue.Len() }, "500ms", "20ms").Should(BeZero(), why)
++	}
++
++	g.It("Should requeue the LoadBalancer Services when a VMI appears or disappears", func() {
++		t := setupTestKubevirtEPSController()
++		stop := make(chan struct{})
++		defer close(stop)
++		startTracking(t, stop, 2)
++
++		// A new VMI must trigger a reconciliation, otherwise a node added by a scale up or a
++		// rollout never becomes an endpoint.
++		createVMI(t, createUnstructuredVMIForCluster("vmi-1", "infra-1", "10.0.0.1", "test-cluster"))
++		expectRequeueOf(t, "Creating a VMI should requeue the LoadBalancer Service")
++
++		// A deleted VMI must trigger a reconciliation as well, otherwise its address stays in the
++		// EndpointSlice and the LoadBalancer blackholes the traffic hashed onto it.
++		err := t.infraDynamic.Resource(vmiGVR).Namespace(infraNamespace).
++			Delete(context.TODO(), "vmi-1", metav1.DeleteOptions{})
++		Expect(err).To(BeNil())
++		expectRequeueOf(t, "Deleting a VMI should requeue the LoadBalancer Service")
++	})
++
++	g.It("Should requeue the LoadBalancer Services only on the VMI updates that can change an endpoint", func() {
++		t := setupTestKubevirtEPSController()
++		stop := make(chan struct{})
++		defer close(stop)
++		createVMI(t, createUnstructuredVMIForCluster("vmi-1", "infra-1", "10.0.0.1", "test-cluster"))
++		// Both Service adds, plus the add of the VMI already present.
++		startTracking(t, stop, 3)
++
++		updateVMI(t, "vmi-1", func(u *unstructured.Unstructured) {
++			u.SetAnnotations(map[string]string{"unrelated": "change"})
++		})
++		expectNoRequeue(t, "An update that touches no endpoint field must not requeue")
++
++		updateVMI(t, "vmi-1", func(u *unstructured.Unstructured) {
++			Expect(unstructured.SetNestedField(u.Object, "Failed", "status", "phase")).To(Succeed())
++		})
++		expectRequeueOf(t, "A phase change should requeue the LoadBalancer Service")
++
++		updateVMI(t, "vmi-1", func(u *unstructured.Unstructured) {
++			Expect(unstructured.SetNestedField(u.Object, "infra-2", "status", "nodeName")).To(Succeed())
++		})
++		expectRequeueOf(t, "A node change should requeue the LoadBalancer Service")
++
++		updateVMI(t, "vmi-1", func(u *unstructured.Unstructured) {
++			Expect(unstructured.SetNestedSlice(u.Object, []interface{}{
++				map[string]interface{}{"name": "default", "ipAddress": "10.0.0.9"},
++			}, "status", "interfaces")).To(Succeed())
++		})
++		expectRequeueOf(t, "An address change should requeue the LoadBalancer Service")
++
++		updateVMI(t, "vmi-1", func(u *unstructured.Unstructured) {
++			u.SetLabels(map[string]string{clusterNameLabel: "another-cluster"})
++		})
++		expectRequeueOf(t, "Moving a VMI to another cluster should requeue the LoadBalancer Service")
++	})
++})
++
++func drainQueue(t *testKubevirtEPSController) {
++	for t.controller.queue.Len() > 0 {
++		item, _ := t.controller.queue.Get()
++		t.controller.queue.Done(item)
++	}
++}
diff --git a/packages/apps/kubernetes/images/kubevirt-csi-driver.tag b/packages/apps/kubernetes/images/kubevirt-csi-driver.tag
index e782d93f91..cd94f98ea7 100644
--- a/packages/apps/kubernetes/images/kubevirt-csi-driver.tag
+++ b/packages/apps/kubernetes/images/kubevirt-csi-driver.tag
@@ -1 +1 @@
-ghcr.io/cozystack/cozystack/kubevirt-csi-driver:0.0.0@sha256:59681800662c67f989c03c6a727d437e5fc4e85769475cef0472b2a5292f2a6f
+ghcr.io/cozystack/cozystack/kubevirt-csi-driver:v1.6.0@sha256:d6326e343c7932ce3d375c6742b9b9745090a4a26bf5bbc5ad19f5504ea93d65
diff --git a/packages/apps/kubernetes/images/kubevirt-csi-driver/Dockerfile b/packages/apps/kubernetes/images/kubevirt-csi-driver/Dockerfile
index 5103e415ef..6a17209fbb 100644
--- a/packages/apps/kubernetes/images/kubevirt-csi-driver/Dockerfile
+++ b/packages/apps/kubernetes/images/kubevirt-csi-driver/Dockerfile
@@ -1,5 +1,6 @@
-ARG builder_image=docker.io/library/golang:1.26
-FROM ${builder_image} AS builder
+ARG builder_image=docker.io/library/golang:1.27@sha256:3680233e3204827fbdc66088528ae6d4b3d034f51d03a99d454f6de034888244
+FROM --platform=$BUILDPLATFORM ${builder_image} AS builder
+ARG GOPROXY
 
 ARG TARGETOS
 ARG TARGETARCH
@@ -7,14 +8,14 @@ ARG TARGETARCH
 WORKDIR /src
 
 COPY go.mod go.sum ./
-RUN go mod download
+RUN for attempt in 1 2 3; do go mod download && break; [ "$attempt" = 3 ] && exit 1; sleep $((attempt * 10)); done
 
 COPY *.go ./
 RUN CGO_ENABLED=0 GOOS=$TARGETOS GOARCH=$TARGETARCH go build \
     -ldflags "-X kubevirt.io/csi-driver/pkg/service.VendorVersion=0.2.0" \
     -o kubevirt-csi-driver .
 
-FROM quay.io/centos/centos:stream9
+FROM docker.io/library/almalinux:9@sha256:3a3fa7f043b142bc8008c8b308d39b47d2c84008addcd52f9f9a7a82d2a90474
 
 RUN dnf install -y e2fsprogs xfsprogs nfs-utils && dnf clean all
 
diff --git a/packages/apps/kubernetes/images/kubevirt-csi-driver/controller.go b/packages/apps/kubernetes/images/kubevirt-csi-driver/controller.go
index 152a3cb56f..9029c9ff30 100644
--- a/packages/apps/kubernetes/images/kubevirt-csi-driver/controller.go
+++ b/packages/apps/kubernetes/images/kubevirt-csi-driver/controller.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"net/url"
+	"slices"
 	"time"
 
 	csi "github.com/container-storage-interface/spec/lib/go/csi"
@@ -349,37 +350,37 @@ func (w *WrappedControllerService) ControllerPublishVolume(ctx context.Context,
 
 	// Create or update CiliumNetworkPolicy allowing egress to NFS server
 	cnpName := fmt.Sprintf("csi-nfs-%s", dvName)
-	vmiOwnerRef := map[string]interface{}{
+	vmiOwnerRef := map[string]any{
 		"apiVersion": "kubevirt.io/v1",
 		"kind":       "VirtualMachineInstance",
 		"name":       vmName,
 		"uid":        string(vmi.UID),
 	}
 	cnp := &unstructured.Unstructured{
-		Object: map[string]interface{}{
+		Object: map[string]any{
 			"apiVersion": "cilium.io/v2",
 			"kind":       "CiliumNetworkPolicy",
-			"metadata": map[string]interface{}{
+			"metadata": map[string]any{
 				"name":            cnpName,
 				"namespace":       vmNamespace,
-				"ownerReferences": []interface{}{vmiOwnerRef},
+				"ownerReferences": []any{vmiOwnerRef},
 			},
-			"spec": map[string]interface{}{
+			"spec": map[string]any{
 				"endpointSelector": buildEndpointSelector([]string{vmName}),
-				"egress": []interface{}{
-					map[string]interface{}{
-						"toEndpoints": []interface{}{
-							map[string]interface{}{
-								"matchLabels": map[string]interface{}{
+				"egress": []any{
+					map[string]any{
+						"toEndpoints": []any{
+							map[string]any{
+								"matchLabels": map[string]any{
 									"k8s:app.kubernetes.io/component": "linstor-csi-nfs-server",
 									"k8s:io.kubernetes.pod.namespace": "cozy-linstor",
 								},
 							},
 						},
-						"toPorts": []interface{}{
-							map[string]interface{}{
-								"ports": []interface{}{
-									map[string]interface{}{
+						"toPorts": []any{
+							map[string]any{
+								"ports": []any{
+									map[string]any{
 										"port":     port,
 										"protocol": "TCP",
 									},
@@ -410,9 +411,10 @@ func (w *WrappedControllerService) ControllerPublishVolume(ctx context.Context,
 	}, nil
 }
 
-// ControllerUnpublishVolume for NFS volumes (RWX Filesystem): deletes CiliumNetworkPolicy.
-// For everything else (RWO and RWX Block), delegates to upstream so the hotplug
-// DataVolume is removed from VM.spec.template.spec.volumes. RWX Block volumes used
+// ControllerUnpublishVolume for NFS volumes (RWX Filesystem): drops this node from the
+// CiliumNetworkPolicy owners, which deletes the policy once no node is left.
+// For everything else (RWO and RWX Block), delegates to upstream, which removes the
+// hotplug DataVolume and waits for it to leave VMI.Status.VolumeStatus. RWX Block volumes used
 // for live migration must NOT be treated as NFS — their cleanup goes through upstream
 // hotplug removal, otherwise stale VM-spec entries permanently block re-attachment to
 // a different VM via the anti-split-brain check (issue #2634).
@@ -468,7 +470,7 @@ func (w *WrappedControllerService) ControllerExpandVolume(ctx context.Context, r
 }
 
 // addCNPOwnerReference adds a VMI ownerReference to an existing CiliumNetworkPolicy.
-func (w *WrappedControllerService) addCNPOwnerReference(ctx context.Context, namespace, cnpName string, ownerRef map[string]interface{}) error {
+func (w *WrappedControllerService) addCNPOwnerReference(ctx context.Context, namespace, cnpName string, ownerRef map[string]any) error {
 	return retry.RetryOnConflict(retry.DefaultRetry, func() error {
 		existing, err := w.dynamicClient.Resource(ciliumNetworkPolicyGVR).Namespace(namespace).Get(ctx, cnpName, metav1.GetOptions{})
 		if err != nil {
@@ -478,7 +480,7 @@ func (w *WrappedControllerService) addCNPOwnerReference(ctx context.Context, nam
 		ownerRefs, _, _ := unstructured.NestedSlice(existing.Object, "metadata", "ownerReferences")
 		uid, _, _ := unstructured.NestedString(ownerRef, "uid")
 		for _, ref := range ownerRefs {
-			if refMap, ok := ref.(map[string]interface{}); ok {
+			if refMap, ok := ref.(map[string]any); ok {
 				if refMap["uid"] == uid {
 					return nil // already present
 				}
@@ -517,9 +519,9 @@ func (w *WrappedControllerService) removeCNPOwnerReference(ctx context.Context,
 		}
 
 		ownerRefs, _, _ := unstructured.NestedSlice(existing.Object, "metadata", "ownerReferences")
-		var remaining []interface{}
+		var remaining []any
 		for _, ref := range ownerRefs {
-			if refMap, ok := ref.(map[string]interface{}); ok {
+			if refMap, ok := ref.(map[string]any); ok {
 				if refMap["name"] == vmName {
 					continue
 				}
@@ -558,14 +560,14 @@ func (w *WrappedControllerService) removeCNPOwnerReference(ctx context.Context,
 
 // buildEndpointSelector returns an endpointSelector using matchExpressions
 // so that multiple VMs can be listed in a single selector.
-func buildEndpointSelector(vmNames []string) map[string]interface{} {
-	values := make([]interface{}, len(vmNames))
+func buildEndpointSelector(vmNames []string) map[string]any {
+	values := make([]any, len(vmNames))
 	for i, name := range vmNames {
 		values[i] = name
 	}
-	return map[string]interface{}{
-		"matchExpressions": []interface{}{
-			map[string]interface{}{
+	return map[string]any{
+		"matchExpressions": []any{
+			map[string]any{
 				"key":      "kubevirt.io/vm",
 				"operator": "In",
 				"values":   values,
@@ -575,10 +577,10 @@ func buildEndpointSelector(vmNames []string) map[string]interface{} {
 }
 
 // vmNamesFromOwnerRefs extracts VM names from ownerReferences.
-func vmNamesFromOwnerRefs(ownerRefs []interface{}) []string {
+func vmNamesFromOwnerRefs(ownerRefs []any) []string {
 	var names []string
 	for _, ref := range ownerRefs {
-		if refMap, ok := ref.(map[string]interface{}); ok {
+		if refMap, ok := ref.(map[string]any); ok {
 			if name, ok := refMap["name"].(string); ok {
 				names = append(names, name)
 			}
@@ -588,12 +590,7 @@ func vmNamesFromOwnerRefs(ownerRefs []interface{}) []string {
 }
 
 func hasRWXAccessMode(pvc *corev1.PersistentVolumeClaim) bool {
-	for _, mode := range pvc.Spec.AccessModes {
-		if mode == corev1.ReadWriteMany {
-			return true
-		}
-	}
-	return false
+	return slices.Contains(pvc.Spec.AccessModes, corev1.ReadWriteMany)
 }
 
 // isNFSVolume reports whether the PVC was provisioned by our CreateVolume NFS path
diff --git a/packages/apps/kubernetes/images/kubevirt-csi-driver/controller_test.go b/packages/apps/kubernetes/images/kubevirt-csi-driver/controller_test.go
new file mode 100644
index 0000000000..46e2e1dce8
--- /dev/null
+++ b/packages/apps/kubernetes/images/kubevirt-csi-driver/controller_test.go
@@ -0,0 +1,488 @@
+package main
+
+import (
+	"context"
+	"encoding/json"
+	"errors"
+	"flag"
+	"net"
+	"reflect"
+	"testing"
+	"time"
+
+	csi "github.com/container-storage-interface/spec/lib/go/csi"
+	"google.golang.org/grpc"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/credentials/insecure"
+	"google.golang.org/grpc/status"
+	"google.golang.org/grpc/test/bufconn"
+	"google.golang.org/protobuf/types/known/emptypb"
+	corev1 "k8s.io/api/core/v1"
+	k8serrors "k8s.io/apimachinery/pkg/api/errors"
+	"k8s.io/apimachinery/pkg/api/resource"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	dynamicfake "k8s.io/client-go/dynamic/fake"
+	"k8s.io/client-go/kubernetes/fake"
+	kubevirtv1 "kubevirt.io/api/core/v1"
+	cdiv1 "kubevirt.io/containerized-data-importer-api/pkg/apis/core/v1beta1"
+
+	kubevirtclient "kubevirt.io/csi-driver/pkg/kubevirt"
+	"kubevirt.io/csi-driver/pkg/service"
+	"kubevirt.io/csi-driver/pkg/util"
+)
+
+// fakeVirtClient implements only the calls the RWX CreateVolume path makes;
+// any other call panics on the nil embedded interface.
+type fakeVirtClient struct {
+	kubevirtclient.Client
+	created *cdiv1.DataVolume
+}
+
+func (f *fakeVirtClient) GetDataVolume(_ context.Context, _, name string) (*cdiv1.DataVolume, error) {
+	return nil, k8serrors.NewNotFound(cdiv1.SchemeGroupVersion.WithResource("datavolumes").GroupResource(), name)
+}
+
+func (f *fakeVirtClient) CreateDataVolume(_ context.Context, _ string, dv *cdiv1.DataVolume) (*cdiv1.DataVolume, error) {
+	f.created = dv
+	return dv, nil
+}
+
+func newTestControllerService(virtClient kubevirtclient.Client) *WrappedControllerService {
+	enforcement := util.StorageClassEnforcement{AllowAll: true}
+	return &WrappedControllerService{
+		ControllerService:       service.NewControllerService(virtClient, "infra-ns", nil, enforcement, true),
+		virtClient:              virtClient,
+		infraNamespace:          "infra-ns",
+		storageClassEnforcement: enforcement,
+	}
+}
+
+// RPCs neither the wrapper nor upstream implement must reach the client as
+// Unimplemented through the gRPC server, not as a panic on a nil embedded
+// pointer. Methods are invoked by name with an empty message so the test also
+// compiles against spec versions that predate some of them; there the server
+// answers Unimplemented for an unknown method.
+func TestControllerAnswersUnimplementedForRPCsTheDriverDoesNotServe(t *testing.T) {
+	lis := bufconn.Listen(1 << 20)
+	srv := grpc.NewServer()
+	csi.RegisterControllerServer(srv, newTestControllerService(&fakeVirtClient{}))
+	go func() { _ = srv.Serve(lis) }()
+	t.Cleanup(srv.Stop)
+
+	conn, err := grpc.NewClient("passthrough:///bufnet",
+		grpc.WithContextDialer(func(context.Context, string) (net.Conn, error) { return lis.Dial() }),
+		grpc.WithTransportCredentials(insecure.NewCredentials()))
+	if err != nil {
+		t.Fatalf("dial: %v", err)
+	}
+	t.Cleanup(func() { _ = conn.Close() })
+
+	for _, method := range []string{
+		"ControllerModifyVolume",
+		"GetSnapshot",
+		"ControllerGetVolumeHealth",
+		"ControllerListVolumeHealth",
+	} {
+		t.Run(method, func(t *testing.T) {
+			err := conn.Invoke(context.Background(), "/csi.v1.Controller/"+method, &emptypb.Empty{}, &emptypb.Empty{})
+			if got := status.Code(err); got != codes.Unimplemented {
+				t.Errorf("%s: code = %v (err %v), want Unimplemented", method, got, err)
+			}
+		})
+	}
+}
+
+// Upstream rejects RWX+Filesystem, so the wrapper builds the DataVolume itself;
+// the JSON it sends to CDI must carry the requested size under
+// spec.storage.resources.requests.storage or CDI provisions nothing usable.
+func TestCreateVolumeRWXFilesystemDataVolumeSpec(t *testing.T) {
+	const size = 3 << 30
+	fake := &fakeVirtClient{}
+	w := newTestControllerService(fake)
+
+	_, err := w.CreateVolume(context.Background(), &csi.CreateVolumeRequest{
+		Name:          "pvc-rwx",
+		CapacityRange: &csi.CapacityRange{RequiredBytes: size},
+		VolumeCapabilities: []*csi.VolumeCapability{{
+			AccessType: &csi.VolumeCapability_Mount{Mount: &csi.VolumeCapability_MountVolume{}},
+			AccessMode: &csi.VolumeCapability_AccessMode{Mode: csi.VolumeCapability_AccessMode_MULTI_NODE_MULTI_WRITER},
+		}},
+		Parameters: map[string]string{kubevirtclient.InfraStorageClassNameParameter: "replicated-nfs"},
+	})
+	if err != nil {
+		t.Fatalf("CreateVolume: %v", err)
+	}
+	if fake.created == nil {
+		t.Fatal("CreateVolume did not create a DataVolume")
+	}
+
+	raw, err := json.Marshal(fake.created)
+	if err != nil {
+		t.Fatalf("marshal DataVolume: %v", err)
+	}
+	var dv struct {
+		Spec struct {
+			Storage struct {
+				AccessModes  []string `json:"accessModes"`
+				VolumeMode   string   `json:"volumeMode"`
+				StorageClass string   `json:"storageClassName"`
+				Resources    struct {
+					Requests map[string]string `json:"requests"`
+				} `json:"resources"`
+			} `json:"storage"`
+		} `json:"spec"`
+	}
+	if err := json.Unmarshal(raw, &dv); err != nil {
+		t.Fatalf("unmarshal DataVolume: %v", err)
+	}
+	st := dv.Spec.Storage
+
+	req, ok := st.Resources.Requests["storage"]
+	if !ok {
+		t.Fatalf("spec.storage.resources.requests.storage missing in %s", raw)
+	}
+	q, err := resource.ParseQuantity(req)
+	if err != nil {
+		t.Fatalf("parse storage request %q: %v", req, err)
+	}
+	if q.Value() != size {
+		t.Errorf("storage request = %s (%d bytes), want %d", req, q.Value(), size)
+	}
+	if want := []string{string(corev1.ReadWriteMany)}; !reflect.DeepEqual(st.AccessModes, want) {
+		t.Errorf("accessModes = %v, want %v", st.AccessModes, want)
+	}
+	if st.VolumeMode != string(corev1.PersistentVolumeFilesystem) {
+		t.Errorf("volumeMode = %q, want %q", st.VolumeMode, corev1.PersistentVolumeFilesystem)
+	}
+	if st.StorageClass != "replicated-nfs" {
+		t.Errorf("storageClassName = %q, want replicated-nfs", st.StorageClass)
+	}
+}
+
+func TestIsRWXFilesystem(t *testing.T) {
+	mount := &csi.VolumeCapability_Mount{Mount: &csi.VolumeCapability_MountVolume{}}
+	block := &csi.VolumeCapability_Block{Block: &csi.VolumeCapability_BlockVolume{}}
+	mode := func(m csi.VolumeCapability_AccessMode_Mode) *csi.VolumeCapability_AccessMode {
+		return &csi.VolumeCapability_AccessMode{Mode: m}
+	}
+
+	cases := []struct {
+		name string
+		caps []*csi.VolumeCapability
+		want bool
+	}{
+		{"RWX mount", []*csi.VolumeCapability{{AccessType: mount, AccessMode: mode(csi.VolumeCapability_AccessMode_MULTI_NODE_MULTI_WRITER)}}, true},
+		{"RWX block is a hotplug volume", []*csi.VolumeCapability{{AccessType: block, AccessMode: mode(csi.VolumeCapability_AccessMode_MULTI_NODE_MULTI_WRITER)}}, false},
+		{"RWO mount", []*csi.VolumeCapability{{AccessType: mount, AccessMode: mode(csi.VolumeCapability_AccessMode_SINGLE_NODE_WRITER)}}, false},
+		{"nil capability is skipped", []*csi.VolumeCapability{nil}, false},
+		{"no capabilities", nil, false},
+	}
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			if got := isRWXFilesystem(tc.caps); got != tc.want {
+				t.Errorf("isRWXFilesystem = %v, want %v", got, tc.want)
+			}
+		})
+	}
+}
+
+func TestIsNFSVolume(t *testing.T) {
+	fs := corev1.PersistentVolumeFilesystem
+	block := corev1.PersistentVolumeBlock
+	pvc := func(mode *corev1.PersistentVolumeMode, modes ...corev1.PersistentVolumeAccessMode) *corev1.PersistentVolumeClaim {
+		return &corev1.PersistentVolumeClaim{Spec: corev1.PersistentVolumeClaimSpec{AccessModes: modes, VolumeMode: mode}}
+	}
+
+	cases := []struct {
+		name string
+		pvc  *corev1.PersistentVolumeClaim
+		want bool
+	}{
+		{"RWX filesystem", pvc(&fs, corev1.ReadWriteMany), true},
+		{"RWX with unset volume mode defaults to filesystem", pvc(nil, corev1.ReadWriteMany), true},
+		{"RWX block is a live-migration hotplug volume", pvc(&block, corev1.ReadWriteMany), false},
+		{"RWO filesystem", pvc(&fs, corev1.ReadWriteOnce), false},
+		{"RWX among several access modes", pvc(&fs, corev1.ReadWriteOnce, corev1.ReadWriteMany), true},
+	}
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			if got := isNFSVolume(tc.pvc); got != tc.want {
+				t.Errorf("isNFSVolume = %v, want %v", got, tc.want)
+			}
+		})
+	}
+}
+
+func TestParseNFSExport(t *testing.T) {
+	cases := []struct {
+		in               string
+		host, port, path string
+	}{
+		{"nfs://10.0.0.5:2050/export/pvc-1", "10.0.0.5", "2050", "/export/pvc-1"},
+		{"nfs://nfs.example.com/export", "nfs.example.com", "2049", "/export"},
+		{"nfs://nfs.example.com:2049", "nfs.example.com", "2049", "/"},
+		{"nfs://[2001:db8::1]:2049/x", "2001:db8::1", "2049", "/x"},
+	}
+	for _, tc := range cases {
+		t.Run(tc.in, func(t *testing.T) {
+			host, port, path, err := parseNFSExport(tc.in)
+			if err != nil {
+				t.Fatalf("parseNFSExport(%q): %v", tc.in, err)
+			}
+			if host != tc.host || port != tc.port || path != tc.path {
+				t.Errorf("parseNFSExport(%q) = %q, %q, %q; want %q, %q, %q", tc.in, host, port, path, tc.host, tc.port, tc.path)
+			}
+		})
+	}
+
+	if _, _, _, err := parseNFSExport("nfs://bad host/x"); err == nil {
+		t.Error("parseNFSExport accepted a malformed URL")
+	}
+}
+
+func TestGetNFSExport(t *testing.T) {
+	cases := []struct {
+		name    string
+		spec    corev1.PersistentVolumeSpec
+		want    string
+		wantErr bool
+	}{
+		{
+			name: "native NFS PV",
+			spec: corev1.PersistentVolumeSpec{PersistentVolumeSource: corev1.PersistentVolumeSource{
+				NFS: &corev1.NFSVolumeSource{Server: "10.0.0.5", Path: "/export/pvc-1"},
+			}},
+			want: "nfs://10.0.0.5:2049/export/pvc-1",
+		},
+		{
+			name: "LINSTOR CSI PV",
+			spec: corev1.PersistentVolumeSpec{PersistentVolumeSource: corev1.PersistentVolumeSource{
+				CSI: &corev1.CSIPersistentVolumeSource{VolumeAttributes: map[string]string{
+					"linstor.csi.linbit.com/nfs-export": "nfs://10.0.0.6:2049/pvc-2",
+				}},
+			}},
+			want: "nfs://10.0.0.6:2049/pvc-2",
+		},
+		{
+			name: "CSI PV without export attribute",
+			spec: corev1.PersistentVolumeSpec{PersistentVolumeSource: corev1.PersistentVolumeSource{
+				CSI: &corev1.CSIPersistentVolumeSource{VolumeAttributes: map[string]string{"other": "x"}},
+			}},
+			wantErr: true,
+		},
+		{name: "no volume source", wantErr: true},
+	}
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			got, err := getNFSExport(&corev1.PersistentVolume{Spec: tc.spec})
+			if (err != nil) != tc.wantErr {
+				t.Fatalf("getNFSExport err = %v, wantErr %v", err, tc.wantErr)
+			}
+			if got != tc.want {
+				t.Errorf("getNFSExport = %q, want %q", got, tc.want)
+			}
+		})
+	}
+}
+
+func TestBuildEndpointSelectorListsEveryVM(t *testing.T) {
+	got := buildEndpointSelector([]string{"vm-a", "vm-b"})
+	want := map[string]any{
+		"matchExpressions": []any{
+			map[string]any{
+				"key":      "kubevirt.io/vm",
+				"operator": "In",
+				"values":   []any{"vm-a", "vm-b"},
+			},
+		},
+	}
+	if !reflect.DeepEqual(got, want) {
+		t.Errorf("buildEndpointSelector = %#v, want %#v", got, want)
+	}
+}
+
+const (
+	testInfraNamespace = "tenant-test"
+	testVMName         = "worker-0"
+	testVolumeName     = "pvc-0"
+)
+
+// teardownClient models the CAPI/CAPK teardown race: the VM is gone while its
+// VMI still reports the hot-plugged volume. The VMI drops the volume once
+// RemoveVolumeFromVMI is called, or when the garbage collector deletes a
+// VMI whose controlling VM is gone.
+type teardownClient struct {
+	kubevirtclient.Client
+	vmiOwners   []metav1.OwnerReference
+	vmiRemovals int
+	lookups     int
+}
+
+func (c *teardownClient) vmiGarbageCollected() bool {
+	owner := metav1.GetControllerOf(&metav1.ObjectMeta{OwnerReferences: c.vmiOwners})
+	return owner != nil && owner.Kind == "VirtualMachine" && owner.APIVersion == kubevirtv1.SchemeGroupVersion.String()
+}
+
+func (c *teardownClient) GetWorkloadManagingVirtualMachine(context.Context, string, string) (*kubevirtv1.VirtualMachine, error) {
+	c.lookups++
+	return nil, k8serrors.NewNotFound(schema.GroupResource{Group: "kubevirt.io", Resource: "virtualmachines"}, testVMName)
+}
+
+func (c *teardownClient) GetVirtualMachine(context.Context, string, string) (*kubevirtv1.VirtualMachineInstance, error) {
+	c.lookups++
+	vmi := &kubevirtv1.VirtualMachineInstance{
+		ObjectMeta: metav1.ObjectMeta{Name: testVMName, Namespace: testInfraNamespace, OwnerReferences: c.vmiOwners},
+	}
+	if c.vmiRemovals == 0 {
+		vmi.Status.VolumeStatus = []kubevirtv1.VolumeStatus{{Name: testVolumeName, HotplugVolume: &kubevirtv1.HotplugVolumeStatus{}}}
+	}
+	return vmi, nil
+}
+
+func (c *teardownClient) EnsureVolumeRemovedVMI(context.Context, string, string, string) (bool, error) {
+	return c.vmiRemovals > 0, nil
+}
+
+func (c *teardownClient) RemoveVolumeFromVMI(context.Context, string, string, *kubevirtv1.RemoveVolumeOptions) error {
+	c.vmiRemovals++
+	return nil
+}
+
+func (c *teardownClient) EnsureVolumeRemoved(context.Context, string, string, string, time.Duration) error {
+	if c.vmiRemovals > 0 || c.vmiGarbageCollected() {
+		return nil
+	}
+	return errors.New("timed out waiting for the VMI to drop the volume")
+}
+
+func vmOwner() []metav1.OwnerReference {
+	return []metav1.OwnerReference{
+		*metav1.NewControllerRef(&kubevirtv1.VirtualMachine{ObjectMeta: metav1.ObjectMeta{Name: testVMName}}, kubevirtv1.VirtualMachineGroupVersionKind),
+	}
+}
+
+// The flag has to reach the upstream controller service, which alone decides
+// whether to call the VMI-level removevolume. A VMI no VM controls gets the
+// call either way, since virt-api accepts it there.
+func TestControllerUnpublishVolumeHonoursVMIHotplugFallback(t *testing.T) {
+	const name = "enable-vmi-hotplug-fallback"
+	tests := []struct {
+		name         string
+		args         []string
+		owners       []metav1.OwnerReference
+		wantRemovals int
+	}{
+		{name: "default, VM-owned VMI", args: nil, owners: vmOwner(), wantRemovals: 1},
+		{name: "disabled, VM-owned VMI", args: []string{"--" + name + "=false"}, owners: vmOwner(), wantRemovals: 0},
+		{name: "disabled, orphaned VMI", args: []string{"--" + name + "=false"}, owners: nil, wantRemovals: 1},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			t.Cleanup(func() {
+				_ = flag.Set(name, flag.Lookup(name).DefValue)
+				_ = flag.Set("infra-cluster-namespace", flag.Lookup("infra-cluster-namespace").DefValue)
+			})
+			args := append([]string{"--infra-cluster-namespace=" + testInfraNamespace}, tt.args...)
+			if err := flag.CommandLine.Parse(args); err != nil {
+				t.Fatalf("parse flags: %v", err)
+			}
+
+			client := &teardownClient{vmiOwners: tt.owners}
+			infra := fake.NewClientset(&corev1.PersistentVolumeClaim{
+				ObjectMeta: metav1.ObjectMeta{Name: testVolumeName, Namespace: testInfraNamespace},
+				Spec:       corev1.PersistentVolumeClaimSpec{AccessModes: []corev1.PersistentVolumeAccessMode{corev1.ReadWriteOnce}},
+			})
+			enforcement := util.StorageClassEnforcement{AllowAll: true, AllowDefault: true}
+			w := newWrappedControllerService(service.NewKubevirtCSIDriver(), client, infra, nil, nil, enforcement)
+
+			req := &csi.ControllerUnpublishVolumeRequest{VolumeId: testVolumeName, NodeId: testInfraNamespace + "/" + testVMName}
+			if _, err := w.ControllerUnpublishVolume(context.Background(), req); err != nil {
+				t.Fatalf("ControllerUnpublishVolume() error = %v", err)
+			}
+			if client.vmiRemovals != tt.wantRemovals {
+				t.Errorf("RemoveVolumeFromVMI calls = %d, want %d", client.vmiRemovals, tt.wantRemovals)
+			}
+		})
+	}
+}
+
+func nfsCNP(owners ...string) *unstructured.Unstructured {
+	refs := make([]interface{}, 0, len(owners))
+	for _, owner := range owners {
+		refs = append(refs, map[string]interface{}{
+			"apiVersion": kubevirtv1.SchemeGroupVersion.String(), "kind": "VirtualMachineInstance", "name": owner, "uid": owner,
+		})
+	}
+	return &unstructured.Unstructured{Object: map[string]interface{}{
+		"apiVersion": "cilium.io/v2",
+		"kind":       "CiliumNetworkPolicy",
+		"metadata":   map[string]interface{}{"name": "csi-nfs-" + testVolumeName, "namespace": testInfraNamespace, "ownerReferences": refs},
+	}}
+}
+
+// An RWX filesystem volume is served over NFS, not hot-plugged, so unpublish
+// only releases this node from the volume's CiliumNetworkPolicy and never
+// reaches the upstream hot-unplug.
+func TestControllerUnpublishVolumeNFSReleasesNetworkPolicyOnly(t *testing.T) {
+	tests := []struct {
+		name       string
+		owners     []string
+		wantOwners []string
+	}{
+		{name: "other nodes still mount it", owners: []string{testVMName, "worker-1"}, wantOwners: []string{"worker-1"}},
+		{name: "last node", owners: []string{testVMName}, wantOwners: nil},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			client := &teardownClient{vmiOwners: vmOwner()}
+			filesystem := corev1.PersistentVolumeFilesystem
+			infra := fake.NewClientset(&corev1.PersistentVolumeClaim{
+				ObjectMeta: metav1.ObjectMeta{Name: testVolumeName, Namespace: testInfraNamespace},
+				Spec: corev1.PersistentVolumeClaimSpec{
+					AccessModes: []corev1.PersistentVolumeAccessMode{corev1.ReadWriteMany},
+					VolumeMode:  &filesystem,
+				},
+			})
+			dynamic := dynamicfake.NewSimpleDynamicClientWithCustomListKinds(runtime.NewScheme(),
+				map[schema.GroupVersionResource]string{ciliumNetworkPolicyGVR: "CiliumNetworkPolicyList"}, nfsCNP(tt.owners...))
+			w := &WrappedControllerService{
+				ControllerService: service.NewControllerService(client, testInfraNamespace, nil, util.StorageClassEnforcement{AllowAll: true}, true),
+				infraClient:       infra,
+				dynamicClient:     dynamic,
+				virtClient:        client,
+				infraNamespace:    testInfraNamespace,
+			}
+
+			req := &csi.ControllerUnpublishVolumeRequest{VolumeId: testVolumeName, NodeId: testInfraNamespace + "/" + testVMName}
+			if _, err := w.ControllerUnpublishVolume(context.Background(), req); err != nil {
+				t.Fatalf("ControllerUnpublishVolume() error = %v", err)
+			}
+			if client.lookups != 0 || client.vmiRemovals != 0 {
+				t.Errorf("VM/VMI lookups = %d, RemoveVolumeFromVMI calls = %d, want none", client.lookups, client.vmiRemovals)
+			}
+
+			cnp, err := dynamic.Resource(ciliumNetworkPolicyGVR).Namespace(testInfraNamespace).Get(context.Background(), "csi-nfs-"+testVolumeName, metav1.GetOptions{})
+			if tt.wantOwners == nil {
+				if !k8serrors.IsNotFound(err) {
+					t.Fatalf("CiliumNetworkPolicy still present after its last owner left: err = %v", err)
+				}
+				return
+			}
+			if err != nil {
+				t.Fatalf("get CiliumNetworkPolicy: %v", err)
+			}
+			var got []string
+			for _, ref := range cnp.GetOwnerReferences() {
+				got = append(got, ref.Name)
+			}
+			if len(got) != len(tt.wantOwners) || got[0] != tt.wantOwners[0] {
+				t.Errorf("CiliumNetworkPolicy owners = %v, want %v", got, tt.wantOwners)
+			}
+		})
+	}
+}
diff --git a/packages/apps/kubernetes/images/kubevirt-csi-driver/go.mod b/packages/apps/kubernetes/images/kubevirt-csi-driver/go.mod
index 53e57387ae..5f717fd674 100644
--- a/packages/apps/kubernetes/images/kubevirt-csi-driver/go.mod
+++ b/packages/apps/kubernetes/images/kubevirt-csi-driver/go.mod
@@ -1,16 +1,18 @@
 module cozystack.io/kubevirt-csi-driver
 
-go 1.26.2
+go 1.27.1
 
 require (
-	github.com/container-storage-interface/spec v1.10.0
-	google.golang.org/grpc v1.80.0
+	github.com/container-storage-interface/spec v1.13.0
+	google.golang.org/grpc v1.83.2
+	google.golang.org/protobuf v1.36.12
 	gopkg.in/yaml.v2 v2.4.0
 	k8s.io/api v0.36.0
 	k8s.io/apimachinery v0.36.0
 	k8s.io/client-go v12.0.0+incompatible
 	k8s.io/klog/v2 v2.140.0
 	k8s.io/mount-utils v0.36.0
+	kubevirt.io/api v1.2.2
 	kubevirt.io/containerized-data-importer-api v1.59.0
 	kubevirt.io/csi-driver v0.0.0-20260424143118-bee6c348c004
 )
@@ -18,48 +20,59 @@ require (
 require (
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/emicklei/go-restful/v3 v3.13.0 // indirect
-	github.com/fxamacker/cbor/v2 v2.9.0 // indirect
-	github.com/go-logr/logr v1.4.3 // indirect
-	github.com/go-openapi/jsonpointer v0.21.0 // indirect
-	github.com/go-openapi/jsonreference v0.20.2 // indirect
-	github.com/go-openapi/swag v0.23.0 // indirect
+	github.com/fxamacker/cbor/v2 v2.9.4 // indirect
+	github.com/go-logr/logr v1.4.4 // indirect
+	github.com/go-openapi/jsonpointer v1.0.1 // indirect
+	github.com/go-openapi/jsonreference v1.0.2 // indirect
+	github.com/go-openapi/swag v0.29.2 // indirect
+	github.com/go-openapi/swag/cmdutils v0.29.2 // indirect
+	github.com/go-openapi/swag/conv v0.29.2 // indirect
+	github.com/go-openapi/swag/fileutils v0.29.2 // indirect
+	github.com/go-openapi/swag/jsonutils v0.29.2 // indirect
+	github.com/go-openapi/swag/loading v0.29.2 // indirect
+	github.com/go-openapi/swag/mangling v0.29.2 // indirect
+	github.com/go-openapi/swag/netutils v0.29.2 // indirect
+	github.com/go-openapi/swag/pools v0.29.2 // indirect
+	github.com/go-openapi/swag/stringutils v0.29.2 // indirect
+	github.com/go-openapi/swag/typeutils v0.29.2 // indirect
+	github.com/go-openapi/swag/yamlutils v0.29.2 // indirect
 	github.com/golang/mock v1.6.0 // indirect
-	github.com/golang/protobuf v1.5.4 // indirect
-	github.com/google/gnostic-models v0.7.0 // indirect
+	github.com/google/gnostic-models v0.7.1 // indirect
+	github.com/google/pprof v0.0.0-20260906184651-6331bc6350fe // indirect
 	github.com/google/uuid v1.6.0 // indirect
-	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/kubernetes-csi/csi-lib-utils v0.18.1 // indirect
+	github.com/kubernetes-csi/csi-lib-utils v0.24.0 // indirect
 	github.com/kubernetes-csi/external-snapshotter/client/v6 v6.3.0 // indirect
-	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/moby/sys/mountinfo v0.7.2 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
+	github.com/onsi/ginkgo/v2 v2.33.0 // indirect
+	github.com/onsi/gomega v1.43.1 // indirect
 	github.com/openshift/api v0.0.0-20230503133300-8bbcb7ca7183 // indirect
 	github.com/openshift/custom-resource-status v1.1.2 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
-	github.com/spf13/pflag v1.0.9 // indirect
+	github.com/rogpeppe/go-internal v1.16.0 // indirect
+	github.com/spf13/pflag v1.0.10 // indirect
+	github.com/stretchr/testify v1.12.1 // indirect
 	github.com/x448/float16 v0.8.4 // indirect
-	go.yaml.in/yaml/v2 v2.4.3 // indirect
-	go.yaml.in/yaml/v3 v3.0.4 // indirect
-	golang.org/x/net v0.53.0 // indirect
-	golang.org/x/oauth2 v0.36.0 // indirect
-	golang.org/x/sys v0.43.0 // indirect
-	golang.org/x/term v0.42.0 // indirect
-	golang.org/x/text v0.36.0 // indirect
-	golang.org/x/time v0.14.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20260128011058-8636f8732409 // indirect
-	google.golang.org/protobuf v1.36.12-0.20260120151049-f2248ac996af // indirect
+	go.yaml.in/yaml/v2 v2.4.4 // indirect
+	go.yaml.in/yaml/v3 v3.0.5 // indirect
+	golang.org/x/net v0.59.0 // indirect
+	golang.org/x/oauth2 v0.37.0 // indirect
+	golang.org/x/sys v0.48.0 // indirect
+	golang.org/x/term v0.46.0 // indirect
+	golang.org/x/text v0.42.0 // indirect
+	golang.org/x/time v0.16.0 // indirect
+	golang.org/x/tools v0.50.0 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20260921155816-b14227669459 // indirect
 	gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/apiextensions-apiserver v0.26.4 // indirect
+	k8s.io/apiextensions-apiserver v0.34.3 // indirect
 	k8s.io/kube-openapi v0.0.0-20260317180543-43fb72c5454a // indirect
-	k8s.io/utils v0.0.0-20260210185600-b8788abfbbc2 // indirect
-	kubevirt.io/api v1.2.2 // indirect
-	kubevirt.io/controller-lifecycle-operator-sdk/api v0.0.0-20220329064328-f3cc58c6ed90 // indirect
-	sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
+	k8s.io/utils v0.0.0-20260707023825-cf1189d6abe3 // indirect
+	kubevirt.io/controller-lifecycle-operator-sdk/api v0.2.4 // indirect
+	sigs.k8s.io/json v0.0.0-20260909141634-11ed52e25bc5 // indirect
 	sigs.k8s.io/randfill v1.0.0 // indirect
 	sigs.k8s.io/structured-merge-diff/v6 v6.3.2 // indirect
 	sigs.k8s.io/yaml v1.6.0 // indirect
@@ -91,5 +104,5 @@ replace (
 	k8s.io/mount-utils => k8s.io/mount-utils v0.36.0
 	k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.36.0
 	k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.36.0
-	kubevirt.io/csi-driver => github.com/kubevirt/csi-driver v0.0.0-20260424143118-bee6c348c004
+	kubevirt.io/csi-driver => github.com/kubevirt/csi-driver v0.0.0-20260924151015-cb4770e4e475
 )
diff --git a/packages/apps/kubernetes/images/kubevirt-csi-driver/go.sum b/packages/apps/kubernetes/images/kubevirt-csi-driver/go.sum
index a37904b056..c9fe98dee9 100644
--- a/packages/apps/kubernetes/images/kubevirt-csi-driver/go.sum
+++ b/packages/apps/kubernetes/images/kubevirt-csi-driver/go.sum
@@ -1,3 +1,5 @@
+github.com/Masterminds/semver/v3 v3.4.0 h1:Zog+i5UMtVoCU8oKka5P7i9q9HgrJeGzI9SA1Xbatp0=
+github.com/Masterminds/semver/v3 v3.4.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM=
 github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ=
 github.com/NYTimes/gziphandler v1.1.1/go.mod h1:n/CVRwUEOgIxrgPvAQhUUr9oeUtvrhMomdKFjzJNB0c=
 github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
@@ -9,8 +11,8 @@ github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XL
 github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
 github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
 github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
-github.com/container-storage-interface/spec v1.10.0 h1:YkzWPV39x+ZMTa6Ax2czJLLwpryrQ+dPesB34mrRMXA=
-github.com/container-storage-interface/spec v1.10.0/go.mod h1:DtUvaQszPml1YJfIK7c00mlv6/g4wNMLanLgiUbKFRI=
+github.com/container-storage-interface/spec v1.13.0 h1:6ja3nYoACisewTPAAZkJ1pbf4+1ehhvt9Z/nYgWGHGw=
+github.com/container-storage-interface/spec v1.13.0/go.mod h1:fPZ7EFHYJwIwc9CMcoaT/yIhFTdToocYVtyafMG7EDM=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -24,8 +26,9 @@ github.com/emicklei/go-restful/v3 v3.13.0 h1:C4Bl2xDndpU6nJ4bc1jXd+uTmYPVUwkD6bF
 github.com/emicklei/go-restful/v3 v3.13.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
-github.com/fxamacker/cbor/v2 v2.9.0 h1:NpKPmjDBgUfBms6tr6JZkTHtfFGcMKsw3eGcmD/sapM=
 github.com/fxamacker/cbor/v2 v2.9.0/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ=
+github.com/fxamacker/cbor/v2 v2.9.4 h1:xwjVlxEMR3S605oUlgBjKLTTeGFciYPGYCtF/35LKGo=
+github.com/fxamacker/cbor/v2 v2.9.4/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ=
 github.com/getkin/kin-openapi v0.76.0/go.mod h1:660oXbgy5JFMKreazJaQTw7o+X00qeSyhcnluiMv+Xg=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas=
@@ -34,25 +37,57 @@ github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbV
 github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
 github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
-github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=
 github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
+github.com/go-logr/logr v1.4.4 h1:tG4xh9yMsRCAiodLVTxyrkzSZ9+o0L1Kg/+cPVcbP/8=
+github.com/go-logr/logr v1.4.4/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
 github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
 github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
 github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
 github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
 github.com/go-openapi/jsonpointer v0.19.6/go.mod h1:osyAmYz/mB/C3I+WsTTSgw1ONzaLJoLCyoi6/zppojs=
-github.com/go-openapi/jsonpointer v0.21.0 h1:YgdVicSA9vH5RiHs9TZW5oyafXZFc6+2Vc1rr/O9oNQ=
 github.com/go-openapi/jsonpointer v0.21.0/go.mod h1:IUyH9l/+uyhIYQ/PXVA41Rexl+kOkAPDdXEYns6fzUY=
+github.com/go-openapi/jsonpointer v1.0.1 h1:2KxywRmNwJkT/FMBa3iRNHEaAxSJvjqoufQZy3au1Mg=
+github.com/go-openapi/jsonpointer v1.0.1/go.mod h1:wI7ZYsFmbIi9nBXOZqgDaS/bqOchRGZjqxFli7FBYxY=
 github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL98+wF9xc8zWvFonSJ8=
 github.com/go-openapi/jsonreference v0.19.6/go.mod h1:diGHMEHg2IqXZGKxqyvWdfWU/aim5Dprw5bqpKkTvns=
 github.com/go-openapi/jsonreference v0.20.1/go.mod h1:Bl1zwGIM8/wsvqjsOQLJ/SH+En5Ap4rVB5KVcIDZG2k=
-github.com/go-openapi/jsonreference v0.20.2 h1:3sVjiK66+uXK/6oQ8xgcRKcFgQ5KXa2KvnJRumpMGbE=
 github.com/go-openapi/jsonreference v0.20.2/go.mod h1:Bl1zwGIM8/wsvqjsOQLJ/SH+En5Ap4rVB5KVcIDZG2k=
+github.com/go-openapi/jsonreference v1.0.2 h1:oS4et8FOf3p3UQxEo4Xt0esijmBUM+F259Xl72OSZsc=
+github.com/go-openapi/jsonreference v1.0.2/go.mod h1:TbUNSOo+fcorZjFaNoiSDSoaNnnZtqJtLGR1PuvE/Cs=
 github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
 github.com/go-openapi/swag v0.21.1/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ=
 github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14=
-github.com/go-openapi/swag v0.23.0 h1:vsEVJDUo2hPJ2tu0/Xc+4noaxyEffXNIs3cOULZ+GrE=
 github.com/go-openapi/swag v0.23.0/go.mod h1:esZ8ITTYEsH1V2trKHjAN8Ai7xHb8RV+YSZ577vPjgQ=
+github.com/go-openapi/swag v0.29.2 h1:9n8frkcsuQRA0INU31VbxNxt1zBaHxrHYGEf5BUjFi4=
+github.com/go-openapi/swag v0.29.2/go.mod h1:RkCiX1gCVXWgLOavDXE3ALJrQ/VO2ziiIzOUs3z10xo=
+github.com/go-openapi/swag/cmdutils v0.29.2 h1:cXEzX/nWCODon251f+1HgL75/R4XXML5IZxgLCWMoro=
+github.com/go-openapi/swag/cmdutils v0.29.2/go.mod h1:XziaSVzYqkDvpWXzASfWajw2YvJrLscq610O2XiyqJw=
+github.com/go-openapi/swag/conv v0.29.2 h1:8c9shoB8l0QRSR6ymq1llHdBWDqpIgJfjTGHx3Vuhm0=
+github.com/go-openapi/swag/conv v0.29.2/go.mod h1:AZS0YigTNf8qNtD6WqJz/N4RUNmpr76SyjFGkq4+p6Q=
+github.com/go-openapi/swag/fileutils v0.29.2 h1:mdUL+Vw5ah1fO1AvFCoHeIyv7YZsCz2MN3KNqd/lLVI=
+github.com/go-openapi/swag/fileutils v0.29.2/go.mod h1:7QKmmodjAebaq61lGVJa8ldLdGeMF4DSgYv8tXOGGo0=
+github.com/go-openapi/swag/jsonutils v0.29.2 h1:uZNSD2/rJDYAfvsLYkykTzXuyxM3QpDKV9jhRHrMu6k=
+github.com/go-openapi/swag/jsonutils v0.29.2/go.mod h1:ONTdNvj3Y+IXRzfa17E+Rgt2ns/qiSOYjIo2K7v2yDs=
+github.com/go-openapi/swag/jsonutils/fixtures_test v0.29.2 h1:w+Fd6EBOMGlC74GYGHqCLGyb3Bpams8TtNrgM/SG4jo=
+github.com/go-openapi/swag/jsonutils/fixtures_test v0.29.2/go.mod h1:HC2egPORFzbj/gf05Zrfgz8Mgplx3oW7hgGi7pjZVhM=
+github.com/go-openapi/swag/loading v0.29.2 h1:QU1ry24e6r6Shoxe380Nx0X5iKkpRO+hJffsyJ2dVlY=
+github.com/go-openapi/swag/loading v0.29.2/go.mod h1:DqilDjuiJKETecsS4TRopWG1acUDsfqN39ZmQhPu6uI=
+github.com/go-openapi/swag/mangling v0.29.2 h1:ltdo3K0tTP4P6zWhVVWDU9D37/YYBuMJRdZxiS2Dtog=
+github.com/go-openapi/swag/mangling v0.29.2/go.mod h1:RjDi4TnItAenS3cgCXSpIl1kKbjG7il6pnmQVl/8bp8=
+github.com/go-openapi/swag/netutils v0.29.2 h1:dBli6jyUa93sDS/XYWShJzf4+nnVfFKfvY9SLUaUzB8=
+github.com/go-openapi/swag/netutils v0.29.2/go.mod h1:1pM6Xg/Um8E1eps3umWl8Hme3ByWXOtHsvFC0CULHUE=
+github.com/go-openapi/swag/pools v0.29.2 h1:PlGoDRF8WtSyXkedZZkpW3f9wDhFf3u8KtaBcmgmh8c=
+github.com/go-openapi/swag/pools v0.29.2/go.mod h1:V3lhxVT4qDYRqc2MRSSbLsTYIYV/2HlHafhyEkmzLIc=
+github.com/go-openapi/swag/stringutils v0.29.2 h1:lcnBxwAaysT3bMUVBfn9V/PkfVqkurpqufKU6rTUMGk=
+github.com/go-openapi/swag/stringutils v0.29.2/go.mod h1:i9cdh7sGaa0nm3CqIvH5IM5h2QClk1wns2ktKeILvRI=
+github.com/go-openapi/swag/typeutils v0.29.2 h1:O7aVvkTs3pXwikgtrPLenigEMdQFgONKRooQA9pgf2I=
+github.com/go-openapi/swag/typeutils v0.29.2/go.mod h1:7+GDG+uz9Ke+eVt4rClZg7wklSDp8hT/mKNh/pC26TE=
+github.com/go-openapi/swag/yamlutils v0.29.2 h1:IFKFFeDnuIwzfsuWRQU+rI8iL3g4XyAYjV/RlnlxPLM=
+github.com/go-openapi/swag/yamlutils v0.29.2/go.mod h1:7MGqtcrK73sxQ4ceiyIf8qiXS/s09JLMdR5esK5euYQ=
+github.com/go-openapi/testify/enable/yaml/v2 v2.7.0 h1:wPW6YRgx3+SID1yUy/Xwa17L8kFEaEKod2VRbJDZNUs=
+github.com/go-openapi/testify/enable/yaml/v2 v2.7.0/go.mod h1:mI1M88etYbc3PhgHsWQK2kwvNwW5aGFqMPbmib+SGIs=
+github.com/go-openapi/testify/v2 v2.7.0 h1:bycOreEj6wfBvijg3YFogZ/sFjTCDmQnwSodSzHa3X8=
+github.com/go-openapi/testify/v2 v2.7.0/go.mod h1:SgsVHtfooshd0tublTtJ50FPKhujf47YRqauXXOUxfw=
 github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 h1:p104kn46Q8WdvHunIJ9dAyjPVtrBPhSr3KT2yUst43I=
 github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
 github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI=
@@ -71,8 +106,9 @@ github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaS
 github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
 github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
-github.com/google/gnostic-models v0.7.0 h1:qwTtogB15McXDaNqTZdzPJRHvaVJlAl+HVQnLmJEJxo=
 github.com/google/gnostic-models v0.7.0/go.mod h1:whL5G0m6dmc5cPxKc5bdKdEN3UjI7OUGxBlw57miDrQ=
+github.com/google/gnostic-models v0.7.1 h1:SisTfuFKJSKM5CPZkffwi6coztzzeYUhc3v4yxLWH8c=
+github.com/google/gnostic-models v0.7.1/go.mod h1:whL5G0m6dmc5cPxKc5bdKdEN3UjI7OUGxBlw57miDrQ=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
@@ -84,8 +120,8 @@ github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20240525223248-4bfdf5a9a2af h1:kmjWCqn2qkEml422C2Rrd27c3VGxi6a/6HNq8QmHRKM=
-github.com/google/pprof v0.0.0-20240525223248-4bfdf5a9a2af/go.mod h1:K1liHPHnj73Fdn/EKuT8nrFqBihUSKXoLYU0BuatOYo=
+github.com/google/pprof v0.0.0-20260906184651-6331bc6350fe h1:QAinXoAFJdGQYztXn3VpFey7KCwpedbZ/EkzbplQ0cY=
+github.com/google/pprof v0.0.0-20260906184651-6331bc6350fe/go.mod h1:jl5iWTm0/hd5PjEYEOuwAJ57L/CibdZfrqZ5XA5GrCk=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
@@ -93,7 +129,6 @@ github.com/googleapis/gnostic v0.5.1/go.mod h1:6U4PtQXGIEt/Z3h5MAT7FNofLnw9vXk2c
 github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
-github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
 github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
 github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
@@ -109,16 +144,15 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/kubernetes-csi/csi-lib-utils v0.18.1 h1:vpg1kbQ6lFVCz7mY71zcqVE7W0GAQXXBoFfHvbW3gdw=
-github.com/kubernetes-csi/csi-lib-utils v0.18.1/go.mod h1:PIcn27zmbY0KBue4JDdZVfDF56tjcS3jKroZPi+pMoY=
+github.com/kubernetes-csi/csi-lib-utils v0.24.0 h1:hpL5ecxtr07/DNIF9Qn/gbNG/ZlgMSMZxfRtgfVm9tY=
+github.com/kubernetes-csi/csi-lib-utils v0.24.0/go.mod h1:JbvkvtWghDcVZnwQoSi6Np9ITwqN7+sqLiSsM9y4kRE=
 github.com/kubernetes-csi/external-snapshotter/client/v6 v6.3.0 h1:qS4r4ljINLWKJ9m9Ge3Q3sGZ/eIoDVDT2RhAdQFHb1k=
 github.com/kubernetes-csi/external-snapshotter/client/v6 v6.3.0/go.mod h1:oGXx2XTEzs9ikW2V6IC1dD8trgjRsS/Mvc2JRiC618Y=
-github.com/kubevirt/csi-driver v0.0.0-20260424143118-bee6c348c004 h1:fEnd+1kIEuzpFJt9slCylHsgPmxyLFO8K83hrToMkWs=
-github.com/kubevirt/csi-driver v0.0.0-20260424143118-bee6c348c004/go.mod h1:Pzl14YlqPpoK/ZdS79tUSuHbC2L/NPqOIjFTN5kTmUg=
+github.com/kubevirt/csi-driver v0.0.0-20260924151015-cb4770e4e475 h1:82B2pAet/OdspUVsJ8VWl4KI58dfcyJJPyrr/dW6o08=
+github.com/kubevirt/csi-driver v0.0.0-20260924151015-cb4770e4e475/go.mod h1:ErITd7C1TCf5N8MRWOjoabX5s5sfW2BUGOOiUOtx+9E=
 github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
-github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
 github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
 github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
 github.com/moby/spdystream v0.5.1/go.mod h1:xBAYlnt/ay+11ShkdFKNAG7LsyK/tmNBVvVOwrfMgdI=
@@ -141,18 +175,17 @@ github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+
 github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
-github.com/onsi/ginkgo v1.16.4 h1:29JGrr5oVBm5ulCWet69zQkzWipVXIol6ygQUe/EzNc=
 github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
 github.com/onsi/ginkgo/v2 v2.0.0/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c=
-github.com/onsi/ginkgo/v2 v2.19.0 h1:9Cnnf7UHo57Hy3k6/m5k3dRfGTMXGvxhHFvkDTCTpvA=
-github.com/onsi/ginkgo/v2 v2.19.0/go.mod h1:rlwLi9PilAFJ8jCg9UE1QP6VBpd6/xj3SRC0d6TU0To=
+github.com/onsi/ginkgo/v2 v2.33.0 h1:C8gBA6Uc2ZEubiV+SXiu5tZnMTwEmXHgkJwGozKtZf8=
+github.com/onsi/ginkgo/v2 v2.33.0/go.mod h1:+aXOY+vzZ5mu2iI2HpTZUPmM//oQfsNFX6gU9kNcA44=
 github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
 github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
 github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
 github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY=
 github.com/onsi/gomega v1.18.1/go.mod h1:0q+aL8jAiMXy9hbwj2mr5GziHiwhAIQpFmmtT5hitRs=
-github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk=
-github.com/onsi/gomega v1.33.1/go.mod h1:U4R44UsT+9eLIaYRB2a5qajjtQYn0hauxvRm16AVYg0=
+github.com/onsi/gomega v1.43.1 h1:vGIPFuYrIO6/0Z09s0I0QQQgFchiX4+tb1re3MScJYo=
+github.com/onsi/gomega v1.43.1/go.mod h1:e/C2HwaZ1DhvjzXXuFhcR7hY7Sh9pl7MmoWKEjzwcdA=
 github.com/openshift/api v0.0.0-20230503133300-8bbcb7ca7183 h1:t/CahSnpqY46sQR01SoS+Jt0jtjgmhgE6lFmRnO4q70=
 github.com/openshift/api v0.0.0-20230503133300-8bbcb7ca7183/go.mod h1:4VWG+W22wrB4HfBL88P40DxLEpSOaiBVxUnfalfJo9k=
 github.com/openshift/custom-resource-status v1.1.2 h1:C3DL44LEbvlbItfd8mT5jWrqPfHnSOQoQf/sypqA6A4=
@@ -163,18 +196,21 @@ github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRI
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
 github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
-github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
 github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
+github.com/rogpeppe/go-internal v1.16.0 h1:O9DK+vNMDVGLr2BeZqmpLeMjiMNkuXfcqntWbZV6S5g=
+github.com/rogpeppe/go-internal v1.16.0/go.mod h1:DrUVZyrJU+txYW5/1kwtXQSMFio52ZOxX7yM1VHvnxs=
 github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
-github.com/spf13/pflag v1.0.9 h1:9exaQaMOCwffKiiiYk6/BndUBv+iRViNW+4lEMi0PvY=
 github.com/spf13/pflag v1.0.9/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+github.com/spf13/pflag v1.0.10 h1:4EBh2KAYBwaONj6b2Ye1GiHfwjqyROoF4RwYO+vPwFk=
+github.com/spf13/pflag v1.0.10/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
-github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
 github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
+github.com/stretchr/objx v0.5.3 h1:jmXUvGomnU1o3W/V5h2VEradbpJDwGrzugQQvL0POH4=
+github.com/stretchr/objx v0.5.3/go.mod h1:rDQraq+vQZU7Fde9LOZLr8Tax6zZvy4kuNKF+QYS+U0=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
@@ -183,8 +219,9 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
 github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
+github.com/stretchr/testify v1.12.1 h1:EuwCh5fleGS7H32xRwO3wRGT7DxrDhLAT6FF8MpWDWE=
+github.com/stretchr/testify v1.12.1/go.mod h1:MDEgiDPPsNp5cuIrHPPCyornHKgEVbtFUmoNlxoYthg=
 github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
 github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
@@ -194,24 +231,26 @@ github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64=
 go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y=
-go.opentelemetry.io/otel v1.41.0 h1:YlEwVsGAlCvczDILpUXpIpPSL/VPugt7zHThEMLce1c=
-go.opentelemetry.io/otel v1.41.0/go.mod h1:Yt4UwgEKeT05QbLwbyHXEwhnjxNO6D8L5PQP51/46dE=
-go.opentelemetry.io/otel/metric v1.41.0 h1:rFnDcs4gRzBcsO9tS8LCpgR0dxg4aaxWlJxCno7JlTQ=
-go.opentelemetry.io/otel/metric v1.41.0/go.mod h1:xPvCwd9pU0VN8tPZYzDZV/BMj9CM9vs00GuBjeKhJps=
-go.opentelemetry.io/otel/sdk v1.40.0 h1:KHW/jUzgo6wsPh9At46+h4upjtccTmuZCFAc9OJ71f8=
-go.opentelemetry.io/otel/sdk v1.40.0/go.mod h1:Ph7EFdYvxq72Y8Li9q8KebuYUr2KoeyHx0DRMKrYBUE=
-go.opentelemetry.io/otel/sdk/metric v1.39.0 h1:cXMVVFVgsIf2YL6QkRF4Urbr/aMInf+2WKg+sEJTtB8=
-go.opentelemetry.io/otel/sdk/metric v1.39.0/go.mod h1:xq9HEVH7qeX69/JnwEfp6fVq5wosJsY1mt4lLfYdVew=
-go.opentelemetry.io/otel/trace v1.41.0 h1:Vbk2co6bhj8L59ZJ6/xFTskY+tGAbOnCtQGVVa9TIN0=
-go.opentelemetry.io/otel/trace v1.41.0/go.mod h1:U1NU4ULCoxeDKc09yCWdWe+3QoyweJcISEVa1RBzOis=
+go.opentelemetry.io/otel v1.44.0 h1:JjwHmHpA4iZ3wBxluu2fbbE7j4kqlE8jXyAyPXH7HqU=
+go.opentelemetry.io/otel v1.44.0/go.mod h1:BMgjTHL9WPRlRjL2oZCBTL4whCGtXch2H4BhOPIAyYc=
+go.opentelemetry.io/otel/metric v1.44.0 h1:1w0gILTcHdr3YI+ixLyjemwrVnsMURbTZFrSYCdDdmc=
+go.opentelemetry.io/otel/metric v1.44.0/go.mod h1:8O7hanEPBNgEMmybD3s2VBKcgWOCsA6tzHBPODAiquo=
+go.opentelemetry.io/otel/sdk v1.44.0 h1:nHYwb9lK+fJPU/dnT6s7W7Z8itMWyqrnVfbheVYrZ58=
+go.opentelemetry.io/otel/sdk v1.44.0/go.mod h1:Osuydd3Se74nqjAKxid74N5eC+jfEqfTegHRnq58oK0=
+go.opentelemetry.io/otel/sdk/metric v1.44.0 h1:3LlKgI+VjbVsjNRFZJZAJ30WjXC5VkNRks6si09iEfI=
+go.opentelemetry.io/otel/sdk/metric v1.44.0/go.mod h1:5B5pMARnXxKhltooO4xUuCBorl65a4EpnTalObqOigA=
+go.opentelemetry.io/otel/trace v1.44.0 h1:jxF5CsGYCe74MCRx2X4g7WsY/VBKRqqpNvXlX/6gtIk=
+go.opentelemetry.io/otel/trace v1.44.0/go.mod h1:oLl1jrMQAVo6v3GAggN+1VH9VIz9iUSvW53sW1Q8PIE=
 go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
 go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
 go.yaml.in/yaml/v2 v2.4.2/go.mod h1:081UH+NErpNdqlCXm3TtEran0rJZGxAYx9hb/ELlsPU=
-go.yaml.in/yaml/v2 v2.4.3 h1:6gvOSjQoTB3vt1l+CU+tSyi/HOjfOjRLJ4YwYZGwRO0=
 go.yaml.in/yaml/v2 v2.4.3/go.mod h1:zSxWcmIDjOzPXpjlTTbAsKokqkDNAVtZO0WOMiT90s8=
+go.yaml.in/yaml/v2 v2.4.4 h1:tuyd0P+2Ont/d6e2rl3be67goVK4R6deVxCUX5vyPaQ=
+go.yaml.in/yaml/v2 v2.4.4/go.mod h1:gMZqIpDtDqOfM0uNfy0SkpRhvUryYH0Z6wdMYcacYXQ=
 go.yaml.in/yaml/v3 v3.0.3/go.mod h1:tBHosrYAkRZjRAOREWbDnBXUf08JOwYq++0QNwQiWzI=
-go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=
 go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
+go.yaml.in/yaml/v3 v3.0.5 h1:N6y/pJk8buWs9NY5ERU2HSMfm+IuD/OtfdAnq6kESPw=
+go.yaml.in/yaml/v3 v3.0.5/go.mod h1:HVTZu1O7/Vkt2N+BFy8Zza+lnLsABggaTM2ZpNIGuKg=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
@@ -251,6 +290,8 @@ golang.org/x/mod v0.29.0/go.mod h1:NyhrlYXJ2H4eJiRy/WDBO6HMqZQ6q9nk4JzS3NuCK+w=
 golang.org/x/mod v0.30.0/go.mod h1:lAsf5O2EvJeSFMiBxXDki7sCgAxEUcZHXoXMKT4GJKc=
 golang.org/x/mod v0.31.0/go.mod h1:43JraMp9cGx1Rx3AqioxrbrhNsLl2l/iNAvuBkrezpg=
 golang.org/x/mod v0.32.0/go.mod h1:SgipZ/3h2Ci89DlEtEXWUk/HteuRin+HHhN+WbNhguU=
+golang.org/x/mod v0.41.0 h1:qJmnOUb4YB+FsEuM3HcWucdZASCPGhsX6uljO6pog0c=
+golang.org/x/mod v0.41.0/go.mod h1:Ek9pY8RKWXwsWvd3rQiHYtMqkjSUV+s1Rj7j4H5Ur6o=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
@@ -282,10 +323,10 @@ golang.org/x/net v0.46.0/go.mod h1:Q9BGdFy1y4nkUwiLvT5qtyhAnEHgnQ/zd8PfU6nc210=
 golang.org/x/net v0.47.0/go.mod h1:/jNxtkgq5yWUGYkaZGqo27cfGZ1c5Nen03aYrrKpVRU=
 golang.org/x/net v0.48.0/go.mod h1:+ndRgGjkh8FGtu1w1FGbEC31if4VrNVMuKTgcAAnQRY=
 golang.org/x/net v0.49.0/go.mod h1:/ysNB2EvaqvesRkuLAyjI1ycPZlQHM3q01F02UY/MV8=
-golang.org/x/net v0.53.0 h1:d+qAbo5L0orcWAr0a9JweQpjXF19LMXJE8Ey7hwOdUA=
-golang.org/x/net v0.53.0/go.mod h1:JvMuJH7rrdiCfbeHoo3fCQU24Lf5JJwT9W3sJFulfgs=
-golang.org/x/oauth2 v0.36.0 h1:peZ/1z27fi9hUOFCAZaHyrpWG5lwe0RJEEEeH0ThlIs=
-golang.org/x/oauth2 v0.36.0/go.mod h1:YDBUJMTkDnJS+A4BP4eZBjCqtokkg1hODuPjwiGPO7Q=
+golang.org/x/net v0.59.0 h1:5zfYln+w5XCxwrnMMJPufRgNoXEaGxl0wo5GqPXyues=
+golang.org/x/net v0.59.0/go.mod h1:2DA/G1UfVbCpQPeWTmMPGY7Cs2PkBkwu743bVX5PIVg=
+golang.org/x/oauth2 v0.37.0 h1:JUlcxA8oAtauLfiH8FX2/FkAWHAdi0QtGCGc+hofE98=
+golang.org/x/oauth2 v0.37.0/go.mod h1:IxwZNxUULJmpBFf9K/9NTMSIfZZuvuTy1gGxhigP/58=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -304,6 +345,8 @@ golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
 golang.org/x/sync v0.17.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
 golang.org/x/sync v0.18.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
 golang.org/x/sync v0.19.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
+golang.org/x/sync v0.23.0 h1:KameEIfc1IkluZyXWLn39Wd4tURc6GbCiISGiZm2bQk=
+golang.org/x/sync v0.23.0/go.mod h1:sUUOizhqBxiL6pEWpqNLUiaJn1ShEbZ6BBqskPbjZm0=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -340,8 +383,8 @@ golang.org/x/sys v0.37.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
 golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
 golang.org/x/sys v0.39.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
 golang.org/x/sys v0.40.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
-golang.org/x/sys v0.43.0 h1:Rlag2XtaFTxp19wS8MXlJwTvoh8ArU6ezoyFsMyCTNI=
-golang.org/x/sys v0.43.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
+golang.org/x/sys v0.48.0 h1:bbX/i/6MgT9BVLM9RT1thmxL04yeTAhbEz4SyadbXoo=
+golang.org/x/sys v0.48.0/go.mod h1:hNLxWAXmnKAxqDtdwIYC4bM9oQPEecfsnNMuSxOs3og=
 golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE=
 golang.org/x/telemetry v0.0.0-20240521205824-bda55230c457/go.mod h1:pRgIJT+bRLFKnoM1ldnzKoxTIn14Yxz928LQRYYgIN0=
 golang.org/x/telemetry v0.0.0-20250710130107-8d8967aff50b/go.mod h1:4ZwOYna0/zsOKwuR5X/m0QFOJpSZvAxFfkQT+Erd9D4=
@@ -368,8 +411,8 @@ golang.org/x/term v0.36.0/go.mod h1:Qu394IJq6V6dCBRgwqshf3mPF85AqzYEzofzRdZkWss=
 golang.org/x/term v0.37.0/go.mod h1:5pB4lxRNYYVZuTLmy8oR2BH8dflOR+IbTYFD8fi3254=
 golang.org/x/term v0.38.0/go.mod h1:bSEAKrOT1W+VSu9TSCMtoGEOUcKxOKgl3LE5QEF/xVg=
 golang.org/x/term v0.39.0/go.mod h1:yxzUCTP/U+FzoxfdKmLaA0RV1WgE0VY7hXBwKtY/4ww=
-golang.org/x/term v0.42.0 h1:UiKe+zDFmJobeJ5ggPwOshJIVt6/Ft0rcfrXZDLWAWY=
-golang.org/x/term v0.42.0/go.mod h1:Dq/D+snpsbazcBG5+F9Q1n2rXV8Ma+71xEjTRufARgY=
+golang.org/x/term v0.46.0 h1:3+OXuTbaKDgwk8jTi3aSLHRlmWqHEUDUtxnbFigO4YE=
+golang.org/x/term v0.46.0/go.mod h1:+K02xbkittuwc0Am4abfA3Fc+XRGXkvBXNO88NCXPoc=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
@@ -391,10 +434,11 @@ golang.org/x/text v0.30.0/go.mod h1:yDdHFIX9t+tORqspjENWgzaCVXgk0yYnYuSZ8UzzBVM=
 golang.org/x/text v0.31.0/go.mod h1:tKRAlv61yKIjGGHX/4tP1LTbc13YSec1pxVEWXzfoeM=
 golang.org/x/text v0.32.0/go.mod h1:o/rUWzghvpD5TXrTIBuJU77MTaN0ljMWE47kxGJQ7jY=
 golang.org/x/text v0.33.0/go.mod h1:LuMebE6+rBincTi9+xWTY8TztLzKHc/9C1uBCG27+q8=
-golang.org/x/text v0.36.0 h1:JfKh3XmcRPqZPKevfXVpI1wXPTqbkE5f7JA92a55Yxg=
-golang.org/x/text v0.36.0/go.mod h1:NIdBknypM8iqVmPiuco0Dh6P5Jcdk8lJL0CUebqK164=
-golang.org/x/time v0.14.0 h1:MRx4UaLrDotUKUdCIqzPC48t1Y9hANFKIRpNx+Te8PI=
+golang.org/x/text v0.42.0 h1:JbOZXgfeCPU9gacVtYliJqOhD+zhrEqK4LfdpmlUZqI=
+golang.org/x/text v0.42.0/go.mod h1:ojzP1Z+2QtioaF8DTtO8K5q7JWVVYwZKenzujK0Zd0E=
 golang.org/x/time v0.14.0/go.mod h1:eL/Oa2bBBK0TkX57Fyni+NgnyQQN4LitPmob2Hjnqw4=
+golang.org/x/time v0.16.0 h1:vMb6ptszcQMkcwiRTAuNNU50gom6++Q/6gY2hDM6VDE=
+golang.org/x/time v0.16.0/go.mod h1:rVKOqvZeKvrDKTQiAHJ7wmwP0RzleSphoEA9RcdLA0s=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20200505023115-26f46d2f7ef8/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
@@ -420,8 +464,8 @@ golang.org/x/tools v0.38.0/go.mod h1:yEsQ/d/YK8cjh0L6rZlY8tgtlKiBNTL14pGDJPJpYQs
 golang.org/x/tools v0.39.0/go.mod h1:JnefbkDPyD8UU2kI5fuf8ZX4/yUeh9W877ZeBONxUqQ=
 golang.org/x/tools v0.40.0/go.mod h1:Ik/tzLRlbscWpqqMRjyWYDisX8bG13FrdXp3o4Sr9lc=
 golang.org/x/tools v0.41.0/go.mod h1:XSY6eDqxVNiYgezAVqqCeihT4j1U2CCsqvH3WhQpnlg=
-golang.org/x/tools v0.43.0 h1:12BdW9CeB3Z+J/I/wj34VMl8X+fEXBxVR90JeMX5E7s=
-golang.org/x/tools v0.43.0/go.mod h1:uHkMso649BX2cZK6+RpuIPXS3ho2hZo4FVwfoy1vIk0=
+golang.org/x/tools v0.50.0 h1:c2ifzfcuY7L90lZ2aKd8S4K2NpASF08SZx9ZuJkHmSU=
+golang.org/x/tools v0.50.0/go.mod h1:7ulVMw3831Mwi5EZD6RomGyffr4VFjuNYXf2BbCEAV0=
 golang.org/x/tools/go/expect v0.1.0-deprecated/go.mod h1:eihoPOH+FgIqa3FpoTwguz/bVUSGBlGQU67vpBeOrBY=
 golang.org/x/tools/go/expect v0.1.1-deprecated/go.mod h1:eihoPOH+FgIqa3FpoTwguz/bVUSGBlGQU67vpBeOrBY=
 golang.org/x/tools/go/packages/packagestest v0.1.1-deprecated/go.mod h1:RVAQXBGNv1ib0J382/DPCRS/BPnsGebyM1Gj5VSDpG8=
@@ -431,10 +475,10 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gonum.org/v1/gonum v0.17.0 h1:VbpOemQlsSMrYmn7T2OUvQ4dqxQXU+ouZFQsZOx50z4=
 gonum.org/v1/gonum v0.17.0/go.mod h1:El3tOrEuMpv2UdMrbNlKEh9vd86bmQ6vqIcDwxEOc1E=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20260128011058-8636f8732409 h1:H86B94AW+VfJWDqFeEbBPhEtHzJwJfTbgE2lZa54ZAQ=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20260128011058-8636f8732409/go.mod h1:j9x/tPzZkyxcgEFkiKEEGxfvyumM01BEtsW8xzOahRQ=
-google.golang.org/grpc v1.80.0 h1:Xr6m2WmWZLETvUNvIUmeD5OAagMw3FiKmMlTdViWsHM=
-google.golang.org/grpc v1.80.0/go.mod h1:ho/dLnxwi3EDJA4Zghp7k2Ec1+c2jqup0bFkw07bwF4=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20260921155816-b14227669459 h1:b0xCahf3FK2m2Cv0p4vTozGPWncCvLfwV86UNg8xWU8=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20260921155816-b14227669459/go.mod h1:OaIUM3+LpYcK2GXM4FTmhWoIq371Owdr+Cc7/BsYHHc=
+google.golang.org/grpc v1.83.2 h1:EManeRomTObA0BU7I8vXgg/78uE5MJ9M8B39EX2WscU=
+google.golang.org/grpc v1.83.2/go.mod h1:YPI1hK3kDked6iHvgX3tR0y+nX/qpMFKhPgFsokw1S8=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
@@ -445,8 +489,9 @@ google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp0
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
-google.golang.org/protobuf v1.36.12-0.20260120151049-f2248ac996af h1:+5/Sw3GsDNlEmu7TfklWKPdQ0Ykja5VEmq2i817+jbI=
 google.golang.org/protobuf v1.36.12-0.20260120151049-f2248ac996af/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
+google.golang.org/protobuf v1.36.12 h1:pJOKDDOyeXErUroCihFAd5LQuwXBSpVnKGrj5o/fwxc=
+google.golang.org/protobuf v1.36.12/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
@@ -469,7 +514,6 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 k8s.io/api v0.36.0 h1:SgqDhZzHdOtMk40xVSvCXkP9ME0H05hPM3p9AB1kL80=
 k8s.io/api v0.36.0/go.mod h1:m1LVrGPNYax5NBHdO+QuAedXyuzTt4RryI/qnmNvs34=
@@ -499,17 +543,19 @@ k8s.io/mount-utils v0.36.0/go.mod h1:+I47UOG6FiUGVSy7VanjU/mQXLShMo3M7xBpGLzCub8
 k8s.io/streaming v0.36.0/go.mod h1:z6fV3D+NVkoeqRMtWwlUZK6U17SY/LqNzOxWL6GyR/s=
 k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
 k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
-k8s.io/utils v0.0.0-20260210185600-b8788abfbbc2 h1:AZYQSJemyQB5eRxqcPky+/7EdBj0xi3g0ZcxxJ7vbWU=
 k8s.io/utils v0.0.0-20260210185600-b8788abfbbc2/go.mod h1:xDxuJ0whA3d0I4mf/C4ppKHxXynQ+fxnkmQH0vTHnuk=
+k8s.io/utils v0.0.0-20260707023825-cf1189d6abe3 h1:jVkFFVfXdXP74B/zbO3hM3hpSFD0xvhQ5U686DPurkE=
+k8s.io/utils v0.0.0-20260707023825-cf1189d6abe3/go.mod h1:M2s5JB1lIYP3jzZdorPLHXIPJzt9vv2muW5a6L9DtNM=
 kubevirt.io/api v1.2.2 h1:PeA937vsZawmKAsiiDQZJ/BbGH4OhEWsIzWrCNfmYXk=
 kubevirt.io/api v1.2.2/go.mod h1:SbeR9ma4EwnaOZEUkh/lNz0kzYm5LPpEDE30vKXC5Zg=
 kubevirt.io/containerized-data-importer-api v1.59.0 h1:GdDt9BlR0qHejpMaPfASbsG8JWDmBf1s7xZBj5W9qn0=
 kubevirt.io/containerized-data-importer-api v1.59.0/go.mod h1:4yOGtCE7HvgKp7wftZZ3TBvDJ0x9d6N6KaRjRYcUFpE=
-kubevirt.io/controller-lifecycle-operator-sdk/api v0.0.0-20220329064328-f3cc58c6ed90 h1:QMrd0nKP0BGbnxTqakhDZAUhGKxPiPiN5gSDqKUmGGc=
-kubevirt.io/controller-lifecycle-operator-sdk/api v0.0.0-20220329064328-f3cc58c6ed90/go.mod h1:018lASpFYBsYN6XwmA2TIrPCx6e0gviTd/ZNtSitKgc=
+kubevirt.io/controller-lifecycle-operator-sdk/api v0.2.4 h1:fZYvD3/Vnitfkx6IJxjLAk8ugnZQ7CXVYcRfkSKmuZY=
+kubevirt.io/controller-lifecycle-operator-sdk/api v0.2.4/go.mod h1:018lASpFYBsYN6XwmA2TIrPCx6e0gviTd/ZNtSitKgc=
 sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
-sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 h1:IpInykpT6ceI+QxKBbEflcR5EXP7sU1kvOlxwZh5txg=
 sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg=
+sigs.k8s.io/json v0.0.0-20260909141634-11ed52e25bc5 h1:k9jo7ED/fsfOcz3L1P20P5tjTNtsdQNwMOG2aKzHrl8=
+sigs.k8s.io/json v0.0.0-20260909141634-11ed52e25bc5/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg=
 sigs.k8s.io/randfill v0.0.0-20250304075658-069ef1bbf016/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=
 sigs.k8s.io/randfill v1.0.0 h1:JfjMILfT8A6RbawdsK2JXGBR5AQVfd+9TbzrlneTyrU=
 sigs.k8s.io/randfill v1.0.0/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=
diff --git a/packages/apps/kubernetes/images/kubevirt-csi-driver/main.go b/packages/apps/kubernetes/images/kubevirt-csi-driver/main.go
index 1b48bfb42e..fdd370a1bd 100644
--- a/packages/apps/kubernetes/images/kubevirt-csi-driver/main.go
+++ b/packages/apps/kubernetes/images/kubevirt-csi-driver/main.go
@@ -37,6 +37,19 @@ var (
 
 	runNodeService       = flag.Bool("run-node-service", true, "Specifies rather or not to run the node service, the default is true")
 	runControllerService = flag.Bool("run-controller-service", true, "Specifies rather or not to run the controller service, the default is true")
+
+	enableVMIHotplugFallback = flag.Bool("enable-vmi-hotplug-fallback", true, "Specifies whether or not to hot-unplug a volume from a VM-owned VMI when it is not in the VM spec. Requires the KubeVirt HotplugVolumes feature gate; set to false when that gate is off. The default is true")
+
+	kubeAPIQPS   = flag.Float64("kube-api-qps", defaultKubeAPIQPS, "QPS limit for the infra- and tenant-cluster Kubernetes API clients. client-go defaults to 5, which starves the once-per-second infra PVC-bound poll in the NFS ControllerPublishVolume path under a burst of concurrent attaches.")
+	kubeAPIBurst = flag.Int("kube-api-burst", defaultKubeAPIBurst, "Burst limit for the infra- and tenant-cluster Kubernetes API clients (client-go default is 10).")
+)
+
+// Chosen well above the client-go defaults (5 QPS / 10 burst) so a scale-out
+// burst of PVC attaches does not starve the bound poll, while staying well
+// within the infra API server's capacity.
+const (
+	defaultKubeAPIQPS   = 100
+	defaultKubeAPIBurst = 200
 )
 
 func init() {
@@ -65,6 +78,9 @@ func handle() {
 	if volumePrefix == nil || *volumePrefix == "" {
 		klog.Fatal("volume-prefix must be set")
 	}
+	if err := validateRateLimitFlags(*kubeAPIQPS, *kubeAPIBurst); err != nil {
+		klog.Fatal(err)
+	}
 
 	inClusterConfig, err := rest.InClusterConfig()
 	if err != nil {
@@ -89,6 +105,9 @@ func handle() {
 		infraRestConfig = inClusterConfig
 	}
 
+	applyKubeAPIRateLimits(tenantRestConfig, *kubeAPIQPS, *kubeAPIBurst)
+	applyKubeAPIRateLimits(infraRestConfig, *kubeAPIQPS, *kubeAPIBurst)
+
 	tenantClientSet, err := kubernetes.NewForConfig(tenantRestConfig)
 	if err != nil {
 		klog.Fatalf("Failed to build tenant client set: %v", err)
@@ -136,14 +155,6 @@ func handle() {
 	// Create upstream driver (provides Identity, Controller, Node services)
 	upstreamDriver := service.NewKubevirtCSIDriver().
 		WithIdentityService(identityClientset)
-	if *runControllerService {
-		upstreamDriver = upstreamDriver.WithControllerService(
-			virtClient,
-			*infraClusterNamespace,
-			infraClusterLabelsMap,
-			storageClassEnforcement,
-		)
-	}
 	if *runNodeService {
 		upstreamDriver = upstreamDriver.WithNodeService(nodeID)
 	}
@@ -159,15 +170,7 @@ func handle() {
 		if err != nil {
 			klog.Fatalf("Failed to build infra dynamic client: %v", err)
 		}
-		cs = &WrappedControllerService{
-			ControllerService:       upstreamDriver.ControllerService,
-			infraClient:             infraKubernetesClient,
-			dynamicClient:           infraDynamicClient,
-			virtClient:              virtClient,
-			infraNamespace:          *infraClusterNamespace,
-			infraClusterLabels:      infraClusterLabelsMap,
-			storageClassEnforcement: storageClassEnforcement,
-		}
+		cs = newWrappedControllerService(upstreamDriver, virtClient, infraKubernetesClient, infraDynamicClient, infraClusterLabelsMap, storageClassEnforcement)
 	}
 
 	var ns csi.NodeServer
@@ -184,6 +187,60 @@ func handle() {
 	s.Wait()
 }
 
+// newWrappedControllerService reads the controller flags itself, so both the
+// upstream service and the wrapper get them without an in-cluster config.
+func newWrappedControllerService(
+	driver *service.KubevirtCSIDriver,
+	virtClient kubevirt.Client,
+	infraClient kubernetes.Interface,
+	dynamicClient dynamic.Interface,
+	infraClusterLabelsMap map[string]string,
+	storageClassEnforcement util.StorageClassEnforcement,
+) *WrappedControllerService {
+	driver.WithControllerService(
+		virtClient,
+		*infraClusterNamespace,
+		infraClusterLabelsMap,
+		storageClassEnforcement,
+		*enableVMIHotplugFallback,
+	)
+	return &WrappedControllerService{
+		ControllerService:       driver.ControllerService,
+		infraClient:             infraClient,
+		dynamicClient:           dynamicClient,
+		virtClient:              virtClient,
+		infraNamespace:          *infraClusterNamespace,
+		infraClusterLabels:      infraClusterLabelsMap,
+		storageClassEnforcement: storageClassEnforcement,
+	}
+}
+
+// validateRateLimitFlags rejects non-positive limits. client-go treats QPS == 0
+// as "use the 5 QPS default" and QPS < 0 as "no rate limiting at all", so an
+// operator passing 0 expecting "unlimited" would silently get the starving
+// default this fix exists to avoid; refuse both rather than surprise them.
+func validateRateLimitFlags(qps float64, burst int) error {
+	if qps <= 0 {
+		return fmt.Errorf("kube-api-qps must be positive, got %v", qps)
+	}
+	if burst <= 0 {
+		return fmt.Errorf("kube-api-burst must be positive, got %d", burst)
+	}
+	return nil
+}
+
+// applyKubeAPIRateLimits raises a rest.Config's client-side rate limiter above
+// the client-go default of 5 QPS / 10 burst. The NFS-volume ControllerPublishVolume
+// path polls the infra PersistentVolumeClaim once per second for up to two minutes;
+// when a tenant scales out and several volumes attach at once, the default limiter
+// starves and the poll fails with "client rate limiter Wait returned an error:
+// context deadline exceeded", which the tenant kubelet surfaces as
+// FailedAttachVolume.
+func applyKubeAPIRateLimits(cfg *rest.Config, qps float64, burst int) {
+	cfg.QPS = float32(qps)
+	cfg.Burst = burst
+}
+
 func configureStorageClassEnforcement(infraStorageClassEnforcement string) util.StorageClassEnforcement {
 	var storageClassEnforcement util.StorageClassEnforcement
 
@@ -208,9 +265,9 @@ func parseLabels() map[string]string {
 		return infraClusterLabelsMap
 	}
 
-	labelStrings := strings.Split(*infraClusterLabels, ",")
+	labelStrings := strings.SplitSeq(*infraClusterLabels, ",")
 
-	for _, label := range labelStrings {
+	for label := range labelStrings {
 		labelPair := strings.SplitN(label, "=", 2)
 
 		if len(labelPair) != 2 {
diff --git a/packages/apps/kubernetes/images/kubevirt-csi-driver/main_test.go b/packages/apps/kubernetes/images/kubevirt-csi-driver/main_test.go
new file mode 100644
index 0000000000..abbccd9e21
--- /dev/null
+++ b/packages/apps/kubernetes/images/kubevirt-csi-driver/main_test.go
@@ -0,0 +1,109 @@
+package main
+
+import (
+	"context"
+	"testing"
+	"time"
+
+	"k8s.io/client-go/rest"
+	"k8s.io/client-go/util/flowcontrol"
+)
+
+// client-go applies these limits to a rest.Config that leaves QPS/Burst unset.
+// They are what the driver ran with before this fix.
+const (
+	clientGoDefaultQPS   float32 = 5
+	clientGoDefaultBurst int     = 10
+)
+
+// applyKubeAPIRateLimits must raise the client both above the client-go default,
+// otherwise the ControllerPublishVolume PVC-bound poll keeps starving under a
+// burst of concurrent attaches.
+func TestApplyKubeAPIRateLimitsRaisesAboveClientGoDefault(t *testing.T) {
+	cfg := &rest.Config{}
+	applyKubeAPIRateLimits(cfg, defaultKubeAPIQPS, defaultKubeAPIBurst)
+
+	if cfg.QPS <= clientGoDefaultQPS {
+		t.Errorf("QPS = %v, want > %v (client-go default)", cfg.QPS, clientGoDefaultQPS)
+	}
+	if cfg.Burst <= clientGoDefaultBurst {
+		t.Errorf("Burst = %d, want > %d (client-go default)", cfg.Burst, clientGoDefaultBurst)
+	}
+}
+
+// A non-default qps/burst must actually reach the config, so --kube-api-qps and
+// --kube-api-burst are real tuning knobs and not just decoration over the constants.
+func TestApplyKubeAPIRateLimitsPropagatesValues(t *testing.T) {
+	cfg := &rest.Config{}
+	applyKubeAPIRateLimits(cfg, 42, 84)
+
+	if cfg.QPS != 42 {
+		t.Errorf("QPS = %v, want 42", cfg.QPS)
+	}
+	if cfg.Burst != 84 {
+		t.Errorf("Burst = %d, want 84", cfg.Burst)
+	}
+}
+
+// The default flag values must pass validation, and a non-positive value — which
+// client-go would silently turn into the starving default (0) or unlimited
+// (<0) — must be rejected.
+func TestValidateRateLimitFlags(t *testing.T) {
+	if err := validateRateLimitFlags(defaultKubeAPIQPS, defaultKubeAPIBurst); err != nil {
+		t.Errorf("defaults must be valid, got %v", err)
+	}
+
+	cases := []struct {
+		name  string
+		qps   float64
+		burst int
+	}{
+		{"zero qps falls back to the starving default", 0, defaultKubeAPIBurst},
+		{"negative qps disables rate limiting", -1, defaultKubeAPIBurst},
+		{"zero burst", defaultKubeAPIQPS, 0},
+		{"negative burst", defaultKubeAPIQPS, -5},
+	}
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			if err := validateRateLimitFlags(tc.qps, tc.burst); err == nil {
+				t.Errorf("validateRateLimitFlags(%v, %d) = nil, want error", tc.qps, tc.burst)
+			}
+		})
+	}
+}
+
+// Behavioural regression for the FailedAttachVolume flake. The NFS-volume
+// ControllerPublishVolume path polls the infra PVC once per second for up to two
+// minutes; when several volumes attach at once the default 5 QPS / 10 burst limiter starves and Wait returns
+// "context deadline exceeded" — the exact error the tenant kubelet reports as
+// FailedAttachVolume. The limits applyKubeAPIRateLimits sets must admit that burst.
+func TestRateLimitedConfigAdmitsBurstThatDefaultStarves(t *testing.T) {
+	// A burst larger than any refill the deadline can supply: 5 QPS over 500ms
+	// tops up ~2.5 tokens on top of a 10-token bucket, so the default limiter
+	// cannot admit 200 waiters before the deadline, while a bucket sized for the
+	// burst admits them immediately. Both outcomes are deterministic.
+	const burst = 200
+	const deadline = 500 * time.Millisecond
+
+	drain := func(qps float32, b int) error {
+		lim := flowcontrol.NewTokenBucketRateLimiter(qps, b)
+		ctx, cancel := context.WithTimeout(context.Background(), deadline)
+		defer cancel()
+		for range burst {
+			if err := lim.Wait(ctx); err != nil {
+				return err
+			}
+		}
+		return nil
+	}
+
+	if err := drain(clientGoDefaultQPS, clientGoDefaultBurst); err == nil {
+		t.Fatal("default 5 QPS / 10 burst limiter admitted the burst; the test can no longer prove the fix")
+	}
+
+	cfg := &rest.Config{}
+	applyKubeAPIRateLimits(cfg, defaultKubeAPIQPS, defaultKubeAPIBurst)
+	if err := drain(cfg.QPS, cfg.Burst); err != nil {
+		t.Errorf("configured limiter (%v QPS / %d burst) still starved on the attach burst: %v", cfg.QPS, cfg.Burst, err)
+	}
+}
diff --git a/packages/apps/kubernetes/images/kubevirt-csi-driver/node.go b/packages/apps/kubernetes/images/kubevirt-csi-driver/node.go
index a367f27faf..1e6eb10101 100644
--- a/packages/apps/kubernetes/images/kubevirt-csi-driver/node.go
+++ b/packages/apps/kubernetes/images/kubevirt-csi-driver/node.go
@@ -2,9 +2,15 @@ package main
 
 import (
 	"context"
+	"errors"
 	"fmt"
+	"io/fs"
 	"os"
+	"os/exec"
 	"path/filepath"
+	"strings"
+	"sync"
+	"time"
 
 	csi "github.com/container-storage-interface/spec/lib/go/csi"
 	"google.golang.org/grpc/codes"
@@ -21,6 +27,16 @@ var _ csi.NodeServer = &WrappedNodeService{}
 type WrappedNodeService struct {
 	*service.NodeService
 	mounter mount.Interface
+	// Target paths with an NFS publish running. kubelet retries a publish
+	// that outlives its 2m deadline while the first call still runs, and on
+	// a dead server every retry would block the same way: the soft temp mount
+	// gives up only after minutes, and the stat of a target that is already
+	// hard-mounted does not give up at all.
+	publishing sync.Map
+	// Replaced in tests, which cannot get the soft temp mount's EIO locally;
+	// nil means the os function.
+	lstat func(string) (os.FileInfo, error)
+	mkdir func(string, os.FileMode) error
 }
 
 // NodeStageVolume for NFS volumes is a no-op (NFS doesn't need staging).
@@ -49,7 +65,19 @@ func (w *WrappedNodeService) NodePublishVolume(ctx context.Context, req *csi.Nod
 		return nil, status.Errorf(codes.Internal, "failed to parse NFS export: %v", err)
 	}
 
+	lstat, mkdir := w.lstat, w.mkdir
+	if lstat == nil {
+		lstat = os.Lstat
+	}
+	if mkdir == nil {
+		mkdir = os.Mkdir
+	}
+
 	targetPath := req.GetTargetPath()
+	if _, busy := w.publishing.LoadOrStore(targetPath, struct{}{}); busy {
+		return nil, status.Errorf(codes.Aborted, "publish of NFS volume %s at %s already in progress", req.GetVolumeId(), targetPath)
+	}
+	defer w.publishing.Delete(targetPath)
 
 	// Check if already mounted
 	notMnt, err := w.mounter.IsLikelyNotMountPoint(targetPath)
@@ -79,24 +107,43 @@ func (w *WrappedNodeService) NodePublishVolume(ctx context.Context, req *csi.Nod
 	// user files that were written before this fix (backward compatibility).
 	tmpMount, err := os.MkdirTemp("", fmt.Sprintf("nfs-init-%s-", req.GetVolumeId()))
 	if err != nil {
-		return nil, status.Errorf(codes.Internal, "failed to create temp mount dir: %v", err)
+		return nil, status.Errorf(codes.Internal, "failed to create temp mount dir for volume %s: %v", req.GetVolumeId(), err)
 	}
-	defer os.Remove(tmpMount)
 
 	rootSource := fmt.Sprintf("%s:%s", host, path)
-	rootOpts := []string{"nfsvers=4.2", fmt.Sprintf("port=%s", port)}
+	// nosharecache gives the temp mount a superblock of its own: the forced
+	// unmount below kills every RPC in flight on its superblock, which would
+	// otherwise be the one the pods on this node use for the same export.
+	// The price is a cache of its own too: pods already holding /data may not
+	// see the entries the migration moves in until their attribute cache
+	// expires (acdirmax).
+	//
+	// soft lets an RPC fail with EIO instead of blocking forever. That is
+	// safe here because this mount only does metadata work that a retried
+	// publish redoes, and it is why the volume mount below stays hard. Over
+	// NFSv4 a soft RPC fails only once the TCP connection is declared dead,
+	// which takes minutes with the default timeo and retrans. Those are not
+	// lowered: the first mount of a server sets them for the connection that
+	// every later mount of it on this node shares, the pods' hard mounts
+	// included. retry=0 stops mount.nfs from retrying a failed mount for 2m.
+	rootOpts := []string{"nfsvers=4.2", fmt.Sprintf("port=%s", port), "nosharecache", "soft", "retry=0"}
 	if err := w.mounter.Mount(rootSource, tmpMount, "nfs", rootOpts); err != nil {
-		return nil, status.Errorf(codes.Internal, "NFS temp mount failed: %v", err)
+		if rmErr := os.Remove(tmpMount); rmErr != nil {
+			klog.Warningf("Failed to remove temp dir %s: %v", tmpMount, rmErr)
+		}
+		return nil, status.Errorf(codes.Internal, "NFS temp mount for volume %s failed: %v", req.GetVolumeId(), err)
 	}
 	defer func() {
-		if err := w.mounter.Unmount(tmpMount); err != nil {
+		if err := unmountTempMount(w.mounter, tmpMount); err != nil {
 			klog.Warningf("Failed to unmount temp dir %s: %v", tmpMount, err)
 		}
 	}()
 
 	dataDir := filepath.Join(tmpMount, "data")
-	if err := os.MkdirAll(dataDir, 0777); err != nil {
-		return nil, status.Errorf(codes.Internal, "failed to create /data subdir: %v", err)
+	// Not MkdirAll: with the server gone its stat fails on the mount point,
+	// and it then reports the local temp dir as existing instead of the EIO.
+	if err := mkdir(dataDir, 0777); err != nil && !errors.Is(err, fs.ErrExist) {
+		return nil, status.Errorf(codes.Internal, "failed to create /data subdir for volume %s: %v", req.GetVolumeId(), err)
 	}
 
 	// Auto-migrate: move user files from root into /data (skip internal artifacts).
@@ -112,8 +159,14 @@ func (w *WrappedNodeService) NodePublishVolume(ctx context.Context, req *csi.Nod
 		}
 		src := filepath.Join(tmpMount, name)
 		dst := filepath.Join(dataDir, name)
-		if _, err := os.Stat(dst); err == nil {
-			continue // already exists in /data, skip
+		// Lstat: a user's symlink in /data counts as present whatever it
+		// points at, and is not replaced.
+		if _, err := lstat(dst); err == nil {
+			klog.Warningf("Not migrating %s for volume %s: /data/%s already exists, so %s stays in the export root", name, req.GetVolumeId(), name, name)
+			continue
+		} else if !os.IsNotExist(err) {
+			// The rename would replace whatever the failed stat could not see.
+			return nil, status.Errorf(codes.Internal, "failed to check /data/%s for volume %s: %v", name, req.GetVolumeId(), err)
 		}
 		klog.Infof("Migrating %s to /data/%s for volume %s", name, name, req.GetVolumeId())
 		if err := os.Rename(src, dst); err != nil {
@@ -134,6 +187,96 @@ func (w *WrappedNodeService) NodePublishVolume(ctx context.Context, req *csi.Nod
 	return &csi.NodePublishVolumeResponse{}, nil
 }
 
+const (
+	// Well inside the 2m kubelet puts on NodePublishVolume (csiTimeout in
+	// kubernetes pkg/volume/csi/csi_plugin.go).
+	tempUnmountTimeout = 30 * time.Second
+	// How long umount's output pipe may stay open once umount has exited or
+	// been killed; the umount.nfs helper it forked can hold it.
+	umountPipeGrace = time.Second
+)
+
+// unmountTempMount bounds the unmount: a plain umount of an NFS mount whose
+// server is gone blocks forever, which hangs the publish and leaks the mount.
+func unmountTempMount(m mount.Interface, dir string) error {
+	return unmountWithin(m, dir, tempUnmountTimeout)
+}
+
+// unmountWithin gives the whole unmount one deadline. On timeout the unmount
+// keeps running in the background and logs its result when it ends; an umount
+// stuck in uninterruptible sleep cannot be killed, so no deadline on the
+// process itself can be relied on.
+//
+// The dir is removed by the worker once the unmount succeeds, so an unmount
+// that finishes after the deadline still cleans up; removed by the caller it
+// would still be a mount point at that moment. A failed unmount keeps the dir.
+// Plain Remove rather than RemoveAll: if the unmount did not take, the dir's
+// contents are the export's.
+func unmountWithin(m mount.Interface, dir string, budget time.Duration) error {
+	done := make(chan error)
+	abandoned := make(chan struct{})
+	go func() {
+		var err error
+		if _, ok := m.(*mount.Mounter); ok {
+			err = umountForcedAfter(dir, budget/3)
+		} else {
+			err = m.Unmount(dir)
+		}
+		if err == nil {
+			if rmErr := os.Remove(dir); rmErr != nil && !os.IsNotExist(rmErr) {
+				klog.Warningf("Failed to remove temp dir %s: %v", dir, rmErr)
+			}
+		}
+		select {
+		case done <- err:
+		case <-abandoned:
+			if err != nil {
+				klog.Warningf("unmount of %s failed after the deadline: %v", dir, err)
+			} else {
+				klog.Infof("unmount of %s finished after the deadline", dir)
+			}
+		}
+	}()
+	select {
+	case err := <-done:
+		return err
+	case <-time.After(budget):
+		close(abandoned)
+		return fmt.Errorf("unmount of %s still running after %v", dir, budget)
+	}
+}
+
+// umountForcedAfter replaces mount-utils' UnmountWithForce, which retries with
+// -f only once its first umount has returned. That umount forks umount.nfs;
+// killed on the deadline, it leaves the helper stuck on the vanished server
+// holding the output pipe, and CombinedOutput waits for that pipe, so the -f
+// never runs. WaitDelay closes the pipe instead.
+func umountForcedAfter(dir string, timeout time.Duration) error {
+	err := runUmount(timeout, dir)
+	if !errors.Is(err, context.DeadlineExceeded) {
+		return err
+	}
+	klog.V(2).Infof("Timed out waiting for unmount of %s, trying with -f", dir)
+	return runUmount(timeout, "-f", dir)
+}
+
+func runUmount(timeout time.Duration, args ...string) error {
+	ctx, cancel := context.WithTimeout(context.Background(), timeout)
+	defer cancel()
+	cmd := exec.CommandContext(ctx, "umount", args...)
+	cmd.WaitDelay = umountPipeGrace
+	out, err := cmd.CombinedOutput()
+	if ctx.Err() != nil {
+		return fmt.Errorf("umount %s: %w", strings.Join(args, " "), ctx.Err())
+	}
+	// umount2 detaches the mount before it blocks tearing the superblock down,
+	// so the -f after a killed umount can find nothing left to unmount.
+	if err != nil && !strings.Contains(string(out), "not mounted") {
+		return fmt.Errorf("umount %s: %v: %s", strings.Join(args, " "), err, out)
+	}
+	return nil
+}
+
 // NodeExpandVolume for NFS volumes is a no-op (LINSTOR handles NFS resize automatically).
 // This should not normally be called for NFS since ControllerExpandVolume returns
 // NodeExpansionRequired=false, but we handle it gracefully as a safety net.
diff --git a/packages/apps/kubernetes/images/kubevirt-csi-driver/node_test.go b/packages/apps/kubernetes/images/kubevirt-csi-driver/node_test.go
new file mode 100644
index 0000000000..9c932615dc
--- /dev/null
+++ b/packages/apps/kubernetes/images/kubevirt-csi-driver/node_test.go
@@ -0,0 +1,340 @@
+package main
+
+import (
+	"bytes"
+	"context"
+	"os"
+	"path/filepath"
+	"slices"
+	"strings"
+	"sync/atomic"
+	"syscall"
+	"testing"
+
+	csi "github.com/container-storage-interface/spec/lib/go/csi"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
+	"k8s.io/klog/v2"
+	mount "k8s.io/mount-utils"
+)
+
+func TestIsNFSMount(t *testing.T) {
+	m := mount.NewFakeMounter([]mount.MountPoint{
+		{Path: "/pods/nfs3", Type: "nfs"},
+		{Path: "/pods/nfs4", Type: "nfs4"},
+		{Path: "/pods/block", Type: "ext4"},
+	})
+
+	cases := map[string]bool{
+		"/pods/nfs3":    true,
+		"/pods/nfs4":    true,
+		"/pods/block":   false,
+		"/pods/missing": false,
+	}
+	for path, want := range cases {
+		if got := isNFSMount(path, m); got != want {
+			t.Errorf("isNFSMount(%q) = %v, want %v", path, got, want)
+		}
+	}
+}
+
+// The fake mounter mounts nothing, so the /data subdir the publish creates
+// lands in the temp dir itself and its removal fails with ENOTEMPTY.
+func TestNodePublishVolumeNFSLogsTempDirRemovalFailure(t *testing.T) {
+	tmpRoot := t.TempDir()
+	t.Setenv("TMPDIR", tmpRoot)
+
+	var logs bytes.Buffer
+	klog.LogToStderr(false)
+	klog.SetOutput(&logs)
+	t.Cleanup(func() {
+		klog.SetOutput(os.Stderr)
+		klog.LogToStderr(true)
+	})
+
+	w := &WrappedNodeService{mounter: mount.NewFakeMounter(nil)}
+	req := &csi.NodePublishVolumeRequest{
+		VolumeId:       "pvc-1",
+		TargetPath:     filepath.Join(t.TempDir(), "target"),
+		PublishContext: map[string]string{nfsExportKey: "nfs://192.0.2.10:2049/export"},
+	}
+	if _, err := w.NodePublishVolume(context.Background(), req); err != nil {
+		t.Fatalf("NodePublishVolume: %v", err)
+	}
+	klog.Flush()
+
+	leftovers, err := filepath.Glob(filepath.Join(tmpRoot, "nfs-init-pvc-1-*"))
+	if err != nil || len(leftovers) != 1 {
+		t.Fatalf("expected one leftover temp dir, got %v (err %v)", leftovers, err)
+	}
+	for _, line := range strings.Split(logs.String(), "\n") {
+		if strings.HasPrefix(line, "W") && strings.Contains(line, leftovers[0]) {
+			return
+		}
+	}
+	t.Errorf("removal failure of %s was not logged as a warning; log output:\n%s", leftovers[0], logs.String())
+}
+
+func nfsPublishRequest(target string) *csi.NodePublishVolumeRequest {
+	return &csi.NodePublishVolumeRequest{
+		VolumeId:       "pvc-1",
+		TargetPath:     target,
+		PublishContext: map[string]string{nfsExportKey: "nfs://192.0.2.10:2049/export"},
+	}
+}
+
+func hasRetryTuning(opts []string) bool {
+	for _, o := range opts {
+		if o == "soft" || strings.HasPrefix(o, "timeo=") || strings.HasPrefix(o, "retrans=") || strings.HasPrefix(o, "retry=") {
+			return true
+		}
+	}
+	return false
+}
+
+// A soft mount can report a failed write the server did apply, harmless for
+// the metadata-only temp mount and not for the pods' data.
+func TestNodePublishVolumeNFSMountsOnlyTheTempRootSoft(t *testing.T) {
+	t.Setenv("TMPDIR", t.TempDir())
+
+	// The fake drops the options of every mount an unmount leaves in place, so
+	// both sets are read while the temp mount is being unmounted, after the
+	// volume mount.
+	var tempOpts, finalOpts []string
+	m := mount.NewFakeMounter(nil)
+	m.UnmountFunc = func(path string) error {
+		for _, mp := range m.MountPoints {
+			switch {
+			case mp.Path == path:
+				tempOpts = mp.Opts
+			case mp.Device == "192.0.2.10:/export/data":
+				finalOpts = mp.Opts
+			}
+		}
+		return nil
+	}
+	w := &WrappedNodeService{mounter: m}
+	if _, err := w.NodePublishVolume(context.Background(), nfsPublishRequest(filepath.Join(t.TempDir(), "target"))); err != nil {
+		t.Fatalf("NodePublishVolume: %v", err)
+	}
+
+	for _, want := range []string{"soft", "retry=0"} {
+		if !slices.Contains(tempOpts, want) {
+			t.Errorf("temp mount options = %v, want %s", tempOpts, want)
+		}
+	}
+	// The first mount of a server sets the TCP timeouts of the connection the
+	// pods' mounts of it share.
+	for _, o := range tempOpts {
+		if strings.HasPrefix(o, "timeo=") || strings.HasPrefix(o, "retrans=") {
+			t.Errorf("temp mount options = %v, want the default timeo and retrans", tempOpts)
+		}
+	}
+	if finalOpts == nil {
+		t.Fatal("the /data subdir was not mounted before the temp mount was unmounted")
+	}
+	if hasRetryTuning(finalOpts) {
+		t.Errorf("volume mount options = %v, want a hard mount with default retry", finalOpts)
+	}
+}
+
+// stalledMounter holds the first mount it gets until release is closed.
+type stalledMounter struct {
+	*mount.FakeMounter
+	held    atomic.Bool
+	entered chan struct{}
+	release chan struct{}
+}
+
+func (b *stalledMounter) Mount(source, target, fstype string, opts []string) error {
+	if b.held.CompareAndSwap(false, true) {
+		close(b.entered)
+		<-b.release
+	}
+	return b.FakeMounter.Mount(source, target, fstype, opts)
+}
+
+// kubelet retries a publish that outlives its deadline while the first call
+// still runs; on a dead server each retry would block the same way.
+func TestNodePublishVolumeNFSRefusesAPublishAlreadyInProgress(t *testing.T) {
+	t.Setenv("TMPDIR", t.TempDir())
+	m := &stalledMounter{
+		FakeMounter: mount.NewFakeMounter(nil),
+		entered:     make(chan struct{}),
+		release:     make(chan struct{}),
+	}
+	w := &WrappedNodeService{mounter: m}
+	target := filepath.Join(t.TempDir(), "target")
+
+	first := make(chan error, 1)
+	go func() {
+		_, err := w.NodePublishVolume(context.Background(), nfsPublishRequest(target))
+		first <- err
+	}()
+	<-m.entered
+
+	_, err := w.NodePublishVolume(context.Background(), nfsPublishRequest(target))
+	if status.Code(err) != codes.Aborted {
+		t.Errorf("publish while one is in progress: err = %v, want code Aborted", err)
+	}
+	if _, err := w.NodePublishVolume(context.Background(), nfsPublishRequest(filepath.Join(t.TempDir(), "other"))); err != nil {
+		t.Errorf("publish of the same volume at another target: %v", err)
+	}
+
+	close(m.release)
+	if err := <-first; err != nil {
+		t.Fatalf("first publish: %v", err)
+	}
+	if _, err := w.NodePublishVolume(context.Background(), nfsPublishRequest(target)); err != nil {
+		t.Errorf("publish after the first one finished: %v", err)
+	}
+}
+
+func TestNodePublishVolumeNFSReleasesTheTargetAfterAFailedPublish(t *testing.T) {
+	t.Setenv("TMPDIR", t.TempDir())
+	w := &WrappedNodeService{mounter: failingMounter{mount.NewFakeMounter(nil)}}
+	req := nfsPublishRequest(filepath.Join(t.TempDir(), "target"))
+	for i := range 2 {
+		_, err := w.NodePublishVolume(context.Background(), req)
+		if code := status.Code(err); code != codes.Internal {
+			t.Fatalf("publish %d: err = %v, want code Internal from the failed mount", i+1, err)
+		}
+	}
+}
+
+// seedingMounter fills the first mount's target with what seed creates there.
+type seedingMounter struct {
+	*mount.FakeMounter
+	seed func(target string) error
+}
+
+func (s *seedingMounter) Mount(source, target, fstype string, opts []string) error {
+	if seed := s.seed; seed != nil {
+		s.seed = nil
+		if err := seed(target); err != nil {
+			return err
+		}
+	}
+	return s.FakeMounter.Mount(source, target, fstype, opts)
+}
+
+func seedRootAndData(root *string, link string) func(string) error {
+	return func(target string) error {
+		*root = target
+		if err := os.WriteFile(filepath.Join(target, "f"), nil, 0o600); err != nil {
+			return err
+		}
+		if err := os.Mkdir(filepath.Join(target, "data"), 0o750); err != nil {
+			return err
+		}
+		return os.Symlink(link, filepath.Join(target, "data", "f"))
+	}
+}
+
+func assertNotMigrated(t *testing.T, root string) {
+	t.Helper()
+	if _, err := os.Stat(filepath.Join(root, "f")); err != nil {
+		t.Errorf("source was moved: %v", err)
+	}
+	if fi, err := os.Lstat(filepath.Join(root, "data", "f")); err != nil || fi.Mode()&os.ModeSymlink == 0 {
+		t.Errorf("destination was replaced: %v, %v", fi, err)
+	}
+}
+
+// A soft temp mount answers a stat with EIO while the server is unreachable;
+// a rename issued once it is back would replace the file the stat missed.
+func TestNodePublishVolumeNFSDoesNotMigrateOverAnUncheckedDestination(t *testing.T) {
+	t.Setenv("TMPDIR", t.TempDir())
+	var root string
+	w := &WrappedNodeService{
+		mounter: &seedingMounter{FakeMounter: mount.NewFakeMounter(nil), seed: seedRootAndData(&root, "elsewhere")},
+		lstat:   func(string) (os.FileInfo, error) { return nil, syscall.EIO },
+	}
+
+	_, err := w.NodePublishVolume(context.Background(), nfsPublishRequest(filepath.Join(t.TempDir(), "target")))
+	if status.Code(err) != codes.Internal {
+		t.Fatalf("err = %v, want code Internal from the failed stat", err)
+	}
+	assertNotMigrated(t, root)
+}
+
+// The symlinks are the user's: one that loops or dangles is still an entry
+// in /data, neither a reason to fail the publish nor one to replace it.
+func TestNodePublishVolumeNFSLeavesASymlinkInDataAlone(t *testing.T) {
+	for name, link := range map[string]string{"loop": "f", "dangling": "missing"} {
+		t.Run(name, func(t *testing.T) {
+			t.Setenv("TMPDIR", t.TempDir())
+			var root string
+			w := &WrappedNodeService{mounter: &seedingMounter{FakeMounter: mount.NewFakeMounter(nil), seed: seedRootAndData(&root, link)}}
+			if _, err := w.NodePublishVolume(context.Background(), nfsPublishRequest(filepath.Join(t.TempDir(), "target"))); err != nil {
+				t.Fatalf("NodePublishVolume: %v", err)
+			}
+			assertNotMigrated(t, root)
+		})
+	}
+}
+
+// The root entry stays where the pod cannot see it, so the skip has to be
+// findable by an operator.
+func TestNodePublishVolumeNFSWarnsAboutAnEntryLeftInTheRoot(t *testing.T) {
+	t.Setenv("TMPDIR", t.TempDir())
+	var logs bytes.Buffer
+	klog.LogToStderr(false)
+	klog.SetOutput(&logs)
+	t.Cleanup(func() {
+		klog.SetOutput(os.Stderr)
+		klog.LogToStderr(true)
+	})
+	var root string
+	w := &WrappedNodeService{mounter: &seedingMounter{FakeMounter: mount.NewFakeMounter(nil), seed: seedRootAndData(&root, "elsewhere")}}
+	if _, err := w.NodePublishVolume(context.Background(), nfsPublishRequest(filepath.Join(t.TempDir(), "target"))); err != nil {
+		t.Fatalf("NodePublishVolume: %v", err)
+	}
+	klog.Flush()
+	for _, line := range strings.Split(logs.String(), "\n") {
+		if strings.HasPrefix(line, "W") && strings.Contains(line, "volume pvc-1") && strings.Contains(line, "/data/f") {
+			return
+		}
+	}
+	t.Errorf("the skipped migration of f was not logged as a warning; log output:\n%s", logs.String())
+}
+
+func TestNodePublishVolumeNFSTempMountErrorsNameTheVolume(t *testing.T) {
+	cases := map[string]struct {
+		tmpdir func(t *testing.T) string
+		w      *WrappedNodeService
+	}{
+		"temp dir": {
+			tmpdir: func(t *testing.T) string { return filepath.Join(t.TempDir(), "missing") },
+			w:      &WrappedNodeService{mounter: mount.NewFakeMounter(nil)},
+		},
+		"mount": {
+			tmpdir: func(t *testing.T) string { return t.TempDir() },
+			w:      &WrappedNodeService{mounter: failingMounter{mount.NewFakeMounter(nil)}},
+		},
+	}
+	for name, tc := range cases {
+		t.Run(name, func(t *testing.T) {
+			t.Setenv("TMPDIR", tc.tmpdir(t))
+			_, err := tc.w.NodePublishVolume(context.Background(), nfsPublishRequest(filepath.Join(t.TempDir(), "target")))
+			if status.Code(err) != codes.Internal || !strings.Contains(err.Error(), "volume pvc-1") {
+				t.Errorf("err = %v, want code Internal naming volume pvc-1", err)
+			}
+		})
+	}
+}
+
+// On a dead server the stat inside MkdirAll fails on the temp mount point
+// itself, and MkdirAll then reports the local temp dir as already existing
+// instead of the errno the server's absence produced.
+func TestNodePublishVolumeNFSReportsTheDataDirErrno(t *testing.T) {
+	t.Setenv("TMPDIR", t.TempDir())
+	w := &WrappedNodeService{
+		mounter: mount.NewFakeMounter(nil),
+		mkdir:   func(string, os.FileMode) error { return syscall.EIO },
+	}
+	_, err := w.NodePublishVolume(context.Background(), nfsPublishRequest(filepath.Join(t.TempDir(), "target")))
+	if err == nil || !strings.Contains(err.Error(), syscall.EIO.Error()) || !strings.Contains(err.Error(), "volume pvc-1") {
+		t.Errorf("err = %v, want the EIO from mkdir, naming volume pvc-1", err)
+	}
+}
diff --git a/packages/apps/kubernetes/images/kubevirt-csi-driver/node_unmount_test.go b/packages/apps/kubernetes/images/kubevirt-csi-driver/node_unmount_test.go
new file mode 100644
index 0000000000..77c046e56a
--- /dev/null
+++ b/packages/apps/kubernetes/images/kubevirt-csi-driver/node_unmount_test.go
@@ -0,0 +1,338 @@
+package main
+
+import (
+	"bytes"
+	"context"
+	"errors"
+	"os"
+	"path/filepath"
+	"slices"
+	"strings"
+	"sync"
+	"testing"
+	"time"
+
+	csi "github.com/container-storage-interface/spec/lib/go/csi"
+	"k8s.io/klog/v2"
+	mount "k8s.io/mount-utils"
+)
+
+// A path that does not exist, so the fake mounter's symlink resolution keeps
+// it as is and matches it against its mount table.
+const tempMountPath = "/nonexistent/nfs-init-pvc-1-123"
+
+// On Linux mount.New runs umount on a scratch dir to detect how it reports
+// "not mounted", so it is built once, before any test puts a fake umount on
+// PATH.
+var execMounter = mount.New("")
+
+func mountedFake(unmountErr error) *mount.FakeMounter {
+	m := mount.NewFakeMounter([]mount.MountPoint{{Path: tempMountPath, Type: "nfs"}})
+	if unmountErr != nil {
+		m.UnmountFunc = func(string) error { return unmountErr }
+	}
+	return m
+}
+
+// fakeUmount puts an umount on PATH that appends its arguments to the returned
+// log and then runs plainBody for a plain unmount or forceBody for umount -f.
+func fakeUmount(t *testing.T, plainBody string) string {
+	return fakeUmountForce(t, plainBody, "exit 0")
+}
+
+func fakeUmountForce(t *testing.T, plainBody, forceBody string) string {
+	t.Helper()
+	bin := t.TempDir()
+	log := filepath.Join(bin, "calls")
+	script := "#!/bin/sh\necho \"$*\" >> " + log + "\n" +
+		"if [ \"$1\" = \"-f\" ]; then " + forceBody + "; fi\n" + plainBody + "\n"
+	if err := os.WriteFile(filepath.Join(bin, "umount"), []byte(script), 0o755); err != nil {
+		t.Fatal(err)
+	}
+	t.Setenv("PATH", bin+string(os.PathListSeparator)+os.Getenv("PATH"))
+	return log
+}
+
+func umountCalls(t *testing.T, log string) []string {
+	t.Helper()
+	b, err := os.ReadFile(log)
+	if err != nil && !os.IsNotExist(err) {
+		t.Fatal(err)
+	}
+	return strings.FieldsFunc(string(b), func(r rune) bool { return r == '\n' })
+}
+
+func tempDir(t *testing.T) string {
+	t.Helper()
+	dir := filepath.Join(t.TempDir(), "nfs-init-pvc-1-123")
+	if err := os.Mkdir(dir, 0o700); err != nil {
+		t.Fatal(err)
+	}
+	return dir
+}
+
+// main wires mount.New(""); unmountWithin runs its own umount only for that
+// type, so a different one would silently lose the forced retry.
+func TestMountNewIsTheExecMounter(t *testing.T) {
+	if _, ok := execMounter.(*mount.Mounter); !ok {
+		t.Fatal("mount.New(\"\") is not *mount.Mounter")
+	}
+}
+
+func TestUnmountWithinTriesAPlainUmountFirst(t *testing.T) {
+	log := fakeUmount(t, "exit 0")
+	dir := tempDir(t)
+
+	if err := unmountWithin(execMounter, dir, 6*time.Second); err != nil {
+		t.Fatalf("unmountWithin: %v", err)
+	}
+	if calls := umountCalls(t, log); !slices.Equal(calls, []string{dir}) {
+		t.Errorf("umount calls = %v, want just the plain one", calls)
+	}
+	if _, err := os.Stat(dir); !os.IsNotExist(err) {
+		t.Errorf("temp dir still present after a successful unmount: %v", err)
+	}
+}
+
+// The plain umount runs the umount.nfs helper as a child. Against a vanished
+// server the helper never returns from umount2(), and killing umount on the
+// deadline orphans it with the output pipe still open.
+func TestUnmountWithinForcesWhenThePlainUmountHangsWithAnOrphan(t *testing.T) {
+	log := fakeUmount(t, "sleep 30 &\nwait")
+	dir := tempDir(t)
+	budget := 6 * time.Second
+
+	start := time.Now()
+	if err := unmountWithin(execMounter, dir, budget); err != nil {
+		t.Fatalf("unmountWithin: %v", err)
+	}
+	if elapsed := time.Since(start); elapsed >= budget {
+		t.Errorf("unmountWithin took %v, want under its %v budget", elapsed, budget)
+	}
+	if calls := umountCalls(t, log); !slices.Equal(calls, []string{dir, "-f " + dir}) {
+		t.Errorf("umount calls = %v, want the plain one then -f", calls)
+	}
+	if _, err := os.Stat(dir); !os.IsNotExist(err) {
+		t.Errorf("temp dir still present after the forced unmount: %v", err)
+	}
+}
+
+func TestUnmountWithinTakesNotMountedFromTheForcedRetryAsDone(t *testing.T) {
+	fakeUmountForce(t, "sleep 30 &\nwait", "echo \"umount: $2: not mounted.\" >&2; exit 32")
+	dir := tempDir(t)
+
+	if err := unmountWithin(execMounter, dir, 6*time.Second); err != nil {
+		t.Fatalf("unmountWithin: %v", err)
+	}
+	if _, err := os.Stat(dir); !os.IsNotExist(err) {
+		t.Errorf("temp dir still present after the forced retry found it unmounted: %v", err)
+	}
+}
+
+func TestUnmountWithinReportsAFailedForcedRetry(t *testing.T) {
+	log := fakeUmountForce(t, "sleep 30 &\nwait", "echo busy >&2; exit 32")
+	dir := tempDir(t)
+
+	err := unmountWithin(execMounter, dir, 6*time.Second)
+	if err == nil || !strings.Contains(err.Error(), "busy") {
+		t.Fatalf("unmountWithin error = %v, want the umount -f failure with its output", err)
+	}
+	if calls := umountCalls(t, log); !slices.Equal(calls, []string{dir, "-f " + dir}) {
+		t.Errorf("umount calls = %v, want the plain one then -f", calls)
+	}
+	if _, err := os.Stat(dir); err != nil {
+		t.Errorf("temp dir removed although it may still be mounted: %v", err)
+	}
+}
+
+func TestUnmountWithinDoesNotForceAfterAFailedUmount(t *testing.T) {
+	log := fakeUmount(t, "echo busy >&2; exit 32")
+	dir := tempDir(t)
+
+	err := unmountWithin(execMounter, dir, 6*time.Second)
+	if err == nil || !strings.Contains(err.Error(), "busy") {
+		t.Fatalf("unmountWithin error = %v, want the umount failure with its output", err)
+	}
+	if calls := umountCalls(t, log); !slices.Equal(calls, []string{dir}) {
+		t.Errorf("umount calls = %v, want no -f after a failure that was not a timeout", calls)
+	}
+	if _, err := os.Stat(dir); err != nil {
+		t.Errorf("temp dir removed although it may still be mounted: %v", err)
+	}
+}
+
+func TestUnmountTempMountFallsBackToPlainUnmount(t *testing.T) {
+	m := mountedFake(nil)
+	if err := unmountTempMount(m, tempMountPath); err != nil {
+		t.Fatalf("unmountTempMount: %v", err)
+	}
+	if mps, _ := m.List(); len(mps) != 0 {
+		t.Errorf("mount points after unmount = %v, want none", mps)
+	}
+
+	if err := unmountTempMount(mountedFake(errors.New("device busy")), tempMountPath); err == nil {
+		t.Error("unmountTempMount succeeded although Unmount failed")
+	}
+}
+
+// blockingMounter stands for an unmount that does not return on its own, such
+// as an umount stuck in uninterruptible sleep, which no signal ends.
+type blockingMounter struct {
+	*mount.FakeMounter
+	release chan struct{}
+	err     error
+}
+
+func (b *blockingMounter) Unmount(string) error {
+	<-b.release
+	return b.err
+}
+
+func TestUnmountWithinGivesUpOnAStalledUnmount(t *testing.T) {
+	m := &blockingMounter{FakeMounter: mountedFake(nil), release: make(chan struct{})}
+	defer close(m.release)
+
+	done := make(chan error, 1)
+	go func() { done <- unmountWithin(m, tempMountPath, 50*time.Millisecond) }()
+	select {
+	case err := <-done:
+		if err == nil {
+			t.Fatal("unmountWithin reported success for an unmount still running")
+		}
+	case <-time.After(5 * time.Second):
+		t.Fatal("unmountWithin did not return within its budget while the unmount stalled")
+	}
+}
+
+// An unmount that outlives its budget still finishes in the background, and the
+// temp dir can only go once it has: removed any earlier it is still a mount
+// point and the remove fails, and nothing would try again.
+func TestUnmountWithinRemovesTheDirAfterALateUnmount(t *testing.T) {
+	dir := tempDir(t)
+	m := &blockingMounter{FakeMounter: mountedFake(nil), release: make(chan struct{})}
+
+	if err := unmountWithin(m, dir, 50*time.Millisecond); err == nil {
+		t.Fatal("unmountWithin reported success for an unmount still running")
+	}
+	if _, err := os.Stat(dir); err != nil {
+		t.Fatalf("temp dir gone while its unmount was still running: %v", err)
+	}
+
+	close(m.release)
+	waitFor(t, "temp dir removed after the late unmount succeeded", func() bool {
+		_, err := os.Stat(dir)
+		return os.IsNotExist(err)
+	})
+}
+
+type syncBuffer struct {
+	mu  sync.Mutex
+	buf bytes.Buffer
+}
+
+func (s *syncBuffer) Write(p []byte) (int, error) {
+	s.mu.Lock()
+	defer s.mu.Unlock()
+	return s.buf.Write(p)
+}
+
+func (s *syncBuffer) String() string {
+	s.mu.Lock()
+	defer s.mu.Unlock()
+	return s.buf.String()
+}
+
+// The caller has already logged "still running"; without a line from the
+// worker nobody can tell a mount that cleaned up late from one that leaked.
+func TestUnmountWithinLogsALateResult(t *testing.T) {
+	var logs syncBuffer
+	klog.LogToStderr(false)
+	klog.SetOutput(&logs)
+	t.Cleanup(func() {
+		klog.SetOutput(os.Stderr)
+		klog.LogToStderr(true)
+	})
+
+	for _, late := range []error{nil, errors.New("device busy")} {
+		m := &blockingMounter{FakeMounter: mountedFake(nil), release: make(chan struct{}), err: late}
+		if err := unmountWithin(m, tempMountPath, 50*time.Millisecond); err == nil {
+			t.Fatal("unmountWithin reported success for an unmount still running")
+		}
+		close(m.release)
+		want := "unmount of " + tempMountPath + " finished after the deadline"
+		if late != nil {
+			want = "unmount of " + tempMountPath + " failed after the deadline: device busy"
+		}
+		waitFor(t, "log line "+want, func() bool { return strings.Contains(logs.String(), want) })
+	}
+}
+
+func waitFor(t *testing.T, what string, cond func() bool) {
+	t.Helper()
+	deadline := time.Now().Add(5 * time.Second)
+	for !cond() {
+		if time.Now().After(deadline) {
+			t.Fatalf("timed out waiting for: %s", what)
+		}
+		time.Sleep(10 * time.Millisecond)
+	}
+}
+
+func TestNodePublishVolumeNFSMountsTheTempRootWithNosharecache(t *testing.T) {
+	tmpRoot := t.TempDir()
+	t.Setenv("TMPDIR", tmpRoot)
+
+	var tempOpts []string
+	m := mount.NewFakeMounter(nil)
+	m.UnmountFunc = func(path string) error {
+		for _, mp := range m.MountPoints {
+			if mp.Path == path {
+				tempOpts = mp.Opts
+			}
+		}
+		return nil
+	}
+	w := &WrappedNodeService{mounter: m}
+	req := &csi.NodePublishVolumeRequest{
+		VolumeId:       "pvc-1",
+		TargetPath:     filepath.Join(t.TempDir(), "target"),
+		PublishContext: map[string]string{nfsExportKey: "nfs://192.0.2.10:2049/export"},
+	}
+	if _, err := w.NodePublishVolume(context.Background(), req); err != nil {
+		t.Fatalf("NodePublishVolume: %v", err)
+	}
+
+	// umount -f runs nfs_umount_begin on the superblock, killing every RPC in
+	// flight on it. Without nosharecache the temp mount shares that superblock
+	// with the pods' mounts of the same export on this node.
+	if !slices.Contains(tempOpts, "nosharecache") {
+		t.Errorf("temp mount options = %v, want nosharecache so a forced unmount stays on its own superblock", tempOpts)
+	}
+}
+
+type failingMounter struct{ *mount.FakeMounter }
+
+func (failingMounter) Mount(string, string, string, []string) error {
+	return errors.New("connection refused")
+}
+
+// The dir is removed only after a successful unmount, so the path that never
+// mounts has to remove it on its own. The mounted path cannot be checked the same
+// way: the fake mounts nothing, so /data lands in the temp dir itself and a
+// plain remove, deliberately not RemoveAll, leaves it.
+func TestNodePublishVolumeNFSRemovesTheTempDirWhenTheMountFails(t *testing.T) {
+	tmpRoot := t.TempDir()
+	t.Setenv("TMPDIR", tmpRoot)
+	w := &WrappedNodeService{mounter: failingMounter{mount.NewFakeMounter(nil)}}
+	req := &csi.NodePublishVolumeRequest{
+		VolumeId:       "pvc-1",
+		TargetPath:     filepath.Join(t.TempDir(), "target"),
+		PublishContext: map[string]string{nfsExportKey: "nfs://192.0.2.10:2049/export"},
+	}
+	if _, err := w.NodePublishVolume(context.Background(), req); err == nil {
+		t.Fatal("NodePublishVolume succeeded although the temp mount failed")
+	}
+	if left, _ := filepath.Glob(filepath.Join(tmpRoot, "nfs-init-*")); len(left) != 0 {
+		t.Errorf("temp dirs left behind: %v", left)
+	}
+}
diff --git a/packages/apps/kubernetes/images/talos-csr-signer.tag b/packages/apps/kubernetes/images/talos-csr-signer.tag
new file mode 100644
index 0000000000..48d18c892d
--- /dev/null
+++ b/packages/apps/kubernetes/images/talos-csr-signer.tag
@@ -0,0 +1 @@
+ghcr.io/cozystack/cozystack/talos-csr-signer:v1.6.0@sha256:85b41e16e5e40398b1272fe0a69de72e205532c8034d0e6a9fc4a1d510f17818
diff --git a/packages/apps/kubernetes/images/talos-csr-signer/Dockerfile b/packages/apps/kubernetes/images/talos-csr-signer/Dockerfile
new file mode 100644
index 0000000000..d06702d51a
--- /dev/null
+++ b/packages/apps/kubernetes/images/talos-csr-signer/Dockerfile
@@ -0,0 +1,36 @@
+# Builds clastix/talos-csr-signer from upstream source at a pinned commit.
+# The upstream project does not publish semver releases yet (only a rolling
+# `:latest` tag on ghcr.io/clastix/talos-csr-signer), so we mirror it into
+# ghcr.io/cozystack/cozystack/talos-csr-signer:<chart-version> with a digest
+# pin. The image tag is the kubernetes chart version (KUBERNETES_PKG_TAG /
+# IMAGE_TAG in the Makefile), not the source commit — the commit is
+# fingerprinted indirectly via the resulting image digest, which the
+# Makefile writes into images/talos-csr-signer.tag.
+#
+# To bump the upstream version, update COMMIT below to the desired master
+# SHA and rerun `make image-talos-csr-signer` in packages/apps/kubernetes;
+# the regenerated images/talos-csr-signer.tag must be committed alongside.
+FROM --platform=$BUILDPLATFORM golang:1.27@sha256:3680233e3204827fbdc66088528ae6d4b3d034f51d03a99d454f6de034888244 AS builder
+ARG GOPROXY
+
+# Upstream is at clastix/talos-csr-signer. Pin to a master SHA so rebuilds
+# are reproducible; the resulting image digest is what CI fingerprints
+# (via images/talos-csr-signer.json), not the upstream commit directly.
+ARG COMMIT=3b434408954012ee5cc7fe3736166f9b02b58871
+ARG TARGETOS
+ARG TARGETARCH
+
+WORKDIR /workspace
+
+RUN curl -sSL "https://github.com/clastix/talos-csr-signer/archive/${COMMIT}.tar.gz" \
+    | tar -xzf - --strip=1
+
+RUN CGO_ENABLED=0 GOOS=$TARGETOS GOARCH=$TARGETARCH \
+    go build -ldflags="-w -s" -o talos-csr-signer .
+
+FROM gcr.io/distroless/static:nonroot@sha256:e2e927ec666bae08560abb3c55d0659eceabb657f56b6782ab500a9fc7f555e3
+WORKDIR /
+COPY --from=builder /workspace/talos-csr-signer /talos-csr-signer
+USER 65532:65532
+
+ENTRYPOINT ["/talos-csr-signer"]
diff --git a/packages/apps/kubernetes/images/ubuntu-container-disk-v1.30.tag b/packages/apps/kubernetes/images/ubuntu-container-disk-v1.30.tag
deleted file mode 100644
index f49fffe66b..0000000000
--- a/packages/apps/kubernetes/images/ubuntu-container-disk-v1.30.tag
+++ /dev/null
@@ -1 +0,0 @@
-ghcr.io/cozystack/cozystack/ubuntu-container-disk:v1.30@sha256:f460ed1fd5a721aed423e6c3b8be0105d7f693cd86ad992d9c15fd4b27e58cec
diff --git a/packages/apps/kubernetes/images/ubuntu-container-disk-v1.31.tag b/packages/apps/kubernetes/images/ubuntu-container-disk-v1.31.tag
deleted file mode 100644
index b5bdc79a17..0000000000
--- a/packages/apps/kubernetes/images/ubuntu-container-disk-v1.31.tag
+++ /dev/null
@@ -1 +0,0 @@
-ghcr.io/cozystack/cozystack/ubuntu-container-disk:v1.31@sha256:aaa2dfa8ee53ae26295f44d2491330f51412457bbe4aa6ba256297cc0bd8a0da
diff --git a/packages/apps/kubernetes/images/ubuntu-container-disk-v1.32.tag b/packages/apps/kubernetes/images/ubuntu-container-disk-v1.32.tag
deleted file mode 100644
index ca28564491..0000000000
--- a/packages/apps/kubernetes/images/ubuntu-container-disk-v1.32.tag
+++ /dev/null
@@ -1 +0,0 @@
-ghcr.io/cozystack/cozystack/ubuntu-container-disk:v1.32@sha256:7acb4728ef6b9c0ff3344bf486bb00f2a083f2098452344a362242235013db01
diff --git a/packages/apps/kubernetes/images/ubuntu-container-disk-v1.33.tag b/packages/apps/kubernetes/images/ubuntu-container-disk-v1.33.tag
deleted file mode 100644
index bb58690af8..0000000000
--- a/packages/apps/kubernetes/images/ubuntu-container-disk-v1.33.tag
+++ /dev/null
@@ -1 +0,0 @@
-ghcr.io/cozystack/cozystack/ubuntu-container-disk:v1.33@sha256:a2024339ab9edb980a96b43ad2744b7aa31afaef0983ddbc6a546068b4cfa87a
diff --git a/packages/apps/kubernetes/images/ubuntu-container-disk-v1.34.tag b/packages/apps/kubernetes/images/ubuntu-container-disk-v1.34.tag
deleted file mode 100644
index 36eed7a767..0000000000
--- a/packages/apps/kubernetes/images/ubuntu-container-disk-v1.34.tag
+++ /dev/null
@@ -1 +0,0 @@
-ghcr.io/cozystack/cozystack/ubuntu-container-disk:v1.34@sha256:97bcf946a5687889c6a421d14e5adece11f0978151b2165dc87b28f77f7607db
diff --git a/packages/apps/kubernetes/images/ubuntu-container-disk-v1.35.tag b/packages/apps/kubernetes/images/ubuntu-container-disk-v1.35.tag
deleted file mode 100644
index faae83d229..0000000000
--- a/packages/apps/kubernetes/images/ubuntu-container-disk-v1.35.tag
+++ /dev/null
@@ -1 +0,0 @@
-ghcr.io/cozystack/cozystack/ubuntu-container-disk:v1.35@sha256:364c6d454891f1eb1a598fddb69cf328a14dbc451a8ac65812b038a7756da60a
diff --git a/packages/apps/kubernetes/images/ubuntu-container-disk/Dockerfile b/packages/apps/kubernetes/images/ubuntu-container-disk/Dockerfile
deleted file mode 100644
index f5a7d54d60..0000000000
--- a/packages/apps/kubernetes/images/ubuntu-container-disk/Dockerfile
+++ /dev/null
@@ -1,60 +0,0 @@
-# TODO: Here we use ubuntu:22.04, as guestfish has some network issues running in ubuntu:24.04
-FROM ubuntu:22.04 AS guestfish
-
-ARG DEBIAN_FRONTEND=noninteractive
-RUN apt-get update \
- && apt-get -y install \
-     libguestfs-tools \
-     linux-image-generic \
-     wget \
-     make \
-     bash-completion
-
-WORKDIR /build
-
-FROM guestfish AS builder
-
-ARG TARGETOS
-ARG TARGETARCH
-
-# noble is a code name for the Ubuntu 24.04 LTS release
-RUN wget -O image.img https://cloud-images.ubuntu.com/noble/current/noble-server-cloudimg-${TARGETARCH}.img --show-progress --output-file /dev/stdout --progress=dot:giga 2>/dev/null
-
-ARG KUBERNETES_VERSION
-
-RUN qemu-img resize image.img 5G \
- && eval "$(guestfish --listen --network)" \
- && guestfish --remote add-drive image.img \
- && guestfish --remote run \
- && guestfish --remote mount /dev/sda1 / \
- && guestfish --remote command "growpart /dev/sda 1 --verbose" \
- && guestfish --remote command "resize2fs /dev/sda1" \
-# docker repo
- && guestfish --remote sh "curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg" \
- && guestfish --remote sh 'echo "deb [signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list' \
-# kubernetes repo
- && guestfish --remote sh "curl -fsSL https://pkgs.k8s.io/core:/stable:/${KUBERNETES_VERSION}/deb/Release.key | gpg --dearmor -o /etc/apt/keyrings/kubernetes-apt-keyring.gpg" \
- && guestfish --remote sh "echo 'deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://pkgs.k8s.io/core:/stable:/${KUBERNETES_VERSION}/deb/ /' | tee /etc/apt/sources.list.d/kubernetes.list" \
- && guestfish --remote command "apt-get check -q" \
-# install containerd
- && guestfish --remote command "apt-get update -q" \
- && guestfish --remote command "apt-get install -yq containerd.io" \
-# configure containerd
- && guestfish --remote command "mkdir -p /etc/containerd" \
- && guestfish --remote sh "containerd config default | tee /etc/containerd/config.toml" \
- && guestfish --remote command "sed -i '/SystemdCgroup/ s/=.*/= true/' /etc/containerd/config.toml" \
- && guestfish --remote command "containerd config dump >/dev/null" \
-# install kubernetes
- && guestfish --remote command "apt-get install -yq kubelet kubeadm" \
-# clean apt cache
- && guestfish --remote sh 'apt-get clean && rm -rf /var/lib/apt/lists/*' \
-# write system configuration
- && guestfish --remote sh 'printf "%s\n" net.bridge.bridge-nf-call-iptables=1 net.bridge.bridge-nf-call-ip6tables=1 net.ipv4.ip_forward=1 net.ipv6.conf.all.forwarding=1 net.ipv6.conf.all.disable_ipv6=0 net.ipv4.tcp_congestion_control=bbr vm.overcommit_memory=1 kernel.panic=10 kernel.panic_on_oops=1 fs.inotify.max_user_instances=8192 fs.inotify.max_user_watches=524288 | tee > /etc/sysctl.d/kubernetes.conf' \
- && guestfish --remote sh 'printf "%s\n" overlay br_netfilter | tee /etc/modules-load.d/kubernetes.conf' \
- && guestfish --remote sh "rm -f /etc/resolv.conf && ln -s ../run/systemd/resolve/stub-resolv.conf /etc/resolv.conf" \
-# umount all and exit
- && guestfish --remote umount-all \
- && guestfish --remote exit
-
-FROM scratch
-COPY --from=builder /build/image.img /disk/image.qcow2
diff --git a/packages/apps/kubernetes/templates/NOTES.txt b/packages/apps/kubernetes/templates/NOTES.txt
index 23e07dab67..138864b17c 100644
--- a/packages/apps/kubernetes/templates/NOTES.txt
+++ b/packages/apps/kubernetes/templates/NOTES.txt
@@ -1,3 +1,49 @@
-To get kubeconfig for this cluster run:
+To get the static admin kubeconfig (break-glass) for this cluster:
 
-kubectl get secret -n {{ .Release.Namespace }} {{ .Release.Name }}-admin-kubeconfig -o go-template='{{`{{ printf "%s\n" (index .data "super-admin.conf" | base64decode) }}`}}'
+  kubectl get secret -n {{ .Release.Namespace }} {{ .Release.Name }}-admin-kubeconfig -o go-template='{{`{{ printf "%s\n" (index .data "super-admin.conf" | base64decode) }}`}}'
+
+{{- if ne .Values.oidc.mode "None" }}
+
+OIDC is enabled for this cluster (spec.oidc.mode={{ .Values.oidc.mode }}).
+{{- if eq .Values.oidc.mode "System" }}
+
+  Per-user kubeconfig wired to `kubectl oidc-login` (one-shot install
+  of the plugin is a prerequisite — `kubectl krew install oidc-login`):
+
+    kubectl get secret -n {{ .Release.Namespace }} {{ .Release.Name }}-oidc-kubeconfig -o jsonpath='{.data.kubeconfig}' | base64 -d > {{ .Release.Name }}.kubeconfig
+    kubectl --kubeconfig {{ .Release.Name }}.kubeconfig get pods --all-namespaces
+
+  The first command writes the OIDC-ready kubeconfig to disk; the
+  second triggers the browser login flow on first use and caches the
+  token locally.
+
+  Per-cluster Keycloak client: {{ include "kubernetes.oidc.clientId" . | trim }}
+  Issuer: {{ include "kubernetes.oidc.systemIssuerURL" . | trim }}
+{{- else if eq .Values.oidc.mode "CustomConfig" }}
+
+  This cluster trusts a tenant-supplied issuer; the platform `cozy`
+  realm is not in the path. Distribute the OIDC kubeconfig out-of-band
+  from your IdP configuration. The static admin kubeconfig above
+  remains as the documented break-glass path.
+{{- end }}
+
+  Listed users carrying cluster-admin or view roles:
+{{- range .Values.oidc.users }}
+    - {{ .email }} ({{ .role }})
+{{- else }}
+    (none — set spec.oidc.users[] to grant access)
+{{- end }}
+{{- end }}
+
+Worker nodes are managed separately as KubernetesNodes resources (one per
+pool), not via spec.nodeGroups on this Kubernetes CR. Create at least one
+pool named {{ .Release.Name | trimPrefix "kubernetes-" }}-<pool> for the
+cluster to have workers.
+{{- if .Values.addons.ingressNginx.enabled }}
+
+The ingress-nginx addon is enabled: its controller only schedules on nodes
+labelled node-role.kubernetes.io/ingress-nginx. Give at least one
+KubernetesNodes pool `roles: [ingress-nginx]`, otherwise the controller has
+nowhere to run and ingress stays unavailable (the chart no longer fails the
+render for this — it is a runtime requirement).
+{{- end }}
diff --git a/packages/apps/kubernetes/templates/_helpers.tpl b/packages/apps/kubernetes/templates/_helpers.tpl
index 40a8ae7ad5..167e6e9056 100644
--- a/packages/apps/kubernetes/templates/_helpers.tpl
+++ b/packages/apps/kubernetes/templates/_helpers.tpl
@@ -50,6 +50,21 @@ app.kubernetes.io/name: {{ include "kubernetes.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}
 
+{{/*
+DNS domain used INSIDE the tenant cluster (kubelet --cluster-domain,
+apiserver --service-cluster-ip-range FQDNs, CoreDNS authoritative zone).
+Pinned to Kamaji's default `networkProfile.clusterDomain` since this chart
+does not currently expose a knob to override it. If that ever becomes
+configurable, plumb the override here and every consumer picks it up.
+
+Distinct from .Values._cluster["cluster-domain"], which is the MANAGEMENT
+cluster domain (e.g. cozy.local) where the Kamaji control plane and
+monitoring stack live.
+*/}}
+{{- define "kubernetes.tenantClusterDomain" -}}
+cluster.local
+{{- end }}
+
 {{/*
 wait-for-kubeconfig init container shared by the control-plane-side
 Deployments (cluster-autoscaler, kccm, kcsi-controller) that mount the
@@ -59,10 +74,10 @@ Kamaji is still bootstrapping; this container polls the mounted path and
 exits only when super-admin.svc appears, which happens after kubelet's
 optional-Secret refresh cycle.
 
-The 10m deadline stays strictly below the 15m HelmRelease
+The 10m deadline stays strictly below the 20m HelmRelease
 Install.Timeout set by cozystack-api for the Kubernetes kind (via the
-release.cozystack.io/helm-install-timeout annotation) so the
-CrashLoopBackOff surfaces before flux remediation fires and uninstalls
+release.cozystack.io/helm-install-timeout annotation on the cozyrds
+entry) so the CrashLoopBackOff surfaces before flux remediation fires and uninstalls
 the Cluster CR.
 
 The default image lives in images/busybox.tag and points directly at
@@ -98,3 +113,197 @@ must exist on the pod and mount at /etc/kubernetes/kubeconfig.
     mountPath: /etc/kubernetes/kubeconfig
     readOnly: true
 {{- end }}
+
+{{/*
+OIDC clientId for the per-cluster Keycloak public client (mode: System).
+
+Namespaced by Release.Namespace so the identifier is globally unique within
+the `cozy` realm — two clusters of the same name in different tenants would
+otherwise collide. The audience binding (KeycloakClientScope) and the
+apiserver's `AuthenticationConfiguration` audience use this same value, so
+both ends of the per-cluster isolation primitive line up by construction.
+
+Truncated to 253 characters because the EDP Keycloak operator stores the
+client as a Kubernetes CR named after the clientId (DNS-1123 subdomain).
+*/}}
+{{- define "kubernetes.oidc.clientId" -}}
+{{- printf "%s-%s" .Release.Namespace .Release.Name | trunc 253 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Name of the per-cluster KeycloakClientScope that carries the audience
+mapper. Same uniqueness considerations as the clientId; suffixed with
+`-audience` so it does not collide with the global `kubernetes-client`
+scope from packages/system/keycloak-configure.
+*/}}
+{{- define "kubernetes.oidc.audienceScopeName" -}}
+{{- printf "%s-%s-audience" .Release.Namespace .Release.Name | trunc 253 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Issuer URL for `mode: System`. Resolves to the platform Keycloak realm
+`cozy`, served at the root host published in the per-namespace bundle by
+cozystack-basics.
+*/}}
+{{- define "kubernetes.oidc.systemIssuerURL" -}}
+{{- printf "https://keycloak.%s/realms/%s" (dig "root-host" "" (.Values._cluster | default dict)) (dig "oidc-realm-name" "cozy" (.Values._cluster | default dict) | toString) }}
+{{- end }}
+
+{{/*
+CEL claimValidationRule body — rejects tokens whose `groups` claim does
+NOT carry at least one of the tenant's four Keycloak groups. The tenant
+chart (packages/apps/tenant) provisions these groups per-tenant in the
+`cozy` realm; the namespace name is the tenant identifier for both root
+and nested tenants (see tenant.name in the tenant chart helpers), so
+`.Release.Namespace` is the correct prefix.
+
+The `has(claims.groups) &&` guard is required — CEL evaluation of
+`claims.groups.exists(...)` on a token missing the claim raises a
+runtime error that surfaces as HTTP 500 from the authenticator rather
+than the intended 401. `has()` short-circuits that path into a plain
+unauthorized outcome with the `message` string in the audit log.
+
+Why enforce membership at the apiserver even though RBAC default-denies
+unmapped identities: `system:authenticated` still leaks the OpenAPI +
+discovery surface (kubectl auth can-i --list, kubectl api-resources,
+`/apis/*` schemata) to every user in the shared `cozy` realm — a
+tenant-alice user could enumerate tenant-bob's cluster's CRDs and
+built-in resource shape. Adding a hard cross-tenant gate here matches
+the design's stated authorization boundary (per-tenant kube-apiserver
+= per-tenant identity domain) rather than relying on downstream
+RBAC-shaped conservatism.
+*/}}
+{{- /*
+`claims.groups` is statically typed `any` in the apiserver's CEL environment
+(claims is map(string, any)), and the `.exists()` comprehension macro rejects a
+range of type `any` — the apiserver fails AuthenticationConfiguration compilation
+at startup and CrashLoops ("expression of type 'any' cannot be range of a
+comprehension (must be list, map, or dynamic)"). Wrap in dyn() so CEL treats the
+range as dynamic; the `has()` guard still short-circuits when groups is absent.
+Verified on a live tenant apiserver (v1.32) — without dyn() the control plane
+never boots.
+*/ -}}
+{{- define "kubernetes.oidc.groupsClaimValidationExpr" -}}
+{{- $ns := .Release.Namespace -}}
+{{- printf "has(claims.groups) && dyn(claims.groups).exists(g, g in [\"%s-view\", \"%s-use\", \"%s-admin\", \"%s-super-admin\"])" $ns $ns $ns $ns -}}
+{{- end }}
+
+{{- /*
+Validates and returns a duration destined for a consumer that does not reject
+a bad value: the cluster-autoscaler parses its annotation with
+time.ParseDuration and silently falls back to its built-in default on a value
+it cannot parse, and the CAPI webhook does not validate unhealthyConditions
+timeouts at all, so a zero or negative one applies and remediates a Machine the
+moment its condition flips. The values schema types these fields as strings and
+stops there, which lets "30" and "-5m" reach the template. The accepted shape
+is narrower than Go's duration grammar on purpose, because that grammar also
+admits a value large enough to overflow the parser -- the silent fallback again
+-- and a fraction small enough to round to zero. The first segment must be
+positive; later segments may be zero, so the canonical rendering of a duration
+("20m0s", "1h0m0s" -- what metav1.Duration serializes to) round-trips. Every
+string this admits parses to a positive duration.
+*/ -}}
+{{- define "kubernetes.positiveDuration" -}}
+{{- $value := toString .value -}}
+{{- if not (regexMatch "^[1-9][0-9]{0,4}[smh]([0-9]{1,5}[smh]){0,2}$" $value) -}}
+{{-   fail (printf "%s must be a whole number of s, m or h (e.g. 30m, 1h30m), got %q" .field $value) -}}
+{{- end -}}
+{{- $value -}}
+{{- end -}}
+
+{{/*
+  The two kube-apiserver flags the tenant control plane owns that have a
+  KamajiControlPlane field it renders them from, keyed to that field.
+  cluster.yaml moves an --flag=value entry for either into the field.
+*/}}
+{{- define "kubernetes.apiServer.movedArgFields" -}}
+{{- dict
+      "--enable-admission-plugins" "controlPlane.apiServer.admissionControllers"
+      "--kubelet-preferred-address-types" "controlPlane.kubelet.preferredAddressTypes"
+    | toJson }}
+{{- end }}
+
+{{/*
+  controlPlane.apiServer.extraArgs as the KamajiControlPlane carries it, as a
+  JSON list: every entry except an --flag=value entry that cluster.yaml moves
+  into its field. Every writer of spec.apiServer.extraArgs reads this.
+*/}}
+{{- define "kubernetes.apiServer.keptExtraArgs" -}}
+{{- $moved := include "kubernetes.apiServer.movedArgFields" . | fromJson }}
+{{- $kept := list }}
+{{- range $arg := .Values.controlPlane.apiServer.extraArgs | default list }}
+{{-   $flag := index (splitList "=" (toString $arg)) 0 }}
+{{-   if not (and (hasKey $moved $flag) (contains "=" (toString $arg))) }}
+{{-     $kept = append $kept $arg }}
+{{-   end }}
+{{- end }}
+{{- toJson $kept }}
+{{- end }}
+{{- /*
+  Nameservers are addresses, so each entry is checked to be one.
+
+  Here the value reaches no shell: this chart writes it into
+  ProxmoxCluster.spec.dnsServers through toYaml. It is checked all the same, so
+  that a hostname or a typo is refused at the same place in both charts rather
+  than accepted here and rejected in the pool chart, where the same list is
+  written into the reconcile Job's unquoted heredoc and has to be an address.
+
+  IPv6 is matched on its character set rather than its full grammar; the
+  apiserver rejects a malformed address anyway.
+*/ -}}
+{{- define "kubernetes.assertDnsServersAreAddresses" -}}
+{{- $v4 := `^((25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])\.){3}(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])$` -}}
+{{- range $i, $e := (default (list) .Values.proxmox.dnsServers) -}}
+{{- $s := $e | toString -}}
+{{- if not (or (regexMatch $v4 $s) (and (contains ":" $s) (regexMatch `^[0-9A-Fa-f:]+$` $s))) -}}
+{{- fail (printf "proxmox.dnsServers[%d] is %q: entries must be IPv4 or IPv6 addresses. Talos takes addresses here, and this list is written into a shell heredoc, so anything else is both invalid for Talos and unsafe to interpolate." $i $s) -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{- /*
+  substrate decides which infrastructure provider this cluster's Cluster object
+  points at, and it is safe to choose only once. Switching it on a live cluster
+  renders no KubevirtCluster, no kccm, no kubevirt-csi controller and no
+  in-tenant -csi HelmRelease — so Flux
+  uninstalls the CSI driver behind every PVC the tenant already has, and the
+  same render adds a ProxmoxCluster and turns the apiserver Service into a
+  LoadBalancer. CAPI does not stop it: its Cluster webhook forbids removing
+  spec.infrastructureRef but admits a change of kind. The `## @immutable` marker
+  on the value is dashboard-only, which is why this reads the live object.
+
+  Inert offline, like the other lookup guards here: with no apiserver the lookup
+  is empty and the render proceeds, so `helm template` and the unit tests are
+  unaffected and a first install has nothing to compare against.
+*/ -}}
+{{- define "kubernetes.assertSubstrateUnchanged" -}}
+{{- $isProxmox := eq (.Values.substrate | default "kubevirt") "proxmox" -}}
+{{- $wantKind := ternary "ProxmoxCluster" "KubevirtCluster" $isProxmox -}}
+{{- $live := lookup "cluster.x-k8s.io/v1beta1" "Cluster" .Release.Namespace .Release.Name -}}
+{{- if $live -}}
+{{- $liveKind := dig "spec" "infrastructureRef" "kind" "" $live -}}
+{{- if and $liveKind (ne $liveKind $wantKind) -}}
+{{- fail (printf "kubernetes: cluster %q already runs on %s and substrate is now %q, which renders a %s. Switching the substrate of a live cluster removes the cloud-controller-manager, the CSI controller and the in-tenant CSI HelmRelease, so Flux uninstalls the driver behind every existing PVC. Create a new cluster on the other substrate and migrate the workloads instead." .Release.Name $liveKind (.Values.substrate | default "kubevirt") $wantKind) -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{- /*
+  A per-cluster owner id for the volumes this tenant's CSI controller creates.
+
+  The driver names every volume vm-<controllerVmID>-pvc-<uuid> and defaults that
+  id to 9999, so on shared storage all tenants' volumes carry one owner: an
+  operator looking at leftovers cannot tell whose they are, and a VM-level ACL
+  cannot separate them. Deriving it from the release name gives each tenant its
+  own, which is what makes both of those possible.
+
+  The range starts at 100000, above the ids Proxmox hands out to real guests in
+  practice and well above the driver's own minimum of 100, and is 800000 wide so
+  two tenants colliding takes a birthday collision rather than a near miss. It
+  is derived, not stored: the same release always produces the same id, and a
+  cluster that is deleted and recreated under the same name adopts its own old
+  volumes rather than orphaning them.
+*/ -}}
+{{- define "kubernetes.proxmoxControllerVmID" -}}
+{{- add 100000 (mod (atoi (adler32sum (printf "%s/%s" .Release.Namespace .Release.Name))) 800000) -}}
+{{- end -}}
diff --git a/packages/apps/kubernetes/templates/_resources.tpl b/packages/apps/kubernetes/templates/_resources.tpl
index fb9407616f..6539c99a13 100644
--- a/packages/apps/kubernetes/templates/_resources.tpl
+++ b/packages/apps/kubernetes/templates/_resources.tpl
@@ -47,16 +47,3 @@ These presets are for basic testing and not meant to be used in production
 {{- printf "ERROR: Preset key '%s' invalid. Allowed values are %s" .type (join "," (keys $presets)) | fail -}}
 {{- end -}}
 {{- end -}}
-
-{{/*
-Convert a CPU quantity string (e.g. "100m", "0.5", "1", "4") to millicores.
-Returns a number string: "100", "500", "1000", "4000".
-*/}}
-{{- define "kubernetes.cpuToMillicores" -}}
-{{-   $str := . | toString -}}
-{{-   if hasSuffix "m" $str -}}
-{{-     trimSuffix "m" $str -}}
-{{-   else -}}
-{{-     mulf ($str | float64) 1000.0 | int | toString -}}
-{{-   end -}}
-{{- end -}}
diff --git a/packages/apps/kubernetes/templates/ccm-proxmox/controller.yaml b/packages/apps/kubernetes/templates/ccm-proxmox/controller.yaml
new file mode 100644
index 0000000000..f90c147a47
--- /dev/null
+++ b/packages/apps/kubernetes/templates/ccm-proxmox/controller.yaml
@@ -0,0 +1,164 @@
+{{- /*
+  The Proxmox cloud-controller-manager, running in the management cluster for
+  the same reason as the CSI controller beside it: it authenticates to the
+  hypervisor, and the tenant is cluster-admin of its own cluster. Its whole job
+  is to write on the tenant's Nodes — clear the
+  node.cloudprovider.kubernetes.io/uninitialized taint the kubelet sets under
+  --cloud-provider=external, set providerID, apply the topology labels the CSI
+  node plugin exits without — and it can do all of that over the tenant's admin
+  kubeconfig from out of cluster. Nothing about it needs to live inside.
+
+  There is no tenant-side RBAC to install: authenticating as the tenant's own
+  admin, there is nothing left to grant.
+*/ -}}
+{{- if eq (.Values.substrate | default "kubevirt") "proxmox" }}
+{{- if .Values._namespace.etcd }}
+{{- if not .Values.proxmox.ccm.credentialsSecretName }}
+{{-   fail "proxmox.ccm.credentialsSecretName is required on the proxmox substrate: without a cloud-controller-manager every worker keeps the uninitialized taint and the cluster schedules nothing" }}
+{{- end }}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ .Release.Name }}-pccm
+  namespace: {{ .Release.Namespace }}
+---
+kind: Deployment
+apiVersion: apps/v1
+metadata:
+  name: {{ .Release.Name }}-pccm
+  labels:
+    app: {{ .Release.Name }}-pccm
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: {{ .Release.Name }}-pccm
+  template:
+    metadata:
+      labels:
+        app: {{ .Release.Name }}-pccm
+        policy.cozystack.io/allow-to-apiserver: "true"
+    spec:
+      enableServiceLinks: false
+      serviceAccountName: {{ .Release.Name }}-pccm
+      priorityClassName: system-cluster-critical
+      {{- /* Deliberately not a blanket `operator: Exists`. That one also matches
+            node.kubernetes.io/unreachable:NoExecute with no tolerationSeconds,
+            which stops admission adding the bounded 300s one, and the Pod then
+            outlives the Node it runs on. The list stays exact for that
+            reason. */}}
+      tolerations:
+        - key: CriticalAddonsOnly
+          operator: Exists
+        - key: node-role.kubernetes.io/control-plane
+          operator: Exists
+          effect: "NoSchedule"
+      initContainers:
+      {{- include "kubernetes.waitForAdminKubeconfig" $ | nindent 6 }}
+      - name: build-cloud-config
+        image: "{{ default (.Files.Get "images/busybox.tag" | trim) .Values.images.waitForKubeconfig }}"
+        command:
+        - sh
+        - -c
+        - |
+          set -eu
+          for k in url token_id token_secret region; do
+            [ -s "/proxmox-credentials/$k" ] || {
+              echo "the credentials Secret has no key '$k'; the cloud-controller-manager needs url, token_id, token_secret and region" >&2
+              exit 1
+            }
+          done
+          umask 077
+          {
+            echo "clusters:"
+            echo "  - url: $(cat /proxmox-credentials/url)"
+            echo "    insecure: {{ .Values.proxmox.insecure }}"
+            echo "    token_id: $(cat /proxmox-credentials/token_id)"
+            echo "    token_secret: $(cat /proxmox-credentials/token_secret)"
+            echo "    region: $(cat /proxmox-credentials/region)"
+            {{- /* capmox, not the default mode. The default resolves a node to
+                  its VM by name and writes providerID as proxmox://<node>/<vmid>;
+                  capmox reads the CAPI Machine and writes proxmox://<SMBIOS UUID>,
+                  which is the form capmox itself puts on the Machine. Leave it
+                  out and the Node and its Machine carry two different providerIDs
+                  for the same VM — measured on a live cluster, where the Node
+                  came up as proxmox://prox-home/119 against the Machine's
+                  proxmox://fc881854-a1f7-4814-831a-b69e286e6e4c. */}}
+            echo "features:"
+            echo "  provider: capmox"
+          } > /cloud-config/config.yaml
+        volumeMounts:
+        - name: proxmox-credentials
+          mountPath: /proxmox-credentials
+          readOnly: true
+        - name: cloud-config
+          mountPath: /cloud-config
+        securityContext:
+          allowPrivilegeEscalation: false
+          capabilities:
+            drop:
+            - ALL
+          readOnlyRootFilesystem: true
+      containers:
+        - name: cloud-controller-manager
+          image: ghcr.io/sergelogvinov/proxmox-cloud-controller-manager:v0.15.0
+          args:
+            - --v=4
+            - --cloud-provider=proxmox
+            - --cloud-config=/etc/proxmox/config.yaml
+            {{- /* cloud-node clears the uninitialized taint and applies the
+                  topology labels; cloud-node-lifecycle removes Nodes whose VM
+                  is gone. The route and service controllers are not wanted:
+                  routing is Cilium's and the hypervisor offers no load
+                  balancer. */}}
+            - --controllers=cloud-node,cloud-node-lifecycle
+            - --leader-elect=false
+            {{- /* Out of cluster, against the tenant. The kubeconfig makes it
+                  the tenant's own admin, which is why no RBAC is installed
+                  there and why --use-service-account-credentials is absent:
+                  that flag asks the manager to mint per-controller tokens from
+                  the cluster it authenticates to. */}}
+            - --kubeconfig=/etc/kubernetes/kubeconfig/super-admin.svc
+            - --authentication-kubeconfig=/etc/kubernetes/kubeconfig/super-admin.svc
+            - --authorization-kubeconfig=/etc/kubernetes/kubeconfig/super-admin.svc
+            - --secure-port=10258
+            - --authorization-always-allow-paths=/healthz,/livez,/readyz,/metrics
+          volumeMounts:
+            - name: cloud-config
+              mountPath: /etc/proxmox
+              readOnly: true
+            - name: kubeconfig
+              mountPath: /etc/kubernetes/kubeconfig
+              readOnly: true
+          livenessProbe:
+            httpGet:
+              path: /healthz
+              port: 10258
+              scheme: HTTPS
+            initialDelaySeconds: 20
+            periodSeconds: 30
+          resources:
+            limits:
+              cpu: 500m
+              memory: 256Mi
+            requests:
+              cpu: 10m
+              memory: 32Mi
+          securityContext:
+            allowPrivilegeEscalation: false
+            capabilities:
+              drop:
+              - ALL
+            readOnlyRootFilesystem: true
+      volumes:
+        - name: cloud-config
+          emptyDir:
+            medium: Memory
+        - name: proxmox-credentials
+          secret:
+            secretName: {{ .Values.proxmox.ccm.credentialsSecretName | quote }}
+        - name: kubeconfig
+          secret:
+            secretName: {{ .Release.Name }}-admin-kubeconfig
+{{- end }}
+{{- end }}
diff --git a/packages/apps/kubernetes/templates/cloud-config.yaml b/packages/apps/kubernetes/templates/cloud-config.yaml
index a4b7f2c95e..553c92ac45 100644
--- a/packages/apps/kubernetes/templates/cloud-config.yaml
+++ b/packages/apps/kubernetes/templates/cloud-config.yaml
@@ -1,3 +1,11 @@
+{{- /* KubeVirt-only: the cloud-controller-manager and the CSI driver here
+      exist to reach the workers' VirtualMachines and their DataVolumes in
+      THIS cluster. On the proxmox substrate the VMs are on an external
+      hypervisor: the CSI node plugin comes from the proxmox-csi package and
+      its controller, with the cloud-controller-manager, runs in this cluster
+      (templates/csi-proxmox/, templates/ccm-proxmox/). Rendering these would
+      leave a controller in the tenant reconciling objects that do not exist. */}}
+{{- if ne (.Values.substrate | default "kubevirt") "proxmox" }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -15,3 +23,4 @@ data:
       apps.cozystack.io/application.kind: Kubernetes
       apps.cozystack.io/application.name: {{ .Release.Name | trimPrefix "kubernetes-" }}
       internal.cozystack.io/tenantresource: "true"
+{{- end }}
diff --git a/packages/apps/kubernetes/templates/cluster-autoscaler/deployment.yaml b/packages/apps/kubernetes/templates/cluster-autoscaler/deployment.yaml
index 298d86dbaf..81cc78619a 100644
--- a/packages/apps/kubernetes/templates/cluster-autoscaler/deployment.yaml
+++ b/packages/apps/kubernetes/templates/cluster-autoscaler/deployment.yaml
@@ -55,7 +55,6 @@ spec:
         - --ignore-mirror-pods-utilization=true
         - --scale-down-unneeded-time=30s
         - --scan-interval=25s
-        - --force-delete-unregistered-nodes=true
         - --kubeconfig=/etc/kubernetes/kubeconfig/super-admin.svc
         - --clusterapi-cloud-config-authoritative
         - --node-group-auto-discovery=clusterapi:namespace={{ .Release.Namespace }},clusterName={{ .Release.Name }}
diff --git a/packages/apps/kubernetes/templates/cluster.yaml b/packages/apps/kubernetes/templates/cluster.yaml
index 6af5e51699..8fbd1ffb25 100644
--- a/packages/apps/kubernetes/templates/cluster.yaml
+++ b/packages/apps/kubernetes/templates/cluster.yaml
@@ -1,4 +1,58 @@
+{{- /*
+  Talos -> Kubernetes support matrix. Each Talos minor release supports a
+  bounded window of Kubernetes minor versions; running a kubelet outside
+  that window produces a silently broken Talos+kubelet combination that
+  HelmRelease cannot detect. Fail the chart render instead, so the operator
+  sees the mismatch in Flux/dashboards before workers roll over.
+
+  Upstream declares the window per Talos *minor* release, and patch releases
+  never move it, so the lookup key is the minor derived from talos.version.
+  Keying on the full patch version would silently disable this guard on every
+  patch bump — exactly the mismatch it exists to catch.
+
+  The matrix only fires for Talos minors it knows about; operators who
+  override talos.version to something outside this list take responsibility
+  for compatibility themselves (extend the dict or upstream a PR).
+  Source: https://docs.siderolabs.com/talos/v1.13/getting-started/support-matrix
+*/}}
+{{- $talosK8sSupportMatrix := dict
+      "v1.13" (list "v1.31" "v1.32" "v1.33" "v1.34" "v1.35" "v1.36")
+}}
+{{- $talosMinor := regexFind "^v[0-9]+\\.[0-9]+" .Values.talos.version }}
+{{- with index $talosK8sSupportMatrix $talosMinor }}
+{{-   if not (has $.Values.version .) }}
+{{-     fail (printf "Kubernetes %s is not supported by Talos %s. Supported versions: %v. Bump tenant 'version' or set talos.version explicitly." $.Values.version $.Values.talos.version .) }}
+{{-   end }}
+{{- end }}
 {{- $etcd := .Values._namespace.etcd }}
+{{- /* Substrate selects the infrastructure half of the cluster. The control
+       plane is Kamaji either way, so this changes exactly one object — the
+       one Cluster.infrastructureRef points at — plus the two tenant addons
+       that only exist because the workers are KubeVirt VMs (the kubevirt-csi
+       driver and the KubeVirt cloud-controller-manager RBAC). */}}
+{{- $substrate := .Values.substrate | default "kubevirt" }}
+{{- if not (has $substrate (list "kubevirt" "proxmox")) }}
+{{- fail (printf "substrate %q is not supported; use \"kubevirt\" or \"proxmox\"" $substrate) }}
+{{- end }}
+{{- $isProxmox := eq $substrate "proxmox" }}
+{{- if $isProxmox }}
+{{- /* capmox assigns static addresses from an InClusterIPPool it builds out of
+       these fields and has no DHCP mode, so an unset pool is not a default —
+       it is a ProxmoxCluster that never reaches Ready and worker Machines that
+       wait on it forever. Refuse at render time instead. */}}
+{{- if not .Values.proxmox.ipv4Config.addresses }}
+{{- fail "substrate proxmox requires proxmox.ipv4Config.addresses: capmox allocates static addresses and has no DHCP mode" }}
+{{- end }}
+{{- if not .Values.proxmox.ipv4Config.gateway }}
+{{- fail "substrate proxmox requires proxmox.ipv4Config.gateway" }}
+{{- end }}
+{{- if not .Values.proxmox.dnsServers }}
+{{- fail "substrate proxmox requires proxmox.dnsServers: the ProxmoxCluster schema makes it mandatory" }}
+{{- end }}
+{{- include "kubernetes.assertDnsServersAreAddresses" . }}
+{{- end }}
+{{- include "kubernetes.assertSubstrateUnchanged" . }}
+{{- $infraKind := ternary "ProxmoxCluster" "KubevirtCluster" $isProxmox }}
 {{- /*
   When $etcd is empty, the parent Tenant application has not populated
   _namespace.etcd in cozystack-values yet - either the operator forgot to
@@ -10,114 +64,26 @@
   flux marks the HelmRelease Ready and retries its 5m reconcile loop until
   the Tenant chart catches up.
 */}}
+{{- /* Worker node pools (KubevirtMachineTemplate, MachineDeployment,
+       MachineHealthCheck, worker WorkloadMonitor) and the Talos
+       reconcile Job that produces each pool's TalosConfigTemplate now
+       live in the separate `kubernetes-nodes` chart (one HelmRelease
+       per pool). This chart renders the control plane only. The
+       reconcile Job in the kubernetes-nodes release still re-patches
+       this KamajiControlPlane's apiserver-Service ClusterIP-SAN and
+       owns each TalosConfigTemplate via an ownerReference to this KCP,
+       so garbage collection on control-plane uninstall is unchanged. */}}
+{{- /*
+  Cluster pod/service CIDRs MUST match between the CAPI Cluster
+  spec.clusterNetwork below and the Talos worker machineconfig's
+  cluster.network — Talos surfaces overlaps against the host pod CIDR
+  as a diagnostic at boot, and divergence between CAPI and Talos would
+  manifest as silently broken kube-proxy / Cilium routing. Keep them
+  in one place here.
+*/}}
+{{- $podCIDR := "10.243.0.0/16" }}
+{{- $serviceCIDR := "10.95.0.0/16" }}
 {{- $ingress := .Values._namespace.ingress }}
-{{- $host := .Values._namespace.host }}
-{{- $kubevirtmachinetemplateNames := list }}
-{{- define "kubevirtmachinetemplate" -}}
-spec:
-  virtualMachineBootstrapCheck:
-    checkStrategy: ssh
-  virtualMachineTemplate:
-    metadata:
-      namespace: {{ $.Release.Namespace }}
-      labels:
-        {{- range .group.roles }}
-        node-role.kubernetes.io/{{ . }}: ""
-        {{- end }}
-    spec:
-      {{- with .group.instanceType }}
-      instancetype:
-        kind: VirtualMachineClusterInstancetype
-        name: {{ . }}
-      {{- end }}
-      runStrategy: Always
-      dataVolumeTemplates:
-      - metadata:
-          name: disk-kubelet
-          annotations:
-            {{/* Populator creates intermediate PVC + PV rebind that causes ClaimMisbound with LINSTOR CSI */}}
-            cdi.kubevirt.io/storage.usePopulator: "false"
-        spec:
-          {{- if hasKey .group "ephemeralStorage" }}
-          {{- fail (printf "nodeGroup %q: ephemeralStorage is no longer supported and should have been automatically migrated to diskSize by platform migration 41. If you see this error after upgrading, the migration did not run — check the cozystack-migration-hook Job logs in cozy-system." .groupName) }}
-          {{- end }}
-          source:
-            blank: {}
-          storage:
-            resources:
-              requests:
-                storage: {{ .group.diskSize | default "20Gi" | quote }}
-            {{- with .group.storageClass }}
-            storageClassName: {{ . | quote }}
-            {{- end }}
-      template:
-        metadata:
-          annotations:
-            kubevirt.io/allow-pod-bridge-network-live-migration: "true"
-          labels:
-            {{- range .group.roles }}
-            node-role.kubernetes.io/{{ . }}: ""
-            {{- end }}
-            cluster.x-k8s.io/deployment-name: {{ $.Release.Name }}-{{ .groupName }}
-        spec:
-          {{- if .Values._cluster.scheduling }}
-          {{- $rawConstraints := get .Values._cluster.scheduling "globalAppTopologySpreadConstraints" }}
-          {{- if $rawConstraints }}
-          {{- $rawConstraints | fromYaml | toYaml | nindent 10 }}
-            labelSelector:
-              matchLabels:
-                cluster.x-k8s.io/cluster-name: {{ $.Release.Name }}
-          {{- end }}
-          {{- end }}
-          domain:
-            {{- if and .group.resources .group.resources.cpu }}
-            cpu:
-              threads: 1
-              cores: {{ .group.resources.cpu }}
-              sockets: 1
-            {{- end }}
-            devices:
-              {{- if .group.gpus }}
-              gpus:
-              {{- range $i, $gpu := .group.gpus }}
-              - name: gpu{{ add $i 1 }}
-                deviceName: {{ $gpu.name }}
-              {{- end }}
-              {{- end }}
-              disks:
-              - name: system
-                disk:
-                  bus: virtio
-                  pciAddress: 0000:07:00.0
-              - name: disk-kubelet
-                disk:
-                  bus: virtio
-                  pciAddress: 0000:08:00.0
-                blockSize:
-                  matchVolume:
-                    enabled: true
-              interfaces:
-              - name: default
-                bridge: {}
-            {{- if and .group.resources .group.resources.memory }}
-            memory:
-              guest: {{ .group.resources.memory }}
-            {{- end }}
-            resources:
-              {{/* 2Gi is enough: persistent DataVolumes are not counted as pod ephemeral storage */}}
-              {{- include "cozy-lib.resources.sanitize" (list (dict "ephemeral-storage" "2Gi") $) | nindent 14 }}
-          evictionStrategy: External
-          volumes:
-          - name: system
-            containerDisk:
-              image: "{{ $.Files.Get (printf "images/ubuntu-container-disk-%s.tag" $.Values.version) | trim }}"
-          - name: disk-kubelet
-            dataVolume:
-              name: disk-kubelet
-          networks:
-          - name: default
-            pod: {}
-{{- end }}
 {{- if not $etcd }}
 ---
 apiVersion: v1
@@ -138,6 +104,181 @@ data:
     to reconcile - this HelmRelease will pick up the DataStore on its next
     5m reconcile loop and provision the cluster.
 {{- else }}
+{{- /* Phase 2 worker-pool adoption guard. Worker pools now live in per-pool
+       kubernetes-nodes releases; the platform migration adopts each pre-split
+       pool's live objects onto its child release (re-annotating
+       meta.helm.sh/release-name, pinning helm.sh/resource-policy=keep) as a
+       pre-upgrade hook, BEFORE this control-plane-only chart reconciles. If
+       that migration never processed a pool (its version slot was already
+       stamped, or it was renumbered out on a merge/backport), a live worker
+       MachineDeployment for this cluster is NOT owned by its kubernetes-nodes
+       child release AND carries no keep pin, and Helm's control-plane-only
+       re-render would prune it and cascade-delete the tenant's worker VMs.
+       Refuse to render instead: the upgrade blocks with a legible reason and
+       the workers keep running on the prior release until the migration runs.
+
+       Exempt pools carrying helm.sh/resource-policy=keep. The migration pins
+       keep on every pool it touches: on the ones it fully adopts (release-name
+       rewritten to the child) and, deliberately, on the ones it cannot adopt
+       but must keep prune-proof (documented skip branches: non-object
+       nodeGroups, invalid rfc-1123 child name, child name over 53 chars,
+       non-object group value). Those skipped pools keep the parent release-name
+       by design, so keep is the migration's "processed, made prune-proof"
+       signature. A pinned MachineDeployment is already safe from Helm prune, so
+       flagging it here would convert that documented degraded-but-running state
+       into a permanent upgrade deadlock. The exemption keys on OWNERSHIP BY THE
+       CHILD RELEASE (release-name starts with kubernetes-nodes-<cluster>-), not
+       on "owned by this parent release": Helm's prune gates on resource-policy
+       alone and never consults the live release-name (see migration 56's
+       foreign-owner branch), so a same-cluster unpinned MD whose release-name is
+       empty or foreign (Helm annotations stripped out-of-band, or a DR restore
+       of the CAPI objects) is ALSO in the parent's prune set and ALSO lost.
+       Firing on "not child-owned AND unpinned" catches those alongside the
+       parent-owned case; only a pool already adopted or natively created by its
+       child release (child release-name) is exempt.
+
+       Fail-closed like system/seaweedfs naming-guard: the release Namespace is
+       a canary that always exists for a live install/upgrade, so an empty
+       canary means a client-side render (helm template / unittest / CI lint,
+       where lookup returns nil) that never prunes live objects: skip there.
+       Discriminate on the adoption annotation, never on mere existence: the
+       MachineDeployment always exists at render time, so an existence-only
+       guard would deadlock the routine upgrade (see helmreleases/ouroboros.yaml).
+
+       Scope: this guard lives in the etcd-present branch (the else of
+       `if not $etcd`), so it does NOT run during the awaiting-etcd window,
+       where the chart renders only the status beacon above. An owned+unpinned
+       MD is therefore not refused in that transient window. This is a
+       pre-existing narrow exposure, not introduced by the split (the pre-split
+       chart also rendered pools only in this same else branch), and it closes
+       as soon as etcd resolves and a real control-plane upgrade re-renders. */}}
+{{- if .Release.IsUpgrade }}
+{{-   if lookup "v1" "Namespace" "" .Release.Namespace }}
+{{-     $unadopted := list }}
+{{-     $childPrefix := printf "kubernetes-nodes-%s-" (trimPrefix "kubernetes-" $.Release.Name) }}
+{{-     range $md := (lookup "cluster.x-k8s.io/v1beta1" "MachineDeployment" $.Release.Namespace "").items }}
+{{-       if and (eq (dig "spec" "clusterName" "" $md) $.Release.Name) (not (hasPrefix $childPrefix (dig "metadata" "annotations" "meta.helm.sh/release-name" "" $md))) (ne (dig "metadata" "annotations" "helm.sh/resource-policy" "" $md) "keep") }}
+{{-         $unadopted = append $unadopted (dig "metadata" "name" "" $md) }}
+{{-       end }}
+{{-     end }}
+{{-     if $unadopted }}
+{{-       fail (printf "kubernetes: refusing to render cluster %q control-plane-only: worker MachineDeployment(s) %v are not owned by their kubernetes-nodes child release and are not pinned with helm.sh/resource-policy=keep, so the Phase 2 worker-pool adoption migration never processed them. Helm prunes on resource-policy alone (not on the live release-name), so rendering now would let Helm prune them and delete the tenant's worker VMs. Recover by one of two paths depending on why the migration missed this pool: if the worker-adoption migration has not run yet, re-run the platform upgrade; if it already ran and stamped (its version slot was renumbered out on a backport, or this parent HelmRelease predates the apps.cozystack.io/application.kind=Kubernetes label the migration selects on and was skipped), then manually annotate helm.sh/resource-policy=keep on those MachineDeployment(s) so this render stops pruning them, and stamp the cozystack-version ConfigMap in cozy-system back below the worker-adoption migration version so it re-runs and adopts them on the next upgrade. A pool the migration deliberately left pinned-but-unadopted already carries helm.sh/resource-policy=keep and is intentionally exempt from this guard." $.Release.Name $unadopted) }}
+{{-     end }}
+{{-   end }}
+{{- end }}
+{{- /* Validate user-supplied apiServer.extraVolumes / extraVolumeMounts before
+       they are wired into the control-plane Deployment and apiserver container.
+
+       The KamajiControlPlane -> TenantControlPlane Deployment runs on the
+       MANAGEMENT cluster (in the tenant namespace), so volumes declared here
+       land on a management-cluster pod. To preserve tenant<->management
+       isolation we deny by default and allow only the ConfigMap/Secret sources
+       that satisfy the intended use case (mounting an AuthenticationConfiguration
+       file). Host-reaching sources (hostPath, csi, nfs, persistentVolumeClaim)
+       and token-projection sources (projected) are rejected — a tenant with
+       self-service access to the Kubernetes CR must not be able to mount
+       management-node paths or project arbitrary service-account tokens into
+       the apiserver pod.
+
+       Names must be unique and non-empty: the chart injects two reserved
+       volumes (talos-ca, talos-tls-cert), and a duplicate or empty volume name
+       would render an invalid podspec the apiserver rejects with an opaque,
+       apply-time error invisible to GitOps. Mounts may only reference a volume
+       the user declared in extraVolumes — the chart-managed talos secret
+       volumes are deliberately not mountable. */}}
+{{- $allowedVolumeSources := list "configMap" "secret" }}
+{{- $reservedVolumeNames := list "talos-ca" "talos-tls-cert" }}
+{{- $userVolumeNames := list }}
+{{- range $i, $vol := .Values.controlPlane.apiServer.extraVolumes }}
+{{-   $volName := $vol.name | default "" | toString }}
+{{-   if eq $volName "" }}
+{{-     fail (printf "controlPlane.apiServer.extraVolumes[%d]: every volume must set a non-empty name" $i) }}
+{{-   end }}
+{{-   if has $volName $reservedVolumeNames }}
+{{-     fail (printf "controlPlane.apiServer.extraVolumes: volume name %q is reserved by the chart for the talos control-plane secrets — rename your volume to avoid a duplicate volume name in the control-plane Deployment" $volName) }}
+{{-   end }}
+{{-   if has $volName $userVolumeNames }}
+{{-     fail (printf "controlPlane.apiServer.extraVolumes: duplicate volume name %q — each extra volume must have a unique name" $volName) }}
+{{-   end }}
+{{-   $userVolumeNames = append $userVolumeNames $volName }}
+{{-   $sources := without (keys $vol) "name" | sortAlpha }}
+{{-   if ne (len $sources) 1 }}
+{{-     fail (printf "controlPlane.apiServer.extraVolumes: volume %q must declare exactly one volume source, got %d (%v)" $volName (len $sources) $sources) }}
+{{-   end }}
+{{-   range $source := $sources }}
+{{-     if not (has $source $allowedVolumeSources) }}
+{{-       fail (printf "controlPlane.apiServer.extraVolumes: volume %q uses a %q source, which is not permitted on a management-cluster control-plane pod — only configMap and secret sources are allowed" $volName $source) }}
+{{-     end }}
+{{-   end }}
+{{- end }}
+{{- range $i, $mount := .Values.controlPlane.apiServer.extraVolumeMounts }}
+{{-   $mountName := $mount.name | default "" | toString }}
+{{-   if eq $mountName "" }}
+{{-     fail (printf "controlPlane.apiServer.extraVolumeMounts[%d]: every mount must set a non-empty name" $i) }}
+{{-   end }}
+{{-   if not (has $mountName $userVolumeNames) }}
+{{-     fail (printf "controlPlane.apiServer.extraVolumeMounts: mount %q references no volume declared in controlPlane.apiServer.extraVolumes — the chart-managed talos volumes cannot be mounted" $mountName) }}
+{{-   end }}
+{{- end }}
+{{- /*
+  Mirrors the `managed` map of buildKubeAPIServerCommand in Kamaji's
+  internal/builders/controlplane/deployment.go (lines 726-774 at 26.9.4-edge,
+  the tag packages/system/kamaji builds), narrowed to what this chart renders:
+  an etcd DataStore, konnectivity on, no dataStoreOverrides. Kamaji cuts each
+  entry at the first "=" and drops it when the name is in that map, so the
+  bare two-entry spelling loses its flag and leaves the value behind as a
+  positional argument the apiserver refuses. Re-derive this list on every
+  Kamaji bump; the extraArgs description in values.yaml names the same flags.
+*/}}
+{{- $kamajiManagedArgs := list
+      "--advertise-address" "--client-ca-file" "--enable-admission-plugins"
+      "--service-cluster-ip-range" "--kubelet-client-certificate"
+      "--kubelet-client-key" "--kubelet-preferred-address-types"
+      "--proxy-client-cert-file" "--proxy-client-key-file"
+      "--requestheader-allowed-names" "--requestheader-client-ca-file"
+      "--secure-port" "--service-account-key-file"
+      "--service-account-signing-key-file" "--tls-cert-file"
+      "--tls-private-key-file" "--etcd-servers" "--etcd-cafile"
+      "--etcd-certfile" "--etcd-keyfile" "--etcd-prefix"
+      "--etcd-compaction-interval" "--egress-selector-config-file" }}
+{{- /*
+  Two of those flags have a field on the KamajiControlPlane that the control
+  plane renders them from, so an --flag=value entry is moved into that field
+  instead of refused, on every render: the entry stays in the values and
+  nothing rewrites it. The last entry wins, as it did while the control plane
+  kept one entry per flag name. The moved entry is left out of the rendered
+  extraArgs, so the list below is the one the apiserver receives.
+*/}}
+{{- $movedArgFields := include "kubernetes.apiServer.movedArgFields" . | fromJson }}
+{{- $admissionControllers := .Values.controlPlane.apiServer.admissionControllers | default list }}
+{{- $preferredAddressTypes := get (.Values.controlPlane.kubelet | default dict) "preferredAddressTypes" | default list }}
+{{- $movedArgs := dict }}
+{{- $keptExtraArgs := include "kubernetes.apiServer.keptExtraArgs" . | fromJsonArray }}
+{{- range $arg := .Values.controlPlane.apiServer.extraArgs | default list }}
+{{-   $flag := index (splitList "=" (toString $arg)) 0 }}
+{{-   $field := get $movedArgFields $flag }}
+{{-   if ne $field "" }}
+{{-     if not (contains "=" (toString $arg)) }}
+{{-       fail (printf "controlPlane.apiServer.extraArgs contains %q with its value in a separate entry — the tenant control plane sets %s itself, from %s, and drops the entry naming it, which leaves the value behind as an argument the apiserver refuses. Write it as %s=value so the chart moves it into %s, or set that field instead." $arg $flag $field $flag $field) }}
+{{-     end }}
+{{-     $fieldIsSet := ternary (gt (len $admissionControllers) 0) (gt (len $preferredAddressTypes) 0) (eq $flag "--enable-admission-plugins") }}
+{{-     if $fieldIsSet }}
+{{-       fail (printf "controlPlane.apiServer.extraArgs contains %q while %s is also set — the tenant control plane takes %s only from %s, so the entry cannot apply. Remove the entry, or empty %s to have the chart take the list from it." $arg $field $flag $field $field) }}
+{{-     end }}
+{{-     if contains "\"" (toString $arg) }}
+{{-       fail (printf "controlPlane.apiServer.extraArgs contains %q, whose value is quoted — the apiserver strips the quotes when it reads the list and the chart does not, so it cannot move the names into %s as written. Write the value without quotes." $arg $field) }}
+{{-     end }}
+{{-     $items := uniq (compact (splitList "," (trimPrefix (printf "%s=" $flag) (toString $arg)))) }}
+{{-     if eq (len $items) 0 }}
+{{-       fail (printf "controlPlane.apiServer.extraArgs contains %q, which names nothing — the chart moves this flag into %s and has no list to move. Remove the entry." $arg $field) }}
+{{-     end }}
+{{-     $movedArgs = set $movedArgs $flag $items }}
+{{-   else if has $flag $kamajiManagedArgs }}
+{{-     fail (printf "controlPlane.apiServer.extraArgs contains %q — the tenant control plane sets %s itself and drops every entry naming it before the kube-apiserver sees the list, so this entry has no effect, and written without =value it leaves its value behind as an argument the apiserver refuses. Remove the entry; the description of controlPlane.apiServer.extraArgs lists every flag the control plane owns." $arg $flag) }}
+{{-   end }}
+{{- end }}
+{{- $admissionControllers = $admissionControllers | default (get $movedArgs "--enable-admission-plugins") }}
+{{- $preferredAddressTypes = $preferredAddressTypes | default (get $movedArgs "--kubelet-preferred-address-types") | default (list "InternalIP" "ExternalIP") }}
 ---
 apiVersion: cluster.x-k8s.io/v1beta1
 kind: Cluster
@@ -148,10 +289,10 @@ spec:
   clusterNetwork:
     pods:
       cidrBlocks:
-      - 10.243.0.0/16
+      - {{ $podCIDR }}
     services:
       cidrBlocks:
-      - 10.95.0.0/16
+      - {{ $serviceCIDR }}
   controlPlaneRef:
     namespace: {{ .Release.Namespace }}
     apiVersion: controlplane.cluster.x-k8s.io/v1alpha1
@@ -159,7 +300,7 @@ spec:
     name: {{ .Release.Name }}
   infrastructureRef:
     apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
-    kind: KubevirtCluster
+    kind: {{ $infraKind }}
     name: {{ .Release.Name }}
     namespace: {{ .Release.Namespace }}
 ---
@@ -172,14 +313,439 @@ metadata:
     cluster.x-k8s.io/role: control-plane
   annotations:
     kamaji.clastix.io/kubeconfig-secret-key: "super-admin.svc"
+{{- /*
+  OIDC wiring for `spec.oidc.mode` ≠ None:
+    - Inject `--authentication-config=/etc/kubernetes/authentication-config/config.yaml`
+      into the kube-apiserver extraArgs.
+    - Mount the per-release Secret carrying the structured
+      AuthenticationConfiguration at that path.
+    - Add the Secret as an extraVolume on the KCP Deployment.
+
+  The OIDC-managed flag and volume are kept ORTHOGONAL to the
+  user-supplied controlPlane.apiServer.extraArgs / extraVolumes /
+  extraVolumeMounts knobs — the user fields are preserved verbatim
+  and the OIDC additions are appended. The OIDC mount name
+  `authentication-config` is reserved by the chart; a user-supplied
+  volume reusing it would conflict in the rendered podSpec.
+
+  For mode=CustomConfig+secretRef, the user-owned Secret is mounted
+  directly (the chart does not copy the contents). Otherwise the
+  chart-owned `<release>-oidc-authn-config` Secret is mounted.
+*/}}
+{{- $oidcEnabled := ne .Values.oidc.mode "None" }}
+{{- $oidcAuthnSecret := printf "%s-oidc-authn-config" .Release.Name }}
+{{- $customSecretRefName := dig "customConfig" "secretRef" "name" "" .Values.oidc }}
+{{- if and (eq .Values.oidc.mode "CustomConfig") (ne $customSecretRefName "") }}
+{{-   $oidcAuthnSecret = $customSecretRefName }}
+{{- end }}
+{{- if and $oidcEnabled (has "authentication-config" $userVolumeNames) }}
+{{-   fail "controlPlane.apiServer.extraVolumes: volume name \"authentication-config\" is reserved by the chart for OIDC AuthenticationConfiguration when spec.oidc.mode is not None — rename your volume." }}
+{{- end }}
+{{- /*
+  Aggregation-layer UID plumbing. What is rendered per version, why an
+  opt-out renders nothing rather than failing, and how the operator's own
+  entries change that are in docs/oidc-tenant.md. That table is the one
+  to update; there is deliberately no copy of it here.
+
+  The chart never renders a --feature-gates term of its own, so it never
+  enables an alpha gate for the operator; it reads the operator's gate entries
+  only to find an opt-out.
+
+  Anchors for the split, read at v1.32.13 and v1.35.6:
+  staging/src/k8s.io/apiserver/pkg/features/kube_features.go for the gate's
+  versioned spec, and .../server/options/authentication.go Validate() for
+  the refusals the guards below mirror. The version that decides is the
+  EFFECTIVE one, which --emulated-version moves down.
+
+  Every entry of a flag reaches the apiserver, so every entry is read, and
+  the three flags accumulate differently. --requestheader-uid-headers is a
+  pflag StringSlice whose repeats append, so the apiserver validates the
+  union and an element the chart adds can only satisfy caseInsensitiveHas.
+  --feature-gates collects into one bucket per component and is handed to
+  featureGate.Set() once, so the last term for a gate name wins across
+  entries. --emulated-version is a StringSlice too, and toVersionMap refuses
+  two elements naming the same component.
+
+  Two pins decide that: the tenant control plane build in
+  packages/system/kamaji, and the owner of the CR field read here,
+  cluster-api-control-plane-provider-kamaji in
+  packages/system/capi-providers-cpprovider, which copies
+  spec.apiServer.extraArgs into the TenantControlPlane verbatim. A bump of
+  either is a reason to re-read this block.
+
+  Ownership is resolved after the arg loop because the merged reading of
+  each flag, and the interaction between them, are known only once every
+  arg has been seen.
+*/}}
+{{- $uidHeaderUnsupported := false }}
+{{- $emulatedKubeVersion := "" }}
+{{- $emulatedKubeDuplicated := false }}
+{{- $uidGateOptedOut := false }}
+{{- $uidHeaderArgSeen := "" }}
+{{- $uidHeaderEmptyArg := "" }}
+{{- $emulatedQuoted := false }}
+{{- $gateArgUnreadable := false }}
+{{- $emulatedArgUnreadable := false }}
+{{- $uidHeaderConforms := false }}
+{{- $uidHeaderHasEmpty := false }}
+{{- $gateValues := dict }}
+{{- $gateArgs := dict }}
+{{- $gateArgSeen := "" }}
+{{- $uidGateSetting := "" }}
+{{- $allBetaSetting := "" }}
+{{- $versionPattern := `^\s*v?([0-9]+(?:\.[0-9]+)*)(.*)$` }}
+{{- $uidArgs := list }}
+{{- /*
+  Legacy `--oidc-*` flags in the user-supplied extraArgs are mutually
+  exclusive with `--authentication-config`. The kube-apiserver refuses
+  to boot when both are set (`--authentication-config cannot be used with
+  any of --oidc-*`), so an existing cluster that previously configured
+  OIDC by hand via the user extra*-passthrough would BOOT-FAIL on upgrade
+  as soon as `spec.oidc.mode` is toggled to `System` or `CustomConfig`.
+  Fail the chart render with an actionable message instead.
+
+  When `spec.oidc.mode: None`, the user is free to keep --oidc-* flags
+  in their extraArgs (the chart does not touch them) — that path is
+  preserved for backward compatibility.
+*/}}
+{{- if $oidcEnabled }}
+{{- /*
+  The chart appends its own arguments after the operator's, starting with
+  --authentication-config. pflag gives a valueless long flag the next argv
+  element as its value whatever that element looks like, so an operator
+  entry that ends the list with one of the three flags read here swallows
+  that appended argument, and the AuthenticationConfiguration is never
+  applied. What that costs depends on the flag: a uid-headers list takes the
+  path verbatim and the apiserver starts with OIDC silently off, while
+  featureGate.Set and toVersionMap both reject it and the apiserver exits.
+  Silent is the one worth refusing the render over, and the other two arrive
+  at the same place by a louder road.
+
+  Earlier in the list the same shape takes the operator's own next entry,
+  which is theirs to mean. No entry between the two goes missing on the way
+  to the apiserver: an entry the control plane would drop is refused above or
+  moved out of this list.
+*/}}
+{{-   $userExtraArgs := $keptExtraArgs }}
+{{-   if gt (len $userExtraArgs) 0 }}
+{{-     $lastUserArg := index $userExtraArgs (sub (len $userExtraArgs) 1) }}
+{{-     if has $lastUserArg (list "--requestheader-uid-headers" "--feature-gates" "--emulated-version") }}
+{{-       fail (printf "controlPlane.apiServer.extraArgs ends with %q while spec.oidc.mode is %q — the chart appends --authentication-config after your entries, and the kube-apiserver would read that as the value of your flag: the AuthenticationConfiguration is never applied, and the control plane either comes up with OIDC silently off or refuses to start at all, depending on which flag swallowed it. Give the flag its value in the same entry, as --flag=value." $lastUserArg $.Values.oidc.mode) }}
+{{-     end }}
+{{-   end }}
+{{-   range $arg := $userExtraArgs }}
+{{-     if hasPrefix "--oidc-" $arg }}
+{{-       fail (printf "controlPlane.apiServer.extraArgs contains %q while spec.oidc.mode is %q — the kube-apiserver refuses to boot with both --authentication-config (injected by spec.oidc) and legacy --oidc-* flags. Remove the --oidc-* flags from controlPlane.apiServer.extraArgs and use spec.oidc.mode: CustomConfig with a customConfig.config carrying the same issuer/audience if you need to override, or spec.oidc.mode: System for the platform cozy default." $arg $.Values.oidc.mode) }}
+{{-     end }}
+{{-     if hasPrefix "--authentication-config" $arg }}
+{{-       fail (printf "controlPlane.apiServer.extraArgs contains %q while spec.oidc.mode is %q — the chart already injects --authentication-config= for OIDC. Drop your explicit flag and let spec.oidc.mode: CustomConfig own the AuthenticationConfiguration (customConfig.config or customConfig.secretRef.name), or leave spec.oidc.mode: None and keep managing the flag yourself." $arg $.Values.oidc.mode) }}
+{{-     end }}
+{{-     if eq $arg "--requestheader-uid-headers" }}
+{{- /*
+  The space-separated spelling, as two elements. pflag pairs them, so the
+  entry counts as present even though its value lives in the next element
+  and this loop never looks there. Presence is what the gate-disabled guard
+  needs; conformance and emptiness stay unknown, exactly as for a quoted
+  value below. The arrangement where the element pflag pairs with is the
+  chart's own is refused above, before this loop runs.
+*/}}
+{{-       if eq $uidHeaderArgSeen "" }}
+{{-         $uidHeaderArgSeen = $arg }}
+{{-       end }}
+{{-     end }}
+{{-     if hasPrefix "--requestheader-uid-headers=" $arg }}
+{{- /*
+  An empty value is not an entry: readAsCSV returns an empty slice, pflag
+  appends nothing from it, and Validate() only inspects a non-empty list.
+
+  Only --flag=value is read for its value here. One element holding both the
+  flag and its value, separated by a space, reaches pflag as an unknown flag
+  and the apiserver refuses to start; the two-element spelling is handled
+  above.
+
+  Match whole ELEMENTS and do NOT trim them: caseInsensitiveHas compares with
+  strings.EqualFold and pflag's CSV reader keeps surrounding spaces, so
+  "X-Remote-Uid-Extra" and "X-Remote-Uid " are both something else, and the
+  chart answers them by adding its own element rather than by reading them
+  permissively. The emptiness test is the one that trims, because
+  checkForWhiteSpaceOnly does, and it refuses the union whatever else it holds.
+
+  A quoted value is read by encoding/csv before the apiserver sees it and
+  this code does not reproduce that, so a quoted entry counts as present and
+  contributes nothing else: it can neither show the union conforms nor show
+  an element is empty. That is the rule for the whole block: fail only where
+  the operator's own entry would stop the apiserver from starting, and
+  withhold a reading rather than guess at one.
+*/}}
+{{-       $headerValue := trimPrefix "--requestheader-uid-headers=" $arg }}
+{{-       if ne $headerValue "" }}
+{{-         if eq $uidHeaderArgSeen "" }}
+{{-           $uidHeaderArgSeen = $arg }}
+{{-         end }}
+{{-         if not (contains "\"" $headerValue) }}
+{{-           range $h := splitList "," $headerValue }}
+{{-             if eq (lower $h) "x-remote-uid" }}
+{{-               $uidHeaderConforms = true }}
+{{-             end }}
+{{-             if eq (trim $h) "" }}
+{{-               $uidHeaderHasEmpty = true }}
+{{-               if eq $uidHeaderEmptyArg "" }}
+{{-                 $uidHeaderEmptyArg = $arg }}
+{{-               end }}
+{{-             end }}
+{{-           end }}
+{{-         end }}
+{{-       end }}
+{{-     end }}
+{{-     if or (eq $arg "--feature-gates") (eq $arg "--emulated-version") }}
+{{- /*
+  The space-separated spelling of the two flags whose values decide what is
+  rendered. pflag pairs the element with the next one, but the value is in
+  an element this loop does not read, so neither the gate nor the effective
+  version can be settled. Withhold what depends on that reading, the way a
+  quoted value does: rendering against a reading that was never taken is the
+  one outcome worth avoiding.
+*/}}
+{{-       if eq $arg "--feature-gates" }}
+{{-         $gateArgUnreadable = true }}
+{{-       else }}
+{{-         $emulatedArgUnreadable = true }}
+{{-       end }}
+{{-     end }}
+{{-     if hasPrefix "--feature-gates=" $arg }}
+{{- /*
+  Values resolve as strconv.ParseBool resolves them (0/f/F, 1/t/T), names
+  compare exactly, and both only after the component prefix is off: the flag
+  is a colon-separated multimap parsed above featureGate.Set(), which is the
+  layer `known[Feature(k)]` belongs to.
+
+  A blanket AllBeta counts: setUnsetBetaGates skips a key an explicit entry
+  already wrote, so the explicit one wins in either map-iteration order.
+
+  Settings accumulate across entries into one dict because the multimap
+  does: every entry's terms land in the same per-component bucket and are
+  joined into a single featureGate.Set(), so the last term for a gate name
+  wins and no earlier entry is dropped.
+*/}}
+{{-       $gateValue := trimPrefix "--feature-gates=" $arg }}
+{{-       range $g := splitList "," $gateValue }}
+{{- /*
+  --feature-gates is a colon-separated multimap: each element is
+  component:name=value, and an element with no component belongs to the
+  empty key, which Set() folds into kube. Reading the whole "kube:Name" as
+  the gate name misses every prefixed spelling. Zero-length elements are
+  skipped the way ColonSeparatedMultimapStringString skips them.
+*/}}
+{{-         if ne $g "" }}
+{{-           $element := $g }}
+{{-           $elementIsKube := true }}
+{{-           if contains ":" $element }}
+{{-             $component := trim (index (splitList ":" $element) 0) }}
+{{- /*
+  Only a literal "kube" keys under the kube component. An empty component,
+  as in ":Foo=true", keys under "" exactly like an unprefixed element. A
+  foreign component keeps its prefix and never matches one of the gate names
+  below.
+*/}}
+{{-             if has $component (list "kube" "") }}
+{{-               $element = trimPrefix (printf "%s:" (index (splitList ":" $element) 0)) $element }}
+{{-             else }}
+{{-               $elementIsKube = false }}
+{{-             end }}
+{{-           end }}
+{{-           if $elementIsKube }}
+{{-             $kv := splitList "=" $element }}
+{{-             if eq (len $kv) 2 }}
+{{-               $gname := trim (index $kv 0) }}
+{{-               $gval := trim (index $kv 1) }}
+{{-               $resolved := "" }}
+{{-               if has $gval (list "1" "t" "T" "true" "TRUE" "True") }}
+{{-                 $resolved = "true" }}
+{{-               else if has $gval (list "0" "f" "F" "false" "FALSE" "False") }}
+{{-                 $resolved = "false" }}
+{{-               end }}
+{{-               if and (ne $resolved "") (has $gname (list "RemoteRequestHeaderUID" "AllBeta")) }}
+{{-                 $gateValues = set $gateValues $gname $resolved }}
+{{- /*
+  Keyed by gate name, so the opt-out message can quote the entry that carries
+  the setting it names rather than whichever entry happened to be read last.
+*/}}
+{{-                 $gateArgs = set $gateArgs $gname $arg }}
+{{-               end }}
+{{-             end }}
+{{-           end }}
+{{-         end }}
+{{-       end }}
+{{-     end }}
+{{-     if hasPrefix "--emulated-version=" $arg }}
+{{- /*
+  Emulation moves the version the gate resolves at, and the header flag has
+  to follow it rather than the image tag. featureSpecAtEmulationVersion
+  (featureSpecAtEmulationAndMinCompatVersion by v1.35) walks the versioned
+  specs down to the emulated version, so RemoteRequestHeaderUID
+  is alpha-and-off at an emulated 1.32 on any binary, and the apiserver
+  refuses the header flag there.
+
+  The value is a CSV of component=version, and an element naming no component
+  is kube's. Anything else names another component and is none of our
+  business. $versionPattern copies versionMatchRE from version.Parse, which
+  toVersionMap uses: an optional v, a run of dot-separated numbers, and
+  anything after it ignored, so the chart reads v1.32, 1.32.0 and 1.32-rc all
+  as 1.32. A version it cannot parse is left
+  alone, the way an unparseable gate value is: the apiserver rejects it on its
+  own terms. A non-zero patch component in an unquoted value fails the render
+  instead: toVersionMap refuses it too, and the render error names the entry
+  where the apiserver would only crash-loop.
+
+  Elements accumulate across entries, and toVersionMap refuses two of them
+  naming the same component. A second kube element therefore stops the
+  apiserver and leaves no version this code can trust, so it is tracked and
+  the header flag is withheld rather than rendered against a guess.
+*/}}
+{{-       $emulatedValue := trimPrefix "--emulated-version=" $arg }}
+{{-       if ne $emulatedValue "" }}
+{{-         if contains "\"" $emulatedValue }}
+{{-           $emulatedQuoted = true }}
+{{-         end }}
+{{-         range $e := splitList "," $emulatedValue }}
+{{-           $parts := regexSplit "=" (trim $e) 2 }}
+{{-           $candidate := "" }}
+{{-           if eq (len $parts) 1 }}
+{{-             $candidate = trim (index $parts 0) }}
+{{-           else if eq (trim (index $parts 0)) "kube" }}
+{{-             $candidate = trim (index $parts 1) }}
+{{-           end }}
+{{-           if ne $candidate "" }}
+{{-             if ne $emulatedKubeVersion "" }}
+{{-               $emulatedKubeDuplicated = true }}
+{{-             end }}
+{{-             $emulatedKubeVersion = $candidate }}
+{{-             if and (not (contains "\"" $emulatedValue)) (regexMatch $versionPattern $candidate) }}
+{{-               $numeric := splitList "." (regexReplaceAll $versionPattern $candidate "${1}") }}
+{{-               if and (ge (len $numeric) 3) (ne (atoi (index $numeric 2)) 0) }}
+{{-                 fail (printf "controlPlane.apiServer.extraArgs contains %q while spec.oidc.mode is %q — the kube-apiserver refuses an --emulated-version with a non-zero patch component (patch version not allowed), so the control plane would refuse to start. Emulation takes major.minor: write %s.%s instead of %s." $arg $.Values.oidc.mode (index $numeric 0) (index $numeric 1) $candidate) }}
+{{-               end }}
+{{-             end }}
+{{-           end }}
+{{-         end }}
+{{-       end }}
+{{-     end }}
+{{-   end }}
+{{-   $uidGateSetting = dig "RemoteRequestHeaderUID" "" $gateValues }}
+{{-   $allBetaSetting = dig "AllBeta" "" $gateValues }}
+{{- /*
+  Emulation can only move the effective version down, so the lower of the two
+  decides. A tenant asking to emulate something newer than its own image is
+  rejected by the apiserver; reading the lower one keeps the chart from
+  rendering a flag that version cannot take.
+*/}}
+{{-   $chartMinorParts := splitList "." (trimPrefix "v" .Values.version) }}
+{{-   $chartMinor := atoi (index $chartMinorParts 1) }}
+{{-   $effectiveMinor := $chartMinor }}
+{{-   if regexMatch $versionPattern $emulatedKubeVersion }}
+{{-     $emulatedParts := splitList "." (regexReplaceAll $versionPattern $emulatedKubeVersion "${1}") }}
+{{-     if ge (len $emulatedParts) 2 }}
+{{-       $emulatedMinor := atoi (index $emulatedParts 1) }}
+{{-       if lt $emulatedMinor $effectiveMinor }}
+{{-         $effectiveMinor = $emulatedMinor }}
+{{-       end }}
+{{-     end }}
+{{-   end }}
+{{- /*
+  The fail messages are migration instructions, so they name the version the
+  decision was taken at, which is not the image tag when emulation moved it.
+*/}}
+{{-   $versionForMessage := .Values.version }}
+{{-   if and (ne $emulatedKubeVersion "") (ne $effectiveMinor $chartMinor) }}
+{{-     $versionForMessage = printf "%s emulating %s" .Values.version $emulatedKubeVersion }}
+{{-   end }}
+{{-   $uidHeaderUnsupported = lt $effectiveMinor 33 }}
+{{-   if eq $uidGateSetting "false" }}
+{{-     $uidGateOptedOut = true }}
+{{-     $gateArgSeen = dig "RemoteRequestHeaderUID" "" $gateArgs }}
+{{-   else if and (ne $uidGateSetting "true") (eq $allBetaSetting "false") }}
+{{-     $uidGateOptedOut = true }}
+{{-     $gateArgSeen = dig "AllBeta" "" $gateArgs }}
+{{-   end }}
+{{-   $argUnreadable := or $gateArgUnreadable $emulatedArgUnreadable }}
+{{- /*
+  An unreadable entry leaves the gate or the version unknown, and what
+  follows holds in every state it can hide. An explicit
+  RemoteRequestHeaderUID=false is an opt-out at every version, so it is
+  refused behind an unread --emulated-version; a blanket AllBeta reaches
+  the gate only while the gate is beta, which a lower emulated version can
+  undo, so it waits for a reading. An unread --feature-gates term can turn
+  the gate back on, so it keeps the opt-out refusal off. An empty element
+  is fatal with the gate in either state. X-Remote-Uid beside an
+  operator's own list can only help: the gate off refuses that list anyway.
+  What the chart adds with no list of the operator's beside it, X-Remote-Uid
+  alone, waits for a reading.
+*/}}
+{{-   if not (or $uidHeaderUnsupported $emulatedQuoted $emulatedKubeDuplicated) }}
+{{-     if $uidGateOptedOut }}
+{{-       if and (ne $uidHeaderArgSeen "") (not $gateArgUnreadable) (or (not $emulatedArgUnreadable) (eq $uidGateSetting "false")) }}
+{{-         fail (printf "controlPlane.apiServer.extraArgs contains %q alongside %q, while spec.oidc.mode is %q on Kubernetes %s — the kube-apiserver rejects a --requestheader-uid-headers list while RemoteRequestHeaderUID is disabled, so the control plane would refuse to start. Drop one of the two: your header flag, or the gate setting that turns RemoteRequestHeaderUID off." $uidHeaderArgSeen $gateArgSeen $.Values.oidc.mode $versionForMessage) }}
+{{-       end }}
+{{-     end }}
+{{-     if $uidHeaderHasEmpty }}
+{{-       fail (printf "controlPlane.apiServer.extraArgs contains %q while spec.oidc.mode is %q — the kube-apiserver rejects a uid-headers list with an empty or whitespace-only element, and it validates every entry of the flag as one list, so the control plane would refuse to start. Remove the empty element from your entry, or drop the entry." $uidHeaderEmptyArg $.Values.oidc.mode) }}
+{{-     end }}
+{{-     if not $uidGateOptedOut }}
+{{- /*
+  Adding a second X-Remote-Uid to a list that already has one is harmless,
+  so this is only about leaving a conforming setup rendering as it did.
+*/}}
+{{-       if and (not $uidHeaderConforms) (or (not $argUnreadable) (ne $uidHeaderArgSeen "")) }}
+{{-         $uidArgs = append $uidArgs "--requestheader-uid-headers=X-Remote-Uid" }}
+{{-       end }}
+{{-     end }}
+{{-   end }}
+{{- end }}
 spec:
   apiServer:
     resources: {{- include "cozy-lib.resources.defaultingSanitize" (list .Values.controlPlane.apiServer.resourcesPreset .Values.controlPlane.apiServer.resources $) | nindent 6 }}
+    {{- /*
+      extraArgs and extraVolumeMounts are ALWAYS emitted (empty array when
+      nothing to inject). Kamaji's KamajiControlPlane is a CRD and Helm
+      applies JSON-merge-patch to CRDs, which for arrays REPLACES the whole
+      value. If we omitted the field for `oidc.mode: None` after previously
+      rendering it under `System`, JSON-merge-patch would leave the live
+      array untouched — the tenant apiserver would keep the stale
+      --authentication-config flag pointing at a Secret that no longer
+      exists, and would refuse to start on the next kubelet restart.
+      Rendering the empty array on the "off" path forces Helm to send a
+      REPLACE patch that clears the stale value.
+    */}}
+    extraArgs:
+      {{- with $keptExtraArgs }}
+      {{- toYaml . | nindent 6 }}
+      {{- end }}
+      {{- if $oidcEnabled }}
+      - --authentication-config=/etc/kubernetes/authentication-config/config.yaml
+      {{- with $uidArgs }}
+      {{- toYaml . | nindent 6 }}
+      {{- end }}
+      {{- end }}
+      {{- if not (or $keptExtraArgs $oidcEnabled) }} []{{ end }}
+    extraVolumeMounts:
+      {{- with .Values.controlPlane.apiServer.extraVolumeMounts }}
+      {{- toYaml . | nindent 6 }}
+      {{- end }}
+      {{- if $oidcEnabled }}
+      - name: authentication-config
+        mountPath: /etc/kubernetes/authentication-config
+        readOnly: true
+      {{- end }}
+      {{- if not (or .Values.controlPlane.apiServer.extraVolumeMounts $oidcEnabled) }} []{{ end }}
   controllerManager:
     resources: {{- include "cozy-lib.resources.defaultingSanitize" (list .Values.controlPlane.controllerManager.resourcesPreset .Values.controlPlane.controllerManager.resources $) | nindent 6 }}
   scheduler:
     resources: {{- include "cozy-lib.resources.defaultingSanitize" (list .Values.controlPlane.scheduler.resourcesPreset .Values.controlPlane.scheduler.resources $) | nindent 6 }}
   dataStoreName: "{{ $etcd }}"
+  {{- with $admissionControllers }}
+  admissionControllers:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
   addons:
     konnectivity:
       {{- $konnVersion := include "kubernetes.konnectivityVersion" $ | trim }}
@@ -195,20 +761,99 @@ spec:
         resources: {{- include "cozy-lib.resources.defaultingSanitize" (list .Values.controlPlane.konnectivity.server.resourcesPreset .Values.controlPlane.konnectivity.server.resources $) | nindent 10 }}
   kubelet:
     cgroupfs: systemd
-    preferredAddressTypes:
-    - InternalIP
-    - ExternalIP
+    preferredAddressTypes: {{- toYaml $preferredAddressTypes | nindent 4 }}
   network:
-    serviceType: ClusterIP
+    {{- /* A KubeVirt worker is a Pod in this cluster and dials the apiserver
+          over the pod network, where a ClusterIP is meaningful. A Proxmox
+          worker is a VM on the hypervisor network and cannot route to one at
+          all: it boots, fails to reach the endpoint, and never files a CSR —
+          a silence that looks like a broken bootstrap rather than an
+          unreachable address. Publishing the Service moves the endpoint onto
+          a network the workers share. */}}
+    serviceType: {{ ternary "LoadBalancer" "ClusterIP" $isProxmox }}
     ingress:
       extraAnnotations:
         nginx.ingress.kubernetes.io/ssl-passthrough: "true"
-      hostname: {{ .Values.host | default (printf "%s.%s" .Release.Name $host) }}:443
+      hostname: {{ .Values.host | default (printf "%s.%s" .Release.Name (include "cozy-lib.ns-host-required" .)) }}:443
       className: "{{ $ingress }}"
+    additionalServicePorts:
+      - name: talos-trustd
+        port: 50001
+        targetPort: 50001
+        protocol: TCP
+    {{- /* Initial render lists only the DNS SANs because the apiserver
+           Service ClusterIP is not yet allocated when Helm executes the
+           template. Since the worker split, the talos-reconcile Job that
+           re-patches certSANs with the live ClusterIP (after which Kamaji
+           re-issues the apiserver TLS cert) runs in each kubernetes-nodes
+           pool release, not in this chart: a cluster with at least one pool
+           gains the ClusterIP SAN once Kamaji emits the Service, while a
+           pool-less cluster keeps DNS SANs only. That is a best-effort
+           extra, not a dependency -- workers dial the apiserver by DNS name
+           via extraHostEntries, so nothing requires the IP SAN. */}}
+    certSANs:
+      - {{ printf "%s.%s.svc" .Release.Name .Release.Namespace }}
+      - {{ printf "%s.%s.svc.%s" .Release.Name .Release.Namespace (include "kubernetes.tenantClusterDomain" .) }}
   deployment:
     podAdditionalMetadata:
       labels:
         policy.cozystack.io/allow-to-etcd: "true"
+    extraContainers:
+      - name: talos-csr-signer
+        image: "{{ default (.Files.Get "images/talos-csr-signer.tag" | trim) .Values.images.talosCsrSigner }}"
+        imagePullPolicy: IfNotPresent
+        ports:
+          - name: trustd
+            containerPort: 50001
+            protocol: TCP
+        env:
+          - name: TALOS_TOKEN
+            valueFrom:
+              secretKeyRef:
+                name: {{ .Release.Name }}-talos-secrets
+                key: token
+        resources:
+          requests:
+            cpu: 10m
+            memory: 32Mi
+          limits:
+            cpu: 200m
+            memory: 128Mi
+        securityContext:
+          allowPrivilegeEscalation: false
+          readOnlyRootFilesystem: true
+          runAsNonRoot: true
+          runAsUser: 65532
+          capabilities:
+            drop:
+              - ALL
+          seccompProfile:
+            type: RuntimeDefault
+        volumeMounts:
+          - name: talos-ca
+            mountPath: /etc/talos-ca
+            readOnly: true
+          - name: talos-tls-cert
+            mountPath: /etc/talos-server-crt
+            readOnly: true
+    extraVolumes:
+      - name: talos-ca
+        secret:
+          secretName: {{ .Release.Name }}-talos-ca
+      - name: talos-tls-cert
+        secret:
+          secretName: {{ .Release.Name }}-talos-tls-cert
+      {{- with .Values.controlPlane.apiServer.extraVolumes }}
+      {{- toYaml . | nindent 6 }}
+      {{- end }}
+      {{- if $oidcEnabled }}
+      - name: authentication-config
+        secret:
+          secretName: {{ $oidcAuthnSecret }}
+          items:
+          - key: config.yaml
+            path: config.yaml
+      {{- end }}
   replicas: {{ .Values.controlPlane.replicas }}
   version: {{ include "kubernetes.versionMap" $ }}
 ---
@@ -228,420 +873,53 @@ spec:
   version: {{ $.Chart.Version }}
 ---
 apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
-kind: KubevirtCluster
+kind: {{ $infraKind }}
 metadata:
+  {{- if not $isProxmox }}
+  {{- /* KubevirtCluster carries managed-by: nothing has to reconcile it, and
+        the annotation keeps CAPI from waiting on an infrastructure controller
+        that will never answer.
+
+        ProxmoxCluster must NOT carry it. The annotation tells CAPI the object
+        is owned by something outside Cluster API, so the Cluster controller
+        never sets the ownerRef on it — and capmox's reconciler exits at
+        "Waiting for Cluster Controller to set OwnerRef on ProxmoxCluster"
+        without ever building the InClusterIPPool the workers draw addresses
+        from. The control plane being external is expressed instead by
+        spec.externalManagedControlPlane below, which is the field capmox
+        actually reads. */}}
   annotations:
     cluster.x-k8s.io/managed-by: kamaji
+  {{- end }}
   name: {{ .Release.Name }}
   namespace: {{ .Release.Namespace }}
-{{- range $groupName, $group := .Values.nodeGroups }}
-{{/* Resolve instanceType once per group — reused for kubelet reservations and capacity annotations. */}}
-{{- $instanceType := dict }}
-{{- if $group.instanceType }}
-{{-   $instanceType = (lookup "instancetype.kubevirt.io/v1beta1" "VirtualMachineClusterInstancetype" "" $group.instanceType) }}
-{{-   if not $instanceType }}
-{{-     fail (printf "nodeGroup %s: specified instanceType %q not found in cluster" $groupName $group.instanceType) }}
-{{-   end }}
-{{- end }}
-{{/* Compute kubelet reservations: explicit resources.memory/cpu wins over instanceType spec.
-     Auto-computed system/kube reserved memory = 5% of effective memory, clamped to [256Mi, 1Gi].
-     Auto-computed system/kube reserved CPU = 5% of effective CPU, clamped to [50m, 500m]. */}}
-{{- $effectiveMemory := "" }}
-{{- if and $group.resources $group.resources.memory }}
-{{-   $effectiveMemory = $group.resources.memory | toString }}
-{{- else if and $instanceType $instanceType.spec $instanceType.spec.memory $instanceType.spec.memory.guest }}
-{{-   $effectiveMemory = $instanceType.spec.memory.guest | toString }}
-{{- end }}
-{{- $effectiveCpu := "" }}
-{{- if and $group.resources $group.resources.cpu }}
-{{-   $effectiveCpu = $group.resources.cpu | toString }}
-{{- else if and $instanceType $instanceType.spec $instanceType.spec.cpu $instanceType.spec.cpu.guest }}
-{{-   $effectiveCpu = $instanceType.spec.cpu.guest | toString }}
-{{- end }}
-{{- $autoReservedMi := 256 }}
-{{- if $effectiveMemory }}
-{{-   $effectiveMemMi := divf (include "cozy-lib.resources.toFloat" $effectiveMemory | float64) 1048576.0 | int }}
-{{-   $fivePercentMi := mulf ($effectiveMemMi | float64) 0.05 | int }}
-{{-   $autoReservedMi = min (max $fivePercentMi 256) 1024 }}
-{{- end }}
-{{- $autoReservedMillicores := 50 }}
-{{- if $effectiveCpu }}
-{{-   $effectiveCpuMillicores := include "kubernetes.cpuToMillicores" $effectiveCpu | int }}
-{{-   $fivePercentMillis := mulf ($effectiveCpuMillicores | float64) 0.05 | int }}
-{{-   $autoReservedMillicores = min (max $fivePercentMillis 50) 500 }}
-{{- end }}
-{{- $kubeletOverride := $group.kubelet | default dict }}
-{{- $systemReservedMemory := $kubeletOverride.systemReservedMemory | default (printf "%dMi" $autoReservedMi) }}
-{{- $kubeReservedMemory := $kubeletOverride.kubeReservedMemory | default (printf "%dMi" $autoReservedMi) }}
-{{- $systemReservedCpu := $kubeletOverride.systemReservedCpu | default (printf "%dm" $autoReservedMillicores) }}
-{{- $kubeReservedCpu := $kubeletOverride.kubeReservedCpu | default (printf "%dm" $autoReservedMillicores) }}
-{{- $evictionHardMemory := $kubeletOverride.evictionHardMemory | default "7%" }}
-{{- $evictionSoftMemory := $kubeletOverride.evictionSoftMemory | default "10%" }}
-{{/* Validate reservation field formats.
-  These guards check the USER-SUPPLIED value (from values.yaml via
-  $kubeletOverride), not the resolved/computed default — the default is
-  always valid by construction.  The eviction threshold validation below
-  differs: it validates the RESOLVED values (user-supplied or default). */}}
-{{- $validations := list
-      (dict "key" "systemReservedMemory" "value" $kubeletOverride.systemReservedMemory "pattern" `^[0-9]+(\.[0-9]+)?([eE][+-]?[0-9]+)?(Ki|Mi|Gi|Ti|Pi|Ei|k|M|G|T|P|E)?$` "hint" "a valid Kubernetes memory quantity (e.g. 128Mi, 1Gi, 1e9, 500e6)")
-      (dict "key" "kubeReservedMemory"   "value" $kubeletOverride.kubeReservedMemory   "pattern" `^[0-9]+(\.[0-9]+)?([eE][+-]?[0-9]+)?(Ki|Mi|Gi|Ti|Pi|Ei|k|M|G|T|P|E)?$` "hint" "a valid Kubernetes memory quantity (e.g. 128Mi, 1Gi, 1e9, 500e6)")
-      (dict "key" "systemReservedCpu"    "value" $kubeletOverride.systemReservedCpu    "pattern" `^([0-9]+m|[0-9]+(\.[0-9]+)?)$`                                                              "hint" "a valid Kubernetes CPU quantity (integer millicores like 100m, or decimal cores like 0.5, 1)")
-      (dict "key" "kubeReservedCpu"      "value" $kubeletOverride.kubeReservedCpu      "pattern" `^([0-9]+m|[0-9]+(\.[0-9]+)?)$`                                                              "hint" "a valid Kubernetes CPU quantity (integer millicores like 100m, or decimal cores like 0.5, 1)")
-}}
-{{- range $validations }}
-{{-   if and .value (not (regexMatch .pattern (.value | toString))) }}
-{{-     fail (printf "nodeGroup %s: invalid %s value %q — must be %s" $groupName .key (.value | toString) .hint) }}
-{{-   end }}
-{{- end }}
-{{/* Validate that user-supplied reservation values are positive (non-zero) */}}
-{{- range $_, $entry := list (dict "key" "systemReservedMemory" "value" $kubeletOverride.systemReservedMemory) (dict "key" "kubeReservedMemory" "value" $kubeletOverride.kubeReservedMemory) }}
-{{-   if $entry.value }}
-{{-     $bytes := include "cozy-lib.resources.toFloat" ($entry.value | toString) | float64 }}
-{{-     if le $bytes 0.0 }}
-{{-       fail (printf "nodeGroup %s: %s must be a positive value, got %s" $groupName $entry.key ($entry.value | toString)) }}
-{{-     end }}
-{{-   end }}
-{{- end }}
-{{- range $_, $entry := list (dict "key" "systemReservedCpu" "value" $kubeletOverride.systemReservedCpu) (dict "key" "kubeReservedCpu" "value" $kubeletOverride.kubeReservedCpu) }}
-{{-   if $entry.value }}
-{{-     $cpuMillis := include "kubernetes.cpuToMillicores" $entry.value | float64 }}
-{{-     if le $cpuMillis 0.0 }}
-{{-       fail (printf "nodeGroup %s: %s must be a positive value, got %s" $groupName $entry.key ($entry.value | toString)) }}
-{{-     end }}
-{{-   end }}
-{{- end }}
-{{/* Validate absolute eviction threshold formats before converting */}}
-{{- if not (hasSuffix "%" $evictionHardMemory) }}
-{{-   if not (regexMatch `^[0-9]+(\.[0-9]+)?([eE][+-]?[0-9]+)?(Ki|Mi|Gi|Ti|Pi|Ei|k|M|G|T|P|E)?$` $evictionHardMemory) }}
-{{-     fail (printf "nodeGroup %s: invalid evictionHardMemory value %q — must be a percentage (e.g. 7%%) or a valid Kubernetes memory quantity (e.g. 500Mi, 1Gi, 1e9)" $groupName $evictionHardMemory) }}
-{{-   end }}
-{{- end }}
-{{- if not (hasSuffix "%" $evictionSoftMemory) }}
-{{-   if not (regexMatch `^[0-9]+(\.[0-9]+)?([eE][+-]?[0-9]+)?(Ki|Mi|Gi|Ti|Pi|Ei|k|M|G|T|P|E)?$` $evictionSoftMemory) }}
-{{-     fail (printf "nodeGroup %s: invalid evictionSoftMemory value %q — must be a percentage (e.g. 10%%) or a valid Kubernetes memory quantity (e.g. 500Mi, 1Gi, 1e9)" $groupName $evictionSoftMemory) }}
-{{-   end }}
-{{- end }}
-{{- if and (hasSuffix "%" $evictionHardMemory) (hasSuffix "%" $evictionSoftMemory) }}
-{{-   $hardPctStr := trimSuffix "%" $evictionHardMemory }}
-{{-   $softPctStr := trimSuffix "%" $evictionSoftMemory }}
-{{-   if not (regexMatch `^[0-9]+(\.[0-9]+)?$` $hardPctStr) }}
-{{-     fail (printf "nodeGroup %s: evictionHardMemory percentage value %q is not a valid number" $groupName $hardPctStr) }}
-{{-   end }}
-{{-   if not (regexMatch `^[0-9]+(\.[0-9]+)?$` $softPctStr) }}
-{{-     fail (printf "nodeGroup %s: evictionSoftMemory percentage value %q is not a valid number" $groupName $softPctStr) }}
-{{-   end }}
-{{-   $hardPct := $hardPctStr | float64 }}
-{{-   $softPct := $softPctStr | float64 }}
-{{-   if le $hardPct 0.0 }}
-{{-     fail (printf "nodeGroup %s: evictionHardMemory percentage must be greater than 0 and at most 100, got %s%%" $groupName $hardPctStr) }}
-{{-   end }}
-{{-   if gt $hardPct 100.0 }}
-{{-     fail (printf "nodeGroup %s: evictionHardMemory percentage must be greater than 0 and at most 100, got %s%%" $groupName $hardPctStr) }}
-{{-   end }}
-{{-   if le $softPct 0.0 }}
-{{-     fail (printf "nodeGroup %s: evictionSoftMemory percentage must be greater than 0 and at most 100, got %s%%" $groupName $softPctStr) }}
-{{-   end }}
-{{-   if gt $softPct 100.0 }}
-{{-     fail (printf "nodeGroup %s: evictionSoftMemory percentage must be greater than 0 and at most 100, got %s%%" $groupName $softPctStr) }}
-{{-   end }}
-{{-   if ge $hardPct $softPct }}
-{{-     fail (printf "nodeGroup %s: evictionHardMemory (%s) must be strictly less than evictionSoftMemory (%s)" $groupName $evictionHardMemory $evictionSoftMemory) }}
-{{-   end }}
-{{- else if and (not (hasSuffix "%" $evictionHardMemory)) (not (hasSuffix "%" $evictionSoftMemory)) }}
-{{-   $hardBytes := include "cozy-lib.resources.toFloat" $evictionHardMemory | float64 }}
-{{-   $softBytes := include "cozy-lib.resources.toFloat" $evictionSoftMemory | float64 }}
-{{-   if ge $hardBytes $softBytes }}
-{{-     fail (printf "nodeGroup %s: evictionHardMemory (%s) must be strictly less than evictionSoftMemory (%s)" $groupName $evictionHardMemory $evictionSoftMemory) }}
-{{-   end }}
-{{- else }}
-{{-   fail (printf "nodeGroup %s: evictionHardMemory (%s) and evictionSoftMemory (%s) must use the same unit type (both percentage or both absolute)" $groupName $evictionHardMemory $evictionSoftMemory) }}
-{{- end }}
-{{/* Resolve eviction hard threshold to bytes for arithmetic.
-     Percentage is relative to effective node memory; absolute values are used as-is. */}}
-{{- $evictionHardBytes := 0.0 }}
-{{- if $effectiveMemory }}
-{{-   if hasSuffix "%" $evictionHardMemory }}
-{{-     $evictionPct := trimSuffix "%" $evictionHardMemory | float64 }}
-{{-     $evictionHardBytes = mulf (include "cozy-lib.resources.toFloat" $effectiveMemory | float64) (divf $evictionPct 100.0) }}
-{{-   else }}
-{{-     $evictionHardBytes = include "cozy-lib.resources.toFloat" $evictionHardMemory | float64 }}
-{{-   end }}
-{{- end }}
-{{/* Validate that total reserved memory (system + kube + eviction) does not exceed effective node memory */}}
-{{- if $effectiveMemory }}
-{{-   $sysBytes := include "cozy-lib.resources.toFloat" $systemReservedMemory | float64 }}
-{{-   $kubeBytes := include "cozy-lib.resources.toFloat" $kubeReservedMemory | float64 }}
-{{-   $totalReservedBytes := addf (addf $sysBytes $kubeBytes) $evictionHardBytes }}
-{{-   $effectiveMemBytes := include "cozy-lib.resources.toFloat" $effectiveMemory | float64 }}
-{{-   if ge $totalReservedBytes $effectiveMemBytes }}
-{{-     fail (printf "nodeGroup %s: total reserved memory (systemReservedMemory=%s + kubeReservedMemory=%s + evictionHardMemory=%s) must be less than effective node memory (%s)" $groupName $systemReservedMemory $kubeReservedMemory $evictionHardMemory $effectiveMemory) }}
-{{-   end }}
-{{- end }}
-{{/* Validate that total reserved CPU does not exceed effective node CPU */}}
-{{- if $effectiveCpu }}
-{{-   $sysCpuMillis := include "kubernetes.cpuToMillicores" $systemReservedCpu | float64 }}
-{{-   $kubeCpuMillis := include "kubernetes.cpuToMillicores" $kubeReservedCpu | float64 }}
-{{-   $totalCpuMillis := addf $sysCpuMillis $kubeCpuMillis }}
-{{-   $effectiveCpuMillicoresV := include "kubernetes.cpuToMillicores" $effectiveCpu | int }}
-{{-   $effectiveCpuMillis := float64 $effectiveCpuMillicoresV }}
-{{-   if ge $totalCpuMillis $effectiveCpuMillis }}
-{{-     fail (printf "nodeGroup %s: total reserved CPU (systemReservedCpu=%s + kubeReservedCpu=%s) must be less than effective node CPU (%s cores)" $groupName $systemReservedCpu $kubeReservedCpu $effectiveCpu) }}
-{{-   end }}
-{{- end }}
-{{/* Guard: explicit kubelet overrides require effective memory for validation */}}
-{{- if not $effectiveMemory }}
-{{-   $hasOverride := or $kubeletOverride.systemReservedMemory $kubeletOverride.kubeReservedMemory $kubeletOverride.evictionHardMemory $kubeletOverride.evictionSoftMemory }}
-{{-   if $hasOverride }}
-{{-     fail (printf "nodeGroup %s: kubelet memory reservations require effective memory to validate — set resources.memory or instanceType" $groupName) }}
-{{-   end }}
-{{- end }}
-{{/* Guard: explicit kubelet CPU overrides require effective CPU for validation */}}
-{{- if not $effectiveCpu }}
-{{-   $hasCpuOverride := or $kubeletOverride.systemReservedCpu $kubeletOverride.kubeReservedCpu }}
-{{-   if $hasCpuOverride }}
-{{-     fail (printf "nodeGroup %s: cannot validate kubelet CPU reservations without effective CPU — set resources.cpu or a valid instanceType" $groupName) }}
-{{-   end }}
-{{- end }}
----
-apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
-kind: KubeadmConfigTemplate
-metadata:
-  name: {{ $.Release.Name }}-{{ $groupName }}
-  namespace: {{ $.Release.Namespace }}
-spec:
-  template:
-    spec:
-      files:
-      - path: /usr/bin/update-k8s.sh
-        owner: root:root
-        permissions: "0755"
-        content: |
-          #!/usr/bin/env bash
-          set -euo pipefail
-
-          # Expected to be passed in via preKubeadmCommands
-          : "${KUBELET_VERSION:?KUBELET_VERSION must be set, e.g. v1.31.0}"
-
-          ARCH="$(uname -m)"
-          case "${ARCH}" in
-            x86_64) ARCH=amd64 ;;
-            aarch64) ARCH=arm64 ;;
-          esac
-
-          # Use your internal mirror here for real-world use.
-          BASE_URL="https://dl.k8s.io/release/${KUBELET_VERSION}/bin/linux/${ARCH}"
-
-          echo "Installing kubelet and kubeadm  ${KUBELET_VERSION} for ${ARCH}..."
-          curl -fsSL "${BASE_URL}/kubelet" -o /root/kubelet
-          curl -fsSL "${BASE_URL}/kubeadm" -o /root/kubeadm
-          chmod 0755 /root/kubelet
-          chmod 0755 /root/kubeadm
-          if /root/kubelet --version ; then mv /root/kubelet /usr/bin/kubelet ; fi
-          if /root/kubeadm version ; then mv /root/kubeadm /usr/bin/kubeadm ; fi
-      {{- $sec := lookup "v1" "Secret" $.Release.Namespace (printf "%s-patch-containerd" $.Release.Name) }}
-      {{- if $sec }}
-        {{- range $key, $_ := $sec.data }}
-      - path: /etc/containerd/certs.d/{{ trimSuffix ".toml" $key }}/hosts.toml
-        contentFrom:
-          secret:
-            name: {{ $.Release.Name }}-patch-containerd
-            key: {{ $key }}
-        permissions: "0400"
-        {{- end }}
-      {{- end }}
-      diskSetup:
-        filesystems:
-        - device: /dev/vdb
-          filesystem: xfs
-          label: persistent
-          partition: "none"
-          {{/* overwrite must stay false: XFS on /dev/vdb is created on first boot; subsequent reboots of the same VM must reuse the existing filesystem via LABEL=persistent */}}
-          overwrite: false
-      mounts:
-      - ["LABEL=persistent", "/persistent"]
-      - ["/persistent/kubelet", "/var/lib/kubelet", "none", "bind,nofail"]
-      - ["/persistent/containerd", "/var/lib/containerd", "none", "bind,nofail"]
-      preKubeadmCommands:
-      - KUBELET_VERSION={{ include "kubernetes.versionMap" $}} /usr/bin/update-k8s.sh || true
-      - sed -i 's|root:x:|root::|' /etc/passwd
-      - systemctl stop containerd.service
-      - mkdir -p /persistent/kubelet /persistent/containerd /var/lib/kubelet /var/lib/containerd
-      - mountpoint -q /var/lib/kubelet || mount -o bind /persistent/kubelet /var/lib/kubelet
-      - mountpoint -q /var/lib/containerd || mount -o bind /persistent/containerd /var/lib/containerd
-      {{/* containerd 2.x renamed the CRI plugin from io.containerd.grpc.v1.cri to io.containerd.cri.v1.images; both seds run unconditionally and the wrong-version one is a no-op */}}
-      - sed -i '/\[plugins\.[^]]*grpc\.v1\.cri[^]]*registry\]/,/^\[/ s|^\(\s*config_path\s*=\s*\).*|\1"/etc/containerd/certs.d"|' /etc/containerd/config.toml
-      - sed -i '/\[plugins\.[^]]*io\.containerd\.cri\.v1\.images[^]]*registry\]/,/^\[/ s|^\(\s*config_path\s*=\s*\).*|\1"/etc/containerd/certs.d"|' /etc/containerd/config.toml
-      - systemctl start containerd.service
-      joinConfiguration:
-        nodeRegistration:
-          kubeletExtraArgs:
-            {{- /*
-              GPU node-groups: label every node `gpu=on` so HAMi's
-              hami-device-plugin DaemonSet (nodeSelector gpu=on) schedules
-              and advertises nvidia.com/gpu. Without the label the plugin
-              stays at DESIRED=0 and no GPUs are exposed to the tenant.
-            */}}
-            {{- if $group.gpus }}
-            node-labels: "gpu=on"
-            {{- end }}
-            system-reserved: "memory={{ $systemReservedMemory }},cpu={{ $systemReservedCpu }}"
-            kube-reserved: "memory={{ $kubeReservedMemory }},cpu={{ $kubeReservedCpu }}"
-            eviction-hard: "memory.available<{{ $evictionHardMemory }},nodefs.available<10%,imagefs.available<15%,nodefs.inodesFree<5%"
-            eviction-soft: "memory.available<{{ $evictionSoftMemory }},nodefs.available<15%,imagefs.available<20%"
-            eviction-soft-grace-period: "memory.available=1m30s,nodefs.available=1m30s,imagefs.available=1m30s"
-            # 256Mi ensures meaningful reclamation per eviction cycle while being
-            # proportional to the 256Mi-1Gi auto-computed reservation range.
-            eviction-minimum-reclaim: "memory.available=256Mi"
-            enforce-node-allocatable: "pods"
-          ignorePreflightErrors:
-          - FileExisting-conntrack
-        discovery:
-          bootstrapToken:
-            apiServerEndpoint: {{ $.Release.Name }}.{{ $.Release.Namespace }}.svc:6443
-      initConfiguration:
-        skipPhases:
-        - addon/kube-proxy
----
-{{- $context := deepCopy $ }}
-{{- $_ := set $context "group" $group }}
-{{- $_ := set $context "groupName" $groupName }}
-{{- $kubevirtmachinetemplate := include "kubevirtmachinetemplate" $context }}
-{{- $kubevirtmachinetemplateHash := $kubevirtmachinetemplate | sha256sum | trunc 6 }}
-{{- $kubevirtmachinetemplateName := printf "%s-%s-%s" $.Release.Name $groupName $kubevirtmachinetemplateHash }}
-{{- $kubevirtmachinetemplateNames = append $kubevirtmachinetemplateNames $kubevirtmachinetemplateName }}
-apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
-kind: KubevirtMachineTemplate
-metadata:
-  name: {{ $.Release.Name }}-{{ $groupName }}-{{ $kubevirtmachinetemplateHash }}
-  namespace: {{ $.Release.Namespace }}
-spec:
-  template:
-    {{- $kubevirtmachinetemplate | nindent 4 }}
----
-apiVersion: cluster.x-k8s.io/v1beta1
-kind: MachineDeployment
-metadata:
-  name: {{ $.Release.Name }}-{{ $groupName }}
-  namespace: {{ $.Release.Namespace }}
-  annotations:
-    cluster.x-k8s.io/cluster-api-autoscaler-node-group-min-size: "{{ $group.minReplicas }}"
-    cluster.x-k8s.io/cluster-api-autoscaler-node-group-max-size: "{{ $group.maxReplicas }}"
-    {{- if $effectiveMemory }}
-    {{-   $sysBytes := include "cozy-lib.resources.toFloat" $systemReservedMemory | float64 }}
-    {{-   $kubeBytes := include "cozy-lib.resources.toFloat" $kubeReservedMemory | float64 }}
-    {{-   $totalReservedBytes := addf (addf $sysBytes $kubeBytes) $evictionHardBytes }}
-    {{-   $allocatableBytes := subf (include "cozy-lib.resources.toFloat" $effectiveMemory | float64) $totalReservedBytes }}
-    {{-   $allocatableMi := divf $allocatableBytes 1048576.0 | floor }}
-    capacity.cluster-autoscaler.kubernetes.io/memory: "{{ $allocatableMi }}Mi"
-    {{- end }}
-    {{- if $effectiveCpu }}
-    {{-   $sysCpuMillisA := include "kubernetes.cpuToMillicores" $systemReservedCpu | float64 }}
-    {{-   $kubeCpuMillisA := include "kubernetes.cpuToMillicores" $kubeReservedCpu | float64 }}
-    {{-   $effectiveCpuMillicoresA := include "kubernetes.cpuToMillicores" $effectiveCpu | int }}
-    {{-   $effectiveCpuMillisA := float64 $effectiveCpuMillicoresA }}
-    {{-   $allocatableCpuMillis := subf $effectiveCpuMillisA (addf $sysCpuMillisA $kubeCpuMillisA) }}
-    {{-   $allocatableCpuMillisInt := $allocatableCpuMillis | ceil | int }}
-    capacity.cluster-autoscaler.kubernetes.io/cpu: "{{ $allocatableCpuMillisInt }}m"
-    {{- end }}
-spec:
-  clusterName: {{ $.Release.Name }}
-  replicas: 2
-  strategy:
-    rollingUpdate:
-      maxSurge: {{ $group.maxReplicas }}
-      maxUnavailable: 1
-    type: RollingUpdate
-  selector:
-    matchLabels:
-      cluster.x-k8s.io/cluster-name: {{ $.Release.Name }}
-      cluster.x-k8s.io/deployment-name: {{ $.Release.Name }}-{{ $groupName }}
-  template:
-    metadata:
-      labels:
-        cluster.x-k8s.io/cluster-name: {{ $.Release.Name }}
-        cluster.x-k8s.io/deployment-name: {{ $.Release.Name }}-{{ $groupName }}
-        {{- range $group.roles }}
-        node-role.kubernetes.io/{{ . }}: ""
-        {{- end }}
-    spec:
-      bootstrap:
-        configRef:
-          apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
-          kind: KubeadmConfigTemplate
-          name: {{ $.Release.Name }}-{{ $groupName }}
-          namespace: {{ $.Release.Namespace }}
-      clusterName: {{ $.Release.Name }}
-      infrastructureRef:
-        apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
-        kind: KubevirtMachineTemplate
-        name: {{ $.Release.Name }}-{{ $groupName }}-{{ $kubevirtmachinetemplateHash }}
-        namespace: {{ $.Release.Namespace }}
-      version: {{ include "kubernetes.versionMap" $}}
----
-apiVersion: cluster.x-k8s.io/v1beta1
-kind: MachineHealthCheck
-metadata:
-  name: {{ $.Release.Name }}-{{ $groupName }}
-  namespace: {{ $.Release.Namespace }}
+{{- if $isProxmox }}
 spec:
-  clusterName: {{ $.Release.Name }}
-  maxUnhealthy: 0
-  nodeStartupTimeout: 10m
-  selector:
-    matchLabels:
-      cluster.x-k8s.io/cluster-name: {{ $.Release.Name }}
-      cluster.x-k8s.io/deployment-name: {{ $.Release.Name }}-{{ $groupName }}
-  unhealthyConditions:
-  - type: Ready
-    status: Unknown
-    timeout: 30s
-  - type: Ready
-    status: "False"
-    timeout: 300s
----
-apiVersion: cozystack.io/v1alpha1
-kind: WorkloadMonitor
-metadata:
-  name: {{ $.Release.Name }}-{{ $groupName }}
-  namespace: {{ $.Release.Namespace }}
-spec:
-  minReplicas: {{ $group.minReplicas }}
-  kind: kubernetes
-  type: worker
-  selector:
-    cluster.x-k8s.io/cluster-name: {{ $.Release.Name }}
-    cluster.x-k8s.io/deployment-name: {{ $.Release.Name }}-{{ $groupName }}
-    cluster.x-k8s.io/role: worker
-  version: {{ $.Chart.Version }}
-{{- end }}
----
-{{- /*
-We must preserve all previous KubevirtMachineTemplates until a MachineSet references them.
-*/ -}}
-{{- $mss := (lookup "cluster.x-k8s.io/v1beta1" "MachineSet" $.Release.Namespace "").items }}
-{{- $oldKubevirtmachinetemplates := dict }}
-{{- range $kmt := (lookup "infrastructure.cluster.x-k8s.io/v1alpha1" "KubevirtMachineTemplate" .Release.Namespace "").items }}
-{{- range $or := $kmt.metadata.ownerReferences }}
-{{- if and (eq $or.kind "Cluster") (eq $or.name $.Release.Name) }}
-{{- range $ms := $mss }}
-{{- if and (eq $ms.spec.template.spec.infrastructureRef.kind "KubevirtMachineTemplate") (eq $ms.spec.template.spec.infrastructureRef.name $kmt.metadata.name) }}
-{{- if not (has $kmt.metadata.name $kubevirtmachinetemplateNames) }}
-{{- $oldKubevirtmachinetemplates = merge $oldKubevirtmachinetemplates (dict $kmt.metadata.name $kmt) }}
-{{- end }}
-{{- end }}
-{{- end }}
-{{- end }}
-{{- end }}
-{{- end }}
+  {{- /* KubevirtCluster needs no spec: its workers live in this cluster and
+        reach the apiserver over the pod network. A ProxmoxCluster addresses an
+        external hypervisor, so it carries what capmox cannot infer — where VMs
+        may be placed, which addresses they may take, and who resolves names for
+        them.
 
-{{- range $oldKubevirtmachinetemplates }}
----
-apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
-kind: KubevirtMachineTemplate
-metadata:
-  name: {{ .metadata.name }}
-  namespace: {{ .metadata.Namespace }}
-spec:
-  {{- .spec | toYaml | nindent 2 }}
+        externalManagedControlPlane is not decoration next to the managed-by
+        annotation above: capmox reads the FIELD, not the annotation. Its
+        ProxmoxCluster webhook skips endpoint validation only when the field is
+        set, and on an absent controlPlaneEndpoint it does not return a
+        validation error — it panics
+        (internal/webhook/proxmoxcluster_webhook.go:105), so the admission
+        request fails with a nil-pointer stack trace instead of a message.
+        Kamaji owns the endpoint here, so the field is simply true. */}}
+  externalManagedControlPlane: true
+  {{- with .Values.proxmox.allowedNodes }}
+  allowedNodes:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  dnsServers:
+    {{- toYaml .Values.proxmox.dnsServers | nindent 4 }}
+  ipv4Config:
+    addresses:
+      {{- toYaml .Values.proxmox.ipv4Config.addresses | nindent 6 }}
+    gateway: {{ .Values.proxmox.ipv4Config.gateway | quote }}
+    prefix: {{ .Values.proxmox.ipv4Config.prefix }}
 {{- end }}
 {{- end }}
diff --git a/packages/apps/kubernetes/templates/copy-patch-containerd.yaml b/packages/apps/kubernetes/templates/copy-patch-containerd.yaml
deleted file mode 100644
index 433452763d..0000000000
--- a/packages/apps/kubernetes/templates/copy-patch-containerd.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-{{- $sourceSecret := lookup "v1" "Secret" "cozy-system" "patch-containerd" }}
-{{- if $sourceSecret }}
-apiVersion: v1
-kind: Secret
-metadata:
-  name: {{ .Release.Name }}-patch-containerd
-  namespace: {{ .Release.Namespace }}
-type: {{ $sourceSecret.type }}
-data:
-{{- range $key, $value := $sourceSecret.data }}
-  {{ printf "%s: %s" $key ($value | quote) | indent 2 }}
-{{- end }}
-{{- end }}
diff --git a/packages/apps/kubernetes/templates/csi-proxmox/controller.yaml b/packages/apps/kubernetes/templates/csi-proxmox/controller.yaml
new file mode 100644
index 0000000000..e3ebf1eb45
--- /dev/null
+++ b/packages/apps/kubernetes/templates/csi-proxmox/controller.yaml
@@ -0,0 +1,239 @@
+{{- /*
+  The Proxmox CSI controller runs HERE, in the management cluster, and not in
+  the tenant. It is the only component in this pair that holds the hypervisor
+  token, and a token that reaches a tenant cluster is a token the tenant owns:
+  the tenant downloads this cluster's admin kubeconfig (the resource definition
+  lists it in secrets.include), so it is cluster-admin there and can read any
+  Secret. The privileges the driver documents are granted on `/` — VM.Audit,
+  VM.Config.Disk, Datastore.Allocate and friends — so a leaked token reaches
+  every VM and every volume on the whole Proxmox cluster, not just this
+  tenant's.
+
+  This mirrors what the KubeVirt path already does in templates/csi/deploy.yaml:
+  the controller lives in the management cluster and drives the tenant through
+  its admin kubeconfig, while the tenant gets only the node plugin, which
+  mounts no credentials at all. The driver supports exactly this — its
+  --kubeconfig flag is documented as "if the provisioner is being run out of
+  cluster" — and so do the sidecars.
+
+  The token still never appears in a rendered manifest: this Deployment names
+  the operator's Secret, and an init container composes the driver's config
+  file from it into an emptyDir at start-up.
+
+  It follows proxmox.csi.enabled, like the tenant-side release: with the driver
+  switched off there is nothing for a controller to serve and no token to hold.
+*/ -}}
+{{- if eq (.Values.substrate | default "kubevirt") "proxmox" }}
+{{- if and .Values._namespace.etcd .Values.proxmox.csi.enabled }}
+{{- if not .Values.proxmox.csi.credentialsSecretName }}
+{{-   fail "proxmox.csi.credentialsSecretName is required on the proxmox substrate: the CSI controller cannot reach the hypervisor without an API token" }}
+{{- end }}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ .Release.Name }}-pcsi
+  namespace: {{ .Release.Namespace }}
+---
+kind: Deployment
+apiVersion: apps/v1
+metadata:
+  name: {{ .Release.Name }}-pcsi-controller
+  labels:
+    app: {{ .Release.Name }}-pcsi-driver
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: {{ .Release.Name }}-pcsi-driver
+  template:
+    metadata:
+      labels:
+        app: {{ .Release.Name }}-pcsi-driver
+        policy.cozystack.io/allow-to-apiserver: "true"
+    spec:
+      enableServiceLinks: false
+      serviceAccountName: {{ .Release.Name }}-pcsi
+      priorityClassName: system-cluster-critical
+      tolerations:
+        - key: CriticalAddonsOnly
+          operator: Exists
+        - key: node-role.kubernetes.io/control-plane
+          operator: Exists
+          effect: "NoSchedule"
+      initContainers:
+      {{- include "kubernetes.waitForAdminKubeconfig" $ | nindent 6 }}
+      {{- /* The operator's Secret carries the four keys the driver's config
+            file is made of: url, token_id, token_secret and region. Composing
+            them here keeps the token in this namespace: the kubelet of this
+            cluster reads the Secret into a tmpfs volume, and nothing carries it
+            into the tenant. */}}
+      - name: build-cloud-config
+        image: "{{ default (.Files.Get "images/busybox.tag" | trim) .Values.images.waitForKubeconfig }}"
+        command:
+        - sh
+        - -c
+        - |
+          set -eu
+          for k in url token_id token_secret region; do
+            [ -s "/proxmox-credentials/$k" ] || {
+              echo "the credentials Secret has no key '$k'; the driver needs url, token_id, token_secret and region" >&2
+              exit 1
+            }
+          done
+          umask 077
+          {
+            echo "clusters:"
+            echo "  - url: $(cat /proxmox-credentials/url)"
+            echo "    insecure: {{ .Values.proxmox.insecure }}"
+            echo "    token_id: $(cat /proxmox-credentials/token_id)"
+            echo "    token_secret: $(cat /proxmox-credentials/token_secret)"
+            echo "    region: $(cat /proxmox-credentials/region)"
+            echo "features:"
+            {{- /* The driver owns every volume it creates as VMID 9999 unless
+                  controllerVmID is set, which leaves the volumes of different
+                  clusters indistinguishable on shared storage: an operator
+                  cannot tell whose leftovers are whose, and a VM-level ACL
+                  cannot separate them. A per-cluster id derived from the tenant
+                  namespace and the release name gives each cluster its own
+                  owner, even when two tenants name their clusters alike. */}}
+            echo "  controllerVmID: {{ include "kubernetes.proxmoxControllerVmID" $ }}"
+          } > /cloud-config/config.yaml
+        volumeMounts:
+        - name: proxmox-credentials
+          mountPath: /proxmox-credentials
+          readOnly: true
+        - name: cloud-config
+          mountPath: /cloud-config
+        securityContext:
+          allowPrivilegeEscalation: false
+          capabilities:
+            drop:
+            - ALL
+          readOnlyRootFilesystem: true
+      containers:
+        - name: csi-driver
+          image: ghcr.io/sergelogvinov/proxmox-csi-controller:v0.20.0
+          args:
+            - "-v=4"
+            - "--csi-address=unix:///csi/csi.sock"
+            - "--cloud-config=/etc/proxmox/config.yaml"
+            {{- /* Out of cluster: the Nodes, PVs and VolumeAttachments this
+                  driver reconciles are the tenant's, and it reaches them the
+                  same way the KubeVirt controller's sidecars do. */}}
+            - "--kubeconfig=/etc/kubernetes/kubeconfig/super-admin.svc"
+          volumeMounts:
+            - name: socket-dir
+              mountPath: /csi
+            - name: cloud-config
+              mountPath: /etc/proxmox
+              readOnly: true
+            - name: kubeconfig
+              mountPath: /etc/kubernetes/kubeconfig
+              readOnly: true
+          resources:
+            limits:
+              cpu: 500m
+              memory: 256Mi
+            requests:
+              cpu: 10m
+              memory: 32Mi
+          securityContext:
+            allowPrivilegeEscalation: false
+            capabilities:
+              drop:
+              - ALL
+            readOnlyRootFilesystem: true
+        - name: csi-attacher
+          image: registry.k8s.io/sig-storage/csi-attacher:v4.12.0
+          args:
+            - "-v=4"
+            - "--csi-address=unix:///csi/csi.sock"
+            - "--timeout=3m"
+            - "--kubeconfig=/etc/kubernetes/kubeconfig/super-admin.svc"
+          volumeMounts:
+            - name: socket-dir
+              mountPath: /csi
+            - name: kubeconfig
+              mountPath: /etc/kubernetes/kubeconfig
+              readOnly: true
+          resources:
+            limits:
+              cpu: 500m
+              memory: 256Mi
+            requests:
+              cpu: 10m
+              memory: 32Mi
+          securityContext:
+            allowPrivilegeEscalation: false
+            capabilities:
+              drop:
+              - ALL
+            readOnlyRootFilesystem: true
+        - name: csi-provisioner
+          image: registry.k8s.io/sig-storage/csi-provisioner:v6.3.0
+          args:
+            - "-v=4"
+            - "--csi-address=unix:///csi/csi.sock"
+            - "--timeout=3m"
+            - "--default-fstype=ext4"
+            - "--feature-gates=Topology=true"
+            - "--kubeconfig=/etc/kubernetes/kubeconfig/super-admin.svc"
+          volumeMounts:
+            - name: socket-dir
+              mountPath: /csi
+            - name: kubeconfig
+              mountPath: /etc/kubernetes/kubeconfig
+              readOnly: true
+          resources:
+            limits:
+              cpu: 500m
+              memory: 256Mi
+            requests:
+              cpu: 10m
+              memory: 32Mi
+          securityContext:
+            allowPrivilegeEscalation: false
+            capabilities:
+              drop:
+              - ALL
+            readOnlyRootFilesystem: true
+        - name: csi-resizer
+          image: registry.k8s.io/sig-storage/csi-resizer:v2.2.1
+          args:
+            - "-v=4"
+            - "--csi-address=unix:///csi/csi.sock"
+            - "--timeout=3m"
+            - "--kubeconfig=/etc/kubernetes/kubeconfig/super-admin.svc"
+          volumeMounts:
+            - name: socket-dir
+              mountPath: /csi
+            - name: kubeconfig
+              mountPath: /etc/kubernetes/kubeconfig
+              readOnly: true
+          resources:
+            limits:
+              cpu: 500m
+              memory: 256Mi
+            requests:
+              cpu: 10m
+              memory: 32Mi
+          securityContext:
+            allowPrivilegeEscalation: false
+            capabilities:
+              drop:
+              - ALL
+            readOnlyRootFilesystem: true
+      volumes:
+        - name: socket-dir
+          emptyDir: {}
+        - name: cloud-config
+          emptyDir:
+            medium: Memory
+        - name: proxmox-credentials
+          secret:
+            secretName: {{ .Values.proxmox.csi.credentialsSecretName | quote }}
+        - name: kubeconfig
+          secret:
+            secretName: {{ .Release.Name }}-admin-kubeconfig
+{{- end }}
+{{- end }}
diff --git a/packages/apps/kubernetes/templates/csi/deploy.yaml b/packages/apps/kubernetes/templates/csi/deploy.yaml
index de62104c07..6c09ff8a84 100644
--- a/packages/apps/kubernetes/templates/csi/deploy.yaml
+++ b/packages/apps/kubernetes/templates/csi/deploy.yaml
@@ -1,3 +1,11 @@
+{{- /* KubeVirt-only: the cloud-controller-manager and the CSI driver here
+      exist to reach the workers' VirtualMachines and their DataVolumes in
+      THIS cluster. On the proxmox substrate the VMs are on an external
+      hypervisor: the CSI node plugin comes from the proxmox-csi package and
+      its controller, with the cloud-controller-manager, runs in this cluster
+      (templates/csi-proxmox/, templates/ccm-proxmox/). Rendering these would
+      leave a controller in the tenant reconciling objects that do not exist. */}}
+{{- if ne (.Values.substrate | default "kubevirt") "proxmox" }}
 {{- if .Values._namespace.etcd }}
 kind: Deployment
 apiVersion: apps/v1
@@ -36,6 +44,9 @@ spec:
             - "--infra-cluster-namespace=$(INFRACLUSTER_NAMESPACE)"
             - "--infra-cluster-labels=$(INFRACLUSTER_LABELS)"
             - "--run-node-service=false"
+            # false while packages/system/kubevirt leaves HotplugVolumes off:
+            # without that gate virt-api rejects removevolume on a VM-owned VMI.
+            - "--enable-vmi-hotplug-fallback=false"
             - "--v=5"
           ports:
             - name: healthz
@@ -79,7 +90,7 @@ spec:
               - ALL
             readOnlyRootFilesystem: true
         - name: csi-provisioner
-          image: quay.io/openshift/origin-csi-external-provisioner:latest
+          image: registry.k8s.io/sig-storage/csi-provisioner:v6.1.0
           resources:
             limits:
               cpu: 512m
@@ -109,7 +120,7 @@ spec:
               mountPath: /etc/kubernetes/kubeconfig
               readOnly: true
         - name: csi-attacher
-          image: quay.io/openshift/origin-csi-external-attacher:latest
+          image: registry.k8s.io/sig-storage/csi-attacher:v4.10.0
           args:
             - "--csi-address=$(ADDRESS)"
             - "--kubeconfig=/etc/kubernetes/kubeconfig/super-admin.svc"
@@ -138,7 +149,7 @@ spec:
               - ALL
             readOnlyRootFilesystem: true
         - name: csi-liveness-probe
-          image: quay.io/openshift/origin-csi-livenessprobe:latest
+          image: registry.k8s.io/sig-storage/livenessprobe:v2.17.0
           args:
             - "--csi-address=/csi/csi.sock"
             - "--probe-timeout=3s"
@@ -224,9 +235,12 @@ spec:
               name: kubeconfig
               readOnly: true
           resources:
+            limits:
+              cpu: 512m
+              memory: 512Mi
             requests:
-              cpu: 10m
-              memory: 20Mi
+              cpu: 125m
+              memory: 128Mi
           securityContext:
             capabilities:
               drop:
@@ -240,3 +254,4 @@ spec:
             optional: true
           name: kubeconfig
 {{- end }}
+{{- end }}
diff --git a/packages/apps/kubernetes/templates/csi/infra-cluster-service-account.yaml b/packages/apps/kubernetes/templates/csi/infra-cluster-service-account.yaml
index fb11ab252d..cdcbe61c46 100644
--- a/packages/apps/kubernetes/templates/csi/infra-cluster-service-account.yaml
+++ b/packages/apps/kubernetes/templates/csi/infra-cluster-service-account.yaml
@@ -1,3 +1,11 @@
+{{- /* KubeVirt-only: the cloud-controller-manager and the CSI driver here
+      exist to reach the workers' VirtualMachines and their DataVolumes in
+      THIS cluster. On the proxmox substrate the VMs are on an external
+      hypervisor: the CSI node plugin comes from the proxmox-csi package and
+      its controller, with the cloud-controller-manager, runs in this cluster
+      (templates/csi-proxmox/, templates/ccm-proxmox/). Rendering these would
+      leave a controller in the tenant reconciling objects that do not exist. */}}
+{{- if ne (.Values.substrate | default "kubevirt") "proxmox" }}
 ---
 apiVersion: v1
 kind: ServiceAccount
@@ -15,8 +23,11 @@ rules:
 - apiGroups: ["kubevirt.io"]
   resources: ["virtualmachineinstances", "virtualmachines"]
   verbs: ["list", "get"]
+# virtualmachineinstances/removevolume: the driver's fallback for a volume
+# missing from the VM spec. Without the HotplugVolumes gate virt-api accepts
+# it only on a VMI no VM owns, e.g. after an orphan-propagation delete.
 - apiGroups: ["subresources.kubevirt.io"]
-  resources: ["virtualmachines/addvolume", "virtualmachines/removevolume"]
+  resources: ["virtualmachines/addvolume", "virtualmachines/removevolume", "virtualmachineinstances/removevolume"]
   verbs: ["update"]
 - apiGroups: ["snapshot.storage.k8s.io"]
   resources: ["volumesnapshots"]
@@ -61,3 +72,4 @@ subjects:
 - kind: ServiceAccount
   name: {{ .Release.Name }}-kcsi
   namespace: {{ .Release.Namespace }}
+{{- end }}
diff --git a/packages/apps/kubernetes/templates/dashboard-resourcemap.yaml b/packages/apps/kubernetes/templates/dashboard-resourcemap.yaml
index b47888e9fb..89a5f94aa8 100644
--- a/packages/apps/kubernetes/templates/dashboard-resourcemap.yaml
+++ b/packages/apps/kubernetes/templates/dashboard-resourcemap.yaml
@@ -10,6 +10,11 @@ rules:
   resourceNames:
   - {{ .Release.Name }}
   verbs: ["get", "list", "watch"]
+{{- /* withholdAdminKubeconfig is internal wiring, deliberately absent from
+       values.yaml and the schema: a wrapper that keeps the cluster-admin
+       credential from the tenant (the computeplane module) sets it in its own
+       HelmRelease values, out of tenant reach. */}}
+{{- if not .Values.withholdAdminKubeconfig }}
 - apiGroups:
   - ""
   resources:
@@ -17,6 +22,7 @@ rules:
   resourceNames:
   - {{ .Release.Name }}-admin-kubeconfig
   verbs: ["get", "list", "watch"]
+{{- end }}
 - apiGroups:
   - ""
   resources:
@@ -30,9 +36,6 @@ rules:
   - workloadmonitors
   resourceNames:
   - {{ .Release.Name }}
-  {{- range $groupName, $group := .Values.nodeGroups }}
-  - {{ $.Release.Name }}-{{ $groupName }}
-  {{- end }}
   verbs: ["get", "list", "watch"]
 ---
 kind: RoleBinding
diff --git a/packages/apps/kubernetes/templates/delete.yaml b/packages/apps/kubernetes/templates/delete.yaml
index 702ba54280..4a0dad2b93 100644
--- a/packages/apps/kubernetes/templates/delete.yaml
+++ b/packages/apps/kubernetes/templates/delete.yaml
@@ -8,6 +8,37 @@ metadata:
     "helm.sh/hook-delete-policy": hook-succeeded,before-hook-creation
   name: {{ .Release.Name }}-pre-cleanup
 spec:
+  # One attempt. restartPolicy Never turns the default of 6 into seven pods in
+  # series, each restarting the script from Step 1 and each paying its own image
+  # pull, which outlives the uninstall budget: helm then times out on its own
+  # instead of reporting which step failed.
+  #
+  # Zero and not one, because a second attempt does not fit. Both waits below
+  # are guarded, so an attempt can spend all of its budget without failing and a
+  # retry starts from Step 1 with the clock already there; on a nodeless tenant
+  # it also re-pays Step 4, since attempt one leaves the TenantControlPlane
+  # terminating. The failure a retry would cover is an eviction (this pod
+  # tolerates control-plane taints), which is not bounded in time and costs most
+  # when it arrives late. The price is that such an eviction fails the whole
+  # attempt and flux repeats it on its own interval — slower, and predictable.
+  backoffLimit: 0
+  # No activeDeadlineSeconds, for arithmetic rather than oversight. A deadline
+  # has to sit above the sum of the waits below, or it cuts runs that were going
+  # to finish, and far enough under helm-controller's uninstall budget to be
+  # what helm reports rather than what it waits through. Those two bounds do not
+  # currently leave a gap, and the image pull comes from Docker Hub with no
+  # mirror in front of it.
+  #
+  # Note that the sum is a whole-Job figure only while backoffLimit is 0:
+  # activeDeadlineSeconds runs from status.startTime and a retry does not reset
+  # it, so allowing retries means the deadline has to clear all of them.
+  #
+  # Room comes from raising spec.uninstall.timeout on the generated HelmRelease,
+  # not from squeezing the waits further.
+  # packages/apps/bucket/templates/hooks/cleanup-acme.yaml is the shape to copy
+  # then: same image, with the deadline and the retry budget set together, and
+  # --request-timeout on each call so an unresponsive apiserver is bounded too,
+  # which --wait=false below does not cover.
   template:
     metadata:
       labels:
@@ -21,14 +52,83 @@ spec:
         - key: node-role.kubernetes.io/control-plane
           operator: Exists
           effect: "NoSchedule"
+      securityContext:
+        runAsNonRoot: true
+        runAsUser: 65534
+        runAsGroup: 65534
+        seccompProfile:
+          type: RuntimeDefault
       containers:
         - name: kubectl
           image: docker.io/clastix/kubectl:v1.32
+          securityContext:
+            allowPrivilegeEscalation: false
+            readOnlyRootFilesystem: true
+            capabilities:
+              drop: ["ALL"]
+          env:
+            - name: HOME
+              value: /tmp
+          resources:
+            requests:
+              cpu: 10m
+              memory: 64Mi
+            limits:
+              cpu: 200m
+              memory: 128Mi
           command:
             - /bin/sh
             - -c
             - |
               set -e
+              # Steps below that can be defeated by a stuck object log a warning
+              # and carry on rather than failing. That is deliberate: this is a
+              # pre-delete hook, so a non-zero exit aborts the Helm uninstall
+              # before the release is removed — the release stays in storage and
+              # the same doomed teardown is retried forever. Those steps
+              # therefore report nothing through the exit code, which leaves the
+              # final message as their only report. Record what those steps
+              # leave behind so that message can name it instead of claiming
+              # success in exactly the case the warnings were written for. The
+              # steps that are NOT backstopped — Steps 3, 5, 6 and 7, and the patch
+              # inside Step 1 — end the run under set -e and never reach that
+              # message at all.
+              #
+              # What gets recorded is RESIDUE, never a change of route. A
+              # bounded delete that times out has a remedy right behind it —
+              # Step 2 falls through to force-clearing finalizers, Step 4 falls
+              # through to Step 4b — and whether anything survived is decided by
+              # that remedy, which records its own outcome. Recording the
+              # timeout as well would report a finished teardown as incomplete
+              # on the commonest fallback path there is: a tenant with no
+              # working nodes, which is exactly why the wait is bounded. Those
+              # steps warn and say nothing to the summary.
+              #
+              # A read that fails looks exactly like one that found nothing: an
+              # empty list and a failed list both give a loop nothing to
+              # iterate, and an absent object and an unreachable apiserver both
+              # make a probe non-zero. Every read this summary rests on
+              # therefore keeps its status — Step 2's force-clear re-list, and
+              # both of Step 4b's probes. Step 1's list is the one that does
+              # not, and that is a decision rather than an omission: Step 2
+              # deletes by label rather than from that list, so a suspend that
+              # never happened leaves nothing of its own behind, and reporting
+              # it would name residue that does not exist.
+              residue_from=""
+              backstop() {
+                # A label is recorded once however many objects hit it: the Step
+                # 2 force-clear runs per child HelmRelease, and a summary that
+                # repeated one step per failed object would read as several
+                # distinct failures. Matched between separators so that a label
+                # which is a prefix of another still counts as absent.
+                case ", $residue_from," in
+                  *", $1,"*) ;;
+                  *) residue_from="${residue_from}${residue_from:+, }$1" ;;
+                esac
+                shift
+                echo "WARNING: $*" >&2
+              }
+
               echo "Step 1: Suspending all HelmReleases with label cozystack.io/target-cluster-name={{ .Release.Name }}"
               for hr in $(kubectl -n {{ .Release.Namespace }} get helmreleases.helm.toolkit.fluxcd.io -l "cozystack.io/target-cluster-name={{ .Release.Name }}" -o name 2>/dev/null || true); do
                 if [ -n "$hr" ]; then           
@@ -38,33 +138,313 @@ spec:
                     --type=merge --field-manager=flux-client-side-apply
                 fi
               done
+{{- if eq (.Values.substrate | default "kubevirt") "proxmox" }}
+              {{- /* Step 1b, proxmox only, and it has to come before Step 2.
+                    A PVC on this substrate is a disk on the hypervisor, and the
+                    only thing that can free it is the CSI controller answering
+                    DeleteVolume. Step 2 removes that controller. capmox then
+                    destroys the worker VMs, and Proxmox frees only the volumes
+                    the destroyed VMID owns — these are owned by the driver's
+                    own controllerVmID, not by any worker — so anything still
+                    bound here stays on storage after the cluster is gone, with
+                    the tenant's data in it and no PV object left to say whose
+                    it was. Deleting the claims while the driver is still up is
+                    what turns that into a DeleteVolume call.
+
+                    Best effort on purpose: a tenant that never came up has no
+                    apiserver to ask, and a teardown must not wedge on that. */}}
+              echo "Step 1b: Releasing Proxmox volumes while the CSI driver is still running"
+              kubeconfig=/tmp/tenant-kubeconfig
+              if kubectl -n {{ .Release.Namespace }} get secret {{ .Release.Name }}-admin-kubeconfig \
+                   -o jsonpath='{.data.super-admin\.svc}' 2>/dev/null | base64 -d > "$kubeconfig" 2>/dev/null && [ -s "$kubeconfig" ]; then
+                {{- /* A kubeconfig that exists is not an apiserver that answers.
+                      Listing claims against one that does not would come back
+                      empty, and empty is the clean case below — so the two are
+                      told apart first, and the silent one goes through the
+                      backstop rather than through "no PVCs to release".
+                      Bounded by `timeout`, not by --request-timeout: a non-zero
+                      --request-timeout on an in-cluster kubectl call diverts it
+                      to localhost:8080, which is why
+                      hack/check-hook-request-timeout.bats refuses the flag in
+                      hook templates, and the check cannot tell this call, which
+                      carries its own kubeconfig, from one that does not. */}}
+                if ! timeout 30 kubectl --kubeconfig "$kubeconfig" get --raw /readyz >/dev/null 2>&1; then
+                  backstop "step 1b (proxmox volumes)" \
+                    "the tenant apiserver did not answer, so no claim could be released; any Proxmox volume the tenant still held stays on the hypervisor"
+                  pvcs=""
+                else
+                  pvcs=$(kubectl --kubeconfig "$kubeconfig" get pvc -A \
+                    -o jsonpath='{range .items[?(@.spec.storageClassName)]}{.metadata.namespace}{" "}{.metadata.name}{" "}{.spec.volumeName}{"\n"}{end}' 2>/dev/null || true)
+                fi
+                if [ -n "$pvcs" ]; then
+                  {{- /* The claims go first, with --wait=false: a claim being
+                        deleted is one the scheduler places no new Pod on, so a
+                        Pod that a StatefulSet or Deployment brings back cannot
+                        mount it again and hold it to the backstop. Then the
+                        Pods that hold them: a claim in use carries the
+                        kubernetes.io/pvc-protection finalizer, so it clears only
+                        once nothing mounts it. The cluster is being destroyed,
+                        so the workloads are going with it either way. */}}
+                  echo "$pvcs" | while read -r pns pname pv; do
+                    [ -n "$pname" ] || continue
+                    echo "  Deleting PVC $pns/$pname (PV $pv)"
+                    kubectl --kubeconfig "$kubeconfig" -n "$pns" delete pvc "$pname" --wait=false --ignore-not-found 2>/dev/null || true
+                  done
+                  {{- /* One line per Pod: its name, then every claim it
+                        mounts. A JSONPath filter on the claim name cannot be
+                        used here: with a Pod that mounts two claims its left
+                        side yields two values, client-go refuses the whole
+                        expression ("can only compare one element at a time"),
+                        and no Pod in that namespace would be found for any
+                        claim. The match is made in the shell instead, on whole
+                        words. */}}
+                  echo "$pvcs" | while read -r pns pname pv; do
+                    [ -n "$pname" ] || continue
+                    kubectl --kubeconfig "$kubeconfig" -n "$pns" get pods \
+                      -o jsonpath='{range .items[*]}{.metadata.name}{range .spec.volumes[*]}{" "}{.persistentVolumeClaim.claimName}{end}{"\n"}{end}' 2>/dev/null \
+                      | while read -r pod claims; do
+                          case " $claims " in
+                            *" $pname "*) ;;
+                            *) continue ;;
+                          esac
+                          echo "  Deleting Pod $pns/$pod, which holds $pname"
+                          kubectl --kubeconfig "$kubeconfig" -n "$pns" delete pod "$pod" --grace-period=0 --force --ignore-not-found 2>/dev/null || true
+                        done
+                  done
+                  {{- /* Wait on the PVs, not the PVCs: the claim disappears as
+                        soon as its finalizer clears, while the disk is freed
+                        only when the PV is gone. */}}
+                  deadline=$(( $(date +%s) + 300 ))
+                  while [ "$(date +%s)" -lt "$deadline" ]; do
+                    left=$(kubectl --kubeconfig "$kubeconfig" get pv \
+                      -o jsonpath='{range .items[?(@.spec.csi.driver=="csi.proxmox.sinextra.dev")]}{.metadata.name}{"\n"}{end}' 2>/dev/null | grep -c . || true)
+                    [ "${left:-0}" -eq 0 ] && break
+                    echo "  waiting for $left Proxmox volume(s) to be released"
+                    sleep 5
+                  done
+                  left=$(kubectl --kubeconfig "$kubeconfig" get pv \
+                    -o jsonpath='{range .items[?(@.spec.csi.driver=="csi.proxmox.sinextra.dev")]}{.metadata.name}{"\n"}{end}' 2>/dev/null | grep -c . || true)
+                  if [ "${left:-0}" -ne 0 ]; then
+                    backstop "step 1b (proxmox volumes)" \
+                      "$left Proxmox volume(s) were not released in 300s; their disks stay on the hypervisor and no PV object will survive to name them"
+                  fi
+                else
+                  echo "  no PVCs to release"
+                fi
+              else
+                echo "  no tenant kubeconfig; nothing to release" >&2
+              fi
+{{- end }}
 
               echo "Step 2: Deleting HelmReleases with label cozystack.io/target-cluster-name={{ .Release.Name }}"
-              kubectl -n {{ .Release.Namespace }} delete helmreleases.helm.toolkit.fluxcd.io \
-                -l "cozystack.io/target-cluster-name={{ .Release.Name }}" \
-                --ignore-not-found=true --wait=true
+              # --wait=true blocks until the child HelmReleases (in-tenant cilium,
+              # coredns, csi, ingress-nginx, …) are fully gone. When the tenant
+              # never became a working cluster — no Ready nodes: storage/LINSTOR
+              # exhaustion, worker VMs that never joined, or a nodeGroup at
+              # minReplicas: 0 — those uninstalls cannot converge (e.g. in-tenant
+              # cilium stays InstallFailed because cilium-operator has nothing to
+              # schedule on), and an UNBOUNDED wait hangs this hook forever: the
+              # parent Helm uninstall then fails on the pre-cleanup Job and the
+              # Kubernetes CR is stuck deleting (see #3271). Bound the wait; if it
+              # expires, force-remove the Flux finalizer from any child HR still
+              # present so it can be garbage-collected. This is safe here because
+              # the whole tenant — its control plane included (torn down in Steps
+              # 3/4 below) — is being destroyed, so there is nothing left to
+              # orphan; a healthy tenant's children uninstall well within the
+              # timeout and never reach the force path.
+              if ! kubectl -n {{ .Release.Namespace }} delete helmreleases.helm.toolkit.fluxcd.io \
+                   -l "cozystack.io/target-cluster-name={{ .Release.Name }}" \
+                   --ignore-not-found=true --wait=true --timeout=120s; then
+                echo "WARNING: child HelmReleases for {{ .Release.Name }} did not uninstall within timeout (tenant likely has no working nodes); force-clearing their finalizers so teardown can proceed" >&2
+                # Captured, not piped straight into `for`: a list that fails and
+                # a list that comes back empty both give the loop nothing to
+                # iterate, and everything this one fails to return keeps its
+                # finalizer. Without the status there is no way to tell those
+                # apart, and the closing message would call the run clean.
+                stuck_hrs=$(kubectl -n {{ .Release.Namespace }} get helmreleases.helm.toolkit.fluxcd.io \
+                              -l "cozystack.io/target-cluster-name={{ .Release.Name }}" -o name 2>/dev/null) \
+                  || backstop "step 2 (child HelmRelease enumeration)" \
+                       "could not list the child HelmReleases left after the timeout, so none could be force-cleared; any still holding finalizers were left in place"
+                for hr in $stuck_hrs; do
+                  [ -n "$hr" ] || continue
+                  echo "  Force-clearing finalizers on $hr"
+                  kubectl -n {{ .Release.Namespace }} patch "$hr" \
+                    --type=merge -p '{"metadata":{"finalizers":null}}' \
+                    || backstop "step 2 (child HelmRelease finalizers)" "failed to clear finalizers on $hr"
+                done
+              fi
 
               echo "Step 3: Deleting KamajiControlPlane {{ .Release.Name }}"
+              # --wait is spelled out because kubectl defaults it to true, and a
+              # --timeout it does not carry defaults to 0, which kubectl reads
+              # as "wait forever" and turns into a week.
+              #
+              # false rather than a bound, because there is nothing here worth
+              # waiting for. What matters downstream is the TenantControlPlane,
+              # and Step 4 deletes that one directly and waits for it; blocking
+              # on the KamajiControlPlane first only adds a second place for a
+              # CAPI finalizer to stall the hook. Not waiting also keeps this
+              # step under `set -e` with no guard: with no timeout to expire,
+              # every remaining non-zero exit is a real failure — the API
+              # rejecting the request, discovery breaking, RBAC being wrong —
+              # and none of those should be reported as a cleanup that happened.
               kubectl -n {{ .Release.Namespace }} delete kamajicontrolplanes.controlplane.cluster.x-k8s.io {{ .Release.Name }} \
-                --ignore-not-found=true
+                --ignore-not-found=true --wait=false
 
-              echo "Step 4: Deleting TenantControlPlane {{ .Release.Name }}"
+              echo "Step 4: Deleting TenantControlPlane {{ .Release.Name }} and waiting for it to be removed"
+              # --wait=true blocks until the TenantControlPlane object is fully
+              # gone. This is required so that Kamaji's TCP finalizer-cleanup
+              # chain (which strips finalizer.kamaji.clastix.io/datastore-secret
+              # off the <release>-datastore-config Secret) has a chance to run
+              # before we fall through to Step 4b. A short --timeout keeps the
+              # hook from hanging forever if Kamaji is unreachable; Step 4b is
+              # the backstop for that case.
               kubectl -n {{ .Release.Namespace }} delete tenantcontrolplanes.kamaji.clastix.io {{ .Release.Name }} \
-                --ignore-not-found=true
+                --ignore-not-found=true --wait=true --timeout=120s \
+                || echo "WARNING: TenantControlPlane {{ .Release.Name }} did not delete within timeout; falling through to Step 4b, which reports whether the datastore-secret finalizer was left behind" >&2
 
+              echo "Step 4b: Clearing leftover Kamaji datastore-secret finalizer on {{ .Release.Name }}-datastore-config"
+              # Kamaji creates a per-tenant datastore connection Secret named
+              # <tcp-name>-datastore-config (tcp-name == .Release.Name) and adds
+              # the finalizer "finalizer.kamaji.clastix.io/datastore-secret" to
+              # it. That finalizer is normally removed by Kamaji as part of the
+              # TenantControlPlane deletion above. If the TCP was force-deleted,
+              # or Kamaji did not reconcile the removal in time, the finalizer
+              # stays on the Secret and blocks deletion of the entire namespace
+              # (the Secret cannot be garbage-collected). Issue #3062 reported
+              # that leak and is closed, but it was closed by this step rather
+              # than by a Kamaji fix: the ordering it describes is still
+              # reachable, so this backstop stays.
+              #
+              # By this point the TenantControlPlane is gone (Step 4 waited for
+              # it), so Kamaji no longer has any legitimate use for this Secret:
+              # the Secret has an ownerReference to the now-deleted TCP and is
+              # only awaiting garbage collection. Stripping the finalizer here is
+              # therefore safe and merely lets the GC reap it. We only patch the
+              # finalizers field of this one named Secret.
+              # Only clear the finalizer if the TenantControlPlane is actually gone.
+              # Step 4 may have timed out with the TCP still present; in that case
+              # Kamaji still legitimately owns the datastore Secret, and stripping
+              # the finalizer would interfere with its lifecycle management. Gate
+              # the patch on the TCP being confirmed absent (CodeRabbit #3078).
+              #
+              # Both probes below are three-way: present, absent, or unknown.
+              # `>/dev/null 2>&1` would collapse the last two, and the mistake is
+              # not symmetric — reading a throttled apiserver as "confirmed
+              # absent" is exactly what defeats the gate this paragraph is about.
+              # `--ignore-not-found` keeps a missing object at exit 0 with no
+              # output and leaves every other failure non-zero, so the status
+              # separates "not there" from "could not ask". (Measured here: a
+              # kubectl that cannot reach a cluster still exits non-zero with the
+              # flag set. That a NotFound exits 0 is inferred rather than
+              # measured — from Steps 2 to 6 in this same script, which pass
+              # `--ignore-not-found` to `delete` under a bare `set -e` and do not
+              # end the run on an object that is already gone.)
+              tcp_lookup=0
+              tcp=$(kubectl -n {{ .Release.Namespace }} get tenantcontrolplanes.kamaji.clastix.io {{ .Release.Name }} \
+                      -o name --ignore-not-found 2>/dev/null) || tcp_lookup=1
+              if [ "$tcp_lookup" != 0 ]; then
+                backstop "step 4b (datastore-secret state unknown)" \
+                  "could not determine whether TenantControlPlane {{ .Release.Name }} is gone, so the finalizer on secret/{{ .Release.Name }}-datastore-config was left untouched rather than stripped from an owner that may still exist; if it is still there it will block deletion of namespace {{ .Release.Namespace }}"
+              elif [ -n "$tcp" ]; then
+                # A label of its own, not the one below: both branches leave the
+                # finalizer on the Secret, but they want opposite things from
+                # whoever reads this. Below, the patch was rejected and the
+                # finalizer has to be cleared by hand. Here it is Kamaji's to
+                # clear and the TenantControlPlane is what needs looking at, so
+                # naming the Secret would send the reader to strip a finalizer
+                # its owner is still using.
+                backstop "step 4b (TenantControlPlane still deleting)" \
+                  "TenantControlPlane {{ .Release.Name }} is still present, so Kamaji may still own secret/{{ .Release.Name }}-datastore-config; leaving its finalizer untouched, and it will block deletion of namespace {{ .Release.Namespace }} until that TenantControlPlane finishes deleting"
+              else
+                secret_lookup=0
+                secret=$(kubectl -n {{ .Release.Namespace }} get secret {{ .Release.Name }}-datastore-config \
+                           -o name --ignore-not-found 2>/dev/null) || secret_lookup=1
+                if [ "$secret_lookup" != 0 ]; then
+                  backstop "step 4b (datastore-secret state unknown)" \
+                    "could not determine whether secret/{{ .Release.Name }}-datastore-config still exists, so its finalizer was neither confirmed gone nor cleared; if it is still there it will block deletion of namespace {{ .Release.Namespace }}"
+                elif [ -n "$secret" ]; then
+                  echo "  Removing finalizers from secret/{{ .Release.Name }}-datastore-config"
+                  kubectl -n {{ .Release.Namespace }} patch secret {{ .Release.Name }}-datastore-config \
+                    --type=merge -p '{"metadata":{"finalizers":null}}' \
+                    || backstop "step 4b (datastore-secret finalizer)" \
+                         "failed to clear finalizer.kamaji.clastix.io/datastore-secret from secret/{{ .Release.Name }}-datastore-config; it will block deletion of namespace {{ .Release.Namespace }} until it is removed by hand"
+                else
+                  echo "  Secret {{ .Release.Name }}-datastore-config not present; nothing to do"
+                fi
+              fi
+
+              # Steps 5 and 6 do not wait. Both defaulted to --wait=true with no
+              # --timeout, so either one parked this hook for a week on a single
+              # stuck finalizer: a DataVolume held by a CDI importer or a PVC
+              # finalizer is the reachable case. Waiting buys nothing here.
+              # Nothing after these steps reads their result, and the DELETE has
+              # already been accepted either way — an expired wait and
+              # --wait=false leave the same cluster state, with the same objects
+              # finalizing in the background once the hook has moved on.
+              {{- /* CDI is a KubeVirt-path component and is not installed on
+                    every cluster; on the proxmox substrate there are no
+                    DataVolumes at all. kubectl exits non-zero on an unknown
+                    resource type, and under set -e that failed the whole hook
+                    after every earlier step had already run — the teardown then
+                    reports failure while the cluster is half gone. Checked
+                    rather than assumed. */}}
               echo "Step 5: Cleaning up DataVolumes"
-              kubectl -n {{ .Release.Namespace }} delete datavolumes \
-                -l "cluster.x-k8s.io/cluster-name={{ .Release.Name }}" \
-                --ignore-not-found=true
+              if ! kubectl api-resources --api-group=cdi.kubevirt.io 2>/dev/null | grep -q datavolumes; then
+                echo "  DataVolume CRD is not installed; nothing to clean up"
+              else
+                kubectl -n {{ .Release.Namespace }} delete datavolumes \
+                  -l "cluster.x-k8s.io/cluster-name={{ .Release.Name }}" \
+                  --ignore-not-found=true --wait=false
+              fi
 
               echo "Step 6: Cleaning up LoadBalancer Services"
               kubectl -n {{ .Release.Namespace }} delete services \
                 -l "cluster.x-k8s.io/cluster-name={{ .Release.Name }}" \
                 --field-selector spec.type=LoadBalancer \
-                --ignore-not-found=true
+                --ignore-not-found=true --wait=false
 
-              echo "Cleanup completed successfully"
+              echo "Step 7: Deleting the Talos PKI and the OIDC bootstrap Job, which outlive the release"
+              # cert-manager runs with enableCertificateOwnerRef: false, so the
+              # two Talos Secrets carry no ownerReference to their Certificates
+              # and survive the uninstall, holding the CA private key of a
+              # cluster that no longer exists. A new cluster of the same name
+              # would then adopt that stale CA instead of issuing its own.
+              #
+              # The Certificates go first: deleting a Secret whose Certificate
+              # still exists is how cert-manager is told to re-issue it, so the
+              # other order brings the Secret back with a fresh key, orphaned
+              # all the same. Neither carries a finalizer, so --wait=false
+              # still leaves each one gone before the next call.
+              #
+              # After Step 4, because the control plane's CSR signer mounts the
+              # CA and the TenantControlPlane is what runs it.
+              #
+              # The OIDC bootstrap Job is a hook with before-hook-creation
+              # only, and hooks are not in the release manifest, so nothing
+              # else ever removes it.
+              kubectl -n {{ .Release.Namespace }} delete certificates.cert-manager.io \
+                {{ .Release.Name }}-talos-ca {{ .Release.Name }}-talos-tls-cert \
+                --ignore-not-found=true --wait=false
+              kubectl -n {{ .Release.Namespace }} delete secrets \
+                {{ .Release.Name }}-talos-ca {{ .Release.Name }}-talos-tls-cert \
+                --ignore-not-found=true --wait=false
+              kubectl -n {{ .Release.Namespace }} delete jobs.batch \
+                {{ .Release.Name }}-oidc-bootstrap \
+                --ignore-not-found=true --wait=false
 
+              if [ -n "$residue_from" ]; then
+                echo "Cleanup incomplete; residue left by: $residue_from" >&2
+                echo "Objects named in the warnings above may need removing by hand; exiting 0 so the release can still be uninstalled" >&2
+              else
+                echo "Cleanup completed successfully"
+              fi
+          volumeMounts:
+            - name: tmp
+              mountPath: /tmp
+      volumes:
+        - name: tmp
+          emptyDir: {}
 ---
 apiVersion: v1
 kind: ServiceAccount
@@ -94,6 +474,9 @@ rules:
       - watch
       - patch
       - delete
+  # watch is granted only where a delete still waits: Step 2 on helmreleases and
+  # Step 4 on tenantcontrolplanes. The other deletes pass --wait=false, so
+  # kubectl never opens a watch for them and the verb would be unexercised.
   - apiGroups:
       - "controlplane.cluster.x-k8s.io"
     resources:
@@ -101,7 +484,6 @@ rules:
     verbs:
       - get
       - list
-      - watch
       - delete
   - apiGroups:
       - "kamaji.clastix.io"
@@ -119,7 +501,6 @@ rules:
     verbs:
       - get
       - list
-      - watch
       - delete
   - apiGroups:
       - ""
@@ -128,7 +509,55 @@ rules:
     verbs:
       - get
       - list
-      - watch
+      - delete
+  # Scoped to two Secrets by name: the Kamaji datastore connection Secret, whose
+  # leftover finalizer.kamaji.clastix.io/datastore-secret finalizer Step 4b
+  # strips, and on the proxmox substrate the tenant's admin kubeconfig, which
+  # Step 1b needs to delete the tenant's PVCs while the CSI driver is still up.
+  # Without the second one Step 1b degrades to "no tenant kubeconfig" and says
+  # nothing is to be released while the volumes are quietly left behind.
+  - apiGroups:
+      - ""
+    resources:
+      - secrets
+    resourceNames:
+      - {{ .Release.Name }}-datastore-config
+      {{- if eq (.Values.substrate | default "kubevirt") "proxmox" }}
+      - {{ .Release.Name }}-admin-kubeconfig
+      {{- end }}
+    verbs:
+      - get
+      - patch
+  # Step 7. Named rather than granted on the kind: the tenant namespace holds
+  # other Certificates, Secrets and Jobs that this hook must not reach.
+  - apiGroups:
+      - "cert-manager.io"
+    resources:
+      - certificates
+    resourceNames:
+      - {{ .Release.Name }}-talos-ca
+      - {{ .Release.Name }}-talos-tls-cert
+    verbs:
+      - get
+      - delete
+  - apiGroups:
+      - ""
+    resources:
+      - secrets
+    resourceNames:
+      - {{ .Release.Name }}-talos-ca
+      - {{ .Release.Name }}-talos-tls-cert
+    verbs:
+      - get
+      - delete
+  - apiGroups:
+      - "batch"
+    resources:
+      - jobs
+    resourceNames:
+      - {{ .Release.Name }}-oidc-bootstrap
+    verbs:
+      - get
       - delete
 ---
 apiVersion: rbac.authorization.k8s.io/v1
diff --git a/packages/apps/kubernetes/templates/helmreleases/cilium.yaml b/packages/apps/kubernetes/templates/helmreleases/cilium.yaml
index 5b69e2f294..07ee92759d 100644
--- a/packages/apps/kubernetes/templates/helmreleases/cilium.yaml
+++ b/packages/apps/kubernetes/templates/helmreleases/cilium.yaml
@@ -1,6 +1,15 @@
 {{- define "cozystack.defaultCiliumValues" -}}
+{{- /* Cilium runs hostNetwork on the Talos worker nodes and resolves the
+       apiserver via the worker's /etc/hosts, which the kubernetes-nodes
+       chart's talos-reconcile Job seeds with the Kamaji Service ClusterIP
+       under <release>.<ns>.svc through machine.network.extraHostEntries
+       (workers only exist through pools, so every node Cilium runs on has
+       the entry). So a plain DNS host works here without a
+       lookup-and-reuse race: the cert covers the same DNS name from chart
+       render time, and the hosts entry is set well before kubelet (and
+       therefore Cilium) comes up on the node. */}}
 cilium:
-  k8sServiceHost: {{ .Release.Name }}.{{ .Release.Namespace }}.svc
+  k8sServiceHost: {{ printf "%s.%s.svc" .Release.Name .Release.Namespace }}
   k8sServicePort: 6443
   routingMode: tunnel
   MTU: 1350
@@ -9,6 +18,12 @@ cilium:
   {{- if $.Values.addons.gatewayAPI.enabled }}
   gatewayAPI:
     enabled: true
+    # Without ALPN "h2" on the TLS listener, browsers silently downgrade every
+    # Gateway request to HTTP/1.1 (they negotiate HTTP/2 only via ALPN).
+    # Frontend hop only; backends stay HTTP/1.1 unless their Service declares
+    # appProtocol kubernetes.io/h2c (GEP-1911). Per-cluster opt-out:
+    # addons.cilium.valuesOverride.cilium.gatewayAPI.enableAlpn=false.
+    enableAlpn: true
   envoy:
     enabled: true
   {{- end }}
@@ -37,11 +52,30 @@ spec:
   storageNamespace: cozy-cilium
   interval: 5m
   timeout: 10m
+  {{- /* Flux's default install strategy remediates a failed install by
+         uninstalling the release, which takes the tenant's only CNI away
+         between attempts. RetryOnFailure drops that teardown: the manifests
+         stay applied and the failed install is retried as an upgrade. Both
+         actions carry the strategy because that retry runs as an upgrade and
+         would otherwise fall back to upgrade remediation. The cost is that a
+         genuine upgrade failure no longer rolls back either, which is forced,
+         since the controller cannot tell a retried install from a real one,
+         and what it replaces was an unbounded rollback-and-retry flap. This
+         removes an amplifier, not a cause: an install that outruns its budget
+         because no node has registered yet stays a problem. The remediation
+         blocks cover the branches no strategy reaches, an absent release for
+         install and an out-of-sync one for upgrade, so retries: -1 stays. */}}
   install:
     createNamespace: true
+    strategy:
+      name: RetryOnFailure
+      retryInterval: 30s
     remediation:
       retries: -1
   upgrade:
+    strategy:
+      name: RetryOnFailure
+      retryInterval: 30s
     remediation:
       retries: -1
   values:
@@ -51,4 +85,57 @@ spec:
   - name: {{ .Release.Name }}-gateway-api-crds
     namespace: {{ .Release.Namespace }}
   {{- end }}
+
+{{- /*
+addons.cilium.valuesOverride is x-kubernetes-preserve-unknown-fields, so a
+tenant can set cilium.kubeProxyReplacement: false for its own cluster. Cozystack
+does not support that value or supply an alternative service load balancer for
+it; guest ClusterIP connectivity can fail. The guest ingress-nginx policy's
+source-side deny also loses the pre-DNAT match, but its target-side ingressDeny
+continues to deny pods after any translation, so the override does not imply
+that the admission webhook becomes reachable.
+
+The mismatch is detectable here rather than in the guest cluster, because this
+HelmRelease's values are assembled on the management cluster, so the beacon is
+emitted next to the release that carries the override. Same mechanism and same
+reasoning as the -awaiting-etcd beacon in ../cluster.yaml: a ConfigMap an
+operator and an alert can both see. It is a diagnostic for an unsupported
+override, not an alternative compatibility mode.
+
+Absence is not a warning: the value is unset in both the override and
+cozystack.defaultCiliumValues on every supported path, and the cilium chart's
+own values.yaml then supplies true. Only an explicit non-true value fires.
+*/}}
+{{- $merged := deepCopy .Values.addons.cilium.valuesOverride | mergeOverwrite (fromYaml (include "cozystack.defaultCiliumValues" .)) }}
+{{- $mergedCilium := dig "cilium" dict $merged }}
+{{- $kpr := dig "kubeProxyReplacement" "" $mergedCilium }}
+{{- if and (ne (toString $kpr) "") (ne (toString $kpr) "true") }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ .Release.Name }}-cilium-kube-proxy-replacement-off
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/name: kubernetes
+    app.kubernetes.io/instance: {{ .Release.Name }}
+data:
+  status: "kube-proxy-replacement-off"
+  kubeProxyReplacement: {{ toString $kpr | quote }}
+  message: |
+    addons.cilium.valuesOverride sets cilium.kubeProxyReplacement to
+    {{ toString $kpr | quote }} for cluster {{ .Release.Name }}.
+
+    Cozystack supports guest cluster networking only when
+    cilium.kubeProxyReplacement is "true". No supported alternative service load
+    balancer is supplied for this override, so ClusterIP connectivity may fail.
+
+    The guest ingress-nginx policy's source-side deny also loses its pre-DNAT
+    match, but its target-side ingressDeny remains. This override does not imply
+    that the admission webhook is reachable through its Service.
+
+    Clear the override or set cilium.kubeProxyReplacement back to true. Disabling
+    the webhook policy does not make this networking configuration supported.
+{{- end }}
 {{- end }}
diff --git a/packages/apps/kubernetes/templates/helmreleases/csi-proxmox.yaml b/packages/apps/kubernetes/templates/helmreleases/csi-proxmox.yaml
new file mode 100644
index 0000000000..77efd9c05b
--- /dev/null
+++ b/packages/apps/kubernetes/templates/helmreleases/csi-proxmox.yaml
@@ -0,0 +1,112 @@
+{{- /* The Proxmox counterpart of helmreleases/csi.yaml, and like that one it
+      ships only the tenant-side half: the node plugin, the CSIDriver object and
+      the storage classes. The controller — the only part that holds the
+      hypervisor token — runs in the management cluster, in
+      templates/csi-proxmox/controller.yaml. Nothing in this release carries a
+      credential, and the vendored chart's Secret template is gated on a
+      non-empty config.clusters, so with the list left empty it renders nothing.
+
+      Kept as its own file rather than a branch inside csi.yaml: the two drivers
+      share nothing but the role. kubevirt-csi reaches DataVolumes in this cluster over the
+      management API; proxmox-csi reaches the hypervisor over its own API with
+      its own credentials, lands in its own namespace, and takes an entirely
+      different values shape. Splitting them keeps the KubeVirt path rendering
+      byte-for-byte what it rendered before Proxmox existed. */}}
+{{- if eq (.Values.substrate | default "kubevirt") "proxmox" }}
+{{- if and .Values._namespace.etcd .Values.proxmox.csi.enabled }}
+apiVersion: helm.toolkit.fluxcd.io/v2
+kind: HelmRelease
+metadata:
+  name: {{ .Release.Name }}-csi
+  labels:
+    cozystack.io/repository: system
+    cozystack.io/target-cluster-name: {{ .Release.Name }}
+    sharding.fluxcd.io/key: tenants
+spec:
+  interval: 5m
+  timeout: 10m
+  releaseName: csi
+  chartRef:
+    kind: ExternalArtifact
+    {{- /* The artifact keeps the kubevirt- prefix because that is the variant
+          of kubernetes-application it is published under, not a statement
+          about the substrate. Naming it otherwise would mean a second variant
+          and a rename of all eighteen tenant addon artifacts. */}}
+    name: cozystack-kubernetes-application-kubevirt-kubernetes-proxmox-csi
+    namespace: cozy-system
+  kubeConfig:
+    secretRef:
+      name: {{ .Release.Name }}-admin-kubeconfig
+      key: super-admin.svc
+  targetNamespace: csi-proxmox
+  storageNamespace: csi-proxmox
+  {{- /* Same reasoning as the kubevirt release: install remediation is an
+         uninstall, which would take the tenant's StorageClasses down between
+         attempts. */}}
+  install:
+    createNamespace: true
+    strategy:
+      name: RetryOnFailure
+      retryInterval: 30s
+    remediation:
+      retries: -1
+  upgrade:
+    strategy:
+      name: RetryOnFailure
+      retryInterval: 30s
+    remediation:
+      retries: -1
+  {{- /* The chart hardcodes CSIDriver.storageCapacity: true, and with the
+        split it has to be false. CSIStorageCapacity objects are published by
+        the provisioner sidecar, which now runs in the management cluster and
+        owns them through an ownerReference to a Pod that does not exist in the
+        tenant, so nothing here ever publishes them — and the scheduler refuses
+        every Pod with "node(s) did not have enough free storage" while it waits.
+        Measured on a live cluster: with the flag true the Pod never schedules,
+        with it false the PVC binds in seconds. Patched rather than forked so the
+        vendored chart still reproduces from `helm pull`. */}}
+  postRenderers:
+    - kustomize:
+        patches:
+          - target:
+              kind: CSIDriver
+              name: csi.proxmox.sinextra.dev
+            patch: |
+              - op: replace
+                path: /spec/storageCapacity
+                value: false
+  values:
+    proxmox-csi-plugin:
+      {{- /* The vendored chart has no switch for the controller, so its
+            replica count is what turns it off here. The Deployment object
+            still renders, with zero replicas and therefore no Pod and no
+            mount of a Secret that does not exist in this cluster. */}}
+      replicaCount: 0
+      options:
+        {{- /* Off for the reason the postRenderer above gives. The chart value
+              alone does not do it: CSIDriver.storageCapacity is hardcoded. */}}
+        enableCapacity: false
+      config:
+        {{- /* Empty on purpose. It is what keeps the chart's templates/secrets.yaml
+              from rendering, and the node plugin needs no cluster credentials:
+              its DaemonSet mounts none. */}}
+        clusters: []
+      storageClass:
+        {{- range .Values.proxmox.csi.storageClasses }}
+        - name: {{ .name | quote }}
+          storage: {{ .storage | quote }}
+          {{- with .fstype }}
+          fstype: {{ . | quote }}
+          {{- end }}
+          {{- with .reclaimPolicy }}
+          reclaimPolicy: {{ . | quote }}
+          {{- end }}
+          {{- if .ssd }}
+          ssd: true
+          {{- end }}
+        {{- end }}
+  dependsOn:
+  - name: {{ .Release.Name }}-cilium
+    namespace: {{ .Release.Namespace }}
+{{- end }}
+{{- end }}
diff --git a/packages/apps/kubernetes/templates/helmreleases/csi.yaml b/packages/apps/kubernetes/templates/helmreleases/csi.yaml
index e9f9730542..c94af9c430 100644
--- a/packages/apps/kubernetes/templates/helmreleases/csi.yaml
+++ b/packages/apps/kubernetes/templates/helmreleases/csi.yaml
@@ -1,3 +1,11 @@
+{{- /* KubeVirt-only: the cloud-controller-manager and the CSI driver here
+      exist to reach the workers' VirtualMachines and their DataVolumes in
+      THIS cluster. On the proxmox substrate the VMs are on an external
+      hypervisor: the CSI node plugin comes from the proxmox-csi package and
+      its controller, with the cloud-controller-manager, runs in this cluster
+      (templates/csi-proxmox/, templates/ccm-proxmox/). Rendering these would
+      leave a controller in the tenant reconciling objects that do not exist. */}}
+{{- if ne (.Values.substrate | default "kubevirt") "proxmox" }}
 {{- if .Values._namespace.etcd }}
 apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
@@ -9,6 +17,7 @@ metadata:
     sharding.fluxcd.io/key: tenants
 spec:
   interval: 5m
+  timeout: 10m
   releaseName: csi
   chartRef:
     kind: ExternalArtifact
@@ -20,20 +29,71 @@ spec:
       key: super-admin.svc
   targetNamespace: cozy-csi
   storageNamespace: cozy-csi
+  {{- /* Flux defaults to the RemediateOnFailure strategy, and install
+         remediation is always an uninstall, so an install that outruns the
+         spec.timeout above is torn down between attempts: the tenant loses
+         its CSI node plugin and the StorageClasses this release propagates,
+         and the next attempt restarts the DaemonSet rollout instead of
+         resuming one already under way. RetryOnFailure keeps the manifests
+         in place and retries the failed release. Both actions carry it
+         because the controller picks the active retry by
+         .status.lastAttemptedReleaseAction and performs that retry as an
+         upgrade, so on install alone the retry's own failure falls through
+         to upgrade remediation, a rollback with no previous release to
+         reach. The cost is that a real upgrade failure retries rather than
+         rolls back, which gives up no stable safety net: with retries: -1
+         and the default rollback strategy, upgrade remediation already
+         rolled back and retried without end. The remediation blocks stay
+         for a different reason, that an absent release
+         consults install and an out-of-sync one consults upgrade, both by
+         retry count rather than by strategy, so retries: -1 keeps them
+         open. */}}
   install:
     createNamespace: true
+    strategy:
+      name: RetryOnFailure
+      retryInterval: 30s
     remediation:
       retries: -1
   upgrade:
+    strategy:
+      name: RetryOnFailure
+      retryInterval: 30s
     remediation:
       retries: -1
-  {{- with .Values.storageClass }}
   values:
-    storageClass: "{{ . }}"
-  {{- end }}
+    storageClasses:
+    {{- /* Propagate remote-accessible LINSTOR infra StorageClasses to the tenant under the same name. */}}
+    {{- $defaultName := .Values.storageClass | default "replicated" }}
+    {{- $out := dict }}
+    {{- range $sc := (lookup "storage.k8s.io/v1" "StorageClass" "" "").items }}
+    {{- $params := $sc.parameters | default dict }}
+    {{- if and (eq $sc.provisioner "linstor.csi.linbit.com") (ne (index $params "linstor.csi.linbit.com/allowRemoteVolumeAccess" | default "true") "false") }}
+    {{- $_ := set $out $sc.metadata.name (dict "infraStorageClass" $sc.metadata.name "default" false) }}
+    {{- end }}
+    {{- end }}
+    {{- /* Non-destructive fallback for dry-run/empty lookup: preserve the legacy mapping, never collapse to nothing. */}}
+    {{- if not $out }}
+    {{- $_ := set $out "replicated" (dict "infraStorageClass" "replicated" "default" false) }}
+    {{- end }}
+    {{- /* Mark exactly one default among the propagated classes. Chosen BEFORE the kubevirt alias is
+           added below, so the legacy alias (which points at $defaultName, possibly absent on the infra
+           cluster) can never be auto-selected as the tenant default: the configured storageClass if
+           propagated, else replicated, else first by name. */}}
+    {{- $chosen := "" }}
+    {{- if hasKey $out $defaultName }}{{ $chosen = $defaultName }}
+    {{- else if hasKey $out "replicated" }}{{ $chosen = "replicated" }}
+    {{- else }}{{ $chosen = (keys $out | sortAlpha | first) }}{{ end }}
+    {{- /* Legacy alias so existing tenant PVCs bound to the "kubevirt" StorageClass keep working. */}}
+    {{- if not (hasKey $out "kubevirt") }}
+    {{- $_ := set $out "kubevirt" (dict "infraStorageClass" $defaultName "default" false) }}
+    {{- end }}
+    {{- $_ := set (index $out $chosen) "default" true }}
+    {{- $out | toYaml | nindent 6 }}
   dependsOn:
   - name: {{ .Release.Name }}-vsnap-crd
     namespace: {{ .Release.Namespace }}
   - name: {{ .Release.Name }}-cilium
     namespace: {{ .Release.Namespace }}
 {{- end }}
+{{- end }}
diff --git a/packages/apps/kubernetes/templates/helmreleases/fluxcd.yaml b/packages/apps/kubernetes/templates/helmreleases/fluxcd.yaml
deleted file mode 100644
index 7ac75d3b5a..0000000000
--- a/packages/apps/kubernetes/templates/helmreleases/fluxcd.yaml
+++ /dev/null
@@ -1,76 +0,0 @@
-{{- if and .Values.addons.fluxcd.enabled .Values._namespace.etcd }}
-apiVersion: helm.toolkit.fluxcd.io/v2
-kind: HelmRelease
-metadata:
-  name: {{ .Release.Name }}-fluxcd-operator
-  labels:
-    cozystack.io/repository: system
-    cozystack.io/target-cluster-name: {{ .Release.Name }}
-    sharding.fluxcd.io/key: tenants
-spec:
-  releaseName: fluxcd-operator
-  chartRef:
-    kind: ExternalArtifact
-    name: cozystack-kubernetes-application-kubevirt-kubernetes-fluxcd-operator
-    namespace: cozy-system
-  kubeConfig:
-    secretRef:
-      name: {{ .Release.Name }}-admin-kubeconfig
-      key: super-admin.svc
-  targetNamespace: cozy-fluxcd
-  storageNamespace: cozy-fluxcd
-  interval: 5m
-  timeout: 10m
-  install:
-    createNamespace: true
-    remediation:
-      retries: -1
-  upgrade:
-    remediation:
-      retries: -1
-  values:
-    flux-operator:
-      fullnameOverride: flux-operator
-      tolerations: []
-      hostNetwork: false
-  dependsOn:
-  - name: {{ .Release.Name }}-cilium
-    namespace: {{ .Release.Namespace }}
----
-apiVersion: helm.toolkit.fluxcd.io/v2
-kind: HelmRelease
-metadata:
-  name: {{ .Release.Name }}-fluxcd
-  labels:
-    cozystack.io/repository: system
-    cozystack.io/target-cluster-name: {{ .Release.Name }}
-    sharding.fluxcd.io/key: tenants
-spec:
-  interval: 5m
-  releaseName: fluxcd
-  chartRef:
-    kind: ExternalArtifact
-    name: cozystack-kubernetes-application-kubevirt-kubernetes-fluxcd
-    namespace: cozy-system
-  kubeConfig:
-    secretRef:
-      name: {{ .Release.Name }}-kubeconfig
-  targetNamespace: cozy-fluxcd
-  storageNamespace: cozy-fluxcd
-  install:
-    createNamespace: true
-    remediation:
-      retries: -1
-  upgrade:
-    remediation:
-      retries: -1
-  {{- with .Values.addons.fluxcd.valuesOverride }}
-  values:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-  dependsOn:
-  - name: {{ .Release.Name }}-cilium
-    namespace: {{ .Release.Namespace }}
-  - name: {{ .Release.Name }}-fluxcd-operator
-    namespace: {{ .Release.Namespace }}
-{{- end }}
diff --git a/packages/apps/kubernetes/templates/helmreleases/gpu-operator.yaml b/packages/apps/kubernetes/templates/helmreleases/gpu-operator.yaml
index 087def18db..efbb1d480b 100644
--- a/packages/apps/kubernetes/templates/helmreleases/gpu-operator.yaml
+++ b/packages/apps/kubernetes/templates/helmreleases/gpu-operator.yaml
@@ -1,31 +1,68 @@
 {{- define "cozystack.defaultGpuOperatorValues" -}}
 {{- /*
-  GPU passthrough default: cozystack passes individual SXM GPUs (e.g.
-  H200) into tenant worker VMs WITHOUT the NVSwitches. The nvidia driver
-  then waits forever for an NVLink fabric that can never come up (no
-  NVSwitch / fabricmanager), leaving Fabric State: In Progress — every
-  CUDA call fails with "system not yet initialized" and the
-  nvidia-operator-validator crashloops. Loading the kernel module with
-  NVreg_NvLinkDisable=1 flips Fabric State to N/A so CUDA initializes.
-  This is correct for per-GPU passthrough since there is no in-VM
-  NVLink/NVSwitch peering anyway.
+  Default for the Talos workers of tenant clusters, where the NVIDIA driver
+  comes from a Talos system extension baked into the worker image. Nothing
+  here loads the module or sets its parameters: that is the kernelModules
+  field of the worker pool, in the KubernetesNodes app
+  (packages/apps/kubernetes-nodes).
 
-  The upstream chart only references an existing ConfigMap by name; the
-  wrapper chart (packages/system/gpu-operator) renders that ConfigMap
-  when kernelModuleConfig.create is true. Overridable via
-  addons.gpuOperator.valuesOverride (mergeOverwrite below keeps user
-  values winning).
+  driver and toolkit are off. The driver container would load its own module
+  and clash with the extension's, and the toolkit container rewrites
+  /etc/containerd/config.toml, which Talos owns and which already registers
+  the nvidia runtime with enable_cdi = true and cdi_spec_dirs = ['/run/cdi'].
+
+  The driver validator is pointed at the host root, where the extension puts
+  the driver. Looking for a driver container install instead, it never writes
+  its sentinel and the device plugin stays blocked behind toolkit-validation.
+  The /dev/char symlinks belong to the extension, so it must not create them.
+
+  Tenant pods carry no runtimeClassName and Talos does not make nvidia the
+  default containerd runtime, so CUDA libraries reach a pod only through CDI.
+  The device plugin annotates pods for CDI injection and generates the spec
+  into /run/cdi with the host's nvidia-ctk. CDI device names key on the uuid
+  strategy, and the annotation prefix is pinned to the one containerd reads.
+  Injection is decided at pod admission, so a pod created before its node
+  works receives nothing and has to be recreated.
+
+  mergeOverwrite below lets addons.gpuOperator.valuesOverride win, but it
+  replaces a list wholesale: an override of devicePlugin.env that adds one
+  variable drops the defaults above, and CDI with them. Restate the full list.
 */}}
-kernelModuleConfig:
-  create: true
 gpu-operator:
   driver:
-    kernelModuleConfig:
-      name: nvidia-kernel-module-params
-{{- if .Values.addons.hami.enabled }}
+    enabled: false
+  toolkit:
+    enabled: false
+  validator:
+    driver:
+      env:
+        - name: DRIVER_ROOT
+          value: "/"
+        - name: NVIDIA_DRIVER_ROOT
+          value: "/"
+        - name: DISABLE_DEV_CHAR_SYMLINK_CREATION
+          value: "true"
   devicePlugin:
+{{- if .Values.addons.hami.enabled }}
+    {{- /* HAMi ships its own device plugin and serves the GPUs itself; the
+           operator's must stay off so the two do not both advertise
+           nvidia.com/gpu. The env below is inert while this is false, and is
+           emitted anyway so the values stay coherent if HAMi is turned off
+           later. HAMi's own plugin needs its own CDI wiring on Talos, which
+           this default does not attempt. */}}
     enabled: false
 {{- end }}
+    env:
+      - name: DEVICE_LIST_STRATEGY
+        value: cdi-annotations
+      - name: DEVICE_ID_STRATEGY
+        value: uuid
+      - name: NVIDIA_DRIVER_ROOT
+        value: "/"
+      - name: NVIDIA_CTK_PATH
+        value: /usr/local/bin/nvidia-ctk
+      - name: CDI_ANNOTATION_PREFIX
+        value: cdi.k8s.io/
 {{- end }}
 
 {{- if and .Values.addons.gpuOperator.enabled .Values._namespace.etcd }}
diff --git a/packages/apps/kubernetes/templates/helmreleases/ingress-nginx.yaml b/packages/apps/kubernetes/templates/helmreleases/ingress-nginx.yaml
index e87ab79b0c..746b805838 100644
--- a/packages/apps/kubernetes/templates/helmreleases/ingress-nginx.yaml
+++ b/packages/apps/kubernetes/templates/helmreleases/ingress-nginx.yaml
@@ -21,6 +21,14 @@ ingress-nginx:
 {{- end }}
 
 {{- if and .Values.addons.ingressNginx.enabled .Values._namespace.etcd }}
+{{- /* The ingress-nginx controller DaemonSet pins itself to nodes labelled
+       node-role.kubernetes.io/ingress-nginx (see cozystack.defaultIngressValues
+       nodeSelector). Since Phase 2 moved worker pools into the separate
+       kubernetes-nodes chart, that label is produced by a KubernetesNodes pool
+       with roles: [ingress-nginx]. If no such pool exists the DaemonSet simply
+       schedules nothing (degraded, not failed) — the requirement is documented
+       in NOTES.txt and the release note rather than enforced at render time, so
+       an existing cluster is never flipped from Ready to Failed on upgrade. */}}
 apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
 metadata:
diff --git a/packages/apps/kubernetes/templates/helmreleases/ouroboros.yaml b/packages/apps/kubernetes/templates/helmreleases/ouroboros.yaml
index 09c20aa05d..ecc8c8aae5 100644
--- a/packages/apps/kubernetes/templates/helmreleases/ouroboros.yaml
+++ b/packages/apps/kubernetes/templates/helmreleases/ouroboros.yaml
@@ -41,7 +41,7 @@ ouroboros:
            federations, custom kubelet --cluster-domain, etc.) can
            override via
            `addons.ouroboros.valuesOverride.ouroboros.controller.clusterDomain`. */}}
-    clusterDomain: cluster.local
+    clusterDomain: {{ include "kubernetes.tenantClusterDomain" $ }}
 {{- end }}
 
 {{- /* addons.ouroboros.enabled requires addons.ingressNginx.enabled. The
diff --git a/packages/apps/kubernetes/templates/helmreleases/victoria-metrics-operator.yaml b/packages/apps/kubernetes/templates/helmreleases/victoria-metrics-operator.yaml
index d6c068ca65..476e470d04 100644
--- a/packages/apps/kubernetes/templates/helmreleases/victoria-metrics-operator.yaml
+++ b/packages/apps/kubernetes/templates/helmreleases/victoria-metrics-operator.yaml
@@ -31,6 +31,8 @@ spec:
   dependsOn:
   - name: {{ .Release.Name }}-cilium
     namespace: {{ .Release.Namespace }}
+  {{- if .Values.addons.certManager.enabled }}
   - name: {{ .Release.Name }}-cert-manager-crds
     namespace: {{ .Release.Namespace }}
+  {{- end }}
 {{- end }}
diff --git a/packages/apps/kubernetes/templates/ingress.yaml b/packages/apps/kubernetes/templates/ingress.yaml
index 4adb7458de..9b35f9683e 100644
--- a/packages/apps/kubernetes/templates/ingress.yaml
+++ b/packages/apps/kubernetes/templates/ingress.yaml
@@ -1,5 +1,9 @@
 {{- $ingress := .Values._namespace.ingress }}
-{{- if and (eq .Values.addons.ingressNginx.exposeMethod "Proxied") .Values.addons.ingressNginx.hosts }}
+{{- /* The _namespace.etcd gate mirrors the ingress-nginx addon HelmRelease:
+       on an etcd-less tenant the chart collapses to the awaiting-etcd beacon,
+       so no addon controller exists and the Service would select nothing. */}}
+{{- if and .Values.addons.ingressNginx.enabled .Values._namespace.etcd (eq .Values.addons.ingressNginx.exposeMethod "Proxied") }}
+{{- if .Values.addons.ingressNginx.hosts }}
 ---
 apiVersion: networking.k8s.io/v1
 kind: Ingress
@@ -41,7 +45,18 @@ spec:
             port:
               number: 80
   {{- end }}
+{{- end }}
 ---
+# The proxy Service is created whenever the addon is enabled on an etcd-backed
+# tenant with exposeMethod Proxied (independent of `hosts`) so that external
+# consumers — e.g. a ComputePlane app's per-app management Ingress — can route to
+# the tenant cluster's ingress-nginx without the tenant module having to know
+# every app host in advance. Both gates match the addon HelmRelease this Service
+# fronts: exposeMethod defaults to Proxied while the addon defaults to off, so
+# gating on exposeMethod alone would emit a selector-less Service on every cluster
+# that runs no ingress-nginx at all; and on an etcd-less tenant the chart collapses
+# to the awaiting-etcd beacon, so the Service would select a controller that never
+# renders.
 apiVersion: v1
 kind: Service
 metadata:
diff --git a/packages/apps/kubernetes/templates/kccm/kccm_cluster_role.yaml b/packages/apps/kubernetes/templates/kccm/kccm_cluster_role.yaml
index cd27da1100..5d8beb455a 100644
--- a/packages/apps/kubernetes/templates/kccm/kccm_cluster_role.yaml
+++ b/packages/apps/kubernetes/templates/kccm/kccm_cluster_role.yaml
@@ -1,3 +1,11 @@
+{{- /* KubeVirt-only: the cloud-controller-manager and the CSI driver here
+      exist to reach the workers' VirtualMachines and their DataVolumes in
+      THIS cluster. On the proxmox substrate the VMs are on an external
+      hypervisor: the CSI node plugin comes from the proxmox-csi package and
+      its controller, with the cloud-controller-manager, runs in this cluster
+      (templates/csi-proxmox/, templates/ccm-proxmox/). Rendering these would
+      leave a controller in the tenant reconciling objects that do not exist. */}}
+{{- if ne (.Values.substrate | default "kubevirt") "proxmox" }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
@@ -9,3 +17,4 @@ rules:
   - nodes
   verbs:
   - get
+{{- end }}
diff --git a/packages/apps/kubernetes/templates/kccm/kccm_cluster_role_binding.yaml b/packages/apps/kubernetes/templates/kccm/kccm_cluster_role_binding.yaml
index 3a8a45b719..ceb698b294 100644
--- a/packages/apps/kubernetes/templates/kccm/kccm_cluster_role_binding.yaml
+++ b/packages/apps/kubernetes/templates/kccm/kccm_cluster_role_binding.yaml
@@ -1,3 +1,11 @@
+{{- /* KubeVirt-only: the cloud-controller-manager and the CSI driver here
+      exist to reach the workers' VirtualMachines and their DataVolumes in
+      THIS cluster. On the proxmox substrate the VMs are on an external
+      hypervisor: the CSI node plugin comes from the proxmox-csi package and
+      its controller, with the cloud-controller-manager, runs in this cluster
+      (templates/csi-proxmox/, templates/ccm-proxmox/). Rendering these would
+      leave a controller in the tenant reconciling objects that do not exist. */}}
+{{- if ne (.Values.substrate | default "kubevirt") "proxmox" }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata: 
@@ -10,3 +18,4 @@ subjects:
 - kind: ServiceAccount
   name: {{ .Release.Name }}-kccm
   namespace: {{ .Release.Namespace }}
+{{- end }}
diff --git a/packages/apps/kubernetes/templates/kccm/kccm_role.yaml b/packages/apps/kubernetes/templates/kccm/kccm_role.yaml
index 314c0f5596..d7f5aa274d 100644
--- a/packages/apps/kubernetes/templates/kccm/kccm_role.yaml
+++ b/packages/apps/kubernetes/templates/kccm/kccm_role.yaml
@@ -1,3 +1,11 @@
+{{- /* KubeVirt-only: the cloud-controller-manager and the CSI driver here
+      exist to reach the workers' VirtualMachines and their DataVolumes in
+      THIS cluster. On the proxmox substrate the VMs are on an external
+      hypervisor: the CSI node plugin comes from the proxmox-csi package and
+      its controller, with the cloud-controller-manager, runs in this cluster
+      (templates/csi-proxmox/, templates/ccm-proxmox/). Rendering these would
+      leave a controller in the tenant reconciling objects that do not exist. */}}
+{{- if ne (.Values.substrate | default "kubevirt") "proxmox" }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
@@ -46,3 +54,4 @@ rules:
   - nodes
   verbs:
   - get
+{{- end }}
diff --git a/packages/apps/kubernetes/templates/kccm/kccm_role_binding.yaml b/packages/apps/kubernetes/templates/kccm/kccm_role_binding.yaml
index cb51808f4f..355577cfbe 100644
--- a/packages/apps/kubernetes/templates/kccm/kccm_role_binding.yaml
+++ b/packages/apps/kubernetes/templates/kccm/kccm_role_binding.yaml
@@ -1,3 +1,11 @@
+{{- /* KubeVirt-only: the cloud-controller-manager and the CSI driver here
+      exist to reach the workers' VirtualMachines and their DataVolumes in
+      THIS cluster. On the proxmox substrate the VMs are on an external
+      hypervisor: the CSI node plugin comes from the proxmox-csi package and
+      its controller, with the cloud-controller-manager, runs in this cluster
+      (templates/csi-proxmox/, templates/ccm-proxmox/). Rendering these would
+      leave a controller in the tenant reconciling objects that do not exist. */}}
+{{- if ne (.Values.substrate | default "kubevirt") "proxmox" }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
@@ -25,3 +33,4 @@ subjects:
 - kind: ServiceAccount
   name: {{ .Release.Name }}-kccm
   namespace: {{ .Release.Namespace }}
+{{- end }}
diff --git a/packages/apps/kubernetes/templates/kccm/manager.yaml b/packages/apps/kubernetes/templates/kccm/manager.yaml
index bd9e27984e..cf78ff25d8 100644
--- a/packages/apps/kubernetes/templates/kccm/manager.yaml
+++ b/packages/apps/kubernetes/templates/kccm/manager.yaml
@@ -1,3 +1,11 @@
+{{- /* KubeVirt-only: the cloud-controller-manager and the CSI driver here
+      exist to reach the workers' VirtualMachines and their DataVolumes in
+      THIS cluster. On the proxmox substrate the VMs are on an external
+      hypervisor: the CSI node plugin comes from the proxmox-csi package and
+      its controller, with the cloud-controller-manager, runs in this cluster
+      (templates/csi-proxmox/, templates/ccm-proxmox/). Rendering these would
+      leave a controller in the tenant reconciling objects that do not exist. */}}
+{{- if ne (.Values.substrate | default "kubevirt") "proxmox" }}
 {{- if .Values._namespace.etcd }}
 apiVersion: apps/v1
 kind: Deployment
@@ -62,3 +70,4 @@ spec:
         name: kubeconfig
       serviceAccountName: {{ .Release.Name }}-kccm
 {{- end }}
+{{- end }}
diff --git a/packages/apps/kubernetes/templates/kccm/service_account.yaml b/packages/apps/kubernetes/templates/kccm/service_account.yaml
index 10a690b203..57a0d63a4f 100644
--- a/packages/apps/kubernetes/templates/kccm/service_account.yaml
+++ b/packages/apps/kubernetes/templates/kccm/service_account.yaml
@@ -1,4 +1,13 @@
+{{- /* KubeVirt-only: the cloud-controller-manager and the CSI driver here
+      exist to reach the workers' VirtualMachines and their DataVolumes in
+      THIS cluster. On the proxmox substrate the VMs are on an external
+      hypervisor: the CSI node plugin comes from the proxmox-csi package and
+      its controller, with the cloud-controller-manager, runs in this cluster
+      (templates/csi-proxmox/, templates/ccm-proxmox/). Rendering these would
+      leave a controller in the tenant reconciling objects that do not exist. */}}
+{{- if ne (.Values.substrate | default "kubevirt") "proxmox" }}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ .Release.Name }}-kccm
+{{- end }}
diff --git a/packages/apps/kubernetes/templates/oidc-authn-config.yaml b/packages/apps/kubernetes/templates/oidc-authn-config.yaml
new file mode 100644
index 0000000000..30e47ab18d
--- /dev/null
+++ b/packages/apps/kubernetes/templates/oidc-authn-config.yaml
@@ -0,0 +1,108 @@
+{{- /*
+  Structured AuthenticationConfiguration for the tenant kube-apiserver
+  (apiserver.config.k8s.io/v1beta1, stable since 1.30).
+
+  Mounted via the KamajiControlPlane in cluster.yaml as a file at
+  /etc/kubernetes/authentication-config/config.yaml and consumed via
+  --authentication-config=. Compared to the legacy `--oidc-*` flags,
+  the file form supports multiple issuers (the `jwt` block is a list)
+  and inline private-CA PEM, so future BYO and Phase-2 issuers extend
+  the same Secret instead of fighting the chart shape.
+
+  System mode:
+    Single JWT entry built from `_cluster.root-host` (the cozy realm
+    issuer URL) and the per-cluster audience (kubernetes.oidc.clientId).
+    Username claim is `email`, groups claim is `groups`, uid claim is
+    `sub` — matching the realm scope provisioned in oidc-keycloak.yaml
+    and the detailed rationale in the note below.
+
+  CustomConfig mode:
+    The tenant supplies the entire `AuthenticationConfiguration` body.
+    Either inline (oidc.customConfig.config — a string) or via a Secret
+    they have already created in the tenant namespace
+    (oidc.customConfig.secretRef.name). The chart writes the inline path
+    verbatim; for secretRef nothing is emitted here (cluster.yaml mounts
+    the user's Secret directly). Exactly one of the two MUST be set;
+    the chart fails the render otherwise.
+
+  None mode renders nothing.
+*/}}
+{{- if eq .Values.oidc.mode "System" }}
+{{-   $issuer := include "kubernetes.oidc.systemIssuerURL" . | trim }}
+{{-   $audience := include "kubernetes.oidc.clientId" . | trim }}
+{{-   $groupsExpr := include "kubernetes.oidc.groupsClaimValidationExpr" . | trim }}
+{{-   $realm := dig "oidc-realm-name" "cozy" (.Values._cluster | default dict) | toString }}
+{{- /*
+User identity claim: `email`, not `preferred_username`.
+
+The design doc example used `claim: preferred_username`, but in the
+cozystack `cozy` realm `preferred_username` is the Keycloak *username*
+(`alice`, `j.doe`), NOT the email — and the operator-facing
+`users[].email` field asks for the email address. Matching the `User:`
+subject in the ClusterRoleBinding to `preferred_username` would
+silently misidentify every user whose Keycloak username differs from
+their email — verified on a test cluster where token auth succeeded
+but the CRB match failed with 403.
+
+Switching the claim to `email` aligns the apiserver-visible identity
+with the operator's declared `users[].email` value. Requires the
+issuer to emit `email` — cozy realm (verified) and every conformant
+OIDC provider do.
+
+UID claim: `sub`, not the username claim. The platform realm ships
+with Keycloak's UPDATE_EMAIL required action enabled (see
+packages/system/keycloak-configure), so a user can change the value
+`email` carries; `sub` is the account UUID and survives that, which
+is what an identifier forwarded to an aggregated API server has to
+do. Without any uid mapping upstream returns an empty UID.
+
+claimValidationRules — cross-tenant isolation gate. Without this rule
+any authenticated cozy-realm user (i.e. anyone in the shared platform
+realm) would receive `system:authenticated` on this tenant's
+apiserver. RBAC default-denies, but discovery (`kubectl api-resources`,
+OpenAPI schemata) still leaks. The CEL expression forces at least one
+of the four tenant-scoped groups
+(`<namespace>-{view,use,admin,super-admin}`, provisioned by the tenant
+chart) to be present in the token's `groups` claim. Symmetric with the
+Grafana-side `allowed_groups` gate in the Monitoring chart — see
+docs/oidc-tenant.md and docs/oidc-grafana.md.
+*/ -}}
+{{-   $authnConfig := printf "apiVersion: apiserver.config.k8s.io/v1beta1\nkind: AuthenticationConfiguration\njwt:\n- issuer:\n    url: %s\n    audiences:\n    - %s\n  claimValidationRules:\n  - expression: '%s'\n    message: \"user is not a member of any %s-{view,use,admin,super-admin} group in the %s realm — this tenant's apiserver only trusts identities the tenant chart has admitted\"\n  claimMappings:\n    username:\n      claim: email\n      prefix: \"\"\n    groups:\n      claim: groups\n      prefix: \"\"\n    uid:\n      claim: sub\n" $issuer $audience $groupsExpr .Release.Namespace $realm }}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ .Release.Name }}-oidc-authn-config
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "kubernetes.labels" . | nindent 4 }}
+type: Opaque
+stringData:
+  config.yaml: |
+{{ $authnConfig | indent 4 }}
+{{- else if eq .Values.oidc.mode "CustomConfig" }}
+{{-   $inlineCfg := dig "customConfig" "config" "" .Values.oidc }}
+{{-   $customSecretRefName := dig "customConfig" "secretRef" "name" "" .Values.oidc }}
+{{-   $hasInline := ne $inlineCfg "" }}
+{{-   $hasSecretRef := ne $customSecretRefName "" }}
+{{-   if and $hasInline $hasSecretRef }}
+{{-     fail "spec.oidc.customConfig: set exactly one of `config` (inline) or `secretRef.name` — they are mutually exclusive." }}
+{{-   end }}
+{{-   if not (or $hasInline $hasSecretRef) }}
+{{-     fail "spec.oidc.mode: CustomConfig requires either spec.oidc.customConfig.config (inline AuthenticationConfiguration) or spec.oidc.customConfig.secretRef.name (Secret with config.yaml key)." }}
+{{-   end }}
+{{-   if $hasInline }}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ .Release.Name }}-oidc-authn-config
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "kubernetes.labels" . | nindent 4 }}
+type: Opaque
+stringData:
+  config.yaml: |
+{{ $inlineCfg | indent 4 }}
+{{-   end }}
+{{- end }}
diff --git a/packages/apps/kubernetes/templates/oidc-keycloak.yaml b/packages/apps/kubernetes/templates/oidc-keycloak.yaml
new file mode 100644
index 0000000000..a8687faf1c
--- /dev/null
+++ b/packages/apps/kubernetes/templates/oidc-keycloak.yaml
@@ -0,0 +1,82 @@
+{{- /*
+  Phase 1 — System mode: render one per-cluster Keycloak client and a
+  per-cluster audience client scope inside the platform `cozy` realm.
+
+  The clientId is namespace-prefixed so it is globally unique across the
+  realm; the audience scope binds `id_token.aud` to that clientId so a
+  token minted for cluster A is rejected by cluster B's apiserver — the
+  per-cluster isolation primitive in the absence of per-tenant realms.
+
+  Nothing is rendered for `mode: CustomConfig` or `mode: None`: in those
+  modes `cozy` is not in the path.
+
+  The `_cluster.oidc-enabled` guard catches the case where an operator
+  toggles `mode: System` without the platform-level OIDC feature
+  (authentication.oidc.enabled) being on — the Keycloak operator CRDs
+  would not be present and the chart would silently no-op without the
+  fail-fast.
+*/}}
+{{- if eq .Values.oidc.mode "System" }}
+{{- /* dig safely navigates missing _cluster / oidc-enabled without a
+       nil-pointer panic — index on nil returns <nil> which stringifies OK
+       but dig is the idiomatic Helm/Sprig way to read optional nested
+       keys. */ -}}
+{{-   $oidcEnabled := dig "oidc-enabled" "" (.Values._cluster | default dict) }}
+{{-   if ne ($oidcEnabled | toString) "true" }}
+{{-     fail "spec.oidc.mode: System requires the platform-level OIDC feature (authentication.oidc.enabled) — enable it in cozystack-values, or use mode: CustomConfig for a tenant-supplied issuer." }}
+{{-   end }}
+{{-   if .Capabilities.APIVersions.Has "v1.edp.epam.com/v1" }}
+{{-     $clientId := include "kubernetes.oidc.clientId" . }}
+{{-     $scopeName := include "kubernetes.oidc.audienceScopeName" . }}
+---
+apiVersion: v1.edp.epam.com/v1
+kind: KeycloakClientScope
+metadata:
+  name: {{ $scopeName }}
+  namespace: {{ .Release.Namespace }}
+spec:
+  name: {{ $scopeName }}
+  realmRef:
+    name: keycloakrealm-cozy
+    kind: ClusterKeycloakRealm
+  description: "Per-cluster audience for tenant kube-apiserver {{ .Release.Name }}"
+  protocol: openid-connect
+  default: false
+  attributes:
+    "include.in.token.scope": "true"
+  protocolMappers:
+    - name: audience
+      protocol: openid-connect
+      protocolMapper: "oidc-audience-mapper"
+      config:
+        "included.client.audience": {{ $clientId | quote }}
+        "id.token.claim": "true"
+        "access.token.claim": "true"
+        "introspection.token.claim": "true"
+        "lightweight.claim": "false"
+---
+apiVersion: v1.edp.epam.com/v1
+kind: KeycloakClient
+metadata:
+  name: {{ $clientId }}
+  namespace: {{ .Release.Namespace }}
+spec:
+  clientId: {{ $clientId }}
+  name: {{ $clientId }}
+  realmRef:
+    name: keycloakrealm-cozy
+    kind: ClusterKeycloakRealm
+  public: true
+  directAccess: false
+  advancedProtocolMappers: true
+  redirectUris:
+    - "http://localhost:8000"
+    - "http://localhost:18000"
+  defaultClientScopes:
+    - groups
+    - {{ $scopeName }}
+  attributes:
+    "pkce.code.challenge.method": "S256"
+    "post.logout.redirect.uris": "+"
+{{-   end }}
+{{- end }}
diff --git a/packages/apps/kubernetes/templates/oidc-kubeconfig-secret.yaml b/packages/apps/kubernetes/templates/oidc-kubeconfig-secret.yaml
new file mode 100644
index 0000000000..14206cd25a
--- /dev/null
+++ b/packages/apps/kubernetes/templates/oidc-kubeconfig-secret.yaml
@@ -0,0 +1,31 @@
+{{- /*
+  Pre-render the OIDC kubeconfig Secret as a chart-owned resource so
+  `helm uninstall` cleans it up. The bootstrap Job patches the `data`
+  field at runtime with the actual kubeconfig (it cannot be rendered
+  at template time because the tenant CA is generated asynchronously
+  by Kamaji).
+
+  Emitted only for `mode: System`; in `CustomConfig` mode the chart
+  does not know the issuer/clientId — the operator distributes the
+  OIDC kubeconfig out-of-band from their own IdP configuration.
+
+  The placeholder content keeps the Secret addressable by the
+  dashboard immediately on install; the bootstrap Job swaps it for a
+  real kubeconfig as soon as the Kamaji-issued admin kubeconfig is
+  available.
+*/}}
+{{- if eq .Values.oidc.mode "System" }}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ .Release.Name }}-oidc-kubeconfig
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "kubernetes.labels" . | nindent 4 }}
+type: Opaque
+stringData:
+  kubeconfig: |
+    # awaiting OIDC bootstrap Job — the tenant CA is generated by
+    # Kamaji asynchronously; the Job populates this Secret as soon as
+    # the admin kubeconfig appears.
+{{- end }}
diff --git a/packages/apps/kubernetes/templates/oidc-rbac-job.yaml b/packages/apps/kubernetes/templates/oidc-rbac-job.yaml
new file mode 100644
index 0000000000..64b6792ced
--- /dev/null
+++ b/packages/apps/kubernetes/templates/oidc-rbac-job.yaml
@@ -0,0 +1,449 @@
+{{- /*
+  OIDC bootstrap + normalize Job — runs as Helm post-install,post-upgrade
+  hook. Always rendered (regardless of `spec.oidc.mode`) so the mode=None
+  path can force-clean the KamajiControlPlane's stale
+  `authentication-config` volume that Server-Side Apply won't remove:
+  when Kamaji's controller writes back to the KCP as part of syncing to
+  TenantControlPlane, it takes SSA ownership of `spec.deployment.extraVolumes`,
+  and a subsequent Helm apply that omits the OIDC volume from the field
+  no longer overrides it (Helm doesn't set `force: true` by default).
+  A `kubectl patch --type=merge` with the desired 2-item array replaces
+  it deterministically.
+
+  Behavior by mode:
+
+  - `mode: None`:
+      - Normalize the KCP: replace `spec.deployment.extraVolumes` with the
+        two chart-baseline volumes (talos-ca, talos-tls-cert), so any
+        leftover `authentication-config` from a previous `System` install
+        is removed. `spec.apiServer.extraArgs` and
+        `spec.apiServer.extraVolumeMounts` are already emitted as `[]` by
+        the chart (see cluster.yaml — see the comment there) and Helm
+        replaces those correctly; only extraVolumes needs the kick.
+      - No CRB apply, no Secret patch.
+
+  - `mode: System | CustomConfig`:
+      - Apply one ClusterRoleBinding per `users[]` entry inside the tenant
+        cluster (`admin` → `cluster-admin`, `view` → `view`, subject = the
+        literal email matched against the `email` claim).
+      - Prune stale CRBs labelled by this release.
+      - `mode: System`: patch the pre-rendered `<release>-oidc-kubeconfig`
+        Secret with a real kubeconfig wired to `kubectl oidc-login`
+        (the tenant CA is extracted at runtime from the Kamaji-issued
+        admin kubeconfig).
+
+  Lifecycle:
+    - ServiceAccount, Role, RoleBinding are RELEASE-OWNED (no
+      `helm.sh/hook` annotations). They are created on `helm install`
+      and deleted on `helm uninstall`, so both the post-install
+      bootstrap hook AND the pre-delete cleanup hook find a working SA.
+    - The Job itself stays a hook so `helm upgrade` re-runs it on every
+      reconcile (picks up `users[]` changes and re-normalizes the KCP).
+
+  Pod is labelled `policy.cozystack.io/allow-to-apiserver: "true"` so
+  the Cilium policy lets it reach the tenant apiserver through
+  konnectivity, matching the existing cluster-autoscaler / KCCM / CSI
+  controllers pattern.
+*/}}
+{{- $clientId := include "kubernetes.oidc.clientId" . | trim }}
+{{- $issuer := include "kubernetes.oidc.systemIssuerURL" . | trim }}
+{{- $externalHost := .Values.host | default (printf "%s.%s" .Release.Name (.Values._namespace.host)) }}
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ .Release.Name }}-oidc-bootstrap
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "kubernetes.labels" . | nindent 4 }}
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: {{ .Release.Name }}-oidc-bootstrap
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "kubernetes.labels" . | nindent 4 }}
+rules:
+  # Patch chart-owned OIDC kubeconfig Secret with runtime tenant CA + kubeconfig.
+  # `get` is needed too — `kubectl patch --type=merge` reads the current object
+  # before computing the merge (SMP does a fetch under the hood).
+  - apiGroups: [""]
+    resources: ["secrets"]
+    resourceNames:
+      - {{ .Release.Name }}-oidc-kubeconfig
+    verbs: ["get", "patch"]
+  # KCP normalize — chart-owned array field is SSA-owned by Kamaji after write-back.
+  - apiGroups: ["controlplane.cluster.x-k8s.io"]
+    resources: ["kamajicontrolplanes"]
+    resourceNames:
+      - {{ .Release.Name }}
+    verbs: ["get", "patch"]
+  # mode=None cleanup — force-delete chart-owned OIDC objects that Helm's
+  # SSA-based apply cannot reap (helm-controller relinquishes ownership on
+  # missing fields but doesn't cascade-delete namespaced resources).
+  - apiGroups: [""]
+    resources: ["secrets"]
+    resourceNames:
+      - {{ .Release.Name }}-oidc-kubeconfig
+      - {{ .Release.Name }}-oidc-authn-config
+    verbs: ["delete"]
+  - apiGroups: ["v1.edp.epam.com"]
+    resources: ["keycloakclients"]
+    resourceNames:
+      - {{ printf "%s-%s" .Release.Namespace .Release.Name }}
+    verbs: ["delete"]
+  - apiGroups: ["v1.edp.epam.com"]
+    resources: ["keycloakclientscopes"]
+    resourceNames:
+      - {{ printf "%s-%s-audience" .Release.Namespace .Release.Name }}
+    verbs: ["delete"]
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: {{ .Release.Name }}-oidc-bootstrap
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "kubernetes.labels" . | nindent 4 }}
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: {{ .Release.Name }}-oidc-bootstrap
+subjects:
+  - kind: ServiceAccount
+    name: {{ .Release.Name }}-oidc-bootstrap
+    namespace: {{ .Release.Namespace }}
+---
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: {{ .Release.Name }}-oidc-bootstrap
+  namespace: {{ .Release.Namespace }}
+  annotations:
+    "helm.sh/hook": post-install,post-upgrade
+    "helm.sh/hook-weight": "10"
+    "helm.sh/hook-delete-policy": before-hook-creation
+  labels:
+    {{- include "kubernetes.labels" . | nindent 4 }}
+spec:
+  backoffLimit: 6
+  template:
+    metadata:
+      labels:
+        {{- include "kubernetes.selectorLabels" . | nindent 8 }}
+        policy.cozystack.io/allow-to-apiserver: "true"
+    spec:
+      serviceAccountName: {{ .Release.Name }}-oidc-bootstrap
+      restartPolicy: OnFailure
+      securityContext:
+        runAsNonRoot: true
+        runAsUser: 65534
+        runAsGroup: 65534
+        seccompProfile:
+          type: RuntimeDefault
+      containers:
+        - name: bootstrap
+          image: "{{ default (.Files.Get "images/kubectl.tag" | trim) .Values.images.kubectl }}"
+          imagePullPolicy: IfNotPresent
+          securityContext:
+            allowPrivilegeEscalation: false
+            readOnlyRootFilesystem: true
+            capabilities:
+              drop: ["ALL"]
+          env:
+            - name: HOME
+              value: /tmp
+            - name: KUBECONFIG_TENANT
+              value: /etc/kubernetes/kubeconfig/super-admin.svc
+            - name: RELEASE
+              value: {{ .Release.Name }}
+            - name: RELEASE_NAMESPACE
+              value: {{ .Release.Namespace }}
+            - name: OIDC_MODE
+              value: {{ .Values.oidc.mode | quote }}
+            - name: OIDC_CLIENT_ID
+              value: {{ $clientId | quote }}
+            - name: OIDC_ISSUER_URL
+              value: {{ $issuer | quote }}
+            - name: OIDC_SERVER_URL
+              value: {{ printf "https://%s:443" $externalHost | quote }}
+          resources:
+            requests:
+              cpu: 10m
+              memory: 64Mi
+            limits:
+              cpu: 200m
+              memory: 256Mi
+          command:
+            - /bin/sh
+            - -c
+            - |
+              set -euo pipefail
+
+              if [ "$OIDC_MODE" = "None" ]; then
+                echo "mode=None: force-cleaning chart-owned OIDC resources Helm's SSA apply cannot reap..."
+
+                # 1. Normalize KCP: kubectl patch --type=merge REPLACES the array,
+                #    which Helm's SSA apply does not do here — Kamaji's field
+                #    manager takes ownership of spec.deployment.extraVolumes on
+                #    write-back to the TenantControlPlane. Verified end-to-end
+                #    against a real Kamaji controller.
+                echo "  patching KamajiControlPlane $RELEASE — remove OIDC-only entries from extraArgs, extraVolumeMounts, deployment.extraVolumes"
+                # Patch payload is rendered at helm template time from the same
+                # source of truth cluster.yaml uses: user-supplied extras stay
+                # intact, only the chart-owned OIDC-only entries (that Kamaji's
+                # SSA field-owner refuses to release) are stripped.
+                kubectl --namespace "$RELEASE_NAMESPACE" patch kamajicontrolplane "$RELEASE" \
+                  --type=merge \
+                  --patch {{ printf "{\"spec\":{\"apiServer\":{\"extraArgs\":%s,\"extraVolumeMounts\":%s},\"deployment\":{\"extraVolumes\":%s}}}"
+                      (include "kubernetes.apiServer.keptExtraArgs" .)
+                      (default (list) .Values.controlPlane.apiServer.extraVolumeMounts | toJson)
+                      (concat (list (dict "name" "talos-ca" "secret" (dict "secretName" (printf "%s-talos-ca" .Release.Name))) (dict "name" "talos-tls-cert" "secret" (dict "secretName" (printf "%s-talos-tls-cert" .Release.Name)))) (default (list) .Values.controlPlane.apiServer.extraVolumes) | toJson)
+                      | quote }}
+
+                # 2. Chart-owned OIDC Secrets — Helm's SSA-based delete-on-absence
+                #    also fails here (same field-ownership pattern). Explicit
+                #    delete is safe: the templates only render these for
+                #    mode=System/CustomConfig, so at mode=None they are stale.
+                echo "  deleting chart-owned OIDC Secrets"
+                kubectl --namespace "$RELEASE_NAMESPACE" delete secret \
+                  "$RELEASE-oidc-kubeconfig" "$RELEASE-oidc-authn-config" \
+                  --ignore-not-found
+
+                # 3. Chart-owned KeycloakClient + audience KeycloakClientScope in
+                #    the cozy realm. These are created by oidc-keycloak.yaml only
+                #    for mode=System; at mode=None they must not linger.
+                #
+                #    The CRD probe must test the OUTPUT of `kubectl api-resources`,
+                #    not its exit code: for an absent API group the command exits 0
+                #    and merely prints an empty list. Guarding on the exit code let
+                #    the deletes run on clusters without the Keycloak operator,
+                #    where they fail with `the server doesn't have a resource type
+                #    "keycloakclient"` — `--ignore-not-found` covers a missing
+                #    object, not an unknown type. Since this Job is a
+                #    post-install/post-upgrade hook, that failure blocked every
+                #    `kubernetes-<cluster>` Helm upgrade at oidc.mode=None (the
+                #    chart default), a fully supported configuration.
+                #    api-resources hits the discovery endpoint, which
+                #    system:discovery grants to every authenticated principal, so
+                #    the probe needs no cluster-scoped CRD read permission.
+                EDP_RESOURCES=$(kubectl api-resources --api-group=v1.edp.epam.com --output=name 2>/dev/null || true)
+                if echo "$EDP_RESOURCES" | grep -q '^keycloakclients\.'; then
+                  echo "  deleting chart-owned KeycloakClient"
+                  kubectl --namespace "$RELEASE_NAMESPACE" delete keycloakclient.v1.edp.epam.com \
+                    "$RELEASE_NAMESPACE-$RELEASE" --ignore-not-found
+                fi
+                if echo "$EDP_RESOURCES" | grep -q '^keycloakclientscopes\.'; then
+                  echo "  deleting chart-owned KeycloakClientScope"
+                  kubectl --namespace "$RELEASE_NAMESPACE" delete keycloakclientscope.v1.edp.epam.com \
+                    "$RELEASE_NAMESPACE-$RELEASE-audience" --ignore-not-found
+                fi
+
+                echo "mode=None cleanup complete."
+                exit 0
+              fi
+
+              echo "Waiting for the tenant admin kubeconfig to appear..."
+              deadline=$(( $(date +%s) + 600 ))
+              until [ -s "$KUBECONFIG_TENANT" ]; do
+                if [ "$(date +%s)" -ge "$deadline" ]; then
+                  echo "tenant admin kubeconfig was not provisioned within 10m; aborting" >&2
+                  exit 1
+                fi
+                sleep 5
+              done
+
+              echo "Applying ${OIDC_MODE} ClusterRoleBindings to the tenant cluster..."
+              DESIRED_FILE=$(mktemp)
+              {{- range .Values.oidc.users }}
+              {{-   $hash := printf "%s-%s" $.Release.Name .email | sha256sum | trunc 16 }}
+              {{-   $crbName := printf "cozystack-oidc-%s" $hash }}
+              {{-   $role := "view" }}
+              {{-   if eq .role "admin" }}
+              {{-     $role = "cluster-admin" }}
+              {{-   end }}
+              echo "{{ $crbName }}" >> "$DESIRED_FILE"
+              cat <<'EOF' | kubectl --kubeconfig "$KUBECONFIG_TENANT" apply --filename -
+              apiVersion: rbac.authorization.k8s.io/v1
+              kind: ClusterRoleBinding
+              metadata:
+                name: {{ $crbName }}
+                labels:
+                  app.kubernetes.io/managed-by: cozystack-oidc
+                  app.kubernetes.io/instance: {{ $.Release.Name }}
+              roleRef:
+                apiGroup: rbac.authorization.k8s.io
+                kind: ClusterRole
+                name: {{ $role }}
+              subjects:
+                - kind: User
+                  apiGroup: rbac.authorization.k8s.io
+                  name: {{ .email | quote }}
+              EOF
+              {{- end }}
+
+              echo "Pruning stale ClusterRoleBindings labelled by this release..."
+              EXISTING=$(kubectl --kubeconfig "$KUBECONFIG_TENANT" get clusterrolebindings \
+                --selector=app.kubernetes.io/managed-by=cozystack-oidc,app.kubernetes.io/instance=$RELEASE \
+                --output=jsonpath='{.items[*].metadata.name}')
+              for crb in $EXISTING; do
+                if ! grep -x -q -F "$crb" "$DESIRED_FILE"; then
+                  echo "  removing $crb"
+                  kubectl --kubeconfig "$KUBECONFIG_TENANT" delete clusterrolebinding "$crb" --ignore-not-found
+                fi
+              done
+              rm -f "$DESIRED_FILE"
+
+              if [ "$OIDC_MODE" = "System" ]; then
+                echo "Patching the OIDC kubeconfig Secret on the management cluster..."
+                CA_DATA=$(kubectl --kubeconfig "$KUBECONFIG_TENANT" config view --raw \
+                  --output=jsonpath='{.clusters[0].cluster.certificate-authority-data}')
+                if [ -z "$CA_DATA" ]; then
+                  echo "tenant admin kubeconfig has no certificate-authority-data; refusing to leave the OIDC kubeconfig Secret as the install-time placeholder" >&2
+                  exit 1
+                fi
+                KUBECONFIG_FILE=$(mktemp)
+                cat > "$KUBECONFIG_FILE" <<EOF
+              apiVersion: v1
+              kind: Config
+              current-context: $RELEASE
+              clusters:
+              - name: $RELEASE
+                cluster:
+                  server: $OIDC_SERVER_URL
+                  certificate-authority-data: $CA_DATA
+              users:
+              - name: $RELEASE-oidc
+                user:
+                  exec:
+                    apiVersion: client.authentication.k8s.io/v1
+                    command: kubectl
+                    args:
+                    - oidc-login
+                    - get-token
+                    - --oidc-issuer-url=$OIDC_ISSUER_URL
+                    - --oidc-client-id=$OIDC_CLIENT_ID
+                    - --oidc-extra-scope=email
+                    - --oidc-extra-scope=groups
+                    - --oidc-use-pkce
+                    interactiveMode: IfAvailable
+                    provideClusterInfo: true
+              contexts:
+              - name: $RELEASE
+                context:
+                  cluster: $RELEASE
+                  user: $RELEASE-oidc
+              EOF
+                KUBECONFIG_B64=$(base64 < "$KUBECONFIG_FILE" | tr -d '\n')
+                PATCH=$(printf '{"data":{"kubeconfig":"%s"},"stringData":null}' "$KUBECONFIG_B64")
+                kubectl --namespace "$RELEASE_NAMESPACE" patch secret \
+                  "$RELEASE-oidc-kubeconfig" \
+                  --type=merge \
+                  --patch "$PATCH"
+                rm -f "$KUBECONFIG_FILE"
+              fi
+
+              echo "Done."
+          volumeMounts:
+            - name: kubeconfig
+              mountPath: /etc/kubernetes/kubeconfig
+              readOnly: true
+            - name: tmp
+              mountPath: /tmp
+      volumes:
+        - name: kubeconfig
+          secret:
+            secretName: {{ .Release.Name }}-admin-kubeconfig
+            optional: true
+        - name: tmp
+          emptyDir: {}
+{{- /*
+  Pre-delete cleanup: remove the release's ClusterRoleBindings inside
+  the tenant cluster before the cluster itself is torn down. Reuses
+  the release-owned ServiceAccount above (NOT a hook resource, so it
+  is still present when this hook fires). Best-effort — if the tenant
+  apiserver is unreachable the orphan CRBs disappear with the control
+  plane anyway.
+*/}}
+{{- if ne .Values.oidc.mode "None" }}
+---
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: {{ .Release.Name }}-oidc-cleanup
+  namespace: {{ .Release.Namespace }}
+  annotations:
+    "helm.sh/hook": pre-delete
+    "helm.sh/hook-weight": "5"
+    "helm.sh/hook-delete-policy": hook-succeeded,before-hook-creation,hook-failed
+  labels:
+    {{- include "kubernetes.labels" . | nindent 4 }}
+spec:
+  backoffLimit: 1
+  template:
+    metadata:
+      labels:
+        {{- include "kubernetes.selectorLabels" . | nindent 8 }}
+        policy.cozystack.io/allow-to-apiserver: "true"
+    spec:
+      serviceAccountName: {{ .Release.Name }}-oidc-bootstrap
+      restartPolicy: OnFailure
+      securityContext:
+        runAsNonRoot: true
+        runAsUser: 65534
+        runAsGroup: 65534
+        seccompProfile:
+          type: RuntimeDefault
+      containers:
+        - name: cleanup
+          image: "{{ default (.Files.Get "images/kubectl.tag" | trim) .Values.images.kubectl }}"
+          imagePullPolicy: IfNotPresent
+          securityContext:
+            allowPrivilegeEscalation: false
+            readOnlyRootFilesystem: true
+            capabilities:
+              drop: ["ALL"]
+          env:
+            - name: HOME
+              value: /tmp
+            - name: KUBECONFIG_TENANT
+              value: /etc/kubernetes/kubeconfig/super-admin.svc
+            - name: RELEASE
+              value: {{ .Release.Name }}
+          resources:
+            requests:
+              cpu: 10m
+              memory: 64Mi
+            limits:
+              cpu: 100m
+              memory: 128Mi
+          command:
+            - /bin/sh
+            - -c
+            - |
+              set -euo pipefail
+              if [ ! -s "$KUBECONFIG_TENANT" ]; then
+                echo "tenant kubeconfig not present; nothing to clean up"
+                exit 0
+              fi
+              kubectl --kubeconfig "$KUBECONFIG_TENANT" \
+                --request-timeout=30s \
+                delete clusterrolebinding \
+                --selector=app.kubernetes.io/managed-by=cozystack-oidc,app.kubernetes.io/instance=$RELEASE \
+                --ignore-not-found --timeout=30s \
+                || echo "WARNING: could not clean OIDC ClusterRoleBindings (apiserver unreachable?); they will disappear with the control plane" >&2
+          volumeMounts:
+            - name: kubeconfig
+              mountPath: /etc/kubernetes/kubeconfig
+              readOnly: true
+            - name: tmp
+              mountPath: /tmp
+      volumes:
+        - name: kubeconfig
+          secret:
+            secretName: {{ .Release.Name }}-admin-kubeconfig
+            optional: true
+        - name: tmp
+          emptyDir: {}
+{{- end }}
diff --git a/packages/apps/kubernetes/templates/talos/bootstrap-token-tenant-job.yaml b/packages/apps/kubernetes/templates/talos/bootstrap-token-tenant-job.yaml
new file mode 100644
index 0000000000..1e161a7c83
--- /dev/null
+++ b/packages/apps/kubernetes/templates/talos/bootstrap-token-tenant-job.yaml
@@ -0,0 +1,250 @@
+{{- /*
+  Job that materialises a long-lived kubeadm-format bootstrap-token Secret
+  inside the tenant kube-system namespace, so that Talos workers can use
+  cluster.token from their machineconfig to perform kubelet CSR.
+
+  Why a Job and not a kube-native Secret on the management cluster:
+  bootstrap-token-<id> Secrets must live in the tenant apiserver's
+  kube-system, which the management cluster can only reach via the
+  Kamaji-issued admin kubeconfig stored as <release>-admin-kubeconfig.
+
+  Why a main-phase resource and not a Helm post-install/post-upgrade hook
+  (the earlier shape): the hook is unreliable on the very failure it was
+  meant to cover. This release carries
+  release.cozystack.io/helm-install-disable-wait: "true" (cozystack-api
+  sets it on both Install.DisableWait and Upgrade.DisableWait), so there
+  is NO main-resource wait phase in front of the hooks — a post-install
+  hook is not gated on MachineDeployment Ready and does fire on a fresh
+  install, so the "hook waits on MD, MD waits on the token" deadlock
+  cannot happen here. What actually breaks is upgrades: a post-UPGRADE
+  hook only runs after a successful upgrade, and a release whose upgrade
+  keeps failing (these tenants were observed at thousands of
+  HR.status.upgradeFailures) never reaches its hook — so the token Secret
+  never lands and the workers stay system:anonymous. pre-* hooks are not
+  usable either: they fire before non-hook templates apply, so
+  <release>-admin-kubeconfig (materialised by Kamaji after the
+  KamajiControlPlane is applied) is not yet available.
+
+  As an ordinary main-phase resource (mirroring talos-reconcile-job.yaml)
+  the Job is applied on every install and every reconcile regardless of
+  hook phase. It lands together with the KamajiControlPlane and
+  talos-secrets; a wait-for-kubeconfig init container holds the Pod until
+  Kamaji publishes the admin kubeconfig Secret (the Secret volume is
+  optional so kubelet does not FailedMount in the meantime), then the
+  kubectl container runs and completes. Under disable-wait Helm does not
+  gate the release on the Job, so it self-heals through the content-hash
+  + TTL mechanism below rather than by failing the release.
+
+  Churn-free across upgrades. A Job's spec.template is immutable and the
+  generated HelmRelease sets no Force, so a static Job name would fail any
+  upgrade that lands while the Job is live (or inside
+  ttlSecondsAfterFinished) with `spec.template: field is immutable`, and
+  RetryOnFailure would loop on it. The Job therefore carries a
+  content-hash name suffix over its whole rendered spec (mirrors
+  talos-reconcile-job.yaml and the KubevirtMachineTemplate idiom in
+  cluster.yaml): an identical render keeps the name and Helm no-ops it;
+  any change that flows into the spec — notably .Values.images.kubectl —
+  yields a new name so a fresh Job runs and Helm prunes the old one. The
+  hash also folds in the looked-up bootstrap token — both halves,
+  bootstrapTokenId and bootstrapTokenSecret — because the token reaches
+  the Job only through secretKeyRef and so never changes the render on
+  its own: without this, a rotated token (a recreated talos-secrets
+  Secret) would leave Helm no-oping a completed Job and the tenant stuck
+  on the stale bootstrap-token. talos-secrets.yaml regenerates the two
+  halves independently (each guarded by its own empty check), so a change
+  to either half must rotate the name; folding both in guarantees that.
+  Folding the token in rotates the name on rotation so the new token is
+  applied and the old Job is pruned. (One idempotent re-run happens on
+  the first reconcile after a fresh install, when the looked-up token
+  flips from empty to its value; the kubectl apply is a no-op.)
+*/}}
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ .Release.Name }}-bootstrap-token-tenant
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "kubernetes.labels" . | nindent 4 }}
+{{- /* Job spec rendered through a named template so the immutable Job's name
+       can carry a content hash of the whole spec (see the header comment).
+       Invoked with the root context, so .Release / .Values / .Files resolve
+       as usual. */}}
+{{- define "kubernetes.bootstrap-token-tenant-job-spec" -}}
+spec:
+  # restartPolicy: OnFailure + backoffLimit gives the kubectl container up to
+  # 11 attempts at the tenant apiserver with exponential backoff, covering the
+  # transient unreadiness window after Kamaji bootstraps the konnectivity plane.
+  # It does NOT fail the release loudly: under helm-install-disable-wait Helm
+  # does not wait on this Job (see the header and talos-reconcile-job.yaml), so
+  # an exhausted backoffLimit leaves the release green with no token Secret.
+  # ttlSecondsAfterFinished then clears the Job so a later reconcile recreates
+  # it (unchanged render => same hash => same name) and retries. The
+  # wait-for-kubeconfig init container — not backoffLimit — covers the
+  # admin-kubeconfig-not-yet-provisioned window, because a Pod blocked in an
+  # init wait never counts as a failed attempt.
+  backoffLimit: 10
+  ttlSecondsAfterFinished: 600
+  template:
+    spec:
+      restartPolicy: OnFailure
+      # This Job only talks to the tenant apiserver via the mounted admin
+      # kubeconfig (KUBECONFIG below); it never calls the management apiserver,
+      # so the management ServiceAccount token is not needed. Drop it.
+      automountServiceAccountToken: false
+      serviceAccountName: {{ .Release.Name }}-bootstrap-token-tenant
+      # Hold the Pod until Kamaji has published <release>-admin-kubeconfig; the
+      # kubeconfig volume is optional so kubelet does not FailedMount while the
+      # Secret is still absent. Shared with kccm/csi/cluster-autoscaler.
+      initContainers:
+      {{- include "kubernetes.waitForAdminKubeconfig" . | nindent 6 }}
+      containers:
+        - name: kubectl
+          image: "{{ default (.Files.Get "images/kubectl.tag" | trim) .Values.images.kubectl }}"
+          env:
+            - name: KUBECONFIG
+              value: /etc/kubernetes/kubeconfig/super-admin.svc
+            - name: TOKEN_ID
+              valueFrom:
+                secretKeyRef:
+                  name: {{ .Release.Name }}-talos-secrets
+                  key: bootstrapTokenId
+            - name: TOKEN_SECRET
+              valueFrom:
+                secretKeyRef:
+                  name: {{ .Release.Name }}-talos-secrets
+                  key: bootstrapTokenSecret
+          volumeMounts:
+            - name: kubeconfig
+              mountPath: /etc/kubernetes/kubeconfig
+              readOnly: true
+          resources:
+            requests:
+              cpu: 10m
+              memory: 64Mi
+            limits:
+              cpu: 100m
+              memory: 256Mi
+          securityContext:
+            allowPrivilegeEscalation: false
+            capabilities:
+              drop:
+                - ALL
+            readOnlyRootFilesystem: true
+            runAsNonRoot: true
+            runAsUser: 65532
+            seccompProfile:
+              type: RuntimeDefault
+          command:
+            - sh
+            - -ec
+            - |
+              # The kubectl apply calls below fail with a non-zero exit when
+              # the tenant apiserver is unreachable, which restarts the pod
+              # under backoffLimit. No internal retry loop needed — Job-level
+              # backoff handles the transient unreadiness window after Kamaji
+              # bootstraps the konnectivity plane.
+              kubectl version --request-timeout=10s
+
+              cat <<EOF | kubectl apply -f -
+              apiVersion: v1
+              kind: Secret
+              metadata:
+                name: bootstrap-token-${TOKEN_ID}
+                namespace: kube-system
+              type: bootstrap.kubernetes.io/token
+              stringData:
+                token-id: ${TOKEN_ID}
+                token-secret: ${TOKEN_SECRET}
+                description: "Talos worker bootstrap token, managed by cozystack kubernetes chart"
+                usage-bootstrap-authentication: "true"
+                usage-bootstrap-signing: "true"
+                auth-extra-groups: "system:bootstrappers:kubeadm:default-node-token"
+              EOF
+
+              echo "[$(date -u +%H:%M:%S)] bootstrap-token-${TOKEN_ID} ensured"
+
+              # Grant system:nodes the ability to watch the kubernetes
+              # Endpoint/EndpointSlice in the default namespace. Talos
+              # workers run an internal k8s.EndpointController (apiserver
+              # failover discovery) that otherwise spams
+              # "endpointslices forbidden" warnings.
+              # Note: resourceNames intentionally omitted — Talos's
+              # informer issues unbounded list/watch and Kubernetes RBAC
+              # only honours resourceNames on list/watch when the client
+              # restricts via a field selector, which Talos does not.
+              # The Role is namespace-scoped to default, where only the
+              # built-in "kubernetes" endpoint lives.
+              cat <<'EOF' | kubectl apply -f -
+              apiVersion: rbac.authorization.k8s.io/v1
+              kind: Role
+              metadata:
+                name: talos:node-apiserver-endpoint-discovery
+                namespace: default
+              rules:
+                - apiGroups: [""]
+                  resources: ["endpoints"]
+                  verbs: ["get", "list", "watch"]
+                - apiGroups: ["discovery.k8s.io"]
+                  resources: ["endpointslices"]
+                  verbs: ["get", "list", "watch"]
+              ---
+              apiVersion: rbac.authorization.k8s.io/v1
+              kind: RoleBinding
+              metadata:
+                name: talos:node-apiserver-endpoint-discovery
+                namespace: default
+              roleRef:
+                apiGroup: rbac.authorization.k8s.io
+                kind: Role
+                name: talos:node-apiserver-endpoint-discovery
+              subjects:
+                - kind: Group
+                  apiGroup: rbac.authorization.k8s.io
+                  name: system:nodes
+              EOF
+
+              # Drop the previous ClusterRole/Binding incarnation if it
+              # exists from earlier deploys of this chart.
+              kubectl delete clusterrole talos:node-apiserver-endpoint-discovery --ignore-not-found
+              kubectl delete clusterrolebinding talos:node-apiserver-endpoint-discovery --ignore-not-found
+
+              echo "[$(date -u +%H:%M:%S)] talos:node-apiserver-endpoint-discovery RBAC ensured"
+      volumes:
+        - name: kubeconfig
+          secret:
+            secretName: {{ .Release.Name }}-admin-kubeconfig
+            optional: true
+{{- end }}
+{{- /* Render the spec, then hash it (plus the looked-up bootstrap token, both
+       halves) into a 6-char name suffix so the immutable Job is churn-free
+       across upgrades yet still rotates when its image or the bootstrap token
+       changes. See the header comment. lookup returns empty during `helm
+       template`/unittest, so the token contribution is stable there and the
+       render stays testable. */}}
+{{- $jobSpec := include "kubernetes.bootstrap-token-tenant-job-spec" . }}
+{{- $btId := "" }}
+{{- $btSecret := "" }}
+{{- $existing := lookup "v1" "Secret" .Release.Namespace (printf "%s-talos-secrets" .Release.Name) }}
+{{- if and $existing $existing.data }}
+{{-   if hasKey $existing.data "bootstrapTokenId" }}
+{{-     $btId = index $existing.data "bootstrapTokenId" | b64dec }}
+{{-   end }}
+{{-   if hasKey $existing.data "bootstrapTokenSecret" }}
+{{-     $btSecret = index $existing.data "bootstrapTokenSecret" | b64dec }}
+{{-   end }}
+{{- end }}
+{{- $jobHash := printf "%s\n%s\n%s" $jobSpec $btId $btSecret | sha256sum | trunc 6 }}
+{{- /* Truncate the name prefix, never the hash, so the name stays within the
+       63-char DNS-label limit while the 6-char content hash is always the
+       suffix. A no-op for normal-length release names. */}}
+{{- $jobName := printf "%s-bootstrap-token-tenant" .Release.Name | trunc 56 | trimSuffix "-" }}
+---
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: {{ $jobName }}-{{ $jobHash }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "kubernetes.labels" . | nindent 4 }}
+{{ $jobSpec }}
diff --git a/packages/apps/kubernetes/templates/talos/talos-pki.yaml b/packages/apps/kubernetes/templates/talos/talos-pki.yaml
new file mode 100644
index 0000000000..ceab17b7d9
--- /dev/null
+++ b/packages/apps/kubernetes/templates/talos/talos-pki.yaml
@@ -0,0 +1,85 @@
+{{- /*
+  Talos PKI infrastructure for the talos-csr-signer sidecar.
+
+  Two layers:
+  - <release>-talos-ca           : Ed25519 self-signed CA used as Talos machine CA.
+                                   The signer mounts this Secret to sign worker
+                                   trustd CSRs. Workers carry the *cert* in their
+                                   machineconfig as machine.ca.crt.
+  - <release>-talos-tls-cert     : Server TLS certificate for the signer's gRPC
+                                   listener, issued by the CA above.
+
+  cert-manager is a hard dependency of Kamaji, so it is always available.
+*/}}
+---
+apiVersion: cert-manager.io/v1
+kind: Issuer
+metadata:
+  name: {{ .Release.Name }}-talos-bootstrap
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "kubernetes.labels" . | nindent 4 }}
+spec:
+  selfSigned: {}
+---
+apiVersion: cert-manager.io/v1
+kind: Certificate
+metadata:
+  name: {{ .Release.Name }}-talos-ca
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "kubernetes.labels" . | nindent 4 }}
+spec:
+  secretName: {{ .Release.Name }}-talos-ca
+  isCA: true
+  commonName: talos
+  duration: 87600h  # 10 years
+  renewBefore: 720h # 30 days
+  privateKey:
+    algorithm: Ed25519
+  issuerRef:
+    name: {{ .Release.Name }}-talos-bootstrap
+    kind: Issuer
+    group: cert-manager.io
+---
+apiVersion: cert-manager.io/v1
+kind: Issuer
+metadata:
+  name: {{ .Release.Name }}-talos-ca
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "kubernetes.labels" . | nindent 4 }}
+spec:
+  ca:
+    secretName: {{ .Release.Name }}-talos-ca
+---
+apiVersion: cert-manager.io/v1
+kind: Certificate
+metadata:
+  name: {{ .Release.Name }}-talos-tls-cert
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "kubernetes.labels" . | nindent 4 }}
+spec:
+  secretName: {{ .Release.Name }}-talos-tls-cert
+  duration: 8760h   # 1 year
+  renewBefore: 720h # 30 days
+  privateKey:
+    algorithm: Ed25519
+  usages:
+    - digital signature
+    - server auth
+  dnsNames:
+    - {{ .Release.Name }}.{{ .Release.Namespace }}.svc
+    - {{ .Release.Name }}.{{ .Release.Namespace }}.svc.{{ include "kubernetes.tenantClusterDomain" . }}
+  {{- /* The cert intentionally carries DNS SANs only, no spec.ipAddresses.
+         Workers reach trustd via the Service DNS name (the worker's
+         machine.network.extraHostEntries injects the ClusterIP into
+         /etc/hosts), so the cert never needs an IP SAN patched in after the
+         ClusterIP becomes known — see the routing note in the kubernetes-nodes
+         chart's talos-reconcile-job.yaml, where the Job lives since the worker
+         split. */}}
+  issuerRef:
+    name: {{ .Release.Name }}-talos-ca
+    kind: Issuer
+    group: cert-manager.io
diff --git a/packages/apps/kubernetes/templates/talos/talos-secrets.yaml b/packages/apps/kubernetes/templates/talos/talos-secrets.yaml
new file mode 100644
index 0000000000..ce0dc04ec9
--- /dev/null
+++ b/packages/apps/kubernetes/templates/talos/talos-secrets.yaml
@@ -0,0 +1,69 @@
+{{- /*
+  Random Talos secrets that don't fit the cert-manager flow.
+
+  Stability across helm upgrades is achieved by looking up the existing
+  Secret on each render. If it exists, we reuse the values; if not, we
+  generate fresh random values. This is the standard Helm "lookup + reuse"
+  pattern for non-cryptographic random values that must remain stable.
+
+  Contents:
+    token             - Talos trustd token (machine.token, cluster.token in
+                        the worker machineconfig). The talos-csr-signer
+                        sidecar reads it via env var to authenticate
+                        worker CSRs.
+    clusterId         - Random cluster identifier (cluster.id).
+    clusterSecret     - Random cluster secret (cluster.secret).
+    bootstrapToken    - kubeadm-format bootstrap token "<id>.<secret>"
+                        used as cluster.token in the worker machineconfig.
+                        A matching bootstrap-token-<id> Secret is
+                        materialised inside the tenant kube-system by the
+                        bootstrap-token-tenant Job.
+    bootstrapTokenId/
+    bootstrapTokenSecret - exposed as separate keys so the Job can mount
+                        them as env vars without re-parsing the combined
+                        value.
+*/}}
+{{- $existing := lookup "v1" "Secret" .Release.Namespace (printf "%s-talos-secrets" .Release.Name) }}
+{{- $token := "" }}
+{{- $clusterId := "" }}
+{{- $clusterSecret := "" }}
+{{- $btId := "" }}
+{{- $btSecret := "" }}
+{{- if $existing }}
+{{-   $token = index $existing.data "token" | b64dec }}
+{{-   $clusterId = index $existing.data "clusterId" | b64dec }}
+{{-   $clusterSecret = index $existing.data "clusterSecret" | b64dec }}
+{{-   if hasKey $existing.data "bootstrapTokenId" }}
+{{-     $btId = index $existing.data "bootstrapTokenId" | b64dec }}
+{{-   end }}
+{{-   if hasKey $existing.data "bootstrapTokenSecret" }}
+{{-     $btSecret = index $existing.data "bootstrapTokenSecret" | b64dec }}
+{{-   end }}
+{{- else }}
+{{-   $token = printf "%s.%s" (randAlphaNum 6 | lower) (randAlphaNum 16 | lower) }}
+{{-   $clusterId = randAlphaNum 32 }}
+{{-   $clusterSecret = randAlphaNum 32 }}
+{{- end }}
+{{- if eq $btId "" }}
+{{-   $btId = randAlphaNum 6 | lower }}
+{{- end }}
+{{- if eq $btSecret "" }}
+{{-   $btSecret = randAlphaNum 16 | lower }}
+{{- end }}
+{{- $bootstrapToken := printf "%s.%s" $btId $btSecret }}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ .Release.Name }}-talos-secrets
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "kubernetes.labels" . | nindent 4 }}
+type: Opaque
+data:
+  token: {{ $token | b64enc | quote }}
+  clusterId: {{ $clusterId | b64enc | quote }}
+  clusterSecret: {{ $clusterSecret | b64enc | quote }}
+  bootstrapToken: {{ $bootstrapToken | b64enc | quote }}
+  bootstrapTokenId: {{ $btId | b64enc | quote }}
+  bootstrapTokenSecret: {{ $btSecret | b64enc | quote }}
diff --git a/packages/apps/kubernetes/tests/apiserver_authentication_test.yaml b/packages/apps/kubernetes/tests/apiserver_authentication_test.yaml
new file mode 100644
index 0000000000..7d642435f4
--- /dev/null
+++ b/packages/apps/kubernetes/tests/apiserver_authentication_test.yaml
@@ -0,0 +1,380 @@
+suite: tenant apiserver authentication passthrough
+
+templates:
+  - templates/cluster.yaml
+
+values:
+  - values/common.yaml
+
+# The KamajiControlPlane is document index 1 in the cluster.yaml render
+# (0: Cluster, 1: KamajiControlPlane, 2: WorkloadMonitor, 3: KubevirtCluster, ...).
+# These tests cover the apiServer authentication passthrough:
+#   controlPlane.apiServer.extraArgs         -> spec.apiServer.extraArgs
+#   controlPlane.apiServer.extraVolumeMounts -> spec.apiServer.extraVolumeMounts
+#   controlPlane.apiServer.extraVolumes      -> spec.deployment.extraVolumes (appended)
+# plus the validation guards on extraVolumes / extraVolumeMounts.
+
+tests:
+  ###############################################
+  # default: opt-in fields render nothing       #
+  ###############################################
+
+  - it: emits empty extraArgs and extraVolumeMounts arrays by default
+    # The chart ALWAYS emits both fields (empty arrays when nothing to inject)
+    # so a mode=System → mode=None transition sends a JSON-merge-patch that
+    # REPLACES the live array — otherwise the CRD keeps the stale flag.
+    release:
+      name: test-k8s
+      namespace: tenant-test
+    asserts:
+      - isKind:
+          of: KamajiControlPlane
+        documentIndex: 1
+      - equal:
+          path: spec.apiServer.extraArgs
+          value: []
+        documentIndex: 1
+      - equal:
+          path: spec.apiServer.extraVolumeMounts
+          value: []
+        documentIndex: 1
+
+  - it: keeps only the two talos control-plane volumes by default
+    release:
+      name: test-k8s
+      namespace: tenant-test
+    asserts:
+      - lengthEqual:
+          path: spec.deployment.extraVolumes
+          count: 2
+        documentIndex: 1
+      - equal:
+          path: spec.deployment.extraVolumes[0].name
+          value: talos-ca
+        documentIndex: 1
+      - equal:
+          path: spec.deployment.extraVolumes[1].name
+          value: talos-tls-cert
+        documentIndex: 1
+
+  ###############################################
+  # extraArgs passthrough                       #
+  ###############################################
+
+  - it: passes apiServer extraArgs through to the KamajiControlPlane
+    # Runs under the default oidc.mode=None, where the chart injects nothing of
+    # its own and the passthrough is verbatim. The collision guards on
+    # --authentication-config and --requestheader-uid-headers are gated on
+    # oidc.mode != None and are covered in oidc_test.yaml.
+    release:
+      name: test-k8s
+      namespace: tenant-test
+    set:
+      controlPlane.apiServer.extraArgs:
+        - "--authentication-config=/etc/kubernetes/authentication/config.yaml"
+        - "--requestheader-uid-headers=X-Remote-Uid"
+    asserts:
+      - equal:
+          path: spec.apiServer.extraArgs[0]
+          value: "--authentication-config=/etc/kubernetes/authentication/config.yaml"
+        documentIndex: 1
+      - contains:
+          path: spec.apiServer.extraArgs
+          content: "--requestheader-uid-headers=X-Remote-Uid"
+        documentIndex: 1
+
+  ###############################################
+  # extraVolumes + extraVolumeMounts passthrough #
+  ###############################################
+
+  - it: appends apiServer extraVolumes after the talos control-plane volumes
+    release:
+      name: test-k8s
+      namespace: tenant-test
+    set:
+      controlPlane.apiServer.extraVolumes:
+        - name: tenant-byo-mount
+          configMap:
+            name: tenant-authentication-config
+    asserts:
+      - lengthEqual:
+          path: spec.deployment.extraVolumes
+          count: 3
+        documentIndex: 1
+      # talos volumes are preserved at the head of the list
+      - equal:
+          path: spec.deployment.extraVolumes[0].name
+          value: talos-ca
+        documentIndex: 1
+      - equal:
+          path: spec.deployment.extraVolumes[1].name
+          value: talos-tls-cert
+        documentIndex: 1
+      # user-supplied volume is appended
+      - equal:
+          path: spec.deployment.extraVolumes[2].name
+          value: tenant-byo-mount
+        documentIndex: 1
+      - equal:
+          path: spec.deployment.extraVolumes[2].configMap.name
+          value: tenant-authentication-config
+        documentIndex: 1
+
+  - it: passes a mount that references a declared extraVolume
+    release:
+      name: test-k8s
+      namespace: tenant-test
+    set:
+      controlPlane.apiServer.extraVolumes:
+        - name: tenant-byo-mount
+          secret:
+            secretName: tenant-authentication-config
+      controlPlane.apiServer.extraVolumeMounts:
+        - name: tenant-byo-mount
+          mountPath: /etc/kubernetes/authentication
+          readOnly: true
+    asserts:
+      - equal:
+          path: spec.apiServer.extraVolumeMounts[0].name
+          value: tenant-byo-mount
+        documentIndex: 1
+      - equal:
+          path: spec.apiServer.extraVolumeMounts[0].mountPath
+          value: /etc/kubernetes/authentication
+        documentIndex: 1
+      - equal:
+          path: spec.apiServer.extraVolumeMounts[0].readOnly
+          value: true
+        documentIndex: 1
+      - equal:
+          path: spec.deployment.extraVolumes[2].secret.secretName
+          value: tenant-authentication-config
+        documentIndex: 1
+
+  ###############################################
+  # volume name guards                          #
+  ###############################################
+
+  - it: fails when an extraVolume reuses the reserved talos-ca name
+    release:
+      name: test-k8s
+      namespace: tenant-test
+    set:
+      controlPlane.apiServer.extraVolumes:
+        - name: talos-ca
+          configMap:
+            name: oops
+    asserts:
+      - failedTemplate:
+          errorMessage: 'controlPlane.apiServer.extraVolumes: volume name "talos-ca" is reserved by the chart for the talos control-plane secrets — rename your volume to avoid a duplicate volume name in the control-plane Deployment'
+
+  - it: fails when an extraVolume reuses the reserved talos-tls-cert name
+    release:
+      name: test-k8s
+      namespace: tenant-test
+    set:
+      controlPlane.apiServer.extraVolumes:
+        - name: talos-tls-cert
+          secret:
+            secretName: oops
+    asserts:
+      - failedTemplate:
+          errorMessage: 'controlPlane.apiServer.extraVolumes: volume name "talos-tls-cert" is reserved by the chart for the talos control-plane secrets — rename your volume to avoid a duplicate volume name in the control-plane Deployment'
+
+  - it: fails when an extraVolume has no name
+    release:
+      name: test-k8s
+      namespace: tenant-test
+    set:
+      controlPlane.apiServer.extraVolumes:
+        - configMap:
+            name: tenant-authentication-config
+    asserts:
+      - failedTemplate:
+          errorMessage: 'controlPlane.apiServer.extraVolumes[0]: every volume must set a non-empty name'
+
+  - it: fails when two extraVolumes share a name
+    release:
+      name: test-k8s
+      namespace: tenant-test
+    set:
+      controlPlane.apiServer.extraVolumes:
+        - name: dup
+          configMap:
+            name: a
+        - name: dup
+          secret:
+            secretName: b
+    asserts:
+      - failedTemplate:
+          errorMessage: 'controlPlane.apiServer.extraVolumes: duplicate volume name "dup" — each extra volume must have a unique name'
+
+  ###############################################
+  # volume source allow-list (tenant isolation) #
+  ###############################################
+
+  - it: accepts a secret extraVolume source
+    release:
+      name: test-k8s
+      namespace: tenant-test
+    set:
+      controlPlane.apiServer.extraVolumes:
+        - name: tenant-byo-mount
+          secret:
+            secretName: tenant-authentication-config
+    asserts:
+      - equal:
+          path: spec.deployment.extraVolumes[2].name
+          value: tenant-byo-mount
+        documentIndex: 1
+      - equal:
+          path: spec.deployment.extraVolumes[2].secret.secretName
+          value: tenant-authentication-config
+        documentIndex: 1
+
+  - it: rejects a hostPath extraVolume source
+    release:
+      name: test-k8s
+      namespace: tenant-test
+    set:
+      controlPlane.apiServer.extraVolumes:
+        - name: host-escape
+          hostPath:
+            path: /etc/kubernetes
+    asserts:
+      - failedTemplate:
+          errorMessage: 'controlPlane.apiServer.extraVolumes: volume "host-escape" uses a "hostPath" source, which is not permitted on a management-cluster control-plane pod — only configMap and secret sources are allowed'
+
+  - it: rejects a csi extraVolume source
+    release:
+      name: test-k8s
+      namespace: tenant-test
+    set:
+      controlPlane.apiServer.extraVolumes:
+        - name: csi-vol
+          csi:
+            driver: some.csi.driver
+    asserts:
+      - failedTemplate:
+          errorMessage: 'controlPlane.apiServer.extraVolumes: volume "csi-vol" uses a "csi" source, which is not permitted on a management-cluster control-plane pod — only configMap and secret sources are allowed'
+
+  - it: rejects an nfs extraVolume source
+    release:
+      name: test-k8s
+      namespace: tenant-test
+    set:
+      controlPlane.apiServer.extraVolumes:
+        - name: nfs-vol
+          nfs:
+            server: 192.0.2.1
+            path: /exports
+    asserts:
+      - failedTemplate:
+          errorMessage: 'controlPlane.apiServer.extraVolumes: volume "nfs-vol" uses a "nfs" source, which is not permitted on a management-cluster control-plane pod — only configMap and secret sources are allowed'
+
+  - it: rejects a persistentVolumeClaim extraVolume source
+    release:
+      name: test-k8s
+      namespace: tenant-test
+    set:
+      controlPlane.apiServer.extraVolumes:
+        - name: pvc-vol
+          persistentVolumeClaim:
+            claimName: some-claim
+    asserts:
+      - failedTemplate:
+          errorMessage: 'controlPlane.apiServer.extraVolumes: volume "pvc-vol" uses a "persistentVolumeClaim" source, which is not permitted on a management-cluster control-plane pod — only configMap and secret sources are allowed'
+
+  - it: rejects a projected extraVolume source (no token projection)
+    release:
+      name: test-k8s
+      namespace: tenant-test
+    set:
+      controlPlane.apiServer.extraVolumes:
+        - name: token-vol
+          projected:
+            sources: []
+    asserts:
+      - failedTemplate:
+          errorMessage: 'controlPlane.apiServer.extraVolumes: volume "token-vol" uses a "projected" source, which is not permitted on a management-cluster control-plane pod — only configMap and secret sources are allowed'
+
+  - it: rejects an emptyDir extraVolume source
+    release:
+      name: test-k8s
+      namespace: tenant-test
+    set:
+      controlPlane.apiServer.extraVolumes:
+        - name: scratch
+          emptyDir: {}
+    asserts:
+      - failedTemplate:
+          errorMessage: 'controlPlane.apiServer.extraVolumes: volume "scratch" uses a "emptyDir" source, which is not permitted on a management-cluster control-plane pod — only configMap and secret sources are allowed'
+
+  ###############################################
+  # exactly-one-source guard                    #
+  ###############################################
+
+  - it: rejects an extraVolume that declares no source
+    release:
+      name: test-k8s
+      namespace: tenant-test
+    set:
+      controlPlane.apiServer.extraVolumes:
+        - name: sourceless
+    asserts:
+      - failedTemplate:
+          errorMessage: 'controlPlane.apiServer.extraVolumes: volume "sourceless" must declare exactly one volume source, got 0 ([])'
+
+  - it: rejects an extraVolume that declares more than one source
+    release:
+      name: test-k8s
+      namespace: tenant-test
+    set:
+      controlPlane.apiServer.extraVolumes:
+        - name: two-sources
+          configMap:
+            name: a
+          secret:
+            secretName: b
+    asserts:
+      - failedTemplate:
+          errorMessage: 'controlPlane.apiServer.extraVolumes: volume "two-sources" must declare exactly one volume source, got 2 ([configMap secret])'
+
+  ###############################################
+  # extraVolumeMounts guards                     #
+  ###############################################
+
+  - it: rejects a mount that references no declared volume
+    release:
+      name: test-k8s
+      namespace: tenant-test
+    set:
+      controlPlane.apiServer.extraVolumeMounts:
+        - name: orphan
+          mountPath: /etc/kubernetes/authentication
+    asserts:
+      - failedTemplate:
+          errorMessage: 'controlPlane.apiServer.extraVolumeMounts: mount "orphan" references no volume declared in controlPlane.apiServer.extraVolumes — the chart-managed talos volumes cannot be mounted'
+
+  - it: rejects a mount that targets the reserved talos-ca volume
+    release:
+      name: test-k8s
+      namespace: tenant-test
+    set:
+      controlPlane.apiServer.extraVolumeMounts:
+        - name: talos-ca
+          mountPath: /exfil
+    asserts:
+      - failedTemplate:
+          errorMessage: 'controlPlane.apiServer.extraVolumeMounts: mount "talos-ca" references no volume declared in controlPlane.apiServer.extraVolumes — the chart-managed talos volumes cannot be mounted'
+
+  - it: fails when a mount has no name
+    release:
+      name: test-k8s
+      namespace: tenant-test
+    set:
+      controlPlane.apiServer.extraVolumeMounts:
+        - mountPath: /etc/kubernetes/authentication
+    asserts:
+      - failedTemplate:
+          errorMessage: 'controlPlane.apiServer.extraVolumeMounts[0]: every mount must set a non-empty name'
diff --git a/packages/apps/kubernetes/tests/cilium_gateway_alpn_test.yaml b/packages/apps/kubernetes/tests/cilium_gateway_alpn_test.yaml
new file mode 100644
index 0000000000..09570bf464
--- /dev/null
+++ b/packages/apps/kubernetes/tests/cilium_gateway_alpn_test.yaml
@@ -0,0 +1,54 @@
+suite: Cilium Gateway API ALPN tests
+templates:
+  - templates/helmreleases/cilium.yaml
+values:
+  - values-ci.yaml
+tests:
+  - it: renders no gatewayAPI block when the gatewayAPI addon is disabled
+    documentSelector:
+      path: kind
+      value: HelmRelease
+    set:
+      addons:
+        gatewayAPI:
+          enabled: false
+        cilium:
+          valuesOverride: {}
+    asserts:
+      - notExists:
+          path: spec.values.cilium.gatewayAPI
+
+  # Browsers negotiate HTTP/2 only through TLS ALPN "h2"; without enableAlpn
+  # every client of a tenant-cluster Gateway silently downgrades to HTTP/1.1.
+  - it: advertises ALPN h2 on Gateway listeners when the gatewayAPI addon is enabled
+    set:
+      addons:
+        gatewayAPI:
+          enabled: true
+        cilium:
+          valuesOverride: {}
+    asserts:
+      - equal:
+          path: spec.values.cilium.gatewayAPI.enabled
+          value: true
+      - equal:
+          path: spec.values.cilium.gatewayAPI.enableAlpn
+          value: true
+
+  - it: lets addons.cilium.valuesOverride opt a cluster out of ALPN
+    set:
+      addons:
+        gatewayAPI:
+          enabled: true
+        cilium:
+          valuesOverride:
+            cilium:
+              gatewayAPI:
+                enableAlpn: false
+    asserts:
+      - equal:
+          path: spec.values.cilium.gatewayAPI.enabled
+          value: true
+      - equal:
+          path: spec.values.cilium.gatewayAPI.enableAlpn
+          value: false
diff --git a/packages/apps/kubernetes/tests/cilium_install_retry_test.yaml b/packages/apps/kubernetes/tests/cilium_install_retry_test.yaml
new file mode 100644
index 0000000000..d90cca2b2a
--- /dev/null
+++ b/packages/apps/kubernetes/tests/cilium_install_retry_test.yaml
@@ -0,0 +1,42 @@
+suite: Cilium install retry strategy tests
+templates:
+  - templates/helmreleases/cilium.yaml
+values:
+  - values-ci.yaml
+tests:
+  # Flux's default strategy remediates a failed install by uninstalling the
+  # release, so a missed install budget on the tenant CNI takes the cluster's
+  # only CNI away for the window until the next install applies the manifests
+  # again, once per cycle for as long as retries allows. RetryOnFailure drops
+  # the teardown and retries as an upgrade instead.
+  - it: retries a failed install instead of uninstalling the CNI
+    asserts:
+      - equal:
+          path: spec.install.strategy.name
+          value: RetryOnFailure
+      - equal:
+          path: spec.install.strategy.retryInterval
+          value: 30s
+
+  # The retry of a failed install runs as an upgrade, so without a strategy on
+  # the upgrade action the second attempt falls back to upgrade remediation.
+  - it: keeps retrying on the upgrade action the install retry runs as
+    asserts:
+      - equal:
+          path: spec.upgrade.strategy.name
+          value: RetryOnFailure
+      - equal:
+          path: spec.upgrade.strategy.retryInterval
+          value: 30s
+
+  # The strategy governs a failed release. Two other branches consult the retry
+  # count instead and refuse to act once it is exhausted: an absent release,
+  # which reads the install block, and an out-of-sync one, which reads upgrade.
+  - it: keeps unlimited retries for the branches no strategy reaches
+    asserts:
+      - equal:
+          path: spec.install.remediation.retries
+          value: -1
+      - equal:
+          path: spec.upgrade.remediation.retries
+          value: -1
diff --git a/packages/apps/kubernetes/tests/cilium_kube_proxy_replacement_test.yaml b/packages/apps/kubernetes/tests/cilium_kube_proxy_replacement_test.yaml
new file mode 100644
index 0000000000..839977a253
--- /dev/null
+++ b/packages/apps/kubernetes/tests/cilium_kube_proxy_replacement_test.yaml
@@ -0,0 +1,84 @@
+suite: tenant cilium kube-proxy-replacement override beacon
+# addons.cilium.valuesOverride is x-kubernetes-preserve-unknown-fields, so a
+# tenant can set cilium.kubeProxyReplacement: false for its own cluster. That is
+# the one path by which the unsupported value reaches a live cluster without a
+# cozystack commit. It can break ClusterIP routing and removes the ingress-nginx
+# policy's source-side pre-DNAT match, but the target-side ingressDeny remains;
+# the override does not imply that the webhook becomes reachable.
+#
+# The override is assembled on the MANAGEMENT cluster, in this chart, which is
+# why the mismatch is detectable here at all. Same beacon mechanism as the
+# -awaiting-etcd ConfigMap in templates/cluster.yaml: something an operator and
+# an alert can both see. It diagnoses an unsupported override rather than
+# defining an alternative compatibility mode.
+templates:
+  - templates/helmreleases/cilium.yaml
+values:
+  - values-ci.yaml
+tests:
+  - it: emits no beacon when the tenant does not touch the value
+    asserts:
+      - hasDocuments:
+          count: 1
+      - isKind:
+          of: HelmRelease
+
+  - it: emits no beacon when the tenant sets it to true explicitly
+    set:
+      addons:
+        cilium:
+          valuesOverride:
+            cilium:
+              kubeProxyReplacement: true
+    asserts:
+      - hasDocuments:
+          count: 1
+      - isKind:
+          of: HelmRelease
+
+  - it: emits a beacon naming the cluster when the tenant turns it off
+    set:
+      addons:
+        cilium:
+          valuesOverride:
+            cilium:
+              kubeProxyReplacement: false
+    asserts:
+      - hasDocuments:
+          count: 2
+      - equal:
+          path: data.status
+          value: kube-proxy-replacement-off
+        documentSelector:
+          path: kind
+          value: ConfigMap
+      - equal:
+          path: data.kubeProxyReplacement
+          value: "false"
+        documentSelector:
+          path: kind
+          value: ConfigMap
+      - matchRegex:
+          path: data.message
+          pattern: "supports guest cluster networking only when"
+        documentSelector:
+          path: kind
+          value: ConfigMap
+
+  # The override survives the merge: cozystack.defaultCiliumValues is
+  # mergeOverwrite'd on top of it and does not set this key, so a tenant value
+  # is what reaches the HelmRelease.
+  - it: passes the tenant override through to the HelmRelease values
+    set:
+      addons:
+        cilium:
+          valuesOverride:
+            cilium:
+              kubeProxyReplacement: false
+    asserts:
+      - equal:
+          path: spec.values.cilium.kubeProxyReplacement
+          value: false
+        documentSelector:
+          path: kind
+          value: HelmRelease
diff --git a/packages/apps/kubernetes/tests/cluster_autoscaler_args_test.yaml b/packages/apps/kubernetes/tests/cluster_autoscaler_args_test.yaml
new file mode 100644
index 0000000000..44c8ff80ff
--- /dev/null
+++ b/packages/apps/kubernetes/tests/cluster_autoscaler_args_test.yaml
@@ -0,0 +1,38 @@
+suite: cluster-autoscaler arguments
+
+# `--force-delete-unregistered-nodes` reads as a safety override that lets the
+# autoscaler remove a long-unregistered machine below the group's min size. On
+# the clusterapi provider it grants nothing of the sort: the provider does not
+# implement force deletion, the call falls back to the ordinary delete path,
+# and that path refuses to take a group below its min size. What the flag does
+# do is skip the step that trims the delete batch down to the group's headroom,
+# so a batch larger than the headroom is refused whole instead of trimmed and
+# partly executed. The flag is therefore absent by intent rather than by
+# oversight, which is what this asserts.
+#
+# The positive assertion is not decoration: an absence assertion against a path
+# that does not resolve passes for the wrong reason, so the args list is proven
+# live first.
+
+templates:
+  - templates/cluster-autoscaler/deployment.yaml
+
+values:
+  - values/common.yaml
+
+release:
+  name: test-k8s
+  namespace: tenant-test
+
+tests:
+  - it: runs against the clusterapi provider without the force-delete override
+    documentSelector:
+      path: kind
+      value: Deployment
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: --cloud-provider=clusterapi
+      - notContains:
+          path: spec.template.spec.containers[0].args
+          content: --force-delete-unregistered-nodes=true
diff --git a/packages/apps/kubernetes/tests/cluster_test.yaml b/packages/apps/kubernetes/tests/cluster_test.yaml
deleted file mode 100644
index ecf44c649d..0000000000
--- a/packages/apps/kubernetes/tests/cluster_test.yaml
+++ /dev/null
@@ -1,460 +0,0 @@
-suite: cluster.yaml template tests
-
-templates:
-  - templates/cluster.yaml
-
-values:
-  - values/common.yaml
-
-# The KubevirtMachineTemplate is document index 5 when rendering with one
-# nodeGroup (md0).  Documents before it: Cluster(0), KamajiControlPlane(1),
-# WorkloadMonitor-cp(2), KubevirtCluster(3), KubeadmConfigTemplate-md0(4).
-# The named template "kubevirtmachinetemplate" is inlined inside document 5
-# under spec.template.spec.
-#
-# Note: instanceType must be set to "" to bypass the lookup() call that
-# validates VirtualMachineClusterInstancetype existence against a live cluster.
-
-tests:
-  ###############################################
-  # dataVolumeTemplates — default disk size     #
-  ###############################################
-
-  - it: falls back to 20Gi when diskSize is not set
-    release:
-      name: test-k8s
-      namespace: tenant-test
-    asserts:
-      - isKind:
-          of: KubevirtMachineTemplate
-        documentIndex: 5
-      - equal:
-          path: spec.template.spec.virtualMachineTemplate.spec.dataVolumeTemplates[0].spec.storage.resources.requests.storage
-          value: "20Gi"
-        documentIndex: 5
-
-  - it: renders dataVolumeTemplate with default 20Gi storage
-    release:
-      name: test-k8s
-      namespace: tenant-test
-    set:
-      nodeGroups.md0.diskSize: 20Gi
-    asserts:
-      - isKind:
-          of: KubevirtMachineTemplate
-        documentIndex: 5
-      - equal:
-          path: spec.template.spec.virtualMachineTemplate.spec.dataVolumeTemplates[0].metadata.name
-          value: disk-kubelet
-        documentIndex: 5
-      - equal:
-          path: spec.template.spec.virtualMachineTemplate.spec.dataVolumeTemplates[0].spec.source.blank
-          value: {}
-        documentIndex: 5
-      - equal:
-          path: spec.template.spec.virtualMachineTemplate.spec.dataVolumeTemplates[0].spec.storage.resources.requests.storage
-          value: 20Gi
-        documentIndex: 5
-
-  ###############################################
-  # dataVolumeTemplates — custom disk size      #
-  ###############################################
-
-  - it: renders dataVolumeTemplate with custom 50Gi storage
-    release:
-      name: test-k8s
-      namespace: tenant-test
-    set:
-      nodeGroups.md0.diskSize: 50Gi
-    asserts:
-      - equal:
-          path: spec.template.spec.virtualMachineTemplate.spec.dataVolumeTemplates[0].spec.storage.resources.requests.storage
-          value: 50Gi
-        documentIndex: 5
-
-  ###############################################
-  # storageClassName omitted when empty         #
-  ###############################################
-
-  - it: omits storageClassName when storageClass is empty
-    release:
-      name: test-k8s
-      namespace: tenant-test
-    set:
-      nodeGroups.md0.storageClass: ""
-    asserts:
-      - notExists:
-          path: spec.template.spec.virtualMachineTemplate.spec.dataVolumeTemplates[0].spec.storage.storageClassName
-        documentIndex: 5
-
-  ###############################################
-  # storageClassName present when set           #
-  ###############################################
-
-  - it: sets storageClassName when storageClass is provided
-    release:
-      name: test-k8s
-      namespace: tenant-test
-    set:
-      nodeGroups.md0.storageClass: "my-storage"
-    asserts:
-      - equal:
-          path: spec.template.spec.virtualMachineTemplate.spec.dataVolumeTemplates[0].spec.storage.storageClassName
-          value: my-storage
-        documentIndex: 5
-
-  ###############################################
-  # ephemeral-storage is always 2Gi             #
-  ###############################################
-
-  - it: hardcodes ephemeral-storage to 2Gi with default diskSize
-    release:
-      name: test-k8s
-      namespace: tenant-test
-    set:
-      nodeGroups.md0.diskSize: 20Gi
-    asserts:
-      - equal:
-          path: spec.template.spec.virtualMachineTemplate.spec.template.spec.domain.resources.limits.ephemeral-storage
-          value: 2Gi
-        documentIndex: 5
-
-  - it: hardcodes ephemeral-storage to 2Gi even with large diskSize
-    release:
-      name: test-k8s
-      namespace: tenant-test
-    set:
-      nodeGroups.md0.diskSize: 100Gi
-    asserts:
-      - equal:
-          path: spec.template.spec.virtualMachineTemplate.spec.template.spec.domain.resources.limits.ephemeral-storage
-          value: 2Gi
-        documentIndex: 5
-
-  ###############################################
-  # disk-kubelet name consistency               #
-  ###############################################
-
-  - it: uses disk-kubelet name consistently across dataVolumeTemplates, volumes, and disks
-    release:
-      name: test-k8s
-      namespace: tenant-test
-    asserts:
-      # dataVolumeTemplates name
-      - equal:
-          path: spec.template.spec.virtualMachineTemplate.spec.dataVolumeTemplates[0].metadata.name
-          value: disk-kubelet
-        documentIndex: 5
-      # disks name
-      - equal:
-          path: spec.template.spec.virtualMachineTemplate.spec.template.spec.domain.devices.disks[1].name
-          value: disk-kubelet
-        documentIndex: 5
-      # volumes name
-      - equal:
-          path: spec.template.spec.virtualMachineTemplate.spec.template.spec.volumes[1].name
-          value: disk-kubelet
-        documentIndex: 5
-      # volumes dataVolume reference
-      - equal:
-          path: spec.template.spec.virtualMachineTemplate.spec.template.spec.volumes[1].dataVolume.name
-          value: disk-kubelet
-        documentIndex: 5
-
-  ###############################################
-  # CDI populator annotation                    #
-  ###############################################
-
-  - it: includes CDI populator annotation on dataVolumeTemplate
-    release:
-      name: test-k8s
-      namespace: tenant-test
-    asserts:
-      - equal:
-          path: spec.template.spec.virtualMachineTemplate.spec.dataVolumeTemplates[0].metadata.annotations["cdi.kubevirt.io/storage.usePopulator"]
-          value: "false"
-        documentIndex: 5
-
-  ###############################################
-  # multiple node groups — independent storage  #
-  ###############################################
-
-  # With two nodeGroups (md0, md1) the range loop emits per-group documents
-  # alphabetically.  Documents before the loop: Cluster(0),
-  # KamajiControlPlane(1), WorkloadMonitor-cp(2), KubevirtCluster(3).
-  # Each group adds: KubeadmConfigTemplate, KubevirtMachineTemplate,
-  # MachineDeployment, MachineHealthCheck, WorkloadMonitor.
-  # md0 KubevirtMachineTemplate → index 5, md1 → index 10.
-
-  - it: renders independent dataVolumeTemplates per node group
-    release:
-      name: test-k8s
-      namespace: tenant-test
-    set:
-      nodeGroups.md0.minReplicas: 0
-      nodeGroups.md0.maxReplicas: 10
-      nodeGroups.md0.instanceType: ""
-      nodeGroups.md0.roles[0]: worker
-      nodeGroups.md0.resources.cpu: 2
-      nodeGroups.md0.resources.memory: 4Gi
-      nodeGroups.md0.diskSize: 20Gi
-      nodeGroups.md1.minReplicas: 0
-      nodeGroups.md1.maxReplicas: 5
-      nodeGroups.md1.instanceType: ""
-      nodeGroups.md1.roles[0]: worker
-      nodeGroups.md1.resources.cpu: 4
-      nodeGroups.md1.resources.memory: 8Gi
-      nodeGroups.md1.diskSize: 50Gi
-      nodeGroups.md1.storageClass: my-storage-class
-    asserts:
-      # --- md0: KubevirtMachineTemplate at document index 5 ---
-      - isKind:
-          of: KubevirtMachineTemplate
-        documentIndex: 5
-      - equal:
-          path: spec.template.spec.virtualMachineTemplate.spec.dataVolumeTemplates[0].spec.storage.resources.requests.storage
-          value: 20Gi
-        documentIndex: 5
-      - notExists:
-          path: spec.template.spec.virtualMachineTemplate.spec.dataVolumeTemplates[0].spec.storage.storageClassName
-        documentIndex: 5
-      # --- md1: KubevirtMachineTemplate at document index 10 ---
-      - isKind:
-          of: KubevirtMachineTemplate
-        documentIndex: 10
-      - equal:
-          path: spec.template.spec.virtualMachineTemplate.spec.dataVolumeTemplates[0].spec.storage.resources.requests.storage
-          value: 50Gi
-        documentIndex: 10
-      - equal:
-          path: spec.template.spec.virtualMachineTemplate.spec.dataVolumeTemplates[0].spec.storage.storageClassName
-          value: my-storage-class
-        documentIndex: 10
-
-  ###############################################
-  # KubeadmConfigTemplate — persistent storage  #
-  ###############################################
-
-  # KubeadmConfigTemplate is document index 4 when rendering with one
-  # nodeGroup (md0).
-
-  - it: configures persistent filesystem as xfs with label persistent
-    release:
-      name: test-k8s
-      namespace: tenant-test
-    asserts:
-      - isKind:
-          of: KubeadmConfigTemplate
-        documentIndex: 4
-      - equal:
-          path: spec.template.spec.diskSetup.filesystems[0].label
-          value: persistent
-        documentIndex: 4
-      - equal:
-          path: spec.template.spec.diskSetup.filesystems[0].overwrite
-          value: false
-        documentIndex: 4
-      - equal:
-          path: spec.template.spec.diskSetup.filesystems[0].filesystem
-          value: xfs
-        documentIndex: 4
-
-  - it: configures persistent filesystem device and partition
-    release:
-      name: test-k8s
-      namespace: tenant-test
-    asserts:
-      - equal:
-          path: spec.template.spec.diskSetup.filesystems[0].device
-          value: /dev/vdb
-        documentIndex: 4
-      - equal:
-          path: spec.template.spec.diskSetup.filesystems[0].partition
-          value: "none"
-        documentIndex: 4
-
-  - it: mounts persistent volume and bind-mounts kubelet and containerd
-    release:
-      name: test-k8s
-      namespace: tenant-test
-    asserts:
-      - equal:
-          path: spec.template.spec.mounts[0]
-          value:
-            - LABEL=persistent
-            - /persistent
-        documentIndex: 4
-      - equal:
-          path: spec.template.spec.mounts[1]
-          value:
-            - /persistent/kubelet
-            - /var/lib/kubelet
-            - none
-            - bind,nofail
-        documentIndex: 4
-      - equal:
-          path: spec.template.spec.mounts[2]
-          value:
-            - /persistent/containerd
-            - /var/lib/containerd
-            - none
-            - bind,nofail
-        documentIndex: 4
-
-  - it: includes mountpoint guards in preKubeadmCommands
-    release:
-      name: test-k8s
-      namespace: tenant-test
-    asserts:
-      - contains:
-          path: spec.template.spec.preKubeadmCommands
-          content: "mountpoint -q /var/lib/kubelet || mount -o bind /persistent/kubelet /var/lib/kubelet"
-        documentIndex: 4
-      - contains:
-          path: spec.template.spec.preKubeadmCommands
-          content: "mountpoint -q /var/lib/containerd || mount -o bind /persistent/containerd /var/lib/containerd"
-        documentIndex: 4
-
-  - it: creates persistent directories in preKubeadmCommands
-    release:
-      name: test-k8s
-      namespace: tenant-test
-    asserts:
-      - contains:
-          path: spec.template.spec.preKubeadmCommands
-          content: "mkdir -p /persistent/kubelet /persistent/containerd /var/lib/kubelet /var/lib/containerd"
-        documentIndex: 4
-
-  - it: patches containerd registry config_path for both 1.x and 2.x plugin schemas
-    release:
-      name: test-k8s
-      namespace: tenant-test
-    asserts:
-      - contains:
-          path: spec.template.spec.preKubeadmCommands
-          content: 'sed -i ''/\[plugins\.[^]]*grpc\.v1\.cri[^]]*registry\]/,/^\[/ s|^\(\s*config_path\s*=\s*\).*|\1"/etc/containerd/certs.d"|'' /etc/containerd/config.toml'
-        documentIndex: 4
-      - contains:
-          path: spec.template.spec.preKubeadmCommands
-          content: 'sed -i ''/\[plugins\.[^]]*io\.containerd\.cri\.v1\.images[^]]*registry\]/,/^\[/ s|^\(\s*config_path\s*=\s*\).*|\1"/etc/containerd/certs.d"|'' /etc/containerd/config.toml'
-        documentIndex: 4
-
-  ###############################################
-  # disk-kubelet matchVolume blockSize          #
-  ###############################################
-
-  - it: sets matchVolume blockSize on disk-kubelet
-    release:
-      name: test-k8s
-      namespace: tenant-test
-    asserts:
-      - equal:
-          path: spec.template.spec.virtualMachineTemplate.spec.template.spec.domain.devices.disks[1].blockSize.matchVolume.enabled
-          value: true
-        documentIndex: 5
-
-  ###############################################
-  # ephemeralStorage migration guard            #
-  ###############################################
-
-  - it: fails when ephemeralStorage is set instead of diskSize
-    release:
-      name: test-k8s
-      namespace: tenant-test
-    set:
-      nodeGroups.md0.ephemeralStorage: 50Gi
-    asserts:
-      - failedTemplate:
-          errorMessage: 'nodeGroup "md0": ephemeralStorage is no longer supported and should have been automatically migrated to diskSize by platform migration 41. If you see this error after upgrading, the migration did not run — check the cozystack-migration-hook Job logs in cozy-system.'
-
-  - it: fails when ephemeralStorage is set to empty string
-    release:
-      name: test-k8s
-      namespace: tenant-test
-    set:
-      nodeGroups.md0.ephemeralStorage: ""
-    asserts:
-      - failedTemplate:
-          errorMessage: 'nodeGroup "md0": ephemeralStorage is no longer supported and should have been automatically migrated to diskSize by platform migration 41. If you see this error after upgrading, the migration did not run — check the cozystack-migration-hook Job logs in cozy-system.'
-
-  - it: fails when both ephemeralStorage and diskSize are set
-    release:
-      name: test-k8s
-      namespace: tenant-test
-    set:
-      nodeGroups.md0.ephemeralStorage: 50Gi
-      nodeGroups.md0.diskSize: 50Gi
-    asserts:
-      - failedTemplate:
-          errorMessage: 'nodeGroup "md0": ephemeralStorage is no longer supported and should have been automatically migrated to diskSize by platform migration 41. If you see this error after upgrading, the migration did not run — check the cozystack-migration-hook Job logs in cozy-system.'
-
-  ###############################################
-  # KubeadmConfigTemplate — files block         #
-  ###############################################
-
-  # When the containerd patch Secret does not exist (lookup returns nil),
-  # only the update-k8s.sh entry must appear in the files list.
-
-  - it: includes update-k8s.sh in KubeadmConfigTemplate files
-    release:
-      name: test-k8s
-      namespace: tenant-test
-    asserts:
-      - isKind:
-          of: KubeadmConfigTemplate
-        documentIndex: 4
-      - equal:
-          path: spec.template.spec.files[0].path
-          value: /usr/bin/update-k8s.sh
-        documentIndex: 4
-      - equal:
-          path: spec.template.spec.files[0].permissions
-          value: "0755"
-        documentIndex: 4
-      - matchRegex:
-          path: spec.template.spec.files[0].content
-          pattern: "KUBELET_VERSION"
-        documentIndex: 4
-      - matchRegex:
-          path: spec.template.spec.files[0].content
-          pattern: "curl -fsSL"
-        documentIndex: 4
-
-  - it: has exactly one file entry when no containerd patch Secret exists
-    release:
-      name: test-k8s
-      namespace: tenant-test
-    asserts:
-      - isKind:
-          of: KubeadmConfigTemplate
-        documentIndex: 4
-      - equal:
-          path: spec.template.spec.files
-          value:
-            - path: /usr/bin/update-k8s.sh
-              owner: root:root
-              permissions: "0755"
-              content: |
-                #!/usr/bin/env bash
-                set -euo pipefail
-
-                # Expected to be passed in via preKubeadmCommands
-                : "${KUBELET_VERSION:?KUBELET_VERSION must be set, e.g. v1.31.0}"
-
-                ARCH="$(uname -m)"
-                case "${ARCH}" in
-                  x86_64) ARCH=amd64 ;;
-                  aarch64) ARCH=arm64 ;;
-                esac
-
-                # Use your internal mirror here for real-world use.
-                BASE_URL="https://dl.k8s.io/release/${KUBELET_VERSION}/bin/linux/${ARCH}"
-
-                echo "Installing kubelet and kubeadm  ${KUBELET_VERSION} for ${ARCH}..."
-                curl -fsSL "${BASE_URL}/kubelet" -o /root/kubelet
-                curl -fsSL "${BASE_URL}/kubeadm" -o /root/kubeadm
-                chmod 0755 /root/kubelet
-                chmod 0755 /root/kubeadm
-                if /root/kubelet --version ; then mv /root/kubelet /usr/bin/kubelet ; fi
-                if /root/kubeadm version ; then mv /root/kubeadm /usr/bin/kubeadm ; fi
-        documentIndex: 4
diff --git a/packages/apps/kubernetes/tests/containerd-config-path-test.sh b/packages/apps/kubernetes/tests/containerd-config-path-test.sh
deleted file mode 100755
index 4ac0340f5f..0000000000
--- a/packages/apps/kubernetes/tests/containerd-config-path-test.sh
+++ /dev/null
@@ -1,72 +0,0 @@
-#!/usr/bin/env bash
-#
-# Regression test for the containerd registry config_path sed lines in
-# templates/cluster.yaml preKubeadmCommands.
-#
-# Prevents two failure modes:
-#   1. The sed lines in this script drift from the ones in cluster.yaml
-#      (drift detection via grep -F against the template).
-#   2. A future containerd release renames the registry plugin section or
-#      changes its default quoting, so the sed silently stops matching
-#      and per-registry mirroring under /etc/containerd/certs.d breaks
-#      (functional check via running the seds against minimal fixtures
-#      of the containerd 1.x and 2.x default configs).
-
-set -euo pipefail
-
-script_dir=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
-template="$script_dir/../templates/cluster.yaml"
-fixtures_dir="$script_dir/fixtures"
-
-# Pick a GNU-compatible sed; the cluster.yaml sed uses \s and \( ... \)
-# which behave differently on BSD sed (macOS default).
-if sed --version >/dev/null 2>&1; then
-  SED=sed
-elif command -v gsed >/dev/null 2>&1; then
-  SED=gsed
-elif [[ "${CI:-}" == "true" ]]; then
-  echo "FAIL: CI must have GNU sed; refusing to skip the regression test"
-  exit 1
-else
-  echo "SKIP: GNU sed not found (install via 'brew install gnu-sed' on macOS)"
-  exit 0
-fi
-
-sed_legacy='sed -i '\''/\[plugins\.[^]]*grpc\.v1\.cri[^]]*registry\]/,/^\[/ s|^\(\s*config_path\s*=\s*\).*|\1"/etc/containerd/certs.d"|'\'' /etc/containerd/config.toml'
-sed_new='sed -i '\''/\[plugins\.[^]]*io\.containerd\.cri\.v1\.images[^]]*registry\]/,/^\[/ s|^\(\s*config_path\s*=\s*\).*|\1"/etc/containerd/certs.d"|'\'' /etc/containerd/config.toml'
-
-# Drift check: the strings above must appear verbatim in cluster.yaml.
-for line in "$sed_legacy" "$sed_new"; do
-  if ! grep -qF -- "$line" "$template"; then
-    echo "FAIL: sed line drifted from $template:"
-    echo "  expected: $line"
-    exit 1
-  fi
-done
-
-# Extract just the inline sed script (between the outer single quotes) for
-# applying via $SED -e.
-script_legacy=$(printf '%s' "$sed_legacy" | $SED -n "s/^sed -i '\\(.*\\)' \\/etc\\/containerd\\/config.toml$/\\1/p")
-script_new=$(printf '%s' "$sed_new" | $SED -n "s/^sed -i '\\(.*\\)' \\/etc\\/containerd\\/config.toml$/\\1/p")
-
-if [[ -z "$script_legacy" || -z "$script_new" ]]; then
-  echo "FAIL: could not parse sed scripts from the template lines"
-  exit 1
-fi
-
-# Functional check: run both seds against each fixture, assert the
-# config_path under the registry section was rewritten exactly once.
-for fixture in "$fixtures_dir"/containerd-1x.toml "$fixtures_dir"/containerd-2x.toml; do
-  name=$(basename "$fixture")
-  patched=$($SED -e "$script_legacy" -e "$script_new" "$fixture")
-
-  count=$(printf '%s\n' "$patched" | grep -cE '^[[:space:]]*config_path = "/etc/containerd/certs.d"$' || true)
-  if [[ "$count" -ne 1 ]]; then
-    echo "FAIL: $name: expected exactly 1 patched config_path line, got $count"
-    echo "--- patched output ---"
-    printf '%s\n' "$patched"
-    exit 1
-  fi
-done
-
-echo "OK: containerd config_path sed lines patch both 1.x and 2.x configs"
diff --git a/packages/apps/kubernetes/tests/control_plane_only_test.yaml b/packages/apps/kubernetes/tests/control_plane_only_test.yaml
new file mode 100644
index 0000000000..c72c333a48
--- /dev/null
+++ b/packages/apps/kubernetes/tests/control_plane_only_test.yaml
@@ -0,0 +1,68 @@
+suite: control-plane-only cluster.yaml render (worker pools moved to kubernetes-nodes)
+
+# Phase 2 moved the worker node pools (KubevirtMachineTemplate, MachineDeployment,
+# MachineHealthCheck, worker WorkloadMonitor) and the per-pool talos-reconcile Job
+# into the separate kubernetes-nodes chart. cluster.yaml now renders the control
+# plane only, in source order: Cluster (0), KamajiControlPlane (1), the
+# control-plane WorkloadMonitor (2), KubevirtCluster (3). This suite pins that
+# surface so a regression that re-introduces pool objects into the parent chart
+# (double-render / name collision) is caught.
+
+templates:
+  - templates/cluster.yaml
+
+values:
+  - values/common.yaml
+
+release:
+  name: test-k8s
+  namespace: tenant-test
+
+tests:
+  - it: renders exactly the four control-plane objects in order
+    asserts:
+      - hasDocuments:
+          count: 4
+      - isKind:
+          of: Cluster
+        documentIndex: 0
+      - equal:
+          path: metadata.name
+          value: test-k8s
+        documentIndex: 0
+      - isKind:
+          of: KamajiControlPlane
+        documentIndex: 1
+      - isKind:
+          of: WorkloadMonitor
+        documentIndex: 2
+      - equal:
+          path: spec.type
+          value: control-plane
+        documentIndex: 2
+      - isKind:
+          of: KubevirtCluster
+        documentIndex: 3
+
+  - it: emits no worker-pool objects
+    asserts:
+      - containsDocument:
+          apiVersion: cluster.x-k8s.io/v1beta1
+          kind: MachineDeployment
+          any: true
+        not: true
+      - containsDocument:
+          apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
+          kind: KubevirtMachineTemplate
+          any: true
+        not: true
+      - containsDocument:
+          apiVersion: cluster.x-k8s.io/v1beta1
+          kind: MachineHealthCheck
+          any: true
+        not: true
+      - containsDocument:
+          apiVersion: bootstrap.cluster.x-k8s.io/v1alpha3
+          kind: TalosConfigTemplate
+          any: true
+        not: true
diff --git a/packages/apps/kubernetes/tests/csi_install_retry_test.yaml b/packages/apps/kubernetes/tests/csi_install_retry_test.yaml
new file mode 100644
index 0000000000..a4bd3e0f2d
--- /dev/null
+++ b/packages/apps/kubernetes/tests/csi_install_retry_test.yaml
@@ -0,0 +1,54 @@
+suite: csi.yaml install retry strategy
+
+templates:
+  - templates/helmreleases/csi.yaml
+
+values:
+  - values/common.yaml
+
+tests:
+  # Install remediation is an uninstall in every case Flux offers, so under the
+  # default strategy an install that misses its budget takes the tenant's CSI
+  # node plugin and propagated StorageClasses away until a later attempt lands
+  # them again. RetryOnFailure keeps the manifests applied and retries instead.
+  - it: retries a failed install instead of uninstalling the tenant CSI
+    release:
+      name: kubernetes-test
+      namespace: tenant-test
+    asserts:
+      - equal:
+          path: spec.install.strategy.name
+          value: RetryOnFailure
+      - equal:
+          path: spec.install.strategy.retryInterval
+          value: 30s
+
+  # The controller performs the retry of a failed install as an upgrade, so
+  # without a strategy here that retry's own failure falls through to upgrade
+  # remediation instead of retrying again.
+  - it: carries the strategy on the upgrade action the retry runs as
+    release:
+      name: kubernetes-test
+      namespace: tenant-test
+    asserts:
+      - equal:
+          path: spec.upgrade.strategy.name
+          value: RetryOnFailure
+      - equal:
+          path: spec.upgrade.strategy.retryInterval
+          value: 30s
+
+  # The strategy governs a failed release. An absent release and an out-of-sync
+  # one take different branches, which consult the retry count instead and stop
+  # acting once it is exhausted.
+  - it: keeps unlimited retries for the branches the strategy does not reach
+    release:
+      name: kubernetes-test
+      namespace: tenant-test
+    asserts:
+      - equal:
+          path: spec.install.remediation.retries
+          value: -1
+      - equal:
+          path: spec.upgrade.remediation.retries
+          value: -1
diff --git a/packages/apps/kubernetes/tests/csi_rbac_test.yaml b/packages/apps/kubernetes/tests/csi_rbac_test.yaml
new file mode 100644
index 0000000000..f533ec4a84
--- /dev/null
+++ b/packages/apps/kubernetes/tests/csi_rbac_test.yaml
@@ -0,0 +1,24 @@
+suite: kubevirt-csi infra-cluster Role
+
+templates:
+  - templates/csi/infra-cluster-service-account.yaml
+
+values:
+  - values/common.yaml
+
+release:
+  name: kubernetes-test
+  namespace: tenant-test
+
+tests:
+  - it: grants only the VM hotplug subresources and VMI-level removevolume
+    documentSelector:
+      path: kind
+      value: Role
+    asserts:
+      - equal:
+          path: rules[?(@.apiGroups[0] == "subresources.kubevirt.io")]
+          value:
+            apiGroups: ["subresources.kubevirt.io"]
+            resources: ["virtualmachines/addvolume", "virtualmachines/removevolume", "virtualmachineinstances/removevolume"]
+            verbs: ["update"]
diff --git a/packages/apps/kubernetes/tests/csi_test.yaml b/packages/apps/kubernetes/tests/csi_test.yaml
new file mode 100644
index 0000000000..e63c9748da
--- /dev/null
+++ b/packages/apps/kubernetes/tests/csi_test.yaml
@@ -0,0 +1,60 @@
+suite: csi.yaml StorageClass propagation
+
+templates:
+  - templates/helmreleases/csi.yaml
+
+values:
+  - values/common.yaml
+
+# NOTE: helm unittest has no live cluster, so `lookup` returns empty and these
+# tests exercise the non-destructive fallback path of the storageClasses map.
+# The LINSTOR provisioner / allowRemoteVolumeAccess filtering is covered by e2e.
+
+tests:
+  - it: renders the -csi HelmRelease when the tenant has etcd
+    release:
+      name: kubernetes-test
+      namespace: tenant-test
+    asserts:
+      - hasDocuments:
+          count: 1
+      - isKind:
+          of: HelmRelease
+      - equal:
+          path: metadata.name
+          value: kubernetes-test-csi
+
+  - it: fallback yields replicated (default) and the kubevirt alias
+    release:
+      name: kubernetes-test
+      namespace: tenant-test
+    asserts:
+      - equal:
+          path: spec.values.storageClasses.replicated.infraStorageClass
+          value: replicated
+      - equal:
+          path: spec.values.storageClasses.replicated.default
+          value: true
+      - equal:
+          path: spec.values.storageClasses.kubevirt.infraStorageClass
+          value: replicated
+      - equal:
+          path: spec.values.storageClasses.kubevirt.default
+          value: false
+
+  - it: kubevirt alias tracks a custom storageClass selector, replicated stays default
+    release:
+      name: kubernetes-test
+      namespace: tenant-test
+    set:
+      storageClass: fast
+    asserts:
+      - equal:
+          path: spec.values.storageClasses.kubevirt.infraStorageClass
+          value: fast
+      - equal:
+          path: spec.values.storageClasses.replicated.default
+          value: true
+      - equal:
+          path: spec.values.storageClasses.kubevirt.default
+          value: false
diff --git a/packages/apps/kubernetes/tests/csi_vmi_hotplug_fallback_test.yaml b/packages/apps/kubernetes/tests/csi_vmi_hotplug_fallback_test.yaml
new file mode 100644
index 0000000000..9d996f736a
--- /dev/null
+++ b/packages/apps/kubernetes/tests/csi_vmi_hotplug_fallback_test.yaml
@@ -0,0 +1,30 @@
+suite: KubeVirt CSI controller VMI hotplug fallback
+
+templates:
+  - templates/csi/deploy.yaml
+
+values:
+  - values/common.yaml
+
+release:
+  name: test-k8s
+  namespace: tenant-test
+
+tests:
+  # Pinned while packages/system/kubevirt leaves HotplugVolumes out of the
+  # static featureGates, so virt-api rejects the VMI-level removevolume on a
+  # VM-owned VMI. This test does not read that CR; the two change together.
+  - it: turns the VMI hotplug fallback off while the KubeVirt CR leaves HotplugVolumes off
+    documentSelector:
+      path: kind
+      value: Deployment
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].name
+          value: csi-driver
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: "--enable-vmi-hotplug-fallback=false"
+      - notContains:
+          path: spec.template.spec.containers[0].args
+          content: "--enable-vmi-hotplug-fallback=true"
diff --git a/packages/apps/kubernetes/tests/dashboard_resourcemap_test.yaml b/packages/apps/kubernetes/tests/dashboard_resourcemap_test.yaml
new file mode 100644
index 0000000000..388fc3ca9f
--- /dev/null
+++ b/packages/apps/kubernetes/tests/dashboard_resourcemap_test.yaml
@@ -0,0 +1,44 @@
+suite: dashboard resource Role and the admin kubeconfig Secret
+
+values:
+  - values-ci.yaml
+
+templates:
+  - templates/dashboard-resourcemap.yaml
+
+tests:
+  - it: grants the tenant read on the admin kubeconfig of its own cluster
+    release:
+      name: kubernetes-foo
+      namespace: tenant-alice
+    documentSelector:
+      path: kind
+      value: Role
+    asserts:
+      - lengthEqual:
+          path: rules
+          count: 4
+      - equal:
+          path: rules[?(@.resources[0]=="secrets")].resourceNames
+          value:
+            - kubernetes-foo-admin-kubeconfig
+
+  - it: grants no read on the admin kubeconfig when the wrapper withholds it
+    release:
+      name: computeplane-cluster
+      namespace: tenant-alice
+    set:
+      withholdAdminKubeconfig: true
+    documentSelector:
+      path: kind
+      value: Role
+    asserts:
+      - lengthEqual:
+          path: rules
+          count: 3
+      - notExists:
+          path: rules[?(@.resources[0]=="secrets")]
+      - equal:
+          path: rules[?(@.resources[0]=="services")].resourceNames
+          value:
+            - computeplane-cluster
diff --git a/packages/apps/kubernetes/tests/delete_hook_test.yaml b/packages/apps/kubernetes/tests/delete_hook_test.yaml
new file mode 100644
index 0000000000..cc6ba341d3
--- /dev/null
+++ b/packages/apps/kubernetes/tests/delete_hook_test.yaml
@@ -0,0 +1,337 @@
+suite: pre-delete cleanup hook (issue #3062)
+
+# These tests pin the behaviour that prevents the Kamaji
+# <release>-datastore-config Secret from blocking namespace deletion:
+# the pre-delete Job must wait for the TenantControlPlane to be gone and
+# then strip the finalizer.kamaji.clastix.io/datastore-secret finalizer,
+# and the cleanup Role must be allowed to patch exactly that one Secret.
+
+templates:
+  - templates/delete.yaml
+
+release:
+  name: test-k8s
+  namespace: tenant-test
+
+values:
+  - values-ci.yaml
+
+tests:
+  - it: cleanup Role can get/patch only the datastore-config Secret
+    documentSelector:
+      path: kind
+      value: Role
+    asserts:
+      - contains:
+          path: rules
+          content:
+            apiGroups:
+              - ""
+            resources:
+              - secrets
+            resourceNames:
+              - test-k8s-datastore-config
+            verbs:
+              - get
+              - patch
+
+  - it: pre-delete Job waits for the TenantControlPlane before clearing the Secret
+    documentSelector:
+      path: kind
+      value: Job
+    asserts:
+      # TCP deletion must wait so Kamaji can clear the finalizer itself first.
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: 'delete tenantcontrolplanes\.kamaji\.clastix\.io test-k8s[\s\S]*--wait=true'
+
+  - it: pre-delete Job strips the leftover datastore-secret finalizer as a backstop
+    documentSelector:
+      path: kind
+      value: Job
+    asserts:
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: 'patch secret test-k8s-datastore-config'
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: '"finalizers":null'
+
+  - it: pre-delete Job clears the finalizer only after confirming the TenantControlPlane is gone
+    documentSelector:
+      path: kind
+      value: Job
+    asserts:
+      # The finalizer patch must be gated on the TCP being absent (#3078): if the
+      # Step 4 delete timed out with the TCP still alive, we must not strip the
+      # finalizer Kamaji still legitimately owns.
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: 'get tenantcontrolplanes\.kamaji\.clastix\.io test-k8s[\s\S]*still present[\s\S]*patch secret test-k8s-datastore-config'
+
+  # The remaining tests pin the wall-clock bounds on every delete in the hook.
+  # kubectl defaults --wait to true and reads --timeout=0 as a week, so a delete
+  # written with neither flag is one stuck finalizer away from parking this hook
+  # for 168 hours.
+
+  - it: every delete in the hook carries a wall-clock bound
+    documentSelector:
+      path: kind
+      value: Job
+    asserts:
+      # Each pattern walks only continuation lines — the ones ending in a
+      # backslash — so it stays inside the command it names. A cross-line
+      # wildcard reaches a flag belonging to the next command instead, and RE2,
+      # which helm-unittest matches with, has no lookahead to exclude the echo
+      # in between.
+      #
+      # None of the three waits, so none of them needs a guard to swallow an
+      # expired one — which matters, because a guard cannot tell a timeout from
+      # a rejected request and would report both as cleanup that happened.
+      #
+      # Step 3. What matters downstream is the TenantControlPlane, which Step 4
+      # deletes and waits for; waiting here only adds a second place for a CAPI
+      # finalizer to stall.
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: 'delete kamajicontrolplanes\.controlplane\.cluster\.x-k8s\.io test-k8s(?:[^\n]*\\\n)*[^\n]*--wait=false'
+      # Steps 5 and 6: nothing after them reads the result, and a DELETE that
+      # has been accepted is not made more complete by watching it. --wait=false
+      # and an expired --wait leave the same cluster state, one of them sooner.
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: 'delete datavolumes(?:[^\n]*\\\n)*[^\n]*--wait=false'
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: 'delete services(?:[^\n]*\\\n)*[^\n]*--wait=false'
+      # And the two that were already bounded stay bounded. --wait=false and
+      # --timeout bound the waiting, not the request: --request-timeout is still
+      # 0 on every call here, so an apiserver that stops answering hangs this
+      # hook the same as before. That is a different failure from the stuck
+      # finalizer these bounds are for, and it wants one answer across all the
+      # calls rather than a flag on the deletes.
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: 'delete helmreleases\.helm\.toolkit\.fluxcd\.io(?:[^\n]*\\\n)*[^\n]*--timeout=[1-9][0-9]*s'
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: 'delete tenantcontrolplanes\.kamaji\.clastix\.io test-k8s(?:[^\n]*\\\n)*[^\n]*--timeout=[1-9][0-9]*s'
+
+  - it: cleanup Role keeps watch on exactly the two resources whose deletes wait
+    documentSelector:
+      path: kind
+      value: Role
+    asserts:
+      # kubectl opens a watch only on the wait path, so watch is granted to the
+      # two resources Steps 2 and 4 wait on and to no others. Removing it from
+      # either of those does not error — the delete hangs instead, which is the
+      # failure mode that is hardest to read from the outside, so it is pinned
+      # rather than left to the reviewer of the next RBAC change.
+      #
+      # Whole-rule contains, not per-index verb assertions. notContains passes
+      # when its path does not resolve, so an index-addressed "and nowhere else"
+      # goes quiet the moment the rules list is reordered or shortened — the
+      # failure it is written to prevent would take the assertion with it.
+      # Matching the entire rule pins the verb set in both directions and names
+      # the resource when it fails; lengthEqual is what closes the remaining
+      # hole, a tenth rule appended past everything asserted here.
+      - lengthEqual:
+          path: rules
+          count: 9
+      - contains:
+          path: rules
+          content:
+            apiGroups: ["helm.toolkit.fluxcd.io"]
+            resources: ["helmreleases"]
+            verbs: ["get", "list", "watch", "patch", "delete"]
+      - contains:
+          path: rules
+          content:
+            apiGroups: ["kamaji.clastix.io"]
+            resources: ["tenantcontrolplanes"]
+            verbs: ["get", "list", "watch", "delete"]
+      - contains:
+          path: rules
+          content:
+            apiGroups: ["controlplane.cluster.x-k8s.io"]
+            resources: ["kamajicontrolplanes"]
+            verbs: ["get", "list", "delete"]
+      - contains:
+          path: rules
+          content:
+            apiGroups: ["cdi.kubevirt.io"]
+            resources: ["datavolumes"]
+            verbs: ["get", "list", "delete"]
+      - contains:
+          path: rules
+          content:
+            apiGroups: [""]
+            resources: ["services"]
+            verbs: ["get", "list", "delete"]
+
+  # Step 7 removes what outlives the release: the two Talos PKI Secrets, which
+  # cert-manager issues without an ownerReference to their Certificates, and the
+  # OIDC bootstrap Job, a hook whose only delete policy is before-hook-creation.
+  - it: deletes the Talos Certificates before their Secrets, so cert-manager cannot re-issue them
+    documentSelector:
+      path: kind
+      value: Job
+    asserts:
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: 'delete certificates\.cert-manager\.io \\\n\s+test-k8s-talos-ca test-k8s-talos-tls-cert(?:[^\n]*\\\n)*[^\n]*--wait=false'
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: 'delete secrets \\\n\s+test-k8s-talos-ca test-k8s-talos-tls-cert(?:[^\n]*\\\n)*[^\n]*--wait=false'
+      - notMatchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: 'delete secrets \\\n\s+test-k8s-talos-ca[\s\S]*delete certificates\.cert-manager\.io'
+
+  - it: deletes the orphaned OIDC bootstrap Job
+    documentSelector:
+      path: kind
+      value: Job
+    asserts:
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: 'delete jobs\.batch \\\n\s+test-k8s-oidc-bootstrap(?:[^\n]*\\\n)*[^\n]*--wait=false'
+
+  - it: cleanup Role can delete only the Step 7 objects, by name
+    documentSelector:
+      path: kind
+      value: Role
+    asserts:
+      - contains:
+          path: rules
+          content:
+            apiGroups: ["cert-manager.io"]
+            resources: ["certificates"]
+            resourceNames: ["test-k8s-talos-ca", "test-k8s-talos-tls-cert"]
+            verbs: ["get", "delete"]
+      - contains:
+          path: rules
+          content:
+            apiGroups: [""]
+            resources: ["secrets"]
+            resourceNames: ["test-k8s-talos-ca", "test-k8s-talos-tls-cert"]
+            verbs: ["get", "delete"]
+      - contains:
+          path: rules
+          content:
+            apiGroups: ["batch"]
+            resources: ["jobs"]
+            resourceNames: ["test-k8s-oidc-bootstrap"]
+            verbs: ["get", "delete"]
+
+  - it: pre-delete Job makes a single attempt
+    documentSelector:
+      path: kind
+      value: Job
+    asserts:
+      # restartPolicy is Never, so the default backoffLimit of 6 allows seven
+      # pods in series, each re-running every step from the top and each paying
+      # its own image pull. That outlives the uninstall budget, and helm gives
+      # up on its own timeout without reporting which step failed.
+      #
+      # Zero and not one: both remaining waits are guarded, so an attempt can
+      # spend its full 240s without failing, and a retry starts from Step 1 with
+      # the clock already there. On a nodeless tenant it also re-pays Step 4's
+      # 120s, because attempt 1 leaves the TenantControlPlane still terminating.
+      - equal:
+          path: spec.backoffLimit
+          value: 0
+      - equal:
+          path: spec.template.spec.restartPolicy
+          value: Never
+
+  # Step 1b exists only on the proxmox substrate: a PVC there is a disk on the
+  # hypervisor that only the CSI controller can free, and Step 2 removes that
+  # controller. The Role gains the tenant's admin kubeconfig for it, by name.
+  - it: releases Proxmox volumes before the driver goes, on proxmox only
+    set: &proxmox
+      substrate: proxmox
+      _namespace:
+        etcd: etcd-test
+      proxmox:
+        dnsServers: ["8.8.8.8"]
+        ipv4Config:
+          addresses: ["10.0.0.160-10.0.0.170"]
+          gateway: "10.0.0.1"
+          prefix: 24
+        ccm:
+          credentialsSecretName: proxmox-ccm-creds
+        csi:
+          enabled: true
+          credentialsSecretName: proxmox-csi-creds
+    documentSelector:
+      path: kind
+      value: Job
+    asserts:
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: 'Step 1b: Releasing Proxmox volumes while the CSI driver is still running'
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: 'get --raw /readyz'
+
+  - it: has no volume-release step on kubevirt, where the CSI controller stays until the cluster goes
+    documentSelector:
+      path: kind
+      value: Job
+    asserts:
+      - notMatchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: 'Step 1b'
+
+  - it: lets the cleanup Role read the tenant admin kubeconfig on proxmox, and nothing more
+    set: *proxmox
+    documentSelector:
+      path: kind
+      value: Role
+    asserts:
+      - contains:
+          path: rules
+          content:
+            apiGroups:
+              - ""
+            resources:
+              - secrets
+            resourceNames:
+              - test-k8s-datastore-config
+              - test-k8s-admin-kubeconfig
+            verbs:
+              - get
+              - patch
+
+  - it: deletes the claims before the Pods that hold them, so nothing can mount one again
+    set: *proxmox
+    documentSelector:
+      path: kind
+      value: Job
+    asserts:
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: 'delete pvc "\$pname"[\s\S]*delete pod "\$pod"'
+      - notMatchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: 'delete pod "\$pod"[\s\S]*delete pvc "\$pname"'
+
+  # A JSONPath filter on the claim name fails for the whole namespace as soon as
+  # one Pod mounts two claims, and the error is swallowed, so no Pod is deleted
+  # and the disks outlive the driver. The loop lists every Pod with its claims
+  # and matches in the shell; hack/proxmox-step1b-pod-match_test.bats runs it.
+  - it: finds the Pods that hold a claim without a JSONPath filter
+    set: *proxmox
+    documentSelector:
+      path: kind
+      value: Job
+    asserts:
+      - notMatchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: '\[\?\(@\.spec\.volumes'
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: 'range \.spec\.volumes\[\*\]\}\{" "\}\{\.persistentVolumeClaim\.claimName\}'
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: 'case " \$claims " in'
diff --git a/packages/apps/kubernetes/tests/fixtures/containerd-1x.toml b/packages/apps/kubernetes/tests/fixtures/containerd-1x.toml
deleted file mode 100644
index dc31b01922..0000000000
--- a/packages/apps/kubernetes/tests/fixtures/containerd-1x.toml
+++ /dev/null
@@ -1,14 +0,0 @@
-version = 2
-
-[plugins]
-  [plugins."io.containerd.grpc.v1.cri"]
-    sandbox_image = "registry.k8s.io/pause:3.8"
-    [plugins."io.containerd.grpc.v1.cri".containerd]
-      snapshotter = "overlayfs"
-      [plugins."io.containerd.grpc.v1.cri".containerd.default_runtime]
-    [plugins."io.containerd.grpc.v1.cri".registry]
-      config_path = ""
-      [plugins."io.containerd.grpc.v1.cri".registry.auths]
-      [plugins."io.containerd.grpc.v1.cri".registry.configs]
-      [plugins."io.containerd.grpc.v1.cri".registry.headers]
-      [plugins."io.containerd.grpc.v1.cri".registry.mirrors]
diff --git a/packages/apps/kubernetes/tests/fixtures/containerd-2x.toml b/packages/apps/kubernetes/tests/fixtures/containerd-2x.toml
deleted file mode 100644
index d79c1302b3..0000000000
--- a/packages/apps/kubernetes/tests/fixtures/containerd-2x.toml
+++ /dev/null
@@ -1,16 +0,0 @@
-version = 3
-
-[plugins]
-  [plugins.'io.containerd.cri.v1.images']
-    snapshotter = 'overlayfs'
-    [plugins.'io.containerd.cri.v1.images'.pinned_images]
-      sandbox = 'registry.k8s.io/pause:3.10'
-    [plugins.'io.containerd.cri.v1.images'.registry]
-      config_path = ''
-    [plugins.'io.containerd.cri.v1.images'.registry_credentials]
-
-  [plugins.'io.containerd.cri.v1.runtime']
-    enable_selinux = false
-    [plugins.'io.containerd.cri.v1.runtime'.containerd]
-      default_runtime_name = 'runc'
-      [plugins.'io.containerd.cri.v1.runtime'.containerd.runtimes]
diff --git a/packages/apps/kubernetes/tests/gpu_node_labels_test.yaml b/packages/apps/kubernetes/tests/gpu_node_labels_test.yaml
deleted file mode 100644
index 87625430a4..0000000000
--- a/packages/apps/kubernetes/tests/gpu_node_labels_test.yaml
+++ /dev/null
@@ -1,77 +0,0 @@
-suite: GPU node-group kubelet node-labels tests
-
-templates:
-  - templates/cluster.yaml
-
-# The KubeadmConfigTemplate for the first nodeGroup is rendered at
-# document index 4 within cluster.yaml. The kubelet args live at:
-# spec.template.spec.joinConfiguration.nodeRegistration.kubeletExtraArgs
-# GPU node-groups must register their nodes with gpu=on so HAMi's
-# hami-device-plugin DaemonSet (nodeSelector gpu=on) schedules.
-
-tests:
-  - it: labels GPU node-groups with gpu=on
-    release:
-      name: test-k8s
-      namespace: tenant-test
-    set:
-      _namespace:
-        etcd: etcd
-        ingress: nginx
-        host: example.com
-      _cluster:
-        cluster-domain: cozy.local
-      nodeGroups:
-        md0:
-          minReplicas: 0
-          maxReplicas: 10
-          instanceType: ""
-          diskSize: 20Gi
-          roles:
-            - worker
-          resources:
-            cpu: 8
-            memory: 16Gi
-          gpus:
-            - name: nvidia.com/GH200
-          kubelet: {}
-    asserts:
-      - isKind:
-          of: KubeadmConfigTemplate
-        documentIndex: 4
-      - equal:
-          path: spec.template.spec.joinConfiguration.nodeRegistration.kubeletExtraArgs.node-labels
-          value: "gpu=on"
-        documentIndex: 4
-
-  - it: does not label non-GPU node-groups with gpu=on
-    release:
-      name: test-k8s
-      namespace: tenant-test
-    set:
-      _namespace:
-        etcd: etcd
-        ingress: nginx
-        host: example.com
-      _cluster:
-        cluster-domain: cozy.local
-      nodeGroups:
-        md0:
-          minReplicas: 0
-          maxReplicas: 10
-          instanceType: ""
-          diskSize: 20Gi
-          roles:
-            - worker
-          resources:
-            cpu: 2
-            memory: 4Gi
-          gpus: []
-          kubelet: {}
-    asserts:
-      - isKind:
-          of: KubeadmConfigTemplate
-        documentIndex: 4
-      - notExists:
-          path: spec.template.spec.joinConfiguration.nodeRegistration.kubeletExtraArgs.node-labels
-        documentIndex: 4
diff --git a/packages/apps/kubernetes/tests/gpu_operator_hami_test.yaml b/packages/apps/kubernetes/tests/gpu_operator_hami_test.yaml
index af301c5da7..c5f91573d5 100644
--- a/packages/apps/kubernetes/tests/gpu_operator_hami_test.yaml
+++ b/packages/apps/kubernetes/tests/gpu_operator_hami_test.yaml
@@ -18,7 +18,10 @@ tests:
           path: spec.values.gpu-operator.devicePlugin.enabled
           value: false
 
-  - it: should default the NvLinkDisable kernel module config even when hami is disabled
+  # On Talos the driver comes from a system extension: the operator must not own
+  # the driver or containerd, the validator must look at the host root, and the
+  # device plugin must route CUDA libraries through CDI.
+  - it: configures the operator for a driver provided by the OS
     set:
       addons:
         gpuOperator:
@@ -29,34 +32,102 @@ tests:
           valuesOverride: {}
     asserts:
       - equal:
-          path: spec.values.kernelModuleConfig.create
-          value: true
+          path: spec.values.gpu-operator.driver.enabled
+          value: false
       - equal:
-          path: spec.values.gpu-operator.driver.kernelModuleConfig.name
-          value: nvidia-kernel-module-params
+          path: spec.values.gpu-operator.toolkit.enabled
+          value: false
+      # Without these the validator never writes its sentinel and the device
+      # plugin stays blocked behind toolkit-validation.
+      - contains:
+          path: spec.values.gpu-operator.validator.driver.env
+          content:
+            name: DRIVER_ROOT
+            value: "/"
+      - contains:
+          path: spec.values.gpu-operator.validator.driver.env
+          content:
+            name: DISABLE_DEV_CHAR_SYMLINK_CREATION
+            value: "true"
+      # Without the CDI settings the pod gets the device and no CUDA libraries.
+      - contains:
+          path: spec.values.gpu-operator.devicePlugin.env
+          content:
+            name: DEVICE_LIST_STRATEGY
+            value: cdi-annotations
+      - contains:
+          path: spec.values.gpu-operator.devicePlugin.env
+          content:
+            name: NVIDIA_CTK_PATH
+            value: /usr/local/bin/nvidia-ctk
+      # CDI device names key on the UUID strategy, the plugin resolves the driver
+      # from NVIDIA_DRIVER_ROOT, and the annotation prefix has to be the one
+      # containerd reads.
+      - contains:
+          path: spec.values.gpu-operator.devicePlugin.env
+          content:
+            name: DEVICE_ID_STRATEGY
+            value: uuid
+      - contains:
+          path: spec.values.gpu-operator.devicePlugin.env
+          content:
+            name: NVIDIA_DRIVER_ROOT
+            value: "/"
+      - contains:
+          path: spec.values.gpu-operator.devicePlugin.env
+          content:
+            name: CDI_ANNOTATION_PREFIX
+            value: cdi.k8s.io/
+      # The driver-validation init container reads NVIDIA_DRIVER_ROOT alongside
+      # DRIVER_ROOT.
+      - contains:
+          path: spec.values.gpu-operator.validator.driver.env
+          content:
+            name: NVIDIA_DRIVER_ROOT
+            value: "/"
+
+  # With the driver container off nothing mounts this ConfigMap. Module
+  # parameters belong to the worker pool's kernelModules in the KubernetesNodes
+  # app (packages/apps/kubernetes-nodes), and an inert second place to set them
+  # would only mislead.
+  - it: does not render the driver-container kernel module ConfigMap
+    set:
+      addons:
+        gpuOperator:
+          enabled: true
+          valuesOverride: {}
+        hami:
+          enabled: false
+          valuesOverride: {}
+    asserts:
+      - notExists:
+          path: spec.values.kernelModuleConfig
       - notExists:
-          path: spec.values.gpu-operator.devicePlugin
+          path: spec.values.gpu-operator.driver.kernelModuleConfig
 
-  - it: should let user override the kernel module config name
+  # mergeOverwrite replaces a list rather than merging it, so an override adding
+  # one variable to devicePlugin.env drops the CDI defaults with it and has to
+  # restate the full list.
+  - it: lets an operator replace the device plugin env wholesale
     set:
       addons:
         gpuOperator:
           enabled: true
           valuesOverride:
             gpu-operator:
-              driver:
-                kernelModuleConfig:
-                  name: my-custom-kmc
+              devicePlugin:
+                env:
+                  - name: DEVICE_LIST_STRATEGY
+                    value: envvar
         hami:
           enabled: false
           valuesOverride: {}
     asserts:
       - equal:
-          path: spec.values.gpu-operator.driver.kernelModuleConfig.name
-          value: my-custom-kmc
-      - equal:
-          path: spec.values.kernelModuleConfig.create
-          value: true
+          path: spec.values.gpu-operator.devicePlugin.env
+          value:
+            - name: DEVICE_LIST_STRATEGY
+              value: envvar
 
   - it: should apply hami defaults when valuesOverride key is omitted
     set:
diff --git a/packages/apps/kubernetes/tests/host_guard_test.yaml b/packages/apps/kubernetes/tests/host_guard_test.yaml
new file mode 100644
index 0000000000..49e83e83a4
--- /dev/null
+++ b/packages/apps/kubernetes/tests/host_guard_test.yaml
@@ -0,0 +1,41 @@
+suite: kubernetes apiserver endpoint guards an empty tenant apex only when it is emitted
+templates:
+  - templates/cluster.yaml
+
+release:
+  name: kubernetes
+  namespace: tenant-test
+
+# cluster.yaml advertises the apiserver endpoint as <release>.<_namespace.host>
+# only inside the KamajiControlPlane, which is emitted when the tenant has an
+# etcd DataStore. cozy-lib.ns-host-required guards that one hostname, so an empty
+# apex fails there. The no-etcd path emits only a ConfigMap beacon and never
+# composes the hostname, so it must keep rendering even with an empty apex (the
+# parent Tenant chart populates _namespace.etcd asynchronously).
+
+tests:
+  - it: fails when the tenant has etcd but the apex is empty and no host override
+    set:
+      _namespace:
+        etcd: tenant-test
+        host: ""
+      _cluster:
+        cluster-domain: cozy.local
+      version: "v1.35"
+    asserts:
+      - failedTemplate:
+          errorMessage: "the tenant apex (_namespace.host) is empty and this app sets no host override, so its ingress hostname would be malformed. Set tenant.spec.host on this tenant, inherit it from a parent that has host set, or set this app's host value."
+
+  - it: still renders the awaiting-etcd beacon when the apex is empty and there is no etcd
+    set:
+      _namespace:
+        etcd: ""
+        host: ""
+      _cluster:
+        cluster-domain: cozy.local
+      version: "v1.35"
+    asserts:
+      - hasDocuments:
+          count: 1
+      - isKind:
+          of: ConfigMap
diff --git a/packages/apps/kubernetes/tests/ingress_proxied_gate_test.yaml b/packages/apps/kubernetes/tests/ingress_proxied_gate_test.yaml
new file mode 100644
index 0000000000..9583b16a31
--- /dev/null
+++ b/packages/apps/kubernetes/tests/ingress_proxied_gate_test.yaml
@@ -0,0 +1,81 @@
+suite: proxied ingress Service gates on the addon, not on hosts
+# exposeMethod defaults to Proxied while addons.ingressNginx.enabled defaults
+# to false, so the Service must render only when the addon is actually on —
+# otherwise every cluster without ingress-nginx grows a Service whose selector
+# (node-role.kubernetes.io/ingress-nginx) matches no pods, and kubernetes-rd
+# surfaces it in the tenant dashboard advertising ports that route nowhere.
+# The Service intentionally does NOT require `hosts`: a ComputePlane app's
+# per-app management Ingress routes to it without the module knowing app hosts
+# in advance.
+templates:
+  - templates/ingress.yaml
+release:
+  name: kubernetes-alice
+  namespace: tenant-alice
+set:
+  _namespace:
+    ingress: tenant-root
+    etcd: tenant-root
+tests:
+  - it: renders nothing when the addon is disabled (default)
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  - it: renders the Service (and no Ingress) when enabled with Proxied and no hosts
+    set:
+      addons:
+        ingressNginx:
+          enabled: true
+          exposeMethod: Proxied
+          hosts: []
+    asserts:
+      - hasDocuments:
+          count: 1
+      - isKind:
+          of: Service
+      - equal:
+          path: metadata.name
+          value: kubernetes-alice-ingress-nginx
+
+  - it: renders Ingress and Service when enabled with Proxied and hosts
+    set:
+      addons:
+        ingressNginx:
+          enabled: true
+          exposeMethod: Proxied
+          hosts: ["app.example.com"]
+    asserts:
+      - hasDocuments:
+          count: 2
+
+  # Deliberate behaviour change pinned: hosts with the addon disabled used to
+  # render the Ingress; "the addon is off" now means nothing renders at all.
+  - it: renders nothing when hosts are set but the addon is disabled
+    set:
+      addons:
+        ingressNginx:
+          enabled: false
+          exposeMethod: Proxied
+          hosts: ["app.example.com"]
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  # The addon HelmRelease itself gates on _namespace.etcd (the etcd-less
+  # render collapses to the awaiting-etcd beacon), so the Service must too —
+  # otherwise an etcd-less tenant with the addon pinned on (ComputePlane)
+  # gets the selector-less Service by another route.
+  - it: renders nothing on an etcd-less tenant even with the addon enabled
+    set:
+      _namespace:
+        ingress: tenant-root
+        etcd: ""
+      addons:
+        ingressNginx:
+          enabled: true
+          exposeMethod: Proxied
+          hosts: []
+    asserts:
+      - hasDocuments:
+          count: 0
diff --git a/packages/apps/kubernetes/tests/kamaji_managed_args_job_test.yaml b/packages/apps/kubernetes/tests/kamaji_managed_args_job_test.yaml
new file mode 100644
index 0000000000..af36fe3c8b
--- /dev/null
+++ b/packages/apps/kubernetes/tests/kamaji_managed_args_job_test.yaml
@@ -0,0 +1,29 @@
+suite: extraArgs the post-upgrade Job patches onto the KamajiControlPlane
+
+values:
+  - values/common.yaml
+
+release:
+  name: test
+  namespace: tenant-test
+
+templates:
+  - templates/oidc-rbac-job.yaml
+
+tests:
+  - it: leaves a moved entry out of the extraArgs the Job patches onto the KamajiControlPlane
+    # The Job's merge patch replaces the whole array, so it has to carry the
+    # list cluster.yaml renders, not the raw values.
+    set:
+      controlPlane.apiServer.extraArgs:
+        - --profiling=false
+        - --enable-admission-plugins=NodeRestriction
+    asserts:
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: '\\"extraArgs\\":\[\\"--profiling=false\\"\]'
+        documentIndex: 3
+      - notMatchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: 'enable-admission-plugins'
+        documentIndex: 3
diff --git a/packages/apps/kubernetes/tests/kamaji_managed_args_test.yaml b/packages/apps/kubernetes/tests/kamaji_managed_args_test.yaml
new file mode 100644
index 0000000000..b09343cf58
--- /dev/null
+++ b/packages/apps/kubernetes/tests/kamaji_managed_args_test.yaml
@@ -0,0 +1,474 @@
+suite: extraArgs entries the tenant control plane drops
+
+values:
+  - values/common.yaml
+
+release:
+  name: test
+  namespace: tenant-test
+
+templates:
+  - templates/cluster.yaml
+
+tests:
+  - it: refuses --advertise-address=value
+    set:
+      controlPlane.apiServer.extraArgs:
+        - --profiling=false
+        - --advertise-address=x
+    asserts:
+      - failedTemplate:
+          errorPattern: '^.*extraArgs contains "--advertise-address=x" — the tenant control plane sets --advertise-address itself '
+
+  - it: refuses --client-ca-file=value
+    set:
+      controlPlane.apiServer.extraArgs:
+        - --profiling=false
+        - --client-ca-file=x
+    asserts:
+      - failedTemplate:
+          errorPattern: '^.*extraArgs contains "--client-ca-file=x" — the tenant control plane sets --client-ca-file itself '
+
+  - it: refuses --service-cluster-ip-range=value
+    set:
+      controlPlane.apiServer.extraArgs:
+        - --profiling=false
+        - --service-cluster-ip-range=x
+    asserts:
+      - failedTemplate:
+          errorPattern: '^.*extraArgs contains "--service-cluster-ip-range=x" — the tenant control plane sets --service-cluster-ip-range itself '
+
+  - it: refuses --kubelet-client-certificate=value
+    set:
+      controlPlane.apiServer.extraArgs:
+        - --profiling=false
+        - --kubelet-client-certificate=x
+    asserts:
+      - failedTemplate:
+          errorPattern: '^.*extraArgs contains "--kubelet-client-certificate=x" — the tenant control plane sets --kubelet-client-certificate itself '
+
+  - it: refuses --kubelet-client-key=value
+    set:
+      controlPlane.apiServer.extraArgs:
+        - --profiling=false
+        - --kubelet-client-key=x
+    asserts:
+      - failedTemplate:
+          errorPattern: '^.*extraArgs contains "--kubelet-client-key=x" — the tenant control plane sets --kubelet-client-key itself '
+
+  - it: refuses --proxy-client-cert-file=value
+    set:
+      controlPlane.apiServer.extraArgs:
+        - --profiling=false
+        - --proxy-client-cert-file=x
+    asserts:
+      - failedTemplate:
+          errorPattern: '^.*extraArgs contains "--proxy-client-cert-file=x" — the tenant control plane sets --proxy-client-cert-file itself '
+
+  - it: refuses --proxy-client-key-file=value
+    set:
+      controlPlane.apiServer.extraArgs:
+        - --profiling=false
+        - --proxy-client-key-file=x
+    asserts:
+      - failedTemplate:
+          errorPattern: '^.*extraArgs contains "--proxy-client-key-file=x" — the tenant control plane sets --proxy-client-key-file itself '
+
+  - it: refuses --requestheader-allowed-names=value
+    set:
+      controlPlane.apiServer.extraArgs:
+        - --profiling=false
+        - --requestheader-allowed-names=x
+    asserts:
+      - failedTemplate:
+          errorPattern: '^.*extraArgs contains "--requestheader-allowed-names=x" — the tenant control plane sets --requestheader-allowed-names itself '
+
+  - it: refuses --requestheader-client-ca-file=value
+    set:
+      controlPlane.apiServer.extraArgs:
+        - --profiling=false
+        - --requestheader-client-ca-file=x
+    asserts:
+      - failedTemplate:
+          errorPattern: '^.*extraArgs contains "--requestheader-client-ca-file=x" — the tenant control plane sets --requestheader-client-ca-file itself '
+
+  - it: refuses --secure-port=value
+    set:
+      controlPlane.apiServer.extraArgs:
+        - --profiling=false
+        - --secure-port=x
+    asserts:
+      - failedTemplate:
+          errorPattern: '^.*extraArgs contains "--secure-port=x" — the tenant control plane sets --secure-port itself '
+
+  - it: refuses --service-account-key-file=value
+    set:
+      controlPlane.apiServer.extraArgs:
+        - --profiling=false
+        - --service-account-key-file=x
+    asserts:
+      - failedTemplate:
+          errorPattern: '^.*extraArgs contains "--service-account-key-file=x" — the tenant control plane sets --service-account-key-file itself '
+
+  - it: refuses --service-account-signing-key-file=value
+    set:
+      controlPlane.apiServer.extraArgs:
+        - --profiling=false
+        - --service-account-signing-key-file=x
+    asserts:
+      - failedTemplate:
+          errorPattern: '^.*extraArgs contains "--service-account-signing-key-file=x" — the tenant control plane sets --service-account-signing-key-file itself '
+
+  - it: refuses --tls-cert-file=value
+    set:
+      controlPlane.apiServer.extraArgs:
+        - --profiling=false
+        - --tls-cert-file=x
+    asserts:
+      - failedTemplate:
+          errorPattern: '^.*extraArgs contains "--tls-cert-file=x" — the tenant control plane sets --tls-cert-file itself '
+
+  - it: refuses --tls-private-key-file=value
+    set:
+      controlPlane.apiServer.extraArgs:
+        - --profiling=false
+        - --tls-private-key-file=x
+    asserts:
+      - failedTemplate:
+          errorPattern: '^.*extraArgs contains "--tls-private-key-file=x" — the tenant control plane sets --tls-private-key-file itself '
+
+  - it: refuses --etcd-servers=value
+    set:
+      controlPlane.apiServer.extraArgs:
+        - --profiling=false
+        - --etcd-servers=x
+    asserts:
+      - failedTemplate:
+          errorPattern: '^.*extraArgs contains "--etcd-servers=x" — the tenant control plane sets --etcd-servers itself '
+
+  - it: refuses --etcd-cafile=value
+    set:
+      controlPlane.apiServer.extraArgs:
+        - --profiling=false
+        - --etcd-cafile=x
+    asserts:
+      - failedTemplate:
+          errorPattern: '^.*extraArgs contains "--etcd-cafile=x" — the tenant control plane sets --etcd-cafile itself '
+
+  - it: refuses --etcd-certfile=value
+    set:
+      controlPlane.apiServer.extraArgs:
+        - --profiling=false
+        - --etcd-certfile=x
+    asserts:
+      - failedTemplate:
+          errorPattern: '^.*extraArgs contains "--etcd-certfile=x" — the tenant control plane sets --etcd-certfile itself '
+
+  - it: refuses --etcd-keyfile=value
+    set:
+      controlPlane.apiServer.extraArgs:
+        - --profiling=false
+        - --etcd-keyfile=x
+    asserts:
+      - failedTemplate:
+          errorPattern: '^.*extraArgs contains "--etcd-keyfile=x" — the tenant control plane sets --etcd-keyfile itself '
+
+  - it: refuses --etcd-prefix=value
+    set:
+      controlPlane.apiServer.extraArgs:
+        - --profiling=false
+        - --etcd-prefix=x
+    asserts:
+      - failedTemplate:
+          errorPattern: '^.*extraArgs contains "--etcd-prefix=x" — the tenant control plane sets --etcd-prefix itself '
+
+  - it: refuses --etcd-compaction-interval=value
+    set:
+      controlPlane.apiServer.extraArgs:
+        - --profiling=false
+        - --etcd-compaction-interval=x
+    asserts:
+      - failedTemplate:
+          errorPattern: '^.*extraArgs contains "--etcd-compaction-interval=x" — the tenant control plane sets --etcd-compaction-interval itself '
+
+  - it: refuses --egress-selector-config-file=value
+    set:
+      controlPlane.apiServer.extraArgs:
+        - --profiling=false
+        - --egress-selector-config-file=x
+    asserts:
+      - failedTemplate:
+          errorPattern: '^.*extraArgs contains "--egress-selector-config-file=x" — the tenant control plane sets --egress-selector-config-file itself '
+
+  - it: renders a flag the control plane only defaults, since the entry replaces the default
+    set:
+      controlPlane.apiServer.extraArgs:
+        - --requestheader-group-headers=X-Group
+        - --authorization-mode=Node,RBAC,Webhook
+    asserts:
+      - equal:
+          path: spec.apiServer.extraArgs
+          value:
+            - --requestheader-group-headers=X-Group
+            - --authorization-mode=Node,RBAC,Webhook
+        documentIndex: 1
+
+  - it: renders --etcd-servers-overrides, which the control plane owns only when dataStoreOverrides is set and this chart never sets it
+    set:
+      controlPlane.apiServer.extraArgs:
+        - --etcd-servers-overrides=/events#https://etcd-events:2379
+    asserts:
+      - equal:
+          path: spec.apiServer.extraArgs
+          value:
+            - --etcd-servers-overrides=/events#https://etcd-events:2379
+        documentIndex: 1
+
+  - it: does not match a flag whose name only starts with a managed one
+    set:
+      controlPlane.apiServer.extraArgs:
+        - --etcd-servers-overrides-extra=x
+        - --secure-port-x=1
+    asserts:
+      - notFailedTemplate: {}
+
+  - it: points every other managed flag at the generic message, not at admissionControllers
+    set:
+      controlPlane.apiServer.extraArgs:
+        - --secure-port=6444
+    asserts:
+      - failedTemplate:
+          errorMessage: 'controlPlane.apiServer.extraArgs contains "--secure-port=6444" — the tenant control plane sets --secure-port itself and drops every entry naming it before the kube-apiserver sees the list, so this entry has no effect, and written without =value it leaves its value behind as an argument the apiserver refuses. Remove the entry; the description of controlPlane.apiServer.extraArgs lists every flag the control plane owns.'
+
+  - it: leaves spec.admissionControllers out by default, so the control plane keeps its own default set
+    asserts:
+      - notExists:
+          path: spec.admissionControllers
+        documentIndex: 1
+
+  - it: leaves spec.admissionControllers out for an explicitly empty list
+    set:
+      controlPlane.apiServer.admissionControllers: []
+    asserts:
+      - notExists:
+          path: spec.admissionControllers
+        documentIndex: 1
+
+  - it: renders controlPlane.apiServer.admissionControllers into spec.admissionControllers verbatim
+    set:
+      controlPlane.apiServer.admissionControllers:
+        - NodeRestriction
+        - AlwaysPullImages
+    asserts:
+      - equal:
+          path: spec.admissionControllers
+          value:
+            - NodeRestriction
+            - AlwaysPullImages
+        documentIndex: 1
+
+  - it: renders the kubelet preferred address types the chart has always rendered by default
+    asserts:
+      - equal:
+          path: spec.kubelet.preferredAddressTypes
+          value:
+            - InternalIP
+            - ExternalIP
+        documentIndex: 1
+
+  - it: renders controlPlane.kubelet.preferredAddressTypes into spec.kubelet.preferredAddressTypes verbatim
+    set:
+      controlPlane.kubelet.preferredAddressTypes:
+        - Hostname
+        - InternalIP
+    asserts:
+      - equal:
+          path: spec.kubelet.preferredAddressTypes
+          value:
+            - Hostname
+            - InternalIP
+        documentIndex: 1
+
+  - it: refuses a managed flag with spec.oidc.mode System as well
+    values:
+      - values/common.yaml
+      - values/oidc-system.yaml
+    set:
+      controlPlane.apiServer.extraArgs:
+        - --secure-port=6444
+    asserts:
+      - failedTemplate:
+          errorPattern: 'extraArgs contains "--secure-port=6444" — the tenant control plane sets --secure-port itself '
+
+  - it: moves an --enable-admission-plugins entry into spec.admissionControllers and out of extraArgs
+    set:
+      controlPlane.apiServer.extraArgs:
+        - --profiling=false
+        - --enable-admission-plugins=NodeRestriction
+    asserts:
+      - equal:
+          path: spec.admissionControllers
+          value:
+            - NodeRestriction
+        documentIndex: 1
+      - equal:
+          path: spec.apiServer.extraArgs
+          value:
+            - --profiling=false
+        documentIndex: 1
+
+  - it: moves a --kubelet-preferred-address-types entry into spec.kubelet.preferredAddressTypes and out of extraArgs
+    set:
+      controlPlane.apiServer.extraArgs:
+        - --kubelet-preferred-address-types=Hostname,InternalIP
+    asserts:
+      - equal:
+          path: spec.kubelet.preferredAddressTypes
+          value:
+            - Hostname
+            - InternalIP
+        documentIndex: 1
+      - equal:
+          path: spec.apiServer.extraArgs
+          value: []
+        documentIndex: 1
+
+  - it: takes the last of two --enable-admission-plugins entries, as the control plane did before it owned the flag
+    set:
+      controlPlane.apiServer.extraArgs:
+        - --enable-admission-plugins=AlwaysPullImages
+        - --enable-admission-plugins=NodeRestriction,PodNodeSelector
+    asserts:
+      - equal:
+          path: spec.admissionControllers
+          value:
+            - NodeRestriction
+            - PodNodeSelector
+        documentIndex: 1
+
+  - it: moves the entry with spec.oidc.mode System too, rendering the chart's own flags after the entries that remain
+    values:
+      - values/common.yaml
+      - values/oidc-system.yaml
+    set:
+      version: "v1.35"
+      controlPlane.apiServer.extraArgs:
+        - --profiling=false
+        - --enable-admission-plugins=NodeRestriction
+    asserts:
+      - equal:
+          path: spec.admissionControllers
+          value:
+            - NodeRestriction
+        documentIndex: 1
+      - equal:
+          path: spec.apiServer.extraArgs
+          value:
+            - --profiling=false
+            - --authentication-config=/etc/kubernetes/authentication-config/config.yaml
+            - --requestheader-uid-headers=X-Remote-Uid
+        documentIndex: 1
+
+  - it: refuses a bare OIDC flag that ends the list once a moved entry after it is gone
+    # The control plane never sees the moved entry, so the bare flag before it
+    # would take the chart's --authentication-config as its value.
+    values:
+      - values/common.yaml
+      - values/oidc-system.yaml
+    set:
+      controlPlane.apiServer.extraArgs:
+        - --requestheader-uid-headers
+        - --enable-admission-plugins=NodeRestriction
+    asserts:
+      - failedTemplate:
+          errorPattern: '^controlPlane.apiServer.extraArgs ends with "--requestheader-uid-headers" while spec.oidc.mode is "System"'
+
+  - it: refuses an --enable-admission-plugins entry while admissionControllers is also set, naming both
+    set:
+      controlPlane.apiServer.admissionControllers:
+        - AlwaysPullImages
+      controlPlane.apiServer.extraArgs:
+        - --enable-admission-plugins=NodeRestriction
+    asserts:
+      - failedTemplate:
+          errorMessage: 'controlPlane.apiServer.extraArgs contains "--enable-admission-plugins=NodeRestriction" while controlPlane.apiServer.admissionControllers is also set — the tenant control plane takes --enable-admission-plugins only from controlPlane.apiServer.admissionControllers, so the entry cannot apply. Remove the entry, or empty controlPlane.apiServer.admissionControllers to have the chart take the list from it.'
+
+  - it: refuses a --kubelet-preferred-address-types entry while preferredAddressTypes is also set, naming both
+    set:
+      controlPlane.kubelet.preferredAddressTypes:
+        - InternalIP
+      controlPlane.apiServer.extraArgs:
+        - --kubelet-preferred-address-types=Hostname
+    asserts:
+      - failedTemplate:
+          errorMessage: 'controlPlane.apiServer.extraArgs contains "--kubelet-preferred-address-types=Hostname" while controlPlane.kubelet.preferredAddressTypes is also set — the tenant control plane takes --kubelet-preferred-address-types only from controlPlane.kubelet.preferredAddressTypes, so the entry cannot apply. Remove the entry, or empty controlPlane.kubelet.preferredAddressTypes to have the chart take the list from it.'
+
+  - it: refuses the bare two-entry spelling of a flag the chart would move, since its value sits in an entry the chart does not read
+    set:
+      controlPlane.apiServer.extraArgs:
+        - --enable-admission-plugins
+        - NodeRestriction,AlwaysPullImages
+    asserts:
+      - failedTemplate:
+          errorMessage: 'controlPlane.apiServer.extraArgs contains "--enable-admission-plugins" with its value in a separate entry — the tenant control plane sets --enable-admission-plugins itself, from controlPlane.apiServer.admissionControllers, and drops the entry naming it, which leaves the value behind as an argument the apiserver refuses. Write it as --enable-admission-plugins=value so the chart moves it into controlPlane.apiServer.admissionControllers, or set that field instead.'
+
+  - it: refuses the bare spelling of --kubelet-preferred-address-types as well
+    set:
+      controlPlane.apiServer.extraArgs:
+        - --kubelet-preferred-address-types
+        - Hostname
+    asserts:
+      - failedTemplate:
+          errorPattern: '^controlPlane.apiServer.extraArgs contains "--kubelet-preferred-address-types" with its value in a separate entry — .* into controlPlane.kubelet.preferredAddressTypes, or set that field instead\.$'
+
+  - it: refuses an --enable-admission-plugins entry that names nothing
+    set:
+      controlPlane.apiServer.extraArgs:
+        - --enable-admission-plugins=
+    asserts:
+      - failedTemplate:
+          errorMessage: 'controlPlane.apiServer.extraArgs contains "--enable-admission-plugins=", which names nothing — the chart moves this flag into controlPlane.apiServer.admissionControllers and has no list to move. Remove the entry.'
+
+  - it: renders the chart's address types for an empty preferredAddressTypes
+    set:
+      controlPlane.kubelet.preferredAddressTypes: []
+    asserts:
+      - equal:
+          path: spec.kubelet.preferredAddressTypes
+          value:
+            - InternalIP
+            - ExternalIP
+        documentIndex: 1
+
+  - it: renders the chart's address types for a null kubelet object
+    set:
+      controlPlane.kubelet: null
+    asserts:
+      - equal:
+          path: spec.kubelet.preferredAddressTypes
+          value:
+            - InternalIP
+            - ExternalIP
+        documentIndex: 1
+
+  - it: drops a repeated address type from a moved entry, keeping the first place it appears
+    # The KamajiControlPlane field is a set and refuses a repeat the flag used
+    # to accept; the order decides which type the apiserver tries first.
+    set:
+      controlPlane.apiServer.extraArgs:
+        - --kubelet-preferred-address-types=InternalIP,Hostname,InternalIP
+    asserts:
+      - equal:
+          path: spec.kubelet.preferredAddressTypes
+          value:
+            - InternalIP
+            - Hostname
+        documentIndex: 1
+
+  - it: refuses a quoted value on a flag the chart would move, since the chart does not unquote it the way the apiserver does
+    set:
+      controlPlane.apiServer.extraArgs:
+        - --enable-admission-plugins="NodeRestriction,PodSecurity"
+    asserts:
+      - failedTemplate:
+          errorMessage: 'controlPlane.apiServer.extraArgs contains "--enable-admission-plugins=\"NodeRestriction,PodSecurity\"", whose value is quoted — the apiserver strips the quotes when it reads the list and the chart does not, so it cannot move the names into controlPlane.apiServer.admissionControllers as written. Write the value without quotes.'
diff --git a/packages/apps/kubernetes/tests/kcsi_sidecar_images_test.yaml b/packages/apps/kubernetes/tests/kcsi_sidecar_images_test.yaml
new file mode 100644
index 0000000000..912d1170df
--- /dev/null
+++ b/packages/apps/kubernetes/tests/kcsi_sidecar_images_test.yaml
@@ -0,0 +1,36 @@
+suite: KubeVirt CSI sidecar images
+
+templates:
+  - templates/csi/deploy.yaml
+
+values:
+  - values/common.yaml
+
+release:
+  name: test-k8s
+  namespace: tenant-test
+
+tests:
+  - it: uses versioned upstream sig-storage sidecars
+    documentSelector:
+      path: kind
+      value: Deployment
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[1].name
+          value: csi-provisioner
+      - equal:
+          path: spec.template.spec.containers[1].image
+          value: registry.k8s.io/sig-storage/csi-provisioner:v6.1.0
+      - equal:
+          path: spec.template.spec.containers[2].name
+          value: csi-attacher
+      - equal:
+          path: spec.template.spec.containers[2].image
+          value: registry.k8s.io/sig-storage/csi-attacher:v4.10.0
+      - equal:
+          path: spec.template.spec.containers[3].name
+          value: csi-liveness-probe
+      - equal:
+          path: spec.template.spec.containers[3].image
+          value: registry.k8s.io/sig-storage/livenessprobe:v2.17.0
diff --git a/packages/apps/kubernetes/tests/kubelet-reservation_test.yaml b/packages/apps/kubernetes/tests/kubelet-reservation_test.yaml
deleted file mode 100644
index b1205d5b6c..0000000000
--- a/packages/apps/kubernetes/tests/kubelet-reservation_test.yaml
+++ /dev/null
@@ -1,1843 +0,0 @@
-suite: kubelet reservation tests
-
-templates:
-  - templates/cluster.yaml
-
-# The KubeadmConfigTemplate for the first nodeGroup (md0) is rendered
-# at document index 4 within cluster.yaml. The kubelet args live at:
-# spec.template.spec.joinConfiguration.nodeRegistration.kubeletExtraArgs
-
-tests:
-  ###################################
-  # Default values (no memory set)  #
-  ###################################
-
-  - it: renders default kubelet args when no memory and no kubelet overrides
-    release:
-      name: test-k8s
-      namespace: tenant-test
-    set:
-      _namespace:
-        etcd: etcd
-        ingress: nginx
-        host: example.com
-      _cluster:
-        cluster-domain: cozy.local
-      nodeGroups:
-        md0:
-          minReplicas: 0
-          maxReplicas: 10
-          instanceType: ""
-          diskSize: 20Gi
-          roles:
-            - worker
-          resources: {}
-    asserts:
-      - isKind:
-          of: KubeadmConfigTemplate
-        documentIndex: 4
-      - equal:
-          path: spec.template.spec.joinConfiguration.nodeRegistration.kubeletExtraArgs.system-reserved
-          value: "memory=256Mi,cpu=50m"
-        documentIndex: 4
-      - equal:
-          path: spec.template.spec.joinConfiguration.nodeRegistration.kubeletExtraArgs.kube-reserved
-          value: "memory=256Mi,cpu=50m"
-        documentIndex: 4
-      - equal:
-          path: spec.template.spec.joinConfiguration.nodeRegistration.kubeletExtraArgs.eviction-hard
-          value: "memory.available<7%,nodefs.available<10%,imagefs.available<15%,nodefs.inodesFree<5%"
-        documentIndex: 4
-      - equal:
-          path: spec.template.spec.joinConfiguration.nodeRegistration.kubeletExtraArgs.eviction-soft
-          value: "memory.available<10%,nodefs.available<15%,imagefs.available<20%"
-        documentIndex: 4
-      - equal:
-          path: spec.template.spec.joinConfiguration.nodeRegistration.kubeletExtraArgs.eviction-soft-grace-period
-          value: "memory.available=1m30s,nodefs.available=1m30s,imagefs.available=1m30s"
-        documentIndex: 4
-      - equal:
-          path: spec.template.spec.joinConfiguration.nodeRegistration.kubeletExtraArgs.eviction-minimum-reclaim
-          value: "memory.available=256Mi"
-        documentIndex: 4
-      - equal:
-          path: spec.template.spec.joinConfiguration.nodeRegistration.kubeletExtraArgs.enforce-node-allocatable
-          value: "pods"
-        documentIndex: 4
-
-  ##########################################
-  # Empty kubelet: {} falls back to defaults
-  ##########################################
-
-  - it: falls back to defaults when kubelet is empty dict
-    release:
-      name: test-k8s
-      namespace: tenant-test
-    set:
-      _namespace:
-        etcd: etcd
-        ingress: nginx
-        host: example.com
-      _cluster:
-        cluster-domain: cozy.local
-      nodeGroups:
-        md0:
-          minReplicas: 0
-          maxReplicas: 10
-          instanceType: ""
-          diskSize: 20Gi
-          roles:
-            - worker
-          resources: {}
-          kubelet: {}
-    asserts:
-      - equal:
-          path: spec.template.spec.joinConfiguration.nodeRegistration.kubeletExtraArgs.system-reserved
-          value: "memory=256Mi,cpu=50m"
-        documentIndex: 4
-      - equal:
-          path: spec.template.spec.joinConfiguration.nodeRegistration.kubeletExtraArgs.kube-reserved
-          value: "memory=256Mi,cpu=50m"
-        documentIndex: 4
-      - equal:
-          path: spec.template.spec.joinConfiguration.nodeRegistration.kubeletExtraArgs.eviction-hard
-          value: "memory.available<7%,nodefs.available<10%,imagefs.available<15%,nodefs.inodesFree<5%"
-        documentIndex: 4
-      - equal:
-          path: spec.template.spec.joinConfiguration.nodeRegistration.kubeletExtraArgs.eviction-soft
-          value: "memory.available<10%,nodefs.available<15%,imagefs.available<20%"
-        documentIndex: 4
-
-  #########################################
-  # Node group without kubelet key at all #
-  #########################################
-
-  - it: renders defaults when nodeGroup has no kubelet key
-    release:
-      name: test-k8s
-      namespace: tenant-test
-    set:
-      _namespace:
-        etcd: etcd
-        ingress: nginx
-        host: example.com
-      _cluster:
-        cluster-domain: cozy.local
-      nodeGroups:
-        md0:
-          minReplicas: 0
-          maxReplicas: 10
-          instanceType: ""
-          diskSize: 20Gi
-          roles:
-            - worker
-          resources: {}
-    asserts:
-      - equal:
-          path: spec.template.spec.joinConfiguration.nodeRegistration.kubeletExtraArgs.system-reserved
-          value: "memory=256Mi,cpu=50m"
-        documentIndex: 4
-      - equal:
-          path: spec.template.spec.joinConfiguration.nodeRegistration.kubeletExtraArgs.kube-reserved
-          value: "memory=256Mi,cpu=50m"
-        documentIndex: 4
-
-  ###############################
-  # Custom kubelet overrides    #
-  ###############################
-
-  - it: uses custom kubelet overrides when specified
-    release:
-      name: test-k8s
-      namespace: tenant-test
-    set:
-      _namespace:
-        etcd: etcd
-        ingress: nginx
-        host: example.com
-      _cluster:
-        cluster-domain: cozy.local
-      nodeGroups:
-        md0:
-          minReplicas: 0
-          maxReplicas: 10
-          instanceType: ""
-          diskSize: 20Gi
-          roles:
-            - worker
-          resources:
-            memory: "8Gi"
-            cpu: 4
-          kubelet:
-            systemReservedMemory: "512Mi"
-            kubeReservedMemory: "256Mi"
-            systemReservedCpu: "200m"
-            kubeReservedCpu: "300m"
-            evictionHardMemory: "5%"
-            evictionSoftMemory: "15%"
-    asserts:
-      - equal:
-          path: spec.template.spec.joinConfiguration.nodeRegistration.kubeletExtraArgs.system-reserved
-          value: "memory=512Mi,cpu=200m"
-        documentIndex: 4
-      - equal:
-          path: spec.template.spec.joinConfiguration.nodeRegistration.kubeletExtraArgs.kube-reserved
-          value: "memory=256Mi,cpu=300m"
-        documentIndex: 4
-      - equal:
-          path: spec.template.spec.joinConfiguration.nodeRegistration.kubeletExtraArgs.eviction-hard
-          value: "memory.available<5%,nodefs.available<10%,imagefs.available<15%,nodefs.inodesFree<5%"
-        documentIndex: 4
-      - equal:
-          path: spec.template.spec.joinConfiguration.nodeRegistration.kubeletExtraArgs.eviction-soft
-          value: "memory.available<15%,nodefs.available<15%,imagefs.available<20%"
-        documentIndex: 4
-
-  - it: allows partial kubelet overrides, uses defaults for unset fields
-    release:
-      name: test-k8s
-      namespace: tenant-test
-    set:
-      _namespace:
-        etcd: etcd
-        ingress: nginx
-        host: example.com
-      _cluster:
-        cluster-domain: cozy.local
-      nodeGroups:
-        md0:
-          minReplicas: 0
-          maxReplicas: 10
-          instanceType: ""
-          diskSize: 20Gi
-          roles:
-            - worker
-          resources:
-            memory: "4Gi"
-          kubelet:
-            systemReservedMemory: "256Mi"
-    asserts:
-      - equal:
-          path: spec.template.spec.joinConfiguration.nodeRegistration.kubeletExtraArgs.system-reserved
-          value: "memory=256Mi,cpu=50m"
-        documentIndex: 4
-      - equal:
-          path: spec.template.spec.joinConfiguration.nodeRegistration.kubeletExtraArgs.kube-reserved
-          value: "memory=256Mi,cpu=50m"
-        documentIndex: 4
-      - equal:
-          path: spec.template.spec.joinConfiguration.nodeRegistration.kubeletExtraArgs.eviction-hard
-          value: "memory.available<7%,nodefs.available<10%,imagefs.available<15%,nodefs.inodesFree<5%"
-        documentIndex: 4
-      - equal:
-          path: spec.template.spec.joinConfiguration.nodeRegistration.kubeletExtraArgs.eviction-soft
-          value: "memory.available<10%,nodefs.available<15%,imagefs.available<20%"
-        documentIndex: 4
-
-  - it: allows valid absolute eviction thresholds (hard < soft)
-    release:
-      name: test-k8s
-      namespace: tenant-test
-    set:
-      _namespace:
-        etcd: etcd
-        ingress: nginx
-        host: example.com
-      _cluster:
-        cluster-domain: cozy.local
-      nodeGroups:
-        md0:
-          minReplicas: 0
-          maxReplicas: 10
-          instanceType: ""
-          diskSize: 20Gi
-          roles:
-            - worker
-          resources:
-            memory: "8Gi"
-          kubelet:
-            evictionHardMemory: "200Mi"
-            evictionSoftMemory: "500Mi"
-    asserts:
-      - equal:
-          path: spec.template.spec.joinConfiguration.nodeRegistration.kubeletExtraArgs.eviction-hard
-          value: "memory.available<200Mi,nodefs.available<10%,imagefs.available<15%,nodefs.inodesFree<5%"
-        documentIndex: 4
-      - equal:
-          path: spec.template.spec.joinConfiguration.nodeRegistration.kubeletExtraArgs.eviction-soft
-          value: "memory.available<500Mi,nodefs.available<15%,imagefs.available<20%"
-        documentIndex: 4
-
-  - it: rejects absolute eviction thresholds where hard >= soft
-    release:
-      name: test-k8s
-      namespace: tenant-test
-    set:
-      _namespace:
-        etcd: etcd
-        ingress: nginx
-        host: example.com
-      _cluster:
-        cluster-domain: cozy.local
-      nodeGroups:
-        md0:
-          minReplicas: 0
-          maxReplicas: 10
-          instanceType: ""
-          diskSize: 20Gi
-          roles:
-            - worker
-          resources: {}
-          kubelet:
-            evictionHardMemory: "1Gi"
-            evictionSoftMemory: "200Mi"
-    asserts:
-      - failedTemplate:
-          errorMessage: "nodeGroup md0: evictionHardMemory (1Gi) must be strictly less than evictionSoftMemory (200Mi)"
-
-  ############################################
-  # Auto-computation from resources.memory   #
-  ############################################
-
-  - it: auto-computes reservation from resources.memory (4Gi -> 256Mi, clamped from 204Mi)
-    release:
-      name: test-k8s
-      namespace: tenant-test
-    set:
-      _namespace:
-        etcd: etcd
-        ingress: nginx
-        host: example.com
-      _cluster:
-        cluster-domain: cozy.local
-      nodeGroups:
-        md0:
-          minReplicas: 0
-          maxReplicas: 10
-          instanceType: ""
-          diskSize: 20Gi
-          roles:
-            - worker
-          resources:
-            memory: "4Gi"
-    asserts:
-      # 4Gi = 4096Mi, 5% = 204Mi (truncated from 204.8), clamped up to 256Mi floor
-      - equal:
-          path: spec.template.spec.joinConfiguration.nodeRegistration.kubeletExtraArgs.system-reserved
-          value: "memory=256Mi,cpu=50m"
-        documentIndex: 4
-      - equal:
-          path: spec.template.spec.joinConfiguration.nodeRegistration.kubeletExtraArgs.kube-reserved
-          value: "memory=256Mi,cpu=50m"
-        documentIndex: 4
-
-  - it: auto-computes reservation from resources.memory (8Gi -> 409Mi)
-    release:
-      name: test-k8s
-      namespace: tenant-test
-    set:
-      _namespace:
-        etcd: etcd
-        ingress: nginx
-        host: example.com
-      _cluster:
-        cluster-domain: cozy.local
-      nodeGroups:
-        md0:
-          minReplicas: 0
-          maxReplicas: 10
-          instanceType: ""
-          diskSize: 20Gi
-          roles:
-            - worker
-          resources:
-            memory: "8Gi"
-    asserts:
-      # 8Gi = 8192Mi, 5% = 409Mi (truncated from 409.6)
-      - equal:
-          path: spec.template.spec.joinConfiguration.nodeRegistration.kubeletExtraArgs.system-reserved
-          value: "memory=409Mi,cpu=50m"
-        documentIndex: 4
-      - equal:
-          path: spec.template.spec.joinConfiguration.nodeRegistration.kubeletExtraArgs.kube-reserved
-          value: "memory=409Mi,cpu=50m"
-        documentIndex: 4
-
-  ##################################
-  # Clamp logic: 256Mi floor        #
-  ##################################
-
-  - it: clamps auto-computed reservation to 256Mi floor (1Gi memory)
-    release:
-      name: test-k8s
-      namespace: tenant-test
-    set:
-      _namespace:
-        etcd: etcd
-        ingress: nginx
-        host: example.com
-      _cluster:
-        cluster-domain: cozy.local
-      nodeGroups:
-        md0:
-          minReplicas: 0
-          maxReplicas: 10
-          instanceType: ""
-          diskSize: 20Gi
-          roles:
-            - worker
-          resources:
-            memory: "1Gi"
-    asserts:
-      # 1Gi = 1024Mi, 5% = 51Mi, but floor is 256Mi
-      - equal:
-          path: spec.template.spec.joinConfiguration.nodeRegistration.kubeletExtraArgs.system-reserved
-          value: "memory=256Mi,cpu=50m"
-        documentIndex: 4
-      - equal:
-          path: spec.template.spec.joinConfiguration.nodeRegistration.kubeletExtraArgs.kube-reserved
-          value: "memory=256Mi,cpu=50m"
-        documentIndex: 4
-
-  - it: clamps auto-computed reservation to 256Mi floor (512Mi memory, triggers validation error)
-    release:
-      name: test-k8s
-      namespace: tenant-test
-    set:
-      _namespace:
-        etcd: etcd
-        ingress: nginx
-        host: example.com
-      _cluster:
-        cluster-domain: cozy.local
-      nodeGroups:
-        md0:
-          minReplicas: 0
-          maxReplicas: 10
-          instanceType: ""
-          diskSize: 20Gi
-          roles:
-            - worker
-          resources:
-            memory: "512Mi"
-    asserts:
-      # 512Mi, 5% = 25Mi, but floor is 256Mi -> 256Mi+256Mi+7%eviction(35Mi) = 547Mi > 512Mi -> fails validation
-      - failedTemplate:
-          errorMessage: "nodeGroup md0: total reserved memory (systemReservedMemory=256Mi + kubeReservedMemory=256Mi + evictionHardMemory=7%) must be less than effective node memory (512Mi)"
-
-  ##################################
-  # Clamp logic: 1024Mi ceiling    #
-  ##################################
-
-  - it: clamps auto-computed reservation to 1024Mi ceiling (32Gi memory)
-    release:
-      name: test-k8s
-      namespace: tenant-test
-    set:
-      _namespace:
-        etcd: etcd
-        ingress: nginx
-        host: example.com
-      _cluster:
-        cluster-domain: cozy.local
-      nodeGroups:
-        md0:
-          minReplicas: 0
-          maxReplicas: 10
-          instanceType: ""
-          diskSize: 20Gi
-          roles:
-            - worker
-          resources:
-            memory: "32Gi"
-    asserts:
-      # 32Gi = 32768Mi, 5% = 1638Mi, capped to 1024Mi
-      - equal:
-          path: spec.template.spec.joinConfiguration.nodeRegistration.kubeletExtraArgs.system-reserved
-          value: "memory=1024Mi,cpu=50m"
-        documentIndex: 4
-      - equal:
-          path: spec.template.spec.joinConfiguration.nodeRegistration.kubeletExtraArgs.kube-reserved
-          value: "memory=1024Mi,cpu=50m"
-        documentIndex: 4
-
-  - it: clamps auto-computed reservation to 1024Mi ceiling (64Gi memory)
-    release:
-      name: test-k8s
-      namespace: tenant-test
-    set:
-      _namespace:
-        etcd: etcd
-        ingress: nginx
-        host: example.com
-      _cluster:
-        cluster-domain: cozy.local
-      nodeGroups:
-        md0:
-          minReplicas: 0
-          maxReplicas: 10
-          instanceType: ""
-          diskSize: 20Gi
-          roles:
-            - worker
-          resources:
-            memory: "64Gi"
-    asserts:
-      # 64Gi = 65536Mi, 5% = 3276Mi, capped to 1024Mi
-      - equal:
-          path: spec.template.spec.joinConfiguration.nodeRegistration.kubeletExtraArgs.system-reserved
-          value: "memory=1024Mi,cpu=50m"
-        documentIndex: 4
-      - equal:
-          path: spec.template.spec.joinConfiguration.nodeRegistration.kubeletExtraArgs.kube-reserved
-          value: "memory=1024Mi,cpu=50m"
-        documentIndex: 4
-
-  ##################################################
-  # Boundary: exactly at 1024Mi ceiling threshold  #
-  ##################################################
-
-  - it: auto-computes exactly 1024Mi at the boundary (20480Mi memory)
-    release:
-      name: test-k8s
-      namespace: tenant-test
-    set:
-      _namespace:
-        etcd: etcd
-        ingress: nginx
-        host: example.com
-      _cluster:
-        cluster-domain: cozy.local
-      nodeGroups:
-        md0:
-          minReplicas: 0
-          maxReplicas: 10
-          instanceType: ""
-          diskSize: 20Gi
-          roles:
-            - worker
-          resources:
-            # 20480Mi = 20Gi, 5% = 1024Mi — exactly at the cap
-            memory: "20Gi"
-    asserts:
-      - equal:
-          path: spec.template.spec.joinConfiguration.nodeRegistration.kubeletExtraArgs.system-reserved
-          value: "memory=1024Mi,cpu=50m"
-        documentIndex: 4
-      - equal:
-          path: spec.template.spec.joinConfiguration.nodeRegistration.kubeletExtraArgs.kube-reserved
-          value: "memory=1024Mi,cpu=50m"
-        documentIndex: 4
-
-  ####################################################
-  # Custom overrides take precedence over auto-compute
-  ####################################################
-
-  - it: custom kubelet memory overrides take precedence over auto-computation
-    release:
-      name: test-k8s
-      namespace: tenant-test
-    set:
-      _namespace:
-        etcd: etcd
-        ingress: nginx
-        host: example.com
-      _cluster:
-        cluster-domain: cozy.local
-      nodeGroups:
-        md0:
-          minReplicas: 0
-          maxReplicas: 10
-          instanceType: ""
-          diskSize: 20Gi
-          roles:
-            - worker
-          resources:
-            memory: "8Gi"
-          kubelet:
-            systemReservedMemory: "1Gi"
-            kubeReservedMemory: "768Mi"
-    asserts:
-      # Despite 8Gi yielding 409Mi auto, explicit overrides win
-      - equal:
-          path: spec.template.spec.joinConfiguration.nodeRegistration.kubeletExtraArgs.system-reserved
-          value: "memory=1Gi,cpu=50m"
-        documentIndex: 4
-      - equal:
-          path: spec.template.spec.joinConfiguration.nodeRegistration.kubeletExtraArgs.kube-reserved
-          value: "memory=768Mi,cpu=50m"
-        documentIndex: 4
-
-  ######################################
-  # Eviction validation: hard >= soft  #
-  ######################################
-
-  - it: fails when evictionHardMemory percentage exceeds evictionSoftMemory
-    release:
-      name: test-k8s
-      namespace: tenant-test
-    set:
-      _namespace:
-        etcd: etcd
-        ingress: nginx
-        host: example.com
-      _cluster:
-        cluster-domain: cozy.local
-      nodeGroups:
-        md0:
-          minReplicas: 0
-          maxReplicas: 10
-          instanceType: ""
-          diskSize: 20Gi
-          roles:
-            - worker
-          resources: {}
-          kubelet:
-            evictionHardMemory: "15%"
-            evictionSoftMemory: "10%"
-    asserts:
-      - failedTemplate:
-          errorMessage: "nodeGroup md0: evictionHardMemory (15%) must be strictly less than evictionSoftMemory (10%)"
-
-  - it: fails when evictionHardMemory percentage equals evictionSoftMemory
-    release:
-      name: test-k8s
-      namespace: tenant-test
-    set:
-      _namespace:
-        etcd: etcd
-        ingress: nginx
-        host: example.com
-      _cluster:
-        cluster-domain: cozy.local
-      nodeGroups:
-        md0:
-          minReplicas: 0
-          maxReplicas: 10
-          instanceType: ""
-          diskSize: 20Gi
-          roles:
-            - worker
-          resources: {}
-          kubelet:
-            evictionHardMemory: "10%"
-            evictionSoftMemory: "10%"
-    asserts:
-      - failedTemplate:
-          errorMessage: "nodeGroup md0: evictionHardMemory (10%) must be strictly less than evictionSoftMemory (10%)"
-
-  - it: fails when default evictionHardMemory is overridden to exceed default evictionSoftMemory
-    release:
-      name: test-k8s
-      namespace: tenant-test
-    set:
-      _namespace:
-        etcd: etcd
-        ingress: nginx
-        host: example.com
-      _cluster:
-        cluster-domain: cozy.local
-      nodeGroups:
-        md0:
-          minReplicas: 0
-          maxReplicas: 10
-          instanceType: ""
-          diskSize: 20Gi
-          roles:
-            - worker
-          resources: {}
-          kubelet:
-            evictionHardMemory: "12%"
-            # soft defaults to 10%, so 12% >= 10% should fail
-    asserts:
-      - failedTemplate:
-          errorMessage: "nodeGroup md0: evictionHardMemory (12%) must be strictly less than evictionSoftMemory (10%)"
-
-  ##############################################
-  # Static args always present                 #
-  ##############################################
-
-  - it: always renders enforce-node-allocatable as pods
-    release:
-      name: test-k8s
-      namespace: tenant-test
-    set:
-      _namespace:
-        etcd: etcd
-        ingress: nginx
-        host: example.com
-      _cluster:
-        cluster-domain: cozy.local
-      nodeGroups:
-        md0:
-          minReplicas: 0
-          maxReplicas: 10
-          instanceType: ""
-          diskSize: 20Gi
-          roles:
-            - worker
-          resources:
-            memory: "16Gi"
-          kubelet:
-            systemReservedMemory: "1Gi"
-            kubeReservedMemory: "512Mi"
-    asserts:
-      - equal:
-          path: spec.template.spec.joinConfiguration.nodeRegistration.kubeletExtraArgs.enforce-node-allocatable
-          value: "pods"
-        documentIndex: 4
-      - equal:
-          path: spec.template.spec.joinConfiguration.nodeRegistration.kubeletExtraArgs.eviction-soft-grace-period
-          value: "memory.available=1m30s,nodefs.available=1m30s,imagefs.available=1m30s"
-        documentIndex: 4
-      - equal:
-          path: spec.template.spec.joinConfiguration.nodeRegistration.kubeletExtraArgs.eviction-minimum-reclaim
-          value: "memory.available=256Mi"
-        documentIndex: 4
-
-  ################################################
-  # Mixed eviction threshold types must be rejected
-  ################################################
-
-  - it: rejects mixed eviction types (hard absolute, soft percentage)
-    release:
-      name: test-k8s
-      namespace: tenant-test
-    set:
-      _namespace:
-        etcd: etcd
-        ingress: nginx
-        host: example.com
-      _cluster:
-        cluster-domain: cozy.local
-      nodeGroups:
-        md0:
-          minReplicas: 0
-          maxReplicas: 10
-          instanceType: ""
-          diskSize: 20Gi
-          roles:
-            - worker
-          resources: {}
-          kubelet:
-            evictionHardMemory: "1Gi"
-            evictionSoftMemory: "10%"
-    asserts:
-      - failedTemplate:
-          errorMessage: "nodeGroup md0: evictionHardMemory (1Gi) and evictionSoftMemory (10%) must use the same unit type (both percentage or both absolute)"
-
-  - it: rejects mixed eviction types reversed (hard percentage, soft absolute)
-    release:
-      name: test-k8s
-      namespace: tenant-test
-    set:
-      _namespace:
-        etcd: etcd
-        ingress: nginx
-        host: example.com
-      _cluster:
-        cluster-domain: cozy.local
-      nodeGroups:
-        md0:
-          minReplicas: 0
-          maxReplicas: 10
-          instanceType: ""
-          diskSize: 20Gi
-          roles:
-            - worker
-          resources: {}
-          kubelet:
-            evictionHardMemory: "10%"
-            evictionSoftMemory: "1Gi"
-    asserts:
-      - failedTemplate:
-          errorMessage: "nodeGroup md0: evictionHardMemory (10%) and evictionSoftMemory (1Gi) must use the same unit type (both percentage or both absolute)"
-
-  ################################################
-  # Reservation field format validation          #
-  ################################################
-
-  - it: rejects invalid CPU format for kubeReservedCpu
-    release:
-      name: test-k8s
-      namespace: tenant-test
-    set:
-      _namespace:
-        etcd: etcd
-        ingress: nginx
-        host: example.com
-      _cluster:
-        cluster-domain: cozy.local
-      nodeGroups:
-        md0:
-          minReplicas: 0
-          maxReplicas: 10
-          instanceType: ""
-          diskSize: 20Gi
-          roles:
-            - worker
-          resources: {}
-          kubelet:
-            kubeReservedCpu: "banana"
-    asserts:
-      - failedTemplate:
-          errorMessage: "nodeGroup md0: invalid kubeReservedCpu value \"banana\" — must be a valid Kubernetes CPU quantity (integer millicores like 100m, or decimal cores like 0.5, 1)"
-
-  - it: rejects invalid memory format for systemReservedMemory
-    release:
-      name: test-k8s
-      namespace: tenant-test
-    set:
-      _namespace:
-        etcd: etcd
-        ingress: nginx
-        host: example.com
-      _cluster:
-        cluster-domain: cozy.local
-      nodeGroups:
-        md0:
-          minReplicas: 0
-          maxReplicas: 10
-          instanceType: ""
-          diskSize: 20Gi
-          roles:
-            - worker
-          resources: {}
-          kubelet:
-            systemReservedMemory: "abc"
-    asserts:
-      - failedTemplate:
-          errorMessage: "nodeGroup md0: invalid systemReservedMemory value \"abc\" — must be a valid Kubernetes memory quantity (e.g. 128Mi, 1Gi, 1e9, 500e6)"
-
-  ################################################
-  # Multi-nodeGroup isolation test               #
-  ################################################
-
-  - it: renders independent kubelet args for multiple node groups
-    release:
-      name: test-k8s
-      namespace: tenant-test
-    set:
-      _namespace:
-        etcd: etcd
-        ingress: nginx
-        host: example.com
-      _cluster:
-        cluster-domain: cozy.local
-      nodeGroups:
-        md0:
-          minReplicas: 0
-          maxReplicas: 10
-          instanceType: ""
-          diskSize: 20Gi
-          roles:
-            - worker
-          resources: {}
-        md1:
-          minReplicas: 1
-          maxReplicas: 5
-          instanceType: ""
-          diskSize: 40Gi
-          roles:
-            - worker
-          resources:
-            memory: "8Gi"
-            cpu: 4
-          kubelet:
-            systemReservedMemory: "512Mi"
-            kubeReservedMemory: "256Mi"
-            systemReservedCpu: "200m"
-            kubeReservedCpu: "150m"
-            evictionHardMemory: "5%"
-            evictionSoftMemory: "15%"
-    asserts:
-      # md0 at documentIndex 4: defaults
-      - isKind:
-          of: KubeadmConfigTemplate
-        documentIndex: 4
-      - equal:
-          path: metadata.name
-          value: test-k8s-md0
-        documentIndex: 4
-      - equal:
-          path: spec.template.spec.joinConfiguration.nodeRegistration.kubeletExtraArgs.system-reserved
-          value: "memory=256Mi,cpu=50m"
-        documentIndex: 4
-      - equal:
-          path: spec.template.spec.joinConfiguration.nodeRegistration.kubeletExtraArgs.kube-reserved
-          value: "memory=256Mi,cpu=50m"
-        documentIndex: 4
-      - equal:
-          path: spec.template.spec.joinConfiguration.nodeRegistration.kubeletExtraArgs.eviction-hard
-          value: "memory.available<7%,nodefs.available<10%,imagefs.available<15%,nodefs.inodesFree<5%"
-        documentIndex: 4
-      - equal:
-          path: spec.template.spec.joinConfiguration.nodeRegistration.kubeletExtraArgs.eviction-soft
-          value: "memory.available<10%,nodefs.available<15%,imagefs.available<20%"
-        documentIndex: 4
-      # md1 at documentIndex 9: custom overrides
-      # (each nodeGroup emits 5 documents: KubeadmConfigTemplate, KubevirtMachineTemplate,
-      #  MachineDeployment, MachineHealthCheck, WorkloadMonitor)
-      - isKind:
-          of: KubeadmConfigTemplate
-        documentIndex: 9
-      - equal:
-          path: metadata.name
-          value: test-k8s-md1
-        documentIndex: 9
-      - equal:
-          path: spec.template.spec.joinConfiguration.nodeRegistration.kubeletExtraArgs.system-reserved
-          value: "memory=512Mi,cpu=200m"
-        documentIndex: 9
-      - equal:
-          path: spec.template.spec.joinConfiguration.nodeRegistration.kubeletExtraArgs.kube-reserved
-          value: "memory=256Mi,cpu=150m"
-        documentIndex: 9
-      - equal:
-          path: spec.template.spec.joinConfiguration.nodeRegistration.kubeletExtraArgs.eviction-hard
-          value: "memory.available<5%,nodefs.available<10%,imagefs.available<15%,nodefs.inodesFree<5%"
-        documentIndex: 9
-      - equal:
-          path: spec.template.spec.joinConfiguration.nodeRegistration.kubeletExtraArgs.eviction-soft
-          value: "memory.available<15%,nodefs.available<15%,imagefs.available<20%"
-        documentIndex: 9
-
-  ################################################
-  # Absolute eviction format validation          #
-  ################################################
-
-  - it: rejects invalid format for absolute evictionHardMemory
-    release:
-      name: test-k8s
-      namespace: tenant-test
-    set:
-      _namespace:
-        etcd: etcd
-        ingress: nginx
-        host: example.com
-      _cluster:
-        cluster-domain: cozy.local
-      nodeGroups:
-        md0:
-          minReplicas: 0
-          maxReplicas: 10
-          instanceType: ""
-          diskSize: 20Gi
-          roles:
-            - worker
-          resources: {}
-          kubelet:
-            evictionHardMemory: "banana"
-            evictionSoftMemory: "500Mi"
-    asserts:
-      - failedTemplate:
-          errorMessage: "nodeGroup md0: invalid evictionHardMemory value \"banana\" — must be a percentage (e.g. 7%) or a valid Kubernetes memory quantity (e.g. 500Mi, 1Gi, 1e9)"
-
-  - it: rejects invalid format for absolute evictionSoftMemory
-    release:
-      name: test-k8s
-      namespace: tenant-test
-    set:
-      _namespace:
-        etcd: etcd
-        ingress: nginx
-        host: example.com
-      _cluster:
-        cluster-domain: cozy.local
-      nodeGroups:
-        md0:
-          minReplicas: 0
-          maxReplicas: 10
-          instanceType: ""
-          diskSize: 20Gi
-          roles:
-            - worker
-          resources: {}
-          kubelet:
-            evictionHardMemory: "200Mi"
-            evictionSoftMemory: "not-a-quantity"
-    asserts:
-      - failedTemplate:
-          errorMessage: "nodeGroup md0: invalid evictionSoftMemory value \"not-a-quantity\" — must be a percentage (e.g. 10%) or a valid Kubernetes memory quantity (e.g. 500Mi, 1Gi, 1e9)"
-
-  - it: accepts valid absolute eviction thresholds with correct format
-    release:
-      name: test-k8s
-      namespace: tenant-test
-    set:
-      _namespace:
-        etcd: etcd
-        ingress: nginx
-        host: example.com
-      _cluster:
-        cluster-domain: cozy.local
-      nodeGroups:
-        md0:
-          minReplicas: 0
-          maxReplicas: 10
-          instanceType: ""
-          diskSize: 20Gi
-          roles:
-            - worker
-          resources:
-            memory: "8Gi"
-          kubelet:
-            evictionHardMemory: "500Mi"
-            evictionSoftMemory: "1Gi"
-    asserts:
-      - equal:
-          path: spec.template.spec.joinConfiguration.nodeRegistration.kubeletExtraArgs.eviction-hard
-          value: "memory.available<500Mi,nodefs.available<10%,imagefs.available<15%,nodefs.inodesFree<5%"
-        documentIndex: 4
-      - equal:
-          path: spec.template.spec.joinConfiguration.nodeRegistration.kubeletExtraArgs.eviction-soft
-          value: "memory.available<1Gi,nodefs.available<15%,imagefs.available<20%"
-        documentIndex: 4
-
-  ####################################################
-  # Eviction percentage range validation             #
-  ####################################################
-
-  - it: rejects non-numeric evictionHardMemory percentage
-    release:
-      name: test-k8s
-      namespace: tenant-test
-    set:
-      _namespace:
-        etcd: etcd
-        ingress: nginx
-        host: example.com
-      _cluster:
-        cluster-domain: cozy.local
-      nodeGroups:
-        md0:
-          minReplicas: 0
-          maxReplicas: 10
-          instanceType: ""
-          diskSize: 20Gi
-          roles:
-            - worker
-          resources: {}
-          kubelet:
-            evictionHardMemory: "abc%"
-            evictionSoftMemory: "10%"
-    asserts:
-      - failedTemplate:
-          errorMessage: "nodeGroup md0: evictionHardMemory percentage value \"abc\" is not a valid number"
-
-  - it: rejects evictionHardMemory percentage over 100
-    release:
-      name: test-k8s
-      namespace: tenant-test
-    set:
-      _namespace:
-        etcd: etcd
-        ingress: nginx
-        host: example.com
-      _cluster:
-        cluster-domain: cozy.local
-      nodeGroups:
-        md0:
-          minReplicas: 0
-          maxReplicas: 10
-          instanceType: ""
-          diskSize: 20Gi
-          roles:
-            - worker
-          resources: {}
-          kubelet:
-            evictionHardMemory: "150%"
-            evictionSoftMemory: "200%"
-    asserts:
-      - failedTemplate:
-          errorMessage: "nodeGroup md0: evictionHardMemory percentage must be greater than 0 and at most 100, got 150%"
-
-  - it: rejects evictionSoftMemory percentage over 100
-    release:
-      name: test-k8s
-      namespace: tenant-test
-    set:
-      _namespace:
-        etcd: etcd
-        ingress: nginx
-        host: example.com
-      _cluster:
-        cluster-domain: cozy.local
-      nodeGroups:
-        md0:
-          minReplicas: 0
-          maxReplicas: 10
-          instanceType: ""
-          diskSize: 20Gi
-          roles:
-            - worker
-          resources: {}
-          kubelet:
-            evictionHardMemory: "5%"
-            evictionSoftMemory: "150%"
-    asserts:
-      - failedTemplate:
-          errorMessage: "nodeGroup md0: evictionSoftMemory percentage must be greater than 0 and at most 100, got 150%"
-
-  - it: rejects evictionHardMemory percentage of zero
-    release:
-      name: test-k8s
-      namespace: tenant-test
-    set:
-      _namespace:
-        etcd: etcd
-        ingress: nginx
-        host: example.com
-      _cluster:
-        cluster-domain: cozy.local
-      nodeGroups:
-        md0:
-          minReplicas: 0
-          maxReplicas: 10
-          instanceType: ""
-          diskSize: 20Gi
-          roles:
-            - worker
-          resources: {}
-          kubelet:
-            evictionHardMemory: "0%"
-            evictionSoftMemory: "10%"
-    asserts:
-      - failedTemplate:
-          errorMessage: "nodeGroup md0: evictionHardMemory percentage must be greater than 0 and at most 100, got 0%"
-
-  - it: rejects negative evictionHardMemory percentage
-    release:
-      name: test-k8s
-      namespace: tenant-test
-    set:
-      _namespace:
-        etcd: etcd
-        ingress: nginx
-        host: example.com
-      _cluster:
-        cluster-domain: cozy.local
-      nodeGroups:
-        md0:
-          minReplicas: 0
-          maxReplicas: 10
-          instanceType: ""
-          diskSize: 20Gi
-          roles:
-            - worker
-          resources: {}
-          kubelet:
-            evictionHardMemory: "-5%"
-            evictionSoftMemory: "10%"
-    asserts:
-      - failedTemplate:
-          errorMessage: "nodeGroup md0: evictionHardMemory percentage value \"-5\" is not a valid number"
-
-  ####################################################
-  # Reserved memory exceeds node memory validation   #
-  ####################################################
-
-  - it: rejects reserved memory exceeding effective node memory
-    release:
-      name: test-k8s
-      namespace: tenant-test
-    set:
-      _namespace:
-        etcd: etcd
-        ingress: nginx
-        host: example.com
-      _cluster:
-        cluster-domain: cozy.local
-      nodeGroups:
-        md0:
-          minReplicas: 0
-          maxReplicas: 10
-          instanceType: ""
-          diskSize: 20Gi
-          roles:
-            - worker
-          resources:
-            memory: "1Gi"
-          kubelet:
-            systemReservedMemory: "512Mi"
-            kubeReservedMemory: "600Mi"
-    asserts:
-      # 1Gi = 1024Mi, 512+600+71(7% eviction) = 1183 > 1024
-      - failedTemplate:
-          errorMessage: "nodeGroup md0: total reserved memory (systemReservedMemory=512Mi + kubeReservedMemory=600Mi + evictionHardMemory=7%) must be less than effective node memory (1Gi)"
-
-  - it: rejects reserved memory equal to effective node memory
-    release:
-      name: test-k8s
-      namespace: tenant-test
-    set:
-      _namespace:
-        etcd: etcd
-        ingress: nginx
-        host: example.com
-      _cluster:
-        cluster-domain: cozy.local
-      nodeGroups:
-        md0:
-          minReplicas: 0
-          maxReplicas: 10
-          instanceType: ""
-          diskSize: 20Gi
-          roles:
-            - worker
-          resources:
-            memory: "1Gi"
-          kubelet:
-            systemReservedMemory: "512Mi"
-            kubeReservedMemory: "512Mi"
-    asserts:
-      # 1Gi = 1024Mi, 512+512+71(7% eviction) = 1095 > 1024
-      - failedTemplate:
-          errorMessage: "nodeGroup md0: total reserved memory (systemReservedMemory=512Mi + kubeReservedMemory=512Mi + evictionHardMemory=7%) must be less than effective node memory (1Gi)"
-
-  - it: allows reserved memory within effective node memory bounds
-    release:
-      name: test-k8s
-      namespace: tenant-test
-    set:
-      _namespace:
-        etcd: etcd
-        ingress: nginx
-        host: example.com
-      _cluster:
-        cluster-domain: cozy.local
-      nodeGroups:
-        md0:
-          minReplicas: 0
-          maxReplicas: 10
-          instanceType: ""
-          diskSize: 20Gi
-          roles:
-            - worker
-          resources:
-            memory: "4Gi"
-          kubelet:
-            systemReservedMemory: "512Mi"
-            kubeReservedMemory: "512Mi"
-    asserts:
-      - equal:
-          path: spec.template.spec.joinConfiguration.nodeRegistration.kubeletExtraArgs.system-reserved
-          value: "memory=512Mi,cpu=50m"
-        documentIndex: 4
-      - equal:
-          path: spec.template.spec.joinConfiguration.nodeRegistration.kubeletExtraArgs.kube-reserved
-          value: "memory=512Mi,cpu=50m"
-        documentIndex: 4
-
-  ################################################################
-  # Overrides without effective memory must be rejected          #
-  ################################################################
-
-  - it: rejects kubelet overrides when no effective memory is available
-    release:
-      name: test-k8s
-      namespace: tenant-test
-    set:
-      _namespace:
-        etcd: etcd
-        ingress: nginx
-        host: example.com
-      _cluster:
-        cluster-domain: cozy.local
-      nodeGroups:
-        md0:
-          minReplicas: 0
-          maxReplicas: 10
-          instanceType: ""
-          diskSize: 20Gi
-          roles:
-            - worker
-          resources: {}
-          kubelet:
-            systemReservedMemory: "1Gi"
-    asserts:
-      - failedTemplate:
-          errorMessage: "nodeGroup md0: kubelet memory reservations require effective memory to validate — set resources.memory or instanceType"
-
-  #############################################################
-  # Eviction thresholds interaction with explicit reservations
-  #############################################################
-
-  - it: renders aggressive absolute eviction with explicit reservations on node
-    release:
-      name: test-k8s
-      namespace: tenant-test
-    set:
-      _namespace:
-        etcd: etcd
-        ingress: nginx
-        host: example.com
-      _cluster:
-        cluster-domain: cozy.local
-      nodeGroups:
-        md0:
-          minReplicas: 0
-          maxReplicas: 10
-          instanceType: ""
-          diskSize: 20Gi
-          roles:
-            - worker
-          resources:
-            memory: "8Gi"
-          kubelet:
-            systemReservedMemory: "512Mi"
-            kubeReservedMemory: "512Mi"
-            evictionHardMemory: "3Gi"
-            evictionSoftMemory: "3.5Gi"
-    asserts:
-      # 8Gi node, 1Gi reserved, 3Gi hard eviction — total 4Gi < 8Gi, passes validation.
-      - equal:
-          path: spec.template.spec.joinConfiguration.nodeRegistration.kubeletExtraArgs.system-reserved
-          value: "memory=512Mi,cpu=50m"
-        documentIndex: 4
-      - equal:
-          path: spec.template.spec.joinConfiguration.nodeRegistration.kubeletExtraArgs.kube-reserved
-          value: "memory=512Mi,cpu=50m"
-        documentIndex: 4
-      - equal:
-          path: spec.template.spec.joinConfiguration.nodeRegistration.kubeletExtraArgs.eviction-hard
-          value: "memory.available<3Gi,nodefs.available<10%,imagefs.available<15%,nodefs.inodesFree<5%"
-        documentIndex: 4
-      - equal:
-          path: spec.template.spec.joinConfiguration.nodeRegistration.kubeletExtraArgs.eviction-soft
-          value: "memory.available<3.5Gi,nodefs.available<15%,imagefs.available<20%"
-        documentIndex: 4
-
-  - it: renders reasonable absolute eviction with explicit reservations
-    release:
-      name: test-k8s
-      namespace: tenant-test
-    set:
-      _namespace:
-        etcd: etcd
-        ingress: nginx
-        host: example.com
-      _cluster:
-        cluster-domain: cozy.local
-      nodeGroups:
-        md0:
-          minReplicas: 0
-          maxReplicas: 10
-          instanceType: ""
-          diskSize: 20Gi
-          roles:
-            - worker
-          resources:
-            memory: "8Gi"
-          kubelet:
-            systemReservedMemory: "512Mi"
-            kubeReservedMemory: "512Mi"
-            evictionHardMemory: "512Mi"
-            evictionSoftMemory: "1Gi"
-    asserts:
-      # 8Gi node, 1Gi reserved, 512Mi hard / 1Gi soft — typical production config.
-      - equal:
-          path: spec.template.spec.joinConfiguration.nodeRegistration.kubeletExtraArgs.system-reserved
-          value: "memory=512Mi,cpu=50m"
-        documentIndex: 4
-      - equal:
-          path: spec.template.spec.joinConfiguration.nodeRegistration.kubeletExtraArgs.kube-reserved
-          value: "memory=512Mi,cpu=50m"
-        documentIndex: 4
-      - equal:
-          path: spec.template.spec.joinConfiguration.nodeRegistration.kubeletExtraArgs.eviction-hard
-          value: "memory.available<512Mi,nodefs.available<10%,imagefs.available<15%,nodefs.inodesFree<5%"
-        documentIndex: 4
-      - equal:
-          path: spec.template.spec.joinConfiguration.nodeRegistration.kubeletExtraArgs.eviction-soft
-          value: "memory.available<1Gi,nodefs.available<15%,imagefs.available<20%"
-        documentIndex: 4
-
-  ####################################################
-  # Capacity annotation: default auto-computation    #
-  ####################################################
-
-  - it: sets capacity.memory annotation with default auto-computed reservations (4Gi)
-    release:
-      name: test-k8s
-      namespace: tenant-test
-    set:
-      _namespace:
-        etcd: etcd
-        ingress: nginx
-        host: example.com
-      _cluster:
-        cluster-domain: cozy.local
-      nodeGroups:
-        md0:
-          minReplicas: 0
-          maxReplicas: 10
-          instanceType: ""
-          diskSize: 20Gi
-          roles:
-            - worker
-          resources:
-            memory: "4Gi"
-    asserts:
-      # 4Gi = 4096Mi; 5% = 204Mi -> clamped to 256Mi floor
-      # systemReserved=256Mi, kubeReserved=256Mi, evictionHard=7% of 4Gi
-      # allocatable = floor(4096 - 256 - 256 - 286.72) = floor(3297.28) = 3297Mi
-      - isKind:
-          of: MachineDeployment
-        documentIndex: 6
-      - equal:
-          path: metadata.annotations["capacity.cluster-autoscaler.kubernetes.io/memory"]
-          value: "3297Mi"
-        documentIndex: 6
-
-  - it: sets capacity.memory annotation with explicit reservation overrides (8Gi)
-    release:
-      name: test-k8s
-      namespace: tenant-test
-    set:
-      _namespace:
-        etcd: etcd
-        ingress: nginx
-        host: example.com
-      _cluster:
-        cluster-domain: cozy.local
-      nodeGroups:
-        md0:
-          minReplicas: 0
-          maxReplicas: 10
-          instanceType: ""
-          diskSize: 20Gi
-          roles:
-            - worker
-          resources:
-            memory: "8Gi"
-          kubelet:
-            systemReservedMemory: "1Gi"
-            kubeReservedMemory: "512Mi"
-    asserts:
-      # 8Gi = 8192Mi; systemReserved=1Gi, kubeReserved=512Mi, evictionHard=7% of 8Gi
-      # allocatable = floor(8192 - 1024 - 512 - 573.44) = floor(6082.56) = 6082Mi
-      - isKind:
-          of: MachineDeployment
-        documentIndex: 6
-      - equal:
-          path: metadata.annotations["capacity.cluster-autoscaler.kubernetes.io/memory"]
-          value: "6082Mi"
-        documentIndex: 6
-
-  - it: omits capacity.memory annotation when no memory info is available
-    release:
-      name: test-k8s
-      namespace: tenant-test
-    set:
-      _namespace:
-        etcd: etcd
-        ingress: nginx
-        host: example.com
-      _cluster:
-        cluster-domain: cozy.local
-      nodeGroups:
-        md0:
-          minReplicas: 0
-          maxReplicas: 10
-          instanceType: ""
-          diskSize: 20Gi
-          roles:
-            - worker
-          resources: {}
-    asserts:
-      - isKind:
-          of: MachineDeployment
-        documentIndex: 6
-      - isNull:
-          path: metadata.annotations["capacity.cluster-autoscaler.kubernetes.io/memory"]
-        documentIndex: 6
-
-  - it: omits capacity.cpu annotation when no cpu info is available
-    release:
-      name: test-k8s
-      namespace: tenant-test
-    set:
-      _namespace:
-        etcd: etcd
-        ingress: nginx
-        host: example.com
-      _cluster:
-        cluster-domain: cozy.local
-      nodeGroups:
-        md0:
-          minReplicas: 0
-          maxReplicas: 10
-          instanceType: ""
-          diskSize: 20Gi
-          roles:
-            - worker
-          resources: {}
-    asserts:
-      - isKind:
-          of: MachineDeployment
-        documentIndex: 6
-      - isNull:
-          path: metadata.annotations["capacity.cluster-autoscaler.kubernetes.io/cpu"]
-        documentIndex: 6
-
-  ####################################################
-  # Capacity annotation: floor gives safe under-approximation
-  ####################################################
-
-  - it: reports non-zero capacity annotation when reservations consume most memory
-    release:
-      name: test-k8s
-      namespace: tenant-test
-    set:
-      _namespace:
-        etcd: etcd
-        ingress: nginx
-        host: example.com
-      _cluster:
-        cluster-domain: cozy.local
-      nodeGroups:
-        md0:
-          minReplicas: 0
-          maxReplicas: 10
-          instanceType: ""
-          diskSize: 20Gi
-          roles:
-            - worker
-          resources:
-            memory: "2.5Gi"
-          kubelet:
-            systemReservedMemory: "1Gi"
-            kubeReservedMemory: "1Gi"
-    asserts:
-      # 2.5Gi = 2560Mi. Reserved: 1Gi + 1Gi + 7% of 2560Mi (179.2Mi) = 2359.2Mi.
-      # Remaining: ~200.8Mi. floor gives a safe under-approximation for cluster-autoscaler.
-      - isKind:
-          of: MachineDeployment
-        documentIndex: 6
-      - notEqual:
-          path: metadata.annotations["capacity.cluster-autoscaler.kubernetes.io/memory"]
-          value: "0Mi"
-        documentIndex: 6
-      - matchRegex:
-          path: metadata.annotations["capacity.cluster-autoscaler.kubernetes.io/memory"]
-          pattern: "^\\d+Mi$"
-        documentIndex: 6
-
-  ####################################################
-  # instanceType validation                          #
-  ####################################################
-
-  # NOTE: The instanceType-based auto-computation path (where resources.memory is
-  # absent and instanceType points to a VirtualMachineClusterInstancetype CR whose
-  # .spec.memory.guest is used as $effectiveMemory) is not exercised here.
-  #
-  # The template uses Helm's `lookup` function to fetch the instancetype CR
-  # (cluster.yaml line ~187). helm-unittest v1.0.3+ does support `lookup` via
-  # the top-level `kubernetesProvider` field (see
-  # `packages/core/platform/tests/bundles_proxy_protocol_lookup_test.yaml`
-  # for an example), but the assertions for the auto-computation arithmetic
-  # are simpler to express with explicit resources.memory values, so all
-  # reservation tests above use that path.
-  #
-  # All reservation auto-computation tests above use resources.memory directly,
-  # which exercises the same 5%-clamp logic that the instanceType path uses.
-  # The instanceType resolution itself is validated via e2e tests that deploy
-  # against a real cluster with instancetype CRs present.
-
-  - it: fails when instanceType is specified but not found in cluster
-    release:
-      name: test-k8s
-      namespace: tenant-test
-    set:
-      _namespace:
-        etcd: etcd
-        ingress: nginx
-        host: example.com
-      _cluster:
-        cluster-domain: cozy.local
-      nodeGroups:
-        md0:
-          minReplicas: 0
-          maxReplicas: 10
-          instanceType: "u1.medium"
-          diskSize: 20Gi
-          roles:
-            - worker
-          resources: {}
-    asserts:
-      - failedTemplate:
-          errorMessage: "nodeGroup md0: specified instanceType \"u1.medium\" not found in cluster"
-
-  ####################################################
-  # CPU auto-computation from resources.cpu          #
-  ####################################################
-
-  - it: auto-computes CPU reservation from resources.cpu (4 cores -> 200m each)
-    release:
-      name: test-k8s
-      namespace: tenant-test
-    set:
-      _namespace:
-        etcd: etcd
-        ingress: nginx
-        host: example.com
-      _cluster:
-        cluster-domain: cozy.local
-      nodeGroups:
-        md0:
-          minReplicas: 0
-          maxReplicas: 10
-          instanceType: ""
-          diskSize: 20Gi
-          roles:
-            - worker
-          resources:
-            memory: "8Gi"
-            cpu: 4
-    asserts:
-      # 4 cores = 4000m, 5% = 200m
-      - equal:
-          path: spec.template.spec.joinConfiguration.nodeRegistration.kubeletExtraArgs.system-reserved
-          value: "memory=409Mi,cpu=200m"
-        documentIndex: 4
-      - equal:
-          path: spec.template.spec.joinConfiguration.nodeRegistration.kubeletExtraArgs.kube-reserved
-          value: "memory=409Mi,cpu=200m"
-        documentIndex: 4
-
-  ##################################
-  # CPU clamp logic: 50m floor     #
-  ##################################
-
-  - it: clamps auto-computed CPU reservation to 50m floor (1 core)
-    release:
-      name: test-k8s
-      namespace: tenant-test
-    set:
-      _namespace:
-        etcd: etcd
-        ingress: nginx
-        host: example.com
-      _cluster:
-        cluster-domain: cozy.local
-      nodeGroups:
-        md0:
-          minReplicas: 0
-          maxReplicas: 10
-          instanceType: ""
-          diskSize: 20Gi
-          roles:
-            - worker
-          resources:
-            memory: "4Gi"
-            cpu: 1
-    asserts:
-      # 1 core = 1000m, 5% = 50m — exactly at floor
-      - equal:
-          path: spec.template.spec.joinConfiguration.nodeRegistration.kubeletExtraArgs.system-reserved
-          value: "memory=256Mi,cpu=50m"
-        documentIndex: 4
-      - equal:
-          path: spec.template.spec.joinConfiguration.nodeRegistration.kubeletExtraArgs.kube-reserved
-          value: "memory=256Mi,cpu=50m"
-        documentIndex: 4
-
-  ##################################
-  # CPU clamp logic: 500m ceiling  #
-  ##################################
-
-  - it: clamps auto-computed CPU reservation to 500m ceiling (20 cores)
-    release:
-      name: test-k8s
-      namespace: tenant-test
-    set:
-      _namespace:
-        etcd: etcd
-        ingress: nginx
-        host: example.com
-      _cluster:
-        cluster-domain: cozy.local
-      nodeGroups:
-        md0:
-          minReplicas: 0
-          maxReplicas: 10
-          instanceType: ""
-          diskSize: 20Gi
-          roles:
-            - worker
-          resources:
-            memory: "32Gi"
-            cpu: 20
-    asserts:
-      # 20 cores = 20000m, 5% = 1000m, capped to 500m
-      - equal:
-          path: spec.template.spec.joinConfiguration.nodeRegistration.kubeletExtraArgs.system-reserved
-          value: "memory=1024Mi,cpu=500m"
-        documentIndex: 4
-      - equal:
-          path: spec.template.spec.joinConfiguration.nodeRegistration.kubeletExtraArgs.kube-reserved
-          value: "memory=1024Mi,cpu=500m"
-        documentIndex: 4
-
-  ####################################################
-  # CPU total validation: exceeds effective CPU      #
-  ####################################################
-
-  - it: rejects reserved CPU exceeding effective node CPU
-    release:
-      name: test-k8s
-      namespace: tenant-test
-    set:
-      _namespace:
-        etcd: etcd
-        ingress: nginx
-        host: example.com
-      _cluster:
-        cluster-domain: cozy.local
-      nodeGroups:
-        md0:
-          minReplicas: 0
-          maxReplicas: 10
-          instanceType: ""
-          diskSize: 20Gi
-          roles:
-            - worker
-          resources:
-            memory: "8Gi"
-            cpu: 2
-          kubelet:
-            systemReservedCpu: "1200m"
-            kubeReservedCpu: "1200m"
-    asserts:
-      # 2 cores = 2000m, 1200+1200 = 2400 > 2000 -> fails
-      - failedTemplate:
-          errorMessage: "nodeGroup md0: total reserved CPU (systemReservedCpu=1200m + kubeReservedCpu=1200m) must be less than effective node CPU (2 cores)"
-
-  ################################################################
-  # CPU override guard: CPU overrides without effective CPU      #
-  ################################################################
-
-  - it: rejects kubelet CPU overrides when no effective CPU is available
-    release:
-      name: test-k8s
-      namespace: tenant-test
-    set:
-      _namespace:
-        etcd: etcd
-        ingress: nginx
-        host: example.com
-      _cluster:
-        cluster-domain: cozy.local
-      nodeGroups:
-        md0:
-          minReplicas: 0
-          maxReplicas: 10
-          instanceType: ""
-          diskSize: 20Gi
-          roles:
-            - worker
-          resources: {}
-          kubelet:
-            systemReservedCpu: "200m"
-    asserts:
-      - failedTemplate:
-          errorMessage: "nodeGroup md0: cannot validate kubelet CPU reservations without effective CPU — set resources.cpu or a valid instanceType"
-
-  ########################################################
-  # Default CPU: no resources/instanceType -> 50m        #
-  ########################################################
-
-  - it: defaults to 50m CPU reservation when no resources or instanceType
-    release:
-      name: test-k8s
-      namespace: tenant-test
-    set:
-      _namespace:
-        etcd: etcd
-        ingress: nginx
-        host: example.com
-      _cluster:
-        cluster-domain: cozy.local
-      nodeGroups:
-        md0:
-          minReplicas: 0
-          maxReplicas: 10
-          instanceType: ""
-          diskSize: 20Gi
-          roles:
-            - worker
-          resources: {}
-    asserts:
-      - equal:
-          path: spec.template.spec.joinConfiguration.nodeRegistration.kubeletExtraArgs.system-reserved
-          value: "memory=256Mi,cpu=50m"
-        documentIndex: 4
-      - equal:
-          path: spec.template.spec.joinConfiguration.nodeRegistration.kubeletExtraArgs.kube-reserved
-          value: "memory=256Mi,cpu=50m"
-        documentIndex: 4
-
-  - it: computes CPU capacity annotation correctly with whole-core input
-    release:
-      name: test-k8s
-      namespace: tenant-test
-    set:
-      _namespace:
-        etcd: etcd
-        ingress: nginx
-        host: example.com
-      _cluster:
-        cluster-domain: cozy.local
-      nodeGroups:
-        md0:
-          minReplicas: 0
-          maxReplicas: 10
-          instanceType: ""
-          diskSize: 20Gi
-          roles: []
-          gpus: []
-          kubelet: {}
-          resources:
-            cpu: 4
-            memory: "8Gi"
-    asserts:
-      - documentIndex: 6
-        isKind:
-          of: MachineDeployment
-      - documentIndex: 6
-        equal:
-          path: metadata.annotations["capacity.cluster-autoscaler.kubernetes.io/cpu"]
-          value: "3600m"
-
-  - it: computes CPU capacity annotation correctly with millicore input
-    release:
-      name: test-k8s
-      namespace: tenant-test
-    set:
-      _namespace:
-        etcd: etcd
-        ingress: nginx
-        host: example.com
-      _cluster:
-        cluster-domain: cozy.local
-      nodeGroups:
-        md0:
-          minReplicas: 0
-          maxReplicas: 10
-          instanceType: ""
-          diskSize: 20Gi
-          roles: []
-          gpus: []
-          kubelet: {}
-          resources:
-            cpu: "4000m"
-            memory: "8Gi"
-    asserts:
-      - documentIndex: 6
-        isKind:
-          of: MachineDeployment
-      - documentIndex: 6
-        equal:
-          path: metadata.annotations["capacity.cluster-autoscaler.kubernetes.io/cpu"]
-          value: "3600m"
diff --git a/packages/apps/kubernetes/tests/oidc_test.yaml b/packages/apps/kubernetes/tests/oidc_test.yaml
new file mode 100644
index 0000000000..0623063e75
--- /dev/null
+++ b/packages/apps/kubernetes/tests/oidc_test.yaml
@@ -0,0 +1,2759 @@
+suite: tenant kube-apiserver OIDC (Phase 1)
+
+values:
+  - values/common.yaml
+
+# In cluster.yaml the KamajiControlPlane is document index 1
+# (0: Cluster, 1: KamajiControlPlane, 2: WorkloadMonitor, 3: KubevirtCluster, ...).
+# Documents at higher indices are KubevirtMachineTemplate, MachineDeployment,
+# MachineHealthCheck, WorkloadMonitor per node group.
+
+tests:
+  ###############################################
+  # default: oidc.mode=None renders nothing     #
+  ###############################################
+
+  - it: emits no OIDC apiserver flag when oidc.mode is None
+    # extraArgs is always rendered (see apiserver_authentication_test — the
+    # explicit `[]` is required so a mode=System → mode=None upgrade REPLACES
+    # the previously-set `--authentication-config` flag on the CRD).
+    release:
+      name: test
+      namespace: tenant-test
+    template: templates/cluster.yaml
+    asserts:
+      - equal:
+          path: spec.apiServer.extraArgs
+          value: []
+        documentIndex: 1
+
+  - it: emits no chart-managed OIDC volume on the KamajiControlPlane when oidc.mode is None
+    release:
+      name: test
+      namespace: tenant-test
+    template: templates/cluster.yaml
+    asserts:
+      - lengthEqual:
+          path: spec.deployment.extraVolumes
+          count: 2
+        documentIndex: 1
+
+  - it: emits no Keycloak objects when oidc.mode is None
+    release:
+      name: test
+      namespace: tenant-test
+    template: templates/oidc-keycloak.yaml
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  - it: emits no AuthenticationConfiguration Secret when oidc.mode is None
+    release:
+      name: test
+      namespace: tenant-test
+    template: templates/oidc-authn-config.yaml
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  - it: renders bootstrap Job + KCP-normalizer scaffolding even when oidc.mode is None
+    # The Job is always rendered (SA + Role + RoleBinding + Job) so the mode=None
+    # branch of the script can force-clean the KamajiControlPlane's stale
+    # `authentication-config` volume that Kamaji's SSA field-ownership prevents
+    # Helm from removing. When mode=None the script skips the CRB+Secret
+    # branches after issuing the normalizing `kubectl patch`.
+    release:
+      name: test
+      namespace: tenant-test
+    template: templates/oidc-rbac-job.yaml
+    asserts:
+      - hasDocuments:
+          count: 4
+      - equal:
+          path: kind
+          value: ServiceAccount
+        documentIndex: 0
+      - equal:
+          path: kind
+          value: Job
+        documentIndex: 3
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: 'if \[ "\$OIDC_MODE" = "None" \]'
+        documentIndex: 3
+
+  - it: mode=None Keycloak cleanup probes the CRDs by output, not by exit code
+    # Regression guard. `kubectl api-resources --api-group=<absent group>` exits 0
+    # and prints an empty list, so an exit-code guard always falls through and the
+    # delete fails with `the server doesn't have a resource type "keycloakclient"`
+    # (--ignore-not-found covers a missing object, not an unknown type). As this
+    # Job is a post-install/post-upgrade hook, that failure blocks the Helm
+    # upgrade of every kubernetes-* release on clusters without the Keycloak
+    # operator — the default configuration.
+    release:
+      name: test
+      namespace: tenant-test
+    template: templates/oidc-rbac-job.yaml
+    asserts:
+      # The probe captures the discovery output ...
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: 'EDP_RESOURCES=\$\(kubectl api-resources --api-group=v1\.edp\.epam\.com --output=name'
+        documentIndex: 3
+      # ... and each delete is gated on its own resource type being present.
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: 'if echo "\$EDP_RESOURCES" \| grep -q ..keycloakclients\\\.'
+        documentIndex: 3
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: 'if echo "\$EDP_RESOURCES" \| grep -q ..keycloakclientscopes\\\.'
+        documentIndex: 3
+      # The broken exit-code guard must not come back.
+      - notMatchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: 'if kubectl api-resources --api-group=v1\.edp\.epam\.com >/dev/null'
+        documentIndex: 3
+
+  - it: emits no OIDC kubeconfig placeholder Secret when oidc.mode is None
+    release:
+      name: test
+      namespace: tenant-test
+    template: templates/oidc-kubeconfig-secret.yaml
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  ###############################################
+  # existing customer upgrade — vestigial fields #
+  ###############################################
+
+  - it: mode=None emits empty extraArgs so a System→None downgrade replaces the live array
+    # Guards against the Helm+CRD JSON-merge-patch pitfall — see cluster.yaml.
+    # If a customer previously set oidc.mode=System, the KCP got
+    # `--authentication-config` in extraArgs. Toggling mode=None must emit an
+    # empty `extraArgs: []` so the patch REPLACES the stale value. Silently
+    # omitting extraArgs would leave the live CRD unchanged and the tenant
+    # apiserver would keep the dangling flag.
+    release:
+      name: test
+      namespace: tenant-test
+    template: templates/cluster.yaml
+    set:
+      oidc.mode: None
+    asserts:
+      - equal:
+          path: spec.apiServer.extraArgs
+          value: []
+        documentIndex: 1
+      - equal:
+          path: spec.apiServer.extraVolumeMounts
+          value: []
+        documentIndex: 1
+      # deployment.extraVolumes always has the two chart-owned Talos volumes;
+      # the OIDC volume must NOT be there in mode=None.
+      - lengthEqual:
+          path: spec.deployment.extraVolumes
+          count: 2
+        documentIndex: 1
+
+  - it: unknown fields under oidc are silently ignored (existing customer upgrade path)
+    release:
+      name: test-legacy
+      namespace: tenant-test
+    template: templates/oidc-rbac-job.yaml
+    set:
+      # An existing CR carried over from an earlier OIDC API surface may still
+      # have the old `oidc.enabled: bool` field. The Phase-1 chart only reads
+      # `oidc.mode`; the vestigial field is silently ignored and mode defaults
+      # to None — the Job renders in normalize-only mode (no CRBs, no Secret
+      # patch, KCP volume cleanup only).
+      oidc.enabled: true
+    asserts:
+      - hasDocuments:
+          count: 4
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: 'if \[ "\$OIDC_MODE" = "None" \]'
+        documentIndex: 3
+
+  ###############################################
+  # mode: System — happy path                   #
+  ###############################################
+
+  - it: System mode renders the per-cluster KeycloakClient
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/oidc-keycloak.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+    capabilities:
+      apiVersions:
+        - v1.edp.epam.com/v1
+    asserts:
+      - isKind:
+          of: KeycloakClient
+        documentIndex: 1
+      - equal:
+          path: spec.clientId
+          value: tenant-foo-kubernetes-app
+        documentIndex: 1
+      - equal:
+          path: spec.public
+          value: true
+        documentIndex: 1
+      - equal:
+          path: spec.realmRef.name
+          value: keycloakrealm-cozy
+        documentIndex: 1
+      - equal:
+          path: spec.realmRef.kind
+          value: ClusterKeycloakRealm
+        documentIndex: 1
+      - equal:
+          path: spec.attributes["pkce.code.challenge.method"]
+          value: S256
+        documentIndex: 1
+      - contains:
+          path: spec.redirectUris
+          content: "http://localhost:8000"
+        documentIndex: 1
+      - contains:
+          path: spec.redirectUris
+          content: "http://localhost:18000"
+        documentIndex: 1
+
+  - it: System mode renders the per-cluster KeycloakClientScope with audience mapper
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/oidc-keycloak.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+    capabilities:
+      apiVersions:
+        - v1.edp.epam.com/v1
+    asserts:
+      - isKind:
+          of: KeycloakClientScope
+        documentIndex: 0
+      - equal:
+          path: spec.name
+          value: tenant-foo-kubernetes-app-audience
+        documentIndex: 0
+      - equal:
+          path: spec.protocolMappers[0].protocolMapper
+          value: oidc-audience-mapper
+        documentIndex: 0
+      - equal:
+          path: spec.protocolMappers[0].config["included.client.audience"]
+          value: tenant-foo-kubernetes-app
+        documentIndex: 0
+
+  - it: System mode skips Keycloak objects when the operator CRDs are absent
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/oidc-keycloak.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  - it: System mode renders the AuthenticationConfiguration Secret with the cozy issuer
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/oidc-authn-config.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+    asserts:
+      - isKind:
+          of: Secret
+      - equal:
+          path: metadata.name
+          value: kubernetes-app-oidc-authn-config
+      - matchRegex:
+          path: stringData["config.yaml"]
+          pattern: "url: https://keycloak.example.org/realms/cozy"
+      # Verified end-to-end: cozy realm's preferred_username is the
+      # Keycloak *username* (not the email), so a CRB subject sourced from
+      # users[].email would silently mis-authenticate. Lock the claim name.
+      - matchRegex:
+          path: stringData["config.yaml"]
+          pattern: "claim: email"
+      # Without a uid mapping upstream hands the user an empty UID, and the
+      # X-Remote-Uid header the chart publishes carries nothing across the
+      # aggregation layer. `sub` survives the email change the platform realm
+      # permits, which the username claim does not.
+      - matchRegex:
+          path: stringData["config.yaml"]
+          pattern: 'uid:\s+claim: sub'
+      - matchRegex:
+          path: stringData["config.yaml"]
+          pattern: "- tenant-foo-kubernetes-app"
+      # Cross-tenant isolation gate — the AuthenticationConfiguration
+      # must carry a CEL claimValidationRule keyed on the release's
+      # tenant-scoped groups. Without this rule, any authenticated
+      # cozy-realm user would land at `system:authenticated` on this
+      # tenant's apiserver and get discovery access. See
+      # kubernetes.oidc.groupsClaimValidationExpr in _helpers.tpl.
+      - matchRegex:
+          path: stringData["config.yaml"]
+          pattern: "claimValidationRules:"
+      # The groups range MUST be wrapped in dyn(): claims.groups is statically
+      # `any`, and the apiserver rejects a comprehension over `any` at startup
+      # (CrashLoop). Pinning dyn() here makes a regression fail the unit suite
+      # instead of only surfacing on a live apiserver. Verified on Kubernetes v1.32.
+      - matchRegex:
+          path: stringData["config.yaml"]
+          pattern: 'expression: .+has\(claims\.groups\).+dyn\(claims\.groups\)\.exists\(g, g in .+tenant-foo-view.+tenant-foo-use.+tenant-foo-admin.+tenant-foo-super-admin'
+      - matchRegex:
+          path: stringData["config.yaml"]
+          pattern: 'message: "user is not a member of any tenant-foo-\{view,use,admin,super-admin\} group'
+
+  - it: System mode injects --authentication-config and the chart-owned volume into the KCP
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/cluster.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+    asserts:
+      - contains:
+          path: spec.apiServer.extraArgs
+          content: "--authentication-config=/etc/kubernetes/authentication-config/config.yaml"
+        documentIndex: 1
+      - contains:
+          path: spec.apiServer.extraVolumeMounts
+          content:
+            name: authentication-config
+            mountPath: /etc/kubernetes/authentication-config
+            readOnly: true
+        documentIndex: 1
+      - lengthEqual:
+          path: spec.deployment.extraVolumes
+          count: 3
+        documentIndex: 1
+      - equal:
+          path: spec.deployment.extraVolumes[2].name
+          value: authentication-config
+        documentIndex: 1
+      - equal:
+          path: spec.deployment.extraVolumes[2].secret.secretName
+          value: kubernetes-app-oidc-authn-config
+        documentIndex: 1
+
+  - it: System mode pre-renders the OIDC kubeconfig Secret as a release-owned placeholder
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/oidc-kubeconfig-secret.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+    asserts:
+      - isKind:
+          of: Secret
+      - equal:
+          path: metadata.name
+          value: kubernetes-app-oidc-kubeconfig
+      - equal:
+          path: metadata.labels["app.kubernetes.io/managed-by"]
+          value: Helm
+      - matchRegex:
+          path: stringData.kubeconfig
+          pattern: "awaiting OIDC bootstrap Job"
+
+  - it: System mode hard-fails when platform OIDC is off
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/oidc-keycloak.yaml
+    set:
+      _cluster.oidc-enabled: "false"
+      _cluster.root-host: example.org
+      oidc.mode: System
+    asserts:
+      - failedTemplate:
+          errorMessage: "spec.oidc.mode: System requires the platform-level OIDC feature (authentication.oidc.enabled) — enable it in cozystack-values, or use mode: CustomConfig for a tenant-supplied issuer."
+
+  - it: System mode hard-fails cleanly when _cluster map has no oidc-enabled key
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/oidc-keycloak.yaml
+    set:
+      _cluster: {}
+      oidc.mode: System
+    asserts:
+      - failedTemplate:
+          errorMessage: "spec.oidc.mode: System requires the platform-level OIDC feature (authentication.oidc.enabled) — enable it in cozystack-values, or use mode: CustomConfig for a tenant-supplied issuer."
+
+  - it: fails when legacy --oidc-* flag collides with spec.oidc.mode
+    # Regression guard: kube-apiserver refuses to boot when both
+    # `--authentication-config` (chart-injected) and legacy `--oidc-*` flags
+    # are set. Existing customers who configured OIDC by hand through the
+    # `controlPlane.apiServer.extraArgs` passthrough would BOOT-FAIL on
+    # upgrade the moment they toggle spec.oidc.mode. Fail render instead.
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/cluster.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+      controlPlane.apiServer.extraArgs:
+        - "--oidc-issuer-url=https://legacy.example/realms/x"
+        - "--oidc-client-id=legacy"
+    asserts:
+      - failedTemplate:
+          errorMessage: 'controlPlane.apiServer.extraArgs contains "--oidc-issuer-url=https://legacy.example/realms/x" while spec.oidc.mode is "System" — the kube-apiserver refuses to boot with both --authentication-config (injected by spec.oidc) and legacy --oidc-* flags. Remove the --oidc-* flags from controlPlane.apiServer.extraArgs and use spec.oidc.mode: CustomConfig with a customConfig.config carrying the same issuer/audience if you need to override, or spec.oidc.mode: System for the platform cozy default.'
+
+  - it: fails when an explicit --authentication-config collides with spec.oidc.mode
+    # The chart injects this flag itself, and the tenant control plane keeps one
+    # entry per flag name, so an operator copy either loses to the chart's or
+    # displaces it. Guard predates the UID work but lives in the same arg loop,
+    # so a future edit there must not drop it silently.
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/cluster.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+      version: "v1.34"
+      controlPlane.apiServer.extraArgs:
+        - "--authentication-config=/etc/kubernetes/other.yaml"
+    asserts:
+      - failedTemplate:
+          errorMessage: 'controlPlane.apiServer.extraArgs contains "--authentication-config=/etc/kubernetes/other.yaml" while spec.oidc.mode is "System" — the chart already injects --authentication-config= for OIDC. Drop your explicit flag and let spec.oidc.mode: CustomConfig own the AuthenticationConfiguration (customConfig.config or customConfig.secretRef.name), or leave spec.oidc.mode: None and keep managing the flag yourself.'
+
+  - it: allows legacy --oidc-* flags to remain when spec.oidc.mode is None
+    # No collision when the chart is NOT injecting --authentication-config —
+    # existing customers who manage OIDC by hand keep working until they
+    # explicitly opt in to the new selector.
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/cluster.yaml
+    set:
+      oidc.mode: None
+      controlPlane.apiServer.extraArgs:
+        - "--oidc-issuer-url=https://legacy.example/realms/x"
+    asserts:
+      - contains:
+          path: spec.apiServer.extraArgs
+          content: "--oidc-issuer-url=https://legacy.example/realms/x"
+        documentIndex: 1
+
+  ###############################################
+  # aggregation-layer UID headers               #
+  ###############################################
+  # An authenticated user's UID reaches an aggregated apiserver only when the
+  # tenant kube-apiserver publishes `requestheader-uid-headers` into the
+  # extension-apiserver-authentication ConfigMap. Every test below pins
+  # `version` explicitly — common.yaml pins v1.32, and inheriting that pin
+  # would silently change the meaning of a case if the pin ever moves.
+
+  - it: v1.32 renders neither flag, below the v1.33 floor
+    # RemoteRequestHeaderUID is alpha and off on v1.32, and the apiserver refuses
+    # the header flag while the gate is off. The chart renders no gate term of
+    # its own, so the header flag has nothing to stand on.
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/cluster.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+      version: "v1.32"
+    asserts:
+      - equal:
+          path: spec.apiServer.extraArgs
+          value:
+            - "--authentication-config=/etc/kubernetes/authentication-config/config.yaml"
+        documentIndex: 1
+
+  - it: v1.33 renders the uid header flag without the feature gate
+    # RemoteRequestHeaderUID is beta and on by default from v1.33; rendering it
+    # anyway would only collide with a user-supplied --feature-gates entry.
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/cluster.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+      version: "v1.33"
+    asserts:
+      - equal:
+          path: spec.apiServer.extraArgs
+          value:
+            - "--authentication-config=/etc/kubernetes/authentication-config/config.yaml"
+            - "--requestheader-uid-headers=X-Remote-Uid"
+        documentIndex: 1
+      - notContains:
+          path: spec.apiServer.extraArgs
+          content: "--feature-gates=RemoteRequestHeaderUID=true"
+        documentIndex: 1
+
+  - it: v1.35 renders the uid header flag without the feature gate
+    # Pins the default enum value and the deny-list fall-through: a version the
+    # chart has not heard of must land on the header-flag-only branch.
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/cluster.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+      version: "v1.35"
+    asserts:
+      - equal:
+          path: spec.apiServer.extraArgs
+          value:
+            - "--authentication-config=/etc/kubernetes/authentication-config/config.yaml"
+            - "--requestheader-uid-headers=X-Remote-Uid"
+        documentIndex: 1
+
+  - it: v1.31 renders neither the uid header flag nor the feature gate
+    # --requestheader-uid-headers does not exist on v1.31 and an unknown flag is
+    # fatal to the apiserver, so aggregated UID is unavailable there by upstream
+    # limitation.
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/cluster.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+      version: "v1.31"
+    asserts:
+      - equal:
+          path: spec.apiServer.extraArgs
+          value:
+            - "--authentication-config=/etc/kubernetes/authentication-config/config.yaml"
+        documentIndex: 1
+
+  - it: CustomConfig mode gets the same uid header flag as System
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/cluster.yaml
+    set:
+      oidc.mode: CustomConfig
+      oidc.customConfig.secretRef.name: my-byo-authn
+      version: "v1.33"
+    asserts:
+      - contains:
+          path: spec.apiServer.extraArgs
+          content: "--requestheader-uid-headers=X-Remote-Uid"
+        documentIndex: 1
+
+  - it: mode None renders no uid header flag on a version that supports it
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/cluster.yaml
+    set:
+      oidc.mode: None
+      version: "v1.33"
+    asserts:
+      - equal:
+          path: spec.apiServer.extraArgs
+          value: []
+        documentIndex: 1
+
+  - it: a user entry already carrying X-Remote-Uid suppresses the chart copy
+    # The apiserver appends repeated entries of this flag, so the chart's own
+    # element would be a duplicate here rather than a fix. The equal on the
+    # full list proves it emitted none.
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/cluster.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+      version: "v1.33"
+      controlPlane.apiServer.extraArgs:
+        - "--requestheader-uid-headers=X-Remote-Uid"
+    asserts:
+      - equal:
+          path: spec.apiServer.extraArgs
+          value:
+            - "--requestheader-uid-headers=X-Remote-Uid"
+            - "--authentication-config=/etc/kubernetes/authentication-config/config.yaml"
+        documentIndex: 1
+
+  - it: adds its own element beside a uid-headers entry that omits X-Remote-Uid
+    # Repeats of the flag append, so the apiserver validates the union and the
+    # operator's own header keeps working beside the standard one. Rendering
+    # both is what makes the list the apiserver would have refused acceptable.
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/cluster.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+      version: "v1.33"
+      controlPlane.apiServer.extraArgs:
+        - "--requestheader-uid-headers=X-Custom-Uid"
+    asserts:
+      - equal:
+          path: spec.apiServer.extraArgs
+          value:
+            - "--requestheader-uid-headers=X-Custom-Uid"
+            - "--authentication-config=/etc/kubernetes/authentication-config/config.yaml"
+            - "--requestheader-uid-headers=X-Remote-Uid"
+        documentIndex: 1
+
+  - it: a user uid-headers list containing X-Remote-Uid among others suppresses the chart copy
+    # The realistic multi-header shape. X-Remote-Uid is present as its own
+    # list element, which is what upstream requires, so the chart defers.
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/cluster.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+      version: "v1.33"
+      controlPlane.apiServer.extraArgs:
+        - "--requestheader-uid-headers=X-Remote-Uid,X-Extra-Uid"
+    asserts:
+      - equal:
+          path: spec.apiServer.extraArgs
+          value:
+            - "--requestheader-uid-headers=X-Remote-Uid,X-Extra-Uid"
+            - "--authentication-config=/etc/kubernetes/authentication-config/config.yaml"
+        documentIndex: 1
+
+  - it: does not read a uid-headers element that only looks like X-Remote-Uid
+    # Upstream matches a whole list element, not a substring: X-Remote-Uid-Extra
+    # does NOT satisfy the requirement. Reading it as the standard element would
+    # suppress the chart's own and leave the apiserver with a list it refuses to
+    # start on — a substring test would do exactly that.
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/cluster.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+      version: "v1.33"
+      controlPlane.apiServer.extraArgs:
+        - "--requestheader-uid-headers=X-Remote-Uid-Extra"
+    asserts:
+      - equal:
+          path: spec.apiServer.extraArgs
+          value:
+            - "--requestheader-uid-headers=X-Remote-Uid-Extra"
+            - "--authentication-config=/etc/kubernetes/authentication-config/config.yaml"
+            - "--requestheader-uid-headers=X-Remote-Uid"
+        documentIndex: 1
+
+  - it: does not read a space-padded X-Remote-Uid as the standard element
+    # The flag is a pflag stringSlice and its CSV reader keeps surrounding
+    # spaces, so upstream compares "X-Remote-Uid " against "X-Remote-Uid" and
+    # finds no match. Reading that as the standard element would suppress the
+    # chart's own and leave the apiserver with a list it refuses to start on.
+    # Being more permissive than upstream is the one direction this reading
+    # must never take.
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/cluster.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+      version: "v1.33"
+      controlPlane.apiServer.extraArgs:
+        - "--requestheader-uid-headers=X-Remote-Uid , Other"
+    asserts:
+      - equal:
+          path: spec.apiServer.extraArgs
+          value:
+            - "--requestheader-uid-headers=X-Remote-Uid , Other"
+            - "--authentication-config=/etc/kubernetes/authentication-config/config.yaml"
+            - "--requestheader-uid-headers=X-Remote-Uid"
+        documentIndex: 1
+
+  - it: fails when a user uid-headers list carries a whitespace-only element
+    # checkForWhiteSpaceOnly runs over the same list and refuses an element that
+    # is empty after TrimSpace, so the X-Remote-Uid next to it does not save the
+    # list, and nothing the chart adds repairs it either.
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/cluster.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+      version: "v1.33"
+      controlPlane.apiServer.extraArgs:
+        - "--requestheader-uid-headers=X-Remote-Uid, "
+    asserts:
+      - failedTemplate:
+          errorMessage: 'controlPlane.apiServer.extraArgs contains "--requestheader-uid-headers=X-Remote-Uid, " while spec.oidc.mode is "System" — the kube-apiserver rejects a uid-headers list with an empty or whitespace-only element, and it validates every entry of the flag as one list, so the control plane would refuse to start. Remove the empty element from your entry, or drop the entry.'
+
+  - it: fails on an empty element in an earlier uid-headers entry
+    # Repeats append, so the trailing comma in the first entry puts an empty
+    # element in the very list checkForWhiteSpaceOnly walks, however well formed
+    # the later entry is. The message quotes the entry that carries it.
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/cluster.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+      version: "v1.33"
+      controlPlane.apiServer.extraArgs:
+        - "--requestheader-uid-headers=X-Remote-Uid,"
+        - "--requestheader-uid-headers=X-Remote-Uid"
+    asserts:
+      - failedTemplate:
+          errorMessage: 'controlPlane.apiServer.extraArgs contains "--requestheader-uid-headers=X-Remote-Uid," while spec.oidc.mode is "System" — the kube-apiserver rejects a uid-headers list with an empty or whitespace-only element, and it validates every entry of the flag as one list, so the control plane would refuse to start. Remove the empty element from your entry, or drop the entry.'
+
+  - it: reads a spaced feature-gates entry disabling the gate as an opt-out from v1.33 on
+    # featureGate.Set() TrimSpace-s the name and the value separately, so
+    # "RemoteRequestHeaderUID = false" really does disable the gate. Matching on
+    # the untrimmed element would miss this spelling and render the header flag
+    # next to a disabled gate — a control plane that cannot start.
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/cluster.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+      version: "v1.34"
+      controlPlane.apiServer.extraArgs:
+        - "--feature-gates=RemoteRequestHeaderUID = false"
+    asserts:
+      - equal:
+          path: spec.apiServer.extraArgs
+          value:
+            - "--feature-gates=RemoteRequestHeaderUID = false"
+            - "--authentication-config=/etc/kubernetes/authentication-config/config.yaml"
+        documentIndex: 1
+
+  - it: renders nothing when a second --emulated-version entry joins a quoted one
+    # This flag accumulates instead of replacing, so neither entry goes away:
+    # the quoted one hides its value and toVersionMap refuses two elements
+    # naming kube in any case. There is no version to render against.
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/cluster.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+      version: "v1.35"
+      controlPlane.apiServer.extraArgs:
+        - '--emulated-version="1.32"'
+        - "--emulated-version=1.34"
+    asserts:
+      - equal:
+          path: spec.apiServer.extraArgs
+          value:
+            - '--emulated-version="1.32"'
+            - "--emulated-version=1.34"
+            - "--authentication-config=/etc/kubernetes/authentication-config/config.yaml"
+        documentIndex: 1
+
+  - it: renders nothing when two --emulated-version entries both name kube
+    # toVersionMap returns "duplicate version flag" and the apiserver never
+    # starts, so there is no effective version the chart could render against.
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/cluster.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+      version: "v1.35"
+      controlPlane.apiServer.extraArgs:
+        - "--emulated-version=1.34"
+        - "--emulated-version=kube=1.33"
+    asserts:
+      - equal:
+          path: spec.apiServer.extraArgs
+          value:
+            - "--emulated-version=1.34"
+            - "--emulated-version=kube=1.33"
+            - "--authentication-config=/etc/kubernetes/authentication-config/config.yaml"
+        documentIndex: 1
+
+  - it: adds its own element beside a quoted uid-headers entry
+    # pflag parses this flag as a StringSlice, whose CSV reader strips a pair of
+    # surrounding double quotes, so the apiserver sees X-Remote-Uid and starts.
+    # The chart compares the raw element and cannot see through the quotes, so
+    # it cannot claim the union conforms; adding its own element is safe
+    # whatever that value turns out to be, and it duplicates at worst.
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/cluster.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+      version: "v1.33"
+      controlPlane.apiServer.extraArgs:
+        - '--requestheader-uid-headers="X-Remote-Uid"'
+    asserts:
+      - equal:
+          path: spec.apiServer.extraArgs
+          value:
+            - '--requestheader-uid-headers="X-Remote-Uid"'
+            - "--authentication-config=/etc/kubernetes/authentication-config/config.yaml"
+            - "--requestheader-uid-headers=X-Remote-Uid"
+        documentIndex: 1
+
+  - it: does not fail on an empty element a quoted uid-headers entry may not hold
+    # encoding/csv reads "X-Remote-Uid,,Other" as one element, so the commas
+    # inside the quotes are data rather than separators and the list upstream
+    # validates has nothing empty in it. Reading the raw text would refuse a
+    # cluster that starts.
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/cluster.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+      version: "v1.33"
+      controlPlane.apiServer.extraArgs:
+        - '--requestheader-uid-headers="X-Remote-Uid,,Other"'
+    asserts:
+      - equal:
+          path: spec.apiServer.extraArgs
+          value:
+            - '--requestheader-uid-headers="X-Remote-Uid,,Other"'
+            - "--authentication-config=/etc/kubernetes/authentication-config/config.yaml"
+            - "--requestheader-uid-headers=X-Remote-Uid"
+        documentIndex: 1
+
+  - it: renders nothing when quotes hide the emulated version from the chart
+    # Same CSV rule on --emulated-version: the apiserver strips the quotes and
+    # reads 1.32, where the gate is alpha-and-off, while the chart does not
+    # strip them. Rendering the header flag on that cluster would stop it from
+    # starting.
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/cluster.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+      version: "v1.35"
+      controlPlane.apiServer.extraArgs:
+        - '--emulated-version="1.32"'
+    asserts:
+      - equal:
+          path: spec.apiServer.extraArgs
+          value:
+            - '--emulated-version="1.32"'
+            - "--authentication-config=/etc/kubernetes/authentication-config/config.yaml"
+        documentIndex: 1
+
+  - it: adds nothing from v1.33 on when a user feature-gates entry disables the gate
+    # RemoteRequestHeaderUID is beta-and-on from v1.33 but never LockToDefault,
+    # so an explicit =false still turns it off — and Validate() rejects
+    # --requestheader-uid-headers whenever the gate is off, on every version.
+    # Rendering the header flag next to the opt-out would stop the control
+    # plane from starting; failing the render would break a cluster that is
+    # running today. The chart honours the opt-out and adds nothing.
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/cluster.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+      version: "v1.34"
+      controlPlane.apiServer.extraArgs:
+        - "--feature-gates=RemoteRequestHeaderUID=false"
+    asserts:
+      - equal:
+          path: spec.apiServer.extraArgs
+          value:
+            - "--feature-gates=RemoteRequestHeaderUID=false"
+            - "--authentication-config=/etc/kubernetes/authentication-config/config.yaml"
+        documentIndex: 1
+
+  - it: adds nothing from v1.33 on when a user feature-gates entry disables all beta gates
+    # AllBeta=false reaches RemoteRequestHeaderUID because the blanket setting
+    # applies to every beta gate with no explicit entry of its own — the same
+    # opt-out as the named one, by a less obvious route.
+    #
+    # Adding the opt-out to a running tenant leaves the rendered list two
+    # entries long, as it was without it. The tenant control plane rebuilds
+    # the apiserver args from a checksum of the list, so a same-length edit
+    # still removes the header flag the previous render carried.
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/cluster.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+      version: "v1.34"
+      controlPlane.apiServer.extraArgs:
+        - "--feature-gates=AllBeta=false"
+    asserts:
+      - equal:
+          path: spec.apiServer.extraArgs
+          value:
+            - "--feature-gates=AllBeta=false"
+            - "--authentication-config=/etc/kubernetes/authentication-config/config.yaml"
+        documentIndex: 1
+
+  - it: accepts AllBeta=false when the gate is also named explicitly
+    # An explicit entry wins over the blanket setting in either map iteration
+    # order, so this combination really does leave the gate on.
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/cluster.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+      version: "v1.34"
+      controlPlane.apiServer.extraArgs:
+        - "--feature-gates=AllBeta=false,RemoteRequestHeaderUID=true"
+    asserts:
+      - equal:
+          path: spec.apiServer.extraArgs
+          value:
+            - "--feature-gates=AllBeta=false,RemoteRequestHeaderUID=true"
+            - "--authentication-config=/etc/kubernetes/authentication-config/config.yaml"
+            - "--requestheader-uid-headers=X-Remote-Uid"
+        documentIndex: 1
+
+  - it: reads the union when an earlier uid-headers entry does not conform
+    # Repeats append, so X-Remote-Uid is in the list the apiserver validates
+    # whichever entry carries it, and the operator's own header travels beside
+    # it. The chart adds nothing.
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/cluster.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+      version: "v1.33"
+      controlPlane.apiServer.extraArgs:
+        - "--requestheader-uid-headers=X-Custom"
+        - "--requestheader-uid-headers=X-Remote-Uid"
+    asserts:
+      - equal:
+          path: spec.apiServer.extraArgs
+          value:
+            - "--requestheader-uid-headers=X-Custom"
+            - "--requestheader-uid-headers=X-Remote-Uid"
+            - "--authentication-config=/etc/kubernetes/authentication-config/config.yaml"
+        documentIndex: 1
+
+  - it: reads the union when a later uid-headers entry does not conform
+    # Mirror of the case above, and the one the old collapse made a render
+    # failure: a later entry cannot take X-Remote-Uid back out of a list that
+    # is only ever appended to.
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/cluster.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+      version: "v1.33"
+      controlPlane.apiServer.extraArgs:
+        - "--requestheader-uid-headers=X-Remote-Uid"
+        - "--requestheader-uid-headers=X-Custom"
+    asserts:
+      - equal:
+          path: spec.apiServer.extraArgs
+          value:
+            - "--requestheader-uid-headers=X-Remote-Uid"
+            - "--requestheader-uid-headers=X-Custom"
+            - "--authentication-config=/etc/kubernetes/authentication-config/config.yaml"
+        documentIndex: 1
+
+  - it: accepts the documented v1.32 hand-written setup unchanged
+    # The shape the released field documentation told operators to write: the
+    # header flag plus the gate it needs to work on v1.32. Below the floor the
+    # chart reads neither entry and adds nothing but --authentication-config.
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/cluster.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+      version: "v1.32"
+      controlPlane.apiServer.extraArgs:
+        - "--feature-gates=RemoteRequestHeaderUID=true"
+        - "--requestheader-uid-headers=X-Remote-Uid"
+    asserts:
+      - equal:
+          path: spec.apiServer.extraArgs
+          value:
+            - "--feature-gates=RemoteRequestHeaderUID=true"
+            - "--requestheader-uid-headers=X-Remote-Uid"
+            - "--authentication-config=/etc/kubernetes/authentication-config/config.yaml"
+        documentIndex: 1
+
+  - it: v1.33 tells an operator who owns the header flag to drop it, not to disable OIDC
+    # Turning OIDC off removes the chart's flag, but not theirs — that advice
+    # would leave the same fatal pair in place.
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/cluster.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+      version: "v1.34"
+      controlPlane.apiServer.extraArgs:
+        - "--requestheader-uid-headers=X-Remote-Uid"
+        - "--feature-gates=RemoteRequestHeaderUID=false"
+    asserts:
+      - failedTemplate:
+          errorMessage: 'controlPlane.apiServer.extraArgs contains "--requestheader-uid-headers=X-Remote-Uid" alongside "--feature-gates=RemoteRequestHeaderUID=false", while spec.oidc.mode is "System" on Kubernetes v1.34 — the kube-apiserver rejects a --requestheader-uid-headers list while RemoteRequestHeaderUID is disabled, so the control plane would refuse to start. Drop one of the two: your header flag, or the gate setting that turns RemoteRequestHeaderUID off.'
+
+  - it: takes the last setting of a gate when the operator supplies several entries
+    # Every entry lands in the same per-component bucket and is joined into one
+    # featureGate.Set(), so the last term for a name is the one that decides.
+    # Judging entries as they arrive would read an opt-out the operator
+    # overrode and withhold the header flag.
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/cluster.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+      version: "v1.34"
+      controlPlane.apiServer.extraArgs:
+        - "--feature-gates=RemoteRequestHeaderUID=false"
+        - "--feature-gates=RemoteRequestHeaderUID=true"
+    asserts:
+      - equal:
+          path: spec.apiServer.extraArgs
+          value:
+            - "--feature-gates=RemoteRequestHeaderUID=false"
+            - "--feature-gates=RemoteRequestHeaderUID=true"
+            - "--authentication-config=/etc/kubernetes/authentication-config/config.yaml"
+            - "--requestheader-uid-headers=X-Remote-Uid"
+        documentIndex: 1
+
+  - it: reads a feature-gates entry disabling the gate as 0 as an opt-out from v1.33 on
+    # featureGate.Set() resolves the value with strconv.ParseBool, which reads 0
+    # as false just like the word. Comparing the raw text would let this through
+    # as if the gate were untouched, and the rendered header flag would then
+    # stop the apiserver from starting.
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/cluster.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+      version: "v1.34"
+      controlPlane.apiServer.extraArgs:
+        - "--feature-gates=RemoteRequestHeaderUID=0"
+    asserts:
+      - equal:
+          path: spec.apiServer.extraArgs
+          value:
+            - "--feature-gates=RemoteRequestHeaderUID=0"
+            - "--authentication-config=/etc/kubernetes/authentication-config/config.yaml"
+        documentIndex: 1
+
+  - it: reads a gate value of 1 as an explicit enable that beats AllBeta=false
+    # strconv.ParseBool reads 1 as true, and an explicit term beats the blanket
+    # one, so the gate stays on and the header flag stands.
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/cluster.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+      version: "v1.34"
+      controlPlane.apiServer.extraArgs:
+        - "--feature-gates=AllBeta=false,RemoteRequestHeaderUID=1"
+    asserts:
+      - equal:
+          path: spec.apiServer.extraArgs
+          value:
+            - "--feature-gates=AllBeta=false,RemoteRequestHeaderUID=1"
+            - "--authentication-config=/etc/kubernetes/authentication-config/config.yaml"
+            - "--requestheader-uid-headers=X-Remote-Uid"
+        documentIndex: 1
+
+  - it: leaves a user feature-gates entry disabling the gate alone on v1.31
+    # v1.31 renders no header flag, so the operator's opt-out collides with
+    # nothing and must pass through untouched.
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/cluster.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+      version: "v1.31"
+      controlPlane.apiServer.extraArgs:
+        - "--feature-gates=RemoteRequestHeaderUID=false"
+    asserts:
+      - equal:
+          path: spec.apiServer.extraArgs
+          value:
+            - "--feature-gates=RemoteRequestHeaderUID=false"
+            - "--authentication-config=/etc/kubernetes/authentication-config/config.yaml"
+        documentIndex: 1
+
+  - it: leaves a user feature-gates entry alone from v1.33 on
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/cluster.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+      version: "v1.34"
+      controlPlane.apiServer.extraArgs:
+        - "--feature-gates=Foo=true"
+    asserts:
+      - equal:
+          path: spec.apiServer.extraArgs
+          value:
+            - "--feature-gates=Foo=true"
+            - "--authentication-config=/etc/kubernetes/authentication-config/config.yaml"
+            - "--requestheader-uid-headers=X-Remote-Uid"
+        documentIndex: 1
+
+  - it: leaves user uid-headers and feature-gates entries alone on v1.31
+    # No guard fires on v1.31: the chart renders nothing of its own there, so a
+    # user entry cannot collide with it.
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/cluster.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+      version: "v1.31"
+      controlPlane.apiServer.extraArgs:
+        - "--requestheader-uid-headers=X-Custom-Uid"
+        - "--feature-gates=Foo=true"
+    asserts:
+      - equal:
+          path: spec.apiServer.extraArgs
+          value:
+            - "--requestheader-uid-headers=X-Custom-Uid"
+            - "--feature-gates=Foo=true"
+            - "--authentication-config=/etc/kubernetes/authentication-config/config.yaml"
+        documentIndex: 1
+
+  - it: leaves a v1.32 opt-out beside a header entry alone
+    # Below the floor the UID guards do not run, so an entry the apiserver
+    # refuses passes through untouched, as on v1.31.
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/cluster.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+      version: "v1.32"
+      controlPlane.apiServer.extraArgs:
+        - "--feature-gates=RemoteRequestHeaderUID=false"
+        - "--requestheader-uid-headers=X-Remote-Uid"
+    asserts:
+      - equal:
+          path: spec.apiServer.extraArgs
+          value:
+            - "--feature-gates=RemoteRequestHeaderUID=false"
+            - "--requestheader-uid-headers=X-Remote-Uid"
+            - "--authentication-config=/etc/kubernetes/authentication-config/config.yaml"
+        documentIndex: 1
+
+  - it: reads a lowercase uid-headers entry as ownership
+    # Validate() compares each entry with strings.EqualFold, so the lowercase
+    # spelling is a list the apiserver accepts and the chart must not add a
+    # second entry beside it. This is the only fixture that spells the header
+    # differently from the chart's own copy; drop the case folding and it is
+    # the one that goes red.
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/cluster.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+      version: "v1.34"
+      controlPlane.apiServer.extraArgs:
+        - "--requestheader-uid-headers=x-remote-uid"
+    asserts:
+      - equal:
+          path: spec.apiServer.extraArgs
+          value:
+            - "--requestheader-uid-headers=x-remote-uid"
+            - "--authentication-config=/etc/kubernetes/authentication-config/config.yaml"
+        documentIndex: 1
+
+  - it: reads an uppercase uid-headers entry among others as ownership
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/cluster.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+      version: "v1.34"
+      controlPlane.apiServer.extraArgs:
+        - "--requestheader-uid-headers=X-Other,X-REMOTE-UID"
+    asserts:
+      - equal:
+          path: spec.apiServer.extraArgs
+          value:
+            - "--requestheader-uid-headers=X-Other,X-REMOTE-UID"
+            - "--authentication-config=/etc/kubernetes/authentication-config/config.yaml"
+        documentIndex: 1
+
+  - it: does not read a mis-cased gate name as an opt-out from v1.33 on
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/cluster.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+      version: "v1.34"
+      controlPlane.apiServer.extraArgs:
+        - "--feature-gates=remoterequestheaderuid=false"
+    asserts:
+      - equal:
+          path: spec.apiServer.extraArgs
+          value:
+            - "--feature-gates=remoterequestheaderuid=false"
+            - "--authentication-config=/etc/kubernetes/authentication-config/config.yaml"
+            - "--requestheader-uid-headers=X-Remote-Uid"
+        documentIndex: 1
+
+  - it: treats an empty feature-gates value as no entry at all
+    # featureGate.Set() skips zero-length elements, so this flag changes no
+    # gate and the header flag renders as it would without the entry.
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/cluster.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+      version: "v1.34"
+      controlPlane.apiServer.extraArgs:
+        - "--feature-gates="
+    asserts:
+      - equal:
+          path: spec.apiServer.extraArgs
+          value:
+            - "--feature-gates="
+            - "--authentication-config=/etc/kubernetes/authentication-config/config.yaml"
+            - "--requestheader-uid-headers=X-Remote-Uid"
+        documentIndex: 1
+
+  - it: treats an empty uid-headers value as no entry at all
+    # pflag readAsCSV returns an empty slice for an empty value and Validate()
+    # only inspects a non-empty list, so the value itself says nothing. Reading
+    # it as a list would fail the render, where rendering the chart's own
+    # element puts X-Remote-Uid in the union and the list the apiserver
+    # validates conforms.
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/cluster.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+      version: "v1.34"
+      controlPlane.apiServer.extraArgs:
+        - "--requestheader-uid-headers="
+    asserts:
+      - equal:
+          path: spec.apiServer.extraArgs
+          value:
+            - "--requestheader-uid-headers="
+            - "--authentication-config=/etc/kubernetes/authentication-config/config.yaml"
+            - "--requestheader-uid-headers=X-Remote-Uid"
+        documentIndex: 1
+
+  - it: follows --emulated-version below the floor rather than the image tag
+    # RemoteRequestHeaderUID resolves through featureSpecAtEmulationVersion
+    # (featureSpecAtEmulationAndMinCompatVersion by v1.35), so an emulated 1.32
+    # puts it back to alpha-and-off on a v1.34 binary and Validate() then rejects
+    # the header flag. The image tag alone would render it.
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/cluster.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+      version: "v1.34"
+      controlPlane.apiServer.extraArgs:
+        - "--emulated-version=1.32"
+    asserts:
+      - equal:
+          path: spec.apiServer.extraArgs
+          value:
+            - "--emulated-version=1.32"
+            - "--authentication-config=/etc/kubernetes/authentication-config/config.yaml"
+        documentIndex: 1
+
+  - it: renders the header flag when --emulated-version lands on the floor
+    # An emulated 1.33 keeps RemoteRequestHeaderUID beta and on, so emulation
+    # down to the floor itself still renders the header flag.
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/cluster.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+      version: "v1.35"
+      controlPlane.apiServer.extraArgs:
+        - "--emulated-version=1.33"
+    asserts:
+      - equal:
+          path: spec.apiServer.extraArgs
+          value:
+            - "--emulated-version=1.33"
+            - "--authentication-config=/etc/kubernetes/authentication-config/config.yaml"
+            - "--requestheader-uid-headers=X-Remote-Uid"
+        documentIndex: 1
+
+  - it: reads the kube component out of a compound --emulated-version value
+    # The value is a CSV of component=version and an element naming no component is
+    # kube's, so both spellings have to reach the same decision.
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/cluster.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+      version: "v1.35"
+      controlPlane.apiServer.extraArgs:
+        - "--emulated-version=kube=1.32"
+    asserts:
+      - equal:
+          path: spec.apiServer.extraArgs
+          value:
+            - "--emulated-version=kube=1.32"
+            - "--authentication-config=/etc/kubernetes/authentication-config/config.yaml"
+        documentIndex: 1
+
+  - it: reads a kube:-prefixed opt-out from v1.33 on
+    # A kube:-prefixed term is the kube component's: the operator turned the gate
+    # off and the chart has to honour it rather than render a header flag the
+    # apiserver rejects.
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/cluster.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+      version: "v1.34"
+      controlPlane.apiServer.extraArgs:
+        - "--feature-gates=kube:RemoteRequestHeaderUID=false"
+    asserts:
+      - equal:
+          path: spec.apiServer.extraArgs
+          value:
+            - "--feature-gates=kube:RemoteRequestHeaderUID=false"
+            - "--authentication-config=/etc/kubernetes/authentication-config/config.yaml"
+        documentIndex: 1
+
+  - it: reads a kube:-prefixed blanket opt-out from v1.33 on
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/cluster.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+      version: "v1.34"
+      controlPlane.apiServer.extraArgs:
+        - "--feature-gates=kube:AllBeta=false"
+    asserts:
+      - equal:
+          path: spec.apiServer.extraArgs
+          value:
+            - "--feature-gates=kube:AllBeta=false"
+            - "--authentication-config=/etc/kubernetes/authentication-config/config.yaml"
+        documentIndex: 1
+
+  - it: does not read AllAlpha=false as an opt-out from v1.33 on
+    # The gate is beta from v1.33, so the alpha blanket leaves it on and the
+    # header flag stands.
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/cluster.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+      version: "v1.34"
+      controlPlane.apiServer.extraArgs:
+        - "--feature-gates=AllAlpha=false"
+    asserts:
+      - equal:
+          path: spec.apiServer.extraArgs
+          value:
+            - "--feature-gates=AllAlpha=false"
+            - "--authentication-config=/etc/kubernetes/authentication-config/config.yaml"
+            - "--requestheader-uid-headers=X-Remote-Uid"
+        documentIndex: 1
+
+  - it: trims whitespace around the component before comparing it
+    # ColonSeparatedMultimapStringString.Set keys on TrimSpace(kv[0]), so ' kube '
+    # is the kube component and the opt-out it carries is the operator's.
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/cluster.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+      version: "v1.34"
+      controlPlane.apiServer.extraArgs:
+        - "--feature-gates= kube :RemoteRequestHeaderUID=false"
+    asserts:
+      - equal:
+          path: spec.apiServer.extraArgs
+          value:
+            - "--feature-gates= kube :RemoteRequestHeaderUID=false"
+            - "--authentication-config=/etc/kubernetes/authentication-config/config.yaml"
+        documentIndex: 1
+
+  - it: skips a zero-length element the way both parse layers do
+    # An empty element between commas is dropped by the multimap reader and by
+    # featureGate.Set, so the opt-out after it still counts.
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/cluster.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+      version: "v1.34"
+      controlPlane.apiServer.extraArgs:
+        - "--feature-gates=Foo=true,,RemoteRequestHeaderUID=false"
+    asserts:
+      - equal:
+          path: spec.apiServer.extraArgs
+          value:
+            - "--feature-gates=Foo=true,,RemoteRequestHeaderUID=false"
+            - "--authentication-config=/etc/kubernetes/authentication-config/config.yaml"
+        documentIndex: 1
+
+  - it: takes the last value when one gate is named twice in a value
+    # featureGate.Set builds a map, so the later element wins and the entry is an
+    # opt-out despite the earlier true.
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/cluster.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+      version: "v1.34"
+      controlPlane.apiServer.extraArgs:
+        - "--feature-gates=RemoteRequestHeaderUID=true,RemoteRequestHeaderUID=false"
+    asserts:
+      - equal:
+          path: spec.apiServer.extraArgs
+          value:
+            - "--feature-gates=RemoteRequestHeaderUID=true,RemoteRequestHeaderUID=false"
+            - "--authentication-config=/etc/kubernetes/authentication-config/config.yaml"
+        documentIndex: 1
+
+  - it: passes an element with no value through without reading an opinion
+    # featureGate.Set rejects it with 'missing bool value', so the apiserver refuses
+    # to start whatever the chart does. The chart neither repairs nor compounds it.
+    # The gate is named RemoteRequestHeaderUID on purpose: with a name the chart
+    # never inspects, this case would hold whatever conclusion the chart drew.
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/cluster.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+      version: "v1.34"
+      controlPlane.apiServer.extraArgs:
+        - "--feature-gates=RemoteRequestHeaderUID"
+    asserts:
+      - equal:
+          path: spec.apiServer.extraArgs
+          value:
+            - "--feature-gates=RemoteRequestHeaderUID"
+            - "--authentication-config=/etc/kubernetes/authentication-config/config.yaml"
+            - "--requestheader-uid-headers=X-Remote-Uid"
+        documentIndex: 1
+
+  - it: passes an unparseable blanket value through without reading an opinion
+    # Twin of the case below on the blanket path: AllBeta is read by the chart, so
+    # a value ParseBool cannot resolve must leave the gate untouched rather than
+    # being guessed either way.
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/cluster.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+      version: "v1.34"
+      controlPlane.apiServer.extraArgs:
+        - "--feature-gates=AllBeta=maybe"
+    asserts:
+      - equal:
+          path: spec.apiServer.extraArgs
+          value:
+            - "--feature-gates=AllBeta=maybe"
+            - "--authentication-config=/etc/kubernetes/authentication-config/config.yaml"
+            - "--requestheader-uid-headers=X-Remote-Uid"
+        documentIndex: 1
+
+  - it: passes an unparseable value through without reading an opinion
+    # Same class: strconv.ParseBool decides, and a value it cannot read is left
+    # unresolved rather than guessed at. Named RemoteRequestHeaderUID for the same
+    # reason as the case above: an unread name makes the assertion unfalsifiable.
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/cluster.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+      version: "v1.34"
+      controlPlane.apiServer.extraArgs:
+        - "--feature-gates=RemoteRequestHeaderUID=maybe"
+    asserts:
+      - equal:
+          path: spec.apiServer.extraArgs
+          value:
+            - "--feature-gates=RemoteRequestHeaderUID=maybe"
+            - "--authentication-config=/etc/kubernetes/authentication-config/config.yaml"
+            - "--requestheader-uid-headers=X-Remote-Uid"
+        documentIndex: 1
+
+  - it: passes a mixed bare and kube:-prefixed gate spelling through
+    # The apiserver refuses a configuration that names the kube component both
+    # ways, but the chart renders no gate term of its own for the spelling to
+    # clash with, so it leaves that refusal to the apiserver like any other
+    # fatal gate value.
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/cluster.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+      version: "v1.34"
+      controlPlane.apiServer.extraArgs:
+        - "--feature-gates=AllBeta=true"
+        - "--feature-gates=kube:Foo=true"
+    asserts:
+      - equal:
+          path: spec.apiServer.extraArgs
+          value:
+            - "--feature-gates=AllBeta=true"
+            - "--feature-gates=kube:Foo=true"
+            - "--authentication-config=/etc/kubernetes/authentication-config/config.yaml"
+            - "--requestheader-uid-headers=X-Remote-Uid"
+        documentIndex: 1
+
+  - it: does not read another component's gate of the same name as an opinion
+    # wardle:RemoteRequestHeaderUID=false is that component's gate, not the tenant
+    # kube-apiserver's, so it must not suppress the header flag. Stripping the
+    # prefix for a foreign component would turn this into a silent opt-out and
+    # leave an aggregated apiserver without the UID.
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/cluster.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+      version: "v1.34"
+      controlPlane.apiServer.extraArgs:
+        - "--feature-gates=wardle:RemoteRequestHeaderUID=false"
+    asserts:
+      - equal:
+          path: spec.apiServer.extraArgs
+          value:
+            - "--feature-gates=wardle:RemoteRequestHeaderUID=false"
+            - "--authentication-config=/etc/kubernetes/authentication-config/config.yaml"
+            - "--requestheader-uid-headers=X-Remote-Uid"
+        documentIndex: 1
+
+  - it: does not read a component whose name merely starts with kube as an opinion
+    # Component names are matched whole: "kubelet" is not "kube", so this gate
+    # belongs to the kubelet and says nothing about the tenant kube-apiserver.
+    # A prefix match here would read it as an opt-out and drop the header flag.
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/cluster.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+      version: "v1.34"
+      controlPlane.apiServer.extraArgs:
+        - "--feature-gates=kubelet:RemoteRequestHeaderUID=false"
+    asserts:
+      - equal:
+          path: spec.apiServer.extraArgs
+          value:
+            - "--feature-gates=kubelet:RemoteRequestHeaderUID=false"
+            - "--authentication-config=/etc/kubernetes/authentication-config/config.yaml"
+            - "--requestheader-uid-headers=X-Remote-Uid"
+        documentIndex: 1
+
+  - it: reads an empty-component opt-out from v1.33 on
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/cluster.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+      version: "v1.34"
+      controlPlane.apiServer.extraArgs:
+        - "--feature-gates=:RemoteRequestHeaderUID=false"
+    asserts:
+      - equal:
+          path: spec.apiServer.extraArgs
+          value:
+            - "--feature-gates=:RemoteRequestHeaderUID=false"
+            - "--authentication-config=/etc/kubernetes/authentication-config/config.yaml"
+        documentIndex: 1
+
+  - it: keeps a blanket AllBeta opt-out when a later feature-gates entry omits it
+    # A later entry that omits AllBeta leaves the blanket in force: reading only
+    # the later entry renders the header flag next to a gate the apiserver has
+    # switched off, and the control plane never starts.
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/cluster.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+      version: "v1.34"
+      controlPlane.apiServer.extraArgs:
+        - "--feature-gates=AllBeta=false"
+        - "--feature-gates=Foo=true"
+    asserts:
+      - equal:
+          path: spec.apiServer.extraArgs
+          value:
+            - "--feature-gates=AllBeta=false"
+            - "--feature-gates=Foo=true"
+            - "--authentication-config=/etc/kubernetes/authentication-config/config.yaml"
+        documentIndex: 1
+
+  - it: keeps an explicit opt-out from an earlier feature-gates entry
+    # The same shape named explicitly rather than through a blanket. Both are
+    # inputs to one featureGate.Set(), so the gate is off and the header flag
+    # must not be rendered beside it.
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/cluster.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+      version: "v1.34"
+      controlPlane.apiServer.extraArgs:
+        - "--feature-gates=RemoteRequestHeaderUID=false"
+        - "--feature-gates=Foo=true"
+    asserts:
+      - equal:
+          path: spec.apiServer.extraArgs
+          value:
+            - "--feature-gates=RemoteRequestHeaderUID=false"
+            - "--feature-gates=Foo=true"
+            - "--authentication-config=/etc/kubernetes/authentication-config/config.yaml"
+        documentIndex: 1
+
+  - it: fails on a header flag whose opt-out lives in an earlier feature-gates entry
+    # The fail path under accumulation: the opt-out and the header flag never
+    # share an entry, and the apiserver still refuses the pair. Reading only the
+    # last gate entry would let this render and the control plane would not start.
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/cluster.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+      version: "v1.34"
+      controlPlane.apiServer.extraArgs:
+        - "--feature-gates=RemoteRequestHeaderUID=false"
+        - "--feature-gates=Foo=true"
+        - "--requestheader-uid-headers=X-Remote-Uid"
+    asserts:
+      - failedTemplate:
+          errorMessage: 'controlPlane.apiServer.extraArgs contains "--requestheader-uid-headers=X-Remote-Uid" alongside "--feature-gates=RemoteRequestHeaderUID=false", while spec.oidc.mode is "System" on Kubernetes v1.34 — the kube-apiserver rejects a --requestheader-uid-headers list while RemoteRequestHeaderUID is disabled, so the control plane would refuse to start. Drop one of the two: your header flag, or the gate setting that turns RemoteRequestHeaderUID off.'
+
+  - it: quotes the entry carrying the opt-out, not the last entry naming a gate
+    # The message tells the operator which of their two entries to drop, so it
+    # has to name the one that turned the gate off. AllBeta=true is read later
+    # and turns it on; quoting that entry would send them to delete a setting
+    # that is not the problem, and the render would still fail.
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/cluster.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+      version: "v1.34"
+      controlPlane.apiServer.extraArgs:
+        - "--feature-gates=RemoteRequestHeaderUID=false"
+        - "--feature-gates=AllBeta=true"
+        - "--requestheader-uid-headers=X-Remote-Uid"
+    asserts:
+      - failedTemplate:
+          errorMessage: 'controlPlane.apiServer.extraArgs contains "--requestheader-uid-headers=X-Remote-Uid" alongside "--feature-gates=RemoteRequestHeaderUID=false", while spec.oidc.mode is "System" on Kubernetes v1.34 — the kube-apiserver rejects a --requestheader-uid-headers list while RemoteRequestHeaderUID is disabled, so the control plane would refuse to start. Drop one of the two: your header flag, or the gate setting that turns RemoteRequestHeaderUID off.'
+
+  - it: quotes the blanket AllBeta entry that carries the opt-out
+    # The blanket selection branch. AllAlpha=true sits in a later entry of its
+    # own, so a selection keyed on the last --feature-gates entry seen would
+    # quote that one instead of the entry that turns the gate off.
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/cluster.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+      version: "v1.34"
+      controlPlane.apiServer.extraArgs:
+        - "--feature-gates=AllBeta=false"
+        - "--feature-gates=AllAlpha=true"
+        - "--requestheader-uid-headers=X-Remote-Uid"
+    asserts:
+      - failedTemplate:
+          errorMessage: 'controlPlane.apiServer.extraArgs contains "--requestheader-uid-headers=X-Remote-Uid" alongside "--feature-gates=AllBeta=false", while spec.oidc.mode is "System" on Kubernetes v1.34 — the kube-apiserver rejects a --requestheader-uid-headers list while RemoteRequestHeaderUID is disabled, so the control plane would refuse to start. Drop one of the two: your header flag, or the gate setting that turns RemoteRequestHeaderUID off.'
+
+  - it: fails when a read flag ends the list and would eat the chart's own entry
+    # The chart appends --authentication-config after the operator's entries,
+    # and pflag hands a valueless long flag the next argument whatever it looks
+    # like. Rendering here produces a control plane that starts, reads no
+    # AuthenticationConfiguration, and fails every OIDC login in silence.
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/cluster.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+      version: "v1.34"
+      controlPlane.apiServer.extraArgs:
+        - "--requestheader-uid-headers"
+    asserts:
+      - failedTemplate:
+          errorMessage: 'controlPlane.apiServer.extraArgs ends with "--requestheader-uid-headers" while spec.oidc.mode is "System" — the chart appends --authentication-config after your entries, and the kube-apiserver would read that as the value of your flag: the AuthenticationConfiguration is never applied, and the control plane either comes up with OIDC silently off or refuses to start at all, depending on which flag swallowed it. Give the flag its value in the same entry, as --flag=value.'
+
+  - it: fails on a trailing bare --feature-gates for the same reason
+    # The sibling flag, where the swallowed argument merely stops the apiserver
+    # instead of disabling OIDC quietly. Same cause, so the same refusal rather
+    # than one message per flag.
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/cluster.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+      version: "v1.32"
+      controlPlane.apiServer.extraArgs:
+        - "--feature-gates"
+    asserts:
+      - failedTemplate:
+          errorMessage: 'controlPlane.apiServer.extraArgs ends with "--feature-gates" while spec.oidc.mode is "System" — the chart appends --authentication-config after your entries, and the kube-apiserver would read that as the value of your flag: the AuthenticationConfiguration is never applied, and the control plane either comes up with OIDC silently off or refuses to start at all, depending on which flag swallowed it. Give the flag its value in the same entry, as --flag=value.'
+
+  - it: keeps a quoted --emulated-version unreadable once a later entry is readable
+    # Quoting is remembered across entries rather than re-decided per entry, and
+    # this is the shape that tells the two apart: the second entry names a
+    # foreign component, so it triggers no duplicate of its own and the
+    # withholding can only come from the quotes on the first. Re-deciding per
+    # entry would read the quoted "1.32" as no emulation at all — the version
+    # pattern does not match a leading quote — and render the header flag for
+    # v1.35.
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/cluster.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+      version: "v1.35"
+      controlPlane.apiServer.extraArgs:
+        - '--emulated-version="1.32"'
+        - "--emulated-version=wardle=1.2"
+    asserts:
+      - equal:
+          path: spec.apiServer.extraArgs
+          value:
+            - '--emulated-version="1.32"'
+            - "--emulated-version=wardle=1.2"
+            - "--authentication-config=/etc/kubernetes/authentication-config/config.yaml"
+        documentIndex: 1
+
+  - it: fails on a trailing bare --emulated-version, the third name in the guard
+    # The guard reads one list of three flag names and the other two have cases
+    # of their own; this is the third, so a name dropped from that list cannot
+    # pass unnoticed.
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/cluster.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+      version: "v1.35"
+      controlPlane.apiServer.extraArgs:
+        - "--emulated-version"
+    asserts:
+      - failedTemplate:
+          errorMessage: 'controlPlane.apiServer.extraArgs ends with "--emulated-version" while spec.oidc.mode is "System" — the chart appends --authentication-config after your entries, and the kube-apiserver would read that as the value of your flag: the AuthenticationConfiguration is never applied, and the control plane either comes up with OIDC silently off or refuses to start at all, depending on which flag swallowed it. Give the flag its value in the same entry, as --flag=value.'
+
+  - it: quotes the uid-headers entry carrying the empty element, not the first
+    # The message tells the operator which entry to edit, and the entries are
+    # read as one list, so the empty element can sit in any of them. A well
+    # formed first entry must not be the one quoted.
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/cluster.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+      version: "v1.34"
+      controlPlane.apiServer.extraArgs:
+        - "--requestheader-uid-headers=X-Remote-Uid"
+        - "--requestheader-uid-headers=A,"
+    asserts:
+      - failedTemplate:
+          errorMessage: 'controlPlane.apiServer.extraArgs contains "--requestheader-uid-headers=A," while spec.oidc.mode is "System" — the kube-apiserver rejects a uid-headers list with an empty or whitespace-only element, and it validates every entry of the flag as one list, so the control plane would refuse to start. Remove the empty element from your entry, or drop the entry.'
+
+  - it: sees a uid-headers entry written as two elements
+    # pflag pairs "--requestheader-uid-headers" with the element after it, so
+    # the apiserver really does get the list and really does refuse it while
+    # the gate is off. Matching only the --flag=value spelling would let this
+    # render and leave the operator with a control plane that will not start.
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/cluster.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+      version: "v1.34"
+      controlPlane.apiServer.extraArgs:
+        - "--feature-gates=RemoteRequestHeaderUID=false"
+        - "--requestheader-uid-headers"
+        - "X-Remote-Uid"
+    asserts:
+      - failedTemplate:
+          errorMessage: 'controlPlane.apiServer.extraArgs contains "--requestheader-uid-headers" alongside "--feature-gates=RemoteRequestHeaderUID=false", while spec.oidc.mode is "System" on Kubernetes v1.34 — the kube-apiserver rejects a --requestheader-uid-headers list while RemoteRequestHeaderUID is disabled, so the control plane would refuse to start. Drop one of the two: your header flag, or the gate setting that turns RemoteRequestHeaderUID off.'
+
+  - it: renders nothing when --feature-gates is written as two elements
+    # The gate setting lives in an element this loop never reads, so the chart
+    # cannot tell an opt-out from an unrelated term. Rendering the header flag
+    # against a reading it did not take is the one outcome worth avoiding.
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/cluster.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+      version: "v1.34"
+      controlPlane.apiServer.extraArgs:
+        - "--feature-gates"
+        - "RemoteRequestHeaderUID=false"
+    asserts:
+      - equal:
+          path: spec.apiServer.extraArgs
+          value:
+            - "--feature-gates"
+            - "RemoteRequestHeaderUID=false"
+            - "--authentication-config=/etc/kubernetes/authentication-config/config.yaml"
+        documentIndex: 1
+
+  - it: renders nothing when --emulated-version is written as two elements
+    # Same rule on the flag that decides the version: an unread value could be
+    # a minor with no such flag at all.
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/cluster.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+      version: "v1.35"
+      controlPlane.apiServer.extraArgs:
+        - "--emulated-version"
+        - "1.31"
+    asserts:
+      - equal:
+          path: spec.apiServer.extraArgs
+          value:
+            - "--emulated-version"
+            - "1.31"
+            - "--authentication-config=/etc/kubernetes/authentication-config/config.yaml"
+        documentIndex: 1
+
+  - it: carries a kube emulation into a later entry that names another component
+    # --emulated-version is a StringSlice, so wardle=1.2 joins 1.31 rather than
+    # replacing it and the effective version is still 1.31, below the gate's
+    # first spec. Resetting per entry would render the header flag for a version
+    # that has no such flag.
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/cluster.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+      version: "v1.34"
+      controlPlane.apiServer.extraArgs:
+        - "--emulated-version=1.31"
+        - "--emulated-version=wardle=1.2"
+    asserts:
+      - equal:
+          path: spec.apiServer.extraArgs
+          value:
+            - "--emulated-version=1.31"
+            - "--emulated-version=wardle=1.2"
+            - "--authentication-config=/etc/kubernetes/authentication-config/config.yaml"
+        documentIndex: 1
+
+  - it: keeps the last non-empty --emulated-version when a later one is empty
+    # An empty value parses to an empty slice and emulates nothing, so an
+    # apiserver handed both entries still emulates 1.32, below the floor.
+    # Reading the empty entry as the operative one would drop the emulation and
+    # render the header flag for the image tag instead.
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/cluster.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+      version: "v1.34"
+      controlPlane.apiServer.extraArgs:
+        - "--emulated-version=1.32"
+        - "--emulated-version="
+    asserts:
+      - equal:
+          path: spec.apiServer.extraArgs
+          value:
+            - "--emulated-version=1.32"
+            - "--emulated-version="
+            - "--authentication-config=/etc/kubernetes/authentication-config/config.yaml"
+        documentIndex: 1
+
+  - it: splits a component element at its first equals sign only
+    # toVersionMap splits with SplitN(compVer, "=", 2) and version.Parse ignores
+    # what follows the numbers, so kube=1.32=x emulates 1.32. Requiring exactly
+    # two parts would skip the element and render the header flag for v1.34.
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/cluster.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+      version: "v1.34"
+      controlPlane.apiServer.extraArgs:
+        - "--emulated-version=kube=1.32=x"
+    asserts:
+      - equal:
+          path: spec.apiServer.extraArgs
+          value:
+            - "--emulated-version=kube=1.32=x"
+            - "--authentication-config=/etc/kubernetes/authentication-config/config.yaml"
+        documentIndex: 1
+
+  - it: ignores an --emulated-version entry naming another component
+    # Emulating an aggregated apiserver's version says nothing about the gate on the
+    # tenant kube-apiserver.
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/cluster.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+      version: "v1.34"
+      controlPlane.apiServer.extraArgs:
+        - "--emulated-version=wardle=1.2"
+    asserts:
+      - equal:
+          path: spec.apiServer.extraArgs
+          value:
+            - "--emulated-version=wardle=1.2"
+            - "--authentication-config=/etc/kubernetes/authentication-config/config.yaml"
+            - "--requestheader-uid-headers=X-Remote-Uid"
+        documentIndex: 1
+
+  - it: does not let --emulated-version raise the version the chart renders for
+    # Emulation only moves the effective version down. Reading a higher one would
+    # render the header flag on a binary whose gate is still alpha.
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/cluster.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+      version: "v1.32"
+      controlPlane.apiServer.extraArgs:
+        - "--emulated-version=1.35"
+    asserts:
+      - equal:
+          path: spec.apiServer.extraArgs
+          value:
+            - "--emulated-version=1.35"
+            - "--authentication-config=/etc/kubernetes/authentication-config/config.yaml"
+        documentIndex: 1
+
+  - it: ignores an --emulated-version whose minor is not a number
+    # The numeric run here is 1 alone, one component where version.Parse needs
+    # two, so the apiserver rejects the value and fails either way. Reading the
+    # minor as 0 would suppress the header flag on an opinion nobody expressed.
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/cluster.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+      version: "v1.34"
+      controlPlane.apiServer.extraArgs:
+        - "--emulated-version=1.garbage"
+    asserts:
+      - equal:
+          path: spec.apiServer.extraArgs
+          value:
+            - "--emulated-version=1.garbage"
+            - "--authentication-config=/etc/kubernetes/authentication-config/config.yaml"
+            - "--requestheader-uid-headers=X-Remote-Uid"
+        documentIndex: 1
+
+  - it: ignores an --emulated-version value it cannot parse
+    # Same treatment as an unreadable gate value: the apiserver rejects it on its own
+    # terms, and the chart does not guess.
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/cluster.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+      version: "v1.34"
+      controlPlane.apiServer.extraArgs:
+        - "--emulated-version=garbage"
+    asserts:
+      - equal:
+          path: spec.apiServer.extraArgs
+          value:
+            - "--emulated-version=garbage"
+            - "--authentication-config=/etc/kubernetes/authentication-config/config.yaml"
+            - "--requestheader-uid-headers=X-Remote-Uid"
+        documentIndex: 1
+
+  - it: fails on a patch-level --emulated-version and names the entry
+    # toVersionMap refuses a non-zero patch component, so the apiserver exits
+    # before it reads anything else. Reading the minor and rendering past it
+    # would hand the operator a crash loop instead of this message.
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/cluster.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+      version: "v1.34"
+      controlPlane.apiServer.extraArgs:
+        - "--emulated-version=1.32.4"
+    asserts:
+      - failedTemplate:
+          errorMessage: 'controlPlane.apiServer.extraArgs contains "--emulated-version=1.32.4" while spec.oidc.mode is "System" — the kube-apiserver refuses an --emulated-version with a non-zero patch component (patch version not allowed), so the control plane would refuse to start. Emulation takes major.minor: write 1.32 instead of 1.32.4.'
+
+  - it: fails on a patch-level kube element of a component-prefixed value
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/cluster.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+      version: "v1.34"
+      controlPlane.apiServer.extraArgs:
+        - "--emulated-version=kube=1.33.1"
+    asserts:
+      - failedTemplate:
+          errorMessage: 'controlPlane.apiServer.extraArgs contains "--emulated-version=kube=1.33.1" while spec.oidc.mode is "System" — the kube-apiserver refuses an --emulated-version with a non-zero patch component (patch version not allowed), so the control plane would refuse to start. Emulation takes major.minor: write 1.33 instead of 1.33.1.'
+
+  - it: fails on a patch-level --emulated-version below the floor too
+    # The refusal is the apiserver's on every version, so it does not wait for
+    # the UID flags to be rendered.
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/cluster.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+      version: "v1.31"
+      controlPlane.apiServer.extraArgs:
+        - "--emulated-version=1.31.2"
+    asserts:
+      - failedTemplate:
+          errorMessage: 'controlPlane.apiServer.extraArgs contains "--emulated-version=1.31.2" while spec.oidc.mode is "System" — the kube-apiserver refuses an --emulated-version with a non-zero patch component (patch version not allowed), so the control plane would refuse to start. Emulation takes major.minor: write 1.31 instead of 1.31.2.'
+
+  - it: reads a zero patch component as the minor it names
+    # Patch() is 0 here, which toVersionMap accepts, so refusing it would break
+    # a control plane that starts.
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/cluster.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+      version: "v1.34"
+      controlPlane.apiServer.extraArgs:
+        - "--emulated-version=1.32.0"
+    asserts:
+      - equal:
+          path: spec.apiServer.extraArgs
+          value:
+            - "--emulated-version=1.32.0"
+            - "--authentication-config=/etc/kubernetes/authentication-config/config.yaml"
+        documentIndex: 1
+
+  - it: reads a zero patch component with a suffix as the minor it names
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/cluster.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+      version: "v1.34"
+      controlPlane.apiServer.extraArgs:
+        - "--emulated-version=1.32.0-rc"
+    asserts:
+      - equal:
+          path: spec.apiServer.extraArgs
+          value:
+            - "--emulated-version=1.32.0-rc"
+            - "--authentication-config=/etc/kubernetes/authentication-config/config.yaml"
+        documentIndex: 1
+
+  - it: reads a v-prefixed --emulated-version as the minor it names
+    # versionMatchRE takes an optional lowercase v in front of the numbers.
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/cluster.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+      version: "v1.34"
+      controlPlane.apiServer.extraArgs:
+        - "--emulated-version=v1.32"
+    asserts:
+      - equal:
+          path: spec.apiServer.extraArgs
+          value:
+            - "--emulated-version=v1.32"
+            - "--authentication-config=/etc/kubernetes/authentication-config/config.yaml"
+        documentIndex: 1
+
+  - it: reads a suffixed --emulated-version as the minor it names
+    # version.Parse ignores whatever follows the numeric run, so 1.32-rc
+    # emulates 1.32. Skipping it would render the header flag for the image
+    # tag on an apiserver emulating a version that refuses it.
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/cluster.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+      version: "v1.34"
+      controlPlane.apiServer.extraArgs:
+        - "--emulated-version=1.32-rc"
+    asserts:
+      - equal:
+          path: spec.apiServer.extraArgs
+          value:
+            - "--emulated-version=1.32-rc"
+            - "--authentication-config=/etc/kubernetes/authentication-config/config.yaml"
+        documentIndex: 1
+
+  - it: reads a suffixed --emulated-version above the floor as the minor it names
+    # Emulating 1.32 renders nothing whether the minor reads as 32 or as 0, so
+    # these cases emulate 1.33, where only a correct reading renders the header.
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/cluster.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+      version: "v1.35"
+      controlPlane.apiServer.extraArgs:
+        - "--emulated-version=1.33-rc"
+    asserts:
+      - equal:
+          path: spec.apiServer.extraArgs
+          value:
+            - "--emulated-version=1.33-rc"
+            - "--authentication-config=/etc/kubernetes/authentication-config/config.yaml"
+            - "--requestheader-uid-headers=X-Remote-Uid"
+        documentIndex: 1
+
+  - it: reads a v-prefixed --emulated-version above the floor as the minor it names
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/cluster.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+      version: "v1.35"
+      controlPlane.apiServer.extraArgs:
+        - "--emulated-version=v1.33"
+    asserts:
+      - equal:
+          path: spec.apiServer.extraArgs
+          value:
+            - "--emulated-version=v1.33"
+            - "--authentication-config=/etc/kubernetes/authentication-config/config.yaml"
+            - "--requestheader-uid-headers=X-Remote-Uid"
+        documentIndex: 1
+
+  - it: reads a zero patch component above the floor as the minor it names
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/cluster.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+      version: "v1.35"
+      controlPlane.apiServer.extraArgs:
+        - "--emulated-version=1.33.0"
+    asserts:
+      - equal:
+          path: spec.apiServer.extraArgs
+          value:
+            - "--emulated-version=1.33.0"
+            - "--authentication-config=/etc/kubernetes/authentication-config/config.yaml"
+            - "--requestheader-uid-headers=X-Remote-Uid"
+        documentIndex: 1
+
+  - it: reads a component element split at its first equals sign above the floor
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/cluster.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+      version: "v1.35"
+      controlPlane.apiServer.extraArgs:
+        - "--emulated-version=kube=1.33=x"
+    asserts:
+      - equal:
+          path: spec.apiServer.extraArgs
+          value:
+            - "--emulated-version=kube=1.33=x"
+            - "--authentication-config=/etc/kubernetes/authentication-config/config.yaml"
+            - "--requestheader-uid-headers=X-Remote-Uid"
+        documentIndex: 1
+
+  - it: does not refuse a patch-level element inside a quoted value
+    # The apiserver strips the quotes and reads the whole value as one element
+    # naming wardle, while splitting it unquoted leaves a kube element 1.32.4"
+    # that the version pattern still matches. The chart withholds a reading of
+    # a quoted value here as it does for the version, and the apiserver keeps
+    # the last word.
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/cluster.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+      version: "v1.34"
+      controlPlane.apiServer.extraArgs:
+        - '--emulated-version="wardle=1.2,1.32.4"'
+    asserts:
+      - equal:
+          path: spec.apiServer.extraArgs
+          value:
+            - '--emulated-version="wardle=1.2,1.32.4"'
+            - "--authentication-config=/etc/kubernetes/authentication-config/config.yaml"
+        documentIndex: 1
+
+  - it: reads a capitalised True as an explicit enable that beats AllBeta=false
+    # strconv.ParseBool accepts True, TRUE, T and t alongside true, so the
+    # chart accepts exactly those spellings. Comparing against true alone would
+    # read this as no opinion and take the blanket opt-out instead.
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/cluster.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+      version: "v1.34"
+      controlPlane.apiServer.extraArgs:
+        - "--feature-gates=AllBeta=false,RemoteRequestHeaderUID=True"
+    asserts:
+      - equal:
+          path: spec.apiServer.extraArgs
+          value:
+            - "--feature-gates=AllBeta=false,RemoteRequestHeaderUID=True"
+            - "--authentication-config=/etc/kubernetes/authentication-config/config.yaml"
+            - "--requestheader-uid-headers=X-Remote-Uid"
+        documentIndex: 1
+
+  - it: reads a single-letter t as an explicit enable that beats AllBeta=false
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/cluster.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+      version: "v1.34"
+      controlPlane.apiServer.extraArgs:
+        - "--feature-gates=AllBeta=false,RemoteRequestHeaderUID=t"
+    asserts:
+      - equal:
+          path: spec.apiServer.extraArgs
+          value:
+            - "--feature-gates=AllBeta=false,RemoteRequestHeaderUID=t"
+            - "--authentication-config=/etc/kubernetes/authentication-config/config.yaml"
+            - "--requestheader-uid-headers=X-Remote-Uid"
+        documentIndex: 1
+
+  - it: does not read a mixed-case gate value as an opt-out from v1.33 on
+    # strconv.ParseBool rejects fAlSe, so the apiserver never disables the gate
+    # on it. Folding case before the match would read it as an opt-out and
+    # withhold the header flag.
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/cluster.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+      version: "v1.34"
+      controlPlane.apiServer.extraArgs:
+        - "--feature-gates=RemoteRequestHeaderUID=fAlSe"
+    asserts:
+      - equal:
+          path: spec.apiServer.extraArgs
+          value:
+            - "--feature-gates=RemoteRequestHeaderUID=fAlSe"
+            - "--authentication-config=/etc/kubernetes/authentication-config/config.yaml"
+            - "--requestheader-uid-headers=X-Remote-Uid"
+        documentIndex: 1
+
+  - it: reads a capitalised F gate value as an opt-out from v1.33 on
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/cluster.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+      version: "v1.34"
+      controlPlane.apiServer.extraArgs:
+        - "--feature-gates=RemoteRequestHeaderUID=F"
+    asserts:
+      - equal:
+          path: spec.apiServer.extraArgs
+          value:
+            - "--feature-gates=RemoteRequestHeaderUID=F"
+            - "--authentication-config=/etc/kubernetes/authentication-config/config.yaml"
+        documentIndex: 1
+
+  - it: names the emulated version in the opt-out message when emulation decided it
+    # The message is the migration instruction, so it has to name the version the
+    # decision was taken at rather than the image tag.
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/cluster.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+      version: "v1.35"
+      controlPlane.apiServer.extraArgs:
+        - "--emulated-version=1.33"
+        - "--feature-gates=RemoteRequestHeaderUID=false"
+        - "--requestheader-uid-headers=X-Remote-Uid"
+    asserts:
+      - failedTemplate:
+          errorMessage: 'controlPlane.apiServer.extraArgs contains "--requestheader-uid-headers=X-Remote-Uid" alongside "--feature-gates=RemoteRequestHeaderUID=false", while spec.oidc.mode is "System" on Kubernetes v1.35 emulating 1.33 — the kube-apiserver rejects a --requestheader-uid-headers list while RemoteRequestHeaderUID is disabled, so the control plane would refuse to start. Drop one of the two: your header flag, or the gate setting that turns RemoteRequestHeaderUID off.'
+
+  ###############################################
+  # mode: System — bootstrap Job + users[]      #
+  ###############################################
+
+  - it: System mode renders the bootstrap Job with the policy.cozystack label
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/oidc-rbac-job.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+      oidc.users:
+        - email: alice@example.org
+          role: admin
+    asserts:
+      # ServiceAccount (0), Role (1), RoleBinding (2), Job bootstrap (3), Job cleanup (4)
+      - isKind:
+          of: Job
+        documentIndex: 3
+      - equal:
+          path: metadata.name
+          value: kubernetes-app-oidc-bootstrap
+        documentIndex: 3
+      - equal:
+          path: spec.template.metadata.labels["policy.cozystack.io/allow-to-apiserver"]
+          value: "true"
+        documentIndex: 3
+
+  - it: bootstrap Job command builds a CRB for each users[] entry
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/oidc-rbac-job.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+      oidc.users:
+        - email: alice@example.org
+          role: admin
+        - email: bob@example.org
+          role: view
+    asserts:
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: 'name: "alice@example.org"'
+        documentIndex: 3
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: 'name: "bob@example.org"'
+        documentIndex: 3
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: 'name: cluster-admin'
+        documentIndex: 3
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: 'name: view'
+        documentIndex: 3
+
+  - it: mode=System aborts the Job instead of leaving the OIDC kubeconfig Secret as the install-time placeholder when the tenant CA is missing
+    # A placeholder kubeconfig cannot authenticate, so the release must not go Ready with it.
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/oidc-rbac-job.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      oidc.mode: System
+      oidc.users:
+        - email: alice@example.org
+          role: admin
+    asserts:
+      - notMatchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: 'WARNING:.*leaving OIDC kubeconfig Secret as the install-time placeholder'
+        documentIndex: 3
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: 'if \[ -z "\$CA_DATA" \]; then\n\s+echo "tenant admin kubeconfig has no certificate-authority-data; refusing to leave the OIDC kubeconfig Secret as the install-time placeholder" >&2\n\s+exit 1\n\s+fi'
+        documentIndex: 3
+
+  ###############################################
+  # mode: CustomConfig                          #
+  ###############################################
+
+  - it: CustomConfig mode writes the operator-supplied AuthenticationConfiguration verbatim
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/oidc-authn-config.yaml
+    set:
+      _cluster.oidc-enabled: "false"
+      oidc.mode: CustomConfig
+      oidc.customConfig.config: |
+        apiVersion: apiserver.config.k8s.io/v1beta1
+        kind: AuthenticationConfiguration
+        jwt:
+        - issuer:
+            url: https://idp.example.com
+            audiences: [my-cluster]
+    asserts:
+      - isKind:
+          of: Secret
+      - equal:
+          path: metadata.name
+          value: kubernetes-app-oidc-authn-config
+      - matchRegex:
+          path: stringData["config.yaml"]
+          pattern: "url: https://idp.example.com"
+      # Verbatim means verbatim: the uid mapping System mode renders must not
+      # be grafted onto a configuration the operator owns.
+      - notMatchRegex:
+          path: stringData["config.yaml"]
+          pattern: 'uid:'
+
+  - it: CustomConfig mode with secretRef does not emit a chart-owned Secret
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/oidc-authn-config.yaml
+    set:
+      _cluster.oidc-enabled: "false"
+      oidc.mode: CustomConfig
+      oidc.customConfig.secretRef.name: my-byo-authn
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  - it: CustomConfig mode with secretRef mounts the tenant-supplied Secret on the KCP
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/cluster.yaml
+    set:
+      oidc.mode: CustomConfig
+      oidc.customConfig.secretRef.name: my-byo-authn
+    asserts:
+      - equal:
+          path: spec.deployment.extraVolumes[2].secret.secretName
+          value: my-byo-authn
+        documentIndex: 1
+
+  - it: CustomConfig mode does not pre-render the OIDC kubeconfig Secret
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/oidc-kubeconfig-secret.yaml
+    set:
+      oidc.mode: CustomConfig
+      oidc.customConfig.config: "..."
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  - it: CustomConfig mode does not render any Keycloak objects
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/oidc-keycloak.yaml
+    set:
+      oidc.mode: CustomConfig
+      oidc.customConfig.config: "..."
+    capabilities:
+      apiVersions:
+        - v1.edp.epam.com/v1
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  - it: CustomConfig mode fails when neither config nor secretRef is supplied
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/oidc-authn-config.yaml
+    set:
+      oidc.mode: CustomConfig
+    asserts:
+      - failedTemplate:
+          errorMessage: "spec.oidc.mode: CustomConfig requires either spec.oidc.customConfig.config (inline AuthenticationConfiguration) or spec.oidc.customConfig.secretRef.name (Secret with config.yaml key)."
+
+  - it: CustomConfig mode rejects setting both config and secretRef
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/oidc-authn-config.yaml
+    set:
+      oidc.mode: CustomConfig
+      oidc.customConfig.config: "..."
+      oidc.customConfig.secretRef.name: my-byo
+    asserts:
+      - failedTemplate:
+          errorMessage: "spec.oidc.customConfig: set exactly one of `config` (inline) or `secretRef.name` — they are mutually exclusive."
+
+  # The managed cluster's apiserver trusts the platform Keycloak realm, whose
+  # name is driven by _cluster.oidc-realm-name (authentication.oidc.realmName in
+  # the platform). A renamed realm must reach the AuthenticationConfiguration
+  # issuer, or the guest apiserver rejects every token the platform mints.
+  - it: System mode threads a custom realm name into the issuer
+    release:
+      name: kubernetes-app
+      namespace: tenant-foo
+    template: templates/oidc-authn-config.yaml
+    set:
+      _cluster.oidc-enabled: "true"
+      _cluster.root-host: example.org
+      _cluster.oidc-realm-name: acme
+      oidc.mode: System
+    asserts:
+      - matchRegex:
+          path: stringData["config.yaml"]
+          pattern: "url: https://keycloak.example.org/realms/acme"
+      - notMatchRegex:
+          path: stringData["config.yaml"]
+          pattern: "/realms/cozy"
+      # The claimValidationRules denial message names the realm; on a renamed
+      # realm it must not keep telling the user to look in "cozy".
+      - matchRegex:
+          path: stringData["config.yaml"]
+          pattern: "group in the acme realm"
+      - notMatchRegex:
+          path: stringData["config.yaml"]
+          pattern: "group in the cozy realm"
diff --git a/packages/apps/kubernetes/tests/oidc_withhold_test.yaml b/packages/apps/kubernetes/tests/oidc_withhold_test.yaml
new file mode 100644
index 0000000000..d0ca27a78d
--- /dev/null
+++ b/packages/apps/kubernetes/tests/oidc_withhold_test.yaml
@@ -0,0 +1,168 @@
+suite: tenant kube-apiserver OIDC, refusals and additions next to an entry the chart cannot read
+
+values:
+  - values/common.yaml
+  - values/oidc-system.yaml
+
+release:
+  name: kubernetes-app
+  namespace: tenant-foo
+
+templates:
+  - templates/cluster.yaml
+
+# An entry written as a flag and a value in two elements hides its value from
+# the chart. What it hides can move the effective version (--emulated-version)
+# or the gate (--feature-gates); the cases below are the ones where the
+# apiserver's answer does not depend on it.
+
+tests:
+  - it: refuses an explicit gate opt-out beside a header entry when --emulated-version is unreadable
+    # Emulation only lowers the version, and the gate never matures going down,
+    # so an opt-out stays an opt-out whatever the hidden version is.
+    set:
+      version: "v1.34"
+      controlPlane.apiServer.extraArgs:
+        - "--feature-gates=RemoteRequestHeaderUID=false"
+        - "--requestheader-uid-headers=X-Remote-Uid"
+        - "--emulated-version"
+        - "1.34"
+    asserts:
+      - failedTemplate:
+          errorMessage: 'controlPlane.apiServer.extraArgs contains "--requestheader-uid-headers=X-Remote-Uid" alongside "--feature-gates=RemoteRequestHeaderUID=false", while spec.oidc.mode is "System" on Kubernetes v1.34 — the kube-apiserver rejects a --requestheader-uid-headers list while RemoteRequestHeaderUID is disabled, so the control plane would refuse to start. Drop one of the two: your header flag, or the gate setting that turns RemoteRequestHeaderUID off.'
+
+  - it: renders an opt-out beside a header entry when --feature-gates is unreadable
+    # The hidden term can turn the gate back on, since the last term for a
+    # name wins across entries, so the chart cannot call this fatal.
+    set:
+      version: "v1.34"
+      controlPlane.apiServer.extraArgs:
+        - "--feature-gates=RemoteRequestHeaderUID=false"
+        - "--requestheader-uid-headers=X-Remote-Uid"
+        - "--feature-gates"
+        - "RemoteRequestHeaderUID=true"
+    asserts:
+      - equal:
+          path: spec.apiServer.extraArgs
+          value:
+            - "--feature-gates=RemoteRequestHeaderUID=false"
+            - "--requestheader-uid-headers=X-Remote-Uid"
+            - "--feature-gates"
+            - "RemoteRequestHeaderUID=true"
+            - "--authentication-config=/etc/kubernetes/authentication-config/config.yaml"
+        documentIndex: 1
+
+  - it: refuses an empty header element when --feature-gates is unreadable
+    # The gate off rejects any list and the gate on rejects the empty element.
+    set:
+      version: "v1.34"
+      controlPlane.apiServer.extraArgs:
+        - "--requestheader-uid-headers=X-Remote-Uid,"
+        - "--feature-gates"
+        - "Foo=true"
+    asserts:
+      - failedTemplate:
+          errorMessage: 'controlPlane.apiServer.extraArgs contains "--requestheader-uid-headers=X-Remote-Uid," while spec.oidc.mode is "System" — the kube-apiserver rejects a uid-headers list with an empty or whitespace-only element, and it validates every entry of the flag as one list, so the control plane would refuse to start. Remove the empty element from your entry, or drop the entry.'
+
+  - it: refuses an empty header element when --emulated-version is unreadable
+    set:
+      version: "v1.34"
+      controlPlane.apiServer.extraArgs:
+        - "--requestheader-uid-headers=X-Remote-Uid,"
+        - "--emulated-version"
+        - "1.34"
+    asserts:
+      - failedTemplate:
+          errorMessage: 'controlPlane.apiServer.extraArgs contains "--requestheader-uid-headers=X-Remote-Uid," while spec.oidc.mode is "System" — the kube-apiserver rejects a uid-headers list with an empty or whitespace-only element, and it validates every entry of the flag as one list, so the control plane would refuse to start. Remove the empty element from your entry, or drop the entry.'
+
+  - it: adds X-Remote-Uid beside a header list without it when --feature-gates is unreadable
+    # The gate off rejects the operator's list on its own; the gate on accepts
+    # it only with X-Remote-Uid in the union. The element helps in one state
+    # and changes nothing in the other.
+    set:
+      version: "v1.33"
+      controlPlane.apiServer.extraArgs:
+        - "--feature-gates"
+        - "Foo=true"
+        - "--requestheader-uid-headers=X-Foo"
+    asserts:
+      - equal:
+          path: spec.apiServer.extraArgs
+          value:
+            - "--feature-gates"
+            - "Foo=true"
+            - "--requestheader-uid-headers=X-Foo"
+            - "--authentication-config=/etc/kubernetes/authentication-config/config.yaml"
+            - "--requestheader-uid-headers=X-Remote-Uid"
+        documentIndex: 1
+
+  - it: adds X-Remote-Uid beside a header list without it when --emulated-version is unreadable
+    set:
+      version: "v1.35"
+      controlPlane.apiServer.extraArgs:
+        - "--emulated-version"
+        - "1.34"
+        - "--requestheader-uid-headers=X-Foo"
+    asserts:
+      - equal:
+          path: spec.apiServer.extraArgs
+          value:
+            - "--emulated-version"
+            - "1.34"
+            - "--requestheader-uid-headers=X-Foo"
+            - "--authentication-config=/etc/kubernetes/authentication-config/config.yaml"
+            - "--requestheader-uid-headers=X-Remote-Uid"
+        documentIndex: 1
+
+  - it: adds nothing beside a conforming header list when --feature-gates is unreadable
+    set:
+      version: "v1.33"
+      controlPlane.apiServer.extraArgs:
+        - "--feature-gates"
+        - "Foo=true"
+        - "--requestheader-uid-headers=X-Remote-Uid"
+    asserts:
+      - equal:
+          path: spec.apiServer.extraArgs
+          value:
+            - "--feature-gates"
+            - "Foo=true"
+            - "--requestheader-uid-headers=X-Remote-Uid"
+            - "--authentication-config=/etc/kubernetes/authentication-config/config.yaml"
+        documentIndex: 1
+
+  - it: refuses an empty header element beside an opt-out when --feature-gates is unreadable
+    # The hidden term keeps the opt-out refusal off, but the empty element is
+    # fatal whichever way it leaves the gate.
+    set:
+      version: "v1.33"
+      controlPlane.apiServer.extraArgs:
+        - "--feature-gates=RemoteRequestHeaderUID=false"
+        - "--feature-gates"
+        - "Foo=true"
+        - "--requestheader-uid-headers=X-Remote-Uid,"
+    asserts:
+      - failedTemplate:
+          errorMessage: 'controlPlane.apiServer.extraArgs contains "--requestheader-uid-headers=X-Remote-Uid," while spec.oidc.mode is "System" — the kube-apiserver rejects a uid-headers list with an empty or whitespace-only element, and it validates every entry of the flag as one list, so the control plane would refuse to start. Remove the empty element from your entry, or drop the entry.'
+
+  - it: renders a blanket opt-out beside a header entry when --emulated-version is unreadable
+    # AllBeta=false reaches the gate only while it is beta. A hidden emulated
+    # 1.32 makes it alpha again, where AllAlpha=true switches it on, so only
+    # an explicit RemoteRequestHeaderUID=false survives an unread version.
+    set:
+      version: "v1.33"
+      controlPlane.apiServer.extraArgs:
+        - "--feature-gates=AllBeta=false,AllAlpha=true"
+        - "--requestheader-uid-headers=X-Remote-Uid"
+        - "--emulated-version"
+        - "1.32"
+    asserts:
+      - equal:
+          path: spec.apiServer.extraArgs
+          value:
+            - "--feature-gates=AllBeta=false,AllAlpha=true"
+            - "--requestheader-uid-headers=X-Remote-Uid"
+            - "--emulated-version"
+            - "1.32"
+            - "--authentication-config=/etc/kubernetes/authentication-config/config.yaml"
+        documentIndex: 1
diff --git a/packages/apps/kubernetes/tests/substrate_proxmox_addons_test.yaml b/packages/apps/kubernetes/tests/substrate_proxmox_addons_test.yaml
new file mode 100644
index 0000000000..a55c05dcbd
--- /dev/null
+++ b/packages/apps/kubernetes/tests/substrate_proxmox_addons_test.yaml
@@ -0,0 +1,321 @@
+suite: proxmox substrate tenant addons
+# Where the hypervisor token is allowed to be, and what the tenant gets instead.
+#
+# The controller half of both components runs in THIS cluster and reaches the
+# tenant over its admin kubeconfig; the tenant gets only the CSI node plugin,
+# which mounts no credentials. That split is the whole point of these objects,
+# so it is asserted from both ends: the management-side Deployments must carry
+# the Secret, and the tenant-side release must carry nothing that could become
+# one.
+templates:
+  - templates/csi-proxmox/controller.yaml
+  - templates/ccm-proxmox/controller.yaml
+  - templates/helmreleases/csi-proxmox.yaml
+release:
+  name: kubernetes-test
+  namespace: tenant-test
+set: &base
+  _namespace:
+    etcd: etcd-test
+  _cluster:
+    cluster-domain: cozy.local
+  version: "v1.35"
+  substrate: proxmox
+  proxmox:
+    dnsServers: ["8.8.8.8"]
+    allowedNodes: [prox-home]
+    ipv4Config:
+      addresses: ["10.0.0.160-10.0.0.170"]
+      gateway: "10.0.0.1"
+      prefix: 24
+    csi:
+      enabled: true
+      credentialsSecretName: proxmox-csi-creds
+      storageClasses:
+        - name: proxmox
+          storage: main-pool
+    ccm:
+      credentialsSecretName: proxmox-ccm-creds
+tests:
+  # --- the tenant side holds nothing ---------------------------------------
+  - it: sends the tenant no credentials at all
+    template: templates/helmreleases/csi-proxmox.yaml
+    documentSelector:
+      path: kind
+      value: HelmRelease
+    asserts:
+      # A valuesFrom here would hand the token to the tenant: Flux would read
+      # the Secret in this namespace and inject it into a release installed
+      # inside the tenant, where the chart writes it to a Secret the tenant can
+      # read with the admin kubeconfig the resource definition hands it.
+      - notExists:
+          path: spec.valuesFrom
+      # The chart's own secrets.yaml is gated on a non-empty clusters list, so
+      # an empty one is what keeps it from rendering.
+      - equal:
+          path: spec.values.proxmox-csi-plugin.config.clusters
+          value: []
+      # And the controller that would have consumed it does not run there.
+      - equal:
+          path: spec.values.proxmox-csi-plugin.replicaCount
+          value: 0
+      # CSIStorageCapacity is published by the provisioner sidecar, which now
+      # runs in the management cluster and owns those objects through a Pod that
+      # does not exist in the tenant. Left on, CSIDriver.storageCapacity=true and
+      # the scheduler waits forever for capacity nobody publishes.
+      - equal:
+          path: spec.values.proxmox-csi-plugin.options.enableCapacity
+          value: false
+      # The chart hardcodes CSIDriver.storageCapacity: true, so the value above
+      # does not reach the object the scheduler reads. Without this patch a Pod
+      # with a Proxmox PVC never schedules.
+      - equal:
+          path: spec.postRenderers[0].kustomize.patches[0].target.kind
+          value: CSIDriver
+      - matchRegex:
+          path: spec.postRenderers[0].kustomize.patches[0].patch
+          pattern: 'path: /spec/storageCapacity'
+
+  - it: still gives the tenant its storage classes and its node plugin release
+    template: templates/helmreleases/csi-proxmox.yaml
+    documentSelector:
+      path: kind
+      value: HelmRelease
+    asserts:
+      - equal:
+          path: spec.values.proxmox-csi-plugin.storageClass[0].name
+          value: proxmox
+      - equal:
+          path: spec.values.proxmox-csi-plugin.storageClass[0].storage
+          value: main-pool
+      - equal:
+          path: spec.kubeConfig.secretRef.name
+          value: kubernetes-test-admin-kubeconfig
+
+  # --- the management side holds it instead ---------------------------------
+  - it: runs the CSI controller here, with the Secret mounted and the tenant as its target
+    template: templates/csi-proxmox/controller.yaml
+    documentSelector:
+      path: kind
+      value: Deployment
+    asserts:
+      - equal:
+          path: metadata.name
+          value: kubernetes-test-pcsi-controller
+      - contains:
+          path: spec.template.spec.volumes
+          content:
+            name: proxmox-credentials
+            secret:
+              secretName: proxmox-csi-creds
+      # Every container that talks to Kubernetes must talk to the TENANT's
+      # apiserver. A sidecar left on the in-cluster ServiceAccount would
+      # reconcile this cluster's objects instead of the tenant's.
+      - equal:
+          path: spec.template.spec.containers[?(@.name=="csi-driver")].args[3]
+          value: "--kubeconfig=/etc/kubernetes/kubeconfig/super-admin.svc"
+      - equal:
+          path: spec.template.spec.containers[?(@.name=="csi-attacher")].args[3]
+          value: "--kubeconfig=/etc/kubernetes/kubeconfig/super-admin.svc"
+      - equal:
+          path: spec.template.spec.containers[?(@.name=="csi-resizer")].args[3]
+          value: "--kubeconfig=/etc/kubernetes/kubeconfig/super-admin.svc"
+
+  - it: runs the cloud-controller-manager here too
+    template: templates/ccm-proxmox/controller.yaml
+    documentSelector:
+      path: kind
+      value: Deployment
+    asserts:
+      - equal:
+          path: metadata.name
+          value: kubernetes-test-pccm
+      - contains:
+          path: spec.template.spec.volumes
+          content:
+            name: proxmox-credentials
+            secret:
+              secretName: proxmox-ccm-creds
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: "--kubeconfig=/etc/kubernetes/kubeconfig/super-admin.svc"
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: "--controllers=cloud-node,cloud-node-lifecycle"
+      # capmox mode, not the default one. The default writes the Node's
+      # providerID as proxmox://<node>/<vmid> while capmox has already written
+      # proxmox://<SMBIOS UUID> on the Machine, and the two never match.
+      - matchRegex:
+          path: spec.template.spec.initContainers[1].command[2]
+          pattern: 'provider: capmox'
+
+  # A blanket `operator: Exists` also matches
+  # node.kubernetes.io/unreachable:NoExecute with no tolerationSeconds, which
+  # stops admission adding the bounded 300s one and lets the Pod outlive its
+  # Node. `notContains` on that one element does not catch a list that ALSO has
+  # the unreachable toleration spelled out, so the whole list is compared.
+  - it: tolerates exactly two taints and no others
+    template: templates/ccm-proxmox/controller.yaml
+    documentSelector:
+      path: kind
+      value: Deployment
+    asserts:
+      - equal:
+          path: spec.template.spec.tolerations
+          value:
+            - key: CriticalAddonsOnly
+              operator: Exists
+            - key: node-role.kubernetes.io/control-plane
+              operator: Exists
+              effect: NoSchedule
+
+  # --- volumes are owned per tenant, not by one shared id -------------------
+  # The driver names volumes vm-<controllerVmID>-pvc-<uuid> and defaults that id
+  # to 9999, which made every tenant's volumes indistinguishable on shared
+  # storage. These cases pin that the id is set and that it follows both the
+  # tenant namespace and the release name, so two clusters never share an owner,
+  # not even two tenants' clusters that happen to have the same name.
+  - it: gives this tenant its own volume owner id
+    template: templates/csi-proxmox/controller.yaml
+    documentSelector:
+      path: kind
+      value: Deployment
+    asserts:
+      - matchRegex:
+          path: spec.template.spec.initContainers[1].command[2]
+          pattern: 'controllerVmID: 1[0-9]{5}|controllerVmID: [2-8][0-9]{5}'
+      - notMatchRegex:
+          path: spec.template.spec.initContainers[1].command[2]
+          pattern: 'controllerVmID: 9999$'
+
+  - it: and a different one to a different tenant
+    release:
+      name: kubernetes-other
+      namespace: tenant-test
+    template: templates/csi-proxmox/controller.yaml
+    documentSelector:
+      path: kind
+      value: Deployment
+    asserts:
+      - notMatchRegex:
+          path: spec.template.spec.initContainers[1].command[2]
+          pattern: 'controllerVmID: 350572'
+
+  - it: and a different one to a cluster of the same name in another tenant
+    release:
+      name: kubernetes-test
+      namespace: tenant-other
+    template: templates/csi-proxmox/controller.yaml
+    documentSelector:
+      path: kind
+      value: Deployment
+    asserts:
+      - matchRegex:
+          path: spec.template.spec.initContainers[1].command[2]
+          pattern: 'controllerVmID: 520398'
+      - notMatchRegex:
+          path: spec.template.spec.initContainers[1].command[2]
+          pattern: 'controllerVmID: 350572'
+
+  # --- refusals and the other substrate -------------------------------------
+  - it: refuses to render a proxmox cluster with no CCM credentials
+    set:
+      proxmox.ccm.credentialsSecretName: ""
+    template: templates/ccm-proxmox/controller.yaml
+    asserts:
+      - failedTemplate:
+          errorMessage: "proxmox.ccm.credentialsSecretName is required on the proxmox substrate: without a cloud-controller-manager every worker keeps the uninitialized taint and the cluster schedules nothing"
+
+  - it: refuses to render a CSI controller with no credentials
+    set:
+      proxmox.csi.credentialsSecretName: ""
+    template: templates/csi-proxmox/controller.yaml
+    asserts:
+      - failedTemplate:
+          errorMessage: "proxmox.csi.credentialsSecretName is required on the proxmox substrate: the CSI controller cannot reach the hypervisor without an API token"
+
+  - it: leaves the KubeVirt substrate untouched
+    set:
+      substrate: kubevirt
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  - it: propagates a verifiable hypervisor certificate to the CSI controller
+    set:
+      proxmox:
+        insecure: false
+        dnsServers: ["8.8.8.8"]
+        allowedNodes: [prox-home]
+        ipv4Config:
+          addresses: ["10.0.0.160-10.0.0.170"]
+          gateway: "10.0.0.1"
+          prefix: 24
+        csi:
+          enabled: true
+          credentialsSecretName: proxmox-csi-creds
+        ccm:
+          credentialsSecretName: proxmox-ccm-creds
+    template: templates/csi-proxmox/controller.yaml
+    documentSelector:
+      path: kind
+      value: Deployment
+    asserts:
+      - matchRegex:
+          path: spec.template.spec.initContainers[1].command[2]
+          pattern: 'insecure: false"'
+
+  - it: propagates a verifiable hypervisor certificate to the cloud-controller-manager
+    set:
+      proxmox:
+        insecure: false
+        dnsServers: ["8.8.8.8"]
+        allowedNodes: [prox-home]
+        ipv4Config:
+          addresses: ["10.0.0.160-10.0.0.170"]
+          gateway: "10.0.0.1"
+          prefix: 24
+        csi:
+          enabled: true
+          credentialsSecretName: proxmox-csi-creds
+        ccm:
+          credentialsSecretName: proxmox-ccm-creds
+    template: templates/ccm-proxmox/controller.yaml
+    documentSelector:
+      path: kind
+      value: Deployment
+    asserts:
+      - matchRegex:
+          path: spec.template.spec.initContainers[1].command[2]
+          pattern: 'insecure: false"'
+
+  - it: keeps the CCM when the CSI driver is switched off
+    set:
+      proxmox.csi.enabled: false
+    asserts:
+      - template: templates/ccm-proxmox/controller.yaml
+        containsDocument:
+          apiVersion: apps/v1
+          kind: Deployment
+          name: kubernetes-test-pccm
+          any: true
+      - template: templates/helmreleases/csi-proxmox.yaml
+        hasDocuments:
+          count: 0
+
+  # The switch has to reach the controller too: a controller with no driver to
+  # serve would still hold a hypervisor token, and would still demand one.
+  - it: runs no CSI controller and needs no CSI token when the driver is switched off
+    set:
+      proxmox.csi.enabled: false
+      proxmox.csi.credentialsSecretName: ""
+    asserts:
+      - template: templates/csi-proxmox/controller.yaml
+        hasDocuments:
+          count: 0
+      - template: templates/ccm-proxmox/controller.yaml
+        containsDocument:
+          apiVersion: apps/v1
+          kind: Deployment
+          name: kubernetes-test-pccm
+          any: true
diff --git a/packages/apps/kubernetes/tests/substrate_proxmox_gates_test.yaml b/packages/apps/kubernetes/tests/substrate_proxmox_gates_test.yaml
new file mode 100644
index 0000000000..545a2e5f48
--- /dev/null
+++ b/packages/apps/kubernetes/tests/substrate_proxmox_gates_test.yaml
@@ -0,0 +1,161 @@
+suite: proxmox switches off the in-cluster CCM and CSI
+
+# kccm and kubevirt-csi exist to reach the workers' VirtualMachines and their
+# DataVolumes IN THIS cluster. On proxmox the VMs are on an external hypervisor
+# and the equivalents are separate packages, so every one of these objects has
+# to disappear — and the in-tenant -csi HelmRelease with them, or Flux installs
+# a driver for a hypervisor that is not there.
+#
+# The negations carry `any: true`: without it a negated containsDocument passes
+# whatever the render contains.
+templates:
+  - templates/helmreleases/csi.yaml
+  - templates/csi/deploy.yaml
+  - templates/csi/infra-cluster-service-account.yaml
+  - templates/kccm/manager.yaml
+  - templates/kccm/service_account.yaml
+  - templates/kccm/kccm_role.yaml
+  - templates/kccm/kccm_role_binding.yaml
+  - templates/kccm/kccm_cluster_role.yaml
+  - templates/kccm/kccm_cluster_role_binding.yaml
+release:
+  name: kubernetes-test
+  namespace: tenant-test
+set:
+  _namespace:
+    etcd: etcd-test
+  _cluster:
+    cluster-domain: cozy.local
+  version: "v1.35"
+tests:
+  - it: renders the in-cluster pair on kubevirt
+    asserts:
+      - template: templates/helmreleases/csi.yaml
+        containsDocument:
+          apiVersion: helm.toolkit.fluxcd.io/v2
+          kind: HelmRelease
+          name: kubernetes-test-csi
+          any: true
+      - template: templates/kccm/manager.yaml
+        containsDocument:
+          apiVersion: apps/v1
+          kind: Deployment
+          name: kubernetes-test-kccm
+          any: true
+      - template: templates/csi/deploy.yaml
+        containsDocument:
+          apiVersion: apps/v1
+          kind: Deployment
+          name: kubernetes-test-kcsi-controller
+          any: true
+      - template: templates/kccm/service_account.yaml
+        containsDocument:
+          apiVersion: v1
+          kind: ServiceAccount
+          name: kubernetes-test-kccm
+          any: true
+      - template: templates/csi/infra-cluster-service-account.yaml
+        containsDocument:
+          apiVersion: v1
+          kind: ServiceAccount
+          name: kubernetes-test-kcsi
+          any: true
+      - template: templates/kccm/kccm_role.yaml
+        containsDocument:
+          apiVersion: rbac.authorization.k8s.io/v1
+          kind: Role
+          name: kubernetes-test-kccm
+          any: true
+      - template: templates/kccm/kccm_cluster_role.yaml
+        containsDocument:
+          apiVersion: rbac.authorization.k8s.io/v1
+          kind: ClusterRole
+          name: tenant-test-kubernetes-test-kccm
+          any: true
+      - template: templates/kccm/kccm_role_binding.yaml
+        containsDocument:
+          apiVersion: rbac.authorization.k8s.io/v1
+          kind: RoleBinding
+          name: kubernetes-test-kccm
+          any: true
+      - template: templates/kccm/kccm_cluster_role_binding.yaml
+        containsDocument:
+          apiVersion: rbac.authorization.k8s.io/v1
+          kind: ClusterRoleBinding
+          name: tenant-test-kubernetes-test-kccm
+          any: true
+
+  - it: renders none of it on proxmox
+    set:
+      substrate: proxmox
+      proxmox:
+        allowedNodes: [prox-home]
+        dnsServers: ["8.8.8.8"]
+        ipv4Config:
+          addresses: ["10.0.0.160-10.0.0.170"]
+          gateway: "10.0.0.1"
+          prefix: 24
+    asserts:
+      - template: templates/helmreleases/csi.yaml
+        containsDocument:
+          apiVersion: helm.toolkit.fluxcd.io/v2
+          kind: HelmRelease
+          name: kubernetes-test-csi
+          any: true
+        not: true
+      - template: templates/kccm/manager.yaml
+        containsDocument:
+          apiVersion: apps/v1
+          kind: Deployment
+          name: kubernetes-test-kccm
+          any: true
+        not: true
+      - template: templates/csi/deploy.yaml
+        containsDocument:
+          apiVersion: apps/v1
+          kind: Deployment
+          name: kubernetes-test-kcsi-controller
+          any: true
+        not: true
+      - template: templates/kccm/service_account.yaml
+        containsDocument:
+          apiVersion: v1
+          kind: ServiceAccount
+          name: kubernetes-test-kccm
+          any: true
+        not: true
+      - template: templates/csi/infra-cluster-service-account.yaml
+        containsDocument:
+          apiVersion: v1
+          kind: ServiceAccount
+          name: kubernetes-test-kcsi
+          any: true
+        not: true
+      - template: templates/kccm/kccm_role.yaml
+        containsDocument:
+          apiVersion: rbac.authorization.k8s.io/v1
+          kind: Role
+          name: kubernetes-test-kccm
+          any: true
+        not: true
+      - template: templates/kccm/kccm_cluster_role.yaml
+        containsDocument:
+          apiVersion: rbac.authorization.k8s.io/v1
+          kind: ClusterRole
+          name: tenant-test-kubernetes-test-kccm
+          any: true
+        not: true
+      - template: templates/kccm/kccm_role_binding.yaml
+        containsDocument:
+          apiVersion: rbac.authorization.k8s.io/v1
+          kind: RoleBinding
+          name: kubernetes-test-kccm
+          any: true
+        not: true
+      - template: templates/kccm/kccm_cluster_role_binding.yaml
+        containsDocument:
+          apiVersion: rbac.authorization.k8s.io/v1
+          kind: ClusterRoleBinding
+          name: tenant-test-kubernetes-test-kccm
+          any: true
+        not: true
diff --git a/packages/apps/kubernetes/tests/substrate_proxmox_test.yaml b/packages/apps/kubernetes/tests/substrate_proxmox_test.yaml
new file mode 100644
index 0000000000..b72d4609b3
--- /dev/null
+++ b/packages/apps/kubernetes/tests/substrate_proxmox_test.yaml
@@ -0,0 +1,150 @@
+suite: proxmox substrate
+# The control plane is Kamaji on both substrates, so this switch changes exactly
+# one object — the one Cluster.infrastructureRef points at — plus the two tenant
+# addons that exist only because the workers are KubeVirt VMs in this cluster.
+# What is asserted here is that it changes those and nothing else.
+templates:
+  - templates/cluster.yaml
+  - templates/kccm/manager.yaml
+  - templates/csi/deploy.yaml
+  - templates/cloud-config.yaml
+release:
+  name: kubernetes-test
+  namespace: tenant-test
+set:
+  _namespace:
+    etcd: etcd-test
+    host: example.org
+  _cluster:
+    cluster-domain: cozy.local
+  version: "v1.35"
+  substrate: proxmox
+  proxmox:
+    allowedNodes: [prox-home]
+    dnsServers: ["8.8.8.8"]
+    ipv4Config:
+      addresses: ["10.0.0.160-10.0.0.170"]
+      gateway: "10.0.0.1"
+      prefix: 24
+tests:
+  - it: builds a ProxmoxCluster carrying what capmox cannot infer
+    template: templates/cluster.yaml
+    documentSelector:
+      path: kind
+      value: ProxmoxCluster
+    asserts:
+      - equal:
+          path: spec.allowedNodes
+          value: [prox-home]
+      - equal:
+          path: spec.ipv4Config.gateway
+          value: "10.0.0.1"
+      - equal:
+          path: spec.dnsServers
+          value: ["8.8.8.8"]
+      # Kamaji owns the endpoint, and capmox reads the FIELD for that — not the
+      # managed-by annotation, which must be absent here. With the annotation
+      # present CAPI never sets an ownerRef on this object and capmox stops at
+      # "Waiting for Cluster Controller to set OwnerRef", leaving the address
+      # pool uncreated and every worker Machine waiting on infrastructure.
+      - equal:
+          path: spec.externalManagedControlPlane
+          value: true
+      - notExists:
+          path: metadata.annotations["cluster.x-k8s.io/managed-by"]
+
+  - it: points the Cluster at the Proxmox infrastructure object
+    template: templates/cluster.yaml
+    documentSelector:
+      path: kind
+      value: Cluster
+    asserts:
+      - equal:
+          path: spec.infrastructureRef.kind
+          value: ProxmoxCluster
+
+  - it: publishes the apiserver, which an off-cluster worker can actually reach
+    template: templates/cluster.yaml
+    documentSelector:
+      path: kind
+      value: KamajiControlPlane
+    asserts:
+      - equal:
+          path: spec.network.serviceType
+          value: LoadBalancer
+
+  - it: keeps the KubeVirt path on a ClusterIP, where its in-cluster workers reach it
+    template: templates/cluster.yaml
+    set:
+      substrate: kubevirt
+    documentSelector:
+      path: kind
+      value: KamajiControlPlane
+    asserts:
+      - equal:
+          path: spec.network.serviceType
+          value: ClusterIP
+
+  - it: keeps the KubeVirt path on its own infrastructure object
+    template: templates/cluster.yaml
+    set:
+      substrate: kubevirt
+    documentSelector:
+      path: kind
+      value: Cluster
+    asserts:
+      - equal:
+          path: spec.infrastructureRef.kind
+          value: KubevirtCluster
+
+  - it: drops the KubeVirt cloud-controller-manager, which has nothing to reconcile here
+    template: templates/kccm/manager.yaml
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  - it: drops the kubevirt-csi driver, whose DataVolumes do not exist on this substrate
+    template: templates/csi/deploy.yaml
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  - it: drops the cloud-config the KubeVirt CCM reads
+    template: templates/cloud-config.yaml
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  - it: refuses an address pool it cannot invent
+    template: templates/cluster.yaml
+    set:
+      proxmox:
+        ipv4Config:
+          addresses: []
+          gateway: "10.0.0.1"
+          prefix: 24
+        dnsServers: ["8.8.8.8"]
+    asserts:
+      - failedTemplate:
+          errorMessage: "substrate proxmox requires proxmox.ipv4Config.addresses: capmox allocates static addresses and has no DHCP mode"
+
+  - it: rejects an unknown substrate
+    template: templates/cluster.yaml
+    set:
+      substrate: vsphere
+    asserts:
+      - failedTemplate:
+          errorMessage: 'substrate "vsphere" is not supported; use "kubevirt" or "proxmox"'
+
+  # The parent chart writes dnsServers into ProxmoxCluster.spec.dnsServers, where
+  # no shell reads it, but the same validation runs here as in the pool chart so
+  # that a hostname or a stray metacharacter is refused at the same place on
+  # both sides.
+  - it: refuses a dnsServers entry that is not an address
+    template: templates/cluster.yaml
+    set:
+      proxmox:
+        dnsServers: ["$(id -u)"]
+    asserts:
+      - failedTemplate:
+          errorPattern: "proxmox.dnsServers\\[0\\] is"
diff --git a/packages/apps/kubernetes/tests/substrate_switch_guard_test.yaml b/packages/apps/kubernetes/tests/substrate_switch_guard_test.yaml
new file mode 100644
index 0000000000..0ef7591a5d
--- /dev/null
+++ b/packages/apps/kubernetes/tests/substrate_switch_guard_test.yaml
@@ -0,0 +1,78 @@
+suite: substrate switch guard (assertSubstrateUnchanged)
+
+# Switching substrate on a live cluster is not a migration, it is a removal.
+# The proxmox render carries no KubevirtCluster, no cloud-controller-manager, no
+# kubevirt-csi controller and no in-tenant -csi HelmRelease — so Flux uninstalls the CSI driver behind every PVC
+# the tenant already has, while the same render adds a ProxmoxCluster and turns
+# the apiserver Service into a LoadBalancer.
+#
+# CAPI does not stop it: the Cluster webhook forbids removing
+# spec.infrastructureRef but admits a change of kind. The `## @immutable` marker
+# is dashboard-only. So the guard reads the live Cluster, and is inert offline.
+templates:
+  - templates/cluster.yaml
+release:
+  name: kubernetes-test
+  namespace: tenant-test
+set:
+  _namespace:
+    etcd: etcd-test
+    host: example.org
+  _cluster:
+    cluster-domain: cozy.local
+  version: "v1.35"
+tests:
+  - it: refuses to move a live KubeVirt cluster onto proxmox
+    set:
+      substrate: proxmox
+      proxmox:
+        allowedNodes: [prox-home]
+        dnsServers: ["8.8.8.8"]
+        ipv4Config:
+          addresses: ["10.0.0.160-10.0.0.170"]
+          gateway: "10.0.0.1"
+          prefix: 24
+    kubernetesProvider:
+      scheme: &scheme
+        "cluster.x-k8s.io/v1beta1/Cluster":
+          gvr: {group: "cluster.x-k8s.io", version: "v1beta1", resource: "clusters"}
+          namespaced: true
+      objects: &liveKubevirt
+        - kind: Cluster
+          apiVersion: cluster.x-k8s.io/v1beta1
+          metadata: {name: kubernetes-test, namespace: tenant-test}
+          spec:
+            infrastructureRef:
+              kind: KubevirtCluster
+              name: kubernetes-test
+    asserts:
+      - failedTemplate:
+          errorPattern: "already runs on KubevirtCluster"
+
+  - it: renders when the live cluster already matches the value
+    kubernetesProvider:
+      scheme: *scheme
+      objects: *liveKubevirt
+    asserts:
+      - containsDocument:
+          apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
+          kind: KubevirtCluster
+          name: kubernetes-test
+          any: true
+
+  - it: renders offline, where a first install has nothing to compare against
+    set:
+      substrate: proxmox
+      proxmox:
+        allowedNodes: [prox-home]
+        dnsServers: ["8.8.8.8"]
+        ipv4Config:
+          addresses: ["10.0.0.160-10.0.0.170"]
+          gateway: "10.0.0.1"
+          prefix: 24
+    asserts:
+      - containsDocument:
+          apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
+          kind: ProxmoxCluster
+          name: kubernetes-test
+          any: true
diff --git a/packages/apps/kubernetes/tests/talos_k8s_support_matrix_test.yaml b/packages/apps/kubernetes/tests/talos_k8s_support_matrix_test.yaml
new file mode 100644
index 0000000000..176813dd82
--- /dev/null
+++ b/packages/apps/kubernetes/tests/talos_k8s_support_matrix_test.yaml
@@ -0,0 +1,53 @@
+suite: Talos to Kubernetes support-matrix guard tests
+
+# Each Talos minor release supports a bounded window of Kubernetes minor
+# versions; running a kubelet outside that window produces a silently
+# broken Talos+kubelet combination that HelmRelease cannot detect. The
+# chart fails render with a clear message instead, so the operator sees
+# the mismatch in Flux/dashboards before workers roll over. Source of
+# truth is the $talosK8sSupportMatrix dict at the top of cluster.yaml.
+#
+# The dict is keyed by Talos minor, and the template derives that minor from
+# talos.version, so every patch release of a supported minor stays guarded.
+#
+# Failure-path coverage is left as a follow-up: values.schema.json
+# enforces Version enum (v1.31..v1.35), which is strictly tighter than
+# the Talos v1.13 matrix entry (v1.31..v1.36), so the only way to
+# trigger the fail() guard via helm-unittest is to feed a Version the
+# schema rejects before the template ever runs. Schema-rejection happens
+# before template execution, so the chart fail() message is unreachable
+# from the test harness until either the matrix gains an exclusion the
+# schema enum still allows, or helm-unittest gains a schema-skip toggle.
+
+templates:
+  - templates/cluster.yaml
+
+values:
+  - values/common.yaml
+
+tests:
+  - it: accepts a Kubernetes version inside the Talos v1.13 support window
+    release:
+      name: test-k8s
+      namespace: tenant-test
+    set:
+      talos:
+        version: "v1.13.6"
+        schematicID: "ce4c980550dd2ab1b17bbf2b08801c7eb59418eafe8f279833297925d67c7515"
+      version: "v1.31"
+    asserts:
+      - hasDocuments:
+          count: 4
+
+  - it: keeps rendering for an older patch release of the same Talos minor
+    release:
+      name: test-k8s
+      namespace: tenant-test
+    set:
+      talos:
+        version: "v1.13.0"
+        schematicID: "ce4c980550dd2ab1b17bbf2b08801c7eb59418eafe8f279833297925d67c7515"
+      version: "v1.31"
+    asserts:
+      - hasDocuments:
+          count: 4
diff --git a/packages/apps/kubernetes/tests/talos_templates_test.yaml b/packages/apps/kubernetes/tests/talos_templates_test.yaml
new file mode 100644
index 0000000000..53fef0b935
--- /dev/null
+++ b/packages/apps/kubernetes/tests/talos_templates_test.yaml
@@ -0,0 +1,187 @@
+suite: talos control-plane PKI, secrets and bootstrap-token render tests
+
+# Render-coverage for the control-plane talos/ templates kept in this chart:
+# the cert-manager Certificates/Issuers (talos-pki), the talos-secrets Secret
+# whose token components the worker reconcile Job binds from, and the
+# bootstrap-token tenant Job. Worker pools and the per-pool talos-reconcile Job
+# that produces each TalosConfigTemplate now live in the kubernetes-nodes chart
+# (covered by its own tests). helm-unittest sees documents in source-file order,
+# so the documentIndex constants below follow the template file layout — update
+# if a top-level object is added/removed/reordered.
+
+values:
+  - values/common.yaml
+
+tests:
+  - it: bootstrap-token tenant Job renders ServiceAccount + Job
+    templates:
+      - templates/talos/bootstrap-token-tenant-job.yaml
+    release:
+      name: test-k8s
+      namespace: tenant-test
+    asserts:
+      # Source order: 0 ServiceAccount, 1 Job (Role/RoleBinding/CNP are
+      # inside the Job's command literal as text, not separate top-level
+      # documents, so they do not contribute to hasDocuments count).
+      - hasDocuments:
+          count: 2
+      - isKind:
+          of: ServiceAccount
+        documentIndex: 0
+      # The ServiceAccount name is stable (not hashed) — the Job references
+      # it by this name and only the immutable Job carries the hash suffix.
+      - equal:
+          path: metadata.name
+          value: test-k8s-bootstrap-token-tenant
+        documentIndex: 0
+      - isKind:
+          of: Job
+        documentIndex: 1
+      # The immutable Job carries a 6-char content-hash suffix (see the
+      # dedicated content-hash cases below and the template header).
+      - matchRegex:
+          path: metadata.name
+          pattern: ^test-k8s-bootstrap-token-tenant-[0-9a-f]{6}$
+        documentIndex: 1
+      # The admin-kubeconfig volume must be optional and gated by the shared
+      # wait-for-kubeconfig init container, so the Pod waits in init (uncounted
+      # by backoffLimit) instead of FailedMount at t0.
+      - equal:
+          path: spec.template.spec.initContainers[0].name
+          value: wait-for-kubeconfig
+        documentIndex: 1
+      - equal:
+          path: spec.template.spec.volumes[0].secret.optional
+          value: true
+        documentIndex: 1
+      # Main-phase, not a hook: NONE of the bootstrap-token resources may
+      # carry helm.sh/hook. A post-install hook is not gated on
+      # MachineDeployment here (the release sets helm-install-disable-wait,
+      # so there is no main-resource wait in front of the hooks); the reason
+      # to leave the hook is that a post-UPGRADE hook never runs on a release
+      # whose upgrade keeps failing, so the token Secret never lands. Pin the
+      # absence on both documents (0 SA, 1 Job).
+      - notExists:
+          path: metadata.annotations["helm.sh/hook"]
+        documentIndex: 0
+      - notExists:
+          path: metadata.annotations["helm.sh/hook"]
+        documentIndex: 1
+
+  # The two cases below pin the bootstrap-token Job's content-hash contract:
+  # an image change rotates the immutable Job's name (so Helm creates a fresh
+  # Job instead of failing on an immutable-field patch), while an unchanged
+  # render keeps the same name (so Helm no-ops). The exact suffix is expected
+  # to change whenever the Job spec changes; that is the signal that the Job
+  # will roll, and the fixture is updated in lockstep.
+  - it: bootstrap-token Job name is derived from the rendered spec
+    templates:
+      - templates/talos/bootstrap-token-tenant-job.yaml
+    release:
+      name: test-k8s
+      namespace: tenant-test
+    asserts:
+      - equal:
+          path: metadata.name
+          value: test-k8s-bootstrap-token-tenant-fc314f
+        documentSelector:
+          path: kind
+          value: Job
+
+  - it: bootstrap-token Job name rotates when images.kubectl changes
+    templates:
+      - templates/talos/bootstrap-token-tenant-job.yaml
+    release:
+      name: test-k8s
+      namespace: tenant-test
+    set:
+      images:
+        kubectl: example.com/kubectl:v9.9.9
+    asserts:
+      # A different exact hash from the default-image render above (fc314f),
+      # proving the hash tracks the rendered spec (the kubectl image is in it),
+      # so an image bump lands a fresh Job rather than an immutable-field patch.
+      # Pinned exactly (like the talos-reconcile sibling cases) rather than by
+      # regex, so a hash drift on either render is caught, not silently masked.
+      - equal:
+          path: metadata.name
+          value: test-k8s-bootstrap-token-tenant-dbf53d
+        documentSelector:
+          path: kind
+          value: Job
+
+  - it: talos-pki emits two cert-manager Certificates and two Issuers
+    templates:
+      - templates/talos/talos-pki.yaml
+    release:
+      name: test-k8s
+      namespace: tenant-test
+    asserts:
+      # Source order in templates/talos/talos-pki.yaml:
+      # 0 Issuer test-k8s-talos-bootstrap (self-signed),
+      # 1 Certificate test-k8s-talos-ca (issued by talos-bootstrap),
+      # 2 Issuer test-k8s-talos-ca (issues tls-cert from talos-ca Secret),
+      # 3 Certificate test-k8s-talos-tls-cert (issued by talos-ca).
+      - hasDocuments:
+          count: 4
+      - isKind:
+          of: Issuer
+        documentIndex: 0
+      - equal:
+          path: metadata.name
+          value: test-k8s-talos-bootstrap
+        documentIndex: 0
+      - isKind:
+          of: Certificate
+        documentIndex: 1
+      - equal:
+          path: metadata.name
+          value: test-k8s-talos-ca
+        documentIndex: 1
+      - equal:
+          path: spec.secretName
+          value: test-k8s-talos-ca
+        documentIndex: 1
+      - isKind:
+          of: Issuer
+        documentIndex: 2
+      - equal:
+          path: metadata.name
+          value: test-k8s-talos-ca
+        documentIndex: 2
+      - isKind:
+          of: Certificate
+        documentIndex: 3
+      - equal:
+          path: metadata.name
+          value: test-k8s-talos-tls-cert
+        documentIndex: 3
+
+  - it: talos-secrets Secret carries the four token-component keys the reconcile Job env binds from
+    templates:
+      - templates/talos/talos-secrets.yaml
+    release:
+      name: test-k8s
+      namespace: tenant-test
+    asserts:
+      - hasDocuments:
+          count: 1
+      - isKind:
+          of: Secret
+        documentIndex: 0
+      - equal:
+          path: metadata.name
+          value: test-k8s-talos-secrets
+        documentIndex: 0
+      - exists:
+          path: data.token
+        documentIndex: 0
+      - exists:
+          path: data.clusterId
+        documentIndex: 0
+      - exists:
+          path: data.clusterSecret
+        documentIndex: 0
+      - exists:
+          path: data.bootstrapToken
+        documentIndex: 0
diff --git a/packages/apps/kubernetes/tests/values-ci-no-etcd.yaml b/packages/apps/kubernetes/tests/values-ci-no-etcd.yaml
index c7c8196fd5..cacacce335 100644
--- a/packages/apps/kubernetes/tests/values-ci-no-etcd.yaml
+++ b/packages/apps/kubernetes/tests/values-ci-no-etcd.yaml
@@ -6,4 +6,3 @@ _namespace:
   host: ""
 _cluster:
   cluster-domain: cozy.local
-nodeGroups: null
diff --git a/packages/apps/kubernetes/tests/values-ci.yaml b/packages/apps/kubernetes/tests/values-ci.yaml
index 13365e8cae..75d4c61442 100644
--- a/packages/apps/kubernetes/tests/values-ci.yaml
+++ b/packages/apps/kubernetes/tests/values-ci.yaml
@@ -3,7 +3,6 @@ _namespace:
   monitoring: ""
   ingress: ""
   seaweedfs: ""
-  host: ""
+  host: "example.org"
 _cluster:
   cluster-domain: cozy.local
-nodeGroups: null
diff --git a/packages/apps/kubernetes/tests/values/common.yaml b/packages/apps/kubernetes/tests/values/common.yaml
index bcf3baf5ad..6377414e1b 100644
--- a/packages/apps/kubernetes/tests/values/common.yaml
+++ b/packages/apps/kubernetes/tests/values/common.yaml
@@ -19,16 +19,5 @@ controlPlane:
     server:
       resources: {}
       resourcesPreset: "micro"
-# diskSize and storageClass are intentionally omitted from md0 to verify template
-# fallback defaults: diskSize defaults to "20Gi", storageClass falls back to cluster default.
-nodeGroups:
-  md0:
-    minReplicas: 0
-    maxReplicas: 10
-    instanceType: ""
-    roles:
-      - worker
-    resources:
-      cpu: 2
-      memory: 4Gi
-    gpus: []
+# Worker pools are managed via KubernetesNodes resources since the Phase 2 split;
+# the kubernetes chart renders the control plane only.
diff --git a/packages/apps/kubernetes/tests/values/oidc-system.yaml b/packages/apps/kubernetes/tests/values/oidc-system.yaml
new file mode 100644
index 0000000000..01ceecccab
--- /dev/null
+++ b/packages/apps/kubernetes/tests/values/oidc-system.yaml
@@ -0,0 +1,34 @@
+_cluster:
+  oidc-enabled: "true"
+  root-host: example.org
+_namespace:
+  etcd: cozy-etcd
+  ingress: nginx
+  host: example.org
+version: "v1.35"
+controlPlane:
+  replicas: 1
+  apiServer:
+    resources: {}
+    resourcesPreset: "large"
+  controllerManager:
+    resources: {}
+    resourcesPreset: "micro"
+  scheduler:
+    resources: {}
+    resourcesPreset: "micro"
+  konnectivity:
+    server:
+      resources: {}
+      resourcesPreset: "micro"
+oidc:
+  mode: "System"
+  customConfig:
+    config: ""
+    secretRef:
+      name: ""
+  users:
+    - email: alice@example.org
+      role: admin
+    - email: bob@example.org
+      role: view
diff --git a/packages/apps/kubernetes/tests/victoria-metrics-operator_test.yaml b/packages/apps/kubernetes/tests/victoria-metrics-operator_test.yaml
new file mode 100644
index 0000000000..d62a995efc
--- /dev/null
+++ b/packages/apps/kubernetes/tests/victoria-metrics-operator_test.yaml
@@ -0,0 +1,77 @@
+suite: victoria-metrics-operator.yaml cert-manager-crds dependency gating
+
+templates:
+  - templates/helmreleases/victoria-metrics-operator.yaml
+
+values:
+  - values/common.yaml
+
+# The vmop HelmRelease is gated on monitoringAgents.enabled, but the
+# cert-manager-crds HelmRelease it can depend on is only created when
+# certManager.enabled is true. The dependsOn entry must therefore be gated on
+# the same condition, otherwise the valid combination
+# monitoringAgents.enabled=true + certManager.enabled=false leaves vmop blocked
+# on a non-existent dependency.
+
+tests:
+  - it: renders the vmop HelmRelease when monitoringAgents is enabled
+    release:
+      name: kubernetes-test
+      namespace: tenant-test
+    set:
+      addons.monitoringAgents.enabled: true
+    asserts:
+      - hasDocuments:
+          count: 1
+      - isKind:
+          of: HelmRelease
+      - equal:
+          path: metadata.name
+          value: kubernetes-test-cozy-victoria-metrics-operator
+
+  - it: always depends on cilium
+    release:
+      name: kubernetes-test
+      namespace: tenant-test
+    set:
+      addons.monitoringAgents.enabled: true
+    asserts:
+      - contains:
+          path: spec.dependsOn
+          content:
+            name: kubernetes-test-cilium
+            namespace: tenant-test
+
+  - it: does NOT depend on cert-manager-crds when certManager is disabled
+    release:
+      name: kubernetes-test
+      namespace: tenant-test
+    set:
+      addons.monitoringAgents.enabled: true
+      addons.certManager.enabled: false
+    asserts:
+      - notContains:
+          path: spec.dependsOn
+          content:
+            name: kubernetes-test-cert-manager-crds
+            namespace: tenant-test
+      - lengthEqual:
+          path: spec.dependsOn
+          count: 1
+
+  - it: depends on cert-manager-crds when certManager is enabled
+    release:
+      name: kubernetes-test
+      namespace: tenant-test
+    set:
+      addons.monitoringAgents.enabled: true
+      addons.certManager.enabled: true
+    asserts:
+      - contains:
+          path: spec.dependsOn
+          content:
+            name: kubernetes-test-cert-manager-crds
+            namespace: tenant-test
+      - lengthEqual:
+          path: spec.dependsOn
+          count: 2
diff --git a/packages/apps/kubernetes/tests/worker_adoption_guard_test.yaml b/packages/apps/kubernetes/tests/worker_adoption_guard_test.yaml
new file mode 100644
index 0000000000..b95d6f4147
--- /dev/null
+++ b/packages/apps/kubernetes/tests/worker_adoption_guard_test.yaml
@@ -0,0 +1,238 @@
+suite: Phase 2 worker-pool adoption guard
+
+# The guard in templates/cluster.yaml refuses to render the control-plane-only
+# chart when a live worker MachineDeployment for this cluster is NOT owned by
+# its kubernetes-nodes child release AND is not pinned with
+# helm.sh/resource-policy=keep (the adoption migration never processed it), so
+# Helm cannot silently prune it and delete the tenant's worker VMs.
+#
+# The guard keys on a live `lookup`. Under `helm template` / CI lint the lookup
+# returns nil, so the guard MUST be a no-op there even on an upgrade render;
+# the first test pins that inertness. The remaining tests seed a live lookup
+# through `kubernetesProvider` (the same technique as
+# kubernetes-nodes/tests/parent_version_skew_test.yaml) and pin the real
+# contract. The guard refuses render only when a MachineDeployment satisfies
+# ALL THREE predicates at cluster.yaml: spec.clusterName == release name (P1);
+# release-name does NOT start with the child prefix kubernetes-nodes-<cluster>-
+# (P2, "not owned by a child release"); and helm.sh/resource-policy != keep
+# (P3, not pinned). P2 is deliberately NOT "release-name == parent": Helm's
+# prune gates on resource-policy alone and never consults the live release-name
+# (see migration 56), so an empty or foreign release-name is just as prunable as
+# the parent's and must also be caught. Each render-expecting case below
+# isolates one predicate as its sole discriminator so that deleting that
+# predicate reddens at least one case (per-conjunct non-vacuity):
+#   - owned by parent + unpinned (P1,P2,P3 all true) -> refuses render;
+#   - empty/foreign release-name + unpinned, same cluster -> refuses render
+#     (the under-match regression case: parent==false yet Helm still prunes);
+#   - owned + pinned keep -> renders, sole discriminator P3 (a pool the
+#     migration deliberately left pinned-but-unadopted is prune-proof and must
+#     not deadlock the upgrade);
+#   - natively-created / greenfield pool: child release-name, NO keep pin ->
+#     renders, sole discriminator P2 (this is the routine post-split upgrade of
+#     every cluster, its highest-blast-radius path; without it P2 is untested
+#     because the adopted-pool case is already exempted by P3's keep);
+#   - adopted onto its child release (child release-name + keep) -> renders,
+#     the real adopted-pool shape;
+#   - owned + unpinned but naming a different cluster -> renders, sole
+#     discriminator P1 (synthetic: a real parent release only stamps
+#     same-cluster MDs, so this isolates the clusterName predicate);
+#   - a MD from a different cluster (both P1 and P2 false) -> renders.
+# cluster.yaml only ever looks up v1/Namespace (the canary) and
+# cluster.x-k8s.io/v1beta1/MachineDeployment, so the scheme registers exactly
+# those two kinds; the release Namespace object is planted so the canary
+# resolves and the guard body runs.
+release:
+  name: kubernetes-test
+  namespace: tenant-test
+  upgrade: true
+
+values:
+  - values/common.yaml
+
+templates:
+  - templates/cluster.yaml
+
+tests:
+  - it: is inert on a client-side upgrade render (empty lookup) and still renders the control plane
+    asserts:
+      # Render succeeded (the guard did not `fail`) and produced the control plane.
+      - isKind:
+          of: KamajiControlPlane
+        documentSelector:
+          path: kind
+          value: KamajiControlPlane
+
+  - it: refuses to render when an owned, unpinned worker MachineDeployment is still live
+    kubernetesProvider:
+      scheme: &scheme
+        "v1/Namespace":
+          gvr:
+            group: ""
+            version: "v1"
+            resource: "namespaces"
+          namespaced: false
+        "cluster.x-k8s.io/v1beta1/MachineDeployment":
+          gvr:
+            group: "cluster.x-k8s.io"
+            version: "v1beta1"
+            resource: "machinedeployments"
+          namespaced: true
+      objects:
+        - &nsObject
+          kind: Namespace
+          apiVersion: v1
+          metadata:
+            name: tenant-test
+        - kind: MachineDeployment
+          apiVersion: cluster.x-k8s.io/v1beta1
+          metadata:
+            name: kubernetes-test-md0
+            namespace: tenant-test
+            annotations:
+              meta.helm.sh/release-name: kubernetes-test
+          spec:
+            clusterName: kubernetes-test
+    asserts:
+      - failedTemplate:
+          errorPattern: "refusing to render cluster"
+
+  - it: refuses to render when a same-cluster unpinned MachineDeployment has an empty release-name (Helm prunes on resource-policy, not on release-name)
+    # Under-match regression guard. A pre-split worker MD whose Helm annotations
+    # were stripped out-of-band (or restored by a DR tool that drops them) has an
+    # empty meta.helm.sh/release-name, so a guard keyed on release-name==parent
+    # would miss it, yet Helm still enters it into the parent's prune set and,
+    # seeing no keep, deletes it. P1 (clusterName) and P3 (no keep) are true and
+    # the release-name is not the child prefix, so the guard must refuse.
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - *nsObject
+        - kind: MachineDeployment
+          apiVersion: cluster.x-k8s.io/v1beta1
+          metadata:
+            name: kubernetes-test-md0
+            namespace: tenant-test
+          spec:
+            clusterName: kubernetes-test
+    asserts:
+      - failedTemplate:
+          errorPattern: "refusing to render cluster"
+
+  - it: renders when the owned worker MachineDeployment is pinned with resource-policy=keep
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - *nsObject
+        - kind: MachineDeployment
+          apiVersion: cluster.x-k8s.io/v1beta1
+          metadata:
+            name: kubernetes-test-md0
+            namespace: tenant-test
+            annotations:
+              meta.helm.sh/release-name: kubernetes-test
+              helm.sh/resource-policy: keep
+          spec:
+            clusterName: kubernetes-test
+    asserts:
+      - isKind:
+          of: KamajiControlPlane
+        documentSelector:
+          path: kind
+          value: KamajiControlPlane
+
+  - it: renders when the worker MachineDeployment is adopted onto its child release
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - *nsObject
+        - kind: MachineDeployment
+          apiVersion: cluster.x-k8s.io/v1beta1
+          metadata:
+            name: kubernetes-test-md0
+            namespace: tenant-test
+            annotations:
+              meta.helm.sh/release-name: kubernetes-nodes-test-md0
+              helm.sh/resource-policy: keep
+          spec:
+            clusterName: kubernetes-test
+    asserts:
+      - isKind:
+          of: KamajiControlPlane
+        documentSelector:
+          path: kind
+          value: KamajiControlPlane
+
+  - it: renders for a natively-created pool (child release-name, no keep pin) so the routine post-split upgrade is not refused
+    # Greenfield / natively-created pool: the kubernetes-nodes child chart renders
+    # its own MachineDeployment with meta.helm.sh/release-name on the CHILD release
+    # and no helm.sh/resource-policy pin (the pin exists only on migration-adopted
+    # objects and is removed by pre-delete-unpin). P1 (clusterName) and P3 (no keep)
+    # are both true here, so P2 (owned by parent) is the ONLY predicate keeping this
+    # out of the refusal set. Deleting P2 from cluster.yaml reddens exactly this case.
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - *nsObject
+        - kind: MachineDeployment
+          apiVersion: cluster.x-k8s.io/v1beta1
+          metadata:
+            name: kubernetes-test-md0
+            namespace: tenant-test
+            annotations:
+              meta.helm.sh/release-name: kubernetes-nodes-test-md0
+          spec:
+            clusterName: kubernetes-test
+    asserts:
+      - isKind:
+          of: KamajiControlPlane
+        documentSelector:
+          path: kind
+          value: KamajiControlPlane
+
+  - it: renders when an owned, unpinned MachineDeployment names a different cluster (isolates the clusterName predicate)
+    # Synthetic shape to isolate P1: parent release-name (P2 true) and no keep
+    # pin (P3 true), but spec.clusterName is NOT this release. A real parent
+    # release only ever stamps same-cluster MDs, so this pairing does not occur
+    # in practice; its sole purpose is to make the clusterName predicate the only
+    # reason the guard does not fire. Deleting P1 from cluster.yaml reddens this
+    # case (P2 and P3 alone would then flag it), which is what pins P1.
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - *nsObject
+        - kind: MachineDeployment
+          apiVersion: cluster.x-k8s.io/v1beta1
+          metadata:
+            name: kubernetes-test-other0
+            namespace: tenant-test
+            annotations:
+              meta.helm.sh/release-name: kubernetes-test
+          spec:
+            clusterName: some-other-cluster
+    asserts:
+      - isKind:
+          of: KamajiControlPlane
+        documentSelector:
+          path: kind
+          value: KamajiControlPlane
+
+  - it: renders when a live MachineDeployment belongs to a different cluster
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - *nsObject
+        - kind: MachineDeployment
+          apiVersion: cluster.x-k8s.io/v1beta1
+          metadata:
+            name: other-cluster-md0
+            namespace: tenant-test
+            annotations:
+              meta.helm.sh/release-name: other-cluster
+          spec:
+            clusterName: other-cluster
+    asserts:
+      - isKind:
+          of: KamajiControlPlane
+        documentSelector:
+          path: kind
+          value: KamajiControlPlane
diff --git a/packages/apps/kubernetes/values.schema.json b/packages/apps/kubernetes/values.schema.json
index ea6fb16a22..02371f0e77 100644
--- a/packages/apps/kubernetes/values.schema.json
+++ b/packages/apps/kubernetes/values.schema.json
@@ -1,9 +1,14 @@
 {
   "title": "Chart Values",
   "type": "object",
+  "x-cozystack-name": {
+    "type": "string",
+    "description": "Cluster name. Every worker pool is a separate KubernetesNodes release named `kubernetes-nodes-\u003cname\u003e-\u003cpool\u003e`, so the name must leave room for the default `md0` pool inside the 53-character Helm release name limit.",
+    "maxLength": 32
+  },
   "properties": {
     "storageClass": {
-      "description": "StorageClass used to store the data.",
+      "description": "Default StorageClass inside the tenant cluster. Remote-accessible LINSTOR classes are auto-propagated to the tenant under the same name.",
       "type": "string",
       "default": "replicated",
       "x-kubernetes-validations": [
@@ -11,157 +16,9 @@
           "rule": "self == oldSelf",
           "message": "storageClass is immutable"
         }
-      ]
-    },
-    "nodeGroups": {
-      "description": "Worker nodes configuration map.",
-      "type": "object",
-      "default": {
-        "md0": {
-          "diskSize": "20Gi",
-          "gpus": [],
-          "instanceType": "u1.medium",
-          "kubelet": {},
-          "maxReplicas": 10,
-          "minReplicas": 0,
-          "resources": {},
-          "roles": [
-            "ingress-nginx"
-          ],
-          "storageClass": ""
-        }
-      },
-      "additionalProperties": {
-        "type": "object",
-        "required": [
-          "diskSize",
-          "instanceType",
-          "maxReplicas",
-          "minReplicas",
-          "resources"
-        ],
-        "properties": {
-          "diskSize": {
-            "description": "Persistent disk size for kubelet and containerd data.",
-            "default": "20Gi",
-            "pattern": "^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$",
-            "anyOf": [
-              {
-                "type": "integer"
-              },
-              {
-                "type": "string"
-              }
-            ],
-            "x-kubernetes-int-or-string": true
-          },
-          "gpus": {
-            "description": "List of GPUs to attach (NVIDIA driver requires at least 4 GiB RAM).",
-            "type": "array",
-            "items": {
-              "type": "object",
-              "required": [
-                "name"
-              ],
-              "properties": {
-                "name": {
-                  "description": "Name of GPU, such as \"nvidia.com/AD102GL_L40S\".",
-                  "type": "string"
-                }
-              }
-            }
-          },
-          "instanceType": {
-            "description": "Virtual machine instance type.",
-            "type": "string",
-            "default": "u1.medium"
-          },
-          "kubelet": {
-            "description": "Kubelet resource reservations for this node group.",
-            "type": "object",
-            "properties": {
-              "evictionHardMemory": {
-                "description": "Hard eviction threshold for memory (absolute like 200Mi or percentage like 7%).",
-                "type": "string",
-                "default": "7%"
-              },
-              "evictionSoftMemory": {
-                "description": "Soft eviction threshold for memory (absolute like 1Gi or percentage like 10%).",
-                "type": "string",
-                "default": "10%"
-              },
-              "kubeReservedCpu": {
-                "description": "CPU reserved for kubelet and container runtime. Auto-computed from instanceType if empty.",
-                "type": "string"
-              },
-              "kubeReservedMemory": {
-                "description": "Memory reserved for kubelet and container runtime. Auto-computed from instanceType if empty.",
-                "type": "string"
-              },
-              "systemReservedCpu": {
-                "description": "CPU reserved for host OS. Auto-computed from instanceType if empty.",
-                "type": "string"
-              },
-              "systemReservedMemory": {
-                "description": "Memory reserved for host OS. Auto-computed from instanceType if empty.",
-                "type": "string"
-              }
-            }
-          },
-          "maxReplicas": {
-            "description": "Maximum number of replicas.",
-            "type": "integer",
-            "default": 10
-          },
-          "minReplicas": {
-            "description": "Minimum number of replicas.",
-            "type": "integer",
-            "default": 0
-          },
-          "resources": {
-            "description": "CPU and memory resources for each worker node.",
-            "type": "object",
-            "properties": {
-              "cpu": {
-                "description": "CPU available.",
-                "pattern": "^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$",
-                "anyOf": [
-                  {
-                    "type": "integer"
-                  },
-                  {
-                    "type": "string"
-                  }
-                ],
-                "x-kubernetes-int-or-string": true
-              },
-              "memory": {
-                "description": "Memory (RAM) available.",
-                "pattern": "^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$",
-                "anyOf": [
-                  {
-                    "type": "integer"
-                  },
-                  {
-                    "type": "string"
-                  }
-                ],
-                "x-kubernetes-int-or-string": true
-              }
-            }
-          },
-          "roles": {
-            "description": "List of node roles.",
-            "type": "array",
-            "items": {
-              "type": "string"
-            }
-          },
-          "storageClass": {
-            "description": "StorageClass for worker node persistent disks. When empty, uses the management cluster default StorageClass (the one annotated storageclass.kubernetes.io/is-default-class: true). NOTE: deliberately not marked immutable — the field is optional and undefaulted, so a strict `self == oldSelf` rule would block any future attempt to set it on an existing node group.",
-            "type": "string"
-          }
-        }
+      ],
+      "x-cozystack-options": {
+        "source": "storageclass"
       }
     },
     "version": {
@@ -173,8 +30,7 @@
         "v1.34",
         "v1.33",
         "v1.32",
-        "v1.31",
-        "v1.30"
+        "v1.31"
       ]
     },
     "host": {
@@ -182,6 +38,147 @@
       "type": "string",
       "default": ""
     },
+    "substrate": {
+      "description": "Which infrastructure provider backs this cluster's worker VMs. `kubevirt` runs them inside this cluster; `proxmox` runs them on an external Proxmox VE cluster through capmox. The control plane is Kamaji either way — this selects the infrastructure half only. Must match the `substrate` of every KubernetesNodes pool attached to this cluster: the pools reference this cluster's infrastructure object by kind, and a mismatch leaves their Machines unreconciled. Switching an existing cluster is not supported; create a new one.",
+      "type": "string",
+      "default": "kubevirt",
+      "x-kubernetes-validations": [
+        {
+          "rule": "self == oldSelf",
+          "message": "substrate is immutable"
+        }
+      ]
+    },
+    "proxmox": {
+      "description": "Proxmox substrate settings.",
+      "type": "object",
+      "default": {},
+      "required": [
+        "ipv4Config"
+      ],
+      "properties": {
+        "allowedNodes": {
+          "description": "Proxmox nodes capmox may place VMs on. Empty means every node in the Proxmox cluster.",
+          "type": "array",
+          "default": [],
+          "items": {
+            "type": "string"
+          }
+        },
+        "ccm": {
+          "description": "Proxmox cloud-controller-manager settings.",
+          "type": "object",
+          "default": {},
+          "required": [
+            "credentialsSecretName"
+          ],
+          "properties": {
+            "credentialsSecretName": {
+              "description": "Secret in THIS namespace holding the controller's Proxmox API credentials under the keys `url`, `token_id`, `token_secret` and `region`. May name the same Secret as `csi.credentialsSecretName`; it is a separate knob so the two can hold separate tokens, since this one only reads VM inventory while the driver attaches and detaches disks.",
+              "type": "string",
+              "default": ""
+            }
+          }
+        },
+        "csi": {
+          "description": "Proxmox CSI driver settings.",
+          "type": "object",
+          "default": {},
+          "required": [
+            "credentialsSecretName",
+            "enabled"
+          ],
+          "properties": {
+            "credentialsSecretName": {
+              "description": "Secret in THIS namespace holding the driver's Proxmox API credentials under the keys `url`, `token_id`, `token_secret` and `region`. The parent chart composes them into the controller's config file here, in the management cluster; nothing reaches the tenant, and no token is written into a rendered manifest. Distinct from the capmox credentials on purpose: the driver attaches and detaches disks, which is a different blast radius from creating VMs.",
+              "type": "string",
+              "default": ""
+            },
+            "enabled": {
+              "description": "Install the driver. Without it a Proxmox-backed tenant has no way to provision PersistentVolumes at all.",
+              "type": "boolean",
+              "default": true
+            },
+            "storageClasses": {
+              "description": "StorageClasses to create in the tenant.",
+              "type": "array",
+              "default": [],
+              "items": {
+                "type": "object",
+                "required": [
+                  "name",
+                  "storage"
+                ],
+                "properties": {
+                  "fstype": {
+                    "description": "Filesystem the driver formats volumes with: ext4 or xfs.",
+                    "type": "string"
+                  },
+                  "name": {
+                    "description": "StorageClass name inside the tenant cluster.",
+                    "type": "string"
+                  },
+                  "reclaimPolicy": {
+                    "description": "Delete or Retain.",
+                    "type": "string"
+                  },
+                  "ssd": {
+                    "description": "Mark volumes as SSD-backed, which changes the discard/cache defaults Proxmox applies.",
+                    "type": "boolean"
+                  },
+                  "storage": {
+                    "description": "Proxmox storage id the volumes are created on (as it appears in `pvesm status`).",
+                    "type": "string"
+                  }
+                }
+              }
+            }
+          }
+        },
+        "dnsServers": {
+          "description": "Nameservers written into each worker's network config. Required by the ProxmoxCluster schema.",
+          "type": "array",
+          "default": [],
+          "items": {
+            "type": "string"
+          }
+        },
+        "insecure": {
+          "description": "Skip verification of the Proxmox API server certificate in the CCM and the CSI controller, both of which run in the management cluster. Default false: the certificate is verified unless an operator turns that off. A stock Proxmox VE install serves a self-signed one, so set true for it, or install a certificate the management cluster trusts.",
+          "type": "boolean",
+          "default": false
+        },
+        "ipv4Config": {
+          "description": "Address pool for workers. capmox assigns static addresses and has no DHCP mode, so this is required rather than optional.",
+          "type": "object",
+          "default": {},
+          "required": [
+            "gateway",
+            "prefix"
+          ],
+          "properties": {
+            "addresses": {
+              "description": "Ranges or CIDRs, e.g. `[\"10.0.0.120-10.0.0.170\"]`. capmox turns these into an InClusterIPPool, so they must not overlap any DHCP range on the same L2 or two workers will answer to one address.",
+              "type": "array",
+              "default": [],
+              "items": {
+                "type": "string"
+              }
+            },
+            "gateway": {
+              "description": "Default gateway for the workers.",
+              "type": "string",
+              "default": ""
+            },
+            "prefix": {
+              "description": "Netmask prefix length.",
+              "type": "integer",
+              "default": 24
+            }
+          }
+        }
+      }
+    },
     "addons": {
       "description": "Cluster addons configuration.",
       "type": "object",
@@ -190,7 +187,6 @@
         "certManager",
         "cilium",
         "coredns",
-        "fluxcd",
         "gatewayAPI",
         "gpuOperator",
         "hami",
@@ -224,7 +220,7 @@
           }
         },
         "cilium": {
-          "description": "Cilium CNI plugin.",
+          "description": "Cilium CNI plugin. Always installed as the tenant cluster's CNI; this section only overrides its Helm values.",
           "type": "object",
           "default": {},
           "required": [
@@ -237,10 +233,11 @@
               "default": {},
               "x-kubernetes-preserve-unknown-fields": true
             }
-          }
+          },
+          "x-cozystack-no-enable-switch": true
         },
         "coredns": {
-          "description": "CoreDNS addon.",
+          "description": "CoreDNS addon. Always installed as the tenant cluster's DNS; this section only overrides its Helm values.",
           "type": "object",
           "default": {},
           "required": [
@@ -253,29 +250,8 @@
               "default": {},
               "x-kubernetes-preserve-unknown-fields": true
             }
-          }
-        },
-        "fluxcd": {
-          "description": "FluxCD GitOps operator.",
-          "type": "object",
-          "default": {},
-          "required": [
-            "enabled",
-            "valuesOverride"
-          ],
-          "properties": {
-            "enabled": {
-              "description": "Enable FluxCD.",
-              "type": "boolean",
-              "default": false
-            },
-            "valuesOverride": {
-              "description": "Custom Helm values overrides.",
-              "type": "object",
-              "default": {},
-              "x-kubernetes-preserve-unknown-fields": true
-            }
-          }
+          },
+          "x-cozystack-no-enable-switch": true
         },
         "gatewayAPI": {
           "description": "Gateway API addon.",
@@ -443,7 +419,7 @@
           }
         },
         "verticalPodAutoscaler": {
-          "description": "Vertical Pod Autoscaler.",
+          "description": "Vertical Pod Autoscaler. Installed and removed together with addons.monitoringAgents.enabled; this section only overrides its Helm values.",
           "type": "object",
           "default": {},
           "required": [
@@ -456,7 +432,8 @@
               "default": {},
               "x-kubernetes-preserve-unknown-fields": true
             }
-          }
+          },
+          "x-cozystack-no-enable-switch": true
         }
       }
     },
@@ -481,6 +458,79 @@
             "resourcesPreset"
           ],
           "properties": {
+            "admissionControllers": {
+              "description": "Admission plugins the tenant kube-apiserver enables, passed through to KamajiControlPlane `spec.admissionControllers`, which the control plane renders as `--enable-admission-plugins`. A non-empty list replaces the control plane's default set instead of adding to it. The kube-apiserver enables these plugins in addition to its own default ones, so leaving a plugin out does not turn it off; to turn one off, name it in `--disable-admission-plugins` in `controlPlane.apiServer.extraArgs` and keep it out of this list, since the apiserver refuses to start with a plugin in both, and the control plane's default set names several. Empty by default, which keeps that default set, taken from the TenantControlPlane CRD: CertificateApproval, CertificateSigning, CertificateSubjectRestriction, DefaultIngressClass, DefaultStorageClass, DefaultTolerationSeconds, LimitRanger, MutatingAdmissionWebhook, NamespaceLifecycle, PersistentVolumeClaimResize, Priority, ResourceQuota, RuntimeClass, ServiceAccount, StorageObjectInUseProtection, TaintNodesByCondition, ValidatingAdmissionWebhook. `NodeRestriction` is not in it.",
+              "type": "array",
+              "default": [],
+              "items": {
+                "type": "string",
+                "enum": [
+                  "AlwaysAdmit",
+                  "AlwaysDeny",
+                  "AlwaysPullImages",
+                  "CertificateApproval",
+                  "CertificateSigning",
+                  "CertificateSubjectRestriction",
+                  "DefaultIngressClass",
+                  "DefaultStorageClass",
+                  "DefaultTolerationSeconds",
+                  "DenyEscalatingExec",
+                  "DenyExecOnPrivileged",
+                  "DenyServiceExternalIPs",
+                  "EventRateLimit",
+                  "ExtendedResourceToleration",
+                  "ImagePolicyWebhook",
+                  "LimitPodHardAntiAffinityTopology",
+                  "LimitRanger",
+                  "MutatingAdmissionWebhook",
+                  "NamespaceAutoProvision",
+                  "NamespaceExists",
+                  "NamespaceLifecycle",
+                  "NodeRestriction",
+                  "OwnerReferencesPermissionEnforcement",
+                  "PersistentVolumeClaimResize",
+                  "PersistentVolumeLabel",
+                  "PodNodeSelector",
+                  "PodSecurity",
+                  "PodSecurityPolicy",
+                  "PodTolerationRestriction",
+                  "Priority",
+                  "ResourceQuota",
+                  "RuntimeClass",
+                  "SecurityContextDeny",
+                  "ServiceAccount",
+                  "StorageObjectInUseProtection",
+                  "TaintNodesByCondition",
+                  "ValidatingAdmissionWebhook"
+                ]
+              }
+            },
+            "extraArgs": {
+              "description": "Extra command-line flags appended to the tenant kube-apiserver, passed through to KamajiControlPlane `spec.apiServer.extraArgs`. For OIDC use `spec.oidc.mode` — this passthrough is the escape hatch for unrelated apiserver flags. The tenant control plane sets each of the following flags itself and drops an entry naming one before the apiserver sees it. The chart moves an `--enable-admission-plugins=` entry into `controlPlane.apiServer.admissionControllers` and a `--kubelet-preferred-address-types=` entry into `controlPlane.kubelet.preferredAddressTypes` while that field is empty, and refuses any other entry naming one of them: `--advertise-address`, `--client-ca-file`, `--enable-admission-plugins`, `--service-cluster-ip-range`, `--kubelet-client-certificate`, `--kubelet-client-key`, `--kubelet-preferred-address-types`, `--proxy-client-cert-file`, `--proxy-client-key-file`, `--requestheader-allowed-names`, `--requestheader-client-ca-file`, `--secure-port`, `--service-account-key-file`, `--service-account-signing-key-file`, `--tls-cert-file`, `--tls-private-key-file`, `--etcd-servers`, `--etcd-cafile`, `--etcd-certfile`, `--etcd-keyfile`, `--etcd-prefix`, `--etcd-compaction-interval`, `--egress-selector-config-file`. When `spec.oidc.mode` is not `None` the chart also renders OIDC flags here, reads what you have written on them, and refuses some combinations outright; `docs/oidc-tenant.md` carries which flags, which combinations, and why. Do NOT add legacy `--oidc-*` flags here when `spec.oidc.mode` is not `None`; the chart injects `--authentication-config` and the apiserver refuses to boot with both. Empty by default (no change to current behavior).",
+              "type": "array",
+              "default": [],
+              "items": {
+                "type": "string"
+              }
+            },
+            "extraVolumeMounts": {
+              "description": "Extra volume mounts added to the tenant kube-apiserver container, passed through to KamajiControlPlane `spec.apiServer.extraVolumeMounts`. Each `name` must reference a volume declared in `extraVolumes`; the chart-managed talos secret volumes cannot be mounted. Each item is a core/v1 VolumeMount. Empty by default.",
+              "type": "array",
+              "default": [],
+              "items": {
+                "type": "object",
+                "x-kubernetes-preserve-unknown-fields": true
+              }
+            },
+            "extraVolumes": {
+              "description": "Extra volumes added to the control-plane Deployment, passed through to KamajiControlPlane `spec.deployment.extraVolumes`. Use to mount a ConfigMap or Secret holding an AuthenticationConfiguration file referenced by `extraArgs`. Each item is a core/v1 Volume, but because the control-plane pod runs on the management cluster only `configMap` and `secret` sources are allowed (host-reaching sources like `hostPath`/`csi` and token-projection via `projected` are rejected); each volume must have a unique, non-empty name and exactly one source. The names `talos-ca` and `talos-tls-cert` are reserved by the chart. Empty by default.",
+              "type": "array",
+              "default": [],
+              "items": {
+                "type": "object",
+                "x-kubernetes-preserve-unknown-fields": true
+              }
+            },
             "resources": {
               "description": "CPU and memory resources for API Server.",
               "type": "object",
@@ -776,6 +826,28 @@
             }
           }
         },
+        "kubelet": {
+          "description": "Kubelet connection settings.",
+          "type": "object",
+          "default": {},
+          "properties": {
+            "preferredAddressTypes": {
+              "description": "Node address types the tenant kube-apiserver tries, in order, when it connects to a kubelet, passed through to KamajiControlPlane `spec.kubelet.preferredAddressTypes`, which the control plane renders as `--kubelet-preferred-address-types`. The KamajiControlPlane CRD rejects a repeated name. Empty by default, which renders `InternalIP`, `ExternalIP`, or the list of a `--kubelet-preferred-address-types=` entry in `controlPlane.apiServer.extraArgs` when there is one.",
+              "type": "array",
+              "default": [],
+              "items": {
+                "type": "string",
+                "enum": [
+                  "Hostname",
+                  "InternalIP",
+                  "ExternalIP",
+                  "InternalDNS",
+                  "ExternalDNS"
+                ]
+              }
+            }
+          }
+        },
         "replicas": {
           "description": "Number of control-plane replicas.",
           "type": "integer",
@@ -886,12 +958,132 @@
       "type": "object",
       "default": {},
       "properties": {
+        "kubectl": {
+          "description": "Image used by the bootstrap-token tenant Job (kubectl). Empty falls back to images/kubectl.tag.",
+          "type": "string",
+          "default": ""
+        },
+        "talosCsrSigner": {
+          "description": "Image used by the talos-csr-signer sidecar in the Kamaji control plane. Empty falls back to images/talos-csr-signer.tag.",
+          "type": "string",
+          "default": ""
+        },
         "waitForKubeconfig": {
           "description": "Image used by the wait-for-kubeconfig init container. Empty falls back to images/busybox.tag.",
           "type": "string",
           "default": ""
         }
       }
+    },
+    "talos": {
+      "description": "Talos worker image configuration.",
+      "type": "object",
+      "default": {},
+      "required": [
+        "imageFactoryURL",
+        "installerRepository",
+        "registryMirrors",
+        "schematicID",
+        "version"
+      ],
+      "properties": {
+        "imageFactoryURL": {
+          "description": "Base URL of the Talos Image Factory that serves the worker OS disk image (the `openstack-amd64.raw.xz` raw artifact streamed in by CDI over HTTP). Defaults to the public factory. Point at a self-hosted Image Factory, a caching mirror, or an internal HTTP file server for air-gapped, rate-limited, or flaky-egress environments. No trailing slash.",
+          "type": "string",
+          "default": "https://factory.talos.dev"
+        },
+        "installerRepository": {
+          "description": "OCI repository prefix for the Talos installer image used by the in-guest `talos-reconcile` upgrade Job. Resolved as `\u003cinstallerRepository\u003e/\u003cschematicID\u003e:\u003cversion\u003e`. Defaults to the public factory's installer path. Override for air-gapped or mirrored registries. No trailing slash.",
+          "type": "string",
+          "default": "factory.talos.dev/installer"
+        },
+        "registryMirrors": {
+          "description": "Talos `machine.registries.mirrors` passthrough for worker nodes: a map of upstream registry host to `{ endpoints: [ ... ] }`. Empty by default, so workers pull container images (the Talos `kubelet` image included) directly from the upstream registry. Point a host such as `ghcr.io` at an in-cluster pull-through mirror for air-gapped, rate-limited, or flaky-egress environments so a worker's boot does not depend on live public egress. Talos still falls back to the upstream registry unless a host also sets `skipFallback: true`, so a mirror alone does not enforce air-gap.",
+          "type": "object",
+          "default": {},
+          "x-kubernetes-preserve-unknown-fields": true
+        },
+        "schematicID": {
+          "description": "Talos image-factory schematic ID. Defaults to the cozystack-tested vanilla schematic. Operators using custom schematics (system extensions, kernel args) override here.",
+          "type": "string",
+          "default": "ce4c980550dd2ab1b17bbf2b08801c7eb59418eafe8f279833297925d67c7515"
+        },
+        "version": {
+          "description": "Talos release used for worker OS image and installer. Must satisfy the chart's Talos\u003c-\u003eKubernetes support matrix against the chosen `version`.",
+          "type": "string",
+          "default": "v1.13.6"
+        }
+      }
+    },
+    "oidc": {
+      "description": "OIDC authentication and per-user RBAC for the tenant kube-apiserver. See docs/oidc-tenant.md for the operator guide.",
+      "type": "object",
+      "default": {},
+      "required": [
+        "mode"
+      ],
+      "properties": {
+        "customConfig": {
+          "description": "Tenant-supplied AuthenticationConfiguration; consumed only when `mode: CustomConfig`.",
+          "type": "object",
+          "default": {},
+          "properties": {
+            "config": {
+              "description": "Inline AuthenticationConfiguration YAML (`apiserver.config.k8s.io/v1beta1`). The chart writes the value verbatim into a Secret mounted at `/etc/kubernetes/authentication-config/config.yaml` on the kube-apiserver. Mutually exclusive with `secretRef.name`.",
+              "type": "string",
+              "default": ""
+            },
+            "secretRef": {
+              "description": "Reference to an existing Secret in the tenant namespace carrying the `AuthenticationConfiguration`.",
+              "type": "object",
+              "default": {},
+              "properties": {
+                "name": {
+                  "description": "Name of an existing Secret in the tenant (release) namespace whose `config.yaml` key holds an `apiserver.config.k8s.io/v1beta1` `AuthenticationConfiguration`. Mutually exclusive with `customConfig.config`.",
+                  "type": "string",
+                  "default": ""
+                }
+              }
+            }
+          }
+        },
+        "mode": {
+          "description": "Identity mode. `None`: no OIDC, only the static admin kubeconfig works. `System`: trust the platform Keycloak realm (`cozy` by default) via a per-cluster public client with audience binding; zero-config default. `CustomConfig`: trust a tenant-supplied issuer directly (BYO); `cozy` is not in the path.",
+          "type": "string",
+          "default": "None",
+          "enum": [
+            "None",
+            "System",
+            "CustomConfig"
+          ]
+        },
+        "users": {
+          "description": "Users granted access to the tenant cluster; each entry produces one ClusterRoleBinding inside the tenant cluster. Works for both `System` and `CustomConfig` modes.",
+          "type": "array",
+          "default": [],
+          "items": {
+            "type": "object",
+            "required": [
+              "email",
+              "role"
+            ],
+            "properties": {
+              "email": {
+                "description": "Email address matched against the `email` claim from the issuer. Used verbatim as the `User:` subject in the ClusterRoleBinding inside the tenant cluster. The `email` claim is a built-in OIDC scope requested explicitly by the chart-generated `kubectl oidc-login` kubeconfig; every conformant OIDC provider (cozy realm included) emits it.",
+                "type": "string"
+              },
+              "role": {
+                "description": "Role to bind: `admin` maps to `ClusterRole/cluster-admin`, `view` maps to `ClusterRole/view`.",
+                "type": "string",
+                "enum": [
+                  "admin",
+                  "view"
+                ]
+              }
+            }
+          }
+        }
+      }
     }
   }
 }
diff --git a/packages/apps/kubernetes/values.yaml b/packages/apps/kubernetes/values.yaml
index 5701c6f152..4397c6de60 100644
--- a/packages/apps/kubernetes/values.yaml
+++ b/packages/apps/kubernetes/values.yaml
@@ -1,9 +1,13 @@
+## @name {string} - Cluster name. Every worker pool is a separate KubernetesNodes release named `kubernetes-nodes-<name>-<pool>`, so the name must leave room for the default `md0` pool inside the 53-character Helm release name limit.
+## @maxLength 32
+
 ##
 ## @section Common Parameters
 ##
 
-## @param {string} storageClass - StorageClass used to store the data.
+## @param {string} storageClass - Default StorageClass inside the tenant cluster. Remote-accessible LINSTOR classes are auto-propagated to the tenant under the same name.
 ## @immutable
+## @x-cozystack-options {source: storageclass}
 storageClass: replicated
 
 ##
@@ -63,42 +67,6 @@ storageClass: replicated
 ## @field {quantity} [cpu] - CPU available.
 ## @field {quantity} [memory] - Memory (RAM) available.
 
-## @typedef {struct} GPU - GPU configuration.
-## @field {string} name - Name of GPU, such as "nvidia.com/AD102GL_L40S".
-
-## @typedef {struct} Kubelet - Kubelet resource reservations for worker nodes.
-## @field {string} [systemReservedMemory] - Memory reserved for host OS. Auto-computed from instanceType if empty.
-## @field {string} [kubeReservedMemory] - Memory reserved for kubelet and container runtime. Auto-computed from instanceType if empty.
-## @field {string} [systemReservedCpu] - CPU reserved for host OS. Auto-computed from instanceType if empty.
-## @field {string} [kubeReservedCpu] - CPU reserved for kubelet and container runtime. Auto-computed from instanceType if empty.
-## @field {string} [evictionHardMemory]="7%" - Hard eviction threshold for memory (absolute like 200Mi or percentage like 7%).
-## @field {string} [evictionSoftMemory]="10%" - Soft eviction threshold for memory (absolute like 1Gi or percentage like 10%).
-
-## @typedef {struct} NodeGroup - Worker node group configuration.
-## @field {int} minReplicas=0 - Minimum number of replicas.
-## @field {int} maxReplicas=10 - Maximum number of replicas.
-## @field {string} instanceType="u1.medium" - Virtual machine instance type.
-## @field {quantity} diskSize="20Gi" - Persistent disk size for kubelet and containerd data.
-## @field {string} [storageClass] - StorageClass for worker node persistent disks. When empty, uses the management cluster default StorageClass (the one annotated storageclass.kubernetes.io/is-default-class: true). NOTE: deliberately not marked immutable — the field is optional and undefaulted, so a strict `self == oldSelf` rule would block any future attempt to set it on an existing node group.
-## @field {[]string} roles - List of node roles.
-## @field {Resources} resources - CPU and memory resources for each worker node.
-## @field {[]GPU} gpus - List of GPUs to attach (NVIDIA driver requires at least 4 GiB RAM).
-## @field {Kubelet} [kubelet] - Kubelet resource reservations for this node group.
-
-## @param {map[string]NodeGroup} nodeGroups - Worker nodes configuration map.
-nodeGroups:
-  md0:
-    minReplicas: 0
-    maxReplicas: 10
-    instanceType: "u1.medium"
-    diskSize: 20Gi
-    storageClass: ""
-    roles:
-    - ingress-nginx
-    resources: {}
-    gpus: []
-    kubelet: {}
-
 ##
 ## @enum {string} Version
 ## @value v1.35
@@ -106,7 +74,6 @@ nodeGroups:
 ## @value v1.33
 ## @value v1.32
 ## @value v1.31
-## @value v1.30
 
 ## @param {Version} version - Kubernetes major.minor version to deploy
 version: "v1.35"
@@ -116,6 +83,56 @@ version: "v1.35"
 host: ""
 
 ##
+## @section Substrate
+
+## @param {string} substrate="kubevirt" - Which infrastructure provider backs this cluster's worker VMs. `kubevirt` runs them inside this cluster; `proxmox` runs them on an external Proxmox VE cluster through capmox. The control plane is Kamaji either way — this selects the infrastructure half only. Must match the `substrate` of every KubernetesNodes pool attached to this cluster: the pools reference this cluster's infrastructure object by kind, and a mismatch leaves their Machines unreconciled. Switching an existing cluster is not supported; create a new one.
+## @immutable
+substrate: kubevirt
+
+## @typedef {struct} ProxmoxIPv4 - Address range capmox allocates worker addresses from.
+## @field {[]string} addresses - Ranges or CIDRs, e.g. `["10.0.0.120-10.0.0.170"]`. capmox turns these into an InClusterIPPool, so they must not overlap any DHCP range on the same L2 or two workers will answer to one address.
+## @field {string} gateway - Default gateway for the workers.
+## @field {int} prefix - Netmask prefix length.
+
+## @typedef {struct} ProxmoxStorageClass - A StorageClass backed by a Proxmox storage.
+## @field {string} name - StorageClass name inside the tenant cluster.
+## @field {string} storage - Proxmox storage id the volumes are created on (as it appears in `pvesm status`).
+## @field {string} [fstype] - Filesystem the driver formats volumes with: ext4 or xfs.
+## @field {bool} [ssd] - Mark volumes as SSD-backed, which changes the discard/cache defaults Proxmox applies.
+## @field {string} [reclaimPolicy] - Delete or Retain.
+
+## @typedef {struct} ProxmoxCCM - Proxmox cloud-controller-manager. It runs in the management cluster, in this namespace, and writes on the tenant's Nodes over the tenant's admin kubeconfig, so the hypervisor token never enters the tenant. Not optional on this substrate: the worker kubelet runs with `--cloud-provider=external`, so every node carries the `uninitialized` taint until this controller clears it, and the CSI node plugin needs the topology labels it applies.
+## @field {string} credentialsSecretName - Secret in THIS namespace holding the controller's Proxmox API credentials under the keys `url`, `token_id`, `token_secret` and `region`. May name the same Secret as `csi.credentialsSecretName`; it is a separate knob so the two can hold separate tokens, since this one only reads VM inventory while the driver attaches and detaches disks.
+
+## @typedef {struct} ProxmoxCSI - Proxmox CSI driver. The tenant gets the node plugin, the CSIDriver object and the storage classes; the controller, the only half that holds the hypervisor token, runs in the management cluster, in this namespace.
+## @field {bool} enabled - Install the driver. Without it a Proxmox-backed tenant has no way to provision PersistentVolumes at all.
+## @field {string} credentialsSecretName - Secret in THIS namespace holding the driver's Proxmox API credentials under the keys `url`, `token_id`, `token_secret` and `region`. The parent chart composes them into the controller's config file here, in the management cluster; nothing reaches the tenant, and no token is written into a rendered manifest. Distinct from the capmox credentials on purpose: the driver attaches and detaches disks, which is a different blast radius from creating VMs.
+## @field {[]ProxmoxStorageClass} storageClasses - StorageClasses to create in the tenant.
+
+## @typedef {struct} Proxmox - Proxmox substrate settings. Ignored unless `substrate` is `proxmox`.
+## @field {[]string} allowedNodes - Proxmox nodes capmox may place VMs on. Empty means every node in the Proxmox cluster.
+## @field {[]string} dnsServers - Nameservers written into each worker's network config. Required by the ProxmoxCluster schema.
+## @field {bool} [insecure] - Skip verification of the Proxmox API server certificate in the CCM and the CSI controller, both of which run in the management cluster. Default false: the certificate is verified unless an operator turns that off. A stock Proxmox VE install serves a self-signed one, so set true for it, or install a certificate the management cluster trusts.
+## @field {ProxmoxIPv4} ipv4Config - Address pool for workers. capmox assigns static addresses and has no DHCP mode, so this is required rather than optional.
+## @field {ProxmoxCCM} [ccm] - Proxmox cloud-controller-manager settings.
+## @field {ProxmoxCSI} [csi] - Proxmox CSI driver settings.
+
+## @param {Proxmox} proxmox - Proxmox substrate settings.
+proxmox:
+  allowedNodes: []
+  dnsServers: []
+  insecure: false
+  ccm:
+    credentialsSecretName: ""
+  csi:
+    enabled: true
+    credentialsSecretName: ""
+    storageClasses: []
+  ipv4Config:
+    addresses: []
+    gateway: ""
+    prefix: 24
+
 ## @section Cluster Addons
 ##
 
@@ -143,10 +160,6 @@ host: ""
 ## @field {bool} enabled - Enable GPU Operator.
 ## @field {object} valuesOverride - Custom Helm values overrides.
 
-## @typedef {struct} FluxCDAddon - FluxCD GitOps operator.
-## @field {bool} enabled - Enable FluxCD.
-## @field {object} valuesOverride - Custom Helm values overrides.
-
 ## @typedef {struct} HAMiAddon - HAMi GPU virtualization middleware.
 ## @field {bool} enabled - Enable HAMi (requires GPU Operator).
 ## @field {object} valuesOverride - Custom Helm values overrides.
@@ -171,16 +184,18 @@ host: ""
 
 ## @typedef {struct} Addons - Cluster addons configuration.
 ## @field {CertManagerAddon} certManager - Cert-manager addon.
-## @field {CiliumAddon} cilium - Cilium CNI plugin.
+## @field {CiliumAddon} cilium - Cilium CNI plugin. Always installed as the tenant cluster's CNI; this section only overrides its Helm values.
+## @x-cozystack-no-enable-switch true
 ## @field {GatewayAPIAddon} gatewayAPI - Gateway API addon.
 ## @field {IngressNginxAddon} ingressNginx - Ingress-NGINX controller.
 ## @field {GPUOperatorAddon} gpuOperator - NVIDIA GPU Operator.
 ## @field {HAMiAddon} hami - HAMi GPU virtualization middleware.
-## @field {FluxCDAddon} fluxcd - FluxCD GitOps operator.
 ## @field {MonitoringAgentsAddon} monitoringAgents - Monitoring agents.
-## @field {VerticalPodAutoscalerAddon} verticalPodAutoscaler - Vertical Pod Autoscaler.
+## @field {VerticalPodAutoscalerAddon} verticalPodAutoscaler - Vertical Pod Autoscaler. Installed and removed together with addons.monitoringAgents.enabled; this section only overrides its Helm values.
+## @x-cozystack-no-enable-switch true
 ## @field {VeleroAddon} velero - Velero backup/restore addon.
-## @field {CoreDNSAddon} coredns - CoreDNS addon.
+## @field {CoreDNSAddon} coredns - CoreDNS addon. Always installed as the tenant cluster's DNS; this section only overrides its Helm values.
+## @x-cozystack-no-enable-switch true
 ## @field {OuroborosAddon} ouroboros - Hairpin-NAT fix for ingress-nginx with PROXY-protocol.
 
 ## @param {Addons} addons - Cluster addons configuration.
@@ -203,9 +218,6 @@ addons:
   hami:
     enabled: false
     valuesOverride: {}
-  fluxcd:
-    enabled: false
-    valuesOverride: {}
   monitoringAgents:
     enabled: false
     valuesOverride: {}
@@ -224,9 +236,62 @@ addons:
 ## @section Kubernetes Control Plane Configuration
 ##
 
+# The two enums below mirror the item enums of the KamajiControlPlane CRD at the
+# provider pin (packages/system/capi-providers-cpprovider/files/control-plane-components.yaml).
+# Re-derive them when that pin moves.
+## @enum {string} AdmissionController - Admission plugin name the KamajiControlPlane accepts.
+## @value AlwaysAdmit
+## @value AlwaysDeny
+## @value AlwaysPullImages
+## @value CertificateApproval
+## @value CertificateSigning
+## @value CertificateSubjectRestriction
+## @value DefaultIngressClass
+## @value DefaultStorageClass
+## @value DefaultTolerationSeconds
+## @value DenyEscalatingExec
+## @value DenyExecOnPrivileged
+## @value DenyServiceExternalIPs
+## @value EventRateLimit
+## @value ExtendedResourceToleration
+## @value ImagePolicyWebhook
+## @value LimitPodHardAntiAffinityTopology
+## @value LimitRanger
+## @value MutatingAdmissionWebhook
+## @value NamespaceAutoProvision
+## @value NamespaceExists
+## @value NamespaceLifecycle
+## @value NodeRestriction
+## @value OwnerReferencesPermissionEnforcement
+## @value PersistentVolumeClaimResize
+## @value PersistentVolumeLabel
+## @value PodNodeSelector
+## @value PodSecurity
+## @value PodSecurityPolicy
+## @value PodTolerationRestriction
+## @value Priority
+## @value ResourceQuota
+## @value RuntimeClass
+## @value SecurityContextDeny
+## @value ServiceAccount
+## @value StorageObjectInUseProtection
+## @value TaintNodesByCondition
+## @value ValidatingAdmissionWebhook
+
+## @enum {string} NodeAddressType - Node address type the KamajiControlPlane accepts.
+## @value Hostname
+## @value InternalIP
+## @value ExternalIP
+## @value InternalDNS
+## @value ExternalDNS
+
 ## @typedef {struct} APIServer - API Server configuration.
 ## @field {Resources} resources - CPU and memory resources for API Server.
 ## @field {ResourcesPreset} resourcesPreset="c1.medium" - Preset if `resources` omitted.
+## @field {[]string} extraArgs - Extra command-line flags appended to the tenant kube-apiserver, passed through to KamajiControlPlane `spec.apiServer.extraArgs`. For OIDC use `spec.oidc.mode` — this passthrough is the escape hatch for unrelated apiserver flags. The tenant control plane sets each of the following flags itself and drops an entry naming one before the apiserver sees it. The chart moves an `--enable-admission-plugins=` entry into `controlPlane.apiServer.admissionControllers` and a `--kubelet-preferred-address-types=` entry into `controlPlane.kubelet.preferredAddressTypes` while that field is empty, and refuses any other entry naming one of them: `--advertise-address`, `--client-ca-file`, `--enable-admission-plugins`, `--service-cluster-ip-range`, `--kubelet-client-certificate`, `--kubelet-client-key`, `--kubelet-preferred-address-types`, `--proxy-client-cert-file`, `--proxy-client-key-file`, `--requestheader-allowed-names`, `--requestheader-client-ca-file`, `--secure-port`, `--service-account-key-file`, `--service-account-signing-key-file`, `--tls-cert-file`, `--tls-private-key-file`, `--etcd-servers`, `--etcd-cafile`, `--etcd-certfile`, `--etcd-keyfile`, `--etcd-prefix`, `--etcd-compaction-interval`, `--egress-selector-config-file`. When `spec.oidc.mode` is not `None` the chart also renders OIDC flags here, reads what you have written on them, and refuses some combinations outright; `docs/oidc-tenant.md` carries which flags, which combinations, and why. Do NOT add legacy `--oidc-*` flags here when `spec.oidc.mode` is not `None`; the chart injects `--authentication-config` and the apiserver refuses to boot with both. Empty by default (no change to current behavior).
+## @field {[]AdmissionController} admissionControllers - Admission plugins the tenant kube-apiserver enables, passed through to KamajiControlPlane `spec.admissionControllers`, which the control plane renders as `--enable-admission-plugins`. A non-empty list replaces the control plane's default set instead of adding to it. The kube-apiserver enables these plugins in addition to its own default ones, so leaving a plugin out does not turn it off; to turn one off, name it in `--disable-admission-plugins` in `controlPlane.apiServer.extraArgs` and keep it out of this list, since the apiserver refuses to start with a plugin in both, and the control plane's default set names several. Empty by default, which keeps that default set, taken from the TenantControlPlane CRD: CertificateApproval, CertificateSigning, CertificateSubjectRestriction, DefaultIngressClass, DefaultStorageClass, DefaultTolerationSeconds, LimitRanger, MutatingAdmissionWebhook, NamespaceLifecycle, PersistentVolumeClaimResize, Priority, ResourceQuota, RuntimeClass, ServiceAccount, StorageObjectInUseProtection, TaintNodesByCondition, ValidatingAdmissionWebhook. `NodeRestriction` is not in it.
+## @field {[]object} extraVolumes - Extra volumes added to the control-plane Deployment, passed through to KamajiControlPlane `spec.deployment.extraVolumes`. Use to mount a ConfigMap or Secret holding an AuthenticationConfiguration file referenced by `extraArgs`. Each item is a core/v1 Volume, but because the control-plane pod runs on the management cluster only `configMap` and `secret` sources are allowed (host-reaching sources like `hostPath`/`csi` and token-projection via `projected` are rejected); each volume must have a unique, non-empty name and exactly one source. The names `talos-ca` and `talos-tls-cert` are reserved by the chart. Empty by default.
+## @field {[]object} extraVolumeMounts - Extra volume mounts added to the tenant kube-apiserver container, passed through to KamajiControlPlane `spec.apiServer.extraVolumeMounts`. Each `name` must reference a volume declared in `extraVolumes`; the chart-managed talos secret volumes cannot be mounted. Each item is a core/v1 VolumeMount. Empty by default.
 
 ## @typedef {struct} ControllerManager - Controller Manager configuration.
 ## @field {Resources} resources - CPU and memory resources for Controller Manager.
@@ -243,12 +308,16 @@ addons:
 ## @typedef {struct} Konnectivity - Konnectivity configuration.
 ## @field {KonnectivityServer} server - Konnectivity Server configuration.
 
+## @typedef {struct} Kubelet - Kubelet connection settings of the tenant control plane.
+## @field {[]NodeAddressType} preferredAddressTypes - Node address types the tenant kube-apiserver tries, in order, when it connects to a kubelet, passed through to KamajiControlPlane `spec.kubelet.preferredAddressTypes`, which the control plane renders as `--kubelet-preferred-address-types`. The KamajiControlPlane CRD rejects a repeated name. Empty by default, which renders `InternalIP`, `ExternalIP`, or the list of a `--kubelet-preferred-address-types=` entry in `controlPlane.apiServer.extraArgs` when there is one.
+
 ## @typedef {struct} ControlPlane - Kubernetes control plane configuration.
 ## @field {int} replicas=2 - Number of control-plane replicas.
 ## @field {APIServer} apiServer - API Server configuration.
 ## @field {ControllerManager} controllerManager - Controller Manager configuration.
 ## @field {Scheduler} scheduler - Scheduler configuration.
 ## @field {Konnectivity} konnectivity - Konnectivity configuration.
+## @field {Kubelet} [kubelet] - Kubelet connection settings.
 
 ## @param {ControlPlane} controlPlane - Kubernetes control-plane configuration.
 controlPlane:
@@ -256,6 +325,10 @@ controlPlane:
   apiServer:
     resources: {}
     resourcesPreset: "c1.medium"
+    extraArgs: []
+    admissionControllers: []
+    extraVolumes: []
+    extraVolumeMounts: []
   controllerManager:
     resources: {}
     resourcesPreset: "t1.micro"
@@ -266,10 +339,73 @@ controlPlane:
     server:
       resources: {}
       resourcesPreset: "t1.micro"
+  kubelet:
+    preferredAddressTypes: []
 
 ## @typedef {struct} Images - Optional image overrides for chart-internal helpers.
 ## @field {string} [waitForKubeconfig] - Image used by the wait-for-kubeconfig init container. Empty falls back to images/busybox.tag.
+## @field {string} [kubectl] - Image used by the bootstrap-token tenant Job (kubectl). Empty falls back to images/kubectl.tag.
+## @field {string} [talosCsrSigner] - Image used by the talos-csr-signer sidecar in the Kamaji control plane. Empty falls back to images/talos-csr-signer.tag.
 
 ## @param {Images} images - Optional image overrides for air-gapped or rate-limited registries.
 images:
   waitForKubeconfig: ""
+  kubectl: ""
+  talosCsrSigner: ""
+
+##
+## @section Talos Worker Image
+##
+
+## @typedef {struct} Talos - Talos worker image configuration.
+## @field {string} version - Talos release used for worker OS image and installer. Must satisfy the chart's Talos<->Kubernetes support matrix against the chosen `version`.
+## @field {string} schematicID - Talos image-factory schematic ID. Defaults to the cozystack-tested vanilla schematic. Operators using custom schematics (system extensions, kernel args) override here.
+## @field {string} imageFactoryURL - Base URL of the Talos Image Factory that serves the worker OS disk image (the `openstack-amd64.raw.xz` raw artifact streamed in by CDI over HTTP). Defaults to the public factory. Point at a self-hosted Image Factory, a caching mirror, or an internal HTTP file server for air-gapped, rate-limited, or flaky-egress environments. No trailing slash.
+## @field {string} installerRepository - OCI repository prefix for the Talos installer image used by the in-guest `talos-reconcile` upgrade Job. Resolved as `<installerRepository>/<schematicID>:<version>`. Defaults to the public factory's installer path. Override for air-gapped or mirrored registries. No trailing slash.
+## @field {object} registryMirrors - Talos `machine.registries.mirrors` passthrough for worker nodes: a map of upstream registry host to `{ endpoints: [ ... ] }`. Empty by default, so workers pull container images (the Talos `kubelet` image included) directly from the upstream registry. Point a host such as `ghcr.io` at an in-cluster pull-through mirror for air-gapped, rate-limited, or flaky-egress environments so a worker's boot does not depend on live public egress. Talos still falls back to the upstream registry unless a host also sets `skipFallback: true`, so a mirror alone does not enforce air-gap.
+
+## @param {Talos} talos - Talos worker image configuration.
+talos:
+  version: "v1.13.6"
+  schematicID: "ce4c980550dd2ab1b17bbf2b08801c7eb59418eafe8f279833297925d67c7515"
+  imageFactoryURL: "https://factory.talos.dev"
+  installerRepository: "factory.talos.dev/installer"
+  registryMirrors: {}
+
+##
+## @section OIDC
+##
+
+## @enum {string} OIDCMode - Identity mode for the tenant kube-apiserver.
+## @value None
+## @value System
+## @value CustomConfig
+
+## @enum {string} OIDCRole - RBAC role bound to a listed user inside the tenant cluster.
+## @value admin
+## @value view
+
+## @typedef {struct} OIDCUser - One user entry; produces one ClusterRoleBinding inside the tenant cluster.
+## @field {string} email - Email address matched against the `email` claim from the issuer. Used verbatim as the `User:` subject in the ClusterRoleBinding inside the tenant cluster. The `email` claim is a built-in OIDC scope requested explicitly by the chart-generated `kubectl oidc-login` kubeconfig; every conformant OIDC provider (cozy realm included) emits it.
+## @field {OIDCRole} role - Role to bind: `admin` maps to `ClusterRole/cluster-admin`, `view` maps to `ClusterRole/view`.
+
+## @typedef {struct} OIDCSecretRef - Reference to a Secret carrying an inline AuthenticationConfiguration.
+## @field {string} [name] - Name of an existing Secret in the tenant (release) namespace whose `config.yaml` key holds an `apiserver.config.k8s.io/v1beta1` `AuthenticationConfiguration`. Mutually exclusive with `customConfig.config`.
+
+## @typedef {struct} OIDCCustomConfig - Tenant-provided AuthenticationConfiguration; consumed only when `mode: CustomConfig`. Exactly one of `config` or `secretRef.name` must be set.
+## @field {string} [config] - Inline AuthenticationConfiguration YAML (`apiserver.config.k8s.io/v1beta1`). The chart writes the value verbatim into a Secret mounted at `/etc/kubernetes/authentication-config/config.yaml` on the kube-apiserver. Mutually exclusive with `secretRef.name`.
+## @field {OIDCSecretRef} [secretRef] - Reference to an existing Secret in the tenant namespace carrying the `AuthenticationConfiguration`.
+
+## @typedef {struct} OIDC - OIDC selector for the tenant cluster (Phase 1 — per-cluster audience binding; no per-tenant Keycloak realm).
+## @field {OIDCMode} mode - Identity mode. `None`: no OIDC, only the static admin kubeconfig works. `System`: trust the platform Keycloak realm (`cozy` by default) via a per-cluster public client with audience binding; zero-config default. `CustomConfig`: trust a tenant-supplied issuer directly (BYO); `cozy` is not in the path.
+## @field {OIDCCustomConfig} [customConfig] - Tenant-supplied AuthenticationConfiguration; consumed only when `mode: CustomConfig`.
+## @field {[]OIDCUser} [users] - Users granted access to the tenant cluster; each entry produces one ClusterRoleBinding inside the tenant cluster. Works for both `System` and `CustomConfig` modes.
+
+## @param {OIDC} oidc - OIDC authentication and per-user RBAC for the tenant kube-apiserver. See docs/oidc-tenant.md for the operator guide.
+oidc:
+  mode: "None"
+  customConfig:
+    config: ""
+    secretRef:
+      name: ""
+  users: []
diff --git a/packages/apps/mariadb/Makefile b/packages/apps/mariadb/Makefile
index 5dbe533f0e..58eb927441 100644
--- a/packages/apps/mariadb/Makefile
+++ b/packages/apps/mariadb/Makefile
@@ -11,11 +11,14 @@ update:
 	hack/update-versions.sh
 	make generate
 
+.PHONY: test
+test:
+	helm unittest .
+
 image:
 	docker buildx build images/mariadb-backup \
 		$(call image-tags,mariadb-backup,$(MARIADB_BACKUP_TAG)) \
-		--cache-from type=registry,ref=$(REGISTRY)/mariadb-backup:latest \
-		--cache-to type=inline \
+		$(call cache-args,mariadb-backup) \
 		--metadata-file images/mariadb-backup.json \
 		$(BUILDX_ARGS)
 	echo "$(REGISTRY)/mariadb-backup:$(IMAGE_TAG)@$$(yq e '."containerimage.digest"' images/mariadb-backup.json -o json -r)" \
diff --git a/packages/apps/mariadb/README.md b/packages/apps/mariadb/README.md
index 8350a23cd9..65eaf7a563 100644
--- a/packages/apps/mariadb/README.md
+++ b/packages/apps/mariadb/README.md
@@ -65,6 +65,92 @@ restic -r s3:s3.example.org/mariadb-backups/database_name restore latest --targe
 more details:
 - https://blog.aenix.io/restic-effective-backup-from-stdin-4bc1e8f083c1
 
+### How to connect over TLS
+
+> Kubernetes objects for an instance are named after the Helm release, which prefixes the instance name: an instance `mydb` produces the Service and Secrets `mariadb-mydb-*`. The names below use `mariadb-<name>` for that reason, while `<instance>` elsewhere in this document is the name of the `MariaDB` resource itself.
+
+TLS is always served. `tls.issuer` selects who issues the certificate:
+
+| `tls.issuer` | issued by | covers |
+| --- | --- | --- |
+| `operator` (default) | mariadb-operator's own CA | `mariadb-<name>`, `-primary`, `-secondary`, the headless service, `localhost` |
+| `cert-manager` | a CA issued for this instance | the same, plus the external hostname when `external` is `true` |
+
+The operator has no way to learn the external hostname, so verifying a connection from outside the cluster requires `tls.issuer: cert-manager`.
+
+The default is `operator`, and it is not derived from `external`: switching issuer re-issues the server certificate under a new authority, which breaks any client that pinned the previous `ca.crt` without making anything safer — those instances already serve TLS.
+
+> The field is named for the issuer, not for on/off, because TLS is on either way. Some other charts here spell a similar-looking `tls.enabled` that *does* switch TLS on and off; this one deliberately does not, and the enum keeps it from reading as a switch. Epic [#2811](https://github.com/cozystack/cozystack/issues/2811) tracks converging the TLS surface across charts.
+
+Enforcement is separate. `tls.required: true` sets `require_secure_transport=ON` and refuses plaintext, under either issuer. It defaults to `false` because turning it on disconnects every client not yet using TLS — a decision to make once clients have the CA, not something an upgrade does.
+
+> `tls.required` will default to `true` in a later release, as an announced change.
+
+Connect with the MariaDB client by supplying the CA and asking for full verification:
+
+```bash
+mysql -h mariadb-<name> -u <user> -p --ssl-ca=/path/to/ca.crt --ssl-verify-server-cert
+```
+
+`-p` without a value prompts for the password, which keeps it out of shell history and out of the process arguments other users can read.
+
+`--ssl-ca` supplies the trust anchor; `--ssl-verify-server-cert` is what checks the server name against the certificate. Whether that second flag defaults to on depends on the version of the *client* you connect with, not the server version selected by `version`: it is off through 10.11 and on from 11.4. Do not read that as "an 11.4 client already verifies". Without `--ssl-ca` it has no trust anchor to verify against, and falls back to an anti-tampering check derived from the password hash, which establishes neither the chain nor the hostname — and cannot be derived at all for a passwordless user. `--ssl-ca` is the load-bearing flag here; pass both and the connection is verified on either client. Note these are MariaDB client options — the MySQL 8 client spells the same intent as `--ssl-mode=VERIFY_IDENTITY`, which the MariaDB client rejects outright.
+
+The trust anchor is published to tenants as `mariadb-<name>.tenant-ca`, an object holding `ca.crt` and nothing else, delivered through the `core.cozystack.io/tenantsecrets` API that the base tenant roles already grant. It is lifted from the operator's own key-free `mariadb-<name>-ca-bundle`, which is reconciled whenever TLS is enabled and follows CA rollovers, but that Secret is not itself granted to tenants: a direct grant on the name would convey whatever happens to occupy it, where the projection conveys only what the platform has vouched for.
+
+```bash
+kubectl get tenantsecret mariadb-<name>.tenant-ca -o jsonpath='{.data.ca\.crt}' | base64 -d > ca.crt
+```
+
+> **Verifying an external connection requires `tls.issuer: cert-manager`.** The operator's certificate does not carry the external hostname, so a client connecting from outside with `--ssl-verify-server-cert` fails hostname verification against an unmanaged instance no matter which CA it trusts. A cert-manager-issued certificate is what puts `mariadb-<name>.<host>` in the certificate.
+>
+> Such clients also need a DNS record pointing at the LoadBalancer address: the hostname is a SAN, the address is not, so connecting to the IP directly fails verification either way.
+
+#### Migrating an existing instance
+
+An existing instance keeps the operator's CA and its current enforcement whether or not you upgrade; setting `tls.issuer: cert-manager` is what moves it to a CA issued for it, and that is the step to plan around.
+
+The deprecated `backup.*` CronJob also changes: its client now verifies the server it connects to, against `mariadb-<name>-ca-bundle`, where before it connected without checking. That bundle is present on every instance and carries whichever CA is in use — the operator's, and the chart's as well under `issuer: cert-manager` — and the certificate covers the hostname the job dials, so the verification itself needs no action. Note that this job is separately unable to start — it reads the root password from a Secret name the chart does not render — so on current releases the change is to a job that does not run. Use the `BackupClass` / `Plan` flow instead.
+
+Switching issuer does not enforce anything by itself — enforcement is a separate opt-in — but it does change who issues the server certificate. A client that re-reads `mariadb-<name>.tenant-ca` at connect time follows the change automatically, because the operator keeps both the old and the new CA in `mariadb-<name>-ca-bundle`, which the projection stays in sync with. A client that copied `ca.crt` out and pinned it will fail chain validation once the new certificate is served, and has to re-read the anchor.
+
+> On a fresh instance created with `tls.issuer: cert-manager`, the pods do not start until cert-manager has issued the certificates: the operator needs the server certificate before it creates the StatefulSet. This resolves on its own within a reconcile or two — the chart labels the Secrets so the operator is woken as soon as they appear — but the instance looks stalled in the meantime.
+
+The order to change it in:
+
+1. Switch the issuer and leave enforcement off (the default):
+
+   ```yaml
+   tls:
+     issuer: cert-manager
+   ```
+
+   This step rolls the StatefulSet. The CR gains `serverCertSecretRef` and `serverCASecretRef`, which changes the name of the Secret projected into the pods, and a pod-template change restarts them. On a multi-replica instance that is a rolling restart; on a single-replica one it is downtime for as long as one pod takes to come back. Wait for `kubectl rollout status statefulset/mariadb-<name>` before going on.
+
+2. Distribute `mariadb-<name>.tenant-ca` and move clients onto verified TLS one at a time.
+3. Once no plaintext clients remain, require it:
+
+   ```yaml
+   tls:
+     issuer: cert-manager
+     required: true
+   ```
+
+Step 3 is the only one that refuses a client by policy, and it happens when you choose it rather than when a platform upgrade rolls through. Step 1 interrupts connections as well, but by restarting the server rather than by rejecting anyone: a client that reconnects is served.
+
+Going back is the same change in reverse: setting `tls.issuer: operator` hands issuance back, and clients have to pick up the operator's CA from the bundle again.
+
+One thing does not clean itself up. The Certificates are removed, but cert-manager is configured not to own the Secrets it issued, so `mariadb-<name>.ca-tls` (the CA private key) and `mariadb-<name>.tls` (the server private key) stay in the namespace. No tenant grant exposes them, but they are private keys, so remove them.
+
+Wait for the rollout first. `mariadb-<name>.tls` is mounted into the running pods for as long as the instance still serves the chart-issued certificate, so deleting it before the operator has reissued and rolled the StatefulSet leaves the next pod unable to start:
+
+```bash
+kubectl rollout status statefulset/mariadb-<name>
+kubectl delete secret mariadb-<name>.ca-tls mariadb-<name>.tls --ignore-not-found
+```
+
+Uninstalling the instance does this for you; only the turn-it-off-and-keep-running case needs the manual step.
+
 ### Known issues
 
 - **Replication can't be finished with various errors**
@@ -81,6 +167,8 @@ more details:
   mysql -h <master> -P 3306 -u<user> -p<password> <database> < ~/tmp/fix-table.sql
   ```
 
+  When TLS is enforced (`tls.required`) the server refuses plaintext connections, so add `--ssl-ca=/path/to/ca.crt --ssl-verify-server-cert` to both commands.
+
 ## Parameters
 
 ### Common parameters
@@ -95,20 +183,34 @@ more details:
 | `size`             | Persistent Volume Claim size available for application data.                                                                      | `quantity` | `10Gi`    |
 | `storageClass`     | StorageClass used to store the data.                                                                                              | `string`   | `""`      |
 | `external`         | Enable external access from outside the cluster.                                                                                  | `bool`     | `false`   |
-| `version`          | MariaDB major.minor version to deploy                                                                                             | `string`   | `v11.8`   |
+
+
+### TLS parameters
+
+| Name           | Description                                                                                                                                                                                                                                                                                                                                 | Type     | Value      |
+| -------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------- | ---------- |
+| `tls`          | TLS configuration. Selects who issues the certificates and whether plaintext is refused; TLS itself is always served.                                                                                                                                                                                                                       | `object` | `{}`       |
+| `tls.issuer`   | Who issues the server certificate: `operator` uses the CA mariadb-operator manages itself, `cert-manager` gives the instance its own CA and is what covers the external hostname. Named for the issuer because TLS is served under both, unlike the similarly-spelled `tls.enabled` in some other charts, which does switch TLS on and off. | `string` | `operator` |
+| `tls.required` | Refuse plaintext connections (sets MariaDB require_secure_transport=ON). Applies under either issuer. Opt-in: turn it on once every client connects over TLS, since it disconnects those that do not.                                                                                                                                       | `*bool`  | `null`     |
+
+
+### Version parameters
+
+| Name      | Description                           | Type     | Value   |
+| --------- | ------------------------------------- | -------- | ------- |
+| `version` | MariaDB major.minor version to deploy | `string` | `v11.8` |
 
 
 ### Application-specific parameters
 
-| Name                             | Description                              | Type                | Value |
-| -------------------------------- | ---------------------------------------- | ------------------- | ----- |
-| `users`                          | Users configuration map.                 | `map[string]object` | `{}`  |
-| `users[name].password`           | Password for the user.                   | `string`            | `""`  |
-| `users[name].maxUserConnections` | Maximum number of connections.           | `int`               | `0`   |
-| `databases`                      | Databases configuration map.             | `map[string]object` | `{}`  |
-| `databases[name].roles`          | Roles assigned to users.                 | `object`            | `{}`  |
-| `databases[name].roles.admin`    | List of users with admin privileges.     | `[]string`          | `[]`  |
-| `databases[name].roles.readonly` | List of users with read-only privileges. | `[]string`          | `[]`  |
+| Name                             | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | Type                | Value |
+| -------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------- | ----- |
+| `users`                          | Users configuration map. Passwords (including the `root` account) are always auto-generated and stored in the `<release>-credentials` Secret; they cannot be set from values — read a user's password from that Secret. A `password` left over in values from before the field was removed is ignored by the render and draws an admission warning, but it is not inert on an upgraded release: the chart preserves whatever password is already in the Secret, which on the first upgrade is the value that was set before removal, so that value stays the live credential until it is rotated (dedicated rotation is tracked in cozystack/community#72). The live password lives only in the Secret. | `map[string]object` | `{}`  |
+| `users[name].maxUserConnections` | Maximum number of connections.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | `int`               | `0`   |
+| `databases`                      | Databases configuration map.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              | `map[string]object` | `{}`  |
+| `databases[name].roles`          | Roles assigned to users.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | `object`            | `{}`  |
+| `databases[name].roles.admin`    | List of users with admin privileges.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | `[]string`          | `[]`  |
+| `databases[name].roles.readonly` | List of users with read-only privileges.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | `[]string`          | `[]`  |
 
 
 ### Backup parameters (DEPRECATED)
@@ -131,7 +233,7 @@ more details:
 ### resources and resourcesPreset
 
 `resources` sets explicit CPU and memory configurations for each replica.
-When left empty, the preset defined in `resourcesPreset` is applied.
+Every resource it leaves unset is taken from the preset defined in `resourcesPreset`.
 
 ```yaml
 resources:
@@ -142,7 +244,7 @@ resources:
 `resourcesPreset` sets named CPU and memory configurations for each replica.
 This setting is ignored if the corresponding `resources` value is set.
 
-Presets follow a cloud-style `<series>.<size>` naming convention. Five series cover the full CPU-to-memory ratio range (`t1` 1:0.5, `c1` 1:1, `s1` 1:2, `u1` 1:4, `m1` 1:8) and each series ships eight sizes (`nano` through `4xlarge`). The legacy flat names (`nano`, `micro`, `small`, `medium`, `large`, `xlarge`, `2xlarge`) remain accepted as deprecated aliases of their 1:1 instance-type equivalents.
+Presets follow a cloud-style `<series>.<size>` naming convention. Five series cover the full CPU-to-memory ratio range (`t1` 1:0.5, `c1` 1:1, `s1` 1:2, `u1` 1:4, `m1` 1:8) and each series ships eight sizes (`nano` through `4xlarge`). The legacy flat names (`nano`, `micro`, `small`, `medium`, `large`, `xlarge`, `2xlarge`) remain accepted as deprecated aliases and keep their original sizes, which do not follow one series: `nano` through `small` equal the `t1` sizes of the same name, while `medium` equals `c1.small` rather than `c1.medium`.
 
 See [`docs/operations/resource-presets.md`](../../../docs/operations/resource-presets.md) for the full size matrix and the legacy-to-instance-type mapping.
 
@@ -152,12 +254,12 @@ See [`docs/operations/resource-presets.md`](../../../docs/operations/resource-pr
 users:
   user1:
     maxUserConnections: 1000
-    password: hackme
   user2:
     maxUserConnections: 1000
-    password: hackme
 ```
 
+Passwords cannot be set here — they (and the `root` account) are auto-generated and stored in the `<release>-credentials` Secret. Read a user's password with `kubectl get secret <release>-credentials -o json | jq -r '.data["user1"]' | base64 -d` (a username may contain a `.`, which `jsonpath` would treat as a path step and return nothing).
+
 
 ### databases
 
diff --git a/packages/apps/mariadb/images/mariadb-backup.tag b/packages/apps/mariadb/images/mariadb-backup.tag
index 6c830892a2..3dafe6c5e1 100644
--- a/packages/apps/mariadb/images/mariadb-backup.tag
+++ b/packages/apps/mariadb/images/mariadb-backup.tag
@@ -1 +1 @@
-ghcr.io/cozystack/cozystack/mariadb-backup:0.0.0@sha256:3841eb171416711977dea0cf8cd45d32344caac9727af760c37d5e1dd41ee4bb
+ghcr.io/cozystack/cozystack/mariadb-backup:v1.6.0@sha256:1de944b5c4fbeef94004b8620b0865aa7886a692dacb23d50c8f9b31fbeece07
diff --git a/packages/apps/mariadb/images/mariadb-backup/Dockerfile b/packages/apps/mariadb/images/mariadb-backup/Dockerfile
index ed56ae5f15..3f792ab531 100644
--- a/packages/apps/mariadb/images/mariadb-backup/Dockerfile
+++ b/packages/apps/mariadb/images/mariadb-backup/Dockerfile
@@ -1,2 +1,2 @@
-FROM alpine:3.20
+FROM alpine:3.24@sha256:294b683cb724975bec92580e1e685676bd4b50bda910ddb8c51d4cabeaec77e6
 RUN apk add --no-cache mariadb-client uuidgen restic
diff --git a/packages/apps/mariadb/templates/_tls.tpl b/packages/apps/mariadb/templates/_tls.tpl
new file mode 100644
index 0000000000..8ffd140f6d
--- /dev/null
+++ b/packages/apps/mariadb/templates/_tls.tpl
@@ -0,0 +1,23 @@
+{{/*
+mariadb.tls.certManagerIssued resolves tls.issuer to "true" or "false" so
+callers can use it with `eq`:
+
+  {{- $certManagerIssued := (include "mariadb.tls.certManagerIssued" .) | eq "true" -}}
+
+Defaults to the operator, and is deliberately not derived from `external`:
+switching issuer re-issues the server certificate under a new authority, which
+breaks any client that pinned the previous ca.crt, and it does not raise the
+security floor — those instances already serve TLS. So it is chosen rather than
+applied on upgrade.
+
+`default (dict)` guards tls: null; `kindIs "invalid"` guards an absent key.
+*/}}
+{{- define "mariadb.tls.certManagerIssued" -}}
+{{- $tlsMap := default (dict) .Values.tls -}}
+{{- $issuer := index $tlsMap "issuer" -}}
+{{- if kindIs "invalid" $issuer -}}
+  {{- "false" -}}
+{{- else -}}
+  {{- eq $issuer "cert-manager" | toString -}}
+{{- end -}}
+{{- end -}}
diff --git a/packages/apps/mariadb/templates/_tuning.tpl b/packages/apps/mariadb/templates/_tuning.tpl
new file mode 100644
index 0000000000..abe73afb83
--- /dev/null
+++ b/packages/apps/mariadb/templates/_tuning.tpl
@@ -0,0 +1,137 @@
+{{/*
+  Derive my.cnf sizing from the instance's own CPU, memory and volume.
+
+  Every value below is either a memory allocation or a thread count, so it
+  belongs to the pod rather than to the host the config was first written
+  for. Settings that encode durability or storage behaviour — flush method,
+  flush_log_at_trx_commit, io_capacity, fast_shutdown — are deliberately not
+  derived here: the chart cannot infer them from the pod's size.
+
+  join_buffer_size is the one allocation left hardcoded, at the 2M the chart
+  has always shipped, eight times the server's own default. It is per-join
+  rather than per-connection and is left for a change that can measure the
+  effect; on a small instance it is the largest allocation this helper does
+  not account for.
+
+  The memory limit is read through the same cozy-lib helper that fills the
+  MariaDB CR's resource stanza, so `resources` overrides and `resourcesPreset`
+  resolve exactly as they do there.
+
+  Two version constraints shape the clamps, both checked against every server
+  this chart ships (10.6.24, 10.11.15, 11.4.9, 11.8.5):
+
+  - InnoDB refuses to start when innodb_buffer_pool_size is too small at the
+    default 16K page size. The exact minimum moved: 10.6 demands 5 MiB, the
+    later lines 6 MiB. The 8Mi floor clears both.
+  - On the 10.6 line the buffer pool is allocated in innodb_buffer_pool_chunk_size
+    units, which default to 128 MiB there, and a request above one chunk is
+    rounded *up* to a whole number of chunks. Rounding the computed size down to
+    a 128 MiB multiple keeps 10.6 from being handed more buffer pool than its
+    memory limit allows. It is a no-op on the other shipped versions: 10.8
+    autosized the chunk to a 64th of the pool, and 10.11.12, 11.4.6 and 11.8.2
+    deprecated and ignore it outright, all at or below 10.11.15, 11.4.9 and
+    11.8.5. Rounding down unconditionally costs those versions a little pool
+    whenever the memory limit is at least 256 MiB and not a multiple of it —
+    the rounding applies to half the limit, and below one whole chunk it does
+    not fire at all — in exchange for one effective size across every version
+    the chart ships.
+
+  Where the clamps sit relative to what the chart used to ship, since an
+  upgrade moves an existing instance onto them:
+
+  - Most caps are the previously shipped value, so an instance large enough to
+    reach one is sized as it is today.
+  - key_buffer_size is capped at 128M against the 1024M shipped before, and
+    floored at 8M against the server's own 128M default. Both ends are
+    deliberate — see the key cache note below — and both lower the allocation
+    on every instance.
+  - The IO threads floor at 2 against a server default of 4, so a one-core
+    instance gets fewer than an untuned server would start. That is the point:
+    the floor follows the CPU limit, not the host.
+  - The buffer pool has no cap at all: it is the setting this whole helper
+    exists to derive, and pinning it to the old 60G would keep the largest
+    instances sized for a host they do not run on. An instance with 128Gi or
+    more of memory is the single case where anything here goes up rather than
+    down, to half of a limit the instance already has.
+*/}}
+{{- define "mariadb.tuning" }}
+{{-   $mib := 1048576 }}
+{{-   $resources := include "cozy-lib.resources.defaultingSanitize" (list .Values.resourcesPreset .Values.resources $) | fromYaml }}
+{{-   $memB := include "cozy-lib.resources.toFloat" $resources.limits.memory | float64 | int64 }}
+{{-   $cpu := include "cozy-lib.resources.toFloat" $resources.limits.cpu | float64 }}
+{{-   $volB := include "cozy-lib.resources.toFloat" (.Values.size | toString) | float64 | int64 }}
+{{-   $memMi := div $memB $mib }}
+{{-   $cores := ceil $cpu | int64 }}
+
+{{/*
+  Buffer pool: half of the memory limit. The classic "70-80% of RAM" advice
+  assumes a dedicated host where the remainder is page cache and overshooting
+  merely swaps. Under a cgroup limit the same budget also has to cover the
+  per-connection buffers, temp tables, the key cache and mysqld's own heap,
+  and exceeding it is an OOM kill rather than swapping, so half is the share
+  that leaves room for everything else.
+*/}}
+{{-   $poolB := div $memB 2 }}
+{{-   if ge $poolB (mul 128 $mib) }}
+{{-     $poolB = mul (div $poolB (mul 128 $mib)) (mul 128 $mib) }}
+{{-   end }}
+{{-   $poolB = max $poolB (mul 8 $mib) }}
+
+{{/*
+  Redo log: bounded by the buffer pool it buffers dirty pages for, and by a
+  small fraction of the data volume it is preallocated on. The floor is the
+  server's own 96M default; the ceiling is the 4096M the chart shipped before.
+  Changing this on an existing database is safe on every shipped version —
+  InnoDB replays the existing log during crash recovery and only then rewrites
+  it at the new size, after both a clean and an unclean shutdown.
+*/}}
+{{-   $logB := min $poolB (div $volB 20) }}
+{{-   $logB = min (max $logB (mul 96 $mib)) (mul 4096 $mib) }}
+
+{{/*
+  MyISAM key cache. Allocated eagerly at startup, and close to dead weight
+  here because MariaDB's own system tables are Aria rather than MyISAM, so it
+  is held to a small share of memory and never above the 128M server default.
+*/}}
+{{-   $keyB := min (max (div $memB 32) (mul 8 $mib)) (mul 128 $mib) }}
+
+{{/*
+  Connections and the per-connection buffers behind them. The floor is stock
+  MariaDB's own 151, so the chart is never more restrictive than an untuned
+  server; the ceiling is the 4096 shipped before.
+*/}}
+{{-   $maxConnections := min (max (div $memMi 4) 151) 4096 }}
+
+{{/*
+  tmp_table_size only takes effect up to max_heap_table_size, which the chart
+  does not set and which defaults to 16M, so today this scales a value whose
+  effective ceiling is its own floor. It is derived anyway so that raising
+  max_heap_table_size later is a one-line change rather than a re-derivation,
+  and because the 512M shipped before was inert for exactly the same reason.
+*/}}
+{{-   $tmpTableB := min (max (div $memB 32) (mul 16 $mib)) (mul 512 $mib) }}
+{{-   $readRndB := min (max (div $memB 256) 262144) (mul 16 $mib) }}
+{{-   $tableOpenCache := min (max (mul $memMi 4) 2000) 40714 }}
+
+{{/*
+  Thread counts follow the CPU limit; ceilings are the previously shipped
+  values. Only the IO threads are live today: thread_pool_size applies solely
+  under thread_handling=pool-of-threads, and the chart leaves the server on its
+  default of one-thread-per-connection, so this — like the 24 shipped before —
+  is carried for the day the chart switches rather than for effect now.
+*/}}
+{{-   $threadPoolSize := min (max $cores 1) 24 }}
+{{-   $ioThreads := min (max $cores 2) 12 }}
+
+{{-   dict
+        "bufferPoolSizeMi" (div $poolB $mib)
+        "logFileSizeMi"    (div $logB $mib)
+        "keyBufferSizeMi"  (div $keyB $mib)
+        "tmpTableSizeMi"   (div $tmpTableB $mib)
+        "readRndBufferKi"  (div $readRndB 1024)
+        "maxConnections"   $maxConnections
+        "tableOpenCache"   $tableOpenCache
+        "threadPoolSize"   $threadPoolSize
+        "ioThreads"        $ioThreads
+      | toYaml }}
+{{- end }}
diff --git a/packages/apps/mariadb/templates/backup-cronjob.yaml b/packages/apps/mariadb/templates/backup-cronjob.yaml
index ddb237cddd..d39d5a8ddb 100644
--- a/packages/apps/mariadb/templates/backup-cronjob.yaml
+++ b/packages/apps/mariadb/templates/backup-cronjob.yaml
@@ -40,8 +40,12 @@ spec:
                 secretKeyRef:
                   name: {{ .Release.Name }}
                   key: root-password
+            - name: MYSQL_CA_SECRET
+              value: {{ .Release.Name }}-ca-bundle
             - name: MYSQL_HOST
-              value: "{{ .Release.Name }}-{{ if eq (int .Values.replicas) 1 }}primary{{ else }}secondary{{ end }}"
+              # replicas>1 enables replication (offload dumps to a secondary);
+              # replicas=1 has no replication and only the bare service exists.
+              value: "{{ .Release.Name }}{{- if gt (int .Values.replicas) 1 }}-secondary{{- end }}"
             - name: AWS_ACCESS_KEY_ID
               valueFrom:
                 secretKeyRef:
@@ -66,6 +70,9 @@ spec:
               name: tmp
             - mountPath: /.cache
               name: cache
+            - mountPath: /etc/mysql-ssl
+              name: tls-ca
+              readOnly: true
             securityContext:
               allowPrivilegeEscalation: false
               capabilities:
@@ -82,6 +89,27 @@ spec:
             emptyDir: {}
           - name: cache
             emptyDir: {}
+          # -ca-bundle is the operator-reconciled trust bundle. It carries both
+          # the old and the new CA across a rollover, whereas the leaf Secret
+          # only ever holds the CA that signed the current certificate. Mounted
+          # unconditionally: the server always serves TLS, so the backup client
+          # always has something to verify against.
+          #
+          # optional so a missing bundle fails the run instead of stopping it.
+          # The operator reconciles the bundle only after certificates settle, so
+          # there is a window on first install where it does not exist yet; a
+          # required mount would leave the pod in ContainerCreating, and with
+          # concurrencyPolicy: Forbid that one stuck pod blocks every later
+          # backup indefinitely. The script checks for the file before connecting
+          # because the client reports its absence only as "TLS/SSL error: No
+          # such file or directory", without naming what it could not read.
+          - name: tls-ca
+            secret:
+              secretName: {{ .Release.Name }}-ca-bundle
+              optional: true
+              items:
+              - key: ca.crt
+                path: ca.crt
           securityContext:
             runAsNonRoot: true
             runAsUser: 9000
diff --git a/packages/apps/mariadb/templates/backup-script.yaml b/packages/apps/mariadb/templates/backup-script.yaml
index b261cdea32..d04bfc5852 100644
--- a/packages/apps/mariadb/templates/backup-script.yaml
+++ b/packages/apps/mariadb/templates/backup-script.yaml
@@ -10,8 +10,47 @@ stringData:
     set -e
     set -o pipefail
 
+    {{- /*
+      The backup image is alpine + mariadb-client, so these options are parsed
+      by the MariaDB client, which implements no ssl-mode option and rejects it
+      at argument parsing time before connecting. --ssl-ca combined with
+      --ssl-verify-server-cert is the MariaDB equivalent of MySQL's strictest
+      mode: it validates the chain against the CA and checks the server
+      hostname against the certificate SANs. Keep this rationale in a template
+      comment rather than a shell comment so the MySQL-only option name never
+      appears in the rendered script.
+
+      The options are unconditional. The server always serves TLS, and the
+      operator reconciles the CA bundle in every configuration, so verifying is
+      always possible; gating them on managed TLS would leave the backup client
+      connecting in plaintext against a server that may be enforcing TLS, and
+      every run would fail.
+    */}}
+    SSL_OPTS="--ssl-ca=/etc/mysql-ssl/ca.crt --ssl-verify-server-cert"
+
+    # The client reports a missing or unusable CA as "TLS/SSL error: No such
+    # file or directory" without naming the file, which is not enough to act on.
+    # The volume is an optional mount, so the file is absent exactly when the
+    # operator has not reconciled the trust bundle yet; say so.
+    #
+    # Empty counts as unusable: the operator drops expired certificates when it
+    # builds the bundle, so a fully expired CA set produces a present but empty
+    # ca.crt. Testing only for readability would let that through to the same
+    # opaque client error this check exists to replace.
+    #
+    # It does not cover every case. On a fresh install with managed TLS the
+    # operator writes the bundle before cert-manager has issued the chart CA, so
+    # the file can be present and non-empty while holding only the operator's
+    # client CA — the connection then fails on verification rather than here.
+    # That window closes on the next reconcile.
+    if [ ! -r /etc/mysql-ssl/ca.crt ] || [ ! -s /etc/mysql-ssl/ca.crt ]; then
+      echo "ERROR: /etc/mysql-ssl/ca.crt is missing or empty, projected from Secret ${MYSQL_CA_SECRET}." >&2
+      echo "The operator reconciles that Secret once TLS certificates settle; retry once it holds a CA." >&2
+      exit 1
+    fi
+
     JOB_ID="job-$(uuidgen|cut -f1 -d-)"
-    DB_LIST=$(mysql -u "$MYSQL_USER" -h "$MYSQL_HOST" -sNe 'SHOW DATABASES;' | grep -v '^\(#.*\|mysql\|sys\|information_schema\|performance_schema\)$')
+    DB_LIST=$(mysql -u "$MYSQL_USER" -h "$MYSQL_HOST" $SSL_OPTS -sNe 'SHOW DATABASES;' | grep -v '^\(#.*\|mysql\|sys\|information_schema\|performance_schema\)$')
     echo DB_LIST=$(echo "$DB_LIST" | shuf) # shuffle list
     echo "Job ID: $JOB_ID"
     echo "Target repo: $REPO_PREFIX"
@@ -26,8 +65,8 @@ stringData:
         restic -r "s3:${REPO_PREFIX}/$db" cat config >/dev/null 2>&1 || \
           restic -r "s3:${REPO_PREFIX}/$db" init --repository-version 2
         restic -r "s3:${REPO_PREFIX}/$db" unlock --remove-all >/dev/null 2>&1 || true # no locks, k8s takes care of it
-        mysqldump -u "$MYSQL_USER" -h "$MYSQL_HOST" --single-transaction --databases $db | \
-          restic -r "s3:${REPO_PREFIX}/$db" backup --tag "$JOB_ID" --stdin --stdin-filename dump.sql 
+        mysqldump -u "$MYSQL_USER" -h "$MYSQL_HOST" $SSL_OPTS --single-transaction --databases $db | \
+          restic -r "s3:${REPO_PREFIX}/$db" backup --tag "$JOB_ID" --stdin --stdin-filename dump.sql
         restic -r "s3:${REPO_PREFIX}/$db" tag --tag "$JOB_ID" --set "completed"
       )
     done
diff --git a/packages/apps/mariadb/templates/certmanager.yaml b/packages/apps/mariadb/templates/certmanager.yaml
new file mode 100644
index 0000000000..ed60e0e167
--- /dev/null
+++ b/packages/apps/mariadb/templates/certmanager.yaml
@@ -0,0 +1,165 @@
+{{- $certManagerIssued := (include "mariadb.tls.certManagerIssued" .) | eq "true" -}}
+{{- if $certManagerIssued }}
+{{- /* default (dict) keeps `index` from erroring when _cluster is absent or null, which is what makes the cozy.local fallback below actually reachable. */}}
+{{- $clusterDomain := (index (default (dict) .Values._cluster) "cluster-domain") | default "cozy.local" }}
+---
+# Self-signed bootstrap Issuer — used only to sign the CA Certificate below.
+apiVersion: cert-manager.io/v1
+kind: Issuer
+metadata:
+  name: {{ .Release.Name }}-selfsigned
+  namespace: {{ .Release.Namespace }}
+spec:
+  selfSigned: {}
+---
+# CA Certificate. rotationPolicy: Never keeps the CA stable so existing
+# client trust bundles remain valid across cert-manager renewals.
+apiVersion: cert-manager.io/v1
+kind: Certificate
+metadata:
+  name: {{ .Release.Name }}-ca
+  namespace: {{ .Release.Namespace }}
+spec:
+  isCA: true
+  commonName: {{ .Release.Name }}-ca
+  # A dot, not a hyphen: the Secret suffix set holds both .ca-tls and .tls, so
+  # hyphenated, release `foo`'s CA Secret and release `foo-ca`'s leaf Secret are
+  # both mariadb-foo-ca-tls. A dot-free suffix after a dot splits uniquely,
+  # because an application name is a DNS-1035 label and cannot contain a dot.
+  # The Certificate and Issuer names keep the hyphen; their suffixes are not a
+  # pair where one is a tail of the other.
+  secretName: {{ .Release.Name }}.ca-tls
+  # This Secret is key-bearing and is never handed to the tenant, nor is it the
+  # source the trust anchor is published from: the TenantProjection this chart
+  # renders names the operator's key-free <release>-ca-bundle as the source
+  # instead, so no publication path ever runs next to the CA private key. The
+  # ApplicationDefinition names neither as a source: it excludes this Secret by
+  # name and selects the published anchor by label.
+  #
+  # The operator only watches Secrets referenced by serverCASecretRef /
+  # serverCertSecretRef when they carry its watch label, and it sets the same
+  # label on Certificates it builds itself. Without it a cert-manager renewal
+  # does not wake a reconcile immediately; the operator requeues every five
+  # minutes while TLS is on, so this buys promptness, not correctness.
+  secretTemplate:
+    labels:
+      k8s.mariadb.com/watch: ""
+  duration: 43800h
+  issuerRef:
+    name: {{ .Release.Name }}-selfsigned
+    kind: Issuer
+    group: cert-manager.io
+  privateKey:
+    rotationPolicy: Never
+    algorithm: ECDSA
+    size: 256
+  # CA usages: signing + cert sign (issuing leaf certs) + crl sign (RFC 5280)
+  usages:
+    - signing
+    - cert sign
+    - crl sign
+---
+# CA Issuer — used to sign the leaf server certificate.
+apiVersion: cert-manager.io/v1
+kind: Issuer
+metadata:
+  name: {{ .Release.Name }}-ca
+  namespace: {{ .Release.Namespace }}
+spec:
+  ca:
+    secretName: {{ .Release.Name }}.ca-tls
+---
+# Leaf server TLS Certificate passed to mariadb-operator via spec.tls.serverCertSecretRef.
+# The SAN list covers the base, primary, and secondary services plus, when external is
+# true, the external DNS name for the LoadBalancer service.
+#
+# The operator can issue this leaf itself, via spec.tls.serverCertIssuerRef
+# pointed at the CA Issuer above, which would remove this hand-written list.
+# It is not used because at the pinned operator version (25.10.2) the SAN list
+# is computed from the cluster's own service names with no way to extend it —
+# the TLS spec has no alt-names field — so the external hostname, the only
+# reason external: true exists, could never appear in the certificate and an
+# external client would fail hostname verification against it.
+#
+# That is version-scoped, not permanent: upstream has since added
+# spec.tls.serverCertAdditionalNames, which TLSServerDNSNames appends. Once the
+# operator is bumped past that, the issuer path can carry the external hostname
+# and everything below here can go. Worth revisiting at the next bump rather
+# than treating this as settled.
+#
+# The consequence is that this list has to track the operator's service naming
+# by hand, and nothing verifies that it still does. The test suite pins the full
+# set, which catches an accidental edit here, but it compares this template
+# against a copy of itself — it cannot notice the operator renaming a service.
+# The operator does not check either: with both serverCASecretRef and
+# serverCertSecretRef supplied it skips certificate issuance, so the code that
+# would validate SANs is never reached. It still reads the Secret — for the pod
+# annotation hash and for status — but never inspects the names in it. So an
+# upstream rename surfaces as a handshake failure in a cluster, and closing
+# that gap needs an e2e case that connects, not another rendering assertion.
+apiVersion: cert-manager.io/v1
+kind: Certificate
+metadata:
+  name: {{ .Release.Name }}-tls
+  namespace: {{ .Release.Namespace }}
+spec:
+  # Dotted for the same reason as the CA Secret above.
+  secretName: {{ .Release.Name }}.tls
+  # Set explicitly: cert-manager leaves the Subject CN empty otherwise, and a
+  # client that still verifies the hostname against the CN rather than the SANs
+  # fails outright against an empty one.
+  commonName: {{ .Release.Name }}
+  # Watch label only: this Secret holds the server private key and is never a
+  # publication source. rotationPolicy below replaces the key on every renewal,
+  # so the operator has to observe the change to roll the pods onto it.
+  secretTemplate:
+    labels:
+      k8s.mariadb.com/watch: ""
+  duration: 8760h
+  renewBefore: 720h
+  isCA: false
+  # Server authentication only. The operator issues its own server certificates
+  # the same way — server auth, never client auth — and keeps client auth on the
+  # separate client certificates it manages, which is what replication actually
+  # presents. MariaDB treats the two as distinct roles, and a user declared
+  # REQUIRE X509 accepts any client certificate signed by a trusted CA, so
+  # granting the server key client auth would let it authenticate as such a user.
+  #
+  # digital signature is the usage an ECDSA key actually needs, for the ECDHE
+  # signature. This set deliberately drops the key encipherment bit the operator
+  # also sets: it covers RSA key transport and means nothing for a P-256 key.
+  usages:
+    - server auth
+    - digital signature
+  dnsNames:
+    {{- $ns := .Release.Namespace }}
+    {{- $name := .Release.Name }}
+    - localhost
+    # All four resolution depths are listed for the headless wildcard, matching
+    # the per-service names below: a client with a low ndots setting, or one
+    # using a search-domain suffix, presents the shortened form during
+    # verification, and an absent SAN fails the handshake.
+    - {{ printf "*.%s-internal" $name | quote }}
+    - {{ printf "*.%s-internal.%s" $name $ns | quote }}
+    - {{ printf "*.%s-internal.%s.svc" $name $ns | quote }}
+    - {{ printf "*.%s-internal.%s.svc.%s" $name $ns $clusterDomain | quote }}
+    {{- range $svc := list $name (printf "%s-primary" $name) (printf "%s-secondary" $name) }}
+    - {{ $svc }}
+    - {{ $svc }}.{{ $ns }}
+    - {{ $svc }}.{{ $ns }}.svc
+    - {{ $svc }}.{{ $ns }}.svc.{{ $clusterDomain }}
+    {{- end }}
+    {{- if .Values.external | default false }}
+    {{- /* default (dict) keeps `index` from erroring on an absent or null _namespace, so the required message is what surfaces. */}}
+    {{- $extHost := required "external is true but _namespace.host is not set" (index (default (dict) .Values._namespace) "host") }}
+    - {{ printf "%s.%s" .Release.Name $extHost }}
+    {{- end }}
+  privateKey:
+    rotationPolicy: Always
+    algorithm: ECDSA
+    size: 256
+  issuerRef:
+    name: {{ .Release.Name }}-ca
+    kind: Issuer
+    group: cert-manager.io
+{{- end }}
diff --git a/packages/apps/mariadb/templates/config.yaml b/packages/apps/mariadb/templates/config.yaml
index cc60dd2c85..48470fac24 100644
--- a/packages/apps/mariadb/templates/config.yaml
+++ b/packages/apps/mariadb/templates/config.yaml
@@ -1,35 +1,33 @@
 ---
+{{- $tuning := include "mariadb.tuning" $ | fromYaml }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ .Release.Name }}-my-cnf
 data:
-  config: |
+  my.cnf: |
     [mysqld]
     sql-mode=NO_ENGINE_SUBSTITUTION
-    max_connections=4096
+    max_connections={{ $tuning.maxConnections }}
     default_authentication_plugin=mysql_native_password
     #innodb_buffer_pool_dump_at_shutdown=1
-    innodb_buffer_pool_instances=48
-    innodb_buffer_pool_size=60G
+    innodb_buffer_pool_size={{ $tuning.bufferPoolSizeMi }}M
     innodb_fast_shutdown=0
     innodb_flush_method=O_DIRECT_NO_FSYNC
     innodb_flush_log_at_trx_commit=2
     innodb_io_capacity=10000
     innodb_io_capacity_max=50000
     #innodb_log_buffer_size=128M
-    innodb_log_file_size=4096M
-    #innodb_log_files_in_group=6
-    innodb_thread_concurrency=24
+    innodb_log_file_size={{ $tuning.logFileSizeMi }}M
     join_buffer_size=2M
-    key_buffer_size=1024M
-    read_rnd_buffer_size=16M
+    key_buffer_size={{ $tuning.keyBufferSizeMi }}M
+    read_rnd_buffer_size={{ $tuning.readRndBufferKi }}K
     #sync_binlog=0
-    table_open_cache=40714
+    table_open_cache={{ $tuning.tableOpenCache }}
     table_definition_cache=4000
-    thread_pool_size=24
-    tmp_table_size=512M
+    thread_pool_size={{ $tuning.threadPoolSize }}
+    tmp_table_size={{ $tuning.tmpTableSizeMi }}M
     master_info_repository=TABLE
     relay_log_info_repository=TABLE
-    innodb_read_io_threads=12
-    innodb_write_io_threads=12
+    innodb_read_io_threads={{ $tuning.ioThreads }}
+    innodb_write_io_threads={{ $tuning.ioThreads }}
diff --git a/packages/apps/mariadb/templates/dashboard-resourcemap.yaml b/packages/apps/mariadb/templates/dashboard-resourcemap.yaml
index af89b39c03..f790a25d3c 100644
--- a/packages/apps/mariadb/templates/dashboard-resourcemap.yaml
+++ b/packages/apps/mariadb/templates/dashboard-resourcemap.yaml
@@ -8,8 +8,14 @@ rules:
   resources:
   - services
   resourceNames:
+  # The bare <name> service exists in both topologies; -primary/-secondary
+  # only when replication is on (replicas>1). Grant exactly what exists so the
+  # RBAC matches the services the ApplicationDefinition (mariadb-rd) lists.
+  - {{ .Release.Name }}
+  {{- if gt (int .Values.replicas) 1 }}
   - {{ .Release.Name }}-primary
   - {{ .Release.Name }}-secondary
+  {{- end }}
   verbs: ["get", "list", "watch"]
 - apiGroups:
   - ""
@@ -18,6 +24,18 @@ rules:
   resourceNames:
   - {{ .Release.Name }}-credentials
   verbs: ["get", "list", "watch"]
+# The TLS Secrets are deliberately NOT granted here, key-bearing or not.
+# .ca-tls and the operator's own -ca hold the CA private key, .tls holds the
+# server private key, and -ca-bundle — while key-free — is still an operator
+# Secret exposed by name rather than through the platform-vouched-for path.
+#
+# The trust anchor reaches the tenant as the key-free <release>.tenant-ca
+# projection instead, through core.cozystack.io/tenantsecrets — which the base
+# tenant roles already grant and which gates on the internal.cozystack.io/
+# tenantresource label the lineage webhook stamps. Granting that projection by
+# NAME here would be wrong too: a name grant conveys whatever occupies the
+# name, whereas the label path conveys only what the platform vouched for. A
+# name grant is gated on a string; the label path is gated on provenance.
 - apiGroups:
   - cozystack.io
   resources:
diff --git a/packages/apps/mariadb/templates/db.yaml b/packages/apps/mariadb/templates/db.yaml
index 338da2695c..d616274454 100644
--- a/packages/apps/mariadb/templates/db.yaml
+++ b/packages/apps/mariadb/templates/db.yaml
@@ -1,17 +1,119 @@
+{{/*
+  A database name also names Kubernetes resources: the Database CR
+  {{ .Release.Name }}-{{ replace "_" "-" $name }} and, under it, each Grant. So
+  the same DNS-1123 rule and "_"/"-" collision that the username guard enforces
+  apply here — a name like "My.Db" or "foo-" renders but the apiserver rejects
+  the Database CR with an opaque error, and two names differing only in "_" vs
+  "-" collide on one Database CR (one silently overwrites the other). Reject an
+  invalid name on both install and upgrade (it never applied either way), but the
+  "_"/"-" collision only on a fresh install, mirroring the username guard in
+  secret.yaml: an existing release already took the overwrite, and blocking its
+  upgrades only makes a running release worse. Database names are not Secret keys,
+  so the DNS-1123 name is the binding rule.
+*/}}
+{{- $seenDBDNS := dict }}
+{{- range $name, $db := .Values.databases }}
+  {{- $crName := printf "%s-%s" $.Release.Name (replace "_" "-" $name) }}
+  {{- if or (gt (len $crName) 253) (not (regexMatch "^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$" $crName)) }}
+    {{- fail (printf "invalid database name %q: it also names the Database resource %q, which Kubernetes requires to be a DNS-1123 subdomain (lowercase letters, digits, \"-\" and \".\", starting and ending with a letter or digit); use a lowercase name without a leading or trailing \"-\" or \".\"" $name $crName) }}
+  {{- end }}
+  {{- /*
+    The name is also the MariaDB database identifier (Database CR spec.name). The
+    server caps an identifier at 64 characters and rejects a longer CREATE DATABASE
+    with "Incorrect database name", but the Database CRD allows 80, so a name of 65-80
+    characters renders a Database the apiserver accepts and only the operator's SQL
+    fails. A release that already applied such a Database must keep upgrading, so on
+    upgrade the 64 cap applies only when the Database does not exist yet; past 80 the
+    apiserver rejects the object itself, so that holds on both paths. An offline
+    render sees no Database and stays strict. The DNS-1123 check above admits only
+    ASCII, so len (bytes) equals characters.
+  */}}
+  {{- if or (gt (len $name) 80) (and (gt (len $name) 64) (or $.Release.IsInstall (not (lookup "k8s.mariadb.com/v1alpha1" "Database" $.Release.Namespace $crName)))) }}
+    {{- fail (printf "invalid database name %q: a MariaDB database identifier is at most 64 characters" $name) }}
+  {{- end }}
+  {{- $dbDNS := replace "_" "-" $name }}
+  {{- if and $.Release.IsInstall (hasKey $seenDBDNS $dbDNS) }}
+    {{- fail (printf "database names %q and %q both map to the Database resource name %q (\"_\" renders as \"-\"); rename one of them" (index $seenDBDNS $dbDNS) $name (printf "%s-%s" $.Release.Name $dbDNS)) }}
+  {{- end }}
+  {{- $_ := set $seenDBDNS $dbDNS $name }}
+{{- end }}
+
+{{/*
+  The Grant CR name is <release>-<dbDNS>-<userDNS>. Two DIFFERENT (database, user)
+  pairs whose "-"/"_" split differently collide there — (database "a", user "b-c")
+  and (database "a-b", user "c") both render <release>-a-b-c — and one silently
+  overwrites the other at apply, dropping a privilege the tenant configured. A
+  user in both admin and readonly of one database would also collide with itself;
+  that user needs only the admin grant (ALL is a superset of the readonly SELECT),
+  so the readonly grant is SKIPPED for them rather than the name role-scoped —
+  role-scoping renames the Grant, and renaming a Grant on upgrade makes the
+  operator revoke the tenant's live privilege while the old CR is pruned. Track
+  the whole rendered Grant name plus its length (the apiserver caps a resource
+  name at 253) and reject an over-long or charset-invalid name on both install and
+  upgrade, but the "_"/"-" collision only on a fresh install — like the sibling
+  guards, an existing release already took the overwrite and blocking its upgrades
+  only makes a running release worse.
+*/}}
+{{- $seenGrant := dict }}
+{{- range $name, $db := .Values.databases }}
+  {{- $dbDNS := replace "_" "-" $name }}
+  {{- $roles := $db.roles | default dict }}
+  {{- $adminUsers := $roles.admin | default (list) | uniq }}
+  {{- $grantUsers := $adminUsers }}
+  {{- range $user := ($roles.readonly | default (list) | uniq) }}
+    {{- if not (has $user $adminUsers) }}{{- $grantUsers = append $grantUsers $user }}{{- end }}
+  {{- end }}
+  {{- range $user := $grantUsers }}
+    {{- $g := printf "%s-%s-%s" $.Release.Name $dbDNS (replace "_" "-" $user) }}
+    {{- if gt (len $g) 253 }}
+      {{- fail (printf "the Grant resource name %q for (database %q, user %q) exceeds the 253-character limit Kubernetes puts on a resource name; shorten the database or user name" $g $name $user) }}
+    {{- end }}
+    {{- if not (regexMatch "^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$" $g) }}
+      {{- fail (printf "invalid role member %q for database %q: it names the Grant resource %q, which Kubernetes requires to be a DNS-1123 subdomain (lowercase letters, digits, \"-\" and \".\", starting and ending with a letter or digit). A name in databases.<db>.roles.admin/readonly is not one of .Values.users, so the username guard never sees it - use a lowercase name without special characters" $user $name $g) }}
+    {{- end }}
+    {{- /*
+      The member is also the Grant's spec.username, a MariaDB account name the
+      server caps at 128 characters. A declared user is held to 80 by secret.yaml,
+      matching the User CRD, but a member declared only under databases.<db>.roles
+      has no User CR and never passes through that cap. Checked after the DNS-1123 guard above, which admits
+      only lowercase ASCII, so len (bytes) equals characters here and a non-ASCII
+      member is reported for its charset rather than as too long; and after the 253
+      guard, so a member long enough to blow the Grant name reports that first.
+      Unlike those two guards, whose invalid name the apiserver rejects so the
+      object never applied, a too-long member renders a Grant the apiserver
+      ACCEPTS: its metadata.name is valid and the Grant CRD puts no maxLength on
+      spec.username, so only mariadb-operator's CREATE USER/GRANT SQL fails. A
+      release that already applied such a Grant must keep upgrading, but a member
+      added on upgrade is new and must still be named here, so on upgrade the cap
+      applies only when the Grant does not exist yet. An offline render sees no
+      Grant and stays strict.
+    */}}
+    {{- if and (gt (len $user) 128) (or $.Release.IsInstall (not (lookup "k8s.mariadb.com/v1alpha1" "Grant" $.Release.Namespace $g))) }}
+      {{- fail (printf "invalid role member %q for database %q: a MariaDB account name is at most 128 characters, so the server rejects the GRANT for a longer one. A name in databases.<db>.roles.admin/readonly is not one of .Values.users, so the username length cap in secret.yaml never sees it" $user $name) }}
+    {{- end }}
+    {{- $desc := printf "(database %q, user %q)" $name $user }}
+    {{- if and $.Release.IsInstall (hasKey $seenGrant $g) }}
+      {{- fail (printf "the Grant resource name %q is produced by both %s and %s (\"_\" renders as \"-\"); rename a database or user so their Grants do not collide" $g (index $seenGrant $g) $desc) }}
+    {{- end }}
+    {{- $_ := set $seenGrant $g $desc }}
+  {{- end }}
+{{- end }}
 {{- range $name, $db := .Values.databases }}
 {{ $dbDNSName := replace "_" "-" $name }}
+{{- $roles := $db.roles | default dict }}
+{{- $adminUsers := $roles.admin | default (list) | uniq }}
 ---
 apiVersion: k8s.mariadb.com/v1alpha1
 kind: Database
 metadata:
   name: {{ $.Release.Name }}-{{ $dbDNSName }}
 spec:
-  name: {{ $name }}
+  name: {{ $name | quote }}
   mariaDbRef:
     name: {{ $.Release.Name }}
   characterSet: utf8
   collate: utf8_general_ci
-{{- range $user := $db.roles.admin }}
+{{- range $user := $adminUsers }}
 {{ $userDNSName := replace "_" "-" $user }}
 ---
 apiVersion: k8s.mariadb.com/v1alpha1
@@ -22,13 +124,26 @@ spec:
   mariaDbRef:
     name: {{ $.Release.Name }}
   privileges: ['ALL']
-  database: {{ $name }}
+  database: {{ $name | quote }}
   table: "*"
-  username: {{ $user }}
+  username: {{ $user | quote }}
   grantOption: true
 {{- end }}
-{{- range $user := $db.roles.readonly }}
+{{- range $user := ($roles.readonly | default (list) | uniq) }}
+{{- if not (has $user $adminUsers) }}
 {{ $userDNSName := replace "_" "-" $user }}
+{{- /*
+  No -readonly suffix: the Grant name must match what earlier releases rendered, or the
+  operator revokes the live privilege as the renamed CR is pruned on upgrade. A
+  user also in admin gets ALL and is skipped above, so there is no same-name
+  collision to disambiguate. Corollary of the shared name: when a user moves
+  between readonly-only and admin across an upgrade, the chart keeps ONE Grant CR
+  under a stable name and only its `privileges` value changes (SELECT<->ALL) — the
+  chart never forces a rename, so it never drives a revoke-and-prune. How the
+  operator applies that privilege change on the live grant is the operator's
+  concern and is not asserted here. This rationale is a template comment so it does
+  not ship into every rendered Grant manifest.
+*/}}
 ---
 apiVersion: k8s.mariadb.com/v1alpha1
 kind: Grant
@@ -38,10 +153,11 @@ spec:
   mariaDbRef:
     name: {{ $.Release.Name }}
   privileges: ['SELECT']
-  database: {{ $name }}
+  database: {{ $name | quote }}
   table: "*"
-  username: {{ $user }}
+  username: {{ $user | quote }}
   grantOption: true
 {{- end }}
+{{- end }}
 
 {{- end }}
diff --git a/packages/apps/mariadb/templates/hooks/cleanup-pvc.yaml b/packages/apps/mariadb/templates/hooks/cleanup-pvc.yaml
index e3fd5c32c6..c204ffd750 100644
--- a/packages/apps/mariadb/templates/hooks/cleanup-pvc.yaml
+++ b/packages/apps/mariadb/templates/hooks/cleanup-pvc.yaml
@@ -10,6 +10,7 @@ metadata:
     "helm.sh/hook-weight": "10"
     "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
 spec:
+  activeDeadlineSeconds: 270
   template:
     metadata:
       labels:
@@ -18,16 +19,76 @@ spec:
     spec:
       serviceAccountName: {{ .Release.Name }}-cleanup
       restartPolicy: Never
+      terminationGracePeriodSeconds: 10
+      securityContext:
+        runAsNonRoot: true
+        runAsUser: 65534
+        runAsGroup: 65534
+        seccompProfile:
+          type: RuntimeDefault
       containers:
         - name: cleanup
-          image: docker.io/clastix/kubectl:v1.32
+          # Digest-pinned (immutable) and routed through the cluster images
+          # registry via cozy-lib.image, so mirrored / air-gapped installs
+          # resolve it and an upstream retag cannot change what runs at
+          # uninstall. The tag+digest is refreshed by the "clastix/kubectl"
+          # custom Renovate manager in .github/renovate.json (the helm-values
+          # manager is disabled repo-wide), so this pin does not silently age.
+          image: {{ include "cozy-lib.image" (list "clastix/kubectl:v1.32@sha256:b9ef7d8dbe65bcc81a46c09b8dc7543103055021c4f43287bf59e92a8f4fe05c" $) }}
+          securityContext:
+            allowPrivilegeEscalation: false
+            readOnlyRootFilesystem: true
+            capabilities:
+              drop: ["ALL"]
+          env:
+            - name: HOME
+              value: /tmp
+          resources:
+            requests:
+              cpu: 10m
+              memory: 64Mi
+            limits:
+              cpu: 200m
+              memory: 128Mi
           command:
             - /bin/sh
             - -c
             - |
+              # --ignore-not-found tolerates already-absent resources; only a
+              # genuine delete failure (RBAC/API error) must fail the hook, so
+              # track it and propagate via the final exit instead of masking
+              # errors behind `|| echo ...`.
+              cleanup_failed=0
               echo "Deleting orphaned PVCs for {{ .Release.Name }}..."
-              kubectl delete pvc -n {{ .Release.Namespace }} -l app.kubernetes.io/instance={{ .Release.Name }} || true
-              echo "PVC cleanup complete."
+              if kubectl delete pvc -n {{ .Release.Namespace }} -l app.kubernetes.io/instance={{ .Release.Name }} --ignore-not-found --wait=true --timeout=120s; then
+                echo "PVC cleanup complete."
+              else
+                echo "WARNING: PVC cleanup failed for {{ .Release.Name }}; orphaned PVCs may remain" >&2
+                cleanup_failed=1
+              fi
+              # .ca-tls holds the CA private key and .tls the server private key.
+              # cert-manager runs with enableCertificateOwnerRef=false, so deleting
+              # the Certificates leaves both Secrets behind indefinitely, in a
+              # namespace the tenant shares with its other applications. They only
+              # exist when TLS was managed; --ignore-not-found covers the rest.
+              # -ca-bundle is not listed: the operator owns it via ownerRef and
+              # Kubernetes garbage-collects it with the MariaDB resource.
+              echo "Deleting orphaned Secrets for {{ .Release.Name }}..."
+              if kubectl delete secret -n {{ .Release.Namespace }} \
+                {{ .Release.Name }}-metrics-password {{ .Release.Name }}-repl-password \
+                {{ .Release.Name }}.ca-tls {{ .Release.Name }}.tls --ignore-not-found; then
+                echo "Secret cleanup complete."
+              else
+                echo "WARNING: Secret cleanup failed for {{ .Release.Name }}; orphaned Secrets may remain" >&2
+                cleanup_failed=1
+              fi
+              exit "${cleanup_failed}"
+          volumeMounts:
+            - name: tmp
+              mountPath: /tmp
+      volumes:
+        - name: tmp
+          emptyDir: {}
 ---
 apiVersion: v1
 kind: ServiceAccount
@@ -51,9 +112,29 @@ metadata:
     "helm.sh/hook-weight": "5"
     "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
 rules:
+  # PVCs are deleted by label selector, which requires list.
   - apiGroups: [""]
     resources: ["persistentvolumeclaims"]
-    verbs: ["get", "list", "delete"]
+    verbs: ["get", "list", "watch", "delete"]
+  # The Secrets left behind are deleted by name — the first two generated by the
+  # operator, the last two by cert-manager — so the rule is scoped to those four
+  # rather than to namespace-wide secret access.
+  #
+  # The cert-manager names are granted under every tls.issuer, deliberately. A
+  # release issued by cert-manager and later switched to tls.issuer: operator
+  # still has both Secrets on the cluster, and uninstall renders this Role from
+  # whatever values are current by then, so gating the names on the issuer would
+  # drop the grant for exactly the release that needs it: the delete above would
+  # fail on RBAC and leave the CA and server private keys behind in a namespace
+  # the tenant shares. get+delete on a name that does not exist grants nothing.
+  - apiGroups: [""]
+    resources: ["secrets"]
+    resourceNames:
+      - {{ .Release.Name }}-metrics-password
+      - {{ .Release.Name }}-repl-password
+      - {{ .Release.Name }}.ca-tls
+      - {{ .Release.Name }}.tls
+    verbs: ["get", "delete"]
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
diff --git a/packages/apps/mariadb/templates/mariadb.yaml b/packages/apps/mariadb/templates/mariadb.yaml
index d3d5e6367b..4cc8b3cf4c 100644
--- a/packages/apps/mariadb/templates/mariadb.yaml
+++ b/packages/apps/mariadb/templates/mariadb.yaml
@@ -1,3 +1,4 @@
+{{- $certManagerIssued := (include "mariadb.tls.certManagerIssued" .) | eq "true" -}}
 ---
 apiVersion: k8s.mariadb.com/v1alpha1
 kind: MariaDB
@@ -12,6 +13,28 @@ spec:
 
   port: 3306
 
+  # The operator leaves failureThreshold unset on the startup probe, so it
+  # defaults to 3. The kubelet only begins probing once initialDelaySeconds has
+  # elapsed and kills the container on the Nth consecutive failure, so the
+  # budget is initialDelay + (failureThreshold - 1) * period, here just 40s --
+  # the same budget as the liveness probe the startup probe exists to defer.
+  # A fresh datadir bootstrap (mysql_install_db, then the entrypoint's
+  # temporary server applying the root password) does not reliably finish
+  # inside that budget under a constrained CPU limit or slow replicated
+  # storage. Overrunning it is not merely a slow start: the kubelet kills the
+  # container mid-bootstrap, leaving a datadir that already has the mysql
+  # system tables but never received the root grant. On restart the entrypoint
+  # keys DATABASE_ALREADY_EXISTS off that directory, skips initialization for
+  # good, and the server comes up with the install-time root account -- local
+  # only and passwordless -- instead of the credentials the operator holds. So
+  # every later probe fails with "Access denied for user 'root'" and the pod
+  # crash-loops permanently with no path back. A threshold of 30 lifts the
+  # budget to 310s. Widen only the startup budget; the liveness and readiness
+  # probes keep the operator defaults, so a server that hangs after a
+  # successful start is still caught as quickly as before.
+  startupProbe:
+    failureThreshold: 30
+
   replicas: {{ .Values.replicas }}
   replicasAllowEvenNumber: true
   affinity:
@@ -29,11 +52,13 @@ spec:
             - {{ .Release.Name }}
         topologyKey: "kubernetes.io/hostname"
 
+  {{- if gt (int .Values.replicas) 1 }}
   replication:
     enabled: true
     #primary:
     #  podIndex: 0
     #  automaticFailover: true
+  {{- end }}
 
   podMetadata:
     labels:
@@ -43,6 +68,14 @@ spec:
     enabled: true
     exporter:
       image: prom/mysqld-exporter:v0.15.1
+      # The mariadb-operator hardcodes the exporter's liveness/readiness probe
+      # as an httpGet on port 9104, which kubelet dials over the pod's IPv4
+      # address. Bind the exporter to the IPv4 wildcard so the probe connects
+      # deterministically; the default [::] listener intermittently refuses the
+      # IPv4 connect on single-stack-IPv4 data planes, flapping the pod to
+      # NotReady and leaving the metrics Service endpoint unpopulated.
+      args:
+      - --web.listen-address=0.0.0.0:9104
       resources:
         requests:
           cpu: 50m
@@ -57,12 +90,15 @@ spec:
 
   myCnfConfigMapKeyRef:
     name: {{ .Release.Name }}-my-cnf
-    key: config
+    key: my.cnf
 
   service:
     metadata:
       labels:
         app.kubernetes.io/instance: {{ $.Release.Name }}
+    {{- if and .Values.external (eq (int .Values.replicas) 1) }}
+    type: LoadBalancer
+    {{- end }}
   storage:
     size: {{ .Values.size }}
     resizeInUseVolumes: true
@@ -71,7 +107,7 @@ spec:
     storageClassName: {{ . }}
     {{- end }}
 
-  {{- if .Values.external }}
+  {{- if and .Values.external (gt (int .Values.replicas) 1) }}
   primaryService:
     type: LoadBalancer
   {{- end }}
@@ -79,4 +115,27 @@ spec:
   #secondaryService:
   #  type: LoadBalancer
 
+  {{- $tlsMap := default (dict) .Values.tls }}
+  {{- $tlsRequired := index $tlsMap "required" }}
+  # Always true, and load-bearing: the operator substitutes an enabled TLS spec
+  # only when spec.tls is absent entirely, so sending the block without this
+  # would turn TLS off.
+  tls:
+    enabled: true
+    # Emitted under either issuer: enforcement works against operator-issued
+    # certificates too, so gating it would accept required: true and silently
+    # not enforce. Defaults to false because switching it on refuses every
+    # client not yet moved to TLS — a decision to make, not something an upgrade
+    # does. Flips to true as an announced change once the trust anchor is
+    # published to tenants automatically.
+    #
+    # `kindIs "invalid"` guards against unset field; an explicit value is preserved.
+    required: {{ if kindIs "invalid" $tlsRequired }}false{{ else }}{{ $tlsRequired }}{{ end }}
+  {{- if $certManagerIssued }}
+    serverCertSecretRef:
+      name: {{ .Release.Name }}.tls
+    serverCASecretRef:
+      name: {{ .Release.Name }}.ca-tls
+  {{- end }}
+
   resources: {{- include "cozy-lib.resources.defaultingSanitize" (list .Values.resourcesPreset .Values.resources $) | nindent 4 }}
diff --git a/packages/apps/mariadb/templates/secret.yaml b/packages/apps/mariadb/templates/secret.yaml
index aa2bd50e36..16a489fe5e 100644
--- a/packages/apps/mariadb/templates/secret.yaml
+++ b/packages/apps/mariadb/templates/secret.yaml
@@ -7,15 +7,96 @@
   {{- end }}
 {{- end }}
 
-{{- $usersWithRoot := .Values.users }}
-{{- if not (and .Values.users.root .Values.users.root.password) }}
-  {{- $_ := set $usersWithRoot "root" dict }}
+{{/*
+  Reject a username outside the Secret-key charset before it becomes a Secret
+  data key, the spec.name of a mariadb-operator User CR and (with "_" mapped to
+  "-") that User's metadata.name. The apiserver would reject such a name later
+  as an invalid Secret key or resource name, but only once Flux applies the
+  render, as an opaque error; failing here names the offending username. The
+  check mirrors k8s IsConfigMapKey (the charset plus its rejection of ".", of any
+  name starting with ".."). The length cap is 80 because the mariadb-operator
+  User CRD caps spec.name at 80 (the server itself allows 128): the apiserver
+  rejects a longer User at apply, so capping here names it at render instead. So
+  it rejects nothing that could otherwise install. There is no shell interpolation here (the operator
+  applies the SQL), so this is a diagnosability guard, not an injection fix;
+  postgres carries the analogous guard in its init-script.
+*/}}
+{{- range $user, $u := .Values.users }}
+  {{- if or (not (regexMatch "^[-._a-zA-Z0-9]+$" $user)) (eq $user ".") (hasPrefix ".." $user) (gt (len $user) 80) }}
+    {{- fail (printf "invalid username %q: a username may contain only letters, digits and the characters -._ , must not be \".\" or start with \"..\", and must be at most 80 characters (the mariadb-operator User resource caps its name at 80, and the name also becomes a Kubernetes Secret key)" $user) }}
+  {{- end }}
+{{- end }}
+
+{{/*
+  The username also names the User CR: user.yaml renders
+  {{ .Release.Name }}-{{ replace "_" "-" $name }} as metadata.name, and Kubernetes
+  requires that to be a DNS-1123 subdomain (lowercase, alnum start/end) — a
+  stricter charset than the Secret key above, which permits uppercase and a
+  leading/trailing "-"/".". A name like "Bob", "foo-" or "foo." passes the Secret
+  charset yet renders an invalid User name that the apiserver rejects at apply with
+  an opaque error. Validate the rendered User name against the DNS-1123 subdomain
+  rule so such a username is named here instead. Checked on the full rendered name
+  so the "-" join to the release prefix (e.g. a leading-dot username) is covered.
+*/}}
+{{- range $user, $u := .Values.users }}
+  {{- $crName := printf "%s-%s" $.Release.Name (replace "_" "-" $user) }}
+  {{- if or (gt (len $crName) 253) (not (regexMatch "^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$" $crName)) }}
+    {{- fail (printf "invalid username %q: it also names the mariadb-operator User resource %q, which Kubernetes requires to be a DNS-1123 subdomain (lowercase letters, digits, \"-\" and \".\", starting and ending with a letter or digit); use a lowercase name without a leading or trailing \"-\" or \".\"" $user $crName) }}
+  {{- end }}
+{{- end }}
+
+{{/*
+  user.yaml renders each User CR as {{ .Release.Name }}-{{ replace "_" "-" $name }},
+  so two usernames that differ only in "_" vs "-" (e.g. "a_b" and "a-b") collide on
+  one User resource name. range sorts keys, so the later one silently overwrites the
+  earlier User CR on apply — one user ends up with a credentials-Secret entry but no
+  backing mariadb-operator User (no error, no warning). Reject the collision on a
+  fresh install, naming both offenders, rather than create a half-configured user.
+  Gated to install: an existing release that already carries the pair took the
+  overwrite when it was first applied, so a platform-driven chart upgrade must not
+  wedge it into a failed reconcile it cannot clear without editing users — blocking
+  the upgrade would only make a running release worse, since one of the two Users is
+  live. The charset and DNS-1123 guards above stay on both paths because an invalid
+  name never applied at all.
+*/}}
+{{- $seenDNS := dict }}
+{{- range $user, $u := .Values.users }}
+  {{- $dns := replace "_" "-" $user }}
+  {{- if and $.Release.IsInstall (hasKey $seenDNS $dns) }}
+    {{- fail (printf "usernames %q and %q both map to the User resource name %q (\"_\" renders as \"-\"); rename one of them" (index $seenDNS $dns) $user (printf "%s-%s" $.Release.Name $dns)) }}
+  {{- end }}
+  {{- $_ := set $seenDNS $dns $user }}
 {{- end }}
 
+{{/*
+  Distinguish a first install from an upgrade whose lookup came back empty. Every
+  password below (root included) is minted only when the lookup did not already
+  carry it, so an upgrade that finds NO credentials Secret at all -- deleted, or
+  the release renamed out from under it -- would silently re-mint all of them.
+  Helm's lookup returns empty only on a genuine NotFound, so a normal upgrade finds
+  the Secret and this never fires; when it does, the Secret is really gone and
+  re-minting would rotate every account. root is the sharp edge: mariadb-operator
+  writes rootPasswordSecretKeyRef only at datadir bootstrap, so a fresh root value
+  on an existing cluster is advertised but never applied and the real root password
+  is lost for good. Fail instead, and let a first install (no Secret expected)
+  through.
+*/}}
+{{- if and .Release.IsUpgrade (not $existingSecret) }}
+  {{- fail (printf "%s-credentials Secret not found while upgrading: refusing to mint fresh passwords, which would rotate every account and, because mariadb-operator applies root only at datadir bootstrap, leave the cluster advertising a root password it never set. If the Secret was deleted, restore it before upgrading (a first install does not hit this path)." .Release.Name) }}
+{{- end }}
+
+{{/* root is always chart-managed and never accepts a value-supplied password. */}}
+{{- $usersWithRoot := deepCopy .Values.users }}
+{{- $_ := set $usersWithRoot "root" dict }}
+
+{{/*
+  Passwords (root included) are always chart-generated and preserved across
+  reconciles via the lookup above: a user keeps whatever password is already
+  stored in the Secret, and only a user without one yet gets a freshly generated
+  value.
+*/}}
 {{- range $user, $u := $usersWithRoot }}
-  {{- if $u.password }}
-    {{- $_ := set $passwords $user $u.password }}
-  {{- else if not (index $passwords $user) }}
+  {{- if not (index $passwords $user) }}
     {{- $_ := set $passwords $user (randAlphaNum 16) }}
   {{- end }}
 {{- end }}
@@ -25,7 +106,17 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: {{ .Release.Name }}-credentials
+  labels:
+    {{- /*
+      mariadb-operator only re-applies a User password from its
+      passwordSecretKeyRef when the referenced Secret carries this label; without
+      it a change to this Secret (e.g. a newly added user's generated password)
+      reaches the server only on the operator's --requeue-sql tick (10h + up to 1h
+      of jitter) instead of promptly. (root is not indexed on the Secret at all -
+      MariaDB.spec.rootPasswordSecretKeyRef lands only at datadir bootstrap.)
+    */}}
+    k8s.mariadb.com/watch: ""
 stringData:
   {{- range $name, $u := $usersWithRoot }}
-  {{ $name }}: {{ index $passwords $name }}
+  {{ $name | quote }}: {{ index $passwords $name | quote }}
   {{- end }}
diff --git a/packages/apps/mariadb/templates/tenant-projection.yaml b/packages/apps/mariadb/templates/tenant-projection.yaml
new file mode 100644
index 0000000000..7dfb64b268
--- /dev/null
+++ b/packages/apps/mariadb/templates/tenant-projection.yaml
@@ -0,0 +1,22 @@
+{{- /*
+Ungated: TLS is always served (see certmanager.yaml and the tls.issuer
+discussion in the README), so the operator reconciles the source Secret for
+every release regardless of tls.issuer.
+
+The source is the operator's own <release>-ca-bundle rather than a
+cert-manager CA Secret: it is key-free already, it exists under both
+tls.issuer values — cert-manager Secrets only render under tls.issuer:
+cert-manager — and it carries the previous CA alongside the new one across a
+rollover, so the tenant reads the same object no matter which issuer is
+active.
+*/}}
+---
+apiVersion: internal.cozystack.io/v1alpha1
+kind: TenantProjection
+metadata:
+  name: {{ .Release.Name }}-ca
+spec:
+  projections:
+    - type: CACert
+      sourceSecretName: {{ .Release.Name }}-ca-bundle
+      sourceKey: ca.crt
diff --git a/packages/apps/mariadb/templates/user.yaml b/packages/apps/mariadb/templates/user.yaml
index 28cb7ba6e4..901f69dafa 100644
--- a/packages/apps/mariadb/templates/user.yaml
+++ b/packages/apps/mariadb/templates/user.yaml
@@ -7,12 +7,12 @@ kind: User
 metadata:
   name: {{ $.Release.Name }}-{{ $dnsName }}
 spec:
-  name: {{ $name }}
+  name: {{ $name | quote }}
   mariaDbRef:
     name: {{ $.Release.Name }}
   passwordSecretKeyRef:
     name: {{ $.Release.Name }}-credentials
-    key: {{ $name }}
+    key: {{ $name | quote }}
   maxUserConnections: {{ $u.maxUserConnections }}
 {{- end }}
 {{- end }}
diff --git a/packages/apps/mariadb/tests/cleanup_hook_test.yaml b/packages/apps/mariadb/tests/cleanup_hook_test.yaml
new file mode 100644
index 0000000000..e27a23bb91
--- /dev/null
+++ b/packages/apps/mariadb/tests/cleanup_hook_test.yaml
@@ -0,0 +1,113 @@
+suite: post-delete cleanup hook
+
+# Locks in the post-delete cleanup behaviour. The mariadb-operator creates
+# <release>-metrics-password and <release>-repl-password Secrets as a side
+# effect of metrics/replication being enabled. These Secrets are not
+# Helm-owned and survive `helm uninstall`, so the post-delete hook must
+# sweep them (issue #3056) alongside the orphaned PVCs. The hook Role also
+# needs RBAC on secrets to do so.
+
+templates:
+  - templates/hooks/cleanup-pvc.yaml
+
+release:
+  name: mariadb-test
+  namespace: tenant-test
+
+tests:
+  # The cert-manager Secrets are deleted here too: cert-manager runs with
+  # enableCertificateOwnerRef=false, so removing the Certificates leaves the CA
+  # private key and the server private key behind in the tenant's namespace.
+  - it: "cleanup Job deletes the operator-generated and cert-manager Secrets by name"
+    documentSelector:
+      path: kind
+      value: Job
+    asserts:
+      # The verb is part of the assertion. Matching the name list alone leaves
+      # the whole point of the hook — that these Secrets are REMOVED — pinned by
+      # nothing, so `kubectl get secret` in place of the delete stays green.
+      #
+      # One pattern for the whole invocation, with the shell's line
+      # continuations spelled out instead of skipped over. A `(?s).*` gap does
+      # not bind a name to the verb it follows: with `.` matching newlines the
+      # gap runs across command boundaries, so the names satisfy it from any
+      # later command in the script while the delete above them removes
+      # something else entirely. Whitespace and backslashes cannot spell a
+      # command, which is what makes this separator load-bearing.
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: "kubectl delete secret -n \\S+[\\s\\\\]+mariadb-test-metrics-password mariadb-test-repl-password[\\s\\\\]+mariadb-test\\.ca-tls mariadb-test\\.tls --ignore-not-found"
+
+  - it: "cleanup Job fails (exits non-zero) when a real delete error occurs, so orphaned resources don't pass silently"
+    documentSelector:
+      path: kind
+      value: Job
+    asserts:
+      # --ignore-not-found tolerates absent resources, but a genuine RBAC/API
+      # failure must propagate: the script tracks failures and exits with that
+      # status instead of masking errors behind `|| echo ...`.
+      #
+      # Assert both delete branches set the failure flag (not just the final
+      # exit), so a regression that stops flagging either path is caught.
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: '(?s)PVC cleanup failed for mariadb-test.*?cleanup_failed=1'
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: '(?s)Secret cleanup failed for mariadb-test.*?cleanup_failed=1'
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: 'exit "\$\{cleanup_failed\}"'
+
+  - it: "bounds the cleanup Job so a claim that will not go cannot hang the uninstall"
+    documentSelector:
+      path: kind
+      value: Job
+    asserts:
+      - equal:
+          path: spec.activeDeadlineSeconds
+          value: 270
+      - equal:
+          path: spec.template.spec.terminationGracePeriodSeconds
+          value: 10
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: 'kubectl delete pvc -n tenant-test -l app\.kubernetes\.io/instance=mariadb-test --ignore-not-found --wait=true --timeout=120s'
+      - notMatchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: '--request-timeout='
+
+  - it: "cleanup Role grants get/list/watch/delete on persistentvolumeclaims"
+    documentSelector:
+      path: kind
+      value: Role
+    asserts:
+      - contains:
+          path: rules
+          content:
+            apiGroups: [""]
+            resources: ["persistentvolumeclaims"]
+            verbs: ["get", "list", "watch", "delete"]
+
+  - it: "cleanup Role scopes secret access to the named secrets only (least privilege)"
+    documentSelector:
+      path: kind
+      value: Role
+    asserts:
+      - contains:
+          path: rules
+          content:
+            apiGroups: [""]
+            resources: ["secrets"]
+            resourceNames:
+              - mariadb-test-metrics-password
+              - mariadb-test-repl-password
+              - mariadb-test.ca-tls
+              - mariadb-test.tls
+            verbs: ["get", "delete"]
+      # Lock the exact rule set (PVC rule + the single scoped secrets rule).
+      # Without this, a broader unscoped `secrets` rule could be added and the
+      # `contains` checks above would still pass.
+      - lengthEqual:
+          path: rules
+          count: 2
diff --git a/packages/apps/mariadb/tests/cleanup_pvc_hook_test.yaml b/packages/apps/mariadb/tests/cleanup_pvc_hook_test.yaml
new file mode 100644
index 0000000000..0af92470cc
--- /dev/null
+++ b/packages/apps/mariadb/tests/cleanup_pvc_hook_test.yaml
@@ -0,0 +1,115 @@
+suite: mariadb post-delete cleanup hook
+templates:
+  - templates/hooks/cleanup-pvc.yaml
+
+release:
+  name: mariadb-test
+  namespace: tenant-root
+
+tests:
+  - it: renders the cleanup Job as a post-delete hook
+    documentIndex: 0
+    asserts:
+      - equal:
+          path: kind
+          value: Job
+      - equal:
+          path: metadata.name
+          value: mariadb-test-cleanup
+      - equal:
+          path: metadata.annotations["helm.sh/hook"]
+          value: post-delete
+
+  - it: pins the cleanup image by digest and routes it through the images registry
+    documentIndex: 0
+    asserts:
+      # The image must be digest-pinned (immutable) rather than a moving tag,
+      # and must NOT hardcode docker.io so a mirrored/air-gapped registry can be
+      # prefixed via cozy-lib.image. Asserted by pattern (not an exact digest)
+      # so a Renovate tag/digest bump does not break the test.
+      - matchRegex:
+          path: spec.template.spec.containers[0].image
+          pattern: ^clastix/kubectl:v[0-9]+\.[0-9]+(\.[0-9]+)?@sha256:[0-9a-f]{64}$
+      - notMatchRegex:
+          path: spec.template.spec.containers[0].image
+          pattern: docker\.io
+
+  - it: prefixes the cleanup image with the cluster images registry when set
+    documentIndex: 0
+    set:
+      _cluster:
+        images-registry: registry.example.com
+    asserts:
+      # A mirrored / air-gapped install resolves the image from the internal
+      # registry; the digest pin is preserved.
+      - matchRegex:
+          path: spec.template.spec.containers[0].image
+          pattern: ^registry\.example\.com/clastix/kubectl:v[0-9]+\.[0-9]+(\.[0-9]+)?@sha256:[0-9a-f]{64}$
+
+  - it: leaves no leading slash when the images registry is empty (default)
+    documentIndex: 0
+    asserts:
+      # With images-registry defaulting to "", the rendered ref must still be a
+      # valid image reference (no leading "/") so a standard install resolves it.
+      # The "^clastix" anchor proves there is no leading slash and no registry.
+      - matchRegex:
+          path: spec.template.spec.containers[0].image
+          pattern: ^clastix/kubectl:v[0-9]+\.[0-9]+(\.[0-9]+)?@sha256:[0-9a-f]{64}$
+      - notMatchRegex:
+          path: spec.template.spec.containers[0].image
+          pattern: ^/
+
+  - it: does not emit a double slash when the images registry has a trailing slash
+    documentIndex: 0
+    set:
+      _cluster:
+        images-registry: registry.example.com/
+    asserts:
+      # A misconfigured registry with a trailing "/" must not yield
+      # "registry.example.com//clastix/..." — the helper trims it.
+      - matchRegex:
+          path: spec.template.spec.containers[0].image
+          pattern: ^registry\.example\.com/clastix/kubectl:v[0-9]+\.[0-9]+(\.[0-9]+)?@sha256:[0-9a-f]{64}$
+      - notMatchRegex:
+          path: spec.template.spec.containers[0].image
+          pattern: //
+
+  # cert-manager runs with enableCertificateOwnerRef=false, so deleting the
+  # Certificates does not delete the Secrets they issued. Without this, the CA
+  # private key and the server private key outlive the release in a namespace
+  # the tenant shares with its other applications.
+  - it: deletes the key-bearing cert-manager Secrets on uninstall
+    documentIndex: 0
+    asserts:
+      # Bound to the delete, and to this one invocation of it: a name reachable
+      # by any other verb says nothing about whether the key outlives the
+      # release, and a `(?s).*` gap between verb and name binds them no better,
+      # since it crosses newlines and therefore crosses commands. Only
+      # whitespace and the shell's line continuations may sit between the
+      # arguments, so the match cannot leave the command it started in. The
+      # operator-generated names are in the pattern because they share that
+      # invocation, not because this case is about them.
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: "kubectl delete secret -n \\S+[\\s\\\\]+mariadb-test-metrics-password mariadb-test-repl-password[\\s\\\\]+mariadb-test\\.ca-tls mariadb-test\\.tls --ignore-not-found"
+      # -ca-bundle carries an ownerRef to the MariaDB resource, so Kubernetes
+      # collects it; deleting it here would need a grant that is not warranted.
+      - notMatchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: "mariadb-test-ca-bundle"
+
+  - it: grants delete on exactly the Secrets it removes
+    documentIndex: 2
+    asserts:
+      - equal:
+          path: kind
+          value: Role
+      - contains:
+          path: rules[1].resourceNames
+          content: mariadb-test.ca-tls
+      - contains:
+          path: rules[1].resourceNames
+          content: mariadb-test.tls
+      - lengthEqual:
+          path: rules[1].resourceNames
+          count: 4
diff --git a/packages/apps/mariadb/tests/credentials_lookup_test.yaml b/packages/apps/mariadb/tests/credentials_lookup_test.yaml
new file mode 100644
index 0000000000..1a341591f4
--- /dev/null
+++ b/packages/apps/mariadb/tests/credentials_lookup_test.yaml
@@ -0,0 +1,41 @@
+suite: MariaDB credentials lookup-backed preservation
+release:
+  name: mariadb-test
+  namespace: tenant-test
+templates:
+  - templates/secret.yaml
+tests:
+  - it: preserves existing passwords (including root) across renders
+    # The lookup in secret.yaml reads back the current Secret, so each user keeps
+    # the password already stored rather than getting a fresh one on every
+    # reconcile. kubernetesProvider mocks that existing Secret.
+    kubernetesProvider:
+      scheme:
+        "v1/Secret":
+          gvr:
+            version: v1
+            resource: secrets
+          namespaced: true
+      objects:
+        - apiVersion: v1
+          kind: Secret
+          metadata:
+            name: mariadb-test-credentials
+            namespace: tenant-test
+          data:
+            testuser: ZXhpc3RpbmdwYXNzd29yZA==
+            root: ZXhpc3Rpbmdyb290
+    set:
+      users:
+        testuser:
+          maxUserConnections: 1000
+    documentSelector:
+      path: metadata.name
+      value: mariadb-test-credentials
+    asserts:
+      - equal:
+          path: stringData.testuser
+          value: existingpassword
+      - equal:
+          path: stringData.root
+          value: existingroot
diff --git a/packages/apps/mariadb/tests/credentials_test.yaml b/packages/apps/mariadb/tests/credentials_test.yaml
new file mode 100644
index 0000000000..6e2d6af1eb
--- /dev/null
+++ b/packages/apps/mariadb/tests/credentials_test.yaml
@@ -0,0 +1,57 @@
+suite: MariaDB credentials generation
+
+# Passwords (including root) are always chart-generated (no plaintext input) and
+# preserved across reconciles by the lookup in secret.yaml. This suite renders
+# without a kubernetesProvider, so lookup() returns nothing and every render
+# generates fresh passwords; the lookup-backed preserve path is covered in
+# credentials_lookup_test.yaml.
+
+release:
+  name: mariadb-test
+  namespace: tenant-test
+
+templates:
+  - templates/secret.yaml
+
+tests:
+  - it: always generates a root password even with no users
+    asserts:
+      - matchRegex:
+          path: stringData.root
+          pattern: ^[a-zA-Z0-9]{16}$
+      - equal:
+          # The watch label makes mariadb-operator react to a change on this
+          # Secret (e.g. a newly added user's generated password) promptly rather
+          # than on its --requeue-sql tick.
+          path: metadata.labels["k8s.mariadb.com/watch"]
+          value: ""
+
+  - it: generates a 16-char alphanumeric password for each defined user
+    set:
+      users:
+        testuser:
+          maxUserConnections: 1000
+    asserts:
+      - matchRegex:
+          path: stringData.testuser
+          pattern: ^[a-zA-Z0-9]{16}$
+      - matchRegex:
+          path: stringData.root
+          pattern: ^[a-zA-Z0-9]{16}$
+
+  - it: ignores a value-supplied password and generates one instead
+    # Pins the breaking-change contract: the schema no longer declares
+    # `password`, but nothing rejects a leftover key, so prove it is dropped
+    # rather than honoured.
+    set:
+      users:
+        testuser:
+          maxUserConnections: 1000
+          password: value-supplied-secret
+    asserts:
+      - matchRegex:
+          path: stringData.testuser
+          pattern: ^[a-zA-Z0-9]{16}$
+      - notMatchRegex:
+          path: stringData.testuser
+          pattern: value-supplied-secret
diff --git a/packages/apps/mariadb/tests/database_validation_test.yaml b/packages/apps/mariadb/tests/database_validation_test.yaml
new file mode 100644
index 0000000000..65ca291211
--- /dev/null
+++ b/packages/apps/mariadb/tests/database_validation_test.yaml
@@ -0,0 +1,485 @@
+suite: db.yaml rejects a database name that cannot install
+
+# A database name becomes the Database CR spec.name and (via "_"->"-") the
+# Database CR metadata.name <release>-<name>, plus each Grant's database and
+# metadata.name. Kubernetes requires that resource name to be a DNS-1123
+# subdomain, and two names differing only in "_" vs "-" collide on one Database
+# CR. Without a guard such names render and fail opaquely at apply — the same
+# class the username guard already catches. Mirror it for databases. Reverting
+# the guard in db.yaml lets the render succeed, so the reject tests fail.
+
+templates:
+  - templates/db.yaml
+
+release:
+  name: mdb-test
+  namespace: tenant-test
+
+set:
+  users:
+    app:
+      maxUserConnections: 10
+
+tests:
+  - it: fails for an uppercase database name (invalid Database CR name)
+    set:
+      databases:
+        My.Db:
+          roles:
+            admin: [app]
+    asserts:
+      - failedTemplate:
+          errorMessage: 'invalid database name "My.Db": it also names the Database resource "mdb-test-My.Db", which Kubernetes requires to be a DNS-1123 subdomain (lowercase letters, digits, "-" and ".", starting and ending with a letter or digit); use a lowercase name without a leading or trailing "-" or "."'
+
+  - it: fails for a database name with a trailing "-"
+    set:
+      databases:
+        foo-:
+          roles:
+            admin: [app]
+    asserts:
+      - failedTemplate:
+          errorMessage: 'invalid database name "foo-": it also names the Database resource "mdb-test-foo-", which Kubernetes requires to be a DNS-1123 subdomain (lowercase letters, digits, "-" and ".", starting and ending with a letter or digit); use a lowercase name without a leading or trailing "-" or "."'
+
+  - it: fails for two database names that collide after the "_"->"-" mapping
+    set:
+      databases:
+        a_b:
+          roles:
+            admin: [app]
+        a-b:
+          roles:
+            admin: [app]
+    asserts:
+      - failedTemplate:
+          errorMessage: 'database names "a-b" and "a_b" both map to the Database resource name "mdb-test-a-b" ("_" renders as "-"); rename one of them'
+
+  # The Grant CR name is the join <release>-<dbDNS>-<userDNS>-<role>, so two
+  # different (database, user) pairs that split the "-"/"_" differently collide
+  # on one Grant even when each database and each username is individually unique
+  # and valid. Per-field guards miss this join; the guard must track the whole
+  # rendered Grant name. Here (db "a", user "b-c") and (db "a-b", user "c") both
+  # render mdb-test-a-b-c-admin.
+  - it: fails when two (database,user) admin grants collide on one Grant name
+    set:
+      users:
+        b-c:
+          maxUserConnections: 10
+        c:
+          maxUserConnections: 10
+      databases:
+        a:
+          roles:
+            admin: [b-c]
+        a-b:
+          roles:
+            admin: [c]
+    asserts:
+      - failedTemplate:
+          errorMessage: 'the Grant resource name "mdb-test-a-b-c" is produced by both (database "a", user "b-c") and (database "a-b", user "c") ("_" renders as "-"); rename a database or user so their Grants do not collide'
+
+  # The Grant name <release>-<db>-<member> can exceed 253 even when the database
+  # name fits: a Grant role member need not be a declared user, so the username
+  # cap never sees it, and the 128-char member cap is checked after this guard. A
+  # long database name cannot drive it, because the 64-char MariaDB database cap
+  # rejects that first. Assert the guard's OWN message (errorPattern) so a fixture
+  # tripping a sibling guard cannot masquerade as coverage.
+  - it: fails when the Grant name exceeds 253 characters though the database name fits
+    set:
+      databases:
+        db:
+          roles:
+            admin: ["aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"]
+    asserts:
+      - failedTemplate:
+          errorPattern: 'the Grant resource name .* exceeds the 253-character limit Kubernetes puts on a resource name'
+
+  # A role list has no uniqueItems in the schema, so admin: [bob, bob] is legal
+  # and renders as a single Grant. The collision guard must
+  # not treat a user duplicated within one role as a collision with itself and
+  # abort the whole render — dedupe first.
+  - it: renders one Grant for a user listed twice in the same role
+    set:
+      users:
+        bob:
+          maxUserConnections: 10
+      databases:
+        testdb:
+          roles:
+            admin: [bob, bob]
+    asserts:
+      # doc 0 Database, doc 1 the single Grant; no self-collision failure
+      - hasDocuments:
+          count: 2
+      - documentIndex: 1
+        equal:
+          path: metadata.name
+          value: mdb-test-testdb-bob
+      - documentIndex: 1
+        equal:
+          path: spec.privileges[0]
+          value: ALL
+
+  # A name in databases.<db>.roles.admin/readonly is NOT one of .Values.users,
+  # so it never passes the username guard in secret.yaml, yet it forms the Grant
+  # CR name <release>-<db>-<user>. A member outside the DNS-1123 charset (here
+  # "Weird.User!") renders a Grant name the apiserver rejects opaquely — the
+  # class the guards exist to close. The Grant guard must check the charset too,
+  # not only the length.
+  - it: fails for a role member that is not a valid DNS-1123 name
+    set:
+      users:
+        gooduser:
+          maxUserConnections: 10
+      databases:
+        mydb:
+          roles:
+            admin: ["Weird.User!"]
+    asserts:
+      - failedTemplate:
+          errorMessage: 'invalid role member "Weird.User!" for database "mydb": it names the Grant resource "mdb-test-mydb-Weird.User!", which Kubernetes requires to be a DNS-1123 subdomain (lowercase letters, digits, "-" and ".", starting and ending with a letter or digit). A name in databases.<db>.roles.admin/readonly is not one of .Values.users, so the username guard never sees it - use a lowercase name without special characters'
+
+  - it: renders normally for a valid lowercase database name
+    set:
+      databases:
+        mydb:
+          roles:
+            admin: [app]
+    asserts:
+      - documentIndex: 0
+        equal:
+          path: kind
+          value: Database
+      - documentIndex: 0
+        equal:
+          path: spec.name
+          value: mydb
+
+  # The database and Grant "_"/"-" collision guards are gated to install, for the
+  # same reason as the username one: an existing release already took the silent
+  # overwrite, and blocking its upgrades only makes a running release worse. On
+  # upgrade both colliding pairs render instead of failing. Removing
+  # ".Release.IsInstall" from either guard turns the matching test red.
+  - it: renders on upgrade for two database names that collide on install
+    release:
+      name: mdb-test
+      namespace: tenant-test
+      upgrade: true
+    set:
+      databases:
+        a_b:
+          roles:
+            admin: [app]
+        a-b:
+          roles:
+            admin: [app]
+    asserts:
+      - hasDocuments:
+          count: 4
+
+  - it: renders on upgrade for two (database,user) grants that collide on install
+    release:
+      name: mdb-test
+      namespace: tenant-test
+      upgrade: true
+    set:
+      users:
+        b-c:
+          maxUserConnections: 10
+        c:
+          maxUserConnections: 10
+      databases:
+        a:
+          roles:
+            admin: [b-c]
+        a-b:
+          roles:
+            admin: [c]
+    asserts:
+      - hasDocuments:
+          count: 4
+
+  # A charset/DNS-invalid database name never applied, so its guard stays on the
+  # upgrade path too rather than deferring an opaque apiserver rejection.
+  - it: still fails on upgrade for an invalid Database CR name
+    release:
+      name: mdb-test
+      namespace: tenant-test
+      upgrade: true
+    set:
+      databases:
+        My.Db:
+          roles:
+            admin: [app]
+    asserts:
+      - failedTemplate:
+          errorMessage: 'invalid database name "My.Db": it also names the Database resource "mdb-test-My.Db", which Kubernetes requires to be a DNS-1123 subdomain (lowercase letters, digits, "-" and ".", starting and ending with a letter or digit); use a lowercase name without a leading or trailing "-" or "."'
+
+  # The database name is the MariaDB database identifier (Database CR spec.name),
+  # capped by the server at 64 characters; a longer CREATE DATABASE fails with
+  # "Incorrect database name". Cap it at render. 65 fails, 64 renders.
+  - it: fails the render for a database name of 65 characters (past the MariaDB identifier limit)
+    set:
+      databases:
+        "daaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa":
+          roles:
+            admin: [app]
+    asserts:
+      - failedTemplate:
+          errorMessage: 'invalid database name "daaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa": a MariaDB database identifier is at most 64 characters'
+
+  - it: renders normally for a database name at the 64-character boundary
+    set:
+      databases:
+        "daaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa":
+          roles:
+            admin: [app]
+    asserts:
+      - documentIndex: 0
+        equal:
+          path: spec.name
+          value: "daaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
+
+  # A Grant role member need not be one of .Values.users, so the 80-character
+  # username cap in secret.yaml (which iterates only .Values.users) never sees it.
+  # The server caps an account name at 128 characters, so a longer member renders
+  # a Grant whose GRANT the server rejects. Cap it at render. The database is kept
+  # short so the Grant name stays under 253 and THIS guard, not the length guard,
+  # fires; assert its own message so a sibling cannot shadow it.
+  - it: fails for a role member longer than the 128-character MariaDB account limit
+    set:
+      databases:
+        db:
+          roles:
+            admin: ["aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"]
+    asserts:
+      - failedTemplate:
+          errorMessage: 'invalid role member "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" for database "db": a MariaDB account name is at most 128 characters, so the server rejects the GRANT for a longer one. A name in databases.<db>.roles.admin/readonly is not one of .Values.users, so the username length cap in secret.yaml never sees it'
+
+  - it: renders normally for a role member at the 128-character boundary
+    set:
+      databases:
+        db:
+          roles:
+            admin: ["aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"]
+    asserts:
+      - hasDocuments:
+          count: 2
+      - documentIndex: 1
+        equal:
+          path: spec.username
+          value: "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
+
+  # Unlike the 253 and DNS-1123 Grant guards, a too-long member renders a Grant
+  # the apiserver accepts (spec.username has no CRD maxLength), so a release that
+  # already applied it must keep upgrading: on upgrade the cap skips a member
+  # whose Grant already exists. Applying the cap on upgrade regardless of the
+  # Grant makes this fail to render.
+  - it: renders on upgrade for an over-128 role member whose Grant already exists
+    release:
+      name: mdb-test
+      namespace: tenant-test
+      upgrade: true
+    kubernetesProvider:
+      scheme:
+        "k8s.mariadb.com/v1alpha1/Grant":
+          gvr: {group: k8s.mariadb.com, version: v1alpha1, resource: grants}
+          namespaced: true
+      objects:
+        - apiVersion: k8s.mariadb.com/v1alpha1
+          kind: Grant
+          metadata:
+            name: mdb-test-db-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+            namespace: tenant-test
+    set:
+      databases:
+        db:
+          roles:
+            admin: ["aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"]
+    asserts:
+      - hasDocuments:
+          count: 2
+      - documentIndex: 1
+        equal:
+          path: spec.username
+          value: "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
+
+  # The DNS-1123 Grant-member charset guard, by contrast, stays on both paths: an
+  # invalid name renders a Grant metadata.name the apiserver rejects, so it never
+  # applied and gating it to install would only defer the same opaque failure to
+  # the apiserver on upgrade. Wrapping that guard in ".Release.IsInstall" turns
+  # this red.
+  - it: still fails on upgrade for a role member that is not a valid DNS-1123 name
+    release:
+      name: mdb-test
+      namespace: tenant-test
+      upgrade: true
+    set:
+      users:
+        gooduser:
+          maxUserConnections: 10
+      databases:
+        mydb:
+          roles:
+            admin: ["Weird.User!"]
+    asserts:
+      - failedTemplate:
+          errorMessage: 'invalid role member "Weird.User!" for database "mydb": it names the Grant resource "mdb-test-mydb-Weird.User!", which Kubernetes requires to be a DNS-1123 subdomain (lowercase letters, digits, "-" and ".", starting and ending with a letter or digit). A name in databases.<db>.roles.admin/readonly is not one of .Values.users, so the username guard never sees it - use a lowercase name without special characters'
+
+  # A member added on upgrade has no Grant yet, so it is as new as one on install
+  # and the cap still names it; gating the cap to install alone would let the
+  # common path, adding a member to a running release, render silently. Dropping
+  # the "not lookup" conjunct lets the render succeed, so this fails.
+  - it: still fails on upgrade for a NEW over-128 role member
+    release:
+      name: mdb-test
+      namespace: tenant-test
+      upgrade: true
+    set:
+      databases:
+        db:
+          roles:
+            admin: ["aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"]
+    asserts:
+      - failedTemplate:
+          errorMessage: 'invalid role member "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" for database "db": a MariaDB account name is at most 128 characters, so the server rejects the GRANT for a longer one. A name in databases.<db>.roles.admin/readonly is not one of .Values.users, so the username length cap in secret.yaml never sees it'
+
+  # A non-ASCII member fails the DNS-1123 guard for its charset, which runs before
+  # the 128 cap: 65 characters of 2-byte "é" are 130 bytes, and reporting them as
+  # "at most 128 characters" would send the tenant shortening a name that is short
+  # enough. Moving the 80 cap back above the DNS-1123 guard turns this red.
+  - it: reports a non-ASCII role member for its charset, not its byte length
+    set:
+      databases:
+        db:
+          roles:
+            admin: ["ééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééééé"]
+    asserts:
+      - failedTemplate:
+          errorPattern: 'invalid role member .* which Kubernetes requires to be a DNS-1123 subdomain'
+
+  # A fresh install has no running release to protect, so the cap holds even when
+  # a stale Grant of that name is already in the namespace. Dropping the
+  # ".Release.IsInstall" conjunct lets the render succeed, so this fails.
+  - it: still fails on install for an over-128 role member a stale Grant carries
+    kubernetesProvider:
+      scheme:
+        "k8s.mariadb.com/v1alpha1/Grant":
+          gvr: {group: k8s.mariadb.com, version: v1alpha1, resource: grants}
+          namespaced: true
+      objects:
+        - apiVersion: k8s.mariadb.com/v1alpha1
+          kind: Grant
+          metadata:
+            name: mdb-test-db-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+            namespace: tenant-test
+    set:
+      databases:
+        db:
+          roles:
+            admin: ["aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"]
+    asserts:
+      - failedTemplate:
+          errorPattern: 'a MariaDB account name is at most 128 characters'
+
+  # The Database CRD allows a spec.name of 80 characters while the server allows
+  # 64, so a name of 65-80 renders a Database the apiserver accepts and only the
+  # operator's SQL fails. A release that already applied one must keep upgrading:
+  # on upgrade the 64 cap skips a name whose Database already exists. Applying the
+  # cap on upgrade regardless of the Database makes this fail to render.
+  - it: renders on upgrade for a 65-character database whose Database already exists
+    release:
+      name: mdb-test
+      namespace: tenant-test
+      upgrade: true
+    kubernetesProvider:
+      scheme:
+        "k8s.mariadb.com/v1alpha1/Database":
+          gvr: {group: k8s.mariadb.com, version: v1alpha1, resource: databases}
+          namespaced: true
+      objects:
+        - apiVersion: k8s.mariadb.com/v1alpha1
+          kind: Database
+          metadata:
+            name: mdb-test-ddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd
+            namespace: tenant-test
+    set:
+      databases:
+        "ddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd":
+          roles:
+            admin: [app]
+    asserts:
+      - documentIndex: 0
+        equal:
+          path: spec.name
+          value: "ddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd"
+
+  # A database added on upgrade has no Database yet, so it is as new as one on
+  # install. Dropping the "not lookup" conjunct lets the render succeed, so this
+  # fails.
+  - it: still fails on upgrade for a NEW 65-character database name
+    release:
+      name: mdb-test
+      namespace: tenant-test
+      upgrade: true
+    set:
+      databases:
+        "ddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd":
+          roles:
+            admin: [app]
+    asserts:
+      - failedTemplate:
+          errorPattern: 'a MariaDB database identifier is at most 64 characters'
+
+  # A fresh install has no release to protect, so the cap holds even when a stale
+  # Database of that name is in the namespace. Dropping the ".Release.IsInstall"
+  # conjunct lets the render succeed, so this fails.
+  - it: still fails on install for a 65-character database a stale Database carries
+    kubernetesProvider:
+      scheme:
+        "k8s.mariadb.com/v1alpha1/Database":
+          gvr: {group: k8s.mariadb.com, version: v1alpha1, resource: databases}
+          namespaced: true
+      objects:
+        - apiVersion: k8s.mariadb.com/v1alpha1
+          kind: Database
+          metadata:
+            name: mdb-test-ddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd
+            namespace: tenant-test
+    set:
+      databases:
+        "ddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd":
+          roles:
+            admin: [app]
+    asserts:
+      - failedTemplate:
+          errorPattern: 'a MariaDB database identifier is at most 64 characters'
+
+  # Past 80 characters the apiserver rejects the Database itself (CRD maxLength),
+  # so such a name never applied and is rejected on upgrade too, even if a
+  # Database of that name somehow exists. Dropping the 80 conjunct lets the render
+  # succeed, so this fails.
+  - it: still fails on upgrade for an 81-character database name
+    release:
+      name: mdb-test
+      namespace: tenant-test
+      upgrade: true
+    kubernetesProvider:
+      scheme:
+        "k8s.mariadb.com/v1alpha1/Database":
+          gvr: {group: k8s.mariadb.com, version: v1alpha1, resource: databases}
+          namespaced: true
+      objects:
+        - apiVersion: k8s.mariadb.com/v1alpha1
+          kind: Database
+          metadata:
+            name: mdb-test-ddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd
+            namespace: tenant-test
+    set:
+      databases:
+        "ddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd":
+          roles:
+            admin: [app]
+    asserts:
+      - failedTemplate:
+          errorPattern: 'a MariaDB database identifier is at most 64 characters'
diff --git a/packages/apps/mariadb/tests/exporter_listen_address_test.yaml b/packages/apps/mariadb/tests/exporter_listen_address_test.yaml
new file mode 100644
index 0000000000..fd6d358f21
--- /dev/null
+++ b/packages/apps/mariadb/tests/exporter_listen_address_test.yaml
@@ -0,0 +1,32 @@
+suite: MariaDB metrics exporter listen address
+
+# Regression cover: the mariadb-operator hardcodes the mysqld-exporter
+# liveness/readiness probe as an httpGet on port 9104, which kubelet dials
+# over the pod's IPv4 address. The exporter must therefore listen on an
+# IPv4 socket; an IPv6 wildcard ([::]) listener intermittently refuses the
+# IPv4 probe on single-stack-IPv4 data planes, flapping the pod to NotReady
+# and leaving the metrics Service endpoint unpopulated. Pin the explicit
+# IPv4 listen-address flag so the probe is reachable deterministically.
+
+templates:
+  - templates/mariadb.yaml
+
+tests:
+  - it: renders the MariaDB CR
+    release:
+      name: mariadb-test
+      namespace: tenant-test
+    asserts:
+      - hasDocuments:
+          count: 1
+      - isKind:
+          of: MariaDB
+
+  - it: pins the exporter to the IPv4 wildcard so the kubelet probe is reachable
+    release:
+      name: mariadb-test
+      namespace: tenant-test
+    asserts:
+      - contains:
+          path: spec.metrics.exporter.args
+          content: --web.listen-address=0.0.0.0:9104
diff --git a/packages/apps/mariadb/tests/grant_username_quoting_test.yaml b/packages/apps/mariadb/tests/grant_username_quoting_test.yaml
new file mode 100644
index 0000000000..494c6ef06e
--- /dev/null
+++ b/packages/apps/mariadb/tests/grant_username_quoting_test.yaml
@@ -0,0 +1,121 @@
+suite: Grant CR quotes the username so a YAML-special name stays a string
+
+# The Grant CR's spec.username must match the User CR's spec.name and the Secret
+# key, which user.yaml/secret.yaml already quote. Emitted bare, a username that
+# is a YAML-special scalar decodes to the wrong type: Kubernetes reads manifests
+# through sigs.k8s.io/yaml (YAML 1.1), where a numeric name like 123 becomes an
+# integer and a name like "on" becomes a boolean, so the Grant names a value the
+# User CR (string) does not, and the privilege is silently never applied.
+#
+# A numeric name is used deliberately: helm-unittest's own loader keeps a bare
+# "on" as the string "on" (it does not apply YAML 1.1 booleans), so only a
+# numeric exercises the coercion here — bare 123 loads as the integer 123, the
+# quoted form as the string "123". Asserting the string form pins the quoting;
+# dropping "| quote" in db.yaml loads it as an integer and turns this red.
+#
+# Document order from db.yaml for one database granting one user admin+readonly:
+#   0 Database, 1 Grant(ALL/admin), 2 Grant(SELECT/readonly).
+
+templates:
+  - templates/db.yaml
+
+release:
+  name: mdb-test
+  namespace: tenant-test
+
+set:
+  users:
+    "123":
+      maxUserConnections: 10
+    "456":
+      maxUserConnections: 10
+  databases:
+    db1:
+      roles:
+        admin: ["123"]
+        readonly: ["456"]
+
+tests:
+  - it: keeps the admin Grant username the string "123"
+    documentIndex: 1
+    asserts:
+      - equal:
+          path: kind
+          value: Grant
+      - equal:
+          path: spec.privileges[0]
+          value: ALL
+      - equal:
+          path: spec.username
+          value: "123"
+
+  - it: keeps the readonly Grant username the string "456"
+    documentIndex: 2
+    asserts:
+      - equal:
+          path: kind
+          value: Grant
+      - equal:
+          path: spec.privileges[0]
+          value: SELECT
+      - equal:
+          path: spec.username
+          value: "456"
+
+  # A database name is subject to the same YAML-1.1 coercion: bare, a numeric
+  # name loads as an integer on the Database CR and the Grant, so they name a
+  # database that is not the one asked for. Quote both.
+  - it: keeps the Database and Grant database name the string "123"
+    set:
+      users:
+        app:
+          maxUserConnections: 10
+      databases:
+        "123":
+          roles:
+            admin: [app]
+    asserts:
+      - documentIndex: 0
+        equal:
+          path: kind
+          value: Database
+      - documentIndex: 0
+        equal:
+          path: spec.name
+          value: "123"
+      - documentIndex: 1
+        equal:
+          path: kind
+          value: Grant
+      - documentIndex: 1
+        equal:
+          path: spec.database
+          value: "123"
+
+  # A user in both admin and readonly of one database must render a SINGLE Grant,
+  # named <release>-<db>-<user> with no role suffix (renaming a Grant on upgrade
+  # makes the operator revoke the live privilege). The admin grant wins (ALL is a
+  # superset of the readonly SELECT); the readonly grant is skipped, so there is
+  # no same-name collision to disambiguate.
+  - it: renders a single unsuffixed admin Grant for a user in both roles
+    set:
+      users:
+        app:
+          maxUserConnections: 10
+      databases:
+        db1:
+          roles:
+            admin: [app]
+            readonly: [app]
+    asserts:
+      # doc 0 Database, doc 1 the one Grant; only two documents (no readonly Grant)
+      - hasDocuments:
+          count: 2
+      - documentIndex: 1
+        equal:
+          path: metadata.name
+          value: mdb-test-db1-app
+      - documentIndex: 1
+        equal:
+          path: spec.privileges[0]
+          value: ALL
diff --git a/packages/apps/mariadb/tests/my_cnf_key_test.yaml b/packages/apps/mariadb/tests/my_cnf_key_test.yaml
new file mode 100644
index 0000000000..cc549dd7d9
--- /dev/null
+++ b/packages/apps/mariadb/tests/my_cnf_key_test.yaml
@@ -0,0 +1,29 @@
+suite: MariaDB my.cnf ConfigMap key
+
+# mariadb-operator projects the referenced key into /etc/mysql/conf.d under
+# the key's own name, and the server's `!includedir` reads only files ending
+# in .cnf there. A key without that suffix is mounted and silently ignored.
+
+tests:
+  - it: stores the config under a .cnf key
+    template: templates/config.yaml
+    release:
+      name: mariadb-test
+      namespace: tenant-test
+    asserts:
+      - exists:
+          path: data["my.cnf"]
+      - isNull:
+          path: data.config
+
+  - it: points the MariaDB CR at that same key
+    template: templates/mariadb.yaml
+    release:
+      name: mariadb-test
+      namespace: tenant-test
+    asserts:
+      - equal:
+          path: spec.myCnfConfigMapKeyRef
+          value:
+            name: mariadb-test-my-cnf
+            key: my.cnf
diff --git a/packages/apps/mariadb/tests/my_cnf_resource_scaling_test.yaml b/packages/apps/mariadb/tests/my_cnf_resource_scaling_test.yaml
new file mode 100644
index 0000000000..a42702d529
--- /dev/null
+++ b/packages/apps/mariadb/tests/my_cnf_resource_scaling_test.yaml
@@ -0,0 +1,241 @@
+suite: MariaDB my.cnf resource scaling
+
+# The shipped my.cnf used to hardcode sizing for a large bare-metal host —
+# a 60G buffer pool, a 4 GiB redo log, a 1 GiB MyISAM key cache and 4096
+# connections — while the chart defaults to t1.nano (250m CPU / 128Mi RAM)
+# and a 10Gi volume. Every memory allocation and thread count in the file
+# now derives from the instance's own CPU and memory limits, so a small
+# instance asks for memory it actually has and does not preallocate a redo
+# log worth 40% of its default volume.
+
+templates:
+  - templates/config.yaml
+
+tests:
+  - it: renders a single my.cnf ConfigMap
+    release:
+      name: mariadb-test
+      namespace: tenant-test
+    asserts:
+      - hasDocuments:
+          count: 1
+      - isKind:
+          of: ConfigMap
+
+  # t1.nano — the chart default: 250m CPU, 128Mi memory, 10Gi volume.
+  - it: sizes every allocation to the instance on the default t1.nano preset
+    release:
+      name: mariadb-test
+      namespace: tenant-test
+    asserts:
+      # 50% of the 128Mi memory limit.
+      - matchRegex:
+          path: data["my.cnf"]
+          pattern: (?m)^innodb_buffer_pool_size=64M$
+      # min(buffer pool, 5% of the 10Gi volume) lifted to the 96M server default.
+      - matchRegex:
+          path: data["my.cnf"]
+          pattern: (?m)^innodb_log_file_size=96M$
+      # memory/4 lifted to the 151 stock MariaDB default.
+      - matchRegex:
+          path: data["my.cnf"]
+          pattern: (?m)^max_connections=151$
+      - matchRegex:
+          path: data["my.cnf"]
+          pattern: (?m)^key_buffer_size=8M$
+      - matchRegex:
+          path: data["my.cnf"]
+          pattern: (?m)^tmp_table_size=16M$
+      - matchRegex:
+          path: data["my.cnf"]
+          pattern: (?m)^read_rnd_buffer_size=512K$
+      - matchRegex:
+          path: data["my.cnf"]
+          pattern: (?m)^table_open_cache=2000$
+      # 250m of CPU must not spawn 24 pool threads.
+      - matchRegex:
+          path: data["my.cnf"]
+          pattern: (?m)^thread_pool_size=1$
+      - matchRegex:
+          path: data["my.cnf"]
+          pattern: (?m)^innodb_read_io_threads=2$
+      - matchRegex:
+          path: data["my.cnf"]
+          pattern: (?m)^innodb_write_io_threads=2$
+
+  # The exact values the old hardcoded file shipped. None of them may come
+  # back for a nano instance, whatever the formulas are rewritten to.
+  - it: never emits the hardcoded large-host sizing on a nano instance
+    release:
+      name: mariadb-test
+      namespace: tenant-test
+    asserts:
+      - notMatchRegex:
+          path: data["my.cnf"]
+          pattern: innodb_buffer_pool_size=60G
+      - notMatchRegex:
+          path: data["my.cnf"]
+          pattern: innodb_log_file_size=4096M
+      - notMatchRegex:
+          path: data["my.cnf"]
+          pattern: key_buffer_size=1024M
+      - notMatchRegex:
+          path: data["my.cnf"]
+          pattern: max_connections=4096
+      - notMatchRegex:
+          path: data["my.cnf"]
+          pattern: tmp_table_size=512M
+
+  # innodb_buffer_pool_instances and innodb_thread_concurrency were removed
+  # from the server in 10.6, below the oldest version this chart ships. Both
+  # only produce a "was removed. It does nothing now" warning on every start.
+  - it: omits variables the shipped server versions have removed
+    release:
+      name: mariadb-test
+      namespace: tenant-test
+    asserts:
+      - notMatchRegex:
+          path: data["my.cnf"]
+          pattern: innodb_buffer_pool_instances
+      - notMatchRegex:
+          path: data["my.cnf"]
+          pattern: innodb_thread_concurrency
+
+  # m1.large — 4 CPU, 32Gi memory. Every cap is reached except the redo log,
+  # which the default 10Gi volume holds down to 512M.
+  - it: scales up on a large preset without exceeding the previous ceilings
+    release:
+      name: mariadb-test
+      namespace: tenant-test
+    set:
+      resourcesPreset: m1.large
+    asserts:
+      - matchRegex:
+          path: data["my.cnf"]
+          pattern: (?m)^innodb_buffer_pool_size=16384M$
+      # min(16Gi pool, 5% of 10Gi volume) — the volume, not the pool, is the bound.
+      - matchRegex:
+          path: data["my.cnf"]
+          pattern: (?m)^innodb_log_file_size=512M$
+      - matchRegex:
+          path: data["my.cnf"]
+          pattern: (?m)^max_connections=4096$
+      - matchRegex:
+          path: data["my.cnf"]
+          pattern: (?m)^key_buffer_size=128M$
+      - matchRegex:
+          path: data["my.cnf"]
+          pattern: (?m)^tmp_table_size=512M$
+      - matchRegex:
+          path: data["my.cnf"]
+          pattern: (?m)^read_rnd_buffer_size=16384K$
+      - matchRegex:
+          path: data["my.cnf"]
+          pattern: (?m)^table_open_cache=40714$
+      - matchRegex:
+          path: data["my.cnf"]
+          pattern: (?m)^thread_pool_size=4$
+      - matchRegex:
+          path: data["my.cnf"]
+          pattern: (?m)^innodb_read_io_threads=4$
+
+  # An explicit resources block must win over the preset, the same way it
+  # does for the MariaDB CR's own resource stanza.
+  - it: derives sizing from an explicit resources override rather than the preset
+    release:
+      name: mariadb-test
+      namespace: tenant-test
+    set:
+      resourcesPreset: t1.nano
+      resources:
+        cpu: "2"
+        memory: 4Gi
+    asserts:
+      - matchRegex:
+          path: data["my.cnf"]
+          pattern: (?m)^innodb_buffer_pool_size=2048M$
+      - matchRegex:
+          path: data["my.cnf"]
+          pattern: (?m)^innodb_log_file_size=512M$
+      - matchRegex:
+          path: data["my.cnf"]
+          pattern: (?m)^max_connections=1024$
+      - matchRegex:
+          path: data["my.cnf"]
+          pattern: (?m)^key_buffer_size=128M$
+      - matchRegex:
+          path: data["my.cnf"]
+          pattern: (?m)^table_open_cache=16384$
+      - matchRegex:
+          path: data["my.cnf"]
+          pattern: (?m)^thread_pool_size=2$
+
+  # The redo log is bounded by the buffer pool and by the volume, and is
+  # never allowed past the 4096M the chart shipped before.
+  - it: caps the redo log at the previously shipped size on a large volume
+    release:
+      name: mariadb-test
+      namespace: tenant-test
+    set:
+      resourcesPreset: m1.large
+      size: 500Gi
+    asserts:
+      - matchRegex:
+          path: data["my.cnf"]
+          pattern: (?m)^innodb_log_file_size=4096M$
+
+  # A small volume must hold the redo log down even when memory is plentiful,
+  # so first boot never preallocates a large fraction of the data volume.
+  - it: lets a small volume bound the redo log below the buffer pool
+    release:
+      name: mariadb-test
+      namespace: tenant-test
+    set:
+      resourcesPreset: m1.large
+      size: 4Gi
+    asserts:
+      # 5% of the 4Gi volume is 204M — above the 96M floor and far below the
+      # 16Gi buffer pool, so the volume fraction is the bound that lands.
+      - matchRegex:
+          path: data["my.cnf"]
+          pattern: (?m)^innodb_log_file_size=204M$
+
+  # The buffer pool is the one derived value with no upper bound, so an
+  # instance with at least 128Gi of memory is sized above the 60G the chart
+  # hardcoded before. That is the intent — half of a limit the instance has,
+  # rather than a number pinned to the host the old file was written for.
+  - it: sizes the buffer pool past the old hardcoded 60G on the largest presets
+    release:
+      name: mariadb-test
+      namespace: tenant-test
+    set:
+      resourcesPreset: m1.4xlarge
+    asserts:
+      # Half of 256Gi. The old file would have left this instance on 60G.
+      - matchRegex:
+          path: data["my.cnf"]
+          pattern: (?m)^innodb_buffer_pool_size=131072M$
+
+  # Settings that are not a memory allocation or a thread count are left
+  # exactly as they were — they encode durability and storage behaviour the
+  # chart cannot derive from the pod's size.
+  - it: leaves behavioural settings untouched
+    release:
+      name: mariadb-test
+      namespace: tenant-test
+    asserts:
+      - matchRegex:
+          path: data["my.cnf"]
+          pattern: (?m)^sql-mode=NO_ENGINE_SUBSTITUTION$
+      - matchRegex:
+          path: data["my.cnf"]
+          pattern: (?m)^innodb_flush_method=O_DIRECT_NO_FSYNC$
+      - matchRegex:
+          path: data["my.cnf"]
+          pattern: (?m)^innodb_flush_log_at_trx_commit=2$
+      - matchRegex:
+          path: data["my.cnf"]
+          pattern: (?m)^innodb_io_capacity=10000$
+      - matchRegex:
+          path: data["my.cnf"]
+          pattern: (?m)^innodb_fast_shutdown=0$
diff --git a/packages/apps/mariadb/tests/root_password_ignored_test.yaml b/packages/apps/mariadb/tests/root_password_ignored_test.yaml
new file mode 100644
index 0000000000..36fadec97e
--- /dev/null
+++ b/packages/apps/mariadb/tests/root_password_ignored_test.yaml
@@ -0,0 +1,51 @@
+suite: root password is always chart-generated, never taken from values
+
+# root is special: the operator applies it once at datadir bootstrap via
+# rootPasswordSecretKeyRef, so a value-supplied root password would be a
+# plaintext credential in tenant values that cannot even be rotated. The chart
+# forces root to a chart-generated password by overwriting any supplied entry
+# (`set $usersWithRoot "root" dict`). Two independent facts are pinned. (1) A value
+# that tries to set root's password is ignored and the Secret carries a freshly
+# generated one; this holds because the generation loop never reads a supplied
+# password for ANY user, so a mutation that only restores root's pass-through
+# (guarding `set ... dict`) does not redden it -- that half is the general rule
+# credentials_test.yaml covers. (2) The `set $usersWithRoot "root" dict` line's own
+# job is to force root into the generated set even when the tenant never declares
+# it: the second test declares no root and asserts the Secret still carries a
+# generated root, so deleting that line drops root from the Secret and reddens it.
+
+templates:
+  - templates/secret.yaml
+
+release:
+  name: mdb-test
+  namespace: tenant-test
+
+tests:
+  - it: ignores a value-supplied root password and generates one instead
+    set:
+      users:
+        root:
+          maxUserConnections: 10
+          password: this-is-a-supplied-root-password-not-generated
+    asserts:
+      - matchRegex:
+          path: stringData.root
+          pattern: ^[a-zA-Z0-9]{16}$
+      - notMatchRegex:
+          path: stringData.root
+          pattern: supplied
+
+  # The `set $usersWithRoot "root" dict` line forces root into the generated set
+  # even when the tenant never declares it. Declare no root and pin that the Secret
+  # still carries a generated root password; deleting the line drops root from the
+  # Secret entirely, reddening this — the specific mutation the header credits.
+  - it: generates a root password even when root is not declared in users
+    set:
+      users:
+        app:
+          maxUserConnections: 10
+    asserts:
+      - matchRegex:
+          path: stringData.root
+          pattern: ^[a-zA-Z0-9]{16}$
diff --git a/packages/apps/mariadb/tests/startup_probe_test.yaml b/packages/apps/mariadb/tests/startup_probe_test.yaml
new file mode 100644
index 0000000000..d6df7e0f41
--- /dev/null
+++ b/packages/apps/mariadb/tests/startup_probe_test.yaml
@@ -0,0 +1,52 @@
+suite: MariaDB startup probe budget
+
+# Regression cover for the widened startup budget. The rationale lives with
+# the field itself, in templates/mariadb.yaml.
+
+templates:
+  - templates/mariadb.yaml
+
+tests:
+  - it: widens the startup probe budget for a single-replica instance
+    release:
+      name: mariadb-test
+      namespace: tenant-test
+    set:
+      replicas: 1
+    asserts:
+      - equal:
+          path: spec.startupProbe.failureThreshold
+          value: 30
+
+  - it: widens the startup probe budget for a replicated instance
+    release:
+      name: mariadb-test
+      namespace: tenant-test
+    set:
+      replicas: 2
+    asserts:
+      - equal:
+          path: spec.startupProbe.failureThreshold
+          value: 30
+
+  - it: leaves liveness and readiness probes to the operator defaults
+    release:
+      name: mariadb-test
+      namespace: tenant-test
+    asserts:
+      - notExists:
+          path: spec.livenessProbe
+      - notExists:
+          path: spec.readinessProbe
+
+  - it: overrides only thresholds so the operator keeps its own probe handler
+    release:
+      name: mariadb-test
+      namespace: tenant-test
+    asserts:
+      - notExists:
+          path: spec.startupProbe.exec
+      - notExists:
+          path: spec.startupProbe.httpGet
+      - notExists:
+          path: spec.startupProbe.tcpSocket
diff --git a/packages/apps/mariadb/tests/tenant_projection_test.yaml b/packages/apps/mariadb/tests/tenant_projection_test.yaml
new file mode 100644
index 0000000000..b297b35120
--- /dev/null
+++ b/packages/apps/mariadb/tests/tenant_projection_test.yaml
@@ -0,0 +1,103 @@
+suite: mariadb TenantProjection sentinel
+
+# The chart renders one TenantProjection per release: the declaration that tells
+# the CA-extraction controller to lift ca.crt out of the operator's key-free
+# <release>-ca-bundle into the tenant-readable <release>.tenant-ca projection.
+#
+# The load-bearing invariant is the ABSENCE of ownerReferences. The sentinel must
+# carry none — it owns the projection, and it is itself owned only through the
+# helm.toolkit.fluxcd.io/name label Flux stamps, which is how the lineage webhook
+# resolves the application. An ownerReference here would short-circuit that walk
+# and silently break the tenant's read path (pkg/lineage/lineage.go).
+
+release:
+  name: my-mariadb
+  namespace: tenant-test
+
+templates:
+  - templates/tenant-projection.yaml
+
+tests:
+  - it: renders exactly one TenantProjection named after the release
+    asserts:
+      - hasDocuments:
+          count: 1
+      - isKind:
+          of: TenantProjection
+      - equal:
+          path: apiVersion
+          value: internal.cozystack.io/v1alpha1
+      - equal:
+          path: metadata.name
+          value: my-mariadb-ca
+
+  # The source is the operator's own ca-bundle rather than the cert-manager CA
+  # Secret: it is key-free already and it exists under both tls.issuer values,
+  # whereas the cert-manager CA Secret only renders under tls.issuer:
+  # cert-manager (see tls_test.yaml / certmanager.yaml).
+  - it: declares a CACert projection of the operator's key-free CA bundle
+    asserts:
+      - equal:
+          path: spec.projections[0].type
+          value: CACert
+      - equal:
+          path: spec.projections[0].sourceSecretName
+          value: my-mariadb-ca-bundle
+      - equal:
+          path: spec.projections[0].sourceKey
+          value: ca.crt
+
+  # The invariant the lineage chain depends on: no ownerReferences, so the
+  # helm-label fallback resolves the application. Pinned so a future edit adding
+  # one reddens here instead of silently breaking tenant reads.
+  - it: carries no ownerReferences
+    asserts:
+      - notExists:
+          path: metadata.ownerReferences
+
+  # Ungated: unlike nats/qdrant, TLS is always served here (see the tls.issuer
+  # discussion in the README), so the source Secret exists for every release
+  # regardless of tls.issuer. Being ungated is the projection's whole contract,
+  # so every issuer state is spelled out. One case setting the chart default
+  # would assert the same branch the cases above already cover, and hiding the
+  # sentinel behind the cert-manager gate would still pass it.
+  - it: renders under the default issuer
+    asserts:
+      - hasDocuments:
+          count: 1
+
+  - it: renders under tls.issuer=operator
+    set:
+      tls:
+        issuer: operator
+    asserts:
+      - hasDocuments:
+          count: 1
+
+  - it: renders under tls.issuer=cert-manager
+    set:
+      tls:
+        issuer: cert-manager
+    asserts:
+      - hasDocuments:
+          count: 1
+
+  # The chart resolves the issuer through a helper that treats an explicit null
+  # as unset, so this is a third state rather than a spelling of the default.
+  - it: renders when tls is explicitly null
+    set:
+      tls: null
+    asserts:
+      - hasDocuments:
+          count: 1
+
+  - it: renders the source and target names from the release, not a fixed string
+    release:
+      name: other-mariadb
+    asserts:
+      - equal:
+          path: metadata.name
+          value: other-mariadb-ca
+      - equal:
+          path: spec.projections[0].sourceSecretName
+          value: other-mariadb-ca-bundle
diff --git a/packages/apps/mariadb/tests/tls_test.yaml b/packages/apps/mariadb/tests/tls_test.yaml
new file mode 100644
index 0000000000..2f5f4548a0
--- /dev/null
+++ b/packages/apps/mariadb/tests/tls_test.yaml
@@ -0,0 +1,1573 @@
+suite: TLS configuration for MariaDB
+
+# "Managed" means the chart issues the CA and server certificate; "unmanaged"
+# means the operator keeps its own. Neither enforces: enforcement is opt-in
+# through tls.required and defaults to false. TLS itself is on in every row —
+# the operator serves it regardless — so no row here turns TLS off.
+#
+# Managing TLS is opt-in and is NOT derived from external:
+#   1. external=false, tls.issuer unset  → unmanaged
+#   2. external=true,  tls.issuer unset  → unmanaged (external does not imply it)
+#   3. external=true,  tls.issuer=operator  → unmanaged (explicit, same result)
+#   4. external=any,   tls.issuer=cert-manager   → managed (the only way in)
+#
+# Scope caveat for the backup cases below. They pin the client flags in the
+# rendered script, and that script does not run today: the CronJob reads the
+# root password from Secret <release> key root-password, while the chart
+# renders <release>-credentials key root, so the pod never leaves
+# CreateContainerConfigError. That mismatch predates this branch and is not
+# fixed here — fixing it would start scheduled dumps on every instance with
+# backups enabled. The cases stay because the flag defect they cover was real:
+# the MariaDB client rejects the MySQL-only --ssl-mode at argument parsing, so
+# whenever the job is repaired or removed, these are what stop it coming back.
+# Until then, read them as pinning the template, not as covering a live path.
+
+release:
+  name: my-mariadb
+  namespace: tenant-test
+
+set:
+  _cluster:
+    cluster-domain: cluster.local
+  _namespace:
+    host: example.com
+
+tests:
+  # -------------------------------------------------------------------
+  # Case 1: external=false, tls.issuer unset → no TLS resources
+  # -------------------------------------------------------------------
+  - it: "certmanager.yaml renders no documents when external=false and tls.issuer is unset"
+    templates:
+      - templates/certmanager.yaml
+    set:
+      external: false
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  # spec.tls.enabled is true in every configuration, because the operator
+  # substitutes TLS{Enabled: true} whenever spec.tls is absent — omitting the
+  # block does not disable TLS, it only hides that TLS is on. Enforcement is
+  # stated explicitly in every configuration too, defaulting to false. What the
+  # unmanaged case must NOT carry is the certificate references: those select
+  # chart-owned material that does not exist there.
+  - it: "mariadb.yaml declares TLS enabled but unmanaged when external=false and tls.issuer is unset"
+    templates:
+      - templates/mariadb.yaml
+    set:
+      external: false
+    asserts:
+      - equal:
+          path: spec.tls.enabled
+          value: true
+      - equal:
+          path: spec.tls.required
+          value: false
+      - notExists:
+          path: spec.tls.serverCertSecretRef
+      - notExists:
+          path: spec.tls.serverCASecretRef
+
+  # Enforcement is not gated on managed TLS. It works against the operator's own
+  # certificates, so dropping it here would accept required: true and silently
+  # not enforce — the worst outcome for a setting that exists to refuse
+  # unprotected connections.
+  - it: "unmanaged TLS still honours an explicit required=true"
+    templates:
+      - templates/mariadb.yaml
+    set:
+      external: false
+      tls:
+        required: true
+    asserts:
+      - equal:
+          path: spec.tls.enabled
+          value: true
+      - equal:
+          path: spec.tls.required
+          value: true
+      - notExists:
+          path: spec.tls.serverCertSecretRef
+
+  - it: "operator-issued TLS honours required=true even with issuer set explicitly"
+    templates:
+      - templates/mariadb.yaml
+    set:
+      external: true
+      tls:
+        issuer: operator
+        required: true
+    asserts:
+      - equal:
+          path: spec.tls.required
+          value: true
+      - notExists:
+          path: spec.tls.serverCASecretRef
+
+  # -------------------------------------------------------------------
+  # Case 2: tls.issuer=cert-manager → managed. external only adds the external SAN;
+  # it does not select managed TLS on its own.
+  # -------------------------------------------------------------------
+  - it: "certmanager.yaml renders 4 documents (selfsigned Issuer, CA Cert, CA Issuer, leaf Cert) when tls.issuer=cert-manager"
+    templates:
+      - templates/certmanager.yaml
+    set:
+      tls:
+        issuer: cert-manager
+      external: true
+    asserts:
+      - hasDocuments:
+          count: 4
+
+  - it: "first document is a selfsigned Issuer when TLS is managed"
+    templates:
+      - templates/certmanager.yaml
+    set:
+      tls:
+        issuer: cert-manager
+      external: true
+    documentIndex: 0
+    asserts:
+      - equal:
+          path: apiVersion
+          value: cert-manager.io/v1
+      - equal:
+          path: kind
+          value: Issuer
+      - equal:
+          path: metadata.name
+          value: my-mariadb-selfsigned
+      - exists:
+          path: spec.selfSigned
+
+  - it: "second document is the CA Certificate when TLS is managed"
+    templates:
+      - templates/certmanager.yaml
+    set:
+      tls:
+        issuer: cert-manager
+      external: true
+    documentIndex: 1
+    asserts:
+      - equal:
+          path: kind
+          value: Certificate
+      - equal:
+          path: metadata.name
+          value: my-mariadb-ca
+      - equal:
+          path: spec.isCA
+          value: true
+      - equal:
+          path: spec.secretName
+          value: my-mariadb.ca-tls
+      - equal:
+          path: spec.issuerRef.name
+          value: my-mariadb-selfsigned
+
+  - it: "third document is the CA Issuer when TLS is managed"
+    templates:
+      - templates/certmanager.yaml
+    set:
+      tls:
+        issuer: cert-manager
+      external: true
+    documentIndex: 2
+    asserts:
+      - equal:
+          path: kind
+          value: Issuer
+      - equal:
+          path: metadata.name
+          value: my-mariadb-ca
+      - equal:
+          path: spec.ca.secretName
+          value: my-mariadb.ca-tls
+
+  - it: "fourth document is the leaf Certificate when TLS is managed"
+    templates:
+      - templates/certmanager.yaml
+    set:
+      tls:
+        issuer: cert-manager
+      external: true
+    documentIndex: 3
+    asserts:
+      - equal:
+          path: kind
+          value: Certificate
+      - equal:
+          path: metadata.name
+          value: my-mariadb-tls
+      - equal:
+          path: spec.secretName
+          value: my-mariadb.tls
+      - equal:
+          path: spec.isCA
+          value: false
+      - equal:
+          path: spec.issuerRef.name
+          value: my-mariadb-ca
+      - equal:
+          path: spec.issuerRef.kind
+          value: Issuer
+
+  - it: "leaf Certificate SAN list contains internal primary and secondary service names when external=true"
+    templates:
+      - templates/certmanager.yaml
+    set:
+      tls:
+        issuer: cert-manager
+      external: true
+    documentIndex: 3
+    asserts:
+      - contains:
+          path: spec.dnsNames
+          content: "my-mariadb"
+      - contains:
+          path: spec.dnsNames
+          content: "my-mariadb.tenant-test.svc"
+      - contains:
+          path: spec.dnsNames
+          content: "my-mariadb.tenant-test.svc.cluster.local"
+      - contains:
+          path: spec.dnsNames
+          content: "my-mariadb-primary"
+      - contains:
+          path: spec.dnsNames
+          content: "my-mariadb-primary.tenant-test.svc"
+      - contains:
+          path: spec.dnsNames
+          content: "my-mariadb-primary.tenant-test.svc.cluster.local"
+      - contains:
+          path: spec.dnsNames
+          content: "my-mariadb-secondary"
+      - contains:
+          path: spec.dnsNames
+          content: "my-mariadb-secondary.tenant-test.svc"
+      - contains:
+          path: spec.dnsNames
+          content: "my-mariadb-secondary.tenant-test.svc.cluster.local"
+      - contains:
+          path: spec.dnsNames
+          content: "localhost"
+      - contains:
+          path: spec.dnsNames
+          content: "*.my-mariadb-internal.tenant-test.svc"
+      - contains:
+          path: spec.dnsNames
+          content: "*.my-mariadb-internal.tenant-test.svc.cluster.local"
+
+  # The full SAN set, pinned exactly. The operator cannot issue this certificate
+  # for us — its TLS spec has no alt-names field, so the external hostname could
+  # never be included — which means this list is maintained by hand against the
+  # operator's service naming.
+  #
+  # What this pins is the template against an accidental edit: lengthEqual makes
+  # it catch an addition as well as a removal. What it cannot do is notice the
+  # operator renaming a service, because the expected list here is a copy of what
+  # the template produces, not of what the operator expects. That gap needs an
+  # e2e case that actually completes a handshake.
+  - it: "leaf Certificate SAN set is exactly the expected list"
+    templates:
+      - templates/certmanager.yaml
+    documentIndex: 3
+    set:
+      external: true
+      tls:
+        issuer: cert-manager
+    asserts:
+      - lengthEqual:
+          path: spec.dnsNames
+          count: 18
+      - equal:
+          path: spec.dnsNames
+          value:
+            - localhost
+            - "*.my-mariadb-internal"
+            - "*.my-mariadb-internal.tenant-test"
+            - "*.my-mariadb-internal.tenant-test.svc"
+            - "*.my-mariadb-internal.tenant-test.svc.cluster.local"
+            - my-mariadb
+            - my-mariadb.tenant-test
+            - my-mariadb.tenant-test.svc
+            - my-mariadb.tenant-test.svc.cluster.local
+            - my-mariadb-primary
+            - my-mariadb-primary.tenant-test
+            - my-mariadb-primary.tenant-test.svc
+            - my-mariadb-primary.tenant-test.svc.cluster.local
+            - my-mariadb-secondary
+            - my-mariadb-secondary.tenant-test
+            - my-mariadb-secondary.tenant-test.svc
+            - my-mariadb-secondary.tenant-test.svc.cluster.local
+            - my-mariadb.example.com
+
+  - it: "leaf Certificate SAN list includes external hostname when external=true"
+    templates:
+      - templates/certmanager.yaml
+    set:
+      tls:
+        issuer: cert-manager
+      external: true
+    documentIndex: 3
+    asserts:
+      - contains:
+          path: spec.dnsNames
+          content: "my-mariadb.example.com"
+
+  - it: "mariadb.yaml sets spec.tls.enabled=true and serverCertSecretRef + serverCASecretRef pointing to chart secrets when external=true"
+    templates:
+      - templates/mariadb.yaml
+    set:
+      tls:
+        issuer: cert-manager
+      external: true
+    asserts:
+      - equal:
+          path: spec.tls.enabled
+          value: true
+      - equal:
+          path: spec.tls.required
+          value: false
+      - equal:
+          path: spec.tls.serverCertSecretRef.name
+          value: my-mariadb.tls
+      - equal:
+          path: spec.tls.serverCASecretRef.name
+          value: my-mariadb.ca-tls
+      - notExists:
+          path: spec.tls.serverCertIssuerRef
+
+  # -------------------------------------------------------------------
+  # Case 3: external=true, tls.issuer=operator → explicit override wins
+  # -------------------------------------------------------------------
+  - it: "certmanager.yaml renders no documents when tls.issuer=operator even if external=true"
+    templates:
+      - templates/certmanager.yaml
+    set:
+      external: true
+      tls:
+        issuer: operator
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  # tls.issuer: operator means "do not manage TLS", never "turn TLS off" — the
+  # operator cannot be told to turn it off. Rendering enabled: false here would
+  # be the one change that actually downgrades an existing instance.
+  - it: "mariadb.yaml keeps TLS enabled but unmanaged when tls.issuer=operator even if external=true"
+    templates:
+      - templates/mariadb.yaml
+    set:
+      external: true
+      tls:
+        issuer: operator
+    asserts:
+      - equal:
+          path: spec.tls.enabled
+          value: true
+      - equal:
+          path: spec.tls.required
+          value: false
+      - notExists:
+          path: spec.tls.serverCertSecretRef
+      - notExists:
+          path: spec.tls.serverCASecretRef
+
+  # -------------------------------------------------------------------
+  # Case 4: external=false, tls.issuer=cert-manager → explicit override wins
+  # -------------------------------------------------------------------
+  - it: "certmanager.yaml renders 4 documents when tls.issuer=cert-manager even if external=false"
+    templates:
+      - templates/certmanager.yaml
+    set:
+      external: false
+      tls:
+        issuer: cert-manager
+    asserts:
+      - hasDocuments:
+          count: 4
+
+  - it: "leaf Certificate SAN list does NOT include external hostname when external=false but tls.issuer=cert-manager"
+    templates:
+      - templates/certmanager.yaml
+    set:
+      external: false
+      tls:
+        issuer: cert-manager
+    documentIndex: 3
+    asserts:
+      - notContains:
+          path: spec.dnsNames
+          content: "my-mariadb.example.com"
+      - contains:
+          path: spec.dnsNames
+          content: "my-mariadb"
+      - contains:
+          path: spec.dnsNames
+          content: "my-mariadb-primary"
+      - contains:
+          path: spec.dnsNames
+          content: "my-mariadb-secondary"
+      - contains:
+          path: spec.dnsNames
+          content: "localhost"
+      - contains:
+          path: spec.dnsNames
+          content: "*.my-mariadb-internal.tenant-test.svc"
+      - contains:
+          path: spec.dnsNames
+          content: "*.my-mariadb-internal.tenant-test.svc.cluster.local"
+
+  - it: "mariadb.yaml sets spec.tls.enabled=true with both cert refs when tls.issuer=cert-manager even if external=false"
+    templates:
+      - templates/mariadb.yaml
+    set:
+      external: false
+      tls:
+        issuer: cert-manager
+    asserts:
+      - equal:
+          path: spec.tls.enabled
+          value: true
+      - equal:
+          path: spec.tls.required
+          value: false
+      - equal:
+          path: spec.tls.serverCertSecretRef.name
+          value: my-mariadb.tls
+      - equal:
+          path: spec.tls.serverCASecretRef.name
+          value: my-mariadb.ca-tls
+      - notExists:
+          path: spec.tls.serverCertIssuerRef
+
+  # -------------------------------------------------------------------
+  # Naming: resource names are derived from release name
+  # -------------------------------------------------------------------
+  - it: "selfsigned Issuer name uses release name as prefix"
+    templates:
+      - templates/certmanager.yaml
+    set:
+      tls:
+        issuer: cert-manager
+      external: true
+    documentIndex: 0
+    asserts:
+      - matchRegex:
+          path: metadata.name
+          pattern: "^my-mariadb-"
+
+  - it: "CA Certificate duration is set to 5 years"
+    templates:
+      - templates/certmanager.yaml
+    set:
+      tls:
+        issuer: cert-manager
+      external: true
+    documentIndex: 1
+    asserts:
+      - equal:
+          path: spec.duration
+          value: "43800h"
+
+  - it: "CA Certificate privateKey.rotationPolicy is Never"
+    templates:
+      - templates/certmanager.yaml
+    set:
+      tls:
+        issuer: cert-manager
+      external: true
+    documentIndex: 1
+    asserts:
+      - equal:
+          path: spec.privateKey.rotationPolicy
+          value: Never
+
+  - it: "leaf Certificate privateKey.rotationPolicy is Always"
+    templates:
+      - templates/certmanager.yaml
+    set:
+      tls:
+        issuer: cert-manager
+      external: true
+    documentIndex: 3
+    asserts:
+      - equal:
+          path: spec.privateKey.rotationPolicy
+          value: Always
+
+  # Both, because cert-manager rejects duration <= renewBefore at admission:
+  # pinning only one lets the other drift into a pair that renders but will not
+  # apply.
+  - it: "leaf Certificate has duration and renewBefore set"
+    templates:
+      - templates/certmanager.yaml
+    set:
+      tls:
+        issuer: cert-manager
+      external: true
+    documentIndex: 3
+    asserts:
+      - equal:
+          path: spec.renewBefore
+          value: "720h"
+      - equal:
+          path: spec.duration
+          value: "8760h"
+
+  # -------------------------------------------------------------------
+  # NB6: dashboard-resourcemap.yaml exposure is TLS-state independent.
+  #
+  # The tenant grant used to follow the issuer and hand out the
+  # cert-manager Secrets whenever TLS was on. Those Secrets carry private
+  # keys, so the grant is now a flat invariant instead: no TLS state may put
+  # them in the Role. All four issuer/external combinations are checked so a
+  # regression cannot hide in the branch that happens to enable TLS.
+  # -------------------------------------------------------------------
+  - it: "RBAC excludes TLS secrets when external=false and tls.issuer unset"
+    templates:
+      - templates/dashboard-resourcemap.yaml
+    set:
+      external: false
+    documentIndex: 0
+    asserts:
+      - notContains:
+          path: rules[1].resourceNames
+          content: my-mariadb.tls
+      - notContains:
+          path: rules[1].resourceNames
+          content: my-mariadb.ca-tls
+
+  - it: "RBAC excludes TLS secrets when external=true and tls.issuer unset"
+    templates:
+      - templates/dashboard-resourcemap.yaml
+    set:
+      external: true
+    documentIndex: 0
+    asserts:
+      - notContains:
+          path: rules[1].resourceNames
+          content: my-mariadb.tls
+      - notContains:
+          path: rules[1].resourceNames
+          content: my-mariadb.ca-tls
+
+  - it: "RBAC excludes TLS secrets when tls.issuer=operator even if external=true"
+    templates:
+      - templates/dashboard-resourcemap.yaml
+    set:
+      external: true
+      tls:
+        issuer: operator
+    documentIndex: 0
+    asserts:
+      - notContains:
+          path: rules[1].resourceNames
+          content: my-mariadb.tls
+      - notContains:
+          path: rules[1].resourceNames
+          content: my-mariadb.ca-tls
+
+  - it: "RBAC excludes TLS secrets when tls.issuer=cert-manager even if external=false"
+    templates:
+      - templates/dashboard-resourcemap.yaml
+    set:
+      external: false
+      tls:
+        issuer: cert-manager
+    documentIndex: 0
+    asserts:
+      - notContains:
+          path: rules[1].resourceNames
+          content: my-mariadb.tls
+      - notContains:
+          path: rules[1].resourceNames
+          content: my-mariadb.ca-tls
+
+  # -------------------------------------------------------------------
+  # B2: issuer resolution must survive explicit tls=null without panic
+  # -------------------------------------------------------------------
+  - it: "issuer resolution survives explicit tls=null without panic (certmanager renders 0 docs)"
+    templates:
+      - templates/certmanager.yaml
+    set:
+      tls: null
+      external: false
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  # tls: null is the same as unset, and unset no longer means "follow external".
+  - it: "issuer resolution survives explicit tls=null with external=true (stays operator-issued)"
+    templates:
+      - templates/certmanager.yaml
+    set:
+      tls: null
+      external: true
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  # -------------------------------------------------------------------
+  # B1: CA cert usages — signing + cert sign + crl sign, no key encipherment
+  # crl sign added for conventional compliance (RFC 5280).
+  # -------------------------------------------------------------------
+  - it: "CA cert has correct usages (signing + cert sign + crl sign)"
+    templates:
+      - templates/certmanager.yaml
+    set:
+      tls:
+        issuer: cert-manager
+    documentIndex: 1
+    asserts:
+      - notContains:
+          path: spec.usages
+          content: key encipherment
+      - contains:
+          path: spec.usages
+          content: signing
+      - contains:
+          path: spec.usages
+          content: cert sign
+      - contains:
+          path: spec.usages
+          content: crl sign
+      - lengthEqual:
+          path: spec.usages
+          count: 3
+
+  # -------------------------------------------------------------------
+  # K1: crl sign in CA cert usages (RFC 5280 conventional compliance)
+  # -------------------------------------------------------------------
+  - it: "CA cert usages contain crl sign"
+    templates:
+      - templates/certmanager.yaml
+    set:
+      tls:
+        issuer: cert-manager
+    documentIndex: 1
+    asserts:
+      - contains:
+          path: spec.usages
+          content: crl sign
+
+  # -------------------------------------------------------------------
+  # NB7: cert-manager Secret names are pinned. They are referenced by the
+  # operator (serverCASecretRef / serverCertSecretRef) and by the backup
+  # CronJob volume, so a rename must break loudly here rather than at runtime.
+  # -------------------------------------------------------------------
+  - it: "leaf cert secretName is pinned"
+    templates:
+      - templates/certmanager.yaml
+    set:
+      tls:
+        issuer: cert-manager
+    documentIndex: 3
+    asserts:
+      - equal:
+          path: spec.secretName
+          value: my-mariadb.tls
+
+  - it: "CA cert secretName is pinned"
+    templates:
+      - templates/certmanager.yaml
+    set:
+      tls:
+        issuer: cert-manager
+    documentIndex: 1
+    asserts:
+      - equal:
+          path: spec.secretName
+          value: my-mariadb.ca-tls
+
+  # The tls.required default and both explicit overrides are covered together
+  # with the unmanaged case, further down under "Tenant exposure".
+
+  # -------------------------------------------------------------------
+  # B4: external absent (no value set) must not append an external SAN
+  # The guard `| default false` ensures omitted external never produces
+  # a malformed entry like "my-mariadb." in the SAN list.
+  # -------------------------------------------------------------------
+  - it: "leaf cert SAN list has no external entry when external is not set"
+    templates:
+      - templates/certmanager.yaml
+    set:
+      tls:
+        issuer: cert-manager
+    documentIndex: 3
+    asserts:
+      - notContains:
+          path: spec.dnsNames
+          content: "my-mariadb.example.com"
+
+  # -------------------------------------------------------------------
+  # B2: tls.issuer unset resolves to the operator
+  # kindIs "invalid" catches the unset case. The schema constrains the field to
+  # the enum, so an explicit tls.issuer: null is rejected before rendering and
+  # only the unset path reaches the helper. This says nothing about tls: null —
+  # blanking the whole map is a different value, is allowed, and is covered
+  # separately above.
+  # -------------------------------------------------------------------
+  # external no longer implies managed TLS. Deriving it would swap the CA of an
+  # existing external instance on the next platform upgrade, with no action from
+  # its owner, and without raising the security floor — those instances already
+  # serve TLS under the operator's CA.
+  - it: "tls.issuer unset with external=true does NOT manage TLS"
+    templates:
+      - templates/certmanager.yaml
+    set:
+      external: true
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  - it: "tls.issuer unset with external=false renders no chart certificates"
+    templates:
+      - templates/certmanager.yaml
+    set:
+      external: false
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  # -------------------------------------------------------------------
+  # NB: the leaf is a server certificate and nothing else. The operator issues
+  # its own server certificates with server auth alone and keeps client auth on
+  # separate client certificates, so the chart matches that split: a user
+  # declared REQUIRE X509 accepts any client certificate signed by a trusted
+  # CA, and client auth here would make the server key usable as one.
+  # digital signature is what the ECDSA key needs for the ECDHE signature;
+  # key encipherment is RSA key transport and is inapplicable to P-256.
+  # Absence of CA-only EKUs (cert sign, signing) is also verified.
+  # -------------------------------------------------------------------
+  - it: "leaf cert usages are exactly server auth and digital signature"
+    templates:
+      - templates/certmanager.yaml
+    set:
+      tls:
+        issuer: cert-manager
+    documentIndex: 3
+    asserts:
+      - contains:
+          path: spec.usages
+          content: server auth
+      - contains:
+          path: spec.usages
+          content: digital signature
+      - notContains:
+          path: spec.usages
+          content: client auth
+      - notContains:
+          path: spec.usages
+          content: key encipherment
+      - notContains:
+          path: spec.usages
+          content: cert sign
+      - notContains:
+          path: spec.usages
+          content: signing
+      - lengthEqual:
+          path: spec.usages
+          count: 2
+
+  # -------------------------------------------------------------------
+  # C: digital signature in leaf cert usages
+  # Required for TLS 1.3 and TLS 1.2 ECDHE — strict clients (Go
+  # crypto/tls, BoringSSL) reject handshakes without this usage.
+  # -------------------------------------------------------------------
+  - it: "leaf cert usages contain digital signature"
+    templates:
+      - templates/certmanager.yaml
+    set:
+      tls:
+        issuer: cert-manager
+    documentIndex: 3
+    asserts:
+      - contains:
+          path: spec.usages
+          content: digital signature
+
+  # -------------------------------------------------------------------
+  # tls.issuer round-trip through the helper
+  # The schema constrains the field to the enum, so anything outside it — a
+  # number, a typo — is rejected before the helper runs. What reaches the
+  # helper is one of the two strings, and it compares them as strings; unset
+  # resolves to the operator via kindIs "invalid".
+  # -------------------------------------------------------------------
+  - it: "cert-manager issuer survives the toString round-trip in the helper"
+    templates:
+      - templates/certmanager.yaml
+    set:
+      tls:
+        issuer: cert-manager
+    asserts:
+      - hasDocuments:
+          count: 4
+
+  # -------------------------------------------------------------------
+  # K2: short-form SAN variants for ndots-shortened clients
+  # <name>.<ns> (without .svc) and *.<name>-internal (without <ns>.svc)
+  # cover clients that search-domain-shorten hostnames before sending DNS
+  # queries, which can produce names that bypass the full-form SANs.
+  # -------------------------------------------------------------------
+  - it: "leaf cert SAN list contains short-form <name>.<ns> entries"
+    templates:
+      - templates/certmanager.yaml
+    set:
+      tls:
+        issuer: cert-manager
+      external: true
+    documentIndex: 3
+    asserts:
+      - contains:
+          path: spec.dnsNames
+          content: "my-mariadb.tenant-test"
+      - contains:
+          path: spec.dnsNames
+          content: "my-mariadb-primary.tenant-test"
+      - contains:
+          path: spec.dnsNames
+          content: "my-mariadb-secondary.tenant-test"
+
+  # The headless wildcard must cover the same four resolution depths as every
+  # named service. A client resolving the 3-label form (low ndots, or a search
+  # domain) presents that name at handshake time, so a gap fails verification.
+  - it: "leaf cert SAN list covers all four depths of the headless wildcard"
+    templates:
+      - templates/certmanager.yaml
+    set:
+      tls:
+        issuer: cert-manager
+      external: true
+    documentIndex: 3
+    asserts:
+      - contains:
+          path: spec.dnsNames
+          content: "*.my-mariadb-internal"
+      - contains:
+          path: spec.dnsNames
+          content: "*.my-mariadb-internal.tenant-test"
+      - contains:
+          path: spec.dnsNames
+          content: "*.my-mariadb-internal.tenant-test.svc"
+      - contains:
+          path: spec.dnsNames
+          content: "*.my-mariadb-internal.tenant-test.svc.cluster.local"
+
+  # external=true requires a hostname for the LoadBalancer SAN. Without the
+  # guard the template dereferences nil and dies with a raw Go pointer error
+  # that says nothing about which value is missing.
+  - it: "external=true without _namespace.host fails with an actionable message"
+    templates:
+      - templates/certmanager.yaml
+    set:
+      tls:
+        issuer: cert-manager
+      external: true
+      _namespace: null
+    asserts:
+      - failedTemplate:
+          errorMessage: "external is true but _namespace.host is not set"
+
+  # -------------------------------------------------------------------
+  # ECDSA: CA and leaf use ECDSA P-256
+  # Smaller keys, faster handshakes, stronger per-bit security than RSA.
+  # rotationPolicy preserved: Never for CA, Always for leaf.
+  # -------------------------------------------------------------------
+  - it: "CA cert uses ECDSA P-256 algorithm"
+    templates:
+      - templates/certmanager.yaml
+    set:
+      tls:
+        issuer: cert-manager
+    documentIndex: 1
+    asserts:
+      - equal:
+          path: spec.privateKey.algorithm
+          value: ECDSA
+      - equal:
+          path: spec.privateKey.size
+          value: 256
+
+  - it: "leaf cert uses ECDSA P-256 algorithm"
+    templates:
+      - templates/certmanager.yaml
+    set:
+      tls:
+        issuer: cert-manager
+    documentIndex: 3
+    asserts:
+      - equal:
+          path: spec.privateKey.algorithm
+          value: ECDSA
+      - equal:
+          path: spec.privateKey.size
+          value: 256
+
+  - it: "CA cert rotationPolicy is Never (ECDSA)"
+    templates:
+      - templates/certmanager.yaml
+    set:
+      tls:
+        issuer: cert-manager
+    documentIndex: 1
+    asserts:
+      - equal:
+          path: spec.privateKey.rotationPolicy
+          value: Never
+
+  - it: "leaf cert rotationPolicy is Always (ECDSA)"
+    templates:
+      - templates/certmanager.yaml
+    set:
+      tls:
+        issuer: cert-manager
+    documentIndex: 3
+    asserts:
+      - equal:
+          path: spec.privateKey.rotationPolicy
+          value: Always
+
+  # -------------------------------------------------------------------
+  # E: backup CronJob mounts the TLS trust anchor when TLS is managed.
+  # When require_secure_transport=ON, the backup mysqldump/mysql commands need
+  # SSL flags to connect. The anchor comes from the operator's ca-bundle, not
+  # from the leaf Secret — see the volume test below for why.
+  # -------------------------------------------------------------------
+  - it: "backup CronJob has tls-ca volumeMount when tls.issuer=cert-manager"
+    templates:
+      - templates/backup-cronjob.yaml
+    set:
+      tls:
+        issuer: cert-manager
+      backup:
+        enabled: true
+        s3Bucket: s3.example.org/test
+        cleanupStrategy: "--keep-last=3"
+    asserts:
+      - contains:
+          path: spec.jobTemplate.spec.template.spec.containers[0].volumeMounts
+          content:
+            mountPath: /etc/mysql-ssl
+            name: tls-ca
+            readOnly: true
+
+  # The trust anchor comes from the operator's CA bundle, not the leaf Secret:
+  # the bundle spans a CA rollover, the leaf only holds the current signer.
+  - it: "backup CronJob takes tls-ca volume from the operator CA bundle when tls.issuer=cert-manager"
+    templates:
+      - templates/backup-cronjob.yaml
+    set:
+      tls:
+        issuer: cert-manager
+      backup:
+        enabled: true
+        s3Bucket: s3.example.org/test
+        cleanupStrategy: "--keep-last=3"
+    asserts:
+      - contains:
+          path: spec.jobTemplate.spec.template.spec.volumes
+          content:
+            name: tls-ca
+            secret:
+              secretName: my-mariadb-ca-bundle
+              optional: true
+              items:
+              - key: ca.crt
+                path: ca.crt
+      # The leaf Secret holds the server private key and must never be mounted
+      # into the backup Pod. Written out in full: contains compares each list
+      # element whole, so an element missing optional: true equals nothing the
+      # template can render and the assertion passes against every mutation,
+      # including the one that swaps this exact Secret in. any: true does not
+      # help — its subset matching only reaches the top level of the element.
+      - notContains:
+          path: spec.jobTemplate.spec.template.spec.volumes
+          content:
+            name: tls-ca
+            secret:
+              secretName: my-mariadb.tls
+              optional: true
+              items:
+              - key: ca.crt
+                path: ca.crt
+
+  # These two used to assert the volume was absent when TLS is unmanaged. It is
+  # now always mounted, because the backup client always verifies. They also
+  # never actually asserted that: notContains compares whole list entries, so
+  # a partial {name: tls-ca} matched nothing and passed either way.
+  - it: "backup CronJob mounts the CA bundle when tls.issuer=operator"
+    templates:
+      - templates/backup-cronjob.yaml
+    set:
+      tls:
+        issuer: operator
+      backup:
+        enabled: true
+        s3Bucket: s3.example.org/test
+        cleanupStrategy: "--keep-last=3"
+    asserts:
+      - contains:
+          path: spec.jobTemplate.spec.template.spec.volumes
+          content:
+            name: tls-ca
+            secret:
+              secretName: my-mariadb-ca-bundle
+              optional: true
+              items:
+              - key: ca.crt
+                path: ca.crt
+
+  - it: "backup CronJob mounts the CA bundle when external=false and tls.issuer unset"
+    templates:
+      - templates/backup-cronjob.yaml
+    set:
+      external: false
+      backup:
+        enabled: true
+        s3Bucket: s3.example.org/test
+        cleanupStrategy: "--keep-last=3"
+    asserts:
+      - contains:
+          path: spec.jobTemplate.spec.template.spec.volumes
+          content:
+            name: tls-ca
+            secret:
+              secretName: my-mariadb-ca-bundle
+              optional: true
+              items:
+              - key: ca.crt
+                path: ca.crt
+      - contains:
+          path: spec.jobTemplate.spec.template.spec.containers[0].volumeMounts
+          content:
+            mountPath: /etc/mysql-ssl
+            name: tls-ca
+            readOnly: true
+
+  # -------------------------------------------------------------------
+  # Tenant read path. The trust anchor reaches the tenant as a key-free
+  # projection, never as one of the Secrets below: tenant-projection.yaml
+  # declares a CACert projection of the operator's <release>-ca-bundle, the
+  # extraction controller writes the anchor from it and stamps
+  # internal.cozystack.io/tenant-ca, and the ApplicationDefinition's
+  # secrets.include selects on that label. That selector carries no name
+  # constraint, so the label rather than the object's name is what decides
+  # tenant visibility, and neither key-bearing cert-manager Secret may carry
+  # it — nor internal.cozystack.io/tenantresource, which is what tenantsecrets
+  # actually serves on. Exclude wins over include and the
+  # ApplicationDefinition names .ca-tls and .tls there, so exclude-by-name is
+  # the backstop behind these assertions, not a substitute for them.
+  #
+  # Selected by the Secret each Certificate writes rather than by position: a
+  # documentIndex would follow the slot, so reordering this template would let
+  # a labelled key-bearing Certificate slide out from under the assertion and
+  # pass green. metadata.name cannot serve here — the CA Certificate and the CA
+  # Issuer share the name <release>-ca — so the kind is pinned separately.
+  - it: "the key-bearing CA Secret is never marked tenant-readable"
+    templates:
+      - templates/certmanager.yaml
+    set:
+      tls:
+        issuer: cert-manager
+    documentSelector:
+      path: spec.secretName
+      value: my-mariadb.ca-tls
+    asserts:
+      - isKind:
+          of: Certificate
+      - equal:
+          path: spec.isCA
+          value: true
+      - notExists:
+          path: spec.secretTemplate.labels["internal.cozystack.io/tenant-ca"]
+      - notExists:
+          path: spec.secretTemplate.labels["internal.cozystack.io/tenantresource"]
+
+  # The leaf Secret holds the server private key, and rotationPolicy: Always
+  # replaces that key on every renewal, so it is never a publication source
+  # under any issuer.
+  - it: "the key-bearing leaf Secret is never marked tenant-readable"
+    templates:
+      - templates/certmanager.yaml
+    set:
+      tls:
+        issuer: cert-manager
+    documentSelector:
+      path: spec.secretName
+      value: my-mariadb.tls
+    asserts:
+      - isKind:
+          of: Certificate
+      - equal:
+          path: spec.isCA
+          value: false
+      - notExists:
+          path: spec.secretTemplate.labels["internal.cozystack.io/tenant-ca"]
+      - notExists:
+          path: spec.secretTemplate.labels["internal.cozystack.io/tenantresource"]
+
+  # The leaf must present a non-empty Subject CN for clients that still verify
+  # against it rather than the SAN list.
+  - it: "leaf Certificate sets a commonName"
+    templates:
+      - templates/certmanager.yaml
+    set:
+      tls:
+        issuer: cert-manager
+    documentSelector:
+      path: spec.secretName
+      value: my-mariadb.tls
+    asserts:
+      - equal:
+          path: spec.commonName
+          value: my-mariadb
+
+  # Both Secrets are referenced by the MariaDB CR (serverCASecretRef /
+  # serverCertSecretRef), and the operator gates those watches on this label.
+  # Without it a cert-manager renewal is not observed until the next resync.
+  - it: "both Certificates label their Secrets for the operator watch"
+    templates:
+      - templates/certmanager.yaml
+    set:
+      tls:
+        issuer: cert-manager
+    asserts:
+      - exists:
+          path: spec.secretTemplate.labels["k8s.mariadb.com/watch"]
+        documentIndex: 1
+      - exists:
+          path: spec.secretTemplate.labels["k8s.mariadb.com/watch"]
+        documentIndex: 3
+
+  # The whole cert-manager chain is gated on the issuer, so under the operator
+  # issuer the chart renders no Certificate at all and there is no document
+  # left that could carry a tenant-read label. Zero documents is the entire
+  # statement this case can make.
+  - it: "certmanager.yaml renders no documents when tls.issuer=operator and external is unset"
+    templates:
+      - templates/certmanager.yaml
+    set:
+      tls:
+        issuer: operator
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  # -------------------------------------------------------------------
+  # Tenant exposure. The dashboard Role is the tenant-facing grant, so no CA
+  # Secret — key-bearing or not — may appear in it under any TLS state. The
+  # tenant gets the key-free tenant-ca projection instead (tenant_projection_
+  # test.yaml), never a name grant on an operator Secret.
+  # -------------------------------------------------------------------
+  - it: "dashboard Role never grants any CA Secret by name"
+    templates:
+      - templates/dashboard-resourcemap.yaml
+    documentIndex: 0
+    set:
+      tls:
+        issuer: cert-manager
+    asserts:
+      - notContains:
+          path: rules[1].resourceNames
+          content: my-mariadb.ca-tls
+      - notContains:
+          path: rules[1].resourceNames
+          content: my-mariadb.tls
+      - notContains:
+          path: rules[1].resourceNames
+          content: my-mariadb-ca-bundle
+      - contains:
+          path: rules[1].resourceNames
+          content: my-mariadb-credentials
+
+  # The absence holds regardless of issuer: this is a flat invariant, not a
+  # branch that happens to be untested under the operator issuer.
+  - it: "dashboard Role never grants the CA bundle even when TLS is unmanaged"
+    templates:
+      - templates/dashboard-resourcemap.yaml
+    documentIndex: 0
+    set:
+      tls:
+        issuer: operator
+    asserts:
+      - notContains:
+          path: rules[1].resourceNames
+          content: my-mariadb-ca-bundle
+      - notContains:
+          path: rules[1].resourceNames
+          content: my-mariadb.ca-tls
+      - notContains:
+          path: rules[1].resourceNames
+          content: my-mariadb.tls
+
+  # The CR must not advertise enforcement the server does not apply. The
+  # operator treats an absent required as false, so a schema default of true
+  # would make `kubectl get mariadb` claim plaintext is refused on an unmanaged
+  # instance where it is not.
+  - it: "unmanaged TLS advertises no enforcement in the rendered CR"
+    templates:
+      - templates/mariadb.yaml
+    set:
+      external: false
+    asserts:
+      - equal:
+          path: spec.tls.enabled
+          value: true
+      - equal:
+          path: spec.tls.required
+          value: false
+
+  # Enforcement is opt-in: it must follow the published trust anchor, not lead
+  # it. Defaulting to true would refuse plaintext connections on the next
+  # platform upgrade while the tenant still has no CA to verify the server
+  # with, and with no way to set the escape hatch beforehand.
+  - it: "managed TLS does not enforce by default"
+    templates:
+      - templates/mariadb.yaml
+    set:
+      tls:
+        issuer: cert-manager
+    asserts:
+      - equal:
+          path: spec.tls.required
+          value: false
+
+  # The kindIs "invalid" guard on required is defensive only: an explicit null
+  # never reaches the template, because the schema types the field as a boolean
+  # and rejects it first. Pin that, so the guard is not mistaken for a live path
+  # and the rejection is not silently relaxed later.
+  - it: "an explicit required=null is rejected by the schema, not rendered"
+    templates:
+      - templates/mariadb.yaml
+    set:
+      tls:
+        issuer: cert-manager
+        required: null
+    asserts:
+      - failedTemplate:
+          errorMessage: "values don't meet the specifications of the schema(s) in the following chart(s):\nmariadb:\n- at '/tls/required': got null, want boolean\n"
+
+  # The resolver maps anything that is not exactly "cert-manager" to the
+  # operator, so a misspelled issuer fails open: the instance keeps operator
+  # issuance and nothing at render time says the value was not understood. The
+  # enum is the only thing that refuses it, and it reaches both this schema and
+  # the ResourceDefinition's from one marker, so a single lost marker opens
+  # both. Pin the rejection on the side that fails quietly.
+  - it: "a misspelled tls.issuer is rejected by the schema, not resolved to the operator"
+    templates:
+      - templates/mariadb.yaml
+    set:
+      tls:
+        issuer: certmanager
+    asserts:
+      - failedTemplate:
+          errorMessage: "values don't meet the specifications of the schema(s) in the following chart(s):\nmariadb:\n- at '/tls/issuer': value must be one of 'operator', 'cert-manager'\n"
+
+  - it: "managed TLS honours an explicit required=true"
+    templates:
+      - templates/mariadb.yaml
+    set:
+      tls:
+        issuer: cert-manager
+        required: true
+    asserts:
+      - equal:
+          path: spec.tls.required
+          value: true
+
+  - it: "managed TLS preserves an explicit required=false"
+    templates:
+      - templates/mariadb.yaml
+    set:
+      tls:
+        issuer: cert-manager
+        required: false
+    asserts:
+      - equal:
+          path: spec.tls.required
+          value: false
+
+  # -------------------------------------------------------------------
+  # Cluster-domain fallback. The platform injects _cluster.cluster-domain
+  # (networking.clusterDomain, "cozy.local"), but the chart-level fallback
+  # must match it: these FQDNs land in the leaf certificate SAN list, and the
+  # backup client verifies the server hostname against exactly that list. A
+  # fallback pointing at the upstream Kubernetes default instead of the
+  # Cozystack one would silently produce certificates that fail verification.
+  # -------------------------------------------------------------------
+  # The fallback must also survive _cluster being absent entirely, not just the
+  # key being blank — otherwise `index` errors before the default is reached
+  # and the fallback is dead code.
+  - it: "leaf certificate SANs fall back to cozy.local when _cluster is null"
+    templates:
+      - templates/certmanager.yaml
+    documentIndex: 3
+    set:
+      tls:
+        issuer: cert-manager
+      _cluster: null
+    asserts:
+      - contains:
+          path: spec.dnsNames
+          content: "my-mariadb.tenant-test.svc.cozy.local"
+
+  - it: "leaf certificate SANs fall back to cozy.local when cluster-domain is unset"
+    templates:
+      - templates/certmanager.yaml
+    documentIndex: 3
+    set:
+      tls:
+        issuer: cert-manager
+      # helm-unittest deep-merges `set` over the suite defaults, so the key is
+      # blanked rather than removed to exercise the fallback branch.
+      _cluster:
+        cluster-domain: ""
+    asserts:
+      - contains:
+          path: spec.dnsNames
+          content: "my-mariadb.tenant-test.svc.cozy.local"
+      - notContains:
+          path: spec.dnsNames
+          content: "my-mariadb.tenant-test.svc.cluster.local"
+
+  # -------------------------------------------------------------------
+  # E: backup script uses MariaDB-native TLS verification flags.
+  #
+  # The backup image is alpine + mariadb-client, so the script is parsed by
+  # the MariaDB client, not the MySQL one. The two dialects differ:
+  #
+  #   MySQL 8    : --ssl-mode=VERIFY_IDENTITY
+  #   MariaDB    : --ssl-ca=<file> --ssl-verify-server-cert
+  #
+  # The MariaDB client has no --ssl-mode option at all and rejects it during
+  # argument parsing ("unknown variable 'ssl-mode=...'", exit 7) before any
+  # connection is attempted, so a single --ssl-mode occurrence fails every
+  # TLS-enabled backup run. These tests therefore assert the dialect, not the
+  # mere presence of some SSL string.
+  # -------------------------------------------------------------------
+  # A missing CA file is reported by the client only as "TLS/SSL error: No such
+  # file or directory", with no path, so the script has to name it itself.
+  - it: "backup-script Secret checks the CA file exists and names it"
+    templates:
+      - templates/backup-script.yaml
+    set:
+      backup:
+        enabled: true
+        s3Bucket: s3.example.org/test
+        cleanupStrategy: "--keep-last=3"
+    asserts:
+      # -s as well as -r: the operator drops expired certificates when building
+      # the bundle, so a fully expired CA set leaves ca.crt present but empty,
+      # and a readability-only check would fall through to the opaque client
+      # error this guard exists to replace.
+      - matchRegex:
+          path: stringData["backup.sh"]
+          pattern: '! -r /etc/mysql-ssl/ca\.crt'
+      - matchRegex:
+          path: stringData["backup.sh"]
+          pattern: '! -s /etc/mysql-ssl/ca\.crt'
+      - matchRegex:
+          path: stringData["backup.sh"]
+          pattern: 'is missing or empty'
+      # The Secret name is the "names it" half of this case, and the reason the
+      # CronJob carries MYSQL_CA_SECRET at all: the client reports a missing CA
+      # without saying which file or where it came from.
+      - matchRegex:
+          path: stringData["backup.sh"]
+          pattern: 'projected from Secret \$\{MYSQL_CA_SECRET\}'
+      # Match the whole construct, not its parts. Asserting the test expression
+      # and the message separately leaves the thing that makes it a guard —
+      # aborting — unpinned: flipping the exit status to 0, or short-circuiting
+      # the condition, keeps every substring above intact while the backup runs
+      # on regardless and can report success having dumped nothing.
+      - matchRegex:
+          path: stringData["backup.sh"]
+          pattern: 'if \[ ! -r /etc/mysql-ssl/ca\.crt \] \|\| \[ ! -s /etc/mysql-ssl/ca\.crt \]; then(.|\n)*exit 1(.|\n)*fi'
+
+  - it: "backup CronJob passes the CA Secret name to the script"
+    templates:
+      - templates/backup-cronjob.yaml
+    set:
+      backup:
+        enabled: true
+        s3Bucket: s3.example.org/test
+        cleanupStrategy: "--keep-last=3"
+    asserts:
+      - contains:
+          path: spec.jobTemplate.spec.template.spec.containers[0].env
+          content:
+            name: MYSQL_CA_SECRET
+            value: my-mariadb-ca-bundle
+
+  - it: "backup-script Secret uses MariaDB TLS verification flags when tls.issuer=cert-manager"
+    templates:
+      - templates/backup-script.yaml
+    set:
+      tls:
+        issuer: cert-manager
+      backup:
+        enabled: true
+        s3Bucket: s3.example.org/test
+        cleanupStrategy: "--keep-last=3"
+    asserts:
+      # --ssl-ca alone only supplies the trust anchor; without
+      # --ssl-verify-server-cert the MariaDB client skips hostname
+      # verification, which would silently downgrade the connection.
+      - matchRegex:
+          path: stringData["backup.sh"]
+          pattern: "--ssl-ca=/etc/mysql-ssl/ca\\.crt"
+      - matchRegex:
+          path: stringData["backup.sh"]
+          pattern: "--ssl-verify-server-cert"
+
+  # Regression guard: no MySQL-8-only option may reach the MariaDB client, in
+  # any TLS state. Anchored on the option name so both --ssl-mode=VALUE and a
+  # bare --ssl-mode are caught. All three states that reach the client are
+  # covered: both issuers, and an external instance on the default issuer.
+  - it: "backup-script Secret never emits the MySQL-only --ssl-mode option (tls.issuer=cert-manager)"
+    templates:
+      - templates/backup-script.yaml
+    set:
+      tls:
+        issuer: cert-manager
+      backup:
+        enabled: true
+        s3Bucket: s3.example.org/test
+        cleanupStrategy: "--keep-last=3"
+    asserts:
+      - notMatchRegex:
+          path: stringData["backup.sh"]
+          pattern: "--ssl-mode"
+
+  # An external instance on the default issuer is the common case,
+  # so it is the one most likely to run the backup against a TLS-enforcing
+  # server — it needs the same guarantees as the explicit path.
+  - it: "backup-script Secret uses MariaDB flags for an external instance on the default issuer"
+    templates:
+      - templates/backup-script.yaml
+    set:
+      external: true
+      backup:
+        enabled: true
+        s3Bucket: s3.example.org/test
+        cleanupStrategy: "--keep-last=3"
+    asserts:
+      - matchRegex:
+          path: stringData["backup.sh"]
+          pattern: "--ssl-ca=/etc/mysql-ssl/ca\\.crt"
+      - matchRegex:
+          path: stringData["backup.sh"]
+          pattern: "--ssl-verify-server-cert"
+      - notMatchRegex:
+          path: stringData["backup.sh"]
+          pattern: "--ssl-mode"
+
+  # Both client invocations must carry $SSL_OPTS. If only one does, that leg
+  # connects without TLS verification while the suite still looks green.
+  - it: "backup-script Secret passes SSL_OPTS to both mysql and mysqldump"
+    templates:
+      - templates/backup-script.yaml
+    set:
+      tls:
+        issuer: cert-manager
+      backup:
+        enabled: true
+        s3Bucket: s3.example.org/test
+        cleanupStrategy: "--keep-last=3"
+    asserts:
+      - matchRegex:
+          path: stringData["backup.sh"]
+          pattern: "mysql -u \"\\$MYSQL_USER\" -h \"\\$MYSQL_HOST\" \\$SSL_OPTS"
+      - matchRegex:
+          path: stringData["backup.sh"]
+          pattern: "mysqldump -u \"\\$MYSQL_USER\" -h \"\\$MYSQL_HOST\" \\$SSL_OPTS"
+
+  # The backup client verifies in every configuration. The server always serves
+  # TLS and the operator always reconciles the CA bundle, so there is nothing to
+  # gain from connecting unverified — and enforcement can be switched on
+  # independently of managed TLS, which would make an unverified backup client
+  # fail outright.
+  - it: "backup-script Secret still uses MariaDB TLS flags when tls.issuer=operator"
+    templates:
+      - templates/backup-script.yaml
+    set:
+      tls:
+        issuer: operator
+      backup:
+        enabled: true
+        s3Bucket: s3.example.org/test
+        cleanupStrategy: "--keep-last=3"
+    asserts:
+      - matchRegex:
+          path: stringData["backup.sh"]
+          pattern: "--ssl-ca=/etc/mysql-ssl/ca\\.crt"
+      - matchRegex:
+          path: stringData["backup.sh"]
+          pattern: "--ssl-verify-server-cert"
+      - notMatchRegex:
+          path: stringData["backup.sh"]
+          pattern: "--ssl-mode"
+
+  # The combination that used to break every backup run: enforcement on while
+  # TLS is unmanaged left the client with no CA and no verification flags.
+  - it: "backup-script Secret verifies when enforcement is on and TLS is unmanaged"
+    templates:
+      - templates/backup-script.yaml
+    set:
+      tls:
+        required: true
+      backup:
+        enabled: true
+        s3Bucket: s3.example.org/test
+        cleanupStrategy: "--keep-last=3"
+    asserts:
+      - matchRegex:
+          path: stringData["backup.sh"]
+          pattern: "--ssl-ca=/etc/mysql-ssl/ca\\.crt"
+      - matchRegex:
+          path: stringData["backup.sh"]
+          pattern: "--ssl-verify-server-cert"
+      - notMatchRegex:
+          path: stringData["backup.sh"]
+          pattern: 'SSL_OPTS=""'
+
+  - it: "backup CronJob mounts the CA bundle when enforcement is on and TLS is unmanaged"
+    templates:
+      - templates/backup-cronjob.yaml
+    set:
+      tls:
+        required: true
+      backup:
+        enabled: true
+        s3Bucket: s3.example.org/test
+        cleanupStrategy: "--keep-last=3"
+    asserts:
+      - contains:
+          path: spec.jobTemplate.spec.template.spec.volumes
+          content:
+            name: tls-ca
+            secret:
+              secretName: my-mariadb-ca-bundle
+              optional: true
+              items:
+              - key: ca.crt
+                path: ca.crt
+
+  - it: "backup CronJob has tls-ca volumeMount when external=true and tls.issuer unset"
+    templates:
+      - templates/backup-cronjob.yaml
+    set:
+      external: true
+      backup:
+        enabled: true
+        s3Bucket: s3.example.org/test
+        cleanupStrategy: "--keep-last=3"
+    asserts:
+      - contains:
+          path: spec.jobTemplate.spec.template.spec.containers[0].volumeMounts
+          content:
+            mountPath: /etc/mysql-ssl
+            name: tls-ca
+            readOnly: true
diff --git a/packages/apps/mariadb/tests/user_key_quoting_test.yaml b/packages/apps/mariadb/tests/user_key_quoting_test.yaml
new file mode 100644
index 0000000000..e28c71421d
--- /dev/null
+++ b/packages/apps/mariadb/tests/user_key_quoting_test.yaml
@@ -0,0 +1,29 @@
+suite: MariaDB User CR quotes a YAML-special username
+
+# The credentials Secret quotes each key (secret.yaml), so a Secret key is always
+# a string. The User CR must reference the same string. A username that is a bare
+# YAML scalar — a number like `123`, or `true`/`false`/`no` — renders unquoted to a
+# non-string, so spec.name and passwordSecretKeyRef.key diverge from the quoted
+# Secret key and the operator cannot find the password. Both must be quoted.
+
+release:
+  name: mariadb-test
+  namespace: tenant-test
+
+templates:
+  - templates/user.yaml
+
+tests:
+  - it: renders a numeric username as a string in name and passwordSecretKeyRef.key
+    template: templates/user.yaml
+    set:
+      users:
+        "123":
+          maxUserConnections: 10
+    asserts:
+      - equal:
+          path: spec.name
+          value: "123"
+      - equal:
+          path: spec.passwordSecretKeyRef.key
+          value: "123"
diff --git a/packages/apps/mariadb/tests/username_validation_test.yaml b/packages/apps/mariadb/tests/username_validation_test.yaml
new file mode 100644
index 0000000000..d1c3c50426
--- /dev/null
+++ b/packages/apps/mariadb/tests/username_validation_test.yaml
@@ -0,0 +1,218 @@
+suite: secret rejects a username outside the safe charset
+
+# A MariaDB username becomes a Kubernetes Secret data key, the spec.name of a
+# mariadb-operator User CR, and (with "_" mapped to "-") the User CR's own
+# metadata.name. A name outside the Secret-key charset renders a Secret and a
+# User the apiserver later rejects with an opaque error; ".", ".." and names
+# over 253 chars match the charset yet k8s IsConfigMapKey still rejects them.
+# Postgres already guards this at render time; MariaDB must too, for parity and
+# to name the offending username instead of failing opaquely at apply. There is
+# no shell interpolation here (the operator applies the SQL), so this is a
+# diagnosability guard, not an injection fix. Reverting the guard in secret.yaml
+# lets the render succeed, so the first test fails.
+
+templates:
+  - templates/secret.yaml
+
+release:
+  name: mdb-test
+  namespace: tenant-test
+
+tests:
+  - it: fails the render for a username with a space
+    set:
+      users:
+        'a b':
+          maxUserConnections: 10
+    asserts:
+      - failedTemplate:
+          errorMessage: 'invalid username "a b": a username may contain only letters, digits and the characters -._ , must not be "." or start with "..", and must be at most 80 characters (the mariadb-operator User resource caps its name at 80, and the name also becomes a Kubernetes Secret key)'
+
+  - it: fails the render for a username with a slash
+    set:
+      users:
+        'a/b':
+          maxUserConnections: 10
+    asserts:
+      - failedTemplate:
+          errorMessage: 'invalid username "a/b": a username may contain only letters, digits and the characters -._ , must not be "." or start with "..", and must be at most 80 characters (the mariadb-operator User resource caps its name at 80, and the name also becomes a Kubernetes Secret key)'
+
+  - it: fails the render for the reserved name "."
+    set:
+      users:
+        '.':
+          maxUserConnections: 10
+    asserts:
+      - failedTemplate:
+          errorMessage: 'invalid username ".": a username may contain only letters, digits and the characters -._ , must not be "." or start with "..", and must be at most 80 characters (the mariadb-operator User resource caps its name at 80, and the name also becomes a Kubernetes Secret key)'
+
+  - it: fails the render for the reserved name ".."
+    set:
+      users:
+        '..':
+          maxUserConnections: 10
+    asserts:
+      - failedTemplate:
+          errorMessage: 'invalid username "..": a username may contain only letters, digits and the characters -._ , must not be "." or start with "..", and must be at most 80 characters (the mariadb-operator User resource caps its name at 80, and the name also becomes a Kubernetes Secret key)'
+
+  # IsConfigMapKey rejects ANY name starting with ".." (hasChDirPrefix), not just
+  # the literal "..", so "..foo" is charset-legal yet cannot install.
+  - it: fails the render for a name starting with ".."
+    set:
+      users:
+        '..foo':
+          maxUserConnections: 10
+    asserts:
+      - failedTemplate:
+          errorMessage: 'invalid username "..foo": a username may contain only letters, digits and the characters -._ , must not be "." or start with "..", and must be at most 80 characters (the mariadb-operator User resource caps its name at 80, and the name also becomes a Kubernetes Secret key)'
+
+  # The username names a mariadb-operator User, whose CRD caps spec.name at 80, so a
+  # longer name is rejected by the apiserver at apply; cap it here (81 chars)
+  # to name it at render. Reverting the cap to 253 lets this through.
+  - it: fails the render for a username of 81 characters (past the User CRD limit)
+    set:
+      users:
+        'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa':
+          maxUserConnections: 10
+    asserts:
+      - failedTemplate:
+          errorMessage: 'invalid username "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa": a username may contain only letters, digits and the characters -._ , must not be "." or start with "..", and must be at most 80 characters (the mariadb-operator User resource caps its name at 80, and the name also becomes a Kubernetes Secret key)'
+
+
+  # The username also names the User CR (<release>-<name>, "_"->"-"), which k8s
+  # requires to be a DNS-1123 subdomain: lowercase, alnum start/end. These pass
+  # the Secret-key charset but the User CR name is invalid, so they cannot install
+  # and must be named at render time rather than failing opaquely at apply.
+  - it: fails the render for an uppercase username (invalid User CR name)
+    set:
+      users:
+        Bob:
+          maxUserConnections: 10
+    asserts:
+      - failedTemplate:
+          errorMessage: 'invalid username "Bob": it also names the mariadb-operator User resource "mdb-test-Bob", which Kubernetes requires to be a DNS-1123 subdomain (lowercase letters, digits, "-" and ".", starting and ending with a letter or digit); use a lowercase name without a leading or trailing "-" or "."'
+
+  - it: fails the render for a username with a trailing "-" (invalid User CR name)
+    set:
+      users:
+        'foo-':
+          maxUserConnections: 10
+    asserts:
+      - failedTemplate:
+          errorMessage: 'invalid username "foo-": it also names the mariadb-operator User resource "mdb-test-foo-", which Kubernetes requires to be a DNS-1123 subdomain (lowercase letters, digits, "-" and ".", starting and ending with a letter or digit); use a lowercase name without a leading or trailing "-" or "."'
+
+  - it: fails the render for a username with a trailing "." (invalid User CR name)
+    set:
+      users:
+        'foo.':
+          maxUserConnections: 10
+    asserts:
+      - failedTemplate:
+          errorMessage: 'invalid username "foo.": it also names the mariadb-operator User resource "mdb-test-foo.", which Kubernetes requires to be a DNS-1123 subdomain (lowercase letters, digits, "-" and ".", starting and ending with a letter or digit); use a lowercase name without a leading or trailing "-" or "."'
+
+  # "a_b" and "a-b" both render the User CR name <release>-a-b ("_" -> "-"), so
+  # one silently overwrites the other on apply. The guard must reject the pair.
+  - it: fails the render when two usernames collide after the "_"->"-" mapping
+    set:
+      users:
+        a_b:
+          maxUserConnections: 10
+        a-b:
+          maxUserConnections: 10
+    asserts:
+      - failedTemplate:
+          errorMessage: 'usernames "a-b" and "a_b" both map to the User resource name "mdb-test-a-b" ("_" renders as "-"); rename one of them'
+
+  - it: renders normally for names using the full safe charset (root always added)
+    set:
+      users:
+        a-b.c_1:
+          maxUserConnections: 10
+    asserts:
+      - matchRegex:
+          path: stringData["a-b.c_1"]
+          pattern: ^[a-zA-Z0-9]{16}$
+
+  # The "_"/"-" collision guard is gated to install. An existing release that
+  # already carries the pair took the silent overwrite when it was first applied;
+  # a platform-driven chart upgrade must not then wedge it into a failed reconcile
+  # it cannot clear without editing users. On upgrade the colliding pair renders
+  # instead of failing. Dropping ".Release.IsInstall" from the guard turns this
+  # test red (the render fails on upgrade), the mutation signal that the gate is
+  # load-bearing.
+  - it: renders on upgrade for a colliding pair the install path rejects
+    release:
+      name: mdb-test
+      namespace: tenant-test
+      upgrade: true
+    # A real upgrade finds the credentials Secret, so seed it: otherwise the
+    # upgrade-with-missing-Secret guard fires first and this would not exercise the
+    # collision gate at all.
+    kubernetesProvider:
+      scheme:
+        "v1/Secret":
+          gvr: {version: v1, resource: secrets}
+          namespaced: true
+      objects:
+        - apiVersion: v1
+          kind: Secret
+          metadata:
+            name: mdb-test-credentials
+            namespace: tenant-test
+          data:
+            root: cm9vdHNlZWRwYXNzd29yZDA=
+    set:
+      users:
+        a_b:
+          maxUserConnections: 10
+        a-b:
+          maxUserConnections: 10
+    asserts:
+      - matchRegex:
+          path: stringData["a-b"]
+          pattern: ^[a-zA-Z0-9]{16}$
+
+  # On a first install there is no credentials Secret yet, so minting fresh
+  # passwords is correct and the render succeeds (lookup returns nothing here).
+  - it: mints on a first install when no credentials Secret exists
+    set:
+      users:
+        app:
+          maxUserConnections: 10
+    asserts:
+      - matchRegex:
+          path: stringData.root
+          pattern: ^[a-zA-Z0-9]{16}$
+
+  # On an upgrade the Secret must exist; a lookup that finds nothing means it was
+  # deleted or the release renamed, and re-minting would rotate every account (root
+  # unrecoverable after bootstrap), so the render fails loudly. Removing the
+  # .Release.IsUpgrade guard lets it mint instead — the mutation signal.
+  - it: fails an upgrade when the credentials Secret is missing
+    release:
+      name: mdb-test
+      namespace: tenant-test
+      upgrade: true
+    set:
+      users:
+        app:
+          maxUserConnections: 10
+    asserts:
+      - failedTemplate:
+          errorMessage: 'mdb-test-credentials Secret not found while upgrading: refusing to mint fresh passwords, which would rotate every account and, because mariadb-operator applies root only at datadir bootstrap, leave the cluster advertising a root password it never set. If the Secret was deleted, restore it before upgrading (a first install does not hit this path).'
+
+  # A charset/DNS-invalid name never applied at all, so its guard stays on the
+  # upgrade path too: gating it would only defer the same failure to the apiserver
+  # as an opaque error rather than naming the offending username here.
+  - it: still fails on upgrade for an invalid User CR name
+    release:
+      name: mdb-test
+      namespace: tenant-test
+      upgrade: true
+    set:
+      users:
+        Bob:
+          maxUserConnections: 10
+    asserts:
+      - failedTemplate:
+          errorMessage: 'invalid username "Bob": it also names the mariadb-operator User resource "mdb-test-Bob", which Kubernetes requires to be a DNS-1123 subdomain (lowercase letters, digits, "-" and ".", starting and ending with a letter or digit); use a lowercase name without a leading or trailing "-" or "."'
diff --git a/packages/apps/mariadb/values.schema.json b/packages/apps/mariadb/values.schema.json
index 8f79641c6b..ab66b1c674 100644
--- a/packages/apps/mariadb/values.schema.json
+++ b/packages/apps/mariadb/values.schema.json
@@ -117,13 +117,36 @@
           "rule": "self == oldSelf",
           "message": "storageClass is immutable"
         }
-      ]
+      ],
+      "x-cozystack-options": {
+        "source": "storageclass"
+      }
     },
     "external": {
       "description": "Enable external access from outside the cluster.",
       "type": "boolean",
       "default": false
     },
+    "tls": {
+      "description": "TLS configuration. Selects who issues the certificates and whether plaintext is refused; TLS itself is always served.",
+      "type": "object",
+      "default": {},
+      "properties": {
+        "issuer": {
+          "description": "Who issues the server certificate: `operator` uses the CA mariadb-operator manages itself, `cert-manager` gives the instance its own CA and is what covers the external hostname. Named for the issuer because TLS is served under both, unlike the similarly-spelled `tls.enabled` in some other charts, which does switch TLS on and off.",
+          "type": "string",
+          "default": "operator",
+          "enum": [
+            "operator",
+            "cert-manager"
+          ]
+        },
+        "required": {
+          "description": "Refuse plaintext connections (sets MariaDB require_secure_transport=ON). Applies under either issuer. Opt-in: turn it on once every client connects over TLS, since it disconnects those that do not.",
+          "type": "boolean"
+        }
+      }
+    },
     "version": {
       "description": "MariaDB major.minor version to deploy",
       "type": "string",
@@ -136,23 +159,18 @@
       ]
     },
     "users": {
-      "description": "Users configuration map.",
+      "description": "Users configuration map. Passwords (including the `root` account) are always auto-generated and stored in the `\u003crelease\u003e-credentials` Secret; they cannot be set from values — read a user's password from that Secret. A `password` left over in values from before the field was removed is ignored by the render and draws an admission warning, but it is not inert on an upgraded release: the chart preserves whatever password is already in the Secret, which on the first upgrade is the value that was set before removal, so that value stays the live credential until it is rotated (dedicated rotation is tracked in cozystack/community#72). The live password lives only in the Secret.",
       "type": "object",
       "default": {},
       "additionalProperties": {
         "type": "object",
         "required": [
-          "maxUserConnections",
-          "password"
+          "maxUserConnections"
         ],
         "properties": {
           "maxUserConnections": {
             "description": "Maximum number of connections.",
             "type": "integer"
-          },
-          "password": {
-            "description": "Password for the user.",
-            "type": "string"
           }
         }
       }
diff --git a/packages/apps/mariadb/values.yaml b/packages/apps/mariadb/values.yaml
index 12840bb0e3..6999b793f2 100644
--- a/packages/apps/mariadb/values.yaml
+++ b/packages/apps/mariadb/values.yaml
@@ -69,11 +69,32 @@ size: 10Gi
 
 ## @param {string} storageClass - StorageClass used to store the data.
 ## @immutable
+## @x-cozystack-options {source: storageclass}
 storageClass: ""
 
 ## @param {bool} external - Enable external access from outside the cluster.
 external: false
 
+##
+## @section TLS parameters
+##
+
+## @enum {string} TLSIssuer
+## @value operator
+## @value cert-manager
+
+## @typedef {struct} TLS - TLS configuration.
+## @field {TLSIssuer} [issuer] - Who issues the server certificate: `operator` uses the CA mariadb-operator manages itself, `cert-manager` gives the instance its own CA and is what covers the external hostname. Named for the issuer because TLS is served under both, unlike the similarly-spelled `tls.enabled` in some other charts, which does switch TLS on and off.
+## @field {*bool} [required] - Refuse plaintext connections (sets MariaDB require_secure_transport=ON). Applies under either issuer. Opt-in: turn it on once every client connects over TLS, since it disconnects those that do not.
+
+## @param {TLS} [tls] - TLS configuration. Selects who issues the certificates and whether plaintext is refused; TLS itself is always served.
+tls:
+  issuer: operator
+
+##
+## @section Version parameters
+##
+
 ##
 ## @enum {string} Version
 ## @value v11.8
@@ -89,19 +110,16 @@ version: v11.8
 ##
 
 ## @typedef {struct} User - User configuration.
-## @field {string} password - Password for the user.
 ## @field {int} maxUserConnections - Maximum number of connections.
 
-## @param {map[string]User} users - Users configuration map.
+## @param {map[string]User} users - Users configuration map. Passwords (including the `root` account) are always auto-generated and stored in the `<release>-credentials` Secret; they cannot be set from values — read a user's password from that Secret. A `password` left over in values from before the field was removed is ignored by the render and draws an admission warning, but it is not inert on an upgraded release: the chart preserves whatever password is already in the Secret, which on the first upgrade is the value that was set before removal, so that value stays the live credential until it is rotated (dedicated rotation is tracked in cozystack/community#72). The live password lives only in the Secret.
 users: {}
 ## Example:
 ## users:
 ##   user1:
 ##     maxUserConnections: 1000
-##     password: hackme
 ##   user2:
 ##     maxUserConnections: 1000
-##     password: hackme
 
 ## @typedef {struct} DatabaseRoles - Role assignments for a database.
 ## @field {[]string} [admin] - List of users with admin privileges.
diff --git a/packages/apps/mongodb/Makefile b/packages/apps/mongodb/Makefile
index 37f30ccc15..723c396537 100644
--- a/packages/apps/mongodb/Makefile
+++ b/packages/apps/mongodb/Makefile
@@ -1,6 +1,6 @@
 include ../../../hack/package.mk
 
-.PHONY: generate update
+.PHONY: generate update test
 
 generate:
 	cozyvalues-gen -m 'mongodb' -v values.yaml -s values.schema.json -r README.md -g ../../../api/apps/v1alpha1/mongodb/types.go
@@ -9,3 +9,6 @@ generate:
 update:
 	hack/update-versions.sh
 	make generate
+
+test:
+	helm unittest .
diff --git a/packages/apps/mongodb/README.md b/packages/apps/mongodb/README.md
index b78f1157f7..a6f2363154 100644
--- a/packages/apps/mongodb/README.md
+++ b/packages/apps/mongodb/README.md
@@ -24,16 +24,91 @@ Each shard is a replica set, and mongos routers handle query routing.
 
 ## Notes
 
+### TLS Mode
+
+TLS is always enabled and fully managed by the PSMDB operator via its native cert-manager integration. The operator creates the complete certificate chain:
+
+- A self-signed CA Issuer and CA Certificate
+- A CA-backed Issuer
+- A leaf TLS certificate with SANs covering the replica set service, per-pod DNS names, wildcards, and localhost
+
+The chart does **not** render cert-manager `Issuer` or `Certificate` resources. The operator manages these directly, and chart-rendered cert-manager objects would be orphaned and ignored as trust anchors.
+
+TLS mode is set to `preferTLS`, which means the MongoDB server accepts both TLS and non-TLS connections. This is also the operator's own default, so the chart states it explicitly rather than changing behaviour; `spec.secrets.ssl` is likewise set explicitly to the name the operator would default to.
+
+> **Note:** `preferTLS` accepts plaintext connections, so it authenticates the server to clients that opt in but does not enforce TLS. Moving to `requireTLS` is a breaking change for any existing plaintext client and is out of scope here. To enforce TLS at the network layer in the meantime, restrict client access via NetworkPolicy.
+>
+> The operator also defaults `tls.allowInvalidCertificates` to `true`, and this chart leaves that default in place, so the server does not reject clients presenting an invalid or mismatched certificate. Combined with `preferTLS`, the guarantee this configuration provides is that a client which opts into TLS can verify the *server*; it is not mutual authentication and it does not keep unverified clients out. Both are inherited operator defaults rather than choices made here, and tightening either is a separate breaking change.
+
+> **External hostname SANs:** When `external: true` is enabled, the chart advertises per-pod LoadBalancer hostnames to the operator via `splitHorizons`, and the operator folds those hostnames into the leaf certificate SAN list. External clients can then verify the TLS hostname, provided `<release>-rs0-<i>.<host>` resolves to the corresponding per-pod LoadBalancer — DNS is an operational prerequisite you must satisfy.
+>
+> That fold is gated on two versions, and this chart controls only one of them. It sets `crVersion: 1.22.0` itself, but the PSMDB operator must also be at 1.22.0 or newer, and the operator is a separate platform component (`packages/system/mongodb-operator`, currently 1.22.0) with its own lifecycle. On a platform carrying an older operator the gate is not met and nothing reports it: the chart still renders `splitHorizons`, the CR is still accepted, the cluster still comes up healthy, and the external hostnames simply never enter the SAN list. A client that then enables hostname verification fails the handshake. If external verification does not work, check the operator version before suspecting DNS.
+>
+> The external hostnames are derived from `_namespace.host`, which the Cozystack controller injects per tenant. Whenever it is empty, TLS stays enabled but `splitHorizons` is omitted, so the certificate does not cover external hostnames and a client connecting to the LoadBalancer with hostname verification on will fail the handshake. Nothing goes red when this happens — the render succeeds and the cluster comes up healthy.
+>
+> That empty state has two causes and only one of them heals. During the brief window before the controller populates the field (or when the chart is rendered outside Cozystack), it resolves on the next reconcile. But a tenant with no host of its own and no ancestor supplying one resolves to an empty host permanently — `packages/apps/tenant` computes it from `.Values.host` or the parent's, and leaves it empty when neither is set. On such a tenant `external: true` works for IP-based access and external TLS hostname verification is simply unavailable; set a host on the tenant (or an ancestor) if you need it. The chart does not fail the render in this case, because that would break existing hostless tenants already running `external: true`.
+
+### Retrieving the CA bundle
+
+The trust anchor is published as `mongodb-<name>.tenant-ca`: an object holding `ca.crt` and nothing else, created for every release and delivered to tenants through the `core.cozystack.io/tenantsecrets` API that the base tenant roles already grant. Every object below is named after the Helm release rather than the `MongoDB` resource, so a `MongoDB` named `catest` gives `mongodb-catest.tenant-ca`, `mongodb-catest-ssl`, and so on; `<release>` stands for `mongodb-<name>` throughout.
+
+The chart declares where it is lifted from by rendering a `TenantProjection` naming `<release>-ssl`. That is the source rather than the operator's `<release>-ca-cert` because it is the name this chart sets in `spec.secrets.ssl`, the operator writes it on both its cert-manager path and its self-signed fallback, and its `ca.crt` carries the merged old and new CA through a rotation. Only `ca.crt` is ever published; the server private key alongside it stays where it is.
+
+```bash
+kubectl --context <ctx> --namespace <tenant> \
+  get tenantsecret mongodb-<name>.tenant-ca \
+  --output jsonpath='{.data.ca\.crt}' | base64 --decode
+```
+
+`<release>.tenant-ca` is the only object that hands over the CA certificate without also handing over a private key, which is why it exists. The PSMDB operator creates its own `<release>-ca-cert` Secret, but that one stores the CA **private key** alongside the certificate — read access would let the holder issue certificates for anything, so it is never granted to a tenant. The same applies to the leaf `<release>-ssl`, which holds the server private key.
+
+It is reached through `tenantsecrets` rather than by reading the Secret directly, and that is deliberate: `tenantsecrets` surfaces only objects the platform has vouched for, whereas a direct grant on the name would convey whatever happens to occupy that name.
+
+> **Warning:** The CA rotates. The operator issues it with a 365-day duration and cert-manager renews it roughly 30 days before expiry, so a bundle copied once will stop verifying within a year. Re-read `<release>.tenant-ca` on a schedule (or mount it and let the kubelet refresh it) instead of baking `ca.crt` into a client image, ConfigMap, or truststore built at release time.
+
+### Verifying a connection
+
+Write the trust anchor to a file, then read the connection string out of `<release>-credentials`:
+
+```bash
+kubectl --context <ctx> --namespace <tenant> \
+  get tenantsecret mongodb-<name>.tenant-ca \
+  --output jsonpath='{.data.ca\.crt}' | base64 --decode > ca.crt
+
+kubectl --context <ctx> --namespace <tenant> \
+  get secret mongodb-<name>-credentials \
+  --output jsonpath='{.data.uri}' | base64 --decode
+```
+
+`mongosh` takes the bundle as a file, and the two TLS inputs are passed as flags rather than folded into the URI:
+
+```bash
+mongosh "<uri>" --tls --tlsCAFile ./ca.crt
+```
+
+Drivers take the same two inputs under their own names (`tls=true` plus a CA path). Prefer the flag form over appending `tls=true` to the connection string: the replica-set URI already carries a `?replicaSet=rs0` query and the sharded one carries none, so the correct separator differs between the two topologies.
+
+> **Omitting the TLS flags does not fail.** Because the server runs in `preferTLS`, a client that leaves them out is accepted on a plaintext connection and nothing reports the downgrade — the session simply is not encrypted. Verification is opt-in on the client side, so treat a working connection as evidence of nothing until the flags are present.
+
+Hostname verification succeeds against the in-cluster names out of the box, since the operator covers them in the leaf SANs. Verifying against an external LoadBalancer endpoint depends on the `splitHorizons` fold described above, and is unavailable in sharded mode — see below.
+
+### Sharding and TLS
+
+In-cluster `mongos` SANs are fully covered: the operator appends the `mongos` and config-replset names (short, namespace, FQDN, and wildcard forms) to every certificate, for sharded and non-sharded clusters alike.
+
+> **Warning:** External TLS hostname verification is not available when `sharding: true`. In sharded mode external access goes through the single `<release>-external` LoadBalancer fronting `mongos`, and no SAN covers that name — `splitHorizons` is replica-set scoped and is only rendered for the non-sharded topology. Clients connecting to a sharded cluster from outside must either verify against an in-cluster `mongos` name that resolves to the same endpoint, or connect without hostname verification. Combining `sharding: true` with `external: true` and full verification is unsupported.
+
 ### External Access
 
 When `external: true` is enabled:
-- **Replica Set mode**: Traffic is load-balanced across all replica set members. This works well for read operations, but write operations require connecting to the primary. MongoDB drivers handle primary discovery automatically using the replica set connection string.
+- **Replica Set mode**: The operator exposes each replica set member through its own LoadBalancer via `replsets[].expose` and rewrites the replica set configuration so drivers can discover the primary from outside the cluster. There is no single load-balanced endpoint: the driver connects to the members and routes writes to the primary itself, using the replica set connection string.
 - **Sharded mode**: Traffic is routed through mongos routers, which handle both reads and writes correctly.
 
 ### Credentials
 
-On first install, the credentials secret will be empty until the Percona operator initializes the cluster.
-Run `helm upgrade` after MongoDB is ready to populate the credentials secret with the actual password.
+The chart generates the operator's system-user passwords and writes them to `<release>-percona-server-mongodb-users` before the operator starts, so `<release>-credentials` carries a working `password` and `uri` from the first install onwards. An upgrade reuses what the secret already holds and never rotates a live password.
+
+A database created before this behaviour landed keeps the secret the operator generated for it, and its `<release>-credentials` is filled on the next upgrade of the release with the password the operator had already assigned.
 
 ### Data lifecycle
 
@@ -54,9 +129,18 @@ When the MongoDB release is uninstalled, the operator finalizers reclaim release
 - `<release>-user-<username>` — per-user passwords
 - `<release>-s3-creds` — backup destination credentials (if backups are configured)
 
+**Reclaimed by ownerReference garbage collection:**
+
+- TLS secrets `<release>-ssl`, `<release>-ssl-internal`, and `<release>-ca-cert`, along with the cert-manager `Issuer` and `Certificate` objects the operator creates. The cascade works out either way on the `--enable-certificate-owner-ref` fork: with the flag the Certificate owns the Secret and the CR owns the Certificate; without it (the default Cozystack ships) the operator makes the CR the direct owner of the Secret.
+
+  > **The Secret ownerReference is applied at reconcile time, not at creation.** cert-manager creates these Secrets unowned, and the operator patches the CR reference on afterwards, in `WaitForCerts`. Two paths skip the patch: a dry-run reconcile returns before it, and a Secret already present under the same name whose `cert-manager.io/certificate-name` annotation does not match is counted toward success and returned on without being patched. So a Secret that predates the release at one of these names — from a restore-from-backup, a rename, or a manual recreate — can stay unowned and survive uninstall. The finalizer does not cover the gap: it enumerates only the users, `internal-<release>`, `internal-<release>-users`, and encryption-key Secrets, and no TLS Secret is on that list. After deleting a release, confirm `<release>-ca-cert` is gone rather than assuming it — it holds the CA private key, and an orphan of it is the one leak this chart's TLS posture exists to prevent.
+- The `<release>.tenant-ca` projection, where the CA-extraction controller is present to publish it, since it is owner-referenced to the `TenantProjection` the chart renders.
+
 **Not reclaimed automatically:**
 
-- TLS secrets `<release>-ssl` and `<release>-ssl-internal` (issued by cert-manager) remain in the namespace after uninstall. Delete them manually if no longer needed.
+- `<release>-ssl-old` and `<release>-ssl-internal-old`, only if a rotation was interrupted. These are operator scratch state, not residue: the operator snapshots the previous leaf certificates under these names when it rotates the cert-manager chain, and deletes them itself in the same pass once the merged CA has landed in the live secrets. They are created with no ownerReference, so a rotation interrupted between the snapshot and the merge can leave them behind, and those stragglers do survive uninstall.
+
+  > **Do not delete these while a rotation is in flight.** The operator reads the previous CA back out of exactly these two names to build the merged trust bundle that keeps pods on old and new certificates talking to each other during the rolling restart. Removing them mid-rotation destroys the only copy of the old CA. Sweep them only if they are still present long after the cluster has settled, which indicates an interrupted rotation rather than one in progress.
 
 **Recovery from a stuck deletion:**
 
@@ -72,13 +156,13 @@ If you need to retain data, take a backup before deletion. Refer to the [Percona
 
 ### Upgrading from earlier versions
 
-Earlier versions of this chart referenced a namespace-shared system users secret (`percona-server-mongodb-users`). Upgrading to a release that scopes this secret per CR (`<release>-percona-server-mongodb-users`) triggers a password rotation for the operator-managed system users. The rotation is performed in place by the Percona operator via `db.changeUserPassword()` against the running mongod (operator log: `Secret data changed. Updating users...`); pods are not restarted and the cluster stays available.
+Earlier versions of this chart referenced a namespace-shared system users secret (`percona-server-mongodb-users`). A release that scopes this secret per CR (`<release>-percona-server-mongodb-users`) renders the new secret on the next upgrade without rotating anything: while the per-release secret does not exist yet, the chart reads the current system-user passwords back from the operator's own copy, `internal-<release>-users`, and writes those same values into the new users secret and into `<release>-credentials`. The Percona operator sees unchanged values and leaves the running users alone; pods are not restarted and the cluster stays available.
 
-**Rotated automatically on upgrade:**
+**Carried over on upgrade:**
 
-- The five operator-managed system accounts: `databaseAdmin`, `userAdmin`, `backup`, `clusterAdmin`, `clusterMonitor`.
-- Secret `<release>-percona-server-mongodb-users` (newly created, per-CR) and `internal-<release>-users` receive the new values.
-- Secret `<release>-credentials` is regenerated; its `password` and `uri` keys reflect the new `databaseAdmin` password.
+- The five operator-managed system accounts: `databaseAdmin`, `userAdmin`, `backup`, `clusterAdmin`, `clusterMonitor` keep their passwords.
+- Secret `<release>-percona-server-mongodb-users` is created per CR with the values already held by `internal-<release>-users`.
+- Secret `<release>-credentials` is filled with the existing `databaseAdmin` password and the matching `uri`. Installs where these keys were empty get them on the next upgrade, because Helm re-renders only when the spec changes.
 
 **Not affected:**
 
@@ -87,7 +171,7 @@ Earlier versions of this chart referenced a namespace-shared system users secret
 
 **Action required after upgrade:**
 
-Workloads that mount `<release>-credentials` keep using the cached old password until they re-read the secret. Restart those pods, or run a controller such as [Reloader](https://github.com/stakater/Reloader) to roll them automatically. Without this, application connections fail with authentication errors once their existing sessions expire.
+Workloads that mounted `<release>-credentials` while its `password` and `uri` were empty see the filled values only after they re-read the secret. Restart those pods, or run a controller such as [Reloader](https://github.com/stakater/Reloader) to roll them automatically.
 
 **Orphaned legacy secret:**
 
@@ -97,6 +181,18 @@ The previous namespace-shared secret `percona-server-mongodb-users` is no longer
 kubectl --namespace <namespace> delete secret percona-server-mongodb-users
 ```
 
+**Rolling restart on upgrade, for external replica set releases only:**
+
+A release already running with `external: true` in replica set mode gains `splitHorizons` on upgrade. The per-pod external hostnames become certificate SANs, so cert-manager reissues `<release>-ssl`; the operator hashes that Secret into a pod-template annotation, which rolls the replica set StatefulSet. The restart is ordered, and at `replicas: 3` or more the replica set stays available through it — a member at a time goes down, the majority holds, and an election moves the primary if it was the one restarted. It is still a restart of the database and worth scheduling.
+
+> **Below three replicas the upgrade is an outage, not a rolling restart.** The chart permits `replicas: 1` and `replicas: 2` (rendering `unsafeFlags.replsetSize: true` for both), and neither is excluded from the SAN change — a one-replica external release gets horizons and rolls exactly like a three-replica one. At `replicas: 1` the rollout takes the only mongod down, so the release is fully unavailable, reads included, until the new pod is ready. At `replicas: 2` the write majority is still 2, so restarting either member leaves the remaining one unable to hold a primary and writes fail for the duration; reads continue only if the client tolerates a secondary. `podDisruptionBudget` does not change this in either case — the disruption is the rollout itself, not an eviction. Schedule a window accordingly, or scale to three before upgrading.
+
+The same pass snapshots the superseded certificates as `<release>-ssl-old` and `<release>-ssl-internal-old`, then deletes them once the merged CA has landed. Because this upgrade changes only the SAN list and not the CA itself, the merge is a no-op and both snapshots are removed on the first pass — no cleanup is expected. See the lifecycle section above for the interrupted case, and do not delete them by hand while the rollout is running.
+
+Scaling an external replica set down can also produce transient reconfiguration errors during the upgrade. MongoDB requires horizons on all members or none, and a terminating pod is still a member while the chart advertises horizons only for the remaining ones. The operator retries and the condition clears once the pod is gone.
+
+Releases with `external: false`, and sharded releases in any configuration, are unaffected: neither renders `splitHorizons`, so no SAN changes and nothing restarts.
+
 > `storageClass` is annotated as immutable in the chart schema — see [`docs/storage-immutability.md`](../../../docs/storage-immutability.md) for the contract and which consumers enforce it.
 
 ## Parameters
@@ -151,16 +247,18 @@ kubectl --namespace <namespace> delete secret percona-server-mongodb-users
 
 ### Backup parameters
 
-| Name                     | Description                                            | Type     | Value                               |
-| ------------------------ | ------------------------------------------------------ | -------- | ----------------------------------- |
-| `backup`                 | Backup configuration.                                  | `object` | `{}`                                |
-| `backup.enabled`         | Enable regular backups.                                | `bool`   | `false`                             |
-| `backup.schedule`        | Cron schedule for automated backups.                   | `string` | `0 2 * * *`                         |
-| `backup.retentionPolicy` | Retention policy (e.g. "30d").                         | `string` | `30d`                               |
-| `backup.destinationPath` | Destination path for backups (e.g. s3://bucket/path/). | `string` | `s3://bucket/path/to/folder/`       |
-| `backup.endpointURL`     | S3 endpoint URL for uploads.                           | `string` | `http://minio-gateway-service:9000` |
-| `backup.s3AccessKey`     | Access key for S3 authentication.                      | `string` | `""`                                |
-| `backup.s3SecretKey`     | Secret key for S3 authentication.                      | `string` | `""`                                |
+| Name                           | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | Type     | Value                               |
+| ------------------------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------- | ----------------------------------- |
+| `backup`                       | Backup configuration.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | `object` | `{}`                                |
+| `backup.enabled`               | Enable regular backups.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    | `bool`   | `false`                             |
+| `backup.useSystemBucket`       | Opt-in: back up to the platform system bucket without supplying S3 credentials. The cozy-default MongoDB BackupClass injects the storage at BackupJob time; tenants do not set s3AccessKey/s3SecretKey/destinationPath/endpointURL, and backups scope to `<namespace>/<application>`. Scheduling moves to a BackupClass Plan; `schedule`, `retentionPolicy` and PITR are ignored while this is on, and this flow has no retention yet (see docs/operations/backup-classes.md). Requires `backup.enabled: true` (the pbm agents run on that flag); the chart refuses the combination with `enabled: false` at render time; the schema carries the same rule as a marker for the UI and for the day the apiserver enforces CEL on application schemas (cozystack/cozystack#2657), which it does not yet. A release that has not yet rendered this flag (its cluster still carries the chart's scheduled tasks and PITR) holds a BackupJob until it does, so the tenant's own storage is never injected over. | `bool`   | `false`                             |
+| `backup.schedule`              | Cron schedule for automated backups. Ignored when useSystemBucket is true (scheduling moves to the BackupClass Plan).                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | `string` | `0 2 * * *`                         |
+| `backup.retentionPolicy`       | Retention policy (e.g. "30d"). Ignored when useSystemBucket is true (no engine-side retention on that flow).                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | `string` | `30d`                               |
+| `backup.destinationPath`       | Destination path for backups (e.g. s3://bucket/path/). Ignored when useSystemBucket is true (the driver injects the platform bucket).                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | `string` | `s3://bucket/path/to/folder/`       |
+| `backup.endpointURL`           | S3 endpoint URL for uploads. Ignored when useSystemBucket is true (the strategy supplies the platform endpoint).                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | `string` | `http://minio-gateway-service:9000` |
+| `backup.insecureSkipTLSVerify` | Skip TLS verification for the S3 endpoint (self-signed, e.g. in-cluster seaweedfs). Ignored when useSystemBucket is true (the platform backupStorage knob applies instead).                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | `bool`   | `false`                             |
+| `backup.s3AccessKey`           | Access key for S3 authentication. Ignored when useSystemBucket is true (credentials come from the projected cozy-backups-creds).                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | `string` | `""`                                |
+| `backup.s3SecretKey`           | Secret key for S3 authentication. Ignored when useSystemBucket is true (credentials come from the projected cozy-backups-creds).                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | `string` | `""`                                |
 
 
 ### Bootstrap (recovery) parameters
diff --git a/packages/apps/mongodb/templates/_backup.tpl b/packages/apps/mongodb/templates/_backup.tpl
new file mode 100644
index 0000000000..516cb4b44a
--- /dev/null
+++ b/packages/apps/mongodb/templates/_backup.tpl
@@ -0,0 +1,13 @@
+{{- /*
+  Bucket and prefix of backup.destinationPath. The bootstrap restore has to
+  read from the place the backup storage writes to. The operator builds the
+  restore's storage from backupSource.s3 alone and takes only the backup name
+  from backupSource.destination, so both templates derive the pair here.
+*/}}
+{{- define "mongodb.backup.bucket" -}}
+{{- .Values.backup.destinationPath | trimPrefix "s3://" | regexFind "^[^/]+" -}}
+{{- end -}}
+
+{{- define "mongodb.backup.prefix" -}}
+{{- .Values.backup.destinationPath | trimPrefix "s3://" | splitList "/" | rest | join "/" -}}
+{{- end -}}
diff --git a/packages/apps/mongodb/templates/backup-secret.yaml b/packages/apps/mongodb/templates/backup-secret.yaml
index f7b2ba01b8..e3bb3950c5 100644
--- a/packages/apps/mongodb/templates/backup-secret.yaml
+++ b/packages/apps/mongodb/templates/backup-secret.yaml
@@ -1,4 +1,10 @@
-{{- if or .Values.backup.enabled .Values.bootstrap.enabled }}
+{{- /*
+  On the useSystemBucket flow the driver injects a storage that references the
+  platform-projected cozy-backups-creds, so this chart-emitted Secret is skipped
+  and tenants do not supply inline keys. Only the legacy flow (own S3, inline
+  keys) materialises it.
+*/}}
+{{- if and (or .Values.backup.enabled .Values.bootstrap.enabled) (not .Values.backup.useSystemBucket) }}
 ---
 apiVersion: v1
 kind: Secret
@@ -6,6 +12,6 @@ metadata:
   name: {{ .Release.Name }}-s3-creds
 type: Opaque
 stringData:
-  AWS_ACCESS_KEY_ID: {{ required "backup.s3AccessKey is required when backup or bootstrap is enabled" .Values.backup.s3AccessKey | quote }}
-  AWS_SECRET_ACCESS_KEY: {{ required "backup.s3SecretKey is required when backup or bootstrap is enabled" .Values.backup.s3SecretKey | quote }}
+  AWS_ACCESS_KEY_ID: {{ required "backup.s3AccessKey is required when backup or bootstrap is enabled without useSystemBucket" .Values.backup.s3AccessKey | quote }}
+  AWS_SECRET_ACCESS_KEY: {{ required "backup.s3SecretKey is required when backup or bootstrap is enabled without useSystemBucket" .Values.backup.s3SecretKey | quote }}
 {{- end }}
diff --git a/packages/apps/mongodb/templates/credentials.yaml b/packages/apps/mongodb/templates/credentials.yaml
index 561f767212..1cf8dc7d85 100644
--- a/packages/apps/mongodb/templates/credentials.yaml
+++ b/packages/apps/mongodb/templates/credentials.yaml
@@ -1,34 +1,80 @@
 {{- $clusterDomain := (index .Values._cluster "cluster-domain") | default "cozy.local" }}
-{{- $operatorSecret := lookup "v1" "Secret" .Release.Namespace (printf "internal-%s-users" .Release.Name) }}
-{{- $password := "" }}
-{{- if and $operatorSecret (hasKey $operatorSecret.data "MONGODB_DATABASE_ADMIN_PASSWORD") }}
-{{- $password = index $operatorSecret.data "MONGODB_DATABASE_ADMIN_PASSWORD" | b64dec }}
+{{- $usersSecretName := printf "%s-percona-server-mongodb-users" .Release.Name }}
+{{- $existingUsers := lookup "v1" "Secret" .Release.Namespace $usersSecretName }}
+{{- $operatorCopy := lookup "v1" "Secret" .Release.Namespace (printf "internal-%s-users" .Release.Name) }}
+
+{{- $chartOwnsUsers := true }}
+{{- if $existingUsers }}
+  {{- $annotations := $existingUsers.metadata.annotations | default dict }}
+  {{- if ne (index $annotations "meta.helm.sh/release-name" | default "") .Release.Name }}
+    {{- $chartOwnsUsers = false }}
+  {{- end }}
+{{- end }}
+
+{{- $systemUsers := list
+      (dict "userKey" "MONGODB_BACKUP_USER" "passwordKey" "MONGODB_BACKUP_PASSWORD" "name" "backup")
+      (dict "userKey" "MONGODB_CLUSTER_ADMIN_USER" "passwordKey" "MONGODB_CLUSTER_ADMIN_PASSWORD" "name" "clusterAdmin")
+      (dict "userKey" "MONGODB_CLUSTER_MONITOR_USER" "passwordKey" "MONGODB_CLUSTER_MONITOR_PASSWORD" "name" "clusterMonitor")
+      (dict "userKey" "MONGODB_DATABASE_ADMIN_USER" "passwordKey" "MONGODB_DATABASE_ADMIN_PASSWORD" "name" "databaseAdmin")
+      (dict "userKey" "MONGODB_USER_ADMIN_USER" "passwordKey" "MONGODB_USER_ADMIN_PASSWORD" "name" "userAdmin") }}
+
+{{- $resolved := dict }}
+{{- range $user := $systemUsers }}
+  {{- $name := $user.name }}
+  {{- $password := "" }}
+  {{- $fromChart := dict }}
+  {{- if $existingUsers }}{{ $fromChart = $existingUsers.data | default dict }}{{ end }}
+  {{- $fromOperator := dict }}
+  {{- if $operatorCopy }}{{ $fromOperator = $operatorCopy.data | default dict }}{{ end }}
+  {{- if hasKey $fromChart $user.passwordKey }}
+    {{- $password = index $fromChart $user.passwordKey | b64dec }}
+    {{- if hasKey $fromChart $user.userKey }}
+      {{- $name = index $fromChart $user.userKey | b64dec }}
+    {{- end }}
+  {{- else if hasKey $fromOperator $user.passwordKey }}
+    {{- $password = index $fromOperator $user.passwordKey | b64dec }}
+    {{- if hasKey $fromOperator $user.userKey }}
+      {{- $name = index $fromOperator $user.userKey | b64dec }}
+    {{- end }}
+  {{- else if not $chartOwnsUsers }}
+    {{- fail (printf "mongodb: Secret %s is not managed by release %s and neither it nor internal-%s-users carries %s; add the key to the Secret or remove the Secret so the chart can own it" $usersSecretName $.Release.Name $.Release.Name $user.passwordKey) }}
+  {{- else }}
+    {{- $password = randAlphaNum 24 }}
+  {{- end }}
+  {{- $_ := set $resolved $user.userKey $name }}
+  {{- $_ := set $resolved $user.passwordKey $password }}
+{{- end }}
+
+{{- $adminUser := index $resolved "MONGODB_DATABASE_ADMIN_USER" }}
+{{- $adminPassword := index $resolved "MONGODB_DATABASE_ADMIN_PASSWORD" }}
+{{- $host := printf "%s-rs0.%s.svc.%s" .Release.Name .Release.Namespace $clusterDomain }}
+{{- $uri := printf "mongodb://%s:%s@%s:27017/admin?replicaSet=rs0" (urlquery $adminUser) (urlquery $adminPassword) $host }}
+{{- if .Values.sharding }}
+  {{- $host = printf "%s-mongos.%s.svc.%s" .Release.Name .Release.Namespace $clusterDomain }}
+  {{- $uri = printf "mongodb://%s:%s@%s:27017/admin" (urlquery $adminUser) (urlquery $adminPassword) $host }}
 {{- end }}
+
+{{- if $chartOwnsUsers }}
 ---
-# Dashboard credentials - lookup from operator-created secret
-# Operator creates secret named "internal-<release>-users" with system user passwords
-# Note: On first install, password/uri will be empty until operator creates the secret.
-# Run 'helm upgrade' after MongoDB is ready to populate credentials.
 apiVersion: v1
 kind: Secret
 metadata:
-  name: {{ .Release.Name }}-credentials
+  name: {{ $usersSecretName }}
 type: Opaque
 stringData:
-  username: databaseAdmin
-  password: {{ $password | quote }}
-  {{- if .Values.sharding }}
-  host: {{ .Release.Name }}-mongos.{{ .Release.Namespace }}.svc.{{ $clusterDomain }}
-  {{- else }}
-  host: {{ .Release.Name }}-rs0.{{ .Release.Namespace }}.svc.{{ $clusterDomain }}
+  {{- range $key := (keys $resolved | sortAlpha) }}
+  {{ $key }}: {{ index $resolved $key | quote }}
   {{- end }}
+{{- end }}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ .Release.Name }}-credentials
+type: Opaque
+stringData:
+  username: {{ $adminUser | quote }}
+  password: {{ $adminPassword | quote }}
+  host: {{ $host | quote }}
   port: "27017"
-  {{- if $password }}
-  {{- if .Values.sharding }}
-  uri: mongodb://databaseAdmin:{{ $password | urlquery }}@{{ .Release.Name }}-mongos.{{ .Release.Namespace }}.svc.{{ $clusterDomain }}:27017/admin
-  {{- else }}
-  uri: mongodb://databaseAdmin:{{ $password | urlquery }}@{{ .Release.Name }}-rs0.{{ .Release.Namespace }}.svc.{{ $clusterDomain }}:27017/admin?replicaSet=rs0
-  {{- end }}
-  {{- else }}
-  uri: ""
-  {{- end }}
+  uri: {{ $uri | quote }}
diff --git a/packages/apps/mongodb/templates/dashboard-resourcemap.yaml b/packages/apps/mongodb/templates/dashboard-resourcemap.yaml
index 33a6a4ef17..0b3868a277 100644
--- a/packages/apps/mongodb/templates/dashboard-resourcemap.yaml
+++ b/packages/apps/mongodb/templates/dashboard-resourcemap.yaml
@@ -19,6 +19,19 @@ rules:
   resourceNames:
   - {{ .Release.Name }}-credentials
   verbs: ["get", "list", "watch"]
+# The TLS Secrets the PSMDB operator creates are deliberately NOT granted here.
+# Both carry private key material: <release>-ca-cert holds the CA private key
+# (full trust-chain compromise if leaked) and <release>-ssl holds the server
+# private key (impersonation / MITM). A tenant verifying the endpoint needs
+# ca.crt and nothing more, so neither belongs in a tenant-facing Role.
+#
+# The trust anchor reaches the tenant as the key-free <release>.tenant-ca
+# projection instead, through core.cozystack.io/tenantsecrets — which the base
+# tenant roles already grant and which gates on the internal.cozystack.io/
+# tenantresource LABEL stamped by the lineage webhook. Granting that projection
+# by NAME here would be wrong too: a name grant conveys whatever occupies the
+# name, whereas the label path conveys only what the platform vouched for. A
+# name grant is gated on a string; the label path is gated on provenance.
 - apiGroups:
   - cozystack.io
   resources:
diff --git a/packages/apps/mongodb/templates/mongodb.yaml b/packages/apps/mongodb/templates/mongodb.yaml
index 3b9229ff1d..c12dbca07a 100644
--- a/packages/apps/mongodb/templates/mongodb.yaml
+++ b/packages/apps/mongodb/templates/mongodb.yaml
@@ -1,4 +1,42 @@
 {{- $clusterDomain := (index .Values._cluster "cluster-domain") | default "cozy.local" }}
+{{- if and .Values.backup.useSystemBucket (not .Values.backup.enabled) }}
+{{- fail "mongodb: backup.useSystemBucket=true requires backup.enabled=true: the percona-backup-mongodb agents only run when backups are enabled, so this combination renders a cluster that can never service a BackupJob. Set backup.enabled=true (or drop useSystemBucket). See docs/operations/backup-classes.md." }}
+{{- end }}
+{{- /*
+TLS IMPLEMENTATION NOTE — operator-managed cert-manager chain
+=============================================================
+TLS is always on, and neither fact below depends on spec.secrets.ssl being set
+here: the operator defaults that name unconditionally, and runs its cert-manager
+integration regardless. TLS-on comes from spec.tls.mode defaulting to preferTLS
+together with the operator refusing a disabled-TLS CR unless unsafeFlags.tls is
+set. Setting secrets.ssl explicitly only makes the name visible in the rendered
+CR. The operator creates the full certificate chain itself:
+
+  1. Self-signed bootstrap Issuer
+  2. CA Certificate, 365-day duration renewed 730h (~30 days) before expiry.
+     The CA therefore ROTATES annually — clients must re-read the trust anchor
+     rather than bake it into an image or ConfigMap.
+  3. CA-backed Issuer
+  4. Leaf server+client cert, lifetime left to the operator's own
+     certValidityDuration default (90 days at 1.22.0 — an operator default this
+     chart deliberately does not pin, so treat the number as informational) and
+     reissued by it without client action, with a SAN
+     list covering the per-replset service (short, namespace, FQDN), the
+     matching wildcards — which is what covers the per-pod headless names,
+     rather than a separate entry each — mongos and config-replset names, and
+     localhost.
+
+The chart does NOT render cert-manager Issuer/Certificate resources to avoid
+orphaning the operator-managed ones. Chart-rendered resources would be ignored
+as trust anchors because the PSMDB operator controls the CA it embeds in pods.
+
+EXTERNAL HOSTNAME SANs:
+  When external: true, the per-pod external hostnames (<release>-rs0-<i>.<host>)
+  are advertised via replsets[].splitHorizons. PSMDB ≥ 1.22.0 folds the horizon
+  hostnames into the operator-managed leaf certificate SAN list when the CR is at
+  crVersion ≥ 1.22.0, so external clients can verify the TLS hostname. The DNS
+  names must resolve to the per-pod LoadBalancers (operational prerequisite).
+*/}}
 ---
 apiVersion: psmdb.percona.com/v1
 kind: PerconaServerMongoDB
@@ -8,12 +46,28 @@ metadata:
     - percona.com/delete-psmdb-pods-in-order
     - percona.com/delete-psmdb-pvc
 spec:
-  crVersion: 1.21.1
+  {{- /*
+    The backup driver matches this operator's own error text ("unable to get
+    storage") to retry the storage-injection race; bumping crVersion must be
+    paired with re-checking that wording in internal/backupcontroller/
+    psmdbstrategy_controller.go (psmdbErrorIsUnresolvedStorage).
+  */}}
+  crVersion: 1.22.0
   clusterServiceDNSSuffix: svc.{{ $clusterDomain }}
   secrets:
     users: {{ .Release.Name }}-percona-server-mongodb-users
+    ssl: {{ .Release.Name }}-ssl
   pause: false
   unmanaged: false
+
+  tls:
+    # This pins the operator's own default rather than choosing a posture: the
+    # operator defaults spec.tls.mode to preferTLS and rejects a disabled-TLS CR
+    # unless spec.unsafeFlags.tls is set, so TLS was already on before this key
+    # existed. Stated explicitly so the mode is visible in the rendered CR.
+    # preferTLS accepts plaintext connections; moving to requireTLS would break
+    # existing plaintext clients and is a separate, breaking change.
+    mode: preferTLS
   image: percona/percona-server-mongodb:{{ include "mongodb.versionMap" $ }}
   imagePullPolicy: IfNotPresent
 
@@ -111,6 +165,30 @@ spec:
         {{- else }}
         enabled: false
         {{- end }}
+      {{- if .Values.external }}
+      {{- /* Split-horizon DNS advertises per-pod external hostnames to clients
+             connecting from outside the cluster. PSMDB ≥ 1.22.0 also folds these
+             hostnames into the operator-managed leaf certificate SAN list (gated
+             on crVersion ≥ 1.22.0), so TLS hostname verification works for
+             external clients. Requires <release>-rs0-<i>.<host> to resolve to the
+             per-pod LoadBalancer (DNS is an operational prerequisite). The host
+             is injected by the cozystack controller as _namespace.host; if it is
+             absent we skip the horizons rather than render an invalid SAN.
+
+             The replicas guard is load-bearing, not defensive: with replicas: 0
+             the range body renders nothing and `splitHorizons:` would be emitted
+             with a null value. The CRD types it as object without nullable, so
+             the API server rejects the whole PerconaServerMongoDB and the
+             HelmRelease fails. Omit the key entirely instead. */}}
+      {{- $host := (.Values._namespace | default dict).host }}
+      {{- if and $host (gt (int $.Values.replicas) 0) }}
+      splitHorizons:
+        {{- range $i := until (int $.Values.replicas) }}
+        {{ $.Release.Name }}-rs0-{{ $i }}:
+          external: {{ $.Release.Name }}-rs0-{{ $i }}.{{ $host }}
+        {{- end }}
+      {{- end }}
+      {{- end }}
     {{- end }}
 
   {{- if .Values.users }}
@@ -151,16 +229,28 @@ spec:
   backup:
     enabled: {{ .Values.backup.enabled | default false }}
     image: percona/percona-backup-mongodb:2.11.0
-    {{- if .Values.backup.enabled }}
+    {{- /*
+      useSystemBucket: keep enabled (so the pbm agents run) but omit the static
+      storage/tasks/pitr. The chart cannot know the platform bucket/endpoint at
+      render time, so the cozy-default BackupClass driver SSA-injects
+      spec.backup.storages["s3-storage"] under its own field manager at
+      BackupJob time; Helm never owns that subtree, so a Flux re-render leaves
+      the injected storage intact (same split the postgres useSystemBucket flow
+      uses for spec.plugins). Scheduling is driven by a BackupClass Plan, not
+      the chart's tasks; PITR on the system bucket is not wired here yet.
+    */}}
+    {{- if and .Values.backup.enabled (not .Values.backup.useSystemBucket) }}
     storages:
       s3-storage:
         type: s3
         s3:
-          bucket: {{ .Values.backup.destinationPath | trimPrefix "s3://" | regexFind "^[^/]+" }}
-          prefix: {{ .Values.backup.destinationPath | trimPrefix "s3://" | splitList "/" | rest | join "/" }}
+          bucket: {{ include "mongodb.backup.bucket" . | quote }}
+          {{- with include "mongodb.backup.prefix" . }}
+          prefix: {{ . | quote }}
+          {{- end }}
           endpointUrl: {{ .Values.backup.endpointURL }}
           credentialsSecret: {{ .Release.Name }}-s3-creds
-          insecureSkipTLSVerify: false
+          insecureSkipTLSVerify: {{ .Values.backup.insecureSkipTLSVerify | default false }}
           forcePathStyle: true
     tasks:
       - name: daily-backup
diff --git a/packages/apps/mongodb/templates/restore.yaml b/packages/apps/mongodb/templates/restore.yaml
index 56e2150b1b..2742cc81f9 100644
--- a/packages/apps/mongodb/templates/restore.yaml
+++ b/packages/apps/mongodb/templates/restore.yaml
@@ -1,10 +1,16 @@
 {{- if .Values.bootstrap.enabled }}
+{{- if .Values.backup.useSystemBucket }}
+{{- fail "mongodb: bootstrap.enabled=true is incompatible with backup.useSystemBucket=true. bootstrap.enabled is not reset after a bootstrap restore completes, so set bootstrap.enabled=false before opting in; to restore from the system bucket use a backups.cozystack.io/RestoreJob against the cozy-default BackupClass instead. See docs/operations/backup-classes.md." }}
+{{- end }}
 {{- if not .Values.bootstrap.backupName }}
 {{- fail "bootstrap.backupName is required when bootstrap.enabled is true" }}
 {{- end }}
 {{- if not .Values.backup.destinationPath }}
 {{- fail "backup.destinationPath is required when bootstrap.enabled is true" }}
 {{- end }}
+{{- if not (include "mongodb.backup.bucket" .) }}
+{{- fail "backup.destinationPath must name a bucket (s3://bucket/path/) when bootstrap.enabled is true" }}
+{{- end }}
 {{- if not .Values.backup.endpointURL }}
 {{- fail "backup.endpointURL is required when bootstrap.enabled is true" }}
 {{- end }}
@@ -30,8 +36,10 @@ spec:
     type: logical
     destination: {{ .Values.backup.destinationPath | trimSuffix "/" }}/{{ .Values.bootstrap.backupName }}
     s3:
+      bucket: {{ include "mongodb.backup.bucket" . | quote }}
+      prefix: {{ include "mongodb.backup.prefix" . | quote }}
       credentialsSecret: {{ .Release.Name }}-s3-creds
       endpointUrl: {{ .Values.backup.endpointURL }}
-      insecureSkipTLSVerify: false
+      insecureSkipTLSVerify: {{ .Values.backup.insecureSkipTLSVerify | default false }}
       forcePathStyle: true
 {{- end }}
diff --git a/packages/apps/mongodb/templates/tenant-projection.yaml b/packages/apps/mongodb/templates/tenant-projection.yaml
new file mode 100644
index 0000000000..29cf129d72
--- /dev/null
+++ b/packages/apps/mongodb/templates/tenant-projection.yaml
@@ -0,0 +1,21 @@
+{{- /*
+Ungated: the PSMDB operator issues the certificate chain unconditionally, so
+the source Secret exists for every release.
+
+The source is the leaf Secret rather than the operator's CA Secret. Both carry
+ca.crt on the cert-manager path, but <release>-ssl is the name this chart sets
+in spec.secrets.ssl, it is also written by the operator's own self-signed
+fallback when cert-manager is absent, and during a CA rotation the operator
+merges the old and new CA into its ca.crt. <release>-ca-cert has none of those
+three properties.
+*/}}
+---
+apiVersion: internal.cozystack.io/v1alpha1
+kind: TenantProjection
+metadata:
+  name: {{ .Release.Name }}-ca
+spec:
+  projections:
+    - type: CACert
+      sourceSecretName: {{ .Release.Name }}-ssl
+      sourceKey: ca.crt
diff --git a/packages/apps/mongodb/tests/backup-secret_test.yaml b/packages/apps/mongodb/tests/backup-secret_test.yaml
index f3eca410eb..8037897201 100644
--- a/packages/apps/mongodb/tests/backup-secret_test.yaml
+++ b/packages/apps/mongodb/tests/backup-secret_test.yaml
@@ -18,6 +18,21 @@ tests:
       - hasDocuments:
           count: 0
 
+  # useSystemBucket: the driver injects a storage referencing the projected
+  # cozy-backups-creds, so the chart skips <release>-s3-creds and needs no
+  # inline keys (no required-fail).
+  - it: skips the s3-creds secret on useSystemBucket
+    release:
+      name: test-mongodb
+      namespace: tenant-test
+    set:
+      backup:
+        enabled: true
+        useSystemBucket: true
+    asserts:
+      - hasDocuments:
+          count: 0
+
   # Rendered when backup enabled
   - it: renders when backup enabled
     release:
@@ -95,7 +110,7 @@ tests:
         s3SecretKey: "secretkey"
     asserts:
       - failedTemplate:
-          errorMessage: "backup.s3AccessKey is required when backup or bootstrap is enabled"
+          errorMessage: "backup.s3AccessKey is required when backup or bootstrap is enabled without useSystemBucket"
 
   # Fails without s3SecretKey
   - it: fails when s3SecretKey missing
@@ -109,4 +124,4 @@ tests:
         s3SecretKey: ""
     asserts:
       - failedTemplate:
-          errorMessage: "backup.s3SecretKey is required when backup or bootstrap is enabled"
+          errorMessage: "backup.s3SecretKey is required when backup or bootstrap is enabled without useSystemBucket"
diff --git a/packages/apps/mongodb/tests/credentials_test.yaml b/packages/apps/mongodb/tests/credentials_test.yaml
index b06924efd3..32935aca17 100644
--- a/packages/apps/mongodb/tests/credentials_test.yaml
+++ b/packages/apps/mongodb/tests/credentials_test.yaml
@@ -3,86 +3,95 @@ suite: credentials tests
 templates:
   - templates/credentials.yaml
 
+release:
+  name: test-mongodb
+  namespace: tenant-test
+
+set:
+  _cluster:
+    cluster-domain: cozy.local
+
 tests:
-  # Basic rendering
-  - it: always renders a Secret
-    release:
-      name: test-mongodb
-      namespace: tenant-test
-    set:
-      _cluster:
-        cluster-domain: cozy.local
+  - it: renders the operator users Secret and the dashboard Secret
     asserts:
       - hasDocuments:
-          count: 1
-      - isKind:
-          of: Secret
-      - equal:
+          count: 2
+      - containsDocument:
+          apiVersion: v1
+          kind: Secret
+          name: test-mongodb-percona-server-mongodb-users
+          any: true
+      - containsDocument:
+          apiVersion: v1
+          kind: Secret
+          name: test-mongodb-credentials
+          any: true
+
+  - it: gives the dashboard a usable password on a first install
+    asserts:
+      - matchRegex:
+          path: stringData.password
+          pattern: ^[A-Za-z0-9]{24}$
+        documentSelector:
+          path: metadata.name
+          value: test-mongodb-credentials
+
+  - it: builds a complete replica-set uri on a first install
+    asserts:
+      - matchRegex:
+          path: stringData.uri
+          pattern: ^mongodb://databaseAdmin:[A-Za-z0-9]{24}@test-mongodb-rs0\.tenant-test\.svc\.cozy\.local:27017/admin\?replicaSet=rs0$
+        documentSelector:
           path: metadata.name
           value: test-mongodb-credentials
-      - equal:
-          path: type
-          value: Opaque
 
-  # Username is always databaseAdmin
   - it: sets username to databaseAdmin
-    release:
-      name: test-mongodb
-      namespace: tenant-test
-    set:
-      _cluster:
-        cluster-domain: cozy.local
     asserts:
       - equal:
           path: stringData.username
           value: databaseAdmin
+        documentSelector:
+          path: metadata.name
+          value: test-mongodb-credentials
 
-  # Port is always 27017
   - it: sets port to 27017
-    release:
-      name: test-mongodb
-      namespace: tenant-test
-    set:
-      _cluster:
-        cluster-domain: cozy.local
     asserts:
       - equal:
           path: stringData.port
           value: "27017"
+        documentSelector:
+          path: metadata.name
+          value: test-mongodb-credentials
 
-  # Host for replica set mode
   - it: uses rs0 service for replica set mode
-    release:
-      name: test-mongodb
-      namespace: tenant-test
     set:
-      _cluster:
-        cluster-domain: cozy.local
       sharding: false
     asserts:
       - equal:
           path: stringData.host
           value: test-mongodb-rs0.tenant-test.svc.cozy.local
+        documentSelector:
+          path: metadata.name
+          value: test-mongodb-credentials
 
-  # Host for sharded mode
-  - it: uses mongos service for sharded mode
-    release:
-      name: test-mongodb
-      namespace: tenant-test
+  - it: uses mongos service and a uri without replicaSet for sharded mode
     set:
-      _cluster:
-        cluster-domain: cozy.local
       sharding: true
     asserts:
       - equal:
           path: stringData.host
           value: test-mongodb-mongos.tenant-test.svc.cozy.local
+        documentSelector:
+          path: metadata.name
+          value: test-mongodb-credentials
+      - matchRegex:
+          path: stringData.uri
+          pattern: ^mongodb://databaseAdmin:[A-Za-z0-9]{24}@test-mongodb-mongos\.tenant-test\.svc\.cozy\.local:27017/admin$
+        documentSelector:
+          path: metadata.name
+          value: test-mongodb-credentials
 
-  # Custom cluster domain
   - it: uses custom cluster domain
-    release:
-      name: test-mongodb
-      namespace: tenant-test
     set:
       _cluster:
         cluster-domain: custom.domain
@@ -91,12 +100,11 @@ tests:
       - equal:
           path: stringData.host
           value: test-mongodb-rs0.tenant-test.svc.custom.domain
+        documentSelector:
+          path: metadata.name
+          value: test-mongodb-credentials
 
-  # Default cluster domain when not set
   - it: defaults to cozy.local when cluster domain not set
-    release:
-      name: test-mongodb
-      namespace: tenant-test
     set:
       _cluster: {}
       sharding: false
@@ -104,29 +112,243 @@ tests:
       - equal:
           path: stringData.host
           value: test-mongodb-rs0.tenant-test.svc.cozy.local
+        documentSelector:
+          path: metadata.name
+          value: test-mongodb-credentials
 
-  # Password empty without operator secret (lookup returns nil in tests)
-  - it: has empty password on first install
-    release:
-      name: test-mongodb
-      namespace: tenant-test
-    set:
-      _cluster:
-        cluster-domain: cozy.local
+  - it: fills every system user the operator expects
+    asserts:
+      - equal:
+          path: stringData.MONGODB_BACKUP_USER
+          value: backup
+        documentSelector:
+          path: metadata.name
+          value: test-mongodb-percona-server-mongodb-users
+      - equal:
+          path: stringData.MONGODB_CLUSTER_ADMIN_USER
+          value: clusterAdmin
+        documentSelector:
+          path: metadata.name
+          value: test-mongodb-percona-server-mongodb-users
+      - equal:
+          path: stringData.MONGODB_CLUSTER_MONITOR_USER
+          value: clusterMonitor
+        documentSelector:
+          path: metadata.name
+          value: test-mongodb-percona-server-mongodb-users
+      - equal:
+          path: stringData.MONGODB_DATABASE_ADMIN_USER
+          value: databaseAdmin
+        documentSelector:
+          path: metadata.name
+          value: test-mongodb-percona-server-mongodb-users
+      - equal:
+          path: stringData.MONGODB_USER_ADMIN_USER
+          value: userAdmin
+        documentSelector:
+          path: metadata.name
+          value: test-mongodb-percona-server-mongodb-users
+
+  - it: generates a password for every system user
+    asserts:
+      - matchRegex:
+          path: stringData.MONGODB_BACKUP_PASSWORD
+          pattern: ^[A-Za-z0-9]{24}$
+        documentSelector:
+          path: metadata.name
+          value: test-mongodb-percona-server-mongodb-users
+      - matchRegex:
+          path: stringData.MONGODB_CLUSTER_ADMIN_PASSWORD
+          pattern: ^[A-Za-z0-9]{24}$
+        documentSelector:
+          path: metadata.name
+          value: test-mongodb-percona-server-mongodb-users
+      - matchRegex:
+          path: stringData.MONGODB_CLUSTER_MONITOR_PASSWORD
+          pattern: ^[A-Za-z0-9]{24}$
+        documentSelector:
+          path: metadata.name
+          value: test-mongodb-percona-server-mongodb-users
+      - matchRegex:
+          path: stringData.MONGODB_DATABASE_ADMIN_PASSWORD
+          pattern: ^[A-Za-z0-9]{24}$
+        documentSelector:
+          path: metadata.name
+          value: test-mongodb-percona-server-mongodb-users
+      - matchRegex:
+          path: stringData.MONGODB_USER_ADMIN_PASSWORD
+          pattern: ^[A-Za-z0-9]{24}$
+        documentSelector:
+          path: metadata.name
+          value: test-mongodb-percona-server-mongodb-users
+
+  - it: types both Secrets Opaque
     asserts:
+      - equal:
+          path: type
+          value: Opaque
+        documentSelector:
+          path: metadata.name
+          value: test-mongodb-percona-server-mongodb-users
+      - equal:
+          path: type
+          value: Opaque
+        documentSelector:
+          path: metadata.name
+          value: test-mongodb-credentials
+
+  - it: reuses a helm-owned users Secret instead of rotating it
+    kubernetesProvider:
+      scheme:
+        "v1/Secret":
+          gvr:
+            version: v1
+            resource: secrets
+          namespaced: true
+      objects:
+        - apiVersion: v1
+          kind: Secret
+          metadata:
+            name: test-mongodb-percona-server-mongodb-users
+            namespace: tenant-test
+            annotations:
+              meta.helm.sh/release-name: test-mongodb
+              meta.helm.sh/release-namespace: tenant-test
+          data:
+            MONGODB_DATABASE_ADMIN_USER: ZGF0YWJhc2VBZG1pbg==
+            MONGODB_DATABASE_ADMIN_PASSWORD: cmV1c2VkLXB3LTE=
+            MONGODB_BACKUP_PASSWORD: YmFja3VwLXB3LTE=
+    asserts:
+      - hasDocuments:
+          count: 2
       - equal:
           path: stringData.password
-          value: ""
+          value: reused-pw-1
+        documentSelector:
+          path: metadata.name
+          value: test-mongodb-credentials
+      - equal:
+          path: stringData.uri
+          value: mongodb://databaseAdmin:reused-pw-1@test-mongodb-rs0.tenant-test.svc.cozy.local:27017/admin?replicaSet=rs0
+        documentSelector:
+          path: metadata.name
+          value: test-mongodb-credentials
+      - equal:
+          path: stringData.MONGODB_DATABASE_ADMIN_PASSWORD
+          value: reused-pw-1
+        documentSelector:
+          path: metadata.name
+          value: test-mongodb-percona-server-mongodb-users
+      - equal:
+          path: stringData.MONGODB_BACKUP_PASSWORD
+          value: backup-pw-1
+        documentSelector:
+          path: metadata.name
+          value: test-mongodb-percona-server-mongodb-users
+      - matchRegex:
+          path: stringData.MONGODB_USER_ADMIN_PASSWORD
+          pattern: ^[A-Za-z0-9]{24}$
+        documentSelector:
+          path: metadata.name
+          value: test-mongodb-percona-server-mongodb-users
 
-  # URI empty without password
-  - it: has empty uri when password not available
-    release:
-      name: test-mongodb
-      namespace: tenant-test
-    set:
-      _cluster:
-        cluster-domain: cozy.local
+  - it: leaves a users Secret it does not own out of the manifest and still fills the credentials
+    kubernetesProvider:
+      scheme:
+        "v1/Secret":
+          gvr:
+            version: v1
+            resource: secrets
+          namespaced: true
+      objects:
+        - apiVersion: v1
+          kind: Secret
+          metadata:
+            name: test-mongodb-percona-server-mongodb-users
+            namespace: tenant-test
+          data:
+            MONGODB_BACKUP_USER: YmFja3Vw
+            MONGODB_BACKUP_PASSWORD: YmFja3VwLXB3LTE=
+            MONGODB_CLUSTER_ADMIN_USER: Y2x1c3RlckFkbWlu
+            MONGODB_CLUSTER_ADMIN_PASSWORD: cmV1c2VkLXB3LTE=
+            MONGODB_CLUSTER_MONITOR_USER: Y2x1c3Rlck1vbml0b3I=
+            MONGODB_CLUSTER_MONITOR_PASSWORD: cmV1c2VkLXB3LTE=
+            MONGODB_DATABASE_ADMIN_USER: ZGJhZG1pbg==
+            MONGODB_DATABASE_ADMIN_PASSWORD: cEBzczp3L3Jk
+            MONGODB_USER_ADMIN_USER: dXNlckFkbWlu
+            MONGODB_USER_ADMIN_PASSWORD: cmV1c2VkLXB3LTE=
     asserts:
+      - hasDocuments:
+          count: 1
+      - equal:
+          path: metadata.name
+          value: test-mongodb-credentials
+      - equal:
+          path: stringData.username
+          value: dbadmin
+      - equal:
+          path: stringData.password
+          value: p@ss:w/rd
       - equal:
           path: stringData.uri
-          value: ""
+          value: mongodb://dbadmin:p%40ss%3Aw%2Frd@test-mongodb-rs0.tenant-test.svc.cozy.local:27017/admin?replicaSet=rs0
+
+  - it: rebuilds the users Secret from the operator copy when the per-release Secret is gone
+    kubernetesProvider:
+      scheme:
+        "v1/Secret":
+          gvr:
+            version: v1
+            resource: secrets
+          namespaced: true
+      objects:
+        - apiVersion: v1
+          kind: Secret
+          metadata:
+            name: internal-test-mongodb-users
+            namespace: tenant-test
+          data:
+            MONGODB_DATABASE_ADMIN_USER: ZGF0YWJhc2VBZG1pbg==
+            MONGODB_DATABASE_ADMIN_PASSWORD: cmV1c2VkLXB3LTE=
+    asserts:
+      - hasDocuments:
+          count: 2
+      - equal:
+          path: stringData.MONGODB_DATABASE_ADMIN_PASSWORD
+          value: reused-pw-1
+        documentSelector:
+          path: metadata.name
+          value: test-mongodb-percona-server-mongodb-users
+      - equal:
+          path: stringData.password
+          value: reused-pw-1
+        documentSelector:
+          path: metadata.name
+          value: test-mongodb-credentials
+      - matchRegex:
+          path: stringData.MONGODB_BACKUP_PASSWORD
+          pattern: ^[A-Za-z0-9]{24}$
+        documentSelector:
+          path: metadata.name
+          value: test-mongodb-percona-server-mongodb-users
+
+  - it: refuses to invent a password for a users Secret it does not own
+    kubernetesProvider:
+      scheme:
+        "v1/Secret":
+          gvr:
+            version: v1
+            resource: secrets
+          namespaced: true
+      objects:
+        - apiVersion: v1
+          kind: Secret
+          metadata:
+            name: test-mongodb-percona-server-mongodb-users
+            namespace: tenant-test
+          data:
+            MONGODB_DATABASE_ADMIN_USER: ZGF0YWJhc2VBZG1pbg==
+            MONGODB_DATABASE_ADMIN_PASSWORD: cmV1c2VkLXB3LTE=
+    asserts:
+      - failedTemplate:
+          errorPattern: "Secret test-mongodb-percona-server-mongodb-users is not managed by release test-mongodb and neither it nor internal-test-mongodb-users carries MONGODB_BACKUP_PASSWORD"
diff --git a/packages/apps/mongodb/tests/dashboard-resourcemap_test.yaml b/packages/apps/mongodb/tests/dashboard-resourcemap_test.yaml
index 8cc1a0a7ba..d1151786f0 100644
--- a/packages/apps/mongodb/tests/dashboard-resourcemap_test.yaml
+++ b/packages/apps/mongodb/tests/dashboard-resourcemap_test.yaml
@@ -104,3 +104,135 @@ tests:
           path: roleRef.apiGroup
           value: rbac.authorization.k8s.io
         documentIndex: 1
+
+  # The operator's TLS Secrets both carry private key material: <release>-ca-cert
+  # holds the CA private key, <release>-ssl holds the server private key. Neither
+  # may ever be granted to a tenant. The trust anchor is delivered instead as the
+  # key-free <release>.tenant-ca projection, via core.cozystack.io/tenantsecrets
+  # — a label-gated path, so it needs no grant in this Role either.
+  #
+  # The four tests below pick the Role with documentSelector rather than
+  # documentIndex, and each pairs its notContains with a positive assertion on
+  # the same path. Both halves are load-bearing and neither substitutes for the
+  # other: notContains passes when the path does not resolve, so on its own it
+  # goes green against the WRONG document (reorder the template) and green when
+  # the path moves (reorder the rules). Indexing survives neither; selecting
+  # survives the first; the positive anchor catches the second.
+
+  - it: Role does not grant the key-bearing TLS secrets
+    release:
+      name: test-mongodb
+      namespace: tenant-test
+    documentSelector:
+      path: kind
+      value: Role
+    asserts:
+      - notContains:
+          path: rules[1].resourceNames
+          content: test-mongodb-ca-cert
+      - notContains:
+          path: rules[1].resourceNames
+          content: test-mongodb-ssl
+      - equal:
+          path: rules[1].resourceNames
+          value:
+            - test-mongodb-credentials
+
+  - it: Role does not grant the key-bearing TLS secrets when external is enabled
+    release:
+      name: test-mongodb
+      namespace: tenant-test
+    documentSelector:
+      path: kind
+      value: Role
+    set:
+      external: true
+    asserts:
+      - notContains:
+          path: rules[1].resourceNames
+          content: test-mongodb-ca-cert
+      - notContains:
+          path: rules[1].resourceNames
+          content: test-mongodb-ssl
+      - equal:
+          path: rules[1].resourceNames
+          value:
+            - test-mongodb-credentials
+
+  - it: Role does not grant the tenant-ca projection by name
+    release:
+      name: test-mongodb
+      namespace: tenant-test
+    documentSelector:
+      path: kind
+      value: Role
+    asserts:
+      - notContains:
+          path: rules[1].resourceNames
+          content: test-mongodb.tenant-ca
+      - equal:
+          path: rules[1].resourceNames
+          value:
+            - test-mongodb-credentials
+
+  - it: Role has exactly three rules
+    release:
+      name: test-mongodb
+      namespace: tenant-test
+    documentSelector:
+      path: kind
+      value: Role
+    asserts:
+      # The secret assertions above are all anchored to rules[1]. Without this,
+      # a fourth rule granting secrets by name would satisfy every one of them
+      # while reopening the leak.
+      - lengthEqual:
+          path: rules
+          count: 3
+
+  - it: the secrets rule grants secrets and nothing wider
+    release:
+      name: test-mongodb
+      namespace: tenant-test
+    documentSelector:
+      path: kind
+      value: Role
+    asserts:
+      # Every other assertion here constrains resourceNames. None constrained
+      # `resources`, so mutating this rule to ["*"] would grant every resource
+      # kind in the namespace — Secrets included, whatever their names — while
+      # leaving the whole suite green.
+      - equal:
+          path: rules[1].resources
+          value:
+            - secrets
+      - equal:
+          path: rules[1].apiGroups
+          value:
+            - ""
+      # The other two rules are pinned for the same reason. Neither names a
+      # key-bearing Secret today, so widening one leaks nothing immediately —
+      # but a rule mutated to ["*"] would grant every resource kind for the
+      # names it lists, and closing the class costs no more than closing the
+      # one instance.
+      - equal:
+          path: rules[0].resources
+          value:
+            - services
+      - equal:
+          path: rules[2].resources
+          value:
+            - workloadmonitors
+      # verbs is the fourth axis of an RBAC rule and the last one left open.
+      # Widening it does not leak a key while resourceNames stays narrow, but
+      # it is the same widening class the assertions above close, and the Role
+      # is read-only by intent.
+      - equal:
+          path: rules[0].verbs
+          value: ["get", "list", "watch"]
+      - equal:
+          path: rules[1].verbs
+          value: ["get", "list", "watch"]
+      - equal:
+          path: rules[2].verbs
+          value: ["get", "list", "watch"]
diff --git a/packages/apps/mongodb/tests/mongodb_test.yaml b/packages/apps/mongodb/tests/mongodb_test.yaml
index a96f8b0dde..d6f4f039d1 100644
--- a/packages/apps/mongodb/tests/mongodb_test.yaml
+++ b/packages/apps/mongodb/tests/mongodb_test.yaml
@@ -38,6 +38,85 @@ tests:
           value: my-mongodb
         documentIndex: 0
 
+  #########################
+  # Backup storage gating #
+  #########################
+
+  # Legacy flow: the chart renders the static s3-storage from backup.* values.
+  - it: renders static s3-storage on the legacy backup flow
+    release:
+      name: test-mongodb
+      namespace: tenant-test
+    set:
+      _cluster:
+        cluster-domain: cozy.local
+      backup:
+        enabled: true
+        useSystemBucket: false
+        destinationPath: s3://my-bucket/mongodb-src/
+        endpointURL: https://s3.example.org
+    asserts:
+      - equal:
+          path: spec.backup.enabled
+          value: true
+        documentIndex: 0
+      - equal:
+          path: spec.backup.storages.s3-storage.s3.credentialsSecret
+          value: test-mongodb-s3-creds
+        documentIndex: 0
+
+  # useSystemBucket: enabled stays true (pbm agents run) but the chart omits
+  # spec.backup.storages entirely - the cozy-default BackupClass driver
+  # SSA-injects it at BackupJob time, so Helm must not own that subtree.
+  - it: omits spec.backup.storages on useSystemBucket
+    release:
+      name: test-mongodb
+      namespace: tenant-test
+    set:
+      _cluster:
+        cluster-domain: cozy.local
+      backup:
+        enabled: true
+        useSystemBucket: true
+    asserts:
+      - equal:
+          path: spec.backup.enabled
+          value: true
+        documentIndex: 0
+      - notExists:
+          path: spec.backup.storages
+        documentIndex: 0
+      - notExists:
+          path: spec.backup.tasks
+        documentIndex: 0
+      - notExists:
+          path: spec.backup.pitr
+        documentIndex: 0
+
+  - it: ignores retentionPolicy and schedule on useSystemBucket (renders, no tasks)
+    # On this flow retentionPolicy and schedule are inert (documented as ignored),
+    # handled the same way: a custom value renders cleanly without emitting the
+    # tasks block, never a hard render error.
+    release:
+      name: test-mongodb
+      namespace: tenant-test
+    set:
+      _cluster:
+        cluster-domain: cozy.local
+      backup:
+        enabled: true
+        useSystemBucket: true
+        retentionPolicy: 7d
+        schedule: "0 5 * * *"
+    asserts:
+      - equal:
+          path: spec.backup.enabled
+          value: true
+        documentIndex: 0
+      - notExists:
+          path: spec.backup.tasks
+        documentIndex: 0
+
   ##################
   # Finalizers     #
   ##################
@@ -106,7 +185,7 @@ tests:
   # CR Version     #
   ##################
 
-  - it: sets crVersion to 1.21.1
+  - it: sets crVersion to 1.22.0
     release:
       name: test-mongodb
       namespace: tenant-test
@@ -116,7 +195,7 @@ tests:
     asserts:
       - equal:
           path: spec.crVersion
-          value: "1.21.1"
+          value: "1.22.0"
         documentIndex: 0
 
   #####################
@@ -191,7 +270,9 @@ tests:
     asserts:
       - notExists:
           path: spec.unsafeFlags
-        documentIndex: 0
+        documentSelector:
+          path: kind
+          value: PerconaServerMongoDB
 
   - it: does not set unsafeFlags when replicas is 5
     release:
@@ -204,7 +285,9 @@ tests:
     asserts:
       - notExists:
           path: spec.unsafeFlags
-        documentIndex: 0
+        documentSelector:
+          path: kind
+          value: PerconaServerMongoDB
 
   ###########################
   # Replica Set Mode        #
@@ -275,7 +358,9 @@ tests:
     asserts:
       - notExists:
           path: spec.replsets[0].volumeSpec.persistentVolumeClaim.storageClassName
-        documentIndex: 0
+        documentSelector:
+          path: kind
+          value: PerconaServerMongoDB
 
   ###########################
   # Replica set expose      #
@@ -465,7 +550,9 @@ tests:
     asserts:
       - notExists:
           path: spec.users
-        documentIndex: 0
+        documentSelector:
+          path: kind
+          value: PerconaServerMongoDB
 
   - it: configures users with admin role
     release:
@@ -838,3 +925,20 @@ tests:
           value: mongod
         documentIndex: 1
 
+  # useSystemBucket without backup.enabled renders a cluster that can never
+  # service a BackupJob (the pbm agents run on enabled alone), so the chart
+  # refuses it at render time instead of letting the tenant find out at the
+  # first BackupJob's deadline.
+  - it: refuses useSystemBucket without backup.enabled
+    release:
+      name: mongo-usb-off
+      namespace: tenant-test
+    set:
+      _cluster:
+        cluster-domain: cozy.local
+      backup:
+        enabled: false
+        useSystemBucket: true
+    asserts:
+      - failedTemplate:
+          errorMessage: "mongodb: backup.useSystemBucket=true requires backup.enabled=true: the percona-backup-mongodb agents only run when backups are enabled, so this combination renders a cluster that can never service a BackupJob. Set backup.enabled=true (or drop useSystemBucket). See docs/operations/backup-classes.md."
diff --git a/packages/apps/mongodb/tests/no-certmanager-objects_test.yaml b/packages/apps/mongodb/tests/no-certmanager-objects_test.yaml
new file mode 100644
index 0000000000..8ea40265a7
--- /dev/null
+++ b/packages/apps/mongodb/tests/no-certmanager-objects_test.yaml
@@ -0,0 +1,90 @@
+suite: chart renders no cert-manager objects
+
+# The PSMDB operator owns the entire cert-manager chain — the self-signed
+# bootstrap Issuer, the CA Certificate, the CA-backed Issuer and the leaf
+# certificates — and controls the CA it embeds in the pods. Anything this chart
+# rendered would be orphaned and ignored as a trust anchor while looking like
+# it participated. The invariant is stated in both templates/mongodb.yaml and
+# the README; this suite is what stops it from silently becoming untrue.
+#
+# Deliberately NOT scoped with `templates:` — the point is to see every
+# document the chart produces, not one file.
+#
+# `any: true` is REQUIRED on every containsDocument below, and its absence is
+# not a style difference. Without it the matcher asserts that EVERY rendered
+# document matches, so negating it yields "not every document is a
+# Certificate" — true of any template FILE rendering more than one document,
+# which is the granularity these are ANDed at, so a forbidden kind rendered
+# alongside another document in one file would pass unconditionally. The
+# vacuity control is the guard against that: it fails if the negated form ever
+# stops discriminating.
+
+release:
+  name: mg-test
+  namespace: tenant-test
+
+set:
+  _cluster:
+    cluster-domain: cozy.local
+
+tests:
+  # Positive control for the four negatives that follow. All of them are
+  # satisfied by a matcher that never matches anything, so they are only worth
+  # as much as the proof that this one does. Asserting a kind the chart
+  # certainly DOES render, through the same matcher shape and the same
+  # `any: true`, supplies it.
+  #
+  # Scoped to the one template that renders the CR, unlike the negatives. An
+  # unscoped assertion is ANDed across template files, so a positive one would
+  # demand the CR appear in backup-secret.yaml and credentials.yaml too and
+  # fail for the wrong reason. That same ANDing is what makes the unscoped
+  # negatives correct: they go red if ANY file renders the forbidden kind.
+  - it: the containsDocument matcher discriminates
+    templates:
+      - templates/mongodb.yaml
+    asserts:
+      - containsDocument:
+          kind: PerconaServerMongoDB
+          apiVersion: psmdb.percona.com/v1
+          any: true
+
+  - it: renders no cert-manager Certificate
+    asserts:
+      - not: true
+        containsDocument:
+          kind: Certificate
+          apiVersion: cert-manager.io/v1
+          any: true
+
+  - it: renders no cert-manager Issuer
+    asserts:
+      - not: true
+        containsDocument:
+          kind: Issuer
+          apiVersion: cert-manager.io/v1
+          any: true
+
+  - it: renders no cert-manager objects with external access enabled
+    set:
+      external: true
+      _namespace:
+        host: example.com
+    asserts:
+      - not: true
+        containsDocument:
+          kind: Certificate
+          apiVersion: cert-manager.io/v1
+          any: true
+      - not: true
+        containsDocument:
+          kind: Issuer
+          apiVersion: cert-manager.io/v1
+          any: true
+
+  - it: renders no cert-manager ClusterIssuer
+    asserts:
+      - not: true
+        containsDocument:
+          kind: ClusterIssuer
+          apiVersion: cert-manager.io/v1
+          any: true
diff --git a/packages/apps/mongodb/tests/restore-storage_test.yaml b/packages/apps/mongodb/tests/restore-storage_test.yaml
new file mode 100644
index 0000000000..1f1245bf80
--- /dev/null
+++ b/packages/apps/mongodb/tests/restore-storage_test.yaml
@@ -0,0 +1,133 @@
+suite: bootstrap restore reads where the backup storage writes
+
+templates:
+  - templates/mongodb.yaml
+  - templates/restore.yaml
+
+release:
+  name: test-mongodb
+  namespace: tenant-test
+
+tests:
+  - it: gives the restore the same S3 location and access as the backup storage
+    set:
+      _cluster:
+        cluster-domain: cozy.local
+      bootstrap:
+        enabled: true
+        backupName: "2026-10-01T02:00:21Z"
+      backup:
+        enabled: true
+        destinationPath: "s3://mybucket/mongodb/prod/"
+        endpointURL: "https://s3.example.org"
+        insecureSkipTLSVerify: true
+        s3AccessKey: "access"
+        s3SecretKey: "secret"
+    asserts:
+      - equal:
+          path: spec.backup.storages.s3-storage.s3.bucket
+          value: mybucket
+        template: templates/mongodb.yaml
+        documentSelector:
+          path: kind
+          value: PerconaServerMongoDB
+      - equal:
+          path: spec.backupSource.s3.bucket
+          value: mybucket
+        template: templates/restore.yaml
+      - equal:
+          path: spec.backup.storages.s3-storage.s3.prefix
+          value: mongodb/prod/
+        template: templates/mongodb.yaml
+        documentSelector:
+          path: kind
+          value: PerconaServerMongoDB
+      - equal:
+          path: spec.backupSource.s3.prefix
+          value: mongodb/prod/
+        template: templates/restore.yaml
+      - equal:
+          path: spec.backup.storages.s3-storage.s3.endpointUrl
+          value: https://s3.example.org
+        template: templates/mongodb.yaml
+        documentSelector:
+          path: kind
+          value: PerconaServerMongoDB
+      - equal:
+          path: spec.backupSource.s3.endpointUrl
+          value: https://s3.example.org
+        template: templates/restore.yaml
+      - equal:
+          path: spec.backup.storages.s3-storage.s3.credentialsSecret
+          value: test-mongodb-s3-creds
+        template: templates/mongodb.yaml
+        documentSelector:
+          path: kind
+          value: PerconaServerMongoDB
+      - equal:
+          path: spec.backupSource.s3.credentialsSecret
+          value: test-mongodb-s3-creds
+        template: templates/restore.yaml
+      - equal:
+          path: spec.backup.storages.s3-storage.s3.insecureSkipTLSVerify
+          value: true
+        template: templates/mongodb.yaml
+        documentSelector:
+          path: kind
+          value: PerconaServerMongoDB
+      - equal:
+          path: spec.backupSource.s3.insecureSkipTLSVerify
+          value: true
+        template: templates/restore.yaml
+      - equal:
+          path: spec.backup.storages.s3-storage.s3.forcePathStyle
+          value: true
+        template: templates/mongodb.yaml
+        documentSelector:
+          path: kind
+          value: PerconaServerMongoDB
+      - equal:
+          path: spec.backupSource.s3.forcePathStyle
+          value: true
+        template: templates/restore.yaml
+      - equal:
+          path: spec.backupSource.destination
+          value: s3://mybucket/mongodb/prod/2026-10-01T02:00:21Z
+        template: templates/restore.yaml
+
+  - it: keeps a numeric bucket and prefix as strings on both sides
+    set:
+      _cluster:
+        cluster-domain: cozy.local
+      bootstrap:
+        enabled: true
+        backupName: "2026-10-01T02:00:21Z"
+      backup:
+        enabled: true
+        destinationPath: "s3://2024/10"
+        endpointURL: "https://s3.example.org"
+        s3AccessKey: "access"
+        s3SecretKey: "secret"
+    asserts:
+      - equal:
+          path: spec.backup.storages.s3-storage.s3.bucket
+          value: "2024"
+        template: templates/mongodb.yaml
+        documentSelector:
+          path: kind
+          value: PerconaServerMongoDB
+      - equal:
+          path: spec.backup.storages.s3-storage.s3.prefix
+          value: "10"
+        template: templates/mongodb.yaml
+        documentSelector:
+          path: kind
+          value: PerconaServerMongoDB
+      - equal:
+          path: spec.backupSource.s3.bucket
+          value: "2024"
+        template: templates/restore.yaml
+      - equal:
+          path: spec.backupSource.s3.prefix
+          value: "10"
+        template: templates/restore.yaml
diff --git a/packages/apps/mongodb/tests/restore_test.yaml b/packages/apps/mongodb/tests/restore_test.yaml
index e591587b9c..8337873b56 100644
--- a/packages/apps/mongodb/tests/restore_test.yaml
+++ b/packages/apps/mongodb/tests/restore_test.yaml
@@ -59,6 +59,20 @@ tests:
       - failedTemplate:
           errorMessage: "bootstrap.backupName is required when bootstrap.enabled is true"
 
+  - it: fails when bootstrap and useSystemBucket are both enabled
+    release:
+      name: test-mongodb
+      namespace: tenant-test
+    set:
+      bootstrap:
+        enabled: true
+        backupName: "my-backup"
+      backup:
+        useSystemBucket: true
+    asserts:
+      - failedTemplate:
+          errorMessage: "mongodb: bootstrap.enabled=true is incompatible with backup.useSystemBucket=true. bootstrap.enabled is not reset after a bootstrap restore completes, so set bootstrap.enabled=false before opting in; to restore from the system bucket use a backups.cozystack.io/RestoreJob against the cozy-default BackupClass instead. See docs/operations/backup-classes.md."
+
   - it: fails when destinationPath is missing
     release:
       name: test-mongodb
@@ -267,11 +281,131 @@ tests:
           path: spec.backupSource.s3.forcePathStyle
           value: true
 
+  - it: sets bucket and prefix from destinationPath
+    release:
+      name: test-mongodb
+      namespace: tenant-test
+    set:
+      bootstrap:
+        enabled: true
+        backupName: "backup"
+      backup:
+        destinationPath: "s3://mybucket/mongodb/prod/"
+        endpointURL: "http://minio:9000"
+        s3AccessKey: "access"
+        s3SecretKey: "secret"
+    asserts:
+      - equal:
+          path: spec.backupSource.s3.bucket
+          value: mybucket
+      - equal:
+          path: spec.backupSource.s3.prefix
+          value: mongodb/prod/
+
+  - it: keeps a prefix without a trailing slash as given
+    release:
+      name: test-mongodb
+      namespace: tenant-test
+    set:
+      bootstrap:
+        enabled: true
+        backupName: "backup"
+      backup:
+        destinationPath: "s3://mybucket/mongodb/prod"
+        endpointURL: "http://minio:9000"
+        s3AccessKey: "access"
+        s3SecretKey: "secret"
+    asserts:
+      - equal:
+          path: spec.backupSource.s3.prefix
+          value: mongodb/prod
+      - equal:
+          path: spec.backupSource.destination
+          value: s3://mybucket/mongodb/prod/backup
+
+  - it: sets an empty prefix when destinationPath is the bucket root
+    release:
+      name: test-mongodb
+      namespace: tenant-test
+    set:
+      bootstrap:
+        enabled: true
+        backupName: "backup"
+      backup:
+        destinationPath: "s3://mybucket"
+        endpointURL: "http://minio:9000"
+        s3AccessKey: "access"
+        s3SecretKey: "secret"
+    asserts:
+      - equal:
+          path: spec.backupSource.s3.bucket
+          value: mybucket
+      - equal:
+          path: spec.backupSource.s3.prefix
+          value: ""
+      - equal:
+          path: spec.backupSource.destination
+          value: s3://mybucket/backup
+
+  - it: keeps a numeric bucket and prefix as strings
+    release:
+      name: test-mongodb
+      namespace: tenant-test
+    set:
+      bootstrap:
+        enabled: true
+        backupName: "backup"
+      backup:
+        destinationPath: "s3://2024/10"
+        endpointURL: "http://minio:9000"
+        s3AccessKey: "access"
+        s3SecretKey: "secret"
+    asserts:
+      - equal:
+          path: spec.backupSource.s3.bucket
+          value: "2024"
+      - equal:
+          path: spec.backupSource.s3.prefix
+          value: "10"
+
+  - it: fails when destinationPath names no bucket
+    release:
+      name: test-mongodb
+      namespace: tenant-test
+    set:
+      bootstrap:
+        enabled: true
+        backupName: "backup"
+      backup:
+        destinationPath: "s3://"
+        endpointURL: "http://minio:9000"
+        s3AccessKey: "access"
+        s3SecretKey: "secret"
+    asserts:
+      - failedTemplate:
+          errorMessage: "backup.destinationPath must name a bucket (s3://bucket/path/) when bootstrap.enabled is true"
+
+  - it: does not check the bucket when bootstrap is disabled
+    release:
+      name: test-mongodb
+      namespace: tenant-test
+    set:
+      bootstrap:
+        enabled: false
+      backup:
+        destinationPath: "s3://"
+    asserts:
+      - hasDocuments:
+          count: 0
+
   #####################
   # PITR              #
   #####################
 
   - it: does not set pitr when recoveryTime not specified
+    documentSelector:
+      path: kind
+      value: PerconaServerMongoDBRestore
     release:
       name: test-mongodb
       namespace: tenant-test
diff --git a/packages/apps/mongodb/tests/tenant_projection_test.yaml b/packages/apps/mongodb/tests/tenant_projection_test.yaml
new file mode 100644
index 0000000000..1b20e8badc
--- /dev/null
+++ b/packages/apps/mongodb/tests/tenant_projection_test.yaml
@@ -0,0 +1,99 @@
+suite: mongodb TenantProjection sentinel
+
+# The chart renders one TenantProjection per release: the declaration that tells
+# the CA-extraction controller to lift ca.crt out of the key-bearing
+# <release>-ssl into the tenant-readable <release>.tenant-ca projection.
+#
+# The load-bearing invariant is the ABSENCE of ownerReferences. The sentinel must
+# carry none — it owns the projection, and it is itself owned only through the
+# helm.toolkit.fluxcd.io/name label Flux stamps, which is how the lineage webhook
+# resolves the application. An ownerReference here would short-circuit that walk
+# and silently break the tenant's read path (pkg/lineage/lineage.go).
+
+release:
+  name: test-mongodb
+  namespace: tenant-test
+
+templates:
+  - templates/tenant-projection.yaml
+
+tests:
+  - it: renders exactly one TenantProjection named after the release
+    asserts:
+      - hasDocuments:
+          count: 1
+      - isKind:
+          of: TenantProjection
+      - equal:
+          path: apiVersion
+          value: internal.cozystack.io/v1alpha1
+      - equal:
+          path: metadata.name
+          value: test-mongodb-ca
+
+  # The source is the leaf Secret, not the operator's <release>-ca-cert. That
+  # one exists only on the cert-manager path and holds a single CA rather than
+  # the merged old+new bundle the operator maintains through a rotation.
+  #
+  # This name is only correct because the CR asks the operator for that same
+  # Secret. The other half is pinned in tls_test.yaml ("spec.secrets.ssl
+  # references the operator-managed leaf secret by default"); rename one without
+  # the other and the projection never becomes ready.
+  - it: declares a CACert projection of the operator-issued leaf Secret
+    asserts:
+      - equal:
+          path: spec.projections[0].type
+          value: CACert
+      - equal:
+          path: spec.projections[0].sourceSecretName
+          value: test-mongodb-ssl
+      - equal:
+          path: spec.projections[0].sourceKey
+          value: ca.crt
+
+  # THE invariant, and the only one here that breaks something. The controller
+  # resolves the owning application by walking to the sentinel's
+  # helm.toolkit.fluxcd.io/name label; an ownerReference short-circuits that
+  # walk, and the tenant silently stops receiving the anchor.
+  - it: carries no ownerReferences, so the lineage walk reaches the release
+    asserts:
+      - notExists:
+          path: metadata.ownerReferences
+
+  # Conformance to the shape Flux and the controller expect, not an invariant:
+  # an explicit namespace or a chart-added label does not break the walk by
+  # itself. Kept separate so the test above keeps its meaning — a single test
+  # named for three unrelated properties reads as though all three were
+  # load-bearing.
+  - it: sets no namespace and adds no labels of its own
+    asserts:
+      - notExists:
+          path: metadata.namespace
+      - notExists:
+          path: metadata.labels
+
+  # Unlike qdrant, the sentinel is ungated: the operator mints the CA whatever
+  # the chart asks for, so there is no plaintext release to skip.
+  #
+  # This is the only case that catches a gate keyed on `external` being TRUE —
+  # every other test here renders with the default `external: false` and stays
+  # green through one. Engines that do gate derive the condition from external
+  # access, so that is the shape a gate copied from one of them would take.
+  - it: renders regardless of external access or sharding
+    set:
+      external: true
+      sharding: true
+    asserts:
+      - hasDocuments:
+          count: 1
+
+  - it: renders the source name from the release, not a fixed string
+    release:
+      name: other-mongodb
+    asserts:
+      - equal:
+          path: metadata.name
+          value: other-mongodb-ca
+      - equal:
+          path: spec.projections[0].sourceSecretName
+          value: other-mongodb-ssl
diff --git a/packages/apps/mongodb/tests/tls_test.yaml b/packages/apps/mongodb/tests/tls_test.yaml
new file mode 100644
index 0000000000..0ddb38e463
--- /dev/null
+++ b/packages/apps/mongodb/tests/tls_test.yaml
@@ -0,0 +1,345 @@
+suite: mongodb TLS CR integration
+
+# TLS is always on in operator-managed mode: the chart unconditionally sets
+# spec.secrets.ssl and spec.tls.mode: preferTLS. The PSMDB operator manages the
+# full cert-manager chain (it does NOT render Issuer/Certificate resources) —
+# see templates/mongodb.yaml for the detailed explanation.
+#
+# splitHorizons (per-pod external hostnames → leaf cert SANs) is injected only
+# when external: true and the per-tenant host (_namespace.host) is present.
+
+release:
+  name: mg-test
+  namespace: tenant-test
+
+set:
+  _cluster:
+    cluster-domain: cozy.local
+
+templates:
+  - templates/mongodb.yaml
+
+tests:
+  ############################################################
+  # TLS is always enabled (operator-managed), regardless of external
+  ############################################################
+
+  - it: spec.tls.mode is preferTLS by default (internal instance, external false)
+    documentIndex: 0
+    asserts:
+      - equal:
+          path: spec.tls.mode
+          value: preferTLS
+
+  - it: spec.secrets.ssl references the operator-managed leaf secret by default
+    documentIndex: 0
+    asserts:
+      - equal:
+          path: spec.secrets.ssl
+          value: mg-test-ssl
+
+  - it: TLS stays on when external is true
+    set:
+      external: true
+      _namespace:
+        host: example.cozy.local
+    documentIndex: 0
+    asserts:
+      - equal:
+          path: spec.tls.mode
+          value: preferTLS
+      - equal:
+          path: spec.secrets.ssl
+          value: mg-test-ssl
+
+  - it: spec.tls has no issuerConf (the operator-managed secret is passed directly)
+    documentIndex: 0
+    asserts:
+      - notExists:
+          path: spec.tls.issuerConf
+
+  ############################################################
+  # crVersion gates the operator's splitHorizons → SAN injection
+  # (cr.CompareVersion("1.22.0") >= 0 in pkg/psmdb/tls/tls.go)
+  ############################################################
+
+  - it: crVersion is hardcoded to 1.22.0
+    documentIndex: 0
+    asserts:
+      - equal:
+          path: spec.crVersion
+          value: 1.22.0
+
+  ############################################################
+  # splitHorizons: per-pod external hostnames for external TLS
+  ############################################################
+
+  - it: splitHorizons advertises per-pod external hostnames when external + host present
+    set:
+      external: true
+      _namespace:
+        host: example.cozy.local
+    documentIndex: 0
+    asserts:
+      - equal:
+          path: spec.replsets[0].splitHorizons
+          value:
+            mg-test-rs0-0:
+              external: mg-test-rs0-0.example.cozy.local
+            mg-test-rs0-1:
+              external: mg-test-rs0-1.example.cozy.local
+            mg-test-rs0-2:
+              external: mg-test-rs0-2.example.cozy.local
+
+  - it: splitHorizons honours the replica count
+    set:
+      external: true
+      replicas: 2
+      _namespace:
+        host: example.cozy.local
+    documentIndex: 0
+    asserts:
+      - equal:
+          path: spec.replsets[0].splitHorizons
+          value:
+            mg-test-rs0-0:
+              external: mg-test-rs0-0.example.cozy.local
+            mg-test-rs0-1:
+              external: mg-test-rs0-1.example.cozy.local
+
+  - it: TLS stays active but splitHorizons is omitted when external true and _namespace.host absent
+    set:
+      external: true
+      # _namespace intentionally absent — controller has not populated host yet
+    documentIndex: 0
+    asserts:
+      - equal:
+          path: spec.tls.mode
+          value: preferTLS
+      - notExists:
+          path: spec.replsets[0].splitHorizons
+
+  - it: no splitHorizons for internal instances (external false)
+    set:
+      external: false
+      # The host must be present for this case to isolate `external`. Without
+      # it the horizons would be omitted by the host guard regardless, so the
+      # test would pass even with the external check removed.
+      _namespace:
+        host: example.com
+    documentIndex: 0
+    asserts:
+      - notExists:
+          path: spec.replsets[0].splitHorizons
+
+  - it: chart does not set allowInvalidCertificates, leaving the operator default
+    documentIndex: 0
+    asserts:
+      # The README states the permissive default is inherited rather than
+      # chosen here. Pin that, so the claim stays falsifiable.
+      - notExists:
+          path: spec.tls.allowInvalidCertificates
+
+  - it: chart does not set certValidityDuration, leaving the operator default
+    documentIndex: 0
+    asserts:
+      # Same class as allowInvalidCertificates above: the leaf lifetime is the
+      # operator's to choose, not this chart's. Deliberately left unpinned.
+      # Nothing in the tenant contract keys off it — the operator reissues and
+      # rolls the StatefulSet on its own, and unlike the CA's annual rotation
+      # there is no client-side action to take, so a change in the default is
+      # absorbed rather than breaking anyone. Pinning a value here would also
+      # freeze the chart against upstream shortening it, which is the direction
+      # a certificate lifetime is likely to move.
+      #
+      # Setting spec.tls for the mode does NOT suppress this default: the
+      # operator backfills certValidityDuration on its own branch when the
+      # field is zero, so leaving it out really does inherit rather than
+      # silently render a zero duration.
+      - notExists:
+          path: spec.tls.certValidityDuration
+
+  ############################################################
+  # nothing may disable TLS behind the rendered mode
+  ############################################################
+
+  # allowUnsafeConfigurations: true makes the operator force tls.mode to
+  # disabled at defaulting time AND set unsafeFlags.tls itself, so the
+  # "TLS must be enabled" guard passes too. unsafeFlags.tls: true lifts that
+  # same guard directly. Either switches TLS off while the rendered
+  # spec.tls.mode still reads preferTLS, so the mode assertions above would
+  # keep passing. The chart already renders an unsafeFlags block for small
+  # replica counts, which is exactly where such an edit would land — pin both
+  # branches.
+  #
+  # The path is the JSON name allowUnsafeConfigurations, not the Go field name
+  # UnsafeConf: asserting the latter is vacuous, since no such field exists in
+  # the CRD and notExists on it can never fail.
+
+  - it: no TLS-disabling escape hatches with a default replica count
+    documentIndex: 0
+    asserts:
+      - notExists:
+          path: spec.allowUnsafeConfigurations
+      - notExists:
+          path: spec.unsafeFlags.tls
+
+  - it: no TLS-disabling escape hatches when unsafeFlags is rendered
+    set:
+      replicas: 1
+    documentIndex: 0
+    asserts:
+      - equal:
+          path: spec.unsafeFlags.replsetSize
+          value: true
+      - notExists:
+          path: spec.allowUnsafeConfigurations
+      - notExists:
+          path: spec.unsafeFlags.tls
+
+  ############################################################
+  # sharding + TLS combination
+  ############################################################
+
+  - it: spec.tls.mode is preferTLS and secrets.ssl is set when sharding enabled
+    set:
+      sharding: true
+      shardingConfig:
+        configServers: 3
+        configServerSize: 3Gi
+        mongos: 2
+        shards:
+          - name: rs0
+            replicas: 3
+            size: 10Gi
+    documentIndex: 0
+    asserts:
+      - equal:
+          path: spec.tls.mode
+          value: preferTLS
+      - equal:
+          path: spec.secrets.ssl
+          value: mg-test-ssl
+
+  - it: no splitHorizons in sharded mode even with external and host set
+    set:
+      external: true
+      _namespace:
+        host: example.com
+      sharding: true
+      shardingConfig:
+        configServers: 3
+        configServerSize: 3Gi
+        mongos: 2
+        shards:
+          - name: rs0
+            replicas: 3
+            size: 10Gi
+    documentIndex: 0
+    asserts:
+      # splitHorizons is replica-set scoped and rendered only for the
+      # non-sharded topology. In sharded mode external access goes through the
+      # single <release>-external LoadBalancer fronting mongos, which no SAN
+      # covers — external hostname verification is unsupported here, and the
+      # README documents that rather than the CR pretending otherwise.
+      - notExists:
+          path: spec.replsets[0].splitHorizons
+
+  ############################################################
+  # splitHorizons must never render as a null value
+  ############################################################
+
+  - it: splitHorizons is omitted entirely when replicas is zero
+    set:
+      external: true
+      replicas: 0
+      _namespace:
+        host: example.com
+    documentIndex: 0
+    asserts:
+      # With replicas: 0 the range body renders nothing. Emitting the key with
+      # a null value would be rejected by the API server: the CRD types
+      # splitHorizons as object without nullable, so the whole
+      # PerconaServerMongoDB fails admission and the HelmRelease with it.
+      - notExists:
+          path: spec.replsets[0].splitHorizons
+
+  - it: splitHorizons is omitted when the tenant host is an empty string
+    set:
+      external: true
+      _namespace:
+        host: ""
+    documentIndex: 0
+    asserts:
+      # The controller may create _namespace before populating host, so the
+      # bootstrap window presents host as an empty string rather than as an
+      # absent key. Both shapes must omit the horizons: an empty host would
+      # otherwise render <release>-rs0-<i>. as a SAN, with a trailing dot and
+      # no domain.
+      - notExists:
+          path: spec.replsets[0].splitHorizons
+
+  - it: splitHorizons still renders for a single replica
+    set:
+      external: true
+      replicas: 1
+      _namespace:
+        host: example.com
+    documentIndex: 0
+    asserts:
+      - equal:
+          path: spec.replsets[0].splitHorizons.mg-test-rs0-0.external
+          value: mg-test-rs0-0.example.com
+      # The horizons reach a topology that cannot survive losing a member, and
+      # unsafeFlags.replsetSize is the chart's own marker for that. The pairing
+      # is what the README's upgrade-restart warning is about: a SAN change
+      # reissues the leaf, the operator hashes it into the pod template, and the
+      # StatefulSet rolls — which at this size is a full outage rather than an
+      # ordered handover. Asserted together so that gating horizons to
+      # quorum-capable sizes later turns this red and sends someone back to the
+      # doc, instead of leaving a warning describing a case that no longer
+      # exists.
+      - equal:
+          path: spec.unsafeFlags.replsetSize
+          value: true
+
+  - it: splitHorizons renders for two replicas, below the write quorum
+    set:
+      external: true
+      replicas: 2
+      _namespace:
+        host: example.com
+    documentIndex: 0
+    asserts:
+      # Two members is the case that reads as highly available and is not: the
+      # majority is still 2, so the rollout's restart of either member stalls
+      # writes until it returns. Covered separately from the single-replica case
+      # because the failure is different -- an outage of writes rather than of
+      # everything -- and the README distinguishes them.
+      - equal:
+          path: spec.replsets[0].splitHorizons.mg-test-rs0-0.external
+          value: mg-test-rs0-0.example.com
+      - equal:
+          path: spec.replsets[0].splitHorizons.mg-test-rs0-1.external
+          value: mg-test-rs0-1.example.com
+      - equal:
+          path: spec.unsafeFlags.replsetSize
+          value: true
+
+  - it: the quorum-capable default replica count needs no unsafe flag
+    set:
+      external: true
+      _namespace:
+        host: example.com
+    documentIndex: 0
+    asserts:
+      # Positive control for the two assertions above. Both read
+      # unsafeFlags.replsetSize as the sub-quorum marker, which says nothing
+      # unless the flag is actually absent at a size that can tolerate a
+      # restart. Without this, rendering the flag unconditionally would leave
+      # them green while the marker meant nothing.
+      - equal:
+          path: spec.replsets[0].splitHorizons.mg-test-rs0-2.external
+          value: mg-test-rs0-2.example.com
+      - notExists:
+          path: spec.unsafeFlags.replsetSize
diff --git a/packages/apps/mongodb/values.schema.json b/packages/apps/mongodb/values.schema.json
index ebb9d3eacb..880ffb6193 100644
--- a/packages/apps/mongodb/values.schema.json
+++ b/packages/apps/mongodb/values.schema.json
@@ -117,7 +117,10 @@
           "rule": "self == oldSelf",
           "message": "storageClass is immutable"
         }
-      ]
+      ],
+      "x-cozystack-options": {
+        "source": "storageclass"
+      }
     },
     "external": {
       "description": "Enable external access from outside the cluster.",
@@ -270,7 +273,7 @@
       ],
       "properties": {
         "destinationPath": {
-          "description": "Destination path for backups (e.g. s3://bucket/path/).",
+          "description": "Destination path for backups (e.g. s3://bucket/path/). Ignored when useSystemBucket is true (the driver injects the platform bucket).",
           "type": "string",
           "default": "s3://bucket/path/to/folder/"
         },
@@ -280,31 +283,47 @@
           "default": false
         },
         "endpointURL": {
-          "description": "S3 endpoint URL for uploads.",
+          "description": "S3 endpoint URL for uploads. Ignored when useSystemBucket is true (the strategy supplies the platform endpoint).",
           "type": "string",
           "default": "http://minio-gateway-service:9000"
         },
+        "insecureSkipTLSVerify": {
+          "description": "Skip TLS verification for the S3 endpoint (self-signed, e.g. in-cluster seaweedfs). Ignored when useSystemBucket is true (the platform backupStorage knob applies instead).",
+          "type": "boolean",
+          "default": false
+        },
         "retentionPolicy": {
-          "description": "Retention policy (e.g. \"30d\").",
+          "description": "Retention policy (e.g. \"30d\"). Ignored when useSystemBucket is true (no engine-side retention on that flow).",
           "type": "string",
           "default": "30d"
         },
         "s3AccessKey": {
-          "description": "Access key for S3 authentication.",
+          "description": "Access key for S3 authentication. Ignored when useSystemBucket is true (credentials come from the projected cozy-backups-creds).",
           "type": "string",
           "default": ""
         },
         "s3SecretKey": {
-          "description": "Secret key for S3 authentication.",
+          "description": "Secret key for S3 authentication. Ignored when useSystemBucket is true (credentials come from the projected cozy-backups-creds).",
           "type": "string",
           "default": ""
         },
         "schedule": {
-          "description": "Cron schedule for automated backups.",
+          "description": "Cron schedule for automated backups. Ignored when useSystemBucket is true (scheduling moves to the BackupClass Plan).",
           "type": "string",
           "default": "0 2 * * *"
+        },
+        "useSystemBucket": {
+          "description": "Opt-in: back up to the platform system bucket without supplying S3 credentials. The cozy-default MongoDB BackupClass injects the storage at BackupJob time; tenants do not set s3AccessKey/s3SecretKey/destinationPath/endpointURL, and backups scope to `\u003cnamespace\u003e/\u003capplication\u003e`. Scheduling moves to a BackupClass Plan; `schedule`, `retentionPolicy` and PITR are ignored while this is on, and this flow has no retention yet (see docs/operations/backup-classes.md). Requires `backup.enabled: true` (the pbm agents run on that flag); the chart refuses the combination with `enabled: false` at render time; the schema carries the same rule as a marker for the UI and for the day the apiserver enforces CEL on application schemas (cozystack/cozystack#2657), which it does not yet. A release that has not yet rendered this flag (its cluster still carries the chart's scheduled tasks and PITR) holds a BackupJob until it does, so the tenant's own storage is never injected over.",
+          "type": "boolean",
+          "default": false
         }
-      }
+      },
+      "x-kubernetes-validations": [
+        {
+          "message": "backup.useSystemBucket requires backup.enabled: the percona-backup-mongodb agents only run when backups are enabled",
+          "rule": "!(has(self.useSystemBucket) \u0026\u0026 self.useSystemBucket) || (has(self.enabled) \u0026\u0026 self.enabled)"
+        }
+      ]
     },
     "bootstrap": {
       "description": "Bootstrap configuration.",
diff --git a/packages/apps/mongodb/values.yaml b/packages/apps/mongodb/values.yaml
index d368d27903..3ad91f2b49 100644
--- a/packages/apps/mongodb/values.yaml
+++ b/packages/apps/mongodb/values.yaml
@@ -69,6 +69,7 @@ size: 10Gi
 
 ## @param {string} storageClass - StorageClass used to store the data.
 ## @immutable
+## @x-cozystack-options {source: storageclass}
 storageClass: ""
 
 ## @param {bool} external - Enable external access from outside the cluster.
@@ -154,20 +155,25 @@ databases: {}
 
 ## @typedef {struct} Backup - Backup configuration.
 ## @field {bool} enabled - Enable regular backups.
-## @field {string} [schedule] - Cron schedule for automated backups.
-## @field {string} [retentionPolicy] - Retention policy (e.g. "30d").
-## @field {string} [destinationPath] - Destination path for backups (e.g. s3://bucket/path/).
-## @field {string} [endpointURL] - S3 endpoint URL for uploads.
-## @field {string} [s3AccessKey] - Access key for S3 authentication.
-## @field {string} [s3SecretKey] - Secret key for S3 authentication.
+## @field {bool} [useSystemBucket] - Opt-in: back up to the platform system bucket without supplying S3 credentials. The cozy-default MongoDB BackupClass injects the storage at BackupJob time; tenants do not set s3AccessKey/s3SecretKey/destinationPath/endpointURL, and backups scope to `<namespace>/<application>`. Scheduling moves to a BackupClass Plan; `schedule`, `retentionPolicy` and PITR are ignored while this is on, and this flow has no retention yet (see docs/operations/backup-classes.md). Requires `backup.enabled: true` (the pbm agents run on that flag); the chart refuses the combination with `enabled: false` at render time; the schema carries the same rule as a marker for the UI and for the day the apiserver enforces CEL on application schemas (cozystack/cozystack#2657), which it does not yet. A release that has not yet rendered this flag (its cluster still carries the chart's scheduled tasks and PITR) holds a BackupJob until it does, so the tenant's own storage is never injected over.
+## @field {string} [schedule] - Cron schedule for automated backups. Ignored when useSystemBucket is true (scheduling moves to the BackupClass Plan).
+## @field {string} [retentionPolicy] - Retention policy (e.g. "30d"). Ignored when useSystemBucket is true (no engine-side retention on that flow).
+## @field {string} [destinationPath] - Destination path for backups (e.g. s3://bucket/path/). Ignored when useSystemBucket is true (the driver injects the platform bucket).
+## @field {string} [endpointURL] - S3 endpoint URL for uploads. Ignored when useSystemBucket is true (the strategy supplies the platform endpoint).
+## @field {bool} [insecureSkipTLSVerify] - Skip TLS verification for the S3 endpoint (self-signed, e.g. in-cluster seaweedfs). Ignored when useSystemBucket is true (the platform backupStorage knob applies instead).
+## @field {string} [s3AccessKey] - Access key for S3 authentication. Ignored when useSystemBucket is true (credentials come from the projected cozy-backups-creds).
+## @field {string} [s3SecretKey] - Secret key for S3 authentication. Ignored when useSystemBucket is true (credentials come from the projected cozy-backups-creds).
 
 ## @param {Backup} backup - Backup configuration.
+## @x-kubernetes-validations [{rule: "!(has(self.useSystemBucket) && self.useSystemBucket) || (has(self.enabled) && self.enabled)", message: "backup.useSystemBucket requires backup.enabled: the percona-backup-mongodb agents only run when backups are enabled"}]
 backup:
   enabled: false
+  useSystemBucket: false
   schedule: "0 2 * * *"
   retentionPolicy: 30d
   destinationPath: "s3://bucket/path/to/folder/"
   endpointURL: "http://minio-gateway-service:9000"
+  insecureSkipTLSVerify: false
   s3AccessKey: ""
   s3SecretKey: ""
 
diff --git a/packages/apps/nats/README.md b/packages/apps/nats/README.md
index 213ff25549..f79a9b0fb3 100644
--- a/packages/apps/nats/README.md
+++ b/packages/apps/nats/README.md
@@ -41,7 +41,7 @@ It provides a data layer for cloud native applications, IoT messaging, and micro
 ### resources and resourcesPreset
 
 `resources` sets explicit CPU and memory configurations for each replica.
-When left empty, the preset defined in `resourcesPreset` is applied.
+Every resource it leaves unset is taken from the preset defined in `resourcesPreset`.
 
 ```yaml
 resources:
@@ -52,7 +52,26 @@ resources:
 `resourcesPreset` sets named CPU and memory configurations for each replica.
 This setting is ignored if the corresponding `resources` value is set.
 
-Presets follow a cloud-style `<series>.<size>` naming convention. Five series cover the full CPU-to-memory ratio range (`t1` 1:0.5, `c1` 1:1, `s1` 1:2, `u1` 1:4, `m1` 1:8) and each series ships eight sizes (`nano` through `4xlarge`). The legacy flat names (`nano`, `micro`, `small`, `medium`, `large`, `xlarge`, `2xlarge`) remain accepted as deprecated aliases of their 1:1 instance-type equivalents.
+Presets follow a cloud-style `<series>.<size>` naming convention. Five series cover the full CPU-to-memory ratio range (`t1` 1:0.5, `c1` 1:1, `s1` 1:2, `u1` 1:4, `m1` 1:8) and each series ships eight sizes (`nano` through `4xlarge`). The legacy flat names (`nano`, `micro`, `small`, `medium`, `large`, `xlarge`, `2xlarge`) remain accepted as deprecated aliases and keep their original sizes, which do not follow one series: `nano` through `small` equal the `t1` sizes of the same name, while `medium` equals `c1.small` rather than `c1.medium`.
 
 See [`docs/operations/resource-presets.md`](../../../docs/operations/resource-presets.md) for the full size matrix and the legacy-to-instance-type mapping.
 
+### tls
+
+`tls.enabled` is tri-state. Left unset it follows `external`, so TLS is enabled automatically for a NATS instance exposed outside the cluster and disabled for one that is not. Setting it explicitly overrides that in either direction.
+
+When TLS is on, the chart issues a self-signed CA and a server certificate from it, and NATS serves the client port on `:4222` with the server certificate.
+
+**Retrieving the CA certificate** for client verification:
+
+The trust anchor is published as `nats-<name>.tenant-ca`: an object holding `ca.crt` and nothing else, delivered to tenants through the `core.cozystack.io/tenantsecrets` API that the base tenant roles already grant. It exists only while TLS is on, because that is the only state in which the chart issues a CA to publish.
+
+```bash
+kubectl --context <ctx> --namespace <tenant> \
+  get tenantsecret nats-<name>.tenant-ca \
+  --output jsonpath='{.data.ca\.crt}' | base64 --decode
+```
+
+`nats-<name>.tenant-ca` is the only object that hands over the CA certificate without also handing over a private key, which is why it exists. The chart's own `nats-<name>-ca` Secret stores the CA **private key** under `tls.key` alongside the certificate — read access to it would let the holder issue certificates for anything, so it is never granted to a tenant. The same applies to `nats-<name>-tls`, which holds the server's private key.
+
+It is reached through `tenantsecrets` rather than by reading the Secret directly, and that is deliberate: `tenantsecrets` surfaces only objects the platform has vouched for, whereas a direct grant on the name would convey whatever happens to occupy that name.
diff --git a/packages/apps/nats/templates/nats.yaml b/packages/apps/nats/templates/nats.yaml
index 301a10981e..061830d53b 100644
--- a/packages/apps/nats/templates/nats.yaml
+++ b/packages/apps/nats/templates/nats.yaml
@@ -17,6 +17,30 @@
   {{- end }}
 {{- end }}
 
+{{- $merge := dict }}
+{{- with .Values.config.merge }}
+  {{- $merge = deepCopy . }}
+{{- end }}
+{{- if $passwords }}
+  {{- $users := list }}
+  {{- range $username, $password := $passwords }}
+    {{- $users = append $users (dict "user" $username "password" $password) }}
+  {{- end }}
+  {{- $account := dict "users" $users }}
+  {{- $existingAccount := get ($merge.accounts | default dict) "A" | default dict }}
+  {{- /* nats-server matches config keys case-insensitively, so JetStream in any case is an explicit setting. */}}
+  {{- $accountSetsJetStream := false }}
+  {{- range $key, $_ := $existingAccount }}
+    {{- if eq (lower $key) "jetstream" }}
+      {{- $accountSetsJetStream = true }}
+    {{- end }}
+  {{- end }}
+  {{- if and .Values.jetstream.enabled (not $accountSetsJetStream) }}
+    {{- $_ := set $account "jetstream" true }}
+  {{- end }}
+  {{- $merge = mergeOverwrite $merge (dict "accounts" (dict "A" $account)) }}
+{{- end }}
+
 {{- if .Values.users }}
 apiVersion: v1
 kind: Secret
@@ -64,20 +88,9 @@ spec:
         secretName: {{ .Release.Name }}-ca
       {{- end }}
       config:
-        {{- if or $passwords .Values.config.merge }}
+        {{- with $merge }}
         merge:
-          {{- if $passwords }}
-          accounts:
-            A:
-              users:
-                {{- range $username, $password := $passwords }}
-                - user: "{{ $username }}"
-                  password: "{{ $password }}"
-                {{- end }}
-          {{- end }}
-          {{- with .Values.config.merge }}
           {{- toYaml . | nindent 10 }}
-          {{- end }}
         {{- end }}
         {{- with .Values.config.resolver }}
         resolver:
diff --git a/packages/apps/nats/templates/tenant-projection.yaml b/packages/apps/nats/templates/tenant-projection.yaml
new file mode 100644
index 0000000000..4484a673a7
--- /dev/null
+++ b/packages/apps/nats/templates/tenant-projection.yaml
@@ -0,0 +1,14 @@
+{{- /* Gated on the same condition as certmanager.yaml: the source Secret only exists when TLS is on. */}}
+{{- /* cert-manager writes the certificate of a selfSigned isCA Certificate to ca.crt as well as to tls.crt, and ca.crt is the key the trust-anchor contract names. */}}
+{{- if eq (include "nats.tls.enabled" .) "true" }}
+---
+apiVersion: internal.cozystack.io/v1alpha1
+kind: TenantProjection
+metadata:
+  name: {{ .Release.Name }}-ca
+spec:
+  projections:
+    - type: CACert
+      sourceSecretName: {{ .Release.Name }}-ca
+      sourceKey: ca.crt
+{{- end }}
diff --git a/packages/apps/nats/tests/certmanager_test.yaml b/packages/apps/nats/tests/certmanager_test.yaml
index efd2433b86..2025f46d40 100644
--- a/packages/apps/nats/tests/certmanager_test.yaml
+++ b/packages/apps/nats/tests/certmanager_test.yaml
@@ -138,6 +138,55 @@ tests:
           path: spec.issuerRef.name
           value: my-nats-ca
 
+  ###################################################
+  # Key-bearing Secrets stay invisible to tenants   #
+  ###################################################
+
+  # Both Certificates below mint a private key: the CA Secret stores the CA key
+  # under tls.key, the leaf Secret the server key. The nats ResourceDefinition
+  # grants tenants read access to Secrets matching
+  # internal.cozystack.io/tenant-ca, so only the controller-authored projection
+  # may carry that label.
+  #
+  # A stamp here does not by itself reach a tenant today: tenantsecrets serves
+  # only objects the lineage webhook marked tenantresource=true, and it resolves
+  # lineage from ownerReferences or the Flux helm labels, neither of which a
+  # cert-manager Secret carries while enableCertificateOwnerRef stays false.
+  # These assertions become load-bearing the moment either of those changes, and
+  # the second gate is not one this chart controls.
+  #
+  # Selected by the Secret each Certificate writes rather than by position: a
+  # documentIndex would follow the slot, so reordering this template would let
+  # a labelled key-bearing Certificate slide out from under the assertion and
+  # pass green.
+  - it: the key-bearing CA Secret is never marked tenant-readable
+    set:
+      tls:
+        enabled: true
+      external: false
+    documentSelector:
+      path: spec.secretName
+      value: my-nats-ca
+    asserts:
+      - notExists:
+          path: spec.secretTemplate.labels["internal.cozystack.io/tenant-ca"]
+      - notExists:
+          path: spec.secretTemplate.labels["internal.cozystack.io/tenantresource"]
+
+  - it: the key-bearing leaf Secret is never marked tenant-readable
+    set:
+      tls:
+        enabled: true
+      external: false
+    documentSelector:
+      path: spec.secretName
+      value: my-nats-tls
+    asserts:
+      - notExists:
+          path: spec.secretTemplate.labels["internal.cozystack.io/tenant-ca"]
+      - notExists:
+          path: spec.secretTemplate.labels["internal.cozystack.io/tenantresource"]
+
   ###################################################
   # SAN coverage (internal, tls.enabled=true)       #
   ###################################################
@@ -261,7 +310,9 @@ tests:
       tls:
         enabled: true
       external: false
-    documentIndex: 3
+    documentSelector:
+      path: metadata.name
+      value: my-nats-tls
     asserts:
       - notContains:
           path: spec.dnsNames
@@ -338,7 +389,9 @@ tests:
       tls:
         enabled: true
       external: false
-    documentIndex: 3
+    documentSelector:
+      path: metadata.name
+      value: my-nats-tls
     asserts:
       - notContains:
           path: spec.usages
@@ -349,7 +402,9 @@ tests:
       tls:
         enabled: true
       external: false
-    documentIndex: 3
+    documentSelector:
+      path: metadata.name
+      value: my-nats-tls
     asserts:
       - notContains:
           path: spec.usages
diff --git a/packages/apps/nats/tests/config_merge_test.yaml b/packages/apps/nats/tests/config_merge_test.yaml
new file mode 100644
index 0000000000..b8763b5d53
--- /dev/null
+++ b/packages/apps/nats/tests/config_merge_test.yaml
@@ -0,0 +1,131 @@
+suite: nats config.merge and generated accounts
+
+release:
+  name: my-nats
+  namespace: tenant-test
+
+set:
+  _cluster:
+    cluster-domain: cozy.local
+
+templates:
+  - templates/nats.yaml
+
+tests:
+  - it: renders the generated users under accounts.A when users are set
+    set:
+      users:
+        app:
+          password: secret
+    documentSelector:
+      path: kind
+      value: HelmRelease
+    asserts:
+      - equal:
+          path: spec.values.nats.config.merge.accounts.A.users
+          value:
+            - user: app
+              password: secret
+      - notExists:
+          path: spec.values.nats.config.merge.jetstream
+
+  - it: merges a tenant accounts block into the generated accounts map
+    set:
+      users:
+        app:
+          password: secret
+      config:
+        merge:
+          accounts:
+            A:
+              jetstream: enabled
+    documentSelector:
+      path: kind
+      value: HelmRelease
+    asserts:
+      - equal:
+          path: spec.values.nats.config.merge.accounts.A.jetstream
+          value: enabled
+      - equal:
+          path: spec.values.nats.config.merge.accounts.A.users
+          value:
+            - user: app
+              password: secret
+      - lengthEqual:
+          path: spec.values.nats.config.merge.accounts.A.users
+          count: 1
+
+  - it: keeps the generated users when the tenant block also lists users for account A
+    set:
+      users:
+        app:
+          password: secret
+      config:
+        merge:
+          accounts:
+            A:
+              users:
+                - user: stray
+                  password: stray
+    documentSelector:
+      path: kind
+      value: HelmRelease
+    asserts:
+      - equal:
+          path: spec.values.nats.config.merge.accounts.A.users
+          value:
+            - user: app
+              password: secret
+
+  - it: keeps other accounts and top-level merge keys next to the generated one
+    set:
+      users:
+        app:
+          password: secret
+      config:
+        merge:
+          max_payload: 4MB
+          accounts:
+            B:
+              jetstream: enabled
+    documentSelector:
+      path: kind
+      value: HelmRelease
+    asserts:
+      - equal:
+          path: spec.values.nats.config.merge.max_payload
+          value: 4MB
+      - equal:
+          path: spec.values.nats.config.merge.accounts.B.jetstream
+          value: enabled
+      - equal:
+          path: spec.values.nats.config.merge.accounts.A.users[0].user
+          value: app
+
+  - it: passes config.merge through unchanged when there are no users
+    set:
+      config:
+        merge:
+          max_payload: 4MB
+          accounts:
+            A:
+              jetstream: enabled
+    documentSelector:
+      path: kind
+      value: HelmRelease
+    asserts:
+      - equal:
+          path: spec.values.nats.config.merge
+          value:
+            max_payload: 4MB
+            accounts:
+              A:
+                jetstream: enabled
+
+  - it: renders no merge block when neither users nor config.merge are set
+    documentSelector:
+      path: kind
+      value: HelmRelease
+    asserts:
+      - notExists:
+          path: spec.values.nats.config.merge
diff --git a/packages/apps/nats/tests/jetstream_test.yaml b/packages/apps/nats/tests/jetstream_test.yaml
new file mode 100644
index 0000000000..1972f9f31a
--- /dev/null
+++ b/packages/apps/nats/tests/jetstream_test.yaml
@@ -0,0 +1,148 @@
+suite: NATS generated account JetStream configuration
+
+release:
+  name: my-nats
+  namespace: tenant-test
+
+set:
+  _cluster:
+    cluster-domain: cozy.local
+  users:
+    app:
+      password: secret
+
+templates:
+  - templates/nats.yaml
+
+tests:
+  - it: enables JetStream for generated users when persistent messaging is enabled
+    documentSelector:
+      path: kind
+      value: HelmRelease
+    asserts:
+      - equal:
+          path: spec.values.nats.config.merge.accounts.A
+          value:
+            jetstream: true
+            users:
+              - user: app
+                password: secret
+      - equal:
+          path: spec.values.nats.config.jetstream.fileStore.enabled
+          value: true
+
+  - it: does not enable account JetStream when persistent messaging is disabled
+    set:
+      jetstream.enabled: false
+    documentSelector:
+      path: kind
+      value: HelmRelease
+    asserts:
+      - notExists:
+          path: spec.values.nats.config.merge.accounts.A.jetstream
+      - equal:
+          path: spec.values.nats.config.merge.accounts.A.users
+          value:
+            - user: app
+              password: secret
+      - equal:
+          path: spec.values.nats.config.jetstream.fileStore.enabled
+          value: false
+
+  - it: generates a usable account when the accounts override is null
+    set:
+      config.merge.accounts: null
+    documentSelector:
+      path: kind
+      value: HelmRelease
+    asserts:
+      - equal:
+          path: spec.values.nats.config.merge.accounts.A
+          value:
+            jetstream: true
+            users:
+              - user: app
+                password: secret
+
+  - it: preserves explicitly configured account JetStream limits
+    set:
+      config.merge.accounts.A.jetstream:
+        max_memory: 0
+        max_file: 1073741824
+        max_streams: 5
+        max_consumers: 10
+    documentSelector:
+      path: kind
+      value: HelmRelease
+    asserts:
+      - equal:
+          path: spec.values.nats.config.merge.accounts.A
+          value:
+            jetstream:
+              max_memory: 0
+              max_file: 1073741824
+              max_streams: 5
+              max_consumers: 10
+            users:
+              - user: app
+                password: secret
+
+  - it: preserves an explicitly disabled account
+    set:
+      config.merge.accounts.A.jetstream: false
+    documentSelector:
+      path: kind
+      value: HelmRelease
+    asserts:
+      - equal:
+          path: spec.values.nats.config.merge.accounts.A.jetstream
+          value: false
+
+  - it: preserves an explicitly empty account JetStream configuration
+    set:
+      config.merge.accounts.A.jetstream: {}
+    documentSelector:
+      path: kind
+      value: HelmRelease
+    asserts:
+      - equal:
+          path: spec.values.nats.config.merge.accounts.A.jetstream
+          value: {}
+
+  - it: preserves an account JetStream setting whose key differs only in case
+    set:
+      config.merge.accounts.A.JetStream:
+        max_streams: 1
+    documentSelector:
+      path: kind
+      value: HelmRelease
+    asserts:
+      - equal:
+          path: spec.values.nats.config.merge.accounts.A
+          value:
+            JetStream:
+              max_streams: 1
+            users:
+              - user: app
+                password: secret
+
+  - it: leaves manually configured accounts unchanged without generated users
+    set:
+      users: null
+      config.merge.accounts.B:
+        jetstream: true
+        users:
+          - user: manual
+            password: manual-secret
+    documentSelector:
+      path: kind
+      value: HelmRelease
+    asserts:
+      - equal:
+          path: spec.values.nats.config.merge.accounts
+          value:
+            B:
+              jetstream: true
+              users:
+                - user: manual
+                  password: manual-secret
diff --git a/packages/apps/nats/tests/tenant_projection_test.yaml b/packages/apps/nats/tests/tenant_projection_test.yaml
new file mode 100644
index 0000000000..b7c1c44062
--- /dev/null
+++ b/packages/apps/nats/tests/tenant_projection_test.yaml
@@ -0,0 +1,123 @@
+suite: nats TenantProjection sentinel
+
+# The chart renders one TenantProjection per TLS-enabled release: the
+# declaration that tells the CA-extraction controller to lift ca.crt out of the
+# key-bearing <release>-ca into the tenant-readable <release>.tenant-ca
+# projection.
+#
+# The load-bearing invariant is the ABSENCE of ownerReferences. The sentinel must
+# carry none — it owns the projection, and it is itself owned only through the
+# helm.toolkit.fluxcd.io/name label Flux stamps, which is how the lineage webhook
+# resolves the application. An ownerReference here would short-circuit that walk
+# and silently break the tenant's read path (pkg/lineage/lineage.go).
+
+release:
+  name: my-nats
+  namespace: tenant-test
+
+templates:
+  - templates/tenant-projection.yaml
+
+tests:
+  - it: renders exactly one TenantProjection named after the release
+    set:
+      tls:
+        enabled: true
+    asserts:
+      - hasDocuments:
+          count: 1
+      - isKind:
+          of: TenantProjection
+      - equal:
+          path: apiVersion
+          value: internal.cozystack.io/v1alpha1
+      - equal:
+          path: metadata.name
+          value: my-nats-ca
+
+  # The list length is asserted alongside the entry: hasDocuments counts
+  # documents, not list entries, so a second entry naming tls.key as its source
+  # renders inside this same document and leaves every other assertion here
+  # untouched. The controller refuses a multi-entry sentinel outright, which
+  # makes that a silent loss of the anchor rather than a leak.
+  - it: declares exactly one projection, of the chart's CA
+    set:
+      tls:
+        enabled: true
+    asserts:
+      - lengthEqual:
+          path: spec.projections
+          count: 1
+      - equal:
+          path: spec.projections[0].type
+          value: CACert
+      - equal:
+          path: spec.projections[0].sourceSecretName
+          value: my-nats-ca
+      - equal:
+          path: spec.projections[0].sourceKey
+          value: ca.crt
+
+  # The one load-bearing invariant: an ownerReference here would short-circuit
+  # the lineage walk before it reaches the helm-label fallback, so the tenant
+  # would silently lose the anchor.
+  - it: carries no ownerReferences, so the lineage walk reaches the helm label
+    set:
+      tls:
+        enabled: true
+    asserts:
+      - notExists:
+          path: metadata.ownerReferences
+
+  # Not an invariant — conformance to the shape the merged engines share. An
+  # explicit namespace would pin the sentinel outside the release, and chart
+  # labels would compete with the Flux label that is the whole attribution
+  # path. Pinned separately so a failure here is not read as a lineage break.
+  - it: omits namespace and chart-added labels, matching the shared shape
+    set:
+      tls:
+        enabled: true
+    asserts:
+      - notExists:
+          path: metadata.namespace
+      - notExists:
+          path: metadata.labels
+
+  # The nats CA exists only while TLS is on. An ungated sentinel would sit
+  # Ready=False/SourceNotFound forever on every plaintext release.
+  #
+  # The gate must track the chart's effective TLS state, not the raw
+  # tls.enabled value: leaving it unset means "follow external". A naive
+  # `if .Values.tls.enabled` still passes the two explicit cases below while
+  # silently publishing no anchor to exactly the releases most likely to need
+  # one, so both implied legs are pinned too.
+  - it: renders the sentinel when TLS is implied by external access
+    set:
+      external: true
+    asserts:
+      - hasDocuments:
+          count: 1
+
+  - it: renders nothing when TLS is implied off by external being false
+    set:
+      external: false
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  - it: renders nothing when TLS is explicitly disabled despite external access
+    set:
+      external: true
+      tls:
+        enabled: false
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  - it: renders nothing when TLS is disabled
+    set:
+      tls:
+        enabled: false
+    asserts:
+      - hasDocuments:
+          count: 0
diff --git a/packages/apps/nats/values.schema.json b/packages/apps/nats/values.schema.json
index 074a403aa3..2fa2c9a10a 100644
--- a/packages/apps/nats/values.schema.json
+++ b/packages/apps/nats/values.schema.json
@@ -103,7 +103,10 @@
           "rule": "self == oldSelf",
           "message": "storageClass is immutable"
         }
-      ]
+      ],
+      "x-cozystack-options": {
+        "source": "storageclass"
+      }
     },
     "external": {
       "description": "Enable external access from outside the cluster.",
diff --git a/packages/apps/nats/values.yaml b/packages/apps/nats/values.yaml
index 387199c7d6..63a85f6739 100644
--- a/packages/apps/nats/values.yaml
+++ b/packages/apps/nats/values.yaml
@@ -66,6 +66,7 @@ resourcesPreset: "t1.nano"
 
 ## @param {string} storageClass - StorageClass used to store the data.
 ## @immutable
+## @x-cozystack-options {source: storageclass}
 storageClass: ""
 
 ## @param {bool} external - Enable external access from outside the cluster.
diff --git a/packages/apps/openbao/Chart.yaml b/packages/apps/openbao/Chart.yaml
index f33fc756bd..56389d91de 100644
--- a/packages/apps/openbao/Chart.yaml
+++ b/packages/apps/openbao/Chart.yaml
@@ -4,4 +4,4 @@ description: Managed OpenBAO secrets management service
 icon: /logos/openbao.svg
 type: application
 version: 0.0.0 # Placeholder, the actual version will be automatically set during the build process
-appVersion: "2.5.0"
+appVersion: "2.5.1"
diff --git a/packages/apps/openbao/Makefile b/packages/apps/openbao/Makefile
index b9530139e3..73fb89dbc1 100644
--- a/packages/apps/openbao/Makefile
+++ b/packages/apps/openbao/Makefile
@@ -3,3 +3,7 @@ include ../../../hack/package.mk
 generate:
 	cozyvalues-gen -m 'openbao' -v values.yaml -s values.schema.json -r README.md -g ../../../api/apps/v1alpha1/openbao/types.go
 	../../../hack/update-crd.sh
+
+.PHONY: test
+test:
+	helm unittest .
diff --git a/packages/apps/openbao/README.md b/packages/apps/openbao/README.md
index 3bc470bf8d..2ba51bddf6 100644
--- a/packages/apps/openbao/README.md
+++ b/packages/apps/openbao/README.md
@@ -5,6 +5,70 @@ It provides identity-based secrets and encryption management for cloud infrastru
 
 > `storageClass` is annotated as immutable in the chart schema — see [`docs/storage-immutability.md`](../../../docs/storage-immutability.md) for the contract and which consumers enforce it.
 
+## Auto-unseal
+
+By default OpenBAO uses Shamir key shares, so after every pod restart an operator has to unseal each replica by hand. Setting `seal.type: static` switches the instance to OpenBAO's [`seal "static"`](https://openbao.org/docs/configuration/seal/static/), which unseals the barrier from a 32-byte key read from a Secret in the tenant namespace. The chart never generates, stores or rotates the key. It only mounts the Secret you name.
+
+The choice is a trade-off. With `static` the key sits in a Secret in the same cluster as the data it unwraps, so the barrier is only as strong as access to Secrets in that namespace, to etcd and to backups. Shamir keeps the key material out of the cluster at the price of a manual unseal after every restart. Pick `static` when availability after a restart matters more than that boundary.
+
+1. A cluster administrator creates the key Secret in the tenant namespace. Tenant roles grant no access to Secrets, so tenant users can neither create the key nor read it back. The pods mount the Secret and do not start until it exists, so have it created before you set `seal.type: static`. The value is the base64 text of 32 random bytes, stored under the key `key`.
+
+   ```bash
+   kubectl -n tenant-<name> create secret generic openbao-unseal \
+     --from-literal=key="$(head -c 32 /dev/urandom | base64 | tr -d '\n')"
+   ```
+
+2. Point the instance at it:
+
+   ```yaml
+   seal:
+     type: static
+     secretName: openbao-unseal
+     keyId: key-1
+   ```
+
+   `keyId` is a permanent identifier for that key material. OpenBAO stores it with the data the key wraps and picks the key by it, so change `keyId` whenever you change the key.
+
+To rotate the key:
+
+1. Have a cluster administrator create a second Secret with the new key material, and pick a new `keyId`.
+2. Move the current pair to `previousSecretName`/`previousKeyId`, put the new pair in `secretName`/`keyId` and upgrade the release. The upgrade changes the config and the StatefulSet template, not the running pods. The upstream chart uses the `OnDelete` update strategy and the server copies its HCL to `/tmp/storageconfig.hcl` at startup, so running pods keep the old key and the old config until they are replaced.
+3. Replace the pods. In standalone mode delete the single pod. In HA mode delete the standby pods one at a time, waiting for each to rejoin and unseal, then delete the active pod so that leadership moves to a pod that already runs the new config. Do not delete the active pod first. Once a node with the new config has taken over, a standby still on the old template cannot unseal after a restart.
+
+   ```bash
+   kubectl -n <namespace> get pods -l openbao-active=true   # the active pod
+   kubectl -n <namespace> delete pod <standby pod>          # each standby, one at a time
+   kubectl -n <namespace> delete pod <active pod>           # last
+   ```
+
+4. Confirm the rotation before touching the old key. The node that becomes active with the new config re-wraps the stored barrier and recovery keys with `current_key` and logs it. Tenant roles do not grant `pods/log`, so a cluster administrator reads that log.
+
+   ```bash
+   kubectl -n <namespace> logs <active pod> | grep -E 'upgrading (stored keys|recovery key)'
+   ```
+
+   Until those lines have appeared, storage is still wrapped with the previous key. The static seal decrypts by the key identifier stored with the data and refuses an identifier it does not know (`unknown key id for data`), which is why both keys have to stay configured until the re-wrap is done.
+5. Drop the `previous*` values, upgrade, and replace the pods once more in the same order. A pod that unseals with the new key alone proves the re-wrap. The cluster administrator deletes the old Secret last.
+
+### Upgrading an existing instance
+
+The chart labels the server pods with `policy.cozystack.io/allow-to-apiserver: "true"`, which the tenant network policy needs before `service_registration "kubernetes"` can reach the API server (#2793). The StatefulSet uses the `OnDelete` strategy, so pods created before the label was added keep running without it after an upgrade. Delete them once, in HA mode one at a time, so that they come back labelled. With the Shamir seal every replaced pod has to be unsealed again. An HA instance that hangs at start because of #2793 stays hung until its pods are replaced.
+
+### Migrating an existing instance from Shamir
+
+Switching a running Shamir-sealed instance to `static` is a seal migration, see the OpenBAO [seal migration](https://openbao.org/docs/concepts/seal/#seal-migration) documentation. The chart does not run it for you. It refuses a changed `seal.type` on an instance that already runs with another seal, because a plain config change leaves an instance that cannot unseal. OpenBAO documents the migration as a procedure with downtime, so plan a window.
+
+1. Take a restorable backup first, as OpenBAO recommends before any seal migration. In HA mode `bao operator raft snapshot save <file>` writes it. In standalone mode the file storage backend is not transactional, so a copy of the data volume taken while the server runs can be inconsistent. Copy the volume while OpenBAO is stopped, or take a volume snapshot with a storage class that snapshots atomically.
+2. A cluster administrator creates the key Secret as described above.
+3. Set `seal.type: static` with `secretName` and `keyId`, add `seal.allowMigration: true` and upgrade the release. The StatefulSet uses the `OnDelete` strategy, so the running pods keep the Shamir configuration until they are replaced. This upgrade is the point of no return for the chart. The server config now names the static seal while every pod still runs Shamir, and from here on the chart refuses `seal.type: shamir`. If you abort before any pod is replaced, a cluster administrator has to remove the `seal "static"` stanza from the `openbao-<name>-config` ConfigMap before the release accepts `shamir` again.
+4. Standalone. Delete the pod. When it is back, run `bao operator unseal -migrate` with each Shamir unseal key. The server performs the migration and the Shamir keys become the recovery keys.
+5. HA. Delete one standby pod, wait for it to come back and run `bao operator unseal -migrate` on it with each Shamir unseal key. Repeat for the other standby pods one at a time. Then run `bao operator step-down` on the active node and wait until another node has become active. The new active node performs the migration and logs its completion. Give that a little time to replicate to the other Raft nodes, then delete the old active pod, so that it restarts with the static configuration and unseals on its own.
+6. Remove `seal.allowMigration` and upgrade the release once more.
+
+Migrating away from `static` needs the old stanza kept with `disabled = "true"` and its key still mounted, which this chart does not render. That direction is refused regardless of `allowMigration`.
+
+Keep a copy of the key outside the cluster. A Raft snapshot or a data PVC is unreadable without it.
+
 ## Parameters
 
 ### Common parameters
@@ -27,3 +91,16 @@ It provides identity-based secrets and encryption management for cloud infrastru
 | ---- | -------------------------- | ------ | ------ |
 | `ui` | Enable the OpenBAO web UI. | `bool` | `true` |
 
+
+### Seal
+
+| Name                      | Description                                                                                                                                                                                                                                                                                                                                                                                                                | Type     | Value    |
+| ------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------- | -------- |
+| `seal`                    | Seal configuration. The default is Shamir key shares. Set `type: static` for auto-unseal.                                                                                                                                                                                                                                                                                                                                  | `object` | `{}`     |
+| `seal.type`               | Seal type. `shamir` keeps the current behaviour, `static` enables auto-unseal from `secretName`.                                                                                                                                                                                                                                                                                                                           | `string` | `shamir` |
+| `seal.secretName`         | Existing Secret in the tenant namespace whose key `key` holds the base64 text of 32 random bytes (for example `openssl rand -base64 32`). A cluster administrator creates it, because tenant roles cannot create Secrets. Lowercase alphanumerics and hyphens, at most 52 characters, because the pod volume is named `userconfig-<name>` and a volume name is a DNS label. Required when `type` is `static`.              | `string` | `""`     |
+| `seal.keyId`              | Permanent identifier of the current key. OpenBAO stores it with the data the key wraps and picks the key by it, so change it whenever the key material changes. Lowercase alphanumerics, `-`, `.` and `_`, starting and ending with an alphanumeric, because the upstream chart evaluates the server config as a template and rewrites upper case placeholders such as `HOSTNAME` in it. Required when `type` is `static`. | `string` | `""`     |
+| `seal.previousSecretName` | Secret holding the previous key during an n-1 key rotation, with the same name constraints as `secretName`. Keep it until the pods have been replaced and the active node has logged `upgrading stored keys`, see the README.                                                                                                                                                                                              | `string` | `""`     |
+| `seal.previousKeyId`      | Identifier of the previous key, with the same character constraints as `keyId`. Required when `previousSecretName` is set.                                                                                                                                                                                                                                                                                                 | `string` | `""`     |
+| `seal.allowMigration`     | Acknowledge a seal migration. The chart refuses to change `type` on an existing instance unless this is `true`. Set it only while running `bao operator unseal -migrate`, then remove it.                                                                                                                                                                                                                                  | `bool`   | `false`  |
+
diff --git a/packages/apps/openbao/templates/openbao.yaml b/packages/apps/openbao/templates/openbao.yaml
index 1b98fe2eb0..d3236be841 100644
--- a/packages/apps/openbao/templates/openbao.yaml
+++ b/packages/apps/openbao/templates/openbao.yaml
@@ -1,3 +1,50 @@
+{{- $seal := .Values.seal }}
+{{- $static := eq $seal.type "static" }}
+{{- if and $static (not $seal.secretName) }}
+{{- fail "seal.secretName is required when seal.type is \"static\"" }}
+{{- end }}
+{{- if and $static (not $seal.keyId) }}
+{{- fail "seal.keyId is required when seal.type is \"static\"" }}
+{{- end }}
+{{- if and $seal.previousSecretName (not $seal.previousKeyId) }}
+{{- fail "seal.previousKeyId is required when seal.previousSecretName is set" }}
+{{- end }}
+{{- if and $seal.previousKeyId (not $seal.previousSecretName) }}
+{{- fail "seal.previousSecretName is required when seal.previousKeyId is set" }}
+{{- end }}
+{{- if and $seal.previousSecretName (not $static) }}
+{{- fail "seal.previousSecretName only applies to seal.type \"static\"" }}
+{{- end }}
+{{- if and $seal.previousSecretName (eq $seal.previousSecretName $seal.secretName) }}
+{{- fail "seal.previousSecretName must name a different Secret than seal.secretName" }}
+{{- end }}
+{{- if and $seal.previousKeyId (eq $seal.previousKeyId $seal.keyId) }}
+{{- fail "seal.previousKeyId must differ from seal.keyId" }}
+{{- end }}
+{{- /*
+Refuse a silent seal change on an existing instance. Changing the seal of an
+initialized OpenBAO is a seal migration (`bao operator unseal -migrate`), and a
+plain config change leaves an instance that cannot unseal. The seal in use is
+visible in the config ConfigMap the previous release rendered. `lookup` returns
+nothing on first install and on dry-run, so the check is a no-op there.
+*/}}
+{{- $cm := lookup "v1" "ConfigMap" .Release.Namespace (printf "%s-config" .Release.Name) }}
+{{- if $cm }}
+{{- $hcl := index ($cm.data | default dict) "extraconfig-from-values.hcl" | default "" }}
+{{- $stanza := regexFind `seal "[a-z]+"` $hcl }}
+{{- $liveSeal := ternary (trimAll "\"" (trimPrefix "seal " $stanza)) "shamir" (ne $stanza "") }}
+{{- /*
+Migrating away from static needs the old stanza kept with disabled = "true"
+and its key still mounted, which this chart does not render. Refuse the
+direction rather than emit a config the migration cannot run against.
+*/}}
+{{- if and (eq $liveSeal "static") (eq $seal.type "shamir") }}
+{{- fail "migration from seal.type \"static\" to \"shamir\" is not supported by this chart" }}
+{{- end }}
+{{- if and (ne $liveSeal $seal.type) (not $seal.allowMigration) }}
+{{- fail (printf "seal.type %q differs from the seal in use (%q). Changing the seal of an existing instance is a seal migration (bao operator unseal -migrate). Set seal.allowMigration: true only while performing it." $seal.type $liveSeal) }}
+{{- end }}
+{{- end }}
 apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
 metadata:
@@ -27,13 +74,37 @@ spec:
         tlsDisable: true
       server:
         podManagementPolicy: Parallel
+        # Cozystack's CiliumNetworkPolicy allow-to-apiserver only admits egress
+        # to kube-apiserver for pods carrying this label. Without it,
+        # service_registration "kubernetes" cannot reach the API server and
+        # the HA pods hang on startup. See issue #2793.
+        extraLabels:
+          policy.cozystack.io/allow-to-apiserver: "true"
         resources: {{- include "cozy-lib.resources.defaultingSanitize" (list .Values.resourcesPreset .Values.resources $) | nindent 10 }}
+        # Ensure the StatefulSet's data PVC is removed when the release is
+        # deleted. Without this, the upstream chart leaves the PVC orphaned
+        # (StatefulSet volumeClaimTemplates are never garbage-collected by
+        # default). Rendered onto the StatefulSet by the upstream chart from
+        # server.persistentVolumeClaimRetentionPolicy. See issue #3058.
+        persistentVolumeClaimRetentionPolicy:
+          whenDeleted: Delete
+          whenScaled: Retain
         dataStorage:
           enabled: true
           size: {{ .Values.size }}
           {{- with .Values.storageClass }}
           storageClass: {{ . }}
           {{- end }}
+        {{- if $static }}
+        # The upstream chart mounts each Secret at /openbao/userconfig/<name>/.
+        extraVolumes:
+          - type: secret
+            name: {{ $seal.secretName | quote }}
+          {{- with $seal.previousSecretName }}
+          - type: secret
+            name: {{ . | quote }}
+          {{- end }}
+        {{- end }}
         {{- if gt (int .Values.replicas) 1 }}
         standalone:
           enabled: false
@@ -60,6 +131,17 @@ spec:
                 }
               {{- end }}
               }
+              {{- if $static }}
+
+              seal "static" {
+                current_key_id = {{ $seal.keyId | quote }}
+                current_key = "file:///openbao/userconfig/{{ $seal.secretName }}/key"
+                {{- if $seal.previousSecretName }}
+                previous_key_id = {{ $seal.previousKeyId | quote }}
+                previous_key = "file:///openbao/userconfig/{{ $seal.previousSecretName }}/key"
+                {{- end }}
+              }
+              {{- end }}
 
               service_registration "kubernetes" {}
         {{- else }}
@@ -77,6 +159,17 @@ spec:
             storage "file" {
               path = "/openbao/data"
             }
+            {{- if $static }}
+
+            seal "static" {
+              current_key_id = {{ $seal.keyId | quote }}
+              current_key = "file:///openbao/userconfig/{{ $seal.secretName }}/key"
+              {{- if $seal.previousSecretName }}
+              previous_key_id = {{ $seal.previousKeyId | quote }}
+              previous_key = "file:///openbao/userconfig/{{ $seal.previousSecretName }}/key"
+              {{- end }}
+            }
+            {{- end }}
             # Note: service_registration "kubernetes" {} is intentionally omitted
             # in standalone mode — it requires an HA-capable storage backend and
             # causes a fatal error with storage "file".
diff --git a/packages/apps/openbao/tests/pvc_retention_test.yaml b/packages/apps/openbao/tests/pvc_retention_test.yaml
new file mode 100644
index 0000000000..e7005d8e16
--- /dev/null
+++ b/packages/apps/openbao/tests/pvc_retention_test.yaml
@@ -0,0 +1,32 @@
+suite: data PVC retention policy passthrough
+
+# Guards the fix for issue #3058: the upstream OpenBAO StatefulSet renders
+# persistentVolumeClaimRetentionPolicy from server.persistentVolumeClaimRetentionPolicy.
+# The app wrapper must pass this value through the HelmRelease so the data PVC
+# is removed on release deletion instead of being orphaned.
+
+templates:
+  - templates/openbao.yaml
+
+release:
+  name: openbao-test
+  namespace: tenant-test
+
+tests:
+  - it: "passes whenDeleted=Delete through the HelmRelease values"
+    documentSelector:
+      path: kind
+      value: HelmRelease
+    asserts:
+      - equal:
+          path: spec.values.openbao.server.persistentVolumeClaimRetentionPolicy.whenDeleted
+          value: Delete
+
+  - it: "keeps whenScaled=Retain so scale-down does not destroy raft member data"
+    documentSelector:
+      path: kind
+      value: HelmRelease
+    asserts:
+      - equal:
+          path: spec.values.openbao.server.persistentVolumeClaimRetentionPolicy.whenScaled
+          value: Retain
diff --git a/packages/apps/openbao/tests/seal_test.yaml b/packages/apps/openbao/tests/seal_test.yaml
new file mode 100644
index 0000000000..78979ef97c
--- /dev/null
+++ b/packages/apps/openbao/tests/seal_test.yaml
@@ -0,0 +1,460 @@
+suite: seal and apiserver egress
+
+# Guards two fixes:
+#
+# - issue #2793: Cozystack's CiliumNetworkPolicy allow-to-apiserver only admits
+#   egress to kube-apiserver for pods labelled
+#   policy.cozystack.io/allow-to-apiserver=true. The upstream chart renders
+#   server.extraLabels onto the StatefulSet pods, so the wrapper must always
+#   pass the label through or service_registration "kubernetes" hangs.
+#
+# - issue #2787: optional auto-unseal with OpenBAO's `seal "static"`. The key
+#   lives in an operator-owned Secret mounted via server.extraVolumes (the
+#   upstream chart mounts each entry at /openbao/userconfig/<name>/).
+
+templates:
+  - templates/openbao.yaml
+
+release:
+  name: openbao-test
+  namespace: tenant-test
+
+tests:
+  - it: "always labels the server pods for apiserver egress"
+    documentSelector:
+      path: kind
+      value: HelmRelease
+    asserts:
+      - equal:
+          path: spec.values.openbao.server.extraLabels["policy.cozystack.io/allow-to-apiserver"]
+          value: "true"
+
+  - it: "keeps shamir by default: no seal stanza and no extra volumes"
+    documentSelector:
+      path: kind
+      value: HelmRelease
+    asserts:
+      - notExists:
+          path: spec.values.openbao.server.extraVolumes
+      - notMatchRegex:
+          path: spec.values.openbao.server.standalone.config
+          pattern: 'seal "static"'
+
+  - it: "keeps shamir by default in HA mode: no seal stanza in the raft config either"
+    set:
+      replicas: 3
+    documentSelector:
+      path: kind
+      value: HelmRelease
+    asserts:
+      - notExists:
+          path: spec.values.openbao.server.extraVolumes
+      - notMatchRegex:
+          path: spec.values.openbao.server.ha.raft.config
+          pattern: 'seal "'
+
+  - it: "renders the static seal stanza and the key volume in HA mode"
+    set:
+      replicas: 3
+      seal:
+        type: static
+        secretName: openbao-unseal
+        keyId: key-1
+    documentSelector:
+      path: kind
+      value: HelmRelease
+    asserts:
+      - equal:
+          path: spec.values.openbao.server.extraVolumes
+          value:
+            - type: secret
+              name: openbao-unseal
+      - matchRegex:
+          path: spec.values.openbao.server.ha.raft.config
+          pattern: 'seal "static" \{\n\s+current_key_id = "key-1"\n\s+current_key = "file:///openbao/userconfig/openbao-unseal/key"\n\s*\}'
+      - notMatchRegex:
+          path: spec.values.openbao.server.ha.raft.config
+          pattern: previous_key
+
+  - it: "renders the static seal stanza in standalone mode too"
+    set:
+      seal:
+        type: static
+        secretName: openbao-unseal
+        keyId: key-1
+    documentSelector:
+      path: kind
+      value: HelmRelease
+    asserts:
+      - matchRegex:
+          path: spec.values.openbao.server.standalone.config
+          pattern: 'seal "static" \{\n\s+current_key_id = "key-1"\n\s+current_key = "file:///openbao/userconfig/openbao-unseal/key"\n\s*\}'
+
+  - it: "mounts the previous key and renders previous_key_* during rotation"
+    set:
+      replicas: 3
+      seal:
+        type: static
+        secretName: openbao-unseal
+        keyId: key-2
+        previousSecretName: openbao-unseal-old
+        previousKeyId: key-1
+    documentSelector:
+      path: kind
+      value: HelmRelease
+    asserts:
+      - equal:
+          path: spec.values.openbao.server.extraVolumes
+          value:
+            - type: secret
+              name: openbao-unseal
+            - type: secret
+              name: openbao-unseal-old
+      - matchRegex:
+          path: spec.values.openbao.server.ha.raft.config
+          pattern: 'previous_key_id = "key-1"\n\s+previous_key = "file:///openbao/userconfig/openbao-unseal-old/key"'
+
+  - it: "rejects static without secretName"
+    set:
+      seal:
+        type: static
+        keyId: key-1
+    asserts:
+      - failedTemplate:
+          errorMessage: 'seal.secretName is required when seal.type is "static"'
+
+  - it: "rejects static without keyId"
+    set:
+      seal:
+        type: static
+        secretName: openbao-unseal
+    asserts:
+      - failedTemplate:
+          errorMessage: 'seal.keyId is required when seal.type is "static"'
+
+  - it: "rejects previousSecretName without previousKeyId"
+    set:
+      seal:
+        type: static
+        secretName: openbao-unseal
+        keyId: key-2
+        previousSecretName: openbao-unseal-old
+    asserts:
+      - failedTemplate:
+          errorMessage: "seal.previousKeyId is required when seal.previousSecretName is set"
+
+  - it: "rejects previousKeyId without previousSecretName"
+    set:
+      seal:
+        type: static
+        secretName: openbao-unseal
+        keyId: key-2
+        previousKeyId: key-1
+    asserts:
+      - failedTemplate:
+          errorMessage: "seal.previousSecretName is required when seal.previousKeyId is set"
+
+  - it: "rejects a previous Secret that is the current one, because both would mount as the same volume"
+    set:
+      seal:
+        type: static
+        secretName: openbao-unseal
+        keyId: key-2
+        previousSecretName: openbao-unseal
+        previousKeyId: key-1
+    asserts:
+      - failedTemplate:
+          errorMessage: "seal.previousSecretName must name a different Secret than seal.secretName"
+
+  - it: "rejects a previous key identifier that is the current one"
+    set:
+      seal:
+        type: static
+        secretName: openbao-unseal-2
+        keyId: key-1
+        previousSecretName: openbao-unseal-1
+        previousKeyId: key-1
+    asserts:
+      - failedTemplate:
+          errorMessage: "seal.previousKeyId must differ from seal.keyId"
+
+  - it: "rejects previousSecretName with seal.type shamir"
+    set:
+      seal:
+        type: shamir
+        previousSecretName: openbao-unseal-old
+        previousKeyId: key-1
+    asserts:
+      - failedTemplate:
+          errorMessage: 'seal.previousSecretName only applies to seal.type "static"'
+
+  # The seal in use is read from the config ConfigMap the previous release
+  # rendered (<release>-config, key extraconfig-from-values.hcl). A ConfigMap
+  # without a seal stanza means Shamir.
+  - it: "refuses to switch an existing Shamir instance to static without allowMigration"
+    kubernetesProvider:
+      scheme:
+        "v1/ConfigMap":
+          gvr:
+            version: "v1"
+            resource: "configmaps"
+          namespaced: true
+      objects:
+        - kind: ConfigMap
+          apiVersion: v1
+          metadata:
+            name: openbao-test-config
+            namespace: tenant-test
+          data:
+            extraconfig-from-values.hcl: |-
+              ui = true
+              storage "raft" {
+                path = "/openbao/data"
+              }
+              service_registration "kubernetes" {}
+    set:
+      replicas: 3
+      seal:
+        type: static
+        secretName: openbao-unseal
+        keyId: key-1
+    asserts:
+      - failedTemplate:
+          errorPattern: 'seal.type "static" differs from the seal in use \("shamir"\)'
+
+  - it: "refuses to switch an existing static instance back to shamir"
+    kubernetesProvider:
+      scheme:
+        "v1/ConfigMap":
+          gvr:
+            version: "v1"
+            resource: "configmaps"
+          namespaced: true
+      objects:
+        - kind: ConfigMap
+          apiVersion: v1
+          metadata:
+            name: openbao-test-config
+            namespace: tenant-test
+          data:
+            extraconfig-from-values.hcl: |-
+              storage "raft" {
+                path = "/openbao/data"
+              }
+              seal "static" {
+                current_key_id = "key-1"
+                current_key = "file:///openbao/userconfig/openbao-unseal/key"
+              }
+    set:
+      replicas: 3
+    asserts:
+      - failedTemplate:
+          errorMessage: 'migration from seal.type "static" to "shamir" is not supported by this chart'
+
+  - it: "refuses static to shamir even with allowMigration: the chart cannot render the disabled legacy stanza"
+    kubernetesProvider:
+      scheme:
+        "v1/ConfigMap":
+          gvr:
+            version: "v1"
+            resource: "configmaps"
+          namespaced: true
+      objects:
+        - kind: ConfigMap
+          apiVersion: v1
+          metadata:
+            name: openbao-test-config
+            namespace: tenant-test
+          data:
+            extraconfig-from-values.hcl: |-
+              seal "static" {
+                current_key_id = "key-1"
+                current_key = "file:///openbao/userconfig/openbao-unseal/key"
+              }
+    set:
+      replicas: 3
+      seal:
+        allowMigration: true
+    asserts:
+      - failedTemplate:
+          errorMessage: 'migration from seal.type "static" to "shamir" is not supported by this chart'
+
+  - it: "renders when the requested seal matches the seal in use"
+    kubernetesProvider:
+      scheme:
+        "v1/ConfigMap":
+          gvr:
+            version: "v1"
+            resource: "configmaps"
+          namespaced: true
+      objects:
+        - kind: ConfigMap
+          apiVersion: v1
+          metadata:
+            name: openbao-test-config
+            namespace: tenant-test
+          data:
+            extraconfig-from-values.hcl: |-
+              seal "static" {
+                current_key_id = "key-1"
+                current_key = "file:///openbao/userconfig/openbao-unseal/key"
+              }
+    set:
+      replicas: 3
+      seal:
+        type: static
+        secretName: openbao-unseal
+        keyId: key-2
+        previousSecretName: openbao-unseal-old
+        previousKeyId: key-1
+    documentSelector:
+      path: kind
+      value: HelmRelease
+    asserts:
+      - matchRegex:
+          path: spec.values.openbao.server.ha.raft.config
+          pattern: 'current_key_id = "key-2"'
+
+  - it: "renders a seal change when allowMigration acknowledges the migration"
+    kubernetesProvider:
+      scheme:
+        "v1/ConfigMap":
+          gvr:
+            version: "v1"
+            resource: "configmaps"
+          namespaced: true
+      objects:
+        - kind: ConfigMap
+          apiVersion: v1
+          metadata:
+            name: openbao-test-config
+            namespace: tenant-test
+          data:
+            extraconfig-from-values.hcl: |-
+              storage "raft" {
+                path = "/openbao/data"
+              }
+    set:
+      replicas: 3
+      seal:
+        type: static
+        secretName: openbao-unseal
+        keyId: key-1
+        allowMigration: true
+    documentSelector:
+      path: kind
+      value: HelmRelease
+    asserts:
+      - matchRegex:
+          path: spec.values.openbao.server.ha.raft.config
+          pattern: 'seal "static"'
+
+  - it: "renders hyphenated Secret names as plain strings in the volumes and in the key paths"
+    set:
+      seal:
+        type: static
+        secretName: openbao-unseal-2
+        keyId: key-2
+        previousSecretName: openbao-unseal-1
+        previousKeyId: key-1
+    documentSelector:
+      path: kind
+      value: HelmRelease
+    asserts:
+      - equal:
+          path: spec.values.openbao.server.extraVolumes
+          value:
+            - type: secret
+              name: openbao-unseal-2
+            - type: secret
+              name: openbao-unseal-1
+      - matchRegex:
+          path: spec.values.openbao.server.standalone.config
+          pattern: 'current_key = "file:///openbao/userconfig/openbao-unseal-2/key"\n\s+previous_key_id = "key-1"\n\s+previous_key = "file:///openbao/userconfig/openbao-unseal-1/key"'
+
+  - it: "rejects a Secret name with a dot, because the pod volume userconfig-<name> must be a DNS label"
+    set:
+      seal:
+        type: static
+        secretName: openbao.unseal
+        keyId: key-1
+    asserts:
+      - failedTemplate:
+          errorPattern: 'seal[./]secretName.*(?i:does not match pattern)'
+
+  - it: "rejects a Secret name longer than 52 characters, because userconfig-<name> must fit 63"
+    set:
+      seal:
+        type: static
+        secretName: a123456789b123456789c123456789d123456789e123456789fgh
+        keyId: key-1
+    asserts:
+      - failedTemplate:
+          errorPattern: 'seal[./]secretName.*(?i:length)'
+
+  - it: "rejects a previous Secret name with a quote"
+    set:
+      seal:
+        type: static
+        secretName: openbao-unseal
+        keyId: key-1
+        previousSecretName: 'openbao"unseal'
+        previousKeyId: key-0
+    asserts:
+      - failedTemplate:
+          errorPattern: 'seal[./]previousSecretName.*(?i:does not match pattern)'
+
+  - it: "accepts a 52 character Secret name and key identifiers in the form OpenBAO documents"
+    set:
+      seal:
+        type: static
+        secretName: a123456789b123456789c123456789d123456789e123456789fg
+        keyId: 20250606-1
+        previousSecretName: openbao-unseal-1
+        previousKeyId: key_2025.03
+    documentSelector:
+      path: kind
+      value: HelmRelease
+    asserts:
+      - equal:
+          path: spec.values.openbao.server.extraVolumes[0].name
+          value: a123456789b123456789c123456789d123456789e123456789fg
+      - matchRegex:
+          path: spec.values.openbao.server.standalone.config
+          pattern: 'current_key_id = "20250606-1"\n\s+current_key = "file:///openbao/userconfig/a123456789b123456789c123456789d123456789e123456789fg/key"\n\s+previous_key_id = "key_2025\.03"'
+
+  # The upstream chart renders the server config through tpl, so braces in a
+  # key identifier would run as a template under the helm-controller identity.
+  # Its start script also replaces HOSTNAME, POD_IP and similar upper case
+  # placeholders anywhere in the config before the server reads it.
+  - it: "rejects a key identifier that the upstream chart would evaluate as a template"
+    set:
+      seal:
+        type: static
+        secretName: openbao-unseal
+        keyId: '{{ .Release.Name }}'
+    asserts:
+      - failedTemplate:
+          errorPattern: 'seal[./]keyId.*(?i:does not match pattern)'
+
+  - it: "rejects an upper case key identifier that the start script would rewrite"
+    set:
+      seal:
+        type: static
+        secretName: openbao-unseal
+        keyId: HOSTNAME
+    asserts:
+      - failedTemplate:
+          errorPattern: 'seal[./]keyId.*(?i:does not match pattern)'
+
+  - it: "rejects a previous key identifier that the upstream chart would evaluate as a template"
+    set:
+      seal:
+        type: static
+        secretName: openbao-unseal-2
+        keyId: key-2
+        previousSecretName: openbao-unseal-1
+        previousKeyId: '{{ .Values }}'
+    asserts:
+      - failedTemplate:
+          errorPattern: 'seal[./]previousKeyId.*(?i:does not match pattern)'
diff --git a/packages/apps/openbao/values.schema.json b/packages/apps/openbao/values.schema.json
index 05af4960a5..f0d785e3d3 100644
--- a/packages/apps/openbao/values.schema.json
+++ b/packages/apps/openbao/values.schema.json
@@ -117,7 +117,10 @@
           "rule": "self == oldSelf",
           "message": "storageClass is immutable"
         }
-      ]
+      ],
+      "x-cozystack-options": {
+        "source": "storageclass"
+      }
     },
     "external": {
       "description": "Enable external access from outside the cluster.",
@@ -128,6 +131,58 @@
       "description": "Enable the OpenBAO web UI.",
       "type": "boolean",
       "default": true
+    },
+    "seal": {
+      "description": "Seal configuration. The default is Shamir key shares. Set `type: static` for auto-unseal.",
+      "type": "object",
+      "default": {},
+      "required": [
+        "keyId",
+        "secretName",
+        "type"
+      ],
+      "properties": {
+        "allowMigration": {
+          "description": "Acknowledge a seal migration. The chart refuses to change `type` on an existing instance unless this is `true`. Set it only while running `bao operator unseal -migrate`, then remove it.",
+          "type": "boolean",
+          "default": false
+        },
+        "keyId": {
+          "description": "Permanent identifier of the current key. OpenBAO stores it with the data the key wraps and picks the key by it, so change it whenever the key material changes. Lowercase alphanumerics, `-`, `.` and `_`, starting and ending with an alphanumeric, because the upstream chart evaluates the server config as a template and rewrites upper case placeholders such as `HOSTNAME` in it. Required when `type` is `static`.",
+          "type": "string",
+          "default": "",
+          "pattern": "^([a-z0-9]([-a-z0-9._]*[a-z0-9])?)?$"
+        },
+        "previousKeyId": {
+          "description": "Identifier of the previous key, with the same character constraints as `keyId`. Required when `previousSecretName` is set.",
+          "type": "string",
+          "default": "",
+          "pattern": "^([a-z0-9]([-a-z0-9._]*[a-z0-9])?)?$"
+        },
+        "previousSecretName": {
+          "description": "Secret holding the previous key during an n-1 key rotation, with the same name constraints as `secretName`. Keep it until the pods have been replaced and the active node has logged `upgrading stored keys`, see the README.",
+          "type": "string",
+          "default": "",
+          "maxLength": 52,
+          "pattern": "^([a-z0-9]([-a-z0-9]*[a-z0-9])?)?$"
+        },
+        "secretName": {
+          "description": "Existing Secret in the tenant namespace whose key `key` holds the base64 text of 32 random bytes (for example `openssl rand -base64 32`). A cluster administrator creates it, because tenant roles cannot create Secrets. Lowercase alphanumerics and hyphens, at most 52 characters, because the pod volume is named `userconfig-\u003cname\u003e` and a volume name is a DNS label. Required when `type` is `static`.",
+          "type": "string",
+          "default": "",
+          "maxLength": 52,
+          "pattern": "^([a-z0-9]([-a-z0-9]*[a-z0-9])?)?$"
+        },
+        "type": {
+          "description": "Seal type. `shamir` keeps the current behaviour, `static` enables auto-unseal from `secretName`.",
+          "type": "string",
+          "default": "shamir",
+          "enum": [
+            "shamir",
+            "static"
+          ]
+        }
+      }
     }
   }
 }
diff --git a/packages/apps/openbao/values.yaml b/packages/apps/openbao/values.yaml
index 98f49cab34..9d713dda30 100644
--- a/packages/apps/openbao/values.yaml
+++ b/packages/apps/openbao/values.yaml
@@ -69,6 +69,7 @@ size: 10Gi
 
 ## @param {string} storageClass - StorageClass used to store the data.
 ## @immutable
+## @x-cozystack-options {source: storageclass}
 storageClass: ""
 
 ## @param {bool} external - Enable external access from outside the cluster.
@@ -80,3 +81,34 @@ external: false
 
 ## @param {bool} ui - Enable the OpenBAO web UI.
 ui: true
+
+##
+## @section Seal
+##
+
+## @enum {string} SealType - How the OpenBAO barrier is unsealed.
+## @value shamir - Shamir key shares. An operator has to unseal every replica after each pod restart.
+## @value static - OpenBAO `seal "static"`. The barrier unseals itself from a 32-byte key read from a Secret.
+
+## @typedef {struct} Seal - Seal configuration. With `static`, the key is read from a Secret that a cluster administrator creates in the tenant namespace. The chart never generates or rotates it.
+## @field {SealType} type - Seal type. `shamir` keeps the current behaviour, `static` enables auto-unseal from `secretName`.
+## @field {string} secretName - Existing Secret in the tenant namespace whose key `key` holds the base64 text of 32 random bytes (for example `openssl rand -base64 32`). A cluster administrator creates it, because tenant roles cannot create Secrets. Lowercase alphanumerics and hyphens, at most 52 characters, because the pod volume is named `userconfig-<name>` and a volume name is a DNS label. Required when `type` is `static`.
+## @maxLength 52
+## @pattern ^([a-z0-9]([-a-z0-9]*[a-z0-9])?)?$
+## @field {string} keyId - Permanent identifier of the current key. OpenBAO stores it with the data the key wraps and picks the key by it, so change it whenever the key material changes. Lowercase alphanumerics, `-`, `.` and `_`, starting and ending with an alphanumeric, because the upstream chart evaluates the server config as a template and rewrites upper case placeholders such as `HOSTNAME` in it. Required when `type` is `static`.
+## @pattern ^([a-z0-9]([-a-z0-9._]*[a-z0-9])?)?$
+## @field {string} [previousSecretName] - Secret holding the previous key during an n-1 key rotation, with the same name constraints as `secretName`. Keep it until the pods have been replaced and the active node has logged `upgrading stored keys`, see the README.
+## @maxLength 52
+## @pattern ^([a-z0-9]([-a-z0-9]*[a-z0-9])?)?$
+## @field {string} [previousKeyId] - Identifier of the previous key, with the same character constraints as `keyId`. Required when `previousSecretName` is set.
+## @pattern ^([a-z0-9]([-a-z0-9._]*[a-z0-9])?)?$
+## @field {bool} [allowMigration] - Acknowledge a seal migration. The chart refuses to change `type` on an existing instance unless this is `true`. Set it only while running `bao operator unseal -migrate`, then remove it.
+
+## @param {Seal} seal - Seal configuration. The default is Shamir key shares. Set `type: static` for auto-unseal.
+seal:
+  type: shamir
+  secretName: ""
+  keyId: ""
+  previousSecretName: ""
+  previousKeyId: ""
+  allowMigration: false
diff --git a/packages/apps/opensearch/README.md b/packages/apps/opensearch/README.md
index 78c39c4da5..74fe3caa66 100644
--- a/packages/apps/opensearch/README.md
+++ b/packages/apps/opensearch/README.md
@@ -2,6 +2,72 @@
 
 > `storageClass` is annotated as immutable in the chart schema — see [`docs/storage-immutability.md`](../../../docs/storage-immutability.md) for the contract and which consumers enforce it.
 
+## TLS and client verification
+
+The HTTP listener and Dashboards always serve TLS. `tls.issuer` selects who signs the certificate: `cert-manager` mints a private CA per release, `operator` leaves it to the CA the opster operator manages itself. Left unset, the field follows `external`, so a release published outside the cluster gets `cert-manager` and a cluster-internal one gets `operator`. Only `cert-manager` requires OpenSearch 2.0.0 or later: below that, choosing it explicitly fails the release, and a release that only set `external` falls back to the operator issuer so it keeps working. Under `cert-manager` the chart issues the certificate for the OpenSearch API and, when Dashboards is enabled, a separate one for Dashboards, both from that per-release CA. Transport mTLS between nodes stays operator-managed under either issuer.
+
+**Retrieving the CA bundle** for client verification:
+
+The trust anchor is published as `opensearch-<name>.tenant-ca`, where `<name>` is the name of the OpenSearch resource: an object holding `ca.crt` and nothing else, created for every release on the `cert-manager` issuer and delivered to tenants through the `core.cozystack.io/tenantsecrets` API that the base tenant roles already grant.
+
+```bash
+kubectl --context <ctx> --namespace <tenant> \
+  get tenantsecret opensearch-<name>.tenant-ca \
+  --output jsonpath='{.data.ca\.crt}' | base64 --decode
+```
+
+That object is the only one that hands over the CA certificate without also handing over a private key, which is why it exists. `opensearch-<name>.http-ca` holds the CA private key alongside the certificate, and each leaf Secret holds a server private key; none of the three is granted to a tenant.
+
+### Operating a release on the cert-manager issuer
+
+Neither OpenSearch nor Dashboards reloads its certificate while running, so a reissue reaches no pod on its own and nothing anywhere reports that one happened. That is not only about a deliberate rotation: changing `external`, the tenant host or the cluster domain changes the certificate's SANs, cert-manager reissues on the spot, and the pods keep serving the old material with no error, event or condition to show for it. All three inputs reissue both certificates, so complete such a change on both sides.
+
+```bash
+kubectl --context <ctx> --namespace <tenant> delete secret opensearch-<name>-http-server
+kubectl --context <ctx> --namespace <tenant> rollout restart statefulset opensearch-<name>-nodes
+
+# only when Dashboards is enabled
+kubectl --context <ctx> --namespace <tenant> delete secret opensearch-<name>-dashboards-server
+kubectl --context <ctx> --namespace <tenant> rollout restart deployment opensearch-<name>-dashboards
+```
+
+Do not delete `opensearch-<name>.http-ca` to force this. That mints a new CA, and until everything has restarted the old one is still what clients are told to trust.
+
+Moving back to the operator issuer leaves the key material behind. The platform runs cert-manager with `enableCertificateOwnerRef: false`, so removing a `Certificate` does not remove the `Secret` it wrote: `opensearch-<name>.http-ca` keeps a usable CA private key at a predictable name for as long as the namespace lives, and each leaf Secret keeps a server key. No tenant Role and no selector reaches any of them, so this is hygiene rather than exposure, but nothing collects them either.
+
+```bash
+kubectl --context <ctx> --namespace <tenant> delete secret \
+  opensearch-<name>.http-ca opensearch-<name>-http-server
+
+# only if Dashboards was enabled
+kubectl --context <ctx> --namespace <tenant> delete secret opensearch-<name>-dashboards-server
+```
+
+The trust anchor needs no such step. The projection carries an owner reference to the sentinel the chart removes with the issuer, so it is collected along with it and no tenant is left trusting a CA the endpoint has stopped presenting.
+
+### Upgrading a release whose application name is too long for Dashboards
+
+With `dashboards.enabled` the application name is limited to 41 characters, and to 32 when `external` is also on, because the operator builds the Dashboards Service as `opensearch-<name>-dashboards` and a longer name overflows the 63-character DNS label limit. The apps API admits 42, so a release can exist today at a length this version refuses, and on upgrade its HelmRelease stops rendering with that length in the message.
+
+Such a release is not being broken by the guard. The Service it needs was already being refused by the API server, and the operator returns that failure on every pass before it reaches its upgrade, restart and snapshot-repository reconcilers, so the release has not been upgrading or rolling since it was created. What changes is that the stall now announces itself.
+
+The application name is fixed and cannot be renamed in place, so the way out for an existing release is `dashboards.enabled: false`, which drops the bound and lets it converge again without a Dashboards deployment it had no working Service for. Keeping Dashboards means recreating the application under a shorter name.
+
+### Upgrading an existing release published externally
+
+A release with `external: true` that never set `tls.issuer` runs on the operator issuer today and moves to `cert-manager` the first time it reconciles after this version. That rolls the cluster and re-anchors it on a new CA, so anything pinned to the operator's CA must be repointed at `opensearch-<name>.tenant-ca`. Set `tls.issuer: operator` before upgrading to keep that half as it is.
+
+The published external-dns name changes with the same upgrade whatever `tls.issuer` says, because the Services are gated on `external` alone: they move from the in-cluster domain, which never resolved outside the cluster, to `<release>.<tenant-host>` and `<release>-dashboards.<tenant-host>`. external-dns is configured upsert-only here, so it issues no delete and the stale record keeps pointing at the LoadBalancer until it is removed from the zone by hand.
+
+Nothing lists the records that are left behind, and the cleanup is per zone rather than per release, so start from the releases that publish one.
+
+```bash
+kubectl --context <ctx> get opensearches.apps.cozystack.io --all-namespaces \
+  --output=custom-columns=NAMESPACE:.metadata.namespace,NAME:.metadata.name,EXTERNAL:.spec.external
+```
+
+Every release listed with `EXTERNAL` true was annotated for `opensearch-<name>.<namespace>.<cluster-domain>` before the upgrade, and for `opensearch-<name>-dashboards.<namespace>.<cluster-domain>` as well when Dashboards was enabled. Whether an annotation ever became a record depends on the deployment, because external-dns ships with no provider and an empty `domainFilters` and a hosted zone for an in-cluster domain is unusual. Where one was served, those are the names to remove from it; the ones under the tenant host replace them.
+
 ## Parameters
 
 ### Common parameters
@@ -20,6 +86,14 @@
 | `version`              | OpenSearch major version to deploy.                                                                                               | `string`   | `v2`        |
 
 
+### TLS configuration
+
+| Name         | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | Type     | Value |
+| ------------ | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------- | ----- |
+| `tls`        | HTTP-layer TLS configuration. Selects who issues the HTTP server certificate; TLS itself is always served.                                                                                                                                                                                                                                                                                                                                                                              | `object` | `{}`  |
+| `tls.issuer` | Who issues the HTTP server certificate: `operator` uses the CA the opster operator manages itself, `cert-manager` gives the release its own CA, covers the external hostname and publishes a trust anchor the tenant can verify against. Unset follows external: `cert-manager` when it is true, `operator` when it is false. Named for the issuer because TLS is served under both, unlike the similarly-spelled `tls.enabled` in some other charts, which does switch TLS on and off. | `string` | `{}`  |
+
+
 ### Image configuration
 
 | Name                | Description                            | Type     | Value |
@@ -50,13 +124,13 @@
 
 ### OpenSearch Dashboards configuration
 
-| Name                          | Description                                           | Type       | Value      |
-| ----------------------------- | ----------------------------------------------------- | ---------- | ---------- |
-| `dashboards`                  | OpenSearch Dashboards configuration.                  | `object`   | `{}`       |
-| `dashboards.enabled`          | Enable OpenSearch Dashboards deployment.              | `bool`     | `false`    |
-| `dashboards.replicas`         | Number of Dashboards replicas.                        | `int`      | `1`        |
-| `dashboards.resources`        | Explicit CPU and memory configuration for Dashboards. | `object`   | `{}`       |
-| `dashboards.resources.cpu`    | CPU available to each node.                           | `quantity` | `""`       |
-| `dashboards.resources.memory` | Memory (RAM) available to each node.                  | `quantity` | `""`       |
-| `dashboards.resourcesPreset`  | Default sizing preset for Dashboards.                 | `string`   | `c1.small` |
+| Name                          | Description                                                                                                                                                                                                                                                                                                                                                 | Type       | Value      |
+| ----------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------- | ---------- |
+| `dashboards`                  | OpenSearch Dashboards configuration.                                                                                                                                                                                                                                                                                                                        | `object`   | `{}`       |
+| `dashboards.enabled`          | Enable OpenSearch Dashboards deployment. The application name is then limited to 41 characters, and to 32 when external access is also on, because the Dashboards Service the operator creates would otherwise exceed the 63-character DNS label limit, and the operator stops upgrading and restarting the release for as long as that Service is refused. | `bool`     | `false`    |
+| `dashboards.replicas`         | Number of Dashboards replicas.                                                                                                                                                                                                                                                                                                                              | `int`      | `1`        |
+| `dashboards.resources`        | Explicit CPU and memory configuration for Dashboards.                                                                                                                                                                                                                                                                                                       | `object`   | `{}`       |
+| `dashboards.resources.cpu`    | CPU available to each node.                                                                                                                                                                                                                                                                                                                                 | `quantity` | `""`       |
+| `dashboards.resources.memory` | Memory (RAM) available to each node.                                                                                                                                                                                                                                                                                                                        | `quantity` | `""`       |
+| `dashboards.resourcesPreset`  | Default sizing preset for Dashboards.                                                                                                                                                                                                                                                                                                                       | `string`   | `c1.small` |
 
diff --git a/packages/apps/opensearch/templates/_names.tpl b/packages/apps/opensearch/templates/_names.tpl
new file mode 100644
index 0000000000..765c7c0f3a
--- /dev/null
+++ b/packages/apps/opensearch/templates/_names.tpl
@@ -0,0 +1,85 @@
+{{/*
+opensearch.validateReleaseName fails the render when the release name is long enough
+that some object THIS CHART renders would be rejected by the API server, or would
+carry a DNS label the certificate cannot legally contain. Ownership is the whole of
+it: a name the chart does not render is not a name a render failure can save.
+
+Two different limits are in play, and conflating them is how this went wrong before:
+
+  - Certificate, Issuer, Secret, Role and RoleBinding names are DNS-1123 SUBDOMAINS,
+    bounded at 253. Nothing here approaches that, so they never bind.
+  - Service names are DNS-1035 LABELS, bounded at 63. So is every label inside a
+    certificate SAN. These are what actually bind.
+
+Which one binds depends on the configuration, because the longest name is only built
+in some of them. The suffixes, longest first:
+
+  -dashboards-external  (20)  Service, when external and dashboards are both on
+  -dashboards           (11)  Service the operator creates when dashboards are on
+  -discovery            (10)  Service the operator always creates, and a SAN label when
+                              the cert-manager issuer is selected. NewDiscoveryServiceForCR runs on
+                              every path, so this name exists regardless of TLS — the
+                              TLS branch below is about the SAN, not about the Service.
+  -external              (9)  Service, when external is on
+
+The guard takes the longest suffix that the current values actually produce and caps
+the release name at 63 minus its length. It is invoked from every template that
+renders one of these names, including the ones that render under the operator
+issuer, because the Service names have nothing to do with the issuer.
+
+THE -dashboards BOUND COSTS THE LAST LEGAL NOTCH, deliberately. It caps the release
+name at 52 while the apps API admits 53 (maxHelmReleaseName in
+pkg/registry/apps/application/rest.go), so one length a tenant may legitimately ask for
+is refused at render time. The alternative is worse at that same length. The operator
+composes the Dashboards Service as <spec.general.serviceName>-dashboards
+(NewDashboardsSvcForCr) and creates it last in DashboardsReconciler.Reconcile, whose
+combined result carries the failure; controllers/opensearchController.go runs its
+component reconcilers in one loop that returns on the first error, and
+dashboards.Reconcile sits ahead of upgrade.Reconcile, restart.Reconcile and
+snapshotrepository.Reconcile. A Service the API server refuses by length therefore does
+not cost one object: it stops those three on every pass for the life of the release, so
+the cluster comes up, converges, and then never upgrades, never rolls and never takes a
+snapshot repository, with the reason only in the operator log. Both outcomes are bad at
+53 characters. This one announces itself.
+
+The Dashboards SAN carries the same overflowing label and is not a second bound:
+cert-manager does not validate DNS label length in dnsNames, so nothing refuses the
+Certificate.
+
+REACHABILITY: Helm itself rejects a release name over 53 characters
+(chartutil.ValidateReleaseName), so two of these bounds can fire, -dashboards-external
+at 43 and -dashboards at 52. The -discovery (53) and -external (54) bounds are unreachable through
+Helm and kept as a backstop only: they are what makes the table above complete, and
+the arithmetic stays correct if the suffixes change. Do not read a passing render at
+53 characters as those branches working.
+*/}}
+{{- define "opensearch.validateReleaseName" -}}
+{{- $external := .Values.external | default false -}}
+{{- $dashboards := .Values.dashboards.enabled | default false -}}
+{{- $certManagerIssued := (include "opensearch.tls.certManagerIssued" .) | eq "true" -}}
+{{- $suffix := "" -}}
+{{- if and $external $dashboards -}}
+  {{- $suffix = "-dashboards-external" -}}
+{{- else if $dashboards -}}
+  {{- $suffix = "-dashboards" -}}
+{{- else if $certManagerIssued -}}
+  {{- $suffix = "-discovery" -}}
+{{- else if $external -}}
+  {{- $suffix = "-external" -}}
+{{- end -}}
+{{- if $suffix -}}
+  {{- $max := sub 63 (len $suffix) | int -}}
+  {{- if gt (len .Release.Name) $max -}}
+    {{- /*
+    An application name cannot be changed in place, so "use a shorter name" is the
+    one remedy an existing release does not have. Both reachable bounds come from
+    the Dashboards Service, so name the knob that drops them.
+    */ -}}
+    {{- $escape := "" -}}
+    {{- if $dashboards -}}
+      {{- $escape = " Set dashboards.enabled to false to drop this bound." -}}
+    {{- end -}}
+    {{- fail (printf "Release name %q is %d chars; opensearch requires <=%d in this configuration so that %q stays within the 63-char DNS label limit.%s" .Release.Name (len .Release.Name) $max (printf "%s%s" .Release.Name $suffix) $escape) -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
diff --git a/packages/apps/opensearch/templates/_tls.tpl b/packages/apps/opensearch/templates/_tls.tpl
new file mode 100644
index 0000000000..ba0e87c95e
--- /dev/null
+++ b/packages/apps/opensearch/templates/_tls.tpl
@@ -0,0 +1,59 @@
+{{/*
+opensearch.tls.certManagerIssued resolves tls.issuer to "true" or "false" so
+callers can use it with `eq`:
+
+  {{- $certManagerIssued := (include "opensearch.tls.certManagerIssued" .) | eq "true" -}}
+
+tls.issuer is tri-state: an explicit value is obeyed, and an absent one follows
+external, because a release nobody publishes has no third party to prove
+anything to. Both issuers serve TLS; the field selects who signs it.
+
+VERSION FLOOR: the cert-manager issuer requires OpenSearch >= 2.0.0.
+
+The operator picks the CA that signs the securityadmin admin certificate by
+cluster version: adminCAName() honours spec.security.tls.http.caSecret only at
+2.0.0 and above, and falls back to spec.security.tls.transport.caSecret below
+that. This chart leaves the transport CA operator-generated, so on an older
+cluster that field is empty and the operator signs the admin certificate with
+its own transport CA while the HTTP listener trusts the cert-manager CA. The
+two anchors never meet, securityadmin cannot authenticate, and the security
+configuration (users, roles, audit policies) never applies, silently.
+
+How the floor is applied depends on who chose the issuer, because the two cases
+have opposite correct answers:
+
+  - chosen explicitly (tls.issuer: cert-manager) → fail, loudly. The user asked
+    for something this version cannot deliver, and quietly giving them a weaker
+    configuration than they asked for would be worse than refusing.
+
+  - resolved from external (tls.issuer unset) → resolve to the operator issuer.
+    The user asked for external access, not for a per-release CA. The operator
+    issuer is what such a release already runs today, so degrading keeps it
+    working instead of breaking it on upgrade.
+
+The comparison runs against the resolved version string rather than the enum,
+the same value that goes into spec.general.version, which is the field the
+operator itself branches on. So the floor tracks the version mapping, and an
+images.opensearch override cannot move it out from under the operator either.
+
+`default dict` guards tls: null, which Helm delivers as nil rather than
+coalescing the key back to the values.yaml default. Measured on v4.2.4, through
+a values file and through --set alike. `kindIs "invalid"` guards an absent
+issuer key, which is the shape the chart ships.
+*/}}
+{{- define "opensearch.tls.certManagerIssued" -}}
+{{- $tlsMap := .Values.tls | default dict -}}
+{{- $issuer := index $tlsMap "issuer" -}}
+{{- $explicit := not (kindIs "invalid" $issuer) -}}
+{{- $resolved := ternary ($issuer | toString) (ternary "cert-manager" "operator" (.Values.external | default false)) $explicit -}}
+{{- $requested := eq $resolved "cert-manager" | toString -}}
+{{- if and (eq $requested "true") (semverCompare "<2.0.0" (include "opensearch.versionMap" .)) -}}
+  {{- if $explicit -}}
+    {{- fail (printf "opensearch %s (version: %s) does not support the cert-manager HTTP issuer: below 2.0.0 the operator signs the securityadmin admin certificate with the transport CA, which cannot verify against the cert-manager HTTP CA, so the admin certificate and the HTTP listener would never share a CA. Set tls.issuer: operator to use the operator's own HTTP CA, or use version v2 or later." (include "opensearch.versionMap" .) (.Values.version | default "v2")) -}}
+  {{- else -}}
+    {{- "false" -}}
+  {{- end -}}
+{{- else -}}
+  {{- $requested -}}
+{{- end -}}
+{{- end -}}
diff --git a/packages/apps/opensearch/templates/certmanager.yaml b/packages/apps/opensearch/templates/certmanager.yaml
new file mode 100644
index 0000000000..381c2e8aa9
--- /dev/null
+++ b/packages/apps/opensearch/templates/certmanager.yaml
@@ -0,0 +1,349 @@
+{{- /*
+NOTE: Transport mTLS is always operator-managed (spec.security.tls.transport.generate: true
+with perNode: true). This file covers HTTP layer (port 9200) and Dashboards HTTPS only.
+Selecting tls.issuer: operator does NOT disable transport mTLS: the operator enforces
+it regardless, as it is required by the OpenSearch security plugin.
+
+Design: ONE leaf Certificate PER SERVICE — the HTTP API (port 9200) and Dashboards
+(port 5601) each get their own, from a shared CA Issuer. They are deliberately not
+combined: a single leaf covering both would hand the Dashboards pod a private key
+valid for the API names. The Dashboards leaf renders last and only when Dashboards is
+enabled, so the chain is 4 resources without it and 5 with it.
+
+IMPORTANT: The CA Secret is named {{ .Release.Name }}.http-ca, with a DOT before
+http-ca. Two reasons stack, and the second is what the dot answers.
+
+It cannot be {{ .Release.Name }}-ca, because the operator hardcodes <clusterName>-ca for
+its own transport CA Secret (ReadOrGenerateCaCert in
+https://github.com/opensearch-project/opensearch-k8s-operator/blob/main/opensearch-operator/pkg/reconcilers/util/util.go).
+The operator would read the cert-manager Secret as that CA and fail with "tls: failed to
+find any PEM data in key input", because it expects ca.key where cert-manager writes
+tls.key.
+
+Nor is -http-ca far enough away, because every one of these names is a release name plus
+a suffix, and a SIBLING RELEASE supplies the difference between two suffixes. A release is
+<prefix><app> with prefix opensearch-, so release opensearch-foo's chart CA
+(<release>-http-ca) and release opensearch-foo-http's operator transport CA
+(<clusterName>-ca) are both opensearch-foo-http-ca — and foo-http is a legal application
+name. Whichever object reaches the name first keeps it, and the other side then reads or
+writes key material it did not create; that goes wrong in both directions and is not
+recoverable in place. The dot ends it: application names are validated as DNS-1035 labels
+(pkg/apis/apps/validation), which cannot contain a dot, and neither can the release prefix,
+so no operator-composed <clusterName><suffix> can equal this name. Secret names are
+DNS-1123 subdomains, which can. The platform's tenant-CA projection carries the dot for
+the same reason (projectionSuffix in internal/controller/cacert).
+
+So the rule: a suffix needs the dot when it is a tail of another suffix in the combined
+set, or has one as a tail. Names collide within a kind and not across kinds, so each kind
+has its own set; the one below is the SECRET suffixes. At operator 2.8.0 that set is -ca,
+-transport-cert, -http-cert, -admin-cert, -dashboards-cert and -admin-password on the
+operator's side, and .http-ca, -http-server, -dashboards-server, -credentials,
+-admin-credentials and -security-config on this chart's. The two leaf Secrets keep the hyphen — {{ .Release.Name }}-http-server and
+{{ .Release.Name }}-dashboards-server — because neither stands in that relation to any
+entry: no other suffix ends in -server, and neither leaf ends in another suffix. A suffix
+added later has to be checked the same way, against the set for its own kind. This chart's
+-security-config does have -config as a tail, and is harmless only because the operator
+composes <clusterName>-config as a ConfigMap (buildConfigMap in the configuration
+reconciler) rather than a Secret.
+
+That test is pairwise between FIXED suffixes, and one name here is not fixed:
+templates/users.yaml renders <release>-user-<username> for every key under .Values.users,
+and the key is tenant-chosen with no pattern constraining it in values.schema.json. A
+suffix whose tail a tenant supplies can be made to end in any name in the set, so the
+test answers "no collision" for one that is constructible: application x with a user
+named http-server, and application x-user on the cert-manager issuer, both write
+opensearch-x-user-http-server — once as the basic-auth Secret the operator watches for
+credentials, once as the HTTP server key. The dot does not close this one the way it
+closes the operator's names: that argument rests on application names being DNS-1035
+labels, and a users key is not, so it can carry a dot of its own. The two leaf names
+below are reachable through that family, which ships today and is open by construction;
+closing it means constraining the users key in that file, not moving a suffix here.
+
+One pair on that list does stand in it, outside this chain: -admin-credentials against
+-credentials, which makes release foo's admin Secret release foo-admin's user-facing one.
+Both names ship today and -credentials is what the ResourceDefinition grants the tenant by
+name, so moving either is a breaking change of its own rather than part of this file.
+
+securityadmin trust: the securityadmin job connects to the HTTP endpoint (port 9200 for
+OpenSearch >= 2.0) and validates the server certificate against the admin certificate's
+ca.crt, authenticating with that same admin certificate. To make both anchor on this CA,
+the CR passes {{ .Release.Name }}.http-ca to spec.security.tls.http.caSecret. Two separate
+mechanisms then act on that one field, and the annotation is involved in only one of
+them. The admin certificate is signed through providedCaCert, which reads the Secret's
+tls.crt/tls.key as the CA and does that only because cert-manager stamps
+cert-manager.io/issuer-kind on it. The listener's trust anchor is not that path: handleHttp
+mounts the key ca.crt out of the same Secret by subPath and points
+plugins.security.ssl.http.pemtrustedcas_filepath at it, with no remap anywhere. So the
+listener half rests on cert-manager writing ca.crt into the CA Secret alongside tls.crt,
+which is the second dependency, and the one the operator's CRD states as "must contain
+ca.crt and ca.key fields". The two halves fail separately; neither is evidence for the
+other. What the pair buys is one CA under both the server certificate securityadmin
+validates and the admin certificate it presents, so users and roles apply. The securityadmin job reaches the cluster on the operator's DNS
+base, which the platform sets from networking.clusterDomain.
+
+NAME-LENGTH GUARD: see opensearch.validateReleaseName in _names.tpl, which owns the
+limits table and is invoked below. Keeping a second copy of those numbers here is how
+the two drifted apart before.
+*/}}
+{{- $certManagerIssued := (include "opensearch.tls.certManagerIssued" .) | eq "true" -}}
+{{- if $certManagerIssued }}
+{{- include "opensearch.validateReleaseName" . -}}
+{{- /*
+The OpenSearch >= 2.0.0 floor for the cert-manager HTTP issuer is enforced in
+opensearch.tls.certManagerIssued, which fails on an explicit choice and degrades
+one resolved from external, so reaching this point already implies a supported
+version.
+*/}}
+{{- /*
+_cluster is defaulted before the read because `index` on an absent map is a hard
+render error, not a nil result — the `| default` below never runs. The platform
+always injects it, so the failure only shows up rendering the chart on its own.
+*/}}
+{{- $clusterDomain := (index (.Values._cluster | default dict) "cluster-domain") | default "cozy.local" }}
+---
+apiVersion: cert-manager.io/v1
+kind: Issuer
+metadata:
+  name: {{ .Release.Name }}-http-selfsigned
+spec:
+  selfSigned: {}
+---
+{{- /*
+HTTP-layer CA Certificate. rotationPolicy: Never keeps the CA stable so existing
+client trust bundles remain valid across cert-manager renewals.
+
+Certificate and Issuer names are this chart's alone — no other component composes
+names of those kinds — so they cannot be reached from the other side and the hyphen
+is safe on them.
+*/}}
+apiVersion: cert-manager.io/v1
+kind: Certificate
+metadata:
+  name: {{ .Release.Name }}-http-ca
+spec:
+  {{- /*
+  A dot, not a hyphen: hyphenated, this name is also the operator's transport CA Secret
+  for the sibling release one -http longer. See the header.
+  */}}
+  secretName: {{ .Release.Name }}.http-ca
+  {{- /*
+  This Secret is the extraction source named by templates/tenant-projection.yaml,
+  which is what publishes ca.crt to the tenant. Nothing is stamped on the Secret
+  itself: the controller reads the sentinel's sourceSecretName and never a label,
+  so the CA private key stored here under tls.key stays unpublishable by any edit
+  that only touches this file.
+
+  Withdrawal rides on the sentinel. Helm owns it, so moving back to the operator
+  issuer removes it, and the projection Secret is collected with it through the owner
+  reference the controller sets (sentinelOwnerRef in the cacert reconciler). The
+  cert-manager Secrets here do outlive that — enableCertificateOwnerRef is false
+  — but they are no longer published to anyone, so a tenant is never left holding
+  an anchor for an endpoint that has gone back to an operator-issued certificate.
+  */}}
+  duration: 87600h  # 10 years
+  isCA: true
+  {{- /*
+  NOT {{ .Release.Name }}: that is the subject of the operator's own transport CA
+  (GenerateCA(clusterName)), and the operator decides whether to re-mint the admin
+  certificate by comparing DN bytes rather than verifying a signature --
+  IsSignedByCA is bytes.Equal(cert.RawIssuer, ca.RawSubject). A colliding subject
+  therefore reads as "already signed by this CA" on a release upgrading off
+  operator-managed TLS: the admin certificate keeps its transport-CA issuer while
+  the listener trusts this one, and securityadmin fails to authenticate with only a
+  job timeout to show for it.
+  */}}
+  commonName: {{ .Release.Name }}-http-ca
+  {{- /*
+  No key encipherment: RFC 5480 section 3 forbids it for ECDSA keys, which do no
+  key transport. Every certificate this file renders is ECDSA P-256.
+  */}}
+  usages:
+    - signing
+    - cert sign
+  privateKey:
+    rotationPolicy: Never
+    algorithm: ECDSA
+    size: 256
+  issuerRef:
+    name: {{ .Release.Name }}-http-selfsigned
+    kind: Issuer
+    group: cert-manager.io
+---
+apiVersion: cert-manager.io/v1
+kind: Issuer
+metadata:
+  name: {{ .Release.Name }}-http-ca
+spec:
+  ca:
+    secretName: {{ .Release.Name }}.http-ca
+---
+{{- /*
+Leaf TLS Certificate for the OpenSearch HTTP API (port 9200), passed to
+spec.security.tls.http.secret.name. Dashboards gets its OWN certificate below.
+
+ONE CERTIFICATE PER SERVICE, not one covering both. The operator issues separately
+(<clusterName>-http-cert and <clusterName>-dashboards-cert), and collapsing them
+into a single combined-SAN leaf would hand the Dashboards pod a private key valid
+for the OpenSearch API names — including the external hostname. Dashboards is the
+far more exposed of the two, so a compromise there would let it impersonate the
+API endpoint for the whole certificate lifetime, which is ten years here. Keeping
+them apart costs one more Certificate and preserves the operator's isolation.
+
+NAMED -http-server, NOT -http-cert, for the first of the two reasons the CA above is
+not named -ca: the operator reserves <clusterName>-http-cert for the HTTP certificate
+it generates itself (nodeSecretName in handleHttp), alongside -ca,
+-transport-cert, -admin-cert and -dashboards-cert. Reusing the reserved name
+breaks the moment the release moves back to the operator issuer: cert-manager
+keeps its Secret when the Certificate goes away (the platform ships
+enableCertificateOwnerRef=false), the operator then finds a Secret already
+sitting at the name it was about to generate, skips generation, and mounts the
+stale cert-manager one — while signing the admin certificate with its own
+transport CA. securityadmin cannot authenticate against that, and the security
+config silently stops applying.
+Staying outside the operator's namespace of names avoids the collision entirely.
+*/}}
+apiVersion: cert-manager.io/v1
+kind: Certificate
+metadata:
+  name: {{ .Release.Name }}-http-server
+spec:
+  secretName: {{ .Release.Name }}-http-server
+  {{- /*
+  LIFETIME MATCHES THE CA, AND THERE IS NO renewBefore, because a reissue cannot
+  reach the running pods. The reason that does not depend on any operator version:
+  OpenSearch reads its certificates once at startup, the pinned operator's CRD has
+  no enableHotReload, and nothing restarts the pods when the Secret changes. So a
+  one-year leaf expired in place — cert-manager reissued into the Secret while the
+  pods kept serving the old certificate until it ran out, taking HTTPS on 9200 down
+  and breaking securityadmin on a timer. Matching the CA's lifetime removes that fuse.
+
+  At operator 2.8.0 (the pinned version) the mount shape compounds it. handleHttp makes
+  its three mount() calls carrying SubPath: filename only where http.generate is off and
+  http.caSecret is set, which is the pair this chart renders under the cert-manager
+  issuer; every other branch, generate with a caSecret included, mounts a whole folder.
+  The kubelet never refreshes a subPath-mounted file at all.
+  Upstream main has since moved every http branch back to mountFolder, so DO NOT
+  treat that half as durable across a `make update` bump.
+  The startup-read reason above is what keeps the conclusion correct either way.
+  (Dropping renewBefore does not disable reissue — cert-manager still defaults to
+  duration/3 — it only stops promising a 30-day cycle nothing can honour.)
+  Rotating this certificate is a deliberate act: delete the Secret named below,
+  then restart the OpenSearch pods so the new material is actually mounted.
+  */}}
+  duration: 87600h  # 10 years, matching the CA above
+  isCA: false
+  usages:
+    - server auth
+    - signing
+  {{- /*
+  MUST COVER EVERY SHAPE THE OPERATOR'S OWN HTTP CERTIFICATE COVERED. The
+  cert-manager issuer replaces the operator-issued certificate, so any name
+  missing here stops verifying for a client that was using it. The operator issues
+  for <name>, the service name, <name>-discovery and the <name>.<ns>[.svc[.domain]]
+  ladder. The two-label form is load-bearing: with ndots:5 and the default search
+  list, <name>.<ns> is what a client inside another namespace actually resolves and
+  therefore what its TLS verification runs against.
+
+  The fully-qualified rung agrees with what the operator emits, because both
+  sides read one platform value: DNS_BASE arrives through
+  opensearch-operator.manager.dnsBase and $clusterDomain here through _cluster,
+  and packages/core/platform/templates/apps.yaml fills both from
+  networking.clusterDomain. Rendered without the platform values the two fall
+  back to different defaults, cozy.local here and cluster.local there, which is
+  a shape no deployment takes.
+  */}}
+  dnsNames:
+    {{- $ns := .Release.Namespace }}
+    {{- $name := .Release.Name }}
+    # OpenSearch HTTP API service (operator-created ClusterIP)
+    - {{ $name }}
+    - {{ $name }}.{{ $ns }}
+    - {{ $name }}.{{ $ns }}.svc
+    - {{ $name }}.{{ $ns }}.svc.{{ $clusterDomain }}
+    # Headless discovery service the operator issues for as well
+    - {{ $name }}-discovery
+    {{- $extHost := (.Values._namespace | default dict).host | default "" }}
+    {{- if and (.Values.external | default false) $extHost }}
+    # External LoadBalancer DNS name (used by external-dns)
+    - {{ printf "%s.%s" $name $extHost }}
+    {{- end }}
+  privateKey:
+    {{- /*
+    PKCS#8, not cert-manager's PKCS1 default. For an ECDSA key that default writes
+    SEC1 ("BEGIN EC PRIVATE KEY"), and the reader here is a JVM: the operator mounts
+    this key as plugins.security.ssl.http.pemkey_filepath and the security plugin
+    hands the file to Netty, whose PEM loader builds a PKCS8EncodedKeySpec and tries
+    RSA, DSA and EC against it. A SEC1 key fails all three, the HTTPS listener never
+    starts, and the failure is a startup exception rather than anything the chart or
+    the operator can report. RSA would not help — PKCS#1 fails the same loader.
+    */}}
+    encoding: PKCS8
+    rotationPolicy: Always
+    algorithm: ECDSA
+    size: 256
+  issuerRef:
+    name: {{ .Release.Name }}-http-ca
+    kind: Issuer
+    group: cert-manager.io
+{{- if .Values.dashboards.enabled }}
+---
+{{- /*
+Leaf TLS Certificate for Dashboards (port 5601), passed to
+spec.dashboards.tls.secret.name. Deliberately a separate key from the API
+certificate above — see the note there. Same CA, so a client that trusts the
+published anchor verifies both, and the names mirror what the operator's own
+Dashboards certificate covered.
+
+Rendered last and only when Dashboards is enabled, so the document order of the
+four resources above does not depend on this value.
+*/}}
+apiVersion: cert-manager.io/v1
+kind: Certificate
+metadata:
+  name: {{ .Release.Name }}-dashboards-server
+spec:
+  secretName: {{ .Release.Name }}-dashboards-server
+  {{- /*
+  Same lifetime as the API certificate, for a DIFFERENT reason — the subPath
+  argument above does not apply here. The operator mounts an externally provided
+  Dashboards certificate as a whole secret volume with no SubPath, so the kubelet
+  does refresh those files. What does not happen is Dashboards noticing: it reads
+  server.ssl.certificate and server.ssl.key once at startup, and the operator adds
+  no checksum annotation for a provided secret, so nothing restarts the Deployment
+  when the material changes. A shorter life would still expire rather than rotate.
+  */}}
+  duration: 87600h  # 10 years, matching the CA
+  isCA: false
+  usages:
+    - server auth
+    - signing
+  dnsNames:
+    {{- $ns := .Release.Namespace }}
+    {{- $name := .Release.Name }}
+    # Dashboards service (operator-created ClusterIP)
+    - {{ $name }}-dashboards
+    - {{ $name }}-dashboards.{{ $ns }}
+    - {{ $name }}-dashboards.{{ $ns }}.svc
+    - {{ $name }}-dashboards.{{ $ns }}.svc.{{ $clusterDomain }}
+    {{- $extHost := (.Values._namespace | default dict).host | default "" }}
+    {{- if and (.Values.external | default false) $extHost }}
+    # External LoadBalancer DNS name (used by external-dns)
+    - {{ printf "%s-dashboards.%s" $name $extHost }}
+    {{- end }}
+  privateKey:
+    {{- /*
+    Node reads this one and accepts SEC1, so the encoding is not forced here the way
+    it is on the API leaf. It is set anyway: two leaves of one chain differing in key
+    encoding is a difference nothing explains, and the next reader would have to
+    re-derive which of the two is the constrained one.
+    */}}
+    encoding: PKCS8
+    rotationPolicy: Always
+    algorithm: ECDSA
+    size: 256
+  issuerRef:
+    name: {{ .Release.Name }}-http-ca
+    kind: Issuer
+    group: cert-manager.io
+{{- end }}
+{{- end }}
diff --git a/packages/apps/opensearch/templates/dashboard-resourcemap.yaml b/packages/apps/opensearch/templates/dashboard-resourcemap.yaml
index 91dbf8cb85..20301a75ac 100644
--- a/packages/apps/opensearch/templates/dashboard-resourcemap.yaml
+++ b/packages/apps/opensearch/templates/dashboard-resourcemap.yaml
@@ -22,6 +22,19 @@ rules:
   resourceNames:
   - {{ .Release.Name }}-credentials
   verbs: ["get", "list", "watch"]
+{{- /*
+The trust anchor is deliberately absent from that list. It reaches the tenant as
+the key-free <release>.tenant-ca projection through core.cozystack.io/tenantsecrets,
+which the base tenant roles already grant and which gates on the
+internal.cozystack.io/tenantresource label the lineage webhook stamps. A name grant
+here would answer a different question: it conveys whatever occupies the name, and
+it keeps conveying it after the webhook has withdrawn the verdict, so it would
+bypass the platform's only revocation channel for the anchor.
+
+The three Secrets of the TLS chain — <release>.http-ca, -http-server and
+-dashboards-server — each hold a private key and belong in no tenant-facing Role at
+all.
+*/}}
 - apiGroups:
   - cozystack.io
   resources:
diff --git a/packages/apps/opensearch/templates/external-svc.yaml b/packages/apps/opensearch/templates/external-svc.yaml
index f28626ab4c..7a87c90d2c 100644
--- a/packages/apps/opensearch/templates/external-svc.yaml
+++ b/packages/apps/opensearch/templates/external-svc.yaml
@@ -1,12 +1,22 @@
 {{- if .Values.external }}
-{{- $clusterDomain := (index .Values._cluster "cluster-domain") | default "cozy.local" }}
+{{- include "opensearch.validateReleaseName" . -}}
+{{- /*
+The tenant host may legitimately be empty — a platform with no _cluster.root-host
+set leaves it so all the way down the tenant tree. That is not a reason to take the
+release down: the LoadBalancers still get addresses and still serve. Publish the
+external-dns hostname only when there is a host to publish, rather than requiring
+one. The certificate SANs degrade the same way.
+*/}}
+{{- $extHost := (.Values._namespace | default dict).host | default "" }}
 ---
 apiVersion: v1
 kind: Service
 metadata:
   name: {{ .Release.Name }}-external
+  {{- if $extHost }}
   annotations:
-    external-dns.alpha.kubernetes.io/hostname: {{ .Release.Name }}.{{ .Release.Namespace }}.{{ $clusterDomain }}
+    external-dns.alpha.kubernetes.io/hostname: {{ printf "%s.%s" .Release.Name $extHost }}
+  {{- end }}
 spec:
   type: LoadBalancer
   selector:
@@ -23,13 +33,19 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ .Release.Name }}-dashboards-external
+  {{- if $extHost }}
   annotations:
-    external-dns.alpha.kubernetes.io/hostname: {{ .Release.Name }}-dashboards.{{ .Release.Namespace }}.{{ $clusterDomain }}
+    external-dns.alpha.kubernetes.io/hostname: {{ printf "%s-dashboards.%s" .Release.Name $extHost }}
+  {{- end }}
 spec:
   type: LoadBalancer
+  {{- /*
+  The operator labels Dashboards pods with opensearch.cluster.dashboards and
+  nothing else — no opster.io/opensearch-cluster, no app.kubernetes.io/*. A
+  selector naming those matches no pod, so the Service silently has no endpoints.
+  */}}
   selector:
-    opster.io/opensearch-cluster: {{ .Release.Name }}
-    app.kubernetes.io/component: dashboards
+    opensearch.cluster.dashboards: {{ .Release.Name }}
   ports:
     - name: https
       port: 5601
diff --git a/packages/apps/opensearch/templates/hooks/cleanup-pvc.yaml b/packages/apps/opensearch/templates/hooks/cleanup-pvc.yaml
new file mode 100644
index 0000000000..438a7203e2
--- /dev/null
+++ b/packages/apps/opensearch/templates/hooks/cleanup-pvc.yaml
@@ -0,0 +1,107 @@
+---
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: {{ .Release.Name }}-cleanup
+  labels:
+    app.kubernetes.io/instance: {{ .Release.Name }}
+  annotations:
+    "helm.sh/hook": post-delete
+    "helm.sh/hook-weight": "10"
+    "helm.sh/hook-delete-policy": before-hook-creation
+spec:
+  backoffLimit: 1
+  activeDeadlineSeconds: 120
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/instance: {{ .Release.Name }}
+        policy.cozystack.io/allow-to-apiserver: "true"
+    spec:
+      serviceAccountName: {{ .Release.Name }}-cleanup
+      restartPolicy: Never
+      securityContext:
+        runAsNonRoot: true
+        runAsUser: 65534
+        runAsGroup: 65534
+        seccompProfile:
+          type: RuntimeDefault
+      containers:
+        - name: cleanup
+          image: {{ include "cozy-lib.image" (list "clastix/kubectl:v1.32@sha256:b9ef7d8dbe65bcc81a46c09b8dc7543103055021c4f43287bf59e92a8f4fe05c" $) }}
+          securityContext:
+            allowPrivilegeEscalation: false
+            readOnlyRootFilesystem: true
+            capabilities:
+              drop: ["ALL"]
+          env:
+            - name: HOME
+              value: /tmp
+          resources:
+            requests:
+              cpu: 10m
+              memory: 64Mi
+            limits:
+              cpu: 200m
+              memory: 128Mi
+          command:
+            - /bin/sh
+            - -c
+            - |
+              set -u
+              echo "Deleting orphaned PVCs for {{ .Release.Name }}..."
+              if ! kubectl delete pvc -n {{ .Release.Namespace }} -l opster.io/opensearch-cluster={{ .Release.Name }} --ignore-not-found --wait=false; then
+                echo "ERROR: failed to delete PVCs matching opster.io/opensearch-cluster={{ .Release.Name }} in {{ .Release.Namespace }}; orphaned PVCs may remain" >&2
+                exit 1
+              fi
+              echo "PVC deletion requested for {{ .Release.Name }}; the claims are released once their pods have stopped."
+          volumeMounts:
+            - name: tmp
+              mountPath: /tmp
+      volumes:
+        - name: tmp
+          emptyDir: {}
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ .Release.Name }}-cleanup
+  labels:
+    app.kubernetes.io/instance: {{ .Release.Name }}
+  annotations:
+    "helm.sh/hook": post-delete
+    "helm.sh/hook-weight": "0"
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: {{ .Release.Name }}-cleanup
+  labels:
+    app.kubernetes.io/instance: {{ .Release.Name }}
+  annotations:
+    "helm.sh/hook": post-delete
+    "helm.sh/hook-weight": "5"
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+rules:
+  - apiGroups: [""]
+    resources: ["persistentvolumeclaims"]
+    verbs: ["get", "list", "delete"]
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: {{ .Release.Name }}-cleanup
+  labels:
+    app.kubernetes.io/instance: {{ .Release.Name }}
+  annotations:
+    "helm.sh/hook": post-delete
+    "helm.sh/hook-weight": "5"
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: {{ .Release.Name }}-cleanup
+subjects:
+  - kind: ServiceAccount
+    name: {{ .Release.Name }}-cleanup
diff --git a/packages/apps/opensearch/templates/opensearch.yaml b/packages/apps/opensearch/templates/opensearch.yaml
index 411c57a4b7..425e9ae7f8 100644
--- a/packages/apps/opensearch/templates/opensearch.yaml
+++ b/packages/apps/opensearch/templates/opensearch.yaml
@@ -3,6 +3,9 @@
 {{- if eq $topologyMode "hard" }}
 {{- $whenUnsatisfiable = "DoNotSchedule" }}
 {{- end }}
+{{- $certManagerIssued := (include "opensearch.tls.certManagerIssued" .) | eq "true" -}}
+{{- /* Renders unconditionally, so the guard is evaluated on the paths where neither certmanager.yaml nor external-svc.yaml renders anything. No reachable bound is unique to those paths today; this invocation is what keeps the check unconditional if one is added. */ -}}
+{{- include "opensearch.validateReleaseName" . -}}
 ---
 apiVersion: opensearch.opster.io/v1
 kind: OpenSearchCluster
@@ -13,8 +16,31 @@ spec:
     serviceName: {{ .Release.Name }}
     version: {{ include "opensearch.versionMap" $ }}
     httpPort: 9200
-    setVMMaxMapCount: true
-    drainDataNodes: true
+    {{- /*
+    The operator's own way to raise vm.max_map_count is a privileged init
+    container in every OpenSearch pod, and the PodSecurity level tenant
+    namespaces run at refuses that before any pod exists. The sysctl comes from
+    the DaemonSet in the opensearch-operator package instead, which raises it on
+    every node from a namespace the platform labels privileged. The node
+    contract is where the value belongs in the long run.
+    */}}
+    setVMMaxMapCount: false
+    {{- /*
+    Draining needs a data node with room for the shards, and below three there is
+    none. With one the operator excludes the node, finds its shards still there
+    and never deletes the pod. With two it stops trying for a full drain itself:
+    opensearch-k8s-operator v2.8.0 warns "some shards may not drain" in
+    pkg/reconcilers/rollingRestart.go restartStatefulSetPod, and
+    PreparePodForDelete in opensearch-gateway/services/os_data_service.go then
+    waits for system index primaries alone, which the surviving node cannot take
+    while it holds their replicas. Not draining pauses replica allocation for the
+    restart instead and re-enables it afterwards.
+
+    Gated on the data role as well: the operator's DataNodesCount adds up the live
+    StatefulSets of pools carrying that role, so with the role off it finds no data
+    nodes to drain whatever the replica count.
+    */}}
+    drainDataNodes: {{ and .Values.nodeRoles.data (gt (int .Values.replicas) 2) }}
     {{- if gt (len .Values.images.opensearch) 0 }}
     image: {{ .Values.images.opensearch }}
     {{- end }}
@@ -26,12 +52,57 @@ spec:
         generate: true
         perNode: true
       http:
+        {{- if $certManagerIssued }}
+        secret:
+          name: {{ .Release.Name }}-http-server
+        {{- /*
+        Feed the cert-manager HTTP CA to the operator so it (a) signs the admin
+        certificate with this CA and (b) sets the HTTP listener trust anchor to it.
+        That puts one CA under both the server cert securityadmin validates and the
+        admin cert it presents, which is what lets users and roles apply at all.
+
+        The dot before http-ca is load-bearing: hyphenated, this is also the name the
+        operator composes for its own transport CA on the sibling release one -http
+        longer. templates/certmanager.yaml carries the mechanism.
+        */}}
+        caSecret:
+          name: {{ .Release.Name }}.http-ca
+        {{- else }}
         generate: true
+        {{- end }}
     config:
       securityConfigSecret:
         name: {{ .Release.Name }}-security-config
       adminCredentialsSecret:
         name: {{ .Release.Name }}-admin-credentials
+      {{- /*
+      securityadmin.sh runs java with no -Xmx of its own, so the JVM sizes its
+      heap from whatever the container is allowed. With nothing set here the
+      tenant LimitRange supplies the namespace default instead, and the operator
+      builds this Job with backoffLimit 0, so the single OOM kill that follows is
+      final: the security index is never written and every node sits behind
+      "Not yet initialized (you may need to run securityadmin)" until the release
+      is deleted.
+
+      Measured against opensearchproject/opensearch:2.11.1 on linux/amd64,
+      applying a security config to a fresh single-node cluster: OOMKilled
+      mid-apply at 128Mi and at 192Mi, completes from 256Mi up. Having no -Xmx it
+      grows into what it is given, peaking at 208Mi under a 256Mi limit and at
+      253Mi under the 512Mi one below, so the headroom here is the point rather
+      than the peak.
+
+      Constants rather than the preset: the tool configures the cluster once and
+      exits, so what it needs does not grow with the nodes it configures, and the
+      smallest preset would hand it back the 128Mi it dies at.
+      */}}
+      updateJob:
+        resources:
+          requests:
+            cpu: 100m
+            memory: 256Mi
+          limits:
+            cpu: "1"
+            memory: 512Mi
   {{- if .Values.dashboards.enabled }}
   dashboards:
     enable: true
@@ -39,7 +110,16 @@ spec:
     replicas: {{ .Values.dashboards.replicas | default 1 }}
     tls:
       enable: true
+      {{- if $certManagerIssued }}
+      {{- /*
+      Dashboards gets its own certificate, not the API one: sharing a key would let
+      a compromised Dashboards impersonate the OpenSearch API endpoint.
+      */}}
+      secret:
+        name: {{ .Release.Name }}-dashboards-server
+      {{- else }}
       generate: true
+      {{- end }}
     resources: {{- include "cozy-lib.resources.defaultingSanitize" (list (.Values.dashboards.resourcesPreset | default "c1.small") .Values.dashboards.resources $) | nindent 6 }}
   {{- end }}
   nodePools:
diff --git a/packages/apps/opensearch/templates/security.yaml b/packages/apps/opensearch/templates/security.yaml
index d10d353ab7..f47372f10e 100644
--- a/packages/apps/opensearch/templates/security.yaml
+++ b/packages/apps/opensearch/templates/security.yaml
@@ -1,4 +1,4 @@
-{{- $clusterDomain := (index .Values._cluster "cluster-domain") | default "cozy.local" }}
+{{- $clusterDomain := (index (.Values._cluster | default dict) "cluster-domain") | default "cozy.local" }}
 {{- $existingAdminCreds := lookup "v1" "Secret" .Release.Namespace (printf "%s-admin-credentials" .Release.Name) }}
 {{- $existingSecurityConfig := lookup "v1" "Secret" .Release.Namespace (printf "%s-security-config" .Release.Name) }}
 {{- $password := randAlphaNum 32 }}
diff --git a/packages/apps/opensearch/templates/tenant-projection.yaml b/packages/apps/opensearch/templates/tenant-projection.yaml
new file mode 100644
index 0000000000..bae2faaa7f
--- /dev/null
+++ b/packages/apps/opensearch/templates/tenant-projection.yaml
@@ -0,0 +1,26 @@
+{{- /*
+Gated on the same condition as certmanager.yaml: the source Secret is minted by
+the CA Certificate there, so it only exists under the cert-manager issuer. An
+ungated sentinel would sit Ready=False/SourceNotFound on every operator-issued
+release.
+
+The source is the cert-manager CA Secret rather than a leaf: it is the anchor a
+client needs, and the controller copies ca.crt alone, so the CA private key
+stored alongside it under tls.key never leaves this namespace.
+
+The version floor lives in opensearch.tls.certManagerIssued, not here, but Helm names this
+file when it fires: of the three templates that call the helper, this is the one
+it evaluates first, so the failure is reported against the line below.
+*/}}
+{{- if eq (include "opensearch.tls.certManagerIssued" .) "true" }}
+---
+apiVersion: internal.cozystack.io/v1alpha1
+kind: TenantProjection
+metadata:
+  name: {{ .Release.Name }}-ca
+spec:
+  projections:
+    - type: CACert
+      sourceSecretName: {{ .Release.Name }}.http-ca
+      sourceKey: ca.crt
+{{- end }}
diff --git a/packages/apps/opensearch/tests/cleanup_pvc_test.yaml b/packages/apps/opensearch/tests/cleanup_pvc_test.yaml
new file mode 100644
index 0000000000..ba4a54ba8b
--- /dev/null
+++ b/packages/apps/opensearch/tests/cleanup_pvc_test.yaml
@@ -0,0 +1,105 @@
+suite: post-delete PVC cleanup hook
+
+release:
+  name: os-test
+  namespace: tenant-test
+
+templates:
+  - templates/hooks/cleanup-pvc.yaml
+
+tests:
+  - it: renders a post-delete Job that deletes the PVCs labelled with the release's OpenSearchCluster
+    documentSelector:
+      path: kind
+      value: Job
+    asserts:
+      - equal:
+          path: metadata.name
+          value: os-test-cleanup
+      - equal:
+          path: metadata.annotations["helm.sh/hook"]
+          value: post-delete
+      - equal:
+          path: metadata.annotations["helm.sh/hook-delete-policy"]
+          value: before-hook-creation
+      - equal:
+          path: spec.backoffLimit
+          value: 1
+      - equal:
+          path: spec.activeDeadlineSeconds
+          value: 120
+      - equal:
+          path: spec.template.spec.serviceAccountName
+          value: os-test-cleanup
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: 'kubectl delete pvc -n tenant-test -l opster\.io/opensearch-cluster=os-test --ignore-not-found --wait=false'
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: 'exit 1'
+
+  - it: pins the cleanup image by digest and routes it through the images registry
+    documentSelector:
+      path: kind
+      value: Job
+    asserts:
+      - matchRegex:
+          path: spec.template.spec.containers[0].image
+          pattern: ^clastix/kubectl:v[0-9]+\.[0-9]+(\.[0-9]+)?@sha256:[0-9a-f]{64}$
+
+  - it: prefixes the cleanup image with the cluster images registry when set
+    documentSelector:
+      path: kind
+      value: Job
+    set:
+      _cluster:
+        images-registry: registry.example.com
+    asserts:
+      - matchRegex:
+          path: spec.template.spec.containers[0].image
+          pattern: ^registry\.example\.com/clastix/kubectl:v[0-9]+\.[0-9]+(\.[0-9]+)?@sha256:[0-9a-f]{64}$
+
+  - it: runs the cleanup container non-root with a restricted securityContext
+    documentSelector:
+      path: kind
+      value: Job
+    asserts:
+      - equal:
+          path: spec.template.spec.securityContext.runAsNonRoot
+          value: true
+      - equal:
+          path: spec.template.spec.containers[0].securityContext.allowPrivilegeEscalation
+          value: false
+      - contains:
+          path: spec.template.spec.containers[0].securityContext.capabilities.drop
+          content: ALL
+
+  - it: grants get/list/delete on persistentvolumeclaims and nothing else
+    documentSelector:
+      path: kind
+      value: Role
+    asserts:
+      - equal:
+          path: metadata.annotations["helm.sh/hook-delete-policy"]
+          value: before-hook-creation,hook-succeeded
+      - equal:
+          path: rules
+          value:
+            - apiGroups: [""]
+              resources: ["persistentvolumeclaims"]
+              verbs: ["get", "list", "delete"]
+
+  - it: binds the cleanup ServiceAccount to the cleanup Role
+    documentSelector:
+      path: kind
+      value: RoleBinding
+    asserts:
+      - equal:
+          path: roleRef.name
+          value: os-test-cleanup
+      - equal:
+          path: subjects[0].kind
+          value: ServiceAccount
+      - equal:
+          path: subjects[0].name
+          value: os-test-cleanup
diff --git a/packages/apps/opensearch/tests/dashboard-resourcemap_test.yaml b/packages/apps/opensearch/tests/dashboard-resourcemap_test.yaml
new file mode 100644
index 0000000000..ed8ac2d653
--- /dev/null
+++ b/packages/apps/opensearch/tests/dashboard-resourcemap_test.yaml
@@ -0,0 +1,84 @@
+suite: opensearch tenant RBAC for dashboard resources
+
+# The Role is the direct read grant for tenant subjects, and the credentials Secret is
+# the only Secret that needs one. The trust anchor takes the other path: the
+# ApplicationDefinition's spec.secrets.include drives the lineage webhook's
+# tenantresource label, and the tenant reads the projection through
+# core.cozystack.io/tenantsecrets, which the base tenant roles grant. Every converged
+# engine delivers it that way and none name-grants it; mongodb's Role says why.
+
+release:
+  name: os-test
+  namespace: tenant-test
+
+set:
+  _cluster:
+    scheduling: {}
+    cluster-domain: cozy.local
+
+templates:
+  - templates/dashboard-resourcemap.yaml
+
+tests:
+  - it: grants the tenant the credentials Secret and nothing else
+    documentIndex: 0
+    asserts:
+      - isKind:
+          of: Role
+      - contains:
+          path: rules[1].resourceNames
+          content: os-test-credentials
+      - equal:
+          path: rules[1].resources
+          value:
+            - secrets
+
+  # Every Secret of the TLS chain carries a private key — the cert-manager CA under
+  # tls.key, and both leaves the same — so granting any of them would hand the tenant
+  # key material. The count is what makes this exhaustive rather than a list of the
+  # three names someone happened to think of, the projection included: it reaches the
+  # tenant through tenantsecrets, so a name grant for it here would be a bypass of the
+  # webhook's verdict rather than a convenience.
+  - it: never grants the tenant a Secret beyond the credentials
+    documentIndex: 0
+    asserts:
+      - notContains:
+          path: rules[1].resourceNames
+          content: os-test.http-ca
+      - notContains:
+          path: rules[1].resourceNames
+          content: os-test-http-server
+      - notContains:
+          path: rules[1].resourceNames
+          content: os-test-dashboards-server
+      - notContains:
+          path: rules[1].resourceNames
+          content: os-test.tenant-ca
+      - lengthEqual:
+          path: rules[1].resourceNames
+          count: 1
+      # And the rule count, because the assertion above is exhaustive only within
+      # rules[1]: a second rule granting secrets at another index satisfies every
+      # other assertion in this file.
+      - lengthEqual:
+          path: rules
+          count: 3
+
+  - it: grants read only, never write
+    documentIndex: 0
+    asserts:
+      - equal:
+          path: rules[1].verbs
+          value:
+            - get
+            - list
+            - watch
+
+  - it: binds the Role to tenant use subjects
+    documentIndex: 1
+    asserts:
+      - isKind:
+          of: RoleBinding
+      - equal:
+          path: roleRef.name
+          value: os-test-dashboard-resources
diff --git a/packages/apps/opensearch/tests/opensearch_test.yaml b/packages/apps/opensearch/tests/opensearch_test.yaml
index 2959ec1801..cc9a54336f 100644
--- a/packages/apps/opensearch/tests/opensearch_test.yaml
+++ b/packages/apps/opensearch/tests/opensearch_test.yaml
@@ -87,19 +87,77 @@ tests:
   # General           #
   #####################
 
-  - it: sets drainDataNodes to true
+  - it: drains data nodes when another node can take the shards
     release:
       name: test-os
       namespace: tenant-test
     set:
       _cluster:
         cluster-domain: cozy.local
+      replicas: 3
     asserts:
       - equal:
           path: spec.general.drainDataNodes
           value: true
         documentIndex: 0
 
+  # The operator's drain waits for the node to hold no shards before it deletes
+  # the pod. A single data node cannot get there, so a release with one replica
+  # would never roll, not for a version bump and not for a certificate move.
+  - it: does not drain the only data node
+    release:
+      name: test-os
+      namespace: tenant-test
+    set:
+      _cluster:
+        cluster-domain: cozy.local
+      replicas: 1
+    asserts:
+      - equal:
+          path: spec.general.drainDataNodes
+          value: false
+        documentIndex: 0
+
+  # Two is the boundary the operator gives up on: it warns that some shards may
+  # not drain and then waits only for system index primaries, which the other
+  # node cannot take while it holds their replicas. The case decides the
+  # threshold, so it is pinned rather than left to the pair either side of it.
+  - it: does not drain when the second data node has nowhere to put the shards
+    release:
+      name: test-os
+      namespace: tenant-test
+    set:
+      _cluster:
+        cluster-domain: cozy.local
+      replicas: 2
+    asserts:
+      - equal:
+          path: spec.general.drainDataNodes
+          value: false
+        documentIndex: 0
+
+  # The operator counts data nodes by summing replicas over pools carrying the
+  # data role. This chart renders one pool, so with the role off the count is
+  # zero however many replicas are asked for.
+  - it: does not drain a release that runs no data nodes
+    release:
+      name: test-os
+      namespace: tenant-test
+    set:
+      _cluster:
+        cluster-domain: cozy.local
+      replicas: 5
+      nodeRoles:
+        master: true
+        data: false
+        ingest: true
+        ml: false
+    asserts:
+      - equal:
+          path: spec.general.drainDataNodes
+          value: false
+        documentIndex: 0
+
   - it: sets httpPort to 9200
     release:
       name: test-os
@@ -113,6 +171,25 @@ tests:
           value: 9200
         documentIndex: 0
 
+  # The operator's init container for vm.max_map_count is privileged, and the
+  # PodSecurity level tenant namespaces run at refuses it before any pod exists.
+  # The sysctl comes from the DaemonSet in the opensearch-operator package
+  # instead, so this flag stays off. It is pinned as an explicit false rather
+  # than as absent, so an omitted key reads as a regression and not as a
+  # default nobody chose.
+  - it: does not ask the operator for the privileged sysctl init container
+    release:
+      name: test-os
+      namespace: tenant-test
+    set:
+      _cluster:
+        cluster-domain: cozy.local
+    asserts:
+      - equal:
+          path: spec.general.setVMMaxMapCount
+          value: false
+        documentIndex: 0
+
   #####################
   # Security          #
   #####################
@@ -174,7 +251,9 @@ tests:
     asserts:
       - notExists:
           path: spec.general.additionalConfig
-        documentIndex: 0
+        documentSelector:
+          path: kind
+          value: OpenSearchCluster
 
   #####################
   # Node Pools        #
@@ -245,6 +324,18 @@ tests:
         ingest: true
         ml: false
     asserts:
+      # Anchor the pool before asserting about it. notContains passes whenever
+      # its path resolves to something lacking the content, and a different
+      # nodePool at [0] qualifies, so a pool added ahead of this one would leave
+      # the guard green while cluster_manager came back on the pool it names.
+      #
+      # The anchor is the component, not a role: roles are shared between pools,
+      # so a second data-bearing pool inserted ahead of this one would satisfy a
+      # role-based anchor while the assertion below read the wrong pool.
+      - equal:
+          path: spec.nodePools[0].component
+          value: nodes
+        documentIndex: 0
       - notContains:
           path: spec.nodePools[0].roles
           content: cluster_manager
@@ -434,7 +525,9 @@ tests:
     asserts:
       - notExists:
           path: spec.dashboards
-        documentIndex: 0
+        documentSelector:
+          path: kind
+          value: OpenSearchCluster
 
   - it: renders dashboards when enabled
     release:
@@ -530,3 +623,50 @@ tests:
           path: spec.selector["opster.io/opensearch-cluster"]
           value: mydb
         documentIndex: 1
+
+  ###################################
+  # securityconfig update job       #
+  ###################################
+
+  - it: gives the securityconfig update job its own resources
+    release:
+      name: test-os
+      namespace: tenant-test
+    set:
+      _cluster:
+        cluster-domain: cozy.local
+    asserts:
+      - equal:
+          path: spec.security.config.updateJob.resources.requests.memory
+          value: 256Mi
+        documentIndex: 0
+      - equal:
+          path: spec.security.config.updateJob.resources.limits.memory
+          value: 512Mi
+        documentIndex: 0
+      - equal:
+          path: spec.security.config.updateJob.resources.requests.cpu
+          value: 100m
+        documentIndex: 0
+      - equal:
+          path: spec.security.config.updateJob.resources.limits.cpu
+          value: "1"
+        documentIndex: 0
+
+  # securityadmin configures the cluster once and exits, so what it needs does
+  # not grow with the cluster. Tying it to the preset would hand it 128Mi again
+  # on the smallest one, which is the amount it is OOMKilled at.
+  - it: keeps the update job resources off the node sizing preset
+    release:
+      name: test-os
+      namespace: tenant-test
+    set:
+      _cluster:
+        cluster-domain: cozy.local
+      resourcesPreset: "nano"
+      resources: {}
+    asserts:
+      - equal:
+          path: spec.security.config.updateJob.resources.limits.memory
+          value: 512Mi
+        documentIndex: 0
diff --git a/packages/apps/opensearch/tests/security_test.yaml b/packages/apps/opensearch/tests/security_test.yaml
index cd8740d901..3001a9fe1d 100644
--- a/packages/apps/opensearch/tests/security_test.yaml
+++ b/packages/apps/opensearch/tests/security_test.yaml
@@ -178,7 +178,9 @@ tests:
     asserts:
       - notExists:
           path: stringData.dashboards-host
-        documentIndex: 2
+        documentSelector:
+          path: metadata.name
+          value: test-os-credentials
 
   - it: includes dashboards fields when dashboards enabled
     release:
@@ -205,3 +207,28 @@ tests:
           path: stringData.dashboards-uri
           pattern: "^https://admin:[a-zA-Z0-9]{32}@test-os-dashboards\\.tenant-test\\.svc\\.cozy\\.local:5601$"
         documentIndex: 2
+
+  ###########################################
+  # Rendering without the platform's _cluster #
+  ###########################################
+
+  # Every case above injects _cluster, which is what the platform does, so none of
+  # them exercises the read itself. `index` on an absent map is a hard render error
+  # rather than a miss returning nil, so it takes the whole template down and the
+  # `| default` that follows never runs. certmanager.yaml has the same read and its
+  # own suite for this in tls_test.yaml; this is the other half.
+  #
+  # No _cluster in `set` on purpose: injecting it is the one thing this case must
+  # not do. The host assertion is what makes it more than a render check — it says
+  # the fallback value actually reached the output.
+  - it: falls back to the default cluster domain when _cluster is absent
+    release:
+      name: test-os
+      namespace: tenant-test
+    asserts:
+      - hasDocuments:
+          count: 3
+      - equal:
+          path: stringData.host
+          value: test-os.tenant-test.svc.cozy.local
+        documentIndex: 2
diff --git a/packages/apps/opensearch/tests/tenant_projection_test.yaml b/packages/apps/opensearch/tests/tenant_projection_test.yaml
new file mode 100644
index 0000000000..0471c7d193
--- /dev/null
+++ b/packages/apps/opensearch/tests/tenant_projection_test.yaml
@@ -0,0 +1,134 @@
+suite: opensearch TenantProjection sentinel
+
+# The chart renders one TenantProjection per TLS-enabled release: the declaration
+# that tells the CA-extraction controller to lift ca.crt out of the key-bearing
+# <release>.http-ca into the tenant-readable <release>.tenant-ca projection.
+#
+# This is the only thing that creates that projection. The tenant reads it through
+# core.cozystack.io/tenantsecrets, which the base tenant roles grant and which the
+# ApplicationDefinition's label selector admits it to; templates/dashboard-
+# resourcemap.yaml deliberately grants no name for it, and
+# tests/dashboard-resourcemap_test.yaml pins that absence. Both paths are inert
+# until the sentinel exists, so losing this template costs the tenant its trust
+# anchor with no error anywhere.
+#
+# The source is named .http-ca, with a dot: the operator reserves <clusterName>-ca for
+# its own transport CA, and the hyphenated form is exactly that name for the sibling
+# release one -http longer. See the note in templates/certmanager.yaml.
+
+release:
+  name: os-test
+  namespace: tenant-test
+
+templates:
+  - templates/tenant-projection.yaml
+
+tests:
+  - it: renders exactly one TenantProjection named after the release
+    set:
+      tls:
+        issuer: cert-manager
+    asserts:
+      - hasDocuments:
+          count: 1
+      - isKind:
+          of: TenantProjection
+      - equal:
+          path: apiVersion
+          value: internal.cozystack.io/v1alpha1
+      - equal:
+          path: metadata.name
+          value: os-test-ca
+
+  - it: declares a CACert projection of the chart's HTTP CA
+    set:
+      tls:
+        issuer: cert-manager
+    asserts:
+      - equal:
+          path: spec.projections[0].type
+          value: CACert
+      - equal:
+          path: spec.projections[0].sourceSecretName
+          value: os-test.http-ca
+      - equal:
+          path: spec.projections[0].sourceKey
+          value: ca.crt
+
+  # The one genuine invariant. pkg/lineage/lineage.go returns early once an
+  # ownerReferences is present, so the helm-label fallback that resolves the
+  # application is never reached: the projection never gets tenantresource=true and
+  # the tenant silently loses the anchor. Adding one breaks the read path with no
+  # error anywhere.
+  - it: carries no ownerReferences
+    set:
+      tls:
+        issuer: cert-manager
+    asserts:
+      - notExists:
+          path: metadata.ownerReferences
+
+  # Not invariants — conformance to the shared sentinel shape. Setting either would
+  # be functionally harmless here (the release namespace is where Helm puts it either
+  # way, and Flux stamps its own label at apply time), but every engine's sentinel is
+  # meant to be the same eight lines, so a local embellishment is a divergence to
+  # catch at review rather than in six copies.
+  - it: matches the shared sentinel shape
+    set:
+      tls:
+        issuer: cert-manager
+    asserts:
+      - notExists:
+          path: metadata.namespace
+      - notExists:
+          path: metadata.labels
+
+  # The source Secret exists only under the cert-manager issuer, so an ungated
+  # sentinel would sit Ready=False/SourceNotFound forever on every
+  # operator-issued release.
+  #
+  # The gate must track the chart's EFFECTIVE issuer, not the raw tls.issuer
+  # value: leaving it unset means "follow external". A naive `if .Values.tls.issuer`
+  # still passes the two explicit cases below while publishing no anchor to exactly
+  # the releases most likely to need one, so both implied legs are pinned too.
+  - it: renders the sentinel when cert-manager is implied by external access
+    set:
+      external: true
+    asserts:
+      - hasDocuments:
+          count: 1
+
+  - it: renders nothing when the operator issuer is implied by external being false
+    set:
+      external: false
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  - it: renders nothing when the operator issuer is chosen despite external access
+    set:
+      external: true
+      tls:
+        issuer: operator
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  - it: renders nothing when the operator issuer is chosen
+    set:
+      tls:
+        issuer: operator
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  # The version floor degrades an issuer resolved from external rather than failing
+  # it, and certmanager.yaml is gated on the same helper — so below 2.0.0 there is no
+  # CA Secret to project from. A sentinel rendered here would never resolve.
+  - it: renders nothing when the version floor degrades an issuer resolved from external
+    set:
+      version: v1
+      external: true
+    asserts:
+      - hasDocuments:
+          count: 0
diff --git a/packages/apps/opensearch/tests/tls_null_values.yaml b/packages/apps/opensearch/tests/tls_null_values.yaml
new file mode 100644
index 0000000000..2fd8fc546a
--- /dev/null
+++ b/packages/apps/opensearch/tests/tls_null_values.yaml
@@ -0,0 +1 @@
+tls: null
diff --git a/packages/apps/opensearch/tests/tls_test.yaml b/packages/apps/opensearch/tests/tls_test.yaml
new file mode 100644
index 0000000000..fb48b91439
--- /dev/null
+++ b/packages/apps/opensearch/tests/tls_test.yaml
@@ -0,0 +1,1440 @@
+suite: opensearch TLS cert-manager chain
+
+# Covers the tri-state tls.issuer field:
+#   (a) external: false, issuer unset          → operator generates the HTTP cert
+#   (b) external: true,  issuer unset          → cert-manager, with the external SAN
+#   (c) external: true,  issuer: operator      → operator generates the HTTP cert
+#   (d) external: false, issuer: cert-manager  → cert-manager, no external SAN
+#   (e) external: true,  issuer: cert-manager  → cert-manager, with the external SAN
+#
+# Design: ONE leaf Certificate per service, both under the same CA. Sharing a key
+# between the API and Dashboards would let a compromised Dashboards impersonate the
+# API endpoint, so they are issued separately, as the operator itself does.
+# Chain: selfsigned Issuer, CA Cert, CA Issuer, API leaf, and — only when Dashboards
+# is enabled, appended last so the first four indices are stable — the Dashboards leaf.
+# Transport mTLS remains operator-managed (generate: true, perNode: true) — not touched here.
+
+release:
+  name: os-test
+  namespace: tenant-test
+
+set:
+  _cluster:
+    scheduling: {}
+    cluster-domain: cozy.local
+
+###############################################################################
+# certmanager.yaml — case (a): external false, issuer unset → no resources
+###############################################################################
+
+templates:
+  - templates/certmanager.yaml
+
+tests:
+  # The release-name bound is whatever the longest DNS label this configuration
+  # actually builds allows, and the limits differ by object kind: Service names and
+  # certificate SAN labels are bounded at 63, while Certificate/Secret/Role names are
+  # subdomains bounded at 253 and never bind. Both sides of each boundary are pinned.
+  #
+  # -dashboards-external (Service, external+dashboards) is the longest at 20 -> 43.
+  - it: rejects a name whose dashboards external Service would exceed 63
+    release:
+      name: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+      namespace: tenant-test
+    set:
+      external: true
+      _namespace:
+        host: example.cozy.local
+      dashboards:
+        enabled: true
+      tls:
+        issuer: cert-manager
+    asserts:
+      - failedTemplate:
+          errorMessage: 'Release name "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" is 44 chars; opensearch requires <=43 in this configuration so that "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-dashboards-external" stays within the 63-char DNS label limit. Set dashboards.enabled to false to drop this bound.'
+
+  - it: accepts the longest name that fits with external and dashboards both on
+    release:
+      name: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+      namespace: tenant-test
+    set:
+      external: true
+      _namespace:
+        host: example.cozy.local
+      dashboards:
+        enabled: true
+      tls:
+        issuer: cert-manager
+    asserts:
+      - hasDocuments:
+          count: 5
+
+  # -dashboards (11 -> 52) is a bound, and besides -dashboards-external the only one
+  # Helm's own 53-character ceiling leaves reachable. Both sides are pinned. What
+  # overflows at 53 is the operator's Dashboards Service, and a Service the API server
+  # refuses by length stops the reconcilers queued behind it rather than costing that
+  # one object.
+  - it: rejects a name whose dashboards Service would exceed 63
+    release:
+      name: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+      namespace: tenant-test
+    set:
+      tls:
+        issuer: cert-manager
+      dashboards:
+        enabled: true
+    asserts:
+      - failedTemplate:
+          errorMessage: 'Release name "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" is 53 chars; opensearch requires <=52 in this configuration so that "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-dashboards" stays within the 63-char DNS label limit. Set dashboards.enabled to false to drop this bound.'
+
+  - it: renders the whole chain for the longest admissible name with dashboards on
+    release:
+      name: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+      namespace: tenant-test
+    set:
+      tls:
+        issuer: cert-manager
+      dashboards:
+        enabled: true
+    asserts:
+      - hasDocuments:
+          count: 5
+      - contains:
+          path: spec.dnsNames
+          content: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-dashboards
+        documentIndex: 4
+
+  # The -discovery bound itself cannot be observed from a test: its cap is 53 and Helm
+  # rejects a release name above 53, so the branch never fires whatever is rendered here.
+  # Deleting it leaves this case green. What is pinned is the SAN that gives the suffix
+  # its reason to be in the table at all.
+  - it: covers the discovery SAN at the longest admissible name with dashboards off
+    release:
+      name: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+      namespace: tenant-test
+    set:
+      tls:
+        issuer: cert-manager
+    asserts:
+      - hasDocuments:
+          count: 4
+      - contains:
+          path: spec.dnsNames
+          content: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-discovery
+        documentIndex: 3
+
+  # A release that never chose an issuer must not be lost to a name length either.
+  - it: still renders a long-named external release that never chose an issuer
+    release:
+      name: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+      namespace: tenant-test
+    set:
+      external: true
+      _namespace:
+        host: example.cozy.local
+    asserts:
+      - hasDocuments:
+          count: 4
+
+  # Version floor: below OpenSearch 2.0.0 the operator signs the admin certificate
+  # with the transport CA instead of http.caSecret, so securityadmin cannot verify
+  # against the cert-manager HTTP CA and the security config silently never applies.
+  # An explicit choice fails; one resolved from external degrades (two cases below).
+  - it: fails when the cert-manager HTTP issuer is chosen explicitly below 2.0.0
+    set:
+      version: v1
+      tls:
+        issuer: cert-manager
+    asserts:
+      - failedTemplate:
+          errorMessage: "opensearch 1.3.20 (version: v1) does not support the cert-manager HTTP issuer: below 2.0.0 the operator signs the securityadmin admin certificate with the transport CA, which cannot verify against the cert-manager HTTP CA, so the admin certificate and the HTTP listener would never share a CA. Set tls.issuer: operator to use the operator's own HTTP CA, or use version v2 or later."
+
+  # A v1 + external release never chose cert-manager: the tri-state resolved it
+  # from external. Degrade to the operator issuer so such a release keeps
+  # rendering on upgrade instead of hard-failing on a field it never set.
+  - it: degrades to the operator issuer when external resolves it below 2.0.0
+    set:
+      version: v1
+      external: true
+      _namespace:
+        host: example.cozy.local
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  - it: allows version v1 under the operator issuer
+    set:
+      version: v1
+      external: true
+      _namespace:
+        host: example.cozy.local
+      tls:
+        issuer: operator
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  - it: allows the cert-manager issuer on v3, which is at or above 2.0.0
+    set:
+      version: v3
+      tls:
+        issuer: cert-manager
+    asserts:
+      - hasDocuments:
+          count: 4
+
+  # Passing http.caSecret moves the operator onto subPath mounts, which the kubelet
+  # never refreshes, and nothing restarts the pods when the Secret changes. A leaf
+  # that outlived its mount would expire in place and take HTTPS down on a timer, so
+  # the leaf must not be short-lived, and renewBefore must not promise a rotation
+  # that cannot happen.
+  - it: gives the leaf certificate no expiry the pods cannot survive
+    set:
+      tls:
+        issuer: cert-manager
+    asserts:
+      - equal:
+          path: spec.duration
+          value: 87600h
+        documentIndex: 3
+      - notExists:
+          path: spec.renewBefore
+        documentIndex: 3
+
+  - it: keeps the CA and the leaf on the same lifetime
+    set:
+      tls:
+        issuer: cert-manager
+    asserts:
+      - equal:
+          path: spec.duration
+          value: 87600h
+        documentIndex: 1
+      - notExists:
+          path: spec.renewBefore
+        documentIndex: 1
+
+  # Both names external-svc publishes to external-dns must appear in the leaf's SAN
+  # list, or an external client reaching the LoadBalancer fails hostname verification.
+  - it: covers both external-dns hostnames with certificate SANs
+    set:
+      external: true
+      _namespace:
+        host: example.cozy.local
+      dashboards:
+        enabled: true
+    asserts:
+      - contains:
+          path: spec.dnsNames
+          content: os-test.example.cozy.local
+        documentIndex: 3
+      - contains:
+          path: spec.dnsNames
+          content: os-test-dashboards.example.cozy.local
+        documentIndex: 4
+      # Neither certificate may carry the other's name — that is the whole point of
+      # issuing them separately.
+      - notContains:
+          path: spec.dnsNames
+          content: os-test-dashboards.example.cozy.local
+        documentIndex: 3
+      - notContains:
+          path: spec.dnsNames
+          content: os-test.example.cozy.local
+        documentIndex: 4
+
+  # The operator reserves <release>-http-cert for the HTTP certificate it generates
+  # itself. If the chart's leaf took that name, moving back to the operator issuer would
+  # leave the cert-manager Secret behind (enableCertificateOwnerRef is false), the
+  # operator would find it already present, skip generation and mount it — while signing the
+  # admin certificate with its transport CA, silently breaking securityadmin.
+  # Anchored on the Certificate's own name, not on the field under test, which a
+  # selector would otherwise decide for the assertions. The equal is what refuses an
+  # absent spec.secretName: notEqual holds against a document carrying no such field,
+  # so the five below pass against any Issuer in the chain on their own.
+  - it: keeps the leaf secret out of the operator's reserved certificate names
+    set:
+      tls:
+        issuer: cert-manager
+    documentSelector:
+      path: metadata.name
+      value: os-test-http-server
+    asserts:
+      - equal:
+          path: spec.secretName
+          value: os-test-http-server
+      - notEqual:
+          path: spec.secretName
+          value: os-test-http-cert
+      - notEqual:
+          path: spec.secretName
+          value: os-test-transport-cert
+      - notEqual:
+          path: spec.secretName
+          value: os-test-dashboards-cert
+      - notEqual:
+          path: spec.secretName
+          value: os-test-admin-cert
+      - notEqual:
+          path: spec.secretName
+          value: os-test-ca
+
+  # Hyphenated, the CA Secret name is also what the operator composes for its own
+  # transport CA on the sibling release one -http longer: release os-test's
+  # <release>-http-ca is release os-test-http's <clusterName>-ca, and os-test-http is a
+  # legal application name. Whichever object reached the name first would keep it while
+  # the other side read or wrote key material it did not create. Application names are
+  # DNS-1035 labels and cannot contain a dot, so the dot puts this name beyond the
+  # operator's reach for every sibling at once.
+  - it: keeps the CA secret beyond the reach of any operator-composed name
+    set:
+      tls:
+        issuer: cert-manager
+    asserts:
+      - equal:
+          path: spec.secretName
+          value: os-test.http-ca
+        documentIndex: 1
+      # The transport CA of the sibling release named one -http longer.
+      - notEqual:
+          path: spec.secretName
+          value: os-test-http-ca
+        documentIndex: 1
+      - notEqual:
+          path: spec.secretName
+          value: os-test-ca
+        documentIndex: 1
+      - notEqual:
+          path: spec.secretName
+          value: os-test-http-cert
+        documentIndex: 1
+      - notEqual:
+          path: spec.secretName
+          value: os-test-admin-cert
+        documentIndex: 1
+
+  # Every Secret this template mints carries a private key: the CA's under tls.key,
+  # and each leaf's server key. The ApplicationDefinition grants by LABEL with no name
+  # constraint, so a tenant-visible label appearing on any of them hands the tenant
+  # that key while every other assertion in this file still passes. The tenant reads
+  # the projection the sentinel produces instead — see tenant_projection_test.yaml.
+  #
+  # Selected by the Secret each Certificate writes rather than by position: a
+  # documentIndex would follow the slot, so reordering this template would let a
+  # labelled key-bearing Certificate slide out from under the assertion and pass
+  # green. spec.secretName also discriminates Certificate from Issuer, which shares
+  # metadata.name os-test-http-ca with it and names the same Secret under
+  # spec.ca.secretName, and helm-unittest fails the test when a selector matches no
+  # document or more than one — so the anchor cannot go blind either.
+  - it: keeps the key-bearing CA secret off every tenant-visible label
+    set:
+      tls:
+        issuer: cert-manager
+    documentSelector:
+      path: spec.secretName
+      value: os-test.http-ca
+    asserts:
+      - notExists:
+          path: spec.secretTemplate.labels["internal.cozystack.io/tenant-ca"]
+      - notExists:
+          path: spec.secretTemplate.labels["internal.cozystack.io/tenantresource"]
+      - notExists:
+          path: spec.secretTemplate
+
+  - it: keeps the key-bearing API leaf off every tenant-visible label
+    set:
+      tls:
+        issuer: cert-manager
+    documentSelector:
+      path: spec.secretName
+      value: os-test-http-server
+    asserts:
+      - notExists:
+          path: spec.secretTemplate.labels["internal.cozystack.io/tenant-ca"]
+      - notExists:
+          path: spec.secretTemplate.labels["internal.cozystack.io/tenantresource"]
+      - notExists:
+          path: spec.secretTemplate
+
+  - it: keeps the key-bearing Dashboards leaf off every tenant-visible label
+    set:
+      tls:
+        issuer: cert-manager
+      dashboards:
+        enabled: true
+    documentSelector:
+      path: spec.secretName
+      value: os-test-dashboards-server
+    asserts:
+      - notExists:
+          path: spec.secretTemplate.labels["internal.cozystack.io/tenant-ca"]
+      - notExists:
+          path: spec.secretTemplate.labels["internal.cozystack.io/tenantresource"]
+
+  # Nothing else in the suite feeds an explicit `tls: null`, and it is a shape a
+  # hand-written values file produces: Helm deletes the key rather than coalescing it
+  # back to the `tls: {}` of values.yaml, so .Values.tls arrives nil. These two pin
+  # that it stays a supported input resolving by `external`, in both directions —
+  # a null that resolved to a constant either way would satisfy one of them by
+  # accident. They also discriminate the `| default dict` in _tls.tpl, which is what
+  # makes it load-bearing rather than defensive: `index` errors on nil, so dropping
+  # the default aborts the render for both.
+  - it: resolves a null tls block by external, to cert-manager
+    values:
+      - tls_null_values.yaml
+    set:
+      external: true
+      _namespace:
+        host: example.cozy.local
+    asserts:
+      - hasDocuments:
+          count: 4
+
+  - it: resolves a null tls block by external, to operator
+    values:
+      - tls_null_values.yaml
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  - it: "(a) renders no resources when external false and issuer unset"
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  - it: "(c) renders no resources when issuer is operator even with external true"
+    set:
+      external: true
+      _namespace:
+        host: example.cozy.local
+      tls:
+        issuer: operator
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  - it: "(b) renders 4 cert-manager resources when external true resolves the issuer"
+    set:
+      external: true
+      _namespace:
+        host: example.cozy.local
+    asserts:
+      - hasDocuments:
+          count: 4
+
+  - it: "(d) renders 4 cert-manager resources when the issuer is cert-manager and external false"
+    set:
+      tls:
+        issuer: cert-manager
+    asserts:
+      - hasDocuments:
+          count: 4
+
+  - it: "(e) renders 4 resources and external SANs when issuer is cert-manager and external true"
+    set:
+      tls:
+        issuer: cert-manager
+      external: true
+      _namespace:
+        host: example.cozy.local
+    asserts:
+      - hasDocuments:
+          count: 4
+      - contains:
+          path: spec.dnsNames
+          content: os-test.example.cozy.local
+        documentIndex: 3
+
+  - it: "(e) adds a fifth resource, the dashboards certificate, when dashboards enabled"
+    set:
+      tls:
+        issuer: cert-manager
+      external: true
+      _namespace:
+        host: example.cozy.local
+      dashboards:
+        enabled: true
+    asserts:
+      - hasDocuments:
+          count: 5
+      - equal:
+          path: metadata.name
+          value: os-test-dashboards-server
+        documentIndex: 4
+      - contains:
+          path: spec.dnsNames
+          content: os-test-dashboards.example.cozy.local
+        documentIndex: 4
+
+  # --- Chain structure ---
+
+  - it: first document is selfsigned Issuer
+    set:
+      tls:
+        issuer: cert-manager
+    documentIndex: 0
+    asserts:
+      - isKind:
+          of: Issuer
+      - equal:
+          path: spec.selfSigned
+          value: {}
+      - equal:
+          path: metadata.name
+          value: os-test-http-selfsigned
+
+  - it: second document is CA Certificate with isCA true and rotationPolicy Never
+    set:
+      tls:
+        issuer: cert-manager
+    documentIndex: 1
+    asserts:
+      - isKind:
+          of: Certificate
+      - equal:
+          path: spec.isCA
+          value: true
+      # Mis-targeting issuerRef still issues and still goes Ready while anchoring on
+      # something other than the intended issuer, so pin the reference completely.
+      - equal:
+          path: spec.issuerRef.kind
+          value: Issuer
+      - equal:
+          path: spec.issuerRef.group
+          value: cert-manager.io
+      - equal:
+          path: spec.secretName
+          value: os-test.http-ca
+      - equal:
+          path: spec.issuerRef.name
+          value: os-test-http-selfsigned
+      - equal:
+          path: spec.privateKey.rotationPolicy
+          value: Never
+      # The subject is a cross-component invariant, not a label: it must differ from
+      # the operator's own CA subject, CN=<release>, because the operator compares
+      # DN bytes to decide whether the admin certificate still needs re-signing. See
+      # the note on the field in certmanager.yaml.
+      - equal:
+          path: spec.commonName
+          value: os-test-http-ca
+      - equal:
+          path: spec.privateKey.algorithm
+          value: ECDSA
+      - equal:
+          path: spec.privateKey.size
+          value: 256
+
+  - it: third document is CA Issuer referencing the CA secret
+    set:
+      tls:
+        issuer: cert-manager
+    documentIndex: 2
+    asserts:
+      - isKind:
+          of: Issuer
+      - equal:
+          path: metadata.name
+          value: os-test-http-ca
+      - equal:
+          path: spec.ca.secretName
+          value: os-test.http-ca
+
+  - it: fourth document is leaf Certificate referencing the CA Issuer
+    set:
+      tls:
+        issuer: cert-manager
+    documentIndex: 3
+    asserts:
+      - isKind:
+          of: Certificate
+      - equal:
+          path: spec.secretName
+          value: os-test-http-server
+      # isCA is independent of spec.usages: cert-manager derives certSign from this
+      # field alone, so a leaf flipped to true still renders the same usages list and
+      # still passes every usages assertion — while becoming an intermediate CA whose
+      # key sits in the pod and chains to the anchor tenants are told to trust.
+      - equal:
+          path: spec.isCA
+          value: false
+      - equal:
+          path: spec.issuerRef.name
+          value: os-test-http-ca
+      - equal:
+          path: spec.issuerRef.kind
+          value: Issuer
+      - equal:
+          path: spec.issuerRef.group
+          value: cert-manager.io
+      - equal:
+          path: spec.privateKey.algorithm
+          value: ECDSA
+      - equal:
+          path: spec.privateKey.size
+          value: 256
+      - equal:
+          path: spec.privateKey.rotationPolicy
+          value: Always
+      # Dropping this falls back to cert-manager's PKCS1 default, which for an ECDSA
+      # key is SEC1 — a format the JVM PEM loader behind the security plugin cannot
+      # read, so OpenSearch fails to start its HTTPS listener. Nothing else in this
+      # file would notice.
+      - equal:
+          path: spec.privateKey.encoding
+          value: PKCS8
+
+  # The same positive pin for the dashboards leaf, which also establishes that index 4
+  # IS that certificate — the negative guards below would otherwise pass vacuously
+  # against whatever landed there if document order ever shifted.
+  # issuerRef is the load-bearing one: pointing it at the bootstrap self-signed Issuer
+  # instead of the CA still issues, still serves HTTPS and still goes Ready, while the
+  # anchor the platform publishes silently stops verifying the dashboards endpoint.
+  - it: fifth document is the dashboards Certificate referencing the same CA Issuer
+    set:
+      tls:
+        issuer: cert-manager
+      dashboards:
+        enabled: true
+    documentIndex: 4
+    asserts:
+      - isKind:
+          of: Certificate
+      - equal:
+          path: metadata.name
+          value: os-test-dashboards-server
+      - equal:
+          path: spec.secretName
+          value: os-test-dashboards-server
+      - equal:
+          path: spec.issuerRef.name
+          value: os-test-http-ca
+      - equal:
+          path: spec.issuerRef.kind
+          value: Issuer
+      - equal:
+          path: spec.issuerRef.group
+          value: cert-manager.io
+      # Same reasoning as the API leaf: usages cannot catch this.
+      - equal:
+          path: spec.isCA
+          value: false
+      - equal:
+          path: spec.privateKey.algorithm
+          value: ECDSA
+      - equal:
+          path: spec.privateKey.size
+          value: 256
+      - equal:
+          path: spec.privateKey.rotationPolicy
+          value: Always
+      - equal:
+          path: spec.privateKey.encoding
+          value: PKCS8
+      # Never the API leaf's Secret: two Certificates writing one Secret would race,
+      # and the CR points each service at its own name.
+      - notEqual:
+          path: spec.secretName
+          value: os-test-http-server
+
+  - it: gives the dashboards certificate the same non-expiring lifetime
+    set:
+      tls:
+        issuer: cert-manager
+      dashboards:
+        enabled: true
+    documentIndex: 4
+    asserts:
+      - equal:
+          path: spec.duration
+          value: 87600h
+      - notExists:
+          path: spec.renewBefore
+
+  # --- SAN coverage for HTTP services ---
+
+  # SAN PARITY WITH THE OPERATOR. The cert-manager issuer replaces the certificate
+  # the operator was issuing, so every name that certificate covered has to be covered
+  # here too — otherwise an existing client silently stops verifying. The operator
+  # issues for <name>, the service name, <name>-discovery and the <name>.<ns>[.svc
+  # [.domain]] ladder, and its Dashboards certificate for the -dashboards ladder.
+  - it: leaf cert covers every DNS form the operator certificate covered
+    set:
+      tls:
+        issuer: cert-manager
+    documentIndex: 3
+    asserts:
+      - contains:
+          path: spec.dnsNames
+          content: os-test
+      - contains:
+          path: spec.dnsNames
+          content: os-test.tenant-test
+      - contains:
+          path: spec.dnsNames
+          content: os-test.tenant-test.svc
+      - contains:
+          path: spec.dnsNames
+          content: os-test.tenant-test.svc.cozy.local
+      - contains:
+          path: spec.dnsNames
+          content: os-test-discovery
+      # ...and none of the Dashboards names, which belong to its own certificate.
+      - notContains:
+          path: spec.dnsNames
+          content: os-test-dashboards
+      - notContains:
+          path: spec.dnsNames
+          content: os-test-dashboards.tenant-test.svc.cozy.local
+
+  - it: "(b) leaf cert includes external HTTP DNS SAN when external true"
+    set:
+      external: true
+      _namespace:
+        host: example.cozy.local
+    documentIndex: 3
+    asserts:
+      - contains:
+          path: spec.dnsNames
+          content: os-test.example.cozy.local
+
+  - it: "(d) leaf cert does NOT include external HTTP DNS SAN when external false"
+    set:
+      tls:
+        issuer: cert-manager
+    documentSelector:
+      path: spec.secretName
+      value: os-test-http-server
+    asserts:
+      - notContains:
+          path: spec.dnsNames
+          content: os-test.example.cozy.local
+
+  # Isolates the `external` operand of that guard. The case above leaves
+  # _namespace.host unset, and the guard is an `and`, so the empty host suppresses the
+  # SAN on its own and the assertion holds whatever `external` does. A host present
+  # with external cleared is the only shape where that operand alone decides.
+  - it: leaf cert omits the external HTTP SAN when a host exists but external is false
+    set:
+      tls:
+        issuer: cert-manager
+      external: false
+      _namespace:
+        host: example.cozy.local
+    documentSelector:
+      path: spec.secretName
+      value: os-test-http-server
+    asserts:
+      - notContains:
+          path: spec.dnsNames
+          content: os-test.example.cozy.local
+
+  # --- SAN coverage for Dashboards services ---
+
+  # THE SAME THREE GUARDS THE API LEAF HAS. The Dashboards certificate inherits every
+  # hazard its sibling documents — a shared key across services, a tenant-visible label
+  # on a Secret that holds a server key, and colliding with a name the operator
+  # generates into — so it has to inherit the assertions too.
+  - it: keeps the dashboards cert from carrying any API name
+    set:
+      tls:
+        issuer: cert-manager
+      external: true
+      _namespace:
+        host: example.cozy.local
+      dashboards:
+        enabled: true
+    documentSelector:
+      path: spec.secretName
+      value: os-test-dashboards-server
+    asserts:
+      - notContains:
+          path: spec.dnsNames
+          content: os-test
+      - notContains:
+          path: spec.dnsNames
+          content: os-test.tenant-test
+      - notContains:
+          path: spec.dnsNames
+          content: os-test.tenant-test.svc
+      - notContains:
+          path: spec.dnsNames
+          content: os-test.tenant-test.svc.cozy.local
+      - notContains:
+          path: spec.dnsNames
+          content: os-test-discovery
+      - notContains:
+          path: spec.dnsNames
+          content: os-test.example.cozy.local
+
+  # Stronger than the two label guards above, which name the two labels that reach a
+  # tenant: this says the chart writes nothing onto that Secret at all.
+  - it: stamps nothing at all onto the dashboards leaf Secret
+    set:
+      tls:
+        issuer: cert-manager
+      dashboards:
+        enabled: true
+    documentSelector:
+      path: spec.secretName
+      value: os-test-dashboards-server
+    asserts:
+      - notExists:
+          path: spec.secretTemplate
+
+  # Anchored and positively pinned for the reason given on the API leaf above.
+  - it: keeps the dashboards secret out of the operator's reserved names
+    set:
+      tls:
+        issuer: cert-manager
+      dashboards:
+        enabled: true
+    documentSelector:
+      path: metadata.name
+      value: os-test-dashboards-server
+    asserts:
+      - equal:
+          path: spec.secretName
+          value: os-test-dashboards-server
+      - notEqual:
+          path: spec.secretName
+          value: os-test-dashboards-cert
+      - notEqual:
+          path: spec.secretName
+          value: os-test-http-cert
+      - notEqual:
+          path: spec.secretName
+          value: os-test-transport-cert
+      - notEqual:
+          path: spec.secretName
+          value: os-test-admin-cert
+      - notEqual:
+          path: spec.secretName
+          value: os-test-ca
+
+  - it: dashboards cert carries the same ECDSA-correct usages as the API leaf
+    set:
+      tls:
+        issuer: cert-manager
+      dashboards:
+        enabled: true
+    documentIndex: 4
+    asserts:
+      - contains:
+          path: spec.usages
+          content: server auth
+      - contains:
+          path: spec.usages
+          content: signing
+      - notContains:
+          path: spec.usages
+          content: key encipherment
+      - lengthEqual:
+          path: spec.usages
+          count: 2
+
+  - it: dashboards cert covers every DNS form the operator dashboards cert covered
+    set:
+      tls:
+        issuer: cert-manager
+      dashboards:
+        enabled: true
+    documentIndex: 4
+    asserts:
+      - contains:
+          path: spec.dnsNames
+          content: os-test-dashboards.tenant-test
+      - contains:
+          path: spec.dnsNames
+          content: os-test-dashboards
+      - contains:
+          path: spec.dnsNames
+          content: os-test-dashboards.tenant-test.svc
+      - contains:
+          path: spec.dnsNames
+          content: os-test-dashboards.tenant-test.svc.cozy.local
+
+  - it: "(b) dashboards cert includes external Dashboards DNS SAN when external true"
+    set:
+      external: true
+      _namespace:
+        host: example.cozy.local
+      dashboards:
+        enabled: true
+    documentIndex: 4
+    asserts:
+      - contains:
+          path: spec.dnsNames
+          content: os-test-dashboards.example.cozy.local
+
+  # The same isolation for the Dashboards leaf, which carries its own copy of the guard.
+  - it: dashboards cert omits the external SAN when a host exists but external is false
+    set:
+      tls:
+        issuer: cert-manager
+      external: false
+      _namespace:
+        host: example.cozy.local
+      dashboards:
+        enabled: true
+    documentSelector:
+      path: spec.secretName
+      value: os-test-dashboards-server
+    asserts:
+      - notContains:
+          path: spec.dnsNames
+          content: os-test-dashboards.example.cozy.local
+
+  # No key encipherment on either certificate: RFC 5480 section 3 forbids it for
+  # ECDSA keys, which do no key transport, and both keys here are ECDSA P-256.
+  - it: leaf cert includes usages server auth and signing, and no key encipherment
+    set:
+      tls:
+        issuer: cert-manager
+    documentIndex: 3
+    asserts:
+      - contains:
+          path: spec.usages
+          content: server auth
+      - contains:
+          path: spec.usages
+          content: signing
+      - notContains:
+          path: spec.usages
+          content: key encipherment
+      - lengthEqual:
+          path: spec.usages
+          count: 2
+      - notContains:
+          path: spec.usages
+          content: cert sign
+
+  - it: CA cert carries no key encipherment either
+    set:
+      tls:
+        issuer: cert-manager
+    documentIndex: 1
+    asserts:
+      - contains:
+          path: spec.usages
+          content: signing
+      - contains:
+          path: spec.usages
+          content: cert sign
+      - notContains:
+          path: spec.usages
+          content: key encipherment
+      - lengthEqual:
+          path: spec.usages
+          count: 2
+
+  # A platform with no root host leaves the tenant host empty all the way down, which
+  # is a supported state. The certificate keeps its in-cluster names and simply omits
+  # the external ones rather than failing the release.
+  - it: omits the external SANs when the tenant host is empty
+    set:
+      tls:
+        issuer: cert-manager
+      external: true
+      _namespace: {}
+      dashboards:
+        enabled: true
+    asserts:
+      - hasDocuments:
+          count: 5
+      - contains:
+          path: spec.dnsNames
+          content: os-test.tenant-test.svc.cozy.local
+        documentIndex: 3
+      - notContains:
+          path: spec.dnsNames
+          content: os-test.
+        documentIndex: 3
+      # The dashboards leaf carries the same guard and must be held to it — an empty
+      # host there would emit a trailing-dot SAN on the more exposed service.
+      - contains:
+          path: spec.dnsNames
+          content: os-test-dashboards.tenant-test.svc.cozy.local
+        documentIndex: 4
+      - notContains:
+          path: spec.dnsNames
+          content: os-test-dashboards.
+        documentIndex: 4
+
+---
+---
+###############################################################################
+# opensearch.yaml — TLS state reflected in OpenSearchCluster spec
+###############################################################################
+suite: opensearch CR TLS wiring
+
+templates:
+  - templates/opensearch.yaml
+
+release:
+  name: os-test
+  namespace: tenant-test
+
+set:
+  _cluster:
+    scheduling: {}
+    cluster-domain: cozy.local
+
+tests:
+  # THE UPGRADE PATH, pinned explicitly. An existing external release on a supported
+  # version has tls unset and runs operator-managed TLS today; once this chart ships
+  # the tri-state moves it onto the cert-manager issuer. That is a deliberate default, but
+  # it rolls the cluster and re-anchors it on a new CA, so it must not change by
+  # accident — hence an assertion of its own rather than incidental coverage.
+  - it: moves an existing external release onto cert-manager on a supported version
+    set:
+      version: v2
+      external: true
+      _namespace:
+        host: example.cozy.local
+    asserts:
+      - equal:
+          path: spec.security.tls.http.secret.name
+          value: os-test-http-server
+        documentIndex: 0
+      - equal:
+          path: spec.security.tls.http.caSecret.name
+          value: os-test.http-ca
+        documentIndex: 0
+      - notExists:
+          path: spec.security.tls.http.generate
+        documentIndex: 0
+
+  # A v1 + external release never chose cert-manager: the tri-state
+  # turned it on. Below 2.0.0 that combination degrades to operator-managed HTTP
+  # TLS rather than failing, so such a release keeps working across an upgrade.
+  - it: leaves HTTP TLS operator-generated when the resolved issuer degrades below 2.0.0
+    set:
+      version: v1
+      external: true
+      _namespace:
+        host: example.cozy.local
+    asserts:
+      - equal:
+          path: spec.security.tls.http.generate
+          value: true
+        documentIndex: 0
+      - notExists:
+          path: spec.security.tls.http.caSecret
+        documentIndex: 0
+      - notExists:
+          path: spec.security.tls.http.secret
+        documentIndex: 0
+
+  # The dashboards-only path: no external access, the operator issuer, so of the three
+  # templates that invoke the name guard this is the only one rendering anything at all.
+  # 52 is the longest name this path admits now that -dashboards is bound, and the CR
+  # must still render at it: the guard exists to refuse the length, not to withhold a
+  # release that fits inside it.
+  - it: renders the cluster for the longest admissible dashboards-only name
+    release:
+      name: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+      namespace: tenant-test
+    set:
+      dashboards:
+        enabled: true
+      external: false
+      tls:
+        issuer: operator
+    asserts:
+      - isKind:
+          of: OpenSearchCluster
+        documentIndex: 0
+      - equal:
+          path: spec.dashboards.enable
+          value: true
+        documentIndex: 0
+
+  # The part whose loss actually hurts: an empty tenant host must not stop the cluster
+  # itself from rendering. A hard failure here takes the OpenSearchCluster CR, the
+  # credentials Secret and the RBAC with it, so a running release goes not-Ready.
+  - it: still renders the cluster when external is on and the tenant host is empty
+    set:
+      external: true
+      _namespace: {}
+    asserts:
+      - isKind:
+          of: OpenSearchCluster
+        documentIndex: 0
+      - equal:
+          path: metadata.name
+          value: os-test
+        documentIndex: 0
+
+  # --- Transport TLS: always operator-managed, never touched ---
+
+  - it: transport TLS always uses operator generate regardless of tls.issuer
+    asserts:
+      - equal:
+          path: spec.security.tls.transport.generate
+          value: true
+        documentIndex: 0
+      - equal:
+          path: spec.security.tls.transport.perNode
+          value: true
+        documentIndex: 0
+
+  - it: transport TLS stays operator generate even when the issuer is cert-manager
+    set:
+      tls:
+        issuer: cert-manager
+    asserts:
+      - equal:
+          path: spec.security.tls.transport.generate
+          value: true
+        documentIndex: 0
+      - equal:
+          path: spec.security.tls.transport.perNode
+          value: true
+        documentIndex: 0
+
+  # --- HTTP TLS: case (a) — operator generate when the issuer resolves to operator ---
+
+  - it: "(a) HTTP uses operator generate when external false and issuer unset"
+    asserts:
+      - equal:
+          path: spec.security.tls.http.generate
+          value: true
+        documentIndex: 0
+      - notExists:
+          path: spec.security.tls.http.secret
+        documentIndex: 0
+      - notExists:
+          path: spec.security.tls.http.caSecret
+        documentIndex: 0
+
+  # --- HTTP TLS: case (b) — cert-manager secret when external true and issuer unset ---
+
+  - it: "(b) HTTP uses cert-manager secret when external true and issuer unset"
+    set:
+      external: true
+      _namespace:
+        host: example.cozy.local
+    asserts:
+      - equal:
+          path: spec.security.tls.http.secret.name
+          value: os-test-http-server
+        documentIndex: 0
+      - equal:
+          path: spec.security.tls.http.caSecret.name
+          value: os-test.http-ca
+        documentIndex: 0
+      - notExists:
+          path: spec.security.tls.http.generate
+        documentIndex: 0
+
+  # --- HTTP TLS: case (c) — operator generate when the issuer is operator ---
+
+  - it: "(c) HTTP uses operator generate when the issuer is operator"
+    set:
+      external: true
+      _namespace:
+        host: example.cozy.local
+      tls:
+        issuer: operator
+    asserts:
+      - equal:
+          path: spec.security.tls.http.generate
+          value: true
+        documentIndex: 0
+      - notExists:
+          path: spec.security.tls.http.secret
+        documentIndex: 0
+      - notExists:
+          path: spec.security.tls.http.caSecret
+        documentIndex: 0
+
+  # --- HTTP TLS: case (d) — cert-manager secret when the issuer is cert-manager ---
+
+  - it: "(d) HTTP uses cert-manager secret when the issuer is cert-manager"
+    set:
+      tls:
+        issuer: cert-manager
+    asserts:
+      - equal:
+          path: spec.security.tls.http.secret.name
+          value: os-test-http-server
+        documentIndex: 0
+      - equal:
+          path: spec.security.tls.http.caSecret.name
+          value: os-test.http-ca
+        documentIndex: 0
+      - notExists:
+          path: spec.security.tls.http.generate
+        documentIndex: 0
+
+  # --- Dashboards TLS: operator generate by default, cert-manager secret when that issuer is resolved ---
+
+  - it: dashboards uses operator generate when enabled and the issuer resolves to operator
+    set:
+      dashboards:
+        enabled: true
+        replicas: 1
+        resourcesPreset: "c1.small"
+        resources: {}
+    asserts:
+      - equal:
+          path: spec.dashboards.tls.enable
+          value: true
+        documentIndex: 0
+      - equal:
+          path: spec.dashboards.tls.generate
+          value: true
+        documentIndex: 0
+      - notExists:
+          path: spec.dashboards.tls.secret
+        documentIndex: 0
+
+  - it: dashboards uses cert-manager secret when enabled and external true resolves the issuer
+    set:
+      external: true
+      _namespace:
+        host: example.cozy.local
+      dashboards:
+        enabled: true
+        replicas: 1
+        resourcesPreset: "c1.small"
+        resources: {}
+    asserts:
+      - equal:
+          path: spec.dashboards.tls.enable
+          value: true
+        documentIndex: 0
+      - equal:
+          path: spec.dashboards.tls.secret.name
+          value: os-test-dashboards-server
+        documentIndex: 0
+      # Never the API certificate: a shared key would let a compromised Dashboards
+      # impersonate the OpenSearch API endpoint.
+      - notEqual:
+          path: spec.dashboards.tls.secret.name
+          value: os-test-http-server
+        documentIndex: 0
+      - notExists:
+          path: spec.dashboards.tls.generate
+        documentIndex: 0
+
+  - it: dashboards uses cert-manager secret when the issuer is cert-manager
+    set:
+      tls:
+        issuer: cert-manager
+      dashboards:
+        enabled: true
+        replicas: 1
+        resourcesPreset: "c1.small"
+        resources: {}
+    asserts:
+      - equal:
+          path: spec.dashboards.tls.enable
+          value: true
+        documentIndex: 0
+      - equal:
+          path: spec.dashboards.tls.secret.name
+          value: os-test-dashboards-server
+        documentIndex: 0
+      # Never the API certificate: a shared key would let a compromised Dashboards
+      # impersonate the OpenSearch API endpoint.
+      - notEqual:
+          path: spec.dashboards.tls.secret.name
+          value: os-test-http-server
+        documentIndex: 0
+      - notExists:
+          path: spec.dashboards.tls.generate
+        documentIndex: 0
+
+---
+---
+###############################################################################
+# external-svc.yaml — required guard for _namespace.host
+###############################################################################
+suite: external service tenant-host guard
+
+templates:
+  - templates/external-svc.yaml
+
+release:
+  name: os-test
+  namespace: tenant-test
+
+set:
+  _cluster:
+    scheduling: {}
+    cluster-domain: cozy.local
+
+tests:
+  # An empty tenant host must not take the release down. The LoadBalancers still get
+  # addresses and still serve; only the external-dns hostname is withheld, because
+  # there is no name to publish. Previously this failed the whole render, which took
+  # the OpenSearchCluster CR with it on a configuration that works on main.
+  # That bound has nothing to do with TLS — the Service renders on external alone —
+  # so the guard has to fire under the operator issuer too.
+  - it: applies the Service bound even under the operator issuer
+    release:
+      name: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+      namespace: tenant-test
+    set:
+      external: true
+      _namespace:
+        host: example.cozy.local
+      dashboards:
+        enabled: true
+      tls:
+        issuer: operator
+    asserts:
+      - failedTemplate:
+          errorMessage: 'Release name "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" is 44 chars; opensearch requires <=43 in this configuration so that "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-dashboards-external" stays within the 63-char DNS label limit. Set dashboards.enabled to false to drop this bound.'
+
+  - it: still renders both Services when the tenant host is empty
+    set:
+      external: true
+      _namespace: {}
+      dashboards:
+        enabled: true
+    asserts:
+      - hasDocuments:
+          count: 2
+      - equal:
+          path: metadata.name
+          value: os-test-external
+        documentIndex: 0
+      - notExists:
+          path: metadata.annotations
+        documentIndex: 0
+      - equal:
+          path: metadata.name
+          value: os-test-dashboards-external
+        documentIndex: 1
+      - notExists:
+          path: metadata.annotations
+        documentIndex: 1
+
+  # _namespace absent entirely, not merely missing its host key — the deref must not
+  # raise a nil pointer either.
+  - it: still renders both Services when _namespace is absent entirely
+    set:
+      external: true
+      dashboards:
+        enabled: true
+    asserts:
+      - hasDocuments:
+          count: 2
+      - notExists:
+          path: metadata.annotations
+        documentIndex: 0
+
+  # The external-dns hostname is built from the tenant host, not the in-cluster
+  # domain: cozy.local does not resolve outside the cluster, and the name published
+  # here has to be one the leaf certificate carries a SAN for.
+  # The operator labels Dashboards pods with opensearch.cluster.dashboards only.
+  # A selector naming opster.io/opensearch-cluster or app.kubernetes.io/* matches
+  # nothing, so the LoadBalancer comes up with no endpoints and no error, while the
+  # chart issues a certificate SAN and documents a hostname for that very Service.
+  - it: selects dashboards pods by the label the operator actually sets
+    set:
+      external: true
+      _namespace:
+        host: example.cozy.local
+      dashboards:
+        enabled: true
+    asserts:
+      - equal:
+          path: spec.selector["opensearch.cluster.dashboards"]
+          value: os-test
+        documentIndex: 1
+      - notExists:
+          path: spec.selector["app.kubernetes.io/component"]
+        documentIndex: 1
+      - notExists:
+          path: spec.selector["opster.io/opensearch-cluster"]
+        documentIndex: 1
+      # The API Service keeps the label the operator does set on data pods.
+      - equal:
+          path: spec.selector["opster.io/opensearch-cluster"]
+          value: os-test
+        documentIndex: 0
+
+  - it: publishes external-dns hostnames under the tenant host
+    set:
+      external: true
+      _namespace:
+        host: example.cozy.local
+      dashboards:
+        enabled: true
+    asserts:
+      - equal:
+          path: metadata.annotations["external-dns.alpha.kubernetes.io/hostname"]
+          value: os-test.example.cozy.local
+        documentIndex: 0
+      - equal:
+          path: metadata.annotations["external-dns.alpha.kubernetes.io/hostname"]
+          value: os-test-dashboards.example.cozy.local
+        documentIndex: 1
+
+---
+---
+###############################################################################
+# The cluster domain read must survive _cluster being absent
+###############################################################################
+#
+# Every other suite in this file injects _cluster, which is what the platform does
+# in production — so none of them can see what happens without it. `index` on an
+# absent map is not a miss returning nil, it is a hard render error ("index of
+# untyped nil"), and it takes the whole chart down rather than the one value it
+# was reading. The default that follows the read never gets a chance to apply.
+#
+# No suite-level `set` here on purpose: adding _cluster back is exactly the thing
+# this suite must not do.
+suite: cluster domain defaulting without _cluster
+
+templates:
+  - templates/certmanager.yaml
+
+release:
+  name: os-test
+  namespace: tenant-test
+
+tests:
+  - it: falls back to the default cluster domain when _cluster is absent
+    set:
+      tls:
+        issuer: cert-manager
+    asserts:
+      - equal:
+          path: spec.dnsNames[3]
+          value: os-test.tenant-test.svc.cozy.local
+        documentIndex: 3
+
+---
+---
+###############################################################################
+# security.yaml — the same read, on a path that renders no certificate
+###############################################################################
+#
+# Its own suite rather than a second test in the one above, because helm-unittest
+# renders every template a suite declares for every test in it: listing both would
+# make the certificate test report a security.yaml render error, a reason that has
+# nothing to do with what it asserts.
+suite: cluster domain defaulting without _cluster in the credentials Secret
+
+templates:
+  - templates/security.yaml
+
+release:
+  name: os-test
+  namespace: tenant-test
+
+tests:
+  # This template renders under either issuer, so an unguarded read here takes
+  # down a release that mints no certificate at all. The host it composes is the
+  # one the tenant connects to.
+  - it: falls back to the default cluster domain when _cluster is absent
+    asserts:
+      - equal:
+          path: stringData.host
+          value: os-test.tenant-test.svc.cozy.local
+        documentIndex: 2
diff --git a/packages/apps/opensearch/tests/tls_upgrade_test.yaml b/packages/apps/opensearch/tests/tls_upgrade_test.yaml
new file mode 100644
index 0000000000..20fc235ae4
--- /dev/null
+++ b/packages/apps/opensearch/tests/tls_upgrade_test.yaml
@@ -0,0 +1,106 @@
+suite: opensearch upgrade off operator-managed HTTP TLS
+
+# An external release created before this chart stored no tls key at all -- the field
+# did not exist -- so on upgrade the tri-state resolves it from external and the
+# release moves from the operator issuer to cert-manager on its first
+# reconcile. The three halves of that transition have to move together on one values
+# path: the CR must name the cert-manager Secrets in the same render that mints them,
+# and the sentinel that publishes the anchor to the tenant must appear with them. Each
+# half is asserted on its own elsewhere; what is pinned here is that one set of values
+# produces all of them, and that the operator issuer produces none.
+#
+# What a render cannot observe is the live transition: whether server-side apply
+# converges when http.generate is removed from a running CR, whether the operator
+# re-mints the admin certificate once the CA subject changes, and whether the nodePool
+# StatefulSet finishes rolling when the mount plan moves from one whole-secret volume
+# to three subPath mounts. Those need a cluster, and hack/e2e-chainsaw/opensearch runs
+# them: it installs the app on the operator listener, removes the key, and asserts the
+# chain, the CR, the roll and the certificate the endpoint presents.
+
+release:
+  name: os-test
+  namespace: tenant-test
+
+templates:
+  - templates/opensearch.yaml
+  - templates/certmanager.yaml
+  - templates/tenant-projection.yaml
+
+set:
+  _cluster:
+    scheduling: {}
+    cluster-domain: cozy.local
+
+tests:
+  - it: moves an existing external release onto the cert-manager chain
+    set:
+      external: true
+      _namespace:
+        host: example.cozy.local
+    asserts:
+      # The CR stops asking the operator to generate and names both Secrets.
+      - notExists:
+          path: spec.security.tls.http.generate
+        template: templates/opensearch.yaml
+        documentIndex: 0
+      - equal:
+          path: spec.security.tls.http.secret.name
+          value: os-test-http-server
+        template: templates/opensearch.yaml
+        documentIndex: 0
+      - equal:
+          path: spec.security.tls.http.caSecret.name
+          value: os-test.http-ca
+        template: templates/opensearch.yaml
+        documentIndex: 0
+      # The same values mint exactly those two Secrets.
+      - hasDocuments:
+          count: 4
+        template: templates/certmanager.yaml
+      - equal:
+          path: spec.secretName
+          value: os-test.http-ca
+        template: templates/certmanager.yaml
+        documentIndex: 1
+      - equal:
+          path: spec.secretName
+          value: os-test-http-server
+        template: templates/certmanager.yaml
+        documentIndex: 3
+      # And the tenant gains the anchor for the CA the listener moved to.
+      - hasDocuments:
+          count: 1
+        template: templates/tenant-projection.yaml
+      - equal:
+          path: spec.projections[0].sourceSecretName
+          value: os-test.http-ca
+        template: templates/tenant-projection.yaml
+        documentIndex: 0
+
+  - it: keeps an external release on the operator listener when that issuer is chosen
+    set:
+      external: true
+      _namespace:
+        host: example.cozy.local
+      tls:
+        issuer: operator
+    asserts:
+      - equal:
+          path: spec.security.tls.http.generate
+          value: true
+        template: templates/opensearch.yaml
+        documentIndex: 0
+      - notExists:
+          path: spec.security.tls.http.secret
+        template: templates/opensearch.yaml
+        documentIndex: 0
+      - notExists:
+          path: spec.security.tls.http.caSecret
+        template: templates/opensearch.yaml
+        documentIndex: 0
+      - hasDocuments:
+          count: 0
+        template: templates/certmanager.yaml
+      - hasDocuments:
+          count: 0
+        template: templates/tenant-projection.yaml
diff --git a/packages/apps/opensearch/values.schema.json b/packages/apps/opensearch/values.schema.json
index e76b6c34c4..710ddd5efc 100644
--- a/packages/apps/opensearch/values.schema.json
+++ b/packages/apps/opensearch/values.schema.json
@@ -117,7 +117,10 @@
           "rule": "self == oldSelf",
           "message": "storageClass is immutable"
         }
-      ]
+      ],
+      "x-cozystack-options": {
+        "source": "storageclass"
+      }
     },
     "external": {
       "description": "Enable external access from outside the cluster.",
@@ -143,6 +146,21 @@
         "v1"
       ]
     },
+    "tls": {
+      "description": "HTTP-layer TLS configuration. Selects who issues the HTTP server certificate; TLS itself is always served.",
+      "type": "object",
+      "default": {},
+      "properties": {
+        "issuer": {
+          "description": "Who issues the HTTP server certificate: `operator` uses the CA the opster operator manages itself, `cert-manager` gives the release its own CA, covers the external hostname and publishes a trust anchor the tenant can verify against. Unset follows external: `cert-manager` when it is true, `operator` when it is false. Named for the issuer because TLS is served under both, unlike the similarly-spelled `tls.enabled` in some other charts, which does switch TLS on and off.",
+          "type": "string",
+          "enum": [
+            "operator",
+            "cert-manager"
+          ]
+        }
+      }
+    },
     "images": {
       "description": "Container images used by the operator.",
       "type": "object",
@@ -223,7 +241,7 @@
       ],
       "properties": {
         "enabled": {
-          "description": "Enable OpenSearch Dashboards deployment.",
+          "description": "Enable OpenSearch Dashboards deployment. The application name is then limited to 41 characters, and to 32 when external access is also on, because the Dashboards Service the operator creates would otherwise exceed the 63-character DNS label limit, and the operator stops upgrading and restarting the release for as long as that Service is refused.",
           "type": "boolean",
           "default": false
         },
diff --git a/packages/apps/opensearch/values.yaml b/packages/apps/opensearch/values.yaml
index a0f3e72e12..76b643c0f1 100644
--- a/packages/apps/opensearch/values.yaml
+++ b/packages/apps/opensearch/values.yaml
@@ -69,9 +69,32 @@ size: 10Gi
 
 ## @param {string} storageClass - StorageClass used to store the data.
 ## @immutable
+## @x-cozystack-options {source: storageclass}
 storageClass: ""
 
 ## @param {bool} external - Enable external access from outside the cluster.
+##   The LoadBalancer Services are published to external-dns as
+##   <release>.<tenant-host> and <release>-dashboards.<tenant-host>. Releases created
+##   before this naming was introduced were published under the in-cluster domain
+##   instead, which does not resolve outside the cluster. Re-applying publishes the
+##   new name but does NOT withdraw the old record: external-dns is configured
+##   upsert-only here, so it issues no delete. The stale entry keeps pointing at the
+##   LoadBalancer
+##   until it is removed from the zone by hand.
+##   ONLY the cert-manager issuer covers those names. Under tls.issuer cert-manager
+##   (or the same resolved from this field on OpenSearch 2.0.0 and later) each service
+##   gets its own certificate carrying its own external name — they are issued
+##   separately, not as one covering both. Under tls.issuer operator, or the fallback
+##   below 2.0.0, the operator issues a certificate for in-cluster names only, so an
+##   external client reaching the published name cannot verify it and must skip
+##   verification or supply its own certificate out of band.
+##   Changing this on a release already on the cert-manager issuer reissues the
+##   certificate with a different set of names, and the pods do not pick that up on
+##   their own — see the manual step described under tls.
+##   On a platform with no root host the tenant host is empty. External access still
+##   works by LoadBalancer address: no external-dns record is published and the
+##   certificate carries in-cluster names only, since there is no external name to
+##   put in either.
 external: false
 
 ## @enum {string} TopologySpreadPolicy - Pod distribution policy across nodes/zones.
@@ -90,6 +113,72 @@ topologySpreadPolicy: "soft"
 ## @param {Version} version - OpenSearch major version to deploy.
 version: v2
 
+##
+## @section TLS configuration
+##
+
+## @enum {string} TLSIssuer
+## @value operator
+## @value cert-manager
+
+## @typedef {struct} TLS - HTTP-layer TLS configuration for OpenSearch and Dashboards.
+## @field {TLSIssuer} [issuer] - Who issues the HTTP server certificate: `operator` uses the CA the opster operator manages itself, `cert-manager` gives the release its own CA, covers the external hostname and publishes a trust anchor the tenant can verify against. Unset follows external: `cert-manager` when it is true, `operator` when it is false. Named for the issuer because TLS is served under both, unlike the similarly-spelled `tls.enabled` in some other charts, which does switch TLS on and off.
+##   NOTE: Transport mTLS between nodes is always active and is managed by the opster
+##   operator (tls.transport.generate: true). Selecting issuer: operator does NOT
+##   disable transport mTLS, which the OpenSearch security plugin requires
+##   unconditionally, and it does not turn HTTP TLS off either. The listener serves
+##   TLS under both issuers; selecting operator only moves the HTTP certificate back
+##   to the one the operator generates for itself.
+##   Under issuer: cert-manager the chart's HTTP CA
+##   (<release>.http-ca, with a dot) is passed to the operator via
+##   spec.security.tls.http.caSecret, so
+##   the operator signs the admin certificate with it and anchors the HTTP listener trust on
+##   it. That puts one CA under both the server certificate the securityadmin job
+##   validates and the admin certificate it presents, so the security configuration
+##   (users, roles, audit policies) from the <release>-security-config Secret applies.
+##   The job reaches the cluster on the operator's DNS base, which the platform sets
+##   from networking.clusterDomain; a package rendered without the platform values
+##   falls back to cluster.local. Transport mTLS stays operator-managed and
+##   independent.
+##   REQUIRES OpenSearch 2.0.0 or later (version v2 or v3). Below that the operator
+##   signs the admin certificate with the transport CA rather than this one, so
+##   securityadmin cannot authenticate. Asking for issuer: cert-manager on such a
+##   version fails the release; leaving it unset resolves to operator
+##   instead, so an external release on an older version keeps working.
+##   The cert-manager certificate is issued by a per-release private CA, so clients must
+##   trust it explicitly. The platform publishes that trust anchor as the key-free Secret
+##   <release>.tenant-ca, holding ca.crt alone; the private key never leaves the
+##   namespace. Neither service picks up a reissued certificate on its own, so ANY
+##   change to one needs a manual step, not just a deliberate rotation: changing
+##   external, the tenant host or the cluster domain makes cert-manager reissue with
+##   the new names while the pods keep serving the old material, with no error
+##   anywhere. Those three reissue BOTH certificates, so complete it on both sides —
+##   delete <release>-http-server and restart the OpenSearch pods, and, when
+##   Dashboards is enabled, delete <release>-dashboards-server and restart the
+##   Dashboards deployment separately. Doing only the first leaves Dashboards serving
+##   a certificate that no longer matches its own name. Do not delete <release>.http-ca
+##   to do this: that mints a new CA, and until everything restarts the old one is
+##   still what is trusted.
+##   UPGRADE NOTE: an existing external release with this field unset is on the
+##   operator issuer today and moves to cert-manager the first time it is
+##   reconciled after this becomes available. That rolls the cluster and re-anchors it
+##   on a new CA, so anything pinned to the operator's CA must be repointed at
+##   <release>.tenant-ca. Set issuer: operator beforehand to keep the TLS side as it
+##   is; the external-dns name documented under external moves either way.
+##   Moving back to the operator issuer on a release that had cert-manager needs a
+##   manual cleanup, for a narrower reason than the tenant's trust: the projection
+##   carries an owner reference to the sentinel this chart removes with the issuer, so
+##   it is collected with it and nobody is left trusting an anchor for an endpoint that
+##   has gone back to an operator-issued certificate. What does survive is
+##   cert-manager's own Secrets, because the platform leaves enableCertificateOwnerRef
+##   false and removing a Certificate then does not remove its Secret. Those hold the
+##   CA private key and a server key each. Delete <release>.http-ca,
+##   <release>-http-server and, if Dashboards was enabled,
+##   <release>-dashboards-server to complete it.
+
+## @param {TLS} tls - HTTP-layer TLS configuration. Selects who issues the HTTP server certificate; TLS itself is always served.
+tls: {}
+
 ##
 ## @section Image configuration
 ##
@@ -139,7 +228,7 @@ users: {}
 ##
 
 ## @typedef {struct} Dashboards - OpenSearch Dashboards deployment configuration.
-## @field {bool} enabled - Enable OpenSearch Dashboards deployment.
+## @field {bool} enabled - Enable OpenSearch Dashboards deployment. The application name is then limited to 41 characters, and to 32 when external access is also on, because the Dashboards Service the operator creates would otherwise exceed the 63-character DNS label limit, and the operator stops upgrading and restarting the release for as long as that Service is refused.
 ## @field {int} replicas - Number of Dashboards replicas.
 ## @field {Resources} [resources] - Explicit CPU and memory configuration for Dashboards.
 ## @field {ResourcesPreset} resourcesPreset - Default sizing preset for Dashboards.
diff --git a/packages/apps/postgres/README.md b/packages/apps/postgres/README.md
index 8359f3eebc..bdc13ea9c2 100644
--- a/packages/apps/postgres/README.md
+++ b/packages/apps/postgres/README.md
@@ -18,22 +18,22 @@ together rather than picking one:
 
 | Layer                                    | What it does                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              | Configured via                                                                                                                                |
 | ---------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------- |
-| **Archive plumbing** (chart, legacy)     | Renders `spec.backup.barmanObjectStore` on the cnpg.io Cluster from helm-install onwards. CNPG starts postgres with `archive_command=barman-cloud-wal-archive`, every WAL switch ships to object storage, and any backup driver gets a complete WAL chain to start replay from. Renders only when `backup.enabled=true`, `useSystemBucket=false`, `destinationPath` is non-empty, AND inline-or-external creds are supplied. **Skipped in the platform `useSystemBucket=true` mode** — the CNPG backup driver SSA-patches `barmanObjectStore` onto the live Cluster at first BackupJob time; until that first BackupJob fires, `archive_command` is not active and WAL accumulates on the PVC. Fire an ad-hoc BackupJob immediately after enabling the flag on existing releases. | Legacy: `backup.enabled=true` plus `backup.destinationPath`, `backup.endpointURL`, and either `backup.s3AccessKey`+`backup.s3SecretKey` or `backup.s3CredentialsSecret`. Platform: `backup.enabled=true` plus `backup.useSystemBucket=true` — no S3 fields. |
-| **Backup orchestration** (recommended)   | Drives ad-hoc and scheduled backups, retention, and restores from `backups.cozystack.io` resources that can span multiple Postgres apps in a tenant. The driver SSA-merges its own `barmanObjectStore` shape over the chart's with `ForceOwnership` (so compression / serverName / target settings flow from the strategy template); chart-managed values cover the same destination so there is no tug-of-war on the live Cluster.                                                                                                                                       | `strategy.backups.cozystack.io/CNPG` + `BackupClass` + `Plan` (recurring) or `BackupJob` (ad-hoc), restores via `RestoreJob`                  |
-| Legacy chart-emitted scheduled backup    | The chart can also emit a `cnpg.io/ScheduledBackup` directly. Superseded by the BackupClass + Plan path, kept around for clusters that did not migrate. **Off by default** - rendered only when both `backup.enabled` and `backup.schedule` are non-empty. With `backup.schedule=""` the archive plumbing still runs; only the chart-emitted scheduled backup is silent.                                                                                                                                                                                                  | `backup.enabled=true` plus `backup.schedule` (CNPG 6-field cron, e.g. `"0 2 * * * *"`)                                                        |
+| **Archive plumbing** (chart, legacy)     | Renders `spec.plugins` (referencing a barman-cloud `ObjectStore`) on the cnpg.io Cluster from helm-install onwards. CNPG runs the barman-cloud plugin as a WAL-archiver sidecar, every WAL switch ships to object storage, and any backup driver gets a complete WAL chain to start replay from. Renders only when `backup.enabled=true`, `useSystemBucket=false`, `destinationPath` is non-empty, AND inline-or-external creds are supplied. **Skipped in the platform `useSystemBucket=true` mode** — the CNPG backup driver SSA-applies the `ObjectStore` and patches `spec.plugins` onto the live Cluster at first BackupJob time; until that first BackupJob fires, plugin WAL archiving is not active and WAL accumulates on the PVC. Fire an ad-hoc BackupJob immediately after enabling the flag on existing releases. | Legacy: `backup.enabled=true` plus `backup.destinationPath`, `backup.endpointURL`, and either `backup.s3AccessKey`+`backup.s3SecretKey` or `backup.s3CredentialsSecret`. Platform: `backup.enabled=true` plus `backup.useSystemBucket=true` — no S3 fields. |
+| **Backup orchestration** (recommended)   | Drives ad-hoc and scheduled backups, retention, and restores from `backups.cozystack.io` resources that can span multiple Postgres apps in a tenant. The driver SSA-applies its own barman-cloud `ObjectStore` and patches `spec.plugins` with `ForceOwnership` (so compression / target settings flow from the strategy template, while the live Cluster's `serverName` — its WAL-archive S3 prefix — is always preserved); chart-managed values cover the same destination so there is no tug-of-war on the live Cluster.                                                                                                                                       | `strategy.backups.cozystack.io/CNPG` + `BackupClass` + `Plan` (recurring) or `BackupJob` (ad-hoc), restores via `RestoreJob`                  |
+| Legacy chart-emitted scheduled backup    | The chart can also emit a `cnpg.io/ScheduledBackup` directly. Superseded by the BackupClass + Plan path, kept around for clusters that did not migrate. **Off by default** - rendered only when both `backup.enabled` and `backup.schedule` are non-empty. With `backup.schedule=""` plugin WAL archiving still runs; only the chart-emitted scheduled backup is silent.                                                                                                                                                                                                  | `backup.enabled=true` plus `backup.schedule` (CNPG 6-field cron, e.g. `"0 2 * * * *"`)                                                        |
 
 The **canonical setup** depends on whether the cluster ships the platform `cozy-default` BackupClass.
 
-**Platform-managed flow (recommended for new clusters)** — opt in via `backup.useSystemBucket: true` and reference `cozy-default` from BackupJob/Plan/RestoreJob. The chart leaves S3 coordinates blank; the CNPG driver SSA-patches `barmanObjectStore` from the platform-managed bucket coordinates at first BackupJob time.
+**Platform-managed flow (recommended for new clusters)** — opt in via `backup.useSystemBucket: true` and reference `cozy-default` from BackupJob/Plan/RestoreJob. The chart leaves S3 coordinates blank; the CNPG driver SSA-applies a barman-cloud `ObjectStore` and patches `spec.plugins` from the platform-managed bucket coordinates at first BackupJob time.
 
 ```yaml
 spec:
   backup:
     enabled: true
-    useSystemBucket: true        # platform projects cozy-backups-creds + driver SSA-patches barmanObjectStore
+    useSystemBucket: true        # platform projects cozy-backups-creds + driver SSA-applies ObjectStore + patches spec.plugins
 ```
 
-**Legacy chart-managed flow** — for clusters that pre-date the platform BackupClass or use a tuned non-default bucket. Provide all S3 coordinates inline (or via `s3CredentialsSecret.name`); `barmanObjectStore` renders from helm-install onwards.
+**Legacy chart-managed flow** — for clusters that pre-date the platform BackupClass or use a tuned non-default bucket. Provide all S3 coordinates inline (or via `s3CredentialsSecret.name`); `spec.plugins` and the barman-cloud `ObjectStore` render from helm-install onwards.
 
 ```yaml
 spec:
@@ -58,23 +58,14 @@ canonical reference (`05-postgres-src.yaml` shows the chart side,
 side, `25-backupjob-adhoc.yaml` and `40-restorejob-to-copy.yaml` show
 ad-hoc backup and restore).
 
-> **Why both layers and not one?** WAL archive is a postmaster setting -
-> CNPG can swap `archive_command` at runtime via SIGHUP, but any WAL that
-> closed before the swap was "archived" by `archive_command=/bin/true`
-> and is gone for good. A backup taken from such a cluster is missing
-> the WAL its `begin_wal` points at, and recovery later fails with
-> `WAL not found`. Letting the chart bootstrap `archive_command` from
-> helm-install removes the race.
+> **Why both layers and not one?** WAL archiving is handled by the barman-cloud plugin's WAL-archiver sidecar - CNPG can attach or detach the plugin at runtime, but any WAL that closed before the plugin began archiving is gone for good. A backup taken from such a cluster is missing the WAL its `begin_wal` points at, and recovery later fails with `WAL not found`. Letting the chart wire the plugin from helm-install removes the race.
 
 ### How to enable backups (preferred: BackupClass + Plan)
 
 End-to-end manifests live under [`examples/backups/postgres/`](../../../examples/backups/postgres/).
 Briefly, the moving parts are:
 
-1. A `strategy.backups.cozystack.io/CNPG` describing the destination bucket
-   and templating the `barmanObjectStore` (including a Secret reference to
-   S3 credentials - the credentials never appear on the Postgres CR
-   `.spec`; see Security note below).
+1. A `strategy.backups.cozystack.io/CNPG` describing the destination bucket and templating the barman-cloud `ObjectStore` (including a Secret reference to S3 credentials - the credentials never appear on the Postgres CR `.spec`; see Security note below).
 2. A `backups.cozystack.io/BackupClass` that names the strategy and is
    selected by an `applicationRef` matching the Postgres app's `Kind`/`Name`.
 3. A `backups.cozystack.io/Plan` (recurring) or `BackupJob` (ad-hoc) that
@@ -104,7 +95,7 @@ ScheduledBackup template off. To turn it on, fill in a CNPG 6-field cron
 expression:
 
 ```yaml
-## @param backup.enabled Enable archive_command + render the chart-managed ScheduledBackup
+## @param backup.enabled Enable plugin WAL archiving + render the chart-managed ScheduledBackup
 ## @param backup.schedule Cron schedule (CNPG 6-field). Empty means no chart-managed ScheduledBackup
 ## @param backup.retentionPolicy Retention policy
 ## @param backup.destinationPath Path to store the backup (i.e. s3://bucket/path/to/folder)
@@ -133,9 +124,9 @@ On a to-copy restore the controller replaces the target app's
 in `Backup.status.underlyingResources`, so the chart's post-install
 init-job does not drop the recovered roles or databases.
 
-> **e2e coverage:** the CI e2e (`hack/e2e-apps/backup-postgres.bats`)
-> exercises the same-namespace to-copy restore (Steps 0-7), which leaves
-> the source running and is therefore the deterministic end-to-end signal.
+> **e2e coverage:** the same-namespace to-copy restore (Steps 0-7) leaves
+> the source running and is the deterministic end-to-end signal; it stays
+> a manual / dev-cluster reference flow, not part of the automated e2e suite.
 > The cross-tenant variant (target Postgres in a different tenant from
 > the source's seaweedfs) stays a manual / dev-cluster exercise —
 > reachability is blocked by the per-tenant Cilium egress policy. The
@@ -175,25 +166,37 @@ See:
 
 CNPG manages the cert chain end-to-end. The operator auto-generates a self-signed CA, signs server, client, and replication leaf certs from it, and rotates them as needed. The chart does not render any cert-manager `Issuer`/`Certificate` objects — that path is mutually exclusive with the operator-managed chain on the CNPG admission webhook.
 
-What the chart contributes: when TLS is on and `external: true`, the chart sets `spec.certificates.serverAltDNSNames` on the CNPG Cluster CR to inject the external hostname `<release>.<_namespace.host>` into the auto-generated server certificate's SAN list. CNPG's default SAN coverage already includes the three built-in ClusterIP services (`-rw`, `-r`, `-ro`) across the four DNS forms (`<svc>`, `<svc>.<ns>`, `<svc>.<ns>.svc`, `<svc>.<ns>.svc.<cluster-domain>`); only the external hostname needs to be added.
+What the chart contributes: when TLS is on and `external: true`, the chart sets `spec.certificates.serverAltDNSNames` on the CNPG Cluster CR to inject the external hostnames `<release>.<_namespace.host>` and `<release>.postgres.<_namespace.host>` into the auto-generated server certificate's SAN list. The second is the per-engine name meant for SNI routing through a TLS-passthrough listener on the tenant Gateway. The certificate covers that name for any client, but routing through such a listener works only when the TLS handshake is the first thing on the wire. With the default negotiation a PostgreSQL client first sends a plaintext SSLRequest, so the listener can route only clients using direct TLS negotiation: PostgreSQL 17 or later on the server and a client connecting with `sslnegotiation=direct`, such as libpq 17 or pgx 5.7.5. CNPG's default SAN coverage already includes the three built-in ClusterIP services (`-rw`, `-r`, `-ro`) across the four DNS forms (`<svc>`, `<svc>.<ns>`, `<svc>.<ns>.svc`, `<svc>.<ns>.svc.<cluster-domain>`); only the external hostnames need to be added.
 
 The tri-state `tls.enabled` controls whether the chart injects `serverAltDNSNames`:
 
-- `tls.enabled: null` (the default) — TLS posture inherits from `external`. When `external: true`, the chart injects the external hostname into the operator-managed cert.
+- `tls.enabled: null` (the default) — TLS posture inherits from `external`. When `external: true`, the chart injects the external hostnames into the operator-managed cert.
 - `tls.enabled: true` with `external: true` — same effect as the default.
 - `tls.enabled: true` with `external: false` — no `serverAltDNSNames` injection is needed (there is no external hostname to add); CNPG's auto-generated cert covers internal services.
-- `tls.enabled: false` — the chart skips `serverAltDNSNames` injection. **Note:** CNPG keeps its built-in TLS on the wire regardless of this flag; this toggle only controls whether the external hostname is added to the cert. To force PostgreSQL to drop TLS entirely you would need to set `postgresql.parameters.ssl = "off"` at the CNPG layer, which is out of scope for this flag.
+- `tls.enabled: false` — the chart skips `serverAltDNSNames` injection. **Note:** CNPG keeps its built-in TLS on the wire regardless of this flag; this toggle only controls whether the external hostnames are added to the cert. To force PostgreSQL to drop TLS entirely you would need to set `postgresql.parameters.ssl = "off"` at the CNPG layer, which is out of scope for this flag.
+
+**Refusing plaintext sessions.** CNPG offers TLS but its built-in last `pg_hba` rule, `host all all all`, also accepts plaintext, so a client using `sslmode=disable` gets an unencrypted session. The tri-state `tls.required` closes that:
+
+- `tls.required: null` (the default) — follows `external`. With `external: true` the chart renders `spec.postgresql.pg_hba` as `hostssl all all all scram-sha-256` followed by `host all all all reject`. CNPG puts these after its fixed rules and before its default rule, and the first matching rule wins, so only TLS sessions are authenticated.
+- `tls.required: true` — the same rules regardless of `external`.
+- `tls.required: false` — no `pg_hba` rules are rendered and CNPG's default applies, which accepts plaintext.
+
+The rules cover every client, in-cluster ones included, because the pod network cannot be told apart from an external client. libpq's default `sslmode=prefer` already negotiates TLS, so only clients that disable TLS explicitly are refused. Instances that were external before this setting existed refuse such clients after the upgrade; set `tls.required: false` to keep accepting them. See the CloudNativePG [`pg_hba` documentation](https://cloudnative-pg.io/documentation/current/postgresql_conf/#the-pg_hba-section).
 
 **Retrieving the CA bundle** for client verification:
 
-CNPG bundles the CA certificate in every user-credentials Secret it creates under the key `ca.crt`. Retrieve it from the `<release>-credentials` Secret, which is already accessible to tenants via the dashboard RBAC:
+The trust anchor is published as `postgres-<name>.tenant-ca`, where `<name>` is the name of the Postgres resource: an object holding `ca.crt` and nothing else, created for every release and delivered to tenants through the `core.cozystack.io/tenantsecrets` API that the base tenant roles already grant. The `postgres-` prefix comes from the release naming this application definition applies, so a Postgres named `foo` gets `postgres-foo.tenant-ca`.
 
 ```bash
 kubectl --context <ctx> --namespace <tenant> \
-  get secret <release>-credentials \
+  get tenantsecret postgres-<name>.tenant-ca \
   --output jsonpath='{.data.ca\.crt}' | base64 --decode
 ```
 
+That object is the only one that hands over the CA certificate without also handing over a private key, which is why it exists. CNPG creates its own `<release>-ca` Secret, but that one stores the CA **private key** (`ca.key`) alongside the certificate — read access to it would let the holder issue certificates for anything, so it is never granted to a tenant.
+
+It is reached through `tenantsecrets` rather than by reading the Secret directly, and that is deliberate: `tenantsecrets` surfaces only objects the platform has vouched for (those the application's definition selects), whereas a direct grant on the name would convey whatever happens to occupy that name.
+
 **Connecting with full verification** (psql example):
 
 ```bash
@@ -207,51 +210,71 @@ For `sslmode=verify-full` to work, the CA bundle retrieved above must be saved t
 
 ### Common parameters
 
-| Name               | Description                                                                                                                          | Type       | Value      |
-| ------------------ | ------------------------------------------------------------------------------------------------------------------------------------ | ---------- | ---------- |
-| `replicas`         | Number of Postgres replicas.                                                                                                         | `int`      | `2`        |
-| `resources`        | Explicit CPU and memory configuration for each PostgreSQL replica. When omitted, the preset defined in `resourcesPreset` is applied. | `object`   | `{}`       |
-| `resources.cpu`    | CPU available to each replica.                                                                                                       | `quantity` | `""`       |
-| `resources.memory` | Memory (RAM) available to each replica.                                                                                              | `quantity` | `""`       |
-| `resourcesPreset`  | Default sizing preset used when `resources` is omitted.                                                                              | `string`   | `t1.micro` |
-| `size`             | Persistent Volume Claim size available for application data.                                                                         | `quantity` | `10Gi`     |
-| `storageClass`     | StorageClass used to store the data.                                                                                                 | `string`   | `""`       |
-| `external`         | Enable external access from outside the cluster.                                                                                     | `bool`     | `false`    |
-| `version`          | PostgreSQL major version to deploy                                                                                                   | `string`   | `v18`      |
+| Name               | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | Type       | Value        |
+| ------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------- | ------------ |
+| `replicas`         | Number of Postgres replicas. Under active autoscaling this is the resting/seed count, not the live count — KEDA drives the live count via `/scale`. Disabling autoscaling does NOT automatically bring the live count back to `replicas`: the client-side merge writes `instances` only when the rendered value changes, so a cluster KEDA grew past `replicas` stays there with no autoscaler left to reduce it — lower `replicas` to the count you want and it rebases down (shedding the surplus replicas + PVCs). Lowering it below the live count, or disabling/dry-running while it sits below the live count, sheds in one step past the scaleDown pacing; stage it to the live count first (suspend the HelmRelease and `kubectl scale` if needed) to avoid a transient. Must stay greater than `quorum.maxSyncReplicas`. | `int`      | `2`          |
+| `resources`        | Explicit CPU and memory configuration for each PostgreSQL replica. When omitted, the preset defined in `resourcesPreset` is applied.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | `object`   | `{}`         |
+| `resources.cpu`    | CPU available to each replica.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        | `quantity` | `""`         |
+| `resources.memory` | Memory (RAM) available to each replica.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | `quantity` | `""`         |
+| `resourcesPreset`  | Default sizing preset used when `resources` is omitted.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | `string`   | `t1.micro`   |
+| `size`             | Persistent Volume Claim size available for application data.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | `quantity` | `10Gi`       |
+| `storageClass`     | StorageClass used to store the data.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | `string`   | `""`         |
+| `external`         | Enable external access from outside the cluster.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | `bool`     | `false`      |
+| `version`          | PostgreSQL major version to deploy                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    | `string`   | `v18`        |
+| `flavor`           | PostgreSQL image flavor, fixed when the cluster is created. `postgresql` uses the CloudNativePG PostgreSQL image. `postgis` uses the CloudNativePG PostGIS image, which adds postgis, postgis_raster, postgis_topology, postgis_sfcgal, postgis_tiger_geocoder and address_standardizer; enable them per database in `databases.<name>.extensions`. Changing the flavor of an existing cluster is refused, and a backup restores only into a cluster of the flavor it was taken from: to change flavor, create a new cluster and move the data with a logical dump (pg_dump / pg_restore).                                                                                                                                                                                                                                            | `string`   | `postgresql` |
 
 
 ### TLS configuration
 
-| Name          | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | Type     | Value  |
-| ------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------- | ------ |
-| `tls`         | TLS configuration for server connections.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | `object` | `{}`   |
-| `tls.enabled` | Tri-state switch controlling whether the chart injects the external hostname into the operator-managed CNPG cert via spec.certificates.serverAltDNSNames. When omitted, the chart injects the SAN if `external: true` and skips it otherwise. Set explicitly to `true` to inject regardless of `external` (no-op when `external: false` since there is no external hostname to add). Set to `false` to skip injection. Note that CNPG keeps its built-in TLS on the wire regardless of this flag — this toggle only controls the chart-side SAN injection; to disable PostgreSQL TLS entirely set `postgresql.parameters.ssl = "off"` at the CNPG layer. | `*bool`  | `null` |
+| Name           | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    | Type     | Value  |
+| -------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------- | ------ |
+| `tls`          | TLS configuration for server connections.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | `object` | `{}`   |
+| `tls.enabled`  | Tri-state switch controlling whether the chart injects the external hostnames into the operator-managed CNPG cert via spec.certificates.serverAltDNSNames. When omitted, the chart injects them if `external: true` and skips them otherwise. Set explicitly to `true` to inject regardless of `external` (no-op when `external: false` since there is no external hostname to add). Set to `false` to skip injection. Note that CNPG keeps its built-in TLS on the wire regardless of this flag — this toggle only controls the chart-side SAN injection; to disable PostgreSQL TLS entirely set `postgresql.parameters.ssl = "off"` at the CNPG layer.                                                                                                                                     | `*bool`  | `null` |
+| `tls.required` | Tri-state switch controlling whether the server refuses sessions that are not encrypted. When omitted, it is on if `external: true` and off otherwise. When on, the chart renders `spec.postgresql.pg_hba` with `hostssl all all all scram-sha-256` (`md5` on PostgreSQL 13, matching CloudNativePG's default rule) followed by `host all all all reject`, so a client that connects with `sslmode=disable` is refused instead of getting a plaintext session; in-cluster clients are held to the same rule, since the pod network cannot be told apart from an external client. Set to `false` to keep accepting plaintext sessions on an external instance, or to `true` to require TLS on an in-cluster one. Rendering fails if `postgresql.parameters.ssl` is off while this is in effect. | `*bool`  | `null` |
 
 
 ### Application-specific parameters
 
-| Name                    | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | Type                     | Value |
-| ----------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------ | ----- |
-| `postgresql`            | PostgreSQL server configuration.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | `object`                 | `{}`  |
-| `postgresql.parameters` | PostgreSQL server parameters. Values may be strings or integers; integers are coerced to strings by the template (e.g. both `max_connections: 100` and `max_connections: "100"` are accepted). BLOCKED (enable arbitrary code execution): archive_command, restore_command, ssl_passphrase_command, archive_cleanup_command, recovery_end_command, dynamic_library_path, local_preload_libraries, session_preload_libraries, shared_preload_libraries. Do NOT override CloudNativePG-managed parameters: archive_mode, primary_conninfo, wal_level, max_replication_slots. | `map[string]intOrString` | `{}`  |
+| Name                                | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | Type                     | Value |
+| ----------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------ | ----- |
+| `postgresql`                        | PostgreSQL server configuration.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | `object`                 | `{}`  |
+| `postgresql.sharedPreloadLibraries` | Libraries loaded at server start, restricted to an allowlist of modules already shipped in the PostgreSQL image. CloudNativePG also preloads `pg_stat_statements`, `auto_explain` and `pgaudit` by itself whenever `parameters` sets a key under their prefix (e.g. `pg_stat_statements.track`), so removing one of them from this list does not unload it while such a key is set; `pg_prewarm` is preloaded only through this list. Changing the list restarts PostgreSQL on every instance, the primary included, so writes pause briefly.                              | `[]string`               | `[]`  |
+| `postgresql.parameters`             | PostgreSQL server parameters. Values may be strings or integers; integers are coerced to strings by the template (e.g. both `max_connections: 100` and `max_connections: "100"` are accepted). BLOCKED (enable arbitrary code execution): archive_command, restore_command, ssl_passphrase_command, archive_cleanup_command, recovery_end_command, dynamic_library_path, local_preload_libraries, session_preload_libraries, shared_preload_libraries. Do NOT override CloudNativePG-managed parameters: archive_mode, primary_conninfo, wal_level, max_replication_slots. | `map[string]intOrString` | `{}`  |
 
 
 ### Quorum-based synchronous replication
 
-| Name                     | Description                                                                        | Type     | Value |
-| ------------------------ | ---------------------------------------------------------------------------------- | -------- | ----- |
-| `quorum`                 | Quorum configuration for synchronous replication.                                  | `object` | `{}`  |
-| `quorum.minSyncReplicas` | Minimum number of synchronous replicas required for commit.                        | `int`    | `0`   |
-| `quorum.maxSyncReplicas` | Maximum number of synchronous replicas allowed (must be less than total replicas). | `int`    | `0`   |
+| Name                     | Description                                                                                                                                                                                                                                                                            | Type     | Value |
+| ------------------------ | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------- | ----- |
+| `quorum`                 | Quorum configuration for synchronous replication.                                                                                                                                                                                                                                      | `object` | `{}`  |
+| `quorum.minSyncReplicas` | Minimum number of synchronous replicas required for commit.                                                                                                                                                                                                                            | `int`    | `0`   |
+| `quorum.maxSyncReplicas` | Maximum number of synchronous replicas allowed (must be less than total replicas). Under autoscaling it also sets the scale-down floor (the effective minimum is `max(minReplicas, maxSyncReplicas+1, 2)`); the chart fails to render if that floor exceeds `autoscaling.maxReplicas`. | `int`    | `0`   |
+
+
+### Autoscaling
+
+| Name                                   | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | Type     | Value             |
+| -------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------- | ----------------- |
+| `autoscaling`                          | Read-replica autoscaling configuration.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | `object` | `{}`              |
+| `autoscaling.enabled`                  | Enable horizontal autoscaling of read replicas. Requires the platform `keda` package to be enabled by an administrator first; the chart fails to render (rather than break the release) if KEDA is not installed. Prerequisite: the queried vmselect must hold BOTH the CNPG metrics (cnpg_backends_total / container CPU) AND kube_pod_labels (kube-state-metrics). This holds for a tenant on the shared root monitoring stack (`monitoring: false`, both land in tenant-root). A tenant running its OWN Monitoring app (`monitoring: true`) has the CNPG metrics but not kube_pod_labels (KSM is root-only), so it must set `serverAddress` to a vmselect carrying both series or autoscaling never actuates.                                                                                                                                                                                                                                                                                                                                                                                                    | `bool`   | `false`           |
+| `autoscaling.serverAddress`            | Override the Prometheus/vmselect URL the ScaledObject queries. Empty (default) derives `http://vmselect-shortterm.<monitoring-ns>.svc:8481/select/0/prometheus`. Set it when the derived vmselect does not hold both the CNPG metrics and kube_pod_labels (e.g. `monitoring: true` tenants, or a non-default `metricsStorages` name). SSRF constraint: the host must be an in-cluster Service DNS name (`<svc>.<ns>.svc[.<clusterDomain>]`) whose namespace is within the tenant's own subtree (its namespace, its parents, or `tenant-root`) — the cluster-privileged KEDA operator fetches this URL every poll, so it is refused a metadata endpoint, an external host, or a sibling/system namespace. Residual surface (accepted trade-off): `tenant-root` is always allowed because the derived default points there, so a tenant can still aim the operator at any Service in `tenant-root` on any port/path (a blind in-cluster reachability probe — the operator reads no response body back to the tenant); the egress NetworkPolicy does not narrow that.                                              | `string` | `""`              |
+| `autoscaling.minReplicas`              | Minimum total instances; raised to the synchronous-quorum floor (`maxSyncReplicas + 1`) and to 2 when either is higher.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | `int`    | `2`               |
+| `autoscaling.maxReplicas`              | Maximum total instances. Must be >= minReplicas and >= the synchronous-quorum floor (maxSyncReplicas+1); the chart fails to render (rather than silently run an unbounded instance count) if the effective floor exceeds it - raise maxReplicas. HAZARD: lowering maxReplicas below the live count makes the HPA cut straight to the new maximum in one step (the current>max branch bypasses the scale-down pacing), shedding the surplus replicas + PVCs at once; to lower it deliberately, suspend the HelmRelease and pin the live count with `kubectl scale` first.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | `int`    | `6`               |
+| `autoscaling.metric`                   | Read-load signal to scale on.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       | `string` | `ReadConnections` |
+| `autoscaling.target`                   | Target read load per read-serving replica (unit depends on `metric`: active connections, or CPU millicores). Dimensionless integer - a resource.Quantity here would accept `150m`, which PromQL reads as 150 minutes and KEDA cannot use as a threshold.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | `int`    | `150`             |
+| `autoscaling.maxReplicationLagSeconds` | Freeze scaling while replication lag exceeds this (seconds) and the primary is writing. 0 disables the brake. Default 0: the freeze branch has only been validated on a live cluster in its non-braking (pass-through) form, so the lag brake is opt-in until the braking path is exercised under load; set a positive value (e.g. 30) to enable it.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | `int`    | `0`               |
+| `autoscaling.dryRun`                   | Recommendation mode: keep the static count and render the ScaledObject with both scaling directions paused, so KEDA keeps the HPA and keeps serving its trigger metric but actuates neither way. Note both scaling policies are disabled, so the HPA's desiredReplicas is frozen to the current count - read the recommendation from the matching read-load dashboard panel for your metric (connections or CPU): desired = 1 + ceil(read load / target), clamped to [effectiveMin..maxReplicas] where effectiveMin = max(minReplicas, maxSyncReplicas+1, 2), not from the desired-replicas line. Like disabling, flipping a LIVE autoscaled cluster into dryRun re-renders `instances: replicas` (the raw static value, which can be below the autoscaling floor); if `replicas` is below the live count, stage it to the live count first (see the enablement note) or the cluster sheds down to `replicas`. No shed occurs when the rendered value is unchanged (replicas already equals the active seed) — client-side merge is then a no-op and the live count is preserved. Permanent, unlike `transition`. | `bool`   | `false`           |
+| `autoscaling.transition`               | Migration phase 1: render `.spec.instances` from `replicas` (which the operator stages to the current live count) AND pause the ScaledObject in both directions, so KEDA stands up with its HPA present but not actuating. Flip to false (phase 2) to hand the runtime count to KEDA. Because the both-direction pause keeps the HPA (not the HPA-deleting full pause), KEDA is genuinely warm at phase 2 — no HPA recreate — and because the active seed is max(replicas, effectiveMin), phase 2 re-renders the same instance count phase 1 did (when `replicas` is staged at/above the floor), so the flip is a merge no-op with no dip. The HPA's scaleUp stabilization window still smooths the first actuation.                                                                                                                                                                                                                                                                                                                                                                                            | `bool`   | `false`           |
 
 
 ### Users configuration
 
-| Name                      | Description                                  | Type                | Value   |
-| ------------------------- | -------------------------------------------- | ------------------- | ------- |
-| `users`                   | Users configuration map.                     | `map[string]object` | `{}`    |
-| `users[name].password`    | Password for the user.                       | `string`            | `""`    |
-| `users[name].replication` | Whether the user has replication privileges. | `bool`              | `false` |
+| Name                      | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | Type                | Value   |
+| ------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------- | ------- |
+| `users`                   | Users configuration map. Passwords are always auto-generated and stored in the `<release>-credentials` Secret; they cannot be set from values — read a user's password from that Secret. A `password` left over in values from before the field was removed is ignored by the render and draws an admission warning, but it is not inert on an upgraded release: the chart preserves whatever password is already in the Secret, which on the first upgrade is the value that was set before removal, so that value stays the live credential until it is rotated (dedicated rotation is tracked in cozystack/community#72). The live password lives only in the Secret. | `map[string]object` | `{}`    |
+| `users[name].replication` | Whether the user has replication privileges.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | `bool`              | `false` |
+| `users[name].createRole`  | Whether the user can create and manage roles (CREATEROLE). Requires PostgreSQL 16 or newer. Setting it back to `false` withdraws the attribute only: the roles the user created, and its ADMIN and SET memberships in them, stay. Once any user has held it, the chart no longer adopts an existing role it did not create, so a user or database declared later under the name of such a role fails the init job until a platform administrator drops that role.                                                                                                                                                                                                          | `bool`              | `false` |
+| `users[name].bypassRls`   | Whether the user can bypass row-level security policies (BYPASSRLS). A role can only create other roles carrying BYPASSRLS if it holds the attribute itself, so this is required alongside `createRole` to provision a privileged service role.                                                                                                                                                                                                                                                                                                                                                                                                                            | `bool`              | `false` |
 
 
 ### Databases configuration
@@ -267,35 +290,37 @@ For `sslmode=verify-full` to work, the CA bundle retrieved above must be saved t
 
 ### Backup parameters
 
-| Name                                            | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | Type     | Value                               |
-| ----------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------- | ----------------------------------- |
-| `backup`                                        | Backup configuration.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | `object` | `{}`                                |
-| `backup.enabled`                                | Enable regular backups.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | `bool`   | `false`                             |
-| `backup.useSystemBucket`                        | Opt-in: when true, the chart-emitted `<release>-s3-creds` Secret is skipped AND `spec.backup.barmanObjectStore` is left UNSET in the chart-rendered Cluster — the cozy-default BackupClass driver SSA-patches the live Cluster with destinationPath/endpointURL/credentials when the first BackupJob runs. Consequence: `archive_command` is NOT active until that first BackupJob fires; WAL accumulates on the PVC in the meantime, so fire an ad-hoc BackupJob immediately after enabling the flag on existing releases. Use together with the platform `cozy-default` BackupClass — tenants do not need to fill `s3AccessKey`/`s3SecretKey` or `destinationPath`/`endpointURL`. The destination path automatically scopes to `s3://cozy-backups/<namespace>/<release>/`. | `bool`   | `false`                             |
-| `backup.schedule`                               | Legacy. Cron schedule (CNPG 6-field format) for the chart-emitted ScheduledBackup. Empty means no chart-managed schedule, which is the recommended setup when a `BackupClass` from `backups.cozystack.io` already drives backup orchestration. In the legacy chart-managed flow `spec.backup.barmanObjectStore` is rendered when `backup.enabled=true` AND `useSystemBucket=false` AND `destinationPath` is non-empty AND inline-or-external creds are supplied; in the platform `useSystemBucket=true` flow the chart skips emitting `barmanObjectStore` and the CNPG driver SSA-patches it onto the live Cluster at first BackupJob time.                                                                                                                                      | `string` | `""`                                |
-| `backup.retentionPolicy`                        | Retention policy (e.g. "30d").                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   | `string` | `30d`                               |
-| `backup.destinationPath`                        | DEPRECATED. Per-tenant S3 configuration is superseded by the platform-managed `cozy-default` BackupClass and the `cozy-backups` system bucket. Leave empty for new installations; the BackupClass driver picks up the system-managed coordinates. Kept for in-place upgrade compatibility.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       | `string` | `s3://bucket/path/to/folder/`       |
-| `backup.endpointURL`                            | DEPRECATED. See `destinationPath`.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | `string` | `http://minio-gateway-service:9000` |
-| `backup.s3AccessKey`                            | DEPRECATED. Tenants no longer supply S3 keys; the system Bucket Secret is projected into the tenant namespace by the backup controller. Ignored when `s3CredentialsSecret.name` is set or `useSystemBucket` is true. The chart skips materialising `<release>-s3-creds` whenever this field is empty so a default install does not leak placeholder credentials into the tenant namespace.                                                                                                                                                                                                                                                                                                                                                                                       | `string` | `""`                                |
-| `backup.s3SecretKey`                            | DEPRECATED. See `s3AccessKey`.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   | `string` | `""`                                |
-| `backup.s3CredentialsSecret`                    | DEPRECATED. Pre-existing Secret with S3 credentials. Use the platform-managed `cozy-default` BackupClass instead. When set, the chart references this Secret directly (legacy chart-managed flow). The CNPG backup driver writes this field on restore so credentials never land in the CR `.spec`.                                                                                                                                                                                                                                                                                                                                                                                                                                                                              | `object` | `{}`                                |
-| `backup.s3CredentialsSecret.name`               | Name of the Secret in the application namespace. Empty means the chart materialises `<release>-s3-creds` from `s3AccessKey`/`s3SecretKey`.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       | `string` | `""`                                |
-| `backup.s3CredentialsSecret.accessKeyIDKey`     | Key in the Secret holding the access key ID. Defaults to `AWS_ACCESS_KEY_ID`.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    | `string` | `""`                                |
-| `backup.s3CredentialsSecret.secretAccessKeyKey` | Key in the Secret holding the secret access key. Defaults to `AWS_SECRET_ACCESS_KEY`.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | `string` | `""`                                |
-| `backup.endpointCA`                             | DEPRECATED. Pre-existing Secret with the CA bundle Barman should trust when reaching a self-signed S3 endpoint. Used for both backup and bootstrap recovery in the legacy chart-managed flow.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    | `object` | `{}`                                |
-| `backup.endpointCA.name`                        | Name of the Secret in the application namespace. Empty means no endpointCA is emitted (Barman uses the system trust store).                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | `string` | `""`                                |
-| `backup.endpointCA.key`                         | Key within the Secret containing the CA bundle. Defaults to `ca.crt`.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | `string` | `""`                                |
+| Name                                            | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | Type     | Value                               |
+| ----------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------- | ----------------------------------- |
+| `backup`                                        | Backup configuration.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | `object` | `{}`                                |
+| `backup.enabled`                                | Enable regular backups.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   | `bool`   | `false`                             |
+| `backup.useSystemBucket`                        | Opt-in: when true, the chart-emitted `<release>-s3-creds` Secret is skipped AND `spec.plugins` (plus the barman-cloud ObjectStore) is left UNSET in the chart-rendered Cluster — the cozy-default BackupClass driver SSA-applies an ObjectStore (carrying destinationPath/endpointURL/credentials) and patches `spec.plugins` on the live Cluster when the first BackupJob runs. Consequence: plugin WAL archiving is NOT active until that first BackupJob fires; WAL accumulates on the PVC in the meantime, so fire an ad-hoc BackupJob immediately after enabling the flag on existing releases. Use together with the platform `cozy-default` BackupClass — tenants do not need to fill `s3AccessKey`/`s3SecretKey` or `destinationPath`/`endpointURL`. The destination path automatically scopes to `s3://cozy-backups/<namespace>/<release>/`. | `bool`   | `false`                             |
+| `backup.schedule`                               | Legacy. Cron schedule (CNPG 6-field format) for the chart-emitted ScheduledBackup. Empty means no chart-managed schedule, which is the recommended setup when a `BackupClass` from `backups.cozystack.io` already drives backup orchestration. In the legacy chart-managed flow `spec.plugins` plus the barman-cloud ObjectStore is rendered when `backup.enabled=true` AND `useSystemBucket=false` AND `destinationPath` is non-empty AND inline-or-external creds are supplied; in the platform `useSystemBucket=true` flow the chart skips emitting `spec.plugins` and the CNPG driver SSA-applies the ObjectStore and patches `spec.plugins` onto the live Cluster at first BackupJob time.                                                                                                                                                           | `string` | `""`                                |
+| `backup.retentionPolicy`                        | Retention policy (e.g. "30d").                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | `string` | `30d`                               |
+| `backup.destinationPath`                        | DEPRECATED. Per-tenant S3 configuration is superseded by the platform-managed `cozy-default` BackupClass and the `cozy-backups` system bucket. Leave empty for new installations; the BackupClass driver picks up the system-managed coordinates. Kept for in-place upgrade compatibility.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | `string` | `s3://bucket/path/to/folder/`       |
+| `backup.endpointURL`                            | DEPRECATED. See `destinationPath`.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        | `string` | `http://minio-gateway-service:9000` |
+| `backup.s3AccessKey`                            | DEPRECATED. Tenants no longer supply S3 keys; the system Bucket Secret is projected into the tenant namespace by the backup controller. Ignored when `s3CredentialsSecret.name` is set or `useSystemBucket` is true. The chart skips materialising `<release>-s3-creds` whenever this field is empty so a default install does not leak placeholder credentials into the tenant namespace.                                                                                                                                                                                                                                                                                                                                                                                                                                                                | `string` | `""`                                |
+| `backup.s3SecretKey`                            | DEPRECATED. See `s3AccessKey`.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | `string` | `""`                                |
+| `backup.s3CredentialsSecret`                    | DEPRECATED. Pre-existing Secret with S3 credentials. Use the platform-managed `cozy-default` BackupClass instead. When set, the chart references this Secret directly (legacy chart-managed flow). The CNPG backup driver writes this field on restore so credentials never land in the CR `.spec`.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       | `object` | `{}`                                |
+| `backup.s3CredentialsSecret.name`               | Name of the Secret in the application namespace. Empty means the chart materialises `<release>-s3-creds` from `s3AccessKey`/`s3SecretKey`.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | `string` | `""`                                |
+| `backup.s3CredentialsSecret.accessKeyIDKey`     | Key in the Secret holding the access key ID. Defaults to `AWS_ACCESS_KEY_ID`.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | `string` | `""`                                |
+| `backup.s3CredentialsSecret.secretAccessKeyKey` | Key in the Secret holding the secret access key. Defaults to `AWS_SECRET_ACCESS_KEY`.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | `string` | `""`                                |
+| `backup.endpointCA`                             | DEPRECATED. Pre-existing Secret with the CA bundle the barman-cloud plugin should trust when reaching a self-signed S3 endpoint. Used for both backup and bootstrap recovery in the legacy chart-managed flow.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | `object` | `{}`                                |
+| `backup.endpointCA.name`                        | Name of the Secret in the application namespace. Empty means no endpointCA is emitted (the plugin uses the system trust store).                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | `string` | `""`                                |
+| `backup.endpointCA.key`                         | Key within the Secret containing the CA bundle. Defaults to `ca.crt`.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | `string` | `""`                                |
 
 
 ### Bootstrap (recovery) parameters
 
-| Name                     | Description                                                                                                                                                                                                                  | Type     | Value   |
-| ------------------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------- | ------- |
-| `bootstrap`              | Bootstrap configuration.                                                                                                                                                                                                     | `object` | `{}`    |
-| `bootstrap.enabled`      | Whether to restore from a backup.                                                                                                                                                                                            | `bool`   | `false` |
-| `bootstrap.recoveryTime` | Timestamp (RFC3339) for point-in-time recovery; empty means latest.                                                                                                                                                          | `string` | `""`    |
-| `bootstrap.oldName`      | Previous cluster name before deletion.                                                                                                                                                                                       | `string` | `""`    |
-| `bootstrap.serverName`   | Barman server name (S3 path prefix) used by the original cluster when writing backups. Set this only when the original cluster had an explicit barmanObjectStore.serverName that differed from its Kubernetes resource name. | `string` | `""`    |
+| Name                      | Description                                                                                                                                                                                                                                                                                                                                                                  | Type     | Value   |
+| ------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------- | ------- |
+| `bootstrap`               | Bootstrap configuration.                                                                                                                                                                                                                                                                                                                                                     | `object` | `{}`    |
+| `bootstrap.enabled`       | Whether to restore from a backup.                                                                                                                                                                                                                                                                                                                                            | `bool`   | `false` |
+| `bootstrap.recoveryTime`  | Timestamp (RFC3339) for point-in-time recovery; empty means latest.                                                                                                                                                                                                                                                                                                          | `string` | `""`    |
+| `bootstrap.backupID`      | Barman ID of the base backup to recover from, passed as `recoveryTarget.backupID`. Empty lets the barman-cloud plugin pick one: the newest backup when `recoveryTime` is empty, otherwise the newest one ending at or before it, on any timeline. The CNPG backup driver sets this on restore.                                                                               | `string` | `""`    |
+| `bootstrap.oldName`       | Previous cluster name before deletion.                                                                                                                                                                                                                                                                                                                                       | `string` | `""`    |
+| `bootstrap.serverName`    | Server name (S3 path prefix) used by the original cluster when writing backups; passed to the barman-cloud plugin via `externalClusters[].plugin.parameters.serverName`. Defaults to `bootstrap.oldName`. Set this only when the original cluster wrote backups under an explicit server name that differed from its Kubernetes resource name.                               | `string` | `""`    |
+| `bootstrap.newServerName` | WAL-archive server name (S3 path prefix) the RESTORED cluster writes to. Must differ from `serverName` (the recovery source) so a restored cluster archives to a fresh, empty prefix and barman-cloud-check-wal-archive passes while it recovers from the source's prefix. The CNPG backup driver sets this on restore; empty means the cluster archives under its own name. | `string` | `""`    |
 
 
 ## Parameter examples and reference
@@ -303,7 +328,7 @@ For `sslmode=verify-full` to work, the CA bundle retrieved above must be saved t
 ### resources and resourcesPreset
 
 `resources` sets explicit CPU and memory configurations for each replica.
-When left empty, the preset defined in `resourcesPreset` is applied.
+Every resource it leaves unset is taken from the preset defined in `resourcesPreset`.
 
 ```yaml
 resources:
@@ -314,7 +339,7 @@ resources:
 `resourcesPreset` sets named CPU and memory configurations for each replica.
 This setting is ignored if the corresponding `resources` value is set.
 
-Presets follow a cloud-style `<series>.<size>` naming convention. Five series cover the full CPU-to-memory ratio range (`t1` 1:0.5, `c1` 1:1, `s1` 1:2, `u1` 1:4, `m1` 1:8) and each series ships eight sizes (`nano` through `4xlarge`). The legacy flat names (`nano`, `micro`, `small`, `medium`, `large`, `xlarge`, `2xlarge`) remain accepted as deprecated aliases of their 1:1 instance-type equivalents.
+Presets follow a cloud-style `<series>.<size>` naming convention. Five series cover the full CPU-to-memory ratio range (`t1` 1:0.5, `c1` 1:1, `s1` 1:2, `u1` 1:4, `m1` 1:8) and each series ships eight sizes (`nano` through `4xlarge`). The legacy flat names (`nano`, `micro`, `small`, `medium`, `large`, `xlarge`, `2xlarge`) remain accepted as deprecated aliases and keep their original sizes, which do not follow one series: `nano` through `small` equal the `t1` sizes of the same name, while `medium` equals `c1.small` rather than `c1.medium`.
 
 See [`docs/operations/resource-presets.md`](../../../docs/operations/resource-presets.md) for the full size matrix and the legacy-to-instance-type mapping.
 
@@ -322,16 +347,15 @@ See [`docs/operations/resource-presets.md`](../../../docs/operations/resource-pr
 
 ```yaml
 users:
-  user1:
-    password: strongpassword
-  user2:
-    password: hackme
-  airflow:
-    password: qwerty123
+  user1: {}
+  user2: {}
+  airflow: {}
   debezium:
     replication: true
 ```
 
+Passwords cannot be set here — they are auto-generated and stored in the `<release>-credentials` Secret. Read a user's password with `kubectl get secret <release>-credentials -o json | jq -r '.data["user1"]' | base64 -d` (a username may contain a `.`, which `jsonpath` would treat as a path step and return nothing).
+
 ### databases
 
 ```yaml
@@ -350,3 +374,5 @@ databases:
     extensions:     
     - hstore        
 ```
+
+A database name may contain only letters, digits and `-._`, and must be at most 54 characters. Renaming a database by changing its key in values makes the init-job drop the old database with its data. To keep the data, a platform administrator first renames it as the CNPG superuser (`ALTER DATABASE "<old>" RENAME TO <new>`, `ALTER ROLE "<old>_admin" RENAME TO <new>_admin` and the same for `_readonly`), and only then is the key changed; the chart then adopts the renamed database on the next reconcile.
diff --git a/packages/apps/postgres/files/postgis-versions.yaml b/packages/apps/postgres/files/postgis-versions.yaml
new file mode 100644
index 0000000000..4b1ad284c6
--- /dev/null
+++ b/packages/apps/postgres/files/postgis-versions.yaml
@@ -0,0 +1,6 @@
+"v18": "18.1-3.6.1-standard-trixie"
+"v17": "17.7-3.6.1-standard-trixie"
+"v16": "16.11-3.6.1-standard-trixie"
+"v15": "15.15-3.6.1-standard-trixie"
+"v14": "14.20-3.6.1-standard-trixie"
+"v13": "13.22-3.6.0-standard-trixie"
diff --git a/packages/apps/postgres/hack/update-versions.sh b/packages/apps/postgres/hack/update-versions.sh
index c92b3895b4..3a4f0a7458 100755
--- a/packages/apps/postgres/hack/update-versions.sh
+++ b/packages/apps/postgres/hack/update-versions.sh
@@ -8,6 +8,7 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 POSTGRES_DIR="$(cd "${SCRIPT_DIR}/.." && pwd)"
 VALUES_FILE="${POSTGRES_DIR}/values.yaml"
 VERSIONS_FILE="${POSTGRES_DIR}/files/versions.yaml"
+POSTGIS_VERSIONS_FILE="${POSTGRES_DIR}/files/postgis-versions.yaml"
 
 # Get supported major versions from GitHub README
 echo "Fetching supported major versions from GitHub..."
@@ -72,6 +73,27 @@ unset IFS
 
 echo "Major versions to add: ${MAJOR_VERSIONS[*]}"
 
+# The postgis flavor must stay on the same PostgreSQL minor as the default
+# flavor, so each major is pinned to the newest postgis build of the minor
+# chosen above. standard-trixie: backups go through the barman-cloud plugin,
+# so the operand does not need the deprecated system variant. Postgis images
+# are built after the PostgreSQL ones, so a fresh minor can lack one for a
+# while: stop before touching any map rather than drop that major from the
+# postgis flavor, and rerun once the image is published.
+echo "Fetching available postgis image tags from registry..."
+POSTGIS_TAGS=$(skopeo list-tags docker://ghcr.io/cloudnative-pg/postgis | jq -r '.Tags[] | select(test("^[0-9]+\\.[0-9]+-[0-9]+\\.[0-9]+\\.[0-9]+-standard-trixie$"))' | sort -V)
+
+declare -A POSTGIS_MAP
+for major_ver in "${MAJOR_VERSIONS[@]}"; do
+    minor="${VERSION_MAP[$major_ver]#v}"
+    postgis_tag=$(echo "$POSTGIS_TAGS" | grep "^${minor//./\\.}-" | tail -n1 || true)
+    if [ -z "$postgis_tag" ]; then
+        echo "Error: no postgis standard-trixie image for PostgreSQL ${minor} (${major_ver}), no file updated" >&2
+        exit 1
+    fi
+    POSTGIS_MAP[$major_ver]="$postgis_tag"
+done
+
 # Create/update versions.yaml file
 echo "Updating $VERSIONS_FILE..."
 {
@@ -82,6 +104,15 @@ echo "Updating $VERSIONS_FILE..."
 
 echo "Successfully updated $VERSIONS_FILE"
 
+echo "Updating $POSTGIS_VERSIONS_FILE..."
+{
+    for major_ver in "${MAJOR_VERSIONS[@]}"; do
+        echo "\"${major_ver}\": \"${POSTGIS_MAP[$major_ver]}\""
+    done
+} > "$POSTGIS_VERSIONS_FILE"
+
+echo "Successfully updated $POSTGIS_VERSIONS_FILE"
+
 # Update values.yaml - enum with major versions only
 TEMP_FILE=$(mktemp)
 trap "rm -f $TEMP_FILE" EXIT
diff --git a/packages/apps/postgres/templates/NOTES.txt b/packages/apps/postgres/templates/NOTES.txt
new file mode 100644
index 0000000000..214cd79f8d
--- /dev/null
+++ b/packages/apps/postgres/templates/NOTES.txt
@@ -0,0 +1,20 @@
+{{- if and .Values.bootstrap.enabled .Values.users }}
+WARNING: this PostgreSQL was provisioned as a restore (bootstrap.enabled=true).
+
+The roles recovered from the backup keep their original password hashes, but the
+{{ .Release.Name }}-credentials Secret now holds freshly generated passwords that
+are NOT yet applied to the database — the init-job that runs ALTER ROLE is skipped
+while bootstrap is on. While bootstrap is on the credentials Secret carries the
+annotation postgres.cozystack.io/credentials-pending: "true". That flag tracks only
+the bootstrap phase, not the whole convergence: the restore driver REMOVES it when
+it clears bootstrap.enabled, and that same reconcile is what triggers the init-job
+— so the flag is already gone for the short window before the init-job has finished
+applying the passwords. Do not read a missing flag as "converged".
+
+The restore driver clears bootstrap.enabled automatically once recovery is healthy,
+and the next reconcile runs the init-job to apply the Secret's passwords onto the
+recovered roles — no action is required. Confirm convergence by logging in as an
+application user rather than by the flag; until a login with the Secret's password
+succeeds, do not treat the advertised application passwords as usable — the database
+is reachable as the CloudNativePG superuser in the meantime.
+{{- end }}
diff --git a/packages/apps/postgres/templates/_autoscaling.tpl b/packages/apps/postgres/templates/_autoscaling.tpl
new file mode 100644
index 0000000000..1a7f20b80a
--- /dev/null
+++ b/packages/apps/postgres/templates/_autoscaling.tpl
@@ -0,0 +1,236 @@
+{{/*
+Read-replica autoscaling helpers (KEDA). See the community design proposal
+"database-horizontal-autoscaling". The chart renders a KEDA ScaledObject via
+cozy-lib.keda.scaledObject; these helpers compute the engine-specific pieces:
+the effective bounds (with the CNPG synchronous-quorum floor folded in), the
+vmselect address, and the read-load PromQL.
+*/}}
+
+{{/*
+postgres.autoscaling.active is "true" only when autoscaling is enabled AND neither
+in dry-run NOR mid-transition. It gates dropping the static spec.instances: while
+dry-run (permanent recommendation) or transition (migration phase 1) is set, the
+static count is kept and the ScaledObject is rendered paused, so KEDA never
+contends with Flux for the field.
+*/}}
+{{- define "postgres.autoscaling.active" -}}
+{{- if and .Values.autoscaling.enabled (not .Values.autoscaling.dryRun) (not .Values.autoscaling.transition) -}}true{{- end -}}
+{{- end -}}
+
+{{/*
+postgres.autoscaling.paused is "true" when the ScaledObject must be rendered
+paused: dry-run (recommendation) or transition (migration phase 1).
+*/}}
+{{- define "postgres.autoscaling.paused" -}}
+{{- if or .Values.autoscaling.dryRun .Values.autoscaling.transition -}}true{{- end -}}
+{{- end -}}
+
+{{/*
+Effective lower bound = max(minReplicas, maxSyncReplicas+1, 2). The synchronous
+quorum floor (maxSyncReplicas+1) and the read-serving floor (2) can never be
+undercut; both live in this same chart's values, so a tenant raising
+maxSyncReplicas re-renders the floor atomically.
+*/}}
+{{- define "postgres.autoscaling.effectiveMin" -}}
+{{- /* Read the values directly - values.yaml/schema already default them (min 2,
+       maxSyncReplicas 0). Do NOT wrap in Sprig `default`: it treats a numeric 0 as
+       empty and would silently substitute the fallback, discarding an explicit 0.
+       An out-of-range value flows into max() and is clamped, never swapped. */ -}}
+{{- $min := int .Values.autoscaling.minReplicas -}}
+{{- $floor := add (int .Values.quorum.maxSyncReplicas) 1 -}}
+{{- max $min $floor 2 -}}
+{{- end -}}
+
+{{/*
+Active-path seed for spec.instances = max(.Values.replicas, effectiveMin). This is
+the CONSTANT the chart writes to spec.instances whenever autoscaling is active. Two
+properties matter and both hold:
+  - it never undercuts the quorum/read floor (it is >= effectiveMin), so CNPG admits
+    the Cluster and a fresh enable lands at a valid count;
+  - it equals .Values.replicas whenever replicas has been staged at/above the floor,
+    so the else-branch (dryRun/transition/off, which renders instances: replicas) and
+    this active branch render the SAME value — the client-side patch (previous-vs-new
+    render) is then empty across an enable / dryRun / transition-phase-2 flip and the
+    live count does not dip.
+Seeding effectiveMin alone (an earlier variant) made the two branches differ, so a
+transition phase-2 flip rebased a staged live count down to the bare floor, shedding
+replicas + PVCs the "warm hand-off" was supposed to preserve. Because the seed is a
+constant, each reconcile renders the same value it rendered last time, so under
+client-side apply the patch is empty and KEDA's higher live value written through /scale
+is never reverted — helm-controller patches this CRD from the previous-vs-new rendered
+manifest and does not consult live state (it leaves Helm's threeWayMergeForUnstructured at
+the default). CAVEAT: this no-op holds only while the seed VALUE is unchanged between
+renders; editing replicas / minReplicas / quorum.maxSyncReplicas moves the seed, and the
+two-way patch then resets spec.instances to the new seed in one step (see the values.yaml
+@field notes on those keys). BUT the whole scheme holds only under CLIENT-SIDE apply. The
+platform's helm-controller (v1.5.0) defaults to server-side apply, which force-owns any
+rendered field and reverts it from KEDA's /scale value; so the postgres ApplicationDefinition
+forces client-side apply via release.cozystack.io/helm-server-side-apply: "false" (see the
+db.yaml seed comment + pkg/registry/apps/application/rest.go). An omit-under-active design
+was evaluated and rejected: under SSA the phase-2 handoff prunes spec.instances whenever
+KEDA has not yet written /scale (e.g. a cluster idle at its floor), collapsing it to 1 —
+see community design proposal §Upgrade "Implementation update (2026-09-02)".
+*/}}
+{{- define "postgres.autoscaling.activeSeed" -}}
+{{- $replicas := int .Values.replicas -}}
+{{- $emin := int (include "postgres.autoscaling.effectiveMin" .) -}}
+{{- max $replicas $emin -}}
+{{- end -}}
+
+{{/*
+Effective upper bound = max(maxReplicas, effectiveMin). The scaledobject.yaml render
+guard rejects effectiveMin > maxReplicas before this is read, so in a rendered chart
+effectiveMin <= maxReplicas always and this resolves to maxReplicas. The max() is a
+defense-in-depth backstop that cannot actually engage given that guard (even maxReplicas
+<= 0 is already rejected, since effectiveMin >= 2 > 0); it is kept so effectiveMax can
+never render below a safe quorum should the guard ever be relaxed.
+*/}}
+{{- define "postgres.autoscaling.effectiveMax" -}}
+{{- /* Direct read, not Sprig `default`: an explicit maxReplicas: 0 must clamp up to
+       the floor via max(), not be silently coerced to the fallback 6. */ -}}
+{{- $max := int .Values.autoscaling.maxReplicas -}}
+{{- $emin := int (include "postgres.autoscaling.effectiveMin" .) -}}
+{{- max $max $emin -}}
+{{- end -}}
+
+{{/*
+Prometheus-API address of the tenant's vmselect (shared root vmselect in the
+MVP, scoped by the query's namespace matcher; the per-object address lets a
+tenant with an isolated monitoring stack point elsewhere later).
+*/}}
+{{- define "postgres.autoscaling.serverAddress" -}}
+{{- /* An explicit autoscaling.serverAddress wins; otherwise derive the tenant's
+       shortterm vmselect. The derived address only works where the SAME vmselect holds
+       BOTH cnpg_backends_total (from the CNPG podMonitor) AND kube_pod_labels (from
+       kube-state-metrics) — true for a tenant using the shared root monitoring stack
+       (monitoring: false), where both land in tenant-root. A tenant running its OWN
+       Monitoring app (monitoring: true) has cnpg metrics in its vmselect but NOT
+       kube_pod_labels (KSM lives only in root), so the join is empty there; such a tenant
+       must set autoscaling.serverAddress to a vmselect that carries both series (or use
+       a non-default metricsStorages name), else the query never resolves. */ -}}
+{{- with .Values.autoscaling.serverAddress -}}
+{{- . -}}
+{{- else -}}
+{{- printf "http://vmselect-shortterm.%s.svc:8481/select/0/prometheus" (include "cozy-lib.ns-monitoring" .) -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Read-load metric: Σ(read load over the standby pods) + target, fed to KEDA as an
+AverageValue trigger so stock HPA computes
+desired = ceil((Σ + target) / target) = 1 + ceil(Σ / target) = primaryCount + desiredRead.
+The join restricts the metric to this app's standby pods; the namespace matcher
+scopes it to the tenant. The read load is floored to zero ONLY when replica pods
+exist, so an idle cluster still returns `target` (→ desired 1, clamped up by
+minReplicaCount) while a cluster whose carrying series are absent returns empty
+(fail-safe hold — see the caveat below), instead of an unconditional `or vector(0)`
+that cannot tell no-load from no-series.
+
+Replication-lag brake (postgres.autoscaling.query, when maxReplicationLagSeconds>0):
+while the max standby lag has exceeded the threshold at any point in the cooldown
+window AND the primary is actively writing WAL, the query returns
+`currentInstances * target` instead of `Σ + target`, which pins desired to the
+current instance count and freezes scaling in BOTH directions (safer than pinning
+maxReplicas, which would still allow scale-down under lag). Using max_over_time for
+the lag term is the hysteresis band — the brake holds for the cooldown after a spike
+rather than flapping on a single sample. The write gate (rate over WAL records > 0)
+keeps an idle primary from tripping the brake. Metrics verified live on CNPG 1.30.0:
+cnpg_pg_replication_lag (seconds) and cnpg_collector_wal_records exist and carry
+namespace/pod; the design's cnpg_pg_stat_replication_sent_diff_bytes does not, so
+WAL-record rate is the write signal. The cluster is scoped by joining kube_pod_labels
+on (namespace,pod), same as the read-load term. The exact thresholds/cooldown are
+tuned per the proposal's PoC; the base (no-lag) path is validated live.
+
+Fail-safe (per the design proposal, "must not read a missing sample as zero" / "No
+blind scaling"), SCOPED to the kube-state-metrics pod-label join: the read-load floor is
+GATED on the existence of ANY CNPG instance pod (count(kube_pod_labels{...instance_role
+=~".+"}) > 0), so the query separates two empty cases an unconditional `or vector(0)`
+would conflate:
+  - the cluster has instance pods (running idle, or still provisioning its replicas) but
+    no active read connections -> load 0 -> desired 1 (scale to floor);
+  - NO CNPG pod labels exist at all (a broken KSM pod-label pipeline) -> the floor is
+    WITHHELD, the term stays empty. The cozy-lib helper pins ignoreNullValues=false on the
+    trigger, so KEDA treats an empty result as an error (FailedGetExternalMetric) rather
+    than its default of 0, and the HPA HOLDS the current count. (Without
+    ignoreNullValues=false the empty result would read as 0 -> desired 0 -> clamp to the
+    floor, i.e. a silent scale-DOWN — the exact failure this gate exists to prevent.)
+The gate keys on ANY instance role (not replica-only) precisely so initial provisioning /
+large restore — when the only replica-side pod is CNPG's join Job (jobRole, not
+instanceRole) — floors on the primary and does NOT error; a replica-only gate would
+spuriously trip DatabaseAutoscalerScalerErrors on a healthy basebackup that routinely
+exceeds the alert's 15m window.
+LIMIT: the gate keys on kube_pod_labels, not on the load-metric source. If kube_pod_labels
+is healthy but the load series itself vanishes (cnpg_backends_total unscraped/renamed, or
+container_cpu_usage_seconds_total absent for the CPU metric — a separate cAdvisor
+pipeline), the term still floors to 0 and the cluster drifts down toward the floor
+silently (the query returns a valid 0, so ScalerErrors does not fire). That drift is
+bounded (never below the quorum floor, no collapse) and heavily damped (scaleDown
+stabilization 1800s, 1 pod / 600s); operators should still alert on absent load series
+for autoscaled namespaces. NOTE the opt-in lag brake below (maxReplicationLagSeconds > 0):
+gating the floor on any instance role also keeps its base term non-empty during
+provisioning so it no longer errors there; it stays opt-in / not-live-validated.
+*/}}
+{{- define "postgres.autoscaling.query" -}}
+{{- $ns := .Release.Namespace -}}
+{{- $rel := .Release.Name -}}
+{{- $target := .Values.autoscaling.target -}}
+{{- $joinReplica := printf "* on(namespace,pod) group_left() kube_pod_labels{job=\"kube-state-metrics\",namespace=%q,label_cnpg_io_cluster=%q,label_cnpg_io_instance_role=\"replica\"}" $ns $rel -}}
+{{- /* Read-load term Σ. The floor is GATED on the existence of ANY instance pod
+       (instance_role=~".+", primary OR replica), not replica-only: `or (vector(0) and
+       on() (count(...instance_role=~".+") > 0))` returns 0 whenever the cluster has a
+       labelled CNPG pod (idle or still provisioning -> desired 1), and WITHHOLDS the
+       floor only when NO CNPG pod labels exist at all (a broken KSM pipeline) so the term
+       stays empty (-> KEDA FailedGetExternalMetric -> HPA holds). Gating on replica-only
+       would withhold the floor during initial provisioning/large restore — when the sole
+       replica-side pod is CNPG's join Job (jobRole, not instanceRole) — and, with
+       ignoreNullValues=false, spuriously fire DatabaseAutoscalerScalerErrors on a healthy
+       basebackup that routinely exceeds the alert's 15m window. The primary always exists
+       during provisioning, so gating on any instance role floors correctly there. This is
+       the fail-safe separation of no-load from no-series. */ -}}
+{{- $idleFloor := printf "(vector(0) and on() (count(kube_pod_labels{job=\"kube-state-metrics\",namespace=%q,label_cnpg_io_cluster=%q,label_cnpg_io_instance_role=~\".+\"}) > 0))" $ns $rel -}}
+{{- $load := "" -}}
+{{- if eq .Values.autoscaling.metric "ReadCPUUtilization" -}}
+{{- $load = printf "((sum(rate(container_cpu_usage_seconds_total{namespace=%q,container=\"postgres\"}[5m]) %s) * 1000) or %s)" $ns $joinReplica $idleFloor -}}
+{{- else -}}
+{{- $load = printf "(sum(cnpg_backends_total{namespace=%q,state=\"active\"} %s) or %s)" $ns $joinReplica $idleFloor -}}
+{{- end -}}
+{{- $base := printf "%s + %v" $load $target -}}
+{{- $maxLag := int .Values.autoscaling.maxReplicationLagSeconds -}}
+{{- if le $maxLag 0 -}}
+{{- $base -}}
+{{- else -}}
+{{- /* Cluster-wide join (all instances) for the lag and WAL-write terms. */ -}}
+{{- $joinCluster := printf "* on(namespace,pod) group_left() kube_pod_labels{job=\"kube-state-metrics\",namespace=%q,label_cnpg_io_cluster=%q}" $ns $rel -}}
+{{- $cooldown := "5m" -}}
+{{- /* Each gate is individually floored with `or vector(0)`: if its source series
+       is absent (a CNPG that does not emit cnpg_pg_replication_lag /
+       cnpg_collector_wal_records) the gate resolves to 0 rather than an empty
+       vector. That makes the fail-open decision explicit and per-gate — the brake
+       only engages on positively-observed lag AND writing — instead of leaving it
+       to the emptiness of the product. The brake is a freeze; failing open (scale
+       normally) when a signal is missing is safer than freezing on absent data. */ -}}
+{{- $lagHigh := printf "((max(max_over_time(cnpg_pg_replication_lag{namespace=%q}[%s]) %s) > bool %d) or vector(0))" $ns $cooldown $joinCluster $maxLag -}}
+{{- $writing := printf "((max(rate(cnpg_collector_wal_records{namespace=%q}[5m]) %s) > bool 0) or vector(0))" $ns $joinCluster -}}
+{{- $braking := printf "(%s * %s)" $lagHigh $writing -}}
+{{- /* currentInstances: count only instance pods. Restrict to pods carrying an
+       instance role (label_cnpg_io_instance_role=~".+") like the read-load term
+       above; CNPG stamps cnpg.io/cluster on its bootstrap/join Job pods too (they
+       carry jobRole, not instanceRole), and kube-state-metrics reports them until
+       GC. Without this filter a lingering join Job pod inflates the frozen count
+       while the brake is engaged, nudging desired up instead of holding it. */ -}}
+{{- $frozen := printf "(count(kube_pod_labels{job=\"kube-state-metrics\",namespace=%q,label_cnpg_io_cluster=%q,label_cnpg_io_instance_role=~\".+\"}) * %v)" $ns $rel $target -}}
+{{- /* base when not braking, frozen (= currentInstances * target) when braking.
+       The frozen summand carries a defensive `or vector(0)`, but note it is a no-op
+       given the surrounding expression, NOT a floor that ever changes the result: the
+       frozen count selects the SAME kube_pod_labels{...instance_role=~".+"} series as the
+       idle-floor gate in $load, and $base's own load term joins on kube_pod_labels too, so
+       within one evaluation base and frozen are empty or non-empty TOGETHER. When base is
+       non-empty frozen is non-empty (the `or vector(0)` is unused); when base is empty
+       (broken KSM pod-label pipeline) frozen is empty and base*(1-braking) is already
+       empty, so the sum is empty either way (→ ignoreNullValues=false → KEDA
+       FailedGetExternalMetric → HPA holds — the intended fail-safe). It is kept only as an
+       explicit belt-and-braces marker; there is no reachable state where base is non-empty
+       while the frozen count is empty (base cannot outlive the kube_pod_labels it joins on). */ -}}
+{{- printf "(%s) * (1 - %s) + ((%s * %s) or vector(0))" $base $braking $frozen $braking -}}
+{{- end -}}
+{{- end -}}
diff --git a/packages/apps/postgres/templates/_extensions.tpl b/packages/apps/postgres/templates/_extensions.tpl
new file mode 100644
index 0000000000..b37ad869ef
--- /dev/null
+++ b/packages/apps/postgres/templates/_extensions.tpl
@@ -0,0 +1,16 @@
+{{/*
+  The name CREATE EXTENSION resolves for a databases.<db>.extensions entry, before
+  it is quoted. Charts that rendered the value unquoted made a hyphenated extension
+  reachable only by writing its quotes into the value ('"uuid-ossp"'), so one
+  surrounding pair is the identifier's own quoting: it is removed and, as a quoted
+  identifier, keeps its case. An unquoted name is folded to lowercase, the way
+  PostgreSQL resolved it unquoted (PostGIS to postgis). The charset guard in
+  init-script.yaml checks this result, so a quote inside the pair still fails it.
+*/}}
+{{- define "postgres.extensionName" -}}
+{{- if regexMatch "^\".+\"$" . -}}
+{{- trimSuffix "\"" (trimPrefix "\"" .) -}}
+{{- else -}}
+{{- lower . -}}
+{{- end -}}
+{{- end -}}
diff --git a/packages/apps/postgres/templates/_tls.tpl b/packages/apps/postgres/templates/_tls.tpl
index ebbf645e5f..3b870c0f8f 100644
--- a/packages/apps/postgres/templates/_tls.tpl
+++ b/packages/apps/postgres/templates/_tls.tpl
@@ -15,3 +15,16 @@ Tri-state semantics:
   {{- .Values.tls.enabled | toString -}}
 {{- end -}}
 {{- end -}}
+
+{{/*
+postgres.tls.required resolves the tri-state tls.required field to "true" or
+"false". Unset follows external, so an externally published instance refuses
+plaintext sessions by default. Set explicitly, it wins in either direction.
+*/}}
+{{- define "postgres.tls.required" -}}
+{{- if kindIs "invalid" .Values.tls.required -}}
+  {{- .Values.external | default false | toString -}}
+{{- else -}}
+  {{- .Values.tls.required | toString -}}
+{{- end -}}
+{{- end -}}
diff --git a/packages/apps/postgres/templates/_versions.tpl b/packages/apps/postgres/templates/_versions.tpl
index ca0ff2a276..b7cdb8c133 100644
--- a/packages/apps/postgres/templates/_versions.tpl
+++ b/packages/apps/postgres/templates/_versions.tpl
@@ -6,3 +6,58 @@
 {{- index $versionMap .Values.version }}
 {{- end }}
 
+{{- define "postgres.postgisVersionMap" }}
+{{- $versionMap := .Files.Get "files/postgis-versions.yaml" | fromYaml }}
+{{- if not (hasKey $versionMap .Values.version) }}
+    {{- printf `PostgreSQL version %s is not supported by the postgis flavor, allowed versions are %s` $.Values.version (keys $versionMap | sortAlpha) | fail }}
+{{- end }}
+{{- index $versionMap .Values.version }}
+{{- end }}
+
+{{/*
+  Single source for the operand image: the init Job runs psql against the
+  Cluster, so both must resolve the same image.
+*/}}
+{{- define "postgres.imageName" -}}
+{{- if eq (default "postgresql" .Values.flavor) "postgis" -}}
+ghcr.io/cloudnative-pg/postgis:{{ include "postgres.postgisVersionMap" . | trim }}
+{{- else -}}
+ghcr.io/cloudnative-pg/postgresql:{{ include "postgres.versionMap" . | trim | trimPrefix "v" }}
+{{- end -}}
+{{- end -}}
+
+{{/*
+  The flavor is fixed at bootstrap. The two image families are built on
+  different Debian releases, so moving a live cluster from one to the other
+  swaps glibc under an initialised data directory and silently invalidates
+  every index on collatable text; the postgis-to-postgresql direction also
+  drops the shared libraries behind every PostGIS object. CNPG would roll
+  either change out as an ordinary image update, so refuse it here, before
+  the Cluster is patched. Only the image name is compared: a minor bump or
+  a registry mirror rewriting the host must keep passing.
+
+  A physical recovery carries the same data directory across, so it is held
+  to the same rule. With no live Cluster of its own yet, the release is
+  checked against its recovery source while that Cluster still exists; once
+  the source is gone the chart has nothing to compare against, and the
+  backup-controller's RestoreJob, which records the flavor on every Backup,
+  is the path that enforces it.
+*/}}
+{{- define "postgres.flavorGuard" -}}
+{{- $wantName := regexReplaceAll "[:@].*$" (last (splitList "/" (include "postgres.imageName" .))) "" -}}
+{{- $live := lookup "postgresql.cnpg.io/v1" "Cluster" .Release.Namespace .Release.Name -}}
+{{- if and $live $live.spec $live.spec.imageName -}}
+{{- $liveName := regexReplaceAll "[:@].*$" (last (splitList "/" $live.spec.imageName)) "" -}}
+{{- if ne $liveName $wantName -}}
+{{- fail (printf "postgres: flavor cannot change on an existing cluster (running %s, requested %s). The image families use different glibc versions, which would corrupt text indexes. Create a new Postgres with the wanted flavor and move the data with a logical dump (pg_dump / pg_restore); restoring a backup keeps the flavor it was taken from." $liveName $wantName) -}}
+{{- end -}}
+{{- else if and .Values.bootstrap.enabled .Values.bootstrap.oldName -}}
+{{- $source := lookup "postgresql.cnpg.io/v1" "Cluster" .Release.Namespace .Values.bootstrap.oldName -}}
+{{- if and $source $source.spec $source.spec.imageName -}}
+{{- $sourceName := regexReplaceAll "[:@].*$" (last (splitList "/" $source.spec.imageName)) "" -}}
+{{- if ne $sourceName $wantName -}}
+{{- fail (printf "postgres: cannot recover a %s backup of %s into the %s flavor. A physical restore keeps the source's glibc and libraries, which would corrupt text indexes. Set flavor to match the source, or create the new Postgres empty and move the data with a logical dump (pg_dump / pg_restore)." $sourceName .Values.bootstrap.oldName $wantName) -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
diff --git a/packages/apps/postgres/templates/backup-secret.yaml b/packages/apps/postgres/templates/backup-secret.yaml
index 593af5cac7..77cabcce20 100644
--- a/packages/apps/postgres/templates/backup-secret.yaml
+++ b/packages/apps/postgres/templates/backup-secret.yaml
@@ -3,15 +3,16 @@
   external Secret via backup.s3CredentialsSecret.name AND the tenant has
   not opted in to the platform-managed flow via backup.useSystemBucket.
   When useSystemBucket=true, cozy-backups-creds is projected into the
-  namespace by the backupstrategy-controller; the chart references it
-  directly from spec.backup.barmanObjectStore.
+  namespace by the backupstrategy-controller and referenced from the
+  barman-cloud ObjectStore's spec.configuration.s3Credentials that the
+  CNPG driver SSA-applies.
 
   Empty access/secret values short-circuit the chart-emitted Secret too:
   the previous behaviour materialised the literal "<your-access-key>"
   placeholder into the tenant namespace whenever backup.enabled=true was
-  set without real coordinates, which spammed Barman's archive_command
-  with junk credentials. Tenants that need the legacy flow must set both
-  values explicitly; everyone else gets the platform flow.
+  set without real coordinates, which spammed the barman-cloud plugin's
+  WAL archiving with junk credentials. Tenants that need the legacy flow
+  must set both values explicitly; everyone else gets the platform flow.
 */}}
 {{- $credCfg := default (dict) .Values.backup.s3CredentialsSecret }}
 {{- $hasInlineCreds := and (ne (default "" .Values.backup.s3AccessKey) "") (ne (default "" .Values.backup.s3SecretKey) "") }}
diff --git a/packages/apps/postgres/templates/backup.yaml b/packages/apps/postgres/templates/backup.yaml
index bc631cbc33..aa1d888e36 100644
--- a/packages/apps/postgres/templates/backup.yaml
+++ b/packages/apps/postgres/templates/backup.yaml
@@ -8,19 +8,21 @@
 
   Gating: rendered only when both `backup.enabled` and `backup.schedule`
   are non-empty. `backup.enabled=true` alone is the documented way to
-  bootstrap `archive_command` on the source cluster (the BackupClass
-  driver SSA-merges spec.backup.barmanObjectStore with ForceOwnership);
-  leaving `backup.schedule=""` lets users opt into archive without also
-  getting a chart-emitted ScheduledBackup that competes with their
-  BackupClass policy. CNPG admission rejects an empty `schedule` field,
-  so the gate keeps invalid manifests from reaching the cluster.
+  bootstrap WAL archiving on the source cluster (the BackupClass driver
+  SSA-applies the barman-cloud ObjectStore and SSA-patches spec.plugins
+  with ForceOwnership); leaving `backup.schedule=""` lets users opt into
+  archive without also getting a chart-emitted ScheduledBackup that
+  competes with their BackupClass policy. CNPG admission rejects an empty
+  `schedule` field, so the gate keeps invalid manifests from reaching the
+  cluster.
 
   Also excluded when `backup.useSystemBucket=true`: in that flow the
-  Cluster's `spec.backup.barmanObjectStore` is intentionally left unset
-  until the BackupClass driver SSA-patches it at first BackupJob time, so
-  a chart-emitted ScheduledBackup would fire against a Cluster with no
-  backup configuration and fail. This mirrors the ClickHouse
-  `useSystemBucket` gates on the chart-managed backup resources.
+  Cluster's `spec.plugins` (and its barman-cloud ObjectStore) are
+  intentionally left unset until the BackupClass driver SSA-applies them
+  at first BackupJob time, so a chart-emitted ScheduledBackup would fire
+  against a Cluster with no backup configuration and fail. This mirrors
+  the ClickHouse `useSystemBucket` gates on the chart-managed backup
+  resources.
 */}}
 {{- if and .Values.backup.enabled .Values.backup.schedule (not .Values.backup.useSystemBucket) }}
 ---
@@ -31,6 +33,9 @@ metadata:
 spec:
   schedule: {{ .Values.backup.schedule | quote }}
   backupOwnerReference: self
+  method: plugin
+  pluginConfiguration:
+    name: barman-cloud.cloudnative-pg.io
   cluster:
     name: {{ .Release.Name }}
 {{- end }}
diff --git a/packages/apps/postgres/templates/db.yaml b/packages/apps/postgres/templates/db.yaml
index 4e0b468194..c087037b96 100644
--- a/packages/apps/postgres/templates/db.yaml
+++ b/packages/apps/postgres/templates/db.yaml
@@ -1,28 +1,93 @@
 {{- $tlsEnabled := (include "postgres.tls.enabled" .) | eq "true" -}}
+{{- $tlsRequired := (include "postgres.tls.required" .) | eq "true" -}}
+{{- $autoscaling := (include "postgres.autoscaling.active" .) | eq "true" -}}
 ---
 apiVersion: postgresql.cnpg.io/v1
 kind: Cluster
 metadata:
   name: {{ .Release.Name }}
+  {{- with .Values.bootstrap.newServerName }}
+  {{- /* Rendered whether or not the barman plugin is: the CNPG restore driver
+         reads it to tell the Cluster its own restore produced from one rendered
+         for an earlier restore. */}}
+  annotations:
+    postgres.cozystack.io/restored-server-name: {{ . | quote }}
+  {{- end }}
 spec:
+  {{- if $autoscaling }}
+  {{- /* Under active autoscaling KEDA owns the runtime count via the /scale
+         subresource. The chart SEEDS spec.instances at a constant = max(replicas,
+         effectiveMin) (postgres.autoscaling.activeSeed) rather than omitting it, for
+         three reasons: (1) with synchronous quorum an omitted field defaults to 1 and
+         CNPG's webhook rejects "maxSyncReplicas must be lower than the number of
+         instances"; (2) omitting it on an EXISTING cluster's enable/upgrade makes
+         three-way merge delete the field, CNPG re-defaults to 1, and every replica +
+         its PVC is decommissioned before KEDA re-clones (hours with no read replicas);
+         (3) seeding effectiveMin ALONE differs from the else-branch (instances:
+         replicas), so a dryRun/transition flip would rebase a staged live count down to
+         the bare floor. Seeding max(replicas, effectiveMin) equals the else-branch value
+         whenever replicas is staged at/above the floor, so those flips render the same
+         value and the live count does not dip; it still never undercuts the quorum floor.
+         Because the seed is constant, each reconcile renders the value it rendered last
+         time, so the client-side patch is empty and never reverts KEDA's higher live
+         value. This holds ONLY under client-side apply, where helm-controller patches
+         this CRD from the previous-vs-new rendered manifest and does not consult live
+         state (it leaves Helm's threeWayMergeForUnstructured at the default): the
+         platform's helm-controller (v1.5.0) defaults to SERVER-SIDE
+         apply, which force-owns every rendered field and would revert spec.instances from
+         KEDA's live /scale value on every reconcile. (Editing replicas / minReplicas /
+         quorum.maxSyncReplicas moves the constant, so that one reconcile DOES patch
+         spec.instances to the new seed — a documented floor-change caveat, see values.yaml.)
+         The postgres ApplicationDefinition
+         therefore forces client-side apply via the annotation
+         release.cozystack.io/helm-server-side-apply: "false"
+         (packages/system/postgres-rd/cozyrds/postgres.yaml), threaded onto the tenant
+         HelmRelease's Install/Upgrade.ServerSideApply in
+         pkg/registry/apps/application/rest.go (convertApplicationToHelmRelease) and
+         guarded by TestConvertApplicationToHelmRelease_ServerSideApplyOverride.
+         (Go-template comment, stripped at render.) */}}
+  instances: {{ include "postgres.autoscaling.activeSeed" . }}
+  {{- else }}
+  {{- /* Static-count path (autoscaling off / dryRun / transition), which renders
+         instances: <replicas>. CNPG's webhook rejects the Cluster if maxSyncReplicas
+         >= instances; guard the DISABLE case in particular, where an autoscaled +
+         sync-quorum cluster runs with instances seeded from effectiveMin while
+         replicas may sit at its default, so a naive disable would render an invalid
+         count and wedge the HelmRelease. Fail closed with an actionable message.
+         (Stripped at render.) */}}
+  {{- if le (int .Values.replicas) (int .Values.quorum.maxSyncReplicas) }}
+  {{- fail (printf "postgres: replicas (%d) must be greater than quorum.maxSyncReplicas (%d) - CNPG rejects a Cluster whose maxSyncReplicas is not lower than its instance count. Raise replicas above maxSyncReplicas. (If you are disabling autoscaling on a synchronous-quorum cluster, first set replicas to at least the live instance count: kubectl scale cluster.postgresql.cnpg.io/%s --replicas=<live count>, with the HelmRelease suspended.)" (int .Values.replicas) (int .Values.quorum.maxSyncReplicas) .Release.Name) }}
+  {{- end }}
   instances: {{ .Values.replicas }}
+  {{- end }}
   {{- if and $tlsEnabled .Values.external }}
   # Operator-managed TLS. CNPG auto-generates its own self-signed CA and signs
   # server + client + replication certs from it. The operator's default SAN list
   # already covers the three built-in services (rw/r/ro) in four DNS forms each
-  # (bare, .ns, .ns.svc, .ns.svc.<cluster-domain>); only the external hostname
-  # needs to be appended via serverAltDNSNames.
+  # (bare, .ns, .ns.svc, .ns.svc.<cluster-domain>); only the external hostnames
+  # need to be appended via serverAltDNSNames.
   #
   # serverAltDNSNames is mutually exclusive with serverTLSSecret per the CNPG
   # admission webhook, which is why the chart no longer renders a cert-manager
   # chain — the operator owns the chain end-to-end.
   #
-  # Trust anchor for clients: the ca.crt key present in every user-credentials
-  # Secret CNPG creates (e.g. <release>-credentials). Mount that key into
-  # client pods to verify TLS.
+  # Trust anchor for clients: the key-free "<release>.tenant-ca" Secret the CA
+  # extraction controller publishes, as declared by the sentinel in
+  # templates/tenant-projection.yaml. Tenants read that Secret through the
+  # core.cozystack.io tenantsecrets API. It is neither <release>-credentials,
+  # which is chart-rendered and holds user passwords only, nor CNPG's
+  # <release>-ca, which holds the CA private key next to ca.crt.
+  #
+  # The second name is the per-engine one, meant for SNI routing through a
+  # TLS-passthrough listener on the tenant Gateway (*.postgres.<apex>). Both
+  # are issued so that a later move between the two hostname schemes reissues
+  # no certificate and changes no client's trust anchor; clients still change
+  # the host they dial.
+  {{- $apex := include "cozy-lib.ns-host-required" . }}
   certificates:
     serverAltDNSNames:
-      - {{ printf "%s.%s" .Release.Name .Values._namespace.host }}
+      - {{ printf "%s.%s" .Release.Name $apex }}
+      - {{ printf "%s.postgres.%s" .Release.Name $apex }}
   {{- end }}
   {{/*
     s3Credentials points at the operator-supplied Secret when
@@ -35,22 +100,28 @@ spec:
   {{- $credSecretName := $credCfg.name | default (printf "%s-s3-creds" .Release.Name) }}
   {{/*
     Platform-managed default flow (useSystemBucket=true):
-      - The chart does NOT render spec.backup.barmanObjectStore. The
-        backup-controller's CNPG driver SSA-patches the live Cluster
-        with destinationPath/endpointURL/credentials at first BackupJob
-        time using field manager "cozystack-cnpg-backup-driver" with
-        ForceOwnership (see internal/backupcontroller/cnpgstrategy_controller.go
-        applyClusterBarmanObjectStore). SSA semantics mean the chart's
-        Helm field manager never owns spec.backup, so a subsequent Flux
-        re-render of this chart leaves the driver's patch intact — no
-        tug-of-war on the live Cluster.
+      - The chart does NOT render spec.plugins or the barman-cloud
+        ObjectStore. The backup-controller's CNPG driver SSA-applies a
+        barmancloud.cnpg.io ObjectStore (carrying destinationPath/
+        endpointURL/credentials) and SSA-patches the live Cluster's
+        spec.plugins to reference it at first BackupJob time, using field
+        manager "cozystack-cnpg-backup-driver" with ForceOwnership (see
+        internal/backupcontroller/cnpgstrategy_controller.go
+        applyClusterPluginBackup). The postgres HelmRelease is applied
+        CLIENT-SIDE (release.cozystack.io/helm-server-side-apply: "false",
+        for the autoscaler seed invariant), and Helm's client-side patch
+        only diffs fields the chart RENDERS (previous-vs-new manifest);
+        since the chart never renders spec.plugins under useSystemBucket, a
+        subsequent Flux re-render leaves the driver's SSA+ForceOwnership
+        patch intact — no tug-of-war on the live Cluster (the two apply on
+        disjoint field sets).
         Coordinates come from a single backupStorage values block in
         the backupstrategy-controller chart. This eliminates the
         endpoint-duplication failure mode (an operator switching the
         platform endpoint would otherwise have to update both the
         backupstrategy-controller and this chart).
-      - Consequence: archive_command is not active until the first
-        BackupJob has run. WAL accumulates on the local PVC in the
+      - Consequence: WAL archiving via the plugin is not active until the
+        first BackupJob has run. WAL accumulates on the local PVC in the
         meantime — fine for small / fresh clusters, but admins of large
         Postgres releases switching mid-flight should run an ad-hoc
         BackupJob immediately after enabling the flag.
@@ -76,52 +147,55 @@ spec:
   {{- $credSecretKey = $credCfg.secretAccessKeyKey | default "AWS_SECRET_ACCESS_KEY" }}
   {{- end }}
   {{/*
-    endpointCA references a Secret carrying the CA bundle Barman should
-    trust. Required when the S3 endpoint serves a self-signed certificate
-    (the cozystack default seaweedfs-s3 ingress qualifies). The same
-    reference flows into both spec.backup.barmanObjectStore.endpointCA and
-    spec.externalClusters[].barmanObjectStore.endpointCA so backup *and*
-    recovery can verify TLS - missing it on the externalClusters side made
-    bootstrap.recovery panic in CNPG's instance-manager.
+    endpointCA references a Secret carrying the CA bundle the barman-cloud
+    plugin should trust. Required when the S3 endpoint serves a self-signed
+    certificate (the cozystack default seaweedfs-s3 ingress qualifies). The
+    same reference flows into both the backup ObjectStore's
+    spec.configuration.endpointCA and the recovery ObjectStore's
+    spec.configuration.endpointCA (referenced from externalClusters[].plugin)
+    so backup *and* recovery can verify TLS - missing it on the recovery
+    side made bootstrap.recovery panic in CNPG's instance-manager.
   */}}
   {{- $caCfg := default (dict) .Values.backup.endpointCA }}
   {{- $caKey := $caCfg.key | default "ca.crt" }}
   {{/*
-    barmanObjectStore is chart-rendered only when the legacy path has
+    The barman-cloud plugin is chart-wired only when the legacy path has
     real coordinates:
       - backup.enabled=true AND
       - useSystemBucket=false (platform flow lets the CNPG driver SSA-
-        patch the live Cluster instead) AND
+        patch spec.plugins + the ObjectStore instead) AND
       - destinationPath is non-empty AND either an inline access/secret
         pair is supplied OR an external Secret reference (s3Credentials-
         Secret.name) is set.
     Anything short of that means the user has enabled backup but not yet
-    supplied S3 coordinates — rendering a half-empty barmanObjectStore
-    would just feed CNPG a broken archive_command. Tenants opting into
-    `useSystemBucket: true` keep barmanObjectStore unset until the
+    supplied S3 coordinates — wiring the plugin against a half-empty
+    ObjectStore would just feed CNPG a broken archive_command. Tenants
+    opting into `useSystemBucket: true` keep spec.plugins unset until the
     backup-controller's CNPG driver SSA-patches it on the first BackupJob.
+
+    The S3/barman settings live in the barmancloud.cnpg.io/ObjectStore CR
+    rendered at the bottom of this file (named after the release); the
+    Cluster only references it by name. Native spec.backup.barmanObjectStore
+    is deprecated in CNPG 1.27 and removed in 1.29. The bare (system-flavor)
+    image tags this chart pins still ship the barman-cloud-* binaries the
+    native path needs (unlike the `standard` variant keycloak-db pins), but
+    the system flavor is deprecated upstream, so this chart moves to the
+    plugin as well.
   */}}
   {{- $hasInlineCreds := and (ne (default "" .Values.backup.s3AccessKey) "") (ne (default "" .Values.backup.s3SecretKey) "") }}
   {{- $hasLegacyCreds := or $hasInlineCreds (ne (default "" $credCfg.name) "") }}
   {{- $renderBarman := and .Values.backup.enabled (not .Values.backup.useSystemBucket) (ne $destinationPath "") $hasLegacyCreds }}
   {{- if $renderBarman }}
-  backup:
-    barmanObjectStore:
-      destinationPath: {{ $destinationPath }}
-      endpointURL: {{ $endpointURL }}
-      {{- if $caCfg.name }}
-      endpointCA:
-        name: {{ $caCfg.name }}
-        key: {{ $caKey }}
-      {{- end }}
-      s3Credentials:
-        accessKeyId:
-          name: {{ $credSecretName }}
-          key: {{ $credAccessKey }}
-        secretAccessKey:
-          name: {{ $credSecretName }}
-          key: {{ $credSecretKey }}
-    retentionPolicy: {{ .Values.backup.retentionPolicy }}
+  plugins:
+    - name: barman-cloud.cloudnative-pg.io
+      isWALArchiver: true
+      parameters:
+        barmanObjectName: {{ .Release.Name }}
+        # Pin the WAL-archive S3 prefix explicitly (the plugin would default it
+        # to the Cluster name anyway); the driver preserves it on a live cluster.
+        # On restore bootstrap.newServerName overrides it with a fresh prefix, so
+        # the re-bootstrapped cluster does not archive onto the recovery source.
+        serverName: {{ .Values.bootstrap.newServerName | default .Release.Name }}
   {{- end }}
 
   {{/*
@@ -163,35 +237,35 @@ spec:
   bootstrap:
     recovery:
       source: {{ .Values.bootstrap.oldName }}
-      {{- if .Values.bootstrap.recoveryTime }}
+      {{- if or .Values.bootstrap.recoveryTime .Values.bootstrap.backupID }}
       recoveryTarget:
-        targetTime: {{ .Values.bootstrap.recoveryTime }}
+        {{- with .Values.bootstrap.backupID }}
+        backupID: {{ . | quote }}
+        {{- end }}
+        {{- with .Values.bootstrap.recoveryTime }}
+        targetTime: {{ . }}
+        {{- end }}
       {{- end }}
   externalClusters:
     - name: {{ .Values.bootstrap.oldName }}
-      barmanObjectStore:
-        destinationPath: {{ .Values.backup.destinationPath }}
-        {{- if .Values.bootstrap.serverName }}
-        serverName: {{ .Values.bootstrap.serverName }}
-        {{- end }}
-        endpointURL: {{ .Values.backup.endpointURL }}
-        {{- if $caCfg.name }}
-        endpointCA:
-          name: {{ $caCfg.name }}
-          key: {{ $caKey }}
-        {{- end }}
-        s3Credentials:
-          accessKeyId:
-            name: {{ $credSecretName }}
-            key: {{ $credAccessKey }}
-          secretAccessKey:
-            name: {{ $credSecretName }}
-            key: {{ $credSecretKey }}
+      plugin:
+        name: barman-cloud.cloudnative-pg.io
+        parameters:
+          # References the recovery ObjectStore rendered at the bottom of this
+          # file, which carries the source cluster's S3 coordinates. serverName
+          # (the source's S3 path prefix) rides on the plugin parameter, not the
+          # ObjectStore (the plugin forbids serverName there). It must always be
+          # set: the native path defaulted an absent serverName to the external
+          # cluster's NAME (= oldName), but the plugin defaults it to the NEW
+          # cluster's name — which would read the wrong S3 prefix on restore.
+          barmanObjectName: {{ .Release.Name }}-recovery
+          serverName: {{ .Values.bootstrap.serverName | default .Values.bootstrap.oldName }}
   {{- end }}
 
   resources: {{- include "cozy-lib.resources.defaultingSanitize" (list .Values.resourcesPreset .Values.resources $) | nindent 4 }}
 
-  imageName: ghcr.io/cloudnative-pg/postgresql:{{ include "postgres.versionMap" $ | trimPrefix "v" }}
+  {{- include "postgres.flavorGuard" $ }}
+  imageName: {{ include "postgres.imageName" $ }}
   enableSuperuserAccess: true
   {{- if .Values._cluster.scheduling }}
   {{- $rawConstraints := get .Values._cluster.scheduling "globalAppTopologySpreadConstraints" }}
@@ -203,8 +277,86 @@ spec:
   {{- end }}
   {{- end }}
   postgresql:
+    {{- if $tlsRequired }}
+    {{- /*
+      CloudNativePG offers TLS (ssl=on) but its built-in last rule, host all all
+      all, also accepts plaintext, so a client choosing sslmode=disable gets an
+      unencrypted session. User rules go after the operator's fixed rules
+      (local peer, streaming_replica cert) and before that default rule, and the
+      first match wins, so these two lines make remote sessions TLS-only.
+      https://cloudnative-pg.io/documentation/current/postgresql_conf/#the-pg_hba-section
+    */}}
+    {{- /*
+      Same password method as CloudNativePG's own default rule: md5 before
+      PostgreSQL 14 (where password_encryption defaults to md5, and md5 also
+      accepts SCRAM verifiers), scram-sha-256 from 14 on.
+      pkg/management/postgres/configuration.go in cloudnative-pg.
+    */}}
+    {{- $pgMajor := trimPrefix "v" .Values.version | atoi }}
+    {{- $authMethod := ternary "md5" "scram-sha-256" (lt $pgMajor 14) }}
+    {{- /*
+      With ssl turned off, hostssl never matches and the reject rule would refuse
+      every remote session; stop with an actionable error instead.
+    */}}
+    {{- $sslParam := "" }}
+    {{- if and .Values.postgresql .Values.postgresql.parameters }}
+    {{- $sslParam = toString (dig "ssl" "" .Values.postgresql.parameters) | lower }}
+    {{- end }}
+    {{- if has $sslParam (list "off" "false" "0" "no") }}
+    {{- fail "postgresql.parameters.ssl is off while tls.required is in effect (external: true or tls.required: true): enable ssl or set tls.required: false" }}
+    {{- end }}
+    pg_hba:
+      - hostssl all all all {{ $authMethod }}
+      - host all all all reject
+    {{- end }}
+    {{- /*
+      Preloading is exposed as a closed allowlist rather than through the blocked
+      shared_preload_libraries parameter. The parameter is free text and accepts a
+      path, so it can point at a writable location; a bare name from this list can
+      only resolve inside $libdir, which lives on the read-only image filesystem.
+      The names below all ship with the CloudNativePG PostgreSQL image. The enum in
+      values.schema.json is the primary guard; this check backs it up for renders
+      that bypass schema validation. helm-unittest cannot reach it, since the schema
+      rejects first, so hack/check-postgres-preload-allowlist.bats pins it instead.
+    */ -}}
+    {{- with .Values.postgresql.sharedPreloadLibraries }}
+    {{- $allowedPreload := list "pg_stat_statements" "auto_explain" "pgaudit" "pg_prewarm" }}
+    shared_preload_libraries:
+      {{- range . }}
+      {{- if not (has . $allowedPreload) }}
+      {{- fail (printf "SECURITY: shared preload library %q is not allowed. Allowed: %s. Loading a library from an arbitrary path enables code execution inside the instance." . (join ", " $allowedPreload)) }}
+      {{- end }}
+      - {{ quote . }}
+      {{- end }}
+    {{- end }}
     parameters:
       {{- $defaults := dict "max_wal_senders" "30" }}
+      {{- /*
+        PostgreSQL sizes shared_buffers at 128MB whatever the container gets.
+        The pool is shared memory, which the kernel cannot reclaim without
+        swap, so every page that fills stays charged against the memory limit.
+        A full pool is the whole limit on t1.nano and half of it on t1.micro,
+        the default preset. A small or idle database never fills it, but a
+        dump, index scans over a large table or a replica catching up after a
+        failover can, and then the OOM killer takes the instance. Below 512Mi
+        the default is therefore a quarter of the memory limit with a 16MB
+        floor, capped at the memory request: CloudNativePG rejects a Cluster
+        whose shared_buffers exceeds that request. From 512Mi up a quarter
+        is at least 128MB, so nothing is
+        rendered and PostgreSQL keeps its own default as before. An explicit
+        shared_buffers in postgresql.parameters still wins. The limit is read
+        through the same cozy-lib helper that fills spec.resources, so presets
+        and resources overrides resolve exactly as they do there.
+      */}}
+      {{- $resources := include "cozy-lib.resources.defaultingSanitize" (list .Values.resourcesPreset .Values.resources $) | fromYaml }}
+      {{- with $resources.limits.memory }}
+      {{- /* 4194304 is 4Mi, so bytes divided by it is a quarter of the limit in MiB. PostgreSQL reads MB as MiB. */}}
+      {{- $quarterMi := div (include "cozy-lib.resources.toFloat" . | float64 | int64) 4194304 }}
+      {{- if lt $quarterMi 128 }}
+      {{- $requestMi := div (include "cozy-lib.resources.toFloat" $resources.requests.memory | float64 | int64) 1048576 }}
+      {{- $_ := set $defaults "shared_buffers" (printf "%dMB" (min $requestMi (max 16 $quarterMi))) }}
+      {{- end }}
+      {{- end }}
       {{- $params := merge (dict) .Values.postgresql.parameters $defaults }}
       {{- /* Security: Block parameters that enable arbitrary code execution (shell commands or .so loading) */ -}}
       {{- $dangerousParams := list "archive_command" "restore_command" "ssl_passphrase_command" "archive_cleanup_command" "recovery_end_command" "dynamic_library_path" "local_preload_libraries" "session_preload_libraries" "shared_preload_libraries" }}
@@ -241,7 +393,20 @@ metadata:
   labels:
     workloads.cozystack.io/resource-preset: {{ .Values.resourcesPreset | quote }}
 spec:
-  replicas: {{ .Values.replicas }}
+  {{- /* Under active autoscaling the desired-replica count is set to the quorum FLOOR
+         (effectiveMin), NOT the seeded spec.instances (activeSeed = max(replicas,
+         effectiveMin)) and not KEDA's live autoscaled target: the seed is only the
+         starting count, KEDA owns the runtime count via /scale and legitimately idles the
+         cluster DOWN to effectiveMin under low load. NOTE the health decision does not
+         actually read this field today — WorkloadMonitorReconciler gates Status.Operational
+         solely on availableReplicas < minReplicas (below), so with minReplicas: 1 an idle
+         autoscaled cluster never false-alarms regardless of what replicas says. replicas is
+         the declared desired target (see the field doc: "desired number of replicas");
+         pinning it to effectiveMin keeps that target honest — the floor KEDA never goes
+         below, so should a future reconciler compare desired vs observed it still holds
+         actual >= desired, rather than false-flagging every idle-to-floor as the live
+         count (or the >floor seed) would. */}}
+  replicas: {{ if $autoscaling }}{{ include "postgres.autoscaling.effectiveMin" . }}{{ else }}{{ .Values.replicas }}{{ end }}
   minReplicas: 1
   kind: postgres
   type: postgres
@@ -249,3 +414,66 @@ spec:
     app.kubernetes.io/name: postgres.apps.cozystack.io
     app.kubernetes.io/instance: {{ $.Release.Name }}
   version: {{ $.Chart.Version }}
+{{- if $renderBarman }}
+---
+# Backup ObjectStore for the barman-cloud plugin. Carries the S3/barman
+# settings the deprecated spec.backup.barmanObjectStore used to hold; the
+# Cluster references it by name via spec.plugins above. serverName is
+# intentionally omitted (the plugin forbids it here and defaults it to the
+# cluster name, preserving the s3://.../<cluster>/ layout).
+apiVersion: barmancloud.cnpg.io/v1
+kind: ObjectStore
+metadata:
+  name: {{ .Release.Name }}
+spec:
+  {{- if .Values.backup.retentionPolicy }}
+  retentionPolicy: {{ .Values.backup.retentionPolicy | quote }}
+  {{- end }}
+  # Size the barman-cloud sidecar explicitly instead of inheriting the tenant
+  # LimitRange default of 128Mi, and pin its S3 request checksum (rationale in
+  # cozy-lib.barman.sidecarConfiguration).
+  {{- include "cozy-lib.barman.sidecarConfiguration" . | nindent 2 }}
+  configuration:
+    destinationPath: {{ $destinationPath }}
+    endpointURL: {{ $endpointURL }}
+    {{- if $caCfg.name }}
+    endpointCA:
+      name: {{ $caCfg.name }}
+      key: {{ $caKey }}
+    {{- end }}
+    s3Credentials:
+      accessKeyId:
+        name: {{ $credSecretName }}
+        key: {{ $credAccessKey }}
+      secretAccessKey:
+        name: {{ $credSecretName }}
+        key: {{ $credSecretKey }}
+{{- end }}
+{{- if .Values.bootstrap.enabled }}
+---
+# Recovery ObjectStore for bootstrap. Points at the source cluster's S3
+# coordinates; referenced from externalClusters[].plugin above. serverName
+# rides on that plugin parameter, not here.
+apiVersion: barmancloud.cnpg.io/v1
+kind: ObjectStore
+metadata:
+  name: {{ .Release.Name }}-recovery
+spec:
+  # Same sidecar configuration as the backup ObjectStore above.
+  {{- include "cozy-lib.barman.sidecarConfiguration" . | nindent 2 }}
+  configuration:
+    destinationPath: {{ $destinationPath }}
+    endpointURL: {{ $endpointURL }}
+    {{- if $caCfg.name }}
+    endpointCA:
+      name: {{ $caCfg.name }}
+      key: {{ $caKey }}
+    {{- end }}
+    s3Credentials:
+      accessKeyId:
+        name: {{ $credSecretName }}
+        key: {{ $credAccessKey }}
+      secretAccessKey:
+        name: {{ $credSecretName }}
+        key: {{ $credSecretKey }}
+{{- end }}
diff --git a/packages/apps/postgres/templates/init-job.yaml b/packages/apps/postgres/templates/init-job.yaml
index 85b56096d2..31eb67ff3f 100644
--- a/packages/apps/postgres/templates/init-job.yaml
+++ b/packages/apps/postgres/templates/init-job.yaml
@@ -1,8 +1,10 @@
 {{/*
   Skip the post-install/post-upgrade init Job entirely while the chart
-  renders bootstrap.recovery. Helm waits up to 5m for hooks to succeed,
-  but the Job's pg_isready loop can't drain that budget while CNPG is
-  still streaming the restore from S3 - the hook then times out and
+  renders bootstrap.recovery. The platform gives hooks the HelmRelease
+  upgrade timeout (10m by default, the cozystack-api
+  --helmrelease-upgrade-timeout flag, overridable per-Application), but the
+  Job's pg_isready loop can't drain that budget while CNPG is still
+  streaming the restore from S3 - the hook then times out and
   Helm rolls the upgrade back to the previous bootstrap.initdb spec,
   which makes every subsequent recovery pod panic in CNPG's
   InitInfo.loadBackup (Recovery == nil after the rollback).
@@ -20,6 +22,31 @@ metadata:
     "helm.sh/hook-weight": "-5"
     "helm.sh/hook-delete-policy": before-hook-creation
 spec:
+  {{- /*
+    This Job is a post-install,post-upgrade Helm hook Helm blocks on. Bound it under
+    the 10m hook budget so its own DeadlineExceeded - or the readiness loop's
+    diagnostic exit - surfaces first, instead of Helm's generic 10m timeout that
+    says nothing about why. Both contexts get a value well below 600s but with real
+    headroom for the work the Job does after the pod is running: the "grant
+    privileges" step below runs a per-schema DO block (GRANT ALL + ALTER DEFAULT
+    PRIVILEGES over every schema of every managed database), so a large existing
+    database needs room, not just the seconds pg_isready takes. On UPGRADE the
+    Cluster is already up (the loop answers in seconds) and the hazard is a
+    concurrent restore purging the target and its <release>-superuser Secret, whose
+    pod then FailedMounts forever; 540s bounds that while leaving the grant loop
+    ~9m. On INSTALL nothing is running yet - the same release is provisioning the
+    Cluster (PVC, image pull, initdb), Helm's wait does not cover a CR, and there is
+    no purge hazard (a restore-to-copy installs with bootstrap.enabled=true, which
+    skips this Job) - so the cold start gets 570s rather than a tight deadline that
+    would fail a slow-but-healthy first boot. A database with a pathological number
+    of schemas can still outrun even this; that is the documented ceiling, the same
+    one Helm's own hook budget imposes. Do not retry the pod either way: the script
+    is idempotent and the purged pod stays Pending on the missing mount, so a retry
+    buys nothing.
+  */}}
+  activeDeadlineSeconds: {{ if .Release.IsInstall }}570{{ else }}540{{ end }}
+  backoffLimit: 0
+  ttlSecondsAfterFinished: 3600
   template:
     metadata:
       name: {{ .Release.Name }}-init-job
@@ -29,7 +56,7 @@ spec:
       restartPolicy: Never
       containers:
       - name: postgres
-        image: ghcr.io/cloudnative-pg/postgresql:{{ include "postgres.versionMap" $ | trimPrefix "v" }}
+        image: {{ include "postgres.imageName" $ }}
         command:
         - bash
         - /scripts/init.sh
@@ -63,6 +90,16 @@ spec:
           name: secret
         - mountPath: /scripts
           name: scripts
+        {{- if .Values.users }}
+        # The init script reads each user's password from this mount at run time
+        # so the credential is never rendered into the init-script Secret. Gated
+        # on .Values.users to match the <release>-credentials Secret, which is
+        # only rendered when there are users: mounting it unconditionally would
+        # FailedMount a userless release and hang the post-upgrade hook.
+        - mountPath: /credentials
+          name: credentials
+          readOnly: true
+        {{- end }}
         {{- include "postgresjobs.resources" . | nindent 8 }}
       securityContext:
         fsGroup: 26
@@ -78,4 +115,9 @@ spec:
       - name: scripts
         secret:
           secretName: {{ .Release.Name }}-init-script
+      {{- if .Values.users }}
+      - name: credentials
+        secret:
+          secretName: {{ .Release.Name }}-credentials
+      {{- end }}
 {{- end }}
diff --git a/packages/apps/postgres/templates/init-script.yaml b/packages/apps/postgres/templates/init-script.yaml
index 1dfb4960a3..e78279a2dc 100644
--- a/packages/apps/postgres/templates/init-script.yaml
+++ b/packages/apps/postgres/templates/init-script.yaml
@@ -7,10 +7,97 @@
   {{- end }}
 {{- end }}
 
+{{/*
+  Reject a username outside the Secret-key charset before it is interpolated
+  into the credentials Secret key, the init-script shell (pw=$(cat "/credentials/<user>"))
+  and the role SQL. The charset mirrors k8s IsConfigMapKey (rejecting ".", any name
+  starting with "..", and the metacharacters that would reach the shell). The
+  length cap is 63, NOT the 253-char Secret-key limit: the username is also a
+  PostgreSQL role name, and an identifier over NAMEDATALEN-1 (63 bytes) is silently
+  TRUNCATED by CREATE ROLE with a NOTICE, not an error, so ON_ERROR_STOP never sees
+  it: the role exists under its 63-byte prefix, two long names sharing that prefix
+  become one role, and the stored name is not the one the tenant declared. Cap at
+  63 so a too-long name is named here instead. A release that installed before the
+  cap still carries such a user's key in the credentials Secret read above and its
+  role under the truncated name; failing its upgrade would wedge the whole release,
+  so on upgrade the cap applies only to a user that Secret does not already carry,
+  i.e. a new one. The charset holds on both paths: a name
+  outside it is not a valid Secret key, so it never installed. The charset is
+  ASCII-only, so len (bytes) equals characters.
+*/}}
+{{- range $user, $u := .Values.users }}
+  {{- $tooLong := and (gt (len $user) 63) (or $.Release.IsInstall (not (hasKey $passwords $user))) }}
+  {{- if or (not (regexMatch "^[-._a-zA-Z0-9]+$" $user)) (eq $user ".") (hasPrefix ".." $user) $tooLong }}
+    {{- fail (printf "invalid username %q: a username may contain only letters, digits and the characters -._ , must not be \".\" or start with \"..\", and must be at most 63 characters (it is a PostgreSQL role name, which CREATE ROLE silently truncates past 63 bytes, and it becomes a Kubernetes Secret key)" $user) }}
+  {{- end }}
+{{- end }}
+
+{{/*
+  A database name is interpolated into SQL identifiers (CREATE DATABASE "<db>", the
+  "<db>_admin"/"<db>_readonly" role names), into a single-quoted SQL string literal
+  in the superuser DO block ('<db>_admin' as a format() argument), and into a
+  space-separated shell list (DEFINED_ROLES). Reject any name outside the same safe
+  charset the username guard enforces so none of those contexts can be broken out
+  of: a "'" would escape the DO-block literal into arbitrary superuser SQL, a "\""
+  the CREATE DATABASE identifier, a space or ";" the shell list. The charset is the
+  injection guard, so it holds on install and upgrade alike: a database added on
+  upgrade is still a new name. It does not reject "." or a ".." prefix the way the
+  username guard does, because a database name is not a Secret key. The length cap
+  is 54 because the name also seeds the "<db>_admin" and "<db>_readonly" roles;
+  "_readonly" is 9 bytes, so past 54 bytes a role truncates past NAMEDATALEN (63).
+  The next init-job run then orphan-drops the truncated role, DROP OWNED only
+  reaches the database it runs in, and DROP ROLE fails on the grants inside the
+  long-named database, so such a release cannot survive a second run anyway. The
+  cap therefore holds on upgrade too: failing the render names
+  the problem instead of crash-looping the init-job. Extension names are
+  PostgreSQL identifiers too, capped at 63.
+*/}}
+{{- range $database, $d := .Values.databases }}
+  {{- if or (not (regexMatch "^[-._a-zA-Z0-9]+$" $database)) (gt (len $database) 54) }}
+    {{- fail (printf "invalid database name %q: a database name may contain only letters, digits and the characters -._ and must be at most 54 characters (it is interpolated into superuser SQL and the init-script shell, and it seeds the \"<db>_admin\" and \"<db>_readonly\" PostgreSQL roles, which CREATE ROLE silently truncates past 63 bytes; the next init-job run then cannot drop the truncated role and fails). Changing only its key in values makes the init-job drop the database; to keep the data, a platform administrator first renames it as the CNPG superuser (ALTER DATABASE, and ALTER ROLE for its <db>_admin and <db>_readonly roles), then the key is changed" $database) }}
+  {{- end }}
+  {{- range $extension := ($d.extensions | default (list)) }}
+    {{- $name := include "postgres.extensionName" $extension }}
+    {{- if or (not (regexMatch "^[-._a-zA-Z0-9]+$" $name)) (eq $name ".") (hasPrefix ".." $name) (gt (len $name) 63) }}
+      {{- fail (printf "invalid extension name %q for database %q: an extension name may contain only letters, digits and the characters -._ , must not be \".\" or start with \"..\", and must be at most 63 characters (it is a PostgreSQL identifier interpolated into CREATE EXTENSION in a superuser session; real names carry \"-\", e.g. uuid-ossp, so it is quoted at the call site). A clause after the name, such as CASCADE or SCHEMA, is not accepted: remove it from the value, which leaves an extension that is already installed as it is, and list the extensions it depends on before it, e.g. [cube, earthdistance]" $extension $database) }}
+    {{- end }}
+  {{- end }}
+{{- end }}
+
+{{/*
+  `postgres` is the CNPG-managed cluster superuser and must never be redefined as
+  an app role. Reject it here, before the bootstrap gate, not only in the
+  create-users block below: that block is skipped while bootstrap.enabled is true,
+  so a restore target carrying users.postgres would install, and the restore
+  controller's automatic bootstrap clear (disablePostgresAppBootstrap) would then
+  wedge the very next reconcile against a fail it never had to see at install while
+  the RestoreJob records Succeeded. Failing regardless of bootstrap keeps the
+  controller from converging a release into an unrenderable state.
+*/}}
+{{- if and .Values.users (hasKey .Values.users "postgres") }}
+  {{- fail "`users.postgres` is forbidden by policy. Use a different username." }}
+{{- end }}
+
+{{/*
+  Unlike MariaDB (secret.yaml carries the same lookup with a guard), postgres does
+  NOT reject an upgrade whose credentials lookup came back empty. The credentials
+  Secret here is gated on .Values.users, so a release installed with the default
+  `users: {}` has no Secret at all; adding its FIRST user is an upgrade whose
+  lookup is legitimately empty, and a guard on `IsUpgrade and not $existingSecret`
+  cannot tell that apart from a deleted Secret (both are empty). Postgres also has
+  no equivalent of MariaDB's bootstrap-only root: every role's password is applied
+  by the post-upgrade init-job (ALTER ROLE), so a re-mint on a genuinely deleted
+  Secret self-heals on the next reconcile rather than desyncing forever. So mint on
+  an empty lookup, and let the common first-user-on-upgrade path through.
+*/}}
+
+{{/*
+  Passwords are always chart-generated and preserved across reconciles via the
+  lookup above: a user keeps whatever password is already stored in the Secret,
+  and only a user without one yet gets a freshly generated value.
+*/}}
 {{- range $user, $u := .Values.users }}
-  {{- if $u.password }}
-    {{- $_ := set $passwords $user $u.password }}
-  {{- else if not (index $passwords $user) }}
+  {{- if not (index $passwords $user) }}
     {{- $_ := set $passwords $user (randAlphaNum 16) }}
   {{- end }}
 {{- end }}
@@ -20,6 +107,16 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: {{ .Release.Name }}-credentials
+  {{- if .Values.bootstrap.enabled }}
+  annotations:
+    # During a restore the roles recovered from the backup keep their original
+    # password hashes, but this Secret holds freshly generated passwords and the
+    # init-job that would apply them (ALTER ROLE) is skipped while bootstrap is
+    # on. So the values below do NOT authenticate yet; they converge once the app
+    # leaves bootstrap and the init-job runs. Flag it so a reader (dashboard,
+    # tenant) does not treat the advertised password as usable mid-restore.
+    postgres.cozystack.io/credentials-pending: "true"
+  {{- end }}
 stringData:
   {{- range $user, $u := .Values.users }}
   {{ quote $user }}: {{ quote (index $passwords $user) }}
@@ -42,82 +139,282 @@ stringData:
     #!/bin/bash
     set -e
 
-    until pg_isready ; do sleep 5; done
+    {{- /*
+      Bounded readiness wait: this script runs as a post-install,post-upgrade Helm
+      hook Helm blocks on, so an unbounded `until pg_isready` would hang the hook
+      forever. The bound is wall-clock elapsed ($SECONDS), not an attempt count: an
+      attempt count ignores the time pg_isready itself takes, so a loop sized in
+      attempts can outlive the Job deadline, and the Job is then killed before this
+      diagnostic prints or the work after readiness gets any time. Each bound sits
+      below the Job's
+      activeDeadlineSeconds so the tail is reserved for create-users and the
+      per-schema grant pass. On UPGRADE the Cluster is already up, so give up after
+      250s of the 540s deadline and a purged target surfaces THIS diagnostic, leaving
+      290s for grants on a large database. On INSTALL the Cluster is still
+      provisioning (PVC, image pull, initdb), so allow 480s of the 570s deadline for
+      a cold-but-healthy first boot; the fresh databases need little of the 90s left.
+      Those tails are upper bounds: activeDeadlineSeconds counts from the Job's
+      start, while $SECONDS starts at 0 when this script does, so the pod's
+      scheduling, image pull and volume mounts come out of the tail first. A slow
+      start eats into the install tail, which is why a cold node can still hit the
+      Job deadline; the upgrade tail is wide enough not to notice. A
+      deleted-superuser-Secret mount never lets this loop run at all - the Job
+      deadline covers that.
+    */}}
+    until pg_isready ; do
+      if [ "$SECONDS" -ge {{ if .Release.IsInstall }}480{{ else }}250{{ end }} ]; then
+        echo "postgres did not become ready in time; on a fresh install the Cluster may still be provisioning (check the cnpg.io/Cluster), on an upgrade the restore target may have been purged by a concurrent restore - failing the init-job rather than blocking the Helm hook" >&2
+        exit 1
+      fi
+      sleep 5
+    done
+
+    {{- /*
+      Role comments cannot tell which roles this chart manages: on PostgreSQL 16 a
+      CREATEROLE holder may COMMENT ON ROLE every role it created, and it may drop
+      the intermediate role that created one, leaving no pg_auth_members trace of
+      who did. Membership in "cozystack:managed" can only be granted by a holder of
+      ADMIN on it, which no role but the superuser ever gets, so the delete passes
+      and the adoption checks below trust that instead. The name sits outside the
+      username and database charsets, so values can never declare it. Its first run
+      marks every role the chart had commented before the marker existed; no role
+      could have held CREATEROLE through the chart by then. On PostgreSQL 16 and
+      later the membership carries neither INHERIT nor SET, so it is a record and
+      nothing else; the role holds no privileges on older majors either.
+    */}}
+    {{- $pgMajor := atoi (trimPrefix "v" .Values.version) }}
+    {{- $markOptions := ternary " WITH INHERIT FALSE, SET FALSE" "" (ge $pgMajor 16) }}
+    echo "== mark managed roles"
+    psql -v ON_ERROR_STOP=1 --echo-all <<\EOT
+    DO $$
+    DECLARE
+        managed record;
+    BEGIN
+        IF NOT EXISTS (SELECT FROM pg_catalog.pg_roles WHERE rolname = 'cozystack:managed') THEN
+            CREATE ROLE "cozystack:managed" NOLOGIN;
+            FOR managed IN SELECT r.rolname FROM pg_roles r JOIN pg_shdescription s ON s.objoid = r.oid AND s.classoid = 'pg_authid'::regclass WHERE s.description IN ('user managed by helm', 'role managed by helm') LOOP
+                EXECUTE format('GRANT %I TO %I{{ $markOptions }}', 'cozystack:managed', managed.rolname);
+            END LOOP;
+        END IF;
+    END$$;
+    EOT
 
     echo "== create users"
-    {{- if and .Values.users (not (hasKey .Values.users "postgres")) }}
-    psql -v ON_ERROR_STOP=1 <<\EOT
+    {{- if .Values.users }}
+    {{- /*
+      A CREATEROLE holder can create a role under a name values will declare later,
+      plant objects owned by it, role settings and default privileges, then drop the
+      intermediate role it did this through, so the squatted role shows no member at
+      all by the time it is declared. No catalog check can tell that apart from a
+      role a platform administrator created, so once any user has held createRole
+      the chart refuses to adopt a role it did not mark. Before that, adopting is
+      safe, and it is what a declared users.app does on install with the role CNPG
+      bootstraps. The flag is read at the start of this session and set only after
+      it, so the run that first grants createRole still adopts, and every user is
+      created and marked before any of them holds CREATEROLE.
+    */}}
+    {{- $grantsCreateRole := false }}
+    psql -v ON_ERROR_STOP=1 --echo-all <<\EOT
     {{- range $user, $u := .Values.users }}
+    {{- if and (default false $u.createRole) (lt $pgMajor 16) }}
+    {{- fail (printf "SECURITY: users.%s.createRole requires PostgreSQL 16 or newer. On PostgreSQL 15 and older, a role holding CREATEROLE can grant itself any non-superuser role, including pg_execute_server_program, which escalates to command execution on the instance." $user) }}
+    {{- end }}
+    {{- if default false $u.createRole }}
+    {{- $grantsCreateRole = true }}
+    {{- end }}
+    SELECT format('DO $$BEGIN RAISE EXCEPTION %L; END$$', 'role "{{ $user }}" already exists and this chart did not create it; a user of this instance has held createRole, so the role may be controlled by that user and users.{{ $user }} will not adopt it. A platform administrator must inspect the role and drop it as the superuser, or declare the user under another name')
+    FROM pg_catalog.pg_roles r
+    WHERE r.rolname = '{{ $user }}'
+      AND current_setting('cozystack.createrole_granted', true) = 'on'
+      AND NOT EXISTS (SELECT FROM pg_catalog.pg_auth_members m JOIN pg_catalog.pg_roles g ON g.oid = m.roleid WHERE g.rolname = 'cozystack:managed' AND m.member = r.oid)\gexec
     SELECT 'CREATE ROLE "{{ $user }}" LOGIN INHERIT;'
     WHERE NOT EXISTS (SELECT FROM pg_catalog.pg_roles WHERE rolname = '{{ $user }}')\gexec
-    ALTER ROLE "{{ $user }}" WITH PASSWORD '{{ index $passwords $user }}' LOGIN INHERIT {{ ternary "REPLICATION" "NOREPLICATION" (default false $u.replication) }};
-    COMMENT ON ROLE "{{ $user }}" IS 'user managed by helm';
+    GRANT "cozystack:managed" TO "{{ $user }}"{{ $markOptions }};
+    {{- end }}
+    EOT
+    {{- if $grantsCreateRole }}
+    psql -v ON_ERROR_STOP=1 --echo-all -c "ALTER DATABASE postgres SET cozystack.createrole_granted = 'on';"
+    {{- end }}
+    {{- /*
+      Each password is read from the mounted <release>-credentials Secret at run
+      time rather than rendered into this script: the init-script Secret is stored
+      verbatim in the Helm release manifest and kept for MaxHistory revisions, so a
+      literal password here would linger in cleartext history a tenant cannot scrub.
+      psql's :'pw' quotes and escapes the value, so it applies safely whatever
+      characters it holds. The password does reach psql through -v, i.e. its argv,
+      readable via /proc/<pid>/cmdline to a process sharing this container's PID
+      namespace -- but this init container runs alone, and any code with that reach
+      can already read the mounted /credentials/* files directly, so the argv path
+      widens no exposure. This rationale is a template comment so it ships ONCE, not
+      once per user, into the rendered init.sh.
+    */}}
+    {{- range $user, $u := .Values.users }}
+    pw=$(cat "/credentials/{{ $user }}")
+    psql -v ON_ERROR_STOP=1 -v pw="$pw" <<\EOT
+    ALTER ROLE "{{ $user }}" WITH PASSWORD :'pw' LOGIN INHERIT {{ ternary "REPLICATION" "NOREPLICATION" (default false $u.replication) }} {{ ternary "CREATEROLE" "NOCREATEROLE" (default false $u.createRole) }} {{ ternary "BYPASSRLS" "NOBYPASSRLS" (default false $u.bypassRls) }};
+    {{- /*
+      PostgreSQL 16 grants a CREATEROLE holder only ADMIN OPTION on the roles it
+      creates, governed by createrole_self_grant, whose default is empty. ADMIN
+      OPTION alone allows granting the role onward but not SET ROLE to it, and
+      creating an object owned by another role requires SET. Without this the
+      attribute looks functional — CREATE ROLE succeeds — yet the very next
+      statement a tenant writes, CREATE SCHEMA ... AUTHORIZATION <new role>,
+      fails with "must be able to SET ROLE". Set as a role-level default so it
+      applies to every session, and reset when the attribute is withdrawn.
+    */}}
+    {{- if default false $u.createRole }}
+    ALTER ROLE "{{ $user }}" SET createrole_self_grant = 'set, inherit';
+    {{- else }}
+    ALTER ROLE "{{ $user }}" RESET createrole_self_grant;
     {{- end }}
+    COMMENT ON ROLE "{{ $user }}" IS 'user managed by helm';
     EOT
-    {{- else if and .Values.users (hasKey .Values.users "postgres") }}
-    {{- fail "`users.postgres` is forbidden by policy. Use a different username." }}
+    {{- end }}
     {{- end }}
 
     echo "== delete users"
-    MANAGED_USERS=$(echo '\du+' | psql | awk -F'|' '$4 == " user managed by helm" {print $1}' | awk NF=NF RS= OFS=' ')
-    DEFINED_USERS="{{ join " " (keys .Values.users) }}"
+    {{- /*
+      Read the managed users from the catalog rather than by parsing `\du+`: its
+      column layout differs across PostgreSQL versions (16 dropped "Member of"), and
+      matching the wrong column finds nothing, so a user removed from values would
+      keep its LOGIN and password. Compare against the declared names truncated to
+      63 bytes, the form CREATE ROLE stores, or a long name kept on upgrade would
+      count as undeclared and be dropped on every run. REASSIGN OWNED and DROP OWNED
+      act only on the database they run in, so run them in every connectable
+      database: an object the user owns elsewhere would otherwise fail DROP USER
+      and wedge every later run. The objects go to "cozystack:orphaned", a role
+      that cannot log in and that the chart grants nothing: what a tenant role
+      created must not become superuser-owned. Every dropped role's objects share
+      that one owner, so its memberships are revoked and, after both drop passes,
+      functions it owns are switched to SECURITY INVOKER and, from PostgreSQL 15,
+      its views to security_invoker. A materialized view, a rule, and a view on
+      an older server have no such switch and keep reading as that owner. Grants
+      and memberships of the dropped role do not carry over, so a view or function
+      it owned can lose access it had through them. The ":" is outside the
+      username and database charsets, so no declared user or <db>_admin role can
+      take the name. In the user and role drop passes, names read from the
+      catalog reach SQL only as psql variables.
+    */}}
+    MANAGED_USERS=$(psql -v ON_ERROR_STOP=1 -t -A -c "SELECT r.rolname FROM pg_roles r JOIN pg_shdescription s ON s.objoid = r.oid AND s.classoid = 'pg_authid'::regclass WHERE s.description = 'user managed by helm' AND r.oid IN (SELECT m.member FROM pg_auth_members m JOIN pg_roles g ON g.oid = m.roleid WHERE g.rolname = 'cozystack:managed')")
+    DEFINED_USERS="{{ $defined := list }}{{ range $user, $u := .Values.users }}{{ $defined = append $defined (trunc 63 $user) }}{{ end }}{{ join " " $defined }}"
     DELETE_USERS=$(for user in $MANAGED_USERS; do case " $DEFINED_USERS " in *" $user "*) :;; *) echo $user;; esac; done)
+    ALL_DBS=$(psql -v ON_ERROR_STOP=1 -t -A -c "SELECT datname FROM pg_database WHERE datallowconn AND NOT datistemplate")
+
+    psql -v ON_ERROR_STOP=1 --echo-all <<\EOT
+    SELECT 'CREATE ROLE "cozystack:orphaned" NOLOGIN NOINHERIT'
+    WHERE NOT EXISTS (SELECT FROM pg_catalog.pg_roles WHERE rolname = 'cozystack:orphaned')\gexec
+    SELECT format('REVOKE %I FROM %I', r.rolname, m.rolname) FROM pg_auth_members am JOIN pg_roles m ON am.member = m.oid JOIN pg_roles r ON am.roleid = r.oid WHERE 'cozystack:orphaned' IN (r.rolname, m.rolname)\gexec
+    ALTER ROLE "cozystack:orphaned" NOLOGIN NOINHERIT NOSUPERUSER NOCREATEDB NOCREATEROLE NOREPLICATION NOBYPASSRLS;
+    EOT
 
     echo "users to delete: $DELETE_USERS"
     for user in $DELETE_USERS; do
-    # https://stackoverflow.com/a/51257346/2931267
-    psql -v ON_ERROR_STOP=1 --echo-all <<EOT
-    REASSIGN OWNED BY $user TO postgres;
-    DROP OWNED BY $user;
-    DROP USER $user;
+    for db in $ALL_DBS; do
+    psql -v ON_ERROR_STOP=1 --echo-queries --dbname "$db" -v user="$user" <<\EOT
+    REASSIGN OWNED BY :"user" TO "cozystack:orphaned";
+    DROP OWNED BY :"user";
+    EOT
+    done
+    psql -v ON_ERROR_STOP=1 --echo-queries -v user="$user" <<\EOT
+    DROP USER :"user";
     EOT
     done
 
     echo "== delete databases"
+    {{- /*
+      A restore replaces spec.databases with the Backup's snapshot, but recovery
+      replays WAL past it, so a database created after the Backup comes back still
+      commented 'database managed by helm' and would be dropped here. The first run
+      after a restore is told apart by bootstrap.newServerName, which the restore
+      driver sets to a value unique to each RestoreJob; the last pass records it as
+      a setting of the postgres database, which the recovery replaces with the
+      source's along with the rest of the catalog. Until then an undeclared managed database is released
+      instead: its comment and its roles' comments are cleared, which keeps the
+      orphaned-roles pass below off roles that still hold grants inside it. The
+      value is free text in values, so it arrives base64-encoded and reaches SQL
+      only as a psql variable.
+    */}}
+    RESTORE_MARK={{ with .Values.bootstrap.newServerName }}$(echo {{ b64enc . }} | base64 -d){{ end }}
+    ADOPTED_MARK=$(psql -v ON_ERROR_STOP=1 -t -A --dbname postgres -c "SELECT current_setting('cozystack.adopted_restore', true)")
     MANAGED_DBS=$(psql -v ON_ERROR_STOP=1 -t -A -c "SELECT datname FROM pg_database d JOIN pg_shdescription s ON d.oid = s.objoid WHERE s.description = 'database managed by helm'")
     DEFINED_DBS="{{ join " " (keys .Values.databases) }}"
     DELETE_DBS=$(for db in $MANAGED_DBS; do case " $DEFINED_DBS " in *" $db "*) :;; *) echo $db;; esac; done)
 
+    if [ -n "$RESTORE_MARK" ] && [ "$ADOPTED_MARK" != "$RESTORE_MARK" ]; then
+    echo "databases the restore brought back that values do not declare, released from management: $DELETE_DBS"
+    for db in $DELETE_DBS; do
+    psql -v ON_ERROR_STOP=1 --echo-all -v db="$db" <<\EOT
+    COMMENT ON DATABASE :"db" IS NULL;
+    SELECT format('COMMENT ON ROLE %I IS NULL', r) FROM unnest(ARRAY[:'db' || '_admin', :'db' || '_readonly']) AS r WHERE EXISTS (SELECT FROM pg_roles WHERE rolname = r)\gexec
+    EOT
+    done
+    else
     echo "databases to delete: $DELETE_DBS"
     for db in $DELETE_DBS; do
     psql -v ON_ERROR_STOP=1 --echo-all -c "DROP DATABASE IF EXISTS \"$db\" WITH (FORCE);"
     done
+    fi
 
     echo "== delete orphaned managed roles"
-    MANAGED_ROLES=$(psql -v ON_ERROR_STOP=1 -t -A -c "SELECT rolname FROM pg_roles r JOIN pg_shdescription s ON r.oid = s.objoid WHERE s.description = 'role managed by helm'")
+    MANAGED_ROLES=$(psql -v ON_ERROR_STOP=1 -t -A -c "SELECT rolname FROM pg_roles r JOIN pg_shdescription s ON r.oid = s.objoid WHERE s.description = 'role managed by helm' AND r.oid IN (SELECT m.member FROM pg_auth_members m JOIN pg_roles g ON g.oid = m.roleid WHERE g.rolname = 'cozystack:managed')")
     DEFINED_ROLES="{{ range $database, $d := .Values.databases }}{{ $database }}_admin {{ $database }}_readonly {{ end }}"
     DELETE_ROLES=$(for role in $MANAGED_ROLES; do case " $DEFINED_ROLES " in *" $role "*) :;; *) echo $role;; esac; done)
 
+    {{- /*
+      Same per-database REASSIGN/DROP OWNED as the user pass, for the same reason.
+      The database list is read again because the pass above may have dropped
+      some of the databases the first read returned.
+    */}}
+    ALL_DBS=$(psql -v ON_ERROR_STOP=1 -t -A -c "SELECT datname FROM pg_database WHERE datallowconn AND NOT datistemplate")
+
     echo "roles to delete: $DELETE_ROLES"
     for role in $DELETE_ROLES; do
-    psql -v ON_ERROR_STOP=1 --echo-all <<EOT
-    DO \$\$
-    DECLARE
-        member record;
-    BEGIN
-        FOR member IN SELECT m.rolname FROM pg_auth_members am JOIN pg_roles m ON am.member = m.oid JOIN pg_roles r ON am.roleid = r.oid WHERE r.rolname = '$role' LOOP
-            EXECUTE format('REVOKE %I FROM %I', '$role', member.rolname);
-        END LOOP;
-    END\$\$;
-    REASSIGN OWNED BY "$role" TO postgres;
-    DROP OWNED BY "$role";
-    DROP ROLE IF EXISTS "$role";
+    psql -v ON_ERROR_STOP=1 --echo-queries -v role="$role" <<\EOT
+    SELECT format('REVOKE %I FROM %I', r.rolname, m.rolname) FROM pg_auth_members am JOIN pg_roles m ON am.member = m.oid JOIN pg_roles r ON am.roleid = r.oid WHERE r.rolname = :'role'\gexec
+    EOT
+    for db in $ALL_DBS; do
+    psql -v ON_ERROR_STOP=1 --echo-queries --dbname "$db" -v role="$role" <<\EOT
+    REASSIGN OWNED BY :"role" TO "cozystack:orphaned";
+    DROP OWNED BY :"role";
+    EOT
+    done
+    psql -v ON_ERROR_STOP=1 --echo-queries -v role="$role" <<\EOT
+    DROP ROLE IF EXISTS :"role";
+    EOT
+    done
+
+    for db in $ALL_DBS; do
+    psql -v ON_ERROR_STOP=1 --echo-queries --dbname "$db" <<\EOT
+    SELECT format('ALTER %s %s SECURITY INVOKER', CASE p.prokind WHEN 'p' THEN 'PROCEDURE' ELSE 'FUNCTION' END, p.oid::regprocedure) FROM pg_proc p WHERE p.proowner = '"cozystack:orphaned"'::regrole AND p.prosecdef\gexec
+    SELECT format('ALTER VIEW %s SET (security_invoker = true)', c.oid::regclass) FROM pg_class c WHERE c.relowner = '"cozystack:orphaned"'::regrole AND c.relkind = 'v' AND current_setting('server_version_num')::int >= 150000 AND NOT coalesce('security_invoker=true' = ANY (c.reloptions), false)\gexec
     EOT
     done
 
     echo "== create databases and roles"
     {{- if .Values.databases }}
+    {{- /*
+      The same adoption check as for users. This session starts after the create
+      users pass has recorded createRole, so the run that first grants it already
+      refuses: its CREATEROLE holders exist from that pass on.
+    */}}
     psql -v ON_ERROR_STOP=1 --echo-all <<\EOT
     {{- range $database, $d := .Values.databases }}
+    SELECT format('DO $$BEGIN RAISE EXCEPTION %L; END$$', format('role "%s" already exists and this chart did not create it; a user of this instance has held createRole, so the role may be controlled by that user and databases.{{ $database }} will not adopt it. A platform administrator must inspect the role and drop it as the superuser, or declare the database under another name', r.rolname))
+    FROM pg_catalog.pg_roles r
+    WHERE r.rolname IN ('{{ $database }}_admin', '{{ $database }}_readonly')
+      AND current_setting('cozystack.createrole_granted', true) = 'on'
+      AND NOT EXISTS (SELECT FROM pg_catalog.pg_auth_members m JOIN pg_catalog.pg_roles g ON g.oid = m.roleid WHERE g.rolname = 'cozystack:managed' AND m.member = r.oid)\gexec
     SELECT 'CREATE DATABASE "{{ $database }}"'
     WHERE NOT EXISTS (SELECT FROM pg_database WHERE datname = '{{ $database }}')\gexec
     COMMENT ON DATABASE "{{ $database }}" IS 'database managed by helm';
     SELECT 'CREATE ROLE "{{ $database }}_admin" NOINHERIT;'
     WHERE NOT EXISTS (SELECT FROM pg_catalog.pg_roles WHERE rolname = '{{ $database }}_admin')\gexec
     COMMENT ON ROLE "{{ $database }}_admin" IS 'role managed by helm';
+    GRANT "cozystack:managed" TO "{{ $database }}_admin"{{ $markOptions }};
     SELECT 'CREATE ROLE "{{ $database }}_readonly" NOINHERIT;'
     WHERE NOT EXISTS (SELECT FROM pg_catalog.pg_roles WHERE rolname = '{{ $database }}_readonly')\gexec
     COMMENT ON ROLE "{{ $database }}_readonly" IS 'role managed by helm';
+    GRANT "cozystack:managed" TO "{{ $database }}_readonly"{{ $markOptions }};
     {{- end }}
     EOT
     {{- end }}
@@ -204,13 +501,14 @@ stringData:
     echo "== assign roles to users"
     psql -v ON_ERROR_STOP=1 --echo-all <<\EOT
     {{- range $database, $d := .Values.databases }}
+    {{- $roles := $d.roles | default dict }}
     {{- range $user, $u := $.Values.users }}
-    {{- if has $user $d.roles.admin }}
+    {{- if has $user $roles.admin }}
     GRANT "{{ $database }}_admin" TO "{{ $user }}";
     {{- else }}
     REVOKE "{{ $database }}_admin" FROM "{{ $user }}";
     {{- end }}
-    {{- if has $user $d.roles.readonly }}
+    {{- if has $user $roles.readonly }}
     GRANT "{{ $database }}_readonly" TO "{{ $user }}";
     {{- else }}
     REVOKE "{{ $database }}_readonly" FROM "{{ $user }}";
@@ -224,9 +522,16 @@ stringData:
     {{- if $d.extensions }}
     psql -v ON_ERROR_STOP=1 --echo-all -d "{{ $database }}" <<\EOT
     {{- range $extension := $d.extensions }}
-    CREATE EXTENSION IF NOT EXISTS {{ $extension }};
+    CREATE EXTENSION IF NOT EXISTS "{{ include "postgres.extensionName" $extension }}";
     {{- end }}
     EOT
     {{- end }}
     {{- end }}
+    {{- if .Values.bootstrap.newServerName }}
+
+    echo "== record the adopted restore"
+    psql -v ON_ERROR_STOP=1 --echo-all -v mark="$RESTORE_MARK" <<\EOT
+    ALTER DATABASE postgres SET cozystack.adopted_restore = :'mark';
+    EOT
+    {{- end }}
 {{- end }}
diff --git a/packages/apps/postgres/templates/scaledobject.yaml b/packages/apps/postgres/templates/scaledobject.yaml
new file mode 100644
index 0000000000..977063842a
--- /dev/null
+++ b/packages/apps/postgres/templates/scaledobject.yaml
@@ -0,0 +1,143 @@
+{{- if .Values.autoscaling.enabled }}
+{{- /*
+Fail closed when KEDA is not installed. KEDA is an optional platform package and
+is NOT enabled by default, but autoscaling.enabled is a tenant-facing knob, so a
+tenant can turn it on against a cluster where the admin never enabled `keda`.
+Without this guard the ScaledObject renders against an unknown kind and the whole
+database HelmRelease fails with an opaque `no matches for kind "ScaledObject"`.
+We must NOT instead silently skip rendering: db.yaml seeds `.spec.instances` at a
+static `max(replicas, effectiveMin)` under active autoscaling, so a skipped
+ScaledObject would leave the tenant with a fixed-size cluster and no HPA — the
+autoscaling they asked for silently absent, with nothing to signal it. Stop with an
+actionable message instead.
+*/ -}}
+{{- if not (.Capabilities.APIVersions.Has "keda.sh/v1alpha1") }}
+{{- fail "postgres: autoscaling.enabled is set, but the KEDA platform package is not installed (keda.sh/v1alpha1 is unknown to the cluster). Ask your platform admin to enable the 'keda' package before enabling database autoscaling." }}
+{{- end }}
+{{- /* The HPA divides read load by target; 0 is undefined and negatives invert scaling. */ -}}
+{{- if lt (int .Values.autoscaling.target) 1 }}
+{{- fail "postgres: autoscaling.target must be a positive integer (the desired-replica formula divides the read load by it)." }}
+{{- end }}
+{{- /* Reject a contradictory range rather than silently resolving it. The effective
+       lower bound folds in the quorum floor (maxSyncReplicas+1) and the read floor (2),
+       so if it exceeds maxReplicas the cost ceiling sits below the count the chart is
+       forced to run; effectiveMax would then silently raise the ceiling to that floor —
+       a possibly large, unbounded instance count — with no signal. Fail closed and tell
+       the operator to raise maxReplicas. This covers both minReplicas > maxReplicas and
+       a quorum floor above maxReplicas. */ -}}
+{{- $emin := int (include "postgres.autoscaling.effectiveMin" .) }}
+{{- if gt $emin (int .Values.autoscaling.maxReplicas) }}
+{{- fail (printf "postgres: the effective minimum instance count (%d = max(minReplicas %d, maxSyncReplicas+1 %d, 2)) exceeds autoscaling.maxReplicas (%d); raise maxReplicas to at least the quorum floor." $emin (int .Values.autoscaling.minReplicas) (add (int .Values.quorum.maxSyncReplicas) 1) (int .Values.autoscaling.maxReplicas)) }}
+{{- end }}
+{{- /* Reject a resting/seed count above the ceiling. `replicas` is the seed the chart
+       renders under autoscaling (max(replicas, effectiveMin)) and the count restored on
+       disable; if it exceeds maxReplicas the stock HPA's `currentReplicas > maxReplicaCount`
+       branch writes /scale = maxReplicaCount UNCONDITIONALLY on the first reconcile — even
+       under the both-direction pause of dryRun/transition, which that branch never consults —
+       cutting the live count straight to maxReplicas in one step and shedding the surplus
+       standbys and their PVCs past the one-per-period scaleDown pacing (the above-max branch
+       never reaches the rendered policies). Fail closed, mirroring the effectiveMin>maxReplicas
+       guard above (design proposal §Upgrade names this the remaining render-guard gap). */ -}}
+{{- if gt (int .Values.replicas) (int .Values.autoscaling.maxReplicas) }}
+{{- fail (printf "postgres: replicas (%d) exceeds autoscaling.maxReplicas (%d); enabling autoscaling (or dry-run/transition) would make KEDA's HPA cut the live count straight to maxReplicas in one step, shedding the surplus standbys and their PVCs past the scale-down pacing. Raise autoscaling.maxReplicas to at least replicas, or lower replicas deliberately first." (int .Values.replicas) (int .Values.autoscaling.maxReplicas)) }}
+{{- end }}
+{{- /* Symmetric LOW-side of the replicas>maxReplicas guard above. Under dry-run/transition
+       the chart renders the STATIC instances=replicas, but the ScaledObject still carries
+       minReplicaCount=effectiveMin with both scale directions paused. The pause disables the
+       HPA's scaling POLICIES, not its min-replica clamp — so when replicas<effectiveMin the
+       HPA raises the live count to the floor on its first reconcile, actuating a scale-up in
+       a mode documented as "actuates neither way", and because the rendered instances value
+       does not change the client-side two-way patch never pulls it back (permanent extra
+       standbys + PVCs). Active mode seeds max(replicas,effectiveMin) so it is unaffected;
+       disabled renders no ScaledObject, so no HPA min-clamp exists. Fail closed and tell the
+       operator to stage replicas to the floor first. */ -}}
+{{- if and (eq (include "postgres.autoscaling.paused" .) "true") (lt (int .Values.replicas) $emin) }}
+{{- fail (printf "postgres: replicas (%d) is below the effective floor (%d = max(minReplicas %d, maxSyncReplicas+1 %d, 2)); under dry-run/transition the ScaledObject is paused but its minReplicaCount clamp still raises the live count to the floor on the first reconcile (a scale-up in a mode meant to only observe), and client-side apply never pulls it back. Stage replicas to at least the floor before dry-run/transition." (int .Values.replicas) $emin (int .Values.autoscaling.minReplicas) (add (int .Values.quorum.maxSyncReplicas) 1)) }}
+{{- end }}
+{{- /* Absolute ceiling on the tenant-facing maxReplicas. The schema/CRD carry no
+       `maximum` (cozyvalues-gen emits no numeric bound) and the aggregated apiserver does
+       not range-validate the Application CR, so this render guard is the only bound; the
+       guards above reject only a floor ABOVE maxReplicas, nothing caps maxReplicas itself.
+       Without this a tenant could set autoscaling.maxReplicas: 100000 and, under load,
+       drive KEDA to scale CNPG toward that many instances — a resource-exhaustion / cost
+       bomb bounded only by a ResourceQuota that may not exist. Fail closed above a sane
+       read-replica ceiling; a deployment that genuinely needs more is a platform-policy
+       decision, not a per-tenant knob. */ -}}
+{{- $maxReplicasCeiling := 100 }}
+{{- if gt (int .Values.autoscaling.maxReplicas) $maxReplicasCeiling }}
+{{- fail (printf "postgres: autoscaling.maxReplicas (%d) exceeds the maximum of %d read replicas; a higher ceiling is a platform-policy decision, not a per-tenant setting." (int .Values.autoscaling.maxReplicas) $maxReplicasCeiling) }}
+{{- end }}
+{{- /* The trigger query is served from vmselect in the tenant's monitoring namespace.
+       If it is unset the serverAddress would render as the malformed
+       `vmselect-shortterm..svc:8481`, which surfaces late as a KEDA scaler error
+       rather than a clear failure. The platform always injects it; fail closed here
+       (mirroring the guards above) for a hand-rendered / misconfigured tenant. */ -}}
+{{- if not (include "cozy-lib.ns-monitoring" .) }}
+{{- fail "postgres: autoscaling requires a monitoring namespace to reach vmselect, but none is set (_namespace.monitoring is empty). The platform normally injects it; ensure the tenant has monitoring enabled." }}
+{{- end }}
+{{- /* SSRF guard on the trigger destination (design proposal §Security). The
+       cluster-privileged KEDA operator fetches serverAddress every polling interval, so a
+       tenant-set value is attacker-controlled. This guard enforces two things and NOT more —
+       do not read it as "refuses everything unsafe":
+         1. the host is an in-cluster Service DNS name (<svc>.<ns>.svc[.<clusterDomain>]),
+            with the optional suffix anchored to THIS cluster's domain (not an arbitrary
+            dotted tail — an unanchored `(\.[a-zA-Z0-9.-]+)?` would accept x.svc.attacker.com);
+         2. the <ns> segment is within the tenant's own subtree (its namespace + parents +
+            root, via cozy-lib.rbac.allParentTenantsAndThis) — the only namespaces whose
+            vmselect the tenant is entitled to read. Without (2) a tenant could point the
+            operator at a sibling tenant's or a system namespace's `.svc` (a blind in-cluster
+            SSRF relay); the egress CiliumNetworkPolicy does NOT stop that (its `cluster`
+            entity permits all in-cluster egress) — it only denies off-cluster, which is the
+            defense-in-depth backstop for (1).
+       The host is parsed as a URL authority (strip scheme, path/query/fragment, userinfo up
+       to the last `@`, then the port) — NOT by truncating at the first `:`/`/`, which a
+       `http://vmselect.<ns>.svc:1@evil.example.com/` userinfo payload defeats (the truncated
+       text passes the .svc check while net/url dials the host after the `@`).
+       cluster-domain rides _cluster (platform apps.yaml, from networking.clusterDomain). */ -}}
+{{- $serverAddress := include "postgres.autoscaling.serverAddress" . }}
+{{- $saNoScheme := regexReplaceAll "^[a-zA-Z][a-zA-Z0-9+.-]*://" $serverAddress "" }}
+{{- $saAuthority := regexReplaceAll "[/?#].*$" $saNoScheme "" }}
+{{- $saAfterUser := regexReplaceAll "^.*@" $saAuthority "" }}
+{{- $saHost := regexReplaceAll ":[0-9]*$" $saAfterUser "" }}
+{{- $clusterDomain := index (.Values._cluster | default dict) "cluster-domain" }}
+{{- $domainSuffix := "" }}
+{{- if $clusterDomain }}
+{{- $domainSuffix = printf "(\\.%s)?" ($clusterDomain | replace "." "\\.") }}
+{{- end }}
+{{- /* Require the full <service>.<namespace>.svc shape: two DNS labels (no embedded
+       dots) before .svc, so a single-label host like `foo.svc` is rejected HERE with the
+       host message rather than slipping through to the namespace-pin below, where the
+       ns-extraction regex leaves it unchanged and it fails for the wrong reason. Anchoring
+       the two labels also drops the old class's stray `.`, which let a dotted tail masquerade
+       as one label. */ -}}
+{{- $dnsLabel := "[a-zA-Z0-9]([a-zA-Z0-9-]*[a-zA-Z0-9])?" }}
+{{- $hostRe := printf "^%s\\.%s\\.svc%s$" $dnsLabel $dnsLabel $domainSuffix }}
+{{- if not (regexMatch $hostRe $saHost) }}
+{{- fail (printf "postgres: autoscaling.serverAddress host %q is not an in-cluster Service DNS name (must be <service>.<namespace>.svc or ...svc.%s). An external host or IP is refused so the cluster-privileged KEDA operator cannot be used as an SSRF relay to a metadata endpoint or another tenant's address." $saHost (default "<cluster-domain>" $clusterDomain)) }}
+{{- end }}
+{{- /* Namespace-pin: the <ns> label of the host must be one the tenant may read from
+       (own namespace, parents, or tenant-root). This narrows what a tenant may set in
+       autoscaling.serverAddress; the constraint and its residual surface (tenant-root is
+       always allowed, so a blind in-cluster probe to a root Service stays possible) are
+       documented on the serverAddress field in values.yaml. */ -}}
+{{- $svcNs := regexReplaceAll "^.*\\.([^.]+)\\.svc(\\..*)?$" $saHost "${1}" }}
+{{- $allowedNs := include "cozy-lib.rbac.allParentTenantsAndThis" .Release.Namespace | fromYamlArray }}
+{{- if not (has $svcNs $allowedNs) }}
+{{- fail (printf "postgres: autoscaling.serverAddress namespace %q is outside this tenant's subtree %v; the cluster-privileged KEDA operator may only be pointed at a vmselect in the tenant's own, parent, or root namespace, not a sibling tenant's or a system namespace's Service." $svcNs $allowedNs) }}
+{{- end }}
+{{- include "cozy-lib.keda.scaledObject" (dict
+     "name" .Release.Name
+     "namespace" .Release.Namespace
+     "scaleTargetRef" (dict "apiVersion" "postgresql.cnpg.io/v1" "kind" "Cluster" "name" .Release.Name)
+     "minReplicaCount" (int (include "postgres.autoscaling.effectiveMin" .))
+     "maxReplicaCount" (int (include "postgres.autoscaling.effectiveMax" .))
+     "serverAddress" (include "postgres.autoscaling.serverAddress" .)
+     "query" (include "postgres.autoscaling.query" .)
+     "threshold" (.Values.autoscaling.target | toString)
+     "behavior" (dict
+       "scaleUp" (dict "stabilizationWindowSeconds" 300)
+       "scaleDown" (dict "stabilizationWindowSeconds" 1800 "policies" (list (dict "type" "Pods" "value" 1 "periodSeconds" 600))))
+     "paused" ((include "postgres.autoscaling.paused" .) | eq "true")
+     "labels" (dict "app.kubernetes.io/name" "postgres.apps.cozystack.io" "app.kubernetes.io/instance" .Release.Name)
+) }}
+{{- end }}
diff --git a/packages/apps/postgres/templates/tenant-projection.yaml b/packages/apps/postgres/templates/tenant-projection.yaml
new file mode 100644
index 0000000000..9f4354331f
--- /dev/null
+++ b/packages/apps/postgres/templates/tenant-projection.yaml
@@ -0,0 +1,10 @@
+---
+apiVersion: internal.cozystack.io/v1alpha1
+kind: TenantProjection
+metadata:
+  name: {{ .Release.Name }}-ca
+spec:
+  projections:
+    - type: CACert
+      sourceSecretName: {{ .Release.Name }}-ca
+      sourceKey: ca.crt
diff --git a/packages/apps/postgres/tests/autoscaling_keda_guard_test.yaml b/packages/apps/postgres/tests/autoscaling_keda_guard_test.yaml
new file mode 100644
index 0000000000..1c8fb7fb01
--- /dev/null
+++ b/packages/apps/postgres/tests/autoscaling_keda_guard_test.yaml
@@ -0,0 +1,42 @@
+suite: postgres autoscaling fails closed without KEDA
+
+# Isolated from autoscaling_test.yaml because that suite makes the KEDA CRD
+# available cluster-wide via suite-level capabilities. Here we assert the
+# opposite: with KEDA absent (default capabilities), enabling autoscaling must
+# stop the render with an actionable message rather than emit a ScaledObject
+# against an unknown kind - which would fail the tenant's whole HelmRelease, and
+# since db.yaml already drops spec.instances under autoscaling, must never
+# silently skip the ScaledObject either.
+
+release:
+  name: postgres-db
+  namespace: tenant-acme
+
+set:
+  _cluster:
+    scheduling: {}
+    cluster-domain: cozy.local
+  _namespace:
+    monitoring: tenant-root
+
+templates:
+  - templates/scaledobject.yaml
+
+tests:
+  - it: fails closed when autoscaling is enabled but the KEDA package is not installed
+    set:
+      autoscaling:
+        enabled: true
+        minReplicas: 2
+        maxReplicas: 6
+        target: 150
+      quorum:
+        maxSyncReplicas: 2
+    asserts:
+      - failedTemplate:
+          errorMessage: "postgres: autoscaling.enabled is set, but the KEDA platform package is not installed (keda.sh/v1alpha1 is unknown to the cluster). Ask your platform admin to enable the 'keda' package before enabling database autoscaling."
+
+  - it: renders nothing when autoscaling is off even without KEDA
+    asserts:
+      - hasDocuments:
+          count: 0
diff --git a/packages/apps/postgres/tests/autoscaling_test.yaml b/packages/apps/postgres/tests/autoscaling_test.yaml
new file mode 100644
index 0000000000..ef23f1fb0c
--- /dev/null
+++ b/packages/apps/postgres/tests/autoscaling_test.yaml
@@ -0,0 +1,721 @@
+suite: postgres read-replica autoscaling (KEDA)
+
+# Covers the autoscaling.enabled path: under active autoscaling the chart stops
+# declaring spec.instances (so Flux/KEDA no longer contend) and renders a KEDA
+# ScaledObject whose bounds encode the synchronous-quorum floor. dryRun keeps the
+# static count and pauses the ScaledObject.
+
+release:
+  name: postgres-db
+  namespace: tenant-acme
+
+set:
+  _cluster:
+    scheduling: {}
+    cluster-domain: cozy.local
+  _namespace:
+    monitoring: tenant-root
+
+# The ScaledObject template guards on the KEDA CRD being present; make it available
+# to every rendering test (individual guard tests override this).
+capabilities:
+  apiVersions:
+    - keda.sh/v1alpha1
+
+templates:
+  - templates/db.yaml
+  - templates/scaledobject.yaml
+
+tests:
+  - it: keeps a static spec.instances and renders no ScaledObject when autoscaling is off (default)
+    templates:
+      - templates/db.yaml
+    documentSelector:
+      path: kind
+      value: Cluster
+    asserts:
+      - equal:
+          path: spec.instances
+          value: 2
+
+  - it: renders no ScaledObject when autoscaling is off (default)
+    templates:
+      - templates/scaledobject.yaml
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  - it: seeds spec.instances at the quorum floor and floors the WorkloadMonitor under active autoscaling
+    templates:
+      - templates/db.yaml
+    set:
+      autoscaling:
+        enabled: true
+        minReplicas: 2
+        maxReplicas: 6
+        target: 150
+      quorum:
+        maxSyncReplicas: 2
+    asserts:
+      # The field is seeded (not omitted) to effectiveMin = max(minReplicas=2,
+      # maxSyncReplicas+1=3, 2) = 3 so a fresh Cluster is admitted at a valid,
+      # quorum-satisfying count; KEDA then owns the runtime value via /scale and
+      # the constant render keeps three-way merge from reverting it.
+      - equal:
+          path: spec.instances
+          value: 3
+        documentSelector:
+          path: kind
+          value: Cluster
+      # WorkloadMonitor tracks the quorum-floored minimum instead of a stale static value
+      - equal:
+          path: spec.replicas
+          value: 3
+        documentSelector:
+          path: kind
+          value: WorkloadMonitor
+
+  - it: seeds a quorum-valid instance count on a fresh autoscaled cluster with synchronous replication
+    templates:
+      - templates/db.yaml
+    set:
+      autoscaling:
+        enabled: true
+        minReplicas: 2
+        maxReplicas: 6
+        target: 150
+      quorum:
+        maxSyncReplicas: 1
+    asserts:
+      # Regression guard for the CNPG admission webhook: an absent .spec.instances
+      # defaults to 1, and "maxSyncReplicas must be lower than the number of
+      # instances" rejects the Cluster when maxSyncReplicas>=1. effectiveMin here is
+      # max(2, 1+1, 2) = 2 > maxSyncReplicas=1, so the fresh Cluster is admitted.
+      - equal:
+          path: spec.instances
+          value: 2
+        documentSelector:
+          path: kind
+          value: Cluster
+
+  - it: seeds spec.instances at the floor under active autoscaling without synchronous quorum
+    templates:
+      - templates/db.yaml
+    set:
+      autoscaling:
+        enabled: true
+        minReplicas: 2
+        maxReplicas: 6
+        target: 150
+      quorum:
+        maxSyncReplicas: 0
+    asserts:
+      # Non-quorum path also SEEDS effectiveMin (=2) rather than omitting the field.
+      # Omitting would delete spec.instances on an existing cluster's enable-upgrade,
+      # collapsing it to CNPG's default of 1 and decommissioning every replica PVC.
+      # The constant seed is a three-way-merge no-op, so KEDA still owns the runtime
+      # count via /scale while the enable dip is capped at the floor (>=2), not 1.
+      - equal:
+          path: spec.instances
+          value: 2
+        documentSelector:
+          path: kind
+          value: Cluster
+
+  - it: renders a KEDA ScaledObject with quorum-floored bounds under active autoscaling
+    templates:
+      - templates/scaledobject.yaml
+    set:
+      autoscaling:
+        enabled: true
+        minReplicas: 2
+        maxReplicas: 6
+        target: 150
+      quorum:
+        maxSyncReplicas: 2
+    asserts:
+      - hasDocuments:
+          count: 1
+      - isKind:
+          of: ScaledObject
+      - equal:
+          path: metadata.name
+          value: postgres-db
+      - equal:
+          path: spec.scaleTargetRef.kind
+          value: Cluster
+      - equal:
+          path: spec.scaleTargetRef.name
+          value: postgres-db
+      # minReplicaCount = max(minReplicas=2, maxSyncReplicas+1=3, 2) = 3
+      - equal:
+          path: spec.minReplicaCount
+          value: 3
+      - equal:
+          path: spec.maxReplicaCount
+          value: 6
+      - equal:
+          path: spec.triggers[0].type
+          value: prometheus
+      - equal:
+          path: spec.triggers[0].metadata.threshold
+          value: "150"
+      # fail-safe: empty result must error (HPA holds), not read as 0 (scale to floor)
+      - equal:
+          path: spec.triggers[0].metadata.ignoreNullValues
+          value: "false"
+      - matchRegex:
+          path: spec.triggers[0].metadata.serverAddress
+          pattern: ^http://vmselect-.*:8481/select/0/prometheus$
+      # the query is scoped to the tenant namespace and folds the target in as +150
+      - matchRegex:
+          path: spec.triggers[0].metadata.query
+          pattern: tenant-acme
+      - matchRegex:
+          path: spec.triggers[0].metadata.query
+          pattern: \+ 150
+      # read load is restricted to standby pods via the exact kube_pod_labels key
+      # kube-state-metrics exposes for CNPG's cnpg.io/instance_role (verified live:
+      # label_cnpg_io_instance_role, snake_case, not camelCase). A wrong key matches
+      # no series; the floor below is gated on replica-pod existence so that fails
+      # safe (empty → HPA holds) rather than reading no-series as idle.
+      - matchRegex:
+          path: spec.triggers[0].metadata.query
+          pattern: label_cnpg_io_instance_role="replica"
+      # every kube_pod_labels selector pins job="kube-state-metrics", parity with the
+      # alert rules, so a duplicate kube_pod_labels series from another exporter cannot
+      # multiply the join. Assert the pin on each selector by its own identifying label
+      # (a bare presence match would pass with only one of them pinned): the read-load
+      # join keys on instance_role="replica"...
+      - matchRegex:
+          path: spec.triggers[0].metadata.query
+          pattern: kube_pod_labels\{job="kube-state-metrics",namespace="tenant-acme",label_cnpg_io_cluster="postgres-db",label_cnpg_io_instance_role="replica"\}
+      # ...and the fail-safe idle floor gates on any instance_role (=~".+")
+      - matchRegex:
+          path: spec.triggers[0].metadata.query
+          pattern: count\(kube_pod_labels\{job="kube-state-metrics",namespace="tenant-acme",label_cnpg_io_cluster="postgres-db",label_cnpg_io_instance_role=~".\+"\}\) > 0
+      # ...and scoped to THIS cluster by release name, so a namespace with multiple
+      # postgres clusters does not cross-count. The dashboard read-load panel mirrors
+      # this per-cluster scoping (label_cnpg_io_cluster).
+      - matchRegex:
+          path: spec.triggers[0].metadata.query
+          pattern: label_cnpg_io_cluster="postgres-db"
+      # Fail-safe floor (design proposal: "must not read a missing sample as zero").
+      # The `or vector(0)` is gated on `count(...replica) > 0`, so a broken metrics
+      # pipeline (empty join) leaves the term empty → KEDA FailedGetExternalMetric →
+      # HPA holds, instead of collapsing a loaded cluster to the floor.
+      - matchRegex:
+          path: spec.triggers[0].metadata.query
+          pattern: or \(vector\(0\) and on\(\) \(count\(kube_pod_labels
+
+  - it: honors an explicit autoscaling.serverAddress override (own-monitoring tenants)
+    templates:
+      - templates/scaledobject.yaml
+    set:
+      autoscaling:
+        enabled: true
+        serverAddress: http://custom-vmselect.tenant-acme.svc:8481/select/0/prometheus
+        minReplicas: 2
+        maxReplicas: 6
+        target: 150
+      quorum:
+        maxSyncReplicas: 2
+    asserts:
+      # A tenant whose derived vmselect lacks kube_pod_labels (monitoring: true) points
+      # serverAddress at one that holds both series; the override wins over the derived
+      # per-tenant address. The namespace must be within the tenant's own subtree
+      # (here its own namespace, tenant-acme) — the SSRF namespace-pin allows own/parent/root.
+      - equal:
+          path: spec.triggers[0].metadata.serverAddress
+          value: http://custom-vmselect.tenant-acme.svc:8481/select/0/prometheus
+
+  - it: refuses an off-cluster serverAddress (SSRF guard on the metric destination)
+    templates:
+      - templates/scaledobject.yaml
+    set:
+      autoscaling:
+        enabled: true
+        serverAddress: http://169.254.169.254/latest/meta-data
+        minReplicas: 2
+        maxReplicas: 6
+        target: 150
+    asserts:
+      # The cluster-privileged KEDA operator fetches serverAddress every poll; a tenant must
+      # not be able to point it at a cloud metadata endpoint or an external host. Only an
+      # in-cluster Service DNS name (…svc[.<domain>]) is accepted.
+      - failedTemplate:
+          errorMessage: 'postgres: autoscaling.serverAddress host "169.254.169.254" is not an in-cluster Service DNS name (must be <service>.<namespace>.svc or ...svc.cozy.local). An external host or IP is refused so the cluster-privileged KEDA operator cannot be used as an SSRF relay to a metadata endpoint or another tenant''s address.'
+
+  - it: refuses an external-hostname serverAddress
+    templates:
+      - templates/scaledobject.yaml
+    set:
+      autoscaling:
+        enabled: true
+        serverAddress: https://evil.example.com/api/v1/query
+        minReplicas: 2
+        maxReplicas: 6
+        target: 150
+    asserts:
+      - failedTemplate:
+          errorMessage: 'postgres: autoscaling.serverAddress host "evil.example.com" is not an in-cluster Service DNS name (must be <service>.<namespace>.svc or ...svc.cozy.local). An external host or IP is refused so the cluster-privileged KEDA operator cannot be used as an SSRF relay to a metadata endpoint or another tenant''s address.'
+
+  - it: refuses a crafted .svc host whose suffix is an external domain (SSRF bypass)
+    templates:
+      - templates/scaledobject.yaml
+    set:
+      autoscaling:
+        enabled: true
+        # `.svc` label followed by an attacker-controlled domain: rejected because the
+        # suffix is anchored to the cluster domain, not any dotted tail. Without the anchor
+        # this resolves and egresses off-cluster.
+        serverAddress: http://x.svc.attacker.com/api/v1/query
+        minReplicas: 2
+        maxReplicas: 6
+        target: 150
+    asserts:
+      - failedTemplate:
+          errorMessage: 'postgres: autoscaling.serverAddress host "x.svc.attacker.com" is not an in-cluster Service DNS name (must be <service>.<namespace>.svc or ...svc.cozy.local). An external host or IP is refused so the cluster-privileged KEDA operator cannot be used as an SSRF relay to a metadata endpoint or another tenant''s address.'
+
+  - it: refuses a single-label .svc host with the host message, not the namespace one
+    templates:
+      - templates/scaledobject.yaml
+    set:
+      autoscaling:
+        enabled: true
+        # `foo.svc` carries no <namespace> segment, so it is not a resolvable in-cluster
+        # Service DNS name. It must be rejected at the host-shape check with the "not an
+        # in-cluster Service DNS name" message. Before the host regex required a
+        # <service>.<namespace>.svc shape it slipped past that check (the regex accepted any
+        # dotted tail ending in .svc), and the namespace-extraction regex two lines down
+        # left the host unchanged, so it was rejected for the WRONG reason — a "namespace
+        # outside subtree" error naming the whole host as the namespace. Same rejection,
+        # actionable message.
+        serverAddress: http://foo.svc:8481/select/0/prometheus
+        minReplicas: 2
+        maxReplicas: 6
+        target: 150
+    asserts:
+      - failedTemplate:
+          errorMessage: 'postgres: autoscaling.serverAddress host "foo.svc" is not an in-cluster Service DNS name (must be <service>.<namespace>.svc or ...svc.cozy.local). An external host or IP is refused so the cluster-privileged KEDA operator cannot be used as an SSRF relay to a metadata endpoint or another tenant''s address.'
+
+  - it: accepts an in-cluster serverAddress that carries the cluster domain (…svc.<domain>)
+    templates:
+      - templates/scaledobject.yaml
+    set:
+      autoscaling:
+        enabled: true
+        # root namespace (tenant-root) is in the tenant's subtree and carries the cluster
+        # domain suffix; both the domain anchor and the namespace-pin accept it.
+        serverAddress: http://vmselect-shortterm.tenant-root.svc.cozy.local:8481/select/0/prometheus
+        minReplicas: 2
+        maxReplicas: 6
+        target: 150
+    asserts:
+      - equal:
+          path: spec.triggers[0].metadata.serverAddress
+          value: http://vmselect-shortterm.tenant-root.svc.cozy.local:8481/select/0/prometheus
+
+  - it: refuses a cross-namespace serverAddress outside the tenant subtree (cross-tenant SSRF)
+    templates:
+      - templates/scaledobject.yaml
+    set:
+      autoscaling:
+        enabled: true
+        # valid in-cluster .svc form AND correct cluster domain, but the namespace belongs to
+        # a sibling tenant the operator must not be pointed at — rejected by the namespace-pin.
+        serverAddress: http://vmselect-shortterm.tenant-sibling.svc.cozy.local:8481/select/0/prometheus
+        minReplicas: 2
+        maxReplicas: 6
+        target: 150
+    asserts:
+      - failedTemplate:
+          errorMessage: 'postgres: autoscaling.serverAddress namespace "tenant-sibling" is outside this tenant''s subtree [tenant-acme tenant-root]; the cluster-privileged KEDA operator may only be pointed at a vmselect in the tenant''s own, parent, or root namespace, not a sibling tenant''s or a system namespace''s Service.'
+
+  - it: refuses a userinfo-smuggled external host (…svc:port@evil.example.com)
+    templates:
+      - templates/scaledobject.yaml
+    set:
+      autoscaling:
+        enabled: true
+        # the userinfo (before @) is a valid-looking .svc name, but net/url dials the host
+        # AFTER the @; authority parsing extracts evil.example.com and rejects it.
+        serverAddress: http://vmselect-shortterm.tenant-acme.svc:8481@evil.example.com/api/v1/query
+        minReplicas: 2
+        maxReplicas: 6
+        target: 150
+    asserts:
+      - failedTemplate:
+          errorMessage: 'postgres: autoscaling.serverAddress host "evil.example.com" is not an in-cluster Service DNS name (must be <service>.<namespace>.svc or ...svc.cozy.local). An external host or IP is refused so the cluster-privileged KEDA operator cannot be used as an SSRF relay to a metadata endpoint or another tenant''s address.'
+
+  - it: fails closed when maxReplicas exceeds the absolute read-replica ceiling (resource-exhaustion cap)
+    templates:
+      - templates/scaledobject.yaml
+    set:
+      autoscaling:
+        enabled: true
+        minReplicas: 2
+        maxReplicas: 100000
+        target: 150
+    asserts:
+      - failedTemplate:
+          errorMessage: "postgres: autoscaling.maxReplicas (100000) exceeds the maximum of 100 read replicas; a higher ceiling is a platform-policy decision, not a per-tenant setting."
+
+  # dryRun renders instances: replicas (=2) but the ScaledObject carries minReplicaCount:
+  # effectiveMin (=4). The pause disables scale policies, not the min clamp, so the HPA would
+  # raise the live count to 4 — a scale-up in a mode meant to only observe. Fail closed.
+  - it: fails closed when dry-run/transition would let the paused HPA min-clamp actuate above the static count
+    templates:
+      - templates/scaledobject.yaml
+    set:
+      replicas: 2
+      autoscaling:
+        enabled: true
+        dryRun: true
+        minReplicas: 4
+        maxReplicas: 6
+        target: 150
+    asserts:
+      - failedTemplate:
+          errorMessage: "postgres: replicas (2) is below the effective floor (4 = max(minReplicas 4, maxSyncReplicas+1 1, 2)); under dry-run/transition the ScaledObject is paused but its minReplicaCount clamp still raises the live count to the floor on the first reconcile (a scale-up in a mode meant to only observe), and client-side apply never pulls it back. Stage replicas to at least the floor before dry-run/transition."
+
+  - it: fails closed when the quorum floor exceeds maxReplicas rather than silently running an unbounded count
+    templates:
+      - templates/scaledobject.yaml
+    set:
+      autoscaling:
+        enabled: true
+        minReplicas: 2
+        maxReplicas: 6
+        target: 150
+      quorum:
+        maxSyncReplicas: 6
+    asserts:
+      # floor = maxSyncReplicas+1 = 7 > maxReplicas 6. Previously effectiveMax silently
+      # raised BOTH bounds to 7 (a maxReplicas cost ceiling quietly defeated, unbounded
+      # for a large maxSyncReplicas). Now the render fails closed and tells the operator
+      # to raise maxReplicas.
+      - failedTemplate:
+          errorMessage: "postgres: the effective minimum instance count (7 = max(minReplicas 2, maxSyncReplicas+1 7, 2)) exceeds autoscaling.maxReplicas (6); raise maxReplicas to at least the quorum floor."
+
+  - it: fails closed when replicas exceeds maxReplicas (cold-start above-ceiling shed guard)
+    templates:
+      - templates/scaledobject.yaml
+    set:
+      replicas: 8
+      autoscaling:
+        enabled: true
+        minReplicas: 2
+        maxReplicas: 6
+        target: 150
+      quorum:
+        maxSyncReplicas: 0
+    asserts:
+      # effectiveMin = 2 <= maxReplicas 6 (the floor>max guard passes), but the resting/seed
+      # count replicas 8 exceeds maxReplicas 6: on enable (or dry-run/transition) the stock
+      # HPA's currentReplicas > maxReplicaCount branch writes /scale = maxReplicaCount
+      # unconditionally, cutting the live count straight to 6 past the scale-down pacing.
+      # Fail closed rather than shed standbys + PVCs silently.
+      - failedTemplate:
+          errorMessage: "postgres: replicas (8) exceeds autoscaling.maxReplicas (6); enabling autoscaling (or dry-run/transition) would make KEDA's HPA cut the live count straight to maxReplicas in one step, shedding the surplus standbys and their PVCs past the scale-down pacing. Raise autoscaling.maxReplicas to at least replicas, or lower replicas deliberately first."
+
+  - it: rejects a stray maxReplicas of 0 (effective floor > max) rather than coercing or clamping it
+    templates:
+      - templates/scaledobject.yaml
+    set:
+      autoscaling:
+        enabled: true
+        minReplicas: 2
+        maxReplicas: 0
+        target: 150
+      quorum:
+        maxSyncReplicas: 0
+    asserts:
+      # maxReplicas: 0 is neither silently coerced to the values default (6) nor
+      # clamped to the floor: the effective minimum (2, the read floor) exceeds
+      # maxReplicas (0), a contradiction that fails at render with a clear message.
+      - failedTemplate:
+          errorMessage: "postgres: the effective minimum instance count (2 = max(minReplicas 2, maxSyncReplicas+1 1, 2)) exceeds autoscaling.maxReplicas (0); raise maxReplicas to at least the quorum floor."
+
+  - it: holds instances at the staged count and pauses the ScaledObject in migration phase 1 (transition)
+    set:
+      replicas: 5                    # operator stages this to the live instance count
+      autoscaling:
+        enabled: true
+        transition: true
+        minReplicas: 2
+        maxReplicas: 6
+        target: 150
+      quorum:
+        maxSyncReplicas: 2
+    asserts:
+      # phase 1: the static field is kept (as a floor) so three-way merge cannot
+      # delete it and collapse CNPG to 1 while KEDA stands up
+      - equal:
+          path: spec.instances
+          value: 5
+        documentSelector:
+          path: kind
+          value: Cluster
+        template: templates/db.yaml
+      # ...and the ScaledObject is present but paused in BOTH directions (no writer
+      # contention yet). Deliberately not the full paused annotation, which would
+      # delete the HPA; the unidirectional pair keeps the HPA warm for phase 2.
+      - equal:
+          path: metadata.annotations["autoscaling.keda.sh/paused-scale-in"]
+          value: "true"
+        template: templates/scaledobject.yaml
+      - equal:
+          path: metadata.annotations["autoscaling.keda.sh/paused-scale-out"]
+          value: "true"
+        template: templates/scaledobject.yaml
+      # the HPA-deleting full pause must NOT be set
+      - notExists:
+          path: metadata.annotations["autoscaling.keda.sh/paused"]
+        template: templates/scaledobject.yaml
+
+  - it: does not dip instances when transition flips to active (phase 1 -> phase 2, staged replicas)
+    templates:
+      - templates/db.yaml
+    set:
+      replicas: 5                    # staged to the live count in phase 1
+      autoscaling:
+        enabled: true
+        transition: false            # phase 2: active autoscaling
+        minReplicas: 2
+        maxReplicas: 6
+        target: 150
+      quorum:
+        maxSyncReplicas: 2
+    asserts:
+      # Phase 1 (transition:true, tested above) renders instances: replicas = 5. Phase 2
+      # (active) must render the SAME 5 so the three-way merge is a no-op and the live
+      # cluster does not shed replicas. activeSeed = max(replicas 5, effectiveMin 3) = 5.
+      # Seeding effectiveMin alone would render 3 here and drop 5->3 at the flip.
+      - equal:
+          path: spec.instances
+          value: 5
+        documentSelector:
+          path: kind
+          value: Cluster
+
+  - it: seeds the quorum floor (not the smaller staged replicas) when replicas is below the floor
+    templates:
+      - templates/db.yaml
+    set:
+      replicas: 2
+      autoscaling:
+        enabled: true
+        minReplicas: 2
+        maxReplicas: 6
+        target: 150
+      quorum:
+        maxSyncReplicas: 4             # floor = 5 > replicas 2
+    asserts:
+      # activeSeed = max(replicas 2, effectiveMin 5) = 5 — the floor still wins, so the
+      # constant never undercuts synchronous quorum even with a small replicas.
+      - equal:
+          path: spec.instances
+          value: 5
+        documentSelector:
+          path: kind
+          value: Cluster
+
+  - it: builds a CPU query when metric is ReadCPUUtilization
+    templates:
+      - templates/scaledobject.yaml
+    set:
+      autoscaling:
+        enabled: true
+        metric: ReadCPUUtilization
+        minReplicas: 2
+        maxReplicas: 6
+        target: 500
+      quorum:
+        maxSyncReplicas: 2
+    asserts:
+      - matchRegex:
+          path: spec.triggers[0].metadata.query
+          pattern: container_cpu_usage_seconds_total
+      - matchRegex:
+          path: spec.triggers[0].metadata.query
+          pattern: \+ 500
+      # same standby-only selector on the CPU path
+      - matchRegex:
+          path: spec.triggers[0].metadata.query
+          pattern: label_cnpg_io_instance_role="replica"
+
+  - it: folds the replication-lag brake into the query when maxReplicationLagSeconds > 0
+    templates:
+      - templates/scaledobject.yaml
+    set:
+      autoscaling:
+        enabled: true
+        minReplicas: 2
+        maxReplicas: 6
+        target: 150
+        maxReplicationLagSeconds: 30
+      quorum:
+        maxSyncReplicas: 2
+    asserts:
+      # lag term (with hysteresis via max_over_time) at the configured threshold,
+      # individually floored so an absent lag metric resolves to 0 (fail-open)
+      - matchRegex:
+          path: spec.triggers[0].metadata.query
+          pattern: max_over_time\(cnpg_pg_replication_lag.*> bool 30\) or vector\(0\)
+      # write gate so an idle primary does not trip the brake, likewise floored
+      - matchRegex:
+          path: spec.triggers[0].metadata.query
+          pattern: rate\(cnpg_collector_wal_records.*> bool 0\) or vector\(0\)
+      # frozen branch pins desired to the current instance count under lag, counting
+      # only instance pods (role-scoped) so lingering CNPG join/bootstrap Job pods
+      # (which carry cnpg.io/cluster but jobRole, not instanceRole) don't inflate it
+      - matchRegex:
+          path: spec.triggers[0].metadata.query
+          pattern: count\(kube_pod_labels\{job="kube-state-metrics",namespace="tenant-acme",label_cnpg_io_cluster="postgres-db",label_cnpg_io_instance_role=~".\+"\}\) \* 150
+      # the frozen summand is floored with `or vector(0)` so a kube-state-metrics
+      # scrape gap (empty count) cannot empty the whole `+` sum and defeat the
+      # base term's own floor
+      - matchRegex:
+          path: spec.triggers[0].metadata.query
+          pattern: count\(kube_pod_labels.*\* 150\).*or vector\(0\)\)$
+      # the cluster-wide lag/WAL join is the fourth kube_pod_labels selector; it pins
+      # job="kube-state-metrics" too and carries no instance_role (closes right after
+      # the cluster label), so assert it distinctly from the role-scoped selectors
+      - matchRegex:
+          path: spec.triggers[0].metadata.query
+          pattern: kube_pod_labels\{job="kube-state-metrics",namespace="tenant-acme",label_cnpg_io_cluster="postgres-db"\}
+
+  - it: fails closed when the monitoring namespace is not set
+    templates:
+      - templates/scaledobject.yaml
+    set:
+      _namespace:
+        monitoring: ""
+      autoscaling:
+        enabled: true
+        minReplicas: 2
+        maxReplicas: 6
+        target: 150
+      quorum:
+        maxSyncReplicas: 0
+    asserts:
+      - failedTemplate:
+          errorMessage: "postgres: autoscaling requires a monitoring namespace to reach vmselect, but none is set (_namespace.monitoring is empty). The platform normally injects it; ensure the tenant has monitoring enabled."
+
+  - it: omits the replication-lag brake when maxReplicationLagSeconds is 0
+    templates:
+      - templates/scaledobject.yaml
+    set:
+      autoscaling:
+        enabled: true
+        minReplicas: 2
+        maxReplicas: 6
+        target: 150
+        maxReplicationLagSeconds: 0
+      quorum:
+        maxSyncReplicas: 2
+    asserts:
+      - notMatchRegex:
+          path: spec.triggers[0].metadata.query
+          pattern: cnpg_pg_replication_lag
+
+  - it: keeps the static count and pauses the ScaledObject in dry-run mode
+    set:
+      autoscaling:
+        enabled: true
+        dryRun: true
+        minReplicas: 2
+        maxReplicas: 6
+        target: 150
+      quorum:
+        maxSyncReplicas: 1
+    asserts:
+      - equal:
+          path: spec.instances
+          value: 2
+        documentSelector:
+          path: kind
+          value: Cluster
+        template: templates/db.yaml
+      # dry-run pauses both directions (HPA kept + metric still served; desired freezes
+      # to current, so the recommendation is read from the metric), never the
+      # HPA-deleting full pause that would blind the recommendation entirely.
+      - equal:
+          path: metadata.annotations["autoscaling.keda.sh/paused-scale-in"]
+          value: "true"
+        template: templates/scaledobject.yaml
+      - equal:
+          path: metadata.annotations["autoscaling.keda.sh/paused-scale-out"]
+          value: "true"
+        template: templates/scaledobject.yaml
+      - notExists:
+          path: metadata.annotations["autoscaling.keda.sh/paused"]
+        template: templates/scaledobject.yaml
+
+  - it: fails closed when the static instance count would violate synchronous quorum (disable-wedge guard)
+    templates:
+      - templates/db.yaml
+    set:
+      # autoscaling off: the chart renders the static instances: <replicas>. With
+      # replicas at its default 2 and maxSyncReplicas 2, CNPG would reject the
+      # Cluster (maxSyncReplicas must be < instances). This is exactly the wedge a
+      # tenant hits when DISABLING autoscaling on a quorum cluster whose replicas
+      # was never raised off the default. Must fail closed at render, not at the webhook.
+      autoscaling:
+        enabled: false
+      quorum:
+        maxSyncReplicas: 2
+    asserts:
+      - failedTemplate:
+          errorMessage: "postgres: replicas (2) must be greater than quorum.maxSyncReplicas (2) - CNPG rejects a Cluster whose maxSyncReplicas is not lower than its instance count. Raise replicas above maxSyncReplicas. (If you are disabling autoscaling on a synchronous-quorum cluster, first set replicas to at least the live instance count: kubectl scale cluster.postgresql.cnpg.io/postgres-db --replicas=<live count>, with the HelmRelease suspended.)"
+
+  - it: fails closed when dryRun renders a quorum-invalid static count (floor guard subsumes the wedge)
+    templates:
+      - templates/scaledobject.yaml
+    set:
+      # dryRun with a quorum cluster whose replicas is still the default is caught by the
+      # floor guard (scaledobject.yaml), not the db.yaml wedge: under dryRun the ScaledObject
+      # is live with minReplicaCount=effectiveMin=max(minReplicas 2, maxSyncReplicas+1 3, 2)=3,
+      # and replicas (2) < 3 fires the floor guard first. That guard is strictly broader than
+      # the wedge here — any replicas <= maxSyncReplicas is also < effectiveMin — so it
+      # supersedes it for dryRun/transition. The wedge itself is still exercised for the
+      # DISABLED path above, where no ScaledObject (and no floor guard) renders.
+      autoscaling:
+        enabled: true
+        dryRun: true
+      quorum:
+        maxSyncReplicas: 2
+    asserts:
+      - failedTemplate:
+          errorMessage: "postgres: replicas (2) is below the effective floor (3 = max(minReplicas 2, maxSyncReplicas+1 3, 2)); under dry-run/transition the ScaledObject is paused but its minReplicaCount clamp still raises the live count to the floor on the first reconcile (a scale-up in a mode meant to only observe), and client-side apply never pulls it back. Stage replicas to at least the floor before dry-run/transition."
+
+  - it: rejects a non-positive autoscaling target
+    templates:
+      - templates/scaledobject.yaml
+    set:
+      autoscaling:
+        enabled: true
+        minReplicas: 2
+        maxReplicas: 6
+        target: 0
+      quorum:
+        maxSyncReplicas: 2
+    asserts:
+      - failedTemplate:
+          errorMessage: "postgres: autoscaling.target must be a positive integer (the desired-replica formula divides the read load by it)."
+
+  - it: rejects minReplicas greater than maxReplicas instead of silently clamping
+    templates:
+      - templates/scaledobject.yaml
+    set:
+      autoscaling:
+        enabled: true
+        minReplicas: 10
+        maxReplicas: 3
+        target: 150
+      quorum:
+        maxSyncReplicas: 0
+    asserts:
+      - failedTemplate:
+          errorMessage: "postgres: the effective minimum instance count (10 = max(minReplicas 10, maxSyncReplicas+1 1, 2)) exceeds autoscaling.maxReplicas (3); raise maxReplicas to at least the quorum floor."
diff --git a/packages/apps/postgres/tests/backup_storage_test.yaml b/packages/apps/postgres/tests/backup_storage_test.yaml
index 8adab98b1e..4aba2222b8 100644
--- a/packages/apps/postgres/tests/backup_storage_test.yaml
+++ b/packages/apps/postgres/tests/backup_storage_test.yaml
@@ -1,11 +1,11 @@
-suite: backup storage flow (barmanObjectStore gating, chart Secret, bootstrap guards)
+suite: backup storage flow (barman-cloud plugin gating, chart Secret, bootstrap guards)
 
-# Locks in the conditional rendering this PR introduced on the cnpg.io
-# Cluster and the chart-managed <release>-s3-creds Secret:
-#   - the legacy flow renders spec.backup.barmanObjectStore + the Secret
+# Locks in the conditional rendering on the cnpg.io Cluster, the barman-cloud
+# ObjectStore CR, and the chart-managed <release>-s3-creds Secret:
+#   - the legacy flow wires spec.plugins + renders the ObjectStore + the Secret
 #     only when real S3 coordinates are present;
-#   - the platform useSystemBucket flow leaves both out (the CNPG backup
-#     driver SSA-patches the live Cluster at first BackupJob time);
+#   - the platform useSystemBucket flow leaves them out (the CNPG backup
+#     driver SSA-patches spec.plugins + the ObjectStore at first BackupJob time);
 #   - bootstrap.recovery fails fast at render time when it would otherwise
 #     emit a dangling s3Credentials reference (useSystemBucket, or no creds).
 # These are template-rendering contracts, so helm-unittest is the right tool.
@@ -23,23 +23,28 @@ set:
     scheduling: {}
 
 tests:
-  - it: "useSystemBucket=true: chart skips barmanObjectStore and <release>-s3-creds"
+  - it: "useSystemBucket=true: chart skips spec.plugins, ObjectStore and <release>-s3-creds"
     set:
       backup:
         enabled: true
         useSystemBucket: true
     asserts:
       - notExists:
-          path: spec.backup.barmanObjectStore
+          path: spec.plugins
         template: templates/db.yaml
         documentSelector:
           path: kind
           value: Cluster
+      # No chart-rendered ObjectStore in the platform flow (the driver owns it):
+      # db.yaml emits only Cluster + WorkloadMonitor.
+      - hasDocuments:
+          count: 2
+        template: templates/db.yaml
       - hasDocuments:
           count: 0
         template: templates/backup-secret.yaml
 
-  - it: "legacy backup with inline creds: renders barmanObjectStore + <release>-s3-creds"
+  - it: "legacy backup with inline creds: wires spec.plugins + ObjectStore + <release>-s3-creds"
     set:
       backup:
         enabled: true
@@ -47,19 +52,67 @@ tests:
         s3AccessKey: AKIAEXAMPLE
         s3SecretKey: s3cr3t
     asserts:
-      - exists:
+      # The Cluster references the barman-cloud plugin, not native barmanObjectStore.
+      - notExists:
           path: spec.backup.barmanObjectStore
         template: templates/db.yaml
         documentSelector:
           path: kind
           value: Cluster
       - equal:
-          path: spec.backup.barmanObjectStore.s3Credentials.accessKeyId.name
-          value: pg-test-s3-creds
+          path: spec.plugins[0].name
+          value: barman-cloud.cloudnative-pg.io
         template: templates/db.yaml
         documentSelector:
           path: kind
           value: Cluster
+      - equal:
+          path: spec.plugins[0].parameters.barmanObjectName
+          value: pg-test
+        template: templates/db.yaml
+        documentSelector:
+          path: kind
+          value: Cluster
+      # The WAL-archive S3 prefix is pinned explicitly to the release name and
+      # must never change on a live cluster (the driver preserves it).
+      - equal:
+          path: spec.plugins[0].parameters.serverName
+          value: pg-test
+        template: templates/db.yaml
+        documentSelector:
+          path: kind
+          value: Cluster
+      # The ObjectStore carries the S3 credentials reference.
+      - equal:
+          path: metadata.name
+          value: pg-test
+        template: templates/db.yaml
+        documentSelector:
+          path: kind
+          value: ObjectStore
+      - equal:
+          path: spec.configuration.s3Credentials.accessKeyId.name
+          value: pg-test-s3-creds
+        template: templates/db.yaml
+        documentSelector:
+          path: kind
+          value: ObjectStore
+      # The barman-cloud sidecar's S3 request checksum is pinned to when_required
+      # (non-AWS S3 gateways reject the botocore default flexible checksum).
+      - equal:
+          path: spec.instanceSidecarConfiguration.env[0].name
+          value: AWS_REQUEST_CHECKSUM_CALCULATION
+        template: templates/db.yaml
+        documentSelector:
+          path: kind
+          value: ObjectStore
+      - equal:
+          path: spec.instanceSidecarConfiguration.env[0].value
+          value: when_required
+        template: templates/db.yaml
+        documentSelector:
+          path: kind
+          value: ObjectStore
       - hasDocuments:
           count: 1
         template: templates/backup-secret.yaml
@@ -68,7 +121,26 @@ tests:
           value: pg-test-s3-creds
         template: templates/backup-secret.yaml
 
-  - it: "backup enabled, no creds, useSystemBucket=false: barmanObjectStore not rendered"
+  - it: "empty retentionPolicy is omitted from the ObjectStore (plugin CRD rejects \"\")"
+    # The barman-cloud ObjectStore CRD validates retentionPolicy against
+    # ^[1-9][0-9]*[dwm]$, so an explicit empty value must be omitted rather than
+    # rendered as retentionPolicy: "" (which the API server rejects).
+    set:
+      backup:
+        enabled: true
+        useSystemBucket: false
+        s3AccessKey: AKIAEXAMPLE
+        s3SecretKey: s3cr3t
+        retentionPolicy: ""
+    asserts:
+      - notExists:
+          path: spec.retentionPolicy
+        template: templates/db.yaml
+        documentSelector:
+          path: kind
+          value: ObjectStore
+
+  - it: "backup enabled, no creds, useSystemBucket=false: plugin + ObjectStore not rendered"
     set:
       backup:
         enabled: true
@@ -77,15 +149,155 @@ tests:
         s3SecretKey: ""
     asserts:
       - notExists:
-          path: spec.backup.barmanObjectStore
+          path: spec.plugins
         template: templates/db.yaml
         documentSelector:
           path: kind
           value: Cluster
+      # No ObjectStore rendered: db.yaml emits only Cluster + WorkloadMonitor.
+      - hasDocuments:
+          count: 2
+        template: templates/db.yaml
       - hasDocuments:
           count: 0
         template: templates/backup-secret.yaml
 
+  - it: "bootstrap recovery: externalClusters[].plugin + a -recovery ObjectStore (serverName on the plugin param, not the ObjectStore)"
+    set:
+      backup:
+        enabled: true
+        useSystemBucket: false
+        s3AccessKey: AKIAEXAMPLE
+        s3SecretKey: s3cr3t
+        destinationPath: s3://bucket/pg-test/
+        endpointURL: https://s3.example:9000
+      bootstrap:
+        enabled: true
+        oldName: old-pg
+        serverName: old-server
+    asserts:
+      # Recovery uses the barman-cloud plugin, not the removed externalClusters[].barmanObjectStore.
+      - notExists:
+          path: spec.externalClusters[0].barmanObjectStore
+        template: templates/db.yaml
+        documentSelector:
+          path: kind
+          value: Cluster
+      - equal:
+          path: spec.externalClusters[0].plugin.name
+          value: barman-cloud.cloudnative-pg.io
+        template: templates/db.yaml
+        documentSelector:
+          path: kind
+          value: Cluster
+      - equal:
+          path: spec.externalClusters[0].plugin.parameters.barmanObjectName
+          value: pg-test-recovery
+        template: templates/db.yaml
+        documentSelector:
+          path: kind
+          value: Cluster
+      # serverName rides on the plugin parameter...
+      - equal:
+          path: spec.externalClusters[0].plugin.parameters.serverName
+          value: old-server
+        template: templates/db.yaml
+        documentSelector:
+          path: kind
+          value: Cluster
+      # ...and the -recovery ObjectStore carries the source S3 config but MUST NOT set
+      # serverName inside spec.configuration (the plugin forbids it there).
+      - equal:
+          path: spec.configuration.destinationPath
+          value: s3://bucket/pg-test/
+        template: templates/db.yaml
+        documentSelector:
+          path: metadata.name
+          value: pg-test-recovery
+      - notExists:
+          path: spec.configuration.serverName
+        template: templates/db.yaml
+        documentSelector:
+          path: metadata.name
+          value: pg-test-recovery
+      # The non-AWS S3 request-checksum pin is applied to the recovery ObjectStore too.
+      - equal:
+          path: spec.instanceSidecarConfiguration.env[0].name
+          value: AWS_REQUEST_CHECKSUM_CALCULATION
+        template: templates/db.yaml
+        documentSelector:
+          path: metadata.name
+          value: pg-test-recovery
+      - equal:
+          path: spec.instanceSidecarConfiguration.env[0].value
+          value: when_required
+        template: templates/db.yaml
+        documentSelector:
+          path: metadata.name
+          value: pg-test-recovery
+
+  - it: "in-place restore: archiver serverName uses bootstrap.newServerName, distinct from the recovery source"
+    # Worst case: source serverName equals the restored cluster's own release
+    # name (pg-test). The chart must archive under bootstrap.newServerName (a
+    # fresh prefix) while recovering from bootstrap.serverName, or the restore
+    # would fail barman-cloud-check-wal-archive with "Expected empty archive".
+    set:
+      backup:
+        enabled: true
+        useSystemBucket: false
+        s3AccessKey: AKIAEXAMPLE
+        s3SecretKey: s3cr3t
+        destinationPath: s3://bucket/pg-test/
+        endpointURL: https://s3.example:9000
+      bootstrap:
+        enabled: true
+        oldName: pg-test
+        serverName: pg-test
+        newServerName: pg-test-restore-deadbeef
+    asserts:
+      # WAL archiver writes to the fresh restore prefix, never the source's.
+      - equal:
+          path: spec.plugins[0].parameters.serverName
+          value: pg-test-restore-deadbeef
+        template: templates/db.yaml
+        documentSelector:
+          path: kind
+          value: Cluster
+      # Recovery still reads the source prefix.
+      - equal:
+          path: spec.externalClusters[0].plugin.parameters.serverName
+          value: pg-test
+        template: templates/db.yaml
+        documentSelector:
+          path: kind
+          value: Cluster
+
+  - it: "bootstrap recovery without serverName: plugin serverName defaults to oldName (native parity)"
+    # Native CNPG defaulted an absent serverName to the externalClusters entry
+    # name (= oldName); the barman-cloud plugin defaults it to the NEW cluster's
+    # name, which would read the wrong S3 prefix. The chart must therefore
+    # always emit serverName, defaulting to oldName.
+    set:
+      backup:
+        enabled: true
+        useSystemBucket: false
+        s3AccessKey: AKIAEXAMPLE
+        s3SecretKey: s3cr3t
+        destinationPath: s3://bucket/pg-test/
+        endpointURL: https://s3.example:9000
+      bootstrap:
+        enabled: true
+        oldName: old-pg
+        serverName: ""
+    asserts:
+      - equal:
+          path: spec.externalClusters[0].plugin.parameters.serverName
+          value: old-pg
+        template: templates/db.yaml
+        documentSelector:
+          path: kind
+          value: Cluster
+
   - it: "bootstrap + useSystemBucket: render fails fast (lock in existing guard)"
     template: templates/db.yaml
     set:
@@ -112,3 +324,73 @@ tests:
     asserts:
       - failedTemplate:
           errorMessage: "postgres: bootstrap.enabled=true requires S3 credentials: set backup.s3AccessKey+backup.s3SecretKey, backup.s3CredentialsSecret.name, or backup.useSystemBucket=true (with a backups.cozystack.io/RestoreJob)."
+
+  - it: "bootstrap recovery with backupID and recoveryTime: both reach recoveryTarget"
+    # Without backupID the barman-cloud plugin picks the newest backup ending by
+    # targetTime, on any timeline, rather than the one the restore asked for.
+    template: templates/db.yaml
+    documentSelector:
+      path: kind
+      value: Cluster
+    set:
+      backup:
+        enabled: true
+        useSystemBucket: false
+        s3AccessKey: AKIAEXAMPLE
+        s3SecretKey: s3cr3t
+        destinationPath: s3://bucket/pg-test/
+      bootstrap:
+        enabled: true
+        oldName: pg-test
+        backupID: "20260921T062713"
+        recoveryTime: "2026-09-22T10:00:00Z"
+    asserts:
+      - equal:
+          path: spec.bootstrap.recovery.recoveryTarget.backupID
+          value: "20260921T062713"
+      # targetTime renders unquoted, so both sides read as a YAML timestamp.
+      - equal:
+          path: spec.bootstrap.recovery.recoveryTarget.targetTime
+          value: 2026-09-22T10:00:00Z
+
+  - it: "bootstrap recovery with backupID only: recovery starts from it and replays to the end of the log"
+    template: templates/db.yaml
+    documentSelector:
+      path: kind
+      value: Cluster
+    set:
+      backup:
+        enabled: true
+        useSystemBucket: false
+        s3AccessKey: AKIAEXAMPLE
+        s3SecretKey: s3cr3t
+        destinationPath: s3://bucket/pg-test/
+      bootstrap:
+        enabled: true
+        oldName: pg-test
+        backupID: "20260921T062713"
+    asserts:
+      - equal:
+          path: spec.bootstrap.recovery.recoveryTarget.backupID
+          value: "20260921T062713"
+      - notExists:
+          path: spec.bootstrap.recovery.recoveryTarget.targetTime
+
+  - it: "bootstrap recovery with neither: no recoveryTarget, the plugin restores the newest backup"
+    template: templates/db.yaml
+    documentSelector:
+      path: kind
+      value: Cluster
+    set:
+      backup:
+        enabled: true
+        useSystemBucket: false
+        s3AccessKey: AKIAEXAMPLE
+        s3SecretKey: s3cr3t
+        destinationPath: s3://bucket/pg-test/
+      bootstrap:
+        enabled: true
+        oldName: pg-test
+    asserts:
+      - notExists:
+          path: spec.bootstrap.recovery.recoveryTarget
diff --git a/packages/apps/postgres/tests/backup_test.yaml b/packages/apps/postgres/tests/backup_test.yaml
index 8dced1513d..ee857fde36 100644
--- a/packages/apps/postgres/tests/backup_test.yaml
+++ b/packages/apps/postgres/tests/backup_test.yaml
@@ -73,6 +73,14 @@ tests:
       - equal:
           path: spec.cluster.name
           value: pg-test
+      # The ScheduledBackup must delegate to the barman-cloud plugin, not the
+      # deprecated native barmanObjectStore method (removed in CNPG 1.29).
+      - equal:
+          path: spec.method
+          value: plugin
+      - equal:
+          path: spec.pluginConfiguration.name
+          value: barman-cloud.cloudnative-pg.io
 
   - it: default values produce no ScheduledBackup
     # Defends the new default - users who deploy with no overrides do not
diff --git a/packages/apps/postgres/tests/barman_resources_test.yaml b/packages/apps/postgres/tests/barman_resources_test.yaml
new file mode 100644
index 0000000000..905fde2bbb
--- /dev/null
+++ b/packages/apps/postgres/tests/barman_resources_test.yaml
@@ -0,0 +1,75 @@
+suite: Barman resources under tenant container limits
+templates:
+  - templates/db.yaml
+release:
+  name: postgres-source
+  namespace: tenant-test
+set:
+  _cluster:
+    scheduling: {}
+  backup:
+    destinationPath: s3://backups/test/
+    endpointURL: https://s3.example.org
+    s3CredentialsSecret:
+      name: postgres-backup
+tests:
+  - it: sets resources for native backup without inheriting the tenant 128Mi limit
+    set:
+      backup.enabled: true
+    asserts:
+      - equal:
+          path: spec.instanceSidecarConfiguration.resources
+          value:
+            requests:
+              cpu: 100m
+              memory: 256Mi
+            limits:
+              memory: 1Gi
+        documentSelector:
+          path: kind
+          value: ObjectStore
+      - notExists:
+          path: spec.instanceSidecarConfiguration.resources.limits.cpu
+        documentSelector:
+          path: kind
+          value: ObjectStore
+      - equal:
+          path: spec.configuration.s3Credentials.accessKeyId.name
+          value: postgres-backup
+        documentSelector:
+          path: kind
+          value: ObjectStore
+  - it: gives recovery its own resources while backup remains disabled
+    set:
+      backup.enabled: false
+      bootstrap:
+        enabled: true
+        oldName: postgres-original
+    asserts:
+      - equal:
+          path: spec.instanceSidecarConfiguration.resources.limits.memory
+          value: 1Gi
+        documentSelector:
+          path: kind
+          value: ObjectStore
+      - equal:
+          path: metadata.name
+          value: postgres-source-recovery
+        documentSelector:
+          path: kind
+          value: ObjectStore
+      - equal:
+          path: spec.externalClusters[0].plugin.parameters.serverName
+          value: postgres-original
+        documentSelector:
+          path: kind
+          value: Cluster
+  - it: does not enable backup for an application that has not requested it
+    asserts:
+      - hasDocuments:
+          count: 2
+      - notExists:
+          path: spec.plugins
+        documentSelector:
+          path: kind
+          value: Cluster
diff --git a/packages/apps/postgres/tests/credentials_lookup_test.yaml b/packages/apps/postgres/tests/credentials_lookup_test.yaml
new file mode 100644
index 0000000000..676511a755
--- /dev/null
+++ b/packages/apps/postgres/tests/credentials_lookup_test.yaml
@@ -0,0 +1,36 @@
+suite: postgres credentials lookup-backed preservation
+release:
+  name: pg-test
+  namespace: tenant-test
+templates:
+  - templates/init-script.yaml
+tests:
+  - it: preserves an existing password across renders
+    # The lookup in init-script.yaml reads back the current Secret, so a user
+    # keeps the password already stored rather than getting a fresh one on every
+    # reconcile. kubernetesProvider mocks that existing Secret.
+    kubernetesProvider:
+      scheme:
+        "v1/Secret":
+          gvr:
+            version: v1
+            resource: secrets
+          namespaced: true
+      objects:
+        - apiVersion: v1
+          kind: Secret
+          metadata:
+            name: pg-test-credentials
+            namespace: tenant-test
+          data:
+            testuser: ZXhpc3RpbmdwYXNzd29yZA==
+    set:
+      users:
+        testuser: {}
+    documentSelector:
+      path: metadata.name
+      value: pg-test-credentials
+    asserts:
+      - equal:
+          path: stringData.testuser
+          value: existingpassword
diff --git a/packages/apps/postgres/tests/credentials_test.yaml b/packages/apps/postgres/tests/credentials_test.yaml
new file mode 100644
index 0000000000..ae2e15aced
--- /dev/null
+++ b/packages/apps/postgres/tests/credentials_test.yaml
@@ -0,0 +1,71 @@
+suite: postgres credentials generation
+
+# Passwords are always chart-generated (no plaintext input) and preserved across
+# reconciles by the lookup in init-script.yaml. This suite renders without a
+# kubernetesProvider, so lookup() returns nothing and every render generates fresh
+# passwords; the lookup-backed preserve path is covered in credentials_lookup_test.yaml.
+
+release:
+  name: pg-test
+  namespace: tenant-test
+
+templates:
+  - templates/init-script.yaml
+
+tests:
+  - it: generates a 16-char alphanumeric password for each defined user
+    set:
+      users:
+        testuser: {}
+    documentSelector:
+      path: metadata.name
+      value: pg-test-credentials
+    asserts:
+      - matchRegex:
+          path: stringData.testuser
+          pattern: ^[a-zA-Z0-9]{16}$
+
+  - it: ignores a value-supplied password and generates one instead
+    # Pins the breaking-change contract: the schema no longer declares
+    # `password`, but nothing rejects a leftover key, so prove it is dropped
+    # rather than honoured.
+    set:
+      users:
+        testuser:
+          password: value-supplied-secret
+    documentSelector:
+      path: metadata.name
+      value: pg-test-credentials
+    asserts:
+      - matchRegex:
+          path: stringData.testuser
+          pattern: ^[a-zA-Z0-9]{16}$
+      - notMatchRegex:
+          path: stringData.testuser
+          pattern: value-supplied-secret
+
+  - it: flags the credentials Secret as pending during a restore
+    set:
+      users:
+        testuser: {}
+      bootstrap:
+        enabled: true
+        oldName: pg-old
+    documentSelector:
+      path: metadata.name
+      value: pg-test-credentials
+    asserts:
+      - equal:
+          path: metadata.annotations["postgres.cozystack.io/credentials-pending"]
+          value: "true"
+
+  - it: does not flag the credentials Secret as pending outside a restore
+    set:
+      users:
+        testuser: {}
+    documentSelector:
+      path: metadata.name
+      value: pg-test-credentials
+    asserts:
+      - notExists:
+          path: metadata.annotations["postgres.cozystack.io/credentials-pending"]
diff --git a/packages/apps/postgres/tests/database_extension_validation_test.yaml b/packages/apps/postgres/tests/database_extension_validation_test.yaml
new file mode 100644
index 0000000000..0e0e665224
--- /dev/null
+++ b/packages/apps/postgres/tests/database_extension_validation_test.yaml
@@ -0,0 +1,372 @@
+suite: init-script rejects database and extension names that break out of the SQL
+
+# A database name is interpolated into CREATE DATABASE "<db>", the "<db>_admin"
+# role, a single-quoted literal in the superuser DO block, and a shell role list;
+# an extension name into CREATE EXTENSION in the superuser session. The username
+# guard already hardens the same class for users. These guards mirror it for
+# databases and extensions, so a "'"/'"'/";"/space cannot escape into arbitrary
+# superuser SQL or the shell. The extension is quoted at the call site (real names
+# carry "-", e.g. uuid-ossp). Reverting either guard lets the render succeed and
+# fails a reject test; unquoting CREATE EXTENSION fails the quoting test.
+
+templates:
+  - templates/init-script.yaml
+
+release:
+  name: pg-test
+  namespace: tenant-test
+
+set:
+  _cluster:
+    scheduling: {}
+
+tests:
+  - it: fails the render for a database name with a single quote (DO-block breakout)
+    set:
+      databases:
+        "x' OR true": {}
+    asserts:
+      - failedTemplate:
+          errorMessage: 'invalid database name "x'' OR true": a database name may contain only letters, digits and the characters -._ and must be at most 54 characters (it is interpolated into superuser SQL and the init-script shell, and it seeds the "<db>_admin" and "<db>_readonly" PostgreSQL roles, which CREATE ROLE silently truncates past 63 bytes; the next init-job run then cannot drop the truncated role and fails). Changing only its key in values makes the init-job drop the database; to keep the data, a platform administrator first renames it as the CNPG superuser (ALTER DATABASE, and ALTER ROLE for its <db>_admin and <db>_readonly roles), then the key is changed'
+
+  - it: fails the render for a database name with a semicolon and space
+    set:
+      databases:
+        "a; DROP": {}
+    asserts:
+      - failedTemplate:
+          errorMessage: 'invalid database name "a; DROP": a database name may contain only letters, digits and the characters -._ and must be at most 54 characters (it is interpolated into superuser SQL and the init-script shell, and it seeds the "<db>_admin" and "<db>_readonly" PostgreSQL roles, which CREATE ROLE silently truncates past 63 bytes; the next init-job run then cannot drop the truncated role and fails). Changing only its key in values makes the init-job drop the database; to keep the data, a platform administrator first renames it as the CNPG superuser (ALTER DATABASE, and ALTER ROLE for its <db>_admin and <db>_readonly roles), then the key is changed'
+
+  - it: fails the render for an extension name carrying injection
+    set:
+      databases:
+        mydb:
+          extensions:
+            - "x; ALTER ROLE app SUPERUSER; --"
+    asserts:
+      - failedTemplate:
+          errorMessage: 'invalid extension name "x; ALTER ROLE app SUPERUSER; --" for database "mydb": an extension name may contain only letters, digits and the characters -._ , must not be "." or start with "..", and must be at most 63 characters (it is a PostgreSQL identifier interpolated into CREATE EXTENSION in a superuser session; real names carry "-", e.g. uuid-ossp, so it is quoted at the call site). A clause after the name, such as CASCADE or SCHEMA, is not accepted: remove it from the value, which leaves an extension that is already installed as it is, and list the extensions it depends on before it, e.g. [cube, earthdistance]'
+
+  - it: quotes the extension name so a hyphenated one (uuid-ossp) is valid SQL
+    set:
+      databases:
+        mydb:
+          extensions:
+            - uuid-ossp
+    documentSelector:
+      path: metadata.name
+      value: pg-test-init-script
+    asserts:
+      - matchRegex:
+          path: stringData["init.sh"]
+          pattern: 'CREATE EXTENSION IF NOT EXISTS "uuid-ossp";'
+      - notMatchRegex:
+          path: stringData["init.sh"]
+          pattern: 'CREATE EXTENSION IF NOT EXISTS uuid-ossp;'
+
+  # PostgreSQL folds an unquoted identifier to lowercase, so an extension written
+  # as PostGIS resolves to the postgis control file when unquoted. Quoting keeps the case
+  # and looks for PostGIS.control instead, which does not exist: CREATE EXTENSION
+  # fails under ON_ERROR_STOP and the post-upgrade init-job wedges the release.
+  # Fold the name before quoting so it resolves as it did unquoted.
+  - it: folds a mixed-case extension name to lowercase before quoting it
+    set:
+      databases:
+        mydb:
+          extensions:
+            - PostGIS
+            - UUID-OSSP
+    documentSelector:
+      path: metadata.name
+      value: pg-test-init-script
+    asserts:
+      - matchRegex:
+          path: stringData["init.sh"]
+          pattern: 'CREATE EXTENSION IF NOT EXISTS "postgis";'
+      - matchRegex:
+          path: stringData["init.sh"]
+          pattern: 'CREATE EXTENSION IF NOT EXISTS "uuid-ossp";'
+      - notMatchRegex:
+          path: stringData["init.sh"]
+          pattern: 'CREATE EXTENSION IF NOT EXISTS "PostGIS";'
+
+  # When CREATE EXTENSION rendered the value unquoted, writing the quotes into the
+  # value was the only way to get a hyphenated extension, so existing releases
+  # carry '"uuid-ossp"'. One surrounding pair is the identifier's own quoting:
+  # the name inside it is what the charset guard checks and what gets quoted.
+  - it: strips one pair of surrounding quotes from an extension name
+    set:
+      databases:
+        mydb:
+          extensions:
+            - '"uuid-ossp"'
+    documentSelector:
+      path: metadata.name
+      value: pg-test-init-script
+    asserts:
+      - matchRegex:
+          path: stringData["init.sh"]
+          pattern: 'CREATE EXTENSION IF NOT EXISTS "uuid-ossp";'
+      - notMatchRegex:
+          path: stringData["init.sh"]
+          pattern: 'CREATE EXTENSION IF NOT EXISTS ""'
+
+  - it: renders on upgrade for an extension name written with its own quotes
+    release:
+      upgrade: true
+    set:
+      databases:
+        mydb:
+          extensions:
+            - '"uuid-ossp"'
+    documentSelector:
+      path: metadata.name
+      value: pg-test-init-script
+    asserts:
+      - matchRegex:
+          path: stringData["init.sh"]
+          pattern: 'CREATE EXTENSION IF NOT EXISTS "uuid-ossp";'
+
+  # A quoted identifier kept its case when it was rendered unquoted, so it must
+  # resolve to the same control file now; only an unquoted name is folded.
+  - it: keeps the case of an extension name written with its own quotes
+    set:
+      databases:
+        mydb:
+          extensions:
+            - '"PostGIS"'
+    documentSelector:
+      path: metadata.name
+      value: pg-test-init-script
+    asserts:
+      - matchRegex:
+          path: stringData["init.sh"]
+          pattern: 'CREATE EXTENSION IF NOT EXISTS "PostGIS";'
+
+  - it: fails the render for an injection inside an extension name's own quotes
+    set:
+      databases:
+        mydb:
+          extensions:
+            - '"x"; ALTER ROLE app SUPERUSER; --"'
+    asserts:
+      - failedTemplate:
+          errorPattern: 'invalid extension name .* for database "mydb": an extension name may contain only letters'
+
+  - it: fails the render for an extension name with an unbalanced quote
+    set:
+      databases:
+        mydb:
+          extensions:
+            - '"uuid-ossp'
+    asserts:
+      - failedTemplate:
+          errorPattern: 'invalid extension name .* for database "mydb": an extension name may contain only letters'
+
+  # The value was once spliced into CREATE EXTENSION whole, so a release can carry
+  # a clause after the name. The guard still refuses it; the message has to say
+  # how to get past it without losing the dependency the clause pulled in.
+  - it: tells how to replace a CASCADE clause when it refuses one on upgrade
+    release:
+      upgrade: true
+    set:
+      databases:
+        mydb:
+          extensions:
+            - earthdistance CASCADE
+    asserts:
+      - failedTemplate:
+          errorPattern: 'invalid extension name "earthdistance CASCADE" for database "mydb": .*A clause after the name, such as CASCADE or SCHEMA, is not accepted: remove it from the value, which leaves an extension that is already installed as it is, and list the extensions it depends on before it, e\.g\. \[cube, earthdistance\]$'
+
+  - it: creates extensions in the order they are listed
+    set:
+      databases:
+        mydb:
+          extensions:
+            - cube
+            - earthdistance
+    documentSelector:
+      path: metadata.name
+      value: pg-test-init-script
+    asserts:
+      - matchRegex:
+          path: stringData["init.sh"]
+          pattern: '(?s)CREATE EXTENSION IF NOT EXISTS "cube";\s*CREATE EXTENSION IF NOT EXISTS "earthdistance";'
+
+  - it: renders normally for a valid database and extension
+    set:
+      databases:
+        mydb:
+          extensions:
+            - pg_trgm
+    documentSelector:
+      path: metadata.name
+      value: pg-test-init-script
+    asserts:
+      - matchRegex:
+          path: stringData["init.sh"]
+          pattern: 'CREATE DATABASE "mydb"'
+      - matchRegex:
+          path: stringData["init.sh"]
+          pattern: 'CREATE EXTENSION IF NOT EXISTS "pg_trgm";'
+
+  # A database name seeds "<db>_readonly" (a PostgreSQL role); "_readonly" is 9
+  # bytes, so the cap is 54 (not the username's 63). 55 chars fails; 54 renders
+  # (its readonly role is exactly 63 bytes). Reverting the cap to 253 lets 55
+  # through into a silently-truncated, orphan-dropped role.
+  - it: fails the render for a database name of 55 characters (readonly role past 63)
+    set:
+      databases:
+        "daaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa": {}
+    asserts:
+      - failedTemplate:
+          errorMessage: 'invalid database name "daaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa": a database name may contain only letters, digits and the characters -._ and must be at most 54 characters (it is interpolated into superuser SQL and the init-script shell, and it seeds the "<db>_admin" and "<db>_readonly" PostgreSQL roles, which CREATE ROLE silently truncates past 63 bytes; the next init-job run then cannot drop the truncated role and fails). Changing only its key in values makes the init-job drop the database; to keep the data, a platform administrator first renames it as the CNPG superuser (ALTER DATABASE, and ALTER ROLE for its <db>_admin and <db>_readonly roles), then the key is changed'
+
+  - it: renders normally for a database name at the 54-character boundary
+    set:
+      databases:
+        "daaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa": {}
+    documentSelector:
+      path: metadata.name
+      value: pg-test-init-script
+    asserts:
+      - matchRegex:
+          path: stringData["init.sh"]
+          pattern: 'CREATE DATABASE "daaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"'
+
+  # The extension length cap (63, a PostgreSQL identifier) needs its own pin — the
+  # sibling username/database caps have boundary tests, this one did not. 64 fails,
+  # 63 renders. Reverting the extension cap to 253 lets 64 through.
+  - it: fails the render for an extension name of 64 characters
+    set:
+      databases:
+        mydb:
+          extensions:
+            - "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
+    asserts:
+      - failedTemplate:
+          errorMessage: 'invalid extension name "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" for database "mydb": an extension name may contain only letters, digits and the characters -._ , must not be "." or start with "..", and must be at most 63 characters (it is a PostgreSQL identifier interpolated into CREATE EXTENSION in a superuser session; real names carry "-", e.g. uuid-ossp, so it is quoted at the call site). A clause after the name, such as CASCADE or SCHEMA, is not accepted: remove it from the value, which leaves an extension that is already installed as it is, and list the extensions it depends on before it, e.g. [cube, earthdistance]'
+
+  - it: renders normally for an extension name at the 63-character boundary
+    set:
+      databases:
+        mydb:
+          extensions:
+            - "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
+    documentSelector:
+      path: metadata.name
+      value: pg-test-init-script
+    asserts:
+      - matchRegex:
+          path: stringData["init.sh"]
+          pattern: 'CREATE EXTENSION IF NOT EXISTS "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";'
+
+  # A database may declare extensions and no roles at all (roles is optional in
+  # the schema). The grant-assignment loop chained $d.roles.admin/readonly, and a
+  # chained field access off a nil .roles nil-pointers the render when a user
+  # exists and the database has no roles key. Binding $roles := $d.roles | default
+  # dict and dereferencing the local avoids it (the user is in neither role, so it
+  # gets REVOKEs), mirroring the mariadb db.yaml guard. Reverting to the inline
+  # $d.roles.admin chain turns this red with a nil-pointer render error.
+  - it: renders when a database has extensions but no roles while users exist
+    set:
+      users:
+        app: {}
+      databases:
+        mydb:
+          extensions:
+            - pg_trgm
+    documentSelector:
+      path: metadata.name
+      value: pg-test-init-script
+    asserts:
+      - matchRegex:
+          path: stringData["init.sh"]
+          pattern: 'REVOKE "mydb_admin" FROM "app";'
+      - matchRegex:
+          path: stringData["init.sh"]
+          pattern: 'REVOKE "mydb_readonly" FROM "app";'
+
+  # Past 54 bytes the name's <db>_admin/<db>_readonly roles truncate past 63
+  # bytes. The next init-job run orphan-drops the truncated role, DROP OWNED only
+  # reaches the database it runs in, and DROP ROLE then fails on the grants inside
+  # the long-named database, so such a release cannot survive a second run anyway.
+  # The cap therefore holds on upgrade as well: failing the
+  # render names the problem instead of crash-looping the init-job. Gating the cap
+  # to install turns this red.
+  - it: still fails on upgrade for a 55-character database name
+    release:
+      name: pg-test
+      namespace: tenant-test
+      upgrade: true
+    set:
+      databases:
+        "daaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa": {}
+    asserts:
+      - failedTemplate:
+          errorMessage: 'invalid database name "daaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa": a database name may contain only letters, digits and the characters -._ and must be at most 54 characters (it is interpolated into superuser SQL and the init-script shell, and it seeds the "<db>_admin" and "<db>_readonly" PostgreSQL roles, which CREATE ROLE silently truncates past 63 bytes; the next init-job run then cannot drop the truncated role and fails). Changing only its key in values makes the init-job drop the database; to keep the data, a platform administrator first renames it as the CNPG superuser (ALTER DATABASE, and ALTER ROLE for its <db>_admin and <db>_readonly roles), then the key is changed'
+
+  # Past 63 bytes CREATE DATABASE itself truncates the name as well, so the next
+  # run re-runs CREATE under the full name and fails on "already exists".
+  - it: still fails on upgrade for a 64-character database name
+    release:
+      name: pg-test
+      namespace: tenant-test
+      upgrade: true
+    set:
+      databases:
+        "daaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa": {}
+    asserts:
+      - failedTemplate:
+          errorMessage: 'invalid database name "daaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa": a database name may contain only letters, digits and the characters -._ and must be at most 54 characters (it is interpolated into superuser SQL and the init-script shell, and it seeds the "<db>_admin" and "<db>_readonly" PostgreSQL roles, which CREATE ROLE silently truncates past 63 bytes; the next init-job run then cannot drop the truncated role and fails). Changing only its key in values makes the init-job drop the database; to keep the data, a platform administrator first renames it as the CNPG superuser (ALTER DATABASE, and ALTER ROLE for its <db>_admin and <db>_readonly roles), then the key is changed'
+
+  # The charset is the injection guard: a new database added on upgrade is still a
+  # new name, and a quote or ";" in it would break out of superuser SQL, so it is
+  # never gated to install.
+  - it: still fails on upgrade for a database name outside the charset
+    release:
+      name: pg-test
+      namespace: tenant-test
+      upgrade: true
+    set:
+      databases:
+        "a; DROP": {}
+    asserts:
+      - failedTemplate:
+          errorMessage: 'invalid database name "a; DROP": a database name may contain only letters, digits and the characters -._ and must be at most 54 characters (it is interpolated into superuser SQL and the init-script shell, and it seeds the "<db>_admin" and "<db>_readonly" PostgreSQL roles, which CREATE ROLE silently truncates past 63 bytes; the next init-job run then cannot drop the truncated role and fails). Changing only its key in values makes the init-job drop the database; to keep the data, a platform administrator first renames it as the CNPG superuser (ALTER DATABASE, and ALTER ROLE for its <db>_admin and <db>_readonly roles), then the key is changed'
+
+  # "." and a ".." prefix are rejected for usernames because a username is a
+  # Secret key; a database name is not, and both are valid quoted identifiers.
+  - it: renders a database named "." and one starting with ".."
+    set:
+      databases:
+        ".": {}
+        "..x": {}
+    documentSelector:
+      path: metadata.name
+      value: pg-test-init-script
+    asserts:
+      - matchRegex:
+          path: stringData["init.sh"]
+          pattern: 'CREATE DATABASE "\.\.x"'
+
+  # "." and a ".." prefix are not extension names; the guard rejects them with the
+  # same message. Dropping either conjunct lets the render succeed, so the matching
+  # test fails.
+  - it: fails the render for an extension named "."
+    set:
+      databases:
+        mydb:
+          extensions: ["."]
+    asserts:
+      - failedTemplate:
+          errorMessage: 'invalid extension name "." for database "mydb": an extension name may contain only letters, digits and the characters -._ , must not be "." or start with "..", and must be at most 63 characters (it is a PostgreSQL identifier interpolated into CREATE EXTENSION in a superuser session; real names carry "-", e.g. uuid-ossp, so it is quoted at the call site). A clause after the name, such as CASCADE or SCHEMA, is not accepted: remove it from the value, which leaves an extension that is already installed as it is, and list the extensions it depends on before it, e.g. [cube, earthdistance]'
+
+  - it: fails the render for an extension name starting with ".."
+    set:
+      databases:
+        mydb:
+          extensions: ["..x"]
+    asserts:
+      - failedTemplate:
+          errorMessage: 'invalid extension name "..x" for database "mydb": an extension name may contain only letters, digits and the characters -._ , must not be "." or start with "..", and must be at most 63 characters (it is a PostgreSQL identifier interpolated into CREATE EXTENSION in a superuser session; real names carry "-", e.g. uuid-ossp, so it is quoted at the call site). A clause after the name, such as CASCADE or SCHEMA, is not accepted: remove it from the value, which leaves an extension that is already installed as it is, and list the extensions it depends on before it, e.g. [cube, earthdistance]'
diff --git a/packages/apps/postgres/tests/delete_users_test.yaml b/packages/apps/postgres/tests/delete_users_test.yaml
new file mode 100644
index 0000000000..a9f4108c16
--- /dev/null
+++ b/packages/apps/postgres/tests/delete_users_test.yaml
@@ -0,0 +1,145 @@
+suite: init-script removes users dropped from values
+
+# The delete-users pass revokes a user that left .Values.users. Reading the managed
+# users by parsing `\du+` and matching the description in column 4 breaks on
+# PostgreSQL 16 and later, which dropped the "Member of" column, so the description
+# sits in column 3 and nothing matches: a removed user keeps its LOGIN and old
+# password. Query the catalog instead, as the database and role passes do.
+
+templates:
+  - templates/init-script.yaml
+
+release:
+  name: pg-test
+  namespace: tenant-test
+
+set:
+  _cluster:
+    scheduling: {}
+
+tests:
+  - it: reads the managed users from the catalog, not from the \du+ layout
+    set:
+      users:
+        app: {}
+    documentSelector:
+      path: metadata.name
+      value: pg-test-init-script
+    asserts:
+      - matchRegex:
+          path: stringData["init.sh"]
+          pattern: "MANAGED_USERS=\\$\\(psql -v ON_ERROR_STOP=1 -t -A -c \"SELECT r.rolname FROM pg_roles r JOIN pg_shdescription s ON s.objoid = r.oid AND s.classoid = 'pg_authid'::regclass WHERE s.description = 'user managed by helm' AND r.oid IN \\(SELECT m.member FROM pg_auth_members m JOIN pg_roles g ON g.oid = m.roleid WHERE g.rolname = 'cozystack:managed'\\)\"\\)"
+      - notMatchRegex:
+          path: stringData["init.sh"]
+          pattern: 'du\+'
+
+  # CREATE ROLE keeps only the first 63 bytes of a longer name, so the catalog holds
+  # a long user under its truncated name. Comparing it against the declared full
+  # name would call it undeclared and drop it on every run, so the declared names
+  # are compared truncated the same way.
+  - it: compares declared users truncated to 63 bytes
+    release:
+      name: pg-test
+      namespace: tenant-test
+      upgrade: true
+    kubernetesProvider:
+      scheme:
+        "v1/Secret":
+          gvr: {version: v1, resource: secrets}
+          namespaced: true
+      objects:
+        - apiVersion: v1
+          kind: Secret
+          metadata:
+            name: pg-test-credentials
+            namespace: tenant-test
+          data:
+            uuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuu: ZXhpc3RpbmdwYXNzd29yZA==
+    set:
+      users:
+        app: {}
+        uuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuu: {}
+    documentSelector:
+      path: metadata.name
+      value: pg-test-init-script
+    asserts:
+      - matchRegex:
+          path: stringData["init.sh"]
+          pattern: 'DEFINED_USERS="app uuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuu"'
+
+  # A removed user may own objects in any database, and REASSIGN OWNED / DROP OWNED
+  # act only on the database they run in; run in the postgres database alone, DROP
+  # USER then fails on the objects elsewhere and wedges every later init-job run.
+  # Run them in every connectable database before dropping the user.
+  - it: reassigns and drops a removed user's objects in every database
+    set:
+      users:
+        app: {}
+    documentSelector:
+      path: metadata.name
+      value: pg-test-init-script
+    asserts:
+      - matchRegex:
+          path: stringData["init.sh"]
+          pattern: "ALL_DBS=\\$\\(psql -v ON_ERROR_STOP=1 -t -A -c \"SELECT datname FROM pg_database WHERE datallowconn AND NOT datistemplate\"\\)"
+      - matchRegex:
+          path: stringData["init.sh"]
+          pattern: 'for db in \$ALL_DBS; do\npsql -v ON_ERROR_STOP=1 --echo-queries --dbname "\$db" -v user="\$user" <<\\EOT\nREASSIGN OWNED BY :"user" TO "cozystack:orphaned";\nDROP OWNED BY :"user";\nEOT\ndone\npsql -v ON_ERROR_STOP=1 --echo-queries -v user="\$user" <<\\EOT\nDROP USER :"user";\nEOT\n'
+
+  # What a tenant role created must not become superuser-owned when the role is
+  # dropped, so its objects go to an inert role instead of postgres.
+  - it: hands a dropped role's objects to an unprivileged role, not the superuser
+    set:
+      users:
+        app: {}
+    documentSelector:
+      path: metadata.name
+      value: pg-test-init-script
+    asserts:
+      - matchRegex:
+          path: stringData["init.sh"]
+          pattern: 'SELECT ''CREATE ROLE "cozystack:orphaned" NOLOGIN NOINHERIT''\nWHERE NOT EXISTS \(SELECT FROM pg_catalog\.pg_roles WHERE rolname = ''cozystack:orphaned''\)\\gexec'
+      - matchRegex:
+          path: stringData["init.sh"]
+          pattern: 'ALTER ROLE "cozystack:orphaned" NOLOGIN NOINHERIT NOSUPERUSER NOCREATEDB NOCREATEROLE NOREPLICATION NOBYPASSRLS;'
+      - matchRegex:
+          path: stringData["init.sh"]
+          pattern: 'REASSIGN OWNED BY :"role" TO "cozystack:orphaned";'
+      - notMatchRegex:
+          path: stringData["init.sh"]
+          pattern: 'REASSIGN OWNED BY .* TO postgres'
+
+  # Every dropped role's objects share the one receiving role, so it must hold no
+  # memberships in either direction, and functions it ends up owning must run with
+  # the caller's rights rather than its own.
+  - it: keeps the receiving role free of memberships and its functions invoker-rights
+    set:
+      users:
+        app: {}
+    documentSelector:
+      path: metadata.name
+      value: pg-test-init-script
+    asserts:
+      - matchRegex:
+          path: stringData["init.sh"]
+          pattern: 'SELECT format\(''REVOKE %I FROM %I'', r\.rolname, m\.rolname\) FROM .* WHERE ''cozystack:orphaned'' IN \(r\.rolname, m\.rolname\)\\gexec\nALTER ROLE "cozystack:orphaned"'
+      - matchRegex:
+          path: stringData["init.sh"]
+          pattern: 'for db in \$ALL_DBS; do\npsql -v ON_ERROR_STOP=1 --echo-queries --dbname "\$db" <<\\EOT\nSELECT format\(''ALTER %s %s SECURITY INVOKER'', .*\) FROM pg_proc p WHERE p\.proowner = ''"cozystack:orphaned"''::regrole AND p\.prosecdef\\gexec\nSELECT format\(''ALTER VIEW %s SET \(security_invoker = true\)'', c\.oid::regclass\) FROM pg_class c WHERE c\.relowner = ''"cozystack:orphaned"''::regrole AND c\.relkind = ''v'' AND current_setting\(''server_version_num''\)::int >= 150000 .*\\gexec\nEOT\ndone'
+
+  # An orphaned role's name comes from the catalog, so it reaches SQL only as a
+  # psql variable in a quoted heredoc, never spliced in by the shell.
+  - it: passes an orphaned role's name to SQL as a psql variable
+    set:
+      users:
+        app: {}
+    documentSelector:
+      path: metadata.name
+      value: pg-test-init-script
+    asserts:
+      - matchRegex:
+          path: stringData["init.sh"]
+          pattern: 'DELETE_ROLES=\$\(.*\)\nALL_DBS=\$\(psql -v ON_ERROR_STOP=1 -t -A -c "SELECT datname FROM pg_database WHERE datallowconn AND NOT datistemplate"\)\n\necho "roles to delete: \$DELETE_ROLES"\nfor role in \$DELETE_ROLES; do\npsql -v ON_ERROR_STOP=1 --echo-queries -v role="\$role" <<\\EOT\nSELECT format\(''REVOKE %I FROM %I'', r\.rolname, m\.rolname\) FROM .* WHERE r\.rolname = :''role''\\gexec\nEOT\nfor db in \$ALL_DBS; do\npsql -v ON_ERROR_STOP=1 --echo-queries --dbname "\$db" -v role="\$role" <<\\EOT\nREASSIGN OWNED BY :"role" TO "cozystack:orphaned";\nDROP OWNED BY :"role";\nEOT\ndone\npsql -v ON_ERROR_STOP=1 --echo-queries -v role="\$role" <<\\EOT\nDROP ROLE IF EXISTS :"role";\nEOT'
+      - notMatchRegex:
+          path: stringData["init.sh"]
+          pattern: '[A-Z] "\$role"|''\$role'''
diff --git a/packages/apps/postgres/tests/flavor_test.yaml b/packages/apps/postgres/tests/flavor_test.yaml
new file mode 100644
index 0000000000..a5f740da44
--- /dev/null
+++ b/packages/apps/postgres/tests/flavor_test.yaml
@@ -0,0 +1,252 @@
+suite: postgres image flavor
+# The Cluster and the init Job must resolve the same image, and a live
+# cluster must never be moved to the other flavor: the two image families
+# ship different glibc versions, so CNPG would roll an image swap that
+# corrupts collatable indexes. Tags are matched by pattern so that
+# hack/update-versions.sh can bump minors without touching this suite.
+release:
+  name: pg-test
+  namespace: tenant-test
+set:
+  _cluster:
+    scheduling: {}
+tests:
+  - it: defaults to the CloudNativePG PostgreSQL image
+    templates:
+      - templates/db.yaml
+    documentSelector:
+      path: kind
+      value: Cluster
+    asserts:
+      - matchRegex:
+          path: spec.imageName
+          pattern: ^ghcr\.io/cloudnative-pg/postgresql:18\.[0-9]+$
+
+  - it: postgis flavor switches the Cluster to the standard-trixie PostGIS image
+    set:
+      flavor: postgis
+    templates:
+      - templates/db.yaml
+    documentSelector:
+      path: kind
+      value: Cluster
+    asserts:
+      - matchRegex:
+          path: spec.imageName
+          pattern: ^ghcr\.io/cloudnative-pg/postgis:18\.[0-9]+-[0-9.]+-standard-trixie$
+
+  - it: postgis flavor runs the init Job from the same image as the Cluster
+    set:
+      flavor: postgis
+      version: v16
+    templates:
+      - templates/init-job.yaml
+    documentSelector:
+      path: kind
+      value: Job
+    asserts:
+      - matchRegex:
+          path: spec.template.spec.containers[0].image
+          pattern: ^ghcr\.io/cloudnative-pg/postgis:16\.[0-9]+-[0-9.]+-standard-trixie$
+
+  - it: refuses to move a live postgresql cluster to postgis
+    set:
+      flavor: postgis
+    kubernetesProvider:
+      scheme:
+        "postgresql.cnpg.io/v1/Cluster":
+          gvr:
+            group: postgresql.cnpg.io
+            version: v1
+            resource: clusters
+          namespaced: true
+      objects:
+        - apiVersion: postgresql.cnpg.io/v1
+          kind: Cluster
+          metadata:
+            name: pg-test
+            namespace: tenant-test
+          spec:
+            imageName: ghcr.io/cloudnative-pg/postgresql:18.1
+    templates:
+      - templates/db.yaml
+    asserts:
+      - failedTemplate:
+          errorPattern: "flavor cannot change on an existing cluster \\(running postgresql, requested postgis\\)"
+
+  - it: refuses to move a live postgis cluster back to postgresql
+    kubernetesProvider:
+      scheme:
+        "postgresql.cnpg.io/v1/Cluster":
+          gvr:
+            group: postgresql.cnpg.io
+            version: v1
+            resource: clusters
+          namespaced: true
+      objects:
+        - apiVersion: postgresql.cnpg.io/v1
+          kind: Cluster
+          metadata:
+            name: pg-test
+            namespace: tenant-test
+          spec:
+            imageName: ghcr.io/cloudnative-pg/postgis:18.1-3.6.1-standard-trixie
+    templates:
+      - templates/db.yaml
+    asserts:
+      - failedTemplate:
+          errorPattern: "flavor cannot change on an existing cluster \\(running postgis, requested postgresql\\)"
+
+  - it: lets a live postgis cluster take a new minor from a mirrored, digest-pinned image
+    set:
+      flavor: postgis
+    kubernetesProvider:
+      scheme:
+        "postgresql.cnpg.io/v1/Cluster":
+          gvr:
+            group: postgresql.cnpg.io
+            version: v1
+            resource: clusters
+          namespaced: true
+      objects:
+        - apiVersion: postgresql.cnpg.io/v1
+          kind: Cluster
+          metadata:
+            name: pg-test
+            namespace: tenant-test
+          spec:
+            imageName: registry.example:5000/cloudnative-pg/postgis:18.0-3.6.0-standard-trixie@sha256:5a6b6d9016f6de30cd389c8a921b8acb64de0421f125a0ed3e95ce1b978bf169
+    templates:
+      - templates/db.yaml
+    documentSelector:
+      path: kind
+      value: Cluster
+    asserts:
+      - matchRegex:
+          path: spec.imageName
+          pattern: ^ghcr\.io/cloudnative-pg/postgis:18\.
+
+
+  - it: points a flavor change to a logical dump, not to a backup restore
+    set:
+      flavor: postgis
+    kubernetesProvider:
+      scheme:
+        "postgresql.cnpg.io/v1/Cluster":
+          gvr:
+            group: postgresql.cnpg.io
+            version: v1
+            resource: clusters
+          namespaced: true
+      objects:
+        - apiVersion: postgresql.cnpg.io/v1
+          kind: Cluster
+          metadata:
+            name: pg-test
+            namespace: tenant-test
+          spec:
+            imageName: ghcr.io/cloudnative-pg/postgresql:18.1
+    templates:
+      - templates/db.yaml
+    asserts:
+      - failedTemplate:
+          errorPattern: "move the data with a logical dump \\(pg_dump / pg_restore\\); restoring a backup keeps the flavor it was taken from"
+
+  - it: refuses to recover a postgis source into the postgresql flavor
+    set:
+      bootstrap:
+        enabled: true
+        oldName: pg-source
+      backup:
+        s3AccessKey: access
+        s3SecretKey: secret
+    kubernetesProvider:
+      scheme:
+        "postgresql.cnpg.io/v1/Cluster":
+          gvr:
+            group: postgresql.cnpg.io
+            version: v1
+            resource: clusters
+          namespaced: true
+      objects:
+        - apiVersion: postgresql.cnpg.io/v1
+          kind: Cluster
+          metadata:
+            name: pg-source
+            namespace: tenant-test
+          spec:
+            imageName: ghcr.io/cloudnative-pg/postgis:18.1-3.6.1-standard-trixie
+    templates:
+      - templates/db.yaml
+    asserts:
+      - failedTemplate:
+          errorPattern: "cannot recover a postgis backup of pg-source into the postgresql flavor"
+
+  - it: refuses to recover a postgresql source into the postgis flavor
+    set:
+      flavor: postgis
+      bootstrap:
+        enabled: true
+        oldName: pg-source
+      backup:
+        s3AccessKey: access
+        s3SecretKey: secret
+    kubernetesProvider:
+      scheme:
+        "postgresql.cnpg.io/v1/Cluster":
+          gvr:
+            group: postgresql.cnpg.io
+            version: v1
+            resource: clusters
+          namespaced: true
+      objects:
+        - apiVersion: postgresql.cnpg.io/v1
+          kind: Cluster
+          metadata:
+            name: pg-source
+            namespace: tenant-test
+          spec:
+            imageName: ghcr.io/cloudnative-pg/postgresql:18.1
+    templates:
+      - templates/db.yaml
+    asserts:
+      - failedTemplate:
+          errorPattern: "cannot recover a postgresql backup of pg-source into the postgis flavor"
+
+  - it: recovers a postgis source into the postgis flavor
+    set:
+      flavor: postgis
+      bootstrap:
+        enabled: true
+        oldName: pg-source
+      backup:
+        s3AccessKey: access
+        s3SecretKey: secret
+    kubernetesProvider:
+      scheme:
+        "postgresql.cnpg.io/v1/Cluster":
+          gvr:
+            group: postgresql.cnpg.io
+            version: v1
+            resource: clusters
+          namespaced: true
+      objects:
+        - apiVersion: postgresql.cnpg.io/v1
+          kind: Cluster
+          metadata:
+            name: pg-source
+            namespace: tenant-test
+          spec:
+            imageName: registry.example:5000/cloudnative-pg/postgis:18.0-3.6.0-standard-trixie
+    templates:
+      - templates/db.yaml
+    documentSelector:
+      path: kind
+      value: Cluster
+    asserts:
+      - equal:
+          path: spec.bootstrap.recovery.source
+          value: pg-source
+      - matchRegex:
+          path: spec.imageName
+          pattern: ^ghcr\.io/cloudnative-pg/postgis:18\.
diff --git a/packages/apps/postgres/tests/host_guard_test.yaml b/packages/apps/postgres/tests/host_guard_test.yaml
new file mode 100644
index 0000000000..4a46e9c88c
--- /dev/null
+++ b/packages/apps/postgres/tests/host_guard_test.yaml
@@ -0,0 +1,63 @@
+suite: postgres external cert fails on an empty apex, but only when external
+
+templates:
+  - templates/db.yaml
+
+release:
+  name: pg-test
+  namespace: tenant-test
+
+# db.yaml appends the external SAN <release>.<_namespace.host> only under
+# `if and $tlsEnabled .Values.external`. cozy-lib.ns-host-required guards that
+# line, so an empty apex fails the render when TLS and external are on, and is a
+# non-issue when external is off.
+
+tests:
+  - it: fails when tls and external are on and the apex is empty
+    set:
+      external: true
+      tls:
+        enabled: true
+      _namespace:
+        host: ""
+      _cluster:
+        scheduling: {}
+        cluster-domain: cozy.local
+    asserts:
+      - failedTemplate:
+          errorMessage: "the tenant apex (_namespace.host) is empty and this app sets no host override, so its ingress hostname would be malformed. Set tenant.spec.host on this tenant, inherit it from a parent that has host set, or set this app's host value."
+
+  - it: still renders when external is off even though the apex is empty
+    set:
+      external: false
+      tls:
+        enabled: true
+      _namespace:
+        host: ""
+      _cluster:
+        scheduling: {}
+        cluster-domain: cozy.local
+    documentSelector:
+      path: kind
+      value: Cluster
+    asserts:
+      - isNull:
+          path: spec.certificates
+
+  - it: renders the external cert SAN from the apex when it is set
+    set:
+      external: true
+      tls:
+        enabled: true
+      _namespace:
+        host: example.org
+      _cluster:
+        scheduling: {}
+        cluster-domain: cozy.local
+    documentSelector:
+      path: kind
+      value: Cluster
+    asserts:
+      - equal:
+          path: spec.certificates.serverAltDNSNames[0]
+          value: pg-test.example.org
diff --git a/packages/apps/postgres/tests/init_job_bounded_test.yaml b/packages/apps/postgres/tests/init_job_bounded_test.yaml
new file mode 100644
index 0000000000..68df367426
--- /dev/null
+++ b/packages/apps/postgres/tests/init_job_bounded_test.yaml
@@ -0,0 +1,99 @@
+suite: the init-job is bounded so a purged restore target cannot deadlock the Helm hook
+
+# Clearing bootstrap.enabled arms the init Job as a post-install,post-upgrade Helm
+# hook that Helm blocks on. Its pod mounts <release>-superuser (which CNPG deletes
+# with the Cluster) and waited `until pg_isready; do sleep 5; done` with no bound
+# and no activeDeadlineSeconds. When a second restore purges the same target while
+# that hook is still pending, the hook can never finish and Helm deadlocks on it —
+# the postgres-2-backup-roundtrip E2E caught exactly this. Bound the Job (a hard
+# activeDeadlineSeconds and no retries) and the readiness wait (a bounded loop that
+# exits) so a purged target fails the hook fast instead of hanging forever.
+
+release:
+  name: pg-test
+  namespace: tenant-test
+
+set:
+  _cluster:
+    scheduling: {}
+  users:
+    app: {}
+
+tests:
+  # On an UPGRADE the Cluster is already up, so pg_isready answers in seconds, but
+  # the deadline must still leave room for the per-schema grant DO block on a large
+  # existing database — 540s, well below the 10m (600s) hook budget so a purged
+  # target's Job fails with its own diagnostic before Helm's generic timeout, yet
+  # not the tight 300s that would fail a legitimate long grant pass. A bump back to
+  # 600 (== the Helm timeout) reddens here.
+  - it: the init Job is bounded on upgrade with grant-loop headroom and does not retry
+    template: templates/init-job.yaml
+    release:
+      name: pg-test
+      namespace: tenant-test
+      upgrade: true
+    asserts:
+      - isKind:
+          of: Job
+      - equal:
+          path: spec.backoffLimit
+          value: 0
+      - equal:
+          path: spec.activeDeadlineSeconds
+          value: 540
+      - matchRegex:
+          path: metadata.annotations["helm.sh/hook"]
+          pattern: post-upgrade
+  # On a fresh INSTALL nothing is running yet — the same release is provisioning the
+  # Cluster (PVC, image pull, initdb) — and there is no purge hazard, so the cold
+  # start gets the near-full budget (570s) rather than the tight upgrade deadline
+  # that would fail a slow-but-healthy first boot. Collapsing this back to one number
+  # for both contexts reddens one side or the other.
+  - it: the init Job gives a cold install the near-full budget
+    template: templates/init-job.yaml
+    asserts:
+      - equal:
+          path: spec.activeDeadlineSeconds
+          value: 570
+
+  # The wait is bounded by wall-clock elapsed ($SECONDS), not by an attempt count:
+  # an attempt count ignores the time pg_isready itself takes, so 110 attempts of
+  # "sleep 5" really ran past the 570s Job deadline and the Job was killed before
+  # the loop could print its diagnostic or leave the create-users/grant work any
+  # time. The bound sits below activeDeadlineSeconds so the tail is reserved for
+  # that work. Reverting to an attempt counter, or raising the bound to the Job
+  # deadline, reddens these.
+  - it: the readiness wait is bounded by elapsed time on install, reserving the deadline tail
+    template: templates/init-script.yaml
+    documentSelector:
+      path: metadata.name
+      value: pg-test-init-script
+    asserts:
+      - notMatchRegex:
+          path: stringData["init.sh"]
+          pattern: 'until pg_isready ; do sleep 5; done'
+      - notMatchRegex:
+          path: stringData["init.sh"]
+          pattern: 'attempts'
+      # Install (the suite default): the cold, still-provisioning Cluster gets up to
+      # 480s of script time, leaving at most 90s of the 570s Job deadline (less the
+      # pod's start-up, which the Job clock counts) for the work after readiness.
+      - matchRegex:
+          path: stringData["init.sh"]
+          pattern: 'if \[ "\$SECONDS" -ge 480 \]; then'
+
+  - it: the readiness wait is tight on upgrade (Cluster already up, purge hazard)
+    template: templates/init-script.yaml
+    release:
+      name: pg-test
+      namespace: tenant-test
+      upgrade: true
+    documentSelector:
+      path: metadata.name
+      value: pg-test-init-script
+    asserts:
+      # Upgrade: the Cluster is already up, so give up after 250s, leaving up to 290s
+      # of the 540s Job deadline for the per-schema grant pass on a large database.
+      - matchRegex:
+          path: stringData["init.sh"]
+          pattern: 'if \[ "\$SECONDS" -ge 250 \]; then'
diff --git a/packages/apps/postgres/tests/init_job_cleanup_test.yaml b/packages/apps/postgres/tests/init_job_cleanup_test.yaml
new file mode 100644
index 0000000000..df88d3f55f
--- /dev/null
+++ b/packages/apps/postgres/tests/init_job_cleanup_test.yaml
@@ -0,0 +1,51 @@
+suite: init-job is garbage-collected after completion
+
+# Locks in cozystack/cozystack#3055: the post-install/post-upgrade init Job
+# is a one-shot reconciler of users/databases/roles. Without a TTL it lingers
+# in the namespace forever after the Postgres CR is deleted (its hook-delete-policy
+# is 'before-hook-creation' only, which never fires on uninstall). A native
+# ttlSecondsAfterFinished lets the Kubernetes TTL controller GC the Job and its
+# Pod ~1 hour after it completes, regardless of Helm hook lifecycle — without
+# touching the hook-timeout semantics the recovery flow depends on. 1h leaves a
+# debugging window for a failed init Job before it is collected.
+
+# Both templates are loaded so the Job's checksum/config annotation can resolve
+# its `include ".../init-script.yaml"`. Each test then pins assertions to a
+# single template via `template:` so the per-template document set is exact.
+templates:
+  - templates/init-job.yaml
+  - templates/init-script.yaml
+
+release:
+  name: pg-test
+  namespace: tenant-test
+
+set:
+  _cluster:
+    scheduling: {}
+  users:
+    app: {}
+
+tests:
+  - it: "init-job sets ttlSecondsAfterFinished so Kubernetes GCs it after the run"
+    template: templates/init-job.yaml
+    asserts:
+      - hasDocuments:
+          count: 1
+      - isKind:
+          of: Job
+      - equal:
+          path: metadata.name
+          value: pg-test-init-job
+      - equal:
+          path: spec.ttlSecondsAfterFinished
+          value: 3600
+
+  - it: "init-job is skipped entirely under bootstrap recovery"
+    template: templates/init-job.yaml
+    set:
+      bootstrap:
+        enabled: true
+    asserts:
+      - hasDocuments:
+          count: 0
diff --git a/packages/apps/postgres/tests/init_script_runtime_password_test.yaml b/packages/apps/postgres/tests/init_script_runtime_password_test.yaml
new file mode 100644
index 0000000000..c8d32b58c8
--- /dev/null
+++ b/packages/apps/postgres/tests/init_script_runtime_password_test.yaml
@@ -0,0 +1,195 @@
+suite: init-script applies user passwords at run time, never in cleartext SQL
+
+# The generated password must NOT be rendered into the init-script SQL. That Secret
+# is stored verbatim in the Helm release manifest and retained for MaxHistory
+# revisions, so a password baked into `ALTER ROLE ... WITH PASSWORD '<literal>'`
+# lingers in cleartext history that a tenant cannot scrub. The init Job must read
+# each password from the <release>-credentials Secret at run time instead.
+#
+# A known password is seeded through kubernetesProvider so the assertions can prove
+# that exact value never appears in the rendered init.sh, while the SQL still
+# applies it through a psql variable (:'pw'), which psql quotes and escapes safely.
+
+templates:
+  - templates/init-script.yaml
+  - templates/init-job.yaml
+
+release:
+  name: pg-test
+  namespace: tenant-test
+
+set:
+  _cluster:
+    scheduling: {}
+
+tests:
+  - it: does not write the seeded user password into the init-script SQL
+    template: templates/init-script.yaml
+    kubernetesProvider:
+      scheme:
+        "v1/Secret":
+          gvr:
+            version: v1
+            resource: secrets
+          namespaced: true
+      objects:
+        - apiVersion: v1
+          kind: Secret
+          metadata:
+            name: pg-test-credentials
+            namespace: tenant-test
+          data:
+            testuser: ZXhpc3RpbmdwYXNzd29yZA==
+    set:
+      users:
+        testuser: {}
+    documentSelector:
+      path: metadata.name
+      value: pg-test-init-script
+    asserts:
+      - notMatchRegex:
+          path: stringData["init.sh"]
+          pattern: existingpassword
+      - notMatchRegex:
+          path: stringData["init.sh"]
+          pattern: "WITH PASSWORD '"
+
+  - it: applies the password through a psql variable read from the mounted Secret
+    template: templates/init-script.yaml
+    set:
+      users:
+        testuser: {}
+    documentSelector:
+      path: metadata.name
+      value: pg-test-init-script
+    asserts:
+      - matchRegex:
+          path: stringData["init.sh"]
+          pattern: "WITH PASSWORD :'pw'"
+      - matchRegex:
+          path: stringData["init.sh"]
+          pattern: /credentials/testuser
+
+  - it: reads every user's password at run time and keeps their replication flag
+    # Each user gets its own run-time read and psql call; prove the per-user
+    # wiring holds for more than one user and that the replication attribute still
+    # rides alongside the run-time password (not lost in the rewrite).
+    template: templates/init-script.yaml
+    set:
+      users:
+        alice:
+          replication: true
+        bob: {}
+    documentSelector:
+      path: metadata.name
+      value: pg-test-init-script
+    asserts:
+      - matchRegex:
+          path: stringData["init.sh"]
+          pattern: 'pw=\$\(cat "/credentials/alice"\)'
+      - matchRegex:
+          path: stringData["init.sh"]
+          pattern: 'pw=\$\(cat "/credentials/bob"\)'
+      - matchRegex:
+          path: stringData["init.sh"]
+          pattern: 'ALTER ROLE "alice" WITH PASSWORD :''pw'' LOGIN INHERIT REPLICATION'
+      - matchRegex:
+          path: stringData["init.sh"]
+          pattern: 'ALTER ROLE "bob" WITH PASSWORD :''pw'' LOGIN INHERIT NOREPLICATION'
+      - notMatchRegex:
+          path: stringData["init.sh"]
+          pattern: "WITH PASSWORD '"
+      # The runtime-read rationale is a {{/* */}} template comment, so it is stripped
+      # from the rendered init.sh rather than copied once per user. Reverting it to a
+      # per-user `#` block makes "cleartext history" reappear (twice, for alice+bob).
+      - notMatchRegex:
+          path: stringData["init.sh"]
+          pattern: cleartext history
+
+  - it: still stores each password in the credentials Secret, the single place it lives
+    # The point of the change is to remove the password from the init-script, NOT
+    # from the credentials Secret the tenant reads. Pin that it still lands there.
+    template: templates/init-script.yaml
+    set:
+      users:
+        alice: {}
+    documentSelector:
+      path: metadata.name
+      value: pg-test-credentials
+    asserts:
+      - matchRegex:
+          path: stringData.alice
+          pattern: ^[a-zA-Z0-9]{16}$
+
+  - it: mounts the credentials Secret into the init Job read-only at run time
+    template: templates/init-job.yaml
+    set:
+      users:
+        testuser: {}
+    asserts:
+      - contains:
+          path: spec.template.spec.volumes
+          content:
+            name: credentials
+            secret:
+              secretName: pg-test-credentials
+      - contains:
+          path: spec.template.spec.containers[0].volumeMounts
+          content:
+            name: credentials
+            mountPath: /credentials
+            readOnly: true
+
+  - it: does not mount the credentials Secret when no users are defined
+    # The <release>-credentials Secret is rendered only when .Values.users is
+    # non-empty (init-script.yaml). A userless release (the default users: {}, or
+    # a databases-only deployment) must therefore NOT mount it, or the init Job
+    # FailedMounts on a Secret that does not exist and the post-upgrade hook times
+    # out, failing the release. The create-users loop is already empty here, so
+    # nothing reads /credentials.
+    template: templates/init-job.yaml
+    set:
+      users: {}
+    asserts:
+      - hasDocuments:
+          count: 1
+      - notContains:
+          path: spec.template.spec.volumes
+          content:
+            name: credentials
+            secret:
+              secretName: pg-test-credentials
+      - notContains:
+          path: spec.template.spec.containers[0].volumeMounts
+          content:
+            name: credentials
+            mountPath: /credentials
+            readOnly: true
+
+  # The delete-users loop interpolates a role name into SQL. The username charset
+  # guard admits "-", "." and uppercase (a valid role name CREATE ROLE quotes), so
+  # the identifier MUST be quoted in REASSIGN/DROP too, or removing a user named
+  # e.g. "my-app" emits a syntax error that fails this post-upgrade hook under
+  # ON_ERROR_STOP and wedges every later reconcile. psql's :"user" quotes it; the
+  # bare :user form, or the shell splicing $user into the SQL, reddens this.
+  - it: quotes the identifier in the delete-users SQL
+    template: templates/init-script.yaml
+    set:
+      users:
+        app: {}
+    documentSelector:
+      path: metadata.name
+      value: pg-test-init-script
+    asserts:
+      - matchRegex:
+          path: stringData["init.sh"]
+          pattern: 'REASSIGN OWNED BY :"user" TO'
+      - matchRegex:
+          path: stringData["init.sh"]
+          pattern: 'DROP OWNED BY :"user"'
+      - matchRegex:
+          path: stringData["init.sh"]
+          pattern: 'DROP USER :"user"'
+      - notMatchRegex:
+          path: stringData["init.sh"]
+          pattern: 'OWNED BY (:user|"?\$user)'
diff --git a/packages/apps/postgres/tests/managed_roles_test.yaml b/packages/apps/postgres/tests/managed_roles_test.yaml
new file mode 100644
index 0000000000..cb81e16d13
--- /dev/null
+++ b/packages/apps/postgres/tests/managed_roles_test.yaml
@@ -0,0 +1,143 @@
+suite: init-script trusts only roles it marked itself
+
+# On PostgreSQL 16 a CREATEROLE holder may COMMENT ON ROLE every role it created,
+# and by creating a role through an intermediate role it then drops, it leaves no
+# pg_auth_members row that tells who did. Two passes trusted what it can forge:
+# the delete passes picked roles by their comment, so a forged comment had the
+# chart drop a role it never created; and the create passes adopted any role that
+# already existed under a declared name, so a role squatted before an admin
+# declared it stayed under the squatter's control. Membership in
+# "cozystack:managed", which only the superuser can grant, replaces the comment as
+# the record. The behaviour is proven against live PostgreSQL 13, 15, 16 and 17;
+# these tests pin the render.
+
+templates:
+  - templates/init-script.yaml
+
+release:
+  name: pg-test
+  namespace: tenant-test
+
+set:
+  _cluster:
+    scheduling: {}
+
+tests:
+  - it: creates the marker once and marks the roles the chart had commented before it existed
+    set:
+      users:
+        app: {}
+    documentSelector:
+      path: metadata.name
+      value: pg-test-init-script
+    asserts:
+      - matchRegex:
+          path: stringData["init.sh"]
+          pattern: "IF NOT EXISTS \\(SELECT FROM pg_catalog.pg_roles WHERE rolname = 'cozystack:managed'\\) THEN\\n\\s+CREATE ROLE \"cozystack:managed\" NOLOGIN;\\n\\s+FOR managed IN SELECT r.rolname FROM pg_roles r JOIN pg_shdescription s ON s.objoid = r.oid AND s.classoid = 'pg_authid'::regclass WHERE s.description IN \\('user managed by helm', 'role managed by helm'\\) LOOP\\n\\s+EXECUTE format\\('GRANT %I TO %I WITH INHERIT FALSE, SET FALSE', 'cozystack:managed', managed.rolname\\);"
+
+  - it: selects the users and roles to delete by the marker, not by the comment alone
+    set:
+      users:
+        app: {}
+    documentSelector:
+      path: metadata.name
+      value: pg-test-init-script
+    asserts:
+      - matchRegex:
+          path: stringData["init.sh"]
+          pattern: "WHERE s.description = 'user managed by helm' AND r.oid IN \\(SELECT m.member FROM pg_auth_members m JOIN pg_roles g ON g.oid = m.roleid WHERE g.rolname = 'cozystack:managed'\\)"
+      - matchRegex:
+          path: stringData["init.sh"]
+          pattern: "WHERE s.description = 'role managed by helm' AND r.oid IN \\(SELECT m.member FROM pg_auth_members m JOIN pg_roles g ON g.oid = m.roleid WHERE g.rolname = 'cozystack:managed'\\)"
+
+  - it: marks every user and database role it creates, as a record that carries no privilege
+    set:
+      users:
+        app: {}
+      databases:
+        shop: {}
+    documentSelector:
+      path: metadata.name
+      value: pg-test-init-script
+    asserts:
+      - matchRegex:
+          path: stringData["init.sh"]
+          pattern: 'GRANT "cozystack:managed" TO "app" WITH INHERIT FALSE, SET FALSE;'
+      - matchRegex:
+          path: stringData["init.sh"]
+          pattern: 'GRANT "cozystack:managed" TO "shop_admin" WITH INHERIT FALSE, SET FALSE;'
+      - matchRegex:
+          path: stringData["init.sh"]
+          pattern: 'GRANT "cozystack:managed" TO "shop_readonly" WITH INHERIT FALSE, SET FALSE;'
+
+  # INHERIT and SET membership options arrived in PostgreSQL 16.
+  - it: marks with a plain GRANT before PostgreSQL 16
+    set:
+      version: v15
+      users:
+        app: {}
+    documentSelector:
+      path: metadata.name
+      value: pg-test-init-script
+    asserts:
+      - matchRegex:
+          path: stringData["init.sh"]
+          pattern: 'GRANT "cozystack:managed" TO "app";'
+      - notMatchRegex:
+          path: stringData["init.sh"]
+          pattern: 'INHERIT FALSE'
+
+  - it: refuses to adopt an unmarked user role once createRole has been granted, before creating it
+    set:
+      users:
+        debezium:
+          replication: true
+    documentSelector:
+      path: metadata.name
+      value: pg-test-init-script
+    asserts:
+      - matchRegex:
+          path: stringData["init.sh"]
+          pattern: "SELECT format\\('DO \\$\\$BEGIN RAISE EXCEPTION %L; END\\$\\$', 'role \"debezium\" already exists and this chart did not create it; [^']*'\\)\\nFROM pg_catalog.pg_roles r\\nWHERE r.rolname = 'debezium'\\n  AND current_setting\\('cozystack.createrole_granted', true\\) = 'on'\\n  AND NOT EXISTS \\(SELECT FROM pg_catalog.pg_auth_members m JOIN pg_catalog.pg_roles g ON g.oid = m.roleid WHERE g.rolname = 'cozystack:managed' AND m.member = r.oid\\)\\\\gexec\\nSELECT 'CREATE ROLE \"debezium\" LOGIN INHERIT;'"
+
+  - it: refuses to adopt unmarked database roles once createRole has been granted, before creating the database
+    set:
+      databases:
+        newdb: {}
+    documentSelector:
+      path: metadata.name
+      value: pg-test-init-script
+    asserts:
+      - matchRegex:
+          path: stringData["init.sh"]
+          pattern: "WHERE r.rolname IN \\('newdb_admin', 'newdb_readonly'\\)\\n  AND current_setting\\('cozystack.createrole_granted', true\\) = 'on'\\n  AND NOT EXISTS \\(SELECT FROM pg_catalog.pg_auth_members m JOIN pg_catalog.pg_roles g ON g.oid = m.roleid WHERE g.rolname = 'cozystack:managed' AND m.member = r.oid\\)\\\\gexec\\nSELECT 'CREATE DATABASE \"newdb\"'"
+
+  # The flag is set after every user is created and marked, so the run that first
+  # grants createRole still adopts a role that predates it, such as the one CNPG
+  # bootstraps for users.app, and before any CREATEROLE is granted, so no holder
+  # exists while it is unset.
+  - it: records createRole after creating and marking the users and before granting the attribute
+    set:
+      users:
+        app: {}
+        migrator:
+          createRole: true
+    documentSelector:
+      path: metadata.name
+      value: pg-test-init-script
+    asserts:
+      - matchRegex:
+          path: stringData["init.sh"]
+          pattern: "(?s)GRANT \"cozystack:managed\" TO \"migrator\" WITH INHERIT FALSE, SET FALSE;\\nEOT\\npsql -v ON_ERROR_STOP=1 --echo-all -c \"ALTER DATABASE postgres SET cozystack.createrole_granted = 'on';\".*ALTER ROLE \"migrator\" WITH PASSWORD :'pw' LOGIN INHERIT NOREPLICATION CREATEROLE"
+
+  - it: does not record createRole when no user holds it
+    set:
+      users:
+        app: {}
+    documentSelector:
+      path: metadata.name
+      value: pg-test-init-script
+    asserts:
+      - notMatchRegex:
+          path: stringData["init.sh"]
+          pattern: 'SET cozystack.createrole_granted'
diff --git a/packages/apps/postgres/tests/notes_bootstrap_test.yaml b/packages/apps/postgres/tests/notes_bootstrap_test.yaml
new file mode 100644
index 0000000000..6ac001af90
--- /dev/null
+++ b/packages/apps/postgres/tests/notes_bootstrap_test.yaml
@@ -0,0 +1,58 @@
+suite: NOTES.txt restore warning is gated on both bootstrap and users
+templates:
+  - templates/NOTES.txt
+release:
+  name: pg-test
+  namespace: tenant-test
+tests:
+  - it: warns during a restore when the release defines users
+    set:
+      bootstrap:
+        enabled: true
+      users:
+        testuser: {}
+    asserts:
+      - matchRegexRaw:
+          pattern: 'provisioned as a restore'
+      - matchRegexRaw:
+          pattern: 'pg-test-credentials Secret now holds freshly generated passwords'
+      - matchRegexRaw:
+          pattern: 'postgres\.cozystack\.io/credentials-pending'
+      # The flag is gated on bootstrap.enabled (init-script.yaml), which the
+      # restore driver clears at the START of convergence, so it is absent for
+      # the window before the init-job finishes. NOTES must not claim the flag
+      # persists "until this converges" and must point at an application login as
+      # the real check. Restoring that overclaim turns this red.
+      - notMatchRegexRaw:
+          pattern: 'until this converges'
+      - matchRegexRaw:
+          pattern: 'That flag tracks only'
+      - matchRegexRaw:
+          pattern: 'Do not read a missing flag as "converged"'
+      - matchRegexRaw:
+          pattern: 'Confirm convergence by logging in as an'
+
+  # The credentials Secret is gated on .Values.users in init-script.yaml, so a
+  # users-less restore never renders it. NOTES must not then describe that Secret
+  # and its pending-credentials annotation, or an operator chases a nonexistent
+  # object. Reverting the gate to bootstrap-only turns this red.
+  - it: stays quiet during a restore when there are no users
+    set:
+      bootstrap:
+        enabled: true
+      users: {}
+    asserts:
+      - notMatchRegexRaw:
+          pattern: 'provisioned as a restore'
+      - notMatchRegexRaw:
+          pattern: 'credentials-pending'
+
+  - it: stays quiet for a normal install
+    set:
+      bootstrap:
+        enabled: false
+      users:
+        testuser: {}
+    asserts:
+      - notMatchRegexRaw:
+          pattern: 'provisioned as a restore'
diff --git a/packages/apps/postgres/tests/pg_hba_test.yaml b/packages/apps/postgres/tests/pg_hba_test.yaml
new file mode 100644
index 0000000000..d287d4a17f
--- /dev/null
+++ b/packages/apps/postgres/tests/pg_hba_test.yaml
@@ -0,0 +1,146 @@
+suite: postgres pg_hba TLS enforcement
+
+# CNPG appends user pg_hba rules after its fixed rules and before its default
+# "host all all all" rule, and the first match wins. tls.required is a tri-state
+# that follows external when omitted.
+
+release:
+  name: pg-test
+  namespace: tenant-test
+
+set:
+  _cluster:
+    scheduling: {}
+    cluster-domain: cozy.local
+  _namespace:
+    host: example.cozy.local
+
+templates:
+  - templates/db.yaml
+
+tests:
+  - it: renders no pg_hba when the instance is not external
+    documentSelector:
+      path: kind
+      value: Cluster
+    asserts:
+      - isNull:
+          path: spec.postgresql.pg_hba
+
+  - it: external instance accepts TLS sessions only
+    set:
+      external: true
+    documentSelector:
+      path: kind
+      value: Cluster
+    asserts:
+      - equal:
+          path: spec.postgresql.pg_hba
+          value:
+            - hostssl all all all scram-sha-256
+            - host all all all reject
+
+  - it: external instance still gets the TLS rules when tls.enabled is false
+    set:
+      external: true
+      tls:
+        enabled: false
+    documentSelector:
+      path: kind
+      value: Cluster
+    asserts:
+      - equal:
+          path: spec.postgresql.pg_hba[0]
+          value: hostssl all all all scram-sha-256
+
+  - it: tls.required false opts an external instance out
+    set:
+      external: true
+      tls:
+        required: false
+    documentSelector:
+      path: kind
+      value: Cluster
+    asserts:
+      - isNull:
+          path: spec.postgresql.pg_hba
+
+  - it: tls.required true applies to an in-cluster instance
+    set:
+      tls:
+        required: true
+    documentSelector:
+      path: kind
+      value: Cluster
+    asserts:
+      - equal:
+          path: spec.postgresql.pg_hba
+          value:
+            - hostssl all all all scram-sha-256
+            - host all all all reject
+
+  - it: pg_hba does not disturb postgresql.parameters
+    set:
+      external: true
+    documentSelector:
+      path: kind
+      value: Cluster
+    asserts:
+      - equal:
+          path: spec.postgresql.parameters.max_connections
+          value: "100"
+
+  # CloudNativePG's own default rule uses md5 before PostgreSQL 14, where
+  # password_encryption defaults to md5; md5 also accepts SCRAM verifiers.
+  - it: uses md5 on PostgreSQL 13 like CloudNativePG's default rule
+    set:
+      external: true
+      version: v13
+    documentSelector:
+      path: kind
+      value: Cluster
+    asserts:
+      - equal:
+          path: spec.postgresql.pg_hba
+          value:
+            - hostssl all all all md5
+            - host all all all reject
+
+  - it: uses scram-sha-256 from PostgreSQL 14
+    set:
+      external: true
+      version: v14
+    documentSelector:
+      path: kind
+      value: Cluster
+    asserts:
+      - equal:
+          path: spec.postgresql.pg_hba
+          value:
+            - hostssl all all all scram-sha-256
+            - host all all all reject
+
+  - it: refuses ssl off while TLS is required
+    set:
+      external: true
+      postgresql:
+        parameters:
+          ssl: "off"
+    asserts:
+      - failedTemplate:
+          errorPattern: "postgresql.parameters.ssl is off while tls.required is in effect"
+
+  - it: allows ssl off when TLS is not required
+    set:
+      external: true
+      tls:
+        required: false
+      postgresql:
+        parameters:
+          ssl: "off"
+    documentSelector:
+      path: kind
+      value: Cluster
+    asserts:
+      - isNull:
+          path: spec.postgresql.pg_hba
diff --git a/packages/apps/postgres/tests/restore_adoption_test.yaml b/packages/apps/postgres/tests/restore_adoption_test.yaml
new file mode 100644
index 0000000000..13863c1cbf
--- /dev/null
+++ b/packages/apps/postgres/tests/restore_adoption_test.yaml
@@ -0,0 +1,100 @@
+suite: init-script keeps databases a restore brought back
+
+# A restore replaces spec.databases with the Backup's snapshot, but recovery
+# replays WAL past it, so a database created after the Backup comes back still
+# commented 'database managed by helm'. Dropping every managed database the spec
+# does not declare would delete it on the first init-job run after the restore.
+# That run is told apart by bootstrap.newServerName, which the restore driver
+# sets to a value unique to each RestoreJob: until the cluster records it as
+# adopted, undeclared managed databases and their roles are released from
+# management instead of dropped. The behaviour is proven against a live
+# PostgreSQL; these tests pin the render.
+
+templates:
+  - templates/init-script.yaml
+
+release:
+  name: pg-test
+  namespace: tenant-test
+  upgrade: true
+
+set:
+  _cluster:
+    scheduling: {}
+  databases:
+    orders: {}
+
+tests:
+  - it: releases undeclared databases instead of dropping them until the restore is adopted
+    set:
+      bootstrap:
+        newServerName: pg-test-restore-0123456789abcdef
+    documentSelector:
+      path: metadata.name
+      value: pg-test-init-script
+    asserts:
+      - matchRegex:
+          path: stringData["init.sh"]
+          pattern: 'if \[ -n "\$RESTORE_MARK" \] && \[ "\$ADOPTED_MARK" != "\$RESTORE_MARK" \]; then'
+      - matchRegex:
+          path: stringData["init.sh"]
+          pattern: "ADOPTED_MARK=\\$\\(psql -v ON_ERROR_STOP=1 -t -A --dbname postgres -c \"SELECT current_setting\\('cozystack.adopted_restore', true\\)\"\\)"
+      - matchRegex:
+          path: stringData["init.sh"]
+          pattern: 'COMMENT ON DATABASE :"db" IS NULL;'
+      - matchRegex:
+          path: stringData["init.sh"]
+          pattern: "unnest\\(ARRAY\\[:'db' \\|\\| '_admin', :'db' \\|\\| '_readonly'\\]\\)"
+      - matchRegex:
+          path: stringData["init.sh"]
+          pattern: 'DROP DATABASE IF EXISTS \\"\$db\\" WITH \(FORCE\);'
+
+  # The mark is written only after every pass has run, so a run that fails part
+  # way leaves the restore unadopted and the next run releases again rather than
+  # dropping what the failed run had not yet released.
+  - it: records the adopted restore after the last pass
+    set:
+      bootstrap:
+        newServerName: pg-test-restore-0123456789abcdef
+      databases:
+        orders:
+          extensions: [hstore]
+    documentSelector:
+      path: metadata.name
+      value: pg-test-init-script
+    asserts:
+      - matchRegex:
+          path: stringData["init.sh"]
+          pattern: "(?s)== create extensions.*ALTER DATABASE postgres SET cozystack.adopted_restore = :'mark';\\s*EOT\\s*$"
+
+  # newServerName is free text in values, so it reaches the script base64-encoded
+  # and SQL only through psql variables.
+  - it: never renders the restore mark into the script verbatim
+    set:
+      bootstrap:
+        newServerName: "x'; DROP DATABASE orders; --"
+    documentSelector:
+      path: metadata.name
+      value: pg-test-init-script
+    asserts:
+      - notMatchRegex:
+          path: stringData["init.sh"]
+          pattern: 'DROP DATABASE orders'
+      - matchRegex:
+          path: stringData["init.sh"]
+          pattern: 'RESTORE_MARK=\$\(echo eCc7IERST1AgREFUQUJBU0Ugb3JkZXJzOyAtLQ== \| base64 -d\)'
+
+  - it: keeps the plain drop and records nothing when no restore is in play
+    documentSelector:
+      path: metadata.name
+      value: pg-test-init-script
+    asserts:
+      - matchRegex:
+          path: stringData["init.sh"]
+          pattern: 'RESTORE_MARK=\n'
+      - notMatchRegex:
+          path: stringData["init.sh"]
+          pattern: "cozystack.adopted_restore = "
+      - matchRegex:
+          path: stringData["init.sh"]
+          pattern: 'DROP DATABASE IF EXISTS \\"\$db\\" WITH \(FORCE\);'
diff --git a/packages/apps/postgres/tests/restore_mark_test.yaml b/packages/apps/postgres/tests/restore_mark_test.yaml
new file mode 100644
index 0000000000..212aedf19f
--- /dev/null
+++ b/packages/apps/postgres/tests/restore_mark_test.yaml
@@ -0,0 +1,66 @@
+suite: Cluster carries the restore that rendered it
+
+# The CNPG restore driver sets bootstrap.newServerName to a value unique to each
+# RestoreJob and reads it back off the Cluster to decide whether the live
+# recovery Cluster is the one its own purge produced. The barman plugin's
+# serverName is not enough, since the plugin renders only with chart-level S3
+# coordinates, so the chart annotates the Cluster whenever the value is set.
+
+templates:
+  - templates/db.yaml
+
+release:
+  name: pg-test
+  namespace: tenant-test
+
+set:
+  _cluster:
+    scheduling: {}
+
+tests:
+  - it: annotates a restored Cluster with bootstrap.newServerName
+    set:
+      backup:
+        enabled: true
+        useSystemBucket: false
+        s3AccessKey: AKIAEXAMPLE
+        s3SecretKey: s3cr3t
+        destinationPath: s3://bucket/pg-test/
+        endpointURL: https://s3.example:9000
+      bootstrap:
+        enabled: true
+        oldName: pg-test
+        serverName: pg-test
+        newServerName: pg-test-restore-deadbeef
+    documentSelector:
+      path: kind
+      value: Cluster
+    asserts:
+      - equal:
+          path: metadata.annotations["postgres.cozystack.io/restored-server-name"]
+          value: pg-test-restore-deadbeef
+
+  - it: keeps the annotation when the barman plugin is not rendered
+    set:
+      backup:
+        enabled: false
+      bootstrap:
+        enabled: false
+        newServerName: pg-test-restore-deadbeef
+    documentSelector:
+      path: kind
+      value: Cluster
+    asserts:
+      - notExists:
+          path: spec.plugins
+      - equal:
+          path: metadata.annotations["postgres.cozystack.io/restored-server-name"]
+          value: pg-test-restore-deadbeef
+
+  - it: renders no annotation on a Cluster that was never restored
+    documentSelector:
+      path: kind
+      value: Cluster
+    asserts:
+      - notExists:
+          path: metadata.annotations
diff --git a/packages/apps/postgres/tests/shared_buffers_test.yaml b/packages/apps/postgres/tests/shared_buffers_test.yaml
new file mode 100644
index 0000000000..cf6e101012
--- /dev/null
+++ b/packages/apps/postgres/tests/shared_buffers_test.yaml
@@ -0,0 +1,250 @@
+suite: shared_buffers default follows the memory limit and request
+
+# PostgreSQL's built-in shared_buffers default is 128MB regardless of the
+# container. Below a 512Mi memory limit the chart defaults it to a quarter of
+# the limit with a 16MB floor, capped at the memory request. From 512Mi up
+# nothing is rendered, so those instances keep the PostgreSQL default.
+
+templates:
+  - templates/db.yaml
+
+release:
+  name: pg-test
+  namespace: tenant-test
+
+set:
+  _cluster:
+    scheduling: {}
+
+tests:
+  - it: "the default preset (t1.micro, 256Mi) gets 64MB"
+    documentSelector:
+      path: kind
+      value: Cluster
+    asserts:
+      - equal:
+          path: spec.postgresql.parameters.shared_buffers
+          value: "64MB"
+
+  - it: "t1.nano (128Mi) gets 32MB"
+    set:
+      resourcesPreset: t1.nano
+    documentSelector:
+      path: kind
+      value: Cluster
+    asserts:
+      - equal:
+          path: spec.postgresql.parameters.shared_buffers
+          value: "32MB"
+
+  - it: "a resources override that sets only cpu keeps the preset memory limit and its 32MB"
+    set:
+      resourcesPreset: t1.nano
+      resources:
+        cpu: 500m
+    documentSelector:
+      path: kind
+      value: Cluster
+    asserts:
+      - equal:
+          path: spec.resources.limits.memory
+          value: 128Mi
+      - equal:
+          path: spec.postgresql.parameters.shared_buffers
+          value: "32MB"
+
+  - it: "explicit resources with 500Mi memory, just under the threshold, get 125MB"
+    set:
+      resources:
+        cpu: 500m
+        memory: 500Mi
+    documentSelector:
+      path: kind
+      value: Cluster
+    asserts:
+      - equal:
+          path: spec.postgresql.parameters.shared_buffers
+          value: "125MB"
+
+  - it: "a 32Mi limit is floored at 16MB"
+    set:
+      resources:
+        cpu: 250m
+        memory: 32Mi
+    documentSelector:
+      path: kind
+      value: Cluster
+    asserts:
+      - equal:
+          path: spec.postgresql.parameters.shared_buffers
+          value: "16MB"
+
+  - it: "t1.small (512Mi) renders no shared_buffers, as before"
+    set:
+      resourcesPreset: t1.small
+    documentSelector:
+      path: kind
+      value: Cluster
+    asserts:
+      - notExists:
+          path: spec.postgresql.parameters.shared_buffers
+
+  - it: "t1.large (2Gi) renders no shared_buffers, as before"
+    set:
+      resourcesPreset: t1.large
+    documentSelector:
+      path: kind
+      value: Cluster
+    asserts:
+      - notExists:
+          path: spec.postgresql.parameters.shared_buffers
+
+  - it: "an explicit shared_buffers wins over the default on a small preset"
+    set:
+      resourcesPreset: t1.nano
+      postgresql:
+        parameters:
+          shared_buffers: "24MB"
+    documentSelector:
+      path: kind
+      value: Cluster
+    asserts:
+      - equal:
+          path: spec.postgresql.parameters.shared_buffers
+          value: "24MB"
+
+  - it: "an explicit shared_buffers is still rendered on a large preset"
+    set:
+      resourcesPreset: t1.large
+      postgresql:
+        parameters:
+          shared_buffers: "1GB"
+    documentSelector:
+      path: kind
+      value: Cluster
+    asserts:
+      - equal:
+          path: spec.postgresql.parameters.shared_buffers
+          value: "1GB"
+
+  - it: "other default parameters are still rendered"
+    set:
+      resourcesPreset: t1.nano
+    documentSelector:
+      path: kind
+      value: Cluster
+    asserts:
+      - equal:
+          path: spec.postgresql.parameters.max_connections
+          value: "100"
+      - equal:
+          path: spec.postgresql.parameters.max_wal_senders
+          value: "30"
+
+  - it: "the default preset caps shared_buffers below a fractional memory request"
+    set:
+      _cluster:
+        memory-allocation-ratio: "5"
+    documentSelector:
+      path: kind
+      value: Cluster
+    asserts:
+      - equal:
+          path: spec.resources.requests.memory
+          value: "53687091"
+      - equal:
+          path: spec.postgresql.parameters.shared_buffers
+          value: "51MB"
+
+  - it: "t1.nano caps shared_buffers at the memory request with overcommit"
+    set:
+      resourcesPreset: t1.nano
+      _cluster:
+        memory-allocation-ratio: "5"
+    documentSelector:
+      path: kind
+      value: Cluster
+    asserts:
+      - equal:
+          path: spec.resources.requests.memory
+          value: "26843545"
+      - equal:
+          path: spec.postgresql.parameters.shared_buffers
+          value: "25MB"
+
+  - it: "a request equal to a quarter of the limit keeps the quarter"
+    set:
+      resourcesPreset: t1.nano
+      _cluster:
+        memory-allocation-ratio: "4"
+    documentSelector:
+      path: kind
+      value: Cluster
+    asserts:
+      - equal:
+          path: spec.resources.requests.memory
+          value: "33554432"
+      - equal:
+          path: spec.postgresql.parameters.shared_buffers
+          value: "32MB"
+
+  - it: "a memory request below 16Mi takes precedence over the floor"
+    set:
+      resources:
+        memory: 60Mi
+      _cluster:
+        memory-allocation-ratio: "4"
+    documentSelector:
+      path: kind
+      value: Cluster
+    asserts:
+      - equal:
+          path: spec.resources.requests.memory
+          value: "15728640"
+      - equal:
+          path: spec.postgresql.parameters.shared_buffers
+          value: "15MB"
+
+  - it: "an explicit memory limit uses its rendered request for the cap"
+    set:
+      resources:
+        memory: 500Mi
+      _cluster:
+        memory-allocation-ratio: "5"
+    documentSelector:
+      path: kind
+      value: Cluster
+    asserts:
+      - equal:
+          path: spec.resources.requests.memory
+          value: "104857600"
+      - equal:
+          path: spec.postgresql.parameters.shared_buffers
+          value: "100MB"
+
+  - it: "an explicit shared_buffers still wins when memory is overcommitted"
+    set:
+      _cluster:
+        memory-allocation-ratio: "5"
+      postgresql:
+        parameters:
+          shared_buffers: "40MB"
+    documentSelector:
+      path: kind
+      value: Cluster
+    asserts:
+      - equal:
+          path: spec.postgresql.parameters.shared_buffers
+          value: "40MB"
+
+  - it: "512Mi still renders no default when memory is overcommitted"
+    set:
+      resourcesPreset: t1.small
+      _cluster:
+        memory-allocation-ratio: "5"
+    documentSelector:
+      path: kind
+      value: Cluster
+    asserts:
+      - notExists:
+          path: spec.postgresql.parameters.shared_buffers
diff --git a/packages/apps/postgres/tests/shared_preload_libraries_test.yaml b/packages/apps/postgres/tests/shared_preload_libraries_test.yaml
new file mode 100644
index 0000000000..a98fb15f97
--- /dev/null
+++ b/packages/apps/postgres/tests/shared_preload_libraries_test.yaml
@@ -0,0 +1,125 @@
+suite: shared preload libraries allowlist
+
+# postgresql.sharedPreloadLibraries maps onto the CloudNativePG Cluster field of the
+# same meaning, which the operator renders into postgresql.conf and which is additive
+# to the operator's own defaults.
+#
+# It exists because shared_preload_libraries stays blocked in postgresql.parameters:
+# that parameter is free text and accepts a path, so it can point at a writable
+# location such as the PGDATA volume. A bare library name from this allowlist can only
+# resolve inside $libdir, which sits on the read-only image filesystem, so the code
+# execution vector the block defends against does not apply. Every name in the list
+# ships with the CloudNativePG PostgreSQL image.
+#
+# CloudNativePG already preloads pg_stat_statements, auto_explain and pgaudit on its
+# own when a parameter under their prefix is set (ManagedExtensions in its
+# pkg/postgres/configuration.go). This list is the explicit switch that needs no
+# tuning parameter, and the only route for pg_prewarm.
+#
+# The enum in values.schema.json is the guard the negative cases below exercise: it
+# rejects a value before rendering starts. The template carries the same allowlist as
+# a backstop for renders that bypass schema validation, which is why those two checks
+# assert the schema error rather than the template one; the backstop itself is pinned
+# by hack/check-postgres-preload-allowlist.bats.
+
+templates:
+  - templates/db.yaml
+
+release:
+  name: pg-test
+  namespace: tenant-test
+
+set:
+  _cluster:
+    scheduling: {}
+    cluster-domain: cozy.local
+
+tests:
+  - it: "the field is absent by default, leaving the operator defaults untouched"
+    documentSelector:
+      path: kind
+      value: Cluster
+    asserts:
+      - notExists:
+          path: spec.postgresql.shared_preload_libraries
+
+  - it: "an allowed library is rendered onto the CNPG field"
+    set:
+      postgresql:
+        sharedPreloadLibraries:
+          - pg_stat_statements
+    documentSelector:
+      path: kind
+      value: Cluster
+    asserts:
+      - equal:
+          path: spec.postgresql.shared_preload_libraries
+          value:
+            - pg_stat_statements
+
+  - it: "order is preserved for several allowed libraries"
+    set:
+      postgresql:
+        sharedPreloadLibraries:
+          - pg_stat_statements
+          - auto_explain
+          - pgaudit
+          - pg_prewarm
+    documentSelector:
+      path: kind
+      value: Cluster
+    asserts:
+      - equal:
+          path: spec.postgresql.shared_preload_libraries
+          value:
+            - pg_stat_statements
+            - auto_explain
+            - pgaudit
+            - pg_prewarm
+
+  - it: "preloading does not disturb postgresql.parameters"
+    set:
+      postgresql:
+        sharedPreloadLibraries:
+          - pg_stat_statements
+        parameters:
+          max_connections: 200
+    documentSelector:
+      path: kind
+      value: Cluster
+    asserts:
+      - equal:
+          path: spec.postgresql.parameters.max_connections
+          value: "200"
+      - equal:
+          path: spec.postgresql.parameters.max_wal_senders
+          value: "30"
+
+  - it: "a library outside the allowlist is rejected by the schema"
+    set:
+      postgresql:
+        sharedPreloadLibraries:
+          - pg_cron
+    asserts:
+      - failedTemplate:
+          errorPattern: "postgresql/sharedPreloadLibraries/0.*value must be one of 'pg_stat_statements', 'auto_explain', 'pgaudit', 'pg_prewarm'"
+
+  - it: "an absolute path is rejected by the schema, which is the vector the parameter block defends against"
+    set:
+      postgresql:
+        sharedPreloadLibraries:
+          - /var/lib/postgresql/data/pgdata/evil.so
+    asserts:
+      - failedTemplate:
+          errorPattern: "postgresql/sharedPreloadLibraries/0.*value must be one of 'pg_stat_statements', 'auto_explain', 'pgaudit', 'pg_prewarm'"
+
+  - it: "shared_preload_libraries stays blocked as a parameter even when the allowlist is used"
+    set:
+      postgresql:
+        sharedPreloadLibraries:
+          - pg_stat_statements
+        parameters:
+          shared_preload_libraries: pg_stat_statements
+    asserts:
+      - failedTemplate:
+          errorMessage: "SECURITY: Parameter 'shared_preload_libraries' is blocked. This parameter can enable arbitrary code execution and must not be set by tenants."
diff --git a/packages/apps/postgres/tests/tenant_projection_test.yaml b/packages/apps/postgres/tests/tenant_projection_test.yaml
new file mode 100644
index 0000000000..fd52446dee
--- /dev/null
+++ b/packages/apps/postgres/tests/tenant_projection_test.yaml
@@ -0,0 +1,52 @@
+suite: postgres TenantProjection sentinel
+
+# The chart renders one TenantProjection per release: the declaration that tells
+# the CA-extraction controller to lift ca.crt out of CNPG's key-bearing
+# <release>-ca into the tenant-readable <release>.tenant-ca projection.
+#
+# The load-bearing invariant is the ABSENCE of ownerReferences. The sentinel must
+# carry none — it owns the projection, and it is itself owned only through the
+# helm.toolkit.fluxcd.io/name label Flux stamps, which is how the lineage webhook
+# resolves the application. An ownerReference here would short-circuit that walk
+# and silently break the tenant's read path (pkg/lineage/lineage.go).
+
+release:
+  name: pg-test
+  namespace: tenant-test
+
+templates:
+  - templates/tenant-projection.yaml
+
+tests:
+  - it: renders exactly one TenantProjection named after the release
+    asserts:
+      - hasDocuments:
+          count: 1
+      - isKind:
+          of: TenantProjection
+      - equal:
+          path: apiVersion
+          value: internal.cozystack.io/v1alpha1
+      - equal:
+          path: metadata.name
+          value: pg-test-ca
+
+  - it: declares a CACert projection of CNPG's CA
+    asserts:
+      - equal:
+          path: spec.projections[0].type
+          value: CACert
+      - equal:
+          path: spec.projections[0].sourceSecretName
+          value: pg-test-ca
+      - equal:
+          path: spec.projections[0].sourceKey
+          value: ca.crt
+
+  # The invariant the lineage chain depends on: no ownerReferences, so the
+  # helm-label fallback resolves the application. Pinned so a future edit adding
+  # one reddens here instead of silently breaking tenant reads.
+  - it: carries no ownerReferences
+    asserts:
+      - notExists:
+          path: metadata.ownerReferences
diff --git a/packages/apps/postgres/tests/tls_test.yaml b/packages/apps/postgres/tests/tls_test.yaml
index f65838f983..b0a7dc5b22 100644
--- a/packages/apps/postgres/tests/tls_test.yaml
+++ b/packages/apps/postgres/tests/tls_test.yaml
@@ -12,7 +12,7 @@ suite: postgres TLS configuration
 # In TLS-on mode the chart sets spec.certificates with serverAltDNSNames so the
 # operator's own CA signs server certs. CNPG auto-derives SANs for the three
 # built-in services (rw/r/ro) in four DNS forms each; the chart only appends
-# the external hostname when external=true.
+# the external hostnames when external=true.
 
 release:
   name: pg-test
@@ -64,7 +64,7 @@ tests:
       - isNull:
           path: spec.certificates
 
-  - it: Cluster has spec.certificates.serverAltDNSNames with external hostname when tls auto-on via external true
+  - it: Cluster has spec.certificates.serverAltDNSNames with external hostnames when tls auto-on via external true
     set:
       external: true
       _namespace:
@@ -82,11 +82,14 @@ tests:
       - contains:
           path: spec.certificates.serverAltDNSNames
           content: pg-test.example.cozy.local
+      - contains:
+          path: spec.certificates.serverAltDNSNames
+          content: pg-test.postgres.example.cozy.local
       - lengthEqual:
           path: spec.certificates.serverAltDNSNames
-          count: 1
+          count: 2
 
-  - it: Cluster has spec.certificates.serverAltDNSNames with external hostname when tls explicitly enabled and external true
+  - it: Cluster has spec.certificates.serverAltDNSNames with external hostnames when tls explicitly enabled and external true
     set:
       tls:
         enabled: true
@@ -100,7 +103,10 @@ tests:
       - contains:
           path: spec.certificates.serverAltDNSNames
           content: pg-test.example.cozy.local
+      - contains:
+          path: spec.certificates.serverAltDNSNames
+          content: pg-test.postgres.example.cozy.local
       - lengthEqual:
           path: spec.certificates.serverAltDNSNames
-          count: 1
+          count: 2
 
diff --git a/packages/apps/postgres/tests/user_createrole_test.yaml b/packages/apps/postgres/tests/user_createrole_test.yaml
new file mode 100644
index 0000000000..fd5afdd91b
--- /dev/null
+++ b/packages/apps/postgres/tests/user_createrole_test.yaml
@@ -0,0 +1,167 @@
+suite: per-user CREATEROLE attribute
+
+# users.<name>.createRole grants the CREATEROLE role attribute to a managed login
+# user, so a tenant can create and manage its own roles without the postgres
+# superuser. Role attributes are not inherited through role membership, so the
+# attribute cannot be carried by the generated <db>_admin group role and has to be
+# set on the login user itself.
+#
+# The attribute is reconciled on every run of the init script: flipping createRole
+# back to false emits NOCREATEROLE and revokes it.
+#
+# The guard on PostgreSQL 16 is a security boundary, not a cosmetic check. Before
+# PostgreSQL 16, CREATEROLE allowed granting membership in any non-superuser role,
+# so a user holding it could grant itself pg_execute_server_program and reach
+# command execution on the instance. PostgreSQL 16 restricted CREATEROLE to roles
+# the grantee administers, which is what makes the attribute safe to expose.
+
+templates:
+  - templates/init-script.yaml
+
+release:
+  name: pg-test
+  namespace: tenant-test
+
+set:
+  _cluster:
+    scheduling: {}
+
+tests:
+  - it: "user is NOCREATEROLE by default"
+    set:
+      users:
+        app: {}
+    documentIndex: 1
+    asserts:
+      - matchRegex:
+          path: stringData["init.sh"]
+          pattern: 'ALTER ROLE "app" WITH PASSWORD .* NOREPLICATION NOCREATEROLE NOBYPASSRLS;'
+
+  - it: "createRole=true emits CREATEROLE"
+    set:
+      version: v18
+      users:
+        app:
+          createRole: true
+    documentIndex: 1
+    asserts:
+      - matchRegex:
+          path: stringData["init.sh"]
+          pattern: 'ALTER ROLE "app" WITH PASSWORD .* NOREPLICATION CREATEROLE NOBYPASSRLS;'
+
+  - it: "createRole=false emits NOCREATEROLE so the attribute is revoked"
+    set:
+      version: v18
+      users:
+        app:
+          createRole: false
+    documentIndex: 1
+    asserts:
+      - matchRegex:
+          path: stringData["init.sh"]
+          pattern: 'ALTER ROLE "app" WITH PASSWORD .* NOCREATEROLE NOBYPASSRLS;'
+
+  - it: "createRole composes with replication"
+    set:
+      version: v18
+      users:
+        app:
+          replication: true
+          createRole: true
+    documentIndex: 1
+    asserts:
+      - matchRegex:
+          path: stringData["init.sh"]
+          pattern: 'ALTER ROLE "app" WITH PASSWORD .* REPLICATION CREATEROLE NOBYPASSRLS;'
+
+  - it: "createRole on PostgreSQL 15 fails fast"
+    set:
+      version: v15
+      users:
+        app:
+          createRole: true
+    asserts:
+      - failedTemplate:
+          errorMessage: "SECURITY: users.app.createRole requires PostgreSQL 16 or newer. On PostgreSQL 15 and older, a role holding CREATEROLE can grant itself any non-superuser role, including pg_execute_server_program, which escalates to command execution on the instance."
+
+  - it: "createRole on PostgreSQL 13 fails fast"
+    set:
+      version: v13
+      users:
+        app:
+          createRole: true
+    asserts:
+      - failedTemplate:
+          errorMessage: "SECURITY: users.app.createRole requires PostgreSQL 16 or newer. On PostgreSQL 15 and older, a role holding CREATEROLE can grant itself any non-superuser role, including pg_execute_server_program, which escalates to command execution on the instance."
+
+  - it: "PostgreSQL 15 renders fine as long as createRole is not requested"
+    set:
+      version: v15
+      users:
+        app: {}
+    documentIndex: 1
+    asserts:
+      - matchRegex:
+          path: stringData["init.sh"]
+          pattern: 'ALTER ROLE "app" WITH PASSWORD .* NOCREATEROLE NOBYPASSRLS;'
+
+  - it: "bypassRls=true emits BYPASSRLS"
+    set:
+      version: v18
+      users:
+        app:
+          bypassRls: true
+    documentIndex: 1
+    asserts:
+      - matchRegex:
+          path: stringData["init.sh"]
+          pattern: 'ALTER ROLE "app" WITH PASSWORD .* NOCREATEROLE BYPASSRLS;'
+
+  - it: "bypassRls composes with createRole, which is what provisioning a privileged service role needs"
+    set:
+      version: v18
+      users:
+        app:
+          createRole: true
+          bypassRls: true
+    documentIndex: 1
+    asserts:
+      - matchRegex:
+          path: stringData["init.sh"]
+          pattern: 'ALTER ROLE "app" WITH PASSWORD .* CREATEROLE BYPASSRLS;'
+
+  - it: "bypassRls is allowed on PostgreSQL 15, it carries no escalation path of its own"
+    set:
+      version: v15
+      users:
+        app:
+          bypassRls: true
+    documentIndex: 1
+    asserts:
+      - matchRegex:
+          path: stringData["init.sh"]
+          pattern: 'ALTER ROLE "app" WITH PASSWORD .* NOCREATEROLE BYPASSRLS;'
+
+  - it: "createRole sets createrole_self_grant so the attribute is usable"
+    set:
+      version: v18
+      users:
+        app:
+          createRole: true
+    documentIndex: 1
+    asserts:
+      - matchRegex:
+          path: stringData["init.sh"]
+          pattern: "ALTER ROLE \"app\" SET createrole_self_grant = 'set, inherit';"
+
+  - it: "withdrawing createRole resets createrole_self_grant"
+    set:
+      version: v18
+      users:
+        app:
+          createRole: false
+    documentIndex: 1
+    asserts:
+      - matchRegex:
+          path: stringData["init.sh"]
+          pattern: 'ALTER ROLE "app" RESET createrole_self_grant;'
diff --git a/packages/apps/postgres/tests/username_validation_test.yaml b/packages/apps/postgres/tests/username_validation_test.yaml
new file mode 100644
index 0000000000..651de9c915
--- /dev/null
+++ b/packages/apps/postgres/tests/username_validation_test.yaml
@@ -0,0 +1,246 @@
+suite: init-script rejects a username outside the safe charset
+
+# The username becomes a Kubernetes Secret data key AND is interpolated into the
+# init-script shell (pw=$(cat "/credentials/<user>")) and role SQL. A name with a
+# shell metacharacter is a command-injection shape; the apiserver would reject it
+# later as an invalid Secret key with an opaque error. The chart must reject it at
+# render time, naming the offending username, so the metacharacter never reaches
+# the script. Reverting the guard in init-script.yaml lets the render succeed,
+# so the first test fails.
+
+templates:
+  - templates/init-script.yaml
+
+release:
+  name: pg-test
+  namespace: tenant-test
+
+set:
+  _cluster:
+    scheduling: {}
+
+tests:
+  - it: fails the render for a username carrying a shell metacharacter
+    set:
+      users:
+        'evil";id;echo "x': {}
+    asserts:
+      - failedTemplate:
+          errorMessage: 'invalid username "evil\";id;echo \"x": a username may contain only letters, digits and the characters -._ , must not be "." or start with "..", and must be at most 63 characters (it is a PostgreSQL role name, which CREATE ROLE silently truncates past 63 bytes, and it becomes a Kubernetes Secret key)'
+
+  - it: fails the render for a username with a space
+    set:
+      users:
+        'a b': {}
+    asserts:
+      - failedTemplate:
+          errorMessage: 'invalid username "a b": a username may contain only letters, digits and the characters -._ , must not be "." or start with "..", and must be at most 63 characters (it is a PostgreSQL role name, which CREATE ROLE silently truncates past 63 bytes, and it becomes a Kubernetes Secret key)'
+
+  # "." and ".." match the charset regex but are rejected by k8s IsConfigMapKey as
+  # Secret keys, so the guard rejects them explicitly (the length cap is a separate,
+  # PostgreSQL-driven concern pinned by the 63/64 boundary tests below). These pin
+  # the guard to the full IsConfigMapKey contract.
+  - it: fails the render for the reserved name "."
+    set:
+      users:
+        '.': {}
+    asserts:
+      - failedTemplate:
+          errorMessage: 'invalid username ".": a username may contain only letters, digits and the characters -._ , must not be "." or start with "..", and must be at most 63 characters (it is a PostgreSQL role name, which CREATE ROLE silently truncates past 63 bytes, and it becomes a Kubernetes Secret key)'
+
+  - it: fails the render for the reserved name ".."
+    set:
+      users:
+        '..': {}
+    asserts:
+      - failedTemplate:
+          errorMessage: 'invalid username "..": a username may contain only letters, digits and the characters -._ , must not be "." or start with "..", and must be at most 63 characters (it is a PostgreSQL role name, which CREATE ROLE silently truncates past 63 bytes, and it becomes a Kubernetes Secret key)'
+
+  # IsConfigMapKey rejects ANY name starting with ".." (hasChDirPrefix), not just
+  # the literal "..", so "..foo" is charset-legal yet cannot install.
+  - it: fails the render for a name starting with ".."
+    set:
+      users:
+        '..foo': {}
+    asserts:
+      - failedTemplate:
+          errorMessage: 'invalid username "..foo": a username may contain only letters, digits and the characters -._ , must not be "." or start with "..", and must be at most 63 characters (it is a PostgreSQL role name, which CREATE ROLE silently truncates past 63 bytes, and it becomes a Kubernetes Secret key)'
+
+  # A username is a PostgreSQL role name: CREATE ROLE silently truncates past 63
+  # bytes (NAMEDATALEN-1) with a NOTICE, not an error, so a 64-char name would be
+  # created as its 63-byte prefix and then dropped by the delete pass (catalog
+  # truncated != declared full name) in the same hook. The cap is 63, not the
+  # 253-char Secret-key limit. 64 chars fails; 63 renders. Reverting the cap to 253
+  # lets the 64-char case through.
+  - it: fails the render for a username of 64 characters (past the 63-byte role limit)
+    set:
+      users:
+        'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa': {}
+    asserts:
+      - failedTemplate:
+          errorMessage: 'invalid username "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa": a username may contain only letters, digits and the characters -._ , must not be "." or start with "..", and must be at most 63 characters (it is a PostgreSQL role name, which CREATE ROLE silently truncates past 63 bytes, and it becomes a Kubernetes Secret key)'
+
+  - it: renders normally for a username at the 63-character boundary
+    set:
+      users:
+        'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa': {}
+    documentSelector:
+      path: metadata.name
+      value: pg-test-credentials
+    asserts:
+      - matchRegex:
+          path: stringData["aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"]
+          pattern: ^[a-zA-Z0-9]{16}$
+
+  - it: renders normally for names using the full safe charset
+    set:
+      users:
+        a-b.c_1: {}
+    documentSelector:
+      path: metadata.name
+      value: pg-test-credentials
+    asserts:
+      - matchRegex:
+          path: stringData["a-b.c_1"]
+          pattern: ^[a-zA-Z0-9]{16}$
+
+  # `postgres` is the CNPG-managed superuser and is forbidden as an app role. The
+  # rejection must not depend on bootstrap.enabled: while it is true the
+  # create-users block is gated off, so a restore target carrying users.postgres
+  # installs, and the restore controller's automatic bootstrap clear
+  # (disablePostgresAppBootstrap) then wedges the next reconcile against this fail
+  # — a state the controller records as Succeeded. Rejecting it regardless of
+  # bootstrap keeps the controller from converging a release into an unrenderable
+  # one. Moving the guard back inside the `not .Values.bootstrap.enabled` block
+  # lets the bootstrap case render, so this test fails.
+  - it: rejects users.postgres even while bootstrap.enabled is true
+    set:
+      bootstrap:
+        enabled: true
+      users:
+        postgres:
+          replication: false
+    asserts:
+      - failedTemplate:
+          errorMessage: '`users.postgres` is forbidden by policy. Use a different username.'
+
+  - it: rejects users.postgres on the normal (non-bootstrap) path too
+    set:
+      users:
+        postgres:
+          replication: false
+    asserts:
+      - failedTemplate:
+          errorMessage: '`users.postgres` is forbidden by policy. Use a different username.'
+
+  # The credentials Secret is gated on .Values.users, so a release installed with
+  # the default `users: {}` has none. Adding its FIRST user is an upgrade whose
+  # lookup is legitimately empty — indistinguishable at render time from a deleted
+  # Secret — so postgres must NOT reject an empty-lookup upgrade (that would hard-
+  # block the common first-user path). It mints instead; the post-upgrade init-job
+  # applies the password. Re-adding a `not $existingSecret` fail on IsUpgrade turns
+  # this red — the regression this pins (a userless release could no longer gain a
+  # user). MariaDB is the opposite case (its Secret always exists via root, and
+  # root desyncs permanently), so its guard stays; see mariadb secret.yaml.
+  - it: mints when the first user is added to a userless release on upgrade
+    release:
+      name: pg-test
+      namespace: tenant-test
+      upgrade: true
+    set:
+      users:
+        app: {}
+    documentSelector:
+      path: metadata.name
+      value: pg-test-credentials
+    asserts:
+      - matchRegex:
+          path: stringData.app
+          pattern: ^[a-zA-Z0-9]{16}$
+
+  # A username of 64+ bytes installed before the 63 cap: its credentials Secret
+  # key was written, while the role itself was truncated and dropped in the same
+  # hook. Failing the render on the next upgrade would wedge the whole release
+  # over a user that never worked, so on upgrade the cap applies only to a user
+  # the existing credentials Secret does not already carry, i.e. a NEW user.
+  # Applying the cap on upgrade regardless of the Secret makes the first case
+  # fail to render; dropping the Secret-key conjunct lets the second render, so
+  # it fails.
+  - it: renders on upgrade for a 64-character user the credentials Secret already carries
+    release:
+      name: pg-test
+      namespace: tenant-test
+      upgrade: true
+    kubernetesProvider:
+      scheme:
+        "v1/Secret":
+          gvr: {version: v1, resource: secrets}
+          namespaced: true
+      objects:
+        - apiVersion: v1
+          kind: Secret
+          metadata:
+            name: pg-test-credentials
+            namespace: tenant-test
+          data:
+            aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa: ZXhpc3RpbmdwYXNzd29yZA==
+    set:
+      users:
+        aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa: {}
+    documentSelector:
+      path: metadata.name
+      value: pg-test-credentials
+    asserts:
+      - equal:
+          path: stringData["aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"]
+          value: existingpassword
+
+  - it: still fails on upgrade for a NEW 64-character user
+    release:
+      name: pg-test
+      namespace: tenant-test
+      upgrade: true
+    kubernetesProvider:
+      scheme:
+        "v1/Secret":
+          gvr: {version: v1, resource: secrets}
+          namespaced: true
+      objects:
+        - apiVersion: v1
+          kind: Secret
+          metadata:
+            name: pg-test-credentials
+            namespace: tenant-test
+          data:
+            app: ZXhpc3RpbmdwYXNzd29yZA==
+    set:
+      users:
+        app: {}
+        aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa: {}
+    asserts:
+      - failedTemplate:
+          errorMessage: 'invalid username "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa": a username may contain only letters, digits and the characters -._ , must not be "." or start with "..", and must be at most 63 characters (it is a PostgreSQL role name, which CREATE ROLE silently truncates past 63 bytes, and it becomes a Kubernetes Secret key)'
+
+  # A fresh install has no release to protect, so the cap holds even when a stale
+  # credentials Secret left in the namespace happens to carry the key. Dropping
+  # the ".Release.IsInstall" conjunct lets the render succeed, so this fails.
+  - it: still fails on install for a 64-character user a stale Secret carries
+    kubernetesProvider:
+      scheme:
+        "v1/Secret":
+          gvr: {version: v1, resource: secrets}
+          namespaced: true
+      objects:
+        - apiVersion: v1
+          kind: Secret
+          metadata:
+            name: pg-test-credentials
+            namespace: tenant-test
+          data:
+            aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa: ZXhpc3RpbmdwYXNzd29yZA==
+    set:
+      users:
+        aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa: {}
+    asserts:
+      - failedTemplate:
+          errorMessage: 'invalid username "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa": a username may contain only letters, digits and the characters -._ , must not be "." or start with "..", and must be at most 63 characters (it is a PostgreSQL role name, which CREATE ROLE silently truncates past 63 bytes, and it becomes a Kubernetes Secret key)'
diff --git a/packages/apps/postgres/values.schema.json b/packages/apps/postgres/values.schema.json
index 7ac89a0876..91747ba243 100644
--- a/packages/apps/postgres/values.schema.json
+++ b/packages/apps/postgres/values.schema.json
@@ -3,7 +3,7 @@
   "type": "object",
   "properties": {
     "replicas": {
-      "description": "Number of Postgres replicas.",
+      "description": "Number of Postgres replicas. Under active autoscaling this is the resting/seed count, not the live count — KEDA drives the live count via `/scale`. Disabling autoscaling does NOT automatically bring the live count back to `replicas`: the client-side merge writes `instances` only when the rendered value changes, so a cluster KEDA grew past `replicas` stays there with no autoscaler left to reduce it — lower `replicas` to the count you want and it rebases down (shedding the surplus replicas + PVCs). Lowering it below the live count, or disabling/dry-running while it sits below the live count, sheds in one step past the scaleDown pacing; stage it to the live count first (suspend the HelmRelease and `kubectl scale` if needed) to avoid a transient. Must stay greater than `quorum.maxSyncReplicas`.",
       "type": "integer",
       "default": 2
     },
@@ -117,7 +117,10 @@
           "rule": "self == oldSelf",
           "message": "storageClass is immutable"
         }
-      ]
+      ],
+      "x-cozystack-options": {
+        "source": "storageclass"
+      }
     },
     "external": {
       "description": "Enable external access from outside the cluster.",
@@ -137,13 +140,26 @@
         "v13"
       ]
     },
+    "flavor": {
+      "description": "PostgreSQL image flavor, fixed when the cluster is created. `postgresql` uses the CloudNativePG PostgreSQL image. `postgis` uses the CloudNativePG PostGIS image, which adds postgis, postgis_raster, postgis_topology, postgis_sfcgal, postgis_tiger_geocoder and address_standardizer; enable them per database in `databases.\u003cname\u003e.extensions`. Changing the flavor of an existing cluster is refused, and a backup restores only into a cluster of the flavor it was taken from: to change flavor, create a new cluster and move the data with a logical dump (pg_dump / pg_restore).",
+      "type": "string",
+      "default": "postgresql",
+      "enum": [
+        "postgresql",
+        "postgis"
+      ]
+    },
     "tls": {
       "description": "TLS configuration for server connections.",
       "type": "object",
       "default": {},
       "properties": {
         "enabled": {
-          "description": "Tri-state switch controlling whether the chart injects the external hostname into the operator-managed CNPG cert via spec.certificates.serverAltDNSNames. When omitted, the chart injects the SAN if `external: true` and skips it otherwise. Set explicitly to `true` to inject regardless of `external` (no-op when `external: false` since there is no external hostname to add). Set to `false` to skip injection. Note that CNPG keeps its built-in TLS on the wire regardless of this flag — this toggle only controls the chart-side SAN injection; to disable PostgreSQL TLS entirely set `postgresql.parameters.ssl = \"off\"` at the CNPG layer.",
+          "description": "Tri-state switch controlling whether the chart injects the external hostnames into the operator-managed CNPG cert via spec.certificates.serverAltDNSNames. When omitted, the chart injects them if `external: true` and skips them otherwise. Set explicitly to `true` to inject regardless of `external` (no-op when `external: false` since there is no external hostname to add). Set to `false` to skip injection. Note that CNPG keeps its built-in TLS on the wire regardless of this flag — this toggle only controls the chart-side SAN injection; to disable PostgreSQL TLS entirely set `postgresql.parameters.ssl = \"off\"` at the CNPG layer.",
+          "type": "boolean"
+        },
+        "required": {
+          "description": "Tri-state switch controlling whether the server refuses sessions that are not encrypted. When omitted, it is on if `external: true` and off otherwise. When on, the chart renders `spec.postgresql.pg_hba` with `hostssl all all all scram-sha-256` (`md5` on PostgreSQL 13, matching CloudNativePG's default rule) followed by `host all all all reject`, so a client that connects with `sslmode=disable` is refused instead of getting a plaintext session; in-cluster clients are held to the same rule, since the pod network cannot be told apart from an external client. Set to `false` to keep accepting plaintext sessions on an external instance, or to `true` to require TLS on an in-cluster one. Rendering fails if `postgresql.parameters.ssl` is off while this is in effect.",
           "type": "boolean"
         }
       }
@@ -170,6 +186,19 @@
             ],
             "x-kubernetes-int-or-string": true
           }
+        },
+        "sharedPreloadLibraries": {
+          "description": "Libraries loaded at server start, restricted to an allowlist of modules already shipped in the PostgreSQL image. CloudNativePG also preloads `pg_stat_statements`, `auto_explain` and `pgaudit` by itself whenever `parameters` sets a key under their prefix (e.g. `pg_stat_statements.track`), so removing one of them from this list does not unload it while such a key is set; `pg_prewarm` is preloaded only through this list. Changing the list restarts PostgreSQL on every instance, the primary included, so writes pause briefly.",
+          "type": "array",
+          "items": {
+            "type": "string",
+            "enum": [
+              "pg_stat_statements",
+              "auto_explain",
+              "pgaudit",
+              "pg_prewarm"
+            ]
+          }
         }
       }
     },
@@ -183,7 +212,7 @@
       ],
       "properties": {
         "maxSyncReplicas": {
-          "description": "Maximum number of synchronous replicas allowed (must be less than total replicas).",
+          "description": "Maximum number of synchronous replicas allowed (must be less than total replicas). Under autoscaling it also sets the scale-down floor (the effective minimum is `max(minReplicas, maxSyncReplicas+1, 2)`); the chart fails to render if that floor exceeds `autoscaling.maxReplicas`.",
           "type": "integer",
           "default": 0
         },
@@ -194,16 +223,87 @@
         }
       }
     },
+    "autoscaling": {
+      "description": "Read-replica autoscaling configuration.",
+      "type": "object",
+      "default": {},
+      "required": [
+        "dryRun",
+        "enabled",
+        "maxReplicas",
+        "maxReplicationLagSeconds",
+        "metric",
+        "minReplicas",
+        "serverAddress",
+        "target",
+        "transition"
+      ],
+      "properties": {
+        "dryRun": {
+          "description": "Recommendation mode: keep the static count and render the ScaledObject with both scaling directions paused, so KEDA keeps the HPA and keeps serving its trigger metric but actuates neither way. Note both scaling policies are disabled, so the HPA's desiredReplicas is frozen to the current count - read the recommendation from the matching read-load dashboard panel for your metric (connections or CPU): desired = 1 + ceil(read load / target), clamped to [effectiveMin..maxReplicas] where effectiveMin = max(minReplicas, maxSyncReplicas+1, 2), not from the desired-replicas line. Like disabling, flipping a LIVE autoscaled cluster into dryRun re-renders `instances: replicas` (the raw static value, which can be below the autoscaling floor); if `replicas` is below the live count, stage it to the live count first (see the enablement note) or the cluster sheds down to `replicas`. No shed occurs when the rendered value is unchanged (replicas already equals the active seed) — client-side merge is then a no-op and the live count is preserved. Permanent, unlike `transition`.",
+          "type": "boolean",
+          "default": false
+        },
+        "enabled": {
+          "description": "Enable horizontal autoscaling of read replicas. Requires the platform `keda` package to be enabled by an administrator first; the chart fails to render (rather than break the release) if KEDA is not installed. Prerequisite: the queried vmselect must hold BOTH the CNPG metrics (cnpg_backends_total / container CPU) AND kube_pod_labels (kube-state-metrics). This holds for a tenant on the shared root monitoring stack (`monitoring: false`, both land in tenant-root). A tenant running its OWN Monitoring app (`monitoring: true`) has the CNPG metrics but not kube_pod_labels (KSM is root-only), so it must set `serverAddress` to a vmselect carrying both series or autoscaling never actuates.",
+          "type": "boolean",
+          "default": false
+        },
+        "maxReplicas": {
+          "description": "Maximum total instances. Must be \u003e= minReplicas and \u003e= the synchronous-quorum floor (maxSyncReplicas+1); the chart fails to render (rather than silently run an unbounded instance count) if the effective floor exceeds it - raise maxReplicas. HAZARD: lowering maxReplicas below the live count makes the HPA cut straight to the new maximum in one step (the current\u003emax branch bypasses the scale-down pacing), shedding the surplus replicas + PVCs at once; to lower it deliberately, suspend the HelmRelease and pin the live count with `kubectl scale` first.",
+          "type": "integer",
+          "default": 6
+        },
+        "maxReplicationLagSeconds": {
+          "description": "Freeze scaling while replication lag exceeds this (seconds) and the primary is writing. 0 disables the brake. Default 0: the freeze branch has only been validated on a live cluster in its non-braking (pass-through) form, so the lag brake is opt-in until the braking path is exercised under load; set a positive value (e.g. 30) to enable it.",
+          "type": "integer",
+          "default": 0
+        },
+        "metric": {
+          "description": "Read-load signal to scale on.",
+          "type": "string",
+          "default": "ReadConnections",
+          "enum": [
+            "ReadConnections",
+            "ReadCPUUtilization"
+          ]
+        },
+        "minReplicas": {
+          "description": "Minimum total instances; raised to the synchronous-quorum floor (`maxSyncReplicas + 1`) and to 2 when either is higher.",
+          "type": "integer",
+          "default": 2
+        },
+        "serverAddress": {
+          "description": "Override the Prometheus/vmselect URL the ScaledObject queries. Empty (default) derives `http://vmselect-shortterm.\u003cmonitoring-ns\u003e.svc:8481/select/0/prometheus`. Set it when the derived vmselect does not hold both the CNPG metrics and kube_pod_labels (e.g. `monitoring: true` tenants, or a non-default `metricsStorages` name). SSRF constraint: the host must be an in-cluster Service DNS name (`\u003csvc\u003e.\u003cns\u003e.svc[.\u003cclusterDomain\u003e]`) whose namespace is within the tenant's own subtree (its namespace, its parents, or `tenant-root`) — the cluster-privileged KEDA operator fetches this URL every poll, so it is refused a metadata endpoint, an external host, or a sibling/system namespace. Residual surface (accepted trade-off): `tenant-root` is always allowed because the derived default points there, so a tenant can still aim the operator at any Service in `tenant-root` on any port/path (a blind in-cluster reachability probe — the operator reads no response body back to the tenant); the egress NetworkPolicy does not narrow that.",
+          "type": "string",
+          "default": ""
+        },
+        "target": {
+          "description": "Target read load per read-serving replica (unit depends on `metric`: active connections, or CPU millicores). Dimensionless integer - a resource.Quantity here would accept `150m`, which PromQL reads as 150 minutes and KEDA cannot use as a threshold.",
+          "type": "integer",
+          "default": 150
+        },
+        "transition": {
+          "description": "Migration phase 1: render `.spec.instances` from `replicas` (which the operator stages to the current live count) AND pause the ScaledObject in both directions, so KEDA stands up with its HPA present but not actuating. Flip to false (phase 2) to hand the runtime count to KEDA. Because the both-direction pause keeps the HPA (not the HPA-deleting full pause), KEDA is genuinely warm at phase 2 — no HPA recreate — and because the active seed is max(replicas, effectiveMin), phase 2 re-renders the same instance count phase 1 did (when `replicas` is staged at/above the floor), so the flip is a merge no-op with no dip. The HPA's scaleUp stabilization window still smooths the first actuation.",
+          "type": "boolean",
+          "default": false
+        }
+      }
+    },
     "users": {
-      "description": "Users configuration map.",
+      "description": "Users configuration map. Passwords are always auto-generated and stored in the `\u003crelease\u003e-credentials` Secret; they cannot be set from values — read a user's password from that Secret. A `password` left over in values from before the field was removed is ignored by the render and draws an admission warning, but it is not inert on an upgraded release: the chart preserves whatever password is already in the Secret, which on the first upgrade is the value that was set before removal, so that value stays the live credential until it is rotated (dedicated rotation is tracked in cozystack/community#72). The live password lives only in the Secret.",
       "type": "object",
       "default": {},
       "additionalProperties": {
         "type": "object",
         "properties": {
-          "password": {
-            "description": "Password for the user.",
-            "type": "string"
+          "bypassRls": {
+            "description": "Whether the user can bypass row-level security policies (BYPASSRLS). A role can only create other roles carrying BYPASSRLS if it holds the attribute itself, so this is required alongside `createRole` to provision a privileged service role.",
+            "type": "boolean"
+          },
+          "createRole": {
+            "description": "Whether the user can create and manage roles (CREATEROLE). Requires PostgreSQL 16 or newer. Setting it back to `false` withdraws the attribute only: the roles the user created, and its ADMIN and SET memberships in them, stay. Once any user has held it, the chart no longer adopts an existing role it did not create, so a user or database declared later under the name of such a role fails the init job until a platform administrator drops that role.",
+            "type": "boolean"
           },
           "replication": {
             "description": "Whether the user has replication privileges.",
@@ -268,7 +368,7 @@
           "default": false
         },
         "endpointCA": {
-          "description": "DEPRECATED. Pre-existing Secret with the CA bundle Barman should trust when reaching a self-signed S3 endpoint. Used for both backup and bootstrap recovery in the legacy chart-managed flow.",
+          "description": "DEPRECATED. Pre-existing Secret with the CA bundle the barman-cloud plugin should trust when reaching a self-signed S3 endpoint. Used for both backup and bootstrap recovery in the legacy chart-managed flow.",
           "type": "object",
           "default": {},
           "properties": {
@@ -278,7 +378,7 @@
               "default": ""
             },
             "name": {
-              "description": "Name of the Secret in the application namespace. Empty means no endpointCA is emitted (Barman uses the system trust store).",
+              "description": "Name of the Secret in the application namespace. Empty means no endpointCA is emitted (the plugin uses the system trust store).",
               "type": "string",
               "default": ""
             }
@@ -327,12 +427,12 @@
           "default": ""
         },
         "schedule": {
-          "description": "Legacy. Cron schedule (CNPG 6-field format) for the chart-emitted ScheduledBackup. Empty means no chart-managed schedule, which is the recommended setup when a `BackupClass` from `backups.cozystack.io` already drives backup orchestration. In the legacy chart-managed flow `spec.backup.barmanObjectStore` is rendered when `backup.enabled=true` AND `useSystemBucket=false` AND `destinationPath` is non-empty AND inline-or-external creds are supplied; in the platform `useSystemBucket=true` flow the chart skips emitting `barmanObjectStore` and the CNPG driver SSA-patches it onto the live Cluster at first BackupJob time.",
+          "description": "Legacy. Cron schedule (CNPG 6-field format) for the chart-emitted ScheduledBackup. Empty means no chart-managed schedule, which is the recommended setup when a `BackupClass` from `backups.cozystack.io` already drives backup orchestration. In the legacy chart-managed flow `spec.plugins` plus the barman-cloud ObjectStore is rendered when `backup.enabled=true` AND `useSystemBucket=false` AND `destinationPath` is non-empty AND inline-or-external creds are supplied; in the platform `useSystemBucket=true` flow the chart skips emitting `spec.plugins` and the CNPG driver SSA-applies the ObjectStore and patches `spec.plugins` onto the live Cluster at first BackupJob time.",
           "type": "string",
           "default": ""
         },
         "useSystemBucket": {
-          "description": "Opt-in: when true, the chart-emitted `\u003crelease\u003e-s3-creds` Secret is skipped AND `spec.backup.barmanObjectStore` is left UNSET in the chart-rendered Cluster — the cozy-default BackupClass driver SSA-patches the live Cluster with destinationPath/endpointURL/credentials when the first BackupJob runs. Consequence: `archive_command` is NOT active until that first BackupJob fires; WAL accumulates on the PVC in the meantime, so fire an ad-hoc BackupJob immediately after enabling the flag on existing releases. Use together with the platform `cozy-default` BackupClass — tenants do not need to fill `s3AccessKey`/`s3SecretKey` or `destinationPath`/`endpointURL`. The destination path automatically scopes to `s3://cozy-backups/\u003cnamespace\u003e/\u003crelease\u003e/`.",
+          "description": "Opt-in: when true, the chart-emitted `\u003crelease\u003e-s3-creds` Secret is skipped AND `spec.plugins` (plus the barman-cloud ObjectStore) is left UNSET in the chart-rendered Cluster — the cozy-default BackupClass driver SSA-applies an ObjectStore (carrying destinationPath/endpointURL/credentials) and patches `spec.plugins` on the live Cluster when the first BackupJob runs. Consequence: plugin WAL archiving is NOT active until that first BackupJob fires; WAL accumulates on the PVC in the meantime, so fire an ad-hoc BackupJob immediately after enabling the flag on existing releases. Use together with the platform `cozy-default` BackupClass — tenants do not need to fill `s3AccessKey`/`s3SecretKey` or `destinationPath`/`endpointURL`. The destination path automatically scopes to `s3://cozy-backups/\u003cnamespace\u003e/\u003crelease\u003e/`.",
           "type": "boolean",
           "default": false
         }
@@ -347,11 +447,21 @@
         "oldName"
       ],
       "properties": {
+        "backupID": {
+          "description": "Barman ID of the base backup to recover from, passed as `recoveryTarget.backupID`. Empty lets the barman-cloud plugin pick one: the newest backup when `recoveryTime` is empty, otherwise the newest one ending at or before it, on any timeline. The CNPG backup driver sets this on restore.",
+          "type": "string",
+          "default": ""
+        },
         "enabled": {
           "description": "Whether to restore from a backup.",
           "type": "boolean",
           "default": false
         },
+        "newServerName": {
+          "description": "WAL-archive server name (S3 path prefix) the RESTORED cluster writes to. Must differ from `serverName` (the recovery source) so a restored cluster archives to a fresh, empty prefix and barman-cloud-check-wal-archive passes while it recovers from the source's prefix. The CNPG backup driver sets this on restore; empty means the cluster archives under its own name.",
+          "type": "string",
+          "default": ""
+        },
         "oldName": {
           "description": "Previous cluster name before deletion.",
           "type": "string",
@@ -363,7 +473,7 @@
           "default": ""
         },
         "serverName": {
-          "description": "Barman server name (S3 path prefix) used by the original cluster when writing backups. Set this only when the original cluster had an explicit barmanObjectStore.serverName that differed from its Kubernetes resource name.",
+          "description": "Server name (S3 path prefix) used by the original cluster when writing backups; passed to the barman-cloud plugin via `externalClusters[].plugin.parameters.serverName`. Defaults to `bootstrap.oldName`. Set this only when the original cluster wrote backups under an explicit server name that differed from its Kubernetes resource name.",
           "type": "string",
           "default": ""
         }
diff --git a/packages/apps/postgres/values.yaml b/packages/apps/postgres/values.yaml
index a4e11958ea..83b658a641 100644
--- a/packages/apps/postgres/values.yaml
+++ b/packages/apps/postgres/values.yaml
@@ -55,7 +55,7 @@
 ## @value xlarge
 ## @value 2xlarge
 
-## @param {int} replicas - Number of Postgres replicas.
+## @param {int} replicas - Number of Postgres replicas. Under active autoscaling this is the resting/seed count, not the live count — KEDA drives the live count via `/scale`. Disabling autoscaling does NOT automatically bring the live count back to `replicas`: the client-side merge writes `instances` only when the rendered value changes, so a cluster KEDA grew past `replicas` stays there with no autoscaler left to reduce it — lower `replicas` to the count you want and it rebases down (shedding the surplus replicas + PVCs). Lowering it below the live count, or disabling/dry-running while it sits below the live count, sheds in one step past the scaleDown pacing; stage it to the live count first (suspend the HelmRelease and `kubectl scale` if needed) to avoid a transient. Must stay greater than `quorum.maxSyncReplicas`.
 replicas: 2
 
 ## @param {Resources} [resources] - Explicit CPU and memory configuration for each PostgreSQL replica. When omitted, the preset defined in `resourcesPreset` is applied.
@@ -69,6 +69,7 @@ size: 10Gi
 
 ## @param {string} storageClass - StorageClass used to store the data.
 ## @immutable
+## @x-cozystack-options {source: storageclass}
 storageClass: ""
 
 ## @param {bool} external - Enable external access from outside the cluster.
@@ -86,12 +87,21 @@ external: false
 ## @param {Version} version - PostgreSQL major version to deploy
 version: v18
 
+##
+## @enum {string} Flavor
+## @value postgresql
+## @value postgis
+
+## @param {Flavor} flavor - PostgreSQL image flavor, fixed when the cluster is created. `postgresql` uses the CloudNativePG PostgreSQL image. `postgis` uses the CloudNativePG PostGIS image, which adds postgis, postgis_raster, postgis_topology, postgis_sfcgal, postgis_tiger_geocoder and address_standardizer; enable them per database in `databases.<name>.extensions`. Changing the flavor of an existing cluster is refused, and a backup restores only into a cluster of the flavor it was taken from: to change flavor, create a new cluster and move the data with a logical dump (pg_dump / pg_restore).
+flavor: postgresql
+
 ##
 ## @section TLS configuration
 ##
 
 ## @typedef {struct} TLS - TLS configuration for PostgreSQL server connections.
-## @field {*bool} enabled - Tri-state switch controlling whether the chart injects the external hostname into the operator-managed CNPG cert via spec.certificates.serverAltDNSNames. When omitted, the chart injects the SAN if `external: true` and skips it otherwise. Set explicitly to `true` to inject regardless of `external` (no-op when `external: false` since there is no external hostname to add). Set to `false` to skip injection. Note that CNPG keeps its built-in TLS on the wire regardless of this flag — this toggle only controls the chart-side SAN injection; to disable PostgreSQL TLS entirely set `postgresql.parameters.ssl = "off"` at the CNPG layer.
+## @field {*bool} enabled - Tri-state switch controlling whether the chart injects the external hostnames into the operator-managed CNPG cert via spec.certificates.serverAltDNSNames. When omitted, the chart injects them if `external: true` and skips them otherwise. Set explicitly to `true` to inject regardless of `external` (no-op when `external: false` since there is no external hostname to add). Set to `false` to skip injection. Note that CNPG keeps its built-in TLS on the wire regardless of this flag — this toggle only controls the chart-side SAN injection; to disable PostgreSQL TLS entirely set `postgresql.parameters.ssl = "off"` at the CNPG layer.
+## @field {*bool} required - Tri-state switch controlling whether the server refuses sessions that are not encrypted. When omitted, it is on if `external: true` and off otherwise. When on, the chart renders `spec.postgresql.pg_hba` with `hostssl all all all scram-sha-256` (`md5` on PostgreSQL 13, matching CloudNativePG's default rule) followed by `host all all all reject`, so a client that connects with `sslmode=disable` is refused instead of getting a plaintext session; in-cluster clients are held to the same rule, since the pod network cannot be told apart from an external client. Set to `false` to keep accepting plaintext sessions on an external instance, or to `true` to require TLS on an in-cluster one. Rendering fails if `postgresql.parameters.ssl` is off while this is in effect.
 
 ## @param {TLS} tls - TLS configuration for server connections.
 tls: {}
@@ -99,7 +109,15 @@ tls: {}
 ## @section Application-specific parameters
 ##
 
+##
+## @enum {string} PreloadLibrary
+## @value pg_stat_statements
+## @value auto_explain
+## @value pgaudit
+## @value pg_prewarm
+
 ## @typedef {struct} PostgreSQL - PostgreSQL server configuration.
+## @field {[]PreloadLibrary} [sharedPreloadLibraries] - Libraries loaded at server start, restricted to an allowlist of modules already shipped in the PostgreSQL image. CloudNativePG also preloads `pg_stat_statements`, `auto_explain` and `pgaudit` by itself whenever `parameters` sets a key under their prefix (e.g. `pg_stat_statements.track`), so removing one of them from this list does not unload it while such a key is set; `pg_prewarm` is preloaded only through this list. Changing the list restarts PostgreSQL on every instance, the primary included, so writes pause briefly.
 ## @field {map[string]intOrString} [parameters] - PostgreSQL server parameters. Values may be strings or integers; integers are coerced to strings by the template (e.g. both `max_connections: 100` and `max_connections: "100"` are accepted). BLOCKED (enable arbitrary code execution): archive_command, restore_command, ssl_passphrase_command, archive_cleanup_command, recovery_end_command, dynamic_library_path, local_preload_libraries, session_preload_libraries, shared_preload_libraries. Do NOT override CloudNativePG-managed parameters: archive_mode, primary_conninfo, wal_level, max_replication_slots.
 
 ## @param {PostgreSQL} postgresql - PostgreSQL server configuration.
@@ -119,12 +137,23 @@ postgresql:
 ##   dynamic_library_path, local_preload_libraries, session_preload_libraries,
 ##   shared_preload_libraries (arbitrary .so loading)
 ##
+## To preload a module, use the `sharedPreloadLibraries` allowlist instead of the
+## blocked `shared_preload_libraries` parameter:
+##   sharedPreloadLibraries:
+##     - pg_stat_statements
+##     - auto_explain
+##
 ## IMPORTANT: Do NOT override CloudNativePG-managed parameters:
 ##   archive_mode, primary_conninfo, wal_level, max_replication_slots
 ##
 ## NOTE: Some parameters require pod restart (not just reload):
 ##   shared_buffers, max_connections, max_prepared_transactions,
 ##   wal_buffers, max_wal_senders
+##
+## When shared_buffers is not set and the memory limit is below 512Mi, the
+## chart sets it to a quarter of the limit with a 16MB floor, capped at the
+## memory request rounded down to whole MiB. Larger limits keep the
+## PostgreSQL default of 128MB.
 
 ##
 ## @section Quorum-based synchronous replication
@@ -132,33 +161,119 @@ postgresql:
 
 ## @typedef {struct} Quorum - Quorum configuration for synchronous replication.
 ## @field {int} minSyncReplicas - Minimum number of synchronous replicas required for commit.
-## @field {int} maxSyncReplicas - Maximum number of synchronous replicas allowed (must be less than total replicas).
+## @field {int} maxSyncReplicas - Maximum number of synchronous replicas allowed (must be less than total replicas). Under autoscaling it also sets the scale-down floor (the effective minimum is `max(minReplicas, maxSyncReplicas+1, 2)`); the chart fails to render if that floor exceeds `autoscaling.maxReplicas`.
 
 ## @param {Quorum} quorum - Quorum configuration for synchronous replication.
 quorum:
   minSyncReplicas: 0
   maxSyncReplicas: 0
 
+##
+## @section Autoscaling
+##
+
+## @typedef {struct} Autoscaling - Horizontal autoscaling of read replicas via KEDA. When active, the CNPG instance count is SEEDED from `max(replicas, floor)` and then driven by a KEDA ScaledObject from read load; `replicas` becomes the resting/seed count, not the live count, which KEDA owns via the `/scale` subresource. Disabling does not auto-restore the live count to `replicas` (the unchanged seed is a merge no-op); lower `replicas` to reclaim capacity KEDA grew.
+## @field {bool} enabled - Enable horizontal autoscaling of read replicas. Requires the platform `keda` package to be enabled by an administrator first; the chart fails to render (rather than break the release) if KEDA is not installed. Prerequisite: the queried vmselect must hold BOTH the CNPG metrics (cnpg_backends_total / container CPU) AND kube_pod_labels (kube-state-metrics). This holds for a tenant on the shared root monitoring stack (`monitoring: false`, both land in tenant-root). A tenant running its OWN Monitoring app (`monitoring: true`) has the CNPG metrics but not kube_pod_labels (KSM is root-only), so it must set `serverAddress` to a vmselect carrying both series or autoscaling never actuates.
+## @field {string} serverAddress - Override the Prometheus/vmselect URL the ScaledObject queries. Empty (default) derives `http://vmselect-shortterm.<monitoring-ns>.svc:8481/select/0/prometheus`. Set it when the derived vmselect does not hold both the CNPG metrics and kube_pod_labels (e.g. `monitoring: true` tenants, or a non-default `metricsStorages` name). SSRF constraint: the host must be an in-cluster Service DNS name (`<svc>.<ns>.svc[.<clusterDomain>]`) whose namespace is within the tenant's own subtree (its namespace, its parents, or `tenant-root`) — the cluster-privileged KEDA operator fetches this URL every poll, so it is refused a metadata endpoint, an external host, or a sibling/system namespace. Residual surface (accepted trade-off): `tenant-root` is always allowed because the derived default points there, so a tenant can still aim the operator at any Service in `tenant-root` on any port/path (a blind in-cluster reachability probe — the operator reads no response body back to the tenant); the egress NetworkPolicy does not narrow that.
+## @field {int} minReplicas - Minimum total instances; raised to the synchronous-quorum floor (`maxSyncReplicas + 1`) and to 2 when either is higher.
+## @field {int} maxReplicas - Maximum total instances. Must be >= minReplicas and >= the synchronous-quorum floor (maxSyncReplicas+1); the chart fails to render (rather than silently run an unbounded instance count) if the effective floor exceeds it - raise maxReplicas. HAZARD: lowering maxReplicas below the live count makes the HPA cut straight to the new maximum in one step (the current>max branch bypasses the scale-down pacing), shedding the surplus replicas + PVCs at once; to lower it deliberately, suspend the HelmRelease and pin the live count with `kubectl scale` first.
+## @field {ReadMetric} metric - Read-load signal to scale on.
+## @field {int} target - Target read load per read-serving replica (unit depends on `metric`: active connections, or CPU millicores). Dimensionless integer - a resource.Quantity here would accept `150m`, which PromQL reads as 150 minutes and KEDA cannot use as a threshold.
+## @field {int} maxReplicationLagSeconds - Freeze scaling while replication lag exceeds this (seconds) and the primary is writing. 0 disables the brake. Default 0: the freeze branch has only been validated on a live cluster in its non-braking (pass-through) form, so the lag brake is opt-in until the braking path is exercised under load; set a positive value (e.g. 30) to enable it.
+## @field {bool} dryRun - Recommendation mode: keep the static count and render the ScaledObject with both scaling directions paused, so KEDA keeps the HPA and keeps serving its trigger metric but actuates neither way. Note both scaling policies are disabled, so the HPA's desiredReplicas is frozen to the current count - read the recommendation from the matching read-load dashboard panel for your metric (connections or CPU): desired = 1 + ceil(read load / target), clamped to [effectiveMin..maxReplicas] where effectiveMin = max(minReplicas, maxSyncReplicas+1, 2), not from the desired-replicas line. Like disabling, flipping a LIVE autoscaled cluster into dryRun re-renders `instances: replicas` (the raw static value, which can be below the autoscaling floor); if `replicas` is below the live count, stage it to the live count first (see the enablement note) or the cluster sheds down to `replicas`. No shed occurs when the rendered value is unchanged (replicas already equals the active seed) — client-side merge is then a no-op and the live count is preserved. Permanent, unlike `transition`.
+## @field {bool} transition - Migration phase 1: render `.spec.instances` from `replicas` (which the operator stages to the current live count) AND pause the ScaledObject in both directions, so KEDA stands up with its HPA present but not actuating. Flip to false (phase 2) to hand the runtime count to KEDA. Because the both-direction pause keeps the HPA (not the HPA-deleting full pause), KEDA is genuinely warm at phase 2 — no HPA recreate — and because the active seed is max(replicas, effectiveMin), phase 2 re-renders the same instance count phase 1 did (when `replicas` is staged at/above the floor), so the flip is a merge no-op with no dip. The HPA's scaleUp stabilization window still smooths the first actuation.
+
+## @enum {string} ReadMetric - Read-load metric type.
+## @value ReadConnections - Active read connections on the standby pods.
+## @value ReadCPUUtilization - CPU (millicores) of the postgres container on the standby pods.
+
+## Under active autoscaling the KEDA HPA owns the runtime count via the /scale
+## subresource, and the chart SEEDS `.spec.instances` at a CONSTANT =
+## max(.Values.replicas, effectiveMin), where effectiveMin = max(minReplicas,
+## maxSyncReplicas+1, 2). It re-renders that same constant every reconcile, and the
+## postgres HelmRelease applies CLIENT-SIDE, under which helm-controller patches this CRD
+## from the previous-vs-new rendered manifest and does not consult live state, so the
+## unchanged constant yields no patch and never reverts KEDA's higher live value written
+## through /scale.
+## Client-side apply is forced per-app: the platform's helm-controller (v1.5.0) defaults
+## to server-side apply, which would force-own the rendered field and revert it, so the
+## postgres ApplicationDefinition carries `release.cozystack.io/helm-server-side-apply:
+## "false"` (threaded onto the HelmRelease in pkg/registry/apps/application/rest.go).
+## Seeding (rather than omitting) is deliberate: an omitted field defaults to 1, which the
+## CNPG webhook rejects under quorum, and — worse — under server-side apply the phase-2
+## omit prunes the field whenever KEDA has not yet written /scale (e.g. a cluster idle at
+## its floor), collapsing it to 1 and decommissioning every replica PVC (see community
+## design proposal §Upgrade "Implementation update 2026-09-02"; validated live on a test cluster).
+## Seeding max(replicas, effectiveMin) — rather than effectiveMin alone — keeps the active
+## branch equal to the disabled/dryRun/transition branch (which renders `instances:
+## replicas`) whenever `replicas` sits at or above the floor, so enabling, dry-running, or
+## completing a transition is a merge no-op and the live count does NOT dip.
+## The merge writes `instances` (rebasing the live count) only when the newly-rendered
+## SEED differs from the previously-rendered one — KEDA's live count is never compared —
+## so the residual drop cases are narrow:
+##   (1) LOWERING `.Values.replicas` below the live count (or enabling with `replicas`
+##       left at its default 2 while the live cluster is larger): the seed becomes
+##       max(replicas, floor) and the live count rebases down to it (never below the
+##       quorum floor, never a collapse to 1), decommissioning the surplus replicas+PVCs.
+##       Stage `replicas` to the live count first to avoid this.
+##   (2) RAISING `minReplicas`/`quorum.maxSyncReplicas` so the floor exceeds both the live
+##       count and `replicas`: the seed rises and the live count is raised to it. Lowering
+##       the floor is a no-op while `replicas` >= the new floor.
+## HAZARD (either case, under load): the rebase compares the newly-rendered seed to the
+## PREVIOUS rendered seed — never to KEDA's live count. So whenever load has scaled the live
+## count ABOVE the seed and any chart change re-renders a seed still at/below that live count
+## (lowering `replicas`, OR raising the floor to a value still below the live count), the
+## re-apply cuts `.spec.instances` straight down to the seed in ONE step — shedding the
+## surplus standbys and their PVCs past the scaleDown pacing — before the HPA re-clones them
+## back up. This is the same one-step shed the lowering-`maxReplicas` HAZARD warns about, but
+## triggered by a floor/replicas change rather than the ceiling. Stage the live count into
+## `replicas` first (below) to avoid the transient.
+## To rebase deliberately with no transient: suspend the HelmRelease, pin the live count
+## with `kubectl scale cluster.postgresql.cnpg.io/<name> --replicas=<live count>` and set
+## `.Values.replicas` to match (or use the two-phase `transition` flow), apply, then
+## resume. The `transition` flag additionally lets KEDA come up warm so it actuates at
+## phase 2 without recreating the HPA.
+## Keep `.Values.replicas` greater than `quorum.maxSyncReplicas` even under autoscaling:
+## the active path floors the seed up to effectiveMin so it admits a too-small `replicas`,
+## but the static path (disable / dryRun / transition phase 1) renders `instances:
+## replicas` and fails closed when `replicas <= maxSyncReplicas` — so a too-small
+## `replicas` only surfaces when you later disable or dry-run, not at enable.
+## Likewise `autoscaling.maxReplicas` must be >= effectiveMin = max(minReplicas,
+## maxSyncReplicas+1, 2) or the chart fails to render (it will not silently run an
+## unbounded instance count) — e.g. with the default read floor, maxReplicas must be >= 2.
+## @param {Autoscaling} autoscaling - Read-replica autoscaling configuration.
+autoscaling:
+  enabled: false
+  serverAddress: ""
+  minReplicas: 2
+  maxReplicas: 6
+  metric: ReadConnections
+  target: 150
+  maxReplicationLagSeconds: 0
+  dryRun: false
+  transition: false
+
 ##
 ## @section Users configuration
 ##
 
 ## @typedef {struct} User - User configuration.
-## @field {string} [password] - Password for the user.
 ## @field {bool} [replication] - Whether the user has replication privileges.
+## @field {bool} [createRole] - Whether the user can create and manage roles (CREATEROLE). Requires PostgreSQL 16 or newer. Setting it back to `false` withdraws the attribute only: the roles the user created, and its ADMIN and SET memberships in them, stay. Once any user has held it, the chart no longer adopts an existing role it did not create, so a user or database declared later under the name of such a role fails the init job until a platform administrator drops that role.
+## @field {bool} [bypassRls] - Whether the user can bypass row-level security policies (BYPASSRLS). A role can only create other roles carrying BYPASSRLS if it holds the attribute itself, so this is required alongside `createRole` to provision a privileged service role.
 
-## @param {map[string]User} users - Users configuration map.
+## @param {map[string]User} users - Users configuration map. Passwords are always auto-generated and stored in the `<release>-credentials` Secret; they cannot be set from values — read a user's password from that Secret. A `password` left over in values from before the field was removed is ignored by the render and draws an admission warning, but it is not inert on an upgraded release: the chart preserves whatever password is already in the Secret, which on the first upgrade is the value that was set before removal, so that value stays the live credential until it is rotated (dedicated rotation is tracked in cozystack/community#72). The live password lives only in the Secret.
 users: {}
 ## Example:
 ## users:
-##   user1:
-##     password: strongpassword
-##   user2:
-##     password: hackme
-##   airflow:
-##     password: qwerty123
+##   user1: {}
+##   user2: {}
+##   airflow: {}
 ##   debezium:
 ##     replication: true
+##   migrator:
+##     createRole: true
+##     bypassRls: true
 
 ##
 ## @section Databases configuration
@@ -194,50 +309,51 @@ databases: {}
 ## @section Backup parameters
 ##
 
-## @typedef {struct} S3CredentialsSecret - Reference to a pre-existing Secret with S3 credentials. Setting `name` makes the chart bind the cnpg.io Cluster's barmanObjectStore directly to that Secret instead of materialising `<release>-s3-creds` from `s3AccessKey`/`s3SecretKey`. Use this to keep credentials out of the Postgres CR's `.spec`.
+## @typedef {struct} S3CredentialsSecret - Reference to a pre-existing Secret with S3 credentials. Setting `name` makes the chart bind the barman-cloud ObjectStore's `spec.configuration.s3Credentials` directly to that Secret instead of materialising `<release>-s3-creds` from `s3AccessKey`/`s3SecretKey`. Use this to keep credentials out of the Postgres CR's `.spec`.
 ## @field {string} [name] - Name of the Secret in the application namespace. Empty means the chart materialises `<release>-s3-creds` from `s3AccessKey`/`s3SecretKey`.
 ## @field {string} [accessKeyIDKey] - Key in the Secret holding the access key ID. Defaults to `AWS_ACCESS_KEY_ID`.
 ## @field {string} [secretAccessKeyKey] - Key in the Secret holding the secret access key. Defaults to `AWS_SECRET_ACCESS_KEY`.
 
-## @typedef {struct} EndpointCA - Reference to a Secret holding a PEM-encoded CA bundle the Barman client should trust when reaching a self-signed S3 endpoint. Required when the cluster's S3 (e.g. cozystack's seaweedfs-s3) presents a certificate not signed by a publicly-trusted CA. Used by both spec.backup.barmanObjectStore.endpointCA and the bootstrap-time externalClusters[].barmanObjectStore.endpointCA so backup *and* recovery can verify TLS.
-## @field {string} [name] - Name of the Secret in the application namespace. Empty means no endpointCA is emitted (Barman uses the system trust store).
+## @typedef {struct} EndpointCA - Reference to a Secret holding a PEM-encoded CA bundle the barman-cloud plugin should trust when reaching a self-signed S3 endpoint. Required when the cluster's S3 (e.g. cozystack's seaweedfs-s3) presents a certificate not signed by a publicly-trusted CA. Used by both the backup ObjectStore's spec.configuration.endpointCA and the recovery ObjectStore's spec.configuration.endpointCA (referenced from externalClusters[].plugin) so backup *and* recovery can verify TLS.
+## @field {string} [name] - Name of the Secret in the application namespace. Empty means no endpointCA is emitted (the plugin uses the system trust store).
 ## @field {string} [key] - Key within the Secret containing the CA bundle. Defaults to `ca.crt`.
 
 ## @typedef {struct} Backup - Backup configuration.
 ## @field {bool} enabled - Enable regular backups.
-## @field {bool} [useSystemBucket] - Opt-in: when true, the chart-emitted `<release>-s3-creds` Secret is skipped AND `spec.backup.barmanObjectStore` is left UNSET in the chart-rendered Cluster — the cozy-default BackupClass driver SSA-patches the live Cluster with destinationPath/endpointURL/credentials when the first BackupJob runs. Consequence: `archive_command` is NOT active until that first BackupJob fires; WAL accumulates on the PVC in the meantime, so fire an ad-hoc BackupJob immediately after enabling the flag on existing releases. Use together with the platform `cozy-default` BackupClass — tenants do not need to fill `s3AccessKey`/`s3SecretKey` or `destinationPath`/`endpointURL`. The destination path automatically scopes to `s3://cozy-backups/<namespace>/<release>/`.
-## @field {string} [schedule] - Legacy. Cron schedule (CNPG 6-field format) for the chart-emitted ScheduledBackup. Empty means no chart-managed schedule, which is the recommended setup when a `BackupClass` from `backups.cozystack.io` already drives backup orchestration. In the legacy chart-managed flow `spec.backup.barmanObjectStore` is rendered when `backup.enabled=true` AND `useSystemBucket=false` AND `destinationPath` is non-empty AND inline-or-external creds are supplied; in the platform `useSystemBucket=true` flow the chart skips emitting `barmanObjectStore` and the CNPG driver SSA-patches it onto the live Cluster at first BackupJob time.
+## @field {bool} [useSystemBucket] - Opt-in: when true, the chart-emitted `<release>-s3-creds` Secret is skipped AND `spec.plugins` (plus the barman-cloud ObjectStore) is left UNSET in the chart-rendered Cluster — the cozy-default BackupClass driver SSA-applies an ObjectStore (carrying destinationPath/endpointURL/credentials) and patches `spec.plugins` on the live Cluster when the first BackupJob runs. Consequence: plugin WAL archiving is NOT active until that first BackupJob fires; WAL accumulates on the PVC in the meantime, so fire an ad-hoc BackupJob immediately after enabling the flag on existing releases. Use together with the platform `cozy-default` BackupClass — tenants do not need to fill `s3AccessKey`/`s3SecretKey` or `destinationPath`/`endpointURL`. The destination path automatically scopes to `s3://cozy-backups/<namespace>/<release>/`.
+## @field {string} [schedule] - Legacy. Cron schedule (CNPG 6-field format) for the chart-emitted ScheduledBackup. Empty means no chart-managed schedule, which is the recommended setup when a `BackupClass` from `backups.cozystack.io` already drives backup orchestration. In the legacy chart-managed flow `spec.plugins` plus the barman-cloud ObjectStore is rendered when `backup.enabled=true` AND `useSystemBucket=false` AND `destinationPath` is non-empty AND inline-or-external creds are supplied; in the platform `useSystemBucket=true` flow the chart skips emitting `spec.plugins` and the CNPG driver SSA-applies the ObjectStore and patches `spec.plugins` onto the live Cluster at first BackupJob time.
 ## @field {string} [retentionPolicy] - Retention policy (e.g. "30d").
 ## @field {string} [destinationPath] - DEPRECATED. Per-tenant S3 configuration is superseded by the platform-managed `cozy-default` BackupClass and the `cozy-backups` system bucket. Leave empty for new installations; the BackupClass driver picks up the system-managed coordinates. Kept for in-place upgrade compatibility.
 ## @field {string} [endpointURL] - DEPRECATED. See `destinationPath`.
 ## @field {string} [s3AccessKey] - DEPRECATED. Tenants no longer supply S3 keys; the system Bucket Secret is projected into the tenant namespace by the backup controller. Ignored when `s3CredentialsSecret.name` is set or `useSystemBucket` is true. The chart skips materialising `<release>-s3-creds` whenever this field is empty so a default install does not leak placeholder credentials into the tenant namespace.
 ## @field {string} [s3SecretKey] - DEPRECATED. See `s3AccessKey`.
 ## @field {S3CredentialsSecret} [s3CredentialsSecret] - DEPRECATED. Pre-existing Secret with S3 credentials. Use the platform-managed `cozy-default` BackupClass instead. When set, the chart references this Secret directly (legacy chart-managed flow). The CNPG backup driver writes this field on restore so credentials never land in the CR `.spec`.
-## @field {EndpointCA} [endpointCA] - DEPRECATED. Pre-existing Secret with the CA bundle Barman should trust when reaching a self-signed S3 endpoint. Used for both backup and bootstrap recovery in the legacy chart-managed flow.
+## @field {EndpointCA} [endpointCA] - DEPRECATED. Pre-existing Secret with the CA bundle the barman-cloud plugin should trust when reaching a self-signed S3 endpoint. Used for both backup and bootstrap recovery in the legacy chart-managed flow.
 
 ## @param {Backup} backup - Backup configuration.
 ##
 ## Note on defaults: destinationPath/endpointURL keep their pre-PR
 ## placeholder values so existing tenants on the legacy chart-managed
-## flow continue to render a barmanObjectStore on upgrade (the
-## placeholder coordinates never produced a working archive_command,
-## but the CR shape stays compatible with what Flux already applied).
+## flow continue to render spec.plugins + a barman-cloud ObjectStore on
+## upgrade (the placeholder coordinates never produced working plugin
+## WAL archiving, but the CR shape stays compatible with what Flux
+## already applied).
 ##
 ## BEHAVIOUR CHANGE on upgrade for tenants with backup.enabled=true and
 ## empty s3AccessKey / s3SecretKey: the pre-PR defaults were the literal
 ## "<your-access-key>" / "<your-secret-key>" placeholders, so the chart
-## still rendered barmanObjectStore (with junk creds, archive_command
-## failing at runtime). After this PR the defaults are empty strings,
+## still wired the plugin (with junk creds, plugin WAL archiving failing
+## at runtime). After this PR the defaults are empty strings,
 ## $hasInlineCreds is false, and the chart NO LONGER renders the backup
-## block at all. Such tenants stop seeing chart-emitted barmanObjectStore
-## on the cnpg.io Cluster. Action: either set real s3AccessKey/s3SecretKey
-## (legacy flow), set useSystemBucket=true (platform flow), or supply
-## s3CredentialsSecret.name (external Secret).
+## block at all. Such tenants stop seeing chart-emitted spec.plugins and
+## the ObjectStore on the cnpg.io Cluster. Action: either set real
+## s3AccessKey/s3SecretKey (legacy flow), set useSystemBucket=true
+## (platform flow), or supply s3CredentialsSecret.name (external Secret).
 ##
 ## New tenants should set useSystemBucket=true and leave the placeholders
-## alone — the chart skips rendering barmanObjectStore entirely in that
-## mode and the CNPG driver SSA-patches it onto the live Cluster at
-## first BackupJob time.
+## alone — the chart skips rendering spec.plugins and the ObjectStore
+## entirely in that mode and the CNPG driver SSA-applies the ObjectStore
+## and patches spec.plugins onto the live Cluster at first BackupJob time.
 backup:
   enabled: false
   useSystemBucket: false
@@ -262,13 +378,17 @@ backup:
 ## @typedef {struct} Bootstrap - Bootstrap configuration for restoring a database cluster from a backup.
 ## @field {bool} enabled - Whether to restore from a backup.
 ## @field {string} [recoveryTime] - Timestamp (RFC3339) for point-in-time recovery; empty means latest.
+## @field {string} [backupID] - Barman ID of the base backup to recover from, passed as `recoveryTarget.backupID`. Empty lets the barman-cloud plugin pick one: the newest backup when `recoveryTime` is empty, otherwise the newest one ending at or before it, on any timeline. The CNPG backup driver sets this on restore.
 ## @field {string} oldName - Previous cluster name before deletion.
-## @field {string} [serverName] - Barman server name (S3 path prefix) used by the original cluster when writing backups. Set this only when the original cluster had an explicit barmanObjectStore.serverName that differed from its Kubernetes resource name.
+## @field {string} [serverName] - Server name (S3 path prefix) used by the original cluster when writing backups; passed to the barman-cloud plugin via `externalClusters[].plugin.parameters.serverName`. Defaults to `bootstrap.oldName`. Set this only when the original cluster wrote backups under an explicit server name that differed from its Kubernetes resource name.
+## @field {string} [newServerName] - WAL-archive server name (S3 path prefix) the RESTORED cluster writes to. Must differ from `serverName` (the recovery source) so a restored cluster archives to a fresh, empty prefix and barman-cloud-check-wal-archive passes while it recovers from the source's prefix. The CNPG backup driver sets this on restore; empty means the cluster archives under its own name.
 
 ## @param {Bootstrap} bootstrap - Bootstrap configuration.
 bootstrap:
   enabled: false
   # example: 2020-11-26 15:22:00.00000+00
   recoveryTime: ""
+  backupID: ""
   oldName: ""
   serverName: ""
+  newServerName: ""
diff --git a/packages/apps/qdrant/README.md b/packages/apps/qdrant/README.md
index 3cb0f9a4ee..84fd84a4a1 100644
--- a/packages/apps/qdrant/README.md
+++ b/packages/apps/qdrant/README.md
@@ -40,7 +40,7 @@ Service deploys Qdrant as a StatefulSet with automatic cluster mode when multipl
 ### resources and resourcesPreset
 
 `resources` sets explicit CPU and memory configurations for each replica.
-When left empty, the preset defined in `resourcesPreset` is applied.
+Every resource it leaves unset is taken from the preset defined in `resourcesPreset`.
 
 ```yaml
 resources:
@@ -51,6 +51,20 @@ resources:
 `resourcesPreset` sets named CPU and memory configurations for each replica.
 This setting is ignored if the corresponding `resources` value is set.
 
-Presets follow a cloud-style `<series>.<size>` naming convention. Five series cover the full CPU-to-memory ratio range (`t1` 1:0.5, `c1` 1:1, `s1` 1:2, `u1` 1:4, `m1` 1:8) and each series ships eight sizes (`nano` through `4xlarge`). The legacy flat names (`nano`, `micro`, `small`, `medium`, `large`, `xlarge`, `2xlarge`) remain accepted as deprecated aliases of their 1:1 instance-type equivalents.
+Presets follow a cloud-style `<series>.<size>` naming convention. Five series cover the full CPU-to-memory ratio range (`t1` 1:0.5, `c1` 1:1, `s1` 1:2, `u1` 1:4, `m1` 1:8) and each series ships eight sizes (`nano` through `4xlarge`). The legacy flat names (`nano`, `micro`, `small`, `medium`, `large`, `xlarge`, `2xlarge`) remain accepted as deprecated aliases and keep their original sizes, which do not follow one series: `nano` through `small` equal the `t1` sizes of the same name, while `medium` equals `c1.small` rather than `c1.medium`.
 
 See [`docs/operations/resource-presets.md`](../../../docs/operations/resource-presets.md) for the full size matrix and the legacy-to-instance-type mapping.
+
+### tls
+
+With TLS on, the chart issues the server certificate from a self-signed CA it creates per release. The trust anchor for verifying that certificate is published as `qdrant-<name>.tenant-ca`, where `<name>` is the name of the `Qdrant` resource: an object holding `ca.crt` and nothing else, delivered to tenants through the `core.cozystack.io/tenantsecrets` API that the base tenant roles already grant.
+
+```bash
+kubectl --context <ctx> --namespace <tenant> \
+  get tenantsecret qdrant-<name>.tenant-ca \
+  --output jsonpath='{.data.ca\.crt}' | base64 --decode
+```
+
+It is the only object that hands over the CA certificate without also handing over a private key, which is why it exists. The `qdrant-<name>-ca` Secret the chart creates stores the CA **private key** alongside the certificate — read access to it would let the holder issue certificates for anything, so it is never granted to a tenant.
+
+It is reached through `tenantsecrets` rather than by reading the Secret directly, and that is deliberate: `tenantsecrets` surfaces only objects the platform has vouched for (those the application's definition selects), whereas a direct grant on the name would convey whatever happens to occupy that name.
diff --git a/packages/apps/qdrant/templates/certmanager.yaml b/packages/apps/qdrant/templates/certmanager.yaml
index bbc8831c73..5da5894c9f 100644
--- a/packages/apps/qdrant/templates/certmanager.yaml
+++ b/packages/apps/qdrant/templates/certmanager.yaml
@@ -78,6 +78,6 @@ spec:
     - {{ printf "%s-%d.%s-headless.%s.svc.%s" $.Release.Name $i $.Release.Name $.Release.Namespace $clusterDomain | quote }}
     {{- end }}
     {{- if .Values.external }}
-    - {{ .Release.Name }}.{{ .Values._namespace.host }}
+    - {{ .Release.Name }}.{{ include "cozy-lib.ns-host-required" . }}
     {{- end }}
 {{- end }}
diff --git a/packages/apps/qdrant/templates/hooks/cleanup-pvc.yaml b/packages/apps/qdrant/templates/hooks/cleanup-pvc.yaml
new file mode 100644
index 0000000000..bbc9547f91
--- /dev/null
+++ b/packages/apps/qdrant/templates/hooks/cleanup-pvc.yaml
@@ -0,0 +1,170 @@
+---
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: {{ .Release.Name }}-qdrant-cleanup
+  labels:
+    app.kubernetes.io/instance: {{ .Release.Name }}
+  annotations:
+    "helm.sh/hook": post-delete
+    "helm.sh/hook-weight": "10"
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+spec:
+  # One retry — not the Kubernetes default of six, and not zero. Every delete
+  # below is idempotent and carries --ignore-not-found, so a second attempt
+  # re-issues an API call rather than re-running any logic, and one short
+  # backoff is what separates a transient apiserver error from a real one.
+  # That distinction is the whole point here: this hook's failures become
+  # visible for the first time with this change, and a signal that fires on
+  # noise stops being read — including on the day it is right. Six is the far
+  # end of the same mistake: the Job would spend about ten minutes backing off
+  # across seven pods, outlasting the hook timeout, and Helm would report that
+  # timeout instead of the hook's own error. Load-bearing only since the script
+  # gained a non-zero exit; before that the script could not report one.
+  backoffLimit: 1
+  activeDeadlineSeconds: 270
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/instance: {{ .Release.Name }}
+        policy.cozystack.io/allow-to-apiserver: "true"
+    spec:
+      serviceAccountName: {{ .Release.Name }}-qdrant-cleanup
+      restartPolicy: Never
+      terminationGracePeriodSeconds: 10
+      securityContext:
+        runAsNonRoot: true
+        runAsUser: 65534
+        runAsGroup: 65534
+        seccompProfile:
+          type: RuntimeDefault
+      containers:
+        - name: cleanup
+          image: docker.io/clastix/kubectl:v1.32
+          securityContext:
+            allowPrivilegeEscalation: false
+            readOnlyRootFilesystem: true
+            capabilities:
+              drop: ["ALL"]
+          env:
+            - name: HOME
+              value: /tmp
+          resources:
+            requests:
+              cpu: 10m
+              memory: 64Mi
+            limits:
+              cpu: 200m
+              memory: 128Mi
+          command:
+            - /bin/sh
+            - -c
+            - |
+              set -u
+              # A delete that did not happen must reach Helm as a non-zero exit.
+              # Otherwise the hook-succeeded delete policy garbage-collects this
+              # Job and the pod that carried the only account of the failure, and
+              # an uninstall that left storage behind is indistinguishable from
+              # one that had nothing to reclaim. Failures are counted and the
+              # exit code is set at the end rather than with `set -e`, so one
+              # failed delete does not skip the work that follows it. An object
+              # that is already gone is not a failure: every delete below passes
+              # --ignore-not-found, which exits 0 in that case, so re-running
+              # this hook over an already-clean namespace still succeeds.
+              # Cost: on failure the Job and its pods stay in the namespace,
+              # which is the point — they hold the log. Nothing collects them
+              # on its own: before-hook-creation deletes the previous copy only
+              # when this hook runs again, and a post-delete hook runs only on
+              # an uninstall. They stay until a release of this name is
+              # installed and uninstalled again, or until the namespace goes.
+              failures=0
+              fail() {
+                failures=$((failures + 1))
+                echo "ERROR: $*" >&2
+              }
+
+              # StatefulSet-templated data PVCs are named
+              # qdrant-storage-<release>-<ordinal> (volumeClaimTemplate name
+              # "qdrant-storage" + StatefulSet name <release> + pod ordinal).
+              # Select by that deterministic name rather than a label: the
+              # upstream chart stamps volumeClaimTemplates labels, which are
+              # immutable on an existing StatefulSet, so a label-based scheme
+              # cannot be applied to already-deployed instances. Name selection
+              # needs no StatefulSet change and also reclaims PVCs created before
+              # this hook existed. The ordinal is anchored ("-[0-9]+$") so a
+              # release whose name is a prefix of a sibling (e.g. "qdrant-test"
+              # vs "qdrant-test-2") never matches the sibling's PVCs and deletes
+              # its data. See #3059.
+              echo "Deleting orphaned data PVCs for release {{ .Release.Name }}..."
+              # The listing is captured on its own line and the filter applied
+              # to the result. Piping the two together reports grep's status,
+              # under which a failed `kubectl get` yields an empty match and
+              # reads exactly like a namespace that holds no data PVCs.
+              if all_pvcs=$(kubectl get pvc -n {{ .Release.Namespace }} -o name); then
+                pvcs=$(echo "$all_pvcs" \
+                  | grep -E "^persistentvolumeclaim/qdrant-storage-{{ .Release.Name }}-[0-9]+$" || true)
+                if [ -z "$pvcs" ]; then
+                  echo "No data PVCs found for release {{ .Release.Name }}; nothing to delete."
+                else
+                  echo "$pvcs" | xargs kubectl delete -n {{ .Release.Namespace }} --ignore-not-found --wait=true --timeout=120s \
+                    || fail "failed to delete data PVCs of {{ .Release.Name }} in {{ .Release.Namespace }} ($(echo "$pvcs" | tr '\n' ' ')); orphaned PVCs may remain"
+                fi
+              else
+                fail "failed to list PVCs in {{ .Release.Namespace }}; cannot tell whether data PVCs of {{ .Release.Name }} remain"
+              fi
+
+              if [ "$failures" -ne 0 ]; then
+                echo "PVC cleanup FAILED for {{ .Release.Name }}: $failures operation(s) did not complete; see the errors above." >&2
+                exit 1
+              fi
+              echo "PVC cleanup complete."
+          volumeMounts:
+            - name: tmp
+              mountPath: /tmp
+      volumes:
+        - name: tmp
+          emptyDir: {}
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ .Release.Name }}-qdrant-cleanup
+  labels:
+    app.kubernetes.io/instance: {{ .Release.Name }}
+  annotations:
+    "helm.sh/hook": post-delete
+    helm.sh/hook-weight: "0"
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: {{ .Release.Name }}-qdrant-cleanup
+  labels:
+    app.kubernetes.io/instance: {{ .Release.Name }}
+  annotations:
+    "helm.sh/hook": post-delete
+    "helm.sh/hook-weight": "5"
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+rules:
+  - apiGroups: [""]
+    resources: ["persistentvolumeclaims"]
+    verbs: ["get", "list", "watch", "delete"]
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: {{ .Release.Name }}-qdrant-cleanup
+  labels:
+    app.kubernetes.io/instance: {{ .Release.Name }}
+  annotations:
+    "helm.sh/hook": post-delete
+    helm.sh/hook-weight: "5"
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: {{ .Release.Name }}-qdrant-cleanup
+subjects:
+  - kind: ServiceAccount
+    name: {{ .Release.Name }}-qdrant-cleanup
diff --git a/packages/apps/qdrant/templates/tenant-projection.yaml b/packages/apps/qdrant/templates/tenant-projection.yaml
new file mode 100644
index 0000000000..42955d8f2d
--- /dev/null
+++ b/packages/apps/qdrant/templates/tenant-projection.yaml
@@ -0,0 +1,13 @@
+{{- /* Gated on the same condition as certmanager.yaml: the source Secret only exists when TLS is on. */}}
+{{- if eq (include "qdrant.tls.enabled" .) "true" }}
+---
+apiVersion: internal.cozystack.io/v1alpha1
+kind: TenantProjection
+metadata:
+  name: {{ .Release.Name }}-ca
+spec:
+  projections:
+    - type: CACert
+      sourceSecretName: {{ .Release.Name }}-ca
+      sourceKey: ca.crt
+{{- end }}
diff --git a/packages/apps/qdrant/tests/certmanager_test.yaml b/packages/apps/qdrant/tests/certmanager_test.yaml
index 1639c9f0a8..c7724458ea 100644
--- a/packages/apps/qdrant/tests/certmanager_test.yaml
+++ b/packages/apps/qdrant/tests/certmanager_test.yaml
@@ -107,6 +107,72 @@ tests:
           value: false
         documentIndex: 3
 
+  ###################################################
+  # Key-bearing Secrets stay invisible to tenants   #
+  ###################################################
+
+  # Both Certificates below mint a private key. Neither may carry the labels
+  # the tenant read path selects on; only the controller-authored projection
+  # may.
+  #
+  # That path has two gates and this label is the second one. tenantsecrets
+  # serves Secrets labelled internal.cozystack.io/tenantresource=true, and the
+  # lineage webhook sets that by matching the Secret against the application
+  # definition's spec.secrets selectors, one of which is the tenant-ca label
+  # below. It only gets that far for a Secret whose owner it can resolve:
+  # pkg/lineage walks ownerReferences, then falls back to a
+  # helm.toolkit.fluxcd.io/name label, and returns no owner otherwise, in
+  # which case the webhook stamps nothing at all. A Secret cert-manager writes
+  # has neither while enableCertificateOwnerRef is false, which is how
+  # cert-manager ships here, so the label on its own is inert today.
+  #
+  # It stops being inert under --enable-certificate-owner-ref, which puts an
+  # ownerReference to the Certificate on the Secret, and the Certificate does
+  # carry the Flux label the walk needs. Same if a secretTemplate ever copies
+  # that label across. So the guard is not protecting against today's config;
+  # it is keeping a cluster flag from being what decides whether the CA
+  # private key is tenant-readable.
+  #
+  # Selected by the Secret each Certificate writes rather than by position: a
+  # documentIndex would follow the slot, so reordering this template would let
+  # a labelled key-bearing Certificate slide out from under the assertion and
+  # pass green.
+  - it: the key-bearing CA Secret is never marked tenant-readable
+    release:
+      name: test-qdrant
+      namespace: tenant-test
+    set:
+      tls:
+        enabled: true
+      _cluster:
+        cluster-domain: cozy.local
+    documentSelector:
+      path: spec.secretName
+      value: test-qdrant-ca
+    asserts:
+      - notExists:
+          path: spec.secretTemplate.labels["internal.cozystack.io/tenant-ca"]
+      - notExists:
+          path: spec.secretTemplate.labels["internal.cozystack.io/tenantresource"]
+
+  - it: the key-bearing leaf Secret is never marked tenant-readable
+    release:
+      name: test-qdrant
+      namespace: tenant-test
+    set:
+      tls:
+        enabled: true
+      _cluster:
+        cluster-domain: cozy.local
+    documentSelector:
+      path: spec.secretName
+      value: test-qdrant-tls
+    asserts:
+      - notExists:
+          path: spec.secretTemplate.labels["internal.cozystack.io/tenant-ca"]
+      - notExists:
+          path: spec.secretTemplate.labels["internal.cozystack.io/tenantresource"]
+
   - it: leaf cert has server auth and client auth EKU
     release:
       name: test-qdrant
@@ -466,7 +532,9 @@ tests:
       - notContains:
           path: spec.dnsNames
           content: test-qdrant.example.cozystack.io
-        documentIndex: 3
+        documentSelector:
+          path: metadata.name
+          value: test-qdrant-tls
 
   #######################################################
   # SAN — per-replica short-form hostnames (issue D)    #
@@ -575,7 +643,9 @@ tests:
       - notContains:
           path: spec.dnsNames
           content: "test-qdrant-1.test-qdrant-headless"
-        documentIndex: 3
+        documentSelector:
+          path: metadata.name
+          value: test-qdrant-tls
 
   #######################################################
   # ECDSA P-256 private keys (issue ECDSA)              #
diff --git a/packages/apps/qdrant/tests/cleanup_pvc_test.yaml b/packages/apps/qdrant/tests/cleanup_pvc_test.yaml
new file mode 100644
index 0000000000..4dc5e60038
--- /dev/null
+++ b/packages/apps/qdrant/tests/cleanup_pvc_test.yaml
@@ -0,0 +1,103 @@
+suite: qdrant data PVC cleanup on delete
+
+# Guards the fix for issue #3059: the upstream Qdrant chart does NOT support
+# persistentVolumeClaimRetentionPolicy, so its StatefulSet-templated data PVC
+# (qdrant-storage-<release>-0) is orphaned when the StatefulSet is deleted.
+#
+# A post-delete hook reclaims the data by deleting PVCs whose name matches the
+# deterministic StatefulSet template prefix (qdrant-storage-<release>-). A
+# name-prefix scheme is used instead of a label because volumeClaimTemplates
+# labels are immutable on an existing StatefulSet — routing a release-unique
+# label through the subchart would break reconciliation for already-deployed
+# instances and still would not match their pre-existing PVCs.
+
+release:
+  name: qdrant-test
+  namespace: tenant-test
+
+tests:
+  #####################################################
+  # post-delete cleanup hook                          #
+  #####################################################
+
+  - it: "renders a post-delete Job that deletes the data PVC by anchored name"
+    templates:
+      - templates/hooks/cleanup-pvc.yaml
+    documentSelector:
+      path: kind
+      value: Job
+    asserts:
+      - isKind:
+          of: Job
+      - equal:
+          path: metadata.annotations["helm.sh/hook"]
+          value: post-delete
+      - equal:
+          path: spec.template.spec.serviceAccountName
+          value: qdrant-test-qdrant-cleanup
+      # The script exits non-zero when a delete or a listing failed, so the Job
+      # can now fail. Under the Kubernetes default of 6 it would back off across
+      # seven pods for about ten minutes and outlast the hook timeout, and Helm
+      # would report that timeout instead of the hook's own error.
+      - equal:
+          path: spec.backoffLimit
+          value: 1
+      # Pinned exactly, because the whole point of the non-zero exit is that the
+      # failed Job survives to be read. Adding hook-failed here hands the Job
+      # straight back to Helm to delete on failure, destroying the only account
+      # of what was left behind — and until this assert existed, that one-line
+      # reversal left this chart's whole suite green, because nothing else here
+      # read the annotation.
+      - equal:
+          path: metadata.annotations["helm.sh/hook-delete-policy"]
+          value: before-hook-creation,hook-succeeded
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: "kubectl get pvc -n tenant-test -o name"
+      # The ordinal MUST be anchored ("-[0-9]+$"). Without it, deleting release
+      # "qdrant-test" would also match a sibling "qdrant-test-2"'s PVCs
+      # (qdrant-storage-qdrant-test-2-0) and irreversibly delete its data.
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: 'grep -E "\^persistentvolumeclaim/qdrant-storage-qdrant-test-\[0-9\]\+\$"'
+      # Guard against regressing to the unanchored prefix (plain grep, no $).
+      - notMatchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: 'grep "\^persistentvolumeclaim/qdrant-storage-qdrant-test-"'
+
+  - it: "bounds the cleanup Job so a claim that will not go cannot hang the uninstall"
+    templates:
+      - templates/hooks/cleanup-pvc.yaml
+    documentSelector:
+      path: kind
+      value: Job
+    asserts:
+      - equal:
+          path: spec.activeDeadlineSeconds
+          value: 270
+      - equal:
+          path: spec.template.spec.terminationGracePeriodSeconds
+          value: 10
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: 'xargs kubectl delete -n tenant-test --ignore-not-found --wait=true --timeout=120s'
+      - notMatchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: '--request-timeout='
+
+  - it: "creates qdrant-scoped RBAC for the cleanup hook"
+    templates:
+      - templates/hooks/cleanup-pvc.yaml
+    documentSelector:
+      path: kind
+      value: Role
+    asserts:
+      - equal:
+          path: metadata.name
+          value: qdrant-test-qdrant-cleanup
+      - contains:
+          path: rules
+          content:
+            apiGroups: [""]
+            resources: ["persistentvolumeclaims"]
+            verbs: ["get", "list", "watch", "delete"]
diff --git a/packages/apps/qdrant/tests/dashboard-resourcemap_test.yaml b/packages/apps/qdrant/tests/dashboard-resourcemap_test.yaml
new file mode 100644
index 0000000000..79ef3bbb40
--- /dev/null
+++ b/packages/apps/qdrant/tests/dashboard-resourcemap_test.yaml
@@ -0,0 +1,338 @@
+suite: qdrant dashboard resourcemap tests
+
+# The Role bound here is what a tenant subject can actually read. Two of the
+# Secrets this chart creates must never appear in it: <release>-ca carries the
+# CA private key under tls.key, <release>-tls the server key. Read access to
+# the former is enough to issue certificates for anything.
+#
+# So the rules array is pinned WHOLE rather than checked for known-bad names.
+# A name-by-name check misses a rule that grants secrets with NO resourceNames
+# at all, which is not a narrow grant but an unrestricted one — "an empty set
+# means that everything is allowed" — and so adds no name to notice while
+# granting every Secret in the namespace. Pinning the whole array also makes
+# the template's spelling irrelevant, since the assertion runs on rendered
+# output.
+#
+# Pinning one document is not enough, because a grant need not live in it. A
+# second RBAC object rendered beside it reaches the same subjects, and a
+# selector addressing the Role looks straight past it. So each permutation
+# also pins the document COUNT, catching an added object, and pins the kind in
+# every slot, catching a substituted one — a count alone is satisfied by
+# swapping the WorkloadMonitor for a binding onto cluster-admin. The
+# RoleBinding is pinned across the same permutations for the same reason: its
+# roleRef is one conditional away from pointing at cluster-admin.
+#
+# Documents are addressed by kind rather than by index. An index follows the
+# slot, so inserting a document above the Role would quietly move these
+# assertions onto something else and pass green. A second Role, or none, makes
+# the selector error rather than silently pick a first match.
+#
+# What this does NOT reach, and why it is a guard rather than a proof:
+#
+#   - a grant rendered from a DIFFERENT template file, since the suite-level
+#     `templates` key scopes what is rendered;
+#   - a grant behind a `.Capabilities` check this suite does not declare.
+#     helm-unittest populates `.Capabilities`, but its default APIVersions set
+#     is empty, so `.Capabilities.APIVersions.Has "cert-manager.io/v1"` is
+#     false here and true on any cluster running cert-manager;
+#   - a grant comparing a value against a third point not sampled, e.g.
+#     `replicas` greater than two or `resourcesPreset` equal to one specific
+#     preset. The permutations below sample each value at the points that
+#     change behaviour — for `tls.enabled`, a tri-state, that means all three
+#     — which settles presence and boolean gates and nothing more.
+
+templates:
+  - templates/dashboard-resourcemap.yaml
+
+release:
+  name: test-qdrant
+  namespace: tenant-test
+
+tests:
+  ###################################################
+  # The document set: nothing added, nothing swapped
+  ###################################################
+
+  # The baseline. A grant that renders only while a value is unset shows up
+  # here and in no other permutation.
+  - it: renders three documents with default values
+    asserts: &documentSet
+      - hasDocuments:
+          count: 3
+
+  - it: renders three documents with TLS enabled
+    set: &tlsOn
+      tls:
+        enabled: true
+    asserts: *documentSet
+
+  - it: renders three documents with TLS implied by external access
+    set: &externalOn
+      external: true
+    asserts: *documentSet
+
+  # Every value a tenant can set, plus the two the platform injects, moved off
+  # their defaults at once, so a grant gated on the presence of any single one
+  # renders here.
+  - it: renders three documents with every settable value set
+    set: &allValues
+      replicas: 2
+      resources:
+        cpu: 500m
+        memory: 1Gi
+      resourcesPreset: u1.large
+      size: 20Gi
+      storageClass: replicated
+      external: true
+      tls:
+        enabled: true
+      _namespace:
+        host: example.com
+      _cluster:
+        cluster-domain: cozy.local
+    asserts: *documentSet
+
+  # Chart.yaml carries version 0.0.0, and it stays 0.0.0 on the path that
+  # ships: the installer pushes packages/ verbatim as an OCI artifact, and the
+  # `helm package --version` target that would stamp a real version has no
+  # caller. Sampling a second version costs one test and means a grant gated
+  # on .Chart.Version cannot hide if that ever changes.
+  - it: renders three documents with a different chart version
+    chart: &packagedChart
+      version: 1.2.3
+    asserts: *documentSet
+
+  # tls.enabled is tri-state: unset means "follow external", so an explicit
+  # false is a distinct state from leaving it out, and a grant gated on it
+  # renders in neither case above.
+  - it: renders three documents with TLS explicitly disabled
+    set: &tlsOff
+      tls:
+        enabled: false
+    asserts: *documentSet
+
+  - it: renders three documents with TLS explicitly disabled despite external access
+    set: &externalTlsOff
+      external: true
+      tls:
+        enabled: false
+    asserts: *documentSet
+
+  # helm-controller upgrades whenever the release is not up to date, so any
+  # values or chart change puts a release on the upgrade path. A grant behind
+  # .Release.IsUpgrade is live on essentially every release while rendering
+  # false in every case above.
+  - it: renders three documents on upgrade
+    release: &upgraded
+      name: test-qdrant
+      namespace: tenant-test
+      upgrade: true
+    asserts: *documentSet
+
+  # The WorkloadMonitor itself. Without this the count above is satisfied by
+  # any replacement, including one binding the tenant to cluster-admin.
+  - it: keeps the WorkloadMonitor as the third document with default values
+    documentSelector: &workloadMonitor
+      path: kind
+      value: WorkloadMonitor
+    asserts: &workloadMonitorPinned
+      - equal:
+          path: metadata.name
+          value: test-qdrant
+
+  - it: keeps the WorkloadMonitor with TLS enabled
+    set: *tlsOn
+    documentSelector: *workloadMonitor
+    asserts: *workloadMonitorPinned
+
+  - it: keeps the WorkloadMonitor with TLS implied by external access
+    set: *externalOn
+    documentSelector: *workloadMonitor
+    asserts: *workloadMonitorPinned
+
+  - it: keeps the WorkloadMonitor with every settable value set
+    set: *allValues
+    documentSelector: *workloadMonitor
+    asserts: *workloadMonitorPinned
+
+  - it: keeps the WorkloadMonitor with a different chart version
+    chart: *packagedChart
+    documentSelector: *workloadMonitor
+    asserts: *workloadMonitorPinned
+
+  - it: keeps the WorkloadMonitor with TLS explicitly disabled
+    set: *tlsOff
+    documentSelector: *workloadMonitor
+    asserts: *workloadMonitorPinned
+
+  - it: keeps the WorkloadMonitor with TLS explicitly disabled despite external access
+    set: *externalTlsOff
+    documentSelector: *workloadMonitor
+    asserts: *workloadMonitorPinned
+
+  - it: keeps the WorkloadMonitor on upgrade
+    release: *upgraded
+    documentSelector: *workloadMonitor
+    asserts: *workloadMonitorPinned
+
+  ###################################################
+  # The grant itself
+  ###################################################
+
+  - it: names the dashboard Role after the release
+    documentSelector: &role
+      path: kind
+      value: Role
+    asserts:
+      - equal:
+          path: apiVersion
+          value: rbac.authorization.k8s.io/v1
+      - equal:
+          path: metadata.name
+          value: test-qdrant-dashboard-resources
+
+  # Default values leave tls.enabled unset and external false, which the
+  # chart's helper resolves to TLS off, so the CA Secret does not exist here.
+  # Pinned to catch a grant that renders only while a value is unset.
+  - it: grants no Secret beyond the API key with default values
+    documentSelector: *role
+    asserts: &pinnedRules
+      - equal:
+          path: rules
+          value:
+            - apiGroups: [""]
+              resources: [services]
+              resourceNames: [test-qdrant, test-qdrant-headless]
+              verbs: [get, list, watch]
+            - apiGroups: [""]
+              resources: [secrets]
+              resourceNames: [test-qdrant-apikey]
+              verbs: [get, list, watch]
+            - apiGroups: [cozystack.io]
+              resources: [workloadmonitors]
+              resourceNames: [test-qdrant]
+              verbs: [get, list, watch]
+
+  # The case that matters. With TLS on the chart mints <release>-ca and
+  # <release>-tls, so this is the permutation where a leaked grant has
+  # something to leak. A grant added inside the same `if` that creates the CA
+  # renders only here, and would sail past a check that runs on defaults.
+  - it: grants no Secret beyond the API key with TLS enabled
+    set: *tlsOn
+    documentSelector: *role
+    asserts: *pinnedRules
+
+  # TLS is also reachable by implication: leaving tls.enabled unset makes it
+  # follow external. Pinned separately because a grant gated on `external`
+  # rather than on the TLS helper renders in neither case above.
+  - it: grants no Secret beyond the API key with TLS implied by external access
+    set: *externalOn
+    documentSelector: *role
+    asserts: *pinnedRules
+
+  - it: grants no Secret beyond the API key with every settable value set
+    set: *allValues
+    documentSelector: *role
+    asserts: *pinnedRules
+
+  - it: grants no Secret beyond the API key with a different chart version
+    chart: *packagedChart
+    documentSelector: *role
+    asserts: *pinnedRules
+
+  - it: grants no Secret beyond the API key with TLS explicitly disabled
+    set: *tlsOff
+    documentSelector: *role
+    asserts: *pinnedRules
+
+  - it: grants no Secret beyond the API key with TLS explicitly disabled despite external access
+    set: *externalTlsOff
+    documentSelector: *role
+    asserts: *pinnedRules
+
+  - it: grants no Secret beyond the API key on upgrade
+    release: *upgraded
+    documentSelector: *role
+    asserts: *pinnedRules
+
+  ###################################################
+  # The binding: who the Role is handed to
+  ###################################################
+
+  # Pinning the Role's rules is worth nothing if the binding points somewhere
+  # else, so roleRef and the subject list are pinned across the same
+  # permutations. A conditional swapping roleRef for cluster-admin renders in
+  # exactly the case a default-values check would miss.
+  - it: binds the tenant subjects to the dashboard Role with default values
+    documentSelector: &roleBinding
+      path: kind
+      value: RoleBinding
+    asserts: &roleBindingPinned
+      - equal:
+          path: roleRef
+          value:
+            kind: Role
+            name: test-qdrant-dashboard-resources
+            apiGroup: rbac.authorization.k8s.io
+      - equal:
+          path: subjects
+          value:
+            - kind: ServiceAccount
+              name: tenant-test
+              namespace: tenant-test
+            - kind: Group
+              name: tenant-test-admin
+              apiGroup: rbac.authorization.k8s.io
+            - kind: Group
+              name: tenant-test-super-admin
+              apiGroup: rbac.authorization.k8s.io
+            - kind: Group
+              name: tenant-test-use
+              apiGroup: rbac.authorization.k8s.io
+            - kind: ServiceAccount
+              name: tenant-root
+              namespace: tenant-root
+            - kind: Group
+              name: tenant-root-admin
+              apiGroup: rbac.authorization.k8s.io
+            - kind: Group
+              name: tenant-root-super-admin
+              apiGroup: rbac.authorization.k8s.io
+            - kind: Group
+              name: tenant-root-use
+              apiGroup: rbac.authorization.k8s.io
+
+  - it: binds the tenant subjects to the dashboard Role with TLS enabled
+    set: *tlsOn
+    documentSelector: *roleBinding
+    asserts: *roleBindingPinned
+
+  - it: binds the tenant subjects to the dashboard Role with TLS implied by external access
+    set: *externalOn
+    documentSelector: *roleBinding
+    asserts: *roleBindingPinned
+
+  - it: binds the tenant subjects to the dashboard Role with every settable value set
+    set: *allValues
+    documentSelector: *roleBinding
+    asserts: *roleBindingPinned
+
+  - it: binds the tenant subjects to the dashboard Role with a different chart version
+    chart: *packagedChart
+    documentSelector: *roleBinding
+    asserts: *roleBindingPinned
+
+  - it: binds the tenant subjects to the dashboard Role with TLS explicitly disabled
+    set: *tlsOff
+    documentSelector: *roleBinding
+    asserts: *roleBindingPinned
+
+  - it: binds the tenant subjects to the dashboard Role with TLS explicitly disabled despite external access
+    set: *externalTlsOff
+    documentSelector: *roleBinding
+    asserts: *roleBindingPinned
+
+  - it: binds the tenant subjects to the dashboard Role on upgrade
+    release: *upgraded
+    documentSelector: *roleBinding
+    asserts: *roleBindingPinned
diff --git a/packages/apps/qdrant/tests/host_guard_test.yaml b/packages/apps/qdrant/tests/host_guard_test.yaml
new file mode 100644
index 0000000000..267c83f2cd
--- /dev/null
+++ b/packages/apps/qdrant/tests/host_guard_test.yaml
@@ -0,0 +1,46 @@
+suite: qdrant external cert fails on an empty apex, but only when external
+
+templates:
+  - templates/certmanager.yaml
+
+# The external SAN test-qdrant.<_namespace.host> is emitted only under
+# `if .Values.external`. cozy-lib.ns-host-required guards that one line, so an
+# empty apex fails the render when external is on, and is a non-issue when it is
+# off (a tenant with no apex and no external exposure must still render).
+
+tests:
+  - it: fails when external is true and the apex is empty
+    release:
+      name: test-qdrant
+      namespace: tenant-test
+    set:
+      tls:
+        enabled: true
+      external: true
+      _namespace:
+        host: ""
+      _cluster:
+        cluster-domain: cozy.local
+    asserts:
+      - failedTemplate:
+          errorMessage: "the tenant apex (_namespace.host) is empty and this app sets no host override, so its ingress hostname would be malformed. Set tenant.spec.host on this tenant, inherit it from a parent that has host set, or set this app's host value."
+
+  - it: still renders when external is false even though the apex is empty
+    release:
+      name: test-qdrant
+      namespace: tenant-test
+    set:
+      tls:
+        enabled: true
+      external: false
+      _namespace:
+        host: ""
+      _cluster:
+        cluster-domain: cozy.local
+    asserts:
+      - hasDocuments:
+          count: 4
+      - notContains:
+          path: spec.dnsNames
+          content: test-qdrant.
+        documentIndex: 3
diff --git a/packages/apps/qdrant/tests/tenant_projection_test.yaml b/packages/apps/qdrant/tests/tenant_projection_test.yaml
new file mode 100644
index 0000000000..5c2247ec77
--- /dev/null
+++ b/packages/apps/qdrant/tests/tenant_projection_test.yaml
@@ -0,0 +1,118 @@
+suite: qdrant TenantProjection sentinel
+
+# The chart renders one TenantProjection per TLS-enabled release: the
+# declaration that tells the CA-extraction controller to lift ca.crt out of the
+# key-bearing <release>-ca into the tenant-readable <release>.tenant-ca
+# projection.
+#
+# The load-bearing invariant is the ABSENCE of ownerReferences. The sentinel must
+# carry none — it owns the projection, and it is itself owned only through the
+# helm.toolkit.fluxcd.io/name label Flux stamps, which is how the lineage webhook
+# resolves the application. An ownerReference here would short-circuit that walk
+# and silently break the tenant's read path (pkg/lineage/lineage.go).
+
+release:
+  name: test-qdrant
+  namespace: tenant-test
+
+templates:
+  - templates/tenant-projection.yaml
+
+tests:
+  - it: renders exactly one TenantProjection named after the release
+    set:
+      tls:
+        enabled: true
+    asserts:
+      - hasDocuments:
+          count: 1
+      - isKind:
+          of: TenantProjection
+      - equal:
+          path: apiVersion
+          value: internal.cozystack.io/v1alpha1
+      - equal:
+          path: metadata.name
+          value: test-qdrant-ca
+
+  - it: declares a CACert projection of the chart's CA
+    set:
+      tls:
+        enabled: true
+    asserts:
+      - equal:
+          path: spec.projections[0].type
+          value: CACert
+      - equal:
+          path: spec.projections[0].sourceSecretName
+          value: test-qdrant-ca
+      - equal:
+          path: spec.projections[0].sourceKey
+          value: ca.crt
+
+  # The one genuine invariant. pkg/lineage/lineage.go returns early once a
+  # ownerReferences is present, so the helm-label fallback that resolves the
+  # application is never reached: the projection never gets tenantresource=true
+  # and the tenant silently loses the anchor. Adding one breaks the read path
+  # with no error anywhere.
+  - it: carries no ownerReferences
+    set:
+      tls:
+        enabled: true
+    asserts:
+      - notExists:
+          path: metadata.ownerReferences
+
+  # Not invariants — conformance to the shared sentinel shape. Setting either
+  # would be functionally harmless here (the release namespace is where Helm
+  # puts it either way, and Flux stamps its own label at apply time), but every
+  # engine's sentinel is meant to be the same eight lines, so a local
+  # embellishment is a divergence to catch at review rather than in six copies.
+  - it: matches the shared sentinel shape
+    set:
+      tls:
+        enabled: true
+    asserts:
+      - notExists:
+          path: metadata.namespace
+      - notExists:
+          path: metadata.labels
+
+  # Unlike CNPG, qdrant's CA exists only while TLS is on. An ungated sentinel
+  # would sit Ready=False/SourceNotFound forever on every plaintext release.
+  #
+  # The gate must track the chart's effective TLS state, not the raw
+  # tls.enabled value: leaving it unset means "follow external". A naive
+  # `if .Values.tls.enabled` still passes the two explicit cases below while
+  # silently publishing no anchor to exactly the releases most likely to need
+  # one, so both implied legs are pinned too.
+  - it: renders the sentinel when TLS is implied by external access
+    set:
+      external: true
+    asserts:
+      - hasDocuments:
+          count: 1
+
+  - it: renders nothing when TLS is implied off by external being false
+    set:
+      external: false
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  - it: renders nothing when TLS is explicitly disabled despite external access
+    set:
+      external: true
+      tls:
+        enabled: false
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  - it: renders nothing when TLS is disabled
+    set:
+      tls:
+        enabled: false
+    asserts:
+      - hasDocuments:
+          count: 0
diff --git a/packages/apps/qdrant/values.schema.json b/packages/apps/qdrant/values.schema.json
index d6c34a977c..13e4d00c82 100644
--- a/packages/apps/qdrant/values.schema.json
+++ b/packages/apps/qdrant/values.schema.json
@@ -117,7 +117,10 @@
           "rule": "self == oldSelf",
           "message": "storageClass is immutable"
         }
-      ]
+      ],
+      "x-cozystack-options": {
+        "source": "storageclass"
+      }
     },
     "external": {
       "description": "Enable external access from outside the cluster.",
diff --git a/packages/apps/qdrant/values.yaml b/packages/apps/qdrant/values.yaml
index 99de5e1999..d284120e4e 100644
--- a/packages/apps/qdrant/values.yaml
+++ b/packages/apps/qdrant/values.yaml
@@ -69,6 +69,7 @@ size: 10Gi
 
 ## @param {string} storageClass - StorageClass used to store the data.
 ## @immutable
+## @x-cozystack-options {source: storageclass}
 storageClass: ""
 
 ## @param {bool} external - Enable external access from outside the cluster.
diff --git a/packages/apps/rabbitmq/Makefile b/packages/apps/rabbitmq/Makefile
index 9b045b6616..9cd5238763 100644
--- a/packages/apps/rabbitmq/Makefile
+++ b/packages/apps/rabbitmq/Makefile
@@ -7,3 +7,6 @@ generate:
 update:
 	hack/update-versions.sh
 	make generate
+
+test:
+	helm unittest .
diff --git a/packages/apps/rabbitmq/README.md b/packages/apps/rabbitmq/README.md
index 463a27cfd5..9d0cbb0ada 100644
--- a/packages/apps/rabbitmq/README.md
+++ b/packages/apps/rabbitmq/README.md
@@ -11,21 +11,30 @@ The service utilizes official RabbitMQ operator. This ensures the reliability an
 
 > `storageClass` is annotated as immutable in the chart schema — see [`docs/storage-immutability.md`](../../../docs/storage-immutability.md) for the contract and which consumers enforce it.
 
+## Backups
+
+RabbitMQ is bound out-of-the-box by the platform `cozy-default` BackupClass, so a `Plan` or an ad-hoc `BackupJob` referencing `cozy-default` backs the instance up with no per-release wiring — see [Backup Classes](../../../docs/operations/backup-classes.md).
+
+The scope is **definitions only** — vhosts, users, permissions, queues, exchanges, bindings, policies and parameters, exported through the management API. **Message payloads are not included**, and there is no point-in-time recovery; back up the messages on disk with a Velero volume snapshot instead if you need them. Restore is a **merge**, not a reset: importing definitions creates or updates what the backup contains and never deletes, so anything created after the backup survives a restore, and a to-copy restore into a separate instance imports the source's users (with their password hashes) into the target.
+
 ## Parameters
 
 ### Common parameters
 
-| Name               | Description                                                                                                                        | Type       | Value     |
-| ------------------ | ---------------------------------------------------------------------------------------------------------------------------------- | ---------- | --------- |
-| `replicas`         | Number of RabbitMQ replicas.                                                                                                       | `int`      | `3`       |
-| `resources`        | Explicit CPU and memory configuration for each RabbitMQ replica. When omitted, the preset defined in `resourcesPreset` is applied. | `object`   | `{}`      |
-| `resources.cpu`    | CPU available to each replica.                                                                                                     | `quantity` | `""`      |
-| `resources.memory` | Memory (RAM) available to each replica.                                                                                            | `quantity` | `""`      |
-| `resourcesPreset`  | Default sizing preset used when `resources` is omitted.                                                                            | `string`   | `t1.nano` |
-| `size`             | Persistent Volume Claim size available for application data.                                                                       | `quantity` | `10Gi`    |
-| `storageClass`     | StorageClass used to store the data.                                                                                               | `string`   | `""`      |
-| `external`         | Enable external access from outside the cluster.                                                                                   | `bool`     | `false`   |
-| `version`          | RabbitMQ major.minor version to deploy                                                                                             | `string`   | `v4.2`    |
+| Name                         | Description                                                                                                                                                                                                                                                                                                                                               | Type       | Value     |
+| ---------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------- | --------- |
+| `replicas`                   | Number of RabbitMQ replicas.                                                                                                                                                                                                                                                                                                                              | `int`      | `3`       |
+| `resources`                  | Explicit CPU and memory configuration for each RabbitMQ replica. Every resource left unset here is taken from `resourcesPreset`.                                                                                                                                                                                                                          | `object`   | `{}`      |
+| `resources.cpu`              | CPU available to each replica.                                                                                                                                                                                                                                                                                                                            | `quantity` | `""`      |
+| `resources.memory`           | Memory (RAM) available to each replica.                                                                                                                                                                                                                                                                                                                   | `quantity` | `""`      |
+| `resourcesPreset`            | Default sizing preset. It supplies every resource `resources` does not set, not only a `resources` left empty entirely.                                                                                                                                                                                                                                   | `string`   | `s1.nano` |
+| `size`                       | Persistent Volume Claim size available for application data.                                                                                                                                                                                                                                                                                              | `quantity` | `10Gi`    |
+| `storageClass`               | StorageClass used to store the data.                                                                                                                                                                                                                                                                                                                      | `string`   | `""`      |
+| `external`                   | Enable external access from outside the cluster.                                                                                                                                                                                                                                                                                                          | `bool`     | `false`   |
+| `tls`                        | TLS configuration. TLS is off unless `tls.enabled` is set to true.                                                                                                                                                                                                                                                                                        | `object`   | `{}`      |
+| `tls.enabled`                | Enable TLS for AMQPS (5671) and Management HTTPS (15671). Applies whether or not `external` is set. Plaintext AMQP (5672) and management (15672) keep serving unless `disableNonTLSListeners` is set as well. Moves the `port` key of the `<release>-default-user` Secret from 5672 to 5671, and the metrics port from 15692 to 15691. Defaults to false. | `bool`     | `false`   |
+| `tls.disableNonTLSListeners` | Close the plaintext AMQP (5672) and management (15672) listeners. This is a broker-level switch: it drops in-cluster clients as well as external ones, and it cannot be combined with `users` or `vhosts`. Erlang distribution (25672) and epmd (4369) stay plaintext regardless. Defaults to false.                                                      | `bool`     | `false`   |
+| `version`                    | RabbitMQ major.minor version to deploy                                                                                                                                                                                                                                                                                                                    | `string`   | `v4.2`    |
 
 
 ### Application-specific parameters
@@ -40,12 +49,86 @@ The service utilizes official RabbitMQ operator. This ensures the reliability an
 | `vhosts[name].roles.readonly` | List of readonly users.          | `[]string`          | `[]`  |
 
 
+## TLS scope
+
+This chart can add TLS listeners for AMQP (port 5671) and the management HTTPS interface (port 15671) using cert-manager. Enabling it adds encrypted endpoints without closing the unencrypted ones — but it does change which endpoint clients are pointed at, and `tls.disableNonTLSListeners` can close the plaintext ones outright. Both are covered below.
+
+**TLS is off unless you ask for it.** `tls.enabled` defaults to `false` and nothing else turns it on — in particular `external` does not. Publishing a broker outside the cluster and encrypting it are separate decisions, so an existing instance keeps its listeners and its published connection details across an upgrade of this chart, and every consequence listed below follows an explicit edit rather than arriving on its own.
+
+**Enabling TLS does not close plaintext, inside or outside the cluster.** AMQP on 5672 and management on 15672 keep listening whenever TLS is on, and when `external` is `true` they are published on the public LoadBalancer alongside the TLS ports. Enabling TLS adds encrypted endpoints; using them is the client's choice rather than something the endpoint enforces. Treat an `external: true` RabbitMQ as reachable in plaintext from outside the cluster — with TLS on or off — and restrict it at the network layer if that is not acceptable.
+
+**Plaintext cannot be closed on the public side alone.** There is no operator-supported way to drop a port from the published Service by itself: `spec.override.service.spec.ports` is applied as a strategic merge patch keyed on `port`, so it can add or mutate entries but never remove them, and the operator regenerates its default port set on every reconcile. The only switch this chart exposes is `tls.disableNonTLSListeners`, described below, and it closes plaintext everywhere at once rather than only on the public side — in-cluster clients included.
+
+A narrower variant, closing AMQP at the broker while leaving the operator's own management path on plaintext so that chart-managed `users` and `vhosts` keep working, looks reachable through `spec.rabbitmq.additionalConfig`. It is not. The operator pins the readiness probe to the `amqp` port unless `spec.tls.disableNonTLSListeners` is set, so writing `listeners.tcp = none` through `additionalConfig` alone leaves every pod failing readiness for good. The flag is the only supported way to close the plaintext listeners, and it closes all of them at once.
+
+**Setting `tls.enabled: true` on a running instance changes three things.** Plan for them before flipping it.
+
+The broker pods roll once, because the operator mounts the new TLS Secret into the pod template and that is a StatefulSet template change. The instance gains a dependency on cert-manager, since the operator will not finish reconciling until the Secret has been issued.
+
+And **the published metrics port changes**. The operator exposes *either* `prometheus` (15692) *or* `prometheus-tls` (15691) on its Service, never both — deliberately, so that a scrape config selecting every port does not count each node twice — and that choice keys off TLS alone. Enabling TLS therefore withdraws 15692 from the Service and publishes 15691 in its place. The broker itself keeps listening on 15692, but a `ServiceMonitor` or `VMServiceScrape` selecting the port by the name `prometheus` stops matching. Retarget it to `prometheus-tls`, which is HTTPS under the release CA and so needs a `tlsConfig` carrying the trust anchor described below. The chart does not paper over this by re-adding 15692 through `spec.override.service`: the operator drops any port name it does not own on each reconcile and the override would reinstate it without a NodePort, which on a LoadBalancer means a fresh allocation and another reconcile every round.
+
+And **the connection details handed to clients change**. `<release>-default-user` is the Service Binding object this chart grants to the tenant, and the operator rewrites its `port` key from `5672` to `5671` as soon as `spec.tls.secretName` is set — gated on TLS alone, not on whether the plaintext listener is still open. A client that hardcodes `:5672` keeps working, because that listener does stay open. A client that resolves its endpoint from the binding — the documented way to consume it — follows the change to 5671 and must speak TLS from then on, and it cannot verify the certificate until the trust anchor below is obtainable. Per-plugin port keys (`mqtt-port`, `stomp-port`, `stream-port` and the web variants) move to their TLS values the same way. This is the main reason `tls.enabled` is opt-in rather than something `external` implies: it moves clients that read the binding correctly, and it moves them the instant the flag is set, before any of them has had a chance to pick up the trust anchor.
+
+**The plaintext management listener is load-bearing.** `messaging-topology-operator` is what reconciles the `User`, `Vhost` and `Permission` objects this chart creates from `users` and `vhosts`, and it talks to the broker over the management API. Once TLS is on it would switch to HTTPS on 15671 and verify the broker against the operator process's system certificate pool, which cannot contain a per-release self-signed CA — so every user and permission would fail to reconcile with `certificate signed by unknown authority`. The chart therefore annotates the cluster with `rabbitmq.com/operator-connection-uri` pointing at plaintext `http://…:15672`, keeping that operator on the in-cluster plaintext port. This affects only the operator's own management connection, never broker traffic, and it is why `tls.disableNonTLSListeners` cannot be combined with `users` or `vhosts`.
+
+**Erlang distribution and epmd stay plaintext no matter what you set.** Inter-node distribution (25672) and epmd (4369) are carried on the headless Service, which `disableNonTLSListeners` never touches — the flag does not apply to them. So `tls.disableNonTLSListeners: true` does not mean "TLS everywhere": it means every *client-facing* listener is TLS-only while inter-node traffic stays in the clear. No TLS field on the cluster reaches them: `spec.tls.caSecretName`, the only one left, turns on client-certificate verification for the client-facing listeners and says nothing about distribution.
+
+### Closing the plaintext listeners
+
+`tls.disableNonTLSListeners` is opt-in and defaults to `false`, so an upgrade never closes a listener a client is already using. Setting it to `true` writes `listeners.tcp = none` into `rabbitmq.conf`, a broker-level directive: the socket is not opened on any interface, so **in-cluster clients lose plaintext at the same instant external ones do**. There is no setting that closes it externally while keeping it internally. Move every client to 5671 and 15671 first, then set the flag.
+
+Two consequences to know before enabling it:
+
+- **It puts the whole cluster out of reach of `messaging-topology-operator`, and the chart refuses to render if `users` or `vhosts` are set.** That operator reconciles those objects over the management API, and the flag forces its connection onto TLS, computed as `TLSEnabled() && (!connectUsingHTTP || DisableNonTLSListeners())`. The `rabbitmq.com/operator-connection-uri` annotation is the one setting that short-circuits that calculation before it is reached, and it is no escape here, because the port it names is the port the flag closes — which is why the chart withdraws it as the flag goes on. The operator then verifies the broker against its own process's system trust pool, which cannot contain a per-release CA, so every object it owns stops reconciling. Note the scope twice over. That calculation reads the `RabbitmqCluster` object, not the origin of the topology CR, so moving users and vhosts out of `values.yaml` into hand-written objects does **not** work around it — they fail the same way, just without the chart's refusal to warn you. And it is not only the three kinds this chart creates: `Binding`, `Exchange`, `Federation`, `OperatorPolicy`, `Permission`, `Policy`, `Queue`, `SchemaReplication`, `Shovel`, `TopicPermission`, `User` and `Vhost` all run on the one reconciler and share the one deletion path. `SuperStream` is the exception, having its own reconciler and no finalizer, but the `Queue`, `Exchange` and `Binding` objects it owns are on the list. Once this flag is on, manage users and permissions through `rabbitmqctl` or a definitions import instead. The same calculation governs deletion, so a topology object that is left behind does not merely stop reconciling: its `deletion.finalizers.<plural>.rabbitmq.com` finalizer can no longer be removed either, and the object sits in `Terminating` until the flag comes back off or the whole `RabbitmqCluster` goes away.
+- The plaintext metrics port closes with it, leaving only `prometheus-tls` on 15691.
+
+#### Removing the topology objects is its own upgrade
+
+Clearing `users` and `vhosts` and setting `tls.disableNonTLSListeners: true` in a single edit does not work, and the chart refuses to render it. Helm applies every object in the target release before it prunes the ones the release dropped, so the broker would close its plaintext listeners while the topology objects were still waiting to be deleted. Their operator needs the management API to release a finalizer, that API is now reachable only over a certificate it cannot verify, and the delete never completes — leaving the objects in `Terminating`, their users still live in the broker, and `kubectl delete namespace` on the tenant hanging, all while the upgrade reports success.
+
+Do it as two upgrades instead:
+
+1. Remove `users` and `vhosts` from the values, along with any hand-written topology object in the namespace, and let that upgrade finish.
+2. Confirm the namespace is clear: `kubectl get bindings.rabbitmq.com,exchanges.rabbitmq.com,federations.rabbitmq.com,operatorpolicies.rabbitmq.com,permissions.rabbitmq.com,policies.rabbitmq.com,queues.rabbitmq.com,schemareplications.rabbitmq.com,shovels.rabbitmq.com,topicpermissions.rabbitmq.com,users.rabbitmq.com,vhosts.rabbitmq.com --namespace <tenant-namespace>` must return nothing bound to this release. Those are the twelve kinds `messaging-topology-operator` drives through one reconciler, and every one of them carries the same finalizer, so checking only the three the chart creates leaves the other nine to wedge. A tenant namespace can hold several RabbitMQ applications, so read `spec.rabbitmqClusterReference.name` on whatever comes back: an object naming a sibling release is reached through that broker, whose listeners this flag does not touch, and the chart's own check ignores it too. Objects in `Terminating` still count — a finalizer that has not come off yet means the operator has not finished with the broker.
+3. Set `tls.disableNonTLSListeners: true`.
+
+A release already wedged this way recovers without data loss: unset `tls.disableNonTLSListeners`, wait for the finalizers to clear once the operator can reach the broker again, and then start over from step 1.
+
+## Verifying the server certificate
+
+The certificates are issued by a per-release self-signed CA, so a client must be given that CA to verify the endpoint. The trust anchor is published as `<release>.tenant-ca`: an object holding `ca.crt` and nothing else, delivered through the `core.cozystack.io/tenantsecrets` API that the base tenant roles already grant.
+
+Throughout this section `<release>` means the Helm release name, which is the application name prefixed with `rabbitmq-`. A RabbitMQ named `orders` is release `rabbitmq-orders`, so its trust anchor is `rabbitmq-orders.tenant-ca` and its certificate Secrets are `rabbitmq-orders-tls` and `rabbitmq-orders-ca`.
+
+```bash
+kubectl get tenantsecret rabbitmq-<name>.tenant-ca --namespace <tenant-namespace> \
+  -o jsonpath='{.data.ca\.crt}' | base64 -d > ca.crt
+```
+
+For an external endpoint, note what the certificate does and does not cover. When the platform supplies a root host the certificate carries `rabbitmq-<name>.<host>` as a SAN, but this chart creates no DNS record for that name — `external: true` renders a bare LoadBalancer Service, with no Ingress and no `external-dns` annotation. Verifying by hostname therefore requires pointing that name at the LoadBalancer address yourself. A client connecting straight to the IP will fail hostname verification against the SAN list, since it contains in-cluster names and the unresolved external name only.
+
+`<release>.tenant-ca` is the only object that hands over the CA certificate without also handing over a private key, which is why it exists. The cert-manager Secrets are deliberately not granted to tenants: `<release>-ca` stores the CA **private key**, so read access would let the holder issue certificates for anything, and the leaf `<release>-tls` stores the server private key next to the same `ca.crt`. RBAC has no key-level filter, so granting either to deliver a trust anchor would deliver a key with it.
+
+Verification runs one way only. The server presents a certificate that a client can verify with the CA above; the server does not ask for one in return. The operator's switch for that is `spec.tls.caSecretName`, which this chart leaves unset. Setting it writes `ssl_options.cacertfile` and `ssl_options.verify = verify_peer` for AMQP, plus a `cacertfile` for the management and metrics listeners. Note what that does not do: `verify_peer` on its own validates a client certificate when one is offered and still admits a client that offers none, and the operator writes neither `fail_if_no_peer_cert` nor `management.ssl.verify`, so making certificates mandatory needs broker configuration that neither the operator nor this chart supplies. Clients continue to authenticate by username and password — carried inside the TLS session rather than in the clear, but still a password rather than a certificate.
+
+### Turning TLS off again
+
+Disabling TLS on a release that had it needs one manual step. Helm removes the `TenantProjection` sentinel along with the `Certificate` objects, and Kubernetes garbage-collects `rabbitmq-<name>.tenant-ca` with it, so the trust anchor stops being projected as soon as TLS goes off — no stale anchor is left for an endpoint that has gone back to plaintext. What Helm cannot clean up is the raw CA material: cert-manager does not delete the Secrets it produced (`enableCertificateOwnerRef` is off), so `rabbitmq-<name>-ca` and `rabbitmq-<name>-tls` stick around, unused, holding private keys nobody references any more. Delete them by hand after disabling TLS.
+
+Deleting the application leaves the same two Secrets behind. The chart renders the `Certificate` and `Issuer` objects and never the Secrets, and cert-manager does not own what it issued, so a Helm uninstall removes neither `rabbitmq-<name>-ca`, which holds the CA private key, nor `rabbitmq-<name>-tls`. After removing a RabbitMQ that had TLS on, delete both from the tenant namespace by hand:
+
+```bash
+kubectl delete secret rabbitmq-<name>-ca rabbitmq-<name>-tls --namespace <tenant-namespace>
+```
+
+> **Warning:** the CA is issued with a 5-year duration and cert-manager renews the certificate as it approaches expiry, so a bundle copied once will eventually stop verifying. Re-read `<release>.tenant-ca` on a schedule, or mount it and let the kubelet refresh it, instead of baking `ca.crt` into a client image or a truststore built at release time.
+
 ## Parameter examples and reference
 
 ### resources and resourcesPreset
 
 `resources` sets explicit CPU and memory configurations for each replica.
-When left empty, the preset defined in `resourcesPreset` is applied.
+Every resource it leaves unset is taken from the preset defined in `resourcesPreset`.
 
 ```yaml
 resources:
@@ -56,13 +139,7 @@ resources:
 `resourcesPreset` sets named CPU and memory configurations for each replica.
 This setting is ignored if the corresponding `resources` value is set.
 
-| Preset name | CPU    | memory  |
-|-------------|--------|---------|
-| `nano`      | `100m` | `128Mi` |
-| `micro`     | `250m` | `256Mi` |
-| `small`     | `500m` | `512Mi` |
-| `medium`    | `500m` | `1Gi`   |
-| `large`     | `1`    | `2Gi`   |
-| `xlarge`    | `2`    | `4Gi`   |
-| `2xlarge`   | `4`    | `8Gi`   |
+Presets follow a cloud-style `<series>.<size>` naming convention. Five series cover the full CPU-to-memory ratio range (`t1` 1:0.5, `c1` 1:1, `s1` 1:2, `u1` 1:4, `m1` 1:8) and each series ships eight sizes (`nano` through `4xlarge`). The legacy flat names (`nano`, `micro`, `small`, `medium`, `large`, `xlarge`, `2xlarge`) remain accepted as deprecated aliases and keep their original sizes, which do not follow one series: `nano` through `small` equal the `t1` sizes of the same name, while `medium` equals `c1.small` rather than `c1.medium`.
+
+See [`docs/operations/resource-presets.md`](../../../docs/operations/resource-presets.md) for the full size matrix and the legacy-to-instance-type mapping.
 
diff --git a/packages/apps/rabbitmq/templates/_tls.tpl b/packages/apps/rabbitmq/templates/_tls.tpl
new file mode 100644
index 0000000000..1de878e95c
--- /dev/null
+++ b/packages/apps/rabbitmq/templates/_tls.tpl
@@ -0,0 +1,41 @@
+{{/*
+rabbitmq.clusterDomain returns the cluster DNS domain, defaulting to cozy.local.
+Used by the certificate SAN list and by the topology-operator connection URI, which
+must agree on how a Service is named.
+*/}}
+{{- define "rabbitmq.clusterDomain" -}}
+{{-   $domain := "cozy.local" -}}
+{{-   if .Values._cluster -}}
+{{-     $domain = (index .Values._cluster "cluster-domain") | default "cozy.local" -}}
+{{-   end -}}
+{{-   $domain -}}
+{{- end -}}
+
+{{/*
+rabbitmq.tls.enabled resolves tls.enabled to the string "true" or "false" so
+callers can compare with `eq`:
+
+  {{- $tlsEnabled := (include "rabbitmq.tls.enabled" .) | eq "true" -}}
+
+TLS is opt-in: unset, null and false all resolve to false, and nothing else turns
+it on — in particular `external` does not, unlike the sibling nats and qdrant
+charts. See README "TLS scope" for why.
+
+Every template that branches on TLS calls this helper, so they cannot disagree
+about whether TLS is on; tests/tls_resolution_test.yaml pins that agreement.
+
+The `dig` on a defaulted dict is load-bearing: `tls: null` in a HelmRelease
+override never arrives as a null, because Helm's coalescing drops the key
+outright, so `.Values.tls` is nil rather than an empty dict and reading
+`.Values.tls.enabled` off it panics with "nil pointer evaluating interface
+{}.enabled". The kindIs check then covers the ordinary path, where `tls: {}`
+from values.yaml makes dig return its nil default.
+*/}}
+{{- define "rabbitmq.tls.enabled" -}}
+{{-   $enabled := dig "enabled" nil (.Values.tls | default dict) -}}
+{{-   if kindIs "invalid" $enabled -}}
+{{-     "false" -}}
+{{-   else -}}
+{{-     $enabled | toString -}}
+{{-   end -}}
+{{- end -}}
diff --git a/packages/apps/rabbitmq/templates/_topology.tpl b/packages/apps/rabbitmq/templates/_topology.tpl
new file mode 100644
index 0000000000..3683862b82
--- /dev/null
+++ b/packages/apps/rabbitmq/templates/_topology.tpl
@@ -0,0 +1,38 @@
+{{/*
+rabbitmq.topology.kinds lists the kinds messaging-topology-operator drives
+through its shared TopologyReconciler. Each one carries a
+deletion.finalizers.<plural>.rabbitmq.com finalizer that comes off only after a
+successful management-API call, so all of them wedge the same way when the
+plaintext listener closes underneath them.
+
+SuperStream is the thirteenth CRD the operator ships and is deliberately absent:
+it runs on its own reconciler, which sets no finalizer, and the Queue, Exchange
+and Binding objects it owns are already on this list.
+
+Callers read it as a space-separated list:
+
+  {{- range $kind := splitList " " (include "rabbitmq.topology.kinds" $) -}}
+*/}}
+{{- define "rabbitmq.topology.kinds" -}}
+Binding Exchange Federation OperatorPolicy Permission Policy Queue SchemaReplication Shovel TopicPermission User Vhost
+{{- end -}}
+
+{{/*
+rabbitmq.topology.resources renders the same list as the comma-separated
+argument `kubectl get` takes. The two irregular plurals match deletionFinalizer()
+in the operator's controllers/utils.go, which is what names the finalizers the
+runbook step is checking for.
+*/}}
+{{- define "rabbitmq.topology.resources" -}}
+{{-   $out := list -}}
+{{-   range $kind := splitList " " (include "rabbitmq.topology.kinds" $) -}}
+{{-     $plural := printf "%ss" (lower $kind) -}}
+{{-     if eq $kind "Policy" -}}
+{{-       $plural = "policies" -}}
+{{-     else if eq $kind "OperatorPolicy" -}}
+{{-       $plural = "operatorpolicies" -}}
+{{-     end -}}
+{{-     $out = append $out (printf "%s.rabbitmq.com" $plural) -}}
+{{-   end -}}
+{{-   join "," $out -}}
+{{- end -}}
diff --git a/packages/apps/rabbitmq/templates/certmanager.yaml b/packages/apps/rabbitmq/templates/certmanager.yaml
new file mode 100644
index 0000000000..a3a9b99a4c
--- /dev/null
+++ b/packages/apps/rabbitmq/templates/certmanager.yaml
@@ -0,0 +1,122 @@
+{{- $tlsEnabled := (include "rabbitmq.tls.enabled" .) | eq "true" }}
+
+{{- if $tlsEnabled }}
+apiVersion: cert-manager.io/v1
+kind: Issuer
+metadata:
+  name: {{ .Release.Name }}-selfsigned
+  namespace: {{ .Release.Namespace }}
+spec:
+  selfSigned: {}
+---
+apiVersion: cert-manager.io/v1
+kind: Certificate
+metadata:
+  name: {{ .Release.Name }}-ca
+  namespace: {{ .Release.Namespace }}
+spec:
+  {{- /* tenant-projection.yaml names this Secret as its sourceSecretName, and
+       that is how the CA-extraction controller finds it: no label on this
+       Secret selects it. The controller reads ca.crt from here rather than
+       from the leaf below, whose Secret carries the server private key beside
+       the same ca.crt.
+
+       cert-manager keeps this Secret when TLS goes off and Helm does not own
+       it, so nothing rendered here can withdraw the raw CA material. See
+       README "Turning TLS off again". */}}
+  secretName: {{ .Release.Name }}-ca
+  duration: 43800h
+  commonName: {{ .Release.Name }}-ca
+  issuerRef:
+    name: {{ .Release.Name }}-selfsigned
+    kind: Issuer
+    group: cert-manager.io
+  isCA: true
+  usages:
+    - cert sign
+    - crl sign
+  privateKey:
+    algorithm: ECDSA
+    size: 256
+    {{- /* Rotating the CA key invalidates every leaf signed by the old one.
+         Renewal keeps the key and issues a fresh certificate, which
+         cert-manager does on its own as the 43800h duration runs out. */}}
+    rotationPolicy: Never
+---
+apiVersion: cert-manager.io/v1
+kind: Issuer
+metadata:
+  name: {{ .Release.Name }}-ca
+  namespace: {{ .Release.Namespace }}
+spec:
+  ca:
+    secretName: {{ .Release.Name }}-ca
+---
+{{- $clusterDomain := include "rabbitmq.clusterDomain" . }}
+{{- $ns := .Release.Namespace }}
+{{- $name := .Release.Name }}
+{{- /* Every name is covered in all resolvable forms: bare (same namespace),
+     two-segment <name>.<namespace> (the cross-namespace shorthand the DNS search
+     path resolves), and the fully qualified .svc / .svc.<domain>. That includes
+     the per-pod wildcards — the operator addresses nodes as
+     <pod>.<name>-nodes.<namespace>, the two-segment form, in RABBITMQ_NODENAME and
+     K8S_HOSTNAME_SUFFIX, so it is the canonical pod address rather than an
+     afterthought. Omitting a two-segment form is the easy mistake: it resolves
+     fine, so the connection succeeds and fails only at hostname verification,
+     which reads as a certificate bug rather than a missing SAN. */}}
+{{- $dnsNames := list
+  $name
+  (printf "%s.%s" $name $ns)
+  (printf "%s.%s.svc" $name $ns)
+  (printf "%s.%s.svc.%s" $name $ns $clusterDomain)
+  (printf "%s-nodes" $name)
+  (printf "%s-nodes.%s" $name $ns)
+  (printf "%s-nodes.%s.svc" $name $ns)
+  (printf "%s-nodes.%s.svc.%s" $name $ns $clusterDomain)
+  (printf "*.%s-nodes" $name)
+  (printf "*.%s-nodes.%s" $name $ns)
+  (printf "*.%s-nodes.%s.svc" $name $ns)
+  (printf "*.%s-nodes.%s.svc.%s" $name $ns $clusterDomain)
+}}
+{{- /* Add the external hostname as a SAN when the platform supplies one, and skip
+     it otherwise rather than failing: _namespace.host derives from the optional
+     _cluster.root-host, so requiring it would turn "external RabbitMQ on a cluster
+     with no root host" into a render error on upgrade. The chart creates no DNS
+     record for this name; see README "Verifying the server certificate". */}}
+{{- if .Values.external }}
+  {{- $host := dig "host" "" (.Values._namespace | default dict) }}
+  {{- if $host }}
+    {{- $dnsNames = append $dnsNames (printf "%s.%s" $name $host) }}
+  {{- end }}
+{{- end }}
+apiVersion: cert-manager.io/v1
+kind: Certificate
+metadata:
+  name: {{ .Release.Name }}-tls
+  namespace: {{ .Release.Namespace }}
+spec:
+  secretName: {{ .Release.Name }}-tls
+  duration: 8760h
+  renewBefore: 720h
+  issuerRef:
+    name: {{ .Release.Name }}-ca
+    kind: Issuer
+    group: cert-manager.io
+  commonName: {{ .Release.Name }}
+  dnsNames:
+    {{- range $dnsNames }}
+    - {{ . | quote }}
+    {{- end }}
+  {{- /* No `key encipherment`: that bit authorises RSA key transport, and this is
+       an ECDSA key. ECDSA cipher suites establish the session over ECDHE and use
+       the certificate only to sign the exchange, so `digital signature` is the
+       bit that does the work. Requesting the other one asks for a capability the
+       key type cannot supply. */}}
+  usages:
+    - digital signature
+    - server auth
+  privateKey:
+    algorithm: ECDSA
+    size: 256
+    rotationPolicy: Always
+{{- end }}
diff --git a/packages/apps/rabbitmq/templates/dashboard-resourcemap.yaml b/packages/apps/rabbitmq/templates/dashboard-resourcemap.yaml
index dd4be442e6..dc25476d71 100644
--- a/packages/apps/rabbitmq/templates/dashboard-resourcemap.yaml
+++ b/packages/apps/rabbitmq/templates/dashboard-resourcemap.yaml
@@ -9,6 +9,12 @@ rules:
   - secrets
   resourceNames:
   - {{ .Release.Name }}-default-user
+  {{- /* No TLS Secret is granted here, in either TLS state. Both objects carrying
+       ca.crt also carry a private key — <release>-tls the server key, <release>-ca
+       the CA key — and RBAC has no key-level filter, so granting read to deliver a
+       trust anchor would deliver the key with it. The tenant reads the key-free
+       <release>.tenant-ca projection through core.cozystack.io/tenantsecrets, which
+       cozy:tenant:use:base already grants. */}}
   {{- range $name, $u := .Values.users }}
   - {{ $.Release.Name }}-{{ kebabcase $name }}-credentials
   {{- end }}
diff --git a/packages/apps/rabbitmq/templates/rabbitmq.yaml b/packages/apps/rabbitmq/templates/rabbitmq.yaml
index bbf2efbe43..3a973fe1a9 100644
--- a/packages/apps/rabbitmq/templates/rabbitmq.yaml
+++ b/packages/apps/rabbitmq/templates/rabbitmq.yaml
@@ -1,3 +1,61 @@
+{{- $tlsEnabled := (include "rabbitmq.tls.enabled" .) | eq "true" }}
+{{- $wantDisableNonTLS := dig "disableNonTLSListeners" false (.Values.tls | default dict) }}
+
+{{- /* Closing the plaintext listeners with TLS off would leave nothing listening.
+     The operator rejects this too (reconcile_tls.go), so fail here rather than
+     drop the flag and render a cluster that looks healthy with every plaintext
+     listener open. */}}
+{{- if and $wantDisableNonTLS (not $tlsEnabled) }}
+{{-   fail "tls.disableNonTLSListeners is set but TLS is off, which would leave no listener at all: set tls.enabled: true as well. The RabbitMQ operator rejects this combination too." }}
+{{- end }}
+{{- $disableNonTLS := and $tlsEnabled $wantDisableNonTLS }}
+
+{{- /* The flag forces messaging-topology-operator onto TLS, where it verifies the
+     per-release CA against x509.SystemCertPool() and fails, so every kind the
+     operator owns stops reconciling. The .Values check understates the breakage:
+     useTLSForConnection derives from the RabbitmqCluster, not from who created the
+     topology CR, so hand-written objects fail the same way without this refusal.
+     See README "Closing the plaintext listeners". */}}
+{{- if and $disableNonTLS (or .Values.users .Values.vhosts) }}
+{{-   fail "tls.disableNonTLSListeners cannot be combined with users or vhosts: closing the plaintext listeners stops messaging-topology-operator from reconciling the User, Vhost and Permission objects it declares, and from deleting them. Every other kind that operator owns breaks the same way, hand-written or not, because it reads the RabbitmqCluster and not who created the CR. Manage users and permissions with rabbitmqctl or a definitions import. Clearing them and setting the flag are two separate upgrades, in that order. See README \"Closing the plaintext listeners\"." }}
+{{- end }}
+
+{{- /* The check above reads values, so it cannot see the transition itself:
+     clearing users and vhosts and setting the flag in one edit leaves both
+     empty and renders cleanly. Helm applies every object in the target release
+     before pruning the ones it dropped, so the broker closes plaintext and
+     loses the connection annotation while the topology objects are still
+     holding deletion.finalizers.<plural>.rabbitmq.com. Their operator then has
+     to reach a management API it can no longer verify, so the delete never
+     completes and the upgrade reports success over objects stuck in
+     Terminating. Read the namespace rather than the values, and only while the
+     flag is being introduced: once the live cluster already carries it the
+     transition is behind us, and an object created after that is the tenant's
+     to clean up rather than a reason to stop rendering. */}}
+{{- if $disableNonTLS }}
+{{-   $live := lookup "rabbitmq.com/v1beta1" "RabbitmqCluster" .Release.Namespace .Release.Name | default dict }}
+{{-   if not (dig "spec" "tls" "disableNonTLSListeners" false $live) }}
+{{-     $pending := list }}
+{{-     range $kind := splitList " " (include "rabbitmq.topology.kinds" $) }}
+{{-       range dig "items" (list) (lookup "rabbitmq.com/v1beta1" $kind $.Release.Namespace "" | default dict) }}
+{{- /* A tenant namespace holds every RabbitMQ application the tenant runs, so
+     the listing has to be narrowed to this release. A sibling's topology
+     objects are reached through their own broker, whose listeners this flag
+     does not touch. An object that binds through connectionSecret rather than
+     by name falls outside this test and stays unguarded: the Secret it points
+     at is what names the broker, and reading it here would not say which
+     release wrote it. */}}
+{{-         if eq (dig "spec" "rabbitmqClusterReference" "name" "" .) $.Release.Name }}
+{{-           $pending = append $pending (printf "%s/%s" $kind .metadata.name) }}
+{{-         end }}
+{{-       end }}
+{{-     end }}
+{{-     if $pending }}
+{{-       fail (printf "tls.disableNonTLSListeners cannot be turned on while this release still has topology objects in namespace %s: %s. Remove them in one upgrade, confirm `kubectl get %s --namespace %s` returns nothing bound to this release, then set the flag in a second upgrade. Setting both at once leaves those objects stuck in Terminating. See README \"Removing the topology objects is its own upgrade\"." $.Release.Namespace (join ", " $pending) (include "rabbitmq.topology.resources" $) $.Release.Namespace) }}
+{{-     end }}
+{{-   end }}
+{{- end }}
+
 apiVersion: rabbitmq.com/v1beta1
 kind: RabbitmqCluster
 metadata:
@@ -5,6 +63,21 @@ metadata:
   labels:
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
+  {{- if and $tlsEnabled (not $disableNonTLS) }}
+  {{- /* Pins messaging-topology-operator to the plaintext management port. Without
+       it, spec.tls.secretName alone flips the operator to https://…:15671, where it
+       verifies the per-release CA against x509.SystemCertPool() and every User,
+       Vhost and Permission fails with "certificate signed by unknown authority".
+       The http:// scheme makes extractURIandScheme report tlsEnabled=false, so that
+       plaintext listener is load-bearing rather than merely tolerated. Broker
+       traffic is unaffected.
+
+       Expect this key on tenant-visible objects: ReconcileAndFilterAnnotations
+       strips only kubernetes.io / k8s.io keys, so the operator copies it onto every
+       child it builds. See README "TLS scope". */}}
+  annotations:
+    rabbitmq.com/operator-connection-uri: "http://{{ .Release.Name }}.{{ .Release.Namespace }}.svc.{{ include "rabbitmq.clusterDomain" . }}:15672"
+  {{- end }}
 spec:
   replicas: {{ .Values.replicas }}
   image: 'rabbitmq:{{ include "rabbitmq.versionMap" $ }}-management'
@@ -13,7 +86,30 @@ spec:
     type: LoadBalancer
   {{- end }}
   resources: {{- include "cozy-lib.resources.defaultingSanitize" (list .Values.resourcesPreset .Values.resources $) | nindent 4 }}
+  {{- if $tlsEnabled }}
+  {{- /* secretName is the whole of it: the operator's defaultTLSConf then supplies
+       ssl_options and management.ssl itself, so no additionalConfig is needed to
+       serve AMQPS or management HTTPS. That same branch writes
+       management.tcp.port=15672, which is why plaintext management stays up while
+       disableNonTLSListeners is unset. No cacertfile is set — it would only matter
+       for verifying CLIENT certificates, which this chart does not enable. */}}
+  tls:
+    secretName: {{ .Release.Name }}-tls
+    {{- if $disableNonTLS }}
+    {{- /* Writes `listeners.tcp = none` into rabbitmq.conf: broker-level, so
+         in-cluster clients lose plaintext with external ones. Does NOT cover Erlang
+         distribution (25672) or epmd (4369), which ride the headless Service. See
+         README "TLS scope". */}}
+    disableNonTLSListeners: true
+    {{- end }}
+  {{- end }}
   override:
+    {{- /* Deliberately no spec.override.service. It cannot remove a port — the
+         override is a strategic merge keyed on `port` against defaults the operator
+         regenerates each reconcile — so a TLS-only port list would be a no-op that
+         reads like a guarantee. Re-adding one is worse: on a LoadBalancer it drives
+         a NodePort reallocation loop through the operator's Service watch. See
+         README "TLS scope". */}}
     statefulSet:
       spec:
         template:
@@ -61,6 +157,9 @@ metadata:
   name: {{ $.Release.Name }}-{{ kebabcase $user }}-credentials
   labels:
     apps.cozystack.io/user-secret: "true"
+    # Topology Operator >= 1.20 caches only Secrets carrying this label, and its User
+    # admission webhook rejects an importCredentialsSecret that lacks it.
+    rabbitmq.com/topology-operator: "true"
 type: Opaque
 stringData:
   username: {{ $user }}
diff --git a/packages/apps/rabbitmq/templates/tenant-projection.yaml b/packages/apps/rabbitmq/templates/tenant-projection.yaml
new file mode 100644
index 0000000000..5662310c03
--- /dev/null
+++ b/packages/apps/rabbitmq/templates/tenant-projection.yaml
@@ -0,0 +1,13 @@
+{{- /* Gated on the same condition as certmanager.yaml: the source Secret only exists when TLS is on. */}}
+{{- if eq (include "rabbitmq.tls.enabled" .) "true" }}
+---
+apiVersion: internal.cozystack.io/v1alpha1
+kind: TenantProjection
+metadata:
+  name: {{ .Release.Name }}-ca
+spec:
+  projections:
+    - type: CACert
+      sourceSecretName: {{ .Release.Name }}-ca
+      sourceKey: ca.crt
+{{- end }}
diff --git a/packages/apps/rabbitmq/tests/certmanager_test.yaml b/packages/apps/rabbitmq/tests/certmanager_test.yaml
new file mode 100644
index 0000000000..4ec1c5b849
--- /dev/null
+++ b/packages/apps/rabbitmq/tests/certmanager_test.yaml
@@ -0,0 +1,630 @@
+suite: RabbitMQ TLS cert-manager chain
+
+templates:
+  - templates/certmanager.yaml
+
+tests:
+  # -----------------------------------------------------------------------
+  # tls.enabled=false: no resources rendered
+  # -----------------------------------------------------------------------
+
+  - it: renders no documents when tls.enabled is false
+    release:
+      name: myrabbitmq
+      namespace: tenant-test
+    set:
+      tls.enabled: false
+      external: false
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  - it: renders no documents when tls.enabled is false even if external is true
+    release:
+      name: myrabbitmq
+      namespace: tenant-test
+    set:
+      tls.enabled: false
+      external: true
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  # -----------------------------------------------------------------------
+  # tls.enabled=true: full chain rendered (4 documents)
+  # -----------------------------------------------------------------------
+
+  - it: renders 4 documents when tls.enabled is true
+    release:
+      name: myrabbitmq
+      namespace: tenant-test
+    set:
+      tls.enabled: true
+      external: false
+    asserts:
+      - hasDocuments:
+          count: 4
+
+  - it: first document is selfsigned Issuer
+    release:
+      name: myrabbitmq
+      namespace: tenant-test
+    set:
+      tls.enabled: true
+      external: false
+    documentIndex: 0
+    asserts:
+      - isKind:
+          of: Issuer
+      - equal:
+          path: metadata.name
+          value: myrabbitmq-selfsigned
+      - equal:
+          path: metadata.namespace
+          value: tenant-test
+      - exists:
+          path: spec.selfSigned
+
+  - it: second document is CA Certificate
+    release:
+      name: myrabbitmq
+      namespace: tenant-test
+    set:
+      tls.enabled: true
+      external: false
+    documentIndex: 1
+    asserts:
+      - isKind:
+          of: Certificate
+      - equal:
+          path: metadata.name
+          value: myrabbitmq-ca
+      - equal:
+          path: metadata.namespace
+          value: tenant-test
+      - equal:
+          path: spec.secretName
+          value: myrabbitmq-ca
+      - equal:
+          path: spec.isCA
+          value: true
+      - equal:
+          path: spec.issuerRef.name
+          value: myrabbitmq-selfsigned
+
+  - it: third document is CA Issuer
+    release:
+      name: myrabbitmq
+      namespace: tenant-test
+    set:
+      tls.enabled: true
+      external: false
+    documentIndex: 2
+    asserts:
+      - isKind:
+          of: Issuer
+      - equal:
+          path: metadata.name
+          value: myrabbitmq-ca
+      - equal:
+          path: metadata.namespace
+          value: tenant-test
+      - equal:
+          path: spec.ca.secretName
+          value: myrabbitmq-ca
+
+  - it: fourth document is leaf Certificate
+    release:
+      name: myrabbitmq
+      namespace: tenant-test
+    set:
+      tls.enabled: true
+      external: false
+    documentIndex: 3
+    asserts:
+      - isKind:
+          of: Certificate
+      - equal:
+          path: metadata.name
+          value: myrabbitmq-tls
+      - equal:
+          path: metadata.namespace
+          value: tenant-test
+      - equal:
+          path: spec.secretName
+          value: myrabbitmq-tls
+      - equal:
+          path: spec.issuerRef.name
+          value: myrabbitmq-ca
+
+  - it: CA cert has cert sign and crl sign usages and not server auth
+    release:
+      name: myrabbitmq
+      namespace: tenant-test
+    set:
+      tls.enabled: true
+      external: false
+    documentIndex: 1
+    asserts:
+      - contains:
+          path: spec.usages
+          content: cert sign
+      - contains:
+          path: spec.usages
+          content: crl sign
+      - notContains:
+          path: spec.usages
+          content: server auth
+
+  # -----------------------------------------------------------------------
+  # SAN coverage: internal-only (external=false)
+  # -----------------------------------------------------------------------
+
+  - it: leaf Certificate contains three internal DNS SANs when external is false
+    release:
+      name: myrabbitmq
+      namespace: tenant-test
+    set:
+      tls.enabled: true
+      external: false
+    documentIndex: 3
+    asserts:
+      - contains:
+          path: spec.dnsNames
+          content: myrabbitmq
+      - contains:
+          path: spec.dnsNames
+          content: myrabbitmq.tenant-test.svc
+      - contains:
+          path: spec.dnsNames
+          content: myrabbitmq.tenant-test.svc.cozy.local
+      - notContains:
+          path: spec.dnsNames
+          content: myrabbitmq.example.com
+
+  - it: leaf Certificate contains inter-node headless SANs when external is false
+    release:
+      name: myrabbitmq
+      namespace: tenant-test
+    set:
+      tls.enabled: true
+      external: false
+    documentIndex: 3
+    asserts:
+      - contains:
+          path: spec.dnsNames
+          content: myrabbitmq-nodes
+      - contains:
+          path: spec.dnsNames
+          content: myrabbitmq-nodes.tenant-test.svc
+      - contains:
+          path: spec.dnsNames
+          content: myrabbitmq-nodes.tenant-test.svc.cozy.local
+      - contains:
+          path: spec.dnsNames
+          content: "*.myrabbitmq-nodes.tenant-test.svc"
+      - contains:
+          path: spec.dnsNames
+          content: "*.myrabbitmq-nodes.tenant-test.svc.cozy.local"
+
+  - it: leaf Certificate contains inter-node headless SANs when external is true
+    release:
+      name: myrabbitmq
+      namespace: tenant-test
+    set:
+      tls.enabled: true
+      external: true
+      _namespace.host: example.com
+    documentIndex: 3
+    asserts:
+      - contains:
+          path: spec.dnsNames
+          content: myrabbitmq-nodes
+      - contains:
+          path: spec.dnsNames
+          content: myrabbitmq-nodes.tenant-test.svc
+      - contains:
+          path: spec.dnsNames
+          content: myrabbitmq-nodes.tenant-test.svc.cozy.local
+      - contains:
+          path: spec.dnsNames
+          content: "*.myrabbitmq-nodes.tenant-test.svc"
+      - contains:
+          path: spec.dnsNames
+          content: "*.myrabbitmq-nodes.tenant-test.svc.cozy.local"
+
+  - it: leaf Certificate uses custom cluster domain in FQDN SAN when _cluster.cluster-domain is set
+    release:
+      name: myrabbitmq
+      namespace: tenant-test
+    set:
+      tls.enabled: true
+      external: false
+      _cluster.cluster-domain: custom.example
+    documentIndex: 3
+    asserts:
+      - contains:
+          path: spec.dnsNames
+          content: myrabbitmq.tenant-test.svc.custom.example
+      - notContains:
+          path: spec.dnsNames
+          content: myrabbitmq.tenant-test.svc.cozy.local
+      - contains:
+          path: spec.dnsNames
+          content: myrabbitmq-nodes.tenant-test.svc.custom.example
+      - contains:
+          path: spec.dnsNames
+          content: "*.myrabbitmq-nodes.tenant-test.svc.custom.example"
+      - notContains:
+          path: spec.dnsNames
+          content: myrabbitmq-nodes.tenant-test.svc.cozy.local
+
+  # -----------------------------------------------------------------------
+  # SAN coverage: external=true adds namespace.host SAN
+  # -----------------------------------------------------------------------
+
+  - it: renders 4 documents when external is true and tls.enabled is true
+    release:
+      name: myrabbitmq
+      namespace: tenant-test
+    set:
+      tls.enabled: true
+      external: true
+      _namespace.host: example.com
+    asserts:
+      - hasDocuments:
+          count: 4
+
+  - it: leaf Certificate contains external SAN when external is true and tls.enabled is true
+    release:
+      name: myrabbitmq
+      namespace: tenant-test
+    set:
+      tls.enabled: true
+      external: true
+      _namespace.host: example.com
+    documentIndex: 3
+    asserts:
+      - contains:
+          path: spec.dnsNames
+          content: myrabbitmq
+      - contains:
+          path: spec.dnsNames
+          content: myrabbitmq.tenant-test.svc
+      - contains:
+          path: spec.dnsNames
+          content: myrabbitmq.tenant-test.svc.cozy.local
+      - contains:
+          path: spec.dnsNames
+          content: myrabbitmq.example.com
+
+  # `external` is the sole discriminator here. Every other case with
+  # external: false also leaves _namespace.host unset, so the platform host is
+  # absent from the SAN list for want of a host rather than for want of the
+  # gate, and dropping the gate would go unnoticed.
+  - it: leaf Certificate omits the platform host when external is false and a host is available
+    release:
+      name: myrabbitmq
+      namespace: tenant-test
+    set:
+      tls.enabled: true
+      external: false
+      _namespace.host: example.com
+    documentIndex: 3
+    asserts:
+      - notContains:
+          path: spec.dnsNames
+          content: myrabbitmq.example.com
+      - contains:
+          path: spec.dnsNames
+          content: myrabbitmq.tenant-test.svc.cozy.local
+
+  # -----------------------------------------------------------------------
+  # Default: tls.enabled unset => no certificate chain, whatever external is.
+  #
+  # The external=true case is the one that matters. Issuing a chain there would
+  # mean an upgrade of an existing published broker starts pulling in
+  # cert-manager and rolling pods on its own, so this pins that `external` is
+  # not a second way to switch TLS on.
+  # -----------------------------------------------------------------------
+
+  - it: renders no TLS chain when tls.enabled is unset and external is true
+    release:
+      name: myrabbitmq
+      namespace: tenant-test
+    values:
+      - fixtures/tls_default_values.yaml
+    set:
+      external: true
+      _namespace.host: example.com
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  - it: renders no TLS chain when tls.enabled is unset and external is false
+    release:
+      name: myrabbitmq
+      namespace: tenant-test
+    values:
+      - fixtures/tls_default_values.yaml
+    set:
+      external: false
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  # -----------------------------------------------------------------------
+  # Leaf certificate duration defaults
+  # -----------------------------------------------------------------------
+
+  - it: leaf Certificate has default duration 8760h
+    release:
+      name: myrabbitmq
+      namespace: tenant-test
+    set:
+      tls.enabled: true
+      external: false
+    documentIndex: 3
+    asserts:
+      - equal:
+          path: spec.duration
+          value: 8760h
+
+  - it: leaf Certificate has default renewBefore 720h
+    release:
+      name: myrabbitmq
+      namespace: tenant-test
+    set:
+      tls.enabled: true
+      external: false
+    documentIndex: 3
+    asserts:
+      - equal:
+          path: spec.renewBefore
+          value: 720h
+
+  # -----------------------------------------------------------------------
+  # B2: leaf cert must have explicit usages including server auth EKU
+  # -----------------------------------------------------------------------
+
+  - it: leaf Certificate has server auth EKU in usages
+    release:
+      name: myrabbitmq
+      namespace: tenant-test
+    set:
+      tls.enabled: true
+      external: false
+    documentIndex: 3
+    asserts:
+      - contains:
+          path: spec.usages
+          content: server auth
+      - contains:
+          path: spec.usages
+          content: digital signature
+      # key encipherment authorises RSA key transport and this key is ECDSA, so
+      # asking for it requests something the key type cannot do. ECDHE signs with
+      # digital signature instead.
+      - notContains:
+          path: spec.usages
+          content: key encipherment
+      - notContains:
+          path: spec.usages
+          content: cert sign
+      - notContains:
+          path: spec.usages
+          content: signing
+
+  # -----------------------------------------------------------------------
+  # ECDSA: CA and leaf certificates use ECDSA P-256 private keys
+  # -----------------------------------------------------------------------
+
+  - it: CA certificate uses ECDSA algorithm with key size 256
+    release:
+      name: myrabbitmq
+      namespace: tenant-test
+    set:
+      tls.enabled: true
+      external: false
+    documentIndex: 1
+    asserts:
+      - equal:
+          path: spec.privateKey.algorithm
+          value: ECDSA
+      - equal:
+          path: spec.privateKey.size
+          value: 256
+
+  - it: leaf certificate uses ECDSA algorithm with key size 256
+    release:
+      name: myrabbitmq
+      namespace: tenant-test
+    set:
+      tls.enabled: true
+      external: false
+    documentIndex: 3
+    asserts:
+      - equal:
+          path: spec.privateKey.algorithm
+          value: ECDSA
+      - equal:
+          path: spec.privateKey.size
+          value: 256
+
+  - it: CA certificate rotationPolicy is Never
+    release:
+      name: myrabbitmq
+      namespace: tenant-test
+    set:
+      tls.enabled: true
+      external: false
+    documentIndex: 1
+    asserts:
+      - equal:
+          path: spec.privateKey.rotationPolicy
+          value: Never
+
+  - it: leaf certificate rotationPolicy is Always
+    release:
+      name: myrabbitmq
+      namespace: tenant-test
+    set:
+      tls.enabled: true
+      external: false
+    documentIndex: 3
+    asserts:
+      - equal:
+          path: spec.privateKey.rotationPolicy
+          value: Always
+
+  # -----------------------------------------------------------------------
+  # CA publication.
+  #
+  # tenant-projection.yaml is what actually makes <release>.tenant-ca exist: it
+  # names this Certificate's Secret as the CA-extraction controller's source.
+  # See tenant_projection_test.yaml for that half of the contract.
+  # -----------------------------------------------------------------------
+
+  - it: CA certificate is the isCA one, so the published anchor is not the leaf
+    release:
+      name: myrabbitmq
+      namespace: tenant-test
+    set:
+      tls.enabled: true
+      external: false
+    documentIndex: 1
+    asserts:
+      - equal:
+          path: spec.isCA
+          value: true
+
+  # -----------------------------------------------------------------------
+  # external=true must NOT require _namespace.host. It derives from
+  # _cluster.root-host, which the platform treats as optional, and an external
+  # RabbitMQ is a bare LoadBalancer with no Ingress. Failing would turn a
+  # previously-working configuration into a render error on upgrade, and those
+  # releases predate tls.enabled so they have no way to opt out.
+  # -----------------------------------------------------------------------
+
+  - it: renders without the external SAN when external is true but _namespace.host is unset
+    release:
+      name: myrabbitmq
+      namespace: tenant-test
+    set:
+      tls.enabled: true
+      external: true
+    documentIndex: 3
+    asserts:
+      - contains:
+          path: spec.dnsNames
+          content: myrabbitmq.tenant-test.svc.cozy.local
+      # No SAN is fabricated from an empty host: "myrabbitmq." would otherwise
+      # be appended and silently accepted as a name.
+      - notContains:
+          path: spec.dnsNames
+          content: myrabbitmq.
+
+  - it: renders the full internal SAN set when _namespace.host is unset
+    release:
+      name: myrabbitmq
+      namespace: tenant-test
+    set:
+      tls.enabled: true
+      external: true
+    documentIndex: 3
+    asserts:
+      # 12 internal names: three families — client Service, headless Service and
+      # the pod wildcard — in four forms each (bare, two-segment, .svc,
+      # .svc.<domain>). The wildcard family carried only three for a while; the
+      # exact-list assertion above is what pins the shape, this pins the count.
+      - lengthEqual:
+          path: spec.dnsNames
+          count: 12
+
+  - it: adds exactly one SAN when _namespace.host is set
+    release:
+      name: myrabbitmq
+      namespace: tenant-test
+    set:
+      tls.enabled: true
+      external: true
+      _namespace.host: example.com
+    documentIndex: 3
+    asserts:
+      - lengthEqual:
+          path: spec.dnsNames
+          count: 13
+
+  - it: renders the external DNS name as a SAN when _namespace.host is set
+    release:
+      name: myrabbitmq
+      namespace: tenant-test
+    set:
+      tls.enabled: true
+      external: true
+      _namespace.host: example.com
+    documentIndex: 3
+    asserts:
+      - contains:
+          path: spec.dnsNames
+          content: myrabbitmq.example.com
+
+  # -----------------------------------------------------------------------
+  # Two-segment SANs. <name>.<namespace> resolves through the DNS search path,
+  # so a client using that form reaches the broker and then fails ONLY hostname
+  # verification — which reads as a certificate bug rather than a missing SAN.
+  # -----------------------------------------------------------------------
+
+  - it: covers the client Service in all resolvable forms
+    release:
+      name: myrabbitmq
+      namespace: tenant-test
+    set:
+      tls.enabled: true
+      external: false
+    documentIndex: 3
+    asserts:
+      - contains:
+          path: spec.dnsNames
+          content: myrabbitmq
+      - contains:
+          path: spec.dnsNames
+          content: myrabbitmq.tenant-test
+      - contains:
+          path: spec.dnsNames
+          content: myrabbitmq.tenant-test.svc
+      - contains:
+          path: spec.dnsNames
+          content: myrabbitmq.tenant-test.svc.cozy.local
+
+  - it: covers the headless Service in all resolvable forms
+    release:
+      name: myrabbitmq
+      namespace: tenant-test
+    set:
+      tls.enabled: true
+      external: false
+    documentIndex: 3
+    asserts:
+      # Asserted as an exact list rather than with `contains`. The title claims
+      # every resolvable form is present, and a `contains` set can only show that
+      # the forms someone thought to list are there — it stays green for the one
+      # nobody thought of, which is exactly how the bare wildcard went missing.
+      # The operator addresses nodes as <pod>.<name>-nodes.<namespace>
+      # (RABBITMQ_NODENAME / K8S_HOSTNAME_SUFFIX), so the wildcard family is the
+      # canonical pod address and needs the same four forms as the rest.
+      - equal:
+          path: spec.dnsNames
+          value:
+            - myrabbitmq
+            - myrabbitmq.tenant-test
+            - myrabbitmq.tenant-test.svc
+            - myrabbitmq.tenant-test.svc.cozy.local
+            - myrabbitmq-nodes
+            - myrabbitmq-nodes.tenant-test
+            - myrabbitmq-nodes.tenant-test.svc
+            - myrabbitmq-nodes.tenant-test.svc.cozy.local
+            - "*.myrabbitmq-nodes"
+            - "*.myrabbitmq-nodes.tenant-test"
+            - "*.myrabbitmq-nodes.tenant-test.svc"
+            - "*.myrabbitmq-nodes.tenant-test.svc.cozy.local"
diff --git a/packages/apps/rabbitmq/tests/dashboard_resourcemap_test.yaml b/packages/apps/rabbitmq/tests/dashboard_resourcemap_test.yaml
new file mode 100644
index 0000000000..023fa51dba
--- /dev/null
+++ b/packages/apps/rabbitmq/tests/dashboard_resourcemap_test.yaml
@@ -0,0 +1,202 @@
+suite: RabbitMQ dashboard Role resource access
+
+templates:
+  - templates/dashboard-resourcemap.yaml
+
+tests:
+  # -----------------------------------------------------------------------
+  # Baseline: Role always grants access to default-user secret
+  # -----------------------------------------------------------------------
+
+  - it: Role always grants access to default-user secret
+    release:
+      name: myrabbitmq
+      namespace: tenant-test
+    set:
+      tls.enabled: false
+      external: false
+    documentIndex: 0
+    asserts:
+      - isKind:
+          of: Role
+      - contains:
+          path: rules[0].resourceNames
+          content: myrabbitmq-default-user
+
+  # -----------------------------------------------------------------------
+  # B: no key-bearing Secret is ever granted, in any TLS state.
+  #
+  # Both objects that carry ca.crt also carry a private key: <release>-tls holds
+  # the server key and <release>-ca holds the CA key. RBAC cannot filter by key,
+  # so granting either to deliver a trust anchor delivers a key with it. The
+  # tenant reads the key-free <release>.tenant-ca projection through
+  # core.cozystack.io/tenantsecrets instead, which the base tenant roles already
+  # grant — so it is deliberately absent from this core/v1 Role too.
+  # -----------------------------------------------------------------------
+
+  - it: Role never grants the leaf TLS secret when tls.enabled is true
+    release:
+      name: myrabbitmq
+      namespace: tenant-test
+    set:
+      tls.enabled: true
+      external: false
+    documentIndex: 0
+    asserts:
+      - isKind:
+          of: Role
+      - notContains:
+          path: rules[0].resourceNames
+          content: myrabbitmq-tls
+
+  - it: Role never grants the CA secret when tls.enabled is true
+    release:
+      name: myrabbitmq
+      namespace: tenant-test
+    set:
+      tls.enabled: true
+      external: false
+    documentIndex: 0
+    asserts:
+      - isKind:
+          of: Role
+      - notContains:
+          path: rules[0].resourceNames
+          content: myrabbitmq-ca
+
+  - it: Role never grants key-bearing secrets on the external TLS path
+    release:
+      name: myrabbitmq
+      namespace: tenant-test
+    set:
+      tls.enabled: true
+      external: true
+      _namespace.host: example.com
+    documentIndex: 0
+    asserts:
+      - isKind:
+          of: Role
+      - notContains:
+          path: rules[0].resourceNames
+          content: myrabbitmq-tls
+      - notContains:
+          path: rules[0].resourceNames
+          content: myrabbitmq-ca
+
+  - it: Role does not grant the tenant-ca projection by name either
+    release:
+      name: myrabbitmq
+      namespace: tenant-test
+    set:
+      tls.enabled: true
+      external: false
+    documentIndex: 0
+    asserts:
+      - isKind:
+          of: Role
+      # Delivered through core.cozystack.io/tenantsecrets, not as a core/v1
+      # Secret, so a resourceNames entry here would grant nothing.
+      - notContains:
+          path: rules[0].resourceNames
+          content: myrabbitmq.tenant-ca
+
+  - it: Role still grants the default-user secret when TLS is on
+    release:
+      name: myrabbitmq
+      namespace: tenant-test
+    set:
+      tls.enabled: true
+      external: false
+    documentIndex: 0
+    asserts:
+      - isKind:
+          of: Role
+      - contains:
+          path: rules[0].resourceNames
+          content: myrabbitmq-default-user
+
+  - it: Role does NOT grant access to TLS secret when TLS is disabled
+    release:
+      name: myrabbitmq
+      namespace: tenant-test
+    set:
+      tls.enabled: false
+      external: false
+    documentIndex: 0
+    asserts:
+      - isKind:
+          of: Role
+      - notContains:
+          path: rules[0].resourceNames
+          content: myrabbitmq-tls
+
+  - it: Role does NOT grant access to TLS secret when tls.enabled is explicitly false even if external is true
+    release:
+      name: myrabbitmq
+      namespace: tenant-test
+    set:
+      tls.enabled: false
+      external: true
+      _namespace.host: example.com
+    documentIndex: 0
+    asserts:
+      - isKind:
+          of: Role
+      - notContains:
+          path: rules[0].resourceNames
+          content: myrabbitmq-tls
+
+  # -----------------------------------------------------------------------
+  # Verify RoleBinding is also rendered
+  # -----------------------------------------------------------------------
+
+  - it: RoleBinding is rendered as second document
+    release:
+      name: myrabbitmq
+      namespace: tenant-test
+    set:
+      tls.enabled: false
+      external: false
+    documentIndex: 1
+    asserts:
+      - isKind:
+          of: RoleBinding
+      - equal:
+          path: roleRef.name
+          value: myrabbitmq-dashboard-resources
+
+  # -----------------------------------------------------------------------
+  # Pin the complete list, not just the absence of known-bad names. Every other
+  # assertion here is a notContains, so a Role that gained the erlang cookie or
+  # any future Secret would satisfy all of them. This is the actual contract.
+  # -----------------------------------------------------------------------
+
+  - it: grants exactly the intended Secrets and nothing else, TLS on
+    release:
+      name: myrabbitmq
+      namespace: tenant-test
+    set:
+      tls.enabled: true
+      external: false
+    documentIndex: 0
+    asserts:
+      - equal:
+          path: rules[0].resourceNames
+          value:
+            - myrabbitmq-default-user
+
+  - it: grants exactly the intended Secrets and nothing else, with users defined
+    release:
+      name: myrabbitmq
+      namespace: tenant-test
+    set:
+      tls.enabled: true
+      external: false
+      users.alice.password: hackme
+    documentIndex: 0
+    asserts:
+      - equal:
+          path: rules[0].resourceNames
+          value:
+            - myrabbitmq-default-user
+            - myrabbitmq-alice-credentials
diff --git a/packages/apps/rabbitmq/tests/disable_non_tls_transition_test.yaml b/packages/apps/rabbitmq/tests/disable_non_tls_transition_test.yaml
new file mode 100644
index 0000000000..ada11352c1
--- /dev/null
+++ b/packages/apps/rabbitmq/tests/disable_non_tls_transition_test.yaml
@@ -0,0 +1,397 @@
+suite: RabbitMQ disableNonTLSListeners one-step migration refusal
+
+templates:
+  - templates/rabbitmq.yaml
+
+release:
+  name: myrabbitmq
+  namespace: tenant-test
+
+# The values-level refusal cannot see this case: an operator who clears users
+# and vhosts and sets the flag in the same edit renders with both empty. What
+# is still in the namespace decides it, so every firing case below mocks the
+# objects Helm would prune only after applying the closed-listener cluster.
+#
+# The kinds come from templates/_topology.tpl, which is also what the refusal
+# prints as the confirmation command, so the scheme below has to carry all
+# twelve. The three the chart itself creates are only a subset: every kind the
+# topology operator drives through TopologyReconciler wedges the same way.
+#
+# A tenant namespace holds several RabbitMQ applications, so the objects also
+# carry `spec.rabbitmqClusterReference.name` and the guard has to read it: a
+# sibling release's User must not stop this release from closing its listeners.
+#
+# The `registrar` objects sit in an unrelated namespace. The fake dynamic
+# client learns a kind from the objects it is given rather than from `scheme`,
+# and refuses to LIST a kind it has never seen instead of returning an empty
+# list; a registrar teaches it the kind without answering the namespaced query.
+tests:
+  - it: refuses the flag while a User is still live and the cluster has not closed its listeners yet
+    kubernetesProvider:
+      scheme: &topologyScheme
+        "rabbitmq.com/v1beta1/RabbitmqCluster":
+          gvr: { group: "rabbitmq.com", version: "v1beta1", resource: "rabbitmqclusters" }
+          namespaced: true
+        "rabbitmq.com/v1beta1/Binding":
+          gvr: { group: "rabbitmq.com", version: "v1beta1", resource: "bindings" }
+          namespaced: true
+        "rabbitmq.com/v1beta1/Exchange":
+          gvr: { group: "rabbitmq.com", version: "v1beta1", resource: "exchanges" }
+          namespaced: true
+        "rabbitmq.com/v1beta1/Federation":
+          gvr: { group: "rabbitmq.com", version: "v1beta1", resource: "federations" }
+          namespaced: true
+        "rabbitmq.com/v1beta1/OperatorPolicy":
+          gvr: { group: "rabbitmq.com", version: "v1beta1", resource: "operatorpolicies" }
+          namespaced: true
+        "rabbitmq.com/v1beta1/Permission":
+          gvr: { group: "rabbitmq.com", version: "v1beta1", resource: "permissions" }
+          namespaced: true
+        "rabbitmq.com/v1beta1/Policy":
+          gvr: { group: "rabbitmq.com", version: "v1beta1", resource: "policies" }
+          namespaced: true
+        "rabbitmq.com/v1beta1/Queue":
+          gvr: { group: "rabbitmq.com", version: "v1beta1", resource: "queues" }
+          namespaced: true
+        "rabbitmq.com/v1beta1/SchemaReplication":
+          gvr: { group: "rabbitmq.com", version: "v1beta1", resource: "schemareplications" }
+          namespaced: true
+        "rabbitmq.com/v1beta1/Shovel":
+          gvr: { group: "rabbitmq.com", version: "v1beta1", resource: "shovels" }
+          namespaced: true
+        "rabbitmq.com/v1beta1/TopicPermission":
+          gvr: { group: "rabbitmq.com", version: "v1beta1", resource: "topicpermissions" }
+          namespaced: true
+        "rabbitmq.com/v1beta1/User":
+          gvr: { group: "rabbitmq.com", version: "v1beta1", resource: "users" }
+          namespaced: true
+        "rabbitmq.com/v1beta1/Vhost":
+          gvr: { group: "rabbitmq.com", version: "v1beta1", resource: "vhosts" }
+          namespaced: true
+      objects:
+        - &rBinding { apiVersion: rabbitmq.com/v1beta1, kind: Binding, metadata: { name: registrar, namespace: unrelated } }
+        - &rExchange { apiVersion: rabbitmq.com/v1beta1, kind: Exchange, metadata: { name: registrar, namespace: unrelated } }
+        - &rFederation { apiVersion: rabbitmq.com/v1beta1, kind: Federation, metadata: { name: registrar, namespace: unrelated } }
+        - &rOperatorPolicy { apiVersion: rabbitmq.com/v1beta1, kind: OperatorPolicy, metadata: { name: registrar, namespace: unrelated } }
+        - &rPermission { apiVersion: rabbitmq.com/v1beta1, kind: Permission, metadata: { name: registrar, namespace: unrelated } }
+        - &rPolicy { apiVersion: rabbitmq.com/v1beta1, kind: Policy, metadata: { name: registrar, namespace: unrelated } }
+        - &rQueue { apiVersion: rabbitmq.com/v1beta1, kind: Queue, metadata: { name: registrar, namespace: unrelated } }
+        - &rSchemaReplication { apiVersion: rabbitmq.com/v1beta1, kind: SchemaReplication, metadata: { name: registrar, namespace: unrelated } }
+        - &rShovel { apiVersion: rabbitmq.com/v1beta1, kind: Shovel, metadata: { name: registrar, namespace: unrelated } }
+        - &rTopicPermission { apiVersion: rabbitmq.com/v1beta1, kind: TopicPermission, metadata: { name: registrar, namespace: unrelated } }
+        - &rUser { apiVersion: rabbitmq.com/v1beta1, kind: User, metadata: { name: registrar, namespace: unrelated } }
+        - &rVhost { apiVersion: rabbitmq.com/v1beta1, kind: Vhost, metadata: { name: registrar, namespace: unrelated } }
+        - &openCluster
+          apiVersion: rabbitmq.com/v1beta1
+          kind: RabbitmqCluster
+          metadata: { name: myrabbitmq, namespace: tenant-test }
+          spec:
+            tls:
+              secretName: myrabbitmq-tls
+        - apiVersion: rabbitmq.com/v1beta1
+          kind: User
+          metadata: { name: myrabbitmq-alice, namespace: tenant-test }
+          spec: { rabbitmqClusterReference: { name: myrabbitmq } }
+    set:
+      tls.enabled: true
+      tls.disableNonTLSListeners: true
+    asserts:
+      - failedTemplate:
+          errorPattern: "cannot be turned on while this release still has topology objects in namespace tenant-test: User/myrabbitmq-alice\\."
+
+  # The chart creates User, Vhost and Permission and nothing else, so a kind it
+  # never declares is what separates "the guard covers the objects this chart
+  # owns" from "the guard covers the objects that wedge". Dropping Queue from
+  # rabbitmq.topology.kinds turns this case red and leaves the rest green.
+  - it: refuses on a Queue, a kind the chart never creates
+    kubernetesProvider:
+      scheme: *topologyScheme
+      objects:
+        - *rBinding
+        - *rExchange
+        - *rFederation
+        - *rOperatorPolicy
+        - *rPermission
+        - *rPolicy
+        - *rQueue
+        - *rSchemaReplication
+        - *rShovel
+        - *rTopicPermission
+        - *rUser
+        - *rVhost
+        - apiVersion: rabbitmq.com/v1beta1
+          kind: Queue
+          metadata: { name: orders-inbound, namespace: tenant-test }
+          spec: { rabbitmqClusterReference: { name: myrabbitmq } }
+    set:
+      tls.enabled: true
+      tls.disableNonTLSListeners: true
+    asserts:
+      - failedTemplate:
+          errorPattern: "in namespace tenant-test: Queue/orders-inbound\\."
+
+  - it: names every pending object across the kinds it finds
+    kubernetesProvider:
+      scheme: *topologyScheme
+      objects:
+        - *rBinding
+        - *rExchange
+        - *rFederation
+        - *rOperatorPolicy
+        - *rPermission
+        - *rPolicy
+        - *rQueue
+        - *rSchemaReplication
+        - *rShovel
+        - *rTopicPermission
+        - *rUser
+        - *rVhost
+        - apiVersion: rabbitmq.com/v1beta1
+          kind: User
+          metadata: { name: myrabbitmq-alice, namespace: tenant-test }
+          spec: { rabbitmqClusterReference: { name: myrabbitmq } }
+        - apiVersion: rabbitmq.com/v1beta1
+          kind: Vhost
+          metadata: { name: myrabbitmq-orders, namespace: tenant-test }
+          spec: { rabbitmqClusterReference: { name: myrabbitmq } }
+        - apiVersion: rabbitmq.com/v1beta1
+          kind: Permission
+          metadata: { name: myrabbitmq-orders-alice, namespace: tenant-test }
+          spec: { rabbitmqClusterReference: { name: myrabbitmq } }
+        - apiVersion: rabbitmq.com/v1beta1
+          kind: Shovel
+          metadata: { name: myrabbitmq-mirror, namespace: tenant-test }
+          spec: { rabbitmqClusterReference: { name: myrabbitmq } }
+    set:
+      tls.enabled: true
+      tls.disableNonTLSListeners: true
+    asserts:
+      - failedTemplate:
+          errorPattern: "Permission/myrabbitmq-orders-alice, Shovel/myrabbitmq-mirror, User/myrabbitmq-alice, Vhost/myrabbitmq-orders"
+
+  - it: refuses on a hand-written Vhost the chart never declared
+    kubernetesProvider:
+      scheme: *topologyScheme
+      objects:
+        - *rBinding
+        - *rExchange
+        - *rFederation
+        - *rOperatorPolicy
+        - *rPermission
+        - *rPolicy
+        - *rQueue
+        - *rSchemaReplication
+        - *rShovel
+        - *rTopicPermission
+        - *rUser
+        - *rVhost
+        - apiVersion: rabbitmq.com/v1beta1
+          kind: Vhost
+          metadata: { name: written-by-hand, namespace: tenant-test }
+          spec: { rabbitmqClusterReference: { name: myrabbitmq } }
+    set:
+      tls.enabled: true
+      tls.disableNonTLSListeners: true
+    asserts:
+      - failedTemplate:
+          errorPattern: "in namespace tenant-test: Vhost/written-by-hand\\."
+
+  - it: spells out the two-upgrade order and the confirmation command
+    kubernetesProvider:
+      scheme: *topologyScheme
+      objects:
+        - *rBinding
+        - *rExchange
+        - *rFederation
+        - *rOperatorPolicy
+        - *rPermission
+        - *rPolicy
+        - *rQueue
+        - *rSchemaReplication
+        - *rShovel
+        - *rTopicPermission
+        - *rUser
+        - *rVhost
+        - apiVersion: rabbitmq.com/v1beta1
+          kind: User
+          metadata: { name: myrabbitmq-alice, namespace: tenant-test }
+          spec: { rabbitmqClusterReference: { name: myrabbitmq } }
+    set:
+      tls.enabled: true
+      tls.disableNonTLSListeners: true
+    asserts:
+      - failedTemplate:
+          errorPattern: "Remove them in one upgrade"
+      - failedTemplate:
+          errorPattern: "Setting both at once leaves those objects stuck in Terminating"
+      # The command names every kind the guard itself looks at, so an operator
+      # who reruns it sees the same set the refusal was computed from.
+      - failedTemplate:
+          errorPattern: "kubectl get bindings\\.rabbitmq\\.com,exchanges\\.rabbitmq\\.com,federations\\.rabbitmq\\.com,operatorpolicies\\.rabbitmq\\.com,permissions\\.rabbitmq\\.com,policies\\.rabbitmq\\.com,queues\\.rabbitmq\\.com,schemareplications\\.rabbitmq\\.com,shovels\\.rabbitmq\\.com,topicpermissions\\.rabbitmq\\.com,users\\.rabbitmq\\.com,vhosts\\.rabbitmq\\.com --namespace tenant-test"
+      - failedTemplate:
+          errorPattern: "See README .Removing the topology objects is its own upgrade."
+
+  # -----------------------------------------------------------------------
+  # Silent paths: the refusal must not outlive the transition it guards.
+  # -----------------------------------------------------------------------
+
+  - it: ignores topology objects belonging to another release in the same namespace
+    kubernetesProvider:
+      scheme: *topologyScheme
+      objects:
+        - *rBinding
+        - *rExchange
+        - *rFederation
+        - *rOperatorPolicy
+        - *rPermission
+        - *rPolicy
+        - *rQueue
+        - *rSchemaReplication
+        - *rShovel
+        - *rTopicPermission
+        - *rUser
+        - *rVhost
+        - apiVersion: rabbitmq.com/v1beta1
+          kind: User
+          metadata: { name: othermq-alice, namespace: tenant-test }
+          spec: { rabbitmqClusterReference: { name: othermq } }
+        - apiVersion: rabbitmq.com/v1beta1
+          kind: Queue
+          metadata: { name: othermq-inbound, namespace: tenant-test }
+          spec: { rabbitmqClusterReference: { name: othermq } }
+    set:
+      tls.enabled: true
+      tls.disableNonTLSListeners: true
+    documentSelector:
+      path: kind
+      value: RabbitmqCluster
+    asserts:
+      - equal:
+          path: spec.tls.disableNonTLSListeners
+          value: true
+
+  - it: renders once the live cluster already has the listeners closed, even with a stray User
+    kubernetesProvider:
+      scheme: *topologyScheme
+      objects:
+        - *rBinding
+        - *rExchange
+        - *rFederation
+        - *rOperatorPolicy
+        - *rPermission
+        - *rPolicy
+        - *rQueue
+        - *rSchemaReplication
+        - *rShovel
+        - *rTopicPermission
+        - *rUser
+        - *rVhost
+        - apiVersion: rabbitmq.com/v1beta1
+          kind: RabbitmqCluster
+          metadata: { name: myrabbitmq, namespace: tenant-test }
+          spec:
+            tls:
+              secretName: myrabbitmq-tls
+              disableNonTLSListeners: true
+        - apiVersion: rabbitmq.com/v1beta1
+          kind: User
+          metadata: { name: created-later-by-the-tenant, namespace: tenant-test }
+          spec: { rabbitmqClusterReference: { name: myrabbitmq } }
+    set:
+      tls.enabled: true
+      tls.disableNonTLSListeners: true
+    documentSelector:
+      path: kind
+      value: RabbitmqCluster
+    asserts:
+      - equal:
+          path: spec.tls.disableNonTLSListeners
+          value: true
+
+  - it: renders on a fresh install where no topology object exists yet
+    kubernetesProvider:
+      scheme: *topologyScheme
+      objects:
+        - *rBinding
+        - *rExchange
+        - *rFederation
+        - *rOperatorPolicy
+        - *rPermission
+        - *rPolicy
+        - *rQueue
+        - *rSchemaReplication
+        - *rShovel
+        - *rTopicPermission
+        - *rUser
+        - *rVhost
+    set:
+      tls.enabled: true
+      tls.disableNonTLSListeners: true
+    documentSelector:
+      path: kind
+      value: RabbitmqCluster
+    asserts:
+      - equal:
+          path: spec.tls.disableNonTLSListeners
+          value: true
+
+  - it: renders without a cluster to query, as helm template and a dry run do
+    set:
+      tls.enabled: true
+      tls.disableNonTLSListeners: true
+    documentSelector:
+      path: kind
+      value: RabbitmqCluster
+    asserts:
+      - equal:
+          path: spec.tls.disableNonTLSListeners
+          value: true
+
+  - it: leaves a release that never sets the flag untouched by the lookup
+    kubernetesProvider:
+      scheme: *topologyScheme
+      objects:
+        - *rBinding
+        - *rExchange
+        - *rFederation
+        - *rOperatorPolicy
+        - *rPermission
+        - *rPolicy
+        - *rQueue
+        - *rSchemaReplication
+        - *rShovel
+        - *rTopicPermission
+        - *rUser
+        - *rVhost
+        - apiVersion: rabbitmq.com/v1beta1
+          kind: User
+          metadata: { name: myrabbitmq-alice, namespace: tenant-test }
+          spec: { rabbitmqClusterReference: { name: myrabbitmq } }
+    set:
+      tls.enabled: true
+    documentSelector:
+      path: kind
+      value: RabbitmqCluster
+    asserts:
+      - notExists:
+          path: spec.tls.disableNonTLSListeners
+
+  # -----------------------------------------------------------------------
+  # The values-level refusal keeps its own job and now states the order.
+  # -----------------------------------------------------------------------
+
+  - it: still refuses on declared users before any lookup happens
+    set:
+      tls.enabled: true
+      tls.disableNonTLSListeners: true
+      users:
+        alice: {}
+    asserts:
+      - failedTemplate:
+          errorPattern: "cannot be combined with users or vhosts"
+      - failedTemplate:
+          errorPattern: "two separate upgrades, in that order"
+      - failedTemplate:
+          errorPattern: "and from deleting them"
+      - failedTemplate:
+          errorPattern: "Every other kind that operator owns breaks the same way"
diff --git a/packages/apps/rabbitmq/tests/fixtures/tls_default_values.yaml b/packages/apps/rabbitmq/tests/fixtures/tls_default_values.yaml
new file mode 100644
index 0000000000..4130ec1d7d
--- /dev/null
+++ b/packages/apps/rabbitmq/tests/fixtures/tls_default_values.yaml
@@ -0,0 +1,5 @@
+# Fixture that reproduces the default values.yaml state for tls.enabled.
+# tls.enabled is intentionally omitted here so that helm-unittest does not
+# inject any value and the template resolves it the way an unedited chart does:
+# TLS off, regardless of .Values.external.
+tls: {}
diff --git a/packages/apps/rabbitmq/tests/rabbitmq_tls_test.yaml b/packages/apps/rabbitmq/tests/rabbitmq_tls_test.yaml
new file mode 100644
index 0000000000..9a7dbd4634
--- /dev/null
+++ b/packages/apps/rabbitmq/tests/rabbitmq_tls_test.yaml
@@ -0,0 +1,526 @@
+suite: RabbitMQ TLS spec wiring
+
+templates:
+  - templates/rabbitmq.yaml
+
+tests:
+  # -----------------------------------------------------------------------
+  # No TLS: spec.tls absent
+  # -----------------------------------------------------------------------
+
+  - it: does not set spec.tls when tls.enabled is false
+    release:
+      name: myrabbitmq
+      namespace: tenant-test
+    set:
+      tls.enabled: false
+      external: false
+    documentSelector:
+      path: kind
+      value: RabbitmqCluster
+    asserts:
+      - notExists:
+          path: spec.tls
+
+  - it: does not include management ssl config when tls.enabled is false
+    release:
+      name: myrabbitmq
+      namespace: tenant-test
+    set:
+      tls.enabled: false
+      external: false
+    documentSelector:
+      path: kind
+      value: RabbitmqCluster
+    asserts:
+      - notExists:
+          path: spec.rabbitmq.additionalConfig
+
+  # -----------------------------------------------------------------------
+  # TLS enabled: spec.tls wired
+  # -----------------------------------------------------------------------
+
+  - it: sets spec.tls.secretName to release-tls when tls.enabled is true
+    release:
+      name: myrabbitmq
+      namespace: tenant-test
+    set:
+      tls.enabled: true
+      external: false
+    documentSelector:
+      path: kind
+      value: RabbitmqCluster
+    asserts:
+      - equal:
+          path: spec.tls.secretName
+          value: myrabbitmq-tls
+
+  - it: does not set disableNonTLSListeners when tls.enabled is true
+    release:
+      name: myrabbitmq
+      namespace: tenant-test
+    set:
+      tls.enabled: true
+      external: false
+    documentSelector:
+      path: kind
+      value: RabbitmqCluster
+    asserts:
+      - notExists:
+          path: spec.tls.disableNonTLSListeners
+
+  # The operator's own defaultTLSConf supplies ssl_options.certfile/keyfile,
+  # listeners.ssl.default and management.ssl.certfile/keyfile/port once
+  # spec.tls.secretName is set, so the chart restates none of them and renders no
+  # additionalConfig at all.
+
+  - it: adds no additionalConfig, since the operator supplies the TLS config itself
+    release:
+      name: myrabbitmq
+      namespace: tenant-test
+    set:
+      tls.enabled: true
+      external: false
+    documentSelector:
+      path: kind
+      value: RabbitmqCluster
+    asserts:
+      # defaultTLSConf already gives ssl_options.certfile/keyfile,
+      # listeners.ssl.default and management.ssl.certfile/keyfile/port once
+      # spec.tls.secretName is set. No cacertfile on either listener either: it
+      # would only matter for verifying CLIENT certificates, which also needs
+      # verify_peer and fail_if_no_peer_cert.
+      - notExists:
+          path: spec.rabbitmq
+
+  - it: never sets disableNonTLSListeners, so plaintext listeners survive TLS
+    release:
+      name: myrabbitmq
+      namespace: tenant-test
+    values:
+      - fixtures/tls_default_values.yaml
+    set:
+      external: true
+      _namespace.host: example.com
+    documentSelector:
+      path: kind
+      value: RabbitmqCluster
+    asserts:
+      - notExists:
+          path: spec.tls.disableNonTLSListeners
+
+  # -----------------------------------------------------------------------
+  # Default: external=true, tls.enabled not set => TLS stays off.
+  #
+  # `external` publishes the broker; it does not encrypt it. Wiring
+  # spec.tls.secretName here would make the operator rewrite the `port` key of
+  # <release>-default-user from 5672 to 5671, moving every client that reads its
+  # endpoint from that binding onto TLS without anyone asking for it.
+  # -----------------------------------------------------------------------
+
+  - it: leaves TLS off when tls.enabled is unset and external is true
+    release:
+      name: myrabbitmq
+      namespace: tenant-test
+    values:
+      - fixtures/tls_default_values.yaml
+    set:
+      external: true
+      _namespace.host: example.com
+    documentSelector:
+      path: kind
+      value: RabbitmqCluster
+    asserts:
+      - notExists:
+          path: spec.tls
+
+  # -----------------------------------------------------------------------
+  # Explicit tls.enabled=false with external=true is off for the same reason
+  # -----------------------------------------------------------------------
+
+  - it: disables TLS when tls.enabled is false even if external is true
+    release:
+      name: myrabbitmq
+      namespace: tenant-test
+    set:
+      tls.enabled: false
+      external: true
+      _namespace.host: example.com
+    documentSelector:
+      path: kind
+      value: RabbitmqCluster
+    asserts:
+      - notExists:
+          path: spec.tls
+      - notExists:
+          path: spec.rabbitmq.additionalConfig
+
+  # -----------------------------------------------------------------------
+  # B1: no spec.override.service is rendered, in any combination.
+  #
+  # Not a TLS-only port list: the merge is a strategic merge patch keyed on
+  # `port`, which can add or mutate an entry but never delete one, so omitting
+  # amqp:5672 would be a no-op that reads like a guarantee to close plaintext.
+  #
+  # And not a re-added prometheus:15692 either, even though enabling TLS swaps the
+  # published metrics port to prometheus-tls:15691. Adding it back would churn:
+  # updatePorts keeps only operator-known port NAMES and carries their NodePort
+  # across, so each reconcile drops the re-added entry and the override reinstates
+  # it with nodePort unset; on a LoadBalancer the apiserver reallocates, and the
+  # write retriggers the operator's Service watch. ClusterIP escapes only because
+  # NodePorts are zeroed there. external:true is the default TLS path, so that is
+  # the configuration that would loop.
+  # -----------------------------------------------------------------------
+
+  - it: no service override is rendered when TLS is on and external is false
+    release:
+      name: myrabbitmq
+      namespace: tenant-test
+    set:
+      tls.enabled: true
+      external: false
+    documentSelector:
+      path: kind
+      value: RabbitmqCluster
+    asserts:
+      - notExists:
+          path: spec.override.service
+
+  - it: no service override is rendered when TLS and external are both on
+    release:
+      name: myrabbitmq
+      namespace: tenant-test
+    values:
+      - fixtures/tls_default_values.yaml
+    set:
+      external: true
+      _namespace.host: example.com
+    documentSelector:
+      path: kind
+      value: RabbitmqCluster
+    asserts:
+      # The LoadBalancer path specifically: a port entry here would be
+      # reallocated on every reconcile.
+      - notExists:
+          path: spec.override.service
+
+  - it: no service override is rendered when external is on but TLS is off
+    release:
+      name: myrabbitmq
+      namespace: tenant-test
+    set:
+      tls.enabled: false
+      external: true
+      _namespace.host: example.com
+    documentSelector:
+      path: kind
+      value: RabbitmqCluster
+    asserts:
+      - notExists:
+          path: spec.override.service
+
+  - it: the statefulSet override is still rendered, so override itself is not empty
+    release:
+      name: myrabbitmq
+      namespace: tenant-test
+    values:
+      - fixtures/tls_default_values.yaml
+    set:
+      external: true
+      _namespace.host: example.com
+    documentSelector:
+      path: kind
+      value: RabbitmqCluster
+    asserts:
+      - exists:
+          path: spec.override.statefulSet
+
+  # -----------------------------------------------------------------------
+  # Inter-node Erlang distribution TLS scope boundary
+  #
+  # This chart wires TLS for AMQP (5671), management HTTPS (15671), and the
+  # cert-manager chain. Inter-node Erlang distribution (port 25672) is NOT
+  # covered. The operator exposes exactly three TLS fields — secretName,
+  # caSecretName and disableNonTLSListeners — and none of them governs 25672,
+  # which the operator carries on the headless Service unconditionally.
+  # caSecretName is client-certificate verification on the client-facing
+  # listeners, not a distribution setting.
+  # -----------------------------------------------------------------------
+
+  - it: leaves caSecretName unset, so clients are never asked for a certificate
+    release:
+      name: myrabbitmq
+      namespace: tenant-test
+    set:
+      tls.enabled: true
+    documentSelector:
+      path: kind
+      value: RabbitmqCluster
+    asserts:
+      - notExists:
+          path: spec.tls.caSecretName
+
+  # -----------------------------------------------------------------------
+  # Baseline (no TLS): RabbitmqCluster always renders
+  # -----------------------------------------------------------------------
+
+
+  # -----------------------------------------------------------------------
+  # messaging-topology-operator must keep using the plaintext management port.
+  #
+  # spec.tls.secretName makes RabbitmqCluster.TLSEnabled() true, and the topology
+  # operator then computes useTLSForConnection = TLSEnabled() && (!connectUsingHTTP
+  # || DisableNonTLSListeners()). connectUsingHTTP comes from
+  # CONNECT_USING_PLAIN_HTTP, which the cozystack Deployment does not set, so it
+  # would dial https://...:15671 and verify against x509.SystemCertPool() — which
+  # cannot contain a per-release self-signed CA. Every User, Vhost and Permission
+  # this chart renders would fail with "certificate signed by unknown authority".
+  # The annotation makes extractURIandScheme report tlsEnabled=false.
+  # -----------------------------------------------------------------------
+
+  - it: pins the operator connection to plaintext management when TLS is on
+    release:
+      name: myrabbitmq
+      namespace: tenant-test
+    set:
+      tls.enabled: true
+      external: false
+    documentSelector:
+      path: kind
+      value: RabbitmqCluster
+    asserts:
+      - equal:
+          path: metadata.annotations["rabbitmq.com/operator-connection-uri"]
+          value: "http://myrabbitmq.tenant-test.svc.cozy.local:15672"
+
+  - it: builds the operator connection URI from the cluster domain, not a literal
+    release:
+      name: myrabbitmq
+      namespace: tenant-test
+    set:
+      tls.enabled: true
+      external: false
+      _cluster.cluster-domain: custom.example
+    documentSelector:
+      path: kind
+      value: RabbitmqCluster
+    asserts:
+      # Every other assertion on this annotation runs on the default domain, so a
+      # hardcoded cozy.local would satisfy them all. On a cluster that sets its
+      # own cluster-domain that URI does not resolve, and messaging-topology-
+      # operator loses the broker entirely — no User, Vhost or Permission
+      # reconciles. This is the case that tells the two apart.
+      - equal:
+          path: metadata.annotations["rabbitmq.com/operator-connection-uri"]
+          value: "http://myrabbitmq.tenant-test.svc.custom.example:15672"
+
+  - it: pins the operator connection on the external path too
+    release:
+      name: myrabbitmq
+      namespace: tenant-test
+    set:
+      tls.enabled: true
+      external: true
+      _namespace.host: example.com
+    documentSelector:
+      path: kind
+      value: RabbitmqCluster
+    asserts:
+      - equal:
+          path: metadata.annotations["rabbitmq.com/operator-connection-uri"]
+          value: "http://myrabbitmq.tenant-test.svc.cozy.local:15672"
+
+  - it: uses an http scheme, since https would fail against the system cert pool
+    release:
+      name: myrabbitmq
+      namespace: tenant-test
+    set:
+      tls.enabled: true
+      external: false
+    documentSelector:
+      path: kind
+      value: RabbitmqCluster
+    asserts:
+      - matchRegex:
+          path: metadata.annotations["rabbitmq.com/operator-connection-uri"]
+          pattern: "^http://"
+
+  - it: adds no connection annotation when TLS is off
+    release:
+      name: myrabbitmq
+      namespace: tenant-test
+    set:
+      tls.enabled: false
+      external: false
+    documentSelector:
+      path: kind
+      value: RabbitmqCluster
+    asserts:
+      # Without TLS the operator already uses plaintext; pinning would only
+      # hardcode a URI the operator derives correctly on its own.
+      - notExists:
+          path: metadata.annotations["rabbitmq.com/operator-connection-uri"]
+
+  # -----------------------------------------------------------------------
+  # tls.disableNonTLSListeners: opt-in, and refused where it would break.
+  #
+  # The flag writes `listeners.tcp = none` into rabbitmq.conf — broker level, so
+  # in-cluster clients lose plaintext at the same instant external ones do. It
+  # stays off unless asked for, so enabling TLS never closes a working listener.
+  #
+  # It also forces messaging-topology-operator onto TLS regardless of how that
+  # operator is configured, because its expression is
+  #   TLSEnabled() && (!connectUsingHTTP || DisableNonTLSListeners())
+  # and it then verifies against the system trust pool, which cannot hold a
+  # per-release CA. Pinning it back to plaintext is no escape — that is the port
+  # the flag closes. So the combination with users/vhosts is refused at render
+  # time instead of failing silently on the cluster.
+  # -----------------------------------------------------------------------
+
+  - it: does not set disableNonTLSListeners by default when TLS is on
+    release:
+      name: myrabbitmq
+      namespace: tenant-test
+    set:
+      tls.enabled: true
+      external: false
+    documentSelector:
+      path: kind
+      value: RabbitmqCluster
+    asserts:
+      - notExists:
+          path: spec.tls.disableNonTLSListeners
+
+  - it: sets disableNonTLSListeners when explicitly opted in
+    release:
+      name: myrabbitmq
+      namespace: tenant-test
+    set:
+      tls.enabled: true
+      external: false
+      tls.disableNonTLSListeners: true
+    documentSelector:
+      path: kind
+      value: RabbitmqCluster
+    asserts:
+      - equal:
+          path: spec.tls.disableNonTLSListeners
+          value: true
+
+  - it: refuses the flag when TLS is explicitly off
+    release:
+      name: myrabbitmq
+      namespace: tenant-test
+    set:
+      tls.enabled: false
+      external: false
+      tls.disableNonTLSListeners: true
+    asserts:
+      # Dropping the request silently would render a healthy-looking cluster with
+      # every plaintext listener open. The operator rejects this combination too,
+      # and at least leaves a TLSError event; a swallowed flag leaves nothing.
+      - failedTemplate:
+          errorPattern: "would leave no listener at all"
+
+  - it: refuses the flag when tls.enabled is left at its default
+    release:
+      name: myrabbitmq
+      namespace: tenant-test
+    set:
+      external: false
+      tls.disableNonTLSListeners: true
+    asserts:
+      # The likeliest way in: hardening a broker by setting only the flag and
+      # assuming it implies TLS. tls.enabled is unset here, so it resolves to
+      # false and the flag would close the only listeners there are.
+      - failedTemplate:
+          errorPattern: "would leave no listener at all"
+
+  - it: refuses the flag when tls.enabled is left at its default and external is true
+    release:
+      name: myrabbitmq
+      namespace: tenant-test
+    set:
+      external: true
+      _namespace.host: example.com
+      tls.disableNonTLSListeners: true
+    asserts:
+      # Same refusal on the published path: external does not supply the TLS
+      # that this flag needs, so it is still a request to close every listener.
+      - failedTemplate:
+          errorPattern: "would leave no listener at all"
+
+  - it: drops the operator connection annotation when the plaintext port is closed
+    release:
+      name: myrabbitmq
+      namespace: tenant-test
+    set:
+      tls.enabled: true
+      external: false
+      tls.disableNonTLSListeners: true
+    documentSelector:
+      path: kind
+      value: RabbitmqCluster
+    asserts:
+      # Pointing the operator at a port this flag just closed would be a
+      # connection refused dressed up as configuration.
+      - notExists:
+          path: metadata.annotations["rabbitmq.com/operator-connection-uri"]
+
+  - it: refuses the flag combined with users
+    release:
+      name: myrabbitmq
+      namespace: tenant-test
+    set:
+      tls.enabled: true
+      tls.disableNonTLSListeners: true
+      users.alice.password: hackme
+    asserts:
+      - failedTemplate:
+          errorPattern: "cannot be combined with users or vhosts"
+
+  - it: refuses the flag combined with vhosts
+    release:
+      name: myrabbitmq
+      namespace: tenant-test
+    set:
+      tls.enabled: true
+      tls.disableNonTLSListeners: true
+      vhosts.myapp.roles.admin[0]: alice
+    asserts:
+      - failedTemplate:
+          errorPattern: "cannot be combined with users or vhosts"
+
+  - it: does not offer hand-written topology objects as the way around the refusal
+    release:
+      name: myrabbitmq
+      namespace: tenant-test
+    set:
+      tls.enabled: true
+      tls.disableNonTLSListeners: true
+      users.alice.password: hackme
+    asserts:
+      # The message used to say "manage users and vhosts outside the chart",
+      # which reads as "move them into hand-written CRs". That does not work:
+      # useTLSForConnection is derived from the RabbitmqCluster, not from who
+      # created the topology CR, so those objects fail the same way with no
+      # refusal to warn anyone. Pin the correction so it cannot drift back.
+      - failedTemplate:
+          errorPattern: "it reads the RabbitmqCluster and not who created the CR"
+      - failedTemplate:
+          errorPattern: "rabbitmqctl or a definitions import"
+
+  - it: allows the flag when the chart is asked to manage no users or vhosts
+    release:
+      name: myrabbitmq
+      namespace: tenant-test
+    set:
+      tls.enabled: true
+      tls.disableNonTLSListeners: true
+    documentSelector:
+      path: kind
+      value: RabbitmqCluster
+    asserts:
+      - equal:
+          path: spec.tls.disableNonTLSListeners
+          value: true
diff --git a/packages/apps/rabbitmq/tests/resources_test.yaml b/packages/apps/rabbitmq/tests/resources_test.yaml
new file mode 100644
index 0000000000..20d23fe0f8
--- /dev/null
+++ b/packages/apps/rabbitmq/tests/resources_test.yaml
@@ -0,0 +1,77 @@
+suite: RabbitMQ default resources
+
+templates:
+  - templates/rabbitmq.yaml
+
+tests:
+  - it: defaults each RabbitMQ replica to the s1.nano preset
+    release:
+      name: rabbitmq-test
+      namespace: tenant-test
+    asserts:
+      - equal:
+          path: spec.resources.limits.cpu
+          value: 250m
+      - equal:
+          path: spec.resources.limits.memory
+          value: 512Mi
+      - equal:
+          path: spec.resources.requests.cpu
+          value: "0.025"
+      - equal:
+          path: spec.resources.requests.memory
+          value: "536870912"
+
+  - it: preserves t1.nano as an explicit backward-compatible override
+    release:
+      name: rabbitmq-test
+      namespace: tenant-test
+    set:
+      resourcesPreset: t1.nano
+    asserts:
+      - equal:
+          path: spec.resources.limits.cpu
+          value: 250m
+      - equal:
+          path: spec.resources.limits.memory
+          value: 128Mi
+
+  - it: prefers explicit resources over the default preset
+    release:
+      name: rabbitmq-test
+      namespace: tenant-test
+    set:
+      resources:
+        cpu: 700m
+        memory: 2Gi
+    asserts:
+      - equal:
+          path: spec.resources.limits.cpu
+          value: 700m
+      - equal:
+          path: spec.resources.limits.memory
+          value: 2Gi
+      - equal:
+          path: spec.resources.requests.cpu
+          value: "0.07"
+      - equal:
+          path: spec.resources.requests.memory
+          value: "2147483648"
+
+  - it: fills the preset into every resource a partial resources map leaves unset
+    release:
+      name: rabbitmq-test
+      namespace: tenant-test
+    set:
+      resources:
+        cpu: 700m
+    asserts:
+      - equal:
+          path: spec.resources.limits.cpu
+          value: 700m
+      - equal:
+          path: spec.resources.limits.memory
+          value: 512Mi
+      - equal:
+          path: spec.resources.requests.memory
+          value: "536870912"
diff --git a/packages/apps/rabbitmq/tests/tenant_projection_test.yaml b/packages/apps/rabbitmq/tests/tenant_projection_test.yaml
new file mode 100644
index 0000000000..01337cc678
--- /dev/null
+++ b/packages/apps/rabbitmq/tests/tenant_projection_test.yaml
@@ -0,0 +1,116 @@
+suite: RabbitMQ TenantProjection sentinel
+
+# The chart renders one TenantProjection per TLS-enabled release: the
+# declaration that tells the CA-extraction controller to lift ca.crt out of the
+# key-bearing <release>-ca into the tenant-readable <release>.tenant-ca
+# projection. Without this sentinel the controller has no source to read, so
+# <release>.tenant-ca is never created and the Role's careful exclusion of the
+# key-bearing Secrets (dashboard_resourcemap_test.yaml) buys the tenant no
+# actual path to the CA.
+#
+# The load-bearing invariant is the ABSENCE of ownerReferences. The sentinel must
+# carry none — it owns the projection, and it is itself owned only through the
+# helm.toolkit.fluxcd.io/name label Flux stamps, which is how the lineage webhook
+# resolves the application. An ownerReference here would short-circuit that walk
+# and silently break the tenant's read path (pkg/lineage/lineage.go).
+
+templates:
+  - templates/tenant-projection.yaml
+
+tests:
+  - it: renders exactly one TenantProjection named after the release
+    release:
+      name: myrabbitmq
+      namespace: tenant-test
+    set:
+      tls.enabled: true
+    asserts:
+      - hasDocuments:
+          count: 1
+      - isKind:
+          of: TenantProjection
+      - equal:
+          path: apiVersion
+          value: internal.cozystack.io/v1alpha1
+      - equal:
+          path: metadata.name
+          value: myrabbitmq-ca
+
+  - it: declares a CACert projection of the isCA certificate's Secret
+    release:
+      name: myrabbitmq
+      namespace: tenant-test
+    set:
+      tls.enabled: true
+    asserts:
+      - lengthEqual:
+          path: spec.projections
+          count: 1
+      - equal:
+          path: spec.projections[0].type
+          value: CACert
+      - equal:
+          path: spec.projections[0].sourceSecretName
+          value: myrabbitmq-ca
+      - equal:
+          path: spec.projections[0].sourceKey
+          value: ca.crt
+
+  - it: carries no ownerReferences, so the lineage walk reaches the helm label
+    release:
+      name: myrabbitmq
+      namespace: tenant-test
+    set:
+      tls.enabled: true
+    asserts:
+      - notExists:
+          path: metadata.ownerReferences
+
+  - it: omits namespace and chart-added labels, matching the shared sentinel shape
+    release:
+      name: myrabbitmq
+      namespace: tenant-test
+    set:
+      tls.enabled: true
+    asserts:
+      - notExists:
+          path: metadata.namespace
+      - notExists:
+          path: metadata.labels
+
+  - it: renders nothing when TLS is disabled, the default
+    release:
+      name: myrabbitmq
+      namespace: tenant-test
+    set:
+      tls.enabled: false
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  # Unlike nats and qdrant, this chart's TLS is opt-in only and never follows
+  # external — see README "TLS scope" and rabbitmq.tls.enabled — so external
+  # alone must not render the sentinel either.
+  - it: renders nothing when external is true but tls.enabled is not set
+    release:
+      name: myrabbitmq
+      namespace: tenant-test
+    set:
+      external: true
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  - it: renders the source name from the release, not a fixed string
+    release:
+      name: other-rabbitmq
+      namespace: tenant-test
+    set:
+      tls.enabled: true
+    asserts:
+      - equal:
+          path: metadata.name
+          value: other-rabbitmq-ca
+      - equal:
+          path: spec.projections[0].sourceSecretName
+          value: other-rabbitmq-ca
diff --git a/packages/apps/rabbitmq/tests/tls_resolution_test.yaml b/packages/apps/rabbitmq/tests/tls_resolution_test.yaml
new file mode 100644
index 0000000000..c4ced2103e
--- /dev/null
+++ b/packages/apps/rabbitmq/tests/tls_resolution_test.yaml
@@ -0,0 +1,154 @@
+suite: RabbitMQ TLS resolution agreement across templates
+
+# rabbitmq.yaml, certmanager.yaml and tenant-projection.yaml all branch on
+# whether TLS is on, through the shared rabbitmq.tls.enabled helper. These tests
+# render all three templates across every external x tls.enabled combination and
+# assert they reach the SAME answer: the certificate chain and the sentinel that
+# publishes its CA must exist exactly when the cluster asks the operator to
+# serve TLS. A chart that issued certificates nobody used, or asked for a Secret
+# that was never created, would pass each template's own suite and fail here —
+# and so would one that issues the CA but never tells the CA-extraction
+# controller to publish it.
+#
+# The combinations also pin that `external` is not an input to the answer. TLS is
+# opt-in: only tls.enabled turns it on.
+#
+# certmanager.yaml renders 4 documents when TLS is on (selfsigned Issuer, CA
+# Certificate, CA Issuer, leaf Certificate) and 0 when it is off.
+# tenant-projection.yaml renders 1 document (the TenantProjection sentinel) when
+# TLS is on and 0 when it is off.
+
+templates:
+  - templates/rabbitmq.yaml
+  - templates/certmanager.yaml
+  - templates/tenant-projection.yaml
+
+tests:
+  # --- TLS ON: only tls.enabled: true does it ---
+
+  - it: both templates turn TLS on when explicitly enabled
+    release: {name: myrabbitmq, namespace: tenant-test}
+    set: {tls.enabled: true, external: false}
+    asserts:
+      - equal:
+          path: spec.tls.secretName
+          value: myrabbitmq-tls
+        template: templates/rabbitmq.yaml
+        documentSelector: {path: kind, value: RabbitmqCluster}
+      - hasDocuments: {count: 4}
+        template: templates/certmanager.yaml
+      - hasDocuments: {count: 1}
+        template: templates/tenant-projection.yaml
+
+  - it: both templates turn TLS on when explicitly enabled alongside external
+    release: {name: myrabbitmq, namespace: tenant-test}
+    set: {tls.enabled: true, external: true, _namespace.host: example.com}
+    asserts:
+      - equal:
+          path: spec.tls.secretName
+          value: myrabbitmq-tls
+        template: templates/rabbitmq.yaml
+        documentSelector: {path: kind, value: RabbitmqCluster}
+      - hasDocuments: {count: 4}
+        template: templates/certmanager.yaml
+      - hasDocuments: {count: 1}
+        template: templates/tenant-projection.yaml
+
+  # --- TLS OFF: both templates must agree there is nothing to do ---
+
+  - it: both templates stay off when both inputs are off
+    release: {name: myrabbitmq, namespace: tenant-test}
+    set: {tls.enabled: false, external: false}
+    asserts:
+      - notExists:
+          path: spec.tls
+        template: templates/rabbitmq.yaml
+        documentSelector: {path: kind, value: RabbitmqCluster}
+      - hasDocuments: {count: 0}
+        template: templates/certmanager.yaml
+      - hasDocuments: {count: 0}
+        template: templates/tenant-projection.yaml
+
+  - it: explicit false with external true is off in BOTH templates
+    release: {name: myrabbitmq, namespace: tenant-test}
+    set: {tls.enabled: false, external: true, _namespace.host: example.com}
+    asserts:
+      - notExists:
+          path: spec.tls
+        template: templates/rabbitmq.yaml
+        documentSelector: {path: kind, value: RabbitmqCluster}
+      - hasDocuments: {count: 0}
+        template: templates/certmanager.yaml
+      - hasDocuments: {count: 0}
+        template: templates/tenant-projection.yaml
+
+  # --- The default is off, and external does not change it. This is the pair
+  # that would go red if inheritance from external were reintroduced. ---
+
+  - it: unset tls.enabled leaves BOTH templates off
+    release: {name: myrabbitmq, namespace: tenant-test}
+    values: [fixtures/tls_default_values.yaml]
+    set: {external: false}
+    asserts:
+      - notExists:
+          path: spec.tls
+        template: templates/rabbitmq.yaml
+        documentSelector: {path: kind, value: RabbitmqCluster}
+      - hasDocuments: {count: 0}
+        template: templates/certmanager.yaml
+      - hasDocuments: {count: 0}
+        template: templates/tenant-projection.yaml
+
+  - it: unset tls.enabled leaves BOTH templates off even when external is true
+    release: {name: myrabbitmq, namespace: tenant-test}
+    values: [fixtures/tls_default_values.yaml]
+    set: {external: true, _namespace.host: example.com}
+    asserts:
+      - notExists:
+          path: spec.tls
+        template: templates/rabbitmq.yaml
+        documentSelector: {path: kind, value: RabbitmqCluster}
+      - hasDocuments: {count: 0}
+        template: templates/certmanager.yaml
+      - hasDocuments: {count: 0}
+        template: templates/tenant-projection.yaml
+
+  # --- null-safety: reachable through a HelmRelease values override, where
+  # structural-schema pruning does not apply ---
+
+  - it: tls set to null resolves to off instead of panicking
+    release: {name: myrabbitmq, namespace: tenant-test}
+    set: {tls: null, external: false}
+    asserts:
+      - notExists:
+          path: spec.tls
+        template: templates/rabbitmq.yaml
+        documentSelector: {path: kind, value: RabbitmqCluster}
+      - hasDocuments: {count: 0}
+        template: templates/certmanager.yaml
+      - hasDocuments: {count: 0}
+        template: templates/tenant-projection.yaml
+
+  - it: tls set to null with external true also resolves to off
+    release: {name: myrabbitmq, namespace: tenant-test}
+    set: {tls: null, external: true, _namespace.host: example.com}
+    asserts:
+      - notExists:
+          path: spec.tls
+        template: templates/rabbitmq.yaml
+        documentSelector: {path: kind, value: RabbitmqCluster}
+      - hasDocuments: {count: 0}
+        template: templates/certmanager.yaml
+      - hasDocuments: {count: 0}
+        template: templates/tenant-projection.yaml
+
+  # A null `enabled` never reaches the template: values.schema.json types it as a
+  # boolean, so Helm rejects it first. That is asserted here rather than in the
+  # helper, so the claim breaks if the schema ever widens.
+
+  - it: tls.enabled set to null is rejected by schema validation
+    release: {name: myrabbitmq, namespace: tenant-test}
+    set: {tls: {enabled: null}, external: false}
+    asserts:
+      - failedTemplate:
+          errorPattern: "at '/tls/enabled': got null, want boolean"
diff --git a/packages/apps/rabbitmq/tests/user_credentials_test.yaml b/packages/apps/rabbitmq/tests/user_credentials_test.yaml
new file mode 100644
index 0000000000..b1a57c8d8d
--- /dev/null
+++ b/packages/apps/rabbitmq/tests/user_credentials_test.yaml
@@ -0,0 +1,43 @@
+suite: RabbitMQ user credentials Secrets
+
+templates:
+  - templates/rabbitmq.yaml
+
+release:
+  name: myrabbitmq
+  namespace: tenant-test
+
+# messaging-topology-operator >= 1.20 caches only Secrets labelled
+# rabbitmq.com/topology-operator=true, and its User admission webhook rejects an
+# importCredentialsSecret that lacks the label. Losing it rejects every User the
+# chart renders.
+
+set:
+  users:
+    alice:
+      password: alicepassword
+    bobSmith:
+      password: bobpassword
+
+tests:
+  - it: points each User at its own credentials Secret
+    documentSelector:
+      path: metadata.name
+      value: myrabbitmq-bob-smith
+    asserts:
+      - isKind:
+          of: User
+      - equal:
+          path: spec.importCredentialsSecret.name
+          value: myrabbitmq-bob-smith-credentials
+
+  - it: labels every credentials Secret for the topology operator's Secret cache
+    documentSelector:
+      path: kind
+      value: Secret
+      matchMany: true
+    asserts:
+      - equal:
+          path: metadata.labels["rabbitmq.com/topology-operator"]
+          value: "true"
+
diff --git a/packages/apps/rabbitmq/values.schema.json b/packages/apps/rabbitmq/values.schema.json
index ddd6a636e3..f4c3087146 100644
--- a/packages/apps/rabbitmq/values.schema.json
+++ b/packages/apps/rabbitmq/values.schema.json
@@ -8,7 +8,7 @@
       "default": 3
     },
     "resources": {
-      "description": "Explicit CPU and memory configuration for each RabbitMQ replica. When omitted, the preset defined in `resourcesPreset` is applied.",
+      "description": "Explicit CPU and memory configuration for each RabbitMQ replica. Every resource left unset here is taken from `resourcesPreset`.",
       "type": "object",
       "default": {},
       "properties": {
@@ -41,9 +41,9 @@
       }
     },
     "resourcesPreset": {
-      "description": "Default sizing preset used when `resources` is omitted.",
+      "description": "Default sizing preset. It supplies every resource `resources` does not set, not only a `resources` left empty entirely.",
       "type": "string",
-      "default": "t1.nano",
+      "default": "s1.nano",
       "enum": [
         "t1.nano",
         "t1.micro",
@@ -117,13 +117,31 @@
           "rule": "self == oldSelf",
           "message": "storageClass is immutable"
         }
-      ]
+      ],
+      "x-cozystack-options": {
+        "source": "storageclass"
+      }
     },
     "external": {
       "description": "Enable external access from outside the cluster.",
       "type": "boolean",
       "default": false
     },
+    "tls": {
+      "description": "TLS configuration. TLS is off unless `tls.enabled` is set to true.",
+      "type": "object",
+      "default": {},
+      "properties": {
+        "disableNonTLSListeners": {
+          "description": "Close the plaintext AMQP (5672) and management (15672) listeners. This is a broker-level switch: it drops in-cluster clients as well as external ones, and it cannot be combined with `users` or `vhosts`. Erlang distribution (25672) and epmd (4369) stay plaintext regardless. Defaults to false.",
+          "type": "boolean"
+        },
+        "enabled": {
+          "description": "Enable TLS for AMQPS (5671) and Management HTTPS (15671). Applies whether or not `external` is set. Plaintext AMQP (5672) and management (15672) keep serving unless `disableNonTLSListeners` is set as well. Moves the `port` key of the `\u003crelease\u003e-default-user` Secret from 5672 to 5671, and the metrics port from 15692 to 15691. Defaults to false.",
+          "type": "boolean"
+        }
+      }
+    },
     "version": {
       "description": "RabbitMQ major.minor version to deploy",
       "type": "string",
diff --git a/packages/apps/rabbitmq/values.yaml b/packages/apps/rabbitmq/values.yaml
index 3bd7201cf8..5973038c60 100644
--- a/packages/apps/rabbitmq/values.yaml
+++ b/packages/apps/rabbitmq/values.yaml
@@ -58,22 +58,33 @@
 ## @param {int} replicas - Number of RabbitMQ replicas.
 replicas: 3
 
-## @param {Resources} [resources] - Explicit CPU and memory configuration for each RabbitMQ replica. When omitted, the preset defined in `resourcesPreset` is applied.
+## @param {Resources} [resources] - Explicit CPU and memory configuration for each RabbitMQ replica. Every resource left unset here is taken from `resourcesPreset`.
 resources: {}
 
-## @param {ResourcesPreset} resourcesPreset="t1.nano" - Default sizing preset used when `resources` is omitted.
-resourcesPreset: "t1.nano"
+## @param {ResourcesPreset} resourcesPreset="s1.nano" - Default sizing preset. It supplies every resource `resources` does not set, not only a `resources` left empty entirely.
+resourcesPreset: "s1.nano"
 
 ## @param {quantity} size - Persistent Volume Claim size available for application data.
 size: 10Gi
 
 ## @param {string} storageClass - StorageClass used to store the data.
 ## @immutable
+## @x-cozystack-options {source: storageclass}
 storageClass: ""
 
 ## @param {bool} external - Enable external access from outside the cluster.
 external: false
 
+## @typedef {struct} TLS - TLS configuration for RabbitMQ.
+## @field {bool} [enabled] - Enable TLS for AMQPS (5671) and Management HTTPS (15671). Applies whether or not `external` is set. Plaintext AMQP (5672) and management (15672) keep serving unless `disableNonTLSListeners` is set as well. Moves the `port` key of the `<release>-default-user` Secret from 5672 to 5671, and the metrics port from 15692 to 15691. Defaults to false.
+## @field {bool} [disableNonTLSListeners] - Close the plaintext AMQP (5672) and management (15672) listeners. This is a broker-level switch: it drops in-cluster clients as well as external ones, and it cannot be combined with `users` or `vhosts`. Erlang distribution (25672) and epmd (4369) stay plaintext regardless. Defaults to false.
+
+## @param {TLS} [tls] - TLS configuration. TLS is off unless `tls.enabled` is set to true.
+## Both fields default to false and neither is inferred from `external`, so an
+## existing instance keeps its listeners and its published connection details
+## until someone edits them. See README "TLS scope" before setting either.
+tls: {}
+
 ##
 ## @enum {string} Version
 ## @value v4.2
diff --git a/packages/apps/redis/Makefile b/packages/apps/redis/Makefile
index 939b75ee13..fed20c1e23 100644
--- a/packages/apps/redis/Makefile
+++ b/packages/apps/redis/Makefile
@@ -1,5 +1,9 @@
 include ../../../hack/package.mk
 
+.PHONY: test
+test:
+	helm unittest .
+
 generate:
 	cozyvalues-gen -m 'redis' -v values.yaml -s values.schema.json -r README.md -g ../../../api/apps/v1alpha1/redis/types.go
 	../../../hack/update-crd.sh
diff --git a/packages/apps/redis/README.md b/packages/apps/redis/README.md
index 57a9d9dbfb..0922bf8217 100644
--- a/packages/apps/redis/README.md
+++ b/packages/apps/redis/README.md
@@ -4,10 +4,10 @@ Redis is a highly versatile and blazing-fast in-memory data store and cache that
 
 ## Deployment Details
 
-Service utilizes the Spotahome Redis Operator for efficient management and orchestration of Redis clusters. 
+Service utilizes the freshworks-oss Redis Operator (a maintained fork of the archived Spotahome operator) for efficient management and orchestration of Redis clusters.
 
 - Docs: https://redis.io/docs/
-- GitHub: https://github.com/spotahome/redis-operator
+- GitHub: https://github.com/freshworks-oss/redis-operator
 
 > `storageClass` is annotated as immutable in the chart schema — see [`docs/storage-immutability.md`](../../../docs/storage-immutability.md) for the contract and which consumers enforce it.
 
@@ -15,24 +15,46 @@ Service utilizes the Spotahome Redis Operator for efficient management and orche
 
 ### Common parameters
 
-| Name               | Description                                                                                                                     | Type       | Value     |
-| ------------------ | ------------------------------------------------------------------------------------------------------------------------------- | ---------- | --------- |
-| `replicas`         | Number of Redis replicas.                                                                                                       | `int`      | `2`       |
-| `resources`        | Explicit CPU and memory configuration for each Redis replica. When omitted, the preset defined in `resourcesPreset` is applied. | `object`   | `{}`      |
-| `resources.cpu`    | CPU available to each replica.                                                                                                  | `quantity` | `""`      |
-| `resources.memory` | Memory (RAM) available to each replica.                                                                                         | `quantity` | `""`      |
-| `resourcesPreset`  | Default sizing preset used when `resources` is omitted.                                                                         | `string`   | `t1.nano` |
-| `size`             | Persistent Volume Claim size available for application data.                                                                    | `quantity` | `1Gi`     |
-| `storageClass`     | StorageClass used to store the data.                                                                                            | `string`   | `""`      |
-| `external`         | Enable external access from outside the cluster.                                                                                | `bool`     | `false`   |
-| `version`          | Redis major version to deploy                                                                                                   | `string`   | `v8`      |
+| Name               | Description                                                                                                                                                                                                                                      | Type       | Value     |
+| ------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ---------- | --------- |
+| `replicas`         | Number of Redis replicas.                                                                                                                                                                                                                        | `int`      | `2`       |
+| `resources`        | Explicit CPU and memory configuration for each Redis replica. When omitted, the preset defined in `resourcesPreset` is applied.                                                                                                                  | `object`   | `{}`      |
+| `resources.cpu`    | CPU available to each replica.                                                                                                                                                                                                                   | `quantity` | `""`      |
+| `resources.memory` | Memory (RAM) available to each replica.                                                                                                                                                                                                          | `quantity` | `""`      |
+| `resourcesPreset`  | Default sizing preset used when `resources` is omitted.                                                                                                                                                                                          | `string`   | `t1.nano` |
+| `size`             | Persistent Volume Claim size available for application data.                                                                                                                                                                                     | `quantity` | `1Gi`     |
+| `storageClass`     | StorageClass used to store the data.                                                                                                                                                                                                             | `string`   | `""`      |
+| `external`         | Enable external access from outside the cluster. Can be enabled only when the instance is created, together with `tls.enabled: true`; turning it on for an existing instance, or changing `tls.enabled` while it is on, is refused at admission. | `bool`     | `false`   |
+| `version`          | Redis major version to deploy. The Redis and Sentinel pods run the same image.                                                                                                                                                                   | `string`   | `v8`      |
+
+
+### TLS parameters
+
+| Name              | Description                                                                                                                                                                                                                                                                                                                                                                   | Type     | Value  |
+| ----------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------- | ------ |
+| `tls`             | TLS configuration. TLS is opt-in and is not inferred from `external`.                                                                                                                                                                                                                                                                                                         | `object` | `{}`   |
+| `tls.enabled`     | Enable TLS for Redis and Sentinel connections. Disabled unless set. Enabling it moves Redis and Sentinel to a TLS-only listener, so existing plaintext clients must be migrated at the same time. Encryption is provided by the redis-operator fork that mounts the certificate Secret into both Redis and Sentinel pods at `/tls`.                                           | `*bool`  | `null` |
+| `tls.authClients` | Maps to the Redis `tls-auth-clients` directive. Defaults to `no` — the server certificate is presented but client certificates are not validated. `yes` requires a client certificate signed by this release's CA, which the platform does not issue. Changing it restarts the Redis and Sentinel pods, because the directive is read from the config file once at startup. | `string` | `{}`   |
 
 
 ### Application-specific parameters
 
-| Name          | Description                 | Type   | Value  |
-| ------------- | --------------------------- | ------ | ------ |
-| `authEnabled` | Enable password generation. | `bool` | `true` |
+| Name                 | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | Type   | Value  |
+| -------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------ | ------ |
+| `authEnabled`        | Enable password generation.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | `bool` | `true` |
+| `minReplicasToWrite` | Redis `min-replicas-to-write`: the master refuses writes unless at least this many replicas are connected and within `minReplicasMaxLag`. Unset by default, which leaves the Redis default (disabled). With `replicas: 2` and a value of 1 the master rejects writes while its only replica is down, trading availability for a bound on the writes lost if an isolated master is failed over. Replication stays asynchronous, so this bounds the loss, it does not remove it. Must be 0 or more and below `replicas` (a master with `replicas` pods has `replicas - 1` replicas), otherwise every write is refused; the chart refuses such a value. | `*int` | `null` |
+| `minReplicasMaxLag`  | Redis `min-replicas-max-lag`, in seconds: a replica whose last acknowledgement is older than this does not count towards `minReplicasToWrite`. Unset by default, which leaves the Redis default (10). Has no effect unless `minReplicasToWrite` is set. Must be at least 1 when `minReplicasToWrite` is set: Redis treats 0 as disabling the check, so the chart refuses it.                                                                                                                                                                                                                                                                         | `*int` | `null` |
+
+
+### Sentinel parameters
+
+| Name                        | Description                                                                                                                                                                                                                                                                               | Type       | Value |
+| --------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------- | ----- |
+| `sentinel`                  | Sentinel configuration. When `sentinel.resources` is empty and `sentinel.resourcesPreset` is unset, the three Sentinel pods are sized like the Redis pods (`resources` and `resourcesPreset`). An empty `sentinel.resources` map counts as unset, as an empty top-level `resources` does. | `object`   | `{}`  |
+| `sentinel.resources`        | Explicit CPU and memory configuration for each Sentinel pod. Keys left out are filled from the preset in `sentinel.resourcesPreset`.                                                                                                                                                      | `object`   | `{}`  |
+| `sentinel.resources.cpu`    | CPU available to each replica.                                                                                                                                                                                                                                                            | `quantity` | `""`  |
+| `sentinel.resources.memory` | Memory (RAM) available to each replica.                                                                                                                                                                                                                                                   | `quantity` | `""`  |
+| `sentinel.resourcesPreset`  | Sizing preset for the Sentinel pods. Defaults to `resourcesPreset`.                                                                                                                                                                                                                       | `string`   | `{}`  |
 
 
 ## Parameter examples and reference
@@ -40,7 +62,7 @@ Service utilizes the Spotahome Redis Operator for efficient management and orche
 ### resources and resourcesPreset
 
 `resources` sets explicit CPU and memory configurations for each replica.
-When left empty, the preset defined in `resourcesPreset` is applied.
+Every resource it leaves unset is taken from the preset defined in `resourcesPreset`.
 
 ```yaml
 resources:
@@ -51,6 +73,60 @@ resources:
 `resourcesPreset` sets named CPU and memory configurations for each replica.
 This setting is ignored if the corresponding `resources` value is set.
 
-Presets follow a cloud-style `<series>.<size>` naming convention. Five series cover the full CPU-to-memory ratio range (`t1` 1:0.5, `c1` 1:1, `s1` 1:2, `u1` 1:4, `m1` 1:8) and each series ships eight sizes (`nano` through `4xlarge`). The legacy flat names (`nano`, `micro`, `small`, `medium`, `large`, `xlarge`, `2xlarge`) remain accepted as deprecated aliases of their 1:1 instance-type equivalents.
+Presets follow a cloud-style `<series>.<size>` naming convention. Five series cover the full CPU-to-memory ratio range (`t1` 1:0.5, `c1` 1:1, `s1` 1:2, `u1` 1:4, `m1` 1:8) and each series ships eight sizes (`nano` through `4xlarge`). The legacy flat names (`nano`, `micro`, `small`, `medium`, `large`, `xlarge`, `2xlarge`) remain accepted as deprecated aliases and keep their original sizes, which do not follow one series: `nano` through `small` equal the `t1` sizes of the same name, while `medium` equals `c1.small` rather than `c1.medium`.
 
 See [`docs/operations/resource-presets.md`](../../../docs/operations/resource-presets.md) for the full size matrix and the legacy-to-instance-type mapping.
+
+### sentinel
+
+`sentinel.resources` and `sentinel.resourcesPreset` size the three Sentinel pods separately from the Redis pods. A Sentinel holds only its configuration and the failover state, so it needs a small fraction of what a Redis replica holding the dataset does. When the `sentinel` block sets neither, the Sentinel pods are sized like the Redis pods, which is how every instance was sized before these parameters existed.
+
+```yaml
+resourcesPreset: u1.small
+sentinel:
+  resources:
+    cpu: 100m
+    memory: 64Mi
+```
+
+Every key `sentinel.resources` leaves unset is taken from `sentinel.resourcesPreset`, which defaults to `resourcesPreset`.
+
+### tls
+
+`tls.enabled` turns on TLS for Redis and Sentinel connections. It is off unless set and is never inferred from `external`.
+
+External access needs TLS and is chosen at creation. A `Redis` created with `external: true` must also set `tls.enabled: true`, and turning `external` on for an existing instance is refused at admission. TLS cannot be added to a running instance (see below), and an instance's `tls.enabled` does not prove what it runs, since the API accepts a change the operator then refuses. To expose an instance, create a new one with both set. While external access is on, `tls.enabled` cannot be changed either, so TLS cannot be dropped before the instance first comes up. Withdrawing external access works and lifts that freeze in the same edit, but external access cannot be turned back on. An instance that was already external without TLS before this rule keeps working and stays editable.
+
+> **TLS is chosen when the instance is created.** TLS replaces plaintext rather than running beside it: with TLS on, Redis and Sentinel are configured with `port 0` and serve only on the TLS port. It cannot be switched on or off for a running instance, because a replica restarted onto the TLS listener cannot replicate from a master still on plaintext, and Sentinels already on TLS would fail over to a stale replica. The operator's RedisFailover schema rejects the change; on an existing instance that surfaces as a failed HelmRelease upgrade while the instance keeps serving what it served before. To add TLS, create a new instance with `tls.enabled` and move the clients and data to it. A `Redis` that was already switched keeps its rejected value until it is put back: the API accepts the change, the HelmRelease then fails on it, and every later edit to that instance waits behind the failure, so remove `tls.enabled` to unblock the release; on an instance with external access that edit is refused unless it also sets `external: false`, or is made by a `system:masters` user or a platform service account. This is also why TLS is not inferred from `external`: an instance reachable from outside the cluster is the one most likely to have clients that an upgrade must not disconnect.
+
+Enabling TLS makes the chart issue a per-release cert-manager chain: a self-signed bootstrap Issuer, a CA certificate, a CA Issuer, and the server leaf certificate the operator mounts into the Redis and Sentinel pods. The CA belongs to this release alone; it is not a cluster-wide trust root, and nothing outside the release trusts it.
+
+This means TLS requires cert-manager, which the platform installs in the variant-independent part of the `system` bundle, so `isp-hosted` has it too. On a cluster where the cert-manager controller has been removed but its CRDs remain, `tls.enabled` renders `cert-manager.io/v1` resources that nothing issues, and no certificate is ever produced; with the CRDs gone too, the release fails on an unknown kind instead.
+
+To verify the server, a client needs that CA certificate. It is published as `redis-<name>.tenant-ca`: an object holding `ca.crt` and nothing else, delivered to tenants through the `core.cozystack.io/tenantsecrets` API the base tenant roles already grant. Every object named below follows the Helm release rather than the `Redis` resource, so a `Redis` named `cache` gives `redis-cache.tenant-ca`, `redis-cache.ca-tls`, and so on.
+
+The chart declares where it is lifted from by rendering a `TenantProjection` naming `<release>.ca-tls`, the Secret cert-manager writes the release CA to. Only `ca.crt` is ever published, and the CA-extraction controller refuses to publish anything that parses as private key material, so the CA private key sitting beside it in that Secret is never projected.
+
+```sh
+kubectl get tenantsecret redis-<name>.tenant-ca -o jsonpath='{.data.ca\.crt}' | base64 -d > ca.crt
+REDISCLI_AUTH=$(kubectl get tenantsecret redis-<name>-auth -o jsonpath='{.data.password}' | base64 -d) \
+  redis-cli --tls --cacert ca.crt -h <host> -p 6379
+```
+
+It is reached through `tenantsecrets` rather than by reading a Secret directly, and that is deliberate: `tenantsecrets` surfaces only objects the platform has vouched for, whereas a direct grant on a name would convey whatever happens to occupy that name. The operator publishes a CA-only Secret of its own at `<release>.ca-cert` and it is key-free today, but the name is the operator's to fill and RBAC cannot filter by key, so it is not granted to the tenant.
+
+`<host>` has to be a name the certificate covers. In-cluster that is any of the `rfr-`, `rfrm-`, `rfrs-` and `rfs-` service names, and `<release>-external-lb` when `external` is on; all of them resolve normally.
+
+From outside the cluster the covered names are `<release>.<tenant-host>` and `<release>.redis.<tenant-host>`, the second being the per-engine name meant for SNI routing through a TLS-passthrough listener on the tenant Gateway, which `redis-cli` reaches only when given `--sni`, since it sends no SNI by default. The chart publishes DNS for neither: the external Service is a plain LoadBalancer with no `external-dns` annotation, so nothing points either name at the LoadBalancer address. Connecting to the LoadBalancer IP instead fails for any client that verifies the hostname, because the only IP addresses in the certificate are the loopback ones the in-pod probes and the metrics sidecar use; `redis-cli` is not such a client, it checks the chain and not the name, so it connects to the IP and hides the mismatch. Until a name is published, an external client has to be pointed at it manually — a DNS record or a hosts entry mapping either name to the LoadBalancer address.
+
+Neither the CA and its private key (`<release>.ca-tls`) nor the server leaf and its private key (`<release>.tls`) is readable by the tenant. The first would allow minting certificates that any client trusting this release accepts; the second would allow impersonating this release's Redis endpoints. `<release>.tenant-ca` exists precisely so the certificate can be handed over without either key going with it.
+
+Certificate renewal reaches the pods through the operator. Redis and Sentinel read `tls-cert-file` and `tls-key-file` once at startup and never re-read them, so a renewed Secret changes nothing until the pods restart. On every reconcile the operator reads the TLS Secret and stamps a hash of its `tls.crt` and `ca.crt` into the pod template of both the Redis StatefulSet and the Sentinel Deployment, as the annotation `redis-failover.freshworks.com/tls-secret-hash`. When cert-manager renews the leaf, 30 days before the end of its one-year validity, the hash changes: the operator's own roller replaces the Redis pods one at a time, replicas before the master, and the Deployment controller rolls Sentinel. Nothing needs to touch the release for the renewed certificate to be served.
+
+If the roll cannot happen, because the operator is down or its reconcile of this RedisFailover keeps failing, the deadline is the old certificate's expiry: past it, clients fail to verify, and so do the operator's own TLS connections to Sentinel and Redis, so its checks and healing stop as well. Restart the Redis and Sentinel pods by hand before then.
+
+The CA certificate has its own clock. cert-manager issues it for five years and reissues it on the same key before that ends, so a `ca.crt` copied out of `<release>.tenant-ca` once keeps verifying new leaves only until the original CA certificate expires. Re-read the projection on a schedule shorter than that, or mount it and let the kubelet refresh it, rather than baking the copy into an image.
+
+`tls.authClients` maps to the Redis `tls-auth-clients` directive and defaults to `no`, meaning the server presents its certificate and does not ask connecting clients for one. Setting it to `optional` or `yes` makes Redis request, and for `yes` require, a client certificate signed by the same per-release CA. Quote the value in a manifest: an unquoted `yes` or `no` is read as a boolean and the string field rejects it. Changing it on a running release restarts the Redis and Sentinel pods: Redis reads the directive from its config file only at startup, so the operator folds the effective value into the certificate hash that drives the rollout, and the change lands when it is made rather than at the next unrelated restart.
+
+Note that the platform does not currently mint a client certificate for the tenant, and the CA private key needed to sign one is deliberately out of reach. Redis and Sentinel pods and the metrics sidecar authenticate with the leaf certificate the operator mounts for them, so they are unaffected, but an external client has no supported way to obtain a certificate this CA will accept. Use `authClients: yes` only when the client certificate is supplied out of band by whoever also controls the CA.
diff --git a/packages/apps/redis/hack/update-versions.sh b/packages/apps/redis/hack/update-versions.sh
index daad973e0a..2735f7ccea 100755
--- a/packages/apps/redis/hack/update-versions.sh
+++ b/packages/apps/redis/hack/update-versions.sh
@@ -116,7 +116,7 @@ for major_ver in "${MAJOR_VERSIONS[@]}"; do
 done
 NEW_VERSION_SECTION="${NEW_VERSION_SECTION}
 
-## @param {Version} version - Redis major version to deploy
+## @param {Version} version - Redis major version to deploy. The Redis and Sentinel pods run the same image.
 version: ${MAJOR_VERSIONS[0]}"
 
 # Check if version section already exists
diff --git a/packages/apps/redis/templates/_tls.tpl b/packages/apps/redis/templates/_tls.tpl
new file mode 100644
index 0000000000..eef5d5b430
--- /dev/null
+++ b/packages/apps/redis/templates/_tls.tpl
@@ -0,0 +1,51 @@
+{{/*
+redis.tls.enabled resolves the tls.enabled field to a plain string "true"
+or "false" so callers can use it with `eq`:
+
+  {{- $tlsEnabled := (include "redis.tls.enabled" .) | eq "true" -}}
+
+Semantics — TLS is opt-in and is never inferred:
+  - tls.enabled explicitly set (bool) → use that value
+  - tls.enabled unset                 → false
+  - tls: null                         → treated as unset, so false
+
+TLS deliberately does NOT follow `external`. In this operator TLS replaces
+plaintext rather than running beside it — the rendered config sets `port 0`
+and moves the listener to `tls-port` — so inferring it from `external` would
+switch an already-running externally-reachable Redis to TLS-only on its
+first reconcile after an upgrade and drop every plaintext client mid-flight.
+A platform upgrade must not sever working connections, so enabling TLS stays
+an explicit decision by whoever also migrates the clients.
+
+`default (dict)` guards against tls: null (nil map). `kindIs "invalid"`
+catches the case where tls is a map with no enabled key at all: index
+returns nil, and nil | toString = "<nil>", which would read as neither
+"true" nor "false".
+
+An explicitly null enabled is not among the shapes reaching here —
+values.schema.json types the field as boolean and rejects null before any
+template runs — so the guard is about the absent key, not a null one.
+*/}}
+{{- define "redis.tls.enabled" -}}
+{{- $tlsMap := default (dict) .Values.tls -}}
+{{- $enabled := index $tlsMap "enabled" -}}
+{{- if kindIs "invalid" $enabled -}}
+  {{- "false" -}}
+{{- else -}}
+  {{- $enabled | toString -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+redis.tls.authClients resolves the optional tls.authClients field.
+Returns "no" when unset to match the redis-operator default.
+*/}}
+{{- define "redis.tls.authClients" -}}
+{{- $tlsMap := default (dict) .Values.tls -}}
+{{- $authClients := index $tlsMap "authClients" -}}
+{{- if kindIs "invalid" $authClients -}}
+no
+{{- else -}}
+{{- $authClients -}}
+{{- end -}}
+{{- end -}}
diff --git a/packages/apps/redis/templates/certmanager.yaml b/packages/apps/redis/templates/certmanager.yaml
new file mode 100644
index 0000000000..412e67c262
--- /dev/null
+++ b/packages/apps/redis/templates/certmanager.yaml
@@ -0,0 +1,136 @@
+{{- $tlsEnabled := (include "redis.tls.enabled" .) | eq "true" -}}
+{{- if $tlsEnabled }}
+{{- $clusterDomain := (index (.Values._cluster | default dict) "cluster-domain") | default "cozy.local" }}
+---
+# Self-signed bootstrap Issuer — used only to sign the CA Certificate below.
+apiVersion: cert-manager.io/v1
+kind: Issuer
+metadata:
+  name: {{ .Release.Name }}-selfsigned
+  namespace: {{ .Release.Namespace }}
+spec:
+  selfSigned: {}
+---
+# CA Certificate. rotationPolicy: Never keeps the CA stable so existing
+# client trust bundles remain valid across cert-manager renewals.
+apiVersion: cert-manager.io/v1
+kind: Certificate
+metadata:
+  name: {{ .Release.Name }}-ca
+  namespace: {{ .Release.Namespace }}
+spec:
+  isCA: true
+  commonName: {{ .Release.Name }}-ca
+  # A dot, not a hyphen: the Secret suffix set holds both -ca-tls and -tls, so
+  # hyphenated, release `foo`'s CA Secret and release `foo-ca`'s leaf Secret
+  # are both redis-foo-ca-tls. The Certificate and Issuer names keep the
+  # hyphen; their suffixes cannot overlap that way.
+  secretName: {{ .Release.Name }}.ca-tls
+  duration: 43800h
+  issuerRef:
+    name: {{ .Release.Name }}-selfsigned
+    kind: Issuer
+    group: cert-manager.io
+  privateKey:
+    rotationPolicy: Never
+    algorithm: ECDSA
+    size: 256
+  # cert sign is what lets this CA issue the leaf below; signing is the
+  # digital signature bit. CRL and OCSP signing are separate cert-manager
+  # usages and are absent, since nothing here publishes revocation.
+  usages:
+    - signing
+    - cert sign
+---
+# CA Issuer — used to sign the leaf server certificate.
+apiVersion: cert-manager.io/v1
+kind: Issuer
+metadata:
+  name: {{ .Release.Name }}-ca
+  namespace: {{ .Release.Namespace }}
+spec:
+  ca:
+    secretName: {{ .Release.Name }}.ca-tls
+---
+# Leaf server TLS Certificate passed to redis-operator via spec.tls.certificateSecret.
+# The SAN list mirrors what the operator computes for its own Certificate
+# (operator/redisfailover/service/generator.go: redisCertificateSANs):
+#   - per-service short, namespace, .svc and .svc.<clusterDomain> forms for
+#     rfr-/rfrm-/rfrs-/rfs- services
+#   - wildcard covering per-pod headless DNS for the redis statefulset
+apiVersion: cert-manager.io/v1
+kind: Certificate
+metadata:
+  name: {{ .Release.Name }}-tls
+  namespace: {{ .Release.Namespace }}
+spec:
+  secretName: {{ .Release.Name }}.tls
+  duration: 8760h
+  renewBefore: 720h
+  isCA: false
+  usages:
+    - digital signature
+    - server auth
+    - client auth
+    - key encipherment
+  dnsNames:
+    {{- $ns := .Release.Namespace }}
+    {{- $rfName := .Release.Name }}
+    {{- $redisSvc := printf "rfr-%s" $rfName }}
+    {{- $masterSvc := printf "rfrm-%s" $rfName }}
+    {{- $slaveSvc := printf "rfrs-%s" $rfName }}
+    {{- $sentinelSvc := printf "rfs-%s" $rfName }}
+    - localhost
+    {{- range $svc := list $redisSvc $masterSvc $slaveSvc $sentinelSvc }}
+    - {{ $svc | quote }}
+    - {{ printf "%s.%s" $svc $ns | quote }}
+    - {{ printf "%s.%s.svc" $svc $ns | quote }}
+    - {{ printf "%s.%s.svc.%s" $svc $ns $clusterDomain | quote }}
+    {{- end }}
+    - {{ printf "*.%s" $redisSvc | quote }}
+    - {{ printf "*.%s.%s" $redisSvc $ns | quote }}
+    - {{ printf "*.%s.%s.svc" $redisSvc $ns | quote }}
+    - {{ printf "*.%s.%s.svc.%s" $redisSvc $ns $clusterDomain | quote }}
+    {{- if .Values.external | default false }}
+    {{- /* The external LoadBalancer Service this chart creates alongside the
+           operator's own services. It resolves in-cluster like any Service, so
+           a client dialing it by name has to find it in the SAN list or fail
+           hostname verification. */}}
+    {{- $extSvc := printf "%s-external-lb" .Release.Name }}
+    - {{ $extSvc | quote }}
+    - {{ printf "%s.%s" $extSvc $ns | quote }}
+    - {{ printf "%s.%s.svc" $extSvc $ns | quote }}
+    - {{ printf "%s.%s.svc.%s" $extSvc $ns $clusterDomain | quote }}
+    {{- /* A tenant without a host is a legitimate shape — packages/apps/tenant
+           leaves the computed host empty when neither the tenant nor its parent
+           sets one — and such a tenant has no external name to certify. Emit
+           the SAN when there is a host and skip it otherwise; requiring one
+           here would stop an already-running external release from rendering
+           at all. Reading through a defaulted dict keeps an absent _namespace
+           from being a nil dereference. */}}
+    {{- $extHost := index (.Values._namespace | default dict) "host" | default "" }}
+    {{- if $extHost }}
+    - {{ printf "%s.%s" .Release.Name $extHost | quote }}
+    {{- /* The per-engine name, meant for SNI routing through a
+           TLS-passthrough listener on the tenant Gateway (*.redis.<apex>).
+           Issued next to the flat name so that a later move between the two
+           hostname schemes reissues no certificate and changes no client's
+           trust anchor; clients still change the host they dial. */}}
+    - {{ printf "%s.redis.%s" .Release.Name $extHost | quote }}
+    {{- end }}
+    {{- end }}
+  ipAddresses:
+    # redis_exporter dials rediss://127.0.0.1 with CA verification; a DNS SAN
+    # for "localhost" does not match an IP literal, so the loopback IPs must be
+    # explicit SANs (mirrors the operator's own self-generated cert behavior).
+    - "127.0.0.1"
+    - "::1"
+  privateKey:
+    rotationPolicy: Always
+    algorithm: ECDSA
+    size: 256
+  issuerRef:
+    name: {{ .Release.Name }}-ca
+    kind: Issuer
+    group: cert-manager.io
+{{- end }}
diff --git a/packages/apps/redis/templates/dashboard-resourcemap.yaml b/packages/apps/redis/templates/dashboard-resourcemap.yaml
index 63f82a7d15..82b5822237 100644
--- a/packages/apps/redis/templates/dashboard-resourcemap.yaml
+++ b/packages/apps/redis/templates/dashboard-resourcemap.yaml
@@ -18,6 +18,25 @@ rules:
   resources:
   - secrets
   resourceNames:
+  {{- /*
+  No TLS Secret of this release is granted here, whatever tls.enabled and
+  tls.authClients are set to. The trust anchor a client needs travels to the
+  tenant as the key-free <release>.tenant-ca projection instead
+  (templates/tenant-projection.yaml), which the platform's CA-extraction
+  controller writes and vouches for; a grant on a Secret name would convey
+  whatever occupies that name.
+
+  The three Secrets deliberately absent:
+    - <release>.ca-tls, the CA certificate and its private key. Anyone holding
+      the key can mint certificates that every client trusting this release's
+      CA accepts.
+    - <release>.tls, the server leaf and its private key. Anyone holding it can
+      impersonate this release's Redis and Sentinel endpoints.
+    - <release>.ca-cert, the CA-only copy the operator publishes. Key-free
+      today, but the operator holds create and update on Secrets cluster-wide,
+      so what lands under that name is the operator's choice rather than the
+      platform's, and RBAC cannot filter by key.
+  */}}
   - "{{ .Release.Name }}-auth"
   verbs: ["get", "list", "watch"]
 - apiGroups:
diff --git a/packages/apps/redis/templates/redisfailover.yaml b/packages/apps/redis/templates/redisfailover.yaml
index 160e030dc5..27c7e90470 100644
--- a/packages/apps/redis/templates/redisfailover.yaml
+++ b/packages/apps/redis/templates/redisfailover.yaml
@@ -1,3 +1,19 @@
+{{- /* One image for the data pods and the Sentinels, resolved once so they cannot drift apart. */}}
+{{- $redisImage := printf "redis:%s" (include "redis.versionMap" $) }}
+{{- $tlsEnabled := (include "redis.tls.enabled" .) | eq "true" -}}
+{{- /*
+  A Sentinel holds only its configuration and failover state, so the Redis
+  sizing over-provisions it. An empty sentinel block still falls back to the
+  Redis sizing, so existing instances render unchanged on upgrade.
+  An empty sentinel.resources map counts as unset, mirroring how an empty
+  top-level resources falls back to resourcesPreset.
+*/}}
+{{- $sentinel := .Values.sentinel | default dict -}}
+{{- $sentinelPreset := $sentinel.resourcesPreset | default .Values.resourcesPreset -}}
+{{- $sentinelResources := .Values.resources -}}
+{{- if or $sentinel.resources $sentinel.resourcesPreset -}}
+{{-   $sentinelResources = $sentinel.resources | default dict -}}
+{{- end -}}
 {{- if .Values.authEnabled }}
   {{- $existingPassword := lookup "v1" "Secret" .Release.Namespace (printf "%s-auth" .Release.Name) }}
   {{- $password := randAlphaNum 32 | b64enc }}
@@ -22,12 +38,37 @@ metadata:
   labels:
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
+    # The freshworks-oss operator reconciles only RedisFailovers whose
+    # operator-group label matches its OPERATOR_GROUP_ID (see
+    # packages/system/redis-operator/values.yaml); without it the CR is
+    # silently ignored. Keep both sides in sync.
+    redis-failover.freshworks.com/operator-group: cozystack
 spec:
+  {{- if $tlsEnabled }}
+  tls:
+    enabled: true
+    authClients: {{ include "redis.tls.authClients" . | quote }}
+    # When TLS is on the operator always publishes an Opaque Secret holding just
+    # ca.crt; this only chooses its name, which otherwise defaults to
+    # "<tls-secret>-ca" — a name that reads as though it belonged to the leaf.
+    # Nothing in the tenant read path consumes it: the trust anchor reaches the
+    # tenant as the <release>.tenant-ca projection declared in
+    # templates/tenant-projection.yaml, sourced from the chart's own CA Secret.
+    caCertSecretName: {{ .Release.Name }}.ca-cert
+    certificateSecret:
+      secretName: {{ .Release.Name }}.tls
+  {{- end }}
   sentinel:
+    # Sentinels run the same image as the data pods. Pinned explicitly because
+    # the operator's compiled-in default (redis:7.2.4-alpine in freshworks-oss
+    # v3.3.5) would otherwise move them on an operator upgrade. Unlike the data
+    # pods they keep no RDB, only a sentinel.conf the init container rewrites
+    # on every start, so a chart rollback to an older engine is safe here.
+    image: {{ $redisImage | quote }}
     replicas: 3
-    resources: {{- include "cozy-lib.resources.defaultingSanitize" (list .Values.resourcesPreset .Values.resources $) | nindent 6 }}
+    resources: {{- include "cozy-lib.resources.defaultingSanitize" (list $sentinelPreset $sentinelResources $) | nindent 6 }}
   redis:
-    image: "redis:{{ include "redis.versionMap" $ }}"
+    image: {{ $redisImage | quote }}
     resources: {{- include "cozy-lib.resources.defaultingSanitize" (list .Values.resourcesPreset .Values.resources $) | nindent 6 }}
     replicas: {{ .Values.replicas }}
     {{- with .Values.size }}
@@ -50,7 +91,7 @@ spec:
     {{- end }}
     exporter:
       enabled: true
-      image: oliver006/redis_exporter:v1.55.0-alpine
+      image: oliver006/redis_exporter:v1.55.0@sha256:d82625bda93823fb40de881ffbb45b65aca772a39c30141387f92314c258da5d
       args:
         - --web.telemetry-path
         - /metrics
@@ -64,6 +105,22 @@ spec:
       - appendonly no
       - save ""
       {{- end }}
+      {{- /* A master with `replicas` pods has replicas-1 replicas, so a requirement of
+             `replicas` or more can never be met and the master would refuse every write. */}}
+      {{- if and (not (kindIs "invalid" .Values.minReplicasToWrite)) (ge (.Values.minReplicasToWrite | int) (.Values.replicas | int)) }}
+      {{- fail (printf "minReplicasToWrite (%d) must be below replicas (%d): the master has replicas-1 replicas, so the master would refuse every write" (.Values.minReplicasToWrite | int) (.Values.replicas | int)) }}
+      {{- end }}
+      {{- if not (kindIs "invalid" .Values.minReplicasToWrite) }}
+      - min-replicas-to-write {{ .Values.minReplicasToWrite | int }}
+      {{- end }}
+      {{- /* Redis treats 0 in either directive as "check disabled" (redis.conf), so a lag of 0
+             next to a replica requirement would silently turn the protection off. */}}
+      {{- if and (not (kindIs "invalid" .Values.minReplicasToWrite)) (gt (.Values.minReplicasToWrite | int) 0) (not (kindIs "invalid" .Values.minReplicasMaxLag)) (le (.Values.minReplicasMaxLag | int) 0) }}
+      {{- fail "minReplicasMaxLag must be at least 1 when minReplicasToWrite is set: Redis treats 0 as disabling the check" }}
+      {{- end }}
+      {{- if not (kindIs "invalid" .Values.minReplicasMaxLag) }}
+      - min-replicas-max-lag {{ .Values.minReplicasMaxLag | int }}
+      {{- end }}
   {{- if .Values.authEnabled }}
   auth:
     secretPath: {{ .Release.Name }}-auth
@@ -93,7 +150,7 @@ metadata:
   name: {{ $.Release.Name }}-sentinel
   namespace: {{ $.Release.Namespace }}
   labels:
-    workloads.cozystack.io/resource-preset: {{ .Values.resourcesPreset | quote }}
+    workloads.cozystack.io/resource-preset: {{ $sentinelPreset | quote }}
 spec:
   minReplicas: 2
   replicas: 3
diff --git a/packages/apps/redis/templates/tenant-projection.yaml b/packages/apps/redis/templates/tenant-projection.yaml
new file mode 100644
index 0000000000..7f8485f93e
--- /dev/null
+++ b/packages/apps/redis/templates/tenant-projection.yaml
@@ -0,0 +1,27 @@
+{{- /* Gated on the same condition as certmanager.yaml: the source Secret only exists when TLS is on. */}}
+{{- /*
+The source is the chart's own CA Secret, not the CA-only Secret the operator
+publishes at spec.tls.caCertSecretName. Both carry the same certificate, but
+<release>.ca-tls is written by cert-manager the moment the CA Certificate is
+issued, so the anchor reaches the tenant without also depending on the operator
+having reconciled the RedisFailover and published its copy. cert-manager writes
+the certificate of a selfSigned isCA Certificate to ca.crt as well as to
+tls.crt, and ca.crt is the key the trust-anchor contract names.
+
+Sourcing a key-bearing Secret is the intended shape: the controller copies the
+single named key and refuses to publish PEM private key material at all
+(internal/controller/cacert/reconciler.go, errPrivateKey), so the CA private key
+sitting beside ca.crt in this Secret is never what gets projected.
+*/}}
+{{- if eq (include "redis.tls.enabled" .) "true" }}
+---
+apiVersion: internal.cozystack.io/v1alpha1
+kind: TenantProjection
+metadata:
+  name: {{ .Release.Name }}-ca
+spec:
+  projections:
+    - type: CACert
+      sourceSecretName: {{ .Release.Name }}.ca-tls
+      sourceKey: ca.crt
+{{- end }}
diff --git a/packages/apps/redis/tests/min_replicas_test.yaml b/packages/apps/redis/tests/min_replicas_test.yaml
new file mode 100644
index 0000000000..f0de83e86a
--- /dev/null
+++ b/packages/apps/redis/tests/min_replicas_test.yaml
@@ -0,0 +1,103 @@
+suite: Redis min-replicas write safety
+
+# Both settings are opt-in: unset keeps the Redis defaults, so existing
+# instances render the same customConfig as before.
+
+release:
+  name: my-redis
+  namespace: tenant-test
+
+set:
+  _cluster:
+    cluster-domain: cluster.local
+  _namespace:
+    host: example.com
+
+templates:
+  - templates/redisfailover.yaml
+
+tests:
+  - it: "renders neither directive by default"
+    documentSelector:
+      path: kind
+      value: RedisFailover
+    asserts:
+      - notContains:
+          path: spec.redis.customConfig
+          content: min-replicas-to-write 1
+      - matchRegex:
+          path: spec.redis.customConfig[0]
+          pattern: ^tcp-keepalive 0$
+      - lengthEqual:
+          path: spec.redis.customConfig
+          count: 2
+
+  - it: "renders min-replicas-to-write when set"
+    set:
+      minReplicasToWrite: 1
+    documentSelector:
+      path: kind
+      value: RedisFailover
+    asserts:
+      - contains:
+          path: spec.redis.customConfig
+          content: min-replicas-to-write 1
+      - notContains:
+          path: spec.redis.customConfig
+          content: min-replicas-max-lag 5
+
+  - it: "renders both directives when both are set"
+    set:
+      minReplicasToWrite: 1
+      minReplicasMaxLag: 5
+    documentSelector:
+      path: kind
+      value: RedisFailover
+    asserts:
+      - contains:
+          path: spec.redis.customConfig
+          content: min-replicas-to-write 1
+      - contains:
+          path: spec.redis.customConfig
+          content: min-replicas-max-lag 5
+
+  - it: "renders an explicit 0 so the setting can be disabled"
+    set:
+      minReplicasToWrite: 0
+    documentSelector:
+      path: kind
+      value: RedisFailover
+    asserts:
+      - contains:
+          path: spec.redis.customConfig
+          content: min-replicas-to-write 0
+
+  - it: refuses a zero lag next to a replica requirement
+    set:
+      minReplicasToWrite: 1
+      minReplicasMaxLag: 0
+    asserts:
+      - failedTemplate:
+          errorPattern: "minReplicasMaxLag must be at least 1 when minReplicasToWrite is set"
+
+  - it: refuses a negative minReplicasToWrite (schema minimum 0)
+    set:
+      minReplicasToWrite: -1
+    asserts:
+      - failedTemplate: {}
+
+  # minReplicasMaxLag alone, so only the schema minimum can refuse it: with
+  # minReplicasToWrite set, the template's lag check would refuse it anyway.
+  - it: refuses a negative minReplicasMaxLag (schema minimum 0)
+    set:
+      minReplicasMaxLag: -1
+    asserts:
+      - failedTemplate: {}
+
+  - it: refuses a requirement that can never be met (minReplicasToWrite >= replicas)
+    set:
+      replicas: 2
+      minReplicasToWrite: 2
+    asserts:
+      - failedTemplate:
+          errorPattern: "minReplicasToWrite \\(2\\) must be below replicas \\(2\\)"
diff --git a/packages/apps/redis/tests/sentinel_image_test.yaml b/packages/apps/redis/tests/sentinel_image_test.yaml
new file mode 100644
index 0000000000..48f851f8a0
--- /dev/null
+++ b/packages/apps/redis/tests/sentinel_image_test.yaml
@@ -0,0 +1,45 @@
+suite: Sentinel image follows the Redis version
+
+release:
+  name: my-redis
+  namespace: tenant-test
+
+set:
+  _cluster:
+    cluster-domain: cluster.local
+  _namespace:
+    host: example.com
+
+templates:
+  - templates/redisfailover.yaml
+
+tests:
+  # An empty spec.sentinel.image would hand the choice to the operator's
+  # compiled-in default, which moves with operator releases. The patterns pin
+  # the major version only, so a patch bump in files/versions.yaml does not
+  # need a test change.
+  - it: "the default version runs Sentinel on the data pods' image"
+    documentSelector:
+      path: kind
+      value: RedisFailover
+    asserts:
+      - matchRegex:
+          path: spec.sentinel.image
+          pattern: ^redis:8\.[0-9]+\.[0-9]+$
+      - matchRegex:
+          path: spec.redis.image
+          pattern: ^redis:8\.[0-9]+\.[0-9]+$
+
+  - it: "version v7 moves Sentinel to the v7 image too"
+    set:
+      version: v7
+    documentSelector:
+      path: kind
+      value: RedisFailover
+    asserts:
+      - matchRegex:
+          path: spec.sentinel.image
+          pattern: ^redis:7\.[0-9]+\.[0-9]+$
+      - matchRegex:
+          path: spec.redis.image
+          pattern: ^redis:7\.[0-9]+\.[0-9]+$
diff --git a/packages/apps/redis/tests/sentinel_resources_test.yaml b/packages/apps/redis/tests/sentinel_resources_test.yaml
new file mode 100644
index 0000000000..46de43fe95
--- /dev/null
+++ b/packages/apps/redis/tests/sentinel_resources_test.yaml
@@ -0,0 +1,175 @@
+suite: Sentinel sizing
+
+release:
+  name: my-redis
+  namespace: tenant-test
+
+set:
+  _cluster:
+    cluster-domain: cluster.local
+  _namespace:
+    host: example.com
+
+templates:
+  - templates/redisfailover.yaml
+
+tests:
+  # Instances created before the sentinel block existed must render the same
+  # Sentinel sizing after an upgrade.
+  - it: "an empty sentinel block sizes Sentinel like Redis"
+    set:
+      resourcesPreset: u1.small
+    documentSelector:
+      path: kind
+      value: RedisFailover
+    asserts:
+      - equal:
+          path: spec.sentinel.resources.limits
+          value:
+            cpu: "1"
+            memory: 4Gi
+            ephemeral-storage: 2Gi
+      - equal:
+          path: spec.redis.resources.limits.memory
+          value: 4Gi
+
+  - it: "an empty sentinel block keeps explicit Redis resources on Sentinel"
+    set:
+      resources:
+        cpu: "2"
+        memory: 3Gi
+    documentSelector:
+      path: kind
+      value: RedisFailover
+    asserts:
+      - equal:
+          path: spec.sentinel.resources.limits.memory
+          value: 3Gi
+      - equal:
+          path: spec.sentinel.resources.limits.cpu
+          value: "2"
+
+  # Mirrors the top-level rule: an empty resources map counts as unset, so it
+  # must not stop the inheritance.
+  - it: "an empty sentinel.resources map counts as unset"
+    set:
+      resources:
+        cpu: "2"
+        memory: 3Gi
+      sentinel:
+        resources: {}
+    documentSelector:
+      path: kind
+      value: RedisFailover
+    asserts:
+      - equal:
+          path: spec.sentinel.resources.limits.memory
+          value: 3Gi
+      - equal:
+          path: spec.sentinel.resources.limits.cpu
+          value: "2"
+
+  # Explicit Redis resources must not leak into a Sentinel that has its own
+  # preset: the preset alone decides.
+  - it: "sentinel.resourcesPreset sizes Sentinel independently of Redis"
+    set:
+      resources:
+        memory: 4Gi
+      sentinel:
+        resourcesPreset: t1.nano
+    documentSelector:
+      path: kind
+      value: RedisFailover
+    asserts:
+      - equal:
+          path: spec.sentinel.resources.limits
+          value:
+            cpu: 250m
+            memory: 128Mi
+            ephemeral-storage: 2Gi
+      - equal:
+          path: spec.redis.resources.limits.memory
+          value: 4Gi
+
+  - it: "sentinel.resources wins over the presets"
+    set:
+      resourcesPreset: u1.small
+      sentinel:
+        resources:
+          cpu: 100m
+          memory: 64Mi
+    documentSelector:
+      path: kind
+      value: RedisFailover
+    asserts:
+      - equal:
+          path: spec.sentinel.resources.limits
+          value:
+            cpu: 100m
+            memory: 64Mi
+            ephemeral-storage: 2Gi
+      - equal:
+          path: spec.redis.resources.limits.memory
+          value: 4Gi
+
+  - it: "keys sentinel.resources leaves unset come from sentinel.resourcesPreset"
+    set:
+      resourcesPreset: u1.small
+      sentinel:
+        resources:
+          memory: 64Mi
+        resourcesPreset: t1.micro
+    documentSelector:
+      path: kind
+      value: RedisFailover
+    asserts:
+      - equal:
+          path: spec.sentinel.resources.limits
+          value:
+            cpu: 500m
+            memory: 64Mi
+            ephemeral-storage: 2Gi
+
+  - it: "the Sentinel WorkloadMonitor carries the Sentinel preset"
+    set:
+      resourcesPreset: u1.small
+      sentinel:
+        resourcesPreset: t1.nano
+    documentSelector:
+      path: metadata.name
+      value: my-redis-sentinel
+    asserts:
+      - equal:
+          path: metadata.labels["workloads.cozystack.io/resource-preset"]
+          value: t1.nano
+
+  - it: "the Redis WorkloadMonitor keeps the Redis preset"
+    set:
+      resourcesPreset: u1.small
+      sentinel:
+        resourcesPreset: t1.nano
+    documentSelector:
+      path: metadata.name
+      value: my-redis-redis
+    asserts:
+      - equal:
+          path: metadata.labels["workloads.cozystack.io/resource-preset"]
+          value: u1.small
+
+  - it: "the Sentinel WorkloadMonitor follows resourcesPreset when the sentinel block is empty"
+    set:
+      resourcesPreset: u1.small
+    documentSelector:
+      path: metadata.name
+      value: my-redis-sentinel
+    asserts:
+      - equal:
+          path: metadata.labels["workloads.cozystack.io/resource-preset"]
+          value: u1.small
+
+  - it: "an unknown sentinel.resourcesPreset is refused"
+    set:
+      sentinel:
+        resourcesPreset: huge
+    asserts:
+      - failedTemplate: {}
diff --git a/packages/apps/redis/tests/tenant_projection_test.yaml b/packages/apps/redis/tests/tenant_projection_test.yaml
new file mode 100644
index 0000000000..edba9f92d5
--- /dev/null
+++ b/packages/apps/redis/tests/tenant_projection_test.yaml
@@ -0,0 +1,113 @@
+suite: redis TenantProjection sentinel
+
+# The chart renders one TenantProjection per TLS-enabled release: the declaration
+# that tells the CA-extraction controller to lift ca.crt out of the key-bearing
+# <release>.ca-tls into the tenant-readable <release>.tenant-ca projection.
+#
+# The load-bearing invariant is the ABSENCE of ownerReferences. The sentinel must
+# carry none — it owns the projection, and it is itself owned only through the
+# helm.toolkit.fluxcd.io/name label Flux stamps, which is how the lineage webhook
+# resolves the application. An ownerReference here would short-circuit that walk
+# and silently break the tenant's read path (pkg/lineage/lineage.go).
+
+release:
+  name: my-redis
+  namespace: tenant-test
+
+templates:
+  - templates/tenant-projection.yaml
+
+tests:
+  - it: renders nothing when TLS is off
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  # The gate is on tls.enabled alone. TLS is not inferred from external access,
+  # so an externally exposed plaintext release must still render no sentinel —
+  # a gate copied from an engine that does derive TLS from `external` would
+  # render one here and leave the controller waiting on a Secret that never
+  # appears.
+  - it: renders nothing when external access is on but TLS is off
+    set:
+      external: true
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  - it: renders exactly one TenantProjection named after the release
+    set:
+      tls:
+        enabled: true
+    asserts:
+      - hasDocuments:
+          count: 1
+      - isKind:
+          of: TenantProjection
+      - equal:
+          path: apiVersion
+          value: internal.cozystack.io/v1alpha1
+      - equal:
+          path: metadata.name
+          value: my-redis-ca
+
+  # The source is the chart's cert-manager CA Secret, not the CA-only Secret the
+  # operator publishes at spec.tls.caCertSecretName. This name is only correct
+  # because certmanager.yaml writes the CA Certificate to it; the other half is
+  # pinned in tls_test.yaml, and renaming one without the other leaves the
+  # projection permanently not-ready on a source that does not exist.
+  - it: declares a CACert projection of the chart's cert-manager CA Secret
+    set:
+      tls:
+        enabled: true
+    asserts:
+      - equal:
+          path: spec.projections[0].type
+          value: CACert
+      - equal:
+          path: spec.projections[0].sourceSecretName
+          value: my-redis.ca-tls
+      - equal:
+          path: spec.projections[0].sourceKey
+          value: ca.crt
+
+  # THE invariant, and the only one here that breaks something. The controller
+  # resolves the owning application by walking to the sentinel's
+  # helm.toolkit.fluxcd.io/name label; an ownerReference short-circuits that
+  # walk, and the tenant silently stops receiving the anchor.
+  - it: carries no ownerReferences, so the lineage walk reaches the release
+    set:
+      tls:
+        enabled: true
+    asserts:
+      - notExists:
+          path: metadata.ownerReferences
+
+  # Conformance to the shape Flux and the controller expect, not an invariant:
+  # an explicit namespace or a chart-added label does not break the walk by
+  # itself. Kept separate so the test above keeps its meaning — a single test
+  # named for three unrelated properties reads as though all three were
+  # load-bearing.
+  - it: sets no namespace and adds no labels of its own
+    set:
+      tls:
+        enabled: true
+    asserts:
+      - notExists:
+          path: metadata.namespace
+      - notExists:
+          path: metadata.labels
+
+  - it: renders both names from the release, not a fixed string
+    release:
+      name: other-redis
+    set:
+      tls:
+        enabled: true
+    asserts:
+      - equal:
+          path: metadata.name
+          value: other-redis-ca
+      - equal:
+          path: spec.projections[0].sourceSecretName
+          value: other-redis.ca-tls
diff --git a/packages/apps/redis/tests/tls_test.yaml b/packages/apps/redis/tests/tls_test.yaml
new file mode 100644
index 0000000000..9b1b3ac0be
--- /dev/null
+++ b/packages/apps/redis/tests/tls_test.yaml
@@ -0,0 +1,861 @@
+suite: TLS configuration for Redis
+
+# TLS is opt-in and is never inferred from external. Tests cover:
+#   1. tls.enabled unset (any external)   -> TLS disabled
+#   2. tls.enabled=true                   -> TLS enabled
+#   3. tls.enabled=false                  -> TLS disabled
+#   4. tls null / empty map               -> TLS disabled
+# Plus authClients propagation, SAN coverage and dashboard RBAC.
+
+release:
+  name: my-redis
+  namespace: tenant-test
+
+set:
+  _cluster:
+    cluster-domain: cluster.local
+  _namespace:
+    host: example.com
+
+tests:
+  # ------------------------------------------------------------------
+  # Case 1: tls.enabled unset -> no TLS resources, whatever external says
+  # ------------------------------------------------------------------
+  - it: "certmanager.yaml renders no documents when tls.enabled is unset"
+    templates:
+      - templates/certmanager.yaml
+    set:
+      external: false
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  # The load-bearing assertion of the opt-in decision. TLS replaces plaintext
+  # in this operator, so inferring it from external would move an already
+  # running externally-reachable Redis to a TLS-only listener on its first
+  # reconcile after an upgrade and cut every plaintext client. Enabling TLS
+  # stays an explicit act.
+  - it: "external=true alone does not enable TLS"
+    templates:
+      - templates/certmanager.yaml
+    set:
+      external: true
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  - it: "external=true alone leaves the operator with no spec.tls"
+    templates:
+      - templates/redisfailover.yaml
+    set:
+      external: true
+    documentSelector:
+      path: kind
+      value: RedisFailover
+    asserts:
+      - notExists:
+          path: spec.tls
+
+  - it: "external=true alone grants the tenant no TLS secrets"
+    templates:
+      - templates/dashboard-resourcemap.yaml
+    set:
+      external: true
+    documentSelector:
+      path: kind
+      value: Role
+    asserts:
+      # The negatives below address rules[1] by index, and notContains is
+      # fail-open on a path that does not exist, so a SECOND secrets rule
+      # granting the key-bearing Secrets would satisfy every one of them.
+      # Pin the rule count: the Role renders services, secrets and
+      # workloadmonitors, and nothing else.
+      - lengthEqual:
+          path: rules
+          count: 3
+      - notContains:
+          path: rules[1].resourceNames
+          content: "my-redis.ca-cert"
+      - notContains:
+          path: rules[1].resourceNames
+          content: "my-redis.tls"
+
+  - it: "redisfailover.yaml does not have spec.tls when tls.enabled is unset"
+    templates:
+      - templates/redisfailover.yaml
+    set:
+      external: false
+    documentSelector:
+      path: kind
+      value: RedisFailover
+    asserts:
+      - notExists:
+          path: spec.tls
+
+  - it: "dashboard-resourcemap.yaml does not list TLS secrets when tls.enabled is unset"
+    templates:
+      - templates/dashboard-resourcemap.yaml
+    set:
+      external: false
+    documentSelector:
+      path: kind
+      value: Role
+    asserts:
+      # The negatives below address rules[1] by index, and notContains is
+      # fail-open on a path that does not exist, so a SECOND secrets rule
+      # granting the key-bearing Secrets would satisfy every one of them.
+      # Pin the rule count: the Role renders services, secrets and
+      # workloadmonitors, and nothing else.
+      - lengthEqual:
+          path: rules
+          count: 3
+      - notContains:
+          path: rules[1].resourceNames
+          content: "my-redis.tls"
+      - notContains:
+          path: rules[1].resourceNames
+          content: "my-redis.ca-cert"
+
+  # ------------------------------------------------------------------
+  # Case 2: tls.enabled=true -> the full cert-manager chain
+  # ------------------------------------------------------------------
+  - it: "certmanager.yaml renders 4 documents when tls.enabled=true"
+    templates:
+      - templates/certmanager.yaml
+    set:
+      external: true
+      tls:
+        enabled: true
+    asserts:
+      - hasDocuments:
+          count: 4
+
+  - it: "first document is a selfsigned Issuer when TLS is enabled"
+    templates:
+      - templates/certmanager.yaml
+    set:
+      external: true
+      tls:
+        enabled: true
+    documentIndex: 0
+    asserts:
+      - equal:
+          path: apiVersion
+          value: cert-manager.io/v1
+      - equal:
+          path: kind
+          value: Issuer
+      - equal:
+          path: metadata.name
+          value: my-redis-selfsigned
+      - exists:
+          path: spec.selfSigned
+
+  - it: "second document is the CA Certificate when TLS is enabled"
+    templates:
+      - templates/certmanager.yaml
+    set:
+      external: true
+      tls:
+        enabled: true
+    documentIndex: 1
+    asserts:
+      - equal:
+          path: kind
+          value: Certificate
+      - equal:
+          path: metadata.name
+          value: my-redis-ca
+      - equal:
+          path: spec.isCA
+          value: true
+      - equal:
+          path: spec.secretName
+          value: my-redis.ca-tls
+      - equal:
+          path: spec.issuerRef.name
+          value: my-redis-selfsigned
+      - equal:
+          path: spec.privateKey.rotationPolicy
+          value: Never
+      - equal:
+          path: spec.privateKey.algorithm
+          value: ECDSA
+      - equal:
+          path: spec.privateKey.size
+          value: 256
+
+  - it: "third document is the CA Issuer when TLS is enabled"
+    templates:
+      - templates/certmanager.yaml
+    set:
+      external: true
+      tls:
+        enabled: true
+    documentIndex: 2
+    asserts:
+      - equal:
+          path: kind
+          value: Issuer
+      - equal:
+          path: metadata.name
+          value: my-redis-ca
+      - equal:
+          path: spec.ca.secretName
+          value: my-redis.ca-tls
+
+  - it: "fourth document is the leaf Certificate when TLS is enabled"
+    templates:
+      - templates/certmanager.yaml
+    set:
+      external: true
+      tls:
+        enabled: true
+    documentIndex: 3
+    asserts:
+      - equal:
+          path: kind
+          value: Certificate
+      - equal:
+          path: metadata.name
+          value: my-redis-tls
+      - equal:
+          path: spec.secretName
+          value: my-redis.tls
+      - equal:
+          path: spec.isCA
+          value: false
+      - equal:
+          path: spec.issuerRef.name
+          value: my-redis-ca
+      - equal:
+          path: spec.issuerRef.kind
+          value: Issuer
+      - equal:
+          path: spec.privateKey.rotationPolicy
+          value: Always
+      - equal:
+          path: spec.privateKey.algorithm
+          value: ECDSA
+
+  - it: "leaf Certificate usages include digital signature for ECDSA TLS handshake"
+    templates:
+      - templates/certmanager.yaml
+    set:
+      external: true
+      tls:
+        enabled: true
+    documentIndex: 3
+    asserts:
+      - contains:
+          path: spec.usages
+          content: "digital signature"
+      - contains:
+          path: spec.usages
+          content: "server auth"
+      - contains:
+          path: spec.usages
+          content: "client auth"
+      - contains:
+          path: spec.usages
+          content: "key encipherment"
+
+  - it: "leaf Certificate SAN list covers all four redis-operator service names with all DNS variants"
+    templates:
+      - templates/certmanager.yaml
+    set:
+      external: true
+      tls:
+        enabled: true
+    documentIndex: 3
+    asserts:
+      - contains:
+          path: spec.dnsNames
+          content: "localhost"
+      # Redis (headless) service
+      - contains:
+          path: spec.dnsNames
+          content: "rfr-my-redis"
+      - contains:
+          path: spec.dnsNames
+          content: "rfr-my-redis.tenant-test"
+      - contains:
+          path: spec.dnsNames
+          content: "rfr-my-redis.tenant-test.svc"
+      - contains:
+          path: spec.dnsNames
+          content: "rfr-my-redis.tenant-test.svc.cluster.local"
+      # Redis master service
+      - contains:
+          path: spec.dnsNames
+          content: "rfrm-my-redis"
+      - contains:
+          path: spec.dnsNames
+          content: "rfrm-my-redis.tenant-test.svc.cluster.local"
+      # Redis slaves service
+      - contains:
+          path: spec.dnsNames
+          content: "rfrs-my-redis"
+      - contains:
+          path: spec.dnsNames
+          content: "rfrs-my-redis.tenant-test.svc.cluster.local"
+      # Sentinel service
+      - contains:
+          path: spec.dnsNames
+          content: "rfs-my-redis"
+      - contains:
+          path: spec.dnsNames
+          content: "rfs-my-redis.tenant-test.svc.cluster.local"
+
+  - it: "leaf Certificate SAN list includes wildcard for per-pod headless DNS"
+    templates:
+      - templates/certmanager.yaml
+    set:
+      external: true
+      tls:
+        enabled: true
+    documentIndex: 3
+    asserts:
+      - contains:
+          path: spec.dnsNames
+          content: "*.rfr-my-redis"
+      - contains:
+          path: spec.dnsNames
+          content: "*.rfr-my-redis.tenant-test.svc"
+      - contains:
+          path: spec.dnsNames
+          content: "*.rfr-my-redis.tenant-test.svc.cluster.local"
+
+  - it: "leaf Certificate SAN list includes external tenant hostname when external=true and TLS is on"
+    templates:
+      - templates/certmanager.yaml
+    set:
+      external: true
+      tls:
+        enabled: true
+    documentIndex: 3
+    asserts:
+      - contains:
+          path: spec.dnsNames
+          content: "my-redis.example.com"
+      - contains:
+          path: spec.dnsNames
+          content: "my-redis.redis.example.com"
+
+  - it: "redisfailover.yaml passes TLS settings to the operator when TLS is enabled"
+    templates:
+      - templates/redisfailover.yaml
+    set:
+      external: true
+      tls:
+        enabled: true
+    documentSelector:
+      path: kind
+      value: RedisFailover
+    asserts:
+      - equal:
+          path: spec.tls.enabled
+          value: true
+      - equal:
+          path: spec.tls.authClients
+          value: "no"
+      - equal:
+          path: spec.tls.certificateSecret.secretName
+          value: my-redis.tls
+      # The name the operator publishes its CA-only Secret under. Pinned so the
+      # name stays predictable rather than falling back to the operator's
+      # "<tls-secret>-ca" default; nothing in the tenant read path depends on
+      # it, which travels through the <release>.tenant-ca projection.
+      - equal:
+          path: spec.tls.caCertSecretName
+          value: my-redis.ca-cert
+
+  - it: "leaf Certificate carries the loopback IP SANs the in-pod clients dial"
+    templates:
+      - templates/certmanager.yaml
+    set:
+      external: true
+      tls:
+        enabled: true
+    documentIndex: 3
+    asserts:
+      # redis_exporter dials rediss://127.0.0.1 and verifies against the CA. A
+      # DNS SAN for localhost does not match an IP literal, so both loopback
+      # addresses have to be present as IP SANs or the sidecar cannot scrape.
+      - contains:
+          path: spec.ipAddresses
+          content: "127.0.0.1"
+      - contains:
+          path: spec.ipAddresses
+          content: "::1"
+
+  - it: "dashboard-resourcemap.yaml grants no TLS secret in RBAC when authClients defaults to no"
+    templates:
+      - templates/dashboard-resourcemap.yaml
+    set:
+      external: true
+      tls:
+        enabled: true
+    documentSelector:
+      path: kind
+      value: Role
+    asserts:
+      # The negatives below address rules[1] by index, and notContains is
+      # fail-open on a path that does not exist, so a SECOND secrets rule
+      # granting the key-bearing Secrets would satisfy every one of them.
+      # Pin the rule count: the Role renders services, secrets and
+      # workloadmonitors, and nothing else.
+      - lengthEqual:
+          path: rules
+          count: 3
+      # The trust anchor reaches the tenant as the <release>.tenant-ca
+      # projection, not as a grant on a Secret name, so the Role lists exactly
+      # the auth Secret and nothing TLS-related.
+      - equal:
+          path: rules[1].resourceNames
+          value:
+            - my-redis-auth
+      # The CA-only Secret the operator publishes. Key-free today, but the name
+      # is the operator's to fill and RBAC cannot filter by key.
+      - notContains:
+          path: rules[1].resourceNames
+          content: "my-redis.ca-cert"
+      # CA certificate and private key.
+      - notContains:
+          path: rules[1].resourceNames
+          content: "my-redis.ca-tls"
+      # Server leaf and private key.
+      - notContains:
+          path: rules[1].resourceNames
+          content: "my-redis.tls"
+
+  - it: "dashboard-resourcemap.yaml withholds both key-bearing secrets in RBAC when authClients=yes"
+    templates:
+      - templates/dashboard-resourcemap.yaml
+    set:
+      external: true
+      tls:
+        enabled: true
+        authClients: "yes"
+    documentSelector:
+      path: kind
+      value: Role
+    asserts:
+      # The negatives below address rules[1] by index, and notContains is
+      # fail-open on a path that does not exist, so a SECOND secrets rule
+      # granting the key-bearing Secrets would satisfy every one of them.
+      # Pin the rule count: the Role renders services, secrets and
+      # workloadmonitors, and nothing else.
+      - lengthEqual:
+          path: rules
+          count: 3
+      - notContains:
+          path: rules[1].resourceNames
+          content: "my-redis.ca-cert"
+      # The server leaf carries tls.key. Granting it would let the tenant
+      # impersonate this release's Redis and Sentinel endpoints, so it stays
+      # withheld even though authClients=yes leaves the tenant without a
+      # client certificate the CA would accept.
+      - notContains:
+          path: rules[1].resourceNames
+          content: "my-redis.tls"
+      - notContains:
+          path: rules[1].resourceNames
+          content: "my-redis.ca-tls"
+
+  - it: "dashboard-resourcemap.yaml withholds both key-bearing secrets in RBAC when authClients=optional"
+    templates:
+      - templates/dashboard-resourcemap.yaml
+    set:
+      external: true
+      tls:
+        enabled: true
+        authClients: "optional"
+    documentSelector:
+      path: kind
+      value: Role
+    asserts:
+      # The negatives below address rules[1] by index, and notContains is
+      # fail-open on a path that does not exist, so a SECOND secrets rule
+      # granting the key-bearing Secrets would satisfy every one of them.
+      # Pin the rule count: the Role renders services, secrets and
+      # workloadmonitors, and nothing else.
+      - lengthEqual:
+          path: rules
+          count: 3
+      - notContains:
+          path: rules[1].resourceNames
+          content: "my-redis.ca-cert"
+      - notContains:
+          path: rules[1].resourceNames
+          content: "my-redis.tls"
+      - notContains:
+          path: rules[1].resourceNames
+          content: "my-redis.ca-tls"
+
+  # ------------------------------------------------------------------
+  # Case 3: external=true, tls.enabled=false -> TLS explicitly off
+  # ------------------------------------------------------------------
+  - it: "certmanager.yaml renders no documents when tls.enabled=false and external=true"
+    templates:
+      - templates/certmanager.yaml
+    set:
+      external: true
+      tls:
+        enabled: false
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  - it: "redisfailover.yaml has no spec.tls when tls.enabled=false and external=true"
+    templates:
+      - templates/redisfailover.yaml
+    set:
+      external: true
+      tls:
+        enabled: false
+    documentSelector:
+      path: kind
+      value: RedisFailover
+    asserts:
+      - notExists:
+          path: spec.tls
+
+  # ------------------------------------------------------------------
+  # Case 4: external=false, tls.enabled=true -> TLS explicitly on
+  # ------------------------------------------------------------------
+  - it: "certmanager.yaml renders 4 documents when tls.enabled=true overrides external=false"
+    templates:
+      - templates/certmanager.yaml
+    set:
+      external: false
+      tls:
+        enabled: true
+    asserts:
+      - hasDocuments:
+          count: 4
+
+  - it: "redisfailover.yaml has spec.tls.enabled=true when tls.enabled=true overrides external=false"
+    templates:
+      - templates/redisfailover.yaml
+    set:
+      external: false
+      tls:
+        enabled: true
+    documentSelector:
+      path: kind
+      value: RedisFailover
+    asserts:
+      - equal:
+          path: spec.tls.enabled
+          value: true
+
+  - it: "leaf Certificate SAN list omits external hostname when external=false"
+    templates:
+      - templates/certmanager.yaml
+    set:
+      external: false
+      tls:
+        enabled: true
+    documentIndex: 3
+    asserts:
+      - notContains:
+          path: spec.dnsNames
+          content: "my-redis.example.com"
+      - notContains:
+          path: spec.dnsNames
+          content: "my-redis.redis.example.com"
+
+  # ------------------------------------------------------------------
+  # authClients propagation
+  # ------------------------------------------------------------------
+  - it: "redisfailover.yaml passes tls.authClients=yes to spec.tls.authClients"
+    templates:
+      - templates/redisfailover.yaml
+    set:
+      tls:
+        enabled: true
+        authClients: "yes"
+    documentSelector:
+      path: kind
+      value: RedisFailover
+    asserts:
+      - equal:
+          path: spec.tls.authClients
+          value: "yes"
+
+  - it: "redisfailover.yaml passes tls.authClients=optional to spec.tls.authClients"
+    templates:
+      - templates/redisfailover.yaml
+    set:
+      tls:
+        enabled: true
+        authClients: "optional"
+    documentSelector:
+      path: kind
+      value: RedisFailover
+    asserts:
+      - equal:
+          path: spec.tls.authClients
+          value: "optional"
+
+  # ------------------------------------------------------------------
+  # Cluster domain customization
+  # ------------------------------------------------------------------
+  - it: "leaf Certificate SAN list honours a custom cluster domain"
+    templates:
+      - templates/certmanager.yaml
+    set:
+      tls:
+        enabled: true
+      _cluster:
+        cluster-domain: my.cluster.local
+    documentIndex: 3
+    asserts:
+      - contains:
+          path: spec.dnsNames
+          content: "rfr-my-redis.tenant-test.svc.my.cluster.local"
+      - contains:
+          path: spec.dnsNames
+          content: "rfrm-my-redis.tenant-test.svc.my.cluster.local"
+      - contains:
+          path: spec.dnsNames
+          content: "rfs-my-redis.tenant-test.svc.my.cluster.local"
+      - contains:
+          path: spec.dnsNames
+          content: "*.rfr-my-redis.tenant-test.svc.my.cluster.local"
+
+  - it: "leaf Certificate SAN list falls back to the cozystack cluster domain when none is set"
+    templates:
+      - templates/certmanager.yaml
+    set:
+      tls:
+        enabled: true
+      # Blanks the suite-level cluster-domain so the template falls back. The
+      # platform always injects it; this pins the fallback to cozystack's own
+      # domain rather than the upstream Kubernetes default, so a SAN list built
+      # without it still matches the names services actually resolve under.
+      _cluster:
+        cluster-domain: ""
+    documentIndex: 3
+    asserts:
+      - contains:
+          path: spec.dnsNames
+          content: "rfr-my-redis.tenant-test.svc.cozy.local"
+      - contains:
+          path: spec.dnsNames
+          content: "*.rfr-my-redis.tenant-test.svc.cozy.local"
+      - notContains:
+          path: spec.dnsNames
+          content: "rfr-my-redis.tenant-test.svc.cluster.local"
+
+  - it: "leaf Certificate renders when the platform injects no _cluster map at all"
+    templates:
+      - templates/certmanager.yaml
+    set:
+      tls:
+        enabled: true
+      # Drops _cluster entirely. Indexing a nil map is a template error that
+      # fires before any default can apply, so without a guard on the parent
+      # map this render fails outright rather than falling back.
+      _cluster: null
+    documentIndex: 3
+    asserts:
+      - contains:
+          path: spec.dnsNames
+          content: "rfr-my-redis.tenant-test.svc.cozy.local"
+      - contains:
+          path: spec.dnsNames
+          content: "*.rfr-my-redis.tenant-test.svc.cozy.local"
+      - notContains:
+          path: spec.dnsNames
+          content: "rfr-my-redis.tenant-test.svc.cluster.local"
+
+  # A tenant with no host is legitimate — packages/apps/tenant leaves the
+  # computed host empty when neither the tenant nor its parent sets one. Such a
+  # release still has to render: an external Redis in a hostless tenant works
+  # today, and failing here would stop it dead on upgrade. There is simply no
+  # external name to certify, so the SAN is omitted and the in-cluster names
+  # still cover every verifying client inside the cluster.
+  - it: "leaf Certificate still renders with no external SAN when the namespace host is empty"
+    templates:
+      - templates/certmanager.yaml
+    set:
+      external: true
+      _namespace:
+        host: ""
+      tls:
+        enabled: true
+    documentIndex: 3
+    asserts:
+      - contains:
+          path: spec.dnsNames
+          content: "rfr-my-redis.tenant-test.svc.cluster.local"
+      - notContains:
+          path: spec.dnsNames
+          content: "my-redis."
+      - notContains:
+          path: spec.dnsNames
+          content: "my-redis.redis."
+
+  - it: "leaf Certificate still renders with no external SAN when no namespace map is injected"
+    templates:
+      - templates/certmanager.yaml
+    set:
+      external: true
+      _namespace: null
+      tls:
+        enabled: true
+    documentIndex: 3
+    asserts:
+      - contains:
+          path: spec.dnsNames
+          content: "rfr-my-redis.tenant-test.svc.cluster.local"
+      - notContains:
+          path: spec.dnsNames
+          content: "my-redis."
+      - notContains:
+          path: spec.dnsNames
+          content: "my-redis.example.com"
+
+  # ------------------------------------------------------------------
+  # Null and empty forms. The `default (dict)` guard in _tls.tpl covers a nil
+  # tls map and `kindIs "invalid"` covers a map with no enabled key; both
+  # resolve to off, same as omitting tls entirely.
+  # ------------------------------------------------------------------
+  - it: "tls set to null leaves TLS off even when external is true"
+    templates:
+      - templates/certmanager.yaml
+    set:
+      external: true
+      tls: null
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  - it: "tls set to null leaves TLS off when external is false"
+    templates:
+      - templates/certmanager.yaml
+    set:
+      external: false
+      tls: null
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  # An explicitly null tls.enabled is rejected by values.schema.json before any
+  # template runs ("at '/tls/enabled': got null, want boolean"), so it has no
+  # test here. The kindIs "invalid" guard in _tls.tpl covers the reachable
+  # shape: tls present as a map with no enabled key at all, which index returns
+  # nil for. That is the tls: {} case, exercised below.
+  - it: "tls given as an empty map leaves TLS off even when external is true"
+    templates:
+      - templates/certmanager.yaml
+    set:
+      external: true
+      tls: {}
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  - it: "tls given as an empty map leaves TLS off when external is false"
+    templates:
+      - templates/certmanager.yaml
+    set:
+      external: false
+      tls: {}
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  # The operator publishes a CA-only Secret whenever TLS is on; caCertSecretName
+  # only chooses its name. Nothing in the tenant read path reads it — the anchor
+  # travels as the <release>.tenant-ca projection — so this pins the name for
+  # predictability, and the test below pins that the tenant is NOT granted it.
+  - it: "the operator is told to publish the CA-only secret under a predictable name"
+    templates:
+      - templates/redisfailover.yaml
+    set:
+      external: true
+      tls:
+        enabled: true
+    documentSelector:
+      path: kind
+      value: RedisFailover
+    asserts:
+      - equal:
+          path: spec.tls.caCertSecretName
+          value: my-redis.ca-cert
+
+  - it: "the tenant is not granted the operator's CA-only secret by name"
+    templates:
+      - templates/dashboard-resourcemap.yaml
+    set:
+      external: true
+      tls:
+        enabled: true
+    documentSelector:
+      path: kind
+      value: Role
+    asserts:
+      # The negatives below address rules[1] by index, and notContains is
+      # fail-open on a path that does not exist, so a SECOND secrets rule
+      # granting the key-bearing Secrets would satisfy every one of them.
+      # Pin the rule count: the Role renders services, secrets and
+      # workloadmonitors, and nothing else.
+      - lengthEqual:
+          path: rules
+          count: 3
+      - notContains:
+          path: rules[1].resourceNames
+          content: "my-redis.ca-cert"
+
+  # The chart creates <release>-external-lb itself when external is on. It
+  # resolves in-cluster like any Service, so a client dialing it by name needs
+  # it in the SAN list; without it the handshake fails hostname verification
+  # against a Service this very chart owns.
+  - it: "leaf Certificate covers the external LoadBalancer Service name"
+    templates:
+      - templates/certmanager.yaml
+    set:
+      external: true
+      tls:
+        enabled: true
+    documentIndex: 3
+    asserts:
+      - contains:
+          path: spec.dnsNames
+          content: "my-redis-external-lb"
+      - contains:
+          path: spec.dnsNames
+          content: "my-redis-external-lb.tenant-test.svc"
+      - contains:
+          path: spec.dnsNames
+          content: "my-redis-external-lb.tenant-test.svc.cluster.local"
+
+  - it: "leaf Certificate omits the external LoadBalancer name when external is off"
+    templates:
+      - templates/certmanager.yaml
+    set:
+      external: false
+      tls:
+        enabled: true
+    documentIndex: 3
+    asserts:
+      - notContains:
+          path: spec.dnsNames
+          content: "my-redis-external-lb"
+
+  # The enum on tls.authClients is a schema constraint with no rendered form
+  # to assert on; pin that an unknown value fails validation before any
+  # template renders.
+  - it: "an unknown tls.authClients value fails schema validation"
+    templates:
+      - templates/redisfailover.yaml
+    set:
+      tls:
+        enabled: true
+        authClients: maybe
+    asserts:
+      - failedTemplate:
+          errorPattern: "authClients.*must be one of"
diff --git a/packages/apps/redis/values.schema.json b/packages/apps/redis/values.schema.json
index a9cb0a5aaf..4bf3e0964d 100644
--- a/packages/apps/redis/values.schema.json
+++ b/packages/apps/redis/values.schema.json
@@ -117,15 +117,18 @@
           "rule": "self == oldSelf",
           "message": "storageClass is immutable"
         }
-      ]
+      ],
+      "x-cozystack-options": {
+        "source": "storageclass"
+      }
     },
     "external": {
-      "description": "Enable external access from outside the cluster.",
+      "description": "Enable external access from outside the cluster. Can be enabled only when the instance is created, together with `tls.enabled: true`; turning it on for an existing instance, or changing `tls.enabled` while it is on, is refused at admission.",
       "type": "boolean",
       "default": false
     },
     "version": {
-      "description": "Redis major version to deploy",
+      "description": "Redis major version to deploy. The Redis and Sentinel pods run the same image.",
       "type": "string",
       "default": "v8",
       "enum": [
@@ -133,10 +136,132 @@
         "v7"
       ]
     },
+    "tls": {
+      "description": "TLS configuration. TLS is opt-in and is not inferred from `external`.",
+      "type": "object",
+      "default": {},
+      "properties": {
+        "authClients": {
+          "description": "Maps to the Redis `tls-auth-clients` directive. Defaults to `no` — the server certificate is presented but client certificates are not validated. `yes` requires a client certificate signed by this release's CA, which the platform does not issue. Changing it restarts the Redis and Sentinel pods, because the directive is read from the config file once at startup.",
+          "type": "string",
+          "enum": [
+            "no",
+            "optional",
+            "yes"
+          ]
+        },
+        "enabled": {
+          "description": "Enable TLS for Redis and Sentinel connections. Disabled unless set. Enabling it moves Redis and Sentinel to a TLS-only listener, so existing plaintext clients must be migrated at the same time. Encryption is provided by the redis-operator fork that mounts the certificate Secret into both Redis and Sentinel pods at `/tls`.",
+          "type": "boolean"
+        }
+      }
+    },
     "authEnabled": {
       "description": "Enable password generation.",
       "type": "boolean",
       "default": true
+    },
+    "minReplicasToWrite": {
+      "description": "Redis `min-replicas-to-write`: the master refuses writes unless at least this many replicas are connected and within `minReplicasMaxLag`. Unset by default, which leaves the Redis default (disabled). With `replicas: 2` and a value of 1 the master rejects writes while its only replica is down, trading availability for a bound on the writes lost if an isolated master is failed over. Replication stays asynchronous, so this bounds the loss, it does not remove it. Must be 0 or more and below `replicas` (a master with `replicas` pods has `replicas - 1` replicas), otherwise every write is refused; the chart refuses such a value.",
+      "type": "integer",
+      "minimum": 0
+    },
+    "minReplicasMaxLag": {
+      "description": "Redis `min-replicas-max-lag`, in seconds: a replica whose last acknowledgement is older than this does not count towards `minReplicasToWrite`. Unset by default, which leaves the Redis default (10). Has no effect unless `minReplicasToWrite` is set. Must be at least 1 when `minReplicasToWrite` is set: Redis treats 0 as disabling the check, so the chart refuses it.",
+      "type": "integer",
+      "minimum": 0
+    },
+    "sentinel": {
+      "description": "Sentinel configuration. When `sentinel.resources` is empty and `sentinel.resourcesPreset` is unset, the three Sentinel pods are sized like the Redis pods (`resources` and `resourcesPreset`). An empty `sentinel.resources` map counts as unset, as an empty top-level `resources` does.",
+      "type": "object",
+      "default": {},
+      "properties": {
+        "resources": {
+          "description": "Explicit CPU and memory configuration for each Sentinel pod. Keys left out are filled from the preset in `sentinel.resourcesPreset`.",
+          "type": "object",
+          "properties": {
+            "cpu": {
+              "description": "CPU available to each replica.",
+              "pattern": "^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$",
+              "anyOf": [
+                {
+                  "type": "integer"
+                },
+                {
+                  "type": "string"
+                }
+              ],
+              "x-kubernetes-int-or-string": true
+            },
+            "memory": {
+              "description": "Memory (RAM) available to each replica.",
+              "pattern": "^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$",
+              "anyOf": [
+                {
+                  "type": "integer"
+                },
+                {
+                  "type": "string"
+                }
+              ],
+              "x-kubernetes-int-or-string": true
+            }
+          }
+        },
+        "resourcesPreset": {
+          "description": "Sizing preset for the Sentinel pods. Defaults to `resourcesPreset`.",
+          "type": "string",
+          "enum": [
+            "t1.nano",
+            "t1.micro",
+            "t1.small",
+            "t1.medium",
+            "t1.large",
+            "t1.xlarge",
+            "t1.2xlarge",
+            "t1.4xlarge",
+            "c1.nano",
+            "c1.micro",
+            "c1.small",
+            "c1.medium",
+            "c1.large",
+            "c1.xlarge",
+            "c1.2xlarge",
+            "c1.4xlarge",
+            "s1.nano",
+            "s1.micro",
+            "s1.small",
+            "s1.medium",
+            "s1.large",
+            "s1.xlarge",
+            "s1.2xlarge",
+            "s1.4xlarge",
+            "u1.nano",
+            "u1.micro",
+            "u1.small",
+            "u1.medium",
+            "u1.large",
+            "u1.xlarge",
+            "u1.2xlarge",
+            "u1.4xlarge",
+            "m1.nano",
+            "m1.micro",
+            "m1.small",
+            "m1.medium",
+            "m1.large",
+            "m1.xlarge",
+            "m1.2xlarge",
+            "m1.4xlarge",
+            "nano",
+            "micro",
+            "small",
+            "medium",
+            "large",
+            "xlarge",
+            "2xlarge"
+          ]
+        }
+      }
     }
   }
 }
diff --git a/packages/apps/redis/values.yaml b/packages/apps/redis/values.yaml
index 6c081502e5..2a580c8e6f 100644
--- a/packages/apps/redis/values.yaml
+++ b/packages/apps/redis/values.yaml
@@ -69,21 +69,63 @@ size: 1Gi
 
 ## @param {string} storageClass - StorageClass used to store the data.
 ## @immutable
+## @x-cozystack-options {source: storageclass}
 storageClass: ""
 
-## @param {bool} external - Enable external access from outside the cluster.
+## @param {bool} external - Enable external access from outside the cluster. Can be enabled only when the instance is created, together with `tls.enabled: true`; turning it on for an existing instance, or changing `tls.enabled` while it is on, is refused at admission.
 external: false
 
 ## @enum {string} Version
 ## @value v8
 ## @value v7
 
-## @param {Version} version - Redis major version to deploy
+## @param {Version} version - Redis major version to deploy. The Redis and Sentinel pods run the same image.
 version: v8
 
+##
+## @section TLS parameters
+##
+
+## @enum {string} AuthClients - Values accepted by the Redis `tls-auth-clients` directive.
+## @value no
+## @value optional
+## @value yes
+
+## @typedef {struct} TLS - TLS configuration.
+## @field {*bool} [enabled] - Enable TLS for Redis and Sentinel connections. Disabled unless set. Enabling it moves Redis and Sentinel to a TLS-only listener, so existing plaintext clients must be migrated at the same time. Encryption is provided by the redis-operator fork that mounts the certificate Secret into both Redis and Sentinel pods at `/tls`.
+## @field {AuthClients} [authClients] - Maps to the Redis `tls-auth-clients` directive. Defaults to `no` — the server certificate is presented but client certificates are not validated. `yes` requires a client certificate signed by this release's CA, which the platform does not issue. Changing it restarts the Redis and Sentinel pods, because the directive is read from the config file once at startup.
+
+## @param {TLS} [tls] - TLS configuration. TLS is opt-in and is not inferred from `external`.
+# Stays empty on purpose. Spelling out `authClients: "no"` here would make the
+# generated README show the default instead of `{}`, but cozyvalues-gen quotes a
+# default only for the literal types `string` and `quantity`; an `@enum` alias
+# like AuthClients falls through to a YAML re-parse where `no` becomes boolean
+# false. The schema would get `"default": false` on a string-typed enum property
+# and the Go field `+kubebuilder:default:=false`. The default is resolved in
+# templates/_tls.tpl instead, and
+# hack/check-values-schema-string-defaults.bats fails on the coercion.
+tls: {}
+
 ##
 ## @section Application-specific parameters
 ##
 
 ## @param {bool} authEnabled - Enable password generation.
 authEnabled: true
+
+## @param {*int} [minReplicasToWrite] - Redis `min-replicas-to-write`: the master refuses writes unless at least this many replicas are connected and within `minReplicasMaxLag`. Unset by default, which leaves the Redis default (disabled). With `replicas: 2` and a value of 1 the master rejects writes while its only replica is down, trading availability for a bound on the writes lost if an isolated master is failed over. Replication stays asynchronous, so this bounds the loss, it does not remove it. Must be 0 or more and below `replicas` (a master with `replicas` pods has `replicas - 1` replicas), otherwise every write is refused; the chart refuses such a value.
+## @minimum 0
+
+## @param {*int} [minReplicasMaxLag] - Redis `min-replicas-max-lag`, in seconds: a replica whose last acknowledgement is older than this does not count towards `minReplicasToWrite`. Unset by default, which leaves the Redis default (10). Has no effect unless `minReplicasToWrite` is set. Must be at least 1 when `minReplicasToWrite` is set: Redis treats 0 as disabling the check, so the chart refuses it.
+## @minimum 0
+
+##
+## @section Sentinel parameters
+##
+
+## @typedef {struct} Sentinel - Sentinel configuration.
+## @field {Resources} [resources] - Explicit CPU and memory configuration for each Sentinel pod. Keys left out are filled from the preset in `sentinel.resourcesPreset`.
+## @field {ResourcesPreset} [resourcesPreset] - Sizing preset for the Sentinel pods. Defaults to `resourcesPreset`.
+
+## @param {Sentinel} [sentinel] - Sentinel configuration. When `sentinel.resources` is empty and `sentinel.resourcesPreset` is unset, the three Sentinel pods are sized like the Redis pods (`resources` and `resourcesPreset`). An empty `sentinel.resources` map counts as unset, as an empty top-level `resources` does.
+sentinel: {}
diff --git a/packages/apps/tcp-balancer/Chart.yaml b/packages/apps/tcp-balancer/Chart.yaml
index a65c69e74e..3676e89563 100644
--- a/packages/apps/tcp-balancer/Chart.yaml
+++ b/packages/apps/tcp-balancer/Chart.yaml
@@ -4,4 +4,4 @@ description: Layer4 load balancer service
 icon: /logos/haproxy.svg
 type: application
 version: 0.0.0 # Placeholder, the actual version will be automatically set during the build process
-appVersion: "2.9.7"
+appVersion: "3.4.4"
diff --git a/packages/apps/tcp-balancer/Makefile b/packages/apps/tcp-balancer/Makefile
index e3bf78fe2c..606e4863d6 100644
--- a/packages/apps/tcp-balancer/Makefile
+++ b/packages/apps/tcp-balancer/Makefile
@@ -1,5 +1,10 @@
 include ../../../hack/package.mk
 
+.PHONY: generate test
+
 generate:
 	cozyvalues-gen -m 'tcpbalancer' -v values.yaml -s values.schema.json -r README.md -g ../../../api/apps/v1alpha1/tcpbalancer/types.go
 	../../../hack/update-crd.sh
+
+test:
+	helm unittest .
diff --git a/packages/apps/tcp-balancer/README.md b/packages/apps/tcp-balancer/README.md
index 375d117140..f7b03483d6 100644
--- a/packages/apps/tcp-balancer/README.md
+++ b/packages/apps/tcp-balancer/README.md
@@ -24,16 +24,16 @@ Managed TCP Load Balancer Service efficiently utilizes HAProxy for load balancin
 
 ### Application-specific parameters
 
-| Name                             | Description                                                   | Type       | Value   |
-| -------------------------------- | ------------------------------------------------------------- | ---------- | ------- |
-| `httpAndHttps`                   | HTTP and HTTPS configuration.                                 | `object`   | `{}`    |
-| `httpAndHttps.mode`              | Mode for balancer.                                            | `string`   | `tcp`   |
-| `httpAndHttps.targetPorts`       | Target ports configuration.                                   | `object`   | `{}`    |
-| `httpAndHttps.targetPorts.http`  | HTTP port number.                                             | `int`      | `80`    |
-| `httpAndHttps.targetPorts.https` | HTTPS port number.                                            | `int`      | `443`   |
-| `httpAndHttps.endpoints`         | Endpoint addresses list.                                      | `[]string` | `[]`    |
-| `whitelistHTTP`                  | Secure HTTP by whitelisting client networks (default: false). | `bool`     | `false` |
-| `whitelist`                      | List of allowed client networks.                              | `[]string` | `[]`    |
+| Name                             | Description                                                                                               | Type       | Value   |
+| -------------------------------- | --------------------------------------------------------------------------------------------------------- | ---------- | ------- |
+| `httpAndHttps`                   | HTTP and HTTPS configuration.                                                                             | `object`   | `{}`    |
+| `httpAndHttps.mode`              | Mode for balancer.                                                                                        | `string`   | `tcp`   |
+| `httpAndHttps.targetPorts`       | Target ports configuration.                                                                               | `object`   | `{}`    |
+| `httpAndHttps.targetPorts.http`  | HTTP port number.                                                                                         | `int`      | `80`    |
+| `httpAndHttps.targetPorts.https` | HTTPS port number.                                                                                        | `int`      | `443`   |
+| `httpAndHttps.endpoints`         | Endpoint addresses list.                                                                                  | `[]string` | `[]`    |
+| `whitelistHTTP`                  | Secure HTTP and HTTPS by whitelisting client networks. Requires a non-empty `whitelist` (default: false). | `bool`     | `false` |
+| `whitelist`                      | List of allowed client networks.                                                                          | `[]string` | `[]`    |
 
 
 ## Parameter examples and reference
@@ -41,7 +41,7 @@ Managed TCP Load Balancer Service efficiently utilizes HAProxy for load balancin
 ### resources and resourcesPreset
 
 `resources` sets explicit CPU and memory configurations for each replica.
-When left empty, the preset defined in `resourcesPreset` is applied.
+Every resource it leaves unset is taken from the preset defined in `resourcesPreset`.
 
 ```yaml
 resources:
@@ -52,6 +52,6 @@ resources:
 `resourcesPreset` sets named CPU and memory configurations for each replica.
 This setting is ignored if the corresponding `resources` value is set.
 
-Presets follow a cloud-style `<series>.<size>` naming convention. Five series cover the full CPU-to-memory ratio range (`t1` 1:0.5, `c1` 1:1, `s1` 1:2, `u1` 1:4, `m1` 1:8) and each series ships eight sizes (`nano` through `4xlarge`). The legacy flat names (`nano`, `micro`, `small`, `medium`, `large`, `xlarge`, `2xlarge`) remain accepted as deprecated aliases of their 1:1 instance-type equivalents.
+Presets follow a cloud-style `<series>.<size>` naming convention. Five series cover the full CPU-to-memory ratio range (`t1` 1:0.5, `c1` 1:1, `s1` 1:2, `u1` 1:4, `m1` 1:8) and each series ships eight sizes (`nano` through `4xlarge`). The legacy flat names (`nano`, `micro`, `small`, `medium`, `large`, `xlarge`, `2xlarge`) remain accepted as deprecated aliases and keep their original sizes, which do not follow one series: `nano` through `small` equal the `t1` sizes of the same name, while `medium` equals `c1.small` rather than `c1.medium`.
 
 See [`docs/operations/resource-presets.md`](../../../docs/operations/resource-presets.md) for the full size matrix and the legacy-to-instance-type mapping.
diff --git a/packages/apps/tcp-balancer/templates/configmap.yaml b/packages/apps/tcp-balancer/templates/configmap.yaml
index c94db1578e..122c10254c 100644
--- a/packages/apps/tcp-balancer/templates/configmap.yaml
+++ b/packages/apps/tcp-balancer/templates/configmap.yaml
@@ -34,22 +34,23 @@ data:
         timeout check           10s
 
     {{- with .Values.httpAndHttps }}
+    {{- if and $.Values.whitelistHTTP (not $.Values.whitelist) }}
+    {{- fail "whitelistHTTP is enabled but whitelist is empty" }}
+    {{- end }}
     {{- if .targetPorts.http }}
     frontend http
         bind :::8080 v4v6
         mode tcp
-        default_backend http
+        default_backend http_backend
         {{- if $.Values.whitelistHTTP }}
-        {{- with $.Values.whitelist }}
-        acl whitelist src{{ range . }} {{ . }}{{ end }}
-        {{- end }}
+        acl whitelist src{{ range $.Values.whitelist }} {{ . }}{{ end }}
         acl all src 0.0.0.0
         tcp-request content accept if whitelist
         tcp-request content reject
         {{- end }}
         tcp-request content set-dst-port int(80)
 
-    backend http
+    backend http_backend
         {{- include "backendoptions" (default "tcp" .mode) | nindent 8 }}
         {{- range $num, $ep := .endpoints }} 
         server srv{{ $num }} {{ $ep }}:{{ $.Values.httpAndHttps.targetPorts.http }} check
@@ -64,18 +65,16 @@ data:
         {{- else }}
         mode tcp
         {{- end }}
-        default_backend https
+        default_backend https_backend
         {{- if $.Values.whitelistHTTP }}
-        {{- with $.Values.whitelist }}
-        acl whitelist src{{ range . }} {{ . }}{{ end }}
-        {{- end }}
+        acl whitelist src{{ range $.Values.whitelist }} {{ . }}{{ end }}
         acl all src 0.0.0.0
         tcp-request content accept if whitelist
         tcp-request content reject
         {{- end }}
         tcp-request content set-dst-port int(443)
 
-    backend https
+    backend https_backend
         {{- include "backendoptions" (default "tcp" .mode) | nindent 8 }}
         {{- range $num, $ep := .endpoints }} 
         server srv{{ $num }} {{ $ep }}:{{ $.Values.httpAndHttps.targetPorts.https }} check
@@ -89,32 +88,32 @@ data:
     frontend kubernetes
         bind :::6443 v4v6
         mode tcp
-        default_backend kubernetes
+        default_backend kubernetes_backend
         {{- with $.Values.whitelist }}
         acl whitelist src{{ range . }} {{ . }}{{ end }}
-        {{- end }}
         acl all src 0.0.0.0
         tcp-request content accept if whitelist
         tcp-request content reject
+        {{- end }}
 
     frontend talos
         bind :::50000 v4v6
         mode tcp
-        default_backend talos
+        default_backend talos_backend
         {{- with $.Values.whitelist }}
         acl whitelist src{{ range . }} {{ . }}{{ end }}
-        {{- end }}
         acl all src 0.0.0.0
         tcp-request content accept if whitelist
         tcp-request content reject
+        {{- end }}
 
-    backend kubernetes
+    backend kubernetes_backend
         {{- include "backendoptions" (default "tcp" .mode) | nindent 8 }}
         {{- range $num, $ep := .endpoints }} 
         server srv{{ $num }} {{ $ep }}:6443 check
         {{- end }}
 
-    backend talos
+    backend talos_backend
         {{- include "backendoptions" (default "tcp" .mode) | nindent 8 }}
         {{- range $num, $ep := .endpoints }} 
         server srv{{ $num }} {{ $ep }}:50000 check
diff --git a/packages/apps/tcp-balancer/templates/deployment.yaml b/packages/apps/tcp-balancer/templates/deployment.yaml
index e23c389189..7bd7b4bc70 100644
--- a/packages/apps/tcp-balancer/templates/deployment.yaml
+++ b/packages/apps/tcp-balancer/templates/deployment.yaml
@@ -32,7 +32,7 @@ spec:
                   - {{ .Release.Name }}-haproxy
               topologyKey: kubernetes.io/hostname
       containers:
-      - image: haproxy:latest
+      - image: haproxy:{{ .Chart.AppVersion }}
         name: haproxy
         resources: {{- include "cozy-lib.resources.defaultingSanitize" (list .Values.resourcesPreset .Values.resources $) | nindent 10 }}
         ports:
diff --git a/packages/apps/tcp-balancer/tests/deployment_test.yaml b/packages/apps/tcp-balancer/tests/deployment_test.yaml
new file mode 100644
index 0000000000..2366867f02
--- /dev/null
+++ b/packages/apps/tcp-balancer/tests/deployment_test.yaml
@@ -0,0 +1,25 @@
+suite: haproxy deployment
+
+templates:
+  - templates/deployment.yaml
+  - templates/configmap.yaml
+
+tests:
+  - it: pins the haproxy image to the chart appVersion
+    template: templates/deployment.yaml
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].image
+          value: haproxy:3.4.4
+      - notMatchRegex:
+          path: spec.template.spec.containers[0].image
+          pattern: ':latest$'
+
+  - it: follows the chart appVersion when it changes
+    template: templates/deployment.yaml
+    chart:
+      appVersion: 9.9.9
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].image
+          value: haproxy:9.9.9
diff --git a/packages/apps/tcp-balancer/tests/haproxy-config_test.yaml b/packages/apps/tcp-balancer/tests/haproxy-config_test.yaml
new file mode 100644
index 0000000000..4c88445838
--- /dev/null
+++ b/packages/apps/tcp-balancer/tests/haproxy-config_test.yaml
@@ -0,0 +1,132 @@
+suite: haproxy config
+
+templates:
+  - templates/configmap.yaml
+
+tests:
+  - it: names backends so they never collide with frontends
+    asserts:
+      - matchRegex:
+          path: data["haproxy.cfg"]
+          pattern: '(?m)^frontend http$'
+      - matchRegex:
+          path: data["haproxy.cfg"]
+          pattern: '(?m)^backend http_backend$'
+      - matchRegex:
+          path: data["haproxy.cfg"]
+          pattern: '(?m)^\s+default_backend http_backend$'
+      - notMatchRegex:
+          path: data["haproxy.cfg"]
+          pattern: '(?m)^backend http$'
+      - matchRegex:
+          path: data["haproxy.cfg"]
+          pattern: '(?m)^frontend https$'
+      - matchRegex:
+          path: data["haproxy.cfg"]
+          pattern: '(?m)^backend https_backend$'
+      - matchRegex:
+          path: data["haproxy.cfg"]
+          pattern: '(?m)^\s+default_backend https_backend$'
+      - notMatchRegex:
+          path: data["haproxy.cfg"]
+          pattern: '(?m)^backend https$'
+
+  - it: renders http frontends without whitelist rules by default
+    asserts:
+      - notMatchRegex:
+          path: data["haproxy.cfg"]
+          pattern: 'acl whitelist'
+      - notMatchRegex:
+          path: data["haproxy.cfg"]
+          pattern: 'tcp-request content accept if whitelist'
+
+  - it: fails when whitelistHTTP is enabled with an empty whitelist
+    set:
+      whitelistHTTP: true
+      whitelist: []
+    asserts:
+      - failedTemplate:
+          errorPattern: 'whitelistHTTP is enabled but whitelist is empty'
+
+  - it: filters http and https when whitelistHTTP is enabled with a whitelist
+    set:
+      whitelistHTTP: true
+      whitelist:
+        - 10.0.0.0/8
+        - 192.168.1.1
+    asserts:
+      - matchRegex:
+          path: data["haproxy.cfg"]
+          pattern: '(?m)^frontend http$\n(?:[ \t]+.*\n)*?[ \t]+acl whitelist src 10\.0\.0\.0/8 192\.168\.1\.1\n[ \t]+acl all src 0\.0\.0\.0\n[ \t]+tcp-request content accept if whitelist\n[ \t]+tcp-request content reject$'
+      - matchRegex:
+          path: data["haproxy.cfg"]
+          pattern: '(?m)^frontend https$\n(?:[ \t]+.*\n)*?[ \t]+acl whitelist src 10\.0\.0\.0/8 192\.168\.1\.1\n[ \t]+acl all src 0\.0\.0\.0\n[ \t]+tcp-request content accept if whitelist\n[ \t]+tcp-request content reject$'
+
+  - it: renames kubernetes and talos backends
+    set:
+      kubernetesAndTalos:
+        endpoints:
+          - 10.1.1.1
+          - 10.1.1.2
+    asserts:
+      - matchRegex:
+          path: data["haproxy.cfg"]
+          pattern: '(?m)^frontend kubernetes$'
+      - matchRegex:
+          path: data["haproxy.cfg"]
+          pattern: '(?m)^\s+default_backend kubernetes_backend$'
+      - matchRegex:
+          path: data["haproxy.cfg"]
+          pattern: '(?m)^backend kubernetes_backend$'
+      - notMatchRegex:
+          path: data["haproxy.cfg"]
+          pattern: '(?m)^backend kubernetes$'
+      - matchRegex:
+          path: data["haproxy.cfg"]
+          pattern: '(?m)^frontend talos$'
+      - matchRegex:
+          path: data["haproxy.cfg"]
+          pattern: '(?m)^\s+default_backend talos_backend$'
+      - matchRegex:
+          path: data["haproxy.cfg"]
+          pattern: '(?m)^backend talos_backend$'
+      - notMatchRegex:
+          path: data["haproxy.cfg"]
+          pattern: '(?m)^backend talos$'
+      - matchRegex:
+          path: data["haproxy.cfg"]
+          pattern: '(?m)^\s+server srv0 10\.1\.1\.1:6443 check\s*$'
+      - matchRegex:
+          path: data["haproxy.cfg"]
+          pattern: '(?m)^\s+server srv1 10\.1\.1\.2:50000 check\s*$'
+
+  - it: renders kubernetes and talos without whitelist rules when the whitelist is empty
+    set:
+      kubernetesAndTalos:
+        endpoints:
+          - 10.1.1.1
+    asserts:
+      - notMatchRegex:
+          path: data["haproxy.cfg"]
+          pattern: 'acl whitelist'
+      - notMatchRegex:
+          path: data["haproxy.cfg"]
+          pattern: 'tcp-request content accept if whitelist'
+      - notMatchRegex:
+          path: data["haproxy.cfg"]
+          pattern: 'tcp-request content reject'
+
+  - it: filters kubernetes and talos when a whitelist is set
+    set:
+      kubernetesAndTalos:
+        endpoints:
+          - 10.1.1.1
+      whitelist:
+        - 10.0.0.0/8
+    asserts:
+      - matchRegex:
+          path: data["haproxy.cfg"]
+          pattern: '(?m)^frontend kubernetes$\n(?:[ \t]+.*\n)*?[ \t]+acl whitelist src 10\.0\.0\.0/8\n[ \t]+acl all src 0\.0\.0\.0\n[ \t]+tcp-request content accept if whitelist\n[ \t]+tcp-request content reject$'
+      - matchRegex:
+          path: data["haproxy.cfg"]
+          pattern: '(?m)^frontend talos$\n(?:[ \t]+.*\n)*?[ \t]+acl whitelist src 10\.0\.0\.0/8\n[ \t]+acl all src 0\.0\.0\.0\n[ \t]+tcp-request content accept if whitelist\n[ \t]+tcp-request content reject$'
diff --git a/packages/apps/tcp-balancer/values.schema.json b/packages/apps/tcp-balancer/values.schema.json
index b05fe7ea07..b36e9d64c6 100644
--- a/packages/apps/tcp-balancer/values.schema.json
+++ b/packages/apps/tcp-balancer/values.schema.json
@@ -149,7 +149,7 @@
       }
     },
     "whitelistHTTP": {
-      "description": "Secure HTTP by whitelisting client networks (default: false).",
+      "description": "Secure HTTP and HTTPS by whitelisting client networks. Requires a non-empty `whitelist` (default: false).",
       "type": "boolean",
       "default": false
     },
diff --git a/packages/apps/tcp-balancer/values.yaml b/packages/apps/tcp-balancer/values.yaml
index ee2f04fd7f..1dc7dbe27d 100644
--- a/packages/apps/tcp-balancer/values.yaml
+++ b/packages/apps/tcp-balancer/values.yaml
@@ -92,7 +92,7 @@ httpAndHttps:
     https: 443
   endpoints: []
 
-## @param {bool} whitelistHTTP - Secure HTTP by whitelisting client networks (default: false).
+## @param {bool} whitelistHTTP - Secure HTTP and HTTPS by whitelisting client networks. Requires a non-empty `whitelist` (default: false).
 whitelistHTTP: false
 ## Example:
 ## whitelistHTTP: true
diff --git a/packages/apps/tenant/Chart.yaml b/packages/apps/tenant/Chart.yaml
index 4763591851..1fa3d3253d 100644
--- a/packages/apps/tenant/Chart.yaml
+++ b/packages/apps/tenant/Chart.yaml
@@ -4,3 +4,7 @@ description: Separated tenant namespace
 icon: /logos/tenant.svg
 type: application
 version: 0.0.0 # Placeholder, the actual version will be automatically set during the build process
+dependencies:
+  - name: cozy-lib
+    version: "*"
+    repository: "file://charts/cozy-lib"
diff --git a/packages/apps/tenant/README.md b/packages/apps/tenant/README.md
index c70ff0f27f..5cd48995c9 100644
--- a/packages/apps/tenant/README.md
+++ b/packages/apps/tenant/README.md
@@ -70,20 +70,27 @@ tenant-u1
     └── postgres-db1
 ```
 
+### Network isolation
+
+Tenant network isolation is enforced with Cilium network policies. On the `isp-hosted` and `isp-hosted-slim` platform variants the CNI belongs to the host, so these policies are created only if the host serves the Cilium policy API when the tenant is installed or updated. On a host without Cilium, tenants get no network isolation from Cozystack, and isolating them is up to the host. If Cilium appears on the host later, the policies are created on the tenant's next chart or values change, not automatically.
+
 ## Parameters
 
 ### Common parameters
 
-| Name              | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    | Type                  | Value   |
-| ----------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------- | ------- |
-| `host`            | The hostname used to access tenant services (defaults to using the tenant name as a subdomain for its parent tenant host).                                                                                                                                                                                                                                                                                                                                                                                                                     | `string`              | `""`    |
-| `etcd`            | Deploy own Etcd cluster.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       | `bool`                | `false` |
-| `monitoring`      | Deploy own Monitoring Stack.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   | `bool`                | `false` |
-| `ingress`         | Deploy own Ingress Controller.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | `bool`                | `false` |
-| `gateway`         | Deploy own Gateway API Gateway (backed by Cilium Gateway API controller). When unset (the default), the chart auto-enables the Gateway for tenants whose apex is derived from the parent (i.e. `host` is empty), and leaves it off for tenants with a custom non-derived apex. Set to `true` or `false` explicitly to override that auto-behaviour. Note: leave the key absent (do not write `gateway: null`) — the chart distinguishes "unset" via missing-key, not via null value, to satisfy the JSON schema generated from this comment. | `bool`                | `false` |
-| `seaweedfs`       | Deploy own SeaweedFS.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | `bool`                | `false` |
-| `schedulingClass` | The name of a SchedulingClass CR to apply scheduling constraints for this tenant's workloads.                                                                                                                                                                                                                                                                                                                                                                                                                                                  | `string`              | `""`    |
-| `resourceQuotas`  | Define resource quotas for the tenant.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | `map[string]quantity` | `{}`    |
+| Name              | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | Type                  | Value   |
+| ----------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------- | ------- |
+| `host`            | The hostname used to access tenant services (defaults to using the tenant name as a subdomain for its parent tenant host).                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       | `string`              | `""`    |
+| `etcd`            | Deploy own Etcd cluster.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | `bool`                | `false` |
+| `monitoring`      | Deploy own Monitoring Stack.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | `bool`                | `false` |
+| `tracingCentral`  | Send this tenant's traces to the shared VictoriaTraces store in tenant-root instead of a per-tenant backend; its Grafana reads them through a vmauth there that pins the tenant's own account, so tenants sharing the store cannot read each other's traces. It needs the tenant's own Monitoring (`monitoring: true`) and tenant-root hosting the store (`tracingCentralHost: true` on its Monitoring, with a `cluster`-mode tracingStorages entry named `generic`); without that the tenant's monitoring render fails rather than dropping spans. tenant-root, and whoever it admits to its Grafana, are inside the store's trust boundary. Applications should export over OTLP/HTTP, in requests below 3 MiB: spans above the platform's per-tenant write rate are retried over HTTP but dropped over gRPC, and a larger request is refused and not retried. | `bool`                | `false` |
+| `ingress`         | Deploy own Ingress Controller.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   | `bool`                | `false` |
+| `gateway`         | Deploy own Gateway API Gateway (backed by Cilium Gateway API controller). When unset (the default) or set to `false`, the tenant does not own a Gateway and instead publishes through the nearest ancestor tenant that owns one, regardless of whether `host` is empty or custom (`false` currently behaves the same as unset and does not opt out of that inheritance). Set to `true` to give the tenant its own Gateway with its own LoadBalancer IP and Certificate. A tenant with a custom (non-derived) `host` that needs its apex publicly reachable must set `true` explicitly, because an ancestor's TLS certificate does not cover a custom apex. Note: leave the key absent (do not write `gateway: null`): the chart distinguishes "unset" via missing-key, not via null value, to satisfy the JSON schema generated from this comment.               | `bool`                | `false` |
+| `gatewayClass`    | GatewayClass for this tenant's own Gateway. Empty uses the platform default (`gateway.className`). Only the classes the operator lists in the platform's `gateway.tenantSelectableClasses`, plus that default, may be named here — anything else fails this tenant's own gateway release and reaches no other tenant. Read only when this tenant owns a Gateway; an inheriting tenant uses its ancestor's. Whether a class terminates TLS itself or at its provider's edge is declared once per class on the platform, not here.                                                                                                                                                                                                                                                                                                                               | `string`              | `""`    |
+| `seaweedfs`       | Deploy own SeaweedFS.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | `bool`                | `false` |
+| `computeplane`    | Deploy own ComputePlane — a single-tenant, Cozystack-managed cluster for untrusted-code applications. The tenant receives no admin kubeconfig for it. Automatic routing of catalog applications onto it (placement: ComputePlane) is a planned follow-up and is not available yet; until it lands, external catalogs target the cluster via its computeplane-cluster-admin-kubeconfig Secret. See design-proposals/compute-plane in cozystack/community.                                                                                                                                                                                                                                                                                                                                                                                                       | `bool`                | `false` |
+| `schedulingClass` | The name of a SchedulingClass CR to apply scheduling constraints for this tenant's workloads.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    | `string`              | `""`    |
+| `resourceQuotas`  | Define resource quotas for the tenant.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | `map[string]quantity` | `{}`    |
 
 
 ## Configuration
diff --git a/packages/apps/tenant/templates/_helpers.tpl b/packages/apps/tenant/templates/_helpers.tpl
index 6d687cb863..428a606576 100644
--- a/packages/apps/tenant/templates/_helpers.tpl
+++ b/packages/apps/tenant/templates/_helpers.tpl
@@ -53,6 +53,38 @@
   typing, so the "key absent" form is what distinguishes "unset"
   from explicit `false`.
 */}}
+{{/*
+  tenant.ancestorTenantLabels emits the full set of
+  `tenant.cozystack.io/<ancestor>: ""` namespace labels for the tenant whose
+  namespace name is passed as the single argument (e.g. "tenant-ktj-htdev").
+
+  Every tenant descends from tenant-root, so that label is always emitted.
+  The remaining ancestors are encoded in the namespace name itself: tenant.name
+  constructs each child namespace as `<parent-namespace>-<word>`, so every
+  progressive dash-prefix of the name is a real ancestor namespace
+  (tenant-ktj-htdev -> tenant-ktj, tenant-ktj-htdev). The last prefix is the
+  tenant's own name, so its self-label is included too.
+
+  Deriving the chain from the name (rather than from a lookup of the parent
+  namespace's labels) is deterministic: it needs no cluster state, renders
+  identically offline, and converges on every reconcile regardless of the
+  order in which parent and child HelmReleases reconcile. It replaces an
+  earlier splitList over `.Release.Namespace` that only ever reached one level
+  up and therefore dropped tenant-root for tenants at depth >= 2 — breaking the
+  `<ancestor>-egress` CiliumClusterwideNetworkPolicy that grants an ancestor
+  reachability to its descendants via the `tenant.cozystack.io/<ancestor>`
+  namespace label.
+*/}}
+{{- define "tenant.ancestorTenantLabels" -}}
+{{- $parts := splitList "-" . -}}
+tenant.cozystack.io/tenant-root: ""
+{{- range $i, $v := $parts }}
+{{- if ne $i 0 }}
+{{ printf "tenant.cozystack.io/%s: \"\"" (join "-" (slice $parts 0 (add $i 1))) }}
+{{- end }}
+{{- end }}
+{{- end -}}
+
 {{- define "tenant.gatewayEffective" -}}
 {{- if kindIs "invalid" .Values.gateway -}}
 false
@@ -60,3 +92,24 @@ false
 {{- if .Values.gateway -}}true{{- else -}}false{{- end -}}
 {{- end -}}
 {{- end -}}
+
+{{- /* The shared-central tracing hops out of a tenant: an opted-in tenant with
+       Monitoring (which deploys the collector and Grafana that use them),
+       never tenant-root, which hosts the shared store. Both egress rules read
+       this one condition so the write and read paths cannot be split. */}}
+{{- define "tenant.tracingCentralEgress" -}}
+{{- if and (ne (include "tenant.name" .) "tenant-root") .Values.tracingCentral .Values.monitoring -}}true{{- end -}}
+{{- end -}}
+
+{{- /* Every variant but the isp-hosted ones installs Cilium itself, so the
+       policies render unconditionally there: a CRD missing at render time
+       must fail the install, not leave the tenant unisolated for good, since
+       helm-controller does not re-render a release when discovery changes.
+       isp-hosted runs on the host's CNI, which may or may not be Cilium. */ -}}
+{{- define "tenant.ciliumPolicies" -}}
+{{- if not (has (include "cozy-lib.bundle-name" .) (list "isp-hosted" "isp-hosted-slim")) -}}
+true
+{{- else if and (.Capabilities.APIVersions.Has "cilium.io/v2/CiliumNetworkPolicy") (.Capabilities.APIVersions.Has "cilium.io/v2/CiliumClusterwideNetworkPolicy") -}}
+true
+{{- end -}}
+{{- end -}}
diff --git a/packages/apps/tenant/templates/cleanup-job.yaml b/packages/apps/tenant/templates/cleanup-job.yaml
index 0f13daa488..ffa07d0fee 100644
--- a/packages/apps/tenant/templates/cleanup-job.yaml
+++ b/packages/apps/tenant/templates/cleanup-job.yaml
@@ -21,7 +21,7 @@ metadata:
 rules:
 - apiGroups: ["helm.toolkit.fluxcd.io"]
   resources: ["helmreleases"]
-  verbs: ["get", "list", "delete"]
+  verbs: ["get", "list", "watch", "delete"]
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
@@ -51,6 +51,50 @@ metadata:
     helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
     helm.sh/hook-weight: "0"
 spec:
+  # A pre-delete hook that never finishes is worse than one that fails: helm
+  # returns from Uninstall.Run before it deletes anything, so the release stays
+  # in storage, flux keeps the finalizer, and the same teardown is retried. The
+  # budget for the whole attempt is spec.uninstall.timeout / spec.timeout on the
+  # tenant HelmRelease; cozystack-api generates it with neither, so it is
+  # helm-controller's 300s default.
+  #
+  # 270s, not 300s. This deadline runs from the Job's startTime and helm's
+  # budget from just before it creates the Job, so equal values would have helm
+  # give up first — and it would give up on a Job that is still running, which is
+  # today's behaviour rather than a fix for it. The 90s above the two bounded
+  # waits inside is what a cold image pull gets to spend before the deadline
+  # starts cutting runs that were going to finish.
+  #
+  # The 30s below the budget is not all margin: helm learns of the failure at
+  # the deadline plus the pod's termination period, because since 1.31 the Job
+  # controller withholds the terminal condition until the pods have finished
+  # terminating. terminationGracePeriodSeconds below is set against this number
+  # for that reason, and the two are only meaningful together — raising either
+  # without the other is what puts the failure back outside the budget.
+  #
+  # Some bound is needed regardless of the waits: the waits bound the watch
+  # phase, not the DELETE calls themselves, which carry kubectl's default
+  # --request-timeout of 0.
+  #
+  # What the remainder buys is not exact. Past the SIGKILL there is still the
+  # kubelet status update and the pod object going away before the condition
+  # lands, and none of that is visible from a rendered manifest, so the test
+  # checks deadline + grace against the budget and stops there. Treat the tail
+  # as unmeasured rather than as slack.
+  #
+  # This path also costs the diagnosis: on DeadlineExceeded the Job controller
+  # deletes the active pods, so the wave that hung leaves no log behind. The
+  # expected path is the wave's own --timeout below, where the script exits and
+  # the failed pod keeps its output until ttlSecondsAfterFinished reaps it. The
+  # deadline is the backstop for a kubectl that never returns at all.
+  activeDeadlineSeconds: 270
+  # One attempt, so the script's exit status is the Job's. At the default of 6
+  # the failure never reaches helm inside the budget: the operator gets a bare
+  # "timed out waiting for the condition" instead of the wave that could not
+  # finish. Needed under either restartPolicy — 6 restarts in place under
+  # OnFailure, 6 fresh pods under Never — so it is not implied by the policy
+  # below.
+  backoffLimit: 0
   ttlSecondsAfterFinished: 300
   template:
     metadata:
@@ -59,12 +103,59 @@ spec:
         policy.cozystack.io/allow-to-apiserver: "true"
     spec:
       serviceAccountName: {{ include "tenant.name" . }}-cleanup
-      restartPolicy: OnFailure
+      # Never, so that "one attempt" is the truth rather than the intent. Under
+      # OnFailure the pod survives its own failure and the kubelet re-runs the
+      # container in place; the Job controller only learns of it afterwards, by
+      # summing restartCount, and caps the Job then. The script therefore starts
+      # over — re-entering the applications wave that just expired — and is cut
+      # down mid-run once the controller catches up. Never leaves a failed pod
+      # the controller sees directly, with nothing re-executed in between.
+      restartPolicy: Never
+      # Part of the deadline, not a detail of it. Since 1.31 the Job controller
+      # withholds the terminal Failed condition until every pod has finished
+      # terminating, so what helm waits for is the deadline plus however long
+      # this pod takes to die. The default 30s would put that at 270+30 — level
+      # with helm's budget, which is the state activeDeadlineSeconds above is
+      # set 30s under the budget to avoid.
+      #
+      # The full period is spent, not merely bounded by. The SIGTERM goes to
+      # PID 1, which is the /bin/sh below: the script runs several commands, so
+      # the shell never execs into kubectl and stays PID 1 itself. A signal
+      # carrying its default disposition is discarded by the kernel when the
+      # target is PID 1, and a non-interactive shell installs no SIGTERM
+      # handler, so nothing acts on it. kubectl is a child and was not
+      # signalled at all. The pod ends on the SIGKILL that closes this period,
+      # every time. Nothing in the script needs to finish gracefully — the
+      # DELETE calls are already sent, and the process is only watching — so a
+      # short period costs nothing and keeps the failure inside the budget.
+      terminationGracePeriodSeconds: 10
+      securityContext:
+        runAsNonRoot: true
+        runAsUser: 65534
+        seccompProfile:
+          type: RuntimeDefault
       containers:
       - name: cleanup
-        image: bitnami/kubectl:latest
+        image: docker.io/clastix/kubectl:v1.32
+        securityContext:
+          allowPrivilegeEscalation: false
+          capabilities:
+            drop: ["ALL"]
+        # Requests, because backoffLimit above removed the second chance this
+        # pod used to have. With no requests it is BestEffort and first in line
+        # under node pressure; previously an eviction was absorbed by a retry
+        # inside the same Job, and now it fails the whole uninstall attempt.
+        # Values match the sibling hook in packages/apps/kubernetes, which runs
+        # the same image doing the same kind of work.
+        resources:
+          requests:
+            cpu: 10m
+            memory: 64Mi
+          limits:
+            cpu: 200m
+            memory: 128Mi
         command:
-        - /bin/bash
+        - /bin/sh
         - -c
         - |
           set -e
@@ -72,14 +163,49 @@ spec:
           
           echo "Cleaning up HelmReleases in namespace: $NAMESPACE"
           
+          # --timeout is not optional here: kubectl reads the default of 0 as
+          # "wait forever" and substitutes a week, so --wait on its own hangs
+          # this hook for as long as any child HelmRelease cannot finalize. Two
+          # bounded waits of 90s leave the rest of the Job's deadline to
+          # scheduling, the image pull and the delete calls themselves.
+          #
+          # 90s is not enough for every tenant, and is not meant to be. An
+          # applications wave holding a nested Tenant, or an app of kind
+          # Kubernetes whose own pre-delete hook spends two 120s waits before it
+          # starts working, expires here on the first attempt and converges
+          # across flux's uninstall retries instead. Neither of those fits the
+          # 300s budget as it stands either, so for them the bound costs
+          # nothing that works today.
+          #
+          # Between the two there is a band that does pay. Every generated child
+          # HelmRelease carries a wait strategy, so a wave inherits its slowest
+          # child; one that settles in, say, 95s completes inside the 300s
+          # budget today and will expire here instead, trading a clean single
+          # attempt for one extra flux retry. That is the price of the bound,
+          # and it is worth it against the alternative — an unbounded wave does
+          # not fail, it consumes the whole budget and leaves helm reporting a
+          # timeout with nothing named in it. If the band turns out to be
+          # populated in practice, raise the waits and the deadline together:
+          # hack/tenant-pre-delete-hook.bats pins their ordering, not their
+          # values.
+          #
+          # Neither is guarded, deliberately. Nothing stands behind these two
+          # deletes — they are the cleanup, not a backstop in front of one — so
+          # a wave that did not finish has to end the run under `set -e` rather
+          # than report success it cannot claim. Ending it also keeps the
+          # ordering the two waves exist for: the tenant modules below are what
+          # the applications above run on, and tearing them out from under
+          # applications that are still deleting makes the namespace harder to
+          # remove, not easier. Whatever did get deleted stays deleted, so the
+          # next uninstall attempt resumes from there.
           echo "Deleting Applications"
           kubectl delete helmreleases.helm.toolkit.fluxcd.io -n "$NAMESPACE" \
             -l 'apps.cozystack.io/application.kind,internal.cozystack.io/tenantmodule!=true' \
-            --ignore-not-found=true --wait=true
+            --ignore-not-found=true --wait=true --timeout=90s
 
           echo "Deleting Tenant Modules"
           kubectl delete helmreleases.helm.toolkit.fluxcd.io -n "$NAMESPACE" \
             -l 'apps.cozystack.io/application.kind,internal.cozystack.io/tenantmodule=true' \
-            --ignore-not-found=true --wait=true
+            --ignore-not-found=true --wait=true --timeout=90s
           
           echo "Cleanup completed successfully"
diff --git a/packages/apps/tenant/templates/computeplane.yaml b/packages/apps/tenant/templates/computeplane.yaml
new file mode 100644
index 0000000000..4a44acbbba
--- /dev/null
+++ b/packages/apps/tenant/templates/computeplane.yaml
@@ -0,0 +1,66 @@
+{{- /*
+  ComputePlane tenant module.
+
+  When enabled, deploys the operator-owned computeplane module chart
+  (packages/extra/computeplane), which in turn provisions a single-tenant,
+  Cozystack-managed cluster for untrusted-code workloads by deploying the
+  ordinary `kubernetes` app with operator-fixed values. The tenant gets no
+  admin kubeconfig for that cluster; see design-proposals/compute-plane in
+  cozystack/community.
+*/}}
+{{- if .Values.computeplane }}
+{{- /*
+  Fail loudly when the module is toggled on without its backing package: the
+  computeplane-application package ships in the iaas bundle while this toggle
+  arrives with tenant-rd in the system bundle, and bundles are independent
+  booleans. Without this guard a system+paas install would render a
+  HelmRelease pointing at a nonexistent ExternalArtifact and retry forever
+  with no diagnostic. The Capabilities gate keeps the check active in-cluster
+  (the Package CRD is always installed there) while letting offline renders
+  (helm template / helm-unittest, where lookup returns nothing) pass. Note
+  the guard deliberately fails closed on a nil lookup once the API group is
+  discoverable: a client-side `helm template --validate` against a live
+  cluster would trip it, but no packaging path in this repo renders the
+  tenant chart that way — Flux renders in-cluster where lookup works.
+*/}}
+{{- if .Capabilities.APIVersions.Has "cozystack.io/v1alpha1" }}
+{{- if not (lookup "cozystack.io/v1alpha1" "Package" "" "cozystack.computeplane-application") }}
+{{- fail "computeplane module is enabled, but the cozystack.computeplane-application package is not installed — it ships in the iaas bundle (set bundles.iaas.enabled: true)" }}
+{{- end }}
+{{- end }}
+apiVersion: helm.toolkit.fluxcd.io/v2
+kind: HelmRelease
+metadata:
+  name: computeplane
+  namespace: {{ include "tenant.name" . }}
+  labels:
+    sharding.fluxcd.io/key: tenants
+    internal.cozystack.io/tenantmodule: "true"
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    apps.cozystack.io/application.kind: ComputePlane
+    apps.cozystack.io/application.group: apps.cozystack.io
+    apps.cozystack.io/application.name: computeplane
+spec:
+  # No spec.releaseName — the aggregated API rebuilds HelmRelease specs
+  # without it, so the release name must equal the object name (as in every
+  # other tenant module). The cluster HelmRelease this module renders is the
+  # separately-named computeplane-cluster, whose derived release name makes
+  # Kamaji write the admin kubeconfig to computeplane-cluster-admin-kubeconfig
+  # (see packages/extra/computeplane/templates/cluster.yaml).
+  chartRef:
+    kind: ExternalArtifact
+    name: cozystack-computeplane-application-kubevirt-computeplane
+    namespace: cozy-system
+  interval: 5m
+  timeout: 10m
+  install:
+    remediation:
+      retries: -1
+  upgrade:
+    remediation:
+      retries: -1
+  valuesFrom:
+  - kind: Secret
+    name: cozystack-values
+{{- end }}
diff --git a/packages/apps/tenant/templates/etcd.yaml b/packages/apps/tenant/templates/etcd.yaml
index 71e0b548d6..12eccde826 100644
--- a/packages/apps/tenant/templates/etcd.yaml
+++ b/packages/apps/tenant/templates/etcd.yaml
@@ -13,16 +13,55 @@ metadata:
     apps.cozystack.io/application.group: apps.cozystack.io
     apps.cozystack.io/application.name: etcd
 spec:
+  # This release creates a VMPodScrape resource guarded by the
+  # victoria-metrics-operator admission webhook (failurePolicy: Fail). On a cold
+  # install the operator can be briefly unavailable on :9443, so gate on its
+  # HelmRelease becoming Ready to avoid an install failure → rollback. The system
+  # monitoring components gate on the operator the same way, via a variant-level
+  # dependsOn in packages/core/platform/sources/monitoring.yaml.
+  dependsOn:
+    - name: victoria-metrics-operator
+      namespace: cozy-victoria-metrics-operator
   chartRef:
     kind: ExternalArtifact
     name: cozystack-etcd-application-default-etcd
     namespace: cozy-system
   interval: 5m
   timeout: 30m
+  {{- /* Flux's default install strategy remediates a failed install by
+         uninstalling, and install remediation is an uninstall in every case
+         Flux offers. This release does not disable hooks on it, so that
+         uninstall runs the etcd chart's post-delete cleanup Job, which deletes
+         the data-etcd-<ordinal> PVCs by name because the etcd-operator does not
+         reclaim them when the EtcdCluster goes. An install that misses its
+         budget therefore destroys the datastore the tenant control planes keep
+         their state in, and the next attempt starts from an empty cluster
+         rather than resuming the one already converging. RetryOnFailure keeps
+         the manifests applied and retries the failed release, so no uninstall
+         happens and the cleanup Job never runs. Both actions carry the strategy
+         because the controller performs that retry as an upgrade, so on install
+         alone the retry's own failure falls through to upgrade remediation.
+         Two things are traded away. A genuine upgrade failure now retries
+         rather than rolls back, which gives up no stable safety net: with
+         retries: -1 and the default strategy, upgrade remediation already
+         rolled back and retried without end. And the uninstall was the only
+         automatic clean slate, so an install wedged on a bad resource state
+         retries against that state until an operator removes the release. For
+         a release that owns data that is the right exchange, because lost data
+         does not come back and a wedged install does. The remediation blocks
+         stay because an absent release consults
+         install and an out-of-sync one consults upgrade, both by retry count
+         rather than by strategy. */}}
   install:
+    strategy:
+      name: RetryOnFailure
+      retryInterval: 30s
     remediation:
       retries: -1
   upgrade:
+    strategy:
+      name: RetryOnFailure
+      retryInterval: 30s
     remediation:
       retries: -1
   valuesFrom:
diff --git a/packages/apps/tenant/templates/gateway.yaml b/packages/apps/tenant/templates/gateway.yaml
index afb5398113..33501313a2 100644
--- a/packages/apps/tenant/templates/gateway.yaml
+++ b/packages/apps/tenant/templates/gateway.yaml
@@ -19,12 +19,45 @@ spec:
     namespace: cozy-system
   interval: 5m
   timeout: 10m
+  {{- /* Install remediation is an uninstall in every case Flux offers, and this
+         release does not disable hooks on it, so a remediated install runs the
+         gateway chart's post-delete cleanup Job. That Job deletes the
+         cozystack-acme-account Secret. The key regenerates on the next install,
+         so unlike the storage-owning releases this costs no data: it costs a
+         re-registration against the ACME provider, and repeated cycles run into
+         its rate limits, which can hold certificate issuance for the tenant
+         down for hours. RetryOnFailure keeps the manifests applied and retries
+         the failed release instead, so no uninstall happens and the cleanup Job
+         never runs. Both actions carry the strategy because the controller
+         performs that retry as an upgrade. Two things are traded away: a real
+         upgrade failure now retries rather than rolls back, which gives up no
+         stable safety net, since with retries: -1 the default strategy already
+         rolled back and retried without end; and the uninstall was the only
+         automatic clean slate, so an install wedged on a bad resource state
+         retries against it until an operator removes the release. The
+         remediation blocks stay because an absent release consults install and
+         an out-of-sync one consults upgrade, both by retry count rather than by
+         strategy. */}}
   install:
+    strategy:
+      name: RetryOnFailure
+      retryInterval: 30s
     remediation:
       retries: -1
   upgrade:
+    strategy:
+      name: RetryOnFailure
+      retryInterval: 30s
     remediation:
       retries: -1
+  {{- /* A tenant-selected class overrides the platform default. Rendered
+         only when set, so a tenant that does not choose one leaves the
+         gateway chart reading _cluster.gateway-class-name, and the key
+         does not appear in the release values at all. */}}
+  {{- with .Values.gatewayClass }}
+  values:
+    gatewayClassName: {{ . | quote }}
+  {{- end }}
   valuesFrom:
   - kind: Secret
     name: cozystack-values
diff --git a/packages/apps/tenant/templates/ingress.yaml b/packages/apps/tenant/templates/ingress.yaml
index 229ee7c62d..b5ed2288f2 100644
--- a/packages/apps/tenant/templates/ingress.yaml
+++ b/packages/apps/tenant/templates/ingress.yaml
@@ -13,6 +13,15 @@ metadata:
     apps.cozystack.io/application.group: apps.cozystack.io
     apps.cozystack.io/application.name: ingress
 spec:
+  # This release creates VMPodScrape resources guarded by the
+  # victoria-metrics-operator admission webhook (failurePolicy: Fail). On a cold
+  # install the operator can be briefly unavailable on :9443, so gate on its
+  # HelmRelease becoming Ready to avoid an install failure → rollback. The system
+  # monitoring components gate on the operator the same way, via a variant-level
+  # dependsOn in packages/core/platform/sources/monitoring.yaml.
+  dependsOn:
+    - name: victoria-metrics-operator
+      namespace: cozy-victoria-metrics-operator
   chartRef:
     kind: ExternalArtifact
     name: cozystack-ingress-application-default-ingress
diff --git a/packages/apps/tenant/templates/keycloakgroups.yaml b/packages/apps/tenant/templates/keycloakgroups.yaml
index 9e25e60d1f..f135a64a9c 100644
--- a/packages/apps/tenant/templates/keycloakgroups.yaml
+++ b/packages/apps/tenant/templates/keycloakgroups.yaml
@@ -1,4 +1,11 @@
-{{- $oidcEnabled := index .Values._cluster "oidc-enabled" }}
+{{- /* _cluster is injected by the platform, so it is absent whenever the chart
+       is rendered on its own, as `helm lint` and `helm template` do. `index`
+       errors on a nil map before any `| default` on its result can apply, so
+       the guard has to sit on the map rather than on the looked-up value. With
+       _cluster present this yields exactly what indexing it directly yielded;
+       with it absent the lookup is nil and the block below stays unrendered,
+       which is what an unconfigured tenant should produce. */ -}}
+{{- $oidcEnabled := index (.Values._cluster | default dict) "oidc-enabled" }}
 {{- if eq $oidcEnabled "true" }}
 {{- if .Capabilities.APIVersions.Has "v1.edp.epam.com/v1" }}
 apiVersion: v1.edp.epam.com/v1
diff --git a/packages/apps/tenant/templates/monitoring.yaml b/packages/apps/tenant/templates/monitoring.yaml
index 29dbf95ab8..30bc83ed83 100644
--- a/packages/apps/tenant/templates/monitoring.yaml
+++ b/packages/apps/tenant/templates/monitoring.yaml
@@ -13,16 +13,52 @@ metadata:
     apps.cozystack.io/application.group: apps.cozystack.io
     apps.cozystack.io/application.name: monitoring
 spec:
+  # This release (via its monitoring-system child) creates VM* custom resources
+  # guarded by the victoria-metrics-operator admission webhook (failurePolicy:
+  # Fail). On a cold install the operator can be briefly unavailable on :9443, so
+  # gate on its HelmRelease becoming Ready to avoid an install failure → rollback.
+  # Gating the parent keeps the monitoring-system child (which emits the VM* CRs)
+  # from being created until the operator is Ready. The system monitoring
+  # components gate on the operator the same way, via a variant-level dependsOn in
+  # packages/core/platform/sources/monitoring.yaml.
+  dependsOn:
+    - name: victoria-metrics-operator
+      namespace: cozy-victoria-metrics-operator
   chartRef:
     kind: ExternalArtifact
     name: cozystack-monitoring-application-default-monitoring
     namespace: cozy-system
   interval: 5m
   timeout: 10m
+  {{- /* Install remediation is an uninstall in every case Flux offers, and this
+         release does not disable hooks on it, so a remediated install runs the
+         monitoring chart's post-delete cleanup Job. That Job deletes PVCs by
+         apps.cozystack.io/application.name=<release>-system, which is the label
+         the metrics and logs claim templates stamp so the operator copies it
+         onto the storage PVCs. An install that only missed its readiness budget
+         therefore takes the tenant's metrics and logs with it, and nothing
+         reconstructs them. RetryOnFailure keeps the manifests applied and
+         retries the failed release instead, so no uninstall happens and the
+         cleanup Job never runs. Both actions carry the strategy because the
+         controller performs that retry as an upgrade. Two things are traded
+         away: a real upgrade failure now retries rather than rolls back, which
+         gives up no stable safety net, since with retries: -1 the default
+         strategy already rolled back and retried without end; and the uninstall
+         was the only automatic clean slate, so an install wedged on a bad
+         resource state retries against it until an operator removes the
+         release. The remediation blocks stay because an absent release consults
+         install and an out-of-sync one consults upgrade, both by retry count
+         rather than by strategy. */}}
   install:
+    strategy:
+      name: RetryOnFailure
+      retryInterval: 30s
     remediation:
       retries: -1
   upgrade:
+    strategy:
+      name: RetryOnFailure
+      retryInterval: 30s
     remediation:
       retries: -1
   valuesFrom:
diff --git a/packages/apps/tenant/templates/namespace.yaml b/packages/apps/tenant/templates/namespace.yaml
index 6e4ea1cb5c..558a3bccff 100644
--- a/packages/apps/tenant/templates/namespace.yaml
+++ b/packages/apps/tenant/templates/namespace.yaml
@@ -1,8 +1,14 @@
-{{/* Lookup for namespace uid (needed for ownerReferences) */}}
+{{/*
+  Lookup the parent namespace, used below to stamp the child namespace's
+  ownerReference uid. During a real helm-controller reconcile the parent
+  namespace (.Release.Namespace) always exists, so the ownerReference is
+  always emitted. The lookup returns empty only when rendering offline
+  (helm template / helm unittest), where the ownerReference is simply omitted
+  so the rest of the template — notably the ancestor labels below, which are
+  derived purely from the namespace name and need no cluster state — still
+  renders and can be unit-tested.
+*/}}
 {{- $existingNS := lookup "v1" "Namespace" "" .Release.Namespace }}
-{{- if not $existingNS }}
-{{- fail (printf "error lookup existing namespace: %s" .Release.Namespace) }}
-{{- end }}
 
 {{- if ne (include "tenant.name" .) "tenant-root" }}
 {{/* Compute namespace values once for use in both Secret and labels */}}
@@ -37,12 +43,14 @@
   owner's Gateway lists this namespace in allowedRoutes via the
   matching namespace.cozystack.io/gateway label.
 
-  Override fires only when the tenant itself owns a Gateway —
-  tenant.gatewayEffective returns "true" for explicit
-  tenant.spec.gateway=true and for tenants with a custom non-derived
-  host (their apex isn't covered by any ancestor's cert / Issuer).
-  In those cases the controller renders a separate Gateway in this
-  tenant's namespace, with its own LB Service / IP / Certificate.
+  Override fires only when the tenant itself owns a Gateway:
+  tenant.gatewayEffective returns "true" only for an explicit
+  tenant.spec.gateway=true, regardless of whether host is derived or
+  custom. In that case the controller renders a separate Gateway in
+  this tenant's namespace, with its own LB Service / IP / Certificate.
+  A tenant with a custom non-derived host that wants its apex routable
+  must set gateway=true explicitly, because no ancestor's cert / Issuer
+  covers that apex.
 
   Cross-namespace attach is gated by ReferenceGrants rendered by the
   TenantGateway controller in the owner namespace, one per child
@@ -75,13 +83,7 @@ metadata:
   name: {{ $tenantName }}
   {{- if hasPrefix "tenant-" .Release.Namespace }}
   labels:
-    tenant.cozystack.io/{{ $tenantName }}: ""
-    {{- $parts := splitList "-" .Release.Namespace }}
-    {{- range $i, $v := $parts }}
-    {{- if ne $i 0 }}
-    tenant.cozystack.io/{{ join "-" (slice $parts 0 (add $i 1)) }}: ""
-    {{- end }}
-    {{- end }}
+    {{- include "tenant.ancestorTenantLabels" $tenantName | nindent 4 }}
     {{/* Labels for network policies */}}
     namespace.cozystack.io/etcd: {{ $etcd | quote }}
     namespace.cozystack.io/ingress: {{ $ingress | quote }}
@@ -93,6 +95,7 @@ metadata:
     scheduler.cozystack.io/scheduling-class: {{ . | quote }}
     {{- end }}
     alpha.kubevirt.io/auto-memory-limits-ratio: "1.0"
+  {{- if $existingNS }}
   ownerReferences:
   - apiVersion: v1
     blockOwnerDeletion: true
@@ -101,6 +104,7 @@ metadata:
     name: {{ .Release.Namespace }}
     uid: {{ $existingNS.metadata.uid }}
   {{- end }}
+  {{- end }}
 ---
 apiVersion: v1
 kind: Secret
@@ -121,6 +125,9 @@ stringData:
       monitoring: {{ $monitoring | quote }}
       seaweedfs: {{ $seaweedfs | quote }}
       host: {{ $computedHost | quote }}
+      {{- if include "tenant.tracingCentralEgress" . }}
+      tracingCentral: true
+      {{- end }}
       {{- with $schedulingClass }}
       schedulingClass: {{ . | quote }}
       {{- end }}
diff --git a/packages/apps/tenant/templates/networkpolicy-traces-central-read.yaml b/packages/apps/tenant/templates/networkpolicy-traces-central-read.yaml
new file mode 100644
index 0000000000..df779a8eb5
--- /dev/null
+++ b/packages/apps/tenant/templates/networkpolicy-traces-central-read.yaml
@@ -0,0 +1,23 @@
+{{- if and (include "tenant.ciliumPolicies" .) (include "tenant.tracingCentralEgress" .) }}
+# Read hop of shared-central tracing: Grafana reaches the tenant-root vmauth,
+# never vtselect, which serves any account a client names.
+apiVersion: cilium.io/v2
+kind: CiliumClusterwideNetworkPolicy
+metadata:
+  name: {{ include "tenant.name" . }}-egress-traces-central-read
+spec:
+  endpointSelector:
+    matchLabels:
+      "k8s:io.kubernetes.pod.namespace": "{{ include "tenant.name" . }}"
+      "k8s:app": grafana
+  egress:
+  - toEndpoints:
+    - matchLabels:
+        "k8s:app.kubernetes.io/name": vmauth
+        "k8s:app.kubernetes.io/instance": traces-central
+        "k8s:io.kubernetes.pod.namespace": tenant-root
+    toPorts:
+    - ports:
+      - port: "8427"
+        protocol: TCP
+{{- end }}
diff --git a/packages/apps/tenant/templates/networkpolicy-traces-central.yaml b/packages/apps/tenant/templates/networkpolicy-traces-central.yaml
new file mode 100644
index 0000000000..7c6808555f
--- /dev/null
+++ b/packages/apps/tenant/templates/networkpolicy-traces-central.yaml
@@ -0,0 +1,25 @@
+{{- if and (include "tenant.ciliumPolicies" .) (include "tenant.tracingCentralEgress" .) }}
+# Write hop of shared-central tracing: the collector reaches the tenant-root
+# vmauth, never vtinsert, which takes the account from the writer's headers.
+# vmauth sets it from the tenant's VMUser login, so a pod that only carries
+# the collector's label reaches no account but this tenant's.
+apiVersion: cilium.io/v2
+kind: CiliumClusterwideNetworkPolicy
+metadata:
+  name: {{ include "tenant.name" . }}-egress-traces-central
+spec:
+  endpointSelector:
+    matchLabels:
+      "k8s:io.kubernetes.pod.namespace": "{{ include "tenant.name" . }}"
+      "k8s:app.kubernetes.io/name": "otel-traces"
+  egress:
+  - toEndpoints:
+    - matchLabels:
+        "k8s:app.kubernetes.io/name": vmauth
+        "k8s:app.kubernetes.io/instance": traces-central
+        "k8s:io.kubernetes.pod.namespace": tenant-root
+    toPorts:
+    - ports:
+      - port: "8427"
+        protocol: TCP
+{{- end }}
diff --git a/packages/apps/tenant/templates/networkpolicy.yaml b/packages/apps/tenant/templates/networkpolicy.yaml
index 4bd3ba02a4..5285b495a1 100644
--- a/packages/apps/tenant/templates/networkpolicy.yaml
+++ b/packages/apps/tenant/templates/networkpolicy.yaml
@@ -1,3 +1,4 @@
+{{- if include "tenant.ciliumPolicies" . }}
 ---
 apiVersion: cilium.io/v2
 kind: CiliumNetworkPolicy
@@ -215,6 +216,23 @@ spec:
 ---
 apiVersion: cilium.io/v2
 kind: CiliumNetworkPolicy
+metadata:
+  # Grafana pods install their plugins at startup from the in-cluster
+  # grafana-dashboards static file server instead of the public Grafana
+  # catalog (see packages/system/monitoring/templates/grafana/grafana.yaml),
+  # so the download keeps working without internet egress. Matching the
+  # whole namespace mirrors allow-to-dashboard / allow-to-keycloak.
+  name: allow-to-grafana-dashboards
+  namespace: {{ include "tenant.name" . }}
+spec:
+  endpointSelector: {}
+  egress:
+  - toEndpoints:
+      - matchLabels:
+          "k8s:io.kubernetes.pod.namespace": cozy-grafana-operator
+---
+apiVersion: cilium.io/v2
+kind: CiliumNetworkPolicy
 metadata:
   name: allow-to-cdi-upload-proxy
   namespace: {{ include "tenant.name" . }}
@@ -224,6 +242,23 @@ spec:
   - toEndpoints:
       - matchLabels:
           "k8s:io.kubernetes.pod.namespace": cozy-kubevirt-cdi
+---
+apiVersion: cilium.io/v2
+kind: CiliumNetworkPolicy
+metadata:
+  name: allow-to-vm-exportproxy
+  namespace: {{ include "tenant.name" . }}
+spec:
+  endpointSelector: {}
+  egress:
+  - toEndpoints:
+      - matchLabels:
+          "k8s:io.kubernetes.pod.namespace": cozy-kubevirt
+          kubevirt.io: virt-exportproxy
+    toPorts:
+    - ports:
+      - port: "8443"
+        protocol: TCP
 {{- if .Values.monitoring }}
 ---
 apiVersion: cilium.io/v2
@@ -257,3 +292,4 @@ spec:
   - toEndpoints:
     - matchLabels:
         cozystack.io/service: ingress
+{{- end }}
diff --git a/packages/apps/tenant/templates/seaweedfs.yaml b/packages/apps/tenant/templates/seaweedfs.yaml
index c0a1cf0c0c..a02cc22a3a 100644
--- a/packages/apps/tenant/templates/seaweedfs.yaml
+++ b/packages/apps/tenant/templates/seaweedfs.yaml
@@ -19,10 +19,40 @@ spec:
     namespace: cozy-system
   interval: 5m
   timeout: 10m
+  {{- /* Flux's default install strategy remediates a failed install by
+         uninstalling, and install remediation is an uninstall in every case
+         Flux offers. This release does not disable hooks on it, so that
+         uninstall runs the seaweedfs chart's post-delete cleanup Job, which
+         deletes the volume PVCs by label and explicitly reclaims the
+         keep-protected CNPG Cluster holding the filer metadata, precisely
+         because nothing else removes it. An install that misses its budget
+         therefore destroys the object store's data and the metadata database
+         that indexes it, and the next attempt starts from nothing rather than
+         resuming. RetryOnFailure keeps the manifests applied and retries the
+         failed release, so no uninstall happens and the cleanup Job never runs.
+         Both actions carry the strategy because the controller performs that
+         retry as an upgrade, so on install alone the retry's own failure falls
+         through to upgrade remediation. Two things are traded away. A genuine
+         upgrade failure now retries rather than rolls back, which gives up no
+         stable safety net: with retries: -1 and the default strategy, upgrade
+         remediation already rolled back and retried without end. And the
+         uninstall was the only automatic clean slate, so an install wedged on a
+         bad resource state retries against that state until an operator removes
+         the release. For a release that owns data that is the right exchange,
+         because lost data does not come back and a wedged install does. The
+         remediation blocks stay because an absent release consults install and
+         an out-of-sync one consults upgrade, both by retry count rather than by
+         strategy. */}}
   install:
+    strategy:
+      name: RetryOnFailure
+      retryInterval: 30s
     remediation:
       retries: -1
   upgrade:
+    strategy:
+      name: RetryOnFailure
+      retryInterval: 30s
     remediation:
       retries: -1
   valuesFrom:
diff --git a/packages/apps/tenant/tests/cleanup_role_watch_test.yaml b/packages/apps/tenant/tests/cleanup_role_watch_test.yaml
new file mode 100644
index 0000000000..b739a0cc35
--- /dev/null
+++ b/packages/apps/tenant/tests/cleanup_role_watch_test.yaml
@@ -0,0 +1,184 @@
+suite: tenant cleanup pre-delete hook
+
+# The pre-delete cleanup hook deletes the tenant's HelmReleases with
+# `kubectl delete --wait=true`, which sets up a watch on helmreleases to block
+# until finalization completes. Without the watch verb that watch is rejected
+# with HTTP 403, the delete call hangs, the Job never finishes, and tenant
+# deletion stalls on the hook. Pin the verb so it cannot regress.
+#
+# The Job runs kubectl from a maintained, version-pinned image. Pin the image
+# so it cannot drift back to an unpinned / sunset base (e.g. bitnami:latest),
+# and pin the command interpreter to a shell that image actually ships
+# (clastix/kubectl is Alpine — /bin/sh only, no /bin/bash) so the container
+# can exec at all.
+#
+# The two fields that stop the hook outliving the uninstall attempt are pinned
+# here because they describe the Job rather than the script, and the script
+# cannot observe them about itself. hack/tenant-pre-delete-hook.bats covers the
+# script's own behaviour by running it.
+
+# Render only the cleanup template. The list keeps an unrelated template breaking
+# out of this suite's result, so what reddens here is the hook it guards.
+# (namespace.yaml's `lookup` is not the reason: the lookup returns empty offline
+# and the template renders.)
+templates:
+  - templates/cleanup-job.yaml
+
+release:
+  name: tenant-test
+  namespace: tenant-test
+
+tests:
+  - it: cleanup Role grants watch on helmreleases
+    asserts:
+      - template: templates/cleanup-job.yaml
+        documentIndex: 1
+        isKind:
+          of: Role
+      - template: templates/cleanup-job.yaml
+        documentIndex: 1
+        contains:
+          path: rules[0].verbs
+          content: watch
+
+  - it: cleanup Job uses the maintained clastix kubectl image
+    asserts:
+      - template: templates/cleanup-job.yaml
+        documentIndex: 3
+        isKind:
+          of: Job
+      - template: templates/cleanup-job.yaml
+        documentIndex: 3
+        equal:
+          path: spec.template.spec.containers[0].image
+          value: docker.io/clastix/kubectl:v1.32
+
+  - it: cleanup Job invokes a shell the image actually ships
+    asserts:
+      - template: templates/cleanup-job.yaml
+        documentIndex: 3
+        isKind:
+          of: Job
+      - template: templates/cleanup-job.yaml
+        documentIndex: 3
+        equal:
+          path: spec.template.spec.containers[0].command[0]
+          value: /bin/sh
+
+  - it: cleanup Job cannot outlive the uninstall attempt that created it
+    # flux takes the uninstall budget from spec.uninstall.timeout / spec.timeout
+    # on the tenant HelmRelease, and cozystack-api generates it with neither, so
+    # the budget is helm-controller's 300s default. At or above that value helm
+    # gives up first and the Job outlives the attempt it belongs to: it is still
+    # running, so it has not finished, so ttlSecondsAfterFinished has not begun
+    # to count, and helm.sh/hook-delete-policy carries no hook-failed either.
+    # Nothing removes it until the next attempt's before-hook-creation sweep.
+    # hack/tenant-pre-delete-hook.bats holds the same ceiling as an ordering
+    # over the four numbers; this pins the value the chart ships.
+    asserts:
+      - template: templates/cleanup-job.yaml
+        documentIndex: 3
+        isKind:
+          of: Job
+      - template: templates/cleanup-job.yaml
+        documentIndex: 3
+        equal:
+          path: spec.activeDeadlineSeconds
+          value: 270
+
+  - it: cleanup Job pod is not BestEffort, since it gets a single attempt
+    # backoffLimit 0 removed the retry that used to absorb an eviction, so a pod
+    # that is first in line under node pressure now fails the whole uninstall
+    # attempt rather than one run inside it. Requests are what take it out of
+    # the BestEffort class; the values match the sibling hook in
+    # packages/apps/kubernetes running the same image.
+    asserts:
+      - template: templates/cleanup-job.yaml
+        documentIndex: 3
+        equal:
+          path: spec.template.spec.containers[0].resources.requests.cpu
+          value: 10m
+      - template: templates/cleanup-job.yaml
+        documentIndex: 3
+        equal:
+          path: spec.template.spec.containers[0].resources.requests.memory
+          value: 64Mi
+
+  - it: cleanup Job pod terminates well inside the uninstall budget
+    # Since 1.31 the Job controller withholds the terminal condition until every
+    # pod has finished terminating, so helm learns of the failure at
+    # activeDeadlineSeconds plus this period, not at the deadline. The full
+    # period is spent rather than bounded by: PID 1 is a shell running a
+    # multi-command script, so it never execs into kubectl, and a default
+    # disposition sent to PID 1 is discarded by the kernel while a
+    # non-interactive shell installs no handler for it. Nothing acts on the
+    # SIGTERM and the pod ends on the SIGKILL that closes this window. Left
+    # unset, the 30s default lands the failure at 270+30 — level with the
+    # budget, which is what the deadline is set under the budget to avoid.
+    asserts:
+      - template: templates/cleanup-job.yaml
+        documentIndex: 3
+        isKind:
+          of: Job
+      - template: templates/cleanup-job.yaml
+        documentIndex: 3
+        equal:
+          path: spec.template.spec.terminationGracePeriodSeconds
+          value: 10
+
+  - it: cleanup Job makes a single attempt so its failure reaches helm
+    # Both halves are load-bearing and neither implies the other. At the default
+    # backoffLimit of 6 none of the retries fits in what is left of the deadline,
+    # so helm never sees a failed Job and the operator gets a bare "timed out
+    # waiting for the condition" instead of the wave that could not finish. And
+    # under restartPolicy OnFailure the cap is applied only after the fact, by
+    # summing restartCount, so the kubelet re-runs the script in place first and
+    # the wave that just expired is re-entered before the Job controller cuts it
+    # down. Never puts a failed pod in front of the controller directly.
+    asserts:
+      - template: templates/cleanup-job.yaml
+        documentIndex: 3
+        isKind:
+          of: Job
+      - template: templates/cleanup-job.yaml
+        documentIndex: 3
+        equal:
+          path: spec.backoffLimit
+          value: 0
+      - template: templates/cleanup-job.yaml
+        documentIndex: 3
+        equal:
+          path: spec.template.spec.restartPolicy
+          value: Never
+
+  - it: cleanup Job runs non-root under a restrictive securityContext
+    asserts:
+      - template: templates/cleanup-job.yaml
+        documentIndex: 3
+        isKind:
+          of: Job
+      - template: templates/cleanup-job.yaml
+        documentIndex: 3
+        equal:
+          path: spec.template.spec.securityContext.runAsNonRoot
+          value: true
+      - template: templates/cleanup-job.yaml
+        documentIndex: 3
+        equal:
+          path: spec.template.spec.securityContext.runAsUser
+          value: 65534
+      - template: templates/cleanup-job.yaml
+        documentIndex: 3
+        equal:
+          path: spec.template.spec.securityContext.seccompProfile.type
+          value: RuntimeDefault
+      - template: templates/cleanup-job.yaml
+        documentIndex: 3
+        equal:
+          path: spec.template.spec.containers[0].securityContext.allowPrivilegeEscalation
+          value: false
+      - template: templates/cleanup-job.yaml
+        documentIndex: 3
+        contains:
+          path: spec.template.spec.containers[0].securityContext.capabilities.drop
+          content: ALL
diff --git a/packages/apps/tenant/tests/computeplane_module_test.yaml b/packages/apps/tenant/tests/computeplane_module_test.yaml
new file mode 100644
index 0000000000..a2090d06d1
--- /dev/null
+++ b/packages/apps/tenant/tests/computeplane_module_test.yaml
@@ -0,0 +1,40 @@
+suite: tenant computeplane module toggle
+# The computeplane module provisions a single-tenant, Cozystack-managed
+# cluster for untrusted-code apps (design-proposals/compute-plane in
+# cozystack/community). Contract pinned here:
+#   - off by default — no HelmRelease;
+#   - NO spec.releaseName on the module HelmRelease: the aggregated API
+#     rebuilds HelmRelease specs without releaseName, so the release name
+#     must always be the object name or the first tenant edit through the
+#     API would rename the release out from under Helm.
+templates:
+  - templates/computeplane.yaml
+release:
+  name: tenant-alice
+  namespace: tenant-alice
+tests:
+  - it: renders nothing by default
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  - it: renders the module HelmRelease when enabled
+    set:
+      computeplane: true
+    asserts:
+      - hasDocuments:
+          count: 1
+      - equal:
+          path: metadata.name
+          value: computeplane
+      - notExists:
+          path: spec.releaseName
+      - equal:
+          path: spec.chartRef.name
+          value: cozystack-computeplane-application-kubevirt-computeplane
+      - equal:
+          path: metadata.labels["internal.cozystack.io/tenantmodule"]
+          value: "true"
+      - equal:
+          path: metadata.labels["apps.cozystack.io/application.kind"]
+          value: ComputePlane
diff --git a/packages/apps/tenant/tests/gateway_default_test.yaml b/packages/apps/tenant/tests/gateway_default_test.yaml
index cf714163e3..406a3c3f5d 100644
--- a/packages/apps/tenant/tests/gateway_default_test.yaml
+++ b/packages/apps/tenant/tests/gateway_default_test.yaml
@@ -11,7 +11,7 @@ templates:
 # Rules under test (see _helpers.tpl::tenant.gatewayEffective):
 #   - gateway unset                     → OFF own (inherit from parent)
 #   - gateway=true  explicit            → ON  own (LB IP / cert burned)
-#   - gateway=false explicit            → OFF own (parked, no inherit)
+#   - gateway=false explicit            → OFF own (same as unset, still inherits)
 #
 # The inheritance propagation itself happens in namespace.yaml:
 # $gateway := $parentNamespace.gateway | default ""
@@ -86,12 +86,12 @@ tests:
           path: kind
           value: HelmRelease
 
-  - it: gateway=false explicit → no own HelmRelease (parked)
-    # The escape hatch. Operator opts out of any Gateway publishing,
-    # even inheritance: namespace.yaml writes _namespace.gateway as
-    # empty string (the cozystack-basics-side label pins this in
-    # cozystack-values-secret_test.yaml), and the parent Gateway's
-    # allowedRoutes selector therefore does not match this namespace.
+  - it: gateway=false explicit → no own HelmRelease (same as unset)
+    # An explicit false renders no own Gateway HelmRelease, exactly like
+    # leaving the key unset. It does NOT opt out of inheritance:
+    # tenant.gatewayEffective returns "false" for both false and unset, so
+    # namespace.yaml keeps _namespace.gateway pointing at the nearest
+    # ancestor that owns a Gateway and this tenant still publishes through it.
     set:
       gateway: false
       host: ""
@@ -117,3 +117,21 @@ tests:
         equal:
           path: kind
           value: HelmRelease
+
+  - it: passes a tenant-selected gatewayClass into the gateway release
+    set:
+      gateway: true
+      gatewayClass: cloudflare-tunnel
+    asserts:
+      - template: templates/gateway.yaml
+        equal:
+          path: spec.values.gatewayClassName
+          value: cloudflare-tunnel
+
+  - it: leaves the release values absent when the tenant selects no class
+    set:
+      gateway: true
+    asserts:
+      - template: templates/gateway.yaml
+        notExists:
+          path: spec.values
diff --git a/packages/apps/tenant/tests/keycloakgroups_oidc_test.yaml b/packages/apps/tenant/tests/keycloakgroups_oidc_test.yaml
new file mode 100644
index 0000000000..ae07b17b91
--- /dev/null
+++ b/packages/apps/tenant/tests/keycloakgroups_oidc_test.yaml
@@ -0,0 +1,53 @@
+suite: tenant keycloak realm groups — the oidc gate survives an uninjected _cluster
+templates:
+  - templates/keycloakgroups.yaml
+
+# `_cluster` is injected by the platform, so it is simply absent whenever the
+# chart is rendered on its own: `helm lint`, `helm template`, and this suite.
+# The template reads it with `index`, and `index` on a nil map is a hard error
+# rather than an empty result, so before the guard the chart could not be
+# rendered outside a cluster at all.
+#
+# The guard has to sit on the map, not on the value: the spelling used
+# elsewhere in the tree, `(index .Values._cluster "x") | default "y"`, does not
+# help, because `index` is evaluated first and fails before `default` ever sees
+# a result to substitute.
+#
+# The third case below is the one that pins the fix. It carries no `set:` at
+# all, because `_cluster` is absent from values.yaml, so "the platform injected
+# nothing" needs no mocking — it is just the chart's own default state.
+
+release:
+  name: tenant-alice
+  namespace: tenant-alice
+
+capabilities:
+  apiVersions:
+    - v1.edp.epam.com/v1
+
+tests:
+  - it: renders the four realm groups when oidc is enabled
+    set:
+      _cluster:
+        oidc-enabled: "true"
+    asserts:
+      - hasDocuments:
+          count: 4
+
+  - it: renders nothing when oidc is explicitly disabled
+    # The gate is an equality against the string "true", so anything else is
+    # off. Pinned alongside the enabled case so a guard that accidentally
+    # rendered unconditionally would be caught.
+    set:
+      _cluster:
+        oidc-enabled: "false"
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  - it: renders nothing when the platform injected no _cluster at all
+    # Fails with `index of untyped nil` without the guard. This is the case the
+    # fix exists for, and the reason the chart can now be rendered standalone.
+    asserts:
+      - hasDocuments:
+          count: 0
diff --git a/packages/apps/tenant/tests/monitoring_gateway_install_retry_test.yaml b/packages/apps/tenant/tests/monitoring_gateway_install_retry_test.yaml
new file mode 100644
index 0000000000..c89c233b6c
--- /dev/null
+++ b/packages/apps/tenant/tests/monitoring_gateway_install_retry_test.yaml
@@ -0,0 +1,104 @@
+suite: monitoring and gateway tenant HelmReleases retry a failed install in place
+
+# Named after the two releases rather than after a class. They do not share one:
+# monitoring loses storage and gateway loses a regenerable key. The tenant's
+# etcd and seaweedfs releases lose storage as well and are outside this suite,
+# so a class-shaped title here would print as PASS over members it never
+# looked at.
+#
+# Restrict rendering to the two templates asserted on, so a template this suite
+# makes no claim about cannot fail it. That is not hypothetical: at the time of
+# writing, dropping the restriction reds all four tests on keycloakgroups.yaml,
+# which errors with "index of untyped nil" on the `.Values._cluster` the
+# platform injects and this suite has no reason to set. Adding a template to
+# the list below is safe.
+templates:
+  - templates/monitoring.yaml
+  - templates/gateway.yaml
+
+release:
+  name: tenant-test
+  namespace: tenant-test
+
+set:
+  monitoring: true
+  gateway: true
+
+tests:
+  # Install remediation is an uninstall in every case Flux offers, and neither
+  # release disables hooks on it, so a remediated install runs the app chart's
+  # post-delete cleanup Job. The monitoring one deletes PVCs by the
+  # apps.cozystack.io/application.name=<release>-system label, and the metrics
+  # and logs claim templates stamp exactly that label so the operator copies it
+  # onto the storage PVCs. An install that misses its budget therefore deletes
+  # the tenant's metrics and logs, which nothing reconstructs.
+  - it: retries a failed monitoring install instead of deleting the storage
+    asserts:
+      - template: templates/monitoring.yaml
+        equal:
+          path: spec.install.strategy.name
+          value: RetryOnFailure
+      - template: templates/monitoring.yaml
+        equal:
+          path: spec.install.strategy.retryInterval
+          value: 30s
+
+  # The gateway cleanup Job deletes the cozystack-acme-account Secret. That key
+  # regenerates on the next install, so the cost is re-registration against the
+  # ACME provider and its rate limits rather than lost data. Same mechanism,
+  # smaller stake, and worth fixing for the same reason: remediation invokes a
+  # teardown written for an honest uninstall.
+  - it: retries a failed gateway install instead of discarding the ACME account
+    asserts:
+      - template: templates/gateway.yaml
+        equal:
+          path: spec.install.strategy.name
+          value: RetryOnFailure
+      - template: templates/gateway.yaml
+        equal:
+          path: spec.install.strategy.retryInterval
+          value: 30s
+
+  # The controller performs the retry of a failed install as an upgrade, so
+  # without a strategy here that retry's own failure falls through to upgrade
+  # remediation instead of retrying again.
+  - it: carries the strategy on the upgrade action the retry runs as
+    asserts:
+      - template: templates/monitoring.yaml
+        equal:
+          path: spec.upgrade.strategy.name
+          value: RetryOnFailure
+      - template: templates/monitoring.yaml
+        equal:
+          path: spec.upgrade.strategy.retryInterval
+          value: 30s
+      - template: templates/gateway.yaml
+        equal:
+          path: spec.upgrade.strategy.name
+          value: RetryOnFailure
+      - template: templates/gateway.yaml
+        equal:
+          path: spec.upgrade.strategy.retryInterval
+          value: 30s
+
+  # The strategy governs a failed release. An absent release and an out-of-sync
+  # one take different branches, which consult the retry count instead and stop
+  # acting once it is exhausted.
+  - it: keeps unlimited retries for the branches the strategy does not reach
+    asserts:
+      - template: templates/monitoring.yaml
+        equal:
+          path: spec.install.remediation.retries
+          value: -1
+      - template: templates/monitoring.yaml
+        equal:
+          path: spec.upgrade.remediation.retries
+          value: -1
+      - template: templates/gateway.yaml
+        equal:
+          path: spec.install.remediation.retries
+          value: -1
+      - template: templates/gateway.yaml
+        equal:
+          path: spec.upgrade.remediation.retries
+          value: -1
diff --git a/packages/apps/tenant/tests/monitoring_tracing_backend_coupling_test.yaml b/packages/apps/tenant/tests/monitoring_tracing_backend_coupling_test.yaml
new file mode 100644
index 0000000000..e96f94d840
--- /dev/null
+++ b/packages/apps/tenant/tests/monitoring_tracing_backend_coupling_test.yaml
@@ -0,0 +1,82 @@
+suite: shared-central tracing couples the collector backend to tracingCentral
+# _namespace.tracingCentral is the only switch to the shared store; it is
+# published under the same condition as the egress rules, and the monitoring
+# HelmRelease's spec.values stays the Monitoring application's.
+templates:
+  - templates/monitoring.yaml
+  - templates/namespace.yaml
+
+release:
+  name: tenant-ktj
+  namespace: tenant-root
+
+tests:
+  - it: publishes tracingCentral=true for an opted-in tenant with monitoring
+    set:
+      monitoring: true
+      tracingCentral: true
+    template: templates/namespace.yaml
+    documentSelector:
+      path: metadata.name
+      value: cozystack-values
+    asserts:
+      - matchRegex:
+          path: stringData["values.yaml"]
+          pattern: "(?m)^_namespace:\\n(  .*\\n)*  tracingCentral: true$"
+
+  # Every app in the tenant reads this Secret, so a key that is always written
+  # would re-upgrade all of them on the platform upgrade.
+  - it: leaves the flag out when the tenant did not opt in
+    set:
+      monitoring: true
+    template: templates/namespace.yaml
+    documentSelector:
+      path: metadata.name
+      value: cozystack-values
+    asserts:
+      - notMatchRegex:
+          path: stringData["values.yaml"]
+          pattern: "tracingCentral"
+
+  # The egress rules exist only for the tenant that opts in and select only its
+  # own namespace, so a child inheriting the flag from a central parent would
+  # export to the shared store with no path to it, every object Ready.
+  - it: does not pass a central parent's flag on to a child with its own monitoring
+    release:
+      name: tenant-bar
+      namespace: tenant-foo
+    set:
+      monitoring: true
+      _namespace:
+        tracingCentral: true
+        monitoring: tenant-foo
+    template: templates/namespace.yaml
+    documentSelector:
+      path: metadata.name
+      value: cozystack-values
+    asserts:
+      - notMatchRegex:
+          path: stringData["values.yaml"]
+          pattern: "tracingCentral"
+
+  - it: leaves the flag out without monitoring, which deploys no collector
+    set:
+      monitoring: false
+      tracingCentral: true
+    template: templates/namespace.yaml
+    documentSelector:
+      path: metadata.name
+      value: cozystack-values
+    asserts:
+      - notMatchRegex:
+          path: stringData["values.yaml"]
+          pattern: "tracingCentral"
+
+  - it: leaves the monitoring HelmRelease values to the Monitoring application
+    set:
+      monitoring: true
+      tracingCentral: true
+    template: templates/monitoring.yaml
+    asserts:
+      - notExists:
+          path: spec.values
diff --git a/packages/apps/tenant/tests/namespace_ancestor_labels_test.yaml b/packages/apps/tenant/tests/namespace_ancestor_labels_test.yaml
new file mode 100644
index 0000000000..773f7a86c9
--- /dev/null
+++ b/packages/apps/tenant/tests/namespace_ancestor_labels_test.yaml
@@ -0,0 +1,91 @@
+suite: tenant namespace ancestor labels
+# Regression cover for the tenant.cozystack.io/<ancestor> namespace labels
+# emitted by namespace.yaml. These labels drive the <ancestor>-egress
+# CiliumClusterwideNetworkPolicy (networkpolicy.yaml): an ancestor tenant is
+# allowed to reach any namespace carrying tenant.cozystack.io/<ancestor>, so
+# every tenant namespace MUST carry the label of each of its ancestors,
+# tenant-root included, at every depth.
+#
+# The labels are derived from the namespace name by tenant.ancestorTenantLabels
+# (see _helpers.tpl) with no cluster lookup, so helm-unittest can render them
+# offline — the ownerReference lookup is the only cluster-coupled part of
+# namespace.yaml and is skipped when the parent namespace lookup is empty.
+templates:
+  - templates/namespace.yaml
+set:
+  _cluster:
+    root-host: example.com
+tests:
+  - it: depth-1 tenant (direct child of root) carries tenant-root and its own label
+    release:
+      name: tenant-ktj
+      namespace: tenant-root
+    asserts:
+      - documentIndex: 0
+        isKind:
+          of: Namespace
+      - documentIndex: 0
+        equal:
+          path: metadata.name
+          value: tenant-ktj
+      - documentIndex: 0
+        equal:
+          path: metadata.labels["tenant.cozystack.io/tenant-root"]
+          value: ""
+      - documentIndex: 0
+        equal:
+          path: metadata.labels["tenant.cozystack.io/tenant-ktj"]
+          value: ""
+
+  - it: depth-2 tenant carries the full ancestor chain including tenant-root
+    release:
+      name: tenant-htdev
+      namespace: tenant-ktj
+    asserts:
+      - documentIndex: 0
+        equal:
+          path: metadata.name
+          value: tenant-ktj-htdev
+      - documentIndex: 0
+        equal:
+          path: metadata.labels["tenant.cozystack.io/tenant-root"]
+          value: ""
+      - documentIndex: 0
+        equal:
+          path: metadata.labels["tenant.cozystack.io/tenant-ktj"]
+          value: ""
+      - documentIndex: 0
+        equal:
+          path: metadata.labels["tenant.cozystack.io/tenant-ktj-htdev"]
+          value: ""
+
+  - it: depth-3 tenant carries every ancestor from root down to itself
+    release:
+      name: tenant-foo
+      namespace: tenant-ktj-htdev
+    asserts:
+      - documentIndex: 0
+        equal:
+          path: metadata.name
+          value: tenant-ktj-htdev-foo
+      - documentIndex: 0
+        equal:
+          path: metadata.labels["tenant.cozystack.io/tenant-root"]
+          value: ""
+      - documentIndex: 0
+        equal:
+          path: metadata.labels["tenant.cozystack.io/tenant-ktj"]
+          value: ""
+      - documentIndex: 0
+        equal:
+          path: metadata.labels["tenant.cozystack.io/tenant-ktj-htdev"]
+          value: ""
+      - documentIndex: 0
+        equal:
+          path: metadata.labels["tenant.cozystack.io/tenant-ktj-htdev-foo"]
+          value: ""
+      # A tenant must NOT claim descendants it does not have: the depth-3
+      # namespace is not an ancestor of any deeper tenant, so no stray label.
+      - documentIndex: 0
+        notExists:
+          path: metadata.labels["tenant.cozystack.io/tenant-ktj-htdev-foo-bar"]
diff --git a/packages/apps/tenant/tests/networkpolicy_cilium_guard_test.yaml b/packages/apps/tenant/tests/networkpolicy_cilium_guard_test.yaml
new file mode 100644
index 0000000000..a6e527d37f
--- /dev/null
+++ b/packages/apps/tenant/tests/networkpolicy_cilium_guard_test.yaml
@@ -0,0 +1,102 @@
+suite: tenant Cilium policies follow the platform variant's CNI
+templates:
+  - templates/networkpolicy.yaml
+  - templates/networkpolicy-traces-central.yaml
+  - templates/networkpolicy-traces-central-read.yaml
+release:
+  name: tenant-ktj
+  namespace: tenant-root
+tests:
+  - it: renders no Cilium objects on isp-hosted without the cilium.io API
+    set:
+      _cluster:
+        bundle-name: isp-hosted
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  - it: renders no Cilium objects on isp-hosted-slim without the cilium.io API
+    set:
+      _cluster:
+        bundle-name: isp-hosted-slim
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  - it: renders no Cilium objects on isp-hosted when only one Cilium kind is served
+    set:
+      _cluster:
+        bundle-name: isp-hosted
+    capabilities:
+      apiVersions:
+        - cilium.io/v2/CiliumNetworkPolicy
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  - it: renders the Cilium policies on isp-hosted when the host runs Cilium
+    set:
+      _cluster:
+        bundle-name: isp-hosted
+    capabilities:
+      apiVersions:
+        - cilium.io/v2/CiliumNetworkPolicy
+        - cilium.io/v2/CiliumClusterwideNetworkPolicy
+    asserts: &policiesRendered
+      - template: templates/networkpolicy.yaml
+        documentSelector:
+          path: metadata.name
+          value: allow-internal-communication
+        isKind:
+          of: CiliumNetworkPolicy
+      - template: templates/networkpolicy.yaml
+        documentSelector:
+          path: metadata.name
+          value: tenant-ktj-ingress
+        isKind:
+          of: CiliumClusterwideNetworkPolicy
+
+  - it: renders the Cilium policies on a Cilium variant even when the API is not discoverable
+    set:
+      _cluster:
+        bundle-name: isp-full
+    asserts: *policiesRendered
+
+  - it: renders the Cilium policies when the platform injected no _cluster
+    asserts: *policiesRendered
+
+  - it: renders no shared-central tracing egress on isp-hosted without the cilium.io API
+    set:
+      _cluster:
+        bundle-name: isp-hosted
+      tracingCentral: true
+      monitoring: true
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  - it: renders the shared-central tracing egress on isp-hosted when the host runs Cilium
+    set:
+      _cluster:
+        bundle-name: isp-hosted
+      tracingCentral: true
+      monitoring: true
+    capabilities:
+      apiVersions:
+        - cilium.io/v2/CiliumNetworkPolicy
+        - cilium.io/v2/CiliumClusterwideNetworkPolicy
+    asserts: &tracingRendered
+      - template: templates/networkpolicy-traces-central.yaml
+        isKind:
+          of: CiliumClusterwideNetworkPolicy
+      - template: templates/networkpolicy-traces-central-read.yaml
+        isKind:
+          of: CiliumClusterwideNetworkPolicy
+
+  - it: renders the shared-central tracing egress on a Cilium variant
+    set:
+      _cluster:
+        bundle-name: isp-full
+      tracingCentral: true
+      monitoring: true
+    asserts: *tracingRendered
diff --git a/packages/apps/tenant/tests/networkpolicy_grafana_dashboards_test.yaml b/packages/apps/tenant/tests/networkpolicy_grafana_dashboards_test.yaml
new file mode 100644
index 0000000000..3bd5639b97
--- /dev/null
+++ b/packages/apps/tenant/tests/networkpolicy_grafana_dashboards_test.yaml
@@ -0,0 +1,32 @@
+suite: tenant egress to the grafana-dashboards plugin server
+# Grafana pods (deployed per tenant by the monitoring chart) install their
+# plugins at startup from the grafana-dashboards static file server in
+# cozy-grafana-operator instead of the public Grafana catalog, so air-gapped
+# installs keep working. Tenant egress is default-deny plus explicit
+# allow-to-* policies, so without this policy the in-cluster download is
+# silently dropped by Cilium and Grafana crash-loops on startup.
+templates:
+  - templates/networkpolicy.yaml
+release:
+  name: tenant-ktj
+  namespace: tenant-root
+tests:
+  - it: allows egress from the tenant namespace to cozy-grafana-operator
+    asserts:
+      - documentSelector:
+          path: metadata.name
+          value: allow-to-grafana-dashboards
+        isKind:
+          of: CiliumNetworkPolicy
+      - documentSelector:
+          path: metadata.name
+          value: allow-to-grafana-dashboards
+        equal:
+          path: metadata.namespace
+          value: tenant-ktj
+      - documentSelector:
+          path: metadata.name
+          value: allow-to-grafana-dashboards
+        equal:
+          path: spec.egress[0].toEndpoints[0].matchLabels["k8s:io.kubernetes.pod.namespace"]
+          value: cozy-grafana-operator
diff --git a/packages/apps/tenant/tests/networkpolicy_traces_central_depth_test.yaml b/packages/apps/tenant/tests/networkpolicy_traces_central_depth_test.yaml
new file mode 100644
index 0000000000..b028b5b110
--- /dev/null
+++ b/packages/apps/tenant/tests/networkpolicy_traces_central_depth_test.yaml
@@ -0,0 +1,29 @@
+suite: shared-central traces egress reaches tenant-root at any depth
+# The shared store lives in tenant-root, not in the parent, so a tenant nested
+# below a non-root parent must still target tenant-root.
+templates:
+  - templates/networkpolicy-traces-central.yaml
+release:
+  name: tenant-deep
+  namespace: tenant-ktj
+set:
+  tracingCentral: true
+  monitoring: true
+tests:
+  - it: targets tenant-root even for a tenant nested below a non-root parent
+    documentSelector:
+      path: metadata.name
+      value: tenant-ktj-deep-egress-traces-central
+    asserts:
+      - equal:
+          path: spec.egress
+          value:
+            - toEndpoints:
+                - matchLabels:
+                    "k8s:app.kubernetes.io/name": vmauth
+                    "k8s:app.kubernetes.io/instance": traces-central
+                    "k8s:io.kubernetes.pod.namespace": tenant-root
+              toPorts:
+                - ports:
+                    - port: "8427"
+                      protocol: TCP
diff --git a/packages/apps/tenant/tests/networkpolicy_traces_central_gate_test.yaml b/packages/apps/tenant/tests/networkpolicy_traces_central_gate_test.yaml
new file mode 100644
index 0000000000..336041db4d
--- /dev/null
+++ b/packages/apps/tenant/tests/networkpolicy_traces_central_gate_test.yaml
@@ -0,0 +1,38 @@
+suite: shared-central traces egress is off by default
+# The cross-boundary egress exists only for a tenant that opted in; by default
+# no tenant may reach the shared store.
+templates:
+  - templates/networkpolicy-traces-central.yaml
+release:
+  name: tenant-ktj
+  namespace: tenant-root
+tests:
+  - it: does not render the egress rule by default (tracingCentral unset)
+    asserts:
+      - containsDocument:
+          apiVersion: cilium.io/v2
+          kind: CiliumClusterwideNetworkPolicy
+          name: tenant-ktj-egress-traces-central
+        not: true
+
+  # Without Monitoring there is no collector to grant the hop to.
+  - it: does not render the egress rule when monitoring is off (no collector)
+    set:
+      tracingCentral: true
+      monitoring: false
+    asserts:
+      - containsDocument:
+          apiVersion: cilium.io/v2
+          kind: CiliumClusterwideNetworkPolicy
+          name: tenant-ktj-egress-traces-central
+        not: true
+
+  - it: renders the egress rule when both tracingCentral and monitoring are on
+    set:
+      tracingCentral: true
+      monitoring: true
+    asserts:
+      - containsDocument:
+          apiVersion: cilium.io/v2
+          kind: CiliumClusterwideNetworkPolicy
+          name: tenant-ktj-egress-traces-central
diff --git a/packages/apps/tenant/tests/networkpolicy_traces_central_read_test.yaml b/packages/apps/tenant/tests/networkpolicy_traces_central_read_test.yaml
new file mode 100644
index 0000000000..ab83b3e6b8
--- /dev/null
+++ b/packages/apps/tenant/tests/networkpolicy_traces_central_read_test.yaml
@@ -0,0 +1,66 @@
+suite: tenant Grafana egress to the shared-central traces vmauth
+# A central tenant reads its spans through the vmauth that fronts the shared
+# store in tenant-root. Only the tenant's Grafana pods may make that hop, and
+# only to vmauth's port, never to vtselect itself, which would accept any
+# account a client names.
+templates:
+  - templates/networkpolicy-traces-central-read.yaml
+release:
+  name: tenant-deep
+  namespace: tenant-ktj
+set:
+  tracingCentral: true
+  monitoring: true
+tests:
+  - it: scopes the read egress to only the Grafana pods
+    documentSelector:
+      path: metadata.name
+      value: tenant-ktj-deep-egress-traces-central-read
+    asserts:
+      - isKind:
+          of: CiliumClusterwideNetworkPolicy
+      - equal:
+          path: spec.endpointSelector.matchLabels
+          value:
+            "k8s:io.kubernetes.pod.namespace": tenant-ktj-deep
+            "k8s:app": grafana
+
+  - it: allows only the tenant-root vmauth port, at any tenant depth
+    documentSelector:
+      path: metadata.name
+      value: tenant-ktj-deep-egress-traces-central-read
+    asserts:
+      - equal:
+          path: spec.egress
+          value:
+            - toEndpoints:
+                - matchLabels:
+                    "k8s:app.kubernetes.io/name": vmauth
+                    "k8s:app.kubernetes.io/instance": traces-central
+                    "k8s:io.kubernetes.pod.namespace": tenant-root
+              toPorts:
+                - ports:
+                    - port: "8427"
+                      protocol: TCP
+
+  - it: does not render by default (tracingCentral unset)
+    set:
+      tracingCentral: false
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  - it: does not render when monitoring is off (no Grafana to grant it to)
+    set:
+      monitoring: false
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  - it: never renders for tenant-root, which hosts the shared store
+    release:
+      name: tenant-root
+      namespace: tenant-root
+    asserts:
+      - hasDocuments:
+          count: 0
diff --git a/packages/apps/tenant/tests/networkpolicy_traces_central_root_test.yaml b/packages/apps/tenant/tests/networkpolicy_traces_central_root_test.yaml
new file mode 100644
index 0000000000..a35e417218
--- /dev/null
+++ b/packages/apps/tenant/tests/networkpolicy_traces_central_root_test.yaml
@@ -0,0 +1,19 @@
+suite: shared-central traces egress never renders for tenant-root
+# tenant-root hosts the shared store, so it gets no egress to it even with
+# tracingCentral set.
+templates:
+  - templates/networkpolicy-traces-central.yaml
+release:
+  name: tenant-root
+  namespace: tenant-root
+set:
+  tracingCentral: true
+  monitoring: true
+tests:
+  - it: is excluded even when tracingCentral is opted in
+    asserts:
+      - containsDocument:
+          apiVersion: cilium.io/v2
+          kind: CiliumClusterwideNetworkPolicy
+          name: tenant-root-egress-traces-central
+        not: true
diff --git a/packages/apps/tenant/tests/networkpolicy_traces_central_test.yaml b/packages/apps/tenant/tests/networkpolicy_traces_central_test.yaml
new file mode 100644
index 0000000000..84fea9026a
--- /dev/null
+++ b/packages/apps/tenant/tests/networkpolicy_traces_central_test.yaml
@@ -0,0 +1,43 @@
+suite: tenant collector egress to the shared-central traces backend
+# Only the tenant's collector pods may cross into tenant-root, and only to the
+# vmauth proxy port.
+templates:
+  - templates/networkpolicy-traces-central.yaml
+release:
+  name: tenant-ktj
+  namespace: tenant-root
+set:
+  tracingCentral: true
+  monitoring: true
+tests:
+  - it: scopes the cross-boundary egress to only the collector pods
+    documentSelector:
+      path: metadata.name
+      value: tenant-ktj-egress-traces-central
+    asserts:
+      - isKind:
+          of: CiliumClusterwideNetworkPolicy
+      - equal:
+          path: spec.endpointSelector.matchLabels["k8s:app.kubernetes.io/name"]
+          value: otel-traces
+      - equal:
+          path: spec.endpointSelector.matchLabels["k8s:io.kubernetes.pod.namespace"]
+          value: tenant-ktj
+
+  - it: allows egress only to the tenant-root vmauth port
+    documentSelector:
+      path: metadata.name
+      value: tenant-ktj-egress-traces-central
+    asserts:
+      - equal:
+          path: spec.egress
+          value:
+            - toEndpoints:
+                - matchLabels:
+                    "k8s:app.kubernetes.io/name": vmauth
+                    "k8s:app.kubernetes.io/instance": traces-central
+                    "k8s:io.kubernetes.pod.namespace": tenant-root
+              toPorts:
+                - ports:
+                    - port: "8427"
+                      protocol: TCP
diff --git a/packages/apps/tenant/tests/networkpolicy_vm_exportproxy_test.yaml b/packages/apps/tenant/tests/networkpolicy_vm_exportproxy_test.yaml
new file mode 100644
index 0000000000..597e000d9e
--- /dev/null
+++ b/packages/apps/tenant/tests/networkpolicy_vm_exportproxy_test.yaml
@@ -0,0 +1,85 @@
+suite: tenant egress to the KubeVirt export proxy
+# The vm-exportproxy Ingress in cozy-kubevirt is served by the ingress
+# controller running in tenant-root. Tenant egress is default-deny plus
+# explicit allow-to-* policies, so without this one the controller cannot
+# reach virt-exportproxy. It follows allow-to-cdi-upload-proxy, the policy for
+# the sibling CDI upload proxy, in where and when it renders.
+templates:
+  - templates/networkpolicy.yaml
+tests:
+  - it: renders next to allow-to-cdi-upload-proxy in the root tenant
+    release:
+      name: tenant-root
+      namespace: tenant-root
+    asserts:
+      - documentSelector:
+          path: metadata.name
+          value: allow-to-cdi-upload-proxy
+        equal:
+          path: metadata.namespace
+          value: tenant-root
+      - documentSelector:
+          path: metadata.name
+          value: allow-to-vm-exportproxy
+        isKind:
+          of: CiliumNetworkPolicy
+      - documentSelector:
+          path: metadata.name
+          value: allow-to-vm-exportproxy
+        equal:
+          path: metadata.namespace
+          value: tenant-root
+
+  - it: renders next to allow-to-cdi-upload-proxy in a nested tenant with every module off
+    release:
+      name: tenant-bar
+      namespace: tenant-foo
+    set:
+      monitoring: false
+      ingress: false
+      etcd: false
+    asserts:
+      - documentSelector:
+          path: metadata.name
+          value: allow-to-cdi-upload-proxy
+        equal:
+          path: metadata.namespace
+          value: tenant-foo-bar
+      - documentSelector:
+          path: metadata.name
+          value: allow-to-vm-exportproxy
+        equal:
+          path: metadata.namespace
+          value: tenant-foo-bar
+
+  - it: applies to every pod of the tenant, as allow-to-cdi-upload-proxy does
+    release:
+      name: tenant-root
+      namespace: tenant-root
+    asserts:
+      - documentSelector:
+          path: metadata.name
+          value: allow-to-vm-exportproxy
+        equal:
+          path: spec.endpointSelector
+          value: {}
+
+  - it: allows only the export proxy pods on their container port
+    release:
+      name: tenant-root
+      namespace: tenant-root
+    asserts:
+      - documentSelector:
+          path: metadata.name
+          value: allow-to-vm-exportproxy
+        equal:
+          path: spec.egress
+          value:
+            - toEndpoints:
+                - matchLabels:
+                    "k8s:io.kubernetes.pod.namespace": cozy-kubevirt
+                    kubevirt.io: virt-exportproxy
+              toPorts:
+                - ports:
+                    - port: "8443"
+                      protocol: TCP
diff --git a/packages/apps/tenant/tests/no_upgrade_force_test.yaml b/packages/apps/tenant/tests/no_upgrade_force_test.yaml
index 80be5a9c6f..b08c65d59a 100644
--- a/packages/apps/tenant/tests/no_upgrade_force_test.yaml
+++ b/packages/apps/tenant/tests/no_upgrade_force_test.yaml
@@ -1,12 +1,31 @@
-suite: tenant HelmReleases carry no deprecated upgrade.force
+suite: tenant HelmReleases set no upgrade.force
 
-# Flux v2.8 / helm-controller v1.5 deprecates `upgrade.force: true` and rejects
-# it under Server-Side Apply. The flux-bump PR swept the flag off every tenant
-# HelmRelease; gateway.yaml was missed in the first pass. This suite pins the
-# invariant across all swept HRs so a stray `force: true` cannot creep back in.
+# Every tenant HelmRelease was swept clear of `upgrade.force`, and this suite pins
+# that it stays off. gateway.yaml was missed in the first pass, which is why the
+# cover is per-template rather than one spot check.
+#
+# helm-controller does not deprecate this field. Flux is pinned at 2.8.x in
+# packages/system/fluxcd/values.yaml, and the CRD vendored at
+# internal/fluxinstall/manifests/fluxcd.yaml describes force as "Force forces
+# resource updates through a replacement strategy" with no deprecation marker —
+# `recreate` is the neighbouring field that carries one. Later upstream
+# documentation adds that force "is ignored for server-side apply (which always
+# forces conflicts with other field managers)"; that sentence is not in the
+# pinned CRD, so do not go looking for it there. Either way the flag is a no-op
+# under SSA, and under client-side apply it replaces resources rather than
+# patching them, which is the downtime the sweep removed.
+#
+# Each test pins the HelmRelease name before asserting the absence, because
+# `notExists` on its own is vacuous: it passes on a template that renders no
+# document at all. Rename the value gating one of these releases and it renders
+# nothing, leaving the bare assertion green while the release it guards is gone.
 
-# Restrict rendering to the swept HelmRelease templates so the chart's
-# namespace.yaml `lookup` (which errors under helm-unittest) is not evaluated.
+# Render only the swept templates. The earlier reason given here — that
+# namespace.yaml's `lookup` errors under helm-unittest — is not true; it returns
+# empty offline and the template renders, which is what its own header says and
+# what tests/namespace_ancestor_labels_test.yaml relies on. The list stays for a
+# different reason: it keeps an unrelated template breaking out of this suite's
+# result, so what reddens here is the flag it guards.
 templates:
   - templates/etcd.yaml
   - templates/info.yaml
@@ -14,6 +33,7 @@ templates:
   - templates/monitoring.yaml
   - templates/seaweedfs.yaml
   - templates/gateway.yaml
+  - templates/computeplane.yaml
 
 release:
   name: tenant-test
@@ -29,35 +49,56 @@ set:
   monitoring: true
   seaweedfs: true
   gateway: true
+  computeplane: true
   host: ""
 
 tests:
   - it: etcd HR has no upgrade.force
     asserts:
+      - template: templates/etcd.yaml
+        equal:
+          path: metadata.name
+          value: etcd
       - template: templates/etcd.yaml
         notExists:
           path: spec.upgrade.force
 
   - it: info HR has no upgrade.force
     asserts:
+      - template: templates/info.yaml
+        equal:
+          path: metadata.name
+          value: info
       - template: templates/info.yaml
         notExists:
           path: spec.upgrade.force
 
   - it: ingress HR has no upgrade.force
     asserts:
+      - template: templates/ingress.yaml
+        equal:
+          path: metadata.name
+          value: ingress
       - template: templates/ingress.yaml
         notExists:
           path: spec.upgrade.force
 
   - it: monitoring HR has no upgrade.force
     asserts:
+      - template: templates/monitoring.yaml
+        equal:
+          path: metadata.name
+          value: monitoring
       - template: templates/monitoring.yaml
         notExists:
           path: spec.upgrade.force
 
   - it: seaweedfs HR has no upgrade.force
     asserts:
+      - template: templates/seaweedfs.yaml
+        equal:
+          path: metadata.name
+          value: seaweedfs
       - template: templates/seaweedfs.yaml
         notExists:
           path: spec.upgrade.force
@@ -65,5 +106,19 @@ tests:
   - it: gateway HR has no upgrade.force
     asserts:
       - template: templates/gateway.yaml
+        equal:
+          path: metadata.name
+          value: gateway
+      - template: templates/gateway.yaml
+        notExists:
+          path: spec.upgrade.force
+
+  - it: computeplane HR has no upgrade.force
+    asserts:
+      - template: templates/computeplane.yaml
+        equal:
+          path: metadata.name
+          value: computeplane
+      - template: templates/computeplane.yaml
         notExists:
           path: spec.upgrade.force
diff --git a/packages/apps/tenant/tests/seaweedfs_values_left_to_the_instance_test.yaml b/packages/apps/tenant/tests/seaweedfs_values_left_to_the_instance_test.yaml
new file mode 100644
index 0000000000..fc1f7ac067
--- /dev/null
+++ b/packages/apps/tenant/tests/seaweedfs_values_left_to_the_instance_test.yaml
@@ -0,0 +1,32 @@
+suite: tenant SeaweedFS release leaves spec.values to the instance
+
+# The SeaweedFS instance this module creates is stored as the HelmRelease below,
+# and its spec.values is the instance's own spec. Platform migration 57 pins
+# master.volumeSizeLimitMB there, and a Helm upgrade of this chart leaves the
+# pin alone only because this template never renders spec.values: a key absent
+# from both the previous and the new manifest is not patched. A key this
+# template rendered into spec.values would be patched on every reconcile, so
+# the whole map stays out, which is the state the migration was measured
+# against.
+#
+# The name is asserted first because notExists alone also passes when the
+# template renders nothing.
+
+templates:
+  - templates/seaweedfs.yaml
+
+release:
+  name: tenant-test
+  namespace: tenant-test
+
+set:
+  seaweedfs: true
+
+tests:
+  - it: renders the seaweedfs release without spec.values
+    asserts:
+      - equal:
+          path: metadata.name
+          value: seaweedfs
+      - notExists:
+          path: spec.values
diff --git a/packages/apps/tenant/tests/vmo_webhook_dependson_test.yaml b/packages/apps/tenant/tests/vmo_webhook_dependson_test.yaml
new file mode 100644
index 0000000000..dfb96cf9a2
--- /dev/null
+++ b/packages/apps/tenant/tests/vmo_webhook_dependson_test.yaml
@@ -0,0 +1,92 @@
+suite: tenant HelmReleases gate on the victoria-metrics-operator
+
+# The victoria-metrics-operator admission webhook is configured with
+# failurePolicy: Fail and rejects the VM* custom resources these tenant
+# releases create (etcd/ingress: VMPodScrape; monitoring via its
+# monitoring-system child: VMCluster/VMAlert/VLCluster/VMAlertmanager/
+# VMServiceScrape) whenever the operator pod is not yet serving on :9443.
+# On a cold install the operator can be briefly unavailable, so every tenant
+# release that creates VM* resources must depend on the operator HelmRelease
+# becoming Ready — otherwise the release reconciles too early, the webhook
+# rejects with connection refused, the install fails and rolls back. Pin the
+# dependsOn so the gate cannot regress.
+
+# Render only the HelmRelease templates this suite asserts on. The list keeps an
+# unrelated template breaking out of this suite's result, so what reddens here is
+# the gate it guards. (namespace.yaml's `lookup` is not the reason: the lookup
+# returns empty offline and the template renders.)
+templates:
+  - templates/etcd.yaml
+  - templates/ingress.yaml
+  - templates/monitoring.yaml
+  - templates/seaweedfs.yaml
+  - templates/gateway.yaml
+
+release:
+  name: tenant-test
+  namespace: tenant-test
+
+set:
+  _cluster:
+    expose-ingress: tenant-root
+    expose-external-ips: "192.0.2.10"
+    gateway-enabled: "true"
+  etcd: true
+  ingress: true
+  monitoring: true
+  seaweedfs: true
+  gateway: true
+  host: ""
+
+tests:
+  - it: etcd HR depends on the victoria-metrics-operator
+    asserts:
+      - template: templates/etcd.yaml
+        equal:
+          path: spec.dependsOn
+          value:
+            - name: victoria-metrics-operator
+              namespace: cozy-victoria-metrics-operator
+
+  - it: ingress HR depends on the victoria-metrics-operator
+    asserts:
+      - template: templates/ingress.yaml
+        equal:
+          path: spec.dependsOn
+          value:
+            - name: victoria-metrics-operator
+              namespace: cozy-victoria-metrics-operator
+
+  - it: monitoring HR depends on the victoria-metrics-operator
+    asserts:
+      - template: templates/monitoring.yaml
+        equal:
+          path: spec.dependsOn
+          value:
+            - name: victoria-metrics-operator
+              namespace: cozy-victoria-metrics-operator
+
+  # The gate is intentionally narrow: only the releases that create VM* custom
+  # resources carry it. Tenant releases that create none (seaweedfs, gateway)
+  # must not be needlessly blocked on the operator.
+  # The name pin is what makes the absence mean something: a bare `notExists`
+  # passes on a template that renders no document at all.
+  - it: seaweedfs HR carries no operator gate
+    asserts:
+      - template: templates/seaweedfs.yaml
+        equal:
+          path: metadata.name
+          value: seaweedfs
+      - template: templates/seaweedfs.yaml
+        notExists:
+          path: spec.dependsOn
+
+  - it: gateway HR carries no operator gate
+    asserts:
+      - template: templates/gateway.yaml
+        equal:
+          path: metadata.name
+          value: gateway
+      - template: templates/gateway.yaml
+        notExists:
+          path: spec.dependsOn
diff --git a/packages/apps/tenant/tests/volume_owner_install_retry_test.yaml b/packages/apps/tenant/tests/volume_owner_install_retry_test.yaml
new file mode 100644
index 0000000000..b0db647e86
--- /dev/null
+++ b/packages/apps/tenant/tests/volume_owner_install_retry_test.yaml
@@ -0,0 +1,102 @@
+suite: etcd and seaweedfs tenant HelmReleases retry a failed install in place
+
+# Named after the two releases rather than after the class they belong to. The
+# tenant's monitoring release owns storage as well and its own post-delete Job
+# deletes it, and that release is outside this suite, so a class-shaped title
+# would print as PASS over members it never looked at.
+#
+# Restrict rendering to the two templates asserted on, so a template this suite
+# makes no claim about cannot fail it. That is not hypothetical: at the time of
+# writing, dropping the restriction reds all four tests on keycloakgroups.yaml,
+# which errors with "index of untyped nil" on the `.Values._cluster` the
+# platform injects and this suite has no reason to set. Adding a template to
+# the list below is safe.
+templates:
+  - templates/etcd.yaml
+  - templates/seaweedfs.yaml
+
+release:
+  name: tenant-test
+  namespace: tenant-test
+
+set:
+  etcd: true
+  seaweedfs: true
+  host: ""
+
+tests:
+  # Install remediation is an uninstall in every case Flux offers, and neither
+  # release disables hooks on it, so a remediated install runs each chart's
+  # post-delete cleanup Job. Those Jobs delete data on purpose: the etcd one
+  # removes the data-etcd-<ordinal> PVCs by name, because the etcd-operator does
+  # not reclaim them when the EtcdCluster goes. An install that misses its
+  # budget therefore destroys the datastore the tenant control planes keep their
+  # state in, rather than merely restarting.
+  - it: retries a failed etcd install instead of deleting the datastore
+    asserts:
+      - template: templates/etcd.yaml
+        equal:
+          path: spec.install.strategy.name
+          value: RetryOnFailure
+      - template: templates/etcd.yaml
+        equal:
+          path: spec.install.strategy.retryInterval
+          value: 30s
+
+  # The seaweedfs cleanup Job deletes the volume PVCs by label and explicitly
+  # reclaims the keep-protected CNPG Cluster holding the filer metadata, which
+  # nothing else removes. Same consequence for a remediated install.
+  - it: retries a failed seaweedfs install instead of deleting the filer metadata
+    asserts:
+      - template: templates/seaweedfs.yaml
+        equal:
+          path: spec.install.strategy.name
+          value: RetryOnFailure
+      - template: templates/seaweedfs.yaml
+        equal:
+          path: spec.install.strategy.retryInterval
+          value: 30s
+
+  # The controller performs the retry of a failed install as an upgrade, so
+  # without a strategy here that retry's own failure falls through to upgrade
+  # remediation instead of retrying again.
+  - it: carries the strategy on the upgrade action the retry runs as
+    asserts:
+      - template: templates/etcd.yaml
+        equal:
+          path: spec.upgrade.strategy.name
+          value: RetryOnFailure
+      - template: templates/etcd.yaml
+        equal:
+          path: spec.upgrade.strategy.retryInterval
+          value: 30s
+      - template: templates/seaweedfs.yaml
+        equal:
+          path: spec.upgrade.strategy.name
+          value: RetryOnFailure
+      - template: templates/seaweedfs.yaml
+        equal:
+          path: spec.upgrade.strategy.retryInterval
+          value: 30s
+
+  # The strategy governs a failed release. An absent release and an out-of-sync
+  # one take different branches, which consult the retry count instead and stop
+  # acting once it is exhausted.
+  - it: keeps unlimited retries for the branches the strategy does not reach
+    asserts:
+      - template: templates/etcd.yaml
+        equal:
+          path: spec.install.remediation.retries
+          value: -1
+      - template: templates/etcd.yaml
+        equal:
+          path: spec.upgrade.remediation.retries
+          value: -1
+      - template: templates/seaweedfs.yaml
+        equal:
+          path: spec.install.remediation.retries
+          value: -1
+      - template: templates/seaweedfs.yaml
+        equal:
+          path: spec.upgrade.remediation.retries
+          value: -1
diff --git a/packages/apps/tenant/values.schema.json b/packages/apps/tenant/values.schema.json
index 86cd3986cf..d47e7a0b36 100644
--- a/packages/apps/tenant/values.schema.json
+++ b/packages/apps/tenant/values.schema.json
@@ -17,20 +17,35 @@
       "type": "boolean",
       "default": false
     },
+    "tracingCentral": {
+      "description": "Send this tenant's traces to the shared VictoriaTraces store in tenant-root instead of a per-tenant backend; its Grafana reads them through a vmauth there that pins the tenant's own account, so tenants sharing the store cannot read each other's traces. It needs the tenant's own Monitoring (`monitoring: true`) and tenant-root hosting the store (`tracingCentralHost: true` on its Monitoring, with a `cluster`-mode tracingStorages entry named `generic`); without that the tenant's monitoring render fails rather than dropping spans. tenant-root, and whoever it admits to its Grafana, are inside the store's trust boundary. Applications should export over OTLP/HTTP, in requests below 3 MiB: spans above the platform's per-tenant write rate are retried over HTTP but dropped over gRPC, and a larger request is refused and not retried.",
+      "type": "boolean",
+      "default": false
+    },
     "ingress": {
       "description": "Deploy own Ingress Controller.",
       "type": "boolean",
       "default": false
     },
     "gateway": {
-      "description": "Deploy own Gateway API Gateway (backed by Cilium Gateway API controller). When unset (the default), the chart auto-enables the Gateway for tenants whose apex is derived from the parent (i.e. `host` is empty), and leaves it off for tenants with a custom non-derived apex. Set to `true` or `false` explicitly to override that auto-behaviour. Note: leave the key absent (do not write `gateway: null`) — the chart distinguishes \"unset\" via missing-key, not via null value, to satisfy the JSON schema generated from this comment.",
+      "description": "Deploy own Gateway API Gateway (backed by Cilium Gateway API controller). When unset (the default) or set to `false`, the tenant does not own a Gateway and instead publishes through the nearest ancestor tenant that owns one, regardless of whether `host` is empty or custom (`false` currently behaves the same as unset and does not opt out of that inheritance). Set to `true` to give the tenant its own Gateway with its own LoadBalancer IP and Certificate. A tenant with a custom (non-derived) `host` that needs its apex publicly reachable must set `true` explicitly, because an ancestor's TLS certificate does not cover a custom apex. Note: leave the key absent (do not write `gateway: null`): the chart distinguishes \"unset\" via missing-key, not via null value, to satisfy the JSON schema generated from this comment.",
       "type": "boolean"
     },
+    "gatewayClass": {
+      "description": "GatewayClass for this tenant's own Gateway. Empty uses the platform default (`gateway.className`). Only the classes the operator lists in the platform's `gateway.tenantSelectableClasses`, plus that default, may be named here — anything else fails this tenant's own gateway release and reaches no other tenant. Read only when this tenant owns a Gateway; an inheriting tenant uses its ancestor's. Whether a class terminates TLS itself or at its provider's edge is declared once per class on the platform, not here.",
+      "type": "string",
+      "default": ""
+    },
     "seaweedfs": {
       "description": "Deploy own SeaweedFS.",
       "type": "boolean",
       "default": false
     },
+    "computeplane": {
+      "description": "Deploy own ComputePlane — a single-tenant, Cozystack-managed cluster for untrusted-code applications. The tenant receives no admin kubeconfig for it. Automatic routing of catalog applications onto it (placement: ComputePlane) is a planned follow-up and is not available yet; until it lands, external catalogs target the cluster via its computeplane-cluster-admin-kubeconfig Secret. See design-proposals/compute-plane in cozystack/community.",
+      "type": "boolean",
+      "default": false
+    },
     "schedulingClass": {
       "description": "The name of a SchedulingClass CR to apply scheduling constraints for this tenant's workloads.",
       "type": "string",
diff --git a/packages/apps/tenant/values.yaml b/packages/apps/tenant/values.yaml
index 00f7654717..a9b233d903 100644
--- a/packages/apps/tenant/values.yaml
+++ b/packages/apps/tenant/values.yaml
@@ -11,14 +11,23 @@ etcd: false
 ## @param {bool} monitoring - Deploy own Monitoring Stack.
 monitoring: false
 
+## @param {bool} tracingCentral - Send this tenant's traces to the shared VictoriaTraces store in tenant-root instead of a per-tenant backend; its Grafana reads them through a vmauth there that pins the tenant's own account, so tenants sharing the store cannot read each other's traces. It needs the tenant's own Monitoring (`monitoring: true`) and tenant-root hosting the store (`tracingCentralHost: true` on its Monitoring, with a `cluster`-mode tracingStorages entry named `generic`); without that the tenant's monitoring render fails rather than dropping spans. tenant-root, and whoever it admits to its Grafana, are inside the store's trust boundary. Applications should export over OTLP/HTTP, in requests below 3 MiB: spans above the platform's per-tenant write rate are retried over HTTP but dropped over gRPC, and a larger request is refused and not retried.
+tracingCentral: false
+
 ## @param {bool} ingress - Deploy own Ingress Controller.
 ingress: false
 
-## @param {bool} [gateway] - Deploy own Gateway API Gateway (backed by Cilium Gateway API controller). When unset (the default), the chart auto-enables the Gateway for tenants whose apex is derived from the parent (i.e. `host` is empty), and leaves it off for tenants with a custom non-derived apex. Set to `true` or `false` explicitly to override that auto-behaviour. Note: leave the key absent (do not write `gateway: null`) — the chart distinguishes "unset" via missing-key, not via null value, to satisfy the JSON schema generated from this comment.
+## @param {bool} [gateway] - Deploy own Gateway API Gateway (backed by Cilium Gateway API controller). When unset (the default) or set to `false`, the tenant does not own a Gateway and instead publishes through the nearest ancestor tenant that owns one, regardless of whether `host` is empty or custom (`false` currently behaves the same as unset and does not opt out of that inheritance). Set to `true` to give the tenant its own Gateway with its own LoadBalancer IP and Certificate. A tenant with a custom (non-derived) `host` that needs its apex publicly reachable must set `true` explicitly, because an ancestor's TLS certificate does not cover a custom apex. Note: leave the key absent (do not write `gateway: null`): the chart distinguishes "unset" via missing-key, not via null value, to satisfy the JSON schema generated from this comment.
+
+## @param {string} [gatewayClass] - GatewayClass for this tenant's own Gateway. Empty uses the platform default (`gateway.className`). Only the classes the operator lists in the platform's `gateway.tenantSelectableClasses`, plus that default, may be named here — anything else fails this tenant's own gateway release and reaches no other tenant. Read only when this tenant owns a Gateway; an inheriting tenant uses its ancestor's. Whether a class terminates TLS itself or at its provider's edge is declared once per class on the platform, not here.
+gatewayClass: ""
 
 ## @param {bool} seaweedfs - Deploy own SeaweedFS.
 seaweedfs: false
 
+## @param {bool} computeplane - Deploy own ComputePlane — a single-tenant, Cozystack-managed cluster for untrusted-code applications. The tenant receives no admin kubeconfig for it. Automatic routing of catalog applications onto it (placement: ComputePlane) is a planned follow-up and is not available yet; until it lands, external catalogs target the cluster via its computeplane-cluster-admin-kubeconfig Secret. See design-proposals/compute-plane in cozystack/community.
+computeplane: false
+
 ## @param {string} [schedulingClass] - The name of a SchedulingClass CR to apply scheduling constraints for this tenant's workloads.
 schedulingClass: ""
 
diff --git a/packages/apps/valkey/.helmignore b/packages/apps/valkey/.helmignore
new file mode 100644
index 0000000000..3de7d4a58e
--- /dev/null
+++ b/packages/apps/valkey/.helmignore
@@ -0,0 +1,4 @@
+.helmignore
+/logos
+/Makefile
+/hack
diff --git a/packages/apps/valkey/Chart.yaml b/packages/apps/valkey/Chart.yaml
new file mode 100644
index 0000000000..21dfaaee0a
--- /dev/null
+++ b/packages/apps/valkey/Chart.yaml
@@ -0,0 +1,7 @@
+apiVersion: v2
+name: valkey
+description: Managed Valkey service
+icon: /logos/valkey.svg
+type: application
+version: 0.0.0 # Placeholder, the actual version will be automatically set during the build process
+appVersion: "8.1.8"
diff --git a/packages/apps/valkey/Makefile b/packages/apps/valkey/Makefile
new file mode 100644
index 0000000000..9e0ae15ebc
--- /dev/null
+++ b/packages/apps/valkey/Makefile
@@ -0,0 +1,9 @@
+include ../../../hack/package.mk
+
+generate:
+	cozyvalues-gen -m 'valkey' -v values.yaml -s values.schema.json -r README.md -g ../../../api/apps/v1alpha1/valkey/types.go
+	../../../hack/update-crd.sh
+
+update:
+	hack/update-versions.sh
+	make generate
diff --git a/packages/apps/valkey/README.md b/packages/apps/valkey/README.md
new file mode 100644
index 0000000000..56a55354fa
--- /dev/null
+++ b/packages/apps/valkey/README.md
@@ -0,0 +1,57 @@
+# Managed Valkey Service
+
+Valkey is a highly versatile and blazing-fast in-memory data store and cache that can significantly boost the performance of your applications. It is the BSD-3-Clause licensed, Linux Foundation-governed fork of Redis 7.2 and a drop-in replacement for it. Managed Valkey Service offers a hassle-free solution for deploying and managing Valkey clusters, ensuring that your data is always available and responsive.
+
+## Deployment Details
+
+Service runs Valkey on the freshworks-oss redis-operator, which manages Sentinel-based HA and selects the Valkey engine natively via `spec.engine: Valkey` — so the official `valkey/valkey` image is used directly, with no Redis-compatibility shim.
+
+- Docs: https://valkey.io/docs/
+- Valkey: https://github.com/valkey-io/valkey
+- Operator: https://github.com/freshworks-oss/redis-operator
+
+> `storageClass` is annotated as immutable in the chart schema — see [`docs/storage-immutability.md`](../../../docs/storage-immutability.md) for the contract and which consumers enforce it.
+
+## Parameters
+
+### Common parameters
+
+| Name               | Description                                                                                                                      | Type       | Value     |
+| ------------------ | -------------------------------------------------------------------------------------------------------------------------------- | ---------- | --------- |
+| `replicas`         | Number of Valkey replicas.                                                                                                       | `int`      | `2`       |
+| `resources`        | Explicit CPU and memory configuration for each Valkey replica. When omitted, the preset defined in `resourcesPreset` is applied. | `object`   | `{}`      |
+| `resources.cpu`    | CPU available to each replica.                                                                                                   | `quantity` | `""`      |
+| `resources.memory` | Memory (RAM) available to each replica.                                                                                          | `quantity` | `""`      |
+| `resourcesPreset`  | Default sizing preset used when `resources` is omitted.                                                                          | `string`   | `t1.nano` |
+| `size`             | Persistent Volume Claim size available for application data.                                                                     | `quantity` | `1Gi`     |
+| `storageClass`     | StorageClass used to store the data.                                                                                             | `string`   | `""`      |
+| `external`         | Enable external access from outside the cluster.                                                                                 | `bool`     | `false`   |
+| `version`          | Valkey major version to deploy                                                                                                   | `string`   | `v8`      |
+
+
+### Application-specific parameters
+
+| Name          | Description                 | Type   | Value  |
+| ------------- | --------------------------- | ------ | ------ |
+| `authEnabled` | Enable password generation. | `bool` | `true` |
+
+
+## Parameter examples and reference
+
+### resources and resourcesPreset
+
+`resources` sets explicit CPU and memory configurations for each replica.
+Every resource it leaves unset is taken from the preset defined in `resourcesPreset`.
+
+```yaml
+resources:
+  cpu: 4000m
+  memory: 4Gi
+```
+
+`resourcesPreset` sets named CPU and memory configurations for each replica.
+This setting is ignored if the corresponding `resources` value is set.
+
+Presets follow a cloud-style `<series>.<size>` naming convention. Five series cover the full CPU-to-memory ratio range (`t1` 1:0.5, `c1` 1:1, `s1` 1:2, `u1` 1:4, `m1` 1:8) and each series ships eight sizes (`nano` through `4xlarge`). The legacy flat names (`nano`, `micro`, `small`, `medium`, `large`, `xlarge`, `2xlarge`) remain accepted as deprecated aliases and keep their original sizes, which do not follow one series: `nano` through `small` equal the `t1` sizes of the same name, while `medium` equals `c1.small` rather than `c1.medium`.
+
+See [`docs/operations/resource-presets.md`](../../../docs/operations/resource-presets.md) for the full size matrix and the legacy-to-instance-type mapping.
diff --git a/packages/apps/valkey/charts/cozy-lib b/packages/apps/valkey/charts/cozy-lib
new file mode 120000
index 0000000000..e181350982
--- /dev/null
+++ b/packages/apps/valkey/charts/cozy-lib
@@ -0,0 +1 @@
+../../../library/cozy-lib
\ No newline at end of file
diff --git a/packages/apps/valkey/files/versions.yaml b/packages/apps/valkey/files/versions.yaml
new file mode 100644
index 0000000000..04a6b40dca
--- /dev/null
+++ b/packages/apps/valkey/files/versions.yaml
@@ -0,0 +1,2 @@
+"v8": "8.1.8"
+"v7": "7.2.13"
diff --git a/packages/apps/valkey/hack/update-versions.sh b/packages/apps/valkey/hack/update-versions.sh
new file mode 100755
index 0000000000..5d7191e18d
--- /dev/null
+++ b/packages/apps/valkey/hack/update-versions.sh
@@ -0,0 +1,117 @@
+#!/usr/bin/env bash
+
+set -o errexit
+set -o nounset
+set -o pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+VALKEY_DIR="$(cd "${SCRIPT_DIR}/.." && pwd)"
+VALUES_FILE="${VALKEY_DIR}/values.yaml"
+VERSIONS_FILE="${VALKEY_DIR}/files/versions.yaml"
+VALKEY_IMAGE="docker://docker.io/valkey/valkey"
+
+# Major versions we keep offering, newest first. We deliberately track the 8.x
+# line (default) and the 7.2.x line — the latter is the BSD-3-Clause fork of
+# Redis 7.2.4 and the most conservative drop-in target. Bumping the offered
+# majors (e.g. to add 9.x) is an explicit edit to this list.
+MAJORS=(8 7)
+
+# Check if skopeo is installed
+if ! command -v skopeo &> /dev/null; then
+    echo "Error: skopeo is not installed. Please install skopeo and try again." >&2
+    exit 1
+fi
+
+# Check if jq is installed
+if ! command -v jq &> /dev/null; then
+    echo "Error: jq is not installed. Please install jq and try again." >&2
+    exit 1
+fi
+
+# Get available image tags
+echo "Fetching available image tags from registry..."
+AVAILABLE_TAGS=$(skopeo list-tags "${VALKEY_IMAGE}" | jq -r '.Tags[] | select(test("^[0-9]+\\.[0-9]+\\.[0-9]+$"))' | sort -V)
+
+if [ -z "$AVAILABLE_TAGS" ]; then
+    echo "Error: Could not fetch available image tags" >&2
+    exit 1
+fi
+
+# Build versions map: major version -> latest patch version
+declare -A VERSION_MAP
+MAJOR_VERSIONS=()
+
+for major_version in "${MAJORS[@]}"; do
+    matching_tags=$(echo "$AVAILABLE_TAGS" | grep "^${major_version}\\.")
+    if [ -n "$matching_tags" ]; then
+        latest_tag=$(echo "$matching_tags" | tail -n1)
+        VERSION_MAP["v${major_version}"]="${latest_tag}"
+        MAJOR_VERSIONS+=("v${major_version}")
+        echo "Found version: v${major_version} -> ${latest_tag}"
+    else
+        echo "Warning: Could not find any patch versions for ${major_version}, skipping..." >&2
+    fi
+done
+
+if [ ${#MAJOR_VERSIONS[@]} -eq 0 ]; then
+    echo "Error: No matching versions found" >&2
+    exit 1
+fi
+
+# Create/update versions.yaml file
+echo "Updating $VERSIONS_FILE..."
+{
+    for major_ver in "${MAJOR_VERSIONS[@]}"; do
+        echo "\"${major_ver}\": \"${VERSION_MAP[$major_ver]}\""
+    done
+} > "$VERSIONS_FILE"
+
+echo "Successfully updated $VERSIONS_FILE"
+
+# Update values.yaml - enum with major versions only
+TEMP_FILE=$(mktemp)
+trap "rm -f $TEMP_FILE" EXIT
+
+# Build new version section
+NEW_VERSION_SECTION="## @enum {string} Version"
+for major_ver in "${MAJOR_VERSIONS[@]}"; do
+    NEW_VERSION_SECTION="${NEW_VERSION_SECTION}
+## @value $major_ver"
+done
+NEW_VERSION_SECTION="${NEW_VERSION_SECTION}
+
+## @param {Version} version - Valkey major version to deploy
+version: ${MAJOR_VERSIONS[0]}"
+
+# Check if version section already exists
+if grep -q "^## @enum {string} Version" "$VALUES_FILE"; then
+    echo "Updating existing version section in $VALUES_FILE..."
+    awk -v new_section="$NEW_VERSION_SECTION" '
+        /^## @enum {string} Version/ {
+            in_section = 1
+            print new_section
+            next
+        }
+        in_section && /^version: / {
+            in_section = 0
+            next
+        }
+        in_section {
+            next
+        }
+        { print }
+    ' "$VALUES_FILE" > "$TEMP_FILE"
+    cat "$TEMP_FILE" > "$VALUES_FILE"
+else
+    echo "Inserting new version section in $VALUES_FILE..."
+    awk -v new_section="$NEW_VERSION_SECTION" '
+        /^## @section Application-specific parameters/ {
+            print new_section
+            print ""
+        }
+        { print }
+    ' "$VALUES_FILE" > "$TEMP_FILE"
+    cat "$TEMP_FILE" > "$VALUES_FILE"
+fi
+
+echo "Successfully updated $VALUES_FILE with major versions: ${MAJOR_VERSIONS[*]}"
diff --git a/packages/apps/valkey/logos/valkey.svg b/packages/apps/valkey/logos/valkey.svg
new file mode 100644
index 0000000000..520138578a
--- /dev/null
+++ b/packages/apps/valkey/logos/valkey.svg
@@ -0,0 +1,11 @@
+<svg width="144" height="144" viewBox="0 0 144 144" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <rect width="144" height="144" rx="24" fill="url(#valkey_bg)"/>
+  <path d="M36 40h18l18 44 18-44h18L80 108h-16L36 40z" fill="#ffffff"/>
+  <circle cx="72" cy="52" r="7" fill="#ffffff"/>
+  <defs>
+    <linearGradient id="valkey_bg" x1="0" y1="0" x2="144" y2="144" gradientUnits="userSpaceOnUse">
+      <stop stop-color="#7A3BFF"/>
+      <stop offset="1" stop-color="#C6249B"/>
+    </linearGradient>
+  </defs>
+</svg>
diff --git a/packages/apps/http-cache/templates/_resources.tpl b/packages/apps/valkey/templates/_resources.tpl
similarity index 100%
rename from packages/apps/http-cache/templates/_resources.tpl
rename to packages/apps/valkey/templates/_resources.tpl
diff --git a/packages/apps/valkey/templates/_versions.tpl b/packages/apps/valkey/templates/_versions.tpl
new file mode 100644
index 0000000000..2e252a9e8e
--- /dev/null
+++ b/packages/apps/valkey/templates/_versions.tpl
@@ -0,0 +1,7 @@
+{{- define "valkey.versionMap" }}
+{{- $versionMap := .Files.Get "files/versions.yaml" | fromYaml }}
+{{- if not (hasKey $versionMap .Values.version) }}
+    {{- printf `Valkey version %s is not supported, allowed versions are %s` $.Values.version (keys $versionMap) | fail }}
+{{- end }}
+{{- index $versionMap .Values.version }}
+{{- end }}
diff --git a/packages/apps/valkey/templates/dashboard-resourcemap.yaml b/packages/apps/valkey/templates/dashboard-resourcemap.yaml
new file mode 100644
index 0000000000..e2e27d2879
--- /dev/null
+++ b/packages/apps/valkey/templates/dashboard-resourcemap.yaml
@@ -0,0 +1,41 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: {{ .Release.Name }}-dashboard-resources
+rules:
+- apiGroups:
+  - ""
+  resources:
+  - services
+  resourceNames:
+  - rfs-{{ .Release.Name }}
+  - rfrm-{{ .Release.Name }}
+  - rfrs-{{ .Release.Name }}
+  - "{{ .Release.Name }}-external-lb"
+  verbs: ["get", "list", "watch"]
+- apiGroups:
+  - ""
+  resources:
+  - secrets
+  resourceNames:
+  - "{{ .Release.Name }}-auth"
+  verbs: ["get", "list", "watch"]
+- apiGroups:
+  - cozystack.io
+  resources:
+  - workloadmonitors
+  resourceNames:
+  - {{ .Release.Name }}-valkey
+  - {{ .Release.Name }}-sentinel
+  verbs: ["get", "list", "watch"]
+---
+kind: RoleBinding
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: {{ .Release.Name }}-dashboard-resources
+subjects:
+{{ include "cozy-lib.rbac.subjectsForTenantAndAccessLevel" (list "use" .Release.Namespace) }}
+roleRef:
+  kind: Role
+  name: {{ .Release.Name }}-dashboard-resources
+  apiGroup: rbac.authorization.k8s.io
diff --git a/packages/apps/valkey/templates/service.yaml b/packages/apps/valkey/templates/service.yaml
new file mode 100644
index 0000000000..043f7d2cc3
--- /dev/null
+++ b/packages/apps/valkey/templates/service.yaml
@@ -0,0 +1,25 @@
+{{- if .Values.external }}
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ .Release.Name }}-external-lb
+  labels:
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+spec:
+  type: LoadBalancer
+  externalTrafficPolicy: Local
+  {{- if (include "cozy-lib.network.disableLoadBalancerNodePorts" $ | fromYaml) }}
+  allocateLoadBalancerNodePorts: false
+  {{- end }}
+  selector:
+    app.kubernetes.io/component: redis
+    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/part-of: redis-failover
+    redisfailovers-role: master
+  ports:
+  - name: redis
+    port: 6379
+    targetPort: redis
+{{- end }}
diff --git a/packages/apps/valkey/templates/servicescrape.yaml b/packages/apps/valkey/templates/servicescrape.yaml
new file mode 100644
index 0000000000..4ad0d18cb6
--- /dev/null
+++ b/packages/apps/valkey/templates/servicescrape.yaml
@@ -0,0 +1,44 @@
+apiVersion: operator.victoriametrics.com/v1beta1
+kind: VMServiceScrape
+metadata:
+  name: {{ .Release.Name }}
+  labels:
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+spec:
+  jobLabel: jobLabel
+  namespaceSelector:
+    matchNames:
+    - {{ .Release.Namespace }}
+  endpoints:
+  - port: metrics
+    relabelConfigs:
+    - replacement: valkey
+      targetLabel: job
+    - sourceLabels: [__meta_kubernetes_pod_node_name]
+      targetLabel: node
+    - replacement: cluster
+      targetLabel: tier
+    - targetLabel: service
+      replacement: {{ .Release.Name }}
+  selector:
+    matchLabels:
+      app: {{ .Release.Name }}-metrics
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ .Release.Name }}-metrics
+  labels:
+    app: {{ .Release.Name }}-metrics
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+spec:
+  selector:
+    app.kubernetes.io/component: redis
+    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/part-of: redis-failover
+  ports:
+  - name: metrics
+    port: 9121
+    targetPort: metrics
diff --git a/packages/apps/valkey/templates/valkeyfailover.yaml b/packages/apps/valkey/templates/valkeyfailover.yaml
new file mode 100644
index 0000000000..a30382120b
--- /dev/null
+++ b/packages/apps/valkey/templates/valkeyfailover.yaml
@@ -0,0 +1,111 @@
+{{- if .Values.authEnabled }}
+  {{- $existingPassword := lookup "v1" "Secret" .Release.Namespace (printf "%s-auth" .Release.Name) }}
+  {{- $password := randAlphaNum 32 | b64enc }}
+  {{- if $existingPassword }}
+    {{- $password = index $existingPassword.data "password" }}
+  {{- end }}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ .Release.Name }}-auth
+data:
+  password: {{ $password }}
+{{- end }}
+
+---
+
+apiVersion: databases.spotahome.com/v1
+kind: RedisFailover
+metadata:
+  name: {{ .Release.Name }}
+  labels:
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    # The freshworks-oss operator reconciles only RedisFailovers whose
+    # operator-group label matches its OPERATOR_GROUP_ID (see
+    # packages/system/redis-operator/values.yaml); without it the CR is
+    # silently ignored. Keep both sides in sync.
+    redis-failover.freshworks.com/operator-group: cozystack
+spec:
+  engine: Valkey
+  sentinel:
+    replicas: 3
+    resources: {{- include "cozy-lib.resources.defaultingSanitize" (list .Values.resourcesPreset .Values.resources $) | nindent 6 }}
+  redis:
+    image: "valkey/valkey:{{ include "valkey.versionMap" $ }}"
+    resources: {{- include "cozy-lib.resources.defaultingSanitize" (list .Values.resourcesPreset .Values.resources $) | nindent 6 }}
+    replicas: {{ .Values.replicas }}
+    {{- with .Values.size }}
+    storage:
+      persistentVolumeClaim:
+        metadata:
+          name: redisfailover-persistent-data
+          labels:
+            app.kubernetes.io/component: redis
+            app.kubernetes.io/instance: {{ $.Release.Name }}
+        spec:
+          accessModes:
+            - ReadWriteOnce
+          resources:
+            requests:
+              storage: {{ . }}
+          {{- with $.Values.storageClass }}
+          storageClassName: {{ . }}
+          {{- end }}
+    {{- end }}
+    exporter:
+      enabled: true
+      image: oliver006/redis_exporter:v1.55.0@sha256:d82625bda93823fb40de881ffbb45b65aca772a39c30141387f92314c258da5d
+      args:
+        - --web.telemetry-path
+        - /metrics
+      env:
+        - name: REDIS_EXPORTER_LOG_FORMAT
+          value: txt
+    customConfig:
+      - tcp-keepalive 0
+      - loglevel notice
+      {{- if not .Values.size }}
+      - appendonly no
+      - save ""
+      {{- end }}
+  {{- if .Values.authEnabled }}
+  auth:
+    secretPath: {{ .Release.Name }}-auth
+  {{- end }}
+
+---
+apiVersion: cozystack.io/v1alpha1
+kind: WorkloadMonitor
+metadata:
+  name: {{ $.Release.Name }}-valkey
+  namespace: {{ $.Release.Namespace }}
+  labels:
+    workloads.cozystack.io/resource-preset: {{ .Values.resourcesPreset | quote }}
+spec:
+  minReplicas: 1
+  replicas: {{ .Values.replicas }}
+  kind: valkey
+  type: valkey
+  selector:
+    app.kubernetes.io/component: redis
+    app.kubernetes.io/instance: {{ $.Release.Name }}
+  version: {{ $.Chart.Version }}
+---
+apiVersion: cozystack.io/v1alpha1
+kind: WorkloadMonitor
+metadata:
+  name: {{ $.Release.Name }}-sentinel
+  namespace: {{ $.Release.Namespace }}
+  labels:
+    workloads.cozystack.io/resource-preset: {{ .Values.resourcesPreset | quote }}
+spec:
+  minReplicas: 2
+  replicas: 3
+  kind: valkey
+  type: sentinel
+  selector:
+    app.kubernetes.io/component: sentinel
+    app.kubernetes.io/instance: {{ $.Release.Name }}
+  version: {{ $.Chart.Version }}
diff --git a/packages/apps/valkey/values.schema.json b/packages/apps/valkey/values.schema.json
new file mode 100644
index 0000000000..c6db3f895a
--- /dev/null
+++ b/packages/apps/valkey/values.schema.json
@@ -0,0 +1,145 @@
+{
+  "title": "Chart Values",
+  "type": "object",
+  "properties": {
+    "replicas": {
+      "description": "Number of Valkey replicas.",
+      "type": "integer",
+      "default": 2
+    },
+    "resources": {
+      "description": "Explicit CPU and memory configuration for each Valkey replica. When omitted, the preset defined in `resourcesPreset` is applied.",
+      "type": "object",
+      "default": {},
+      "properties": {
+        "cpu": {
+          "description": "CPU available to each replica.",
+          "pattern": "^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$",
+          "anyOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "type": "string"
+            }
+          ],
+          "x-kubernetes-int-or-string": true
+        },
+        "memory": {
+          "description": "Memory (RAM) available to each replica.",
+          "pattern": "^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$",
+          "anyOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "type": "string"
+            }
+          ],
+          "x-kubernetes-int-or-string": true
+        }
+      }
+    },
+    "resourcesPreset": {
+      "description": "Default sizing preset used when `resources` is omitted.",
+      "type": "string",
+      "default": "t1.nano",
+      "enum": [
+        "t1.nano",
+        "t1.micro",
+        "t1.small",
+        "t1.medium",
+        "t1.large",
+        "t1.xlarge",
+        "t1.2xlarge",
+        "t1.4xlarge",
+        "c1.nano",
+        "c1.micro",
+        "c1.small",
+        "c1.medium",
+        "c1.large",
+        "c1.xlarge",
+        "c1.2xlarge",
+        "c1.4xlarge",
+        "s1.nano",
+        "s1.micro",
+        "s1.small",
+        "s1.medium",
+        "s1.large",
+        "s1.xlarge",
+        "s1.2xlarge",
+        "s1.4xlarge",
+        "u1.nano",
+        "u1.micro",
+        "u1.small",
+        "u1.medium",
+        "u1.large",
+        "u1.xlarge",
+        "u1.2xlarge",
+        "u1.4xlarge",
+        "m1.nano",
+        "m1.micro",
+        "m1.small",
+        "m1.medium",
+        "m1.large",
+        "m1.xlarge",
+        "m1.2xlarge",
+        "m1.4xlarge",
+        "nano",
+        "micro",
+        "small",
+        "medium",
+        "large",
+        "xlarge",
+        "2xlarge"
+      ]
+    },
+    "size": {
+      "description": "Persistent Volume Claim size available for application data.",
+      "default": "1Gi",
+      "pattern": "^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$",
+      "anyOf": [
+        {
+          "type": "integer"
+        },
+        {
+          "type": "string"
+        }
+      ],
+      "x-kubernetes-int-or-string": true
+    },
+    "storageClass": {
+      "description": "StorageClass used to store the data.",
+      "type": "string",
+      "default": "",
+      "x-kubernetes-validations": [
+        {
+          "rule": "self == oldSelf",
+          "message": "storageClass is immutable"
+        }
+      ],
+      "x-cozystack-options": {
+        "source": "storageclass"
+      }
+    },
+    "external": {
+      "description": "Enable external access from outside the cluster.",
+      "type": "boolean",
+      "default": false
+    },
+    "version": {
+      "description": "Valkey major version to deploy",
+      "type": "string",
+      "default": "v8",
+      "enum": [
+        "v8",
+        "v7"
+      ]
+    },
+    "authEnabled": {
+      "description": "Enable password generation.",
+      "type": "boolean",
+      "default": true
+    }
+  }
+}
diff --git a/packages/apps/valkey/values.yaml b/packages/apps/valkey/values.yaml
new file mode 100644
index 0000000000..63940436da
--- /dev/null
+++ b/packages/apps/valkey/values.yaml
@@ -0,0 +1,90 @@
+##
+## @section Common parameters
+##
+
+## @typedef {struct} Resources - Explicit CPU and memory configuration for each Valkey replica.
+## @field {quantity} [cpu] - CPU available to each replica.
+## @field {quantity} [memory] - Memory (RAM) available to each replica.
+
+## @enum {string} ResourcesPreset - Default sizing preset.
+## @value t1.nano
+## @value t1.micro
+## @value t1.small
+## @value t1.medium
+## @value t1.large
+## @value t1.xlarge
+## @value t1.2xlarge
+## @value t1.4xlarge
+## @value c1.nano
+## @value c1.micro
+## @value c1.small
+## @value c1.medium
+## @value c1.large
+## @value c1.xlarge
+## @value c1.2xlarge
+## @value c1.4xlarge
+## @value s1.nano
+## @value s1.micro
+## @value s1.small
+## @value s1.medium
+## @value s1.large
+## @value s1.xlarge
+## @value s1.2xlarge
+## @value s1.4xlarge
+## @value u1.nano
+## @value u1.micro
+## @value u1.small
+## @value u1.medium
+## @value u1.large
+## @value u1.xlarge
+## @value u1.2xlarge
+## @value u1.4xlarge
+## @value m1.nano
+## @value m1.micro
+## @value m1.small
+## @value m1.medium
+## @value m1.large
+## @value m1.xlarge
+## @value m1.2xlarge
+## @value m1.4xlarge
+## @value nano
+## @value micro
+## @value small
+## @value medium
+## @value large
+## @value xlarge
+## @value 2xlarge
+
+## @param {int} replicas - Number of Valkey replicas.
+replicas: 2
+
+## @param {Resources} [resources] - Explicit CPU and memory configuration for each Valkey replica. When omitted, the preset defined in `resourcesPreset` is applied.
+resources: {}
+
+## @param {ResourcesPreset} resourcesPreset="t1.nano" - Default sizing preset used when `resources` is omitted.
+resourcesPreset: "t1.nano"
+
+## @param {quantity} size - Persistent Volume Claim size available for application data.
+size: 1Gi
+
+## @param {string} storageClass - StorageClass used to store the data.
+## @immutable
+## @x-cozystack-options {source: storageclass}
+storageClass: ""
+
+## @param {bool} external - Enable external access from outside the cluster.
+external: false
+
+## @enum {string} Version
+## @value v8
+## @value v7
+
+## @param {Version} version - Valkey major version to deploy
+version: v8
+
+##
+## @section Application-specific parameters
+##
+
+## @param {bool} authEnabled - Enable password generation.
+authEnabled: true
diff --git a/packages/apps/vm-disk/Makefile b/packages/apps/vm-disk/Makefile
index 80b1075a45..f60da96d7d 100644
--- a/packages/apps/vm-disk/Makefile
+++ b/packages/apps/vm-disk/Makefile
@@ -1,5 +1,8 @@
 include ../../../hack/package.mk
 
+test:
+	helm unittest .
+
 generate:
 	cozyvalues-gen -m 'vmdisk' -v values.yaml -s values.schema.json -r README.md -g ../../../api/apps/v1alpha1/vmdisk/types.go
 	../../../hack/update-crd.sh
diff --git a/packages/apps/vm-disk/README.md b/packages/apps/vm-disk/README.md
index 36bf5502b4..4700a8ee90 100644
--- a/packages/apps/vm-disk/README.md
+++ b/packages/apps/vm-disk/README.md
@@ -2,23 +2,30 @@
 
 A Virtual Machine Disk
 
-> `storageClass` is annotated as immutable in the chart schema — see [`docs/storage-immutability.md`](../../../docs/storage-immutability.md) for the contract and which consumers enforce it.
+> `storageClass` and `source` are annotated as immutable in the chart schema — see [`docs/storage-immutability.md`](../../../docs/storage-immutability.md) for the contract and which consumers enforce it. `DataVolume.spec` is immutable in CDI, so the chart also fails the release on an attempted `storageClass`/`source` edit of an existing disk rather than silently reusing the old spec; delete and recreate the disk to change either field.
+
+> Whether CDI has finished populating the disk shows up in the `WorkloadsReady` condition, not in `Ready`, which follows the Helm release and does not wait on the DataVolume: `WorkloadsReady` stays `False` while an import, clone or upload is in flight and when the DataVolume fails. Its message names the DataVolume and the phase it is in, followed by the error CDI reports for the pod populating the disk when there is one, such as a 404 or an unresolvable host on an HTTP source: CDI keeps retrying such an import, so its phase stays `ImportInProgress`, and the error is shown between retries rather than while a retry is running. `kubectl get vmdisks` shows the condition in the `WORKLOADS` column, and the console badge reads `DataVolumeNotReady` until it is `True`. A disk created before this behaviour was introduced keeps its old release settings, under which `Ready` may wait on the DataVolume, until its application is next updated. A `source.upload` disk reads `False` from the moment it is created until `virtctl image-upload` completes, because CDI reports waiting for the upload and receiving it as one phase. A disk counts as ready while it waits for its consumer with `bindImmediately` off on a `WaitForFirstConsumer` class, because that is a state such a disk is supposed to rest in.
+
+> `bindImmediately` is on by default, so a disk's volume is provisioned when the disk is created rather than deferred to the first consumer. That default exists because a VMDisk is a standalone object with a lifecycle of its own: on a `WaitForFirstConsumer` StorageClass a disk that no VM has attached yet would otherwise never populate at all. It costs something on a node-pinned class such as `local`, where the CDI worker pod becomes the first consumer and the volume lands where that pod was scheduled rather than where the VM will run, so a VM whose placement is constrained (a `nodeSelector`, a resource request only one node satisfies, or the Windows affinity applied by `_cluster.scheduling.dedicatedNodesForWindowsVMs`) can stay unschedulable against a node-affinity conflict, and `storageClass` is immutable so the only exit is deleting and recreating the disk. Turn `bindImmediately` off for a disk a VMInstance will consume on such a class: KubeVirt then renders a temporary launcher pod carrying the VM's own affinity and node selector, and the volume binds where the VM can actually run. The chart default `replicated` binds `Immediate` regardless, so neither setting changes anything there.
+
+> A disk created from `source.image` should use the StorageClass its golden image lives in, `replicated` in the default layout. When CDI clones with the `csi-clone` strategy, the platform default, into a different StorageClass of the same CSI driver with the same volume mode and room to expand, it does not fall back to a host-assisted copy and leaves the clone to the driver. The `snapshot` strategy does the same when it gets a VolumeSnapshotClass of that driver: the class both StorageProfiles name, or, when they do not name the same one, any class of the driver. LINSTOR creates that clone next to the source data, so on a target class that does not allow remote volume access from every node, such as a node-local class, the clone may never bind. The chart refuses such a new disk when the golden's driver and the target class's provisioner are both LINSTOR and the target's `allowRemoteVolumeAccess` is not a value linstor-csi reads as true (`1`, `t` or `true`, in any of the cases Go's `strconv.ParseBool` accepts); any other value is a list of rules, and the chart counts it as access from anywhere only when one rule names no `fromSame` label. Without that parameter it reads the target's layer list the way linstor-csi does, which allows remote access when it has a DRBD or NVMe layer, and a class that sets no layer list has DRBD. Under `snapshot`, it also refuses a disk whose golden and target StorageProfiles name the same VolumeSnapshotClass when that class does not exist and the golden's driver is the target class's provisioner, whatever the driver: CDI then fails to plan the clone instead of falling back. Both refusals compare only what they can look up: without the golden image's PVC, the `cdi` resource or the target's StorageClass nothing is compared. The remote access refusal also needs the target's StorageProfile with a claim property set and the golden's driver, taken from its bound PV or else from its StorageClass; when any of them is missing, the disk renders. Neither applies to a disk whose DataVolume or PVC already exists. Use the golden image's StorageClass instead, or ask the platform administrator to set `cloneStrategyOverride: copy` in the `kubevirt-cdi` package, which clones through a host-assisted copy in every case. The remote access refusal leaves alone a target class that allows remote volume access, a driver other than LINSTOR, a target class of another driver, a different volume mode, a class without volume expansion, `snapshot` that gets no VolumeSnapshotClass of the driver, and the `copy` strategy. An empty `storageClass` is compared as the class CDI would pick for it: the class annotated `storageclass.kubevirt.io/is-default-virt-class`, otherwise the class annotated `storageclass.kubernetes.io/is-default-class`; when several classes carry the annotation that decides, nothing is compared.
 
 ## Parameters
 
 ### Common parameters
 
-| Name                | Description                                             | Type       | Value        |
-| ------------------- | ------------------------------------------------------- | ---------- | ------------ |
-| `source`            | The source image location used to create a disk.        | `object`   | `{}`         |
-| `source.image`      | Use image by name from default collection.              | `*object`  | `null`       |
-| `source.image.name` | Name of the image to use.                               | `string`   | `""`         |
-| `source.upload`     | Upload local image.                                     | `*object`  | `null`       |
-| `source.http`       | Download image from an HTTP source.                     | `*object`  | `null`       |
-| `source.http.url`   | URL to download the image.                              | `string`   | `""`         |
-| `source.disk`       | Clone an existing vm-disk.                              | `*object`  | `null`       |
-| `source.disk.name`  | Name of the vm-disk to clone.                           | `string`   | `""`         |
-| `optical`           | Defines if disk should be considered optical.           | `bool`     | `false`      |
-| `storage`           | The size of the disk allocated for the virtual machine. | `quantity` | `5Gi`        |
-| `storageClass`      | StorageClass used to store the data.                    | `string`   | `replicated` |
+| Name                | Description                                                              | Type       | Value        |
+| ------------------- | ------------------------------------------------------------------------ | ---------- | ------------ |
+| `source`            | The source image location used to create a disk.                         | `object`   | `{}`         |
+| `source.image`      | Use image by name from default collection.                               | `*object`  | `null`       |
+| `source.image.name` | Name of the image to use.                                                | `string`   | `""`         |
+| `source.upload`     | Upload local image.                                                      | `*object`  | `null`       |
+| `source.http`       | Download image from an HTTP source.                                      | `*object`  | `null`       |
+| `source.http.url`   | URL to download the image.                                               | `string`   | `""`         |
+| `source.disk`       | Clone an existing vm-disk.                                               | `*object`  | `null`       |
+| `source.disk.name`  | Name of the vm-disk to clone.                                            | `string`   | `""`         |
+| `optical`           | Defines if disk should be considered optical.                            | `bool`     | `false`      |
+| `storage`           | The size of the disk allocated for the virtual machine.                  | `quantity` | `5Gi`        |
+| `storageClass`      | StorageClass used to store the data.                                     | `string`   | `replicated` |
+| `bindImmediately`   | Provision the volume at disk creation instead of waiting for a consumer. | `bool`     | `true`       |
 
diff --git a/packages/apps/vm-disk/templates/dv.yaml b/packages/apps/vm-disk/templates/dv.yaml
index 521a82b830..09831fc794 100644
--- a/packages/apps/vm-disk/templates/dv.yaml
+++ b/packages/apps/vm-disk/templates/dv.yaml
@@ -1,10 +1,259 @@
 {{- $existingDV := lookup "cdi.kubevirt.io/v1beta1" "DataVolume" .Release.Namespace .Release.Name }}
+{{- $sourceAnnotation := "vm-disk.cozystack.io/source" }}
+{{- $storageClassAnnotation := "vm-disk.cozystack.io/storage-class" }}
+{{- $requestedSource := toJson (.Values.source | default dict) }}
+{{- $requestedSC := (.Values.storageClass | default "") | toString }}
+{{- /* Build the desired source spec from .Values so it can be both rendered and compared. */}}
+{{- $desiredSource := dict }}
+{{- if .Values.source }}
+  {{- if gt (len .Values.source) 1 }}
+    {{- fail "Exactly one type of source is expected!" }}
+  {{- end }}
+  {{- if hasKey .Values.source "image" }}
+    {{- $desiredSource = dict "pvc" (dict "name" (printf "vm-default-images-%s" (required "A valid .Values.source.image.name entry required!" .Values.source.image.name)) "namespace" "cozy-public") }}
+    {{- /* Refuse a golden that is missing or whose import Failed: CDI never
+           populates it, so the clone would wait forever. A golden still importing
+           is left alone because CDI holds the clone until the source is populated.
+           Missing means neither the DataVolume nor the PVC CDI clones exists, as
+           the DataVolume can precede its PVC, and counts only when the release
+           namespace is visible: helm template has no cluster and every lookup
+           comes back empty. An existing disk is exempt: its DataVolume spec is
+           immutable, so failing the render cannot rescue it and would only block
+           this release's upgrades. Its PVC alone counts as existing, since CDI
+           can garbage-collect a completed DataVolume and leave the PVC. */}}
+    {{- if not (or $existingDV (lookup "v1" "PersistentVolumeClaim" .Release.Namespace .Release.Name)) }}
+      {{- $golden := lookup "cdi.kubevirt.io/v1beta1" "DataVolume" "cozy-public" $desiredSource.pvc.name }}
+      {{- $goldenPVC := lookup "v1" "PersistentVolumeClaim" "cozy-public" $desiredSource.pvc.name }}
+      {{- if eq (dig "status" "phase" "" $golden | toString) "Failed" }}
+        {{- fail (printf "source.image %q: golden DataVolume %q in cozy-public failed to import (phase Failed), so a clone of it would never complete. Ask the platform administrator to check the importer pod in cozy-public, then delete that DataVolume to retry the import." .Values.source.image.name $desiredSource.pvc.name) }}
+      {{- else if and (not $golden) (not $goldenPVC) (lookup "v1" "Namespace" "" .Release.Namespace) }}
+        {{- fail (printf "source.image %q: golden image %q not found in cozy-public, so a clone of it would never start. Check the image name, or ask the platform administrator to add cozystack.vm-default-images to bundles.enabledPackages." .Values.source.image.name $desiredSource.pvc.name) }}
+      {{- end }}
+      {{- /* Refuse a clone into a class other than the golden's that CDI would
+             attempt as an advanced clone (csi-clone, or snapshot with a usable
+             snapshot class): nothing on that path compares class names,
+             so a target class of the same provisioner gets no fallback. LINSTOR
+             creates the clone where the source data is and then needs it
+             reachable from the node the claim is placed on, which only a class
+             allowing remote access from anywhere guarantees; otherwise the
+             clone PVC may never bind. The golden PVC carries the class CDI
+             resolved for it; without one (no cluster, or the PVC not created
+             yet) nothing is compared. An empty storageClass is resolved the
+             way CDI resolves it for a kubevirt DataVolume: the default virt
+             class, else the Kubernetes default class. CDI breaks a tie between
+             several defaults by creation time; that is not reproduced, so a
+             tie compares nothing. */}}
+      {{- $goldenSC := dig "spec" "storageClassName" "" ($goldenPVC | default dict) | toString }}
+      {{- $targetSC := $requestedSC }}
+      {{- if and $goldenSC (not $targetSC) }}
+        {{- $classes := (lookup "storage.k8s.io/v1" "StorageClass" "" "").items | default list }}
+        {{- $resolved := false }}
+        {{- range $annotation := list "storageclass.kubevirt.io/is-default-virt-class" "storageclass.kubernetes.io/is-default-class" }}
+          {{- if not $resolved }}
+            {{- $defaults := list }}
+            {{- range $classes }}
+              {{- if eq (dig "metadata" "annotations" $annotation "" . | toString) "true" }}
+                {{- $defaults = append $defaults .metadata.name }}
+              {{- end }}
+            {{- end }}
+            {{- if $defaults }}
+              {{- $resolved = true }}
+              {{- if eq (len $defaults) 1 }}{{- $targetSC = first $defaults }}{{- end }}
+            {{- end }}
+          {{- end }}
+        {{- end }}
+      {{- end }}
+      {{- if and $goldenSC $targetSC (ne $goldenSC $targetSC) }}
+        {{- /* Mirror CDI's planner (pkg/controller/clone/planner.go at
+               v1.66.1): the strategy is the CDI CR's override, else the target
+               StorageProfile's, else snapshot. snapshot falls back to a
+               host-assisted copy when no VolumeSnapshotClass serves the
+               driver (the one both StorageProfiles name, else any), fails
+               outright when the one both name does not exist, and otherwise
+               goes on like csi-clone. csi-clone falls back on a driver or
+               volume mode mismatch, or on a larger target in a class without
+               expansion; sizes are not compared, so a class without expansion
+               is left alone. A host-assisted copy completes, so every fallback
+               renders. Anything else not found compares nothing. */}}
+        {{- $cdi := lookup "cdi.kubevirt.io/v1beta1" "CDI" "" "cdi" }}
+        {{- $profile := lookup "cdi.kubevirt.io/v1beta1" "StorageProfile" "" $targetSC | default dict }}
+        {{- $goldenClass := lookup "storage.k8s.io/v1" "StorageClass" "" $goldenSC | default dict }}
+        {{- $targetClass := lookup "storage.k8s.io/v1" "StorageClass" "" $targetSC | default dict }}
+        {{- $strategy := "" }}
+        {{- if $cdi }}
+          {{- $strategy = dig "spec" "cloneStrategyOverride" "" $cdi | default (dig "status" "cloneStrategy" "snapshot" $profile) | toString }}
+        {{- end }}
+        {{- /* CDI reads the source's driver from its bound PV first. */}}
+        {{- $goldenProvisioner := dig "provisioner" "" $goldenClass | toString }}
+        {{- with dig "spec" "volumeName" "" $goldenPVC }}
+          {{- with dig "spec" "csi" "driver" "" (lookup "v1" "PersistentVolume" "" . | default dict) }}
+            {{- $goldenProvisioner = . | toString }}
+          {{- end }}
+        {{- end }}
+        {{- $sameProvisioner := and $goldenProvisioner (eq $goldenProvisioner (dig "provisioner" "" $targetClass | toString)) }}
+        {{- $advanced := eq $strategy "csi-clone" }}
+        {{- /* Gated on the API being served: a lookup of a kind the cluster
+               does not know fails the render instead of returning nothing. */}}
+        {{- if and (eq $strategy "snapshot") (.Capabilities.APIVersions.Has "snapshot.storage.k8s.io/v1/VolumeSnapshotClass") }}
+          {{- $goldenProfile := lookup "cdi.kubevirt.io/v1beta1" "StorageProfile" "" $goldenSC | default dict }}
+          {{- $commonSnapshotClass := dig "status" "snapshotClass" "" $goldenProfile | toString }}
+          {{- if ne $commonSnapshotClass (dig "status" "snapshotClass" "" $profile | toString) }}
+            {{- $commonSnapshotClass = "" }}
+          {{- end }}
+          {{- if $commonSnapshotClass }}
+            {{- $snapshotClass := lookup "snapshot.storage.k8s.io/v1" "VolumeSnapshotClass" "" $commonSnapshotClass }}
+            {{- if and $sameProvisioner (not $snapshotClass) }}
+              {{- fail (printf "source.image %q: VolumeSnapshotClass %q, named by the StorageProfiles of both %q and %q, does not exist, so CDI cannot plan a clone of golden image %q into StorageClass %q. Set storageClass to %q, or ask the platform administrator to fix the StorageProfiles' snapshotClass." .Values.source.image.name $commonSnapshotClass $goldenSC $targetSC $desiredSource.pvc.name $targetSC $goldenSC) }}
+            {{- end }}
+            {{- $advanced = eq (dig "driver" "" ($snapshotClass | default dict) | toString) $goldenProvisioner }}
+          {{- else }}
+            {{- range (lookup "snapshot.storage.k8s.io/v1" "VolumeSnapshotClass" "" "").items | default list }}
+              {{- if eq (dig "driver" "" . | toString) $goldenProvisioner }}{{- $advanced = true }}{{- end }}
+            {{- end }}
+          {{- end }}
+        {{- end }}
+        {{- $propertySets := dig "status" "claimPropertySets" list $profile }}
+        {{- $targetMode := "" }}
+        {{- if $propertySets }}
+          {{- $targetMode = dig "volumeMode" "Filesystem" (first $propertySets) | toString }}
+        {{- end }}
+        {{- /* linstor-csi takes the parameter with or without its prefix and
+               the key in any case, parses the value with strconv.ParseBool, and
+               without it allows remote access when the layer list (DRBD and
+               storage by default) has a DRBD or NVMe layer. Any other value is
+               a list of rules, and a rule naming no fromSame label allows
+               access from anywhere. */}}
+        {{- $remoteAccess := "" }}
+        {{- $layerList := "drbd storage" }}
+        {{- range $key, $value := dig "parameters" dict $targetClass }}
+          {{- $parts := splitn "/" 2 $key }}
+          {{- $name := $parts._0 }}
+          {{- if $parts._1 }}
+            {{- $name = ternary $parts._1 "" (eq $parts._0 "linstor.csi.linbit.com") }}
+          {{- end }}
+          {{- if eq (lower $name) "allowremotevolumeaccess" }}{{- $remoteAccess = $value | toString }}{{- end }}
+          {{- if eq (lower $name) "layerlist" }}{{- $layerList = $value | toString }}{{- end }}
+        {{- end }}
+        {{- $layers := splitList " " (lower $layerList) }}
+        {{- $remoteFromAnywhere := or (has "drbd" $layers) (has "nvme" $layers) }}
+        {{- if $remoteAccess }}
+          {{- $remoteFromAnywhere = has $remoteAccess (list "1" "t" "T" "TRUE" "true" "True") }}
+          {{- range fromYamlArray $remoteAccess }}
+            {{- if and (kindIs "map" .) (not (get . "fromSame")) }}{{- $remoteFromAnywhere = true }}{{- end }}
+          {{- end }}
+        {{- end }}
+        {{- if and $advanced $sameProvisioner (eq $goldenProvisioner "linstor.csi.linbit.com") (not $remoteFromAnywhere) (eq $targetMode (dig "spec" "volumeMode" "Filesystem" $goldenPVC | toString)) (dig "allowVolumeExpansion" false $targetClass) }}
+          {{- fail (printf "source.image %q: golden image %q lives in StorageClass %q, and a clone into StorageClass %q of the same provisioner gets no host-assisted fallback from CDI. LINSTOR creates the clone next to the source data, and StorageClass %q does not allow remote volume access from every node, so the clone may never bind. Set storageClass to %q, or ask the platform administrator to set cloneStrategyOverride to copy in the kubevirt-cdi package." .Values.source.image.name $desiredSource.pvc.name $goldenSC $targetSC $targetSC $goldenSC) }}
+        {{- end }}
+      {{- end }}
+    {{- end }}
+  {{- else if hasKey .Values.source "http" }}
+    {{- $desiredSource = dict "http" (dict "url" (required "A valid .Values.source.http.url entry required!" .Values.source.http.url)) }}
+  {{- else if hasKey .Values.source "upload" }}
+    {{- $desiredSource = dict "upload" dict }}
+  {{- else if hasKey .Values.source "disk" }}
+    {{- $desiredSource = dict "pvc" (dict "name" (printf "vm-disk-%s" (required "A valid .Values.source.disk.name entry required!" .Values.source.disk.name)) "namespace" .Release.Namespace) }}
+  {{- else }}
+    {{- fail (printf "Unknown source type: %s. Expected one of: image, http, upload, disk." (keys .Values.source | join ", ")) }}
+  {{- end }}
+{{- else }}
+  {{- $desiredSource = dict "blank" dict }}
+{{- end }}
+{{- /*
+  DataVolume.spec is immutable in CDI, so editing storageClass/source on an
+  existing disk is a silent no-op that diverges the CR from the cluster (#2985);
+  fail instead. Both are compared against the operator input recorded in an
+  annotation at creation (legacy disks fall back to stored spec.source). Full
+  contract + caveats: docs/storage-immutability.md. Size growth: pvc-resize-hook.
+*/}}
+{{- if $existingDV }}
+  {{- $existingAnnotations := $existingDV.metadata.annotations | default dict }}
+  {{- if hasKey $existingAnnotations $storageClassAnnotation }}
+    {{- $recordedSC := (index $existingAnnotations $storageClassAnnotation) | toString }}
+    {{- if ne $recordedSC $requestedSC }}
+      {{- fail (printf "VMDisk storageClass is immutable after creation (current: %q, requested: %q). Delete and recreate the disk to change it." $recordedSC $requestedSC) }}
+    {{- end }}
+  {{- end }}
+  {{- $recordedSource := (index $existingAnnotations $sourceAnnotation) | default "" }}
+  {{- if $recordedSource }}
+    {{- if ne $recordedSource $requestedSource }}
+      {{- fail (printf "VMDisk source is immutable after creation (current: %s, requested: %s). Delete and recreate the disk to change it." $recordedSource $requestedSource) }}
+    {{- end }}
+  {{- else }}
+    {{- $storedSource := $existingDV.spec.source | default dict }}
+    {{- /* Legacy disk (no annotation): compare only chart-producible stored
+           shapes; anything else (sourceRef, non-map, foreign source) is left
+           alone, never crashed or deadlocked. Vars are declared before the map
+           guards so they stay in scope below. See docs/storage-immutability.md. */}}
+    {{- $storedType := "" }}
+    {{- $chartShaped := false }}
+    {{- $storedIsImageClone := false }}
+    {{- if kindIs "map" $storedSource }}
+      {{- if eq (len (keys $storedSource)) 1 }}{{- $storedType = first (keys $storedSource) }}{{- end }}
+      {{- $storedBody := index $storedSource $storedType }}
+      {{- if kindIs "map" $storedBody }}
+        {{- if or (eq $storedType "blank") (eq $storedType "upload") }}
+          {{- $chartShaped = true }}
+        {{- else if eq $storedType "http" }}
+          {{- if eq (keys $storedBody | sortAlpha | join ",") "url" }}{{- $chartShaped = true }}{{- end }}
+        {{- else if eq $storedType "pvc" }}
+          {{- /* The chart only ever clones a pvc from cozy-public (image) or the
+                 release namespace (disk); a pvc in any other namespace is a
+                 foreign source with no chart-producible provenance. */}}
+          {{- if eq (keys $storedBody | sortAlpha | join ",") "name,namespace" }}
+            {{- if or (eq ($storedBody.namespace | toString) "cozy-public") (eq ($storedBody.namespace | toString) .Release.Namespace) }}
+              {{- $chartShaped = true }}
+            {{- end }}
+            {{- if eq ($storedBody.namespace | toString) "cozy-public" }}{{- $storedIsImageClone = true }}{{- end }}
+          {{- end }}
+        {{- end }}
+      {{- end }}
+    {{- end }}
+    {{- /* The image-clone exemption applies only when the request is ALSO an
+           image: the vm-image- -> vm-default-images- prefix drift is
+           indistinguishable from a real image-name change only then. A change
+           away from an image source to another type is a different shape and is
+           still caught. */}}
+    {{- $exemptImage := and $storedIsImageClone (hasKey (.Values.source | default dict) "image") }}
+    {{- if and $chartShaped (not $exemptImage) }}
+      {{- if ne (toYaml $storedSource) (toYaml $desiredSource) }}
+        {{- fail (printf "VMDisk source is immutable after creation (current: %s, requested: %s). Delete and recreate the disk to change it." (toJson $storedSource) $requestedSource) }}
+      {{- end }}
+    {{- end }}
+  {{- end }}
+{{- end }}
 apiVersion: cdi.kubevirt.io/v1beta1
 kind: DataVolume
 metadata:
   annotations:
-    {{- if hasKey .Values.source "upload" }}
-    cdi.kubevirt.io/storage.bind.immediate.requested: ""
+    {{- /* A `#` comment here would be part of the rendered DataVolume, so the
+           explanation lives in a template comment and the operator-facing half
+           in README.md.
+
+           On by default, for every source type, and on the existing-DV path as
+           well: a VMDisk is a standalone object populated before any VM consumes
+           it, so on a WaitForFirstConsumer class a disk nothing has attached
+           would never populate at all. CDI reads the annotation by presence.
+
+           Off is the placement-correct path for a disk a VMInstance will
+           consume: KubeVirt renders a temporary launcher pod carrying the VM's
+           own affinity and nodeSelector, so the volume binds where the VM can
+           actually run. The two cases want opposite defaults and only the
+           operator knows which one a given disk is. `replicated`, the chart
+           default, binds Immediate either way, so neither setting moves it. */}}
+    {{- if .Values.bindImmediately }}
+    cdi.kubevirt.io/storage.bind.immediate.requested: "true"
+    {{- end }}
+    {{- if $existingDV }}
+    {{- if hasKey ($existingDV.metadata.annotations | default dict) $sourceAnnotation }}
+    {{ $sourceAnnotation }}: {{ index ($existingDV.metadata.annotations | default dict) $sourceAnnotation | quote }}
+    {{- end }}
+    {{- if hasKey ($existingDV.metadata.annotations | default dict) $storageClassAnnotation }}
+    {{ $storageClassAnnotation }}: {{ index ($existingDV.metadata.annotations | default dict) $storageClassAnnotation | quote }}
+    {{- end }}
+    {{- else }}
+    {{ $sourceAnnotation }}: {{ $requestedSource | quote }}
+    {{ $storageClassAnnotation }}: {{ $requestedSC | quote }}
     {{- end }}
     vm-disk.cozystack.io/optical: "{{ .Values.optical }}"
   labels:
@@ -13,31 +262,10 @@ metadata:
 spec:
   {{- if $existingDV }}
     {{- toYaml $existingDV.spec | nindent 2 }}
-  {{- else }} 
-  contentType: kubevirt
-  {{- if .Values.source }}
-  {{- if gt (len .Values.source) 1 }}
-    {{- fail "Exactly one type of source is expected!" }}
-  {{- end }}
-  source:
-    {{- if hasKey .Values.source "image" }}
-    pvc:
-      name: vm-default-images-{{ required "A valid .Values.source.image.name entry required!" .Values.source.image.name }}
-      namespace: cozy-public
-    {{- else if hasKey .Values.source "http" }}
-    http:
-      url: {{ required "A valid .Values.source.http.url entry required!" .Values.source.http.url }}
-    {{- else if hasKey .Values.source "upload" }}
-    upload: {}
-    {{- else if hasKey .Values.source "disk" }}
-    pvc:
-      name: vm-disk-{{ required "A valid .Values.source.disk.name entry required!" .Values.source.disk.name }}
-      namespace: {{ $.Release.Namespace }}
-    {{- end }}
   {{- else }}
+  contentType: kubevirt
   source:
-    blank: {}
-  {{- end }}
+    {{- toYaml $desiredSource | nindent 4 }}
   storage:
     resources:
       requests:
diff --git a/packages/apps/vm-disk/templates/pvc-resize-hook.yaml b/packages/apps/vm-disk/templates/pvc-resize-hook.yaml
index 2454c599cb..5e327c6f58 100644
--- a/packages/apps/vm-disk/templates/pvc-resize-hook.yaml
+++ b/packages/apps/vm-disk/templates/pvc-resize-hook.yaml
@@ -21,6 +21,7 @@ metadata:
     helm.sh/hook-weight: "0"
     helm.sh/hook-delete-policy: hook-succeeded,before-hook-creation
 spec:
+  backoffLimit: 1
   template:
     metadata:
       labels:
@@ -28,10 +29,18 @@ spec:
     spec:
       serviceAccountName: {{ .Release.Name }}-volume-resize-hook
       restartPolicy: Never
-      backoffLimit: 1
+      securityContext:
+        runAsNonRoot: true
+        runAsUser: 65534
+        seccompProfile:
+          type: RuntimeDefault
       containers:
         - name: resize
-          image: docker.io/alpine/k8s:1.33.4
+          image: docker.io/alpine/k8s:1.36.2
+          securityContext:
+            allowPrivilegeEscalation: false
+            capabilities:
+              drop: ["ALL"]
           command: ["sh", "-xec"]
           args:
             - |
diff --git a/packages/apps/vm-disk/tests/datavolume_test.yaml b/packages/apps/vm-disk/tests/datavolume_test.yaml
new file mode 100644
index 0000000000..4b07b10d5e
--- /dev/null
+++ b/packages/apps/vm-disk/tests/datavolume_test.yaml
@@ -0,0 +1,65 @@
+suite: vm-disk DataVolume binding
+templates:
+  - templates/dv.yaml
+tests:
+  - it: requests immediate binding for a standalone disk
+    set:
+      source:
+        http:
+          url: https://example.com/disk.img
+    asserts:
+      - equal:
+          path: metadata.annotations["cdi.kubevirt.io/storage.bind.immediate.requested"]
+          value: "true"
+
+  # Both branches are pinned, because the two cases the switch exists for want
+  # opposite defaults: a standalone disk needs the bind now or it never
+  # populates, and a disk a VMInstance will consume binds correctly only when
+  # KubeVirt's launcher pod is the first consumer. Asserted by key absence and
+  # not by a negated match, which passes for free once the path stops resolving.
+  - it: omits the annotation when the operator defers binding to the consumer
+    set:
+      bindImmediately: false
+      source:
+        http:
+          url: https://example.com/disk.img
+    asserts:
+      - notExists:
+          path: metadata.annotations["cdi.kubevirt.io/storage.bind.immediate.requested"]
+      - exists:
+          path: metadata.annotations["vm-disk.cozystack.io/source"]
+
+  # The existing-DataVolume path renders its own annotation block, so the switch
+  # has to reach it too rather than only the creation path.
+  - it: defers binding on an existing DataVolume as well
+    set:
+      bindImmediately: false
+      storageClass: replicated
+      source: {http: {url: https://example.com/original.qcow2}}
+    kubernetesProvider:
+      scheme:
+        "cdi.kubevirt.io/v1beta1/DataVolume":
+          gvr: {group: cdi.kubevirt.io, version: v1beta1, resource: datavolumes}
+          namespaced: true
+      objects:
+        - kind: DataVolume
+          apiVersion: cdi.kubevirt.io/v1beta1
+          metadata:
+            name: RELEASE-NAME
+            namespace: NAMESPACE
+            annotations:
+              vm-disk.cozystack.io/source: '{"http":{"url":"https://example.com/original.qcow2"}}'
+              vm-disk.cozystack.io/storage-class: replicated
+          spec:
+            source: {http: {url: https://example.com/original.qcow2}}
+            storage: {resources: {requests: {storage: 9Gi}}, storageClassName: replicated}
+    asserts:
+      - notFailedTemplate: {}
+      # 9Gi comes from the mocked object and 5Gi from values, so this proves the
+      # render took the existing-DataVolume path rather than passing as a fresh
+      # create that happens to omit the same annotation.
+      - equal:
+          path: spec.storage.resources.requests.storage
+          value: 9Gi
+      - notExists:
+          path: metadata.annotations["cdi.kubevirt.io/storage.bind.immediate.requested"]
diff --git a/packages/apps/vm-disk/tests/dv_golden_image_test.yaml b/packages/apps/vm-disk/tests/dv_golden_image_test.yaml
new file mode 100644
index 0000000000..d901c6c96e
--- /dev/null
+++ b/packages/apps/vm-disk/tests/dv_golden_image_test.yaml
@@ -0,0 +1,187 @@
+suite: vm-disk refuses to clone a golden image that is missing or failed
+# A golden that is missing or whose import Failed is never populated, and CDI
+# holds a clone of it forever, so a new disk on it would sit pending with
+# nothing pointing at the image. A golden still importing is safe to clone
+# because CDI waits for it, and helm template has no cluster to look it up in.
+release:
+  name: test-vm-disk
+  namespace: tenant-test
+templates:
+  - templates/dv.yaml
+tests:
+  - it: refuses a new disk on a golden whose import Failed
+    set:
+      source: {image: {name: ubuntu}}
+    kubernetesProvider:
+      scheme: &scheme
+        "cdi.kubevirt.io/v1beta1/DataVolume":
+          gvr: {group: cdi.kubevirt.io, version: v1beta1, resource: datavolumes}
+          namespaced: true
+        "v1/Namespace":
+          gvr: {group: "", version: v1, resource: namespaces}
+          namespaced: false
+        "v1/PersistentVolumeClaim":
+          gvr: {group: "", version: v1, resource: persistentvolumeclaims}
+          namespaced: true
+      objects:
+        - kind: DataVolume
+          apiVersion: cdi.kubevirt.io/v1beta1
+          metadata: {name: vm-default-images-ubuntu, namespace: cozy-public}
+          status: {phase: Failed}
+    asserts:
+      - failedTemplate:
+          errorPattern: 'golden DataVolume "vm-default-images-ubuntu" in cozy-public failed to import \(phase Failed\)'
+
+  - it: clones a golden whose import Succeeded
+    set:
+      source: {image: {name: ubuntu}}
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - kind: Namespace
+          apiVersion: v1
+          metadata: {name: tenant-test}
+        - kind: DataVolume
+          apiVersion: cdi.kubevirt.io/v1beta1
+          metadata: {name: vm-default-images-ubuntu, namespace: cozy-public}
+          status: {phase: Succeeded}
+        - kind: PersistentVolumeClaim
+          apiVersion: v1
+          metadata: {name: vm-default-images-ubuntu, namespace: cozy-public}
+    asserts:
+      - equal:
+          path: spec.source.pvc
+          value: {name: vm-default-images-ubuntu, namespace: cozy-public}
+
+  - it: clones a golden that is still importing
+    set:
+      source: {image: {name: ubuntu}}
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - kind: Namespace
+          apiVersion: v1
+          metadata: {name: tenant-test}
+        - kind: DataVolume
+          apiVersion: cdi.kubevirt.io/v1beta1
+          metadata: {name: vm-default-images-ubuntu, namespace: cozy-public}
+          status: {phase: ImportInProgress}
+        - kind: PersistentVolumeClaim
+          apiVersion: v1
+          metadata: {name: vm-default-images-ubuntu, namespace: cozy-public}
+    asserts:
+      - equal:
+          path: spec.source.pvc
+          value: {name: vm-default-images-ubuntu, namespace: cozy-public}
+
+  - it: renders without a cluster to look the golden up in
+    set:
+      source: {image: {name: ubuntu}}
+    asserts:
+      - equal:
+          path: spec.source.pvc
+          value: {name: vm-default-images-ubuntu, namespace: cozy-public}
+
+  - it: leaves an existing disk alone when its golden later Failed
+    set:
+      source: {image: {name: ubuntu}}
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - kind: DataVolume
+          apiVersion: cdi.kubevirt.io/v1beta1
+          metadata: {name: vm-default-images-ubuntu, namespace: cozy-public}
+          status: {phase: Failed}
+        - kind: DataVolume
+          apiVersion: cdi.kubevirt.io/v1beta1
+          metadata:
+            name: test-vm-disk
+            namespace: tenant-test
+            annotations:
+              vm-disk.cozystack.io/source: '{"image":{"name":"ubuntu"}}'
+              vm-disk.cozystack.io/storage-class: replicated
+          spec:
+            source: {pvc: {name: vm-default-images-ubuntu, namespace: cozy-public}}
+            storage: {resources: {requests: {storage: 5Gi}}, storageClassName: replicated}
+    asserts:
+      - notFailedTemplate: {}
+
+  - it: refuses a new disk on a golden that does not exist
+    set:
+      source: {image: {name: nosuch}}
+    kubernetesProvider:
+      scheme: *scheme
+      objects: &releaseNamespace
+        - kind: Namespace
+          apiVersion: v1
+          metadata: {name: tenant-test}
+    asserts:
+      - failedTemplate:
+          errorPattern: 'source.image "nosuch": golden image "vm-default-images-nosuch" not found in cozy-public'
+
+  - it: clones a golden PVC that has no DataVolume
+    set:
+      source: {image: {name: ubuntu}}
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - kind: Namespace
+          apiVersion: v1
+          metadata: {name: tenant-test}
+        - kind: PersistentVolumeClaim
+          apiVersion: v1
+          metadata: {name: vm-default-images-ubuntu, namespace: cozy-public}
+    asserts:
+      - equal:
+          path: spec.source.pvc
+          value: {name: vm-default-images-ubuntu, namespace: cozy-public}
+
+  - it: leaves an existing disk alone when its golden was later removed
+    set:
+      source: {image: {name: ubuntu}}
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - kind: Namespace
+          apiVersion: v1
+          metadata: {name: tenant-test}
+        - kind: DataVolume
+          apiVersion: cdi.kubevirt.io/v1beta1
+          metadata:
+            name: test-vm-disk
+            namespace: tenant-test
+            annotations:
+              vm-disk.cozystack.io/source: '{"image":{"name":"ubuntu"}}'
+              vm-disk.cozystack.io/storage-class: replicated
+          spec:
+            source: {pvc: {name: vm-default-images-ubuntu, namespace: cozy-public}}
+            storage: {resources: {requests: {storage: 5Gi}}, storageClassName: replicated}
+    asserts:
+      - notFailedTemplate: {}
+
+  - it: does not look the golden up for a source other than an image
+    set:
+      source: {http: {url: "https://example.com/disk.img"}}
+    kubernetesProvider:
+      scheme: *scheme
+      objects: *releaseNamespace
+    asserts:
+      - notFailedTemplate: {}
+
+  - it: clones a golden whose DataVolume exists before CDI created its PVC
+    set:
+      source: {image: {name: ubuntu}}
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - kind: Namespace
+          apiVersion: v1
+          metadata: {name: tenant-test}
+        - kind: DataVolume
+          apiVersion: cdi.kubevirt.io/v1beta1
+          metadata: {name: vm-default-images-ubuntu, namespace: cozy-public}
+          status: {phase: ImportScheduled}
+    asserts:
+      - equal:
+          path: spec.source.pvc
+          value: {name: vm-default-images-ubuntu, namespace: cozy-public}
diff --git a/packages/apps/vm-disk/tests/dv_golden_storageclass_test.yaml b/packages/apps/vm-disk/tests/dv_golden_storageclass_test.yaml
new file mode 100644
index 0000000000..48b7dbf2e3
--- /dev/null
+++ b/packages/apps/vm-disk/tests/dv_golden_storageclass_test.yaml
@@ -0,0 +1,1362 @@
+suite: vm-disk refuses a golden-image clone CDI would leave to the CSI driver
+# CDI's csi-clone path, and its snapshot path once a VolumeSnapshotClass
+# serves the provisioner, check the source and target classes for a common
+# provisioner, a matching volume mode and room to expand, and nothing else: a
+# target in another class of the same provisioner gets no host-assisted
+# fallback. LINSTOR creates the clone next to the source data, so on a
+# target class without remote volume access its clone PVC may never bind.
+# A snapshot class both profiles name that does not exist is refused as
+# well, since CDI then fails instead of falling back. Every other
+# combination either falls back to a host-assisted copy, is reachable from
+# any node, or is a case the chart cannot see, and renders.
+# The class the golden lives in is read from its PVC, which carries the
+# class CDI resolved for it.
+release:
+  name: test-vm-disk
+  namespace: tenant-test
+templates:
+  - templates/dv.yaml
+tests:
+  - it: refuses a new disk in another class of the golden's provisioner under csi-clone
+    set:
+      source: {image: {name: ubuntu}}
+      storageClass: local
+    kubernetesProvider:
+      scheme: &scheme
+        "cdi.kubevirt.io/v1beta1/DataVolume":
+          gvr: {group: cdi.kubevirt.io, version: v1beta1, resource: datavolumes}
+          namespaced: true
+        "cdi.kubevirt.io/v1beta1/CDI":
+          gvr: {group: cdi.kubevirt.io, version: v1beta1, resource: cdis}
+          namespaced: false
+        "cdi.kubevirt.io/v1beta1/StorageProfile":
+          gvr: {group: cdi.kubevirt.io, version: v1beta1, resource: storageprofiles}
+          namespaced: false
+        "v1/Namespace":
+          gvr: {group: "", version: v1, resource: namespaces}
+          namespaced: false
+        "v1/PersistentVolumeClaim":
+          gvr: {group: "", version: v1, resource: persistentvolumeclaims}
+          namespaced: true
+        "storage.k8s.io/v1/StorageClass":
+          gvr: {group: storage.k8s.io, version: v1, resource: storageclasses}
+          namespaced: false
+      objects:
+        - &namespace
+          kind: Namespace
+          apiVersion: v1
+          metadata: {name: tenant-test}
+        - &goldenPVC
+          kind: PersistentVolumeClaim
+          apiVersion: v1
+          metadata: {name: vm-default-images-ubuntu, namespace: cozy-public}
+          spec: {storageClassName: replicated, volumeMode: Block}
+        - &cdiCSIClone
+          kind: CDI
+          apiVersion: cdi.kubevirt.io/v1beta1
+          metadata: {name: cdi}
+          spec: {cloneStrategyOverride: csi-clone}
+        - &replicatedClass
+          kind: StorageClass
+          apiVersion: storage.k8s.io/v1
+          metadata: {name: replicated}
+          provisioner: linstor.csi.linbit.com
+          allowVolumeExpansion: true
+        - &localClass
+          kind: StorageClass
+          apiVersion: storage.k8s.io/v1
+          metadata: {name: local}
+          provisioner: linstor.csi.linbit.com
+          parameters: {linstor.csi.linbit.com/allowRemoteVolumeAccess: "false"}
+          allowVolumeExpansion: true
+        - &localProfile
+          kind: StorageProfile
+          apiVersion: cdi.kubevirt.io/v1beta1
+          metadata: {name: local}
+          status:
+            claimPropertySets: [{accessModes: [ReadWriteOnce], volumeMode: Block}]
+    asserts:
+      - failedTemplate:
+          errorPattern: 'source.image "ubuntu": golden image "vm-default-images-ubuntu" lives in StorageClass "replicated", and a clone into StorageClass "local" of the same provisioner gets no host-assisted fallback from CDI\. LINSTOR creates the clone next to the source data, and StorageClass "local" does not allow remote volume access from every node, so the clone may never bind\. Set storageClass to "replicated"'
+
+  # The golden's own class carries a profile here too, so only the class
+  # comparison keeps the common case from being refused.
+  - it: clones a golden in the class the disk asks for
+    set:
+      source: {image: {name: ubuntu}}
+      storageClass: replicated
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - *namespace
+        - *goldenPVC
+        - *cdiCSIClone
+        - *replicatedClass
+        - *localClass
+        - *localProfile
+        - &replicatedProfile
+          kind: StorageProfile
+          apiVersion: cdi.kubevirt.io/v1beta1
+          metadata: {name: replicated}
+          status:
+            claimPropertySets: [{accessModes: [ReadWriteOnce], volumeMode: Block}]
+    asserts:
+      - equal:
+          path: spec.storage.storageClassName
+          value: replicated
+
+  - it: renders without a cluster to look the golden up in
+    set:
+      source: {image: {name: ubuntu}}
+      storageClass: local
+    asserts:
+      - equal:
+          path: spec.storage.storageClassName
+          value: local
+
+  # The DataVolume can exist a moment before CDI creates its PVC; its own spec
+  # may name no class, so only the PVC is trusted for the comparison.
+  - it: clones a golden whose PVC does not exist yet
+    set:
+      source: {image: {name: ubuntu}}
+      storageClass: local
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - *namespace
+        - *cdiCSIClone
+        - *replicatedClass
+        - *localClass
+        - *localProfile
+        - kind: DataVolume
+          apiVersion: cdi.kubevirt.io/v1beta1
+          metadata: {name: vm-default-images-ubuntu, namespace: cozy-public}
+          status: {phase: ImportScheduled}
+    asserts:
+      - notFailedTemplate: {}
+
+  - it: leaves an existing disk alone
+    set:
+      source: {image: {name: ubuntu}}
+      storageClass: local
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - *namespace
+        - *goldenPVC
+        - *cdiCSIClone
+        - *replicatedClass
+        - *localClass
+        - *localProfile
+        - kind: DataVolume
+          apiVersion: cdi.kubevirt.io/v1beta1
+          metadata:
+            name: test-vm-disk
+            namespace: tenant-test
+            annotations:
+              vm-disk.cozystack.io/source: '{"image":{"name":"ubuntu"}}'
+              vm-disk.cozystack.io/storage-class: local
+          spec:
+            source: {pvc: {name: vm-default-images-ubuntu, namespace: cozy-public}}
+            storage: {resources: {requests: {storage: 5Gi}}, storageClassName: local}
+    asserts:
+      - notFailedTemplate: {}
+
+  - it: does not compare classes for a source other than an image
+    set:
+      source: {disk: {name: other}}
+      storageClass: local
+    kubernetesProvider:
+      scheme: *scheme
+      objects: [*namespace, *goldenPVC, *cdiCSIClone, *replicatedClass, *localClass, *localProfile]
+    asserts:
+      - notFailedTemplate: {}
+
+  # Each of the following removes exactly one condition of the refusal from
+  # the fixture above; CDI falls back to a host-assisted copy for each, which
+  # completes across classes.
+  - it: clones into a class of another provisioner
+    set:
+      source: {image: {name: ubuntu}}
+      storageClass: local
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - *namespace
+        - *goldenPVC
+        - *cdiCSIClone
+        - *replicatedClass
+        - *localProfile
+        - kind: StorageClass
+          apiVersion: storage.k8s.io/v1
+          metadata: {name: local}
+          provisioner: rancher.io/local-path
+          parameters: {linstor.csi.linbit.com/allowRemoteVolumeAccess: "false"}
+          allowVolumeExpansion: true
+    asserts:
+      - notFailedTemplate: {}
+
+  - it: clones under the copy strategy
+    set:
+      source: {image: {name: ubuntu}}
+      storageClass: local
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - *namespace
+        - *goldenPVC
+        - *replicatedClass
+        - *localClass
+        - *localProfile
+        - kind: CDI
+          apiVersion: cdi.kubevirt.io/v1beta1
+          metadata: {name: cdi}
+          spec: {cloneStrategyOverride: copy}
+    asserts:
+      - notFailedTemplate: {}
+
+  - it: clones into a class whose volume mode differs from the golden's
+    set:
+      source: {image: {name: ubuntu}}
+      storageClass: local
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - *namespace
+        - *goldenPVC
+        - *cdiCSIClone
+        - *replicatedClass
+        - *localClass
+        - kind: StorageProfile
+          apiVersion: cdi.kubevirt.io/v1beta1
+          metadata: {name: local}
+          status:
+            claimPropertySets: [{accessModes: [ReadWriteOnce], volumeMode: Filesystem}]
+    asserts:
+      - notFailedTemplate: {}
+
+  # Without expansion CDI falls back only for a disk larger than the golden;
+  # the chart does not compare sizes, so it leaves such a class alone.
+  - it: clones into a class that does not allow volume expansion
+    set:
+      source: {image: {name: ubuntu}}
+      storageClass: local
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - *namespace
+        - *goldenPVC
+        - *cdiCSIClone
+        - *replicatedClass
+        - *localProfile
+        - kind: StorageClass
+          apiVersion: storage.k8s.io/v1
+          metadata: {name: local}
+          provisioner: linstor.csi.linbit.com
+          parameters: {linstor.csi.linbit.com/allowRemoteVolumeAccess: "false"}
+    asserts:
+      - notFailedTemplate: {}
+
+  # The snapshot path falls back to a host-assisted copy only when no
+  # VolumeSnapshotClass serves the provisioner; past that it runs the same
+  # checks as csi-clone, so a usable snapshot class is refused like csi-clone.
+  - it: refuses under the snapshot strategy when a snapshot class serves the provisioner
+    set:
+      source: {image: {name: ubuntu}}
+      storageClass: local
+    capabilities: &snapshotAPI
+      apiVersions:
+        - snapshot.storage.k8s.io/v1/VolumeSnapshotClass
+    kubernetesProvider:
+      scheme: &snapshotScheme
+        "cdi.kubevirt.io/v1beta1/CDI":
+          gvr: {group: cdi.kubevirt.io, version: v1beta1, resource: cdis}
+          namespaced: false
+        "cdi.kubevirt.io/v1beta1/DataVolume":
+          gvr: {group: cdi.kubevirt.io, version: v1beta1, resource: datavolumes}
+          namespaced: true
+        "cdi.kubevirt.io/v1beta1/StorageProfile":
+          gvr: {group: cdi.kubevirt.io, version: v1beta1, resource: storageprofiles}
+          namespaced: false
+        "v1/Namespace":
+          gvr: {group: "", version: v1, resource: namespaces}
+          namespaced: false
+        "v1/PersistentVolumeClaim":
+          gvr: {group: "", version: v1, resource: persistentvolumeclaims}
+          namespaced: true
+        "storage.k8s.io/v1/StorageClass":
+          gvr: {group: storage.k8s.io, version: v1, resource: storageclasses}
+          namespaced: false
+        "snapshot.storage.k8s.io/v1/VolumeSnapshotClass":
+          gvr: {group: snapshot.storage.k8s.io, version: v1, resource: volumesnapshotclasses}
+          namespaced: false
+      objects:
+        - *namespace
+        - *goldenPVC
+        - *replicatedClass
+        - *localClass
+        - *localProfile
+        - &cdiSnapshot
+          kind: CDI
+          apiVersion: cdi.kubevirt.io/v1beta1
+          metadata: {name: cdi}
+          spec: {cloneStrategyOverride: snapshot}
+        - &linstorSnapshotClass
+          kind: VolumeSnapshotClass
+          apiVersion: snapshot.storage.k8s.io/v1
+          metadata: {name: linstor-snapshots}
+          driver: linstor.csi.linbit.com
+    asserts:
+      - failedTemplate:
+          errorPattern: 'a clone into StorageClass "local" of the same provisioner gets no host-assisted fallback from CDI'
+
+  - it: clones under the snapshot strategy when no snapshot class serves the provisioner
+    set:
+      source: {image: {name: ubuntu}}
+      storageClass: local
+    capabilities: *snapshotAPI
+    kubernetesProvider:
+      scheme: *snapshotScheme
+      objects:
+        - *namespace
+        - *goldenPVC
+        - *replicatedClass
+        - *localClass
+        - *localProfile
+        - *cdiSnapshot
+        - kind: VolumeSnapshotClass
+          apiVersion: snapshot.storage.k8s.io/v1
+          metadata: {name: other-snapshots}
+          driver: rancher.io/local-path
+    asserts:
+      - notFailedTemplate: {}
+
+  # When both StorageProfiles name the same snapshot class, CDI uses that one
+  # class and falls back if its driver is another provisioner's.
+  - it: clones under the snapshot strategy when the profiles' common snapshot class serves another provisioner
+    set:
+      source: {image: {name: ubuntu}}
+      storageClass: local
+    capabilities: *snapshotAPI
+    kubernetesProvider:
+      scheme: *snapshotScheme
+      objects:
+        - *namespace
+        - *goldenPVC
+        - *replicatedClass
+        - *localClass
+        - *cdiSnapshot
+        - *linstorSnapshotClass
+        - kind: VolumeSnapshotClass
+          apiVersion: snapshot.storage.k8s.io/v1
+          metadata: {name: other-snapshots}
+          driver: rancher.io/local-path
+        - kind: StorageProfile
+          apiVersion: cdi.kubevirt.io/v1beta1
+          metadata: {name: replicated}
+          status: {snapshotClass: other-snapshots}
+        - kind: StorageProfile
+          apiVersion: cdi.kubevirt.io/v1beta1
+          metadata: {name: local}
+          status:
+            snapshotClass: other-snapshots
+            claimPropertySets: [{accessModes: [ReadWriteOnce], volumeMode: Block}]
+    asserts:
+      - notFailedTemplate: {}
+
+  - it: refuses under the snapshot strategy when the profiles' common snapshot class serves the provisioner
+    set:
+      source: {image: {name: ubuntu}}
+      storageClass: local
+    capabilities: *snapshotAPI
+    kubernetesProvider:
+      scheme: *snapshotScheme
+      objects:
+        - *namespace
+        - *goldenPVC
+        - *replicatedClass
+        - *localClass
+        - *cdiSnapshot
+        - *linstorSnapshotClass
+        - kind: StorageProfile
+          apiVersion: cdi.kubevirt.io/v1beta1
+          metadata: {name: replicated}
+          status: {snapshotClass: linstor-snapshots}
+        - kind: StorageProfile
+          apiVersion: cdi.kubevirt.io/v1beta1
+          metadata: {name: local}
+          status:
+            snapshotClass: linstor-snapshots
+            claimPropertySets: [{accessModes: [ReadWriteOnce], volumeMode: Block}]
+    asserts:
+      - failedTemplate:
+          errorPattern: 'a clone into StorageClass "local" of the same provisioner gets no host-assisted fallback from CDI'
+
+  # A snapshot class only one profile names is not common to both, so CDI
+  # picks any class of the provisioner instead.
+  - it: refuses under the snapshot strategy when only the golden's profile names a snapshot class
+    set:
+      source: {image: {name: ubuntu}}
+      storageClass: local
+    capabilities: *snapshotAPI
+    kubernetesProvider:
+      scheme: *snapshotScheme
+      objects:
+        - *namespace
+        - *goldenPVC
+        - *replicatedClass
+        - *localClass
+        - *localProfile
+        - *cdiSnapshot
+        - *linstorSnapshotClass
+        - kind: VolumeSnapshotClass
+          apiVersion: snapshot.storage.k8s.io/v1
+          metadata: {name: other-snapshots}
+          driver: rancher.io/local-path
+        - kind: StorageProfile
+          apiVersion: cdi.kubevirt.io/v1beta1
+          metadata: {name: replicated}
+          status: {snapshotClass: other-snapshots}
+    asserts:
+      - failedTemplate:
+          errorPattern: 'a clone into StorageClass "local" of the same provisioner gets no host-assisted fallback from CDI'
+
+  - it: refuses under the snapshot strategy when only the target's profile names a snapshot class
+    set:
+      source: {image: {name: ubuntu}}
+      storageClass: local
+    capabilities: *snapshotAPI
+    kubernetesProvider:
+      scheme: *snapshotScheme
+      objects:
+        - *namespace
+        - *goldenPVC
+        - *replicatedClass
+        - *localClass
+        - *cdiSnapshot
+        - *linstorSnapshotClass
+        - kind: VolumeSnapshotClass
+          apiVersion: snapshot.storage.k8s.io/v1
+          metadata: {name: other-snapshots}
+          driver: rancher.io/local-path
+        - kind: StorageProfile
+          apiVersion: cdi.kubevirt.io/v1beta1
+          metadata: {name: local}
+          status:
+            snapshotClass: other-snapshots
+            claimPropertySets: [{accessModes: [ReadWriteOnce], volumeMode: Block}]
+    asserts:
+      - failedTemplate:
+          errorPattern: 'a clone into StorageClass "local" of the same provisioner gets no host-assisted fallback from CDI'
+
+  # Without the snapshot API there is no snapshot class to look up, and a
+  # lookup of a kind the cluster does not serve would fail the render.
+  - it: clones under the snapshot strategy when the cluster has no snapshot API
+    set:
+      source: {image: {name: ubuntu}}
+      storageClass: local
+    kubernetesProvider:
+      scheme: *scheme
+      objects: [*namespace, *goldenPVC, *replicatedClass, *localClass, *localProfile, *cdiSnapshot]
+    asserts:
+      - notFailedTemplate: {}
+
+  # With no global override CDI takes the strategy from the target class's
+  # StorageProfile.
+  - it: refuses without an override when the target profile selects csi-clone
+    set:
+      source: {image: {name: ubuntu}}
+      storageClass: local
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - *namespace
+        - *goldenPVC
+        - *replicatedClass
+        - *localClass
+        - &cdiNoOverride
+          kind: CDI
+          apiVersion: cdi.kubevirt.io/v1beta1
+          metadata: {name: cdi}
+          spec: {}
+        - kind: StorageProfile
+          apiVersion: cdi.kubevirt.io/v1beta1
+          metadata: {name: local}
+          status:
+            cloneStrategy: csi-clone
+            claimPropertySets: [{accessModes: [ReadWriteOnce], volumeMode: Block}]
+    asserts:
+      - failedTemplate:
+          errorPattern: 'a clone into StorageClass "local" of the same provisioner gets no host-assisted fallback from CDI'
+
+  # The CDI override wins over the target profile's strategy, in both directions.
+  - it: refuses when the override is csi-clone and the target profile selects copy
+    set:
+      source: {image: {name: ubuntu}}
+      storageClass: local
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - *namespace
+        - *goldenPVC
+        - *cdiCSIClone
+        - *replicatedClass
+        - *localClass
+        - kind: StorageProfile
+          apiVersion: cdi.kubevirt.io/v1beta1
+          metadata: {name: local}
+          status:
+            cloneStrategy: copy
+            claimPropertySets: [{accessModes: [ReadWriteOnce], volumeMode: Block}]
+    asserts:
+      - failedTemplate:
+          errorPattern: 'a clone into StorageClass "local" of the same provisioner gets no host-assisted fallback from CDI'
+
+  - it: clones when the override is copy and the target profile selects csi-clone
+    set:
+      source: {image: {name: ubuntu}}
+      storageClass: local
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - *namespace
+        - *goldenPVC
+        - *replicatedClass
+        - *localClass
+        - kind: CDI
+          apiVersion: cdi.kubevirt.io/v1beta1
+          metadata: {name: cdi}
+          spec: {cloneStrategyOverride: copy}
+        - kind: StorageProfile
+          apiVersion: cdi.kubevirt.io/v1beta1
+          metadata: {name: local}
+          status:
+            cloneStrategy: csi-clone
+            claimPropertySets: [{accessModes: [ReadWriteOnce], volumeMode: Block}]
+    asserts:
+      - notFailedTemplate: {}
+
+  # With no override and no profile strategy CDI takes snapshot, which a
+  # snapshot class of the provisioner turns into an advanced clone.
+  - it: refuses without an override or a profile strategy when a snapshot class serves the provisioner
+    set:
+      source: {image: {name: ubuntu}}
+      storageClass: local
+    capabilities: *snapshotAPI
+    kubernetesProvider:
+      scheme: *snapshotScheme
+      objects:
+        - *namespace
+        - *goldenPVC
+        - *replicatedClass
+        - *localClass
+        - *localProfile
+        - *linstorSnapshotClass
+        - kind: CDI
+          apiVersion: cdi.kubevirt.io/v1beta1
+          metadata: {name: cdi}
+          spec: {}
+    asserts:
+      - failedTemplate:
+          errorPattern: 'a clone into StorageClass "local" of the same provisioner gets no host-assisted fallback from CDI'
+
+  # Without the CDI resource the strategy is unknown, even with a profile that
+  # names csi-clone.
+  - it: clones when the CDI resource cannot be found
+    set:
+      source: {image: {name: ubuntu}}
+      storageClass: local
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - *namespace
+        - *goldenPVC
+        - *replicatedClass
+        - *localClass
+        - kind: StorageProfile
+          apiVersion: cdi.kubevirt.io/v1beta1
+          metadata: {name: local}
+          status:
+            cloneStrategy: csi-clone
+            claimPropertySets: [{accessModes: [ReadWriteOnce], volumeMode: Block}]
+    asserts:
+      - notFailedTemplate: {}
+
+  - it: clones when the golden's StorageClass cannot be found
+    set:
+      source: {image: {name: ubuntu}}
+      storageClass: local
+    kubernetesProvider:
+      scheme: *scheme
+      objects: [*namespace, *goldenPVC, *cdiCSIClone, *localClass, *localProfile]
+    asserts:
+      - notFailedTemplate: {}
+
+  # Without a claim property set the target's volume mode is unknown.
+  - it: clones when the target profile carries no claim property set
+    set:
+      source: {image: {name: ubuntu}}
+      storageClass: local
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - *namespace
+        - *goldenPVC
+        - *cdiCSIClone
+        - *replicatedClass
+        - *localClass
+        - kind: StorageProfile
+          apiVersion: cdi.kubevirt.io/v1beta1
+          metadata: {name: local}
+          status: {}
+    asserts:
+      - notFailedTemplate: {}
+
+  # A volume mode left unset on either side means Filesystem: the API server
+  # defaults the PVC, and CDI leaves an unset profile mode to that default.
+  - it: refuses when both volume modes are left at the default
+    set:
+      source: {image: {name: ubuntu}}
+      storageClass: local
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - *namespace
+        - *cdiCSIClone
+        - *replicatedClass
+        - *localClass
+        - kind: PersistentVolumeClaim
+          apiVersion: v1
+          metadata: {name: vm-default-images-ubuntu, namespace: cozy-public}
+          spec: {storageClassName: replicated}
+        - kind: StorageProfile
+          apiVersion: cdi.kubevirt.io/v1beta1
+          metadata: {name: local}
+          status:
+            claimPropertySets: [{accessModes: [ReadWriteOnce]}]
+    asserts:
+      - failedTemplate:
+          errorPattern: 'a clone into StorageClass "local" of the same provisioner gets no host-assisted fallback from CDI'
+
+  - it: clones without an override when the target profile names no strategy
+    set:
+      source: {image: {name: ubuntu}}
+      storageClass: local
+    kubernetesProvider:
+      scheme: *scheme
+      objects: [*namespace, *goldenPVC, *cdiNoOverride, *replicatedClass, *localClass, *localProfile]
+    asserts:
+      - notFailedTemplate: {}
+
+  # An empty storageClass leaves the choice to CDI, which for a kubevirt
+  # DataVolume takes the class annotated as the default virt class first and
+  # the Kubernetes default class only when there is none.
+  - it: refuses an empty class whose default virt class differs from the golden's
+    set:
+      source: {image: {name: ubuntu}}
+      storageClass: ""
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - *namespace
+        - *goldenPVC
+        - *cdiCSIClone
+        - *localProfile
+        - kind: StorageClass
+          apiVersion: storage.k8s.io/v1
+          metadata:
+            name: replicated
+            annotations: {storageclass.kubernetes.io/is-default-class: "true"}
+          provisioner: linstor.csi.linbit.com
+          allowVolumeExpansion: true
+        - kind: StorageClass
+          apiVersion: storage.k8s.io/v1
+          metadata:
+            name: local
+            annotations: {storageclass.kubevirt.io/is-default-virt-class: "true"}
+          provisioner: linstor.csi.linbit.com
+          parameters: {linstor.csi.linbit.com/allowRemoteVolumeAccess: "false"}
+          allowVolumeExpansion: true
+    asserts:
+      - failedTemplate:
+          errorPattern: 'a clone into StorageClass "local" of the same provisioner gets no host-assisted fallback from CDI'
+
+  - it: refuses an empty class whose Kubernetes default class differs from the golden's
+    set:
+      source: {image: {name: ubuntu}}
+      storageClass: ""
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - *namespace
+        - *goldenPVC
+        - *cdiCSIClone
+        - *localProfile
+        - *replicatedClass
+        - kind: StorageClass
+          apiVersion: storage.k8s.io/v1
+          metadata:
+            name: local
+            annotations: {storageclass.kubernetes.io/is-default-class: "true"}
+          provisioner: linstor.csi.linbit.com
+          parameters: {linstor.csi.linbit.com/allowRemoteVolumeAccess: "false"}
+          allowVolumeExpansion: true
+    asserts:
+      - failedTemplate:
+          errorPattern: 'a clone into StorageClass "local" of the same provisioner gets no host-assisted fallback from CDI'
+
+  - it: clones with an empty class whose default virt class is the golden's
+    set:
+      source: {image: {name: ubuntu}}
+      storageClass: ""
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - *namespace
+        - *goldenPVC
+        - *cdiCSIClone
+        - *localProfile
+        - *replicatedProfile
+        - kind: StorageClass
+          apiVersion: storage.k8s.io/v1
+          metadata:
+            name: local
+            annotations: {storageclass.kubernetes.io/is-default-class: "true"}
+          provisioner: linstor.csi.linbit.com
+          parameters: {linstor.csi.linbit.com/allowRemoteVolumeAccess: "false"}
+          allowVolumeExpansion: true
+        - kind: StorageClass
+          apiVersion: storage.k8s.io/v1
+          metadata:
+            name: replicated
+            annotations: {storageclass.kubevirt.io/is-default-virt-class: "true"}
+          provisioner: linstor.csi.linbit.com
+          allowVolumeExpansion: true
+    asserts:
+      - notFailedTemplate: {}
+      - notExists:
+          path: spec.storage.storageClassName
+
+  - it: clones with an empty class when the cluster has no default class
+    set:
+      source: {image: {name: ubuntu}}
+      storageClass: ""
+    kubernetesProvider:
+      scheme: *scheme
+      objects: [*namespace, *goldenPVC, *cdiCSIClone, *replicatedClass, *localClass, *localProfile]
+    asserts:
+      - notFailedTemplate: {}
+
+  # CDI breaks a tie between several defaults by creation time, which the
+  # comparison does not reproduce, so a tie compares nothing.
+  - it: clones with an empty class when several classes claim the default
+    set:
+      source: {image: {name: ubuntu}}
+      storageClass: ""
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - *namespace
+        - *goldenPVC
+        - *cdiCSIClone
+        - *replicatedClass
+        - *localProfile
+        # Both tied classes carry a profile, so only the tie keeps this from
+        # being refused.
+        - &fastProfile
+          kind: StorageProfile
+          apiVersion: cdi.kubevirt.io/v1beta1
+          metadata: {name: fast}
+          status:
+            claimPropertySets: [{accessModes: [ReadWriteOnce], volumeMode: Block}]
+        - &localDefault
+          kind: StorageClass
+          apiVersion: storage.k8s.io/v1
+          metadata:
+            name: local
+            annotations: {storageclass.kubernetes.io/is-default-class: "true"}
+          provisioner: linstor.csi.linbit.com
+          parameters: {linstor.csi.linbit.com/allowRemoteVolumeAccess: "false"}
+          allowVolumeExpansion: true
+        - kind: StorageClass
+          apiVersion: storage.k8s.io/v1
+          metadata:
+            name: fast
+            annotations: {storageclass.kubernetes.io/is-default-class: "true"}
+          provisioner: linstor.csi.linbit.com
+          parameters: {linstor.csi.linbit.com/allowRemoteVolumeAccess: "false"}
+          allowVolumeExpansion: true
+    asserts:
+      - notFailedTemplate: {}
+
+  # A tie among default virt classes does not hand the choice to the
+  # Kubernetes default: CDI picks one of the virt classes.
+  - it: clones with an empty class when several classes claim the default virt class
+    set:
+      source: {image: {name: ubuntu}}
+      storageClass: ""
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - *namespace
+        - *goldenPVC
+        - *cdiCSIClone
+        - *localProfile
+        - *fastProfile
+        - *localDefault
+        - kind: StorageClass
+          apiVersion: storage.k8s.io/v1
+          metadata:
+            name: replicated
+            annotations: {storageclass.kubevirt.io/is-default-virt-class: "true"}
+          provisioner: linstor.csi.linbit.com
+          allowVolumeExpansion: true
+        - kind: StorageClass
+          apiVersion: storage.k8s.io/v1
+          metadata:
+            name: fast
+            annotations: {storageclass.kubevirt.io/is-default-virt-class: "true"}
+          provisioner: linstor.csi.linbit.com
+          parameters: {linstor.csi.linbit.com/allowRemoteVolumeAccess: "false"}
+          allowVolumeExpansion: true
+    asserts:
+      - notFailedTemplate: {}
+
+  # LINSTOR's clone lands next to the source data, and only then places the
+  # volume for the node it is asked for: a class that allows remote access
+  # serves that node over the network, so the clone binds.
+  - it: clones into a LINSTOR class that allows remote volume access
+    set:
+      source: {image: {name: ubuntu}}
+      storageClass: local
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - *namespace
+        - *goldenPVC
+        - *cdiCSIClone
+        - *replicatedClass
+        - *localProfile
+        - kind: StorageClass
+          apiVersion: storage.k8s.io/v1
+          metadata: {name: local}
+          provisioner: linstor.csi.linbit.com
+          parameters: {linstor.csi.linbit.com/allowRemoteVolumeAccess: "1"}
+          allowVolumeExpansion: true
+    asserts:
+      - notFailedTemplate: {}
+
+  # linstor-csi reads its parameters with or without the driver prefix and
+  # matches the key case-insensitively.
+  - it: refuses a class that denies remote access under an unprefixed key
+    set:
+      source: {image: {name: ubuntu}}
+      storageClass: local
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - *namespace
+        - *goldenPVC
+        - *cdiCSIClone
+        - *replicatedClass
+        - *localProfile
+        - kind: StorageClass
+          apiVersion: storage.k8s.io/v1
+          metadata: {name: local}
+          provisioner: linstor.csi.linbit.com
+          parameters: {AllowRemoteVolumeAccess: "false"}
+          allowVolumeExpansion: true
+    asserts:
+      - failedTemplate:
+          errorPattern: 'StorageClass "local" does not allow remote volume access'
+
+  # A rule list whose every rule names a fromSame label allows access only from
+  # nodes sharing that label, which need not include the one the clone is
+  # asked for.
+  - it: refuses a class that allows remote access only by rule
+    set:
+      source: {image: {name: ubuntu}}
+      storageClass: local
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - *namespace
+        - *goldenPVC
+        - *cdiCSIClone
+        - *replicatedClass
+        - *localProfile
+        - kind: StorageClass
+          apiVersion: storage.k8s.io/v1
+          metadata: {name: local}
+          provisioner: linstor.csi.linbit.com
+          parameters:
+            linstor.csi.linbit.com/allowRemoteVolumeAccess: |
+              - fromSame: [topology.kubernetes.io/zone]
+          allowVolumeExpansion: true
+    asserts:
+      - failedTemplate:
+          errorPattern: 'StorageClass "local" does not allow remote volume access'
+
+  # Without the parameter linstor-csi allows remote access exactly when the
+  # layer list carries DRBD or NVMe, and the default layer list carries DRBD.
+  - it: clones into a LINSTOR class with neither the parameter nor a layer list
+    set:
+      source: {image: {name: ubuntu}}
+      storageClass: local
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - *namespace
+        - *goldenPVC
+        - *cdiCSIClone
+        - *replicatedClass
+        - *localProfile
+        - kind: StorageClass
+          apiVersion: storage.k8s.io/v1
+          metadata: {name: local}
+          provisioner: linstor.csi.linbit.com
+          allowVolumeExpansion: true
+    asserts:
+      - notFailedTemplate: {}
+
+  - it: refuses a LINSTOR class whose layer list has no network layer and no parameter
+    set:
+      source: {image: {name: ubuntu}}
+      storageClass: local
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - *namespace
+        - *goldenPVC
+        - *cdiCSIClone
+        - *replicatedClass
+        - *localProfile
+        - kind: StorageClass
+          apiVersion: storage.k8s.io/v1
+          metadata: {name: local}
+          provisioner: linstor.csi.linbit.com
+          parameters: {linstor.csi.linbit.com/layerList: "luks storage"}
+          allowVolumeExpansion: true
+    asserts:
+      - failedTemplate:
+          errorPattern: 'StorageClass "local" does not allow remote volume access'
+
+  - it: clones into a LINSTOR class whose layer list carries NVMe and no parameter
+    set:
+      source: {image: {name: ubuntu}}
+      storageClass: local
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - *namespace
+        - *goldenPVC
+        - *cdiCSIClone
+        - *replicatedClass
+        - *localProfile
+        - kind: StorageClass
+          apiVersion: storage.k8s.io/v1
+          metadata: {name: local}
+          provisioner: linstor.csi.linbit.com
+          parameters: {layerList: "NVME storage"}
+          allowVolumeExpansion: true
+    asserts:
+      - notFailedTemplate: {}
+
+  # Where the clone lands is a property of the driver, and only LINSTOR's is
+  # known to strand it.
+  - it: clones into another class of a provisioner other than LINSTOR
+    set:
+      source: {image: {name: ubuntu}}
+      storageClass: local
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - *namespace
+        - *goldenPVC
+        - *cdiCSIClone
+        - *localProfile
+        - kind: StorageClass
+          apiVersion: storage.k8s.io/v1
+          metadata: {name: replicated}
+          provisioner: example.com/csi
+          allowVolumeExpansion: true
+        - kind: StorageClass
+          apiVersion: storage.k8s.io/v1
+          metadata: {name: local}
+          provisioner: example.com/csi
+          parameters: {allowRemoteVolumeAccess: "false"}
+          allowVolumeExpansion: true
+    asserts:
+      - notFailedTemplate: {}
+
+  # CDI takes the target's volume mode from the first claim property set; a
+  # LINSTOR profile lists Block before Filesystem.
+  - it: refuses when the target profile's first claim property set matches the golden's volume mode
+    set:
+      source: {image: {name: ubuntu}}
+      storageClass: local
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - *namespace
+        - *goldenPVC
+        - *cdiCSIClone
+        - *replicatedClass
+        - *localClass
+        - kind: StorageProfile
+          apiVersion: cdi.kubevirt.io/v1beta1
+          metadata: {name: local}
+          status:
+            claimPropertySets:
+              - {accessModes: [ReadWriteMany], volumeMode: Block}
+              - {accessModes: [ReadWriteOnce], volumeMode: Filesystem}
+    asserts:
+      - failedTemplate:
+          errorPattern: 'StorageClass "local" does not allow remote volume access'
+
+  # CDI reads the source's driver from its bound PV and falls back to the
+  # class's provisioner only for an unbound claim.
+  - it: clones a golden whose PV belongs to another driver than its class names
+    set:
+      source: {image: {name: ubuntu}}
+      storageClass: local
+    kubernetesProvider:
+      scheme:
+        <<: *scheme
+        "v1/PersistentVolume":
+          gvr: {group: "", version: v1, resource: persistentvolumes}
+          namespaced: false
+      objects:
+        - *namespace
+        - *cdiCSIClone
+        - *replicatedClass
+        - *localClass
+        - *localProfile
+        - kind: PersistentVolumeClaim
+          apiVersion: v1
+          metadata: {name: vm-default-images-ubuntu, namespace: cozy-public}
+          spec: {storageClassName: replicated, volumeMode: Block, volumeName: pv-golden}
+        - kind: PersistentVolume
+          apiVersion: v1
+          metadata: {name: pv-golden}
+          spec: {csi: {driver: example.com/csi, volumeHandle: golden}}
+    asserts:
+      - notFailedTemplate: {}
+
+  # Both profiles name a snapshot class that does not exist: CDI fails to plan
+  # the clone instead of falling back, so it never starts.
+  - it: refuses under the snapshot strategy when the profiles' common snapshot class does not exist
+    set:
+      source: {image: {name: ubuntu}}
+      storageClass: local
+    capabilities: *snapshotAPI
+    kubernetesProvider:
+      scheme: *snapshotScheme
+      objects:
+        - *namespace
+        - *goldenPVC
+        - *replicatedClass
+        - *cdiSnapshot
+        - kind: StorageClass
+          apiVersion: storage.k8s.io/v1
+          metadata: {name: local}
+          provisioner: linstor.csi.linbit.com
+          allowVolumeExpansion: true
+        - kind: StorageProfile
+          apiVersion: cdi.kubevirt.io/v1beta1
+          metadata: {name: replicated}
+          status: {snapshotClass: missing-snapshots}
+        - kind: StorageProfile
+          apiVersion: cdi.kubevirt.io/v1beta1
+          metadata: {name: local}
+          status:
+            snapshotClass: missing-snapshots
+            claimPropertySets: [{accessModes: [ReadWriteOnce], volumeMode: Block}]
+    asserts:
+      - failedTemplate:
+          errorPattern: 'VolumeSnapshotClass "missing-snapshots", named by the StorageProfiles of both "replicated" and "local", does not exist'
+
+  # CDI can garbage-collect a completed DataVolume and leave its PVC, which is
+  # the disk; a PVC restored on its own is the same state.
+  - it: leaves a disk alone whose PVC exists without its DataVolume
+    set:
+      source: {image: {name: ubuntu}}
+      storageClass: local
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - *namespace
+        - *goldenPVC
+        - *cdiCSIClone
+        - *replicatedClass
+        - *localClass
+        - *localProfile
+        - &diskPVC
+          kind: PersistentVolumeClaim
+          apiVersion: v1
+          metadata: {name: test-vm-disk, namespace: tenant-test}
+          spec: {storageClassName: local, volumeMode: Block}
+    asserts:
+      - notFailedTemplate: {}
+
+  - it: leaves a disk alone whose PVC exists without its DataVolume when the golden failed
+    set:
+      source: {image: {name: ubuntu}}
+      storageClass: local
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - *namespace
+        - *diskPVC
+        - kind: DataVolume
+          apiVersion: cdi.kubevirt.io/v1beta1
+          metadata: {name: vm-default-images-ubuntu, namespace: cozy-public}
+          status: {phase: Failed}
+    asserts:
+      - notFailedTemplate: {}
+
+  # A key under another prefix belongs to someone else and is not read.
+  - it: clones into a LINSTOR class that allows remote access next to a foreign key that denies it
+    set:
+      source: {image: {name: ubuntu}}
+      storageClass: local
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - *namespace
+        - *goldenPVC
+        - *cdiCSIClone
+        - *replicatedClass
+        - *localProfile
+        - kind: StorageClass
+          apiVersion: storage.k8s.io/v1
+          metadata: {name: local}
+          provisioner: linstor.csi.linbit.com
+          parameters:
+            linstor.csi.linbit.com/allowRemoteVolumeAccess: "true"
+            other.example.com/allowRemoteVolumeAccess: "false"
+          allowVolumeExpansion: true
+    asserts:
+      - notFailedTemplate: {}
+
+  # With no common driver CDI falls back before it looks the snapshot class up.
+  - it: clones under the snapshot strategy into another provisioner when the profiles' common snapshot class does not exist
+    set:
+      source: {image: {name: ubuntu}}
+      storageClass: local
+    capabilities: *snapshotAPI
+    kubernetesProvider:
+      scheme: *snapshotScheme
+      objects:
+        - *namespace
+        - *goldenPVC
+        - *replicatedClass
+        - *cdiSnapshot
+        - kind: StorageClass
+          apiVersion: storage.k8s.io/v1
+          metadata: {name: local}
+          provisioner: example.com/csi
+          allowVolumeExpansion: true
+        - kind: StorageProfile
+          apiVersion: cdi.kubevirt.io/v1beta1
+          metadata: {name: replicated}
+          status: {snapshotClass: missing-snapshots}
+        - kind: StorageProfile
+          apiVersion: cdi.kubevirt.io/v1beta1
+          metadata: {name: local}
+          status:
+            snapshotClass: missing-snapshots
+            claimPropertySets: [{accessModes: [ReadWriteOnce], volumeMode: Block}]
+    asserts:
+      - notFailedTemplate: {}
+
+  # With neither class found there is no driver to compare, and nothing is.
+  - it: clones under the snapshot strategy when neither class nor the common snapshot class can be found
+    set:
+      source: {image: {name: ubuntu}}
+      storageClass: local
+    capabilities: *snapshotAPI
+    kubernetesProvider:
+      scheme: *snapshotScheme
+      objects:
+        - *namespace
+        - *goldenPVC
+        - *cdiSnapshot
+        - kind: StorageProfile
+          apiVersion: cdi.kubevirt.io/v1beta1
+          metadata: {name: replicated}
+          status: {snapshotClass: missing-snapshots}
+        - kind: StorageProfile
+          apiVersion: cdi.kubevirt.io/v1beta1
+          metadata: {name: local}
+          status:
+            snapshotClass: missing-snapshots
+            claimPropertySets: [{accessModes: [ReadWriteOnce], volumeMode: Block}]
+    asserts:
+      - notFailedTemplate: {}
+
+  # linstor-csi's own "from anywhere" policy is a single rule with no label.
+  - it: clones into a LINSTOR class whose rule list has a rule naming no label
+    set:
+      source: {image: {name: ubuntu}}
+      storageClass: local
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - *namespace
+        - *goldenPVC
+        - *cdiCSIClone
+        - *replicatedClass
+        - *localProfile
+        - kind: StorageClass
+          apiVersion: storage.k8s.io/v1
+          metadata: {name: local}
+          provisioner: linstor.csi.linbit.com
+          parameters:
+            linstor.csi.linbit.com/allowRemoteVolumeAccess: |
+              - fromSame: [topology.kubernetes.io/zone]
+              - {}
+          allowVolumeExpansion: true
+    asserts:
+      - notFailedTemplate: {}
+
+  - it: refuses under the snapshot strategy when the common snapshot class of another driver does not exist
+    set:
+      source: {image: {name: ubuntu}}
+      storageClass: local
+    capabilities: *snapshotAPI
+    kubernetesProvider:
+      scheme: *snapshotScheme
+      objects:
+        - *namespace
+        - *goldenPVC
+        - *cdiSnapshot
+        - kind: StorageClass
+          apiVersion: storage.k8s.io/v1
+          metadata: {name: replicated}
+          provisioner: example.com/csi
+          allowVolumeExpansion: true
+        - kind: StorageClass
+          apiVersion: storage.k8s.io/v1
+          metadata: {name: local}
+          provisioner: example.com/csi
+          allowVolumeExpansion: true
+        - kind: StorageProfile
+          apiVersion: cdi.kubevirt.io/v1beta1
+          metadata: {name: replicated}
+          status: {snapshotClass: missing-snapshots}
+        - kind: StorageProfile
+          apiVersion: cdi.kubevirt.io/v1beta1
+          metadata: {name: local}
+          status:
+            snapshotClass: missing-snapshots
+            claimPropertySets: [{accessModes: [ReadWriteOnce], volumeMode: Block}]
+    asserts:
+      - failedTemplate:
+          errorPattern: 'VolumeSnapshotClass "missing-snapshots", named by the StorageProfiles of both "replicated" and "local", does not exist'
+
+  # Every spelling strconv.ParseBool reads as true allows remote access.
+  - it: clones into a LINSTOR class whose allowRemoteVolumeAccess is "t"
+    set:
+      source: {image: {name: ubuntu}}
+      storageClass: local
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - *namespace
+        - *goldenPVC
+        - *cdiCSIClone
+        - *replicatedClass
+        - *localProfile
+        - kind: StorageClass
+          apiVersion: storage.k8s.io/v1
+          metadata: {name: local}
+          provisioner: linstor.csi.linbit.com
+          parameters: {linstor.csi.linbit.com/allowRemoteVolumeAccess: "t"}
+          allowVolumeExpansion: true
+    asserts:
+      - notFailedTemplate: {}
+
+  - it: clones into a LINSTOR class whose allowRemoteVolumeAccess is "T"
+    set:
+      source: {image: {name: ubuntu}}
+      storageClass: local
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - *namespace
+        - *goldenPVC
+        - *cdiCSIClone
+        - *replicatedClass
+        - *localProfile
+        - kind: StorageClass
+          apiVersion: storage.k8s.io/v1
+          metadata: {name: local}
+          provisioner: linstor.csi.linbit.com
+          parameters: {linstor.csi.linbit.com/allowRemoteVolumeAccess: "T"}
+          allowVolumeExpansion: true
+    asserts:
+      - notFailedTemplate: {}
+
+  - it: clones into a LINSTOR class whose allowRemoteVolumeAccess is "TRUE"
+    set:
+      source: {image: {name: ubuntu}}
+      storageClass: local
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - *namespace
+        - *goldenPVC
+        - *cdiCSIClone
+        - *replicatedClass
+        - *localProfile
+        - kind: StorageClass
+          apiVersion: storage.k8s.io/v1
+          metadata: {name: local}
+          provisioner: linstor.csi.linbit.com
+          parameters: {linstor.csi.linbit.com/allowRemoteVolumeAccess: "TRUE"}
+          allowVolumeExpansion: true
+    asserts:
+      - notFailedTemplate: {}
+
+  - it: clones into a LINSTOR class whose allowRemoteVolumeAccess is "true"
+    set:
+      source: {image: {name: ubuntu}}
+      storageClass: local
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - *namespace
+        - *goldenPVC
+        - *cdiCSIClone
+        - *replicatedClass
+        - *localProfile
+        - kind: StorageClass
+          apiVersion: storage.k8s.io/v1
+          metadata: {name: local}
+          provisioner: linstor.csi.linbit.com
+          parameters: {linstor.csi.linbit.com/allowRemoteVolumeAccess: "true"}
+          allowVolumeExpansion: true
+    asserts:
+      - notFailedTemplate: {}
+
+  - it: clones into a LINSTOR class whose allowRemoteVolumeAccess is "True"
+    set:
+      source: {image: {name: ubuntu}}
+      storageClass: local
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - *namespace
+        - *goldenPVC
+        - *cdiCSIClone
+        - *replicatedClass
+        - *localProfile
+        - kind: StorageClass
+          apiVersion: storage.k8s.io/v1
+          metadata: {name: local}
+          provisioner: linstor.csi.linbit.com
+          parameters: {linstor.csi.linbit.com/allowRemoteVolumeAccess: "True"}
+          allowVolumeExpansion: true
+    asserts:
+      - notFailedTemplate: {}
diff --git a/packages/apps/vm-disk/tests/dv_immutability_test.yaml b/packages/apps/vm-disk/tests/dv_immutability_test.yaml
new file mode 100644
index 0000000000..13808ae993
--- /dev/null
+++ b/packages/apps/vm-disk/tests/dv_immutability_test.yaml
@@ -0,0 +1,885 @@
+suite: vm-disk DataVolume immutable fields (storageClass/source)
+
+# Regression for #2985: editing storageClass/source on an existing VMDisk used
+# to be silently ignored — dv.yaml reused the existing DataVolume.spec verbatim
+# and the edit rendered as a no-op while the HelmRelease reported success. The
+# template now fails loudly when the operator's requested storageClass/source
+# differs from what the disk was created with.
+#
+#  - storageClass is compared ONLY against the vm-disk.cozystack.io/storage-class
+#    annotation recorded at creation; the template performs no PVC lookup, so a
+#    disk with no such annotation is not guarded (never false-rejected against a
+#    live class it never recorded).
+#  - source is compared against a vm-disk.cozystack.io/source annotation written
+#    at creation. A disk that predates the annotation is compared against its
+#    stored spec.source, with the exemption keyed on the stored source being an
+#    image clone (whose PVC-name prefix drifts across chart versions — commit
+#    bec35e3a), not on the requested type. The annotation is written only at
+#    creation and preserved verbatim, never overwritten with an edit.
+#
+# Existing DataVolumes are mocked via the kubernetes provider so the DataVolume
+# lookup in dv.yaml resolves without a live cluster.
+release:
+  name: test-vm-disk
+  namespace: tenant-test
+templates:
+  - templates/dv.yaml
+tests:
+  - it: rejects a storageClass change on an existing DataVolume
+    set:
+      storageClass: other
+      source: {http: {url: https://example.com/original.qcow2}}
+    kubernetesProvider:
+      scheme:
+        "cdi.kubevirt.io/v1beta1/DataVolume":
+          gvr: {group: cdi.kubevirt.io, version: v1beta1, resource: datavolumes}
+          namespaced: true
+      objects:
+        - kind: DataVolume
+          apiVersion: cdi.kubevirt.io/v1beta1
+          metadata:
+            name: test-vm-disk
+            namespace: tenant-test
+            annotations:
+              vm-disk.cozystack.io/source: '{"http":{"url":"https://example.com/original.qcow2"}}'
+              vm-disk.cozystack.io/storage-class: replicated
+          spec:
+            source: {http: {url: https://example.com/original.qcow2}}
+            storage: {resources: {requests: {storage: 5Gi}}, storageClassName: replicated}
+    asserts:
+      - failedTemplate:
+          errorPattern: 'VMDisk storageClass is immutable after creation'
+
+  - it: rejects clearing storageClass to empty on a disk created with a class
+    # coderabbit finding: replicated -> "" must not be silently ignored. The
+    # requested value is compared against the storage-class recorded at
+    # creation, so an empty requested value is still caught.
+    set:
+      storageClass: ""
+      source: {http: {url: https://example.com/original.qcow2}}
+    kubernetesProvider:
+      scheme:
+        "cdi.kubevirt.io/v1beta1/DataVolume":
+          gvr: {group: cdi.kubevirt.io, version: v1beta1, resource: datavolumes}
+          namespaced: true
+      objects:
+        - kind: DataVolume
+          apiVersion: cdi.kubevirt.io/v1beta1
+          metadata:
+            name: test-vm-disk
+            namespace: tenant-test
+            annotations:
+              vm-disk.cozystack.io/source: '{"http":{"url":"https://example.com/original.qcow2"}}'
+              vm-disk.cozystack.io/storage-class: replicated
+          spec:
+            source: {http: {url: https://example.com/original.qcow2}}
+            storage: {resources: {requests: {storage: 5Gi}}, storageClassName: replicated}
+    asserts:
+      - failedTemplate:
+          errorPattern: 'VMDisk storageClass is immutable after creation'
+
+  - it: does not reject an unchanged disk created with an empty storageClass
+    # A disk created with "" records an empty storage-class annotation; an
+    # unchanged reconcile ("" vs "") must not fire.
+    set:
+      storageClass: ""
+      source: {http: {url: https://example.com/original.qcow2}}
+    kubernetesProvider:
+      scheme:
+        "cdi.kubevirt.io/v1beta1/DataVolume":
+          gvr: {group: cdi.kubevirt.io, version: v1beta1, resource: datavolumes}
+          namespaced: true
+      objects:
+        - kind: DataVolume
+          apiVersion: cdi.kubevirt.io/v1beta1
+          metadata:
+            name: test-vm-disk
+            namespace: tenant-test
+            annotations:
+              vm-disk.cozystack.io/source: '{"http":{"url":"https://example.com/original.qcow2"}}'
+              vm-disk.cozystack.io/storage-class: ""
+          spec:
+            source: {http: {url: https://example.com/original.qcow2}}
+            storage: {resources: {requests: {storage: 5Gi}}}
+    asserts:
+      - notFailedTemplate: {}
+
+  - it: rejects setting a concrete class on a disk created with an empty storageClass
+    # coderabbit finding: "" -> replicated must be caught. Annotation-key presence
+    # (not value truthiness) marks the empty class as recorded provenance.
+    set:
+      storageClass: replicated
+      source: {http: {url: https://example.com/original.qcow2}}
+    kubernetesProvider:
+      scheme:
+        "cdi.kubevirt.io/v1beta1/DataVolume":
+          gvr: {group: cdi.kubevirt.io, version: v1beta1, resource: datavolumes}
+          namespaced: true
+      objects:
+        - kind: DataVolume
+          apiVersion: cdi.kubevirt.io/v1beta1
+          metadata:
+            name: test-vm-disk
+            namespace: tenant-test
+            annotations:
+              vm-disk.cozystack.io/source: '{"http":{"url":"https://example.com/original.qcow2"}}'
+              vm-disk.cozystack.io/storage-class: ""
+          spec:
+            source: {http: {url: https://example.com/original.qcow2}}
+            storage: {resources: {requests: {storage: 5Gi}}}
+    asserts:
+      - failedTemplate:
+          errorPattern: 'VMDisk storageClass is immutable after creation'
+
+  - it: rejects a source change on an existing DataVolume
+    set:
+      storageClass: replicated
+      source: {http: {url: https://example.com/changed.qcow2}}
+    kubernetesProvider:
+      scheme:
+        "cdi.kubevirt.io/v1beta1/DataVolume":
+          gvr: {group: cdi.kubevirt.io, version: v1beta1, resource: datavolumes}
+          namespaced: true
+      objects:
+        - kind: DataVolume
+          apiVersion: cdi.kubevirt.io/v1beta1
+          metadata:
+            name: test-vm-disk
+            namespace: tenant-test
+            annotations:
+              vm-disk.cozystack.io/source: '{"http":{"url":"https://example.com/original.qcow2"}}'
+          spec:
+            source: {http: {url: https://example.com/original.qcow2}}
+            storage: {resources: {requests: {storage: 5Gi}}, storageClassName: replicated}
+    asserts:
+      - failedTemplate:
+          errorPattern: 'VMDisk source is immutable after creation'
+
+  - it: reuses the existing spec and preserves both annotations when unchanged
+    set:
+      storageClass: replicated
+      source: {http: {url: https://example.com/original.qcow2}}
+    kubernetesProvider:
+      scheme:
+        "cdi.kubevirt.io/v1beta1/DataVolume":
+          gvr: {group: cdi.kubevirt.io, version: v1beta1, resource: datavolumes}
+          namespaced: true
+      objects:
+        - kind: DataVolume
+          apiVersion: cdi.kubevirt.io/v1beta1
+          metadata:
+            name: test-vm-disk
+            namespace: tenant-test
+            annotations:
+              vm-disk.cozystack.io/source: '{"http":{"url":"https://example.com/original.qcow2"}}'
+              vm-disk.cozystack.io/storage-class: replicated
+          spec:
+            source: {http: {url: https://example.com/original.qcow2}}
+            storage: {resources: {requests: {storage: 5Gi}}, storageClassName: replicated}
+    asserts:
+      - notFailedTemplate: {}
+      - equal:
+          path: spec.storage.storageClassName
+          value: replicated
+      - equal:
+          path: spec.source.http.url
+          value: https://example.com/original.qcow2
+      - equal:
+          path: metadata.annotations["vm-disk.cozystack.io/source"]
+          value: '{"http":{"url":"https://example.com/original.qcow2"}}'
+      - equal:
+          path: metadata.annotations["vm-disk.cozystack.io/storage-class"]
+          value: replicated
+      # The immediate-bind annotation is emitted on this path too, so `helm
+      # upgrade` retrofits it onto DataVolumes created before it was
+      # unconditional. Inert for a volume that has already bound -- CDI reads
+      # the annotation when it provisions -- and pinned here so the retrofit is
+      # a recorded decision rather than a side effect nobody asserted.
+      - equal:
+          path: metadata.annotations["cdi.kubevirt.io/storage.bind.immediate.requested"]
+          value: "true"
+
+  - it: does not false-reject an unchanged http disk whose URL has query-string special chars
+    # Round-trip lock: the recorded annotation holds toJson-escaped & < >; an
+    # unchanged reconcile recomputes the identical escaped string and must match.
+    set:
+      storageClass: replicated
+      source: {http: {url: "https://s3.example.com/x?a=1&b=2&c=<>"}}
+    kubernetesProvider:
+      scheme:
+        "cdi.kubevirt.io/v1beta1/DataVolume":
+          gvr: {group: cdi.kubevirt.io, version: v1beta1, resource: datavolumes}
+          namespaced: true
+      objects:
+        - kind: DataVolume
+          apiVersion: cdi.kubevirt.io/v1beta1
+          metadata:
+            name: test-vm-disk
+            namespace: tenant-test
+            annotations:
+              vm-disk.cozystack.io/source: '{"http":{"url":"https://s3.example.com/x?a=1\u0026b=2\u0026c=\u003c\u003e"}}'
+          spec:
+            source: {http: {url: "https://s3.example.com/x?a=1&b=2&c=<>"}}
+            storage: {resources: {requests: {storage: 5Gi}}, storageClassName: replicated}
+    asserts:
+      - notFailedTemplate: {}
+
+  - it: rejects a changed query-string http URL against the recorded escaped annotation
+    set:
+      storageClass: replicated
+      source: {http: {url: "https://s3.example.com/x?a=1&b=9"}}
+    kubernetesProvider:
+      scheme:
+        "cdi.kubevirt.io/v1beta1/DataVolume":
+          gvr: {group: cdi.kubevirt.io, version: v1beta1, resource: datavolumes}
+          namespaced: true
+      objects:
+        - kind: DataVolume
+          apiVersion: cdi.kubevirt.io/v1beta1
+          metadata:
+            name: test-vm-disk
+            namespace: tenant-test
+            annotations:
+              vm-disk.cozystack.io/source: '{"http":{"url":"https://s3.example.com/x?a=1\u0026b=2\u0026c=\u003c\u003e"}}'
+          spec:
+            source: {http: {url: "https://s3.example.com/x?a=1&b=2&c=<>"}}
+            storage: {resources: {requests: {storage: 5Gi}}, storageClassName: replicated}
+    asserts:
+      - failedTemplate:
+          errorPattern: 'VMDisk source is immutable after creation'
+
+  - it: allows a storage grow while immutable fields are unchanged
+    set:
+      storageClass: replicated
+      storage: 10Gi
+      source: {http: {url: https://example.com/original.qcow2}}
+    kubernetesProvider:
+      scheme:
+        "cdi.kubevirt.io/v1beta1/DataVolume":
+          gvr: {group: cdi.kubevirt.io, version: v1beta1, resource: datavolumes}
+          namespaced: true
+      objects:
+        - kind: DataVolume
+          apiVersion: cdi.kubevirt.io/v1beta1
+          metadata:
+            name: test-vm-disk
+            namespace: tenant-test
+            annotations:
+              vm-disk.cozystack.io/source: '{"http":{"url":"https://example.com/original.qcow2"}}'
+          spec:
+            source: {http: {url: https://example.com/original.qcow2}}
+            storage: {resources: {requests: {storage: 5Gi}}, storageClassName: replicated}
+    asserts:
+      - notFailedTemplate: {}
+
+  - it: rejects an image-name change on an annotated image disk
+    set:
+      storageClass: replicated
+      source: {image: {name: debian}}
+    kubernetesProvider:
+      scheme:
+        "cdi.kubevirt.io/v1beta1/DataVolume":
+          gvr: {group: cdi.kubevirt.io, version: v1beta1, resource: datavolumes}
+          namespaced: true
+      objects:
+        - kind: DataVolume
+          apiVersion: cdi.kubevirt.io/v1beta1
+          metadata:
+            name: test-vm-disk
+            namespace: tenant-test
+            annotations:
+              vm-disk.cozystack.io/source: '{"image":{"name":"ubuntu"}}'
+          spec:
+            source: {pvc: {name: vm-default-images-ubuntu, namespace: cozy-public}}
+            storage: {resources: {requests: {storage: 5Gi}}, storageClassName: replicated}
+    asserts:
+      - failedTemplate:
+          errorPattern: 'VMDisk source is immutable after creation'
+
+  - it: treats a matching image clone as a no-op and preserves its annotation
+    set:
+      storageClass: replicated
+      source: {image: {name: ubuntu}}
+    kubernetesProvider:
+      scheme:
+        "cdi.kubevirt.io/v1beta1/DataVolume":
+          gvr: {group: cdi.kubevirt.io, version: v1beta1, resource: datavolumes}
+          namespaced: true
+      objects:
+        - kind: DataVolume
+          apiVersion: cdi.kubevirt.io/v1beta1
+          metadata:
+            name: test-vm-disk
+            namespace: tenant-test
+            annotations:
+              vm-disk.cozystack.io/source: '{"image":{"name":"ubuntu"}}'
+          spec:
+            source: {pvc: {name: vm-default-images-ubuntu, namespace: cozy-public}}
+            storage: {resources: {requests: {storage: 5Gi}}, storageClassName: replicated}
+    asserts:
+      - notFailedTemplate: {}
+      - equal:
+          path: spec.source.pvc.name
+          value: vm-default-images-ubuntu
+
+  - it: does not falsely reject or poison a legacy image disk whose PVC name predates the rename
+    # CRITICAL regression (#3969 review): a disk cloned before commit bec35e3a
+    # carries spec.source.pvc.name=vm-image-<name> forever and has no source
+    # annotation. Comparing the rendered vm-default-images-<name> against it must
+    # NOT fire, and the reuse render must NOT backfill a source annotation.
+    set:
+      storageClass: replicated
+      source: {image: {name: ubuntu}}
+    kubernetesProvider:
+      scheme:
+        "cdi.kubevirt.io/v1beta1/DataVolume":
+          gvr: {group: cdi.kubevirt.io, version: v1beta1, resource: datavolumes}
+          namespaced: true
+      objects:
+        - kind: DataVolume
+          apiVersion: cdi.kubevirt.io/v1beta1
+          metadata:
+            name: test-vm-disk
+            namespace: tenant-test
+          spec:
+            source: {pvc: {name: vm-image-ubuntu, namespace: cozy-public}}
+            storage: {resources: {requests: {storage: 5Gi}}, storageClassName: replicated}
+    asserts:
+      - notFailedTemplate: {}
+      - equal:
+          path: spec.source.pvc.name
+          value: vm-image-ubuntu
+      - notExists:
+          path: metadata.annotations["vm-disk.cozystack.io/source"]
+
+  - it: intentionally does NOT catch an image-name change on a legacy image disk (documented exemption)
+    # Pins the one deliberate gap: a legacy image disk (no annotation) whose
+    # pvc.name prefix drifted across the bec35e3a rename cannot be compared by
+    # rendered spec, so image is exempt from the annotation-less fallback. The
+    # edit is silently reused rather than failed. Not a regression (all edits
+    # were previously silent); all disks created by this chart version onward
+    # carry the annotation and are fully guarded. See docs/storage-immutability.md.
+    set:
+      storageClass: replicated
+      source: {image: {name: debian}}
+    kubernetesProvider:
+      scheme:
+        "cdi.kubevirt.io/v1beta1/DataVolume":
+          gvr: {group: cdi.kubevirt.io, version: v1beta1, resource: datavolumes}
+          namespaced: true
+      objects:
+        - kind: DataVolume
+          apiVersion: cdi.kubevirt.io/v1beta1
+          metadata:
+            name: test-vm-disk
+            namespace: tenant-test
+          spec:
+            source: {pvc: {name: vm-image-ubuntu, namespace: cozy-public}}
+            storage: {resources: {requests: {storage: 5Gi}}, storageClassName: replicated}
+    asserts:
+      - notFailedTemplate: {}
+      - equal:
+          path: spec.source.pvc.name
+          value: vm-image-ubuntu
+
+  - it: rejects changing a legacy non-image disk to an image source (exemption keys on stored type)
+    # MAJOR (#3969 review, IvanHunters): the image exemption must key on the
+    # STORED source being an image clone, not the requested type — otherwise a
+    # legacy http disk edited to source.image slips through as a silent no-op.
+    set:
+      storageClass: replicated
+      source: {image: {name: ubuntu}}
+    kubernetesProvider:
+      scheme:
+        "cdi.kubevirt.io/v1beta1/DataVolume":
+          gvr: {group: cdi.kubevirt.io, version: v1beta1, resource: datavolumes}
+          namespaced: true
+      objects:
+        - kind: DataVolume
+          apiVersion: cdi.kubevirt.io/v1beta1
+          metadata:
+            name: test-vm-disk
+            namespace: tenant-test
+          spec:
+            source: {http: {url: https://example.com/original.qcow2}}
+            storage: {resources: {requests: {storage: 5Gi}}, storageClassName: replicated}
+    asserts:
+      - failedTemplate:
+          errorPattern: 'VMDisk source is immutable after creation'
+
+  - it: rejects changing a legacy image disk to a non-image source
+    # MAJOR (#3969 re-review, IvanHunters): the image exemption must also key on
+    # the REQUESTED side. A legacy image disk (stored vm-image-<name>, no
+    # annotation) edited to http/upload/disk/blank is a different shape that
+    # cannot coincide with the stored pvc, so the change must be caught — the
+    # prefix-drift ambiguity only exists when the request is itself an image.
+    set:
+      storageClass: replicated
+      source: {http: {url: https://example.com/new.qcow2}}
+    kubernetesProvider:
+      scheme:
+        "cdi.kubevirt.io/v1beta1/DataVolume":
+          gvr: {group: cdi.kubevirt.io, version: v1beta1, resource: datavolumes}
+          namespaced: true
+      objects:
+        - kind: DataVolume
+          apiVersion: cdi.kubevirt.io/v1beta1
+          metadata:
+            name: test-vm-disk
+            namespace: tenant-test
+          spec:
+            source: {pvc: {name: vm-image-ubuntu, namespace: cozy-public}}
+            storage: {resources: {requests: {storage: 5Gi}}, storageClassName: replicated}
+    asserts:
+      - failedTemplate:
+          errorPattern: 'VMDisk source is immutable after creation'
+
+  - it: does not deadlock an adopted DataVolume that uses sourceRef (no spec.source)
+    # MAJOR (#3969 re-review, IvanHunters): an adopted DV may use spec.sourceRef
+    # (DataSource/DataImportCron) with no spec.source. The annotation-less source
+    # fallback must skip a stored source the chart cannot render, rather than
+    # comparing {} against the desired spec and failing every reconcile forever.
+    set:
+      storageClass: replicated
+      source: {http: {url: https://example.com/original.qcow2}}
+    kubernetesProvider:
+      scheme:
+        "cdi.kubevirt.io/v1beta1/DataVolume":
+          gvr: {group: cdi.kubevirt.io, version: v1beta1, resource: datavolumes}
+          namespaced: true
+      objects:
+        - kind: DataVolume
+          apiVersion: cdi.kubevirt.io/v1beta1
+          metadata:
+            name: test-vm-disk
+            namespace: tenant-test
+          spec:
+            sourceRef: {kind: DataSource, name: golden, namespace: cozy-public}
+            storage: {resources: {requests: {storage: 5Gi}}, storageClassName: replicated}
+    asserts:
+      - notFailedTemplate: {}
+
+  - it: does not deadlock an adopted DataVolume whose http source carries a secretRef
+    # Same class as above: a stored http source with an extra field the chart
+    # never renders is not chart-shaped, so the fallback must skip it rather than
+    # false-reject on the toYaml mismatch.
+    set:
+      storageClass: replicated
+      source: {http: {url: https://example.com/original.qcow2}}
+    kubernetesProvider:
+      scheme:
+        "cdi.kubevirt.io/v1beta1/DataVolume":
+          gvr: {group: cdi.kubevirt.io, version: v1beta1, resource: datavolumes}
+          namespaced: true
+      objects:
+        - kind: DataVolume
+          apiVersion: cdi.kubevirt.io/v1beta1
+          metadata:
+            name: test-vm-disk
+            namespace: tenant-test
+          spec:
+            source: {http: {url: https://example.com/original.qcow2, secretRef: mysecret}}
+            storage: {resources: {requests: {storage: 5Gi}}, storageClassName: replicated}
+    asserts:
+      - notFailedTemplate: {}
+
+  - it: does not crash on an adopted DataVolume whose source subfield is null (pvc)
+    # Defensive (#3969 re-review): a stored source of {pvc: null} must route to the
+    # "left alone" path, not hard-crash `keys` on a nil submap and deadlock the render.
+    set:
+      storageClass: replicated
+      source: {http: {url: https://example.com/original.qcow2}}
+    kubernetesProvider:
+      scheme:
+        "cdi.kubevirt.io/v1beta1/DataVolume":
+          gvr: {group: cdi.kubevirt.io, version: v1beta1, resource: datavolumes}
+          namespaced: true
+      objects:
+        - kind: DataVolume
+          apiVersion: cdi.kubevirt.io/v1beta1
+          metadata:
+            name: test-vm-disk
+            namespace: tenant-test
+          spec:
+            source: {pvc: null}
+            storage: {resources: {requests: {storage: 5Gi}}, storageClassName: replicated}
+    asserts:
+      - notFailedTemplate: {}
+
+  - it: does not crash on an adopted DataVolume whose source subfield is null (http)
+    set:
+      storageClass: replicated
+      source: {http: {url: https://example.com/original.qcow2}}
+    kubernetesProvider:
+      scheme:
+        "cdi.kubevirt.io/v1beta1/DataVolume":
+          gvr: {group: cdi.kubevirt.io, version: v1beta1, resource: datavolumes}
+          namespaced: true
+      objects:
+        - kind: DataVolume
+          apiVersion: cdi.kubevirt.io/v1beta1
+          metadata:
+            name: test-vm-disk
+            namespace: tenant-test
+          spec:
+            source: {http: null}
+            storage: {resources: {requests: {storage: 5Gi}}, storageClassName: replicated}
+    asserts:
+      - notFailedTemplate: {}
+
+  - it: does not crash or false-reject an adopted DataVolume with a null blank submap
+    # Defensive: every recognized source type must require a map body; a null
+    # (or scalar) submap routes to "left alone", never to a toYaml false-reject.
+    set:
+      storageClass: replicated
+      source: {}
+    kubernetesProvider:
+      scheme:
+        "cdi.kubevirt.io/v1beta1/DataVolume":
+          gvr: {group: cdi.kubevirt.io, version: v1beta1, resource: datavolumes}
+          namespaced: true
+      objects:
+        - kind: DataVolume
+          apiVersion: cdi.kubevirt.io/v1beta1
+          metadata: {name: test-vm-disk, namespace: tenant-test}
+          spec:
+            source: {blank: null}
+            storage: {resources: {requests: {storage: 5Gi}}, storageClassName: replicated}
+    asserts:
+      - notFailedTemplate: {}
+
+  - it: does not crash or false-reject an adopted DataVolume with a null upload submap
+    set:
+      storageClass: replicated
+      source: {upload: {}}
+    kubernetesProvider:
+      scheme:
+        "cdi.kubevirt.io/v1beta1/DataVolume":
+          gvr: {group: cdi.kubevirt.io, version: v1beta1, resource: datavolumes}
+          namespaced: true
+      objects:
+        - kind: DataVolume
+          apiVersion: cdi.kubevirt.io/v1beta1
+          metadata: {name: test-vm-disk, namespace: tenant-test}
+          spec:
+            source: {upload: null}
+            storage: {resources: {requests: {storage: 5Gi}}, storageClassName: replicated}
+    asserts:
+      - notFailedTemplate: {}
+
+  - it: does not crash on an adopted DataVolume with a scalar pvc source
+    # The $storedIsImageClone namespace read must be guarded too, or a scalar pvc
+    # errors with "can't evaluate field namespace in type string".
+    set:
+      storageClass: replicated
+      source: {http: {url: https://example.com/original.qcow2}}
+    kubernetesProvider:
+      scheme:
+        "cdi.kubevirt.io/v1beta1/DataVolume":
+          gvr: {group: cdi.kubevirt.io, version: v1beta1, resource: datavolumes}
+          namespaced: true
+      objects:
+        - kind: DataVolume
+          apiVersion: cdi.kubevirt.io/v1beta1
+          metadata: {name: test-vm-disk, namespace: tenant-test}
+          spec:
+            source: {pvc: "not-a-map"}
+            storage: {resources: {requests: {storage: 5Gi}}, storageClassName: replicated}
+    asserts:
+      - notFailedTemplate: {}
+
+  - it: does not crash on an adopted DataVolume with a scalar http source
+    set:
+      storageClass: replicated
+      source: {http: {url: https://example.com/original.qcow2}}
+    kubernetesProvider:
+      scheme:
+        "cdi.kubevirt.io/v1beta1/DataVolume":
+          gvr: {group: cdi.kubevirt.io, version: v1beta1, resource: datavolumes}
+          namespaced: true
+      objects:
+        - kind: DataVolume
+          apiVersion: cdi.kubevirt.io/v1beta1
+          metadata: {name: test-vm-disk, namespace: tenant-test}
+          spec:
+            source: {http: "not-a-map"}
+            storage: {resources: {requests: {storage: 5Gi}}, storageClassName: replicated}
+    asserts:
+      - notFailedTemplate: {}
+
+  - it: does not crash on an adopted DataVolume with a scalar top-level source
+    # Defensive: a non-map spec.source (CDI forbids it, but a hand-written object
+    # might carry it) must route to "left alone", not crash keys on a string.
+    set:
+      storageClass: replicated
+      source: {http: {url: https://example.com/original.qcow2}}
+    kubernetesProvider:
+      scheme:
+        "cdi.kubevirt.io/v1beta1/DataVolume":
+          gvr: {group: cdi.kubevirt.io, version: v1beta1, resource: datavolumes}
+          namespaced: true
+      objects:
+        - kind: DataVolume
+          apiVersion: cdi.kubevirt.io/v1beta1
+          metadata: {name: test-vm-disk, namespace: tenant-test}
+          spec:
+            source: "not-a-map"
+            storage: {resources: {requests: {storage: 5Gi}}, storageClassName: replicated}
+    asserts:
+      - notFailedTemplate: {}
+
+  - it: leaves alone an adopted pvc clone in a foreign namespace
+    # BUG (#3969 re-review): the chart only produces a pvc in cozy-public (image)
+    # or .Release.Namespace (disk). A stored pvc in any other namespace is not
+    # chart-producible provenance and must be left alone, not deadlocked.
+    set:
+      storageClass: replicated
+      source: {disk: {name: somedisk}}
+    kubernetesProvider:
+      scheme:
+        "cdi.kubevirt.io/v1beta1/DataVolume":
+          gvr: {group: cdi.kubevirt.io, version: v1beta1, resource: datavolumes}
+          namespaced: true
+      objects:
+        - kind: DataVolume
+          apiVersion: cdi.kubevirt.io/v1beta1
+          metadata: {name: test-vm-disk, namespace: tenant-test}
+          spec:
+            source: {pvc: {name: somedisk, namespace: prod-ns}}
+            storage: {resources: {requests: {storage: 5Gi}}, storageClassName: replicated}
+    asserts:
+      - notFailedTemplate: {}
+
+  - it: leaves alone an adopted image-prefixed pvc stored outside cozy-public
+    set:
+      storageClass: replicated
+      source: {image: {name: ubuntu}}
+    kubernetesProvider:
+      scheme:
+        "cdi.kubevirt.io/v1beta1/DataVolume":
+          gvr: {group: cdi.kubevirt.io, version: v1beta1, resource: datavolumes}
+          namespaced: true
+      objects:
+        - kind: DataVolume
+          apiVersion: cdi.kubevirt.io/v1beta1
+          metadata: {name: test-vm-disk, namespace: tenant-test}
+          spec:
+            source: {pvc: {name: vm-default-images-ubuntu, namespace: other-images-ns}}
+            storage: {resources: {requests: {storage: 5Gi}}, storageClassName: replicated}
+    asserts:
+      - notFailedTemplate: {}
+
+  - it: does not crash on an adopted DataVolume with a scalar blank source
+    set:
+      storageClass: replicated
+      source: {}
+    kubernetesProvider:
+      scheme:
+        "cdi.kubevirt.io/v1beta1/DataVolume":
+          gvr: {group: cdi.kubevirt.io, version: v1beta1, resource: datavolumes}
+          namespaced: true
+      objects:
+        - kind: DataVolume
+          apiVersion: cdi.kubevirt.io/v1beta1
+          metadata: {name: test-vm-disk, namespace: tenant-test}
+          spec:
+            source: {blank: "not-a-map"}
+            storage: {resources: {requests: {storage: 5Gi}}, storageClassName: replicated}
+    asserts:
+      - notFailedTemplate: {}
+
+  - it: leaves alone an adopted pvc source with only a name (foreign shape)
+    set:
+      storageClass: replicated
+      source: {disk: {name: whatever}}
+    kubernetesProvider:
+      scheme:
+        "cdi.kubevirt.io/v1beta1/DataVolume":
+          gvr: {group: cdi.kubevirt.io, version: v1beta1, resource: datavolumes}
+          namespaced: true
+      objects:
+        - kind: DataVolume
+          apiVersion: cdi.kubevirt.io/v1beta1
+          metadata: {name: test-vm-disk, namespace: tenant-test}
+          spec:
+            source: {pvc: {name: foreign-only}}
+            storage: {resources: {requests: {storage: 5Gi}}, storageClassName: replicated}
+    asserts:
+      - notFailedTemplate: {}
+
+  - it: does not falsely reject an adopted disk whose PVC class differs from the values default
+    # MAJOR (#3969 review, IvanHunters): storageClass must be compared against the
+    # creation-time annotation only, never the live PVC/DV — an adopted/foreign
+    # disk on local-path with the CR left at the default (replicated) was Ready
+    # before and must not deadlock the render. The PVC below is mocked on a
+    # different class ON PURPOSE: the template must ignore it (no PVC lookup), so
+    # this doubles as a guard against anyone reintroducing a live-PVC read.
+    set:
+      storageClass: replicated
+      source: {http: {url: https://example.com/original.qcow2}}
+    kubernetesProvider:
+      scheme:
+        "cdi.kubevirt.io/v1beta1/DataVolume":
+          gvr: {group: cdi.kubevirt.io, version: v1beta1, resource: datavolumes}
+          namespaced: true
+        "v1/PersistentVolumeClaim":
+          gvr: {group: "", version: v1, resource: persistentvolumeclaims}
+          namespaced: true
+      objects:
+        - kind: DataVolume
+          apiVersion: cdi.kubevirt.io/v1beta1
+          metadata:
+            name: test-vm-disk
+            namespace: tenant-test
+          spec:
+            source: {http: {url: https://example.com/original.qcow2}}
+            storage: {resources: {requests: {storage: 5Gi}}}
+        - kind: PersistentVolumeClaim
+          apiVersion: v1
+          metadata:
+            name: test-vm-disk
+            namespace: tenant-test
+          spec:
+            storageClassName: local-path
+    asserts:
+      - notFailedTemplate: {}
+
+  - it: rejects a source change on a legacy non-image disk with no annotation
+    # The annotation-less fallback: http/upload/disk/blank reproduce spec.source
+    # exactly, so a changed URL is caught by comparing against the stored spec.
+    set:
+      storageClass: replicated
+      source: {http: {url: https://example.com/changed.qcow2}}
+    kubernetesProvider:
+      scheme:
+        "cdi.kubevirt.io/v1beta1/DataVolume":
+          gvr: {group: cdi.kubevirt.io, version: v1beta1, resource: datavolumes}
+          namespaced: true
+      objects:
+        - kind: DataVolume
+          apiVersion: cdi.kubevirt.io/v1beta1
+          metadata:
+            name: test-vm-disk
+            namespace: tenant-test
+          spec:
+            source: {http: {url: https://example.com/original.qcow2}}
+            storage: {resources: {requests: {storage: 5Gi}}, storageClassName: replicated}
+    asserts:
+      - failedTemplate:
+          errorPattern: 'VMDisk source is immutable after creation'
+
+  - it: does not reject or poison an unchanged legacy non-image disk with no annotation
+    set:
+      storageClass: replicated
+      source: {http: {url: https://example.com/original.qcow2}}
+    kubernetesProvider:
+      scheme:
+        "cdi.kubevirt.io/v1beta1/DataVolume":
+          gvr: {group: cdi.kubevirt.io, version: v1beta1, resource: datavolumes}
+          namespaced: true
+      objects:
+        - kind: DataVolume
+          apiVersion: cdi.kubevirt.io/v1beta1
+          metadata:
+            name: test-vm-disk
+            namespace: tenant-test
+          spec:
+            source: {http: {url: https://example.com/original.qcow2}}
+            storage: {resources: {requests: {storage: 5Gi}}, storageClassName: replicated}
+    asserts:
+      - notFailedTemplate: {}
+      - notExists:
+          path: metadata.annotations["vm-disk.cozystack.io/source"]
+
+  - it: rejects a disk-clone name change on a legacy disk with no annotation
+    # The disk-clone (vm-disk-<name>) fallback branch: prefix is stable, so a
+    # changed clone name is a real edit and must be caught.
+    set:
+      storageClass: replicated
+      source: {disk: {name: newsrc}}
+    kubernetesProvider:
+      scheme:
+        "cdi.kubevirt.io/v1beta1/DataVolume":
+          gvr: {group: cdi.kubevirt.io, version: v1beta1, resource: datavolumes}
+          namespaced: true
+      objects:
+        - kind: DataVolume
+          apiVersion: cdi.kubevirt.io/v1beta1
+          metadata:
+            name: test-vm-disk
+            namespace: tenant-test
+          spec:
+            source: {pvc: {name: vm-disk-oldsrc, namespace: tenant-test}}
+            storage: {resources: {requests: {storage: 5Gi}}, storageClassName: replicated}
+    asserts:
+      - failedTemplate:
+          errorPattern: 'VMDisk source is immutable after creation'
+
+  - it: does not reject an unchanged legacy blank disk with no annotation
+    set:
+      storageClass: replicated
+      source: {}
+    kubernetesProvider:
+      scheme:
+        "cdi.kubevirt.io/v1beta1/DataVolume":
+          gvr: {group: cdi.kubevirt.io, version: v1beta1, resource: datavolumes}
+          namespaced: true
+      objects:
+        - kind: DataVolume
+          apiVersion: cdi.kubevirt.io/v1beta1
+          metadata:
+            name: test-vm-disk
+            namespace: tenant-test
+          spec:
+            source: {blank: {}}
+            storage: {resources: {requests: {storage: 5Gi}}, storageClassName: replicated}
+    asserts:
+      - notFailedTemplate: {}
+
+  - it: does not reject an unchanged legacy upload disk with no annotation
+    set:
+      storageClass: replicated
+      source: {upload: {}}
+    kubernetesProvider:
+      scheme:
+        "cdi.kubevirt.io/v1beta1/DataVolume":
+          gvr: {group: cdi.kubevirt.io, version: v1beta1, resource: datavolumes}
+          namespaced: true
+      objects:
+        - kind: DataVolume
+          apiVersion: cdi.kubevirt.io/v1beta1
+          metadata:
+            name: test-vm-disk
+            namespace: tenant-test
+          spec:
+            source: {upload: {}}
+            storage: {resources: {requests: {storage: 5Gi}}, storageClassName: replicated}
+    asserts:
+      - notFailedTemplate: {}
+
+  - it: does not enforce storageClass on a disk with no storage-class annotation
+    # storageClass is guarded via the creation-time annotation ONLY. An adopted
+    # or pre-annotation disk carries no record, so the check is skipped rather
+    # than compared against the live class (which would false-reject when the CR
+    # default differs from the disk's real class).
+    set:
+      storageClass: other
+      source: {http: {url: https://example.com/original.qcow2}}
+    kubernetesProvider:
+      scheme:
+        "cdi.kubevirt.io/v1beta1/DataVolume":
+          gvr: {group: cdi.kubevirt.io, version: v1beta1, resource: datavolumes}
+          namespaced: true
+      objects:
+        - kind: DataVolume
+          apiVersion: cdi.kubevirt.io/v1beta1
+          metadata:
+            name: test-vm-disk
+            namespace: tenant-test
+            annotations:
+              vm-disk.cozystack.io/source: '{"http":{"url":"https://example.com/original.qcow2"}}'
+          spec:
+            source: {http: {url: https://example.com/original.qcow2}}
+            storage: {resources: {requests: {storage: 5Gi}}, storageClassName: replicated}
+    asserts:
+      - notFailedTemplate: {}
diff --git a/packages/apps/vm-disk/tests/dv_source_test.yaml b/packages/apps/vm-disk/tests/dv_source_test.yaml
new file mode 100644
index 0000000000..3cc482606b
--- /dev/null
+++ b/packages/apps/vm-disk/tests/dv_source_test.yaml
@@ -0,0 +1,174 @@
+suite: vm-disk DataVolume source rendering on initial creation
+
+# When no DataVolume exists yet, dv.yaml builds spec.source from .Values.source.
+# This pins the refactor that routes every source type through the shared
+# $desiredSource variable (used both for rendering and for the immutability
+# comparison), so a regression there is caught without a live cluster.
+release:
+  name: test-vm-disk
+  namespace: tenant-test
+templates:
+  - templates/dv.yaml
+tests:
+  - it: records an empty storage-class annotation when created with an empty storageClass
+    # Provenance is recorded even for "" (cluster default), so a later change to a
+    # concrete class is caught. Annotation-key presence (not its value)
+    # distinguishes a recorded empty class from a legacy disk with no annotation.
+    set:
+      storageClass: ""
+    asserts:
+      - equal:
+          path: metadata.annotations["vm-disk.cozystack.io/storage-class"]
+          value: ""
+
+  - it: treats an explicit null source as blank without crashing
+    # A direct HelmRelease consumer may write source: null; every .Values.source
+    # access must tolerate it (default dict) rather than crash hasKey on nil.
+    set:
+      source: null
+    asserts:
+      - notFailedTemplate: {}
+      - equal:
+          path: spec.source.blank
+          value: {}
+
+  - it: renders a blank source by default and records it in the source annotation
+    asserts:
+      - equal:
+          path: spec.source.blank
+          value: {}
+      - equal:
+          path: spec.storage.storageClassName
+          value: replicated
+      - equal:
+          path: metadata.annotations["vm-disk.cozystack.io/source"]
+          value: '{}'
+      # Immediate binding is requested for every source type, not only upload.
+      # A standalone VMDisk has no consumer to wait for, so on a
+      # WaitForFirstConsumer class the volume would otherwise never populate;
+      # the placement trade-off that buys is in README.md. Pinned per source so
+      # a regression to the old upload-only condition reddens here.
+      - equal:
+          path: metadata.annotations["cdi.kubevirt.io/storage.bind.immediate.requested"]
+          value: "true"
+
+  - it: renders an http source from values and records it in the source annotation
+    set:
+      source:
+        http:
+          url: https://example.com/img.qcow2
+    asserts:
+      - equal:
+          path: spec.source.http.url
+          value: https://example.com/img.qcow2
+      # The create-path annotation write is the linchpin of the immutability
+      # guard: later renders compare the operator's input against it, so a
+      # regression here would silently degrade every new disk to the lossy
+      # spec-compare fallback.
+      - equal:
+          path: metadata.annotations["vm-disk.cozystack.io/source"]
+          value: '{"http":{"url":"https://example.com/img.qcow2"}}'
+      # storageClass provenance is recorded at creation too, so a later clear-to-empty is caught.
+      - equal:
+          path: metadata.annotations["vm-disk.cozystack.io/storage-class"]
+          value: replicated
+
+  - it: records a query-string http URL with json-escaped special chars in the annotation
+    # Load-bearing round-trip: the source guard is a byte-for-byte string compare,
+    # so toJson's HTML-escaping of & < > (common in presigned S3 URLs) must be
+    # recorded verbatim and recompute identically. Locks the escaping so a future
+    # toJson change trips here instead of deadlocking every &-URL disk in prod.
+    set:
+      source:
+        http:
+          url: https://s3.example.com/x?a=1&b=2&c=<>
+    asserts:
+      - equal:
+          path: spec.source.http.url
+          value: https://s3.example.com/x?a=1&b=2&c=<>
+      - equal:
+          path: metadata.annotations["vm-disk.cozystack.io/source"]
+          value: '{"http":{"url":"https://s3.example.com/x?a=1\u0026b=2\u0026c=\u003c\u003e"}}'
+
+  - it: renders an image source as a cozy-public pvc clone
+    set:
+      source:
+        image:
+          name: ubuntu
+    asserts:
+      - equal:
+          path: spec.source.pvc.name
+          value: vm-default-images-ubuntu
+      - equal:
+          path: spec.source.pvc.namespace
+          value: cozy-public
+      - equal:
+          path: metadata.annotations["vm-disk.cozystack.io/source"]
+          value: '{"image":{"name":"ubuntu"}}'
+      # Immediate binding is requested for every source type, not only upload.
+      # A standalone VMDisk has no consumer to wait for, so on a
+      # WaitForFirstConsumer class the volume would otherwise never populate;
+      # the placement trade-off that buys is in README.md. Pinned per source so
+      # a regression to the old upload-only condition reddens here.
+      - equal:
+          path: metadata.annotations["cdi.kubevirt.io/storage.bind.immediate.requested"]
+          value: "true"
+
+  - it: renders a disk source as an in-namespace pvc clone
+    set:
+      source:
+        disk:
+          name: other
+    asserts:
+      - equal:
+          path: spec.source.pvc.name
+          value: vm-disk-other
+      - equal:
+          path: spec.source.pvc.namespace
+          value: tenant-test
+      - equal:
+          path: metadata.annotations["vm-disk.cozystack.io/source"]
+          value: '{"disk":{"name":"other"}}'
+      # Immediate binding is requested for every source type, not only upload.
+      # A standalone VMDisk has no consumer to wait for, so on a
+      # WaitForFirstConsumer class the volume would otherwise never populate;
+      # the placement trade-off that buys is in README.md. Pinned per source so
+      # a regression to the old upload-only condition reddens here.
+      - equal:
+          path: metadata.annotations["cdi.kubevirt.io/storage.bind.immediate.requested"]
+          value: "true"
+
+  - it: renders an upload source and requests immediate bind
+    set:
+      source:
+        upload: {}
+    asserts:
+      - equal:
+          path: spec.source.upload
+          value: {}
+      - equal:
+          path: metadata.annotations["cdi.kubevirt.io/storage.bind.immediate.requested"]
+          value: "true"
+      - equal:
+          path: metadata.annotations["vm-disk.cozystack.io/source"]
+          value: '{"upload":{}}'
+
+  - it: rejects more than one source type
+    set:
+      source:
+        http:
+          url: https://example.com/img.qcow2
+        image:
+          name: ubuntu
+    asserts:
+      - failedTemplate:
+          errorMessage: Exactly one type of source is expected!
+
+  - it: rejects an unrecognized single source type with a clear message
+    set:
+      source:
+        snapshot:
+          name: snap1
+    asserts:
+      - failedTemplate:
+          errorPattern: 'Unknown source type'
diff --git a/packages/apps/vm-disk/tests/hook_securitycontext_test.yaml b/packages/apps/vm-disk/tests/hook_securitycontext_test.yaml
new file mode 100644
index 0000000000..41df5e4b92
--- /dev/null
+++ b/packages/apps/vm-disk/tests/hook_securitycontext_test.yaml
@@ -0,0 +1,64 @@
+suite: vm-disk pvc-resize hook runs non-root
+
+# The resize hook only renders when an existing PVC is being grown
+# (lookup-gated on the PVC + a larger .Values.storage), so mock a smaller PVC
+# and request a larger size to drive the render, then pin the non-root
+# securityContext. Scope to the hook template so the chart's tenant-identifier
+# lookups elsewhere don't need a live cluster.
+release:
+  name: test-vm-disk
+  namespace: tenant-test
+templates:
+  - templates/pvc-resize-hook.yaml
+set:
+  storage: 2Gi
+kubernetesProvider:
+  scheme:
+    "v1/PersistentVolumeClaim":
+      gvr:
+        group: ""
+        version: "v1"
+        resource: "persistentvolumeclaims"
+      namespaced: true
+  objects:
+    - kind: PersistentVolumeClaim
+      apiVersion: v1
+      metadata:
+        name: test-vm-disk
+        namespace: tenant-test
+      spec:
+        resources:
+          requests:
+            storage: 1Gi
+tests:
+  - it: pvc-resize hook Job runs under a restrictive non-root securityContext
+    documentSelector:
+      path: kind
+      value: Job
+    asserts:
+      - equal:
+          path: spec.template.spec.securityContext.runAsNonRoot
+          value: true
+      - equal:
+          path: spec.template.spec.securityContext.runAsUser
+          value: 65534
+      - equal:
+          path: spec.template.spec.securityContext.seccompProfile.type
+          value: RuntimeDefault
+      - equal:
+          path: spec.template.spec.containers[0].securityContext.allowPrivilegeEscalation
+          value: false
+      - contains:
+          path: spec.template.spec.containers[0].securityContext.capabilities.drop
+          content: ALL
+
+  - it: backoffLimit is set at Job.spec, not silently dropped under the pod spec
+    documentSelector:
+      path: kind
+      value: Job
+    asserts:
+      - equal:
+          path: spec.backoffLimit
+          value: 1
+      - notExists:
+          path: spec.template.spec.backoffLimit
diff --git a/packages/apps/vm-disk/values.schema.json b/packages/apps/vm-disk/values.schema.json
index 54d346548f..c5a254f8ae 100644
--- a/packages/apps/vm-disk/values.schema.json
+++ b/packages/apps/vm-disk/values.schema.json
@@ -42,7 +42,10 @@
           "properties": {
             "name": {
               "description": "Name of the image to use.",
-              "type": "string"
+              "type": "string",
+              "x-cozystack-options": {
+                "source": "image"
+              }
             }
           }
         },
@@ -50,7 +53,13 @@
           "description": "Upload local image.",
           "type": "object"
         }
-      }
+      },
+      "x-kubernetes-validations": [
+        {
+          "rule": "self == oldSelf",
+          "message": "source is immutable"
+        }
+      ]
     },
     "optical": {
       "description": "Defines if disk should be considered optical.",
@@ -80,7 +89,15 @@
           "rule": "self == oldSelf",
           "message": "storageClass is immutable"
         }
-      ]
+      ],
+      "x-cozystack-options": {
+        "source": "storageclass"
+      }
+    },
+    "bindImmediately": {
+      "description": "Provision the volume at disk creation instead of waiting for a consumer.",
+      "type": "boolean",
+      "default": true
     }
   }
 }
diff --git a/packages/apps/vm-disk/values.yaml b/packages/apps/vm-disk/values.yaml
index bf83896af4..e377e8a799 100644
--- a/packages/apps/vm-disk/values.yaml
+++ b/packages/apps/vm-disk/values.yaml
@@ -4,6 +4,7 @@
 
 ## @typedef {struct} SourceImage - Use image by name.
 ## @field {string} name - Name of the image to use.
+## @x-cozystack-options {source: image}
 
 ## @typedef {struct} SourceUpload - Upload local image.
 
@@ -20,6 +21,7 @@
 ## @field {*SourceDisk} [disk] - Clone an existing vm-disk.
 
 ## @param {Source} source - The source image location used to create a disk.
+## @immutable
 source: {}
 
 ## @param {bool} optical - Defines if disk should be considered optical.
@@ -30,4 +32,8 @@ storage: 5Gi
 
 ## @param {string} storageClass - StorageClass used to store the data.
 ## @immutable
+## @x-cozystack-options {source: storageclass}
 storageClass: replicated
+
+## @param {bool} bindImmediately - Provision the volume at disk creation instead of waiting for a consumer.
+bindImmediately: true
diff --git a/packages/apps/vm-instance/Makefile b/packages/apps/vm-instance/Makefile
index deaeaf2072..ba05ddfdcd 100644
--- a/packages/apps/vm-instance/Makefile
+++ b/packages/apps/vm-instance/Makefile
@@ -1,15 +1,8 @@
 include ../../../hack/package.mk
 
+test:
+	helm unittest .
+
 generate:
 	cozyvalues-gen -m 'vminstance' -v values.yaml -s values.schema.json -r README.md -g ../../../api/apps/v1alpha1/vminstance/types.go
-	#INSTANCE_TYPES=$$(yq e '.metadata.name' -o=json -r ../../system/kubevirt-instancetypes/templates/instancetypes.yaml | yq 'split(" ") | . + [""]' -o json) \
-	#  && yq -i -o json ".properties.instanceType.enum = $${INSTANCE_TYPES}" values.schema.json
-	# Union the upstream preference catalog with the Cozystack-local deprecated
-	# aliases in extra-instancetypes.yaml, so retained EOL profiles (e.g.
-	# centos.7*/centos.stream8*) stay in the enum and the dynamic CRD does not
-	# reject existing VMInstance CRs that reference them.
-	PREFERENCES=$$( { yq e '.metadata.name' ../../system/kubevirt-instancetypes/templates/preferences.yaml; \
-	                  yq e 'select(.kind == "VirtualMachineClusterPreference") | .metadata.name' ../../system/kubevirt-instancetypes/templates/extra-instancetypes.yaml; } \
-	                | grep -E -v -- '^(---)?$$' | sort -u | jq -R . | jq -s '. + [""]' ) \
-	  && yq -i -o json ".properties.instanceProfile.enum = $${PREFERENCES}" values.schema.json
 	../../../hack/update-crd.sh
diff --git a/packages/apps/vm-instance/README.md b/packages/apps/vm-instance/README.md
index c1a016073e..2365ca9c1b 100644
--- a/packages/apps/vm-instance/README.md
+++ b/packages/apps/vm-instance/README.md
@@ -36,32 +36,37 @@ virtctl ssh <user>@<vm>
 
 ### Common parameters
 
-| Name                | Description                                                                                                                                                                                                   | Type       | Value       |
-| ------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------- | ----------- |
-| `external`          | Enable external access from outside the cluster.                                                                                                                                                              | `bool`     | `false`     |
-| `externalMethod`    | Method to pass through traffic to the VM.                                                                                                                                                                     | `string`   | `PortList`  |
-| `externalPorts`     | Ports to forward from outside the cluster.                                                                                                                                                                    | `[]int`    | `[22]`      |
-| `externalAllowICMP` | Whether to accept ICMP traffic to the VM in PortList mode (preserves ping and PMTU discovery). No effect in WholeIP mode. Default true so ping behaves as users expect even when port filtering is in effect. | `bool`     | `true`      |
-| `runStrategy`       | Requested running state of the VirtualMachineInstance                                                                                                                                                         | `string`   | `Always`    |
-| `instanceType`      | Virtual Machine instance type.                                                                                                                                                                                | `string`   | `u1.medium` |
-| `instanceProfile`   | Virtual Machine preferences profile.                                                                                                                                                                          | `string`   | `ubuntu`    |
-| `disks`             | List of disks to attach.                                                                                                                                                                                      | `[]object` | `[]`        |
-| `disks[i].name`     | Disk name.                                                                                                                                                                                                    | `string`   | `""`        |
-| `disks[i].bus`      | Disk bus type (e.g. "sata").                                                                                                                                                                                  | `string`   | `""`        |
-| `networks`          | Networks to attach the VM to.                                                                                                                                                                                 | `[]object` | `[]`        |
-| `networks[i].name`  | Network attachment name.                                                                                                                                                                                      | `string`   | `""`        |
-| `subnets`           | Deprecated: use networks instead.                                                                                                                                                                             | `[]object` | `[]`        |
-| `subnets[i].name`   | Network attachment name.                                                                                                                                                                                      | `string`   | `""`        |
-| `gpus`              | List of GPUs to attach (NVIDIA driver requires at least 4 GiB RAM).                                                                                                                                           | `[]object` | `[]`        |
-| `gpus[i].name`      | The name of the GPU resource to attach.                                                                                                                                                                       | `string`   | `""`        |
-| `cpuModel`          | Model specifies the CPU model inside the VMI. List of available models https://github.com/libvirt/libvirt/tree/master/src/cpu_map                                                                             | `string`   | `""`        |
-| `resources`         | Resource configuration for the virtual machine.                                                                                                                                                               | `object`   | `{}`        |
-| `resources.cpu`     | Number of CPU cores allocated.                                                                                                                                                                                | `quantity` | `""`        |
-| `resources.memory`  | Amount of memory allocated.                                                                                                                                                                                   | `quantity` | `""`        |
-| `resources.sockets` | Number of CPU sockets (vCPU topology).                                                                                                                                                                        | `quantity` | `""`        |
-| `sshKeys`           | List of SSH public keys for authentication.                                                                                                                                                                   | `[]string` | `[]`        |
-| `cloudInit`         | Cloud-init user data.                                                                                                                                                                                         | `string`   | `""`        |
-| `cloudInitSeed`     | Seed string to generate SMBIOS UUID for the VM.                                                                                                                                                               | `string`   | `""`        |
+| Name                     | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | Type       | Value       |
+| ------------------------ | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------- | ----------- |
+| `external`               | Enable external access from outside the cluster.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | `bool`     | `false`     |
+| `externalMethod`         | Method to pass through traffic to the VM.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | `string`   | `PortList`  |
+| `externalPorts`          | Ports to forward from outside the cluster.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | `[]int`    | `[22]`      |
+| `externalAllowICMP`      | Whether to accept ICMP traffic to the VM in PortList mode (preserves ping and PMTU discovery). No effect in WholeIP mode. Default true so ping behaves as users expect even when port filtering is in effect.                                                                                                                                                                                                                                                                                                                                                                                                         | `bool`     | `true`      |
+| `runStrategy`            | Requested running state of the VirtualMachineInstance                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | `string`   | `Always`    |
+| `instanceType`           | Virtual Machine instance type. Ignored when `resources` sizes the VM, which needs whole-number cpu and sockets plus memory; the whole type is dropped then, so any dedicated CPU placement, hugepages, NUMA or realtime settings it carries go with it. While this field is set, a `resources` block that sizes only part of the VM is rejected outright instead of ignored, so complete it or clear it.                                                                                                                                                                                                              | `string`   | `u1.medium` |
+| `instanceProfile`        | Virtual Machine preferences profile.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | `string`   | `ubuntu`    |
+| `disks`                  | List of disks to attach.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              | `[]object` | `[]`        |
+| `disks[i].name`          | Disk name.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | `string`   | `""`        |
+| `disks[i].bus`           | Disk bus type (e.g. "sata").                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | `string`   | `""`        |
+| `networks`               | Networks to attach the VM to.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | `[]object` | `[]`        |
+| `networks[i].name`       | Network attachment name.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              | `string`   | `""`        |
+| `subnets`                | Deprecated: use networks instead.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | `[]object` | `[]`        |
+| `subnets[i].name`        | Network attachment name.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              | `string`   | `""`        |
+| `gpus`                   | List of GPUs to attach (NVIDIA driver requires at least 4 GiB RAM).                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   | `[]object` | `[]`        |
+| `gpus[i].name`           | The name of the GPU resource to attach.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | `string`   | `""`        |
+| `cpuModel`               | Model specifies the CPU model inside the VMI. List of available models https://github.com/libvirt/libvirt/tree/master/src/cpu_map                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | `string`   | `""`        |
+| `firmware`               | Firmware and boot configuration (UEFI/BIOS selection, Secure Boot, persistent EFI NVRAM).                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | `object`   | `{}`        |
+| `firmware.bootloader`    | Bootloader to boot the VM with: "uefi" (OVMF) or "bios" (SeaBIOS). Empty inherits the instanceProfile default.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        | `string`   | `""`        |
+| `firmware.secureBoot`    | Enable UEFI Secure Boot. Only applies when bootloader is "uefi".                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | `bool`     | `false`     |
+| `firmware.efiPersistent` | Persist EFI NVRAM (e.g. enrolled Secure Boot keys, such as an updated Microsoft UEFI CA) across reboots. Only applies when bootloader is "uefi".                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | `bool`     | `false`     |
+| `resources`              | Resource configuration for the virtual machine. Set whole-number cpu and sockets together with memory to size the VM directly, which overrides `instanceType`. Alongside an `instanceType`, a block that sizes only part of the VM is rejected; a whole-number cpu or sockets on its own sizes nothing and is ignored.                                                                                                                                                                                                                                                                                                | `object`   | `{}`        |
+| `resources.cpu`          | Number of CPU cores allocated, as a positive whole number such as `2`. Millicore or other unit-suffixed, fractional, zero, negative, above 4294967295 and quoted leading-zero values are rejected at render time, because the value becomes the VM's unsigned integer `domain.cpu.cores`.                                                                                                                                                                                                                                                                                                                             | `quantity` | `""`        |
+| `resources.memory`       | Amount of memory allocated, as a quantity of at least `1M` such as `8Gi`. Less than 1M is rejected at render time, because KubeVirt refuses a non-zero amount below 1M and a zero or negative amount sizes nothing.                                                                                                                                                                                                                                                                                                                                                                                                   | `quantity` | `""`        |
+| `resources.sockets`      | Number of CPU sockets (vCPU topology), as a positive whole number such as `1`. Millicore or other unit-suffixed, fractional, zero, negative, above 4294967295 and quoted leading-zero values are rejected at render time, because the value becomes the VM's unsigned integer `domain.cpu.sockets`.                                                                                                                                                                                                                                                                                                                   | `quantity` | `""`        |
+| `sshKeys`                | List of SSH public keys for authentication.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | `[]string` | `[]`        |
+| `cloudInit`              | Cloud-init user data.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | `string`   | `""`        |
+| `netplanDhcp`            | Supply cloud-init network-data that requests DHCP on every `en*` and `eth*` interface and keeps the DNS search domains DHCP offers. Needed for a netplan guest (Ubuntu, Debian) to address a secondary network such as a VPC subnet. Leave it off for a guest rendered by anything other than netplan, which would lose DHCP on every interface, and for a guest that configures an interface statically through netplan, which this configuration would shadow. Turning it on for a VM that has neither `cloudInit` nor `sshKeys` adds a cloud-init disk, and the guest's next boot is then treated as a first boot. | `bool`     | `false`     |
+| `cloudInitSeed`          | Seed string to generate SMBIOS UUID for the VM.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       | `string`   | `""`        |
 
 
 ## U Series
diff --git a/packages/apps/vm-instance/templates/_helpers.tpl b/packages/apps/vm-instance/templates/_helpers.tpl
index ddea90febf..337aa8f391 100644
--- a/packages/apps/vm-instance/templates/_helpers.tpl
+++ b/packages/apps/vm-instance/templates/_helpers.tpl
@@ -73,26 +73,132 @@ Generate a stable UUID for cloud-init re-initialization upon upgrade.
 {{/*
 Domain resources (cpu, memory) as a JSON object.
 Used in vm.yaml for rendering and in the update hook for merge patches.
+
+cpu and sockets are schema-typed as quantities but land in domain.cpu.cores
+and domain.cpu.sockets, which KubeVirt declares as uint32. Casting 500m to an
+integer yields 0, and KubeVirt boots a zero core count as one core, so only a
+whole count within uint32 gets past this point. The raw spelling is decoded
+as YAML, so +2, 2.0 or 1e1 pass as the integers they decode to; a leading
+zero is refused outright, because YAML decodes 010 as octal 8. Presence
+rather than truth, so that a 0 is refused instead of read as unset. Memory
+stays a quantity, which KubeVirt accepts as such, but KubeVirt v1.9.0
+admission refuses a non-zero amount below 1M
+(validateMemoryRequestsNegativeOrNull in
+pkg/virt-api/webhooks/validating-webhook/admitters/vmi-create-admitter.go),
+and a zero or negative amount sizes nothing, so the render refuses both.
+
+A number the operator left unquoted reaches the chart already decoded, and
+its spelling is gone, so the error labels it as read rather than written. The
+schema admits a number only as an integer, so it prints as whole digits,
+never in the exponent form a large float64 takes under %v.
 */}}
+{{- define "virtual-machine.resourceAsWritten" -}}
+{{- if kindIs "string" . -}}
+  {{- . -}}
+{{- else -}}
+  {{- printf "read as %.0f" (float64 .) -}}
+{{- end -}}
+{{- end -}}
+
 {{- define "virtual-machine.domainResources" -}}
+{{- $resources := .Values.resources | default dict -}}
+{{- $counts := dict -}}
+{{- range $field := list "cpu" "sockets" -}}
+  {{- $value := index $resources $field -}}
+  {{- if not (kindIs "invalid" $value) -}}
+    {{- $raw := printf "%v" $value -}}
+    {{- $count := (printf "v: %s" $raw | fromYaml).v -}}
+    {{- $isNumber := or (kindIs "int" $count) (kindIs "int64" $count) (kindIs "float64" $count) -}}
+    {{- $whole := and $isNumber (gt (float64 $count) 0.0) (le (float64 $count) 4294967295.0) (eq (floor $count) (float64 $count)) -}}
+    {{- if or (not $whole) (regexMatch "^\\+?0[0-9]" $raw) -}}
+      {{- fail (printf "resources.%s (%s) must be a positive whole number, such as 2. It becomes the VM's domain.cpu.%s, which KubeVirt declares as an unsigned integer, so a millicore or other unit-suffixed, fractional, zero, negative, out-of-range or leading-zero quantity cannot size the guest. Set a whole number, or remove the field." $field (include "virtual-machine.resourceAsWritten" $value) (ternary "cores" "sockets" (eq $field "cpu"))) -}}
+    {{- end -}}
+    {{- $_ := set $counts $field ($count | int64) -}}
+  {{- end -}}
+{{- end -}}
+{{- $memory := index $resources "memory" -}}
+{{- if not (kindIs "invalid" $memory) -}}
+  {{- if lt (include "cozy-lib.resources.toFloat" $memory | float64) 1e6 -}}
+    {{- fail (printf "resources.memory (%s) must be at least 1M, such as 8Gi. KubeVirt refuses a non-zero amount below 1M, and a zero or negative amount sizes nothing. Set a larger amount, or remove the field." (include "virtual-machine.resourceAsWritten" $memory)) -}}
+  {{- end -}}
+{{- end -}}
 {{- $result := dict -}}
-{{- if or .Values.cpuModel (and .Values.resources .Values.resources.cpu .Values.resources.sockets) -}}
+{{- if or .Values.cpuModel (and $counts.cpu $counts.sockets) -}}
   {{- $cpu := dict -}}
-  {{- if and .Values.resources .Values.resources.cpu .Values.resources.sockets -}}
-    {{- $_ := set $cpu "cores" (.Values.resources.cpu | int64) -}}
-    {{- $_ := set $cpu "sockets" (.Values.resources.sockets | int64) -}}
+  {{- if and $counts.cpu $counts.sockets -}}
+    {{- $_ := set $cpu "cores" $counts.cpu -}}
+    {{- $_ := set $cpu "sockets" $counts.sockets -}}
   {{- end -}}
   {{- if .Values.cpuModel -}}
     {{- $_ := set $cpu "model" .Values.cpuModel -}}
   {{- end -}}
   {{- $_ := set $result "cpu" $cpu -}}
 {{- end -}}
-{{- if and .Values.resources .Values.resources.memory -}}
-  {{- $_ := set $result "resources" (dict "requests" (dict "memory" .Values.resources.memory)) -}}
+{{- with $memory -}}
+  {{- $_ := set $result "resources" (dict "requests" (dict "memory" .)) -}}
 {{- end -}}
 {{- $result | toJson -}}
 {{- end -}}
 
+{{/*
+Instance type actually rendered into the VM spec, empty when the VM is sized by
+explicit resources instead.
+
+KubeVirt v1.9.0 refuses a VirtualMachine that carries an instancetype matcher
+together with explicit domain sizing, and the two halves of that rule are not
+the same shape. validateCPU in pkg/instancetype/apply/cpu.go conflicts on
+domain.cpu.cores and domain.cpu.sockets only when they are non-zero;
+validateMemory in memory.go conflicts on domain.resources.requests.memory
+whenever the key is present, zero included. A resources block that supplies
+all three therefore replaces the matcher, the same way the kubernetes-nodes
+chart already sizes its worker VMs.
+
+Everything below is decided from what domainResources actually emitted, never
+from which keys the user set. The two readings differ, and only the first one
+is the question KubeVirt asks. domainResources needs cpu and sockets together
+before it writes domain.cpu, so a whole resources.cpu on its own emits nothing
+and conflicts with nothing; those releases render today and must keep
+rendering. Reading the emitted values also survives a resources block the
+user nulls outright, which Helm coalescing turns into a nil .Values.resources
+that a raw field read would dereference. cpuModel writes domain.cpu.model,
+which conflicts only when the instance type declares a model of its own, so
+it is deliberately not among the three fields read back here.
+
+A block that emits some sizing but not all of it has no safe reading next to an
+instance type: dropping the matcher would size the VM from fields the user
+never finished, and keeping it either loses to the webhook or silently discards
+what was typed. Stop the render and name both sides instead.
+*/}}
+{{- define "virtual-machine.effectiveInstanceType" -}}
+{{- $domain := include "virtual-machine.domainResources" . | fromJson -}}
+{{- $sized := list -}}
+{{- $unsized := list -}}
+{{- if dig "cpu" "cores" nil $domain -}}
+  {{- $sized = append $sized "resources.cpu" -}}
+{{- else -}}
+  {{- $unsized = append $unsized "resources.cpu" -}}
+{{- end -}}
+{{- if dig "cpu" "sockets" nil $domain -}}
+  {{- $sized = append $sized "resources.sockets" -}}
+{{- else -}}
+  {{- $unsized = append $unsized "resources.sockets" -}}
+{{- end -}}
+{{- if dig "resources" "requests" "memory" nil $domain -}}
+  {{- $sized = append $sized "resources.memory" -}}
+{{- else -}}
+  {{- $unsized = append $unsized "resources.memory" -}}
+{{- end -}}
+{{- if empty $unsized -}}
+  {{- /* Sized by resources, so no matcher is rendered and nothing conflicts. */ -}}
+{{- else if and $sized .Values.instanceType -}}
+  {{- fail (printf "instanceType %q cannot be combined with a resources block that sizes the VM only in part. Sizing came from %s, but not from %s. resources.cpu and resources.sockets size the VM only when both are set to whole numbers. KubeVirt rejects a VirtualMachine that carries an instancetype matcher together with explicit domain cpu or memory, so either give resources.cpu, resources.sockets and resources.memory values that all size the VM, or clear %s and let the instance type size it." .Values.instanceType (join ", " $sized) (join ", " $unsized) (join ", " $sized)) -}}
+{{- else -}}
+  {{- /* An explicit instanceType: null survives the merge as a nil, which Go
+         renders as the truthy literal <no value>: a name no lookup matches. */ -}}
+  {{- .Values.instanceType | default "" -}}
+{{- end -}}
+{{- end -}}
+
 {{/*
 Node Affinity for Windows VMs
 */}}
diff --git a/packages/apps/vm-instance/templates/secret-network-config.yaml b/packages/apps/vm-instance/templates/secret-network-config.yaml
new file mode 100644
index 0000000000..0e32f58472
--- /dev/null
+++ b/packages/apps/vm-instance/templates/secret-network-config.yaml
@@ -0,0 +1,49 @@
+{{- /*
+Cloud-init network-data for netplan guests.
+
+Two defaults leave a netplan guest worse off than the DHCP already on the wire.
+virt-launcher runs a DHCP server on every bridge-bound interface, secondary
+ones included (kubevirt pkg/network/setup/launcher/configurator.go gates only on
+iface.Bridge), yet cloud-init's fallback configuration covers a single
+interface, so a VM joined to a VPC subnet never asks for the address reserved
+for it. That server also advertises the launcher pod's search domains as option
+119, while systemd-networkd defaults UseDomains= to no (systemd.network(5)), so
+the guest discards them and a cluster domain under .local falls through to the
+mDNS exclusion in resolved and answers REFUSED.
+
+Matching en* and eth* rather than naming interfaces keeps this correct whatever
+the guest calls its NICs, and is the shape Debian's own cloud images ship.
+networkDataSecretRef replaces the fallback configuration instead of adding to
+it, so every interface has to be described here, not just the secondary ones.
+
+Opt-in rather than keyed on instanceProfile, whose default is ubuntu whatever
+the disk holds: the sysconfig, NetworkManager and eni renderers turn each match
+stanza into an interface literally named cozy-en or cozy-eth, so a non-netplan
+guest would lose DHCP on its real NIC.
+*/}}
+{{- if .Values.netplanDhcp }}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ include "virtual-machine.fullname" . }}-network-config
+  labels:
+    {{- include "virtual-machine.labels" . | nindent 4 }}
+stringData:
+  networkdata: |
+    network:
+      version: 2
+      ethernets:
+        cozy-en:
+          match:
+            name: "en*"
+          dhcp4: true
+          dhcp4-overrides:
+            use-domains: true
+        cozy-eth:
+          match:
+            name: "eth*"
+          dhcp4: true
+          dhcp4-overrides:
+            use-domains: true
+{{- end }}
diff --git a/packages/apps/vm-instance/templates/vm-update-hook.yaml b/packages/apps/vm-instance/templates/vm-update-hook.yaml
index 995dafff9e..72bc617e2b 100644
--- a/packages/apps/vm-instance/templates/vm-update-hook.yaml
+++ b/packages/apps/vm-instance/templates/vm-update-hook.yaml
@@ -4,7 +4,13 @@
 {{- $existingVM := lookup "kubevirt.io/v1" "VirtualMachine" $namespace $vmName -}}
 {{- $existingService := lookup "v1" "Service" $namespace $vmName -}}
 
-{{- $instanceType := .Values.instanceType | default "" -}}
+{{- /* The effective type, not the raw value: a VM switched from an instance
+       type to a complete resources block renders no matcher any more, and the
+       hook has to strip the one already on the object. Reading .Values
+       directly here would see the leftover instanceType, skip the patch, and
+       leave spec.instancetype.revisionName in place for KubeVirt to keep
+       applying against the domain resources Helm just wrote. */}}
+{{- $instanceType := include "virtual-machine.effectiveInstanceType" . -}}
 {{- $instanceProfile := .Values.instanceProfile | default "" -}}
 {{- $desiredServiceType := ternary "LoadBalancer" "ClusterIP" .Values.external -}}
 
@@ -56,9 +62,18 @@ spec:
     spec:
       serviceAccountName: {{ $.Release.Name }}-update-hook
       restartPolicy: Never
+      securityContext:
+        runAsNonRoot: true
+        runAsUser: 65534
+        seccompProfile:
+          type: RuntimeDefault
       containers:
         - name: update-resources
-          image: docker.io/alpine/k8s:1.33.4
+          image: docker.io/alpine/k8s:1.36.2
+          securityContext:
+            allowPrivilegeEscalation: false
+            capabilities:
+              drop: ["ALL"]
           resources:
             requests:
               memory: "16Mi"
diff --git a/packages/apps/vm-instance/templates/vm.yaml b/packages/apps/vm-instance/templates/vm.yaml
index b6d20dfa6e..8153adf8fe 100644
--- a/packages/apps/vm-instance/templates/vm.yaml
+++ b/packages/apps/vm-instance/templates/vm.yaml
@@ -1,9 +1,21 @@
-{{- if and .Values.instanceType (not (lookup "instancetype.kubevirt.io/v1beta1" "VirtualMachineClusterInstancetype" "" .Values.instanceType)) }}
-{{-   fail (printf "Specified instanceType does not exist in the cluster: %s" .Values.instanceType) }}
+{{- /* The effective type, not the raw value: once complete resources size the
+       VM the matcher is gone, and a stale or misspelled instanceType that the
+       dashboard gives no way to clear must not fail a render that never
+       references it. */}}
+{{- $instanceType := include "virtual-machine.effectiveInstanceType" . }}
+{{- if and $instanceType (not (lookup "instancetype.kubevirt.io/v1beta1" "VirtualMachineClusterInstancetype" "" $instanceType)) }}
+{{-   fail (printf "Specified instanceType does not exist in the cluster: %s" $instanceType) }}
 {{- end }}
 {{- if and .Values.instanceProfile (not (lookup "instancetype.kubevirt.io/v1beta1" "VirtualMachineClusterPreference" "" .Values.instanceProfile)) }}
 {{-   fail (printf "Specified instanceProfile does not exist in the cluster: %s" .Values.instanceProfile) }}
 {{- end }}
+{{- /* Raw values here, deliberately. This gate asks whether the user supplied
+       a sizing source at all, which is a question about their input; every
+       other read asks what gets rendered, which is a question about the
+       output. The raw instanceType and the effective one cannot disagree on
+       this gate's outcome -- a truthy raw value with an empty effective one
+       means the resources are complete, so the VM is sized either way -- but
+       swapping this one to $instanceType would quietly change what it means. */}}
 {{- if and (not .Values.instanceType) (not (and .Values.resources .Values.resources.cpu .Values.resources.sockets .Values.resources.memory)) }}
 {{-   fail "Either instanceType or resources (cpu, sockets, memory) must be specified" }}
 {{- end }}
@@ -21,7 +33,7 @@ spec:
   {{- else }}
   runStrategy: {{ ternary "Always" "Halted" (.Values.running | default true) }}
   {{- end }}
-  {{- with .Values.instanceType }}
+  {{- with $instanceType }}
   instancetype:
     kind: VirtualMachineClusterInstancetype
     name: {{ . }}
@@ -35,17 +47,20 @@ spec:
     metadata:
       annotations:
         kubevirt.io/allow-pod-bridge-network-live-migration: "true"
+        {{- if .Capabilities.APIVersions.Has "kubeovn.io/v1/IP" }}
         {{- $ovnIPName := printf "%s.%s" (include "virtual-machine.fullname" .) .Release.Namespace }}
         {{- $ovnIP := lookup "kubeovn.io/v1" "IP" "" $ovnIPName }}
         {{- if $ovnIP }}
         ovn.kubernetes.io/mac_address: {{ $ovnIP.spec.macAddress | quote }}
         ovn.kubernetes.io/ip_address: {{ $ovnIP.spec.ipAddress | quote }}
         {{- end }}
+        {{- end }}
       labels:
         {{- include "virtual-machine.labels" . | nindent 8 }}
     spec:
       domain:
         {{- $domainRes := include "virtual-machine.domainResources" . | fromJson -}}
+        {{- $fw := .Values.firmware | default dict }}
         {{- with $domainRes.cpu }}
         cpu: {{- . | toYaml | nindent 10 }}
         {{- end }}
@@ -54,6 +69,20 @@ spec:
         {{- end }}
         firmware:
           uuid: {{ include "virtual-machine.stableUuid" . }}
+          {{- if eq (toString $fw.bootloader) "uefi" }}
+          bootloader:
+            efi:
+              secureBoot: {{ $fw.secureBoot | default false }}
+              persistent: {{ $fw.efiPersistent | default false }}
+          {{- else if eq (toString $fw.bootloader) "bios" }}
+          bootloader:
+            bios: {}
+          {{- end }}
+        {{- if and (eq (toString $fw.bootloader) "uefi") ($fw.secureBoot | default false) }}
+        features:
+          smm:
+            enabled: true
+        {{- end }}
         devices:
           {{- if .Values.gpus }}
           gpus:
@@ -80,7 +109,7 @@ spec:
             {{-   fail (printf "Specified disk not exists in cluster: %s" .name) }}
             {{- end }}
           {{- end }}
-          {{- if or .Values.cloudInit .Values.sshKeys }}
+          {{- if or .Values.cloudInit .Values.sshKeys .Values.netplanDhcp }}
           - name: cloudinitdisk
             disk: {}
           {{- end }}
@@ -113,11 +142,17 @@ spec:
         dataVolume:
           name: vm-disk-{{ .name }}
       {{- end }}
-      {{- if or .Values.cloudInit .Values.sshKeys }}
+      {{- if or .Values.cloudInit .Values.sshKeys .Values.netplanDhcp }}
       - name: cloudinitdisk
         cloudInitNoCloud:
+          {{- if or .Values.cloudInit .Values.sshKeys }}
           secretRef:
             name: {{ include "virtual-machine.fullname" . }}-cloud-init
+          {{- end }}
+          {{- if .Values.netplanDhcp }}
+          networkDataSecretRef:
+            name: {{ include "virtual-machine.fullname" . }}-network-config
+          {{- end }}
       {{- end }}
       networks:
       - name: default
diff --git a/packages/apps/vm-instance/tests/hook_securitycontext_test.yaml b/packages/apps/vm-instance/tests/hook_securitycontext_test.yaml
new file mode 100644
index 0000000000..55cdd379e4
--- /dev/null
+++ b/packages/apps/vm-instance/tests/hook_securitycontext_test.yaml
@@ -0,0 +1,52 @@
+suite: vm-instance update-hook runs non-root
+
+# The update hook only renders when an existing VM/Service needs reconciling
+# (lookup-gated). Mock a Service whose type differs from the desired one
+# (existing LoadBalancer vs desired ClusterIP) to drive the render, then pin
+# the non-root securityContext. Scope to the hook template so the chart's
+# instanceType lookups elsewhere don't need a live cluster.
+release:
+  name: test-vm
+  namespace: tenant-test
+templates:
+  - templates/vm-update-hook.yaml
+set:
+  fullnameOverride: test-vm
+  external: false
+kubernetesProvider:
+  scheme:
+    "v1/Service":
+      gvr:
+        group: ""
+        version: "v1"
+        resource: "services"
+      namespaced: true
+  objects:
+    - kind: Service
+      apiVersion: v1
+      metadata:
+        name: test-vm
+        namespace: tenant-test
+      spec:
+        type: LoadBalancer
+tests:
+  - it: update-hook Job runs under a restrictive non-root securityContext
+    documentSelector:
+      path: kind
+      value: Job
+    asserts:
+      - equal:
+          path: spec.template.spec.securityContext.runAsNonRoot
+          value: true
+      - equal:
+          path: spec.template.spec.securityContext.runAsUser
+          value: 65534
+      - equal:
+          path: spec.template.spec.securityContext.seccompProfile.type
+          value: RuntimeDefault
+      - equal:
+          path: spec.template.spec.containers[0].securityContext.allowPrivilegeEscalation
+          value: false
+      - contains:
+          path: spec.template.spec.containers[0].securityContext.capabilities.drop
+          content: ALL
diff --git a/packages/apps/vm-instance/tests/instancetype_resources_test.yaml b/packages/apps/vm-instance/tests/instancetype_resources_test.yaml
new file mode 100644
index 0000000000..efb646c362
--- /dev/null
+++ b/packages/apps/vm-instance/tests/instancetype_resources_test.yaml
@@ -0,0 +1,506 @@
+suite: vm-instance instance type versus explicit resources
+
+# KubeVirt rejects a VirtualMachine that carries an instancetype matcher and
+# explicit domain sizing at once, so the chart has to pick one. These cases pin
+# which one it picks for every combination of instanceType and resources, plus
+# the update hook that has to strip a matcher left on an existing VM.
+#
+# The chart validates instanceType and instanceProfile against the cluster, and
+# reads the platform-injected _cluster for the Windows node affinity, so every
+# case mocks both.
+
+release:
+  name: test-vm
+  namespace: tenant-test
+
+set:
+  fullnameOverride: test-vm
+  _cluster: {}
+
+kubernetesProvider:
+  scheme:
+    "instancetype.kubevirt.io/v1beta1/VirtualMachineClusterInstancetype":
+      gvr:
+        group: instancetype.kubevirt.io
+        version: v1beta1
+        resource: virtualmachineclusterinstancetypes
+      namespaced: false
+    "instancetype.kubevirt.io/v1beta1/VirtualMachineClusterPreference":
+      gvr:
+        group: instancetype.kubevirt.io
+        version: v1beta1
+        resource: virtualmachineclusterpreferences
+      namespaced: false
+    "kubevirt.io/v1/VirtualMachine":
+      gvr:
+        group: kubevirt.io
+        version: v1
+        resource: virtualmachines
+      namespaced: true
+    "kubeovn.io/v1/IP":
+      gvr:
+        group: kubeovn.io
+        version: v1
+        resource: ips
+      namespaced: false
+  objects:
+    - kind: VirtualMachineClusterInstancetype
+      apiVersion: instancetype.kubevirt.io/v1beta1
+      metadata:
+        name: u1.medium
+    - kind: VirtualMachineClusterPreference
+      apiVersion: instancetype.kubevirt.io/v1beta1
+      metadata:
+        name: ubuntu
+
+tests:
+  - it: sizes the VM by the instance type alone when no resources are given
+    templates:
+      - templates/vm.yaml
+    asserts:
+      - equal:
+          path: spec.instancetype.name
+          value: u1.medium
+      - equal:
+          path: spec.instancetype.kind
+          value: VirtualMachineClusterInstancetype
+      - notExists:
+          path: spec.template.spec.domain.cpu
+      - notExists:
+          path: spec.template.spec.domain.resources
+
+  - it: sizes the VM by resources alone when the instance type is cleared
+    templates:
+      - templates/vm.yaml
+    set:
+      instanceType: ""
+      resources:
+        cpu: 4
+        sockets: 1
+        memory: 8Gi
+    asserts:
+      - notExists:
+          path: spec.instancetype
+      - equal:
+          path: spec.template.spec.domain.cpu.cores
+          value: 4
+      - equal:
+          path: spec.template.spec.domain.cpu.sockets
+          value: 1
+      - equal:
+          path: spec.template.spec.domain.resources.requests.memory
+          value: 8Gi
+
+  # The regression this suite exists for: the dashboard cannot clear
+  # instanceType, so a user who fills cpu/sockets/memory keeps the chart default
+  # alongside them. Complete resources win and the matcher is dropped.
+  - it: drops the matcher when complete resources are set next to an instance type
+    templates:
+      - templates/vm.yaml
+    set:
+      instanceType: u1.medium
+      resources:
+        cpu: 4
+        sockets: 1
+        memory: 8Gi
+    asserts:
+      - notExists:
+          path: spec.instancetype
+      - equal:
+          path: spec.template.spec.domain.cpu.cores
+          value: 4
+      - equal:
+          path: spec.template.spec.domain.cpu.sockets
+          value: 1
+      - equal:
+          path: spec.template.spec.domain.resources.requests.memory
+          value: 8Gi
+
+  - it: refuses an instance type next to a resources block missing cpu and sockets
+    templates:
+      - templates/vm.yaml
+    set:
+      instanceType: u1.medium
+      resources:
+        memory: 8Gi
+    asserts:
+      - failedTemplate:
+          errorMessage: 'instanceType "u1.medium" cannot be combined with a resources block that sizes the VM only in part. Sizing came from resources.memory, but not from resources.cpu, resources.sockets. resources.cpu and resources.sockets size the VM only when both are set to whole numbers. KubeVirt rejects a VirtualMachine that carries an instancetype matcher together with explicit domain cpu or memory, so either give resources.cpu, resources.sockets and resources.memory values that all size the VM, or clear resources.memory and let the instance type size it.'
+
+  - it: refuses an instance type next to a resources block missing only memory
+    templates:
+      - templates/vm.yaml
+    set:
+      instanceType: u1.medium
+      resources:
+        cpu: 4
+        sockets: 1
+    asserts:
+      - failedTemplate:
+          errorMessage: 'instanceType "u1.medium" cannot be combined with a resources block that sizes the VM only in part. Sizing came from resources.cpu, resources.sockets, but not from resources.memory. resources.cpu and resources.sockets size the VM only when both are set to whole numbers. KubeVirt rejects a VirtualMachine that carries an instancetype matcher together with explicit domain cpu or memory, so either give resources.cpu, resources.sockets and resources.memory values that all size the VM, or clear resources.cpu, resources.sockets and let the instance type size it.'
+
+  # The shape the ticket's own workaround section warns about, since sockets is
+  # easy to miss. cpu is set here and is a whole number, so the message must not
+  # imply the value was rejected: it names cpu as unsized and states the pair
+  # rule that explains it, without asserting anything about this input.
+  - it: refuses an instance type next to cpu and memory with no sockets
+    templates:
+      - templates/vm.yaml
+    set:
+      instanceType: u1.medium
+      resources:
+        cpu: 4
+        memory: 8Gi
+    asserts:
+      - failedTemplate:
+          errorMessage: 'instanceType "u1.medium" cannot be combined with a resources block that sizes the VM only in part. Sizing came from resources.memory, but not from resources.cpu, resources.sockets. resources.cpu and resources.sockets size the VM only when both are set to whole numbers. KubeVirt rejects a VirtualMachine that carries an instancetype matcher together with explicit domain cpu or memory, so either give resources.cpu, resources.sockets and resources.memory values that all size the VM, or clear resources.memory and let the instance type size it.'
+
+  # values.schema.json accepts the full Kubernetes quantity grammar for
+  # resources.cpu, but only a whole number can become domain.cpu.cores. A
+  # millicore value is refused before it reaches the instance type decision,
+  # rather than counting as sizing and dropping the matcher.
+  - it: refuses an instance type next to a cpu quantity that is not a core count
+    templates:
+      - templates/vm.yaml
+    set:
+      instanceType: u1.medium
+      resources:
+        cpu: 500m
+        sockets: 1
+        memory: 8Gi
+    asserts:
+      - failedTemplate:
+          errorPattern: '^resources\.cpu \(500m\) must be a positive whole number'
+
+  # domainResources writes domain.cpu only when cpu and sockets arrive together,
+  # so these two shapes emit no override at all and KubeVirt has nothing to
+  # reject. They render today; failing them would stop an existing release from
+  # reconciling over a field that was already being ignored.
+  - it: keeps rendering an instance type beside resources.cpu on its own
+    templates:
+      - templates/vm.yaml
+    set:
+      instanceType: u1.medium
+      resources:
+        cpu: 4
+    asserts:
+      - equal:
+          path: spec.instancetype.name
+          value: u1.medium
+      - notExists:
+          path: spec.template.spec.domain.cpu
+      - notExists:
+          path: spec.template.spec.domain.resources
+
+  - it: keeps rendering an instance type beside resources.sockets on its own
+    templates:
+      - templates/vm.yaml
+    set:
+      instanceType: u1.medium
+      resources:
+        sockets: 1
+    asserts:
+      - equal:
+          path: spec.instancetype.name
+          value: u1.medium
+      - notExists:
+          path: spec.template.spec.domain.cpu
+      - notExists:
+          path: spec.template.spec.domain.resources
+
+  # An explicitly nulled resources block is the shape that separates the two
+  # readings from the other side: .Values.resources is nil, so a raw
+  # .Values.resources.memory read is a nil pointer at render time, while the
+  # emitted object it is read from instead is merely empty.
+  - it: renders an instance type beside an explicitly nulled resources block
+    templates:
+      - templates/vm.yaml
+    values:
+      - ./nulled_resources_values.yaml
+    asserts:
+      - equal:
+          path: spec.instancetype.name
+          value: u1.medium
+      - notExists:
+          path: spec.template.spec.domain.cpu
+      - notExists:
+          path: spec.template.spec.domain.resources
+
+  # cpuModel is the one domain field allowed to sit beside a matcher: KubeVirt
+  # flags domain.cpu.model only when the instance type declares a model too.
+  # No instance type shipped in packages/system/kubevirt-instancetypes declares
+  # one, so the chart does not guard the pair.
+  - it: leaves cpuModel beside an instance type alone
+    templates:
+      - templates/vm.yaml
+    set:
+      instanceType: u1.medium
+      cpuModel: host-passthrough
+    asserts:
+      - equal:
+          path: spec.instancetype.name
+          value: u1.medium
+      - equal:
+          path: spec.template.spec.domain.cpu.model
+          value: host-passthrough
+      - notExists:
+          path: spec.template.spec.domain.cpu.cores
+      - notExists:
+          path: spec.template.spec.domain.resources
+
+  # cpuModel opens domain.cpu on its own, which must not let a lone
+  # resources.cpu slip in as cores: that would be partial sizing again.
+  - it: keeps a lone resources.cpu out of the domain cpu that cpuModel opens
+    templates:
+      - templates/vm.yaml
+    set:
+      instanceType: u1.medium
+      cpuModel: host-passthrough
+      resources:
+        cpu: 4
+    asserts:
+      - equal:
+          path: spec.instancetype.name
+          value: u1.medium
+      - notExists:
+          path: spec.template.spec.domain.cpu.cores
+
+  # The one shape where the emitted domain.cpu carries a key the sizing check
+  # deliberately ignores. cpuModel must not count towards sizing, and must not
+  # stop complete resources from dropping the matcher either.
+  - it: keeps cpuModel while complete resources drop the matcher
+    templates:
+      - templates/vm.yaml
+    set:
+      instanceType: u1.medium
+      cpuModel: host-passthrough
+      resources:
+        cpu: 4
+        sockets: 1
+        memory: 8Gi
+    asserts:
+      - notExists:
+          path: spec.instancetype
+      - equal:
+          path: spec.template.spec.domain.cpu.model
+          value: host-passthrough
+      - equal:
+          path: spec.template.spec.domain.cpu.cores
+          value: 4
+      - equal:
+          path: spec.template.spec.domain.resources.requests.memory
+          value: 8Gi
+
+  # Same class of confusing error as the one this suite fixes: a name the
+  # rendered VM never references must not fail the render.
+  - it: ignores an instance type absent from the cluster once resources size the VM
+    templates:
+      - templates/vm.yaml
+    set:
+      instanceType: u1.deleted
+      resources:
+        cpu: 4
+        sockets: 1
+        memory: 8Gi
+    asserts:
+      - notExists:
+          path: spec.instancetype
+      - equal:
+          path: spec.template.spec.domain.cpu.cores
+          value: 4
+
+  - it: still refuses an instance type absent from the cluster when it sizes the VM
+    templates:
+      - templates/vm.yaml
+    set:
+      instanceType: u1.deleted
+    asserts:
+      - failedTemplate:
+          errorMessage: 'Specified instanceType does not exist in the cluster: u1.deleted'
+
+  # An explicit instanceType: null survives the values merge as a nil, and Go
+  # renders a nil as the literal string "<no value>", which is truthy. Left
+  # unguarded that reaches the existence check as a type name no lookup can
+  # match, and the operator is told to go fix an instance type they never
+  # named. A null has to read as "no instance type" on both paths below.
+  - it: treats a nulled instance type as unset rather than as a name
+    templates:
+      - templates/vm.yaml
+    values:
+      - ./nulled_instancetype_values.yaml
+    asserts:
+      - failedTemplate:
+          errorMessage: 'Either instanceType or resources (cpu, sockets, memory) must be specified'
+
+  # The other way in: partial sizing takes the branch that returns the raw
+  # value too, and with no instance type to size the VM it has to end in the
+  # "Either" check rather than in a lookup of a placeholder name.
+  - it: refuses a nulled instance type beside partial resources without leaking a placeholder name
+    templates:
+      - templates/vm.yaml
+    values:
+      - ./nulled_instancetype_values.yaml
+    set:
+      resources:
+        memory: 8Gi
+    asserts:
+      - failedTemplate:
+          errorMessage: 'Either instanceType or resources (cpu, sockets, memory) must be specified'
+
+  - it: still refuses a partial resources block with no instance type to fall back on
+    templates:
+      - templates/vm.yaml
+    set:
+      instanceType: ""
+      resources:
+        cpu: 4
+    asserts:
+      - failedTemplate:
+          errorMessage: 'Either instanceType or resources (cpu, sockets, memory) must be specified'
+
+  # The hook is what removes an instancetype already stamped on a live VM.
+  # It has to read the same effective value vm.yaml renders, otherwise the
+  # leftover spec.instancetype survives the upgrade and KubeVirt goes on
+  # applying it against the domain resources Helm just wrote.
+  - it: patches the instancetype off a live VM that moved to complete resources
+    templates:
+      - templates/vm-update-hook.yaml
+    set:
+      instanceType: u1.medium
+      resources:
+        cpu: 4
+        sockets: 1
+        memory: 8Gi
+    kubernetesProvider:
+      objects:
+        - kind: VirtualMachine
+          apiVersion: kubevirt.io/v1
+          metadata:
+            name: test-vm
+            namespace: tenant-test
+          spec:
+            instancetype:
+              kind: VirtualMachineClusterInstancetype
+              name: u1.medium
+    documentSelector:
+      path: kind
+      value: Job
+    asserts:
+      - matchRegex:
+          path: spec.template.spec.containers[0].args[0]
+          pattern: '"instancetype":null'
+      - matchRegex:
+          path: spec.template.spec.containers[0].args[0]
+          pattern: '"cores":4'
+      - matchRegex:
+          path: spec.template.spec.containers[0].args[0]
+          pattern: '"memory":"8Gi"'
+
+  # The third branch of the hook's selector, and the upgrade path for any VM
+  # created under the workaround this fixes (explicit instanceType "" plus
+  # resources): the moment a dashboard edit drops the empty string, the chart
+  # default is back. The hook used to wipe the domain sizing and stamp the
+  # matcher on, and Helm's three-way merge keeps the live spec.instancetype
+  # because it is in neither the old nor the new manifest, so the VM would end
+  # up conflicted again.
+  #
+  # The mocked object body carries no integers on purpose: apimachinery's
+  # DeepCopyJSONValue accepts only string, int64, bool, float64 and nil, YAML
+  # integers decode to Go int, and the resulting "cannot deep copy int" is
+  # reported against whichever lookup runs next rather than against the mock.
+  - it: leaves a resource-sized VM alone instead of stamping the instance type back on
+    templates:
+      - templates/vm-update-hook.yaml
+    set:
+      instanceType: u1.medium
+      resources:
+        cpu: 4
+        sockets: 1
+        memory: 8Gi
+    kubernetesProvider:
+      objects:
+        - kind: VirtualMachine
+          apiVersion: kubevirt.io/v1
+          metadata:
+            name: test-vm
+            namespace: tenant-test
+          spec:
+            runStrategy: Always
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  # The same hook branch in the other direction: a resource-sized VM going back
+  # to instancetype sizing still has to have its domain cpu and resources
+  # nulled, or KubeVirt sees the matcher and the old explicit sizing together.
+  - it: strips the domain sizing off a live VM that moved back to an instance type
+    templates:
+      - templates/vm-update-hook.yaml
+    set:
+      instanceType: u1.medium
+    kubernetesProvider:
+      objects:
+        - kind: VirtualMachine
+          apiVersion: kubevirt.io/v1
+          metadata:
+            name: test-vm
+            namespace: tenant-test
+          spec:
+            runStrategy: Always
+    documentSelector:
+      path: kind
+      value: Job
+    asserts:
+      - matchRegex:
+          path: spec.template.spec.containers[0].args[0]
+          pattern: '"instancetype":\{"name":"u1.medium"'
+      - matchRegex:
+          path: spec.template.spec.containers[0].args[0]
+          pattern: '"cpu":null,"resources":null'
+
+  - it: renames the instance type on a live VM that already carries a different one
+    templates:
+      - templates/vm-update-hook.yaml
+    set:
+      instanceType: u1.medium
+    kubernetesProvider:
+      objects:
+        - kind: VirtualMachine
+          apiVersion: kubevirt.io/v1
+          metadata:
+            name: test-vm
+            namespace: tenant-test
+          spec:
+            instancetype:
+              kind: VirtualMachineClusterInstancetype
+              name: u1.small
+    documentSelector:
+      path: kind
+      value: Job
+    asserts:
+      - matchRegex:
+          path: spec.template.spec.containers[0].args[0]
+          pattern: 'Patching VirtualMachine for instancetype update'
+      - matchRegex:
+          path: spec.template.spec.containers[0].args[0]
+          pattern: '"name": "u1.medium", "revisionName": null'
+
+  - it: leaves a live VM alone when its instance type still sizes it
+    templates:
+      - templates/vm-update-hook.yaml
+    set:
+      instanceType: u1.medium
+    kubernetesProvider:
+      objects:
+        - kind: VirtualMachine
+          apiVersion: kubevirt.io/v1
+          metadata:
+            name: test-vm
+            namespace: tenant-test
+          spec:
+            instancetype:
+              kind: VirtualMachineClusterInstancetype
+              name: u1.medium
+    asserts:
+      - hasDocuments:
+          count: 0
diff --git a/packages/apps/vm-instance/tests/kubeovn_capability_test.yaml b/packages/apps/vm-instance/tests/kubeovn_capability_test.yaml
new file mode 100644
index 0000000000..c2d9e63edd
--- /dev/null
+++ b/packages/apps/vm-instance/tests/kubeovn_capability_test.yaml
@@ -0,0 +1,61 @@
+suite: vm-instance Kube-OVN IP pinning follows API discovery
+
+# On a live cluster Helm's `lookup` propagates the discovery error when the
+# requested API group is not served, so the chart could not render at all
+# without the Kube-OVN CRDs. helm-unittest's fake lookup never errors: it just
+# returns nothing for an unserved kind, so an IP object is mocked here to pin
+# both sides. With the API advertised the annotations must carry the mocked
+# values; with the API absent they must be missing even though the object
+# exists, which is the branch the discovery guard adds.
+release:
+  name: test-vm
+  namespace: tenant-test
+templates:
+  - templates/vm.yaml
+set:
+  fullnameOverride: test-vm
+  instanceType: ""
+  instanceProfile: ""
+  resources:
+    cpu: 1
+    sockets: 1
+    memory: 1Gi
+  _cluster:
+    scheduling:
+      dedicatedNodesForWindowsVMs: "false"
+kubernetesProvider:
+  scheme:
+    "kubeovn.io/v1/IP":
+      gvr:
+        group: kubeovn.io
+        version: v1
+        resource: ips
+      namespaced: false
+  objects:
+    - apiVersion: kubeovn.io/v1
+      kind: IP
+      metadata:
+        name: test-vm.tenant-test
+      spec:
+        macAddress: "00:00:5E:00:53:01"
+        ipAddress: "192.0.2.10"
+tests:
+  - it: pins the Kube-OVN IP and MAC when the IP API is served
+    capabilities:
+      apiVersions:
+        - kubeovn.io/v1/IP
+    asserts:
+      - equal:
+          path: spec.template.metadata.annotations["ovn.kubernetes.io/mac_address"]
+          value: "00:00:5E:00:53:01"
+      - equal:
+          path: spec.template.metadata.annotations["ovn.kubernetes.io/ip_address"]
+          value: "192.0.2.10"
+  - it: skips the lookup when the IP API is not served, even if an IP object exists
+    capabilities:
+      apiVersions: []
+    asserts:
+      - notExists:
+          path: spec.template.metadata.annotations["ovn.kubernetes.io/mac_address"]
+      - notExists:
+          path: spec.template.metadata.annotations["ovn.kubernetes.io/ip_address"]
diff --git a/packages/apps/vm-instance/tests/network_data_test.yaml b/packages/apps/vm-instance/tests/network_data_test.yaml
new file mode 100644
index 0000000000..721f7db59a
--- /dev/null
+++ b/packages/apps/vm-instance/tests/network_data_test.yaml
@@ -0,0 +1,137 @@
+suite: vm-instance cloud-init network-data for netplan guests (netplanDhcp)
+
+# A netplan guest configures only the interface cloud-init's fallback covers and
+# keeps none of the DHCP-supplied search domains, so the assertions below are on
+# the two properties that change that: every ethernet asks for DHCP, and the
+# link keeps the domains it is offered. Naming an interface instead of matching
+# a glob would satisfy a field assertion and still leave a guest whose NICs
+# enumerate differently unconfigured, which is why the match stanza is asserted
+# rather than the presence of the key.
+release:
+  name: test-vm
+  namespace: tenant-test
+templates:
+  - templates/vm.yaml
+  - templates/secret-network-config.yaml
+set:
+  fullnameOverride: test-vm
+  instanceType: ""
+  resources:
+    cpu: 1
+    sockets: 1
+    memory: 1Gi
+  _cluster:
+    scheduling:
+      dedicatedNodesForWindowsVMs: "false"
+kubernetesProvider:
+  scheme:
+    "instancetype.kubevirt.io/v1beta1/VirtualMachineClusterPreference":
+      gvr:
+        group: instancetype.kubevirt.io
+        version: v1beta1
+        resource: virtualmachineclusterpreferences
+      namespaced: false
+  objects:
+    - apiVersion: instancetype.kubevirt.io/v1beta1
+      kind: VirtualMachineClusterPreference
+      metadata:
+        name: ubuntu
+    - apiVersion: instancetype.kubevirt.io/v1beta1
+      kind: VirtualMachineClusterPreference
+      metadata:
+        name: rhel.9
+tests:
+  - it: gives every ethernet DHCP and keeps the offered search domains
+    set:
+      netplanDhcp: true
+    asserts:
+      - template: templates/secret-network-config.yaml
+        equal:
+          path: stringData.networkdata
+          value: |
+            network:
+              version: 2
+              ethernets:
+                cozy-en:
+                  match:
+                    name: "en*"
+                  dhcp4: true
+                  dhcp4-overrides:
+                    use-domains: true
+                cozy-eth:
+                  match:
+                    name: "eth*"
+                  dhcp4: true
+                  dhcp4-overrides:
+                    use-domains: true
+
+  - it: attaches the network-data to the VM even when no user-data is requested
+    set:
+      netplanDhcp: true
+    asserts:
+      - template: templates/vm.yaml
+        equal:
+          path: spec.template.spec.volumes[?(@.name=="cloudinitdisk")].cloudInitNoCloud.networkDataSecretRef.name
+          value: test-vm-network-config
+      - template: templates/vm.yaml
+        notExists:
+          path: spec.template.spec.volumes[?(@.name=="cloudinitdisk")].cloudInitNoCloud.secretRef
+      - template: templates/vm.yaml
+        equal:
+          path: spec.template.spec.domain.devices.disks[?(@.name=="cloudinitdisk")].disk
+          value: {}
+
+  - it: carries user-data and network-data side by side
+    set:
+      netplanDhcp: true
+      cloudInit: |
+        #cloud-config
+        packages:
+          - htop
+    asserts:
+      - template: templates/vm.yaml
+        equal:
+          path: spec.template.spec.volumes[?(@.name=="cloudinitdisk")].cloudInitNoCloud.secretRef.name
+          value: test-vm-cloud-init
+      - template: templates/vm.yaml
+        equal:
+          path: spec.template.spec.volumes[?(@.name=="cloudinitdisk")].cloudInitNoCloud.networkDataSecretRef.name
+          value: test-vm-network-config
+
+  # The default instanceProfile is ubuntu whatever image the disk holds, and a
+  # cloud-init disk appearing on a VM that never had one makes the guest's next
+  # boot a first boot, so a VM that leaves the key alone must render exactly as
+  # before: no network-data and no cloud-init disk.
+  - it: leaves a VM on the default profile without network-data or a cloud-init disk
+    asserts:
+      - template: templates/secret-network-config.yaml
+        hasDocuments:
+          count: 0
+      - template: templates/vm.yaml
+        notExists:
+          path: spec.template.spec.volumes[?(@.name=="cloudinitdisk")]
+      - template: templates/vm.yaml
+        notExists:
+          path: spec.template.spec.domain.devices.disks[?(@.name=="cloudinitdisk")]
+
+  - it: keeps user-data alone when the key is off
+    set:
+      cloudInit: |
+        #cloud-config
+    asserts:
+      - template: templates/vm.yaml
+        equal:
+          path: spec.template.spec.volumes[?(@.name=="cloudinitdisk")].cloudInitNoCloud.secretRef.name
+          value: test-vm-cloud-init
+      - template: templates/vm.yaml
+        notExists:
+          path: spec.template.spec.volumes[?(@.name=="cloudinitdisk")].cloudInitNoCloud.networkDataSecretRef
+
+  - it: follows the key rather than the instance profile
+    set:
+      instanceProfile: rhel.9
+      netplanDhcp: true
+    asserts:
+      - template: templates/secret-network-config.yaml
+        hasDocuments:
+          count: 1
diff --git a/packages/apps/vm-instance/tests/nulled_instancetype_values.yaml b/packages/apps/vm-instance/tests/nulled_instancetype_values.yaml
new file mode 100644
index 0000000000..85730c9858
--- /dev/null
+++ b/packages/apps/vm-instance/tests/nulled_instancetype_values.yaml
@@ -0,0 +1,7 @@
+# Fixture, not a suite: helm-unittest only collects tests/*_test.yaml.
+#
+# An explicit null is the one way a user can take instanceType away, and it
+# cannot be expressed through a suite's `set` block, where a null value and an
+# omitted key are indistinguishable. A values file keeps the null intact
+# through the merge, which is the state that used to render as <no value>.
+instanceType: null
diff --git a/packages/apps/vm-instance/tests/nulled_resources_values.yaml b/packages/apps/vm-instance/tests/nulled_resources_values.yaml
new file mode 100644
index 0000000000..0bd61ea266
--- /dev/null
+++ b/packages/apps/vm-instance/tests/nulled_resources_values.yaml
@@ -0,0 +1,10 @@
+# Fixture, not a suite: helm-unittest only collects tests/*_test.yaml.
+#
+# Helm coalescing drops a key the user nulls outright, so .Values.resources is
+# nil here rather than the chart's {} default, and a suite's `set` block cannot
+# express that. Every read of the block has to survive the nil: domainResources
+# defaults it to an empty dict, the "Either instanceType or resources" check
+# guards it with an `and`, and the completeness read digs into emitted JSON that
+# is empty rather than absent.
+instanceType: u1.medium
+resources: null
diff --git a/packages/apps/vm-instance/tests/resources_values_test.yaml b/packages/apps/vm-instance/tests/resources_values_test.yaml
new file mode 100644
index 0000000000..13fdd27dc6
--- /dev/null
+++ b/packages/apps/vm-instance/tests/resources_values_test.yaml
@@ -0,0 +1,441 @@
+suite: vm-instance resources values
+
+# resources.cpu and resources.sockets are typed as quantities, but they land in
+# domain.cpu.cores and domain.cpu.sockets, which KubeVirt declares as uint32.
+# Only a whole number has a meaning there, so anything else has to stop the
+# render rather than truncate to 0 and leave KubeVirt to boot one core. Memory
+# is a quantity on the KubeVirt side too, but KubeVirt admission refuses a
+# non-zero amount below 1M and a zero or negative amount sizes nothing, so
+# both stop the render as well.
+
+templates:
+  - templates/vm.yaml
+release:
+  name: test-vm
+  namespace: tenant-test
+set:
+  fullnameOverride: test-vm
+  _cluster: {}
+  instanceType: ""
+  instanceProfile: ""
+tests:
+  - it: renders a quoted whole cpu as an integer core count
+    set:
+      resources:
+        cpu: "2"
+        sockets: 1
+        memory: 8Gi
+    asserts:
+      - equal:
+          path: spec.template.spec.domain.cpu.cores
+          value: 2
+
+  - it: renders an unquoted integer cpu as the same core count
+    set:
+      resources:
+        cpu: 4
+        sockets: 1
+        memory: 8Gi
+    asserts:
+      - equal:
+          path: spec.template.spec.domain.cpu.cores
+          value: 4
+
+  - it: renders a whole float cpu as an integer core count
+    set:
+      resources:
+        cpu: 2.0
+        sockets: 1
+        memory: 8Gi
+    asserts:
+      - equal:
+          path: spec.template.spec.domain.cpu.cores
+          value: 2
+
+  - it: renders a quoted whole decimal cpu as the same core count
+    set:
+      resources:
+        cpu: "2.0"
+        sockets: 1
+        memory: 8Gi
+    asserts:
+      - equal:
+          path: spec.template.spec.domain.cpu.cores
+          value: 2
+
+  - it: renders an explicit plus sign on cpu as the same core count
+    set:
+      resources:
+        cpu: "+2"
+        sockets: 1
+        memory: 8Gi
+    asserts:
+      - equal:
+          path: spec.template.spec.domain.cpu.cores
+          value: 2
+
+  - it: renders an exponent spelling of cpu as the core count it decodes to
+    set:
+      resources:
+        cpu: "1e1"
+        sockets: 1
+        memory: 8Gi
+    asserts:
+      - equal:
+          path: spec.template.spec.domain.cpu.cores
+          value: 10
+
+  - it: renders a trailing-dot spelling of cpu as the core count it decodes to
+    set:
+      resources:
+        cpu: "2."
+        sockets: 1
+        memory: 8Gi
+    asserts:
+      - equal:
+          path: spec.template.spec.domain.cpu.cores
+          value: 2
+
+  - it: refuses a millicore cpu instead of truncating it to no cores
+    set:
+      resources:
+        cpu: 500m
+        sockets: 1
+        memory: 8Gi
+    asserts:
+      - failedTemplate:
+          errorPattern: '^resources\.cpu \(500m\) must be a positive whole number, such as 2\. It becomes the VM''s domain\.cpu\.cores,'
+
+  - it: refuses a millicore spelling of whole cores
+    set:
+      resources:
+        cpu: 2000m
+        sockets: 1
+        memory: 8Gi
+    asserts:
+      - failedTemplate:
+          errorPattern: '^resources\.cpu \(2000m\) must be a positive whole number, such as 2\. It becomes the VM''s domain\.cpu\.cores,'
+
+  - it: refuses a fractional cpu
+    set:
+      resources:
+        cpu: "1.5"
+        sockets: 1
+        memory: 8Gi
+    asserts:
+      - failedTemplate:
+          errorPattern: '^resources\.cpu \(1\.5\) must be a positive whole number, such as 2\. It becomes the VM''s domain\.cpu\.cores,'
+
+  - it: refuses an unquoted zero cpu instead of treating it as unset
+    set:
+      resources:
+        cpu: 0
+        sockets: 1
+        memory: 8Gi
+    asserts:
+      - failedTemplate:
+          errorPattern: '^resources\.cpu \(read as 0\) must be a positive whole number, such as 2\. It becomes the VM''s domain\.cpu\.cores,'
+
+  - it: refuses a quoted zero cpu
+    set:
+      resources:
+        cpu: "0"
+        sockets: 1
+        memory: 8Gi
+    asserts:
+      - failedTemplate:
+          errorPattern: '^resources\.cpu \(0\) must be a positive whole number, such as 2\. It becomes the VM''s domain\.cpu\.cores,'
+
+  - it: refuses a negative cpu
+    set:
+      resources:
+        cpu: "-2"
+        sockets: 1
+        memory: 8Gi
+    asserts:
+      - failedTemplate:
+          errorPattern: '^resources\.cpu \(-2\) must be a positive whole number, such as 2\. It becomes the VM''s domain\.cpu\.cores,'
+
+  - it: refuses a cpu with a leading zero, which YAML reads as octal
+    set:
+      resources:
+        cpu: "010"
+        sockets: 1
+        memory: 8Gi
+    asserts:
+      - failedTemplate:
+          errorPattern: '^resources\.cpu \(010\) must be a positive whole number, such as 2\. It becomes the VM''s domain\.cpu\.cores,'
+
+  - it: renders the largest cpu that fits in uint32
+    set:
+      resources:
+        cpu: "4294967295"
+        sockets: 1
+        memory: 8Gi
+    asserts:
+      - equal:
+          path: spec.template.spec.domain.cpu.cores
+          value: 4294967295
+
+  - it: refuses a cpu past the uint32 range
+    set:
+      resources:
+        cpu: "4294967296"
+        sockets: 1
+        memory: 8Gi
+    asserts:
+      - failedTemplate:
+          errorPattern: '^resources\.cpu \(4294967296\) must be a positive whole number, such as 2\. It becomes the VM''s domain\.cpu\.cores,'
+
+  - it: renders a quoted whole sockets as an integer socket count
+    set:
+      resources:
+        cpu: 4
+        sockets: "2"
+        memory: 8Gi
+    asserts:
+      - equal:
+          path: spec.template.spec.domain.cpu.sockets
+          value: 2
+
+  - it: renders a whole float sockets as an integer socket count
+    set:
+      resources:
+        cpu: 4
+        sockets: 2.0
+        memory: 8Gi
+    asserts:
+      - equal:
+          path: spec.template.spec.domain.cpu.sockets
+          value: 2
+
+  - it: refuses a millicore sockets instead of truncating it to none
+    set:
+      resources:
+        cpu: 4
+        sockets: 500m
+        memory: 8Gi
+    asserts:
+      - failedTemplate:
+          errorPattern: '^resources\.sockets \(500m\) must be a positive whole number, such as 2\. It becomes the VM''s domain\.cpu\.sockets,'
+
+  - it: refuses a fractional sockets
+    set:
+      resources:
+        cpu: 4
+        sockets: "1.5"
+        memory: 8Gi
+    asserts:
+      - failedTemplate:
+          errorPattern: '^resources\.sockets \(1\.5\) must be a positive whole number, such as 2\. It becomes the VM''s domain\.cpu\.sockets,'
+
+  - it: refuses an unquoted zero sockets
+    set:
+      resources:
+        cpu: 4
+        sockets: 0
+        memory: 8Gi
+    asserts:
+      - failedTemplate:
+          errorPattern: '^resources\.sockets \(read as 0\) must be a positive whole number, such as 2\. It becomes the VM''s domain\.cpu\.sockets,'
+
+  - it: refuses a sockets with a leading zero
+    set:
+      resources:
+        cpu: 4
+        sockets: "010"
+        memory: 8Gi
+    asserts:
+      - failedTemplate:
+          errorPattern: '^resources\.sockets \(010\) must be a positive whole number, such as 2\. It becomes the VM''s domain\.cpu\.sockets,'
+
+  - it: refuses a negative sockets
+    set:
+      resources:
+        cpu: 4
+        sockets: "-2"
+        memory: 8Gi
+    asserts:
+      - failedTemplate:
+          errorPattern: '^resources\.sockets \(-2\) must be a positive whole number, such as 2\. It becomes the VM''s domain\.cpu\.sockets,'
+
+  - it: refuses a sockets past the uint32 range
+    set:
+      resources:
+        cpu: 4
+        sockets: "4294967296"
+        memory: 8Gi
+    asserts:
+      - failedTemplate:
+          errorPattern: '^resources\.sockets \(4294967296\) must be a positive whole number, such as 2\. It becomes the VM''s domain\.cpu\.sockets,'
+
+  - it: refuses a suffixed cpu even when it is a whole count
+    set:
+      resources:
+        cpu: 1k
+        sockets: 1
+        memory: 8Gi
+    asserts:
+      - failedTemplate:
+          errorPattern: '^resources\.cpu \(1k\) must be a positive whole number, such as 2\. It becomes the VM''s domain\.cpu\.cores,'
+
+  - it: passes a binary-suffixed memory through unchanged
+    set:
+      resources:
+        cpu: 4
+        sockets: 1
+        memory: 8Gi
+    asserts:
+      - equal:
+          path: spec.template.spec.domain.resources.requests.memory
+          value: 8Gi
+
+  - it: passes a fractional memory quantity through unchanged
+    set:
+      resources:
+        cpu: 4
+        sockets: 1
+        memory: 1.5Gi
+    asserts:
+      - equal:
+          path: spec.template.spec.domain.resources.requests.memory
+          value: 1.5Gi
+
+  - it: passes an unquoted byte count through unchanged
+    set:
+      resources:
+        cpu: 4
+        sockets: 1
+        memory: 8589934592
+    asserts:
+      - equal:
+          path: spec.template.spec.domain.resources.requests.memory
+          value: 8589934592
+
+  - it: refuses a quoted zero memory instead of requesting none
+    set:
+      resources:
+        cpu: 4
+        sockets: 1
+        memory: "0"
+    asserts:
+      - failedTemplate:
+          errorPattern: '^resources\.memory \(0\) must be at least 1M'
+
+  - it: refuses an unquoted zero memory instead of treating it as unset
+    set:
+      resources:
+        cpu: 4
+        sockets: 1
+        memory: 0
+    asserts:
+      - failedTemplate:
+          errorPattern: '^resources\.memory \(read as 0\) must be at least 1M'
+
+  - it: refuses a zero memory written with a suffix
+    set:
+      resources:
+        cpu: 4
+        sockets: 1
+        memory: 0Gi
+    asserts:
+      - failedTemplate:
+          errorPattern: '^resources\.memory \(0Gi\) must be at least 1M'
+
+  - it: refuses a negative memory
+    set:
+      resources:
+        cpu: 4
+        sockets: 1
+        memory: "-1Gi"
+    asserts:
+      - failedTemplate:
+          errorPattern: '^resources\.memory \(-1Gi\) must be at least 1M'
+
+  - it: refuses a millibyte memory that KubeVirt admission would refuse
+    set:
+      resources:
+        cpu: 4
+        sockets: 1
+        memory: 500m
+    asserts:
+      - failedTemplate:
+          errorPattern: '^resources\.memory \(500m\) must be at least 1M, such as 8Gi\. KubeVirt refuses a non-zero amount below 1M,'
+
+  - it: refuses a binary-suffixed memory below 1M
+    set:
+      resources:
+        cpu: 4
+        sockets: 1
+        memory: 976Ki
+    asserts:
+      - failedTemplate:
+          errorPattern: '^resources\.memory \(976Ki\) must be at least 1M'
+
+  - it: refuses an unquoted byte count one below 1M
+    set:
+      resources:
+        cpu: 4
+        sockets: 1
+        memory: 999999
+    asserts:
+      - failedTemplate:
+          errorPattern: '^resources\.memory \(read as 999999\) must be at least 1M'
+
+  - it: renders memory of exactly 1M
+    set:
+      resources:
+        cpu: 4
+        sockets: 1
+        memory: 1M
+    asserts:
+      - equal:
+          path: spec.template.spec.domain.resources.requests.memory
+          value: 1M
+
+  - it: renders a binary-suffixed memory of exactly 1M
+    set:
+      resources:
+        cpu: 4
+        sockets: 1
+        memory: 976.5625Ki
+    asserts:
+      - equal:
+          path: spec.template.spec.domain.resources.requests.memory
+          value: 976.5625Ki
+
+  - it: renders an unquoted byte count of exactly 1M
+    set:
+      resources:
+        cpu: 4
+        sockets: 1
+        memory: 1000000
+    asserts:
+      - equal:
+          path: spec.template.spec.domain.resources.requests.memory
+          value: 1000000
+
+  # An unquoted number reaches the chart already decoded, so its spelling is
+  # gone. The error says so, and prints the number in plain digits rather than
+  # the exponent form a large float formats to.
+  - it: prints a large unquoted cpu in plain digits
+    set:
+      resources:
+        cpu: 4294967296
+        sockets: 1
+        memory: 8Gi
+    asserts:
+      - failedTemplate:
+          errorPattern: '^resources\.cpu \(read as 4294967296\) must be a positive whole number'
+
+  # A cpu or sockets on its own emits no domain.cpu, so beside an instance type
+  # it used to be ignored whatever it held. A value that cannot be a count is
+  # refused there as well, before it can wait for the day sockets is filled in.
+  - it: refuses a millicore cpu on its own beside an instance type
+    set:
+      instanceType: u1.medium
+      resources:
+        cpu: 500m
+    asserts:
+      - failedTemplate:
+          errorPattern: '^resources\.cpu \(500m\) must be a positive whole number'
diff --git a/packages/apps/vm-instance/values.schema.json b/packages/apps/vm-instance/values.schema.json
index d14100999e..7c24a9e521 100644
--- a/packages/apps/vm-instance/values.schema.json
+++ b/packages/apps/vm-instance/values.schema.json
@@ -44,76 +44,20 @@
       ]
     },
     "instanceType": {
-      "description": "Virtual Machine instance type.",
+      "description": "Virtual Machine instance type. Ignored when `resources` sizes the VM, which needs whole-number cpu and sockets plus memory; the whole type is dropped then, so any dedicated CPU placement, hugepages, NUMA or realtime settings it carries go with it. While this field is set, a `resources` block that sizes only part of the VM is rejected outright instead of ignored, so complete it or clear it.",
       "type": "string",
-      "default": "u1.medium"
+      "default": "u1.medium",
+      "x-cozystack-options": {
+        "source": "instancetype"
+      }
     },
     "instanceProfile": {
       "description": "Virtual Machine preferences profile.",
       "type": "string",
       "default": "ubuntu",
-      "enum": [
-        "alpine",
-        "centos.7",
-        "centos.7.desktop",
-        "centos.stream10",
-        "centos.stream10.desktop",
-        "centos.stream8",
-        "centos.stream8.desktop",
-        "centos.stream8.dpdk",
-        "centos.stream9",
-        "centos.stream9.desktop",
-        "centos.stream9.dpdk",
-        "cirros",
-        "debian",
-        "fedora",
-        "fedora.arm64",
-        "fedora.s390x",
-        "legacy",
-        "linux",
-        "linux.efi",
-        "linux.virtiotransitional",
-        "opensuse.leap",
-        "opensuse.tumbleweed",
-        "oraclelinux",
-        "rhel.10",
-        "rhel.10.arm64",
-        "rhel.10.s390x",
-        "rhel.7",
-        "rhel.7.desktop",
-        "rhel.8",
-        "rhel.8.desktop",
-        "rhel.8.dpdk",
-        "rhel.9",
-        "rhel.9.arm64",
-        "rhel.9.desktop",
-        "rhel.9.dpdk",
-        "rhel.9.realtime",
-        "rhel.9.s390x",
-        "sles",
-        "ubuntu",
-        "windows.10",
-        "windows.10.virtio",
-        "windows.11",
-        "windows.11.virtio",
-        "windows.2k12",
-        "windows.2k12.virtio",
-        "windows.2k16",
-        "windows.2k16.virtio",
-        "windows.2k19",
-        "windows.2k19.virtio",
-        "windows.2k22",
-        "windows.2k22.virtio",
-        "windows.2k25",
-        "windows.2k25.virtio",
-        "windows.2k3",
-        "windows.2k8",
-        "windows.2k8.virtio",
-        "windows.7",
-        "windows.7.virtio",
-        "windows.xp",
-        ""
-      ]
+      "x-cozystack-options": {
+        "source": "instanceprofile"
+      }
     },
     "disks": {
       "description": "List of disks to attach.",
@@ -131,7 +75,10 @@
           },
           "name": {
             "description": "Disk name.",
-            "type": "string"
+            "type": "string",
+            "x-cozystack-options": {
+              "source": "vmdisk"
+            }
           }
         }
       }
@@ -145,7 +92,10 @@
         "properties": {
           "name": {
             "description": "Network attachment name.",
-            "type": "string"
+            "type": "string",
+            "x-cozystack-options": {
+              "source": "network"
+            }
           }
         }
       }
@@ -159,7 +109,10 @@
         "properties": {
           "name": {
             "description": "Network attachment name.",
-            "type": "string"
+            "type": "string",
+            "x-cozystack-options": {
+              "source": "network"
+            }
           }
         }
       }
@@ -176,7 +129,10 @@
         "properties": {
           "name": {
             "description": "The name of the GPU resource to attach.",
-            "type": "string"
+            "type": "string",
+            "x-cozystack-options": {
+              "source": "gpu"
+            }
           }
         }
       }
@@ -186,13 +142,32 @@
       "type": "string",
       "default": ""
     },
+    "firmware": {
+      "description": "Firmware and boot configuration (UEFI/BIOS selection, Secure Boot, persistent EFI NVRAM).",
+      "type": "object",
+      "default": {},
+      "properties": {
+        "bootloader": {
+          "description": "Bootloader to boot the VM with: \"uefi\" (OVMF) or \"bios\" (SeaBIOS). Empty inherits the instanceProfile default.",
+          "type": "string"
+        },
+        "efiPersistent": {
+          "description": "Persist EFI NVRAM (e.g. enrolled Secure Boot keys, such as an updated Microsoft UEFI CA) across reboots. Only applies when bootloader is \"uefi\".",
+          "type": "boolean"
+        },
+        "secureBoot": {
+          "description": "Enable UEFI Secure Boot. Only applies when bootloader is \"uefi\".",
+          "type": "boolean"
+        }
+      }
+    },
     "resources": {
-      "description": "Resource configuration for the virtual machine.",
+      "description": "Resource configuration for the virtual machine. Set whole-number cpu and sockets together with memory to size the VM directly, which overrides `instanceType`. Alongside an `instanceType`, a block that sizes only part of the VM is rejected; a whole-number cpu or sockets on its own sizes nothing and is ignored.",
       "type": "object",
       "default": {},
       "properties": {
         "cpu": {
-          "description": "Number of CPU cores allocated.",
+          "description": "Number of CPU cores allocated, as a positive whole number such as `2`. Millicore or other unit-suffixed, fractional, zero, negative, above 4294967295 and quoted leading-zero values are rejected at render time, because the value becomes the VM's unsigned integer `domain.cpu.cores`.",
           "pattern": "^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$",
           "anyOf": [
             {
@@ -205,7 +180,7 @@
           "x-kubernetes-int-or-string": true
         },
         "memory": {
-          "description": "Amount of memory allocated.",
+          "description": "Amount of memory allocated, as a quantity of at least `1M` such as `8Gi`. Less than 1M is rejected at render time, because KubeVirt refuses a non-zero amount below 1M and a zero or negative amount sizes nothing.",
           "pattern": "^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$",
           "anyOf": [
             {
@@ -218,7 +193,7 @@
           "x-kubernetes-int-or-string": true
         },
         "sockets": {
-          "description": "Number of CPU sockets (vCPU topology).",
+          "description": "Number of CPU sockets (vCPU topology), as a positive whole number such as `1`. Millicore or other unit-suffixed, fractional, zero, negative, above 4294967295 and quoted leading-zero values are rejected at render time, because the value becomes the VM's unsigned integer `domain.cpu.sockets`.",
           "pattern": "^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$",
           "anyOf": [
             {
@@ -245,6 +220,11 @@
       "type": "string",
       "default": ""
     },
+    "netplanDhcp": {
+      "description": "Supply cloud-init network-data that requests DHCP on every `en*` and `eth*` interface and keeps the DNS search domains DHCP offers. Needed for a netplan guest (Ubuntu, Debian) to address a secondary network such as a VPC subnet. Leave it off for a guest rendered by anything other than netplan, which would lose DHCP on every interface, and for a guest that configures an interface statically through netplan, which this configuration would shadow. Turning it on for a VM that has neither `cloudInit` nor `sshKeys` adds a cloud-init disk, and the guest's next boot is then treated as a first boot.",
+      "type": "boolean",
+      "default": false
+    },
     "cloudInitSeed": {
       "description": "Seed string to generate SMBIOS UUID for the VM.",
       "type": "string",
diff --git a/packages/apps/vm-instance/values.yaml b/packages/apps/vm-instance/values.yaml
index 92e399c254..88fc6f8dd1 100644
--- a/packages/apps/vm-instance/values.yaml
+++ b/packages/apps/vm-instance/values.yaml
@@ -8,18 +8,26 @@
 
 ## @typedef {struct} Disk - Disk configuration.
 ## @field {string} name - Disk name.
+## @x-cozystack-options {source: vmdisk}
 ## @field {string} [bus] - Disk bus type (e.g. "sata").
 
 ## @typedef {struct} Network - Network to attach the VM to.
 ## @field {string} [name] - Network attachment name.
+## @x-cozystack-options {source: network}
 
 ## @typedef {struct} GPU - GPU device configuration.
 ## @field {string} name - The name of the GPU resource to attach.
+## @x-cozystack-options {source: gpu}
 
 ## @typedef {struct} Resources - Resource configuration for the virtual machine.
-## @field {quantity} [cpu] - Number of CPU cores allocated.
-## @field {quantity} [memory] - Amount of memory allocated.
-## @field {quantity} [sockets] - Number of CPU sockets (vCPU topology).
+## @field {quantity} [cpu] - Number of CPU cores allocated, as a positive whole number such as `2`. Millicore or other unit-suffixed, fractional, zero, negative, above 4294967295 and quoted leading-zero values are rejected at render time, because the value becomes the VM's unsigned integer `domain.cpu.cores`.
+## @field {quantity} [memory] - Amount of memory allocated, as a quantity of at least `1M` such as `8Gi`. Less than 1M is rejected at render time, because KubeVirt refuses a non-zero amount below 1M and a zero or negative amount sizes nothing.
+## @field {quantity} [sockets] - Number of CPU sockets (vCPU topology), as a positive whole number such as `1`. Millicore or other unit-suffixed, fractional, zero, negative, above 4294967295 and quoted leading-zero values are rejected at render time, because the value becomes the VM's unsigned integer `domain.cpu.sockets`.
+
+## @typedef {struct} Firmware - Firmware and boot configuration. When left empty, the boot mode is inherited from the instanceProfile.
+## @field {string} [bootloader] - Bootloader to boot the VM with: "uefi" (OVMF) or "bios" (SeaBIOS). Empty inherits the instanceProfile default.
+## @field {bool} [secureBoot] - Enable UEFI Secure Boot. Only applies when bootloader is "uefi".
+## @field {bool} [efiPersistent] - Persist EFI NVRAM (e.g. enrolled Secure Boot keys, such as an updated Microsoft UEFI CA) across reboots. Only applies when bootloader is "uefi".
 
 ## @param {bool} external - Enable external access from outside the cluster.
 external: false
@@ -44,10 +52,12 @@ externalAllowICMP: true
 ## @param {RunStrategy} runStrategy - Requested running state of the VirtualMachineInstance
 runStrategy: Always
 
-## @param {string} instanceType - Virtual Machine instance type.
+## @param {string} instanceType - Virtual Machine instance type. Ignored when `resources` sizes the VM, which needs whole-number cpu and sockets plus memory; the whole type is dropped then, so any dedicated CPU placement, hugepages, NUMA or realtime settings it carries go with it. While this field is set, a `resources` block that sizes only part of the VM is rejected outright instead of ignored, so complete it or clear it.
+## @x-cozystack-options {source: instancetype}
 instanceType: "u1.medium"
 
 ## @param {string} instanceProfile - Virtual Machine preferences profile.
+## @x-cozystack-options {source: instanceprofile}
 instanceProfile: ubuntu
 
 ## @param {[]Disk} disks - List of disks to attach.
@@ -77,7 +87,15 @@ gpus: []
 ## @param {string} cpuModel - Model specifies the CPU model inside the VMI. List of available models https://github.com/libvirt/libvirt/tree/master/src/cpu_map
 cpuModel: ""
 
-## @param {Resources} [resources] - Resource configuration for the virtual machine.
+## @param {Firmware} [firmware] - Firmware and boot configuration (UEFI/BIOS selection, Secure Boot, persistent EFI NVRAM).
+firmware: {}
+## Example:
+## firmware:
+##   bootloader: uefi
+##   secureBoot: true
+##   efiPersistent: true
+
+## @param {Resources} [resources] - Resource configuration for the virtual machine. Set whole-number cpu and sockets together with memory to size the VM directly, which overrides `instanceType`. Alongside an `instanceType`, a block that sizes only part of the VM is rejected; a whole-number cpu or sockets on its own sizes nothing and is ignored.
 resources: {}
 
 ## @param {[]string} sshKeys - List of SSH public keys for authentication.
@@ -97,6 +115,9 @@ cloudInit: ""
 ##   chpasswd: { expire: False }
 ##
 
+## @param {bool} netplanDhcp - Supply cloud-init network-data that requests DHCP on every `en*` and `eth*` interface and keeps the DNS search domains DHCP offers. Needed for a netplan guest (Ubuntu, Debian) to address a secondary network such as a VPC subnet. Leave it off for a guest rendered by anything other than netplan, which would lose DHCP on every interface, and for a guest that configures an interface statically through netplan, which this configuration would shadow. Turning it on for a VM that has neither `cloudInit` nor `sshKeys` adds a cloud-init disk, and the guest's next boot is then treated as a first boot.
+netplanDhcp: false
+
 ## @param {string} cloudInitSeed - Seed string to generate SMBIOS UUID for the VM.
 cloudInitSeed: ""
 ## Example:
diff --git a/packages/apps/vpc/Makefile b/packages/apps/vpc/Makefile
index 2f0c193f02..fce015f3e5 100644
--- a/packages/apps/vpc/Makefile
+++ b/packages/apps/vpc/Makefile
@@ -6,3 +6,6 @@ generate:
 
 update:
 	echo
+
+test:
+	helm unittest .
diff --git a/packages/apps/vpc/templates/vpc.yaml b/packages/apps/vpc/templates/vpc.yaml
index 784c181b27..049d719873 100644
--- a/packages/apps/vpc/templates/vpc.yaml
+++ b/packages/apps/vpc/templates/vpc.yaml
@@ -81,6 +81,12 @@ spec:
   protocol: IPv4
   enableLb: false
   private: true
+  {{- with .allowSubnets }}
+  allowSubnets:
+    {{- range . }}
+    - {{ . | quote }}
+    {{- end }}
+  {{- end }}
 {{- end }}
 ---
 apiVersion: v1
diff --git a/packages/apps/vpc/tests/subnet_test.yaml b/packages/apps/vpc/tests/subnet_test.yaml
new file mode 100644
index 0000000000..889d945abe
--- /dev/null
+++ b/packages/apps/vpc/tests/subnet_test.yaml
@@ -0,0 +1,87 @@
+suite: kube-ovn Subnet rendering
+
+templates:
+  - templates/vpc.yaml
+
+release:
+  name: virtualprivatecloud-myvpc
+  namespace: tenant-test
+
+tests:
+  - it: renders no allowSubnets on a subnet that declares none
+    set:
+      subnets:
+        - name: plain
+          cidr: "172.16.0.0/24"
+    asserts:
+      - notExists:
+          path: spec.allowSubnets
+        documentSelector:
+          path: spec.cidrBlock
+          value: "172.16.0.0/24"
+      - equal:
+          path: spec.private
+          value: true
+        documentSelector:
+          path: spec.cidrBlock
+          value: "172.16.0.0/24"
+
+  - it: admits the declared CIDRs into the subnet while keeping it private
+    set:
+      subnets:
+        - name: gateway
+          cidr: "172.16.1.0/24"
+          allowSubnets:
+            - "192.168.1.0/24"
+            - "10.20.0.0/16"
+    asserts:
+      - equal:
+          path: spec.allowSubnets
+          value:
+            - "192.168.1.0/24"
+            - "10.20.0.0/16"
+        documentSelector:
+          path: spec.cidrBlock
+          value: "172.16.1.0/24"
+      - equal:
+          path: spec.private
+          value: true
+        documentSelector:
+          path: spec.cidrBlock
+          value: "172.16.1.0/24"
+
+  - it: scopes allowSubnets to the subnet that declares it
+    set:
+      subnets:
+        - name: plain
+          cidr: "172.16.0.0/24"
+        - name: gateway
+          cidr: "172.16.1.0/24"
+          allowSubnets:
+            - "192.168.1.0/24"
+    asserts:
+      - notExists:
+          path: spec.allowSubnets
+        documentSelector:
+          path: spec.cidrBlock
+          value: "172.16.0.0/24"
+      - equal:
+          path: spec.allowSubnets
+          value:
+            - "192.168.1.0/24"
+        documentSelector:
+          path: spec.cidrBlock
+          value: "172.16.1.0/24"
+
+  - it: treats an empty allowSubnets list as unset
+    set:
+      subnets:
+        - name: plain
+          cidr: "172.16.0.0/24"
+          allowSubnets: []
+    asserts:
+      - notExists:
+          path: spec.allowSubnets
+        documentSelector:
+          path: spec.cidrBlock
+          value: "172.16.0.0/24"
diff --git a/packages/apps/vpc/values.schema.json b/packages/apps/vpc/values.schema.json
index b25b46ed29..bff82a8af5 100644
--- a/packages/apps/vpc/values.schema.json
+++ b/packages/apps/vpc/values.schema.json
@@ -12,6 +12,13 @@
           "name"
         ],
         "properties": {
+          "allowSubnets": {
+            "description": "Additional source CIDRs admitted into this private subnet, such as remote networks routed in through a gateway VM",
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          },
           "cidr": {
             "description": "IP address range",
             "type": "string"
diff --git a/packages/apps/vpc/values.yaml b/packages/apps/vpc/values.yaml
index 8bd275894b..b3132ec536 100644
--- a/packages/apps/vpc/values.yaml
+++ b/packages/apps/vpc/values.yaml
@@ -5,6 +5,7 @@
 ## @typedef {struct} Subnet - Subnet of a VPC
 ## @field {string} name - Subnet name
 ## @field {string} [cidr] - IP address range
+## @field {[]string} [allowSubnets] - Additional source CIDRs admitted into this private subnet, such as remote networks routed in through a gateway VM
 
 ## @param {[]Subnet} subnets - Subnets of a VPC
 subnets: []
@@ -14,6 +15,8 @@ subnets: []
 ##     cidr: "172.16.0.0/24"
 ##   - name: mysubnet1
 ##     cidr: "172.16.1.0/24"
+##     allowSubnets:
+##       - "192.168.1.0/24"
 
 ## @typedef {struct} Peer - VPC peering target
 ## @field {string} vpcName - Logical name of the remote VPC (without "virtualprivatecloud-" prefix)
diff --git a/packages/apps/vpn/Makefile b/packages/apps/vpn/Makefile
index d0b8412f65..3a8c700be7 100644
--- a/packages/apps/vpn/Makefile
+++ b/packages/apps/vpn/Makefile
@@ -1,5 +1,22 @@
+SHADOWBOX_VERSION = $(shell awk -F= '$$1 == "ARG VERSION" {print $$2; exit}' images/shadowbox/Dockerfile)
+
+include ../../../hack/common-envs.mk
 include ../../../hack/package.mk
 
+.PHONY: test image
+test:
+	helm unittest .
+
 generate:
 	cozyvalues-gen -m 'vpn' -v values.yaml -s values.schema.json -r README.md -g ../../../api/apps/v1alpha1/vpn/types.go
 	../../../hack/update-crd.sh
+
+image:
+	docker buildx build images/shadowbox \
+		$(call image-tags,shadowbox,$(SHADOWBOX_VERSION)) \
+		$(call cache-args,shadowbox) \
+		--metadata-file images/shadowbox.json \
+		$(BUILDX_ARGS)
+	echo "$(REGISTRY)/shadowbox:$(IMAGE_TAG)@$$(yq e '."containerimage.digest"' images/shadowbox.json -o json -r)" \
+		> images/shadowbox.tag
+	rm -f images/shadowbox.json
diff --git a/packages/apps/vpn/README.md b/packages/apps/vpn/README.md
index 4bb7e5d813..f8032f621a 100644
--- a/packages/apps/vpn/README.md
+++ b/packages/apps/vpn/README.md
@@ -44,7 +44,7 @@ Furthermore, Shadowbox is compatible with standard Shadowsocks clients, providin
 ### resources and resourcesPreset
 
 `resources` sets explicit CPU and memory configurations for each replica.
-When left empty, the preset defined in `resourcesPreset` is applied.
+Every resource it leaves unset is taken from the preset defined in `resourcesPreset`.
 
 ```yaml
 resources:
@@ -55,7 +55,7 @@ resources:
 `resourcesPreset` sets named CPU and memory configurations for each replica.
 This setting is ignored if the corresponding `resources` value is set.
 
-Presets follow a cloud-style `<series>.<size>` naming convention. Five series cover the full CPU-to-memory ratio range (`t1` 1:0.5, `c1` 1:1, `s1` 1:2, `u1` 1:4, `m1` 1:8) and each series ships eight sizes (`nano` through `4xlarge`). The legacy flat names (`nano`, `micro`, `small`, `medium`, `large`, `xlarge`, `2xlarge`) remain accepted as deprecated aliases of their 1:1 instance-type equivalents.
+Presets follow a cloud-style `<series>.<size>` naming convention. Five series cover the full CPU-to-memory ratio range (`t1` 1:0.5, `c1` 1:1, `s1` 1:2, `u1` 1:4, `m1` 1:8) and each series ships eight sizes (`nano` through `4xlarge`). The legacy flat names (`nano`, `micro`, `small`, `medium`, `large`, `xlarge`, `2xlarge`) remain accepted as deprecated aliases and keep their original sizes, which do not follow one series: `nano` through `small` equal the `t1` sizes of the same name, while `medium` equals `c1.small` rather than `c1.medium`.
 
 See [`docs/operations/resource-presets.md`](../../../docs/operations/resource-presets.md) for the full size matrix and the legacy-to-instance-type mapping.
 
diff --git a/packages/apps/vpn/images/shadowbox.tag b/packages/apps/vpn/images/shadowbox.tag
new file mode 100644
index 0000000000..bea3e8d32f
--- /dev/null
+++ b/packages/apps/vpn/images/shadowbox.tag
@@ -0,0 +1 @@
+quay.io/outline/shadowbox:v1.12.3@sha256:545c6f7c7261bb30ae1dffe24a6fca5f8512f5d17c72cfb9e410e7e655444e62
diff --git a/packages/apps/vpn/images/shadowbox/Dockerfile b/packages/apps/vpn/images/shadowbox/Dockerfile
new file mode 100644
index 0000000000..bd406e8150
--- /dev/null
+++ b/packages/apps/vpn/images/shadowbox/Dockerfile
@@ -0,0 +1,66 @@
+# Upstream publishes quay.io/outline/shadowbox for amd64 only, although its
+# own Taskfile already knows how to target arm64. This rebuilds the same
+# release as a multi-arch image; the layout follows upstream's
+# src/shadowbox/Taskfile.yml `docker:build`.
+ARG VERSION=v1.12.3
+ARG COMMIT=067d0d47aedac94a3888a127fa6c65f2f53b9987
+
+FROM --platform=$BUILDPLATFORM node:18.18.0-alpine3.18@sha256:a315556d82ef54561e54fca7d8ee333382de183d4e56841dcefcd05b55310f46 AS source
+ARG VERSION
+ARG COMMIT
+RUN apk add --no-cache git
+RUN git clone --branch server-${VERSION} --depth 1 https://github.com/OutlineFoundation/outline-server /src \
+    && test "$(git -C /src rev-parse HEAD)" = "${COMMIT}"
+
+# main.js is a single webpack bundle with no native addons, so it is built
+# once on the build platform and shared by every target.
+FROM source AS app
+ARG VERSION
+WORKDIR /src
+RUN npm ci --ignore-scripts
+RUN SB_VERSION=${VERSION} npx webpack --config=src/shadowbox/webpack.config.js \
+      --output-path=/out/opt/outline-server/app --mode=production \
+    && cp src/shadowbox/package.json /out/opt/outline-server/
+
+FROM --platform=$BUILDPLATFORM golang:1.27-alpine@sha256:8a5910f31396cd4d89662f56c68b3ae31d374308270a1c3bd96672ee5ed43414 AS ss-server
+ARG GOPROXY
+ARG TARGETOS
+ARG TARGETARCH
+COPY --from=source /src /src
+WORKDIR /src
+RUN for attempt in 1 2 3; do go mod download && break; [ "$attempt" = 3 ] && exit 1; sleep $((attempt * 10)); done
+RUN GOOS=${TARGETOS} GOARCH=${TARGETARCH} CGO_ENABLED=0 go build -trimpath \
+      -ldflags='-s -w -X main.version=embedded' \
+      -o /out/opt/outline-server/bin/ github.com/Jigsaw-Code/outline-ss-server/cmd/outline-ss-server
+
+# Version and checksums are upstream's, from third_party/Taskfile.yml.
+FROM --platform=$BUILDPLATFORM node:18.18.0-alpine3.18@sha256:a315556d82ef54561e54fca7d8ee333382de183d4e56841dcefcd05b55310f46 AS prometheus
+ARG TARGETARCH
+ARG PROMETHEUS_VERSION=2.37.1
+RUN case "${TARGETARCH}" in \
+      amd64) sum=753f66437597cf52ada98c2f459aa8c03745475c249c9f2b40ac7b3919131ba6 ;; \
+      arm64) sum=b59a66fb5c7ec5acf6bf426793528a5789a1478a0dad8c64edc2843caf31b1b8 ;; \
+      *) echo "unsupported TARGETARCH ${TARGETARCH}" >&2; exit 1 ;; \
+    esac \
+    && name=prometheus-${PROMETHEUS_VERSION}.linux-${TARGETARCH} \
+    && wget -q -O /tmp/p.tgz https://github.com/prometheus/prometheus/releases/download/v${PROMETHEUS_VERSION}/${name}.tar.gz \
+    && echo "${sum}  /tmp/p.tgz" | sha256sum -c - \
+    && mkdir -p /out/opt/outline-server/bin \
+    && tar -xzf /tmp/p.tgz -C /out/opt/outline-server/bin --strip-components=1 ${name}/prometheus
+
+FROM node:18.18.0-alpine3.18@sha256:a315556d82ef54561e54fca7d8ee333382de183d4e56841dcefcd05b55310f46
+ARG VERSION
+LABEL shadowbox.github.release=${VERSION}
+# The user management service doesn't quit with SIGTERM.
+STOPSIGNAL SIGKILL
+# curl detects the public IP; coreutils gives update_mmdb.sh a `date --date`.
+RUN apk add --no-cache --upgrade coreutils curl
+COPY --from=app /out /
+COPY --from=ss-server /out /
+COPY --from=prometheus /out /
+COPY --from=source /src/src/shadowbox/scripts /scripts
+COPY --from=source /src/src/shadowbox/scripts/update_mmdb.sh /etc/periodic/weekly/update_mmdb.sh
+COPY --from=source /src/src/shadowbox/docker/cmd.sh /cmd.sh
+RUN mkdir -p /root/shadowbox/persisted-state && /etc/periodic/weekly/update_mmdb.sh
+WORKDIR /opt/outline-server
+CMD ["/cmd.sh"]
diff --git a/packages/apps/vpn/templates/deployment.yaml b/packages/apps/vpn/templates/deployment.yaml
index a5a66dd38f..ac7ce157c6 100644
--- a/packages/apps/vpn/templates/deployment.yaml
+++ b/packages/apps/vpn/templates/deployment.yaml
@@ -42,7 +42,7 @@ spec:
                 path: shadowbox_server_config.json
       containers:
         - name: outline-vpn
-          image: quay.io/outline/shadowbox:stable
+          image: {{ .Files.Get "images/shadowbox.tag" | trim | quote }}
           resources: {{- include "cozy-lib.resources.defaultingSanitize" (list .Values.resourcesPreset .Values.resources $) | nindent 12 }}
           ports:
             - containerPort: 40000
diff --git a/packages/apps/vpn/templates/secret.yaml b/packages/apps/vpn/templates/secret.yaml
index 3ef4ac4b32..31a3643cea 100644
--- a/packages/apps/vpn/templates/secret.yaml
+++ b/packages/apps/vpn/templates/secret.yaml
@@ -1,4 +1,4 @@
-{{- $host := .Values._namespace.host }}
+{{- $host := include "cozy-lib.ns-host-required" . }}
 {{- $existingSecret := lookup "v1" "Secret" .Release.Namespace (printf "%s-vpn" .Release.Name) }}
 {{- $accessKeys := list }}
 {{- $passwords := dict }}
@@ -59,8 +59,6 @@ kind: Secret
 metadata:
   name: {{ .Release.Name }}-urls
 type: Opaque
-foo: |
-  {{ toJson $passwords }}
 stringData:
   {{- range $user, $u := .Values.users }}
   "{{ $user }}": "ss://{{ regexReplaceAll "=" (replace "/" "_" (replace "+" "-" (printf "chacha20-ietf-poly1305:%s" (index $passwords $user) | b64enc))) "" }}@{{ $.Values.host | default (printf "%s.%s" $.Release.Name $host) }}:40000/?outline=1#{{ $.Release.Name }}"
diff --git a/packages/apps/vpn/tests/host_guard_test.yaml b/packages/apps/vpn/tests/host_guard_test.yaml
new file mode 100644
index 0000000000..ef68d209f0
--- /dev/null
+++ b/packages/apps/vpn/tests/host_guard_test.yaml
@@ -0,0 +1,28 @@
+suite: vpn access URL fails on an empty apex
+
+templates:
+  - templates/secret.yaml
+
+release:
+  name: vpn-test
+  namespace: tenant-test
+
+# secret.yaml builds the per-user access URL as <release>.<_namespace.host>.
+# cozy-lib.ns-host-required guards the apex, so an empty apex fails the render.
+
+tests:
+  - it: fails when the apex is empty and no host override
+    set:
+      _namespace:
+        host: ""
+    asserts:
+      - failedTemplate:
+          errorMessage: "the tenant apex (_namespace.host) is empty and this app sets no host override, so its ingress hostname would be malformed. Set tenant.spec.host on this tenant, inherit it from a parent that has host set, or set this app's host value."
+
+  - it: renders the secret when the apex is set
+    set:
+      _namespace:
+        host: example.com
+    asserts:
+      - hasDocuments:
+          count: 2
diff --git a/packages/apps/vpn/tests/vpn_test.yaml b/packages/apps/vpn/tests/vpn_test.yaml
new file mode 100644
index 0000000000..125f581849
--- /dev/null
+++ b/packages/apps/vpn/tests/vpn_test.yaml
@@ -0,0 +1,36 @@
+suite: vpn default render
+
+# Both templates are loaded so the Deployment's checksum/config annotation can
+# resolve its include of secret.yaml; template: pins assertions to the
+# Deployment document alone.
+templates:
+  - templates/deployment.yaml
+  - templates/secret.yaml
+
+release:
+  name: vpn-test
+  namespace: tenant-test
+
+set:
+  _namespace:
+    host: example.com
+
+tests:
+  - it: renders a Deployment with the default replicas and the image from images/shadowbox.tag
+    template: templates/deployment.yaml
+    asserts:
+      - hasDocuments:
+          count: 1
+      - isNotNullOrEmpty:
+          path: spec.template.spec.containers[0].image
+      - isKind:
+          of: Deployment
+      - equal:
+          path: metadata.name
+          value: vpn-test-vpn
+      - equal:
+          path: spec.replicas
+          value: 2
+      - equal:
+          path: spec.template.spec.containers[0].ports[0].containerPort
+          value: 40000
diff --git a/packages/core/flux-aio/Makefile b/packages/core/flux-aio/Makefile
index 614b7f86c1..dddb9f4bac 100644
--- a/packages/core/flux-aio/Makefile
+++ b/packages/core/flux-aio/Makefile
@@ -17,9 +17,12 @@ MANIFESTS_DIR=../../../internal/fluxinstall/manifests
 update:
 	timoni bundle build -f flux-aio.cue > $(MANIFESTS_DIR)/fluxcd.yaml
 	yq eval '(select(.kind == "Namespace") | .metadata.labels."pod-security.kubernetes.io/enforce") = "privileged"' -i $(MANIFESTS_DIR)/fluxcd.yaml
+	# The flux-aio module does not expose a --concurrent flag for source-watcher; inject it here.
+	# source-watcher builds one ExternalArtifact per PackageSource component, so raise its
+	# concurrency above the binary default of 10 to match the other controllers under load.
+	# The append is guarded so a future module that emits its own --concurrent is not duplicated.
+	yq eval '(select(.kind == "Deployment" and .metadata.name == "flux").spec.template.spec.containers[] | select(.name == "source-watcher") | select(.args | contains(["--concurrent=20"]) | not).args) += ["--concurrent=20"]' -i $(MANIFESTS_DIR)/fluxcd.yaml
 	sed -i $(MANIFESTS_DIR)/fluxcd.yaml \
 		-e '/timoni/d' \
 		-e 's|\.cluster\.local\.,||g' -e 's|\.cluster\.local\,||g' -e 's|\.cluster\.local\.||g' \
 		-e 's|--storage-adv-addr=source-watcher.$$(RUNTIME_NAMESPACE).svc|--storage-adv-addr=flux.$$(RUNTIME_NAMESPACE).svc|'
-	yq eval '.spec.template.spec.containers[0].image = "'"$$(yq eval 'select(.kind == "Deployment" and .metadata.name == "flux") | .spec.template.spec.containers[] | select(.name == "helm-controller").image' $(MANIFESTS_DIR)/fluxcd.yaml)"'"' -i $(MANIFESTS_DIR)/fluxcd-tenants.yaml
-	yq eval '.metadata.labels."app.kubernetes.io/version" = "'"$$(yq eval 'select(.kind == "Deployment" and .metadata.name == "flux") | .metadata.labels."app.kubernetes.io/version"' $(MANIFESTS_DIR)/fluxcd.yaml)"'"' -i $(MANIFESTS_DIR)/fluxcd-tenants.yaml
diff --git a/packages/core/flux-aio/flux-aio.cue b/packages/core/flux-aio/flux-aio.cue
index e47d20aad7..268654c08c 100644
--- a/packages/core/flux-aio/flux-aio.cue
+++ b/packages/core/flux-aio/flux-aio.cue
@@ -10,6 +10,20 @@ bundle: {
 			namespace: "cozy-fluxcd"
 			values: {
 				securityProfile: "privileged"
+				// source-watcher builds one ExternalArtifact per PackageSource
+				// component; on the management cluster that is ~100 concurrent
+				// builds during install. Give it CPU headroom so it is not
+				// starved by its sibling controllers in the all-in-one pod.
+				// The module has no per-controller args override for the
+				// watcher, so its --concurrent bump is applied as a post-render
+				// patch in the Makefile.
+				controllers: watcher: resources: {
+					requests: {
+						cpu:    "500m"
+						memory: "64Mi"
+					}
+					limits: memory: "1Gi"
+				}
 				tolerations: [{
 					operator: "Exists"
 					key:      "node.kubernetes.io/not-ready"
diff --git a/packages/core/installer/Makefile b/packages/core/installer/Makefile
index 90e23dae6f..a5da8fcc40 100644
--- a/packages/core/installer/Makefile
+++ b/packages/core/installer/Makefile
@@ -15,26 +15,40 @@ apply:
 diff:
 	cozyhr show --namespace $(NAMESPACE) $(NAME) --plain | kubectl diff -f -
 
+test:
+	helm unittest .
+
 image: pre-checks image-operator image-packages chart
 
 image-operator:
 	docker buildx build -f images/cozystack-operator/Dockerfile ../../.. \
 		$(call image-tags,cozystack-operator,v$(COZYSTACK_VERSION)) \
 		--build-arg VERSION=v$(COZYSTACK_VERSION) \
-		--cache-from type=registry,ref=$(REGISTRY)/cozystack-operator:latest \
-		--cache-to type=inline \
+		$(call cache-args,cozystack-operator) \
 		--metadata-file images/cozystack-operator.json \
 		$(BUILDX_ARGS)
 	IMAGE="$(REGISTRY)/cozystack-operator:$(IMAGE_TAG)@$$(yq -e '.["containerimage.digest"]' images/cozystack-operator.json -o json -r)" \
 		yq -i '.cozystackOperator.image = strenv(IMAGE)' values.yaml
 	rm -f images/cozystack-operator.json
 
+# flux push artifact REPLACES its built-in ignore list when --ignore-paths is
+# given, so the defaults are repeated here. node_modules/ is the addition: a
+# developer who runs `pnpm install` under images/console leaves the console's
+# dependency tree in packages/, and one file above Helm's 5MB per-file limit
+# makes the dashboard chart unloadable on every cluster that pulls the bundle.
+# Held by hack/check-packages-artifact-ignores.bats.
+PACKAGES_IGNORE_PATHS := .git/,.gitignore,.gitmodules,.gitattributes,*.jpg,*.jpeg,*.gif,*.png,*.wmv,*.flv,*.tar.gz,*.zip,node_modules/
+
 image-packages:
 	mkdir -p ../../../_out/assets images
 	echo $$(git rev-parse HEAD; git diff HEAD; git ls-files --others --exclude-standard) | shasum -a 256 > ../platform/.build-revision
+# The stamped digest is what the operator hands Flux to pull from the registry,
+# so a build that pushes nothing keeps the committed ref instead.
+ifeq ($(PUSH),1)
 	flux push artifact \
 		oci://$(REGISTRY)/cozystack-packages:$(IMAGE_TAG) \
 		--path=../../../packages \
+		--ignore-paths='$(PACKAGES_IGNORE_PATHS)' \
 		--source=https://github.com/cozystack/cozystack \
 		--revision="$$(git describe --tags):$$(git rev-parse HEAD)" \
 		2>&1 | tee images/cozystack-packages.log
@@ -44,6 +58,9 @@ image-packages:
 		test -n "$$DIGEST" && \
 		yq -i '.cozystackOperator.platformSourceUrl = strenv(REPO)' values.yaml && \
 		yq -i '.cozystackOperator.platformSourceRef = "digest=" + strenv(DIGEST)' values.yaml
+else
+	@echo "PUSH=$(PUSH): cozystack-packages not pushed; values.yaml keeps its committed platformSourceRef"
+endif
 
 chart:
 	set -e; \
diff --git a/packages/core/installer/example/platform.yaml b/packages/core/installer/example/platform.yaml
index 6ec544aa69..d127870fe9 100644
--- a/packages/core/installer/example/platform.yaml
+++ b/packages/core/installer/example/platform.yaml
@@ -9,12 +9,12 @@ spec:
     platform:
       values:
         publishing:
-          host: "dev5.infra.aenix.org"
-          apiServerEndpoint: "https://api.dev5.infra.aenix.org"
+          host: "example.org"
+          apiServerEndpoint: "https://api.example.org"
           externalIPs:
-          - 10.4.0.94
-          - 10.4.0.179
-          - 10.4.0.26
+          - 192.0.2.10
+          - 192.0.2.11
+          - 192.0.2.12
         authentication:
           oidc:
             enabled: true
diff --git a/packages/core/installer/images/cozystack-operator/Dockerfile b/packages/core/installer/images/cozystack-operator/Dockerfile
index 0172263605..21604a0296 100644
--- a/packages/core/installer/images/cozystack-operator/Dockerfile
+++ b/packages/core/installer/images/cozystack-operator/Dockerfile
@@ -1,4 +1,5 @@
-FROM golang:1.26-alpine AS builder
+FROM --platform=$BUILDPLATFORM golang:1.27-alpine@sha256:8a5910f31396cd4d89662f56c68b3ae31d374308270a1c3bd96672ee5ed43414 AS builder
+ARG GOPROXY
 
 ARG TARGETOS
 ARG TARGETARCH
@@ -9,7 +10,7 @@ RUN apk add --no-cache make git
 COPY . /src/
 WORKDIR /src
 
-RUN go mod download
+RUN for attempt in 1 2 3; do go mod download && break; [ "$attempt" = 3 ] && exit 1; sleep $((attempt * 10)); done
 
 # Build cozystack-operator
 RUN CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build \
@@ -17,7 +18,7 @@ RUN CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build \
   -o /cozystack-operator \
   ./cmd/cozystack-operator
 
-FROM alpine:3.22
+FROM alpine:3.24@sha256:294b683cb724975bec92580e1e685676bd4b50bda910ddb8c51d4cabeaec77e6
 
 COPY --from=builder /cozystack-operator /usr/bin/cozystack-operator
 
diff --git a/packages/core/installer/templates/cozy-system-labels.yaml b/packages/core/installer/templates/cozy-system-labels.yaml
index b6a8db6c50..75ce80349d 100644
--- a/packages/core/installer/templates/cozy-system-labels.yaml
+++ b/packages/core/installer/templates/cozy-system-labels.yaml
@@ -111,7 +111,7 @@ spec:
           type: RuntimeDefault
       containers:
       - name: kubectl
-        image: docker.io/alpine/k8s:1.33.4@sha256:b0523f0a244ddc4c8e055aa335c040d3d78b3ead5528f4544395f7f9f69c7b68
+        image: docker.io/alpine/k8s:1.36.2@sha256:44ef4942e171939b9c665a4a84beb80e2dcdb9a24330d4651cfdfd2e9deecc47
         imagePullPolicy: IfNotPresent
         securityContext:
           allowPrivilegeEscalation: false
diff --git a/packages/core/installer/templates/cozystack-operator.yaml b/packages/core/installer/templates/cozystack-operator.yaml
index 95e6996dad..6f2cc6880c 100644
--- a/packages/core/installer/templates/cozystack-operator.yaml
+++ b/packages/core/installer/templates/cozystack-operator.yaml
@@ -1,3 +1,86 @@
+{{/*
+  Maintainer notes on the rollout strategy. The operator-facing constraints it
+  implies are in plain # comments further down, because those ship to whoever
+  applies the rendered _out/assets/cozystack-operator-*.yaml. Everything here
+  is about this repository and stays inside the template.
+
+  tests/rollout_strategy_test.yaml pins the strategy values and the four
+  preconditions below against every variant the chart ships, all on one shared
+  anchor, so gating any of them on a variant is caught by the variants it was
+  not gated to. Three preconditions are pinned airtight; precondition 2 is not,
+  and says where the gap is rather than leaving the reader to assume coverage
+  that is not there:
+
+  1. No container or initContainer declares a port. Asserted with a
+     containers[*] wildcard rather than containers[0], because the constraint
+     binds every container in the pod and not only the first: under hostNetwork
+     a declared containerPort defaults to the same hostPort, and the surge pod
+     then has nowhere to go on a single-node cluster.
+  2. Neither listener is bound at runtime. --metrics-bind-address=0 and
+     --health-probe-bind-address=0 are asserted explicitly, because the
+     operator's own defaults are :8080 and :8081. The arguments are the only
+     thing holding this, and the scheduler cannot see it either way. This is
+     the loosely pinned one, and the reason is worth stating precisely so
+     nobody trusts the wrong model of it. contains is a membership test with
+     no notion of position, while Go's flag package keeps the last occurrence,
+     so a duplicate appearing AFTER the disabled one wins and the assert still
+     passes; a duplicate before it loses, and the assert passes just the same.
+     Moving the disabled flag last therefore fixes the process but not the
+     test, which stays green either way. notContains on :8080 and :8081 closes
+     that for those two addresses, again regardless of position, and they are
+     the ones a values-gated block added to let users enable metrics would
+     reach for, since they are this binary's own flag defaults. Any other
+     address slips through: helm-unittest cannot express "this flag appears no
+     more than once". So changing a value in place is caught, and duplicating
+     one is caught only for those two addresses.
+  3. --leader-elect stays on. maxSurge: 1 means a second manager process
+     exists by construction on every upgrade, so the lease is what keeps the
+     incoming pod's reconcile loops off the cluster until the outgoing one is
+     gone. Turning it off lets two managers reconcile at once.
+  4. No probe uses httpGet. This follows from 2: with both listeners disabled
+     an httpGet probe has no port left to target. Only the httpGet field is
+     asserted absent, not the probes themselves, so an exec probe stays
+     legitimate — but under maxUnavailable: 0 an exec probe that cannot pass
+     while the outgoing pod is still alive wedges the rollout permanently
+     rather than transiently, since the outgoing pod is not retired until the
+     incoming one is available. A readiness gate that depends on the old
+     process being gone deadlocks against the strategy.
+
+  Read precondition 3 for exactly what it says and no more. The lease governs
+  the reconcile loops; it does not govern everything the two pods do at once,
+  and two overlaps sit outside it. The routine one happens on every healthy
+  upgrade and is bounded by the outgoing pod's termination grace: for that
+  moment an old binary keeps reconciling against schema the incoming pod has
+  already moved. The rare one needs the outgoing pod to be broken and
+  restarting, and it is the worse of the two, because one ordering of it
+  silently reverts the incoming pod's install phase and does not heal itself
+  afterwards. Both are known and accepted, not oversights. Unlike the binders
+  below, neither is hypothetical.
+
+  What pays for carrying them, since Recreate would make Available honest with
+  no second pod at all: when the replacement never starts — a surge pod that
+  cannot be scheduled, an image that cannot be pulled — maxUnavailable: 0 keeps
+  the outgoing operator running while the rollout wedges, where Recreate would
+  have deleted it first and left none. That is the whole of the gain, and it
+  covers only that class. A replacement that starts and then dies is already
+  counted available, so the outgoing pod is gone by then under either strategy.
+
+  The variant loop is not ceremony: the template branches on variant inside the
+  container spec, so a port added under one branch renders for that variant
+  alone and a single-variant suite would not see it. The container-name assert
+  pins containers[0] for the three argument asserts, which would otherwise start
+  describing a different container if one were inserted ahead of the operator.
+
+  The manager is also configured with a webhook server on 9443, which reads
+  like a third binder and is not one: controller-runtime adds that server to
+  its runnables only inside GetWebhookServer(), and this binary registers no
+  webhook and never calls it, so nothing listens. Registering one would bind
+  9443 in the host namespace and wedge the rollout the same way, and no
+  chart-level test can reach that — it is a Go-side change. PprofBindAddress is
+  a fourth binder of the same kind: unset today, with no flag exposing it and
+  no path to it from this chart, so it is inert for the same reason and would
+  wedge the rollout for the same reason if it were ever set.
+*/}}
 {{- $validVariants := list "talos" "generic" "hosted" -}}
 {{- if not (has .Values.cozystackOperator.variant $validVariants) -}}
 {{- fail (printf "Invalid cozystackOperator.variant %q: must be one of talos, generic, hosted" .Values.cozystackOperator.variant) -}}
@@ -35,8 +118,34 @@ spec:
   strategy:
     type: RollingUpdate
     rollingUpdate:
-      maxSurge: 0
-      maxUnavailable: 1
+      # This pair is what Kubernetes itself would pick here: the default
+      # 25% / 25% resolves at replicas: 1 to maxSurge 1 and maxUnavailable 0,
+      # because the surge rounds up and the unavailability rounds down. Spelling
+      # it out is not tuning, it is declining to override the default.
+      # maxUnavailable must stay 0. At replicas: 1 anything higher makes the
+      # minimum available replica count replicas - maxUnavailable = 0, and the
+      # Available condition then reports True with no running pod at all, which
+      # hides a dead operator from every consumer of that status.
+      # Kubernetes rejects maxUnavailable: 0 together with maxSurge: 0, so the
+      # surge cannot go the other way either. The surge pod shares the node
+      # network namespace (hostNetwork below), so nothing in this pod may need
+      # a port, and the two ways of needing one fail differently. Declaring a
+      # containerPort makes the surge pod unschedulable on a single-node
+      # cluster: it never runs, so maxUnavailable: 0 keeps the outgoing pod
+      # serving and the rollout simply wedges. Binding a port at runtime, by
+      # pointing --metrics-bind-address or --health-probe-bind-address at a
+      # real address, is worse, because this pod has no readiness probe and
+      # counts as available the moment its container starts. The outgoing pod
+      # is retired at that point, and the incoming one dies with EADDRINUSE
+      # afterwards, leaving no operator at all rather than the old one. Do not
+      # read maxUnavailable: 0 as protection against that second class; what
+      # catches it is whatever waits on the resources the operator is supposed
+      # to create.
+      # This also rules out an httpGet probe of any kind on this Deployment: the
+      # port it would target is one of the two disabled above. Only an exec
+      # probe can ever work here.
+      maxSurge: 1
+      maxUnavailable: 0
   template:
     metadata:
       labels:
@@ -47,6 +156,10 @@ spec:
       - name: cozystack-operator
         image: "{{ .Values.cozystackOperator.image }}"
         args:
+        # Must stay on. maxSurge: 1 above means a second manager pod exists on
+        # every upgrade, and the lease is what keeps the incoming one's
+        # reconcile loops off the cluster until the outgoing one is gone.
+        # Turning it off lets two managers reconcile the same cluster at once.
         - --leader-elect=true
         - --install-flux=true
         # The operator applies embedded CRDs via server-side apply on every
@@ -73,28 +186,46 @@ spec:
         {{- if ne (toString .Values.cozystackOperator.helmReleaseMaxHistory) "" }}
         - --helmrelease-max-history={{ .Values.cozystackOperator.helmReleaseMaxHistory }}
         {{- end }}
+        {{- if ne (toString .Values.cozystackOperator.systemNamespaceMemoryLimit) "" }}
+        - --system-namespace-memory-limit={{ .Values.cozystackOperator.systemNamespaceMemoryLimit }}
+        {{- end }}
+        {{- if ne (toString .Values.cozystackOperator.systemNamespaceMemoryRequest) "" }}
+        - --system-namespace-memory-request={{ .Values.cozystackOperator.systemNamespaceMemoryRequest }}
+        {{- end }}
         - --platform-source-name=cozystack-platform
         - --platform-source-url={{ .Values.cozystackOperator.platformSourceUrl }}
         {{- if .Values.cozystackOperator.platformSourceRef }}
         - --platform-source-ref={{ .Values.cozystackOperator.platformSourceRef }}
         {{- end }}
-        {{- if eq .Values.cozystackOperator.variant "talos" }}
+        {{- if .Values.cozystackOperator.platformSourceSecret }}
+        - --platform-source-secret={{ .Values.cozystackOperator.platformSourceSecret }}
+        {{- end }}
+        {{- $hasEndpointEnv := or (eq .Values.cozystackOperator.variant "talos") (eq .Values.cozystackOperator.variant "generic") }}
+        {{- if or .Values.cozystackOperator.platformVersion $hasEndpointEnv }}
         env:
+        {{- if .Values.cozystackOperator.platformVersion }}
+        # Platform version reported by the operator (telemetry). Deploy-time data,
+        # not baked into the image — lets a release-candidate image be promoted to
+        # stable by retagging alone. Overrides the build-time value in pkg/version.
+        - name: COZYSTACK_VERSION
+          value: {{ .Values.cozystackOperator.platformVersion | quote }}
+        {{- end }}
+        {{- if eq .Values.cozystackOperator.variant "talos" }}
         # Talos KubePrism endpoint
         - name: KUBERNETES_SERVICE_HOST
           value: "localhost"
         - name: KUBERNETES_SERVICE_PORT
           value: "7445"
         {{- else if eq .Values.cozystackOperator.variant "generic" }}
-        env:
         # Generic Kubernetes: API server endpoint
         - name: KUBERNETES_SERVICE_HOST
           value: {{ required "cozystack.apiServerHost is required in generic mode" .Values.cozystack.apiServerHost | quote }}
         - name: KUBERNETES_SERVICE_PORT
           value: {{ .Values.cozystack.apiServerPort | quote }}
-        {{- else if eq .Values.cozystackOperator.variant "hosted" }}
-        # Hosted: use in-cluster service account, no env override needed
-        env: []
+        {{- end }}
+        {{- end }}
+        {{- if eq .Values.cozystackOperator.variant "hosted" }}
+        # Hosted: use in-cluster service account, no endpoint env override needed
         {{- end }}
       hostNetwork: true
       tolerations:
diff --git a/packages/core/installer/tests/cozystack_version_test.yaml b/packages/core/installer/tests/cozystack_version_test.yaml
new file mode 100644
index 0000000000..fa9353a403
--- /dev/null
+++ b/packages/core/installer/tests/cozystack_version_test.yaml
@@ -0,0 +1,92 @@
+suite: cozystack-operator COZYSTACK_VERSION env rendering
+
+# The COZYSTACK_VERSION env is what lets a release-candidate image be promoted
+# to stable by retagging alone (the operator reports the deploy-time platform
+# version instead of a value baked into the image). It is emitted only when
+# platformVersion is set, and is interleaved with the per-variant endpoint env
+# under a single conditional — pin both axes so a refactor can't silently drop
+# COZYSTACK_VERSION or mis-render the variant endpoint block.
+
+templates:
+  - templates/cozystack-operator.yaml
+
+# cozystack-operator.yaml renders a ServiceAccount, a ClusterRoleBinding and the
+# operator Deployment; every assert is pinned to the Deployment.
+tests:
+  - it: talos + platformVersion sets COZYSTACK_VERSION and the KubePrism endpoint
+    set:
+      cozystackOperator.variant: talos
+      cozystackOperator.platformVersion: v1.4.0
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].env
+          value:
+            - name: COZYSTACK_VERSION
+              value: v1.4.0
+            - name: KUBERNETES_SERVICE_HOST
+              value: localhost
+            - name: KUBERNETES_SERVICE_PORT
+              value: "7445"
+        documentSelector:
+          path: kind
+          value: Deployment
+
+  - it: talos without platformVersion omits COZYSTACK_VERSION but keeps the endpoint env
+    set:
+      cozystackOperator.variant: talos
+      cozystackOperator.platformVersion: ""
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].env
+          value:
+            - name: KUBERNETES_SERVICE_HOST
+              value: localhost
+            - name: KUBERNETES_SERVICE_PORT
+              value: "7445"
+        documentSelector:
+          path: kind
+          value: Deployment
+
+  - it: generic + platformVersion sets COZYSTACK_VERSION and the apiServer endpoint
+    set:
+      cozystackOperator.variant: generic
+      cozystackOperator.platformVersion: v1.4.0
+      cozystack.apiServerHost: api.example.com
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].env
+          value:
+            - name: COZYSTACK_VERSION
+              value: v1.4.0
+            - name: KUBERNETES_SERVICE_HOST
+              value: api.example.com
+            - name: KUBERNETES_SERVICE_PORT
+              value: "6443"
+        documentSelector:
+          path: kind
+          value: Deployment
+
+  - it: hosted + platformVersion sets COZYSTACK_VERSION and no endpoint env
+    set:
+      cozystackOperator.variant: hosted
+      cozystackOperator.platformVersion: v1.4.0
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].env
+          value:
+            - name: COZYSTACK_VERSION
+              value: v1.4.0
+        documentSelector:
+          path: kind
+          value: Deployment
+
+  - it: hosted without platformVersion renders no env block at all
+    set:
+      cozystackOperator.variant: hosted
+      cozystackOperator.platformVersion: ""
+    asserts:
+      - notExists:
+          path: spec.template.spec.containers[0].env
+        documentSelector:
+          path: kind
+          value: Deployment
diff --git a/packages/core/installer/tests/rollout_strategy_test.yaml b/packages/core/installer/tests/rollout_strategy_test.yaml
new file mode 100644
index 0000000000..a544149f70
--- /dev/null
+++ b/packages/core/installer/tests/rollout_strategy_test.yaml
@@ -0,0 +1,144 @@
+suite: cozystack-operator rollout strategy
+
+# Pins the rollout strategy and the four preconditions the surge pod makes
+# load-bearing: no declared port, no bound listener, leader election on, no
+# httpGet probe. Each is checked against every variant the chart ships. The
+# bound-listener one is pinned only partially, for a reason recorded next to
+# the asserts themselves; the other three are airtight.
+#
+# Why the strategy is what it is, why each precondition matters and how each one
+# fails: the maintainer note at the top of templates/cozystack-operator.yaml.
+# That note is the single owner of the reasoning; this file only asserts it.
+
+templates:
+  - templates/cozystack-operator.yaml
+
+tests:
+  - it: keeps the strategy and every surge precondition on the talos variant
+    set:
+      cozystackOperator.variant: talos
+    asserts: &surgeSafe
+      # The strategy rides the same anchor as the preconditions rather than
+      # sitting in a talos-only case of its own. It renders outside every
+      # variant branch today, so one case would pass, but that is a property
+      # of the template rather than a guarantee: move the block inside a
+      # branch and a single-variant assert stops seeing the other two.
+      - equal:
+          path: spec.replicas
+          value: 1
+        documentSelector:
+          path: kind
+          value: Deployment
+      # Pinned alongside the two values below because they are meaningless
+      # without it: MaxUnavailable() reports 0 for any strategy that is not
+      # RollingUpdate, so a switch to Recreate would satisfy the intent of this
+      # test by a different route while leaving the rollingUpdate block behind
+      # as dead configuration the API server then rejects at apply.
+      - equal:
+          path: spec.strategy.type
+          value: RollingUpdate
+        documentSelector:
+          path: kind
+          value: Deployment
+      - equal:
+          path: spec.strategy.rollingUpdate.maxUnavailable
+          value: 0
+        documentSelector:
+          path: kind
+          value: Deployment
+      - equal:
+          path: spec.strategy.rollingUpdate.maxSurge
+          value: 1
+        documentSelector:
+          path: kind
+          value: Deployment
+      - equal:
+          path: spec.template.spec.hostNetwork
+          value: true
+        documentSelector:
+          path: kind
+          value: Deployment
+      - notExists:
+          path: spec.template.spec.containers[*].ports
+        documentSelector:
+          path: kind
+          value: Deployment
+      - notExists:
+          path: spec.template.spec.initContainers[*].ports
+        documentSelector:
+          path: kind
+          value: Deployment
+      # The three argument asserts read containers[0], so pin which container
+      # that is. A container inserted ahead of the operator would otherwise
+      # shift the index and leave them asserting about something else.
+      - equal:
+          path: spec.template.spec.containers[0].name
+          value: cozystack-operator
+        documentSelector:
+          path: kind
+          value: Deployment
+      # contains is a membership test with no notion of position, while Go's
+      # flag package keeps the last occurrence, so these two alone stay green
+      # whether a duplicate lands before the =0 and loses or after it and binds
+      # the port — they cannot tell the two apart. Moving the =0 flag last
+      # would fix the process without making these asserts catch anything. The
+      # notContains pair below closes that for the two addresses this binary
+      # defaults its own flags to; any other address still slips through.
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: --metrics-bind-address=0
+        documentSelector:
+          path: kind
+          value: Deployment
+      - notContains:
+          path: spec.template.spec.containers[0].args
+          content: --metrics-bind-address=:8080
+        documentSelector:
+          path: kind
+          value: Deployment
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: --health-probe-bind-address=0
+        documentSelector:
+          path: kind
+          value: Deployment
+      - notContains:
+          path: spec.template.spec.containers[0].args
+          content: --health-probe-bind-address=:8081
+        documentSelector:
+          path: kind
+          value: Deployment
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: --leader-elect=true
+        documentSelector:
+          path: kind
+          value: Deployment
+      # Only the httpGet field is asserted absent, not the probes themselves, so
+      # an exec probe stays legitimate.
+      - notExists:
+          path: spec.template.spec.containers[*].readinessProbe.httpGet
+        documentSelector:
+          path: kind
+          value: Deployment
+      - notExists:
+          path: spec.template.spec.containers[*].livenessProbe.httpGet
+        documentSelector:
+          path: kind
+          value: Deployment
+      - notExists:
+          path: spec.template.spec.containers[*].startupProbe.httpGet
+        documentSelector:
+          path: kind
+          value: Deployment
+
+  - it: keeps the strategy and every surge precondition on the generic variant
+    set:
+      cozystackOperator.variant: generic
+      cozystack.apiServerHost: api.example.com
+    asserts: *surgeSafe
+
+  - it: keeps the strategy and every surge precondition on the hosted variant
+    set:
+      cozystackOperator.variant: hosted
+    asserts: *surgeSafe
diff --git a/packages/core/installer/tests/system_defaults_limitrange_test.yaml b/packages/core/installer/tests/system_defaults_limitrange_test.yaml
new file mode 100644
index 0000000000..534ac1f4d8
--- /dev/null
+++ b/packages/core/installer/tests/system_defaults_limitrange_test.yaml
@@ -0,0 +1,71 @@
+suite: cozystack-operator system namespace memory defaults
+
+# The operator maintains a LimitRange in every system namespace so that system
+# components carry a memory limit. Only a limit sets memory.max on the pod cgroup,
+# and the Talos userspace OOM handler (v1.12+) drops cgroups with memory.max from
+# its victim set — without it, system components are killed on behalf of tenant
+# workloads that caused the pressure but do have limits.
+#
+# Both knobs default to "" so the operator's own defaults (32Gi / 32Mi) apply, and
+# "0" must reach the operator rather than being swallowed as empty: it is how an
+# operator disables the LimitRange.
+
+templates:
+  - templates/cozystack-operator.yaml
+
+# cozystack-operator.yaml renders a ServiceAccount, a ClusterRoleBinding and the
+# operator Deployment; every assert is pinned to the Deployment.
+tests:
+  - it: unset knobs render no flags, leaving the operator defaults in force
+    set:
+      cozystackOperator.variant: talos
+    asserts:
+      # Asserted as the empty-valued flag forms rather than as the whole args
+      # list. Dropping the `ne … ""` guard renders exactly these, since both
+      # values default to "", so this still catches the regression it is here
+      # for. Pinning the whole list instead would embed the platform source
+      # digest, which breaks the test on every unrelated digest bump and trips
+      # the first-party image-ref guard in promote-rewrite-tags_test.bats.
+      - notContains:
+          path: spec.template.spec.containers[0].args
+          content: --system-namespace-memory-limit=
+        documentSelector:
+          path: kind
+          value: Deployment
+      - notContains:
+          path: spec.template.spec.containers[0].args
+          content: --system-namespace-memory-request=
+        documentSelector:
+          path: kind
+          value: Deployment
+
+  - it: both knobs are passed through when set
+    set:
+      cozystackOperator.variant: talos
+      cozystackOperator.systemNamespaceMemoryLimit: 8Gi
+      cozystackOperator.systemNamespaceMemoryRequest: 64Mi
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: --system-namespace-memory-limit=8Gi
+        documentSelector:
+          path: kind
+          value: Deployment
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: --system-namespace-memory-request=64Mi
+        documentSelector:
+          path: kind
+          value: Deployment
+
+  - it: a zero limit reaches the operator, which is how the LimitRange is disabled
+    set:
+      cozystackOperator.variant: talos
+      cozystackOperator.systemNamespaceMemoryLimit: 0
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: --system-namespace-memory-limit=0
+        documentSelector:
+          path: kind
+          value: Deployment
diff --git a/packages/core/installer/values.yaml b/packages/core/installer/values.yaml
index 3216fdc52e..b080fd4339 100644
--- a/packages/core/installer/values.yaml
+++ b/packages/core/installer/values.yaml
@@ -7,9 +7,23 @@ bareNamespace: false
 cozystackOperator:
   # Deployment variant: talos, generic, hosted
   variant: talos
-  image: ghcr.io/cozystack/cozystack/cozystack-operator:v1.4.0-rc.2@sha256:54f6013f97e9b9f028ba1c99f6b315119c0c1b16ab4ba042fab14ee3c4789e17
+  # Platform version this install reports (telemetry, observability). Supplied
+  # as deploy-time data, not baked into the image — so a release-candidate image
+  # can be promoted to stable by retagging alone. Injected as the
+  # COZYSTACK_VERSION env var on the operator; when empty the operator falls back
+  # to the value baked at build time. The Makefile sets this for the
+  # kubectl-apply release artifacts (_out/assets/cozystack-operator-*.yaml).
+  platformVersion: ""
+  # Stop the operator sending cluster telemetry (nodes, storage, packages) to
+  # https://telemetry.cozystack.io. This covers the OPERATOR only. The second
+  # collector, cozystack-controller, reports application counts and is
+  # configured through the platform Package — set telemetry.disabled there as
+  # well, or the opt-out is partial. Declared here rather than left implicit
+  # because the documented opt-out is a `--set` against this key.
+  disableTelemetry: false
+  image: ghcr.io/cozystack/cozystack/cozystack-operator:v1.6.0@sha256:93b305f78823b070c59ca631b213e39bd9d8a256d5c520f156a03f5f72f57a5d
   platformSourceUrl: 'oci://ghcr.io/cozystack/cozystack/cozystack-packages'
-  platformSourceRef: 'digest=sha256:c950daef3c15108ebab4e31a3c04ec7c0800ec97da807236c164f444743f8347'
+  platformSourceRef: 'digest=sha256:bf68208730860fa8e47f378a0260e79a0262e0783fa63ba4f7f97f57a48b2d23'
   # When non-empty, overrides the operator's --helmrelease-interval flag
   # (operator default: 5m). E2E sets this to 30s; production should leave empty.
   helmReleaseInterval: ""
@@ -29,6 +43,26 @@ cozystackOperator:
   # (operator default: 5). Number of release revisions Helm keeps per HR.
   # Use 0 for unlimited; lower values reduce Secret accumulation in test clusters.
   helmReleaseMaxHistory: ""
+  # Default container memory limit in eligible system namespaces, including kube-system.
+  # Empty selects the operator default (32Gi); 0 removes managed LimitRanges.
+  # Lowering or an oversized request creates a durable hold. A cluster administrator
+  # must acknowledge its exact target before defaulting resumes; disabling retains holds.
+  # Explicit container limits and foreign namespace memory policies are preserved.
+  # See docs/operations/system-memory-limits.md for sizing, exclusions and acknowledgement.
+  systemNamespaceMemoryLimit: ""
+  # Default memory request paired with the limit. Empty selects 32Mi; 0 is supported.
+  # Keep small to avoid reserving the full limit for every previously limitless container.
+  systemNamespaceMemoryRequest: ""
+  # Name of the Secret in cozy-system namespace containing credentials for the
+  # platform source. When non-empty, sets spec.secretRef on the generated
+  # OCIRepository or GitRepository resource. Secret type depends on source kind:
+  #   OCI (oci://...): kubernetes.io/dockerconfigjson with registry credentials.
+  #   Git over HTTPS:  Opaque secret with `username`+`password`, or `bearerToken`.
+  #   Git over SSH:    Opaque secret with `identity` (PEM private key) and `known_hosts`.
+  # The Secret must already exist in cozy-system before the operator reconciles;
+  # otherwise source-controller will report a failed condition until it is created.
+  # See FluxCD source-controller docs for the exact key layout per scheme.
+  platformSourceSecret: ''
 # Generic variant configuration (only used when cozystackOperator.variant=generic)
 cozystack:
   # Kubernetes API server host (IP only, no protocol/port)
diff --git a/packages/core/platform/Makefile b/packages/core/platform/Makefile
index 4461210338..94a6c17e5e 100644
--- a/packages/core/platform/Makefile
+++ b/packages/core/platform/Makefile
@@ -28,12 +28,20 @@ unprotect:
 image: image-migrations
 
 image-migrations:
+	# Vendor the v1alpha2 CRDs into the build context so migration 50 can ensure
+	# they exist before adoption (the etcd-operator-crds HelmRelease only installs
+	# AFTER this pre-upgrade hook). Copied from the committed source of truth —
+	# no build-time network fetch, stays in lockstep with the chart. Removed again
+	# after the build; the leading rm reclaims a stale copy from a failed build.
+	rm -rf images/migrations/etcd-operator-crds
+	mkdir -p images/migrations/etcd-operator-crds
+	cp ../../system/etcd-operator-crds/templates/*.yaml images/migrations/etcd-operator-crds/
 	docker buildx build images/migrations \
 		$(call image-tags,platform-migrations,v$(COZYSTACK_VERSION)) \
-		--cache-from type=registry,ref=$(REGISTRY)/platform-migrations:latest \
-		--cache-to type=inline \
+		$(call cache-args,platform-migrations) \
 		--metadata-file images/migrations.json \
 		$(BUILDX_ARGS)
+	rm -rf images/migrations/etcd-operator-crds
 	IMAGE="$(REGISTRY)/platform-migrations:$(IMAGE_TAG)@$$(yq -e -o json -r '.["containerimage.digest"]' images/migrations.json)" \
 		yq --inplace '.migrations.image = strenv(IMAGE)' values.yaml
 	rm -f images/migrations.json
diff --git a/packages/core/platform/files/gpu-passthrough-defaults.yaml b/packages/core/platform/files/gpu-passthrough-defaults.yaml
new file mode 100644
index 0000000000..22b682c3a1
--- /dev/null
+++ b/packages/core/platform/files/gpu-passthrough-defaults.yaml
@@ -0,0 +1,89 @@
+# NVIDIA datacenter GPUs commonly used in passthrough VFIO mode. Used by
+# bundles/iaas.yaml when bundles.iaas.gpuOperatorVariant=default and
+# cozystack.gpu-operator is in bundles.enabledPackages. Auto-injected into
+# the KubeVirt CR at spec.configuration.permittedHostDevices.pciHostDevices.
+#
+# PCI vendor:device pairs are stable vendor-assigned identifiers under the
+# PCI-SIG-administered namespace and do not drift across driver versions.
+#
+# The resourceName is what nvidia-sandbox-device-plugin
+# (nvcr.io/nvidia/kubevirt-gpu-device-plugin, the image shipped by the
+# gpu-operator package) advertises on the node. The plugin derives it
+# mechanically from the device's PCI-IDs database name: uppercase the
+# name, turn "/", "." and whitespace into "_", then strip the remaining
+# non-alphanumerics (the "[" / "]" around the model). So
+# "TU104GL [Tesla T4]" becomes nvidia.com/TU104GL_TESLA_T4 and
+# "GA100GL [A30 PCIe]" becomes nvidia.com/GA100GL_A30_PCIE — the slug
+# carries every token the PCI-IDs string holds (die suffix "GL", the
+# "Tesla" brand on Turing/Volta, form factor, memory), not a tidy
+# <arch>_<model>. The names here track the pci.ids snapshot bundled in
+# the plugin image; a different plugin build can emit a different string.
+# Always confirm against the live node (kubectl describe node <node> |
+# grep nvidia.com/) and extend or replace via .Values.gpu.permittedHostDevices
+# / .Values.gpu.replaceDefaults when it differs.
+#
+# externalResourceProvider: true is mandatory here — the resource is
+# published by the sandbox-device-plugin DaemonSet, not by KubeVirt itself.
+pciHostDevices:
+# Hopper
+- pciVendorSelector: "10DE:2335"
+  resourceName: nvidia.com/GH100_H200_SXM_141GB
+  externalResourceProvider: true
+- pciVendorSelector: "10DE:2330"
+  resourceName: nvidia.com/GH100_H100_SXM5_80GB
+  externalResourceProvider: true
+- pciVendorSelector: "10DE:2331"
+  resourceName: nvidia.com/GH100_H100_PCIE
+  externalResourceProvider: true
+- pciVendorSelector: "10DE:2321"
+  resourceName: nvidia.com/GH100_H100L_94GB
+  externalResourceProvider: true
+# Ada Lovelace (datacenter SKUs)
+- pciVendorSelector: "10DE:26B9"
+  resourceName: nvidia.com/AD102GL_L40S
+  externalResourceProvider: true
+- pciVendorSelector: "10DE:26B5"
+  resourceName: nvidia.com/AD102GL_L40
+  externalResourceProvider: true
+- pciVendorSelector: "10DE:27B8"
+  resourceName: nvidia.com/AD104GL_L4
+  externalResourceProvider: true
+# Ampere
+- pciVendorSelector: "10DE:20B2"
+  resourceName: nvidia.com/GA100_A100_SXM4_80GB
+  externalResourceProvider: true
+- pciVendorSelector: "10DE:20B0"
+  resourceName: nvidia.com/GA100_A100_SXM4_40GB
+  externalResourceProvider: true
+- pciVendorSelector: "10DE:20B5"
+  resourceName: nvidia.com/GA100_A100_PCIE_80GB
+  externalResourceProvider: true
+- pciVendorSelector: "10DE:20F1"
+  resourceName: nvidia.com/GA100_A100_PCIE_40GB
+  externalResourceProvider: true
+- pciVendorSelector: "10DE:20B7"
+  resourceName: nvidia.com/GA100GL_A30_PCIE
+  externalResourceProvider: true
+- pciVendorSelector: "10DE:2235"
+  resourceName: nvidia.com/GA102GL_A40
+  externalResourceProvider: true
+- pciVendorSelector: "10DE:2236"
+  resourceName: nvidia.com/GA102GL_A10
+  externalResourceProvider: true
+# Turing
+- pciVendorSelector: "10DE:1EB8"
+  resourceName: nvidia.com/TU104GL_TESLA_T4
+  externalResourceProvider: true
+# Volta
+- pciVendorSelector: "10DE:1DB1"
+  resourceName: nvidia.com/GV100GL_TESLA_V100_SXM2_16GB
+  externalResourceProvider: true
+- pciVendorSelector: "10DE:1DB5"
+  resourceName: nvidia.com/GV100GL_TESLA_V100_SXM2_32GB
+  externalResourceProvider: true
+- pciVendorSelector: "10DE:1DB4"
+  resourceName: nvidia.com/GV100GL_TESLA_V100_PCIE_16GB
+  externalResourceProvider: true
+- pciVendorSelector: "10DE:1DF6"
+  resourceName: nvidia.com/GV100GL_TESLA_V100S_PCIE_32GB
+  externalResourceProvider: true
diff --git a/packages/core/platform/files/gpu-vgpu-defaults.yaml b/packages/core/platform/files/gpu-vgpu-defaults.yaml
new file mode 100644
index 0000000000..fe5ac1fbd3
--- /dev/null
+++ b/packages/core/platform/files/gpu-vgpu-defaults.yaml
@@ -0,0 +1,58 @@
+# NVIDIA vGPU profiles to EXPOSE to VMs in vGPU mode. Used by
+# bundles/iaas.yaml when bundles.iaas.gpuOperatorVariant=vgpu and
+# cozystack.gpu-operator is in bundles.enabledPackages. Auto-injected
+# into the KubeVirt CR at spec.configuration.permittedHostDevices.mediatedDevices.
+#
+# Division of labour: the GPU Operator's vGPU Device Manager CREATES the
+# mdev devices on each node from a name-based profile config; KubeVirt
+# only EXPOSES the already-created mdevs to VMs, matched by profile name
+# via mdevNameSelector. This file therefore carries only the name-based
+# exposure list — it does NOT ship a mediatedDevicesConfiguration block.
+# That block's mediatedDeviceTypes are numeric nvidia-NNN ids that make
+# KubeVirt itself create mdevs, but those ids are per-(SKU, driver) sysfs
+# indices with no portable value, and would duplicate the Device
+# Manager. Operators who deliberately want KubeVirt to drive creation set
+# host-verified ids via .Values.gpu.mediatedDevicesConfiguration instead.
+#
+# mdevNameSelector must match the on-host profile name the driver exposes
+# under /sys/bus/pci/devices/<BDF>/mdev_supported_types/*/name — which is
+# driver-branch-dependent ("NVIDIA A100-40C" on the vGPU 13+/AIE branch,
+# "GRID A100-40C" on older GRID drivers). The profiles below cover the
+# 24Q/48Q and whole-card C splits on the families cozystack supports for
+# vGPU (Ampere and earlier — Ada Lovelace and Blackwell use per-VF NVIDIA
+# sysfs and are out of scope; see system/gpu-operator/values-vgpu.yaml).
+# Verify against the live node and override via
+# .Values.gpu.permittedHostDevices / .Values.gpu.replaceDefaults if your
+# driver exposes different names:
+#
+#   for t in /sys/bus/pci/devices/<BDF>/mdev_supported_types/*; do \
+#     echo "$(basename "$t") -> $(cat "$t"/name)"; done
+#
+# externalResourceProvider: true is mandatory — the mediated devices are
+# published by the vGPU Manager DaemonSet, not by KubeVirt itself.
+permittedHostDevices:
+  mediatedDevices:
+  - mdevNameSelector: NVIDIA A100-40C
+    resourceName: nvidia.com/A100-40C
+    externalResourceProvider: true
+  - mdevNameSelector: NVIDIA A100-80C
+    resourceName: nvidia.com/A100-80C
+    externalResourceProvider: true
+  - mdevNameSelector: NVIDIA A40-48Q
+    resourceName: nvidia.com/A40-48Q
+    externalResourceProvider: true
+  - mdevNameSelector: NVIDIA A40-24Q
+    resourceName: nvidia.com/A40-24Q
+    externalResourceProvider: true
+  - mdevNameSelector: NVIDIA A30-24C
+    resourceName: nvidia.com/A30-24C
+    externalResourceProvider: true
+  - mdevNameSelector: NVIDIA A10-24Q
+    resourceName: nvidia.com/A10-24Q
+    externalResourceProvider: true
+  - mdevNameSelector: NVIDIA V100D-32C
+    resourceName: nvidia.com/V100D-32C
+    externalResourceProvider: true
+  - mdevNameSelector: NVIDIA T4-16Q
+    resourceName: nvidia.com/T4-16Q
+    externalResourceProvider: true
diff --git a/packages/core/platform/images/migrations/Dockerfile b/packages/core/platform/images/migrations/Dockerfile
index b35808d55e..6084a9e5ee 100644
--- a/packages/core/platform/images/migrations/Dockerfile
+++ b/packages/core/platform/images/migrations/Dockerfile
@@ -1,10 +1,40 @@
-FROM alpine:3.22
+# migration 50 runs the etcd-migrate adoption tool to move legacy etcd.aenix.io
+# clusters onto etcd-operator.cozystack.io/v1alpha2. etcd-migrate is published
+# as a standalone CLI asset of the etcd-operator release (the operator image
+# itself contains only /manager), so we fetch the linux binary for the build's
+# target arch and verify it against the release's cli-SHA256SUMS.txt. Bump
+# ETCD_OPERATOR_VERSION (and the pinned checksums below) together, keeping it in
+# sync with packages/system/etcd-operator (Chart appVersion).
+FROM alpine:3.24@sha256:294b683cb724975bec92580e1e685676bd4b50bda910ddb8c51d4cabeaec77e6
+
+ARG TARGETOS
+ARG TARGETARCH
+ARG ETCD_OPERATOR_VERSION=v0.5.2
 
 RUN wget -O- https://github.com/cozystack/cozyhr/raw/refs/heads/main/hack/install.sh | sh -s -- -v 1.6.1
 
 RUN apk add --no-cache kubectl helm coreutils git jq ca-certificates bash curl
 
+# SHA-256 of etcd-migrate-linux-<arch> from the etcd-operator v0.5.2 release
+# (cli-SHA256SUMS.txt). The migrations image only ever runs as a Kubernetes Job,
+# so only linux arches are needed.
+RUN set -eux; \
+    case "${TARGETARCH}" in \
+      amd64) sha256="34fd617e8c4a6312da99e0c449a6afe7ff92518f263d17c5a082087adbdf1936" ;; \
+      arm64) sha256="05fc3096a594c15a963fc18ee4bde17575def48912730cc47225a43aa276859f" ;; \
+      *) echo "unsupported TARGETARCH=${TARGETARCH:-<empty>} (build with buildx)" >&2; exit 1 ;; \
+    esac; \
+    curl -fsSL -o /usr/bin/etcd-migrate \
+      "https://github.com/cozystack/etcd-operator/releases/download/${ETCD_OPERATOR_VERSION}/etcd-migrate-${TARGETOS:-linux}-${TARGETARCH}"; \
+    echo "${sha256}  /usr/bin/etcd-migrate" | sha256sum -c -; \
+    chmod +x /usr/bin/etcd-migrate
+
 COPY migrations /migrations
+# v1alpha2 etcd CRDs, vendored into the build context by `make image-migrations`.
+# migration 50 applies these before adoption so it does not deadlock waiting for
+# the etcd-operator-crds HelmRelease (which only reconciles after the migration
+# pre-upgrade hook completes).
+COPY etcd-operator-crds /etcd-operator-crds
 COPY run-migrations.sh /usr/bin/run-migrations.sh
 
 WORKDIR /migrations
diff --git a/packages/core/platform/images/migrations/migrations/42 b/packages/core/platform/images/migrations/migrations/42
index adc4f0fea3..5844f4acc4 100755
--- a/packages/core/platform/images/migrations/migrations/42
+++ b/packages/core/platform/images/migrations/migrations/42
@@ -14,29 +14,20 @@
 # the next chart-driven apply sees no diff.
 #
 # 3-way-merge note: this apply records the no-delete label in the kubectl
-# last-applied-configuration annotation under the default field manager.
-# Any future migration that re-stamps cozystack-version via the same field
-# manager MUST include the label inline (matching the chart template at
-# templates/cozystack-version.yaml) — a label-less apply by the same field
-# manager would strip it.
+# last-applied-configuration annotation under the default field manager. A
+# label-less apply by the same field manager would strip it, so the manifest
+# is rendered by the shared helper (lib/cozystack-version.sh) that every
+# migration sources rather than a hand-copied heredoc.
 
 set -euo pipefail
 
+# shellcheck source=lib/cozystack-version.sh
+. "$(dirname "$0")/lib/cozystack-version.sh"
+
 NAMESPACE="${NAMESPACE:-cozy-system}"
 DRY_RUN="${MIGRATION_DRY_RUN:-0}"
 
-MANIFEST=$(cat <<EOF
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: cozystack-version
-  namespace: ${NAMESPACE}
-  labels:
-    platform.cozystack.io/no-delete: "true"
-data:
-  version: "43"
-EOF
-)
+MANIFEST=$(render_cozystack_version_manifest 43)
 
 if [ "$DRY_RUN" = "1" ]; then
   echo "[dry-run] would apply:"
diff --git a/packages/core/platform/images/migrations/migrations/43 b/packages/core/platform/images/migrations/migrations/43
index 0c421d1fce..e7d56e7d04 100755
--- a/packages/core/platform/images/migrations/migrations/43
+++ b/packages/core/platform/images/migrations/migrations/43
@@ -1,47 +1,34 @@
 #!/bin/sh
 # Migration 43 --> 44
-# Adopt existing Cluster/seaweedfs-db resources into the new seaweedfs-db
+# Adopt existing Cluster/seaweedfs-db resources into the new <name>-db
 # HelmRelease introduced in this release.
 #
-# Pre-split, the CNPG Cluster lived inside the seaweedfs-system Helm release.
-# Splitting moves it to a new release named seaweedfs-db. We rewrite the
-# helm ownership annotations so Helm adopts the existing Cluster instead of
-# erroring on the next reconcile, and stamp helm.sh/resource-policy: keep
-# so the seaweedfs-system upgrade (which no longer renders the Cluster) does
-# not delete it during the transition.
+# Pre-split, the CNPG Cluster lived inside the <name>-system Helm release.
+# Splitting moves it to a new release named <name>-db. We rewrite the helm
+# ownership annotations so Helm adopts the existing Cluster instead of erroring
+# on the next reconcile, and stamp helm.sh/resource-policy: keep so the
+# <name>-system upgrade (which no longer renders the Cluster) does not delete it
+# during the transition.
+#
+# The hand-over itself lives in lib/seaweedfs-db-adopt.sh, shared with migration
+# 53. This migration originally compared the owning release name against the
+# literal "seaweedfs-system", which silently skipped every instance NOT named
+# `seaweedfs`: SeaweedFS is a user-creatable kind, so an instance `foo` is owned
+# by `foo-system`. Those tenants got no `keep`, and the <name>-system upgrade
+# pruned their Cluster — taking the filer metadata, and with it all of the
+# tenant's S3. The shared helper matches the `-system` SUFFIX instead, covering
+# every instance name; migration 53 repairs clusters that already ran the
+# hardcoded version.
 
 set -euo pipefail
 
-# Iterate every namespace that has a Cluster named "seaweedfs-db".
-for ns in $(kubectl get cluster.postgresql.cnpg.io -A \
-              -o jsonpath='{range .items[?(@.metadata.name=="seaweedfs-db")]}{.metadata.namespace}{"\n"}{end}'); do
-  current=$(kubectl get cluster.postgresql.cnpg.io seaweedfs-db -n "$ns" \
-    -o jsonpath='{.metadata.annotations.meta\.helm\.sh/release-name}' 2>/dev/null || true)
-  if [ "$current" = "seaweedfs-system" ]; then
-    echo "Re-annotating Cluster/seaweedfs-db in $ns: seaweedfs-system -> seaweedfs-db"
-    kubectl annotate cluster.postgresql.cnpg.io seaweedfs-db -n "$ns" \
-      meta.helm.sh/release-name=seaweedfs-db \
-      helm.sh/resource-policy=keep \
-      --overwrite
-    # release-namespace stays the same (tenant namespace, e.g. tenant-root)
-  fi
-done
+# shellcheck source=lib/cozystack-version.sh
+. "$(dirname "$0")/lib/cozystack-version.sh"
+# shellcheck source=lib/seaweedfs-db-adopt.sh
+. "$(dirname "$0")/lib/seaweedfs-db-adopt.sh"
+
+adopt_seaweedfs_db_clusters
 
-# Stamp version.
-# Mirror migration 42's labeled manifest. A label-less apply by the same field
-# manager (kubectl create | kubectl apply) would strip the
-# platform.cozystack.io/no-delete label migration 42 added, dropping
-# cozystack-version out of the cozystack-no-delete-guardrail
-# ValidatingAdmissionPolicy. templates/cozystack-version.yaml only re-renders the
-# labeled ConfigMap on first install, so the label must be carried inline here.
-kubectl apply --filename - <<EOF
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: cozystack-version
-  namespace: cozy-system
-  labels:
-    platform.cozystack.io/no-delete: "true"
-data:
-  version: "44"
-EOF
+# Stamp version. The labeled manifest lives in the shared helper so it cannot
+# drift back to a label-less apply that strips platform.cozystack.io/no-delete.
+stamp_cozystack_version 44
diff --git a/packages/core/platform/images/migrations/migrations/44 b/packages/core/platform/images/migrations/migrations/44
new file mode 100755
index 0000000000..96e786a3a0
--- /dev/null
+++ b/packages/core/platform/images/migrations/migrations/44
@@ -0,0 +1,31 @@
+#!/bin/sh
+# Migration 44 --> 45
+# Tenant Flux sharding: the hand-rolled flux-tenants helm-controller shard is
+# replaced by operator-managed helm-controller-shard<i> Deployments
+# (flux-shard-operator). The operator itself drains and deletes flux-tenants
+# at runtime once no HelmRelease carries sharding.fluxcd.io/key=tenants; this
+# migration only removes a leftover Deployment defensively, and only when that
+# guard is already satisfied — flux-tenants must keep reconciling any
+# HelmRelease still on the legacy bucket.
+
+set -euo pipefail
+
+# shellcheck source=lib/cozystack-version.sh
+. "$(dirname "$0")/lib/cozystack-version.sh"
+
+if kubectl get deployment flux-tenants -n cozy-fluxcd >/dev/null 2>&1; then
+  # No early-close (head) in the pipe: under pipefail a large name list would
+  # SIGPIPE kubectl and abort the migration.
+  remaining=$(kubectl get helmreleases.helm.toolkit.fluxcd.io -A \
+    -l sharding.fluxcd.io/key=tenants -o name | wc -l)
+  if [ "$remaining" -eq 0 ]; then
+    echo "No HelmReleases left on the legacy tenants shard; removing flux-tenants Deployment"
+    kubectl delete deployment flux-tenants -n cozy-fluxcd --ignore-not-found=true
+  else
+    echo "HelmReleases still carry sharding.fluxcd.io/key=tenants; leaving flux-tenants in place (flux-shard-operator retires it after the backfill drains)"
+  fi
+fi
+
+# Stamp version. The labeled manifest lives in the shared helper so it cannot
+# drift back to a label-less apply that strips platform.cozystack.io/no-delete.
+stamp_cozystack_version 45
diff --git a/packages/core/platform/images/migrations/migrations/45 b/packages/core/platform/images/migrations/migrations/45
new file mode 100755
index 0000000000..8b06dd2c4d
--- /dev/null
+++ b/packages/core/platform/images/migrations/migrations/45
@@ -0,0 +1,129 @@
+#!/bin/bash
+# Migration 45 --> 46
+# Pin KubeadmConfigTemplate / KubeadmConfig objects with helm.sh/resource-policy=keep
+# so the Talos worker migration does not let Helm prune them while CAPI still
+# references them from the existing kubeadm-backed MachineSet.
+#
+# This release drops KubeadmConfigTemplate from the kubernetes app chart templates
+# entirely (workers move to TalosConfigTemplate). On upgrade Helm sees the
+# resource present in the previous release manifest but absent in the new one
+# and issues a delete. The old MachineSet, which is still around until CAPI
+# finishes rolling workers onto Talos, then has its bootstrap.configRef pointing
+# at a missing object and floods controller-manager logs with reconcile errors.
+# In pathological cases (slow Talos image fetch from factory.talos.dev,
+# MachineHealthCheck remediation, etc.) workers can hang in pending state with
+# nothing to bootstrap from.
+#
+# The fix is to annotate every Helm-managed KubeadmConfigTemplate (and any
+# Helm-managed KubeadmConfig) with helm.sh/resource-policy=keep *before* the new
+# chart renders. The KubeadmConfig children CAPI spawns from the template are
+# owned by their Machine, not Helm (no app.kubernetes.io/managed-by=Helm label),
+# so Helm never prunes them and the managed-by selector below leaves them alone.
+# Helm then leaves the template alone, CAPI keeps its references intact, and the
+# resources disappear naturally when the old MachineSet is finally
+# garbage-collected after the Talos rollover completes.
+#
+# Idempotent: re-running on already-annotated objects is a no-op
+# (kubectl annotate --overwrite tolerates the existing value).
+#
+# Strict failure semantics: a failed annotate exits 1 to halt
+# run-migrations.sh, leaving CURRENT_VERSION at 45 so this migration retries
+# on the next platform upgrade. Best-effort semantics (exit 0 on partial
+# failure) are unsafe here because any KubeadmConfigTemplate left
+# un-pinned can be pruned by Helm during the chart upgrade, which then
+# breaks the still-extant kubeadm-backed MachineSet's bootstrap.configRef
+# while the Talos rollover is in flight — recovering that requires
+# manually recreating the templates with the right helm ownership
+# annotations and is not something we want to gate on a "best-effort"
+# migration.
+
+set -euo pipefail
+
+# shellcheck source=lib/cozystack-version.sh
+. "$(dirname "$0")/lib/cozystack-version.sh"
+
+DRY_RUN="${MIGRATION_DRY_RUN:-0}"
+FAILURES=0
+PATCHED=0
+SKIPPED=0
+
+KEEP_ANNOTATION="helm.sh/resource-policy=keep"
+# Helm injects the app.kubernetes.io/managed-by=Helm LABEL into every resource it
+# renders (e.g. the chart's KubeadmConfigTemplate). meta.helm.sh/release-name is an
+# ANNOTATION, not a label, so it cannot be used as a --selector — doing so silently
+# matches nothing and the keep annotation is never applied.
+HELM_MANAGED_SELECTOR="app.kubernetes.io/managed-by=Helm"
+
+annotate_object() {
+  local kind="$1" ns="$2" name="$3"
+  local current
+
+  current=$(kubectl get "$kind" --namespace "$ns" "$name" \
+    --output 'jsonpath={.metadata.annotations.helm\.sh/resource-policy}' 2>/dev/null || true)
+
+  if [ "$current" = "keep" ]; then
+    SKIPPED=$((SKIPPED + 1))
+    return 0
+  fi
+
+  if [ "$DRY_RUN" = "1" ]; then
+    echo "[dry-run] would annotate $kind $ns/$name $KEEP_ANNOTATION"
+    PATCHED=$((PATCHED + 1))
+    return 0
+  fi
+
+  local kubectl_err
+  if kubectl_err=$(kubectl annotate "$kind" --namespace "$ns" "$name" \
+       "$KEEP_ANNOTATION" --overwrite 2>&1 >/dev/null); then
+    echo "Annotated $kind $ns/$name"
+    PATCHED=$((PATCHED + 1))
+  else
+    echo "WARN: failed to annotate $kind $ns/$name: ${kubectl_err:-unknown error}" >&2
+    FAILURES=$((FAILURES + 1))
+  fi
+}
+
+list_helm_managed() {
+  local kind="$1" out
+  if ! out=$(kubectl get "$kind" --all-namespaces \
+       --selector "$HELM_MANAGED_SELECTOR" \
+       --output 'jsonpath={range .items[*]}{.metadata.namespace}{"\t"}{.metadata.name}{"\n"}{end}' \
+       2>&1); then
+    case "$out" in
+      *"the server doesn't have a resource type"*|*"no matches for kind"*|*"NotFound"*) return 0 ;;
+    esac
+    echo "ERROR: kubectl get $kind failed: $out" >&2
+    return 1
+  fi
+  printf '%s' "$out"
+}
+
+for kind in kubeadmconfigtemplates.bootstrap.cluster.x-k8s.io \
+            kubeadmconfigs.bootstrap.cluster.x-k8s.io; do
+  echo "==> Pinning Helm-managed $kind with $KEEP_ANNOTATION"
+  items=$(list_helm_managed "$kind") || exit 1
+  while IFS=$'\t' read -r ns name; do
+    [ -z "$ns" ] && continue
+    annotate_object "$kind" "$ns" "$name"
+  done <<<"$items"
+done
+
+echo "==> Summary: patched=$PATCHED skipped=$SKIPPED failures=$FAILURES" | tee /dev/stderr
+
+if [ "$DRY_RUN" = "1" ]; then
+  echo "Dry-run complete; version stamp not advanced"
+  exit 0
+fi
+
+if [ "$FAILURES" -gt 0 ]; then
+  echo "ERROR: $FAILURES annotate(s) failed; halting run-migrations.sh and leaving CURRENT_VERSION at 45 so this migration retries on the next platform upgrade." >&2
+  echo "ERROR: any un-pinned KubeadmConfigTemplate left behind is at risk of being pruned by the kubernetes chart upgrade; investigate the failed annotate(s) above before retrying." >&2
+  exit 1
+fi
+
+# Stamp version=46. The labeled manifest lives in the shared helper so it
+# cannot drift back to a label-less apply that strips the
+# platform.cozystack.io/no-delete label migration 42 added (which would drop
+# cozystack-version out of the cozystack-no-delete-guardrail
+# ValidatingAdmissionPolicy).
+stamp_cozystack_version 46
diff --git a/packages/core/platform/images/migrations/migrations/46 b/packages/core/platform/images/migrations/migrations/46
new file mode 100755
index 0000000000..d8926bc9c5
--- /dev/null
+++ b/packages/core/platform/images/migrations/migrations/46
@@ -0,0 +1,118 @@
+#!/bin/bash
+# Migration 46 --> 47
+# Bump kuberneteses.apps.cozystack.io spec.version from "v1.30" to "v1.31".
+#
+# This release drops v1.30 from the Talos<->Kubernetes support matrix: Talos v1.13
+# (the version this chart pins for worker images) supports only k8s 1.31-1.36.
+# The chart now refuses to render with version: "v1.30" via an explicit fail()
+# guard in templates/_versions.tpl. Without this migration, tenants that were
+# still on v1.30 when the platform upgrade lands have their HelmRelease enter
+# a failed state and the Talos worker rollover never starts.
+#
+# This migration patches the tenant CR ahead of the chart upgrade. The bump
+# v1.30 -> v1.31 is the standard kubeadm minor upgrade path; kubeadm handles
+# kubelet/control-plane rollover during the subsequent HR reconcile, and the
+# new chart then layers the TalosConfigTemplate switch on top so workers move
+# off Ubuntu+kubeadm onto Talos in the same upgrade window.
+#
+# Idempotent: re-running on already-bumped CRs is a no-op (current != "v1.30").
+# Best-effort: a failed patch is logged and leaves the version stamp at 46 so
+# the migration retries on the next platform upgrade.
+
+set -euo pipefail
+
+# shellcheck source=lib/cozystack-version.sh
+. "$(dirname "$0")/lib/cozystack-version.sh"
+
+DRY_RUN="${MIGRATION_DRY_RUN:-0}"
+FAILURES=0
+PATCHED=0
+SKIPPED=0
+FAILED_TENANTS=""
+
+OLD_VERSION="v1.30"
+NEW_VERSION="v1.31"
+
+bump_version() {
+  local ns="$1" name="$2" current
+
+  current=$(kubectl get kuberneteses.apps.cozystack.io --namespace "$ns" "$name" \
+    --output 'jsonpath={.spec.version}' 2>/dev/null || true)
+
+  if [ "$current" != "$OLD_VERSION" ]; then
+    SKIPPED=$((SKIPPED + 1))
+    return 0
+  fi
+
+  if [ "$DRY_RUN" = "1" ]; then
+    echo "[dry-run] would patch kubernetes $ns/$name: spec.version $OLD_VERSION -> $NEW_VERSION"
+    PATCHED=$((PATCHED + 1))
+    return 0
+  fi
+
+  local kubectl_err
+  if kubectl_err=$(kubectl patch kuberneteses.apps.cozystack.io --namespace "$ns" "$name" \
+       --type merge --patch "{\"spec\":{\"version\":\"$NEW_VERSION\"}}" 2>&1 >/dev/null); then
+    echo "Patched kubernetes $ns/$name: spec.version $OLD_VERSION -> $NEW_VERSION"
+    PATCHED=$((PATCHED + 1))
+  else
+    echo "WARN: failed to patch kubernetes $ns/$name: ${kubectl_err:-unknown error}" >&2
+    FAILURES=$((FAILURES + 1))
+    FAILED_TENANTS="${FAILED_TENANTS}${FAILED_TENANTS:+,}${ns}/${name}"
+  fi
+}
+
+echo "==> Bumping kuberneteses.apps.cozystack.io spec.version $OLD_VERSION -> $NEW_VERSION"
+
+if ! items=$(kubectl get kuberneteses.apps.cozystack.io --all-namespaces \
+     --output 'jsonpath={range .items[*]}{.metadata.namespace}{"\t"}{.metadata.name}{"\n"}{end}' \
+     2>&1); then
+  case "$items" in
+    *"the server doesn't have a resource type"*|*"no matches for kind"*|*"NotFound"*)
+      echo "kuberneteses.apps.cozystack.io CRD not present; nothing to migrate"
+      items=""
+      ;;
+    *)
+      echo "ERROR: kubectl get kuberneteses.apps.cozystack.io failed: $items" >&2
+      exit 1
+      ;;
+  esac
+fi
+
+while IFS=$'\t' read -r ns name; do
+  [ -z "$ns" ] && continue
+  bump_version "$ns" "$name"
+done <<<"$items"
+
+echo "==> Summary: patched=$PATCHED skipped=$SKIPPED failures=$FAILURES" | tee /dev/stderr
+
+if [ "$DRY_RUN" = "1" ]; then
+  echo "Dry-run complete; version stamp not advanced"
+  exit 0
+fi
+
+if [ "$FAILURES" -gt 0 ]; then
+  echo "WARN: $FAILURES patch(es) failed; leaving CURRENT_VERSION at 46 for retry on next upgrade."
+  echo "WARN: failed tenants: $FAILED_TENANTS" >&2
+  # Surface the failure list as an annotation on the cozystack-version
+  # ConfigMap so operators see "which tenants are stuck at v1.30" via
+  # `kubectl describe cm -n cozy-system cozystack-version` without having
+  # to grep migration Job logs (the Job exits 0 to allow retry, which
+  # otherwise hides this state behind a green Job status).
+  kubectl annotate configmap --namespace cozy-system cozystack-version \
+    "cozystack.io/migration-46-failed-tenants=$FAILED_TENANTS" \
+    --overwrite >/dev/null 2>&1 || true
+  exit 0
+fi
+
+# Clear any annotation left by a previous partial-failure run, so a clean
+# success doesn't leave stale "failed tenants" data on the ConfigMap.
+kubectl annotate configmap --namespace cozy-system cozystack-version \
+  "cozystack.io/migration-46-failed-tenants-" >/dev/null 2>&1 || true
+
+# Stamp version=47. The labeled manifest lives in the shared helper so it
+# cannot drift back to a label-less apply that strips the
+# platform.cozystack.io/no-delete label migration 42 added (which would drop
+# cozystack-version out of the cozystack-no-delete-guardrail
+# ValidatingAdmissionPolicy).
+stamp_cozystack_version 47
diff --git a/packages/core/platform/images/migrations/migrations/47 b/packages/core/platform/images/migrations/migrations/47
new file mode 100755
index 0000000000..e5209b7746
--- /dev/null
+++ b/packages/core/platform/images/migrations/migrations/47
@@ -0,0 +1,131 @@
+#!/bin/bash
+# Migration 47 --> 48
+# Pin the implicit default "md0" node group explicitly on existing tenant
+# Kubernetes clusters.
+#
+# The kubernetes app chart used to ship a default nodeGroups.md0 in
+# values.yaml, which Helm merged into every cluster's values. The default is
+# now applied only when nodeGroups is empty (see the kubernetes chart helper
+# "kubernetes.nodeGroups"). Clusters that defined their own nodeGroups without
+# md0 were nonetheless getting md0 via the merge, and md0 is tracked in their
+# Helm release manifest; without this migration the new chart would prune the
+# live md0 MachineDeployment (→ CAPI MachineSet/Machine/node deletion) on the
+# next reconcile. We pin md0 explicitly to preserve the current node topology.
+# Operators may remove it afterwards on clusters that do not need it.
+#
+# Idempotent: clusters that already define md0 are left untouched.
+# Fail-closed: any read or patch failure aborts the migration (exit 1) before the
+# version stamp advances, so the pre-upgrade hook fails and Helm does not roll out
+# the new kubernetes chart against clusters whose md0 is not yet pinned (their
+# live md0 MachineDeployment would otherwise be pruned). CURRENT_VERSION stays at
+# 47 and the migration retries on the next upgrade.
+
+set -euo pipefail
+
+# shellcheck source=lib/cozystack-version.sh
+. "$(dirname "$0")/lib/cozystack-version.sh"
+
+DRY_RUN="${MIGRATION_DRY_RUN:-0}"
+FAILURES=0
+PATCHED=0
+SKIPPED=0
+
+# Default md0 group, matching the chart's built-in default (kubernetes.nodeGroups).
+MD0_JSON='{"minReplicas":0,"maxReplicas":10,"instanceType":"u1.medium","diskSize":"20Gi","storageClass":"","roles":["ingress-nginx"],"resources":{},"gpus":[],"kubelet":{}}'
+
+# Add .spec.nodeGroups.md0 only when nodeGroups exists and md0 is absent.
+JQ_TRANSFORM="
+  if (.spec.nodeGroups | type) == \"object\" and (.spec.nodeGroups | has(\"md0\") | not)
+  then .spec.nodeGroups.md0 = ${MD0_JSON}
+  else . end
+"
+
+list_objects() {
+  local kind="$1" out
+  if ! out=$(kubectl get "$kind" --all-namespaces \
+       --output 'jsonpath={range .items[*]}{.metadata.namespace}{"\t"}{.metadata.name}{"\n"}{end}' \
+       2>&1); then
+    # CRD not installed (kubernetes app type never registered) → nothing to do.
+    case "$out" in
+      *"the server doesn't have a resource type"*|*"no matches for kind"*|*"NotFound"*) return 0 ;;
+    esac
+    echo "ERROR: kubectl get $kind failed: $out" >&2
+    return 1
+  fi
+  printf '%s' "$out"
+}
+
+patch_md0() {
+  local ns="$1" name="$2" obj new patch kubectl_err out rc
+
+  # Distinguish "object genuinely gone" (NotFound → skip) from any other read
+  # error (RBAC/transient/timeout → failure). On success kubectl writes JSON to
+  # stdout and nothing to stderr; on failure it writes the error to stderr and
+  # nothing to stdout, so a combined capture keyed on the exit code is exact.
+  out=$(kubectl get kuberneteses.apps.cozystack.io --namespace "$ns" "$name" --output json 2>&1) && rc=0 || rc=$?
+  if [ "$rc" -ne 0 ]; then
+    case "$out" in
+      *"NotFound"*|*"not found"*)
+        echo "SKIP $ns/$name: object not found (deleted concurrently)"
+        SKIPPED=$((SKIPPED + 1)) ;;
+      *)
+        echo "WARN: failed to read $ns/$name: ${out:-unknown error}" >&2
+        FAILURES=$((FAILURES + 1)) ;;
+    esac
+    return 0
+  fi
+  obj="$out"
+
+  new=$(printf '%s' "$obj" | jq -c "$JQ_TRANSFORM")
+  if [ "$(printf '%s' "$obj" | jq -c .spec.nodeGroups)" = "$(printf '%s' "$new" | jq -c .spec.nodeGroups)" ]; then
+    echo "SKIP $ns/$name: md0 already defined (or no nodeGroups)"
+    SKIPPED=$((SKIPPED + 1))
+    return 0
+  fi
+
+  # Patch only md0 — a JSON merge patch carrying the whole re-read nodeGroups map
+  # could restore stale sibling groups if another actor changed them between the
+  # read and the patch. The transform above only ever adds md0.
+  patch=$(printf '%s' "$new" | jq -c '{spec: {nodeGroups: {md0: .spec.nodeGroups.md0}}}')
+
+  if [ "$DRY_RUN" = "1" ]; then
+    echo "[dry-run] would pin md0 on $ns/$name"
+    PATCHED=$((PATCHED + 1))
+    return 0
+  fi
+
+  if kubectl_err=$(printf '%s' "$patch" | kubectl patch kuberneteses.apps.cozystack.io \
+       --namespace "$ns" "$name" --type merge --patch-file /dev/stdin 2>&1 >/dev/null); then
+    echo "Pinned md0 on $ns/$name"
+    PATCHED=$((PATCHED + 1))
+  else
+    echo "WARN: failed to patch $ns/$name: ${kubectl_err:-unknown error}" >&2
+    FAILURES=$((FAILURES + 1))
+  fi
+}
+
+echo "==> Pinning implicit md0 node group on kuberneteses.apps.cozystack.io"
+items=$(list_objects kuberneteses.apps.cozystack.io) || exit 1
+while IFS=$'\t' read -r ns name; do
+  [ -z "$ns" ] && continue
+  patch_md0 "$ns" "$name"
+done <<<"$items"
+
+echo "==> Summary: pinned=$PATCHED skipped=$SKIPPED failures=$FAILURES" | tee /dev/stderr
+
+if [ "$DRY_RUN" = "1" ]; then
+  echo "Dry-run complete; version stamp not advanced"
+  exit 0
+fi
+
+if [ "$FAILURES" -gt 0 ]; then
+  echo "ERROR: $FAILURES read/patch(es) failed; aborting before the version stamp so the kubernetes chart upgrade does not proceed against un-pinned clusters (their live md0 MachineDeployment would be pruned). Leaving CURRENT_VERSION at 47; investigate the failures above and re-run the upgrade." >&2
+  exit 1
+fi
+
+# Stamp version via the shared helper so the cozystack-version ConfigMap keeps
+# the platform.cozystack.io/no-delete label. A label-less apply by the same
+# field manager (kubectl create configmap | kubectl apply) would strip the
+# label migration 42 added, dropping cozystack-version out of the
+# cozystack-no-delete-guardrail ValidatingAdmissionPolicy.
+stamp_cozystack_version 48
diff --git a/packages/core/platform/images/migrations/migrations/48 b/packages/core/platform/images/migrations/migrations/48
new file mode 100755
index 0000000000..4c2ae1be78
--- /dev/null
+++ b/packages/core/platform/images/migrations/migrations/48
@@ -0,0 +1,72 @@
+#!/bin/sh
+# Migration 48 --> 49
+# Backfill the app.kubernetes.io/instance release label onto pre-existing
+# ClickHouse keeper PVCs.
+#
+# PR #3072 adds app.kubernetes.io/instance to the keeper volumeClaimTemplates and
+# a post-delete hook that garbage-collects PVCs carrying that label. But the
+# altinity clickhouse-keeper-operator only stamps volumeClaimTemplates.metadata
+# .labels onto PVCs it creates *after* the change; it never re-labels PVCs that
+# already exist. Keeper PVCs provisioned before this upgrade therefore stay
+# unlabeled, the cleanup hook's selector misses them, and they keep leaking on
+# delete (issue #3057). This migration relabels them once so the hook can reclaim
+# them. The main ClickHouse data/log PVCs have carried the label since 2025-06-03
+# (well before the migration era) and need no backfill.
+#
+# Best-effort by design: the worst case if a relabel is skipped is the
+# pre-existing leak this PR set out to fix, which is strictly no worse than the
+# status quo. A transient apiserver hiccup must therefore NOT abort the whole
+# platform upgrade, so the keeper list and per-PVC reads tolerate failure
+# (|| true) rather than exiting non-zero.
+
+set -euo pipefail
+
+# shellcheck source=lib/cozystack-version.sh
+. "$(dirname "$0")/lib/cozystack-version.sh"
+
+# This migration runs platform-wide (targetVersion bump), including on clusters
+# that never installed ClickHouse. Skip the backfill when the keeper CRD is
+# absent. The `|| true` on the list additionally keeps a transient apiserver
+# error from aborting the upgrade — there is nothing safety-critical to gate on.
+if ! kubectl get crd clickhousekeeperinstallations.clickhouse-keeper.altinity.com >/dev/null 2>&1; then
+  echo "ClickHouse keeper CRD not present; skipping keeper PVC label backfill"
+  chks=""
+else
+  # Each ClickHouseKeeperInstallation is named "<release>-keeper"; its PVCs are
+  # created from the "default" volumeClaimTemplate and named
+  # "default-chk-<release>-keeper-<cluster>-<shard>-<replica>-<ordinal>".
+  # No early-close (head) in the pipe: under pipefail a large list would SIGPIPE
+  # kubectl and abort the migration.
+  chks=$(kubectl get clickhousekeeperinstallations.clickhouse-keeper.altinity.com -A \
+    -o jsonpath='{range .items[*]}{.metadata.namespace}{" "}{.metadata.name}{"\n"}{end}' || true)
+fi
+
+echo "$chks" | while read -r ns chk; do
+  [ -n "${ns:-}" ] || continue
+  release="${chk%-keeper}"
+
+  # grep exits 1 when a namespace has no matching PVCs; tolerate it so pipefail
+  # does not abort the whole migration on an empty match.
+  pvcs=$(kubectl get pvc -n "$ns" \
+    -o jsonpath='{range .items[*]}{.metadata.name}{"\n"}{end}' 2>/dev/null \
+    | grep -E "^default-chk-${chk}-" || true)
+
+  for pvc in $pvcs; do
+    [ -n "${pvc:-}" ] || continue
+    current=$(kubectl get pvc -n "$ns" "$pvc" \
+      -o jsonpath='{.metadata.labels.app\.kubernetes\.io/instance}' 2>/dev/null || true)
+    if [ "$current" = "$release" ]; then
+      echo "PVC $ns/$pvc already labeled app.kubernetes.io/instance=$release; skipping"
+      continue
+    fi
+    echo "Labeling PVC $ns/$pvc with app.kubernetes.io/instance=$release"
+    kubectl label pvc -n "$ns" "$pvc" "app.kubernetes.io/instance=$release" --overwrite
+  done
+done
+
+# Stamp version via the shared helper so the cozystack-version ConfigMap keeps
+# the platform.cozystack.io/no-delete label. A label-less apply by the same
+# field manager would strip the label migration 42 added, dropping
+# cozystack-version out of the cozystack-no-delete-guardrail
+# ValidatingAdmissionPolicy.
+stamp_cozystack_version 49
diff --git a/packages/core/platform/images/migrations/migrations/49 b/packages/core/platform/images/migrations/migrations/49
new file mode 100644
index 0000000000..ef957fe4dc
--- /dev/null
+++ b/packages/core/platform/images/migrations/migrations/49
@@ -0,0 +1,70 @@
+#!/bin/sh
+# Migration 49 --> 50
+# Backfill tenant.cozystack.io/<ancestor> labels on existing tenant namespaces.
+#
+# Tenant chart versions before this release derived the ancestor label chain by
+# splitting .Release.Namespace, which only ever reached one level up and dropped
+# the transitive ancestors (notably tenant.cozystack.io/tenant-root) for tenants
+# at depth >= 2. That broke the <ancestor>-egress CiliumClusterwideNetworkPolicy
+# (packages/apps/tenant/templates/networkpolicy.yaml): it grants an ancestor
+# reachability to a descendant namespace only when the descendant carries
+# tenant.cozystack.io/<ancestor>, so a missing tenant-root label left the root
+# ingress controller unable to reach nested tenants (upstream timeouts, #2810 /
+# #2171).
+#
+# The chart fix makes every tenant namespace self-compute its full ancestor
+# chain from its own name on the next reconcile. This migration backfills the
+# labels immediately so clusters heal without waiting on each tenant
+# HelmRelease to re-reconcile (e.g. suspended or failed releases).
+#
+# Best-effort by design: the worst case if a relabel is skipped is the
+# pre-existing missing-label bug this PR set out to fix, which is strictly no
+# worse than the status quo. A transient apiserver hiccup must therefore NOT
+# abort the whole platform upgrade, so the namespace list and per-namespace
+# relabel tolerate failure (|| true) rather than exiting non-zero. Idempotent:
+# kubectl label --overwrite only adds/refreshes the listed labels and never
+# removes others.
+
+set -euo pipefail
+
+# shellcheck source=lib/cozystack-version.sh
+. "$(dirname "$0")/lib/cozystack-version.sh"
+
+# Every tenant lives in a namespace named tenant-<...>. tenant-root is the
+# implicit chain root and carries no tenant.cozystack.io/* label (the chart
+# omits the label block for it), so it is skipped. The `|| true` keeps a
+# transient apiserver error from aborting the upgrade.
+tenant_ns=$(kubectl get namespaces \
+              -o jsonpath='{range .items[*]}{.metadata.name}{"\n"}{end}' \
+            | grep '^tenant-' || true)
+
+for ns in $tenant_ns; do
+  [ "$ns" = "tenant-root" ] && continue
+
+  # Build the ancestor label list from the namespace name: every tenant
+  # descends from tenant-root, then each progressive dash-prefix of the name
+  # (skipping the bare "tenant" segment) is a real ancestor namespace, the last
+  # being the tenant itself. e.g. tenant-ktj-htdev -> tenant-root, tenant-ktj,
+  # tenant-ktj-htdev.
+  labels="tenant.cozystack.io/tenant-root="
+  acc=""
+  IFS='-'
+  for seg in $ns; do
+    if [ -z "$acc" ]; then
+      acc="$seg"
+    else
+      acc="$acc-$seg"
+    fi
+    [ "$acc" = "tenant" ] && continue
+    labels="$labels tenant.cozystack.io/$acc="
+  done
+  unset IFS
+
+  echo "Backfilling ancestor labels on namespace $ns: $labels"
+  # shellcheck disable=SC2086 # word splitting of $labels into flags is intended
+  kubectl label namespace "$ns" $labels --overwrite || true
+done
+
+# Stamp version via the shared helper so the cozystack-version ConfigMap keeps
+# the platform.cozystack.io/no-delete label (see lib/cozystack-version.sh).
+stamp_cozystack_version 50
diff --git a/packages/core/platform/images/migrations/migrations/50 b/packages/core/platform/images/migrations/migrations/50
new file mode 100755
index 0000000000..6d5f4e8935
--- /dev/null
+++ b/packages/core/platform/images/migrations/migrations/50
@@ -0,0 +1,759 @@
+#!/bin/bash
+# Migration 50 --> 51
+# Adopt legacy etcd.aenix.io/v1alpha1 clusters onto the new
+# etcd-operator.cozystack.io/v1alpha2 operator, in place (no data move, no pod
+# restart), using the etcd-migrate tool baked into this image.
+#
+# Context: this is a PRE-upgrade hook — it runs BEFORE the etcd-operator
+# HelmRelease reconciles, so the etcd-operator Deployment is still the LEGACY
+# operator while this runs (that is why --agent-image is passed explicitly
+# below, and why the Deployment we scale to 0 during adoption is the legacy
+# one). Once it reconciles the new v1alpha2 operator ignores etcd.aenix.io CRs;
+# until adoption the legacy StatefulSets keep the etcd pods running. etcd-migrate
+# rewrites ownership/labels/CRs so the new operator takes over the live data
+# plane on its first reconcile after this hook.
+#
+# Idempotent: etcd-migrate completes a partially-applied adoption on re-run,
+# and a cluster with no remaining legacy CRs is a no-op. The version stamp at
+# the end is the gate.
+
+set -euo pipefail
+
+NAMESPACE="${NAMESPACE:-cozy-system}"
+DRY_RUN="${MIGRATION_DRY_RUN:-0}"
+# Supported escape hatch for the mandatory pre-adoption safety snapshot. The
+# snapshot to the platform cozy-backups bucket is the default and cannot be
+# silently skipped, but not every cluster has backup storage: backups may be
+# disabled, an external S3 may have no staged creds, or SeaweedFS may not be
+# ready at upgrade time. Those are individually-supported configs, so rather
+# than turn "no backup storage" into a total upgrade block, an operator who
+# accepts adopting live etcd WITHOUT a snapshot can set ETCD_ADOPT_SKIP_BACKUP=1
+# to pass etcd-migrate's --skip-backup. Default 0 keeps the fail-loud behaviour.
+# The platform renders this from migrations.etcdAdoptSkipBackup
+# (templates/migration-hook.yaml), which is the only route an operator has:
+# nothing else can set a var on a Helm-hook Job. Keep the two in lockstep —
+# an unreachable hatch is what the failure messages below used to advertise.
+SKIP_BACKUP="${ETCD_ADOPT_SKIP_BACKUP:-0}"
+
+# _is_true accepts the spellings an operator can plausibly arrive at. The
+# platform renders this var through migrations.etcdAdoptSkipBackup and always
+# emits "1"/"0", so the extra spellings are for the hand-set paths (running this
+# image directly, or a Job edited in place) where "true" is the natural thing to
+# type. A safety valve that is set but silently ignored is the worst outcome
+# here — worse than one that is not offered at all — so recognise the obvious
+# spellings rather than only the documented one. Everything else, including
+# typos, stays false: skipping the snapshot must need an affirmative answer.
+_is_true() {
+  case "$(printf '%s' "${1:-}" | tr '[:upper:]' '[:lower:]')" in
+    1 | true | yes) return 0 ;;
+    *) return 1 ;;
+  esac
+}
+
+# _print_skip_backup_hatch spells out how to actually take the hatch. Naming the
+# env var alone is useless advice: this Job is a Helm hook rendered by the
+# platform chart, so an operator cannot set the variable directly and nothing
+# they can edit survives the next render. The Package CR is the only supported
+# route (it is cluster-scoped; the platform chart's own values sit under
+# components.platform). Deliberately not sold as a quick fix — it is a values
+# change plus a re-reconcile, and it must be reverted afterwards.
+_print_skip_backup_hatch() {
+  echo "    kubectl edit package.cozystack.io cozystack.cozystack-platform" >&2
+  echo "    spec:" >&2
+  echo "      components:" >&2
+  echo "        platform:" >&2
+  echo "          values:" >&2
+  echo "            migrations:" >&2
+  echo "              etcdAdoptSkipBackup: true" >&2
+  echo "    Flux then re-renders the platform chart and re-runs this hook, which adopts" >&2
+  echo "    every legacy etcd WITHOUT a snapshot. Set it back to false once the upgrade" >&2
+  echo "    completes, or the next etcd migration will skip its snapshot too." >&2
+}
+
+# Shared cozystack-version stamp helper. Every migration >= 42 must stamp via
+# this (labeled, no-delete-guarded) helper rather than a hand-rolled apply — the
+# cozystack-version-stamp.bats guard enforces it. Provides stamp_cozystack_version.
+# shellcheck source=lib/cozystack-version.sh
+. "$(dirname "$0")/lib/cozystack-version.sh"
+
+# etcd-operator coordinates (the v1alpha2 operator deployment).
+ETCD_OPERATOR_NS="${ETCD_OPERATOR_NS:-cozy-etcd-operator}"
+ETCD_OPERATOR_DEPLOY="${ETCD_OPERATOR_DEPLOY:-etcd-operator-controller-manager}"
+# v1alpha2 operator image. Passed to etcd-migrate as --agent-image so the
+# snapshot agent runs the v0.5.x image rather than whatever resolveAgentImage
+# would read off the still-running LEGACY operator Deployment during this hook.
+# Keep in sync with packages/system/etcd-operator (Chart appVersion) and the
+# etcd-migrate binary pinned in the Dockerfile.
+ETCD_OPERATOR_IMAGE="${ETCD_OPERATOR_IMAGE:-ghcr.io/cozystack/etcd-operator:v0.5.2}"
+# v1alpha2 CRD coordinates. ETCD_CRD_DIR holds the copies baked into the image
+# (see Dockerfile); ensure_v1alpha2_crds applies them when the cluster does not
+# have them yet.
+ETCD_V2_CRD="etcdclusters.etcd-operator.cozystack.io"
+ETCD_CRD_DIR="${ETCD_CRD_DIR:-/etcd-operator-crds}"
+
+# Pre-adoption safety snapshot. etcd-migrate --apply rewires ownership of LIVE
+# etcd storage, so it refuses to run without a backup destination (or an
+# explicit --skip-backup, which we deliberately DO NOT use). The unattended
+# platform upgrade must never skip this snapshot silently: a botched adoption on
+# a tenant control-plane etcd would be unrecoverable. So by default we ALWAYS
+# snapshot every adopted cluster to the platform-managed object store — the
+# built-in cozy-backups bucket that every cozy-default BackupClass already
+# writes to — before adopting, and if the target cannot be resolved we FAIL
+# LOUDLY rather than adopt without a snapshot. The ONLY opt-out is the explicit
+# ETCD_ADOPT_SKIP_BACKUP=1 escape hatch (see SKIP_BACKUP above), for clusters
+# that intentionally have no backup storage; it is never taken implicitly.
+#
+# Tenant isolation: the snapshots land under a SYSTEM key prefix
+# (SNAPSHOT_KEY_PREFIX), separate from the per-app "<ns>/<name>/" keys. But the
+# real boundary is the credentials Secret, not the path — the SeaweedFS bucket
+# user is bucket-scoped, so a key prefix alone does not gate access. We copy the
+# projector-managed cozy-backups-creds (a PLAIN Secret, with the
+# apps.cozystack.io/managed-by label and WITHOUT internal.cozystack.io/
+# tenantresource) into each adopted namespace: the lineage-controller webhook
+# never promotes it to a TenantSecret, so a tenant on the default
+# cozy:tenant:base role (no core/v1.Secret verbs) cannot read it. The
+# managed-by label also keeps it compatible with the backupstrategy-controller
+# projector, which refuses to manage a cozy-backups-creds it does not own.
+PLATFORM_STRATEGY="${PLATFORM_STRATEGY:-cozy-default-etcd}"
+PLATFORM_CREDS_SECRET="${PLATFORM_CREDS_SECRET:-cozy-backups-creds}"
+# Namespace holding a ready-projected PLATFORM_CREDS_SECRET (AWS_ACCESS_KEY_ID /
+# AWS_SECRET_ACCESS_KEY). The backupstrategy-controller eagerly projects it into
+# cozy-velero (backupStorage.systemNamespaces); we copy it from there into each
+# adopted cluster's namespace so etcd-migrate's per-namespace snapshot Job can
+# mount it.
+PLATFORM_CREDS_NS="${PLATFORM_CREDS_NS:-cozy-velero}"
+# System key prefix for the one-off adoption snapshots, segregated from the
+# per-app backup keys (<ns>/<name>/) the cozy-default strategy writes.
+SNAPSHOT_KEY_PREFIX="${SNAPSHOT_KEY_PREFIX:-cozy-system/etcd-adoption/}"
+# Labels that keep the staged copy tenant-invisible (no tenantresource promotion)
+# and projector-owned (so future BackupJobs do not hit TargetSecretNotOwned).
+CREDS_MANAGED_BY_LABEL="apps.cozystack.io/managed-by"
+CREDS_MANAGED_BY_VALUE="cozystack-backups"
+CREDS_TENANT_LABEL="internal.cozystack.io/tenantresource"
+
+# Re-issue the server and peer certificates for one adopted cluster so they
+# cover the domains the NEW operator uses, BEFORE the operator can ever replace
+# a member. Background: in secretRef TLS (what adoption produces) the operator
+# never mints certs, it only references them. Adopted members keep the legacy
+# `*.<name>-headless.<ns>.svc` domain, but every member the operator *creates*
+# (scale-up, and crucially replacement) comes up under the native
+# `<random>.<name>.<ns>.svc` domain. Cozystack's legacy etcd chart issues these
+# certs with enumerated per-pod SANs and no wildcard — enough to adopt, but a
+# replacement member's name is in no SAN and fails TLS verification forever
+# (a silent failure: the member still joins raft and its Pod reports Ready, so
+# the CR shows Available=True while the cluster runs one short). We add both the
+# native and the (transient, mixed-window) legacy wildcard to the server and
+# peer cert-manager Certificates and wait for cert-manager to re-issue.
+# Idempotent: a cert that already carries the native wildcard is left untouched.
+#
+# Only the short `.svc` wildcard forms are added — deliberately NOT the
+# `.svc.<cluster-domain>` FQDN forms. The operator dials members by the short
+# `.svc` name (helpers.go peerURL/clientURL) and only mints FQDN SANs in
+# certManager mode, which this chart does not use; the etcd chart's Certificate
+# templates declare only the short forms, so adding FQDN SANs here would be
+# stripped on the next HelmRelease reconcile — adoption and chart output must
+# converge to the same fixed point on the cert SANs.
+# _san_present <ns> <secret> <cert> <native>
+# Returns 0 iff <native> is present in the issued Secret's cert-manager.io/alt-names
+# annotation OR the Certificate's spec.dnsNames (the source of truth for the SANs
+# cert-manager will issue). ROBUSTNESS: a plain `kubectl get ... 2>/dev/null` can
+# transiently return an EMPTY string on an API hiccup (discovery refresh, apiserver
+# blip, throttling), which is indistinguishable from "SAN genuinely absent" and
+# makes a correctly-configured cert look missing — the failure mode that wedges the
+# cert wait below. Neither field is ever legitimately empty on a real object, so we
+# treat an empty read from BOTH sources as a transient error and retry, only
+# trusting a non-empty read to decide presence/absence.
+_san_present() {
+  local ns="$1" secret="$2" cert="$3" native="$4" a d try
+  for try in 1 2 3 4 5; do
+    a=$(kubectl -n "$ns" get secret "$secret" \
+          -o jsonpath='{.metadata.annotations.cert-manager\.io/alt-names}' 2>/dev/null || true)
+    # {.spec.dnsNames[*]} yields a SPACE-separated list (one SAN per token);
+    # {.spec.dnsNames} would be a bracketed JSON blob that tr ',' cannot split,
+    # forcing a substring match. Split on spaces and match EXACTLY (grep -qxF) —
+    # same as the Secret annotation above — so a wildcard that is a substring of
+    # a longer SAN (e.g. *.etcd.<ns>.svc inside *.etcd.<ns>.svc.cluster.local)
+    # cannot false-positive and skip the patch.
+    d=$(kubectl -n "$ns" get certificate.cert-manager.io "$cert" \
+          -o jsonpath='{.spec.dnsNames[*]}' 2>/dev/null || true)
+    if [ -n "$a" ] || [ -n "$d" ]; then
+      printf '%s' "$a" | tr ',' '\n' | grep -qxF "$native" && return 0
+      printf '%s' "$d" | tr ' ' '\n' | grep -qxF "$native" && return 0
+      return 1
+    fi
+    sleep 1
+  done
+  return 1
+}
+
+# _secret_has_san: exact-match check that $native is listed in the ISSUED
+# Secret's cert-manager alt-names annotation — the authoritative record of what
+# cert-manager has actually issued. Unlike _san_present it does NOT consult the
+# Certificate spec.dnsNames: after we patch the spec below, the spec carries the
+# wildcard immediately, but the Secret is only re-issued once cert-manager
+# reconciles; the wait loop must gate on the SECRET, not on the value we just
+# wrote. Same empty-read retry rationale as _san_present (a real issued Secret
+# never has an empty alt-names annotation), and the same exact grep -qxF match.
+_secret_has_san() {
+  local ns="$1" secret="$2" native="$3" a try
+  for try in 1 2 3 4 5; do
+    a=$(kubectl -n "$ns" get secret "$secret" \
+          -o jsonpath='{.metadata.annotations.cert-manager\.io/alt-names}' 2>/dev/null || true)
+    if [ -n "$a" ]; then
+      printf '%s' "$a" | tr ',' '\n' | grep -qxF "$native"
+      return
+    fi
+    sleep 1
+  done
+  return 1
+}
+
+ensure_wildcard_sans() {
+  local ns="$1" name="$2"
+  local native="*.${name}.${ns}.svc"
+  local sans
+  sans=$(printf '%s\n' \
+    "*.${name}.${ns}.svc" \
+    "*.${name}-headless.${ns}.svc" \
+    | jq -R . | jq -s .)
+  local cert secret
+  for cert in "${name}-server" "${name}-peer"; do
+    secret="${cert}-tls"
+    if ! kubectl -n "$ns" get certificate.cert-manager.io "$cert" >/dev/null 2>&1; then
+      echo "  - ${ns}/${cert}: Certificate not found; skipping (operator-managed or already pruned)"
+      continue
+    fi
+    if _san_present "$ns" "$secret" "$cert" "$native"; then
+      echo "  - ${ns}/${cert}: native wildcard already present; nothing to do"
+      continue
+    fi
+    if [ "$DRY_RUN" = "1" ]; then
+      echo "  - [dry-run] ${ns}/${cert}: would add SANs ${native} (+legacy headless wildcard) and wait for re-issue"
+      continue
+    fi
+    echo "  - ${ns}/${cert}: adding native + legacy wildcard SANs and re-issuing"
+    local merged
+    merged=$(kubectl -n "$ns" get certificate.cert-manager.io "$cert" -o json \
+      | jq -c --argjson add "$sans" '(.spec.dnsNames // []) + $add | unique')
+    kubectl -n "$ns" patch certificate.cert-manager.io "$cert" --type=merge \
+      -p "{\"spec\":{\"dnsNames\":${merged}}}"
+    # Wait for cert-manager to re-issue the Secret with the new SANs.
+    local i
+    for i in $(seq 1 30); do
+      if _secret_has_san "$ns" "$secret" "$native"; then
+        echo "    ${ns}/${secret}: re-issued Secret now carries the native wildcard"
+        break
+      fi
+      [ "$i" = "30" ] && { echo "    ERROR: ${ns}/${secret} not re-issued with ${native} in time" >&2; exit 1; }
+      sleep 4
+    done
+  done
+}
+
+# secret_val echoes one base64 key from a Secret JSON blob, whitespace-stripped.
+# A trailing newline in the Secret data would otherwise ride into a URL and
+# break it. Stricter than the `trim` backupstrategy-controller.endpoint applies
+# (edges only): every key read through here is a host, bucket, region or bool,
+# none of which may contain interior whitespace, so stripping it all cannot
+# discard a meaningful value.
+secret_val() {
+  printf '%s' "$1" | jq -r --arg k "$2" '.data[$k] // ""' \
+    | base64 -d 2>/dev/null | tr -d '[:space:]'
+}
+
+# _cosi_bucket_claimed <bucket> returns 0 iff <bucket> is the S3 bucket some
+# BucketClaim was provisioned into, i.e. the projected credentials describe a
+# COSI bucket rather than an admin-managed external one.
+#
+# Keyed on DATA, not on names: the COSI driver assigns the bucket name and
+# publishes it as BucketClaim .status.bucketName, which is the very value the
+# projector republishes as the `bucketName` key (packages/system/bucket
+# user-credentials.yaml reads BucketInfo spec.bucketName; live-verified equal on
+# a real stand). Matching that makes the probe independent of
+# backupStorage.namespace / .bucketName, which are supported Package-CR
+# overrides this hook cannot see — a claim-name lookup would miss a renamed
+# bucket and misclassify the cluster as external.
+#
+# Data-keying also disposes of the common stale claim: one wedged Terminating
+# (the cosi bucketclaim-protection finalizer outlives an uninstalled COSI
+# controller) whose status carries some OTHER bucket simply does not match.
+#
+# Four-way, because "definitely not COSI", "could not read" and "cannot tell"
+# must never collapse into one answer: guessing "external" on an unreadable API
+# sends a COSI cluster to the v1.5.x plaintext CR endpoint, which is the very P0
+# this hook exists to avoid. Callers must fail loud on 2, and this function
+# prints the specific reason it could not answer.
+#   0 -> a LIVE claim owns the bucket: COSI-provisioned
+#   1 -> definitively unowned: admin-managed external S3
+#   2 -> undeterminable; reason already logged
+#
+# A TERMINATING claim on the MATCHING bucket is treated as ambiguous. It is
+# reachable two ways with opposite answers: an admin who moved COSI -> external
+# S3 reusing the bucket name (external; the claim is a corpse COSI is not around
+# to reap), or a still-COSI cluster whose claim is mid-recreate (COSI). Both
+# readings fail loudly-but-confusingly when wrong — a handshake error against
+# the wrong scheme — so neither buys reliability, and reading it as "external"
+# specifically resurrects the plaintext-:8333 P0.
+#
+# Refusing is a judgement call, not a proof that the two are indistinguishable:
+# comparing the projected host against the CR's would separate them today (reuse
+# -> same host; a v1.5.x mid-recreate -> ACME ingress vs the seaweedfs default).
+# But that leans on the CR being present AND still carrying the v1.5.x default —
+# precisely what this function exists not to trust — so it is a heuristic, and
+# an irreversible live-etcd adoption is the wrong place to spend one. Refuse and
+# let the operator resolve the claim (idempotent: re-run after).
+_cosi_bucket_claimed() {
+  local want="$1" crd claims verdict try
+  # `--ignore-not-found -o name` separates a genuinely absent CRD (rc=0, no
+  # output -> definitive, so it costs no retries and external clusters pay
+  # nothing) from a real read error (rc!=0 -> retry, then refuse).
+  crd=""
+  for try in 1 2 3; do
+    if crd=$(kubectl get crd bucketclaims.objectstorage.k8s.io \
+               --ignore-not-found -o name 2>/dev/null); then
+      [ -n "$crd" ] || return 1
+      break
+    fi
+    if [ "$try" = "3" ]; then
+      echo "  cannot read the BucketClaim CRD (API error): COSI presence unknown" >&2
+      return 2
+    fi
+    sleep 1
+  done
+
+  for try in 1 2 3; do
+    if claims=$(kubectl get bucketclaims.objectstorage.k8s.io -A -o json 2>/dev/null); then
+      # ONE jq process, and nothing downstream that can exit early. A
+      # `jq -r ... | grep -qxF` pipe is unusable here: grep exits on the first
+      # match and SIGPIPEs jq, and `set -o pipefail` reports the RIGHTMOST
+      # non-zero status — jq's 141 — so a MATCH is returned as a failure. It is
+      # a race on the list outgrowing one stdio write (~8KB, i.e. a few hundred
+      # claims) with only a last-line match safe, so it surfaces exactly on the
+      # big multi-tenant clusters this must not misjudge. `any` streams inside
+      # jq: immune to both list size and match position.
+      #
+      # The shape gate is deliberate: without it every unexpected document
+      # (null, items absent/null/not-a-list) silently reads as "no match" =
+      # external = the plaintext P0. No producer emits those — kubectl always
+      # renders a List with an items array — so the gate only ever fires on
+      # something we genuinely cannot interpret, and that must not be an answer.
+      verdict=$(printf '%s' "$claims" | jq -r --arg w "$want" '
+        if (.items | type) != "array" or any(.items[]; type != "object") then "malformed"
+        elif any(.items[]; ((.status?.bucketName? // "") == $w)
+                           and ((.metadata?.deletionTimestamp? // "") == "")) then "cosi"
+        elif any(.items[]; (.status?.bucketName? // "") == $w) then "terminating"
+        else "external"
+        end' 2>/dev/null) || verdict="malformed"
+      case "$verdict" in
+        cosi)     return 0 ;;
+        external) return 1 ;;
+        terminating)
+          echo "  bucket '${want}' is claimed ONLY by a TERMINATING BucketClaim: cannot tell a" >&2
+          echo "  COSI bucket mid-teardown (endpoint = the TLS S3 ingress) from an external" >&2
+          echo "  store that reuses the name (endpoint = whatever the admin configured)." >&2
+          echo "  Resolve the claim — let COSI reap it, or clear its finalizer — then re-run." >&2
+          return 2 ;;
+        *)
+          echo "  unexpected BucketClaim list shape; refusing to interpret it" >&2
+          return 2 ;;
+      esac
+    fi
+    if [ "$try" = "3" ]; then
+      echo "  cannot list BucketClaims (API error): bucket ownership unknown" >&2
+      return 2
+    fi
+    sleep 1
+  done
+}
+
+# resolve_platform_backup_args echoes the etcd-migrate --backup-s3-* flags for
+# the platform-managed safety snapshot, or returns non-zero if the target
+# cannot be resolved. Read-only — safe in dry-run.
+#
+# The coordinates come from the PROJECTED CREDENTIALS SECRET, not from the live
+# cozy-default-etcd Strategy CR, because this runs as a PRE-upgrade hook: every
+# chart-rendered resource on the cluster still belongs to the version we are
+# upgrading FROM, and cannot be trusted to describe a reachable target.
+#
+# On a v1.5.x cluster the live Strategy CR is wrong in one of two ways, and the
+# platform upgrade is gated behind this snapshot, so neither can self-heal
+# first (the fixed backupstrategy-controller chart only reconciles AFTER the
+# upgrade this hook blocks):
+#
+#   1. Absent. strategy-etcd-default.yaml is guarded by `if $bucketName`, whose
+#      helper `lookup`s the BucketClaim status. The BucketClaim is created by
+#      that same chart, so on first render the lookup is empty and the Strategy
+#      is silently skipped. Helm lookup only runs at install/upgrade time, so a
+#      cluster that reached 1.5.x in one hop never grows the CR on reconcile.
+#      Reachable ONLY under provisionBucket: true — the helper short-circuits to
+#      .Values.backupStorage.bucketName (non-empty) before the lookup when it is
+#      false, which is what makes the CR a sound fallback on the external path.
+#   2. Present, carrying the static default http://seaweedfs-s3...svc:8333.
+#      Cozystack ships SeaweedFS with enableSecurity=true, so :8333 is a TLS
+#      listener — plaintext against it fails the handshake and every snapshot
+#      dies. The Etcd Strategy's S3 schema has no caCert/insecureSkipVerify, so
+#      the self-signed in-cluster endpoint is unusable at ANY scheme; a trusted
+#      -cert endpoint is required.
+#
+# PLATFORM_CREDS_SECRET is produced by the projector from the COSI-provisioned
+# bucket's system credentials — bucket provisioning, not chart values — so it
+# describes the live bucket regardless of the version that rendered the chart.
+# It advertises the external S3 ingress (ACME cert) as a bare host, and that
+# ingress is always TLS, so we force https:// exactly as the 1.6 chart helper
+# backupstrategy-controller.endpoint does. We already had to read this Secret
+# for the AWS keys, so this adds no new dependency.
+#
+# The Strategy CR remains the fallback for the admin-managed external-S3 case
+# (provisionBucket: false), where .Values.backupStorage.endpoint is
+# authoritative and may legitimately be plaintext against a private object
+# store. That path is keyed off whether a BucketClaim actually claims the
+# projected bucket (_cosi_bucket_claimed), NOT off a missing projected endpoint:
+# the projector never omits the endpoint — it substitutes
+# BACKUP_STORAGE_ENDPOINT and fails ReasonSourceMalformed when both sources are
+# empty (credentials_projector.go), so a projected Secret always carries one and
+# its presence discriminates nothing.
+resolve_platform_backup_args() {
+  local creds ep bucket region fps
+  # The credentials Secret must already exist with BOTH AWS keys so the snapshot
+  # agent can authenticate. Validate both up front: a Secret missing one key
+  # would otherwise abort etcd-migrate AFTER the operator/cert mutations have
+  # begun (creds staged, operator scaled to 0).
+  creds=$(kubectl -n "$PLATFORM_CREDS_NS" get secret "$PLATFORM_CREDS_SECRET" -o json 2>/dev/null) || return 1
+  printf '%s' "$creds" | jq -e '(.data.AWS_ACCESS_KEY_ID // "")     | length > 0' >/dev/null 2>&1 || return 1
+  printf '%s' "$creds" | jq -e '(.data.AWS_SECRET_ACCESS_KEY // "") | length > 0' >/dev/null 2>&1 || return 1
+
+  ep=$(secret_val "$creds" endpoint)
+  bucket=$(secret_val "$creds" bucketName)
+  region=$(secret_val "$creds" region)
+  fps=$(secret_val "$creds" forcePathStyle)
+
+  # An empty bucket cannot be matched against a claim, so it is classified
+  # external and resolved wholly from the CR — what origin/main did.
+  local cosi=1
+  if [ -n "$bucket" ]; then
+    cosi=0; _cosi_bucket_claimed "$bucket" || cosi=$?
+  fi
+  if [ "$cosi" = "2" ]; then
+    echo "  ERROR: could not determine whether bucket '${bucket}' is COSI-provisioned" >&2
+    echo "  (reason above). Refusing to guess the endpoint scheme: a wrong guess snapshots" >&2
+    echo "  to an unreachable endpoint and the adoption fails anyway, so the guess buys" >&2
+    echo "  nothing. Resolve the condition above and re-run — this migration is idempotent." >&2
+    return 1
+  fi
+
+  # `[ -n "$ep" ]` guards the forcing itself, not just the classification: an
+  # empty projected endpoint must degrade to the CR fallback below, never to a
+  # scheme-only "https://" that would satisfy the non-empty check at the end and
+  # be passed to etcd-migrate as a destination.
+  if [ "$cosi" = "0" ]; then
+    echo "  bucket '${bucket}' is claimed by a BucketClaim: COSI-provisioned, forcing https" >&2
+    if [ -n "$ep" ]; then
+      # Projected (COSI) endpoint: a bare host fronted by the always-TLS S3
+      # ingress. Strip any scheme a future producer might emit, then force https.
+      ep="${ep#https://}"; ep="${ep#http://}"
+      ep="https://${ep}"
+    fi
+  else
+    # External S3: take EVERY coordinate from the Strategy CR, not just the
+    # endpoint. The CR renders .Values.backupStorage.* and points at this same
+    # cozy-backups-creds (strategy-etcd-default.yaml credentialsSecretRef), so
+    # CR coordinates + these credentials is exactly what this cluster's regular
+    # etcd BackupJobs already use — the one combination proven to work here, and
+    # the bucket an operator will look in for the snapshot. Keeping the Secret's
+    # bucket while taking the CR's endpoint would invent a pairing nothing else
+    # in the system produces: the projector copies bucketName straight from the
+    # admin-managed source Secret and never from backupStorage.bucketName, so
+    # the two can disagree outright. (region can only disagree if the source
+    # Secret overrides it; forcePathStyle is always the platform value on both
+    # sides and cannot.) If CR-bucket + these creds really did not go together,
+    # the cluster's own backups would already be failing — a pre-existing
+    # misconfiguration to fix, not to route around by snapshotting somewhere
+    # nothing else writes.
+    #
+    # Relying on the CR wholesale is safe on this path and only this path:
+    # bucketName short-circuits to .Values.backupStorage.bucketName before the
+    # BucketClaim lookup that races on the COSI path, so `if $bucketName` always
+    # passes and the CR is guaranteed present. The scheme in particular survives
+    # nowhere else — the projector strips it off the host.
+    echo "  no BucketClaim claims bucket '${bucket:-<unset>}': treating as external S3," >&2
+    echo "  taking every coordinate from the '${PLATFORM_STRATEGY}' Strategy CR verbatim" >&2
+    ep=""; bucket=""; region=""; fps=""
+  fi
+
+  # Fill from the Strategy CR: every coordinate on the external-S3 path above,
+  # and on the COSI path only what the projector dropped because its source
+  # Secret did not carry it (setOrDelete deletes an empty value rather than
+  # writing it). The COSI path keeps the projected bucket on purpose — it is the
+  # COSI-assigned name, which the CR can only reproduce via a live lookup that
+  # may not have run.
+  if [ -z "$ep" ] || [ -z "$bucket" ] || [ -z "$region" ] || [ -z "$fps" ]; then
+    local cr
+    cr=$(kubectl get etcds.strategy.backups.cozystack.io "$PLATFORM_STRATEGY" -o json 2>/dev/null) || cr=""
+    if [ -n "$cr" ]; then
+      [ -n "$ep" ]     || ep=$(printf '%s' "$cr"     | jq -r '.spec.template.destination.s3.endpoint // ""')
+      [ -n "$bucket" ] || bucket=$(printf '%s' "$cr" | jq -r '.spec.template.destination.s3.bucket // ""')
+      [ -n "$region" ] || region=$(printf '%s' "$cr" | jq -r '.spec.template.destination.s3.region // ""')
+      [ -n "$fps" ]    || fps=$(printf '%s' "$cr"    | jq -r '.spec.template.destination.s3.forcePathStyle // false')
+    fi
+  fi
+  [ -n "$ep" ] && [ -n "$bucket" ] || return 1
+
+  local args="--backup-s3-endpoint=${ep} --backup-s3-bucket=${bucket}"
+  args="${args} --backup-s3-credentials-secret=${PLATFORM_CREDS_SECRET}"
+  args="${args} --backup-s3-key=${SNAPSHOT_KEY_PREFIX}"
+  [ -n "$region" ] && args="${args} --backup-s3-region=${region}"
+  [ "$fps" = "true" ] && args="${args} --backup-s3-force-path-style"
+  printf '%s' "$args"
+}
+
+# stage_backup_creds copies PLATFORM_CREDS_SECRET from PLATFORM_CREDS_NS into
+# <ns> so the snapshot Job etcd-migrate creates in that namespace can mount it
+# (etcd-migrate requires the credentials Secret in EVERY migrated namespace).
+# The copy strips namespace-bound and owner metadata, force-sets the managed-by
+# label (projector compatibility) and drops the tenantresource label (so the
+# webhook never exposes it to the tenant). Idempotent (server-side apply).
+stage_backup_creds() {
+  local ns="$1"
+  kubectl -n "$PLATFORM_CREDS_NS" get secret "$PLATFORM_CREDS_SECRET" -o json \
+    | jq --arg mbl "$CREDS_MANAGED_BY_LABEL" --arg mbv "$CREDS_MANAGED_BY_VALUE" \
+         --arg tl "$CREDS_TENANT_LABEL" '
+        .metadata.labels = ((.metadata.labels // {}) + {($mbl): $mbv})
+        | del(.metadata.labels[$tl])
+        | del(.metadata.namespace, .metadata.resourceVersion, .metadata.uid,
+              .metadata.creationTimestamp, .metadata.ownerReferences,
+              .metadata.managedFields, .metadata.annotations, .status)' \
+    | kubectl -n "$ns" apply --server-side --force-conflicts -f -
+}
+
+# ensure_v1alpha2_crds installs the etcd-operator.cozystack.io/v1alpha2 CRDs
+# baked into this image when they are not already present. On the first upgrade
+# that introduces v1alpha2 they are ABSENT during this pre-upgrade hook: the
+# etcd-operator-crds HelmRelease only reconciles AFTER the platform chart's
+# resources are applied, i.e. after this hook. etcd-migrate (even its dry-run)
+# lists v1alpha2 EtcdClusters and would fail without the CRDs, so we apply the
+# baked copies first. Server-side apply so the etcd-operator-crds HelmRelease
+# cleanly co-owns them later; they carry helm.sh/resource-policy: keep, so
+# neither owner deletes them. Idempotent.
+ensure_v1alpha2_crds() {
+  if kubectl get crd "$ETCD_V2_CRD" >/dev/null 2>&1; then
+    echo "v1alpha2 CRDs already present."
+    return 0
+  fi
+  if [ "$DRY_RUN" = "1" ]; then
+    echo "[dry-run] would apply baked v1alpha2 CRDs from ${ETCD_CRD_DIR}"
+    return 0
+  fi
+  if [ ! -d "$ETCD_CRD_DIR" ]; then
+    echo "ERROR: v1alpha2 CRDs are absent and the baked copy ${ETCD_CRD_DIR} is missing from the image" >&2
+    exit 1
+  fi
+  echo "v1alpha2 CRDs absent (etcd-operator-crds HelmRelease not reconciled yet); applying baked copies from ${ETCD_CRD_DIR}..."
+  kubectl apply --server-side --force-conflicts -f "$ETCD_CRD_DIR"
+  kubectl wait --for=condition=established crd "$ETCD_V2_CRD" --timeout=60s
+}
+
+# Warn loudly about scheduled backups that DO NOT carry over. etcd-migrate
+# adopts the data plane, but the legacy etcd.aenix.io EtcdBackupSchedule /
+# EtcdBackup CRs have no equivalent under the v1alpha2 operator — scheduled
+# etcd backups silently stop. The replacement is a backups.cozystack.io
+# BackupClass + Plan (see examples/backups/etcd), which a tenant who relied on
+# the old backup.enabled=true must reconfigure. We deliberately do NOT
+# auto-translate: the destination/credentials shapes differ and a silent,
+# best-effort translation would be worse than a loud, actionable warning during
+# an unattended platform upgrade. Read-only, so it also runs in dry-run.
+warn_orphaned_backup_schedules() {
+  local crd found="" out
+  for crd in etcdbackupschedules.etcd.aenix.io etcdbackups.etcd.aenix.io; do
+    kubectl get crd "$crd" >/dev/null 2>&1 || continue
+    out=$(kubectl get "$crd" -A \
+      -o jsonpath='{range .items[*]}{.metadata.namespace}/{.metadata.name}{"\n"}{end}' 2>/dev/null)
+    [ -n "$out" ] && found="${found}${out}"$'\n'
+  done
+  [ -n "${found//[$'\n']/}" ] || return 0
+  echo "=========================================================================" >&2
+  echo "WARNING: legacy etcd.aenix.io backup resources will NOT be migrated."     >&2
+  echo "Scheduled/one-off etcd backups STOP working after this upgrade. The new"  >&2
+  echo "flow is a backups.cozystack.io BackupClass + Plan (see"                   >&2
+  echo "examples/backups/etcd); reconfigure it per tenant. Orphaned resources:"   >&2
+  printf '%s' "$found" | sed '/^$/d;s/^/  - /'                                    >&2
+  echo "=========================================================================" >&2
+}
+
+# Nothing to adopt if the legacy CRD is absent or carries no clusters.
+if ! kubectl get crd etcdclusters.etcd.aenix.io >/dev/null 2>&1; then
+  echo "No etcd.aenix.io CRD present; nothing to migrate."
+  [ "$DRY_RUN" = "1" ] && { echo "[dry-run] would stamp version 51"; exit 0; }
+  stamp_cozystack_version 51
+  exit 0
+fi
+
+LEGACY_COUNT=$(kubectl get etcdclusters.etcd.aenix.io -A -o name 2>/dev/null | wc -l | tr -d ' ')
+echo "Found ${LEGACY_COUNT} legacy etcd.aenix.io/EtcdCluster(s)."
+
+warn_orphaned_backup_schedules
+
+if ! command -v etcd-migrate >/dev/null 2>&1; then
+  echo "etcd-migrate binary not found in the migrations image (expected at /usr/bin/etcd-migrate, copied from the etcd-operator image)" >&2
+  exit 1
+fi
+
+# Adoption (and even the etcd-migrate dry-run) needs the v1alpha2 CRDs; install
+# them now if the etcd-operator-crds HelmRelease has not reconciled yet.
+if [ "$LEGACY_COUNT" -gt 0 ]; then
+  ensure_v1alpha2_crds
+fi
+
+# Resolve the platform-managed safety-snapshot destination (policy block at the
+# top). Done BEFORE the dry-run so the printed plan reflects the real flags, and
+# before any mutation so an unresolvable target aborts cleanly. The snapshot to
+# the cozy-backups bucket is mandatory unless the operator sets the explicit
+# ETCD_ADOPT_SKIP_BACKUP=1 escape hatch; any inbound ETCD_MIGRATE_BACKUP_ARGS is
+# overwritten here on purpose (it can never suppress the snapshot).
+if [ "$LEGACY_COUNT" -gt 0 ]; then
+  if _is_true "$SKIP_BACKUP"; then
+    echo "WARNING: migrations.etcdAdoptSkipBackup is set — adopting live etcd WITHOUT a" >&2
+    echo "  pre-adoption safety snapshot, by explicit operator request. A botched adoption" >&2
+    echo "  on a tenant control-plane etcd is UNRECOVERABLE with no snapshot. Reset the" >&2
+    echo "  flag to false once this upgrade is through." >&2
+    ETCD_MIGRATE_BACKUP_ARGS="--skip-backup"
+  else
+    echo "Resolving platform-managed S3 snapshot target ('${PLATFORM_STRATEGY}' strategy)..."
+    if ETCD_MIGRATE_BACKUP_ARGS=$(resolve_platform_backup_args); then
+      echo "  -> safety snapshot: ${ETCD_MIGRATE_BACKUP_ARGS}"
+    else
+      echo "ERROR: refusing to adopt live etcd without a safety snapshot." >&2
+      echo "  See the classification logged above: a bucket claimed by a BucketClaim is" >&2
+      echo "  resolved from the projected Secret, anything else from the Strategy CR." >&2
+      echo "  Could not resolve the platform backup target: the '${PLATFORM_STRATEGY}'" >&2
+      echo "  strategy and a projected '${PLATFORM_CREDS_SECRET}' Secret (AWS_ACCESS_KEY_ID/" >&2
+      echo "  AWS_SECRET_ACCESS_KEY) in '${PLATFORM_CREDS_NS}' are required. Ensure the" >&2
+      echo "  cozy-backups Bucket and the backupstrategy-controller are healthy, then re-run." >&2
+      echo "  If this cluster intentionally has no backup storage (backups disabled," >&2
+      echo "  external S3 without staged creds, or SeaweedFS not yet ready) and you accept" >&2
+      echo "  adopting live etcd WITHOUT a snapshot, take the escape hatch:" >&2
+      _print_skip_backup_hatch
+      exit 1
+    fi
+  fi
+fi
+
+# Ensure every cluster's certs cover the new operator's native member domain
+# BEFORE adoption, so a later member replacement does not silently fail TLS.
+if [ "$LEGACY_COUNT" -gt 0 ]; then
+  echo "=== ensuring wildcard SANs on adopted clusters' server/peer certs ==="
+  while read -r ns name; do
+    [ -n "$ns" ] || continue
+    echo "Cluster ${ns}/${name}:"
+    ensure_wildcard_sans "$ns" "$name"
+  done < <(kubectl get etcdclusters.etcd.aenix.io -A \
+    -o jsonpath='{range .items[*]}{.metadata.namespace}{" "}{.metadata.name}{"\n"}{end}' 2>/dev/null)
+fi
+
+# etcd-migrate (unlike kubectl) does NOT fall back to the in-cluster
+# ServiceAccount: it only reads a kubeconfig FILE (-k/--kubeconfig, default
+# /root/.kube/config), which does not exist in this Job pod. Synthesize one from
+# the mounted ServiceAccount so etcd-migrate authenticates as the hook SA.
+ETCD_MIGRATE_KUBECONFIG="${ETCD_MIGRATE_KUBECONFIG:-/tmp/in-cluster.kubeconfig}"
+_sa_dir="${ETCD_ADOPT_SA_DIR:-/var/run/secrets/kubernetes.io/serviceaccount}"
+if [ ! -f "$ETCD_MIGRATE_KUBECONFIG" ] && [ -f "$_sa_dir/token" ]; then
+  # server is the in-cluster DNS name, NOT https://$KUBERNETES_SERVICE_HOST:PORT:
+  # on an IPv6-only cluster KUBERNETES_SERVICE_HOST is a bare IPv6 address that
+  # would need bracketing to be a valid URL. kubernetes.default.svc is
+  # IP-family-agnostic, resolves in-cluster, and is validated by the mounted SA
+  # CA — the same server URL kubectl itself synthesizes in-cluster.
+  cat > "$ETCD_MIGRATE_KUBECONFIG" <<KUBECONFIG_EOF
+apiVersion: v1
+kind: Config
+clusters:
+- name: in-cluster
+  cluster:
+    certificate-authority: ${_sa_dir}/ca.crt
+    server: https://kubernetes.default.svc
+contexts:
+- name: in-cluster
+  context:
+    cluster: in-cluster
+    user: sa
+    namespace: $(cat "$_sa_dir/namespace")
+current-context: in-cluster
+users:
+- name: sa
+  user:
+    tokenFile: ${_sa_dir}/token
+KUBECONFIG_EOF
+fi
+
+# Always show the plan first.
+echo "=== etcd-migrate dry-run ==="
+etcd-migrate \
+  --kubeconfig="${ETCD_MIGRATE_KUBECONFIG}" \
+  --new-controller="${ETCD_OPERATOR_NS}/${ETCD_OPERATOR_DEPLOY}" \
+  --skip-controller-check || true
+
+if [ "$DRY_RUN" = "1" ]; then
+  echo "[dry-run] would scale ${ETCD_OPERATOR_NS}/${ETCD_OPERATOR_DEPLOY} to 0, run etcd-migrate --apply ${ETCD_MIGRATE_BACKUP_ARGS:-<no clusters>}, leave it at 0 for the etcd-operator HelmRelease to replace, then stamp version 51"
+  exit 0
+fi
+
+if [ "$LEGACY_COUNT" -gt 0 ]; then
+  # Stage the snapshot credentials into every adopted namespace BEFORE adoption:
+  # etcd-migrate's per-namespace snapshot Job mounts PLATFORM_CREDS_SECRET there.
+  # Skipped entirely when ETCD_ADOPT_SKIP_BACKUP=1 (no snapshot Job runs, so no
+  # creds are needed) — adoption below still proceeds.
+  if ! _is_true "$SKIP_BACKUP"; then
+    echo "=== staging snapshot credentials ('${PLATFORM_CREDS_SECRET}') into adopted namespaces ==="
+    while read -r ns name; do
+      [ -n "$ns" ] || continue
+      echo "  - ${ns}"
+      stage_backup_creds "$ns"
+    done < <(kubectl get etcdclusters.etcd.aenix.io -A \
+      -o jsonpath='{range .items[*]}{.metadata.namespace}{" "}{.metadata.name}{"\n"}{end}' 2>/dev/null)
+  fi
+
+  # The etcd-operator is cluster-wide: while it sits at 0 replicas NO tenant's
+  # etcd is reconciled. With `set -euo pipefail`, a non-zero exit from
+  # etcd-migrate --apply would abort the script and strand the operator at 0
+  # platform-wide until a human intervenes. Arm an EXIT trap the moment we scale
+  # down so the operator is restored when adoption fails or the script is
+  # interrupted. The Job then retries adoption (idempotent) from a healthy
+  # operator instead of a frozen one. A successful adoption disarms the trap and
+  # leaves the legacy operator at 0, see below.
+  restore_etcd_operator() {
+    echo "Restoring ${ETCD_OPERATOR_NS}/${ETCD_OPERATOR_DEPLOY} to 1 replica..."
+    kubectl -n "$ETCD_OPERATOR_NS" scale deploy "$ETCD_OPERATOR_DEPLOY" --replicas=1 >/dev/null 2>&1 || true
+  }
+  trap restore_etcd_operator EXIT
+
+  echo "Scaling ${ETCD_OPERATOR_NS}/${ETCD_OPERATOR_DEPLOY} to 0 for adoption..."
+  kubectl -n "$ETCD_OPERATOR_NS" scale deploy "$ETCD_OPERATOR_DEPLOY" --replicas=0
+  kubectl -n "$ETCD_OPERATOR_NS" rollout status deploy "$ETCD_OPERATOR_DEPLOY" --timeout=120s || true
+
+  echo "=== etcd-migrate --apply (snapshot -> cozy-backups, then adopt) ==="
+  # --agent-image is explicit: during this hook the Deployment we just scaled to
+  # 0 is still the LEGACY operator, so resolveAgentImage would otherwise bake the
+  # wrong (aenix) image into the snapshot Job.
+  etcd-migrate --apply --yes \
+    --kubeconfig="${ETCD_MIGRATE_KUBECONFIG}" \
+    --new-controller="${ETCD_OPERATOR_NS}/${ETCD_OPERATOR_DEPLOY}" \
+    --skip-controller-check \
+    --agent-image="${ETCD_OPERATOR_IMAGE}" \
+    ${ETCD_MIGRATE_BACKUP_ARGS}
+
+  # Adoption succeeded, so the legacy operator stays at 0. Every legacy cluster
+  # is now a v1alpha2 EtcdCluster that only the v1alpha2 operator manages, and
+  # the etcd-operator HelmRelease replaces this Deployment with that operator
+  # later in the same upgrade. A legacy operator running in between undoes part
+  # of the adoption. Until a tenant's etcd HelmRelease picks up the new chart,
+  # Flux re-creates the legacy EtcdCluster from the old one, and the legacy
+  # operator reconciles it, re-creates the StatefulSet that etcd-migrate
+  # orphan-deleted and takes the legacy headless Service back from the adopted
+  # members. The new chart then prunes that EtcdCluster, the garbage collector
+  # deletes the Service with it, and the members' etcd-<i>.etcd-headless names
+  # stop resolving. Only a failed or interrupted adoption restores the operator,
+  # through the EXIT trap above.
+  echo "Leaving ${ETCD_OPERATOR_NS}/${ETCD_OPERATOR_DEPLOY} at 0 replicas, the etcd-operator HelmRelease replaces it with the v1alpha2 operator."
+  trap - EXIT
+fi
+
+stamp_cozystack_version 51
+echo "Applied configmap ${NAMESPACE}/cozystack-version version=51"
diff --git a/packages/core/platform/images/migrations/migrations/51 b/packages/core/platform/images/migrations/migrations/51
new file mode 100755
index 0000000000..ac8a2241c5
--- /dev/null
+++ b/packages/core/platform/images/migrations/migrations/51
@@ -0,0 +1,99 @@
+#!/bin/bash
+# Migration 51 --> 52
+# Backfill the apps.cozystack.io/application.name release label onto pre-existing
+# VictoriaMetrics / VictoriaLogs storage PVCs of the monitoring module.
+#
+# PR #3094 adds apps.cozystack.io/application.name to the VMCluster/VLCluster
+# storage volumeClaimTemplates (packages/system/monitoring) and a post-delete
+# hook that garbage-collects PVCs carrying that label. But vm-operator only
+# stamps volumeClaimTemplate.metadata.labels onto PVCs it creates *after* the
+# change; the Kubernetes StatefulSet controller applies claim-template labels
+# only at PVC creation and never re-labels existing PVCs, and vm-operator's PVC
+# reconciler is resize-only. Storage provisioned before this upgrade therefore
+# stays unlabeled, the cleanup hook's selector misses it, and it keeps leaking on
+# delete (issue #3091). This migration relabels those PVCs once so the hook can
+# reclaim them.
+#
+# The label value is read from each CR's spec.managedMetadata so we relabel only
+# cozystack-managed monitoring clusters (a user's own VMCluster carries no such
+# label and is left untouched) and always stamp the exact value the hook selects.
+#
+# Best-effort by design: the worst case if a relabel is skipped is the
+# pre-existing leak this PR set out to fix, which is strictly no worse than the
+# status quo. A transient apiserver hiccup must therefore NOT abort the whole
+# platform upgrade, so the CR list and per-PVC reads tolerate failure (|| true)
+# rather than exiting non-zero.
+
+set -euo pipefail
+
+# shellcheck source=lib/cozystack-version.sh
+. "$(dirname "$0")/lib/cozystack-version.sh"
+
+label_key="apps.cozystack.io/application.name"
+# jsonpath escapes the dots/slash in the label key.
+label_path='{.spec.managedMetadata.labels.apps\.cozystack\.io/application\.name}'
+
+# relabel_storage <crd> <pvc-name-regex>
+# For every CR of <crd> that carries the cozystack application.name label, relabel
+# its storage PVCs (matched by the StatefulSet-derived <pvc-name-regex>, with the
+# CR name spliced in) to the same value.
+relabel_storage() {
+  crd="$1"
+  pvc_regex_tmpl="$2"
+
+  # This migration runs platform-wide (targetVersion bump), including on clusters
+  # that never installed monitoring. Skip when the CRD is absent. The `|| true`
+  # on the list additionally keeps a transient apiserver error from aborting the
+  # upgrade — there is nothing safety-critical to gate on.
+  if ! kubectl get crd "$crd" >/dev/null 2>&1; then
+    echo "$crd not present; skipping monitoring PVC label backfill"
+    return 0
+  fi
+
+  crs=$(kubectl get "$crd" -A \
+    -o jsonpath='{range .items[*]}{.metadata.namespace}{" "}{.metadata.name}{"\n"}{end}' || true)
+
+  echo "$crs" | while read -r ns name; do
+    [ -n "${ns:-}" ] || continue
+
+    appname=$(kubectl get "$crd" -n "$ns" "$name" -o jsonpath="$label_path" 2>/dev/null || true)
+    if [ -z "$appname" ]; then
+      echo "$crd $ns/$name has no $label_key; not a cozystack-managed cluster, skipping"
+      continue
+    fi
+
+    # Splice the CR name into the PVC regex (e.g. "(vmstorage|vmselect)-NAME-[0-9]+$").
+    pvc_regex=$(printf '%s' "$pvc_regex_tmpl" | sed "s/NAME/${name}/g")
+
+    # grep exits 1 when a namespace has no matching PVCs; tolerate it so pipefail
+    # does not abort the whole migration on an empty match.
+    pvcs=$(kubectl get pvc -n "$ns" \
+      -o jsonpath='{range .items[*]}{.metadata.name}{"\n"}{end}' 2>/dev/null \
+      | grep -E "$pvc_regex" || true)
+
+    for pvc in $pvcs; do
+      [ -n "${pvc:-}" ] || continue
+      current=$(kubectl get pvc -n "$ns" "$pvc" \
+        -o jsonpath="{.metadata.labels.apps\.cozystack\.io/application\.name}" 2>/dev/null || true)
+      if [ "$current" = "$appname" ]; then
+        echo "PVC $ns/$pvc already labeled $label_key=$appname; skipping"
+        continue
+      fi
+      echo "Labeling PVC $ns/$pvc with $label_key=$appname"
+      kubectl label pvc -n "$ns" "$pvc" "$label_key=$appname" --overwrite
+    done
+  done
+}
+
+# vm-operator storage PVCs are named "<claim-template>-<sts>-<ordinal>" and the
+# StatefulSet is "<component>-<cr>", so every PVC ends with
+# "<component>-<cr>-<ordinal>". The regex suffix-matches that tail, so it is
+# robust to the claim-template prefix (e.g. vmstorage-db-vmstorage-<cr>-0 and
+# vmselect-cachedir-vmselect-<cr>-0 both match on the vmselect/vmstorage arm).
+relabel_storage vmclusters.operator.victoriametrics.com '(vmstorage|vmselect)-NAME-[0-9]+$'
+# vlstorage STS PVCs are "<claim-template>-vlstorage-<cr>-<ordinal>".
+relabel_storage vlclusters.operator.victoriametrics.com 'vlstorage-NAME-[0-9]+$'
+
+# Stamp version via the shared helper so the cozystack-version ConfigMap keeps
+# the platform.cozystack.io/no-delete label.
+stamp_cozystack_version 52
diff --git a/packages/core/platform/images/migrations/migrations/52 b/packages/core/platform/images/migrations/migrations/52
new file mode 100755
index 0000000000..affe67088f
--- /dev/null
+++ b/packages/core/platform/images/migrations/migrations/52
@@ -0,0 +1,28 @@
+#!/bin/sh
+# Migration 52 --> 53
+# Delete the old linstor-scheduler admission webhook Deployment so the upgrade
+# can recreate it.
+#
+# Cozystack used to ship the linstor-scheduler admission webhook as loose
+# downstream templates whose Deployment selected pods by the base scheduler
+# selectorLabels plus app.kubernetes.io/component: admission. Upstream chart
+# 0.3.0 now ships the admission webhook natively; its Deployment keeps the same
+# name (linstor-scheduler-admission) but selects on a distinct
+# app.kubernetes.io/name: linstor-scheduler-admission. A Deployment's
+# spec.selector is immutable, so an in-place upgrade of an existing install
+# would be rejected. Deleting the old Deployment before the component reconciles
+# lets the new one be created cleanly (its ReplicaSet and pods follow); the
+# webhook's failurePolicy is Ignore, so the brief gap does not block Pod
+# creation. Safe when absent: fresh installs and clusters without the linstor
+# stack simply skip it via --ignore-not-found.
+
+set -euo pipefail
+
+# shellcheck source=lib/cozystack-version.sh
+. "$(dirname "$0")/lib/cozystack-version.sh"
+
+kubectl delete deployment linstor-scheduler-admission --namespace cozy-linstor --ignore-not-found
+
+# Stamp version via the shared helper so the cozystack-version ConfigMap keeps
+# the platform.cozystack.io/no-delete label.
+stamp_cozystack_version 53
diff --git a/packages/core/platform/images/migrations/migrations/53 b/packages/core/platform/images/migrations/migrations/53
new file mode 100755
index 0000000000..a0e6bbca18
--- /dev/null
+++ b/packages/core/platform/images/migrations/migrations/53
@@ -0,0 +1,52 @@
+#!/bin/sh
+# Migration 53 --> 54
+# Repair the 1.5.0 db-split hand-over for SeaweedFS instances whose name is not
+# the default `seaweedfs`.
+#
+# Migration 43 performs the hand-over of Cluster/seaweedfs-db from the
+# <name>-system release to the <name>-db release introduced by the split (PR
+# #2601, v1.5.0). It matched the owning release name against the literal
+# "seaweedfs-system", so it only ever fired for an instance named `seaweedfs`.
+# `SeaweedFS` is a user-creatable kind: an instance named `foo` is owned by
+# release `foo-system` and was skipped. Such a tenant kept
+# meta.helm.sh/release-name: <name>-system and never received
+# helm.sh/resource-policy: keep, so the <name>-system upgrade — whose post-split
+# chart no longer renders the Cluster — deleted it as a removed resource. CNPG
+# takes the PVC with the Cluster, so the filer metadata, and with it every object
+# in that tenant's S3, is unreachable.
+#
+# Migration 43 is fixed in place, which covers clusters upgrading from before 43.
+# Migrations never re-run, so any cluster already at version >= 44 ran the
+# hardcoded version and is still exposed: this migration re-checks the fleet and
+# performs the hand-over for any Cluster/seaweedfs-db still owned by a
+# <name>-system release. Running as a pre-upgrade hook, it lands before the
+# platform applies the new artifacts and therefore before <name>-system
+# re-renders, closing the window on THIS upgrade.
+#
+# The prune is not a one-shot: Helm diffs the LAST DEPLOYED revision against the
+# new manifest, so a tenant whose <name>-system last succeeded on a pre-split
+# revision recomputes the same deletion on EVERY upgrade attempt, including ones
+# that fail for unrelated reasons. Such a tenant re-deletes the Cluster each time
+# <name>-db recreates it. Stamping `keep` breaks that loop even when the
+# <name>-system upgrade itself stays wedged.
+#
+# Idempotent (a Cluster already owned by <name>-db is left alone), so it is a
+# no-op on a correctly migrated cluster and on fresh installs.
+#
+# LIMIT — this migration cannot recover a Cluster that is ALREADY deleted. There
+# is nothing left to re-annotate: the PVC went with it. Such a tenant needs its
+# filer metadata restored from a backup; see
+# docs/operations/seaweedfs-431-rename-recovery.md.
+
+set -euo pipefail
+
+# shellcheck source=lib/cozystack-version.sh
+. "$(dirname "$0")/lib/cozystack-version.sh"
+# shellcheck source=lib/seaweedfs-db-adopt.sh
+. "$(dirname "$0")/lib/seaweedfs-db-adopt.sh"
+
+adopt_seaweedfs_db_clusters
+
+# Stamp version via the shared helper so the cozystack-version ConfigMap keeps
+# the platform.cozystack.io/no-delete label.
+stamp_cozystack_version 54
diff --git a/packages/core/platform/images/migrations/migrations/54 b/packages/core/platform/images/migrations/migrations/54
new file mode 100755
index 0000000000..20ba1d4ac7
--- /dev/null
+++ b/packages/core/platform/images/migrations/migrations/54
@@ -0,0 +1,80 @@
+#!/bin/sh
+# Migration 54 --> 55
+# Adopt every existing RedisFailover onto the freshworks-oss redis-operator's
+# group filter AND pin its engine, before the new operator starts.
+#
+# redis-operator v3.3.5 watches RedisFailovers through a server-side label
+# selector, redis-failover.freshworks.com/operator-group=$OPERATOR_GROUP_ID
+# (OPERATOR_GROUP_ID=cozystack, set in packages/system/redis-operator). A CR
+# without that label never reaches the operator's informer at all — no event,
+# no reconcile, no error. The chart templates now stamp the label, but an
+# existing CR only receives it when its own HelmRelease next upgrades, which is
+# AFTER the operator rolls (the redis/harbor workloads dependsOn
+# cozystack.redis-operator).
+#
+# That same window is dangerous for the engine version. v3.3.5's compiled-in
+# default image moved 6.2.6 -> 7.2.4, so the moment the operator adopts a
+# labelled CR whose spec.redis.image / spec.sentinel.image is still empty, it
+# rolls that Redis to 7.2.4 — which rewrites dump.rdb into a format 6.2.6 cannot
+# load. The later chart upgrade that pins 6.2.6 then rolls back onto an
+# unreadable file and CrashLoops (Harbor's Redis is PVC-backed). So we label AND
+# pin in the same pass, before the operator sees anything: set spec.redis.image
+# / spec.sentinel.image to redis:6.2.6-alpine only where empty (Harbor has both
+# empty; apps/redis pins its data image via versionMap and leaves only the
+# sentinel empty). The later chart render writes the identical values, so
+# nothing fights.
+#
+# Runs as a pre-upgrade hook, ahead of the new operator.
+#
+# If another migration 54 lands first, renumber this one and bump
+# migrations.targetVersion; the collision surfaces as a loud add/add conflict on
+# rebase.
+
+set -euo pipefail
+
+# shellcheck source=lib/cozystack-version.sh
+. "$(dirname "$0")/lib/cozystack-version.sh"
+
+# `--ignore-not-found -o name` separates a genuinely absent CRD (rc 0, empty
+# output -> nothing to adopt) from a real API error (rc != 0 -> abort under
+# set -e). A bare `kubectl get crd >/dev/null 2>&1` cannot tell them apart: a
+# one-off apiserver blip during the hook would read as "absent", stamp the
+# version and leave the whole fleet unlabelled and invisible to the new
+# operator, permanently — the exact failure this migration exists to prevent.
+# Mirrors the probe in migration 50.
+crd=$(kubectl get crd redisfailovers.databases.spotahome.com --ignore-not-found -o name)
+if [ -z "$crd" ]; then
+  echo "RedisFailover CRD not present; nothing to adopt"
+  stamp_cozystack_version 55
+  exit 0
+fi
+
+rfs=$(kubectl get redisfailovers.databases.spotahome.com --all-namespaces -o json \
+  | jq -r '.items[] | "\(.metadata.namespace) \(.metadata.name)"')
+
+# Heredoc-fed loop (not a pipe) so a failed patch aborts the migration in this
+# shell rather than only its subshell.
+if [ -n "$rfs" ]; then
+  while read -r ns name; do
+    [ -n "$ns" ] || continue
+    cur=$(kubectl -n "$ns" get redisfailovers.databases.spotahome.com "$name" -o json)
+    redis_img=$(printf '%s' "$cur" | jq -r '.spec.redis.image // ""')
+    sentinel_img=$(printf '%s' "$cur" | jq -r '.spec.sentinel.image // ""')
+    # Always add the operator-group label; pin redis:6.2.6-alpine only where the
+    # image is currently empty. Deep-merge with jq `*` so both spec sub-objects
+    # survive, and a non-empty image (apps/redis's versionMap data image) is
+    # left untouched.
+    patch=$(jq -cn --arg ri "$redis_img" --arg si "$sentinel_img" '
+      {metadata: {labels: {"redis-failover.freshworks.com/operator-group": "cozystack"}}}
+      * (if $ri == "" then {spec: {redis: {image: "redis:6.2.6-alpine"}}} else {} end)
+      * (if $si == "" then {spec: {sentinel: {image: "redis:6.2.6-alpine"}}} else {} end)')
+    echo "Adopting RedisFailover ${ns}/${name} (label + engine pin where empty)"
+    kubectl -n "$ns" patch redisfailovers.databases.spotahome.com "$name" \
+      --type=merge -p "$patch"
+  done <<EOF
+$rfs
+EOF
+fi
+
+# Stamp version
+stamp_cozystack_version 55
diff --git a/packages/core/platform/images/migrations/migrations/55 b/packages/core/platform/images/migrations/migrations/55
new file mode 100755
index 0000000000..ea721e5e5c
--- /dev/null
+++ b/packages/core/platform/images/migrations/migrations/55
@@ -0,0 +1,82 @@
+#!/bin/sh
+# Migration 55 --> 56
+# Remove the tenant-cluster FluxCD addon (packages/system/fluxcd-operator and
+# packages/system/fluxcd).
+#
+# Those charts were the last vendored copyleft-licensed content in the
+# repository and only served the optional `addons.fluxcd` toggle of the
+# Kubernetes app, which deployed a Flux Operator + FluxInstance into a tenant
+# cluster through a pair of HelmReleases living in the management cluster. The
+# addon is dropped as a breaking change.
+#
+# For any tenant that had it enabled, orphan those HelmReleases rather than let
+# them be pruned: suspend reconciliation, drop the Flux finalizer so the delete
+# does NOT trigger a Helm uninstall inside the tenant cluster, then delete the
+# now-inert object from the management cluster. The Flux release already running
+# inside the tenant keeps running untouched. This mirrors the orphan idiom used
+# by migration 29.
+#
+# Runs as a pre-upgrade hook, i.e. before the new (addon-less) Kubernetes chart
+# reaches the tenant HelmReleases, so the finalizer is removed before any
+# pruning can fire.
+#
+# Fail-closed. Dropping the finalizer is what this script relies on to keep the
+# delete below from triggering a Helm uninstall inside the tenant. (On
+# helm-controller v1.5.0 the suspend above also blocks that uninstall, but the
+# fence lives in the controller, not here, so we do not lean on it.) Migrations
+# never re-run, so a swallowed error would stamp the version on a half-orphaned
+# fleet and never look back. Every step therefore runs under `set -euo pipefail`
+# with no `|| true`, and the delete is gated on the finalizer actually being
+# gone — verified with a read that aborts on any API error, not one that treats
+# a failed read as "gone". If anything fails the migration stops (recoverable)
+# rather than deleting a still-finalized object (not).
+
+set -euo pipefail
+
+# shellcheck source=lib/cozystack-version.sh
+. "$(dirname "$0")/lib/cozystack-version.sh"
+
+# The addon HelmReleases are the only ones referencing these ExternalArtifact
+# charts, so match on chartRef.name to select them across every tenant namespace.
+# No `|| true`: a failed list must stop the migration, not silently proceed to
+# stamp the version on a fleet we never actually inspected.
+hrs=$(kubectl get helmreleases.helm.toolkit.fluxcd.io --all-namespaces -o json \
+  | jq -r '.items[]
+      | select(.spec.chartRef.name == "cozystack-kubernetes-application-kubevirt-kubernetes-fluxcd"
+            or .spec.chartRef.name == "cozystack-kubernetes-application-kubevirt-kubernetes-fluxcd-operator")
+      | "\(.metadata.namespace) \(.metadata.name)"')
+
+# Feed the loop with a heredoc, not a pipe, so it runs in this shell and an
+# `exit 1` below aborts the whole migration instead of only its subshell.
+if [ -n "$hrs" ]; then
+  while read -r ns name; do
+    [ -n "$ns" ] || continue
+    echo "Orphaning FluxCD addon HelmRelease ${ns}/${name}"
+    # Suspend so Flux stops reconciling while we detach the finalizer.
+    kubectl -n "$ns" patch helmreleases.helm.toolkit.fluxcd.io "$name" --type=merge \
+      -p '{"spec":{"suspend":true}}'
+    # Drop the Flux finalizer. Not best-effort: this is what makes the delete
+    # inert, so a failure here must abort (set -e), never fall through to delete.
+    kubectl -n "$ns" patch helmreleases.helm.toolkit.fluxcd.io "$name" --type=merge \
+      -p '{"metadata":{"finalizers":null}}'
+    # Verify the finalizer is actually gone before deleting. If the patch was
+    # rejected (webhook, RBAC, conflict, transient apiserver error) the object
+    # still carries it, and deleting now would set a deletionTimestamp that makes
+    # helm-controller run the very uninstall this migration exists to avoid.
+    # --ignore-not-found, not `2>/dev/null || true`: a concurrently-deleted
+    # object reads empty with rc 0, but a real API error aborts under set -e
+    # instead of passing the gate on an object whose state was never read.
+    remaining=$(kubectl -n "$ns" get helmreleases.helm.toolkit.fluxcd.io "$name" \
+      --ignore-not-found -o jsonpath='{.metadata.finalizers}')
+    if [ -n "$remaining" ]; then
+      echo "ERROR: finalizer still present on ${ns}/${name} after patch (${remaining}); refusing to delete" >&2
+      exit 1
+    fi
+    kubectl -n "$ns" delete helmreleases.helm.toolkit.fluxcd.io "$name" --ignore-not-found --wait=false
+  done <<EOF
+$hrs
+EOF
+fi
+
+# Stamp version
+stamp_cozystack_version 56
diff --git a/packages/core/platform/images/migrations/migrations/56 b/packages/core/platform/images/migrations/migrations/56
new file mode 100755
index 0000000000..19d4dc4753
--- /dev/null
+++ b/packages/core/platform/images/migrations/migrations/56
@@ -0,0 +1,617 @@
+#!/bin/bash
+# Migration 56 --> 57
+# Phase 2 kubernetes chart split: adopt the worker node pools that the
+# monolithic kubernetes chart used to render into per-pool kubernetes-nodes
+# HelmReleases.
+#
+# Before this release, HelmRelease kubernetes-<cluster> rendered the worker
+# KubevirtMachineTemplate / MachineDeployment / MachineHealthCheck / worker
+# WorkloadMonitor for every entry in spec.values.nodeGroups (plus an implicit
+# md0 default when nodeGroups was empty). This release removes those objects
+# from the kubernetes chart (they moved to the kubernetes-nodes chart, one
+# HelmRelease per pool). On upgrade Helm would see them present in the previous
+# kubernetes-<cluster> release manifest but absent in the new one and PRUNE
+# them -- destroying the tenant's running worker VMs.
+#
+# For every parent kubernetes HelmRelease this migration therefore, per pool:
+#   1. creates the child HelmRelease kubernetes-nodes-<cluster>-<pool> (which
+#      cozystack-api reverse-maps to a KubernetesNodes CR by prefix). The child
+#      is created directly as a HelmRelease, not via the aggregated
+#      KubernetesNodes API, because that API's ApplicationDefinition only lands
+#      later in this same upgrade and would 404 from this pre-upgrade hook.
+#   2. re-annotates the existing worker objects onto the child release
+#      (meta.helm.sh/release-name) and pins helm.sh/resource-policy=keep so the
+#      parent kubernetes-<cluster> upgrade -- which now renders control plane
+#      only -- does not prune them during the transition. The child chart then
+#      adopts them byte-identically (proven in PR-2a golden parity; the
+#      KubevirtMachineTemplate content-hash name is preserved so no worker VM
+#      churns).
+#
+# Runs as a pre-upgrade/pre-install hook, i.e. BEFORE any tenant HelmRelease
+# reconciles the new chart, which is the only safe window for the keep +
+# re-annotation to land ahead of the parent's control-plane-only re-render.
+# That window is not perfectly quiet: if a parent kubernetes-<cluster> HR is
+# upgraded during it (a user edit, a forced reconcile, any values change) it
+# renders the OLD chart, still emits the pool objects, and Helm rejects the
+# apply with an ownership-metadata error. It self-heals once the new chart
+# artifact lands, but operators should avoid editing Kubernetes CRs during a
+# platform upgrade (also called out in the release notes).
+#
+# _cluster and nodeHealthCheck are NOT copied verbatim into the child values:
+# _cluster is injected at runtime from the cozystack-values Secret (referenced
+# via the child's valuesFrom, same as every tenant app), and nodeHealthCheck
+# collapses into the child's per-pool maxUnhealthy / nodeStartupTimeout /
+# readyUnknownTimeout / readyFalseTimeout below. The cluster-level
+# maxNodeProvisionTime and the per-group podCpuLimit / podCpuRequest are carried
+# through too: all of these feed the pool's MachineDeployment / MachineHealthCheck
+# or the KubevirtMachineTemplate, so dropping them would silently reset a tuned
+# pool (podCpuLimit/podCpuRequest additionally roll the pool, being KMT-hash
+# inputs). storageClass falls back to the cluster-level value to mirror the
+# parent's `group.storageClass | default .Values.storageClass`.
+#
+# The parent HelmRelease's spec.values keeps its now-unused nodeGroups /
+# nodeHealthCheck keys: the new kubernetes chart schema ignores them (no
+# additionalProperties:false), and stripping them here would rewrite the parent
+# values mid-window and trigger an old-chart re-render. A later cleanup
+# migration can drop them once the whole fleet is past version 57.
+#
+# Idempotent: re-running skips child HRs that already exist and objects already
+# adopted. Strict: any failed create/annotate exits 1 so run-migrations.sh
+# leaves CURRENT_VERSION at 56 and retries on the next upgrade -- best-effort is
+# unsafe because a pool left un-pinned is pruned by the parent upgrade. The
+# same contract governs every read whose absence gates a pin or adopt: absence
+# is detected with --ignore-not-found (success + empty output), so a non-zero
+# read exit can only be a real failure and exits 1 rather than masquerade as
+# absence, because "absent" here means "do not pin", and an un-pinned live
+# pool is destroyed. stderr is never captured into data (kubectl warns on
+# successful reads) and never text-matched for absence (transient failures can
+# contain "not found" too); the child-HR existence check is the one
+# deliberately tolerant read, annotated inline.
+#
+# NOT auto-reversible: downgrading the platform re-renders the OLD kubernetes
+# chart, whose manifest still lists the worker objects now annotated
+# meta.helm.sh/release-name=kubernetes-nodes-<cluster>-<pool>; the parent
+# upgrade then fails Helm ownership validation. To roll back, first re-annotate
+# every adopted object back to the parent release:
+#   kubectl annotate <res> <name> -n <ns> \
+#     meta.helm.sh/release-name=kubernetes-<cluster> --overwrite
+# (and remove the kubernetes-nodes-<cluster>-<pool> HelmReleases) BEFORE
+# downgrading the kubernetes chart.
+
+set -euo pipefail
+
+# shellcheck source=lib/cozystack-version.sh
+. "$(dirname "$0")/lib/cozystack-version.sh"
+
+CHILD_CHART_REF_NAME="cozystack-kubernetes-nodes-application-kubevirt-kubernetes-nodes"
+PARENT_CHART_REF_NAME="cozystack-kubernetes-application-kubevirt-kubernetes"
+# Older parents (created before cozystack-api moved to spec.chartRef, 43da779ee
+# 2026-01-14) carry an inline spec.chart instead: spec.chart.spec.chart is the
+# chart name "kubernetes" (real parents source it from the cozystack-apps
+# HelmRepository; kubernetes-rd release.chart before 8e9c0dd5a). The
+# application.kind label predates chartRef (fdca49838 2025-12-19), so the
+# unlabelled parents the restamp below exists to catch are exactly this
+# inline-chart shape -- matching only chartRef would miss every one of them.
+# Discover both shapes.
+#
+# The inline branch matches the chart NAME only, deliberately NOT the sourceRef:
+# the historical sourceRef name/namespace is not pinned across every past release,
+# and gating on it risks UNDER-matching a real legacy parent -- which means its
+# workers are neither adopted nor label-restamped and get pruned (data loss). The
+# looser match's worst case is the opposite and harmless: a non-cozystack HR
+# named kubernetes-* that happens to carry an inline chart literally named
+# "kubernetes" gets mislabelled (spurious child HR, no prune, no data loss). The
+# chart's render-time worker-adoption guard is the data-loss backstop regardless,
+# so this trades a low mislabel risk for zero under-match risk on purpose.
+PARENT_INLINE_CHART_NAME="kubernetes"
+
+# Durable record of pools that were pinned prune-proof but NOT adopted (every
+# warn+pin+skip branch below). These warnings otherwise live only in this Job's
+# log, which the next upgrade's before-hook-creation delete policy reaps, so an
+# operator hunting the un-managed pools after the fact has nothing to go on --
+# migration 56 stamps unconditionally and does not re-run. Each skip appends one
+# line here; if any survive the sweep the lines are published as a ConfigMap
+# before the stamp (below). A real file, so appends inside the sweep's while
+# subshell persist.
+SKIPPED_FILE=$(mktemp)
+# Fail-open: recording a skip is a diagnostic aid, not a safety mechanism (the
+# pool is already pinned prune-proof when this is called). It runs under set -e in
+# a skip branch that must NOT abort -- a failed append (e.g. /tmp full) must not
+# deadlock the fleet upgrade for one tenant, exactly the invariant every
+# warn+pin+continue branch preserves.
+record_skip() { echo "$1" >> "$SKIPPED_FILE" || true; }
+
+# The implicit default node group the parent chart's kubernetes.nodeGroups helper
+# injected when spec.values.nodeGroups was empty. Materialised explicitly so a
+# cluster that relied on the default keeps its (ingress-nginx-roled) md0 pool.
+# The helper was deleted in commit 92b9785da; its canonical default is pinned
+# here field-for-field. If DEFAULT_MD0 ever needs revisiting, diff against the
+# pre-removal definition:
+#   git show 92b9785da^:packages/apps/kubernetes/templates/_helpers.tpl
+# (the "kubernetes.nodeGroups" define, else branch). A drift here would rename
+# the content-hashed KubevirtMachineTemplate and roll every implicit-md0 pool.
+DEFAULT_MD0='{"minReplicas":0,"maxReplicas":10,"instanceType":"u1.medium","diskSize":"20Gi","storageClass":"","roles":["ingress-nginx"],"resources":{},"gpus":[],"kubelet":{}}'
+
+# adopt_one <resource> <object-name> <namespace> <new-release> <expected-old-release>
+adopt_one() {
+  res=$1; obj=$2; ns=$3; new_rel=$4; old_rel=$5
+  # One read serves both the existence check and the owner-annotation fetch.
+  # --ignore-not-found makes absence a SUCCESS with empty output, so a non-zero
+  # exit can only be a real failure (timeout, 429, RBAC, conversion-webhook
+  # outage -- all plausible while the platform is mid-upgrade) and exits 1, so
+  # run-migrations.sh leaves CURRENT_VERSION at 56 and retries on the next
+  # upgrade. Treating a failure as "absent" would skip the keep pin, let the
+  # migration complete and stamp, and the parent's control-plane-only re-render
+  # would then prune the live pool. Do NOT classify by stderr text ("not found"
+  # also appears in transient conversion-webhook failures), and do NOT capture
+  # stderr into data: kubectl warns on SUCCESSFUL reads (API deprecation,
+  # client-side throttling), and a warning glued onto the owner annotation
+  # would trip the foreign-owner refusal below on every tenant, deterministically.
+  if ! out=$(kubectl get "$res" "$obj" -n "$ns" -o json --ignore-not-found); then
+    echo "    ERROR: reading $res/$obj in $ns failed" >&2
+    return 1
+  fi
+  if [ -z "$out" ]; then
+    echo "    $res/$obj absent in $ns, skipping"
+    return 0
+  fi
+  cur=$(printf '%s' "$out" | jq -r '.metadata.annotations["meta.helm.sh/release-name"] // ""')
+  if [ "$cur" = "$new_rel" ]; then
+    echo "    $res/$obj already adopted by $new_rel"
+    return 0
+  fi
+  if [ -n "$cur" ] && [ "$cur" != "$old_rel" ]; then
+    # A foreign owner is a hostile stored shape, same class as a non-object
+    # nodeGroups or an RFC-1123-invalid key: reachable out-of-band via
+    # `kubectl annotate <res> <name> meta.helm.sh/release-name=<other>` on the
+    # tenant namespace. Do NOT exit 1 here -- under set -e that aborts the whole
+    # per-cluster pipeline, run-migrations.sh leaves CURRENT_VERSION unstamped,
+    # and one tenant's corrupted annotation deadlocks the platform upgrade for
+    # EVERY tenant with no path out. Refuse to ADOPT (rewriting a foreign
+    # release-name could corrupt that other release), but still PIN keep exactly
+    # as every sibling skip branch (invalid name, overflow, non-object) does:
+    # the worker object is in the parent's OLD pre-split release manifest, so the
+    # parent's control-plane-only re-render enters it into the prune set, and
+    # Helm's prune gates ONLY on helm.sh/resource-policy=keep -- it does not
+    # consult the live meta.helm.sh/release-name. Skipping without the pin would
+    # let the parent delete the object and cascade-destroy the tenant's worker
+    # VMs. Pinning is additive and cannot corrupt the other release. Migration 56
+    # stamps 57 unconditionally and does not re-run, so recovery is manual.
+    echo "    WARNING: $res/$obj owned by unexpected release '$cur' (expected '$old_rel'); pinning resource-policy=keep and skipping adoption of this object" >&2
+    echo "    WARNING: remedy: if it genuinely belongs to this pool, re-annotate meta.helm.sh/release-name=$new_rel on $res/$obj manually; migration 56 has already stamped and will not re-run" >&2
+    pin_keep "$res" "$obj" "$ns"
+    record_skip "$ns object $res/$obj: owned by foreign release '$cur' (expected '$old_rel'); pinned prune-proof, NOT adopted -- child release '$new_rel' may stay Failed on an ownership conflict until this object is re-annotated"
+    return 0
+  fi
+  echo "    adopting $res/$obj -> $new_rel"
+  # release-namespace is normally already present (Helm stamped it when the
+  # parent applied the object, and the child release lives in the same
+  # namespace), but an object whose Helm annotations were stripped out-of-band
+  # still passes the empty-cur branch above -- set it alongside release-name so
+  # such an object cannot fail the child's ownership validation.
+  kubectl annotate "$res" "$obj" -n "$ns" \
+    helm.sh/resource-policy=keep \
+    meta.helm.sh/release-name="$new_rel" \
+    meta.helm.sh/release-namespace="$ns" \
+    --overwrite
+  kubectl label "$res" "$obj" -n "$ns" \
+    app.kubernetes.io/managed-by=Helm --overwrite
+}
+
+# pin_keep <resource> <object-name> <namespace> -- protect an object from the
+# parent's control-plane-only re-render prune without transferring ownership.
+# Used for pools we cannot adopt (name overflow): the workers keep running,
+# unmanaged, until the operator gives the cluster a shorter name.
+pin_keep() {
+  res=$1; obj=$2; ns=$3
+  # Same absence-vs-failure split as adopt_one (--ignore-not-found: absence is
+  # success + empty output): a read failure treated as "absent" would leave a
+  # live pool un-pinned for the parent's prune, so it exits 1 and the migration
+  # retries on the next upgrade.
+  if ! out=$(kubectl get "$res" "$obj" -n "$ns" -o name --ignore-not-found); then
+    echo "    ERROR: reading $res/$obj in $ns failed" >&2
+    return 1
+  fi
+  [ -z "$out" ] && return 0
+  echo "    pinning $res/$obj with resource-policy=keep"
+  kubectl annotate "$res" "$obj" -n "$ns" helm.sh/resource-policy=keep --overwrite
+}
+
+# list_kmts <namespace> -- newline-separated names of every
+# KubevirtMachineTemplate in the namespace. Fail-closed: a listing failure must
+# NOT read as "no templates" (the caller would adopt/pin zero KMTs, the
+# migration would complete and stamp, and the parent upgrade would prune a
+# preserved older-revision KMT that an in-flight MachineSet still references --
+# permanently, since the child chart only re-emits KMTs already annotated with
+# its own release name). `for kmt in $(...)` discards the substitution's exit
+# status even under set -e, so callers capture into a variable first (the
+# assignment's failure IS seen by set -e) and grep afterwards. A missing CRD
+# (migration-47 precedent) means no pool can exist -> empty; that is the ONE
+# classification stderr is needed for, so stderr goes to a temp file -- never
+# into the data variable, which kubectl warnings on successful reads would
+# contaminate -- and only the two deterministic RESTMapper/discovery messages
+# match; a transient failure whose text merely contains "not found" does not.
+list_kmts() {
+  ns=$1
+  errf=$(mktemp)
+  if ! out=$(kubectl get kubevirtmachinetemplate.infrastructure.cluster.x-k8s.io -n "$ns" \
+      -o jsonpath='{range .items[*]}{.metadata.name}{"\n"}{end}' 2>"$errf"); then
+    err=$(cat "$errf"); rm -f "$errf"
+    case "$err" in
+      *"the server doesn't have a resource type"*|*"no matches for kind"*) return 0 ;;
+    esac
+    echo "  ERROR: listing KubevirtMachineTemplates in $ns failed: $err" >&2
+    return 1
+  fi
+  rm -f "$errf"
+  printf '%s' "$out"
+}
+
+# pin_pool_objects <cluster> <group> <namespace> -- pin every worker object of a
+# pool we cannot adopt (name overflow, or a name that is not a valid HelmRelease
+# metadata.name) so the parent's control-plane-only re-render cannot prune them.
+# The pool keeps running unmanaged until the operator recreates it with a legal
+# name. Absence is tolerated inside pin_keep, so it is a safe no-op when the
+# objects are absent (a pool that never rendered under a bad name).
+pin_pool_objects() {
+  cluster=$1; group=$2; ns=$3
+  base="kubernetes-${cluster}-${group}"
+  # The pool's objects only ever existed under this composed name, and the
+  # apiserver only accepts DNS-1123 subdomain names -- so a composed name that
+  # is not one (a group key with a slash, space, underscore, uppercase...)
+  # provably never had an object applied under it. Skip without issuing any
+  # read: there is nothing to pin, and kubectl rejects some malformed names
+  # client-side (e.g. containing '/'), which would read as a failure here and
+  # deadlock the run over a pool that cannot exist.
+  if ! printf '%s' "$base" | grep -qE '^[a-z0-9]([a-z0-9.-]*[a-z0-9])?$'; then
+    echo "    '$base' is not a valid object name, so no object can exist under it; nothing to pin"
+    return 0
+  fi
+  pin_keep "machinedeployment.cluster.x-k8s.io" "$base" "$ns"
+  pin_keep "machinehealthcheck.cluster.x-k8s.io" "$base" "$ns"
+  pin_keep "workloadmonitor.cozystack.io" "$base" "$ns"
+  kmts=$(list_kmts "$ns")
+  for kmt in $(printf '%s\n' "$kmts" |
+               grep -E "^kubernetes-${cluster}-${group}-[0-9a-f]{6}$" || true); do
+    pin_keep "kubevirtmachinetemplate.infrastructure.cluster.x-k8s.io" "$kmt" "$ns"
+  done
+}
+
+# pin_cluster_pools <cluster> <namespace> -- pin every live worker pool of a
+# cluster whose nodeGroups we cannot introspect (stored as a non-object). We
+# cannot enumerate the declared pool keys, so discover the live pools from their
+# KubevirtMachineTemplates (named kubernetes-<cluster>-<group>-<6hex>): each
+# distinct <group> is pinned via pin_pool_objects, the same warn+pin+skip
+# contract every other unadoptable branch uses. Without this the parent's
+# control-plane-only re-render prunes the un-pinned worker VMs. Fail-closed: the
+# KMT listing goes through list_kmts, so a transient read failure aborts the run
+# (retried next upgrade) instead of masquerading as "no pools" and leaving live
+# workers un-pinned. Over-matching a sibling cluster's KMT (when one cluster name
+# is a dash-delimited prefix of another in the same namespace) only pins keep on
+# an object that is preserved anyway, so it is harmless; under-matching would
+# lose VMs, so discovery errs toward pinning.
+pin_cluster_pools() {
+  cluster=$1; ns=$2
+  kmts=$(list_kmts "$ns")
+  groups=$(printf '%s\n' "$kmts" |
+           grep -E "^kubernetes-${cluster}-.+-[0-9a-f]{6}$" |
+           sed -E "s/^kubernetes-${cluster}-(.+)-[0-9a-f]{6}$/\1/" |
+           sort -u || true)
+  for group in $groups; do
+    [ -n "$group" ] || continue
+    pin_pool_objects "$cluster" "$group" "$ns"
+  done
+}
+
+# The sweep below selects parents by the apps.cozystack.io/application.kind label,
+# but that label postdates v1.2 (commit fdca49838, 2025-12-10): a parent
+# kubernetes HelmRelease created before it, or one restored/created by hand, does
+# not carry the label. The label selector would then skip that cluster entirely,
+# the migration would report success and stamp 57, and the parent's
+# control-plane-only re-render would prune its un-pinned workers with no pin and
+# no warning -- the exact data loss every skip branch below pins to avoid, here
+# reached by a labelling gap instead of a hostile value. (The chart's own
+# render-time guard fail-closes on this too, so it is not silent data loss; this
+# restamp is what lets an old cluster adopt seamlessly instead of blocking the
+# upgrade until an operator recovers it by hand.) The chart identity -- chartRef
+# for newer parents, inline spec.chart for older ones -- pins a kubernetes cluster
+# release regardless of labels, so restamp the three application labels on any
+# such release FIRST, then let the sweep pick it up like any other. A label write
+# is additive and cannot corrupt a release (same reasoning as pinning keep on the
+# foreign-owner branch); it also repairs the release for everything else that
+# filters on that label (cozystack-api's List, the lineage webhook), not only for
+# this migration. Runs under set -e/pipefail, so a genuine label failure aborts
+# before the stamp and retries next upgrade.
+kubectl get helmrelease --all-namespaces -o json |
+  jq -r --arg chart "$PARENT_CHART_REF_NAME" --arg inlinechart "$PARENT_INLINE_CHART_NAME" '.items[]
+      | select((.spec.chartRef.name == $chart) or (.spec.chart.spec.chart == $inlinechart))
+      | select(.metadata.name | startswith("kubernetes-"))
+      | select(.metadata.labels["apps.cozystack.io/application.kind"] != "Kubernetes")
+      | "\(.metadata.namespace) \(.metadata.name)"' |
+  while IFS=' ' read -r ns name; do
+    [ -n "$ns" ] || continue
+    echo "restamping application labels on unlabelled parent $ns/$name (kubernetes chart, missing apps.cozystack.io/application.kind)"
+    kubectl label helmrelease "$name" -n "$ns" --overwrite \
+      apps.cozystack.io/application.kind=Kubernetes \
+      apps.cozystack.io/application.group=apps.cozystack.io \
+      "apps.cozystack.io/application.name=${name#kubernetes-}"
+  done
+
+kubectl get helmrelease --all-namespaces \
+  -l apps.cozystack.io/application.kind=Kubernetes -o json |
+  jq -c '.items[] | {ns: .metadata.namespace, name: .metadata.name, values: (.spec.values // {})}' |
+  while IFS= read -r hrjson; do
+    ns=$(printf '%s' "$hrjson" | jq -r '.ns')
+    name=$(printf '%s' "$hrjson" | jq -r '.name')
+    values=$(printf '%s' "$hrjson" | jq -c '.values')
+
+    case "$name" in
+      kubernetes-*) cluster=${name#kubernetes-} ;;
+      *) echo "skipping HelmRelease with unexpected name '$name' in $ns" >&2; continue ;;
+    esac
+    echo "processing cluster '$cluster' (HelmRelease $name in $ns)"
+
+    groups_json=$(printf '%s' "$values" | jq -c '.nodeGroups // {}')
+    # nodeGroups is map[string]NodeGroup, but the aggregated API's old schema never
+    # enforced that shape, so a hand-mangled parent HR (a kubectl edit bypasses the
+    # aggregated API's validation) can persist nodeGroups as a non-object: an array,
+    # string or number. Iterating that shape crashes jq under set -e (e.g. keys[] on
+    # an array yields indices, then .[$idx] fails with "Cannot index array with
+    # string") and, because this runs as the platform pre-upgrade hook, exits 1 and
+    # deadlocks the upgrade for EVERY tenant. Warn and skip this cluster's pool
+    # adoption instead -- but first pin its live worker pools with
+    # resource-policy=keep (discovered from their KMTs, since the declared keys
+    # are unreadable): the objects were rendered by an earlier good revision and
+    # are still live, and skipping without pinning would let the parent's
+    # control-plane-only re-render prune the tenant's worker VMs, the exact
+    # data-loss every sibling skip branch (invalid name, overflow, per-group
+    # non-object) pins to avoid. {} / null still fall through to the implicit md0
+    # default.
+    groups_type=$(printf '%s' "$groups_json" | jq -r 'type')
+    if [ "$groups_type" != "object" ]; then
+      echo "  WARNING: nodeGroups of cluster '$cluster' is a $groups_type, not an object; pinning its live worker pools with resource-policy=keep and skipping adoption" >&2
+      pin_cluster_pools "$cluster" "$ns"
+      record_skip "$ns/$name: nodeGroups is a $groups_type (not an object); live worker pools pinned prune-proof, NOT adopted"
+      continue
+    fi
+    if [ "$(printf '%s' "$groups_json" | jq 'length')" -eq 0 ]; then
+      echo "  nodeGroups empty; materialising implicit md0 default"
+      groups_json=$(jq -cn --argjson d "$DEFAULT_MD0" '{md0: $d}')
+    fi
+
+    # Iterate keys newline-safely. An unquoted `for group in $(... keys[])` would
+    # word-split (and glob-expand) a key containing whitespace or a glob char, e.g.
+    # "my pool", exactly as reachable as the "My_Pool" case the RFC-1123 guard below
+    # was added for, into separate fragments, each individually RFC-1123 valid, so
+    # the guard never fires and bogus child releases get fabricated for a pool that
+    # never existed. `read` consumes whole lines and does not glob, so the intact key
+    # reaches the guard. A key with an embedded newline cannot round-trip line
+    # iteration, but each fragment then fails the RFC-1123 regex as one token, so
+    # nothing hostile survives. Fail-closed exit semantics are preserved: a non-zero
+    # exit inside the loop (set -e) propagates out through pipefail exactly as the
+    # enclosing per-cluster while pipeline already relies on.
+    printf '%s' "$groups_json" | jq -r 'keys[]' | while IFS= read -r group; do
+      child_name="kubernetes-nodes-${cluster}-${group}"
+      app_name="${cluster}-${group}"
+      # Normalize the per-group value to an object or null: the same
+      # unconstrained-schema vector lets a group value be a non-object
+      # (string/number/array), on which the value-mapping jq below (`$grp | has(...)`)
+      # aborts under set -e. A non-object value becomes null and takes the warn + pin
+      # + skip path below, same as an invalid name.
+      grp=$(printf '%s' "$groups_json" | jq -c --arg g "$group" '.[$g] | if type == "object" then . else null end')
+
+      # A HelmRelease metadata.name must be a valid RFC-1123 label. The old
+      # nodeGroups map key was never schema-constrained (map[string]NodeGroup,
+      # no propertyNames pattern), so a stored parent HR can carry a key like
+      # "My_Pool" — added via kubectl/dashboard, whose own render then failed at
+      # apply time, leaving the HR stuck on an older revision with the bad key
+      # persisted. child_name would then be RFC-1123-invalid, `kubectl apply`
+      # rejects it, and under set -e the script exits 1 — deadlocking the
+      # platform pre-upgrade hook for EVERY tenant, exactly the failure the
+      # overflow branch below was built to avoid. Route it through the same
+      # warn + pin + skip path. pin_pool_objects pins whatever can actually
+      # exist: a key that is label-invalid but still a valid object name (e.g.
+      # dotted) may have live objects and gets pinned; one that is not even a
+      # valid object name provably has none and is skipped without a read --
+      # either way the warning is the point.
+      if ! printf '%s' "$child_name" | grep -qE '^[a-z0-9]([-a-z0-9]*[a-z0-9])?$'; then
+        echo "  WARNING: child release name '$child_name' (nodeGroup key '$group') is not a valid RFC-1123 label" >&2
+        echo "  WARNING: pinning pool '$cluster'/'$group' objects with resource-policy=keep and skipping adoption" >&2
+        echo "  WARNING: remedy: recreate the pool with an RFC-1123 name (lowercase alphanumeric and '-', must start and end alphanumeric)" >&2
+        pin_pool_objects "$cluster" "$group" "$ns"
+        record_skip "$ns/$name pool '$group': child name '$child_name' is not a valid RFC-1123 label; objects pinned prune-proof, NOT adopted"
+        continue
+      fi
+
+      # Helm refuses release names longer than 53 characters. The kubernetes chart
+      # caps a new cluster name at 32 (its `## @name` declaration, enforced by
+      # cozystack-api) precisely so its pools fit, but a legacy or hand-created
+      # cluster name can be longer, and combined with the longer kubernetes-nodes-
+      # prefix the child name can overflow. Do NOT fail the whole migration
+      # here: exiting would deadlock the platform pre-upgrade hook for EVERY
+      # tenant, with no path out. Instead pin this pool's worker objects with
+      # resource-policy=keep so the parent's control-plane-only re-render cannot
+      # prune them, skip creating the child HelmRelease, warn loudly, and move
+      # on. The pool keeps running unmanaged until the operator recreates the
+      # cluster with a shorter name (cluster+pool must fit in 36 chars).
+      if [ "${#child_name}" -gt 53 ]; then
+        echo "  WARNING: child release name '$child_name' (${#child_name} chars) exceeds Helm's 53-char limit" >&2
+        echo "  WARNING: pinning pool '$cluster'/'$group' objects with resource-policy=keep and skipping adoption" >&2
+        echo "  WARNING: remedy: recreate the cluster with a shorter name (cluster+pool must fit in 36 chars)" >&2
+        pin_pool_objects "$cluster" "$group" "$ns"
+        record_skip "$ns/$name pool '$group': child name '$child_name' (${#child_name} chars) exceeds Helm's 53-char limit; objects pinned prune-proof, NOT adopted"
+        continue
+      fi
+
+      # A non-object group value (normalized to null above) carries no pool
+      # configuration; pin any objects it may have rendered and skip adoption, the
+      # same warn + pin + skip contract as an invalid name. Without this the
+      # value-mapping jq below aborts under set -e and deadlocks the pre-upgrade
+      # hook for every tenant.
+      if [ "$grp" = "null" ]; then
+        echo "  WARNING: nodeGroup '$group' of cluster '$cluster' has a non-object value; pinning its objects with resource-policy=keep and skipping adoption" >&2
+        pin_pool_objects "$cluster" "$group" "$ns"
+        record_skip "$ns/$name pool '$group': non-object group value; objects pinned prune-proof, NOT adopted"
+        continue
+      fi
+
+      # Fields the value-mapping jq below copies verbatim into the child HR must
+      # be scalars. The nodeGroups map value was never fully schema-constrained
+      # (unconstrained NodeGroup subfields, reachable by kubectl/dashboard edit),
+      # so a stored group could carry e.g. storageClass or instanceType as an
+      # object or array. Copied through, that value fails the KubernetesNodes
+      # schema on the child HR install, leaving the pool's child release stuck
+      # Failed. Route a non-scalar scalar-field through the same warn + pin +
+      # skip contract instead: pin the live objects prune-proof and skip
+      # adoption, so the pool keeps running unmanaged until the operator fixes
+      # the stored value, rather than churning on a child install that cannot
+      # validate. Container-typed fields (roles, resources, gpus, kubelet) are
+      # excluded: they are legitimately object/array.
+      bad_scalar=$(printf '%s' "$grp" | jq -r '
+        . as $g
+        | ["minReplicas","maxReplicas","instanceType","diskSize","storageClass","logSerialConsole","maxUnhealthy","nodeStartupTimeout","podCpuLimit","podCpuRequest"]
+        | map(. as $k | select(($g|has($k)) and (($g[$k]|type) as $t | $t == "object" or $t == "array")))
+        | join(",")')
+      if [ -n "$bad_scalar" ]; then
+        echo "  WARNING: nodeGroup '$group' of cluster '$cluster' has non-scalar value(s) for field(s) [$bad_scalar]; pinning its objects with resource-policy=keep and skipping adoption" >&2
+        echo "  WARNING: remedy: restore the field(s) to a scalar on the parent Kubernetes CR's nodeGroups.$group, then recreate the pool; migration 56 has already stamped and will not re-run" >&2
+        pin_pool_objects "$cluster" "$group" "$ns"
+        record_skip "$ns/$name pool '$group': non-scalar value(s) for field(s) [$bad_scalar]; objects pinned prune-proof, NOT adopted"
+        continue
+      fi
+
+      child_values=$(printf '%s' "$values" | jq -c \
+        --arg cluster "$cluster" \
+        --argjson grp "$grp" '
+        def pick($o; ks): reduce ks[] as $k ({}; if ($o | has($k)) then . + {($k): $o[$k]} else . end);
+        ({cluster: $cluster}
+         + pick($grp; ["minReplicas","maxReplicas","instanceType","diskSize","roles","resources","gpus","kubelet","logSerialConsole","podCpuLimit","podCpuRequest"])
+         # storageClass: per-group value if set and non-empty, else cluster-level
+         # (mirrors the parent `group.storageClass | default .Values.storageClass`).
+         + (if (($grp | has("storageClass")) and ($grp.storageClass != "")) then {storageClass: $grp.storageClass}
+            elif (has("storageClass") and (.storageClass != null)) then {storageClass: .storageClass}
+            else {} end)
+         # effective MHC knobs: per-group override, else cluster-wide nodeHealthCheck
+         + (if ($grp | has("maxUnhealthy")) then {maxUnhealthy: $grp.maxUnhealthy}
+            elif ((.nodeHealthCheck | type) == "object" and (.nodeHealthCheck | has("maxUnhealthy"))) then {maxUnhealthy: .nodeHealthCheck.maxUnhealthy}
+            else {} end)
+         + (if ($grp | has("nodeStartupTimeout")) then {nodeStartupTimeout: $grp.nodeStartupTimeout}
+            elif ((.nodeHealthCheck | type) == "object" and (.nodeHealthCheck | has("nodeStartupTimeout"))) then {nodeStartupTimeout: .nodeHealthCheck.nodeStartupTimeout}
+            else {} end)
+         # cluster-wide MHC condition timeouts: no per-group override exists in the
+         # parent model, so these flatten straight from nodeHealthCheck.
+         + (if ((.nodeHealthCheck | type) == "object" and (.nodeHealthCheck | has("readyUnknownTimeout"))) then {readyUnknownTimeout: .nodeHealthCheck.readyUnknownTimeout} else {} end)
+         + (if ((.nodeHealthCheck | type) == "object" and (.nodeHealthCheck | has("readyFalseTimeout"))) then {readyFalseTimeout: .nodeHealthCheck.readyFalseTimeout} else {} end)
+         # cluster-wide autoscaler budget: top-level parent field, rendered onto the
+         # pool MachineDeployment maxnodeprovisiontime annotation.
+         + (if (has("maxNodeProvisionTime") and (.maxNodeProvisionTime != null)) then {maxNodeProvisionTime: .maxNodeProvisionTime} else {} end)
+         # cluster-level inputs the pool templates consume verbatim
+         + pick(.; ["version","talos"])
+         # images: copy only the declared kubectl override, not the whole
+         # parent images map (which carries waitForKubeconfig/talosCsrSigner that
+         # the KubernetesNodes schema does not declare and a dashboard round-trip
+         # would drop).
+         + (if ((.images | type) == "object" and (.images | has("kubectl"))) then {images: {kubectl: .images.kubectl}} else {} end)
+        )')
+
+      # Adopt the worker objects the parent rendered for this group BEFORE
+      # creating the child HelmRelease. If the kubernetes-nodes ExternalArtifact
+      # already exists (Phase 2a shipped in an earlier release), helm-controller
+      # can start the child install the moment the HR appears; adopting first
+      # guarantees the keep + release-name annotations are already in place, so
+      # the child install never trips Helm's ownership validation.
+      adopt_one "machinedeployment.cluster.x-k8s.io" "kubernetes-${cluster}-${group}" "$ns" "$child_name" "kubernetes-${cluster}"
+      adopt_one "machinehealthcheck.cluster.x-k8s.io" "kubernetes-${cluster}-${group}" "$ns" "$child_name" "kubernetes-${cluster}"
+      adopt_one "workloadmonitor.cozystack.io" "kubernetes-${cluster}-${group}" "$ns" "$child_name" "kubernetes-${cluster}"
+
+      # All KubevirtMachineTemplates for this group carry a 6-hex content-hash
+      # suffix (parent chart: sha256sum | trunc 6): kubernetes-<cluster>-<group>-<hash>.
+      # Anchor on that suffix so pool 'md0' does not also match a sibling pool
+      # 'md0-large-<hash>' (which would mis-adopt it and deadlock the migration).
+      # Adopt every revision (current + any preserved older one still referenced
+      # by an in-flight MachineSet). Capture-first via list_kmts (fail-closed);
+      # the || true covers only the empty-grep-match case.
+      kmts=$(list_kmts "$ns")
+      for kmt in $(printf '%s\n' "$kmts" |
+                   grep -E "^kubernetes-${cluster}-${group}-[0-9a-f]{6}$" || true); do
+        adopt_one "kubevirtmachinetemplate.infrastructure.cluster.x-k8s.io" "$kmt" "$ns" "$child_name" "kubernetes-${cluster}"
+      done
+
+      # This existence check MAY stay fail-open (unlike the reads above): a
+      # transient error here routes into the create path, whose `kubectl apply`
+      # is idempotent for an HR this migration already created and itself fails
+      # closed if the apiserver is genuinely down. No silent-skip hazard.
+      if kubectl get helmrelease "$child_name" -n "$ns" >/dev/null 2>&1; then
+        echo "  child HelmRelease $child_name already exists, skipping create"
+      else
+        echo "  creating child HelmRelease $child_name"
+        # HR shape mirrors pkg/registry/apps/application/rest.go
+        # convertApplicationToHelmRelease (interval, maxHistory, RetryOnFailure
+        # strategy + retryInterval, timeouts+disableWait from the kubernetes-nodes
+        # ApplicationDefinition annotations) so an adopted pool is byte-shaped
+        # like a natively created one and self-heals on a failed install.
+        jq -cn \
+          --arg name "$child_name" --arg ns "$ns" --arg app "$app_name" \
+          --arg chart "$CHILD_CHART_REF_NAME" --argjson values "$child_values" '
+          {
+            apiVersion: "helm.toolkit.fluxcd.io/v2",
+            kind: "HelmRelease",
+            metadata: {
+              name: $name,
+              namespace: $ns,
+              labels: {
+                "sharding.fluxcd.io/key": "tenants",
+                "apps.cozystack.io/application.kind": "KubernetesNodes",
+                "apps.cozystack.io/application.group": "apps.cozystack.io",
+                "apps.cozystack.io/application.name": $app
+              }
+            },
+            spec: {
+              interval: "5m",
+              maxHistory: 5,
+              chartRef: { kind: "ExternalArtifact", name: $chart, namespace: "cozy-system" },
+              install: {
+                timeout: "15m",
+                disableWait: true,
+                strategy: { name: "RetryOnFailure", retryInterval: "30s" }
+              },
+              upgrade: {
+                timeout: "15m",
+                disableWait: true,
+                strategy: { name: "RetryOnFailure", retryInterval: "30s" }
+              },
+              valuesFrom: [ { kind: "Secret", name: "cozystack-values" } ],
+              values: $values
+            }
+          }' | kubectl apply --filename -
+      fi
+    done
+  done
+
+# Publish a durable record of any pool that was pinned prune-proof but not
+# adopted, BEFORE stamping: the per-Job log warnings are reaped by the next
+# upgrade's before-hook-creation delete policy, and migration 56 does not re-run,
+# so without this an operator cannot locate the un-managed pools after the fact.
+# The ConfigMap is a plain data record (no no-delete label needed); a re-run of
+# the migration on a retry refreshes it via apply.
+#
+# Best-effort: the record is a convenience artifact, NOT a safety mechanism --
+# every skipped pool was already pinned prune-proof (pin_keep) earlier in the
+# sweep, so the workers are safe regardless of whether this write lands. Do not
+# let it gate the stamp: a permanent write failure (e.g. the record growing past
+# etcd's object-size limit at a very large skip count) would otherwise abort the
+# migration before the stamp and deadlock the fleet upgrade with no path out,
+# even though the data protection already completed. So swallow its failure with
+# a warning rather than failing closed.
+if [ -s "$SKIPPED_FILE" ]; then
+  echo "WARNING: wrote $(wc -l < "$SKIPPED_FILE" | tr -d ' ') record(s) of worker objects/pools pinned prune-proof but NOT adopted to configmap/cozystack-migration-56-unadopted in ${NAMESPACE:-cozy-system} (one line per skipped worker object or pool -- a foreign-owned pool contributes one line per object, so this is a line count, not a distinct-pool count; read the configmap for the breakdown). Migration 56 will not re-run, so these need manual recovery (adopt or recreate)." >&2
+  kubectl create configmap cozystack-migration-56-unadopted \
+    -n "${NAMESPACE:-cozy-system}" \
+    --from-file=unadopted="$SKIPPED_FILE" \
+    --dry-run=client -o yaml | kubectl apply --filename - ||
+    echo "WARNING: could not publish the unadopted-pools record ConfigMap; the pools are still pinned prune-proof and safe, but you will need to find them in this Job's log above" >&2
+fi
+rm -f "$SKIPPED_FILE"
+
+# Stamp version via the shared helper so the no-delete label is preserved.
+stamp_cozystack_version 57
diff --git a/packages/core/platform/images/migrations/migrations/57 b/packages/core/platform/images/migrations/migrations/57
new file mode 100755
index 0000000000..15253096b9
--- /dev/null
+++ b/packages/core/platform/images/migrations/migrations/57
@@ -0,0 +1,131 @@
+#!/bin/sh
+# Migration 57 --> 58
+# Keep every existing SeaweedFS instance at the master volume size limit it has
+# been running with, 1000, unless it already names one or its master is not an
+# object, which no v1 chart renders.
+#
+# The seaweedfs app chart now sends master.volumeSizeLimitMB and defaults it to
+# 400. An instance that has been running at 1000 would take that default on its
+# next reconcile, and every volume between 400 MB and 1000 MB would leave the
+# master's writable set at once, stranding any bucket whose volumes had all
+# crossed the line. So the value is written as 1000 on each instance that has
+# not chosen one, apart from that unrenderable shape, and on a variant that runs
+# platform migrations the new default reaches only instances created after this
+# release. Lowering an existing instance is left to its operator, with the check
+# in docs/operations/seaweedfs-lowering-the-volume-size-limit.md.
+#
+# Where the value goes. An instance is a HelmRelease labelled with its
+# application kind and group, the selector cozystack-api lists SeaweedFS with,
+# and its spec.values is the application spec. That holds for an instance
+# created through the API and for one the tenant module renders, including the
+# platform's own in tenant-root, so one patch serves both. The tenant module
+# renders that HelmRelease without spec.values, which
+# packages/apps/tenant/tests/seaweedfs_values_left_to_the_instance_test.yaml
+# pins, and a Helm upgrade leaves a key alone when neither the previous nor the
+# new manifest carries it: measured with Helm 4.3.0 on client-side apply,
+# server-side apply and a forced server-side upgrade, and read in
+# pkg/kube/client.go createPatch at v4.1.1, the Helm that helm-controller v1.5.0
+# runs. If the tenant chart ever renders master.volumeSizeLimitMB into that
+# release, its value replaces this one on every reconcile. The <name>-system
+# child is not the place either: its parent renders it on every reconcile.
+#
+# "Chosen" is a whole number from 1 to 30000, the range the new chart accepts,
+# and such a value is left as it is. Unless it is 1000 it is also named in the
+# Job log, because the previous chart ignored it and the new one applies it;
+# 1000 changes nothing, and a Job retried after a partial run finds its own pins
+# there. Anything else counts as not chosen and is replaced with 1000: an absent
+# key, a null, a string, a fraction or a number out of range. The previous chart
+# ignored all of those, so 1000 is what the instance has been running with in
+# their place, and the new chart refuses them, so keeping one would stop that
+# release from reconciling. A master holding a scalar or a list is not patched,
+# since patching it would replace whatever it holds, and every v1 schema types
+# master as an object, so that release does not render today either. The Job
+# log names it, because whoever repairs master later has to set the limit in
+# the same edit or the instance comes up at 400. A null master is patched like
+# an absent one. A spec.values that is not an object is different:
+# helm-controller discards values it cannot read as a map
+# (HelmRelease.GetValues at v1.5.0) and renders the chart's defaults, so that
+# instance runs at 1000 today and would take 400. It counts as not chosen, and
+# the same merge patch replaces it with the pin, measured with
+# gopkg.in/evanphx/json-patch.v4 v4.13.0, the merge-patch implementation
+# k8s.io/apiserver v0.35.0 calls. That drops nothing that applies, and the Job
+# log keeps what it held.
+#
+# helm-controller merges spec.values over valuesFrom (ChartValuesFromReferences
+# in fluxcd/pkg/chartutil v1.22.0). A limit a valuesFrom entry sets without
+# targetPath is therefore overridden by the pin, and one set through targetPath
+# wins or loses depending on the entries before it. The apps API and the tenant
+# module both set valuesFrom to the cozystack-values Secret alone, so any other
+# entry is named in the Job log, and the pin is written regardless.
+#
+# Order. On a variant that runs platform migrations, this runs as a pre-upgrade
+# hook of the platform release, and the cozystack-packages source every
+# application chart is built from is itself a manifest of that release
+# (templates/repository.yaml), applied only after the hooks finish. There, no
+# instance can reach the new chart before this has run, and a failure here stops
+# the platform upgrade before that source moves, so no instance reaches it
+# unpatched either. Everything therefore fails closed. That order holds while
+# the platform source is pinned by digest, as it is out of the box. A source
+# that follows a tag, a semver range or a branch lets source-controller move
+# cozystack-packages on its own schedule, and an instance there can run at 400,
+# with the stranding that brings, until this has run.
+#
+# Until cozystack-packages moves, each patched release still runs its old chart,
+# which ignores the key: no v1 release of the chart reads it, and none closes
+# the master object in its values schema. The patch costs at most an upgrade
+# that renders nothing new.
+
+set -euo pipefail
+
+# shellcheck source=lib/cozystack-version.sh
+. "$(dirname "$0")/lib/cozystack-version.sh"
+
+selector='apps.cozystack.io/application.kind=SeaweedFS,apps.cozystack.io/application.group=apps.cozystack.io'
+
+# The HelmRelease CRD is always present here, so an empty list is a cluster with
+# no instance, and a failed list aborts under set -e rather than reading as one.
+plan=$(kubectl get helmreleases.helm.toolkit.fluxcd.io --all-namespaces -l "$selector" -o json \
+  | jq -r '.items[]
+      | "\(.metadata.namespace) \(.metadata.name)" as $id
+      | .spec.values as $s
+      | [(.spec.valuesFrom // [])[] | select(. != {kind: "Secret", name: "cozystack-values"})] as $extra
+      | (if $extra != [] then "valuesfrom \($id) \($extra | tojson)" else empty end),
+        (if $s != null and ($s | type) != "object"
+         then "unreadable \($id) \($s | tojson)", "pin \($id)"
+         elif $s.master != null and ($s.master | type) != "object"
+         then "unrenderable \($id) \($s.master | tojson)"
+         else
+           $s.master.volumeSizeLimitMB as $v
+           | if ($v | type) != "number" or $v != ($v | floor) or $v < 1 or $v > 30000
+             then "pin \($id)"
+             elif $v == 1000 then empty
+             else "keep \($id) \($v)" end
+         end)')
+
+if [ -n "$plan" ]; then
+  while read -r action ns name detail; do
+    case "$action" in
+      pin)
+        echo "Pinning SeaweedFS ${ns}/${name} at master.volumeSizeLimitMB=1000"
+        kubectl -n "$ns" patch helmreleases.helm.toolkit.fluxcd.io "$name" \
+          --type=merge -p '{"spec":{"values":{"master":{"volumeSizeLimitMB":1000}}}}'
+        ;;
+      keep)
+        echo "Keeping SeaweedFS ${ns}/${name} at master.volumeSizeLimitMB=${detail}: the previous chart ignored it and the new one applies it (docs/operations/seaweedfs-lowering-the-volume-size-limit.md)"
+        ;;
+      unreadable)
+        echo "WARNING: SeaweedFS ${ns}/${name} has a spec.values that is not an object, which helm-controller ignores; the pin replaces it. It held: ${detail}" >&2
+        ;;
+      unrenderable)
+        echo "WARNING: SeaweedFS ${ns}/${name} is not pinned: its master is not an object, so no v1 chart renders it. Set master.volumeSizeLimitMB in the edit that repairs master, or the instance comes up at 400. master holds: ${detail}" >&2
+        ;;
+      valuesfrom)
+        echo "WARNING: SeaweedFS ${ns}/${name} also takes values from ${detail}. spec.values is merged over them, so a master.volumeSizeLimitMB set there without targetPath does not apply, and one set through targetPath can, depending on the entries before it" >&2
+        ;;
+    esac
+  done <<EOF
+$plan
+EOF
+fi
+
+stamp_cozystack_version 58
diff --git a/packages/core/platform/images/migrations/migrations/58 b/packages/core/platform/images/migrations/migrations/58
new file mode 100755
index 0000000000..050e6706c2
--- /dev/null
+++ b/packages/core/platform/images/migrations/migrations/58
@@ -0,0 +1,145 @@
+#!/bin/sh
+# Migration 58 --> 59
+# Freeze HTTPCache on the packages artifact the cluster already renders it from.
+#
+# HTTPCache is removed from this repository, so the platform stops publishing
+# its chart. Its PackageSource carries no keep annotation, which means Helm
+# prunes it on upgrade; the ArtifactGenerator it owns goes with it and takes
+# both ExternalArtifacts along. Those are the chartRef targets of
+# hr/http-cache-rd and of every tenant http-cache-<name> release, so doing
+# nothing would leave all of them Ready=False for good and fire
+# HelmReleaseNotReady on every cluster with the naas bundle.
+#
+# A cluster that still runs an instance therefore keeps the application, served
+# from a frozen source: a copy of the packages OCIRepository pinned to the
+# manifest digest the live object resolves at this moment. The migration runs as
+# a pre-upgrade hook, before the upgrade re-points cozystack-packages, so that
+# digest names the release the instances render from today, in whatever
+# registry the operator serves it from and with whatever pull secret and
+# verification they configured; an air-gapped mirror has it by definition. The
+# copy is created without owner references or Helm metadata, so nothing
+# reconciles or prunes it, and the PackageSource is repointed at it and disowned
+# the same way. Names stay as they are on purpose: the ApplicationDefinition
+# inside that artifact hardcodes its chartRef, so renaming the PackageSource
+# would leave every release pointing at an artifact nobody produces.
+#
+# Assumes cozystack-packages is pinned to a fixed release: a floating tag
+# re-pointed in place would pin an artifact that no longer carries the chart.
+#
+# A cluster with no instance keeps nothing. The naas bundle installs the rd
+# component whether or not anyone created an HTTPCache, so freezing
+# unconditionally would leave pinned leftovers on clusters that never used the
+# application. There the migration removes the platform side instead.
+#
+# Fail-closed like migration 55: migrations never re-run, so a swallowed error
+# would stamp the version past a half-frozen fleet.
+
+set -euo pipefail
+
+# shellcheck source=lib/cozystack-version.sh
+. "$(dirname "$0")/lib/cozystack-version.sh"
+
+SOURCE_NAME="cozystack-packages-http-cache"
+GRANT_NAME="cozy:tenant:admin:http-cache-frozen"
+PACKAGE_NAME="cozystack.http-cache-application"
+
+# Select the tenant releases by the chart they render from and by the
+# application label migration 22 put on them, so a release whose chartRef was
+# never rewritten is still seen.
+instances=$(kubectl get helmreleases.helm.toolkit.fluxcd.io --all-namespaces -o json \
+  | jq -r '.items[]
+      | select(.spec.chartRef.name == "cozystack-http-cache-application-default-http-cache"
+            or .metadata.labels["apps.cozystack.io/application.kind"] == "HTTPCache")
+      | "\(.metadata.namespace)/\(.metadata.name)"')
+
+if [ -z "$instances" ]; then
+  echo "No HTTPCache instances found; removing the application from the platform"
+  # Block on the Package: the operator reconciles off an informer cache and a
+  # reconcile in flight against the pre-delete entry re-creates the release it
+  # owns, along with the ApplicationDefinition and storage removed just below.
+  kubectl delete packages.cozystack.io "$PACKAGE_NAME" --ignore-not-found
+  kubectl -n cozy-system delete helmreleases.helm.toolkit.fluxcd.io http-cache-rd --ignore-not-found --wait=false
+  kubectl delete applicationdefinitions.cozystack.io http-cache --ignore-not-found
+  kubectl -n cozy-system delete secret -l owner=helm,name=http-cache-rd --ignore-not-found
+  stamp_cozystack_version 59
+  exit 0
+fi
+
+# Copy the live packages OCIRepository rather than writing one from scratch, so
+# a cluster that overrides the registry host, its pull secret or the interval
+# keeps those settings. Reading it with --ignore-not-found would treat an API
+# error as "absent" and go on to publish a source pointing nowhere, so the read
+# is plain and aborts under set -e.
+src=$(kubectl -n cozy-system get ocirepositories.source.toolkit.fluxcd.io cozystack-packages -o json)
+
+# spec.ref.digest is the manifest digest when the installer pinned one. A tag or
+# semver ref resolves through status.artifact.revision, which source-controller
+# writes as <tag>@sha256:<manifest digest>. status.artifact.digest is the
+# checksum of the downloaded tarball, not of the manifest, and cannot stand in.
+digest=$(printf '%s' "$src" | jq -r '
+  .spec.ref.digest
+    // ((.status.artifact.revision // "") | capture("@(?<d>sha256:[0-9a-f]{64})$").d)
+    // empty')
+case "$digest" in
+  sha256:*) ;;
+  *)
+    echo "cozystack-packages has neither a digest ref nor a resolved artifact revision; nothing to freeze on" >&2
+    exit 1
+    ;;
+esac
+
+echo "HTTPCache instances found, freezing the application on ${digest}:"
+printf '%s\n' "$instances" | sed 's/^/  /'
+
+# The copy becomes the only chart source those instances have, so it carries
+# the same deletion guardrail the original gets from the platform chart.
+printf '%s' "$src" | jq --arg name "$SOURCE_NAME" --arg digest "$digest" '
+  {
+    apiVersion: .apiVersion,
+    kind: .kind,
+    metadata: {
+      name: $name,
+      namespace: .metadata.namespace,
+      labels: { "platform.cozystack.io/no-delete": "true" },
+      annotations: { "platform.cozystack.io/frozen": "http-cache" }
+    },
+    spec: (.spec | .ref = { digest: $digest })
+  }' | kubectl apply --filename -
+
+# Repoint the application at the frozen source and take it out of Helm's hands:
+# the keep annotation is read off the live object during the upgrade prune, and
+# dropping the release metadata stops a later release from adopting it.
+kubectl patch packagesources.cozystack.io "$PACKAGE_NAME" --type=merge -p "$(cat <<JSON
+{"metadata":{"annotations":{"helm.sh/resource-policy":"keep","meta.helm.sh/release-name":null,"meta.helm.sh/release-namespace":null},"labels":{"app.kubernetes.io/managed-by":null}},"spec":{"sourceRef":{"name":"${SOURCE_NAME}"}}}
+JSON
+)"
+
+# The Package is rendered with the keep annotation already, so it survives the
+# prune on its own; it only needs the release metadata dropped.
+kubectl patch packages.cozystack.io "$PACKAGE_NAME" --type=merge \
+  -p '{"metadata":{"annotations":{"meta.helm.sh/release-name":null,"meta.helm.sh/release-namespace":null},"labels":{"app.kubernetes.io/managed-by":null}}}'
+
+# Without this the owner of a frozen instance can see it and not remove it: the
+# wildcard over apps.cozystack.io lives in cozy:tenant:base, which aggregates
+# into cozy:tenant and not into cozy:tenant:admin, cozy:tenant:view:base is read
+# only, and no role in the tenant chain carries a verb on
+# helm.toolkit.fluxcd.io. The verb set is the one cozy:tenant:admin:base
+# carried, create included, so the upgrade leaves the owner the access they
+# already had.
+kubectl apply --filename - <<YAML
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: ${GRANT_NAME}
+  labels:
+    rbac.cozystack.io/aggregate-to-tenant-admin: "true"
+    platform.cozystack.io/no-delete: "true"
+  annotations:
+    platform.cozystack.io/frozen: http-cache
+rules:
+- apiGroups: ["apps.cozystack.io"]
+  resources: ["httpcaches"]
+  verbs: ["create", "update", "patch", "delete"]
+YAML
+
+stamp_cozystack_version 59
diff --git a/packages/core/platform/images/migrations/migrations/59 b/packages/core/platform/images/migrations/migrations/59
new file mode 100755
index 0000000000..3131236c45
--- /dev/null
+++ b/packages/core/platform/images/migrations/migrations/59
@@ -0,0 +1,118 @@
+#!/bin/sh
+# Migration 59 --> 60
+# Copy VMI-only hotplugged volumes into their VM spec before declarative
+# hotplug takes over.
+#
+# The upgrade drops the KubeVirt HotplugVolumes gate, which switches
+# DeclarativeHotplugVolumes on. From then on virt-controller rebuilds each
+# running VMI's hotplug volumes from VM.spec and removes every hotpluggable
+# VMI volume the VM spec does not list (pkg/storage/hotplug/hotplug.go,
+# filterHotplugVMIVolumes, v1.9.0). kubevirt-csi attached tenant volumes
+# through the VMI subresource until mid-2025, and live migration carries such
+# a VMI across KubeVirt updates, so a tenant node that was never recreated can
+# still hold a mounted disk only its VMI knows about. Without this migration
+# the first reconcile after the upgrade unplugs it under the workload.
+#
+# The fix is to write each such volume, with its disk, into the VM template as
+# it already is on the VMI. Hotplug volume changes are a valid live update, so
+# the VM does not become RestartRequired, and the declarative reconcile then
+# finds VM.spec and the VMI in agreement.
+#
+# This also makes ephemeral hotplugs permanent. A volume a user added to a
+# VM-owned VMI at the VMI level (virtctl addvolume without --persist) has the
+# same shape and is copied too, so it attaches again after a VM restart. With
+# the gate off, virt-api refuses VMI-level addvolume and removevolume on a
+# VM-owned VMI (vmiVolumePatch in pkg/virt-api/rest/volumes.go, v1.9.0), so
+# from then on such a volume can only be removed through the VM.
+#
+# Ordering: this runs as the platform chart's pre-upgrade hook, before the
+# upgrade re-points cozystack-packages. The kubevirt package, which renders the
+# KubeVirt CR, and the tenant kubernetes charts, which pass kubevirt-csi its
+# fallback flag, both render from that source, so on a variant that runs
+# migrations neither change reaches the cluster before this has run. The
+# default variant renders no migration hook, and a cluster there that installed
+# KubeVirt by hand gets the new charts without this step.
+#
+# Fail-closed like migration 58: migrations never re-run, so a swallowed error
+# would stamp the version past a VM that still needs the copy.
+
+set -euo pipefail
+
+# shellcheck source=lib/cozystack-version.sh
+. "$(dirname "$0")/lib/cozystack-version.sh"
+
+# --ignore-not-found separates a cluster without KubeVirt (no output, rc 0)
+# from an API error, which aborts under set -e.
+crd=$(kubectl get crd virtualmachines.kubevirt.io --ignore-not-found -o name)
+if [ -z "$crd" ]; then
+  echo "KubeVirt is not installed; no VM to update"
+  stamp_cozystack_version 60
+  exit 0
+fi
+
+work=$(mktemp -d)
+trap 'rm -rf "$work"' EXIT
+
+kubectl get virtualmachines.kubevirt.io --all-namespaces -o json > "$work/vms.json"
+kubectl get virtualmachineinstances.kubevirt.io --all-namespaces -o json > "$work/vmis.json"
+
+# One line per VM that needs the copy. The predicate is the one virt-controller
+# removes by (storagetypes.IsDeclarativeHotplugVolume): a DataVolume or PVC
+# volume marked hotpluggable. virt-api gives every VMI-level addvolume that
+# shape, so an ephemeral hotplug made by anything else (virtctl addvolume
+# without --persist, before virtctl ignored that flag) matches too and becomes
+# permanent; leaving it out would not keep it ephemeral, the first reconcile
+# would unplug it. Only a Running VMI is considered, as in
+# patchHotplugVolumes: any other one is not reconciled, and its next start
+# builds the VMI from the VM spec. A disk already named in the VM spec is left
+# out so the patch cannot introduce a duplicate.
+jq -c --slurpfile vms "$work/vms.json" '
+  ($vms[0].items | map({key: "\(.metadata.namespace)/\(.metadata.name)", value: .}) | from_entries) as $byname
+  | .items[]
+  | select(.status.phase == "Running")
+  | ([.metadata.ownerReferences[]?
+      | select(.controller == true and .kind == "VirtualMachine" and (.apiVersion | startswith("kubevirt.io/")))
+      | .name][0]) as $owner
+  | select($owner != null)
+  | $byname["\(.metadata.namespace)/\($owner)"] as $vm
+  | select($vm != null)
+  | ($vm.spec.template.spec.volumes // []) as $vols
+  | ($vm.spec.template.spec.domain.devices.disks // []) as $disks
+  | ($vols | map(.name)) as $have
+  | ($disks | map(.name)) as $haveDisks
+  | [.spec.volumes[]?
+      | select(.dataVolume.hotpluggable == true or .persistentVolumeClaim.hotpluggable == true)
+      | .name as $n | select($have | index($n) | not)] as $missing
+  | select($missing | length > 0)
+  | ($missing | map(.name)) as $names
+  | {
+      namespace: $vm.metadata.namespace,
+      name: $vm.metadata.name,
+      names: $names,
+      patch: [
+        {op: "test", path: "/metadata/resourceVersion", value: $vm.metadata.resourceVersion},
+        {op: "add", path: "/spec/template/spec/volumes", value: ($vols + $missing)},
+        {op: "add", path: "/spec/template/spec/domain/devices/disks",
+         value: ($disks + [.spec.domain.devices.disks[]?
+           | .name as $n | select(($names | index($n)) and ($haveDisks | index($n) | not))])}
+      ]
+    }' "$work/vmis.json" > "$work/patches"
+
+if [ ! -s "$work/patches" ]; then
+  echo "No VM has a VMI-only hotplugged volume; nothing to update"
+  stamp_cozystack_version 60
+  exit 0
+fi
+
+while read -r line; do
+  ns=$(printf '%s' "$line" | jq -r '.namespace')
+  name=$(printf '%s' "$line" | jq -r '.name')
+  names=$(printf '%s' "$line" | jq -r '.names | join(",")')
+  echo "VM $ns/$name: adding hotplugged volumes $names to the VM spec"
+  # The resourceVersion test makes a VM changed since the read fail the patch
+  # instead of losing that change.
+  kubectl -n "$ns" patch virtualmachines.kubevirt.io "$name" --type=json \
+    -p "$(printf '%s' "$line" | jq -c '.patch')"
+done < "$work/patches"
+
+stamp_cozystack_version 60
diff --git a/packages/core/platform/images/migrations/migrations/lib/cozystack-version.sh b/packages/core/platform/images/migrations/migrations/lib/cozystack-version.sh
new file mode 100644
index 0000000000..7b665f5f05
--- /dev/null
+++ b/packages/core/platform/images/migrations/migrations/lib/cozystack-version.sh
@@ -0,0 +1,51 @@
+# shellcheck shell=sh
+# Shared helper for stamping the cozystack-version ConfigMap during migrations.
+#
+# The ConfigMap MUST carry the platform.cozystack.io/no-delete=true label so the
+# cozystack-no-delete-guardrail ValidatingAdmissionPolicy guards it against
+# deletion. Migrations apply it under the default kubectl field manager; a
+# label-less apply by that same manager would strip the label (the failure mode
+# migration 42 first fixed). templates/cozystack-version.yaml renders the
+# labeled ConfigMap only on first install (lookup-if-not), so every upgrade-time
+# stamp must re-emit the label by hand.
+#
+# Centralizing the manifest here means migration 45+ cannot drift back to a
+# label-less apply: every go-forward stamp (migration 42 onward and the
+# bootstrap path in run-migrations.sh) sources this file and calls the helper
+# instead of copy-pasting a heredoc. Migrations 1-41 predate the no-delete
+# label and stamp label-less on purpose; migration 42 backfills the label on
+# any upgrade path through them, so they are left frozen. The
+# cozystack-version-stamp.bats suite pins this — no migration numbered >= 42
+# (nor run-migrations.sh) may stamp cozystack-version without the helper.
+#
+# Sourced, not executed. Each migrations/<N> script (42+) does:
+#   . "$(dirname "$0")/lib/cozystack-version.sh"
+# and run-migrations.sh sources /migrations/lib/cozystack-version.sh.
+
+# render_cozystack_version_manifest <version>
+# Emit the labeled cozystack-version ConfigMap manifest on stdout. Pure (no
+# kubectl), so it is unit-testable in isolation. The namespace defaults to
+# cozy-system and is overridable via $NAMESPACE.
+render_cozystack_version_manifest() {
+  : "${1:?render_cozystack_version_manifest: version argument required}"
+  cat <<EOF
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: cozystack-version
+  namespace: ${NAMESPACE:-cozy-system}
+  labels:
+    platform.cozystack.io/no-delete: "true"
+data:
+  version: "$1"
+EOF
+}
+
+# stamp_cozystack_version <version>
+# Render and apply the labeled manifest under the default kubectl field manager.
+stamp_cozystack_version() {
+  # Guard the version here too, not only in render: without pipefail a render
+  # failure would not abort the pipeline and kubectl would apply empty input.
+  : "${1:?stamp_cozystack_version: version argument required}"
+  render_cozystack_version_manifest "$1" | kubectl apply --filename -
+}
diff --git a/packages/core/platform/images/migrations/migrations/lib/seaweedfs-db-adopt.sh b/packages/core/platform/images/migrations/migrations/lib/seaweedfs-db-adopt.sh
new file mode 100644
index 0000000000..3991ee840b
--- /dev/null
+++ b/packages/core/platform/images/migrations/migrations/lib/seaweedfs-db-adopt.sh
@@ -0,0 +1,178 @@
+# shellcheck shell=sh
+# Shared helper for handing Cluster/seaweedfs-db over to the <name>-db release.
+#
+# The 1.5.0 db split (PR #2601) moved the CNPG Cluster carrying SeaweedFS filer
+# metadata out of the <name>-system Helm release into a new <name>-db release.
+# The Cluster object itself did not move — only its ownership had to. Two things
+# must be true BEFORE <name>-system next renders, and they are independent:
+#
+#   meta.helm.sh/release-name=<name>-db   so <name>-db ADOPTS the existing
+#                                         Cluster instead of failing its install
+#                                         on Helm's ownership check;
+#   helm.sh/resource-policy=keep          so the <name>-system upgrade, whose new
+#                                         chart no longer renders the Cluster,
+#                                         does not GARBAGE-COLLECT it as a
+#                                         removed resource.
+#
+# Without `keep` the Cluster is deleted, CNPG takes its PVC with it, and the
+# tenant's filer metadata — hence all of its S3 — is gone. Data loss, not outage.
+#
+# The window is not a one-shot. Helm prunes by diffing the LAST DEPLOYED revision
+# against the new manifest, so as long as <name>-system's last successful revision
+# is a pre-split one that still contains the Cluster, EVERY subsequent upgrade
+# attempt — including ones that fail for unrelated reasons and never become the
+# new "deployed" revision — re-computes the same deletion. A tenant whose
+# <name>-system is wedged therefore re-deletes the Cluster on every retry, racing
+# <name>-db, which keeps recreating it. `keep` is what breaks that loop, and it
+# must stay for as long as that pre-split revision remains the prune baseline
+# (i.e. until <name>-system upgrades successfully at least once). Clearing it
+# again is deferred to the 1.7 batch migrations.
+#
+# Ownership is therefore NOT a proxy for safety. A Cluster can already be owned by
+# <name>-db and still need `keep`: where the hand-over was skipped, <name>-system
+# prunes the Cluster and <name>-db simply RECREATES it under its own ownership
+# with no keep — while <name>-system's prune baseline still lists it, so the next
+# reconcile deletes it again. Both shapes are live on the upgrade stand:
+# tenant-l and tenant-root are <name>-db-owned WITH keep and their <name>-system
+# deployed revision (rev 1) still contains the Cluster, so only keep saves them;
+# tenant-fresh is <name>-db-owned WITHOUT keep because it was installed after the
+# split and its <name>-system never rendered a Cluster. Telling those two apart
+# needs the release's deployed manifest, which this script cannot read cheaply or
+# reliably. The costs are asymmetric: stamping keep where it was not needed leaves
+# an orphan on app delete (which the extra/seaweedfs cleanup hook reclaims);
+# missing one loses the database. So keep is stamped on every Cluster owned by
+# either side of the split.
+#
+# Migration 43 shipped this logic with the owning release name hardcoded to
+# "seaweedfs-system", which is only correct for an instance named `seaweedfs`.
+# `SeaweedFS` is a user-creatable kind, so an instance named e.g. `foo` is owned
+# by `foo-system` and was silently skipped: no re-own, no keep, Cluster pruned.
+# Matching on the `-system` SUFFIX instead covers every instance name, so this
+# helper is sourced by both migration 43 (the original hand-over, for clusters
+# that have not run it yet) and migration 53 (repair, for clusters that already
+# ran the hardcoded version).
+#
+# Idempotent: a Cluster already owned by <name>-db AND carrying keep is left
+# alone, so re-running is a no-op and both migrations can safely fire on the same
+# cluster.
+#
+# FAILS CLOSED. Migrations never re-run, so a transient error swallowed here would
+# permanently leave at-risk tenants exposed with no later migration to catch them.
+# Every kubectl failure is fatal EXCEPT the two that genuinely mean "nothing to
+# do": the CNPG resource type not being served at all (a cluster without CNPG),
+# and a Cluster disappearing between the scan and the read. A non-zero return
+# aborts the migration before it stamps the version, so the Job retries.
+#
+# Sourced, not executed:
+#   . "$(dirname "$0")/lib/seaweedfs-db-adopt.sh"
+
+# _sdb_is_absent_err <file>
+# True when a kubectl error means the thing simply is not there, as opposed to the
+# API being unreachable, forbidden, throttled, or not yet established. Kept
+# deliberately narrow: anything unrecognised is treated as fatal.
+_sdb_is_absent_err() {
+  grep -qiE "server doesn't have a resource type|server could not find the requested resource|could not find the requested resource|not found" "$1"
+}
+
+# adopt_seaweedfs_db_clusters
+# Re-own and/or protect every Cluster/seaweedfs-db the split left exposed.
+# Returns non-zero (aborting the migration) on any error that is not "absent".
+adopt_seaweedfs_db_clusters() {
+  _sdb_err=$(mktemp)
+
+  # Fleet scan. Assigning inside `if !` keeps errexit from firing so the exit
+  # status can be inspected — `for ns in $(kubectl ...)` would silently iterate
+  # zero times on failure and let the caller stamp the version regardless, which
+  # is the whole bug this guard exists for.
+  if ! _sdb_namespaces=$(kubectl get cluster.postgresql.cnpg.io -A \
+        -o jsonpath='{range .items[?(@.metadata.name=="seaweedfs-db")]}{.metadata.namespace}{"\n"}{end}' \
+        2>"$_sdb_err"); then
+    if _sdb_is_absent_err "$_sdb_err"; then
+      echo "CNPG Cluster resource type is not served on this cluster — no SeaweedFS databases to hand over"
+      rm -f "$_sdb_err"
+      return 0
+    fi
+    echo "FATAL: cannot list Cluster/seaweedfs-db across namespaces; refusing to stamp past an unverified fleet:" >&2
+    cat "$_sdb_err" >&2
+    rm -f "$_sdb_err"
+    return 1
+  fi
+
+  for ns in $_sdb_namespaces; do
+    [ -n "$ns" ] || continue
+
+    if ! _sdb_current=$(kubectl get cluster.postgresql.cnpg.io seaweedfs-db -n "$ns" \
+          -o jsonpath='{.metadata.annotations.meta\.helm\.sh/release-name}' 2>"$_sdb_err"); then
+      if _sdb_is_absent_err "$_sdb_err"; then
+        echo "Cluster/seaweedfs-db in $ns disappeared between scan and read — skipping"
+        continue
+      fi
+      echo "FATAL: cannot read the Helm owner of Cluster/seaweedfs-db in $ns:" >&2
+      cat "$_sdb_err" >&2
+      rm -f "$_sdb_err"
+      return 1
+    fi
+
+    if ! _sdb_keep=$(kubectl get cluster.postgresql.cnpg.io seaweedfs-db -n "$ns" \
+          -o jsonpath='{.metadata.annotations.helm\.sh/resource-policy}' 2>"$_sdb_err"); then
+      if _sdb_is_absent_err "$_sdb_err"; then
+        echo "Cluster/seaweedfs-db in $ns disappeared between scan and read — skipping"
+        continue
+      fi
+      echo "FATAL: cannot read the resource-policy of Cluster/seaweedfs-db in $ns:" >&2
+      cat "$_sdb_err" >&2
+      rm -f "$_sdb_err"
+      return 1
+    fi
+
+    case "$_sdb_current" in
+      # No Helm ownership annotation at all — distinct from "unreadable", which is
+      # fatal above. Guessing an owner would be worse than doing nothing, but a
+      # SeaweedFS database that nobody owns is worth saying out loud.
+      "")
+        echo "WARNING: Cluster/seaweedfs-db in $ns carries no meta.helm.sh/release-name — not Helm-managed, leaving it alone. If this tenant runs SeaweedFS, verify by hand that its database is not about to be pruned." >&2
+        ;;
+
+      # Owned by the data-plane release: this is the hand-over. The instance name
+      # is whatever precedes -system, so `foo-system` -> `foo-db` exactly as
+      # `seaweedfs-system` -> `seaweedfs-db`.
+      *-system)
+        _sdb_instance="${_sdb_current%-system}"
+        # A release literally named "-system" has no instance name; refusing is
+        # safer than annotating an owner of "-db" that no release will claim.
+        if [ -z "$_sdb_instance" ]; then
+          echo "WARNING: Cluster/seaweedfs-db in $ns is owned by a release named '$_sdb_current' with no instance name — skipping" >&2
+          continue
+        fi
+        echo "Re-annotating Cluster/seaweedfs-db in $ns: $_sdb_current -> ${_sdb_instance}-db (+keep)"
+        kubectl annotate cluster.postgresql.cnpg.io seaweedfs-db -n "$ns" \
+          meta.helm.sh/release-name="${_sdb_instance}-db" \
+          helm.sh/resource-policy=keep \
+          --overwrite
+        # release-namespace stays the same (the tenant namespace); both releases
+        # live there, so the ownership check only needed release-name rewritten.
+        ;;
+
+      # Already owned by the db release. Ownership is correct, but that does NOT
+      # imply it is protected — see the note above. Stamp keep if it is missing.
+      *-db)
+        if [ "$_sdb_keep" = "keep" ]; then
+          echo "Cluster/seaweedfs-db in $ns already handed over to $_sdb_current and protected — nothing to do"
+        else
+          echo "Protecting Cluster/seaweedfs-db in $ns: owned by $_sdb_current but missing helm.sh/resource-policy=keep"
+          kubectl annotate cluster.postgresql.cnpg.io seaweedfs-db -n "$ns" \
+            helm.sh/resource-policy=keep \
+            --overwrite
+        fi
+        ;;
+
+      # Owned by some unrelated release. Not ours to touch.
+      *)
+        echo "WARNING: Cluster/seaweedfs-db in $ns is owned by unrelated release '$_sdb_current' — leaving it alone" >&2
+        ;;
+    esac
+  done
+
+  rm -f "$_sdb_err"
+  return 0
+}
diff --git a/packages/core/platform/images/migrations/run-migrations.sh b/packages/core/platform/images/migrations/run-migrations.sh
index 90a72d907b..19b70f44a2 100755
--- a/packages/core/platform/images/migrations/run-migrations.sh
+++ b/packages/core/platform/images/migrations/run-migrations.sh
@@ -1,22 +1,54 @@
 #!/bin/sh
 set -euo pipefail
 
+# shellcheck source=migrations/lib/cozystack-version.sh
+. /migrations/lib/cozystack-version.sh
+
 NAMESPACE="${NAMESPACE:-cozy-system}"
 CURRENT_VERSION="${CURRENT_VERSION:-0}"
 TARGET_VERSION="${TARGET_VERSION:-0}"
 
-echo "Starting migrations from version $CURRENT_VERSION to $TARGET_VERSION"
-
-# Check if ConfigMap exists
-if ! kubectl get configmap --namespace "$NAMESPACE" cozystack-version >/dev/null 2>&1; then
+# --ignore-not-found turns only NotFound into empty output; any other failure
+# still exits non-zero and aborts here, so the Job retries it. Reading such a
+# failure as absence would stamp the target over migrations that never ran.
+EXISTING=$(kubectl get configmap --namespace "$NAMESPACE" cozystack-version --ignore-not-found --output name)
+if [ -z "$EXISTING" ]; then
   echo "ConfigMap cozystack-version does not exist, creating it with version $TARGET_VERSION"
-  kubectl create configmap --namespace "$NAMESPACE" cozystack-version \
-    --from-literal=version="$TARGET_VERSION" \
-    --dry-run=client --output yaml | kubectl apply --filename -
+  # Stamp via the shared helper so the bootstrap ConfigMap carries the
+  # platform.cozystack.io/no-delete label, matching every go-forward stamp
+  # (migration 42 onward; migrations 1-41 stamp label-less and are backfilled
+  # by migration 42, so they are intentionally left as-is).
+  stamp_cozystack_version "$TARGET_VERSION"
   echo "ConfigMap created with version $TARGET_VERSION"
   exit 0
 fi
 
+# CURRENT_VERSION is rendered once per upgrade, and the Job retries a failed
+# pod with that same environment, while every migration that finished has
+# stamped the ConfigMap since. Start from the stamp, or a retry re-runs
+# migrations that already completed. A failed read aborts: the Job retries
+# it, whereas falling back would reopen the re-run. Only a ConfigMap that
+# holds no integer version keeps the rendered value, which the chart derived
+# from that same field.
+STAMPED_VERSION=$(kubectl get configmap --namespace "$NAMESPACE" cozystack-version --output jsonpath='{.data.version}')
+case "$STAMPED_VERSION" in
+  ''|*[!0-9]*)
+    echo "ConfigMap cozystack-version holds no integer version ('$STAMPED_VERSION'), keeping the rendered $CURRENT_VERSION"
+    ;;
+  *)
+    # A stamp past the shell's integer range would fail the -ge test below
+    # inside an if, where set -e does not stop it, and end in a green Job that
+    # ran nothing. Falling back is no answer: the chart renders it as 0.
+    if ! [ "$STAMPED_VERSION" -ge 0 ] 2>/dev/null; then
+      echo "ConfigMap cozystack-version holds version $STAMPED_VERSION, outside the supported integer range" >&2
+      exit 1
+    fi
+    CURRENT_VERSION="$STAMPED_VERSION"
+    ;;
+esac
+
+echo "Starting migrations from version $CURRENT_VERSION to $TARGET_VERSION"
+
 # If current version is already at target, nothing to do
 if [ "$CURRENT_VERSION" -ge "$TARGET_VERSION" ]; then
   echo "Current version $CURRENT_VERSION is already at or above target version $TARGET_VERSION"
diff --git a/packages/core/platform/sources/backupstrategy-controller.yaml b/packages/core/platform/sources/backupstrategy-controller.yaml
index 2306c755f5..d28e599912 100644
--- a/packages/core/platform/sources/backupstrategy-controller.yaml
+++ b/packages/core/platform/sources/backupstrategy-controller.yaml
@@ -18,8 +18,16 @@ spec:
     # All three must be installed before the templates render, otherwise
     # the Helm release fails with "no matches for kind". Order is enforced
     # via dependsOn so a fresh-cluster bootstrap cannot race the CRDs.
+    #
+    # The cozy-backups Bucket is also created INTO the tenant-root namespace,
+    # which is provisioned by cozystack-basics (the static tenant-root release).
+    # Without the cozystack-basics edge the Bucket patch can race namespace
+    # creation on a fresh install and fail with `namespaces "tenant-root" not
+    # found`, which then races the install script's wait deadline. Depend on
+    # cozystack-basics so the target namespace exists first.
     dependsOn:
     - cozystack.networking
+    - cozystack.cozystack-basics
     - cozystack.backup-controller
     - cozystack.bucket-application
     - cozystack.objectstorage-controller
diff --git a/packages/core/platform/sources/bootbox-application.yaml b/packages/core/platform/sources/bootbox-application.yaml
index ee64017690..8aca8fbf25 100644
--- a/packages/core/platform/sources/bootbox-application.yaml
+++ b/packages/core/platform/sources/bootbox-application.yaml
@@ -13,6 +13,8 @@ spec:
     - name: default
       dependsOn:
         - cozystack.networking
+        # cozystack-engine ships the ApplicationDefinition CRD rendered by the *-rd component below.
+        - cozystack.cozystack-engine
       libraries:
         - name: cozy-lib
           path: library/cozy-lib
diff --git a/packages/core/platform/sources/bucket-application.yaml b/packages/core/platform/sources/bucket-application.yaml
index a50c116f1d..c503f0f40a 100644
--- a/packages/core/platform/sources/bucket-application.yaml
+++ b/packages/core/platform/sources/bucket-application.yaml
@@ -14,12 +14,15 @@ spec:
       dependsOn:
         - cozystack.networking
         - cozystack.objectstorage-controller
+        # cozystack-engine ships the ApplicationDefinition CRD rendered by the *-rd component below.
+        - cozystack.cozystack-engine
       libraries:
         - name: cozy-lib
           path: library/cozy-lib
       components:
         - name: bucket-system
           path: system/bucket
+          libraries: ["cozy-lib"]
         - name: bucket
           path: apps/bucket
           libraries: ["cozy-lib"]
diff --git a/packages/core/platform/sources/capi-provider-infra-proxmox.yaml b/packages/core/platform/sources/capi-provider-infra-proxmox.yaml
new file mode 100644
index 0000000000..86e65078eb
--- /dev/null
+++ b/packages/core/platform/sources/capi-provider-infra-proxmox.yaml
@@ -0,0 +1,30 @@
+---
+apiVersion: cozystack.io/v1alpha1
+kind: PackageSource
+metadata:
+  name: cozystack.capi-provider-infra-proxmox
+spec:
+  sourceRef:
+    kind: OCIRepository
+    name: cozystack-packages
+    namespace: cozy-system
+    path: /
+  variants:
+  # The kubevirt infra provider depends on cozystack.kubevirt because its VMs run
+  # inside this cluster. The proxmox one has no such edge: the hypervisor is
+  # external, reached over the Proxmox API with the credentials in the package's
+  # credentialsSecretName. What it does need is the IPAM provider — capmox
+  # allocates static addresses from an InClusterIPPool rather than using DHCP,
+  # so without it ProxmoxCluster never reaches Ready.
+  - name: default
+    dependsOn:
+    - cozystack.networking
+    - cozystack.capi-operator
+    - cozystack.capi-provider-ipam-in-cluster
+    components:
+    - name: capi-providers-infraprovider-proxmox
+      path: system/capi-providers-infraprovider-proxmox
+      install:
+        privileged: true
+        namespace: cozy-cluster-api
+        releaseName: capi-providers-infraprovider-proxmox
diff --git a/packages/core/platform/sources/capi-provider-ipam-in-cluster.yaml b/packages/core/platform/sources/capi-provider-ipam-in-cluster.yaml
new file mode 100644
index 0000000000..9e0520f143
--- /dev/null
+++ b/packages/core/platform/sources/capi-provider-ipam-in-cluster.yaml
@@ -0,0 +1,27 @@
+---
+apiVersion: cozystack.io/v1alpha1
+kind: PackageSource
+metadata:
+  name: cozystack.capi-provider-ipam-in-cluster
+spec:
+  sourceRef:
+    kind: OCIRepository
+    name: cozystack-packages
+    namespace: cozy-system
+    path: /
+  variants:
+  # No infrastructure edge here on purpose: an IPAM provider is a generic Cluster
+  # API addon, and the only current consumer declares the dependency on its own
+  # side, so this variant stays reusable by any provider that assigns addresses
+  # instead of leasing them.
+  - name: default
+    dependsOn:
+    - cozystack.networking
+    - cozystack.capi-operator
+    components:
+    - name: capi-providers-ipam-in-cluster
+      path: system/capi-providers-ipam-in-cluster
+      install:
+        privileged: true
+        namespace: cozy-cluster-api
+        releaseName: capi-providers-ipam-in-cluster
diff --git a/packages/core/platform/sources/clickhouse-application.yaml b/packages/core/platform/sources/clickhouse-application.yaml
index f22a003de5..b6ca0f7a8e 100644
--- a/packages/core/platform/sources/clickhouse-application.yaml
+++ b/packages/core/platform/sources/clickhouse-application.yaml
@@ -13,6 +13,8 @@ spec:
     - name: default
       dependsOn:
         - cozystack.clickhouse-operator
+        # cozystack-engine ships the ApplicationDefinition CRD rendered by the *-rd component below.
+        - cozystack.cozystack-engine
       libraries:
         - name: cozy-lib
           path: library/cozy-lib
diff --git a/packages/core/platform/sources/computeplane-application.yaml b/packages/core/platform/sources/computeplane-application.yaml
new file mode 100644
index 0000000000..66e5b26acf
--- /dev/null
+++ b/packages/core/platform/sources/computeplane-application.yaml
@@ -0,0 +1,57 @@
+---
+apiVersion: cozystack.io/v1alpha1
+kind: PackageSource
+metadata:
+  name: cozystack.computeplane-application
+spec:
+  sourceRef:
+    kind: OCIRepository
+    name: cozystack-packages
+    namespace: cozy-system
+    path: /
+  variants:
+    # The variant mirrors the kubernetes-application variant whose chart it
+    # re-sources: the wrapped cluster substrate is the kubevirt flavour of
+    # apps/kubernetes, and the artifact naming contract
+    # (cozystack-computeplane-application-kubevirt-*) carries that provenance.
+    # A future non-kubevirt substrate would arrive as a sibling variant.
+    - name: kubevirt
+      # Variant dependsOn gates only the components that carry an install:
+      # block — here computeplane-rd alone. cozystack-engine serves the
+      # ApplicationDefinition CRD that computeplane-rd installs; the
+      # kubernetes-application edge orders that install after the kubernetes
+      # machinery (CAPI providers, Kamaji, the addon artifacts) is present, so
+      # the ComputePlane kind is not registered — and cannot be instantiated —
+      # on a cluster that lacks what it provisions.
+      dependsOn:
+        - cozystack.cozystack-engine
+        - cozystack.kubernetes-application
+      libraries:
+        - name: cozy-lib
+          path: library/cozy-lib
+      components:
+        # The ComputePlane module chart (tenant module, source-only): rendered
+        # into the tenant namespace by the tenant chart when the module is on.
+        - name: computeplane
+          path: extra/computeplane
+        # The ordinary managed-kubernetes app, re-declared source-only under
+        # this package's own scope (cozystack-computeplane-application-kubevirt-kubernetes)
+        # so the module is self-contained and does not reach into another
+        # package's artifacts for the cluster chart itself.
+        - name: kubernetes
+          path: apps/kubernetes
+          libraries: ["cozy-lib"]
+        # The worker-pool chart, likewise re-declared source-only under this
+        # package's own scope (cozystack-computeplane-application-kubevirt-kubernetes-nodes).
+        # Since Phase 2 split worker pools out of apps/kubernetes, the module
+        # renders one child HelmRelease per nodeGroup against this artifact
+        # (see extra/computeplane/templates/cluster.yaml); keeping it in-scope
+        # preserves the same self-containment as the cluster chart above.
+        - name: kubernetes-nodes
+          path: apps/kubernetes-nodes
+          libraries: ["cozy-lib"]
+        - name: computeplane-rd
+          path: system/computeplane-rd
+          install:
+            namespace: cozy-system
+            releaseName: computeplane-rd
diff --git a/packages/core/platform/sources/cozystack-basics.yaml b/packages/core/platform/sources/cozystack-basics.yaml
index a3fbbad107..0a71a24615 100644
--- a/packages/core/platform/sources/cozystack-basics.yaml
+++ b/packages/core/platform/sources/cozystack-basics.yaml
@@ -13,6 +13,28 @@ spec:
   - name: default
     dependsOn:
     - cozystack.tenant-application
+    # cozystack-basics ships cluster-wide ValidatingAdmissionPolicies (the
+    # gateway / route / tenant host policies). kube-controller-manager's VAP
+    # status type-checker panics (nil-pointer deref in cel/openapi) when it
+    # type-checks a policy against a matched type whose schema it cannot
+    # resolve yet, so these policies must never predate the APIs they match:
+    #   - cozystack-engine serves tenants.apps.cozystack.io (via cozystack-api);
+    #     without this dependency the tenant-host policy is created before
+    #     cozystack-api is Ready, crashes KCM, and deadlocks the whole install
+    #     (KCM down -> cert/token issuance stalls -> cozystack-api never starts
+    #     -> the tenants schema never resolves -> KCM keeps crashing).
+    #   - gateway-api-crds establishes gateways/httproutes/tlsroutes for the
+    #     gateway/route host policies.
+    # Drift detection is off on operator-generated HelmReleases, so a
+    # capability gate in the templates would render the policy out at first
+    # install and never add it back; ordering via dependsOn is the reliable
+    # fix. The cozystack-engine and gateway-api-crds packages it depends on
+    # consume none of cozystack-basics' outputs and do not depend back on it,
+    # so these edges add no cycle. (Downstream packages such as backupstrategy-
+    # controller dependsOn cozystack-basics, but those do not feed engine or
+    # gateway-api-crds, so they cannot close a loop here.)
+    - cozystack.cozystack-engine
+    - cozystack.gateway-api-crds
     components:
     - name: cozystack-basics
       path: system/cozystack-basics
diff --git a/packages/core/platform/sources/etcd-application.yaml b/packages/core/platform/sources/etcd-application.yaml
index 1abcec1216..be5e4bce42 100644
--- a/packages/core/platform/sources/etcd-application.yaml
+++ b/packages/core/platform/sources/etcd-application.yaml
@@ -13,6 +13,17 @@ spec:
     - name: default
       dependsOn:
         - cozystack.networking
+        # The etcd chart renders kind: EtcdCluster from
+        # etcd-operator.cozystack.io/v1alpha2, so the operator that serves that
+        # CRD is a genuine prerequisite of offering the app at all. Without this
+        # edge the etcd-rd HelmRelease registers the ApplicationDefinition as
+        # soon as the engine is up, a tenant can create an Etcd before the
+        # operator exists, and its HelmRelease then fails with `no matches for
+        # kind "EtcdCluster"`. Same shape as every other operator-backed app
+        # here (postgres, mariadb, kafka, redis, ...).
+        - cozystack.etcd-operator
+        # cozystack-engine ships the ApplicationDefinition CRD rendered by the *-rd component below.
+        - cozystack.cozystack-engine
       libraries:
         - name: cozy-lib
           path: library/cozy-lib
diff --git a/packages/core/platform/sources/etcd-operator.yaml b/packages/core/platform/sources/etcd-operator.yaml
index a262f94eca..97255bfc58 100644
--- a/packages/core/platform/sources/etcd-operator.yaml
+++ b/packages/core/platform/sources/etcd-operator.yaml
@@ -16,9 +16,15 @@ spec:
     - cozystack.cert-manager
     - cozystack.vertical-pod-autoscaler
     components:
+    - name: etcd-operator-crds
+      path: system/etcd-operator-crds
+      install:
+        namespace: cozy-etcd-operator
+        releaseName: etcd-operator-crds
     - name: etcd-operator
       path: system/etcd-operator
       install:
         namespace: cozy-etcd-operator
         releaseName: etcd-operator
-        upgradeCRDs: CreateReplace
+        dependsOn:
+        - etcd-operator-crds
diff --git a/packages/core/platform/sources/external-dns-application.yaml b/packages/core/platform/sources/external-dns-application.yaml
index 0a37dc5222..cd26bc02dc 100644
--- a/packages/core/platform/sources/external-dns-application.yaml
+++ b/packages/core/platform/sources/external-dns-application.yaml
@@ -13,6 +13,8 @@ spec:
     - name: default
       dependsOn:
         - cozystack.networking
+        # cozystack-engine ships the ApplicationDefinition CRD rendered by the *-rd component below.
+        - cozystack.cozystack-engine
       libraries:
         - name: cozy-lib
           path: library/cozy-lib
diff --git a/packages/core/platform/sources/flux-shard-operator.yaml b/packages/core/platform/sources/flux-shard-operator.yaml
new file mode 100644
index 0000000000..c6145129bf
--- /dev/null
+++ b/packages/core/platform/sources/flux-shard-operator.yaml
@@ -0,0 +1,22 @@
+---
+apiVersion: cozystack.io/v1alpha1
+kind: PackageSource
+metadata:
+  name: cozystack.flux-shard-operator
+spec:
+  sourceRef:
+    kind: OCIRepository
+    name: cozystack-packages
+    namespace: cozy-system
+    path: /
+  variants:
+  - name: default
+    dependsOn:
+    - cozystack.cert-manager
+    - cozystack.cozystack-engine
+    components:
+    - name: flux-shard-operator
+      path: system/flux-shard-operator
+      install:
+        namespace: cozy-fluxcd
+        releaseName: flux-shard-operator
diff --git a/packages/core/platform/sources/foundationdb-application.yaml b/packages/core/platform/sources/foundationdb-application.yaml
index 4488b03392..23caa037e2 100644
--- a/packages/core/platform/sources/foundationdb-application.yaml
+++ b/packages/core/platform/sources/foundationdb-application.yaml
@@ -14,6 +14,8 @@ spec:
       dependsOn:
         - cozystack.networking
         - cozystack.foundationdb-operator
+        # cozystack-engine ships the ApplicationDefinition CRD rendered by the *-rd component below.
+        - cozystack.cozystack-engine
       libraries:
         - name: cozy-lib
           path: library/cozy-lib
diff --git a/packages/core/platform/sources/gpu-operator.yaml b/packages/core/platform/sources/gpu-operator.yaml
index 932457480e..e1eb90b4e3 100644
--- a/packages/core/platform/sources/gpu-operator.yaml
+++ b/packages/core/platform/sources/gpu-operator.yaml
@@ -36,3 +36,16 @@ spec:
         privileged: true
         namespace: cozy-gpu-operator
         releaseName: gpu-operator
+  - name: container
+    dependsOn:
+    - cozystack.networking
+    components:
+    - name: gpu-operator
+      path: system/gpu-operator
+      valuesFiles:
+      - values.yaml
+      - values-container.yaml
+      install:
+        privileged: true
+        namespace: cozy-gpu-operator
+        releaseName: gpu-operator
diff --git a/packages/core/platform/sources/harbor-application.yaml b/packages/core/platform/sources/harbor-application.yaml
index c2773bdd98..9121d9c022 100644
--- a/packages/core/platform/sources/harbor-application.yaml
+++ b/packages/core/platform/sources/harbor-application.yaml
@@ -16,6 +16,8 @@ spec:
         - cozystack.postgres-operator
         - cozystack.redis-operator
         - cozystack.objectstorage-controller
+        # cozystack-engine ships the ApplicationDefinition CRD rendered by the *-rd component below.
+        - cozystack.cozystack-engine
       libraries:
         - name: cozy-lib
           path: library/cozy-lib
diff --git a/packages/core/platform/sources/http-cache-application.yaml b/packages/core/platform/sources/http-cache-application.yaml
deleted file mode 100644
index 67537b4f51..0000000000
--- a/packages/core/platform/sources/http-cache-application.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
----
-apiVersion: cozystack.io/v1alpha1
-kind: PackageSource
-metadata:
-  name: cozystack.http-cache-application
-spec:
-  sourceRef:
-    kind: OCIRepository
-    name: cozystack-packages
-    namespace: cozy-system
-    path: /
-  variants:
-    - name: default
-      dependsOn:
-        - cozystack.networking
-      libraries:
-        - name: cozy-lib
-          path: library/cozy-lib
-      components:
-        - name: http-cache
-          path: apps/http-cache
-          libraries: [cozy-lib]
-        - name: http-cache-rd
-          path: system/http-cache-rd
-          install:
-            namespace: cozy-system
-            releaseName: http-cache-rd
diff --git a/packages/core/platform/sources/info-application.yaml b/packages/core/platform/sources/info-application.yaml
index 25b8b79827..7ab6d708d2 100644
--- a/packages/core/platform/sources/info-application.yaml
+++ b/packages/core/platform/sources/info-application.yaml
@@ -13,6 +13,8 @@ spec:
     - name: default
       dependsOn:
         - cozystack.networking
+        # cozystack-engine ships the ApplicationDefinition CRD rendered by the *-rd component below.
+        - cozystack.cozystack-engine
       libraries:
         - name: cozy-lib
           path: library/cozy-lib
diff --git a/packages/core/platform/sources/ingress-application.yaml b/packages/core/platform/sources/ingress-application.yaml
index 638c2f1c4f..157fb2f629 100644
--- a/packages/core/platform/sources/ingress-application.yaml
+++ b/packages/core/platform/sources/ingress-application.yaml
@@ -13,6 +13,8 @@ spec:
     - name: default
       dependsOn:
         - cozystack.networking
+        # cozystack-engine ships the ApplicationDefinition CRD rendered by the *-rd component below.
+        - cozystack.cozystack-engine
       libraries:
         - name: cozy-lib
           path: library/cozy-lib
diff --git a/packages/core/platform/sources/kafka-application.yaml b/packages/core/platform/sources/kafka-application.yaml
index 4a5ca15871..3b3c58770d 100644
--- a/packages/core/platform/sources/kafka-application.yaml
+++ b/packages/core/platform/sources/kafka-application.yaml
@@ -14,6 +14,8 @@ spec:
       dependsOn:
         - cozystack.networking
         - cozystack.kafka-operator
+        # cozystack-engine ships the ApplicationDefinition CRD rendered by the *-rd component below.
+        - cozystack.cozystack-engine
       libraries:
         - name: cozy-lib
           path: library/cozy-lib
diff --git a/packages/core/platform/sources/keda.yaml b/packages/core/platform/sources/keda.yaml
new file mode 100644
index 0000000000..cdcce60bb7
--- /dev/null
+++ b/packages/core/platform/sources/keda.yaml
@@ -0,0 +1,36 @@
+---
+apiVersion: cozystack.io/v1alpha1
+kind: PackageSource
+metadata:
+  name: cozystack.keda
+spec:
+  sourceRef:
+    kind: OCIRepository
+    name: cozystack-packages
+    namespace: cozy-system
+    path: /
+  variants:
+  - name: default
+    # Install-order dependencies only:
+    # - cozystack.networking: CNI must be reconciled before the operator pod schedules.
+    # - cozystack.prometheus-operator-crds: the shim enables a ServiceMonitor, whose
+    #   CRD must exist before the manifest is applied.
+    #
+    # cert-manager is intentionally NOT listed: the KEDA chart generates its own
+    # admission-webhook TLS (built-in CA), so cert-manager is not a prerequisite.
+    #
+    # KEDA is an OPTIONAL package (enabled via bundles.enabledPackages) and must
+    # never appear in a default package's dependsOn, or the platform HelmRelease
+    # would stay DependenciesNotReady whenever KEDA is not enabled. It claims the
+    # cluster-wide external.metrics.k8s.io APIService (distinct from metrics-server's
+    # metrics.k8s.io, so no conflict) — the deliberate platform-wide dependency
+    # database read-replica autoscaling rests on.
+    dependsOn:
+    - cozystack.networking
+    - cozystack.prometheus-operator-crds
+    components:
+    - name: keda
+      path: system/keda
+      install:
+        namespace: cozy-keda
+        releaseName: keda
diff --git a/packages/core/platform/sources/kubernetes-application.yaml b/packages/core/platform/sources/kubernetes-application.yaml
index 551a8191fa..acd81f292b 100644
--- a/packages/core/platform/sources/kubernetes-application.yaml
+++ b/packages/core/platform/sources/kubernetes-application.yaml
@@ -18,6 +18,8 @@ spec:
         - cozystack.capi-provider-core
         - cozystack.capi-provider-cp-kamaji
         - cozystack.capi-provider-infra-kubevirt
+        # cozystack-engine ships the ApplicationDefinition CRD rendered by the *-rd component below.
+        - cozystack.cozystack-engine
       libraries:
         - name: cozy-lib
           path: library/cozy-lib
@@ -36,16 +38,21 @@ spec:
           path: system/victoria-metrics-operator
         - name: kubernetes-kubevirt-csi-node
           path: system/kubevirt-csi-node
+        # The node half of the storage driver for the proxmox substrate: the
+        # DaemonSet, the CSIDriver object and the storage classes. Published
+        # alongside the KubeVirt one rather than in a variant of its own,
+        # because a second variant would rename every tenant addon artifact.
+        # The controller half and the cloud-controller-manager are not here:
+        # they hold the hypervisor token, so they run in the management cluster
+        # as plain Deployments rendered by the kubernetes chart itself.
+        - name: kubernetes-proxmox-csi
+          path: system/proxmox-csi
         - name: kubernetes-vertical-pod-autoscaler-crds
           path: system/vertical-pod-autoscaler-crds
         - name: kubernetes-coredns
           path: system/coredns
         - name: kubernetes-cert-manager
           path: system/cert-manager
-        - name: kubernetes-fluxcd-operator
-          path: system/fluxcd-operator
-        - name: kubernetes-fluxcd
-          path: system/fluxcd
         - name: kubernetes-monitoring-agents
           path: system/monitoring-agents
         - name: kubernetes-cilium
diff --git a/packages/core/platform/sources/kubernetes-nodes-application.yaml b/packages/core/platform/sources/kubernetes-nodes-application.yaml
new file mode 100644
index 0000000000..b50ba7928a
--- /dev/null
+++ b/packages/core/platform/sources/kubernetes-nodes-application.yaml
@@ -0,0 +1,34 @@
+---
+apiVersion: cozystack.io/v1alpha1
+kind: PackageSource
+metadata:
+  name: cozystack.kubernetes-nodes-application
+spec:
+  sourceRef:
+    kind: OCIRepository
+    name: cozystack-packages
+    namespace: cozy-system
+    path: /
+  variants:
+    - name: kubevirt
+      dependsOn:
+        - cozystack.networking
+        - cozystack.capi-operator
+        - cozystack.capi-provider-bootstrap-kubeadm
+        - cozystack.capi-provider-core
+        - cozystack.capi-provider-cp-kamaji
+        - cozystack.capi-provider-infra-kubevirt
+        # cozystack-engine ships the ApplicationDefinition CRD rendered by the *-rd component below.
+        - cozystack.cozystack-engine
+      libraries:
+        - name: cozy-lib
+          path: library/cozy-lib
+      components:
+        - name: kubernetes-nodes
+          path: apps/kubernetes-nodes
+          libraries: ["cozy-lib"]
+        - name: kubernetes-nodes-rd
+          path: system/kubernetes-nodes-rd
+          install:
+            namespace: cozy-system
+            releaseName: kubernetes-nodes-rd
diff --git a/packages/core/platform/sources/kubernetes-worker-image.yaml b/packages/core/platform/sources/kubernetes-worker-image.yaml
new file mode 100644
index 0000000000..0f38b6b7b1
--- /dev/null
+++ b/packages/core/platform/sources/kubernetes-worker-image.yaml
@@ -0,0 +1,32 @@
+---
+apiVersion: cozystack.io/v1alpha1
+kind: PackageSource
+metadata:
+  name: cozystack.kubernetes-worker-image
+spec:
+  sourceRef:
+    kind: OCIRepository
+    name: cozystack-packages
+    namespace: cozy-system
+    path: /
+  variants:
+    - name: default
+      dependsOn:
+        - cozystack.networking
+        - cozystack.kubevirt-cdi
+      components:
+        - name: kubernetes-worker-image
+          path: system/kubernetes-worker-image
+          install:
+            namespace: cozy-system
+            releaseName: kubernetes-worker-image
+            # Ready only once every golden has imported. Worker pools read each
+            # golden's phase directly and do not wait on this status, so the
+            # gate delays no pool; it only stops the catalog reporting green
+            # over an import that never finished. See vm-default-images.yaml
+            # for how the expressions treat each phase.
+            healthCheckExprs:
+              - apiVersion: cdi.kubevirt.io/v1beta1
+                kind: DataVolume
+                failed: "has(status.phase) && status.phase == 'Failed'"
+                current: "has(status.phase) && status.phase == 'Succeeded'"
diff --git a/packages/core/platform/sources/kubevirt-cdi.yaml b/packages/core/platform/sources/kubevirt-cdi.yaml
index bd925c0dec..00e9469f2c 100644
--- a/packages/core/platform/sources/kubevirt-cdi.yaml
+++ b/packages/core/platform/sources/kubevirt-cdi.yaml
@@ -11,8 +11,16 @@ spec:
     path: /
   variants:
   - name: default
+    # kubevirt-cdi ships the cdi-clone-dv RoleBinding INTO the cozy-public
+    # namespace, which is provisioned by cozystack-basics. Without the
+    # cozystack-basics edge the RoleBinding can race namespace creation on a
+    # fresh install and fail with `namespaces "cozy-public" not found`.
+    # Normally masked by Flux retries; becomes a hard UpgradeFailed under slow
+    # reconcile. Depend on cozystack-basics so the target namespace exists
+    # first. No cycle: cozystack-basics' deps do not depend on kubevirt-cdi.
     dependsOn:
     - cozystack.networking
+    - cozystack.cozystack-basics
     components:
     - name: kubevirt-cdi-operator
       path: system/kubevirt-cdi-operator
diff --git a/packages/core/platform/sources/local-storage.yaml b/packages/core/platform/sources/local-storage.yaml
new file mode 100644
index 0000000000..f14cf30379
--- /dev/null
+++ b/packages/core/platform/sources/local-storage.yaml
@@ -0,0 +1,22 @@
+---
+apiVersion: cozystack.io/v1alpha1
+kind: PackageSource
+metadata:
+  name: cozystack.local-storage
+spec:
+  sourceRef:
+    kind: OCIRepository
+    name: cozystack-packages
+    namespace: cozy-system
+    path: /
+  variants:
+  - name: default
+    dependsOn:
+    - cozystack.networking
+    components:
+    - name: local-storage
+      path: system/local-storage
+      install:
+        privileged: true
+        namespace: cozy-local-storage
+        releaseName: local-storage
diff --git a/packages/core/platform/sources/mariadb-application.yaml b/packages/core/platform/sources/mariadb-application.yaml
index 34ff901b7f..2f324e14ec 100644
--- a/packages/core/platform/sources/mariadb-application.yaml
+++ b/packages/core/platform/sources/mariadb-application.yaml
@@ -14,6 +14,8 @@ spec:
       dependsOn:
         - cozystack.networking
         - cozystack.mariadb-operator
+        # cozystack-engine ships the ApplicationDefinition CRD rendered by the *-rd component below.
+        - cozystack.cozystack-engine
       libraries:
         - name: cozy-lib
           path: library/cozy-lib
diff --git a/packages/core/platform/sources/mongodb-application.yaml b/packages/core/platform/sources/mongodb-application.yaml
index b6106fe176..298d478679 100644
--- a/packages/core/platform/sources/mongodb-application.yaml
+++ b/packages/core/platform/sources/mongodb-application.yaml
@@ -13,6 +13,18 @@ spec:
     - name: default
       dependsOn:
         - cozystack.networking
+        - cozystack.mongodb-operator
+        # cozystack-engine ships the ApplicationDefinition CRD rendered by the *-rd component below.
+        - cozystack.cozystack-engine
+        # The mongodb chart renders kind: PerconaServerMongoDB from
+        # psmdb.percona.com/v1, so the operator that serves that CRD is a
+        # prerequisite of offering the app at all. Without this edge the
+        # mongodb-rd HelmRelease registers the ApplicationDefinition as soon as
+        # the engine is up, a tenant can create a MongoDB before the operator
+        # exists, and its HelmRelease fails with `no matches for kind
+        # "PerconaServerMongoDB"`. Same shape as every other operator-backed app
+        # here (postgres, mariadb, kafka, redis, etcd).
+        - cozystack.mongodb-operator
       libraries:
         - name: cozy-lib
           path: library/cozy-lib
diff --git a/packages/core/platform/sources/mongodb-operator.yaml b/packages/core/platform/sources/mongodb-operator.yaml
index e3d6fe9ef1..c783e9dd06 100644
--- a/packages/core/platform/sources/mongodb-operator.yaml
+++ b/packages/core/platform/sources/mongodb-operator.yaml
@@ -21,3 +21,4 @@ spec:
       install:
         namespace: cozy-mongodb-operator
         releaseName: mongodb-operator
+        upgradeCRDs: CreateReplace
diff --git a/packages/core/platform/sources/monitoring-application.yaml b/packages/core/platform/sources/monitoring-application.yaml
index 119aaa3738..188bcba7a7 100644
--- a/packages/core/platform/sources/monitoring-application.yaml
+++ b/packages/core/platform/sources/monitoring-application.yaml
@@ -16,6 +16,43 @@ spec:
         - cozystack.postgres-operator
         - cozystack.grafana-operator
         - cozystack.victoria-metrics-operator
+        # cozystack-engine ships the ApplicationDefinition CRD rendered by the *-rd component below.
+        - cozystack.cozystack-engine
+      libraries:
+        - name: cozy-lib
+          path: library/cozy-lib
+      components:
+        - name: monitoring-system
+          path: system/monitoring
+          libraries: ["cozy-lib"]
+        - name: monitoring
+          path: extra/monitoring
+          libraries: ["cozy-lib"]
+        - name: monitoring-rd
+          path: system/monitoring-rd
+          install:
+            namespace: cozy-system
+            releaseName: monitoring-rd
+    # `oidc` variant — additionally waits for cozystack.keycloak-operator so
+    # the v1.edp.epam.com CRDs consumed by the Phase-1 OIDC selector
+    # (spec.oidc.mode: System renders a per-instance KeycloakClient and
+    # KeycloakClientScope in the cozy realm) are registered before the
+    # monitoring chart reconciles. Without this edge, the
+    # `.Capabilities.APIVersions.Has "v1.edp.epam.com/v1"` guard in
+    # templates/grafana/oidc-keycloak.yaml would fail the render (or, worse,
+    # if the guard were removed, silently drop the Keycloak side and leave
+    # Grafana's auth.generic_oauth pointing at a client that never gets
+    # provisioned). Selected from the bundle when `authentication.oidc.enabled`
+    # is true — see packages/core/platform/templates/bundles/system.yaml.
+    # Mirrors the cozystack-engine default/oidc variant split.
+    - name: oidc
+      dependsOn:
+        - cozystack.networking
+        - cozystack.postgres-operator
+        - cozystack.grafana-operator
+        - cozystack.victoria-metrics-operator
+        - cozystack.cozystack-engine
+        - cozystack.keycloak-operator
       libraries:
         - name: cozy-lib
           path: library/cozy-lib
diff --git a/packages/core/platform/sources/nats-application.yaml b/packages/core/platform/sources/nats-application.yaml
index b09c5a3030..21c75440de 100644
--- a/packages/core/platform/sources/nats-application.yaml
+++ b/packages/core/platform/sources/nats-application.yaml
@@ -13,6 +13,8 @@ spec:
     - name: default
       dependsOn:
         - cozystack.networking
+        # cozystack-engine ships the ApplicationDefinition CRD rendered by the *-rd component below.
+        - cozystack.cozystack-engine
       libraries:
         - name: cozy-lib
           path: library/cozy-lib
diff --git a/packages/core/platform/sources/openbao-application.yaml b/packages/core/platform/sources/openbao-application.yaml
index 438148af25..715bf00c70 100644
--- a/packages/core/platform/sources/openbao-application.yaml
+++ b/packages/core/platform/sources/openbao-application.yaml
@@ -13,6 +13,8 @@ spec:
     - name: default
       dependsOn:
         - cozystack.networking
+        # cozystack-engine ships the ApplicationDefinition CRD rendered by the *-rd component below.
+        - cozystack.cozystack-engine
       libraries:
         - name: cozy-lib
           path: library/cozy-lib
diff --git a/packages/core/platform/sources/opensearch-application.yaml b/packages/core/platform/sources/opensearch-application.yaml
index 19358c210f..285fc54516 100644
--- a/packages/core/platform/sources/opensearch-application.yaml
+++ b/packages/core/platform/sources/opensearch-application.yaml
@@ -14,6 +14,8 @@ spec:
     dependsOn:
     - cozystack.networking
     - cozystack.opensearch-operator
+    # cozystack-engine ships the ApplicationDefinition CRD rendered by the *-rd component below.
+    - cozystack.cozystack-engine
     libraries:
     - name: cozy-lib
       path: library/cozy-lib
diff --git a/packages/core/platform/sources/opensearch-operator.yaml b/packages/core/platform/sources/opensearch-operator.yaml
index 21dd7a43e4..76687ca8e5 100644
--- a/packages/core/platform/sources/opensearch-operator.yaml
+++ b/packages/core/platform/sources/opensearch-operator.yaml
@@ -18,5 +18,6 @@ spec:
     - name: opensearch-operator
       path: system/opensearch-operator
       install:
+        privileged: true
         namespace: cozy-opensearch-operator
         releaseName: opensearch-operator
diff --git a/packages/core/platform/sources/postgres-application.yaml b/packages/core/platform/sources/postgres-application.yaml
index 5d7b220b8a..784dc63342 100644
--- a/packages/core/platform/sources/postgres-application.yaml
+++ b/packages/core/platform/sources/postgres-application.yaml
@@ -14,6 +14,8 @@ spec:
       dependsOn:
         - cozystack.networking
         - cozystack.postgres-operator
+        # cozystack-engine ships the ApplicationDefinition CRD rendered by the *-rd component below.
+        - cozystack.cozystack-engine
       libraries:
         - name: cozy-lib
           path: library/cozy-lib
diff --git a/packages/core/platform/sources/qdrant-application.yaml b/packages/core/platform/sources/qdrant-application.yaml
index 6477cc37cd..4bd16b6801 100644
--- a/packages/core/platform/sources/qdrant-application.yaml
+++ b/packages/core/platform/sources/qdrant-application.yaml
@@ -13,6 +13,8 @@ spec:
     - name: default
       dependsOn:
         - cozystack.networking
+        # cozystack-engine ships the ApplicationDefinition CRD rendered by the *-rd component below.
+        - cozystack.cozystack-engine
       libraries:
         - name: cozy-lib
           path: library/cozy-lib
diff --git a/packages/core/platform/sources/rabbitmq-application.yaml b/packages/core/platform/sources/rabbitmq-application.yaml
index 7dc68b3152..bf1ed1914e 100644
--- a/packages/core/platform/sources/rabbitmq-application.yaml
+++ b/packages/core/platform/sources/rabbitmq-application.yaml
@@ -14,6 +14,8 @@ spec:
       dependsOn:
         - cozystack.networking
         - cozystack.rabbitmq-operator
+        # cozystack-engine ships the ApplicationDefinition CRD rendered by the *-rd component below.
+        - cozystack.cozystack-engine
       libraries:
         - name: cozy-lib
           path: library/cozy-lib
diff --git a/packages/core/platform/sources/redis-application.yaml b/packages/core/platform/sources/redis-application.yaml
index 41a2a9dc79..6abfacc65e 100644
--- a/packages/core/platform/sources/redis-application.yaml
+++ b/packages/core/platform/sources/redis-application.yaml
@@ -14,6 +14,8 @@ spec:
       dependsOn:
         - cozystack.networking
         - cozystack.redis-operator
+        # cozystack-engine ships the ApplicationDefinition CRD rendered by the *-rd component below.
+        - cozystack.cozystack-engine
       libraries:
         - name: cozy-lib
           path: library/cozy-lib
diff --git a/packages/core/platform/sources/redis-operator.yaml b/packages/core/platform/sources/redis-operator.yaml
index 9abb3d265c..25ca2299f1 100644
--- a/packages/core/platform/sources/redis-operator.yaml
+++ b/packages/core/platform/sources/redis-operator.yaml
@@ -19,3 +19,9 @@ spec:
       install:
         namespace: cozy-redis-operator
         releaseName: redis-operator
+        # The freshworks fork ships an engine-aware CRD (spec.engine, for the
+        # Valkey follow-up). helm-controller defaults CRD upgrades to Skip, so
+        # without this an upgraded cluster keeps the old spotahome schema and
+        # prunes spec.engine on admission. Additive schema diff, so replace is
+        # safe.
+        upgradeCRDs: CreateReplace
diff --git a/packages/core/platform/sources/seaweedfs-application.yaml b/packages/core/platform/sources/seaweedfs-application.yaml
index a213ebc86a..f7ff7ca94e 100644
--- a/packages/core/platform/sources/seaweedfs-application.yaml
+++ b/packages/core/platform/sources/seaweedfs-application.yaml
@@ -13,6 +13,9 @@ spec:
     - name: default
       dependsOn:
         - cozystack.networking
+        - cozystack.objectstorage-controller
+        # cozystack-engine ships the ApplicationDefinition CRD rendered by the *-rd component below.
+        - cozystack.cozystack-engine
       libraries:
         - name: cozy-lib
           path: library/cozy-lib
diff --git a/packages/core/platform/sources/securitygroup-controller.yaml b/packages/core/platform/sources/securitygroup-controller.yaml
new file mode 100644
index 0000000000..fedf0af462
--- /dev/null
+++ b/packages/core/platform/sources/securitygroup-controller.yaml
@@ -0,0 +1,22 @@
+---
+apiVersion: cozystack.io/v1alpha1
+kind: PackageSource
+metadata:
+  name: cozystack.securitygroup-controller
+spec:
+  sourceRef:
+    kind: OCIRepository
+    name: cozystack-packages
+    namespace: cozy-system
+    path: /
+  variants:
+  - name: default
+    dependsOn:
+    - cozystack.networking
+    components:
+    - name: securitygroup-controller
+      path: system/securitygroup-controller
+      install:
+        privileged: true
+        namespace: cozy-securitygroup-controller
+        releaseName: securitygroup-controller
diff --git a/packages/core/platform/sources/talos-log-collector.yaml b/packages/core/platform/sources/talos-log-collector.yaml
new file mode 100644
index 0000000000..35c6874f54
--- /dev/null
+++ b/packages/core/platform/sources/talos-log-collector.yaml
@@ -0,0 +1,22 @@
+---
+apiVersion: cozystack.io/v1alpha1
+kind: PackageSource
+metadata:
+  name: cozystack.talos-log-collector
+spec:
+  sourceRef:
+    kind: OCIRepository
+    name: cozystack-packages
+    namespace: cozy-system
+    path: /
+  variants:
+  - name: default
+    dependsOn:
+    - cozystack.networking
+    components:
+    - name: talos-log-collector
+      path: system/talos-log-collector
+      install:
+        namespace: cozy-talos-log-collector
+        releaseName: talos-log-collector
+        privileged: true
diff --git a/packages/core/platform/sources/tcp-balancer-application.yaml b/packages/core/platform/sources/tcp-balancer-application.yaml
index 0ba031e7d3..bbee51fe5f 100644
--- a/packages/core/platform/sources/tcp-balancer-application.yaml
+++ b/packages/core/platform/sources/tcp-balancer-application.yaml
@@ -13,6 +13,8 @@ spec:
     - name: default
       dependsOn:
         - cozystack.networking
+        # cozystack-engine ships the ApplicationDefinition CRD rendered by the *-rd component below.
+        - cozystack.cozystack-engine
       libraries:
         - name: cozy-lib
           path: library/cozy-lib
diff --git a/packages/core/platform/sources/tenant-application.yaml b/packages/core/platform/sources/tenant-application.yaml
index 6fad2ba64b..b790f8a06d 100644
--- a/packages/core/platform/sources/tenant-application.yaml
+++ b/packages/core/platform/sources/tenant-application.yaml
@@ -19,6 +19,31 @@ spec:
         - cozystack.info-application
         - cozystack.monitoring-application
         - cozystack.etcd-application
+        # cozystack-engine ships the ApplicationDefinition CRD rendered by the *-rd component below.
+        - cozystack.cozystack-engine
+      libraries:
+        - name: cozy-lib
+          path: library/cozy-lib
+      components:
+        - name: tenant
+          path: apps/tenant
+          libraries: [cozy-lib]
+        - name: tenant-rd
+          path: system/tenant-rd
+          install:
+            namespace: cozy-system
+            releaseName: tenant-rd
+    # Selected by the slim platform variants, which emit none of the
+    # monitoring, etcd and seaweedfs applications the default variant waits on.
+    # The tenant ApplicationDefinition and cozystack-basics reference the default
+    # variant's artifacts by name; the PackageSource builds those for every variant.
+    - name: slim
+      dependsOn:
+        - cozystack.networking
+        - cozystack.ingress-application
+        - cozystack.gateway-application
+        - cozystack.info-application
+        - cozystack.cozystack-engine
       libraries:
         - name: cozy-lib
           path: library/cozy-lib
diff --git a/packages/core/platform/sources/valkey-application.yaml b/packages/core/platform/sources/valkey-application.yaml
new file mode 100644
index 0000000000..6769849e95
--- /dev/null
+++ b/packages/core/platform/sources/valkey-application.yaml
@@ -0,0 +1,30 @@
+---
+apiVersion: cozystack.io/v1alpha1
+kind: PackageSource
+metadata:
+  name: cozystack.valkey-application
+spec:
+  sourceRef:
+    kind: OCIRepository
+    name: cozystack-packages
+    namespace: cozy-system
+    path: /
+  variants:
+    - name: default
+      dependsOn:
+        - cozystack.networking
+        - cozystack.redis-operator
+        # cozystack-engine ships the ApplicationDefinition CRD rendered by the *-rd component below.
+        - cozystack.cozystack-engine
+      libraries:
+        - name: cozy-lib
+          path: library/cozy-lib
+      components:
+        - name: valkey
+          path: apps/valkey
+          libraries: ["cozy-lib"]
+        - name: valkey-rd
+          path: system/valkey-rd
+          install:
+            namespace: cozy-system
+            releaseName: valkey-rd
diff --git a/packages/core/platform/sources/velero.yaml b/packages/core/platform/sources/velero.yaml
index 2374e84733..acfb4d2bdd 100644
--- a/packages/core/platform/sources/velero.yaml
+++ b/packages/core/platform/sources/velero.yaml
@@ -21,3 +21,4 @@ spec:
         privileged: true
         namespace: cozy-velero
         releaseName: velero
+        upgradeCRDs: CreateReplace
diff --git a/packages/core/platform/sources/vertical-pod-autoscaler.yaml b/packages/core/platform/sources/vertical-pod-autoscaler.yaml
index a4d827cc56..16ecc6efdd 100644
--- a/packages/core/platform/sources/vertical-pod-autoscaler.yaml
+++ b/packages/core/platform/sources/vertical-pod-autoscaler.yaml
@@ -12,7 +12,19 @@ spec:
   variants:
   - name: default
     dependsOn:
+    # cozystack.cert-manager is required because the VPA admission-controller
+    # webhook TLS is now provisioned by a cert-manager Certificate + Issuer
+    # (see packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/
+    # templates/admission-controller/certificate.yaml). Without cert-manager
+    # already Ready when the VPA package reconciles, the Certificate stays
+    # pending, the Secret never gets written, and the admission-controller pod
+    # CrashLoops on missing TLS mount — the same failure mode that used to
+    # cascade the whole cozystack-platform HR under the legacy genCA path,
+    # now with a clean dependency instead of racing readiness. Verified
+    # non-circular: cozystack.cert-manager depends on cozystack.networking
+    # and cozystack.gateway-api-crds, neither of which touches VPA.
     - cozystack.networking
+    - cozystack.cert-manager
     components:
     - name: vertical-pod-autoscaler-crds
       path: system/vertical-pod-autoscaler-crds
diff --git a/packages/core/platform/sources/virtualprivatecloud-application.yaml b/packages/core/platform/sources/virtualprivatecloud-application.yaml
index b6a8519b12..4b813881ba 100644
--- a/packages/core/platform/sources/virtualprivatecloud-application.yaml
+++ b/packages/core/platform/sources/virtualprivatecloud-application.yaml
@@ -14,6 +14,8 @@ spec:
       dependsOn:
         - cozystack.networking
         - cozystack.multus
+        # cozystack-engine ships the ApplicationDefinition CRD rendered by the *-rd component below.
+        - cozystack.cozystack-engine
       libraries:
         - name: cozy-lib
           path: library/cozy-lib
diff --git a/packages/core/platform/sources/vm-default-images.yaml b/packages/core/platform/sources/vm-default-images.yaml
index 16cd6a9456..999dc60483 100644
--- a/packages/core/platform/sources/vm-default-images.yaml
+++ b/packages/core/platform/sources/vm-default-images.yaml
@@ -20,3 +20,14 @@ spec:
           install:
             namespace: cozy-system
             releaseName: vm-default-images
+            # Ready only once every image has imported, so the status says
+            # whether the collection is actually there. Any phase other than
+            # Succeeded or Failed matches neither expression and flux keeps
+            # waiting. There is no per-component timeout: a download that
+            # outlasts the operator-wide install window is retried as an
+            # upgrade until it finishes, and nothing is uninstalled in between.
+            healthCheckExprs:
+              - apiVersion: cdi.kubevirt.io/v1beta1
+                kind: DataVolume
+                failed: "has(status.phase) && status.phase == 'Failed'"
+                current: "has(status.phase) && status.phase == 'Succeeded'"
diff --git a/packages/core/platform/sources/vm-disk-application.yaml b/packages/core/platform/sources/vm-disk-application.yaml
index a4e98ca958..e15064a0f7 100644
--- a/packages/core/platform/sources/vm-disk-application.yaml
+++ b/packages/core/platform/sources/vm-disk-application.yaml
@@ -14,6 +14,8 @@ spec:
       dependsOn:
         - cozystack.networking
         - cozystack.kubevirt-cdi
+        # cozystack-engine ships the ApplicationDefinition CRD rendered by the *-rd component below.
+        - cozystack.cozystack-engine
       libraries:
         - name: cozy-lib
           path: library/cozy-lib
diff --git a/packages/core/platform/sources/vm-instance-application.yaml b/packages/core/platform/sources/vm-instance-application.yaml
index eaa0c76e88..2fd377e291 100644
--- a/packages/core/platform/sources/vm-instance-application.yaml
+++ b/packages/core/platform/sources/vm-instance-application.yaml
@@ -14,6 +14,8 @@ spec:
       dependsOn:
         - cozystack.networking
         - cozystack.kubevirt
+        # cozystack-engine ships the ApplicationDefinition CRD rendered by the *-rd component below.
+        - cozystack.cozystack-engine
       libraries:
         - name: cozy-lib
           path: library/cozy-lib
diff --git a/packages/core/platform/sources/vpn-application.yaml b/packages/core/platform/sources/vpn-application.yaml
index 0200108fe3..5ce29cb2c3 100644
--- a/packages/core/platform/sources/vpn-application.yaml
+++ b/packages/core/platform/sources/vpn-application.yaml
@@ -13,6 +13,8 @@ spec:
     - name: default
       dependsOn:
         - cozystack.networking
+        # cozystack-engine ships the ApplicationDefinition CRD rendered by the *-rd component below.
+        - cozystack.cozystack-engine
       libraries:
         - name: cozy-lib
           path: library/cozy-lib
diff --git a/packages/core/platform/templates/_helpers.tpl b/packages/core/platform/templates/_helpers.tpl
index 4bc024298a..8c3443a8b1 100644
--- a/packages/core/platform/templates/_helpers.tpl
+++ b/packages/core/platform/templates/_helpers.tpl
@@ -8,6 +8,9 @@
 {{- end -}}
 {{- $disabled := default (list) $root.Values.bundles.disabledPackages -}}
 {{- if not (has $name $disabled) -}}
+{{- if eq $name "cozystack.networking" -}}
+{{- include "cozystack.platform.networking.variantGuard" (list $root $variant) -}}
+{{- end }}
 ---
 apiVersion: cozystack.io/v1alpha1
 kind: Package
@@ -24,6 +27,29 @@ spec:
 {{- end }}
 {{ end }}
 
+{{/*
+Refuses to change the variant of a live cozystack.networking Package. The
+operator deletes every HelmRelease of a Package that its new variant does not
+install, so isp-full -> isp-hosted removes cilium and kubeovn and leaves the
+cluster without a CNI. The acknowledgement names the target variant rather than
+being a boolean, so a value left set after one switch does not cover the next.
+Inert where lookup returns nothing: helm template, client-side dry-run, first
+install.
+Call as (list $ <variant about to be rendered>).
+*/}}
+{{- define "cozystack.platform.networking.variantGuard" -}}
+{{- $root := index . 0 -}}
+{{- $variant := index . 1 -}}
+{{- $live := lookup "cozystack.io/v1alpha1" "Package" "" "cozystack.networking" -}}
+{{- if $live -}}
+{{- $liveVariant := default "default" (dig "spec" "variant" "" $live) -}}
+{{- $ack := dig "acknowledgeVariantChange" "" ($root.Values.networking | default dict) | toString -}}
+{{- if and (ne $liveVariant $variant) (ne $ack $variant) -}}
+{{- fail (printf "the live cozystack.networking Package runs variant %q and this render would switch it to %q (bundles.system.variant: %s). The operator then deletes any HelmRelease of that Package the new variant does not install (none if it installs everything the current one does): isp-full to isp-hosted removes Cilium and Kube-OVN and leaves every pod without networking, isp-full to isp-slim removes Kube-OVN. Either restore the previous spec.variant of the cozystack.cozystack-platform Package, or, once the cluster has another CNI or no longer needs the removed one, set networking.acknowledgeVariantChange: %q in its spec.components.platform.values to confirm this exact switch. If the live variant was set by hand and has to stay, add cozystack.networking to bundles.disabledPackages: acknowledging lets this render replace it." $liveVariant $variant $root.Values.bundles.system.variant $variant) -}}
+{{- end -}}
+{{- end -}}
+{{- end }}
+
 {{- define "cozystack.platform.package.default" -}}
 {{- $name := index . 0 -}}
 {{- $root := index . 1 -}}
@@ -34,6 +60,14 @@ spec:
 {{- $name := index . 0 -}}
 {{- $variant := default "default" (index . 1) -}}
 {{- $root := default $ (index . 2) -}}
+{{- /* Components are accepted here for the same reason the always-on helper
+       above accepts them: an opt-in package can need platform configuration
+       just as much as a default one. Omitting this silently dropped whatever
+       the caller passed, which is worse than not supporting it at all. */ -}}
+{{- $components := dict -}}
+{{- if gt (len .) 3 -}}
+{{- $components = index . 3 -}}
+{{- end -}}
 {{- $disabled := default (list) $root.Values.bundles.disabledPackages -}}
 {{- $enabled := default (list) $root.Values.bundles.enabledPackages -}}
 {{- if and (has $name $enabled) (not (has $name $disabled)) -}}
@@ -46,27 +80,208 @@ metadata:
     helm.sh/resource-policy: keep
 spec:
   variant: {{ $variant }}
+{{- if $components }}
+  components:
+{{ toYaml $components | indent 4 }}
+{{- end }}
 {{- end }}
 {{ end }}
 
 {{- define "cozystack.platform.package.optional.default" -}}
 {{- $name := index . 0 -}}
 {{- $root := index . 1 -}}
-{{- include "cozystack.platform.package.optional" (list $name "default" $root) }}
+{{- $components := dict -}}
+{{- if gt (len .) 2 -}}
+{{- $components = index . 2 -}}
+{{- end -}}
+{{- include "cozystack.platform.package.optional" (list $name "default" $root $components) }}
 {{ end }}
 
 {{/*
-Common system packages shared between isp-full and isp-full-generic bundles.
-Does NOT include: networking (variant differs), linstor (talos.enabled differs)
+Emits "true" on the slim variants, empty otherwise.
+*/}}
+{{- define "cozystack.platform.slim" -}}
+{{- if has .Values.bundles.system.variant (list "isp-slim" "isp-slim-generic" "isp-hosted-slim") }}true{{ end -}}
+{{- end }}
+
+{{/*
+A package that is always on in the full variants and opt-in (bundles.enabledPackages)
+on the slim ones. Takes the same arguments as cozystack.platform.package.
+*/}}
+{{- define "cozystack.platform.package.full" -}}
+{{- if include "cozystack.platform.slim" (index . 2) -}}
+{{- include "cozystack.platform.package.optional" . }}
+{{- else -}}
+{{- include "cozystack.platform.package" . }}
+{{- end -}}
+{{ end }}
+
+{{/*
+Emits the cozystack.networking Package. Call as
+(list $ <components> <full variant> <slim variant>). The slim variants run Cilium
+alone: no KubeOVN component, and Cilium L2 announcements stand in for MetalLB.
+*/}}
+{{- define "cozystack.platform.package.networking" -}}
+{{- $root := index . 0 -}}
+{{- $components := index . 1 -}}
+{{- $variant := index . 2 -}}
+{{- if include "cozystack.platform.slim" $root -}}
+{{- if dig "encryption" "enabled" false ($root.Values.networking | default dict) -}}
+{{- fail "networking.encryption.enabled is not supported on the slim variants: their Cilium-only datapath has no encryption wiring yet" -}}
+{{- end -}}
+{{- $variant = index . 3 -}}
+{{- $_ := unset $components "kubeovn" -}}
+{{- $cilium := dig "cilium" "values" "cilium" dict $components -}}
+{{- $_ := set $cilium "l2announcements" (dict "enabled" true) -}}
+{{- $_ := set $components "cilium" (dict "values" (dict "cilium" $cilium)) -}}
+{{- end -}}
+{{- include "cozystack.platform.package" (list "cozystack.networking" $variant $root $components) }}
+{{- end }}
+
+{{- define "cozystack.platform.package.full.default" -}}
+{{- include "cozystack.platform.package.full" (list (index . 0) "default" (index . 1)) }}
+{{ end }}
+
+{{/*
+Resolve networking.stageCniPlugins for a bundle, given that bundle's default.
+Call as (list $ <default-bool>); emits the string "true" or "false".
+
+Two things this exists for, both of which a bare `dig` gets wrong.
+
+`dig` returns its default only when the key is ABSENT. A key present with a nil
+value returns nil, and nil is how an operator clears an inherited override --
+deleting `stageCniPlugins: true` from spec.components.platform.values by setting
+it to null. A bare dig would hand that straight through as nil, the chart would
+read it as off, and a generic-Linux cluster would silently go back to failing
+bridge-type NADs while values.yaml documents the default as on. Nil is therefore
+folded back onto the variant default, which is what "unset" means to a reader.
+
+And the value can arrive as a string. Today a values file does not produce one
+for a boolean spelling -- measured on Helm v4: yes/no/on/off and true/false all
+resolve to booleans, YAML 1.1 style -- but --set-string does, and that "today"
+is why the spellings are normalised rather than relied on: which of them the
+parser folds is a property of whichever YAML library Helm links, not of this
+chart. A parser that stopped folding yes/no would hand this template the string
+instead, and normalising costs nothing either way. Since this key is how an
+operator declines a behaviour change, a spelling the template does not
+understand must not quietly mean the opposite of what was written: anything
+unrecognised stops the render.
+*/}}
+{{- define "cozystack.platform.stageCniPlugins" -}}
+{{- $root := index . 0 -}}
+{{- $default := index . 1 -}}
+{{- $value := dig "stageCniPlugins" nil ($root.Values.networking | default dict) -}}
+{{- if kindIs "invalid" $value -}}
+{{- $default | toString -}}
+{{- else -}}
+{{- $spelling := $value | toString | lower -}}
+{{- if or (eq $spelling "true") (eq $spelling "yes") (eq $spelling "on") (eq $spelling "1") -}}
+true
+{{- else if or (eq $spelling "false") (eq $spelling "no") (eq $spelling "off") (eq $spelling "0") -}}
+false
+{{- else -}}
+{{- fail (printf "networking.stageCniPlugins: expected a boolean, got %q -- leaving it unset follows the bundle variant" ($value | toString)) -}}
+{{- end -}}
+{{- end -}}
+{{- end }}
+
+{{/*
+Values of the cozystack.multus Package. Call as (list $ <stageCniPlugins default>);
+emits YAML. networking.multus.resources is passed only when set, so an unset key
+leaves the multus chart default in charge.
+*/}}
+{{- define "cozystack.platform.multus.values" -}}
+{{- $root := index . 0 -}}
+{{- $values := dict "stageCniPlugins" (eq (include "cozystack.platform.stageCniPlugins" .) "true") -}}
+{{- $multus := index ($root.Values.networking | default dict) "multus" -}}
+{{- if kindIs "invalid" $multus -}}
+{{- $multus = dict -}}
+{{- end -}}
+{{- if not (kindIs "map" $multus) -}}
+{{- fail (printf "networking.multus: expected a map, got %s" (kindOf $multus)) -}}
+{{- end -}}
+{{- $resources := index $multus "resources" -}}
+{{- if not (kindIs "invalid" $resources) -}}
+{{- if not (kindIs "map" $resources) -}}
+{{- fail (printf "networking.multus.resources: expected a map, got %s" (kindOf $resources)) -}}
+{{- end -}}
+{{- $_ := set $values "resources" $resources -}}
+{{- end -}}
+{{- toYaml $values -}}
+{{- end }}
+
+{{/*
+Common system packages shared between the isp-full, isp-full-generic, isp-slim and
+isp-slim-generic bundles.
+Does NOT include the packages each variant emits itself: networking (variant
+differs), linstor (talos.enabled differs), multus (stageCniPlugins differs) and
+cozystack-scheduler (emitted with its own variant in both branches)
 */}}
 {{- define "cozystack.platform.system.common-packages" -}}
 {{- $root := . -}}
+{{- if not (include "cozystack.platform.slim" $root) -}}
 {{include "cozystack.platform.package.default" (list "cozystack.kubeovn-webhook" $root) }}
 {{include "cozystack.platform.package.default" (list "cozystack.kubeovn-plunger" $root) }}
-{{include "cozystack.platform.package.default" (list "cozystack.cozy-proxy" $root) }}
-{{include "cozystack.platform.package.default" (list "cozystack.multus" $root) }}
-{{include "cozystack.platform.package.default" (list "cozystack.metallb" $root) }}
+{{- end }}
+{{include "cozystack.platform.package.full.default" (list "cozystack.cozy-proxy" $root) }}
+{{include "cozystack.platform.package.full.default" (list "cozystack.metallb" $root) }}
 {{include "cozystack.platform.package.default" (list "cozystack.reloader" $root) }}
 {{include "cozystack.platform.package.default" (list "cozystack.linstor-scheduler" $root) }}
 {{include "cozystack.platform.package.default" (list "cozystack.snapshot-controller" $root) }}
+{{- /* securitygroup-controller maintains membership labels for CiliumNetworkPolicy-backed
+       SecurityGroups, so it only makes sense where Cilium runs. Keeping it here with the
+       other data-plane packages (rather than in the variant-agnostic body of system.yaml)
+       keeps it out of the isp-hosted (networking=noop) variant, which never calls
+       common-packages and has no cilium.io CRD for the controller to watch. */ -}}
+{{include "cozystack.platform.package.default" (list "cozystack.securitygroup-controller" $root) }}
+{{- end }}
+
+{{/*
+The block Cilium takes its own addresses from on the kube-ovn variants, the
+last /21 of the pod CIDR, which kube-ovn is told to exclude. Called with the
+pod CIDR, "cozystack.platform.ciliumPool" emits the block as a CIDR for the
+Cilium operator and "cozystack.platform.ciliumPoolRange" as a first..last range
+for kube-ovn excludeIps.
+
+The block has to sit inside the pod CIDR rather than next to it. Envoy reaches
+Gateway API backends from the node's Ingress IP, and kube-ovn masquerades
+host-originated traffic only when its source lies in one of its subnets.
+Outside them the backend's reply is routed to the backend's own node and lost.
+The end of the range is the part kube-ovn reaches last, since it hands out
+free addresses in ascending order and reuses released ones only once the rest
+are gone. A /21 cut into /29s serves 256 nodes, the most a /16 cluster CIDR
+sliced into /24s ever allowed.
+*/}}
+{{- define "cozystack.platform.ciliumPoolBounds" -}}
+{{- $cidr := toString . -}}
+{{- if not (regexMatch "^[0-9]{1,3}(\\.[0-9]{1,3}){3}/[0-9]{1,2}$" $cidr) -}}
+{{- fail (printf "networking.podCIDR %q is not an IPv4 CIDR" $cidr) -}}
+{{- end -}}
+{{- $parts := splitList "/" $cidr -}}
+{{- $prefix := atoi (last $parts) -}}
+{{- if gt $prefix 20 -}}
+{{- fail (printf "networking.podCIDR %s is too small. The kube-ovn variants reserve its last /21 for Cilium, so it needs a prefix of /20 or shorter" $cidr) -}}
+{{- end -}}
+{{- $address := 0 -}}
+{{- range splitList "." (first $parts) -}}
+{{- $address = add (mul $address 256) (atoi .) -}}
+{{- end -}}
+{{- $size := 1 -}}
+{{- range until (sub 32 $prefix | int) -}}
+{{- $size = mul $size 2 -}}
+{{- end -}}
+{{- $first := add (sub $address (mod $address $size)) (sub $size 2048) -}}
+{{- printf "%s %s" (include "cozystack.platform.ipv4" $first) (include "cozystack.platform.ipv4" (add $first 2047)) -}}
+{{- end }}
+
+{{- define "cozystack.platform.ipv4" -}}
+{{- printf "%d.%d.%d.%d" (div . 16777216) (mod (div . 65536) 256) (mod (div . 256) 256) (mod . 256) -}}
+{{- end }}
+
+{{- define "cozystack.platform.ciliumPool" -}}
+{{- printf "%s/21" (first (splitList " " (include "cozystack.platform.ciliumPoolBounds" .))) -}}
+{{- end }}
+
+{{- define "cozystack.platform.ciliumPoolRange" -}}
+{{- join ".." (splitList " " (include "cozystack.platform.ciliumPoolBounds" .)) -}}
 {{- end }}
diff --git a/packages/core/platform/templates/apps.yaml b/packages/core/platform/templates/apps.yaml
index 2e909de6dc..030cfe8b2c 100644
--- a/packages/core/platform/templates/apps.yaml
+++ b/packages/core/platform/templates/apps.yaml
@@ -18,11 +18,60 @@ metadata:
 type: Opaque
 stringData:
   values.yaml: |
+    # keda.clusterDomain: authoritative cluster domain injected into the KEDA subchart
+    # (a subchart value a template cannot derive from _cluster). Rationale: packages/system/keda.
+    keda:
+      clusterDomain: {{ .Values.networking.clusterDomain | quote }}
+    {{- /*
+      The operator builds every in-cluster name it needs from DNS_BASE: the
+      securityconfig job target, its own OpenSearch API client URL, the
+      Dashboards host, and the SANs it writes into node certificates. This is
+      a vendored subchart value, so it travels under the subchart key; _cluster
+      stops at each package's own templates and never reaches a subchart.
+      A package rendered without this Secret falls back to cluster.local.
+    */}}
+    opensearch-operator:
+      manager:
+        dnsBase: {{ .Values.networking.clusterDomain | quote }}
     _cluster:
       root-host: {{ $rootHost | quote }}
       bundle-name: {{ .Values.bundles.system.variant | quote }}
       solver: {{ .Values.publishing.certificates.solver | quote }}
       issuer-name: {{ .Values.publishing.certificates.issuerName | quote }}
+      {{- /*
+        Wildcard certificate mode. Only the Secret NAME rides this
+        channel — never the cert/key material (unlike a private key, the
+        name is not sensitive). When set, the ingress flow points the
+        root ingress controller's --default-ssl-certificate at it and
+        drops per-host ACME, and the gateway chart switches the
+        TenantGateway to certMode=existingSecret — unless
+        the tenant's Gateway is on an edge-terminated class, which wins
+        over it and issues nothing at all.
+
+        The name comes from one of two sources, with the operator-
+        provided (BYO) name always winning:
+          1. publishing.certificates.wildcardSecretName — a Secret the
+             operator pre-creates in the publishing namespace
+             (tenant-root). wildcard-issue stays false: the platform
+             mints nothing.
+          2. Otherwise, on the ingress-nginx path (gateway.enabled=false)
+             with solver=dns01 and publishing.certificates.wildcard=true,
+             the platform issues its own shared wildcard. wildcard-issue
+             becomes true and the publishing ingress package renders the
+             Certificate into this Secret name. http01 cannot issue
+             wildcards, and the Gateway API path issues its own wildcard
+             via the TenantGateway controller, so both are excluded.
+        Empty name + wildcard-issue=false = per-host ACME as before.
+      */}}
+      {{- $byoWildcard := .Values.publishing.certificates.wildcardSecretName | default "" }}
+      {{- $wildcardSecretName := $byoWildcard }}
+      {{- $wildcardIssue := false }}
+      {{- if and (not $byoWildcard) (eq .Values.publishing.certificates.solver "dns01") .Values.publishing.certificates.wildcard (not .Values.gateway.enabled) }}
+      {{- $wildcardSecretName = "cozystack-wildcard-tls" }}
+      {{- $wildcardIssue = true }}
+      {{- end }}
+      wildcard-secret-name: {{ $wildcardSecretName | quote }}
+      wildcard-issue: {{ $wildcardIssue | quote }}
       {{- /*
         DNS-01 solver wiring. Read only when solver=dns01, but the
         keys are written unconditionally so a render-time switch from
@@ -57,7 +106,47 @@ stringData:
       oidc-enabled: {{ .Values.authentication.oidc.enabled | quote }}
       oidc-insecure-skip-verify: {{ .Values.authentication.oidc.insecureSkipVerify | quote }}
       extra-keycloak-redirect-uri-for-dashboard: {{ index .Values.authentication.oidc.keycloakExtraRedirectUri | quote }}
-      keycloak-internal-url: {{ .Values.authentication.oidc.keycloakInternalUrl | quote }}
+      {{- /* The realm name becomes a Keycloak realm, a URL path segment in every
+             issuer/redirect/logout URL, and a shell token in the update-email
+             hook. Reject anything YAML or --set did not resolve to a string (a
+             bare number, or true/false) — coercing it would rename the realm to
+             something never typed and inject a "%!s(...)" into the derived URL —
+             and reject anything outside a safe slug charset, so a stray "/" or
+             space cannot split a URL path or the shell. Fail at the source
+             rather than emit a broken issuer later. The hint does not echo the
+             parsed value back: YAML has already lost the operator's original
+             token (on -> true), so quoting is the fix, not the reprinted bool. */}}
+      {{- /* Unset (null) falls back to cozy; an explicit "" is a meaningless
+             value, not a default request, so let it reach the charset guard
+             below rather than swallowing it — mirrors the keycloakInternalUrl
+             tri-state a few lines down (kindIs "invalid" is null, not ""). */}}
+      {{- $realmName := .Values.authentication.oidc.realmName }}
+      {{- if kindIs "invalid" $realmName }}
+      {{-   $realmName = "cozy" }}
+      {{- end }}
+      {{- if not (kindIs "string" $realmName) }}
+      {{-   fail (printf "authentication.oidc.realmName must be a string (got %s); wrap the value in quotes in the platform values, e.g. realmName: \"my-realm\"" (kindOf $realmName)) }}
+      {{- end }}
+      {{- if not (regexMatch "^[a-zA-Z0-9][a-zA-Z0-9._-]*$" $realmName) }}
+      {{-   fail (printf "authentication.oidc.realmName %q is invalid: use only letters, digits, '.', '_' and '-' (it is used verbatim as a URL path segment and a shell token)" $realmName) }}
+      {{- end }}
+      {{- /* master holds the Keycloak super-admin. Naming it here would put
+             every platform client, the cluster-admin role and the users who
+             log in to the dashboard inside that realm, and publish its login
+             page and token endpoint wherever the platform realm is published. */}}
+      {{- if eq $realmName "master" }}
+      {{-   fail "authentication.oidc.realmName must not be master: that realm holds the Keycloak super-admin, so platform clients and end users would share it. Pick any other name, e.g. realmName: \"cozy\"" }}
+      {{- end }}
+      oidc-realm-name: {{ $realmName | quote }}
+      {{- /* null keycloakInternalUrl derives the in-cluster Service URL for the
+             configured realm; "" is the external-discovery escape hatch and an
+             explicit value is passed through, so distinguish null from "" with
+             kindIs rather than `default`, which would also fire on "". */}}
+      {{- $keycloakInternalUrl := .Values.authentication.oidc.keycloakInternalUrl }}
+      {{- if kindIs "invalid" $keycloakInternalUrl }}
+      {{-   $keycloakInternalUrl = printf "http://keycloak-http.cozy-keycloak.svc:8080/realms/%s" $realmName }}
+      {{- end }}
+      keycloak-internal-url: {{ $keycloakInternalUrl | quote }}
       expose-services: {{ .Values.publishing.exposedServices | join "," | quote }}
       {{- /*
         expose-ingress carries two semantically distinct values that
@@ -76,11 +165,123 @@ stringData:
         key. Documented here as a known limitation.
       */}}
       expose-ingress: {{ .Values.publishing.ingressName | quote }}
+      {{- /* Optional namespace of a SEPARATE Gateway/ingressClass that
+             system components (currently Keycloak) attach their admin
+             routes to — e.g. a private-IP Gateway unreachable from the
+             public internet. Empty -> admin shares expose-ingress. The
+             Gateway itself is provisioned out of band; this only selects
+             where the admin route attaches. */}}
+      expose-ingress-admin: {{ .Values.publishing.ingressNameAdmin | default "" | quote }}
       expose-external-ips: {{ .Values.publishing.externalIPs | join "," | quote }}
+      {{- /* Native loadBalancerClass for the host ingress LoadBalancer Service
+             (see extra/ingress). Empty lets the default LB controller claim it. */}}
+      load-balancer-class: {{ .Values.publishing.loadBalancerClass | default "" | quote }}
+      {{- /* Host PROXY-protocol switch. extra/ingress reads this and applies
+             use-proxy-protocol to the external-facing ingress (the namespace
+             named by expose-ingress), keeping it host-scoped like expose-external-ips. */}}
+      proxy-protocol: {{ .Values.publishing.proxyProtocol | default false | quote }}
       gateway-enabled: {{ .Values.gateway.enabled | default false | quote }}
       gateway-attached-namespaces: {{ .Values.gateway.attachedNamespaces | default (list) | join "," | quote }}
+      {{- /* Normalised once here rather than at each reader: two charts
+             compare this scalar against the comma-joined lists below,
+             which trim their own entries on split, so a padded name that
+             reached them would match in neither.
+
+             Unset falls back to the bundled class. Whitespace-only does
+             NOT: unset means "I did not choose", while whitespace means
+             "I chose, and what I typed is garbage" — and this key decides
+             where TLS terminates. Resolving it quietly would publish a
+             tenant directly, with a real certificate on a real address,
+             that the operator meant to put behind an edge terminator. */}}
+      {{- /* Read before normalising, and check the kind first. `default`
+             fires on any falsy value, so a `default ""` ahead of these
+             checks would launder 0 and false into the empty string and
+             resolve them to the bundled class — the guard would then
+             cover the loudest bad input and miss the two quietest. The
+             order of a guard's steps is part of the guard. */}}
+      {{- $rawClassName := .Values.gateway.className }}
+      {{- if not (kindIs "invalid" $rawClassName) }}
+      {{- if not (kindIs "string" $rawClassName) }}
+      {{- fail (printf "gateway.className must be a GatewayClass name, got %v" $rawClassName) }}
+      {{- end }}
+      {{- if and (ne $rawClassName "") (eq (trim $rawClassName) "") }}
+      {{- fail "gateway.className is only whitespace. Leave it unset to use the bundled cilium class, or name a real GatewayClass — resolving a blank value silently would decide TLS termination for every tenant that did not choose." }}
+      {{- end }}
+      {{- end }}
+      gateway-class-name: {{ $rawClassName | default "" | trim | default "cilium" | quote }}
+      {{- /*
+        A non-string entry is rejected here rather than travelling as
+        something the join below would render unreadably. Note what is NOT
+        checked: whether the names correspond to GatewayClasses that exist.
+        A misspelled name in this list simply matches no class, so edge
+        behaviour never engages for it and nothing says so — the same shape
+        as a misspelled name in className, which lands a tenant Gateway on
+        a class the cluster does not serve and shows up as a Gateway that
+        never programs.
+      */}}
+      {{- $edgeClasses := .Values.gateway.edgeTerminatedClasses | default (list) }}
+      {{- $tenantClasses := .Values.gateway.tenantSelectableClasses | default (list) }}
+      {{- /* Both lists travel as one comma-joined scalar, so a name that
+             carries a comma would arrive as two names and match neither. */}}
+      {{- range $edgeClasses }}
+      {{- if not (kindIs "string" .) }}
+      {{- fail (printf "gateway.edgeTerminatedClasses must be a list of GatewayClass names, got %v" .) }}
+      {{- end }}
+      {{- if contains "," (. | toString) }}
+      {{- fail (printf "gateway.edgeTerminatedClasses entry %q contains a comma; the list travels comma-joined and the name would be split" .) }}
+      {{- end }}
+      {{- end }}
+      {{- range $tenantClasses }}
+      {{- if not (kindIs "string" .) }}
+      {{- fail (printf "gateway.tenantSelectableClasses must be a list of GatewayClass names, got %v" .) }}
+      {{- end }}
+      {{- if contains "," (. | toString) }}
+      {{- fail (printf "gateway.tenantSelectableClasses entry %q contains a comma; the list travels comma-joined and the name would be split" .) }}
+      {{- end }}
+      {{- end }}
+      gateway-edge-classes: {{ $edgeClasses | join "," | quote }}
+      gateway-tenant-classes: {{ $tenantClasses | join "," | quote }}
+      {{- /* Whether the root tenant hosts the platform monitoring stack
+             (Tenant/root spec.monitoring). cozystack-basics gates the
+             cozy-monitoring -> tenant-root vlinsert/vminsert ExternalName
+             redirects on this: when the root tenant has no monitoring, those
+             redirects dead-end and fluent-bit silently drops logs (#3181).
+             `dig` (not `default`) is used deliberately: it keys on presence,
+             so an explicit rootEnabled=false is preserved (Go's `default`
+             would treat the boolean false as empty and flip it back to true),
+             while `| default dict` guards against `.Values.monitoring` being
+             null/omitted in custom values. Missing key -> the true default,
+             matching the chart values.yaml. */}}
+      monitoring-enabled: {{ dig "rootEnabled" true (.Values.monitoring | default dict) | quote }}
+      {{- /* The rate each shared-central tracing tenant's collector holds it
+             to. Only written when set: every release in every tenant reads
+             this Secret, and a key appearing would upgrade all of them. */}}
+      {{- /* Helm reads a number from values as a float64, so a whole number
+             is checked as one and written back as int64 digits. Sprig's int64
+             reads a leading zero as octal and returns 0 on a parse error, so a
+             string is converted only once it is plain decimal digits. The
+             ceiling (1 TiB/s) keeps every value exact as a float64 and keeps
+             the collector's per-replica split clear of int64 overflow. */}}
+      {{- $tracingMax := 1099511627776 }}
+      {{- $tracingRaw := dig "tracingCentralTenantBytesPerSecond" 0 (.Values.monitoring | default dict) }}
+      {{- $tracingRate := -1 }}
+      {{- if kindIs "string" $tracingRaw }}
+      {{-   if regexMatch "^(0|[1-9][0-9]{0,12})$" $tracingRaw }}{{ $tracingRate = int64 $tracingRaw }}{{ end }}
+      {{- else if or (kindIs "float64" $tracingRaw) (kindIs "int64" $tracingRaw) (kindIs "int" $tracingRaw) }}
+      {{-   $f := float64 $tracingRaw }}
+      {{-   if eq (floor $f) $f }}{{ $tracingRate = int64 $tracingRaw }}{{ end }}
+      {{- end }}
+      {{- if or (lt (int64 $tracingRate) 0) (gt (int64 $tracingRate) (int64 $tracingMax)) }}
+      {{-   fail (printf "monitoring.tracingCentralTenantBytesPerSecond must be a whole number of bytes per second, at most %d, or 0 for the default; got %v" $tracingMax $tracingRaw) }}
+      {{- end }}
+      {{- if gt (int64 $tracingRate) 0 }}
+      tracing-central-tenant-bytes-per-second: {{ int64 $tracingRate | quote }}
+      {{- end }}
       cluster-domain: {{ .Values.networking.clusterDomain | quote }}
       api-server-endpoint: {{ .Values.publishing.apiServerEndpoint | quote }}
+      {{- /* Display-only DNS suffix for the dashboard's Services tab
+             (<service>.<suffix>). Empty -> the console shows no hostname. */}}
+      service-domain: {{ .Values.publishing.serviceDomain | default "" | toString | trimAll "." | quote }}
       {{- with .Values.branding }}
       branding:
         {{- . | toYaml | nindent 8 }}
diff --git a/packages/core/platform/templates/bundles/iaas.yaml b/packages/core/platform/templates/bundles/iaas.yaml
index 66ec98b20e..4570d78b04 100644
--- a/packages/core/platform/templates/bundles/iaas.yaml
+++ b/packages/core/platform/templates/bundles/iaas.yaml
@@ -1,15 +1,216 @@
 {{- if and .Values.bundles.iaas.enabled (not (or (eq .Values.bundles.system.variant "isp-full") (eq .Values.bundles.system.variant "isp-full-generic"))) }}
 {{- fail "bundles.iaas.enabled can only be true when bundles.system.variant is 'isp-full' or 'isp-full-generic'" }}
 {{- end }}
+{{- /* Same hole as the paas/naas guards closed: bundles.system.variant keeps its
+       value when bundles.system.enabled is false, so the check above passes on a
+       configuration that skips the system bundle entirely. Every package below
+       depends on its control-plane body — rendering iaas without it leaves all 12
+       Packages in DependenciesNotReady with nothing naming the cause. */ -}}
+{{- if and .Values.bundles.iaas.enabled (not .Values.bundles.system.enabled) }}
+{{- fail "bundles.iaas.enabled requires bundles.system.enabled: the iaas bundle depends on packages emitted by the system bundle (cozystack.networking, cozystack.cozystack-engine, cozystack.cert-manager, cozystack.prometheus-operator-crds and cozystack.cozystack-basics). Enable the system bundle with bundles.system.variant: isp-full or isp-full-generic." }}
+{{- end }}
 {{- if and .Values.bundles.iaas.enabled (or (eq .Values.bundles.system.variant "isp-full") (eq .Values.bundles.system.variant "isp-full-generic")) }}
-{{- $kubevirtComponents := dict -}}
+{{- $kubevirtValues := dict -}}
 {{- if .Values.resources.cpuAllocationRatio -}}
-{{- $_ := set $kubevirtComponents "kubevirt" (dict "values" (dict "cpuAllocationRatio" (.Values.resources.cpuAllocationRatio | int))) -}}
+{{- $_ := set $kubevirtValues "cpuAllocationRatio" (.Values.resources.cpuAllocationRatio | int) -}}
+{{- end -}}
+{{- /*
+  Feature gates the cluster declines, forwarded verbatim. This include is the
+  only writer of the cozystack.kubevirt Package, and patching that Package by
+  hand is reverted the next time the platform re-renders it (see
+  docs/operations/backup-classes.md for the same trap on backupStorage), so
+  without this hop the chart value has no supported setter. The parenthesized
+  walk is nil-safe for the reason the gpu block below spells out.
+*/ -}}
+{{- $disabledFeatureGates := (.Values.kubevirt).disabledFeatureGates -}}
+{{- if $disabledFeatureGates -}}
+{{- $_ := set $kubevirtValues "disabledFeatureGates" $disabledFeatureGates -}}
+{{- end -}}
+{{- with (.Values.kubevirt).migrations -}}
+{{- $_ := set $kubevirtValues "migrations" . -}}
+{{- end -}}
+{{- /*
+  When cozystack.gpu-operator is enabled the platform mirrors the variant
+  into the KubeVirt CR: the HostDevices feature gate, without which the
+  admission webhook rejects any VM that references a host-device GPU by
+  resourceName, plus a permittedHostDevices block assembled per variant.
+  The platform's own tables are the passthrough one in the default
+  variant and the mdev one in vgpu behind gpu.vgpuDeviceManager.enabled;
+  gpu.replaceDefaults drops whichever would apply, and the operator's own
+  .gpu entries are appended on top (see the per-key comment below for
+  which key each variant reads). A vgpu cluster at stock values therefore
+  gets the gate and no device table. See docs/gpu-vgpu.md for the
+  user-facing knobs.
+
+  Both pieces are VM-facing and are emitted only for the two variants
+  that hand a GPU resource to a VM: default (the whole card, rebound to
+  vfio-pci) and vgpu (mdev profiles or SR-IOV VFs carved out by the host
+  vGPU driver). The container variant serves GPUs to ordinary pods
+  through the device plugin and runs no VM-facing GPU stack at all —
+  sandboxWorkloads and vfioManager are both off — so the gate would
+  advertise a capability the node cannot serve and the device table
+  would list resources no plugin ever registers there.
+*/ -}}
+{{- /*
+  Mirror the cozystack.platform.package.optional helper's enable/disable
+  semantics — disabledPackages wins over enabledPackages. A shared values
+  file may list gpu-operator under enabled but a per-cluster override
+  may push it into disabled; in that case the gpu-operator Package CR is
+  not emitted and the kubevirt CR must not carry GPU wiring either.
+*/ -}}
+{{- $gpuName := "cozystack.gpu-operator" -}}
+{{- $gpuEnabled := and (has $gpuName (default (list) .Values.bundles.enabledPackages)) (not (has $gpuName (default (list) .Values.bundles.disabledPackages))) -}}
+{{- $gpuVariant := .Values.bundles.iaas.gpuOperatorVariant | default "default" -}}
+{{- /*
+  The accepted set is the variant list of the cozystack.gpu-operator
+  PackageSource in sources/gpu-operator.yaml — default, vgpu, container.
+  A variant added there needs adding here too, or the bundle rejects a
+  value the package ships.
+
+  Validate up front, not behind $gpuEnabled — a typo like
+  gpuOperatorVariant: passthrough (instead of "default") would otherwise
+  render fine until someone flips gpu-operator into enabledPackages, at
+  which point the bundle breaks. Failing fast here surfaces the typo on
+  the first render after the values file changes.
+*/ -}}
+{{- if not (or (eq $gpuVariant "default") (eq $gpuVariant "vgpu") (eq $gpuVariant "container")) -}}
+{{- fail (printf "bundles.iaas.gpuOperatorVariant must be \"default\", \"vgpu\" or \"container\", got %q" $gpuVariant) -}}
+{{- end -}}
+{{- if and $gpuEnabled (ne $gpuVariant "container") }}
+{{- $_ := set $kubevirtValues "extraFeatureGates" (list "HostDevices") -}}
+{{- /*
+  Each .Values.gpu access is fully parenthesized — (((.Values.gpu).x).y) —
+  on purpose. Parenthesizing makes the field walk nil-safe: an operator may
+  null out the whole gpu block (gpu: null) or leave a sub-key blank
+  (permittedHostDevices: with no value parses to null), and Helm's
+  null-deletes-key coalescing then drops it from .Values. A bare
+  .Values.gpu.permittedHostDevices.pciHostDevices walk panics with
+  "nil pointer evaluating interface {}.permittedHostDevices" on the first
+  nil hop; the parenthesized form yields an invalid Value that `default`
+  absorbs instead. Do NOT flatten these into a bare dotted path — the
+  null-gpu cases in tests/bundles_gpu_kubevirt_wiring_test.yaml pin it.
+*/ -}}
+{{- $userPci := default (list) (((.Values.gpu).permittedHostDevices).pciHostDevices) -}}
+{{- $userMdev := default (list) (((.Values.gpu).permittedHostDevices).mediatedDevices) -}}
+{{- $userMdevConfig := default (dict) (.Values.gpu).mediatedDevicesConfiguration -}}
+{{- $replace := default false (.Values.gpu).replaceDefaults -}}
+{{- /*
+  pciHostDevices applies in both VM variants — passthrough (vfio-pci,
+  whole GPU) and post-kubevirt#16890 SR-IOV vGPU VFs (Ada Lovelace /
+  Blackwell with the vGPU 17/20 driver branch) both advertise via
+  pciHostDevices. The container variant never reaches this block.
+  mediatedDevices is vgpu-only: it EXPOSES, by stable profile name
+  (mdevNameSelector), the mdev devices the GPU Operator's vGPU Device
+  Manager creates on the node. Emitting it in the passthrough variant
+  would carry vGPU-only configuration into a CR that has no vGPU manager
+  deployed — a footgun for operators who keep a shared gpu values block
+  and flip the variant back to default.
+
+  mediatedDevicesConfiguration is intentionally NOT defaulted. Its
+  mediatedDeviceTypes entries are numeric nvidia-NNN ids that make
+  KubeVirt itself create mdevs — but those ids are per-(SKU, driver)
+  sysfs indices with no portable value, and mdev creation is already
+  handled by the vGPU Device Manager (name-based). It is therefore
+  emitted only from the .gpu.mediatedDevicesConfiguration override, for
+  operators who deliberately want KubeVirt to drive creation with
+  host-verified type ids.
+*/ -}}
+{{- $pci := list -}}
+{{- $mdev := list -}}
+{{- $mdevConfig := dict -}}
+{{- if eq $gpuVariant "default" -}}
+{{- if not $replace -}}
+{{- $defaults := $.Files.Get "files/gpu-passthrough-defaults.yaml" | fromYaml -}}
+{{- $pci = concat $pci $defaults.pciHostDevices -}}
+{{- end -}}
+{{- $pci = concat $pci $userPci -}}
+{{- else -}}
+{{- /*
+  The mediatedDevices defaults name the mdev profiles the vGPU Device
+  Manager creates; they are only useful when that DaemonSet is actually
+  deployed — without it, /sys/class/mdev_bus/ stays empty and the
+  rendered mediated resources can never become allocatable. Suppress the
+  platform mdev defaults when vgpuDeviceManager.enabled is false (the
+  case on Ada Lovelace / Blackwell SR-IOV); the operator can still set
+  their own mediated entries via .gpu.permittedHostDevices.
+*/ -}}
+{{- $deviceManagerOn := default false (((.Values.gpu).vgpuDeviceManager).enabled) -}}
+{{- if and (not $replace) $deviceManagerOn -}}
+{{- $vgpuDefaults := $.Files.Get "files/gpu-vgpu-defaults.yaml" | fromYaml -}}
+{{- $mdev = concat $mdev $vgpuDefaults.permittedHostDevices.mediatedDevices -}}
+{{- end -}}
+{{- $pci = concat $pci $userPci -}}
+{{- $mdev = concat $mdev $userMdev -}}
+{{- $mdevConfig = mergeOverwrite $mdevConfig $userMdevConfig -}}
+{{- end -}}
+{{- $permitted := dict -}}
+{{- if $pci -}}
+{{- $_ := set $permitted "pciHostDevices" $pci -}}
+{{- end -}}
+{{- if $mdev -}}
+{{- $_ := set $permitted "mediatedDevices" $mdev -}}
+{{- end -}}
+{{- if $permitted -}}
+{{- $_ := set $kubevirtValues "permittedHostDevices" $permitted -}}
+{{- end -}}
+{{- if $mdevConfig -}}
+{{- $_ := set $kubevirtValues "mediatedDevicesConfiguration" $mdevConfig -}}
+{{- end -}}
+{{- end -}}
+{{- $kubevirtComponents := dict -}}
+{{- if $kubevirtValues -}}
+{{- $_ := set $kubevirtComponents "kubevirt" (dict "values" $kubevirtValues) -}}
 {{- end -}}
 {{include "cozystack.platform.package" (list "cozystack.kubevirt" "default" $ $kubevirtComponents) }}
 {{include "cozystack.platform.package.default" (list "cozystack.kubevirt-cdi" $) }}
 {{include "cozystack.platform.package.optional.default" (list "cozystack.vm-default-images" $) }}
-{{include "cozystack.platform.package.optional.default" (list "cozystack.gpu-operator" $) }}
+{{- /*
+  Forward the platform-level worker image catalog overrides into the emitted
+  cozystack.kubernetes-worker-image Package CR's
+  components.kubernetes-worker-image.values, so the supported override path
+  on the cozystack-platform Package -- spec.components.platform.values.kubernetesWorkerImage
+  -- actually reaches that chart's HelmRelease. Same pattern as the kubevirt /
+  gpu-operator forwarding above and backupStorage in bundles/system.yaml. The
+  catalog's own knobs are the two the feature exists for: an air-gapped or
+  rate-limited cluster repoints imageFactoryURL, and a cluster whose worker pools
+  do not sit on `replicated` moves the golden onto their class -- without which
+  the pool-side StorageClass guard refuses the render while naming a fix the
+  operator cannot apply. Unset (the default) emits no components block and keeps
+  the Package identical to the historical render.
+*/ -}}
+{{- $workerImageComponents := dict -}}
+{{- if .Values.kubernetesWorkerImage -}}
+{{- $_ := set $workerImageComponents "kubernetes-worker-image" (dict "values" .Values.kubernetesWorkerImage) -}}
+{{- end -}}
+{{include "cozystack.platform.package.optional.default" (list "cozystack.kubernetes-worker-image" $ $workerImageComponents) }}
+{{- /*
+  Forward platform-level vGPU knobs into the emitted cozystack.gpu-operator
+  Package CR's components.gpu-operator.values. Only applies to the vgpu
+  variant — passthrough does not consume them. Each knob is forwarded
+  independently: the vgpuManager block ships if any of repository, version,
+  a non-default image, or imagePullSecrets is set (avoids the silent-drop
+  trap where a private registry needs imagePullSecrets but inherits the
+  upstream image tag); vgpuDeviceManager.enabled ships whenever the
+  operator set it (true on Pascal–Ampere mdev clusters, default false).
+*/ -}}
+{{- $gpuOperatorComponents := dict -}}
+{{- if and $gpuEnabled (eq $gpuVariant "vgpu") -}}
+{{- $gpuOperatorOverrides := dict -}}
+{{- $vgpuMgr := default (dict) (.Values.gpu).vgpuManager -}}
+{{- $imageCustomized := and (hasKey $vgpuMgr "image") (ne (default "" $vgpuMgr.image) "vgpu-manager") -}}
+{{- if or $vgpuMgr.repository $vgpuMgr.version $imageCustomized $vgpuMgr.imagePullSecrets -}}
+{{- $_ := set $gpuOperatorOverrides "vgpuManager" $vgpuMgr -}}
+{{- end -}}
+{{- if (((.Values.gpu).vgpuDeviceManager).enabled) -}}
+{{- $_ := set $gpuOperatorOverrides "vgpuDeviceManager" (dict "enabled" true) -}}
+{{- end -}}
+{{- if $gpuOperatorOverrides -}}
+{{- $_ := set $gpuOperatorComponents "gpu-operator" (dict "values" (dict "gpu-operator" $gpuOperatorOverrides)) -}}
+{{- end -}}
+{{- end -}}
+{{- if $gpuEnabled }}
+{{include "cozystack.platform.package" (list "cozystack.gpu-operator" $gpuVariant $ $gpuOperatorComponents) }}
+{{- end }}
 {{include "cozystack.platform.package.optional.default" (list "cozystack.hami" $) }}
 {{include "cozystack.platform.package.default" (list "cozystack.kamaji" $) }}
 {{include "cozystack.platform.package.default" (list "cozystack.capi-operator" $) }}
@@ -17,9 +218,76 @@
 {{include "cozystack.platform.package.default" (list "cozystack.capi-provider-core" $) }}
 {{include "cozystack.platform.package.default" (list "cozystack.capi-provider-cp-kamaji" $) }}
 {{include "cozystack.platform.package.default" (list "cozystack.capi-provider-infra-kubevirt" $) }}
-{{include "cozystack.platform.package.default" (list "cozystack.bucket-application" $) }}
+{{- /*
+  The Proxmox infrastructure provider is opt-in where the KubeVirt one is not,
+  and the asymmetry is not a matter of taste. capmox talks to a hypervisor that
+  lives outside this cluster, and it needs a capmox-config Secret holding a
+  Proxmox API token: capi-operator reads that Secret before it installs
+  anything, so with no Secret the provider is never deployed at all. Enabling
+  this by default would ask every Cozystack install that has no Proxmox to
+  supply hypervisor credentials.
+
+  Enable it by adding cozystack.capi-provider-infra-proxmox to
+  bundles.enabledPackages. The in-cluster IPAM provider comes with it, for the
+  reason written next to the dependsOn edge in
+  sources/capi-provider-infra-proxmox.yaml. IPAM is also independently
+  enableable — it is a generic Cluster API addon, useful to any provider that
+  assigns rather than leases.
+*/ -}}
+{{- $proxmoxName := "cozystack.capi-provider-infra-proxmox" -}}
+{{- $ipamName := "cozystack.capi-provider-ipam-in-cluster" -}}
+{{- $pkgDisabled := default (list) .Values.bundles.disabledPackages -}}
+{{- $pkgEnabled := default (list) .Values.bundles.enabledPackages -}}
+{{- $proxmoxEnabled := and (has $proxmoxName $pkgEnabled) (not (has $proxmoxName $pkgDisabled)) -}}
+{{- /*
+  Naming the pair in conflicting lists is the one case worth stopping for. The
+  cluster catches it on its own: the capmox PackageSource depends on the IPAM
+  Package, so with that Package absent the capmox one goes Ready=False with
+  DependenciesNotReady and no HelmRelease is created. What it does not do is
+  say why. Failing the render names the two list entries that conflict, at the
+  moment someone writes them, instead of leaving a condition to decode later.
+*/ -}}
+{{- if and $proxmoxEnabled (has $ipamName $pkgDisabled) -}}
+{{- fail (printf "%s requires %s, which is listed in bundles.disabledPackages: capmox allocates worker addresses from an InClusterIPPool and has no DHCP mode, so without the IPAM provider no ProxmoxCluster ever becomes Ready" $proxmoxName $ipamName) -}}
+{{- end -}}
+{{- if or $proxmoxEnabled (has $ipamName $pkgEnabled) }}
+{{include "cozystack.platform.package.default" (list $ipamName $) }}
+{{- end }}
+{{- if $proxmoxEnabled }}
+{{include "cozystack.platform.package.default" (list $proxmoxName $) }}
+{{- end }}
 {{include "cozystack.platform.package" (list "cozystack.kubernetes-application" "kubevirt" $) }}
+{{include "cozystack.platform.package" (list "cozystack.kubernetes-nodes-application" "kubevirt" $) }}
+{{include "cozystack.platform.package" (list "cozystack.computeplane-application" "kubevirt" $) }}
 {{include "cozystack.platform.package" (list "cozystack.virtualprivatecloud-application" "kubevirt" $) }}
 {{include "cozystack.platform.package" (list "cozystack.vm-disk-application" "kubevirt" $) }}
 {{include "cozystack.platform.package" (list "cozystack.vm-instance-application" "kubevirt" $) }}
+{{- /*
+  VM import is opt-in: the Forklift operator ships a large manifest with its own
+  CRDs and broad RBAC, and the migration controller holds cluster-wide access to
+  PersistentVolumes so it can hand a transferred volume to a VMDisk without
+  copying it. That surface is worth it for a cluster migrating off vSphere and
+  pure cost for every other iaas cluster, so add these three to
+  bundles.enabledPackages to turn it on.
+
+  The VDDK image travels here as configuration rather than living in the tree:
+  it is built from a proprietary VMware SDK that Cozystack can neither ship nor
+  mirror, so an operator who holds a licence builds it and names it in
+  vmImport.vddkImage. Only the reference travels, never a credential. Empty is
+  the normal state and makes the vSphere path report itself unavailable on each
+  VMImportSource instead of failing midway through a transfer.
+
+  The key is vmImport rather than migration because the platform already has a
+  top-level `migrations` for its own schema migrations, and two neighbouring
+  keys differing by one letter is a configuration mistake waiting to happen.
+*/ -}}
+{{- $migrationComponents := dict -}}
+{{- with .Values.vmImport -}}
+{{- with .vddkImage -}}
+{{- $_ := set $migrationComponents "migration-controller" (dict "values" (dict "vddkImage" .)) -}}
+{{- end -}}
+{{- end -}}
+{{include "cozystack.platform.package.optional.default" (list "cozystack.forklift-operator" $) }}
+{{include "cozystack.platform.package.optional.default" (list "cozystack.forklift" $) }}
+{{include "cozystack.platform.package.optional" (list "cozystack.migration-controller" "default" $ $migrationComponents) }}
 {{- end }}
diff --git a/packages/core/platform/templates/bundles/naas.yaml b/packages/core/platform/templates/bundles/naas.yaml
index 9682d44706..9c1eae4fbc 100644
--- a/packages/core/platform/templates/bundles/naas.yaml
+++ b/packages/core/platform/templates/bundles/naas.yaml
@@ -1,8 +1,13 @@
-{{- if and .Values.bundles.naas.enabled (not (or (eq .Values.bundles.system.variant "isp-full") (eq .Values.bundles.system.variant "isp-full-generic") (eq .Values.bundles.system.variant "isp-hosted"))) }}
-{{- fail "bundles.naas.enabled can only be true when bundles.system.variant is 'isp-full', 'isp-full-generic', or 'isp-hosted'" }}
+{{- if and .Values.bundles.naas.enabled (not (has .Values.bundles.system.variant (list "isp-full" "isp-full-generic" "isp-hosted" "isp-slim" "isp-slim-generic" "isp-hosted-slim"))) }}
+{{- fail "bundles.naas.enabled can only be true when bundles.system.variant is 'isp-full', 'isp-full-generic', 'isp-hosted', 'isp-slim', 'isp-slim-generic', or 'isp-hosted-slim'" }}
 {{- end }}
-{{- if and .Values.bundles.naas.enabled (or (eq .Values.bundles.system.variant "isp-full") (eq .Values.bundles.system.variant "isp-full-generic") (eq .Values.bundles.system.variant "isp-hosted")) }}
-{{include "cozystack.platform.package.default" (list "cozystack.http-cache-application" $) }}
-{{include "cozystack.platform.package.default" (list "cozystack.tcp-balancer-application" $) }}
-{{include "cozystack.platform.package.default" (list "cozystack.vpn-application" $) }}
+{{- /* See the matching guard in paas.yaml: a valid bundles.system.variant does not
+       imply the system bundle is actually emitted, and every package below depends
+       on its control-plane body. */ -}}
+{{- if and .Values.bundles.naas.enabled (not .Values.bundles.system.enabled) }}
+{{- fail "bundles.naas.enabled requires bundles.system.enabled: the naas catalog depends on packages emitted by the system bundle (cozystack.cozystack-engine, which ships the ApplicationDefinition CRD, plus cozystack.networking). To run a hosted platform where the host provides CNI, storage and virtualisation, keep bundles.system.enabled: true and set bundles.system.variant: isp-hosted (which selects a noop networking Package) with bundles.iaas.enabled: false — do not disable the system bundle." }}
+{{- end }}
+{{- if and .Values.bundles.naas.enabled (has .Values.bundles.system.variant (list "isp-full" "isp-full-generic" "isp-hosted" "isp-slim" "isp-slim-generic" "isp-hosted-slim")) }}
+{{include "cozystack.platform.package.full.default" (list "cozystack.tcp-balancer-application" $) }}
+{{include "cozystack.platform.package.full.default" (list "cozystack.vpn-application" $) }}
 {{- end }}
diff --git a/packages/core/platform/templates/bundles/paas.yaml b/packages/core/platform/templates/bundles/paas.yaml
index 157f5b40f0..585d95e500 100644
--- a/packages/core/platform/templates/bundles/paas.yaml
+++ b/packages/core/platform/templates/bundles/paas.yaml
@@ -1,26 +1,37 @@
-{{- if and .Values.bundles.paas.enabled (not (or (eq .Values.bundles.system.variant "isp-full") (eq .Values.bundles.system.variant "isp-full-generic") (eq .Values.bundles.system.variant "isp-hosted"))) }}
-{{- fail "bundles.paas.enabled can only be true when bundles.system.variant is 'isp-full', 'isp-full-generic', or 'isp-hosted'" }}
+{{- if and .Values.bundles.paas.enabled (not (has .Values.bundles.system.variant (list "isp-full" "isp-full-generic" "isp-hosted" "isp-slim" "isp-slim-generic" "isp-hosted-slim"))) }}
+{{- fail "bundles.paas.enabled can only be true when bundles.system.variant is 'isp-full', 'isp-full-generic', 'isp-hosted', 'isp-slim', 'isp-slim-generic', or 'isp-hosted-slim'" }}
 {{- end }}
-{{- if and .Values.bundles.paas.enabled (or (eq .Values.bundles.system.variant "isp-full") (eq .Values.bundles.system.variant "isp-full-generic") (eq .Values.bundles.system.variant "isp-hosted")) }}
-{{include "cozystack.platform.package.default" (list "cozystack.mariadb-operator" $) }}
-{{include "cozystack.platform.package.default" (list "cozystack.kafka-operator" $) }}
-{{include "cozystack.platform.package.default" (list "cozystack.clickhouse-operator" $) }}
-{{include "cozystack.platform.package.default" (list "cozystack.foundationdb-operator" $) }}
-{{include "cozystack.platform.package.default" (list "cozystack.rabbitmq-operator" $) }}
-{{include "cozystack.platform.package.default" (list "cozystack.redis-operator" $) }}
-{{include "cozystack.platform.package.default" (list "cozystack.mongodb-operator" $) }}
-{{include "cozystack.platform.package.default" (list "cozystack.opensearch-operator" $) }}
-{{include "cozystack.platform.package.default" (list "cozystack.clickhouse-application" $) }}
-{{include "cozystack.platform.package.default" (list "cozystack.foundationdb-application" $) }}
-{{include "cozystack.platform.package.default" (list "cozystack.harbor-application" $) }}
-{{include "cozystack.platform.package.default" (list "cozystack.kafka-application" $) }}
-{{include "cozystack.platform.package.default" (list "cozystack.mariadb-application" $) }}
-{{include "cozystack.platform.package.default" (list "cozystack.mongodb-application" $) }}
-{{include "cozystack.platform.package.default" (list "cozystack.nats-application" $) }}
-{{include "cozystack.platform.package.default" (list "cozystack.openbao-application" $) }}
-{{include "cozystack.platform.package.default" (list "cozystack.opensearch-application" $) }}
-{{include "cozystack.platform.package.default" (list "cozystack.postgres-application" $) }}
-{{include "cozystack.platform.package.default" (list "cozystack.qdrant-application" $) }}
-{{include "cozystack.platform.package.default" (list "cozystack.rabbitmq-application" $) }}
-{{include "cozystack.platform.package.default" (list "cozystack.redis-application" $) }}
+{{- /* The variant check above is not sufficient: bundles.system.variant keeps its
+       value when bundles.system.enabled is false, so a preset could select a valid
+       variant and still skip the whole system bundle. Every package below depends on
+       the system bundle's control-plane body, so that combination renders an app
+       catalog whose entire dependency closure is absent — each Package then sits in
+       DependenciesNotReady forever and the cozystack-platform HelmRelease never goes
+       Ready, with no error pointing at the cause. Fail the render instead. */ -}}
+{{- if and .Values.bundles.paas.enabled (not .Values.bundles.system.enabled) }}
+{{- fail "bundles.paas.enabled requires bundles.system.enabled: the paas catalog depends on packages emitted by the system bundle (cozystack.cozystack-engine, which ships the ApplicationDefinition CRD, plus cozystack.networking, cozystack.cert-manager, cozystack.prometheus-operator-crds, cozystack.postgres-operator and cozystack.objectstorage-controller). To run a hosted platform where the host provides CNI, storage and virtualisation, keep bundles.system.enabled: true and set bundles.system.variant: isp-hosted (which selects a noop networking Package) with bundles.iaas.enabled: false — do not disable the system bundle." }}
+{{- end }}
+{{- if and .Values.bundles.paas.enabled (has .Values.bundles.system.variant (list "isp-full" "isp-full-generic" "isp-hosted" "isp-slim" "isp-slim-generic" "isp-hosted-slim")) }}
+{{include "cozystack.platform.package.full.default" (list "cozystack.mariadb-operator" $) }}
+{{include "cozystack.platform.package.full.default" (list "cozystack.kafka-operator" $) }}
+{{include "cozystack.platform.package.full.default" (list "cozystack.clickhouse-operator" $) }}
+{{include "cozystack.platform.package.full.default" (list "cozystack.foundationdb-operator" $) }}
+{{include "cozystack.platform.package.full.default" (list "cozystack.rabbitmq-operator" $) }}
+{{include "cozystack.platform.package.full.default" (list "cozystack.redis-operator" $) }}
+{{include "cozystack.platform.package.full.default" (list "cozystack.mongodb-operator" $) }}
+{{include "cozystack.platform.package.full.default" (list "cozystack.opensearch-operator" $) }}
+{{include "cozystack.platform.package.full.default" (list "cozystack.clickhouse-application" $) }}
+{{include "cozystack.platform.package.full.default" (list "cozystack.foundationdb-application" $) }}
+{{include "cozystack.platform.package.full.default" (list "cozystack.harbor-application" $) }}
+{{include "cozystack.platform.package.full.default" (list "cozystack.kafka-application" $) }}
+{{include "cozystack.platform.package.full.default" (list "cozystack.mariadb-application" $) }}
+{{include "cozystack.platform.package.full.default" (list "cozystack.mongodb-application" $) }}
+{{include "cozystack.platform.package.full.default" (list "cozystack.nats-application" $) }}
+{{include "cozystack.platform.package.full.default" (list "cozystack.openbao-application" $) }}
+{{include "cozystack.platform.package.full.default" (list "cozystack.opensearch-application" $) }}
+{{include "cozystack.platform.package.full.default" (list "cozystack.postgres-application" $) }}
+{{include "cozystack.platform.package.full.default" (list "cozystack.qdrant-application" $) }}
+{{include "cozystack.platform.package.full.default" (list "cozystack.rabbitmq-application" $) }}
+{{include "cozystack.platform.package.full.default" (list "cozystack.redis-application" $) }}
+{{include "cozystack.platform.package.full.default" (list "cozystack.valkey-application" $) }}
 {{- end }}
diff --git a/packages/core/platform/templates/bundles/system.yaml b/packages/core/platform/templates/bundles/system.yaml
index 9528cffe40..b726a77ea3 100644
--- a/packages/core/platform/templates/bundles/system.yaml
+++ b/packages/core/platform/templates/bundles/system.yaml
@@ -1,7 +1,7 @@
 {{- if .Values.bundles.system.enabled }}
 
 # Networking
-{{- if eq .Values.bundles.system.variant "isp-full" }}
+{{- if has .Values.bundles.system.variant (list "isp-full" "isp-slim") }}
 {{- $networkingComponents := dict -}}
 {{- if .Values.networking -}}
 {{- $kubeovnIpv4 := dict
@@ -13,27 +13,62 @@
 {{- if .Values.networking.kubeovn.MASTER_NODES -}}
 {{- $_ := set $kubeovnDict "MASTER_NODES" .Values.networking.kubeovn.MASTER_NODES -}}
 {{- end -}}
-{{- $kubeovnValues := dict "kube-ovn" $kubeovnDict -}}
-{{- $_ := set $networkingComponents "kubeovn" (dict "values" $kubeovnValues) -}}
-{{- /* For Talos (isp-full): use KubePrism endpoint and disable cgroup autoMount */ -}}
-{{- $ciliumValues := dict "cilium" (dict
+{{- /* Opt-in east-west encryption (networking.encryption.enabled): on the
+       default kubeovn-cilium datapath the overlay is KubeOVN's Geneve
+       tunnel, so encrypting it means turning on KubeOVN IPsec. KubeOVN's
+       own controller provisions the IPsec CA and per-node certs through
+       the Kubernetes CSR API — no cert-manager wiring needed here. Off by
+       default; complements (does not replace) application-level TLS. */ -}}
+{{- if dig "encryption" "enabled" false .Values.networking -}}
+{{- $_ := set $kubeovnDict "func" (dict "ENABLE_OVN_IPSEC" true) -}}
+{{- end -}}
+{{- /* For Talos (isp-full, isp-slim): use KubePrism endpoint and disable cgroup autoMount */ -}}
+{{- /* gateway.http2 is threaded explicitly in BOTH states: inline HelmRelease
+       values override the system/cilium valuesFiles default (enableAlpn: true),
+       so an operator's http2: false actually reaches the dataplane. */ -}}
+{{- $cilium := dict
   "k8sServiceHost" "localhost"
   "k8sServicePort" "7445"
-  "cgroup" (dict "autoMount" (dict "enabled" false))) -}}
+  "cgroup" (dict "autoMount" (dict "enabled" false))
+  "gatewayAPI" (dict "enableAlpn" .Values.gateway.http2) -}}
+{{- /* Cilium's own addresses come from a block of the pod CIDR that kube-ovn
+       does not hand out, see cozystack.platform.ciliumPool. The slim variants
+       run no kube-ovn and keep Cilium allocating pods from Node.spec.podCIDR. */ -}}
+{{- if not (include "cozystack.platform.slim" $) -}}
+{{- $_ := set $kubeovnDict "networking" (dict "EXCLUDE_IPS" (include "cozystack.platform.ciliumPoolRange" .Values.networking.podCIDR)) -}}
+{{- $_ := set $cilium "ipam" (dict "operator" (dict "clusterPoolIPv4PodCIDRList" (list (include "cozystack.platform.ciliumPool" .Values.networking.podCIDR)))) -}}
+{{- end -}}
+{{- $kubeovnValues := dict "kube-ovn" $kubeovnDict -}}
+{{- $_ := set $networkingComponents "kubeovn" (dict "values" $kubeovnValues) -}}
+{{- $ciliumValues := dict "cilium" $cilium -}}
 {{- $_ := set $networkingComponents "cilium" (dict "values" $ciliumValues) -}}
 {{- end -}}
-{{include "cozystack.platform.package" (list "cozystack.networking" "kubeovn-cilium" $ $networkingComponents) }}
+{{include "cozystack.platform.package.networking" (list $ $networkingComponents "kubeovn-cilium" "cilium") }}
 {{include "cozystack.platform.system.common-packages" $ }}
+{{- /* Talos bundles only bridge, firewall, flannel, host-local, loopback and
+       portmap in /opt/cni/bin from its own node image; the other ten this
+       package carries are not there, so a NetworkAttachmentDefinition naming
+       macvlan, ipvlan or vlan fails on Talos exactly as it does on generic
+       Linux. Staging is therefore on here too. The four names that overlap are
+       rewritten on every pod recreation with the SAME upstream version --
+       Talos pins containernetworking/plugins v1.9.1 in siderolabs/pkgs and so
+       do we -- so this is not a downgrade of a system component; see the
+       talos-cni-plugins-checked-against marker in the multus image Dockerfile.
+       networking.stageCniPlugins turns it off, for nodes whose operator
+       manages that directory. The value is always emitted rather than left to
+       the chart default, so the rendered Package states which way it went. */ -}}
+{{- $multusComponents := dict "multus" (dict "values" (include "cozystack.platform.multus.values" (list $ true) | fromYaml)) -}}
+{{include "cozystack.platform.package.full" (list "cozystack.multus" "default" $ $multusComponents) }}
 {{include "cozystack.platform.package.default" (list "cozystack.linstor" $) }}
 {{include "cozystack.platform.package" (list "cozystack.cozystack-scheduler" "linstor" $) }}
 {{- end }}
 
-{{- if eq .Values.bundles.system.variant "isp-hosted" }}
+{{- if has .Values.bundles.system.variant (list "isp-hosted" "isp-hosted-slim") }}
 {{include "cozystack.platform.package" (list "cozystack.networking" "noop" $) }}
 {{include "cozystack.platform.package.default" (list "cozystack.cozystack-scheduler" $) }}
 {{- end }}
 
-{{- if eq .Values.bundles.system.variant "isp-full-generic" }}
+{{- if has .Values.bundles.system.variant (list "isp-full-generic" "isp-slim-generic") }}
 {{- $networkingComponents := dict -}}
 {{- if .Values.networking -}}
 {{- /* Parse apiServerEndpoint URL for generic k8s (used by both Cilium and KubeOVN) */ -}}
@@ -79,18 +114,43 @@
 {{- end -}}
 {{- /* For generic k8s (k3s), control-plane label has value "true" */ -}}
 {{- $_ := set $kubeovnDict "MASTER_NODES_LABEL" "node-role.kubernetes.io/control-plane=true" -}}
-{{- $kubeovnValues := dict "kube-ovn" $kubeovnDict -}}
-{{- $_ := set $networkingComponents "kubeovn" (dict "values" $kubeovnValues) -}}
+{{- /* Opt-in east-west encryption (networking.encryption.enabled): same
+       KubeOVN Geneve-overlay IPsec path as isp-full. See the isp-full
+       branch above for the mechanism notes. */ -}}
+{{- if dig "encryption" "enabled" false .Values.networking -}}
+{{- $_ := set $kubeovnDict "func" (dict "ENABLE_OVN_IPSEC" true) -}}
+{{- end -}}
 {{- /* Cilium configuration - for generic k8s, always enable cgroup autoMount */ -}}
-{{- $ciliumValues := dict "cilium" (dict
+{{- /* gateway.http2 threading: same rationale as the isp-full branch above. */ -}}
+{{- $cilium := dict
   "k8sServiceHost" $apiHost
   "k8sServicePort" $apiPort
-  "cgroup" (dict "autoMount" (dict "enabled" true))) -}}
+  "cgroup" (dict "autoMount" (dict "enabled" true))
+  "gatewayAPI" (dict "enableAlpn" .Values.gateway.http2) -}}
+{{- /* Cilium's address block, same as the isp-full branch above, from the pod
+       CIDR the cluster actually runs with. */ -}}
+{{- if not (include "cozystack.platform.slim" $) -}}
+{{- $_ := set $kubeovnDict "networking" (dict "EXCLUDE_IPS" (include "cozystack.platform.ciliumPoolRange" $podCIDR)) -}}
+{{- $_ := set $cilium "ipam" (dict "operator" (dict "clusterPoolIPv4PodCIDRList" (list (include "cozystack.platform.ciliumPool" $podCIDR)))) -}}
+{{- end -}}
+{{- $kubeovnValues := dict "kube-ovn" $kubeovnDict -}}
+{{- $_ := set $networkingComponents "kubeovn" (dict "values" $kubeovnValues) -}}
+{{- $ciliumValues := dict "cilium" $cilium -}}
 {{- $_ := set $networkingComponents "cilium" (dict "values" $ciliumValues) -}}
 {{- end -}}
-{{- /* Use kubeovn-cilium-generic variant (no values-talos.yaml) */ -}}
-{{include "cozystack.platform.package" (list "cozystack.networking" "kubeovn-cilium-generic" $ $networkingComponents) }}
+{{- /* Use kubeovn-cilium-generic / cilium-generic (no values-talos.yaml) */ -}}
+{{include "cozystack.platform.package.networking" (list $ $networkingComponents "kubeovn-cilium-generic" "cilium-generic") }}
 {{include "cozystack.platform.system.common-packages" $ }}
+{{- /* multus staging: same default as the isp-full branch above, and here the
+       gap is wider -- generic Linux has no guarantee that /opt/cni/bin holds
+       any of the reference plugins, since k3s keeps its copies elsewhere and
+       Cilium installs only cilium-cni + loopback. Where staging runs it
+       installs on every pod recreation rather than only when a file is absent:
+       that rewrite is the only path a later plugin version has onto an existing
+       node, so installing only when absent would pin each node to whichever
+       version arrived there first. */ -}}
+{{- $multusComponents := dict "multus" (dict "values" (include "cozystack.platform.multus.values" (list $ true) | fromYaml)) -}}
+{{include "cozystack.platform.package.full" (list "cozystack.multus" "default" $ $multusComponents) }}
 {{- /* Pass talos.enabled: false to linstor for generic Linux */ -}}
 {{- $linstorComponents := dict "linstor" (dict "values" (dict "talos" (dict "enabled" false))) -}}
 {{include "cozystack.platform.package" (list "cozystack.linstor" "default" $ $linstorComponents) }}
@@ -100,12 +160,24 @@
 # Cozystack Engine
 {{- $cozystackEngineComponents := dict -}}
 {{- /* For generic k8s, DaemonSets with control-plane nodeSelector need value "true" */ -}}
-{{- if eq .Values.bundles.system.variant "isp-full-generic" -}}
+{{- if has .Values.bundles.system.variant (list "isp-full-generic" "isp-slim-generic") -}}
 {{- $genericNodeSelector := dict "node-role.kubernetes.io/control-plane" "true" -}}
 {{- /* cozystack-api DaemonSet */ -}}
 {{- $apiValues := dict "cozystackAPI" (dict "nodeSelector" $genericNodeSelector) -}}
 {{- $_ := set $cozystackEngineComponents "cozystack-api" (dict "values" $apiValues) -}}
 {{- end -}}
+{{- /* Telemetry is collected by TWO components: cozystack-operator (cluster
+       facts) and cozystack-controller (application counts). The operator is
+       switched off at install time via cozystackOperator.disableTelemetry on
+       the cozy-installer chart, which cannot reach a package deployed by the
+       platform. Threading it here gives the controller half of the opt-out a
+       platform-level key, so `telemetry.disabled: true` plus the installer
+       flag silences both. Without this, an operator who followed the
+       documented opt-out kept sending cozy_application_count. */ -}}
+{{- if .Values.telemetry.disabled -}}
+{{- $controllerValues := dict "cozystackController" (dict "disableTelemetry" true) -}}
+{{- $_ := set $cozystackEngineComponents "cozystack-controller" (dict "values" $controllerValues) -}}
+{{- end -}}
 {{- if .Values.authentication.oidc.enabled }}
 {{include "cozystack.platform.package" (list "cozystack.cozystack-engine" "oidc" $ $cozystackEngineComponents) }}
 {{include "cozystack.platform.package.default" (list "cozystack.keycloak" $) }}
@@ -116,8 +188,25 @@
 
 # Common Packages
 {{include "cozystack.platform.package.default" (list "cozystack.gateway-api-crds" $) }}
-{{include "cozystack.platform.package.default" (list "cozystack.cert-manager" $) }}
-{{- /* Disable hazard guard. The vendored cozy-ouroboros chart (0.7.0)
+{{- /* The ClusterIssuers of cert-manager-issuers and the per-tenant Issuers
+       rendered for TenantGateway both use an http01.gatewayHTTPRoute solver
+       when the Gateway is enabled, and the controller refuses that solver
+       unless Gateway API support is switched on: every such challenge fails
+       with "gateway api is not enabled" and no certificate is issued. Safe to
+       switch on for every host variant because cozystack.gateway-api-crds is
+       emitted above unconditionally and the cert-manager source depends on
+       it. Threaded here rather than set as a default of system/cert-manager:
+       the same chart is installed into tenant clusters, where the CRDs are an
+       opt-in addon and a controller started with enableGatewayAPI and no
+       CRDs exits at startup. */ -}}
+{{- $certManagerConfig := dict
+  "apiVersion" "controller.config.cert-manager.io/v1alpha1"
+  "kind" "ControllerConfiguration"
+  "enableGatewayAPI" true -}}
+{{- $certManagerValues := dict "cert-manager" (dict "config" $certManagerConfig) -}}
+{{- $certManagerComponents := dict "cert-manager" (dict "values" $certManagerValues) -}}
+{{include "cozystack.platform.package" (list "cozystack.cert-manager" "default" $ $certManagerComponents) }}
+{{- /* Disable hazard guard. The vendored cozy-ouroboros chart (0.8.0)
        ships a pre-delete Helm hook that sed-strips the BEGIN/END
        block from kube-system/coredns Corefile when the chart is
        actually uninstalled — so the cleanup is automatic in the
@@ -129,11 +218,14 @@
        present-on-cluster Package. ouroboros keeps running, the
        cleanup hook never fires, the rewrite block stays live. The
        operator must `kubectl delete package.cozystack.io
-       cozystack.ouroboros` (or add the package to
-       bundles.disabledPackages) for the chart to actually uninstall
-       and the hook to actually clean up. This guard fails the render
-       on the dangerous transition path so the operator confirms
-       they understand the asymmetry by setting
+       cozystack.ouroboros` for the chart to actually uninstall and
+       the hook to actually clean up. Adding the name to
+       bundles.disabledPackages is not a second path to that: it only
+       stops _helpers.tpl emitting the Package document, which is the
+       same suppression the flag flip already performs, and
+       resource-policy: keep leaves the live Package running. This
+       guard fails the render on the dangerous transition path so the
+       operator confirms they understand the asymmetry by setting
        publishing.proxyProtocolAcknowledgeUnclean: true.
        Known hole: an operator who manually `kubectl delete package
        cozystack.ouroboros` before flipping the flag back bypasses the
@@ -157,69 +249,142 @@
        CrashLoop the controller on WaitForCacheSync against missing
        GVRs. Operators on hosts that do install Gateway-API CRDs out
        of band can enable it via the standard Package values override. */ -}}
-{{include "cozystack.platform.package.default" (list "cozystack.ouroboros" $) }}
+{{- /* Point the ouroboros proxy at the HOST ingress-nginx Service. The
+       wrapper chart default (cozy-ingress-nginx / ingress-nginx-controller)
+       describes a managed Kubernetes tenant cluster, NOT the host: on the
+       host, extra/ingress deploys ingress-nginx into the root tenant
+       namespace (publishing.ingressName, default tenant-root) with
+       fullnameOverride <short>-ingress, yielding the controller Service
+       <short>-ingress-controller (e.g. root-ingress-controller). Derive
+       namespace + serviceName from publishing.ingressName so a non-default
+       ingress name still resolves; mirror the trimPrefix "tenant-"
+       transform extra/ingress applies to .Release.Namespace. */ -}}
+{{- $ingressNs := .Values.publishing.ingressName | default "tenant-root" -}}
+{{- $ingressSvc := printf "%s-ingress-controller" (trimPrefix "tenant-" $ingressNs) -}}
+{{- $ouroborosTarget := dict "namespace" $ingressNs "serviceName" $ingressSvc -}}
+{{- $ouroborosValues := dict "ouroboros" (dict "proxy" (dict "target" $ouroborosTarget)) -}}
+{{- $ouroborosComponents := dict "ouroboros" (dict "values" $ouroborosValues) -}}
+{{include "cozystack.platform.package" (list "cozystack.ouroboros" "default" $ $ouroborosComponents) }}
 {{- end }}
 {{include "cozystack.platform.package.default" (list "cozystack.flux-plunger" $) }}
+{{include "cozystack.platform.package.default" (list "cozystack.flux-shard-operator" $) }}
 {{include "cozystack.platform.package.default" (list "cozystack.victoria-metrics-operator" $) }}
 {{- $tenantComponents := dict -}}
 {{- $tenantClusterValues := dict "_cluster" (dict "oidc-enabled" (ternary "true" "false" .Values.authentication.oidc.enabled)) -}}
 {{- $_ := set $tenantComponents "tenant" (dict "values" $tenantClusterValues) }}
-{{include "cozystack.platform.package" (list "cozystack.tenant-application" "default" $ $tenantComponents) }}
-{{- $ingressComponents := dict -}}
-{{- if .Values.publishing.proxyProtocol }}
-{{- /* PROXY-protocol carries the real client IP at L4 before HTTP
-       parsing — `real-ip-header: proxy_protocol` + `enable-real-ip:
-       true` are the source of truth for $remote_addr.
-       use-forwarded-headers / compute-full-forwarded-for are
-       deliberately NOT injected here: with PROXY-protocol providing
-       the source IP, X-Forwarded-For from the LB-to-ingress hop is
-       redundant, AND turning on use-forwarded-headers without a
-       paired proxy-real-ip-cidr makes nginx trust X-Forwarded-For
-       from any source, letting clients spoof their own source IP.
-       Operators with a Cloudflare/CloudFront-style proxy in front
-       of the L4 LB that does carry X-Forwarded-* legitimately can
-       layer that in via Package values override (with the matching
-       proxy-real-ip-cidr range). */ -}}
-{{- $proxyProtoConfig := dict
-  "use-proxy-protocol" "true"
-  "real-ip-header" "proxy_protocol"
-  "enable-real-ip" "true" -}}
-{{- $ingressNginxValues := dict "ingress-nginx" (dict "controller" (dict "config" $proxyProtoConfig)) -}}
-{{- $_ := set $ingressComponents "ingress-system" (dict "values" $ingressNginxValues) -}}
-{{- end }}
-{{include "cozystack.platform.package" (list "cozystack.ingress-application" "default" $ $ingressComponents) }}
+{{- /* The default variant waits on monitoring, etcd and seaweedfs applications,
+       which the slim variants do not emit. */ -}}
+{{- $tenantVariant := ternary "slim" "default" (eq (include "cozystack.platform.slim" $) "true") }}
+{{include "cozystack.platform.package" (list "cozystack.tenant-application" $tenantVariant $ $tenantComponents) }}
+{{- /* PROXY-protocol on the host ingress-nginx is delivered via
+       _cluster.proxy-protocol in the cozystack-values Secret (see
+       templates/apps.yaml) and applied by the extra/ingress chart to the
+       external-facing ingress. It does NOT ride on this Package's component
+       values: the ingress-system / ingress components have no install: block,
+       so PackageReconciler never builds a HelmRelease for them and never
+       consumes their values. */ -}}
+{{include "cozystack.platform.package.default" (list "cozystack.ingress-application" $) }}
 {{include "cozystack.platform.package.default" (list "cozystack.gateway-application" $) }}
-{{include "cozystack.platform.package.default" (list "cozystack.seaweedfs-application" $) }}
+{{include "cozystack.platform.package.full.default" (list "cozystack.seaweedfs-application" $) }}
 {{include "cozystack.platform.package.default" (list "cozystack.info-application" $) }}
-{{include "cozystack.platform.package.default" (list "cozystack.monitoring-application" $) }}
-{{include "cozystack.platform.package.default" (list "cozystack.etcd-application" $) }}
+{{- /* Variant selection mirrors cozystack-engine above: `oidc` when
+       platform-level OIDC is on (extra dependsOn on
+       cozystack.keycloak-operator so the v1.edp.epam.com CRDs are
+       registered before the monitoring chart reconciles), `default`
+       otherwise (no wait on a Package that would not be emitted).
+
+       No component-values override is passed. The platform Grafana's
+       HelmRelease is created by the tenant-root chart's
+       templates/monitoring.yaml (not by PackageReconciler over the
+       monitoring-system component here — that component has no
+       `install:` block), so `Package.spec.components[].values` here
+       would be silently dropped by the reconciler
+       (internal/operator/package_reconciler.go:197-201 skips
+       components without `install:` before ever reaching the
+       hr.Spec.Values assignment). Server-level GrafanaAdmin
+       promotion is out of scope for Phase 1; see
+       docs/oidc-grafana.md. */}}
+{{- if .Values.authentication.oidc.enabled }}
+{{include "cozystack.platform.package.full" (list "cozystack.monitoring-application" "oidc" $) }}
+{{- else }}
+{{include "cozystack.platform.package.full" (list "cozystack.monitoring-application" "default" $) }}
+{{- end }}
+{{include "cozystack.platform.package.full.default" (list "cozystack.etcd-application" $) }}
 {{include "cozystack.platform.package.default" (list "cozystack.cozystack-basics" $) }}
-{{include "cozystack.platform.package.default" (list "cozystack.backupstrategy-controller" $) }}
-{{include "cozystack.platform.package.default" (list "cozystack.backup-controller" $) }}
-{{include "cozystack.platform.package.default" (list "cozystack.vertical-pod-autoscaler" $) }}
-{{include "cozystack.platform.package.default" (list "cozystack.metrics-server" $) }}
+{{- /*
+  Forward admin backupStorage overrides (endpoint, region, systemSecretName, …)
+  into the emitted cozystack.backupstrategy-controller Package CR's
+  components.backupstrategy-controller.values, so the supported override path
+  on the cozystack-platform Package — spec.components.platform.values.backupStorage —
+  actually reaches the backupstrategy-controller HelmRelease (#3245). Same
+  pattern as the kubevirt / gpu-operator forwarding in bundles/iaas.yaml. The
+  components block is only rendered when the admin set something, so an unset
+  backupStorage keeps the emitted Package identical to the historical render.
+*/ -}}
+{{- $backupStrategyValues := dict -}}
+{{- if .Values.backupStorage -}}
+{{- $_ := set $backupStrategyValues "backupStorage" .Values.backupStorage -}}
+{{- end -}}
+{{- if .Values.backupStrategyController -}}
+{{- $_ := set $backupStrategyValues "backupStrategyController" .Values.backupStrategyController -}}
+{{- end -}}
+{{- $backupStrategyComponents := dict -}}
+{{- if $backupStrategyValues -}}
+{{- $_ := set $backupStrategyComponents "backupstrategy-controller" (dict "values" $backupStrategyValues) -}}
+{{- end -}}
+{{include "cozystack.platform.package.full" (list "cozystack.backupstrategy-controller" "default" $ $backupStrategyComponents) }}
+{{include "cozystack.platform.package.full.default" (list "cozystack.backup-controller" $) }}
+{{- /* velero must be emitted wherever backupstrategy-controller is: the latter
+hard-depends on cozystack.velero, so a missing velero leaves the
+backupstrategy-controller Package permanently DependenciesNotReady and the
+cozystack-platform HelmRelease never becomes Ready. Both are default on the full
+variants and opt-in on the slim ones. */}}
+{{include "cozystack.platform.package.full.default" (list "cozystack.velero" $) }}
+{{include "cozystack.platform.package.full.default" (list "cozystack.vertical-pod-autoscaler" $) }}
+{{include "cozystack.platform.package.full.default" (list "cozystack.metrics-server" $) }}
 {{- $monitoringAgentsComponents := dict "monitoring-agents" (dict "values" (dict "global" (dict "target" "tenant-root"))) -}}
-{{include "cozystack.platform.package" (list "cozystack.monitoring-agents" "default" $ $monitoringAgentsComponents) }}
-{{include "cozystack.platform.package.default" (list "cozystack.goldpinger" $) }}
+{{include "cozystack.platform.package.full" (list "cozystack.monitoring-agents" "default" $ $monitoringAgentsComponents) }}
+{{include "cozystack.platform.package.full.default" (list "cozystack.goldpinger" $) }}
 {{include "cozystack.platform.package.default" (list "cozystack.prometheus-operator-crds" $) }}
-{{include "cozystack.platform.package.default" (list "cozystack.grafana-operator" $) }}
-{{include "cozystack.platform.package.default" (list "cozystack.etcd-operator" $) }}
+{{include "cozystack.platform.package.full.default" (list "cozystack.grafana-operator" $) }}
+{{include "cozystack.platform.package.full.default" (list "cozystack.etcd-operator" $) }}
+{{- /* keycloak depends on postgres-operator, so OIDC keeps it on the slim variants too. */ -}}
+{{- if .Values.authentication.oidc.enabled }}
 {{include "cozystack.platform.package.default" (list "cozystack.postgres-operator" $) }}
+{{- else }}
+{{include "cozystack.platform.package.full.default" (list "cozystack.postgres-operator" $) }}
+{{- end }}
+{{/* Always on, the slim variants included: cozystack-controller watches
+       BucketClaim unconditionally, and without this CRD its manager never
+       finishes syncing caches and crash-loops. */ -}}
 {{include "cozystack.platform.package.default" (list "cozystack.objectstorage-controller" $) }}
+{{- /* bucket-application belongs to the system bundle, not iaas: its own
+       dependsOn closure is cozystack.networking + cozystack.objectstorage-controller
+       + cozystack.cozystack-engine, all emitted here, and nothing in it needs
+       KubeVirt or CAPI. It sat in the iaas bundle while cozystack.backupstrategy-controller
+       — a *default* package of this bundle — hard-depends on it, so every
+       system-on/iaas-off configuration (i.e. isp-hosted) left
+       backupstrategy-controller permanently DependenciesNotReady. Both isp-full
+       presets masked that by enabling iaas. Same reasoning as the velero comment
+       above: a hard dependency of a default package must itself be emitted
+       wherever that default package is. */ -}}
+{{include "cozystack.platform.package.full.default" (list "cozystack.bucket-application" $) }}
 
 # Optional System Packages (controlled via bundles.enabledPackages)
 {{include "cozystack.platform.package.optional.default" (list "cozystack.nfs-driver" $) }}
+{{include "cozystack.platform.package.optional.default" (list "cozystack.local-storage" $) }}
 {{include "cozystack.platform.package.optional.default" (list "cozystack.telepresence" $) }}
 {{include "cozystack.platform.package.optional.default" (list "cozystack.external-dns" $) }}
 {{include "cozystack.platform.package.optional.default" (list "cozystack.external-dns-application" $) }}
 {{include "cozystack.platform.package.optional.default" (list "cozystack.kuberture" $) }}
+{{include "cozystack.platform.package.optional.default" (list "cozystack.keda" $) }}
 {{include "cozystack.platform.package.optional.default" (list "cozystack.external-secrets-operator" $) }}
-{{include "cozystack.platform.package.optional.default" (list "cozystack.velero" $) }}
 {{include "cozystack.platform.package.optional.default" (list "cozystack.linstor-gui" $) }}
 {{- if has "cozystack.bootbox" (default (list) .Values.bundles.enabledPackages) }}
 {{include "cozystack.platform.package.default" (list "cozystack.bootbox-application" $) }}
 {{include "cozystack.platform.package.default" (list "cozystack.bootbox" $) }}
 {{- end }}
 {{include "cozystack.platform.package.optional.default" (list "cozystack.hetzner-robotlb" $) }}
+{{include "cozystack.platform.package.optional.default" (list "cozystack.talos-log-collector" $) }}
 
 {{- end }}
diff --git a/packages/core/platform/templates/migration-hook.yaml b/packages/core/platform/templates/migration-hook.yaml
index 67b098208d..5431286b95 100644
--- a/packages/core/platform/templates/migration-hook.yaml
+++ b/packages/core/platform/templates/migration-hook.yaml
@@ -2,6 +2,20 @@
 {{- $shouldRunMigrationHook := false }}
 {{- $currentVersion := 0 }}
 {{- $targetVersion := .Values.migrations.targetVersion | int }}
+{{- /*
+  Resolve migrations.etcdAdoptSkipBackup to the exact string migration 50
+  matches. Two hazards, both silent:
+    - the key is absent on a Platform Package that predates it, so `dig` supplies
+      the default rather than letting the whole platform render fail;
+    - the script tests for "1", so a bare bool renders "true" and the hatch is
+      accepted, displayed in the Job spec, and ignored. Normalise through a
+      string so a bool, a quoted "true" out of the Package CR's Values JSON, or
+      a numeric 1 all land on the same answer.
+  Anything unrecognised (nil, garbage) resolves to "0": taking the hatch must
+  require an affirmative spelling, never a typo.
+*/}}
+{{- $skipBackupRaw := dig "etcdAdoptSkipBackup" false .Values.migrations }}
+{{- $skipBackup := has (lower (printf "%v" $skipBackupRaw)) (list "1" "true" "yes") }}
 {{- $configMap := lookup "v1" "ConfigMap" .Release.Namespace "cozystack-version" }}
 {{- if $configMap }}
   {{- $currentVersion = dig "data" "version" "0" $configMap | int }}
@@ -38,6 +52,11 @@ spec:
               value: {{ $currentVersion | quote }}
             - name: TARGET_VERSION
               value: {{ $targetVersion | quote }}
+            # Always emitted, including the "0" default, so the Job spec states
+            # the cluster's safety posture outright: an operator reading the Job
+            # can see whether the snapshot was skipped without diffing values.
+            - name: ETCD_ADOPT_SKIP_BACKUP
+              value: {{ $skipBackup | ternary "1" "0" | quote }}
       restartPolicy: Never
 ---
 apiVersion: rbac.authorization.k8s.io/v1
diff --git a/packages/core/platform/tests/apps_admin_ingress_wiring_test.yaml b/packages/core/platform/tests/apps_admin_ingress_wiring_test.yaml
new file mode 100644
index 0000000000..447a950b35
--- /dev/null
+++ b/packages/core/platform/tests/apps_admin_ingress_wiring_test.yaml
@@ -0,0 +1,25 @@
+suite: apps.yaml admin-ingress platform → tenant value wiring
+templates:
+  - templates/apps.yaml
+
+release:
+  name: cozy-platform
+  namespace: cozy-system
+
+# Asserts that publishing.ingressNameAdmin lands in _cluster.expose-ingress-admin,
+# the key read by system charts (currently keycloak) to attach admin routes to a
+# separate Gateway/ingressClass. Empty by default so admin shares expose-ingress.
+tests:
+  - it: writes an empty expose-ingress-admin by default
+    asserts:
+      - matchRegex:
+          path: stringData["values.yaml"]
+          pattern: 'expose-ingress-admin:\s*""'
+
+  - it: writes the configured admin ingress namespace
+    set:
+      publishing.ingressNameAdmin: cozy-private
+    asserts:
+      - matchRegex:
+          path: stringData["values.yaml"]
+          pattern: 'expose-ingress-admin:\s*"cozy-private"'
diff --git a/packages/core/platform/tests/apps_gateway_class_wiring_test.yaml b/packages/core/platform/tests/apps_gateway_class_wiring_test.yaml
new file mode 100644
index 0000000000..ac001c3cbf
--- /dev/null
+++ b/packages/core/platform/tests/apps_gateway_class_wiring_test.yaml
@@ -0,0 +1,144 @@
+suite: apps.yaml gateway.className / gateway.edgeTerminatedClasses → _cluster wiring
+templates:
+  - templates/apps.yaml
+
+release:
+  name: cozy-platform
+  namespace: cozy-system
+
+# gateway.className names the GatewayClass a tenant Gateway uses when the
+# tenant picks none, and gateway.edgeTerminatedClasses names the classes whose
+# provider terminates TLS upstream — a property of the class, so a tenant that
+# selects one gets edge behaviour without stating it separately. Both reach the
+# per-tenant gateway chart only through the _cluster keys in the
+# cozystack-values Secret; without these pins a platform-level change would
+# silently never arrive.
+
+tests:
+  - it: writes the cilium default class and an empty edge list by default
+    asserts:
+      - matchRegex:
+          path: stringData["values.yaml"]
+          pattern: '(?m)^\s*gateway-class-name:\s*"cilium"'
+      - matchRegex:
+          path: stringData["values.yaml"]
+          pattern: '(?m)^\s*gateway-edge-classes:\s*""'
+
+  # The chart's own default is the string "cilium", so every other case
+  # here reaches the kind check with a string. Nulling the key is the one
+  # way to reach it with no value at all, and the documented fallback for
+  # an unmade choice is the bundled class — not the refusal a bare kind
+  # check would raise on nil.
+  - it: falls back to the bundled class when the key is explicitly unset
+    set:
+      gateway:
+        className: null
+    asserts:
+      - matchRegex:
+          path: stringData["values.yaml"]
+          pattern: '(?m)^\s*gateway-class-name:\s*"cilium"'
+
+  - it: writes the configured default class and the edge-terminated list
+    set:
+      gateway:
+        className: cloudflare-tunnel
+        edgeTerminatedClasses:
+          - cloudflare-tunnel
+          - some-other-tunnel
+    asserts:
+      - matchRegex:
+          path: stringData["values.yaml"]
+          pattern: '(?m)^\s*gateway-class-name:\s*"cloudflare-tunnel"'
+      - matchRegex:
+          path: stringData["values.yaml"]
+          pattern: '(?m)^\s*gateway-edge-classes:\s*"cloudflare-tunnel,some-other-tunnel"'
+
+  - it: normalises a padded default class before it reaches either reader
+    set:
+      gateway:
+        className: "  cloudflare-tunnel  "
+        edgeTerminatedClasses:
+          - cloudflare-tunnel
+    asserts:
+      - matchRegex:
+          path: stringData["values.yaml"]
+          pattern: '(?m)^\s*gateway-class-name:\s*"cloudflare-tunnel"'
+
+  - it: refuses a whitespace-only default rather than resolving it quietly
+    set:
+      gateway:
+        className: "   "
+    asserts:
+      - failedTemplate:
+          errorMessage: 'gateway.className is only whitespace. Leave it unset to use the bundled cilium class, or name a real GatewayClass — resolving a blank value silently would decide TLS termination for every tenant that did not choose.'
+
+  - it: rejects a non-string default class by name
+    set:
+      gateway:
+        className: 123
+    asserts:
+      - failedTemplate:
+          errorMessage: 'gateway.className must be a GatewayClass name, got 123'
+
+  # 0 and false are the falsy non-strings. A `default ""` placed ahead of
+  # the kind check would turn both into the empty string and resolve them
+  # to the bundled class, so these two pin the ORDER of the guard, not
+  # just its presence.
+  - it: rejects a zero default class rather than treating it as unset
+    set:
+      gateway:
+        className: 0
+    asserts:
+      - failedTemplate:
+          errorMessage: 'gateway.className must be a GatewayClass name, got 0'
+
+  - it: rejects a boolean default class rather than treating it as unset
+    set:
+      gateway:
+        className: false
+    asserts:
+      - failedTemplate:
+          errorMessage: 'gateway.className must be a GatewayClass name, got false'
+
+  - it: carries the classes a tenant may select
+    set:
+      gateway:
+        tenantSelectableClasses:
+          - cloudflare-tunnel
+    asserts:
+      - matchRegex:
+          path: stringData["values.yaml"]
+          pattern: '(?m)^\s*gateway-tenant-classes:\s*"cloudflare-tunnel"'
+
+  - it: rejects a non-string entry in gateway.edgeTerminatedClasses
+    set:
+      gateway:
+        edgeTerminatedClasses:
+          - 42
+    asserts:
+      - failedTemplate:
+          errorPattern: 'gateway.edgeTerminatedClasses must be a list of GatewayClass names'
+
+  - it: rejects a non-string entry in gateway.tenantSelectableClasses
+    set:
+      gateway:
+        tenantSelectableClasses:
+          - 42
+    asserts:
+      - failedTemplate:
+          errorPattern: 'gateway.tenantSelectableClasses must be a list of GatewayClass names'
+
+  - it: rejects a class name carrying a comma, which the channel would split
+    set:
+      gateway:
+        edgeTerminatedClasses:
+          - "cloudflare-tunnel,sneaky"
+    asserts:
+      - failedTemplate:
+          errorPattern: 'contains a comma; the list travels comma-joined'
+
+  - it: writes an empty tenant-selectable list by default
+    asserts:
+      - matchRegex:
+          path: stringData["values.yaml"]
+          pattern: '(?m)^\s*gateway-tenant-classes:\s*""'
diff --git a/packages/core/platform/tests/apps_keda_cluster_domain_test.yaml b/packages/core/platform/tests/apps_keda_cluster_domain_test.yaml
new file mode 100644
index 0000000000..8b90077652
--- /dev/null
+++ b/packages/core/platform/tests/apps_keda_cluster_domain_test.yaml
@@ -0,0 +1,34 @@
+suite: apps.yaml networking.clusterDomain → keda.clusterDomain wiring
+
+templates:
+  - templates/apps.yaml
+
+release:
+  name: cozy-platform
+  namespace: cozy-system
+
+# KEDA's clusterDomain is a vendored-subchart value a chart template cannot derive
+# from _cluster, so core/platform injects the authoritative networking.clusterDomain
+# into the shared cozystack-values Secret under the keda subchart key. Without it a
+# cluster whose domain is not the cozy.local default would leave KEDA dialing the
+# operator's metrics gRPC service at an NXDOMAIN address and every database HPA would
+# report FailedGetExternalMetric. These assertions pin that the value lands in the
+# Secret and tracks networking.clusterDomain rather than a literal.
+
+tests:
+  - it: injects keda.clusterDomain from the cozy.local default
+    asserts:
+      - matchRegex:
+          path: stringData["values.yaml"]
+          pattern: '(?m)^\s*keda:\s*$'
+      - matchRegex:
+          path: stringData["values.yaml"]
+          pattern: '(?m)^\s*clusterDomain:\s*"cozy.local"'
+
+  - it: tracks a non-default networking.clusterDomain
+    set:
+      networking.clusterDomain: cluster.local
+    asserts:
+      - matchRegex:
+          path: stringData["values.yaml"]
+          pattern: '(?m)^\s*clusterDomain:\s*"cluster.local"'
diff --git a/packages/core/platform/tests/apps_load_balancer_class_wiring_test.yaml b/packages/core/platform/tests/apps_load_balancer_class_wiring_test.yaml
new file mode 100644
index 0000000000..34d04c8c13
--- /dev/null
+++ b/packages/core/platform/tests/apps_load_balancer_class_wiring_test.yaml
@@ -0,0 +1,29 @@
+suite: apps.yaml publishing.loadBalancerClass → _cluster wiring
+templates:
+  - templates/apps.yaml
+
+release:
+  name: cozy-platform
+  namespace: cozy-system
+
+# publishing.loadBalancerClass selects which LoadBalancer controller handles the
+# host ingress Service. It reaches the host ingress-nginx through
+# _cluster.load-balancer-class in the cozystack-values Secret (the same path
+# expose-external-ips and proxy-protocol travel). These assertions pin that the
+# value lands in the Secret; without them the host ingress would silently never
+# see the configured loadBalancerClass.
+
+tests:
+  - it: writes an empty load-balancer-class by default
+    asserts:
+      - matchRegex:
+          path: stringData["values.yaml"]
+          pattern: '(?m)^\s*load-balancer-class:\s*""'
+
+  - it: writes the load-balancer-class when publishing.loadBalancerClass is set
+    set:
+      publishing.loadBalancerClass: metallb.io/metallb
+    asserts:
+      - matchRegex:
+          path: stringData["values.yaml"]
+          pattern: '(?m)^\s*load-balancer-class:\s*"metallb\.io/metallb"'
diff --git a/packages/core/platform/tests/apps_monitoring_enabled_wiring_test.yaml b/packages/core/platform/tests/apps_monitoring_enabled_wiring_test.yaml
new file mode 100644
index 0000000000..e5c945bbf0
--- /dev/null
+++ b/packages/core/platform/tests/apps_monitoring_enabled_wiring_test.yaml
@@ -0,0 +1,42 @@
+suite: apps.yaml monitoring.rootEnabled → _cluster wiring
+templates:
+  - templates/apps.yaml
+
+release:
+  name: cozy-platform
+  namespace: cozy-system
+
+# monitoring.rootEnabled records whether the root tenant hosts the platform
+# monitoring stack (Tenant/root spec.monitoring). It reaches cozystack-basics
+# through _cluster.monitoring-enabled in the cozystack-values Secret, where it
+# gates the cozy-monitoring -> tenant-root vlinsert/vminsert ExternalName
+# redirects. Without the flag in the Secret those redirects would always be
+# created and dead-end when the root tenant has no monitoring, silently
+# dropping logs (issue #3181). These assertions pin that the flag lands in the
+# Secret both ways.
+
+tests:
+  - it: writes monitoring-enabled true by default
+    asserts:
+      - matchRegex:
+          path: stringData["values.yaml"]
+          pattern: '(?m)^\s*monitoring-enabled:\s*"true"'
+
+  - it: writes monitoring-enabled false when monitoring.rootEnabled is disabled
+    set:
+      monitoring.rootEnabled: false
+    asserts:
+      - matchRegex:
+          path: stringData["values.yaml"]
+          pattern: '(?m)^\s*monitoring-enabled:\s*"false"'
+
+  # Guard: `.Values.monitoring` nulled in custom values must not panic the
+  # render; `dig ... (.Values.monitoring | default dict)` falls back to the
+  # true default.
+  - it: falls back to true (no panic) when monitoring is null
+    set:
+      monitoring: null
+    asserts:
+      - matchRegex:
+          path: stringData["values.yaml"]
+          pattern: '(?m)^\s*monitoring-enabled:\s*"true"'
diff --git a/packages/core/platform/tests/apps_oidc_keycloak_internal_url_test.yaml b/packages/core/platform/tests/apps_oidc_keycloak_internal_url_test.yaml
new file mode 100644
index 0000000000..35f7db4d83
--- /dev/null
+++ b/packages/core/platform/tests/apps_oidc_keycloak_internal_url_test.yaml
@@ -0,0 +1,77 @@
+suite: apps.yaml OIDC keycloak-internal-url platform → tenant value wiring
+templates:
+  - templates/apps.yaml
+
+release:
+  name: cozy-platform
+  namespace: cozy-system
+
+# authentication.oidc.keycloakInternalUrl rides the _cluster channel as
+# keycloak-internal-url and is read by the dashboard and linstor-gui
+# gatekeepers (packages/system/{dashboard,linstor-gui}/templates/gatekeeper.yaml).
+# A non-empty value switches oauth2-proxy to --skip-oidc-discovery and sends
+# the backend calls (token, jwks, userinfo, logout) straight to the Keycloak
+# Service, so the dashboard no longer depends on the root ingress serving the
+# external Keycloak hostname before it can start. The default must therefore be
+# the in-cluster Service address, and an operator override — including an
+# override back to "" — must still reach the consumers untouched.
+
+tests:
+  - it: writes the in-cluster keycloak Service address by default
+    asserts:
+      - matchRegex:
+          path: stringData["values.yaml"]
+          pattern: 'keycloak-internal-url:\s*"http://keycloak-http\.cozy-keycloak\.svc:8080/realms/cozy"'
+
+  - it: writes the in-cluster default even when OIDC is enabled
+    set:
+      authentication.oidc.enabled: true
+    asserts:
+      - matchRegex:
+          path: stringData["values.yaml"]
+          pattern: 'oidc-enabled:\s*"true"'
+      - matchRegex:
+          path: stringData["values.yaml"]
+          pattern: 'keycloak-internal-url:\s*"http://keycloak-http\.cozy-keycloak\.svc:8080/realms/cozy"'
+
+  - it: honors an operator override pointing at a non-standard keycloak placement
+    set:
+      authentication.oidc.enabled: true
+      authentication.oidc.keycloakInternalUrl: http://keycloak.example.test:8080/realms/other
+    asserts:
+      - matchRegex:
+          path: stringData["values.yaml"]
+          pattern: 'keycloak-internal-url:\s*"http://keycloak\.example\.test:8080/realms/other"'
+
+  - it: keeps the empty-string escape hatch, restoring external OIDC discovery
+    set:
+      authentication.oidc.enabled: true
+      authentication.oidc.keycloakInternalUrl: ""
+    asserts:
+      - matchRegex:
+          path: stringData["values.yaml"]
+          pattern: 'keycloak-internal-url:\s*""'
+
+  # The default internal URL bakes the realm segment, so it must follow
+  # authentication.oidc.realmName rather than the literal "cozy" — otherwise a
+  # renamed realm points every backend call at a realm Keycloak does not serve.
+  - it: derives the default internal URL from a custom realm name
+    set:
+      authentication.oidc.enabled: true
+      authentication.oidc.realmName: acme
+    asserts:
+      - matchRegex:
+          path: stringData["values.yaml"]
+          pattern: 'keycloak-internal-url:\s*"http://keycloak-http\.cozy-keycloak\.svc:8080/realms/acme"'
+
+  # The escape hatch is an operator decision independent of the realm name, so a
+  # custom realm must not resurrect a derived URL over an explicit empty string.
+  - it: keeps the empty-string escape hatch even with a custom realm name
+    set:
+      authentication.oidc.enabled: true
+      authentication.oidc.realmName: acme
+      authentication.oidc.keycloakInternalUrl: ""
+    asserts:
+      - matchRegex:
+          path: stringData["values.yaml"]
+          pattern: 'keycloak-internal-url:\s*""'
diff --git a/packages/core/platform/tests/apps_oidc_realm_name_test.yaml b/packages/core/platform/tests/apps_oidc_realm_name_test.yaml
new file mode 100644
index 0000000000..deeb93f9ad
--- /dev/null
+++ b/packages/core/platform/tests/apps_oidc_realm_name_test.yaml
@@ -0,0 +1,99 @@
+suite: apps.yaml OIDC realm-name platform → tenant value wiring
+templates:
+  - templates/apps.yaml
+
+release:
+  name: cozy-platform
+  namespace: cozy-system
+
+# authentication.oidc.realmName is the single source for the Keycloak realm.
+# It rides the _cluster channel as oidc-realm-name and is read by
+# keycloak-configure (realm/clients/roles), the dashboard and linstor-gui
+# gatekeepers (issuer/login/logout URLs) and the info kubeconfig. The apiserver
+# OIDC issuer is configured out-of-band via talm oidcIssuerUrl, so a mismatch
+# there silently breaks SSO; pin the default and the propagation so a rename in
+# one place cannot drift from the value every consumer reads.
+
+tests:
+  - it: defaults the realm name to cozy
+    asserts:
+      - matchRegex:
+          path: stringData["values.yaml"]
+          pattern: 'oidc-realm-name:\s*"cozy"'
+
+  # Unset (null) falls back to cozy, but an explicit empty string is a
+  # meaningless value, not a request for the default — it is rejected by the
+  # charset guard rather than silently coerced, mirroring the null-vs-"" tristate
+  # of keycloakInternalUrl below.
+  - it: rejects an explicitly empty realm name
+    set:
+      authentication.oidc.realmName: ""
+    asserts:
+      - failedTemplate:
+          errorMessage: 'authentication.oidc.realmName "" is invalid: use only letters, digits, ''.'', ''_'' and ''-'' (it is used verbatim as a URL path segment and a shell token)'
+
+  # Every platform client and the cluster-admin role are created in this realm,
+  # and its login page is published wherever the platform realm is published.
+  - it: rejects master as the realm name
+    set:
+      authentication.oidc.realmName: master
+    asserts:
+      - failedTemplate:
+          errorPattern: 'authentication.oidc.realmName must not be master'
+
+  - it: propagates a custom realm name onto the _cluster channel
+    set:
+      authentication.oidc.realmName: acme
+    asserts:
+      - matchRegex:
+          path: stringData["values.yaml"]
+          pattern: 'oidc-realm-name:\s*"acme"'
+
+  - it: derives the default in-cluster keycloak URL from the realm name
+    set:
+      authentication.oidc.realmName: acme
+    asserts:
+      - matchRegex:
+          path: stringData["values.yaml"]
+          pattern: 'keycloak-internal-url:\s*"http://keycloak-http\.cozy-keycloak\.svc:8080/realms/acme"'
+
+  # A realm name YAML resolves to a non-string (a bare integer, or a reserved
+  # word like on/off that becomes a bool) is rejected, not silently coerced —
+  # coercion would rename the realm to something never typed and inject a
+  # "%!s(...)" format error into the derived URL.
+  - it: rejects a non-string realm name with a quoting hint
+    set:
+      authentication.oidc.realmName: 123
+    asserts:
+      - failedTemplate:
+          errorMessage: 'authentication.oidc.realmName must be a string (got float64); wrap the value in quotes in the platform values, e.g. realmName: "my-realm"'
+
+  # A quoted numeric name is a legitimate string and passes through to both the
+  # realm key and the derived URL unchanged.
+  - it: accepts a quoted numeric realm name verbatim
+    set:
+      authentication.oidc.realmName: "123"
+    asserts:
+      - matchRegex:
+          path: stringData["values.yaml"]
+          pattern: 'oidc-realm-name:\s*"123"'
+      - matchRegex:
+          path: stringData["values.yaml"]
+          pattern: 'keycloak-internal-url:\s*"http://keycloak-http\.cozy-keycloak\.svc:8080/realms/123"'
+
+  # The realm is spliced verbatim into URL path segments and a shell token, so a
+  # name with a "/" or a space must be rejected at the source rather than split
+  # a URL or break the hook script downstream.
+  - it: rejects a realm name with a path separator
+    set:
+      authentication.oidc.realmName: "foo/bar"
+    asserts:
+      - failedTemplate:
+          errorMessage: 'authentication.oidc.realmName "foo/bar" is invalid: use only letters, digits, ''.'', ''_'' and ''-'' (it is used verbatim as a URL path segment and a shell token)'
+
+  - it: rejects a realm name with a space
+    set:
+      authentication.oidc.realmName: "foo bar"
+    asserts:
+      - failedTemplate:
+          errorMessage: 'authentication.oidc.realmName "foo bar" is invalid: use only letters, digits, ''.'', ''_'' and ''-'' (it is used verbatim as a URL path segment and a shell token)'
diff --git a/packages/core/platform/tests/apps_opensearch_operator_dns_base_test.yaml b/packages/core/platform/tests/apps_opensearch_operator_dns_base_test.yaml
new file mode 100644
index 0000000000..5d2cd06932
--- /dev/null
+++ b/packages/core/platform/tests/apps_opensearch_operator_dns_base_test.yaml
@@ -0,0 +1,33 @@
+suite: apps.yaml networking.clusterDomain reaches the opensearch-operator DNS base
+
+templates:
+  - templates/apps.yaml
+
+release:
+  name: cozy-platform
+  namespace: cozy-system
+
+# The operator builds every in-cluster name it needs from DNS_BASE, which the
+# vendored subchart reads from manager.dnsBase and defaults to cluster.local.
+# The platform carries the authoritative domain to it under the subchart key in
+# the shared values Secret. Every pattern here anchors dnsBase to its
+# opensearch-operator and manager parents, so a sibling block carrying the same
+# domain cannot satisfy the assertion on its own.
+
+tests:
+  - it: carries the cozy.local default under the subchart key
+    asserts:
+      - matchRegex:
+          path: stringData["values.yaml"]
+          pattern: '(?m)^opensearch-operator:\n  manager:\n    dnsBase: "cozy\.local"$'
+
+  - it: tracks a non-default networking.clusterDomain
+    set:
+      networking.clusterDomain: example.test
+    asserts:
+      - matchRegex:
+          path: stringData["values.yaml"]
+          pattern: '(?m)^opensearch-operator:\n  manager:\n    dnsBase: "example\.test"$'
+      - notMatchRegex:
+          path: stringData["values.yaml"]
+          pattern: '(?m)^opensearch-operator:\n  manager:\n    dnsBase: "cozy\.local"$'
diff --git a/packages/core/platform/tests/apps_proxy_protocol_wiring_test.yaml b/packages/core/platform/tests/apps_proxy_protocol_wiring_test.yaml
new file mode 100644
index 0000000000..72c9a38746
--- /dev/null
+++ b/packages/core/platform/tests/apps_proxy_protocol_wiring_test.yaml
@@ -0,0 +1,30 @@
+suite: apps.yaml publishing.proxyProtocol → _cluster wiring
+templates:
+  - templates/apps.yaml
+
+release:
+  name: cozy-platform
+  namespace: cozy-system
+
+# publishing.proxyProtocol is the host PROXY-protocol switch. It reaches the
+# host ingress-nginx through _cluster.proxy-protocol in the cozystack-values
+# Secret (the same path expose-external-ips travels): cozystack-basics
+# propagates the whole _cluster block into the tenant-root Secret, and the
+# extra/ingress chart applies it to the external-facing ingress. These
+# assertions pin that the switch lands in the Secret; without them the host
+# ingress would silently never see the flag (the bug fixed here).
+
+tests:
+  - it: writes proxy-protocol false by default
+    asserts:
+      - matchRegex:
+          path: stringData["values.yaml"]
+          pattern: '(?m)^\s*proxy-protocol:\s*"false"'
+
+  - it: writes proxy-protocol true when publishing.proxyProtocol is enabled
+    set:
+      publishing.proxyProtocol: true
+    asserts:
+      - matchRegex:
+          path: stringData["values.yaml"]
+          pattern: '(?m)^\s*proxy-protocol:\s*"true"'
diff --git a/packages/core/platform/tests/apps_service_domain_wiring_test.yaml b/packages/core/platform/tests/apps_service_domain_wiring_test.yaml
new file mode 100644
index 0000000000..567f6fc5c0
--- /dev/null
+++ b/packages/core/platform/tests/apps_service_domain_wiring_test.yaml
@@ -0,0 +1,52 @@
+suite: apps.yaml publishing.serviceDomain → _cluster wiring
+templates:
+  - templates/apps.yaml
+
+release:
+  name: cozy-platform
+  namespace: cozy-system
+
+# publishing.serviceDomain is the DNS suffix the dashboard appends to a
+# LoadBalancer Service name on the application Services tab. It reaches the
+# dashboard chart through _cluster.service-domain in the cozystack-values
+# Secret (the same path cluster-domain and branding travel). Pin both
+# directions: the empty default, which the console turns into "show no
+# hostname", and a configured value landing verbatim. Without these a refactor
+# of the values map could drop the key and the dashboard would silently stop
+# showing hostnames on every cluster that configured one.
+
+tests:
+  - it: writes an empty service-domain by default
+    asserts:
+      - matchRegex:
+          path: stringData["values.yaml"]
+          pattern: '(?m)^\s*service-domain:\s*""'
+
+  - it: writes the service-domain when publishing.serviceDomain is set
+    set:
+      publishing.serviceDomain: svc.example.org
+    asserts:
+      - matchRegex:
+          path: stringData["values.yaml"]
+          pattern: '(?m)^\s*service-domain:\s*"svc\.example\.org"'
+
+  # The console joins "<service>.<suffix>" verbatim, so a leading or trailing
+  # dot from the operator would render "demo..svc.example.org." — strip them
+  # here, the single place every consumer reads from.
+  - it: strips leading and trailing dots from publishing.serviceDomain
+    set:
+      publishing.serviceDomain: .svc.example.org.
+    asserts:
+      - matchRegex:
+          path: stringData["values.yaml"]
+          pattern: '(?m)^\s*service-domain:\s*"svc\.example\.org"'
+
+  # An unquoted scalar in the operator's values arrives as a number, and
+  # trimAll on a float64 aborts the whole platform render. Coerce first.
+  - it: renders an unquoted numeric publishing.serviceDomain instead of failing
+    set:
+      publishing.serviceDomain: 123
+    asserts:
+      - matchRegex:
+          path: stringData["values.yaml"]
+          pattern: '(?m)^\s*service-domain:\s*"123"'
diff --git a/packages/core/platform/tests/apps_tracing_central_rate_wiring_test.yaml b/packages/core/platform/tests/apps_tracing_central_rate_wiring_test.yaml
new file mode 100644
index 0000000000..fa6d431066
--- /dev/null
+++ b/packages/core/platform/tests/apps_tracing_central_rate_wiring_test.yaml
@@ -0,0 +1,140 @@
+suite: apps.yaml monitoring.tracingCentralTenantBytesPerSecond → _cluster wiring
+templates:
+  - templates/apps.yaml
+
+release:
+  name: cozy-platform
+  namespace: cozy-system
+
+# The rate each shared-central tracing tenant may write reaches every tenant's
+# collector through _cluster in the cozystack-values Secret. A change there
+# changes the values every monitoring HelmRelease reads, so Flux upgrades each
+# of them; a rate read with lookup at render time never would.
+
+tests:
+  # Helm reads a number from values as a float64, which prints a million as
+  # 1e+06: the rate must still come out as plain digits for the collector.
+  - it: writes a rate of a million as plain digits
+    set:
+      monitoring.tracingCentralTenantBytesPerSecond: 1000000
+    asserts:
+      - matchRegex:
+          path: stringData["values.yaml"]
+          pattern: '(?m)^\s*tracing-central-tenant-bytes-per-second:\s*"1000000"$'
+
+  - it: writes a rate given as a string of digits
+    set:
+      monitoring.tracingCentralTenantBytesPerSecond: "500000"
+    asserts:
+      - matchRegex:
+          path: stringData["values.yaml"]
+          pattern: '(?m)^\s*tracing-central-tenant-bytes-per-second:\s*"500000"$'
+
+  - it: writes the rate when monitoring.tracingCentralTenantBytesPerSecond is set
+    set:
+      monitoring.tracingCentralTenantBytesPerSecond: 500000
+    asserts:
+      - matchRegex:
+          path: stringData["values.yaml"]
+          pattern: '(?m)^\s*tracing-central-tenant-bytes-per-second:\s*"500000"$'
+
+  # Every release in every tenant reads this Secret, so a key written while
+  # nobody set a rate would upgrade all of them on the platform upgrade.
+  - it: writes no rate by default
+    asserts:
+      - notMatchRegex:
+          path: stringData["values.yaml"]
+          pattern: "tracing-central-tenant-bytes-per-second"
+
+  - it: writes no rate for an explicit zero
+    set:
+      monitoring.tracingCentralTenantBytesPerSecond: 0
+    asserts:
+      - notMatchRegex:
+          path: stringData["values.yaml"]
+          pattern: "tracing-central-tenant-bytes-per-second"
+
+  # Anything but a whole number of bytes per second is refused rather than read
+  # as the default, which would leave the operator's limit silently unapplied.
+  - it: refuses a negative value
+    set:
+      monitoring.tracingCentralTenantBytesPerSecond: -1
+    asserts:
+      - failedTemplate:
+          errorPattern: "monitoring.tracingCentralTenantBytesPerSecond must be a whole number of bytes per second"
+
+  - it: refuses a quantity with a unit
+    set:
+      monitoring.tracingCentralTenantBytesPerSecond: "1Mi"
+    asserts:
+      - failedTemplate:
+          errorPattern: "monitoring.tracingCentralTenantBytesPerSecond must be a whole number of bytes per second"
+
+  - it: refuses a string in exponent notation
+    set:
+      monitoring.tracingCentralTenantBytesPerSecond: "1e6"
+    asserts:
+      - failedTemplate:
+          errorPattern: "monitoring.tracingCentralTenantBytesPerSecond must be a whole number of bytes per second"
+
+  - it: refuses a fractional value
+    set:
+      monitoring.tracingCentralTenantBytesPerSecond: 1.5
+    asserts:
+      - failedTemplate:
+          errorPattern: "monitoring.tracingCentralTenantBytesPerSecond must be a whole number of bytes per second"
+
+  # Sprig's int64 reads a string with a leading zero as octal ("0100" is 64)
+  # and returns 0 on a parse error, which would write no key.
+  - it: refuses a string with a leading zero
+    set:
+      monitoring.tracingCentralTenantBytesPerSecond: "0100"
+    asserts:
+      - failedTemplate:
+          errorPattern: "monitoring.tracingCentralTenantBytesPerSecond must be a whole number of bytes per second"
+
+  - it: refuses a string that is not a valid octal number
+    set:
+      monitoring.tracingCentralTenantBytesPerSecond: "08"
+    asserts:
+      - failedTemplate:
+          errorPattern: "monitoring.tracingCentralTenantBytesPerSecond must be a whole number of bytes per second"
+
+  # Each collector adds its replica count to the rate before splitting it, and
+  # an int64 conversion of a float beyond int64 differs by CPU architecture.
+  - it: refuses a string of digits beyond the ceiling
+    set:
+      monitoring.tracingCentralTenantBytesPerSecond: "99999999999999999999"
+    asserts:
+      - failedTemplate:
+          errorPattern: "monitoring.tracingCentralTenantBytesPerSecond must be a whole number of bytes per second, at most 1099511627776"
+
+  - it: refuses a number beyond the ceiling
+    set:
+      monitoring.tracingCentralTenantBytesPerSecond: 1e19
+    asserts:
+      - failedTemplate:
+          errorPattern: "monitoring.tracingCentralTenantBytesPerSecond must be a whole number of bytes per second, at most 1099511627776"
+
+  - it: refuses one byte above the ceiling
+    set:
+      monitoring.tracingCentralTenantBytesPerSecond: 1099511627777
+    asserts:
+      - failedTemplate:
+          errorPattern: "monitoring.tracingCentralTenantBytesPerSecond must be a whole number of bytes per second, at most 1099511627776"
+
+  - it: writes a rate at the ceiling
+    set:
+      monitoring.tracingCentralTenantBytesPerSecond: 1099511627776
+    asserts:
+      - matchRegex:
+          path: stringData["values.yaml"]
+          pattern: '(?m)^\s*tracing-central-tenant-bytes-per-second:\s*"1099511627776"$'
+
+  - it: writes a string rate at the ceiling
+    set:
+      monitoring.tracingCentralTenantBytesPerSecond: "1099511627776"
+    asserts:
+      - matchRegex:
+          path: stringData["values.yaml"]
+          pattern: '(?m)^\s*tracing-central-tenant-bytes-per-second:\s*"1099511627776"$'
diff --git a/packages/core/platform/tests/apps_wildcard_acme_test.yaml b/packages/core/platform/tests/apps_wildcard_acme_test.yaml
new file mode 100644
index 0000000000..9449aa3e61
--- /dev/null
+++ b/packages/core/platform/tests/apps_wildcard_acme_test.yaml
@@ -0,0 +1,93 @@
+suite: apps.yaml ACME wildcard issuance wiring
+
+templates:
+  - templates/apps.yaml
+
+release:
+  name: cozy-platform
+  namespace: cozy-system
+
+# WS2 / #2400: on the default ingress-nginx path (gateway.enabled=false) a
+# DNS-01 solver lets the platform issue ONE shared wildcard certificate
+# (*.<root-host> + <root-host>) instead of minting a per-host ACME cert
+# for every system service. It is OPT-IN (publishing.certificates.wildcard,
+# default false): a single-label wildcard does not cover custom service
+# hosts outside *.<root-host>, so leaving it off keeps the safe per-host
+# behavior and never switches a dns01 cluster silently on upgrade.
+# apps.yaml computes the effective _cluster.wildcard-secret-name and an
+# _cluster.wildcard-issue signal the publishing ingress package reads to
+# render the Certificate. Operator-provided (BYO) wildcard names always
+# win and never trigger issuance; http01 cannot issue wildcards; the
+# Gateway API path issues its own wildcard via the controller, so issuance
+# here is gated to gateway.enabled=false.
+
+tests:
+  - it: does not issue a wildcard by default (http01)
+    asserts:
+      - matchRegex:
+          path: stringData["values.yaml"]
+          pattern: 'wildcard-secret-name:\s*""'
+      - matchRegex:
+          path: stringData["values.yaml"]
+          pattern: 'wildcard-issue:\s*"false"'
+
+  - it: does not auto-issue on dns01 unless explicitly opted in
+    set:
+      publishing.certificates.solver: dns01
+    asserts:
+      - matchRegex:
+          path: stringData["values.yaml"]
+          pattern: 'wildcard-secret-name:\s*""'
+      - matchRegex:
+          path: stringData["values.yaml"]
+          pattern: 'wildcard-issue:\s*"false"'
+
+  - it: issues a shared wildcard when opted in on the dns01 ingress path
+    set:
+      publishing.certificates.solver: dns01
+      publishing.certificates.wildcard: true
+    asserts:
+      - matchRegex:
+          path: stringData["values.yaml"]
+          pattern: 'wildcard-secret-name:\s*"cozystack-wildcard-tls"'
+      - matchRegex:
+          path: stringData["values.yaml"]
+          pattern: 'wildcard-issue:\s*"true"'
+
+  - it: does not auto-issue on the ingress path when Gateway API is enabled
+    set:
+      publishing.certificates.solver: dns01
+      publishing.certificates.wildcard: true
+      gateway.enabled: true
+    asserts:
+      - matchRegex:
+          path: stringData["values.yaml"]
+          pattern: 'wildcard-secret-name:\s*""'
+      - matchRegex:
+          path: stringData["values.yaml"]
+          pattern: 'wildcard-issue:\s*"false"'
+
+  - it: operator-provided wildcard secret wins and never triggers issuance
+    set:
+      publishing.certificates.solver: dns01
+      publishing.certificates.wildcard: true
+      publishing.certificates.wildcardSecretName: byo-wildcard-tls
+    asserts:
+      - matchRegex:
+          path: stringData["values.yaml"]
+          pattern: 'wildcard-secret-name:\s*"byo-wildcard-tls"'
+      - matchRegex:
+          path: stringData["values.yaml"]
+          pattern: 'wildcard-issue:\s*"false"'
+
+  - it: http01 never issues a wildcard even when opted in
+    set:
+      publishing.certificates.solver: http01
+      publishing.certificates.wildcard: true
+    asserts:
+      - matchRegex:
+          path: stringData["values.yaml"]
+          pattern: 'wildcard-secret-name:\s*""'
+      - matchRegex:
+          path: stringData["values.yaml"]
+          pattern: 'wildcard-issue:\s*"false"'
diff --git a/packages/core/platform/tests/apps_wildcard_secret_test.yaml b/packages/core/platform/tests/apps_wildcard_secret_test.yaml
new file mode 100644
index 0000000000..5de70208c9
--- /dev/null
+++ b/packages/core/platform/tests/apps_wildcard_secret_test.yaml
@@ -0,0 +1,28 @@
+suite: apps.yaml operator wildcard secret name wiring
+templates:
+  - templates/apps.yaml
+
+release:
+  name: cozy-platform
+  namespace: cozy-system
+
+# Asserts that publishing.certificates.wildcardSecretName lands in the
+# _cluster.wildcard-secret-name key that the ingress flow and the
+# gateway chart read to switch into operator-supplied-wildcard mode.
+# Only the Secret NAME travels on this channel — never the cert/key
+# material — so the value is a plain quoted string.
+
+tests:
+  - it: writes empty wildcard-secret-name by default
+    asserts:
+      - matchRegex:
+          path: stringData["values.yaml"]
+          pattern: 'wildcard-secret-name:\s*""'
+
+  - it: writes the operator-supplied wildcard secret name when set
+    set:
+      publishing.certificates.wildcardSecretName: wildcard-tls
+    asserts:
+      - matchRegex:
+          path: stringData["values.yaml"]
+          pattern: 'wildcard-secret-name:\s*"wildcard-tls"'
diff --git a/packages/core/platform/tests/bundles_backupstorage_wiring_test.yaml b/packages/core/platform/tests/bundles_backupstorage_wiring_test.yaml
new file mode 100644
index 0000000000..3828bd0acf
--- /dev/null
+++ b/packages/core/platform/tests/bundles_backupstorage_wiring_test.yaml
@@ -0,0 +1,91 @@
+suite: bundles.system backupStorage → backupstrategy-controller wiring
+templates:
+  - templates/bundles/system.yaml
+release:
+  name: cozystack
+  namespace: cozy-system
+tests:
+  # Regression for #3245: the documented admin override for the cozy-default
+  # backup S3 coordinates rides on spec.components.platform.values.backupStorage
+  # of the cozystack-platform Package. The platform chart must forward that
+  # block into the emitted cozystack.backupstrategy-controller Package CR's
+  # components, otherwise the override silently never reaches the
+  # backupstrategy-controller HelmRelease.
+  - it: emits cozystack.backupstrategy-controller without a components block when backupStorage is unset
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full
+    documentSelector:
+      path: metadata.name
+      value: cozystack.backupstrategy-controller
+    asserts:
+      - equal:
+          path: kind
+          value: Package
+      - equal:
+          path: spec.variant
+          value: default
+      - notExists:
+          path: spec.components
+
+  - it: forwards backupStorage overrides into the backupstrategy-controller component values
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full
+      backupStorage:
+        provisionBucket: false
+        endpoint: https://s3.example.com
+        region: eu-central-1
+        systemSecretName: external-s3-credentials
+    documentSelector:
+      path: metadata.name
+      value: cozystack.backupstrategy-controller
+    asserts:
+      - equal:
+          path: spec.components.backupstrategy-controller.values.backupStorage.provisionBucket
+          value: false
+      - equal:
+          path: spec.components.backupstrategy-controller.values.backupStorage.endpoint
+          value: https://s3.example.com
+      - equal:
+          path: spec.components.backupstrategy-controller.values.backupStorage.region
+          value: eu-central-1
+      - equal:
+          path: spec.components.backupstrategy-controller.values.backupStorage.systemSecretName
+          value: external-s3-credentials
+
+  - it: forwards backupStorage overrides on the isp-full-generic variant too
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full-generic
+      backupStorage:
+        endpoint: https://s3.example.com
+    documentSelector:
+      path: metadata.name
+      value: cozystack.backupstrategy-controller
+    asserts:
+      - equal:
+          path: spec.components.backupstrategy-controller.values.backupStorage.endpoint
+          value: https://s3.example.com
+
+  - it: forwards backupStorage overrides on the isp-hosted variant too
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-hosted
+      backupStorage:
+        endpoint: https://s3.example.com
+    documentSelector:
+      path: metadata.name
+      value: cozystack.backupstrategy-controller
+    asserts:
+      - equal:
+          path: spec.components.backupstrategy-controller.values.backupStorage.endpoint
+          value: https://s3.example.com
diff --git a/packages/core/platform/tests/bundles_catalog_requires_system_test.yaml b/packages/core/platform/tests/bundles_catalog_requires_system_test.yaml
new file mode 100644
index 0000000000..0eec4c74f5
--- /dev/null
+++ b/packages/core/platform/tests/bundles_catalog_requires_system_test.yaml
@@ -0,0 +1,106 @@
+suite: paas/naas catalogs refuse to render without the system bundle
+templates:
+  - templates/bundles/paas.yaml
+  - templates/bundles/naas.yaml
+  - templates/bundles/iaas.yaml
+release:
+  name: cozystack
+  namespace: cozy-system
+tests:
+  # bundles.system.variant keeps its value when bundles.system.enabled is false,
+  # so the pre-existing variant guard passes on a preset that selects a valid
+  # variant and still skips the whole system bundle. That combination shipped in
+  # values-isp-hosted.yaml and produced an app catalog with no dependency
+  # closure: every Package DependenciesNotReady, the cozystack-platform
+  # HelmRelease never Ready, and nothing in the output naming the cause. Fail the
+  # render instead of letting the operator discover it hours later.
+  #
+  # Assertions are scoped with `template:` because helm-unittest otherwise checks
+  # every assertion against every template listed above, and each guard lives in
+  # only one of them.
+  - it: fails the render when paas is enabled without the system bundle
+    set:
+      bundles:
+        system:
+          enabled: false
+          variant: isp-hosted
+        paas:
+          enabled: true
+        naas:
+          enabled: false
+    asserts:
+      - failedTemplate:
+          errorPattern: "bundles\\.paas\\.enabled requires bundles\\.system\\.enabled"
+        template: templates/bundles/paas.yaml
+
+  - it: fails the render when naas is enabled without the system bundle
+    set:
+      bundles:
+        system:
+          enabled: false
+          variant: isp-hosted
+        paas:
+          enabled: false
+        naas:
+          enabled: true
+    asserts:
+      - failedTemplate:
+          errorPattern: "bundles\\.naas\\.enabled requires bundles\\.system\\.enabled"
+        template: templates/bundles/naas.yaml
+
+  - it: fails the render when iaas is enabled without the system bundle
+    set:
+      bundles:
+        system:
+          enabled: false
+          variant: isp-full
+        iaas:
+          enabled: true
+        paas:
+          enabled: false
+        naas:
+          enabled: false
+    asserts:
+      - failedTemplate:
+          errorPattern: "bundles\\.iaas\\.enabled requires bundles\\.system\\.enabled"
+        template: templates/bundles/iaas.yaml
+
+  # The message has to tell the operator what to do instead, otherwise the
+  # obvious reading of "requires system" is to abandon the hosted topology.
+  - it: points the operator at the isp-hosted variant rather than at disabling the bundle
+    set:
+      bundles:
+        system:
+          enabled: false
+          variant: isp-hosted
+        paas:
+          enabled: true
+    asserts:
+      - failedTemplate:
+          errorPattern: "bundles\\.system\\.variant: isp-hosted.*bundles\\.iaas\\.enabled: false"
+        template: templates/bundles/paas.yaml
+
+  # The guard must not fire on the supported configurations.
+  - it: renders the catalog when the system bundle is enabled on the hosted variant
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-hosted
+        paas:
+          enabled: true
+        naas:
+          enabled: true
+    asserts:
+      - containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.harbor-application
+          any: true
+        template: templates/bundles/paas.yaml
+      - containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.vpn-application
+          any: true
+        template: templates/bundles/naas.yaml
diff --git a/packages/core/platform/tests/bundles_cert_manager_gateway_api_test.yaml b/packages/core/platform/tests/bundles_cert_manager_gateway_api_test.yaml
new file mode 100644
index 0000000000..c784de810f
--- /dev/null
+++ b/packages/core/platform/tests/bundles_cert_manager_gateway_api_test.yaml
@@ -0,0 +1,78 @@
+suite: cert-manager Gateway API solver bundle wiring
+templates:
+  - templates/bundles/system.yaml
+  - templates/sources.yaml
+release:
+  name: cozystack
+  namespace: cozy-system
+tests:
+  # With the Gateway enabled, the platform's ClusterIssuers and the per-tenant
+  # Issuers both carry an http01.gatewayHTTPRoute solver, and the controller
+  # refuses it unless Gateway API support is on: every challenge fails with
+  # "gateway api is not enabled". The flag rides on the Package's component
+  # values, not on a default of system/cert-manager, because that chart is also
+  # installed into tenant clusters without the CRDs, where the same flag makes
+  # the controller exit at startup. These tests pin the host side of that split.
+  - it: enables the Gateway API solver on the host cert-manager (isp-full)
+    template: templates/bundles/system.yaml
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full
+    documentSelector:
+      path: metadata.name
+      value: cozystack.cert-manager
+    asserts:
+      - equal:
+          path: spec.components.cert-manager.values.cert-manager.config
+          value:
+            apiVersion: controller.config.cert-manager.io/v1alpha1
+            kind: ControllerConfiguration
+            enableGatewayAPI: true
+
+  - it: enables it on the hosted variant too (isp-hosted)
+    template: templates/bundles/system.yaml
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-hosted
+        iaas:
+          enabled: false
+    documentSelector:
+      path: metadata.name
+      value: cozystack.cert-manager
+    asserts:
+      - equal:
+          path: spec.components.cert-manager.values.cert-manager.config.enableGatewayAPI
+          value: true
+
+  # What makes the flag safe on the host: the CRDs ship on every variant and
+  # cert-manager is ordered after them. Losing either turns the flag into the
+  # tenant failure mode described above.
+  - it: ships the Gateway API CRDs on the hosted variant as well (isp-hosted)
+    template: templates/bundles/system.yaml
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-hosted
+        iaas:
+          enabled: false
+    asserts:
+      - containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.gateway-api-crds
+          any: true
+
+  - it: orders cert-manager after the Gateway API CRDs
+    template: templates/sources.yaml
+    documentSelector:
+      path: metadata.name
+      value: cozystack.cert-manager
+    asserts:
+      - contains:
+          path: spec.variants[0].dependsOn
+          content: cozystack.gateway-api-crds
diff --git a/packages/core/platform/tests/bundles_cilium_pool_wiring_test.yaml b/packages/core/platform/tests/bundles_cilium_pool_wiring_test.yaml
new file mode 100644
index 0000000000..9c18faed17
--- /dev/null
+++ b/packages/core/platform/tests/bundles_cilium_pool_wiring_test.yaml
@@ -0,0 +1,133 @@
+suite: Cilium address block on the kube-ovn variants
+templates:
+  - templates/bundles/system.yaml
+release:
+  name: cozystack
+  namespace: cozy-system
+tests:
+  # The block has to be the same in both places: Cilium allocates its router and
+  # Ingress IPs from it, and kube-ovn must never hand one of those to a pod.
+  - it: hands the last /21 of the default pod CIDR to Cilium and excludes it in kube-ovn
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full
+    documentSelector:
+      path: metadata.name
+      value: cozystack.networking
+    asserts:
+      - equal:
+          path: spec.variant
+          value: kubeovn-cilium
+      - equal:
+          path: spec.components.cilium.values.cilium.ipam.operator.clusterPoolIPv4PodCIDRList
+          value:
+            - 10.244.248.0/21
+      - equal:
+          path: spec.components.kubeovn.values.kube-ovn.networking.EXCLUDE_IPS
+          value: 10.244.248.0..10.244.255.255
+
+  - it: follows a custom pod CIDR on the generic variant
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full-generic
+      networking:
+        podCIDR: 10.42.0.0/16
+    documentSelector:
+      path: metadata.name
+      value: cozystack.networking
+    asserts:
+      - equal:
+          path: spec.variant
+          value: kubeovn-cilium-generic
+      - equal:
+          path: spec.components.cilium.values.cilium.ipam.operator.clusterPoolIPv4PodCIDRList
+          value:
+            - 10.42.248.0/21
+      - equal:
+          path: spec.components.kubeovn.values.kube-ovn.networking.EXCLUDE_IPS
+          value: 10.42.248.0..10.42.255.255
+
+  - it: takes the end of a wider pod CIDR and ignores host bits in the network address
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full
+      networking:
+        podCIDR: 10.100.7.1/12
+    documentSelector:
+      path: metadata.name
+      value: cozystack.networking
+    asserts:
+      - equal:
+          path: spec.components.cilium.values.cilium.ipam.operator.clusterPoolIPv4PodCIDRList
+          value:
+            - 10.111.248.0/21
+      - equal:
+          path: spec.components.kubeovn.values.kube-ovn.networking.EXCLUDE_IPS
+          value: 10.111.248.0..10.111.255.255
+
+  - it: keeps the kube-ovn ipv4 overrides next to the exclusion
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full
+    documentSelector:
+      path: metadata.name
+      value: cozystack.networking
+    asserts:
+      - equal:
+          path: spec.components.kubeovn.values.kube-ovn.ipv4.POD_CIDR
+          value: 10.244.0.0/16
+      - equal:
+          path: spec.components.cilium.values.cilium.k8sServiceHost
+          value: localhost
+
+  - it: refuses a pod CIDR too small to give up a /21
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full
+      networking:
+        podCIDR: 10.244.0.0/21
+    asserts:
+      - failedTemplate:
+          errorPattern: "networking.podCIDR 10.244.0.0/21 is too small"
+
+  - it: refuses a pod CIDR that is not an IPv4 CIDR
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full
+      networking:
+        podCIDR: fd00::/64
+    asserts:
+      - failedTemplate:
+          errorPattern: "is not an IPv4 CIDR"
+
+  # The slim variants run Cilium alone. It allocates pod addresses there from
+  # Node.spec.podCIDR, so neither the block nor kube-ovn belongs in them.
+  - it: leaves the slim variant's Cilium IPAM alone
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-slim
+    documentSelector:
+      path: metadata.name
+      value: cozystack.networking
+    asserts:
+      - equal:
+          path: spec.variant
+          value: cilium
+      - notExists:
+          path: spec.components.cilium.values.cilium.ipam
+      - notExists:
+          path: spec.components.kubeovn
diff --git a/packages/core/platform/tests/bundles_gateway_http2_wiring_test.yaml b/packages/core/platform/tests/bundles_gateway_http2_wiring_test.yaml
new file mode 100644
index 0000000000..2db9828e6c
--- /dev/null
+++ b/packages/core/platform/tests/bundles_gateway_http2_wiring_test.yaml
@@ -0,0 +1,94 @@
+suite: gateway.http2 bundle wiring
+templates:
+  - templates/bundles/system.yaml
+release:
+  name: cozystack
+  namespace: cozy-system
+tests:
+  # Browsers negotiate HTTP/2 only through TLS ALPN "h2". The knob maps to
+  # cilium.gatewayAPI.enableAlpn, which must arrive as inline component values
+  # on the cozystack.networking Package — inline HelmRelease values are the
+  # only layer that overrides the system/cilium valuesFiles default, so a
+  # value that stops rendering here silently stops reaching the dataplane.
+  - it: threads gatewayAPI.enableAlpn=true into cilium by default (isp-full)
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full
+    documentSelector:
+      path: metadata.name
+      value: cozystack.networking
+    asserts:
+      - equal:
+          path: spec.variant
+          value: kubeovn-cilium
+      - equal:
+          path: spec.components.cilium.values.cilium.gatewayAPI.enableAlpn
+          value: true
+
+  - it: threads gatewayAPI.enableAlpn=false when gateway.http2 is disabled (isp-full)
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full
+      gateway:
+        http2: false
+    documentSelector:
+      path: metadata.name
+      value: cozystack.networking
+    asserts:
+      - equal:
+          path: spec.components.cilium.values.cilium.gatewayAPI.enableAlpn
+          value: false
+
+  - it: keeps the Talos-specific cilium endpoint values alongside the ALPN flag (isp-full)
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full
+    documentSelector:
+      path: metadata.name
+      value: cozystack.networking
+    asserts:
+      - equal:
+          path: spec.components.cilium.values.cilium.k8sServiceHost
+          value: localhost
+      - equal:
+          path: spec.components.cilium.values.cilium.k8sServicePort
+          value: "7445"
+
+  - it: threads gatewayAPI.enableAlpn=true into cilium by default (isp-full-generic)
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full-generic
+    documentSelector:
+      path: metadata.name
+      value: cozystack.networking
+    asserts:
+      - equal:
+          path: spec.variant
+          value: kubeovn-cilium-generic
+      - equal:
+          path: spec.components.cilium.values.cilium.gatewayAPI.enableAlpn
+          value: true
+
+  - it: threads gatewayAPI.enableAlpn=false when gateway.http2 is disabled (isp-full-generic)
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full-generic
+      gateway:
+        http2: false
+    documentSelector:
+      path: metadata.name
+      value: cozystack.networking
+    asserts:
+      - equal:
+          path: spec.components.cilium.values.cilium.gatewayAPI.enableAlpn
+          value: false
diff --git a/packages/core/platform/tests/bundles_gpu_kubevirt_wiring_test.yaml b/packages/core/platform/tests/bundles_gpu_kubevirt_wiring_test.yaml
new file mode 100644
index 0000000000..997f8c50d3
--- /dev/null
+++ b/packages/core/platform/tests/bundles_gpu_kubevirt_wiring_test.yaml
@@ -0,0 +1,951 @@
+suite: bundles.iaas gpu-operator → kubevirt wiring
+templates:
+  - templates/bundles/iaas.yaml
+release:
+  name: cozystack
+  namespace: cozy-system
+tests:
+  - it: leaves cozystack.kubevirt with no extra gpu wiring when gpu-operator is not enabled
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full
+        iaas:
+          enabled: true
+        enabledPackages: []
+    documentSelector:
+      path: metadata.name
+      value: cozystack.kubevirt
+    asserts:
+      - equal:
+          path: kind
+          value: Package
+      - notExists:
+          path: spec.components.kubevirt.values.extraFeatureGates
+      - notExists:
+          path: spec.components.kubevirt.values.permittedHostDevices
+      - notExists:
+          path: spec.components.kubevirt.values.mediatedDevicesConfiguration
+
+  - it: emits gpu-operator Package at default variant when only the package is enabled (no explicit variant override)
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full
+        iaas:
+          enabled: true
+        enabledPackages:
+        - cozystack.gpu-operator
+    documentSelector:
+      path: metadata.name
+      value: cozystack.gpu-operator
+    asserts:
+      - equal:
+          path: spec.variant
+          value: default
+
+  - it: wires HostDevices gate plus NVIDIA passthrough pciHostDevices into the kubevirt component when gpu-operator is enabled at the default (passthrough) variant
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full
+        iaas:
+          enabled: true
+        enabledPackages:
+        - cozystack.gpu-operator
+    documentSelector:
+      path: metadata.name
+      value: cozystack.kubevirt
+    asserts:
+      - contains:
+          path: spec.components.kubevirt.values.extraFeatureGates
+          content: HostDevices
+      - exists:
+          path: spec.components.kubevirt.values.permittedHostDevices.pciHostDevices
+      - contains:
+          path: spec.components.kubevirt.values.permittedHostDevices.pciHostDevices
+          content:
+            pciVendorSelector: "10DE:2335"
+            resourceName: nvidia.com/GH100_H200_SXM_141GB
+            externalResourceProvider: true
+      - notExists:
+          path: spec.components.kubevirt.values.permittedHostDevices.mediatedDevices
+      - notExists:
+          path: spec.components.kubevirt.values.mediatedDevicesConfiguration
+
+  - it: switches gpu-operator Package to vgpu variant when bundles.iaas.gpuOperatorVariant is "vgpu"
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full
+        iaas:
+          enabled: true
+          gpuOperatorVariant: vgpu
+        enabledPackages:
+        - cozystack.gpu-operator
+    documentSelector:
+      path: metadata.name
+      value: cozystack.gpu-operator
+    asserts:
+      - equal:
+          path: spec.variant
+          value: vgpu
+
+  - it: exposes NVIDIA mediatedDevices by name in vgpu variant when gpu.vgpuDeviceManager.enabled is true, and does NOT default a numeric mediatedDevicesConfiguration (mdev creation is delegated to the vGPU Device Manager)
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full
+        iaas:
+          enabled: true
+          gpuOperatorVariant: vgpu
+        enabledPackages:
+        - cozystack.gpu-operator
+      gpu:
+        vgpuDeviceManager:
+          enabled: true
+    documentSelector:
+      path: metadata.name
+      value: cozystack.kubevirt
+    asserts:
+      - contains:
+          path: spec.components.kubevirt.values.extraFeatureGates
+          content: HostDevices
+      - exists:
+          path: spec.components.kubevirt.values.permittedHostDevices.mediatedDevices
+      - notExists:
+          path: spec.components.kubevirt.values.permittedHostDevices.pciHostDevices
+      # No numeric mediatedDeviceTypes is shipped by default — those ids are
+      # per-(SKU, driver) sysfs indices, and the vGPU Device Manager already
+      # creates the mdevs by name.
+      - notExists:
+          path: spec.components.kubevirt.values.mediatedDevicesConfiguration
+
+  - it: suppresses the NVIDIA mdev defaults in vgpu variant when gpu.vgpuDeviceManager.enabled is false (default — Ada Lovelace SR-IOV path), so KubeVirt does not advertise resources that no daemon can ever create
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full
+        iaas:
+          enabled: true
+          gpuOperatorVariant: vgpu
+        enabledPackages:
+        - cozystack.gpu-operator
+    documentSelector:
+      path: metadata.name
+      value: cozystack.kubevirt
+    asserts:
+      - contains:
+          path: spec.components.kubevirt.values.extraFeatureGates
+          content: HostDevices
+      - notExists:
+          path: spec.components.kubevirt.values.permittedHostDevices.mediatedDevices
+      - notExists:
+          path: spec.components.kubevirt.values.permittedHostDevices.pciHostDevices
+      - notExists:
+          path: spec.components.kubevirt.values.mediatedDevicesConfiguration
+
+  - it: appends user-supplied pciHostDevices to the NVIDIA defaults when gpu.replaceDefaults is false
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full
+        iaas:
+          enabled: true
+        enabledPackages:
+        - cozystack.gpu-operator
+      gpu:
+        permittedHostDevices:
+          pciHostDevices:
+          - pciVendorSelector: "1002:744C"
+            resourceName: amd.com/MI300X
+            externalResourceProvider: true
+    documentSelector:
+      path: metadata.name
+      value: cozystack.kubevirt
+    asserts:
+      - contains:
+          path: spec.components.kubevirt.values.permittedHostDevices.pciHostDevices
+          content:
+            pciVendorSelector: "10DE:2335"
+            resourceName: nvidia.com/GH100_H200_SXM_141GB
+            externalResourceProvider: true
+      - contains:
+          path: spec.components.kubevirt.values.permittedHostDevices.pciHostDevices
+          content:
+            pciVendorSelector: "1002:744C"
+            resourceName: amd.com/MI300X
+            externalResourceProvider: true
+
+  - it: drops NVIDIA defaults and keeps only the user list when gpu.replaceDefaults is true
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full
+        iaas:
+          enabled: true
+        enabledPackages:
+        - cozystack.gpu-operator
+      gpu:
+        replaceDefaults: true
+        permittedHostDevices:
+          pciHostDevices:
+          - pciVendorSelector: "1002:744C"
+            resourceName: amd.com/MI300X
+            externalResourceProvider: true
+    documentSelector:
+      path: metadata.name
+      value: cozystack.kubevirt
+    asserts:
+      - equal:
+          path: spec.components.kubevirt.values.permittedHostDevices.pciHostDevices
+          value:
+          - pciVendorSelector: "1002:744C"
+            resourceName: amd.com/MI300X
+            externalResourceProvider: true
+
+  - it: fails fast with a descriptive error when bundles.iaas.gpuOperatorVariant is set to an unsupported value
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full
+        iaas:
+          enabled: true
+          gpuOperatorVariant: sriov
+        enabledPackages:
+        - cozystack.gpu-operator
+    asserts:
+      - failedTemplate:
+          errorMessage: 'bundles.iaas.gpuOperatorVariant must be "default", "vgpu" or "container", got "sriov"'
+
+  - it: rejects an invalid gpuOperatorVariant even when gpu-operator is not enabled so the typo is caught at edit time, not at gpu-enable time
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full
+        iaas:
+          enabled: true
+          gpuOperatorVariant: passthrough
+        enabledPackages: []
+    asserts:
+      - failedTemplate:
+          errorMessage: 'bundles.iaas.gpuOperatorVariant must be "default", "vgpu" or "container", got "passthrough"'
+
+  # The container variant is the third variant the cozystack.gpu-operator
+  # PackageSource ships (values.yaml + values-container.yaml). The bundle
+  # guard rejected it for its first release, which made a shipped and tested
+  # variant unselectable from platform values.
+  - it: emits the gpu-operator Package at the container variant so the third shipped variant is selectable from platform values
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full
+        iaas:
+          enabled: true
+          gpuOperatorVariant: container
+        enabledPackages:
+        - cozystack.gpu-operator
+      # Both legs of the vgpu forwarding block are armed on purpose. It is
+      # the only writer of spec.components on this Package and container
+      # newly reaches its gate; with these unset the block yields an empty
+      # dict either way, so the notExists below would hold even if the gate
+      # admitted container.
+      gpu:
+        vgpuManager:
+          imagePullSecrets:
+          - nvidia-registry-secret
+        vgpuDeviceManager:
+          enabled: true
+    documentSelector:
+      path: metadata.name
+      value: cozystack.gpu-operator
+    asserts:
+      - equal:
+          path: kind
+          value: Package
+      - equal:
+          path: spec.variant
+          value: container
+      - notExists:
+          path: spec.components
+
+  # The container variant keeps the host NVIDIA driver bound and pins
+  # vfioManager off, so no GPU can be detached for a VM. Emitting the
+  # HostDevices gate would advertise a KubeVirt capability the node cannot
+  # serve, and the pciHostDevices table would name resources that no
+  # sandbox device plugin ever registers.
+  - it: leaves the KubeVirt host-device wiring out entirely in the container variant, even with gpu.* overrides set
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full
+        iaas:
+          enabled: true
+          gpuOperatorVariant: container
+        enabledPackages:
+        - cozystack.gpu-operator
+      gpu:
+        permittedHostDevices:
+          pciHostDevices:
+          - pciVendorSelector: "1002:744C"
+            resourceName: amd.com/MI300X
+            externalResourceProvider: true
+          mediatedDevices:
+          - mdevNameSelector: NVIDIA A100-40C
+            resourceName: nvidia.com/A100-40C
+            externalResourceProvider: true
+        mediatedDevicesConfiguration:
+          mediatedDeviceTypes:
+          - nvidia-559
+    documentSelector:
+      path: metadata.name
+      value: cozystack.kubevirt
+    asserts:
+      - notExists:
+          path: spec.components.kubevirt.values.extraFeatureGates
+      - notExists:
+          path: spec.components.kubevirt.values.permittedHostDevices
+      - notExists:
+          path: spec.components.kubevirt.values.mediatedDevicesConfiguration
+      # The rest of the kubevirt component values are untouched by the
+      # variant — this pins that the container branch skips only the GPU
+      # wiring, not the whole component block.
+      - equal:
+          path: spec.components.kubevirt.values.cpuAllocationRatio
+          value: 10
+
+  - it: emits the gpu-operator Package without component overrides for the passthrough variant so vfio-pci defaults from the chart apply unchanged
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full
+        iaas:
+          enabled: true
+        enabledPackages:
+        - cozystack.gpu-operator
+    documentSelector:
+      path: metadata.name
+      value: cozystack.gpu-operator
+    asserts:
+      - equal:
+          path: spec.variant
+          value: default
+      - notExists:
+          path: spec.components
+
+  - it: forwards vgpuManager image coordinates from gpu.vgpuManager into the gpu-operator Package CR when bundles.iaas.gpuOperatorVariant is vgpu
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full
+        iaas:
+          enabled: true
+          gpuOperatorVariant: vgpu
+        enabledPackages:
+        - cozystack.gpu-operator
+      gpu:
+        vgpuManager:
+          repository: registry.example.com/nvidia
+          image: vgpu-manager-custom
+          version: "595.58.02-ubuntu24.04"
+          imagePullSecrets:
+          - nvidia-registry-secret
+    documentSelector:
+      path: metadata.name
+      value: cozystack.gpu-operator
+    asserts:
+      - equal:
+          path: spec.variant
+          value: vgpu
+      - equal:
+          path: spec.components.gpu-operator.values.gpu-operator.vgpuManager.repository
+          value: registry.example.com/nvidia
+      - equal:
+          path: spec.components.gpu-operator.values.gpu-operator.vgpuManager.image
+          value: vgpu-manager-custom
+      - equal:
+          path: spec.components.gpu-operator.values.gpu-operator.vgpuManager.version
+          value: "595.58.02-ubuntu24.04"
+      - equal:
+          path: spec.components.gpu-operator.values.gpu-operator.vgpuManager.imagePullSecrets
+          value:
+          - nvidia-registry-secret
+
+  - it: forwards gpu.vgpuManager.imagePullSecrets even when repository/version/image are left at the platform defaults — private registries with the chart-default tag are a real config and must not be silently dropped
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full
+        iaas:
+          enabled: true
+          gpuOperatorVariant: vgpu
+        enabledPackages:
+        - cozystack.gpu-operator
+      gpu:
+        vgpuManager:
+          imagePullSecrets:
+          - nvidia-registry-secret
+    documentSelector:
+      path: metadata.name
+      value: cozystack.gpu-operator
+    asserts:
+      - equal:
+          path: spec.components.gpu-operator.values.gpu-operator.vgpuManager.imagePullSecrets
+          value:
+          - nvidia-registry-secret
+
+  - it: enables nvidia vgpu-device-manager in the gpu-operator Package CR when gpu.vgpuDeviceManager.enabled is true so mediated devices actually materialize on the node
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full
+        iaas:
+          enabled: true
+          gpuOperatorVariant: vgpu
+        enabledPackages:
+        - cozystack.gpu-operator
+      gpu:
+        vgpuDeviceManager:
+          enabled: true
+    documentSelector:
+      path: metadata.name
+      value: cozystack.gpu-operator
+    asserts:
+      - equal:
+          path: spec.components.gpu-operator.values.gpu-operator.vgpuDeviceManager.enabled
+          value: true
+
+  - it: leaves the gpu-operator Package without vgpuManager overrides when gpu.vgpuManager.repository and .version are both blank — the operator can still hand-craft a Package CR override later
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full
+        iaas:
+          enabled: true
+          gpuOperatorVariant: vgpu
+        enabledPackages:
+        - cozystack.gpu-operator
+    documentSelector:
+      path: metadata.name
+      value: cozystack.gpu-operator
+    asserts:
+      - equal:
+          path: spec.variant
+          value: vgpu
+      - notExists:
+          path: spec.components.gpu-operator
+
+  - it: propagates resources.cpuAllocationRatio into the kubevirt component values even when gpu-operator is not enabled
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full
+        iaas:
+          enabled: true
+        enabledPackages: []
+      resources:
+        cpuAllocationRatio: 7
+    documentSelector:
+      path: metadata.name
+      value: cozystack.kubevirt
+    asserts:
+      - equal:
+          path: spec.components.kubevirt.values.cpuAllocationRatio
+          value: 7
+
+  # The kubevirt chart reads disabledFeatureGates from its own values, and the
+  # only writer of a Package CR's components is this bundle — editing the CR by
+  # hand is undone on the next platform render. Without this hop the chart value
+  # is unreachable from a supported install.
+  - it: forwards kubevirt.disabledFeatureGates into the kubevirt component values
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full
+        iaas:
+          enabled: true
+        enabledPackages: []
+      kubevirt:
+        disabledFeatureGates:
+        - ImageVolume
+    documentSelector:
+      path: metadata.name
+      value: cozystack.kubevirt
+    asserts:
+      - equal:
+          path: spec.components.kubevirt.values.disabledFeatureGates
+          value:
+          - ImageVolume
+
+  - it: leaves disabledFeatureGates out of the kubevirt component values at the platform defaults
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full
+        iaas:
+          enabled: true
+        enabledPackages: []
+    documentSelector:
+      path: metadata.name
+      value: cozystack.kubevirt
+    asserts:
+      - notExists:
+          path: spec.components.kubevirt.values.disabledFeatureGates
+      - notExists:
+          path: spec.components.kubevirt.values.migrations
+      - equal:
+          path: spec.components
+          value:
+            kubevirt:
+              values:
+                cpuAllocationRatio: 10
+
+  - it: renders the kubevirt Package without a nil-pointer error when the whole kubevirt block is set to null
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full
+        iaas:
+          enabled: true
+        enabledPackages: []
+      kubevirt: null
+    documentSelector:
+      path: metadata.name
+      value: cozystack.kubevirt
+    asserts:
+      - equal:
+          path: kind
+          value: Package
+      - notExists:
+          path: spec.components.kubevirt.values.disabledFeatureGates
+      - notExists:
+          path: spec.components.kubevirt.values.migrations
+
+  - it: forwards kubevirt.migrations into the kubevirt component values
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full
+        iaas:
+          enabled: true
+        enabledPackages: []
+      kubevirt:
+        migrations:
+          bandwidthPerMigration: 625M
+          parallelMigrationsPerCluster: 2
+          parallelOutboundMigrationsPerNode: 1
+    documentSelector:
+      path: metadata.name
+      value: cozystack.kubevirt
+    asserts:
+      - equal:
+          path: spec.components.kubevirt.values
+          value:
+            cpuAllocationRatio: 10
+            migrations:
+              bandwidthPerMigration: 625M
+              parallelMigrationsPerCluster: 2
+              parallelOutboundMigrationsPerNode: 1
+
+  - it: omits empty kubevirt.migrations
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full
+        iaas:
+          enabled: true
+        enabledPackages: []
+      kubevirt:
+        migrations: {}
+    documentSelector:
+      path: metadata.name
+      value: cozystack.kubevirt
+    asserts:
+      - equal:
+          path: spec.components.kubevirt.values
+          value:
+            cpuAllocationRatio: 10
+
+  - it: omits null kubevirt.migrations
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full
+        iaas:
+          enabled: true
+        enabledPackages: []
+      kubevirt:
+        migrations: null
+    documentSelector:
+      path: metadata.name
+      value: cozystack.kubevirt
+    asserts:
+      - equal:
+          path: spec.components.kubevirt.values
+          value:
+            cpuAllocationRatio: 10
+
+  - it: preserves false and zero kubevirt.migrations values
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full
+        iaas:
+          enabled: true
+        enabledPackages: []
+      kubevirt:
+        migrations:
+          allowAutoConverge: false
+          completionTimeoutPerGiB: 0
+    documentSelector:
+      path: metadata.name
+      value: cozystack.kubevirt
+    asserts:
+      - equal:
+          path: spec.components.kubevirt.values
+          value:
+            cpuAllocationRatio: 10
+            migrations:
+              allowAutoConverge: false
+              completionTimeoutPerGiB: 0
+
+  - it: appends user-supplied pciHostDevices in vgpu mode so post-kubevirt#16890 SR-IOV vGPU VFs can be advertised alongside the platform mediated defaults
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full
+        iaas:
+          enabled: true
+          gpuOperatorVariant: vgpu
+        enabledPackages:
+        - cozystack.gpu-operator
+      gpu:
+        vgpuDeviceManager:
+          enabled: true
+        permittedHostDevices:
+          pciHostDevices:
+          - pciVendorSelector: "10DE:26B9"
+            resourceName: nvidia.com/L40S-24Q
+    documentSelector:
+      path: metadata.name
+      value: cozystack.kubevirt
+    asserts:
+      - exists:
+          path: spec.components.kubevirt.values.permittedHostDevices.pciHostDevices
+      - contains:
+          path: spec.components.kubevirt.values.permittedHostDevices.pciHostDevices
+          content:
+            pciVendorSelector: "10DE:26B9"
+            resourceName: nvidia.com/L40S-24Q
+      - exists:
+          path: spec.components.kubevirt.values.permittedHostDevices.mediatedDevices
+
+  - it: appends user-supplied mediatedDevices in vgpu mode on top of the platform NVIDIA defaults when the device manager is enabled
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full
+        iaas:
+          enabled: true
+          gpuOperatorVariant: vgpu
+        enabledPackages:
+        - cozystack.gpu-operator
+      gpu:
+        vgpuDeviceManager:
+          enabled: true
+        permittedHostDevices:
+          mediatedDevices:
+          - mdevNameSelector: NVIDIA H100-80C
+            resourceName: nvidia.com/H100-80C
+            externalResourceProvider: true
+    documentSelector:
+      path: metadata.name
+      value: cozystack.kubevirt
+    asserts:
+      - contains:
+          path: spec.components.kubevirt.values.permittedHostDevices.mediatedDevices
+          content:
+            mdevNameSelector: NVIDIA A100-40C
+            resourceName: nvidia.com/A100-40C
+            externalResourceProvider: true
+      - contains:
+          path: spec.components.kubevirt.values.permittedHostDevices.mediatedDevices
+          content:
+            mdevNameSelector: NVIDIA H100-80C
+            resourceName: nvidia.com/H100-80C
+            externalResourceProvider: true
+
+  - it: drops the NVIDIA vgpu defaults and keeps only the user mediatedDevices / mediatedDevicesConfiguration when gpu.replaceDefaults is true
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full
+        iaas:
+          enabled: true
+          gpuOperatorVariant: vgpu
+        enabledPackages:
+        - cozystack.gpu-operator
+      gpu:
+        replaceDefaults: true
+        permittedHostDevices:
+          mediatedDevices:
+          - mdevNameSelector: NVIDIA H100-80C
+            resourceName: nvidia.com/H100-80C
+            externalResourceProvider: true
+        mediatedDevicesConfiguration:
+          mediatedDeviceTypes:
+          - nvidia-1234
+    documentSelector:
+      path: metadata.name
+      value: cozystack.kubevirt
+    asserts:
+      - equal:
+          path: spec.components.kubevirt.values.permittedHostDevices.mediatedDevices
+          value:
+          - mdevNameSelector: NVIDIA H100-80C
+            resourceName: nvidia.com/H100-80C
+            externalResourceProvider: true
+      - equal:
+          path: spec.components.kubevirt.values.mediatedDevicesConfiguration.mediatedDeviceTypes
+          value:
+          - nvidia-1234
+
+  - it: skips gpu wiring when cozystack.gpu-operator appears in both enabledPackages and disabledPackages — disabled wins, mirroring the optional-package helper
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full
+        iaas:
+          enabled: true
+        enabledPackages:
+        - cozystack.gpu-operator
+        disabledPackages:
+        - cozystack.gpu-operator
+    documentSelector:
+      path: metadata.name
+      value: cozystack.kubevirt
+    asserts:
+      - notExists:
+          path: spec.components.kubevirt.values.extraFeatureGates
+      - notExists:
+          path: spec.components.kubevirt.values.permittedHostDevices
+      - notExists:
+          path: spec.components.kubevirt.values.mediatedDevicesConfiguration
+
+  - it: ignores user gpu.mediatedDevices and gpu.mediatedDevicesConfiguration in the passthrough variant — vGPU-only knobs must not leak into a vfio-pci CR
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full
+        iaas:
+          enabled: true
+        enabledPackages:
+        - cozystack.gpu-operator
+      gpu:
+        permittedHostDevices:
+          mediatedDevices:
+          - mdevNameSelector: NVIDIA A100-40C
+            resourceName: nvidia.com/A100-40C
+            externalResourceProvider: true
+        mediatedDevicesConfiguration:
+          mediatedDeviceTypes:
+          - nvidia-559
+    documentSelector:
+      path: metadata.name
+      value: cozystack.kubevirt
+    asserts:
+      - exists:
+          path: spec.components.kubevirt.values.permittedHostDevices.pciHostDevices
+      - notExists:
+          path: spec.components.kubevirt.values.permittedHostDevices.mediatedDevices
+      - notExists:
+          path: spec.components.kubevirt.values.mediatedDevicesConfiguration
+
+  - it: renders the passthrough wiring without a nil-pointer error when the whole gpu block is set to null and gpu-operator is enabled
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full
+        iaas:
+          enabled: true
+        enabledPackages:
+        - cozystack.gpu-operator
+      gpu: null
+    documentSelector:
+      path: metadata.name
+      value: cozystack.kubevirt
+    asserts:
+      - contains:
+          path: spec.components.kubevirt.values.extraFeatureGates
+          content: HostDevices
+      - exists:
+          path: spec.components.kubevirt.values.permittedHostDevices.pciHostDevices
+
+  - it: renders the vgpu wiring without a nil-pointer error when the whole gpu block is set to null and gpu-operator runs in the vgpu variant
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full
+        iaas:
+          enabled: true
+          gpuOperatorVariant: vgpu
+        enabledPackages:
+        - cozystack.gpu-operator
+      gpu: null
+    documentSelector:
+      path: metadata.name
+      value: cozystack.kubevirt
+    asserts:
+      - contains:
+          path: spec.components.kubevirt.values.extraFeatureGates
+          content: HostDevices
+
+  - it: renders without a nil-pointer error when gpu sub-keys are empty (null) YAML keys
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full
+        iaas:
+          enabled: true
+        enabledPackages:
+        - cozystack.gpu-operator
+      gpu:
+        permittedHostDevices: null
+        mediatedDevicesConfiguration: null
+        vgpuDeviceManager: null
+        vgpuManager: null
+    documentSelector:
+      path: metadata.name
+      value: cozystack.kubevirt
+    asserts:
+      - contains:
+          path: spec.components.kubevirt.values.extraFeatureGates
+          content: HostDevices
+      - exists:
+          path: spec.components.kubevirt.values.permittedHostDevices.pciHostDevices
+
+  - it: advertises GPUs under the exact resourceName the sandbox plugin generates from pci.ids (uppercase, with Tesla/GL/PCIE tokens) — the slugs that actually match the node
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full
+        iaas:
+          enabled: true
+        enabledPackages:
+        - cozystack.gpu-operator
+    documentSelector:
+      path: metadata.name
+      value: cozystack.kubevirt
+    asserts:
+      # Turing T4 — pci.ids "TU104GL [Tesla T4]" → TU104GL_TESLA_T4 (the
+      # plugin keeps the Tesla brand and upper-cases). The tidy TU104GL_T4
+      # form never matches a vanilla plugin.
+      - contains:
+          path: spec.components.kubevirt.values.permittedHostDevices.pciHostDevices
+          content:
+            pciVendorSelector: "10DE:1EB8"
+            resourceName: nvidia.com/TU104GL_TESLA_T4
+            externalResourceProvider: true
+      # Ampere A30 — pci.ids "GA100GL [A30 PCIe]" → GA100GL_A30_PCIE (GL die
+      # suffix and PCIE form factor are part of the slug).
+      - contains:
+          path: spec.components.kubevirt.values.permittedHostDevices.pciHostDevices
+          content:
+            pciVendorSelector: "10DE:20B7"
+            resourceName: nvidia.com/GA100GL_A30_PCIE
+            externalResourceProvider: true
+      # V100 SXM2 — 1DB1 is the 16GB part, 1DB5 the 32GB part (distinct
+      # device IDs); slug "GV100GL [Tesla V100 SXM2 NNGB]" → GV100GL_TESLA_...
+      - contains:
+          path: spec.components.kubevirt.values.permittedHostDevices.pciHostDevices
+          content:
+            pciVendorSelector: "10DE:1DB1"
+            resourceName: nvidia.com/GV100GL_TESLA_V100_SXM2_16GB
+            externalResourceProvider: true
+      - contains:
+          path: spec.components.kubevirt.values.permittedHostDevices.pciHostDevices
+          content:
+            pciVendorSelector: "10DE:1DB5"
+            resourceName: nvidia.com/GV100GL_TESLA_V100_SXM2_32GB
+            externalResourceProvider: true
+      # Regression guards: the tidy/short forms that do NOT match a vanilla
+      # plugin must never reappear.
+      - notContains:
+          path: spec.components.kubevirt.values.permittedHostDevices.pciHostDevices
+          content:
+            pciVendorSelector: "10DE:1EB8"
+            resourceName: nvidia.com/TU104GL_T4
+            externalResourceProvider: true
+      - notContains:
+          path: spec.components.kubevirt.values.permittedHostDevices.pciHostDevices
+          content:
+            pciVendorSelector: "10DE:1DB1"
+            resourceName: nvidia.com/GV100_V100_SXM2_32GB
+            externalResourceProvider: true
+
+  - it: still forwards a user-supplied gpu.mediatedDevicesConfiguration into the CR in vgpu mode (the override escape hatch survives the name-based default), alongside the name-based mediatedDevices defaults
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full
+        iaas:
+          enabled: true
+          gpuOperatorVariant: vgpu
+        enabledPackages:
+        - cozystack.gpu-operator
+      gpu:
+        vgpuDeviceManager:
+          enabled: true
+        mediatedDevicesConfiguration:
+          mediatedDeviceTypes:
+          - nvidia-473
+    documentSelector:
+      path: metadata.name
+      value: cozystack.kubevirt
+    asserts:
+      # name-based exposure defaults still flow in...
+      - contains:
+          path: spec.components.kubevirt.values.permittedHostDevices.mediatedDevices
+          content:
+            mdevNameSelector: NVIDIA A100-40C
+            resourceName: nvidia.com/A100-40C
+            externalResourceProvider: true
+      # ...and the operator's explicit numeric config is honoured.
+      - contains:
+          path: spec.components.kubevirt.values.mediatedDevicesConfiguration.mediatedDeviceTypes
+          content: nvidia-473
diff --git a/packages/core/platform/tests/bundles_isp_hosted_dependency_closure_test.yaml b/packages/core/platform/tests/bundles_isp_hosted_dependency_closure_test.yaml
new file mode 100644
index 0000000000..f307b2a61d
--- /dev/null
+++ b/packages/core/platform/tests/bundles_isp_hosted_dependency_closure_test.yaml
@@ -0,0 +1,146 @@
+suite: isp-hosted emits the dependency closure its app catalog needs
+templates:
+  - templates/bundles/system.yaml
+release:
+  name: cozystack
+  namespace: cozy-system
+tests:
+  # The isp-hosted preset drops the data-plane head (the host provides CNI,
+  # storage and virtualisation) but MUST still emit the system bundle's
+  # variant-agnostic control-plane body. Shipping bundles.system.enabled: false
+  # while paas/naas stayed on rendered an app catalog whose entire dependency
+  # closure was absent: all 24 Packages sat in DependenciesNotReady forever and
+  # the cozystack-platform HelmRelease never went Ready. Each package below is a
+  # dependsOn edge of a paas/naas application PackageSource, so losing any one of
+  # them reproduces that wedge.
+  - it: emits every package the paas/naas catalog depends on
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-hosted
+        iaas:
+          enabled: false
+        paas:
+          enabled: true
+        naas:
+          enabled: true
+    asserts:
+      # Sole source of the application-definition-crd component, i.e. the
+      # ApplicationDefinition CRD every *-rd component renders against. Without
+      # it the *-rd HelmReleases fail with `no matches for kind
+      # "ApplicationDefinition" in version "cozystack.io/v1alpha1"`.
+      - containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.cozystack-engine
+          any: true
+      # The noop networking Package for this variant. 23 of the catalog's
+      # PackageSources declare dependsOn: cozystack.networking.
+      - containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.networking
+          any: true
+      - containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.cert-manager
+          any: true
+      - containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.prometheus-operator-crds
+          any: true
+      - containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.postgres-operator
+          any: true
+      - containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.objectstorage-controller
+          any: true
+
+  # bucket-application lives in the system bundle rather than iaas: its own
+  # dependsOn closure is networking + objectstorage-controller + cozystack-engine
+  # and nothing in it needs KubeVirt or CAPI, while cozystack.backupstrategy-controller
+  # — a default package of the system bundle — hard-depends on it. Keeping it in
+  # iaas left every system-on/iaas-off configuration with a permanently
+  # DependenciesNotReady backupstrategy-controller.
+  - it: emits bucket-application from the system bundle even when iaas is disabled
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-hosted
+        iaas:
+          enabled: false
+    asserts:
+      - containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.bucket-application
+          any: true
+      - containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.backupstrategy-controller
+          any: true
+
+  # The tests above drive the templates through `set:`, so they pin the template
+  # logic but would not notice values-isp-hosted.yaml itself regressing. Load the
+  # shipped preset unmodified — this is the assertion that actually fails if
+  # bundles.system.enabled goes back to false, which is how the wedge shipped.
+  - it: ships the isp-hosted preset with the system bundle enabled
+    values:
+      - ../values-isp-hosted.yaml
+    asserts:
+      - containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.cozystack-engine
+          any: true
+      - containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.networking
+          any: true
+      - containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.bucket-application
+          any: true
+
+  # The hosted variant must not drag in the data-plane it exists to exclude.
+  #
+  # `any: true` is load-bearing on a negated containsDocument. Without it the
+  # assertion negates "EVERY rendered document matches", which any multi-document
+  # render satisfies trivially — the case then passes even with cozystack.linstor
+  # emitted into the hosted branch. With `any: true` it negates "SOME document
+  # matches", which is the intended meaning.
+  - it: does not emit data-plane packages on the hosted variant
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-hosted
+        iaas:
+          enabled: false
+    asserts:
+      - containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.linstor
+          any: true
+        not: true
+      # securitygroup-controller is emitted from the common-packages helper, which
+      # only the isp-full branches call — it watches cilium.io CRDs that the noop
+      # networking variant never installs. Emitted on isp-full, absent here.
+      - containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.securitygroup-controller
+          any: true
+        not: true
diff --git a/packages/core/platform/tests/bundles_keda_default_test.yaml b/packages/core/platform/tests/bundles_keda_default_test.yaml
new file mode 100644
index 0000000000..7d1d214151
--- /dev/null
+++ b/packages/core/platform/tests/bundles_keda_default_test.yaml
@@ -0,0 +1,60 @@
+suite: keda optional package (opt-in via enabledPackages)
+templates:
+  - templates/bundles/system.yaml
+release:
+  name: cozystack
+  namespace: cozy-system
+tests:
+  # KEDA is optional: it claims the cluster-wide external.metrics.k8s.io
+  # APIService, so it must never install unless an operator opts in. It also must
+  # not be a dependsOn of any default package, or the platform HelmRelease would
+  # stay DependenciesNotReady when KEDA is not enabled.
+  - it: does not emit cozystack.keda by default (optional, not enabled)
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full
+    asserts:
+      # any: true is REQUIRED inside the matcher for the negative to search the whole
+      # document set; without it containsDocument matches nothing and `not: true` is a
+      # vacuous no-op (a package.default regression would pass unnoticed).
+      - containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.keda
+          any: true
+        not: true
+
+  - it: emits cozystack.keda when listed in enabledPackages
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full
+        enabledPackages:
+          - cozystack.keda
+    asserts:
+      - containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.keda
+          any: true
+
+  - it: honors disabledPackages even when also enabled
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full
+        enabledPackages:
+          - cozystack.keda
+        disabledPackages:
+          - cozystack.keda
+    asserts:
+      - containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.keda
+          any: true
+        not: true
diff --git a/packages/core/platform/tests/bundles_multus_resources_test.yaml b/packages/core/platform/tests/bundles_multus_resources_test.yaml
new file mode 100644
index 0000000000..2dbb0bdd84
--- /dev/null
+++ b/packages/core/platform/tests/bundles_multus_resources_test.yaml
@@ -0,0 +1,147 @@
+suite: networking.multus.resources bundle wiring
+templates:
+  - templates/bundles/system.yaml
+release:
+  name: cozystack
+  namespace: cozy-system
+tests:
+  # Unset leaves the multus chart default in charge rather than freezing a copy
+  # of it into every Package.
+  - it: passes no resources when the key is unset
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full
+    documentSelector:
+      path: metadata.name
+      value: cozystack.multus
+    asserts:
+      - notExists:
+          path: spec.components.multus.values.resources
+      - equal:
+          path: spec.components.multus.values.stageCniPlugins
+          value: true
+
+  - it: passes an override on talos next to stageCniPlugins
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full
+      networking:
+        multus:
+          resources:
+            limits:
+              memory: 8Gi
+    documentSelector:
+      path: metadata.name
+      value: cozystack.multus
+    asserts:
+      - equal:
+          path: spec.components.multus.values
+          value:
+            stageCniPlugins: true
+            resources:
+              limits:
+                memory: 8Gi
+
+  - it: passes an override on generic Linux
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full-generic
+      networking:
+        multus:
+          resources:
+            requests:
+              cpu: 500m
+    documentSelector:
+      path: metadata.name
+      value: cozystack.multus
+    asserts:
+      - equal:
+          path: spec.components.multus.values.resources
+          value:
+            requests:
+              cpu: 500m
+
+  - it: passes an override when multus is opted in on a slim variant
+    values:
+      - ../values-isp-slim-generic.yaml
+    set:
+      bundles:
+        enabledPackages:
+          - cozystack.multus
+      networking:
+        multus:
+          resources:
+            limits:
+              memory: 8Gi
+    documentSelector:
+      path: metadata.name
+      value: cozystack.multus
+    asserts:
+      - equal:
+          path: spec.components.multus.values.resources.limits.memory
+          value: 8Gi
+
+  - it: reads an explicit null as unset
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full
+      networking:
+        multus:
+          resources: null
+    documentSelector:
+      path: metadata.name
+      value: cozystack.multus
+    asserts:
+      - notExists:
+          path: spec.components.multus.values.resources
+
+  - it: refuses resources that are not a map
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full
+      networking:
+        multus:
+          resources: 4Gi
+    asserts:
+      - failedTemplate:
+          errorMessage: 'networking.multus.resources: expected a map, got string'
+
+  # An uncommented `multus:` with nothing under it arrives as null.
+  - it: reads a null multus block as unset
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full
+      networking:
+        multus: null
+    documentSelector:
+      path: metadata.name
+      value: cozystack.multus
+    asserts:
+      - notExists:
+          path: spec.components.multus.values.resources
+
+  # false is the spelling most likely to mean "turn multus off", which this key
+  # does not do, so it must not pass as unset.
+  - it: refuses a multus block that is not a map
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full
+      networking:
+        multus: false
+    asserts:
+      - failedTemplate:
+          errorMessage: 'networking.multus: expected a map, got bool'
diff --git a/packages/core/platform/tests/bundles_multus_staging_test.yaml b/packages/core/platform/tests/bundles_multus_staging_test.yaml
new file mode 100644
index 0000000000..d994b86aa6
--- /dev/null
+++ b/packages/core/platform/tests/bundles_multus_staging_test.yaml
@@ -0,0 +1,287 @@
+suite: networking.stageCniPlugins bundle wiring
+templates:
+  - templates/bundles/system.yaml
+release:
+  name: cozystack
+  namespace: cozy-system
+tests:
+  # The line that delivers the feature: nothing asserted in
+  # packages/system/multus or hack/cni-plugins-staging-contract.bats can tell
+  # whether any bundle switches it on.
+  - it: stages the reference CNI plugins on generic Linux
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full-generic
+    documentSelector:
+      path: metadata.name
+      value: cozystack.multus
+    asserts:
+      - equal:
+          path: spec.components.multus.values.stageCniPlugins
+          value: true
+
+  # Talos is the default variant, and it bundles only bridge, firewall, flannel,
+  # host-local, loopback and portmap. The other ten are absent there too, so
+  # staging is on. The four that overlap are rewritten with the same upstream
+  # version rather than an older one, which is what makes this safe.
+  - it: stages the reference CNI plugins on talos as well
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full
+    documentSelector:
+      path: metadata.name
+      value: cozystack.multus
+    asserts:
+      - equal:
+          path: spec.components.multus.values.stageCniPlugins
+          value: true
+
+  # Turning staging on is a behaviour change for existing generic clusters, and
+  # the way out cannot be "disable the package": that takes the
+  # NetworkAttachmentDefinition CRD and the vpc app with it.
+  - it: honours an explicit opt-out on generic Linux
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full-generic
+      networking:
+        stageCniPlugins: false
+    documentSelector:
+      path: metadata.name
+      value: cozystack.multus
+    asserts:
+      - equal:
+          path: spec.components.multus.values.stageCniPlugins
+          value: false
+
+  # The other direction of the same lever on Talos: an operator who provisions
+  # /opt/cni/bin himself declines there too.
+  - it: honours an explicit opt-out on talos
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full
+      networking:
+        stageCniPlugins: false
+    documentSelector:
+      path: metadata.name
+      value: cozystack.multus
+    asserts:
+      - equal:
+          path: spec.components.multus.values.stageCniPlugins
+          value: false
+
+  # Clearing an override is written in Helm by setting the key to null rather
+  # than by deleting it, and `dig` returns its default only for an ABSENT key --
+  # a present-but-nil value comes through as nil. Both variants are asserted,
+  # because the bug would be in the resolution and not in either default.
+  - it: treats an explicit null as unset on generic Linux
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full-generic
+      networking:
+        stageCniPlugins: null
+    documentSelector:
+      path: metadata.name
+      value: cozystack.multus
+    asserts:
+      - equal:
+          path: spec.components.multus.values.stageCniPlugins
+          value: true
+
+  - it: treats an explicit null as unset on talos
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full
+      networking:
+        stageCniPlugins: null
+    documentSelector:
+      path: metadata.name
+      value: cozystack.multus
+    asserts:
+      - equal:
+          path: spec.components.multus.values.stageCniPlugins
+          value: true
+
+  # A values file can hand the key over as a string, so a spelling the template
+  # does not recognise must not resolve to the opposite of what was written.
+  - it: normalises a quoted spelling instead of reading it as off
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full
+      networking:
+        stageCniPlugins: "True"
+    documentSelector:
+      path: metadata.name
+      value: cozystack.multus
+    asserts:
+      - equal:
+          path: spec.components.multus.values.stageCniPlugins
+          value: true
+
+  # The helper holds the accepted spellings as two independent branches and
+  # nothing else makes them agree; a spelling moved across stays accepted while
+  # resolving to the opposite, since only an UNrecognised value calls fail().
+  # The chart's own two lists are a different pair, covered separately.
+  - it: resolves a non-canonical ON spelling as on, not as off
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full
+      networking:
+        stageCniPlugins: "yes"
+    documentSelector:
+      path: metadata.name
+      value: cozystack.multus
+    asserts:
+      - equal:
+          path: spec.components.multus.values.stageCniPlugins
+          value: true
+
+  - it: resolves a non-canonical OFF spelling as off, not as on
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full-generic
+      networking:
+        stageCniPlugins: "off"
+    documentSelector:
+      path: metadata.name
+      value: cozystack.multus
+    asserts:
+      - equal:
+          path: spec.components.multus.values.stageCniPlugins
+          value: false
+
+  - it: resolves the ON spelling 'on' the way it is documented
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full
+      networking:
+        stageCniPlugins: "on"
+    documentSelector:
+      path: metadata.name
+      value: cozystack.multus
+    asserts:
+      - equal:
+          path: spec.components.multus.values.stageCniPlugins
+          value: true
+
+  - it: resolves the ON spelling '1' the way it is documented
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full
+      networking:
+        stageCniPlugins: "1"
+    documentSelector:
+      path: metadata.name
+      value: cozystack.multus
+    asserts:
+      - equal:
+          path: spec.components.multus.values.stageCniPlugins
+          value: true
+
+  - it: resolves the OFF spelling 'no' the way it is documented
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full-generic
+      networking:
+        stageCniPlugins: "no"
+    documentSelector:
+      path: metadata.name
+      value: cozystack.multus
+    asserts:
+      - equal:
+          path: spec.components.multus.values.stageCniPlugins
+          value: false
+
+  - it: resolves the OFF spelling '0' the way it is documented
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full-generic
+      networking:
+        stageCniPlugins: "0"
+    documentSelector:
+      path: metadata.name
+      value: cozystack.multus
+    asserts:
+      - equal:
+          path: spec.components.multus.values.stageCniPlugins
+          value: false
+
+  - it: refuses a value that is neither true nor false
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full-generic
+      networking:
+        stageCniPlugins: maybe
+    asserts:
+      - failedTemplate:
+          errorMessage: 'networking.stageCniPlugins: expected a boolean, got "maybe" -- leaving it unset follows the bundle variant'
+
+  # multus is included by hand in both variant branches rather than through
+  # cozystack.platform.system.common-packages. The two branches currently pass
+  # the same value, and that is not an oversight: the value is variant-scoped by
+  # construction, not because it happens to differ. It differed when Talos was
+  # thought to carry the whole reference set; it stopped differing when that
+  # turned out to be five plugins out of fourteen. Folding multus back into the
+  # shared helper would edit a template every package renders through, and is
+  # worth doing only if variant scoping is decided to be wrong in principle --
+  # not because two lines read alike today.
+  #
+  # What the two cases below hold is that multus is shipped at all in each
+  # variant: dropping it takes the NetworkAttachmentDefinition CRD with it, and
+  # the vpc app dependsOn cozystack.multus -- that edge is asserted in
+  # tests/vpc_multus_dependency_test.yaml, which renders a different template and
+  # so cannot share this suite.
+  - it: ships multus in the talos bundle
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full
+    documentSelector:
+      path: metadata.name
+      value: cozystack.multus
+    asserts:
+      - equal:
+          path: spec.variant
+          value: default
+
+  - it: ships multus in the generic bundle
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full-generic
+    documentSelector:
+      path: metadata.name
+      value: cozystack.multus
+    asserts:
+      - equal:
+          path: spec.variant
+          value: default
diff --git a/packages/core/platform/tests/bundles_networking_encryption_test.yaml b/packages/core/platform/tests/bundles_networking_encryption_test.yaml
new file mode 100644
index 0000000000..3ec3efaada
--- /dev/null
+++ b/packages/core/platform/tests/bundles_networking_encryption_test.yaml
@@ -0,0 +1,137 @@
+suite: networking.encryption bundle wiring
+templates:
+  - templates/bundles/system.yaml
+release:
+  name: cozystack
+  namespace: cozy-system
+tests:
+  - it: leaves KubeOVN overlay IPsec unset on the default isp-full datapath when encryption is off
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full
+      networking:
+        encryption:
+          enabled: false
+    documentSelector:
+      path: metadata.name
+      value: cozystack.networking
+    asserts:
+      - equal:
+          path: spec.variant
+          value: kubeovn-cilium
+      - notExists:
+          path: spec.components.kubeovn.values.kube-ovn.func.ENABLE_OVN_IPSEC
+
+  - it: leaves KubeOVN overlay IPsec unset on isp-full when networking.encryption is absent (backward compatible, no nil-pointer)
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full
+    documentSelector:
+      path: metadata.name
+      value: cozystack.networking
+    asserts:
+      - equal:
+          path: spec.variant
+          value: kubeovn-cilium
+      - notExists:
+          path: spec.components.kubeovn.values.kube-ovn.func.ENABLE_OVN_IPSEC
+
+  - it: enables KubeOVN Geneve-overlay IPsec on the default isp-full datapath when encryption is on
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full
+      networking:
+        encryption:
+          enabled: true
+    documentSelector:
+      path: metadata.name
+      value: cozystack.networking
+    asserts:
+      - equal:
+          path: spec.variant
+          value: kubeovn-cilium
+      - equal:
+          path: spec.components.kubeovn.values.kube-ovn.func.ENABLE_OVN_IPSEC
+          value: true
+
+  - it: enables KubeOVN overlay IPsec on the generic kubeovn-cilium-generic datapath when encryption is on
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full-generic
+      networking:
+        encryption:
+          enabled: true
+    documentSelector:
+      path: metadata.name
+      value: cozystack.networking
+    asserts:
+      - equal:
+          path: spec.variant
+          value: kubeovn-cilium-generic
+      - equal:
+          path: spec.components.kubeovn.values.kube-ovn.func.ENABLE_OVN_IPSEC
+          value: true
+
+  - it: leaves the generic datapath IPsec unset when encryption is off
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full-generic
+      networking:
+        encryption:
+          enabled: false
+    documentSelector:
+      path: metadata.name
+      value: cozystack.networking
+    asserts:
+      - equal:
+          path: spec.variant
+          value: kubeovn-cilium-generic
+      - notExists:
+          path: spec.components.kubeovn.values.kube-ovn.func.ENABLE_OVN_IPSEC
+
+  - it: keeps the existing kube-ovn ipv4 component overrides alongside the IPsec toggle (deep merge, not replace)
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full
+      networking:
+        encryption:
+          enabled: true
+    documentSelector:
+      path: metadata.name
+      value: cozystack.networking
+    asserts:
+      - equal:
+          path: spec.components.kubeovn.values.kube-ovn.ipv4.POD_CIDR
+          value: 10.244.0.0/16
+      - equal:
+          path: spec.components.kubeovn.values.kube-ovn.func.ENABLE_OVN_IPSEC
+          value: true
+
+  - it: renders without a nil-pointer error when networking is set to null and encryption is therefore unreachable
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full
+      networking: null
+    documentSelector:
+      path: metadata.name
+      value: cozystack.networking
+    asserts:
+      - equal:
+          path: spec.variant
+          value: kubeovn-cilium
+      - notExists:
+          path: spec.components
diff --git a/packages/core/platform/tests/bundles_networking_variant_guard_test.yaml b/packages/core/platform/tests/bundles_networking_variant_guard_test.yaml
new file mode 100644
index 0000000000..f2edc9a6b1
--- /dev/null
+++ b/packages/core/platform/tests/bundles_networking_variant_guard_test.yaml
@@ -0,0 +1,230 @@
+suite: networking variant change guard (lookup of the live cozystack.networking Package)
+
+# A new networking variant is not a migration. The operator reconciles the
+# Package against the new variant and deletes every HelmRelease of the Package
+# that the new variant does not install: isp-full -> isp-hosted (noop) removes
+# cilium and kubeovn, isp-full -> isp-slim (cilium) removes kubeovn. The guard
+# reads the live Package and is inert where lookup returns nothing (helm
+# template, client-side dry-run, fresh install).
+templates:
+  - templates/bundles/system.yaml
+release:
+  name: cozystack
+  namespace: cozy-system
+set:
+  bundles:
+    system:
+      enabled: true
+      variant: isp-full
+tests:
+  - it: refuses isp-full -> isp-hosted on a live kubeovn-cilium cluster and names the acknowledge value
+    set:
+      bundles:
+        system:
+          variant: isp-hosted
+    kubernetesProvider:
+      scheme: &scheme
+        "cozystack.io/v1alpha1/Package":
+          gvr: {group: "cozystack.io", version: "v1alpha1", resource: "packages"}
+          namespaced: false
+      objects: &liveKubeovnCilium
+        - kind: Package
+          apiVersion: cozystack.io/v1alpha1
+          metadata: {name: cozystack.networking}
+          spec: {variant: kubeovn-cilium}
+    asserts:
+      - failedTemplate:
+          errorPattern: 'cozystack.networking Package runs variant "kubeovn-cilium".*render would switch it to "noop".*restore the previous spec.variant of the cozystack.cozystack-platform Package.*networking.acknowledgeVariantChange: "noop" in its spec.components.platform.values'
+
+  - it: refuses isp-full -> isp-slim on a live kubeovn-cilium cluster
+    set:
+      bundles:
+        system:
+          variant: isp-slim
+    kubernetesProvider:
+      scheme: *scheme
+      objects: *liveKubeovnCilium
+    asserts:
+      - failedTemplate:
+          errorPattern: 'runs variant "kubeovn-cilium".*switch it to "cilium".*networking.acknowledgeVariantChange: "cilium"'
+
+  # Nothing is deleted on this switch, so the error must not say otherwise.
+  - it: refuses isp-hosted -> isp-full on a live noop cluster
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - kind: Package
+          apiVersion: cozystack.io/v1alpha1
+          metadata: {name: cozystack.networking}
+          spec: {variant: noop}
+    asserts:
+      - failedTemplate:
+          errorPattern: 'runs variant "noop".*switch it to "kubeovn-cilium".*deletes any HelmRelease of that Package the new variant does not install \(none if it installs everything the current one does\)'
+
+  - it: treats a live Package without spec.variant as the default variant
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - kind: Package
+          apiVersion: cozystack.io/v1alpha1
+          metadata: {name: cozystack.networking}
+          spec: {}
+    asserts:
+      - failedTemplate:
+          errorPattern: 'runs variant "default".*switch it to "kubeovn-cilium"'
+
+  # No bundle renders cilium-kilo, so a live one was set by hand. Acknowledging
+  # lets the render write the bundle's variant over it, so the error has to
+  # point such a cluster at disabledPackages instead.
+  - it: points a hand-set live variant at disabledPackages
+    kubernetesProvider:
+      scheme: *scheme
+      objects: &liveCiliumKilo
+        - kind: Package
+          apiVersion: cozystack.io/v1alpha1
+          metadata: {name: cozystack.networking}
+          spec: {variant: cilium-kilo}
+    asserts:
+      - failedTemplate:
+          errorPattern: 'runs variant "cilium-kilo".*restore the previous spec.variant of the cozystack.cozystack-platform Package.*networking.acknowledgeVariantChange: "kubeovn-cilium".*If the live variant was set by hand and has to stay, add cozystack.networking to bundles.disabledPackages: acknowledging lets this render replace it'
+
+  - it: lets an acknowledged switch replace a hand-set live variant
+    set:
+      networking:
+        acknowledgeVariantChange: kubeovn-cilium
+    kubernetesProvider:
+      scheme: *scheme
+      objects: *liveCiliumKilo
+    documentSelector:
+      path: metadata.name
+      value: cozystack.networking
+    asserts:
+      - equal:
+          path: spec.variant
+          value: kubeovn-cilium
+
+  - it: renders when the live variant matches the rendered one
+    kubernetesProvider:
+      scheme: *scheme
+      objects: *liveKubeovnCilium
+    documentSelector:
+      path: metadata.name
+      value: cozystack.networking
+    asserts:
+      - equal:
+          path: spec.variant
+          value: kubeovn-cilium
+
+  - it: renders the change when acknowledgeVariantChange names the new variant
+    set:
+      bundles:
+        system:
+          variant: isp-hosted
+      networking:
+        acknowledgeVariantChange: noop
+    kubernetesProvider:
+      scheme: *scheme
+      objects: *liveKubeovnCilium
+    documentSelector:
+      path: metadata.name
+      value: cozystack.networking
+    asserts:
+      - equal:
+          path: spec.variant
+          value: noop
+
+  # The acknowledgement is bound to one target, so a value left behind after
+  # one switch does not wave through the next one.
+  - it: still refuses when acknowledgeVariantChange names a different variant
+    set:
+      bundles:
+        system:
+          variant: isp-hosted
+      networking:
+        acknowledgeVariantChange: cilium
+    kubernetesProvider:
+      scheme: *scheme
+      objects: *liveKubeovnCilium
+    asserts:
+      - failedTemplate:
+          errorPattern: 'networking.acknowledgeVariantChange: "noop"'
+
+  - it: still refuses when acknowledgeVariantChange is a bare boolean
+    set:
+      bundles:
+        system:
+          variant: isp-hosted
+      networking:
+        acknowledgeVariantChange: true
+    kubernetesProvider:
+      scheme: *scheme
+      objects: *liveKubeovnCilium
+    asserts:
+      - failedTemplate:
+          errorPattern: 'networking.acknowledgeVariantChange: "noop"'
+
+  # A Package left out of the render is not re-rendered, so Helm does not
+  # touch its variant; helm.sh/resource-policy: keep leaves it as it is.
+  - it: renders when cozystack.networking is in bundles.disabledPackages
+    set:
+      bundles:
+        system:
+          variant: isp-hosted
+        disabledPackages:
+          - cozystack.networking
+    kubernetesProvider:
+      scheme: *scheme
+      objects: *liveKubeovnCilium
+    asserts:
+      - containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.networking
+          any: true
+        not: true
+
+  - it: renders offline (no live Package) for isp-hosted
+    set:
+      bundles:
+        system:
+          variant: isp-hosted
+    documentSelector:
+      path: metadata.name
+      value: cozystack.networking
+    asserts:
+      - equal:
+          path: spec.variant
+          value: noop
+
+  - it: renders offline (no live Package) for isp-slim
+    set:
+      bundles:
+        system:
+          variant: isp-slim
+    documentSelector:
+      path: metadata.name
+      value: cozystack.networking
+    asserts:
+      - equal:
+          path: spec.variant
+          value: cilium
+
+  - it: renders on a cluster that has other Packages but no cozystack.networking yet
+    set:
+      bundles:
+        system:
+          variant: isp-full-generic
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - kind: Package
+          apiVersion: cozystack.io/v1alpha1
+          metadata: {name: cozystack.cert-manager}
+          spec: {variant: default}
+    documentSelector:
+      path: metadata.name
+      value: cozystack.networking
+    asserts:
+      - equal:
+          path: spec.variant
+          value: kubeovn-cilium-generic
diff --git a/packages/core/platform/tests/bundles_proxmox_wiring_test.yaml b/packages/core/platform/tests/bundles_proxmox_wiring_test.yaml
new file mode 100644
index 0000000000..c57adfa30e
--- /dev/null
+++ b/packages/core/platform/tests/bundles_proxmox_wiring_test.yaml
@@ -0,0 +1,129 @@
+suite: bundles.iaas proxmox substrate wiring
+# capmox is opt-in where the KubeVirt infra provider is not: it drives a
+# hypervisor outside this cluster and does nothing without a Proxmox API token.
+# What is pinned here is that opting in is enough — the IPAM provider it cannot
+# work without comes along — and that opting in halfway stops the render instead
+# of parking a Package at Ready=False with DependenciesNotReady and no message
+# naming the two list entries that conflict.
+templates:
+  - templates/bundles/iaas.yaml
+release:
+  name: cozystack
+  namespace: cozy-system
+tests:
+  - it: ships neither package by default
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full
+        iaas:
+          enabled: true
+        enabledPackages: []
+    asserts:
+      - containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.capi-provider-infra-proxmox
+          any: true
+        not: true
+      - containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.capi-provider-ipam-in-cluster
+          any: true
+        not: true
+      # The KubeVirt provider stays unconditional — this wiring must not have
+      # made the default substrate opt-in by accident.
+      - containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.capi-provider-infra-kubevirt
+          any: true
+
+  - it: pulls in the IPAM provider when capmox is enabled
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full
+        iaas:
+          enabled: true
+        enabledPackages:
+          - cozystack.capi-provider-infra-proxmox
+    asserts:
+      - containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.capi-provider-infra-proxmox
+          any: true
+      - containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.capi-provider-ipam-in-cluster
+          any: true
+
+  - it: emits the IPAM provider on its own, without dragging capmox in
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full
+        iaas:
+          enabled: true
+        enabledPackages:
+          - cozystack.capi-provider-ipam-in-cluster
+    asserts:
+      - containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.capi-provider-ipam-in-cluster
+          any: true
+      - containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.capi-provider-infra-proxmox
+          any: true
+        not: true
+
+  - it: emits neither when capmox is enabled and disabled at once
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full
+        iaas:
+          enabled: true
+        enabledPackages:
+          - cozystack.capi-provider-infra-proxmox
+        disabledPackages:
+          - cozystack.capi-provider-infra-proxmox
+    asserts:
+      - containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.capi-provider-infra-proxmox
+          any: true
+        not: true
+      - containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.capi-provider-ipam-in-cluster
+          any: true
+        not: true
+
+  - it: refuses to ship capmox with its IPAM provider disabled
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full
+        iaas:
+          enabled: true
+        enabledPackages:
+          - cozystack.capi-provider-infra-proxmox
+        disabledPackages:
+          - cozystack.capi-provider-ipam-in-cluster
+    asserts:
+      - failedTemplate:
+          errorMessage: "cozystack.capi-provider-infra-proxmox requires cozystack.capi-provider-ipam-in-cluster, which is listed in bundles.disabledPackages: capmox allocates worker addresses from an InClusterIPPool and has no DHCP mode, so without the IPAM provider no ProxmoxCluster ever becomes Ready"
diff --git a/packages/core/platform/tests/bundles_proxy_protocol_lookup_test.yaml b/packages/core/platform/tests/bundles_proxy_protocol_lookup_test.yaml
index fc6cee8a15..a0751ee00f 100644
--- a/packages/core/platform/tests/bundles_proxy_protocol_lookup_test.yaml
+++ b/packages/core/platform/tests/bundles_proxy_protocol_lookup_test.yaml
@@ -78,3 +78,23 @@ tests:
           path: metadata.annotations["helm.sh/resource-policy"]
           value: keep
 
+  # bundles.disabledPackages is not a route out of the guard. A name in
+  # that list only stops _helpers.tpl emitting the Package document; the
+  # guard keys off a lookup for the live Package CR, which the list
+  # never touches. An operator who reaches for disabledPackages instead
+  # of `kubectl delete package` still gets the failure, and ouroboros is
+  # still installed when they get it.
+  - it: still fails when cozystack.ouroboros is in bundles.disabledPackages but the Package CR is live
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full
+        disabledPackages:
+          - cozystack.ouroboros
+      publishing:
+        proxyProtocol: false
+        proxyProtocolAcknowledgeUnclean: false
+    asserts:
+      - failedTemplate:
+          errorPattern: "publishing.proxyProtocol was previously enabled.*helm.sh/resource-policy: keep leaves the existing Package"
diff --git a/packages/core/platform/tests/bundles_proxy_protocol_test.yaml b/packages/core/platform/tests/bundles_proxy_protocol_test.yaml
index dccb8c3ed7..7fe4a50915 100644
--- a/packages/core/platform/tests/bundles_proxy_protocol_test.yaml
+++ b/packages/core/platform/tests/bundles_proxy_protocol_test.yaml
@@ -64,7 +64,7 @@ tests:
           path: spec.variant
           value: default
 
-  - it: injects three PROXY-protocol nginx config keys into ingress-application when proxyProtocol is true (use-proxy-protocol, real-ip-header, enable-real-ip)
+  - it: points the host ouroboros proxy at the root-tenant ingress Service (default ingressName)
     set:
       bundles:
         system:
@@ -74,29 +74,66 @@ tests:
         proxyProtocol: true
     documentSelector:
       path: metadata.name
-      value: cozystack.ingress-application
+      value: cozystack.ouroboros
     asserts:
+      # The host ingress-nginx is deployed by extra/ingress into the root
+      # tenant namespace as <short>-ingress-controller, NOT the chart
+      # default ingress-nginx-controller.cozy-ingress-nginx (which is the
+      # managed-Kubernetes-tenant layout). Both are derived from
+      # publishing.ingressName (default tenant-root).
+      - equal:
+          path: spec.components.ouroboros.values.ouroboros.proxy.target.namespace
+          value: tenant-root
       - equal:
-          path: spec.components.ingress-system.values.ingress-nginx.controller.config.use-proxy-protocol
-          value: "true"
+          path: spec.components.ouroboros.values.ouroboros.proxy.target.serviceName
+          value: root-ingress-controller
+
+  - it: derives the ouroboros proxy target from a non-default publishing.ingressName
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full
+      publishing:
+        proxyProtocol: true
+        ingressName: tenant-foo
+    documentSelector:
+      path: metadata.name
+      value: cozystack.ouroboros
+    asserts:
       - equal:
-          path: spec.components.ingress-system.values.ingress-nginx.controller.config.real-ip-header
-          value: proxy_protocol
+          path: spec.components.ouroboros.values.ouroboros.proxy.target.namespace
+          value: tenant-foo
       - equal:
-          path: spec.components.ingress-system.values.ingress-nginx.controller.config.enable-real-ip
-          value: "true"
-      # use-forwarded-headers + compute-full-forwarded-for are
-      # deliberately NOT injected. Without a paired proxy-real-ip-cidr
-      # they let clients spoof X-Forwarded-For; with PROXY-protocol
-      # the L4 proxy header is already the source of truth for
-      # $remote_addr, so the X-Forwarded-* headers from the LB hop
-      # are redundant. Operators with a downstream proxy that adds
-      # X-Forwarded-* legitimately can layer them in via Package
-      # values override with the matching CIDR.
-      - notExists:
-          path: spec.components.ingress-system.values.ingress-nginx.controller.config.use-forwarded-headers
+          path: spec.components.ouroboros.values.ouroboros.proxy.target.serviceName
+          value: foo-ingress-controller
+
+  - it: leaves cozystack.ingress-application as the bare default Package when proxyProtocol is true
+    # The host PROXY-protocol config does NOT ride on the ingress-application
+    # Package's component values — the ingress-system / ingress components have
+    # no install: block, so PackageReconciler drops component values for them.
+    # The switch is delivered via _cluster.proxy-protocol in the cozystack-values
+    # Secret instead (see apps_proxy_protocol_wiring_test.yaml), so this Package
+    # stays the bare default regardless of proxyProtocol.
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full
+      publishing:
+        proxyProtocol: true
+    documentSelector:
+      path: metadata.name
+      value: cozystack.ingress-application
+    asserts:
+      - equal:
+          path: kind
+          value: Package
+      - equal:
+          path: spec.variant
+          value: default
       - notExists:
-          path: spec.components.ingress-system.values.ingress-nginx.controller.config.compute-full-forwarded-for
+          path: spec.components
 
   - it: bundles.disabledPackages suppresses cozystack.ouroboros even when proxyProtocol is true
     set:
diff --git a/packages/core/platform/tests/bundles_slim_variants_test.yaml b/packages/core/platform/tests/bundles_slim_variants_test.yaml
new file mode 100644
index 0000000000..ed29ab9744
--- /dev/null
+++ b/packages/core/platform/tests/bundles_slim_variants_test.yaml
@@ -0,0 +1,1286 @@
+suite: slim variants emit only the base platform
+templates:
+  - templates/bundles/system.yaml
+  - templates/bundles/paas.yaml
+  - templates/bundles/naas.yaml
+  - templates/bundles/iaas.yaml
+release:
+  name: cozystack
+  namespace: cozy-system
+tests:
+  - it: ships the isp-slim preset with the base platform only
+    values:
+      - ../values-isp-slim.yaml
+    asserts:
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.cozystack-engine
+          any: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.gateway-api-crds
+          any: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.cert-manager
+          any: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.flux-plunger
+          any: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.flux-shard-operator
+          any: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.victoria-metrics-operator
+          any: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.prometheus-operator-crds
+          any: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.tenant-application
+          any: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.ingress-application
+          any: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.gateway-application
+          any: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.info-application
+          any: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.cozystack-basics
+          any: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.networking
+          any: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.kubeovn-webhook
+          any: true
+        not: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.kubeovn-plunger
+          any: true
+        not: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.metallb
+          any: true
+        not: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.reloader
+          any: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.snapshot-controller
+          any: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.linstor
+          any: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.linstor-scheduler
+          any: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.cozystack-scheduler
+          any: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.securitygroup-controller
+          any: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.multus
+          any: true
+        not: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.cozy-proxy
+          any: true
+        not: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.seaweedfs-application
+          any: true
+        not: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.monitoring-application
+          any: true
+        not: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.etcd-application
+          any: true
+        not: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.backupstrategy-controller
+          any: true
+        not: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.backup-controller
+          any: true
+        not: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.velero
+          any: true
+        not: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.bucket-application
+          any: true
+        not: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.objectstorage-controller
+          any: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.postgres-operator
+          any: true
+        not: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.vertical-pod-autoscaler
+          any: true
+        not: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.metrics-server
+          any: true
+        not: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.monitoring-agents
+          any: true
+        not: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.goldpinger
+          any: true
+        not: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.grafana-operator
+          any: true
+        not: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.etcd-operator
+          any: true
+        not: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.keycloak
+          any: true
+        not: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.keycloak-operator
+          any: true
+        not: true
+      - template: templates/bundles/paas.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.mariadb-operator
+          any: true
+        not: true
+      - template: templates/bundles/paas.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.redis-operator
+          any: true
+        not: true
+      - template: templates/bundles/paas.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.postgres-application
+          any: true
+        not: true
+      - template: templates/bundles/paas.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.redis-application
+          any: true
+        not: true
+      - template: templates/bundles/paas.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.valkey-application
+          any: true
+        not: true
+      - template: templates/bundles/naas.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.tcp-balancer-application
+          any: true
+        not: true
+      - template: templates/bundles/naas.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.vpn-application
+          any: true
+        not: true
+  - it: ships the isp-slim-generic preset with the base platform only
+    values:
+      - ../values-isp-slim-generic.yaml
+    asserts:
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.cozystack-engine
+          any: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.gateway-api-crds
+          any: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.cert-manager
+          any: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.flux-plunger
+          any: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.flux-shard-operator
+          any: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.victoria-metrics-operator
+          any: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.prometheus-operator-crds
+          any: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.tenant-application
+          any: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.ingress-application
+          any: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.gateway-application
+          any: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.info-application
+          any: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.cozystack-basics
+          any: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.networking
+          any: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.kubeovn-webhook
+          any: true
+        not: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.kubeovn-plunger
+          any: true
+        not: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.metallb
+          any: true
+        not: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.reloader
+          any: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.snapshot-controller
+          any: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.linstor
+          any: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.linstor-scheduler
+          any: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.cozystack-scheduler
+          any: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.securitygroup-controller
+          any: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.multus
+          any: true
+        not: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.cozy-proxy
+          any: true
+        not: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.seaweedfs-application
+          any: true
+        not: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.monitoring-application
+          any: true
+        not: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.etcd-application
+          any: true
+        not: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.backupstrategy-controller
+          any: true
+        not: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.backup-controller
+          any: true
+        not: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.velero
+          any: true
+        not: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.bucket-application
+          any: true
+        not: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.objectstorage-controller
+          any: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.postgres-operator
+          any: true
+        not: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.vertical-pod-autoscaler
+          any: true
+        not: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.metrics-server
+          any: true
+        not: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.monitoring-agents
+          any: true
+        not: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.goldpinger
+          any: true
+        not: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.grafana-operator
+          any: true
+        not: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.etcd-operator
+          any: true
+        not: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.keycloak
+          any: true
+        not: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.keycloak-operator
+          any: true
+        not: true
+      - template: templates/bundles/paas.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.mariadb-operator
+          any: true
+        not: true
+      - template: templates/bundles/paas.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.redis-operator
+          any: true
+        not: true
+      - template: templates/bundles/paas.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.postgres-application
+          any: true
+        not: true
+      - template: templates/bundles/paas.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.redis-application
+          any: true
+        not: true
+      - template: templates/bundles/paas.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.valkey-application
+          any: true
+        not: true
+      - template: templates/bundles/naas.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.tcp-balancer-application
+          any: true
+        not: true
+      - template: templates/bundles/naas.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.vpn-application
+          any: true
+        not: true
+  - it: ships the isp-hosted-slim preset with the base platform only
+    values:
+      - ../values-isp-hosted-slim.yaml
+    asserts:
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.cozystack-engine
+          any: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.gateway-api-crds
+          any: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.cert-manager
+          any: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.flux-plunger
+          any: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.flux-shard-operator
+          any: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.victoria-metrics-operator
+          any: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.prometheus-operator-crds
+          any: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.tenant-application
+          any: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.ingress-application
+          any: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.gateway-application
+          any: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.info-application
+          any: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.cozystack-basics
+          any: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.networking
+          any: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.cozystack-scheduler
+          any: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.multus
+          any: true
+        not: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.cozy-proxy
+          any: true
+        not: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.seaweedfs-application
+          any: true
+        not: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.monitoring-application
+          any: true
+        not: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.etcd-application
+          any: true
+        not: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.backupstrategy-controller
+          any: true
+        not: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.backup-controller
+          any: true
+        not: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.velero
+          any: true
+        not: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.bucket-application
+          any: true
+        not: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.objectstorage-controller
+          any: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.postgres-operator
+          any: true
+        not: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.vertical-pod-autoscaler
+          any: true
+        not: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.metrics-server
+          any: true
+        not: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.monitoring-agents
+          any: true
+        not: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.goldpinger
+          any: true
+        not: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.grafana-operator
+          any: true
+        not: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.etcd-operator
+          any: true
+        not: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.keycloak
+          any: true
+        not: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.keycloak-operator
+          any: true
+        not: true
+      - template: templates/bundles/paas.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.mariadb-operator
+          any: true
+        not: true
+      - template: templates/bundles/paas.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.redis-operator
+          any: true
+        not: true
+      - template: templates/bundles/paas.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.postgres-application
+          any: true
+        not: true
+      - template: templates/bundles/paas.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.redis-application
+          any: true
+        not: true
+      - template: templates/bundles/paas.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.valkey-application
+          any: true
+        not: true
+      - template: templates/bundles/naas.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.tcp-balancer-application
+          any: true
+        not: true
+      - template: templates/bundles/naas.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.vpn-application
+          any: true
+        not: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.kubeovn-webhook
+          any: true
+        not: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.kubeovn-plunger
+          any: true
+        not: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.metallb
+          any: true
+        not: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.reloader
+          any: true
+        not: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.snapshot-controller
+          any: true
+        not: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.linstor
+          any: true
+        not: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.linstor-scheduler
+          any: true
+        not: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.securitygroup-controller
+          any: true
+        not: true
+
+  # tenant-application's default variant waits on monitoring, etcd and seaweedfs
+  # applications, none of which a slim variant emits; the slim variant of that
+  # PackageSource is what lets cozystack-basics (and so tenant-root) go Ready.
+  - it: selects the slim tenant-application variant on a slim preset
+    values:
+      - ../values-isp-slim.yaml
+    template: templates/bundles/system.yaml
+    documentSelector:
+      path: metadata.name
+      value: cozystack.tenant-application
+    asserts:
+      - equal:
+          path: spec.variant
+          value: slim
+
+  - it: keeps the default tenant-application variant on isp-full
+    values:
+      - ../values-isp-full.yaml
+    template: templates/bundles/system.yaml
+    documentSelector:
+      path: metadata.name
+      value: cozystack.tenant-application
+    asserts:
+      - equal:
+          path: spec.variant
+          value: default
+
+  - it: emits an opt-in package once it is listed in bundles.enabledPackages
+    values:
+      - ../values-isp-slim.yaml
+    set:
+      bundles:
+        enabledPackages:
+          - cozystack.monitoring-application
+          - cozystack.multus
+          - cozystack.postgres-application
+          - cozystack.vpn-application
+    asserts:
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.monitoring-application
+          any: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.multus
+          any: true
+      - template: templates/bundles/paas.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.postgres-application
+          any: true
+      - template: templates/bundles/naas.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.vpn-application
+          any: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.etcd-application
+          any: true
+        not: true
+      - template: templates/bundles/paas.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.redis-application
+          any: true
+        not: true
+      - template: templates/bundles/naas.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.tcp-balancer-application
+          any: true
+        not: true
+
+  - it: keeps multus stageCniPlugins when multus is opted in on isp-slim-generic
+    values:
+      - ../values-isp-slim-generic.yaml
+    set:
+      bundles:
+        enabledPackages:
+          - cozystack.multus
+    template: templates/bundles/system.yaml
+    documentSelector:
+      path: metadata.name
+      value: cozystack.multus
+    asserts:
+      - equal:
+          path: spec.components.multus.values.stageCniPlugins
+          value: true
+
+  # keycloak depends on postgres-operator, so OIDC must pull it in even though
+  # postgres-operator is opt-in on slim.
+  - it: emits keycloak and its postgres-operator dependency when OIDC is on
+    values:
+      - ../values-isp-slim.yaml
+    set:
+      authentication:
+        oidc:
+          enabled: true
+    asserts:
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.keycloak
+          any: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.keycloak-operator
+          any: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.postgres-operator
+          any: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.monitoring-application
+          any: true
+        not: true
+
+  - it: uses the Talos networking values on isp-slim
+    values:
+      - ../values-isp-slim.yaml
+    template: templates/bundles/system.yaml
+    documentSelector:
+      path: metadata.name
+      value: cozystack.networking
+    asserts:
+      - equal:
+          path: spec.variant
+          value: cilium
+      - equal:
+          path: spec.components.cilium.values.cilium.k8sServicePort
+          value: "7445"
+      - equal:
+          path: spec.components.cilium.values.cilium.l2announcements.enabled
+          value: true
+      - notExists:
+          path: spec.components.kubeovn
+
+  - it: uses the generic networking values on isp-slim-generic
+    values:
+      - ../values-isp-slim-generic.yaml
+    template: templates/bundles/system.yaml
+    documentSelector:
+      path: metadata.name
+      value: cozystack.networking
+    asserts:
+      - equal:
+          path: spec.variant
+          value: cilium-generic
+      - equal:
+          path: spec.components.cilium.values.cilium.cgroup.autoMount.enabled
+          value: true
+      - equal:
+          path: spec.components.cilium.values.cilium.l2announcements.enabled
+          value: true
+      - notExists:
+          path: spec.components.kubeovn
+
+  - it: pins cozystack-api to generic control-plane nodes on isp-slim-generic
+    values:
+      - ../values-isp-slim-generic.yaml
+    template: templates/bundles/system.yaml
+    documentSelector:
+      path: metadata.name
+      value: cozystack.cozystack-engine
+    asserts:
+      - equal:
+          path: spec.components.cozystack-api.values.cozystackAPI.nodeSelector
+          value:
+            node-role.kubernetes.io/control-plane: "true"
+
+  - it: uses noop networking on isp-hosted-slim
+    values:
+      - ../values-isp-hosted-slim.yaml
+    template: templates/bundles/system.yaml
+    documentSelector:
+      path: metadata.name
+      value: cozystack.networking
+    asserts:
+      - equal:
+          path: spec.variant
+          value: noop
+
+  # KubeOVN IPsec is what networking.encryption drives on the full variants; the
+  # Cilium-only slim datapath has nothing to switch on, so a silent no-op is refused.
+  - it: refuses networking.encryption on a slim variant
+    values:
+      - ../values-isp-slim.yaml
+    set:
+      networking:
+        encryption:
+          enabled: true
+    template: templates/bundles/system.yaml
+    asserts:
+      - failedTemplate:
+          errorPattern: "not supported on the slim variants"
+
+  - it: emits metallb once it is opted in on a slim variant
+    values:
+      - ../values-isp-slim.yaml
+    set:
+      bundles:
+        enabledPackages:
+          - cozystack.metallb
+    template: templates/bundles/system.yaml
+    asserts:
+      - containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.metallb
+          any: true
+      - containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.kubeovn-webhook
+          any: true
+        not: true
+
+  - it: refuses the iaas bundle on a slim variant
+    values:
+      - ../values-isp-slim.yaml
+    set:
+      bundles:
+        iaas:
+          enabled: true
+    template: templates/bundles/iaas.yaml
+    asserts:
+      - failedTemplate:
+          errorPattern: "isp-full"
+
+  - it: keeps KubeOVN networking on isp-full
+    values:
+      - ../values-isp-full.yaml
+    template: templates/bundles/system.yaml
+    documentSelector:
+      path: metadata.name
+      value: cozystack.networking
+    asserts:
+      - equal:
+          path: spec.variant
+          value: kubeovn-cilium
+      - exists:
+          path: spec.components.kubeovn
+      - notExists:
+          path: spec.components.cilium.values.cilium.l2announcements
+
+  - it: still emits the full set on isp-full
+    values:
+      - ../values-isp-full.yaml
+    asserts:
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.multus
+          any: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.cozy-proxy
+          any: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.monitoring-application
+          any: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.velero
+          any: true
+      - template: templates/bundles/system.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.postgres-operator
+          any: true
+      - template: templates/bundles/paas.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.redis-application
+          any: true
+      - template: templates/bundles/naas.yaml
+        containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.vpn-application
+          any: true
diff --git a/packages/core/platform/tests/bundles_telemetry_optout_test.yaml b/packages/core/platform/tests/bundles_telemetry_optout_test.yaml
new file mode 100644
index 0000000000..484ec77a01
--- /dev/null
+++ b/packages/core/platform/tests/bundles_telemetry_optout_test.yaml
@@ -0,0 +1,85 @@
+suite: telemetry opt-out bundle wiring
+templates:
+  - templates/bundles/system.yaml
+release:
+  name: cozystack
+  namespace: cozy-system
+tests:
+  # Telemetry has two senders: cozystack-operator (cluster facts) and
+  # cozystack-controller (application counts). The operator is switched off on
+  # the cozy-installer chart, which cannot reach a package the platform
+  # deploys — so without the wiring asserted here, an operator who followed the
+  # documented opt-out kept sending cozy_application_count indefinitely, with
+  # nothing failing to signal it. The regression is silent by construction,
+  # which is why it is pinned.
+  - it: threads disableTelemetry into cozystack-controller when telemetry.disabled is set (isp-full)
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full
+      telemetry:
+        disabled: true
+    documentSelector:
+      path: metadata.name
+      value: cozystack.cozystack-engine
+    asserts:
+      - equal:
+          path: spec.components.cozystack-controller.values.cozystackController.disableTelemetry
+          value: true
+
+  - it: leaves the controller untouched by default, so telemetry stays opt-out (isp-full)
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full
+    documentSelector:
+      path: metadata.name
+      value: cozystack.cozystack-engine
+    asserts:
+      - notExists:
+          path: spec.components
+
+  - it: threads the flag on the oidc variant too (isp-full)
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full
+      authentication:
+        oidc:
+          enabled: true
+      telemetry:
+        disabled: true
+    documentSelector:
+      path: metadata.name
+      value: cozystack.cozystack-engine
+    asserts:
+      - equal:
+          path: spec.variant
+          value: oidc
+      - equal:
+          path: spec.components.cozystack-controller.values.cozystackController.disableTelemetry
+          value: true
+
+  # isp-full-generic already carries a cozystack-api override. The telemetry
+  # key must be added beside it, not replace it.
+  - it: coexists with the generic variant's cozystack-api nodeSelector override
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full-generic
+      telemetry:
+        disabled: true
+    documentSelector:
+      path: metadata.name
+      value: cozystack.cozystack-engine
+    asserts:
+      - equal:
+          path: spec.components.cozystack-controller.values.cozystackController.disableTelemetry
+          value: true
+      - equal:
+          path: spec.components.cozystack-api.values.cozystackAPI.nodeSelector["node-role.kubernetes.io/control-plane"]
+          value: "true"
diff --git a/packages/core/platform/tests/bundles_velero_default_test.yaml b/packages/core/platform/tests/bundles_velero_default_test.yaml
new file mode 100644
index 0000000000..51460fad6a
--- /dev/null
+++ b/packages/core/platform/tests/bundles_velero_default_test.yaml
@@ -0,0 +1,45 @@
+suite: velero installed by default (backupstrategy-controller hard dependency)
+templates:
+  - templates/bundles/system.yaml
+release:
+  name: cozystack
+  namespace: cozy-system
+tests:
+  # backupstrategy-controller is a default package and its PackageSource
+  # declares dependsOn: cozystack.velero. If velero is optional and not
+  # enabled, the backupstrategy-controller Package stays
+  # DependenciesNotReady forever and the cozystack-platform HelmRelease
+  # never becomes Ready. Guard against velero regressing to optional.
+  - it: emits the cozystack.velero Package by default (no enabledPackages)
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full
+    asserts:
+      - containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.velero
+          any: true
+
+  - it: keeps the disabledPackages opt-out working for cozystack.velero
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full
+        disabledPackages:
+          - cozystack.velero
+          - cozystack.backupstrategy-controller
+    asserts:
+      - containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.velero
+        not: true
+      - containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.backupstrategy-controller
+        not: true
diff --git a/packages/core/platform/tests/bundles_vm_import_wiring_test.yaml b/packages/core/platform/tests/bundles_vm_import_wiring_test.yaml
new file mode 100644
index 0000000000..3511bedfca
--- /dev/null
+++ b/packages/core/platform/tests/bundles_vm_import_wiring_test.yaml
@@ -0,0 +1,132 @@
+suite: bundles.iaas VM import opt-in and VDDK image wiring
+templates:
+  - templates/bundles/iaas.yaml
+release:
+  name: cozystack
+  namespace: cozy-system
+tests:
+  # The three packages carry a large vendored manifest, their own CRDs, and a
+  # controller with cluster-wide access to PersistentVolumes. A cluster that is
+  # not migrating off vSphere must not pay for any of it.
+  - it: installs nothing for VM import unless the packages are explicitly enabled
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full
+        iaas:
+          enabled: true
+    asserts:
+      - containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.forklift-operator
+          any: true
+        not: true
+      - containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.forklift
+          any: true
+        not: true
+      - containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.migration-controller
+          any: true
+        not: true
+
+  - it: emits all three packages once they are enabled
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full
+        iaas:
+          enabled: true
+        enabledPackages:
+          - cozystack.forklift-operator
+          - cozystack.forklift
+          - cozystack.migration-controller
+    asserts:
+      - containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.forklift-operator
+          any: true
+      - containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.forklift
+          any: true
+      - containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.migration-controller
+          any: true
+
+  # Empty is the normal state: the vSphere path then reports itself unavailable
+  # on each VMImportSource. No components block should be emitted at all, so the
+  # package keeps its own chart default rather than being handed an empty string.
+  - it: emits no components block when no VDDK image is configured
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full
+        iaas:
+          enabled: true
+        enabledPackages:
+          - cozystack.migration-controller
+    documentSelector:
+      path: metadata.name
+      value: cozystack.migration-controller
+    asserts:
+      - equal:
+          path: spec.variant
+          value: default
+      - notExists:
+          path: spec.components
+
+  # The regression this guards: the optional-package helper used to ignore a
+  # components argument entirely, so an operator could set vddkImage, see it
+  # accepted, and never have it reach the controller.
+  - it: forwards the operator-configured VDDK image into the controller component values
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full
+        iaas:
+          enabled: true
+        enabledPackages:
+          - cozystack.migration-controller
+      vmImport:
+        vddkImage: registry.example.com/vddk:8.0.3
+    documentSelector:
+      path: metadata.name
+      value: cozystack.migration-controller
+    asserts:
+      - equal:
+          path: spec.components.migration-controller.values.vddkImage
+          value: registry.example.com/vddk:8.0.3
+
+  # A VDDK image set on a cluster that has not enabled the packages must not
+  # conjure them into existence: configuration is not consent to install.
+  - it: does not install the controller just because a VDDK image is set
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full
+        iaas:
+          enabled: true
+      vmImport:
+        vddkImage: registry.example.com/vddk:8.0.3
+    asserts:
+      - containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.migration-controller
+          any: true
+        not: true
diff --git a/packages/core/platform/tests/bundles_worker_image_wiring_test.yaml b/packages/core/platform/tests/bundles_worker_image_wiring_test.yaml
new file mode 100644
index 0000000000..e172afc22e
--- /dev/null
+++ b/packages/core/platform/tests/bundles_worker_image_wiring_test.yaml
@@ -0,0 +1,117 @@
+suite: bundles.iaas kubernetesWorkerImage → kubernetes-worker-image wiring
+templates:
+  - templates/bundles/iaas.yaml
+release:
+  name: cozystack
+  namespace: cozy-system
+tests:
+  # The catalog documents four operator knobs, and
+  # cozystack.platform.package.optional used to emit a Package carrying a variant
+  # and nothing else -- so an air-gapped cluster could not repoint the single
+  # image import, and a cluster whose worker pools are not on `replicated` could
+  # not move the golden onto their class, which is the exact fix the pool-side
+  # StorageClass guard tells them to apply. These cases pin the forwarding, and
+  # the first one pins that an unset key still emits no components block at all.
+  - it: emits cozystack.kubernetes-worker-image without a components block when the key is unset
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full
+        iaas:
+          enabled: true
+        enabledPackages:
+          - cozystack.kubernetes-worker-image
+    documentSelector:
+      path: metadata.name
+      value: cozystack.kubernetes-worker-image
+    asserts:
+      - equal:
+          path: kind
+          value: Package
+      - equal:
+          path: spec.variant
+          value: default
+      - notExists:
+          path: spec.components
+
+  - it: forwards kubernetesWorkerImage overrides into the component values
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full
+        iaas:
+          enabled: true
+        enabledPackages:
+          - cozystack.kubernetes-worker-image
+      kubernetesWorkerImage:
+        imageFactoryURL: https://factory.internal.example.com
+        storageClass: local
+        storage: 8Gi
+        images:
+          - schematicID: abc123
+            version: v1.13.6
+    documentSelector:
+      path: metadata.name
+      value: cozystack.kubernetes-worker-image
+    asserts:
+      - equal:
+          path: spec.components.kubernetes-worker-image.values.imageFactoryURL
+          value: https://factory.internal.example.com
+      - equal:
+          path: spec.components.kubernetes-worker-image.values.storageClass
+          value: local
+      - equal:
+          path: spec.components.kubernetes-worker-image.values.storage
+          value: 8Gi
+      - equal:
+          path: spec.components.kubernetes-worker-image.values.images[0].schematicID
+          value: abc123
+      - equal:
+          path: spec.components.kubernetes-worker-image.values.images[0].version
+          value: v1.13.6
+
+  # The knob is inert without the opt-in, and must not resurrect the package on
+  # its own: an operator who sets the values but forgets enabledPackages gets no
+  # Package, exactly as before.
+  - it: does not emit the package when the values are set but the package is not enabled
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full
+        iaas:
+          enabled: true
+        enabledPackages: []
+      kubernetesWorkerImage:
+        storageClass: local
+    asserts:
+      - containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.kubernetes-worker-image
+          any: true
+        not: true
+
+  # vm-default-images shares the helper. Adding a fourth argument to it must not
+  # start emitting a components block on every other optional package.
+  - it: leaves other optional packages without a components block
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full
+        iaas:
+          enabled: true
+        enabledPackages:
+          - cozystack.vm-default-images
+          - cozystack.kubernetes-worker-image
+      kubernetesWorkerImage:
+        storageClass: local
+    documentSelector:
+      path: metadata.name
+      value: cozystack.vm-default-images
+    asserts:
+      - notExists:
+          path: spec.components
diff --git a/packages/core/platform/tests/fixtures/selective-install-postgres-values.yaml b/packages/core/platform/tests/fixtures/selective-install-postgres-values.yaml
new file mode 100644
index 0000000000..221aeeb275
--- /dev/null
+++ b/packages/core/platform/tests/fixtures/selective-install-postgres-values.yaml
@@ -0,0 +1,62 @@
+# Generated by: hack/select-install.sh --disabled postgres
+# Regenerate after changing the PackageSource inventory or install baseline.
+bundles:
+  disabledPackages:
+    - cozystack.bootbox
+    - cozystack.bootbox-application
+    - cozystack.capi-provider-infra-proxmox
+    - cozystack.capi-provider-ipam-in-cluster
+    - cozystack.clickhouse-application
+    - cozystack.clickhouse-operator
+    - cozystack.cluster-autoscaler-azure
+    - cozystack.cluster-autoscaler-hetzner
+    - cozystack.clustersecret-operator
+    - cozystack.computeplane-application
+    - cozystack.external-dns
+    - cozystack.external-dns-application
+    - cozystack.external-secrets-operator
+    - cozystack.foundationdb-application
+    - cozystack.foundationdb-operator
+    - cozystack.goldpinger
+    - cozystack.gpu-operator
+    - cozystack.hami
+    - cozystack.harbor-application
+    - cozystack.hetzner-robotlb
+    - cozystack.ingress-nginx
+    - cozystack.kafka-application
+    - cozystack.kafka-operator
+    - cozystack.keda
+    - cozystack.kubeovn-plunger
+    - cozystack.kubeovn-webhook
+    - cozystack.kubernetes-application
+    - cozystack.kubernetes-nodes-application
+    - cozystack.kubernetes-worker-image
+    - cozystack.kuberture
+    - cozystack.linstor-gui
+    - cozystack.local-ccm
+    - cozystack.local-storage
+    - cozystack.mariadb-application
+    - cozystack.mariadb-operator
+    - cozystack.mongodb-application
+    - cozystack.mongodb-operator
+    - cozystack.monitoring
+    - cozystack.nats-application
+    - cozystack.nfs-driver
+    - cozystack.openbao-application
+    - cozystack.opensearch-application
+    - cozystack.opensearch-operator
+    - cozystack.qdrant-application
+    - cozystack.rabbitmq-application
+    - cozystack.rabbitmq-operator
+    - cozystack.redis-application
+    - cozystack.redis-operator
+    - cozystack.securitygroup-controller
+    - cozystack.talos-log-collector
+    - cozystack.tcp-balancer-application
+    - cozystack.telepresence
+    - cozystack.valkey-application
+    - cozystack.virtualprivatecloud-application
+    - cozystack.vm-default-images
+    - cozystack.vm-disk-application
+    - cozystack.vm-instance-application
+    - cozystack.vpn-application
diff --git a/packages/core/platform/tests/migration_hook_skip_backup_test.yaml b/packages/core/platform/tests/migration_hook_skip_backup_test.yaml
new file mode 100644
index 0000000000..18406d4f8b
--- /dev/null
+++ b/packages/core/platform/tests/migration_hook_skip_backup_test.yaml
@@ -0,0 +1,139 @@
+suite: migrations.etcdAdoptSkipBackup reaches the migration Job as the value the script matches
+templates:
+  - templates/migration-hook.yaml
+release:
+  name: cozystack
+  namespace: cozy-system
+# The Job only renders when the cozystack-version ConfigMap reports a version
+# BELOW migrations.targetVersion. Under plain `helm template` (and therefore
+# `helm lint`/CI) lookup returns nil and the whole hook is skipped, so the env
+# block is unreachable without mocking the ConfigMap — which is precisely why
+# this template had no coverage and shipped an unreachable escape hatch.
+kubernetesProvider:
+  scheme:
+    "v1/ConfigMap":
+      gvr:
+        version: "v1"
+        resource: "configmaps"
+      namespaced: true
+  objects:
+    - kind: ConfigMap
+      apiVersion: v1
+      metadata:
+        name: cozystack-version
+        namespace: cozy-system
+      data:
+        version: "52"
+tests:
+  # The trap this suite exists for: migration 50 tests the env var against the
+  # literal string "1". A bare bool renders "true", which the script does not
+  # match, so the hatch would appear in the Job spec and silently do nothing —
+  # the worst outcome for a safety valve an operator reaches for when stuck.
+  # Assert the RENDERED VALUE, never merely that the var exists.
+  - it: renders ETCD_ADOPT_SKIP_BACKUP=1 (not "true") when the flag is enabled
+    set:
+      migrations:
+        enabled: true
+        etcdAdoptSkipBackup: true
+    documentSelector:
+      path: kind
+      value: Job
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].env[3].name
+          value: ETCD_ADOPT_SKIP_BACKUP
+      - equal:
+          path: spec.template.spec.containers[0].env[3].value
+          value: "1"
+
+  - it: renders ETCD_ADOPT_SKIP_BACKUP=0 when the flag is explicitly disabled
+    set:
+      migrations:
+        enabled: true
+        etcdAdoptSkipBackup: false
+    documentSelector:
+      path: kind
+      value: Job
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].env[3].value
+          value: "0"
+
+  # A Platform Package predating this knob carries no such key. The chart's own
+  # values.yaml supplies the default on merge, but the template must not depend
+  # on that: a nil here would fail the render of the ENTIRE platform chart and
+  # brick every upgrade — far worse than the hatch being unavailable.
+  - it: renders cleanly and OFF when the key is absent entirely (pre-existing Package CR)
+    set:
+      migrations:
+        enabled: true
+        etcdAdoptSkipBackup: null
+    documentSelector:
+      path: kind
+      value: Job
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].env[3].value
+          value: "0"
+
+  # Values arrive as JSON from the Package CR, where a quoted "true" is an easy
+  # mistake. It must take the hatch rather than silently render "0".
+  - it: accepts a stringified true from the Package CR Values JSON
+    set:
+      migrations:
+        enabled: true
+        etcdAdoptSkipBackup: "true"
+    documentSelector:
+      path: kind
+      value: Job
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].env[3].value
+          value: "1"
+
+  # The dangerous direction must require an affirmative spelling: anything
+  # unrecognised resolves to "0" rather than being treated as truthy.
+  - it: treats an unrecognised value as OFF, never as an accidental skip
+    set:
+      migrations:
+        enabled: true
+        etcdAdoptSkipBackup: "banana"
+    documentSelector:
+      path: kind
+      value: Job
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].env[3].value
+          value: "0"
+
+  # The pre-existing env contract must survive: the script reads all four.
+  - it: keeps NAMESPACE/CURRENT_VERSION/TARGET_VERSION alongside the new var
+    set:
+      migrations:
+        enabled: true
+        etcdAdoptSkipBackup: true
+    documentSelector:
+      path: kind
+      value: Job
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].env[0].name
+          value: NAMESPACE
+      - equal:
+          path: spec.template.spec.containers[0].env[1].name
+          value: CURRENT_VERSION
+      - equal:
+          path: spec.template.spec.containers[0].env[1].value
+          value: "52"
+      - equal:
+          path: spec.template.spec.containers[0].env[2].name
+          value: TARGET_VERSION
+
+  - it: emits no Job at all when migrations are disabled
+    set:
+      migrations:
+        enabled: false
+        etcdAdoptSkipBackup: true
+    asserts:
+      - hasDocuments:
+          count: 0
diff --git a/packages/core/platform/tests/selective_install_test.yaml b/packages/core/platform/tests/selective_install_test.yaml
new file mode 100644
index 0000000000..ddc83d6691
--- /dev/null
+++ b/packages/core/platform/tests/selective_install_test.yaml
@@ -0,0 +1,141 @@
+suite: selective install via disabledPackages
+
+# The values fixture is generated from the selector and checked against the
+# PackageSource inventory by hack/select-install_test.bats. These tests prove
+# that the platform chart consumes that configuration; they do not prove live
+# reconciliation or uninstall packages protected by resource-policy: keep.
+
+templates:
+  - templates/bundles/paas.yaml
+  - templates/bundles/iaas.yaml
+  - templates/bundles/naas.yaml
+  - templates/bundles/system.yaml
+
+release:
+  name: cozystack
+  namespace: cozy-system
+
+tests:
+  - it: keeps the system runtime baseline
+    template: templates/bundles/system.yaml
+    values:
+      - fixtures/selective-install-postgres-values.yaml
+    set:
+      bundles:
+        system: {enabled: true, variant: isp-full}
+    asserts:
+      - containsDocument: {apiVersion: cozystack.io/v1alpha1, kind: Package, name: cozystack.cozystack-engine, any: true}
+      - containsDocument: {apiVersion: cozystack.io/v1alpha1, kind: Package, name: cozystack.flux-shard-operator, any: true}
+      - containsDocument: {apiVersion: cozystack.io/v1alpha1, kind: Package, name: cozystack.cozystack-basics, any: true}
+      - containsDocument: {apiVersion: cozystack.io/v1alpha1, kind: Package, name: cozystack.tenant-application, any: true}
+      - containsDocument: {apiVersion: cozystack.io/v1alpha1, kind: Package, name: cozystack.etcd-application, any: true}
+      - containsDocument: {apiVersion: cozystack.io/v1alpha1, kind: Package, name: cozystack.ingress-application, any: true}
+      - containsDocument: {apiVersion: cozystack.io/v1alpha1, kind: Package, name: cozystack.monitoring-application, any: true}
+      - containsDocument: {apiVersion: cozystack.io/v1alpha1, kind: Package, name: cozystack.seaweedfs-application, any: true}
+      - containsDocument: {apiVersion: cozystack.io/v1alpha1, kind: Package, name: cozystack.linstor, any: true}
+      - containsDocument: {apiVersion: cozystack.io/v1alpha1, kind: Package, name: cozystack.metallb, any: true}
+      - containsDocument: {apiVersion: cozystack.io/v1alpha1, kind: Package, name: cozystack.reloader, any: true}
+      - containsDocument: {apiVersion: cozystack.io/v1alpha1, kind: Package, name: cozystack.snapshot-controller, any: true}
+      - containsDocument: {apiVersion: cozystack.io/v1alpha1, kind: Package, name: cozystack.etcd-operator, any: true}
+      - containsDocument: {apiVersion: cozystack.io/v1alpha1, kind: Package, name: cozystack.grafana-operator, any: true}
+      - containsDocument: {apiVersion: cozystack.io/v1alpha1, kind: Package, name: cozystack.postgres-operator, any: true}
+      - containsDocument: {apiVersion: cozystack.io/v1alpha1, kind: Package, name: cozystack.victoria-metrics-operator, any: true}
+
+  - it: keeps the postgres backup roundtrip prerequisites
+    template: templates/bundles/system.yaml
+    values:
+      - fixtures/selective-install-postgres-values.yaml
+    set:
+      bundles:
+        system: {enabled: true, variant: isp-full}
+    asserts:
+      - containsDocument: {apiVersion: cozystack.io/v1alpha1, kind: Package, name: cozystack.backupstrategy-controller, any: true}
+      - containsDocument: {apiVersion: cozystack.io/v1alpha1, kind: Package, name: cozystack.backup-controller, any: true}
+      - containsDocument: {apiVersion: cozystack.io/v1alpha1, kind: Package, name: cozystack.bucket-application, any: true}
+      - containsDocument: {apiVersion: cozystack.io/v1alpha1, kind: Package, name: cozystack.objectstorage-controller, any: true}
+      - containsDocument: {apiVersion: cozystack.io/v1alpha1, kind: Package, name: cozystack.velero, any: true}
+
+  - it: keeps the CAPI and virtualization runtime baseline
+    template: templates/bundles/iaas.yaml
+    values:
+      - fixtures/selective-install-postgres-values.yaml
+    set:
+      bundles:
+        system: {enabled: true, variant: isp-full}
+        iaas: {enabled: true}
+    asserts:
+      - containsDocument: {apiVersion: cozystack.io/v1alpha1, kind: Package, name: cozystack.kubevirt, any: true}
+      - containsDocument: {apiVersion: cozystack.io/v1alpha1, kind: Package, name: cozystack.kubevirt-cdi, any: true}
+      - containsDocument: {apiVersion: cozystack.io/v1alpha1, kind: Package, name: cozystack.kamaji, any: true}
+      - containsDocument: {apiVersion: cozystack.io/v1alpha1, kind: Package, name: cozystack.capi-operator, any: true}
+      - containsDocument: {apiVersion: cozystack.io/v1alpha1, kind: Package, name: cozystack.capi-provider-bootstrap-kubeadm, any: true}
+      - containsDocument: {apiVersion: cozystack.io/v1alpha1, kind: Package, name: cozystack.capi-provider-core, any: true}
+      - containsDocument: {apiVersion: cozystack.io/v1alpha1, kind: Package, name: cozystack.capi-provider-cp-kamaji, any: true}
+      - containsDocument: {apiVersion: cozystack.io/v1alpha1, kind: Package, name: cozystack.capi-provider-infra-kubevirt, any: true}
+
+  - it: keeps the selected application and removes unrelated applications
+    template: templates/bundles/paas.yaml
+    values:
+      - fixtures/selective-install-postgres-values.yaml
+    set:
+      bundles:
+        system: {enabled: true, variant: isp-full}
+        paas: {enabled: true}
+    asserts:
+      - containsDocument: {apiVersion: cozystack.io/v1alpha1, kind: Package, name: cozystack.postgres-application, any: true}
+      - containsDocument: {apiVersion: cozystack.io/v1alpha1, kind: Package, name: cozystack.mariadb-operator, any: true}
+        not: true
+      - containsDocument: {apiVersion: cozystack.io/v1alpha1, kind: Package, name: cozystack.kafka-operator, any: true}
+        not: true
+
+  - it: removes common packages outside the audited runtime baseline
+    template: templates/bundles/system.yaml
+    values:
+      - fixtures/selective-install-postgres-values.yaml
+    set:
+      bundles:
+        system: {enabled: true, variant: isp-full}
+    asserts:
+      - containsDocument: {apiVersion: cozystack.io/v1alpha1, kind: Package, name: cozystack.goldpinger, any: true}
+        not: true
+      - containsDocument: {apiVersion: cozystack.io/v1alpha1, kind: Package, name: cozystack.kubeovn-plunger, any: true}
+        not: true
+
+  - it: keeps the platform services no suite owns
+    template: templates/bundles/system.yaml
+    values:
+      - fixtures/selective-install-postgres-values.yaml
+    set:
+      bundles:
+        system: {enabled: true, variant: isp-full}
+    asserts:
+      - containsDocument: {apiVersion: cozystack.io/v1alpha1, kind: Package, name: cozystack.cozy-proxy, any: true}
+      - containsDocument: {apiVersion: cozystack.io/v1alpha1, kind: Package, name: cozystack.cozystack-scheduler, any: true}
+      - containsDocument: {apiVersion: cozystack.io/v1alpha1, kind: Package, name: cozystack.flux-plunger, any: true}
+      - containsDocument: {apiVersion: cozystack.io/v1alpha1, kind: Package, name: cozystack.linstor-scheduler, any: true}
+      - containsDocument: {apiVersion: cozystack.io/v1alpha1, kind: Package, name: cozystack.multus, any: true}
+
+  - it: keeps the later OIDC upgrade packages
+    template: templates/bundles/system.yaml
+    values:
+      - fixtures/selective-install-postgres-values.yaml
+    set:
+      authentication:
+        oidc:
+          enabled: true
+      bundles:
+        system: {enabled: true, variant: isp-full}
+    asserts:
+      - containsDocument: {apiVersion: cozystack.io/v1alpha1, kind: Package, name: cozystack.keycloak, any: true}
+      - containsDocument: {apiVersion: cozystack.io/v1alpha1, kind: Package, name: cozystack.keycloak-operator, any: true}
+
+  - it: keeps iaas and naas bundle guards valid with the reduced set
+    values:
+      - fixtures/selective-install-postgres-values.yaml
+    set:
+      bundles:
+        system: {enabled: true, variant: isp-full}
+        iaas: {enabled: true}
+        naas: {enabled: true}
+    asserts:
+      - notFailedTemplate: {}
diff --git a/packages/core/platform/tests/sources_backupstrategy_dependson_test.yaml b/packages/core/platform/tests/sources_backupstrategy_dependson_test.yaml
new file mode 100644
index 0000000000..e1234972bb
--- /dev/null
+++ b/packages/core/platform/tests/sources_backupstrategy_dependson_test.yaml
@@ -0,0 +1,34 @@
+suite: backupstrategy-controller waits for the tenant-root namespace and its CRDs
+# Regression guard for a fresh-install ordering race: backupstrategy-controller
+# creates the cozy-backups Bucket INTO the tenant-root namespace, which is
+# provisioned by cozystack-basics. Without the cozystack-basics edge the Bucket
+# patch races namespace creation and fails with `namespaces "tenant-root" not
+# found`, which then races the install script's wait deadline. The CRD edges
+# (backup-controller / bucket-application / objectstorage-controller / velero)
+# guard the `no matches for kind` race. All edges below must stay.
+templates:
+  - templates/sources.yaml
+release:
+  name: cozystack
+  namespace: cozy-system
+tests:
+  - it: backupstrategy-controller dependsOn cozystack-basics and the CRD providers
+    documentSelector:
+      path: metadata.name
+      value: cozystack.backupstrategy-controller
+    asserts:
+      - contains:
+          path: spec.variants[0].dependsOn
+          content: cozystack.cozystack-basics
+      - contains:
+          path: spec.variants[0].dependsOn
+          content: cozystack.backup-controller
+      - contains:
+          path: spec.variants[0].dependsOn
+          content: cozystack.bucket-application
+      - contains:
+          path: spec.variants[0].dependsOn
+          content: cozystack.objectstorage-controller
+      - contains:
+          path: spec.variants[0].dependsOn
+          content: cozystack.velero
diff --git a/packages/core/platform/tests/sources_basics_dependson_test.yaml b/packages/core/platform/tests/sources_basics_dependson_test.yaml
new file mode 100644
index 0000000000..7f698256c6
--- /dev/null
+++ b/packages/core/platform/tests/sources_basics_dependson_test.yaml
@@ -0,0 +1,27 @@
+suite: cozystack-basics waits for the APIs its admission policies type-check
+# Regression guard for the kube-controller-manager VAP-status-controller panic:
+# cozystack-basics ships cluster-wide ValidatingAdmissionPolicies that match
+# tenants.apps.cozystack.io (served by cozystack-api, in cozystack-engine) and
+# the Gateway API types (from gateway-api-crds). If the package installs before
+# those APIs are served, KCM type-checks a policy against an unresolvable schema,
+# panics, and deadlocks the install. The dependsOn edges below must stay.
+templates:
+  - templates/sources.yaml
+release:
+  name: cozystack
+  namespace: cozy-system
+tests:
+  - it: cozystack-basics dependsOn cozystack-engine and gateway-api-crds (and tenant-application)
+    documentSelector:
+      path: metadata.name
+      value: cozystack.cozystack-basics
+    asserts:
+      - contains:
+          path: spec.variants[0].dependsOn
+          content: cozystack.tenant-application
+      - contains:
+          path: spec.variants[0].dependsOn
+          content: cozystack.cozystack-engine
+      - contains:
+          path: spec.variants[0].dependsOn
+          content: cozystack.gateway-api-crds
diff --git a/packages/core/platform/tests/sources_capi_provider_proxmox_test.yaml b/packages/core/platform/tests/sources_capi_provider_proxmox_test.yaml
new file mode 100644
index 0000000000..d6f4ffd274
--- /dev/null
+++ b/packages/core/platform/tests/sources_capi_provider_proxmox_test.yaml
@@ -0,0 +1,69 @@
+suite: proxmox infrastructure provider and its IPAM dependency
+# Two edges here are easy to get wrong and expensive when wrong, so they are
+# asserted rather than left to review.
+#
+# 1. The proxmox provider depends on the in-cluster IPAM provider — the reason
+#    is written next to that edge in sources/capi-provider-infra-proxmox.yaml.
+#
+# 2. The proxmox provider must NOT depend on cozystack.kubevirt. The kubevirt
+#    infra provider does, because its VMs run inside this cluster; the Proxmox
+#    hypervisor is external and reached over its API.
+templates:
+  - templates/sources.yaml
+release:
+  name: cozystack
+  namespace: cozy-system
+tests:
+  - it: makes the proxmox provider depend on IPAM, the operator and networking
+    documentSelector:
+      path: metadata.name
+      value: cozystack.capi-provider-infra-proxmox
+    asserts:
+      - equal:
+          path: spec.variants[0].name
+          value: default
+      - contains:
+          path: spec.variants[0].dependsOn
+          content: cozystack.capi-provider-ipam-in-cluster
+      - contains:
+          path: spec.variants[0].dependsOn
+          content: cozystack.capi-operator
+      - contains:
+          path: spec.variants[0].dependsOn
+          content: cozystack.networking
+      - notContains:
+          path: spec.variants[0].dependsOn
+          content: cozystack.kubevirt
+      - contains:
+          path: spec.variants[0].components
+          content:
+            name: capi-providers-infraprovider-proxmox
+            path: system/capi-providers-infraprovider-proxmox
+            install:
+              privileged: true
+              namespace: cozy-cluster-api
+              releaseName: capi-providers-infraprovider-proxmox
+
+  - it: keeps the IPAM provider generic, with no edge back to proxmox
+    documentSelector:
+      path: metadata.name
+      value: cozystack.capi-provider-ipam-in-cluster
+    asserts:
+      - equal:
+          path: spec.variants[0].name
+          value: default
+      - contains:
+          path: spec.variants[0].dependsOn
+          content: cozystack.capi-operator
+      - notContains:
+          path: spec.variants[0].dependsOn
+          content: cozystack.capi-provider-infra-proxmox
+      - contains:
+          path: spec.variants[0].components
+          content:
+            name: capi-providers-ipam-in-cluster
+            path: system/capi-providers-ipam-in-cluster
+            install:
+              privileged: true
+              namespace: cozy-cluster-api
+              releaseName: capi-providers-ipam-in-cluster
diff --git a/packages/core/platform/tests/sources_computeplane_test.yaml b/packages/core/platform/tests/sources_computeplane_test.yaml
new file mode 100644
index 0000000000..7d75af3575
--- /dev/null
+++ b/packages/core/platform/tests/sources_computeplane_test.yaml
@@ -0,0 +1,70 @@
+suite: computeplane package source and iaas bundle wiring
+# The computeplane package is self-contained: it re-declares apps/kubernetes
+# as its own source-only component (the module's cluster HelmRelease points at
+# cozystack-computeplane-application-kubevirt-kubernetes), while the wrapped
+# chart's child addon HelmReleases still reference the kubernetes-application
+# artifacts — hence the hard dependsOn edge. See
+# design-proposals/compute-plane in cozystack/community.
+templates:
+  - templates/sources.yaml
+  - templates/bundles/iaas.yaml
+release:
+  name: cozystack
+  namespace: cozy-system
+tests:
+  - it: declares the self-contained kubevirt variant with the kubernetes re-source
+    template: templates/sources.yaml
+    documentSelector:
+      path: metadata.name
+      value: cozystack.computeplane-application
+    asserts:
+      - equal:
+          path: spec.variants[0].name
+          value: kubevirt
+      - contains:
+          path: spec.variants[0].dependsOn
+          content: cozystack.kubernetes-application
+      - contains:
+          path: spec.variants[0].components
+          content:
+            name: kubernetes
+            path: apps/kubernetes
+            libraries: ["cozy-lib"]
+      # Phase 2 split worker pools into apps/kubernetes-nodes; the module renders
+      # one pool HelmRelease per nodeGroup against this re-sourced artifact.
+      - contains:
+          path: spec.variants[0].components
+          content:
+            name: kubernetes-nodes
+            path: apps/kubernetes-nodes
+            libraries: ["cozy-lib"]
+      - contains:
+          path: spec.variants[0].components
+          content:
+            name: computeplane
+            path: extra/computeplane
+      - contains:
+          path: spec.variants[0].components
+          content:
+            name: computeplane-rd
+            path: system/computeplane-rd
+            install:
+              namespace: cozy-system
+              releaseName: computeplane-rd
+
+  - it: ships in the iaas bundle with the kubevirt variant
+    template: templates/bundles/iaas.yaml
+    set:
+      bundles:
+        system:
+          enabled: true
+          variant: isp-full
+        iaas:
+          enabled: true
+    documentSelector:
+      path: metadata.name
+      value: cozystack.computeplane-application
+    asserts:
+      - equal:
+          path: spec.variant
+          value: kubevirt
diff --git a/packages/core/platform/tests/sources_etcd_application_dependson_test.yaml b/packages/core/platform/tests/sources_etcd_application_dependson_test.yaml
new file mode 100644
index 0000000000..4adbc63107
--- /dev/null
+++ b/packages/core/platform/tests/sources_etcd_application_dependson_test.yaml
@@ -0,0 +1,30 @@
+suite: etcd-application waits for the operator that serves its CRD
+# The etcd chart (extra/etcd) renders kind: EtcdCluster from
+# etcd-operator.cozystack.io/v1alpha2, so cozystack.etcd-operator is a genuine
+# prerequisite of offering the app rather than a test-selection hint. Without
+# this edge the etcd-rd HelmRelease registers the ApplicationDefinition as soon
+# as cozystack-engine is up, a tenant can create an Etcd before the operator
+# exists, and its HelmRelease fails with `no matches for kind "EtcdCluster"`.
+# The edge is also what makes the etcd Chainsaw suite reachable from the
+# operator's own package, so a change to the operator selects that suite instead
+# of the whole run — see hack/select-e2e.sh's src_to_suites().
+templates:
+  - templates/sources.yaml
+release:
+  name: cozystack
+  namespace: cozy-system
+tests:
+  - it: etcd-application dependsOn etcd-operator alongside its baseline edges
+    documentSelector:
+      path: metadata.name
+      value: cozystack.etcd-application
+    asserts:
+      - contains:
+          path: spec.variants[0].dependsOn
+          content: cozystack.etcd-operator
+      - contains:
+          path: spec.variants[0].dependsOn
+          content: cozystack.networking
+      - contains:
+          path: spec.variants[0].dependsOn
+          content: cozystack.cozystack-engine
diff --git a/packages/core/platform/tests/sources_golden_images_healthcheck_test.yaml b/packages/core/platform/tests/sources_golden_images_healthcheck_test.yaml
new file mode 100644
index 0000000000..0ca3466d4e
--- /dev/null
+++ b/packages/core/platform/tests/sources_golden_images_healthcheck_test.yaml
@@ -0,0 +1,39 @@
+suite: golden image catalogs wait for their images to import
+# Every image is a DataVolume with immediate bind, so the import starts at
+# install. Without healthCheckExprs the HelmRelease goes Ready as soon as helm
+# has applied the DataVolumes, and an image that never imports stays green.
+# current must hold only on Succeeded: a looser expression lets an unfinished
+# import pass.
+templates:
+  - templates/sources.yaml
+release:
+  name: cozystack
+  namespace: cozy-system
+tests:
+  - it: gates the vm-default-images component on DataVolume Succeeded
+    documentSelector:
+      path: metadata.name
+      value: cozystack.vm-default-images
+    asserts:
+      - equal:
+          path: spec.variants[0].components[0].name
+          value: vm-default-images
+      - equal:
+          path: spec.variants[0].components[0].install.healthCheckExprs
+          value: &exprs
+            - apiVersion: cdi.kubevirt.io/v1beta1
+              kind: DataVolume
+              failed: "has(status.phase) && status.phase == 'Failed'"
+              current: "has(status.phase) && status.phase == 'Succeeded'"
+
+  - it: gates the kubernetes-worker-image component on DataVolume Succeeded
+    documentSelector:
+      path: metadata.name
+      value: cozystack.kubernetes-worker-image
+    asserts:
+      - equal:
+          path: spec.variants[0].components[0].name
+          value: kubernetes-worker-image
+      - equal:
+          path: spec.variants[0].components[0].install.healthCheckExprs
+          value: *exprs
diff --git a/packages/core/platform/tests/sources_keda_dependson_test.yaml b/packages/core/platform/tests/sources_keda_dependson_test.yaml
new file mode 100644
index 0000000000..c0bc05a627
--- /dev/null
+++ b/packages/core/platform/tests/sources_keda_dependson_test.yaml
@@ -0,0 +1,30 @@
+suite: keda PackageSource dependencies
+templates:
+  - templates/sources.yaml
+release:
+  name: cozystack
+  namespace: cozy-system
+tests:
+  - it: keda PackageSource installs into cozy-keda and depends on networking + prometheus-operator-crds
+    documentSelector:
+      path: metadata.name
+      value: cozystack.keda
+    asserts:
+      - equal:
+          path: kind
+          value: PackageSource
+      - contains:
+          path: spec.variants[0].dependsOn
+          content: cozystack.networking
+      - contains:
+          path: spec.variants[0].dependsOn
+          content: cozystack.prometheus-operator-crds
+      - equal:
+          path: spec.variants[0].components[0].name
+          value: keda
+      - equal:
+          path: spec.variants[0].components[0].path
+          value: system/keda
+      - equal:
+          path: spec.variants[0].components[0].install.namespace
+          value: cozy-keda
diff --git a/packages/core/platform/tests/sources_kubevirt_cdi_dependson_test.yaml b/packages/core/platform/tests/sources_kubevirt_cdi_dependson_test.yaml
new file mode 100644
index 0000000000..009a8426f1
--- /dev/null
+++ b/packages/core/platform/tests/sources_kubevirt_cdi_dependson_test.yaml
@@ -0,0 +1,24 @@
+suite: kubevirt-cdi waits for the cozy-public namespace it binds into
+# Regression guard for a fresh-install ordering race: kubevirt-cdi ships the
+# cdi-clone-dv RoleBinding INTO the cozy-public namespace, which is provisioned
+# by cozystack-basics. Without the cozystack-basics edge the RoleBinding races
+# namespace creation and fails with `namespaces "cozy-public" not found`,
+# normally masked by Flux retries but a hard UpgradeFailed under slow reconcile.
+# The dependsOn edges below must stay.
+templates:
+  - templates/sources.yaml
+release:
+  name: cozystack
+  namespace: cozy-system
+tests:
+  - it: kubevirt-cdi dependsOn networking and cozystack-basics
+    documentSelector:
+      path: metadata.name
+      value: cozystack.kubevirt-cdi
+    asserts:
+      - contains:
+          path: spec.variants[0].dependsOn
+          content: cozystack.networking
+      - contains:
+          path: spec.variants[0].dependsOn
+          content: cozystack.cozystack-basics
diff --git a/packages/core/platform/tests/sources_local_storage_test.yaml b/packages/core/platform/tests/sources_local_storage_test.yaml
new file mode 100644
index 0000000000..460e8cf855
--- /dev/null
+++ b/packages/core/platform/tests/sources_local_storage_test.yaml
@@ -0,0 +1,78 @@
+suite: standalone local storage registration
+templates:
+  - templates/sources.yaml
+  - templates/bundles/system.yaml
+release:
+  name: cozystack
+  namespace: cozy-system
+tests:
+  - it: registers the source before optional application APIs exist
+    template: templates/sources.yaml
+    documentSelector:
+      path: metadata.name
+      value: cozystack.local-storage
+    asserts:
+      - equal:
+          path: spec.variants[0].name
+          value: default
+      - contains:
+          path: spec.variants[0].dependsOn
+          content: cozystack.networking
+      - contains:
+          path: spec.variants[0].components
+          content:
+            name: local-storage
+            path: system/local-storage
+            install:
+              privileged: true
+              namespace: cozy-local-storage
+              releaseName: local-storage
+  - it: does not install local storage with ordinary system defaults
+    template: templates/bundles/system.yaml
+    set:
+      bundles.system.enabled: true
+    asserts:
+      - containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.local-storage
+          any: true
+        not: true
+  - it: emits a Package only for explicit system bundle selection
+    template: templates/bundles/system.yaml
+    capabilities:
+      apiVersions:
+        - apps.cozystack.io/v1alpha1
+    set:
+      bundles.system.enabled: true
+      bundles.enabledPackages: [cozystack.local-storage]
+    documentSelector:
+      path: metadata.name
+      value: cozystack.local-storage
+    asserts:
+      - equal:
+          path: kind
+          value: Package
+      - equal:
+          path: spec.variant
+          value: default
+  - it: lets disabledPackages override opt in
+    template: templates/bundles/system.yaml
+    set:
+      bundles.system.enabled: true
+      bundles.enabledPackages: [cozystack.local-storage]
+      bundles.disabledPackages: [cozystack.local-storage]
+    asserts:
+      - containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: Package
+          name: cozystack.local-storage
+          any: true
+        not: true
+  - it: leaves a bundle-free platform available for standalone Package installation
+    template: templates/bundles/system.yaml
+    set:
+      bundles.enabledPackages: [cozystack.local-storage]
+    asserts:
+      - hasDocuments:
+          count: 0
diff --git a/packages/core/platform/tests/sources_mongodb_application_dependson_test.yaml b/packages/core/platform/tests/sources_mongodb_application_dependson_test.yaml
new file mode 100644
index 0000000000..4cbbe0247a
--- /dev/null
+++ b/packages/core/platform/tests/sources_mongodb_application_dependson_test.yaml
@@ -0,0 +1,31 @@
+suite: mongodb-application waits for the operator that serves its CRD
+# The mongodb chart (apps/mongodb) renders kind: PerconaServerMongoDB from
+# psmdb.percona.com/v1, so cozystack.mongodb-operator is a genuine prerequisite
+# of offering the app rather than a test-selection hint. Without this edge the
+# mongodb-rd HelmRelease registers the ApplicationDefinition as soon as
+# cozystack-engine is up, a tenant can create a MongoDB before the operator
+# exists, and its HelmRelease fails with `no matches for kind
+# "PerconaServerMongoDB"`.
+# The edge is also what makes the mongodb Chainsaw suite reachable from the
+# operator's own package, so a change to the operator selects that suite instead
+# of the whole run — see hack/select-e2e.sh's src_to_suites().
+templates:
+  - templates/sources.yaml
+release:
+  name: cozystack
+  namespace: cozy-system
+tests:
+  - it: mongodb-application dependsOn mongodb-operator alongside its baseline edges
+    documentSelector:
+      path: metadata.name
+      value: cozystack.mongodb-application
+    asserts:
+      - contains:
+          path: spec.variants[0].dependsOn
+          content: cozystack.mongodb-operator
+      - contains:
+          path: spec.variants[0].dependsOn
+          content: cozystack.networking
+      - contains:
+          path: spec.variants[0].dependsOn
+          content: cozystack.cozystack-engine
diff --git a/packages/core/platform/tests/sources_mongodb_operator_crds_test.yaml b/packages/core/platform/tests/sources_mongodb_operator_crds_test.yaml
new file mode 100644
index 0000000000..b6e9a895e1
--- /dev/null
+++ b/packages/core/platform/tests/sources_mongodb_operator_crds_test.yaml
@@ -0,0 +1,21 @@
+suite: mongodb-operator applies CRD updates on upgrade
+# psmdb-operator evolves its CRD schema between minor versions (1.21 -> 1.22 adds
+# storageScaling/storageAutoscaling, vault and other fields). Helm never upgrades
+# CRDs shipped in crds/, so the PackageSource must opt into CreateReplace; without
+# it the operator binary upgrades while the live CRD stays behind and the
+# apiserver rejects the new fields on existing clusters. Pin the policy so an
+# upgrade cannot silently regress.
+templates:
+  - templates/sources.yaml
+release:
+  name: cozystack
+  namespace: cozy-system
+tests:
+  - it: mongodb-operator PackageSource sets upgradeCRDs to CreateReplace
+    documentSelector:
+      path: metadata.name
+      value: cozystack.mongodb-operator
+    asserts:
+      - equal:
+          path: spec.variants[0].components[0].install.upgradeCRDs
+          value: CreateReplace
diff --git a/packages/core/platform/tests/sources_monitoring_application_dependson_test.yaml b/packages/core/platform/tests/sources_monitoring_application_dependson_test.yaml
new file mode 100644
index 0000000000..70bc7e59b3
--- /dev/null
+++ b/packages/core/platform/tests/sources_monitoring_application_dependson_test.yaml
@@ -0,0 +1,70 @@
+suite: monitoring-application variant ordering edges (default + oidc)
+# Regression guard for a fresh-install ordering race introduced by the Phase-1
+# OIDC selector (cozystack/cozystack#3176). The `oidc` variant additionally
+# depends on cozystack.keycloak-operator so the v1.edp.epam.com CRDs are
+# registered before the monitoring chart reconciles — without this edge the
+# `.Capabilities.APIVersions.Has` guard in
+# templates/grafana/oidc-keycloak.yaml would silently drop the whole
+# Keycloak side of mode: System and Grafana's auth.generic_oauth block would
+# point at a client that never gets provisioned. The `default` variant MUST
+# NOT depend on keycloak-operator — that Package is only emitted when
+# authentication.oidc.enabled is true, so a hard dep on the default variant
+# would leave every OIDC-off cluster stuck on DependenciesNotReady forever.
+templates:
+  - templates/sources.yaml
+release:
+  name: cozystack
+  namespace: cozy-system
+tests:
+  - it: default variant carries the baseline reconciliation edges without keycloak-operator
+    documentSelector:
+      path: metadata.name
+      value: cozystack.monitoring-application
+    asserts:
+      - contains:
+          path: spec.variants[0].dependsOn
+          content: cozystack.networking
+      - contains:
+          path: spec.variants[0].dependsOn
+          content: cozystack.postgres-operator
+      - contains:
+          path: spec.variants[0].dependsOn
+          content: cozystack.grafana-operator
+      - contains:
+          path: spec.variants[0].dependsOn
+          content: cozystack.victoria-metrics-operator
+      - contains:
+          path: spec.variants[0].dependsOn
+          content: cozystack.cozystack-engine
+      - notContains:
+          path: spec.variants[0].dependsOn
+          content: cozystack.keycloak-operator
+
+  - it: oidc variant additionally waits for keycloak-operator (OIDC CRDs)
+    documentSelector:
+      path: metadata.name
+      value: cozystack.monitoring-application
+    asserts:
+      - equal:
+          path: spec.variants[1].name
+          value: oidc
+      - contains:
+          path: spec.variants[1].dependsOn
+          content: cozystack.keycloak-operator
+      # oidc variant inherits the baseline edges (regression guard against
+      # someone dropping one when refactoring the variant).
+      - contains:
+          path: spec.variants[1].dependsOn
+          content: cozystack.networking
+      - contains:
+          path: spec.variants[1].dependsOn
+          content: cozystack.grafana-operator
+      - contains:
+          path: spec.variants[1].dependsOn
+          content: cozystack.postgres-operator
+      - contains:
+          path: spec.variants[1].dependsOn
+          content: cozystack.victoria-metrics-operator
+      - contains:
+          path: spec.variants[1].dependsOn
+          content: cozystack.cozystack-engine
diff --git a/packages/core/platform/tests/sources_opensearch_operator_privileged_test.yaml b/packages/core/platform/tests/sources_opensearch_operator_privileged_test.yaml
new file mode 100644
index 0000000000..1efad0ec95
--- /dev/null
+++ b/packages/core/platform/tests/sources_opensearch_operator_privileged_test.yaml
@@ -0,0 +1,25 @@
+suite: opensearch-operator installs as a privileged component
+# The package ships a DaemonSet whose init container raises vm.max_map_count, and
+# that container has to be privileged: the kernel does not namespace vm.*, so no
+# pod can set the value for itself. cozystack-operator labels a namespace
+# enforce=privileged only when some component declares install.privileged, so
+# dropping this field does not fail rendering anywhere; it leaves the DaemonSet
+# inadmissible on any cluster whose PodSecurity default is baseline or stricter.
+# Pin it so the namespace cannot silently lose the level the DaemonSet needs.
+templates:
+  - templates/sources.yaml
+release:
+  name: cozystack
+  namespace: cozy-system
+tests:
+  - it: opensearch-operator PackageSource declares its component privileged
+    documentSelector:
+      path: metadata.name
+      value: cozystack.opensearch-operator
+    asserts:
+      - equal:
+          path: spec.variants[0].components[0].install.privileged
+          value: true
+      - equal:
+          path: spec.variants[0].components[0].install.namespace
+          value: cozy-opensearch-operator
diff --git a/packages/core/platform/tests/sources_redis_operator_crds_test.yaml b/packages/core/platform/tests/sources_redis_operator_crds_test.yaml
new file mode 100644
index 0000000000..39d3fb0ece
--- /dev/null
+++ b/packages/core/platform/tests/sources_redis_operator_crds_test.yaml
@@ -0,0 +1,22 @@
+suite: redis-operator applies CRD updates on upgrade
+# The freshworks-oss fork ships an engine-aware RedisFailover CRD (spec.engine,
+# for the Valkey follow-up), and the downstream TLS patch adds spec.tls on top
+# of it. Helm never upgrades CRDs shipped in crds/, so the PackageSource must
+# opt into CreateReplace; without it the operator binary upgrades while the live
+# CRD stays behind, and the apiserver prunes spec.engine and strips spec.tls
+# from every RedisFailover the redis chart renders, leaving TLS silently off.
+# Pin the policy so an upgrade cannot silently regress.
+templates:
+  - templates/sources.yaml
+release:
+  name: cozystack
+  namespace: cozy-system
+tests:
+  - it: redis-operator PackageSource sets upgradeCRDs to CreateReplace
+    documentSelector:
+      path: metadata.name
+      value: cozystack.redis-operator
+    asserts:
+      - equal:
+          path: spec.variants[0].components[0].install.upgradeCRDs
+          value: CreateReplace
diff --git a/packages/core/platform/tests/sources_tenant_application_slim_test.yaml b/packages/core/platform/tests/sources_tenant_application_slim_test.yaml
new file mode 100644
index 0000000000..3c5fe23638
--- /dev/null
+++ b/packages/core/platform/tests/sources_tenant_application_slim_test.yaml
@@ -0,0 +1,37 @@
+suite: tenant-application slim variant waits only on packages the slim presets emit
+# The slim platform variants emit no monitoring, etcd or seaweedfs application.
+# If the slim variant of tenant-application waited on any of them, the Package
+# would stay DependenciesNotReady and so would cozystack-basics and tenant-root.
+templates:
+  - templates/sources.yaml
+release:
+  name: cozystack
+  namespace: cozy-system
+tests:
+  - it: slim dependsOn keeps the base edges and drops the opt-in applications
+    documentSelector:
+      path: metadata.name
+      value: cozystack.tenant-application
+    asserts:
+      - equal:
+          path: spec.variants[1].name
+          value: slim
+      - equal:
+          path: spec.variants[1].dependsOn
+          value:
+            - cozystack.networking
+            - cozystack.ingress-application
+            - cozystack.gateway-application
+            - cozystack.info-application
+            - cozystack.cozystack-engine
+      - equal:
+          path: spec.variants[1].components
+          value:
+            - name: tenant
+              path: apps/tenant
+              libraries: [cozy-lib]
+            - name: tenant-rd
+              path: system/tenant-rd
+              install:
+                namespace: cozy-system
+                releaseName: tenant-rd
diff --git a/packages/core/platform/tests/sources_velero_crds_test.yaml b/packages/core/platform/tests/sources_velero_crds_test.yaml
new file mode 100644
index 0000000000..a48ad53c87
--- /dev/null
+++ b/packages/core/platform/tests/sources_velero_crds_test.yaml
@@ -0,0 +1,22 @@
+suite: velero applies CRD updates on upgrade
+# velero evolves its CRD schema between versions (v1.18 adds the Queued and
+# ReadyToStart backup phases). Helm never upgrades CRDs shipped in crds/, and
+# the velero package disables the chart's upgrade-crds Job, so the PackageSource
+# must opt into CreateReplace; without it the server binary upgrades while the
+# live CRDs stay at first-install state, the apiserver rejects the new phases,
+# and backups sit in New while the HelmRelease stays green. Pin the policy so an
+# upgrade cannot silently regress.
+templates:
+  - templates/sources.yaml
+release:
+  name: cozystack
+  namespace: cozy-system
+tests:
+  - it: velero PackageSource sets upgradeCRDs to CreateReplace
+    documentSelector:
+      path: metadata.name
+      value: cozystack.velero
+    asserts:
+      - equal:
+          path: spec.variants[0].components[0].install.upgradeCRDs
+          value: CreateReplace
diff --git a/packages/core/platform/tests/vpc_multus_dependency_test.yaml b/packages/core/platform/tests/vpc_multus_dependency_test.yaml
new file mode 100644
index 0000000000..d948b5eafc
--- /dev/null
+++ b/packages/core/platform/tests/vpc_multus_dependency_test.yaml
@@ -0,0 +1,25 @@
+suite: the vpc application depends on multus
+# Its own suite because it renders templates/sources.yaml: adding that template
+# to a suite built around templates/bundles/system.yaml makes every
+# metadata.name selector there match in two documents at once.
+templates:
+  - templates/sources.yaml
+release:
+  name: cozystack
+  namespace: cozy-system
+tests:
+  # The vpc application uses NetworkAttachmentDefinitions, whose CRD multus
+  # installs, so vpc has to install AFTER multus; the edge below is what makes
+  # Flux wait rather than race. It lives in a
+  # static PackageSource the chart ships verbatim through .Files.Glob, which is
+  # easy to mistake for something no rendered document carries: `helm template .`
+  # on this chart fails whole on an OCIRepository lookup and emits nothing at
+  # all, and that empty output reads like absence rather than like an error.
+  - it: keeps the vpc application depending on multus
+    documentSelector:
+      path: metadata.name
+      value: cozystack.virtualprivatecloud-application
+    asserts:
+      - contains:
+          path: spec.variants[0].dependsOn
+          content: cozystack.multus
diff --git a/packages/core/platform/values-isp-full-generic.yaml b/packages/core/platform/values-isp-full-generic.yaml
index 4fd5ff594c..0bd7209cef 100644
--- a/packages/core/platform/values-isp-full-generic.yaml
+++ b/packages/core/platform/values-isp-full-generic.yaml
@@ -11,5 +11,4 @@ bundles:
   naas:
     enabled: true
   enabledPackages:
-    - cozystack.velero
     - cozystack.backupstrategy-controller
diff --git a/packages/core/platform/values-isp-hosted-slim.yaml b/packages/core/platform/values-isp-hosted-slim.yaml
new file mode 100644
index 0000000000..cfd3adcc56
--- /dev/null
+++ b/packages/core/platform/values-isp-hosted-slim.yaml
@@ -0,0 +1,28 @@
+migrations:
+  enabled: true
+# The minimal counterpart of isp-hosted: the host provides CNI, storage and load
+# balancing, and only the Cozystack control plane is emitted. The paas/naas
+# packages and the system packages that do not need a Cozystack-managed data
+# plane are opt-in through bundles.enabledPackages; iaas is refused.
+# An opt-in package does not pull in its dependsOn: list the whole chain, or the
+# Package stays DependenciesNotReady. The chain is the dependsOn of the
+# package in sources/, followed recursively; for example harbor-application
+# needs postgres-operator and redis-operator. The
+# Tenant etcd, monitoring and seaweedfs switches need their application and
+# its chain opted in as well.
+# victoria-metrics-operator and prometheus-operator-crds stay on even without
+# monitoring: the tenant ingress release and most paas operators depend on them.
+bundles:
+  system:
+    enabled: true
+    variant: "isp-hosted-slim"
+  iaas:
+    enabled: false
+  paas:
+    enabled: true
+  naas:
+    enabled: true
+# Tenant/root does not run monitoring here, so the cozy-monitoring redirects
+# into it would dead-end; see monitoring.rootEnabled in values.yaml.
+monitoring:
+  rootEnabled: false
diff --git a/packages/core/platform/values-isp-hosted.yaml b/packages/core/platform/values-isp-hosted.yaml
index c3af0deb76..876e316da7 100644
--- a/packages/core/platform/values-isp-hosted.yaml
+++ b/packages/core/platform/values-isp-hosted.yaml
@@ -1,8 +1,19 @@
 migrations:
   enabled: true
 bundles:
+  # The system bundle carries two things: a variant-selected data-plane head
+  # (kubeovn/cilium/linstor on isp-full, a noop networking Package here) and a
+  # variant-agnostic control-plane body (cozystack-engine — the sole source of
+  # the ApplicationDefinition CRD — plus cert-manager, prometheus-operator-crds,
+  # postgres-operator, objectstorage-controller and the *-application catalog).
+  # "Hosted" drops the data-plane head only: the host already provides CNI,
+  # storage and virtualisation. That is expressed by variant: isp-hosted, NOT by
+  # disabling the bundle — turning it off also deletes the control-plane body,
+  # which leaves every paas/naas application Package permanently
+  # DependenciesNotReady. iaas stays off; see templates/bundles/iaas.yaml, which
+  # refuses to render on this variant.
   system:
-    enabled: false
+    enabled: true
     variant: "isp-hosted"
   iaas:
     enabled: false
diff --git a/packages/core/platform/values-isp-slim-generic.yaml b/packages/core/platform/values-isp-slim-generic.yaml
new file mode 100644
index 0000000000..ef213893de
--- /dev/null
+++ b/packages/core/platform/values-isp-slim-generic.yaml
@@ -0,0 +1,33 @@
+migrations:
+  enabled: true
+# Slim variants emit the base platform only; everything else is opt-in through
+# bundles.enabledPackages, including every paas/naas package. iaas is refused.
+# An opt-in package does not pull in its dependsOn: list the whole chain, or the
+# Package stays DependenciesNotReady. The chain is the dependsOn of the
+# package in sources/, followed recursively; for example harbor-application
+# needs postgres-operator and redis-operator. The
+# Tenant etcd, monitoring and seaweedfs switches need their application and
+# its chain opted in as well.
+# victoria-metrics-operator and prometheus-operator-crds stay on even without
+# monitoring: linstor, the tenant ingress release and most paas operators
+# depend on them.
+# Networking is Cilium alone (no KubeOVN), and Cilium L2 announcements replace
+# MetalLB: a LoadBalancer Service gets its address from a CiliumLoadBalancerIPPool
+# announced by a CiliumL2AnnouncementPolicy, both created by the admin.
+# Cilium takes pod ranges from node.spec.podCIDR, so kube-controller-manager
+# must allocate node CIDRs (Talos and k3s do by default; kubeadm needs
+# --pod-network-cidr). The networking.*CIDR values here are KubeOVN-only.
+bundles:
+  system:
+    enabled: true
+    variant: "isp-slim-generic"
+  iaas:
+    enabled: false
+  paas:
+    enabled: true
+  naas:
+    enabled: true
+# Tenant/root does not run monitoring here, so the cozy-monitoring redirects
+# into it would dead-end; see monitoring.rootEnabled in values.yaml.
+monitoring:
+  rootEnabled: false
diff --git a/packages/core/platform/values-isp-slim.yaml b/packages/core/platform/values-isp-slim.yaml
new file mode 100644
index 0000000000..41b494bd97
--- /dev/null
+++ b/packages/core/platform/values-isp-slim.yaml
@@ -0,0 +1,33 @@
+migrations:
+  enabled: true
+# Slim variants emit the base platform only; everything else is opt-in through
+# bundles.enabledPackages, including every paas/naas package. iaas is refused.
+# An opt-in package does not pull in its dependsOn: list the whole chain, or the
+# Package stays DependenciesNotReady. The chain is the dependsOn of the
+# package in sources/, followed recursively; for example harbor-application
+# needs postgres-operator and redis-operator. The
+# Tenant etcd, monitoring and seaweedfs switches need their application and
+# its chain opted in as well.
+# victoria-metrics-operator and prometheus-operator-crds stay on even without
+# monitoring: linstor, the tenant ingress release and most paas operators
+# depend on them.
+# Networking is Cilium alone (no KubeOVN), and Cilium L2 announcements replace
+# MetalLB: a LoadBalancer Service gets its address from a CiliumLoadBalancerIPPool
+# announced by a CiliumL2AnnouncementPolicy, both created by the admin.
+# Cilium takes pod ranges from node.spec.podCIDR, so kube-controller-manager
+# must allocate node CIDRs (Talos and k3s do by default; kubeadm needs
+# --pod-network-cidr). The networking.*CIDR values here are KubeOVN-only.
+bundles:
+  system:
+    enabled: true
+    variant: "isp-slim"
+  iaas:
+    enabled: false
+  paas:
+    enabled: true
+  naas:
+    enabled: true
+# Tenant/root does not run monitoring here, so the cozy-monitoring redirects
+# into it would dead-end; see monitoring.rootEnabled in values.yaml.
+monitoring:
+  rootEnabled: false
diff --git a/packages/core/platform/values.yaml b/packages/core/platform/values.yaml
index 02fb3bd626..747f4c9045 100644
--- a/packages/core/platform/values.yaml
+++ b/packages/core/platform/values.yaml
@@ -5,24 +5,89 @@ sourceRef:
   path: /
 migrations:
   enabled: false
-  image: ghcr.io/cozystack/cozystack/platform-migrations:v1.4.0-rc.2@sha256:17390197a9b11d76a8dd1b24c6d1512adb7d3226b28b5bcba8551b14b1ec4be0
-  targetVersion: 44
+  # The image digest is NOT hand-edited alongside targetVersion. The release
+  # build rebuilds the migrations image from this same source tree (which
+  # carries migrations/<N> and the etcd-migrate binary) and restamps this pin
+  # in the same commit via `make image-migrations` (yq --inplace) — so image and
+  # targetVersion are only consistent at a release tag, not mid-PR. The digest
+  # below therefore lags targetVersion in-tree by design; run-migrations.sh
+  # refuses to advance past a migration file missing from the image (exit 1), so
+  # a stale pin fails loudly rather than silently skipping the etcd adoption.
+  image: ghcr.io/cozystack/cozystack/platform-migrations:v1.6.0@sha256:6777042e3e9c6bad76e7d96fb64baa115061975f39061cb3ede84e21d0e2213f
+  targetVersion: 60
+  # Adopt legacy etcd clusters onto the v1alpha2 operator WITHOUT the mandatory
+  # pre-adoption safety snapshot (migration 50). Leave false unless migration 50
+  # has actually refused to proceed and you accept the risk: adoption rewires
+  # ownership of LIVE etcd storage, and a botched adoption on a tenant
+  # control-plane etcd is UNRECOVERABLE with no snapshot.
+  #
+  # Migration 50 refuses when it cannot resolve, or cannot trust, a snapshot
+  # destination — backups disabled, an external S3 whose credentials were never
+  # staged, SeaweedFS not ready at upgrade time, or a bucket it cannot classify.
+  # Those are individually-supported configurations, so rather than leave such a
+  # cluster permanently unable to upgrade, this flag lets an operator proceed
+  # deliberately. Prefer fixing the condition the migration names in its log:
+  # the migration is idempotent, so re-running after the fix is the safe path,
+  # and this flag is the last resort when there is nothing to fix.
+  #
+  # Reset it to false once the upgrade is through, or the next platform upgrade
+  # that adds an etcd migration will skip its snapshot too.
+  etcdAdoptSkipBackup: false
 # Bundle deployment configuration
 bundles:
   system:
     enabled: false
-    variant: "isp-full" # Options: "isp-full", "isp-full-generic", "isp-hosted", "distro-full"
+    variant: "isp-full" # Options: "isp-full", "isp-full-generic", "isp-hosted", "isp-slim", "isp-slim-generic", "isp-hosted-slim"
   iaas:
     enabled: false
+    # gpu-operator variant selector — applies when cozystack.gpu-operator is
+    # in bundles.enabledPackages. "default" runs the vfio-pci passthrough
+    # stack (whole GPU → one VM); "vgpu" runs the vGPU Manager stack;
+    # "container" serves GPUs to ordinary pods through the device plugin on
+    # hosts that already provide the NVIDIA driver and container toolkit.
+    # The platform mirrors the two VM variants into the KubeVirt CR: both
+    # get the HostDevices feature gate; passthrough also gets a default
+    # permittedHostDevices.pciHostDevices table covering common NVIDIA
+    # datacenter GPUs (vendor 10DE), and vgpu gets
+    # permittedHostDevices.mediatedDevices when
+    # gpu.vgpuDeviceManager.enabled is true. No mediatedDevicesConfiguration
+    # default ships in either variant — see the gpu block below for why.
+    # "container" gets none of that wiring: it keeps the host driver bound,
+    # so no GPU is available for VM passthrough.
+    # Operators with additional or non-NVIDIA cards extend the defaults via
+    # gpu.permittedHostDevices / gpu.mediatedDevicesConfiguration /
+    # gpu.replaceDefaults below — read by the two VM variants only.
+    gpuOperatorVariant: default
   paas:
     enabled: false
   naas:
     enabled: false
   disabledPackages: []
+  # Packages the platform ships but does not deploy unless named here. Two of
+  # them belong to the Proxmox substrate, where worker VMs run on an external
+  # hypervisor instead of on KubeVirt in this cluster:
+  #
+  #   cozystack.capi-provider-infra-proxmox
+  #     capmox, the Cluster API infrastructure provider for Proxmox VE. Needs a
+  #     capmox-config Secret with a Proxmox API token before it can do anything;
+  #     enabling it pulls in the IPAM provider below automatically.
+  #   cozystack.capi-provider-ipam-in-cluster
+  #     Cluster API in-cluster IPAM. Required by capmox, which assigns static
+  #     addresses and has no DHCP mode. Listed separately because it is a
+  #     generic addon, not a Proxmox one.
+  #
+  # Both are emitted by the iaas bundle. disabledPackages still wins over this
+  # list, except that disabling IPAM while capmox is enabled stops the render:
+  # the cluster would only park capmox at Ready=False with DependenciesNotReady,
+  # and nothing there would name the two list entries that conflict.
   enabledPackages: []
 # Network configuration
 networking:
   clusterDomain: "cozy.local"
+  # On the kube-ovn variants the last /21 of podCIDR is reserved for Cilium's
+  # own router and Gateway API Ingress addresses and excluded from kube-ovn
+  # allocation, so podCIDR needs a prefix of /20 or shorter. Each node takes a
+  # /29 of that block, which caps these variants at 256 nodes.
   podCIDR: "10.244.0.0/16"
   podGateway: "10.244.0.1"
   serviceCIDR: "10.96.0.0/16"
@@ -34,10 +99,105 @@ networking:
   # Set this to comma-separated list of master node IPs to override.
   kubeovn:
     MASTER_NODES: ""
+  # Confirms a change of the cozystack.networking Package variant on a running
+  # cluster. Changing the variant of the cozystack.cozystack-platform Package
+  # can change that variant (isp-full runs kubeovn-cilium, isp-slim runs cilium,
+  # isp-hosted runs noop), and the operator then deletes the networking
+  # HelmReleases the new variant does not install: isp-full -> isp-hosted
+  # removes Cilium and Kube-OVN. The platform render refuses such a change
+  # while the live Package has another variant, unless this is set to the NEW
+  # networking variant, as named in the render error. It confirms that one
+  # switch only; a leftover value does not cover a later switch to a different
+  # variant.
+  acknowledgeVariantChange: ""
+  # In-cluster (east-west) transport encryption. Opt-in, OFF by default.
+  #
+  # When enabled, pod-to-pod traffic that crosses nodes is encrypted at the
+  # network layer by the ACTIVE datapath, regardless of whether the workload
+  # speaks TLS — defense-in-depth for the whole mesh without per-application
+  # changes. This COMPLEMENTS, and does NOT replace, application-level /
+  # end-to-end TLS: it never reaches an external client and gives a tenant no
+  # verifiable endpoint certificate (see the per-app certificate series). Use
+  # it alongside, not instead of, TLS on exposed endpoints.
+  #
+  # The mechanism is datapath-specific (selected by bundles.system.variant):
+  #
+  #   * kubeovn-cilium (isp-full) and kubeovn-cilium-generic
+  #     (isp-full-generic): KubeOVN owns the datapath; its Geneve overlay is
+  #     encrypted with IPsec (kube-ovn ENABLE_OVN_IPSEC). KubeOVN's own
+  #     controller provisions the IPsec CA and per-node certificates through
+  #     the Kubernetes CSR API — no cert-manager wiring is required. This is
+  #     the path this toggle drives today.
+  #   * cilium / cilium-generic (Cilium owns the datapath; isp-slim,
+  #     isp-slim-generic): Cilium-native WireGuard/IPsec is the right mechanism
+  #     there, but it is not wired yet, so the slim variants refuse this toggle.
+  #   * cilium-kilo: Kilo already establishes a WireGuard mesh, but only at
+  #     meshGranularity=location — it encrypts CROSS-LOCATION traffic and
+  #     leaves intra-location pod-to-pod in cleartext by design. This toggle
+  #     targets exactly that intra-location gap and composes with Kilo rather
+  #     than conflicting with it.
+  #
+  # CAVEATS: encrypting the overlay adds per-packet ESP overhead and lowers
+  # the effective MTU, so east-west throughput drops and latency rises; the
+  # cost is highest for high-bandwidth flows. IPsec here protects the
+  # inter-node overlay tunnels — same-node pod-to-pod traffic never leaves the
+  # host and is not tunneled or encrypted. Flipping this on an existing
+  # cluster triggers a rollout of the CNI components. On variants without a
+  # cozystack-managed encryptable datapath (isp-hosted, isp-hosted-slim / noop) the toggle
+  # has no effect.
+  encryption:
+    enabled: false
+  # Install the upstream reference CNI plugins (bridge, macvlan, ipvlan, ...)
+  # into /opt/cni/bin on every node, from the multus image. Multus-backed
+  # NetworkAttachmentDefinitions delegate to these. Talos puts six binaries in
+  # that directory -- bridge, firewall, host-local, loopback and portmap from the
+  # same upstream release, plus flannel from a different repo -- and generic Linux
+  # gives no guarantee at all, so a bridge-type NAD fails there with
+  # `failed to find plugin "bridge" in path [/opt/cni/bin]`. A NAD naming one of
+  # the other ten needs staging on either platform.
+  #
+  # On for both variants when unset. Four of the names Talos carries are ones
+  # staging writes, so it rewrites those with the same upstream version (v1.9.1
+  # on both sides) and adds the ten it does not carry; loopback is not staged and
+  # flannel was never part of the reference set. Set it explicitly to decline.
+  #
+  # A spelling this chart does not recognise stops the whole platform render, not
+  # just multus, so a typo here halts reconciliation cluster-wide. That is
+  # deliberate -- reading an unreadable value as "off" would defeat the opt-out --
+  # but it is why the accepted spellings are worth getting right first time.
+  #
+  # When on, the plugins are written every time the Multus pod is recreated,
+  # replacing files of the same name. 14 of the upstream reference plugins are
+  # installed; loopback, dhcp, dummy and tap are left alone. See
+  # docs/vm-external-vlan.md.
+  #
+  # On a running cluster this is set on the `platform` component of the
+  # `cozystack.cozystack-platform` Package CR, the same path as backupStorage
+  # (see docs/operations/backup-classes.md). Editing the multus HelmRelease or
+  # the child Package cozystack.multus directly is reverted by the platform
+  # reconcile.
+  # stageCniPlugins: true
+  # Resources of the kube-multus container, merged over the defaults in
+  # packages/system/multus/values.yaml, which also say why there is no CPU limit.
+  # Unset keeps those defaults. The multus chart refuses to render without a
+  # memory limit and a memory request. Set on a running cluster the same way as
+  # stageCniPlugins above.
+  # multus:
+  #   resources:
+  #     limits:
+  #       memory: 8Gi
+
 # Service publishing and ingress configuration
 publishing:
   host: "example.org"
   ingressName: tenant-root
+  # Optional namespace of a SEPARATE Gateway / ingressClass that system
+  # components attach their admin routes to (currently Keycloak) — e.g. one
+  # bound to a private IP, unreachable from the public internet. Empty means
+  # admin endpoints share the same ingress as everything else (ingressName).
+  # The private Gateway itself is NOT created by cozystack; provision it out
+  # of band, then point this at its namespace to move admin traffic onto it.
+  ingressNameAdmin: ""
   exposedServices:
     - api
     - dashboard
@@ -45,6 +205,31 @@ publishing:
     - cdi-uploadproxy
   apiServerEndpoint: "" # example: "https://api.example.org"
   externalIPs: []
+  # Native loadBalancerClass for the host ingress. When externalIPs is empty the
+  # host ingress publishes its Service as type: LoadBalancer; set this to the
+  # loadBalancerClass of the LoadBalancer controller that should handle it. The
+  # admin provisions the matching address pool / announcer out of band (a MetalLB
+  # IPAddressPool, a Cilium LB-IPAM pool, a cloud LB, etc.). Empty lets the
+  # cluster's default LoadBalancer controller claim the Service.
+  # spec.loadBalancerClass is immutable: on a cluster whose host ingress Service
+  # already exists as type: LoadBalancer, setting, changing, or clearing this
+  # value requires recreating that Service once (the chart fails early with the
+  # exact command).
+  loadBalancerClass: ""
+  # DNS suffix the dashboard appends to the name of a LoadBalancer Service on
+  # the application Services tab, shown under the external IP as
+  # `<service-name>.<serviceDomain>` (e.g. demo-external-write.svc.example.org
+  # for a postgres release named demo). Display-only: nothing in the platform
+  # creates DNS records for it. Set it only when your DNS already resolves
+  # exactly that name to the Service's LoadBalancer IP, e.g. external-dns with
+  # a matching fqdn template. A CoreDNS k8s_external zone does not fit: it
+  # answers <service>.<namespace>.<zone>, which this suffix cannot express.
+  # This is not the `<release>.<tenant host>` name the app charts put into
+  # their certificates, so a TLS client may see a SAN mismatch unless DNS and
+  # certificates are aligned by the operator. The suffix is cluster-wide, so
+  # two tenants with a release of the same name get the same hostname.
+  # Empty (the default) shows no hostname.
+  serviceDomain: ""
   # Enable PROXY-protocol on the host ingress-nginx and auto-deploy
   # ouroboros (system/ouroboros) to fix the resulting hairpin-NAT
   # problem (intra-cluster traffic to the cluster's own public hostnames
@@ -103,14 +288,17 @@ publishing:
   # there). The flag does not cascade into tenants on its own.
   #
   # DISABLE PATH: flipping this back from true to false has TWO
-  # asymmetric effects. ingress-nginx side: the next reconcile re-emits
-  # cozystack.ingress-application without the use-proxy-protocol /
-  # real-ip-header / enable-real-ip overrides (cozystack deliberately
-  # never set use-forwarded-headers or compute-full-forwarded-for here
-  # — those would allow any upstream proxy to spoof X-Forwarded-For
-  # without a paired proxy-real-ip-cidr — see bundles/system.yaml),
-  # so ingress-nginx
-  # stops accepting PROXY-protocol headers. If the upstream L4 LB is
+  # asymmetric effects. ingress-nginx side: the switch travels through
+  # _cluster.proxy-protocol in the cozystack-values Secret, so the next
+  # reconcile re-renders the host ingress-nginx (extra/ingress) without
+  # the use-proxy-protocol / real-ip-header / enable-real-ip keys
+  # (cozystack deliberately never sets use-forwarded-headers or
+  # compute-full-forwarded-for — those would allow any upstream proxy
+  # to spoof X-Forwarded-For without a paired proxy-real-ip-cidr — see
+  # the rationale in extra/ingress/templates/nginx-ingress.yaml). The
+  # cozystack.ingress-application Package stays the bare default
+  # throughout; the keys never ride on it. ingress-nginx then stops
+  # accepting PROXY-protocol headers. If the upstream L4 LB is
   # still prepending PROXY frames at that moment, every external
   # request to ingress-nginx breaks until the LB is also reconfigured
   # — flip the LB OFF FIRST, then flip this flag. ouroboros side:
@@ -125,16 +313,24 @@ publishing:
   #
   #   kubectl delete package.cozystack.io cozystack.ouroboros
   #
-  # or adds the package name to bundles.disabledPackages. THAT is the
-  # path that triggers the chart's pre-delete Helm hook
+  # THAT is the path that triggers the chart's pre-delete Helm hook
   # (charts/ouroboros/templates/coredns-cleanup-hook.yaml, vendored at
-  # 0.7.0) — the hook quiesces the controller, sed-strips the
+  # 0.8.0) — the hook quiesces the controller, sed-strips the
   # BEGIN/END block from the live kube-system/coredns Corefile, and
   # restores the cleaned ConfigMap via kubectl replace. The hook is
   # automatic; operators do NOT need to run a manual sed recipe in
   # the normal disable path. Documentation of the hook's exact
   # behaviour lives in the upstream chart's README.
   #
+  # bundles.disabledPackages does NOT do this. Putting this name in
+  # that list only makes templates/_helpers.tpl skip emitting the
+  # Package document — the same suppression as leaving proxyProtocol
+  # false — and resource-policy: keep then stops Helm pruning a
+  # Package it no longer renders. The Package CR stays, so does the
+  # HelmRelease it owns, ouroboros keeps running, and the pre-delete
+  # hook never fires. No platform values setting reaches that hook:
+  # the operator has to delete the Package CR.
+  #
   # Manual cleanup recipe (only if the chart's pre-delete hook fails
   # to land — controller pod stuck in CrashLoop blocking the quiesce
   # step, ConfigMap RBAC drift on the namespace, helm uninstall
@@ -173,7 +369,7 @@ publishing:
   # Package CR on the cluster. An operator who manually
   # `kubectl delete package cozystack.ouroboros` before flipping the
   # flag back bypasses the check entirely (the lookup returns nil, the
-  # render proceeds). In the chart 0.7.0 that path is mostly safe —
+  # render proceeds). In the chart 0.8.0 that path is mostly safe —
   # `kubectl delete package` triggers helm uninstall and the chart's
   # pre-delete hook patches the Corefile automatically. The hole is
   # the rare case where the hook itself fails (controller pod stuck,
@@ -185,6 +381,82 @@ publishing:
   certificates:
     solver: http01 # "http01" or "dns01"
     issuerName: letsencrypt-prod
+    # Shared wildcard issuance on the default ingress-nginx path
+    # (gateway.enabled=false). Opt-in, OFF by default. When set to true
+    # with solver=dns01 and no operator-provided wildcardSecretName, the
+    # platform issues ONE wildcard Certificate (*.<root-host> +
+    # <root-host>) via the DNS-01 ClusterIssuer and serves it as the
+    # ingress controller's default SSL certificate, so system services
+    # (dashboard, grafana, keycloak, harbor, …) stop minting a per-host
+    # ACME cert each. This avoids the Let's Encrypt per-domain rate limit
+    # once a deployment exceeds ~50 endpoints, matching the Gateway API
+    # path which issues a per-apex wildcard in dns01 mode.
+    #
+    # Ignored when solver=http01 (HTTP-01 cannot issue wildcards) and
+    # when gateway.enabled=true (the TenantGateway controller issues the
+    # wildcard there).
+    #
+    # COVERAGE CAVEAT — same contract as wildcardSecretName below: a
+    # single-label wildcard *.<root-host> covers <service>.<root-host>
+    # but NOT a custom service host outside it (e.g. a keycloak
+    # ingress.host / harbor host / grafana host set to auth.example.com,
+    # or a nested a.b.<root-host>). When this is true, services whose
+    # host is not covered fall back to the default SSL certificate and
+    # would serve the wrong certificate. Only enable it when every
+    # exposed system service uses a <service>.<root-host> host (the
+    # default), or provide a covering wildcardSecretName instead. Left
+    # OFF by default precisely so a dns01 cluster with a custom service
+    # host is never silently switched on upgrade.
+    #
+    # BLAST RADIUS — like wildcardSecretName, the chosen name rides the
+    # _cluster channel, which every child tenant inherits verbatim. A
+    # child tenant that inherits the root ingress has nested service
+    # hosts (<service>.<tenant>.<root-host>) that *.<root-host> does NOT
+    # cover; enabling this makes those services drop per-host ACME and
+    # serve the root default certificate too. This is not root-tenant
+    # scoped — only enable it when child-tenant hosts are also covered
+    # (or left on the Gateway path). Per-tenant wildcards are tracked
+    # separately.
+    #
+    # FIRST-ISSUANCE WINDOW: when this is turned on, consumers drop their
+    # per-host certs immediately, but the DNS-01 wildcard takes a few
+    # minutes to issue. Until the Secret is populated ingress-nginx serves
+    # its self-signed default cert (browser warning), then self-heals —
+    # the same delay per-host ACME has on first issue, which an
+    # operator-provided wildcardSecretName avoids only by pre-existing.
+    wildcard: false
+    # Operator-provided wildcard certificate. When set, platform
+    # services and the root tenant's ingress/Gateway serve under this
+    # pre-existing TLS Secret instead of minting per-host ACME certs.
+    # The Secret must already exist in the publishing namespace — the
+    # one that runs the root ingress controller / Gateway, which follows
+    # publishing.ingressName (tenant-root by default) — be of type
+    # kubernetes.io/tls, and cover the root host (typically a wildcard
+    # *.<root-host> + <root-host>). Only the
+    # NAME is distributed through the platform values channel — the
+    # cert/key material is never broadcast. Leave empty to keep ACME
+    # issuance (solver/issuerName above).
+    #
+    # Child tenants are covered automatically: the platform controller
+    # replicates this Secret into every tenant namespace that runs its own
+    # ingress controller, and into Gateway owners as long as their Gateway
+    # terminates TLS itself (see gateway.edgeTerminatedClasses below), so each
+    # per-tenant termination point serves the wildcard from its own
+    # namespace (no cross-namespace Secret
+    # read, no widened tenant RBAC). No extra input — the same name set
+    # here drives both the consumers and the replication. The replica
+    # carries the wildcard private key into each terminating tenant
+    # namespace (the same exposure as the per-host ACME Secret it replaces,
+    # now shared across tenants), and covers a child apex only if the
+    # certificate's SAN list does — a single *.<root-host> does not match
+    # *.<child-apex>, so supply SANs covering the child apexes you serve.
+    # On a freshly-created tenant the replica may land a moment after the
+    # tenant's ingress controller starts. The window is bounded: the
+    # platform controller creates the replica within one reconcile, and
+    # ingress-nginx watches its default-ssl-certificate Secret and adopts
+    # it when it appears (no restart needed). Until then ingress-nginx logs
+    # a warning and serves its built-in certificate.
+    wildcardSecretName: ""
     # Rate-limit note: every tenant with gateway=true issues one
     # Certificate for its wildcard + apex hostnames. If many tenants share
     # the same apex domain with issuerName=letsencrypt-prod, the cluster
@@ -219,17 +491,64 @@ publishing:
         tsigAlgorithm: HMACSHA256
         secretName: ""
         secretKey: tsig-secret-key
+# Telemetry reported by platform components.
+#
+# Two components report: cozystack-operator (cluster facts — nodes, storage,
+# packages) and cozystack-controller (application counts). This key covers the
+# CONTROLLER, which the platform deploys. The operator is deployed by the
+# cozy-installer chart and is switched off separately, with
+# cozystackOperator.disableTelemetry=true — a full opt-out needs both, because
+# the two components are installed by two different charts.
+#
+# What is collected, and why, is documented at
+# https://cozystack.io/docs/operations/configuration/telemetry/
+telemetry:
+  disabled: false
 # Authentication configuration
 authentication:
   oidc:
     enabled: false
     insecureSkipVerify: false
     keycloakExtraRedirectUri: ""
-    # Internal URL to access KeyCloak realm for backend-to-backend requests (bypasses external DNS).
-    # When set, oauth2-proxy uses --skip-oidc-discovery and routes all backend calls (token, jwks,
-    # userinfo, logout) through this URL while keeping browser redirects on the external URL.
-    # Example: http://keycloak-http.cozy-keycloak.svc:8080/realms/cozy
-    keycloakInternalUrl: ""
+    # Technical name of the Keycloak realm that owns the cozystack clients and
+    # the cozystack-cluster-admin roles. keycloak-configure creates the realm
+    # under this name, and every SSO consumer (dashboard, linstor-gui, the
+    # generated kubeconfig, and the derived keycloakInternalUrl below) points at
+    # /realms/<realmName>. The apiserver OIDC issuer is set out-of-band via talm
+    # oidcIssuerUrl and must carry the same realm, or the tokens minted here are
+    # rejected. Rename it in one place; keep it in step with talm.
+    #
+    # Set this at install time. Changing it on a running cluster does not rename
+    # the realm: the keycloak-operator provisions a fresh, empty realm under the
+    # new name and abandons the old one, so every account, session and client
+    # living in the previous realm is orphaned. Treat a rename on a live cluster
+    # as a from-scratch re-provision of identities, not an in-place migration.
+    #
+    # "master" is refused: that realm holds the Keycloak super-admin, so naming
+    # it here would put the platform clients, the cluster-admin roles and every
+    # end user inside it.
+    realmName: "cozy"
+    # In-cluster URL of the KeyCloak realm, used for backend-to-backend requests. oauth2-proxy runs
+    # with --skip-oidc-discovery and sends every backend call (token, jwks, userinfo, logout) to this
+    # URL, while browser-facing redirects keep pointing at the external host.
+    #
+    # This is the default path: the bundled KeyCloak is the only supported provider, so those calls
+    # have no reason to leave the cluster. Taking the external hostname instead would route them
+    # through public DNS and the root ingress — which does not serve yet on a fresh install, leaving
+    # the dashboard permanently down.
+    #
+    # The keycloak-http Service has no TLS listener, so these backend calls travel as plaintext HTTP
+    # between pods, as keycloak-configure's own admin calls to the same address already do.
+    #
+    # Override only for a KeyCloak that does not live at the standard in-cluster address. Setting it
+    # to an empty string restores full OIDC discovery against the external issuer.
+    #
+    # Left unset (null), it is derived from realmName as
+    # http://keycloak-http.cozy-keycloak.svc:8080/realms/<realmName>, so a realm rename reaches these
+    # backend calls automatically. The tri-state is: null -> derive from realmName; "" -> external
+    # OIDC discovery; any other value -> used verbatim. An explicit value is not rewritten, so a
+    # custom realm paired with an explicit URL must name the same realm.
+    keycloakInternalUrl: null
 # Gateway API configuration
 gateway:
   # Enable Gateway API support across the platform. When true:
@@ -237,19 +556,103 @@ gateway:
   #     that attaches to the root tenant's Gateway, so Certificate issuance
   #     works for tenants whose ingress is via Gateway API rather than
   #     ingress-nginx.
-  #   - Exposed services (dashboard, keycloak, harbor, bucket, grafana,
-  #     cozystack-api, vm-exportproxy, cdi-uploadproxy) render an
-  #     HTTPRoute attached to the tenant's Gateway.
+  #   - Exposed services whose TLS the Gateway terminates (dashboard,
+  #     keycloak, harbor, bucket, grafana) render an HTTPRoute attached to
+  #     the tenant's Gateway.
+  #   - The three that present a certificate of their own (api,
+  #     vm-exportproxy, cdi-uploadproxy) render a TLSRoute instead, pinned
+  #     by sectionName to the tls-<name> TLS-passthrough listener the
+  #     per-tenant gateway chart declares for it. The cozystack-api,
+  #     kubevirt and kubevirt-cdi packages ship one each, cluster-wide,
+  #     attached to the Gateway in the namespace publishing.ingressName
+  #     selects.
   # Per-tenant opt-in is still governed by tenant.spec.gateway=true, which
   # materialises the Gateway itself. This flag only controls platform-wide
-  # Gateway API integration (cert-manager solver + per-service HTTPRoutes).
+  # Gateway API integration (cert-manager solver + the per-service routes).
   enabled: false
+  # Default GatewayClass for tenant Gateways. A tenant picks another one
+  # with `gatewayClass` on its Tenant resource; this is the value used when
+  # it does not. The default is the Cilium class the platform ships. Reaches
+  # the per-tenant gateway chart as _cluster.gateway-class-name.
+  className: cilium
+  # GatewayClasses whose provider terminates TLS upstream of the Gateway
+  # (a Cloudflare Tunnel class ends TLS at the Cloudflare edge and reaches
+  # the Gateway over the tunnel). TLS termination is a property of the
+  # class, not of the tenant, so it is declared here once and every tenant
+  # that selects such a class gets it: the TenantGateway controller then
+  # issues no certificates for that Gateway, renders plain HTTP listeners
+  # for the apex and its wildcards, and skips the TLS-passthrough listeners
+  # — which leaves the tenant Kubernetes API, VM export and CDI upload
+  # endpoints unpublished through it, their TLSRoutes matching no listener.
+  #
+  # Listing a class here is a claim about that class and nothing validates
+  # it: name the bundled `cilium` and its Gateways publish every app
+  # hostname over plain HTTP on a public address, with no redirect and no
+  # certificate. Only list a class whose provider really does terminate TLS
+  # in front of the Gateway.
+  #
+  # Moving an existing tenant onto such a class also withdraws the operator
+  # wildcard from it: its namespace stops counting as a TLS termination
+  # point, so the replica of publishing.certificates.wildcardSecretName is
+  # deleted from it on the next reconcile. Ingress owners keep theirs, and a
+  # missing source Secret postpones the deletion rather than forcing it.
+  # Reaches the per-tenant gateway chart as _cluster.gateway-edge-classes.
+  edgeTerminatedClasses: []
+  # GatewayClasses a tenant may select for its own Gateway through
+  # `tenant.spec.gatewayClass`, on top of className above (which every
+  # tenant may always end up on, since it is the default). A tenant asking
+  # for anything outside this set fails its own gateway release with a
+  # message naming the class, and reaches no other tenant.
+  #
+  # This is an allowlist because Tenant is a tenant-writable object and a
+  # GatewayClass is cluster-scoped: without it a tenant could attach its
+  # Gateway to any class the cluster registers, including one an admin
+  # keeps for internal-only or differently-fronted traffic. Empty (the
+  # default) means tenants cannot choose at all and every Gateway lands on
+  # className. The allowed set is this list plus the CURRENT className, so
+  # changing className while a tenant pins the previous one by name fails
+  # that tenant's gateway release until it is updated too — list the old
+  # class here when moving the default. Reaches the per-tenant gateway
+  # chart as _cluster.gateway-tenant-classes.
+  tenantSelectableClasses: []
+  # Advertise HTTP/2 on every Gateway API listener served by the bundled
+  # Cilium dataplane. Browsers negotiate HTTP/2 exclusively through TLS ALPN
+  # "h2"; with this off, Envoy advertises no ALPN protocols and every client
+  # silently falls back to HTTP/1.1 — no error anywhere, just head-of-line
+  # blocking and the per-origin connection limit that HTTP/2 removes.
+  # ingress-nginx (which the Gateway path replaces) advertised h2 out of the
+  # box, so on-by-default restores the pre-migration behaviour. ALPN offers
+  # h2 then http/1.1, so clients without HTTP/2 keep working unchanged.
+  #
+  # Frontend hop only: gateway↔backend connections stay HTTP/1.1 unless a
+  # Service opts in per GEP-1911 by declaring appProtocol
+  # kubernetes.io/h2c on its port (that backend-protocol support is switched
+  # on together with ALPN; no cozystack-shipped Service declares such a
+  # value today, so backends see no change from this flag alone).
+  #
+  # Cluster-wide: maps to Cilium's enable-gateway-api-alpn agent config, so
+  # it covers the root and every tenant Gateway at once — there is no
+  # per-Gateway granularity in the dataplane. Only effective on bundles
+  # where cozystack manages Cilium (isp-full*, isp-slim*); on
+  # isp-hosted* the hosting-side CNI owns this setting. Flipping it re-rolls
+  # the cilium DaemonSet on the next platform upgrade (rollOutCiliumPods),
+  # the same disruption profile as any cilium config change.
+  http2: true
   # Namespaces that are allowed to attach HTTPRoute or TLSRoute to a tenant
   # Gateway. The publishing tenant namespace is always included implicitly.
-  # Additional entries must be the exact namespace name (matched on the
-  # built-in kubernetes.io/metadata.name label). Tenants not on this list
-  # cannot attach a route to somebody else's Gateway, which prevents
-  # hostname hijacking across tenants.
+  # Additional entries must be the exact namespace name. The controller
+  # grants the access by stamping the namespace.cozystack.io/gateway label
+  # on each listed namespace; writing that label needs patch on Namespace,
+  # which no tenant role holds. The label reaches the HTTPS-terminate and
+  # the port-443 passthrough listeners. The port-80 listener and the
+  # native-port listeners from tlsPassthroughListeners select on the
+  # built-in kubernetes.io/metadata.name label instead: the native-port
+  # ones name the publishing tenant alone, so listing a namespace here
+  # does not let it attach to a database port, while the port-80 listener
+  # names the tenant plus cozy-cert-manager, where the ACME challenge
+  # route lands. Tenants not on this list cannot attach a route to
+  # somebody else's Gateway, which prevents hostname hijacking across
+  # tenants.
   #
   # The `default` namespace is included because the Kubernetes API's
   # TLSRoute (shipped by the cozystack-api package) has to live next to
@@ -266,10 +669,104 @@ gateway:
     - cozy-monitoring
     - cozy-linstor-gui
     - default
+# Platform monitoring configuration.
+monitoring:
+  # Whether the root tenant (tenant-root) hosts the platform
+  # VictoriaMetrics/VictoriaLogs stack, i.e. Tenant/root spec.monitoring=true.
+  # The platform centralises metrics and logs in tenant-root, and
+  # cozystack-basics publishes vlinsert-generic / vminsert-* ExternalName
+  # Services in cozy-monitoring that redirect there. When the root tenant has
+  # monitoring disabled those redirects dead-end and fluent-bit silently drops
+  # logs (issue #3181), so the ExternalNames are only created when this is
+  # true. This is the single render-time source of truth for that gate:
+  # changing it re-renders cozystack-basics (helm-controller watches the
+  # cozystack-values Secret it flows into). Nothing in the charts sets
+  # Tenant/root spec.monitoring — it is a runtime choice on the Tenant CR
+  # (default false; the standard install enables it out-of-band). The default
+  # here is true only to preserve the historical always-create behaviour;
+  # operators MUST set it to match their actual Tenant/root spec.monitoring.
+  rootEnabled: true
+  # The rate, in bytes per second counted uncompressed and before the
+  # collector samples, at which each tenant using shared-central tracing may
+  # write into the traces store tenant-root hosts; each tenant's collector
+  # refuses data above it, with a 429 an OTLP/HTTP sender retries and a
+  # RESOURCE_EXHAUSTED an OTLP/gRPC sender drops, so central tenants should
+  # export over HTTP; a request above 3 MiB gets a 400, not retried. 0 keeps
+  # the default of about 97 KiB/s: over the two days VictoriaTraces always
+  # keeps, one tenant writes at most the disk cap of a default 10Gi store,
+  # counted uncompressed, and the store keeps it compressed and only the
+  # sampled share of it (samplingPercentage). Each collector pod starts with a
+  # full bucket, so a pod start lets through above the rate up to 5 MiB, or
+  # one second of the pod's share of the rate when that is larger. Raise it
+  # with the store's size, as a whole number up to 1099511627776 (1 TiB/s);
+  # anything else fails the render. A change upgrades every release in every
+  # tenant once, since it travels in the cozystack-values Secret they all
+  # read.
+  tracingCentralTenantBytesPerSecond: 0
+# Backup storage overrides for the platform-managed cozy-default BackupClass.
+# Everything set here is forwarded verbatim into the emitted
+# cozystack.backupstrategy-controller Package CR as
+# components.backupstrategy-controller.values.backupStorage, so it lands on the
+# backupstrategy-controller HelmRelease and deep-merges over that chart's own
+# backupStorage defaults (packages/system/backupstrategy-controller/values.yaml
+# documents every knob: provisionBucket, bucketName, endpoint, region,
+# forcePathStyle, systemSecretName, systemNamespaces, …). Admins set this via
+# spec.components.platform.values.backupStorage on the
+# cozystack.cozystack-platform Package — see docs/operations/backup-classes.md.
+# Empty (the default) forwards nothing and keeps the child chart defaults.
+backupStorage: {}
+
+# backupStrategyController overrides for the platform-managed strategy CRs,
+# forwarded verbatim into the same Package as
+# components.backupstrategy-controller.values.backupStrategyController. The
+# knob that needs this is redisBackupResources: the shipped cozy-default-redis
+# Strategy CR is Helm-managed (a direct edit reverts on upgrade), so a tenant
+# with a large Redis raises the restore Pod's memory / ephemeral-storage here,
+# via spec.components.platform.values.backupStrategyController.redisBackupResources
+# on the cozystack.cozystack-platform Package. Empty forwards nothing.
+backupStrategyController: {}
+# Overrides for the optional cozystack.kubernetes-worker-image package (the
+# golden Talos worker OS images tenant Kubernetes node pools clone instead of
+# each worker importing the raw image over HTTP). Everything set here is
+# forwarded verbatim into the emitted Package CR as
+# components.kubernetes-worker-image.values, so it lands on that chart's
+# HelmRelease and deep-merges over its defaults
+# (packages/system/kubernetes-worker-image/values.yaml documents every knob:
+# imageFactoryURL, storageClass, storage, images). Admins set this via
+# spec.components.platform.values.kubernetesWorkerImage on the
+# cozystack.cozystack-platform Package, alongside adding
+# cozystack.kubernetes-worker-image to bundles.enabledPackages -- the package is
+# opt-in and this key alone does not enable it. The two knobs that decide
+# whether the feature is usable at all are imageFactoryURL (an air-gapped or
+# rate-limited cluster must repoint the single import) and storageClass (CDI
+# cannot clone across StorageClasses, so a cluster whose worker pools are not on
+# `replicated` must move the golden onto their class). Empty (the default)
+# forwards nothing and keeps the child chart defaults.
+kubernetesWorkerImage: {}
 # Pod scheduling configuration
 scheduling:
   globalAppTopologySpreadConstraints: ""
-# UI branding configuration
+# UI branding configuration. The whole map is propagated verbatim into
+# _cluster.branding (the cozystack-values Secret) and consumed by the dashboard
+# (config.json) and Keycloak realm provisioning.
+#
+# Recognized keys:
+#   brandName:       realm displayName (the Keycloak login title reads it as
+#                    "Sign in to <brandName>").
+#   brandHtmlName:   realm displayNameHtml (HTML shown in the login header).
+#   loginTheme:      Keycloak login theme name; selected as the realm login
+#                    theme and used as the theme directory/name.
+#   loginThemeImage: OCI image carrying that theme under /themes/. When set
+#                    together with loginTheme, the keycloak chart mounts it via
+#                    an init container, so the theme ships without patching the
+#                    StatefulSet or the keycloak package values.
+#
+# Example:
+# branding:
+#   brandName: "Acme Platform"
+#   brandHtmlName: "<b>Acme</b> Platform"
+#   loginTheme: acme
+#   loginThemeImage: registry.example.com/acme-keycloak-theme:v1
 branding: {}
 # Container registry mirrors configuration
 #
@@ -307,3 +804,134 @@ resources:
   cpuAllocationRatio: 10
   memoryAllocationRatio: 1
   ephemeralStorageAllocationRatio: 40
+# KubeVirt CR settings that no other platform knob implies. Forwarded into the
+# emitted cozystack.kubevirt Package CR as components.kubevirt.values, next to
+# the entries the iaas bundle derives from resources.cpuAllocationRatio and
+# from the gpu block below.
+kubevirt:
+  # Feature gates switched off under
+  # spec.configuration.developerConfiguration.disabledFeatureGates, on top of
+  # the opt-outs the kubevirt chart pins: Template and
+  # ExternalNetResourceInjection always, ImageVolume below Kubernetes 1.35.
+  # KubeVirt 1.9 turns every Beta gate on by default, so this is how a cluster
+  # declines one it cannot carry — a container runtime without image volume
+  # support on Kubernetes 1.35 or newer is the case this list is for.
+  #
+  #   kubevirt:
+  #     disabledFeatureGates:
+  #     - ImageVolume
+  #
+  # A gate the chart already enables cannot be switched off here. KubeVirt
+  # refuses a CR that names one gate in both lists, so the chart stops the
+  # render and names the gate rather than ship a CR the cluster would reject
+  # on update and misread on install.
+  disabledFeatureGates: []
+  # Passed to spec.configuration.migrations on the KubeVirt CR.
+  # Empty keeps KubeVirt's defaults. bandwidthPerMigration is bytes/second.
+  migrations: {}
+# GPU host-device wiring for VirtualMachine workloads. Merged into the KubeVirt
+# CR's permittedHostDevices when bundles.enabledPackages contains
+# cozystack.gpu-operator and bundles.iaas.gpuOperatorVariant is one of the two
+# VM variants, default or vgpu. The platform's own defaults join it there: the
+# passthrough table in the default variant, the mdev table in vgpu only when
+# gpu.vgpuDeviceManager.enabled is true, and neither when replaceDefaults below
+# is true. So a stock vgpu cluster that sets nothing here gets the HostDevices
+# gate and no device table at all. The container variant serves GPUs to pods
+# and never to VMs, so nothing in this block reaches the KubeVirt CR under it.
+gpu:
+  # When false (default), the lists below are appended to the platform's
+  # NVIDIA defaults. When true, the user lists fully replace the defaults
+  # — use this for clusters with only non-NVIDIA accelerators or where a
+  # strictly curated allowlist is required.
+  replaceDefaults: false
+  permittedHostDevices:
+    # PCI passthrough devices. Rendered when non-empty under either VM
+    # variant — pciHostDevices covers both the vfio-pci passthrough path
+    # (default variant) and the post-kubevirt#16890 SR-IOV vGPU path
+    # (vgpu variant on Ada Lovelace / Blackwell, where VFs are advertised
+    # via pciHostDevices, not via mediatedDevices). The container variant
+    # renders neither list. Default-table coverage:
+    # H100, H200, A100 PCIe/SXM, A40, A30, A10, L40, L40S, L4, T4, V100,
+    # V100S (PCI vendor 10DE). Item shape matches KubeVirt's pciHostDevices:
+    #   - pciVendorSelector: "10DE:2335"
+    #     resourceName: nvidia.com/GH100_H200_SXM_141GB
+    #     externalResourceProvider: true
+    pciHostDevices: []
+    # Mediated (mdev) vGPU devices — pre-kubevirt#16890 path used by
+    # Pascal–Ampere on the legacy mdev driver branch. Default-table coverage:
+    # A100-40C/80C, A40-24Q/48Q, A30-24C, A10-24Q, V100D-32C, T4-16Q.
+    # Item shape matches KubeVirt's mediatedDevices:
+    #   - mdevNameSelector: NVIDIA A100-40C
+    #     resourceName: nvidia.com/A100-40C
+    #     externalResourceProvider: true
+    mediatedDevices: []
+  # mediatedDevicesConfiguration makes KubeVirt itself create mdevs on the
+  # node (vgpu variant only). The platform ships NO default here: mdev
+  # creation is delegated to the GPU Operator's vGPU Device Manager
+  # (name-based), and the mediatedDeviceTypes ids below are numeric
+  # nvidia-NNN sysfs indices that vary per GPU SKU and driver branch — no
+  # value is portable, so look yours up on the host
+  # (/sys/bus/pci/devices/<BDF>/mdev_supported_types/*/name) before setting
+  # it. Supplying it opts into KubeVirt-driven creation on top of the
+  # Device Manager. Helm's mergeOverwrite semantics apply: a top-level key
+  # you supply REPLACES that key wholesale rather than appending. Shape
+  # matches KubeVirt's MediatedDevicesConfiguration:
+  #   mediatedDeviceTypes:
+  #     - nvidia-740
+  #   nodeMediatedDeviceTypes:
+  #     - nodeSelector:
+  #         nvidia.com/gpu.product: NVIDIA-L40S
+  #       mediatedDeviceTypes:
+  #         - nvidia-740
+  mediatedDevicesConfiguration: {}
+  # NVIDIA vGPU Manager container image (vgpu variant only). The .run is
+  # proprietary, not redistributable, so the platform cannot ship default
+  # tags — the operator builds the container per
+  # https://github.com/NVIDIA/gpu-driver-container and supplies the
+  # private-registry coordinates here. The platform forwards these as
+  # components.gpu-operator.values.gpu-operator.vgpuManager to the emitted
+  # cozystack.gpu-operator Package CR when bundles.iaas.gpuOperatorVariant
+  # is vgpu. Forwarding triggers when ANY of repository, version, image
+  # (non-default), or imagePullSecrets is set — partial values still
+  # propagate so a private-registry-with-default-tag setup is not
+  # silently dropped.
+  vgpuManager:
+    repository: ""
+    image: vgpu-manager
+    version: ""
+    imagePullSecrets: []
+  # vGPU Device Manager controls whether nvidia.com's
+  # `vgpu-device-manager` DaemonSet is deployed (vgpu variant only). The
+  # DaemonSet walks /sys/class/mdev_bus/ to auto-create mediated devices
+  # from the mediatedDeviceTypes list. Default-off because that path
+  # only exists on Pascal–Ampere (V100, T4, A100, A30, …) with the mdev
+  # driver branch — on Ada Lovelace / Blackwell (L4, L40, L40S, B100)
+  # with the vGPU 17/20 driver branch the directory is missing and the
+  # DaemonSet crash-loops with "no parent devices found". Flip to true
+  # on Pascal–Ampere clusters; leave false on Ada/Blackwell and supply
+  # SR-IOV VFs via .gpu.permittedHostDevices.pciHostDevices instead.
+  # When true the platform also lets the default name-based mediatedDevices
+  # exposure list from files/gpu-vgpu-defaults.yaml flow into the KubeVirt
+  # CR; when false those defaults are suppressed (advertising mediated
+  # resources that nothing can ever allocate is a worse footgun than
+  # missing entries).
+  vgpuDeviceManager:
+    enabled: false
+
+# VM import from external virtualization platforms (opt-in; see the iaas bundle).
+vmImport:
+  # Container image carrying the VMware Virtual Disk Development Kit, used by
+  # the raw-copy transfer path. Cozystack neither ships nor mirrors it: it is
+  # built from a proprietary VMware SDK, so an operator who holds a licence
+  # builds the image, pushes it somewhere the cluster can pull from, and names
+  # it here. Only the reference travels to the controller, never a credential.
+  #
+  # Empty is the normal state and means the vSphere import path is unavailable
+  # rather than broken: a vSphere VMImportSource reports VDDKNotConfigured on
+  # its own status, so a tenant learns at registration time instead of watching
+  # a transfer die halfway. Non-VMware providers never need it.
+  #
+  # Named vmImport, not migration, to keep it clearly distinct from the
+  # top-level `migrations` key above, which is the platform's own schema
+  # migrations and has nothing to do with moving virtual machines.
+  vddkImage: ""
diff --git a/packages/core/talos/Makefile b/packages/core/talos/Makefile
index d9a65cd4a2..42ee4a609b 100644
--- a/packages/core/talos/Makefile
+++ b/packages/core/talos/Makefile
@@ -5,26 +5,40 @@ TALOS_VERSION=$(shell awk '/^version:/ {print $$2}' images/talos/profiles/instal
 
 include ../../../hack/common-envs.mk
 
+ASSETS := ../../../_out/assets
+
+# The installer image and the release assets are built for the architectures
+# in PLATFORM. matchbox carries the kernel and initramfs of both whatever
+# PLATFORM says: the node it runs on has nothing to do with the architecture
+# of the machines it network-boots.
+TALOS_ARCHES := $(patsubst linux/%,%,$(subst $(comma), ,$(or $(PLATFORM),$(DEFAULT_PLATFORMS))))
+BOOT_ARCHES := amd64 arm64
+
+# assets <file pattern> <arches> — the asset paths, % standing for the arch.
+assets = $(foreach a,$(2),$(ASSETS)/$(subst %,$(a),$(1)))
+
 update:
 	hack/gen-profiles.sh
 
 image: image-matchbox image-talos
 
-image-talos:
-	test -f ../../../_out/assets/installer-amd64.tar || make talos-installer
+# The installers of every arch go into one OCI layout, where
+# hack/installer-index.sh ties them into the index that is pushed.
+image-talos: talos-installer
+	rm -rf $(ASSETS)/installer-oci
 	set -e; \
-	SRC=docker-archive:../../../_out/assets/installer-amd64.tar; \
-	skopeo copy "$$SRC" docker://$(REGISTRY)/talos:$(IMAGE_TAG); \
-	if [ "$(PUBLISH_VERSIONED)" = "1" ]; then skopeo copy "$$SRC" docker://$(REGISTRY)/talos:$(TALOS_VERSION); fi; \
-	if [ "$(PUBLISH_FLOATING)" = "1" ]; then skopeo copy "$$SRC" docker://$(REGISTRY)/talos:latest; fi
-
-image-matchbox:
-	test -f ../../../_out/assets/kernel-amd64 || make talos-kernel
-	test -f ../../../_out/assets/initramfs-metal-amd64.xz || make talos-initramfs
+	for a in $(TALOS_ARCHES); do skopeo copy docker-archive:$(ASSETS)/installer-$$a.tar oci:$(ASSETS)/installer-oci:$$a; done; \
+	hack/installer-index.sh $(ASSETS)/installer-oci $(TALOS_ARCHES); \
+	SRC=oci:$(ASSETS)/installer-oci:index; \
+	$(if $(strip $(OCI_EXPORT_DIR)),mkdir -p "$(OCI_EXPORT_DIR)"; skopeo copy --all "$$SRC" "oci-archive:$(OCI_EXPORT_DIR)/talos.oci.tar:$(IMAGE_TAG)",if [ "$(PUSH)" = "1" ]; then skopeo copy --all "$$SRC" docker://$(REGISTRY)/talos:$(IMAGE_TAG); fi); \
+	if [ -z "$(OCI_EXPORT_DIR)" ] && [ "$(PUSH)" = "1" ] && [ "$(PUBLISH_VERSIONED)" = "1" ]; then skopeo copy --all "$$SRC" docker://$(REGISTRY)/talos:$(TALOS_VERSION); fi; \
+	if [ -z "$(OCI_EXPORT_DIR)" ] && [ "$(PUSH)" = "1" ] && [ "$(PUBLISH_FLOATING)" = "1" ]; then skopeo copy --all "$$SRC" docker://$(REGISTRY)/talos:latest; fi
+	rm -rf $(ASSETS)/installer-oci
+
+image-matchbox: $(call assets,kernel-%,$(BOOT_ARCHES)) $(call assets,initramfs-metal-%.xz,$(BOOT_ARCHES))
 	docker buildx build -f images/matchbox/Dockerfile ../../.. \
 		$(call image-tags,matchbox,$(TALOS_VERSION)) \
-		--cache-from type=registry,ref=$(REGISTRY)/matchbox:latest \
-		--cache-to type=inline \
+		$(call cache-args,matchbox) \
 		--metadata-file images/matchbox.json \
 		$(BUILDX_ARGS)
 	echo "$(REGISTRY)/matchbox:$(IMAGE_TAG)@$$(yq e '."containerimage.digest"' images/matchbox.json -o json -r)" \
@@ -33,27 +47,27 @@ image-matchbox:
 
 assets: talos-iso talos-nocloud talos-metal talos-kernel talos-initramfs
 
-talos-initramfs:
-	test -f ../../../_out/assets/initramfs-metal-amd64.xz || $(MAKE) build-talos-initramfs
-
-talos-kernel:
-	test -f ../../../_out/assets/kernel-amd64 || $(MAKE) build-talos-kernel
-
-talos-installer:
-	test -f ../../../_out/assets/installer-amd64.tar || $(MAKE) build-talos-installer
-
-talos-iso:
-	test -f ../../../_out/assets/metal-amd64.iso || $(MAKE) build-talos-iso
-
-talos-nocloud:
-	test -f ../../../_out/assets/nocloud-amd64.raw.xz || $(MAKE) build-talos-nocloud
+talos-initramfs: $(call assets,initramfs-metal-%.xz,$(TALOS_ARCHES))
+talos-kernel: $(call assets,kernel-%,$(TALOS_ARCHES))
+talos-installer: $(call assets,installer-%.tar,$(TALOS_ARCHES))
+talos-iso: $(call assets,metal-%.iso,$(TALOS_ARCHES))
+talos-nocloud: $(call assets,nocloud-%.raw.xz,$(TALOS_ARCHES))
+talos-metal: $(call assets,metal-%.raw.xz,$(TALOS_ARCHES))
 
-talos-metal:
-	test -f ../../../_out/assets/metal-amd64.raw.xz || $(MAKE) build-talos-metal
+.PHONY: update image image-talos image-matchbox assets talos-initramfs talos-kernel talos-installer talos-iso talos-nocloud talos-metal
 
-build-talos-initramfs build-talos-kernel build-talos-installer build-talos-iso build-talos-nocloud build-talos-metal:
-	mkdir -p ../../../_out/assets
-	cat images/talos/profiles/$(subst build-talos-,,$@).yaml | \
-		docker run --rm -i -v /dev:/dev --privileged "ghcr.io/siderolabs/imager:$(TALOS_VERSION)" --tar-to-stdout - | \
-		tar -C ../../../_out/assets -xzf-
+# imager <profile> — run the imager on the profile of that name for the arch
+# in $*. amd64 profiles carry no arch suffix (see hack/gen-profiles.sh).
+define imager
+	mkdir -p $(ASSETS)
+	docker run --rm -i -v /dev:/dev --privileged "ghcr.io/siderolabs/imager:$(TALOS_VERSION)" --tar-to-stdout - \
+		< images/talos/profiles/$(1)$(if $(filter-out amd64,$*),-$*).yaml | \
+		tar -C $(ASSETS) -xzf-
+endef
 
+$(ASSETS)/initramfs-metal-%.xz: ; $(call imager,initramfs)
+$(ASSETS)/kernel-%: ; $(call imager,kernel)
+$(ASSETS)/installer-%.tar: ; $(call imager,installer)
+$(ASSETS)/metal-%.iso: ; $(call imager,iso)
+$(ASSETS)/nocloud-%.raw.xz: ; $(call imager,nocloud)
+$(ASSETS)/metal-%.raw.xz: ; $(call imager,metal)
diff --git a/packages/core/talos/hack/gen-profiles.sh b/packages/core/talos/hack/gen-profiles.sh
index bbe932d7b2..93169f333f 100755
--- a/packages/core/talos/hack/gen-profiles.sh
+++ b/packages/core/talos/hack/gen-profiles.sh
@@ -4,8 +4,20 @@ set -u
 
 TMPDIR=$(mktemp -d)
 PROFILES="initramfs kernel iso installer nocloud metal"
-FIRMWARES="amd-ucode amdgpu bnx2-bnx2x i915 intel-ice-firmware intel-ucode qlogic-firmware"
-EXTENSIONS="drbd zfs"
+ARCHES="amd64 arm64"
+
+# Every extension below is published for arm64 too, but not every one is
+# worth installing there:
+# - amd-ucode and intel-ucode are x86 CPU microcode, which an arm64 kernel
+#   never loads;
+# - the arm64 builds of amdgpu and i915 are empty, carrying a manifest and no
+#   files at all.
+# bnx2-bnx2x, intel-ice-firmware and qlogic-firmware are firmware for PCIe
+# NICs whose drivers (bnx2, bnx2x, ice, qed) the arm64 Talos kernel builds as
+# modules, so arm64 servers with those cards need them as much as x86 ones.
+# drbd and zfs are what Cozystack itself needs on every node.
+EXTENSIONS_amd64="amd-ucode amdgpu bnx2-bnx2x intel-ice-firmware i915 intel-ucode qlogic-firmware drbd zfs"
+EXTENSIONS_arm64="bnx2-bnx2x intel-ice-firmware qlogic-firmware drbd zfs"
 
 mkdir -p images/talos/profiles
 
@@ -17,82 +29,80 @@ export "TALOS_VERSION=$talos_version"
 
 crane export ghcr.io/siderolabs/extensions:${TALOS_VERSION} | tar x -O image-digests > $TMPDIR/image-digests
 
-for firmware in $FIRMWARES; do
-  printf "fetching %s version: " "$firmware"
-  firmware_var=$(echo "$firmware" | tr '[:lower:]' '[:upper:]' | tr - _)_IMAGE
-  image=$(grep -F "/$firmware:" $TMPDIR/image-digests)
-  echo "$image"
-  export "$firmware_var=$image"
-done
+for arch in $ARCHES; do
+  eval "extensions=\$EXTENSIONS_$arch"
+  # amd64 keeps the unsuffixed names that the Makefile and other tooling
+  # read the Talos version from.
+  suffix=""
+  [ "$arch" = amd64 ] || suffix="-$arch"
 
-for extension in $EXTENSIONS; do
-  printf "fetching %s version: " "$extension"
-  extension_var=$(echo "$extension" | tr '[:lower:]' '[:upper:]' | tr - _)_IMAGE
-  image=$(grep -F "/$extension:" $TMPDIR/image-digests)
-  echo "$image"
-  export "$extension_var=$image"
-done
-
-for profile in $PROFILES; do
-  echo "writing profile images/talos/profiles/$profile.yaml"
-  case "$profile" in
-    initramfs|kernel|iso)
-      image_options="{}"
-      out_format="raw"
-      platform="metal"
-      kind="$profile"
-      ;;
-    installer)
-      image_options="{}"
-      out_format="raw"
-      platform="metal"
-      kind="installer"
-      ;;
-    metal)
-      image_options="{ diskSize: 1306525696, diskFormat: raw }"
-      out_format=".xz"
-      platform="metal"
-      kind="image"
-      ;;
-    nocloud)
-      image_options="{ diskSize: 1306525696, diskFormat: raw }"
-      out_format=".xz"
-      platform="nocloud"
-      kind="image"
-      ;;
-    *)
-      echo "Unknown profile: $profile" >&2
+  system_extensions=""
+  for extension in $extensions; do
+    printf "fetching %s version for %s: " "$extension" "$arch"
+    image=$(grep -F "/$extension:" $TMPDIR/image-digests)
+    echo "$image"
+    # Fail here rather than in the imager if upstream drops an arch.
+    crane manifest "$image" | jq -e --arg arch "$arch" '.manifests | any(.platform.architecture == $arch)' >/dev/null || {
+      echo "$image has no $arch image" >&2
       exit 1
-      ;;
-  esac
+    }
+    system_extensions="$system_extensions
+    - imageRef: $image"
+  done
+
+  for profile in $PROFILES; do
+    file="images/talos/profiles/$profile$suffix.yaml"
+    echo "writing profile $file"
+    case "$profile" in
+      initramfs|kernel|iso)
+        image_options="{}"
+        out_format="raw"
+        platform="metal"
+        kind="$profile"
+        ;;
+      installer)
+        image_options="{}"
+        out_format="raw"
+        platform="metal"
+        kind="installer"
+        ;;
+      metal)
+        image_options="{ diskSize: 1306525696, diskFormat: raw }"
+        out_format=".xz"
+        platform="metal"
+        kind="image"
+        ;;
+      nocloud)
+        image_options="{ diskSize: 1306525696, diskFormat: raw }"
+        out_format=".xz"
+        platform="nocloud"
+        kind="image"
+        ;;
+      *)
+        echo "Unknown profile: $profile" >&2
+        exit 1
+        ;;
+    esac
 
-  cat > images/talos/profiles/$profile.yaml <<EOT
+    cat > "$file" <<EOT
 # this file generated by hack/gen-profiles.sh
 # do not edit it
-arch: amd64
+arch: ${arch}
 platform: ${platform}
 secureboot: false
 version: ${TALOS_VERSION}
 input:
   kernel:
-    path: /usr/install/amd64/vmlinuz
+    path: /usr/install/${arch}/vmlinuz
   initramfs:
-    path: /usr/install/amd64/initramfs.xz
+    path: /usr/install/${arch}/initramfs.xz
   baseInstaller:
-    imageRef: "ghcr.io/siderolabs/installer:${TALOS_VERSION}"
-  systemExtensions:
-    - imageRef: ${AMD_UCODE_IMAGE}
-    - imageRef: ${AMDGPU_IMAGE}
-    - imageRef: ${BNX2_BNX2X_IMAGE}
-    - imageRef: ${INTEL_ICE_FIRMWARE_IMAGE}
-    - imageRef: ${I915_IMAGE}
-    - imageRef: ${INTEL_UCODE_IMAGE}
-    - imageRef: ${QLOGIC_FIRMWARE_IMAGE}
-    - imageRef: ${DRBD_IMAGE}
-    - imageRef: ${ZFS_IMAGE}
+    imageRef: "ghcr.io/siderolabs/installer-base:${TALOS_VERSION}"
+  systemExtensions:${system_extensions}
 output:
   kind: ${kind}
   imageOptions: ${image_options}
   outFormat: ${out_format}
 EOT
+  done
 done
diff --git a/packages/core/talos/hack/installer-index.sh b/packages/core/talos/hack/installer-index.sh
new file mode 100755
index 0000000000..a3712f3d37
--- /dev/null
+++ b/packages/core/talos/hack/installer-index.sh
@@ -0,0 +1,35 @@
+#!/bin/sh
+# installer-index.sh <oci-layout> <arch>...
+#
+# Adds to an OCI layout an image index, tagged "index", over the manifests
+# tagged with each given arch. skopeo copies an index but cannot assemble one,
+# and buildx can only take an OCI layout as a source on a builder the release
+# job, which builds on the classic docker driver, does not have.
+set -eu
+
+layout=$1
+shift
+
+manifests=$(for arch in "$@"; do
+  jq -c --arg arch "$arch" '.manifests[]
+    | select(.annotations["org.opencontainers.image.ref.name"] == $arch)
+    | {mediaType, digest, size, platform: {architecture: $arch, os: "linux"}}' "$layout/index.json"
+done | jq -s -c .)
+
+found=$(printf '%s' "$manifests" | jq length)
+if [ "$found" -ne "$#" ]; then
+  echo "installer-index.sh: $layout holds $found of the manifests for: $*" >&2
+  exit 1
+fi
+
+index=$(jq -n -c --argjson m "$manifests" \
+  '{schemaVersion: 2, mediaType: "application/vnd.oci.image.index.v1+json", manifests: $m}')
+digest=$(printf '%s' "$index" | sha256sum | cut -d' ' -f1)
+size=$(printf '%s' "$index" | wc -c | tr -d ' ')
+printf '%s' "$index" > "$layout/blobs/sha256/$digest"
+
+jq --arg d "sha256:$digest" --argjson s "$size" \
+  '.manifests += [{mediaType: "application/vnd.oci.image.index.v1+json", digest: $d, size: $s,
+       annotations: {"org.opencontainers.image.ref.name": "index"}}]' \
+  "$layout/index.json" > "$layout/index.json.new"
+mv "$layout/index.json.new" "$layout/index.json"
diff --git a/packages/core/talos/images/matchbox/Dockerfile b/packages/core/talos/images/matchbox/Dockerfile
index fbb6f3bf7c..c03172b862 100644
--- a/packages/core/talos/images/matchbox/Dockerfile
+++ b/packages/core/talos/images/matchbox/Dockerfile
@@ -1,6 +1,11 @@
-FROM quay.io/poseidon/matchbox:v0.10.0
+FROM quay.io/poseidon/matchbox:v0.11.0@sha256:06bcdae85335fd00e8277b007b55cfb49d96a0114628c0f70db2b92b079d246a
 
+# Every image carries both arches' assets, not only TARGETARCH's: the node
+# matchbox runs on says nothing about the machines it boots. The arm64 group
+# picks its assets by the arch iPXE reports.
 COPY _out/assets/initramfs-metal-amd64.xz /var/lib/matchbox/assets/initramfs.xz
 COPY _out/assets/kernel-amd64 /var/lib/matchbox/assets/vmlinuz
+COPY _out/assets/initramfs-metal-arm64.xz /var/lib/matchbox/assets/initramfs-arm64.xz
+COPY _out/assets/kernel-arm64 /var/lib/matchbox/assets/vmlinuz-arm64
 COPY packages/core/talos/images/matchbox/groups /var/lib/matchbox/groups
 COPY packages/core/talos/images/matchbox/profiles /var/lib/matchbox/profiles
diff --git a/packages/core/talos/images/matchbox/groups/arm64.json b/packages/core/talos/images/matchbox/groups/arm64.json
new file mode 100644
index 0000000000..c8677d9f8a
--- /dev/null
+++ b/packages/core/talos/images/matchbox/groups/arm64.json
@@ -0,0 +1,8 @@
+{
+  "id": "arm64",
+  "name": "arm64",
+  "profile": "arm64",
+  "selector": {
+    "arch": "arm64"
+  }
+}
diff --git a/packages/core/talos/images/matchbox/profiles/arm64.json b/packages/core/talos/images/matchbox/profiles/arm64.json
new file mode 100644
index 0000000000..684586d83e
--- /dev/null
+++ b/packages/core/talos/images/matchbox/profiles/arm64.json
@@ -0,0 +1,18 @@
+{
+  "id": "arm64",
+  "name": "arm64",
+  "boot": {
+    "kernel": "/assets/vmlinuz-arm64",
+    "initrd": ["/assets/initramfs-arm64.xz"],
+    "args": [
+      "initrd=initramfs-arm64.xz",
+      "init_on_alloc=1",
+      "slab_nomerge",
+      "pti=on",
+      "console=tty0",
+      "console=ttyAMA0",
+      "printk.devkmsg=on",
+      "talos.platform=metal"
+    ]
+  }
+}
diff --git a/packages/core/talos/images/talos/profiles/initramfs-arm64.yaml b/packages/core/talos/images/talos/profiles/initramfs-arm64.yaml
new file mode 100644
index 0000000000..9b9df5ad97
--- /dev/null
+++ b/packages/core/talos/images/talos/profiles/initramfs-arm64.yaml
@@ -0,0 +1,23 @@
+# this file generated by hack/gen-profiles.sh
+# do not edit it
+arch: arm64
+platform: metal
+secureboot: false
+version: v1.14.2
+input:
+  kernel:
+    path: /usr/install/arm64/vmlinuz
+  initramfs:
+    path: /usr/install/arm64/initramfs.xz
+  baseInstaller:
+    imageRef: "ghcr.io/siderolabs/installer-base:v1.14.2"
+  systemExtensions:
+    - imageRef: ghcr.io/siderolabs/bnx2-bnx2x:20260916@sha256:f0ba5d110925a3e4e4fceeb146001e1f6b2430ef85b85c8fdd07848cd82b8b7b
+    - imageRef: ghcr.io/siderolabs/intel-ice-firmware:20260916@sha256:858c93853e75fdc69da6ada28a24d2b9e2ec486e3f53b6ccf520fb4ab9b3388e
+    - imageRef: ghcr.io/siderolabs/qlogic-firmware:20260916@sha256:44adfb8f21402064e2406d7eb70d2dc6925ed231ba3884a52a5019047a4409b9
+    - imageRef: ghcr.io/siderolabs/drbd:9.3.4-v1.14.2@sha256:07d2be475e08b3c8b633319e7ed1e73d3e838836cfa734fef1bc0d45ea4b18d1
+    - imageRef: ghcr.io/siderolabs/zfs:2.4.4-v1.14.2@sha256:19f57dacaaac5689ec50c77c94e40051676215ef21700e37e5adf4b6055e3dc7
+output:
+  kind: initramfs
+  imageOptions: {}
+  outFormat: raw
diff --git a/packages/core/talos/images/talos/profiles/initramfs.yaml b/packages/core/talos/images/talos/profiles/initramfs.yaml
index 42a6929095..1eb5cd062a 100644
--- a/packages/core/talos/images/talos/profiles/initramfs.yaml
+++ b/packages/core/talos/images/talos/profiles/initramfs.yaml
@@ -3,24 +3,24 @@
 arch: amd64
 platform: metal
 secureboot: false
-version: v1.13.0
+version: v1.14.2
 input:
   kernel:
     path: /usr/install/amd64/vmlinuz
   initramfs:
     path: /usr/install/amd64/initramfs.xz
   baseInstaller:
-    imageRef: "ghcr.io/siderolabs/installer:v1.13.0"
+    imageRef: "ghcr.io/siderolabs/installer-base:v1.14.2"
   systemExtensions:
-    - imageRef: ghcr.io/siderolabs/amd-ucode:20260410@sha256:d5a0256846700ebb4fd2dba0107cfd944f6689d9bf96f47ab9dc35ef1e225179
-    - imageRef: ghcr.io/siderolabs/amdgpu:20260410-v1.13.0@sha256:48f121b8b6575b6c38e2dd459cbb022f6ef3e8aea6209255a14654d28aea8b8c
-    - imageRef: ghcr.io/siderolabs/bnx2-bnx2x:20260410@sha256:5a481b38c305d2292e7b6e06750ec704ac1229602c75cf80535ff3561f0b29c3
-    - imageRef: ghcr.io/siderolabs/intel-ice-firmware:20260410@sha256:ef1cbec222fb2d2ae0db9c025e4b9b6b875d965d49ebb71d7ad9f0713133c299
-    - imageRef: ghcr.io/siderolabs/i915:20260410-v1.13.0@sha256:fa10ab5a7ab8e412ef8ead8d244cf1ba37c13c60ceb0150044e4682ff29b25af
-    - imageRef: ghcr.io/siderolabs/intel-ucode:20260227@sha256:6112f6426a7081727545f7c33dcf2a89ff672494847b180380b4c58f3544a7b2
-    - imageRef: ghcr.io/siderolabs/qlogic-firmware:20260410@sha256:83593864ae91b16e9962258b5f0bd777d4c81846ece206bb84e9c37be023715c
-    - imageRef: ghcr.io/siderolabs/drbd:9.3.1-v1.13.0@sha256:414c94ab6c73c6f20b4dbfce53383fd9ea7bc485d76ceaee5eb6360d2bddcc40
-    - imageRef: ghcr.io/siderolabs/zfs:2.4.1-v1.13.0@sha256:301ae643b38d8b377c051ec0e52b9b03ea49bdc90ca7c49e0da83444a92c5619
+    - imageRef: ghcr.io/siderolabs/amd-ucode:20260916@sha256:50904b899cd328ad3a84478bd83d0f88a3e0cb1be87a8ccd199717fc51391c8d
+    - imageRef: ghcr.io/siderolabs/amdgpu:20260916-v1.14.2@sha256:aa1cf0084d3f0e38fa711e030fb63c037d8610742e93cc12a3d7255cd60f0944
+    - imageRef: ghcr.io/siderolabs/bnx2-bnx2x:20260916@sha256:f0ba5d110925a3e4e4fceeb146001e1f6b2430ef85b85c8fdd07848cd82b8b7b
+    - imageRef: ghcr.io/siderolabs/intel-ice-firmware:20260916@sha256:858c93853e75fdc69da6ada28a24d2b9e2ec486e3f53b6ccf520fb4ab9b3388e
+    - imageRef: ghcr.io/siderolabs/i915:20260916-v1.14.2@sha256:ed2ea6d8733cefbb71c4303a9f19ad04d349b034cf842afebdd540fb5904e36e
+    - imageRef: ghcr.io/siderolabs/intel-ucode:20260812@sha256:5f3d4e4b7a3a6f08df6aa13afa8c476422ccb76ba63186a480fe0ce2e19aa921
+    - imageRef: ghcr.io/siderolabs/qlogic-firmware:20260916@sha256:44adfb8f21402064e2406d7eb70d2dc6925ed231ba3884a52a5019047a4409b9
+    - imageRef: ghcr.io/siderolabs/drbd:9.3.4-v1.14.2@sha256:07d2be475e08b3c8b633319e7ed1e73d3e838836cfa734fef1bc0d45ea4b18d1
+    - imageRef: ghcr.io/siderolabs/zfs:2.4.4-v1.14.2@sha256:19f57dacaaac5689ec50c77c94e40051676215ef21700e37e5adf4b6055e3dc7
 output:
   kind: initramfs
   imageOptions: {}
diff --git a/packages/core/talos/images/talos/profiles/installer-arm64.yaml b/packages/core/talos/images/talos/profiles/installer-arm64.yaml
new file mode 100644
index 0000000000..5a5e139838
--- /dev/null
+++ b/packages/core/talos/images/talos/profiles/installer-arm64.yaml
@@ -0,0 +1,23 @@
+# this file generated by hack/gen-profiles.sh
+# do not edit it
+arch: arm64
+platform: metal
+secureboot: false
+version: v1.14.2
+input:
+  kernel:
+    path: /usr/install/arm64/vmlinuz
+  initramfs:
+    path: /usr/install/arm64/initramfs.xz
+  baseInstaller:
+    imageRef: "ghcr.io/siderolabs/installer-base:v1.14.2"
+  systemExtensions:
+    - imageRef: ghcr.io/siderolabs/bnx2-bnx2x:20260916@sha256:f0ba5d110925a3e4e4fceeb146001e1f6b2430ef85b85c8fdd07848cd82b8b7b
+    - imageRef: ghcr.io/siderolabs/intel-ice-firmware:20260916@sha256:858c93853e75fdc69da6ada28a24d2b9e2ec486e3f53b6ccf520fb4ab9b3388e
+    - imageRef: ghcr.io/siderolabs/qlogic-firmware:20260916@sha256:44adfb8f21402064e2406d7eb70d2dc6925ed231ba3884a52a5019047a4409b9
+    - imageRef: ghcr.io/siderolabs/drbd:9.3.4-v1.14.2@sha256:07d2be475e08b3c8b633319e7ed1e73d3e838836cfa734fef1bc0d45ea4b18d1
+    - imageRef: ghcr.io/siderolabs/zfs:2.4.4-v1.14.2@sha256:19f57dacaaac5689ec50c77c94e40051676215ef21700e37e5adf4b6055e3dc7
+output:
+  kind: installer
+  imageOptions: {}
+  outFormat: raw
diff --git a/packages/core/talos/images/talos/profiles/installer.yaml b/packages/core/talos/images/talos/profiles/installer.yaml
index 09f11dc535..50a2d345b4 100644
--- a/packages/core/talos/images/talos/profiles/installer.yaml
+++ b/packages/core/talos/images/talos/profiles/installer.yaml
@@ -3,24 +3,24 @@
 arch: amd64
 platform: metal
 secureboot: false
-version: v1.13.0
+version: v1.14.2
 input:
   kernel:
     path: /usr/install/amd64/vmlinuz
   initramfs:
     path: /usr/install/amd64/initramfs.xz
   baseInstaller:
-    imageRef: "ghcr.io/siderolabs/installer:v1.13.0"
+    imageRef: "ghcr.io/siderolabs/installer-base:v1.14.2"
   systemExtensions:
-    - imageRef: ghcr.io/siderolabs/amd-ucode:20260410@sha256:d5a0256846700ebb4fd2dba0107cfd944f6689d9bf96f47ab9dc35ef1e225179
-    - imageRef: ghcr.io/siderolabs/amdgpu:20260410-v1.13.0@sha256:48f121b8b6575b6c38e2dd459cbb022f6ef3e8aea6209255a14654d28aea8b8c
-    - imageRef: ghcr.io/siderolabs/bnx2-bnx2x:20260410@sha256:5a481b38c305d2292e7b6e06750ec704ac1229602c75cf80535ff3561f0b29c3
-    - imageRef: ghcr.io/siderolabs/intel-ice-firmware:20260410@sha256:ef1cbec222fb2d2ae0db9c025e4b9b6b875d965d49ebb71d7ad9f0713133c299
-    - imageRef: ghcr.io/siderolabs/i915:20260410-v1.13.0@sha256:fa10ab5a7ab8e412ef8ead8d244cf1ba37c13c60ceb0150044e4682ff29b25af
-    - imageRef: ghcr.io/siderolabs/intel-ucode:20260227@sha256:6112f6426a7081727545f7c33dcf2a89ff672494847b180380b4c58f3544a7b2
-    - imageRef: ghcr.io/siderolabs/qlogic-firmware:20260410@sha256:83593864ae91b16e9962258b5f0bd777d4c81846ece206bb84e9c37be023715c
-    - imageRef: ghcr.io/siderolabs/drbd:9.3.1-v1.13.0@sha256:414c94ab6c73c6f20b4dbfce53383fd9ea7bc485d76ceaee5eb6360d2bddcc40
-    - imageRef: ghcr.io/siderolabs/zfs:2.4.1-v1.13.0@sha256:301ae643b38d8b377c051ec0e52b9b03ea49bdc90ca7c49e0da83444a92c5619
+    - imageRef: ghcr.io/siderolabs/amd-ucode:20260916@sha256:50904b899cd328ad3a84478bd83d0f88a3e0cb1be87a8ccd199717fc51391c8d
+    - imageRef: ghcr.io/siderolabs/amdgpu:20260916-v1.14.2@sha256:aa1cf0084d3f0e38fa711e030fb63c037d8610742e93cc12a3d7255cd60f0944
+    - imageRef: ghcr.io/siderolabs/bnx2-bnx2x:20260916@sha256:f0ba5d110925a3e4e4fceeb146001e1f6b2430ef85b85c8fdd07848cd82b8b7b
+    - imageRef: ghcr.io/siderolabs/intel-ice-firmware:20260916@sha256:858c93853e75fdc69da6ada28a24d2b9e2ec486e3f53b6ccf520fb4ab9b3388e
+    - imageRef: ghcr.io/siderolabs/i915:20260916-v1.14.2@sha256:ed2ea6d8733cefbb71c4303a9f19ad04d349b034cf842afebdd540fb5904e36e
+    - imageRef: ghcr.io/siderolabs/intel-ucode:20260812@sha256:5f3d4e4b7a3a6f08df6aa13afa8c476422ccb76ba63186a480fe0ce2e19aa921
+    - imageRef: ghcr.io/siderolabs/qlogic-firmware:20260916@sha256:44adfb8f21402064e2406d7eb70d2dc6925ed231ba3884a52a5019047a4409b9
+    - imageRef: ghcr.io/siderolabs/drbd:9.3.4-v1.14.2@sha256:07d2be475e08b3c8b633319e7ed1e73d3e838836cfa734fef1bc0d45ea4b18d1
+    - imageRef: ghcr.io/siderolabs/zfs:2.4.4-v1.14.2@sha256:19f57dacaaac5689ec50c77c94e40051676215ef21700e37e5adf4b6055e3dc7
 output:
   kind: installer
   imageOptions: {}
diff --git a/packages/core/talos/images/talos/profiles/iso-arm64.yaml b/packages/core/talos/images/talos/profiles/iso-arm64.yaml
new file mode 100644
index 0000000000..ef13db4d12
--- /dev/null
+++ b/packages/core/talos/images/talos/profiles/iso-arm64.yaml
@@ -0,0 +1,23 @@
+# this file generated by hack/gen-profiles.sh
+# do not edit it
+arch: arm64
+platform: metal
+secureboot: false
+version: v1.14.2
+input:
+  kernel:
+    path: /usr/install/arm64/vmlinuz
+  initramfs:
+    path: /usr/install/arm64/initramfs.xz
+  baseInstaller:
+    imageRef: "ghcr.io/siderolabs/installer-base:v1.14.2"
+  systemExtensions:
+    - imageRef: ghcr.io/siderolabs/bnx2-bnx2x:20260916@sha256:f0ba5d110925a3e4e4fceeb146001e1f6b2430ef85b85c8fdd07848cd82b8b7b
+    - imageRef: ghcr.io/siderolabs/intel-ice-firmware:20260916@sha256:858c93853e75fdc69da6ada28a24d2b9e2ec486e3f53b6ccf520fb4ab9b3388e
+    - imageRef: ghcr.io/siderolabs/qlogic-firmware:20260916@sha256:44adfb8f21402064e2406d7eb70d2dc6925ed231ba3884a52a5019047a4409b9
+    - imageRef: ghcr.io/siderolabs/drbd:9.3.4-v1.14.2@sha256:07d2be475e08b3c8b633319e7ed1e73d3e838836cfa734fef1bc0d45ea4b18d1
+    - imageRef: ghcr.io/siderolabs/zfs:2.4.4-v1.14.2@sha256:19f57dacaaac5689ec50c77c94e40051676215ef21700e37e5adf4b6055e3dc7
+output:
+  kind: iso
+  imageOptions: {}
+  outFormat: raw
diff --git a/packages/core/talos/images/talos/profiles/iso.yaml b/packages/core/talos/images/talos/profiles/iso.yaml
index f4867313dc..5cc9511763 100644
--- a/packages/core/talos/images/talos/profiles/iso.yaml
+++ b/packages/core/talos/images/talos/profiles/iso.yaml
@@ -3,24 +3,24 @@
 arch: amd64
 platform: metal
 secureboot: false
-version: v1.13.0
+version: v1.14.2
 input:
   kernel:
     path: /usr/install/amd64/vmlinuz
   initramfs:
     path: /usr/install/amd64/initramfs.xz
   baseInstaller:
-    imageRef: "ghcr.io/siderolabs/installer:v1.13.0"
+    imageRef: "ghcr.io/siderolabs/installer-base:v1.14.2"
   systemExtensions:
-    - imageRef: ghcr.io/siderolabs/amd-ucode:20260410@sha256:d5a0256846700ebb4fd2dba0107cfd944f6689d9bf96f47ab9dc35ef1e225179
-    - imageRef: ghcr.io/siderolabs/amdgpu:20260410-v1.13.0@sha256:48f121b8b6575b6c38e2dd459cbb022f6ef3e8aea6209255a14654d28aea8b8c
-    - imageRef: ghcr.io/siderolabs/bnx2-bnx2x:20260410@sha256:5a481b38c305d2292e7b6e06750ec704ac1229602c75cf80535ff3561f0b29c3
-    - imageRef: ghcr.io/siderolabs/intel-ice-firmware:20260410@sha256:ef1cbec222fb2d2ae0db9c025e4b9b6b875d965d49ebb71d7ad9f0713133c299
-    - imageRef: ghcr.io/siderolabs/i915:20260410-v1.13.0@sha256:fa10ab5a7ab8e412ef8ead8d244cf1ba37c13c60ceb0150044e4682ff29b25af
-    - imageRef: ghcr.io/siderolabs/intel-ucode:20260227@sha256:6112f6426a7081727545f7c33dcf2a89ff672494847b180380b4c58f3544a7b2
-    - imageRef: ghcr.io/siderolabs/qlogic-firmware:20260410@sha256:83593864ae91b16e9962258b5f0bd777d4c81846ece206bb84e9c37be023715c
-    - imageRef: ghcr.io/siderolabs/drbd:9.3.1-v1.13.0@sha256:414c94ab6c73c6f20b4dbfce53383fd9ea7bc485d76ceaee5eb6360d2bddcc40
-    - imageRef: ghcr.io/siderolabs/zfs:2.4.1-v1.13.0@sha256:301ae643b38d8b377c051ec0e52b9b03ea49bdc90ca7c49e0da83444a92c5619
+    - imageRef: ghcr.io/siderolabs/amd-ucode:20260916@sha256:50904b899cd328ad3a84478bd83d0f88a3e0cb1be87a8ccd199717fc51391c8d
+    - imageRef: ghcr.io/siderolabs/amdgpu:20260916-v1.14.2@sha256:aa1cf0084d3f0e38fa711e030fb63c037d8610742e93cc12a3d7255cd60f0944
+    - imageRef: ghcr.io/siderolabs/bnx2-bnx2x:20260916@sha256:f0ba5d110925a3e4e4fceeb146001e1f6b2430ef85b85c8fdd07848cd82b8b7b
+    - imageRef: ghcr.io/siderolabs/intel-ice-firmware:20260916@sha256:858c93853e75fdc69da6ada28a24d2b9e2ec486e3f53b6ccf520fb4ab9b3388e
+    - imageRef: ghcr.io/siderolabs/i915:20260916-v1.14.2@sha256:ed2ea6d8733cefbb71c4303a9f19ad04d349b034cf842afebdd540fb5904e36e
+    - imageRef: ghcr.io/siderolabs/intel-ucode:20260812@sha256:5f3d4e4b7a3a6f08df6aa13afa8c476422ccb76ba63186a480fe0ce2e19aa921
+    - imageRef: ghcr.io/siderolabs/qlogic-firmware:20260916@sha256:44adfb8f21402064e2406d7eb70d2dc6925ed231ba3884a52a5019047a4409b9
+    - imageRef: ghcr.io/siderolabs/drbd:9.3.4-v1.14.2@sha256:07d2be475e08b3c8b633319e7ed1e73d3e838836cfa734fef1bc0d45ea4b18d1
+    - imageRef: ghcr.io/siderolabs/zfs:2.4.4-v1.14.2@sha256:19f57dacaaac5689ec50c77c94e40051676215ef21700e37e5adf4b6055e3dc7
 output:
   kind: iso
   imageOptions: {}
diff --git a/packages/core/talos/images/talos/profiles/kernel-arm64.yaml b/packages/core/talos/images/talos/profiles/kernel-arm64.yaml
new file mode 100644
index 0000000000..358f90855f
--- /dev/null
+++ b/packages/core/talos/images/talos/profiles/kernel-arm64.yaml
@@ -0,0 +1,23 @@
+# this file generated by hack/gen-profiles.sh
+# do not edit it
+arch: arm64
+platform: metal
+secureboot: false
+version: v1.14.2
+input:
+  kernel:
+    path: /usr/install/arm64/vmlinuz
+  initramfs:
+    path: /usr/install/arm64/initramfs.xz
+  baseInstaller:
+    imageRef: "ghcr.io/siderolabs/installer-base:v1.14.2"
+  systemExtensions:
+    - imageRef: ghcr.io/siderolabs/bnx2-bnx2x:20260916@sha256:f0ba5d110925a3e4e4fceeb146001e1f6b2430ef85b85c8fdd07848cd82b8b7b
+    - imageRef: ghcr.io/siderolabs/intel-ice-firmware:20260916@sha256:858c93853e75fdc69da6ada28a24d2b9e2ec486e3f53b6ccf520fb4ab9b3388e
+    - imageRef: ghcr.io/siderolabs/qlogic-firmware:20260916@sha256:44adfb8f21402064e2406d7eb70d2dc6925ed231ba3884a52a5019047a4409b9
+    - imageRef: ghcr.io/siderolabs/drbd:9.3.4-v1.14.2@sha256:07d2be475e08b3c8b633319e7ed1e73d3e838836cfa734fef1bc0d45ea4b18d1
+    - imageRef: ghcr.io/siderolabs/zfs:2.4.4-v1.14.2@sha256:19f57dacaaac5689ec50c77c94e40051676215ef21700e37e5adf4b6055e3dc7
+output:
+  kind: kernel
+  imageOptions: {}
+  outFormat: raw
diff --git a/packages/core/talos/images/talos/profiles/kernel.yaml b/packages/core/talos/images/talos/profiles/kernel.yaml
index dd8fd1a9ae..a73a3566da 100644
--- a/packages/core/talos/images/talos/profiles/kernel.yaml
+++ b/packages/core/talos/images/talos/profiles/kernel.yaml
@@ -3,24 +3,24 @@
 arch: amd64
 platform: metal
 secureboot: false
-version: v1.13.0
+version: v1.14.2
 input:
   kernel:
     path: /usr/install/amd64/vmlinuz
   initramfs:
     path: /usr/install/amd64/initramfs.xz
   baseInstaller:
-    imageRef: "ghcr.io/siderolabs/installer:v1.13.0"
+    imageRef: "ghcr.io/siderolabs/installer-base:v1.14.2"
   systemExtensions:
-    - imageRef: ghcr.io/siderolabs/amd-ucode:20260410@sha256:d5a0256846700ebb4fd2dba0107cfd944f6689d9bf96f47ab9dc35ef1e225179
-    - imageRef: ghcr.io/siderolabs/amdgpu:20260410-v1.13.0@sha256:48f121b8b6575b6c38e2dd459cbb022f6ef3e8aea6209255a14654d28aea8b8c
-    - imageRef: ghcr.io/siderolabs/bnx2-bnx2x:20260410@sha256:5a481b38c305d2292e7b6e06750ec704ac1229602c75cf80535ff3561f0b29c3
-    - imageRef: ghcr.io/siderolabs/intel-ice-firmware:20260410@sha256:ef1cbec222fb2d2ae0db9c025e4b9b6b875d965d49ebb71d7ad9f0713133c299
-    - imageRef: ghcr.io/siderolabs/i915:20260410-v1.13.0@sha256:fa10ab5a7ab8e412ef8ead8d244cf1ba37c13c60ceb0150044e4682ff29b25af
-    - imageRef: ghcr.io/siderolabs/intel-ucode:20260227@sha256:6112f6426a7081727545f7c33dcf2a89ff672494847b180380b4c58f3544a7b2
-    - imageRef: ghcr.io/siderolabs/qlogic-firmware:20260410@sha256:83593864ae91b16e9962258b5f0bd777d4c81846ece206bb84e9c37be023715c
-    - imageRef: ghcr.io/siderolabs/drbd:9.3.1-v1.13.0@sha256:414c94ab6c73c6f20b4dbfce53383fd9ea7bc485d76ceaee5eb6360d2bddcc40
-    - imageRef: ghcr.io/siderolabs/zfs:2.4.1-v1.13.0@sha256:301ae643b38d8b377c051ec0e52b9b03ea49bdc90ca7c49e0da83444a92c5619
+    - imageRef: ghcr.io/siderolabs/amd-ucode:20260916@sha256:50904b899cd328ad3a84478bd83d0f88a3e0cb1be87a8ccd199717fc51391c8d
+    - imageRef: ghcr.io/siderolabs/amdgpu:20260916-v1.14.2@sha256:aa1cf0084d3f0e38fa711e030fb63c037d8610742e93cc12a3d7255cd60f0944
+    - imageRef: ghcr.io/siderolabs/bnx2-bnx2x:20260916@sha256:f0ba5d110925a3e4e4fceeb146001e1f6b2430ef85b85c8fdd07848cd82b8b7b
+    - imageRef: ghcr.io/siderolabs/intel-ice-firmware:20260916@sha256:858c93853e75fdc69da6ada28a24d2b9e2ec486e3f53b6ccf520fb4ab9b3388e
+    - imageRef: ghcr.io/siderolabs/i915:20260916-v1.14.2@sha256:ed2ea6d8733cefbb71c4303a9f19ad04d349b034cf842afebdd540fb5904e36e
+    - imageRef: ghcr.io/siderolabs/intel-ucode:20260812@sha256:5f3d4e4b7a3a6f08df6aa13afa8c476422ccb76ba63186a480fe0ce2e19aa921
+    - imageRef: ghcr.io/siderolabs/qlogic-firmware:20260916@sha256:44adfb8f21402064e2406d7eb70d2dc6925ed231ba3884a52a5019047a4409b9
+    - imageRef: ghcr.io/siderolabs/drbd:9.3.4-v1.14.2@sha256:07d2be475e08b3c8b633319e7ed1e73d3e838836cfa734fef1bc0d45ea4b18d1
+    - imageRef: ghcr.io/siderolabs/zfs:2.4.4-v1.14.2@sha256:19f57dacaaac5689ec50c77c94e40051676215ef21700e37e5adf4b6055e3dc7
 output:
   kind: kernel
   imageOptions: {}
diff --git a/packages/core/talos/images/talos/profiles/metal-arm64.yaml b/packages/core/talos/images/talos/profiles/metal-arm64.yaml
new file mode 100644
index 0000000000..613b765563
--- /dev/null
+++ b/packages/core/talos/images/talos/profiles/metal-arm64.yaml
@@ -0,0 +1,23 @@
+# this file generated by hack/gen-profiles.sh
+# do not edit it
+arch: arm64
+platform: metal
+secureboot: false
+version: v1.14.2
+input:
+  kernel:
+    path: /usr/install/arm64/vmlinuz
+  initramfs:
+    path: /usr/install/arm64/initramfs.xz
+  baseInstaller:
+    imageRef: "ghcr.io/siderolabs/installer-base:v1.14.2"
+  systemExtensions:
+    - imageRef: ghcr.io/siderolabs/bnx2-bnx2x:20260916@sha256:f0ba5d110925a3e4e4fceeb146001e1f6b2430ef85b85c8fdd07848cd82b8b7b
+    - imageRef: ghcr.io/siderolabs/intel-ice-firmware:20260916@sha256:858c93853e75fdc69da6ada28a24d2b9e2ec486e3f53b6ccf520fb4ab9b3388e
+    - imageRef: ghcr.io/siderolabs/qlogic-firmware:20260916@sha256:44adfb8f21402064e2406d7eb70d2dc6925ed231ba3884a52a5019047a4409b9
+    - imageRef: ghcr.io/siderolabs/drbd:9.3.4-v1.14.2@sha256:07d2be475e08b3c8b633319e7ed1e73d3e838836cfa734fef1bc0d45ea4b18d1
+    - imageRef: ghcr.io/siderolabs/zfs:2.4.4-v1.14.2@sha256:19f57dacaaac5689ec50c77c94e40051676215ef21700e37e5adf4b6055e3dc7
+output:
+  kind: image
+  imageOptions: { diskSize: 1306525696, diskFormat: raw }
+  outFormat: .xz
diff --git a/packages/core/talos/images/talos/profiles/metal.yaml b/packages/core/talos/images/talos/profiles/metal.yaml
index 196ab35d95..b49681dffd 100644
--- a/packages/core/talos/images/talos/profiles/metal.yaml
+++ b/packages/core/talos/images/talos/profiles/metal.yaml
@@ -3,24 +3,24 @@
 arch: amd64
 platform: metal
 secureboot: false
-version: v1.13.0
+version: v1.14.2
 input:
   kernel:
     path: /usr/install/amd64/vmlinuz
   initramfs:
     path: /usr/install/amd64/initramfs.xz
   baseInstaller:
-    imageRef: "ghcr.io/siderolabs/installer:v1.13.0"
+    imageRef: "ghcr.io/siderolabs/installer-base:v1.14.2"
   systemExtensions:
-    - imageRef: ghcr.io/siderolabs/amd-ucode:20260410@sha256:d5a0256846700ebb4fd2dba0107cfd944f6689d9bf96f47ab9dc35ef1e225179
-    - imageRef: ghcr.io/siderolabs/amdgpu:20260410-v1.13.0@sha256:48f121b8b6575b6c38e2dd459cbb022f6ef3e8aea6209255a14654d28aea8b8c
-    - imageRef: ghcr.io/siderolabs/bnx2-bnx2x:20260410@sha256:5a481b38c305d2292e7b6e06750ec704ac1229602c75cf80535ff3561f0b29c3
-    - imageRef: ghcr.io/siderolabs/intel-ice-firmware:20260410@sha256:ef1cbec222fb2d2ae0db9c025e4b9b6b875d965d49ebb71d7ad9f0713133c299
-    - imageRef: ghcr.io/siderolabs/i915:20260410-v1.13.0@sha256:fa10ab5a7ab8e412ef8ead8d244cf1ba37c13c60ceb0150044e4682ff29b25af
-    - imageRef: ghcr.io/siderolabs/intel-ucode:20260227@sha256:6112f6426a7081727545f7c33dcf2a89ff672494847b180380b4c58f3544a7b2
-    - imageRef: ghcr.io/siderolabs/qlogic-firmware:20260410@sha256:83593864ae91b16e9962258b5f0bd777d4c81846ece206bb84e9c37be023715c
-    - imageRef: ghcr.io/siderolabs/drbd:9.3.1-v1.13.0@sha256:414c94ab6c73c6f20b4dbfce53383fd9ea7bc485d76ceaee5eb6360d2bddcc40
-    - imageRef: ghcr.io/siderolabs/zfs:2.4.1-v1.13.0@sha256:301ae643b38d8b377c051ec0e52b9b03ea49bdc90ca7c49e0da83444a92c5619
+    - imageRef: ghcr.io/siderolabs/amd-ucode:20260916@sha256:50904b899cd328ad3a84478bd83d0f88a3e0cb1be87a8ccd199717fc51391c8d
+    - imageRef: ghcr.io/siderolabs/amdgpu:20260916-v1.14.2@sha256:aa1cf0084d3f0e38fa711e030fb63c037d8610742e93cc12a3d7255cd60f0944
+    - imageRef: ghcr.io/siderolabs/bnx2-bnx2x:20260916@sha256:f0ba5d110925a3e4e4fceeb146001e1f6b2430ef85b85c8fdd07848cd82b8b7b
+    - imageRef: ghcr.io/siderolabs/intel-ice-firmware:20260916@sha256:858c93853e75fdc69da6ada28a24d2b9e2ec486e3f53b6ccf520fb4ab9b3388e
+    - imageRef: ghcr.io/siderolabs/i915:20260916-v1.14.2@sha256:ed2ea6d8733cefbb71c4303a9f19ad04d349b034cf842afebdd540fb5904e36e
+    - imageRef: ghcr.io/siderolabs/intel-ucode:20260812@sha256:5f3d4e4b7a3a6f08df6aa13afa8c476422ccb76ba63186a480fe0ce2e19aa921
+    - imageRef: ghcr.io/siderolabs/qlogic-firmware:20260916@sha256:44adfb8f21402064e2406d7eb70d2dc6925ed231ba3884a52a5019047a4409b9
+    - imageRef: ghcr.io/siderolabs/drbd:9.3.4-v1.14.2@sha256:07d2be475e08b3c8b633319e7ed1e73d3e838836cfa734fef1bc0d45ea4b18d1
+    - imageRef: ghcr.io/siderolabs/zfs:2.4.4-v1.14.2@sha256:19f57dacaaac5689ec50c77c94e40051676215ef21700e37e5adf4b6055e3dc7
 output:
   kind: image
   imageOptions: { diskSize: 1306525696, diskFormat: raw }
diff --git a/packages/core/talos/images/talos/profiles/nocloud-arm64.yaml b/packages/core/talos/images/talos/profiles/nocloud-arm64.yaml
new file mode 100644
index 0000000000..535e8adac5
--- /dev/null
+++ b/packages/core/talos/images/talos/profiles/nocloud-arm64.yaml
@@ -0,0 +1,23 @@
+# this file generated by hack/gen-profiles.sh
+# do not edit it
+arch: arm64
+platform: nocloud
+secureboot: false
+version: v1.14.2
+input:
+  kernel:
+    path: /usr/install/arm64/vmlinuz
+  initramfs:
+    path: /usr/install/arm64/initramfs.xz
+  baseInstaller:
+    imageRef: "ghcr.io/siderolabs/installer-base:v1.14.2"
+  systemExtensions:
+    - imageRef: ghcr.io/siderolabs/bnx2-bnx2x:20260916@sha256:f0ba5d110925a3e4e4fceeb146001e1f6b2430ef85b85c8fdd07848cd82b8b7b
+    - imageRef: ghcr.io/siderolabs/intel-ice-firmware:20260916@sha256:858c93853e75fdc69da6ada28a24d2b9e2ec486e3f53b6ccf520fb4ab9b3388e
+    - imageRef: ghcr.io/siderolabs/qlogic-firmware:20260916@sha256:44adfb8f21402064e2406d7eb70d2dc6925ed231ba3884a52a5019047a4409b9
+    - imageRef: ghcr.io/siderolabs/drbd:9.3.4-v1.14.2@sha256:07d2be475e08b3c8b633319e7ed1e73d3e838836cfa734fef1bc0d45ea4b18d1
+    - imageRef: ghcr.io/siderolabs/zfs:2.4.4-v1.14.2@sha256:19f57dacaaac5689ec50c77c94e40051676215ef21700e37e5adf4b6055e3dc7
+output:
+  kind: image
+  imageOptions: { diskSize: 1306525696, diskFormat: raw }
+  outFormat: .xz
diff --git a/packages/core/talos/images/talos/profiles/nocloud.yaml b/packages/core/talos/images/talos/profiles/nocloud.yaml
index c0769a1243..a068597eae 100644
--- a/packages/core/talos/images/talos/profiles/nocloud.yaml
+++ b/packages/core/talos/images/talos/profiles/nocloud.yaml
@@ -3,24 +3,24 @@
 arch: amd64
 platform: nocloud
 secureboot: false
-version: v1.13.0
+version: v1.14.2
 input:
   kernel:
     path: /usr/install/amd64/vmlinuz
   initramfs:
     path: /usr/install/amd64/initramfs.xz
   baseInstaller:
-    imageRef: "ghcr.io/siderolabs/installer:v1.13.0"
+    imageRef: "ghcr.io/siderolabs/installer-base:v1.14.2"
   systemExtensions:
-    - imageRef: ghcr.io/siderolabs/amd-ucode:20260410@sha256:d5a0256846700ebb4fd2dba0107cfd944f6689d9bf96f47ab9dc35ef1e225179
-    - imageRef: ghcr.io/siderolabs/amdgpu:20260410-v1.13.0@sha256:48f121b8b6575b6c38e2dd459cbb022f6ef3e8aea6209255a14654d28aea8b8c
-    - imageRef: ghcr.io/siderolabs/bnx2-bnx2x:20260410@sha256:5a481b38c305d2292e7b6e06750ec704ac1229602c75cf80535ff3561f0b29c3
-    - imageRef: ghcr.io/siderolabs/intel-ice-firmware:20260410@sha256:ef1cbec222fb2d2ae0db9c025e4b9b6b875d965d49ebb71d7ad9f0713133c299
-    - imageRef: ghcr.io/siderolabs/i915:20260410-v1.13.0@sha256:fa10ab5a7ab8e412ef8ead8d244cf1ba37c13c60ceb0150044e4682ff29b25af
-    - imageRef: ghcr.io/siderolabs/intel-ucode:20260227@sha256:6112f6426a7081727545f7c33dcf2a89ff672494847b180380b4c58f3544a7b2
-    - imageRef: ghcr.io/siderolabs/qlogic-firmware:20260410@sha256:83593864ae91b16e9962258b5f0bd777d4c81846ece206bb84e9c37be023715c
-    - imageRef: ghcr.io/siderolabs/drbd:9.3.1-v1.13.0@sha256:414c94ab6c73c6f20b4dbfce53383fd9ea7bc485d76ceaee5eb6360d2bddcc40
-    - imageRef: ghcr.io/siderolabs/zfs:2.4.1-v1.13.0@sha256:301ae643b38d8b377c051ec0e52b9b03ea49bdc90ca7c49e0da83444a92c5619
+    - imageRef: ghcr.io/siderolabs/amd-ucode:20260916@sha256:50904b899cd328ad3a84478bd83d0f88a3e0cb1be87a8ccd199717fc51391c8d
+    - imageRef: ghcr.io/siderolabs/amdgpu:20260916-v1.14.2@sha256:aa1cf0084d3f0e38fa711e030fb63c037d8610742e93cc12a3d7255cd60f0944
+    - imageRef: ghcr.io/siderolabs/bnx2-bnx2x:20260916@sha256:f0ba5d110925a3e4e4fceeb146001e1f6b2430ef85b85c8fdd07848cd82b8b7b
+    - imageRef: ghcr.io/siderolabs/intel-ice-firmware:20260916@sha256:858c93853e75fdc69da6ada28a24d2b9e2ec486e3f53b6ccf520fb4ab9b3388e
+    - imageRef: ghcr.io/siderolabs/i915:20260916-v1.14.2@sha256:ed2ea6d8733cefbb71c4303a9f19ad04d349b034cf842afebdd540fb5904e36e
+    - imageRef: ghcr.io/siderolabs/intel-ucode:20260812@sha256:5f3d4e4b7a3a6f08df6aa13afa8c476422ccb76ba63186a480fe0ce2e19aa921
+    - imageRef: ghcr.io/siderolabs/qlogic-firmware:20260916@sha256:44adfb8f21402064e2406d7eb70d2dc6925ed231ba3884a52a5019047a4409b9
+    - imageRef: ghcr.io/siderolabs/drbd:9.3.4-v1.14.2@sha256:07d2be475e08b3c8b633319e7ed1e73d3e838836cfa734fef1bc0d45ea4b18d1
+    - imageRef: ghcr.io/siderolabs/zfs:2.4.4-v1.14.2@sha256:19f57dacaaac5689ec50c77c94e40051676215ef21700e37e5adf4b6055e3dc7
 output:
   kind: image
   imageOptions: { diskSize: 1306525696, diskFormat: raw }
diff --git a/packages/core/testing/Makefile b/packages/core/testing/Makefile
index 489cca4766..861af1e440 100644
--- a/packages/core/testing/Makefile
+++ b/packages/core/testing/Makefile
@@ -3,12 +3,32 @@ NAME := sandbox
 CLEAN := 1
 TESTING_APPS := $(shell find ../../apps -maxdepth 1 -mindepth 1 -type d | awk -F/ '{print $$NF}')
 SANDBOX_NAME := cozy-e2e-sandbox-$(shell echo "$$(hostname):$$(pwd)" | sha256sum | cut -c -6)
+COZY_E2E_NODE_CPUS ?= 8
+COZY_E2E_NODE_MEMORY_MIB ?= 24576
 
 ROOT_DIR = $(dir $(abspath $(firstword $(MAKEFILE_LIST))/../../..))
+# One container lane per host. Unlike SANDBOX_NAME above, these names are not
+# per-checkout, and hack/e2e-compose.yaml's `container_name: srv1..3` and the
+# `data-srvN` zpools are global besides -- so a second checkout on the same host
+# adopts this one's nodes and pools, and its delete-cluster-container destroys
+# them. Not reachable in CI, where the lane already fills the largest runner
+# shape (3 x 8 vCPU / 24 GiB against 32 / 128), and left as a known limit rather
+# than fixed because isolating it properly means renaming the pools, which the
+# LINSTOR storage-pool registration reads.
+COMPOSE_PROJECT ?= cozy-e2e
+COMPOSE_FILE ?= $(ROOT_DIR)hack/e2e-compose.yaml
+ZPOOL_BACKING_DIR ?= /var/lib/cozy-e2e-zpools
+
+# The e2e sandbox image is pinned to amd64 as a whole: its VM lane boots the
+# amd64 Talos disk under qemu-system-x86_64 with KVM
+# (hack/e2e-prepare-cluster.bats), which an arm64 sandbox cannot run.
+# `override` beats any PLATFORM given on the command line, an explicit
+# linux/arm64 as much as one passed to a whole `make build`. It must precede
+# the include: common-envs.mk expands BUILDX_ARGS immediately.
+override PLATFORM := linux/amd64
 
 include ../../../hack/common-envs.mk
 
-
 help: ## Show this help.
 	@awk 'BEGIN {FS = ":.*?## "} /^[a-zA-Z_-]+:.*?## / {sub("\\\\n",sprintf("\n%22c"," "), $$2);printf "\033[36m%-20s\033[0m %s\n", $$1, $$2}' $(MAKEFILE_LIST)
 
@@ -17,30 +37,146 @@ image: image-e2e-sandbox
 image-e2e-sandbox:
 	docker buildx build -f images/e2e-sandbox/Dockerfile images/e2e-sandbox \
 		$(call image-tags,e2e-sandbox,v$(COZYSTACK_VERSION)) \
-		--cache-from type=registry,ref=$(REGISTRY)/e2e-sandbox:latest \
-		--cache-to type=inline \
+		$(call cache-args,e2e-sandbox) \
 		--metadata-file images/e2e-sandbox.json \
 		$(BUILDX_ARGS)
 	IMAGE="$(REGISTRY)/e2e-sandbox:$(IMAGE_TAG)@$$(yq e '."containerimage.digest"' images/e2e-sandbox.json -o json -r)" \
 		yq -i '.e2e.image = strenv(IMAGE)' values.yaml
 	rm -f images/e2e-sandbox.json
 
-test: test-openapi test-apps ## Run the end-to-end tests in existing sandbox
+# Named `e2e` (not `test`) so hack/helm-unit-tests.sh — which runs the `test`
+# target of every package whose `make -n test` resolves — does not pick up this
+# sandbox-driven e2e flow and try to run it in the unit-test phase (no sandbox
+# exists then). The root `make test` target invokes this.
+e2e: test-openapi test-chainsaw ## Run the end-to-end tests in existing sandbox
 
 copy-nocloud-image:
 	docker cp ../../../_out/assets/nocloud-amd64.raw.xz "${SANDBOX_NAME}":/workspace/_out/assets/nocloud-amd64.raw.xz
 
+# Live BATS suites need a literal invocation here: the root unit glob excludes
+# hack/e2e-* and subdirectories. hack/bats-runner-coverage.bats checks for files
+# with no runner and for runner paths whose files no longer exist.
 prepare-cluster: copy-nocloud-image
 	docker exec "${SANDBOX_NAME}" sh -c 'cd /workspace && hack/cozytest.sh hack/e2e-prepare-cluster.bats'
 
+# Container lane: Talos nodes as containers instead of QEMU guests, so tenant
+# workloads sit one nesting level shallower. Sits BESIDE prepare-cluster rather
+# than replacing it; nothing downstream changes, because the addressing, CPU and
+# memory in hack/e2e-compose.yaml mirror the QEMU lane exactly.
+#
+# Two steps, not one, because the halves must run in different places. The nodes
+# have to be siblings on the runner's docker daemon for the /dev and /run/udev
+# binds in hack/e2e-compose.yaml to resolve against the real host devtmpfs --
+# that bind is what lets this lane carry LINSTOR at all -- so the host-side half
+# needs a docker socket the sandbox does not have. Everything Talos-side then
+# runs inside the sandbox exactly as the QEMU lane does.
+#
+# No copy-nocloud-image dependency: containers boot from the Talos image
+# directly and need no nocloud asset, which also means this lane does not wait
+# on `make -C packages/core/talos assets`.
+prepare-cluster-container: delete-cluster-container
+	SANDBOX_NAME="${SANDBOX_NAME}" COMPOSE_PROJECT="${COMPOSE_PROJECT}" COMPOSE_FILE="${COMPOSE_FILE}" ZPOOL_BACKING_DIR="${ZPOOL_BACKING_DIR}" COZY_E2E_NODE_CPUS="${COZY_E2E_NODE_CPUS}" COZY_E2E_NODE_MEMORY_MIB="${COZY_E2E_NODE_MEMORY_MIB}" $(ROOT_DIR)hack/e2e-container-up.sh
+	docker exec -e COZY_E2E_NODE_CPUS="${COZY_E2E_NODE_CPUS}" -e COZY_E2E_NODE_MEMORY_MIB="${COZY_E2E_NODE_MEMORY_MIB}" "${SANDBOX_NAME}" sh -c 'cd /workspace && hack/cozytest.sh hack/e2e-prepare-cluster-container.bats'
+
+# Tear the container lane down. Docker volumes hold etcd and kubelet state, and
+# the host zpools hold LINSTOR data, so both halves must disappear before a
+# retry or the next run can adopt a half-dead cluster.
+# USERDATA is set to a placeholder because compose interpolates the whole file
+# before it decides what the subcommand needs, so the `${USERDATA:?}` guard that
+# makes a missing machine config fail loudly on `up` also fails `down`, where no
+# machine config is required. The value is never read: `down` matches containers
+# by project and service name. Without it teardown always errored, and ignoring
+# that error left the nodes and their /var volumes alive for the next run -- the
+# exact half-dead cluster this target exists to prevent.
+delete-cluster-container:
+	@set -u; \
+		cleanup_rc=0; \
+		if USERDATA=teardown docker compose -p "${COMPOSE_PROJECT}" -f "${COMPOSE_FILE}" down -v; then \
+			:; \
+		else \
+			step_rc=$$?; \
+			echo "container compose teardown failed with exit $$step_rc; continuing host-storage cleanup" >&2; \
+			cleanup_rc=$$step_rc; \
+		fi; \
+		if [ -z "${ZPOOL_BACKING_DIR}" ] || [ "${ZPOOL_BACKING_DIR}" = / ]; then \
+			echo "refusing unsafe ZPOOL_BACKING_DIR '${ZPOOL_BACKING_DIR}'" >&2; \
+			exit 1; \
+		fi; \
+		if [ "$$(id -u)" -eq 0 ]; then sudo_cmd=; else sudo_cmd=sudo; fi; \
+		for n in 1 2 3; do \
+			pool_detached=1; \
+			if $$sudo_cmd zpool list "data-srv$${n}" >/dev/null 2>&1; then \
+				if $$sudo_cmd zpool destroy "data-srv$${n}"; then \
+					:; \
+				else \
+					step_rc=$$?; \
+					echo "failed to destroy zpool data-srv$${n} (exit $$step_rc)" >&2; \
+					if [ "$$cleanup_rc" -eq 0 ]; then cleanup_rc=$$step_rc; fi; \
+					pool_detached=0; \
+				fi; \
+			else \
+				direct_list_rc=$$?; \
+				inventory_rc=0; \
+				pool_names=$$($$sudo_cmd zpool list -H -o name 2>/dev/null) || inventory_rc=$$?; \
+				if [ "$$inventory_rc" -ne 0 ]; then \
+					echo "failed to inventory zpools after data-srv$${n} lookup returned exit $$direct_list_rc (inventory exit $$inventory_rc); keeping its backing file" >&2; \
+					if [ "$$cleanup_rc" -eq 0 ]; then cleanup_rc=$$inventory_rc; fi; \
+					pool_detached=0; \
+				elif printf '%s\n' "$$pool_names" | grep -Fxq "data-srv$${n}"; then \
+					echo "zpool inventory still lists data-srv$${n} after its direct lookup returned exit $$direct_list_rc; keeping its backing file" >&2; \
+					if [ "$$cleanup_rc" -eq 0 ]; then cleanup_rc=$$direct_list_rc; fi; \
+					pool_detached=0; \
+				fi; \
+			fi; \
+			if [ "$$pool_detached" -eq 0 ]; then \
+				echo "keeping ${ZPOOL_BACKING_DIR}/srv$${n}.img because data-srv$${n} is still imported" >&2; \
+			else \
+				if $$sudo_cmd rm -f "${ZPOOL_BACKING_DIR}/srv$${n}.img"; then \
+					:; \
+				else \
+					step_rc=$$?; \
+					echo "failed to remove ${ZPOOL_BACKING_DIR}/srv$${n}.img (exit $$step_rc)" >&2; \
+					if [ "$$cleanup_rc" -eq 0 ]; then cleanup_rc=$$step_rc; fi; \
+				fi; \
+			fi; \
+		done; \
+		if [ -d "${ZPOOL_BACKING_DIR}" ]; then \
+			if $$sudo_cmd rmdir "${ZPOOL_BACKING_DIR}"; then \
+				:; \
+			else \
+				step_rc=$$?; \
+				echo "failed to remove backing directory ${ZPOOL_BACKING_DIR} (exit $$step_rc)" >&2; \
+				if [ "$$cleanup_rc" -eq 0 ]; then cleanup_rc=$$step_rc; fi; \
+			fi; \
+		fi; \
+		exit "$$cleanup_rc"
+
+# The API endpoint and E2E-only storage mode cross into the sandbox explicitly:
+# docker exec starts a fresh environment, so values exported by the caller do
+# not reach the manifest generator or root-tenant setup. Empty values retain the
+# QEMU defaults; the container lane supplies its node endpoint, disables DRBD,
+# and selects local storage because its Talos nodes share one kernel.
+# COZY_DISABLED_PACKAGES is the space-separated output of
+# hack/select-install.sh --disabled; empty installs the whole platform.
 install-cozystack:
-	docker exec "${SANDBOX_NAME}" sh -c 'cd /workspace && hack/cozytest.sh hack/e2e-install-cozystack.bats'
+	docker exec -e COZY_APISERVER_ENDPOINT="${COZY_APISERVER_ENDPOINT}" -e COZY_LINSTOR_DRBD_ENABLED="${COZY_LINSTOR_DRBD_ENABLED}" -e COZY_E2E_STORAGE_CLASS="${COZY_E2E_STORAGE_CLASS}" -e COZY_DISABLED_PACKAGES="${COZY_DISABLED_PACKAGES}" "${SANDBOX_NAME}" sh -c 'cd /workspace && hack/cozytest.sh hack/e2e-install-cozystack.bats'
 
 test-openapi:
 	docker exec "${SANDBOX_NAME}" sh -c 'cd /workspace && hack/cozytest.sh hack/e2e-test-openapi.bats'
 
-test-apps-%:
-	docker exec "${SANDBOX_NAME}" sh -c 'cd /workspace && hack/cozytest.sh hack/e2e-apps/$*.bats'
+# Run the Chainsaw E2E app suite. Chainsaw loads .chainsaw.yaml from the cwd,
+# discovers each Test in or below a suite dir of hack/e2e-chainsaw/, polls each
+# assertion to its own timeout, and writes a JUnit chainsaw-report.xml the CI
+# job uploads. CHAINSAW_SUITES restricts the run to the named suite dirs
+# (space-separated, e.g. "postgres bucket"); empty runs the whole suite. The
+# CI Test-Impact-Analysis step (hack/select-e2e.sh) sets it from the PR diff.
+# hack/e2e-chainsaw-run.sh runs one `chainsaw test` per suite directory, so it
+# can fail the suite whose pods outlive its cleanup, and merges the per-suite
+# reports into that same chainsaw-report.xml.
+# COZY_E2E_STORAGE_CLASS is passed both to script operations and as a Chainsaw
+# value for templated resource files; empty keeps the QEMU default, replicated.
+test-chainsaw:
+	docker exec -e COZY_E2E_STORAGE_CLASS="${COZY_E2E_STORAGE_CLASS}" "${SANDBOX_NAME}" sh -c 'cd /workspace/hack/e2e-chainsaw && ../e2e-chainsaw-run.sh --set-string storageClass="$${COZY_E2E_STORAGE_CLASS:-replicated}" ${CHAINSAW_SUITES}'
 
 collect-report: ## Collect the test report from the sandbox.
 	docker exec "${SANDBOX_NAME}" sh -c 'cd /workspace && hack/cozyreport.sh cozyreport'
@@ -51,6 +187,14 @@ collect-images: ## Collect the list of images used in the sandbox.
 	docker exec "${SANDBOX_NAME}" sh -c 'cd /workspace && hack/collect-images.sh'
 	mkdir -p ../../../_out
 	docker cp "${SANDBOX_NAME}":/workspace/images.txt ../../../_out/images.txt
+	docker cp "${SANDBOX_NAME}":/workspace/image-refs.txt ../../../_out/image-refs.txt
+
+# Install for the isp-hosted lane (.github/workflows/e2e-isp-hosted.yaml): the
+# hosted installer variant and the isp-hosted platform variant, on a kind
+# cluster the workflow attaches the sandbox to. Nothing to pass in, unlike
+# install-cozystack: the endpoint and storage belong to the cluster.
+install-cozystack-hosted:
+	docker exec "${SANDBOX_NAME}" sh -c 'cd /workspace && hack/cozytest.sh hack/e2e-install-cozystack-hosted.bats'
 
 delete: ## Remove sandbox from existing Kubernetes cluster.
 	docker rm -f "${SANDBOX_NAME}" || true
@@ -58,14 +202,29 @@ delete: ## Remove sandbox from existing Kubernetes cluster.
 exec:  ## Opens an interactive shell in the sandbox container.
 	docker exec -ti "${SANDBOX_NAME}" bash
 
+# Which machine this run landed on, recorded before the container exists.
+#
+# Here rather than in a workflow step for two reasons. The metadata service
+# answers on a link-local address the container is not guaranteed to reach, so
+# the read has to happen on this side of `docker run`; and the record has to be
+# inside the tree the `docker cp` below carries in, or hack/cozyreport.sh cannot
+# fold it into the artifact from inside. Every workflow that runs the suite reaches
+# the sandbox through `make prepare-env`, so one call here covers each of them on
+# both the green and the red path, with no per-workflow step to keep in step. No
+# count of those workflows here on purpose: the count is what goes stale, and the
+# funnel is the property worth stating.
+#
+# Ahead of `docker run`, so a runner whose sandbox fails to start is still
+# identified. Never fatal: the script says why it could not read something and
+# exits 0. On a machine with no metadata service -- a laptop running this target
+# directly -- it costs the read's own ceiling once, against a target that then
+# boots three QEMU guests.
 apply: delete
-	mkdir -p /tmp/${SANDBOX_NAME}
-	chmod 777 /tmp/${SANDBOX_NAME}
+	COZY_RUNNER_IDENTITY_FILE="$(ROOT_DIR)_out/runner-identity.txt" $(ROOT_DIR)hack/e2e-runner-identity.sh
 	docker run \
 		-d --rm --name "${SANDBOX_NAME}" --privileged \
 		-e TALOSCONFIG=/workspace/talosconfig \
 		-e KUBECONFIG=/workspace/kubeconfig \
-		-e SANDBOX_NAME=${SANDBOX_NAME} \
 		"$$(yq .e2e.image values.yaml)" \
 		--timeout 30m
 	docker cp "${ROOT_DIR}/." "${SANDBOX_NAME}":/workspace
diff --git a/packages/core/testing/images/e2e-sandbox/Dockerfile b/packages/core/testing/images/e2e-sandbox/Dockerfile
index ea18475d96..2fb2925844 100644
--- a/packages/core/testing/images/e2e-sandbox/Dockerfile
+++ b/packages/core/testing/images/e2e-sandbox/Dockerfile
@@ -1,26 +1,97 @@
-FROM ubuntu:22.04
+# Chainsaw is built from source because v0.2.15 ends an assert on the first API
+# error other than NotFound, so an etcd leader change during a poll fails the
+# step long before its timeout. The patch keeps polling on transient server
+# errors. Go back to the release tarball, dropping this stage, patches/ and
+# chainsaw-transient/, once a chainsaw release carries kyverno/chainsaw#2761.
+# Go 1.26 and -trimpath follow the v0.2.15 release binary (go1.26.0); a newer
+# Go minor is not what that release was tested with.
+FROM --platform=$BUILDPLATFORM golang:1.26.8@sha256:3c3e25a4da13fd0478eed2df1eb35a0e667094a7124d3993a6a1d30f71c17e79 AS chainsaw
+ARG GOPROXY
+ARG CHAINSAW_VERSION=0.2.15
+ARG CHAINSAW_SOURCE_SHA256=04f3fc7dd8e958e4fc7d73383bc22b05827240dd2fe7a8e32ee99d8c0332da2a
+ARG TARGETOS
+ARG TARGETARCH
+ARG BUILDOS
+ARG BUILDARCH
+
+WORKDIR /workspace
+
+RUN curl -fsSL "https://github.com/kyverno/chainsaw/archive/refs/tags/v${CHAINSAW_VERSION}.tar.gz" -o /tmp/chainsaw.tar.gz \
+ && echo "${CHAINSAW_SOURCE_SHA256}  /tmp/chainsaw.tar.gz" | sha256sum -c - \
+ && tar -xzf /tmp/chainsaw.tar.gz --strip=1 \
+ && rm -f /tmp/chainsaw.tar.gz
+
+COPY patches /patches
+RUN git apply /patches/*.patch
+
+# go build never compiles a _test.go, so nothing else runs the tests of the
+# packages the patches touch. The list is read into a variable first: a for
+# loop drops the exit status of a command substitution.
+RUN files=$(git apply --numstat /patches/*.patch) || exit 1; \
+    for dir in $(printf '%s\n' "$files" | cut -f3 | grep '\.go$' | xargs -r -n1 dirname | sort -u); do \
+      (cd "$dir" && go test .) || exit 1; \
+    done
+
+RUN CGO_ENABLED=0 GOOS=$TARGETOS GOARCH=$TARGETARCH go build -trimpath \
+    -ldflags "-s -w -X github.com/kyverno/chainsaw/pkg/version.BuildVersion=${CHAINSAW_VERSION}" \
+    -o /chainsaw .
+
+# The test executes chainsaw, so a cross build tests a host build of the same
+# patched tree instead of the shipped binary. The tests skip without CHAINSAW,
+# and a skip reports ok, so a skip fails the step here.
+COPY chainsaw-transient /chainsaw-transient
+RUN if [ "$TARGETOS/$TARGETARCH" = "$BUILDOS/$BUILDARCH" ]; then \
+      bin=/chainsaw; \
+    else \
+      bin=/tmp/chainsaw-host && CGO_ENABLED=0 go build -o "$bin" . || exit 1; \
+    fi; \
+    cd /chainsaw-transient && out=$(CHAINSAW="$bin" go test -count=1 -v .) || { printf '%s\n' "$out"; exit 1; }; \
+    printf '%s\n' "$out"; \
+    if printf '%s\n' "$out" | grep -q -- '--- SKIP'; then echo "chainsaw-transient skipped its tests" >&2; exit 1; fi
+
+FROM ubuntu:24.04@sha256:008173c23f95b170204355c12626cb5a965d779a7e1283b09e9cffbb1bf33ca3
 
-ARG KUBECTL_VERSION=1.33.2
-ARG TALOSCTL_VERSION=1.10.4
-ARG HELM_VERSION=3.18.3
+ARG KUBECTL_VERSION=1.33.13
+ARG TALOSCTL_VERSION=1.13.5
+ARG HELM_VERSION=3.21.2
 ARG COZYHR_VERSION=1.6.1
+ARG CRUST_GATHER_VERSION=v0.15.2
+ARG MC_VERSION=RELEASE.2025-08-13T08-35-41Z
+ARG FLUX_VERSION=2.8.6
 
 ARG TARGETOS
 ARG TARGETARCH
 
 RUN apt update -q
-RUN apt install -yq --no-install-recommends psmisc genisoimage ca-certificates qemu-kvm qemu-utils iproute2 iptables wget xz-utils netcat curl jq make git bash-completion
+RUN apt install -yq --no-install-recommends psmisc genisoimage ca-certificates qemu-kvm qemu-utils iproute2 iptables wget xz-utils netcat-openbsd curl jq make git bash-completion
 RUN curl -sSL "https://github.com/siderolabs/talos/releases/download/v${TALOSCTL_VERSION}/talosctl-${TARGETOS}-${TARGETARCH}" -o /usr/local/bin/talosctl \
  && chmod +x /usr/local/bin/talosctl
 RUN curl -sSL "https://dl.k8s.io/release/v${KUBECTL_VERSION}/bin/${TARGETOS}/${TARGETARCH}/kubectl" -o /usr/local/bin/kubectl \
  && chmod +x /usr/local/bin/kubectl
 RUN curl -sSL "https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3" | bash -s - --version "v${HELM_VERSION}"
-RUN curl -sSL "https://github.com/mikefarah/yq/releases/download/v4.44.3/yq_${TARGETOS}_${TARGETARCH}" -o /usr/local/bin/yq \
+RUN curl -sSL "https://github.com/mikefarah/yq/releases/download/v4.53.3/yq_${TARGETOS}_${TARGETARCH}" -o /usr/local/bin/yq \
  && chmod +x /usr/local/bin/yq
-RUN curl -sSL "https://fluxcd.io/install.sh" | bash
+RUN curl -fsSL "https://fluxcd.io/install.sh" -o /tmp/flux-install.sh \
+ && FLUX_VERSION="${FLUX_VERSION}" bash /tmp/flux-install.sh \
+ && rm -f /tmp/flux-install.sh
 RUN curl -sSL "https://github.com/cozystack/cozyhr/raw/refs/heads/main/hack/install.sh" | sh -s -- -v "${COZYHR_VERSION}"
-RUN curl -fsSL "https://dl.min.io/client/mc/release/${TARGETOS}-${TARGETARCH}/mc" --create-dirs -o /usr/local/bin/mc \
+# dl.min.io stopped serving community mc builds (HTTP 410) when MinIO archived
+# the project; the final release is still published on GitHub.
+RUN case "${TARGETARCH}" in \
+      amd64) sum=01f866e9c5f9b87c2b09116fa5d7c06695b106242d829a8bb32990c00312e891 ;; \
+      arm64) sum=14c8c9616cfce4636add161304353244e8de383b2e2752c0e9dad01d4c27c12c ;; \
+      *) echo "no pinned mc checksum for ${TARGETARCH}" >&2; exit 1 ;; \
+    esac \
+ && curl -fsSL "https://github.com/minio/mc/releases/download/${MC_VERSION}/mc.${TARGETOS}-${TARGETARCH}.${MC_VERSION}" -o /usr/local/bin/mc \
+ && echo "${sum}  /usr/local/bin/mc" | sha256sum -c - \
  && chmod +x /usr/local/bin/mc
+# crust-gather: full-cluster diagnostic snapshots, captured per failed test by
+# cozytest.sh (BATS install/openapi tests) and by the global .chainsaw.yaml
+# error.catch (Chainsaw app suite) — host plus each nested tenant cluster — and
+# `crust-gather serve`-able from the cozyreport artifact. Installs a static musl
+# binary as crust-gather.
+RUN curl -sSfL "https://github.com/crust-gather/crust-gather/raw/main/install.sh" | sh -s -- --version "${CRUST_GATHER_VERSION}" --bin-dir /usr/local/bin --yes
+COPY --from=chainsaw /chainsaw /usr/local/bin/chainsaw
 RUN <<'EOF'
 cat <<'EOT' >> /etc/bash.bashrc
 . /etc/bash_completion
diff --git a/packages/core/testing/images/e2e-sandbox/chainsaw-transient/go.mod b/packages/core/testing/images/e2e-sandbox/chainsaw-transient/go.mod
new file mode 100644
index 0000000000..b167cf2ba1
--- /dev/null
+++ b/packages/core/testing/images/e2e-sandbox/chainsaw-transient/go.mod
@@ -0,0 +1,3 @@
+module github.com/cozystack/cozystack/e2e-sandbox/chainsaw-transient
+
+go 1.26
diff --git a/packages/core/testing/images/e2e-sandbox/chainsaw-transient/transient_test.go b/packages/core/testing/images/e2e-sandbox/chainsaw-transient/transient_test.go
new file mode 100644
index 0000000000..dc43cc54aa
--- /dev/null
+++ b/packages/core/testing/images/e2e-sandbox/chainsaw-transient/transient_test.go
@@ -0,0 +1,182 @@
+// Package transient runs a chainsaw built from the e2e sandbox's patched tree
+// against a fake apiserver that answers the asserted object's GET with
+// HTTP 500 and an empty reason, which is what kube-apiserver sends for an etcd
+// error such as `etcdserver: leader changed`.
+// Release v0.2.15 ends an assert on the first such answer; the image carries
+// a patch that keeps it polling until its own timeout.
+package transient
+
+import (
+	"encoding/json"
+	"fmt"
+	"net/http"
+	"net/http/httptest"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"sync/atomic"
+	"testing"
+	"time"
+)
+
+const assertTimeout = 10 * time.Second
+
+func writeJSON(w http.ResponseWriter, code int, v any) {
+	w.Header().Set("Content-Type", "application/json")
+	w.WriteHeader(code)
+	_ = json.NewEncoder(w).Encode(v)
+}
+
+func status(code int, reason, message string) map[string]any {
+	return map[string]any{
+		"kind": "Status", "apiVersion": "v1", "status": "Failure",
+		"code": code, "reason": reason, "message": message,
+	}
+}
+
+// fakeAPIServer serves just enough discovery for chainsaw to resolve
+// v1/ConfigMap, and answers GET default/probe with 500 for the first
+// `failures` requests (all of them when failures < 0), then with the object.
+func fakeAPIServer(t *testing.T, failures int64) (*httptest.Server, *atomic.Int64) {
+	t.Helper()
+	var gets atomic.Int64
+	mux := http.NewServeMux()
+	mux.HandleFunc("/version", func(w http.ResponseWriter, _ *http.Request) {
+		writeJSON(w, http.StatusOK, map[string]string{"major": "1", "minor": "33", "gitVersion": "v1.33.0"})
+	})
+	mux.HandleFunc("/api", func(w http.ResponseWriter, _ *http.Request) {
+		writeJSON(w, http.StatusOK, map[string]any{
+			"kind": "APIVersions", "versions": []string{"v1"},
+			"serverAddressByClientCIDRs": []map[string]string{{"clientCIDR": "0.0.0.0/0", "serverAddress": "127.0.0.1"}},
+		})
+	})
+	mux.HandleFunc("/apis", func(w http.ResponseWriter, _ *http.Request) {
+		writeJSON(w, http.StatusOK, map[string]any{"kind": "APIGroupList", "apiVersion": "v1", "groups": []any{}})
+	})
+	mux.HandleFunc("/api/v1", func(w http.ResponseWriter, _ *http.Request) {
+		verbs := []string{"create", "delete", "get", "list", "patch", "update", "watch"}
+		writeJSON(w, http.StatusOK, map[string]any{
+			"kind": "APIResourceList", "apiVersion": "v1", "groupVersion": "v1",
+			"resources": []map[string]any{
+				{"name": "namespaces", "singularName": "namespace", "namespaced": false, "kind": "Namespace", "verbs": verbs},
+				{"name": "configmaps", "singularName": "configmap", "namespaced": true, "kind": "ConfigMap", "verbs": verbs},
+			},
+		})
+	})
+	mux.HandleFunc("/api/v1/namespaces/default", func(w http.ResponseWriter, _ *http.Request) {
+		writeJSON(w, http.StatusOK, map[string]any{
+			"kind": "Namespace", "apiVersion": "v1",
+			"metadata": map[string]any{"name": "default"},
+			"status":   map[string]any{"phase": "Active"},
+		})
+	})
+	mux.HandleFunc("/api/v1/namespaces/default/configmaps/probe", func(w http.ResponseWriter, r *http.Request) {
+		if r.Method != http.MethodGet {
+			writeJSON(w, http.StatusMethodNotAllowed, status(http.StatusMethodNotAllowed, "MethodNotAllowed", r.Method))
+			return
+		}
+		n := gets.Add(1)
+		if failures < 0 || n <= failures {
+			writeJSON(w, http.StatusInternalServerError, status(http.StatusInternalServerError, "", "etcdserver: leader changed"))
+			return
+		}
+		writeJSON(w, http.StatusOK, map[string]any{
+			"kind": "ConfigMap", "apiVersion": "v1",
+			"metadata": map[string]any{"name": "probe", "namespace": "default"},
+			"data":     map[string]string{"ready": "true"},
+		})
+	})
+	mux.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
+		writeJSON(w, http.StatusNotFound, status(http.StatusNotFound, "NotFound", r.URL.Path))
+	})
+	srv := httptest.NewServer(mux)
+	t.Cleanup(srv.Close)
+	return srv, &gets
+}
+
+func runChainsaw(t *testing.T, server string) (time.Duration, string, error) {
+	t.Helper()
+	bin := os.Getenv("CHAINSAW")
+	// The image build sets CHAINSAW; `make go-module-tests` reaches this module
+	// too, with no patched binary to test.
+	if bin == "" {
+		t.Skip("CHAINSAW is not set to the chainsaw binary under test")
+	}
+	dir := t.TempDir()
+	kubeconfig := filepath.Join(dir, "kubeconfig")
+	if err := os.WriteFile(kubeconfig, []byte(fmt.Sprintf(`apiVersion: v1
+kind: Config
+clusters:
+- name: fake
+  cluster:
+    server: %s
+contexts:
+- name: fake
+  context:
+    cluster: fake
+    user: fake
+current-context: fake
+users:
+- name: fake
+  user: {}
+`, server)), 0o600); err != nil {
+		t.Fatal(err)
+	}
+	suite := filepath.Join(dir, "suite")
+	if err := os.Mkdir(suite, 0o755); err != nil {
+		t.Fatal(err)
+	}
+	if err := os.WriteFile(filepath.Join(suite, "chainsaw-test.yaml"), []byte(fmt.Sprintf(`apiVersion: chainsaw.kyverno.io/v1alpha1
+kind: Test
+metadata:
+  name: transient
+spec:
+  namespace: default
+  skipDelete: true
+  steps:
+  - try:
+    - assert:
+        timeout: %s
+        resource:
+          apiVersion: v1
+          kind: ConfigMap
+          metadata:
+            name: probe
+            namespace: default
+          data:
+            ready: "true"
+`, assertTimeout)), 0o600); err != nil {
+		t.Fatal(err)
+	}
+	cmd := exec.Command(bin, "test", "--test-dir", suite, "--no-color")
+	cmd.Env = append(os.Environ(), "KUBECONFIG="+kubeconfig)
+	start := time.Now()
+	out, err := cmd.CombinedOutput()
+	return time.Since(start), string(out), err
+}
+
+// A run of 500s shorter than the timeout must not fail the assert: the poll
+// carries on and passes once the object comes back.
+func TestAssertSurvivesTransientServerErrors(t *testing.T) {
+	srv, gets := fakeAPIServer(t, 5)
+	elapsed, out, err := runChainsaw(t, srv.URL)
+	if err != nil {
+		t.Fatalf("chainsaw failed after %s and %d GETs of the object, want a pass once the 500s stop:\n%s", elapsed, gets.Load(), out)
+	}
+	if gets.Load() <= 5 {
+		t.Fatalf("chainsaw passed after only %d GETs of the object, so it never saw the 500s:\n%s", gets.Load(), out)
+	}
+}
+
+// When the 500s never stop, the assert still fails, and it fails by its own
+// timeout rather than on the first error.
+func TestAssertFailsAtItsTimeoutOnPersistentServerErrors(t *testing.T) {
+	srv, gets := fakeAPIServer(t, -1)
+	elapsed, out, err := runChainsaw(t, srv.URL)
+	if err == nil {
+		t.Fatalf("chainsaw passed against an apiserver that only answers 500:\n%s", out)
+	}
+	if elapsed < assertTimeout || gets.Load() < 2 {
+		t.Fatalf("chainsaw failed after %s and %d GETs of the object, want the %s assert timeout and more than one GET:\n%s", elapsed, gets.Load(), assertTimeout, out)
+	}
+}
diff --git a/packages/core/testing/images/e2e-sandbox/patches/0001-fix-assert-polling-error.patch b/packages/core/testing/images/e2e-sandbox/patches/0001-fix-assert-polling-error.patch
new file mode 100644
index 0000000000..99b799d556
--- /dev/null
+++ b/packages/core/testing/images/e2e-sandbox/patches/0001-fix-assert-polling-error.patch
@@ -0,0 +1,247 @@
+From dcbe912b15be1060c741b88d275b2134b29a2704 Mon Sep 17 00:00:00 2001
+From: Shubham Singh <shubhsoch@gmail.com>
+Date: Mon, 3 Aug 2026 16:18:17 +0530
+Subject: [PATCH] fix: assert-polling-error
+
+Upstream: https://github.com/kyverno/chainsaw/pull/2761
+
+Signed-off-by: Shubham Singh <shubhsoch@gmail.com>
+---
+ pkg/engine/operations/assert/operation.go     | 10 ++-
+ .../operations/assert/operation_test.go       |  8 +-
+ pkg/engine/operations/error/operation.go      |  9 ++-
+ pkg/engine/operations/error/operation_test.go |  4 +-
+ pkg/engine/operations/internal/errors.go      | 18 +++++
+ pkg/engine/operations/internal/errors_test.go | 81 +++++++++++++++++++
+ 6 files changed, 122 insertions(+), 8 deletions(-)
+ create mode 100644 pkg/engine/operations/internal/errors.go
+ create mode 100644 pkg/engine/operations/internal/errors_test.go
+
+diff --git a/pkg/engine/operations/assert/operation.go b/pkg/engine/operations/assert/operation.go
+index c457d7d64..0b70fe05d 100644
+--- a/pkg/engine/operations/assert/operation.go
++++ b/pkg/engine/operations/assert/operation.go
+@@ -3,6 +3,7 @@ package assert
+ import (
+ 	"context"
+ 	"errors"
++	"fmt"
+ 
+ 	"github.com/kyverno/chainsaw/pkg/apis"
+ 	"github.com/kyverno/chainsaw/pkg/apis/v1alpha1"
+@@ -100,6 +101,10 @@ func (o *operation) execute(ctx context.Context, bindings apis.Bindings, obj uns
+ 					errs = append(errs, errors.New("actual resource not found"))
+ 					return false, nil
+ 				}
++				if internal.IsRetriable(err) {
++					errs = append(errs, err)
++					return false, nil
++				}
+ 				return false, err
+ 			} else if len(candidates) == 0 {
+ 				errs = append(errs, errors.New("no actual resource found"))
+@@ -127,7 +132,10 @@ func (o *operation) execute(ctx context.Context, bindings apis.Bindings, obj uns
+ 	}
+ 	// eventually return a combination of last errors
+ 	if len(lastErrs) != 0 {
+-		return multierr.Combine(lastErrs...)
++		return multierr.Append(
++			multierr.Combine(lastErrs...),
++			fmt.Errorf("operation terminated with error: %w", err),
++		)
+ 	}
+ 	// return received error
+ 	return err
+diff --git a/pkg/engine/operations/assert/operation_test.go b/pkg/engine/operations/assert/operation_test.go
+index cf5b64c59..7ceea5c98 100644
+--- a/pkg/engine/operations/assert/operation_test.go
++++ b/pkg/engine/operations/assert/operation_test.go
+@@ -96,7 +96,7 @@ func Test_operationAssert(t *testing.T) {
+ 		expectErr: true,
+ 		expectedLogs: []string{
+ 			"ASSERT: RUN - []",
+-			"ASSERT: ERROR - [=== ERROR\n---------------\nv1/Pod/test-pod\n---------------\n* spec.containers[0].image: Invalid value: \"fake-image\": Expected value: \"test-image\"\n* spec.containers[0].name: Invalid value: \"fake-container\": Expected value: \"test-container\"\n\n--- expected\n+++ actual\n@@ -4,6 +4,6 @@\n   name: test-pod\n spec:\n   containers:\n-  - image: test-image\n-    name: test-container\n+  - image: fake-image\n+    name: fake-container]",
++			"ASSERT: ERROR - [=== ERROR\n---------------\nv1/Pod/test-pod\n---------------\n* spec.containers[0].image: Invalid value: \"fake-image\": Expected value: \"test-image\"\n* spec.containers[0].name: Invalid value: \"fake-container\": Expected value: \"test-container\"\n\n--- expected\n+++ actual\n@@ -4,6 +4,6 @@\n   name: test-pod\n spec:\n   containers:\n-  - image: test-image\n-    name: test-container\n+  - image: fake-image\n+    name: fake-container\n \n\noperation terminated with error: context deadline exceeded]",
+ 		},
+ 	}, {
+ 		name: "Not found using Get",
+@@ -117,7 +117,7 @@ func Test_operationAssert(t *testing.T) {
+ 			},
+ 		},
+ 		expectErr:    true,
+-		expectedLogs: []string{"ASSERT: RUN - []", "ASSERT: ERROR - [=== ERROR\nactual resource not found]"},
++		expectedLogs: []string{"ASSERT: RUN - []", "ASSERT: ERROR - [=== ERROR\nactual resource not found\noperation terminated with error: context deadline exceeded]"},
+ 	}, {
+ 		name: "Bad assert",
+ 		expected: unstructured.Unstructured{
+@@ -176,7 +176,7 @@ func Test_operationAssert(t *testing.T) {
+ 				return nil
+ 			},
+ 		},
+-		expectedLogs: []string{"ASSERT: RUN - []", "ASSERT: ERROR - [=== ERROR\n---------------\nv1/Pod/test-pod\n---------------\n* spec.foo: Required value: field not found in the input object\n\n--- expected\n+++ actual\n@@ -2,6 +2,5 @@\n kind: Pod\n metadata:\n   name: test-pod\n-spec:\n-  foo: bar\n+spec: {}]"},
++		expectedLogs: []string{"ASSERT: RUN - []", "ASSERT: ERROR - [=== ERROR\n---------------\nv1/Pod/test-pod\n---------------\n* spec.foo: Required value: field not found in the input object\n\n--- expected\n+++ actual\n@@ -2,6 +2,5 @@\n kind: Pod\n metadata:\n   name: test-pod\n-spec:\n-  foo: bar\n+spec: {}\n \n\noperation terminated with error: context deadline exceeded]"},
+ 		expectErr:    true,
+ 	}, {
+ 		name: "Successful match using List",
+@@ -243,7 +243,7 @@ func Test_operationAssert(t *testing.T) {
+ 			},
+ 		},
+ 		expectErr:    true,
+-		expectedLogs: []string{"ASSERT: RUN - []", "ASSERT: ERROR - [=== ERROR\nno actual resource found]"},
++		expectedLogs: []string{"ASSERT: RUN - []", "ASSERT: ERROR - [=== ERROR\nno actual resource found\noperation terminated with error: context deadline exceeded]"},
+ 	}, {
+ 		name: "List operation fails",
+ 		expected: unstructured.Unstructured{
+diff --git a/pkg/engine/operations/error/operation.go b/pkg/engine/operations/error/operation.go
+index 031f1c2eb..8fcf2ee39 100644
+--- a/pkg/engine/operations/error/operation.go
++++ b/pkg/engine/operations/error/operation.go
+@@ -95,6 +95,10 @@ func (o *operation) execute(ctx context.Context, bindings apis.Bindings, obj uns
+ 				if kerrors.IsNotFound(err) {
+ 					return true, nil
+ 				}
++				if internal.IsRetriable(err) {
++					errs = append(errs, err)
++					return false, nil
++				}
+ 				return false, err
+ 			} else if len(candidates) == 0 {
+ 				return true, nil
+@@ -119,7 +123,10 @@ func (o *operation) execute(ctx context.Context, bindings apis.Bindings, obj uns
+ 	}
+ 	// eventually return a combination of last errors
+ 	if len(lastErrs) != 0 {
+-		return multierr.Combine(lastErrs...)
++		return multierr.Append(
++			multierr.Combine(lastErrs...),
++			fmt.Errorf("operation terminated with error: %w", err),
++		)
+ 	}
+ 	// return received error
+ 	return err
+diff --git a/pkg/engine/operations/error/operation_test.go b/pkg/engine/operations/error/operation_test.go
+index 0280b2cb2..e2be30464 100644
+--- a/pkg/engine/operations/error/operation_test.go
++++ b/pkg/engine/operations/error/operation_test.go
+@@ -80,8 +80,8 @@ func Test_operationError(t *testing.T) {
+ 				return nil
+ 			},
+ 		},
+-		expectedErr:  fmt.Errorf("v1/Pod/foo/test-pod - resource matches expectation"),
+-		expectedLogs: []string{"ERROR: RUN - []", "ERROR: ERROR - [=== ERROR\nv1/Pod/foo/test-pod - resource matches expectation]"},
++		expectedErr:  fmt.Errorf("v1/Pod/foo/test-pod - resource matches expectation; operation terminated with error: context deadline exceeded"),
++		expectedLogs: []string{"ERROR: RUN - []", "ERROR: ERROR - [=== ERROR\noperation terminated with error: context deadline exceeded\nv1/Pod/foo/test-pod - resource matches expectation]"},
+ 	}, {
+ 		name: "Bad assert",
+ 		expected: unstructured.Unstructured{
+diff --git a/pkg/engine/operations/internal/errors.go b/pkg/engine/operations/internal/errors.go
+new file mode 100644
+index 000000000..dacff7efd
+--- /dev/null
++++ b/pkg/engine/operations/internal/errors.go
+@@ -0,0 +1,18 @@
++package internal
++
++import (
++	kerrors "k8s.io/apimachinery/pkg/api/errors"
++)
++
++// IsRetriable checks if an error from the API server is a transient error that should be retried.
++func IsRetriable(err error) bool {
++	if err == nil {
++		return false
++	}
++	return kerrors.IsInternalError(err) ||
++		kerrors.IsServiceUnavailable(err) ||
++		kerrors.IsTimeout(err) ||
++		kerrors.IsServerTimeout(err) ||
++		kerrors.IsTooManyRequests(err) ||
++		kerrors.IsUnexpectedServerError(err)
++}
+diff --git a/pkg/engine/operations/internal/errors_test.go b/pkg/engine/operations/internal/errors_test.go
+new file mode 100644
+index 000000000..012d16c0d
+--- /dev/null
++++ b/pkg/engine/operations/internal/errors_test.go
+@@ -0,0 +1,81 @@
++package internal
++
++import (
++	"errors"
++	"testing"
++
++	"github.com/stretchr/testify/assert"
++	kerrors "k8s.io/apimachinery/pkg/api/errors"
++	"k8s.io/apimachinery/pkg/runtime/schema"
++)
++
++func TestIsRetriable(t *testing.T) {
++	tests := []struct {
++		name     string
++		err      error
++		expected bool
++	}{
++		{
++			name:     "nil error",
++			err:      nil,
++			expected: false,
++		},
++		{
++			name:     "generic error",
++			err:      errors.New("some error"),
++			expected: false,
++		},
++		{
++			name:     "forbidden error",
++			err:      kerrors.NewForbidden(schema.GroupResource{Group: "", Resource: "pods"}, "test-pod", errors.New("forbidden")),
++			expected: false,
++		},
++		{
++			name:     "unauthorized error",
++			err:      kerrors.NewUnauthorized("unauthorized"),
++			expected: false,
++		},
++		{
++			name:     "bad request error",
++			err:      kerrors.NewBadRequest("bad request"),
++			expected: false,
++		},
++		{
++			name:     "internal error",
++			err:      kerrors.NewInternalError(errors.New("internal server error")),
++			expected: true,
++		},
++		{
++			name:     "service unavailable error",
++			err:      kerrors.NewServiceUnavailable("service unavailable"),
++			expected: true,
++		},
++		{
++			name:     "timeout error",
++			err:      kerrors.NewTimeoutError("timeout", 10),
++			expected: true,
++		},
++		{
++			name:     "server timeout error",
++			err:      kerrors.NewServerTimeout(schema.GroupResource{Group: "", Resource: "pods"}, "get", 10),
++			expected: true,
++		},
++		{
++			name:     "too many requests error",
++			err:      kerrors.NewTooManyRequests("too many requests", 10),
++			expected: true,
++		},
++		{
++			name:     "unexpected server error",
++			err:      kerrors.NewGenericServerResponse(500, "GET", schema.GroupResource{Group: "", Resource: "pods"}, "test-pod", "unexpected body", 0, false),
++			expected: true,
++		},
++	}
++
++	for _, tt := range tests {
++		t.Run(tt.name, func(t *testing.T) {
++			actual := IsRetriable(tt.err)
++			assert.Equal(t, tt.expected, actual)
++		})
++	}
++}
diff --git a/packages/core/testing/values.yaml b/packages/core/testing/values.yaml
index 1821d8fabd..7e3c1739ae 100644
--- a/packages/core/testing/values.yaml
+++ b/packages/core/testing/values.yaml
@@ -1,2 +1,2 @@
 e2e:
-  image: ghcr.io/cozystack/cozystack/e2e-sandbox:v1.4.0-rc.2@sha256:0367a03b981df2a3ea13f411d4cb7869c2bf2c89c07d3d5c8971b9a28921ccef
+  image: ghcr.io/cozystack/cozystack/e2e-sandbox:v1.6.0@sha256:a9980e8c48d6e50ed2b5d8245a4e0aae00970777b6e2255577fdb66035a44c68
diff --git a/packages/extra/bootbox/Makefile b/packages/extra/bootbox/Makefile
index 57fa0a77d5..80a0f7d01a 100644
--- a/packages/extra/bootbox/Makefile
+++ b/packages/extra/bootbox/Makefile
@@ -3,6 +3,9 @@ NAMESPACE=tenant-root
 
 include ../../../hack/package.mk
 
+test:
+	helm unittest .
+
 generate:
 	cozyvalues-gen -v values.yaml -s values.schema.json -r README.md
 	../../../hack/update-crd.sh
diff --git a/packages/extra/bootbox/images/matchbox.tag b/packages/extra/bootbox/images/matchbox.tag
index a45bddb94a..5d086145d8 100644
--- a/packages/extra/bootbox/images/matchbox.tag
+++ b/packages/extra/bootbox/images/matchbox.tag
@@ -1 +1 @@
-ghcr.io/cozystack/cozystack/matchbox:v1.4.0-rc.2@sha256:bfb81c61cbe44d8f362ea40c5f4f4a109eaa7c7da05838b3b52811e538815b41
+ghcr.io/cozystack/cozystack/matchbox:v1.6.0@sha256:7805917462ad1288272a6324c0f32a4f9a250e1723a2759f7afebce181400f96
diff --git a/packages/extra/bootbox/templates/matchbox/configmaps.yaml b/packages/extra/bootbox/templates/matchbox/configmaps.yaml
index 6b95b4f531..76f5e08b21 100644
--- a/packages/extra/bootbox/templates/matchbox/configmaps.yaml
+++ b/packages/extra/bootbox/templates/matchbox/configmaps.yaml
@@ -22,6 +22,25 @@ data:
         ]
       }
     }
+  arm64.json: |
+    {
+      "id": "arm64",
+      "name": "arm64",
+      "boot": {
+        "kernel": "/assets/vmlinuz-arm64",
+        "initrd": ["/assets/initramfs-arm64.xz"],
+        "args": [
+          "initrd=initramfs-arm64.xz",
+          "init_on_alloc=1",
+          "slab_nomerge",
+          "pti=on",
+          "console=tty0",
+          "console=ttyAMA0",
+          "printk.devkmsg=on",
+          "talos.platform=metal"
+        ]
+      }
+    }
 ---
 apiVersion: v1
 kind: ConfigMap
@@ -34,6 +53,15 @@ data:
       "name": "default",
       "profile": "default"
     }
+  arm64.json: |
+    {
+      "id": "arm64",
+      "name": "arm64",
+      "profile": "arm64",
+      "selector": {
+        "arch": "arm64"
+      }
+    }
 ---
 apiVersion: v1
 kind: ConfigMap
diff --git a/packages/extra/bootbox/templates/matchbox/deployment.yaml b/packages/extra/bootbox/templates/matchbox/deployment.yaml
index 470c2814f8..2c801ea4f1 100644
--- a/packages/extra/bootbox/templates/matchbox/deployment.yaml
+++ b/packages/extra/bootbox/templates/matchbox/deployment.yaml
@@ -29,6 +29,13 @@ spec:
           - name: http
             containerPort: 8080
             protocol: TCP
+        resources:
+          limits:
+            cpu: 200m
+            memory: 256Mi
+          requests:
+            cpu: 50m
+            memory: 128Mi
       volumes:
         - name: profiles-volume
           configMap:
diff --git a/packages/extra/bootbox/templates/matchbox/ingress.yaml b/packages/extra/bootbox/templates/matchbox/ingress.yaml
index 5eef34893f..1b5bb3bed5 100644
--- a/packages/extra/bootbox/templates/matchbox/ingress.yaml
+++ b/packages/extra/bootbox/templates/matchbox/ingress.yaml
@@ -1,27 +1,38 @@
 {{- $solver := (index .Values._cluster "solver") | default "http01" }}
 {{- $clusterIssuer := (index .Values._cluster "issuer-name") | default "letsencrypt-prod" }}
 {{- $ingress := .Values._namespace.ingress }}
-{{- $host := .Values._namespace.host }}
+{{- $host := include "cozy-lib.ns-host-required" . }}
+{{- $wildcardSecret := (index .Values._cluster "wildcard-secret-name") | default "" }}
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: bootbox
   labels:
     app: bootbox
+  {{- /* Operator wildcard mode: nginx serves the default SSL cert, so skip per-host ACME. Render annotations only when something remains. */}}
+  {{- if or (not $wildcardSecret) .Values.whitelistHTTP }}
   annotations:
+    {{- if not $wildcardSecret }}
     {{- if eq $solver "http01" }}
     acme.cert-manager.io/http01-ingress-ingressclassname: {{ $ingress }}
     {{- end }}
     cert-manager.io/cluster-issuer: {{ $clusterIssuer }}
+    {{- end }}
     {{- if .Values.whitelistHTTP }}
     nginx.ingress.kubernetes.io/whitelist-source-range: "{{ join "," (.Values.whitelist | default "0.0.0.0/32") }}"
     {{- end }}
+  {{- end }}
 spec:
   ingressClassName: {{ $ingress }}
   tls:
     - hosts:
         - "{{ printf "bootbox.%s" (.Values.host | default $host) }}"
+      {{- /* Operator wildcard mode: no per-host secret — ingress-nginx falls
+             back to the default SSL certificate while the tls section keeps
+             the HTTP-to-HTTPS redirect enforced. */}}
+      {{- if not $wildcardSecret }}
       secretName: bootbox-tls
+      {{- end }}
   rules:
     - host: "{{ printf "bootbox.%s" (.Values.host | default $host) }}"
       http:
diff --git a/packages/extra/bootbox/templates/matchbox/machines.yaml b/packages/extra/bootbox/templates/matchbox/machines.yaml
index a52c4b402e..02ba9b7e6c 100644
--- a/packages/extra/bootbox/templates/matchbox/machines.yaml
+++ b/packages/extra/bootbox/templates/matchbox/machines.yaml
@@ -1,4 +1,4 @@
-{{- $host := .Values._namespace.host }}
+{{- $host := include "cozy-lib.ns-host-required" . }}
 
 {{ range $m := .Values.machines }}
 ---
diff --git a/packages/extra/bootbox/tests/host_guard_machines_test.yaml b/packages/extra/bootbox/tests/host_guard_machines_test.yaml
new file mode 100644
index 0000000000..be8ad458b1
--- /dev/null
+++ b/packages/extra/bootbox/tests/host_guard_machines_test.yaml
@@ -0,0 +1,41 @@
+suite: bootbox machines guards an empty apex in isolation
+templates:
+  - templates/matchbox/machines.yaml
+
+release:
+  name: bootbox
+  namespace: tenant-root
+
+# The guard sits at the top of machines.yaml, before the machines range, so the
+# failing case needs no machines (the default [] is schema-valid). The positive
+# case supplies a schema-complete machine to emit a Hardware object.
+
+tests:
+  - it: fails when _namespace is injected with an empty host and no host override
+    set:
+      _namespace:
+        host: ""
+        ingress: tenant-root
+    asserts:
+      - failedTemplate:
+          errorMessage: "the tenant apex (_namespace.host) is empty and this app sets no host override, so its ingress hostname would be malformed. Set tenant.spec.host on this tenant, inherit it from a parent that has host set, or set this app's host value."
+
+  - it: renders the iPXE URL from the apex when it is set
+    set:
+      _namespace:
+        host: example.org
+        ingress: tenant-root
+      machines:
+        - arch: x86_64
+          hostname: node1
+          mac: ["aa:bb:cc:dd:ee:ff"]
+          uefi: true
+          leaseTime: 3600
+          ip:
+            address: 192.0.2.10
+            gateway: 192.0.2.1
+            netmask: 255.255.255.0
+    asserts:
+      - equal:
+          path: spec.interfaces[0].netboot.ipxe.url
+          value: "https://bootbox.example.org/boot.ipxe"
diff --git a/packages/extra/bootbox/tests/host_guard_test.yaml b/packages/extra/bootbox/tests/host_guard_test.yaml
new file mode 100644
index 0000000000..aaabe69cb3
--- /dev/null
+++ b/packages/extra/bootbox/tests/host_guard_test.yaml
@@ -0,0 +1,37 @@
+suite: bootbox ingress fails on an empty apex
+
+templates:
+  - templates/matchbox/ingress.yaml
+
+release:
+  name: bootbox
+  namespace: tenant-root
+
+# The matchbox Ingress host is bootbox.<_namespace.host>. cozy-lib.ns-host-required
+# guards the apex, so an empty apex fails the render.
+
+tests:
+  - it: fails when the apex is empty and no host override
+    set:
+      _namespace:
+        host: ""
+        ingress: tenant-root
+      _cluster:
+        issuer-name: letsencrypt-prod
+        solver: http01
+    asserts:
+      - failedTemplate:
+          errorMessage: "the tenant apex (_namespace.host) is empty and this app sets no host override, so its ingress hostname would be malformed. Set tenant.spec.host on this tenant, inherit it from a parent that has host set, or set this app's host value."
+
+  - it: renders the ingress when the apex is set
+    set:
+      _namespace:
+        host: example.org
+        ingress: tenant-root
+      _cluster:
+        issuer-name: letsencrypt-prod
+        solver: http01
+    asserts:
+      - equal:
+          path: kind
+          value: Ingress
diff --git a/packages/extra/bootbox/tests/ingress_wildcard_test.yaml b/packages/extra/bootbox/tests/ingress_wildcard_test.yaml
new file mode 100644
index 0000000000..212eeaa167
--- /dev/null
+++ b/packages/extra/bootbox/tests/ingress_wildcard_test.yaml
@@ -0,0 +1,78 @@
+suite: bootbox ingress wildcard mode drops per-host ACME
+templates:
+  - templates/matchbox/ingress.yaml
+
+release:
+  name: bootbox
+  namespace: tenant-root
+
+# bootbox deploys into tenant-root and uses the publishing tenant's
+# ingress controller (_namespace.ingress), so in wildcard mode it must
+# also stop minting its own per-host ACME cert. The cert-manager + http01
+# annotations and the per-host tls secretName are dropped; the tls
+# section itself stays so the HTTPS redirect keeps working against the
+# default SSL certificate. bootbox's only other annotation
+# (whitelist-source-range) is conditional, so the annotations
+# block must collapse entirely when wildcard is set and no whitelist is
+# configured.
+
+tests:
+  - it: collapses the annotations block and drops tls secretName when wildcard set and no whitelist
+    set:
+      whitelistHTTP: false
+      _namespace:
+        host: example.org
+        ingress: tenant-root
+      _cluster:
+        issuer-name: letsencrypt-prod
+        solver: http01
+        wildcard-secret-name: wildcard-tls
+    asserts:
+      - equal:
+          path: kind
+          value: Ingress
+      - notExists:
+          path: metadata.annotations
+      - exists:
+          path: spec.tls
+      - notExists:
+          path: spec.tls[0].secretName
+
+  - it: keeps cert-manager annotation and tls secretName without wildcard secret
+    set:
+      _namespace:
+        host: example.org
+        ingress: tenant-root
+      _cluster:
+        issuer-name: letsencrypt-prod
+        solver: http01
+    asserts:
+      - equal:
+          path: metadata.annotations["cert-manager.io/cluster-issuer"]
+          value: letsencrypt-prod
+      - equal:
+          path: spec.tls[0].secretName
+          value: bootbox-tls
+
+  - it: keeps whitelist annotation but drops cert-manager when wildcard set with whitelist
+    set:
+      whitelistHTTP: true
+      whitelist:
+        - "192.0.2.0/24"
+      _namespace:
+        host: example.org
+        ingress: tenant-root
+      _cluster:
+        issuer-name: letsencrypt-prod
+        solver: http01
+        wildcard-secret-name: wildcard-tls
+    asserts:
+      - notExists:
+          path: metadata.annotations["cert-manager.io/cluster-issuer"]
+      - equal:
+          path: metadata.annotations["nginx.ingress.kubernetes.io/whitelist-source-range"]
+          value: "192.0.2.0/24"
+      - exists:
+          path: spec.tls
+      - notExists:
+          path: spec.tls[0].secretName
diff --git a/packages/apps/http-cache/.helmignore b/packages/extra/computeplane/.helmignore
similarity index 100%
rename from packages/apps/http-cache/.helmignore
rename to packages/extra/computeplane/.helmignore
diff --git a/packages/extra/computeplane/Chart.yaml b/packages/extra/computeplane/Chart.yaml
new file mode 100644
index 0000000000..7fc1fd7709
--- /dev/null
+++ b/packages/extra/computeplane/Chart.yaml
@@ -0,0 +1,6 @@
+apiVersion: v2
+name: computeplane
+description: Managed, isolated environment for running code-executing apps
+icon: /logos/computeplane.svg
+type: application
+version: 0.0.0 # Placeholder, the actual version will be automatically set during the build process
diff --git a/packages/extra/computeplane/Makefile b/packages/extra/computeplane/Makefile
new file mode 100644
index 0000000000..a55a75cb9c
--- /dev/null
+++ b/packages/extra/computeplane/Makefile
@@ -0,0 +1,11 @@
+NAME=computeplane
+
+include ../../../hack/package.mk
+
+.PHONY: test
+test:
+	helm unittest .
+
+generate:
+	cozyvalues-gen -v values.yaml -s values.schema.json -r README.md
+	../../../hack/update-crd.sh
diff --git a/packages/extra/computeplane/README.md b/packages/extra/computeplane/README.md
new file mode 100644
index 0000000000..fe6c1af676
--- /dev/null
+++ b/packages/extra/computeplane/README.md
@@ -0,0 +1,62 @@
+# ComputePlane
+
+A managed, isolated environment for running code-executing (untrusted-code)
+catalog applications — notebooks, workflow "code" nodes, plugin systems.
+
+This tenant module provisions a single-tenant, Cozystack-managed cluster by
+deploying the ordinary `apps/kubernetes` chart (Kamaji control plane +
+KubeVirt-VM worker nodes) with operator-fixed values, sourced from this
+package's own source-only `ExternalArtifact`
+(`cozystack-computeplane-application-kubevirt-kubernetes`). The tenant gets the
+same substrate as any managed `kind: Kubernetes` cluster, but holds no admin
+kubeconfig for it. The security posture (Cozystack-enablement addons, withheld
+credentials) is baked into the chart and cannot be overridden; the one
+tenant-facing knob is `nodeGroups` — the module forwards only the documented per-pool fields to the pool chart, so any other `NodeGroup` field (e.g. `talos`, `version`, `images`) is silently dropped: accepted but inert.
+
+The cluster `HelmRelease` is named `computeplane-cluster` and its release name
+is derived from it, so Kamaji writes the admin kubeconfig to the Secret
+`computeplane-cluster-admin-kubeconfig` (key `super-admin.svc`) — the derived
+contract consumed by the HelmReleases of `placement: ComputePlane`
+applications. The tenant never sees that Secret: tenant-visible secrets are an
+allowlist, and this module's `ApplicationDefinition` includes nothing, which
+withholds every Secret in the module's lineage by construction.
+
+**Prerequisite:** an `etcd` module must be available to the tenant — its own,
+or one inherited from an ancestor tenant (the `_namespace.etcd` context
+propagates down the tenant tree, so enabling a redundant local etcd is not
+required). The tenant Kubernetes machinery — including the cluster-autoscaler
+that brings up the default scale-from-zero `md0` node group — is backed by
+that etcd; without it the wrapped chart collapses to its `awaiting-etcd`
+status beacon and the ComputePlane provisions no control plane or workers
+(the HelmReleases still report Ready over the empty shell, so check for the
+beacon ConfigMap when nothing comes up).
+
+See the full design in
+[cozystack/community design-proposals/compute-plane](https://github.com/cozystack/community/tree/main/design-proposals/compute-plane).
+
+## Parameters
+
+### Cluster shape
+
+| Name                                            | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | Type                | Value       |
+| ----------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------- | ----------- |
+| `nodeGroups`                                    | Worker node groups of the ComputePlane cluster (cluster shape only — the security posture is fixed by the module and cannot be overridden through this knob: the module forwards only the documented per-pool fields to the `kubernetes-nodes` pool chart, so any other `NodeGroup` field, e.g. `talos`/`version`/`images`, is silently dropped — accepted but inert). Same structure as the `kubernetes` application's `nodeGroups`. When left empty, the module itself materialises a default scale-from-zero `md0` pool with `roles: [ingress-nginx]` (the wrapped `kubernetes` chart no longer injects one after the Phase 2 split), so the cluster sits idle until a pending Pod (e.g. the ingress-nginx controller) triggers the cluster-autoscaler. Supplied groups are authoritative (not merged with the default), so at least one of them must carry `roles: [ingress-nginx]` — enforced at render time. Each supplied pool key must be at most 15 characters so its `kubernetes-nodes-computeplane-cluster-<pool>` HelmRelease name fits Helm's 53-character limit — also enforced at render time. | `map[string]object` | `{}`        |
+| `nodeGroups[name].minReplicas`                  | Minimum number of replicas.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | `int`               | `0`         |
+| `nodeGroups[name].maxReplicas`                  | Maximum number of replicas.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | `int`               | `10`        |
+| `nodeGroups[name].instanceType`                 | Virtual machine instance type.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        | `string`            | `u1.medium` |
+| `nodeGroups[name].diskSize`                     | System disk size for the worker VM. Carries the Talos OS image, kubelet state, containerd image cache, and any local-path PVCs.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       | `quantity`          | `20Gi`      |
+| `nodeGroups[name].storageClass`                 | StorageClass for worker node persistent disks. When empty, the `kubernetes-nodes` pool chart applies its own default (`replicated`).                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | `string`            | `""`        |
+| `nodeGroups[name].roles`                        | List of node roles. At least one group must carry `ingress-nginx` — the module pins the ingress-nginx addon on, and its controller only schedules onto nodes with that role (enforced at render time).                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              | `[]string`          | `[]`        |
+| `nodeGroups[name].resources`                    | Explicit CPU and memory for each worker node, as an alternative to `instanceType` sizing. Set both `cpu` and `memory` together or neither.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | `object`            | `{}`        |
+| `nodeGroups[name].resources.cpu`                | CPU available.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        | `quantity`          | `""`        |
+| `nodeGroups[name].resources.memory`             | Memory (RAM) available.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | `quantity`          | `""`        |
+| `nodeGroups[name].gpus`                         | List of GPUs to attach (NVIDIA driver requires at least 4 GiB RAM).                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   | `[]object`          | `[]`        |
+| `nodeGroups[name].gpus[i].name`                 | Name of GPU, such as "nvidia.com/AD102GL_L40S".                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       | `string`            | `""`        |
+| `nodeGroups[name].kubelet`                      | Kubelet resource reservations for this node group.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    | `object`            | `{}`        |
+| `nodeGroups[name].kubelet.systemReservedMemory` | Memory reserved for host OS. Auto-computed from instanceType if empty.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | `string`            | `""`        |
+| `nodeGroups[name].kubelet.kubeReservedMemory`   | Memory reserved for kubelet and container runtime. Auto-computed from instanceType if empty.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | `string`            | `""`        |
+| `nodeGroups[name].kubelet.systemReservedCpu`    | CPU reserved for host OS. Auto-computed from instanceType if empty.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   | `string`            | `""`        |
+| `nodeGroups[name].kubelet.kubeReservedCpu`      | CPU reserved for kubelet and container runtime. Auto-computed from instanceType if empty.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | `string`            | `""`        |
+| `nodeGroups[name].kubelet.evictionHardMemory`   | Hard eviction threshold for memory (absolute like 200Mi or percentage like 7%).                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       | `string`            | `7%`        |
+| `nodeGroups[name].kubelet.evictionSoftMemory`   | Soft eviction threshold for memory (absolute like 1Gi or percentage like 10%).                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        | `string`            | `10%`       |
+
diff --git a/packages/extra/computeplane/logos/computeplane.svg b/packages/extra/computeplane/logos/computeplane.svg
new file mode 100644
index 0000000000..ac4e9a6400
--- /dev/null
+++ b/packages/extra/computeplane/logos/computeplane.svg
@@ -0,0 +1,10 @@
+<svg width="144" height="144" viewBox="0 0 144 144" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="144" height="144" rx="24" fill="url(#paint0_linear_681_2845)"/>
+<path d="M71.9968 19C70.3039 19.0002 68.9312 20.5322 68.9314 22.4221C68.9314 22.4511 68.9373 22.4788 68.9379 22.5076C68.9354 22.7644 68.9231 23.0737 68.9314 23.2973C68.9717 24.3873 69.2082 25.2216 69.3506 26.2258C69.6084 28.3752 69.8245 30.1569 69.6912 31.813C69.5615 32.4375 69.1037 33.0086 68.6956 33.4056L68.6235 34.7086C66.7839 34.8617 64.9319 35.1421 63.0821 35.5641C55.1226 37.3798 48.2695 41.4991 43.052 47.0609C42.7134 46.8288 42.1211 46.4019 41.945 46.2712C41.3977 46.3454 40.8445 46.5151 40.1241 46.0935C38.7522 45.1657 37.5028 43.8851 35.991 42.3424C35.2982 41.6044 34.7966 40.9018 33.9735 40.1904C33.7866 40.0289 33.5014 39.8104 33.2923 39.6442C32.6489 39.1288 31.89 38.86 31.157 38.8348C30.2147 38.8024 29.3075 39.1725 28.7138 39.9206C27.6584 41.2506 27.9963 43.2833 29.4671 44.4614C29.482 44.4734 29.4979 44.4827 29.5129 44.4943C29.715 44.6589 29.9625 44.8698 30.1483 45.0076C31.0217 45.6555 31.8195 45.9872 32.6897 46.5015C34.5231 47.6391 36.043 48.5823 37.2486 49.7196C37.7194 50.2237 37.8016 51.1122 37.8643 51.4964L38.8468 52.3782C33.5872 60.3308 31.153 70.1539 32.5915 80.1627L31.3077 80.5378C30.9693 80.9768 30.4912 81.6676 29.9911 81.8738C28.4138 82.3729 26.6387 82.5562 24.4956 82.7819C23.4894 82.866 22.6213 82.8158 21.5546 83.0188C21.3198 83.0635 20.9927 83.1491 20.7358 83.2097C20.7269 83.2116 20.7186 83.2142 20.7096 83.2162C20.6956 83.2195 20.6772 83.2263 20.6638 83.2294C18.857 83.668 17.6963 85.3365 18.0699 86.9805C18.4437 88.6248 20.2086 89.6248 22.0262 89.2312C22.0393 89.2282 22.0584 89.2277 22.072 89.2246C22.0926 89.2199 22.1106 89.2099 22.131 89.2049C22.3844 89.149 22.7019 89.0868 22.9236 89.0272C23.9723 88.7451 24.7318 88.3306 25.6746 87.9677C27.7029 87.2368 29.3828 86.6262 31.0195 86.3883C31.703 86.3345 32.4232 86.812 32.7814 87.0134L34.1177 86.7831C37.1926 96.3613 43.6366 104.103 51.7963 108.961L51.2396 110.303C51.4403 110.824 51.6616 111.53 51.5121 112.045C50.9171 113.595 49.898 115.231 48.7374 117.055C48.1755 117.898 47.6004 118.552 47.0934 119.516C46.972 119.747 46.8175 120.102 46.7004 120.346C45.9125 122.039 46.4904 123.99 48.0038 124.722C49.5268 125.459 51.4171 124.682 52.2352 122.985C52.2364 122.982 52.2406 122.98 52.2417 122.978C52.2426 122.976 52.2409 122.973 52.2417 122.971C52.3582 122.731 52.5233 122.415 52.6216 122.188C53.056 121.189 53.2005 120.332 53.5059 119.365C54.317 117.318 54.7626 115.17 55.8791 113.832C56.1849 113.466 56.6833 113.325 57.2001 113.186L57.8944 111.922C65.008 114.665 72.9705 115.402 80.9245 113.587C82.7391 113.173 84.4908 112.637 86.1843 111.994C86.3794 112.342 86.742 113.011 86.8393 113.179C87.3644 113.351 87.9377 113.439 88.4047 114.133C89.2401 115.567 89.8114 117.263 90.5073 119.312C90.8128 120.279 90.9638 121.136 91.3981 122.136C91.4971 122.363 91.6614 122.684 91.778 122.925C92.5944 124.628 94.4907 125.407 96.0159 124.669C97.5292 123.937 98.1077 121.986 97.3194 120.293C97.2023 120.049 97.0412 119.695 96.9198 119.464C96.4127 118.499 95.8377 117.852 95.2758 117.009C94.1152 115.185 93.1526 113.67 92.5575 112.12C92.3087 111.32 92.5995 110.823 92.7933 110.303C92.6772 110.17 92.4288 109.414 92.2824 109.059C100.762 104.029 107.017 95.9985 109.955 86.7239C110.351 86.7865 111.041 86.9091 111.265 86.9542C111.726 86.6487 112.149 86.2501 112.981 86.3159C114.617 86.5537 116.297 87.1645 118.326 87.8953C119.268 88.2581 120.028 88.6793 121.077 88.9614C121.298 89.021 121.616 89.0766 121.869 89.1325C121.889 89.1375 121.908 89.1475 121.928 89.1522C121.942 89.1553 121.961 89.1558 121.974 89.1588C123.792 89.552 125.557 88.5526 125.93 86.9081C126.303 85.2641 125.143 83.5952 123.336 83.157C123.074 83.097 122.701 82.995 122.446 82.9465C121.379 82.7435 120.511 82.7935 119.505 82.7095C117.361 82.4839 115.586 82.3004 114.009 81.8014C113.366 81.5507 112.908 80.7819 112.686 80.4655L111.448 80.1035C112.09 75.438 111.917 70.5825 110.806 65.7243C109.685 60.8208 107.704 56.3361 105.062 52.3848C105.379 52.0948 105.979 51.5612 106.149 51.4043C106.199 50.8517 106.156 50.2722 106.725 49.6603C107.931 48.523 109.451 47.5799 111.284 46.4423C112.154 45.9279 112.959 45.5964 113.832 44.9484C114.03 44.8019 114.299 44.5699 114.507 44.4022C115.977 43.2237 116.316 41.1911 115.26 39.8614C114.204 38.5317 112.159 38.4065 110.688 39.585C110.479 39.7516 110.195 39.9688 110.007 40.1312C109.184 40.8426 108.676 41.5452 107.983 42.2832C106.471 43.8259 105.222 45.113 103.85 46.0409C103.255 46.3885 102.385 46.2682 101.99 46.2449L100.824 47.0806C94.1753 40.0763 85.1235 35.5982 75.3766 34.7283C75.3494 34.3179 75.3137 33.5761 75.3046 33.3529C74.9056 32.9693 74.4235 32.6418 74.3024 31.813C74.1691 30.1569 74.3917 28.3752 74.6496 26.2258C74.7919 25.2216 75.0284 24.3873 75.0688 23.2973C75.078 23.0495 75.0632 22.69 75.0622 22.4221C75.062 20.5322 73.6898 18.9998 71.9968 19ZM68.1585 42.8886L67.248 59.0447L67.1825 59.0776C67.1214 60.5229 65.9375 61.677 64.4839 61.677C63.8884 61.677 63.3388 61.4849 62.8922 61.1571L62.866 61.1703L49.6807 51.7794C53.7331 47.7759 58.9164 44.8172 64.89 43.4546C65.9812 43.2056 67.0719 43.0209 68.1585 42.8886ZM75.8417 42.8886C82.8159 43.7504 89.2657 46.9232 94.2081 51.786L81.108 61.1176L81.0621 61.0979C79.8994 61.9512 78.2611 61.7394 77.3548 60.5978C76.9835 60.1301 76.7887 59.5801 76.7653 59.0249L76.7522 59.0184L75.8417 42.8886ZM44.8991 57.814L56.9382 68.633L56.9251 68.6988C58.0117 69.6479 58.172 71.2949 57.2657 72.4368C56.8944 72.9045 56.3975 73.2182 55.8639 73.3647L55.8508 73.4173L40.4188 77.8923C39.6334 70.6765 41.3261 63.6621 44.8991 57.814ZM99.0094 57.8206C100.798 60.7336 102.153 63.9871 102.959 67.5143C103.756 70.9991 103.956 74.4778 103.627 77.8397L88.1166 73.3515L88.1035 73.2857C86.7145 72.9043 85.8609 71.4848 86.1843 70.0611C86.3168 69.4778 86.6249 68.9844 87.0423 68.6198L87.0358 68.5869L99.0094 57.8206ZM69.5274 69.4688H74.4596L77.5251 73.3186L76.4247 78.1226L71.9968 80.2614L67.5558 78.1161L66.4554 73.312L69.5274 69.4688ZM85.3393 82.6437C85.5489 82.6331 85.7576 82.652 85.9616 82.6898L85.9878 82.6569L101.95 85.3682C99.6142 91.9624 95.144 97.675 89.1711 101.498L82.9747 86.4606L82.9944 86.4343C82.4252 85.1055 82.9948 83.5472 84.3044 82.9135C84.6397 82.7513 84.99 82.6614 85.3393 82.6437ZM58.5298 82.7095C59.748 82.7267 60.8406 83.5761 61.1237 84.822C61.2562 85.4052 61.1917 85.9831 60.973 86.4935L61.0189 86.5527L54.888 101.439C49.1559 97.7432 44.5904 92.2099 42.1481 85.4208L57.9731 82.7227L57.9993 82.7556C58.1763 82.7229 58.3558 82.7071 58.5298 82.7095ZM71.8986 89.2312C72.3229 89.2155 72.7534 89.303 73.1627 89.501C73.6992 89.7606 74.1136 90.1692 74.3745 90.6592H74.4334L82.2346 104.821C81.2221 105.162 80.1813 105.454 79.1167 105.697C73.1505 107.058 67.2032 106.645 61.818 104.802L69.5995 90.6658H69.6126C70.0795 89.7888 70.965 89.2656 71.8986 89.2312Z" fill="white" stroke="white" stroke-width="0.25"/>
+<defs>
+<linearGradient id="paint0_linear_681_2845" x1="10" y1="15.5" x2="144" y2="131.5" gradientUnits="userSpaceOnUse">
+<stop stop-color="#4D87FF"/>
+<stop offset="1" stop-color="#0547D0"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/packages/extra/computeplane/templates/check-release-name.yaml b/packages/extra/computeplane/templates/check-release-name.yaml
new file mode 100644
index 0000000000..384435afd9
--- /dev/null
+++ b/packages/extra/computeplane/templates/check-release-name.yaml
@@ -0,0 +1,3 @@
+{{- if ne .Release.Name .Chart.Name }}
+{{- fail (printf "The name of the release MUST BE %s" .Chart.Name) }}
+{{- end -}}
diff --git a/packages/extra/computeplane/templates/cluster.yaml b/packages/extra/computeplane/templates/cluster.yaml
new file mode 100644
index 0000000000..82ecdc4525
--- /dev/null
+++ b/packages/extra/computeplane/templates/cluster.yaml
@@ -0,0 +1,220 @@
+{{- /*
+  ComputePlane cluster (rendered by the computeplane tenant module).
+
+  Provisions a single-tenant, Cozystack-managed cluster for untrusted-code
+  workloads by deploying the ordinary `apps/kubernetes` chart (Kamaji control
+  plane + KubeVirt-VM worker nodes) with operator-fixed values. The chart is
+  sourced from this package's own source-only ExternalArtifact (see
+  packages/core/platform/sources/computeplane-application.yaml), so the module
+  is self-contained.
+
+  The HelmRelease is named computeplane-cluster (the module's own HelmRelease
+  occupies the object name "computeplane" in the tenant namespace) and sets no
+  spec.releaseName: the aggregated API cannot represent releaseName — the
+  conversion rebuilds HelmRelease specs without it — so both releases must let
+  Flux derive the name from the object name, like every other tenant module.
+  Kamaji therefore writes the cluster's admin kubeconfig to the Secret
+  `computeplane-cluster-admin-kubeconfig` (key super-admin.svc) — the derived
+  contract consumed by the HelmReleases of `placement: ComputePlane`
+  applications. The tenant never sees it: tenant-visible secrets are an
+  allowlist (computeplane-rd declares include: [], which withholds
+  everything), so the withholding is rename-proof by construction. Renaming
+  this object still renames the Secret and dangles every consumer; don't.
+
+  Everything security-relevant is fixed here and unreachable by the tenant:
+  the tenant holds no admin kubeconfig for this cluster and the module exposes
+  cluster *shape* only (nodeGroups). See design-proposals/compute-plane in
+  cozystack/community.
+
+  install/upgrade.disableWait mirrors how the managed `kubernetes` app is
+  reconciled elsewhere: it emits child HelmReleases (cilium/coredns/csi/…) and
+  a talos-reconcile Job that cannot become Ready until worker nodes exist, so
+  the parent must not block on them.
+*/}}
+{{- /*
+  Supplied nodeGroups are authoritative — the wrapped chart does not merge
+  them with its default md0 (which carries roles: [ingress-nginx]) — while the
+  module pins the ingress-nginx addon on and its controller only schedules
+  onto nodes with that role. Without this guard, any tenant-supplied
+  nodeGroups lacking the role would leave the controller Pending forever and
+  the ComputePlane ingress would never come up.
+*/}}
+{{- $clusterRelease := "computeplane-cluster" }}
+{{- if .Values.nodeGroups }}
+{{- $hasIngressRole := false }}
+{{- range $name, $group := .Values.nodeGroups }}
+{{- if and (has "ingress-nginx" (default (list) $group.roles)) (gt (int (default 0 $group.maxReplicas)) 0) }}
+{{- $hasIngressRole = true }}
+{{- end }}
+{{- /* The pool key becomes the pool HelmRelease name and its CAPI object names,
+       which must be RFC-1123 labels. The NodeGroup schema has no propertyNames
+       pattern, so an uppercase/underscore key renders an invalid metadata.name the
+       apiserver rejects, and a key with a ':' renders invalid YAML that fails the
+       whole module render. Guard it here so the failure is uniform and early,
+       alongside the length check (mirrors migration 56's RFC-1123 child-name
+       guard). */}}
+{{- if not (regexMatch "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$" $name) }}
+{{- fail (printf "computeplane: nodeGroup key %q is not a valid RFC-1123 label (lowercase alphanumeric and '-', must start and end alphanumeric); it would render an invalid pool HelmRelease name. Rename the pool." $name) }}
+{{- end }}
+{{- /* Helm caps a HelmRelease name at 53 chars. Every pool renders
+       kubernetes-nodes-<clusterRelease>-<pool>; with clusterRelease
+       "computeplane-cluster" that is a 38-char fixed prefix, so a pool key longer
+       than 15 chars yields a name the apiserver accepts as a valid DNS-1123
+       subdomain but Flux then never reconciles, with no other signal. The
+       NodeGroup schema puts no maxLength on the key, so guard it here at render
+       time (mirrors the aggregated API's validateNameLength and migration 56's
+       overflow branch — the same 53-char cap this split hits on every other
+       path). Derived from $clusterRelease so it cannot drift from the name
+       rendered below. */}}
+{{- $childName := printf "kubernetes-nodes-%s-%s" $clusterRelease $name }}
+{{- if gt (len $childName) 53 }}
+{{- $budget := sub 53 (len (printf "kubernetes-nodes-%s-" $clusterRelease)) }}
+{{- fail (printf "computeplane: nodeGroup %q renders pool HelmRelease name %q (%d chars), which exceeds Helm's 53-char limit; the release would be created but never reconcile. Rename the pool to at most %d characters." $name $childName (len $childName) $budget) }}
+{{- end }}
+{{- end }}
+{{- if not $hasIngressRole }}
+{{- fail "computeplane: at least one nodeGroup must carry roles: [ingress-nginx] with maxReplicas >= 1 — the module pins the ingress-nginx addon on, and its controller only schedules onto ingress-nginx nodes" }}
+{{- end }}
+{{- end }}
+apiVersion: helm.toolkit.fluxcd.io/v2
+kind: HelmRelease
+metadata:
+  name: computeplane-cluster
+  labels:
+    sharding.fluxcd.io/key: tenants
+    # No in-tree reader yet: this is the selector hook for the deferred
+    # placement: ComputePlane routing in cozystack-api (and for operators
+    # locating ComputePlane cluster releases) — do not remove as dead.
+    internal.cozystack.io/computeplane: "true"
+spec:
+  chartRef:
+    kind: ExternalArtifact
+    name: cozystack-computeplane-application-kubevirt-kubernetes
+    namespace: cozy-system
+  interval: 5m
+  timeout: 30m
+  install:
+    disableWait: true
+    remediation:
+      retries: -1
+  upgrade:
+    disableWait: true
+    remediation:
+      retries: -1
+  # Cozystack-enablement. A ComputePlane is not a vanilla Kubernetes cluster:
+  # placement: ComputePlane apps (e.g. cozyllm Jupyter/n8n/Langflow) render
+  # Certificate resources (-> certManager) and Ingress objects
+  # (-> ingressNginx) into the target cluster, so those controllers must run
+  # inside it. No in-cluster Flux is needed: consumer HelmReleases live on the
+  # management cluster and carry spec.kubeConfig, so the management Flux
+  # resolves their charts and applies the rendered manifests remotely. Flux
+  # merges spec.values after valuesFrom, so nothing injected via
+  # cozystack-values can disable these pins.
+  values:
+    # The wrapped chart otherwise lets the tenant's "use" subjects read
+    # computeplane-cluster-admin-kubeconfig through its dashboard Role.
+    withholdAdminKubeconfig: true
+    addons:
+      certManager:
+        enabled: true
+      ingressNginx:
+        enabled: true
+        # Expose the ComputePlane ingress-nginx via the Proxied NodePort Service so a
+        # ComputePlane app's per-app management Ingress can route to it without a
+        # management LoadBalancer. The Service (computeplane-cluster-ingress-nginx,
+        # named after the cluster release) is created whenever the addon is enabled
+        # with exposeMethod Proxied, independent of any hosts list.
+        exposeMethod: Proxied
+  valuesFrom:
+  - kind: Secret
+    name: cozystack-values
+{{- /*
+  Worker pools. Phase 2 split worker nodeGroups out of apps/kubernetes into the
+  apps/kubernetes-nodes chart, so the parent cluster HelmRelease above no longer
+  renders any MachineDeployment from spec.values.nodeGroups (passing it there
+  now does nothing). The module reproduces the pre-split behaviour by emitting
+  one child HelmRelease per nodeGroup against this package's own kubernetes-nodes
+  artifact (cozystack-computeplane-application-kubevirt-kubernetes-nodes, see
+  packages/core/platform/sources/computeplane-application.yaml).
+
+  clusterReleaseName wires each pool to the parent: the pool chart normally
+  derives the parent cluster as kubernetes-<cluster>, but this module fixes the
+  parent release to computeplane-cluster (the admin-kubeconfig Secret contract),
+  which is off that convention, so the pool cannot derive it and is told
+  explicitly. cluster carries the same value because it also drives the pool
+  release-name prefix the chart strips to recover the pool name.
+
+  Each pool HelmRelease is shaped like a natively created KubernetesNodes pool
+  (interval/maxHistory, RetryOnFailure strategy, 15m timeouts + disableWait —
+  mirrors pkg/registry/apps/application/rest.go), so a ComputePlane pool behaves
+  identically to one created through the aggregated API.
+
+  When nodeGroups is empty the wrapped chart used to inject a scale-from-zero
+  md0 with roles: [ingress-nginx]; that default is gone with the split, so the
+  module materialises the same md0 here, otherwise the pinned ingress-nginx
+  addon would have no node to schedule onto and stay Pending forever.
+*/}}
+{{- $pools := .Values.nodeGroups }}
+{{- if not $pools }}
+{{- $pools = dict "md0" (dict "roles" (list "ingress-nginx") "minReplicas" 0) }}
+{{- end }}
+{{- range $pool, $group := $pools }}
+---
+apiVersion: helm.toolkit.fluxcd.io/v2
+kind: HelmRelease
+metadata:
+  name: kubernetes-nodes-{{ $clusterRelease }}-{{ $pool }}
+  labels:
+    sharding.fluxcd.io/key: tenants
+    apps.cozystack.io/application.kind: KubernetesNodes
+    apps.cozystack.io/application.group: apps.cozystack.io
+    apps.cozystack.io/application.name: {{ $clusterRelease }}-{{ $pool }}
+spec:
+  interval: 5m
+  maxHistory: 5
+  chartRef:
+    kind: ExternalArtifact
+    name: cozystack-computeplane-application-kubevirt-kubernetes-nodes
+    namespace: cozy-system
+  install:
+    timeout: 15m
+    disableWait: true
+    strategy:
+      name: RetryOnFailure
+      retryInterval: 30s
+  upgrade:
+    timeout: 15m
+    disableWait: true
+    strategy:
+      name: RetryOnFailure
+      retryInterval: 30s
+  values:
+    cluster: {{ $clusterRelease }}
+    clusterReleaseName: {{ $clusterRelease }}
+    {{- /* Splice ONLY the pool's own shape, as an explicit allowlist (pick), not a
+           denylist. This module runs untrusted tenant code and the NodeGroup schema
+           has no additionalProperties:false, so a tenant can put ANY key in a
+           nodeGroup and it validates. A denylist (omit a few known-bad keys) leaks
+           every key it does not name — e.g. the platform-injected `_cluster` object
+           (cluster-domain, oidc, dns01/proxy config; delivered via the
+           cozystack-values Secret in valuesFrom, and Flux merges spec.values OVER
+           valuesFrom so a tenant key wins), or `nameOverride` — and silently
+           re-opens the hole every time kubernetes-nodes gains a new top-level value.
+           So enumerate exactly the per-pool shape fields kubernetes-nodes accepts
+           and pass through only those. Everything cluster-level or module-owned
+           (cluster, clusterReleaseName, talos, version, images, osImage, _cluster,
+           nameOverride, ...) is dropped by construction: the module sets cluster/
+           clusterReleaseName itself above, and a tenant cannot pick the worker OS
+           image / Talos installer / kubelet version / cluster wiring. osImage is
+           named here on purpose rather than merely absent: a ComputePlane pool
+           takes the module's worker OS image and cannot opt into the golden-image
+           clone or repoint itself at another Image Factory, both of which are
+           operator decisions about the platform's own images. Keep this list in
+           sync with the kubernetes-nodes values schema's pool-shape params. */}}
+    {{- with pick $group "minReplicas" "maxReplicas" "instanceType" "diskSize" "storageClass" "roles" "resources" "gpus" "kubelet" "logSerialConsole" "maxUnhealthy" "nodeStartupTimeout" "readyUnknownTimeout" "readyFalseTimeout" "podCpuLimit" "podCpuRequest" "maxNodeProvisionTime" }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+  valuesFrom:
+  - kind: Secret
+    name: cozystack-values
+{{- end }}
diff --git a/packages/extra/computeplane/tests/cluster_test.yaml b/packages/extra/computeplane/tests/cluster_test.yaml
new file mode 100644
index 0000000000..9d1a6768fc
--- /dev/null
+++ b/packages/extra/computeplane/tests/cluster_test.yaml
@@ -0,0 +1,319 @@
+suite: computeplane module renders the operator-owned cluster and worker pools
+# The module wraps the ordinary apps/kubernetes chart with operator-fixed
+# values (design-proposals/compute-plane in cozystack/community). These pins
+# are the contract:
+#   - the cluster HelmRelease is named computeplane-cluster and sets NO
+#     spec.releaseName (the aggregated API cannot represent releaseName, so
+#     both the module and cluster releases must derive from object names);
+#     the derived release name makes Kamaji write the admin kubeconfig to
+#     computeplane-cluster-admin-kubeconfig, which placement: ComputePlane
+#     applications consume and computeplane-rd withholds from tenants;
+#   - the Cozystack-enablement addons (certManager/ingressNginx) are inline
+#     spec.values, so nothing injected via valuesFrom can disable them; no
+#     in-cluster Flux — consumer HelmReleases reconcile from the management
+#     cluster via spec.kubeConfig;
+#   - the chart comes from this package's own source-only ExternalArtifact,
+#     keeping the module self-contained.
+# Phase 2 split worker pools into apps/kubernetes-nodes, so the module now also
+# emits one child HelmRelease per nodeGroup against this package's own
+# kubernetes-nodes artifact, wired to the parent via clusterReleaseName.
+templates:
+  - templates/cluster.yaml
+release:
+  name: computeplane
+  namespace: tenant-alice
+tests:
+  - it: derives the cluster release name from the object name (kubeconfig contract)
+    documentSelector:
+      path: metadata.name
+      value: computeplane-cluster
+    asserts:
+      - equal:
+          path: metadata.name
+          value: computeplane-cluster
+      - notExists:
+          path: spec.releaseName
+      - equal:
+          path: spec.chartRef.name
+          value: cozystack-computeplane-application-kubevirt-kubernetes
+      - equal:
+          path: spec.chartRef.kind
+          value: ExternalArtifact
+
+  - it: withholds the admin kubeconfig from the tenant's dashboard Role
+    documentSelector:
+      path: metadata.name
+      value: computeplane-cluster
+    asserts:
+      - equal:
+          path: spec.values.withholdAdminKubeconfig
+          value: true
+
+  - it: pins the Cozystack-enablement addons as inline values
+    documentSelector:
+      path: metadata.name
+      value: computeplane-cluster
+    asserts:
+      - notExists:
+          path: spec.values.addons.fluxcd
+      - equal:
+          path: spec.values.addons.certManager.enabled
+          value: true
+      - equal:
+          path: spec.values.addons.ingressNginx.enabled
+          value: true
+      - equal:
+          path: spec.values.addons.ingressNginx.exposeMethod
+          value: Proxied
+      # The kubernetes app emits child HelmReleases and a talos-reconcile Job
+      # that cannot become Ready until worker nodes exist — the parent must
+      # not block on them.
+      - equal:
+          path: spec.install.disableWait
+          value: true
+      - equal:
+          path: spec.upgrade.disableWait
+          value: true
+
+  # Phase 2 removed nodeGroups from the wrapped kubernetes chart; the parent
+  # HelmRelease must no longer carry it (it would silently do nothing).
+  - it: does not pass nodeGroups to the wrapped control-plane chart
+    documentSelector:
+      path: metadata.name
+      value: computeplane-cluster
+    set:
+      nodeGroups:
+        md0:
+          minReplicas: 1
+          maxReplicas: 3
+          instanceType: u1.large
+          diskSize: 32Gi
+          roles: ["ingress-nginx"]
+    asserts:
+      - notExists:
+          path: spec.values.nodeGroups
+
+  # With nodeGroups unset, the pre-split wrapped chart injected a scale-from-zero
+  # md0 with roles: [ingress-nginx]; the module now materialises that pool itself
+  # so the pinned ingress-nginx addon has a node to schedule onto.
+  - it: materialises the default ingress-nginx md0 pool when nodeGroups is unset
+    documentSelector:
+      path: metadata.name
+      value: kubernetes-nodes-computeplane-cluster-md0
+    asserts:
+      - equal:
+          path: kind
+          value: HelmRelease
+      - equal:
+          path: spec.chartRef.name
+          value: cozystack-computeplane-application-kubevirt-kubernetes-nodes
+      - equal:
+          path: spec.chartRef.kind
+          value: ExternalArtifact
+      - equal:
+          path: metadata.labels['apps.cozystack.io/application.kind']
+          value: KubernetesNodes
+      - equal:
+          path: metadata.labels['apps.cozystack.io/application.name']
+          value: computeplane-cluster-md0
+      - equal:
+          path: spec.values.cluster
+          value: computeplane-cluster
+      - equal:
+          path: spec.values.clusterReleaseName
+          value: computeplane-cluster
+      - equal:
+          path: spec.values.roles[0]
+          value: ingress-nginx
+      # canonical KubernetesNodes pool shape (mirrors rest.go): RetryOnFailure
+      # strategy + disableWait, not the parent module's remediation style.
+      - equal:
+          path: spec.install.strategy.name
+          value: RetryOnFailure
+      - equal:
+          path: spec.install.disableWait
+          value: true
+
+  # A tenant that supplies nodeGroups gets one pool HelmRelease per group,
+  # authoritative (not merged with the default md0), each wired to the parent.
+  - it: emits one pool HelmRelease per supplied nodeGroup
+    set:
+      nodeGroups:
+        md0:
+          minReplicas: 1
+          maxReplicas: 3
+          instanceType: u1.large
+          diskSize: 32Gi
+          roles: ["ingress-nginx"]
+        gpu0:
+          minReplicas: 0
+          maxReplicas: 2
+          instanceType: u1.xlarge
+          diskSize: 64Gi
+          roles: []
+          gpus:
+            - name: nvidia.com/AD102GL_L40S
+    asserts:
+      # three docs total: parent + two pools
+      - hasDocuments:
+          count: 3
+      - equal:
+          path: spec.values.instanceType
+          value: u1.large
+        documentSelector:
+          path: metadata.name
+          value: kubernetes-nodes-computeplane-cluster-md0
+      - equal:
+          path: spec.values.gpus[0].name
+          value: nvidia.com/AD102GL_L40S
+        documentSelector:
+          path: metadata.name
+          value: kubernetes-nodes-computeplane-cluster-gpu0
+      # no implicit md0 is added on top of supplied groups
+      - equal:
+          path: spec.values.maxReplicas
+          value: 3
+        documentSelector:
+          path: metadata.name
+          value: kubernetes-nodes-computeplane-cluster-md0
+
+  # Supplied nodeGroups are authoritative (not merged with the wrapped chart's
+  # default md0), while the module pins ingress-nginx on — groups without the
+  # role would leave the controller Pending forever, so the render must refuse.
+  - it: rejects nodeGroups without an ingress-nginx role
+    set:
+      nodeGroups:
+        gpu0:
+          minReplicas: 1
+          maxReplicas: 2
+          instanceType: u1.large
+          diskSize: 32Gi
+          roles: []
+    asserts:
+      - failedTemplate:
+          errorPattern: "at least one nodeGroup must carry roles"
+
+  - it: accepts nodeGroups when any group carries the ingress-nginx role
+    documentSelector:
+      path: metadata.name
+      value: kubernetes-nodes-computeplane-cluster-edge
+    set:
+      nodeGroups:
+        gpu0:
+          minReplicas: 1
+          maxReplicas: 2
+          instanceType: u1.large
+          diskSize: 32Gi
+          roles: []
+        edge:
+          minReplicas: 1
+          maxReplicas: 1
+          instanceType: u1.medium
+          diskSize: 20Gi
+          roles: ["ingress-nginx"]
+    asserts:
+      - equal:
+          path: spec.values.roles[0]
+          value: ingress-nginx
+
+  # The generator does not emit additionalProperties: false, so unlisted
+  # NodeGroup fields are NOT rejected by the schema. The splice is an allowlist
+  # (pick), so documented pool-shape extras (e.g. maxUnhealthy — a valid
+  # kubernetes-nodes pool field) still flow through, while everything it does not
+  # name is dropped: the module-owned wiring keys (cluster, clusterReleaseName) so
+  # a tenant group key of the same name cannot render a duplicate YAML key that
+  # re-parents the pool onto a tenant-controlled cluster, and the cluster-level
+  # keys (talos, version, images) plus platform keys (_cluster, nameOverride) so a
+  # shape-only knob cannot choose the worker OS image / kubelet version. This case
+  # pins both directions.
+  - it: passes shape fields through but strips module-owned and cluster-level keys
+    documentSelector:
+      path: metadata.name
+      value: kubernetes-nodes-computeplane-cluster-md0
+    set:
+      nodeGroups:
+        md0:
+          minReplicas: 1
+          maxReplicas: 3
+          instanceType: u1.large
+          diskSize: 32Gi
+          roles: ["ingress-nginx"]
+          # tolerated shape extra: must pass through
+          maxUnhealthy: 40%
+          # module-owned wiring: a duplicate key must NOT override the module value
+          cluster: attacker-cluster
+          clusterReleaseName: kubernetes-attacker
+          # cluster-level worker-image keys: a shape-only knob must NOT let a tenant
+          # pick the worker OS image / installer / kubelet version
+          talos:
+            imageFactoryURL: https://evil.example.com
+            installerRepository: evil.example.com/installer
+          version: v1.31
+          images:
+            kubectl: evil.example.com/kubectl:latest
+          # platform-injected object (cluster-domain/oidc/dns01/proxy) delivered via
+          # the cozystack-values Secret: a tenant key must NOT reach the pool values
+          # (the allowlist splice drops anything it does not name — regression guard
+          # for the denylist hole this replaced)
+          _cluster:
+            cluster-domain: attacker.example.com
+          # helm nameOverride: not a pool-shape field, must not pass through
+          nameOverride: pwned
+    asserts:
+      - equal:
+          path: spec.values.maxUnhealthy
+          value: 40%
+      - equal:
+          path: spec.values.cluster
+          value: computeplane-cluster
+      - equal:
+          path: spec.values.clusterReleaseName
+          value: computeplane-cluster
+      - notExists:
+          path: spec.values.talos
+      - notExists:
+          path: spec.values.version
+      - notExists:
+          path: spec.values.images
+      - notExists:
+          path: spec.values._cluster
+      - notExists:
+          path: spec.values.nameOverride
+
+  # Helm caps a HelmRelease name at 53 chars and each pool renders a 38-char fixed
+  # prefix, so a pool key over 15 chars would create a release the apiserver
+  # accepts but Flux never reconciles. The render must refuse instead (the same
+  # 53-char cap the migration overflow branch and the aggregated API already
+  # guard on their own paths).
+  - it: refuses a pool name that overflows Helm's 53-char release-name cap
+    set:
+      nodeGroups:
+        workers-for-analytics-jobs:
+          minReplicas: 1
+          maxReplicas: 3
+          instanceType: u1.medium
+          diskSize: 20Gi
+          roles: ["ingress-nginx"]
+    asserts:
+      - failedTemplate:
+          errorPattern: "exceeds Helm's 53-char limit"
+      # the remedy budget is derived (sub 53 (len prefix)) — pin it so a wrong
+      # computation is caught, not just the presence of the error
+      - failedTemplate:
+          errorPattern: "Rename the pool to at most 15 characters"
+
+  # The pool key becomes the HelmRelease name and CAPI object names (RFC-1123
+  # labels). An uppercase/underscore key would render an invalid metadata.name;
+  # the render must refuse early and uniformly, like the length guard.
+  - it: refuses a pool name that is not a valid RFC-1123 label
+    set:
+      nodeGroups:
+        Bad_Pool:
+          minReplicas: 1
+          maxReplicas: 1
+          instanceType: u1.medium
+          diskSize: 20Gi
+          roles: ["ingress-nginx"]
+    asserts:
+      - failedTemplate:
+          errorPattern: "is not a valid RFC-1123 label"
diff --git a/packages/extra/computeplane/tests/release_name_test.yaml b/packages/extra/computeplane/tests/release_name_test.yaml
new file mode 100644
index 0000000000..6dcf8f1271
--- /dev/null
+++ b/packages/extra/computeplane/tests/release_name_test.yaml
@@ -0,0 +1,25 @@
+suite: computeplane module refuses a non-canonical release name
+# The module release name must equal the chart name: the aggregated API
+# rebuilds HelmRelease specs without spec.releaseName, so the release name is
+# always the object name — and the object name is what the ComputePlane
+# ApplicationDefinition (release.prefix "") maps onto. A stray release name
+# (e.g. the historical computeplane-module) would collide with that mapping,
+# so the guard fails the render loudly.
+templates:
+  - templates/check-release-name.yaml
+tests:
+  - it: rejects a suffixed release name
+    release:
+      name: computeplane-module
+      namespace: tenant-alice
+    asserts:
+      - failedTemplate:
+          errorPattern: "The name of the release MUST BE computeplane"
+
+  - it: accepts the canonical release name
+    release:
+      name: computeplane
+      namespace: tenant-alice
+    asserts:
+      - hasDocuments:
+          count: 0
diff --git a/packages/extra/computeplane/values.schema.json b/packages/extra/computeplane/values.schema.json
new file mode 100644
index 0000000000..41db84758e
--- /dev/null
+++ b/packages/extra/computeplane/values.schema.json
@@ -0,0 +1,151 @@
+{
+  "title": "Chart Values",
+  "type": "object",
+  "properties": {
+    "nodeGroups": {
+      "description": "Worker node groups of the ComputePlane cluster (cluster shape only — the security posture is fixed by the module and cannot be overridden through this knob: the module forwards only the documented per-pool fields to the `kubernetes-nodes` pool chart, so any other `NodeGroup` field, e.g. `talos`/`version`/`images`, is silently dropped — accepted but inert). Same structure as the `kubernetes` application's `nodeGroups`. When left empty, the module itself materialises a default scale-from-zero `md0` pool with `roles: [ingress-nginx]` (the wrapped `kubernetes` chart no longer injects one after the Phase 2 split), so the cluster sits idle until a pending Pod (e.g. the ingress-nginx controller) triggers the cluster-autoscaler. Supplied groups are authoritative (not merged with the default), so at least one of them must carry `roles: [ingress-nginx]` — enforced at render time. Each supplied pool key must be at most 15 characters so its `kubernetes-nodes-computeplane-cluster-\u003cpool\u003e` HelmRelease name fits Helm's 53-character limit — also enforced at render time.",
+      "type": "object",
+      "default": {},
+      "additionalProperties": {
+        "type": "object",
+        "required": [
+          "diskSize",
+          "instanceType",
+          "maxReplicas",
+          "minReplicas"
+        ],
+        "properties": {
+          "diskSize": {
+            "description": "System disk size for the worker VM. Carries the Talos OS image, kubelet state, containerd image cache, and any local-path PVCs.",
+            "default": "20Gi",
+            "pattern": "^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$",
+            "anyOf": [
+              {
+                "type": "integer"
+              },
+              {
+                "type": "string"
+              }
+            ],
+            "x-kubernetes-int-or-string": true
+          },
+          "gpus": {
+            "description": "List of GPUs to attach (NVIDIA driver requires at least 4 GiB RAM).",
+            "type": "array",
+            "items": {
+              "type": "object",
+              "required": [
+                "name"
+              ],
+              "properties": {
+                "name": {
+                  "description": "Name of GPU, such as \"nvidia.com/AD102GL_L40S\".",
+                  "type": "string",
+                  "x-cozystack-options": {
+                    "source": "gpu"
+                  }
+                }
+              }
+            }
+          },
+          "instanceType": {
+            "description": "Virtual machine instance type.",
+            "type": "string",
+            "default": "u1.medium",
+            "x-cozystack-options": {
+              "source": "instancetype"
+            }
+          },
+          "kubelet": {
+            "description": "Kubelet resource reservations for this node group.",
+            "type": "object",
+            "properties": {
+              "evictionHardMemory": {
+                "description": "Hard eviction threshold for memory (absolute like 200Mi or percentage like 7%).",
+                "type": "string",
+                "default": "7%"
+              },
+              "evictionSoftMemory": {
+                "description": "Soft eviction threshold for memory (absolute like 1Gi or percentage like 10%).",
+                "type": "string",
+                "default": "10%"
+              },
+              "kubeReservedCpu": {
+                "description": "CPU reserved for kubelet and container runtime. Auto-computed from instanceType if empty.",
+                "type": "string"
+              },
+              "kubeReservedMemory": {
+                "description": "Memory reserved for kubelet and container runtime. Auto-computed from instanceType if empty.",
+                "type": "string"
+              },
+              "systemReservedCpu": {
+                "description": "CPU reserved for host OS. Auto-computed from instanceType if empty.",
+                "type": "string"
+              },
+              "systemReservedMemory": {
+                "description": "Memory reserved for host OS. Auto-computed from instanceType if empty.",
+                "type": "string"
+              }
+            }
+          },
+          "maxReplicas": {
+            "description": "Maximum number of replicas.",
+            "type": "integer",
+            "default": 10
+          },
+          "minReplicas": {
+            "description": "Minimum number of replicas.",
+            "type": "integer",
+            "default": 0
+          },
+          "resources": {
+            "description": "Explicit CPU and memory for each worker node, as an alternative to `instanceType` sizing. Set both `cpu` and `memory` together or neither.",
+            "type": "object",
+            "properties": {
+              "cpu": {
+                "description": "CPU available.",
+                "pattern": "^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$",
+                "anyOf": [
+                  {
+                    "type": "integer"
+                  },
+                  {
+                    "type": "string"
+                  }
+                ],
+                "x-kubernetes-int-or-string": true
+              },
+              "memory": {
+                "description": "Memory (RAM) available.",
+                "pattern": "^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$",
+                "anyOf": [
+                  {
+                    "type": "integer"
+                  },
+                  {
+                    "type": "string"
+                  }
+                ],
+                "x-kubernetes-int-or-string": true
+              }
+            }
+          },
+          "roles": {
+            "description": "List of node roles. At least one group must carry `ingress-nginx` — the module pins the ingress-nginx addon on, and its controller only schedules onto nodes with that role (enforced at render time).",
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          },
+          "storageClass": {
+            "description": "StorageClass for worker node persistent disks. When empty, the `kubernetes-nodes` pool chart applies its own default (`replicated`).",
+            "type": "string",
+            "x-cozystack-options": {
+              "source": "storageclass"
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/packages/extra/computeplane/values.yaml b/packages/extra/computeplane/values.yaml
new file mode 100644
index 0000000000..8ab49ea95c
--- /dev/null
+++ b/packages/extra/computeplane/values.yaml
@@ -0,0 +1,35 @@
+##
+## @section Cluster shape
+##
+
+## @typedef {struct} Resources - Explicit CPU and memory configuration for a node or component.
+## @field {quantity} [cpu] - CPU available.
+## @field {quantity} [memory] - Memory (RAM) available.
+
+## @typedef {struct} GPU - GPU configuration.
+## @field {string} name - Name of GPU, such as "nvidia.com/AD102GL_L40S".
+## @x-cozystack-options {source: gpu}
+
+## @typedef {struct} Kubelet - Kubelet resource reservations for worker nodes.
+## @field {string} [systemReservedMemory] - Memory reserved for host OS. Auto-computed from instanceType if empty.
+## @field {string} [kubeReservedMemory] - Memory reserved for kubelet and container runtime. Auto-computed from instanceType if empty.
+## @field {string} [systemReservedCpu] - CPU reserved for host OS. Auto-computed from instanceType if empty.
+## @field {string} [kubeReservedCpu] - CPU reserved for kubelet and container runtime. Auto-computed from instanceType if empty.
+## @field {string} [evictionHardMemory]="7%" - Hard eviction threshold for memory (absolute like 200Mi or percentage like 7%).
+## @field {string} [evictionSoftMemory]="10%" - Soft eviction threshold for memory (absolute like 1Gi or percentage like 10%).
+
+## @typedef {struct} NodeGroup - Worker node group configuration.
+## @field {int} minReplicas=0 - Minimum number of replicas.
+## @field {int} maxReplicas=10 - Maximum number of replicas.
+## @field {string} instanceType="u1.medium" - Virtual machine instance type.
+## @x-cozystack-options {source: instancetype}
+## @field {quantity} diskSize="20Gi" - System disk size for the worker VM. Carries the Talos OS image, kubelet state, containerd image cache, and any local-path PVCs.
+## @field {string} [storageClass] - StorageClass for worker node persistent disks. When empty, the `kubernetes-nodes` pool chart applies its own default (`replicated`).
+## @x-cozystack-options {source: storageclass}
+## @field {[]string} roles - List of node roles. At least one group must carry `ingress-nginx` — the module pins the ingress-nginx addon on, and its controller only schedules onto nodes with that role (enforced at render time).
+## @field {Resources} [resources] - Explicit CPU and memory for each worker node, as an alternative to `instanceType` sizing. Set both `cpu` and `memory` together or neither.
+## @field {[]GPU} gpus - List of GPUs to attach (NVIDIA driver requires at least 4 GiB RAM).
+## @field {Kubelet} [kubelet] - Kubelet resource reservations for this node group.
+
+## @param {map[string]NodeGroup} nodeGroups - Worker node groups of the ComputePlane cluster (cluster shape only — the security posture is fixed by the module and cannot be overridden through this knob: the module forwards only the documented per-pool fields to the `kubernetes-nodes` pool chart, so any other `NodeGroup` field, e.g. `talos`/`version`/`images`, is silently dropped — accepted but inert). Same structure as the `kubernetes` application's `nodeGroups`. When left empty, the module itself materialises a default scale-from-zero `md0` pool with `roles: [ingress-nginx]` (the wrapped `kubernetes` chart no longer injects one after the Phase 2 split), so the cluster sits idle until a pending Pod (e.g. the ingress-nginx controller) triggers the cluster-autoscaler. Supplied groups are authoritative (not merged with the default), so at least one of them must carry `roles: [ingress-nginx]` — enforced at render time. Each supplied pool key must be at most 15 characters so its `kubernetes-nodes-computeplane-cluster-<pool>` HelmRelease name fits Helm's 53-character limit — also enforced at render time.
+nodeGroups: {}
diff --git a/packages/extra/etcd/Makefile b/packages/extra/etcd/Makefile
index 2b3ed61e6f..4dfb7ef4d5 100644
--- a/packages/extra/etcd/Makefile
+++ b/packages/extra/etcd/Makefile
@@ -6,5 +6,6 @@ generate:
 	cozyvalues-gen -v values.yaml -s values.schema.json -r README.md
 	../../../hack/update-crd.sh
 
+.PHONY: test
 test:
 	helm unittest .
diff --git a/packages/extra/etcd/README.md b/packages/extra/etcd/README.md
index b8b9690124..e96c63832f 100644
--- a/packages/extra/etcd/README.md
+++ b/packages/extra/etcd/README.md
@@ -1,83 +1,47 @@
 # Etcd-cluster
 
-## Backups
-
-**DEPRECATED:** the `backup.*` values block (`backup.enabled`,
-`backup.schedule`, `backup.destinationPath`, ...) is superseded by the
-Cozystack `BackupClass` flow driven by the `Etcd` strategy in
-`strategy.backups.cozystack.io/v1alpha1`. New tenants should use a
-`BackupJob` / `RestoreJob` against an `Etcd` strategy + `BackupClass`
-instead — see `examples/backups/etcd/` for the end-to-end demo and
-`internal/backupcontroller/etcdstrategy_controller.go` for the driver.
-Existing tenants with `backup.enabled=true` continue to render the
-legacy `EtcdBackupSchedule` + S3 credentials Secret unchanged — the
-two flows coexist, the chart's scheduled backups have NOT stopped
-working, and the `backup.*`-conditional rendered output is identical
-to prior releases.
-
-### Upgrade note: `serverTrustedCASecret` is now set unconditionally
-
-This release adds `security.tls.serverTrustedCASecret: etcd-ca-tls` to
-the rendered `EtcdCluster`. The field is required so that the
-etcd-operator's `backup_agent` / `restore_agent` (v0.4.4+) trust the
-server cert when they connect from their own pod via etcdctl —
-without it the agent falls back to the system trust store and the
-backup/restore handshake fails with "certificate signed by unknown
-authority". The chart reuses the existing `etcd-ca-tls` Secret that
-already issues every client/server cert today, so the field points at
-material that has been present in the namespace since the cluster was
-first deployed. On a Helm upgrade the etcd-operator observes the new
-field and starts enforcing server-cert verification on its own client
-connections; it does NOT roll the etcd member pods (the etcd container's
-TLS configuration was already authoritative). Tenants who rely on the
-backup-agent today will continue to need this field set, so leaving it
-on by default keeps the chart consistent with the documented backup
-path.
+This chart renders an `EtcdCluster` (`etcd-operator.cozystack.io/v1alpha2`)
+managed by the cozystack etcd-operator, plus the cert-manager CA chain and a
+Kamaji `DataStore`. TLS uses secretRef mode: this chart's own cert-manager
+`Certificate` resources issue the server, operator-client and peer certs from
+the `etcd-issuer` / `etcd-peer-issuer` CA Issuers, and the `EtcdCluster` only
+*references* the resulting Secrets via `serverSecretRef` /
+`operatorClientSecretRef` / `peer.secretRef` (the operator itself mints
+nothing). This is deliberate: `spec.tls` is immutable in v1alpha2 and
+`etcd-migrate` adopts legacy clusters into exactly this secretRef shape, so the
+chart must match it or every post-adoption reconcile is rejected. etcd runs
+cert-only (`--client-cert-auth`, no password auth); consumers authenticate by
+presenting a `commonName=root` client cert (`etcd-client-tls`) signed by the
+same CA.
 
-When `backup.enabled` is set to `true`, the chart renders an `EtcdBackupSchedule` (etcd.aenix.io/v1alpha1) and an S3 credentials `Secret`. The etcd-operator (v0.4.3+) reconciles the schedule into a `CronJob` that periodically snapshots the cluster to S3. This release bumps the bundled `packages/system/etcd-operator` chart from v0.4.3 to v0.4.5 (so the new `EtcdBackup.status.snapshot` field — added in v0.4.4 — and the restore-agent path fixes — added in v0.4.5 — are available to the strategy driver). The legacy `backup.enabled=true` path is unchanged by the bump and continues to function on v0.4.5 exactly as it did on v0.4.3.
+## Backups
 
-Enabling backup requires the following fields to be explicitly set (defaults are empty strings so that missing values fail fast at template render time): `backup.s3AccessKey`, `backup.s3SecretKey`, `backup.destinationPath` (must start with `s3://` and have no `//` segments), and `backup.endpointURL`. S3 credentials passed through plain values end up in the HelmRelease manifest — for production deployments prefer an external secret management tool (ESO, Sealed Secrets, etc.) over committing the keys to Git.
+Backups are driven by the Cozystack `BackupClass` flow: a `BackupJob` /
+`RestoreJob` against the `Etcd` strategy (`strategy.backups.cozystack.io/v1alpha1`).
+See `examples/backups/etcd/` for the end-to-end demo and
+`internal/backupcontroller/etcdstrategy_controller.go` for the driver. The
+driver materialises one `EtcdSnapshot` (`etcd-operator.cozystack.io/v1alpha2`)
+per `BackupJob`; restore is in-place (the driver suspends this chart's
+`HelmRelease`, deletes the live `EtcdCluster`, and re-creates it with
+`spec.bootstrap.restore.source.s3` populated from the `Backup` artefact's
+coordinates).
 
-**Restore and ad-hoc backup**: the primary supported path is the
-Cozystack `BackupClass` / `BackupJob` / `RestoreJob` flow described
-above and demonstrated end-to-end under `examples/backups/etcd/`. The
-driver suspends this chart's `HelmRelease` for the duration of an
-in-place restore, deletes the live `EtcdCluster`, and re-creates it
-with `spec.bootstrap.restore.source.s3` populated from the
-`Backup` artefact's coordinates. The upstream `EtcdCluster.spec.bootstrap`
-field and the one-shot `EtcdBackup` CR (v0.4.4) are NOT exposed
-through this chart's values themselves; tenants who need to bypass
-the BackupClass flow (e.g. an out-of-band recovery using a snapshot
-that has no `Backup` artefact) can hand-apply the corresponding
-custom resource manifest as an escape hatch.
+> The legacy `backup.*` values block and the `EtcdBackupSchedule` CRD no longer
+> exist under the v1alpha2 operator — scheduled backups are expressed as a
+> `BackupClass` / `Plan` instead.
 
 ## Parameters
 
 ### Common parameters
 
-| Name               | Description                          | Type       | Value   |
-| ------------------ | ------------------------------------ | ---------- | ------- |
-| `size`             | Persistent Volume size.              | `quantity` | `4Gi`   |
-| `storageClass`     | StorageClass used to store the data. | `string`   | `""`    |
-| `replicas`         | Number of etcd replicas.             | `int`      | `3`     |
-| `resources`        | Resource configuration for etcd.     | `object`   | `{}`    |
-| `resources.cpu`    | Number of CPU cores allocated.       | `quantity` | `1000m` |
-| `resources.memory` | Amount of memory allocated.          | `quantity` | `512Mi` |
-
-
-### Backup parameters
-
-| Name                                | Description                                                                                                                                                                                                                                       | Type     | Value       |
-| ----------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------- | ----------- |
-| `backup`                            | DEPRECATED: Backup configuration. The chart still renders the legacy EtcdBackupSchedule when backup.enabled=true, but new tenants should drive backups through a BackupClass bound to the Etcd strategy (strategy.backups.cozystack.io/v1alpha1). | `object` | `{}`        |
-| `backup.enabled`                    | DEPRECATED: Enable scheduled S3 backups. Use a BackupJob against an Etcd strategy instead.                                                                                                                                                        | `bool`   | `false`     |
-| `backup.schedule`                   | DEPRECATED: Cron schedule for automated backups. Use a backups.cozystack.io/Plan instead.                                                                                                                                                         | `string` | `0 2 * * *` |
-| `backup.destinationPath`            | DEPRECATED: Destination path for backups (e.g. s3://bucket/path/).                                                                                                                                                                                | `string` | `""`        |
-| `backup.endpointURL`                | DEPRECATED: S3 endpoint URL for uploads.                                                                                                                                                                                                          | `string` | `""`        |
-| `backup.region`                     | DEPRECATED: S3 region.                                                                                                                                                                                                                            | `string` | `""`        |
-| `backup.forcePathStyle`             | DEPRECATED: Use path-style S3 URLs (required for MinIO and most S3-compatible providers).                                                                                                                                                         | `bool`   | `true`      |
-| `backup.s3AccessKey`                | DEPRECATED: Access key for S3 authentication.                                                                                                                                                                                                     | `string` | `""`        |
-| `backup.s3SecretKey`                | DEPRECATED: Secret key for S3 authentication.                                                                                                                                                                                                     | `string` | `""`        |
-| `backup.successfulJobsHistoryLimit` | DEPRECATED: Number of successful backup jobs to retain.                                                                                                                                                                                           | `int`    | `3`         |
-| `backup.failedJobsHistoryLimit`     | DEPRECATED: Number of failed backup jobs to retain.                                                                                                                                                                                               | `int`    | `1`         |
+| Name               | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | Type       | Value    |
+| ------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------- | -------- |
+| `version`          | etcd version (X.Y.Z) to run, set on the EtcdCluster's spec.version; the operator pulls etcd from its own configured image.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              | `string`   | `3.6.11` |
+| `size`             | Persistent Volume size.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | `quantity` | `4Gi`    |
+| `storageClass`     | StorageClass used to store the data.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    | `string`   | `""`     |
+| `replicas`         | Number of etcd replicas.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | `int`      | `3`      |
+| `resources`        | Resource configuration for etcd.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        | `object`   | `{}`     |
+| `resources.cpu`    | Number of CPU cores allocated.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | `quantity` | `1000m`  |
+| `resources.memory` | Amount of memory allocated.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | `quantity` | `512Mi`  |
+| `affinity`         | Affinity rules set verbatim on the EtcdCluster's spec.affinity, replacing the chart default. When left empty the chart applies a soft (preferred) podAntiAffinity that spreads members across nodes by kubernetes.io/hostname on a best-effort basis, so a single node failure is less likely to take out more than one member. The default is intentionally soft: a hard rule would leave a member Pending when there are fewer schedulable nodes than replicas, or when node-local storage pins a member to a node. Set a hard requiredDuringSchedulingIgnoredDuringExecution rule here to forbid co-location outright (only on clusters with enough nodes and non-node-pinned storage). Note that the operator applies affinity only when it creates or replaces a member Pod and does not reschedule running members, so on a cluster that already has co-located members the rule takes effect only as each member is replaced, not retroactively. | `object`   | `{}`     |
 
diff --git a/packages/extra/etcd/templates/backup-secret.yaml b/packages/extra/etcd/templates/backup-secret.yaml
deleted file mode 100644
index 080bff2170..0000000000
--- a/packages/extra/etcd/templates/backup-secret.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-{{- if .Values.backup.enabled }}
----
-apiVersion: v1
-kind: Secret
-metadata:
-  name: etcd-s3-creds
-type: Opaque
-stringData:
-  AWS_ACCESS_KEY_ID: {{ required "backup.s3AccessKey is required when backup.enabled=true" .Values.backup.s3AccessKey | quote }}
-  AWS_SECRET_ACCESS_KEY: {{ required "backup.s3SecretKey is required when backup.enabled=true" .Values.backup.s3SecretKey | quote }}
-{{- end }}
diff --git a/packages/extra/etcd/templates/etcd-backup-schedule.yaml b/packages/extra/etcd/templates/etcd-backup-schedule.yaml
deleted file mode 100644
index 3dce5a9ece..0000000000
--- a/packages/extra/etcd/templates/etcd-backup-schedule.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-{{- if .Values.backup.enabled }}
-{{- $endpointURL := required "backup.endpointURL is required when backup.enabled=true" .Values.backup.endpointURL -}}
-{{- $destPath := required "backup.destinationPath is required when backup.enabled=true" .Values.backup.destinationPath -}}
-{{- if not (hasPrefix "s3://" $destPath) }}{{ fail "backup.destinationPath must start with s3://" }}{{- end }}
-{{- $rawPath := $destPath | trimPrefix "s3://" | trimSuffix "/" -}}
-{{- if contains "//" $rawPath }}{{ fail "backup.destinationPath must not contain '//' segments" }}{{- end }}
-{{- $parts := splitList "/" $rawPath -}}
-{{- $bucket := first $parts -}}
-{{- if eq $bucket "" }}{{ fail "backup.destinationPath must contain a bucket (e.g. s3://bucket/path/)" }}{{- end }}
-{{- $key := rest $parts | join "/" -}}
----
-apiVersion: etcd.aenix.io/v1alpha1
-kind: EtcdBackupSchedule
-metadata:
-  name: etcd
-spec:
-  clusterRef:
-    name: etcd
-  schedule: {{ .Values.backup.schedule | quote }}
-  successfulJobsHistoryLimit: {{ .Values.backup.successfulJobsHistoryLimit | int }}
-  failedJobsHistoryLimit: {{ .Values.backup.failedJobsHistoryLimit | int }}
-  destination:
-    s3:
-      endpoint: {{ $endpointURL | quote }}
-      bucket: {{ $bucket | quote }}
-      {{- with $key }}
-      key: {{ . | quote }}
-      {{- end }}
-      {{- with .Values.backup.region }}
-      region: {{ . | quote }}
-      {{- end }}
-      forcePathStyle: {{ .Values.backup.forcePathStyle }}
-      credentialsSecretRef:
-        name: etcd-s3-creds
-{{- end }}
diff --git a/packages/extra/etcd/templates/etcd-cluster.yaml b/packages/extra/etcd/templates/etcd-cluster.yaml
index e092ac8039..2824ce3718 100644
--- a/packages/extra/etcd/templates/etcd-cluster.yaml
+++ b/packages/extra/etcd/templates/etcd-cluster.yaml
@@ -8,84 +8,91 @@
 {{- printf "%.0f" $result -}}
 {{- end -}}
 ---
-apiVersion: etcd.aenix.io/v1alpha1
+apiVersion: etcd-operator.cozystack.io/v1alpha2
 kind: EtcdCluster
 metadata:
   name: etcd
 spec:
-  options:
-    quota-backend-bytes: {{ include "calculateQuotaBackendBytes" .Values.size | quote }}
-    auto-compaction-mode: "periodic"
-    auto-compaction-retention: "5m"
-    snapshot-count: "10000"
+  version: {{ .Values.version | quote }}
   replicas: {{ .Values.replicas }}
   storage:
-    volumeClaimTemplate:
-      spec:
-        resources:
-          requests:
-            storage: {{ .Values.size }}
-        {{- with .Values.storageClass }}
-        storageClassName: {{ . }}
-        {{- end }}
-  security:
-    tls:
-      peerTrustedCASecret: etcd-peer-ca-tls
-      peerSecret: etcd-peer-tls
-      serverSecret: etcd-server-tls
-      clientTrustedCASecret: etcd-ca-tls
-      clientSecret: etcd-client-tls
-      # Required so etcd-operator v0.4.4+ backup_agent / restore_agent
-      # mount the server CA at /etc/etcd/pki/server/ca/ca.crt and set
-      # ETCD_TLS_CA_PATH (internal/controller/factory/backup_job.go gates
-      # the env+volume on EtcdCluster.IsServerTrustedCADefined()). Without
-      # it the agent's etcdctl client falls back to the system trust
-      # store and fails to verify the etcd server cert with "certificate
-      # signed by unknown authority". Same CA as clientTrustedCASecret -
-      # the chart issues client and server certs from the same etcd-ca.
-      serverTrustedCASecret: etcd-ca-tls
-  podTemplate:
-    metadata:
-      labels:
-        cozystack.io/service: etcd
-    spec:
-      containers:
-      - name: etcd
-        ports:
-        - name: metrics
-          containerPort: 2381
-          protocol: TCP
-        startupProbe:
-          failureThreshold: 300
-          periodSeconds: 5
-        livenessProbe:
-          failureThreshold: 10
-          periodSeconds: 10
-        readinessProbe:
-          failureThreshold: 3
-          periodSeconds: 5
-        {{- with .Values.resources }}
-        resources: {{- include "cozy-lib.resources.sanitize" (list . $) | nindent 10 }}
-        {{- end }}
-    {{- $rawConstraints := "" }}
-    {{- if .Values._cluster.scheduling }}
-      {{- $rawConstraints = get .Values._cluster.scheduling "globalAppTopologySpreadConstraints" }}
-    {{- end }}
-    {{- if $rawConstraints }}
-      {{- $rawConstraints | fromYaml | toYaml | nindent 6 }}
-        labelSelector:
-          matchLabels:
-            app.kubernetes.io/instance: etcd
-    {{- else }}
-      topologySpreadConstraints:
-      - maxSkew: 1
-        topologyKey: "kubernetes.io/hostname"
-        whenUnsatisfiable: ScheduleAnyway
-        labelSelector:
-          matchLabels:
-            app.kubernetes.io/instance: etcd
+    size: {{ .Values.size }}
+    {{- with .Values.storageClass }}
+    storageClassName: {{ . }}
     {{- end }}
-  podDisruptionBudgetTemplate: {}
+  options:
+    # quotaBackendBytes/snapshotCount are typed integers in v1alpha2 (no quotes).
+    quotaBackendBytes: {{ include "calculateQuotaBackendBytes" .Values.size }}
+    autoCompactionMode: periodic
+    autoCompactionRetention: "5m"
+    snapshotCount: 10000
+  {{- with .Values.resources }}
+  resources: {{- include "cozy-lib.resources.sanitize" (list . $) | nindent 4 }}
+  {{- end }}
+  additionalMetadata:
+    labels:
+      cozystack.io/service: etcd
+  # TLS uses secretRef mode: the chart issues the server, operator-client and
+  # peer certs via the cert-manager Certificates rendered below, and the
+  # EtcdCluster only REFERENCES the resulting Secrets. This is deliberate, not
+  # cosmetic — spec.tls is immutable in v1alpha2 (CRD CEL: self.tls ==
+  # oldSelf.tls), and `etcd-migrate` adopts legacy clusters into exactly this
+  # secretRef shape (serverSecretRef/operatorClientSecretRef/peer.secretRef,
+  # pointing at the legacy etcd-{server,client,peer}-tls Secrets). Rendering
+  # certManager here would diverge from the adopted object and the API server
+  # would reject every post-adoption HelmRelease reconcile, leaving migrated
+  # clusters permanently non-Ready. Providing operatorClientSecretRef keeps etcd
+  # --client-cert-auth on, so external clients (the Kamaji DataStore) still
+  # authenticate with a CN=root client cert. ca.crt lives inside each referenced
+  # Secret (cert-manager writes it), which is what v1alpha2 reads as the trusted
+  # CA. No spec.auth: cozystack stays cert-only (no etcd password auth).
+  tls:
+    client:
+      serverSecretRef:
+        name: etcd-server-tls
+      operatorClientSecretRef:
+        name: etcd-client-tls
+    peer:
+      secretRef:
+        name: etcd-peer-tls
+  {{- $rawConstraints := "" }}
+  {{- if .Values._cluster.scheduling }}
+    {{- $rawConstraints = get .Values._cluster.scheduling "globalAppTopologySpreadConstraints" }}
+  {{- end }}
+  {{- if $rawConstraints }}
+  {{- /* The raw value already carries its own top-level topologySpreadConstraints: key */}}
+  {{- $rawConstraints | fromYaml | toYaml | nindent 2 }}
+    labelSelector:
+      matchLabels:
+        app.kubernetes.io/instance: etcd
+  {{- else }}
+  topologySpreadConstraints:
+  - maxSkew: 1
+    topologyKey: "kubernetes.io/hostname"
+    whenUnsatisfiable: ScheduleAnyway
+    labelSelector:
+      matchLabels:
+        app.kubernetes.io/instance: etcd
+  {{- end }}
+  {{- with .Values.affinity }}
+  affinity:
+    {{- toYaml . | nindent 4 }}
+  {{- else }}
+  # Soft anti-affinity: spread etcd members across nodes on a best-effort
+  # basis so a single node failure is unlikely to take out more than one
+  # member. Preferred (not required) because a hard rule would leave a member
+  # Pending when replicas exceed schedulable nodes, or when node-local storage
+  # pins a member to a node. Override via .Values.affinity for a hard rule.
+  affinity:
+    podAntiAffinity:
+      preferredDuringSchedulingIgnoredDuringExecution:
+        - weight: 100
+          podAffinityTerm:
+            labelSelector:
+              matchLabels:
+                app.kubernetes.io/instance: etcd
+            topologyKey: kubernetes.io/hostname
+  {{- end }}
 ---
 apiVersion: cert-manager.io/v1
 kind: Issuer
@@ -164,6 +171,16 @@ spec:
   ca:
     secretName: etcd-ca-tls
 ---
+# Server certificate, referenced by spec.tls.client.serverSecretRef. The SANs
+# must cover every name the operator and clients dial the cluster by. We use
+# WILDCARDS (not the legacy chart's enumerated etcd-<i>.etcd-headless SANs)
+# because the v1alpha2 operator brings up members — including replacements after
+# a failure — under random names in its native domain (<member>.etcd.<ns>.svc);
+# an enumerated list would leave a replacement member's name out of every SAN
+# and fail TLS verification forever (a silent one-short-cluster). The legacy
+# headless wildcard is kept so adopted members still validate during the
+# transition window. cert-manager writes ca.crt into etcd-server-tls, which
+# v1alpha2 reads as --trusted-ca-file.
 apiVersion: cert-manager.io/v1
 kind: Certificate
 metadata:
@@ -178,18 +195,15 @@ spec:
       - {{ .Release.Name }}
   isCA: false
   usages:
-    - "client auth"
-    - "server auth"
-    - "signing"
-    - "key encipherment"
+  - "client auth"
+  - "server auth"
+  - "signing"
+  - "key encipherment"
   dnsNames:
   - etcd
-  - etcd.{{ $.Release.Namespace }}.svc
-  {{- range $i := until (int $.Values.replicas) }}
-  - etcd-{{ $i }}
-  - etcd-{{ $i }}.etcd-headless
-  - etcd-{{ $i }}.etcd-headless.{{ $.Release.Namespace }}.svc
-  {{- end }}
+  - etcd.{{ .Release.Namespace }}.svc
+  - "*.etcd.{{ .Release.Namespace }}.svc"
+  - "*.etcd-headless.{{ .Release.Namespace }}.svc"
   - localhost
   ipAddresses:
   - "127.0.0.1"
@@ -199,7 +213,10 @@ spec:
     size: 4096
   issuerRef:
     name: etcd-issuer
+    kind: Issuer
 ---
+# Peer certificate, referenced by spec.tls.peer.secretRef. Same wildcard SAN
+# rationale as the server cert above.
 apiVersion: cert-manager.io/v1
 kind: Certificate
 metadata:
@@ -214,18 +231,15 @@ spec:
       - {{ .Release.Name }}
   isCA: false
   usages:
-    - "server auth"
-    - "client auth"
-    - "signing"
-    - "key encipherment"
+  - "server auth"
+  - "client auth"
+  - "signing"
+  - "key encipherment"
   dnsNames:
   - etcd
-  - etcd.{{ $.Release.Namespace }}.svc
-  {{- range $i := until (int $.Values.replicas) }}
-  - etcd-{{ $i }}
-  - etcd-{{ $i }}.etcd-headless
-  - etcd-{{ $i }}.etcd-headless.{{ $.Release.Namespace }}.svc
-  {{- end }}
+  - etcd.{{ .Release.Namespace }}.svc
+  - "*.etcd.{{ .Release.Namespace }}.svc"
+  - "*.etcd-headless.{{ .Release.Namespace }}.svc"
   - localhost
   ipAddresses:
   - "127.0.0.1"
@@ -235,7 +249,12 @@ spec:
     size: 4096
   issuerRef:
     name: etcd-peer-issuer
+    kind: Issuer
 ---
+# Client certificate, referenced by spec.tls.client.operatorClientSecretRef and
+# reused by external consumers of the cluster (the Kamaji DataStore).
+# commonName=root identifies the caller as the etcd root user under
+# --client-cert-auth.
 apiVersion: cert-manager.io/v1
 kind: Certificate
 metadata:
@@ -275,3 +294,50 @@ spec:
     app.kubernetes.io/managed-by: etcd-operator
     app.kubernetes.io/name: etcd
   version: {{ $.Chart.Version }}
+---
+# Transitional headless Service backing the LEGACY per-pod DNS names.
+#
+# `etcd-migrate` adopts legacy clusters IN PLACE — the existing Pods are never
+# recreated, so they keep their original `spec.subdomain: etcd-headless` (and
+# hostname etcd-<i>). Their stable DNS name therefore stays
+# `etcd-<i>.etcd-headless.<ns>.svc`, which the v1alpha2 operator dials for
+# MemberList/health until the members are eventually rolled onto its native
+# `<member>.etcd.<ns>.svc` domain (served by the operator-owned `etcd` Service).
+#
+# The v1alpha2 operator only creates the native `etcd` Service, and the legacy
+# `etcd-headless` Service (previously owned by the old operator) is pruned during
+# the transition. Without a Service named `etcd-headless`, the adopted Pods'
+# `etcd-<i>.etcd-headless.<ns>.svc` records stop resolving (`no such host`),
+# MemberList fails, and status.readyMembers never populates — the cluster never
+# goes Ready even though the etcd processes are healthy and in quorum. This is
+# the DNS counterpart of the legacy `*.etcd-headless.<ns>.svc` wildcard kept in
+# the server/peer cert SANs above for the same transition window.
+#
+# Selector mirrors the operator's native `etcd` Service
+# (etcd-operator.cozystack.io/cluster), so this resolves the same member Pods;
+# publishNotReadyAddresses keeps peer discovery working while a member is not
+# yet Ready. Safe to remove — together with the legacy cert SAN — once the
+# members have been rolled onto the native `etcd` subdomain.
+apiVersion: v1
+kind: Service
+metadata:
+  name: etcd-headless
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: etcd
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    cozystack.io/service: etcd
+spec:
+  clusterIP: None
+  publishNotReadyAddresses: true
+  selector:
+    etcd-operator.cozystack.io/cluster: etcd
+  ports:
+  - name: client
+    port: 2379
+    targetPort: 2379
+    protocol: TCP
+  - name: peer
+    port: 2380
+    targetPort: 2380
+    protocol: TCP
diff --git a/packages/extra/etcd/templates/etcd-defrag.yaml b/packages/extra/etcd/templates/etcd-defrag.yaml
index 0478129f64..52cc63518c 100644
--- a/packages/extra/etcd/templates/etcd-defrag.yaml
+++ b/packages/extra/etcd/templates/etcd-defrag.yaml
@@ -14,9 +14,19 @@ spec:
       backoffLimit: 2
       template:
         spec:
+          securityContext:
+            runAsNonRoot: true
+            runAsUser: 1001
+            seccompProfile:
+              type: RuntimeDefault
           containers:
           - name: etcd-defrag
             image: ghcr.io/ahrtr/etcd-defrag:v0.13.0
+            securityContext:
+              allowPrivilegeEscalation: false
+              readOnlyRootFilesystem: true
+              capabilities:
+                drop: ["ALL"]
             resources:
               requests:
                 cpu: 200m
@@ -25,11 +35,23 @@ spec:
                 cpu: 500m
                 memory: 512Mi
             args:
-            - --endpoints={{ range $i, $e := until (int .Values.replicas) }}{{ if $i }},{{ end }}https://{{ $.Release.Name }}-{{ $i }}.{{ $.Release.Name }}-headless.{{ $.Release.Namespace }}.svc:2379{{ end }}
+            # The v1alpha2 operator names the headless Service after the
+            # cluster ({{ $.Release.Name }}) and does not use StatefulSet
+            # ordinal pod names. Point at the headless Service and let
+            # --cluster fan the defrag out to every member via member-list.
+            - --endpoints=https://{{ $.Release.Name }}.{{ $.Release.Namespace }}.svc:2379
             - --cacert=/etc/etcd/pki/client/cert/ca.crt
             - --cert=/etc/etcd/pki/client/cert/tls.crt
             - --key=/etc/etcd/pki/client/cert/tls.key
             - --cluster
+            # etcd compacts itself (periodic, 5m retention, see etcd-cluster.yaml).
+            # Compacting again to the latest revision either fails because nothing
+            # was written since, or drops the history that retention keeps for
+            # watchers to resume from.
+            - --compaction=false
+            # dbQuotaUsage below is dbSize over this value, and the tool assumes
+            # 2 GiB unless told the quota the cluster actually runs with.
+            - --etcd-storage-quota-bytes={{ include "calculateQuotaBackendBytes" .Values.size }}
             - --defrag-rule
             - "dbQuotaUsage > 0.8 || dbSize - dbSizeInUse > 200*1024*1024"
             volumeMounts:
diff --git a/packages/extra/etcd/templates/hooks/cleanup.yaml b/packages/extra/etcd/templates/hooks/cleanup.yaml
new file mode 100644
index 0000000000..62a0666bf6
--- /dev/null
+++ b/packages/extra/etcd/templates/hooks/cleanup.yaml
@@ -0,0 +1,149 @@
+{{- /*
+  Clamp the replica count to at least 1 so an explicit replicas: 0 cannot
+  render an empty resourceNames list below — an empty resourceNames in an RBAC
+  rule matches ALL PVCs in the namespace (a wildcard), which would silently
+  undo the least-privilege scoping. data-etcd-0 always exists for any running
+  cluster, and the delete uses --ignore-not-found, so the clamp is safe.
+*/}}
+{{- $replicaCount := max 1 (int .Values.replicas) | int }}
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ .Release.Name }}-cleanup
+  labels:
+    app.kubernetes.io/instance: {{ .Release.Name }}
+  annotations:
+    "helm.sh/hook": post-delete
+    "helm.sh/hook-weight": "0"
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: {{ .Release.Name }}-cleanup
+  labels:
+    app.kubernetes.io/instance: {{ .Release.Name }}
+  annotations:
+    "helm.sh/hook": post-delete
+    "helm.sh/hook-weight": "5"
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+rules:
+  # The Job deletes the data PVCs by their deterministic per-replica names
+  # (data-etcd-<ordinal>), so we grant delete by explicit resourceNames rather
+  # than a namespace-wide PVC delete that could hit a sibling workload's PVC.
+  - apiGroups: [""]
+    resources: ["persistentvolumeclaims"]
+    verbs: ["get", "delete"]
+    resourceNames:
+{{- range $i := until $replicaCount }}
+      - data-etcd-{{ $i }}
+{{- end }}
+  # cert-manager TLS secrets carry only the cluster-wide
+  # controller.cert-manager.io/fao label, and the two pre-install "keep"
+  # secrets carry none, so we grant delete by explicit resourceNames rather
+  # than an unsafe label sweep that could hit a sibling app's secrets.
+  - apiGroups: [""]
+    resources: ["secrets"]
+    verbs: ["get", "delete"]
+    resourceNames:
+      - etcd-peer-ca-tls
+      - etcd-ca-tls
+      - etcd-server-tls
+      - etcd-peer-tls
+      - etcd-client-tls
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: {{ .Release.Name }}-cleanup
+  labels:
+    app.kubernetes.io/instance: {{ .Release.Name }}
+  annotations:
+    "helm.sh/hook": post-delete
+    "helm.sh/hook-weight": "5"
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: {{ .Release.Name }}-cleanup
+subjects:
+  - kind: ServiceAccount
+    name: {{ .Release.Name }}-cleanup
+    namespace: {{ .Release.Namespace }}
+---
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: {{ .Release.Name }}-cleanup
+  labels:
+    app.kubernetes.io/instance: {{ .Release.Name }}
+  annotations:
+    "helm.sh/hook": post-delete
+    "helm.sh/hook-weight": "10"
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+spec:
+  backoffLimit: 3
+  activeDeadlineSeconds: 120
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/instance: {{ .Release.Name }}
+        policy.cozystack.io/allow-to-apiserver: "true"
+    spec:
+      serviceAccountName: {{ .Release.Name }}-cleanup
+      restartPolicy: Never
+      securityContext:
+        runAsNonRoot: true
+        runAsUser: 65534
+        runAsGroup: 65534
+        fsGroup: 65534
+        seccompProfile:
+          type: RuntimeDefault
+      volumes:
+        - name: tmp
+          emptyDir: {}
+      containers:
+        - name: cleanup
+          image: docker.io/clastix/kubectl:v1.32
+          env:
+            - name: HOME
+              value: /tmp
+          securityContext:
+            allowPrivilegeEscalation: false
+            readOnlyRootFilesystem: true
+            capabilities:
+              drop:
+                - ALL
+          volumeMounts:
+            - name: tmp
+              mountPath: /tmp
+          resources:
+            requests:
+              cpu: 10m
+              memory: 64Mi
+            limits:
+              cpu: 200m
+              memory: 128Mi
+          command:
+            - /bin/sh
+            - -c
+            - |
+              # The EtcdCluster is named "etcd" (check-release-name pins the
+              # release name to "etcd"), so its StatefulSet volumeClaimTemplate
+              # PVCs are named data-etcd-<ordinal>, one per replica. The
+              # etcd-operator does not garbage-collect them on EtcdCluster
+              # deletion, so we delete them here by name (safe: no sibling
+              # workload shares the data-etcd-* prefix in a tenant namespace).
+              echo "Deleting orphaned etcd data PVCs for {{ .Release.Name }}..."
+              kubectl delete pvc -n {{ .Release.Namespace }} {{ range $i := until $replicaCount }}data-etcd-{{ $i }} {{ end }}--ignore-not-found --wait=false \
+                || echo "WARNING: etcd PVC cleanup failed for {{ .Release.Name }}; orphaned PVCs may remain" >&2
+              # etcd-ca-tls / etcd-client-tls are pre-install "keep" secrets
+              # this chart owns; etcd-peer-ca-tls / etcd-server-tls /
+              # etcd-peer-tls are cert-manager-issued secrets with no owner
+              # reference. None are reclaimed by the uninstall, so delete them
+              # by name.
+              echo "Deleting orphaned etcd TLS secrets for {{ .Release.Name }}..."
+              kubectl delete secret -n {{ .Release.Namespace }} etcd-peer-ca-tls etcd-ca-tls etcd-server-tls etcd-peer-tls etcd-client-tls --ignore-not-found --wait=false \
+                || echo "WARNING: etcd secret cleanup failed for {{ .Release.Name }}; orphaned secrets may remain" >&2
+              echo "etcd cleanup complete."
diff --git a/packages/extra/etcd/templates/vpa.yaml b/packages/extra/etcd/templates/vpa.yaml
index 57055cbdfc..7be0efbe90 100644
--- a/packages/extra/etcd/templates/vpa.yaml
+++ b/packages/extra/etcd/templates/vpa.yaml
@@ -4,12 +4,19 @@ kind: VerticalPodAutoscaler
 metadata:
   name: etcd
 spec:
+  # The v1alpha2 operator manages member Pods directly (no StatefulSet); the
+  # EtcdCluster exposes a /scale subresource with status.selector for HPA/VPA.
   targetRef:
-    apiVersion: apps/v1
-    kind: StatefulSet
+    apiVersion: etcd-operator.cozystack.io/v1alpha2
+    kind: EtcdCluster
     name: etcd
   updatePolicy:
-    updateMode: Auto
+    # Initial, not Auto: Auto evicts running etcd members to apply new
+    # recommendations, churning the StatefulSet (and tripping the Cilium
+    # IP-reuse leak under load). Evicting an etcd member is also disruptive to
+    # quorum. Initial sets requests at pod creation without evicting; the
+    # minAllowed floor below is the safety net since running pods aren't resized.
+    updateMode: Initial
   resourcePolicy:
     containerPolicies:
     - containerName: etcd
diff --git a/packages/extra/etcd/tests/affinity_test.yaml b/packages/extra/etcd/tests/affinity_test.yaml
new file mode 100644
index 0000000000..ea762ccb7a
--- /dev/null
+++ b/packages/extra/etcd/tests/affinity_test.yaml
@@ -0,0 +1,57 @@
+suite: etcd EtcdCluster affinity rendering
+
+release:
+  name: etcd
+  namespace: tenant-root
+
+templates:
+  - templates/etcd-cluster.yaml
+
+tests:
+  - it: applies a soft per-host podAntiAffinity by default
+    set:
+      _cluster: {}
+    documentSelector:
+      path: kind
+      value: EtcdCluster
+    asserts:
+      - equal:
+          path: spec.affinity.podAntiAffinity.preferredDuringSchedulingIgnoredDuringExecution[0].weight
+          value: 100
+      - equal:
+          path: spec.affinity.podAntiAffinity.preferredDuringSchedulingIgnoredDuringExecution[0].podAffinityTerm.topologyKey
+          value: kubernetes.io/hostname
+      - equal:
+          path: spec.affinity.podAntiAffinity.preferredDuringSchedulingIgnoredDuringExecution[0].podAffinityTerm.labelSelector.matchLabels["app.kubernetes.io/instance"]
+          value: etcd
+      - lengthEqual:
+          path: spec.affinity.podAntiAffinity.preferredDuringSchedulingIgnoredDuringExecution
+          count: 1
+
+  # A supplied affinity must replace the default outright — a hard rule should
+  # render verbatim and the soft preferred default must not leak through.
+  - it: renders a supplied affinity verbatim and drops the default
+    set:
+      _cluster: {}
+      affinity:
+        podAntiAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            - labelSelector:
+                matchLabels:
+                  app.kubernetes.io/instance: etcd
+              topologyKey: kubernetes.io/hostname
+    documentSelector:
+      path: kind
+      value: EtcdCluster
+    asserts:
+      - equal:
+          path: spec.affinity.podAntiAffinity.requiredDuringSchedulingIgnoredDuringExecution[0].topologyKey
+          value: kubernetes.io/hostname
+      - equal:
+          path: spec.affinity.podAntiAffinity.requiredDuringSchedulingIgnoredDuringExecution[0].labelSelector.matchLabels["app.kubernetes.io/instance"]
+          value: etcd
+      - lengthEqual:
+          path: spec.affinity.podAntiAffinity.requiredDuringSchedulingIgnoredDuringExecution
+          count: 1
+      - notExists:
+          path: spec.affinity.podAntiAffinity.preferredDuringSchedulingIgnoredDuringExecution
diff --git a/packages/extra/etcd/tests/backup-secret_test.yaml b/packages/extra/etcd/tests/backup-secret_test.yaml
deleted file mode 100644
index 02d8197724..0000000000
--- a/packages/extra/etcd/tests/backup-secret_test.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-suite: backup secret tests
-
-templates:
-  - templates/backup-secret.yaml
-
-tests:
-  - it: does not render when backup disabled
-    release:
-      name: etcd
-      namespace: tenant-test
-    set:
-      backup:
-        enabled: false
-    asserts:
-      - hasDocuments:
-          count: 0
-
-  - it: renders when backup enabled with valid credentials
-    release:
-      name: etcd
-      namespace: tenant-test
-    set:
-      backup:
-        enabled: true
-        s3AccessKey: "AKIAIOSFODNN7EXAMPLE"
-        s3SecretKey: "wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY"
-        destinationPath: "s3://bucket/path/"
-        endpointURL: "https://s3.example.com"
-    asserts:
-      - hasDocuments:
-          count: 1
-      - isKind:
-          of: Secret
-      - equal:
-          path: metadata.name
-          value: etcd-s3-creds
-      - equal:
-          path: type
-          value: Opaque
-
-  - it: secret name is hardcoded regardless of release name
-    release:
-      name: etcd
-      namespace: tenant-test
-    set:
-      backup:
-        enabled: true
-        s3AccessKey: "k"
-        s3SecretKey: "s"
-        destinationPath: "s3://b/"
-        endpointURL: "https://s3.example.com"
-    asserts:
-      - equal:
-          path: metadata.name
-          value: etcd-s3-creds
-
-  - it: contains AWS credentials in expected keys
-    release:
-      name: etcd
-      namespace: tenant-test
-    set:
-      backup:
-        enabled: true
-        s3AccessKey: "MYACCESSKEY"
-        s3SecretKey: "MYSECRETKEY"
-        destinationPath: "s3://b/"
-        endpointURL: "https://s3.example.com"
-    asserts:
-      - equal:
-          path: stringData.AWS_ACCESS_KEY_ID
-          value: "MYACCESSKEY"
-      - equal:
-          path: stringData.AWS_SECRET_ACCESS_KEY
-          value: "MYSECRETKEY"
-
-  - it: fails when s3AccessKey is empty
-    release:
-      name: etcd
-      namespace: tenant-test
-    set:
-      backup:
-        enabled: true
-        s3AccessKey: ""
-        s3SecretKey: "secretkey"
-        destinationPath: "s3://b/"
-        endpointURL: "https://s3.example.com"
-    asserts:
-      - failedTemplate:
-          errorMessage: "backup.s3AccessKey is required when backup.enabled=true"
-
-  - it: fails when s3SecretKey is empty
-    release:
-      name: etcd
-      namespace: tenant-test
-    set:
-      backup:
-        enabled: true
-        s3AccessKey: "accesskey"
-        s3SecretKey: ""
-        destinationPath: "s3://b/"
-        endpointURL: "https://s3.example.com"
-    asserts:
-      - failedTemplate:
-          errorMessage: "backup.s3SecretKey is required when backup.enabled=true"
diff --git a/packages/extra/etcd/tests/backup-values-compat_test.yaml b/packages/extra/etcd/tests/backup-values-compat_test.yaml
new file mode 100644
index 0000000000..bc14d7219d
--- /dev/null
+++ b/packages/extra/etcd/tests/backup-values-compat_test.yaml
@@ -0,0 +1,41 @@
+suite: etcd chart tolerates leftover legacy backup.* values on upgrade
+
+# A tenant upgrading from the pre-v1alpha2 chart still carries spec.backup on
+# their apps.cozystack.io/Etcd CR (the old backup.enabled=true knob). The
+# v1alpha2 chart dropped the backup.* schema and templates entirely. Helm
+# validates a release's values against values.schema.json on every upgrade, so
+# if that schema ever gains `additionalProperties: false`, the leftover backup
+# key would fail validation and wedge the Etcd HelmRelease for EVERY such tenant
+# (a far louder, earlier break than the scheduled-backups-stop the migration
+# warns about). This pins that the leftover values are IGNORED, not rejected.
+
+release:
+  name: etcd
+  namespace: tenant-test
+
+templates:
+  - templates/etcd-cluster.yaml
+
+tests:
+  - it: renders the EtcdCluster when a legacy backup.* block is still present
+    set:
+      _cluster: {}
+      backup:
+        enabled: true
+        s3Bucket: legacy-bucket
+        s3Region: us-east-1
+        schedule: "@daily"
+    documentSelector:
+      path: kind
+      value: EtcdCluster
+    asserts:
+      # The render reaching a valid EtcdCluster doc proves Helm's values-schema
+      # validation accepted the leftover backup.* block. If values.schema.json
+      # gained additionalProperties:false, helm-unittest would error here with
+      # "additional properties 'backup' not allowed" instead.
+      - equal:
+          path: spec.replicas
+          value: 3
+      - equal:
+          path: spec.version
+          value: "3.6.11"
diff --git a/packages/extra/etcd/tests/cleanup_test.yaml b/packages/extra/etcd/tests/cleanup_test.yaml
new file mode 100644
index 0000000000..5b646cb5f3
--- /dev/null
+++ b/packages/extra/etcd/tests/cleanup_test.yaml
@@ -0,0 +1,211 @@
+suite: etcd post-delete cleanup hook removes orphaned PVCs and TLS secrets
+templates:
+  - templates/hooks/cleanup.yaml
+
+release:
+  name: etcd
+  namespace: tenant-root
+
+# After the etcd tenant module is disabled (etcd: false), the etcd-operator
+# StatefulSet data PVCs (data-etcd-{0,1,2}) are never garbage-collected, and
+# the five etcd-*-tls secrets are left orphaned in the tenant namespace:
+#   - etcd-ca-tls / etcd-client-tls are created by this chart as pre-install
+#     hooks with helm.sh/resource-policy: keep, so Helm deliberately keeps them.
+#   - etcd-peer-ca-tls / etcd-server-tls / etcd-peer-tls are populated by
+#     cert-manager from Certificate resources and carry no owner reference back
+#     to the chart, so they survive the uninstall.
+# The check-release-name.tpl guard pins .Release.Name to "etcd", so every
+# target name is deterministic. This post-delete hook renders a Job (plus its
+# RBAC) that deletes the data PVCs by name (one per replica) and the five
+# secrets by name.
+
+tests:
+  - it: renders the cleanup ServiceAccount as a post-delete hook
+    documentSelector:
+      path: kind
+      value: ServiceAccount
+    asserts:
+      - equal:
+          path: metadata.name
+          value: etcd-cleanup
+      - equal:
+          path: metadata.annotations["helm.sh/hook"]
+          value: post-delete
+      - equal:
+          path: metadata.annotations["helm.sh/hook-weight"]
+          value: "0"
+      - equal:
+          path: metadata.annotations["helm.sh/hook-delete-policy"]
+          value: before-hook-creation,hook-succeeded
+
+  - it: grants delete on PVCs and only the 5 named TLS secrets
+    documentSelector:
+      path: kind
+      value: Role
+    asserts:
+      - equal:
+          path: metadata.annotations["helm.sh/hook"]
+          value: post-delete
+      - equal:
+          path: metadata.annotations["helm.sh/hook-weight"]
+          value: "5"
+      - equal:
+          path: metadata.annotations["helm.sh/hook-delete-policy"]
+          value: before-hook-creation,hook-succeeded
+      # PVC deletes are scoped to the deterministic per-replica names, not a
+      # namespace-wide delete, so a regression cannot reach a sibling's PVC.
+      - contains:
+          path: rules
+          content:
+            apiGroups: [""]
+            resources: ["persistentvolumeclaims"]
+            verbs: ["get", "delete"]
+            resourceNames:
+              - data-etcd-0
+              - data-etcd-1
+              - data-etcd-2
+      - contains:
+          path: rules
+          content:
+            apiGroups: [""]
+            resources: ["secrets"]
+            verbs: ["get", "delete"]
+            resourceNames:
+              - etcd-peer-ca-tls
+              - etcd-ca-tls
+              - etcd-server-tls
+              - etcd-peer-tls
+              - etcd-client-tls
+
+  - it: binds the cleanup Role to the cleanup ServiceAccount
+    documentSelector:
+      path: kind
+      value: RoleBinding
+    asserts:
+      - equal:
+          path: metadata.annotations["helm.sh/hook"]
+          value: post-delete
+      - equal:
+          path: metadata.annotations["helm.sh/hook-weight"]
+          value: "5"
+      - equal:
+          path: metadata.annotations["helm.sh/hook-delete-policy"]
+          value: before-hook-creation,hook-succeeded
+      - equal:
+          path: roleRef.name
+          value: etcd-cleanup
+      - equal:
+          path: subjects[0].kind
+          value: ServiceAccount
+      - equal:
+          path: subjects[0].name
+          value: etcd-cleanup
+
+  - it: renders a hardened cleanup Job with the right hook metadata
+    documentSelector:
+      path: kind
+      value: Job
+    asserts:
+      - equal:
+          path: metadata.name
+          value: etcd-cleanup
+      - equal:
+          path: metadata.annotations["helm.sh/hook"]
+          value: post-delete
+      - equal:
+          path: metadata.annotations["helm.sh/hook-weight"]
+          value: "10"
+      - equal:
+          path: metadata.annotations["helm.sh/hook-delete-policy"]
+          value: before-hook-creation,hook-succeeded
+      - equal:
+          path: spec.activeDeadlineSeconds
+          value: 120
+      - equal:
+          path: spec.template.metadata.labels["policy.cozystack.io/allow-to-apiserver"]
+          value: "true"
+      - equal:
+          path: spec.template.spec.serviceAccountName
+          value: etcd-cleanup
+      - equal:
+          path: spec.template.spec.containers[0].image
+          value: docker.io/clastix/kubectl:v1.32
+      - equal:
+          path: spec.template.spec.securityContext.runAsNonRoot
+          value: true
+      - equal:
+          path: spec.template.spec.securityContext.runAsUser
+          value: 65534
+      - equal:
+          path: spec.template.spec.securityContext.seccompProfile.type
+          value: RuntimeDefault
+      - equal:
+          path: spec.template.spec.containers[0].securityContext.readOnlyRootFilesystem
+          value: true
+      - equal:
+          path: spec.template.spec.containers[0].securityContext.allowPrivilegeEscalation
+          value: false
+      - contains:
+          path: spec.template.spec.containers[0].securityContext.capabilities.drop
+          content: ALL
+      - equal:
+          path: spec.template.spec.containers[0].resources.requests.cpu
+          value: 10m
+      - equal:
+          path: spec.template.spec.containers[0].resources.requests.memory
+          value: 64Mi
+      - equal:
+          path: spec.template.spec.containers[0].resources.limits.cpu
+          value: 200m
+      - equal:
+          path: spec.template.spec.containers[0].resources.limits.memory
+          value: 128Mi
+
+  - it: deletes one data PVC per replica and the five TLS secrets by name
+    documentSelector:
+      path: kind
+      value: Job
+    asserts:
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: 'kubectl delete pvc -n tenant-root data-etcd-0 data-etcd-1 data-etcd-2 --ignore-not-found --wait=false'
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: 'kubectl delete secret -n tenant-root etcd-peer-ca-tls etcd-ca-tls etcd-server-tls etcd-peer-tls etcd-client-tls --ignore-not-found --wait=false'
+
+  - it: scales the PVC list to the configured replica count
+    documentSelector:
+      path: kind
+      value: Job
+    set:
+      replicas: 5
+    asserts:
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: 'kubectl delete pvc -n tenant-root data-etcd-0 data-etcd-1 data-etcd-2 data-etcd-3 data-etcd-4 --ignore-not-found --wait=false'
+
+  # An explicit replicas: 0 must NOT render an empty resourceNames list — an
+  # empty resourceNames in an RBAC rule matches every PVC in the namespace
+  # (a wildcard), which would silently undo the least-privilege scoping. The
+  # $replicaCount clamp keeps at least data-etcd-0 in both the Role and command.
+  - it: clamps to one PVC name when replicas is 0 so RBAC never becomes a wildcard
+    set:
+      replicas: 0
+    asserts:
+      - contains:
+          path: rules
+          content:
+            apiGroups: [""]
+            resources: ["persistentvolumeclaims"]
+            verbs: ["get", "delete"]
+            resourceNames:
+              - data-etcd-0
+        documentSelector:
+          path: kind
+          value: Role
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: 'kubectl delete pvc -n tenant-root data-etcd-0 --ignore-not-found --wait=false'
+        documentSelector:
+          path: kind
+          value: Job
diff --git a/packages/extra/etcd/tests/defrag_test.yaml b/packages/extra/etcd/tests/defrag_test.yaml
new file mode 100644
index 0000000000..8d74e1a6b2
--- /dev/null
+++ b/packages/extra/etcd/tests/defrag_test.yaml
@@ -0,0 +1,43 @@
+suite: etcd defrag CronJob leaves compaction to etcd and knows the real quota
+
+release:
+  name: etcd
+  namespace: tenant-test
+
+templates:
+  - templates/etcd-defrag.yaml
+  - templates/etcd-cluster.yaml
+
+set:
+  _cluster: {}
+
+tests:
+  - it: does not compact before defragmenting
+    template: templates/etcd-defrag.yaml
+    asserts:
+      - contains:
+          path: spec.jobTemplate.spec.template.spec.containers[0].args
+          content: --compaction=false
+
+  - it: evaluates dbQuotaUsage against the default 4Gi cluster quota
+    template: templates/etcd-defrag.yaml
+    asserts:
+      - contains:
+          path: spec.jobTemplate.spec.template.spec.containers[0].args
+          content: --etcd-storage-quota-bytes=4080218931
+
+  - it: passes the defrag tool the same quota the EtcdCluster gets
+    set:
+      size: 10Gi
+    asserts:
+      - contains:
+          path: spec.jobTemplate.spec.template.spec.containers[0].args
+          content: --etcd-storage-quota-bytes=10200547328
+        template: templates/etcd-defrag.yaml
+      - equal:
+          path: spec.options.quotaBackendBytes
+          value: 10200547328
+        template: templates/etcd-cluster.yaml
+        documentSelector:
+          path: kind
+          value: EtcdCluster
diff --git a/packages/extra/etcd/tests/etcd-backup-schedule_test.yaml b/packages/extra/etcd/tests/etcd-backup-schedule_test.yaml
deleted file mode 100644
index 0f0197120e..0000000000
--- a/packages/extra/etcd/tests/etcd-backup-schedule_test.yaml
+++ /dev/null
@@ -1,174 +0,0 @@
-suite: etcd backup schedule tests
-
-templates:
-  - templates/etcd-backup-schedule.yaml
-
-tests:
-  - it: does not render when backup disabled
-    release:
-      name: etcd
-      namespace: tenant-test
-    set:
-      backup:
-        enabled: false
-    asserts:
-      - hasDocuments:
-          count: 0
-
-  - it: renders when backup enabled with valid values
-    release:
-      name: etcd
-      namespace: tenant-test
-    set:
-      backup:
-        enabled: true
-        schedule: "0 2 * * *"
-        destinationPath: "s3://my-bucket/etcd/prod/"
-        endpointURL: "https://s3.example.com"
-        region: "us-east-1"
-        forcePathStyle: true
-        s3AccessKey: "k"
-        s3SecretKey: "s"
-        successfulJobsHistoryLimit: 3
-        failedJobsHistoryLimit: 1
-    asserts:
-      - hasDocuments:
-          count: 1
-      - isKind:
-          of: EtcdBackupSchedule
-      - equal:
-          path: metadata.name
-          value: etcd
-      - equal:
-          path: spec.clusterRef.name
-          value: etcd
-      - equal:
-          path: spec.schedule
-          value: "0 2 * * *"
-      - equal:
-          path: spec.destination.s3.endpoint
-          value: "https://s3.example.com"
-      - equal:
-          path: spec.destination.s3.bucket
-          value: "my-bucket"
-      - equal:
-          path: spec.destination.s3.key
-          value: "etcd/prod"
-      - equal:
-          path: spec.destination.s3.region
-          value: "us-east-1"
-      - equal:
-          path: spec.destination.s3.forcePathStyle
-          value: true
-      - equal:
-          path: spec.destination.s3.credentialsSecretRef.name
-          value: etcd-s3-creds
-
-  - it: omits key when destinationPath points at bucket root
-    release:
-      name: etcd
-      namespace: tenant-test
-    set:
-      backup:
-        enabled: true
-        destinationPath: "s3://bucket-only/"
-        endpointURL: "https://s3.example.com"
-        s3AccessKey: "k"
-        s3SecretKey: "s"
-    asserts:
-      - equal:
-          path: spec.destination.s3.bucket
-          value: "bucket-only"
-      - notExists:
-          path: spec.destination.s3.key
-
-  - it: omits region when not set
-    release:
-      name: etcd
-      namespace: tenant-test
-    set:
-      backup:
-        enabled: true
-        destinationPath: "s3://b/k/"
-        endpointURL: "https://s3.example.com"
-        region: ""
-        s3AccessKey: "k"
-        s3SecretKey: "s"
-    asserts:
-      - notExists:
-          path: spec.destination.s3.region
-
-  - it: fails when destinationPath is empty
-    release:
-      name: etcd
-      namespace: tenant-test
-    set:
-      backup:
-        enabled: true
-        destinationPath: ""
-        endpointURL: "https://s3.example.com"
-        s3AccessKey: "k"
-        s3SecretKey: "s"
-    asserts:
-      - failedTemplate:
-          errorMessage: "backup.destinationPath is required when backup.enabled=true"
-
-  - it: fails when endpointURL is empty
-    release:
-      name: etcd
-      namespace: tenant-test
-    set:
-      backup:
-        enabled: true
-        destinationPath: "s3://b/"
-        endpointURL: ""
-        s3AccessKey: "k"
-        s3SecretKey: "s"
-    asserts:
-      - failedTemplate:
-          errorMessage: "backup.endpointURL is required when backup.enabled=true"
-
-  - it: fails when destinationPath lacks s3:// prefix
-    release:
-      name: etcd
-      namespace: tenant-test
-    set:
-      backup:
-        enabled: true
-        destinationPath: "my-bucket/path/"
-        endpointURL: "https://s3.example.com"
-        s3AccessKey: "k"
-        s3SecretKey: "s"
-    asserts:
-      - failedTemplate:
-          errorMessage: "backup.destinationPath must start with s3://"
-
-  - it: fails when destinationPath contains double slashes
-    release:
-      name: etcd
-      namespace: tenant-test
-    set:
-      backup:
-        enabled: true
-        destinationPath: "s3://bucket//subdir/"
-        endpointURL: "https://s3.example.com"
-        s3AccessKey: "k"
-        s3SecretKey: "s"
-    asserts:
-      - failedTemplate:
-          errorMessage: "backup.destinationPath must not contain '//' segments"
-
-  - it: fails when destinationPath has no bucket
-    release:
-      name: etcd
-      namespace: tenant-test
-    set:
-      backup:
-        enabled: true
-        destinationPath: "s3:///path/"
-        endpointURL: "https://s3.example.com"
-        s3AccessKey: "k"
-        s3SecretKey: "s"
-    asserts:
-      - failedTemplate:
-          errorMessage: "backup.destinationPath must contain a bucket (e.g. s3://bucket/path/)"
diff --git a/packages/extra/etcd/tests/etcd-cluster_test.yaml b/packages/extra/etcd/tests/etcd-cluster_test.yaml
new file mode 100644
index 0000000000..e9d9a981c4
--- /dev/null
+++ b/packages/extra/etcd/tests/etcd-cluster_test.yaml
@@ -0,0 +1,77 @@
+suite: etcd cluster pins an etcd version new enough for consistent watches
+
+# Retargeted from #3122 to the v1alpha2 chart. Under etcd.aenix.io/v1alpha1 the
+# version was forced via a spec.podTemplate container image override (the
+# operator hardcoded v3.5.12); v1alpha2 exposes spec.version and the operator
+# pulls etcd at that version from its own configured image, so there is no
+# podTemplate image to assert. The durable contract is unchanged: the requested
+# etcd release is >= 3.5.13 (the floor at which kube-apiserver enables the
+# RequestWatchProgress storage feature for consistent watches), never the
+# operator-default v3.5.12. The exact patch is intentionally NOT pinned here so
+# routine version bumps do not turn this red.
+
+release:
+  name: etcd
+  namespace: tenant-test
+
+templates:
+  - templates/etcd-cluster.yaml
+
+set:
+  _cluster: {}
+
+tests:
+  - it: requests an etcd version >= 3.5.13 via spec.version
+    documentSelector:
+      path: kind
+      value: EtcdCluster
+    asserts:
+      - matchRegex:
+          path: spec.version
+          pattern: ^(3\.5\.(1[3-9]|[2-9][0-9]|[1-9][0-9]{2,})|3\.([6-9]|[1-9][0-9])\.[0-9]+|[4-9][0-9]*\.[0-9]+\.[0-9]+)$
+
+  - it: never falls back to the operator default v3.5.12
+    documentSelector:
+      path: kind
+      value: EtcdCluster
+    asserts:
+      - notEqual:
+          path: spec.version
+          value: "3.5.12"
+
+  - it: ships the transitional etcd-headless Service that keeps legacy per-pod DNS resolving during v1alpha2 adoption
+    # Adopted Pods keep their legacy `etcd-<i>.etcd-headless.<ns>.svc` DNS (never
+    # recreated), which the operator dials for MemberList until members roll onto
+    # the native domain. It must be headless, publish not-ready addresses (so
+    # peer discovery works before a member is Ready), select the operator's
+    # member Pods, and expose the client/peer ports.
+    documentSelector:
+      path: kind
+      value: Service
+    asserts:
+      - equal:
+          path: metadata.name
+          value: etcd-headless
+      - equal:
+          path: spec.clusterIP
+          value: None
+      - equal:
+          path: spec.publishNotReadyAddresses
+          value: true
+      - equal:
+          path: spec.selector["etcd-operator.cozystack.io/cluster"]
+          value: etcd
+      - contains:
+          path: spec.ports
+          content:
+            name: client
+            port: 2379
+            targetPort: 2379
+            protocol: TCP
+      - contains:
+          path: spec.ports
+          content:
+            name: peer
+            port: 2380
+            targetPort: 2380
+            protocol: TCP
diff --git a/packages/extra/etcd/tests/tls-secretref_test.yaml b/packages/extra/etcd/tests/tls-secretref_test.yaml
new file mode 100644
index 0000000000..112de9cac9
--- /dev/null
+++ b/packages/extra/etcd/tests/tls-secretref_test.yaml
@@ -0,0 +1,76 @@
+suite: etcd EtcdCluster TLS uses secretRef matching etcd-migrate adoption
+# Review blocker B2: spec.tls is immutable in v1alpha2 and `etcd-migrate` adopts
+# legacy clusters into the secretRef shape (serverSecretRef / operatorClientSecretRef
+# / peer.secretRef -> etcd-{server,client,peer}-tls). The chart MUST render that
+# same shape, not certManager, or every post-adoption reconcile is rejected by the
+# CRD's `self.tls == oldSelf.tls` rule and migrated clusters stay non-Ready. The
+# chart-issued server/peer certs must carry the operator's native wildcard domain
+# so a replacement member (random name) still validates TLS.
+
+release:
+  name: etcd
+  namespace: tenant-root
+
+templates:
+  - templates/etcd-cluster.yaml
+
+tests:
+  - it: renders the EtcdCluster TLS as secretRef, not certManager
+    set:
+      _cluster: {}
+    documentSelector:
+      path: kind
+      value: EtcdCluster
+    asserts:
+      - equal:
+          path: spec.tls.client.serverSecretRef.name
+          value: etcd-server-tls
+      - equal:
+          path: spec.tls.client.operatorClientSecretRef.name
+          value: etcd-client-tls
+      - equal:
+          path: spec.tls.peer.secretRef.name
+          value: etcd-peer-tls
+      # certManager shape would diverge from the adopted object on the immutable
+      # spec.tls subtree -> API rejection on the next HelmRelease reconcile.
+      - notExists:
+          path: spec.tls.client.certManager
+      - notExists:
+          path: spec.tls.peer.certManager
+
+  - it: issues the server cert with the operator's native wildcard SANs
+    set:
+      _cluster: {}
+    documentSelector:
+      path: metadata.name
+      value: etcd-server
+    asserts:
+      - equal:
+          path: spec.secretName
+          value: etcd-server-tls
+      - contains:
+          path: spec.dnsNames
+          content: "*.etcd.tenant-root.svc"
+      - contains:
+          path: spec.dnsNames
+          content: "*.etcd-headless.tenant-root.svc"
+      - equal:
+          path: spec.issuerRef.name
+          value: etcd-issuer
+
+  - it: issues the peer cert with the operator's native wildcard SANs
+    set:
+      _cluster: {}
+    documentSelector:
+      path: metadata.name
+      value: etcd-peer
+    asserts:
+      - equal:
+          path: spec.secretName
+          value: etcd-peer-tls
+      - contains:
+          path: spec.dnsNames
+          content: "*.etcd.tenant-root.svc"
+      - equal:
+          path: spec.issuerRef.name
+          value: etcd-peer-issuer
diff --git a/packages/extra/etcd/tests/topology-spread_test.yaml b/packages/extra/etcd/tests/topology-spread_test.yaml
new file mode 100644
index 0000000000..4b96fc310c
--- /dev/null
+++ b/packages/extra/etcd/tests/topology-spread_test.yaml
@@ -0,0 +1,66 @@
+suite: etcd EtcdCluster topologySpreadConstraints rendering
+
+release:
+  name: etcd
+  namespace: tenant-root
+
+templates:
+  - templates/etcd-cluster.yaml
+
+tests:
+  - it: uses a soft per-host spread by default
+    set:
+      _cluster: {}
+    documentSelector:
+      path: kind
+      value: EtcdCluster
+    asserts:
+      - equal:
+          path: spec.topologySpreadConstraints[0].maxSkew
+          value: 1
+      - equal:
+          path: spec.topologySpreadConstraints[0].topologyKey
+          value: kubernetes.io/hostname
+      - equal:
+          path: spec.topologySpreadConstraints[0].whenUnsatisfiable
+          value: ScheduleAnyway
+      - equal:
+          path: spec.topologySpreadConstraints[0].labelSelector.matchLabels["app.kubernetes.io/instance"]
+          value: etcd
+      - lengthEqual:
+          path: spec.topologySpreadConstraints
+          count: 1
+
+  # Regression guard: a cluster-wide globalAppTopologySpreadConstraints is
+  # authored as a full block whose top-level key is `topologySpreadConstraints:`.
+  # The custom branch must NOT re-emit that key (duplicate key => helm aborts)
+  # and must nest labelSelector under the injected list item, mirroring the
+  # postgres/kubernetes charts.
+  - it: injects the cluster-wide spread policy without duplicating the key
+    set:
+      _cluster:
+        scheduling:
+          globalAppTopologySpreadConstraints: |
+            topologySpreadConstraints:
+            - maxSkew: 2
+              topologyKey: topology.kubernetes.io/zone
+              whenUnsatisfiable: DoNotSchedule
+    documentSelector:
+      path: kind
+      value: EtcdCluster
+    asserts:
+      - equal:
+          path: spec.topologySpreadConstraints[0].maxSkew
+          value: 2
+      - equal:
+          path: spec.topologySpreadConstraints[0].topologyKey
+          value: topology.kubernetes.io/zone
+      - equal:
+          path: spec.topologySpreadConstraints[0].whenUnsatisfiable
+          value: DoNotSchedule
+      - equal:
+          path: spec.topologySpreadConstraints[0].labelSelector.matchLabels["app.kubernetes.io/instance"]
+          value: etcd
+      - lengthEqual:
+          path: spec.topologySpreadConstraints
+          count: 1
diff --git a/packages/extra/etcd/tests/vpa_test.yaml b/packages/extra/etcd/tests/vpa_test.yaml
new file mode 100644
index 0000000000..3c8bc09cca
--- /dev/null
+++ b/packages/extra/etcd/tests/vpa_test.yaml
@@ -0,0 +1,39 @@
+suite: etcd VerticalPodAutoscaler bounds
+
+release:
+  name: etcd
+  namespace: tenant-root
+
+templates:
+  - templates/vpa.yaml
+
+tests:
+  - it: brackets the sanitized request with a floor and a ceiling
+    set:
+      _cluster: {}
+    asserts:
+      - equal:
+          path: spec.resourcePolicy.containerPolicies[0].minAllowed.cpu
+          value: "0.025"
+      - equal:
+          path: spec.resourcePolicy.containerPolicies[0].maxAllowed.cpu
+          value: "0.5"
+
+  # Regression guard for #3517. minAllowed/maxAllowed are bounds on the
+  # *request* the VPA sets, so they go through cozy-lib.resources.sanitize and
+  # are divided by cpuAllocationRatio like every other request in the chart.
+  # 250m / 4 = 62.5m, which the VPA admission webhook rejects outright
+  # ("minAllowed: CPU [62500u] must be a whole number of milli CPUs"), leaving
+  # the HelmRelease looping UpgradeFailed -> RollbackFailed forever. The helper
+  # now rounds up to a whole milli-CPU, so any ratio renders a valid quantity.
+  - it: renders whole milli-CPU bounds on a ratio that does not divide 250m
+    set:
+      _cluster:
+        cpu-allocation-ratio: 4
+    asserts:
+      - equal:
+          path: spec.resourcePolicy.containerPolicies[0].minAllowed.cpu
+          value: 63m
+      - equal:
+          path: spec.resourcePolicy.containerPolicies[0].maxAllowed.cpu
+          value: "1.25"
diff --git a/packages/extra/etcd/values.schema.json b/packages/extra/etcd/values.schema.json
index 75917e8e11..b438ca9d7b 100644
--- a/packages/extra/etcd/values.schema.json
+++ b/packages/extra/etcd/values.schema.json
@@ -2,6 +2,11 @@
   "title": "Chart Values",
   "type": "object",
   "properties": {
+    "version": {
+      "description": "etcd version (X.Y.Z) to run, set on the EtcdCluster's spec.version; the operator pulls etcd from its own configured image.",
+      "type": "string",
+      "default": "3.6.11"
+    },
     "size": {
       "description": "Persistent Volume size.",
       "default": "4Gi",
@@ -61,62 +66,11 @@
         }
       }
     },
-    "backup": {
-      "description": "DEPRECATED: Backup configuration. The chart still renders the legacy EtcdBackupSchedule when backup.enabled=true, but new tenants should drive backups through a BackupClass bound to the Etcd strategy (strategy.backups.cozystack.io/v1alpha1).",
+    "affinity": {
+      "description": "Affinity rules set verbatim on the EtcdCluster's spec.affinity, replacing the chart default. When left empty the chart applies a soft (preferred) podAntiAffinity that spreads members across nodes by kubernetes.io/hostname on a best-effort basis, so a single node failure is less likely to take out more than one member. The default is intentionally soft: a hard rule would leave a member Pending when there are fewer schedulable nodes than replicas, or when node-local storage pins a member to a node. Set a hard requiredDuringSchedulingIgnoredDuringExecution rule here to forbid co-location outright (only on clusters with enough nodes and non-node-pinned storage). Note that the operator applies affinity only when it creates or replaces a member Pod and does not reschedule running members, so on a cluster that already has co-located members the rule takes effect only as each member is replaced, not retroactively.",
       "type": "object",
       "default": {},
-      "properties": {
-        "destinationPath": {
-          "description": "DEPRECATED: Destination path for backups (e.g. s3://bucket/path/).",
-          "type": "string",
-          "default": ""
-        },
-        "enabled": {
-          "description": "DEPRECATED: Enable scheduled S3 backups. Use a BackupJob against an Etcd strategy instead.",
-          "type": "boolean",
-          "default": false
-        },
-        "endpointURL": {
-          "description": "DEPRECATED: S3 endpoint URL for uploads.",
-          "type": "string",
-          "default": ""
-        },
-        "failedJobsHistoryLimit": {
-          "description": "DEPRECATED: Number of failed backup jobs to retain.",
-          "type": "integer",
-          "default": 1
-        },
-        "forcePathStyle": {
-          "description": "DEPRECATED: Use path-style S3 URLs (required for MinIO and most S3-compatible providers).",
-          "type": "boolean",
-          "default": true
-        },
-        "region": {
-          "description": "DEPRECATED: S3 region.",
-          "type": "string",
-          "default": ""
-        },
-        "s3AccessKey": {
-          "description": "DEPRECATED: Access key for S3 authentication.",
-          "type": "string",
-          "default": ""
-        },
-        "s3SecretKey": {
-          "description": "DEPRECATED: Secret key for S3 authentication.",
-          "type": "string",
-          "default": ""
-        },
-        "schedule": {
-          "description": "DEPRECATED: Cron schedule for automated backups. Use a backups.cozystack.io/Plan instead.",
-          "type": "string",
-          "default": "0 2 * * *"
-        },
-        "successfulJobsHistoryLimit": {
-          "description": "DEPRECATED: Number of successful backup jobs to retain.",
-          "type": "integer",
-          "default": 3
-        }
-      }
+      "x-kubernetes-preserve-unknown-fields": true
     }
   }
 }
diff --git a/packages/extra/etcd/values.yaml b/packages/extra/etcd/values.yaml
index dc0c8753a0..61b994d7c9 100644
--- a/packages/extra/etcd/values.yaml
+++ b/packages/extra/etcd/values.yaml
@@ -2,6 +2,9 @@
 ## @section Common parameters
 ##
 
+## @param {string} [version] - etcd version (X.Y.Z) to run, set on the EtcdCluster's spec.version; the operator pulls etcd from its own configured image.
+version: "3.6.11"
+
 ## @param {quantity} [size] - Persistent Volume size.
 size: 4Gi
 
@@ -20,31 +23,5 @@ resources:
   cpu: 1000m
   memory: 512Mi
 
-##
-## @section Backup parameters
-##
-
-## @typedef {struct} Backup - DEPRECATED: Backup configuration. Superseded by the Cozystack BackupClass flow driven by the Etcd strategy (strategy.backups.cozystack.io/v1alpha1); see README.md for migration.
-## @field {bool} [enabled] - DEPRECATED: Enable scheduled S3 backups. Use a BackupJob against an Etcd strategy instead.
-## @field {string} [schedule] - DEPRECATED: Cron schedule for automated backups. Use a backups.cozystack.io/Plan instead.
-## @field {string} [destinationPath] - DEPRECATED: Destination path for backups (e.g. s3://bucket/path/).
-## @field {string} [endpointURL] - DEPRECATED: S3 endpoint URL for uploads.
-## @field {string} [region] - DEPRECATED: S3 region.
-## @field {bool} [forcePathStyle] - DEPRECATED: Use path-style S3 URLs (required for MinIO and most S3-compatible providers).
-## @field {string} [s3AccessKey] - DEPRECATED: Access key for S3 authentication.
-## @field {string} [s3SecretKey] - DEPRECATED: Secret key for S3 authentication.
-## @field {int} [successfulJobsHistoryLimit] - DEPRECATED: Number of successful backup jobs to retain.
-## @field {int} [failedJobsHistoryLimit] - DEPRECATED: Number of failed backup jobs to retain.
-
-## @param {Backup} backup - DEPRECATED: Backup configuration. The chart still renders the legacy EtcdBackupSchedule when backup.enabled=true, but new tenants should drive backups through a BackupClass bound to the Etcd strategy (strategy.backups.cozystack.io/v1alpha1).
-backup:
-  enabled: false
-  schedule: "0 2 * * *"
-  destinationPath: ""
-  endpointURL: ""
-  region: ""
-  forcePathStyle: true
-  s3AccessKey: ""
-  s3SecretKey: ""
-  successfulJobsHistoryLimit: 3
-  failedJobsHistoryLimit: 1
+## @param {object} [affinity] - Affinity rules set verbatim on the EtcdCluster's spec.affinity, replacing the chart default. When left empty the chart applies a soft (preferred) podAntiAffinity that spreads members across nodes by kubernetes.io/hostname on a best-effort basis, so a single node failure is less likely to take out more than one member. The default is intentionally soft: a hard rule would leave a member Pending when there are fewer schedulable nodes than replicas, or when node-local storage pins a member to a node. Set a hard requiredDuringSchedulingIgnoredDuringExecution rule here to forbid co-location outright (only on clusters with enough nodes and non-node-pinned storage). Note that the operator applies affinity only when it creates or replaces a member Pod and does not reschedule running members, so on a cluster that already has co-located members the rule takes effect only as each member is replaced, not retroactively.
+affinity: {}
diff --git a/packages/extra/gateway/Makefile b/packages/extra/gateway/Makefile
index f5d7761394..6446139bc7 100644
--- a/packages/extra/gateway/Makefile
+++ b/packages/extra/gateway/Makefile
@@ -5,5 +5,6 @@ include ../../../hack/package.mk
 generate:
 	cozyvalues-gen -v values.yaml -s values.schema.json -r README.md
 
+.PHONY: test
 test:
 	helm unittest .
diff --git a/packages/extra/gateway/README.md b/packages/extra/gateway/README.md
index 89b643afff..c47ebfb14c 100644
--- a/packages/extra/gateway/README.md
+++ b/packages/extra/gateway/README.md
@@ -8,22 +8,24 @@ The chart renders one `gateway.cozystack.io/v1alpha1 TenantGateway` CR per tenan
 
 A tenant gets its own dedicated Gateway (own LB Service, own LB IP, own Certificate) only when it explicitly asks via `tenant.spec.gateway=true`. Every other tenant in the tree attaches its routes to the Gateway of the nearest ancestor that does own one — same shape as `_namespace.ingress` inheritance today.
 
-The `apps/tenant` chart writes a namespace label `namespace.cozystack.io/gateway: <owner-tenant-name>` onto each tenant namespace, carrying either this tenant's own name (when owning a Gateway) or the inherited ancestor name (when inheriting). The Gateway's listener `allowedRoutes.namespaces.selector` is keyed on that label, so the same logic permits the inheriting tenant's HTTPRoutes / TLSRoutes to attach. cozystack-controller separately patches the same label onto every namespace in `tgw.Spec.AttachedNamespaces` so cozy-* system namespaces (cert-manager, monitoring, harbor, …) reach the publishing Gateway alongside the tenant tree, garbage-collecting labels it wrote when an entry is removed from the attach list.
+The `apps/tenant` chart writes a namespace label `namespace.cozystack.io/gateway: <owner-tenant-name>` onto each tenant namespace, carrying either this tenant's own name (when owning a Gateway) or the inherited ancestor name (when inheriting). The HTTPS-terminate and port-443 passthrough listeners key their `allowedRoutes.namespaces.selector` on that label, so the same logic permits the inheriting tenant's HTTPRoutes / TLSRoutes to attach to them. The port-80 listener and the native-port listeners from `tlsPassthroughListeners` do not: both pin `kubernetes.io/metadata.name` instead, and inheritance does not reach either. cozystack-controller separately patches the same label onto every namespace in `tgw.Spec.AttachedNamespaces` so cozy-* system namespaces (cert-manager, monitoring, harbor, …) reach the publishing Gateway alongside the tenant tree, garbage-collecting labels it wrote when an entry is removed from the attach list.
 
 Owning a separate Gateway makes sense for: a tenant that needs its own LB IP (DNS already pinned, firewall rule on a specific address), a tenant whose apex is not derived from the parent (custom `host`, e.g. `customer1.io` not under the platform apex — the ancestor's cert/Issuer can't cover it), or a tenant that wants its own ACME account / cert authority. Otherwise leave `gateway` unset and inherit.
 
-## Cert mode: HTTP-01 (default) vs DNS-01 (opt-in)
+## Cert mode: HTTP-01 (default) vs DNS-01 (opt-in) vs existing Secret vs edge
 
-The platform-wide `publishing.certificates.solver` value selects how the controller sources TLS certificates for the tenant Gateway.
+The platform-wide `publishing.certificates.solver` value selects how the controller sources TLS certificates for the tenant Gateway. Setting `publishing.certificates.wildcardSecretName` switches to a third mode (existing Secret) that overrides the solver entirely, and putting the tenant's GatewayClass in `gateway.edgeTerminatedClasses` switches to a fourth that issues nothing at all — see below.
+
+The sections below are the chart's own reference. For the operator's view of the same surface — the three platform values that bound which class a tenant lands on, what a tenant writes to pick one, what moving between classes does to certificates and to the wildcard replica, and how the mechanism fails when the configured names and the installed classes disagree — see [`docs/gateway-classes.md`](../../../docs/gateway-classes.md).
 
 ### Default — HTTP-01
 
 Out of the box, no extra config required. The controller:
 
 - Renders an ACME `Issuer` in the tenant namespace with an `http01.gatewayHTTPRoute` solver pointing at the tenant's own Gateway / `http` listener.
-- Watches HTTPRoutes / TLSRoutes attached to the Gateway (parentRefs pointing at it). For each unique hostname seen, it adds a per-app HTTPS listener and a per-app `Certificate` (dnsNames containing exactly that hostname).
-- Per-app listener naming: `https-<first-label-of-hostname>` (e.g. `https-harbor`).
-- Per-app cert naming: `<tgw-name>-<first-label>-tls`.
+- Watches HTTPRoutes / TLSRoutes attached to the Gateway (parentRefs pointing at it). For each unique hostname an HTTPRoute claims, it adds a per-app HTTPS listener and a per-app `Certificate` (dnsNames containing exactly that hostname). A hostname a TLS-passthrough listener answers earns neither, whether or not a `TLSRoute` is attached there, and a hostname only a `TLSRoute` claims earns neither at all — the passthrough section below carries that rule and why it is keyed on the declaration. A route that also claims a hostname outside the reservation stays `Accepted` and is served on that one. A wildcard hostname on an `HTTPRoute` earns neither either, whatever else claims the name: the HTTP-01 challenge issues no wildcard certificate, so no terminate listener can carry it and the route reads `Accepted=False` with `NoMatchingListenerHostname` naming the wildcard. The exception is a route that asked for the plain-HTTP listener rather than a terminate one, by pinning port 80 or by naming `http`: that listener carries no hostname, so it serves a wildcard claim like any other and the route is refused nothing. Over TLS a wildcard is served only by the modes that terminate the whole apex. A `parentRef` that pins a port other than 443 earns neither through that `parentRef`, since the per-app listener is published on 443 alone; selecting the plain-HTTP listener instead, by port 80 or by naming `http`, from a namespace it admits (the publishing tenant's and `cozy-cert-manager`) serves the route there without a terminate listener, and selecting it from any other namespace is refused by that listener with `NotAllowedByListeners`.
+- Per-app listener naming: `https-<first-label-of-hostname>-<8 hex digits of sha256(hostname)>` (e.g. `https-harbor-760d5a8a`); the suffix keeps two hostnames sharing a first label apart.
+- Per-app cert naming: `<tgw-name>-<first-label>-<same 8 hex digits>-tls`.
 
 Adding a new published app is purely a matter of deploying its HTTPRoute — no edits to `_cluster.expose-services` needed.
 
@@ -46,21 +48,76 @@ For inheriting child tenants under this Gateway: the controller extends the same
 
 Pick DNS-01 when you specifically want a wildcard cert (e.g. a long-lived staging cluster with many short-lived apps and tight LE rate limits). Otherwise stay on HTTP-01.
 
-> **Listener-cap considerations.** Gateway API caps `Gateway.spec.listeners` at 64. In HTTP-01 mode, every published hostname adds one HTTPS listener, plus the mandatory `http` listener and one extra per TLS-passthrough service — so a tenant approaching 60+ published apps on HTTP-01 hits the spec cap and the rendered `Gateway` fails admission. DNS-01 mode collapses every hostname under the apex into one wildcard listener and is the right choice for high-fanout single-tenant deployments.
+> **Listener-cap considerations.** Gateway API caps `Gateway.spec.listeners` at 64. In HTTP-01 mode, every published hostname adds one HTTPS listener, plus the mandatory `http` listener, one extra per TLS-passthrough service, and one per `tlsPassthroughListeners` entry on the `TenantGateway` — so the per-app listeners share that budget with the rest, and a tenant that exhausts it does not get a rejected write: the controller catches the assembled total before submitting the `Gateway` and reports it as `Ready=False` naming the budget, so the failure lands on the object the tenant owns. DNS-01 mode collapses every hostname under the apex into one wildcard listener and is the right choice for high-fanout single-tenant deployments.
+
+### Opt-in — existing wildcard Secret (operator-provided)
+
+Set `publishing.certificates.wildcardSecretName` in the platform chart values to point the tenant Gateway at a pre-existing wildcard TLS Secret instead of issuing anything via ACME. Use this when the operator already holds a wildcard certificate — purchased, or issued by a corporate CA — and wants platform services to serve under it. This mode takes precedence over `solver`: when `wildcardSecretName` is set, the solver / provider / issuer values are ignored.
+
+The platform chart writes the value into `_cluster.wildcard-secret-name` (the name only — the certificate and private key never travel on the values channel), and the gateway chart renders `certMode: existingSecret` with `wildcardSecretRef.name` on the `TenantGateway` CR. The controller then:
+
+- Mints no `Issuer` and no `Certificate`. Switching into this mode from HTTP-01 or DNS-01 garbage-collects the now-unused per-tenant `Issuer` and any per-listener / wildcard `Certificate` the controller previously owned.
+- Renders the same single-wildcard listener shape as DNS-01: a `https` (`*.<apex>`) listener and a `https-apex` (`<apex>`) listener (plus one `*.<child-apex>` listener per inheriting child), all with `certificateRefs` pointing at the operator-supplied Secret.
+
+The Secret must exist in the `TenantGateway`'s own namespace, be of type `kubernetes.io/tls`, and cover the apex (and `*.<apex>`). Cross-namespace references are intentionally unsupported (no `ReferenceGrant`), so each per-tenant Gateway reads the Secret from its own namespace. For the root publishing tenant that is the operator-created Secret in `tenant-root`. For a child tenant that runs its own Gateway, the platform controller replicates the operator Secret into the tenant namespace automatically — it reads the source name from the same `publishing.certificates.wildcardSecretName` that drives the consumers, so a same-named replica is mirrored into every tenant namespace that owns a termination point, then garbage-collected when wildcard mode is explicitly disabled (clearing `publishing.certificates.wildcardSecretName`) or when a tenant stops terminating TLS. A transient absence of the source Secret or the platform values channel does not prune existing replicas. No extra operator input, and the replica carries no extra RBAC — the Gateway reads only its own-namespace copy. Replication delivers the bytes, not coverage: the certificate matches a child apex only if its SAN list does, and a single `*.<apex>` does not match `*.<child-apex>`. The controller still renders a `*.<child-apex>` listener bound to the Secret for each inheriting child, so when the SANs do not cover that apex, clients of the child subdomain are served the parent certificate and see a hostname-mismatch TLS error — supply a certificate whose SANs cover the child apexes you intend to serve. Like DNS-01, this mode collapses every hostname under the apex into one wildcard listener, so it is also a way to stay clear of the 64-listener cap.
+
+### Opt-in — edge termination (no certificates)
+
+TLS termination is a property of the GatewayClass, so it is declared once per class rather than per tenant: list a class in the platform's `gateway.edgeTerminatedClasses` when its provider terminates TLS upstream of the Gateway — a Cloudflare Tunnel class ends TLS at the Cloudflare edge and reaches the Gateway over the tunnel. Every tenant whose Gateway lands on such a class gets `certMode: edge` on its `TenantGateway`, whether it arrived there through the platform default (`gateway.className`) or by choosing the class itself (`tenant.spec.gatewayClass`, bounded by `gateway.tenantSelectableClasses`). The mode wins over `wildcardSecretName` and over `solver`; the solver, provider, issuer and wildcard-secret inputs are not read. The controller then:
+
+- Mints no `Issuer`, no `Certificate` and no http-to-https redirect route (the edge redirects itself). Switching into this mode garbage-collects the ACME objects the controller previously owned — the `Issuer` and the `Certificate` objects, not the TLS Secrets they issued: cert-manager runs with `enableCertificateOwnerRef: false`, so each Secret stays in the tenant namespace, unreferenced, until an operator removes it. That is how every mode transition already behaves, not something edge introduces.
+- Renders the apex, its wildcard and every inheriting child apex as plain HTTP listeners (`edge`, `edge-apex`, `edge-child-*`) with the same label-based `allowedRoutes` as the HTTPS listeners of the other modes, so app HTTPRoutes attach by hostname unchanged. `TLSPassthroughServices` are not rendered: an HTTP-only edge cannot carry a TLS-passthrough listener, so the tenant Kubernetes API, VM export and CDI upload endpoints are not published through such a Gateway. `TLSPassthroughListeners` is refused rather than dropped, and the difference is which side sets the field: `tlsPassthroughServices` carries a chart default on the publishing tenant, so dropping it is the only way an edge tenant renders at all, while a native-port listener is set on the CR by hand and a tenant that asked for one is better told it cannot have it here than left reading `Ready=True` over a port nothing answers. Where the packages that own them create those `TLSRoute` objects at all — each renders only when `gateway.enabled` is on and its name is still in `publishing.exposedServices` — the routes then match no listener on the Gateway, so those endpoints are unpublished rather than undeclared. The controller says so on the routes themselves rather than leaving them to be read as healthy: every attached `TLSRoute` that declares hostnames gets `Accepted=False` with reason `NoMatchingParent` under this controller's name, which is Gateway API's reason for a `parentRef` whose port or section matches no listener on the Gateway. A `TLSRoute` that declares none has this controller's entry removed instead, because the hostname it would be judged on is lent by a listener this mode does not render, and every attached `HTTPRoute` has the entry removed too, because whatever it carried was written by the HTTP-01 pass about listeners this mode does not render; `dns01` and `existingSecret` remove both the same way. The class controller writes its own entry under its own name and this does not touch it. Moving back off the mode clears the condition again, either by judging the route afresh under `http01` or, under `dns01` and `existingSecret` where the controller collects no hostname claims, by dropping the entry instead of holding an opinion it cannot support.
+
+Listing a class here is a claim about that class and nothing validates it: name the bundled `cilium` and its Gateways serve every app hostname over plain HTTP on a public address, with no redirect and no certificate — exactly the cleartext-credentials case the narrow port-80 selector exists to prevent in the other modes. Only list a class whose provider terminates TLS in front of the Gateway.
+
+The two halves of that move are not ordered against each other: the wildcard-secret controller watches the `TenantGateway` and prunes as soon as its `certMode` changes, while the Gateway itself re-renders when the tenant's HelmRelease does and the class controller reprograms after that. A tenant can therefore be briefly serving HTTPS listeners whose Secret has already gone.
+
+Moving an existing tenant onto such a class also withdraws the operator wildcard from that tenant: its namespace stops counting as a termination point, so the replica described under [existing wildcard Secret](#opt-in--existing-wildcard-secret-operator-provided) is deleted from it on the next reconcile. Its neighbours keep theirs, and so does a namespace that also owns an ingress controller — that one still terminates locally.
+
+Route hostnames still stay inside the tenant apex; on a class that shares one edge address between all Gateways the class controller has to enforce that itself, since the platform's route-hostname policy admits routes that declare no hostnames at all.
+
+The publishing tenant is the one tenant that cannot move itself across that line: the chart refuses to render when its selected class is edge-terminated and `gateway.className` is not, or the reverse. The cluster-wide ACME `ClusterIssuer`s point their HTTP-01 solver at that tenant's Gateway, and whether the solver pins `sectionName: http` is decided from `gateway.className` alone — a tenant's own class choice does not travel on that channel. A publishing tenant that went to an edge class on its own would therefore keep a solver pinned to the `http` listener its Gateway no longer renders, and every HTTP-01 certificate in the cluster would stop issuing with nothing in any status naming the cause. The guard is symmetric because either direction leaves those two decisions derived from different classes. Move `gateway.className` instead; which namespace counts as the publishing tenant comes from `publishing.ingressName`.
 
 ## External IP allocation
 
 The per-tenant Gateway's auto-created `LoadBalancer` Service draws its IP from whatever LB allocator the cluster admin has configured at the platform layer — same shape as ingress-nginx today. Cozystack itself ships MetalLB installed but does not render any `IPAddressPool` / `L2Advertisement` / `BGPAdvertisement` from this chart; admins set up the allocator that suits their environment (MetalLB pool with L2 / BGP, Cilium LB-IPAM with announcer, robotlb against a cloud provider, or `Service.spec.externalIPs` pinning).
 
 The tenant API stays mechanism-agnostic — no `gatewayIP` field, no allocator-specific manifest in the tenant chart. If a tenant needs a specific address (DNS already pinned, firewall rule, etc.), the operator pre-allocates it on the admin side: either pre-create the Service with `loadBalancerIP` set, or hand the tenant a reference to a named admin-managed pool. Per-Service IP uniqueness is the allocator's responsibility and works the same way as for any other LoadBalancer Service in the cluster.
+
+## Layer-4 TLS passthrough on native ports
+
+There are two distinct passthrough forms, and they do not replace each other. The `tlsPassthroughServices` chart value renders one `mode: Passthrough` listener per named service on port 443, selected by SNI alongside the HTTPS-terminate listeners. The `tlsPassthroughListeners` field on the `TenantGateway` resource renders one listener per entry on the entry's own native port — 6379 for Redis, 27017 for a sharded MongoDB's `mongos`, 5432 for PostgreSQL where both ends are new enough to negotiate TLS directly — so a database engine can present its own certificate directly to clients on the port those clients already expect, while sharing the tenant Gateway's address. The engine has to speak TLS first: a protocol whose server opens with a plaintext greeting, MySQL and MariaDB on 3306 above all, deadlocks against a passthrough listener waiting for a `ClientHello` that never arrives, and no listener can rescue it because there is no certificate to fall back on. Which engines qualify is settled in [#2815](https://github.com/cozystack/cozystack/issues/2815) rather than here.
+
+Each entry names a listener, a port, and an SNI hostname. The port must be free (80 and 443 belong to the Gateway's own listeners) and distinct from every other entry; the hostname must fall within the tenant apex. Those rules are enforced at admission by CEL on the CRD, so a bad entry is refused on write rather than stalling the tenant's reconcile.
+
+No two passthrough listeners may match the same SNI, counting the port-443 listeners `tlsPassthroughServices` renders and counting wildcards — `*.<apex>` overlaps the shipped `api.<apex>` listener, so a wildcard that broad is rejected on a `TenantGateway` that carries the defaults, which the chart writes on the publishing tenant alone. Emptying that value removes the service hostnames from the comparison but not the rule: two entries of this field still have to keep clear of each other, and a broad wildcard still covers a narrower one. Cilium before `v1.19.6` selected a passthrough backend by SNI alone and could not tell two matching listeners apart even on different ports, so the overlap silently forwarded the stream to whichever one won. The shipped `v1.20.2` gives each routed passthrough port its own Envoy listener, so the rule now holds as a narrowing rather than a workaround, and lifting it is tracked in #4765. This rule is one of those the controller checks rather than admission, so it surfaces as `Ready=False` on the TenantGateway instead of a rejected write. So are a repeated `tlsPassthroughServices` entry, an entry whose composed listener name or hostname runs past the 253 characters Gateway API allows, and an assembled listener count over the Gateway API cap of 64; the schema-constraints paragraph below carries why the first is judged there rather than at the write, while the last two are about values a single field's bound cannot see. An apex no listener hostname can sit within is checked by the controller as well, but the containment rule at admission refuses it first, as that paragraph says.
+
+The listener is all this field creates. Nothing is routed until a `TLSRoute` attaches to it by `sectionName: tls-<name>` and names a backend Service, and because a passthrough listener never terminates TLS, the backend — not the Gateway — must hold the certificate for the listener's hostname. Route attachment is bounded more tightly than on the other listeners, in two ways: only `TLSRoute`, and only from the publishing tenant's own namespace, pinned by the `kubernetes.io/metadata.name` label that kube-apiserver writes. `TLSRoute` alone is what Cilium derives from the `TLS` listener protocol rather than something Gateway API guarantees: the spec leaves the protocol-to-kind mapping to the implementation and its own table pairs `TLS` with `TCPRoute` as well. The kind is left to the protocol rather than spelled out because the protocol already says `TLSRoute`. Before `v1.19.6` a listener that spelled its kinds out had them applied to every route on the Gateway, not to itself; from that release Cilium matches the listener the route actually names. The `namespace.cozystack.io/gateway` label the port-443 listeners select on is stamped on every inheriting child tenant namespace, which is a reasonable attach set for a shared HTTPS port and a poor one for a database port. Narrowing is free while no chart value exposes this field; widening later is a values change, whereas narrowing after something depends on it would not be.
+
+Three current limitations are worth knowing before designing around this, and they do not share an origin. The first is the certificate mode: the field is refused under `edge`, which ends TLS at the class provider and renders no TLS listener for a passthrough entry to sit beside. `dns01` and `existingSecret` accept it. Their `*.<apex>` terminate listener overlaps every entry by SNI, but on port 443, and Gateway API treats listeners on different ports as compatible; the shipped Cilium (`v1.20.2`) gives each port its own Envoy listener when their SNI overlaps. The second is a deliberate narrowing under `http01`: a hostname a passthrough listener answers gets no HTTPS-terminate listener on 443, although Gateway API would serve the two on different ports, so a tenant cannot publish one name as HTTPS on 443 and as passthrough on another port. A name beneath a wildcard entry is reserved the same way. Under `dns01` and `existingSecret` the wildcard terminate listener still serves such a name on 443, because it cannot be withdrawn per hostname. The third is a narrowing of this phase: each entry must occupy its own port, so two instances of the same engine cannot both sit on the engine's native port distinguished only by SNI. Gateway API permits that pair and the port-443 `tls-<svc>` listeners already are that pair; the restriction exists because nothing downstream yet makes two engines on one port testable, and lifting it means deleting a check in the controller and the matching CEL rule in the CRD, without touching a field or a type. None of the three depends on the Cilium version, and none changes the API: the first and third are validation rules, the second is a rendering rule.
+
+Two more things belong next to those, because both bear on what a tenant sees. The first is the pair on port 443 itself. `api`, `vm-exportproxy` and `cdi-uploadproxy` are passed through on 443 of the tenant Gateway, beside the terminate listeners. Upstream Cilium marks an HTTPS-terminate listener and a TLS-passthrough listener on one port `Conflicted` whenever their hostnames overlap, so the `*.<apex>` listener of `dns01` and `existingSecret` would take the three passthrough listeners down with it. The operator image this platform ships carries a patch (`packages/system/cilium/images/cilium-operator/patches`) that accepts the pair when the passthrough hostname is strictly narrower than the HTTPS one, and Envoy selects the exact server name ahead of the wildcard. A terminate listener for the passthrough name itself is not narrower, and it is the pair the reservation below keeps from being rendered under `http01`. The second is a shape this platform has not run before: a passthrough listener declared with no `TLSRoute` behind it. `TenantGateway` readiness folds in every listener's `Accepted` and `Programmed` conditions, so a listener the Gateway controller declined would take the tenant's `Ready` to false. It does not, and that is readable from the `v1.20.2` source rather than open. `setGatewayListenerStatus` judges a listener on its protocol, on the route kinds its `allowedRoutes` names, on its certificate references and on whether its spec conflicts with another listener's, and on nothing else, so a passthrough listener with no `certificateRefs` and no routes is `Accepted`; `Programmed` is then written from the Gateway having an address at all, gated only on `Accepted`. Neither condition consults the route set.
+
+The reason the Cilium version matters is worth stating plainly, because it also decides what the declared port does and does not buy. On `v1.19.5` the whole Gateway is translated into a single Envoy listener with a TLS inspector in front, and every filter chain is selected by transport protocol and SNI alone: `toFilterChainMatch` in `operator/pkg/model/translation/envoy_listener.go` sets no destination port. A terminate chain and a passthrough chain carrying one name therefore land in the same listener whichever Gateway port declared them, which is where the two restrictions that release left behind came from. The certificate-mode one is lifted; the rule against two passthrough entries sharing an SNI across ports still stands. The same fact has a consequence that is not a restriction: the declared port is where the listener is published, not where the backend can be reached. A TLS handshake carrying `postgres.<apex>` selects that passthrough chain on any port the tenant's load balancer forwards, port 443 included, so narrowing a firewall to 80 and 443 does not put the engine out of reach. The hostname is the access surface; give the backend its own authentication and treat the SNI as public. Cilium `v1.19.6` restores the port boundary, but conditionally, and only for a listener something actually routes to. `NeedsPerPortListeners` is true when the model has more than one HTTPS port, or more than one TLS-passthrough port carrying a route, or an HTTPS chain and a routed passthrough chain on different ports sharing an SNI. A passthrough listener with no `TLSRoute` behind it contributes no filter chain, so it counts toward none of the three, which is consistent: with no route there is nothing on that port to collide with anything. Once a route attaches, a tenant that also has a routed `tls-<svc>` listener on 443 has two routed passthrough ports and the listeners split on the second clause. Port 443 then carries HTTPS and passthrough listeners at once, and upstream emits two Envoy listeners with one name for it, which the agent refuses (cilium/cilium#48269); the operator image this platform ships carries the fix. A Gateway whose only routed passthrough listener is that single entry splits on the third clause instead, and only when a terminate chain on another port shares its SNI, which is the `*.<apex>` listener of `dns01` and `existingSecret` beside an entry under the apex. The bump changes the diagnostic side as well, and in the opposite direction from the split: `v1.19.6` adds a check, `listenerPairConflict` in `operator/pkg/gateway-api/status_listener.go` on `v1.20.2`, which finds an HTTPS-terminate and a TLS-passthrough listener sharing a port and an overlapping SNI from the listener specs alone and marks both `Conflicted` and not `Accepted`; from `v1.20` the pair is also dropped from Envoy. A declared listener with no route on it is enough to trigger it, which on port 443 meant every `tls-<svc>` listener beside a terminate listener whose hostname overlaps it, the `*.<apex>` one of `dns01` and `existingSecret` included. The operator image this platform ships accepts the pair when the passthrough hostname is strictly narrower than the HTTPS one (`packages/system/cilium/images/cilium-operator/patches`), so the `tls-<svc>` listeners serve beside `*.<apex>` on 443. A terminate listener for the passthrough name itself is not narrower; it is the pair the reservation above keeps from being rendered, and this field is kept off 443.
+
+This field is set on the `TenantGateway` resource directly; the chart exposes no corresponding value yet. That matters operationally, though not the way it first looks: the `TenantGateway` is rendered and owned by this chart, but helm-controller runs with drift detection off here (no HelmRelease in the tree sets `spec.driftDetection`, and the controller carries no feature gate for it), so a `kubectl edit` adding `tlsPassthroughListeners` is not reverted on the release's next interval. Nor does the next `helm upgrade` take it away. Helm patches a custom resource whose Go type it does not know by merging the old rendered manifest with the new one. `createPatch` in `pkg/kube/client.go` has two paths for such an object: the two-way one is `jsonpatch.CreateMergePatch(oldData, newData)`, which does not consult the live object at all, and the three-way one does read it. Which path runs depends on the Helm version helm-controller carries, and that is not pinned in this tree, so treat the path as unverified from here. The outcome does not turn on it: a key the chart renders in neither manifest appears in no patch on either path and is never removed. `helm uninstall`, a chart that starts rendering the key, and `spec.upgrade.force` are the ways out, and nothing in this tree sets the last of them. So the hazard runs the other way from the usual one: a hand-added entry is not something the platform will quietly revert, it is a native database port published on the tenant's shared address that stays published until somebody removes it by hand. Until the chart exposes a value, treat the field as reachable only for experimentation, and write down what you added. A stored entry also blocks a later move to `certMode: edge`. The CEL rule that keeps this field out of `edge` sits on the `spec` node, and ratcheting suppresses a CEL error only while the node it sits on is unchanged, so a stored `tlsPassthroughListeners` refuses the very write that would move the mode to `edge`. Moves between `http01`, `dns01` and `existingSecret` pass. A switch to an edge-terminated class, the platform default or the tenant's own, reaches this chart as `certMode`, the write is then rejected for that tenant, and its gateway HelmRelease retries against the refusal without end, since `packages/apps/tenant/templates/gateway.yaml` sets `remediation.retries: -1` on install and upgrade alike. That is the exit condition: the field has to be removed before the mode can move to `edge`.
+
+One behaviour change reaches clusters that never set this field. A hostname a route claimed used to earn an HTTPS-terminate listener and an ACME certificate even when a passthrough listener already held that hostname, and the certificate went to a hostname whose backend presents its own. On port 443 that also put two listeners on one port and hostname — Gateway API admits the pair, because its listener uniqueness rule counts the protocol as well as the port and hostname, and its compatibility rules then call for both to report `Conflicted`. Cilium before `v1.19.6` implements none of that: `v1.19.5` writes `Accepted`, `Programmed` and `ResolvedRefs` on a listener and has no `Conflicted` condition anywhere, so the pair is admitted, translated, and reported by nothing. In HTTP-01 mode a hostname a passthrough listener holds now produces neither listener nor certificate, and a hostname only a `TLSRoute` claims produces neither either. The reservation is read off the `TenantGateway` spec alone: it holds whether or not a `TLSRoute` is attached to the passthrough listener and whatever that route's backends resolve to, so a route's status does not depend on how an implementation builds its filter chains. An `HTTPRoute` whose every hostname is reserved reads `Accepted=False` with `NoMatchingListenerHostname` naming the passthrough hostname; one that also claims a free hostname stays `Accepted` and is served on that one. That covers both passthrough forms: the port-443 one, where a terminate listener for the same name is a pair Cilium conflicts, and the native-port one, where the reservation is a policy that keeps an app from taking a platform name on 443. The rule does not run the other way, because the other direction never reaches it: an `HTTPRoute` publishing `*.<apex>` overlaps the shipped `api.<apex>` entry, but it is refused before the overlap is read. The HTTP-01 challenge issues no certificate for a wildcard name, so no terminate listener could ever carry the wildcard, and the route reads `NoMatchingListenerHostname` naming it whether or not a `TLSRoute` claims `*.<apex>` too. Until that refusal, the claim reached the renderer and produced a listener whose name carried the asterisk, which the Gateway CRD refuses in a listener name while admitting it in a hostname, and the apiserver then refused the whole Gateway write, with every other listener on it frozen where it stood. A wildcard published by an `HTTPRoute` is served only by the modes that terminate the whole apex. The other two cert modes are unaffected, because neither renders per-hostname listeners at all: the wildcard `https` and `https-apex` listeners still carry every name under the apex as a hostname, passthrough hostnames included, so nothing is shed there, and a `tls-<svc>` listener still answers its own name first. The shipped `tlsPassthroughServices` default is `api`, `vm-exportproxy` and `cdi-uploadproxy`, and the chart writes it only where the platform's own `TLSRoute`s attach: on the publishing tenant — `tenant-root` unless the cluster's `expose-ingress` says otherwise — while `gateway.enabled` is on, and only for the names `publishing.exposedServices` lists. On HTTP-01 that tenant sheds the terminate listeners for those names on upgrade, with the controller garbage-collecting the certificates that went with them. Every other tenant renders no passthrough listener from this value, so its own `HTTPRoute` on one of those names under its apex keeps its terminate listener and certificate. A child tenant that rendered the three passthrough listeners before the upgrade loses them, and no shipped route goes with them: the platform `TLSRoute`s name the publishing tenant's Gateway alone. A `TLSRoute` added by hand to one of those child listeners does lose its parent. To keep such a listener, set `tlsPassthroughServices` on that tenant's `TenantGateway` with a merge patch once the upgrade has removed it. From then on the chart renders the key in neither manifest there, so a later `helm upgrade` leaves the patch in place, with the caveats the `tlsPassthroughListeners` paragraph above gives for a hand-set field. Read the publishing tenant's shedding as a change of serving path rather than the removal of something idle: before the upgrade each of those hostnames has both listeners on port 443 and both filter chains carry the SNI, nothing on the objects says which one answers a connection, and Cilium `v1.19.5` offers no `Conflicted` condition to look at, so you cannot tell from the cluster whether `api.<apex>` is terminated by the Gateway or passed through. After the upgrade it is passed through, always. If anything depends on the Gateway terminating one of those three names, it depends on the half of that ambiguity that goes away. The certificates are collected but their TLS `Secrets` are not: cert-manager here ships `enableCertificateOwnerRef: false`, so each shed `Secret` stays in the namespace with no owner, nothing renewing it and nothing removing it. That is worth knowing in both directions — three stale `kubernetes.io/tls` `Secrets` per shedding tenant to clean up by hand, and a cheap way back, since a re-created `Certificate` adopts a still-valid `Secret` rather than placing an order.
+
+Before upgrading, check one thing about `api.<apex>` in particular: once the terminate listener is gone, the only certificate on that name is the management kube-apiserver's own serving certificate, so that certificate has to carry `api.<apex>` in its SANs. A cluster that came to the Gateway from ingress-nginx already meets this, because that path passes the same name through to the same Service and its clients have been validating the apiserver's certificate all along. A cluster that has been served by the Gateway's ACME certificate on that name does not necessarily, and it loses `api.<apex>` on upgrade until the SAN is there. Adding it is a change to the management cluster's apiserver rather than to anything in this chart; the alternative is the first path below, which moves the consumer to a hostname outside `tlsPassthroughServices` and costs nothing.
+
+If something does depend on that terminate path, there are three ways forward and they are not equivalent. Moving the consumer to another hostname under the apex costs nothing: a name outside `tlsPassthroughServices` still earns its own terminate listener and ACME certificate, while the passthrough name goes on answering the platform's own `TLSRoute`. Switching `certMode` to `dns01` or `existingSecret`, at the price of DNS-01 credentials or an operator-supplied certificate, does not bring termination back either. Neither mode renders per-hostname listeners, and their wildcard terminate listener covers these names on 443, but the `tls-<svc>` listener beside it answers its exact name first, so the name stays passed through. The wildcard terminates such a name only once its passthrough listener is gone, so this path ends where the next one does. Removing a service from `tlsPassthroughServices` does not bring its terminate listener back, and that is the point worth reading twice: the passthrough listener goes, the platform `TLSRoute` that attached to it by `sectionName: tls-<svc>` has nothing left to attach to, and the hostname is then claimed by a `TLSRoute` alone, which earns no terminate listener either. Nothing serves the name until something else claims it. So this path is a rewrite rather than a rollback, and it is only finished once the component is republished by an `HTTPRoute` on that hostname, which does earn a terminate listener and a certificate. For `api` that is the Kubernetes API endpoint, and passthrough means its clients hold a TLS session with the apiserver itself; terminating in front of it changes what that session authenticates against, so check what your clients present before picking this one.
+
+Schema constraints tightened alongside this field reach objects that already exist, and every one of them is a kind the apiserver ratchets. `apex` is bounded at 253 characters, and `tlsPassthroughServices` at 62 entries each a DNS-1123 subdomain of at most 249 characters; a stored value that violates one still passes any write that leaves it unchanged, and the rule bites only once the value itself changes. `apex` gets no format pattern, deliberately, and that is not a statement that a mixed-case host works. It arrives verbatim from the `namespace.cozystack.io/host` label, which nothing normalizes and which may hold upper case, and the controller then composes listener hostnames from it that Gateway API refuses, so such a tenant's Gateway does not render with or without a pattern here. What a pattern changes is only where that lands: refused at the write it fails this HelmRelease and everything the release owns, admitted it is `Ready=False` on the one Gateway. An apex no listener hostname can sit within is caught only when `tlsPassthroughListeners` is in use, and then by the containment rule rather than by the controller: that CEL rule compares bytes as well, so a mixed-case apex with a lowercase listener hostname is refused at the write, with a message naming the hostname, and the controller's own check, which names the apex, is reached only where the CRD lags the controller. A repeated `tlsPassthroughServices` entry is reported by the controller as `Ready=False` rather than refused at admission, and that is deliberate, though not for the reason symmetry suggests. Ratcheting does reach a list-type error, and at a coarser grain than the rest: the apiserver checks an incoming object's list-type semantics only when the stored object passes them, for the whole object at once (read from `pkg/registry/customresource/strategy.go` in the pinned `k8s.io/apiextensions-apiserver` v0.37.1). So declaring the list a set would not block writes to an object already carrying a duplicate; it would stop every list on that `TenantGateway` from being checked at all, silently, while the duplicate the controller can name goes on being reported by name. The shipped defaults and the chart's own `fail` on an empty host conform to all of it, and for `tlsPassthroughServices` nothing else can reach the field: the only key the tenant writes into this chart's HelmRelease values is `gatewayClassName`, and only when the tenant chose a class, while everything else arrives through `valuesFrom` the `cozystack-values` Secret, and the platform writes no such key into that Secret, so the chart default, filtered to the publishing tenant as described above, is the only value that arrives and the bounds guard a value only an edit to this chart can change. An upgrade is a no-op.
+
 ## Parameters
 
 ### Common parameters
 
-| Name                     | Description                                                                                                                                                                                                                                                                          | Type       | Value                                    |
-| ------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ---------- | ---------------------------------------- |
-| `gatewayClassName`       | GatewayClass to attach the tenant Gateway to. Must exist cluster-wide. Default matches the Cilium-managed class.                                                                                                                                                                     | `string`   | `cilium`                                 |
-| `tlsPassthroughServices` | Names (from publishing.exposedServices) whose traffic is TLS-passthrough rather than TLS-terminate. For each such service a dedicated HTTPS listener with tls.mode=Passthrough is rendered on the Gateway, and the service is expected to attach a TLSRoute instead of an HTTPRoute. | `[]string` | `[api, vm-exportproxy, cdi-uploadproxy]` |
+| Name                     | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | Type       | Value                                    |
+| ------------------------ | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------- | ---------------------------------------- |
+| `gatewayClassName`       | GatewayClass for this tenant's Gateway, set from `tenant.spec.gatewayClass`. Empty means the platform default (`_cluster.gateway-class-name`, itself defaulting to the bundled `cilium` class). Whether the class terminates TLS itself or at its provider's edge comes from the platform's `gateway.edgeTerminatedClasses`, so the two cannot get out of step.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | `string`   | `""`                                     |
+| `tlsPassthroughServices` | Names (from publishing.exposedServices) whose traffic is TLS-passthrough rather than TLS-terminate. For each such service a dedicated HTTPS listener with tls.mode=Passthrough is rendered on the Gateway, and the service is expected to attach a TLSRoute instead of an HTTPRoute. Rendered only on the publishing tenant, the namespace `publishing.ingressName` names, while `gateway.enabled` is on, and only for names `publishing.exposedServices` lists: the platform TLSRoutes for these services attach to that tenant's Gateway alone, and a passthrough listener anywhere else would reserve its name with nothing behind it. Ignored when this tenant's Gateway is on a class the platform lists in `gateway.edgeTerminatedClasses`: an HTTP-only edge cannot carry a TLS listener, so those services are not published through the tenant Gateway at all. | `[]string` | `[api, vm-exportproxy, cdi-uploadproxy]` |
 
 
 ## Security model
@@ -70,16 +127,17 @@ Tenants in Cozystack interact with the platform exclusively through `apps.cozyst
 The protections below split into three groups by who they defend against:
 
 - **Tenant-user-input gates** — Layer 4 (`cozystack-tenant-host-policy`). `Tenant.spec.host` is the user-supplied field that surfaces as a security boundary at the hostname layer; it is gated on every Create / Update via `cozystack-api`'s admission chain (`pkg/registry/apps/application/rest.go`).
-- **Defense-in-depth** — Layers 1, 2, 5, 6, 7. These do not protect against tenant-user input (tenants don't hold the relevant RBAC). They guard against bugs in cozystack-controller / Flux, supply-chain compromise of an app chart that emits Gateway API resources, and confused-deputy mistakes by a cluster admin. Fail-closed via `failurePolicy: Fail` + `validationActions: [Deny]`.
+- **Defense-in-depth** — Layers 1, 2, 5, 6, 7, 8. These do not protect against tenant-user input (tenants don't hold the relevant RBAC). They guard against bugs in cozystack-controller / Flux, supply-chain compromise of an app chart that emits Gateway API or Ingress resources, and confused-deputy mistakes by a cluster admin. Fail-closed via `failurePolicy: Fail` + `validationActions: [Deny]`. Layers 1-7 cover the opt-in Gateway API dataplane; Layer 8 covers the legacy Ingress dataplane, which is the default (Gateway API is off by default).
 - **Admin-against-themselves** — Layer 3 (`cozystack-gateway-attached-namespaces-policy`). Rejects a `kubectl edit packages.cozystack.io` that would slip a `tenant-*` entry into the platform Package's `gateway.attachedNamespaces`. Layer 6 catches the same misconfiguration at helm render time.
 
-1. **Namespace whitelist on listeners.** Every listener carries an `allowedRoutes.namespaces.from: Selector` matching the built-in `kubernetes.io/metadata.name` label (written by kube-apiserver, unspoofable). HTTPS / TLS-passthrough listeners accept routes from the publishing tenant's namespace plus `gateway.attachedNamespaces` in the platform chart (default includes the `cozy-*` namespaces for platform services and `default` for the Kubernetes API TLSRoute). A namespace outside the list literally cannot attach any `HTTPRoute` or `TLSRoute` to those listeners. The plain-HTTP listener (port 80) carries a strictly narrower selector — only the tenant namespace itself (where the controller-owned http→https redirect HTTPRoute lives) and `cozy-cert-manager` (HTTP-01 ACME challenge HTTPRoutes) — so app HTTPRoutes attaching by hostname cannot bind to port 80 and serve plaintext. HTTPS listeners additionally restrict `allowedRoutes.kinds` to `HTTPRoute` (and TLS-passthrough listeners to `TLSRoute`), preventing GRPCRoute / TCPRoute / UDPRoute from attaching outside the route-hostname VAP's coverage.
+1. **Namespace whitelist on listeners.** Every listener carries an `allowedRoutes.namespaces.from: Selector`, and there are two labels behind them. The plain-HTTP port-80 listener selects on the built-in `kubernetes.io/metadata.name` label, which kube-apiserver writes and a namespace cannot forge. The HTTPS-terminate and the port-443 TLS-passthrough listeners select on `namespace.cozystack.io/gateway`, which is an ordinary namespace label written by the `apps/tenant` chart and by the controller, so it carries no such guarantee on its own: what keeps a namespace from applying it and attaching is that `Namespace` is cluster-scoped and no tenant role grants a verb on it, and what such a namespace could publish if it did is bounded by the route-hostname policies of Layer 2. The native-port layer-4 listeners from `tlsPassthroughListeners` go back to the `kubernetes.io/metadata.name` pin and name only the publishing tenant's namespace. HTTPS / TLS-passthrough listeners accept routes from the publishing tenant's namespace plus `gateway.attachedNamespaces` in the platform chart, which the controller labels for exactly that purpose (the default list includes the `cozy-*` namespaces for platform services and `default` for the Kubernetes API TLSRoute), and the tenant chart stamps the same label on **every inheriting child tenant namespace**, pointing at the nearest ancestor that owns a Gateway, so the attach set is the whole inheriting tenant subtree rather than the tenant plus the admin-listed namespaces. A namespace carrying neither the name match nor that label cannot attach any `HTTPRoute` or `TLSRoute` to those listeners, while a child tenant receives the label at creation rather than by patching anything. Under `certMode: edge` there are no HTTPS listeners to describe: the Gateway serves port 80 only, every listener carries the same broad selector, and the narrow port-80 rule stated further down this item does not apply — see [edge termination](#opt-in--edge-termination-no-certificates). Which class a tenant may put itself on is itself bounded: `tenant.spec.gatewayClass` is a tenant-writable field, so the gateway chart accepts only the platform default plus the classes listed in `gateway.tenantSelectableClasses`, and fails the tenant's own release otherwise. In every other mode: the plain-HTTP listener (port 80) carries a strictly narrower selector — only the tenant namespace itself and `cozy-cert-manager`. Both the controller-owned http→https redirect HTTPRoute and cert-manager's HTTP-01 challenge route live in the tenant namespace, the latter because cert-manager creates the Challenge, and with it the solver route, in the Certificate's own namespace; the `cozy-cert-manager` entry is not exercised by that path. That selector keeps routes from the other `cozy-*` namespaces and from inheriting child tenants off port 80; it does not keep off the publishing tenant's own app routes, which live in that same namespace and are admitted by it. Which route kinds a listener admits is settled two different ways. On port 443 it is written out: every listener there, HTTPS-terminate and `tls-<svc>` passthrough alike, carries the same `allowedRoutes.kinds` of `HTTPRoute` and `TLSRoute`, because divergent kind sets on one port make Cilium merge the listeners and drop HTTPRoutes (cilium#45559). The native-port listeners name no kinds at all and let the derivation from the listener protocol stand, because the protocol already says `TLSRoute`; before `v1.19.6` Cilium turned an explicit `TLSRoute` into a rejection of every HTTPRoute on the Gateway, whatever port the listener sat on. What that derivation admits is the implementation's call rather than the spec's: Gateway API leaves the protocol-to-kind mapping to the implementation and its conventional table pairs `TLS` with `TCPRoute` as well as `TLSRoute`, so the port-443 listeners exclude GRPCRoute, TCPRoute and UDPRoute by naming their kinds, while the native-port ones rest on Cilium implementing neither TCPRoute nor UDPRoute. GRPCRoute reaches the port-80 listener instead, where the route-hostname VAP covers it; TCPRoute and UDPRoute carry no hostname.
 2. **`cozystack-gateway-hostname-policy`** — `ValidatingAdmissionPolicy` on `gateway.networking.k8s.io/v1 Gateway` CREATE/UPDATE. Reads `namespaceObject.metadata.labels["namespace.cozystack.io/host"]` and rejects any listener hostname that is not equal to that value or a subdomain of it. `matchConditions` gate the VAP to cozystack-managed namespaces only — Gateways in unrelated namespaces (e.g. `kube-system`) are not touched.
 3. **`cozystack-gateway-attached-namespaces-policy`** — VAP on `cozystack.io/v1alpha1 Package` CREATE/UPDATE. Rejects any `tenant-*` entry in `spec.components.platform.values.gateway.attachedNamespaces`. Catches direct `kubectl edit packages.cozystack.io` that would bypass the helm render-time guard in layer 6.
 4. **`cozystack-tenant-host-policy`** — VAP on `apps.cozystack.io/v1alpha1 Tenant` CREATE/UPDATE. Rejects setting or changing `spec.host` unless the caller's groups contain `system:masters`, `system:serviceaccounts:cozy-system`, `system:serviceaccounts:cozy-cert-manager`, `system:serviceaccounts:cozy-fluxcd` or `system:serviceaccounts:kube-system`. Closes the path where a tenant user sets `spec.host=dashboard.example.org` on their own tenant to have the tenant chart write a hijacked label into the namespace.
 5. **`cozystack-namespace-host-label-policy`** — VAP on core `v1 Namespace` CREATE/UPDATE. Rejects any set or change of the `namespace.cozystack.io/host` label, except by the same trusted-caller whitelist as layer 4. This closes both first-time label writes on CREATE and first-time adds on UPDATE — only cozystack/Flux service accounts (which apply the tenant chart) can stamp the label.
 6. **Render-time `fail` in cozystack-basics.** The cozystack-basics chart fails the helm render if `_cluster.gateway-attached-namespaces` contains any `tenant-*` entry. Triggers on the helm-install path before the cluster ever sees the values — complements layer 3 which triggers at `kubectl apply` time.
-7. **`cozystack-route-hostname-policy`** — VAP on `gateway.networking.k8s.io/v1 HTTPRoute` and `v1alpha2 TLSRoute` CREATE/UPDATE. Scoped to `tenant-*` namespaces (cozy-* are cluster-admin-managed and trusted to publish under any apex). Rejects any `spec.hostnames` entry that is not equal to the namespace's `namespace.cozystack.io/host` label or a subdomain of it. Defense-in-depth against an app chart bug or supply-chain compromise that emits Gateway API resources outside the tenant's apex — tenants in Cozystack do not hold `gateway.networking.k8s.io/*` RBAC by design, so this is not a tenant-user defense. The within-apex cross-namespace case (a tenant chart claiming a hostname that is published by a `cozy-*` app) is handled by the controller at reconciliation time: when two routes from different namespaces claim the same hostname, the `cozy-*` namespace wins and the loser receives a `HostnameConflict` condition under the controller's name in `Status.Parents`.
+7. **`cozystack-route-hostname-policy`** — VAP on `HTTPRoute`, `TLSRoute` and `GRPCRoute` CREATE/UPDATE in `gateway.networking.k8s.io`, matching every version the vendored CRD bundle serves for each (pinned against the bundle by `hack/route-hostname-policy-version-coverage.bats`). GRPCRoute is covered because the port-80 listener leaves `allowedRoutes.kinds` unset, and an unset list resolves to the kinds the listener protocol supports, which for HTTP includes GRPCRoute. Scoped to `tenant-*` namespaces (cozy-* are cluster-admin-managed and trusted to publish under any apex). Requires `spec.hostnames` to be present and non-empty, and rejects any entry that is not equal to the namespace's `namespace.cozystack.io/host` label or a subdomain of it. A route that names no hostname is not inert: it inherits the hostnames of every listener it attaches to, and `parentRefs` may name a Gateway in another namespace, so admitting it unchecked would let it cover whatever that listener covers. A VAP cannot resolve the parent Gateway to learn which hostnames would be inherited, so the policy requires the route to name its own. The controller-owned http-to-https redirect names the tenant apex and its wildcard for this reason. Defense-in-depth against an app chart bug or supply-chain compromise that emits Gateway API resources outside the tenant's apex — tenants in Cozystack do not hold `gateway.networking.k8s.io/*` RBAC by design, so this is not a tenant-user defense. The within-apex cross-namespace case (a tenant chart claiming a hostname that is published by a `cozy-*` app) is handled by the controller at reconciliation time for HTTPRoute and TLSRoute: when two such routes from different namespaces claim the same hostname, the `cozy-*` namespace wins and the loser receives a `HostnameConflict` condition under the controller's name in `Status.Parents`. Which condition a route gets follows the shape of the refusal. `HostnameConflict` says another route holds the name. `NoMatchingListenerHostname` says there is no listener this route can attach to, and the message tells apart the shapes that produce it: nothing renders the name at all; the only listener carrying it is a TLS-passthrough listener, which answers the SNI but is not something an `HTTPRoute` attaches to, and no terminate listener was rendered beside it; the route named a listener in its `parentRef` and that listener answers a different hostname; the route named a port in its `parentRef` and no listener answering its hostname is published on that port, which an `HTTPRoute` reaches by pinning a port that is neither 443, the only port its terminate listener sits on, nor 80, which selects the plain-HTTP listener and is answered by the two shapes below rather than here; or the route is an `HTTPRoute` that wanted a terminate listener and claims a wildcard under HTTP-01, which issues no wildcard certificate, so no terminate listener could carry the name; the same route selecting the plain-HTTP listener is served there and reaches none of these shapes. Read it as "nothing here will serve you", not as "no listener exists": in every shape but the first and the last the listener is right there, and on port 443 the passthrough one even lists `HTTPRoute` among its kinds. The two `parentRef` shapes and the wildcard are also the ones that can hit a route inside the publishing tenant, which is why none of them is folded into the namespace refusal below. `NotAllowedByListeners` is the third condition, and three shapes reach it, each a listener that answers the route and turns it away. A native-port listener would take the route's kind and admits routes from the tenant's own namespace alone, so a route from elsewhere is refused by a listener that would otherwise serve it. An `HTTPRoute` that pins a rendered `tls-<name>` listener by `sectionName` is the other: that listener forwards a stream it never terminates and takes `TLSRoute` alone by protocol, so it cannot serve an `HTTPRoute` whatever namespace the route is in. An `HTTPRoute` that selects the plain-HTTP listener, by port 80 or by naming `http`, from a namespace that listener does not admit is the third. `NoMatchingParent` is the fourth, and it is the shape where the `sectionName` itself is wrong rather than the listener it names: a route pinned to a `tls-<name>` listener this Gateway does not render attaches to nothing whatever answers its hostname, and the controller can say so because it renders every listener in that namespace. For an `HTTPRoute` it is reported whatever answers the hostname, because the section is judged before the overlap is read, and an `HTTPRoute` whose `sectionName` and `parentRef` port select different listeners, `http` with port 443 for one, reaches it the same way. For a `TLSRoute` it is reported where a passthrough listener answers the route's hostname, which is where that comparison is made; one pinned to an absent section on a hostname no passthrough listener answers is unserved for the plainer reason and carries `NoMatchingListenerHostname` instead, unless an `HTTPRoute` claims that hostname too: the terminate listener rendered for it leaves the name served by something, so the `TLSRoute` is judged like any attached route and can read `Accepted=True` while the section it pinned does not exist. It still cannot attach to that listener, and that gap predates the withdrawal. A `sectionName` outside that prefix, `http` aside, is not judged here at all: the listener families it could name are the ones this pass is still deciding, so the route is written `Accepted=True` like any attached route, and the class controller's own entry says whether the listener it named took it. All four hold whether or not another route also claimed the name. Two `TLSRoute`s racing for a hostname a passthrough listener answers, both eligible to attach, still get the conflict, because that listener serves exactly one of them. A route carrying a conflict alongside any of the others is reported as `HostnameConflict`, with every cause spelled out in the message: the reason names the half an operator can act on by moving the other route. Read `Accepted=False` here as "at least one of this route's hostnames is not served", not as "this route serves nothing": Gateway API gives one condition per parentRef while a route may claim several hostnames, so a route claiming one withdrawn name and one ordinary name keeps the listener and the certificate for the second. The message names the hostnames that lost, and the ones it does not name are being served. GRPCRoute takes no part in that race and never carries the condition; it reaches only the hostname-less port-80 listener, which every route attaches to regardless of the hostname it claims.
+8. **`cozystack-ingress-hostname-policy`** — VAP on core `networking.k8s.io/v1 Ingress` CREATE/UPDATE. Gateway API is opt-in and **off by default**, so in the default configuration tenant applications publish through a legacy Ingress on the shared ingress-nginx; layers 1-7 constrain tenant hostnames on the opt-in Gateway path, and this VAP adds a hostname constraint on the default Ingress path. Scoped to `tenant-*` namespaces (cozy-* are cluster-admin-managed and trusted). A hostname on `spec.rules[].host` or `spec.tls[].hosts[]` is allowed when it is within the namespace's own `namespace.cozystack.io/host` apex, OR when it lies entirely outside the platform root apex (`_cluster.root-host`) — the second case lets a tenant route its own external custom domain (for example the `kubernetes` app's Proxied `addons.ingressNginx.hosts`, which routes a user-supplied domain to a nested cluster). A hostname that falls under the platform root apex but outside the namespace's own apex is rejected; a rule with no host (an unbounded catch-all) and `spec.defaultBackend` (a catch-all for unmatched traffic) are also rejected. Fail-closed: a `tenant-*` namespace missing its host label is denied, and the policy renders only when `_cluster.root-host` is set. This bounds which apexes a tenant Ingress may claim under the platform domain; it does not attempt to resolve every possible hostname collision.
 
 For `tenant-root` the allowed host suffix is `publishing.host`; for any `tenant-<name>` that inherits from its parent the suffix is `<name>.<parent apex>`. A child tenant with an independent apex (`customer1.io` instead of a subdomain) is handled correctly because the VAP reads the per-namespace label rather than assuming a subdomain hierarchy.
 
diff --git a/packages/extra/gateway/templates/hooks/cleanup-acme.yaml b/packages/extra/gateway/templates/hooks/cleanup-acme.yaml
new file mode 100644
index 0000000000..992517ff19
--- /dev/null
+++ b/packages/extra/gateway/templates/hooks/cleanup-acme.yaml
@@ -0,0 +1,103 @@
+---
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: {{ .Release.Name }}-cleanup
+  labels:
+    app.kubernetes.io/instance: {{ .Release.Name }}
+  annotations:
+    "helm.sh/hook": post-delete
+    "helm.sh/hook-weight": "10"
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+spec:
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/instance: {{ .Release.Name }}
+        policy.cozystack.io/allow-to-apiserver: "true"
+    spec:
+      serviceAccountName: {{ .Release.Name }}-cleanup
+      restartPolicy: Never
+      securityContext:
+        runAsNonRoot: true
+        runAsUser: 65534
+        runAsGroup: 65534
+        seccompProfile:
+          type: RuntimeDefault
+      containers:
+        - name: cleanup
+          image: docker.io/clastix/kubectl:v1.32
+          securityContext:
+            allowPrivilegeEscalation: false
+            readOnlyRootFilesystem: true
+            capabilities:
+              drop: ["ALL"]
+          env:
+            - name: HOME
+              value: /tmp
+          resources:
+            requests:
+              cpu: 10m
+              memory: 64Mi
+            limits:
+              cpu: 200m
+              memory: 128Mi
+          command:
+            - /bin/sh
+            - -c
+            - |
+              echo "Deleting orphaned cert-manager ACME account secret for {{ .Release.Name }}..."
+              kubectl delete secret -n {{ .Release.Namespace }} cozystack-acme-account --ignore-not-found \
+                || echo "WARNING: ACME account secret cleanup failed for {{ .Release.Name }}; it may remain orphaned" >&2
+              echo "Cleanup complete."
+          volumeMounts:
+            - name: tmp
+              mountPath: /tmp
+      volumes:
+        - name: tmp
+          emptyDir: {}
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ .Release.Name }}-cleanup
+  labels:
+    app.kubernetes.io/instance: {{ .Release.Name }}
+  annotations:
+    "helm.sh/hook": post-delete
+    helm.sh/hook-weight: "0"
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: {{ .Release.Name }}-cleanup
+  labels:
+    app.kubernetes.io/instance: {{ .Release.Name }}
+  annotations:
+    "helm.sh/hook": post-delete
+    "helm.sh/hook-weight": "5"
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+rules:
+  - apiGroups: [""]
+    resources: ["secrets"]
+    resourceNames: ["cozystack-acme-account"]
+    verbs: ["get", "delete"]
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: {{ .Release.Name }}-cleanup
+  labels:
+    app.kubernetes.io/instance: {{ .Release.Name }}
+  annotations:
+    "helm.sh/hook": post-delete
+    helm.sh/hook-weight: "5"
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: {{ .Release.Name }}-cleanup
+subjects:
+  - kind: ServiceAccount
+    name: {{ .Release.Name }}-cleanup
diff --git a/packages/extra/gateway/templates/tenantgateway.yaml b/packages/extra/gateway/templates/tenantgateway.yaml
index aa8c9a1b81..f0d5ef5ebf 100644
--- a/packages/extra/gateway/templates/tenantgateway.yaml
+++ b/packages/extra/gateway/templates/tenantgateway.yaml
@@ -5,6 +5,106 @@
 {{- $solver := (index .Values._cluster "solver") | default "http01" }}
 {{- $issuerName := (index .Values._cluster "issuer-name") | default "letsencrypt-prod" }}
 {{- $provider := (index .Values._cluster "dns01-provider") | default "cloudflare" }}
+{{- $wildcardSecret := (index .Values._cluster "wildcard-secret-name") | default "" }}
+{{- /*
+  Class resolution, most specific first: the tenant's own choice
+  (tenant.spec.gatewayClass, delivered as this chart's gatewayClassName),
+  then the platform default (_cluster.gateway-class-name), then the chart
+  default for a platform that predates the key.
+*/}}
+{{- /* Trimmed on both sides of every later comparison: the class lists
+       below arrive comma-joined and trim their own entries, so an
+       untrimmed scalar here would fail `has` against its own padded
+       self and match neither the edge list nor the allowlist that is
+       supposed to always contain the default.
+
+       Unset falls back; whitespace-only refuses. Unset means the choice
+       was not made, and falling back is its documented behaviour.
+       Whitespace means a choice was made and is garbage, in the field
+       that decides where TLS terminates — resolving it quietly would put
+       a tenant meant for an edge terminator on the bundled class and
+       publish it directly instead. */}}
+{{- $rawDefaultClass := (index .Values._cluster "gateway-class-name") | default "" }}
+{{- $rawClassName := .Values.gatewayClassName | default "" }}
+{{- if and (ne $rawDefaultClass "") (eq (trim $rawDefaultClass) "") }}
+  {{- fail "packages/extra/gateway: _cluster.gateway-class-name is only whitespace. The platform writes this from gateway.className; leave that unset for the bundled cilium class rather than blank." }}
+{{- end }}
+{{- if and (ne $rawClassName "") (eq (trim $rawClassName) "") }}
+  {{- fail "packages/extra/gateway: gatewayClass is only whitespace. Leave tenant.spec.gatewayClass unset to take the platform default, or name a class the operator lists in gateway.tenantSelectableClasses." }}
+{{- end }}
+{{- $defaultClass := $rawDefaultClass | trim | default "cilium" }}
+{{- $className := $rawClassName | trim | default $defaultClass }}
+{{- $edgeClasses := list }}
+{{- range splitList "," ((index .Values._cluster "gateway-edge-classes") | default "") }}
+  {{- $c := . | trim }}
+  {{- if $c }}
+    {{- $edgeClasses = append $edgeClasses $c }}
+  {{- end }}
+{{- end }}
+{{- /*
+  A tenant may only select a class the operator allowed. Tenant is a
+  tenant-writable object and a GatewayClass is cluster-scoped, so without
+  this check a tenant could attach its Gateway to an admin's internal-only
+  class. The platform default is always allowed: every tenant that chooses
+  nothing already lands on it.
+*/}}
+{{- /* expose-ingress is overloaded: it is both an ingressClassName and
+       the publishing namespace, and the two coincide only in the default
+       deployment (see the NOTE in the wildcardsecret controller's
+       readConfig). A deployment that splits them makes the checks below
+       compare against the wrong namespace, so they stop protecting the
+       tenant they are meant to. */}}
+{{- $publishingNS := (index .Values._cluster "expose-ingress") | default "tenant-root" }}
+{{- if .Values.gatewayClassName }}
+  {{- $allowed := list $defaultClass }}
+  {{- range splitList "," ((index .Values._cluster "gateway-tenant-classes") | default "") }}
+    {{- $c := . | trim }}
+    {{- if $c }}
+      {{- $allowed = append $allowed $c }}
+    {{- end }}
+  {{- end }}
+  {{- if not (has $className $allowed) }}
+    {{- fail (printf "packages/extra/gateway: gatewayClass=%q is not selectable by tenants. Allowed: %s. The operator extends the set with gateway.tenantSelectableClasses in the platform values." $className (join ", " $allowed)) }}
+  {{- end }}
+  {{- /*
+    The publishing tenant is a special case. Its Gateway is what the
+    cluster-wide ACME ClusterIssuers point their HTTP-01 solver at, and
+    those are rendered from the platform default class alone — a tenant's
+    own choice does not ride that channel. Letting the publishing tenant
+    pick a class whose TLS terminates differently would leave the solver
+    pinned to a listener that Gateway no longer has (or unpinned when it
+    does), and every HTTP-01 certificate in the cluster stops issuing with
+    nothing in any status saying why. Refuse it here, where the operator
+    is looking, rather than in the certificate that silently never renews.
+  */}}
+  {{- if eq .Release.Namespace $publishingNS }}
+    {{- $defaultAtEdge := has $defaultClass $edgeClasses }}
+    {{- $selectedAtEdge := has $className $edgeClasses }}
+    {{- if ne $defaultAtEdge $selectedAtEdge }}
+      {{- fail (printf "packages/extra/gateway: the publishing tenant (%s) cannot select gatewayClass=%q: it terminates TLS differently from the platform default %q, and the cluster-wide ACME issuers are configured from that default. Change gateway.className instead." $publishingNS $className $defaultClass) }}
+    {{- end }}
+  {{- end }}
+{{- end }}
+{{- /*
+  TLS termination is a property of the CLASS, declared once on the platform
+  and read here for whichever class this tenant ended up on — so a tenant
+  that selects an edge-terminated class gets edge behaviour without having
+  to state it again, and cannot get the two out of step.
+*/}}
+{{- $tlsTermination := ternary "edge" "gateway" (has $className $edgeClasses) }}
+{{- /*
+  Edge termination wins over everything else: the class provider ends
+  TLS upstream of the Gateway (Cloudflare Tunnel terminates at the
+  Cloudflare edge), so the controller mints no certificates at all
+  and the solver, provider, issuer and wildcard-secret inputs are
+  not read. Below that, the operator-supplied wildcard mode wins over
+  ACME. When
+  _cluster.wildcard-secret-name is set, the Gateway references that
+  pre-existing Secret directly (certMode=existingSecret) and the
+  controller mints no Issuer/Certificate — so the solver, provider,
+  and issuer-name validations below (all ACME concerns) are skipped.
+*/}}
+{{- if and (ne $tlsTermination "edge") (not $wildcardSecret) }}
 {{- /*
   Validate solver early — same check the old issuer.yaml ran. The
   controller will refuse to render an Issuer with an unsupported
@@ -22,6 +122,7 @@
 {{- if and (ne $issuerName "letsencrypt-prod") (ne $issuerName "letsencrypt-stage") }}
   {{- fail (printf "packages/extra/gateway currently supports publishing.certificates.issuerName=letsencrypt-prod or letsencrypt-stage (got %q). For other issuers, extend the controller to map the name to the corresponding ACME server URL." $issuerName) }}
 {{- end }}
+{{- end }}
 {{- $extraNs := list }}
 {{- range splitList "," ((index .Values._cluster "gateway-attached-namespaces") | default "") }}
   {{- $ns := . | trim }}
@@ -36,7 +137,14 @@ metadata:
   name: cozystack
 spec:
   apex: {{ $host | quote }}
-  gatewayClassName: {{ .Values.gatewayClassName | quote }}
+  gatewayClassName: {{ $className | quote }}
+  {{- if eq $tlsTermination "edge" }}
+  certMode: edge
+  {{- else if $wildcardSecret }}
+  certMode: existingSecret
+  wildcardSecretRef:
+    name: {{ $wildcardSecret | quote }}
+  {{- else }}
   certMode: {{ $solver | quote }}
   issuerName: {{ $issuerName | quote }}
   {{- if eq $solver "dns01" }}
@@ -75,13 +183,29 @@ spec:
         key: {{ (index .Values._cluster "dns01-rfc2136-secret-key") | default "tsig-secret-key" | quote }}
     {{- end }}
   {{- end }}
+  {{- end }}
   {{- with $extraNs }}
   attachedNamespaces:
     {{- range . }}
     - {{ . | quote }}
     {{- end }}
   {{- end }}
-  {{- with .Values.tlsPassthroughServices }}
+  {{- /* Only where a platform TLSRoute can attach: the packages owning
+         these services render one per name in expose-services while
+         gateway-enabled is on, always parented to the publishing tenant's
+         Gateway. Anywhere else the listener would be routeless and would
+         still reserve its name, taking it from the tenant's own HTTPRoutes.
+         None in edge mode: the controller renders no TLS listener there. */}}
+  {{- $exposed := splitList "," ((index .Values._cluster "expose-services") | default "") }}
+  {{- $passthrough := list }}
+  {{- if and (ne $tlsTermination "edge") (eq .Release.Namespace $publishingNS) (eq (toString ((index .Values._cluster "gateway-enabled") | default "false")) "true") }}
+    {{- range .Values.tlsPassthroughServices }}
+      {{- if has . $exposed }}
+        {{- $passthrough = append $passthrough . }}
+      {{- end }}
+    {{- end }}
+  {{- end }}
+  {{- with $passthrough }}
   tlsPassthroughServices:
     {{- range . }}
     - {{ . | quote }}
diff --git a/packages/extra/gateway/tests/cleanup_acme_test.yaml b/packages/extra/gateway/tests/cleanup_acme_test.yaml
new file mode 100644
index 0000000000..2460570b21
--- /dev/null
+++ b/packages/extra/gateway/tests/cleanup_acme_test.yaml
@@ -0,0 +1,130 @@
+suite: cleanup ACME account secret post-delete hook
+templates:
+  - templates/hooks/cleanup-acme.yaml
+
+release:
+  name: gateway
+  namespace: tenant-root
+
+tests:
+  - it: renders the post-delete cleanup Job, ServiceAccount, Role and RoleBinding
+    asserts:
+      - hasDocuments:
+          count: 4
+
+  - it: Job is a post-delete hook named <release>-cleanup
+    documentSelector:
+      path: kind
+      value: Job
+    asserts:
+      - equal:
+          path: metadata.name
+          value: gateway-cleanup
+      - equal:
+          path: metadata.annotations["helm.sh/hook"]
+          value: post-delete
+      - equal:
+          path: metadata.annotations["helm.sh/hook-weight"]
+          value: "10"
+      - equal:
+          path: metadata.annotations["helm.sh/hook-delete-policy"]
+          value: before-hook-creation,hook-succeeded
+
+  - it: Job deletes the cozystack-acme-account secret in the release namespace
+    documentSelector:
+      path: kind
+      value: Job
+    asserts:
+      - equal:
+          path: spec.template.spec.serviceAccountName
+          value: gateway-cleanup
+      - equal:
+          path: spec.template.spec.restartPolicy
+          value: Never
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: "kubectl delete secret -n tenant-root cozystack-acme-account --ignore-not-found"
+
+  - it: Job pod and container carry a hardened securityContext
+    documentSelector:
+      path: kind
+      value: Job
+    asserts:
+      - equal:
+          path: spec.template.spec.securityContext.runAsNonRoot
+          value: true
+      - equal:
+          path: spec.template.spec.securityContext.runAsUser
+          value: 65534
+      - equal:
+          path: spec.template.spec.securityContext.seccompProfile.type
+          value: RuntimeDefault
+      - equal:
+          path: spec.template.spec.containers[0].securityContext.allowPrivilegeEscalation
+          value: false
+      - equal:
+          path: spec.template.spec.containers[0].securityContext.readOnlyRootFilesystem
+          value: true
+      - contains:
+          path: spec.template.spec.containers[0].securityContext.capabilities.drop
+          content: ALL
+      - equal:
+          path: spec.template.metadata.labels["policy.cozystack.io/allow-to-apiserver"]
+          value: "true"
+
+  - it: Role is scoped via resourceNames to the cozystack-acme-account secret only
+    documentSelector:
+      path: kind
+      value: Role
+    asserts:
+      - equal:
+          path: metadata.name
+          value: gateway-cleanup
+      - equal:
+          path: metadata.annotations["helm.sh/hook"]
+          value: post-delete
+      - equal:
+          path: rules[0].apiGroups[0]
+          value: ""
+      - contains:
+          path: rules[0].resources
+          content: secrets
+      - equal:
+          path: rules[0].resourceNames
+          value:
+            - cozystack-acme-account
+      - equal:
+          path: rules[0].verbs
+          value:
+            - get
+            - delete
+
+  - it: RoleBinding binds the cleanup Role to the cleanup ServiceAccount
+    documentSelector:
+      path: kind
+      value: RoleBinding
+    asserts:
+      - equal:
+          path: roleRef.kind
+          value: Role
+      - equal:
+          path: roleRef.name
+          value: gateway-cleanup
+      - equal:
+          path: subjects[0].kind
+          value: ServiceAccount
+      - equal:
+          path: subjects[0].name
+          value: gateway-cleanup
+
+  - it: ServiceAccount is a post-delete hook named <release>-cleanup
+    documentSelector:
+      path: kind
+      value: ServiceAccount
+    asserts:
+      - equal:
+          path: metadata.name
+          value: gateway-cleanup
+      - equal:
+          path: metadata.annotations["helm.sh/hook"]
+          value: post-delete
diff --git a/packages/extra/gateway/tests/tenantgateway_test.yaml b/packages/extra/gateway/tests/tenantgateway_test.yaml
index 1f444a0655..8bbf8b7209 100644
--- a/packages/extra/gateway/tests/tenantgateway_test.yaml
+++ b/packages/extra/gateway/tests/tenantgateway_test.yaml
@@ -259,11 +259,13 @@ tests:
             - cozy-dashboard
             - cozy-keycloak
 
-  - it: tlsPassthroughServices defaults to api,vm-exportproxy,cdi-uploadproxy
+  - it: the publishing tenant renders the default tlsPassthroughServices the platform exposes
     set:
       _cluster:
         solver: http01
         expose-ingress: tenant-root
+        expose-services: api,dashboard,vm-exportproxy,cdi-uploadproxy
+        gateway-enabled: "true"
         issuer-name: letsencrypt-prod
       _namespace:
         host: example.org
@@ -274,3 +276,508 @@ tests:
             - api
             - vm-exportproxy
             - cdi-uploadproxy
+
+  - it: the publishing tenant renders only the passthrough services the platform exposes
+    set:
+      _cluster:
+        solver: http01
+        expose-ingress: tenant-root
+        expose-services: dashboard,api
+        gateway-enabled: "true"
+        issuer-name: letsencrypt-prod
+      _namespace:
+        host: example.org
+    asserts:
+      - equal:
+          path: spec.tlsPassthroughServices
+          value:
+            - api
+
+  - it: the publishing tenant is the one expose-ingress names
+    release:
+      namespace: tenant-pub
+    set:
+      _cluster:
+        solver: http01
+        expose-ingress: tenant-pub
+        expose-services: api,dashboard,vm-exportproxy,cdi-uploadproxy
+        gateway-enabled: "true"
+        issuer-name: letsencrypt-prod
+      _namespace:
+        host: pub.example.org
+    asserts:
+      - equal:
+          path: spec.tlsPassthroughServices
+          value:
+            - api
+            - vm-exportproxy
+            - cdi-uploadproxy
+
+  - it: a tenant that does not publish the platform services renders no tlsPassthroughServices
+    release:
+      namespace: tenant-alice
+    set:
+      _cluster:
+        solver: http01
+        expose-ingress: tenant-root
+        expose-services: api,dashboard,vm-exportproxy,cdi-uploadproxy
+        gateway-enabled: "true"
+        issuer-name: letsencrypt-prod
+      _namespace:
+        host: alice.example.org
+    asserts:
+      - notExists:
+          path: spec.tlsPassthroughServices
+
+  - it: the publishing tenant renders no tlsPassthroughServices while the platform gateway is off
+    set:
+      _cluster:
+        solver: http01
+        expose-ingress: tenant-root
+        expose-services: api,dashboard,vm-exportproxy,cdi-uploadproxy
+        gateway-enabled: "false"
+        issuer-name: letsencrypt-prod
+      _namespace:
+        host: example.org
+    asserts:
+      - notExists:
+          path: spec.tlsPassthroughServices
+
+  - it: the publishing tenant renders no tlsPassthroughServices when the platform exposes none of them
+    set:
+      _cluster:
+        solver: http01
+        expose-ingress: tenant-root
+        expose-services: dashboard
+        gateway-enabled: "true"
+        issuer-name: letsencrypt-prod
+      _namespace:
+        host: example.org
+    asserts:
+      - notExists:
+          path: spec.tlsPassthroughServices
+
+  - it: wildcard-secret-name switches to certMode=existingSecret with wildcardSecretRef
+    set:
+      _cluster:
+        solver: http01
+        expose-ingress: tenant-root
+        issuer-name: letsencrypt-prod
+        wildcard-secret-name: wildcard-tls
+      _namespace:
+        host: example.org
+    asserts:
+      - equal:
+          path: spec.certMode
+          value: existingSecret
+      - equal:
+          path: spec.wildcardSecretRef.name
+          value: wildcard-tls
+      - notExists:
+          path: spec.dns01
+      - notExists:
+          path: spec.issuerName
+
+  - it: wildcard-secret-name takes precedence over solver=dns01
+    set:
+      _cluster:
+        solver: dns01
+        dns01-provider: cloudflare
+        expose-ingress: tenant-root
+        issuer-name: letsencrypt-prod
+        wildcard-secret-name: wildcard-tls
+      _namespace:
+        host: example.org
+    asserts:
+      - equal:
+          path: spec.certMode
+          value: existingSecret
+      - equal:
+          path: spec.wildcardSecretRef.name
+          value: wildcard-tls
+      - notExists:
+          path: spec.dns01
+
+  - it: wildcard mode skips ACME validations (custom issuer-name ignored)
+    set:
+      _cluster:
+        solver: http01
+        expose-ingress: tenant-root
+        issuer-name: my-custom-ca
+        wildcard-secret-name: wildcard-tls
+      _namespace:
+        host: example.org
+    asserts:
+      - equal:
+          path: spec.certMode
+          value: existingSecret
+      - notExists:
+          path: spec.issuerName
+
+  - it: tlsPassthroughServices still render in wildcard mode
+    set:
+      _cluster:
+        solver: http01
+        expose-ingress: tenant-root
+        expose-services: api,dashboard,vm-exportproxy,cdi-uploadproxy
+        gateway-enabled: "true"
+        issuer-name: letsencrypt-prod
+        wildcard-secret-name: wildcard-tls
+      _namespace:
+        host: example.org
+    asserts:
+      - equal:
+          path: spec.tlsPassthroughServices
+          value:
+            - api
+            - vm-exportproxy
+            - cdi-uploadproxy
+
+  - it: gateway-class-name from _cluster is the default when the tenant picks none
+    set:
+      _cluster:
+        solver: http01
+        expose-ingress: tenant-root
+        issuer-name: letsencrypt-prod
+        gateway-class-name: cloudflare-tunnel
+      _namespace:
+        host: example.org
+    asserts:
+      - equal:
+          path: spec.gatewayClassName
+          value: cloudflare-tunnel
+
+  - it: the tenant's own class wins over the platform default
+    release:
+      namespace: tenant-alice
+    set:
+      _cluster:
+        solver: http01
+        expose-ingress: tenant-root
+        issuer-name: letsencrypt-prod
+        gateway-class-name: cilium
+        gateway-tenant-classes: cloudflare-tunnel
+      _namespace:
+        host: example.org
+      gatewayClassName: cloudflare-tunnel
+    asserts:
+      - equal:
+          path: spec.gatewayClassName
+          value: cloudflare-tunnel
+
+  - it: falls back to cilium against a platform that predates gateway.className
+    set:
+      _cluster:
+        solver: http01
+        expose-ingress: tenant-root
+        issuer-name: letsencrypt-prod
+      _namespace:
+        host: example.org
+    asserts:
+      - equal:
+          path: spec.gatewayClassName
+          value: cilium
+
+  - it: a class listed as edge-terminated switches the tenant to certMode=edge
+    release:
+      namespace: tenant-alice
+    set:
+      _cluster:
+        solver: dns01
+        dns01-provider: cloudflare
+        expose-ingress: tenant-root
+        issuer-name: letsencrypt-prod
+        gateway-class-name: cilium
+        gateway-edge-classes: cloudflare-tunnel,some-other-tunnel
+        gateway-tenant-classes: cloudflare-tunnel
+      _namespace:
+        host: alice.example.org
+      gatewayClassName: cloudflare-tunnel
+    asserts:
+      - equal:
+          path: spec.certMode
+          value: edge
+      - equal:
+          path: spec.gatewayClassName
+          value: cloudflare-tunnel
+      - notExists:
+          path: spec.dns01
+      - notExists:
+          path: spec.issuerName
+      - notExists:
+          path: spec.wildcardSecretRef
+
+  - it: the same tenant on a class that is not listed keeps issuing certificates
+    set:
+      _cluster:
+        solver: dns01
+        dns01-provider: cloudflare
+        expose-ingress: tenant-root
+        issuer-name: letsencrypt-prod
+        gateway-class-name: cilium
+        gateway-edge-classes: cloudflare-tunnel
+      _namespace:
+        host: example.org
+    asserts:
+      - equal:
+          path: spec.certMode
+          value: dns01
+      - equal:
+          path: spec.gatewayClassName
+          value: cilium
+      - exists:
+          path: spec.dns01.cloudflare
+
+  - it: the platform default class being edge-terminated reaches a tenant that picks nothing
+    set:
+      _cluster:
+        solver: http01
+        expose-ingress: tenant-root
+        issuer-name: letsencrypt-prod
+        gateway-class-name: cloudflare-tunnel
+        gateway-edge-classes: cloudflare-tunnel
+      _namespace:
+        host: example.org
+    asserts:
+      - equal:
+          path: spec.certMode
+          value: edge
+
+  - it: a padded platform default class still matches the edge list and renders trimmed
+    set:
+      _cluster:
+        solver: http01
+        expose-ingress: tenant-root
+        issuer-name: letsencrypt-prod
+        gateway-class-name: "  cloudflare-tunnel  "
+        gateway-edge-classes: cloudflare-tunnel
+      _namespace:
+        host: example.org
+    asserts:
+      - equal:
+          path: spec.gatewayClassName
+          value: cloudflare-tunnel
+      - equal:
+          path: spec.certMode
+          value: edge
+
+  - it: a padded tenant-selected class passes the allowlist and renders trimmed
+    release:
+      namespace: tenant-alice
+    set:
+      _cluster:
+        solver: http01
+        expose-ingress: tenant-root
+        issuer-name: letsencrypt-prod
+        gateway-class-name: cilium
+        gateway-edge-classes: cloudflare-tunnel
+        gateway-tenant-classes: cloudflare-tunnel
+      _namespace:
+        host: alice.example.org
+      gatewayClassName: "  cloudflare-tunnel  "
+    asserts:
+      - equal:
+          path: spec.gatewayClassName
+          value: cloudflare-tunnel
+      - equal:
+          path: spec.certMode
+          value: edge
+
+  - it: an unset platform default falls back to the bundled class
+    set:
+      _cluster:
+        solver: http01
+        expose-ingress: tenant-root
+        issuer-name: letsencrypt-prod
+      _namespace:
+        host: example.org
+    asserts:
+      - equal:
+          path: spec.gatewayClassName
+          value: cilium
+
+  - it: a whitespace-only platform default is refused rather than resolved
+    set:
+      _cluster:
+        solver: http01
+        expose-ingress: tenant-root
+        issuer-name: letsencrypt-prod
+        gateway-class-name: "   "
+      _namespace:
+        host: example.org
+    asserts:
+      - failedTemplate:
+          errorMessage: 'packages/extra/gateway: _cluster.gateway-class-name is only whitespace. The platform writes this from gateway.className; leave that unset for the bundled cilium class rather than blank.'
+
+  - it: a whitespace-only tenant class is refused rather than silently defaulted
+    release:
+      namespace: tenant-alice
+    set:
+      _cluster:
+        solver: http01
+        expose-ingress: tenant-root
+        issuer-name: letsencrypt-prod
+        gateway-class-name: cilium
+      _namespace:
+        host: alice.example.org
+      gatewayClassName: "   "
+    asserts:
+      - failedTemplate:
+          errorMessage: 'packages/extra/gateway: gatewayClass is only whitespace. Leave tenant.spec.gatewayClass unset to take the platform default, or name a class the operator lists in gateway.tenantSelectableClasses.'
+
+  - it: an edge class wins over wildcard-secret-name
+    set:
+      _cluster:
+        solver: http01
+        expose-ingress: tenant-root
+        issuer-name: letsencrypt-prod
+        wildcard-secret-name: wildcard-tls
+        gateway-class-name: cloudflare-tunnel
+        gateway-edge-classes: cloudflare-tunnel
+      _namespace:
+        host: example.org
+    asserts:
+      - equal:
+          path: spec.certMode
+          value: edge
+      - notExists:
+          path: spec.wildcardSecretRef
+
+  - it: an edge class skips the ACME validations (custom issuer-name ignored)
+    set:
+      _cluster:
+        solver: bogus
+        expose-ingress: tenant-root
+        issuer-name: my-corp-ca
+        gateway-class-name: cloudflare-tunnel
+        gateway-edge-classes: cloudflare-tunnel
+      _namespace:
+        host: example.org
+    asserts:
+      - equal:
+          path: spec.certMode
+          value: edge
+
+  - it: a tenant cannot select a class the operator did not allow
+    set:
+      _cluster:
+        solver: http01
+        expose-ingress: tenant-root
+        issuer-name: letsencrypt-prod
+        gateway-class-name: cilium
+        gateway-tenant-classes: cloudflare-tunnel
+      _namespace:
+        host: example.org
+      gatewayClassName: admin-internal
+    asserts:
+      - failedTemplate:
+          errorPattern: 'gatewayClass="admin-internal" is not selectable by tenants'
+
+  - it: a tenant may always select the platform default explicitly
+    set:
+      _cluster:
+        solver: http01
+        expose-ingress: tenant-root
+        issuer-name: letsencrypt-prod
+        gateway-class-name: cilium
+      _namespace:
+        host: example.org
+      gatewayClassName: cilium
+    asserts:
+      - equal:
+          path: spec.gatewayClassName
+          value: cilium
+
+  - it: the publishing tenant cannot select a class that terminates TLS differently
+    set:
+      _cluster:
+        solver: http01
+        expose-ingress: tenant-root
+        issuer-name: letsencrypt-prod
+        gateway-class-name: cilium
+        gateway-edge-classes: cloudflare-tunnel
+        gateway-tenant-classes: cloudflare-tunnel
+      _namespace:
+        host: example.org
+      gatewayClassName: cloudflare-tunnel
+    asserts:
+      - failedTemplate:
+          errorPattern: 'the publishing tenant \(tenant-root\) cannot select gatewayClass="cloudflare-tunnel"'
+
+  - it: a non-publishing tenant may select that same class
+    release:
+      namespace: tenant-alice
+    set:
+      _cluster:
+        solver: http01
+        expose-ingress: tenant-root
+        issuer-name: letsencrypt-prod
+        gateway-class-name: cilium
+        gateway-edge-classes: cloudflare-tunnel
+        gateway-tenant-classes: cloudflare-tunnel
+      _namespace:
+        host: alice.example.org
+      gatewayClassName: cloudflare-tunnel
+    asserts:
+      - equal:
+          path: spec.certMode
+          value: edge
+
+  - it: the publishing tenant may select a class that matches the default's termination
+    set:
+      _cluster:
+        solver: http01
+        expose-ingress: tenant-root
+        issuer-name: letsencrypt-prod
+        gateway-class-name: cilium
+        gateway-edge-classes: cloudflare-tunnel
+        gateway-tenant-classes: another-terminating-class
+      _namespace:
+        host: example.org
+      gatewayClassName: another-terminating-class
+    asserts:
+      - equal:
+          path: spec.gatewayClassName
+          value: another-terminating-class
+      - equal:
+          path: spec.certMode
+          value: http01
+
+  - it: the publishing tenant may select another edge class when the default is edge too
+    set:
+      _cluster:
+        solver: http01
+        expose-ingress: tenant-root
+        issuer-name: letsencrypt-prod
+        gateway-class-name: cloudflare-tunnel
+        gateway-edge-classes: cloudflare-tunnel,some-other-tunnel
+        gateway-tenant-classes: some-other-tunnel
+      _namespace:
+        host: example.org
+      gatewayClassName: some-other-tunnel
+    asserts:
+      - equal:
+          path: spec.gatewayClassName
+          value: some-other-tunnel
+      - equal:
+          path: spec.certMode
+          value: edge
+
+  - it: an edge publishing tenant advertises no tlsPassthroughServices in its CR
+    set:
+      _cluster:
+        solver: http01
+        expose-ingress: tenant-root
+        expose-services: api,dashboard,vm-exportproxy,cdi-uploadproxy
+        gateway-enabled: "true"
+        issuer-name: letsencrypt-prod
+        gateway-class-name: cloudflare-tunnel
+        gateway-edge-classes: cloudflare-tunnel
+      _namespace:
+        host: example.org
+    asserts:
+      - equal:
+          path: spec.certMode
+          value: edge
+      - notExists:
+          path: spec.tlsPassthroughServices
diff --git a/packages/extra/gateway/values.schema.json b/packages/extra/gateway/values.schema.json
index 6a093ebb78..290af8c56e 100644
--- a/packages/extra/gateway/values.schema.json
+++ b/packages/extra/gateway/values.schema.json
@@ -3,12 +3,12 @@
   "type": "object",
   "properties": {
     "gatewayClassName": {
-      "description": "GatewayClass to attach the tenant Gateway to. Must exist cluster-wide. Default matches the Cilium-managed class.",
+      "description": "GatewayClass for this tenant's Gateway, set from `tenant.spec.gatewayClass`. Empty means the platform default (`_cluster.gateway-class-name`, itself defaulting to the bundled `cilium` class). Whether the class terminates TLS itself or at its provider's edge comes from the platform's `gateway.edgeTerminatedClasses`, so the two cannot get out of step.",
       "type": "string",
-      "default": "cilium"
+      "default": ""
     },
     "tlsPassthroughServices": {
-      "description": "Names (from publishing.exposedServices) whose traffic is TLS-passthrough rather than TLS-terminate. For each such service a dedicated HTTPS listener with tls.mode=Passthrough is rendered on the Gateway, and the service is expected to attach a TLSRoute instead of an HTTPRoute.",
+      "description": "Names (from publishing.exposedServices) whose traffic is TLS-passthrough rather than TLS-terminate. For each such service a dedicated HTTPS listener with tls.mode=Passthrough is rendered on the Gateway, and the service is expected to attach a TLSRoute instead of an HTTPRoute. Rendered only on the publishing tenant, the namespace `publishing.ingressName` names, while `gateway.enabled` is on, and only for names `publishing.exposedServices` lists: the platform TLSRoutes for these services attach to that tenant's Gateway alone, and a passthrough listener anywhere else would reserve its name with nothing behind it. Ignored when this tenant's Gateway is on a class the platform lists in `gateway.edgeTerminatedClasses`: an HTTP-only edge cannot carry a TLS listener, so those services are not published through the tenant Gateway at all.",
       "type": "array",
       "default": [
         "api",
diff --git a/packages/extra/gateway/values.yaml b/packages/extra/gateway/values.yaml
index 74d8224835..9019f342ab 100644
--- a/packages/extra/gateway/values.yaml
+++ b/packages/extra/gateway/values.yaml
@@ -2,10 +2,10 @@
 ## @section Common parameters
 ##
 
-## @param {string} gatewayClassName - GatewayClass to attach the tenant Gateway to. Must exist cluster-wide. Default matches the Cilium-managed class.
-gatewayClassName: cilium
+## @param {string} gatewayClassName - GatewayClass for this tenant's Gateway, set from `tenant.spec.gatewayClass`. Empty means the platform default (`_cluster.gateway-class-name`, itself defaulting to the bundled `cilium` class). Whether the class terminates TLS itself or at its provider's edge comes from the platform's `gateway.edgeTerminatedClasses`, so the two cannot get out of step.
+gatewayClassName: ""
 
-## @param {[]string} tlsPassthroughServices - Names (from publishing.exposedServices) whose traffic is TLS-passthrough rather than TLS-terminate. For each such service a dedicated HTTPS listener with tls.mode=Passthrough is rendered on the Gateway, and the service is expected to attach a TLSRoute instead of an HTTPRoute.
+## @param {[]string} tlsPassthroughServices - Names (from publishing.exposedServices) whose traffic is TLS-passthrough rather than TLS-terminate. For each such service a dedicated HTTPS listener with tls.mode=Passthrough is rendered on the Gateway, and the service is expected to attach a TLSRoute instead of an HTTPRoute. Rendered only on the publishing tenant, the namespace `publishing.ingressName` names, while `gateway.enabled` is on, and only for names `publishing.exposedServices` lists: the platform TLSRoutes for these services attach to that tenant's Gateway alone, and a passthrough listener anywhere else would reserve its name with nothing behind it. Ignored when this tenant's Gateway is on a class the platform lists in `gateway.edgeTerminatedClasses`: an HTTP-only edge cannot carry a TLS listener, so those services are not published through the tenant Gateway at all.
 tlsPassthroughServices:
   - api
   - vm-exportproxy
diff --git a/packages/extra/info/Makefile b/packages/extra/info/Makefile
index 02e04d53b8..9d58f7197a 100644
--- a/packages/extra/info/Makefile
+++ b/packages/extra/info/Makefile
@@ -1,7 +1,10 @@
-NAME=etcd
+NAME=info
 
 include ../../../hack/package.mk
 
+test:
+	helm unittest .
+
 generate:
 	cozyvalues-gen -v values.yaml -s values.schema.json -r README.md
 	yq -o json -i '.properties = {}' values.schema.json
diff --git a/packages/extra/info/templates/kubeconfig.yaml b/packages/extra/info/templates/kubeconfig.yaml
index 5e473e1ed3..e8fea935df 100644
--- a/packages/extra/info/templates/kubeconfig.yaml
+++ b/packages/extra/info/templates/kubeconfig.yaml
@@ -1,4 +1,5 @@
 {{- $host := index .Values._cluster "root-host" }}
+{{- $realm := index .Values._cluster "oidc-realm-name" | default "cozy" }}
 {{- $oidcEnabled := index .Values._cluster "oidc-enabled" }}
 {{- if $oidcEnabled }}
 {{-   $apiServerEndpoint := index .Values._cluster "api-server-endpoint" }}
@@ -35,7 +36,7 @@ stringData:
           args:
           - oidc-login
           - get-token
-          - --oidc-issuer-url=https://keycloak.{{ $host }}/realms/cozy
+          - --oidc-issuer-url=https://keycloak.{{ $host }}/realms/{{ $realm }}
           - --oidc-client-id=kubernetes
           - --skip-open-browser
           command: kubectl
diff --git a/packages/extra/info/tests/kubeconfig_test.yaml b/packages/extra/info/tests/kubeconfig_test.yaml
new file mode 100644
index 0000000000..6486e40558
--- /dev/null
+++ b/packages/extra/info/tests/kubeconfig_test.yaml
@@ -0,0 +1,43 @@
+suite: info kubeconfig OIDC issuer realm
+templates:
+  - templates/kubeconfig.yaml
+
+release:
+  name: info
+  namespace: tenant-root
+
+# The generated user kubeconfig runs kubectl oidc-login against
+# keycloak.<host>/realms/<realm>. The realm segment is driven by
+# _cluster.oidc-realm-name (authentication.oidc.realmName in the platform), so a
+# renamed realm must reach the issuer here too — the token this kubeconfig mints
+# is rejected by the apiserver unless its issuer matches the apiserver OIDC
+# issuer, which the operator points at the same custom realm via talm.
+
+tests:
+  - it: defaults the issuer realm to cozy
+    set:
+      _cluster:
+        root-host: example.org
+        oidc-enabled: "true"
+        api-server-endpoint: https://api.example.org:6443
+        kube-root-ca: dGVzdA==
+    asserts:
+      - matchRegex:
+          path: stringData.kubeconfig
+          pattern: '--oidc-issuer-url=https://keycloak\.example\.org/realms/cozy'
+
+  - it: threads a custom realm name into the issuer
+    set:
+      _cluster:
+        root-host: example.org
+        oidc-enabled: "true"
+        oidc-realm-name: acme
+        api-server-endpoint: https://api.example.org:6443
+        kube-root-ca: dGVzdA==
+    asserts:
+      - matchRegex:
+          path: stringData.kubeconfig
+          pattern: '--oidc-issuer-url=https://keycloak\.example\.org/realms/acme'
+      - notMatchRegex:
+          path: stringData.kubeconfig
+          pattern: '/realms/cozy'
diff --git a/packages/extra/ingress/README.md b/packages/extra/ingress/README.md
index 60510d9da7..da7f648403 100644
--- a/packages/extra/ingress/README.md
+++ b/packages/extra/ingress/README.md
@@ -4,13 +4,14 @@
 
 ### Common parameters
 
-| Name               | Description                                                                                                                             | Type       | Value      |
-| ------------------ | --------------------------------------------------------------------------------------------------------------------------------------- | ---------- | ---------- |
-| `replicas`         | Number of ingress-nginx replicas.                                                                                                       | `int`      | `2`        |
-| `whitelist`        | List of client networks.                                                                                                                | `[]string` | `[]`       |
-| `cloudflareProxy`  | Restoring original visitor IPs when Cloudflare proxied is enabled.                                                                      | `bool`     | `false`    |
-| `resources`        | Explicit CPU and memory configuration for each ingress-nginx replica. When omitted, the preset defined in `resourcesPreset` is applied. | `object`   | `{}`       |
-| `resources.cpu`    | CPU available to each replica.                                                                                                          | `quantity` | `""`       |
-| `resources.memory` | Memory (RAM) available to each replica.                                                                                                 | `quantity` | `""`       |
-| `resourcesPreset`  | Default sizing preset used when `resources` is omitted.                                                                                 | `string`   | `t1.micro` |
+| Name               | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    | Type       | Value      |
+| ------------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------- | ---------- |
+| `replicas`         | Number of ingress-nginx replicas.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              | `int`      | `2`        |
+| `whitelist`        | List of client networks.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       | `[]string` | `[]`       |
+| `cloudflareProxy`  | Restoring original visitor IPs when Cloudflare proxied is enabled.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | `bool`     | `false`    |
+| `proxyProtocol`    | Enable PROXY-protocol (use-proxy-protocol) on a tenant Ingress application. The upstream L4 load balancer in front of ingress-nginx MUST already inject PROXY-protocol v1 headers, otherwise all traffic to this ingress breaks — including in-cluster and direct-Service (hairpin) access to its public hostnames. Mutually exclusive with cloudflareProxy. For the host (external-facing) ingress use the platform-level publishing.proxyProtocol switch instead; the per-app value is rejected there because it would bypass the ouroboros hairpin handling and the disable-hazard guard. | `bool`     | `false`    |
+| `resources`        | Explicit CPU and memory configuration for each ingress-nginx replica. When omitted, the preset defined in `resourcesPreset` is applied.                                                                                                                                                                                                                                                                                                                                                                                                                                                        | `object`   | `{}`       |
+| `resources.cpu`    | CPU available to each replica.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | `quantity` | `""`       |
+| `resources.memory` | Memory (RAM) available to each replica.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        | `quantity` | `""`       |
+| `resourcesPreset`  | Default sizing preset used when `resources` is omitted.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        | `string`   | `t1.micro` |
 
diff --git a/packages/extra/ingress/templates/nginx-ingress.yaml b/packages/extra/ingress/templates/nginx-ingress.yaml
index 0a59ed50ba..006e97501f 100644
--- a/packages/extra/ingress/templates/nginx-ingress.yaml
+++ b/packages/extra/ingress/templates/nginx-ingress.yaml
@@ -1,5 +1,43 @@
 {{- $exposeIngress := (index .Values._cluster "expose-ingress") | default "tenant-root" }}
 {{- $exposeExternalIPs := (index .Values._cluster "expose-external-ips") | default "" | nospace }}
+{{- $loadBalancerClass := (index .Values._cluster "load-balancer-class") | default "" }}
+{{- $wildcardSecret := (index .Values._cluster "wildcard-secret-name") | default "" }}
+{{- /* PROXY-protocol is enabled either explicitly per-app (.Values.proxyProtocol)
+       or, for the host control plane, via the platform-level publishing.proxyProtocol
+       switch carried in _cluster.proxy-protocol and applied only to the external-facing
+       ingress (the namespace named by expose-ingress, like expose-external-ips above).
+       toString normalises the _cluster value whether it arrives as string "true" or bool. */ -}}
+{{- $proxyProtocol := or .Values.proxyProtocol (and (eq $exposeIngress .Release.Namespace) (eq (toString (index .Values._cluster "proxy-protocol")) "true")) }}
+{{- /* The per-app proxyProtocol value is for tenant Ingress apps. On the
+       external-facing (host) ingress, PROXY-protocol must be enabled via the
+       platform-level publishing.proxyProtocol switch — only that path installs
+       ouroboros (hairpin handling) and arms the disable-hazard guard. */ -}}
+{{- if and .Values.proxyProtocol (eq $exposeIngress .Release.Namespace) }}
+{{- fail "On the host (external-facing) ingress, enable PROXY-protocol via publishing.proxyProtocol, not the per-app proxyProtocol value — the platform switch pairs it with ouroboros hairpin handling and the disable-hazard guard" }}
+{{- end }}
+{{- /* Cloudflare's HTTP proxy does not speak PROXY-protocol to origins, and its
+       real_ip_header server-snippet overrides real-ip-header: proxy_protocol —
+       the two together emit contradictory config. */ -}}
+{{- if and .Values.cloudflareProxy $proxyProtocol }}
+{{- fail "cloudflareProxy and proxyProtocol are mutually exclusive: Cloudflare's HTTP proxy does not send PROXY-protocol frames, and the cloudflareProxy server-snippet overrides real-ip-header proxy_protocol" }}
+{{- end }}
+{{- /* spec.loadBalancerClass is immutable: once the host ingress Service exists
+       as type LoadBalancer, Kubernetes forbids adding, changing, OR removing the
+       field on update, so Flux would wedge on the reconcile instead of migrating.
+       Guard only the host ingress on the LoadBalancer path (where the class is
+       emitted on the service block below), and only against an existing
+       type: LoadBalancer Service whose class actually differs from the requested
+       value — set, change, or clear all trip it, while a ClusterIP Service
+       (externalIPs path) transitioning to LoadBalancer may set the class freely.
+       lookup returns nil on fresh install / dry-run / CI, so the guard stays
+       silent there and the Service is born with the requested class. */ -}}
+{{- if and (eq $exposeIngress .Release.Namespace) (not $exposeExternalIPs) }}
+{{- $svcName := printf "%s-ingress-controller" (trimPrefix "tenant-" .Release.Namespace) }}
+{{- $existingSvc := lookup "v1" "Service" .Release.Namespace $svcName }}
+{{- if and $existingSvc (eq (dig "spec" "type" "" $existingSvc) "LoadBalancer") (ne (dig "spec" "loadBalancerClass" "" $existingSvc) $loadBalancerClass) }}
+{{- fail (printf "publishing.loadBalancerClass cannot be changed on the existing host ingress Service %s/%s: spec.loadBalancerClass is immutable once the Service is type LoadBalancer (existing: %q, requested: %q). Delete the Service once so Flux recreates it with the new setting — the external LoadBalancer is briefly reprovisioned: kubectl -n %s delete service %s" .Release.Namespace $svcName (dig "spec" "loadBalancerClass" "" $existingSvc) $loadBalancerClass .Release.Namespace $svcName) }}
+{{- end }}
+{{- end }}
 apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
 metadata:
@@ -28,6 +66,26 @@ spec:
       controller:
         replicaCount: {{ .Values.replicas }}
         ingressClass: {{ .Release.Namespace }}
+        {{- /*
+          Operator-supplied wildcard mode. Serve the pre-existing
+          wildcard Secret as the default SSL certificate so per-host
+          ACME certs are unnecessary. ingress-nginx can only read a
+          default-ssl-certificate Secret from its own namespace, so the
+          reference is always same-namespace: the publishing controller
+          reads the operator-created Secret in tenant-root, and every
+          child-tenant controller reads the replica that the platform
+          controller mirrors into that tenant namespace. Each ingress
+          HelmRelease renders only in the namespace that owns the
+          controller, so .Release.Namespace is always the right place.
+          On a freshly-created tenant the replica may land a moment after
+          the controller starts; until then ingress-nginx logs a
+          default-ssl-certificate warning and serves its built-in
+          certificate, then self-corrects once the replica appears.
+        */}}
+        {{- if $wildcardSecret }}
+        extraArgs:
+          default-ssl-certificate: "{{ .Release.Namespace }}/{{ $wildcardSecret }}"
+        {{- end }}
         resources: {{- include "cozy-lib.resources.defaultingSanitize" (list .Values.resourcesPreset .Values.resources $) | nindent 10 }}
         ingressClassResource:
           name: {{ .Release.Namespace }}
@@ -48,15 +106,31 @@ spec:
           {{- else }}
           type: LoadBalancer
           externalTrafficPolicy: Local
+          {{- /* loadBalancerClass is a host-publishing setting: apply it only to
+                 the external-facing ingress (the namespace named by expose-ingress),
+                 host-scoped like expose-external-ips and proxy-protocol above.
+                 Tenant ingress Services keep the cluster's default LB controller. */}}
+          {{- if and $loadBalancerClass (eq $exposeIngress .Release.Namespace) }}
+          loadBalancerClass: {{ $loadBalancerClass }}
+          {{- end }}
           {{- end }}
-        {{- if or .Values.whitelist .Values.cloudflareProxy }}
+        {{- if or .Values.whitelist .Values.cloudflareProxy $proxyProtocol }}
         config:
           {{- with .Values.whitelist }}
           whitelist-source-range: "{{ join "," . }}"
           {{- end }}
           {{- if .Values.cloudflareProxy }}
-          set_real_ip_from: "{{ include "ingress.cloudflare-ips" . }}"
+          proxy-real-ip-cidr: "{{ include "ingress.cloudflare-ips" . }}"
           use-forwarded-headers: "true"
           server-snippet: "real_ip_header CF-Connecting-IP;"
           {{- end }}
+          {{- if $proxyProtocol }}
+          {{- /* real-ip-header + enable-real-ip make the PROXY-protocol frame the
+                 source of truth for $remote_addr. use-forwarded-headers /
+                 compute-full-forwarded-for are deliberately NOT set: without a
+                 paired proxy-real-ip-cidr they let clients spoof X-Forwarded-For. */}}
+          use-proxy-protocol: "true"
+          real-ip-header: "proxy_protocol"
+          enable-real-ip: "true"
+          {{- end }}
         {{- end }}
diff --git a/packages/extra/ingress/templates/wildcard-certificate.yaml b/packages/extra/ingress/templates/wildcard-certificate.yaml
new file mode 100644
index 0000000000..a247f6660e
--- /dev/null
+++ b/packages/extra/ingress/templates/wildcard-certificate.yaml
@@ -0,0 +1,51 @@
+{{- $exposeIngress := (index .Values._cluster "expose-ingress") | default "tenant-root" }}
+{{- /* toString normalises the _cluster value whether it arrives as the
+       string "true" (Flux valuesFrom Secret, the real path) or as a bool
+       (helm --set), mirroring the proxy-protocol handling in
+       nginx-ingress.yaml. */ -}}
+{{- $wildcardIssue := (index .Values._cluster "wildcard-issue") | default "false" | toString }}
+{{- $wildcardSecret := (index .Values._cluster "wildcard-secret-name") | default "" }}
+{{- $rootHost := (index .Values._cluster "root-host") | default "" }}
+{{- $issuerName := (index .Values._cluster "issuer-name") | default "letsencrypt-prod" }}
+{{- /*
+  Shared ACME wildcard for the ingress-nginx path (WS2 / #2400). When the
+  platform decides to issue a wildcard (_cluster.wildcard-issue=true,
+  computed in core/platform apps.yaml only on the solver=dns01 ingress
+  path with gateway.enabled=false), the publishing tenant's ingress
+  controller renders ONE DNS-01 Certificate for <root-host> +
+  *.<root-host>. ingress-nginx serves the resulting Secret as its
+  --default-ssl-certificate (see nginx-ingress.yaml), so the system
+  services drop their per-host cert-manager annotation — matching the
+  Gateway API path, which issues a per-apex wildcard via the TenantGateway
+  controller in dns01 mode.
+
+  Only the publishing controller (Release.Namespace == expose-ingress)
+  renders it: the Secret must live in that namespace for ingress-nginx to
+  read it, and child-tenant controllers cannot point --default-ssl-certificate
+  at another namespace. The reference is therefore always same-namespace,
+  the same constraint the operator-supplied wildcard path observes.
+
+  The ClusterIssuer named here (issuer-name, letsencrypt-prod by default)
+  already carries the DNS-01 solver from packages/system/cert-manager-issuers
+  whenever solver=dns01, so no per-tenant Issuer is minted on this path.
+*/}}
+{{- if and (eq $wildcardIssue "true") (eq .Release.Namespace $exposeIngress) }}
+{{- if not $wildcardSecret }}
+{{- fail "packages/extra/ingress: _cluster.wildcard-issue=true but _cluster.wildcard-secret-name is empty — the platform must supply the target Secret name." }}
+{{- end }}
+{{- if not $rootHost }}
+{{- fail "packages/extra/ingress: _cluster.wildcard-issue=true but _cluster.root-host is empty — cannot build the wildcard dnsNames." }}
+{{- end }}
+apiVersion: cert-manager.io/v1
+kind: Certificate
+metadata:
+  name: cozystack-wildcard
+spec:
+  secretName: {{ $wildcardSecret | quote }}
+  issuerRef:
+    kind: ClusterIssuer
+    name: {{ $issuerName | quote }}
+  dnsNames:
+    - {{ $rootHost | quote }}
+    - {{ printf "*.%s" $rootHost | quote }}
+{{- end }}
diff --git a/packages/extra/ingress/tests/cloudflare_proxy_test.yaml b/packages/extra/ingress/tests/cloudflare_proxy_test.yaml
new file mode 100644
index 0000000000..24869abe82
--- /dev/null
+++ b/packages/extra/ingress/tests/cloudflare_proxy_test.yaml
@@ -0,0 +1,40 @@
+suite: ingress cloudflareProxy wiring
+templates:
+  - templates/nginx-ingress.yaml
+release:
+  name: ingress
+  namespace: tenant-foo
+set:
+  _cluster: {}
+  cloudflareProxy: true
+tests:
+  - it: trusts CF-Connecting-IP only from the Cloudflare ranges
+    asserts:
+      - matchRegex:
+          path: spec.values.ingress-nginx.controller.config.proxy-real-ip-cidr
+          pattern: ^[0-9a-f.:/]+(,[0-9a-f.:/]+)+$
+      - notMatchRegex:
+          path: spec.values.ingress-nginx.controller.config.proxy-real-ip-cidr
+          pattern: (^|,)(0\.0\.0\.0/0|::/0)(,|$)
+      - equal:
+          path: spec.values.ingress-nginx.controller.config.use-forwarded-headers
+          value: "true"
+      - equal:
+          path: spec.values.ingress-nginx.controller.config.server-snippet
+          value: "real_ip_header CF-Connecting-IP;"
+
+  - it: does not use set_real_ip_from, which is not an ingress-nginx ConfigMap key
+    asserts:
+      - notExists:
+          path: spec.values.ingress-nginx.controller.config.set_real_ip_from
+
+  - it: keeps the whitelist next to the trusted ranges
+    set:
+      whitelist:
+        - 192.0.2.0/24
+    asserts:
+      - equal:
+          path: spec.values.ingress-nginx.controller.config.whitelist-source-range
+          value: 192.0.2.0/24
+      - exists:
+          path: spec.values.ingress-nginx.controller.config.proxy-real-ip-cidr
diff --git a/packages/extra/ingress/tests/default_ssl_certificate_test.yaml b/packages/extra/ingress/tests/default_ssl_certificate_test.yaml
new file mode 100644
index 0000000000..ab10c87932
--- /dev/null
+++ b/packages/extra/ingress/tests/default_ssl_certificate_test.yaml
@@ -0,0 +1,49 @@
+suite: ingress-nginx default-ssl-certificate wiring
+templates:
+  - templates/nginx-ingress.yaml
+
+release:
+  name: ingress
+  namespace: tenant-root
+
+# When the operator supplies a wildcard Secret
+# (_cluster.wildcard-secret-name), each tenant ingress controller serves
+# it as the default SSL certificate so per-host ACME certs are no longer
+# needed. The reference is always same-namespace: the publishing
+# controller reads the operator-created Secret in its own namespace, and
+# a child-tenant controller reads the replica the platform controller
+# mirrors into that tenant namespace. ingress-nginx can only read a
+# default-ssl-certificate Secret from its own namespace, so the flag
+# points at .Release.Namespace in every case.
+
+tests:
+  - it: sets default-ssl-certificate on the publishing controller when wildcard is set
+    set:
+      _cluster:
+        expose-ingress: tenant-root
+        wildcard-secret-name: wildcard-tls
+    asserts:
+      - equal:
+          path: spec.values.ingress-nginx.controller.extraArgs.default-ssl-certificate
+          value: tenant-root/wildcard-tls
+
+  - it: does not set default-ssl-certificate when no wildcard secret
+    set:
+      _cluster:
+        expose-ingress: tenant-root
+    asserts:
+      - notExists:
+          path: spec.values.ingress-nginx.controller.extraArgs.default-ssl-certificate
+
+  - it: points a child-tenant controller at its own-namespace wildcard replica
+    release:
+      name: ingress
+      namespace: tenant-foo
+    set:
+      _cluster:
+        expose-ingress: tenant-root
+        wildcard-secret-name: wildcard-tls
+    asserts:
+      - equal:
+          path: spec.values.ingress-nginx.controller.extraArgs.default-ssl-certificate
+          value: tenant-foo/wildcard-tls
diff --git a/packages/extra/ingress/tests/load_balancer_class_immutable_test.yaml b/packages/extra/ingress/tests/load_balancer_class_immutable_test.yaml
new file mode 100644
index 0000000000..715a53f415
--- /dev/null
+++ b/packages/extra/ingress/tests/load_balancer_class_immutable_test.yaml
@@ -0,0 +1,149 @@
+suite: ingress loadBalancerClass immutability guard
+templates:
+  - templates/nginx-ingress.yaml
+release:
+  name: ingress
+  namespace: tenant-root
+
+# spec.loadBalancerClass is immutable once a Service is type LoadBalancer.
+# Adding or changing it on the existing host ingress Service would wedge Flux on
+# an API-rejected patch, so the chart fails early with recreate instructions.
+# lookup returns nil on fresh install / dry-run / CI (no kubernetesProvider),
+# where the Service is born with the class and the guard must stay silent.
+tests:
+  - it: renders cleanly on a fresh install when no Service exists yet
+    set:
+      _cluster:
+        expose-ingress: tenant-root
+        load-balancer-class: metallb.io/metallb
+    asserts:
+      - equal:
+          path: spec.values.ingress-nginx.controller.service.loadBalancerClass
+          value: metallb.io/metallb
+
+  - it: fails when the existing host Service is LoadBalancer without a class
+    set:
+      _cluster:
+        expose-ingress: tenant-root
+        load-balancer-class: metallb.io/metallb
+    kubernetesProvider:
+      scheme:
+        "v1/Service":
+          gvr:
+            version: v1
+            resource: services
+          namespaced: true
+      objects:
+        - apiVersion: v1
+          kind: Service
+          metadata:
+            name: root-ingress-controller
+            namespace: tenant-root
+          spec:
+            type: LoadBalancer
+    asserts:
+      - failedTemplate:
+          errorPattern: "spec\\.loadBalancerClass is immutable once the Service is type LoadBalancer"
+      - failedTemplate:
+          errorPattern: "kubectl -n tenant-root delete service root-ingress-controller"
+
+  - it: fails when the existing host Service has a different class
+    set:
+      _cluster:
+        expose-ingress: tenant-root
+        load-balancer-class: metallb.io/metallb
+    kubernetesProvider:
+      scheme:
+        "v1/Service":
+          gvr:
+            version: v1
+            resource: services
+          namespaced: true
+      objects:
+        - apiVersion: v1
+          kind: Service
+          metadata:
+            name: root-ingress-controller
+            namespace: tenant-root
+          spec:
+            type: LoadBalancer
+            loadBalancerClass: cilium.io/l2-announcer
+    asserts:
+      - failedTemplate:
+          errorPattern: 'existing: "cilium.io/l2-announcer", requested: "metallb.io/metallb"'
+
+  - it: renders cleanly when the existing host Service already has the same class
+    set:
+      _cluster:
+        expose-ingress: tenant-root
+        load-balancer-class: metallb.io/metallb
+    kubernetesProvider:
+      scheme:
+        "v1/Service":
+          gvr:
+            version: v1
+            resource: services
+          namespaced: true
+      objects:
+        - apiVersion: v1
+          kind: Service
+          metadata:
+            name: root-ingress-controller
+            namespace: tenant-root
+          spec:
+            type: LoadBalancer
+            loadBalancerClass: metallb.io/metallb
+    asserts:
+      - equal:
+          path: spec.values.ingress-nginx.controller.service.loadBalancerClass
+          value: metallb.io/metallb
+
+  - it: fails when clearing a class the existing host Service still carries
+    set:
+      _cluster:
+        expose-ingress: tenant-root
+        # load-balancer-class intentionally unset (operator clearing it)
+    kubernetesProvider:
+      scheme:
+        "v1/Service":
+          gvr:
+            version: v1
+            resource: services
+          namespaced: true
+      objects:
+        - apiVersion: v1
+          kind: Service
+          metadata:
+            name: root-ingress-controller
+            namespace: tenant-root
+          spec:
+            type: LoadBalancer
+            loadBalancerClass: metallb.io/metallb
+    asserts:
+      - failedTemplate:
+          errorPattern: 'existing: "metallb.io/metallb", requested: ""'
+
+  - it: renders cleanly when migrating from the externalIPs (ClusterIP) Service
+    set:
+      _cluster:
+        expose-ingress: tenant-root
+        load-balancer-class: metallb.io/metallb
+    kubernetesProvider:
+      scheme:
+        "v1/Service":
+          gvr:
+            version: v1
+            resource: services
+          namespaced: true
+      objects:
+        - apiVersion: v1
+          kind: Service
+          metadata:
+            name: root-ingress-controller
+            namespace: tenant-root
+          spec:
+            type: ClusterIP
+    asserts:
+      - equal:
+          path: spec.values.ingress-nginx.controller.service.loadBalancerClass
+          value: metallb.io/metallb
diff --git a/packages/extra/ingress/tests/load_balancer_class_test.yaml b/packages/extra/ingress/tests/load_balancer_class_test.yaml
new file mode 100644
index 0000000000..0dd92ddb77
--- /dev/null
+++ b/packages/extra/ingress/tests/load_balancer_class_test.yaml
@@ -0,0 +1,69 @@
+suite: ingress loadBalancerClass wiring
+templates:
+  - templates/nginx-ingress.yaml
+release:
+  name: ingress
+
+# publishing.loadBalancerClass is a host-publishing setting carried in
+# _cluster.load-balancer-class. It must land on the external-facing (host)
+# ingress Service only — host-scoped like expose-external-ips and
+# proxy-protocol. These assertions pin that scope: a tenant ingress must NOT
+# inherit the host's loadBalancerClass, or its Service would be claimed by an
+# LB controller the tenant never asked for.
+tests:
+  - it: sets loadBalancerClass on the host ingress LoadBalancer Service
+    set:
+      _cluster:
+        expose-ingress: tenant-root
+        load-balancer-class: metallb.io/metallb
+    release:
+      namespace: tenant-root
+    asserts:
+      - equal:
+          path: spec.values.ingress-nginx.controller.service.type
+          value: LoadBalancer
+      - equal:
+          path: spec.values.ingress-nginx.controller.service.loadBalancerClass
+          value: metallb.io/metallb
+
+  - it: does not leak the host loadBalancerClass onto a tenant ingress
+    set:
+      _cluster:
+        expose-ingress: tenant-root
+        load-balancer-class: metallb.io/metallb
+    release:
+      namespace: tenant-foo
+    asserts:
+      - equal:
+          path: spec.values.ingress-nginx.controller.service.type
+          value: LoadBalancer
+      - notExists:
+          path: spec.values.ingress-nginx.controller.service.loadBalancerClass
+
+  - it: keeps the externalIPs path untouched by loadBalancerClass
+    set:
+      _cluster:
+        expose-ingress: tenant-root
+        expose-external-ips: 203.0.113.10
+        load-balancer-class: metallb.io/metallb
+    release:
+      namespace: tenant-root
+    asserts:
+      - equal:
+          path: spec.values.ingress-nginx.controller.service.type
+          value: ClusterIP
+      - notExists:
+          path: spec.values.ingress-nginx.controller.service.loadBalancerClass
+
+  - it: omits loadBalancerClass on the host ingress when none is configured
+    set:
+      _cluster:
+        expose-ingress: tenant-root
+    release:
+      namespace: tenant-root
+    asserts:
+      - equal:
+          path: spec.values.ingress-nginx.controller.service.type
+          value: LoadBalancer
+      - notExists:
+          path: spec.values.ingress-nginx.controller.service.loadBalancerClass
diff --git a/packages/extra/ingress/tests/proxy_protocol_test.yaml b/packages/extra/ingress/tests/proxy_protocol_test.yaml
new file mode 100644
index 0000000000..1dfbed2022
--- /dev/null
+++ b/packages/extra/ingress/tests/proxy_protocol_test.yaml
@@ -0,0 +1,84 @@
+suite: ingress proxyProtocol wiring
+templates:
+  - templates/nginx-ingress.yaml
+release:
+  name: ingress
+tests:
+  - it: emits PROXY-protocol nginx config keys when proxyProtocol is set per-app
+    set:
+      _cluster: {}
+      proxyProtocol: true
+    release:
+      namespace: tenant-foo
+    asserts:
+      - equal:
+          path: spec.values.ingress-nginx.controller.config.use-proxy-protocol
+          value: "true"
+      - equal:
+          path: spec.values.ingress-nginx.controller.config.real-ip-header
+          value: proxy_protocol
+      - equal:
+          path: spec.values.ingress-nginx.controller.config.enable-real-ip
+          value: "true"
+      # use-forwarded-headers is deliberately NOT set: without a paired
+      # proxy-real-ip-cidr it lets clients spoof X-Forwarded-For, and the
+      # PROXY-protocol frame is already the source of truth for $remote_addr.
+      - notExists:
+          path: spec.values.ingress-nginx.controller.config.use-forwarded-headers
+
+  - it: enables PROXY-protocol on the host ingress via the _cluster switch
+    set:
+      _cluster:
+        proxy-protocol: "true"
+    release:
+      namespace: tenant-root
+    asserts:
+      - equal:
+          path: spec.values.ingress-nginx.controller.config.use-proxy-protocol
+          value: "true"
+      - equal:
+          path: spec.values.ingress-nginx.controller.config.real-ip-header
+          value: proxy_protocol
+      - equal:
+          path: spec.values.ingress-nginx.controller.config.enable-real-ip
+          value: "true"
+
+  - it: leaves a non-host ingress untouched by the host _cluster switch
+    set:
+      _cluster:
+        proxy-protocol: "true"
+    release:
+      namespace: tenant-foo
+    asserts:
+      - notExists:
+          path: spec.values.ingress-nginx.controller.config
+
+  - it: emits no config block when no proxy/whitelist features are enabled
+    set:
+      _cluster: {}
+    release:
+      namespace: tenant-root
+    asserts:
+      - notExists:
+          path: spec.values.ingress-nginx.controller.config
+
+  - it: refuses the per-app proxyProtocol value on the external-facing (host) ingress
+    set:
+      _cluster: {}
+      proxyProtocol: true
+    release:
+      namespace: tenant-root
+    asserts:
+      - failedTemplate:
+          errorMessage: "On the host (external-facing) ingress, enable PROXY-protocol via publishing.proxyProtocol, not the per-app proxyProtocol value — the platform switch pairs it with ouroboros hairpin handling and the disable-hazard guard"
+
+  - it: refuses cloudflareProxy and proxyProtocol together
+    set:
+      _cluster: {}
+      cloudflareProxy: true
+      proxyProtocol: true
+    release:
+      namespace: tenant-foo
+    asserts:
+      - failedTemplate:
+          errorMessage: "cloudflareProxy and proxyProtocol are mutually exclusive: Cloudflare's HTTP proxy does not send PROXY-protocol frames, and the cloudflareProxy server-snippet overrides real-ip-header proxy_protocol"
diff --git a/packages/extra/ingress/tests/wildcard_certificate_test.yaml b/packages/extra/ingress/tests/wildcard_certificate_test.yaml
new file mode 100644
index 0000000000..5a13b05986
--- /dev/null
+++ b/packages/extra/ingress/tests/wildcard_certificate_test.yaml
@@ -0,0 +1,115 @@
+suite: ingress-nginx ACME wildcard Certificate
+
+templates:
+  - templates/wildcard-certificate.yaml
+
+release:
+  name: ingress
+  namespace: tenant-root
+
+# WS2 / #2400: when the platform decides to issue a shared wildcard on the
+# ingress-nginx path (_cluster.wildcard-issue=true, computed in
+# core/platform apps.yaml only for solver=dns01 + gateway disabled), the
+# publishing tenant's ingress controller renders ONE DNS-01 Certificate
+# for <root-host> + *.<root-host>. ingress-nginx serves the resulting
+# Secret as its default SSL certificate, so per-host ACME is unnecessary.
+# Only the publishing controller (Release.Namespace == expose-ingress)
+# renders it — the Secret must live in that namespace and child-tenant
+# controllers cannot read it. The ClusterIssuer named here already carries
+# the DNS-01 solver whenever solver=dns01.
+
+tests:
+  - it: renders a DNS-01 wildcard Certificate on the publishing controller
+    set:
+      _cluster:
+        expose-ingress: tenant-root
+        wildcard-issue: "true"
+        wildcard-secret-name: cozystack-wildcard-tls
+        root-host: example.org
+        issuer-name: letsencrypt-prod
+    asserts:
+      - hasDocuments:
+          count: 1
+      - equal:
+          path: kind
+          value: Certificate
+      - equal:
+          path: metadata.name
+          value: cozystack-wildcard
+      - equal:
+          path: spec.secretName
+          value: cozystack-wildcard-tls
+      - equal:
+          path: spec.issuerRef.kind
+          value: ClusterIssuer
+      - equal:
+          path: spec.issuerRef.name
+          value: letsencrypt-prod
+      - equal:
+          path: spec.dnsNames
+          value:
+            - example.org
+            - "*.example.org"
+
+  - it: renders nothing when wildcard-issue is not set
+    set:
+      _cluster:
+        expose-ingress: tenant-root
+        wildcard-secret-name: ""
+        root-host: example.org
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  - it: does not render on a non-publishing tenant controller
+    release:
+      name: ingress
+      namespace: tenant-foo
+    set:
+      _cluster:
+        expose-ingress: tenant-root
+        wildcard-issue: "true"
+        wildcard-secret-name: cozystack-wildcard-tls
+        root-host: example.org
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  - it: honors a custom issuer name
+    set:
+      _cluster:
+        expose-ingress: tenant-root
+        wildcard-issue: "true"
+        wildcard-secret-name: cozystack-wildcard-tls
+        root-host: example.org
+        issuer-name: letsencrypt-stage
+    asserts:
+      - equal:
+          path: spec.issuerRef.name
+          value: letsencrypt-stage
+
+  # Fail-fast guards: platform-internal invariants that should never trip,
+  # but must fail loudly (not render a Certificate pointing at a
+  # nonexistent Secret or with empty dnsNames) if apps.yaml ever regresses
+  # and sets wildcard-issue=true without the keys it implies.
+  - it: fails when wildcard-issue is true but the secret name is empty
+    set:
+      _cluster:
+        expose-ingress: tenant-root
+        wildcard-issue: "true"
+        wildcard-secret-name: ""
+        root-host: example.org
+    asserts:
+      - failedTemplate:
+          errorMessage: "packages/extra/ingress: _cluster.wildcard-issue=true but _cluster.wildcard-secret-name is empty — the platform must supply the target Secret name."
+
+  - it: fails when wildcard-issue is true but root-host is empty
+    set:
+      _cluster:
+        expose-ingress: tenant-root
+        wildcard-issue: "true"
+        wildcard-secret-name: cozystack-wildcard-tls
+        root-host: ""
+    asserts:
+      - failedTemplate:
+          errorMessage: "packages/extra/ingress: _cluster.wildcard-issue=true but _cluster.root-host is empty — cannot build the wildcard dnsNames."
diff --git a/packages/extra/ingress/values.schema.json b/packages/extra/ingress/values.schema.json
index 13390e442d..e4345547e9 100644
--- a/packages/extra/ingress/values.schema.json
+++ b/packages/extra/ingress/values.schema.json
@@ -20,6 +20,11 @@
       "type": "boolean",
       "default": false
     },
+    "proxyProtocol": {
+      "description": "Enable PROXY-protocol (use-proxy-protocol) on a tenant Ingress application. The upstream L4 load balancer in front of ingress-nginx MUST already inject PROXY-protocol v1 headers, otherwise all traffic to this ingress breaks — including in-cluster and direct-Service (hairpin) access to its public hostnames. Mutually exclusive with cloudflareProxy. For the host (external-facing) ingress use the platform-level publishing.proxyProtocol switch instead; the per-app value is rejected there because it would bypass the ouroboros hairpin handling and the disable-hazard guard.",
+      "type": "boolean",
+      "default": false
+    },
     "resources": {
       "description": "Explicit CPU and memory configuration for each ingress-nginx replica. When omitted, the preset defined in `resourcesPreset` is applied.",
       "type": "object",
diff --git a/packages/extra/ingress/values.yaml b/packages/extra/ingress/values.yaml
index dd917ecdef..9ec726f51e 100644
--- a/packages/extra/ingress/values.yaml
+++ b/packages/extra/ingress/values.yaml
@@ -15,6 +15,9 @@ whitelist: []
 ## @param {bool} cloudflareProxy - Restoring original visitor IPs when Cloudflare proxied is enabled.
 cloudflareProxy: false
 
+## @param {bool} proxyProtocol - Enable PROXY-protocol (use-proxy-protocol) on a tenant Ingress application. The upstream L4 load balancer in front of ingress-nginx MUST already inject PROXY-protocol v1 headers, otherwise all traffic to this ingress breaks — including in-cluster and direct-Service (hairpin) access to its public hostnames. Mutually exclusive with cloudflareProxy. For the host (external-facing) ingress use the platform-level publishing.proxyProtocol switch instead; the per-app value is rejected there because it would bypass the ouroboros hairpin handling and the disable-hazard guard.
+proxyProtocol: false
+
 ## @typedef {struct} Resources - Explicit CPU and memory configuration for each ingress-nginx replica.
 ## @field {quantity} [cpu] - CPU available to each replica.
 ## @field {quantity} [memory] - Memory (RAM) available to each replica.
diff --git a/packages/extra/monitoring/Makefile b/packages/extra/monitoring/Makefile
index 618a96ab47..ca0e5f5bbc 100644
--- a/packages/extra/monitoring/Makefile
+++ b/packages/extra/monitoring/Makefile
@@ -1,21 +1,13 @@
-GRAFANA_TAG = $(shell awk '$$1 == "version:" {print $$2}' Chart.yaml)
-
 NAME=monitoring
 
 include ../../../hack/common-envs.mk
 include ../../../hack/package.mk
 
+.PHONY: test
+
 generate:
 	cozyvalues-gen -v values.yaml -s values.schema.json -r README.md
 	../../../hack/update-crd.sh
 
-image:
-	docker buildx build images/grafana \
-		$(call image-tags,grafana,$(GRAFANA_TAG)) \
-		--cache-from type=registry,ref=$(REGISTRY)/grafana:latest \
-		--cache-to type=inline \
-		--metadata-file images/grafana.json \
-		$(BUILDX_ARGS)
-	echo "$(REGISTRY)/grafana:$(IMAGE_TAG)@$$(yq e '."containerimage.digest"' images/grafana.json -o json -r)" \
-		> images/grafana.tag
-	rm -f images/grafana.json
+test:
+	helm unittest .
diff --git a/packages/extra/monitoring/README.md b/packages/extra/monitoring/README.md
index ed7df4f64d..60211032ed 100644
--- a/packages/extra/monitoring/README.md
+++ b/packages/extra/monitoring/README.md
@@ -53,28 +53,68 @@
 | `logsStorages[i].storageClassName` | StorageClass used to store the data.     | `string`   | `replicated` |
 
 
+### Traces storage configuration
+
+| Name                                         | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | Type       | Value        |
+| -------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------- | ------------ |
+| `tracingStorages`                            | Configuration of traces storage instances. Empty by default (tracing off): no backend and no trace collector are rendered. Adding an entry provisions a VictoriaTraces backend and, while tracingCollector.enabled is true, deploys the OTLP collector in front of it. A tenant with shared-central tracing (the Tenant's tracingCentral) gets the collector, while tracingCollector.enabled is true, without an entry, which then exports to the shared store; entries still listed keep their store and datasource, so traces stored before the switch stay readable until the entry is removed.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | `[]object` | `[]`         |
+| `tracingStorages[i].name`                    | Name of the storage instance: a lowercase RFC 1123 label of at most 42 characters. Treat as immutable once a backend exists: the VTCluster/VTSingle, its Services, PVCs and Grafana datasource are all named after it, so renaming an entry deploys a new, empty backend and removes the old one, the same way changing mode does (single mode loses the old PVC, cluster mode leaves the old vtstorage PVCs Bound until the whole Monitoring release is deleted).                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | `string`   | `""`         |
+| `tracingStorages[i].mode`                    | Deployment mode: "cluster" renders a VTCluster; "single" renders a single-binary VTSingle for edge/dev/small clusters. Treat as immutable once a backend exists: mode selects which Kind is rendered under the same name, so changing it on a running backend re-identifies the object rather than reconfiguring it. Switching from "single" to "cluster" prunes the VTSingle and the operator garbage-collects its PVC (stored traces are lost); switching from "cluster" to "single" (or removing the entry) leaves the vtstorage PVCs Bound and billed until the whole Monitoring release is deleted. The API cannot guard this (transition rules are not available on an array-item field), so this note is the only guard: migrate deliberately, accepting the loss.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | `string`   | `cluster`    |
+| `tracingStorages[i].retentionPeriod`         | Retention period for traces.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        | `string`   | `14d`        |
+| `tracingStorages[i].storage`                 | Persistent volume size.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | `quantity` | `10Gi`       |
+| `tracingStorages[i].storageClassName`        | StorageClass used to store the data.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | `string`   | `replicated` |
+| `tracingStorages[i].retentionDiskUsageBytes` | Optional disk-usage cap as a VictoriaMetrics BytesString (e.g. "8GB" or "8GiB"), bounding disk use on top of the age-based retentionPeriod. Uses byte-suffix grammar (kb/mb/gb/tb, KiB/MiB/GiB/TiB), NOT the Kubernetes-quantity grammar of the sibling storage field, so "8Gi" is rejected by the operator. In cluster mode the cap is per vtstorage replica (replicaCount 2), so the effective total is twice the value. Unset, the store drops its oldest day once its filesystem is 80% full instead, so every store is disk-bounded. Either way VictoriaTraces keeps the last two days, so spans arriving faster than the cap allows for two days can still fill the disk.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | `string`   | `""`         |
+| `tracingCentralHost`                         | tenant-root only: accept spans from tenants that turned on shared-central tracing (the Tenant's tracingCentral) into this Monitoring's tracingStorages entry named `generic`, which must be in `cluster` mode. Every central tenant then shares that store's disk and retention with tenant-root, and nothing reserves space per tenant: once the store's disk cap is reached (retentionDiskUsageBytes, or 80% of its filesystem) the oldest spans of all of them are evicted together. Each tenant is held to the platform's monitoring.tracingCentralTenantBytesPerSecond, which by default lets one tenant write at most the cap of a default 10Gi store, counted uncompressed and before the tenant's sampling, over the two days VictoriaTraces always keeps, so raise it with the store; several tenants writing at their limit together still can fill it. That bound holds for a tenant whose collector keeps running: each collector pod starts with a full bucket, up to 5 MiB or one second of its share of the rate when that is larger, and any change to the tenant's Monitoring rolls every collector pod, so a tenant that keeps changing it writes that much more on each rollout, for up to ten replicas; closing that needs a limiter with shared state, which the collector does not run. Ignored outside tenant-root. The tenant-root namespace is inside the trust boundary of the shared store, as it is for the metrics of tenants that rely on a parent's monitoring: vmauth pins each central tenant to its own account, but workloads in tenant-root reach the store directly, and one that learns a tenant's account ID (a hash of its namespace name and UID, which its VMUsers carry) can read and write that account. Whoever tenant-root admits to its Grafana is inside it too, since tenant-root's own datasource for the store reaches vtselect without vmauth; who that is follows its Grafana's oidc mode (with System, tenant-root's own groups, which already hold the same access level in every tenant under tenant-root). The render refuses to stop hosting while central tenants remain, but removing the tenant-root Monitoring altogether is not a render and is not refused: turn tracingCentral off on the central tenants first, since until then every Monitoring render of theirs fails, their metrics, logs and alerting changes included. The refusals read each other's objects when they render, so a tenant turning tracingCentral on while tenant-root stops hosting can pass both: that tenant's collector then exports to a vmauth that is gone while every release reports Ready, until its Monitoring renders again. Recover by hosting again; turning that tenant's tracingCentral off instead ends the silent drop, and turning it on again is then refused until tenant-root hosts. | `bool`     | `false`      |
+
+
+### Traces collector configuration
+
+| Name                                         | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    | Type       | Value   |
+| -------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------- | ------- |
+| `tracingCollector`                           | OpenTelemetry Collector for trace ingestion. With shared-central tracing it refuses spans above the platform's per-tenant write rate: OTLP/HTTP senders retry them, OTLP/gRPC senders drop them, so export over HTTP. It also refuses a request larger than 3 MiB (decompressed) with a 400, which senders do not retry, so keep export batches below that.                                                                                                                                                                                                                                                                                                                                                                                                    | `object`   | `{}`    |
+| `tracingCollector.enabled`                   | Deploy the OTLP collector. When disabled, applications must send OTLP straight to the traces backend (no central sampling/redaction); with shared-central tracing they have no path to it, so no new spans arrive, while the traces already stored stay readable. The collector fronts a single backend, and the limit holds with shared-central tracing too, since turning that off makes it export to the local entry again: while it is enabled, tracingStorages must hold at most one entry, and adding a second one fails the whole Monitoring render until the extra entry is removed or the collector is disabled.                                                                                                                                      | `bool`     | `true`  |
+| `tracingCollector.replicas`                  | Number of collector replicas. Head sampling is trace-id-deterministic, so replicas>1 are safe and remove the single-ingest-path SPOF. With shared-central tracing each replica sends up to two requests at a time against this tenant's write limit of four per vmauth replica, so more replicas do not raise the tenant's throughput; the tenant's write rate (the platform's monitoring.tracingCentralTenantBytesPerSecond) is split across them as well, so a sender whose connection stays on one replica gets that replica's share, and each replica that starts lets through above the rate up to 5 MiB, or one second of its share when that is larger, which is why shared-central tracing allows at most 10 replicas and fails the render above that. | `int`      | `1`     |
+| `tracingCollector.samplingPercentage`        | Head-sampling percentage applied at the collector before export.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | `int`      | `10`    |
+| `tracingCollector.redactAttributes`          | Span attribute keys to drop before export (the PII/secret control point, e.g. db.statement).                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   | `[]string` | `[]`    |
+| `tracingCollector.resources`                 | Resource configuration for the collector.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | `object`   | `{}`    |
+| `tracingCollector.resources.requests`        | Resource requests.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | `object`   | `{}`    |
+| `tracingCollector.resources.requests.cpu`    | CPU request.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   | `quantity` | `100m`  |
+| `tracingCollector.resources.requests.memory` | Memory request.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | `quantity` | `256Mi` |
+| `tracingCollector.resources.limits`          | Resource limits.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | `object`   | `{}`    |
+| `tracingCollector.resources.limits.cpu`      | CPU limit.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | `quantity` | `1`     |
+| `tracingCollector.resources.limits.memory`   | Memory limit.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | `quantity` | `1Gi`   |
+
+
 ### Alerta configuration
 
-| Name                                      | Description                                                           | Type       | Value   |
-| ----------------------------------------- | --------------------------------------------------------------------- | ---------- | ------- |
-| `alerta`                                  | Configuration for the Alerta service.                                 | `object`   | `{}`    |
-| `alerta.storage`                          | Persistent volume size for the database.                              | `string`   | `10Gi`  |
-| `alerta.storageClassName`                 | StorageClass used for the database.                                   | `string`   | `""`    |
-| `alerta.resources`                        | Resource configuration.                                               | `object`   | `{}`    |
-| `alerta.resources.requests`               | Resource requests.                                                    | `object`   | `{}`    |
-| `alerta.resources.requests.cpu`           | CPU request.                                                          | `quantity` | `100m`  |
-| `alerta.resources.requests.memory`        | Memory request.                                                       | `quantity` | `256Mi` |
-| `alerta.resources.limits`                 | Resource limits.                                                      | `object`   | `{}`    |
-| `alerta.resources.limits.cpu`             | CPU limit.                                                            | `quantity` | `1`     |
-| `alerta.resources.limits.memory`          | Memory limit.                                                         | `quantity` | `1Gi`   |
-| `alerta.alerts`                           | Alert routing configuration.                                          | `object`   | `{}`    |
-| `alerta.alerts.telegram`                  | Configuration for Telegram alerts.                                    | `object`   | `{}`    |
-| `alerta.alerts.telegram.token`            | Telegram bot token.                                                   | `string`   | `""`    |
-| `alerta.alerts.telegram.chatID`           | Telegram chat ID(s), separated by commas.                             | `string`   | `""`    |
-| `alerta.alerts.telegram.disabledSeverity` | List of severities without alerts (e.g. ["informational","warning"]). | `[]string` | `[]`    |
-| `alerta.alerts.slack`                     | Configuration for Slack alerts.                                       | `object`   | `{}`    |
-| `alerta.alerts.slack.url`                 | Configuration uri for Slack alerts.                                   | `string`   | `""`    |
-| `alerta.alerts.slack.disabledSeverity`    | List of severities without alerts (e.g. ["informational","warning"]). | `[]string` | `[]`    |
+| Name                                      | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | Type       | Value   |
+| ----------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------- | ------- |
+| `alerta`                                  | Configuration for the Alerta service.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | `object`   | `{}`    |
+| `alerta.storage`                          | Persistent volume size for the database.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | `string`   | `10Gi`  |
+| `alerta.storageClassName`                 | StorageClass used for the database.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              | `string`   | `""`    |
+| `alerta.resources`                        | Resource configuration.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | `object`   | `{}`    |
+| `alerta.resources.requests`               | Resource requests.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | `object`   | `{}`    |
+| `alerta.resources.requests.cpu`           | CPU request.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | `quantity` | `100m`  |
+| `alerta.resources.requests.memory`        | Memory request.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | `quantity` | `256Mi` |
+| `alerta.resources.limits`                 | Resource limits.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | `object`   | `{}`    |
+| `alerta.resources.limits.cpu`             | CPU limit.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       | `quantity` | `1`     |
+| `alerta.resources.limits.memory`          | Memory limit.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    | `quantity` | `1Gi`   |
+| `alerta.alerts`                           | Alert routing configuration.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | `object`   | `{}`    |
+| `alerta.alerts.telegram`                  | Configuration for Telegram alerts.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | `object`   | `{}`    |
+| `alerta.alerts.telegram.token`            | Telegram bot token.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              | `string`   | `""`    |
+| `alerta.alerts.telegram.chatID`           | Telegram chat ID(s), separated by commas.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        | `string`   | `""`    |
+| `alerta.alerts.telegram.disabledSeverity` | List of severities without alerts (e.g. ["informational","warning"]).                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | `[]string` | `[]`    |
+| `alerta.alerts.slack`                     | Configuration for Slack alerts.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | `object`   | `{}`    |
+| `alerta.alerts.slack.url`                 | Configuration uri for Slack alerts.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              | `string`   | `""`    |
+| `alerta.alerts.slack.disabledSeverity`    | List of severities without alerts (e.g. ["informational","warning"]).                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | `[]string` | `[]`    |
+| `alerta.alerts.email`                     | Configuration for email alerts. Alerts carrying the label notify_email with the string value true are emailed when their severity is in the severities list (default critical and major). A bare YAML boolean does not match. Alerts listed in alertnames are emailed unless matched by an earlier platform route.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | `object`   | `{}`    |
+| `alerta.alerts.email.to`                  | Recipient address, or several separated by commas. A display name is accepted, such as `Oncall <oncall@example.org>`, as long as it carries no comma. Quote display names containing punctuation such as `:`, `@`, parentheses or `?`. RFC 2047 encoded words are not accepted. IP domain literals accept dotted-quad IPv4 only. IPv6 literals are rejected because Go mail parsers disagree on their syntax across versions. ASCII control characters are rejected. Addresses must be literal, so Alertmanager template actions are rejected. The accepted form is deliberately narrower than RFC 5322. The local part must be a dot-atom, with no leading, trailing or doubled dot, and quoted local parts, comments and a `mailto:` prefix are rejected. An address outside that form fails the render, because Alertmanager parses addresses only when it sends and drops the notification with no record a tenant can read. | `string`   | `""`    |
+| `alerta.alerts.email.from`                | Sender address, one only. A display name is accepted. It takes the same narrower form as `to`, and an address outside it fails the render.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       | `string`   | `""`    |
+| `alerta.alerts.email.smarthost`           | SMTP server as `host:port` (e.g. "smtp.example.com:465"). A value without a port, an invalid bracketed IP address or a port with leading zeros fails the render. Port 465 uses implicit TLS, other ports use STARTTLS.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | `string`   | `""`    |
+| `alerta.alerts.email.authUsername`        | Username for SMTP LOGIN/PLAIN authentication. The password is read from the `password` key of a Secret named `alertmanager-email-password` in the release namespace, which the platform operator creates. The name is fixed and the Secret is mounted into Alertmanager, so a missing Secret blocks the whole Alertmanager rollout, not only email delivery. The credential in it must belong to this tenant alone. `smarthost` is chosen by whoever writes the Monitoring, so one relay credential provisioned under the same name in every namespace can be collected by pointing `smarthost` at a host the tenant controls.                                                                                                                                                                                                                                                                                                   | `string`   | `""`    |
+| `alerta.alerts.email.repeatInterval`      | Minimum time before a still-firing alert is emailed again, as an Alertmanager duration with units `y`, `w`, `d`, `h`, `m`, `s`, `ms` in descending order, each at most once, such as `5m`, `12h` or `1h30m`. Delivery is evaluated every 5m, so shorter intervals take effect at 5m and other intervals round up to a multiple of 5m. Zero, a unit out of order and a total beyond what Alertmanager accepts fail the render. Empty keeps the 12h default.                                                                                                                                                                                                                                                                                                                                                                                                                                                                       | `string`   | `""`    |
+| `alerta.alerts.email.alertnames`          | Alert names emailed whether or not the rule carries the notify_email label, with no severity filter. Earlier platform routes still take precedence. Alerts with `event="Heartbeat"`, including `Watchdog`, go only to Alerta, and alerts with severity `none`, `CDIDefaultStorageClassDegraded` and `CDINoDefaultStorageClass` are blackholed and never reach email. This is the way to opt in alerts the platform ships, since their helm-owned rule definitions cannot be labelled per cluster. Entries must be plain Prometheus alert names such as `KubeAPIDown`, and anything else fails the render. Empty adds no extra route.                                                                                                                                                                                                                                                                                             | `[]string` | `[]`    |
+| `alerta.alerts.email.severities`          | Severities the notify_email route accepts (e.g. ["critical","major","warning"]). Empty keeps the default of critical and major. List every severity in use to email opted-in alerts regardless of severity. Entries must be plain severity names, and anything else fails the render.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | `[]string` | `[]`    |
 
 
 ### Grafana configuration
@@ -101,3 +141,18 @@
 | `vmagent.externalLabels` | External labels applied to all metrics.  | `object` | `{}`  |
 | `vmagent.remoteWrite`    | Remote write configuration.              | `object` | `{}`  |
 
+
+### OIDC authentication
+
+| Name                               | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | Type       | Value  |
+| ---------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------- | ------ |
+| `oidc`                             | OIDC authentication for the Grafana instance. See docs/oidc-grafana.md for the operator guide.                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | `object`   | `{}`   |
+| `oidc.mode`                        | Identity mode. `None`: no OIDC, only the `grafana-admin-password` Secret works. `System`: trust the platform `cozy` realm via a per-instance confidential client and audience binding; zero-config default. `CustomConfig`: trust a tenant-supplied issuer directly (BYO); `cozy` is not in the path.                                                                                                                                                                                                                                                                     | `string`   | `None` |
+| `oidc.customConfig`                | Tenant-supplied `[auth.generic_oauth]` payload; consumed only when `mode: CustomConfig`.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | `object`   | `{}`   |
+| `oidc.customConfig.config`         | Inline map of `[auth.generic_oauth]` keys. Written verbatim into the Grafana CR `spec.config`. Mutually exclusive with `secretRef.name`.                                                                                                                                                                                                                                                                                                                                                                                                                                  | `object`   | `{}`   |
+| `oidc.customConfig.secretRef`      | Reference to a Secret holding an `auth.ini` fragment; mounted under `/etc/grafana/oidc` and loaded via `GF_PATHS_CUSTOM_INI`. With shared-central tracing only its `auth.ini` key is mounted, so the fragment cannot read another key of the Secret with `$__file{}`.                                                                                                                                                                                                                                                                                                     | `object`   | `{}`   |
+| `oidc.customConfig.secretRef.name` | Name of an existing Secret in the release namespace whose `auth.ini` key holds a ready-made `[auth.generic_oauth]` block. Mutually exclusive with `customConfig.config`.                                                                                                                                                                                                                                                                                                                                                                                                  | `string`   | `""`   |
+| `oidc.users`                       | Users granted access to this Grafana instance's org. Each entry is reconciled into Grafana org membership + role by a chart-owned post-install/post-upgrade Job. Works for both `System` and `CustomConfig` modes; ignored when `mode: None`. Users not listed here get nothing (no default org role from group mapping).                                                                                                                                                                                                                                                 | `[]object` | `[]`   |
+| `oidc.users[i].email`              | Email address matched against the `email` claim from the issuer. The chart pre-provisions a Grafana account with this email so the users-Job can set the org role before the operator's first login (`oauth_allow_insecure_email_lookup = true` glues the two together). Must match a conservative pattern: local part is `[A-Za-z0-9._%+-]+`, domain is `[A-Za-z0-9.-]+\.[A-Za-z]{2,}`. Whitespace, quoted literals, and unusual URL-reserved characters are rejected on schema level so the reconcile-Job's shell handling never has to defend against malformed input. | `string`   | `""`   |
+| `oidc.users[i].role`               | Grafana org role to bind: `Admin`, `Editor`, or `Viewer`. Applied to the release's Grafana org (`Main Org.`); server-level `GrafanaAdmin` promotion is out of scope for Phase 1. Required — the users-Job POSTs `{loginOrEmail, role}` to `/api/orgs/1/users` and PATCHes `{role}` to converge across re-runs; omitting the field would render `role: "null"` into the body and fail with HTTP 400.                                                                                                                                                                     | `string`   | `{}`   |
+
diff --git a/packages/extra/monitoring/templates/_helpers.tpl b/packages/extra/monitoring/templates/_helpers.tpl
new file mode 100644
index 0000000000..3cf3eaffe9
--- /dev/null
+++ b/packages/extra/monitoring/templates/_helpers.tpl
@@ -0,0 +1,17 @@
+{{- /*
+  Same condition as monitoring.tracingCentral in packages/system/monitoring,
+  which renders the collector this chart accounts for; the two must agree.
+*/ -}}
+{{- define "monitoring.tracingCentral" -}}
+{{- if and (ne .Release.Namespace "tenant-root") (eq (toString (dig "tracingCentral" false (.Values._namespace | default dict))) "true") -}}true{{- end -}}
+{{- end -}}
+
+{{- /* Same condition as monitoring.tracingCentralStore in packages/system/monitoring,
+       which renders the vmauth this chart accounts for. */}}
+{{- define "monitoring.tracingCentralStore" -}}
+{{- if and (eq .Release.Namespace "tenant-root") (eq (toString .Values.tracingCentralHost) "true") -}}
+{{-   range .Values.tracingStorages -}}
+{{-     if and (eq .name "generic") (eq (.mode | default "cluster") "cluster") }}true{{ end -}}
+{{-   end -}}
+{{- end -}}
+{{- end -}}
diff --git a/packages/extra/monitoring/templates/dashboard-resourcemap.yaml b/packages/extra/monitoring/templates/dashboard-resourcemap.yaml
index 5a5a3def98..fab86a4e0d 100644
--- a/packages/extra/monitoring/templates/dashboard-resourcemap.yaml
+++ b/packages/extra/monitoring/templates/dashboard-resourcemap.yaml
@@ -35,7 +35,7 @@ rules:
   - grafana
   - grafana-db
   - alerta-db
-  - alermanager
+  - alertmanager
   {{- range .Values.metricsStorages }}
   - {{ .name }}-vmstorage
   - {{ .name }}-vmselect
@@ -50,6 +50,12 @@ rules:
   - vmalert-{{ .name }}
   {{- break }}
   {{- end }}
+  {{- if and .Values.tracingCollector.enabled (or (include "monitoring.tracingCentral" .) (not (empty .Values.tracingStorages))) }}
+  - otel-traces
+  {{- end }}
+  {{- if include "monitoring.tracingCentralStore" . }}
+  - vmauth-traces-central
+  {{- end }}
   verbs: ["get", "list", "watch"]
 ---
 kind: RoleBinding
diff --git a/packages/extra/monitoring/templates/helmrelease.yaml b/packages/extra/monitoring/templates/helmrelease.yaml
index af4e1dab61..12720b18a2 100644
--- a/packages/extra/monitoring/templates/helmrelease.yaml
+++ b/packages/extra/monitoring/templates/helmrelease.yaml
@@ -10,14 +10,93 @@ spec:
     name: cozystack-monitoring-application-default-monitoring-system
     namespace: cozy-system
   interval: 5m
-  timeout: 10m
+  {{- /*
+    Aligned with the outer cozyrds `release.cozystack.io/helm-install-timeout: "15m"`
+    (packages/system/monitoring-rd/cozyrds/monitoring.yaml) so the inner HR does
+    not fail at 10m while the OIDC users-Job is still inside its
+    activeDeadlineSeconds: 900 (10m Grafana wait + reconcile budget).
+  */}}
+  timeout: 15m
   install:
     remediation:
       retries: -1
   upgrade:
     remediation:
       retries: -1
+  {{- /*
+    `poller` waitStrategy is required for healthCheckExprs to be evaluated.
+    Without it the HR flips Ready as soon as helm applies the VLCluster CR,
+    before the victoria-metrics-operator has stood up the log store, which is
+    exactly how a missing/broken VictoriaLogs stayed invisible (issue #3181:
+    fluent-bit drops logs at a dead-end vlinsert-generic while the release is
+    Ready). Gating on the VLCluster's own status makes that failure loud.
+  */}}
+  waitStrategy:
+    name: poller
+  {{- /*
+    VLCluster's status.conditions carry no stable Ready-type contract for this
+    operator version, so key on status.updateStatus instead. The CRD types it
+    as a free-form string; the operator's known values are operational,
+    expanding, failed and paused. `operational` maps to current and `expanding`
+    to in-progress; the `failed` predicate is a catch-all for everything else
+    (the operator's `failed` and `paused`, plus any future/unknown value), so
+    an unexpected status can never be silently read as Ready. A paused or
+    failed log store is not ingesting, so the release must not report Ready;
+    cozystack never sets spec.paused on these VLClusters, so `paused` is not
+    reachable in normal operation. Before the operator writes any updateStatus
+    (fresh apply) all three predicates are false, so the poller holds the
+    release not-ready until it becomes operational or hits `timeout:`, the
+    real backstop. Matching by kind covers every logsStorages entry. (CEL
+    evaluation is exercised live, not in helm-unittest, which cannot run it.)
+
+    The gate keys on a VLCluster existing, so an empty logsStorages would leave
+    nothing to match. That configuration is rejected at render time by the
+    system/monitoring chart (templates/vlogs/vlogs.yaml fails on an empty
+    logsStorages), so the "Ready with no log store" hole cannot be reached.
+
+    The traces backend (VTCluster / VTSingle) shares this operator and the same
+    status.updateStatus contract, so it is gated identically below. Unlike logs,
+    tracingStorages is EMPTY by default (tracing off), so usually nothing renders
+    and these exprs are inert: Flux evaluates them only against CRs in the
+    release inventory. "Ready with no trace store" is intentional and harmless:
+    nothing produces spans until the collector ships, so no data is dropped
+    (hence no fail-on-empty guard yet, unlike the logs #3181 guard which fires
+    because fluent-bit ships logs unconditionally). Shared-central mode
+    (_namespace.tracingCentral) keeps the local stores still listed, so the
+    exprs gate those; the shared store itself is tenant-root's to gate, and
+    its VMAuth, which every central tenant writes and reads through, is gated
+    the same way, inert outside a hosting tenant-root.
+  */}}
+  healthCheckExprs:
+    - apiVersion: operator.victoriametrics.com/v1
+      kind: VLCluster
+      inProgress: has(status.updateStatus) && status.updateStatus == 'expanding'
+      failed:     has(status.updateStatus) && status.updateStatus != 'operational' && status.updateStatus != 'expanding'
+      current:    has(status.updateStatus) && status.updateStatus == 'operational'
+    - apiVersion: operator.victoriametrics.com/v1
+      kind: VTCluster
+      inProgress: has(status.updateStatus) && status.updateStatus == 'expanding'
+      failed:     has(status.updateStatus) && status.updateStatus != 'operational' && status.updateStatus != 'expanding'
+      current:    has(status.updateStatus) && status.updateStatus == 'operational'
+    - apiVersion: operator.victoriametrics.com/v1
+      kind: VTSingle
+      inProgress: has(status.updateStatus) && status.updateStatus == 'expanding'
+      failed:     has(status.updateStatus) && status.updateStatus != 'operational' && status.updateStatus != 'expanding'
+      current:    has(status.updateStatus) && status.updateStatus == 'operational'
+    - apiVersion: operator.victoriametrics.com/v1beta1
+      kind: VMAuth
+      inProgress: has(status.updateStatus) && status.updateStatus == 'expanding'
+      failed:     has(status.updateStatus) && status.updateStatus != 'operational' && status.updateStatus != 'expanding'
+      current:    has(status.updateStatus) && status.updateStatus == 'operational'
   valuesFrom:
   - kind: Secret
     name: cozystack-values
-  values: {{- .Values | toYaml | nindent 4 }}
+  {{- /* The apps API does not prune keys the Monitoring schema leaves out, and
+         a central tenant's collector enforces the platform's rate on it, so its
+         image stays the platform's. So does Grafana's: its pod may reach a
+         central tenant's vmauth and mounts the Secret the tenant names in
+         oidc.customConfig.secretRef. */}}
+  {{- $values := deepCopy .Values }}
+  {{- $_ := unset $values.tracingCollector "image" }}
+  {{- $_ := unset $values.grafana "image" }}
+  values: {{- $values | toYaml | nindent 4 }}
diff --git a/packages/extra/monitoring/templates/hooks/cleanup.yaml b/packages/extra/monitoring/templates/hooks/cleanup.yaml
new file mode 100644
index 0000000000..2655dbde34
--- /dev/null
+++ b/packages/extra/monitoring/templates/hooks/cleanup.yaml
@@ -0,0 +1,115 @@
+---
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: {{ .Release.Name }}-cleanup
+  labels:
+    app.kubernetes.io/instance: {{ .Release.Name }}
+  annotations:
+    "helm.sh/hook": post-delete
+    "helm.sh/hook-weight": "10"
+    # Keep only before-hook-creation on the Job so a Failed cleanup survives for
+    # post-mortem; the SA/Role/RoleBinding keep hook-succeeded (cozystack #3072).
+    "helm.sh/hook-delete-policy": before-hook-creation
+spec:
+  # Backstop: the deletes are best-effort and non-blocking (--wait=false), but
+  # cap the Job so it can never stall the HelmRelease teardown.
+  activeDeadlineSeconds: 120
+  # Best-effort cleanup: never retry.
+  backoffLimit: 0
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/instance: {{ .Release.Name }}
+        policy.cozystack.io/allow-to-apiserver: "true"
+    spec:
+      serviceAccountName: {{ .Release.Name }}-cleanup
+      restartPolicy: Never
+      securityContext:
+        runAsNonRoot: true
+        runAsUser: 65534
+        runAsGroup: 65534
+        seccompProfile:
+          type: RuntimeDefault
+      containers:
+        - name: cleanup
+          image: docker.io/clastix/kubectl:v1.32
+          securityContext:
+            allowPrivilegeEscalation: false
+            readOnlyRootFilesystem: true
+            capabilities:
+              drop:
+                - ALL
+          env:
+            - name: HOME
+              value: /tmp
+          resources:
+            requests:
+              cpu: 10m
+              memory: 64Mi
+            limits:
+              cpu: 200m
+              memory: 128Mi
+          command:
+            - /bin/sh
+            - -c
+            - |
+              kubectl delete pvc -n {{ .Release.Namespace }} -l apps.cozystack.io/application.name={{ .Release.Name }}-system --ignore-not-found --wait=false \
+                || echo "WARNING: VM storage PVC cleanup failed for {{ .Release.Name }}; orphaned PVCs may remain" >&2
+              kubectl delete secret -n {{ .Release.Namespace }} alerta-tls grafana-ingress-tls --ignore-not-found --wait=false \
+                || echo "WARNING: TLS secret cleanup failed for {{ .Release.Name }}; orphaned secrets may remain" >&2
+          volumeMounts:
+            - name: tmp
+              mountPath: /tmp
+      volumes:
+        - name: tmp
+          emptyDir: {}
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ .Release.Name }}-cleanup
+  labels:
+    app.kubernetes.io/instance: {{ .Release.Name }}
+  annotations:
+    "helm.sh/hook": post-delete
+    "helm.sh/hook-weight": "0"
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: {{ .Release.Name }}-cleanup
+  labels:
+    app.kubernetes.io/instance: {{ .Release.Name }}
+  annotations:
+    "helm.sh/hook": post-delete
+    "helm.sh/hook-weight": "5"
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+rules:
+  - apiGroups: [""]
+    resources: ["persistentvolumeclaims"]
+    verbs: ["get", "list", "delete"]
+  - apiGroups: [""]
+    resources: ["secrets"]
+    resourceNames: ["alerta-tls", "grafana-ingress-tls"]
+    verbs: ["get", "delete"]
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: {{ .Release.Name }}-cleanup
+  labels:
+    app.kubernetes.io/instance: {{ .Release.Name }}
+  annotations:
+    "helm.sh/hook": post-delete
+    "helm.sh/hook-weight": "5"
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: {{ .Release.Name }}-cleanup
+subjects:
+  - kind: ServiceAccount
+    name: {{ .Release.Name }}-cleanup
+    namespace: {{ .Release.Namespace }}
diff --git a/packages/extra/monitoring/templates/workloadmonitors.yaml b/packages/extra/monitoring/templates/workloadmonitors.yaml
index 5d80335167..4a5813d42f 100644
--- a/packages/extra/monitoring/templates/workloadmonitors.yaml
+++ b/packages/extra/monitoring/templates/workloadmonitors.yaml
@@ -178,3 +178,38 @@ spec:
     app.kubernetes.io/instance: alertmanager
     app.kubernetes.io/name: vmalertmanager
   version: {{ $.Chart.Version }}
+{{- /* The OTLP trace collector renders under the same gate as the collector
+       itself (tracingCollector.enabled AND either a local tracingStorages backend
+       or central mode), so tenant workload accounting covers it like every other
+       monitoring component. expectedReplicas tracks the configured replica count. */}}
+{{- if and .Values.tracingCollector.enabled (or (include "monitoring.tracingCentral" .) (not (empty .Values.tracingStorages))) }}
+---
+apiVersion: cozystack.io/v1alpha1
+kind: WorkloadMonitor
+metadata:
+  name: otel-traces
+spec:
+  replicas: {{ .Values.tracingCollector.replicas }}
+  minReplicas: 1
+  kind: monitoring
+  type: otel-collector
+  selector:
+    app.kubernetes.io/name: otel-traces
+  version: {{ $.Chart.Version }}
+{{- end }}
+{{- if include "monitoring.tracingCentralStore" . }}
+---
+apiVersion: cozystack.io/v1alpha1
+kind: WorkloadMonitor
+metadata:
+  name: vmauth-traces-central
+spec:
+  replicas: 2
+  minReplicas: 1
+  kind: monitoring
+  type: vmauth
+  selector:
+    app.kubernetes.io/instance: traces-central
+    app.kubernetes.io/name: vmauth
+  version: {{ $.Chart.Version }}
+{{- end }}
diff --git a/packages/extra/monitoring/tests/cleanup_test.yaml b/packages/extra/monitoring/tests/cleanup_test.yaml
new file mode 100644
index 0000000000..da52a12f8b
--- /dev/null
+++ b/packages/extra/monitoring/tests/cleanup_test.yaml
@@ -0,0 +1,168 @@
+suite: monitoring post-delete cleanup hook removes orphaned VM PVCs and TLS secrets
+
+release:
+  name: monitoring
+  namespace: tenant-root
+
+templates:
+  - templates/hooks/cleanup.yaml
+
+tests:
+  - it: renders the cleanup Job as a post-delete hook with the hardened pod spec
+    documentSelector:
+      path: kind
+      value: Job
+    asserts:
+      - equal:
+          path: metadata.name
+          value: monitoring-cleanup
+      - equal:
+          path: metadata.annotations["helm.sh/hook"]
+          value: post-delete
+      - equal:
+          path: metadata.annotations["helm.sh/hook-weight"]
+          value: "10"
+      # The Job keeps only before-hook-creation so a Failed cleanup survives for
+      # post-mortem; hook-succeeded stays on the SA/Role/RoleBinding (see #3072).
+      - equal:
+          path: metadata.annotations["helm.sh/hook-delete-policy"]
+          value: before-hook-creation
+      # Backstop so a stuck delete can never stall the HelmRelease teardown.
+      - equal:
+          path: spec.activeDeadlineSeconds
+          value: 120
+      # Best-effort, never retry.
+      - equal:
+          path: spec.backoffLimit
+          value: 0
+      - equal:
+          path: spec.template.metadata.labels["policy.cozystack.io/allow-to-apiserver"]
+          value: "true"
+      - equal:
+          path: spec.template.spec.serviceAccountName
+          value: monitoring-cleanup
+      - equal:
+          path: spec.template.spec.restartPolicy
+          value: Never
+      - equal:
+          path: spec.template.spec.securityContext.runAsNonRoot
+          value: true
+      - equal:
+          path: spec.template.spec.securityContext.runAsUser
+          value: 65534
+      - equal:
+          path: spec.template.spec.containers[0].name
+          value: cleanup
+      - equal:
+          path: spec.template.spec.containers[0].image
+          value: docker.io/clastix/kubectl:v1.32
+      - equal:
+          path: spec.template.spec.containers[0].securityContext.readOnlyRootFilesystem
+          value: true
+      - contains:
+          path: spec.template.spec.containers[0].securityContext.capabilities.drop
+          content: ALL
+
+  - it: deletes the vm-operator storage PVCs scoped to this release without blocking teardown
+    documentSelector:
+      path: kind
+      value: Job
+    asserts:
+      # The selector is scoped to this release by apps.cozystack.io/application.name
+      # alone. That label is stamped on the VM/VL CRs'
+      # storage.volumeClaimTemplate.metadata.labels (packages/system/monitoring) and
+      # is copied onto the PVCs by vm-operator (IntoSTSVolume); spec.managedMetadata
+      # is not applied to PVCs, so the claim template is the only path that works.
+      # managed-by=vm-operator is deliberately NOT in the selector: on v0.68.4 it
+      # lives only on the StatefulSet selector/pod labels, so relying on it is
+      # fragile; application.name=<release>-system is already release-scoped and
+      # provably present on the PVC, and the CNPG db PVCs (grafana-db/alerta-db)
+      # do not carry it, so they stay untouched.
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: 'kubectl delete pvc -n tenant-root -l apps\.cozystack\.io/application\.name=monitoring-system --ignore-not-found --wait=false'
+      # Never widen the PVC sweep beyond the release-scoped label.
+      - notMatchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: kubectl delete pvc[^\n]*--all
+      # Regression guard: never re-introduce managed-by=vm-operator into the PVC
+      # selector — on the shipped v0.68.4 it is not stamped on the storage PVCs,
+      # so an AND with it silently matches nothing (see #3094 review).
+      - notMatchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: 'kubectl delete pvc[^\n]*managed-by=vm-operator'
+
+  - it: deletes the cert-manager TLS secrets by name without blocking teardown
+    documentSelector:
+      path: kind
+      value: Job
+    asserts:
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: kubectl delete secret -n tenant-root alerta-tls grafana-ingress-tls --ignore-not-found --wait=false
+      # The secret deletion must stay name-scoped — never a label or --all sweep.
+      - notMatchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: kubectl delete secret[^\n]*(-l |--all)
+
+  - it: creates the cleanup ServiceAccount as a post-delete hook
+    documentSelector:
+      path: kind
+      value: ServiceAccount
+    asserts:
+      - equal:
+          path: metadata.name
+          value: monitoring-cleanup
+      - equal:
+          path: metadata.annotations["helm.sh/hook"]
+          value: post-delete
+      - equal:
+          path: metadata.annotations["helm.sh/hook-weight"]
+          value: "0"
+
+  - it: grants RBAC to delete PVCs by label and the two named TLS secrets
+    documentSelector:
+      path: kind
+      value: Role
+    asserts:
+      - equal:
+          path: metadata.name
+          value: monitoring-cleanup
+      - equal:
+          path: metadata.annotations["helm.sh/hook-weight"]
+          value: "5"
+      - equal:
+          path: rules[0].resources[0]
+          value: persistentvolumeclaims
+      - contains:
+          path: rules[0].verbs
+          content: delete
+      - equal:
+          path: rules[1].resources[0]
+          value: secrets
+      - equal:
+          path: rules[1].resourceNames
+          value:
+            - alerta-tls
+            - grafana-ingress-tls
+      - contains:
+          path: rules[1].verbs
+          content: delete
+
+  - it: binds the cleanup Role to the cleanup ServiceAccount
+    documentSelector:
+      path: kind
+      value: RoleBinding
+    asserts:
+      - equal:
+          path: metadata.name
+          value: monitoring-cleanup
+      - equal:
+          path: roleRef.name
+          value: monitoring-cleanup
+      - equal:
+          path: subjects[0].name
+          value: monitoring-cleanup
+      - equal:
+          path: subjects[0].namespace
+          value: tenant-root
diff --git a/packages/extra/monitoring/tests/helmrelease_test.yaml b/packages/extra/monitoring/tests/helmrelease_test.yaml
new file mode 100644
index 0000000000..fc98baf111
--- /dev/null
+++ b/packages/extra/monitoring/tests/helmrelease_test.yaml
@@ -0,0 +1,161 @@
+suite: monitoring-system HelmRelease readiness gate
+templates:
+  - templates/helmrelease.yaml
+
+release:
+  name: monitoring
+  namespace: tenant-root
+
+# The monitoring-system HelmRelease owns the VLCluster(s) rendered from
+# logsStorages. Without a health gate it flips Ready as soon as helm applies the
+# CR, so a missing or broken VictoriaLogs stays invisible while fluent-bit drops
+# logs at a dead-end vlinsert-generic (issue #3181). A `poller` waitStrategy plus
+# a VLCluster healthCheckExpr makes that failure surface as not-ready.
+tests:
+  - it: names the child release <release>-system
+    asserts:
+      - containsDocument:
+          kind: HelmRelease
+          apiVersion: helm.toolkit.fluxcd.io/v2
+          name: monitoring-system
+
+  - it: uses the poller waitStrategy so healthCheckExprs are evaluated
+    asserts:
+      - equal:
+          path: spec.waitStrategy.name
+          value: poller
+
+  - it: passes tenant-set oidc values through to the inner chart
+    set:
+      oidc.mode: System
+      oidc.users:
+        - email: alice@example.com
+          role: Admin
+    asserts:
+      - equal:
+          path: spec.values.oidc.mode
+          value: System
+      - equal:
+          path: spec.values.oidc.users[0].email
+          value: alice@example.com
+      - equal:
+          path: spec.values.oidc.users[0].role
+          value: Admin
+
+  - it: gates readiness on the VLCluster status.updateStatus
+    asserts:
+      - equal:
+          path: spec.healthCheckExprs[0].apiVersion
+          value: operator.victoriametrics.com/v1
+      - equal:
+          path: spec.healthCheckExprs[0].kind
+          value: VLCluster
+      - equal:
+          path: spec.healthCheckExprs[0].current
+          value: "has(status.updateStatus) && status.updateStatus == 'operational'"
+      - equal:
+          path: spec.healthCheckExprs[0].inProgress
+          value: "has(status.updateStatus) && status.updateStatus == 'expanding'"
+      - equal:
+          path: spec.healthCheckExprs[0].failed
+          value: "has(status.updateStatus) && status.updateStatus != 'operational' && status.updateStatus != 'expanding'"
+
+  # The traces backend (VTCluster/VTSingle from tracingStorages) is gated the
+  # same way and by the same operator status contract. tracingStorages is empty
+  # by default, so these exprs are usually inert (no CR to match); when a backend
+  # is configured they gate readiness on it. Pin both entries so a
+  # dropped/reordered block or a typo'd CEL expression fails a test rather than
+  # silently regressing the gate.
+  - it: gates readiness on the VTCluster status.updateStatus
+    asserts:
+      - equal:
+          path: spec.healthCheckExprs[1].apiVersion
+          value: operator.victoriametrics.com/v1
+      - equal:
+          path: spec.healthCheckExprs[1].kind
+          value: VTCluster
+      - equal:
+          path: spec.healthCheckExprs[1].current
+          value: "has(status.updateStatus) && status.updateStatus == 'operational'"
+      - equal:
+          path: spec.healthCheckExprs[1].inProgress
+          value: "has(status.updateStatus) && status.updateStatus == 'expanding'"
+      - equal:
+          path: spec.healthCheckExprs[1].failed
+          value: "has(status.updateStatus) && status.updateStatus != 'operational' && status.updateStatus != 'expanding'"
+
+  - it: gates readiness on the VTSingle status.updateStatus
+    asserts:
+      - equal:
+          path: spec.healthCheckExprs[2].apiVersion
+          value: operator.victoriametrics.com/v1
+      - equal:
+          path: spec.healthCheckExprs[2].kind
+          value: VTSingle
+      - equal:
+          path: spec.healthCheckExprs[2].current
+          value: "has(status.updateStatus) && status.updateStatus == 'operational'"
+      - equal:
+          path: spec.healthCheckExprs[2].inProgress
+          value: "has(status.updateStatus) && status.updateStatus == 'expanding'"
+      - equal:
+          path: spec.healthCheckExprs[2].failed
+          value: "has(status.updateStatus) && status.updateStatus != 'operational' && status.updateStatus != 'expanding'"
+
+  # The shared-central vmauth carries the same operator status contract. Every
+  # central tenant writes and reads through it, so a failed vmauth must not
+  # leave tenant-root's release Ready; outside a hosting tenant-root no VMAuth
+  # is in the inventory and the entry is inert.
+  - it: gates readiness on the VMAuth status.updateStatus
+    asserts:
+      - equal:
+          path: spec.healthCheckExprs[3].apiVersion
+          value: operator.victoriametrics.com/v1beta1
+      - equal:
+          path: spec.healthCheckExprs[3].kind
+          value: VMAuth
+      - equal:
+          path: spec.healthCheckExprs[3].current
+          value: "has(status.updateStatus) && status.updateStatus == 'operational'"
+      - equal:
+          path: spec.healthCheckExprs[3].inProgress
+          value: "has(status.updateStatus) && status.updateStatus == 'expanding'"
+      - equal:
+          path: spec.healthCheckExprs[3].failed
+          value: "has(status.updateStatus) && status.updateStatus != 'operational' && status.updateStatus != 'expanding'"
+
+  # The collector a central tenant writes through enforces the rate the
+  # platform sets for it, so its image is the platform's. The apps API defaults the
+  # Monitoring spec but does not prune keys its schema leaves out, so a key set
+  # there would otherwise reach the inner chart and swap the collector for one
+  # without the limiter.
+  - it: does not pass a collector image set on the Monitoring application through
+    set:
+      tracingCollector:
+        enabled: true
+        replicas: 1
+        samplingPercentage: 10
+        image: docker.io/example/collector:1
+    asserts:
+      - notExists:
+          path: spec.values.tracingCollector.image
+      - equal:
+          path: spec.values.tracingCollector.replicas
+          value: 1
+
+  # The Grafana pod may reach a central tenant's vmauth and mounts the Secret
+  # a tenant names in oidc.customConfig.secretRef, so an image of the tenant's
+  # choosing could read a login from it; the image is the platform's too.
+  - it: does not pass a Grafana image set on the Monitoring application through
+    set:
+      grafana:
+        image: docker.io/example/grafana:1
+        resources:
+          requests:
+            cpu: 100m
+    asserts:
+      - notExists:
+          path: spec.values.grafana.image
+      - equal:
+          path: spec.values.grafana.resources.requests.cpu
+          value: 100m
diff --git a/packages/extra/monitoring/tests/tracing_collector_replicas_test.yaml b/packages/extra/monitoring/tests/tracing_collector_replicas_test.yaml
new file mode 100644
index 0000000000..a5f982eecd
--- /dev/null
+++ b/packages/extra/monitoring/tests/tracing_collector_replicas_test.yaml
@@ -0,0 +1,36 @@
+suite: the traces collector's replica count is bounded only where the rate needs it
+# Each collector replica holds its own share of a shared-central tenant's write
+# rate and starts with a full token bucket, so the replica count bounds how
+# much a central tenant can write above its rate on a rollout. A collector
+# writing to the tenant's own store has no rate, and the replica count it
+# shipped with stays valid; this chart cannot tell the two apart, so the bound
+# is enforced where the collector is rendered.
+templates:
+  - templates/helmrelease.yaml
+
+release:
+  name: monitoring
+  namespace: tenant-foo
+
+tests:
+  - it: accepts ten collector replicas
+    set:
+      tracingCollector:
+        enabled: true
+        replicas: 10
+        samplingPercentage: 10
+    asserts:
+      - equal:
+          path: spec.values.tracingCollector.replicas
+          value: 10
+
+  - it: accepts more than ten collector replicas, which only shared-central tracing refuses
+    set:
+      tracingCollector:
+        enabled: true
+        replicas: 12
+        samplingPercentage: 10
+    asserts:
+      - equal:
+          path: spec.values.tracingCollector.replicas
+          value: 12
diff --git a/packages/extra/monitoring/tests/workloadmonitors_traces_test.yaml b/packages/extra/monitoring/tests/workloadmonitors_traces_test.yaml
new file mode 100644
index 0000000000..b4f3048e90
--- /dev/null
+++ b/packages/extra/monitoring/tests/workloadmonitors_traces_test.yaml
@@ -0,0 +1,327 @@
+suite: OTLP trace collector is accounted for in tenant workload monitoring
+# Every workload the monitoring chart ships is enumerated in workloadmonitors.yaml
+# (so tenant workload health is tracked) and whitelisted in the dashboard-resources
+# Role (so the tenant dashboard may read its WorkloadMonitor). The OTLP collector
+# must be covered the same way — under the same gate it renders on
+# (tracingCollector.enabled AND a configured tracingStorages backend) and not when
+# tracing is off.
+templates:
+  - templates/workloadmonitors.yaml
+  - templates/dashboard-resourcemap.yaml
+
+release:
+  name: monitoring
+  namespace: tenant-test
+
+tests:
+  - it: renders a WorkloadMonitor for the collector when enabled with a backend
+    template: templates/workloadmonitors.yaml
+    set:
+      tracingCollector:
+        enabled: true
+        replicas: 2
+        samplingPercentage: 10
+      tracingStorages:
+        - name: generic
+          mode: cluster
+          retentionPeriod: "14d"
+          storage: 10Gi
+          storageClassName: replicated
+    documentSelector:
+      path: metadata.name
+      value: otel-traces
+    asserts:
+      - equal:
+          path: kind
+          value: WorkloadMonitor
+      - equal:
+          path: spec.type
+          value: otel-collector
+      # expectedReplicas tracks the configured replica count, minReplicas 1.
+      - equal:
+          path: spec.replicas
+          value: 2
+      - equal:
+          path: spec.minReplicas
+          value: 1
+      - equal:
+          path: spec.selector["app.kubernetes.io/name"]
+          value: otel-traces
+
+  - it: renders a WorkloadMonitor for the collector in central mode (no local backend)
+    template: templates/workloadmonitors.yaml
+    release:
+      namespace: tenant-foo
+    set:
+      _namespace:
+        tracingCentral: true
+      tracingCollector:
+        enabled: true
+        replicas: 1
+        samplingPercentage: 10
+      tracingStorages: []
+    documentSelector:
+      path: metadata.name
+      value: otel-traces
+    asserts:
+      - equal:
+          path: spec.type
+          value: otel-collector
+
+  - it: accounts for no central collector in tenant-root, which never exports centrally
+    template: templates/workloadmonitors.yaml
+    release:
+      namespace: tenant-root
+    set:
+      _namespace:
+        tracingCentral: true
+      tracingCollector:
+        enabled: true
+        replicas: 1
+        samplingPercentage: 10
+      tracingStorages: []
+    documentSelector:
+      path: metadata.name
+      value: otel-traces
+      skipEmptyTemplates: true
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  - it: treats a tracingCentral string other than true as off
+    template: templates/workloadmonitors.yaml
+    release:
+      namespace: tenant-foo
+    set:
+      _namespace:
+        tracingCentral: "false"
+      tracingCollector:
+        enabled: true
+        replicas: 1
+        samplingPercentage: 10
+      tracingStorages: []
+    documentSelector:
+      path: metadata.name
+      value: otel-traces
+      skipEmptyTemplates: true
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  - it: whitelists the central collector's WorkloadMonitor with no local backend
+    template: templates/dashboard-resourcemap.yaml
+    release:
+      namespace: tenant-foo
+    set:
+      _namespace:
+        tracingCentral: true
+      tracingCollector:
+        enabled: true
+        replicas: 1
+        samplingPercentage: 10
+      tracingStorages: []
+    documentSelector:
+      path: kind
+      value: Role
+    asserts:
+      - contains:
+          path: rules[3].resourceNames
+          content: otel-traces
+
+  - it: accounts for the shared-store vmauth where tenant-root hosts it
+    template: templates/workloadmonitors.yaml
+    release:
+      namespace: tenant-root
+    set:
+      tracingCentralHost: true
+      tracingStorages:
+        - name: generic
+          mode: cluster
+          retentionPeriod: "14d"
+          storage: 10Gi
+          storageClassName: replicated
+    documentSelector:
+      path: metadata.name
+      value: vmauth-traces-central
+    asserts:
+      - equal:
+          path: spec
+          value:
+            replicas: 2
+            minReplicas: 1
+            kind: monitoring
+            type: vmauth
+            selector:
+              app.kubernetes.io/instance: traces-central
+              app.kubernetes.io/name: vmauth
+            version: 0.0.0
+
+  - it: accounts for no vmauth where tenant-root does not host
+    template: templates/workloadmonitors.yaml
+    release:
+      namespace: tenant-root
+    set:
+      tracingStorages:
+        - name: generic
+          mode: cluster
+          retentionPeriod: "14d"
+          storage: 10Gi
+          storageClassName: replicated
+    documentSelector:
+      path: metadata.name
+      value: vmauth-traces-central
+      skipEmptyTemplates: true
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  - it: accounts for no vmauth outside tenant-root, the flag notwithstanding
+    template: templates/workloadmonitors.yaml
+    release:
+      namespace: tenant-foo
+    set:
+      tracingCentralHost: true
+      tracingStorages:
+        - name: generic
+          mode: cluster
+          retentionPeriod: "14d"
+          storage: 10Gi
+          storageClassName: replicated
+    documentSelector:
+      path: metadata.name
+      value: vmauth-traces-central
+      skipEmptyTemplates: true
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  - it: accounts for no vmauth without a cluster-mode store named generic
+    template: templates/workloadmonitors.yaml
+    release:
+      namespace: tenant-root
+    set:
+      tracingCentralHost: true
+      tracingStorages:
+        - name: generic
+          mode: single
+          retentionPeriod: "14d"
+          storage: 10Gi
+          storageClassName: replicated
+        - name: other
+          mode: cluster
+          retentionPeriod: "14d"
+          storage: 10Gi
+          storageClassName: replicated
+    documentSelector:
+      path: metadata.name
+      value: vmauth-traces-central
+      skipEmptyTemplates: true
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  - it: whitelists the shared-store vmauth WorkloadMonitor in the dashboard-resources Role
+    template: templates/dashboard-resourcemap.yaml
+    release:
+      namespace: tenant-root
+    set:
+      tracingCentralHost: true
+      tracingStorages:
+        - name: generic
+          mode: cluster
+          retentionPeriod: "14d"
+          storage: 10Gi
+          storageClassName: replicated
+    documentSelector:
+      path: kind
+      value: Role
+    asserts:
+      - contains:
+          path: rules[3].resourceNames
+          content: vmauth-traces-central
+
+  - it: whitelists no vmauth WorkloadMonitor where tenant-root does not host
+    template: templates/dashboard-resourcemap.yaml
+    release:
+      namespace: tenant-root
+    set:
+      tracingStorages:
+        - name: generic
+          mode: cluster
+          retentionPeriod: "14d"
+          storage: 10Gi
+          storageClassName: replicated
+    documentSelector:
+      path: kind
+      value: Role
+    asserts:
+      - notContains:
+          path: rules[3].resourceNames
+          content: vmauth-traces-central
+
+  - it: whitelists the collector WorkloadMonitor in the dashboard-resources Role
+    template: templates/dashboard-resourcemap.yaml
+    set:
+      tracingCollector:
+        enabled: true
+        replicas: 1
+        samplingPercentage: 10
+      tracingStorages:
+        - name: generic
+          mode: cluster
+          retentionPeriod: "14d"
+          storage: 10Gi
+          storageClassName: replicated
+    documentSelector:
+      path: kind
+      value: Role
+    asserts:
+      - contains:
+          path: rules[3].resourceNames
+          content: otel-traces
+      # The Role must whitelist each WorkloadMonitor by its real name. Guard the
+      # alertmanager entry, which shipped misspelled ("alermanager") so the
+      # alertmanager WorkloadMonitor was silently not RBAC-covered for the
+      # dashboard — a defect in the exact resourceNames list this PR edits.
+      - contains:
+          path: rules[3].resourceNames
+          content: alertmanager
+      - notContains:
+          path: rules[3].resourceNames
+          content: alermanager
+
+  # Absence is asserted on the resourcemap Role (a single deterministic document)
+  # via notContains rather than on workloadmonitors.yaml: that template emits a
+  # leading `---`, which makes containsDocument+not a no-op (an empty lead doc).
+  # Both templates gate the collector on the identical condition, so the Role's
+  # resourceNames list is a faithful proxy for whether the WorkloadMonitor renders.
+  - it: does not whitelist the collector when tracing is off (empty tracingStorages)
+    template: templates/dashboard-resourcemap.yaml
+    documentSelector:
+      path: kind
+      value: Role
+    asserts:
+      - notContains:
+          path: rules[3].resourceNames
+          content: otel-traces
+
+  - it: does not whitelist the collector when the collector is disabled
+    template: templates/dashboard-resourcemap.yaml
+    set:
+      tracingCollector:
+        enabled: false
+        replicas: 1
+        samplingPercentage: 10
+      tracingStorages:
+        - name: generic
+          mode: cluster
+          retentionPeriod: "14d"
+          storage: 10Gi
+          storageClassName: replicated
+    documentSelector:
+      path: kind
+      value: Role
+    asserts:
+      - notContains:
+          path: rules[3].resourceNames
+          content: otel-traces
diff --git a/packages/extra/monitoring/values.schema.json b/packages/extra/monitoring/values.schema.json
index 4bc6906e2d..5975924747 100644
--- a/packages/extra/monitoring/values.schema.json
+++ b/packages/extra/monitoring/values.schema.json
@@ -323,6 +323,184 @@
         }
       }
     },
+    "tracingStorages": {
+      "description": "Configuration of traces storage instances. Empty by default (tracing off): no backend and no trace collector are rendered. Adding an entry provisions a VictoriaTraces backend and, while tracingCollector.enabled is true, deploys the OTLP collector in front of it. A tenant with shared-central tracing (the Tenant's tracingCentral) gets the collector, while tracingCollector.enabled is true, without an entry, which then exports to the shared store; entries still listed keep their store and datasource, so traces stored before the switch stay readable until the entry is removed.",
+      "type": "array",
+      "default": [],
+      "items": {
+        "type": "object",
+        "required": [
+          "mode",
+          "name",
+          "retentionPeriod",
+          "storage",
+          "storageClassName"
+        ],
+        "properties": {
+          "mode": {
+            "description": "Deployment mode: \"cluster\" renders a VTCluster; \"single\" renders a single-binary VTSingle for edge/dev/small clusters. Treat as immutable once a backend exists: mode selects which Kind is rendered under the same name, so changing it on a running backend re-identifies the object rather than reconfiguring it. Switching from \"single\" to \"cluster\" prunes the VTSingle and the operator garbage-collects its PVC (stored traces are lost); switching from \"cluster\" to \"single\" (or removing the entry) leaves the vtstorage PVCs Bound and billed until the whole Monitoring release is deleted. The API cannot guard this (transition rules are not available on an array-item field), so this note is the only guard: migrate deliberately, accepting the loss.",
+            "type": "string",
+            "default": "cluster",
+            "enum": [
+              "cluster",
+              "single"
+            ]
+          },
+          "name": {
+            "description": "Name of the storage instance: a lowercase RFC 1123 label of at most 42 characters. Treat as immutable once a backend exists: the VTCluster/VTSingle, its Services, PVCs and Grafana datasource are all named after it, so renaming an entry deploys a new, empty backend and removes the old one, the same way changing mode does (single mode loses the old PVC, cluster mode leaves the old vtstorage PVCs Bound until the whole Monitoring release is deleted).",
+            "type": "string"
+          },
+          "retentionDiskUsageBytes": {
+            "description": "Optional disk-usage cap as a VictoriaMetrics BytesString (e.g. \"8GB\" or \"8GiB\"), bounding disk use on top of the age-based retentionPeriod. Uses byte-suffix grammar (kb/mb/gb/tb, KiB/MiB/GiB/TiB), NOT the Kubernetes-quantity grammar of the sibling storage field, so \"8Gi\" is rejected by the operator. In cluster mode the cap is per vtstorage replica (replicaCount 2), so the effective total is twice the value. Unset, the store drops its oldest day once its filesystem is 80% full instead, so every store is disk-bounded. Either way VictoriaTraces keeps the last two days, so spans arriving faster than the cap allows for two days can still fill the disk.",
+            "type": "string"
+          },
+          "retentionPeriod": {
+            "description": "Retention period for traces.",
+            "type": "string",
+            "default": "14d"
+          },
+          "storage": {
+            "description": "Persistent volume size.",
+            "default": "10Gi",
+            "pattern": "^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$",
+            "anyOf": [
+              {
+                "type": "integer"
+              },
+              {
+                "type": "string"
+              }
+            ],
+            "x-kubernetes-int-or-string": true
+          },
+          "storageClassName": {
+            "description": "StorageClass used to store the data.",
+            "type": "string",
+            "default": "replicated"
+          }
+        }
+      }
+    },
+    "tracingCentralHost": {
+      "description": "tenant-root only: accept spans from tenants that turned on shared-central tracing (the Tenant's tracingCentral) into this Monitoring's tracingStorages entry named `generic`, which must be in `cluster` mode. Every central tenant then shares that store's disk and retention with tenant-root, and nothing reserves space per tenant: once the store's disk cap is reached (retentionDiskUsageBytes, or 80% of its filesystem) the oldest spans of all of them are evicted together. Each tenant is held to the platform's monitoring.tracingCentralTenantBytesPerSecond, which by default lets one tenant write at most the cap of a default 10Gi store, counted uncompressed and before the tenant's sampling, over the two days VictoriaTraces always keeps, so raise it with the store; several tenants writing at their limit together still can fill it. That bound holds for a tenant whose collector keeps running: each collector pod starts with a full bucket, up to 5 MiB or one second of its share of the rate when that is larger, and any change to the tenant's Monitoring rolls every collector pod, so a tenant that keeps changing it writes that much more on each rollout, for up to ten replicas; closing that needs a limiter with shared state, which the collector does not run. Ignored outside tenant-root. The tenant-root namespace is inside the trust boundary of the shared store, as it is for the metrics of tenants that rely on a parent's monitoring: vmauth pins each central tenant to its own account, but workloads in tenant-root reach the store directly, and one that learns a tenant's account ID (a hash of its namespace name and UID, which its VMUsers carry) can read and write that account. Whoever tenant-root admits to its Grafana is inside it too, since tenant-root's own datasource for the store reaches vtselect without vmauth; who that is follows its Grafana's oidc mode (with System, tenant-root's own groups, which already hold the same access level in every tenant under tenant-root). The render refuses to stop hosting while central tenants remain, but removing the tenant-root Monitoring altogether is not a render and is not refused: turn tracingCentral off on the central tenants first, since until then every Monitoring render of theirs fails, their metrics, logs and alerting changes included. The refusals read each other's objects when they render, so a tenant turning tracingCentral on while tenant-root stops hosting can pass both: that tenant's collector then exports to a vmauth that is gone while every release reports Ready, until its Monitoring renders again. Recover by hosting again; turning that tenant's tracingCentral off instead ends the silent drop, and turning it on again is then refused until tenant-root hosts.",
+      "type": "boolean",
+      "default": false
+    },
+    "tracingCollector": {
+      "description": "OpenTelemetry Collector for trace ingestion. With shared-central tracing it refuses spans above the platform's per-tenant write rate: OTLP/HTTP senders retry them, OTLP/gRPC senders drop them, so export over HTTP. It also refuses a request larger than 3 MiB (decompressed) with a 400, which senders do not retry, so keep export batches below that.",
+      "type": "object",
+      "default": {},
+      "required": [
+        "enabled",
+        "replicas",
+        "samplingPercentage"
+      ],
+      "properties": {
+        "enabled": {
+          "description": "Deploy the OTLP collector. When disabled, applications must send OTLP straight to the traces backend (no central sampling/redaction); with shared-central tracing they have no path to it, so no new spans arrive, while the traces already stored stay readable. The collector fronts a single backend, and the limit holds with shared-central tracing too, since turning that off makes it export to the local entry again: while it is enabled, tracingStorages must hold at most one entry, and adding a second one fails the whole Monitoring render until the extra entry is removed or the collector is disabled.",
+          "type": "boolean",
+          "default": true
+        },
+        "redactAttributes": {
+          "description": "Span attribute keys to drop before export (the PII/secret control point, e.g. db.statement).",
+          "type": "array",
+          "default": [],
+          "items": {
+            "type": "string"
+          }
+        },
+        "replicas": {
+          "description": "Number of collector replicas. Head sampling is trace-id-deterministic, so replicas\u003e1 are safe and remove the single-ingest-path SPOF. With shared-central tracing each replica sends up to two requests at a time against this tenant's write limit of four per vmauth replica, so more replicas do not raise the tenant's throughput; the tenant's write rate (the platform's monitoring.tracingCentralTenantBytesPerSecond) is split across them as well, so a sender whose connection stays on one replica gets that replica's share, and each replica that starts lets through above the rate up to 5 MiB, or one second of its share when that is larger, which is why shared-central tracing allows at most 10 replicas and fails the render above that.",
+          "type": "integer",
+          "default": 1,
+          "minimum": 1
+        },
+        "resources": {
+          "description": "Resource configuration for the collector.",
+          "type": "object",
+          "default": {},
+          "properties": {
+            "limits": {
+              "description": "Resource limits.",
+              "type": "object",
+              "default": {},
+              "properties": {
+                "cpu": {
+                  "description": "CPU limit.",
+                  "default": 1,
+                  "pattern": "^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$",
+                  "anyOf": [
+                    {
+                      "type": "integer"
+                    },
+                    {
+                      "type": "string"
+                    }
+                  ],
+                  "x-kubernetes-int-or-string": true
+                },
+                "memory": {
+                  "description": "Memory limit.",
+                  "default": "1Gi",
+                  "pattern": "^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$",
+                  "anyOf": [
+                    {
+                      "type": "integer"
+                    },
+                    {
+                      "type": "string"
+                    }
+                  ],
+                  "x-kubernetes-int-or-string": true
+                }
+              }
+            },
+            "requests": {
+              "description": "Resource requests.",
+              "type": "object",
+              "default": {},
+              "properties": {
+                "cpu": {
+                  "description": "CPU request.",
+                  "default": "100m",
+                  "pattern": "^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$",
+                  "anyOf": [
+                    {
+                      "type": "integer"
+                    },
+                    {
+                      "type": "string"
+                    }
+                  ],
+                  "x-kubernetes-int-or-string": true
+                },
+                "memory": {
+                  "description": "Memory request.",
+                  "default": "256Mi",
+                  "pattern": "^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$",
+                  "anyOf": [
+                    {
+                      "type": "integer"
+                    },
+                    {
+                      "type": "string"
+                    }
+                  ],
+                  "x-kubernetes-int-or-string": true
+                }
+              }
+            }
+          }
+        },
+        "samplingPercentage": {
+          "description": "Head-sampling percentage applied at the collector before export.",
+          "type": "integer",
+          "default": 10,
+          "maximum": 100,
+          "minimum": 0
+        }
+      }
+    },
     "alerta": {
       "description": "Configuration for the Alerta service.",
       "type": "object",
@@ -333,6 +511,59 @@
           "type": "object",
           "default": {},
           "properties": {
+            "email": {
+              "description": "Configuration for email alerts. Alerts carrying the label notify_email with the string value true are emailed when their severity is in the severities list (default critical and major). A bare YAML boolean does not match. Alerts listed in alertnames are emailed unless matched by an earlier platform route.",
+              "type": "object",
+              "default": {},
+              "required": [
+                "from",
+                "smarthost",
+                "to"
+              ],
+              "properties": {
+                "alertnames": {
+                  "description": "Alert names emailed whether or not the rule carries the notify_email label, with no severity filter. Earlier platform routes still take precedence. Alerts with `event=\"Heartbeat\"`, including `Watchdog`, go only to Alerta, and alerts with severity `none`, `CDIDefaultStorageClassDegraded` and `CDINoDefaultStorageClass` are blackholed and never reach email. This is the way to opt in alerts the platform ships, since their helm-owned rule definitions cannot be labelled per cluster. Entries must be plain Prometheus alert names such as `KubeAPIDown`, and anything else fails the render. Empty adds no extra route.",
+                  "type": "array",
+                  "default": [],
+                  "items": {
+                    "type": "string"
+                  }
+                },
+                "authUsername": {
+                  "description": "Username for SMTP LOGIN/PLAIN authentication. The password is read from the `password` key of a Secret named `alertmanager-email-password` in the release namespace, which the platform operator creates. The name is fixed and the Secret is mounted into Alertmanager, so a missing Secret blocks the whole Alertmanager rollout, not only email delivery. The credential in it must belong to this tenant alone. `smarthost` is chosen by whoever writes the Monitoring, so one relay credential provisioned under the same name in every namespace can be collected by pointing `smarthost` at a host the tenant controls.",
+                  "type": "string",
+                  "default": ""
+                },
+                "from": {
+                  "description": "Sender address, one only. A display name is accepted. It takes the same narrower form as `to`, and an address outside it fails the render.",
+                  "type": "string",
+                  "default": ""
+                },
+                "repeatInterval": {
+                  "description": "Minimum time before a still-firing alert is emailed again, as an Alertmanager duration with units `y`, `w`, `d`, `h`, `m`, `s`, `ms` in descending order, each at most once, such as `5m`, `12h` or `1h30m`. Delivery is evaluated every 5m, so shorter intervals take effect at 5m and other intervals round up to a multiple of 5m. Zero, a unit out of order and a total beyond what Alertmanager accepts fail the render. Empty keeps the 12h default.",
+                  "type": "string",
+                  "default": ""
+                },
+                "severities": {
+                  "description": "Severities the notify_email route accepts (e.g. [\"critical\",\"major\",\"warning\"]). Empty keeps the default of critical and major. List every severity in use to email opted-in alerts regardless of severity. Entries must be plain severity names, and anything else fails the render.",
+                  "type": "array",
+                  "default": [],
+                  "items": {
+                    "type": "string"
+                  }
+                },
+                "smarthost": {
+                  "description": "SMTP server as `host:port` (e.g. \"smtp.example.com:465\"). A value without a port, an invalid bracketed IP address or a port with leading zeros fails the render. Port 465 uses implicit TLS, other ports use STARTTLS.",
+                  "type": "string",
+                  "default": ""
+                },
+                "to": {
+                  "description": "Recipient address, or several separated by commas. A display name is accepted, such as `Oncall \u003concall@example.org\u003e`, as long as it carries no comma. Quote display names containing punctuation such as `:`, `@`, parentheses or `?`. RFC 2047 encoded words are not accepted. IP domain literals accept dotted-quad IPv4 only. IPv6 literals are rejected because Go mail parsers disagree on their syntax across versions. ASCII control characters are rejected. Addresses must be literal, so Alertmanager template actions are rejected. The accepted form is deliberately narrower than RFC 5322. The local part must be a dot-atom, with no leading, trailing or doubled dot, and quoted local parts, comments and a `mailto:` prefix are rejected. An address outside that form fails the render, because Alertmanager parses addresses only when it sends and drops the notification with no record a tenant can read.",
+                  "type": "string",
+                  "default": ""
+                }
+              }
+            },
             "slack": {
               "description": "Configuration for Slack alerts.",
               "type": "object",
@@ -595,6 +826,77 @@
           }
         }
       }
+    },
+    "oidc": {
+      "description": "OIDC authentication for the Grafana instance. See docs/oidc-grafana.md for the operator guide.",
+      "type": "object",
+      "default": {},
+      "required": [
+        "mode"
+      ],
+      "properties": {
+        "customConfig": {
+          "description": "Tenant-supplied `[auth.generic_oauth]` payload; consumed only when `mode: CustomConfig`.",
+          "type": "object",
+          "default": {},
+          "properties": {
+            "config": {
+              "description": "Inline map of `[auth.generic_oauth]` keys. Written verbatim into the Grafana CR `spec.config`. Mutually exclusive with `secretRef.name`.",
+              "type": "object",
+              "default": {}
+            },
+            "secretRef": {
+              "description": "Reference to a Secret holding an `auth.ini` fragment; mounted under `/etc/grafana/oidc` and loaded via `GF_PATHS_CUSTOM_INI`. With shared-central tracing only its `auth.ini` key is mounted, so the fragment cannot read another key of the Secret with `$__file{}`.",
+              "type": "object",
+              "default": {},
+              "properties": {
+                "name": {
+                  "description": "Name of an existing Secret in the release namespace whose `auth.ini` key holds a ready-made `[auth.generic_oauth]` block. Mutually exclusive with `customConfig.config`.",
+                  "type": "string",
+                  "default": ""
+                }
+              }
+            }
+          }
+        },
+        "mode": {
+          "description": "Identity mode. `None`: no OIDC, only the `grafana-admin-password` Secret works. `System`: trust the platform `cozy` realm via a per-instance confidential client and audience binding; zero-config default. `CustomConfig`: trust a tenant-supplied issuer directly (BYO); `cozy` is not in the path.",
+          "type": "string",
+          "default": "None",
+          "enum": [
+            "None",
+            "System",
+            "CustomConfig"
+          ]
+        },
+        "users": {
+          "description": "Users granted access to this Grafana instance's org. Each entry is reconciled into Grafana org membership + role by a chart-owned post-install/post-upgrade Job. Works for both `System` and `CustomConfig` modes; ignored when `mode: None`. Users not listed here get nothing (no default org role from group mapping).",
+          "type": "array",
+          "default": [],
+          "items": {
+            "type": "object",
+            "required": [
+              "email",
+              "role"
+            ],
+            "properties": {
+              "email": {
+                "description": "Email address matched against the `email` claim from the issuer. The chart pre-provisions a Grafana account with this email so the users-Job can set the org role before the operator's first login (`oauth_allow_insecure_email_lookup = true` glues the two together). Must match a conservative pattern: local part is `[A-Za-z0-9._%+-]+`, domain is `[A-Za-z0-9.-]+\\.[A-Za-z]{2,}`. Whitespace, quoted literals, and unusual URL-reserved characters are rejected on schema level so the reconcile-Job's shell handling never has to defend against malformed input.",
+                "type": "string"
+              },
+              "role": {
+                "description": "Grafana org role to bind: `Admin`, `Editor`, or `Viewer`. Applied to the release's Grafana org (`Main Org.`); server-level `GrafanaAdmin` promotion is out of scope for Phase 1. Required — the users-Job POSTs `{loginOrEmail, role}` to `/api/orgs/1/users` and PATCHes `{role}` to converge across re-runs; omitting the field would render `role: \"null\"` into the body and fail with HTTP 400.",
+                "type": "string",
+                "enum": [
+                  "Admin",
+                  "Editor",
+                  "Viewer"
+                ]
+              }
+            }
+          }
+        }
+      }
     }
   }
 }
diff --git a/packages/extra/monitoring/values.yaml b/packages/extra/monitoring/values.yaml
index c521f38946..cda66724f5 100644
--- a/packages/extra/monitoring/values.yaml
+++ b/packages/extra/monitoring/values.yaml
@@ -92,6 +92,56 @@ logsStorages:
   storage: 10Gi
   storageClassName: replicated
 
+##
+## @section Traces storage configuration
+##
+
+## @enum {string} TracingMode - Deployment mode for a traces storage instance.
+## @value cluster
+## @value single
+
+## @typedef {struct} TracingStorage - Configuration of traces storage instance.
+## @field {string} name - Name of the storage instance: a lowercase RFC 1123 label of at most 42 characters. Treat as immutable once a backend exists: the VTCluster/VTSingle, its Services, PVCs and Grafana datasource are all named after it, so renaming an entry deploys a new, empty backend and removes the old one, the same way changing mode does (single mode loses the old PVC, cluster mode leaves the old vtstorage PVCs Bound until the whole Monitoring release is deleted).
+## @field {TracingMode} mode="cluster" - Deployment mode: "cluster" renders a VTCluster; "single" renders a single-binary VTSingle for edge/dev/small clusters. Treat as immutable once a backend exists: mode selects which Kind is rendered under the same name, so changing it on a running backend re-identifies the object rather than reconfiguring it. Switching from "single" to "cluster" prunes the VTSingle and the operator garbage-collects its PVC (stored traces are lost); switching from "cluster" to "single" (or removing the entry) leaves the vtstorage PVCs Bound and billed until the whole Monitoring release is deleted. The API cannot guard this (transition rules are not available on an array-item field), so this note is the only guard: migrate deliberately, accepting the loss.
+## @field {string} retentionPeriod="14d" - Retention period for traces.
+## @field {quantity} storage="10Gi" - Persistent volume size.
+## @field {string} storageClassName="replicated" - StorageClass used to store the data.
+## @field {string} [retentionDiskUsageBytes] - Optional disk-usage cap as a VictoriaMetrics BytesString (e.g. "8GB" or "8GiB"), bounding disk use on top of the age-based retentionPeriod. Uses byte-suffix grammar (kb/mb/gb/tb, KiB/MiB/GiB/TiB), NOT the Kubernetes-quantity grammar of the sibling storage field, so "8Gi" is rejected by the operator. In cluster mode the cap is per vtstorage replica (replicaCount 2), so the effective total is twice the value. Unset, the store drops its oldest day once its filesystem is 80% full instead, so every store is disk-bounded. Either way VictoriaTraces keeps the last two days, so spans arriving faster than the cap allows for two days can still fill the disk.
+
+## @param {[]TracingStorage} tracingStorages - Configuration of traces storage instances. Empty by default (tracing off): no backend and no trace collector are rendered. Adding an entry provisions a VictoriaTraces backend and, while tracingCollector.enabled is true, deploys the OTLP collector in front of it. A tenant with shared-central tracing (the Tenant's tracingCentral) gets the collector, while tracingCollector.enabled is true, without an entry, which then exports to the shared store; entries still listed keep their store and datasource, so traces stored before the switch stay readable until the entry is removed.
+tracingStorages: []
+
+## @param {bool} tracingCentralHost - tenant-root only: accept spans from tenants that turned on shared-central tracing (the Tenant's tracingCentral) into this Monitoring's tracingStorages entry named `generic`, which must be in `cluster` mode. Every central tenant then shares that store's disk and retention with tenant-root, and nothing reserves space per tenant: once the store's disk cap is reached (retentionDiskUsageBytes, or 80% of its filesystem) the oldest spans of all of them are evicted together. Each tenant is held to the platform's monitoring.tracingCentralTenantBytesPerSecond, which by default lets one tenant write at most the cap of a default 10Gi store, counted uncompressed and before the tenant's sampling, over the two days VictoriaTraces always keeps, so raise it with the store; several tenants writing at their limit together still can fill it. That bound holds for a tenant whose collector keeps running: each collector pod starts with a full bucket, up to 5 MiB or one second of its share of the rate when that is larger, and any change to the tenant's Monitoring rolls every collector pod, so a tenant that keeps changing it writes that much more on each rollout, for up to ten replicas; closing that needs a limiter with shared state, which the collector does not run. Ignored outside tenant-root. The tenant-root namespace is inside the trust boundary of the shared store, as it is for the metrics of tenants that rely on a parent's monitoring: vmauth pins each central tenant to its own account, but workloads in tenant-root reach the store directly, and one that learns a tenant's account ID (a hash of its namespace name and UID, which its VMUsers carry) can read and write that account. Whoever tenant-root admits to its Grafana is inside it too, since tenant-root's own datasource for the store reaches vtselect without vmauth; who that is follows its Grafana's oidc mode (with System, tenant-root's own groups, which already hold the same access level in every tenant under tenant-root). The render refuses to stop hosting while central tenants remain, but removing the tenant-root Monitoring altogether is not a render and is not refused: turn tracingCentral off on the central tenants first, since until then every Monitoring render of theirs fails, their metrics, logs and alerting changes included. The refusals read each other's objects when they render, so a tenant turning tracingCentral on while tenant-root stops hosting can pass both: that tenant's collector then exports to a vmauth that is gone while every release reports Ready, until its Monitoring renders again. Recover by hosting again; turning that tenant's tracingCentral off instead ends the silent drop, and turning it on again is then refused until tenant-root hosts.
+tracingCentralHost: false
+
+##
+## @section Traces collector configuration
+##
+
+## @typedef {struct} TracingCollector - Per-tenant OpenTelemetry Collector that fronts the traces backend, the tenant's own or, with shared-central tracing, the shared store in tenant-root. It is the app-facing OTLP ingest gateway and the point where sampling/redaction are enforced. Tenant isolation does not come from this workload: for a local backend it comes from the tenant NetworkPolicies, and with shared-central tracing from the vmauth in tenant-root, which pins the tenant's account to its credentials whatever the collector sends. With shared-central tracing it also holds the tenant to the platform's write rate (monitoring.tracingCentralTenantBytesPerSecond) and refuses data above it: an OTLP/HTTP sender gets a 429 and retries, while an OTLP/gRPC sender gets RESOURCE_EXHAUSTED without RetryInfo and drops those spans, so applications of central tenants should export over HTTP.
+## @field {bool} enabled=true - Deploy the OTLP collector. When disabled, applications must send OTLP straight to the traces backend (no central sampling/redaction); with shared-central tracing they have no path to it, so no new spans arrive, while the traces already stored stay readable. The collector fronts a single backend, and the limit holds with shared-central tracing too, since turning that off makes it export to the local entry again: while it is enabled, tracingStorages must hold at most one entry, and adding a second one fails the whole Monitoring render until the extra entry is removed or the collector is disabled.
+## @field {int} replicas=1 - Number of collector replicas. Head sampling is trace-id-deterministic, so replicas>1 are safe and remove the single-ingest-path SPOF. With shared-central tracing each replica sends up to two requests at a time against this tenant's write limit of four per vmauth replica, so more replicas do not raise the tenant's throughput; the tenant's write rate (the platform's monitoring.tracingCentralTenantBytesPerSecond) is split across them as well, so a sender whose connection stays on one replica gets that replica's share, and each replica that starts lets through above the rate up to 5 MiB, or one second of its share when that is larger, which is why shared-central tracing allows at most 10 replicas and fails the render above that.
+## @minimum 1
+## @field {int} samplingPercentage=10 - Head-sampling percentage applied at the collector before export.
+## @minimum 0
+## @maximum 100
+## @field {[]string} [redactAttributes] - Span attribute keys to drop before export (the PII/secret control point, e.g. db.statement).
+## @field {Resources} [resources] - Resource configuration for the collector.
+
+## @param {TracingCollector} tracingCollector - OpenTelemetry Collector for trace ingestion. With shared-central tracing it refuses spans above the platform's per-tenant write rate: OTLP/HTTP senders retry them, OTLP/gRPC senders drop them, so export over HTTP. It also refuses a request larger than 3 MiB (decompressed) with a 400, which senders do not retry, so keep export batches below that.
+tracingCollector:
+  enabled: true
+  replicas: 1
+  samplingPercentage: 10
+  redactAttributes: []
+  resources:
+    limits:
+      cpu: "1"
+      memory: 1Gi
+    requests:
+      cpu: 100m
+      memory: 256Mi
+
 ##
 ## @section Alerta configuration
 ##
@@ -105,9 +155,19 @@ logsStorages:
 ## @field {string} url - Configuration uri for Slack alerts.
 ## @field {[]string} [disabledSeverity] - List of severities without alerts (e.g. ["informational","warning"]).
 
+## @typedef {struct} EmailAlerts - Email alert configuration. When enabled, alerts carrying the label `notify_email="true"` with a severity from `severities` (default `critical` and `major`) are sent by email in addition to Alerta, and alerts listed in `alertnames` are emailed regardless of labels unless matched by an earlier platform route. The label is matched as a string, so a rule must carry `notify_email: "true"` rather than a bare YAML boolean.
+## @field {string} to - Recipient address, or several separated by commas. A display name is accepted, such as `Oncall <oncall@example.org>`, as long as it carries no comma. Quote display names containing punctuation such as `:`, `@`, parentheses or `?`. RFC 2047 encoded words are not accepted. IP domain literals accept dotted-quad IPv4 only. IPv6 literals are rejected because Go mail parsers disagree on their syntax across versions. ASCII control characters are rejected. Addresses must be literal, so Alertmanager template actions are rejected. The accepted form is deliberately narrower than RFC 5322. The local part must be a dot-atom, with no leading, trailing or doubled dot, and quoted local parts, comments and a `mailto:` prefix are rejected. An address outside that form fails the render, because Alertmanager parses addresses only when it sends and drops the notification with no record a tenant can read.
+## @field {string} from - Sender address, one only. A display name is accepted. It takes the same narrower form as `to`, and an address outside it fails the render.
+## @field {string} smarthost - SMTP server as `host:port` (e.g. "smtp.example.com:465"). A value without a port, an invalid bracketed IP address or a port with leading zeros fails the render. Port 465 uses implicit TLS, other ports use STARTTLS.
+## @field {string} [authUsername] - Username for SMTP LOGIN/PLAIN authentication. The password is read from the `password` key of a Secret named `alertmanager-email-password` in the release namespace, which the platform operator creates. The name is fixed and the Secret is mounted into Alertmanager, so a missing Secret blocks the whole Alertmanager rollout, not only email delivery. The credential in it must belong to this tenant alone. `smarthost` is chosen by whoever writes the Monitoring, so one relay credential provisioned under the same name in every namespace can be collected by pointing `smarthost` at a host the tenant controls.
+## @field {string} [repeatInterval] - Minimum time before a still-firing alert is emailed again, as an Alertmanager duration with units `y`, `w`, `d`, `h`, `m`, `s`, `ms` in descending order, each at most once, such as `5m`, `12h` or `1h30m`. Delivery is evaluated every 5m, so shorter intervals take effect at 5m and other intervals round up to a multiple of 5m. Zero, a unit out of order and a total beyond what Alertmanager accepts fail the render. Empty keeps the 12h default.
+## @field {[]string} [alertnames] - Alert names emailed whether or not the rule carries the notify_email label, with no severity filter. Earlier platform routes still take precedence. Alerts with `event="Heartbeat"`, including `Watchdog`, go only to Alerta, and alerts with severity `none`, `CDIDefaultStorageClassDegraded` and `CDINoDefaultStorageClass` are blackholed and never reach email. This is the way to opt in alerts the platform ships, since their helm-owned rule definitions cannot be labelled per cluster. Entries must be plain Prometheus alert names such as `KubeAPIDown`, and anything else fails the render. Empty adds no extra route.
+## @field {[]string} [severities] - Severities the notify_email route accepts (e.g. ["critical","major","warning"]). Empty keeps the default of critical and major. List every severity in use to email opted-in alerts regardless of severity. Entries must be plain severity names, and anything else fails the render.
+
 ## @typedef {struct} Alerts - Alert routing configuration.
 ## @field {TelegramAlerts} [telegram] - Configuration for Telegram alerts.
 ## @field {SlackAlerts} [slack] - Configuration for Slack alerts.
+## @field {EmailAlerts} [email] - Configuration for email alerts. Alerts carrying the label notify_email with the string value true are emailed when their severity is in the severities list (default critical and major). A bare YAML boolean does not match. Alerts listed in alertnames are emailed unless matched by an earlier platform route.
 
 ## @typedef {struct} Alerta - Configuration for the Alerta service.
 ## @field {string} [storage] - Persistent volume size for the database.
@@ -134,6 +194,14 @@ alerta:
     slack:
       url: ""
       disabledSeverity: []
+    email:
+      to: ""
+      from: ""
+      smarthost: ""
+      authUsername: ""
+      repeatInterval: ""
+      alertnames: []
+      severities: []
 ##
 ## @section Grafana configuration
 ##
@@ -182,3 +250,45 @@ vmagent:
   ##   - job_name: "custom"
   ##     static_configs:
   ##       - targets: ["my-service:9090"]
+
+##
+## @section OIDC authentication
+##
+
+## @enum {string} OIDCMode - Identity mode for the Grafana instance.
+## @value None
+## @value System
+## @value CustomConfig
+
+## @typedef {struct} OIDCSecretRef - Reference to a Secret carrying an `[auth.generic_oauth]` ini fragment.
+## @field {string} [name] - Name of an existing Secret in the release namespace whose `auth.ini` key holds a ready-made `[auth.generic_oauth]` block. Mutually exclusive with `customConfig.config`.
+
+## @typedef {struct} OIDCCustomConfigInline - Inline map of grafana.ini `[auth.generic_oauth]` keys.
+## @field {string} [<key>] - Value for the generic_oauth key (e.g. `client_id`, `client_secret`, `auth_url`, `token_url`, `api_url`, `scopes`, `role_attribute_path`).
+
+## @typedef {struct} OIDCCustomConfig - Tenant-supplied AuthN payload; consumed only when `mode: CustomConfig`. Exactly one of `config` or `secretRef.name` must be set.
+## @field {OIDCCustomConfigInline} [config] - Inline map of `[auth.generic_oauth]` keys. Written verbatim into the Grafana CR `spec.config`. Mutually exclusive with `secretRef.name`.
+## @field {OIDCSecretRef} [secretRef] - Reference to a Secret holding an `auth.ini` fragment; mounted under `/etc/grafana/oidc` and loaded via `GF_PATHS_CUSTOM_INI`. With shared-central tracing only its `auth.ini` key is mounted, so the fragment cannot read another key of the Secret with `$__file{}`.
+
+## @enum {string} OIDCRole - Grafana org role bound to a listed user.
+## @value Admin
+## @value Editor
+## @value Viewer
+
+## @typedef {struct} OIDCUser - Grafana user reconciled into the release's org.
+## @field {string} email - Email address matched against the `email` claim from the issuer. The chart pre-provisions a Grafana account with this email so the users-Job can set the org role before the operator's first login (`oauth_allow_insecure_email_lookup = true` glues the two together). Must match a conservative pattern: local part is `[A-Za-z0-9._%+-]+`, domain is `[A-Za-z0-9.-]+\.[A-Za-z]{2,}`. Whitespace, quoted literals, and unusual URL-reserved characters are rejected on schema level so the reconcile-Job's shell handling never has to defend against malformed input.
+## @field {OIDCRole} role - Grafana org role to bind: `Admin`, `Editor`, or `Viewer`. Applied to the release's Grafana org (`Main Org.`); server-level `GrafanaAdmin` promotion is out of scope for Phase 1. Required — the users-Job POSTs `{loginOrEmail, role}` to `/api/orgs/1/users` and PATCHes `{role}` to converge across re-runs; omitting the field would render `role: "null"` into the body and fail with HTTP 400.
+
+## @typedef {struct} OIDC - OIDC selector for the Grafana instance (Phase 1 — per-instance audience binding; no per-tenant Keycloak realm).
+## @field {OIDCMode} mode - Identity mode. `None`: no OIDC, only the `grafana-admin-password` Secret works. `System`: trust the platform `cozy` realm via a per-instance confidential client and audience binding; zero-config default. `CustomConfig`: trust a tenant-supplied issuer directly (BYO); `cozy` is not in the path.
+## @field {OIDCCustomConfig} [customConfig] - Tenant-supplied `[auth.generic_oauth]` payload; consumed only when `mode: CustomConfig`.
+## @field {[]OIDCUser} [users] - Users granted access to this Grafana instance's org. Each entry is reconciled into Grafana org membership + role by a chart-owned post-install/post-upgrade Job. Works for both `System` and `CustomConfig` modes; ignored when `mode: None`. Users not listed here get nothing (no default org role from group mapping).
+
+## @param {OIDC} oidc - OIDC authentication for the Grafana instance. See docs/oidc-grafana.md for the operator guide.
+oidc:
+  mode: "None"
+  customConfig:
+    config: {}
+    secretRef:
+      name: ""
+  users: []
diff --git a/packages/extra/seaweedfs/Makefile b/packages/extra/seaweedfs/Makefile
index eaa1b906a1..e1d814adea 100644
--- a/packages/extra/seaweedfs/Makefile
+++ b/packages/extra/seaweedfs/Makefile
@@ -2,6 +2,26 @@ NAME=seaweedfs
 
 include ../../../hack/package.mk
 
+.PHONY: test
+test:
+	helm unittest .
+	$(MAKE) test-guard-fail-closed
+
+# Sibling of the same target in packages/system/seaweedfs: this chart's copy of
+# the naming guard must also refuse an UPGRADE it cannot see the cluster for.
+# helm-unittest 1.0.3 ignores release.isUpgrade, so tests/guard_fail_closed_test.yaml
+# can only cover the render-through side and passes with or without the canary —
+# the refusal needs a real renderer.
+.PHONY: test-guard-fail-closed
+test-guard-fail-closed:
+	@out=$$(helm template seaweedfs . -n tenant-root --is-upgrade \
+	  --set topology=Simple --set replicationFactor=2 \
+	  --set _namespace.host=example.org --set _namespace.ingress=tenant-root \
+	  --set _cluster.issuer-name=letsencrypt-prod --set _cluster.solver=http01 2>&1); \
+	echo "$$out" | grep -q 'refusing to upgrade blind' \
+	  || { echo "FAIL: a blind upgrade rendered instead of refusing (naming-guard canary is not firing)"; echo "$$out" | head -5; exit 1; }
+	@echo "ok: naming guard refuses a blind upgrade"
+
 generate:
 	cozyvalues-gen -v values.yaml -s values.schema.json -r README.md
 	../../../hack/update-crd.sh
diff --git a/packages/extra/seaweedfs/README.md b/packages/extra/seaweedfs/README.md
index 5a3f6cf2f4..e269992bfc 100644
--- a/packages/extra/seaweedfs/README.md
+++ b/packages/extra/seaweedfs/README.md
@@ -13,68 +13,69 @@
 
 ### SeaweedFS Components Configuration
 
-| Name                                              | Description                                                                                                   | Type                | Value      |
-| ------------------------------------------------- | ------------------------------------------------------------------------------------------------------------- | ------------------- | ---------- |
-| `db`                                              | Database configuration.                                                                                       | `object`            | `{}`       |
-| `db.replicas`                                     | Number of database replicas.                                                                                  | `int`               | `2`        |
-| `db.size`                                         | Persistent Volume size.                                                                                       | `quantity`          | `10Gi`     |
-| `db.storageClass`                                 | StorageClass used to store the data.                                                                          | `string`            | `""`       |
-| `db.resources`                                    | Explicit CPU and memory configuration. When omitted, the preset defined in `resourcesPreset` is applied.      | `object`            | `{}`       |
-| `db.resources.cpu`                                | Number of CPU cores allocated.                                                                                | `quantity`          | `""`       |
-| `db.resources.memory`                             | Amount of memory allocated.                                                                                   | `quantity`          | `""`       |
-| `db.resourcesPreset`                              | Default sizing preset used when `resources` is omitted.                                                       | `string`            | `t1.small` |
-| `master`                                          | Master service configuration.                                                                                 | `object`            | `{}`       |
-| `master.replicas`                                 | Number of master replicas.                                                                                    | `int`               | `3`        |
-| `master.resources`                                | Explicit CPU and memory configuration. When omitted, the preset defined in `resourcesPreset` is applied.      | `object`            | `{}`       |
-| `master.resources.cpu`                            | Number of CPU cores allocated.                                                                                | `quantity`          | `""`       |
-| `master.resources.memory`                         | Amount of memory allocated.                                                                                   | `quantity`          | `""`       |
-| `master.resourcesPreset`                          | Default sizing preset used when `resources` is omitted.                                                       | `string`            | `t1.small` |
-| `filer`                                           | Filer service configuration.                                                                                  | `object`            | `{}`       |
-| `filer.replicas`                                  | Number of filer replicas.                                                                                     | `int`               | `2`        |
-| `filer.resources`                                 | Explicit CPU and memory configuration. When omitted, the preset defined in `resourcesPreset` is applied.      | `object`            | `{}`       |
-| `filer.resources.cpu`                             | Number of CPU cores allocated.                                                                                | `quantity`          | `""`       |
-| `filer.resources.memory`                          | Amount of memory allocated.                                                                                   | `quantity`          | `""`       |
-| `filer.resourcesPreset`                           | Default sizing preset used when `resources` is omitted.                                                       | `string`            | `t1.small` |
-| `filer.grpcHost`                                  | The hostname used to expose or access the filer service externally.                                           | `string`            | `""`       |
-| `filer.grpcPort`                                  | The port used to access the filer service externally.                                                         | `int`               | `443`      |
-| `filer.whitelist`                                 | A list of IP addresses or CIDR ranges that are allowed to access the filer service.                           | `[]string`          | `[]`       |
-| `volume`                                          | Volume service configuration.                                                                                 | `object`            | `{}`       |
-| `volume.replicas`                                 | Number of volume replicas.                                                                                    | `int`               | `2`        |
-| `volume.size`                                     | Persistent Volume size.                                                                                       | `quantity`          | `10Gi`     |
-| `volume.storageClass`                             | StorageClass used to store the data.                                                                          | `string`            | `""`       |
-| `volume.diskType`                                 | SeaweedFS disk type tag for the default volume servers (e.g., "hdd", "ssd").                                  | `string`            | `""`       |
-| `volume.resources`                                | Explicit CPU and memory configuration. When omitted, the preset defined in `resourcesPreset` is applied.      | `object`            | `{}`       |
-| `volume.resources.cpu`                            | Number of CPU cores allocated.                                                                                | `quantity`          | `""`       |
-| `volume.resources.memory`                         | Amount of memory allocated.                                                                                   | `quantity`          | `""`       |
-| `volume.resourcesPreset`                          | Default sizing preset used when `resources` is omitted.                                                       | `string`            | `t1.small` |
-| `volume.zones`                                    | A map of zones for MultiZone topology. Each zone can have its own number of replicas and size.                | `map[string]object` | `{}`       |
-| `volume.zones[name].replicas`                     | Number of replicas in the zone.                                                                               | `int`               | `0`        |
-| `volume.zones[name].size`                         | Zone storage size.                                                                                            | `quantity`          | `""`       |
-| `volume.zones[name].dataCenter`                   | SeaweedFS data center name for this zone. Defaults to the zone name.                                          | `string`            | `""`       |
-| `volume.zones[name].nodeSelector`                 | YAML nodeSelector for this zone (default: topology.kubernetes.io/zone: <zoneName>).                           | `string`            | `""`       |
-| `volume.zones[name].storageClass`                 | StorageClass used to store zone data. Defaults to volume.storageClass.                                        | `string`            | `""`       |
-| `volume.zones[name].pools`                        | A map of storage pools for this zone. Each pool creates a separate Volume StatefulSet per zone.               | `map[string]object` | `{}`       |
-| `volume.zones[name].pools[name].diskType`         | SeaweedFS disk type tag (e.g., "ssd", "hdd", "nvme").                                                         | `string`            | `""`       |
-| `volume.zones[name].pools[name].replicas`         | Number of volume replicas. Defaults to volume.replicas (Simple) or zone.replicas/volume.replicas (MultiZone). | `int`               | `0`        |
-| `volume.zones[name].pools[name].size`             | Persistent Volume size. Defaults to volume.size (Simple) or zone.size/volume.size (MultiZone).                | `quantity`          | `""`       |
-| `volume.zones[name].pools[name].storageClass`     | Kubernetes StorageClass for the pool. Defaults to volume.storageClass.                                        | `string`            | `""`       |
-| `volume.zones[name].pools[name].resources`        | Explicit CPU and memory configuration. When omitted, the preset defined in `resourcesPreset` is applied.      | `object`            | `{}`       |
-| `volume.zones[name].pools[name].resources.cpu`    | Number of CPU cores allocated.                                                                                | `quantity`          | `""`       |
-| `volume.zones[name].pools[name].resources.memory` | Amount of memory allocated.                                                                                   | `quantity`          | `""`       |
-| `volume.zones[name].pools[name].resourcesPreset`  | Default sizing preset used when `resources` is omitted. Defaults to volume.resourcesPreset.                   | `string`            | `{}`       |
-| `volume.pools`                                    | A map of storage pools. Each pool creates a separate Volume StatefulSet with its own disk type.               | `map[string]object` | `{}`       |
-| `volume.pools[name].diskType`                     | SeaweedFS disk type tag (e.g., "ssd", "hdd", "nvme").                                                         | `string`            | `""`       |
-| `volume.pools[name].replicas`                     | Number of volume replicas. Defaults to volume.replicas (Simple) or zone.replicas/volume.replicas (MultiZone). | `int`               | `0`        |
-| `volume.pools[name].size`                         | Persistent Volume size. Defaults to volume.size (Simple) or zone.size/volume.size (MultiZone).                | `quantity`          | `""`       |
-| `volume.pools[name].storageClass`                 | Kubernetes StorageClass for the pool. Defaults to volume.storageClass.                                        | `string`            | `""`       |
-| `volume.pools[name].resources`                    | Explicit CPU and memory configuration. When omitted, the preset defined in `resourcesPreset` is applied.      | `object`            | `{}`       |
-| `volume.pools[name].resources.cpu`                | Number of CPU cores allocated.                                                                                | `quantity`          | `""`       |
-| `volume.pools[name].resources.memory`             | Amount of memory allocated.                                                                                   | `quantity`          | `""`       |
-| `volume.pools[name].resourcesPreset`              | Default sizing preset used when `resources` is omitted. Defaults to volume.resourcesPreset.                   | `string`            | `{}`       |
-| `s3`                                              | S3 service configuration.                                                                                     | `object`            | `{}`       |
-| `s3.replicas`                                     | Number of S3 replicas.                                                                                        | `int`               | `2`        |
-| `s3.resources`                                    | Explicit CPU and memory configuration. When omitted, the preset defined in `resourcesPreset` is applied.      | `object`            | `{}`       |
-| `s3.resources.cpu`                                | Number of CPU cores allocated.                                                                                | `quantity`          | `""`       |
-| `s3.resources.memory`                             | Amount of memory allocated.                                                                                   | `quantity`          | `""`       |
-| `s3.resourcesPreset`                              | Default sizing preset used when `resources` is omitted.                                                       | `string`            | `t1.small` |
+| Name                                              | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | Type                | Value      |
+| ------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------- | ---------- |
+| `db`                                              | Database configuration.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | `object`            | `{}`       |
+| `db.replicas`                                     | Number of database replicas.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | `int`               | `2`        |
+| `db.size`                                         | Persistent Volume size.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | `quantity`          | `10Gi`     |
+| `db.storageClass`                                 | StorageClass used to store the data.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    | `string`            | `""`       |
+| `db.resources`                                    | Explicit CPU and memory configuration. When omitted, the preset defined in `resourcesPreset` is applied.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | `object`            | `{}`       |
+| `db.resources.cpu`                                | Number of CPU cores allocated.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | `quantity`          | `""`       |
+| `db.resources.memory`                             | Amount of memory allocated.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | `quantity`          | `""`       |
+| `db.resourcesPreset`                              | Default sizing preset used when `resources` is omitted.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | `string`            | `t1.small` |
+| `master`                                          | Master service configuration.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | `object`            | `{}`       |
+| `master.replicas`                                 | Number of master replicas.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              | `int`               | `3`        |
+| `master.resources`                                | Explicit CPU and memory configuration. When omitted, the preset defined in `resourcesPreset` is applied.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | `object`            | `{}`       |
+| `master.resources.cpu`                            | Number of CPU cores allocated.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | `quantity`          | `""`       |
+| `master.resources.memory`                         | Amount of memory allocated.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | `quantity`          | `""`       |
+| `master.resourcesPreset`                          | Default sizing preset used when `resources` is omitted.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | `string`            | `t1.small` |
+| `master.volumeSizeLimitMB`                        | Size in MB at which a volume stops taking writes, and the divisor that sets how many buckets a volume server can serve. Lower it to fit more buckets on the same disk, at the cost of more volume files for the same stored data; on a large volume it is worth raising instead. Changing it on an instance that already holds data costs something either way: lowering it stops writes to every bucket whose volumes all reach the new value until that bucket can grow, and raising it takes the room new buckets grow into, so run the check in docs/operations/seaweedfs-lowering-the-volume-size-limit.md first. Must be between 1 and 30000. A value close to or above `volume.size` leaves each volume server a single slot rather than failing, since the server floors its slot count at one. | `int`               | `400`      |
+| `filer`                                           | Filer service configuration.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | `object`            | `{}`       |
+| `filer.replicas`                                  | Number of filer replicas.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | `int`               | `2`        |
+| `filer.resources`                                 | Explicit CPU and memory configuration. When omitted, the preset defined in `resourcesPreset` is applied.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | `object`            | `{}`       |
+| `filer.resources.cpu`                             | Number of CPU cores allocated.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | `quantity`          | `""`       |
+| `filer.resources.memory`                          | Amount of memory allocated.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | `quantity`          | `""`       |
+| `filer.resourcesPreset`                           | Default sizing preset used when `resources` is omitted.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | `string`            | `t1.small` |
+| `filer.grpcHost`                                  | The hostname used to expose or access the filer service externally.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | `string`            | `""`       |
+| `filer.grpcPort`                                  | The port used to access the filer service externally.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   | `int`               | `443`      |
+| `filer.whitelist`                                 | A list of IP addresses or CIDR ranges that are allowed to access the filer service.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | `[]string`          | `[]`       |
+| `volume`                                          | Volume service configuration.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | `object`            | `{}`       |
+| `volume.replicas`                                 | Number of volume replicas.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              | `int`               | `2`        |
+| `volume.size`                                     | Persistent Volume size.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | `quantity`          | `10Gi`     |
+| `volume.storageClass`                             | StorageClass used to store the data.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    | `string`            | `""`       |
+| `volume.diskType`                                 | SeaweedFS disk type tag for the default volume servers (e.g., "hdd", "ssd").                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | `string`            | `""`       |
+| `volume.resources`                                | Explicit CPU and memory configuration. When omitted, the preset defined in `resourcesPreset` is applied.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | `object`            | `{}`       |
+| `volume.resources.cpu`                            | Number of CPU cores allocated.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | `quantity`          | `""`       |
+| `volume.resources.memory`                         | Amount of memory allocated.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | `quantity`          | `""`       |
+| `volume.resourcesPreset`                          | Default sizing preset used when `resources` is omitted.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | `string`            | `t1.small` |
+| `volume.zones`                                    | A map of zones for MultiZone topology. Each zone can have its own number of replicas and size.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | `map[string]object` | `{}`       |
+| `volume.zones[name].replicas`                     | Number of replicas in the zone.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | `int`               | `0`        |
+| `volume.zones[name].size`                         | Zone storage size.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | `quantity`          | `""`       |
+| `volume.zones[name].dataCenter`                   | SeaweedFS data center name for this zone. Defaults to the zone name.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    | `string`            | `""`       |
+| `volume.zones[name].nodeSelector`                 | YAML nodeSelector for this zone (default: topology.kubernetes.io/zone: <zoneName>).                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | `string`            | `""`       |
+| `volume.zones[name].storageClass`                 | StorageClass used to store zone data. Defaults to volume.storageClass.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | `string`            | `""`       |
+| `volume.zones[name].pools`                        | A map of storage pools for this zone. Each pool creates a separate Volume StatefulSet per zone.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | `map[string]object` | `{}`       |
+| `volume.zones[name].pools[name].diskType`         | SeaweedFS disk type tag (e.g., "ssd", "hdd", "nvme").                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   | `string`            | `""`       |
+| `volume.zones[name].pools[name].replicas`         | Number of volume replicas. Defaults to volume.replicas (Simple) or zone.replicas/volume.replicas (MultiZone).                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | `int`               | `0`        |
+| `volume.zones[name].pools[name].size`             | Persistent Volume size. Defaults to volume.size (Simple) or zone.size/volume.size (MultiZone).                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | `quantity`          | `""`       |
+| `volume.zones[name].pools[name].storageClass`     | Kubernetes StorageClass for the pool. Defaults to volume.storageClass.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | `string`            | `""`       |
+| `volume.zones[name].pools[name].resources`        | Explicit CPU and memory configuration. When omitted, the preset defined in `resourcesPreset` is applied.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | `object`            | `{}`       |
+| `volume.zones[name].pools[name].resources.cpu`    | Number of CPU cores allocated.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | `quantity`          | `""`       |
+| `volume.zones[name].pools[name].resources.memory` | Amount of memory allocated.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | `quantity`          | `""`       |
+| `volume.zones[name].pools[name].resourcesPreset`  | Default sizing preset used when `resources` is omitted. Defaults to volume.resourcesPreset.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | `string`            | `{}`       |
+| `volume.pools`                                    | A map of storage pools. Each pool creates a separate Volume StatefulSet with its own disk type.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | `map[string]object` | `{}`       |
+| `volume.pools[name].diskType`                     | SeaweedFS disk type tag (e.g., "ssd", "hdd", "nvme").                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   | `string`            | `""`       |
+| `volume.pools[name].replicas`                     | Number of volume replicas. Defaults to volume.replicas (Simple) or zone.replicas/volume.replicas (MultiZone).                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | `int`               | `0`        |
+| `volume.pools[name].size`                         | Persistent Volume size. Defaults to volume.size (Simple) or zone.size/volume.size (MultiZone).                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | `quantity`          | `""`       |
+| `volume.pools[name].storageClass`                 | Kubernetes StorageClass for the pool. Defaults to volume.storageClass.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | `string`            | `""`       |
+| `volume.pools[name].resources`                    | Explicit CPU and memory configuration. When omitted, the preset defined in `resourcesPreset` is applied.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | `object`            | `{}`       |
+| `volume.pools[name].resources.cpu`                | Number of CPU cores allocated.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | `quantity`          | `""`       |
+| `volume.pools[name].resources.memory`             | Amount of memory allocated.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | `quantity`          | `""`       |
+| `volume.pools[name].resourcesPreset`              | Default sizing preset used when `resources` is omitted. Defaults to volume.resourcesPreset.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | `string`            | `{}`       |
+| `s3`                                              | S3 service configuration.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | `object`            | `{}`       |
+| `s3.replicas`                                     | Number of S3 replicas.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | `int`               | `2`        |
+| `s3.resources`                                    | Explicit CPU and memory configuration. When omitted, the preset defined in `resourcesPreset` is applied.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | `object`            | `{}`       |
+| `s3.resources.cpu`                                | Number of CPU cores allocated.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | `quantity`          | `""`       |
+| `s3.resources.memory`                             | Amount of memory allocated.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | `quantity`          | `""`       |
+| `s3.resourcesPreset`                              | Default sizing preset used when `resources` is omitted.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | `string`            | `t1.small` |
 
diff --git a/packages/extra/seaweedfs/images/objectstorage-sidecar.tag b/packages/extra/seaweedfs/images/objectstorage-sidecar.tag
index 7600f17540..a3cd453be9 100644
--- a/packages/extra/seaweedfs/images/objectstorage-sidecar.tag
+++ b/packages/extra/seaweedfs/images/objectstorage-sidecar.tag
@@ -1 +1 @@
-ghcr.io/cozystack/cozystack/objectstorage-sidecar:v1.4.0-rc.2@sha256:ad318fa6e365d2c1ef5559979104b62c34b4440d33ac2e554508f77cde1f1d3e
+ghcr.io/cozystack/cozystack/objectstorage-sidecar:v1.6.0@sha256:4d665becd3399c2fe1e8a66e15d14d16e4a5a75395fb0ae65cff46679a8989f1
diff --git a/packages/extra/seaweedfs/images/seaweedfs-cosi-driver.tag b/packages/extra/seaweedfs/images/seaweedfs-cosi-driver.tag
index 52494779d1..49f2529500 100644
--- a/packages/extra/seaweedfs/images/seaweedfs-cosi-driver.tag
+++ b/packages/extra/seaweedfs/images/seaweedfs-cosi-driver.tag
@@ -1 +1 @@
-ghcr.io/seaweedfs/seaweedfs-cosi-driver:v0.3.0
+ghcr.io/seaweedfs/seaweedfs-cosi-driver:v0.3.1
diff --git a/packages/extra/seaweedfs/templates/_naming.tpl b/packages/extra/seaweedfs/templates/_naming.tpl
new file mode 100644
index 0000000000..4f8935db89
--- /dev/null
+++ b/packages/extra/seaweedfs/templates/_naming.tpl
@@ -0,0 +1,48 @@
+{{- /* seaweedfs.renamedVolumePrefix — reconstruct the name 4.31 gives the volume
+   component of the `<name>-system` release, i.e. the RELEASE-NAMED generation the
+   fullnameOverride pin exists to avoid.
+
+   Input: the `<name>-system` release name, as a bare string.
+     {{ include "seaweedfs.renamedVolumePrefix" "foo-system" }} -> foo-system-seaweedfs-volume
+
+   This replays two upstream helpers, so it must track them if the vendored chart
+   changes (hack/seaweedfs-guard-parity.bats pins the two copies of the guard
+   against each other; charts/seaweedfs/templates/shared/_helpers.tpl is the
+   source of truth for the rules below):
+
+     seaweedfs.fullname      — with no fullnameOverride, the release name, plus
+                               `-<chart name>` when the release name does not
+                               already contain it; truncated to 63.
+     seaweedfs.componentName — truncates the fullname to (62 - len(suffix)) before
+                               appending `-<suffix>`, so for `volume` the fullname
+                               is cut to 56. An instance name >= ~40 chars
+                               therefore loses `seaweedfs` from the tail, which is
+                               why a `contains "seaweedfs"` name filter cannot see
+                               its claims and this reconstruction can.
+
+   The guard deliberately does NOT call seaweedfs.fullname directly: that helper
+   reads .Values.fullnameOverride, which this chart PINS to `seaweedfs`, so it
+   returns the chart-named generation — the opposite of what is wanted here.
+
+   ACCEPTED LIMIT — zone/pool volume components. MultiZone (and Simple-with-
+   pools) tenants get per-group components with suffix `volume-<key>`, cut at
+   (62 - len(suffix)), i.e. SHORTER than the 56 this helper reconstructs. The
+   prefixes only diverge when the fullname exceeds that shorter cut: for the
+   supported instance (the tenant module hardcodes the name `seaweedfs`,
+   fullname 16 chars) that takes a zone/pool key of ~40+ characters, and for
+   the default `volume` group it can never happen (its suffix IS the 56 cut).
+   A guard prefix that diverges means a release-named zone component the guard
+   cannot see. Decided 2026-07-17 (1.6 triage): accepted and documented in
+   docs/operations/seaweedfs-431-rename-recovery.md (Scope) rather than
+   reconstructed per-key — instance names are fixed by the tenant module and
+   absurd keys are the only reachable trigger. Revisit if instance naming is
+   ever opened up or a key-length clamp lands in extra/seaweedfs. */}}
+{{- define "seaweedfs.renamedVolumePrefix" -}}
+{{- $release := . -}}
+{{- $full := $release -}}
+{{- if not (contains "seaweedfs" $release) -}}
+{{-   $full = printf "%s-seaweedfs" $release -}}
+{{- end -}}
+{{- $full = $full | trunc 63 | trimSuffix "-" -}}
+{{- printf "%s-volume" ($full | trunc 56 | trimSuffix "-") -}}
+{{- end -}}
diff --git a/packages/extra/seaweedfs/templates/client/cosi-deployment.yaml b/packages/extra/seaweedfs/templates/client/cosi-deployment.yaml
index f73a61bfa2..619462dac7 100644
--- a/packages/extra/seaweedfs/templates/client/cosi-deployment.yaml
+++ b/packages/extra/seaweedfs/templates/client/cosi-deployment.yaml
@@ -1,5 +1,5 @@
 {{- if eq .Values.topology "Client" }}
-{{- $host := .Values._namespace.host }}
+{{- $host := include "cozy-lib.ns-host-required" . }}
 ---
 apiVersion: apps/v1
 kind: Deployment
diff --git a/packages/extra/seaweedfs/templates/hooks/cleanup.yaml b/packages/extra/seaweedfs/templates/hooks/cleanup.yaml
new file mode 100644
index 0000000000..e678e05e12
--- /dev/null
+++ b/packages/extra/seaweedfs/templates/hooks/cleanup.yaml
@@ -0,0 +1,219 @@
+{{- /* The 4.31 chart names the fresh-install secrets after seaweedfs.fullname of
+     the child `<name>-system` release: `seaweedfs-system` for the default
+     instance, `<name>-system-seaweedfs` for a non-default one (the helper appends
+     the chart name when the release name does not contain it). Compute it here so
+     the cleanup covers both without hardcoding the default. */ -}}
+{{- $childRelease := printf "%s-system" .Release.Name }}
+{{- $renamedFull := $childRelease }}
+{{- if not (contains "seaweedfs" $childRelease) }}
+{{-   $renamedFull = printf "%s-seaweedfs" $childRelease }}
+{{- end }}
+{{- $renamedFull = $renamedFull | trunc 63 | trimSuffix "-" }}
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ .Release.Name }}-cleanup
+  labels:
+    app.kubernetes.io/instance: {{ .Release.Name }}
+  annotations:
+    "helm.sh/hook": post-delete
+    "helm.sh/hook-weight": "0"
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: {{ .Release.Name }}-cleanup
+  labels:
+    app.kubernetes.io/instance: {{ .Release.Name }}
+  annotations:
+    "helm.sh/hook": post-delete
+    "helm.sh/hook-weight": "5"
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+rules:
+  - apiGroups: [""]
+    resources: ["persistentvolumeclaims"]
+    verbs: ["get", "list", "delete"]
+  {{- if not (eq .Values.topology "Client") }}
+  # The filer-metadata database. Platform migration 43/53 stamps
+  # helm.sh/resource-policy=keep on it so a <name>-system upgrade cannot prune it
+  # (that prune is a data-loss bug), but `keep` is permanent and also stops the
+  # <name>-db release's own uninstall from removing it — so deleting the app
+  # would leave the CNPG Cluster, its Postgres pods and its PVCs behind with
+  # nothing owning them. Reclaim it explicitly here instead.
+  #
+  # Gated exactly as templates/seaweedfs-db.yaml gates the <name>-db HelmRelease.
+  # The Cluster name is hardcoded `seaweedfs-db` by the db chart for every
+  # instance, so it is NOT this release's to delete unless this release owns the
+  # db: a Client instance renders no <name>-db at all and shares another app's
+  # filer, and a second Simple instance in the same namespace loses the ownership
+  # race but still installs. Ungated, deleting either would take a DIFFERENT app's
+  # database, and CNPG takes its PVC with it via ownerReferences. The Job
+  # re-checks the ownership annotation at run time; this gate only stops the
+  # permission from being granted at all where it can never be legitimate.
+  - apiGroups: ["postgresql.cnpg.io"]
+    resources: ["clusters"]
+    verbs: ["get", "delete"]
+    resourceNames:
+      - seaweedfs-db
+  {{- end }}
+  - apiGroups: [""]
+    resources: ["secrets"]
+    verbs: ["get", "delete"]
+    resourceNames:
+      - {{ .Release.Name }}-s3-ingress-tls
+      # Renamed 4.31 naming (a tenant installed fresh on 1.5.x kept these).
+      - {{ $renamedFull }}-admin-cert
+      - {{ $renamedFull }}-ca-cert
+      - {{ $renamedFull }}-client-cert
+      - {{ $renamedFull }}-filer-cert
+      - {{ $renamedFull }}-master-cert
+      - {{ $renamedFull }}-volume-cert
+      - {{ $renamedFull }}-worker-cert
+      - {{ $renamedFull }}-db-secret
+      # Adopted chart-based naming: before 4.31 the chart ignored the release name,
+      # so these are seaweedfs-* for every release, and system/seaweedfs pins that
+      # name back. Only one of the two schemes exists on a given tenant; listing
+      # both keeps the delete exhaustive.
+      - seaweedfs-admin-cert
+      - seaweedfs-ca-cert
+      - seaweedfs-client-cert
+      - seaweedfs-filer-cert
+      - seaweedfs-master-cert
+      - seaweedfs-volume-cert
+      - seaweedfs-worker-cert
+      - seaweedfs-db-secret
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: {{ .Release.Name }}-cleanup
+  labels:
+    app.kubernetes.io/instance: {{ .Release.Name }}
+  annotations:
+    "helm.sh/hook": post-delete
+    "helm.sh/hook-weight": "5"
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: {{ .Release.Name }}-cleanup
+subjects:
+  - kind: ServiceAccount
+    name: {{ .Release.Name }}-cleanup
+    namespace: {{ .Release.Namespace }}
+---
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: {{ .Release.Name }}-cleanup
+  labels:
+    app.kubernetes.io/instance: {{ .Release.Name }}
+  annotations:
+    "helm.sh/hook": post-delete
+    "helm.sh/hook-weight": "10"
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+spec:
+  backoffLimit: 3
+  activeDeadlineSeconds: 120
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/instance: {{ .Release.Name }}
+        policy.cozystack.io/allow-to-apiserver: "true"
+    spec:
+      serviceAccountName: {{ .Release.Name }}-cleanup
+      restartPolicy: Never
+      securityContext:
+        runAsNonRoot: true
+        runAsUser: 65534
+        runAsGroup: 65534
+        fsGroup: 65534
+        seccompProfile:
+          type: RuntimeDefault
+      volumes:
+        - name: tmp
+          emptyDir: {}
+      containers:
+        - name: cleanup
+          image: docker.io/clastix/kubectl:v1.32
+          env:
+            - name: HOME
+              value: /tmp
+          securityContext:
+            allowPrivilegeEscalation: false
+            readOnlyRootFilesystem: true
+            capabilities:
+              drop:
+                - ALL
+          volumeMounts:
+            - name: tmp
+              mountPath: /tmp
+          resources:
+            requests:
+              cpu: 10m
+              memory: 64Mi
+            limits:
+              cpu: 200m
+              memory: 128Mi
+          command:
+            - /bin/sh
+            - -c
+            - |
+              echo "Deleting orphaned SeaweedFS volume PVCs for {{ .Release.Name }}..."
+              kubectl delete pvc -n {{ .Release.Namespace }} -l app.kubernetes.io/name=seaweedfs,app.kubernetes.io/instance={{ .Release.Name }}-system --ignore-not-found --wait=false \
+                || echo "WARNING: SeaweedFS PVC cleanup failed for {{ .Release.Name }}; orphaned PVCs may remain" >&2
+              {{- if not (eq .Values.topology "Client") }}
+              # The filer-metadata database. Platform migration 43/53 stamps
+              # helm.sh/resource-policy=keep on this Cluster so a <name>-system
+              # upgrade cannot prune it — that prune destroys the tenant's S3
+              # index — but `keep` is permanent and also survives the <name>-db
+              # release's own uninstall, so without this the Cluster, its
+              # Postgres pods and its PVCs outlive the app that owned them. The
+              # PVCs carry ownerReferences to the Cluster, so deleting it
+              # garbage-collects them; they are NOT matched by the label selector
+              # above (they are labelled cnpg.io/cluster=seaweedfs-db).
+              #
+              # The Cluster name is hardcoded `seaweedfs-db` for every instance,
+              # so confirm THIS release owns it before deleting. A Client instance
+              # renders no <name>-db and shares another app's filer; a second
+              # Simple instance in the same namespace loses Helm's ownership race
+              # but still installs. Deleting on name alone would take a different
+              # app's database.
+              echo "Deleting SeaweedFS filer-metadata database for {{ .Release.Name }}..."
+              # Reading ownership must FAIL the Job on error, not fall through. `|| true`
+              # would turn a Forbidden, a timeout or any API error into an empty owner,
+              # take the "nothing to reclaim" branch below, and let the Job complete —
+              # orphaning the keep-protected Cluster this hook exists to reclaim, with
+              # nothing else that will ever collect it. Only a genuine NotFound counts
+              # as absence; every other failure aborts so the Job retries.
+              owner_err=/tmp/seaweedfs-db-owner-err
+              if owner=$(kubectl get cluster.postgresql.cnpg.io -n {{ .Release.Namespace }} seaweedfs-db \
+                          -o jsonpath='{.metadata.annotations.meta\.helm\.sh/release-name}' 2>"$owner_err"); then
+                :
+              elif grep -qi 'not found' "$owner_err"; then
+                owner=""
+              else
+                cat "$owner_err" >&2
+                echo "ERROR: failed to read Cluster/seaweedfs-db ownership for {{ .Release.Name }}; refusing to assume it is absent. Failing so the Job retries." >&2
+                rm -f "$owner_err"
+                exit 1
+              fi
+              rm -f "$owner_err"
+              if [ -z "$owner" ]; then
+                echo "No Cluster/seaweedfs-db owned by a Helm release here; nothing to reclaim."
+              elif [ "$owner" != "{{ .Release.Name }}-db" ]; then
+                echo "REFUSING to delete Cluster/seaweedfs-db: owned by '$owner', not {{ .Release.Name }}-db. Another SeaweedFS app owns this database; leaving it alone." >&2
+              else
+                # A failure here must FAIL the Job: the Cluster is keep-protected, so
+                # nothing else will ever reclaim it, and hook-delete-policy would
+                # otherwise remove the only cleanup Job while the orphan remains.
+                kubectl delete cluster.postgresql.cnpg.io -n {{ .Release.Namespace }} seaweedfs-db --ignore-not-found --wait=false \
+                  || { echo "ERROR: failed to delete Cluster/seaweedfs-db for {{ .Release.Name }}; it is keep-protected and will be orphaned. Failing so the Job retries." >&2; exit 1; }
+              fi
+              {{- end }}
+              echo "Deleting orphaned SeaweedFS cert/db secrets for {{ .Release.Name }}..."
+              kubectl delete secret -n {{ .Release.Namespace }} {{ .Release.Name }}-s3-ingress-tls {{ $renamedFull }}-admin-cert {{ $renamedFull }}-ca-cert {{ $renamedFull }}-client-cert {{ $renamedFull }}-filer-cert {{ $renamedFull }}-master-cert {{ $renamedFull }}-volume-cert {{ $renamedFull }}-worker-cert {{ $renamedFull }}-db-secret seaweedfs-admin-cert seaweedfs-ca-cert seaweedfs-client-cert seaweedfs-filer-cert seaweedfs-master-cert seaweedfs-volume-cert seaweedfs-worker-cert seaweedfs-db-secret --ignore-not-found --wait=false \
+                || echo "WARNING: SeaweedFS secret cleanup failed for {{ .Release.Name }}; orphaned secrets may remain" >&2
+              echo "SeaweedFS cleanup complete."
diff --git a/packages/extra/seaweedfs/templates/seaweedfs.yaml b/packages/extra/seaweedfs/templates/seaweedfs.yaml
index 1e30df3d4d..27e5557e04 100644
--- a/packages/extra/seaweedfs/templates/seaweedfs.yaml
+++ b/packages/extra/seaweedfs/templates/seaweedfs.yaml
@@ -94,9 +94,103 @@
 
 {{- if not (eq .Values.topology "Client") }}
 {{- $ingress := .Values._namespace.ingress }}
-{{- $host := .Values._namespace.host }}
+{{- $host := include "cozy-lib.ns-host-required" . }}
 {{- $solver := (index .Values._cluster "solver") | default "http01" }}
 {{- $clusterIssuer := (index .Values._cluster "issuer-name") | default "letsencrypt-prod" }}
+{{- $wildcardSecret := (index .Values._cluster "wildcard-secret-name") | default "" }}
+{{- /* Refuse to rename a running SeaweedFS away from its data.
+
+   Before 4.31 the chart named workloads after the CHART, ignoring the release
+   name, so every instance ran as `seaweedfs-*` with its data on
+   `data1-seaweedfs-volume-*`. 4.31 names them after the release instead, so the
+   upgrade could not rename in place (StatefulSet names are immutable) and Helm
+   stood up a second, empty set while the data stayed put. system/seaweedfs pins
+   the chart-based name back, so those workloads and volumes are adopted in place.
+
+   These states cannot be adopted and stop the render instead:
+
+   - FRESH on 1.5.x: only the renamed volumes exist, so the data was written under
+     them. Adopting the chart-based name would rename the workloads AWAY from that
+     data and bring up an empty cluster beside it. Helm cannot move data between
+     PVCs, so the operator is sent to the PV re-bind runbook (Step 2).
+   - D-split: both sets exist AND the renamed volume servers are live, so they may
+     hold objects written through the split endpoint. Adopting the chart-based set
+     would strand those. The operator is sent to reconcile the split first (Step 3).
+     A duplicate that never served (D-wedged: zero ready replicas) is refused the
+     same way: readyReplicas is a snapshot, not proof it never served, so it cannot
+     be told apart from D-split and is never adopted blind (see the note below).
+
+   The renamed volumes are matched by SHAPE rather than by reconstructing the
+   name: a volume PVC is always `data1-<fullname>-volume[-<pool|zone>]-N`, and
+   `<fullname>` is `seaweedfs` only for the adopted naming. Reconstructing it
+   instead would have to replay the chart's fullname helper AND its 56-character
+   component truncation, and would silently miss a tenant whose name is long or
+   does not contain the chart name.
+
+   PVCs hold the data and outlive any workload, but carry no chart labels, so they
+   are matched on the name shape and must mention the chart to avoid tripping over
+   an unrelated `data1-*-volume-*` claim. StatefulSets do carry the labels, so they
+   are matched on those, which is also the ONLY signal for a tenant whose PVCs are
+   not provisioned yet and for one whose instance name is long enough that the
+   chart truncated `seaweedfs` off the PVC names. Either establishes a generation's
+   presence, so the two are OR-ed.
+
+   Two generations present is UNDECIDABLE from inside a render and this guard does
+   not guess — see the long note in system/seaweedfs/templates/naming-guard.yaml.
+   In short: the release history DOES record birth order durably, but birth order
+   is the wrong question. It says which generation is original; adoption needs to
+   know whether the other one is EMPTY, and D-wedged and D-split are identical on
+   every durable signal.
+
+   This copy of the guard warns on the SeaweedFS application itself, where the
+   operator looks first. The ENFORCING copy lives in system/seaweedfs
+   (templates/naming-guard.yaml): the <name>-system HelmRelease pulls its chart
+   from a platform-managed ExternalArtifact, so a platform upgrade re-renders
+   THAT chart directly without ever re-rendering this one. Keep the two
+   classifications in sync — they are deliberately identical, and
+   hack/seaweedfs-guard-parity.bats fails the build if they drift.
+
+   Fail-closed: lookup errors abort the render, but a client-side render returns
+   nothing — the release namespace is used as a canary, and an upgrade that
+   cannot see the cluster refuses instead of misclassifying. */}}
+{{- $canary := lookup "v1" "Namespace" "" .Release.Namespace }}
+{{- if and (not $canary) .Release.IsUpgrade }}
+{{-   fail (printf "SeaweedFS naming-migration guard for %s in namespace %s: cannot see the cluster (lookup returned nothing for the release namespace itself). This render decides whether workloads are renamed away from live data, so refusing to upgrade blind. Renders applied by helm-controller always see the cluster; if templating by hand, render server-side." .Release.Name .Release.Namespace) }}
+{{- end }}
+{{- if $canary }}
+{{- /* extra/seaweedfs is the `<name>` release; the renamed generation is named
+   after its CHILD `<name>-system` release, so derive it. This one line is the only
+   difference from the copy in system/seaweedfs. */}}
+{{- $sysRelease := printf "%s-system" .Release.Name }}
+{{- $renamedVol := include "seaweedfs.renamedVolumePrefix" $sysRelease }}
+{{- $legacyPVC := false }}
+{{- $systemPVC := false }}
+{{- $legacySTS := false }}
+{{- $systemSTS := false }}
+{{- range (lookup "v1" "PersistentVolumeClaim" .Release.Namespace "").items | default list }}
+{{-   if hasPrefix (printf "data1-%s" $renamedVol) .metadata.name }}
+{{-     $systemPVC = true }}
+{{-   else if hasPrefix "data1-seaweedfs-volume" .metadata.name }}
+{{-     $legacyPVC = true }}
+{{-   end }}
+{{- end }}
+{{- range (lookup "apps/v1" "StatefulSet" .Release.Namespace "").items | default list }}
+{{-   if eq (dig "app.kubernetes.io/name" "" (.metadata.labels | default dict)) "seaweedfs" }}
+{{-     if hasPrefix $renamedVol .metadata.name }}
+{{-       $systemSTS = true }}
+{{-     else if hasPrefix "seaweedfs-volume" .metadata.name }}
+{{-       $legacySTS = true }}
+{{-     end }}
+{{-   end }}
+{{- end }}
+{{- $legacyGen := or $legacyPVC $legacySTS }}
+{{- $systemGen := or $systemPVC $systemSTS }}
+{{- if and $legacyGen $systemGen }}
+{{-   fail (printf "SeaweedFS %s in namespace %s has BOTH naming generations present: the chart-named set (seaweedfs-volume / data1-seaweedfs-volume-*) AND the release-named set this chart no longer uses. One of them is an empty duplicate and one holds the data, and which is which cannot be established from inside a Helm render — claim timestamps are mutable (the Step 2 re-bind recreates claims), StatefulSets are recreated by the adoption hook, and a duplicate with zero ready replicas may still have served writes. Rendering would adopt the chart-named set, so guessing wrong strands or destroys the data. Refusing instead. Classify the tenant and delete the EMPTY generation so exactly one remains — this render then adopts the survivor with no further action. See docs/operations/seaweedfs-431-rename-recovery.md (Step 1 classifies; Step 2/2a/3 recover). If you are part-way through Step 2's re-bind, finish it." .Release.Name .Release.Namespace) }}
+{{- else if $systemGen }}
+{{-   fail (printf "SeaweedFS %s in namespace %s keeps its data on volumes named after the Helm release — a tenant installed fresh on Cozystack 1.5.x (or one whose instance name is long enough that the chart truncated the volume PVC names, leaving only its StatefulSets to match on). Workloads are named seaweedfs-*, so rendering would rename them away from that data and bring up an empty cluster. Helm cannot move data between PVCs. Re-bind the existing PVs onto the data1-seaweedfs-volume-* PVC names before upgrading — see docs/operations/seaweedfs-431-rename-recovery.md (Step 2)." .Release.Name .Release.Namespace) }}
+{{- end }}
+{{- end }}
 apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
 metadata:
@@ -140,6 +234,9 @@ spec:
         defaultReplicaPlacement: "{{ sub .Values.replicationFactor 1 }}00"
         {{- end }}
         replicas: {{ .Values.master.replicas }}
+        {{- /* An explicit null is dropped before schema validation, so neither
+               bound sees it, and the master exits on the empty flag it renders. */}}
+        volumeSizeLimitMB: {{ required "master.volumeSizeLimitMB must be set" .Values.master.volumeSizeLimitMB }}
         resources: {{- include "cozy-lib.resources.defaultingSanitize" (list .Values.master.resourcesPreset .Values.master.resources $) | nindent 10 }}
       volume:
         {{ if eq .Values.topology "MultiZone" }}
@@ -256,14 +353,22 @@ spec:
             nginx.ingress.kubernetes.io/client-body-timeout: "3600"
             nginx.ingress.kubernetes.io/client-header-timeout: "120"
             nginx.ingress.kubernetes.io/service-upstream: "true"
+            {{- /* Operator wildcard mode: nginx serves the default SSL cert, so skip per-host ACME. */}}
+            {{- if not $wildcardSecret }}
             {{- if eq $solver "http01" }}
             acme.cert-manager.io/http01-ingress-ingressclassname: {{ $ingress }}
             {{- end }}
             cert-manager.io/cluster-issuer: {{ $clusterIssuer }}
+            {{- end }}
           tls:
             - hosts:
               - {{ .Values.host | default (printf "s3.%s" $host) }}
+              {{- /* Operator wildcard mode: no per-host secret — ingress-nginx
+                     falls back to the default SSL certificate while the tls
+                     section keeps the HTTP-to-HTTPS redirect enforced. */}}
+              {{- if not $wildcardSecret }}
               secretName: {{ .Release.Name }}-s3-ingress-tls
+              {{- end }}
         resources: {{- include "cozy-lib.resources.defaultingSanitize" (list .Values.s3.resourcesPreset .Values.s3.resources $) | nindent 10 }}
       cosi:
         driverName: "{{ .Release.Namespace }}.seaweedfs.objectstorage.k8s.io"
diff --git a/packages/extra/seaweedfs/tests/cleanup_client_test.yaml b/packages/extra/seaweedfs/tests/cleanup_client_test.yaml
new file mode 100644
index 0000000000..1e4422f26b
--- /dev/null
+++ b/packages/extra/seaweedfs/tests/cleanup_client_test.yaml
@@ -0,0 +1,64 @@
+suite: seaweedfs cleanup hook does not reclaim another app's database
+
+# templates/seaweedfs-db.yaml gates the <name>-db HelmRelease on
+# `topology != "Client"`: a Client instance renders NO database of its own and
+# points at another app's filer. The cleanup hook reclaims Cluster/seaweedfs-db —
+# a name the db chart hardcodes for every instance — so if it is not gated the
+# same way, deleting a Client deletes the SERVER's filer metadata, and CNPG takes
+# the PVC with it via ownerReferences. Total S3 loss for an app the operator never
+# touched.
+#
+# These fail on an ungated hook: it renders the Role granting delete on
+# clusters/seaweedfs-db and the delete command for a release that owns no database.
+
+templates:
+  - templates/hooks/cleanup.yaml
+
+release:
+  name: s3-remote
+  namespace: tenant-root
+
+tests:
+  - it: grants no cnpg RBAC to a Client instance
+    set: &client
+      topology: Client
+      filer:
+        grpcHost: seaweedfs-filer.tenant-other.svc
+      _namespace:
+        host: example.org
+        ingress: tenant-root
+      _cluster:
+        issuer-name: letsencrypt-prod
+        solver: http01
+    documentSelector:
+      path: kind
+      value: Role
+    asserts:
+      # Bound the Role by shape instead of naming one spelling of the forbidden
+      # rule. A Client renders exactly two rules, both in the core group. The
+      # cnpg grant is gated between them in the template, so ungating it adds a
+      # third rule whatever its spelling — other verbs, a wildcard resource, a
+      # different resourceNames list — and rules[2] exists. The rules themselves
+      # are left unpinned because the secret list is long and churns on its own.
+      - equal:
+          path: rules[0].apiGroups
+          value: [""]
+      - equal:
+          path: rules[1].apiGroups
+          value: [""]
+      - notExists:
+          path: rules[2]
+
+  - it: does not delete any database in a Client instance's cleanup command
+    set: *client
+    documentSelector:
+      path: kind
+      value: Job
+    asserts:
+      - notMatchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: 'delete cluster\.postgresql\.cnpg\.io'
+      # Its own PVC/secret cleanup must still run.
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: 'kubectl delete pvc -n tenant-root'
diff --git a/packages/extra/seaweedfs/tests/cleanup_named_test.yaml b/packages/extra/seaweedfs/tests/cleanup_named_test.yaml
new file mode 100644
index 0000000000..2b72c9e484
--- /dev/null
+++ b/packages/extra/seaweedfs/tests/cleanup_named_test.yaml
@@ -0,0 +1,48 @@
+suite: seaweedfs cleanup hook covers a non-default instance name
+
+# SeaweedFS is a user-creatable kind, so an instance can run under a name other
+# than `seaweedfs`. On delete, the post-delete hook must remove that instance's
+# secrets under BOTH schemes it could carry: the adopted chart-based `seaweedfs-*`
+# and the renamed `seaweedfs.fullname`-based names. For a non-default release the
+# fullname helper appends the chart name, so a fresh-1.5.x `archive` instance's
+# secrets are `archive-system-seaweedfs-*` — not `archive-system-*`. This pins
+# that the hook derives the renamed name instead of hardcoding the default.
+
+templates:
+  - templates/hooks/cleanup.yaml
+
+release:
+  name: archive
+  namespace: tenant-root
+
+set: &values
+  topology: Simple
+  replicationFactor: 2
+  _namespace:
+    host: example.org
+    ingress: tenant-root
+  _cluster:
+    issuer-name: letsencrypt-prod
+    solver: http01
+
+tests:
+  - it: grants delete on the renamed (archive-system-seaweedfs-*) and adopted (seaweedfs-*) secrets
+    set: *values
+    documentSelector:
+      path: kind
+      value: Role
+    asserts:
+      - contains:
+          path: rules[2].resourceNames
+          content: archive-system-seaweedfs-ca-cert
+      - contains:
+          path: rules[2].resourceNames
+          content: archive-system-seaweedfs-db-secret
+      # The adopted chart-based scheme is the same for every instance.
+      - contains:
+          path: rules[2].resourceNames
+          content: seaweedfs-ca-cert
+      # The old hardcoded default name must NOT appear for a non-default instance.
+      - notContains:
+          path: rules[2].resourceNames
+          content: archive-system-ca-cert
diff --git a/packages/extra/seaweedfs/tests/cleanup_test.yaml b/packages/extra/seaweedfs/tests/cleanup_test.yaml
new file mode 100644
index 0000000000..580a7d106a
--- /dev/null
+++ b/packages/extra/seaweedfs/tests/cleanup_test.yaml
@@ -0,0 +1,229 @@
+suite: seaweedfs post-delete cleanup hook removes orphaned PVCs and secrets
+templates:
+  - templates/hooks/cleanup.yaml
+
+release:
+  name: seaweedfs
+  namespace: tenant-root
+
+# After the seaweedfs module is disabled, the StatefulSet data PVCs
+# (data1-seaweedfs-system-volume-{0,1}) and the cert-manager TLS / db
+# secrets are left orphaned. The post-delete hook renders a Job (plus its
+# RBAC) that deletes the volume PVCs by label and the secrets by name.
+# Secrets are cleaned under BOTH naming schemes: the native
+# {{ .Release.Name }}-system-* prefix (fresh installs) and the adopted
+# chart-name-based seaweedfs-* prefix (clusters upgraded past the 4.31
+# rename, where seaweedfs.yaml pins fullnameOverride=seaweedfs). Only one
+# set exists on a given cluster; the hook lists both so cleanup stays
+# exhaustive. PVCs are deleted by the app.kubernetes.io/instance label,
+# which is {{ .Release.Name }}-system under either naming.
+
+tests:
+  - it: renders the cleanup ServiceAccount as a post-delete hook
+    documentSelector:
+      path: kind
+      value: ServiceAccount
+    asserts:
+      - equal:
+          path: metadata.name
+          value: seaweedfs-cleanup
+      - equal:
+          path: metadata.annotations["helm.sh/hook"]
+          value: post-delete
+      - equal:
+          path: metadata.annotations["helm.sh/hook-weight"]
+          value: "0"
+      - equal:
+          path: metadata.annotations["helm.sh/hook-delete-policy"]
+          value: before-hook-creation,hook-succeeded
+
+  - it: grants delete on PVCs and only the named secrets under both naming schemes
+    documentSelector:
+      path: kind
+      value: Role
+    asserts:
+      - equal:
+          path: metadata.annotations["helm.sh/hook-weight"]
+          value: "5"
+      - contains:
+          path: rules
+          content:
+            apiGroups: [""]
+            resources: ["persistentvolumeclaims"]
+            verbs: ["get", "list", "delete"]
+      # Migration 43/53 stamps helm.sh/resource-policy=keep on the CNPG Cluster
+      # so a <name>-system upgrade cannot prune the filer metadata. `keep` is
+      # permanent and also survives the <name>-db release's own uninstall, so
+      # without an explicit reclaim here, deleting the app orphans the Cluster,
+      # its Postgres pods and its PVCs (which the PVC selector above does not
+      # match — they are labelled cnpg.io/cluster=seaweedfs-db).
+      - contains:
+          path: rules
+          content:
+            apiGroups: ["postgresql.cnpg.io"]
+            resources: ["clusters"]
+            verbs: ["get", "delete"]
+            resourceNames:
+              - seaweedfs-db
+      - contains:
+          path: rules
+          content:
+            apiGroups: [""]
+            resources: ["secrets"]
+            verbs: ["get", "delete"]
+            resourceNames:
+              - seaweedfs-s3-ingress-tls
+              - seaweedfs-system-admin-cert
+              - seaweedfs-system-ca-cert
+              - seaweedfs-system-client-cert
+              - seaweedfs-system-filer-cert
+              - seaweedfs-system-master-cert
+              - seaweedfs-system-volume-cert
+              - seaweedfs-system-worker-cert
+              - seaweedfs-system-db-secret
+              - seaweedfs-admin-cert
+              - seaweedfs-ca-cert
+              - seaweedfs-client-cert
+              - seaweedfs-filer-cert
+              - seaweedfs-master-cert
+              - seaweedfs-volume-cert
+              - seaweedfs-worker-cert
+              - seaweedfs-db-secret
+
+  - it: binds the cleanup Role to the cleanup ServiceAccount
+    documentSelector:
+      path: kind
+      value: RoleBinding
+    asserts:
+      - equal:
+          path: metadata.annotations["helm.sh/hook-weight"]
+          value: "5"
+      - equal:
+          path: roleRef.name
+          value: seaweedfs-cleanup
+      - equal:
+          path: subjects[0].kind
+          value: ServiceAccount
+      - equal:
+          path: subjects[0].name
+          value: seaweedfs-cleanup
+
+  - it: renders a hardened cleanup Job with the right hook metadata
+    documentSelector:
+      path: kind
+      value: Job
+    asserts:
+      - equal:
+          path: metadata.name
+          value: seaweedfs-cleanup
+      - equal:
+          path: metadata.annotations["helm.sh/hook"]
+          value: post-delete
+      - equal:
+          path: metadata.annotations["helm.sh/hook-weight"]
+          value: "10"
+      - equal:
+          path: metadata.annotations["helm.sh/hook-delete-policy"]
+          value: before-hook-creation,hook-succeeded
+      - equal:
+          path: spec.activeDeadlineSeconds
+          value: 120
+      - equal:
+          path: spec.template.metadata.labels["policy.cozystack.io/allow-to-apiserver"]
+          value: "true"
+      - equal:
+          path: spec.template.spec.serviceAccountName
+          value: seaweedfs-cleanup
+      - equal:
+          path: spec.template.spec.containers[0].image
+          value: docker.io/clastix/kubectl:v1.32
+      - equal:
+          path: spec.template.spec.securityContext.runAsNonRoot
+          value: true
+      - equal:
+          path: spec.template.spec.securityContext.runAsUser
+          value: 65534
+      - equal:
+          path: spec.template.spec.securityContext.seccompProfile.type
+          value: RuntimeDefault
+      - equal:
+          path: spec.template.spec.containers[0].securityContext.readOnlyRootFilesystem
+          value: true
+      - equal:
+          path: spec.template.spec.containers[0].securityContext.allowPrivilegeEscalation
+          value: false
+      - contains:
+          path: spec.template.spec.containers[0].securityContext.capabilities.drop
+          content: ALL
+      - equal:
+          path: spec.template.spec.containers[0].resources.requests.cpu
+          value: 10m
+      - equal:
+          path: spec.template.spec.containers[0].resources.requests.memory
+          value: 64Mi
+      - equal:
+          path: spec.template.spec.containers[0].resources.limits.cpu
+          value: 200m
+      - equal:
+          path: spec.template.spec.containers[0].resources.limits.memory
+          value: 128Mi
+
+  - it: deletes volume PVCs by label and the named secrets in the cleanup command
+    documentSelector:
+      path: kind
+      value: Job
+    asserts:
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: 'kubectl delete pvc -n tenant-root -l app\.kubernetes\.io/name=seaweedfs,app\.kubernetes\.io/instance=seaweedfs-system --ignore-not-found --wait=false'
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: 'kubectl delete secret -n tenant-root seaweedfs-s3-ingress-tls seaweedfs-system-admin-cert seaweedfs-system-ca-cert seaweedfs-system-client-cert seaweedfs-system-filer-cert seaweedfs-system-master-cert seaweedfs-system-volume-cert seaweedfs-system-worker-cert seaweedfs-system-db-secret seaweedfs-admin-cert seaweedfs-ca-cert seaweedfs-client-cert seaweedfs-filer-cert seaweedfs-master-cert seaweedfs-volume-cert seaweedfs-worker-cert seaweedfs-db-secret --ignore-not-found --wait=false'
+      # The PVC selector must NOT filter by component: the volume StatefulSet sets
+      # app.kubernetes.io/component to volume / volume-<pool> / volume-<zone>[-<pool>]
+      # depending on topology, so a component clause would leave non-default pools and
+      # MultiZone PVCs orphaned (the leak this hook fixes).
+      - notMatchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: 'app\.kubernetes\.io/component='
+      # The filer-metadata database must be reclaimed too. Migration 43/53 stamps
+      # helm.sh/resource-policy=keep on the Cluster so a <name>-system upgrade
+      # cannot prune it (that prune destroys the tenant's S3 index), but keep is
+      # permanent and also survives the <name>-db release's own uninstall — so
+      # deleting the app would leave the Cluster, its Postgres pods and its PVCs
+      # with nothing owning them. The PVCs carry ownerReferences to the Cluster,
+      # so deleting it garbage-collects them; the label selector above does not
+      # match them (they are labelled cnpg.io/cluster=seaweedfs-db).
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: 'kubectl delete cluster\.postgresql\.cnpg\.io -n tenant-root seaweedfs-db --ignore-not-found --wait=false'
+      # The Cluster name is hardcoded `seaweedfs-db` for EVERY instance, so name
+      # alone is not ownership. Deleting on name would take a different SeaweedFS
+      # app's database (a Client shares another app's filer; a second Simple
+      # instance loses Helm's ownership race but still installs), and CNPG takes
+      # the PVC with it. The Job must re-check the owner annotation at run time.
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: 'REFUSING to delete Cluster/seaweedfs-db: owned by'
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: '\$owner" != "seaweedfs-db"'
+      # A failed reclaim must FAIL the Job: the Cluster is keep-protected, so
+      # nothing else reclaims it, and hook-delete-policy would drop the only
+      # cleanup Job. `|| echo` would swallow it into exit zero.
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: 'Failing so the Job retries.*\n.*exit 1|exit 1'
+      - notMatchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: 'delete cluster\.postgresql\.cnpg\.io[^|]*\|\| echo'
+      # Reading ownership must ALSO fail closed. `|| true` on the get would turn a
+      # Forbidden or timeout into an empty owner, take the "nothing to reclaim"
+      # branch, and orphan the keep-protected Cluster. Only a genuine NotFound is
+      # treated as absence; every other error aborts the Job.
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: 'failed to read Cluster/seaweedfs-db ownership'
+      - notMatchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: "release-name.}' 2>/dev/null \\|\\| true"
diff --git a/packages/extra/seaweedfs/tests/fullname_override_named_test.yaml b/packages/extra/seaweedfs/tests/fullname_override_named_test.yaml
new file mode 100644
index 0000000000..4a6465c3ab
--- /dev/null
+++ b/packages/extra/seaweedfs/tests/fullname_override_named_test.yaml
@@ -0,0 +1,190 @@
+suite: seaweedfs naming guard for a non-default instance name
+
+# SeaweedFS is a user-creatable kind, so an instance can run under a name other
+# than `seaweedfs`. Two things follow, and the guard has to get both right:
+#   - Before 4.31 the chart ignored the release name, so such an instance ALSO
+#     stored its data on the chart-named data1-seaweedfs-volume-* PVCs.
+#   - On 4.31 the fullname helper appends the chart name when the release name
+#     does not contain it, so a fresh 1.5.x `archive` wrote its data to
+#     data1-archive-system-seaweedfs-volume-*, NOT data1-archive-system-volume-*.
+#
+# The guard only runs when it can see the cluster (the release namespace is its
+# canary), so every provider registers v1/Namespace and includes the namespace.
+
+templates:
+  - templates/seaweedfs.yaml
+
+release:
+  name: archive
+  namespace: tenant-root
+
+set: &values
+  topology: Simple
+  replicationFactor: 2
+  _namespace:
+    host: example.org
+    ingress: tenant-root
+  _cluster:
+    issuer-name: letsencrypt-prod
+    solver: http01
+
+tests:
+  - it: adopts a pre-4.31 instance whose data is on the chart-named PVCs
+    set: *values
+    kubernetesProvider:
+      scheme: &scheme
+        "v1/Namespace":
+          gvr:
+            group: ""
+            version: "v1"
+            resource: "namespaces"
+          namespaced: false
+        "v1/PersistentVolumeClaim":
+          gvr:
+            group: ""
+            version: "v1"
+            resource: "persistentvolumeclaims"
+          namespaced: true
+        "apps/v1/StatefulSet":
+          gvr:
+            group: "apps"
+            version: "v1"
+            resource: "statefulsets"
+          namespaced: true
+      objects:
+        - &ns
+          kind: Namespace
+          apiVersion: v1
+          metadata:
+            name: tenant-root
+        - kind: PersistentVolumeClaim
+          apiVersion: v1
+          metadata:
+            name: data1-seaweedfs-volume-0
+            namespace: tenant-root
+            creationTimestamp: "2025-11-02T10:00:00Z"
+        - kind: StatefulSet
+          apiVersion: apps/v1
+          metadata:
+            name: unrelated-app
+            namespace: tenant-root
+    documentSelector:
+      path: kind
+      value: HelmRelease
+    asserts:
+      - equal:
+          path: metadata.name
+          value: archive-system
+
+  - it: refuses to render when this release's data is on its renamed volumes
+    set: *values
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - *ns
+        - kind: PersistentVolumeClaim
+          apiVersion: v1
+          metadata:
+            name: data1-archive-system-seaweedfs-volume-0
+            namespace: tenant-root
+            creationTimestamp: "2026-06-20T07:01:59Z"
+        - kind: StatefulSet
+          apiVersion: apps/v1
+          metadata:
+            name: unrelated-app
+            namespace: tenant-root
+    asserts:
+      - failedTemplate:
+          errorPattern: "SeaweedFS archive in namespace tenant-root keeps its data on volumes named after the Helm release"
+
+  - it: refuses when both generations exist (was S-damaged)
+    set: *values
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - *ns
+        # A fresh-1.5.x `archive` that an unguarded upgrade already damaged: the
+        # renamed volumes are older (the data was born there) and the chart-named
+        # set is the newer, empty one. Must be S (Step 2a), never D-split.
+        - kind: PersistentVolumeClaim
+          apiVersion: v1
+          metadata:
+            name: data1-archive-system-seaweedfs-volume-0
+            namespace: tenant-root
+            creationTimestamp: "2026-06-20T07:01:59Z"
+        - kind: PersistentVolumeClaim
+          apiVersion: v1
+          metadata:
+            name: data1-seaweedfs-volume-0
+            namespace: tenant-root
+            creationTimestamp: "2026-06-20T08:28:58Z"
+        - kind: StatefulSet
+          apiVersion: apps/v1
+          metadata:
+            name: archive-system-seaweedfs-volume
+            namespace: tenant-root
+            labels:
+              app.kubernetes.io/name: seaweedfs
+          status:
+            readyReplicas: "1"
+    asserts:
+      - failedTemplate:
+          errorPattern: "has BOTH naming generations present"
+
+  - it: catches a long instance name whose renamed workloads the chart truncated
+    # Instance `archive-of-quarterly-financial-statements-x1` -> child release
+    # archive-of-quarterly-financial-statements-x1-system -> the fullname gains
+    # `-seaweedfs` (the release name does not contain it) and is 61 chars, so
+    # componentName cuts it to 56 before appending `-volume`: the chart name is gone
+    # from the tail and both the workload and its claims read
+    # ...-x1-system-seaw-volume. A `contains "seaweedfs"` name filter cannot see
+    # either of them; the reconstructed prefix matches both exactly.
+    release:
+      name: archive-of-quarterly-financial-statements-x1
+      namespace: tenant-root
+    set: *values
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - *ns
+        - kind: StatefulSet
+          apiVersion: apps/v1
+          metadata:
+            name: archive-of-quarterly-financial-statements-x1-system-seaw-volume
+            namespace: tenant-root
+            labels:
+              app.kubernetes.io/name: seaweedfs
+        - kind: PersistentVolumeClaim
+          apiVersion: v1
+          metadata:
+            name: data1-archive-of-quarterly-financial-statements-x1-system-seaw-volume-0
+            namespace: tenant-root
+    asserts:
+      - failedTemplate:
+          errorPattern: "keeps its data on volumes named after the Helm release"
+
+  - it: ignores an unrelated data1-*-volume-* PVC belonging to another app
+    set: *values
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - *ns
+        - kind: PersistentVolumeClaim
+          apiVersion: v1
+          metadata:
+            name: data1-clickhouse-volume-0
+            namespace: tenant-root
+        - kind: StatefulSet
+          apiVersion: apps/v1
+          metadata:
+            name: clickhouse-volume
+            namespace: tenant-root
+            labels:
+              app.kubernetes.io/name: clickhouse
+    documentSelector:
+      path: kind
+      value: HelmRelease
+    asserts:
+      - equal:
+          path: metadata.name
+          value: archive-system
diff --git a/packages/extra/seaweedfs/tests/fullname_override_test.yaml b/packages/extra/seaweedfs/tests/fullname_override_test.yaml
new file mode 100644
index 0000000000..590a9cf6f2
--- /dev/null
+++ b/packages/extra/seaweedfs/tests/fullname_override_test.yaml
@@ -0,0 +1,329 @@
+suite: seaweedfs legacy-naming guard
+
+# system/seaweedfs pins the chart-based name, so workloads keep their pre-4.31
+# names (`seaweedfs-master`, `data1-seaweedfs-volume-N`) and an upgrade past the
+# 4.31 rename adopts the running set in place.
+#
+# Any tenant with BOTH naming generations present stops the render instead of
+# adopting — which set is the empty duplicate cannot be told from inside a render,
+# so the guard refuses and sends the operator to classify. The recovery path
+# differs by case: a tenant an unguarded upgrade already damaged (the renamed
+# volumes are OLDER — the data was born there and the chart-named set is the empty
+# one → Step 2a + Step 2), and a D-split tenant (the legacy volumes are older AND
+# the renamed volume servers are live → reconcile the split, Step 3). A duplicate
+# that never served (D-wedged, zero ready replicas) is refused the same way:
+# readyReplicas is a snapshot, not proof it never served, so it is indistinguishable
+# from D-split and cannot be adopted blind. A tenant installed FRESH on 1.5.x (only
+# the renamed volumes exist, no second generation) is refused separately → PV
+# re-bind, Step 2.
+#
+# The guard only runs when it can see the cluster: the release namespace is its
+# canary. Every test that exercises classification therefore registers
+# v1/Namespace and provides the release namespace object; the fail-closed
+# behaviour of the canary itself is covered in guard_fail_closed_test.yaml.
+#
+# Two helm-unittest quirks the mocks work around:
+#   - The template GETs the namespace and LISTs both PVCs and StatefulSets, so
+#     every mocked provider must register all three kinds — a fake client errors
+#     on an unregistered kind rather than returning empty.
+#   - status.readyReplicas is quoted ("1"/"0"): the fake client cannot deep-copy
+#     a bare Go int in a mocked object's status, and the template's `int` coerces
+#     the string back either way.
+
+templates:
+  - templates/seaweedfs.yaml
+
+release:
+  name: seaweedfs
+  namespace: tenant-root
+
+set: &values
+  topology: Simple
+  replicationFactor: 2
+  _namespace:
+    host: example.org
+    ingress: tenant-root
+  _cluster:
+    issuer-name: letsencrypt-prod
+    solver: http01
+
+tests:
+  - it: renders for a net-new install (no SeaweedFS data in the namespace)
+    set: *values
+    kubernetesProvider:
+      scheme: &scheme
+        "v1/Namespace":
+          gvr:
+            group: ""
+            version: "v1"
+            resource: "namespaces"
+          namespaced: false
+        "v1/PersistentVolumeClaim":
+          gvr:
+            group: ""
+            version: "v1"
+            resource: "persistentvolumeclaims"
+          namespaced: true
+        "apps/v1/StatefulSet":
+          gvr:
+            group: "apps"
+            version: "v1"
+            resource: "statefulsets"
+          namespaced: true
+      objects:
+        - &ns
+          kind: Namespace
+          apiVersion: v1
+          metadata:
+            name: tenant-root
+        - kind: PersistentVolumeClaim
+          apiVersion: v1
+          metadata:
+            name: unrelated-app-data-0
+            namespace: tenant-root
+        - kind: StatefulSet
+          apiVersion: apps/v1
+          metadata:
+            name: unrelated-app
+            namespace: tenant-root
+    documentSelector:
+      path: kind
+      value: HelmRelease
+    asserts:
+      - equal:
+          path: metadata.name
+          value: seaweedfs-system
+      # The chart-based name is pinned in system/seaweedfs values, not re-pinned here.
+      - notExists:
+          path: spec.values.seaweedfs.fullnameOverride
+
+  - it: renders for a cluster whose data is on the legacy seaweedfs-* PVCs
+    set: *values
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - *ns
+        - kind: PersistentVolumeClaim
+          apiVersion: v1
+          metadata:
+            name: data1-seaweedfs-volume-0
+            namespace: tenant-root
+            creationTimestamp: "2025-11-02T10:00:00Z"
+        - kind: PersistentVolumeClaim
+          apiVersion: v1
+          metadata:
+            name: unrelated-app-data-0
+            namespace: tenant-root
+        - kind: StatefulSet
+          apiVersion: apps/v1
+          metadata:
+            name: unrelated-app
+            namespace: tenant-root
+    documentSelector:
+      path: kind
+      value: HelmRelease
+    asserts:
+      - equal:
+          path: metadata.name
+          value: seaweedfs-system
+
+  # Was: "renders on a D-wedged cluster — adopts the legacy set". A duplicate
+  # reading zero ready replicas used to be treated as proof it never served, so
+  # this rendered through. readyReplicas is only a snapshot: a duplicate that
+  # crashed, was scaled down, or lost readiness AFTER serving writes looks
+  # identical, and adopting the legacy set would strand whatever it wrote. Both
+  # generations present is now refused regardless of liveness.
+  - it: refuses when both generations exist and the duplicate reads zero ready (was D-wedged, adopted)
+    set: *values
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - *ns
+        - kind: PersistentVolumeClaim
+          apiVersion: v1
+          metadata:
+            name: data1-seaweedfs-volume-0
+            namespace: tenant-root
+            creationTimestamp: "2025-11-02T10:00:00Z"
+        - kind: PersistentVolumeClaim
+          apiVersion: v1
+          metadata:
+            name: data1-seaweedfs-system-volume-0
+            namespace: tenant-root
+            creationTimestamp: "2026-06-20T12:00:00Z"
+        - kind: PersistentVolumeClaim
+          apiVersion: v1
+          metadata:
+            name: unrelated-app-data-0
+            namespace: tenant-root
+        - kind: StatefulSet
+          apiVersion: apps/v1
+          metadata:
+            name: seaweedfs-system-volume
+            namespace: tenant-root
+            labels:
+              app.kubernetes.io/name: seaweedfs
+          status:
+            readyReplicas: "0"
+    asserts:
+      - failedTemplate:
+          errorPattern: "has BOTH naming generations present"
+
+  - it: refuses when both generations exist and the duplicate is live (was D-split)
+    set: *values
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - *ns
+        - kind: PersistentVolumeClaim
+          apiVersion: v1
+          metadata:
+            name: data1-seaweedfs-volume-0
+            namespace: tenant-root
+            creationTimestamp: "2025-11-02T10:00:00Z"
+        - kind: PersistentVolumeClaim
+          apiVersion: v1
+          metadata:
+            name: data1-seaweedfs-system-volume-0
+            namespace: tenant-root
+            creationTimestamp: "2026-06-20T12:00:00Z"
+        # The duplicate volume set is live: it may hold objects written through
+        # the split endpoint, so adoption would strand them.
+        - kind: StatefulSet
+          apiVersion: apps/v1
+          metadata:
+            name: seaweedfs-system-volume
+            namespace: tenant-root
+            labels:
+              app.kubernetes.io/name: seaweedfs
+          status:
+            readyReplicas: "1"
+    asserts:
+      - failedTemplate:
+          errorPattern: "has BOTH naming generations present"
+
+  - it: refuses when both generations exist and the renamed volumes are older (was S-damaged)
+    set: *values
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - *ns
+        # Mirrors a fresh-1.5.x tenant that an unguarded 1.6 upgrade already hit:
+        # the data was born on the renamed volumes (older), and the upgrade
+        # created the chart-named set (newer, EMPTY). The renamed set is live —
+        # which a presence-only guard misreads as D-split, sending the operator
+        # to quiesce the set that holds all the data.
+        - kind: PersistentVolumeClaim
+          apiVersion: v1
+          metadata:
+            name: data1-seaweedfs-system-volume-0
+            namespace: tenant-root
+            creationTimestamp: "2026-06-20T07:01:59Z"
+        - kind: PersistentVolumeClaim
+          apiVersion: v1
+          metadata:
+            name: data1-seaweedfs-volume-0
+            namespace: tenant-root
+            creationTimestamp: "2026-06-20T08:28:58Z"
+        - kind: StatefulSet
+          apiVersion: apps/v1
+          metadata:
+            name: seaweedfs-system-volume
+            namespace: tenant-root
+            labels:
+              app.kubernetes.io/name: seaweedfs
+          status:
+            readyReplicas: "1"
+        - kind: StatefulSet
+          apiVersion: apps/v1
+          metadata:
+            name: seaweedfs-volume
+            namespace: tenant-root
+            labels:
+              app.kubernetes.io/name: seaweedfs
+          status:
+            readyReplicas: "0"
+    asserts:
+      - failedTemplate:
+          errorPattern: "has BOTH naming generations present"
+
+  - it: renders for a zoned legacy cluster (volume StatefulSets are per zone)
+    set: *values
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - *ns
+        - kind: PersistentVolumeClaim
+          apiVersion: v1
+          metadata:
+            name: data1-seaweedfs-volume-zone-a-0
+            namespace: tenant-root
+            creationTimestamp: "2025-11-02T10:00:00Z"
+        - kind: PersistentVolumeClaim
+          apiVersion: v1
+          metadata:
+            name: unrelated-app-data-0
+            namespace: tenant-root
+        - kind: StatefulSet
+          apiVersion: apps/v1
+          metadata:
+            name: unrelated-app
+            namespace: tenant-root
+    documentSelector:
+      path: kind
+      value: HelmRelease
+    asserts:
+      - equal:
+          path: metadata.name
+          value: seaweedfs-system
+
+  - it: refuses to render when the data lives only on seaweedfs-system-* PVCs
+    set: *values
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - *ns
+        - kind: PersistentVolumeClaim
+          apiVersion: v1
+          metadata:
+            name: data1-seaweedfs-system-volume-0
+            namespace: tenant-root
+            creationTimestamp: "2026-06-20T07:01:59Z"
+        - kind: StatefulSet
+          apiVersion: apps/v1
+          metadata:
+            name: unrelated-app
+            namespace: tenant-root
+    asserts:
+      - failedTemplate:
+          errorPattern: "keeps its data on volumes named after the Helm release.*Re-bind"
+
+  - it: refuses to render on a seaweedfs-system-* cluster detected by its StatefulSet
+    set: *values
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - *ns
+        # No volume PVCs are visible at all (e.g. not provisioned yet, or a long
+        # name truncated the chart name out of them); the renamed StatefulSet
+        # alone is enough to refuse.
+        - kind: StatefulSet
+          apiVersion: apps/v1
+          metadata:
+            name: seaweedfs-system-volume
+            namespace: tenant-root
+            labels:
+              app.kubernetes.io/name: seaweedfs
+        - kind: PersistentVolumeClaim
+          apiVersion: v1
+          metadata:
+            name: unrelated-app-data-0
+            namespace: tenant-root
+        - kind: StatefulSet
+          apiVersion: apps/v1
+          metadata:
+            name: unrelated-app
+            namespace: tenant-root
+    asserts:
+      - failedTemplate:
+          errorPattern: "keeps its data on volumes named after the Helm release"
diff --git a/packages/extra/seaweedfs/tests/guard_fail_closed_test.yaml b/packages/extra/seaweedfs/tests/guard_fail_closed_test.yaml
new file mode 100644
index 0000000000..3234d3e95e
--- /dev/null
+++ b/packages/extra/seaweedfs/tests/guard_fail_closed_test.yaml
@@ -0,0 +1,42 @@
+suite: seaweedfs naming guard skips cleanly without a cluster view
+
+# The guard classifies a tenant by looking up its PVCs and StatefulSets. A
+# failed API call already aborts the render (Helm propagates lookup errors),
+# but a CLIENT-SIDE render (helm template, --dry-run=client) silently returns
+# nothing — which, unguarded, would render the chart-based names over a class-S
+# tenant. The release namespace is the canary: it always exists for a real
+# install or upgrade, so when it cannot be seen, an UPGRADE refuses rather than
+# classify blind, while an install without cluster access (CI lint, unittest
+# with no provider — this test) skips the guard: it never touches live data.
+#
+# The refusal branch cannot be modelled here: helm-unittest 1.0.3 ignores
+# release.isUpgrade (.Release.IsUpgrade renders false regardless). Verify it
+# with a real renderer instead:
+#   helm template packages/extra/seaweedfs --is-upgrade ... 2>&1 \
+#     | grep 'refusing to upgrade blind'
+
+templates:
+  - templates/seaweedfs.yaml
+
+release:
+  name: seaweedfs
+  namespace: tenant-root
+
+tests:
+  - it: still renders a client-side install (no cluster view, no data at risk)
+    set:
+      topology: Simple
+      replicationFactor: 2
+      _namespace:
+        host: example.org
+        ingress: tenant-root
+      _cluster:
+        issuer-name: letsencrypt-prod
+        solver: http01
+    documentSelector:
+      path: kind
+      value: HelmRelease
+    asserts:
+      - equal:
+          path: metadata.name
+          value: seaweedfs-system
diff --git a/packages/extra/seaweedfs/tests/host_guard_cosi_test.yaml b/packages/extra/seaweedfs/tests/host_guard_cosi_test.yaml
new file mode 100644
index 0000000000..0ed1f95e6f
--- /dev/null
+++ b/packages/extra/seaweedfs/tests/host_guard_cosi_test.yaml
@@ -0,0 +1,37 @@
+suite: seaweedfs COSI deployment guards an empty apex in isolation
+templates:
+  - templates/client/cosi-deployment.yaml
+
+release:
+  name: seaweedfs
+  namespace: tenant-root
+
+tests:
+  - it: fails when topology is Client and the apex is empty with no host override
+    set:
+      topology: Client
+      _namespace:
+        host: ""
+        ingress: tenant-root
+      filer:
+        grpcHost: seaweedfs-filer
+        grpcPort: 18888
+    asserts:
+      - failedTemplate:
+          errorMessage: "the tenant apex (_namespace.host) is empty and this app sets no host override, so its ingress hostname would be malformed. Set tenant.spec.host on this tenant, inherit it from a parent that has host set, or set this app's host value."
+
+  - it: renders the S3 endpoint from the apex when it is set
+    set:
+      topology: Client
+      _namespace:
+        host: example.org
+        ingress: tenant-root
+      filer:
+        grpcHost: seaweedfs-filer
+        grpcPort: 18888
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: ENDPOINT
+            value: https://s3.example.org
diff --git a/packages/extra/seaweedfs/tests/host_guard_test.yaml b/packages/extra/seaweedfs/tests/host_guard_test.yaml
new file mode 100644
index 0000000000..d77aa13069
--- /dev/null
+++ b/packages/extra/seaweedfs/tests/host_guard_test.yaml
@@ -0,0 +1,44 @@
+suite: seaweedfs S3 endpoint fails on an empty apex
+
+templates:
+  - templates/seaweedfs.yaml
+
+release:
+  name: seaweedfs
+  namespace: tenant-root
+
+# The S3 endpoint is s3.<_namespace.host> on the non-Client topology path.
+# cozy-lib.ns-host-required guards the apex, so an empty apex fails the render.
+
+tests:
+  - it: fails when the apex is empty and no host override
+    set:
+      topology: Simple
+      replicationFactor: 2
+      _namespace:
+        host: ""
+        ingress: tenant-root
+      _cluster:
+        issuer-name: letsencrypt-prod
+        solver: http01
+    asserts:
+      - failedTemplate:
+          errorMessage: "the tenant apex (_namespace.host) is empty and this app sets no host override, so its ingress hostname would be malformed. Set tenant.spec.host on this tenant, inherit it from a parent that has host set, or set this app's host value."
+
+  - it: renders the HelmRelease when the apex is set
+    documentSelector:
+      path: kind
+      value: HelmRelease
+    set:
+      topology: Simple
+      replicationFactor: 2
+      _namespace:
+        host: example.org
+        ingress: tenant-root
+      _cluster:
+        issuer-name: letsencrypt-prod
+        solver: http01
+    asserts:
+      - equal:
+          path: kind
+          value: HelmRelease
diff --git a/packages/extra/seaweedfs/tests/ingress_wildcard_test.yaml b/packages/extra/seaweedfs/tests/ingress_wildcard_test.yaml
new file mode 100644
index 0000000000..5bcde9625e
--- /dev/null
+++ b/packages/extra/seaweedfs/tests/ingress_wildcard_test.yaml
@@ -0,0 +1,60 @@
+suite: seaweedfs S3 ingress wildcard mode drops per-host ACME
+templates:
+  - templates/seaweedfs.yaml
+
+release:
+  name: seaweedfs
+  namespace: tenant-root
+
+# seaweedfs.yaml renders a HelmRelease whose values carry the inline
+# S3 ingress (spec.values.seaweedfs.s3.ingress). documentSelector
+# targets that HelmRelease (the template also emits WorkloadMonitor
+# docs). In wildcard mode the cert-manager + http01 annotations and the
+# per-host tls secretName are dropped (the tls section stays so the
+# HTTPS redirect keeps working against the default SSL certificate);
+# the other nginx annotations stay.
+
+tests:
+  - it: drops cert-manager annotation and tls secretName when wildcard secret is set
+    documentSelector:
+      path: kind
+      value: HelmRelease
+    set:
+      topology: Simple
+      replicationFactor: 2
+      _namespace:
+        host: example.org
+        ingress: tenant-root
+      _cluster:
+        issuer-name: letsencrypt-prod
+        solver: http01
+        wildcard-secret-name: wildcard-tls
+    asserts:
+      - notExists:
+          path: spec.values.seaweedfs.s3.ingress.annotations["cert-manager.io/cluster-issuer"]
+      - exists:
+          path: spec.values.seaweedfs.s3.ingress.tls
+      - notExists:
+          path: spec.values.seaweedfs.s3.ingress.tls[0].secretName
+      - exists:
+          path: spec.values.seaweedfs.s3.ingress.annotations["nginx.ingress.kubernetes.io/proxy-body-size"]
+
+  - it: keeps cert-manager annotation and tls secretName without wildcard secret
+    documentSelector:
+      path: kind
+      value: HelmRelease
+    set:
+      topology: Simple
+      replicationFactor: 2
+      _namespace:
+        host: example.org
+        ingress: tenant-root
+      _cluster:
+        issuer-name: letsencrypt-prod
+        solver: http01
+    asserts:
+      - equal:
+          path: spec.values.seaweedfs.s3.ingress.annotations["cert-manager.io/cluster-issuer"]
+          value: letsencrypt-prod
+      - exists:
+          path: spec.values.seaweedfs.s3.ingress.tls[0].secretName
diff --git a/packages/extra/seaweedfs/tests/master_volume_budget_test.yaml b/packages/extra/seaweedfs/tests/master_volume_budget_test.yaml
new file mode 100644
index 0000000000..b108dfe332
--- /dev/null
+++ b/packages/extra/seaweedfs/tests/master_volume_budget_test.yaml
@@ -0,0 +1,195 @@
+suite: seaweedfs master volume size limit reaches the data plane
+
+# This limit is one of the two numbers the bucket ceiling divides by, so it has
+# to arrive at the master or the ceiling is whatever the data-plane chart
+# defaults to. The arithmetic behind that is in
+# packages/system/seaweedfs/values.yaml, next to the pair it governs.
+# It is not reachable any other way: the system chart is pulled by
+# ExternalArtifact, and the component that publishes it declares no install
+# section, so a Package-level values override for it is dropped before any
+# merge.
+#
+# The overridden case matters as much as the default. Asserting only the
+# default passes just as well against a template that ignores the value and
+# writes the same number as a literal, which is the state this suite exists to
+# rule out.
+
+templates:
+  - templates/seaweedfs.yaml
+
+release:
+  name: seaweedfs
+  namespace: tenant-root
+
+tests:
+  - it: carries the default volume size limit to the master
+    set: &platform
+      _namespace:
+        host: example.org
+        ingress: tenant-root
+      _cluster:
+        issuer-name: letsencrypt-prod
+        solver: http01
+    documentSelector:
+      path: metadata.name
+      value: seaweedfs-system
+    asserts:
+      - equal:
+          path: spec.values.seaweedfs.master.volumeSizeLimitMB
+          value: 400
+
+  - it: carries an operator's volume size limit to the master
+    set:
+      <<: *platform
+      master:
+        volumeSizeLimitMB: 2000
+    documentSelector:
+      path: metadata.name
+      value: seaweedfs-system
+    asserts:
+      - equal:
+          path: spec.values.seaweedfs.master.volumeSizeLimitMB
+          value: 2000
+
+  # The operator doc says the free-space reserve on the shipped volume is at
+  # least one limit, because a 10Gi PVC clears the 8000 MiB of filesystem that
+  # takes at a limit of 400. Nothing else pins that default, so changing it
+  # would leave the sentence wrong with no test to say so.
+  - it: ships a 10Gi volume by default, the size the reserve claim is made for
+    set: *platform
+    documentSelector:
+      path: metadata.name
+      value: seaweedfs-system
+    asserts:
+      - equal:
+          path: spec.values.seaweedfs.volume.dataDirs[0].size
+          value: "10Gi"
+
+  # The divisor is only half the arithmetic: the volume server derives a slot
+  # count at all because its -max is zero, and this template writes that zero
+  # into dataDirs on every release. dataDirs is a list, so Helm replaces the
+  # data-plane chart's copy wholesale and this literal is what installs run.
+  # Losing it is a silent capacity regression rather than a render error: the
+  # server falls back to the subchart's fixed 7, and no other case in either
+  # suite notices.
+  #
+  # The template writes the same literal at four sites, one per render path:
+  # the default volume, a pool, a zone, and a pool inside a zone. All four are
+  # covered, here and in the MultiZone case at the end.
+  - it: keeps the volume server slot count auto-derived on every release
+    set: *platform
+    documentSelector:
+      path: metadata.name
+      value: seaweedfs-system
+    asserts:
+      - equal:
+          path: spec.values.seaweedfs.volume.dataDirs[0].maxVolumes
+          value: 0
+
+  - it: keeps the slot count auto-derived for a storage pool too
+    set:
+      <<: *platform
+      volume:
+        pools:
+          fast:
+            diskType: ssd
+    documentSelector:
+      path: metadata.name
+      value: seaweedfs-system
+    asserts:
+      - equal:
+          path: spec.values.seaweedfs.volumes.fast.dataDirs[0].maxVolumes
+          value: 0
+
+  # Both ends of the range take an instance down, so the values schema refuses
+  # them. Zero turns the slot calculation off, so nothing is grown and every
+  # write fails. Past 30000 the master refuses to start, so the instance never
+  # comes up at all. The refusals match the field and the keyword only: the
+  # numbers in the message are formatted by the schema library, and where each
+  # edge sits is pinned by the accepting cases below them.
+  - it: refuses a volume size limit of zero
+    set:
+      <<: *platform
+      master:
+        volumeSizeLimitMB: 0
+    asserts:
+      - failedTemplate:
+          errorPattern: "/master/volumeSizeLimitMB': minimum:"
+
+  - it: refuses a volume size limit past what the master accepts
+    set:
+      <<: *platform
+      master:
+        volumeSizeLimitMB: 30001
+    asserts:
+      - failedTemplate:
+          errorPattern: "/master/volumeSizeLimitMB': maximum:"
+
+  # An explicit null never reaches the schema: Helm drops the key first, so
+  # the bounds above pass it, and without a refusal here the master is started
+  # with an empty -volumeSizeLimitMB= and exits on it.
+  - it: refuses an explicit null volume size limit
+    set:
+      <<: *platform
+      master:
+        volumeSizeLimitMB: null
+    asserts:
+      - failedTemplate:
+          errorPattern: "master.volumeSizeLimitMB must be set"
+
+  - it: allows the largest volume size limit the master accepts
+    set:
+      <<: *platform
+      master:
+        volumeSizeLimitMB: 30000
+    documentSelector:
+      path: metadata.name
+      value: seaweedfs-system
+    asserts:
+      - equal:
+          path: spec.values.seaweedfs.master.volumeSizeLimitMB
+          value: 30000
+
+  # The refusal above pins where the schema starts saying no, this pins where it
+  # has to keep saying yes. Without it the lower bound can drift upward — a
+  # `@minimum` raised to 2 refuses the smallest legal value and every other
+  # case here stays green.
+  - it: allows the smallest volume size limit the master accepts
+    set:
+      <<: *platform
+      master:
+        volumeSizeLimitMB: 1
+    documentSelector:
+      path: metadata.name
+      value: seaweedfs-system
+    asserts:
+      - equal:
+          path: spec.values.seaweedfs.master.volumeSizeLimitMB
+          value: 1
+
+  # MultiZone renders its own dataDirs per zone, and per pool within a zone, so
+  # the zero has four sites in this template rather than two. replicationFactor
+  # has to come down to the zone count, which the preflight enforces.
+  - it: keeps the slot count auto-derived for a zone and a pool inside it
+    set:
+      <<: *platform
+      topology: MultiZone
+      replicationFactor: 1
+      volume:
+        zones:
+          east:
+            replicas: 2
+            size: 10Gi
+            pools:
+              fast:
+                diskType: ssd
+    documentSelector:
+      path: metadata.name
+      value: seaweedfs-system
+    asserts:
+      - equal:
+          path: spec.values.seaweedfs.volumes.east.dataDirs[0].maxVolumes
+          value: 0
+      - equal:
+          path: spec.values.seaweedfs.volumes.east-fast.dataDirs[0].maxVolumes
+          value: 0
diff --git a/packages/extra/seaweedfs/values.schema.json b/packages/extra/seaweedfs/values.schema.json
index 9ce047d1ce..ab9b953ace 100644
--- a/packages/extra/seaweedfs/values.schema.json
+++ b/packages/extra/seaweedfs/values.schema.json
@@ -236,6 +236,13 @@
             "xlarge",
             "2xlarge"
           ]
+        },
+        "volumeSizeLimitMB": {
+          "description": "Size in MB at which a volume stops taking writes, and the divisor that sets how many buckets a volume server can serve. Lower it to fit more buckets on the same disk, at the cost of more volume files for the same stored data; on a large volume it is worth raising instead. Changing it on an instance that already holds data costs something either way: lowering it stops writes to every bucket whose volumes all reach the new value until that bucket can grow, and raising it takes the room new buckets grow into, so run the check in docs/operations/seaweedfs-lowering-the-volume-size-limit.md first. Must be between 1 and 30000. A value close to or above `volume.size` leaves each volume server a single slot rather than failing, since the server floors its slot count at one.",
+          "type": "integer",
+          "default": 400,
+          "maximum": 30000,
+          "minimum": 1
         }
       }
     },
diff --git a/packages/extra/seaweedfs/values.yaml b/packages/extra/seaweedfs/values.yaml
index 71934780f1..0aa569bc47 100644
--- a/packages/extra/seaweedfs/values.yaml
+++ b/packages/extra/seaweedfs/values.yaml
@@ -92,12 +92,34 @@ db:
 ## @field {int} [replicas] - Number of master replicas.
 ## @field {Resources} [resources] - Explicit CPU and memory configuration. When omitted, the preset defined in `resourcesPreset` is applied.
 ## @field {ResourcesPreset} [resourcesPreset] - Default sizing preset used when `resources` is omitted.
+## @field {int} [volumeSizeLimitMB] - Size in MB at which a volume stops taking writes, and the divisor that sets how many buckets a volume server can serve. Lower it to fit more buckets on the same disk, at the cost of more volume files for the same stored data; on a large volume it is worth raising instead. Changing it on an instance that already holds data costs something either way: lowering it stops writes to every bucket whose volumes all reach the new value until that bucket can grow, and raising it takes the room new buckets grow into, so run the check in docs/operations/seaweedfs-lowering-the-volume-size-limit.md first. Must be between 1 and 30000. A value close to or above `volume.size` leaves each volume server a single slot rather than failing, since the server floors its slot count at one.
+## @minimum 1
+## @maximum 30000
 
 ## @param {Master} [master] - Master service configuration.
 master:
   replicas: 3
   resources: {}
   resourcesPreset: "t1.small"
+  # The size limit a new instance starts with; on a variant that runs platform
+  # migrations, migration 57 keeps every instance that predates it at 1000
+  # unless its limit was already set or its master is not an object. The
+  # template sends it on every release, so it wins over the data-plane chart's
+  # value, which is only a fallback and stays at upstream's 1000 for the reason
+  # given beside it. Why the number is 400, and the growth count it multiplies
+  # against, are in packages/system/seaweedfs/values.yaml; the pin in this
+  # chart's suite moves with this value and nothing moves that reasoning with
+  # it, so change both or neither. What changing it costs an instance that
+  # already holds data is in
+  # docs/operations/seaweedfs-lowering-the-volume-size-limit.md.
+  #
+  # The bounds on the field are where the instance stops working rather than
+  # a preference. Zero is not a small limit but an off switch: the volume
+  # server leaves its slot calculation untouched, reports no capacity, and
+  # nothing is grown. Above 30000 the master exits at start; that ceiling is
+  # VolumeSizeLimitGB in the standard SeaweedFS build the image carries, and a
+  # large-disk build raises it, so read that constant there before widening.
+  volumeSizeLimitMB: 400
 
 ## @typedef {struct} Filer - Filer service configuration.
 ## @field {int} [replicas] - Number of filer replicas.
diff --git a/packages/library/cozy-lib/templates/_barman.tpl b/packages/library/cozy-lib/templates/_barman.tpl
new file mode 100644
index 0000000000..c37b9673f7
--- /dev/null
+++ b/packages/library/cozy-lib/templates/_barman.tpl
@@ -0,0 +1,46 @@
+{{- /*
+cozy-lib.barman.sidecarConfiguration renders a barman-cloud ObjectStore
+`spec.instanceSidecarConfiguration` shared by every chart that enables the
+plugin. It carries the two settings the sidecar cannot get right on its own.
+
+Resources: the plugin injects the sidecar with no resources, and what that
+means depends on the namespace. A tenant with resourceQuotas set carries a
+LimitRange (packages/apps/tenant/templates/quota.yaml) that defaults every
+container to 128Mi; the sidecar is OOMKilled mid-backup under it, leaving the
+ObjectStore healthy and the backup failed. Measured cgroup high-water mark on a
+38 MB database is 254 MiB, so 128Mi cannot hold it. A namespace without a
+LimitRange, which is cozy-keycloak and any tenant that leaves resourceQuotas
+empty, gave the sidecar no requests and no limit at all, so nothing reserved
+memory for it and nothing bounded it. The same request and limit settle both:
+256Mi holds the measured working set and 1Gi is four times the measurement.
+No CPU limit is set, matching the entityOperator precedent in
+packages/apps/kafka: a throttled sidecar stalls WAL archiving instead of
+failing it. Inside a tenant the limit counts against the ResourceQuota
+limits.memory budget, 1Gi per instance pod.
+
+Checksum: since botocore ~1.36 (early 2025) the default
+RequestChecksumCalculation is when_supported, which attaches a flexible checksum
+(the x-amz-content-sha256 header) to every PutObject. Non-AWS S3-compatible
+backends (Ceph RADOS Gateway, the platform's own SeaweedFS system bucket, some
+MinIO/Cloudflare R2 builds) reject it with "InvalidArgument:
+x-amz-content-sha256 must be UNSIGNED-PAYLOAD, ...", so every backup/WAL-archive
+upload fails against them. when_required computes a checksum only when the
+operation mandates one; AWS S3 accepts that on a plain PutObject too, so it is a
+safe default everywhere.
+
+Emit under an ObjectStore `spec:` with `{{- include "cozy-lib.barman.sidecarConfiguration" . | nindent 2 }}`.
+The Go-driven platform (useSystemBucket=true) ObjectStore sets the same fields in
+internal/backupcontroller/cnpgstrategy_controller.go (barmanSidecarConfiguration).
+*/ -}}
+{{- define "cozy-lib.barman.sidecarConfiguration" -}}
+instanceSidecarConfiguration:
+  resources:
+    requests:
+      cpu: 100m
+      memory: 256Mi
+    limits:
+      memory: 1Gi
+  env:
+    - name: AWS_REQUEST_CHECKSUM_CALCULATION
+      value: when_required
+{{- end -}}
diff --git a/packages/library/cozy-lib/templates/_cozyconfig.tpl b/packages/library/cozy-lib/templates/_cozyconfig.tpl
index 648b26175a..0ba92a655d 100644
--- a/packages/library/cozy-lib/templates/_cozyconfig.tpl
+++ b/packages/library/cozy-lib/templates/_cozyconfig.tpl
@@ -8,7 +8,7 @@ Get the root host for the cluster.
 Usage: {{ include "cozy-lib.root-host" . }}
 */}}
 {{- define "cozy-lib.root-host" -}}
-{{- (index .Values._cluster "root-host") | default "" }}
+{{- (index (.Values._cluster | default dict) "root-host") | default "" }}
 {{- end }}
 
 {{/*
@@ -16,7 +16,7 @@ Get the bundle name for the cluster.
 Usage: {{ include "cozy-lib.bundle-name" . }}
 */}}
 {{- define "cozy-lib.bundle-name" -}}
-{{- (index .Values._cluster "bundle-name") | default "" }}
+{{- (index (.Values._cluster | default dict) "bundle-name") | default "" }}
 {{- end }}
 
 {{/*
@@ -24,7 +24,28 @@ Get the images registry.
 Usage: {{ include "cozy-lib.images-registry" . }}
 */}}
 {{- define "cozy-lib.images-registry" -}}
-{{- (index .Values._cluster "images-registry") | default "" }}
+{{- (index (.Values._cluster | default dict) "images-registry") | default "" }}
+{{- end }}
+
+{{/*
+Build a fully-qualified image reference routed through the cluster images
+registry. Pass the registry-relative image path (repository + tag, ideally
+digest-pinned) and the global context.
+Usage: {{ include "cozy-lib.image" (list "clastix/kubectl:v1.32@sha256:..." $) }}
+When images-registry is set (mirrored / air-gapped installs) it is prefixed as
+"<registry>/<image>"; when empty (the default on a standard install) the image
+is returned unchanged so it resolves from its default registry — importantly
+with no leading "/", which would otherwise be an invalid reference.
+A trailing "/" on the registry and a leading "/" on the image path are trimmed
+so a misconfigured images-registry ("registry.example.com/") cannot produce a
+double slash in the rendered reference.
+*/}}
+{{- define "cozy-lib.image" -}}
+{{- include "cozy-lib.checkInput" . }}
+{{- $image := index . 0 | trimPrefix "/" }}
+{{- $ctx := index . 1 }}
+{{- $registry := include "cozy-lib.images-registry" $ctx | trimSuffix "/" }}
+{{- with $registry }}{{ . }}/{{ end }}{{ $image }}
 {{- end }}
 
 {{/*
@@ -32,7 +53,7 @@ Get the ipv4 cluster CIDR.
 Usage: {{ include "cozy-lib.ipv4-cluster-cidr" . }}
 */}}
 {{- define "cozy-lib.ipv4-cluster-cidr" -}}
-{{- (index .Values._cluster "ipv4-cluster-cidr") | default "" }}
+{{- (index (.Values._cluster | default dict) "ipv4-cluster-cidr") | default "" }}
 {{- end }}
 
 {{/*
@@ -40,7 +61,7 @@ Get the ipv4 service CIDR.
 Usage: {{ include "cozy-lib.ipv4-service-cidr" . }}
 */}}
 {{- define "cozy-lib.ipv4-service-cidr" -}}
-{{- (index .Values._cluster "ipv4-service-cidr") | default "" }}
+{{- (index (.Values._cluster | default dict) "ipv4-service-cidr") | default "" }}
 {{- end }}
 
 {{/*
@@ -48,7 +69,7 @@ Get the ipv4 join CIDR.
 Usage: {{ include "cozy-lib.ipv4-join-cidr" . }}
 */}}
 {{- define "cozy-lib.ipv4-join-cidr" -}}
-{{- (index .Values._cluster "ipv4-join-cidr") | default "" }}
+{{- (index (.Values._cluster | default dict) "ipv4-join-cidr") | default "" }}
 {{- end }}
 
 {{/*
@@ -57,8 +78,9 @@ Usage: {{ include "cozy-lib.scheduling" . }}
 Returns: YAML string of scheduling configuration
 */}}
 {{- define "cozy-lib.scheduling" -}}
-{{- if .Values._cluster.scheduling }}
-{{- .Values._cluster.scheduling | toYaml }}
+{{- $scheduling := (.Values._cluster | default dict).scheduling }}
+{{- if $scheduling }}
+{{- $scheduling | toYaml }}
 {{- end }}
 {{- end }}
 
@@ -68,8 +90,9 @@ Usage: {{ include "cozy-lib.branding" . }}
 Returns: YAML string of branding configuration
 */}}
 {{- define "cozy-lib.branding" -}}
-{{- if .Values._cluster.branding }}
-{{- .Values._cluster.branding | toYaml }}
+{{- $branding := (.Values._cluster | default dict).branding }}
+{{- if $branding }}
+{{- $branding | toYaml }}
 {{- end }}
 {{- end }}
 
@@ -83,7 +106,31 @@ Get the host for this namespace.
 Usage: {{ include "cozy-lib.ns-host" . }}
 */}}
 {{- define "cozy-lib.ns-host" -}}
-{{- .Values._namespace.host | default "" }}
+{{- (.Values._namespace | default dict).host | default "" }}
+{{- end }}
+
+{{/*
+Get the host for this namespace, requiring a usable apex.
+Returns the same value as cozy-lib.ns-host, but fails the render when
+the platform has injected _namespace and its host is empty AND this app
+sets no host override (.Values.host), instead of silently composing a
+malformed "<sub>." hostname into an Ingress, HTTPRoute or Certificate
+dnsName. The guard is scoped to the injected state on purpose: a
+standalone render (helm lint / helm template with no _namespace) has no
+apex by design and must stay renderable, so an absent _namespace never
+fails. Call it only at a site that actually emits a hostname, so a
+tenant with no apex and no public exposure is unaffected. This mirrors
+the gateway path (packages/extra/gateway/templates/tenantgateway.yaml),
+which fails on an empty apex only when a Gateway is actually rendered.
+Usage: {{ include "cozy-lib.ns-host-required" . }}
+*/}}
+{{- define "cozy-lib.ns-host-required" -}}
+{{- $ns := .Values._namespace -}}
+{{- $apex := ($ns | default dict).host | default "" -}}
+{{- if and $ns (not (.Values.host | default "")) (not $apex) -}}
+{{- fail "the tenant apex (_namespace.host) is empty and this app sets no host override, so its ingress hostname would be malformed. Set tenant.spec.host on this tenant, inherit it from a parent that has host set, or set this app's host value." -}}
+{{- end -}}
+{{- $apex -}}
 {{- end }}
 
 {{/*
@@ -91,7 +138,7 @@ Get the etcd namespace reference.
 Usage: {{ include "cozy-lib.ns-etcd" . }}
 */}}
 {{- define "cozy-lib.ns-etcd" -}}
-{{- .Values._namespace.etcd | default "" }}
+{{- (.Values._namespace | default dict).etcd | default "" }}
 {{- end }}
 
 {{/*
@@ -99,7 +146,7 @@ Get the ingress namespace reference.
 Usage: {{ include "cozy-lib.ns-ingress" . }}
 */}}
 {{- define "cozy-lib.ns-ingress" -}}
-{{- .Values._namespace.ingress | default "" }}
+{{- (.Values._namespace | default dict).ingress | default "" }}
 {{- end }}
 
 {{/*
@@ -107,7 +154,7 @@ Get the monitoring namespace reference.
 Usage: {{ include "cozy-lib.ns-monitoring" . }}
 */}}
 {{- define "cozy-lib.ns-monitoring" -}}
-{{- .Values._namespace.monitoring | default "" }}
+{{- (.Values._namespace | default dict).monitoring | default "" }}
 {{- end }}
 
 {{/*
@@ -115,7 +162,7 @@ Get the seaweedfs namespace reference.
 Usage: {{ include "cozy-lib.ns-seaweedfs" . }}
 */}}
 {{- define "cozy-lib.ns-seaweedfs" -}}
-{{- .Values._namespace.seaweedfs | default "" }}
+{{- (.Values._namespace | default dict).seaweedfs | default "" }}
 {{- end }}
 
 {{/*
diff --git a/packages/library/cozy-lib/templates/_keda.tpl b/packages/library/cozy-lib/templates/_keda.tpl
new file mode 100644
index 0000000000..bcee49d774
--- /dev/null
+++ b/packages/library/cozy-lib/templates/_keda.tpl
@@ -0,0 +1,173 @@
+{{/*
+cozy-lib.keda.scaledObject renders a KEDA ScaledObject that drives an engine
+operator's /scale subresource from a single VictoriaMetrics query.
+
+This is the whole runtime of database read-replica autoscaling in cozystack:
+the app chart renders this object, and stock KEDA queries VictoriaMetrics,
+computes the desired count with an HPA it manages, and writes the engine CR's
+scale subresource. There is no bespoke controller (see the design proposal
+"database-horizontal-autoscaling"). The helper is engine-agnostic: the caller
+supplies the already-computed effective bounds (the synchronous-quorum floor is
+engine-specific and belongs in the chart, not here), the scale target, and the
+metric query.
+
+Invoked with a single dict argument:
+
+  {{ include "cozy-lib.keda.scaledObject" (dict
+       "name"            .Release.Name
+       "namespace"       .Release.Namespace
+       "scaleTargetRef"  (dict "apiVersion" "postgresql.cnpg.io/v1" "kind" "Cluster" "name" .Release.Name)
+       "minReplicaCount" $effectiveMin
+       "maxReplicaCount" $effectiveMax
+       "serverAddress"   $vmselectURL
+       "query"           $promql
+       "threshold"       "150"
+       "behavior"        $hpaBehavior      # optional; HPA behavior block, carried verbatim
+       "paused"          $paused           # true to render paused; a caller pauses for BOTH dry-run AND migration transition, not dry-run alone
+       "labels"          (dict "app.kubernetes.io/instance" .Release.Name)
+  ) }}
+
+Parameters:
+  - name            (required) ScaledObject name. Convention: the release name.
+  - scaleTargetRef  (required) dict with apiVersion, kind, name of the CR to scale.
+  - minReplicaCount (required) effective lower bound (chart computes the quorum floor).
+  - maxReplicaCount (required) effective upper bound; must be >= minReplicaCount.
+  - serverAddress   (required) Prometheus-API URL of the tenant's vmselect.
+  - query           (required) PromQL whose value / threshold is the desired count.
+  - threshold       (required) AverageValue target; desired = ceil(query / threshold).
+  - namespace       (optional) metadata.namespace.
+  - behavior        (optional) HPA behavior block (scale-down pacing etc.), carried verbatim.
+  - paused          (optional) when true, stamps autoscaling.keda.sh/paused-scale-in
+                    AND paused-scale-out =true (dry-run / recommendation mode — KEDA
+                    keeps the HPA and keeps serving its metric but actuates in neither
+                    direction). Deliberately not the full paused=true, which in KEDA
+                    2.20.2 deletes the HPA and blinds the dashboard/alerts. Because both
+                    scaling policies are disabled, the HPA's desiredReplicas is frozen to
+                    the current count; read the recommendation from the served metric
+                    (desired = ceil(metric / threshold)), not from desiredReplicas.
+  - labels          (optional) extra labels, merged onto the mandatory ones.
+  - annotations     (optional) extra annotations, merged under the pause annotations.
+*/}}
+{{- define "cozy-lib.keda.scaledObject" -}}
+{{-   if not (kindIs "map" .) -}}
+{{-     fail "cozy-lib.keda.scaledObject: expected a single dict argument" -}}
+{{-   end -}}
+{{-   $name := default "" .name -}}
+{{-   if eq $name "" -}}
+{{-     fail "cozy-lib.keda.scaledObject: name is required" -}}
+{{-   end -}}
+{{-   $ref := default (dict) .scaleTargetRef -}}
+{{-   if not (kindIs "map" $ref) -}}
+{{-     fail "cozy-lib.keda.scaledObject: scaleTargetRef must be a dict" -}}
+{{-   end -}}
+{{-   if eq (default "" $ref.name) "" -}}
+{{-     fail "cozy-lib.keda.scaledObject: scaleTargetRef.name is required" -}}
+{{-   end -}}
+{{-   if eq (default "" $ref.kind) "" -}}
+{{-     fail "cozy-lib.keda.scaledObject: scaleTargetRef.kind is required" -}}
+{{-   end -}}
+{{-   if eq (default "" $ref.apiVersion) "" -}}
+{{-     fail "cozy-lib.keda.scaledObject: scaleTargetRef.apiVersion is required" -}}
+{{-   end -}}
+{{-   if eq (printf "%v" (default "" .query)) "" -}}
+{{-     fail "cozy-lib.keda.scaledObject: query is required" -}}
+{{-   end -}}
+{{-   if eq (printf "%v" (default "" .threshold)) "" -}}
+{{-     fail "cozy-lib.keda.scaledObject: threshold is required" -}}
+{{-   end -}}
+{{-   if eq (default "" .serverAddress) "" -}}
+{{-     fail "cozy-lib.keda.scaledObject: serverAddress is required" -}}
+{{-   end -}}
+{{- /* Bounds are required NUMBERS. A nil is "invalid"; a non-numeric string like
+       "two" must also fail rather than coerce through `int` to 0 (which would sail
+       past the ordering guard and render a scale-to-zero-capable ScaledObject). */ -}}
+{{-   if not (or (kindIs "int" .minReplicaCount) (kindIs "float64" .minReplicaCount)) -}}
+{{-     fail "cozy-lib.keda.scaledObject: minReplicaCount is required and must be a number" -}}
+{{-   end -}}
+{{-   if not (or (kindIs "int" .maxReplicaCount) (kindIs "float64" .maxReplicaCount)) -}}
+{{-     fail "cozy-lib.keda.scaledObject: maxReplicaCount is required and must be a number" -}}
+{{-   end -}}
+{{-   $min := int .minReplicaCount -}}
+{{-   $max := int .maxReplicaCount -}}
+{{- /* A replica floor cannot be negative; reject it before the ordering check so an
+       all-negative or mixed-sign pair (e.g. min -5, max -3, which satisfies max >= min)
+       cannot render a ScaledObject with a nonsensical bound. A negative max with a
+       non-negative min is already caught by the ordering check below. Test the
+       untruncated value: `int` truncates toward zero, so a fractional negative like
+       -0.5 would become $min 0 and slip past a `$min`-based check into exactly the
+       scale-to-zero-capable object the type guard above exists to prevent. */ -}}
+{{-   if lt (float64 .minReplicaCount) 0.0 -}}
+{{-     fail "cozy-lib.keda.scaledObject: minReplicaCount must be >= 0" -}}
+{{-   end -}}
+{{-   if lt $max $min -}}
+{{-     fail "cozy-lib.keda.scaledObject: maxReplicaCount must be >= minReplicaCount" -}}
+{{-   end -}}
+{{-   $labels := merge (dict "app.kubernetes.io/managed-by" "cozystack") (default (dict) .labels) -}}
+{{-   $annotations := default (dict) .annotations -}}
+{{- /* Coerce rather than truthiness-test: a caller passing the string "false"
+       (easy to produce from an include without an `| eq "true"` guard) must NOT
+       pause. Only a real true / "true" pauses. */ -}}
+{{-   if eq (printf "%v" (default false .paused)) "true" -}}
+{{- /* Recommendation / warm-standby pause via the UNIDIRECTIONAL pair, deliberately
+       NOT autoscaling.keda.sh/paused. In KEDA 2.20.2 the full paused annotation runs
+       handlePause -> stopScaleLoop + ensureHPAForScaledObjectIsDeleted, i.e. it DELETES
+       the HPA — which erases the keda-hpa-* series the dashboard and alerts ride on and
+       leaves nothing to observe. Pausing BOTH directions instead keeps KEDA's scale loop
+       running and the HPA in place (verified against v2.20.2 controllers/keda/hpa.go: the
+       pair sets the HPA's ScaleUp AND ScaleDown SelectPolicy to Disabled), so the HPA is
+       retained and KEDA keeps serving/scraping the trigger metric. NOTE: with both
+       directions disabled the k8s HPA normalizes status.desiredReplicas to
+       currentReplicas, so desired does NOT diverge here — the recommendation is read from
+       the served metric (keda_scaler_metrics_value, or the read-load panel: desired =
+       ceil(metric / threshold)), not from the HPA's desiredReplicas. For the migration
+       transition this still makes KEDA genuinely warm: un-pausing hands off without
+       recreating the HPA (the HPA's scaleUp stabilization window still applies to the
+       first move). */ -}}
+{{-     $annotations = merge (dict "autoscaling.keda.sh/paused-scale-in" "true" "autoscaling.keda.sh/paused-scale-out" "true") $annotations -}}
+{{-   end -}}
+apiVersion: keda.sh/v1alpha1
+kind: ScaledObject
+metadata:
+  name: {{ $name }}
+{{-   with .namespace }}
+  namespace: {{ . }}
+{{-   end }}
+  labels: {{- toYaml $labels | nindent 4 }}
+{{-   if $annotations }}
+  annotations: {{- toYaml $annotations | nindent 4 }}
+{{-   end }}
+spec:
+  scaleTargetRef:
+    apiVersion: {{ $ref.apiVersion }}
+    kind: {{ $ref.kind }}
+    name: {{ $ref.name }}
+  minReplicaCount: {{ $min }}
+  maxReplicaCount: {{ $max }}
+{{-   with .behavior }}
+  advanced:
+    horizontalPodAutoscalerConfig:
+      behavior: {{- toYaml . | nindent 8 }}
+{{-   end }}
+  triggers:
+    - type: prometheus
+      {{- /* Explicit, not relying on KEDA's default: the desired-count identity
+             desired = ceil(query / threshold) holds only for an AverageValue
+             external metric (no per-pod divisor). Pinning it keeps a KEDA
+             re-vendor or default change from silently breaking the arithmetic. */}}
+      metricType: AverageValue
+      metadata:
+        serverAddress: {{ .serverAddress | quote }}
+        query: {{ .query | quote }}
+        threshold: {{ .threshold | quote }}
+        {{- /* Fail-safe: KEDA's prometheus scaler defaults ignoreNullValues=true, which
+               turns an EMPTY query result into metric value 0 (not an error) — the HPA
+               would then compute desired 0 and clamp to minReplicaCount, i.e. silently
+               scale a cluster DOWN to the floor when the metrics pipeline is broken. Set
+               it false so an empty result is an error (FailedGetExternalMetric) and the
+               HPA HOLDS the current count instead. Callers must ensure a HEALTHY query
+               never returns empty — e.g. floor the load term to vector(0) when the target
+               workload exists — so only a genuinely broken pipeline (or no series) trips
+               this. This is what makes the "must not read a missing sample as zero"
+               contract actually hold; without it the idle-floor gymnastics are moot. */}}
+        ignoreNullValues: "false"
+{{- end -}}
diff --git a/packages/library/cozy-lib/templates/_resources.tpl b/packages/library/cozy-lib/templates/_resources.tpl
index 86e76ab548..48b0718fd8 100644
--- a/packages/library/cozy-lib/templates/_resources.tpl
+++ b/packages/library/cozy-lib/templates/_resources.tpl
@@ -43,8 +43,13 @@
     {{- $value := . -}}
     {{- $unit := 1.0 -}}
     {{- if typeIs "string" . -}}
+        {{- /* Every suffix the Kubernetes quantity grammar allows, because a
+               suffix missing here does not fail: the value keeps its unit
+               letter, `float64` cannot parse it and silently yields zero, and
+               whatever compared or divided that zero reports a wrong answer
+               with no error to notice. */ -}}
         {{- $base2 := dict "Ki" 0x1p10 "Mi" 0x1p20 "Gi" 0x1p30 "Ti" 0x1p40 "Pi" 0x1p50 "Ei" 0x1p60 -}}
-        {{- $base10 := dict "m" 1e-3 "k" 1e3 "M" 1e6 "G" 1e9 "T" 1e12 "P" 1e15 "E" 1e18 -}}
+        {{- $base10 := dict "n" 1e-9 "u" 1e-6 "m" 1e-3 "k" 1e3 "M" 1e6 "G" 1e9 "T" 1e12 "P" 1e15 "E" 1e18 -}}
         {{- range $k, $v := merge $base2 $base10 -}}
             {{- if hasSuffix $k $ -}}
                 {{- $value = trimSuffix $k $ -}}
@@ -59,7 +64,9 @@
   A sanitized resource map is a dict with resource-name to resource-quantity.
   All resources are returned with equal **requests** and **limits**, except for
   **cpu**, whose *request* is reduced by the CPU-allocation ratio obtained from
-  `cozy-lib.resources.cpuAllocationRatio`.
+  `cozy-lib.resources.cpuAllocationRatio` and then rounded **up** to a whole
+  number of milli-CPUs (a CPU quantity finer than 1m is invalid for the VPA
+  admission webhook and meaningless for the scheduler).
 
   The template now expects **one flat map** as input (no nested `requests:` /
   `limits:` sections).  Each value in that map is taken as the *limit* for the
@@ -97,7 +104,29 @@
 {{-     if eq $k "cpu" }}
 {{-       $vcpuRequestF64 := (include "cozy-lib.resources.toFloat" $v) | float64 }}
 {{-       $cpuRequestF64 := divf $vcpuRequestF64 $cpuAllocationRatio }}
-{{-       $_ := set $output.requests $k ($cpuRequestF64 | toString) }}
+{{- /*
+        A CPU quantity must be a whole number of milli-CPUs: the VPA admission
+        webhook rejects anything finer ("minAllowed: CPU [62500u] must be a
+        whole number of milli CPUs"), and a sub-milli request is meaningless
+        anyway. A ratio that does not divide the value evenly produces one:
+        250m / 4 = 62.5m. Round the request up to the next whole milli-CPU so
+        every allocation ratio renders a valid quantity, never below the
+        intended fraction of the limit. A request whose shortest decimal form
+        is already whole-milli keeps that form, so the default ratio of 10
+        renders exactly as it did before.
+        The comparison needs no tolerance: sprig's divf/mulf run on
+        shopspring/decimal rather than float64, so 250m / 10 * 1000 is exactly
+        25 and not 25.000000000000004. A tolerance would in fact reintroduce
+        the bug it looks like it prevents, by accepting a value such as
+        100.0000004m as whole-milli and rendering it verbatim.
+*/}}
+{{-       $cpuRequestMilli := mulf $cpuRequestF64 1000.0 | float64 }}
+{{-       $cpuRequestMilliCeil := ceil $cpuRequestMilli }}
+{{-       if eq $cpuRequestMilli $cpuRequestMilliCeil }}
+{{-         $_ := set $output.requests $k ($cpuRequestF64 | toString) }}
+{{-       else }}
+{{-         $_ := set $output.requests $k (printf "%dm" (int64 $cpuRequestMilliCeil)) }}
+{{-       end }}
 {{-       $_ := set $output.limits $k ($v | toString) }}
 {{-     else if eq $k "memory" }}
 {{-       $vMemoryRequestF64 := (include "cozy-lib.resources.toFloat" $v) | float64 }}
diff --git a/packages/library/cozy-lib/templates/_tls.tpl b/packages/library/cozy-lib/templates/_tls.tpl
new file mode 100644
index 0000000000..c9028e00a9
--- /dev/null
+++ b/packages/library/cozy-lib/templates/_tls.tpl
@@ -0,0 +1,136 @@
+{{/*
+cozy-lib.tls.caCertSecret renders the canonical CA-only trust-anchor Secret
+"<release>.tenant-ca", carrying ONLY ca.crt and never a private key.
+
+Why a dedicated object: the Secrets that already hold ca.crt also hold keys —
+cert-manager's "<release>-ca" carries the CA key, the leaf "<release>-tls" the
+server key — so any RBAC that grants a tenant ca.crt through them leaks a key
+too. This helper emits ca.crt alone, labelled so the tenant reads it through the
+core.cozystack.io/tenantsecrets virtual resource the base tenant roles already
+grant (never through a raw core/v1 Secret).
+
+Name is "<release>.tenant-ca", NOT "<release>-ca-cert": Percona Server for
+MongoDB already claims "<release>-ca-cert" with a key-bearing Secret of its own.
+
+This is the render-time path, for charts that hold the CA PEM as a value. Engines
+whose operator mints the CA asynchronously are served instead by the CA-extraction
+controller (internal/controller/cacert), which projects the same canonical object
+out of whatever Secret the engine produces — so a tenant learns exactly one name.
+*/}}
+
+{{/*
+cozy-lib.tls.validateCACert checks that a CA PEM value carries complete
+certificate blocks and nothing else, and renders nothing. Every chart value
+that accepts a CA in PEM form routes through here, so the fail-closed rules
+live in exactly one place.
+
+Invoked with a single dict argument:
+
+  {{ include "cozy-lib.tls.validateCACert" (dict
+       "caCert" $caCertPem
+       "field"  "talos.imageFactoryCA"
+  ) }}
+
+Parameters:
+  - caCert (required) the CA chain in PEM.
+  - field  (required) the caller's field name, carried into the fail messages
+           so the operator sees the value they actually set rather than this
+           helper's parameter.
+
+Emptiness is the caller's decision, not this helper's: one caller treats empty
+as "unset" and never calls, another fails it with its own "required" message
+first. What this helper owns is the shape of a value that IS supplied.
+
+The checks bound block SHAPE only — a Helm template has no x509 parser, so a
+body spelled in base64 characters passes however meaningless. The Go
+CA-extraction controller (internal/controller/cacert) does the full pem.Decode
++ x509 parse on its path.
+*/}}
+{{- define "cozy-lib.tls.validateCACert" -}}
+{{-   if not (kindIs "map" .) -}}
+{{-     fail "cozy-lib.tls.validateCACert: expected a single dict argument" -}}
+{{-   end -}}
+{{-   $field := printf "%v" (default "" .field) -}}
+{{-   if eq $field "" -}}
+{{-     fail "cozy-lib.tls.validateCACert: field is required" -}}
+{{-   end -}}
+{{- /* Coerce to string first: an unquoted numeric YAML scalar (caCert: 12345)
+       parses to float64, and regexMatch on it would die with a raw Go type
+       error instead of this helper's own fail message. (caCert: 0 is treated
+       as empty by `default ""` and fails the full-PEM check below.) */ -}}
+{{-   $caCert := printf "%v" (default "" .caCert) -}}
+{{- /* Reject private-key material, anchored to the PEM header and case-insensitive
+       so it neither false-positives on certificate body text nor misses a
+       lowercased header. Stops at "PRIVATE KEY", not the closing dashes, so PGP's
+       "-----BEGIN PGP PRIVATE KEY BLOCK-----" is still caught. */ -}}
+{{-   if regexMatch "(?i)-----BEGIN [A-Z0-9 ]*PRIVATE KEY" $caCert -}}
+{{-     fail (printf "cozy-lib.tls.validateCACert: %s must not contain private key material" $field) -}}
+{{-   end -}}
+{{- /* Require the WHOLE value (\A ... \z) to be complete certificate blocks and
+       whitespace, not merely to contain one, because callers emit the value
+       VERBATIM into an object readable by anything that can read the namespace:
+       preamble or trailing bytes (e.g. a raw DER/JWK key wearing no PEM
+       header) would otherwise ride along. */ -}}
+{{-   if not (regexMatch "(?i)\\A\\s*(-----BEGIN CERTIFICATE-----\\s+[A-Za-z0-9+/=][A-Za-z0-9+/=\\s]*-----END CERTIFICATE-----\\s*)+\\z" $caCert) -}}
+{{-     fail (printf "cozy-lib.tls.validateCACert: %s must contain a complete PEM certificate block (BEGIN/END CERTIFICATE)" $field) -}}
+{{-   end -}}
+{{- end -}}
+
+{{/*
+Invoked with a single dict argument. A chart holding the CA PEM as a value calls
+it like this (there is no production caller yet — this is the pattern one uses):
+
+  {{ include "cozy-lib.tls.caCertSecret" (dict
+       "name"      (printf "%s.tenant-ca" .Release.Name)
+       "namespace" .Release.Namespace
+       "caCert"    $caCertPem
+       "labels"    (dict "app.kubernetes.io/instance" .Release.Name)
+  ) }}
+
+Parameters:
+  - name        (required) Secret name. Convention: "<release>.tenant-ca".
+  - caCert      (required) the CA chain in PEM. Must be one or more COMPLETE
+                certificate blocks and nothing else; the helper fails closed on a
+                private-key header or on any non-certificate bytes (the shared
+                cozy-lib.tls.validateCACert checks).
+  - namespace   (optional) metadata.namespace.
+  - labels      (optional) extra labels, merged onto the mandatory tenant labels.
+  - annotations (optional) extra annotations.
+*/}}
+{{- define "cozy-lib.tls.caCertSecret" -}}
+{{-   if not (kindIs "map" .) -}}
+{{-     fail "cozy-lib.tls.caCertSecret: expected a single dict argument" -}}
+{{-   end -}}
+{{-   $name := default "" .name -}}
+{{-   if eq $name "" -}}
+{{-     fail "cozy-lib.tls.caCertSecret: name is required" -}}
+{{-   end -}}
+{{- /* Coerce to string first: an unquoted numeric YAML scalar (caCert: 12345)
+       parses to float64, and trim on it would die with a raw Go type error
+       instead of this helper's own fail message. (caCert: 0 reports "required",
+       not coerced — `default ""` treats 0 as empty; pinned by a test.) */ -}}
+{{-   $caCert := printf "%v" (default "" .caCert) -}}
+{{-   if eq (trim $caCert) "" -}}
+{{-     fail "cozy-lib.tls.caCertSecret: caCert is required and must be a non-empty PEM" -}}
+{{-   end -}}
+{{-   include "cozy-lib.tls.validateCACert" (dict "caCert" $caCert "field" "caCert") -}}
+{{- /* internal.cozystack.io/tenant-ca is the selector an ApplicationDefinition
+       matches and the CA-extraction controller stamps, so a helper-rendered
+       anchor must carry it to converge with a projected one. tenantresource is
+       rendered for shape but the lineage webhook recomputes it on admission. */ -}}
+{{-   $labels := merge (dict "internal.cozystack.io/tenant-ca" "true" "internal.cozystack.io/tenantresource" "true") (default (dict) .labels) -}}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ $name }}
+{{-   with .namespace }}
+  namespace: {{ . }}
+{{-   end }}
+  labels: {{- toYaml $labels | nindent 4 }}
+{{-   with .annotations }}
+  annotations: {{- toYaml . | nindent 4 }}
+{{-   end }}
+type: Opaque
+stringData:
+  ca.crt: {{ $caCert | quote }}
+{{- end -}}
diff --git a/packages/library/cozy-lib/values.schema.json b/packages/library/cozy-lib/values.schema.json
index decc79aa15..596fa58b47 100644
--- a/packages/library/cozy-lib/values.schema.json
+++ b/packages/library/cozy-lib/values.schema.json
@@ -1,5 +1,7 @@
 {
-    "title": "Chart Values",
-    "type": "object",
-    "properties": {}
-}
\ No newline at end of file
+  "title": "Chart Values",
+  "type": "object",
+  "properties": {
+
+  }
+}
diff --git a/packages/system/.gitattributes b/packages/system/.gitattributes
new file mode 100644
index 0000000000..698426f39e
--- /dev/null
+++ b/packages/system/.gitattributes
@@ -0,0 +1 @@
+*/cozyrds/*.yaml linguist-generated
diff --git a/packages/system/application-definition-crd/definition/cozystack.io_applicationdefinitions.yaml b/packages/system/application-definition-crd/definition/cozystack.io_applicationdefinitions.yaml
index 44d3386536..9229e76019 100644
--- a/packages/system/application-definition-crd/definition/cozystack.io_applicationdefinitions.yaml
+++ b/packages/system/application-definition-crd/definition/cozystack.io_applicationdefinitions.yaml
@@ -311,13 +311,91 @@ spec:
                     - kind
                     - name
                     type: object
+                  healthCheckExprs:
+                    description: |-
+                      HealthCheckExprs maps to HelmReleaseSpec.HealthCheckExprs — CEL health
+                      expressions for the custom resource(s) this application renders, so the
+                      HelmRelease reports Ready only when the CR is actually healthy instead of
+                      as soon as helm applies it. OpenAPI validates only the struct shape, so
+                      mistakes surface in helm-controller, and they do not all fail the same
+                      way:
+                        - An expression that does not parse, an empty current expression, or
+                          two entries for the same group and kind stall the HelmRelease with
+                          reason InvalidCELExpression before any Helm action runs.
+                        - An expression that errors on the object, such as a read of a
+                          misspelled field or a non-boolean result, does not end the wait: the
+                          CR reads as Unknown on every poll, and the Helm action waits out its
+                          timeout with the CEL error in the message. Reading a status field
+                          errors this way, even inside has(), until the CR's controller writes
+                          a status; the wait goes on and can still succeed once it does.
+                        - A current expression that evaluates cleanly but never becomes true,
+                          such as a comparison against the wrong value, leaves the CR
+                          InProgress, and the Helm action waits out its timeout with no CEL
+                          error to point at the expression.
+                        - A group or kind that does not match the CR the chart renders leaves
+                          the expressions unused, and that CR is judged by the built-in
+                          kstatus rules instead.
+                      A CR whose CRD is not installed fails the Helm action before any wait,
+                      whatever these expressions say.
+                      Upstream evaluates these only when the Helm action itself has wait
+                      enabled, so the release.cozystack.io/helm-install-disable-wait annotation
+                      makes them a silent no-op whatever waitStrategy says: the HelmRelease
+                      reports Ready as soon as helm applies the CR, with no error or warning.
+                    items:
+                      description: CustomHealthCheck defines the health check for
+                        custom resources.
+                      properties:
+                        apiVersion:
+                          description: APIVersion of the custom resource under evaluation.
+                          type: string
+                        current:
+                          description: |-
+                            Current is the CEL expression that determines if the status
+                            of the custom resource has reached the desired state.
+                          type: string
+                        failed:
+                          description: |-
+                            Failed is the CEL expression that determines if the status
+                            of the custom resource has failed to reach the desired state.
+                          type: string
+                        inProgress:
+                          description: |-
+                            InProgress is the CEL expression that determines if the status
+                            of the custom resource has not yet reached the desired state.
+                          type: string
+                        kind:
+                          description: Kind of the custom resource under evaluation.
+                          type: string
+                      required:
+                      - apiVersion
+                      - current
+                      - kind
+                      type: object
+                    type: array
                   labels:
                     additionalProperties:
                       type: string
                     description: Labels for the release
                     type: object
                   prefix:
-                    description: Prefix for the release name
+                    description: |-
+                      Prefix for the release name. Release names are "<prefix><app name>" and the
+                      tenant CA trust anchor is projected to "<release>.tenant-ca", where the dot
+                      is a separator no release name may contain — so the prefix must be dot-free.
+                      It is restricted to lowercase DNS-1123 characters, which excludes the dot by
+                      construction.
+                    pattern: ^[a-z0-9-]*$
+                    type: string
+                  waitStrategy:
+                    description: |-
+                      WaitStrategy maps to HelmReleaseSpec.WaitStrategy.Name — a deliberate
+                      scalar simplification of the upstream {name} object, since there is only
+                      one value to set. One of poller|legacy. When healthCheckExprs is set and
+                      this is empty, the generated HelmRelease defaults to poller, because
+                      healthCheckExprs are only evaluated under the poller wait strategy.
+                    enum:
+                    - poller
+                    - legacy
                     type: string
                 required:
                 - chartRef
diff --git a/packages/system/backup-controller/Makefile b/packages/system/backup-controller/Makefile
index 595174faa2..b512fa8963 100644
--- a/packages/system/backup-controller/Makefile
+++ b/packages/system/backup-controller/Makefile
@@ -4,13 +4,15 @@ NAMESPACE=cozy-backup-controller
 include ../../../hack/common-envs.mk
 include ../../../hack/package.mk
 
+test:
+	helm unittest .
+
 image: image-backup-controller
 
 image-backup-controller:
 	docker buildx build -f images/backup-controller/Dockerfile ../../.. \
 		$(call image-tags,backup-controller,v$(COZYSTACK_VERSION)) \
-		--cache-from type=registry,ref=$(REGISTRY)/backup-controller:latest \
-		--cache-to type=inline \
+		$(call cache-args,backup-controller) \
 		--metadata-file images/backup-controller.json \
 		$(BUILDX_ARGS)
 	IMAGE="$(REGISTRY)/backup-controller:$(IMAGE_TAG)@$$(yq e '."containerimage.digest"' images/backup-controller.json -o json -r)" \
diff --git a/packages/system/backup-controller/definitions/backups.cozystack.io_backupjobs.yaml b/packages/system/backup-controller/definitions/backups.cozystack.io_backupjobs.yaml
index 7a0ed6f5c6..dee83507b7 100644
--- a/packages/system/backup-controller/definitions/backups.cozystack.io_backupjobs.yaml
+++ b/packages/system/backup-controller/definitions/backups.cozystack.io_backupjobs.yaml
@@ -4,6 +4,9 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.16.4
+    options.cozystack.io/source.applicationRef.kind: appkind
+    options.cozystack.io/source.backupClassName: backupclass
+    options.cozystack.io/source.planRef.name: plan
   name: backupjobs.backups.cozystack.io
 spec:
   group: backups.cozystack.io
diff --git a/packages/system/backup-controller/definitions/backups.cozystack.io_backups.yaml b/packages/system/backup-controller/definitions/backups.cozystack.io_backups.yaml
index d48df53361..28ef57fb7d 100644
--- a/packages/system/backup-controller/definitions/backups.cozystack.io_backups.yaml
+++ b/packages/system/backup-controller/definitions/backups.cozystack.io_backups.yaml
@@ -4,6 +4,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.16.4
+    options.cozystack.io/source.applicationRef.kind: appkind
   name: backups.backups.cozystack.io
 spec:
   group: backups.cozystack.io
diff --git a/packages/system/backup-controller/definitions/backups.cozystack.io_plans.yaml b/packages/system/backup-controller/definitions/backups.cozystack.io_plans.yaml
index 94c0933460..4d6c95f422 100644
--- a/packages/system/backup-controller/definitions/backups.cozystack.io_plans.yaml
+++ b/packages/system/backup-controller/definitions/backups.cozystack.io_plans.yaml
@@ -4,6 +4,8 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.16.4
+    options.cozystack.io/source.applicationRef.kind: appkind
+    options.cozystack.io/source.backupClassName: backupclass
   name: plans.backups.cozystack.io
 spec:
   group: backups.cozystack.io
diff --git a/packages/system/backup-controller/definitions/backups.cozystack.io_restorejobs.yaml b/packages/system/backup-controller/definitions/backups.cozystack.io_restorejobs.yaml
index b94659941a..6c902ba0ef 100644
--- a/packages/system/backup-controller/definitions/backups.cozystack.io_restorejobs.yaml
+++ b/packages/system/backup-controller/definitions/backups.cozystack.io_restorejobs.yaml
@@ -4,6 +4,8 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.16.4
+    options.cozystack.io/source.backupRef.name: backup
+    options.cozystack.io/source.targetApplicationRef.kind: appkind
   name: restorejobs.backups.cozystack.io
 spec:
   group: backups.cozystack.io
diff --git a/packages/system/backup-controller/images/backup-controller/Dockerfile b/packages/system/backup-controller/images/backup-controller/Dockerfile
index 83d7d675f1..f599185cb2 100644
--- a/packages/system/backup-controller/images/backup-controller/Dockerfile
+++ b/packages/system/backup-controller/images/backup-controller/Dockerfile
@@ -1,4 +1,5 @@
-FROM golang:1.26-alpine AS builder
+FROM --platform=$BUILDPLATFORM golang:1.27-alpine@sha256:8a5910f31396cd4d89662f56c68b3ae31d374308270a1c3bd96672ee5ed43414 AS builder
+ARG GOPROXY
 
 ARG TARGETOS
 ARG TARGETARCH
@@ -6,7 +7,7 @@ ARG TARGETARCH
 WORKDIR /workspace
 
 COPY go.mod go.sum ./
-RUN GOOS=$TARGETOS GOARCH=$TARGETARCH go mod download
+RUN for attempt in 1 2 3; do GOOS=$TARGETOS GOARCH=$TARGETARCH go mod download && break; [ "$attempt" = 3 ] && exit 1; sleep $((attempt * 10)); done
 
 COPY api api/
 COPY pkg pkg/
diff --git a/packages/system/backup-controller/tests/crds-option-sources_test.yaml b/packages/system/backup-controller/tests/crds-option-sources_test.yaml
new file mode 100644
index 0000000000..56f4239fc7
--- /dev/null
+++ b/packages/system/backup-controller/tests/crds-option-sources_test.yaml
@@ -0,0 +1,82 @@
+suite: backup-controller CRDs expose dropdown option sources via annotations, not schema
+
+# The x-cozystack-options vendor extension cannot live in an apiextensions CRD
+# validation schema: JSONSchemaProps only preserves x-kubernetes-* extensions,
+# so server-side apply rejects the unknown key and the apiserver drops it on
+# decode. The dashboard's field->source mapping therefore lives in CRD metadata
+# annotations (preserved by the apiserver) and is reattached client-side. These
+# tests pin that contract and guard against re-introducing the in-schema
+# injector that previously broke CRD apply: each dropdown field must carry its
+# source in metadata.annotations and must NOT carry x-cozystack-options in the
+# OpenAPI schema.
+templates:
+  - templates/crds.yaml
+
+release:
+  name: backup-controller
+  namespace: cozy-backup-controller
+
+tests:
+  - it: backupjobs CRD carries source annotations and no in-schema extension
+    documentSelector:
+      path: metadata.name
+      value: backupjobs.backups.cozystack.io
+    asserts:
+      - equal:
+          path: metadata.annotations["options.cozystack.io/source.applicationRef.kind"]
+          value: appkind
+      - equal:
+          path: metadata.annotations["options.cozystack.io/source.planRef.name"]
+          value: plan
+      - equal:
+          path: metadata.annotations["options.cozystack.io/source.backupClassName"]
+          value: backupclass
+      - notExists:
+          path: spec.versions[0].schema.openAPIV3Schema.properties.spec.properties.applicationRef.properties.kind["x-cozystack-options"]
+      - notExists:
+          path: spec.versions[0].schema.openAPIV3Schema.properties.spec.properties.planRef.properties.name["x-cozystack-options"]
+      - notExists:
+          path: spec.versions[0].schema.openAPIV3Schema.properties.spec.properties.backupClassName["x-cozystack-options"]
+
+  - it: backups CRD carries the appkind source annotation only
+    documentSelector:
+      path: metadata.name
+      value: backups.backups.cozystack.io
+    asserts:
+      - equal:
+          path: metadata.annotations["options.cozystack.io/source.applicationRef.kind"]
+          value: appkind
+      - notExists:
+          path: spec.versions[0].schema.openAPIV3Schema.properties.spec.properties.applicationRef.properties.kind["x-cozystack-options"]
+
+  - it: plans CRD carries appkind and backupclass source annotations
+    documentSelector:
+      path: metadata.name
+      value: plans.backups.cozystack.io
+    asserts:
+      - equal:
+          path: metadata.annotations["options.cozystack.io/source.applicationRef.kind"]
+          value: appkind
+      - equal:
+          path: metadata.annotations["options.cozystack.io/source.backupClassName"]
+          value: backupclass
+      - notExists:
+          path: spec.versions[0].schema.openAPIV3Schema.properties.spec.properties.applicationRef.properties.kind["x-cozystack-options"]
+      - notExists:
+          path: spec.versions[0].schema.openAPIV3Schema.properties.spec.properties.backupClassName["x-cozystack-options"]
+
+  - it: restorejobs CRD carries backup and appkind source annotations
+    documentSelector:
+      path: metadata.name
+      value: restorejobs.backups.cozystack.io
+    asserts:
+      - equal:
+          path: metadata.annotations["options.cozystack.io/source.backupRef.name"]
+          value: backup
+      - equal:
+          path: metadata.annotations["options.cozystack.io/source.targetApplicationRef.kind"]
+          value: appkind
+      - notExists:
+          path: spec.versions[0].schema.openAPIV3Schema.properties.spec.properties.backupRef.properties.name["x-cozystack-options"]
+      - notExists:
+          path: spec.versions[0].schema.openAPIV3Schema.properties.spec.properties.targetApplicationRef.properties.kind["x-cozystack-options"]
diff --git a/packages/system/backup-controller/values.yaml b/packages/system/backup-controller/values.yaml
index c152bc8905..a62272f454 100644
--- a/packages/system/backup-controller/values.yaml
+++ b/packages/system/backup-controller/values.yaml
@@ -1,5 +1,5 @@
 backupController:
-  image: "ghcr.io/cozystack/cozystack/backup-controller:v1.4.0-rc.2@sha256:5910cafa8e21a2b3ebc135504c041fecc2c2b94442c543dc25984592b3503f69"
+  image: "ghcr.io/cozystack/cozystack/backup-controller:v1.6.0@sha256:fc4571354413d86ed11fa38dee8fd3d2d879e11c48d7d92c28630b2d54a2bcbb"
   replicas: 2
   debug: false
   metrics:
diff --git a/packages/system/backupstrategy-controller/Makefile b/packages/system/backupstrategy-controller/Makefile
index f3bb61335f..94b1931d98 100644
--- a/packages/system/backupstrategy-controller/Makefile
+++ b/packages/system/backupstrategy-controller/Makefile
@@ -4,18 +4,47 @@ NAMESPACE=cozy-backup-controller
 include ../../../hack/common-envs.mk
 include ../../../hack/package.mk
 
-image: image-backupstrategy-controller
+# PHONY so a stray file/dir named `image` cannot mark the aggregate up to date
+# and skip both builds.
+.PHONY: image image-backupstrategy-controller image-redis-backup image-backup-http-client
+
+image: image-backupstrategy-controller image-redis-backup image-backup-http-client
 
 image-backupstrategy-controller:
 	docker buildx build -f images/backupstrategy-controller/Dockerfile ../../.. \
 		$(call image-tags,backupstrategy-controller,v$(COZYSTACK_VERSION)) \
-		--cache-from type=registry,ref=$(REGISTRY)/backupstrategy-controller:latest \
-		--cache-to type=inline \
+		$(call cache-args,backupstrategy-controller) \
 		--metadata-file images/backupstrategy-controller.json \
 		$(BUILDX_ARGS)
 	IMAGE="$(REGISTRY)/backupstrategy-controller:$(IMAGE_TAG)@$$(yq e '."containerimage.digest"' images/backupstrategy-controller.json -o json -r)" \
 		yq -i '.backupStrategyController.image = strenv(IMAGE)' values.yaml
 	rm -f images/backupstrategy-controller.json
 
+# Depends on image-backupstrategy-controller so the two recipes never rewrite
+# values.yaml concurrently under `make -j image` — each stamps a digest with
+# `yq -i`, and a concurrent write would drop one of them.
+image-redis-backup: image-backupstrategy-controller
+	docker buildx build -f images/redis-backup/Dockerfile images/redis-backup \
+		$(call image-tags,redis-backup,v$(COZYSTACK_VERSION)) \
+		$(call cache-args,redis-backup) \
+		--metadata-file images/redis-backup.json \
+		$(BUILDX_ARGS)
+	IMAGE="$(REGISTRY)/redis-backup:$(IMAGE_TAG)@$$(yq e '."containerimage.digest"' images/redis-backup.json -o json -r)" \
+		yq -i '.backupStrategyController.redisBackupClientImage = strenv(IMAGE)' values.yaml
+	rm -f images/redis-backup.json
+
+# Chained after image-redis-backup for the same reason: one `yq -i` writer at a
+# time. Both keys get the same ref, so the repository stays pinned at a single
+# digest (hack/image-pin-consistency.bats).
+image-backup-http-client: image-redis-backup
+	docker buildx build -f images/backup-http-client/Dockerfile images/backup-http-client \
+		$(call image-tags,backup-http-client,v$(COZYSTACK_VERSION)) \
+		$(call cache-args,backup-http-client) \
+		--metadata-file images/backup-http-client.json \
+		$(BUILDX_ARGS)
+	IMAGE="$(REGISTRY)/backup-http-client:$(IMAGE_TAG)@$$(yq e '."containerimage.digest"' images/backup-http-client.json -o json -r)" \
+		yq -i '.backupStrategyController.chBackupClientImage = strenv(IMAGE) | .backupStrategyController.rabbitmqBackupClientImage = strenv(IMAGE)' values.yaml
+	rm -f images/backup-http-client.json
+
 test:
 	helm unittest .
diff --git a/packages/system/backupstrategy-controller/definitions/strategy.backups.cozystack.io_altinities.yaml b/packages/system/backupstrategy-controller/definitions/strategy.backups.cozystack.io_altinities.yaml
index a98bfa3773..ceb08e8f35 100644
--- a/packages/system/backupstrategy-controller/definitions/strategy.backups.cozystack.io_altinities.yaml
+++ b/packages/system/backupstrategy-controller/definitions/strategy.backups.cozystack.io_altinities.yaml
@@ -1077,7 +1077,9 @@ spec:
                                         description: Selects a key of a ConfigMap.
                                         properties:
                                           key:
-                                            description: The key to select.
+                                            description: |-
+                                              The key to select from the ConfigMap's Data field.
+                                              Keys in the BinaryData field are not currently propagated to container env vars.
                                             type: string
                                           name:
                                             default: ""
@@ -1352,6 +1354,11 @@ spec:
                                             Number must be in the range 1 to 65535.
                                             Name must be an IANA_SVC_NAME.
                                           x-kubernetes-int-or-string: true
+                                        protocol:
+                                          description: |-
+                                            Protocol selects the wire protocol for the probe connection.
+                                            Nil defaults to HTTP/1.1.
+                                          type: string
                                         scheme:
                                           description: |-
                                             Scheme to use for connecting to the host.
@@ -1466,6 +1473,11 @@ spec:
                                             Number must be in the range 1 to 65535.
                                             Name must be an IANA_SVC_NAME.
                                           x-kubernetes-int-or-string: true
+                                        protocol:
+                                          description: |-
+                                            Protocol selects the wire protocol for the probe connection.
+                                            Nil defaults to HTTP/1.1.
+                                          type: string
                                         scheme:
                                           description: |-
                                             Scheme to use for connecting to the host.
@@ -1548,6 +1560,13 @@ spec:
                                 grpc:
                                   description: GRPC specifies a GRPC HealthCheckRequest.
                                   properties:
+                                    mode:
+                                      description: |-
+                                        mode specifies the connection mode for the gRPC health probe.
+                                        Set to "TLS" to use TLS without certificate verification.
+                                        Set to "Plaintext" to use a plaintext (insecure) connection explicitly.
+                                        If not specified, the probe uses a plaintext (insecure) connection.
+                                      type: string
                                     port:
                                       description: Port number of the gRPC service.
                                         Number must be in the range 1 to 65535.
@@ -1606,6 +1625,11 @@ spec:
                                         Number must be in the range 1 to 65535.
                                         Name must be an IANA_SVC_NAME.
                                       x-kubernetes-int-or-string: true
+                                    protocol:
+                                      description: |-
+                                        Protocol selects the wire protocol for the probe connection.
+                                        Nil defaults to HTTP/1.1.
+                                      type: string
                                     scheme:
                                       description: |-
                                         Scheme to use for connecting to the host.
@@ -1763,6 +1787,13 @@ spec:
                                 grpc:
                                   description: GRPC specifies a GRPC HealthCheckRequest.
                                   properties:
+                                    mode:
+                                      description: |-
+                                        mode specifies the connection mode for the gRPC health probe.
+                                        Set to "TLS" to use TLS without certificate verification.
+                                        Set to "Plaintext" to use a plaintext (insecure) connection explicitly.
+                                        If not specified, the probe uses a plaintext (insecure) connection.
+                                      type: string
                                     port:
                                       description: Port number of the gRPC service.
                                         Number must be in the range 1 to 65535.
@@ -1821,6 +1852,11 @@ spec:
                                         Number must be in the range 1 to 65535.
                                         Name must be an IANA_SVC_NAME.
                                       x-kubernetes-int-or-string: true
+                                    protocol:
+                                      description: |-
+                                        Protocol selects the wire protocol for the probe connection.
+                                        Nil defaults to HTTP/1.1.
+                                      type: string
                                     scheme:
                                       description: |-
                                         Scheme to use for connecting to the host.
@@ -1890,7 +1926,9 @@ spec:
                                   type: integer
                               type: object
                             resizePolicy:
-                              description: Resources resize policy for the container.
+                              description: |-
+                                Resources resize policy for the container.
+                                This field cannot be set on ephemeral containers.
                               items:
                                 description: ContainerResizePolicy represents resource
                                   resize policy for the container.
@@ -2120,7 +2158,6 @@ spec:
                                     procMount denotes the type of proc mount to use for the containers.
                                     The default value is Default which uses the container runtime defaults for
                                     readonly paths and masked paths.
-                                    This requires the ProcMountType feature flag to be enabled.
                                     Note that this field cannot be set when spec.os.name is windows.
                                   type: string
                                 readOnlyRootFilesystem:
@@ -2275,6 +2312,13 @@ spec:
                                 grpc:
                                   description: GRPC specifies a GRPC HealthCheckRequest.
                                   properties:
+                                    mode:
+                                      description: |-
+                                        mode specifies the connection mode for the gRPC health probe.
+                                        Set to "TLS" to use TLS without certificate verification.
+                                        Set to "Plaintext" to use a plaintext (insecure) connection explicitly.
+                                        If not specified, the probe uses a plaintext (insecure) connection.
+                                      type: string
                                     port:
                                       description: Port number of the gRPC service.
                                         Number must be in the range 1 to 65535.
@@ -2333,6 +2377,11 @@ spec:
                                         Number must be in the range 1 to 65535.
                                         Name must be an IANA_SVC_NAME.
                                       x-kubernetes-int-or-string: true
+                                    protocol:
+                                      description: |-
+                                        Protocol selects the wire protocol for the probe connection.
+                                        Nil defaults to HTTP/1.1.
+                                      type: string
                                     scheme:
                                       description: |-
                                         Scheme to use for connecting to the host.
@@ -2474,10 +2523,21 @@ spec:
                                 description: VolumeMount describes a mounting of a
                                   Volume within a container.
                                 properties:
-                                  mountPath:
+                                  bindMountOptions:
                                     description: |-
-                                      Path within the container at which the volume should be mounted.  Must
-                                      not contain ':'.
+                                      bindMountOptions is the list of additional bind mount options to apply when
+                                      mounting this volume into the container. Allowed values are noexec,
+                                      nodev, and nosuid. These are Linux mount options and have no effect on
+                                      Windows nodes.
+                                      This field is not supported with image volumes.
+                                      This is an alpha field and requires enabling the VolumeBindMountOptions feature gate.
+                                    items:
+                                      type: string
+                                    type: array
+                                    x-kubernetes-list-type: set
+                                  mountPath:
+                                    description: Path within the container at which
+                                      the volume should be mounted.
                                     type: string
                                   mountPropagation:
                                     description: |-
@@ -2689,7 +2749,9 @@ spec:
                                         description: Selects a key of a ConfigMap.
                                         properties:
                                           key:
-                                            description: The key to select.
+                                            description: |-
+                                              The key to select from the ConfigMap's Data field.
+                                              Keys in the BinaryData field are not currently propagated to container env vars.
                                             type: string
                                           name:
                                             default: ""
@@ -2961,6 +3023,11 @@ spec:
                                             Number must be in the range 1 to 65535.
                                             Name must be an IANA_SVC_NAME.
                                           x-kubernetes-int-or-string: true
+                                        protocol:
+                                          description: |-
+                                            Protocol selects the wire protocol for the probe connection.
+                                            Nil defaults to HTTP/1.1.
+                                          type: string
                                         scheme:
                                           description: |-
                                             Scheme to use for connecting to the host.
@@ -3075,6 +3142,11 @@ spec:
                                             Number must be in the range 1 to 65535.
                                             Name must be an IANA_SVC_NAME.
                                           x-kubernetes-int-or-string: true
+                                        protocol:
+                                          description: |-
+                                            Protocol selects the wire protocol for the probe connection.
+                                            Nil defaults to HTTP/1.1.
+                                          type: string
                                         scheme:
                                           description: |-
                                             Scheme to use for connecting to the host.
@@ -3153,6 +3225,13 @@ spec:
                                 grpc:
                                   description: GRPC specifies a GRPC HealthCheckRequest.
                                   properties:
+                                    mode:
+                                      description: |-
+                                        mode specifies the connection mode for the gRPC health probe.
+                                        Set to "TLS" to use TLS without certificate verification.
+                                        Set to "Plaintext" to use a plaintext (insecure) connection explicitly.
+                                        If not specified, the probe uses a plaintext (insecure) connection.
+                                      type: string
                                     port:
                                       description: Port number of the gRPC service.
                                         Number must be in the range 1 to 65535.
@@ -3211,6 +3290,11 @@ spec:
                                         Number must be in the range 1 to 65535.
                                         Name must be an IANA_SVC_NAME.
                                       x-kubernetes-int-or-string: true
+                                    protocol:
+                                      description: |-
+                                        Protocol selects the wire protocol for the probe connection.
+                                        Nil defaults to HTTP/1.1.
+                                      type: string
                                     scheme:
                                       description: |-
                                         Scheme to use for connecting to the host.
@@ -3356,6 +3440,13 @@ spec:
                                 grpc:
                                   description: GRPC specifies a GRPC HealthCheckRequest.
                                   properties:
+                                    mode:
+                                      description: |-
+                                        mode specifies the connection mode for the gRPC health probe.
+                                        Set to "TLS" to use TLS without certificate verification.
+                                        Set to "Plaintext" to use a plaintext (insecure) connection explicitly.
+                                        If not specified, the probe uses a plaintext (insecure) connection.
+                                      type: string
                                     port:
                                       description: Port number of the gRPC service.
                                         Number must be in the range 1 to 65535.
@@ -3414,6 +3505,11 @@ spec:
                                         Number must be in the range 1 to 65535.
                                         Name must be an IANA_SVC_NAME.
                                       x-kubernetes-int-or-string: true
+                                    protocol:
+                                      description: |-
+                                        Protocol selects the wire protocol for the probe connection.
+                                        Nil defaults to HTTP/1.1.
+                                      type: string
                                     scheme:
                                       description: |-
                                         Scheme to use for connecting to the host.
@@ -3691,7 +3787,6 @@ spec:
                                     procMount denotes the type of proc mount to use for the containers.
                                     The default value is Default which uses the container runtime defaults for
                                     readonly paths and masked paths.
-                                    This requires the ProcMountType feature flag to be enabled.
                                     Note that this field cannot be set when spec.os.name is windows.
                                   type: string
                                 readOnlyRootFilesystem:
@@ -3839,6 +3934,13 @@ spec:
                                 grpc:
                                   description: GRPC specifies a GRPC HealthCheckRequest.
                                   properties:
+                                    mode:
+                                      description: |-
+                                        mode specifies the connection mode for the gRPC health probe.
+                                        Set to "TLS" to use TLS without certificate verification.
+                                        Set to "Plaintext" to use a plaintext (insecure) connection explicitly.
+                                        If not specified, the probe uses a plaintext (insecure) connection.
+                                      type: string
                                     port:
                                       description: Port number of the gRPC service.
                                         Number must be in the range 1 to 65535.
@@ -3897,6 +3999,11 @@ spec:
                                         Number must be in the range 1 to 65535.
                                         Name must be an IANA_SVC_NAME.
                                       x-kubernetes-int-or-string: true
+                                    protocol:
+                                      description: |-
+                                        Protocol selects the wire protocol for the probe connection.
+                                        Nil defaults to HTTP/1.1.
+                                      type: string
                                     scheme:
                                       description: |-
                                         Scheme to use for connecting to the host.
@@ -4047,10 +4154,21 @@ spec:
                                 description: VolumeMount describes a mounting of a
                                   Volume within a container.
                                 properties:
-                                  mountPath:
+                                  bindMountOptions:
                                     description: |-
-                                      Path within the container at which the volume should be mounted.  Must
-                                      not contain ':'.
+                                      bindMountOptions is the list of additional bind mount options to apply when
+                                      mounting this volume into the container. Allowed values are noexec,
+                                      nodev, and nosuid. These are Linux mount options and have no effect on
+                                      Windows nodes.
+                                      This field is not supported with image volumes.
+                                      This is an alpha field and requires enabling the VolumeBindMountOptions feature gate.
+                                    items:
+                                      type: string
+                                    type: array
+                                    x-kubernetes-list-type: set
+                                  mountPath:
+                                    description: Path within the container at which
+                                      the volume should be mounted.
                                     type: string
                                   mountPropagation:
                                     description: |-
@@ -4122,6 +4240,63 @@ spec:
                         x-kubernetes-list-map-keys:
                         - name
                         x-kubernetes-list-type: map
+                      evictionResponders:
+                        description: |-
+                          evictionResponders reference responders that react to Evictions based on EvictionRequests.
+                          Responders should observe and communicate through the Eviction Resource API to help with
+                          the graceful termination of a pod. The responders are selected sequentially, according to
+                          their specified priority.
+
+                          Responders should periodically report on an eviction progress by updating the
+                          .status.responders[].heartbeatTime field of the Eviction object. If this field is not updated
+                          within the heartbeat deadline defined by the Eviction API (currently 20 minutes), the eviction
+                          is passed over to the next responder with a lower priority. If there is no other responder,
+                          the last default imperative-eviction.k8s.io/evictor responder with a priority of 100 will
+                          evict the pod using the imperative Eviction API (pods/<name>/eviction subresource).
+
+                          The maximum length of the responders list is 10.
+                          Responders are not supported when the pod is part of a PodGroup (.spec.schedulingGroup is set).
+                          This field can only be set on creation and is immutable afterwards.
+                        items:
+                          description: |-
+                            EvictionResponder allows you to specify the responder reacting to an Eviction.
+                            Responders should observe and communicate through the Eviction Resource API to help with
+                            the graceful eviction of a target (e.g. termination of a pod).
+                          properties:
+                            name:
+                              description: |-
+                                name allows you to identify the responder responding to the Eviction.
+
+                                It must be a valid domain-prefixed key (such as "acme.io/foo").
+                                Domain names *.k8s.io and *.kubernetes.io are reserved.
+                                This field must be unique for each responder.
+                                This field is required.
+                              type: string
+                            priority:
+                              description: |-
+                                priority for this responder. Higher priorities are selected first by the evictionrequest-controller.
+                                If there are responders with the same priority, the responder whose domain name comes first in the
+                                alphabetical higher domain order, will be picked. This means that the top domain labels are compared
+                                alphabetically first, followed by the lower domain labels. The key is compared last.
+
+                                The responder that is the managing controller of the pod should set the value of
+                                this field to 10000 to allow both for preemption or fallback registration by other
+                                responders.
+
+                                The minimum value is 0 and the maximum value is 100000.
+                                The interval 0-999 is reserved for responders with *.k8s.io suffix.
+                                This field is required.
+                              format: int32
+                              type: integer
+                          required:
+                          - name
+                          - priority
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        type: array
+                        x-kubernetes-list-map-keys:
+                        - name
+                        x-kubernetes-list-type: map
                       hostAliases:
                         description: |-
                           HostAliases is an optional list of hosts and IPs that will be injected into the pod's hosts
@@ -4175,7 +4350,6 @@ spec:
                           When set to false, a new userns is created for the pod. Setting false is useful for
                           mitigating container breakout vulnerabilities even allowing users to run their
                           containers as root without actually having root privileges on the host.
-                          This field is alpha-level and is only honored by servers that enable the UserNamespacesSupport feature.
                         type: boolean
                       hostname:
                         description: |-
@@ -4193,7 +4367,6 @@ spec:
                           - `hostNetwork` must be set to false.
 
                           This field must be a valid DNS subdomain as defined in RFC 1123 and contain at most 64 characters.
-                          Requires the HostnameOverride feature gate to be enabled.
                         type: string
                       imagePullSecrets:
                         description: |-
@@ -4300,7 +4473,9 @@ spec:
                                         description: Selects a key of a ConfigMap.
                                         properties:
                                           key:
-                                            description: The key to select.
+                                            description: |-
+                                              The key to select from the ConfigMap's Data field.
+                                              Keys in the BinaryData field are not currently propagated to container env vars.
                                             type: string
                                           name:
                                             default: ""
@@ -4575,6 +4750,11 @@ spec:
                                             Number must be in the range 1 to 65535.
                                             Name must be an IANA_SVC_NAME.
                                           x-kubernetes-int-or-string: true
+                                        protocol:
+                                          description: |-
+                                            Protocol selects the wire protocol for the probe connection.
+                                            Nil defaults to HTTP/1.1.
+                                          type: string
                                         scheme:
                                           description: |-
                                             Scheme to use for connecting to the host.
@@ -4689,6 +4869,11 @@ spec:
                                             Number must be in the range 1 to 65535.
                                             Name must be an IANA_SVC_NAME.
                                           x-kubernetes-int-or-string: true
+                                        protocol:
+                                          description: |-
+                                            Protocol selects the wire protocol for the probe connection.
+                                            Nil defaults to HTTP/1.1.
+                                          type: string
                                         scheme:
                                           description: |-
                                             Scheme to use for connecting to the host.
@@ -4771,6 +4956,13 @@ spec:
                                 grpc:
                                   description: GRPC specifies a GRPC HealthCheckRequest.
                                   properties:
+                                    mode:
+                                      description: |-
+                                        mode specifies the connection mode for the gRPC health probe.
+                                        Set to "TLS" to use TLS without certificate verification.
+                                        Set to "Plaintext" to use a plaintext (insecure) connection explicitly.
+                                        If not specified, the probe uses a plaintext (insecure) connection.
+                                      type: string
                                     port:
                                       description: Port number of the gRPC service.
                                         Number must be in the range 1 to 65535.
@@ -4829,6 +5021,11 @@ spec:
                                         Number must be in the range 1 to 65535.
                                         Name must be an IANA_SVC_NAME.
                                       x-kubernetes-int-or-string: true
+                                    protocol:
+                                      description: |-
+                                        Protocol selects the wire protocol for the probe connection.
+                                        Nil defaults to HTTP/1.1.
+                                      type: string
                                     scheme:
                                       description: |-
                                         Scheme to use for connecting to the host.
@@ -4986,6 +5183,13 @@ spec:
                                 grpc:
                                   description: GRPC specifies a GRPC HealthCheckRequest.
                                   properties:
+                                    mode:
+                                      description: |-
+                                        mode specifies the connection mode for the gRPC health probe.
+                                        Set to "TLS" to use TLS without certificate verification.
+                                        Set to "Plaintext" to use a plaintext (insecure) connection explicitly.
+                                        If not specified, the probe uses a plaintext (insecure) connection.
+                                      type: string
                                     port:
                                       description: Port number of the gRPC service.
                                         Number must be in the range 1 to 65535.
@@ -5044,6 +5248,11 @@ spec:
                                         Number must be in the range 1 to 65535.
                                         Name must be an IANA_SVC_NAME.
                                       x-kubernetes-int-or-string: true
+                                    protocol:
+                                      description: |-
+                                        Protocol selects the wire protocol for the probe connection.
+                                        Nil defaults to HTTP/1.1.
+                                      type: string
                                     scheme:
                                       description: |-
                                         Scheme to use for connecting to the host.
@@ -5113,7 +5322,9 @@ spec:
                                   type: integer
                               type: object
                             resizePolicy:
-                              description: Resources resize policy for the container.
+                              description: |-
+                                Resources resize policy for the container.
+                                This field cannot be set on ephemeral containers.
                               items:
                                 description: ContainerResizePolicy represents resource
                                   resize policy for the container.
@@ -5343,7 +5554,6 @@ spec:
                                     procMount denotes the type of proc mount to use for the containers.
                                     The default value is Default which uses the container runtime defaults for
                                     readonly paths and masked paths.
-                                    This requires the ProcMountType feature flag to be enabled.
                                     Note that this field cannot be set when spec.os.name is windows.
                                   type: string
                                 readOnlyRootFilesystem:
@@ -5498,6 +5708,13 @@ spec:
                                 grpc:
                                   description: GRPC specifies a GRPC HealthCheckRequest.
                                   properties:
+                                    mode:
+                                      description: |-
+                                        mode specifies the connection mode for the gRPC health probe.
+                                        Set to "TLS" to use TLS without certificate verification.
+                                        Set to "Plaintext" to use a plaintext (insecure) connection explicitly.
+                                        If not specified, the probe uses a plaintext (insecure) connection.
+                                      type: string
                                     port:
                                       description: Port number of the gRPC service.
                                         Number must be in the range 1 to 65535.
@@ -5556,6 +5773,11 @@ spec:
                                         Number must be in the range 1 to 65535.
                                         Name must be an IANA_SVC_NAME.
                                       x-kubernetes-int-or-string: true
+                                    protocol:
+                                      description: |-
+                                        Protocol selects the wire protocol for the probe connection.
+                                        Nil defaults to HTTP/1.1.
+                                      type: string
                                     scheme:
                                       description: |-
                                         Scheme to use for connecting to the host.
@@ -5697,10 +5919,21 @@ spec:
                                 description: VolumeMount describes a mounting of a
                                   Volume within a container.
                                 properties:
-                                  mountPath:
+                                  bindMountOptions:
                                     description: |-
-                                      Path within the container at which the volume should be mounted.  Must
-                                      not contain ':'.
+                                      bindMountOptions is the list of additional bind mount options to apply when
+                                      mounting this volume into the container. Allowed values are noexec,
+                                      nodev, and nosuid. These are Linux mount options and have no effect on
+                                      Windows nodes.
+                                      This field is not supported with image volumes.
+                                      This is an alpha field and requires enabling the VolumeBindMountOptions feature gate.
+                                    items:
+                                      type: string
+                                    type: array
+                                    x-kubernetes-list-type: set
+                                  mountPath:
+                                    description: Path within the container at which
+                                      the volume should be mounted.
                                     type: string
                                   mountPropagation:
                                     description: |-
@@ -5854,6 +6087,8 @@ spec:
                         description: |-
                           PreemptionPolicy is the Policy for preempting pods with lower priority.
                           One of Never, PreemptLowerPriority.
+                          When Priority Admission Controller is enabled, it prevents users from setting
+                          this field. The admission controller populates this field from PriorityClassName.
                           Defaults to PreemptLowerPriority if unset.
                         type: string
                       priority:
@@ -5900,8 +6135,8 @@ spec:
                           will be made available to those containers which consume them
                           by name.
 
-                          This is an alpha field and requires enabling the
-                          DynamicResourceAllocation feature gate.
+                          This is a stable field but requires that the
+                          DynamicResourceAllocation feature gate is enabled.
 
                           This field is immutable.
                         items:
@@ -5912,6 +6147,14 @@ spec:
 
                             It adds a name to it that uniquely identifies the ResourceClaim inside the Pod.
                             Containers that need access to the ResourceClaim reference it with this name.
+
+                            When the DRAWorkloadResourceClaims feature gate is enabled and this Pod
+                            belongs to a PodGroup, a PodResourceClaim is matched to a
+                            PodGroupResourceClaim if all of their fields are equal (Name,
+                            ResourceClaimName, and ResourceClaimTemplateName). A matched claim references
+                            a single ResourceClaim shared across all Pods in the PodGroup, reserved for
+                            the PodGroup in ResourceClaimStatus.ReservedFor rather than for individual
+                            Pods.
                           properties:
                             name:
                               description: |-
@@ -5937,6 +6180,16 @@ spec:
                                 generated component, will be used to form a unique name for the
                                 ResourceClaim, which will be recorded in pod.status.resourceClaimStatuses.
 
+                                When the DRAWorkloadResourceClaims feature gate is enabled and the pod
+                                belongs to a PodGroup that defines a PodGroupResourceClaim with the same
+                                Name and ResourceClaimTemplateName, this PodResourceClaim resolves to the
+                                ResourceClaim generated for the PodGroup. All pods in the group that
+                                define an equivalent PodResourceClaim matching the
+                                PodGroupResourceClaim's Name and ResourceClaimTemplateName share the same
+                                generated ResourceClaim. ResourceClaims generated for a PodGroup are
+                                owned by the PodGroup and their lifecycles are tied to the PodGroup
+                                instead of any individual pod.
+
                                 This field is immutable and no changes will be made to the
                                 corresponding ResourceClaim by the control plane after creating the
                                 ResourceClaim.
@@ -6062,6 +6315,28 @@ spec:
                         x-kubernetes-list-map-keys:
                         - name
                         x-kubernetes-list-type: map
+                      schedulingGroup:
+                        description: |-
+                          SchedulingGroup provides a reference to the immediate scheduling runtime
+                          grouping object that this Pod belongs to.
+                          This field is used by the scheduler to identify the group and apply the
+                          correct group scheduling policies. The association with a group also
+                          impacts other lifecycle aspects of a Pod that are relevant in a wider context
+                          of scheduling like preemption, resource attachment, etc. If not specified,
+                          the Pod is treated as a single unit in all of these aspects.
+                          The group object referenced by this field may not exist at the time the
+                          Pod is created.
+                          This field is immutable, but a group object with the same name may be
+                          recreated with different policies. Doing this during pod scheduling
+                          may result in the placement not conforming to the expected policies.
+                        properties:
+                          podGroupName:
+                            description: |-
+                              PodGroupName specifies the name of the standalone PodGroup object
+                              that represents the runtime instance of this group.
+                              Must be a DNS subdomain.
+                            type: string
+                        type: object
                       securityContext:
                         description: |-
                           SecurityContext holds pod-level security attributes and common container settings.
@@ -6158,11 +6433,8 @@ spec:
                               Eligible volumes are in-tree FibreChannel and iSCSI volumes, and all CSI volumes
                               whose CSI driver announces SELinux support by setting spec.seLinuxMount: true in their
                               CSIDriver instance. Other volumes are always re-labelled recursively.
-                              "MountOption" value is allowed only when SELinuxMount feature gate is enabled.
 
-                              If not specified and SELinuxMount feature gate is enabled, "MountOption" is used.
-                              If not specified and SELinuxMount feature gate is disabled, "MountOption" is used for ReadWriteOncePod volumes
-                              and "Recursive" for all other volumes.
+                              If not specified, "MountOption" is used.
 
                               This field affects only Pods that have SELinux label set, either in PodSecurityContext or in SecurityContext of all containers.
 
@@ -6360,9 +6632,10 @@ spec:
                             operator:
                               description: |-
                                 Operator represents a key's relationship to the value.
-                                Valid operators are Exists and Equal. Defaults to Equal.
+                                Valid operators are Exists, Equal, Lt, and Gt. Defaults to Equal.
                                 Exists is equivalent to wildcard for value, so that a pod can
                                 tolerate all taints of a particular category.
+                                Lt and Gt perform numeric comparisons (requires feature gate TaintTolerationComparisonOperators).
                               type: string
                             tolerationSeconds:
                               description: |-
@@ -6781,6 +7054,13 @@ spec:
                                     mode, like fsGroup, and the result can be other mode bits set.
                                   format: int32
                                   type: integer
+                                defaultUser:
+                                  description: |-
+                                    defaultUser is Optional: The owner UID of the created files by default.
+                                    The defaultUser field is only used as a fallback when the item-level user field is unset.
+                                    (Alpha) This field requires the AtomicWriteVolumeUserFields feature gate to be enabled.
+                                  format: int64
+                                  type: integer
                                 items:
                                   description: |-
                                     items if unspecified, each key-value pair in the Data field of the referenced
@@ -6814,6 +7094,13 @@ spec:
                                           May not contain the path element '..'.
                                           May not start with the string '..'.
                                         type: string
+                                      user:
+                                        description: |-
+                                          user is Optional: The owner UID of the created file.
+                                          If specified, the item-level user field takes precedence over defaultUser.
+                                          (Alpha) This field requires the AtomicWriteVolumeUserFields feature gate to be enabled.
+                                        format: int64
+                                        type: integer
                                     required:
                                     - key
                                     - path
@@ -6901,6 +7188,13 @@ spec:
                                     mode, like fsGroup, and the result can be other mode bits set.
                                   format: int32
                                   type: integer
+                                defaultUser:
+                                  description: |-
+                                    defaultUser is Optional: The owner UID of the created files by default.
+                                    The defaultUser field is only used as a fallback when the item-level user field is unset.
+                                    (Alpha) This field requires the AtomicWriteVolumeUserFields feature gate to be enabled.
+                                  format: int64
+                                  type: integer
                                 items:
                                   description: Items is a list of downward API volume
                                     file
@@ -6969,6 +7263,13 @@ spec:
                                         - resource
                                         type: object
                                         x-kubernetes-map-type: atomic
+                                      user:
+                                        description: |-
+                                          user is Optional: The owner UID of the created file.
+                                          If specified, the item-level user field takes precedence over defaultUser.
+                                          (Alpha) This field requires the AtomicWriteVolumeUserFields feature gate to be enabled.
+                                        format: int64
+                                        type: integer
                                     required:
                                     - path
                                     type: object
@@ -6987,6 +7288,18 @@ spec:
                                     Must be an empty string (default) or Memory.
                                     More info: https://kubernetes.io/docs/concepts/storage/volumes#emptydir
                                   type: string
+                                mode:
+                                  description: |-
+                                    mode specifies the permission bits for the emptyDir directory, in numeric
+                                    notation (e.g., 0755, 01777). Must be a value between 0000 and 01777.
+                                    If not specified, defaults to 0777.
+                                    This might be in conflict with other options that affect the file
+                                    mode, like fsGroup. If fsGroup is specified, the fsGroup permissions
+                                    will override the mode specified here.
+                                    This field has no effect on Windows.
+                                    This field is alpha and requires EmptyDirVolumeMode featuregate to be enabled.
+                                  format: int32
+                                  type: integer
                                 sizeLimit:
                                   anyOf:
                                   - type: integer
@@ -7080,8 +7393,8 @@ spec:
                                             * An existing PVC (PersistentVolumeClaim)
                                             If the provisioner or an external controller can support the specified data source,
                                             it will create a new volume based on the contents of the specified data source.
-                                            When the AnyVolumeDataSource feature gate is enabled, dataSource contents will be copied to dataSourceRef,
-                                            and dataSourceRef contents will be copied to dataSource when dataSourceRef.namespace is not specified.
+                                            dataSource contents will be copied to dataSourceRef, and dataSourceRef contents will be
+                                            copied to dataSource when dataSourceRef.namespace is not specified.
                                             If the namespace is specified, then dataSourceRef will not be copied to dataSource.
                                           properties:
                                             apiGroup:
@@ -7126,7 +7439,6 @@ spec:
                                               specified.
                                             * While dataSource only allows local objects, dataSourceRef allows objects
                                               in any namespaces.
-                                            (Beta) Using this field requires the AnyVolumeDataSource feature gate to be enabled.
                                             (Alpha) Using the namespace field of dataSourceRef requires the CrossNamespaceVolumeDataSource feature gate to be enabled.
                                           properties:
                                             apiGroup:
@@ -7156,7 +7468,7 @@ spec:
                                         resources:
                                           description: |-
                                             resources represents the minimum resources the volume should have.
-                                            If RecoverVolumeExpansionFailure feature is enabled users are allowed to specify resource requirements
+                                            Users are allowed to specify resource requirements
                                             that are lower than previous value but must still be higher than capacity recorded in the
                                             status field of the claim.
                                             More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources
@@ -7489,7 +7801,7 @@ spec:
                                 A failure to resolve or pull the image during pod startup will block containers from starting and may add significant latency. Failures will be retried using normal volume backoff and will be reported on the pod reason and message.
                                 The types of objects that may be mounted by this volume are defined by the container runtime implementation on a host machine and at minimum must include all valid types supported by the container image field.
                                 The OCI object gets mounted in a single directory (spec.containers[*].volumeMounts.mountPath) by merging the manifest layers in the same way as for container images.
-                                The volume will be mounted read-only (ro) and non-executable files (noexec).
+                                The volume will be mounted read-only (ro).
                                 Sub path mounts for containers are not supported (spec.containers[*].volumeMounts.subpath) before 1.33.
                                 The field spec.securityContext.fsGroupChangePolicy has no effect on this volume type.
                               properties:
@@ -7661,8 +7973,7 @@ spec:
                               description: |-
                                 portworxVolume represents a portworx volume attached and mounted on kubelets host machine.
                                 Deprecated: PortworxVolume is deprecated. All operations for the in-tree portworxVolume type
-                                are redirected to the pxd.portworx.com CSI driver when the CSIMigrationPortworx feature-gate
-                                is on.
+                                are redirected to the pxd.portworx.com CSI driver.
                               properties:
                                 fsType:
                                   description: |-
@@ -7696,6 +8007,13 @@ spec:
                                     mode, like fsGroup, and the result can be other mode bits set.
                                   format: int32
                                   type: integer
+                                defaultUser:
+                                  description: |-
+                                    defaultUser is Optional: The owner UID of the created files by default.
+                                    The defaultUser field is only used as a fallback when the item-level user field is unset.
+                                    (Alpha) This field requires the AtomicWriteVolumeUserFields feature gate to be enabled.
+                                  format: int64
+                                  type: integer
                                 sources:
                                   description: |-
                                     sources is the list of volume projections. Each entry in this list
@@ -7796,6 +8114,13 @@ spec:
                                               Mutually-exclusive with name.  The contents of all selected
                                               ClusterTrustBundles will be unified and deduplicated.
                                             type: string
+                                          user:
+                                            description: |-
+                                              user is Optional: The owner UID of the created file.
+                                              If specified, the item-level user field takes precedence over defaultUser.
+                                              (Alpha) This field requires the AtomicWriteVolumeUserFields feature gate to be enabled.
+                                            format: int64
+                                            type: integer
                                         required:
                                         - path
                                         type: object
@@ -7836,6 +8161,13 @@ spec:
                                                     May not contain the path element '..'.
                                                     May not start with the string '..'.
                                                   type: string
+                                                user:
+                                                  description: |-
+                                                    user is Optional: The owner UID of the created file.
+                                                    If specified, the item-level user field takes precedence over defaultUser.
+                                                    (Alpha) This field requires the AtomicWriteVolumeUserFields feature gate to be enabled.
+                                                  format: int64
+                                                  type: integer
                                               required:
                                               - key
                                               - path
@@ -7935,6 +8267,13 @@ spec:
                                                   - resource
                                                   type: object
                                                   x-kubernetes-map-type: atomic
+                                                user:
+                                                  description: |-
+                                                    user is Optional: The owner UID of the created file.
+                                                    If specified, the item-level user field takes precedence over defaultUser.
+                                                    (Alpha) This field requires the AtomicWriteVolumeUserFields feature gate to be enabled.
+                                                  format: int64
+                                                  type: integer
                                               required:
                                               - path
                                               type: object
@@ -8042,6 +8381,31 @@ spec:
                                             description: Kubelet's generated CSRs
                                               will be addressed to this signer.
                                             type: string
+                                          user:
+                                            description: |-
+                                              user is Optional: The owner UID of the created file.
+                                              If specified, the item-level user field takes precedence over defaultUser.
+                                              (Alpha) This field requires the AtomicWriteVolumeUserFields feature gate to be enabled.
+                                            format: int64
+                                            type: integer
+                                          userAnnotations:
+                                            additionalProperties:
+                                              type: string
+                                            description: |-
+                                              userAnnotations allow pod authors to pass additional information to
+                                              the signer implementation.  Kubernetes does not restrict or validate this
+                                              metadata in any way.
+
+                                              These values are copied verbatim into the `spec.unverifiedUserAnnotations` field of
+                                              the PodCertificateRequest objects that Kubelet creates.
+
+                                              Entries are subject to the same validation as object metadata annotations,
+                                              with the addition that all keys must be domain-prefixed. No restrictions
+                                              are placed on values, except an overall size limitation on the entire field.
+
+                                              Signers should document the keys and values they support. Signers should
+                                              deny requests that contain keys they do not recognize.
+                                            type: object
                                         required:
                                         - keyType
                                         - signerName
@@ -8083,6 +8447,13 @@ spec:
                                                     May not contain the path element '..'.
                                                     May not start with the string '..'.
                                                   type: string
+                                                user:
+                                                  description: |-
+                                                    user is Optional: The owner UID of the created file.
+                                                    If specified, the item-level user field takes precedence over defaultUser.
+                                                    (Alpha) This field requires the AtomicWriteVolumeUserFields feature gate to be enabled.
+                                                  format: int64
+                                                  type: integer
                                               required:
                                               - key
                                               - path
@@ -8130,6 +8501,13 @@ spec:
                                               path is the path relative to the mount point of the file to project the
                                               token into.
                                             type: string
+                                          user:
+                                            description: |-
+                                              user is Optional: The owner UID of the created file.
+                                              If specified, the item-level user field takes precedence over defaultUser.
+                                              (Alpha) This field requires the AtomicWriteVolumeUserFields feature gate to be enabled.
+                                            format: int64
+                                            type: integer
                                         required:
                                         - path
                                         type: object
@@ -8336,6 +8714,13 @@ spec:
                                     mode, like fsGroup, and the result can be other mode bits set.
                                   format: int32
                                   type: integer
+                                defaultUser:
+                                  description: |-
+                                    defaultUser is Optional: The owner UID of the created files by default.
+                                    The defaultUser field is only used as a fallback when the item-level user field is unset.
+                                    (Alpha) This field requires the AtomicWriteVolumeUserFields feature gate to be enabled.
+                                  format: int64
+                                  type: integer
                                 items:
                                   description: |-
                                     items If unspecified, each key-value pair in the Data field of the referenced
@@ -8369,6 +8754,13 @@ spec:
                                           May not contain the path element '..'.
                                           May not start with the string '..'.
                                         type: string
+                                      user:
+                                        description: |-
+                                          user is Optional: The owner UID of the created file.
+                                          If specified, the item-level user field takes precedence over defaultUser.
+                                          (Alpha) This field requires the AtomicWriteVolumeUserFields feature gate to be enabled.
+                                        format: int64
+                                        type: integer
                                     required:
                                     - key
                                     - path
diff --git a/packages/system/backupstrategy-controller/definitions/strategy.backups.cozystack.io_cnpgs.yaml b/packages/system/backupstrategy-controller/definitions/strategy.backups.cozystack.io_cnpgs.yaml
index 1540eafe8a..961961fc52 100644
--- a/packages/system/backupstrategy-controller/definitions/strategy.backups.cozystack.io_cnpgs.yaml
+++ b/packages/system/backupstrategy-controller/definitions/strategy.backups.cozystack.io_cnpgs.yaml
@@ -20,10 +20,12 @@ spec:
         description: |-
           CNPG defines a backup strategy that delegates execution to the
           CloudNativePG operator (postgresql.cnpg.io). The strategy carries a
-          templated barmanObjectStore configuration that the driver injects into
-          the live cnpg.io Cluster of the application; backup runs are produced as
-          postgresql.cnpg.io/Backup objects and surfaced as Cozystack Backup
-          artifacts.
+          templated barman configuration that the driver applies to the live
+          application Cluster through the barman-cloud plugin: it renders an
+          ObjectStore CR (barmancloud.cnpg.io) and wires the Cluster's spec.plugins
+          to it (native spec.backup.barmanObjectStore is deprecated in CNPG 1.27 and
+          removed in 1.29). Backup runs are produced as postgresql.cnpg.io/Backup
+          objects with spec.method=plugin and surfaced as Cozystack Backup artifacts.
         properties:
           apiVersion:
             description: |-
@@ -61,9 +63,11 @@ spec:
                 properties:
                   barmanObjectStore:
                     description: |-
-                      BarmanObjectStore is the templated CloudNativePG barmanObjectStore
-                      configuration. Field semantics mirror
-                      postgresql.cnpg.io/v1.BarmanObjectStoreConfiguration.
+                      BarmanObjectStore is the templated barman configuration. Field semantics
+                      mirror postgresql.cnpg.io/v1.BarmanObjectStoreConfiguration; the driver
+                      projects it into a barmancloud.cnpg.io ObjectStore.spec.configuration
+                      (plus spec.retentionPolicy) and references it from the Cluster via the
+                      barman-cloud plugin. The field name is retained for API stability.
                     properties:
                       data:
                         description: Data carries optional Barman base-backup settings.
@@ -178,8 +182,11 @@ spec:
                   serverName:
                     description: |-
                       ServerName overrides the Barman server name used as the storage path
-                      prefix. When empty, the driver defaults it to the application name.
-                      Templating is supported.
+                      prefix. When empty, the driver defaults it to the Cluster name suffixed
+                      with the application UID, so a recreated application never archives
+                      into its predecessor's prefix. A Cluster that already has the
+                      barman-cloud plugin attached keeps its serverName. Templating is
+                      supported.
                     type: string
                 required:
                 - barmanObjectStore
diff --git a/packages/system/backupstrategy-controller/definitions/strategy.backups.cozystack.io_etcds.yaml b/packages/system/backupstrategy-controller/definitions/strategy.backups.cozystack.io_etcds.yaml
index 29414c742d..4ebf0214d9 100644
--- a/packages/system/backupstrategy-controller/definitions/strategy.backups.cozystack.io_etcds.yaml
+++ b/packages/system/backupstrategy-controller/definitions/strategy.backups.cozystack.io_etcds.yaml
@@ -19,16 +19,16 @@ spec:
       openAPIV3Schema:
         description: |-
           Etcd defines a backup strategy that delegates execution to the
-          etcd-operator (etcd.aenix.io). The strategy carries a templated backup
-          destination configuration; the driver materialises one
-          etcd.aenix.io/v1alpha1 EtcdBackup per Cozystack BackupJob and surfaces
+          etcd-operator (etcd-operator.cozystack.io). The strategy carries a templated
+          backup destination configuration; the driver materialises one
+          etcd-operator.cozystack.io/v1alpha2 EtcdSnapshot per Cozystack BackupJob and surfaces
           it as a Cozystack Backup artefact.
 
           Restore is in-place only: the driver suspends the source Etcd
           HelmRelease, snapshots the live EtcdCluster spec, deletes it, and
           re-creates the EtcdCluster with spec.bootstrap.restore.source
           pointing at the Backup's S3 coordinates, then resumes the HR after
-          the cluster reaches Ready.
+          the cluster becomes Available.
 
           To-copy restore is NOT supported: RestoreJob.spec.targetApplicationRef
           is a TypedLocalObjectReference (no namespace field), so there is no
@@ -63,7 +63,7 @@ spec:
             properties:
               template:
                 description: |-
-                  Template carries the templated EtcdBackup destination configuration
+                  Template carries the templated EtcdSnapshot destination configuration
                   applied per BackupJob (and re-rendered against the same
                   .Application / .Parameters at restore time). String fields support
                   Helm-style Go templating with two top-level values:
@@ -76,7 +76,7 @@ spec:
                   destination:
                     description: |-
                       Destination defines where the etcd snapshot will be stored. Field
-                      semantics mirror etcd.aenix.io/v1alpha1 EtcdBackup.spec.destination.
+                      semantics mirror etcd-operator.cozystack.io/v1alpha2 EtcdSnapshot.spec.destination.
                     properties:
                       s3:
                         description: |-
diff --git a/packages/system/backupstrategy-controller/definitions/strategy.backups.cozystack.io_foundationdbs.yaml b/packages/system/backupstrategy-controller/definitions/strategy.backups.cozystack.io_foundationdbs.yaml
index 68ef6f6bef..7becb4601f 100644
--- a/packages/system/backupstrategy-controller/definitions/strategy.backups.cozystack.io_foundationdbs.yaml
+++ b/packages/system/backupstrategy-controller/definitions/strategy.backups.cozystack.io_foundationdbs.yaml
@@ -1097,7 +1097,9 @@ spec:
                                             description: Selects a key of a ConfigMap.
                                             properties:
                                               key:
-                                                description: The key to select.
+                                                description: |-
+                                                  The key to select from the ConfigMap's Data field.
+                                                  Keys in the BinaryData field are not currently propagated to container env vars.
                                                 type: string
                                               name:
                                                 default: ""
@@ -1376,6 +1378,11 @@ spec:
                                                 Number must be in the range 1 to 65535.
                                                 Name must be an IANA_SVC_NAME.
                                               x-kubernetes-int-or-string: true
+                                            protocol:
+                                              description: |-
+                                                Protocol selects the wire protocol for the probe connection.
+                                                Nil defaults to HTTP/1.1.
+                                              type: string
                                             scheme:
                                               description: |-
                                                 Scheme to use for connecting to the host.
@@ -1493,6 +1500,11 @@ spec:
                                                 Number must be in the range 1 to 65535.
                                                 Name must be an IANA_SVC_NAME.
                                               x-kubernetes-int-or-string: true
+                                            protocol:
+                                              description: |-
+                                                Protocol selects the wire protocol for the probe connection.
+                                                Nil defaults to HTTP/1.1.
+                                              type: string
                                             scheme:
                                               description: |-
                                                 Scheme to use for connecting to the host.
@@ -1575,6 +1587,13 @@ spec:
                                     grpc:
                                       description: GRPC specifies a GRPC HealthCheckRequest.
                                       properties:
+                                        mode:
+                                          description: |-
+                                            mode specifies the connection mode for the gRPC health probe.
+                                            Set to "TLS" to use TLS without certificate verification.
+                                            Set to "Plaintext" to use a plaintext (insecure) connection explicitly.
+                                            If not specified, the probe uses a plaintext (insecure) connection.
+                                          type: string
                                         port:
                                           description: Port number of the gRPC service.
                                             Number must be in the range 1 to 65535.
@@ -1634,6 +1653,11 @@ spec:
                                             Number must be in the range 1 to 65535.
                                             Name must be an IANA_SVC_NAME.
                                           x-kubernetes-int-or-string: true
+                                        protocol:
+                                          description: |-
+                                            Protocol selects the wire protocol for the probe connection.
+                                            Nil defaults to HTTP/1.1.
+                                          type: string
                                         scheme:
                                           description: |-
                                             Scheme to use for connecting to the host.
@@ -1791,6 +1815,13 @@ spec:
                                     grpc:
                                       description: GRPC specifies a GRPC HealthCheckRequest.
                                       properties:
+                                        mode:
+                                          description: |-
+                                            mode specifies the connection mode for the gRPC health probe.
+                                            Set to "TLS" to use TLS without certificate verification.
+                                            Set to "Plaintext" to use a plaintext (insecure) connection explicitly.
+                                            If not specified, the probe uses a plaintext (insecure) connection.
+                                          type: string
                                         port:
                                           description: Port number of the gRPC service.
                                             Number must be in the range 1 to 65535.
@@ -1850,6 +1881,11 @@ spec:
                                             Number must be in the range 1 to 65535.
                                             Name must be an IANA_SVC_NAME.
                                           x-kubernetes-int-or-string: true
+                                        protocol:
+                                          description: |-
+                                            Protocol selects the wire protocol for the probe connection.
+                                            Nil defaults to HTTP/1.1.
+                                          type: string
                                         scheme:
                                           description: |-
                                             Scheme to use for connecting to the host.
@@ -1919,7 +1955,9 @@ spec:
                                       type: integer
                                   type: object
                                 resizePolicy:
-                                  description: Resources resize policy for the container.
+                                  description: |-
+                                    Resources resize policy for the container.
+                                    This field cannot be set on ephemeral containers.
                                   items:
                                     description: ContainerResizePolicy represents
                                       resource resize policy for the container.
@@ -2149,7 +2187,6 @@ spec:
                                         procMount denotes the type of proc mount to use for the containers.
                                         The default value is Default which uses the container runtime defaults for
                                         readonly paths and masked paths.
-                                        This requires the ProcMountType feature flag to be enabled.
                                         Note that this field cannot be set when spec.os.name is windows.
                                       type: string
                                     readOnlyRootFilesystem:
@@ -2304,6 +2341,13 @@ spec:
                                     grpc:
                                       description: GRPC specifies a GRPC HealthCheckRequest.
                                       properties:
+                                        mode:
+                                          description: |-
+                                            mode specifies the connection mode for the gRPC health probe.
+                                            Set to "TLS" to use TLS without certificate verification.
+                                            Set to "Plaintext" to use a plaintext (insecure) connection explicitly.
+                                            If not specified, the probe uses a plaintext (insecure) connection.
+                                          type: string
                                         port:
                                           description: Port number of the gRPC service.
                                             Number must be in the range 1 to 65535.
@@ -2363,6 +2407,11 @@ spec:
                                             Number must be in the range 1 to 65535.
                                             Name must be an IANA_SVC_NAME.
                                           x-kubernetes-int-or-string: true
+                                        protocol:
+                                          description: |-
+                                            Protocol selects the wire protocol for the probe connection.
+                                            Nil defaults to HTTP/1.1.
+                                          type: string
                                         scheme:
                                           description: |-
                                             Scheme to use for connecting to the host.
@@ -2504,10 +2553,21 @@ spec:
                                     description: VolumeMount describes a mounting
                                       of a Volume within a container.
                                     properties:
-                                      mountPath:
+                                      bindMountOptions:
                                         description: |-
-                                          Path within the container at which the volume should be mounted.  Must
-                                          not contain ':'.
+                                          bindMountOptions is the list of additional bind mount options to apply when
+                                          mounting this volume into the container. Allowed values are noexec,
+                                          nodev, and nosuid. These are Linux mount options and have no effect on
+                                          Windows nodes.
+                                          This field is not supported with image volumes.
+                                          This is an alpha field and requires enabling the VolumeBindMountOptions feature gate.
+                                        items:
+                                          type: string
+                                        type: array
+                                        x-kubernetes-list-type: set
+                                      mountPath:
+                                        description: Path within the container at
+                                          which the volume should be mounted.
                                         type: string
                                       mountPropagation:
                                         description: |-
@@ -2720,7 +2780,9 @@ spec:
                                             description: Selects a key of a ConfigMap.
                                             properties:
                                               key:
-                                                description: The key to select.
+                                                description: |-
+                                                  The key to select from the ConfigMap's Data field.
+                                                  Keys in the BinaryData field are not currently propagated to container env vars.
                                                 type: string
                                               name:
                                                 default: ""
@@ -2996,6 +3058,11 @@ spec:
                                                 Number must be in the range 1 to 65535.
                                                 Name must be an IANA_SVC_NAME.
                                               x-kubernetes-int-or-string: true
+                                            protocol:
+                                              description: |-
+                                                Protocol selects the wire protocol for the probe connection.
+                                                Nil defaults to HTTP/1.1.
+                                              type: string
                                             scheme:
                                               description: |-
                                                 Scheme to use for connecting to the host.
@@ -3113,6 +3180,11 @@ spec:
                                                 Number must be in the range 1 to 65535.
                                                 Name must be an IANA_SVC_NAME.
                                               x-kubernetes-int-or-string: true
+                                            protocol:
+                                              description: |-
+                                                Protocol selects the wire protocol for the probe connection.
+                                                Nil defaults to HTTP/1.1.
+                                              type: string
                                             scheme:
                                               description: |-
                                                 Scheme to use for connecting to the host.
@@ -3192,6 +3264,13 @@ spec:
                                     grpc:
                                       description: GRPC specifies a GRPC HealthCheckRequest.
                                       properties:
+                                        mode:
+                                          description: |-
+                                            mode specifies the connection mode for the gRPC health probe.
+                                            Set to "TLS" to use TLS without certificate verification.
+                                            Set to "Plaintext" to use a plaintext (insecure) connection explicitly.
+                                            If not specified, the probe uses a plaintext (insecure) connection.
+                                          type: string
                                         port:
                                           description: Port number of the gRPC service.
                                             Number must be in the range 1 to 65535.
@@ -3251,6 +3330,11 @@ spec:
                                             Number must be in the range 1 to 65535.
                                             Name must be an IANA_SVC_NAME.
                                           x-kubernetes-int-or-string: true
+                                        protocol:
+                                          description: |-
+                                            Protocol selects the wire protocol for the probe connection.
+                                            Nil defaults to HTTP/1.1.
+                                          type: string
                                         scheme:
                                           description: |-
                                             Scheme to use for connecting to the host.
@@ -3398,6 +3482,13 @@ spec:
                                     grpc:
                                       description: GRPC specifies a GRPC HealthCheckRequest.
                                       properties:
+                                        mode:
+                                          description: |-
+                                            mode specifies the connection mode for the gRPC health probe.
+                                            Set to "TLS" to use TLS without certificate verification.
+                                            Set to "Plaintext" to use a plaintext (insecure) connection explicitly.
+                                            If not specified, the probe uses a plaintext (insecure) connection.
+                                          type: string
                                         port:
                                           description: Port number of the gRPC service.
                                             Number must be in the range 1 to 65535.
@@ -3457,6 +3548,11 @@ spec:
                                             Number must be in the range 1 to 65535.
                                             Name must be an IANA_SVC_NAME.
                                           x-kubernetes-int-or-string: true
+                                        protocol:
+                                          description: |-
+                                            Protocol selects the wire protocol for the probe connection.
+                                            Nil defaults to HTTP/1.1.
+                                          type: string
                                         scheme:
                                           description: |-
                                             Scheme to use for connecting to the host.
@@ -3734,7 +3830,6 @@ spec:
                                         procMount denotes the type of proc mount to use for the containers.
                                         The default value is Default which uses the container runtime defaults for
                                         readonly paths and masked paths.
-                                        This requires the ProcMountType feature flag to be enabled.
                                         Note that this field cannot be set when spec.os.name is windows.
                                       type: string
                                     readOnlyRootFilesystem:
@@ -3883,6 +3978,13 @@ spec:
                                     grpc:
                                       description: GRPC specifies a GRPC HealthCheckRequest.
                                       properties:
+                                        mode:
+                                          description: |-
+                                            mode specifies the connection mode for the gRPC health probe.
+                                            Set to "TLS" to use TLS without certificate verification.
+                                            Set to "Plaintext" to use a plaintext (insecure) connection explicitly.
+                                            If not specified, the probe uses a plaintext (insecure) connection.
+                                          type: string
                                         port:
                                           description: Port number of the gRPC service.
                                             Number must be in the range 1 to 65535.
@@ -3942,6 +4044,11 @@ spec:
                                             Number must be in the range 1 to 65535.
                                             Name must be an IANA_SVC_NAME.
                                           x-kubernetes-int-or-string: true
+                                        protocol:
+                                          description: |-
+                                            Protocol selects the wire protocol for the probe connection.
+                                            Nil defaults to HTTP/1.1.
+                                          type: string
                                         scheme:
                                           description: |-
                                             Scheme to use for connecting to the host.
@@ -4092,10 +4199,21 @@ spec:
                                     description: VolumeMount describes a mounting
                                       of a Volume within a container.
                                     properties:
-                                      mountPath:
+                                      bindMountOptions:
                                         description: |-
-                                          Path within the container at which the volume should be mounted.  Must
-                                          not contain ':'.
+                                          bindMountOptions is the list of additional bind mount options to apply when
+                                          mounting this volume into the container. Allowed values are noexec,
+                                          nodev, and nosuid. These are Linux mount options and have no effect on
+                                          Windows nodes.
+                                          This field is not supported with image volumes.
+                                          This is an alpha field and requires enabling the VolumeBindMountOptions feature gate.
+                                        items:
+                                          type: string
+                                        type: array
+                                        x-kubernetes-list-type: set
+                                      mountPath:
+                                        description: Path within the container at
+                                          which the volume should be mounted.
                                         type: string
                                       mountPropagation:
                                         description: |-
@@ -4168,6 +4286,63 @@ spec:
                             x-kubernetes-list-map-keys:
                             - name
                             x-kubernetes-list-type: map
+                          evictionResponders:
+                            description: |-
+                              evictionResponders reference responders that react to Evictions based on EvictionRequests.
+                              Responders should observe and communicate through the Eviction Resource API to help with
+                              the graceful termination of a pod. The responders are selected sequentially, according to
+                              their specified priority.
+
+                              Responders should periodically report on an eviction progress by updating the
+                              .status.responders[].heartbeatTime field of the Eviction object. If this field is not updated
+                              within the heartbeat deadline defined by the Eviction API (currently 20 minutes), the eviction
+                              is passed over to the next responder with a lower priority. If there is no other responder,
+                              the last default imperative-eviction.k8s.io/evictor responder with a priority of 100 will
+                              evict the pod using the imperative Eviction API (pods/<name>/eviction subresource).
+
+                              The maximum length of the responders list is 10.
+                              Responders are not supported when the pod is part of a PodGroup (.spec.schedulingGroup is set).
+                              This field can only be set on creation and is immutable afterwards.
+                            items:
+                              description: |-
+                                EvictionResponder allows you to specify the responder reacting to an Eviction.
+                                Responders should observe and communicate through the Eviction Resource API to help with
+                                the graceful eviction of a target (e.g. termination of a pod).
+                              properties:
+                                name:
+                                  description: |-
+                                    name allows you to identify the responder responding to the Eviction.
+
+                                    It must be a valid domain-prefixed key (such as "acme.io/foo").
+                                    Domain names *.k8s.io and *.kubernetes.io are reserved.
+                                    This field must be unique for each responder.
+                                    This field is required.
+                                  type: string
+                                priority:
+                                  description: |-
+                                    priority for this responder. Higher priorities are selected first by the evictionrequest-controller.
+                                    If there are responders with the same priority, the responder whose domain name comes first in the
+                                    alphabetical higher domain order, will be picked. This means that the top domain labels are compared
+                                    alphabetically first, followed by the lower domain labels. The key is compared last.
+
+                                    The responder that is the managing controller of the pod should set the value of
+                                    this field to 10000 to allow both for preemption or fallback registration by other
+                                    responders.
+
+                                    The minimum value is 0 and the maximum value is 100000.
+                                    The interval 0-999 is reserved for responders with *.k8s.io suffix.
+                                    This field is required.
+                                  format: int32
+                                  type: integer
+                              required:
+                              - name
+                              - priority
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            type: array
+                            x-kubernetes-list-map-keys:
+                            - name
+                            x-kubernetes-list-type: map
                           hostAliases:
                             description: |-
                               HostAliases is an optional list of hosts and IPs that will be injected into the pod's hosts
@@ -4221,7 +4396,6 @@ spec:
                               When set to false, a new userns is created for the pod. Setting false is useful for
                               mitigating container breakout vulnerabilities even allowing users to run their
                               containers as root without actually having root privileges on the host.
-                              This field is alpha-level and is only honored by servers that enable the UserNamespacesSupport feature.
                             type: boolean
                           hostname:
                             description: |-
@@ -4239,7 +4413,6 @@ spec:
                               - `hostNetwork` must be set to false.
 
                               This field must be a valid DNS subdomain as defined in RFC 1123 and contain at most 64 characters.
-                              Requires the HostnameOverride feature gate to be enabled.
                             type: string
                           imagePullSecrets:
                             description: |-
@@ -4346,7 +4519,9 @@ spec:
                                             description: Selects a key of a ConfigMap.
                                             properties:
                                               key:
-                                                description: The key to select.
+                                                description: |-
+                                                  The key to select from the ConfigMap's Data field.
+                                                  Keys in the BinaryData field are not currently propagated to container env vars.
                                                 type: string
                                               name:
                                                 default: ""
@@ -4625,6 +4800,11 @@ spec:
                                                 Number must be in the range 1 to 65535.
                                                 Name must be an IANA_SVC_NAME.
                                               x-kubernetes-int-or-string: true
+                                            protocol:
+                                              description: |-
+                                                Protocol selects the wire protocol for the probe connection.
+                                                Nil defaults to HTTP/1.1.
+                                              type: string
                                             scheme:
                                               description: |-
                                                 Scheme to use for connecting to the host.
@@ -4742,6 +4922,11 @@ spec:
                                                 Number must be in the range 1 to 65535.
                                                 Name must be an IANA_SVC_NAME.
                                               x-kubernetes-int-or-string: true
+                                            protocol:
+                                              description: |-
+                                                Protocol selects the wire protocol for the probe connection.
+                                                Nil defaults to HTTP/1.1.
+                                              type: string
                                             scheme:
                                               description: |-
                                                 Scheme to use for connecting to the host.
@@ -4824,6 +5009,13 @@ spec:
                                     grpc:
                                       description: GRPC specifies a GRPC HealthCheckRequest.
                                       properties:
+                                        mode:
+                                          description: |-
+                                            mode specifies the connection mode for the gRPC health probe.
+                                            Set to "TLS" to use TLS without certificate verification.
+                                            Set to "Plaintext" to use a plaintext (insecure) connection explicitly.
+                                            If not specified, the probe uses a plaintext (insecure) connection.
+                                          type: string
                                         port:
                                           description: Port number of the gRPC service.
                                             Number must be in the range 1 to 65535.
@@ -4883,6 +5075,11 @@ spec:
                                             Number must be in the range 1 to 65535.
                                             Name must be an IANA_SVC_NAME.
                                           x-kubernetes-int-or-string: true
+                                        protocol:
+                                          description: |-
+                                            Protocol selects the wire protocol for the probe connection.
+                                            Nil defaults to HTTP/1.1.
+                                          type: string
                                         scheme:
                                           description: |-
                                             Scheme to use for connecting to the host.
@@ -5040,6 +5237,13 @@ spec:
                                     grpc:
                                       description: GRPC specifies a GRPC HealthCheckRequest.
                                       properties:
+                                        mode:
+                                          description: |-
+                                            mode specifies the connection mode for the gRPC health probe.
+                                            Set to "TLS" to use TLS without certificate verification.
+                                            Set to "Plaintext" to use a plaintext (insecure) connection explicitly.
+                                            If not specified, the probe uses a plaintext (insecure) connection.
+                                          type: string
                                         port:
                                           description: Port number of the gRPC service.
                                             Number must be in the range 1 to 65535.
@@ -5099,6 +5303,11 @@ spec:
                                             Number must be in the range 1 to 65535.
                                             Name must be an IANA_SVC_NAME.
                                           x-kubernetes-int-or-string: true
+                                        protocol:
+                                          description: |-
+                                            Protocol selects the wire protocol for the probe connection.
+                                            Nil defaults to HTTP/1.1.
+                                          type: string
                                         scheme:
                                           description: |-
                                             Scheme to use for connecting to the host.
@@ -5168,7 +5377,9 @@ spec:
                                       type: integer
                                   type: object
                                 resizePolicy:
-                                  description: Resources resize policy for the container.
+                                  description: |-
+                                    Resources resize policy for the container.
+                                    This field cannot be set on ephemeral containers.
                                   items:
                                     description: ContainerResizePolicy represents
                                       resource resize policy for the container.
@@ -5398,7 +5609,6 @@ spec:
                                         procMount denotes the type of proc mount to use for the containers.
                                         The default value is Default which uses the container runtime defaults for
                                         readonly paths and masked paths.
-                                        This requires the ProcMountType feature flag to be enabled.
                                         Note that this field cannot be set when spec.os.name is windows.
                                       type: string
                                     readOnlyRootFilesystem:
@@ -5553,6 +5763,13 @@ spec:
                                     grpc:
                                       description: GRPC specifies a GRPC HealthCheckRequest.
                                       properties:
+                                        mode:
+                                          description: |-
+                                            mode specifies the connection mode for the gRPC health probe.
+                                            Set to "TLS" to use TLS without certificate verification.
+                                            Set to "Plaintext" to use a plaintext (insecure) connection explicitly.
+                                            If not specified, the probe uses a plaintext (insecure) connection.
+                                          type: string
                                         port:
                                           description: Port number of the gRPC service.
                                             Number must be in the range 1 to 65535.
@@ -5612,6 +5829,11 @@ spec:
                                             Number must be in the range 1 to 65535.
                                             Name must be an IANA_SVC_NAME.
                                           x-kubernetes-int-or-string: true
+                                        protocol:
+                                          description: |-
+                                            Protocol selects the wire protocol for the probe connection.
+                                            Nil defaults to HTTP/1.1.
+                                          type: string
                                         scheme:
                                           description: |-
                                             Scheme to use for connecting to the host.
@@ -5753,10 +5975,21 @@ spec:
                                     description: VolumeMount describes a mounting
                                       of a Volume within a container.
                                     properties:
-                                      mountPath:
+                                      bindMountOptions:
                                         description: |-
-                                          Path within the container at which the volume should be mounted.  Must
-                                          not contain ':'.
+                                          bindMountOptions is the list of additional bind mount options to apply when
+                                          mounting this volume into the container. Allowed values are noexec,
+                                          nodev, and nosuid. These are Linux mount options and have no effect on
+                                          Windows nodes.
+                                          This field is not supported with image volumes.
+                                          This is an alpha field and requires enabling the VolumeBindMountOptions feature gate.
+                                        items:
+                                          type: string
+                                        type: array
+                                        x-kubernetes-list-type: set
+                                      mountPath:
+                                        description: Path within the container at
+                                          which the volume should be mounted.
                                         type: string
                                       mountPropagation:
                                         description: |-
@@ -5911,6 +6144,8 @@ spec:
                             description: |-
                               PreemptionPolicy is the Policy for preempting pods with lower priority.
                               One of Never, PreemptLowerPriority.
+                              When Priority Admission Controller is enabled, it prevents users from setting
+                              this field. The admission controller populates this field from PriorityClassName.
                               Defaults to PreemptLowerPriority if unset.
                             type: string
                           priority:
@@ -5957,8 +6192,8 @@ spec:
                               will be made available to those containers which consume them
                               by name.
 
-                              This is an alpha field and requires enabling the
-                              DynamicResourceAllocation feature gate.
+                              This is a stable field but requires that the
+                              DynamicResourceAllocation feature gate is enabled.
 
                               This field is immutable.
                             items:
@@ -5969,6 +6204,14 @@ spec:
 
                                 It adds a name to it that uniquely identifies the ResourceClaim inside the Pod.
                                 Containers that need access to the ResourceClaim reference it with this name.
+
+                                When the DRAWorkloadResourceClaims feature gate is enabled and this Pod
+                                belongs to a PodGroup, a PodResourceClaim is matched to a
+                                PodGroupResourceClaim if all of their fields are equal (Name,
+                                ResourceClaimName, and ResourceClaimTemplateName). A matched claim references
+                                a single ResourceClaim shared across all Pods in the PodGroup, reserved for
+                                the PodGroup in ResourceClaimStatus.ReservedFor rather than for individual
+                                Pods.
                               properties:
                                 name:
                                   description: |-
@@ -5994,6 +6237,16 @@ spec:
                                     generated component, will be used to form a unique name for the
                                     ResourceClaim, which will be recorded in pod.status.resourceClaimStatuses.
 
+                                    When the DRAWorkloadResourceClaims feature gate is enabled and the pod
+                                    belongs to a PodGroup that defines a PodGroupResourceClaim with the same
+                                    Name and ResourceClaimTemplateName, this PodResourceClaim resolves to the
+                                    ResourceClaim generated for the PodGroup. All pods in the group that
+                                    define an equivalent PodResourceClaim matching the
+                                    PodGroupResourceClaim's Name and ResourceClaimTemplateName share the same
+                                    generated ResourceClaim. ResourceClaims generated for a PodGroup are
+                                    owned by the PodGroup and their lifecycles are tied to the PodGroup
+                                    instead of any individual pod.
+
                                     This field is immutable and no changes will be made to the
                                     corresponding ResourceClaim by the control plane after creating the
                                     ResourceClaim.
@@ -6120,6 +6373,28 @@ spec:
                             x-kubernetes-list-map-keys:
                             - name
                             x-kubernetes-list-type: map
+                          schedulingGroup:
+                            description: |-
+                              SchedulingGroup provides a reference to the immediate scheduling runtime
+                              grouping object that this Pod belongs to.
+                              This field is used by the scheduler to identify the group and apply the
+                              correct group scheduling policies. The association with a group also
+                              impacts other lifecycle aspects of a Pod that are relevant in a wider context
+                              of scheduling like preemption, resource attachment, etc. If not specified,
+                              the Pod is treated as a single unit in all of these aspects.
+                              The group object referenced by this field may not exist at the time the
+                              Pod is created.
+                              This field is immutable, but a group object with the same name may be
+                              recreated with different policies. Doing this during pod scheduling
+                              may result in the placement not conforming to the expected policies.
+                            properties:
+                              podGroupName:
+                                description: |-
+                                  PodGroupName specifies the name of the standalone PodGroup object
+                                  that represents the runtime instance of this group.
+                                  Must be a DNS subdomain.
+                                type: string
+                            type: object
                           securityContext:
                             description: |-
                               SecurityContext holds pod-level security attributes and common container settings.
@@ -6216,11 +6491,8 @@ spec:
                                   Eligible volumes are in-tree FibreChannel and iSCSI volumes, and all CSI volumes
                                   whose CSI driver announces SELinux support by setting spec.seLinuxMount: true in their
                                   CSIDriver instance. Other volumes are always re-labelled recursively.
-                                  "MountOption" value is allowed only when SELinuxMount feature gate is enabled.
 
-                                  If not specified and SELinuxMount feature gate is enabled, "MountOption" is used.
-                                  If not specified and SELinuxMount feature gate is disabled, "MountOption" is used for ReadWriteOncePod volumes
-                                  and "Recursive" for all other volumes.
+                                  If not specified, "MountOption" is used.
 
                                   This field affects only Pods that have SELinux label set, either in PodSecurityContext or in SecurityContext of all containers.
 
@@ -6418,9 +6690,10 @@ spec:
                                 operator:
                                   description: |-
                                     Operator represents a key's relationship to the value.
-                                    Valid operators are Exists and Equal. Defaults to Equal.
+                                    Valid operators are Exists, Equal, Lt, and Gt. Defaults to Equal.
                                     Exists is equivalent to wildcard for value, so that a pod can
                                     tolerate all taints of a particular category.
+                                    Lt and Gt perform numeric comparisons (requires feature gate TaintTolerationComparisonOperators).
                                   type: string
                                 tolerationSeconds:
                                   description: |-
@@ -6841,6 +7114,13 @@ spec:
                                         mode, like fsGroup, and the result can be other mode bits set.
                                       format: int32
                                       type: integer
+                                    defaultUser:
+                                      description: |-
+                                        defaultUser is Optional: The owner UID of the created files by default.
+                                        The defaultUser field is only used as a fallback when the item-level user field is unset.
+                                        (Alpha) This field requires the AtomicWriteVolumeUserFields feature gate to be enabled.
+                                      format: int64
+                                      type: integer
                                     items:
                                       description: |-
                                         items if unspecified, each key-value pair in the Data field of the referenced
@@ -6874,6 +7154,13 @@ spec:
                                               May not contain the path element '..'.
                                               May not start with the string '..'.
                                             type: string
+                                          user:
+                                            description: |-
+                                              user is Optional: The owner UID of the created file.
+                                              If specified, the item-level user field takes precedence over defaultUser.
+                                              (Alpha) This field requires the AtomicWriteVolumeUserFields feature gate to be enabled.
+                                            format: int64
+                                            type: integer
                                         required:
                                         - key
                                         - path
@@ -6961,6 +7248,13 @@ spec:
                                         mode, like fsGroup, and the result can be other mode bits set.
                                       format: int32
                                       type: integer
+                                    defaultUser:
+                                      description: |-
+                                        defaultUser is Optional: The owner UID of the created files by default.
+                                        The defaultUser field is only used as a fallback when the item-level user field is unset.
+                                        (Alpha) This field requires the AtomicWriteVolumeUserFields feature gate to be enabled.
+                                      format: int64
+                                      type: integer
                                     items:
                                       description: Items is a list of downward API
                                         volume file
@@ -7031,6 +7325,13 @@ spec:
                                             - resource
                                             type: object
                                             x-kubernetes-map-type: atomic
+                                          user:
+                                            description: |-
+                                              user is Optional: The owner UID of the created file.
+                                              If specified, the item-level user field takes precedence over defaultUser.
+                                              (Alpha) This field requires the AtomicWriteVolumeUserFields feature gate to be enabled.
+                                            format: int64
+                                            type: integer
                                         required:
                                         - path
                                         type: object
@@ -7049,6 +7350,18 @@ spec:
                                         Must be an empty string (default) or Memory.
                                         More info: https://kubernetes.io/docs/concepts/storage/volumes#emptydir
                                       type: string
+                                    mode:
+                                      description: |-
+                                        mode specifies the permission bits for the emptyDir directory, in numeric
+                                        notation (e.g., 0755, 01777). Must be a value between 0000 and 01777.
+                                        If not specified, defaults to 0777.
+                                        This might be in conflict with other options that affect the file
+                                        mode, like fsGroup. If fsGroup is specified, the fsGroup permissions
+                                        will override the mode specified here.
+                                        This field has no effect on Windows.
+                                        This field is alpha and requires EmptyDirVolumeMode featuregate to be enabled.
+                                      format: int32
+                                      type: integer
                                     sizeLimit:
                                       anyOf:
                                       - type: integer
@@ -7142,8 +7455,8 @@ spec:
                                                 * An existing PVC (PersistentVolumeClaim)
                                                 If the provisioner or an external controller can support the specified data source,
                                                 it will create a new volume based on the contents of the specified data source.
-                                                When the AnyVolumeDataSource feature gate is enabled, dataSource contents will be copied to dataSourceRef,
-                                                and dataSourceRef contents will be copied to dataSource when dataSourceRef.namespace is not specified.
+                                                dataSource contents will be copied to dataSourceRef, and dataSourceRef contents will be
+                                                copied to dataSource when dataSourceRef.namespace is not specified.
                                                 If the namespace is specified, then dataSourceRef will not be copied to dataSource.
                                               properties:
                                                 apiGroup:
@@ -7188,7 +7501,6 @@ spec:
                                                   specified.
                                                 * While dataSource only allows local objects, dataSourceRef allows objects
                                                   in any namespaces.
-                                                (Beta) Using this field requires the AnyVolumeDataSource feature gate to be enabled.
                                                 (Alpha) Using the namespace field of dataSourceRef requires the CrossNamespaceVolumeDataSource feature gate to be enabled.
                                               properties:
                                                 apiGroup:
@@ -7218,7 +7530,7 @@ spec:
                                             resources:
                                               description: |-
                                                 resources represents the minimum resources the volume should have.
-                                                If RecoverVolumeExpansionFailure feature is enabled users are allowed to specify resource requirements
+                                                Users are allowed to specify resource requirements
                                                 that are lower than previous value but must still be higher than capacity recorded in the
                                                 status field of the claim.
                                                 More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources
@@ -7554,7 +7866,7 @@ spec:
                                     A failure to resolve or pull the image during pod startup will block containers from starting and may add significant latency. Failures will be retried using normal volume backoff and will be reported on the pod reason and message.
                                     The types of objects that may be mounted by this volume are defined by the container runtime implementation on a host machine and at minimum must include all valid types supported by the container image field.
                                     The OCI object gets mounted in a single directory (spec.containers[*].volumeMounts.mountPath) by merging the manifest layers in the same way as for container images.
-                                    The volume will be mounted read-only (ro) and non-executable files (noexec).
+                                    The volume will be mounted read-only (ro).
                                     Sub path mounts for containers are not supported (spec.containers[*].volumeMounts.subpath) before 1.33.
                                     The field spec.securityContext.fsGroupChangePolicy has no effect on this volume type.
                                   properties:
@@ -7728,8 +8040,7 @@ spec:
                                   description: |-
                                     portworxVolume represents a portworx volume attached and mounted on kubelets host machine.
                                     Deprecated: PortworxVolume is deprecated. All operations for the in-tree portworxVolume type
-                                    are redirected to the pxd.portworx.com CSI driver when the CSIMigrationPortworx feature-gate
-                                    is on.
+                                    are redirected to the pxd.portworx.com CSI driver.
                                   properties:
                                     fsType:
                                       description: |-
@@ -7763,6 +8074,13 @@ spec:
                                         mode, like fsGroup, and the result can be other mode bits set.
                                       format: int32
                                       type: integer
+                                    defaultUser:
+                                      description: |-
+                                        defaultUser is Optional: The owner UID of the created files by default.
+                                        The defaultUser field is only used as a fallback when the item-level user field is unset.
+                                        (Alpha) This field requires the AtomicWriteVolumeUserFields feature gate to be enabled.
+                                      format: int64
+                                      type: integer
                                     sources:
                                       description: |-
                                         sources is the list of volume projections. Each entry in this list
@@ -7864,6 +8182,13 @@ spec:
                                                   Mutually-exclusive with name.  The contents of all selected
                                                   ClusterTrustBundles will be unified and deduplicated.
                                                 type: string
+                                              user:
+                                                description: |-
+                                                  user is Optional: The owner UID of the created file.
+                                                  If specified, the item-level user field takes precedence over defaultUser.
+                                                  (Alpha) This field requires the AtomicWriteVolumeUserFields feature gate to be enabled.
+                                                format: int64
+                                                type: integer
                                             required:
                                             - path
                                             type: object
@@ -7905,6 +8230,13 @@ spec:
                                                         May not contain the path element '..'.
                                                         May not start with the string '..'.
                                                       type: string
+                                                    user:
+                                                      description: |-
+                                                        user is Optional: The owner UID of the created file.
+                                                        If specified, the item-level user field takes precedence over defaultUser.
+                                                        (Alpha) This field requires the AtomicWriteVolumeUserFields feature gate to be enabled.
+                                                      format: int64
+                                                      type: integer
                                                   required:
                                                   - key
                                                   - path
@@ -8008,6 +8340,13 @@ spec:
                                                       - resource
                                                       type: object
                                                       x-kubernetes-map-type: atomic
+                                                    user:
+                                                      description: |-
+                                                        user is Optional: The owner UID of the created file.
+                                                        If specified, the item-level user field takes precedence over defaultUser.
+                                                        (Alpha) This field requires the AtomicWriteVolumeUserFields feature gate to be enabled.
+                                                      format: int64
+                                                      type: integer
                                                   required:
                                                   - path
                                                   type: object
@@ -8115,6 +8454,31 @@ spec:
                                                 description: Kubelet's generated CSRs
                                                   will be addressed to this signer.
                                                 type: string
+                                              user:
+                                                description: |-
+                                                  user is Optional: The owner UID of the created file.
+                                                  If specified, the item-level user field takes precedence over defaultUser.
+                                                  (Alpha) This field requires the AtomicWriteVolumeUserFields feature gate to be enabled.
+                                                format: int64
+                                                type: integer
+                                              userAnnotations:
+                                                additionalProperties:
+                                                  type: string
+                                                description: |-
+                                                  userAnnotations allow pod authors to pass additional information to
+                                                  the signer implementation.  Kubernetes does not restrict or validate this
+                                                  metadata in any way.
+
+                                                  These values are copied verbatim into the `spec.unverifiedUserAnnotations` field of
+                                                  the PodCertificateRequest objects that Kubelet creates.
+
+                                                  Entries are subject to the same validation as object metadata annotations,
+                                                  with the addition that all keys must be domain-prefixed. No restrictions
+                                                  are placed on values, except an overall size limitation on the entire field.
+
+                                                  Signers should document the keys and values they support. Signers should
+                                                  deny requests that contain keys they do not recognize.
+                                                type: object
                                             required:
                                             - keyType
                                             - signerName
@@ -8157,6 +8521,13 @@ spec:
                                                         May not contain the path element '..'.
                                                         May not start with the string '..'.
                                                       type: string
+                                                    user:
+                                                      description: |-
+                                                        user is Optional: The owner UID of the created file.
+                                                        If specified, the item-level user field takes precedence over defaultUser.
+                                                        (Alpha) This field requires the AtomicWriteVolumeUserFields feature gate to be enabled.
+                                                      format: int64
+                                                      type: integer
                                                   required:
                                                   - key
                                                   - path
@@ -8206,6 +8577,13 @@ spec:
                                                   path is the path relative to the mount point of the file to project the
                                                   token into.
                                                 type: string
+                                              user:
+                                                description: |-
+                                                  user is Optional: The owner UID of the created file.
+                                                  If specified, the item-level user field takes precedence over defaultUser.
+                                                  (Alpha) This field requires the AtomicWriteVolumeUserFields feature gate to be enabled.
+                                                format: int64
+                                                type: integer
                                             required:
                                             - path
                                             type: object
@@ -8413,6 +8791,13 @@ spec:
                                         mode, like fsGroup, and the result can be other mode bits set.
                                       format: int32
                                       type: integer
+                                    defaultUser:
+                                      description: |-
+                                        defaultUser is Optional: The owner UID of the created files by default.
+                                        The defaultUser field is only used as a fallback when the item-level user field is unset.
+                                        (Alpha) This field requires the AtomicWriteVolumeUserFields feature gate to be enabled.
+                                      format: int64
+                                      type: integer
                                     items:
                                       description: |-
                                         items If unspecified, each key-value pair in the Data field of the referenced
@@ -8446,6 +8831,13 @@ spec:
                                               May not contain the path element '..'.
                                               May not start with the string '..'.
                                             type: string
+                                          user:
+                                            description: |-
+                                              user is Optional: The owner UID of the created file.
+                                              If specified, the item-level user field takes precedence over defaultUser.
+                                              (Alpha) This field requires the AtomicWriteVolumeUserFields feature gate to be enabled.
+                                            format: int64
+                                            type: integer
                                         required:
                                         - key
                                         - path
diff --git a/packages/system/backupstrategy-controller/definitions/strategy.backups.cozystack.io_jobs.yaml b/packages/system/backupstrategy-controller/definitions/strategy.backups.cozystack.io_jobs.yaml
index 492841e329..9da84130d2 100644
--- a/packages/system/backupstrategy-controller/definitions/strategy.backups.cozystack.io_jobs.yaml
+++ b/packages/system/backupstrategy-controller/definitions/strategy.backups.cozystack.io_jobs.yaml
@@ -1070,7 +1070,9 @@ spec:
                                         description: Selects a key of a ConfigMap.
                                         properties:
                                           key:
-                                            description: The key to select.
+                                            description: |-
+                                              The key to select from the ConfigMap's Data field.
+                                              Keys in the BinaryData field are not currently propagated to container env vars.
                                             type: string
                                           name:
                                             default: ""
@@ -1345,6 +1347,11 @@ spec:
                                             Number must be in the range 1 to 65535.
                                             Name must be an IANA_SVC_NAME.
                                           x-kubernetes-int-or-string: true
+                                        protocol:
+                                          description: |-
+                                            Protocol selects the wire protocol for the probe connection.
+                                            Nil defaults to HTTP/1.1.
+                                          type: string
                                         scheme:
                                           description: |-
                                             Scheme to use for connecting to the host.
@@ -1459,6 +1466,11 @@ spec:
                                             Number must be in the range 1 to 65535.
                                             Name must be an IANA_SVC_NAME.
                                           x-kubernetes-int-or-string: true
+                                        protocol:
+                                          description: |-
+                                            Protocol selects the wire protocol for the probe connection.
+                                            Nil defaults to HTTP/1.1.
+                                          type: string
                                         scheme:
                                           description: |-
                                             Scheme to use for connecting to the host.
@@ -1541,6 +1553,13 @@ spec:
                                 grpc:
                                   description: GRPC specifies a GRPC HealthCheckRequest.
                                   properties:
+                                    mode:
+                                      description: |-
+                                        mode specifies the connection mode for the gRPC health probe.
+                                        Set to "TLS" to use TLS without certificate verification.
+                                        Set to "Plaintext" to use a plaintext (insecure) connection explicitly.
+                                        If not specified, the probe uses a plaintext (insecure) connection.
+                                      type: string
                                     port:
                                       description: Port number of the gRPC service.
                                         Number must be in the range 1 to 65535.
@@ -1599,6 +1618,11 @@ spec:
                                         Number must be in the range 1 to 65535.
                                         Name must be an IANA_SVC_NAME.
                                       x-kubernetes-int-or-string: true
+                                    protocol:
+                                      description: |-
+                                        Protocol selects the wire protocol for the probe connection.
+                                        Nil defaults to HTTP/1.1.
+                                      type: string
                                     scheme:
                                       description: |-
                                         Scheme to use for connecting to the host.
@@ -1756,6 +1780,13 @@ spec:
                                 grpc:
                                   description: GRPC specifies a GRPC HealthCheckRequest.
                                   properties:
+                                    mode:
+                                      description: |-
+                                        mode specifies the connection mode for the gRPC health probe.
+                                        Set to "TLS" to use TLS without certificate verification.
+                                        Set to "Plaintext" to use a plaintext (insecure) connection explicitly.
+                                        If not specified, the probe uses a plaintext (insecure) connection.
+                                      type: string
                                     port:
                                       description: Port number of the gRPC service.
                                         Number must be in the range 1 to 65535.
@@ -1814,6 +1845,11 @@ spec:
                                         Number must be in the range 1 to 65535.
                                         Name must be an IANA_SVC_NAME.
                                       x-kubernetes-int-or-string: true
+                                    protocol:
+                                      description: |-
+                                        Protocol selects the wire protocol for the probe connection.
+                                        Nil defaults to HTTP/1.1.
+                                      type: string
                                     scheme:
                                       description: |-
                                         Scheme to use for connecting to the host.
@@ -1883,7 +1919,9 @@ spec:
                                   type: integer
                               type: object
                             resizePolicy:
-                              description: Resources resize policy for the container.
+                              description: |-
+                                Resources resize policy for the container.
+                                This field cannot be set on ephemeral containers.
                               items:
                                 description: ContainerResizePolicy represents resource
                                   resize policy for the container.
@@ -2113,7 +2151,6 @@ spec:
                                     procMount denotes the type of proc mount to use for the containers.
                                     The default value is Default which uses the container runtime defaults for
                                     readonly paths and masked paths.
-                                    This requires the ProcMountType feature flag to be enabled.
                                     Note that this field cannot be set when spec.os.name is windows.
                                   type: string
                                 readOnlyRootFilesystem:
@@ -2268,6 +2305,13 @@ spec:
                                 grpc:
                                   description: GRPC specifies a GRPC HealthCheckRequest.
                                   properties:
+                                    mode:
+                                      description: |-
+                                        mode specifies the connection mode for the gRPC health probe.
+                                        Set to "TLS" to use TLS without certificate verification.
+                                        Set to "Plaintext" to use a plaintext (insecure) connection explicitly.
+                                        If not specified, the probe uses a plaintext (insecure) connection.
+                                      type: string
                                     port:
                                       description: Port number of the gRPC service.
                                         Number must be in the range 1 to 65535.
@@ -2326,6 +2370,11 @@ spec:
                                         Number must be in the range 1 to 65535.
                                         Name must be an IANA_SVC_NAME.
                                       x-kubernetes-int-or-string: true
+                                    protocol:
+                                      description: |-
+                                        Protocol selects the wire protocol for the probe connection.
+                                        Nil defaults to HTTP/1.1.
+                                      type: string
                                     scheme:
                                       description: |-
                                         Scheme to use for connecting to the host.
@@ -2467,10 +2516,21 @@ spec:
                                 description: VolumeMount describes a mounting of a
                                   Volume within a container.
                                 properties:
-                                  mountPath:
+                                  bindMountOptions:
                                     description: |-
-                                      Path within the container at which the volume should be mounted.  Must
-                                      not contain ':'.
+                                      bindMountOptions is the list of additional bind mount options to apply when
+                                      mounting this volume into the container. Allowed values are noexec,
+                                      nodev, and nosuid. These are Linux mount options and have no effect on
+                                      Windows nodes.
+                                      This field is not supported with image volumes.
+                                      This is an alpha field and requires enabling the VolumeBindMountOptions feature gate.
+                                    items:
+                                      type: string
+                                    type: array
+                                    x-kubernetes-list-type: set
+                                  mountPath:
+                                    description: Path within the container at which
+                                      the volume should be mounted.
                                     type: string
                                   mountPropagation:
                                     description: |-
@@ -2682,7 +2742,9 @@ spec:
                                         description: Selects a key of a ConfigMap.
                                         properties:
                                           key:
-                                            description: The key to select.
+                                            description: |-
+                                              The key to select from the ConfigMap's Data field.
+                                              Keys in the BinaryData field are not currently propagated to container env vars.
                                             type: string
                                           name:
                                             default: ""
@@ -2954,6 +3016,11 @@ spec:
                                             Number must be in the range 1 to 65535.
                                             Name must be an IANA_SVC_NAME.
                                           x-kubernetes-int-or-string: true
+                                        protocol:
+                                          description: |-
+                                            Protocol selects the wire protocol for the probe connection.
+                                            Nil defaults to HTTP/1.1.
+                                          type: string
                                         scheme:
                                           description: |-
                                             Scheme to use for connecting to the host.
@@ -3068,6 +3135,11 @@ spec:
                                             Number must be in the range 1 to 65535.
                                             Name must be an IANA_SVC_NAME.
                                           x-kubernetes-int-or-string: true
+                                        protocol:
+                                          description: |-
+                                            Protocol selects the wire protocol for the probe connection.
+                                            Nil defaults to HTTP/1.1.
+                                          type: string
                                         scheme:
                                           description: |-
                                             Scheme to use for connecting to the host.
@@ -3146,6 +3218,13 @@ spec:
                                 grpc:
                                   description: GRPC specifies a GRPC HealthCheckRequest.
                                   properties:
+                                    mode:
+                                      description: |-
+                                        mode specifies the connection mode for the gRPC health probe.
+                                        Set to "TLS" to use TLS without certificate verification.
+                                        Set to "Plaintext" to use a plaintext (insecure) connection explicitly.
+                                        If not specified, the probe uses a plaintext (insecure) connection.
+                                      type: string
                                     port:
                                       description: Port number of the gRPC service.
                                         Number must be in the range 1 to 65535.
@@ -3204,6 +3283,11 @@ spec:
                                         Number must be in the range 1 to 65535.
                                         Name must be an IANA_SVC_NAME.
                                       x-kubernetes-int-or-string: true
+                                    protocol:
+                                      description: |-
+                                        Protocol selects the wire protocol for the probe connection.
+                                        Nil defaults to HTTP/1.1.
+                                      type: string
                                     scheme:
                                       description: |-
                                         Scheme to use for connecting to the host.
@@ -3349,6 +3433,13 @@ spec:
                                 grpc:
                                   description: GRPC specifies a GRPC HealthCheckRequest.
                                   properties:
+                                    mode:
+                                      description: |-
+                                        mode specifies the connection mode for the gRPC health probe.
+                                        Set to "TLS" to use TLS without certificate verification.
+                                        Set to "Plaintext" to use a plaintext (insecure) connection explicitly.
+                                        If not specified, the probe uses a plaintext (insecure) connection.
+                                      type: string
                                     port:
                                       description: Port number of the gRPC service.
                                         Number must be in the range 1 to 65535.
@@ -3407,6 +3498,11 @@ spec:
                                         Number must be in the range 1 to 65535.
                                         Name must be an IANA_SVC_NAME.
                                       x-kubernetes-int-or-string: true
+                                    protocol:
+                                      description: |-
+                                        Protocol selects the wire protocol for the probe connection.
+                                        Nil defaults to HTTP/1.1.
+                                      type: string
                                     scheme:
                                       description: |-
                                         Scheme to use for connecting to the host.
@@ -3684,7 +3780,6 @@ spec:
                                     procMount denotes the type of proc mount to use for the containers.
                                     The default value is Default which uses the container runtime defaults for
                                     readonly paths and masked paths.
-                                    This requires the ProcMountType feature flag to be enabled.
                                     Note that this field cannot be set when spec.os.name is windows.
                                   type: string
                                 readOnlyRootFilesystem:
@@ -3832,6 +3927,13 @@ spec:
                                 grpc:
                                   description: GRPC specifies a GRPC HealthCheckRequest.
                                   properties:
+                                    mode:
+                                      description: |-
+                                        mode specifies the connection mode for the gRPC health probe.
+                                        Set to "TLS" to use TLS without certificate verification.
+                                        Set to "Plaintext" to use a plaintext (insecure) connection explicitly.
+                                        If not specified, the probe uses a plaintext (insecure) connection.
+                                      type: string
                                     port:
                                       description: Port number of the gRPC service.
                                         Number must be in the range 1 to 65535.
@@ -3890,6 +3992,11 @@ spec:
                                         Number must be in the range 1 to 65535.
                                         Name must be an IANA_SVC_NAME.
                                       x-kubernetes-int-or-string: true
+                                    protocol:
+                                      description: |-
+                                        Protocol selects the wire protocol for the probe connection.
+                                        Nil defaults to HTTP/1.1.
+                                      type: string
                                     scheme:
                                       description: |-
                                         Scheme to use for connecting to the host.
@@ -4040,10 +4147,21 @@ spec:
                                 description: VolumeMount describes a mounting of a
                                   Volume within a container.
                                 properties:
-                                  mountPath:
+                                  bindMountOptions:
                                     description: |-
-                                      Path within the container at which the volume should be mounted.  Must
-                                      not contain ':'.
+                                      bindMountOptions is the list of additional bind mount options to apply when
+                                      mounting this volume into the container. Allowed values are noexec,
+                                      nodev, and nosuid. These are Linux mount options and have no effect on
+                                      Windows nodes.
+                                      This field is not supported with image volumes.
+                                      This is an alpha field and requires enabling the VolumeBindMountOptions feature gate.
+                                    items:
+                                      type: string
+                                    type: array
+                                    x-kubernetes-list-type: set
+                                  mountPath:
+                                    description: Path within the container at which
+                                      the volume should be mounted.
                                     type: string
                                   mountPropagation:
                                     description: |-
@@ -4115,6 +4233,63 @@ spec:
                         x-kubernetes-list-map-keys:
                         - name
                         x-kubernetes-list-type: map
+                      evictionResponders:
+                        description: |-
+                          evictionResponders reference responders that react to Evictions based on EvictionRequests.
+                          Responders should observe and communicate through the Eviction Resource API to help with
+                          the graceful termination of a pod. The responders are selected sequentially, according to
+                          their specified priority.
+
+                          Responders should periodically report on an eviction progress by updating the
+                          .status.responders[].heartbeatTime field of the Eviction object. If this field is not updated
+                          within the heartbeat deadline defined by the Eviction API (currently 20 minutes), the eviction
+                          is passed over to the next responder with a lower priority. If there is no other responder,
+                          the last default imperative-eviction.k8s.io/evictor responder with a priority of 100 will
+                          evict the pod using the imperative Eviction API (pods/<name>/eviction subresource).
+
+                          The maximum length of the responders list is 10.
+                          Responders are not supported when the pod is part of a PodGroup (.spec.schedulingGroup is set).
+                          This field can only be set on creation and is immutable afterwards.
+                        items:
+                          description: |-
+                            EvictionResponder allows you to specify the responder reacting to an Eviction.
+                            Responders should observe and communicate through the Eviction Resource API to help with
+                            the graceful eviction of a target (e.g. termination of a pod).
+                          properties:
+                            name:
+                              description: |-
+                                name allows you to identify the responder responding to the Eviction.
+
+                                It must be a valid domain-prefixed key (such as "acme.io/foo").
+                                Domain names *.k8s.io and *.kubernetes.io are reserved.
+                                This field must be unique for each responder.
+                                This field is required.
+                              type: string
+                            priority:
+                              description: |-
+                                priority for this responder. Higher priorities are selected first by the evictionrequest-controller.
+                                If there are responders with the same priority, the responder whose domain name comes first in the
+                                alphabetical higher domain order, will be picked. This means that the top domain labels are compared
+                                alphabetically first, followed by the lower domain labels. The key is compared last.
+
+                                The responder that is the managing controller of the pod should set the value of
+                                this field to 10000 to allow both for preemption or fallback registration by other
+                                responders.
+
+                                The minimum value is 0 and the maximum value is 100000.
+                                The interval 0-999 is reserved for responders with *.k8s.io suffix.
+                                This field is required.
+                              format: int32
+                              type: integer
+                          required:
+                          - name
+                          - priority
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        type: array
+                        x-kubernetes-list-map-keys:
+                        - name
+                        x-kubernetes-list-type: map
                       hostAliases:
                         description: |-
                           HostAliases is an optional list of hosts and IPs that will be injected into the pod's hosts
@@ -4168,7 +4343,6 @@ spec:
                           When set to false, a new userns is created for the pod. Setting false is useful for
                           mitigating container breakout vulnerabilities even allowing users to run their
                           containers as root without actually having root privileges on the host.
-                          This field is alpha-level and is only honored by servers that enable the UserNamespacesSupport feature.
                         type: boolean
                       hostname:
                         description: |-
@@ -4186,7 +4360,6 @@ spec:
                           - `hostNetwork` must be set to false.
 
                           This field must be a valid DNS subdomain as defined in RFC 1123 and contain at most 64 characters.
-                          Requires the HostnameOverride feature gate to be enabled.
                         type: string
                       imagePullSecrets:
                         description: |-
@@ -4293,7 +4466,9 @@ spec:
                                         description: Selects a key of a ConfigMap.
                                         properties:
                                           key:
-                                            description: The key to select.
+                                            description: |-
+                                              The key to select from the ConfigMap's Data field.
+                                              Keys in the BinaryData field are not currently propagated to container env vars.
                                             type: string
                                           name:
                                             default: ""
@@ -4568,6 +4743,11 @@ spec:
                                             Number must be in the range 1 to 65535.
                                             Name must be an IANA_SVC_NAME.
                                           x-kubernetes-int-or-string: true
+                                        protocol:
+                                          description: |-
+                                            Protocol selects the wire protocol for the probe connection.
+                                            Nil defaults to HTTP/1.1.
+                                          type: string
                                         scheme:
                                           description: |-
                                             Scheme to use for connecting to the host.
@@ -4682,6 +4862,11 @@ spec:
                                             Number must be in the range 1 to 65535.
                                             Name must be an IANA_SVC_NAME.
                                           x-kubernetes-int-or-string: true
+                                        protocol:
+                                          description: |-
+                                            Protocol selects the wire protocol for the probe connection.
+                                            Nil defaults to HTTP/1.1.
+                                          type: string
                                         scheme:
                                           description: |-
                                             Scheme to use for connecting to the host.
@@ -4764,6 +4949,13 @@ spec:
                                 grpc:
                                   description: GRPC specifies a GRPC HealthCheckRequest.
                                   properties:
+                                    mode:
+                                      description: |-
+                                        mode specifies the connection mode for the gRPC health probe.
+                                        Set to "TLS" to use TLS without certificate verification.
+                                        Set to "Plaintext" to use a plaintext (insecure) connection explicitly.
+                                        If not specified, the probe uses a plaintext (insecure) connection.
+                                      type: string
                                     port:
                                       description: Port number of the gRPC service.
                                         Number must be in the range 1 to 65535.
@@ -4822,6 +5014,11 @@ spec:
                                         Number must be in the range 1 to 65535.
                                         Name must be an IANA_SVC_NAME.
                                       x-kubernetes-int-or-string: true
+                                    protocol:
+                                      description: |-
+                                        Protocol selects the wire protocol for the probe connection.
+                                        Nil defaults to HTTP/1.1.
+                                      type: string
                                     scheme:
                                       description: |-
                                         Scheme to use for connecting to the host.
@@ -4979,6 +5176,13 @@ spec:
                                 grpc:
                                   description: GRPC specifies a GRPC HealthCheckRequest.
                                   properties:
+                                    mode:
+                                      description: |-
+                                        mode specifies the connection mode for the gRPC health probe.
+                                        Set to "TLS" to use TLS without certificate verification.
+                                        Set to "Plaintext" to use a plaintext (insecure) connection explicitly.
+                                        If not specified, the probe uses a plaintext (insecure) connection.
+                                      type: string
                                     port:
                                       description: Port number of the gRPC service.
                                         Number must be in the range 1 to 65535.
@@ -5037,6 +5241,11 @@ spec:
                                         Number must be in the range 1 to 65535.
                                         Name must be an IANA_SVC_NAME.
                                       x-kubernetes-int-or-string: true
+                                    protocol:
+                                      description: |-
+                                        Protocol selects the wire protocol for the probe connection.
+                                        Nil defaults to HTTP/1.1.
+                                      type: string
                                     scheme:
                                       description: |-
                                         Scheme to use for connecting to the host.
@@ -5106,7 +5315,9 @@ spec:
                                   type: integer
                               type: object
                             resizePolicy:
-                              description: Resources resize policy for the container.
+                              description: |-
+                                Resources resize policy for the container.
+                                This field cannot be set on ephemeral containers.
                               items:
                                 description: ContainerResizePolicy represents resource
                                   resize policy for the container.
@@ -5336,7 +5547,6 @@ spec:
                                     procMount denotes the type of proc mount to use for the containers.
                                     The default value is Default which uses the container runtime defaults for
                                     readonly paths and masked paths.
-                                    This requires the ProcMountType feature flag to be enabled.
                                     Note that this field cannot be set when spec.os.name is windows.
                                   type: string
                                 readOnlyRootFilesystem:
@@ -5491,6 +5701,13 @@ spec:
                                 grpc:
                                   description: GRPC specifies a GRPC HealthCheckRequest.
                                   properties:
+                                    mode:
+                                      description: |-
+                                        mode specifies the connection mode for the gRPC health probe.
+                                        Set to "TLS" to use TLS without certificate verification.
+                                        Set to "Plaintext" to use a plaintext (insecure) connection explicitly.
+                                        If not specified, the probe uses a plaintext (insecure) connection.
+                                      type: string
                                     port:
                                       description: Port number of the gRPC service.
                                         Number must be in the range 1 to 65535.
@@ -5549,6 +5766,11 @@ spec:
                                         Number must be in the range 1 to 65535.
                                         Name must be an IANA_SVC_NAME.
                                       x-kubernetes-int-or-string: true
+                                    protocol:
+                                      description: |-
+                                        Protocol selects the wire protocol for the probe connection.
+                                        Nil defaults to HTTP/1.1.
+                                      type: string
                                     scheme:
                                       description: |-
                                         Scheme to use for connecting to the host.
@@ -5690,10 +5912,21 @@ spec:
                                 description: VolumeMount describes a mounting of a
                                   Volume within a container.
                                 properties:
-                                  mountPath:
+                                  bindMountOptions:
                                     description: |-
-                                      Path within the container at which the volume should be mounted.  Must
-                                      not contain ':'.
+                                      bindMountOptions is the list of additional bind mount options to apply when
+                                      mounting this volume into the container. Allowed values are noexec,
+                                      nodev, and nosuid. These are Linux mount options and have no effect on
+                                      Windows nodes.
+                                      This field is not supported with image volumes.
+                                      This is an alpha field and requires enabling the VolumeBindMountOptions feature gate.
+                                    items:
+                                      type: string
+                                    type: array
+                                    x-kubernetes-list-type: set
+                                  mountPath:
+                                    description: Path within the container at which
+                                      the volume should be mounted.
                                     type: string
                                   mountPropagation:
                                     description: |-
@@ -5847,6 +6080,8 @@ spec:
                         description: |-
                           PreemptionPolicy is the Policy for preempting pods with lower priority.
                           One of Never, PreemptLowerPriority.
+                          When Priority Admission Controller is enabled, it prevents users from setting
+                          this field. The admission controller populates this field from PriorityClassName.
                           Defaults to PreemptLowerPriority if unset.
                         type: string
                       priority:
@@ -5893,8 +6128,8 @@ spec:
                           will be made available to those containers which consume them
                           by name.
 
-                          This is an alpha field and requires enabling the
-                          DynamicResourceAllocation feature gate.
+                          This is a stable field but requires that the
+                          DynamicResourceAllocation feature gate is enabled.
 
                           This field is immutable.
                         items:
@@ -5905,6 +6140,14 @@ spec:
 
                             It adds a name to it that uniquely identifies the ResourceClaim inside the Pod.
                             Containers that need access to the ResourceClaim reference it with this name.
+
+                            When the DRAWorkloadResourceClaims feature gate is enabled and this Pod
+                            belongs to a PodGroup, a PodResourceClaim is matched to a
+                            PodGroupResourceClaim if all of their fields are equal (Name,
+                            ResourceClaimName, and ResourceClaimTemplateName). A matched claim references
+                            a single ResourceClaim shared across all Pods in the PodGroup, reserved for
+                            the PodGroup in ResourceClaimStatus.ReservedFor rather than for individual
+                            Pods.
                           properties:
                             name:
                               description: |-
@@ -5930,6 +6173,16 @@ spec:
                                 generated component, will be used to form a unique name for the
                                 ResourceClaim, which will be recorded in pod.status.resourceClaimStatuses.
 
+                                When the DRAWorkloadResourceClaims feature gate is enabled and the pod
+                                belongs to a PodGroup that defines a PodGroupResourceClaim with the same
+                                Name and ResourceClaimTemplateName, this PodResourceClaim resolves to the
+                                ResourceClaim generated for the PodGroup. All pods in the group that
+                                define an equivalent PodResourceClaim matching the
+                                PodGroupResourceClaim's Name and ResourceClaimTemplateName share the same
+                                generated ResourceClaim. ResourceClaims generated for a PodGroup are
+                                owned by the PodGroup and their lifecycles are tied to the PodGroup
+                                instead of any individual pod.
+
                                 This field is immutable and no changes will be made to the
                                 corresponding ResourceClaim by the control plane after creating the
                                 ResourceClaim.
@@ -6055,6 +6308,28 @@ spec:
                         x-kubernetes-list-map-keys:
                         - name
                         x-kubernetes-list-type: map
+                      schedulingGroup:
+                        description: |-
+                          SchedulingGroup provides a reference to the immediate scheduling runtime
+                          grouping object that this Pod belongs to.
+                          This field is used by the scheduler to identify the group and apply the
+                          correct group scheduling policies. The association with a group also
+                          impacts other lifecycle aspects of a Pod that are relevant in a wider context
+                          of scheduling like preemption, resource attachment, etc. If not specified,
+                          the Pod is treated as a single unit in all of these aspects.
+                          The group object referenced by this field may not exist at the time the
+                          Pod is created.
+                          This field is immutable, but a group object with the same name may be
+                          recreated with different policies. Doing this during pod scheduling
+                          may result in the placement not conforming to the expected policies.
+                        properties:
+                          podGroupName:
+                            description: |-
+                              PodGroupName specifies the name of the standalone PodGroup object
+                              that represents the runtime instance of this group.
+                              Must be a DNS subdomain.
+                            type: string
+                        type: object
                       securityContext:
                         description: |-
                           SecurityContext holds pod-level security attributes and common container settings.
@@ -6151,11 +6426,8 @@ spec:
                               Eligible volumes are in-tree FibreChannel and iSCSI volumes, and all CSI volumes
                               whose CSI driver announces SELinux support by setting spec.seLinuxMount: true in their
                               CSIDriver instance. Other volumes are always re-labelled recursively.
-                              "MountOption" value is allowed only when SELinuxMount feature gate is enabled.
 
-                              If not specified and SELinuxMount feature gate is enabled, "MountOption" is used.
-                              If not specified and SELinuxMount feature gate is disabled, "MountOption" is used for ReadWriteOncePod volumes
-                              and "Recursive" for all other volumes.
+                              If not specified, "MountOption" is used.
 
                               This field affects only Pods that have SELinux label set, either in PodSecurityContext or in SecurityContext of all containers.
 
@@ -6353,9 +6625,10 @@ spec:
                             operator:
                               description: |-
                                 Operator represents a key's relationship to the value.
-                                Valid operators are Exists and Equal. Defaults to Equal.
+                                Valid operators are Exists, Equal, Lt, and Gt. Defaults to Equal.
                                 Exists is equivalent to wildcard for value, so that a pod can
                                 tolerate all taints of a particular category.
+                                Lt and Gt perform numeric comparisons (requires feature gate TaintTolerationComparisonOperators).
                               type: string
                             tolerationSeconds:
                               description: |-
@@ -6774,6 +7047,13 @@ spec:
                                     mode, like fsGroup, and the result can be other mode bits set.
                                   format: int32
                                   type: integer
+                                defaultUser:
+                                  description: |-
+                                    defaultUser is Optional: The owner UID of the created files by default.
+                                    The defaultUser field is only used as a fallback when the item-level user field is unset.
+                                    (Alpha) This field requires the AtomicWriteVolumeUserFields feature gate to be enabled.
+                                  format: int64
+                                  type: integer
                                 items:
                                   description: |-
                                     items if unspecified, each key-value pair in the Data field of the referenced
@@ -6807,6 +7087,13 @@ spec:
                                           May not contain the path element '..'.
                                           May not start with the string '..'.
                                         type: string
+                                      user:
+                                        description: |-
+                                          user is Optional: The owner UID of the created file.
+                                          If specified, the item-level user field takes precedence over defaultUser.
+                                          (Alpha) This field requires the AtomicWriteVolumeUserFields feature gate to be enabled.
+                                        format: int64
+                                        type: integer
                                     required:
                                     - key
                                     - path
@@ -6894,6 +7181,13 @@ spec:
                                     mode, like fsGroup, and the result can be other mode bits set.
                                   format: int32
                                   type: integer
+                                defaultUser:
+                                  description: |-
+                                    defaultUser is Optional: The owner UID of the created files by default.
+                                    The defaultUser field is only used as a fallback when the item-level user field is unset.
+                                    (Alpha) This field requires the AtomicWriteVolumeUserFields feature gate to be enabled.
+                                  format: int64
+                                  type: integer
                                 items:
                                   description: Items is a list of downward API volume
                                     file
@@ -6962,6 +7256,13 @@ spec:
                                         - resource
                                         type: object
                                         x-kubernetes-map-type: atomic
+                                      user:
+                                        description: |-
+                                          user is Optional: The owner UID of the created file.
+                                          If specified, the item-level user field takes precedence over defaultUser.
+                                          (Alpha) This field requires the AtomicWriteVolumeUserFields feature gate to be enabled.
+                                        format: int64
+                                        type: integer
                                     required:
                                     - path
                                     type: object
@@ -6980,6 +7281,18 @@ spec:
                                     Must be an empty string (default) or Memory.
                                     More info: https://kubernetes.io/docs/concepts/storage/volumes#emptydir
                                   type: string
+                                mode:
+                                  description: |-
+                                    mode specifies the permission bits for the emptyDir directory, in numeric
+                                    notation (e.g., 0755, 01777). Must be a value between 0000 and 01777.
+                                    If not specified, defaults to 0777.
+                                    This might be in conflict with other options that affect the file
+                                    mode, like fsGroup. If fsGroup is specified, the fsGroup permissions
+                                    will override the mode specified here.
+                                    This field has no effect on Windows.
+                                    This field is alpha and requires EmptyDirVolumeMode featuregate to be enabled.
+                                  format: int32
+                                  type: integer
                                 sizeLimit:
                                   anyOf:
                                   - type: integer
@@ -7073,8 +7386,8 @@ spec:
                                             * An existing PVC (PersistentVolumeClaim)
                                             If the provisioner or an external controller can support the specified data source,
                                             it will create a new volume based on the contents of the specified data source.
-                                            When the AnyVolumeDataSource feature gate is enabled, dataSource contents will be copied to dataSourceRef,
-                                            and dataSourceRef contents will be copied to dataSource when dataSourceRef.namespace is not specified.
+                                            dataSource contents will be copied to dataSourceRef, and dataSourceRef contents will be
+                                            copied to dataSource when dataSourceRef.namespace is not specified.
                                             If the namespace is specified, then dataSourceRef will not be copied to dataSource.
                                           properties:
                                             apiGroup:
@@ -7119,7 +7432,6 @@ spec:
                                               specified.
                                             * While dataSource only allows local objects, dataSourceRef allows objects
                                               in any namespaces.
-                                            (Beta) Using this field requires the AnyVolumeDataSource feature gate to be enabled.
                                             (Alpha) Using the namespace field of dataSourceRef requires the CrossNamespaceVolumeDataSource feature gate to be enabled.
                                           properties:
                                             apiGroup:
@@ -7149,7 +7461,7 @@ spec:
                                         resources:
                                           description: |-
                                             resources represents the minimum resources the volume should have.
-                                            If RecoverVolumeExpansionFailure feature is enabled users are allowed to specify resource requirements
+                                            Users are allowed to specify resource requirements
                                             that are lower than previous value but must still be higher than capacity recorded in the
                                             status field of the claim.
                                             More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources
@@ -7482,7 +7794,7 @@ spec:
                                 A failure to resolve or pull the image during pod startup will block containers from starting and may add significant latency. Failures will be retried using normal volume backoff and will be reported on the pod reason and message.
                                 The types of objects that may be mounted by this volume are defined by the container runtime implementation on a host machine and at minimum must include all valid types supported by the container image field.
                                 The OCI object gets mounted in a single directory (spec.containers[*].volumeMounts.mountPath) by merging the manifest layers in the same way as for container images.
-                                The volume will be mounted read-only (ro) and non-executable files (noexec).
+                                The volume will be mounted read-only (ro).
                                 Sub path mounts for containers are not supported (spec.containers[*].volumeMounts.subpath) before 1.33.
                                 The field spec.securityContext.fsGroupChangePolicy has no effect on this volume type.
                               properties:
@@ -7654,8 +7966,7 @@ spec:
                               description: |-
                                 portworxVolume represents a portworx volume attached and mounted on kubelets host machine.
                                 Deprecated: PortworxVolume is deprecated. All operations for the in-tree portworxVolume type
-                                are redirected to the pxd.portworx.com CSI driver when the CSIMigrationPortworx feature-gate
-                                is on.
+                                are redirected to the pxd.portworx.com CSI driver.
                               properties:
                                 fsType:
                                   description: |-
@@ -7689,6 +8000,13 @@ spec:
                                     mode, like fsGroup, and the result can be other mode bits set.
                                   format: int32
                                   type: integer
+                                defaultUser:
+                                  description: |-
+                                    defaultUser is Optional: The owner UID of the created files by default.
+                                    The defaultUser field is only used as a fallback when the item-level user field is unset.
+                                    (Alpha) This field requires the AtomicWriteVolumeUserFields feature gate to be enabled.
+                                  format: int64
+                                  type: integer
                                 sources:
                                   description: |-
                                     sources is the list of volume projections. Each entry in this list
@@ -7789,6 +8107,13 @@ spec:
                                               Mutually-exclusive with name.  The contents of all selected
                                               ClusterTrustBundles will be unified and deduplicated.
                                             type: string
+                                          user:
+                                            description: |-
+                                              user is Optional: The owner UID of the created file.
+                                              If specified, the item-level user field takes precedence over defaultUser.
+                                              (Alpha) This field requires the AtomicWriteVolumeUserFields feature gate to be enabled.
+                                            format: int64
+                                            type: integer
                                         required:
                                         - path
                                         type: object
@@ -7829,6 +8154,13 @@ spec:
                                                     May not contain the path element '..'.
                                                     May not start with the string '..'.
                                                   type: string
+                                                user:
+                                                  description: |-
+                                                    user is Optional: The owner UID of the created file.
+                                                    If specified, the item-level user field takes precedence over defaultUser.
+                                                    (Alpha) This field requires the AtomicWriteVolumeUserFields feature gate to be enabled.
+                                                  format: int64
+                                                  type: integer
                                               required:
                                               - key
                                               - path
@@ -7928,6 +8260,13 @@ spec:
                                                   - resource
                                                   type: object
                                                   x-kubernetes-map-type: atomic
+                                                user:
+                                                  description: |-
+                                                    user is Optional: The owner UID of the created file.
+                                                    If specified, the item-level user field takes precedence over defaultUser.
+                                                    (Alpha) This field requires the AtomicWriteVolumeUserFields feature gate to be enabled.
+                                                  format: int64
+                                                  type: integer
                                               required:
                                               - path
                                               type: object
@@ -8035,6 +8374,31 @@ spec:
                                             description: Kubelet's generated CSRs
                                               will be addressed to this signer.
                                             type: string
+                                          user:
+                                            description: |-
+                                              user is Optional: The owner UID of the created file.
+                                              If specified, the item-level user field takes precedence over defaultUser.
+                                              (Alpha) This field requires the AtomicWriteVolumeUserFields feature gate to be enabled.
+                                            format: int64
+                                            type: integer
+                                          userAnnotations:
+                                            additionalProperties:
+                                              type: string
+                                            description: |-
+                                              userAnnotations allow pod authors to pass additional information to
+                                              the signer implementation.  Kubernetes does not restrict or validate this
+                                              metadata in any way.
+
+                                              These values are copied verbatim into the `spec.unverifiedUserAnnotations` field of
+                                              the PodCertificateRequest objects that Kubelet creates.
+
+                                              Entries are subject to the same validation as object metadata annotations,
+                                              with the addition that all keys must be domain-prefixed. No restrictions
+                                              are placed on values, except an overall size limitation on the entire field.
+
+                                              Signers should document the keys and values they support. Signers should
+                                              deny requests that contain keys they do not recognize.
+                                            type: object
                                         required:
                                         - keyType
                                         - signerName
@@ -8076,6 +8440,13 @@ spec:
                                                     May not contain the path element '..'.
                                                     May not start with the string '..'.
                                                   type: string
+                                                user:
+                                                  description: |-
+                                                    user is Optional: The owner UID of the created file.
+                                                    If specified, the item-level user field takes precedence over defaultUser.
+                                                    (Alpha) This field requires the AtomicWriteVolumeUserFields feature gate to be enabled.
+                                                  format: int64
+                                                  type: integer
                                               required:
                                               - key
                                               - path
@@ -8123,6 +8494,13 @@ spec:
                                               path is the path relative to the mount point of the file to project the
                                               token into.
                                             type: string
+                                          user:
+                                            description: |-
+                                              user is Optional: The owner UID of the created file.
+                                              If specified, the item-level user field takes precedence over defaultUser.
+                                              (Alpha) This field requires the AtomicWriteVolumeUserFields feature gate to be enabled.
+                                            format: int64
+                                            type: integer
                                         required:
                                         - path
                                         type: object
@@ -8329,6 +8707,13 @@ spec:
                                     mode, like fsGroup, and the result can be other mode bits set.
                                   format: int32
                                   type: integer
+                                defaultUser:
+                                  description: |-
+                                    defaultUser is Optional: The owner UID of the created files by default.
+                                    The defaultUser field is only used as a fallback when the item-level user field is unset.
+                                    (Alpha) This field requires the AtomicWriteVolumeUserFields feature gate to be enabled.
+                                  format: int64
+                                  type: integer
                                 items:
                                   description: |-
                                     items If unspecified, each key-value pair in the Data field of the referenced
@@ -8362,6 +8747,13 @@ spec:
                                           May not contain the path element '..'.
                                           May not start with the string '..'.
                                         type: string
+                                      user:
+                                        description: |-
+                                          user is Optional: The owner UID of the created file.
+                                          If specified, the item-level user field takes precedence over defaultUser.
+                                          (Alpha) This field requires the AtomicWriteVolumeUserFields feature gate to be enabled.
+                                        format: int64
+                                        type: integer
                                     required:
                                     - key
                                     - path
diff --git a/packages/system/backupstrategy-controller/definitions/strategy.backups.cozystack.io_kafkas.yaml b/packages/system/backupstrategy-controller/definitions/strategy.backups.cozystack.io_kafkas.yaml
new file mode 100644
index 0000000000..4dc3df8cd4
--- /dev/null
+++ b/packages/system/backupstrategy-controller/definitions/strategy.backups.cozystack.io_kafkas.yaml
@@ -0,0 +1,150 @@
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.16.4
+  name: kafkas.strategy.backups.cozystack.io
+spec:
+  group: strategy.backups.cozystack.io
+  names:
+    kind: Kafka
+    listKind: KafkaList
+    plural: kafkas
+    singular: kafka
+  scope: Cluster
+  versions:
+  - name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        description: |-
+          Kafka defines a backup strategy for the topic METADATA of a Cozystack-managed
+          Kafka application: topic definitions and their configs (partitions,
+          replication factor, per-topic config keys), read and re-applied through the
+          Kafka Admin API. It is not a message-data backup and carries no consumer
+          offsets, ACLs, quotas or KafkaUsers — those are out of scope for this
+          strategy (message data belongs to a volume-snapshot strategy). Like the Job
+          strategy, the driver renders spec.template into a one-shot batch/v1.Job for
+          both backup and restore.
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: KafkaSpec specifies the desired behavior of a Kafka metadata
+              backup strategy.
+            properties:
+              artifactURITemplate:
+                description: |-
+                  ArtifactURITemplate is rendered against the same context, injected into the
+                  Job as ARTIFACT_URI (the single source of truth for the object location),
+                  and recorded on the produced Backup's status.artifact.uri so restore and
+                  cleanup act on the exact object the backup wrote. The driver requires it:
+                  reconcileKafka fails the BackupJob when it is empty, since nothing would
+                  record where the export is stored. The shipped cozy-default-kafka strategy
+                  always sets it; a custom Kafka strategy that stores backups must too.
+                type: string
+              template:
+                description: |-
+                  Template holds a PodTemplateSpec run to completion to back up (or restore)
+                  the application's topic metadata. Helm-like Go templates are supported in
+                  every string field and are rendered against:
+                    - `.Application` — the live application object.
+                    - `.Release.Name` and `.Release.Namespace` — the application's name and
+                      namespace (the TARGET on restore).
+                    - `.Mode` — `"backup"`, `"restore"`, or `"cleanup"` (delete the object
+                      of a removed Backup), identifying the run.
+                    - `.BackupName` — the per-run identity: the BackupJob name on backup,
+                      the source Backup name on restore. Use it to scope the object key so
+                      distinct backups of one application do not overwrite each other.
+                    - `.Parameters` — the resolved BackupClass strategy parameters.
+                    - `.Backup` — only on restore: `.Backup.Name`, `.Backup.Namespace` and
+                      `.Backup.ApplicationRef` describing the source backup.
+
+                  Stored schemaless deliberately: the full PodTemplateSpec OpenAPI schema is
+                  ~590 KB, and inlining it here (after Altinity/Job/FoundationDB) would push
+                  the chart's Helm state Secret over the 1 MiB cap. See job_types.go for the
+                  same field carried with its schema, and strategy-kafka-default.yaml for
+                  the rendered pod.
+                x-kubernetes-preserve-unknown-fields: true
+            required:
+            - template
+            type: object
+          status:
+            properties:
+              conditions:
+                items:
+                  description: Condition contains details for one aspect of the current
+                    state of this API Resource.
+                  properties:
+                    lastTransitionTime:
+                      description: |-
+                        lastTransitionTime is the last time the condition transitioned from one status to another.
+                        This should be when the underlying condition changed.  If that is not known, then using the time when the API field changed is acceptable.
+                      format: date-time
+                      type: string
+                    message:
+                      description: |-
+                        message is a human readable message indicating details about the transition.
+                        This may be an empty string.
+                      maxLength: 32768
+                      type: string
+                    observedGeneration:
+                      description: |-
+                        observedGeneration represents the .metadata.generation that the condition was set based upon.
+                        For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date
+                        with respect to the current state of the instance.
+                      format: int64
+                      minimum: 0
+                      type: integer
+                    reason:
+                      description: |-
+                        reason contains a programmatic identifier indicating the reason for the condition's last transition.
+                        Producers of specific condition types may define expected values and meanings for this field,
+                        and whether the values are considered a guaranteed API.
+                        The value should be a CamelCase string.
+                        This field may not be empty.
+                      maxLength: 1024
+                      minLength: 1
+                      pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
+                      type: string
+                    status:
+                      description: status of the condition, one of True, False, Unknown.
+                      enum:
+                      - "True"
+                      - "False"
+                      - Unknown
+                      type: string
+                    type:
+                      description: type of condition in CamelCase or in foo.example.com/CamelCase.
+                      maxLength: 316
+                      pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
+                      type: string
+                  required:
+                  - lastTransitionTime
+                  - message
+                  - reason
+                  - status
+                  - type
+                  type: object
+                type: array
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}
diff --git a/packages/system/backupstrategy-controller/definitions/strategy.backups.cozystack.io_mariadbs.yaml b/packages/system/backupstrategy-controller/definitions/strategy.backups.cozystack.io_mariadbs.yaml
index de7bae6109..6f1e719876 100644
--- a/packages/system/backupstrategy-controller/definitions/strategy.backups.cozystack.io_mariadbs.yaml
+++ b/packages/system/backupstrategy-controller/definitions/strategy.backups.cozystack.io_mariadbs.yaml
@@ -110,8 +110,8 @@ spec:
                               * An existing PVC (PersistentVolumeClaim)
                               If the provisioner or an external controller can support the specified data source,
                               it will create a new volume based on the contents of the specified data source.
-                              When the AnyVolumeDataSource feature gate is enabled, dataSource contents will be copied to dataSourceRef,
-                              and dataSourceRef contents will be copied to dataSource when dataSourceRef.namespace is not specified.
+                              dataSource contents will be copied to dataSourceRef, and dataSourceRef contents will be
+                              copied to dataSource when dataSourceRef.namespace is not specified.
                               If the namespace is specified, then dataSourceRef will not be copied to dataSource.
                             properties:
                               apiGroup:
@@ -154,7 +154,6 @@ spec:
                                 specified.
                               * While dataSource only allows local objects, dataSourceRef allows objects
                                 in any namespaces.
-                              (Beta) Using this field requires the AnyVolumeDataSource feature gate to be enabled.
                               (Alpha) Using the namespace field of dataSourceRef requires the CrossNamespaceVolumeDataSource feature gate to be enabled.
                             properties:
                               apiGroup:
@@ -182,7 +181,7 @@ spec:
                           resources:
                             description: |-
                               resources represents the minimum resources the volume should have.
-                              If RecoverVolumeExpansionFailure feature is enabled users are allowed to specify resource requirements
+                              Users are allowed to specify resource requirements
                               that are lower than previous value but must still be higher than capacity recorded in the
                               status field of the claim.
                               More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources
@@ -624,6 +623,13 @@ spec:
                                   mode, like fsGroup, and the result can be other mode bits set.
                                 format: int32
                                 type: integer
+                              defaultUser:
+                                description: |-
+                                  defaultUser is Optional: The owner UID of the created files by default.
+                                  The defaultUser field is only used as a fallback when the item-level user field is unset.
+                                  (Alpha) This field requires the AtomicWriteVolumeUserFields feature gate to be enabled.
+                                format: int64
+                                type: integer
                               items:
                                 description: |-
                                   items if unspecified, each key-value pair in the Data field of the referenced
@@ -657,6 +663,13 @@ spec:
                                         May not contain the path element '..'.
                                         May not start with the string '..'.
                                       type: string
+                                    user:
+                                      description: |-
+                                        user is Optional: The owner UID of the created file.
+                                        If specified, the item-level user field takes precedence over defaultUser.
+                                        (Alpha) This field requires the AtomicWriteVolumeUserFields feature gate to be enabled.
+                                      format: int64
+                                      type: integer
                                   required:
                                   - key
                                   - path
@@ -744,6 +757,13 @@ spec:
                                   mode, like fsGroup, and the result can be other mode bits set.
                                 format: int32
                                 type: integer
+                              defaultUser:
+                                description: |-
+                                  defaultUser is Optional: The owner UID of the created files by default.
+                                  The defaultUser field is only used as a fallback when the item-level user field is unset.
+                                  (Alpha) This field requires the AtomicWriteVolumeUserFields feature gate to be enabled.
+                                format: int64
+                                type: integer
                               items:
                                 description: Items is a list of downward API volume
                                   file
@@ -810,6 +830,13 @@ spec:
                                       - resource
                                       type: object
                                       x-kubernetes-map-type: atomic
+                                    user:
+                                      description: |-
+                                        user is Optional: The owner UID of the created file.
+                                        If specified, the item-level user field takes precedence over defaultUser.
+                                        (Alpha) This field requires the AtomicWriteVolumeUserFields feature gate to be enabled.
+                                      format: int64
+                                      type: integer
                                   required:
                                   - path
                                   type: object
@@ -828,6 +855,18 @@ spec:
                                   Must be an empty string (default) or Memory.
                                   More info: https://kubernetes.io/docs/concepts/storage/volumes#emptydir
                                 type: string
+                              mode:
+                                description: |-
+                                  mode specifies the permission bits for the emptyDir directory, in numeric
+                                  notation (e.g., 0755, 01777). Must be a value between 0000 and 01777.
+                                  If not specified, defaults to 0777.
+                                  This might be in conflict with other options that affect the file
+                                  mode, like fsGroup. If fsGroup is specified, the fsGroup permissions
+                                  will override the mode specified here.
+                                  This field has no effect on Windows.
+                                  This field is alpha and requires EmptyDirVolumeMode featuregate to be enabled.
+                                format: int32
+                                type: integer
                               sizeLimit:
                                 anyOf:
                                 - type: integer
@@ -921,8 +960,8 @@ spec:
                                           * An existing PVC (PersistentVolumeClaim)
                                           If the provisioner or an external controller can support the specified data source,
                                           it will create a new volume based on the contents of the specified data source.
-                                          When the AnyVolumeDataSource feature gate is enabled, dataSource contents will be copied to dataSourceRef,
-                                          and dataSourceRef contents will be copied to dataSource when dataSourceRef.namespace is not specified.
+                                          dataSource contents will be copied to dataSourceRef, and dataSourceRef contents will be
+                                          copied to dataSource when dataSourceRef.namespace is not specified.
                                           If the namespace is specified, then dataSourceRef will not be copied to dataSource.
                                         properties:
                                           apiGroup:
@@ -967,7 +1006,6 @@ spec:
                                             specified.
                                           * While dataSource only allows local objects, dataSourceRef allows objects
                                             in any namespaces.
-                                          (Beta) Using this field requires the AnyVolumeDataSource feature gate to be enabled.
                                           (Alpha) Using the namespace field of dataSourceRef requires the CrossNamespaceVolumeDataSource feature gate to be enabled.
                                         properties:
                                           apiGroup:
@@ -997,7 +1035,7 @@ spec:
                                       resources:
                                         description: |-
                                           resources represents the minimum resources the volume should have.
-                                          If RecoverVolumeExpansionFailure feature is enabled users are allowed to specify resource requirements
+                                          Users are allowed to specify resource requirements
                                           that are lower than previous value but must still be higher than capacity recorded in the
                                           status field of the claim.
                                           More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources
@@ -1329,7 +1367,7 @@ spec:
                               A failure to resolve or pull the image during pod startup will block containers from starting and may add significant latency. Failures will be retried using normal volume backoff and will be reported on the pod reason and message.
                               The types of objects that may be mounted by this volume are defined by the container runtime implementation on a host machine and at minimum must include all valid types supported by the container image field.
                               The OCI object gets mounted in a single directory (spec.containers[*].volumeMounts.mountPath) by merging the manifest layers in the same way as for container images.
-                              The volume will be mounted read-only (ro) and non-executable files (noexec).
+                              The volume will be mounted read-only (ro).
                               Sub path mounts for containers are not supported (spec.containers[*].volumeMounts.subpath) before 1.33.
                               The field spec.securityContext.fsGroupChangePolicy has no effect on this volume type.
                             properties:
@@ -1495,8 +1533,7 @@ spec:
                             description: |-
                               portworxVolume represents a portworx volume attached and mounted on kubelets host machine.
                               Deprecated: PortworxVolume is deprecated. All operations for the in-tree portworxVolume type
-                              are redirected to the pxd.portworx.com CSI driver when the CSIMigrationPortworx feature-gate
-                              is on.
+                              are redirected to the pxd.portworx.com CSI driver.
                             properties:
                               fsType:
                                 description: |-
@@ -1530,6 +1567,13 @@ spec:
                                   mode, like fsGroup, and the result can be other mode bits set.
                                 format: int32
                                 type: integer
+                              defaultUser:
+                                description: |-
+                                  defaultUser is Optional: The owner UID of the created files by default.
+                                  The defaultUser field is only used as a fallback when the item-level user field is unset.
+                                  (Alpha) This field requires the AtomicWriteVolumeUserFields feature gate to be enabled.
+                                format: int64
+                                type: integer
                               sources:
                                 description: |-
                                   sources is the list of volume projections. Each entry in this list
@@ -1630,6 +1674,13 @@ spec:
                                             Mutually-exclusive with name.  The contents of all selected
                                             ClusterTrustBundles will be unified and deduplicated.
                                           type: string
+                                        user:
+                                          description: |-
+                                            user is Optional: The owner UID of the created file.
+                                            If specified, the item-level user field takes precedence over defaultUser.
+                                            (Alpha) This field requires the AtomicWriteVolumeUserFields feature gate to be enabled.
+                                          format: int64
+                                          type: integer
                                       required:
                                       - path
                                       type: object
@@ -1670,6 +1721,13 @@ spec:
                                                   May not contain the path element '..'.
                                                   May not start with the string '..'.
                                                 type: string
+                                              user:
+                                                description: |-
+                                                  user is Optional: The owner UID of the created file.
+                                                  If specified, the item-level user field takes precedence over defaultUser.
+                                                  (Alpha) This field requires the AtomicWriteVolumeUserFields feature gate to be enabled.
+                                                format: int64
+                                                type: integer
                                             required:
                                             - key
                                             - path
@@ -1769,6 +1827,13 @@ spec:
                                                 - resource
                                                 type: object
                                                 x-kubernetes-map-type: atomic
+                                              user:
+                                                description: |-
+                                                  user is Optional: The owner UID of the created file.
+                                                  If specified, the item-level user field takes precedence over defaultUser.
+                                                  (Alpha) This field requires the AtomicWriteVolumeUserFields feature gate to be enabled.
+                                                format: int64
+                                                type: integer
                                             required:
                                             - path
                                             type: object
@@ -1876,6 +1941,31 @@ spec:
                                           description: Kubelet's generated CSRs will
                                             be addressed to this signer.
                                           type: string
+                                        user:
+                                          description: |-
+                                            user is Optional: The owner UID of the created file.
+                                            If specified, the item-level user field takes precedence over defaultUser.
+                                            (Alpha) This field requires the AtomicWriteVolumeUserFields feature gate to be enabled.
+                                          format: int64
+                                          type: integer
+                                        userAnnotations:
+                                          additionalProperties:
+                                            type: string
+                                          description: |-
+                                            userAnnotations allow pod authors to pass additional information to
+                                            the signer implementation.  Kubernetes does not restrict or validate this
+                                            metadata in any way.
+
+                                            These values are copied verbatim into the `spec.unverifiedUserAnnotations` field of
+                                            the PodCertificateRequest objects that Kubelet creates.
+
+                                            Entries are subject to the same validation as object metadata annotations,
+                                            with the addition that all keys must be domain-prefixed. No restrictions
+                                            are placed on values, except an overall size limitation on the entire field.
+
+                                            Signers should document the keys and values they support. Signers should
+                                            deny requests that contain keys they do not recognize.
+                                          type: object
                                       required:
                                       - keyType
                                       - signerName
@@ -1917,6 +2007,13 @@ spec:
                                                   May not contain the path element '..'.
                                                   May not start with the string '..'.
                                                 type: string
+                                              user:
+                                                description: |-
+                                                  user is Optional: The owner UID of the created file.
+                                                  If specified, the item-level user field takes precedence over defaultUser.
+                                                  (Alpha) This field requires the AtomicWriteVolumeUserFields feature gate to be enabled.
+                                                format: int64
+                                                type: integer
                                             required:
                                             - key
                                             - path
@@ -1964,6 +2061,13 @@ spec:
                                             path is the path relative to the mount point of the file to project the
                                             token into.
                                           type: string
+                                        user:
+                                          description: |-
+                                            user is Optional: The owner UID of the created file.
+                                            If specified, the item-level user field takes precedence over defaultUser.
+                                            (Alpha) This field requires the AtomicWriteVolumeUserFields feature gate to be enabled.
+                                          format: int64
+                                          type: integer
                                       required:
                                       - path
                                       type: object
@@ -2170,6 +2274,13 @@ spec:
                                   mode, like fsGroup, and the result can be other mode bits set.
                                 format: int32
                                 type: integer
+                              defaultUser:
+                                description: |-
+                                  defaultUser is Optional: The owner UID of the created files by default.
+                                  The defaultUser field is only used as a fallback when the item-level user field is unset.
+                                  (Alpha) This field requires the AtomicWriteVolumeUserFields feature gate to be enabled.
+                                format: int64
+                                type: integer
                               items:
                                 description: |-
                                   items If unspecified, each key-value pair in the Data field of the referenced
@@ -2203,6 +2314,13 @@ spec:
                                         May not contain the path element '..'.
                                         May not start with the string '..'.
                                       type: string
+                                    user:
+                                      description: |-
+                                        user is Optional: The owner UID of the created file.
+                                        If specified, the item-level user field takes precedence over defaultUser.
+                                        (Alpha) This field requires the AtomicWriteVolumeUserFields feature gate to be enabled.
+                                      format: int64
+                                      type: integer
                                   required:
                                   - key
                                   - path
diff --git a/packages/system/backupstrategy-controller/definitions/strategy.backups.cozystack.io_mongodbs.yaml b/packages/system/backupstrategy-controller/definitions/strategy.backups.cozystack.io_mongodbs.yaml
new file mode 100644
index 0000000000..4a26604aff
--- /dev/null
+++ b/packages/system/backupstrategy-controller/definitions/strategy.backups.cozystack.io_mongodbs.yaml
@@ -0,0 +1,213 @@
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.16.4
+  name: mongodbs.strategy.backups.cozystack.io
+spec:
+  group: strategy.backups.cozystack.io
+  names:
+    kind: MongoDB
+    listKind: MongoDBList
+    plural: mongodbs
+    singular: mongodb
+  scope: Cluster
+  versions:
+  - name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        description: |-
+          MongoDB defines a backup strategy that delegates execution to the Percona
+          Server for MongoDB operator (psmdb.percona.com). The strategy carries a
+          templated logical-backup configuration; the driver materialises
+          PerconaServerMongoDBBackup objects per BackupJob and surfaces them as
+          Cozystack Backup artifacts. Restores create a PerconaServerMongoDBRestore
+          CR with clusterName pointing at the target cluster and a backupSource
+          carrying the S3 destination read back from the source backup, so the same
+          artifact restores in-place or into a differently-named instance.
+
+          The strategy always names the storage (spec.template.storageName) psmdb
+          resolves against the source cluster's spec.backup.storages. On the legacy
+          flow the S3/credentials for that storage live on the PerconaServerMongoDB CR
+          (the mongodb chart declares them when backup.enabled=true and
+          useSystemBucket=false). On the useSystemBucket flow the chart cannot know the
+          platform bucket at render time, so the strategy also carries the storage's S3
+          coordinates (spec.template.s3) and the driver SSA-injects them onto the
+          cluster at BackupJob time.
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: MongoDBSpec specifies the desired psmdb-operator-driven backup
+              strategy.
+            properties:
+              template:
+                description: |-
+                  Template carries the templated PerconaServerMongoDBBackup configuration.
+                  String fields support Helm-style Go templating with two top-level
+                  values:
+                    .Application - the application object (apps.cozystack.io/MongoDB)
+                    .Parameters  - the parameters from the matched BackupClassStrategy.
+                                   These values MUST NOT carry credentials — the psmdb
+                                   storage (bucket/endpoint/credentialsSecret) lives on the
+                                   PerconaServerMongoDB CR, referenced here only by name.
+                properties:
+                  compressionLevel:
+                    description: |-
+                      CompressionLevel tunes the compression algorithm (algorithm-specific).
+                      Left unset the operator picks its default.
+                    type: integer
+                  compressionType:
+                    description: |-
+                      CompressionType is the pbm compression algorithm (e.g. "gzip", "zstd",
+                      "s2", "snappy", "lz4", "pgzip", "none"). Defaults to the operator-side
+                      default when empty. Templating is supported.
+                    type: string
+                  s3:
+                    description: |-
+                      S3 carries the system-bucket storage coordinates the driver SSA-patches
+                      onto the source PerconaServerMongoDB's spec.backup.storages[StorageName]
+                      on the useSystemBucket flow. PBM takes these as static CR fields (not
+                      secret refs), and the platform bucket name / endpoint are only known at
+                      BackupJob time, so the cozy-default strategy carries them (endpointUrl
+                      already scheme'd by the endpoint helper) and the driver injects them. Nil
+                      means the legacy flow: rely on the storage the app chart rendered
+                      statically, and patch nothing.
+                    properties:
+                      bucket:
+                        description: Bucket is the S3 bucket name (the COSI-assigned
+                          system bucket).
+                        type: string
+                      credentialsSecret:
+                        description: |-
+                          CredentialsSecret names the Secret carrying AWS_ACCESS_KEY_ID /
+                          AWS_SECRET_ACCESS_KEY. Defaults to cozy-backups-creds when empty.
+                        type: string
+                      endpointUrl:
+                        description: EndpointURL is the full S3 endpoint URL including
+                          scheme.
+                        type: string
+                      forcePathStyle:
+                        description: ForcePathStyle selects path-style S3 addressing.
+                        type: boolean
+                      insecureSkipTLSVerify:
+                        description: InsecureSkipTLSVerify disables S3 endpoint certificate
+                          verification.
+                        type: boolean
+                      prefix:
+                        description: Prefix scopes this release's backups under the
+                          bucket.
+                        type: string
+                      region:
+                        description: Region is the S3 region.
+                        type: string
+                    type: object
+                  storageName:
+                    description: |-
+                      StorageName names a storage entry in the source cluster's
+                      spec.backup.storages. On the legacy flow the mongodb chart declares
+                      "s3-storage" when backup.enabled=true and useSystemBucket=false; on the
+                      useSystemBucket flow the driver injects an entry under this same name from
+                      the S3 coordinates below. Leave empty to use "s3-storage". Templating is
+                      supported.
+                    type: string
+                  type:
+                    description: |-
+                      Type selects the backup type. Only "logical" is supported (logical
+                      dumps are portable across clusters, which is what makes
+                      restore-to-differently-named instances work). Defaults to "logical"
+                      when empty.
+                    enum:
+                    - logical
+                    type: string
+                type: object
+            required:
+            - template
+            type: object
+          status:
+            description: |-
+              MongoDBStatus reports observed state for the strategy CR. Driver controllers
+              surface diagnostic conditions here (e.g. validation issues).
+            properties:
+              conditions:
+                description: Conditions holds the latest available observations.
+                items:
+                  description: Condition contains details for one aspect of the current
+                    state of this API Resource.
+                  properties:
+                    lastTransitionTime:
+                      description: |-
+                        lastTransitionTime is the last time the condition transitioned from one status to another.
+                        This should be when the underlying condition changed.  If that is not known, then using the time when the API field changed is acceptable.
+                      format: date-time
+                      type: string
+                    message:
+                      description: |-
+                        message is a human readable message indicating details about the transition.
+                        This may be an empty string.
+                      maxLength: 32768
+                      type: string
+                    observedGeneration:
+                      description: |-
+                        observedGeneration represents the .metadata.generation that the condition was set based upon.
+                        For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date
+                        with respect to the current state of the instance.
+                      format: int64
+                      minimum: 0
+                      type: integer
+                    reason:
+                      description: |-
+                        reason contains a programmatic identifier indicating the reason for the condition's last transition.
+                        Producers of specific condition types may define expected values and meanings for this field,
+                        and whether the values are considered a guaranteed API.
+                        The value should be a CamelCase string.
+                        This field may not be empty.
+                      maxLength: 1024
+                      minLength: 1
+                      pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
+                      type: string
+                    status:
+                      description: status of the condition, one of True, False, Unknown.
+                      enum:
+                      - "True"
+                      - "False"
+                      - Unknown
+                      type: string
+                    type:
+                      description: type of condition in CamelCase or in foo.example.com/CamelCase.
+                      maxLength: 316
+                      pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
+                      type: string
+                  required:
+                  - lastTransitionTime
+                  - message
+                  - reason
+                  - status
+                  - type
+                  type: object
+                type: array
+                x-kubernetes-list-map-keys:
+                - type
+                x-kubernetes-list-type: map
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}
diff --git a/packages/system/backupstrategy-controller/definitions/strategy.backups.cozystack.io_rabbitmqs.yaml b/packages/system/backupstrategy-controller/definitions/strategy.backups.cozystack.io_rabbitmqs.yaml
new file mode 100644
index 0000000000..d3b2b598bc
--- /dev/null
+++ b/packages/system/backupstrategy-controller/definitions/strategy.backups.cozystack.io_rabbitmqs.yaml
@@ -0,0 +1,170 @@
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.16.4
+  name: rabbitmqs.strategy.backups.cozystack.io
+spec:
+  group: strategy.backups.cozystack.io
+  names:
+    kind: Rabbitmq
+    listKind: RabbitmqList
+    plural: rabbitmqs
+    singular: rabbitmq
+  scope: Cluster
+  versions:
+  - name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        description: |-
+          Rabbitmq defines a backup strategy that exports and imports RabbitMQ broker
+          DEFINITIONS (vhosts, users, permissions, queues, exchanges, bindings,
+          policies, parameters) via the management HTTP API, run as a one-shot
+          batch/v1.Job per BackupJob / RestoreJob. Message payloads are out of scope -
+          RabbitMQ has no consistent online export of them, so a full-data backup is a
+          Velero volume snapshot, not this strategy. The driver gates on the target
+          RabbitmqCluster being ready, wraps the templated PodTemplateSpec in a Job,
+          and records the stored object on the Cozystack Backup artifact.
+
+          Restore is a MERGE, not a reset: it POSTs the definitions to /api/definitions,
+          which creates or updates what is in the export and never deletes anything, so
+          objects created after the backup survive the restore and the broker is not
+          returned to its exact backup-time state. A to-copy restore also imports the
+          source's users (with password hashes) into the target.
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: RabbitmqSpec specifies the desired Rabbitmq-driven backup
+              strategy.
+            properties:
+              artifactURITemplate:
+                description: |-
+                  ArtifactURITemplate is the object location the backup writes to, rendered
+                  against the run context and recorded on the produced Backup's
+                  status.artifact.uri. It is the single source of truth for where the
+                  export lives: the backup Job writes exactly this object, and restore reads
+                  the recorded value back rather than reconstructing a key. It is REQUIRED
+                  for backups - a BackupJob whose resolved strategy leaves it empty fails,
+                  because nothing would record where the export was stored. Ignored on
+                  restore (the recorded value is used instead).
+                type: string
+              template:
+                description: |-
+                  Template is the PodTemplateSpec the driver wraps in a batch/v1.Job for
+                  both backup and restore runs. Helm-style Go templates are supported in
+                  every string field. The available context is:
+                    .Application - the application object (apps.cozystack.io/RabbitMQ)
+                    .Release.Name, .Release.Namespace - shorthand for the application
+                                                        name/namespace
+                    .Mode        - "backup" or "restore"
+                    .BackupName  - the per-run identity used to scope the object key so
+                                   distinct backups of one application do not overwrite
+                                   each other: the BackupJob name on backup, the source
+                                   Backup name on restore.
+                    .ArtifactURI - the stored object's location and single source of truth:
+                                   the rendered ArtifactURITemplate on backup, and the value
+                                   recorded on the source Backup's status.artifact.uri on
+                                   restore (so restore reads the exact object backup wrote).
+                    .Parameters  - map[string]string from the matched BackupClassStrategy
+                    .Backup      - the source Backup metadata (only set on restore);
+                                   exposes .Name, .Namespace, and
+                                   .ApplicationRef.{APIGroup,Kind,Name} so a to-copy
+                                   restore can address the source release's object key.
+
+                  The template is stored schemaless (its content is preserved but not
+                  validated by the apiserver): the driver renders and validates the pod
+                  spec, and generating the full PodTemplateSpec OpenAPI schema here would
+                  add ~590 KB to this CRD. The backupstrategy-controller chart inlines
+                  every definitions/*.yaml into one Helm release, whose state Secret is
+                  capped at 1 MiB - a fourth full PodTemplateSpec schema (after Altinity,
+                  Job and FoundationDB) pushes that Secret over the cap and fails install.
+                x-kubernetes-preserve-unknown-fields: true
+            required:
+            - template
+            type: object
+          status:
+            description: RabbitmqStatus reports observed state for the strategy CR.
+            properties:
+              conditions:
+                description: Conditions holds the latest available observations.
+                items:
+                  description: Condition contains details for one aspect of the current
+                    state of this API Resource.
+                  properties:
+                    lastTransitionTime:
+                      description: |-
+                        lastTransitionTime is the last time the condition transitioned from one status to another.
+                        This should be when the underlying condition changed.  If that is not known, then using the time when the API field changed is acceptable.
+                      format: date-time
+                      type: string
+                    message:
+                      description: |-
+                        message is a human readable message indicating details about the transition.
+                        This may be an empty string.
+                      maxLength: 32768
+                      type: string
+                    observedGeneration:
+                      description: |-
+                        observedGeneration represents the .metadata.generation that the condition was set based upon.
+                        For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date
+                        with respect to the current state of the instance.
+                      format: int64
+                      minimum: 0
+                      type: integer
+                    reason:
+                      description: |-
+                        reason contains a programmatic identifier indicating the reason for the condition's last transition.
+                        Producers of specific condition types may define expected values and meanings for this field,
+                        and whether the values are considered a guaranteed API.
+                        The value should be a CamelCase string.
+                        This field may not be empty.
+                      maxLength: 1024
+                      minLength: 1
+                      pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
+                      type: string
+                    status:
+                      description: status of the condition, one of True, False, Unknown.
+                      enum:
+                      - "True"
+                      - "False"
+                      - Unknown
+                      type: string
+                    type:
+                      description: type of condition in CamelCase or in foo.example.com/CamelCase.
+                      maxLength: 316
+                      pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
+                      type: string
+                  required:
+                  - lastTransitionTime
+                  - message
+                  - reason
+                  - status
+                  - type
+                  type: object
+                type: array
+                x-kubernetes-list-map-keys:
+                - type
+                x-kubernetes-list-type: map
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}
diff --git a/packages/system/backupstrategy-controller/definitions/strategy.backups.cozystack.io_redis.yaml b/packages/system/backupstrategy-controller/definitions/strategy.backups.cozystack.io_redis.yaml
new file mode 100644
index 0000000000..97bcdd85bc
--- /dev/null
+++ b/packages/system/backupstrategy-controller/definitions/strategy.backups.cozystack.io_redis.yaml
@@ -0,0 +1,148 @@
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.16.4
+  name: redis.strategy.backups.cozystack.io
+spec:
+  group: strategy.backups.cozystack.io
+  names:
+    kind: Redis
+    listKind: RedisList
+    plural: redis
+    singular: redis
+  scope: Cluster
+  versions:
+  - name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        description: |-
+          Redis defines a backup strategy for a spotahome RedisFailover app, Redis or
+          Valkey. The spotahome operator ships no backup CRD, so the strategy runs a
+          one-shot Job that dumps an RDB snapshot to object storage (and replays it on
+          restore) - the same PodTemplateSpec model as the Job/Altinity strategies
+          rather than an operator-CR delegation.
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: RedisSpec specifies the desired behavior of a Redis backup
+              strategy.
+            properties:
+              template:
+                description: |-
+                  Template holds a PodTemplateSpec with the right shape to run a single
+                  pod to completion and dump (or restore) a Redis RDB snapshot to object
+                  storage. Helm-like Go templates are supported in every string field and
+                  are rendered against the following context:
+                    - `.Application` — the live application object (e.g.
+                      `.Application.spec.replicas`).
+                    - `.Release.Name` and `.Release.Namespace` — the application's name
+                      and namespace.
+                    - `.Release.Prefix` — the prefix the application's chart puts before
+                      the name of every resource it creates: `redis-` for a Redis
+                      application, `valkey-` for a Valkey one. Both run on the same
+                      RedisFailover operator, so one strategy serves either kind.
+                    - `.Mode` — `"backup"`, `"restore"`, or `"cleanup"` (delete the object
+                      of a removed Backup), identifying the run.
+                    - `.ObjectKey` — the object-storage key for this run: unique per backup,
+                      and on restore/cleanup the exact key recorded on the Backup, so a Plan
+                      keeps one object per run and a restore reads back the one it names
+                      rather than whatever last overwrote a shared path.
+                    - `.Parameters` — the resolved BackupClass strategy parameters.
+                    - `.Backup` — only on restore runs: `.Backup.Name`, `.Backup.Namespace`
+                      and `.Backup.ApplicationRef` describing the source backup, so a
+                      to-copy restore reads the SOURCE release's object-storage prefix.
+
+                  Stored schemaless (content preserved, not validated by the apiserver): the
+                  driver renders and validates the pod spec, and generating the full
+                  PodTemplateSpec OpenAPI schema here would add ~590 KB to this CRD. The
+                  backupstrategy-controller chart inlines every definitions/*.yaml into one
+                  Helm release whose state Secret is capped at 1 MiB, so a full
+                  PodTemplateSpec schema here (a fifth after Altinity, Job, FoundationDB and
+                  Redis's own siblings) pushes that Secret over the cap and fails install.
+                  Same reason as rabbitmq_types.go.
+                x-kubernetes-preserve-unknown-fields: true
+            required:
+            - template
+            type: object
+          status:
+            properties:
+              conditions:
+                items:
+                  description: Condition contains details for one aspect of the current
+                    state of this API Resource.
+                  properties:
+                    lastTransitionTime:
+                      description: |-
+                        lastTransitionTime is the last time the condition transitioned from one status to another.
+                        This should be when the underlying condition changed.  If that is not known, then using the time when the API field changed is acceptable.
+                      format: date-time
+                      type: string
+                    message:
+                      description: |-
+                        message is a human readable message indicating details about the transition.
+                        This may be an empty string.
+                      maxLength: 32768
+                      type: string
+                    observedGeneration:
+                      description: |-
+                        observedGeneration represents the .metadata.generation that the condition was set based upon.
+                        For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date
+                        with respect to the current state of the instance.
+                      format: int64
+                      minimum: 0
+                      type: integer
+                    reason:
+                      description: |-
+                        reason contains a programmatic identifier indicating the reason for the condition's last transition.
+                        Producers of specific condition types may define expected values and meanings for this field,
+                        and whether the values are considered a guaranteed API.
+                        The value should be a CamelCase string.
+                        This field may not be empty.
+                      maxLength: 1024
+                      minLength: 1
+                      pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
+                      type: string
+                    status:
+                      description: status of the condition, one of True, False, Unknown.
+                      enum:
+                      - "True"
+                      - "False"
+                      - Unknown
+                      type: string
+                    type:
+                      description: type of condition in CamelCase or in foo.example.com/CamelCase.
+                      maxLength: 316
+                      pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
+                      type: string
+                  required:
+                  - lastTransitionTime
+                  - message
+                  - reason
+                  - status
+                  - type
+                  type: object
+                type: array
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}
diff --git a/packages/system/backupstrategy-controller/definitions/strategy.backups.cozystack.io_veleroes.yaml b/packages/system/backupstrategy-controller/definitions/strategy.backups.cozystack.io_veleroes.yaml
index 34254aed38..e21b296e87 100644
--- a/packages/system/backupstrategy-controller/definitions/strategy.backups.cozystack.io_veleroes.yaml
+++ b/packages/system/backupstrategy-controller/definitions/strategy.backups.cozystack.io_veleroes.yaml
@@ -417,6 +417,33 @@ spec:
                         - name
                         type: object
                         x-kubernetes-map-type: atomic
+                      resourcePolicy:
+                        description: |-
+                          ResourcePolicy specifies the reference to a ConfigMap containing resource
+                          filter policies for this restore. The ConfigMap can contain a
+                          namespacedFilterPolicies section that specifies per-namespace resource type
+                          filters, label selectors, and resource name patterns, and a
+                          clusterScopedFilterPolicy section for per-kind filtering of cluster-scoped
+                          resources. The ConfigMap format is the same as for BackupSpec.ResourcePolicy.
+                        nullable: true
+                        properties:
+                          apiGroup:
+                            description: |-
+                              APIGroup is the group for the resource being referenced.
+                              If APIGroup is not specified, the specified Kind must be in the core API group.
+                              For any other third-party types, APIGroup is required.
+                            type: string
+                          kind:
+                            description: Kind is the type of resource being referenced
+                            type: string
+                          name:
+                            description: Name is the name of resource being referenced
+                            type: string
+                        required:
+                        - kind
+                        - name
+                        type: object
+                        x-kubernetes-map-type: atomic
                       restorePVs:
                         description: |-
                           RestorePVs specifies whether to restore all included
diff --git a/packages/system/backupstrategy-controller/files/kafka-backup.sh b/packages/system/backupstrategy-controller/files/kafka-backup.sh
new file mode 100644
index 0000000000..753ed0d2b8
--- /dev/null
+++ b/packages/system/backupstrategy-controller/files/kafka-backup.sh
@@ -0,0 +1,218 @@
+# shellcheck shell=bash
+set -euo pipefail
+# BIN is the Kafka CLI directory; the Strimzi image ships it at /opt/kafka/bin.
+# Overridable only so hack/kafka-backup-script.bats can point it at stubbed
+# kafka-topics.sh / kafka-configs.sh; the Job never sets it.
+BIN="${BIN:-/opt/kafka/bin}"
+TAB=$(printf '\t')
+# Overridable for the same reason as BIN: hack/kafka-backup-script.bats points it
+# at a per-test path so runs cannot read back a previous test's records. The Job
+# never sets it.
+file="${METADATA_FILE:-/tmp/kafka-metadata.txt}"
+
+# Validate MODE up front and fail closed on anything unexpected. internal/
+# template renders the input unchanged when it fails, so a broken env render
+# would ship the literal "{{ .Mode }}"; without this guard the bare `else`
+# below would run the destructive restore path under the guise of a backup.
+case "${MODE}" in
+  backup|restore|cleanup) ;;
+  *) echo "unknown MODE '${MODE}' (expected backup|restore|cleanup)" >&2; exit 1 ;;
+esac
+
+case "${S3_ENDPOINT}" in
+  http://*|https://*) base="${S3_ENDPOINT}" ;;
+  *) base="https://${S3_ENDPOINT}" ;;
+esac
+# ARTIFACT_URI is s3://<bucket>/<key>. Split it, then build the HTTP
+# object URL honouring path-style vs virtual-hosted addressing.
+case "${ARTIFACT_URI}" in
+  s3://*) rest="${ARTIFACT_URI#s3://}"; bucket="${rest%%/*}"; key="${rest#*/}" ;;
+  *) echo "expected an s3:// artifact URI, got '${ARTIFACT_URI}' (set spec.artifactURITemplate)" >&2; exit 1 ;;
+esac
+# Split the endpoint into scheme, host, optional port and optional path
+# prefix. IPv6-safe: a bracketed literal ([::1]) keeps its brackets and only
+# a colon OUTSIDE them is the port separator.
+scheme="${base%%://*}"
+rest2="${base#*://}"
+hostport="${rest2%%/*}"
+case "${rest2}" in */*) pathpart="/${rest2#*/}" ;; *) pathpart="" ;; esac
+case "${hostport}" in
+  \[*\]*) host="${hostport%%\]*}]"; after="${hostport##*\]}"; port="${after#:}"; [ "${port}" = "${after}" ] && port="" ;;
+  *) host="${hostport%%:*}"; port="${hostport##*:}"; [ "${port}" = "${hostport}" ] && port="" ;;
+esac
+if [ "${scheme}" = http ]; then defport=80; else defport=443; fi
+# curl 7.76.1 (this image) omits a NON-default port from the SigV4 canonical
+# host but still sends it in the Host header, so the backend recomputes a
+# different signature and 403s every request (fixed in curl 7.86.0). Sign and
+# send a portless URL and redirect the connection to the real port with
+# --connect-to, so signed, sent and server-side host all agree; correct on
+# curl >= 7.86 too (which drops the default port anyway). No -k: TLS is
+# verified against the endpoint's certificate (the platform endpoint is the
+# ACME-valid ingress), matching strategy-rabbitmq-default.yaml.
+if [ "${S3_FORCE_PATH_STYLE}" = "false" ]; then
+  reqhost="${bucket}.${host}"
+  obj_url="${scheme}://${reqhost}${pathpart}/${key}"
+else
+  reqhost="${host}"
+  obj_url="${scheme}://${reqhost}${pathpart}/${bucket}/${key}"
+fi
+# --connect-to matches HOST1 against the request host, which differs between
+# path-style (${host}) and virtual-hosted (${bucket}.${host}) — key it off the
+# host the URL actually uses so the redirect fires in both modes; the real
+# connection target stays ${host}:${port}.
+connect_to=""
+if [ -n "${port}" ] && [ "${port}" != "${defport}" ]; then
+  connect_to="--connect-to ${reqhost}:${defport}:${host}:${port}"
+fi
+# ${connect_to} is unquoted so an empty value expands to no argument.
+s3() { curl -fsS ${connect_to} --aws-sigv4 "aws:amz:${S3_REGION}:s3" \
+  --user "${AWS_ACCESS_KEY_ID}:${AWS_SECRET_ACCESS_KEY}" "$@"; }
+
+# Cleanup runs when the owning Backup is deleted: delete the object and exit
+# before any broker access (the source may already be gone). A missing object
+# is success (delete is idempotent), so a non-2xx/404 exits non-zero and the
+# controller retries rather than orphaning the object.
+if [ "${MODE}" = cleanup ]; then
+  echo "deleting ${ARTIFACT_URI}"
+  code=$(curl -sS -o /dev/null -w '%{http_code}' ${connect_to} \
+    --aws-sigv4 "aws:amz:${S3_REGION}:s3" \
+    --user "${AWS_ACCESS_KEY_ID}:${AWS_SECRET_ACCESS_KEY}" \
+    -X DELETE "${obj_url}" || true)
+  case "${code}" in
+    2*|404) echo "deleted (HTTP ${code})"; exit 0 ;;
+    *) echo "delete failed: HTTP ${code}" >&2; exit 1 ;;
+  esac
+fi
+
+# Extract PartitionCount / ReplicationFactor from a --describe summary line;
+# empty output means an unparsable describe.
+describe_field() { printf '%s' "$1" | grep -oE "$2: [0-9]+" | awk '{print $2}'; }
+
+if [ "${MODE}" = backup ]; then
+  echo "exporting Kafka topic metadata from ${BOOTSTRAP}"
+  # Fail closed: a failed --list must abort, not read as "no topics" and upload
+  # an empty backup that reports success. An empty list after a SUCCESSFUL call
+  # is a legitimate "no user topics" state.
+  if ! all=$("${BIN}"/kafka-topics.sh --bootstrap-server "${BOOTSTRAP}" --list --exclude-internal); then
+    echo "cannot list topics on ${BOOTSTRAP}" >&2; exit 1
+  fi
+  : > "${file}"
+  # Topic names cannot contain whitespace, so word-splitting is safe and keeps
+  # the loop in the current shell (a piped while would swallow exits into a
+  # subshell).
+  for t in ${all}; do
+    [ -n "${t}" ] || continue
+    # kafka-topics --topic is a Java REGEX filter, not a literal name:
+    # "audit.events" would also match "audit-events". Wrap the name in \Q...\E
+    # so it matches exactly the one topic (a missing topic still yields exit 1 /
+    # empty, preserved).
+    if ! desc=$("${BIN}"/kafka-topics.sh --bootstrap-server "${BOOTSTRAP}" --describe --topic "\Q${t}\E"); then
+      echo "cannot describe topic ${t}" >&2; exit 1
+    fi
+    line=${desc%%$'\n'*}
+    parts=$(describe_field "${line}" PartitionCount)
+    rf=$(describe_field "${line}" ReplicationFactor)
+    { [ -n "${parts}" ] && [ -n "${rf}" ]; } || { echo "unparsable describe for ${t}: ${line}" >&2; exit 1; }
+    printf 'T%s%s%s%s%s%s\n' "${TAB}" "${t}" "${TAB}" "${parts}" "${TAB}" "${rf}" >> "${file}"
+    # Non-default configs, ONE per line from kafka-configs --describe
+    # ("  key=value sensitive=... synonyms=..."), so a value that contains a
+    # comma stays in its own tab-separated field — the comma-joined "Configs:"
+    # summary cannot be split unambiguously.
+    if ! cfgout=$("${BIN}"/kafka-configs.sh --bootstrap-server "${BOOTSTRAP}" --describe --entity-type topics --entity-name "${t}"); then
+      echo "cannot describe configs for ${t}" >&2; exit 1
+    fi
+    # Fail closed like the --list guard: grep exit 1 is "no non-default configs"
+    # (fine); any other exit is an I/O error and must abort, not silently drop
+    # the topic's configs.
+    if cfglines=$(printf '%s\n' "${cfgout}" | grep -E '^[[:space:]]+[^[:space:]=]+='); then :; else
+      rc=$?; [ "${rc}" -eq 1 ] || { echo "cannot parse configs for ${t}" >&2; exit 1; }
+      cfglines=""
+    fi
+    if [ -n "${cfglines}" ]; then
+      printf '%s\n' "${cfglines}" | while read -r cl; do
+        kv=${cl%% sensitive=*}
+        k=${kv%%=*}
+        v=${kv#*=}
+        printf 'C%s%s%s%s%s%s\n' "${TAB}" "${t}" "${TAB}" "${k}" "${TAB}" "${v}" >> "${file}"
+      done
+    fi
+    echo "  ${t}: partitions=${parts} rf=${rf}"
+  done
+  s3 -X PUT --upload-file "${file}" "${obj_url}"
+  echo "uploaded ${ARTIFACT_URI}"
+else
+  echo "restoring Kafka topic metadata into ${BOOTSTRAP} from ${ARTIFACT_URI}"
+  s3 -o "${file}" "${obj_url}"
+  # Probe existence with --list, fail closed: a --describe under 2>/dev/null
+  # cannot tell "topic absent" from "broker unreachable" (Kafka 3.9.1 exits 1
+  # for both, and the distinguishing text goes to stdout). --list instead fails
+  # the whole restore when the broker is unreachable, so a transient outage is
+  # never misread as "absent" and routed into --create.
+  if ! live=$("${BIN}"/kafka-topics.sh --bootstrap-server "${BOOTSTRAP}" --list); then
+    echo "cannot list topics on ${BOOTSTRAP}" >&2; exit 1
+  fi
+  # Redirect (not a pipe) so an exit inside aborts the whole script.
+  while IFS="${TAB}" read -r kind a b c; do
+    case "${kind}" in
+    T)
+      t=$a; parts=$b; rf=$c
+      # Validate the RECORDED shape (from the stored object) before it reaches the
+      # numeric comparisons below or --create: a non-numeric parts makes
+      # `[ "${lp}" -lt "${parts}" ]` exit 2, and an `if` condition is exempt from
+      # errexit, so the topic would be skipped yet reported restored. A
+      # well-formed but wrong-content object (which curl -f cannot catch) must
+      # fail loudly, like the unrecognised-record-kind guard below.
+      case "${parts}" in ''|*[!0-9]*) echo "unparsable recorded partition count for ${t}: '${parts}'" >&2; exit 1 ;; esac
+      case "${rf}" in ''|*[!0-9]*) echo "unparsable recorded replication factor for ${t}: '${rf}'" >&2; exit 1 ;; esac
+      # grep -F -x: literal whole-line match against the live list. Here-string,
+      # not a pipe: `grep -q` exits at the first match, and a pipe would SIGPIPE
+      # the producer once the topic's line is far enough from the end of a large
+      # list, which pipefail turns into a false "not found" that misroutes an
+      # existing topic into --create.
+      if grep -qxF -- "${t}" <<<"${live}"; then
+        if ! desc=$("${BIN}"/kafka-topics.sh --bootstrap-server "${BOOTSTRAP}" --describe --topic "\Q${t}\E"); then
+          echo "cannot describe existing topic ${t}" >&2; exit 1
+        fi
+        line=${desc%%$'\n'*}
+        lp=$(describe_field "${line}" PartitionCount)
+        lrf=$(describe_field "${line}" ReplicationFactor)
+        # Validate the live shape parsed (as the backup path does for parts/rf):
+        # an empty lp/lrf makes the numeric comparisons below exit 2, which the
+        # if/elif would swallow and report the topic restored without altering.
+        { [ -n "${lp}" ] && [ -n "${lrf}" ]; } || { echo "unparsable live describe for ${t}: ${line}" >&2; exit 1; }
+        # A restore that cannot reach the recorded shape must fail loudly, not
+        # report success against a divergent topic.
+        if [ "${lrf}" != "${rf}" ]; then
+          echo "topic ${t}: replication factor differs (live=${lrf} backup=${rf}); cannot reconcile" >&2; exit 1
+        fi
+        if [ "${lp}" -lt "${parts}" ]; then
+          "${BIN}"/kafka-topics.sh --bootstrap-server "${BOOTSTRAP}" --alter --topic "\Q${t}\E" --partitions "${parts}"
+        elif [ "${lp}" -gt "${parts}" ]; then
+          echo "topic ${t}: live has ${lp} partitions, backup ${parts}; Kafka cannot decrease partitions" >&2; exit 1
+        fi
+      else
+        "${BIN}"/kafka-topics.sh --bootstrap-server "${BOOTSTRAP}" --create --topic "${t}" --partitions "${parts}" --replication-factor "${rf}"
+      fi
+      echo "  topic ${t}: partitions=${parts} rf=${rf}"
+      ;;
+    C)
+      t=$a; k=$b; v=$c
+      # Bracket-group only when the value contains a comma, so kafka-configs
+      # does not split it into bogus key=val tokens.
+      case "${v}" in
+        *,*) add="${k}=[${v}]" ;;
+        *)   add="${k}=${v}" ;;
+      esac
+      "${BIN}"/kafka-configs.sh --bootstrap-server "${BOOTSTRAP}" --alter --entity-type topics --entity-name "${t}" --add-config "${add}"
+      echo "    config ${t}: ${k}"
+      ;;
+    *)
+      # Fail closed on an unrecognised record: a well-formed but wrong-content
+      # object (curl -f catches transport errors, not a wrong-content 200) must
+      # not restore a subset of topics and still report success.
+      echo "unrecognised metadata record kind '${kind}' (corrupt or wrong object?)" >&2; exit 1
+      ;;
+    esac
+  done < "${file}"
+  echo "restore complete"
+fi
diff --git a/packages/system/backupstrategy-controller/images/backup-http-client/Dockerfile b/packages/system/backupstrategy-controller/images/backup-http-client/Dockerfile
new file mode 100644
index 0000000000..21f078f759
--- /dev/null
+++ b/packages/system/backupstrategy-controller/images/backup-http-client/Dockerfile
@@ -0,0 +1,10 @@
+# backup-http-client runs the Altinity (ClickHouse) and RabbitMQ strategy Pods:
+# both scripts drive an HTTP API with curl and verify TLS against the bundled
+# ca-certificates; the Altinity one also parses JSON with jq, and the RabbitMQ
+# one moves its export to S3 with curl --aws-sigv4. Everything is installed at
+# build time so the Pods never run `apk add` and work on air-gapped clusters.
+FROM alpine:3.24@sha256:294b683cb724975bec92580e1e685676bd4b50bda910ddb8c51d4cabeaec77e6
+
+RUN apk add --no-cache curl jq ca-certificates
+
+USER 65532:65532
diff --git a/packages/system/backupstrategy-controller/images/backupstrategy-controller/Dockerfile b/packages/system/backupstrategy-controller/images/backupstrategy-controller/Dockerfile
index 243cce651d..d22df20fc8 100644
--- a/packages/system/backupstrategy-controller/images/backupstrategy-controller/Dockerfile
+++ b/packages/system/backupstrategy-controller/images/backupstrategy-controller/Dockerfile
@@ -1,4 +1,5 @@
-FROM golang:1.26-alpine AS builder
+FROM --platform=$BUILDPLATFORM golang:1.27-alpine@sha256:8a5910f31396cd4d89662f56c68b3ae31d374308270a1c3bd96672ee5ed43414 AS builder
+ARG GOPROXY
 
 ARG TARGETOS
 ARG TARGETARCH
@@ -6,7 +7,7 @@ ARG TARGETARCH
 WORKDIR /workspace
 
 COPY go.mod go.sum ./
-RUN GOOS=$TARGETOS GOARCH=$TARGETARCH go mod download
+RUN for attempt in 1 2 3; do GOOS=$TARGETOS GOARCH=$TARGETARCH go mod download && break; [ "$attempt" = 3 ] && exit 1; sleep $((attempt * 10)); done
 
 COPY api api/
 COPY pkg pkg/
diff --git a/packages/system/backupstrategy-controller/images/redis-backup/Dockerfile b/packages/system/backupstrategy-controller/images/redis-backup/Dockerfile
new file mode 100644
index 0000000000..d59f7e06f1
--- /dev/null
+++ b/packages/system/backupstrategy-controller/images/redis-backup/Dockerfile
@@ -0,0 +1,15 @@
+# redis-backup bundles the tools the Redis/Valkey strategy Pod needs and that no
+# stock image carries together: redis-server + redis-cli (dump on backup, and on
+# restore a throwaway server that loads the RDB so a real Redis emits the replay
+# stream), and curl for the SigV4 S3 transport. The spotahome operator ships no
+# backup CRD, so the strategy runs this image as a one-shot Job.
+#
+# The base is redis 8.x, not `apk add redis` (Alpine ships 7.2, which cannot load
+# an RDB written by the redis 8.4 / valkey 8 apps — "Can't handle RDB format
+# version 12"). Restore fidelity depends on the loader being at least as new as
+# the source engine.
+FROM redis:8-alpine@sha256:ba6e394f6acc2a695ef1b6944f161b9ca813711739be68319fa0db3470673f1d
+
+RUN apk add --no-cache curl ca-certificates
+
+USER 65532:65532
diff --git a/packages/system/backupstrategy-controller/templates/_helpers.tpl b/packages/system/backupstrategy-controller/templates/_helpers.tpl
index b0b275136c..6665cc6391 100644
--- a/packages/system/backupstrategy-controller/templates/_helpers.tpl
+++ b/packages/system/backupstrategy-controller/templates/_helpers.tpl
@@ -27,9 +27,22 @@
       cozystack.bucket-application + cozystack.objectstorage-controller
       ensures the controllers exist before this chart installs, but the
       BucketClaim status is reconciled asynchronously, so the first render
-      sees an unpopulated status and skips. Flux re-renders the
-      HelmRelease on its next reconcile (spec.interval); once COSI has
-      populated status.bucketName, the gated templates materialise.
+      sees an unpopulated status and skips.
+
+      The render CANNOT fail here instead: this chart is the producer of
+      the very Bucket the lookup reads, so a failed render would never
+      apply templates/bucket.yaml and the condition could never resolve.
+
+      Nor does Flux repair the skip on its own. helm-controller does not
+      re-render a release whose chart and values did not change — the
+      interval reconcile is a no-op for a healthy release, and drift
+      detection is off on operator-generated HelmReleases — so the skip is
+      PERMANENT, not a bootstrap window. Convergence is driven instead by
+      the controller's DefaultObjectsGate
+      (internal/backupcontroller/default_objects_gate.go), which forces a
+      real Helm upgrade (reconcile.fluxcd.io/forceAt + requestedAt) once
+      the bucket name is resolvable and any gated object is missing. See
+      backupStorage.reconcileDefaultObjects in values.yaml.
     - bucketNameOverride set → bypass the lookup and use it directly. This
       is the escape hatch for offline `helm template` / `--dry-run` renders
       (CI / local diffs), where lookup returns nil and no apiserver is
@@ -53,10 +66,124 @@
 {{- end -}}
 {{/* When neither path produces a value, emit the empty string.
      Strategy/BSL templates that include this helper must gate
-     themselves on a non-empty result and skip rendering until Flux
-     re-reconciles the HelmRelease (driven by spec.interval) once the
-     BucketClaim's COSI-assigned status.bucketName is populated. The
-     accompanying templates/bucket.yaml ALWAYS renders so the
-     BucketClaim CAN come into existence even on the first install. */}}
+     themselves on a non-empty result and skip rendering until a real
+     Helm upgrade re-runs this lookup with the BucketClaim's
+     COSI-assigned status.bucketName populated. That upgrade is forced by
+     the controller's DefaultObjectsGate — it does NOT happen on the
+     HelmRelease's interval reconcile. The accompanying
+     templates/bucket.yaml ALWAYS renders so the BucketClaim CAN come
+     into existence even on the first install. */}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+  Resolve the S3 endpoint URL (scheme included) shared by every default
+  Strategy CR (CNPG/Etcd/MariaDB/FDB), the Velero BSL, and the controller
+  Deployment env.
+
+  Why not just use .Values.backupStorage.endpoint: Cozystack ships SeaweedFS
+  with global.seaweedfs.enableSecurity=true, so its in-cluster S3 Service
+  serves TLS on :8333 fronted by the self-signed "SeaweedFS CA". The static
+  default endpoint (http://seaweedfs-s3...svc:8333) therefore hits a TLS
+  listener over plaintext and every backup upload fails the handshake. The
+  Etcd Strategy's S3 schema has no caCert/insecureSkipVerify field, so it
+  cannot target the self-signed in-cluster endpoint at all — it needs a
+  trusted-cert endpoint. The COSI-provisioned bucket exposes exactly that: the
+  external S3 ingress (ACME cert), advertised in the bucket's system
+  credentials Secret (backupStorage.systemSecretName) — the same Secret the
+  projector already consumes. We read the bucket host from there and force the
+  https:// scheme (the S3 ingress is always TLS).
+
+  Failure semantics mirror bucketName:
+    - provisionBucket: false → external S3, the admin-configured
+      .Values.backupStorage.endpoint is authoritative. Return it as-is.
+    - provisionBucket: true + system Secret present → return
+      https://<bucket-host>.
+    - provisionBucket: true + Secret missing (offline `helm template`/unit
+      render, or pre-reconcile install where lookup returns nil) → fall back
+      to .Values.backupStorage.endpoint. On a live deploy Flux re-renders on
+      spec.interval once the Secret exists, promoting the derived endpoint.
+
+  Normalization of the decoded value: trim first (a trailing newline in the
+  Secret data would otherwise ride into the URL and break it), then strip any
+  leftover scheme before re-forcing https://. The producer already writes a
+  bare host, so the trimPrefix pair is belt-and-suspenders and never fires
+  today — kept as insurance against a future producer that emits a scheme.
+*/}}
+{{- define "backupstrategy-controller.endpoint" -}}
+{{- if not .Values.backupStorage.provisionBucket -}}
+{{- .Values.backupStorage.endpoint -}}
+{{- else -}}
+{{- $secret := lookup "v1" "Secret" .Values.backupStorage.namespace .Values.backupStorage.systemSecretName -}}
+{{- if and $secret $secret.data (index $secret.data "endpoint") -}}
+{{- printf "https://%s" (b64dec (index $secret.data "endpoint") | trim | trimPrefix "https://" | trimPrefix "http://") -}}
+{{- else -}}
+{{- .Values.backupStorage.endpoint -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+  Answer, for one CRD this chart ships as a template, whether the apiserver
+  already serves its kind.
+
+  Why a default Strategy needs this on top of the bucket-name gate. This chart
+  ships its strategy.backups.cozystack.io CRDs as ordinary templates
+  (templates/crds.yaml globs definitions/*.yaml), and Helm resolves EVERY
+  document in a release manifest through the cluster's RESTMapper in Build()
+  before it applies any of them. A Strategy CR whose CRD is not served yet
+  therefore fails Build(), and the release applies ZERO objects — including the
+  CRDs that would have made the mapping resolve. Every retry renders the same
+  manifest, so the failure is permanent rather than a race.
+
+  The bucket-name gate covers the FIRST INSTALL of a new cluster, where nothing
+  is resolvable yet and no Strategy renders at all. It cannot cover the case
+  this helper exists for: adding a NEW strategy kind to a chart that is already
+  installed. There the bucket name resolved long ago, so the first upgraded
+  revision renders the new CRD and the new Strategy CR together and wedges the
+  release exactly as above. That is not hypothetical — it is how the MongoDB
+  driver reached main, and the upgrade E2E lane caught it on the v1.6.2 → main
+  path with `no matches for kind "MongoDB"`.
+
+  Asking about the CRD OBJECT rather than listing the custom kind is
+  deliberate. `lookup` on a kind the apiserver does not serve is not an empty
+  result — it is a render ERROR ("unable to get apiresource"), which would trade
+  the wedge for a different permanent failure. apiextensions.k8s.io/v1 is always
+  served, so this lookup can only answer yes or no. Established=True rather than
+  mere existence, because a CRD is only in the RESTMapper once it is; a
+  not-yet-established CRD costs one retried revision here instead of a failed
+  one, and Flux retries.
+
+  Convergence after a skip is the same mechanism the bucket gate relies on and
+  is NOT the HelmRelease interval (see the bucketName helper): once the CRD is
+  served, the controller's DefaultObjectsGate sees the kind mapped and the CR
+  absent and forces a real Helm upgrade, whose render then includes it. The gate
+  skips kinds that do not map at all (meta.IsNoMatchError), which is what keeps
+  it from forcing upgrades against a render that cannot yet produce the object.
+
+  bucketNameOverride short-circuits the lookup for the same reason it does in
+  bucketName: it marks an offline render — `helm template`, a CI diff, a
+  helm-unittest case — where there is no apiserver to ask and the operator has
+  declared that cluster-derived state should be treated as resolved. Live
+  deploys go through Flux and never set it.
+
+  Every default Strategy gates on this helper as well as on the bucket name,
+  including the kinds whose CRDs shipped long ago: the bucket gate is also open
+  on the very first render of an external-S3 install (provisionBucket=false),
+  where no CRD exists yet. hack/backupstrategy-crd-gate.bats fails CI on any
+  template that renders a Strategy CR without it.
+*/}}
+{{- define "backupstrategy-controller.crdEstablished" -}}
+{{- if .root.Values.backupStorage.bucketNameOverride -}}
+true
+{{- else -}}
+{{- $crd := lookup "apiextensions.k8s.io/v1" "CustomResourceDefinition" "" .crd -}}
+{{- if and $crd $crd.status -}}
+{{- range $c := (default (list) $crd.status.conditions) -}}
+{{- if and (eq $c.type "Established") (eq (toString $c.status) "True") -}}
+true
+{{- end -}}
+{{- end -}}
+{{- end -}}
 {{- end -}}
 {{- end -}}
diff --git a/packages/system/backupstrategy-controller/templates/backupclass-default.yaml b/packages/system/backupstrategy-controller/templates/backupclass-default.yaml
index f635c69c89..750d564ab6 100644
--- a/packages/system/backupstrategy-controller/templates/backupclass-default.yaml
+++ b/packages/system/backupstrategy-controller/templates/backupclass-default.yaml
@@ -6,9 +6,15 @@
   from Day 1; the Strategy CRs it references stay gated on a populated
   $bucketName because they DO need the COSI-assigned bucket name
   embedded in their template. A BackupJob fired during the bootstrap
-  window surfaces a transient Ready=False/StrategyNotReady in the
-  driver and self-heals once Flux re-renders the chart with the
-  populated BucketClaim status.
+  window surfaces a transient Ready=False/StrategyNotReady in the driver.
+
+  It does NOT self-heal on a Flux reconcile: helm-controller re-renders
+  only when the chart or values change, so the gated Strategy CRs would
+  stay absent forever. The controller's DefaultObjectsGate reads THIS
+  object's strategyRefs as the manifest of what must exist and forces the
+  real Helm upgrade that materialises them (see
+  backupStorage.reconcileDefaultObjects). Adding a route here therefore
+  also adds the referenced Strategy CR to that existence check.
 */}}
 apiVersion: backups.cozystack.io/v1alpha1
 kind: BackupClass
@@ -44,6 +50,41 @@ spec:
         apiGroup: strategy.backups.cozystack.io
         kind: Altinity
         name: cozy-default-altinity
+    - application:
+        apiGroup: apps.cozystack.io
+        kind: MongoDB
+      strategyRef:
+        apiGroup: strategy.backups.cozystack.io
+        kind: MongoDB
+        name: cozy-default-mongodb
+    - application:
+        apiGroup: apps.cozystack.io
+        kind: RabbitMQ
+      strategyRef:
+        apiGroup: strategy.backups.cozystack.io
+        kind: Rabbitmq
+        name: cozy-default-rabbitmq
+    - application:
+        apiGroup: apps.cozystack.io
+        kind: Redis
+      strategyRef:
+        apiGroup: strategy.backups.cozystack.io
+        kind: Redis
+        name: cozy-default-redis
+    - application:
+        apiGroup: apps.cozystack.io
+        kind: Valkey
+      strategyRef:
+        apiGroup: strategy.backups.cozystack.io
+        kind: Redis
+        name: cozy-default-redis
+    - application:
+        apiGroup: apps.cozystack.io
+        kind: Kafka
+      strategyRef:
+        apiGroup: strategy.backups.cozystack.io
+        kind: Kafka
+        name: cozy-default-kafka
     # FoundationDB intentionally NOT bound in cozy-default. The Strategy
     # CR cozy-default-foundationdb is shipped (admins can wire it into a
     # custom BackupClass), but Restore goes through fdbrestore in the
diff --git a/packages/system/backupstrategy-controller/templates/deployment.yaml b/packages/system/backupstrategy-controller/templates/deployment.yaml
index 42adb19a80..f35e97661a 100644
--- a/packages/system/backupstrategy-controller/templates/deployment.yaml
+++ b/packages/system/backupstrategy-controller/templates/deployment.yaml
@@ -43,13 +43,56 @@ spec:
         - name: BACKUP_STORAGE_CREDS_SECRET_NAME
           value: cozy-backups-creds
         - name: BACKUP_STORAGE_ENDPOINT
-          value: {{ .Values.backupStorage.endpoint | quote }}
+          value: {{ include "backupstrategy-controller.endpoint" . | quote }}
         - name: BACKUP_STORAGE_REGION
           value: {{ .Values.backupStorage.region | quote }}
         - name: BACKUP_STORAGE_FORCE_PATH_STYLE
           value: {{ .Values.backupStorage.forcePathStyle | quote }}
         - name: BACKUP_STORAGE_SYSTEM_NAMESPACES
           value: {{ .Values.backupStorage.systemNamespaces | join "," | quote }}
+        {{- if .Values.backupStorage.reconcileDefaultObjects }}
+        # DefaultObjectsGate: the Strategy CRs and the Velero BSL are gated
+        # on a `lookup` of the BucketClaim this same chart creates, so a
+        # fresh install renders them empty — permanently, because
+        # helm-controller does not re-render an unchanged, successful
+        # release. The gate detects the missing objects once the bucket name
+        # is resolvable and forces exactly one real Helm upgrade on THIS
+        # release, which is the only thing that re-runs the lookups.
+        - name: BACKUP_DEFAULT_OBJECTS_BACKUPCLASS
+          value: cozy-default
+        - name: BACKUP_DEFAULT_OBJECTS_HELMRELEASE_NAME
+          value: {{ .Release.Name | quote }}
+        - name: BACKUP_DEFAULT_OBJECTS_HELMRELEASE_NAMESPACE
+          value: {{ .Release.Namespace | quote }}
+        {{- if .Values.backupStorage.provisionBucket }}
+        # The credentials Secret named by BACKUP_STORAGE_SECRET_NAME is
+        # itself rendered behind an install-time `lookup` — of the COSI
+        # Secret, by packages/system/bucket/templates/user-credentials.yaml —
+        # so it is subject to the same permanent skip, one release earlier in
+        # the chain. While it is missing the projector has no source, every
+        # Strategy CR and the Velero BSL stay gated off, and migration 50
+        # cannot resolve its snapshot target. These coordinates let the gate
+        # force the release that renders it.
+        #
+        # The name is the Bucket CR name carrying the bucket-rd release
+        # prefix (packages/system/bucket-rd/cozyrds/bucket.yaml) plus the
+        # "-system" suffix the parent chart appends
+        # (packages/apps/bucket/templates/helmrelease.yaml), which is exactly
+        # BACKUP_STORAGE_SECRET_NAME minus "-credentials". tests/
+        # default_objects_gate_test.yaml asserts the two stay in lockstep.
+        #
+        # Omitted on provisionBucket=false (external S3): the Secret is
+        # admin-managed there and no release renders it.
+        - name: BACKUP_CREDENTIALS_HELMRELEASE_NAME
+          value: {{ printf "bucket-%s-system" .Values.backupStorage.bucketName | quote }}
+        - name: BACKUP_CREDENTIALS_HELMRELEASE_NAMESPACE
+          value: {{ .Values.backupStorage.namespace | quote }}
+        {{- end }}
+        {{- if .Values.velero.bslEnabled }}
+        - name: BACKUP_DEFAULT_OBJECTS_VELERO_NAMESPACE
+          value: {{ .Values.velero.namespace | quote }}
+        {{- end }}
+        {{- end }}
         ports:
         {{- if .Values.backupStrategyController.metrics.enabled }}
         - name: metrics
diff --git a/packages/system/backupstrategy-controller/templates/rbac.yaml b/packages/system/backupstrategy-controller/templates/rbac.yaml
index 2a5790a92f..ac91243926 100644
--- a/packages/system/backupstrategy-controller/templates/rbac.yaml
+++ b/packages/system/backupstrategy-controller/templates/rbac.yaml
@@ -26,6 +26,14 @@ rules:
 - apiGroups: [""]
   resources: ["pods"]
   verbs: ["get", "list", "watch"]
+# Pods/log: the CNPG RestoreJob driver reads a bootstrap-recovery pod's log to
+# tell an unreachable point-in-time target (recoveryTime past the last archived
+# WAL) apart from a transient recovery-pod crash, and fail the RestoreJob fast.
+# pods/log is a distinct RBAC subresource from pods; without this the GetLogs
+# call is 403-Forbidden and the fail-fast silently degrades to a deadline hang.
+- apiGroups: [""]
+  resources: ["pods/log"]
+  verbs: ["get"]
 # ConfigMaps: controller-runtime cache requires cluster-scoped list/watch;
 # create/update/delete is scoped to cozy-velero via a Role shipped by the
 # velero chart (packages/system/velero/templates/backupstrategy-controller-rbac.yaml)
@@ -49,14 +57,21 @@ rules:
 - apiGroups: ["kubevirt.io"]
   resources: ["virtualmachineinstances"]
   verbs: ["get"]
-# CDI DataVolumes: pre-restore deletes DVs so CDI doesn't recreate PVCs after rename
+# CDI DataVolumes: pre-restore deletes DVs so CDI doesn't recreate PVCs after rename,
+# and reads each one back to hold the restore until it is gone (a point Get
+# through the dynamic client, so no list/watch)
 - apiGroups: ["cdi.kubevirt.io"]
   resources: ["datavolumes"]
-  verbs: ["delete"]
-# HelmReleases: pre-restore suspends HRs; post-restore rename creates new HR and deletes old
+  verbs: ["get", "delete"]
+# HelmReleases: pre-restore suspends HRs; post-restore rename creates new HR
+# and deletes old. patch additionally lets the DefaultObjectsGate stamp
+# reconcile.fluxcd.io/forceAt + requestedAt on THIS chart's own release to
+# force the Helm upgrade that materialises the lookup-gated default backup
+# objects (no list/watch: every access is a point Get through the dynamic
+# client, so no cluster-wide HelmRelease informer is started).
 - apiGroups: ["helm.toolkit.fluxcd.io"]
   resources: ["helmreleases"]
-  verbs: ["get", "create", "update", "delete"]
+  verbs: ["get", "create", "update", "patch", "delete"]
 # PVCs and PVs: pre-restore renames PVCs (delete old, create new) and patches PV reclaim policy
 - apiGroups: [""]
   resources: ["persistentvolumeclaims"]
@@ -68,6 +83,13 @@ rules:
 - apiGroups: ["velero.io"]
   resources: ["backups", "restores", "datauploads"]
   verbs: ["create", "get", "list", "watch", "update", "patch", "delete", "deletecollection"]
+# Velero BackupStorageLocation: the DefaultObjectsGate checks that the
+# cozy-default BSL — rendered by the same lookup-gated template as the
+# Strategy CRs — actually exists. Read-only, and a point Get through the
+# dynamic client, so `get` alone is enough (no informer, no list/watch).
+- apiGroups: ["velero.io"]
+  resources: ["backupstoragelocations"]
+  verbs: ["get"]
 # Velero DeleteBackupRequest: used by BackupReconciler to delete Velero backups with their storage data
 - apiGroups: ["velero.io"]
   resources: ["deletebackuprequests"]
@@ -85,15 +107,24 @@ rules:
 - apiGroups: ["coordination.k8s.io"]
   resources: ["leases"]
   verbs: ["get", "list", "watch", "create", "update", "patch"]
-# CNPG strategy: SSA-patch the live Cluster (spec.backup.barmanObjectStore),
-# create one-shot Backup CRs, observe their status, and clean them up on
-# RestoreJob purge.
+# CNPG strategy: SSA-patch the live Cluster (spec.plugins referencing the
+# barman-cloud plugin), create one-shot Backup CRs, observe their status, and
+# clean them up on RestoreJob purge.
 - apiGroups: ["postgresql.cnpg.io"]
   resources: ["clusters"]
   verbs: ["get", "list", "watch", "patch", "delete"]
 - apiGroups: ["postgresql.cnpg.io"]
   resources: ["backups"]
   verbs: ["get", "list", "watch", "create", "patch", "delete"]
+# barman-cloud plugin ObjectStore CRs: the CNPG driver SSA-applies one per
+# platform-managed Cluster to carry the S3/barman configuration that native
+# spec.backup.barmanObjectStore used to hold (deprecated in CNPG 1.27, removed
+# in 1.29). The driver owner-references each ObjectStore to its Cluster, so
+# Kubernetes garbage-collects it when the Cluster is deleted (app teardown or
+# the RestoreJob purge) — the driver never deletes it itself, hence no delete verb.
+- apiGroups: ["barmancloud.cnpg.io"]
+  resources: ["objectstores"]
+  verbs: ["get", "list", "watch", "create", "patch", "update"]
 # Secrets: the BackupJob/RestoreJob reconcilers project the platform-managed
 # S3 credentials Secret from the backupStorage.namespace (tenant-root by
 # default) into each tenant namespace as cozy-backups-creds. The verbs are
@@ -125,6 +156,27 @@ rules:
 - apiGroups: ["k8s.mariadb.com"]
   resources: ["backups", "restores"]
   verbs: ["get", "list", "watch", "create"]
+# MongoDB strategy: read the operator-side PerconaServerMongoDB CR to gate on
+# the backup preconditions, create one-shot PerconaServerMongoDBBackup CRs on the
+# BackupJob path, and create PerconaServerMongoDBRestore CRs on the RestoreJob
+# path. The cluster CR is patched only on the useSystemBucket flow (storage
+# injection, below); it is never deleted.
+- apiGroups: ["psmdb.percona.com"]
+  resources: ["perconaservermongodbs"]
+  # patch: the useSystemBucket flow SSA-injects spec.backup.storages onto the
+  # live PerconaServerMongoDB at BackupJob time (server-side apply is a PATCH).
+  verbs: ["get", "list", "watch", "patch"]
+- apiGroups: ["psmdb.percona.com"]
+  resources: ["perconaservermongodbbackups"]
+  # delete: prune a useSystemBucket archive by deleting its CR (the delete-backup
+  # finalizer frees the object), and cancel a not-yet-started system-bucket CR at
+  # the BackupJob timeout (a legacy CR is left in place). patch: strip the driver's own delete-backup finalizer
+  # to release a wedged cleanup. See reconcileMongoDB / cleanupMongoDBBackup and
+  # docs/operations/backup-classes.md.
+  verbs: ["get", "list", "watch", "create", "delete", "patch"]
+- apiGroups: ["psmdb.percona.com"]
+  resources: ["perconaservermongodbrestores"]
+  verbs: ["get", "list", "watch", "create"]
 # FoundationDB strategy: read the operator-side FoundationDBCluster CR to
 # surface "not yet rendered" preconditions, create per-BackupJob
 # FoundationDBBackup CRs and per-RestoreJob FoundationDBRestore CRs.
@@ -140,18 +192,32 @@ rules:
 - apiGroups: ["apps.foundationdb.org"]
   resources: ["foundationdbrestores"]
   verbs: ["get", "list", "watch", "create"]
-# Etcd strategy: read the operator-side EtcdCluster CR (existence + Ready
-# gate before snapshotting; live spec on the restore path) and create
-# per-BackupJob etcd.aenix.io/EtcdBackup CRs. Restore is in-place only:
-# the driver deletes the chart-rendered EtcdCluster, then creates a new
-# one with spec.bootstrap.restore.source populated from the artifact -
-# so delete + create on etcdclusters are both required. The PVCs the
-# operator generates for member volumes get listed (etcdClusterFullyGone
+# Etcd strategy: read the operator-side EtcdCluster CR (existence +
+# Available gate before snapshotting; live spec on the restore path) and
+# create per-BackupJob etcd-operator.cozystack.io/EtcdSnapshot CRs. Restore
+# is in-place only: the driver deletes the chart-rendered EtcdCluster, then
+# creates a new one with spec.bootstrap.restore.source populated from the
+# artifact - so delete + create on etcdclusters are both required. The PVCs
+# the operator generates for member volumes get listed (etcdClusterFullyGone
 # gate) but never directly mutated; cleanup is owned by the operator's
 # finalizers + the EtcdCluster ownerRef cascade.
-- apiGroups: ["etcd.aenix.io"]
+- apiGroups: ["etcd-operator.cozystack.io"]
   resources: ["etcdclusters"]
   verbs: ["get", "list", "watch", "create", "delete"]
-- apiGroups: ["etcd.aenix.io"]
-  resources: ["etcdbackups"]
+- apiGroups: ["etcd-operator.cozystack.io"]
+  resources: ["etcdsnapshots"]
   verbs: ["get", "list", "watch", "create"]
+# Rabbitmq strategy: read the operator-side RabbitmqCluster CR to gate on
+# "all replicas ready" before exporting/importing definitions over the
+# management API. The driver only ever reads it - the actual work runs in a
+# batch/v1.Job (granted above), never by mutating the RabbitmqCluster.
+- apiGroups: ["rabbitmq.com"]
+  resources: ["rabbitmqclusters"]
+  verbs: ["get", "list", "watch"]
+# Kafka strategy: read the Strimzi Kafka cluster CR only, as a Ready
+# precondition before the metadata backup/restore Job runs. The driver never
+# mutates it; the export/import runs entirely in the batch/jobs granted above
+# via the Kafka Admin API, so no kafkatopics access is needed here.
+- apiGroups: ["kafka.strimzi.io"]
+  resources: ["kafkas"]
+  verbs: ["get", "list", "watch"]
diff --git a/packages/system/backupstrategy-controller/templates/strategy-altinity-default.yaml b/packages/system/backupstrategy-controller/templates/strategy-altinity-default.yaml
index b2d49871d4..3397d6d0d6 100644
--- a/packages/system/backupstrategy-controller/templates/strategy-altinity-default.yaml
+++ b/packages/system/backupstrategy-controller/templates/strategy-altinity-default.yaml
@@ -12,7 +12,8 @@
   inner expression at chart install time and fail.
 */}}
 {{- $bucketName := include "backupstrategy-controller.bucketName" . -}}
-{{- if $bucketName -}}
+{{- $crdEstablished := include "backupstrategy-controller.crdEstablished" (dict "root" . "crd" "altinities.strategy.backups.cozystack.io") -}}
+{{- if and $bucketName $crdEstablished -}}
 apiVersion: strategy.backups.cozystack.io/v1alpha1
 kind: Altinity
 metadata:
@@ -23,13 +24,6 @@ spec:
       restartPolicy: Never
       containers:
         - name: ch-backup-client
-          # platform-migrations is the pre-built, digested image release
-          # CI maintains in packages/core/platform/values.yaml. It bundles
-          # curl + jq + kubectl + helm + ca-certificates on alpine, so the
-          # strategy Pod does not depend on dl-cdn.alpinelinux.org at run
-          # time — works on air-gapped clusters. The image is reused
-          # rather than a single-purpose ch-backup-client to avoid a
-          # second tag that release CI would have to re-digest each cut.
           image: "{{ .Values.backupStrategyController.chBackupClientImage }}"
           imagePullPolicy: IfNotPresent
           # The clickhouse-backup HTTP API on :7171 enforces basic auth;
@@ -52,9 +46,8 @@ spec:
           args:
             - |
               set -euo pipefail
-              # curl + jq are baked into the ch-backup-client image; no
-              # `apk add` here so the Pod stays runnable on air-gapped
-              # clusters.
+              # curl + jq are baked into the image; no `apk add` here so
+              # the Pod stays runnable on air-gapped clusters.
               host="chi-clickhouse-{{ printf "{{ .Release.Name }}" }}-clickhouse-0-0.{{ printf "{{ .Release.Namespace }}" }}.svc"
               api="http://${host}:7171"
               auth="-u ${API_USERNAME}:${API_PASSWORD}"
diff --git a/packages/system/backupstrategy-controller/templates/strategy-cnpg-default.yaml b/packages/system/backupstrategy-controller/templates/strategy-cnpg-default.yaml
index 10aada2cf0..58dda61b10 100644
--- a/packages/system/backupstrategy-controller/templates/strategy-cnpg-default.yaml
+++ b/packages/system/backupstrategy-controller/templates/strategy-cnpg-default.yaml
@@ -1,15 +1,22 @@
 {{- $bucketName := include "backupstrategy-controller.bucketName" . -}}
-{{- if $bucketName -}}
+{{- $crdEstablished := include "backupstrategy-controller.crdEstablished" (dict "root" . "crd" "cnpgs.strategy.backups.cozystack.io") -}}
+{{- if and $bucketName $crdEstablished -}}
 apiVersion: strategy.backups.cozystack.io/v1alpha1
 kind: CNPG
 metadata:
   name: cozy-default-cnpg
 spec:
   template:
-    serverName: {{ printf "{{ .Application.metadata.namespace }}-{{ .Application.metadata.name }}" | quote }}
+    {{- /*
+      The uid keeps a Postgres deleted and recreated under the same name off
+      its predecessor's archive: destinationPath is per name, and CNPG drops
+      the empty-archive guard before the first BackupJob attaches the plugin.
+      The driver keeps the serverName of a Cluster already archiving.
+    */}}
+    serverName: {{ printf "{{ .Application.metadata.namespace }}-{{ .Application.metadata.name }}{{ with .Application.metadata.uid }}-{{ . }}{{ end }}" | quote }}
     barmanObjectStore:
       destinationPath: {{ printf "s3://%s/{{ .Application.metadata.namespace }}/{{ .Application.metadata.name }}/" $bucketName | quote }}
-      endpointURL: {{ .Values.backupStorage.endpoint | quote }}
+      endpointURL: {{ include "backupstrategy-controller.endpoint" . | quote }}
       retentionPolicy: "30d"
       s3Credentials:
         secretRef:
diff --git a/packages/system/backupstrategy-controller/templates/strategy-etcd-default.yaml b/packages/system/backupstrategy-controller/templates/strategy-etcd-default.yaml
index 70eb8f52b3..f335f04cfc 100644
--- a/packages/system/backupstrategy-controller/templates/strategy-etcd-default.yaml
+++ b/packages/system/backupstrategy-controller/templates/strategy-etcd-default.yaml
@@ -1,5 +1,6 @@
 {{- $bucketName := include "backupstrategy-controller.bucketName" . -}}
-{{- if $bucketName -}}
+{{- $crdEstablished := include "backupstrategy-controller.crdEstablished" (dict "root" . "crd" "etcds.strategy.backups.cozystack.io") -}}
+{{- if and $bucketName $crdEstablished -}}
 apiVersion: strategy.backups.cozystack.io/v1alpha1
 kind: Etcd
 metadata:
@@ -9,7 +10,7 @@ spec:
     destination:
       s3:
         bucket: {{ $bucketName | quote }}
-        endpoint: {{ .Values.backupStorage.endpoint | quote }}
+        endpoint: {{ include "backupstrategy-controller.endpoint" . | quote }}
         key: {{ printf "{{ .Application.metadata.namespace }}/{{ .Application.metadata.name }}/" | quote }}
         region: {{ .Values.backupStorage.region | quote }}
         forcePathStyle: {{ .Values.backupStorage.forcePathStyle }}
diff --git a/packages/system/backupstrategy-controller/templates/strategy-foundationdb-default.yaml b/packages/system/backupstrategy-controller/templates/strategy-foundationdb-default.yaml
index 5d72101cfd..061be2ffb3 100644
--- a/packages/system/backupstrategy-controller/templates/strategy-foundationdb-default.yaml
+++ b/packages/system/backupstrategy-controller/templates/strategy-foundationdb-default.yaml
@@ -1,7 +1,9 @@
-{{- $endpointHost := .Values.backupStorage.endpoint | trimPrefix "https://" | trimPrefix "http://" -}}
-{{- $secureConn := ternary "1" "0" (hasPrefix "https://" .Values.backupStorage.endpoint) -}}
+{{- $endpoint := include "backupstrategy-controller.endpoint" . -}}
+{{- $endpointHost := $endpoint | trimPrefix "https://" | trimPrefix "http://" -}}
+{{- $secureConn := ternary "1" "0" (hasPrefix "https://" $endpoint) -}}
 {{- $bucketName := include "backupstrategy-controller.bucketName" . -}}
-{{- if $bucketName -}}
+{{- $crdEstablished := include "backupstrategy-controller.crdEstablished" (dict "root" . "crd" "foundationdbs.strategy.backups.cozystack.io") -}}
+{{- if and $bucketName $crdEstablished -}}
 apiVersion: strategy.backups.cozystack.io/v1alpha1
 kind: FoundationDB
 metadata:
diff --git a/packages/system/backupstrategy-controller/templates/strategy-kafka-default.yaml b/packages/system/backupstrategy-controller/templates/strategy-kafka-default.yaml
new file mode 100644
index 0000000000..d5c88bdf5a
--- /dev/null
+++ b/packages/system/backupstrategy-controller/templates/strategy-kafka-default.yaml
@@ -0,0 +1,96 @@
+{{/*
+  Two-layer templating (see strategy-altinity-default.yaml for the rationale):
+  Helm renders this file at chart install time (the $bucketName gate, the
+  endpoint/bucket/region); the backupstrategy-controller re-renders the
+  resulting Kafka Strategy CR per BackupJob/RestoreJob/cleanup, expanding
+  `{{ .Mode | .Release | .BackupName | .ArtifactURI | .Backup }}`. A literal
+  `{{ .Foo }}` that must survive Helm is passed as the string argument of `printf`.
+
+  Kafka topic-METADATA backup. Strimzi ships no backup CR and this strategy does
+  not touch message data: it exports every non-internal topic's definition
+  (partition count, replication factor, non-default configs) through the Kafka
+  Admin API and restores it. Consumer offsets, ACLs, quotas and KafkaUsers are
+  out of scope. Restored topics are created directly through the Admin API, so
+  on the target they are unmanaged (no KafkaTopic CR) — and for a topic that IS
+  owned by a KafkaTopic CR, the Strimzi Topic Operator reconciles its configs
+  from the CR, so an in-place config restore of such a topic is transient. See
+  docs/operations/backup-classes.md and the example README.
+*/}}
+{{- $bucketName := include "backupstrategy-controller.bucketName" . -}}
+{{- $crdEstablished := include "backupstrategy-controller.crdEstablished" (dict "root" . "crd" "kafkas.strategy.backups.cozystack.io") -}}
+{{- if and $bucketName $crdEstablished -}}
+apiVersion: strategy.backups.cozystack.io/v1alpha1
+kind: Kafka
+metadata:
+  name: cozy-default-kafka
+spec:
+  artifactURITemplate: {{ printf "s3://%s/{{ .Release.Namespace }}/{{ .Release.Name }}/{{ .BackupName }}/kafka-metadata.txt" $bucketName | quote }}
+  template:
+    spec:
+      restartPolicy: Never
+      containers:
+        - name: kafka-backup
+          # The driver fills .ClientImage per job with the target Kafka broker's
+          # own image (resolved from a live broker pod), so the Admin-API CLI it
+          # runs always matches the broker version - no separately pinned image to
+          # drift. Cleanup reuses the image the backup recorded.
+          image: {{ printf "{{ .ClientImage }}" | quote }}
+          imagePullPolicy: IfNotPresent
+          env:
+            - name: MODE
+              value: {{ printf "{{ .Mode }}" | quote }}
+            # The chart names the Strimzi cluster kafka-<app>; its plaintext
+            # bootstrap Service is kafka-<app>-kafka-bootstrap:9092 (no TLS/auth
+            # on the internal plain listener). On restore .Release is the TARGET.
+            - name: BOOTSTRAP
+              value: {{ printf "kafka-{{ .Release.Name }}-kafka-bootstrap.{{ .Release.Namespace }}.svc:9092" | quote }}
+            # ARTIFACT_URI is the single source of truth for the object
+            # location: rendered from spec.artifactURITemplate, recorded on the
+            # Backup's status.artifact.uri, and read back on restore/cleanup so
+            # those fetch or delete the exact object this backup wrote — a later
+            # change to the key layout cannot orphan older backups.
+            - name: ARTIFACT_URI
+              value: {{ printf "{{ .ArtifactURI }}" | quote }}
+            # S3 coordinates from the projected cozy-backups-creds Secret.
+            - name: AWS_ACCESS_KEY_ID
+              valueFrom:
+                secretKeyRef:
+                  name: cozy-backups-creds
+                  key: AWS_ACCESS_KEY_ID
+            - name: AWS_SECRET_ACCESS_KEY
+              valueFrom:
+                secretKeyRef:
+                  name: cozy-backups-creds
+                  key: AWS_SECRET_ACCESS_KEY
+            - name: S3_ENDPOINT
+              value: {{ include "backupstrategy-controller.endpoint" . | quote }}
+            - name: S3_REGION
+              value: {{ .Values.backupStorage.region | quote }}
+            - name: S3_FORCE_PATH_STYLE
+              value: {{ .Values.backupStorage.forcePathStyle | quote }}
+          command: ["/usr/bin/bash", "-c"]
+          # The driver script is kept as a standalone shell file and
+          # embedded verbatim so hack/kafka-backup-script.bats can execute
+          # it against stubbed kafka CLIs + S3 (the shell logic is otherwise
+          # untestable at the chart layer). The controller renders every string
+          # leaf of this PodTemplateSpec through internal/template, args[0]
+          # included, so a Go-template action embedded in the script is
+          # substituted at render (only the .Mode action is); runtime inputs
+          # otherwise arrive as env vars.
+          args:
+            - |
+{{ .Files.Get "files/kafka-backup.sh" | indent 14 }}
+          resources:
+            requests:
+              cpu: 100m
+              memory: 256Mi
+            limits:
+              cpu: "1"
+              memory: 1Gi
+          securityContext:
+            allowPrivilegeEscalation: false
+            capabilities:
+              drop: ["ALL"]
+            seccompProfile:
+              type: RuntimeDefault
+{{- end -}}
diff --git a/packages/system/backupstrategy-controller/templates/strategy-mariadb-default.yaml b/packages/system/backupstrategy-controller/templates/strategy-mariadb-default.yaml
index 6ed3661fd4..ec8b351607 100644
--- a/packages/system/backupstrategy-controller/templates/strategy-mariadb-default.yaml
+++ b/packages/system/backupstrategy-controller/templates/strategy-mariadb-default.yaml
@@ -1,6 +1,8 @@
-{{- $endpointHost := .Values.backupStorage.endpoint | trimPrefix "https://" | trimPrefix "http://" -}}
+{{- $endpoint := include "backupstrategy-controller.endpoint" . -}}
+{{- $endpointHost := $endpoint | trimPrefix "https://" | trimPrefix "http://" -}}
 {{- $bucketName := include "backupstrategy-controller.bucketName" . -}}
-{{- if $bucketName -}}
+{{- $crdEstablished := include "backupstrategy-controller.crdEstablished" (dict "root" . "crd" "mariadbs.strategy.backups.cozystack.io") -}}
+{{- if and $bucketName $crdEstablished -}}
 apiVersion: strategy.backups.cozystack.io/v1alpha1
 kind: MariaDB
 metadata:
@@ -20,6 +22,6 @@ spec:
           name: cozy-backups-creds
           key: AWS_SECRET_ACCESS_KEY
         tls:
-          enabled: {{ hasPrefix "https://" .Values.backupStorage.endpoint }}
+          enabled: {{ hasPrefix "https://" $endpoint }}
     compression: gzip
 {{- end -}}
diff --git a/packages/system/backupstrategy-controller/templates/strategy-mongodb-default.yaml b/packages/system/backupstrategy-controller/templates/strategy-mongodb-default.yaml
new file mode 100644
index 0000000000..3bf8ff407c
--- /dev/null
+++ b/packages/system/backupstrategy-controller/templates/strategy-mongodb-default.yaml
@@ -0,0 +1,79 @@
+{{/*
+  cozy-default MongoDB strategy. The Percona psmdb operator resolves the
+  on-demand backup's storageName against the source PerconaServerMongoDB CR's
+  spec.backup.storages. On the legacy flow that storage lives on the MongoDB
+  application (declared by the chart as "s3-storage" when backup.enabled=true,
+  with the tenant's own bucket/creds). On the useSystemBucket flow the app
+  chart cannot know the platform bucket/endpoint at render time, so this
+  Strategy carries the coordinates (the s3 block below) and the driver
+  SSA-injects them into the app's spec.backup.storages["s3-storage"] on every
+  BackupJob. Injection is keyed off the app's backup.useSystemBucket flag, not
+  off the live cluster's storage set: a legacy app leaves the flag false and is
+  never touched, so its own static "s3-storage" stays intact.
+
+  It is gated on $bucketName — which the s3 block below now renders — and on
+  $crdEstablished for install ordering. This chart ships its own
+  strategy.backups.cozystack.io CRDs as ordinary templates (templates/crds.yaml
+  globs definitions/*.yaml), and Helm resolves every document in a release
+  manifest through the cluster's RESTMapper in Build() BEFORE it applies any of
+  them. An ungated Strategy CR therefore has no mapping while its CRD is still
+  absent, Build() fails with "no matches for kind", and the release applies
+  ZERO objects — including the CRDs that would have made the mapping resolve.
+  Nothing recovers from that: every retry renders the same manifest, so the
+  failure is permanent rather than a race, and Helm's kind sorter cannot help
+  because it orders the apply, not the Build.
+
+  So this Strategy must be absent from any render whose cluster cannot yet map
+  it, and there are TWO such renders, not one.
+
+  A fresh install is the first. $bucketName is empty until the COSI BucketClaim
+  status is reconciled (see templates/_helpers.tpl), which is exactly the window
+  where the CRDs are being applied; by the time DefaultObjectsGate forces a
+  second revision the CRDs exist and the mapping resolves.
+
+  Adding this kind to an ALREADY-INSTALLED chart is the second, and the bucket
+  gate is no help there: the bucket name resolved releases ago, so the first
+  upgraded revision renders the new CRD and this CR together and wedges the
+  release. That is not a hypothetical — this Strategy shipped to main that way,
+  and the upgrade E2E lane caught it on the v1.6.2 → main path. Hence the
+  explicit CRD gate below, which asks whether the apiserver serves the kind and
+  answers for both renders; see the crdEstablished helper for why it asks about
+  the CRD object rather than listing the kind, and for how the release converges
+  afterwards.
+
+  Precondition (surfaced by the driver as a clear Ready=False, not a silent
+  hang): the MongoDB application must have backup.enabled=true so the
+  percona-backup-mongodb agents run. On the legacy flow the "s3-storage" entry
+  must also already exist on the app; on the useSystemBucket flow the driver
+  injects it at BackupJob time. See docs/operations/backup-classes.md.
+*/}}
+{{- $bucketName := include "backupstrategy-controller.bucketName" . -}}
+{{- $crdEstablished := include "backupstrategy-controller.crdEstablished" (dict "root" . "crd" "mongodbs.strategy.backups.cozystack.io") -}}
+{{- if and $bucketName $crdEstablished -}}
+apiVersion: strategy.backups.cozystack.io/v1alpha1
+kind: MongoDB
+metadata:
+  name: cozy-default-mongodb
+spec:
+  template:
+    storageName: s3-storage
+    type: logical
+    compressionType: gzip
+    {{- /*
+      System-bucket coordinates the driver SSA-injects onto the source
+      PerconaServerMongoDB's spec.backup.storages[s3-storage] when the app ran
+      with backup.useSystemBucket=true (the chart then omits the static storage).
+      A legacy app leaves the flag false and is never injected, so it keeps its
+      own static s3-storage. endpointUrl carries the scheme from the endpoint
+      helper so PBM's aws-sdk client gets a valid URL; credentials come from the
+      projected cozy-backups-creds. See docs/operations/backup-classes.md.
+    */}}
+    s3:
+      bucket: {{ $bucketName | quote }}
+      endpointUrl: {{ include "backupstrategy-controller.endpoint" . | quote }}
+      prefix: {{ printf "{{ .Application.metadata.namespace }}/{{ .Application.metadata.name }}" | quote }}
+      region: {{ .Values.backupStorage.region | quote }}
+      credentialsSecret: cozy-backups-creds
+      forcePathStyle: {{ .Values.backupStorage.forcePathStyle }}
+      insecureSkipTLSVerify: {{ .Values.backupStorage.insecureSkipTLSVerify }}
+{{- end -}}
diff --git a/packages/system/backupstrategy-controller/templates/strategy-rabbitmq-default.yaml b/packages/system/backupstrategy-controller/templates/strategy-rabbitmq-default.yaml
new file mode 100644
index 0000000000..9c303a6d36
--- /dev/null
+++ b/packages/system/backupstrategy-controller/templates/strategy-rabbitmq-default.yaml
@@ -0,0 +1,187 @@
+{{/*
+  Strategy template rendering uses two layers of Go templates:
+   1. Helm renders this file at chart install time. Anything inside
+      `{{ ... }}` is interpreted by Helm - the $bucketName gate, the
+      endpoint/bucket/region values, the S3 credentials Secret name.
+   2. The backupstrategy-controller re-renders the resulting Job Strategy
+      CR per BackupJob/RestoreJob, expanding `{{ .Application | .Release |
+      .Mode | .Backup }}` against the live application object.
+  To emit a literal `{{ .Foo }}` that survives Helm, it is passed as the
+  string argument of `printf` (a backtick raw string when it contains
+  double quotes): Helm does not interpret inner template delimiters inside
+  a printf string literal. See strategy-altinity-default.yaml for the
+  longer rationale.
+
+  This is the RabbitMQ definitions backup: the cluster operator ships no
+  backup CR and RabbitMQ has no consistent online message export, so the
+  strategy exports broker DEFINITIONS (vhosts, users, permissions, queues,
+  exchanges, bindings, policies, parameters) via the management HTTP API
+  and stores them in the system bucket. Message payloads are out of scope -
+  a full-data backup is a Velero volume snapshot, not this strategy.
+*/}}
+{{- $bucketName := include "backupstrategy-controller.bucketName" . -}}
+{{- $crdEstablished := include "backupstrategy-controller.crdEstablished" (dict "root" . "crd" "rabbitmqs.strategy.backups.cozystack.io") -}}
+{{- if and $bucketName $crdEstablished -}}
+apiVersion: strategy.backups.cozystack.io/v1alpha1
+kind: Rabbitmq
+metadata:
+  name: cozy-default-rabbitmq
+spec:
+  # The driver defers the run until the RabbitmqCluster reports AllReplicasReady
+  # (a Go-side precondition), so a not-yet-ready broker surfaces a precise
+  # Ready=False wait on the BackupJob/RestoreJob rather than a Job that starts
+  # and fails. The in-Pod curl retry below still covers the residual gap between
+  # the cluster going ready and the management API accepting requests.
+  #
+  # Record the stored object's location on the produced Backup so it is
+  # introspectable. The key is scoped by the SOURCE namespace/name, matching
+  # what the script writes and reads.
+  artifactURITemplate: {{ printf "s3://%s/{{ .Release.Namespace }}/{{ .Release.Name }}/{{ .BackupName }}/definitions.json" $bucketName | quote }}
+  template:
+    spec:
+      restartPolicy: Never
+      containers:
+        - name: rabbitmq-backup
+          image: "{{ .Values.backupStrategyController.rabbitmqBackupClientImage }}"
+          imagePullPolicy: IfNotPresent
+          env:
+            - name: MODE
+              value: {{ printf "{{ .Mode }}" | quote }}
+            # The Cozystack RabbitMQ release name is prefixed with "rabbitmq-",
+            # so the operator's client Service and default-user Secret are
+            # rabbitmq-<app>. On restore .Release is the TARGET, so host and
+            # credentials point at the broker being restored into.
+            - name: RABBITMQ_HOST
+              value: {{ printf "rabbitmq-{{ .Release.Name }}.{{ .Release.Namespace }}.svc" | quote }}
+            # optional: the cleanup run (on Backup deletion) only touches S3 and
+            # may execute after the source broker - and this Secret - are gone.
+            - name: RABBITMQ_USER
+              valueFrom:
+                secretKeyRef:
+                  name: {{ printf "rabbitmq-{{ .Release.Name }}-default-user" | quote }}
+                  key: username
+                  optional: true
+            - name: RABBITMQ_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: {{ printf "rabbitmq-{{ .Release.Name }}-default-user" | quote }}
+                  key: password
+                  optional: true
+            # ARTIFACT_URI is the single source of truth for the object location:
+            # the driver renders it from spec.artifactURITemplate, records it on
+            # the Backup's status.artifact.uri, and injects it here. On restore
+            # it is that recorded value read back from the Backup, so restore
+            # fetches the exact object the backup wrote and a later change to the
+            # key layout cannot orphan older backups.
+            - name: ARTIFACT_URI
+              value: {{ printf "{{ .ArtifactURI }}" | quote }}
+            # S3 coordinates. Credentials come from cozy-backups-creds, which the
+            # controller projects into the application namespace before dispatch.
+            # The endpoint helper yields the ACME-valid external ingress with a
+            # scheme, so curl --aws-sigv4 (which needs a full URL) verifies TLS
+            # against the image's ca-certificates - no -k, which would disable
+            # verification permanently for every tenant.
+            - name: AWS_ACCESS_KEY_ID
+              valueFrom:
+                secretKeyRef:
+                  name: cozy-backups-creds
+                  key: AWS_ACCESS_KEY_ID
+            - name: AWS_SECRET_ACCESS_KEY
+              valueFrom:
+                secretKeyRef:
+                  name: cozy-backups-creds
+                  key: AWS_SECRET_ACCESS_KEY
+            - name: S3_ENDPOINT
+              value: {{ include "backupstrategy-controller.endpoint" . | quote }}
+            - name: S3_REGION
+              value: {{ .Values.backupStorage.region | quote }}
+            - name: S3_FORCE_PATH_STYLE
+              value: {{ .Values.backupStorage.forcePathStyle | quote }}
+          command: ["/bin/sh", "-c"]
+          args:
+            - |
+              set -eu
+
+              case "${S3_ENDPOINT}" in
+                http://*|https://*) base="${S3_ENDPOINT}" ;;
+                *) base="https://${S3_ENDPOINT}" ;;
+              esac
+
+              # ARTIFACT_URI is s3://<bucket>/<key>. Split it and build the HTTP
+              # object URL, honouring path-style vs virtual-hosted addressing so
+              # this works against both SeaweedFS (path-style) and an external S3
+              # configured for virtual-hosted-style.
+              case "${ARTIFACT_URI}" in
+                s3://*) rest="${ARTIFACT_URI#s3://}"; bucket="${rest%%/*}"; key="${rest#*/}" ;;
+                *) echo "expected an s3:// artifact URI, got '${ARTIFACT_URI}' (set spec.artifactURITemplate)" >&2; exit 1 ;;
+              esac
+              if [ "${S3_FORCE_PATH_STYLE}" = "false" ]; then
+                scheme="${base%%://*}"; host="${base#*://}"
+                obj_url="${scheme}://${bucket}.${host}/${key}"
+              else
+                obj_url="${base}/${bucket}/${key}"
+              fi
+
+              s3() { curl -fsS --aws-sigv4 "aws:amz:${S3_REGION}:s3" \
+                --user "${AWS_ACCESS_KEY_ID}:${AWS_SECRET_ACCESS_KEY}" "$@"; }
+
+              # Cleanup runs when the owning Backup is deleted. It only touches
+              # S3 - the source broker may already be gone - so it deletes the
+              # object and exits before any management-API access. A missing
+              # object is not an error.
+              if [ "${MODE}" = cleanup ]; then
+                echo "deleting ${ARTIFACT_URI}"
+                # A missing object is success (delete is idempotent); any other
+                # non-2xx is a real failure, so this exits non-zero and the
+                # controller retries rather than orphaning the object.
+                code=$(curl -sS -o /dev/null -w '%{http_code}' \
+                  --aws-sigv4 "aws:amz:${S3_REGION}:s3" \
+                  --user "${AWS_ACCESS_KEY_ID}:${AWS_SECRET_ACCESS_KEY}" \
+                  -X DELETE "${obj_url}" || true)
+                case "${code}" in
+                  2*|404) echo "deleted (HTTP ${code})"; exit 0 ;;
+                  *) echo "delete failed: HTTP ${code}" >&2; exit 1 ;;
+                esac
+              fi
+
+              api="http://${RABBITMQ_HOST}:15672/api/definitions"
+
+              # Precondition gates on the application being Ready; the
+              # management API can still be warming up. Wait for it before the
+              # export/import so a cold API is not read as a backup failure.
+              for _ in $(seq 1 60); do
+                if curl -fsS -u "${RABBITMQ_USER}:${RABBITMQ_PASSWORD}" --max-time 5 \
+                    "http://${RABBITMQ_HOST}:15672/api/overview" >/dev/null 2>&1; then
+                  break
+                fi
+                sleep 5
+              done
+
+              if [ "${MODE}" = backup ]; then
+                echo "exporting RabbitMQ definitions from ${RABBITMQ_HOST} to ${ARTIFACT_URI}"
+                curl -fsS -u "${RABBITMQ_USER}:${RABBITMQ_PASSWORD}" "${api}" -o /tmp/definitions.json
+                s3 -X PUT --upload-file /tmp/definitions.json "${obj_url}"
+                echo "uploaded ${ARTIFACT_URI}"
+              else
+                echo "importing RabbitMQ definitions into ${RABBITMQ_HOST} from ${ARTIFACT_URI}"
+                echo "note: import is additive (POST /api/definitions merges); it does not delete objects created after the backup"
+                s3 -o /tmp/definitions.json "${obj_url}"
+                curl -fsS -u "${RABBITMQ_USER}:${RABBITMQ_PASSWORD}" \
+                  -H "content-type: application/json" \
+                  -X POST "${api}" --data-binary @/tmp/definitions.json
+                echo "import complete"
+              fi
+          resources:
+            requests:
+              cpu: 10m
+              memory: 32Mi
+            limits:
+              cpu: 200m
+              memory: 128Mi
+          securityContext:
+            allowPrivilegeEscalation: false
+            capabilities:
+              drop: ["ALL"]
+            seccompProfile:
+              type: RuntimeDefault
+{{- end -}}
diff --git a/packages/system/backupstrategy-controller/templates/strategy-redis-default.yaml b/packages/system/backupstrategy-controller/templates/strategy-redis-default.yaml
new file mode 100644
index 0000000000..f2f9a54b02
--- /dev/null
+++ b/packages/system/backupstrategy-controller/templates/strategy-redis-default.yaml
@@ -0,0 +1,359 @@
+{{/*
+  Strategy template rendering uses two layers of Go templates:
+   1. Helm renders this file at chart install time. Anything inside
+      `{{ ... }}` is interpreted by Helm.
+   2. The strategy controller renders the resulting Strategy CR
+      per-BackupJob, expanding `{{ .Application | .Release | .Mode |
+      .Backup }}` against the live application object.
+  To emit a literal "{{ .Foo }}" that survives Helm, we pass it as the
+  string argument of `printf` — Helm does not interpret inner template
+  delimiters inside printf's quoted strings. Do NOT inline the literal
+  directly or Helm will try to evaluate the inner expression at chart
+  install time and fail.
+
+  Gated, like every default Strategy, on a resolved $bucketName and on its
+  CRD being established; see the crdEstablished helper.
+*/}}
+{{- $bucketName := include "backupstrategy-controller.bucketName" . -}}
+{{- $crdEstablished := include "backupstrategy-controller.crdEstablished" (dict "root" . "crd" "redis.strategy.backups.cozystack.io") -}}
+{{- if and $bucketName $crdEstablished -}}
+apiVersion: strategy.backups.cozystack.io/v1alpha1
+kind: Redis
+metadata:
+  name: cozy-default-redis
+spec:
+  template:
+    spec:
+      restartPolicy: Never
+      {{- /*
+      Bound a wedged run (e.g. redis-cli --rdb blocking on a stalled master) so
+      it becomes a Failed Job the driver reports, instead of a Pod the cron Plan
+      keeps stacking behind; the job-in-progress path has no other deadline. int
+      so a large values-file override (parsed as float64) renders as an integer,
+      not exponent form (1e+06), which would fail schema validation. Full
+      rationale: docs/operations/backup-classes.md.
+      */}}
+      activeDeadlineSeconds: {{ int .Values.backupStrategyController.redisBackupActiveDeadlineSeconds }}
+      volumes:
+        {{- /*
+        The Redis app's own CA. The chart moves Redis and Sentinel to a TLS-only
+        listener when the app has tls.enabled and publishes the CA at
+        redis-<app>.ca-cert; mounting it optionally means ca.crt is present
+        exactly when the app is TLS, and a non-TLS app (every Valkey app) leaves
+        /etc/redis-ca empty so the script keeps its plaintext path (see the RTLS
+        block). .Release.Prefix is the chart's name prefix, redis- or valkey-;
+        it defaults to redis- because during an upgrade the previous controller,
+        which predates Prefix and serves only Redis, renders this same CR.
+        */}}
+        - name: redis-ca
+          secret:
+            secretName: {{ printf `{{ .Release.Prefix | default "redis-" }}{{ .Release.Name }}.ca-cert` | quote }}
+            optional: true
+        {{- if .Values.backupStorage.endpointCASecretName }}
+        {{- /*
+        Verify the S3 endpoint against this private CA when the admin points
+        endpointCASecretName at a Secret carrying ca.crt (self-signed SeaweedFS).
+        Optional, because nothing projects this Secret into the app namespace: a
+        required mount would wedge the Pod on FailedMount for the whole
+        activeDeadlineSeconds (never a Failed Job) when the admin has not created
+        it. A missing ca.crt does NOT skip verification: the script falls through
+        to the image's system CA store and curl fails the handshake fast;
+        skip-verify still needs its explicit opt-in. See backup-classes.md.
+        */}}
+        - name: s3-ca
+          secret:
+            secretName: {{ .Values.backupStorage.endpointCASecretName | quote }}
+            optional: true
+        {{- end }}
+      containers:
+        - name: redis-backup
+          image: "{{ .Values.backupStrategyController.redisBackupClientImage }}"
+          imagePullPolicy: IfNotPresent
+          volumeMounts:
+            - name: redis-ca
+              mountPath: /etc/redis-ca
+              readOnly: true
+            {{- if .Values.backupStorage.endpointCASecretName }}
+            - name: s3-ca
+              mountPath: /etc/s3-ca
+              readOnly: true
+            {{- end }}
+          env:
+            {{- /*
+            Redis password, when the app has authEnabled (the default). The chart
+            emits the Secret <prefix><app>-auth; mount it optionally so a no-auth
+            app still schedules.
+            */}}
+            - name: REDIS_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: {{ printf `{{ .Release.Prefix | default "redis-" }}{{ .Release.Name }}-auth` | quote }}
+                  key: password
+                  optional: true
+            {{- /*
+            S3 coordinates come from cozy-backups-creds, projected into the app
+            namespace by the backupstrategy-controller before every
+            BackupJob/RestoreJob. endpoint is a BARE host (no scheme) by design;
+            the script prepends https:// when unscheme'd. These refs are optional
+            so a missing/empty key lets the Pod start and the script fail loudly
+            (a required ref would wedge the Pod in CreateContainerConfigError,
+            which never becomes a Failed Job).
+            */}}
+            - name: S3_ENDPOINT
+              valueFrom:
+                secretKeyRef:
+                  name: cozy-backups-creds
+                  key: endpoint
+                  optional: true
+            - name: S3_BUCKET
+              valueFrom:
+                secretKeyRef:
+                  name: cozy-backups-creds
+                  key: bucketName
+                  optional: true
+            - name: S3_REGION
+              valueFrom:
+                secretKeyRef:
+                  name: cozy-backups-creds
+                  key: region
+                  optional: true
+            - name: AWS_ACCESS_KEY_ID
+              valueFrom:
+                secretKeyRef:
+                  name: cozy-backups-creds
+                  key: AWS_ACCESS_KEY_ID
+                  optional: true
+            - name: AWS_SECRET_ACCESS_KEY
+              valueFrom:
+                secretKeyRef:
+                  name: cozy-backups-creds
+                  key: AWS_SECRET_ACCESS_KEY
+                  optional: true
+            {{- /*
+            Skip-verify is an explicit opt-in, never a silent fallback. Off by
+            default: the platform bucket carries a publicly trusted ACME cert the
+            image's ca-certificates verifies unaided.
+            */}}
+            - name: S3_INSECURE_SKIP_VERIFY
+              value: {{ .Values.backupStorage.insecureSkipTLSVerify | quote }}
+          command: ["/bin/sh", "-c"]
+          args:
+            - |
+              set -euo pipefail
+
+              {{- /*
+              The S3 refs are optional secretKeyRefs (see the container env), so
+              a missing/empty key fails here with a clear cause rather than
+              wedging the Pod in CreateContainerConfigError — which never becomes
+              a Failed Job and leaves the BackupJob stuck at Running.
+              */}}
+              : "${S3_ENDPOINT:?missing endpoint in cozy-backups-creds}"
+              : "${S3_BUCKET:?missing bucketName in cozy-backups-creds}"
+              : "${S3_REGION:?missing region in cozy-backups-creds}"
+              : "${AWS_ACCESS_KEY_ID:?missing AWS_ACCESS_KEY_ID in cozy-backups-creds}"
+              : "${AWS_SECRET_ACCESS_KEY:?missing AWS_SECRET_ACCESS_KEY in cozy-backups-creds}"
+
+              MODE="{{ printf "{{ .Mode }}" }}"
+              {{- /*
+              The object name is minted by the controller per BackupJob and
+              recorded on the Backup, so each backup is a distinct object and a
+              restore reads back the exact one its Backup points at. Computing it
+              in-script would collapse a Plan's history onto one object. On
+              cleanup it names the object a deleted Backup must remove.
+              */}}
+              KEY="{{ printf "{{ .ObjectKey }}" }}"
+
+              # S3 transport, needed by every mode (backup, restore, cleanup).
+              case "${S3_ENDPOINT}" in
+                http://*|https://*) BASE="${S3_ENDPOINT}" ;;
+                *)                  BASE="https://${S3_ENDPOINT}" ;;
+              esac
+              TLS=""
+              case "${BASE}" in
+                https://*)
+                  {{- /*
+                  Default: verify against the image's system CA store — the
+                  platform bucket's ACME cert needs nothing more. A mounted
+                  private CA (self-signed SeaweedFS) is honoured when present.
+                  Skip-verify is reached only by explicit opt-in, never as a
+                  fallback, so an insecure transport is always a choice.
+                  */}}
+                  if [ -f /etc/s3-ca/ca.crt ]; then TLS="--cacert /etc/s3-ca/ca.crt";
+                  elif [ -f /etc/s3-ca/tls.crt ]; then TLS="--cacert /etc/s3-ca/tls.crt";
+                  elif [ "${S3_INSECURE_SKIP_VERIFY:-false}" = "true" ]; then TLS="-k";
+                  fi
+                  ;;
+              esac
+              s3() {
+                curl -fsS ${TLS} \
+                  --aws-sigv4 "aws:amz:${S3_REGION}:s3" \
+                  --user "${AWS_ACCESS_KEY_ID}:${AWS_SECRET_ACCESS_KEY}" "$@"
+              }
+              OBJ="${BASE}/${S3_BUCKET}/${KEY}"
+
+              {{- /*
+              Cleanup runs when a Backup is deleted: it removes just that
+              Backup's object and never contacts Redis, so it works even after
+              the source app is gone. Idempotent — a 404 (already gone) is
+              success; -f is dropped so the 404 does not abort before the case.
+              */}}
+              if [ "${MODE}" = "cleanup" ]; then
+                echo "deleting s3://${S3_BUCKET}/${KEY}"
+                code=$(curl -sS -o /dev/null -w '%{http_code}' ${TLS} \
+                  --aws-sigv4 "aws:amz:${S3_REGION}:s3" \
+                  --user "${AWS_ACCESS_KEY_ID}:${AWS_SECRET_ACCESS_KEY}" \
+                  -X DELETE "${OBJ}")
+                case "${code}" in
+                  2??|404) echo "deleted (HTTP ${code})"; exit 0 ;;
+                  *)       echo "delete failed: HTTP ${code}" >&2; exit 1 ;;
+                esac
+              fi
+
+              {{- /*
+              Redis server-side TLS. The chart moves Redis and Sentinel to a
+              TLS-only listener when the app has tls.enabled and publishes the
+              trust anchor at redis-<app>.ca-cert; that Secret is mounted
+              optionally, so ca.crt exists here iff the app is TLS. Verify both
+              the Sentinel and the master connection against it. authClients: yes
+              (mutual TLS) is out of scope — the platform issues no client
+              certificate — but is off by default.
+              */}}
+              RTLS=""
+              if [ -f /etc/redis-ca/ca.crt ]; then
+                RTLS="--tls --cacert /etc/redis-ca/ca.crt"
+              fi
+
+              {{- /*
+              The sentinel Service always belongs to the app we operate on: the
+              source on backup, the restore TARGET on restore (both are
+              .Release.Name at driver-render time). The cozystack redis and
+              valkey charts name their RedisFailover <prefix><app>, so the
+              operator's sentinel Service is rfs-<prefix><app>; mymaster is its
+              master name.
+              */}}
+              SENTINEL="rfs-{{ printf `{{ .Release.Prefix | default "redis-" }}{{ .Release.Name }}` }}"
+
+              # Discover the current master via any sentinel — the RedisFailover
+              # master moves on failover, so a fixed host would break after one.
+              addr=$(redis-cli ${RTLS} -h "${SENTINEL}" -p 26379 sentinel get-master-addr-by-name mymaster)
+              MHOST=$(echo "${addr}" | sed -n '1p')
+              MPORT=$(echo "${addr}" | sed -n '2p')
+              if [ -z "${MHOST}" ] || [ -z "${MPORT}" ]; then
+                echo "could not resolve redis master from sentinel ${SENTINEL}" >&2
+                exit 1
+              fi
+
+              {{- /*
+              tgt runs redis-cli against the app master. The password reaches
+              redis-cli through REDISCLI_AUTH, never argv (ps-visible in the
+              pod); it is set only when the app has auth, because an empty value
+              makes redis-cli send AUTH to an unauthenticated server and fail.
+              The throwaway loader below is local and unauthenticated, so it must
+              NOT inherit this — hence a per-call wrapper, not an export.
+              */}}
+              tgt() {
+                if [ -n "${REDIS_PASSWORD:-}" ]; then
+                  REDISCLI_AUTH="${REDIS_PASSWORD}" redis-cli ${RTLS} -h "${MHOST}" -p "${MPORT}" "$@"
+                else
+                  redis-cli ${RTLS} -h "${MHOST}" -p "${MPORT}" "$@"
+                fi
+              }
+
+              # Explicit modes only — an unrecognised MODE must NOT fall into the
+              # destructive restore branch (FLUSHALL + replay into the master).
+              if [ "${MODE}" = "backup" ]; then
+                echo "dumping RDB from master ${MHOST}:${MPORT}"
+                tgt --rdb /tmp/dump.rdb
+                echo "uploading s3://${S3_BUCKET}/${KEY}"
+                s3 -X PUT --upload-file /tmp/dump.rdb "${OBJ}"
+              elif [ "${MODE}" = "restore" ]; then
+                echo "downloading s3://${S3_BUCKET}/${KEY}"
+                s3 -o /tmp/dump.rdb "${OBJ}"
+                {{- /*
+                Replay by loading the RDB into a throwaway local redis and
+                letting a real engine emit the replay stream. A standalone
+                RDB->RESP converter (hdt3213/rdb) drops the database boundary
+                (every SELECT gone, so db1+ merge into db0) and stream consumer
+                groups; a real redis preserves both. It must be at least as new
+                as the source engine or it cannot read the RDB version.
+                */}}
+                mkdir -p /tmp/restore
+                cp /tmp/dump.rdb /tmp/restore/dump.rdb
+                redis-server --dir /tmp/restore --dbfilename dump.rdb \
+                  --port 6399 --bind 127.0.0.1 --save "" --appendonly no &
+                for _ in $(seq 1 300); do
+                  redis-cli -p 6399 PING >/dev/null 2>&1 && break
+                  sleep 1
+                done
+                if ! redis-cli -p 6399 PING >/dev/null 2>&1; then
+                  {{- /*
+                  The loader is memory-bounded by the Pod's limit; the most
+                  common cause here is a dataset larger than that limit (the
+                  cgroup OOM-kills redis-server while sh survives), then an RDB
+                  version newer than the image. Raise
+                  backupStrategyController.redisBackupResources.limits.memory /
+                  ephemeral-storage, or check the image version.
+                  */}}
+                  echo "throwaway redis did not become ready: dataset likely exceeds the restore memory limit, or the RDB version is newer than the image" >&2
+                  exit 1
+                fi
+                # A RESP base AOF (no RDB preamble) is the faithful, replayable
+                # form: one SELECT per source database, streams with XSETID and
+                # XGROUP. CONFIG SET appendonly yes triggers the initial rewrite.
+                redis-cli -p 6399 CONFIG SET aof-use-rdb-preamble no >/dev/null
+                redis-cli -p 6399 CONFIG SET appendonly yes >/dev/null
+                {{- /*
+                Wait for the rewrite to actually FINISH, not merely for
+                in_progress to read 0 — right after `appendonly yes` the rewrite
+                is only scheduled, so a bare in_progress:0 check can fall through
+                before it starts and read an absent or half-written base AOF. The
+                completion condition is all three: no rewrite in flight, the last
+                one succeeded, and the base AOF is on disk (find, not `ls`, so a
+                no-match returns 0 under pipefail). REPLAY is set each iteration
+                so it survives the loop.
+                */}}
+                REPLAY=""
+                for _ in $(seq 1 300); do
+                  persistence=$(redis-cli -p 6399 INFO persistence | tr -d '\r')
+                  inprog=$(echo "${persistence}" | awk -F: '/aof_rewrite_in_progress:/{print $2}')
+                  status=$(echo "${persistence}" | awk -F: '/aof_last_bgrewrite_status:/{print $2}')
+                  REPLAY=$(find /tmp/restore/appendonlydir -name '*.base.aof' 2>/dev/null | head -n1 || true)
+                  if [ "${inprog}" = "0" ] && [ "${status}" = "ok" ] && [ -n "${REPLAY}" ]; then
+                    break
+                  fi
+                  sleep 1
+                done
+                if [ -z "${REPLAY}" ]; then
+                  echo "throwaway redis produced no base AOF to replay (rewrite did not finish)" >&2
+                  exit 1
+                fi
+                # FLUSHALL first so an in-place restore is a replacement, not a
+                # merge onto stale keys; the SELECTs in the stream then land each
+                # source database back on its own index.
+                tgt FLUSHALL
+                tgt --pipe < "${REPLAY}"
+                redis-cli -p 6399 SHUTDOWN NOSAVE >/dev/null 2>&1 || true
+                echo "restore complete into ${MHOST}:${MPORT}"
+              else
+                echo "unknown mode: ${MODE}" >&2
+                exit 1
+              fi
+          {{- /*
+          On restore the throwaway loader holds the whole dataset in memory and
+          materialises the RDB plus its AOF rewrite on disk, so memory and
+          ephemeral-storage must scale with the Redis it restores — the restore
+          ceiling, not the backup one, sets these. The shipped Strategy CR is
+          cluster-scoped and Helm-managed, so an admin raises the ceiling once
+          via backupStrategyController.redisBackupResources in chart values (an
+          in-place edit of the CR reverts on upgrade). Defaults suit
+          small-to-medium instances. See backup-classes.md.
+          */}}
+          resources:
+            {{- toYaml .Values.backupStrategyController.redisBackupResources | nindent 12 }}
+          securityContext:
+            allowPrivilegeEscalation: false
+            capabilities:
+              drop: ["ALL"]
+            seccompProfile:
+              type: RuntimeDefault
+{{- end -}}
diff --git a/packages/system/backupstrategy-controller/templates/strategy-velero-vmdisk-default.yaml b/packages/system/backupstrategy-controller/templates/strategy-velero-vmdisk-default.yaml
index 13a4f5d526..4511fbc581 100644
--- a/packages/system/backupstrategy-controller/templates/strategy-velero-vmdisk-default.yaml
+++ b/packages/system/backupstrategy-controller/templates/strategy-velero-vmdisk-default.yaml
@@ -1,5 +1,6 @@
 {{- $bucketName := include "backupstrategy-controller.bucketName" . -}}
-{{- if and .Values.velero.bslEnabled $bucketName -}}
+{{- $crdEstablished := include "backupstrategy-controller.crdEstablished" (dict "root" . "crd" "veleroes.strategy.backups.cozystack.io") -}}
+{{- if and .Values.velero.bslEnabled $bucketName $crdEstablished -}}
 apiVersion: strategy.backups.cozystack.io/v1alpha1
 kind: Velero
 metadata:
diff --git a/packages/system/backupstrategy-controller/templates/strategy-velero-vminstance-default.yaml b/packages/system/backupstrategy-controller/templates/strategy-velero-vminstance-default.yaml
index b4ebc6e171..b1f919125b 100644
--- a/packages/system/backupstrategy-controller/templates/strategy-velero-vminstance-default.yaml
+++ b/packages/system/backupstrategy-controller/templates/strategy-velero-vminstance-default.yaml
@@ -1,5 +1,6 @@
 {{- $bucketName := include "backupstrategy-controller.bucketName" . -}}
-{{- if and .Values.velero.bslEnabled $bucketName -}}
+{{- $crdEstablished := include "backupstrategy-controller.crdEstablished" (dict "root" . "crd" "veleroes.strategy.backups.cozystack.io") -}}
+{{- if and .Values.velero.bslEnabled $bucketName $crdEstablished -}}
 apiVersion: strategy.backups.cozystack.io/v1alpha1
 kind: Velero
 metadata:
diff --git a/packages/system/backupstrategy-controller/templates/velero-bsl.yaml b/packages/system/backupstrategy-controller/templates/velero-bsl.yaml
index a081539952..e0ba05ad8d 100644
--- a/packages/system/backupstrategy-controller/templates/velero-bsl.yaml
+++ b/packages/system/backupstrategy-controller/templates/velero-bsl.yaml
@@ -30,6 +30,6 @@ spec:
   config:
     region: {{ .Values.backupStorage.region | quote }}
     s3ForcePathStyle: {{ .Values.backupStorage.forcePathStyle | quote }}
-    s3Url: {{ .Values.backupStorage.endpoint | quote }}
+    s3Url: {{ include "backupstrategy-controller.endpoint" . | quote }}
 {{- end }}
 {{- end }}
diff --git a/packages/system/backupstrategy-controller/tests/default_objects_gate_test.yaml b/packages/system/backupstrategy-controller/tests/default_objects_gate_test.yaml
new file mode 100644
index 0000000000..976fee1667
--- /dev/null
+++ b/packages/system/backupstrategy-controller/tests/default_objects_gate_test.yaml
@@ -0,0 +1,156 @@
+suite: DefaultObjectsGate wiring — the release the gate forces, and its RBAC
+
+# The Strategy CRs and the Velero BSL are rendered behind a `lookup` of the
+# BucketClaim this same chart creates, so a fresh install renders them empty
+# and helm-controller never re-renders (unchanged chart + values, drift
+# detection off) — the skip is permanent. The controller's DefaultObjectsGate
+# repairs that by forcing a real Helm upgrade on THIS release, so the release
+# coordinates it is given must be this chart's own release, and it must hold
+# the verbs to do it.
+
+templates:
+  - templates/deployment.yaml
+  - templates/rbac.yaml
+
+release:
+  name: backupstrategy-controller
+  namespace: cozy-backup-controller
+
+tests:
+  - it: "gate targets this chart's own HelmRelease and the cozy-default BackupClass"
+    template: templates/deployment.yaml
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: BACKUP_DEFAULT_OBJECTS_HELMRELEASE_NAME
+            value: backupstrategy-controller
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: BACKUP_DEFAULT_OBJECTS_HELMRELEASE_NAMESPACE
+            value: cozy-backup-controller
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: BACKUP_DEFAULT_OBJECTS_BACKUPCLASS
+            value: cozy-default
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: BACKUP_DEFAULT_OBJECTS_VELERO_NAMESPACE
+            value: cozy-velero
+
+  # The credentials Secret is rendered one release earlier, by the platform
+  # bucket's <bucket>-system release, behind the same kind of install-time
+  # lookup. Its name is assembled from the bucket-rd release prefix and the
+  # "-system" suffix the parent bucket chart appends, and it must stay in
+  # lockstep with systemSecretName: the gate resolves the bucket name from
+  # that Secret and forces exactly this release when it is absent. Two
+  # independently written strings, so pin the relationship, not just the value.
+  - it: "gate targets the bucket release that renders the credentials Secret"
+    template: templates/deployment.yaml
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: BACKUP_CREDENTIALS_HELMRELEASE_NAME
+            value: bucket-cozy-backups-system
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: BACKUP_CREDENTIALS_HELMRELEASE_NAMESPACE
+            value: tenant-root
+      # BACKUP_STORAGE_SECRET_NAME is exactly the release name above with
+      # "-credentials" appended — that is what makes forcing this release the
+      # thing that creates that Secret.
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: BACKUP_STORAGE_SECRET_NAME
+            value: bucket-cozy-backups-system-credentials
+
+  - it: "a renamed bucket moves both the forced release and the Secret together"
+    template: templates/deployment.yaml
+    set:
+      backupStorage.bucketName: platform-backups
+      backupStorage.systemSecretName: bucket-platform-backups-system-credentials
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: BACKUP_CREDENTIALS_HELMRELEASE_NAME
+            value: bucket-platform-backups-system
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: BACKUP_STORAGE_SECRET_NAME
+            value: bucket-platform-backups-system-credentials
+
+  # External S3: the Secret is admin-managed and no release renders it, so
+  # there is nothing to force. Handing the gate stale coordinates would make
+  # it patch a HelmRelease that does not exist every MinForceInterval.
+  - it: "provisionBucket=false: no bucket release to force"
+    template: templates/deployment.yaml
+    set:
+      backupStorage.provisionBucket: false
+    asserts:
+      - notContains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: BACKUP_CREDENTIALS_HELMRELEASE_NAME
+            value: bucket-cozy-backups-system
+      - notContains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: BACKUP_CREDENTIALS_HELMRELEASE_NAMESPACE
+            value: tenant-root
+
+  - it: "velero.bslEnabled=false: the BSL is not rendered, so the gate must not look for it"
+    template: templates/deployment.yaml
+    set:
+      velero.bslEnabled: false
+    asserts:
+      - notContains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: BACKUP_DEFAULT_OBJECTS_VELERO_NAMESPACE
+            value: cozy-velero
+      # The rest of the gate stays wired: the Strategy CRs still need it.
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: BACKUP_DEFAULT_OBJECTS_HELMRELEASE_NAME
+            value: backupstrategy-controller
+
+  - it: "reconcileDefaultObjects=false: the gate is fully unwired (main.go disables it on an empty release name)"
+    template: templates/deployment.yaml
+    set:
+      backupStorage.reconcileDefaultObjects: false
+    asserts:
+      - notContains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: BACKUP_DEFAULT_OBJECTS_HELMRELEASE_NAME
+            value: backupstrategy-controller
+      - notContains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: BACKUP_DEFAULT_OBJECTS_BACKUPCLASS
+            value: cozy-default
+
+  - it: "ClusterRole grants patch on helmreleases (forceAt stamp) and get on backupstoragelocations"
+    template: templates/rbac.yaml
+    asserts:
+      - contains:
+          path: rules
+          content:
+            apiGroups: ["helm.toolkit.fluxcd.io"]
+            resources: ["helmreleases"]
+            verbs: ["get", "create", "update", "patch", "delete"]
+      - contains:
+          path: rules
+          content:
+            apiGroups: ["velero.io"]
+            resources: ["backupstoragelocations"]
+            verbs: ["get"]
diff --git a/packages/system/backupstrategy-controller/tests/deployment_test.yaml b/packages/system/backupstrategy-controller/tests/deployment_test.yaml
index 1f714bfaac..6c17f5f583 100644
--- a/packages/system/backupstrategy-controller/tests/deployment_test.yaml
+++ b/packages/system/backupstrategy-controller/tests/deployment_test.yaml
@@ -28,6 +28,15 @@ tests:
     set:
       backupStrategyController.metrics.enabled: false
     asserts:
+      # Anchor first: the two assertions below address a container by index, and
+      # notContains passes whenever its path resolves to something without the
+      # forbidden content — including a different container. A sidecar inserted
+      # ahead of this one would leave both of them green while the flag they
+      # exist to forbid came back on the controller. This equal is what fails in
+      # that case; the negatives cannot.
+      - equal:
+          path: spec.template.spec.containers[0].name
+          value: backupstrategy-controller
       - notContains:
           path: spec.template.spec.containers[0].args
           content: --metrics-bind-address=:8443
diff --git a/packages/system/backupstrategy-controller/tests/endpoint_form_test.yaml b/packages/system/backupstrategy-controller/tests/endpoint_form_test.yaml
index 12ba395355..58821f3f36 100644
--- a/packages/system/backupstrategy-controller/tests/endpoint_form_test.yaml
+++ b/packages/system/backupstrategy-controller/tests/endpoint_form_test.yaml
@@ -1,13 +1,26 @@
 suite: endpoint scheme → per-driver derivations (TLS / secure_connection / scheme stripping)
 
-# backupStorage.endpoint is a single URL adapted per driver. MariaDB and
-# FoundationDB want a bare host:port and derive their secure flag from the
-# scheme, so flipping http<->https must flip tls.enabled / secure_connection
-# without leaking the scheme into the host fields.
+# The S3 endpoint is resolved by the "backupstrategy-controller.endpoint"
+# helper and shared by every driver: CNPG/Etcd want a full URL (scheme
+# included), MariaDB/FoundationDB want a bare host:port and derive their secure
+# flag from the scheme, and the Velero BSL wants a full URL. Flipping
+# http<->https must flip tls.enabled / secure_connection without leaking the
+# scheme into the host fields, and must reach every consumer identically.
+#
+# NOTE: the provisionBucket:true derivation (read the external ACME endpoint
+# from the COSI system Secret and force https://) uses `lookup`, which returns
+# nothing under `helm template` / helm-unittest. These offline tests therefore
+# exercise the FALLBACK path — where the helper returns
+# .Values.backupStorage.endpoint verbatim — which is exactly what runs on the
+# pre-reconcile first install and for external S3 (provisionBucket:false).
 
 templates:
+  - templates/strategy-etcd-default.yaml
+  - templates/strategy-cnpg-default.yaml
   - templates/strategy-mariadb-default.yaml
   - templates/strategy-foundationdb-default.yaml
+  - templates/strategy-mongodb-default.yaml
+  - templates/velero-bsl.yaml
 
 release:
   name: t
@@ -18,10 +31,22 @@ set:
   backupStorage.bucketNameOverride: test-bucket
 
 tests:
-  - it: "https endpoint: MariaDB TLS on, FDB secure_connection=1, scheme stripped from host fields"
+  - it: "https endpoint: full URL reaches CNPG/Etcd/Velero; MariaDB TLS on, FDB secure_connection=1, scheme stripped from host fields"
     set:
       backupStorage.endpoint: https://s3.example.com:8333
     asserts:
+      - equal:
+          path: spec.template.destination.s3.endpoint
+          value: https://s3.example.com:8333
+        template: templates/strategy-etcd-default.yaml
+      - equal:
+          path: spec.template.barmanObjectStore.endpointURL
+          value: https://s3.example.com:8333
+        template: templates/strategy-cnpg-default.yaml
+      - equal:
+          path: spec.config.s3Url
+          value: https://s3.example.com:8333
+        template: templates/velero-bsl.yaml
       - equal:
           path: spec.template.storage.s3.endpoint
           value: s3.example.com:8333
@@ -38,11 +63,19 @@ tests:
           path: spec.template.blobStoreConfiguration.urlParameters
           content: secure_connection=1
         template: templates/strategy-foundationdb-default.yaml
+      - equal:
+          path: spec.template.s3.endpointUrl
+          value: https://s3.example.com:8333
+        template: templates/strategy-mongodb-default.yaml
 
-  - it: "http endpoint: MariaDB TLS off, FDB secure_connection=0"
+  - it: "http endpoint: MariaDB TLS off, FDB secure_connection=0, Etcd keeps scheme"
     set:
       backupStorage.endpoint: http://s3.example.com:8333
     asserts:
+      - equal:
+          path: spec.template.destination.s3.endpoint
+          value: http://s3.example.com:8333
+        template: templates/strategy-etcd-default.yaml
       - equal:
           path: spec.template.storage.s3.tls.enabled
           value: false
@@ -51,3 +84,22 @@ tests:
           path: spec.template.blobStoreConfiguration.urlParameters
           content: secure_connection=0
         template: templates/strategy-foundationdb-default.yaml
+      - equal:
+          path: spec.template.s3.endpointUrl
+          value: http://s3.example.com:8333
+        template: templates/strategy-mongodb-default.yaml
+
+  - it: "external S3 (provisionBucket:false): endpoint is used verbatim (no derivation)"
+    set:
+      backupStorage.provisionBucket: false
+      backupStorage.bucketName: ext-bucket
+      backupStorage.endpoint: https://minio.example.internal:9000
+    asserts:
+      - equal:
+          path: spec.template.destination.s3.endpoint
+          value: https://minio.example.internal:9000
+        template: templates/strategy-etcd-default.yaml
+      - equal:
+          path: spec.config.s3Url
+          value: https://minio.example.internal:9000
+        template: templates/velero-bsl.yaml
diff --git a/packages/system/backupstrategy-controller/tests/rendering_test.yaml b/packages/system/backupstrategy-controller/tests/rendering_test.yaml
index d39fcc379a..3db6adb141 100644
--- a/packages/system/backupstrategy-controller/tests/rendering_test.yaml
+++ b/packages/system/backupstrategy-controller/tests/rendering_test.yaml
@@ -15,6 +15,10 @@ templates:
   - templates/strategy-mariadb-default.yaml
   - templates/strategy-etcd-default.yaml
   - templates/strategy-altinity-default.yaml
+  - templates/strategy-mongodb-default.yaml
+  - templates/strategy-rabbitmq-default.yaml
+  - templates/strategy-redis-default.yaml
+  - templates/strategy-kafka-default.yaml
   - templates/strategy-foundationdb-default.yaml
   - templates/strategy-velero-vminstance-default.yaml
   - templates/strategy-velero-vmdisk-default.yaml
@@ -49,6 +53,32 @@ tests:
       - hasDocuments:
           count: 0
         template: templates/strategy-altinity-default.yaml
+      # MongoDB is gated like every sibling, and this count is the assertion
+      # that keeps the chart installable. Its Strategy carries the system-bucket
+      # coordinates ($bucketName), so it needs the gate for the same reason the
+      # others do: this chart ships its own CRDs as templates, Helm resolves the
+      # whole manifest through the RESTMapper before applying any of it, and one
+      # ungated Strategy CR makes the first install apply zero objects with "no
+      # matches for kind" and never recover. A count of 1 here is that bug,
+      # green, which is how it shipped once already.
+      - hasDocuments:
+          count: 0
+        template: templates/strategy-mongodb-default.yaml
+      # RabbitMQ Job strategy carries bucket coordinates (endpoint, bucket,
+      # object key), so it MUST stay off the first render like the others -
+      # an ungated Strategy CR trips the same "no matches for kind" install
+      # failure described above.
+      - hasDocuments:
+          count: 0
+        template: templates/strategy-rabbitmq-default.yaml
+      # Kafka metadata Job strategy carries bucket coordinates too, so it stays
+      # off the first render for the same ordering reason as its siblings.
+      - hasDocuments:
+          count: 0
+        template: templates/strategy-kafka-default.yaml
+      - hasDocuments:
+          count: 0
+        template: templates/strategy-redis-default.yaml
       - hasDocuments:
           count: 0
         template: templates/strategy-foundationdb-default.yaml
@@ -62,7 +92,7 @@ tests:
           count: 0
         template: templates/velero-bsl.yaml
 
-  - it: "cozy-default BackupClass is the Day-1 tenant interface: renders unconditionally with all six routes (FoundationDB intentionally unbound)"
+  - it: "cozy-default BackupClass is the Day-1 tenant interface: renders unconditionally with all eleven routes (FoundationDB intentionally unbound)"
     asserts:
       - hasDocuments:
           count: 1
@@ -73,10 +103,58 @@ tests:
         template: templates/backupclass-default.yaml
       - lengthEqual:
           path: spec.strategies
-          count: 6
+          count: 11
+        template: templates/backupclass-default.yaml
+      - contains:
+          path: spec.strategies
+          content:
+            application:
+              apiGroup: apps.cozystack.io
+              kind: RabbitMQ
+            strategyRef:
+              apiGroup: strategy.backups.cozystack.io
+              kind: Rabbitmq
+              name: cozy-default-rabbitmq
+        template: templates/backupclass-default.yaml
+      - contains:
+          path: spec.strategies
+          content:
+            application:
+              apiGroup: apps.cozystack.io
+              kind: Redis
+            strategyRef:
+              apiGroup: strategy.backups.cozystack.io
+              kind: Redis
+              name: cozy-default-redis
+        template: templates/backupclass-default.yaml
+      - contains:
+          path: spec.strategies
+          content:
+            application:
+              apiGroup: apps.cozystack.io
+              kind: Valkey
+            strategyRef:
+              apiGroup: strategy.backups.cozystack.io
+              kind: Redis
+              name: cozy-default-redis
+        template: templates/backupclass-default.yaml
+      - contains:
+          path: spec.strategies
+          content:
+            application:
+              apiGroup: apps.cozystack.io
+              kind: Kafka
+            strategyRef:
+              apiGroup: strategy.backups.cozystack.io
+              kind: Kafka
+              name: cozy-default-kafka
         template: templates/backupclass-default.yaml
 
   - it: "all Strategy CRs and the Velero BSL render once a bucket name resolves"
+    # bucketNameOverride marks an offline render, and the MongoDB count below is
+    # what pins that the CRD gate honours it: without that short-circuit no
+    # `helm template` or CI diff could ever produce this Strategy, since neither
+    # has an apiserver to ask about the CRD.
     set:
       backupStorage.bucketNameOverride: test-bucket
     asserts:
@@ -92,6 +170,67 @@ tests:
       - hasDocuments:
           count: 1
         template: templates/strategy-altinity-default.yaml
+      - hasDocuments:
+          count: 1
+        template: templates/strategy-mongodb-default.yaml
+      - equal:
+          path: spec.template.s3.bucket
+          value: test-bucket
+        template: templates/strategy-mongodb-default.yaml
+      - equal:
+          path: spec.template.s3.credentialsSecret
+          value: cozy-backups-creds
+        template: templates/strategy-mongodb-default.yaml
+      - equal:
+          path: spec.template.s3.region
+          value: us-east-1
+        template: templates/strategy-mongodb-default.yaml
+      - equal:
+          path: spec.template.s3.forcePathStyle
+          value: true
+        template: templates/strategy-mongodb-default.yaml
+      # insecureSkipTLSVerify is plumbed end-to-end (strategy -> driver-injected
+      # storage entry). This case pins the default (knob off -> false); the
+      # "renders insecureSkipTLSVerify from the platform knob" case below flips
+      # the knob on, so the pair discriminates the rendered value from a
+      # hardcoded literal (either would redden one of the two).
+      - equal:
+          path: spec.template.s3.insecureSkipTLSVerify
+          value: false
+        template: templates/strategy-mongodb-default.yaml
+      # prefix must reach the CR as a literal go-template string: Helm must NOT
+      # evaluate it, so the driver templates it per-application at BackupJob time.
+      # A stray brace would empty it with every doc-count assertion still green.
+      - equal:
+          path: spec.template.s3.prefix
+          value: "{{ .Application.metadata.namespace }}/{{ .Application.metadata.name }}"
+        template: templates/strategy-mongodb-default.yaml
+      - hasDocuments:
+          count: 1
+        template: templates/strategy-rabbitmq-default.yaml
+      - hasDocuments:
+          count: 1
+        template: templates/strategy-redis-default.yaml
+      - hasDocuments:
+          count: 1
+        template: templates/strategy-kafka-default.yaml
+      - isKind:
+          of: Kafka
+        template: templates/strategy-kafka-default.yaml
+      - equal:
+          path: metadata.name
+          value: cozy-default-kafka
+        template: templates/strategy-kafka-default.yaml
+      - equal:
+          path: spec.artifactURITemplate
+          value: "s3://test-bucket/{{ .Release.Namespace }}/{{ .Release.Name }}/{{ .BackupName }}/kafka-metadata.txt"
+        template: templates/strategy-kafka-default.yaml
+      # The chart pins no client image: the controller fills the placeholder with
+      # the target broker's own image at reconcile time.
+      - equal:
+          path: spec.template.spec.containers[0].image
+          value: "{{ .ClientImage }}"
+        template: templates/strategy-kafka-default.yaml
       - hasDocuments:
           count: 1
         template: templates/strategy-foundationdb-default.yaml
@@ -114,10 +253,47 @@ tests:
           value: "true"
         template: templates/velero-bsl.yaml
 
+  - it: "the MongoDB strategy renders insecureSkipTLSVerify from the platform knob"
+    # Pairs with the default (false) assertion above: with the knob flipped on,
+    # the injected storage entry must carry true. A template that hardcoded either
+    # literal would redden one of the two cases, so together they prove the value
+    # tracks backupStorage.insecureSkipTLSVerify rather than a constant.
+    set:
+      backupStorage.bucketNameOverride: test-bucket
+      backupStorage.insecureSkipTLSVerify: true
+    asserts:
+      - equal:
+          path: spec.template.s3.insecureSkipTLSVerify
+          value: true
+        template: templates/strategy-mongodb-default.yaml
+
   - it: "external S3 (provisionBucket=false): Strategy CRs render against the configured bucketName, no Bucket CR is created"
+    # The CRDs are reported Established, as on any render after the first: the
+    # CRD gate is what holds these CRs back on the first one.
     set:
       backupStorage.provisionBucket: false
       backupStorage.bucketName: ext-bucket
+    kubernetesProvider:
+      scheme:
+        "apiextensions.k8s.io/v1/CustomResourceDefinition":
+          gvr:
+            group: apiextensions.k8s.io
+            version: v1
+            resource: customresourcedefinitions
+          namespaced: false
+      objects:
+        - apiVersion: apiextensions.k8s.io/v1
+          kind: CustomResourceDefinition
+          metadata:
+            name: cnpgs.strategy.backups.cozystack.io
+          status:
+            conditions: [{type: Established, status: "True"}]
+        - apiVersion: apiextensions.k8s.io/v1
+          kind: CustomResourceDefinition
+          metadata:
+            name: mariadbs.strategy.backups.cozystack.io
+          status:
+            conditions: [{type: Established, status: "True"}]
     asserts:
       - hasDocuments:
           count: 0
@@ -134,6 +310,186 @@ tests:
           value: ext-bucket
         template: templates/strategy-mariadb-default.yaml
 
+  - it: "Strategies gate on their CRD as well as on the bucket, so a render whose CRDs are not served yet cannot wedge the release"
+    # provisionBucket=false is what makes this case load-bearing: it resolves
+    # $bucketName WITHOUT the offline bucketNameOverride, which is the shape of a
+    # cluster that has been running for releases, and of the first render of an
+    # external-S3 install — bucket gate open, and only the CRD gate still able
+    # to hold the CR back. helm-unittest renders with no apiserver, so the CRD
+    # lookup answers "absent", which is the same answer a real cluster gives on
+    # the upgrade that first ships that CRD. Rendering the CR there fails
+    # Build() for the WHOLE release ("no matches for kind MongoDB") and applies
+    # zero objects, including the CRD that would have fixed it, so a count of 1
+    # for any of these is that wedge, green. hack/backupstrategy-crd-gate.bats
+    # holds the same property for every template, listed here or not.
+    set:
+      backupStorage.provisionBucket: false
+      backupStorage.bucketName: ext-bucket
+    asserts:
+      - hasDocuments:
+          count: 0
+        template: templates/strategy-mongodb-default.yaml
+      - hasDocuments:
+          count: 0
+        template: templates/strategy-kafka-default.yaml
+      - hasDocuments:
+          count: 0
+        template: templates/strategy-rabbitmq-default.yaml
+      - hasDocuments:
+          count: 0
+        template: templates/strategy-redis-default.yaml
+      - hasDocuments:
+          count: 0
+        template: templates/strategy-cnpg-default.yaml
+      - {hasDocuments: {count: 0}, template: templates/strategy-mariadb-default.yaml}
+      - {hasDocuments: {count: 0}, template: templates/strategy-etcd-default.yaml}
+      - {hasDocuments: {count: 0}, template: templates/strategy-altinity-default.yaml}
+      - {hasDocuments: {count: 0}, template: templates/strategy-foundationdb-default.yaml}
+      - {hasDocuments: {count: 0}, template: templates/strategy-velero-vminstance-default.yaml}
+      - {hasDocuments: {count: 0}, template: templates/strategy-velero-vmdisk-default.yaml}
+      # The ungated BackupClass keeps rendering, which is what makes the counts
+      # above an assertion about the CRD gate rather than about a chart-wide
+      # render failure.
+      - hasDocuments:
+          count: 1
+        template: templates/backupclass-default.yaml
+
+  - it: "the CRD-gated Strategies render once the apiserver reports their CRDs Established"
+    # The counterpart of the case above, and the only one that resolves the CRD
+    # gate through a real lookup: bucketNameOverride short-circuits it, so every
+    # other case would stay green with a misspelt CRD name that never resolves on
+    # a live cluster, leaving the CR absent and DefaultObjectsGate forcing
+    # upgrades for good.
+    set:
+      backupStorage.provisionBucket: false
+      backupStorage.bucketName: ext-bucket
+    kubernetesProvider:
+      scheme:
+        "apiextensions.k8s.io/v1/CustomResourceDefinition":
+          gvr:
+            group: apiextensions.k8s.io
+            version: v1
+            resource: customresourcedefinitions
+          namespaced: false
+      objects:
+        - apiVersion: apiextensions.k8s.io/v1
+          kind: CustomResourceDefinition
+          metadata:
+            name: mongodbs.strategy.backups.cozystack.io
+          status:
+            conditions: [{type: Established, status: "True"}]
+        - apiVersion: apiextensions.k8s.io/v1
+          kind: CustomResourceDefinition
+          metadata:
+            name: kafkas.strategy.backups.cozystack.io
+          status:
+            conditions: [{type: Established, status: "True"}]
+        - apiVersion: apiextensions.k8s.io/v1
+          kind: CustomResourceDefinition
+          metadata:
+            name: rabbitmqs.strategy.backups.cozystack.io
+          status:
+            conditions: [{type: Established, status: "True"}]
+        - apiVersion: apiextensions.k8s.io/v1
+          kind: CustomResourceDefinition
+          metadata:
+            name: redis.strategy.backups.cozystack.io
+          status:
+            conditions: [{type: Established, status: "True"}]
+    asserts:
+      - hasDocuments:
+          count: 1
+        template: templates/strategy-mongodb-default.yaml
+      - hasDocuments:
+          count: 1
+        template: templates/strategy-kafka-default.yaml
+      - hasDocuments:
+          count: 1
+        template: templates/strategy-rabbitmq-default.yaml
+      - hasDocuments:
+          count: 1
+        template: templates/strategy-redis-default.yaml
+
+  - it: "with every CRD Established, the bucket gate alone still holds every Strategy CR back until the BucketClaim resolves"
+    # The CRD gate is closed in every render that has no apiserver, so the
+    # bootstrap-window case above would stay green with any bucket gate deleted.
+    # Only a render that serves the CRDs and leaves the BucketClaim unresolved
+    # pins that gate, and its absence ships a Strategy CR with an empty bucket.
+    kubernetesProvider:
+      scheme:
+        "apiextensions.k8s.io/v1/CustomResourceDefinition":
+          gvr: {group: apiextensions.k8s.io, version: v1, resource: customresourcedefinitions}
+          namespaced: false
+        "objectstorage.k8s.io/v1alpha1/BucketClaim":
+          gvr: {group: objectstorage.k8s.io, version: v1alpha1, resource: bucketclaims}
+          namespaced: true
+        "v1/Secret":
+          gvr: {group: "", version: v1, resource: secrets}
+          namespaced: true
+      objects:
+        - {apiVersion: apiextensions.k8s.io/v1, kind: CustomResourceDefinition, metadata: {name: altinities.strategy.backups.cozystack.io}, status: {conditions: [{type: Established, status: "True"}]}}
+        - {apiVersion: apiextensions.k8s.io/v1, kind: CustomResourceDefinition, metadata: {name: cnpgs.strategy.backups.cozystack.io}, status: {conditions: [{type: Established, status: "True"}]}}
+        - {apiVersion: apiextensions.k8s.io/v1, kind: CustomResourceDefinition, metadata: {name: etcds.strategy.backups.cozystack.io}, status: {conditions: [{type: Established, status: "True"}]}}
+        - {apiVersion: apiextensions.k8s.io/v1, kind: CustomResourceDefinition, metadata: {name: foundationdbs.strategy.backups.cozystack.io}, status: {conditions: [{type: Established, status: "True"}]}}
+        - {apiVersion: apiextensions.k8s.io/v1, kind: CustomResourceDefinition, metadata: {name: kafkas.strategy.backups.cozystack.io}, status: {conditions: [{type: Established, status: "True"}]}}
+        - {apiVersion: apiextensions.k8s.io/v1, kind: CustomResourceDefinition, metadata: {name: mariadbs.strategy.backups.cozystack.io}, status: {conditions: [{type: Established, status: "True"}]}}
+        - {apiVersion: apiextensions.k8s.io/v1, kind: CustomResourceDefinition, metadata: {name: mongodbs.strategy.backups.cozystack.io}, status: {conditions: [{type: Established, status: "True"}]}}
+        - {apiVersion: apiextensions.k8s.io/v1, kind: CustomResourceDefinition, metadata: {name: rabbitmqs.strategy.backups.cozystack.io}, status: {conditions: [{type: Established, status: "True"}]}}
+        - {apiVersion: apiextensions.k8s.io/v1, kind: CustomResourceDefinition, metadata: {name: redis.strategy.backups.cozystack.io}, status: {conditions: [{type: Established, status: "True"}]}}
+        - {apiVersion: apiextensions.k8s.io/v1, kind: CustomResourceDefinition, metadata: {name: veleroes.strategy.backups.cozystack.io}, status: {conditions: [{type: Established, status: "True"}]}}
+    asserts:
+      - {hasDocuments: {count: 0}, template: templates/strategy-altinity-default.yaml}
+      - {hasDocuments: {count: 0}, template: templates/strategy-cnpg-default.yaml}
+      - {hasDocuments: {count: 0}, template: templates/strategy-etcd-default.yaml}
+      - {hasDocuments: {count: 0}, template: templates/strategy-foundationdb-default.yaml}
+      - {hasDocuments: {count: 0}, template: templates/strategy-kafka-default.yaml}
+      - {hasDocuments: {count: 0}, template: templates/strategy-mariadb-default.yaml}
+      - {hasDocuments: {count: 0}, template: templates/strategy-mongodb-default.yaml}
+      - {hasDocuments: {count: 0}, template: templates/strategy-rabbitmq-default.yaml}
+      - {hasDocuments: {count: 0}, template: templates/strategy-redis-default.yaml}
+      - {hasDocuments: {count: 0}, template: templates/strategy-velero-vminstance-default.yaml}
+      - {hasDocuments: {count: 0}, template: templates/strategy-velero-vmdisk-default.yaml}
+
+  - it: "with every CRD Established and the BucketClaim resolved, every Strategy CR renders against the COSI bucket name"
+    # The positive half of the case above, through the same live lookups and no
+    # offline override: the state every forced upgrade after bootstrap renders.
+    kubernetesProvider:
+      scheme:
+        "apiextensions.k8s.io/v1/CustomResourceDefinition":
+          gvr: {group: apiextensions.k8s.io, version: v1, resource: customresourcedefinitions}
+          namespaced: false
+        "objectstorage.k8s.io/v1alpha1/BucketClaim":
+          gvr: {group: objectstorage.k8s.io, version: v1alpha1, resource: bucketclaims}
+          namespaced: true
+        "v1/Secret":
+          gvr: {group: "", version: v1, resource: secrets}
+          namespaced: true
+      objects:
+        - {apiVersion: objectstorage.k8s.io/v1alpha1, kind: BucketClaim, metadata: {name: bucket-cozy-backups, namespace: tenant-root}, status: {bucketName: cozy-backups-0123}}
+        - {apiVersion: apiextensions.k8s.io/v1, kind: CustomResourceDefinition, metadata: {name: altinities.strategy.backups.cozystack.io}, status: {conditions: [{type: Established, status: "True"}]}}
+        - {apiVersion: apiextensions.k8s.io/v1, kind: CustomResourceDefinition, metadata: {name: cnpgs.strategy.backups.cozystack.io}, status: {conditions: [{type: Established, status: "True"}]}}
+        - {apiVersion: apiextensions.k8s.io/v1, kind: CustomResourceDefinition, metadata: {name: etcds.strategy.backups.cozystack.io}, status: {conditions: [{type: Established, status: "True"}]}}
+        - {apiVersion: apiextensions.k8s.io/v1, kind: CustomResourceDefinition, metadata: {name: foundationdbs.strategy.backups.cozystack.io}, status: {conditions: [{type: Established, status: "True"}]}}
+        - {apiVersion: apiextensions.k8s.io/v1, kind: CustomResourceDefinition, metadata: {name: kafkas.strategy.backups.cozystack.io}, status: {conditions: [{type: Established, status: "True"}]}}
+        - {apiVersion: apiextensions.k8s.io/v1, kind: CustomResourceDefinition, metadata: {name: mariadbs.strategy.backups.cozystack.io}, status: {conditions: [{type: Established, status: "True"}]}}
+        - {apiVersion: apiextensions.k8s.io/v1, kind: CustomResourceDefinition, metadata: {name: mongodbs.strategy.backups.cozystack.io}, status: {conditions: [{type: Established, status: "True"}]}}
+        - {apiVersion: apiextensions.k8s.io/v1, kind: CustomResourceDefinition, metadata: {name: rabbitmqs.strategy.backups.cozystack.io}, status: {conditions: [{type: Established, status: "True"}]}}
+        - {apiVersion: apiextensions.k8s.io/v1, kind: CustomResourceDefinition, metadata: {name: redis.strategy.backups.cozystack.io}, status: {conditions: [{type: Established, status: "True"}]}}
+        - {apiVersion: apiextensions.k8s.io/v1, kind: CustomResourceDefinition, metadata: {name: veleroes.strategy.backups.cozystack.io}, status: {conditions: [{type: Established, status: "True"}]}}
+    asserts:
+      - {hasDocuments: {count: 1}, template: templates/strategy-altinity-default.yaml}
+      - {hasDocuments: {count: 1}, template: templates/strategy-cnpg-default.yaml}
+      - {matchRegex: {path: spec.template.barmanObjectStore.destinationPath, pattern: ^s3://cozy-backups-0123/}, template: templates/strategy-cnpg-default.yaml}
+      - {hasDocuments: {count: 1}, template: templates/strategy-etcd-default.yaml}
+      - {hasDocuments: {count: 1}, template: templates/strategy-foundationdb-default.yaml}
+      - {hasDocuments: {count: 1}, template: templates/strategy-kafka-default.yaml}
+      - {hasDocuments: {count: 1}, template: templates/strategy-mariadb-default.yaml}
+      - {hasDocuments: {count: 1}, template: templates/strategy-mongodb-default.yaml}
+      - {hasDocuments: {count: 1}, template: templates/strategy-rabbitmq-default.yaml}
+      - {hasDocuments: {count: 1}, template: templates/strategy-redis-default.yaml}
+      - {hasDocuments: {count: 1}, template: templates/strategy-velero-vminstance-default.yaml}
+      - {hasDocuments: {count: 1}, template: templates/strategy-velero-vmdisk-default.yaml}
+
   - it: "velero.bslEnabled=false: Velero strategies and BSL drop out while other strategies keep rendering"
     set:
       backupStorage.bucketNameOverride: test-bucket
diff --git a/packages/system/backupstrategy-controller/tests/restore_rbac_test.yaml b/packages/system/backupstrategy-controller/tests/restore_rbac_test.yaml
new file mode 100644
index 0000000000..b13b881737
--- /dev/null
+++ b/packages/system/backupstrategy-controller/tests/restore_rbac_test.yaml
@@ -0,0 +1,23 @@
+suite: RBAC of the Velero restore preparation
+
+# prepareForRestore reads every DataVolume back after deleting it and holds
+# the Velero Restore until it is gone. The read goes through the dynamic
+# client, which the Go unit tests run with no authorization, so a missing verb
+# only shows up on a cluster, where it fails every in-place VM restore.
+
+templates:
+  - templates/rbac.yaml
+
+release:
+  name: backupstrategy-controller
+  namespace: cozy-backup-controller
+
+tests:
+  - it: "ClusterRole can read and delete DataVolumes"
+    asserts:
+      - contains:
+          path: rules
+          content:
+            apiGroups: ["cdi.kubevirt.io"]
+            resources: ["datavolumes"]
+            verbs: ["get", "delete"]
diff --git a/packages/system/backupstrategy-controller/tests/strategy_cnpg_test.yaml b/packages/system/backupstrategy-controller/tests/strategy_cnpg_test.yaml
new file mode 100644
index 0000000000..bff1eb5975
--- /dev/null
+++ b/packages/system/backupstrategy-controller/tests/strategy_cnpg_test.yaml
@@ -0,0 +1,31 @@
+suite: CNPG strategy — per-instance WAL-archive prefix
+
+# The backup-controller renders these strings against the Postgres app, so the
+# assertions pin the template text itself. TestRenderCNPGTemplate_DefaultServerName
+# and TestReconcileCNPG_RecreatedAppArchivesUnderAFreshPrefix in
+# internal/backupcontroller exercise the same serverName string.
+
+templates:
+  - templates/strategy-cnpg-default.yaml
+
+release:
+  name: t
+  namespace: cozy-backup-controller
+
+set:
+  backupStorage.bucketNameOverride: test-bucket
+
+tests:
+  - it: "serverName carries the app uid, guarded so an app without one renders no '<no value>'"
+    asserts:
+      - equal:
+          path: spec.template.serverName
+          value: "{{ .Application.metadata.namespace }}-{{ .Application.metadata.name }}{{ with .Application.metadata.uid }}-{{ . }}{{ end }}"
+
+  # The driver re-applies destinationPath on every BackupJob, so a change here
+  # splits every existing archive; only the serverName may vary per instance.
+  - it: "destinationPath stays keyed by namespace and name"
+    asserts:
+      - equal:
+          path: spec.template.barmanObjectStore.destinationPath
+          value: "s3://test-bucket/{{ .Application.metadata.namespace }}/{{ .Application.metadata.name }}/"
diff --git a/packages/system/backupstrategy-controller/tests/strategy_redis_test.yaml b/packages/system/backupstrategy-controller/tests/strategy_redis_test.yaml
new file mode 100644
index 0000000000..24cbe33439
--- /dev/null
+++ b/packages/system/backupstrategy-controller/tests/strategy_redis_test.yaml
@@ -0,0 +1,94 @@
+suite: Redis strategy — CA/TLS wiring, deadline, and fail-loud S3 refs
+
+# These pin the Redis Strategy CR's render-time LOGIC — the decisions the chart
+# makes, not the script text (whose contract is the backup/restore roundtrip
+# e2e). The load-bearing one is TLS: the default must not skip verification, an
+# opt-in must, and a private-CA Secret must be required rather than optional.
+
+templates:
+  - templates/strategy-redis-default.yaml
+
+release:
+  name: t
+  namespace: cozy-backup-controller
+
+set:
+  # a resolvable bucket name so the gated strategy renders at all
+  backupStorage.bucketNameOverride: test-bucket
+
+tests:
+  - it: "default: app CA mounted optionally (server-TLS auto-detect), no S3 CA, skip-verify off, deadline set, S3 refs optional"
+    asserts:
+      # The Redis app's CA is always mounted, but optionally: ca.crt lands only
+      # for a TLS-enabled app, and the script keys its server-TLS path off that
+      # file's presence. Its absence must not fail the Pod.
+      - contains:
+          path: spec.template.spec.volumes
+          content:
+            name: redis-ca
+            secret:
+              secretName: '{{ .Release.Prefix | default "redis-" }}{{ .Release.Name }}.ca-cert'
+              optional: true
+      - contains:
+          path: spec.template.spec.containers[0].volumeMounts
+          content:
+            name: redis-ca
+            mountPath: /etc/redis-ca
+            readOnly: true
+      # No S3-endpoint CA volume unless endpointCASecretName is set.
+      - notContains:
+          path: spec.template.spec.volumes
+          content:
+            name: s3-ca
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: S3_INSECURE_SKIP_VERIFY
+            value: "false"
+      - equal:
+          path: spec.template.spec.activeDeadlineSeconds
+          value: 3600
+      # Every S3 coordinate ref is optional so a missing key fails the script
+      # loudly instead of wedging the Pod in CreateContainerConfigError.
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: S3_ENDPOINT
+            valueFrom:
+              secretKeyRef:
+                name: cozy-backups-creds
+                key: endpoint
+                optional: true
+
+  - it: "endpointCASecretName set: CA volume mounted at /etc/s3-ca, optional so a missing Secret does not wedge the Pod"
+    set:
+      backupStorage.endpointCASecretName: my-s3-ca
+    asserts:
+      # Optional, because nothing projects this Secret into the app namespace:
+      # a required mount would wedge the Pod on FailedMount (never a Failed Job)
+      # until the deadline when the admin has not created it. A missing ca.crt
+      # falls through to the system CA store and fails the handshake fast; it
+      # does not skip verification.
+      - contains:
+          path: spec.template.spec.volumes
+          content:
+            name: s3-ca
+            secret:
+              secretName: my-s3-ca
+              optional: true
+      - contains:
+          path: spec.template.spec.containers[0].volumeMounts
+          content:
+            name: s3-ca
+            mountPath: /etc/s3-ca
+            readOnly: true
+
+  - it: "insecureSkipTLSVerify=true is threaded to the Pod as an explicit opt-in"
+    set:
+      backupStorage.insecureSkipTLSVerify: true
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: S3_INSECURE_SKIP_VERIFY
+            value: "true"
diff --git a/packages/system/backupstrategy-controller/values.yaml b/packages/system/backupstrategy-controller/values.yaml
index 1cb5c8aa73..6cf39c65a8 100644
--- a/packages/system/backupstrategy-controller/values.yaml
+++ b/packages/system/backupstrategy-controller/values.yaml
@@ -1,14 +1,49 @@
 backupStrategyController:
-  image: "ghcr.io/cozystack/cozystack/backupstrategy-controller:v1.4.0-rc.2@sha256:dd5533d4bbb3e5f3b6bdd3499518fba270abbf183b252cc698168114851e7eae"
-  # chBackupClientImage is the image rendered into the Altinity strategy
-  # Pod: it drives clickhouse-backup's HTTP API via curl + jq. We reuse
-  # platform-migrations (already pre-built and digested by release CI in
-  # packages/core/platform/values.yaml) because it bundles curl + jq +
-  # ca-certificates — avoids shipping a one-binary tiny image whose tag
-  # would have to be re-digested on every release. Bumping the
-  # platform-migrations version requires updating BOTH this value and
-  # packages/core/platform/values.yaml so they remain in lockstep.
-  chBackupClientImage: "ghcr.io/cozystack/cozystack/platform-migrations:v1.4.0-rc.2@sha256:17390197a9b11d76a8dd1b24c6d1512adb7d3226b28b5bcba8551b14b1ec4be0"
+  image: "ghcr.io/cozystack/cozystack/backupstrategy-controller:v1.6.0@sha256:e8bf0521d1d1d8b90ebe66e9013010887033ba2653901799d57f2df47c9d879e"
+  # chBackupClientImage is rendered into the Altinity strategy Pod, which drives
+  # clickhouse-backup's HTTP API with curl + jq. rabbitmqBackupClientImage is
+  # rendered into the RabbitMQ strategy Pod, which calls the management API and
+  # moves the definitions export to S3 with curl --aws-sigv4. Both run the
+  # images/backup-http-client/ image (alpine + curl + jq + ca-certificates) and
+  # must hold the same ref: one repository pinned at two digests fails the
+  # release promotion (hack/image-pin-consistency.bats). They are separate keys
+  # so either strategy can move to its own image later.
+  # DO NOT hand-edit: `make image` stamps both.
+  chBackupClientImage: "ghcr.io/cozystack/cozystack/backup-http-client:v1.6.0"
+  rabbitmqBackupClientImage: "ghcr.io/cozystack/cozystack/backup-http-client:v1.6.0"
+  # redisBackupClientImage is rendered into the Redis strategy Pod. The
+  # spotahome operator ships no backup CRD, so the strategy runs a one-shot Job
+  # that dumps an RDB snapshot to S3 and, on restore, loads it into a throwaway
+  # redis to emit a faithful replay stream. It ships its own image (redis 8 +
+  # curl) built from images/redis-backup/; `make image` re-digests this value.
+  redisBackupClientImage: "ghcr.io/cozystack/cozystack/redis-backup:v1.6.0"
+  # redisBackupActiveDeadlineSeconds bounds one backup/restore Job so a run that
+  # wedges (e.g. a --rdb dump blocking on a stalled master) becomes a Failed Job
+  # the driver reports, rather than a Running BackupJob a cron Plan stacks behind.
+  # The driver promotes this to the Job's activeDeadlineSeconds, so it bounds the
+  # whole run across retries, not each Pod attempt separately.
+  redisBackupActiveDeadlineSeconds: 3600
+  # redisBackupResources sizes the Redis strategy Pod. Restore is the demanding
+  # side: the throwaway loader holds the whole dataset in memory and writes the
+  # RDB plus its AOF rewrite to ephemeral storage, so a large Redis needs memory
+  # and ephemeral-storage well above the backup's. Raise these for tenants with
+  # large instances; the defaults suit small-to-medium ones.
+  redisBackupResources:
+    requests:
+      cpu: 10m
+      memory: 64Mi
+      ephemeral-storage: 256Mi
+    limits:
+      cpu: "1"
+      memory: 1Gi
+      ephemeral-storage: 4Gi
+  # The Kafka metadata strategy carries no client image here: unlike the Altinity
+  # and RabbitMQ drivers, which need only curl (plus jq for Altinity), its driver
+  # runs the Kafka Admin-API CLI (kafka-topics / kafka-configs), which only the
+  # Strimzi broker image ships. So the controller resolves the image from
+  # the target Kafka broker at reconcile time (strategy-kafka-default.yaml renders
+  # the container image as the "{{ .ClientImage }}" placeholder), and records it on
+  # the Backup so cleanup can reuse it once the broker is gone. No pin to drift.
   replicas: 2
   debug: false
   metrics:
@@ -47,11 +82,26 @@ backupStorage:
   # name independent of .bucketName above, and the BucketClaim status
   # is the only authoritative source.
   bucketNameOverride: ""
-  # endpoint is wired into every default Strategy CR at chart-render time.
-  # Switching to an https:// URL silently enables TLS in the MariaDB
-  # strategy (tls.enabled is computed from the scheme). Make sure the CA
-  # bundle is reachable to the operator (mariadb's tls.caSecretKeyRef, the
-  # FDB pod ca-cert volume, Velero's BSL caCert field) before flipping it.
+  # endpoint is the S3 endpoint URL shared by every default Strategy CR, the
+  # Velero BSL and the controller Deployment. For a provisioned bucket
+  # (provisionBucket: true, the default) it is NOT used verbatim: the
+  # "backupstrategy-controller.endpoint" helper derives the real endpoint from
+  # the COSI bucket's system credentials Secret (backupStorage.systemSecretName)
+  # and forces https://, because Cozystack's SeaweedFS runs with
+  # enableSecurity=true and serves TLS on :8333 behind the self-signed
+  # "SeaweedFS CA". The COSI-advertised endpoint is the external S3 ingress
+  # (ACME cert), which every consumer can verify — unlike the in-cluster
+  # service, whose CA is not plumbed to the backup operators and which the Etcd
+  # Strategy's S3 schema (no caCert field) cannot target at all.
+  #
+  # This value is the FALLBACK, used only when the derivation cannot run:
+  #   - provisionBucket: false (external S3) — set it to your S3 endpoint,
+  #     scheme included; it is used verbatim (the MariaDB/FDB strategies compute
+  #     their secure flag from the scheme, so https:// enables TLS there — make
+  #     the CA bundle reachable to those operators before pointing at a
+  #     self-signed external endpoint);
+  #   - offline `helm template` / unit renders and the pre-reconcile first
+  #     install, where the Secret lookup returns nothing.
   endpoint: http://seaweedfs-s3.tenant-root.svc.cozy.local:8333
   # region is re-projected into cozy-backups-creds on the next reconcile
   # (1-minute tick for system namespaces, on-demand for tenant namespaces).
@@ -70,12 +120,59 @@ backupStorage:
   # tolerates the raw COSI Secret format (single BucketInfo JSON key) so a
   # cluster that wires an external S3 Secret manually still works.
   systemSecretName: bucket-cozy-backups-system-credentials
+  # endpointCASecretName — optional Secret (key ca.crt) in the app namespace
+  # that the Redis strategy Pod trusts when the S3 endpoint is https with a
+  # self-signed cert (e.g. SeaweedFS). Empty by default: the projected endpoint
+  # is always https and the platform bucket's ACME cert verifies against the
+  # image's system CA store unaided, so no CA override is needed. Set it only for
+  # a private-CA endpoint. When set, the Secret is required — a missing one fails
+  # the Pod loudly rather than silently skipping verification.
+  endpointCASecretName: ""
+  # insecureSkipTLSVerify disables S3 certificate verification (curl -k). Off by
+  # default and an explicit opt-in, never a fallback: leaving it false keeps an
+  # untrusted-cert endpoint failing closed instead of silently insecure. Prefer
+  # endpointCASecretName for a self-signed endpoint.
+  insecureSkipTLSVerify: false
   # systemNamespaces — namespaces where the controller eagerly projects
   # cozy-backups-creds so long-lived static references (Velero BSL, FDB
   # operator deployments) keep finding the Secret without on-demand
   # rendering. Tenants are projected lazily during BackupJob reconcile.
   systemNamespaces:
     - cozy-velero
+  # reconcileDefaultObjects enables the controller's DefaultObjectsGate.
+  #
+  # The Strategy CRs and the Velero BSL below are Helm-templated behind a
+  # `lookup` of the BucketClaim THIS chart creates, because the S3 bucket
+  # name is assigned by the COSI driver (bucket-<claim-UID>) and cannot be
+  # computed at render time. On a fresh install the lookup is empty and those
+  # templates render nothing — and helm-controller does not re-render a
+  # release whose chart and values did not change (drift detection is off on
+  # operator-generated HelmReleases), so the skip is PERMANENT. Clusters have
+  # run for months with only the BackupClass present and no Strategy CRs at
+  # all; recovery needed a hand-stamped reconcile.fluxcd.io/forceAt +
+  # requestedAt, because a plain reconcile request does not re-render.
+  #
+  # The systemSecretName Secret above sits one release earlier in the same
+  # trap: packages/system/bucket/templates/user-credentials.yaml renders it
+  # behind a `lookup` of the COSI Secret, and skips it just as permanently.
+  # Without it the projector has no source at all, so nothing downstream can
+  # resolve — and neither can this gate, which reads the bucket name from it.
+  #
+  # With this enabled the controller repairs both, in order: while the
+  # credentials Secret is missing it forces the bucket's <bucket>-system
+  # release; once the bucket name resolves it checks that every object
+  # cozy-default routes to exists and forces THIS release when any is
+  # missing. Both are throttled, independently, and a no-op in the steady
+  # state. A suspended release is skipped rather than re-stamped forever. The
+  # gate does NOT create the objects itself: their bodies are values-driven
+  # and Helm stays their single owner.
+  #
+  # Turn this off only if you manage the default Strategy CRs out of band and
+  # accept that a missed install-time render is never repaired. Watch
+  # cozystack_backup_default_objects_missing (paired with
+  # cozystack_backup_default_objects_check_errors_total, which marks the
+  # gauge stale) if you do.
+  reconcileDefaultObjects: true
 # velero — BSL rendering. The cozy-default BackupStorageLocation is
 # created in cozy-velero by templates/velero-bsl.yaml so endpoint/bucket/
 # region come from the same backupStorage block used by Strategy CRs and
@@ -87,12 +184,17 @@ backupStorage:
 # Velero CRDs are guaranteed to exist by the time this chart installs.
 # The BSL template additionally gates itself on a populated BucketClaim
 # status via the bucketName helper, so on a bootstrap install the BSL
-# materialises only after the platform Bucket reconciles. Setting this
+# materialises only after the platform Bucket reconciles AND the
+# DefaultObjectsGate has forced a real Helm upgrade (an interval reconcile
+# alone does not re-render). Setting this
 # to false is an explicit opt-out for clusters that disable VM backups
-# entirely and want to avoid the cluster-default BSL — in that case the
-# cozy-default-velero-vminstance / -vmdisk strategy CRs still ship but
-# their `storageLocation: cozy-default` reference will not resolve, so
-# VM BackupJobs against cozy-default will fail.
+# entirely and want to avoid the cluster-default BSL. In that case the
+# cozy-default-velero-vminstance / -vmdisk Strategy CRs are gated off the
+# same flag and are NOT rendered either, so the DefaultObjectsGate does
+# not expect them (it would otherwise force a Helm upgrade forever against
+# a render that can never produce them). VM BackupJobs against cozy-default
+# still fail, because the BackupClass keeps routing VMInstance / VMDisk to
+# those absent strategies.
 velero:
   bslEnabled: true
   namespace: cozy-velero
diff --git a/packages/system/bucket-rd/cozyrds/bucket.yaml b/packages/system/bucket-rd/cozyrds/bucket.yaml
index 7eab56b640..f75c736bdb 100644
--- a/packages/system/bucket-rd/cozyrds/bucket.yaml
+++ b/packages/system/bucket-rd/cozyrds/bucket.yaml
@@ -8,7 +8,7 @@ spec:
     plural: buckets
     singular: bucket
     openAPISchema: |-
-      {"title":"Chart Values","type":"object","properties":{"locking":{"description":"Provisions bucket from the `-lock` BucketClass (with object lock enabled).","type":"boolean","default":false},"storagePool":{"description":"Selects a specific BucketClass by storage pool name.","type":"string","default":""},"users":{"description":"Users configuration map.","type":"object","default":{},"additionalProperties":{"type":"object","properties":{"readonly":{"description":"Whether the user has read-only access.","type":"boolean"}}}}}}
+      {"title":"Chart Values","type":"object","properties":{"locking":{"description":"Provisions bucket from the `-lock` BucketClass (with object lock enabled).","type":"boolean","default":false},"storagePool":{"description":"Selects a specific BucketClass by storage pool name.","type":"string","default":"","x-cozystack-options":{"source":"storagepool"}},"ui":{"description":"Deploys the web UI (s3manager) with its Service and its Ingress or HTTPRoute at `<bucket>.<tenant host>`. Set to `false` to run the bucket without them.","type":"boolean","default":true},"users":{"description":"Users configuration map.","type":"object","default":{},"additionalProperties":{"type":"object","properties":{"readonly":{"description":"Whether the user has read-only access.","type":"boolean"}}}}}}
   release:
     prefix: bucket-
     labels:
@@ -26,7 +26,7 @@ spec:
     tags:
       - storage
     icon: PHN2ZyB3aWR0aD0iMTQ0IiBoZWlnaHQ9IjE0NCIgdmlld0JveD0iMCAwIDE0NCAxNDQiIGZpbGw9Im5vbmUiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+CjxyZWN0IHdpZHRoPSIxNDQiIGhlaWdodD0iMTQ0IiByeD0iMjQiIGZpbGw9InVybCgjcGFpbnQwX2xpbmVhcl82ODNfMzA5MSkiLz4KPHBhdGggZmlsbC1ydWxlPSJldmVub2RkIiBjbGlwLXJ1bGU9ImV2ZW5vZGQiIGQ9Ik03MiAzMC4xNjQxTDExNy45ODMgMzYuNzc4OVY0MC42NzM5QzExNy45ODMgNDYuNDY1MyA5Ny4zODYyIDUxLjEzMzIgNzEuOTgyNyA1MS4xMzMyQzQ2LjU3OTIgNTEuMTMzMiAyNiA0Ni40NjUzIDI2IDQwLjY3MzlWMzYuNDQzMUw3MiAzMC4xNjQxWk03MiA1OC4yNjc4QzkxLjIwODQgNTguMjY3OCAxMDcuNjU4IDU1LjU5ODYgMTE0LjU0NyA1MS44MDQ4TDExNi44MDMgNDguMTExTDExNy43MjMgNDQuNzUzVjQ4LjkxNzFMMTAyLjY3OSAxMTEuMDMzQzEwMi42NzkgMTE0Ljg5NSA4OC45NTMzIDExOCA3Mi4wMTcyIDExOEM1NS4wODEyIDExOCA0MS4zNzQzIDExNC44OTUgNDEuMzc0MyAxMTEuMDMzTDI2LjMzIDQ4LjkxNzFWNDQuODM2OUwyOS44MDA3IDUxLjkzODJDMzYuNzA2NSA1NS42NjUzIDUyLjk5OTcgNTguMjY3OCA3MiA1OC4yNjc4WiIgZmlsbD0iIzhDMzEyMyIvPgo8cGF0aCBmaWxsLXJ1bGU9ImV2ZW5vZGQiIGNsaXAtcnVsZT0iZXZlbm9kZCIgZD0iTTcyLjAwMDMgMjZDOTcuNDAzOCAyNiAxMTggMzAuNjgzOSAxMTggMzYuNDQyQzExOCA0Mi4yIDk3LjM4NjYgNDYuODUwNyA3Mi4wMDAzIDQ2Ljg1MDdDNDYuNjE0MSA0Ni44NTA3IDI2LjAxNzYgNDIuMjM0NSAyNi4wMTc2IDM2LjQ0MkMyNi4wMTc2IDMwLjY0OTQgNDYuNTk2OCAyNiA3Mi4wMDAzIDI2Wk03Mi4wMDAzIDU0LjEwMzdDOTUuNjg1NyA1NC4xMDM3IDExNS4xNzIgNTAuMDU4IDExNy43MDYgNDQuODE5N0wxMDIuNjYyIDEwNi45MzdDMTAyLjY2MiAxMTAuNzk5IDg4LjkzNjQgMTEzLjkwNSA3Mi4wMDAzIDExMy45MDVDNTUuMDY0MyAxMTMuOTA1IDQxLjMzOSAxMTAuODE2IDQxLjMzOSAxMDYuOTU0TDI2LjI5NTkgNDQuODM3QzI4Ljg0NjYgNTAuMDU4IDQ4LjMzMzMgNTQuMTAzNyA3Mi4wMDAzIDU0LjEwMzdaIiBmaWxsPSIjRTA1MjQzIi8+CjxwYXRoIGZpbGwtcnVsZT0iZXZlbm9kZCIgY2xpcC1ydWxlPSJldmVub2RkIiBkPSJNNjEuMTcyNSA2MC4wMjkzSDgxLjA5MjhWNzkuMTY3Nkg2MS4xNzI1VjYwLjAyOTNaTTQ1LjMzMDEgOTUuMzY4OEM0NS4zMzAxIDkwLjE0MiA0OS43MTA0IDg1LjkzNDIgNTUuMTUxMSA4NS45MzQyQzYwLjU5MTcgODUuOTM0MiA2NC45NzIxIDkwLjE0MiA2NC45NzIxIDk1LjM2ODhDNjQuOTcyMSAxMDAuNTk2IDYwLjU5MTcgMTA0LjgwMyA1NS4xNTExIDEwNC44MDNDNDkuNzEwNCAxMDQuODAzIDQ1LjMzMDEgMTAwLjU5NiA0NS4zMzAxIDk1LjM2ODhaTTk2LjQ0ODcgMTA0LjM2OEg3Ni43NzIyTDg2LjYxMDUgODYuNzczN0w5Ni40NDg3IDEwNC4zNjhaIiBmaWxsPSJ3aGl0ZSIvPgo8ZGVmcz4KPGxpbmVhckdyYWRpZW50IGlkPSJwYWludDBfbGluZWFyXzY4M18zMDkxIiB4MT0iMCIgeTE9IjAiIHgyPSIxNTEiIHkyPSIxODAiIGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIj4KPHN0b3Agc3RvcC1jb2xvcj0iI0ZGRjBFRSIvPgo8c3RvcCBvZmZzZXQ9IjEiIHN0b3AtY29sb3I9IiNFQzg4N0QiLz4KPC9saW5lYXJHcmFkaWVudD4KPC9kZWZzPgo8L3N2Zz4K
-    keysOrder: [["apiVersion"], ["appVersion"], ["kind"], ["metadata"], ["metadata", "name"], ["spec", "locking"], ["spec", "storagePool"], ["spec", "users"]]
+    keysOrder: [["apiVersion"], ["appVersion"], ["kind"], ["metadata"], ["metadata", "name"], ["spec", "locking"], ["spec", "storagePool"], ["spec", "ui"], ["spec", "users"]]
   secrets:
     exclude: []
     include:
diff --git a/packages/system/bucket/Makefile b/packages/system/bucket/Makefile
index ec218b644b..19ab32d4ec 100644
--- a/packages/system/bucket/Makefile
+++ b/packages/system/bucket/Makefile
@@ -8,13 +8,15 @@ include ../../../hack/package.mk
 update:
 	@echo Nothing to update
 
+test:
+	helm unittest .
+
 image: image-s3manager
 
 image-s3manager:
 	docker buildx build images/s3manager \
 		$(call image-tags,s3manager,$(S3MANAGER_TAG)) \
-		--cache-from type=registry,ref=$(REGISTRY)/s3manager:latest \
-		--cache-to type=inline \
+		$(call cache-args,s3manager) \
 		--metadata-file images/s3manager.json \
 		$(BUILDX_ARGS)
 	echo "$(REGISTRY)/s3manager:$(IMAGE_TAG)@$$(yq e '."containerimage.digest"' images/s3manager.json -o json -r)" \
diff --git a/packages/system/bucket/charts/cozy-lib b/packages/system/bucket/charts/cozy-lib
new file mode 120000
index 0000000000..e181350982
--- /dev/null
+++ b/packages/system/bucket/charts/cozy-lib
@@ -0,0 +1 @@
+../../../library/cozy-lib
\ No newline at end of file
diff --git a/packages/system/bucket/images/s3manager.tag b/packages/system/bucket/images/s3manager.tag
index 908b04990a..b5234c0e78 100644
--- a/packages/system/bucket/images/s3manager.tag
+++ b/packages/system/bucket/images/s3manager.tag
@@ -1 +1 @@
-ghcr.io/cozystack/cozystack/s3manager:v0.5.0@sha256:1f2f0885770b807cf65dc2ab590dfdc7586d57df3c74107c1b5a4f00574165a8
+ghcr.io/cozystack/cozystack/s3manager:v1.6.0@sha256:73665aaf7f5406b4a1e456d14060fe874e0ae2a436ba7fd3058fa73abff8a927
diff --git a/packages/system/bucket/images/s3manager/Dockerfile b/packages/system/bucket/images/s3manager/Dockerfile
index e97adf07b6..994519c00e 100644
--- a/packages/system/bucket/images/s3manager/Dockerfile
+++ b/packages/system/bucket/images/s3manager/Dockerfile
@@ -1,6 +1,7 @@
 # Source: https://github.com/cloudlena/s3manager/blob/main/Dockerfile
 
-FROM docker.io/library/golang:1 AS builder
+FROM --platform=$BUILDPLATFORM docker.io/library/golang:1.27@sha256:3680233e3204827fbdc66088528ae6d4b3d034f51d03a99d454f6de034888244 AS builder
+ARG GOPROXY
 
 ARG TARGETOS
 ARG TARGETARCH
@@ -10,9 +11,21 @@ RUN wget -O- https://github.com/cloudlena/s3manager/archive/9a7c8e446b422f8973b8
 ADD cozystack.patch /
 RUN git apply /cozystack.patch
 RUN go mod tidy
+
+# go build never compiles a _test.go, so nothing else runs the tests of the
+# packages the patch touches. Each package is tested from its own directory:
+# that finds the module it belongs to, and an empty list runs nothing.
+# The list is read into a variable first: a for loop drops the exit status
+# of a command substitution, so a patch git cannot read would leave the list
+# empty and the step green.
+RUN files=$(git apply --numstat /cozystack.patch) || exit 1; \
+    for dir in $(printf '%s\n' "$files" | cut -f3 | grep '\.go$' | xargs -r -n1 dirname | sort -u); do \
+      (cd "$dir" && go test .) || exit 1; \
+    done
+
 RUN GOOS=$TARGETOS GOARCH=$TARGETARCH CGO_ENABLED=0 go build -ldflags="-s -w" -a -installsuffix cgo -o bin/s3manager
 
-FROM docker.io/library/alpine:latest
+FROM docker.io/library/alpine:3.24@sha256:294b683cb724975bec92580e1e685676bd4b50bda910ddb8c51d4cabeaec77e6
 WORKDIR /usr/src/app
 RUN addgroup -S s3manager && adduser -S s3manager -G s3manager
 RUN apk add --no-cache \
diff --git a/packages/system/bucket/templates/deployment.yaml b/packages/system/bucket/templates/deployment.yaml
index 5c13cb2dc0..fa890fd26d 100644
--- a/packages/system/bucket/templates/deployment.yaml
+++ b/packages/system/bucket/templates/deployment.yaml
@@ -1,4 +1,6 @@
-{{- $endpoint := printf "s3.%s" .Values._namespace.host }}
+{{- if .Values.ui }}
+{{- $host := include "cozy-lib.ns-host-required" . }}
+{{- $endpoint := printf "s3.%s" $host }}
 {{- range $name, $user := .Values.users }}
   {{- $secretName := printf "%s-%s" $.Values.bucketName $name }}
   {{- $existingSecret := lookup "v1" "Secret" $.Release.Namespace $secretName }}
@@ -29,3 +31,11 @@ spec:
           value: {{ $endpoint | quote }}
         - name: SKIP_SSL_VERIFICATION
           value: "true"
+        resources:
+          limits:
+            cpu: 500m
+            memory: 512Mi
+          requests:
+            cpu: 100m
+            memory: 128Mi
+{{- end }}
diff --git a/packages/system/bucket/templates/httproute.yaml b/packages/system/bucket/templates/httproute.yaml
index 8e6fae5176..9031abeb31 100644
--- a/packages/system/bucket/templates/httproute.yaml
+++ b/packages/system/bucket/templates/httproute.yaml
@@ -1,4 +1,5 @@
-{{- $host := .Values._namespace.host }}
+{{- if .Values.ui }}
+{{- $host := include "cozy-lib.ns-host-required" . }}
 {{- $gateway := .Values._namespace.gateway | default "" }}
 {{- if $gateway }}
 apiVersion: gateway.networking.k8s.io/v1
@@ -18,3 +19,4 @@ spec:
     - name: {{ .Values.bucketName }}-ui
       port: 8080
 {{- end }}
+{{- end }}
diff --git a/packages/system/bucket/templates/ingress.yaml b/packages/system/bucket/templates/ingress.yaml
index c2d8064779..06dad564b3 100644
--- a/packages/system/bucket/templates/ingress.yaml
+++ b/packages/system/bucket/templates/ingress.yaml
@@ -1,8 +1,10 @@
-{{- $host := .Values._namespace.host }}
+{{- if .Values.ui }}
+{{- $host := include "cozy-lib.ns-host-required" . }}
 {{- $ingress := .Values._namespace.ingress }}
 {{- $gateway := .Values._namespace.gateway | default "" }}
 {{- $solver := (index .Values._cluster "solver") | default "http01" }}
 {{- $clusterIssuer := (index .Values._cluster "issuer-name") | default "letsencrypt-prod" }}
+{{- $wildcardSecret := (index .Values._cluster "wildcard-secret-name") | default "" }}
 {{- if not $gateway }}
 
 apiVersion: networking.k8s.io/v1
@@ -13,16 +15,24 @@ metadata:
     nginx.ingress.kubernetes.io/proxy-body-size: "0"
     nginx.ingress.kubernetes.io/proxy-read-timeout: "99999"
     nginx.ingress.kubernetes.io/proxy-send-timeout: "99999"
+    {{- /* Operator wildcard mode: nginx serves the default SSL cert, so skip per-host ACME. */}}
+    {{- if not $wildcardSecret }}
     {{- if eq $solver "http01" }}
     acme.cert-manager.io/http01-ingress-ingressclassname: {{ $ingress }}
     {{- end }}
     cert-manager.io/cluster-issuer: {{ $clusterIssuer }}
+    {{- end }}
 spec:
   ingressClassName: {{ $ingress }}
   tls:
     - hosts:
         - "{{ .Values.bucketName }}.{{ $host }}"
+      {{- /* Operator wildcard mode: no per-host secret — ingress-nginx falls
+             back to the default SSL certificate while the tls section keeps
+             the HTTP-to-HTTPS redirect enforced. */}}
+      {{- if not $wildcardSecret }}
       secretName: {{ .Values.bucketName }}-ui-tls
+      {{- end }}
   rules:
   - host: {{ .Values.bucketName }}.{{ $host }}
     http:
@@ -35,3 +45,4 @@ spec:
             port:
               number: 8080
 {{- end }}
+{{- end }}
diff --git a/packages/system/bucket/templates/service.yaml b/packages/system/bucket/templates/service.yaml
index dc9c67b25c..9452c2195a 100644
--- a/packages/system/bucket/templates/service.yaml
+++ b/packages/system/bucket/templates/service.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.ui }}
 apiVersion: v1
 kind: Service
 metadata:
@@ -10,3 +11,4 @@ spec:
       port: 8080
       targetPort: 8080
   type: ClusterIP
+{{- end }}
diff --git a/packages/system/bucket/templates/user-credentials.yaml b/packages/system/bucket/templates/user-credentials.yaml
index da65cf94a4..6c2a14bd10 100644
--- a/packages/system/bucket/templates/user-credentials.yaml
+++ b/packages/system/bucket/templates/user-credentials.yaml
@@ -1,3 +1,39 @@
+{{/*
+  The human-friendly per-user credentials Secret is derived from the COSI
+  Secret the objectstorage sidecar writes for the matching BucketAccess
+  (packages/apps/bucket/templates/bucketclaim.yaml). That Secret carries a
+  single BucketInfo JSON document with the driver-assigned bucket name and
+  the S3 keys — none of it is knowable at render time, so a `lookup` is
+  unavoidable here.
+
+  The skip below is NOT self-healing, contrary to what this file used to
+  imply. helm-controller does not re-render a release whose chart and values
+  did not change, and drift detection is off on operator-generated
+  HelmReleases, so a lookup that comes back empty at install time is skipped
+  PERMANENTLY: the Secret is never created, and every consumer that reads it
+  stays broken until somebody forces a real Helm upgrade
+  (reconcile.fluxcd.io/forceAt + requestedAt — a plain `flux reconcile` does
+  not re-render).
+
+  Failing the render instead is tempting and wrong. Helm cannot render a
+  partial set, so a `fail` inside this range aborts the WHOLE
+  <bucket>-system release — the other users' Secrets, and the bucket UI
+  Deployment/Service/Ingress/HTTPRoute with them. One declared user whose
+  BucketAccess never provisions (a misconfigured bucketAccessClassName, a
+  COSI failure) would then take down every other user of that bucket, and on
+  an already-installed release it would park it in Failed and block every
+  later upgrade, with no per-bucket way out.
+
+  So the repair lives outside the chart, where it is per-object and costs a
+  throttled annotation patch: backupstrategy-controller's DefaultObjectsGate
+  (internal/backupcontroller/default_objects_gate.go) forces this release
+  when the platform bucket's credentials Secret is absent. That covers the
+  cluster-breaking case — the cozy-backups Secret feeds the credentials
+  projector, hence every default BackupClass strategy, Velero, and migration
+  50. Tenant buckets keep the pre-existing behaviour; generalising the gate
+  to every bucket needs a controller that owns them and is tracked
+  separately.
+*/}}
 {{- range $name, $user := .Values.users }}
 {{- $secretName := printf "%s-%s" $.Values.bucketName $name }}
 {{- $existingSecret := lookup "v1" "Secret" $.Release.Namespace $secretName }}
diff --git a/packages/system/bucket/tests/host_guard_deployment_test.yaml b/packages/system/bucket/tests/host_guard_deployment_test.yaml
new file mode 100644
index 0000000000..1badd9e8b1
--- /dev/null
+++ b/packages/system/bucket/tests/host_guard_deployment_test.yaml
@@ -0,0 +1,29 @@
+suite: bucket deployment guards an empty apex in isolation
+templates:
+  - templates/deployment.yaml
+
+release:
+  name: bucket
+  namespace: tenant-root
+
+tests:
+  - it: fails when _namespace is injected with an empty host
+    set:
+      _namespace:
+        host: ""
+        ingress: tenant-root
+    asserts:
+      - failedTemplate:
+          errorMessage: "the tenant apex (_namespace.host) is empty and this app sets no host override, so its ingress hostname would be malformed. Set tenant.spec.host on this tenant, inherit it from a parent that has host set, or set this app's host value."
+
+  - it: renders the S3 endpoint from the apex when it is set
+    set:
+      _namespace:
+        host: example.org
+        ingress: tenant-root
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: ENDPOINT
+            value: s3.example.org
diff --git a/packages/system/bucket/tests/host_guard_httproute_test.yaml b/packages/system/bucket/tests/host_guard_httproute_test.yaml
new file mode 100644
index 0000000000..ae8d5d0951
--- /dev/null
+++ b/packages/system/bucket/tests/host_guard_httproute_test.yaml
@@ -0,0 +1,29 @@
+suite: bucket HTTPRoute guards an empty apex in isolation
+templates:
+  - templates/httproute.yaml
+
+release:
+  name: bucket
+  namespace: tenant-root
+
+tests:
+  - it: fails when _namespace is injected with an empty host
+    set:
+      _namespace:
+        host: ""
+        ingress: tenant-root
+        gateway: tenant-root
+    asserts:
+      - failedTemplate:
+          errorMessage: "the tenant apex (_namespace.host) is empty and this app sets no host override, so its ingress hostname would be malformed. Set tenant.spec.host on this tenant, inherit it from a parent that has host set, or set this app's host value."
+
+  - it: renders the HTTPRoute hostname from the apex when it is set
+    set:
+      _namespace:
+        host: example.org
+        ingress: tenant-root
+        gateway: tenant-root
+    asserts:
+      - equal:
+          path: spec.hostnames[0]
+          value: cozystack.example.org
diff --git a/packages/system/bucket/tests/host_guard_test.yaml b/packages/system/bucket/tests/host_guard_test.yaml
new file mode 100644
index 0000000000..f2d11c1c5f
--- /dev/null
+++ b/packages/system/bucket/tests/host_guard_test.yaml
@@ -0,0 +1,40 @@
+suite: bucket ingress fails on an empty apex
+
+templates:
+  - templates/ingress.yaml
+
+release:
+  name: bucket
+  namespace: tenant-root
+
+# The bucket Ingress host is <bucketName>.<_namespace.host>. This chart has no
+# per-app host override, so cozy-lib.ns-host-required requires the apex whenever
+# the Ingress renders (gated on an empty _namespace.gateway).
+
+tests:
+  - it: fails when the apex is empty
+    set:
+      _namespace:
+        host: ""
+        ingress: tenant-root
+        gateway: ""
+      _cluster:
+        issuer-name: letsencrypt-prod
+        solver: http01
+    asserts:
+      - failedTemplate:
+          errorMessage: "the tenant apex (_namespace.host) is empty and this app sets no host override, so its ingress hostname would be malformed. Set tenant.spec.host on this tenant, inherit it from a parent that has host set, or set this app's host value."
+
+  - it: renders the ingress when the apex is set
+    set:
+      _namespace:
+        host: example.org
+        ingress: tenant-root
+        gateway: ""
+      _cluster:
+        issuer-name: letsencrypt-prod
+        solver: http01
+    asserts:
+      - equal:
+          path: kind
+          value: Ingress
diff --git a/packages/system/bucket/tests/ingress_wildcard_test.yaml b/packages/system/bucket/tests/ingress_wildcard_test.yaml
new file mode 100644
index 0000000000..8f223bd66c
--- /dev/null
+++ b/packages/system/bucket/tests/ingress_wildcard_test.yaml
@@ -0,0 +1,82 @@
+suite: bucket ingress wildcard mode drops per-host ACME
+templates:
+  - templates/ingress.yaml
+
+release:
+  name: bucket
+  namespace: tenant-root
+
+# bucket gates its Ingress on an empty _namespace.gateway. In wildcard
+# mode the cert-manager + http01 annotations and the per-host tls
+# secretName are dropped (the tls section stays so the HTTPS redirect
+# keeps working against the default SSL certificate); the other nginx
+# annotations stay so the annotations map is never empty.
+
+tests:
+  - it: drops cert-manager annotation and tls secretName when wildcard secret is set
+    set:
+      _namespace:
+        host: example.org
+        ingress: tenant-root
+        gateway: ""
+      _cluster:
+        issuer-name: letsencrypt-prod
+        solver: http01
+        wildcard-secret-name: wildcard-tls
+    asserts:
+      - equal:
+          path: kind
+          value: Ingress
+      - notExists:
+          path: metadata.annotations["cert-manager.io/cluster-issuer"]
+      - exists:
+          path: spec.tls
+      - notExists:
+          path: spec.tls[0].secretName
+      - exists:
+          path: metadata.annotations["nginx.ingress.kubernetes.io/proxy-body-size"]
+
+  - it: keeps cert-manager annotation and tls secretName without wildcard secret
+    set:
+      _namespace:
+        host: example.org
+        ingress: tenant-root
+        gateway: ""
+      _cluster:
+        issuer-name: letsencrypt-prod
+        solver: http01
+    asserts:
+      - equal:
+          path: metadata.annotations["cert-manager.io/cluster-issuer"]
+          value: letsencrypt-prod
+      - exists:
+          path: spec.tls[0].secretName
+
+  # WS2 / #2400 child-tenant blast radius, pinned as a contract: the
+  # wildcard secret name rides _cluster, which packages/apps/tenant copies
+  # verbatim into every child tenant. A child inheriting the root ingress
+  # has nested service hosts (<svc>.<tenant>.<root-host>) that a
+  # single-label *.<root-host> does NOT cover, yet the service still drops
+  # its per-host cert and falls back to the root default certificate. This
+  # is the documented reason shared wildcard issuance is opt-in / off by
+  # default. Here _namespace.host is the child apex (alice.example.org),
+  # so the bucket host is two labels deep under the wildcard.
+  - it: nested child-tenant host drops per-host ACME when wildcard mode is active
+    set:
+      bucketName: data
+      _namespace:
+        host: alice.example.org
+        ingress: tenant-root
+        gateway: ""
+      _cluster:
+        issuer-name: letsencrypt-prod
+        solver: dns01
+        wildcard-secret-name: cozystack-wildcard-tls
+    asserts:
+      - equal:
+          path: spec.rules[0].host
+          value: data.alice.example.org
+      - notExists:
+          path: metadata.annotations["cert-manager.io/cluster-issuer"]
+      - notExists:
+          path: spec.tls[0].secretName
diff --git a/packages/system/bucket/tests/standalone_render_test.yaml b/packages/system/bucket/tests/standalone_render_test.yaml
new file mode 100644
index 0000000000..fbb55fd776
--- /dev/null
+++ b/packages/system/bucket/tests/standalone_render_test.yaml
@@ -0,0 +1,21 @@
+suite: bucket renders with no platform values injected
+release:
+  name: bucket
+  namespace: cozy-bucket
+
+# The platform injects _cluster and _namespace through the cozystack-values
+# Secret, so every case that sets them itself renders fine whether or not
+# values.yaml declares the keys. This case supplies neither. Drop the
+# _cluster declaration and the render dies on "index of untyped nil"; drop
+# the _namespace one and it dies on "nil pointer evaluating interface
+# {}.host". Both are what keep the chart renderable outside a cluster. No
+# suite-level `templates:` list here on purpose: it would narrow the render
+# to the listed files and let a later template reintroduce the same
+# breakage unseen.
+
+tests:
+  - it: still renders the ingress when _cluster and _namespace are absent
+    asserts:
+      - template: templates/ingress.yaml
+        hasDocuments:
+          count: 1
diff --git a/packages/system/bucket/tests/ui_toggle_test.yaml b/packages/system/bucket/tests/ui_toggle_test.yaml
new file mode 100644
index 0000000000..11b78ef2f6
--- /dev/null
+++ b/packages/system/bucket/tests/ui_toggle_test.yaml
@@ -0,0 +1,67 @@
+suite: bucket UI can be switched off
+templates:
+  - templates/deployment.yaml
+  - templates/service.yaml
+  - templates/ingress.yaml
+  - templates/httproute.yaml
+
+release:
+  name: bucket
+  namespace: tenant-root
+
+set:
+  _namespace:
+    host: example.org
+    ingress: tenant-root
+
+tests:
+  - it: renders the UI Deployment, Service and Ingress by default
+    asserts:
+      - template: templates/deployment.yaml
+        hasDocuments:
+          count: 1
+      - template: templates/service.yaml
+        hasDocuments:
+          count: 1
+      - template: templates/ingress.yaml
+        hasDocuments:
+          count: 1
+
+  - it: renders none of the UI objects behind an Ingress when ui is false
+    set:
+      ui: false
+    asserts:
+      - template: templates/deployment.yaml
+        hasDocuments:
+          count: 0
+      - template: templates/service.yaml
+        hasDocuments:
+          count: 0
+      - template: templates/ingress.yaml
+        hasDocuments:
+          count: 0
+
+  - it: renders no HTTPRoute behind a Gateway when ui is false
+    set:
+      ui: false
+      _namespace:
+        gateway: tenant-root
+    asserts:
+      - template: templates/httproute.yaml
+        hasDocuments:
+          count: 0
+
+  # The UI hostname is the only consumer of the tenant apex in this chart, so
+  # a bucket without it must not trip the empty-apex guard.
+  - it: does not require the tenant apex when ui is false
+    set:
+      ui: false
+      _namespace:
+        host: ""
+    asserts:
+      - template: templates/deployment.yaml
+        hasDocuments:
+          count: 0
+      - template: templates/ingress.yaml
+        hasDocuments:
+          count: 0
diff --git a/packages/system/bucket/tests/user_credentials_test.yaml b/packages/system/bucket/tests/user_credentials_test.yaml
new file mode 100644
index 0000000000..c0c4a16344
--- /dev/null
+++ b/packages/system/bucket/tests/user_credentials_test.yaml
@@ -0,0 +1,80 @@
+suite: an unresolvable user must not take the rest of the release down
+
+# The <bucket>-<user>-credentials Secret is derived from the COSI Secret the
+# objectstorage sidecar writes, which is only knowable through a `lookup`.
+# helm-unittest renders with no live cluster, so lookup always returns nil —
+# exactly the pre-reconcile install window these cases pin.
+#
+# The skip is not self-healing (helm-controller does not re-render an
+# unchanged release), and the repair for the platform bucket lives in
+# backupstrategy-controller's DefaultObjectsGate, which forces this release.
+#
+# What these cases guard is the shape of that decision: the render must stay
+# partial, never fatal. A `fail` here cannot be scoped to one user — Helm
+# renders all or nothing — so it would take the other users' Secrets and the
+# bucket UI down with it, and park an installed release in Failed with no
+# per-bucket way out.
+#
+# _namespace / _cluster are set in every case because helm-unittest renders
+# the whole chart for each one, not only the templates it asserts on: the
+# ingress template dereferences both and would abort the render otherwise.
+
+release:
+  name: bucket-cozy-backups
+  namespace: tenant-root
+
+set: &base
+  bucketName: bucket-cozy-backups
+  _namespace:
+    host: example.org
+    ingress: tenant-root
+    gateway: ""
+  _cluster:
+    issuer-name: letsencrypt-prod
+    solver: http01
+
+tests:
+  - it: "emits no Secret while a declared user's COSI Secret does not exist yet"
+    templates:
+      - templates/user-credentials.yaml
+    set:
+      <<: *base
+      users:
+        system:
+          readonly: false
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  - it: "no declared users: nothing to render"
+    templates:
+      - templates/user-credentials.yaml
+    set:
+      <<: *base
+      users: {}
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  # The regression guard. With every user unresolvable — the multi-user
+  # partial-failure case — the rest of the release must still render. If a
+  # `fail` is ever reintroduced in user-credentials.yaml, Helm aborts the
+  # whole chart and this case fails on the aborted render, not on an
+  # assertion.
+  - it: "the bucket UI still renders when no user's COSI Secret resolves"
+    templates:
+      - templates/service.yaml
+    set:
+      <<: *base
+      users:
+        system:
+          readonly: false
+        alice:
+          readonly: true
+    asserts:
+      - equal:
+          path: kind
+          value: Service
+      - equal:
+          path: metadata.name
+          value: bucket-cozy-backups-ui
diff --git a/packages/system/bucket/values.yaml b/packages/system/bucket/values.yaml
index 739c497724..4984413f89 100644
--- a/packages/system/bucket/values.yaml
+++ b/packages/system/bucket/values.yaml
@@ -1,2 +1,8 @@
+# Injected by the platform from the cozystack-values Secret. The empty
+# defaults keep the chart renderable on its own, outside a cluster.
+_cluster: {}
+_namespace: {}
+
 bucketName: "cozystack"
 users: {}
+ui: true
diff --git a/packages/system/capi-providers-bootstrap/Makefile b/packages/system/capi-providers-bootstrap/Makefile
index 54d8ca8b15..6fa6358835 100644
--- a/packages/system/capi-providers-bootstrap/Makefile
+++ b/packages/system/capi-providers-bootstrap/Makefile
@@ -2,3 +2,36 @@ export NAME=capi-providers-bootstrap
 export NAMESPACE=cozy-cluster-api
 
 include ../../../hack/package.mk
+
+.PHONY: update
+
+# Upstream Talos bootstrap provider (CABPT) release pinned by tag. Keep
+# in lockstep with templates/providers.yaml (BootstrapProvider spec.version)
+# and templates/configmaps.yaml (ConfigMap name) — clusterctl matches the
+# bundle by tag.
+CABPT_UPSTREAM_VERSION = v0.6.12
+
+# Refreshes files/bootstrap-components-talos.yaml + files/components-talos.gz
+# from upstream CABPT release artifacts at CABPT_UPSTREAM_VERSION with
+# patches/ applied (the cozystack-side rename of the default ServiceAccount
+# to cabpt-manager so capi-operator does not rewrite the SA namespace —
+# see PR #2610 for the full rationale). Mirrors the symmetric update
+# target in packages/system/capi-providers-cpprovider/Makefile.
+#
+# Run when bumping CABPT_UPSTREAM_VERSION or editing patches/. The
+# metadata-talos.yaml file is checked in as-is from upstream and is not
+# refreshed here (it changes far less often and a manual curl+diff is
+# enough when CABPT cuts a new release series).
+update:
+	@command -v patch >/dev/null || { echo "patch(1) required"; exit 1; }
+	rm -rf .update-tmp
+	mkdir .update-tmp
+	curl -sSL "https://github.com/siderolabs/cluster-api-bootstrap-provider-talos/releases/download/$(CABPT_UPSTREAM_VERSION)/bootstrap-components.yaml" \
+		-o .update-tmp/bootstrap-components.yaml
+	for p in patches/*.diff; do \
+		[ -e "$$p" ] || continue; \
+		(cd .update-tmp && patch bootstrap-components.yaml < ../$$p) || exit 1; \
+	done
+	mv .update-tmp/bootstrap-components.yaml files/bootstrap-components-talos.yaml
+	gzip -nc files/bootstrap-components-talos.yaml > files/components-talos.gz
+	rm -rf .update-tmp
diff --git a/packages/system/capi-providers-bootstrap/files/bootstrap-components-talos.yaml b/packages/system/capi-providers-bootstrap/files/bootstrap-components-talos.yaml
new file mode 100644
index 0000000000..adb7a4c87f
--- /dev/null
+++ b/packages/system/capi-providers-bootstrap/files/bootstrap-components-talos.yaml
@@ -0,0 +1,824 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  labels:
+    cluster.x-k8s.io/provider: bootstrap-talos
+  name: cabpt-system
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    cert-manager.io/inject-ca-from: cabpt-system/cabpt-serving-cert
+    controller-gen.kubebuilder.io/version: v0.17.0
+  labels:
+    cluster.x-k8s.io/provider: bootstrap-talos
+    cluster.x-k8s.io/v1alpha3: v1alpha3
+    cluster.x-k8s.io/v1alpha4: v1alpha3
+    cluster.x-k8s.io/v1beta1: v1alpha3
+  name: talosconfigs.bootstrap.cluster.x-k8s.io
+spec:
+  conversion:
+    strategy: Webhook
+    webhook:
+      clientConfig:
+        service:
+          name: cabpt-webhook-service
+          namespace: cabpt-system
+          path: /convert
+      conversionReviewVersions:
+      - v1
+      - v1beta1
+  group: bootstrap.cluster.x-k8s.io
+  names:
+    categories:
+    - cluster-api
+    kind: TalosConfig
+    listKind: TalosConfigList
+    plural: talosconfigs
+    singular: talosconfig
+  scope: Namespaced
+  versions:
+  - name: v1alpha2
+    schema:
+      openAPIV3Schema:
+        description: TalosConfig is the Schema for the talosconfigs API
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: TalosConfigSpec defines the desired state of TalosConfig
+            properties:
+              data:
+                type: string
+              generateType:
+                type: string
+            required:
+            - generateType
+            type: object
+          status:
+            description: TalosConfigStatus defines the observed state of TalosConfig
+            properties:
+              bootstrapData:
+                description: BootstrapData will be a slice of bootstrap data
+                format: byte
+                type: string
+              errorMessage:
+                description: ErrorMessage will be set on non-retryable errors
+                type: string
+              errorReason:
+                description: ErrorReason will be set on non-retryable errors
+                type: string
+              ready:
+                description: Ready indicates the BootstrapData field is ready to be
+                  consumed
+                type: boolean
+              talosConfig:
+                description: Talos config will be a string containing the config for
+                  download
+                type: string
+            type: object
+        type: object
+    served: true
+    storage: false
+    subresources:
+      status: {}
+  - name: v1alpha3
+    schema:
+      openAPIV3Schema:
+        description: TalosConfig is the Schema for the talosconfigs API
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: TalosConfigSpec defines the desired state of TalosConfig
+            properties:
+              configPatches:
+                items:
+                  properties:
+                    op:
+                      type: string
+                    path:
+                      type: string
+                    value:
+                      x-kubernetes-preserve-unknown-fields: true
+                  required:
+                  - op
+                  - path
+                  type: object
+                type: array
+              data:
+                type: string
+              generateType:
+                type: string
+              hostname:
+                description: Set hostname in the machine configuration to some value.
+                properties:
+                  source:
+                    description: |-
+                      Source of the hostname.
+
+                      Allowed values:
+                      "MachineName" (use linked Machine's Name).
+                      "InfrastructureName" (use linked Machine's infrastructure's name).
+                    type: string
+                type: object
+              strategicPatches:
+                description: Talos Linux machine configuration strategic merge patch
+                  list.
+                items:
+                  type: string
+                type: array
+              talosVersion:
+                type: string
+            required:
+            - generateType
+            type: object
+          status:
+            description: TalosConfigStatus defines the observed state of TalosConfig
+            properties:
+              conditions:
+                description: Conditions defines current service state of the TalosConfig.
+                items:
+                  description: Condition defines an observation of a Cluster API resource
+                    operational state.
+                  properties:
+                    lastTransitionTime:
+                      description: |-
+                        lastTransitionTime is the last time the condition transitioned from one status to another.
+                        This should be when the underlying condition changed. If that is not known, then using the time when
+                        the API field changed is acceptable.
+                      format: date-time
+                      type: string
+                    message:
+                      description: |-
+                        message is a human readable message indicating details about the transition.
+                        This field may be empty.
+                      maxLength: 10240
+                      minLength: 1
+                      type: string
+                    reason:
+                      description: |-
+                        reason is the reason for the condition's last transition in CamelCase.
+                        The specific API may choose whether or not this field is considered a guaranteed API.
+                        This field may be empty.
+                      maxLength: 256
+                      minLength: 1
+                      type: string
+                    severity:
+                      description: |-
+                        severity provides an explicit classification of Reason code, so the users or machines can immediately
+                        understand the current situation and act accordingly.
+                        The Severity field MUST be set only when Status=False.
+                      maxLength: 32
+                      type: string
+                    status:
+                      description: status of the condition, one of True, False, Unknown.
+                      type: string
+                    type:
+                      description: |-
+                        type of condition in CamelCase or in foo.example.com/CamelCase.
+                        Many .condition.type values are consistent across resources like Available, but because arbitrary conditions
+                        can be useful (see .node.status.conditions), the ability to deconflict is important.
+                      maxLength: 256
+                      minLength: 1
+                      type: string
+                  required:
+                  - lastTransitionTime
+                  - status
+                  - type
+                  type: object
+                type: array
+              dataSecretName:
+                description: DataSecretName is the name of the secret that stores
+                  the bootstrap data script.
+                type: string
+              failureMessage:
+                description: FailureMessage will be set on non-retryable errors
+                type: string
+              failureReason:
+                description: FailureReason will be set on non-retryable errors
+                type: string
+              observedGeneration:
+                description: ObservedGeneration is the latest generation observed
+                  by the controller.
+                format: int64
+                type: integer
+              ready:
+                description: Ready indicates the BootstrapData field is ready to be
+                  consumed
+                type: boolean
+              talosConfig:
+                description: |-
+                  Talos config will be a string containing the config for download.
+
+                  Deprecated: please use `<cluster>-talosconfig` secret.
+                type: string
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    cert-manager.io/inject-ca-from: cabpt-system/cabpt-serving-cert
+    controller-gen.kubebuilder.io/version: v0.17.0
+  labels:
+    cluster.x-k8s.io/provider: bootstrap-talos
+    cluster.x-k8s.io/v1alpha3: v1alpha3
+    cluster.x-k8s.io/v1alpha4: v1alpha3
+    cluster.x-k8s.io/v1beta1: v1alpha3
+  name: talosconfigtemplates.bootstrap.cluster.x-k8s.io
+spec:
+  conversion:
+    strategy: Webhook
+    webhook:
+      clientConfig:
+        service:
+          name: cabpt-webhook-service
+          namespace: cabpt-system
+          path: /convert
+      conversionReviewVersions:
+      - v1
+      - v1beta1
+  group: bootstrap.cluster.x-k8s.io
+  names:
+    categories:
+    - cluster-api
+    kind: TalosConfigTemplate
+    listKind: TalosConfigTemplateList
+    plural: talosconfigtemplates
+    singular: talosconfigtemplate
+  scope: Namespaced
+  versions:
+  - name: v1alpha2
+    schema:
+      openAPIV3Schema:
+        description: TalosConfigTemplate is the Schema for the talosconfigtemplates
+          API
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: TalosConfigTemplateSpec defines the desired state of TalosConfigTemplate
+            properties:
+              template:
+                description: TalosConfigTemplateResource defines the Template structure
+                properties:
+                  spec:
+                    description: TalosConfigSpec defines the desired state of TalosConfig
+                    properties:
+                      data:
+                        type: string
+                      generateType:
+                        type: string
+                    required:
+                    - generateType
+                    type: object
+                type: object
+            required:
+            - template
+            type: object
+        type: object
+    served: true
+    storage: false
+  - name: v1alpha3
+    schema:
+      openAPIV3Schema:
+        description: TalosConfigTemplate is the Schema for the talosconfigtemplates
+          API
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: TalosConfigTemplateSpec defines the desired state of TalosConfigTemplate
+            properties:
+              template:
+                description: TalosConfigTemplateResource defines the Template structure
+                properties:
+                  spec:
+                    description: TalosConfigSpec defines the desired state of TalosConfig
+                    properties:
+                      configPatches:
+                        items:
+                          properties:
+                            op:
+                              type: string
+                            path:
+                              type: string
+                            value:
+                              x-kubernetes-preserve-unknown-fields: true
+                          required:
+                          - op
+                          - path
+                          type: object
+                        type: array
+                      data:
+                        type: string
+                      generateType:
+                        type: string
+                      hostname:
+                        description: Set hostname in the machine configuration to
+                          some value.
+                        properties:
+                          source:
+                            description: |-
+                              Source of the hostname.
+
+                              Allowed values:
+                              "MachineName" (use linked Machine's Name).
+                              "InfrastructureName" (use linked Machine's infrastructure's name).
+                            type: string
+                        type: object
+                      strategicPatches:
+                        description: Talos Linux machine configuration strategic merge
+                          patch list.
+                        items:
+                          type: string
+                        type: array
+                      talosVersion:
+                        type: string
+                    required:
+                    - generateType
+                    type: object
+                type: object
+            required:
+            - template
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  labels:
+    cluster.x-k8s.io/provider: bootstrap-talos
+  name: cabpt-leader-election-role
+  namespace: cabpt-system
+rules:
+- apiGroups:
+  - ""
+  resources:
+  - configmaps
+  verbs:
+  - get
+  - list
+  - watch
+  - create
+  - update
+  - patch
+  - delete
+- apiGroups:
+  - ""
+  resources:
+  - configmaps/status
+  verbs:
+  - get
+  - update
+  - patch
+- apiGroups:
+  - ""
+  resources:
+  - events
+  verbs:
+  - create
+- apiGroups:
+  - coordination.k8s.io
+  resources:
+  - leases
+  verbs:
+  - get
+  - list
+  - watch
+  - create
+  - update
+  - patch
+  - delete
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  labels:
+    cluster.x-k8s.io/provider: bootstrap-talos
+  name: cabpt-manager-role
+rules:
+- apiGroups:
+  - ""
+  resources:
+  - secrets
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - bootstrap.cluster.x-k8s.io
+  resources:
+  - talosconfigs
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - bootstrap.cluster.x-k8s.io
+  resources:
+  - talosconfigs/status
+  verbs:
+  - get
+  - patch
+  - update
+- apiGroups:
+  - cluster.x-k8s.io
+  resources:
+  - clusters
+  - clusters/status
+  - machines
+  - machines/status
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - exp.cluster.x-k8s.io
+  resources:
+  - machinepools
+  - machinepools/status
+  verbs:
+  - get
+  - list
+  - watch
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  labels:
+    cluster.x-k8s.io/provider: bootstrap-talos
+  name: cabpt-proxy-role
+rules:
+- apiGroups:
+  - authentication.k8s.io
+  resources:
+  - tokenreviews
+  verbs:
+  - create
+- apiGroups:
+  - authorization.k8s.io
+  resources:
+  - subjectaccessreviews
+  verbs:
+  - create
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  labels:
+    cluster.x-k8s.io/provider: bootstrap-talos
+  name: cabpt-talosconfig-editor-role
+rules:
+- apiGroups:
+  - bootstrap.cluster.x-k8s.io
+  resources:
+  - talosconfigs
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - bootstrap.cluster.x-k8s.io
+  resources:
+  - talosconfigs/status
+  verbs:
+  - get
+  - patch
+  - update
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  labels:
+    cluster.x-k8s.io/provider: bootstrap-talos
+  name: cabpt-manager
+  namespace: cabpt-system
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  labels:
+    cluster.x-k8s.io/provider: bootstrap-talos
+  name: cabpt-leader-election-rolebinding
+  namespace: cabpt-system
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: cabpt-leader-election-role
+subjects:
+- kind: ServiceAccount
+  name: cabpt-manager
+  namespace: cabpt-system
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  labels:
+    cluster.x-k8s.io/provider: bootstrap-talos
+  name: cabpt-manager-rolebinding
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: cabpt-manager-role
+subjects:
+- kind: ServiceAccount
+  name: cabpt-manager
+  namespace: cabpt-system
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  labels:
+    cluster.x-k8s.io/provider: bootstrap-talos
+  name: cabpt-proxy-rolebinding
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: cabpt-proxy-role
+subjects:
+- kind: ServiceAccount
+  name: cabpt-manager
+  namespace: cabpt-system
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  labels:
+    cluster.x-k8s.io/provider: bootstrap-talos
+  name: cabpt-talosconfig-editor-rolebinding
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: cabpt-talosconfig-editor-role
+subjects:
+- kind: ServiceAccount
+  name: cabpt-manager
+  namespace: cabpt-system
+---
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    cluster.x-k8s.io/provider: bootstrap-talos
+    control-plane: controller-manager
+  name: cabpt-controller-manager-metrics-service
+  namespace: cabpt-system
+spec:
+  ports:
+  - name: https
+    port: 8443
+    targetPort: https
+  selector:
+    cluster.x-k8s.io/provider: bootstrap-talos
+    control-plane: controller-manager
+---
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    cluster.x-k8s.io/provider: bootstrap-talos
+  name: cabpt-webhook-service
+  namespace: cabpt-system
+spec:
+  ports:
+  - port: 443
+    targetPort: 9443
+  selector:
+    cluster.x-k8s.io/provider: bootstrap-talos
+    control-plane: controller-manager
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  labels:
+    cluster.x-k8s.io/provider: bootstrap-talos
+    control-plane: controller-manager
+  name: cabpt-controller-manager
+  namespace: cabpt-system
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      cluster.x-k8s.io/provider: bootstrap-talos
+      control-plane: controller-manager
+  template:
+    metadata:
+      labels:
+        cluster.x-k8s.io/provider: bootstrap-talos
+        control-plane: controller-manager
+    spec:
+      containers:
+      - args:
+        - --enable-leader-election
+        - --feature-gates=MachinePool=${EXP_MACHINE_POOL:=false}
+        - --diagnostics-address=${CAPI_DIAGNOSTICS_ADDRESS:=:8443}
+        - --insecure-diagnostics=${CAPI_INSECURE_DIAGNOSTICS:=false}
+        command:
+        - /manager
+        image: ghcr.io/siderolabs/cluster-api-talos-controller:v0.6.12
+        imagePullPolicy: Always
+        livenessProbe:
+          httpGet:
+            path: /healthz
+            port: healthz
+        name: manager
+        ports:
+        - containerPort: 9443
+          name: webhook-server
+          protocol: TCP
+        - containerPort: 9440
+          name: healthz
+          protocol: TCP
+        - containerPort: 8443
+          name: metrics
+          protocol: TCP
+        readinessProbe:
+          httpGet:
+            path: /readyz
+            port: healthz
+        resources:
+          limits:
+            cpu: 500m
+            memory: 500Mi
+          requests:
+            cpu: 100m
+            memory: 128Mi
+        securityContext:
+          allowPrivilegeEscalation: false
+          capabilities:
+            drop:
+            - ALL
+          privileged: false
+          runAsGroup: 65532
+          runAsUser: 65532
+        terminationMessagePolicy: FallbackToLogsOnError
+        volumeMounts:
+        - mountPath: /tmp/k8s-webhook-server/serving-certs
+          name: cert
+          readOnly: true
+      serviceAccountName: cabpt-manager
+      terminationGracePeriodSeconds: 10
+      volumes:
+      - name: cert
+        secret:
+          defaultMode: 420
+          secretName: cabpt-webhook-service-cert
+---
+apiVersion: cert-manager.io/v1
+kind: Certificate
+metadata:
+  labels:
+    cluster.x-k8s.io/provider: bootstrap-talos
+  name: cabpt-serving-cert
+  namespace: cabpt-system
+spec:
+  dnsNames:
+  - cabpt-webhook-service.cabpt-system.svc
+  - cabpt-webhook-service.cabpt-system.svc.cluster.local
+  issuerRef:
+    kind: Issuer
+    name: cabpt-selfsigned-issuer
+  secretName: cabpt-webhook-service-cert
+---
+apiVersion: cert-manager.io/v1
+kind: Issuer
+metadata:
+  labels:
+    cluster.x-k8s.io/provider: bootstrap-talos
+  name: cabpt-selfsigned-issuer
+  namespace: cabpt-system
+spec:
+  selfSigned: {}
+---
+apiVersion: admissionregistration.k8s.io/v1
+kind: ValidatingWebhookConfiguration
+metadata:
+  annotations:
+    cert-manager.io/inject-ca-from: cabpt-system/cabpt-serving-cert
+  labels:
+    cluster.x-k8s.io/provider: bootstrap-talos
+  name: cabpt-validating-webhook-configuration
+webhooks:
+- admissionReviewVersions:
+  - v1
+  clientConfig:
+    service:
+      name: cabpt-webhook-service
+      namespace: cabpt-system
+      path: /validate-bootstrap-cluster-x-k8s-io-v1alpha3-talosconfig
+  failurePolicy: Fail
+  name: vtalosconfig.cluster.x-k8s.io
+  rules:
+  - apiGroups:
+    - bootstrap.cluster.x-k8s.io
+    apiVersions:
+    - v1alpha3
+    operations:
+    - CREATE
+    - UPDATE
+    resources:
+    - talosconfigs
+  sideEffects: None
+- admissionReviewVersions:
+  - v1
+  clientConfig:
+    service:
+      name: cabpt-webhook-service
+      namespace: cabpt-system
+      path: /validate-bootstrap-cluster-x-k8s-io-v1alpha3-talosconfigtemplate
+  failurePolicy: Fail
+  name: vtalosconfigtemplate.cluster.x-k8s.io
+  rules:
+  - apiGroups:
+    - bootstrap.cluster.x-k8s.io
+    apiVersions:
+    - v1alpha3
+    operations:
+    - UPDATE
+    resources:
+    - talosconfigtemplates
+  sideEffects: None
diff --git a/packages/system/capi-providers-bootstrap/files/components-talos.gz b/packages/system/capi-providers-bootstrap/files/components-talos.gz
new file mode 100644
index 0000000000..99e4608a7e
Binary files /dev/null and b/packages/system/capi-providers-bootstrap/files/components-talos.gz differ
diff --git a/packages/system/capi-providers-bootstrap/files/metadata-talos.yaml b/packages/system/capi-providers-bootstrap/files/metadata-talos.yaml
new file mode 100644
index 0000000000..d67b3373e3
--- /dev/null
+++ b/packages/system/capi-providers-bootstrap/files/metadata-talos.yaml
@@ -0,0 +1,18 @@
+apiVersion: clusterctl.cluster.x-k8s.io/v1alpha3
+kind: Metadata
+releaseSeries:
+- major: 0
+  minor: 2
+  contract: v1alpha3
+- major: 0
+  minor: 3
+  contract: v1alpha3
+- major: 0
+  minor: 4
+  contract: v1alpha4
+- major: 0
+  minor: 5
+  contract: v1beta1
+- major: 0
+  minor: 6
+  contract: v1beta1
diff --git a/packages/system/capi-providers-bootstrap/patches/0001-rename-default-sa-to-cabpt-manager.diff b/packages/system/capi-providers-bootstrap/patches/0001-rename-default-sa-to-cabpt-manager.diff
new file mode 100644
index 0000000000..a213a1bf31
--- /dev/null
+++ b/packages/system/capi-providers-bootstrap/patches/0001-rename-default-sa-to-cabpt-manager.diff
@@ -0,0 +1,61 @@
+--- a/bootstrap-components.yaml
++++ b/bootstrap-components.yaml
+@@ -570,6 +570,14 @@
+   - patch
+   - update
+ ---
++apiVersion: v1
++kind: ServiceAccount
++metadata:
++  labels:
++    cluster.x-k8s.io/provider: bootstrap-talos
++  name: cabpt-manager
++  namespace: cabpt-system
++---
+ apiVersion: rbac.authorization.k8s.io/v1
+ kind: RoleBinding
+ metadata:
+@@ -583,7 +591,7 @@
+   name: cabpt-leader-election-role
+ subjects:
+ - kind: ServiceAccount
+-  name: default
++  name: cabpt-manager
+   namespace: cabpt-system
+ ---
+ apiVersion: rbac.authorization.k8s.io/v1
+@@ -598,7 +606,7 @@
+   name: cabpt-manager-role
+ subjects:
+ - kind: ServiceAccount
+-  name: default
++  name: cabpt-manager
+   namespace: cabpt-system
+ ---
+ apiVersion: rbac.authorization.k8s.io/v1
+@@ -613,7 +621,7 @@
+   name: cabpt-proxy-role
+ subjects:
+ - kind: ServiceAccount
+-  name: default
++  name: cabpt-manager
+   namespace: cabpt-system
+ ---
+ apiVersion: rbac.authorization.k8s.io/v1
+@@ -628,7 +636,7 @@
+   name: cabpt-talosconfig-editor-role
+ subjects:
+ - kind: ServiceAccount
+-  name: default
++  name: cabpt-manager
+   namespace: cabpt-system
+ ---
+ apiVersion: v1
+@@ -732,6 +740,7 @@
+         - mountPath: /tmp/k8s-webhook-server/serving-certs
+           name: cert
+           readOnly: true
++      serviceAccountName: cabpt-manager
+       terminationGracePeriodSeconds: 10
+       volumes:
+       - name: cert
diff --git a/packages/system/capi-providers-bootstrap/templates/configmaps.yaml b/packages/system/capi-providers-bootstrap/templates/configmaps.yaml
index 3eaeb2aa78..a3e2cd81f3 100644
--- a/packages/system/capi-providers-bootstrap/templates/configmaps.yaml
+++ b/packages/system/capi-providers-bootstrap/templates/configmaps.yaml
@@ -4,9 +4,24 @@ metadata:
   name: v1.10.1-bootstrap
   labels:
     bootstrap-components: cozy
+    bootstrap-provider: kubeadm
   annotations:
     provider.cluster.x-k8s.io/compressed: "true"
 binaryData:
   components: {{ .Files.Get "files/components.gz" | b64enc | quote }}
 data:
   metadata: {{ .Files.Get "files/metadata.yaml" | quote }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: v0.6.12-bootstrap-talos
+  labels:
+    bootstrap-components: cozy
+    bootstrap-provider: talos
+  annotations:
+    provider.cluster.x-k8s.io/compressed: "true"
+binaryData:
+  components: {{ .Files.Get "files/components-talos.gz" | b64enc | quote }}
+data:
+  metadata: {{ .Files.Get "files/metadata-talos.yaml" | quote }}
diff --git a/packages/system/capi-providers-bootstrap/templates/providers.yaml b/packages/system/capi-providers-bootstrap/templates/providers.yaml
index 5b741b3b55..3574f0f056 100644
--- a/packages/system/capi-providers-bootstrap/templates/providers.yaml
+++ b/packages/system/capi-providers-bootstrap/templates/providers.yaml
@@ -9,6 +9,7 @@ spec:
     selector:
       matchLabels:
         bootstrap-components: cozy
+        bootstrap-provider: kubeadm
   deployment:
     containers:
     - name: manager
@@ -19,3 +20,16 @@ spec:
         requests:
           cpu: 10m
           memory: 64Mi
+---
+apiVersion: operator.cluster.x-k8s.io/v1alpha2
+kind: BootstrapProvider
+metadata:
+  name: talos
+spec:
+  # https://github.com/siderolabs/cluster-api-bootstrap-provider-talos
+  version: v0.6.12-bootstrap-talos
+  fetchConfig:
+    selector:
+      matchLabels:
+        bootstrap-components: cozy
+        bootstrap-provider: talos
diff --git a/packages/system/capi-providers-core/.helmignore b/packages/system/capi-providers-core/.helmignore
index 7a69e7e1db..aba9a295fe 100644
--- a/packages/system/capi-providers-core/.helmignore
+++ b/packages/system/capi-providers-core/.helmignore
@@ -1 +1 @@
-files/.*-components.yaml
+files/*-components.yaml
diff --git a/packages/system/capi-providers-core/files/components.gz b/packages/system/capi-providers-core/files/components.gz
index 438087eb66..bf045689aa 100644
Binary files a/packages/system/capi-providers-core/files/components.gz and b/packages/system/capi-providers-core/files/components.gz differ
diff --git a/packages/system/capi-providers-core/files/core-components.yaml b/packages/system/capi-providers-core/files/core-components.yaml
index 83cdfdd761..e82893bc42 100644
--- a/packages/system/capi-providers-core/files/core-components.yaml
+++ b/packages/system/capi-providers-core/files/core-components.yaml
@@ -15144,6 +15144,12 @@ spec:
               fieldPath: metadata.uid
         image: registry.k8s.io/cluster-api/cluster-api-controller:v1.10.1
         imagePullPolicy: IfNotPresent
+        startupProbe:
+          httpGet:
+            path: /healthz
+            port: healthz
+          failureThreshold: 30
+          periodSeconds: 10
         livenessProbe:
           httpGet:
             path: /healthz
diff --git a/packages/system/capi-providers-cpprovider/Makefile b/packages/system/capi-providers-cpprovider/Makefile
index caec8d9683..2f3c44d0d8 100644
--- a/packages/system/capi-providers-cpprovider/Makefile
+++ b/packages/system/capi-providers-cpprovider/Makefile
@@ -1,4 +1,56 @@
 export NAME=capi-providers-cpprovider
 export NAMESPACE=cozy-cluster-api
 
+include ../../../hack/common-envs.mk
 include ../../../hack/package.mk
+
+.PHONY: image update
+
+# Upstream tag pinned in the Dockerfile and reused below for the
+# kustomize re-render. Keep them in lockstep when bumping.
+UPSTREAM_VERSION = $(shell awk -F= '/^ARG VERSION=/{print $$2}' images/cluster-api-control-plane-provider-kamaji/Dockerfile)
+# Counter for cozystack-side respins on top of the same UPSTREAM_VERSION
+# (e.g. patches/ refresh, Go toolchain bump). Bump when something other
+# than UPSTREAM_VERSION changes.
+COZYSTACK_REV = 0
+IMAGE_BASE = $(REGISTRY)/cluster-api-control-plane-provider-kamaji
+# The image is versioned by its upstream component, so the stamped refs carry
+# this tag. It is pushed like any package's versioned tag, only under
+# PUBLISH_VERSIONED=1; every build pushes the build-unique IMAGE_TAG.
+COMPONENT_VERSION = $(UPSTREAM_VERSION)-cozystack.$(COZYSTACK_REV)
+
+image:
+	docker buildx build images/cluster-api-control-plane-provider-kamaji \
+		$(call image-tags,cluster-api-control-plane-provider-kamaji,$(COMPONENT_VERSION)) \
+		--cache-from type=registry,ref=$(IMAGE_BASE):latest \
+		$(if $(strip $(OCI_EXPORT_DIR)),,--cache-to type=inline) \
+		--metadata-file images/cluster-api-control-plane-provider-kamaji.json \
+		$(BUILDX_ARGS)
+	digest=$$(yq e '."containerimage.digest"' images/cluster-api-control-plane-provider-kamaji.json -o json -r); \
+	IMG="$(IMAGE_BASE):$(COMPONENT_VERSION)@$$digest"; \
+	echo "$$IMG" > images/cluster-api-control-plane-provider-kamaji.tag; \
+	sed -i.bak -E "s|image: ghcr\.io/.+/cluster-api-control-plane-provider-kamaji:[^[:space:]]+|image: $$IMG|" files/control-plane-components.yaml; \
+	rm files/control-plane-components.yaml.bak; \
+	gzip -nc files/control-plane-components.yaml > files/components.gz
+	rm -f images/cluster-api-control-plane-provider-kamaji.json
+
+# Refreshes files/control-plane-components.yaml + files/components.gz from
+# upstream sources at UPSTREAM_VERSION with patches/ applied, leaving the
+# manager image ref pointing at our mirror. Use when bumping UPSTREAM_VERSION
+# or editing patches/. Requires kustomize on PATH.
+update:
+	@command -v kustomize >/dev/null || { echo "kustomize required (https://kustomize.io)"; exit 1; }
+	rm -rf .update-tmp
+	mkdir .update-tmp
+	curl -sSL "https://github.com/clastix/cluster-api-control-plane-provider-kamaji/archive/refs/tags/$(UPSTREAM_VERSION).tar.gz" \
+		| tar -xzf - --strip=1 -C .update-tmp
+	cd .update-tmp && git init -q && git add . && git commit -qm init && \
+		for p in ../images/cluster-api-control-plane-provider-kamaji/patches/*.diff; do \
+			[ -e "$$p" ] || continue; \
+			git apply --recount "$$p"; \
+		done
+	cd .update-tmp/config/manager && \
+		kustomize edit set image controller=$(IMAGE_BASE):$(COMPONENT_VERSION)
+	kustomize build .update-tmp/config/default > files/control-plane-components.yaml
+	gzip -nc files/control-plane-components.yaml > files/components.gz
+	rm -rf .update-tmp
diff --git a/packages/system/capi-providers-cpprovider/files/components.gz b/packages/system/capi-providers-cpprovider/files/components.gz
index 930a26af89..b96f984eb0 100644
Binary files a/packages/system/capi-providers-cpprovider/files/components.gz and b/packages/system/capi-providers-cpprovider/files/components.gz differ
diff --git a/packages/system/capi-providers-cpprovider/files/control-plane-components.yaml b/packages/system/capi-providers-cpprovider/files/control-plane-components.yaml
index 64fc7d6d9c..bfd7e9128e 100644
--- a/packages/system/capi-providers-cpprovider/files/control-plane-components.yaml
+++ b/packages/system/capi-providers-cpprovider/files/control-plane-components.yaml
@@ -55,7 +55,8 @@ spec:
     name: v1alpha1
     schema:
       openAPIV3Schema:
-        description: KamajiControlPlane is the Schema for the kamajicontrolplanes API.
+        description: KamajiControlPlane is the Schema for the kamajicontrolplanes
+          API.
         properties:
           apiVersion:
             description: |-
@@ -78,7 +79,8 @@ spec:
             description: KamajiControlPlaneSpec defines the desired state of KamajiControlPlane.
             properties:
               addons:
-                description: The addons that must be managed by Kamaji, such as CoreDNS, kube-proxy, and konnectivity.
+                description: The addons that must be managed by Kamaji, such as CoreDNS,
+                  kube-proxy, and konnectivity.
                 properties:
                   coreDNS:
                     description: |-
@@ -104,7 +106,8 @@ spec:
                         type: string
                     type: object
                   konnectivity:
-                    description: Enables the Konnectivity addon in the Tenant Cluster, required if the worker nodes are in a different network.
+                    description: Enables the Konnectivity addon in the Tenant Cluster,
+                      required if the worker nodes are in a different network.
                     properties:
                       agent:
                         default:
@@ -130,11 +133,13 @@ spec:
                             type: boolean
                           image:
                             default: registry.k8s.io/kas-network-proxy/proxy-agent
-                            description: AgentImage defines the container image for Konnectivity's agent.
+                            description: AgentImage defines the container image for
+                              Konnectivity's agent.
                             type: string
                           mode:
                             default: DaemonSet
-                            description: 'Mode allows specifying the Agent deployment mode: Deployment, or DaemonSet (default).'
+                            description: 'Mode allows specifying the Agent deployment
+                              mode: Deployment, or DaemonSet (default).'
                             enum:
                             - DaemonSet
                             - Deployment
@@ -170,9 +175,10 @@ spec:
                                 operator:
                                   description: |-
                                     Operator represents a key's relationship to the value.
-                                    Valid operators are Exists and Equal. Defaults to Equal.
+                                    Valid operators are Exists, Equal, Lt, and Gt. Defaults to Equal.
                                     Exists is equivalent to wildcard for value, so that a pod can
                                     tolerate all taints of a particular category.
+                                    Lt and Gt perform numeric comparisons (requires feature gate TaintTolerationComparisonOperators).
                                   type: string
                                 tolerationSeconds:
                                   description: |-
@@ -198,8 +204,11 @@ spec:
                             type: string
                         type: object
                         x-kubernetes-validations:
-                        - message: replicas must be 0 when mode is DaemonSet, and greater than 0 when mode is Deployment
-                          rule: '!(self.mode == ''DaemonSet'' && has(self.replicas) && self.replicas != 0) && !(self.mode == ''Deployment'' && self.replicas == 0)'
+                        - message: replicas must be 0 (or unset) when mode is DaemonSet,
+                            and greater than 0 (or unset) when mode is Deployment
+                          rule: '!(self.mode == ''DaemonSet'' && has(self.replicas)
+                            && self.replicas != 0) && !(self.mode == ''Deployment''
+                            && has(self.replicas) && self.replicas == 0)'
                       server:
                         default:
                           image: registry.k8s.io/kas-network-proxy/proxy-server
@@ -216,14 +225,17 @@ spec:
                             type: array
                           image:
                             default: registry.k8s.io/kas-network-proxy/proxy-server
-                            description: Container image used by the Konnectivity server.
+                            description: Container image used by the Konnectivity
+                              server.
                             type: string
                           port:
-                            description: The port which Konnectivity server is listening to.
+                            description: The port which Konnectivity server is listening
+                              to.
                             format: int32
                             type: integer
                           resources:
-                            description: Resources define the amount of CPU and memory to allocate to the Konnectivity server.
+                            description: Resources define the amount of CPU and memory
+                              to allocate to the Konnectivity server.
                             properties:
                               claims:
                                 description: |-
@@ -235,7 +247,8 @@ spec:
 
                                   This field is immutable. It can only be set for containers.
                                 items:
-                                  description: ResourceClaim references one entry in PodSpec.ResourceClaims.
+                                  description: ResourceClaim references one entry
+                                    in PodSpec.ResourceClaims.
                                   properties:
                                     name:
                                       description: |-
@@ -357,7 +370,8 @@ spec:
                   type: string
                 type: array
               apiServer:
-                description: ControlPlaneComponent allows the customization for the given component of the control plane.
+                description: ControlPlaneComponent allows the customization for the
+                  given component of the control plane.
                 properties:
                   containerImageName:
                     description: |-
@@ -371,7 +385,8 @@ spec:
                     type: array
                   extraVolumeMounts:
                     items:
-                      description: VolumeMount describes a mounting of a Volume within a container.
+                      description: VolumeMount describes a mounting of a Volume within
+                        a container.
                       properties:
                         mountPath:
                           description: |-
@@ -431,8 +446,123 @@ spec:
                       - name
                       type: object
                     type: array
+                  probes:
+                    description: Probes defines per-probe-type configuration.
+                    properties:
+                      liveness:
+                        description: Liveness defines parameters for the liveness
+                          probe.
+                        properties:
+                          failureThreshold:
+                            description: FailureThreshold is the consecutive failure
+                              count required to consider the probe failed.
+                            format: int32
+                            minimum: 1
+                            type: integer
+                          initialDelaySeconds:
+                            description: InitialDelaySeconds is the number of seconds
+                              after the container has started before the probe is
+                              initiated.
+                            format: int32
+                            minimum: 0
+                            type: integer
+                          periodSeconds:
+                            description: PeriodSeconds is how often (in seconds) to
+                              perform the probe.
+                            format: int32
+                            minimum: 1
+                            type: integer
+                          successThreshold:
+                            description: |-
+                              SuccessThreshold is the minimum consecutive successes for the probe to be considered successful.
+                              Must be 1 for liveness and startup probes.
+                            format: int32
+                            minimum: 1
+                            type: integer
+                          timeoutSeconds:
+                            description: TimeoutSeconds is the number of seconds after
+                              which the probe times out.
+                            format: int32
+                            minimum: 1
+                            type: integer
+                        type: object
+                      readiness:
+                        description: Readiness defines parameters for the readiness
+                          probe.
+                        properties:
+                          failureThreshold:
+                            description: FailureThreshold is the consecutive failure
+                              count required to consider the probe failed.
+                            format: int32
+                            minimum: 1
+                            type: integer
+                          initialDelaySeconds:
+                            description: InitialDelaySeconds is the number of seconds
+                              after the container has started before the probe is
+                              initiated.
+                            format: int32
+                            minimum: 0
+                            type: integer
+                          periodSeconds:
+                            description: PeriodSeconds is how often (in seconds) to
+                              perform the probe.
+                            format: int32
+                            minimum: 1
+                            type: integer
+                          successThreshold:
+                            description: |-
+                              SuccessThreshold is the minimum consecutive successes for the probe to be considered successful.
+                              Must be 1 for liveness and startup probes.
+                            format: int32
+                            minimum: 1
+                            type: integer
+                          timeoutSeconds:
+                            description: TimeoutSeconds is the number of seconds after
+                              which the probe times out.
+                            format: int32
+                            minimum: 1
+                            type: integer
+                        type: object
+                      startup:
+                        description: Startup defines parameters for the startup probe.
+                        properties:
+                          failureThreshold:
+                            description: FailureThreshold is the consecutive failure
+                              count required to consider the probe failed.
+                            format: int32
+                            minimum: 1
+                            type: integer
+                          initialDelaySeconds:
+                            description: InitialDelaySeconds is the number of seconds
+                              after the container has started before the probe is
+                              initiated.
+                            format: int32
+                            minimum: 0
+                            type: integer
+                          periodSeconds:
+                            description: PeriodSeconds is how often (in seconds) to
+                              perform the probe.
+                            format: int32
+                            minimum: 1
+                            type: integer
+                          successThreshold:
+                            description: |-
+                              SuccessThreshold is the minimum consecutive successes for the probe to be considered successful.
+                              Must be 1 for liveness and startup probes.
+                            format: int32
+                            minimum: 1
+                            type: integer
+                          timeoutSeconds:
+                            description: TimeoutSeconds is the number of seconds after
+                              which the probe times out.
+                            format: int32
+                            minimum: 1
+                            type: integer
+                        type: object
+                    type: object
                   resources:
-                    description: ResourceRequirements describes the compute resource requirements.
+                    description: ResourceRequirements describes the compute resource
+                      requirements.
                     properties:
                       claims:
                         description: |-
@@ -492,7 +622,8 @@ spec:
                     type: object
                 type: object
               controlPlaneEndpoint:
-                description: ControlPlaneEndpoint propagates the endpoint the Kubernetes API Server managed by Kamaji is located.
+                description: ControlPlaneEndpoint propagates the endpoint the Kubernetes
+                  API Server managed by Kamaji is located.
                 properties:
                   host:
                     description: host is the hostname on which the API server is serving.
@@ -507,7 +638,8 @@ spec:
                 - port
                 type: object
               controllerManager:
-                description: ControlPlaneComponent allows the customization for the given component of the control plane.
+                description: ControlPlaneComponent allows the customization for the
+                  given component of the control plane.
                 properties:
                   containerImageName:
                     description: |-
@@ -521,7 +653,8 @@ spec:
                     type: array
                   extraVolumeMounts:
                     items:
-                      description: VolumeMount describes a mounting of a Volume within a container.
+                      description: VolumeMount describes a mounting of a Volume within
+                        a container.
                       properties:
                         mountPath:
                           description: |-
@@ -581,8 +714,123 @@ spec:
                       - name
                       type: object
                     type: array
+                  probes:
+                    description: Probes defines per-probe-type configuration.
+                    properties:
+                      liveness:
+                        description: Liveness defines parameters for the liveness
+                          probe.
+                        properties:
+                          failureThreshold:
+                            description: FailureThreshold is the consecutive failure
+                              count required to consider the probe failed.
+                            format: int32
+                            minimum: 1
+                            type: integer
+                          initialDelaySeconds:
+                            description: InitialDelaySeconds is the number of seconds
+                              after the container has started before the probe is
+                              initiated.
+                            format: int32
+                            minimum: 0
+                            type: integer
+                          periodSeconds:
+                            description: PeriodSeconds is how often (in seconds) to
+                              perform the probe.
+                            format: int32
+                            minimum: 1
+                            type: integer
+                          successThreshold:
+                            description: |-
+                              SuccessThreshold is the minimum consecutive successes for the probe to be considered successful.
+                              Must be 1 for liveness and startup probes.
+                            format: int32
+                            minimum: 1
+                            type: integer
+                          timeoutSeconds:
+                            description: TimeoutSeconds is the number of seconds after
+                              which the probe times out.
+                            format: int32
+                            minimum: 1
+                            type: integer
+                        type: object
+                      readiness:
+                        description: Readiness defines parameters for the readiness
+                          probe.
+                        properties:
+                          failureThreshold:
+                            description: FailureThreshold is the consecutive failure
+                              count required to consider the probe failed.
+                            format: int32
+                            minimum: 1
+                            type: integer
+                          initialDelaySeconds:
+                            description: InitialDelaySeconds is the number of seconds
+                              after the container has started before the probe is
+                              initiated.
+                            format: int32
+                            minimum: 0
+                            type: integer
+                          periodSeconds:
+                            description: PeriodSeconds is how often (in seconds) to
+                              perform the probe.
+                            format: int32
+                            minimum: 1
+                            type: integer
+                          successThreshold:
+                            description: |-
+                              SuccessThreshold is the minimum consecutive successes for the probe to be considered successful.
+                              Must be 1 for liveness and startup probes.
+                            format: int32
+                            minimum: 1
+                            type: integer
+                          timeoutSeconds:
+                            description: TimeoutSeconds is the number of seconds after
+                              which the probe times out.
+                            format: int32
+                            minimum: 1
+                            type: integer
+                        type: object
+                      startup:
+                        description: Startup defines parameters for the startup probe.
+                        properties:
+                          failureThreshold:
+                            description: FailureThreshold is the consecutive failure
+                              count required to consider the probe failed.
+                            format: int32
+                            minimum: 1
+                            type: integer
+                          initialDelaySeconds:
+                            description: InitialDelaySeconds is the number of seconds
+                              after the container has started before the probe is
+                              initiated.
+                            format: int32
+                            minimum: 0
+                            type: integer
+                          periodSeconds:
+                            description: PeriodSeconds is how often (in seconds) to
+                              perform the probe.
+                            format: int32
+                            minimum: 1
+                            type: integer
+                          successThreshold:
+                            description: |-
+                              SuccessThreshold is the minimum consecutive successes for the probe to be considered successful.
+                              Must be 1 for liveness and startup probes.
+                            format: int32
+                            minimum: 1
+                            type: integer
+                          timeoutSeconds:
+                            description: TimeoutSeconds is the number of seconds after
+                              which the probe times out.
+                            format: int32
+                            minimum: 1
+                            type: integer
+                        type: object
+                    type: object
                   resources:
-                    description: ResourceRequirements describes the compute resource requirements.
+                    description: ResourceRequirements describes the compute resource
+                      requirements.
                     properties:
                       claims:
                         description: |-
@@ -646,8 +894,26 @@ spec:
                   The Kamaji DataStore to use for the given TenantControlPlane.
                   Retrieve the list of the allowed ones by issuing "kubectl get datastores.kamaji.clastix.io".
                 type: string
+              dataStoreOverrides:
+                description: DataStoreOverrides defines which Kubernetes resources
+                  will be stored in dedicated datastores.
+                items:
+                  description: DataStoreOverride defines which kubernetes resource
+                    will be stored in a dedicated datastore.
+                  properties:
+                    dataStore:
+                      description: DataStore specifies the DataStore that should be
+                        used to store the Kubernetes data for the given Resource.
+                      type: string
+                    resource:
+                      description: Resource specifies which kubernetes resource to
+                        target.
+                      type: string
+                  type: object
+                type: array
               dataStoreSchema:
-                description: DataStoreSchema allows to specify the name of the database (for relational DataStores) or the key prefix (for etcd)
+                description: DataStoreSchema allows to specify the name of the database
+                  (for relational DataStores) or the key prefix (for etcd)
                 type: string
               dataStoreUsername:
                 description: |-
@@ -660,7 +926,8 @@ spec:
                 - message: changing the dataStoreUsername is not supported
                   rule: self == oldSelf
               deployment:
-                description: Configure how the TenantControlPlane Deployment object should be configured.
+                description: Configure how the TenantControlPlane Deployment object
+                  should be configured.
                 properties:
                   additionalMetadata:
                     description: |-
@@ -680,7 +947,8 @@ spec:
                     description: Affinity is a group of affinity scheduling rules.
                     properties:
                       nodeAffinity:
-                        description: Describes node affinity scheduling rules for the pod.
+                        description: Describes node affinity scheduling rules for
+                          the pod.
                         properties:
                           preferredDuringSchedulingIgnoredDuringExecution:
                             description: |-
@@ -699,17 +967,20 @@ spec:
                                 (i.e. it's a no-op). A null preferred scheduling term matches no objects (i.e. is also a no-op).
                               properties:
                                 preference:
-                                  description: A node selector term, associated with the corresponding weight.
+                                  description: A node selector term, associated with
+                                    the corresponding weight.
                                   properties:
                                     matchExpressions:
-                                      description: A list of node selector requirements by node's labels.
+                                      description: A list of node selector requirements
+                                        by node's labels.
                                       items:
                                         description: |-
                                           A node selector requirement is a selector that contains values, a key, and an operator
                                           that relates the key and values.
                                         properties:
                                           key:
-                                            description: The label key that the selector applies to.
+                                            description: The label key that the selector
+                                              applies to.
                                             type: string
                                           operator:
                                             description: |-
@@ -734,14 +1005,16 @@ spec:
                                       type: array
                                       x-kubernetes-list-type: atomic
                                     matchFields:
-                                      description: A list of node selector requirements by node's fields.
+                                      description: A list of node selector requirements
+                                        by node's fields.
                                       items:
                                         description: |-
                                           A node selector requirement is a selector that contains values, a key, and an operator
                                           that relates the key and values.
                                         properties:
                                           key:
-                                            description: The label key that the selector applies to.
+                                            description: The label key that the selector
+                                              applies to.
                                             type: string
                                           operator:
                                             description: |-
@@ -768,7 +1041,8 @@ spec:
                                   type: object
                                   x-kubernetes-map-type: atomic
                                 weight:
-                                  description: Weight associated with matching the corresponding nodeSelectorTerm, in the range 1-100.
+                                  description: Weight associated with matching the
+                                    corresponding nodeSelectorTerm, in the range 1-100.
                                   format: int32
                                   type: integer
                               required:
@@ -786,7 +1060,8 @@ spec:
                               may or may not try to eventually evict the pod from its node.
                             properties:
                               nodeSelectorTerms:
-                                description: Required. A list of node selector terms. The terms are ORed.
+                                description: Required. A list of node selector terms.
+                                  The terms are ORed.
                                 items:
                                   description: |-
                                     A null or empty node selector term matches no objects. The requirements of
@@ -794,14 +1069,16 @@ spec:
                                     The TopologySelectorTerm type implements a subset of the NodeSelectorTerm.
                                   properties:
                                     matchExpressions:
-                                      description: A list of node selector requirements by node's labels.
+                                      description: A list of node selector requirements
+                                        by node's labels.
                                       items:
                                         description: |-
                                           A node selector requirement is a selector that contains values, a key, and an operator
                                           that relates the key and values.
                                         properties:
                                           key:
-                                            description: The label key that the selector applies to.
+                                            description: The label key that the selector
+                                              applies to.
                                             type: string
                                           operator:
                                             description: |-
@@ -826,14 +1103,16 @@ spec:
                                       type: array
                                       x-kubernetes-list-type: atomic
                                     matchFields:
-                                      description: A list of node selector requirements by node's fields.
+                                      description: A list of node selector requirements
+                                        by node's fields.
                                       items:
                                         description: |-
                                           A node selector requirement is a selector that contains values, a key, and an operator
                                           that relates the key and values.
                                         properties:
                                           key:
-                                            description: The label key that the selector applies to.
+                                            description: The label key that the selector
+                                              applies to.
                                             type: string
                                           operator:
                                             description: |-
@@ -867,7 +1146,9 @@ spec:
                             x-kubernetes-map-type: atomic
                         type: object
                       podAffinity:
-                        description: Describes pod affinity scheduling rules (e.g. co-locate this pod in the same node, zone, etc. as some other pod(s)).
+                        description: Describes pod affinity scheduling rules (e.g.
+                          co-locate this pod in the same node, zone, etc. as some
+                          other pod(s)).
                         properties:
                           preferredDuringSchedulingIgnoredDuringExecution:
                             description: |-
@@ -881,10 +1162,13 @@ spec:
                               "weight" to the sum if the node has pods which matches the corresponding podAffinityTerm; the
                               node(s) with the highest sum are the most preferred.
                             items:
-                              description: The weights of all of the matched WeightedPodAffinityTerm fields are added per-node to find the most preferred node(s)
+                              description: The weights of all of the matched WeightedPodAffinityTerm
+                                fields are added per-node to find the most preferred
+                                node(s)
                               properties:
                                 podAffinityTerm:
-                                  description: Required. A pod affinity term, associated with the corresponding weight.
+                                  description: Required. A pod affinity term, associated
+                                    with the corresponding weight.
                                   properties:
                                     labelSelector:
                                       description: |-
@@ -892,14 +1176,17 @@ spec:
                                         If it's null, this PodAffinityTerm matches with no Pods.
                                       properties:
                                         matchExpressions:
-                                          description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
+                                          description: matchExpressions is a list
+                                            of label selector requirements. The requirements
+                                            are ANDed.
                                           items:
                                             description: |-
                                               A label selector requirement is a selector that contains values, a key, and an operator that
                                               relates the key and values.
                                             properties:
                                               key:
-                                                description: key is the label key that the selector applies to.
+                                                description: key is the label key
+                                                  that the selector applies to.
                                                 type: string
                                               operator:
                                                 description: |-
@@ -969,14 +1256,17 @@ spec:
                                         An empty selector ({}) matches all namespaces.
                                       properties:
                                         matchExpressions:
-                                          description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
+                                          description: matchExpressions is a list
+                                            of label selector requirements. The requirements
+                                            are ANDed.
                                           items:
                                             description: |-
                                               A label selector requirement is a selector that contains values, a key, and an operator that
                                               relates the key and values.
                                             properties:
                                               key:
-                                                description: key is the label key that the selector applies to.
+                                                description: key is the label key
+                                                  that the selector applies to.
                                                 type: string
                                               operator:
                                                 description: |-
@@ -1066,14 +1356,17 @@ spec:
                                     If it's null, this PodAffinityTerm matches with no Pods.
                                   properties:
                                     matchExpressions:
-                                      description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
+                                      description: matchExpressions is a list of label
+                                        selector requirements. The requirements are
+                                        ANDed.
                                       items:
                                         description: |-
                                           A label selector requirement is a selector that contains values, a key, and an operator that
                                           relates the key and values.
                                         properties:
                                           key:
-                                            description: key is the label key that the selector applies to.
+                                            description: key is the label key that
+                                              the selector applies to.
                                             type: string
                                           operator:
                                             description: |-
@@ -1143,14 +1436,17 @@ spec:
                                     An empty selector ({}) matches all namespaces.
                                   properties:
                                     matchExpressions:
-                                      description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
+                                      description: matchExpressions is a list of label
+                                        selector requirements. The requirements are
+                                        ANDed.
                                       items:
                                         description: |-
                                           A label selector requirement is a selector that contains values, a key, and an operator that
                                           relates the key and values.
                                         properties:
                                           key:
-                                            description: key is the label key that the selector applies to.
+                                            description: key is the label key that
+                                              the selector applies to.
                                             type: string
                                           operator:
                                             description: |-
@@ -1208,7 +1504,9 @@ spec:
                             x-kubernetes-list-type: atomic
                         type: object
                       podAntiAffinity:
-                        description: Describes pod anti-affinity scheduling rules (e.g. avoid putting this pod in the same node, zone, etc. as some other pod(s)).
+                        description: Describes pod anti-affinity scheduling rules
+                          (e.g. avoid putting this pod in the same node, zone, etc.
+                          as some other pod(s)).
                         properties:
                           preferredDuringSchedulingIgnoredDuringExecution:
                             description: |-
@@ -1222,10 +1520,13 @@ spec:
                               "weight" from the sum if the node has pods which matches the corresponding podAffinityTerm; the
                               node(s) with the highest sum are the most preferred.
                             items:
-                              description: The weights of all of the matched WeightedPodAffinityTerm fields are added per-node to find the most preferred node(s)
+                              description: The weights of all of the matched WeightedPodAffinityTerm
+                                fields are added per-node to find the most preferred
+                                node(s)
                               properties:
                                 podAffinityTerm:
-                                  description: Required. A pod affinity term, associated with the corresponding weight.
+                                  description: Required. A pod affinity term, associated
+                                    with the corresponding weight.
                                   properties:
                                     labelSelector:
                                       description: |-
@@ -1233,14 +1534,17 @@ spec:
                                         If it's null, this PodAffinityTerm matches with no Pods.
                                       properties:
                                         matchExpressions:
-                                          description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
+                                          description: matchExpressions is a list
+                                            of label selector requirements. The requirements
+                                            are ANDed.
                                           items:
                                             description: |-
                                               A label selector requirement is a selector that contains values, a key, and an operator that
                                               relates the key and values.
                                             properties:
                                               key:
-                                                description: key is the label key that the selector applies to.
+                                                description: key is the label key
+                                                  that the selector applies to.
                                                 type: string
                                               operator:
                                                 description: |-
@@ -1310,14 +1614,17 @@ spec:
                                         An empty selector ({}) matches all namespaces.
                                       properties:
                                         matchExpressions:
-                                          description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
+                                          description: matchExpressions is a list
+                                            of label selector requirements. The requirements
+                                            are ANDed.
                                           items:
                                             description: |-
                                               A label selector requirement is a selector that contains values, a key, and an operator that
                                               relates the key and values.
                                             properties:
                                               key:
-                                                description: key is the label key that the selector applies to.
+                                                description: key is the label key
+                                                  that the selector applies to.
                                                 type: string
                                               operator:
                                                 description: |-
@@ -1407,14 +1714,17 @@ spec:
                                     If it's null, this PodAffinityTerm matches with no Pods.
                                   properties:
                                     matchExpressions:
-                                      description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
+                                      description: matchExpressions is a list of label
+                                        selector requirements. The requirements are
+                                        ANDed.
                                       items:
                                         description: |-
                                           A label selector requirement is a selector that contains values, a key, and an operator that
                                           relates the key and values.
                                         properties:
                                           key:
-                                            description: key is the label key that the selector applies to.
+                                            description: key is the label key that
+                                              the selector applies to.
                                             type: string
                                           operator:
                                             description: |-
@@ -1484,14 +1794,17 @@ spec:
                                     An empty selector ({}) matches all namespaces.
                                   properties:
                                     matchExpressions:
-                                      description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
+                                      description: matchExpressions is a list of label
+                                        selector requirements. The requirements are
+                                        ANDed.
                                       items:
                                         description: |-
                                           A label selector requirement is a selector that contains values, a key, and an operator that
                                           relates the key and values.
                                         properties:
                                           key:
-                                            description: key is the label key that the selector applies to.
+                                            description: key is the label key that
+                                              the selector applies to.
                                             type: string
                                           operator:
                                             description: |-
@@ -1556,10 +1869,12 @@ spec:
                       The ExternalClusterReference feature gate must be enabled with one of the available flags.
                     properties:
                       deploymentNamespace:
-                        description: The Namespace where the resulting TenantControlPlane must be deployed to.
+                        description: The Namespace where the resulting TenantControlPlane
+                          must be deployed to.
                         type: string
                       kubeconfigSecretKey:
-                        description: The key used to extract the kubeconfig from the specified Secret.
+                        description: The key used to extract the kubeconfig from the
+                          specified Secret.
                         minLength: 1
                         type: string
                       kubeconfigSecretName:
@@ -1580,7 +1895,8 @@ spec:
                     type: object
                   extraContainers:
                     items:
-                      description: A single application container that you want to run within a pod.
+                      description: A single application container that you want to
+                        run within a pod.
                       properties:
                         args:
                           description: |-
@@ -1615,7 +1931,8 @@ spec:
                             List of environment variables to set in the container.
                             Cannot be updated.
                           items:
-                            description: EnvVar represents an environment variable present in a Container.
+                            description: EnvVar represents an environment variable
+                              present in a Container.
                             properties:
                               name:
                                 description: |-
@@ -1635,7 +1952,8 @@ spec:
                                   Defaults to "".
                                 type: string
                               valueFrom:
-                                description: Source for the environment variable's value. Cannot be used if value is not empty.
+                                description: Source for the environment variable's
+                                  value. Cannot be used if value is not empty.
                                 properties:
                                   configMapKeyRef:
                                     description: Selects a key of a ConfigMap.
@@ -1653,7 +1971,8 @@ spec:
                                           More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
                                         type: string
                                       optional:
-                                        description: Specify whether the ConfigMap or its key must be defined
+                                        description: Specify whether the ConfigMap
+                                          or its key must be defined
                                         type: boolean
                                     required:
                                     - key
@@ -1665,10 +1984,12 @@ spec:
                                       spec.nodeName, spec.serviceAccountName, status.hostIP, status.podIP, status.podIPs.
                                     properties:
                                       apiVersion:
-                                        description: Version of the schema the FieldPath is written in terms of, defaults to "v1".
+                                        description: Version of the schema the FieldPath
+                                          is written in terms of, defaults to "v1".
                                         type: string
                                       fieldPath:
-                                        description: Path of the field to select in the specified API version.
+                                        description: Path of the field to select in
+                                          the specified API version.
                                         type: string
                                     required:
                                     - fieldPath
@@ -1702,7 +2023,8 @@ spec:
                                           Must be relative and may not contain the '..' path or start with '..'.
                                         type: string
                                       volumeName:
-                                        description: The name of the volume mount containing the env file.
+                                        description: The name of the volume mount
+                                          containing the env file.
                                         type: string
                                     required:
                                     - key
@@ -1716,13 +2038,15 @@ spec:
                                       (limits.cpu, limits.memory, limits.ephemeral-storage, requests.cpu, requests.memory and requests.ephemeral-storage) are currently supported.
                                     properties:
                                       containerName:
-                                        description: 'Container name: required for volumes, optional for env vars'
+                                        description: 'Container name: required for
+                                          volumes, optional for env vars'
                                         type: string
                                       divisor:
                                         anyOf:
                                         - type: integer
                                         - type: string
-                                        description: Specifies the output format of the exposed resources, defaults to "1"
+                                        description: Specifies the output format of
+                                          the exposed resources, defaults to "1"
                                         pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
                                         x-kubernetes-int-or-string: true
                                       resource:
@@ -1733,10 +2057,12 @@ spec:
                                     type: object
                                     x-kubernetes-map-type: atomic
                                   secretKeyRef:
-                                    description: Selects a key of a secret in the pod's namespace
+                                    description: Selects a key of a secret in the
+                                      pod's namespace
                                     properties:
                                       key:
-                                        description: The key of the secret to select from.  Must be a valid secret key.
+                                        description: The key of the secret to select
+                                          from.  Must be a valid secret key.
                                         type: string
                                       name:
                                         default: ""
@@ -1748,7 +2074,8 @@ spec:
                                           More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
                                         type: string
                                       optional:
-                                        description: Specify whether the Secret or its key must be defined
+                                        description: Specify whether the Secret or
+                                          its key must be defined
                                         type: boolean
                                     required:
                                     - key
@@ -1771,7 +2098,8 @@ spec:
                             Values defined by an Env with a duplicate key will take precedence.
                             Cannot be updated.
                           items:
-                            description: EnvFromSource represents the source of a set of ConfigMaps or Secrets
+                            description: EnvFromSource represents the source of a
+                              set of ConfigMaps or Secrets
                             properties:
                               configMapRef:
                                 description: The ConfigMap to select from
@@ -1786,7 +2114,8 @@ spec:
                                       More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
                                     type: string
                                   optional:
-                                    description: Specify whether the ConfigMap must be defined
+                                    description: Specify whether the ConfigMap must
+                                      be defined
                                     type: boolean
                                 type: object
                                 x-kubernetes-map-type: atomic
@@ -1808,7 +2137,8 @@ spec:
                                       More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
                                     type: string
                                   optional:
-                                    description: Specify whether the Secret must be defined
+                                    description: Specify whether the Secret must be
+                                      defined
                                     type: boolean
                                 type: object
                                 x-kubernetes-map-type: atomic
@@ -1843,7 +2173,8 @@ spec:
                                 More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
                               properties:
                                 exec:
-                                  description: Exec specifies a command to execute in the container.
+                                  description: Exec specifies a command to execute
+                                    in the container.
                                   properties:
                                     command:
                                       description: |-
@@ -1858,7 +2189,8 @@ spec:
                                       x-kubernetes-list-type: atomic
                                   type: object
                                 httpGet:
-                                  description: HTTPGet specifies an HTTP GET request to perform.
+                                  description: HTTPGet specifies an HTTP GET request
+                                    to perform.
                                   properties:
                                     host:
                                       description: |-
@@ -1866,9 +2198,11 @@ spec:
                                         "Host" in httpHeaders instead.
                                       type: string
                                     httpHeaders:
-                                      description: Custom headers to set in the request. HTTP allows repeated headers.
+                                      description: Custom headers to set in the request.
+                                        HTTP allows repeated headers.
                                       items:
-                                        description: HTTPHeader describes a custom header to be used in HTTP probes
+                                        description: HTTPHeader describes a custom
+                                          header to be used in HTTP probes
                                         properties:
                                           name:
                                             description: |-
@@ -1905,10 +2239,12 @@ spec:
                                   - port
                                   type: object
                                 sleep:
-                                  description: Sleep represents a duration that the container should sleep.
+                                  description: Sleep represents a duration that the
+                                    container should sleep.
                                   properties:
                                     seconds:
-                                      description: Seconds is the number of seconds to sleep.
+                                      description: Seconds is the number of seconds
+                                        to sleep.
                                       format: int64
                                       type: integer
                                   required:
@@ -1921,7 +2257,8 @@ spec:
                                     lifecycle hooks will fail at runtime when it is specified.
                                   properties:
                                     host:
-                                      description: 'Optional: Host name to connect to, defaults to the pod IP.'
+                                      description: 'Optional: Host name to connect
+                                        to, defaults to the pod IP.'
                                       type: string
                                     port:
                                       anyOf:
@@ -1949,7 +2286,8 @@ spec:
                                 More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
                               properties:
                                 exec:
-                                  description: Exec specifies a command to execute in the container.
+                                  description: Exec specifies a command to execute
+                                    in the container.
                                   properties:
                                     command:
                                       description: |-
@@ -1964,7 +2302,8 @@ spec:
                                       x-kubernetes-list-type: atomic
                                   type: object
                                 httpGet:
-                                  description: HTTPGet specifies an HTTP GET request to perform.
+                                  description: HTTPGet specifies an HTTP GET request
+                                    to perform.
                                   properties:
                                     host:
                                       description: |-
@@ -1972,9 +2311,11 @@ spec:
                                         "Host" in httpHeaders instead.
                                       type: string
                                     httpHeaders:
-                                      description: Custom headers to set in the request. HTTP allows repeated headers.
+                                      description: Custom headers to set in the request.
+                                        HTTP allows repeated headers.
                                       items:
-                                        description: HTTPHeader describes a custom header to be used in HTTP probes
+                                        description: HTTPHeader describes a custom
+                                          header to be used in HTTP probes
                                         properties:
                                           name:
                                             description: |-
@@ -2011,10 +2352,12 @@ spec:
                                   - port
                                   type: object
                                 sleep:
-                                  description: Sleep represents a duration that the container should sleep.
+                                  description: Sleep represents a duration that the
+                                    container should sleep.
                                   properties:
                                     seconds:
-                                      description: Seconds is the number of seconds to sleep.
+                                      description: Seconds is the number of seconds
+                                        to sleep.
                                       format: int64
                                       type: integer
                                   required:
@@ -2027,7 +2370,8 @@ spec:
                                     lifecycle hooks will fail at runtime when it is specified.
                                   properties:
                                     host:
-                                      description: 'Optional: Host name to connect to, defaults to the pod IP.'
+                                      description: 'Optional: Host name to connect
+                                        to, defaults to the pod IP.'
                                       type: string
                                     port:
                                       anyOf:
@@ -2057,7 +2401,8 @@ spec:
                             More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
                           properties:
                             exec:
-                              description: Exec specifies a command to execute in the container.
+                              description: Exec specifies a command to execute in
+                                the container.
                               properties:
                                 command:
                                   description: |-
@@ -2081,7 +2426,8 @@ spec:
                               description: GRPC specifies a GRPC HealthCheckRequest.
                               properties:
                                 port:
-                                  description: Port number of the gRPC service. Number must be in the range 1 to 65535.
+                                  description: Port number of the gRPC service. Number
+                                    must be in the range 1 to 65535.
                                   format: int32
                                   type: integer
                                 service:
@@ -2096,7 +2442,8 @@ spec:
                               - port
                               type: object
                             httpGet:
-                              description: HTTPGet specifies an HTTP GET request to perform.
+                              description: HTTPGet specifies an HTTP GET request to
+                                perform.
                               properties:
                                 host:
                                   description: |-
@@ -2104,9 +2451,11 @@ spec:
                                     "Host" in httpHeaders instead.
                                   type: string
                                 httpHeaders:
-                                  description: Custom headers to set in the request. HTTP allows repeated headers.
+                                  description: Custom headers to set in the request.
+                                    HTTP allows repeated headers.
                                   items:
-                                    description: HTTPHeader describes a custom header to be used in HTTP probes
+                                    description: HTTPHeader describes a custom header
+                                      to be used in HTTP probes
                                     properties:
                                       name:
                                         description: |-
@@ -2161,10 +2510,12 @@ spec:
                               format: int32
                               type: integer
                             tcpSocket:
-                              description: TCPSocket specifies a connection to a TCP port.
+                              description: TCPSocket specifies a connection to a TCP
+                                port.
                               properties:
                                 host:
-                                  description: 'Optional: Host name to connect to, defaults to the pod IP.'
+                                  description: 'Optional: Host name to connect to,
+                                    defaults to the pod IP.'
                                   type: string
                                 port:
                                   anyOf:
@@ -2216,7 +2567,8 @@ spec:
                             For more information See https://github.com/kubernetes/kubernetes/issues/108255.
                             Cannot be updated.
                           items:
-                            description: ContainerPort represents a network port in a single container.
+                            description: ContainerPort represents a network port in
+                              a single container.
                             properties:
                               containerPort:
                                 description: |-
@@ -2225,7 +2577,8 @@ spec:
                                 format: int32
                                 type: integer
                               hostIP:
-                                description: What host IP to bind the external port to.
+                                description: What host IP to bind the external port
+                                  to.
                                 type: string
                               hostPort:
                                 description: |-
@@ -2263,7 +2616,8 @@ spec:
                             More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
                           properties:
                             exec:
-                              description: Exec specifies a command to execute in the container.
+                              description: Exec specifies a command to execute in
+                                the container.
                               properties:
                                 command:
                                   description: |-
@@ -2287,7 +2641,8 @@ spec:
                               description: GRPC specifies a GRPC HealthCheckRequest.
                               properties:
                                 port:
-                                  description: Port number of the gRPC service. Number must be in the range 1 to 65535.
+                                  description: Port number of the gRPC service. Number
+                                    must be in the range 1 to 65535.
                                   format: int32
                                   type: integer
                                 service:
@@ -2302,7 +2657,8 @@ spec:
                               - port
                               type: object
                             httpGet:
-                              description: HTTPGet specifies an HTTP GET request to perform.
+                              description: HTTPGet specifies an HTTP GET request to
+                                perform.
                               properties:
                                 host:
                                   description: |-
@@ -2310,9 +2666,11 @@ spec:
                                     "Host" in httpHeaders instead.
                                   type: string
                                 httpHeaders:
-                                  description: Custom headers to set in the request. HTTP allows repeated headers.
+                                  description: Custom headers to set in the request.
+                                    HTTP allows repeated headers.
                                   items:
-                                    description: HTTPHeader describes a custom header to be used in HTTP probes
+                                    description: HTTPHeader describes a custom header
+                                      to be used in HTTP probes
                                     properties:
                                       name:
                                         description: |-
@@ -2367,10 +2725,12 @@ spec:
                               format: int32
                               type: integer
                             tcpSocket:
-                              description: TCPSocket specifies a connection to a TCP port.
+                              description: TCPSocket specifies a connection to a TCP
+                                port.
                               properties:
                                 host:
-                                  description: 'Optional: Host name to connect to, defaults to the pod IP.'
+                                  description: 'Optional: Host name to connect to,
+                                    defaults to the pod IP.'
                                   type: string
                                 port:
                                   anyOf:
@@ -2407,9 +2767,12 @@ spec:
                               type: integer
                           type: object
                         resizePolicy:
-                          description: Resources resize policy for the container.
+                          description: |-
+                            Resources resize policy for the container.
+                            This field cannot be set on ephemeral containers.
                           items:
-                            description: ContainerResizePolicy represents resource resize policy for the container.
+                            description: ContainerResizePolicy represents resource
+                              resize policy for the container.
                             properties:
                               resourceName:
                                 description: |-
@@ -2443,7 +2806,8 @@ spec:
 
                                 This field is immutable. It can only be set for containers.
                               items:
-                                description: ResourceClaim references one entry in PodSpec.ResourceClaims.
+                                description: ResourceClaim references one entry in
+                                  PodSpec.ResourceClaims.
                                 properties:
                                   name:
                                     description: |-
@@ -2521,7 +2885,8 @@ spec:
                             When rules are specified, container MUST set RestartPolicy explicitly
                             even it if matches the Pod's RestartPolicy.
                           items:
-                            description: ContainerRestartRule describes how a container exit is handled.
+                            description: ContainerRestartRule describes how a container
+                              exit is handled.
                             properties:
                               action:
                                 description: |-
@@ -2530,7 +2895,8 @@ spec:
                                   container.
                                 type: string
                               exitCodes:
-                                description: Represents the exit codes to check on container exits.
+                                description: Represents the exit codes to check on
+                                  container exits.
                                 properties:
                                   operator:
                                     description: |-
@@ -2607,14 +2973,16 @@ spec:
                                 add:
                                   description: Added capabilities
                                   items:
-                                    description: Capability represent POSIX capabilities type
+                                    description: Capability represent POSIX capabilities
+                                      type
                                     type: string
                                   type: array
                                   x-kubernetes-list-type: atomic
                                 drop:
                                   description: Removed capabilities
                                   items:
-                                    description: Capability represent POSIX capabilities type
+                                    description: Capability represent POSIX capabilities
+                                      type
                                     type: string
                                   type: array
                                   x-kubernetes-list-type: atomic
@@ -2676,16 +3044,20 @@ spec:
                                 Note that this field cannot be set when spec.os.name is windows.
                               properties:
                                 level:
-                                  description: Level is SELinux level label that applies to the container.
+                                  description: Level is SELinux level label that applies
+                                    to the container.
                                   type: string
                                 role:
-                                  description: Role is a SELinux role label that applies to the container.
+                                  description: Role is a SELinux role label that applies
+                                    to the container.
                                   type: string
                                 type:
-                                  description: Type is a SELinux type label that applies to the container.
+                                  description: Type is a SELinux type label that applies
+                                    to the container.
                                   type: string
                                 user:
-                                  description: User is a SELinux user label that applies to the container.
+                                  description: User is a SELinux user label that applies
+                                    to the container.
                                   type: string
                               type: object
                             seccompProfile:
@@ -2728,7 +3100,8 @@ spec:
                                     GMSA credential spec named by the GMSACredentialSpecName field.
                                   type: string
                                 gmsaCredentialSpecName:
-                                  description: GMSACredentialSpecName is the name of the GMSA credential spec to use.
+                                  description: GMSACredentialSpecName is the name
+                                    of the GMSA credential spec to use.
                                   type: string
                                 hostProcess:
                                   description: |-
@@ -2757,7 +3130,8 @@ spec:
                             More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
                           properties:
                             exec:
-                              description: Exec specifies a command to execute in the container.
+                              description: Exec specifies a command to execute in
+                                the container.
                               properties:
                                 command:
                                   description: |-
@@ -2781,7 +3155,8 @@ spec:
                               description: GRPC specifies a GRPC HealthCheckRequest.
                               properties:
                                 port:
-                                  description: Port number of the gRPC service. Number must be in the range 1 to 65535.
+                                  description: Port number of the gRPC service. Number
+                                    must be in the range 1 to 65535.
                                   format: int32
                                   type: integer
                                 service:
@@ -2796,7 +3171,8 @@ spec:
                               - port
                               type: object
                             httpGet:
-                              description: HTTPGet specifies an HTTP GET request to perform.
+                              description: HTTPGet specifies an HTTP GET request to
+                                perform.
                               properties:
                                 host:
                                   description: |-
@@ -2804,9 +3180,11 @@ spec:
                                     "Host" in httpHeaders instead.
                                   type: string
                                 httpHeaders:
-                                  description: Custom headers to set in the request. HTTP allows repeated headers.
+                                  description: Custom headers to set in the request.
+                                    HTTP allows repeated headers.
                                   items:
-                                    description: HTTPHeader describes a custom header to be used in HTTP probes
+                                    description: HTTPHeader describes a custom header
+                                      to be used in HTTP probes
                                     properties:
                                       name:
                                         description: |-
@@ -2861,10 +3239,12 @@ spec:
                               format: int32
                               type: integer
                             tcpSocket:
-                              description: TCPSocket specifies a connection to a TCP port.
+                              description: TCPSocket specifies a connection to a TCP
+                                port.
                               properties:
                                 host:
-                                  description: 'Optional: Host name to connect to, defaults to the pod IP.'
+                                  description: 'Optional: Host name to connect to,
+                                    defaults to the pod IP.'
                                   type: string
                                 port:
                                   anyOf:
@@ -2942,15 +3322,19 @@ spec:
                             Default is false.
                           type: boolean
                         volumeDevices:
-                          description: volumeDevices is the list of block devices to be used by the container.
+                          description: volumeDevices is the list of block devices
+                            to be used by the container.
                           items:
-                            description: volumeDevice describes a mapping of a raw block device within a container.
+                            description: volumeDevice describes a mapping of a raw
+                              block device within a container.
                             properties:
                               devicePath:
-                                description: devicePath is the path inside of the container that the device will be mapped to.
+                                description: devicePath is the path inside of the
+                                  container that the device will be mapped to.
                                 type: string
                               name:
-                                description: name must match the name of a persistentVolumeClaim in the pod
+                                description: name must match the name of a persistentVolumeClaim
+                                  in the pod
                                 type: string
                             required:
                             - devicePath
@@ -2965,7 +3349,8 @@ spec:
                             Pod volumes to mount into the container's filesystem.
                             Cannot be updated.
                           items:
-                            description: VolumeMount describes a mounting of a Volume within a container.
+                            description: VolumeMount describes a mounting of a Volume
+                              within a container.
                             properties:
                               mountPath:
                                 description: |-
@@ -3041,7 +3426,8 @@ spec:
                     type: array
                   extraInitContainers:
                     items:
-                      description: A single application container that you want to run within a pod.
+                      description: A single application container that you want to
+                        run within a pod.
                       properties:
                         args:
                           description: |-
@@ -3076,7 +3462,8 @@ spec:
                             List of environment variables to set in the container.
                             Cannot be updated.
                           items:
-                            description: EnvVar represents an environment variable present in a Container.
+                            description: EnvVar represents an environment variable
+                              present in a Container.
                             properties:
                               name:
                                 description: |-
@@ -3096,7 +3483,8 @@ spec:
                                   Defaults to "".
                                 type: string
                               valueFrom:
-                                description: Source for the environment variable's value. Cannot be used if value is not empty.
+                                description: Source for the environment variable's
+                                  value. Cannot be used if value is not empty.
                                 properties:
                                   configMapKeyRef:
                                     description: Selects a key of a ConfigMap.
@@ -3114,7 +3502,8 @@ spec:
                                           More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
                                         type: string
                                       optional:
-                                        description: Specify whether the ConfigMap or its key must be defined
+                                        description: Specify whether the ConfigMap
+                                          or its key must be defined
                                         type: boolean
                                     required:
                                     - key
@@ -3126,10 +3515,12 @@ spec:
                                       spec.nodeName, spec.serviceAccountName, status.hostIP, status.podIP, status.podIPs.
                                     properties:
                                       apiVersion:
-                                        description: Version of the schema the FieldPath is written in terms of, defaults to "v1".
+                                        description: Version of the schema the FieldPath
+                                          is written in terms of, defaults to "v1".
                                         type: string
                                       fieldPath:
-                                        description: Path of the field to select in the specified API version.
+                                        description: Path of the field to select in
+                                          the specified API version.
                                         type: string
                                     required:
                                     - fieldPath
@@ -3163,7 +3554,8 @@ spec:
                                           Must be relative and may not contain the '..' path or start with '..'.
                                         type: string
                                       volumeName:
-                                        description: The name of the volume mount containing the env file.
+                                        description: The name of the volume mount
+                                          containing the env file.
                                         type: string
                                     required:
                                     - key
@@ -3177,13 +3569,15 @@ spec:
                                       (limits.cpu, limits.memory, limits.ephemeral-storage, requests.cpu, requests.memory and requests.ephemeral-storage) are currently supported.
                                     properties:
                                       containerName:
-                                        description: 'Container name: required for volumes, optional for env vars'
+                                        description: 'Container name: required for
+                                          volumes, optional for env vars'
                                         type: string
                                       divisor:
                                         anyOf:
                                         - type: integer
                                         - type: string
-                                        description: Specifies the output format of the exposed resources, defaults to "1"
+                                        description: Specifies the output format of
+                                          the exposed resources, defaults to "1"
                                         pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
                                         x-kubernetes-int-or-string: true
                                       resource:
@@ -3194,10 +3588,12 @@ spec:
                                     type: object
                                     x-kubernetes-map-type: atomic
                                   secretKeyRef:
-                                    description: Selects a key of a secret in the pod's namespace
+                                    description: Selects a key of a secret in the
+                                      pod's namespace
                                     properties:
                                       key:
-                                        description: The key of the secret to select from.  Must be a valid secret key.
+                                        description: The key of the secret to select
+                                          from.  Must be a valid secret key.
                                         type: string
                                       name:
                                         default: ""
@@ -3209,7 +3605,8 @@ spec:
                                           More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
                                         type: string
                                       optional:
-                                        description: Specify whether the Secret or its key must be defined
+                                        description: Specify whether the Secret or
+                                          its key must be defined
                                         type: boolean
                                     required:
                                     - key
@@ -3232,7 +3629,8 @@ spec:
                             Values defined by an Env with a duplicate key will take precedence.
                             Cannot be updated.
                           items:
-                            description: EnvFromSource represents the source of a set of ConfigMaps or Secrets
+                            description: EnvFromSource represents the source of a
+                              set of ConfigMaps or Secrets
                             properties:
                               configMapRef:
                                 description: The ConfigMap to select from
@@ -3247,7 +3645,8 @@ spec:
                                       More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
                                     type: string
                                   optional:
-                                    description: Specify whether the ConfigMap must be defined
+                                    description: Specify whether the ConfigMap must
+                                      be defined
                                     type: boolean
                                 type: object
                                 x-kubernetes-map-type: atomic
@@ -3269,7 +3668,8 @@ spec:
                                       More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
                                     type: string
                                   optional:
-                                    description: Specify whether the Secret must be defined
+                                    description: Specify whether the Secret must be
+                                      defined
                                     type: boolean
                                 type: object
                                 x-kubernetes-map-type: atomic
@@ -3304,7 +3704,8 @@ spec:
                                 More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
                               properties:
                                 exec:
-                                  description: Exec specifies a command to execute in the container.
+                                  description: Exec specifies a command to execute
+                                    in the container.
                                   properties:
                                     command:
                                       description: |-
@@ -3319,7 +3720,8 @@ spec:
                                       x-kubernetes-list-type: atomic
                                   type: object
                                 httpGet:
-                                  description: HTTPGet specifies an HTTP GET request to perform.
+                                  description: HTTPGet specifies an HTTP GET request
+                                    to perform.
                                   properties:
                                     host:
                                       description: |-
@@ -3327,9 +3729,11 @@ spec:
                                         "Host" in httpHeaders instead.
                                       type: string
                                     httpHeaders:
-                                      description: Custom headers to set in the request. HTTP allows repeated headers.
+                                      description: Custom headers to set in the request.
+                                        HTTP allows repeated headers.
                                       items:
-                                        description: HTTPHeader describes a custom header to be used in HTTP probes
+                                        description: HTTPHeader describes a custom
+                                          header to be used in HTTP probes
                                         properties:
                                           name:
                                             description: |-
@@ -3366,10 +3770,12 @@ spec:
                                   - port
                                   type: object
                                 sleep:
-                                  description: Sleep represents a duration that the container should sleep.
+                                  description: Sleep represents a duration that the
+                                    container should sleep.
                                   properties:
                                     seconds:
-                                      description: Seconds is the number of seconds to sleep.
+                                      description: Seconds is the number of seconds
+                                        to sleep.
                                       format: int64
                                       type: integer
                                   required:
@@ -3382,7 +3788,8 @@ spec:
                                     lifecycle hooks will fail at runtime when it is specified.
                                   properties:
                                     host:
-                                      description: 'Optional: Host name to connect to, defaults to the pod IP.'
+                                      description: 'Optional: Host name to connect
+                                        to, defaults to the pod IP.'
                                       type: string
                                     port:
                                       anyOf:
@@ -3410,7 +3817,8 @@ spec:
                                 More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
                               properties:
                                 exec:
-                                  description: Exec specifies a command to execute in the container.
+                                  description: Exec specifies a command to execute
+                                    in the container.
                                   properties:
                                     command:
                                       description: |-
@@ -3425,7 +3833,8 @@ spec:
                                       x-kubernetes-list-type: atomic
                                   type: object
                                 httpGet:
-                                  description: HTTPGet specifies an HTTP GET request to perform.
+                                  description: HTTPGet specifies an HTTP GET request
+                                    to perform.
                                   properties:
                                     host:
                                       description: |-
@@ -3433,9 +3842,11 @@ spec:
                                         "Host" in httpHeaders instead.
                                       type: string
                                     httpHeaders:
-                                      description: Custom headers to set in the request. HTTP allows repeated headers.
+                                      description: Custom headers to set in the request.
+                                        HTTP allows repeated headers.
                                       items:
-                                        description: HTTPHeader describes a custom header to be used in HTTP probes
+                                        description: HTTPHeader describes a custom
+                                          header to be used in HTTP probes
                                         properties:
                                           name:
                                             description: |-
@@ -3472,10 +3883,12 @@ spec:
                                   - port
                                   type: object
                                 sleep:
-                                  description: Sleep represents a duration that the container should sleep.
+                                  description: Sleep represents a duration that the
+                                    container should sleep.
                                   properties:
                                     seconds:
-                                      description: Seconds is the number of seconds to sleep.
+                                      description: Seconds is the number of seconds
+                                        to sleep.
                                       format: int64
                                       type: integer
                                   required:
@@ -3488,7 +3901,8 @@ spec:
                                     lifecycle hooks will fail at runtime when it is specified.
                                   properties:
                                     host:
-                                      description: 'Optional: Host name to connect to, defaults to the pod IP.'
+                                      description: 'Optional: Host name to connect
+                                        to, defaults to the pod IP.'
                                       type: string
                                     port:
                                       anyOf:
@@ -3518,7 +3932,8 @@ spec:
                             More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
                           properties:
                             exec:
-                              description: Exec specifies a command to execute in the container.
+                              description: Exec specifies a command to execute in
+                                the container.
                               properties:
                                 command:
                                   description: |-
@@ -3542,7 +3957,8 @@ spec:
                               description: GRPC specifies a GRPC HealthCheckRequest.
                               properties:
                                 port:
-                                  description: Port number of the gRPC service. Number must be in the range 1 to 65535.
+                                  description: Port number of the gRPC service. Number
+                                    must be in the range 1 to 65535.
                                   format: int32
                                   type: integer
                                 service:
@@ -3557,7 +3973,8 @@ spec:
                               - port
                               type: object
                             httpGet:
-                              description: HTTPGet specifies an HTTP GET request to perform.
+                              description: HTTPGet specifies an HTTP GET request to
+                                perform.
                               properties:
                                 host:
                                   description: |-
@@ -3565,9 +3982,11 @@ spec:
                                     "Host" in httpHeaders instead.
                                   type: string
                                 httpHeaders:
-                                  description: Custom headers to set in the request. HTTP allows repeated headers.
+                                  description: Custom headers to set in the request.
+                                    HTTP allows repeated headers.
                                   items:
-                                    description: HTTPHeader describes a custom header to be used in HTTP probes
+                                    description: HTTPHeader describes a custom header
+                                      to be used in HTTP probes
                                     properties:
                                       name:
                                         description: |-
@@ -3622,10 +4041,12 @@ spec:
                               format: int32
                               type: integer
                             tcpSocket:
-                              description: TCPSocket specifies a connection to a TCP port.
+                              description: TCPSocket specifies a connection to a TCP
+                                port.
                               properties:
                                 host:
-                                  description: 'Optional: Host name to connect to, defaults to the pod IP.'
+                                  description: 'Optional: Host name to connect to,
+                                    defaults to the pod IP.'
                                   type: string
                                 port:
                                   anyOf:
@@ -3677,7 +4098,8 @@ spec:
                             For more information See https://github.com/kubernetes/kubernetes/issues/108255.
                             Cannot be updated.
                           items:
-                            description: ContainerPort represents a network port in a single container.
+                            description: ContainerPort represents a network port in
+                              a single container.
                             properties:
                               containerPort:
                                 description: |-
@@ -3686,7 +4108,8 @@ spec:
                                 format: int32
                                 type: integer
                               hostIP:
-                                description: What host IP to bind the external port to.
+                                description: What host IP to bind the external port
+                                  to.
                                 type: string
                               hostPort:
                                 description: |-
@@ -3724,7 +4147,8 @@ spec:
                             More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
                           properties:
                             exec:
-                              description: Exec specifies a command to execute in the container.
+                              description: Exec specifies a command to execute in
+                                the container.
                               properties:
                                 command:
                                   description: |-
@@ -3748,7 +4172,8 @@ spec:
                               description: GRPC specifies a GRPC HealthCheckRequest.
                               properties:
                                 port:
-                                  description: Port number of the gRPC service. Number must be in the range 1 to 65535.
+                                  description: Port number of the gRPC service. Number
+                                    must be in the range 1 to 65535.
                                   format: int32
                                   type: integer
                                 service:
@@ -3763,7 +4188,8 @@ spec:
                               - port
                               type: object
                             httpGet:
-                              description: HTTPGet specifies an HTTP GET request to perform.
+                              description: HTTPGet specifies an HTTP GET request to
+                                perform.
                               properties:
                                 host:
                                   description: |-
@@ -3771,9 +4197,11 @@ spec:
                                     "Host" in httpHeaders instead.
                                   type: string
                                 httpHeaders:
-                                  description: Custom headers to set in the request. HTTP allows repeated headers.
+                                  description: Custom headers to set in the request.
+                                    HTTP allows repeated headers.
                                   items:
-                                    description: HTTPHeader describes a custom header to be used in HTTP probes
+                                    description: HTTPHeader describes a custom header
+                                      to be used in HTTP probes
                                     properties:
                                       name:
                                         description: |-
@@ -3828,10 +4256,12 @@ spec:
                               format: int32
                               type: integer
                             tcpSocket:
-                              description: TCPSocket specifies a connection to a TCP port.
+                              description: TCPSocket specifies a connection to a TCP
+                                port.
                               properties:
                                 host:
-                                  description: 'Optional: Host name to connect to, defaults to the pod IP.'
+                                  description: 'Optional: Host name to connect to,
+                                    defaults to the pod IP.'
                                   type: string
                                 port:
                                   anyOf:
@@ -3868,9 +4298,12 @@ spec:
                               type: integer
                           type: object
                         resizePolicy:
-                          description: Resources resize policy for the container.
+                          description: |-
+                            Resources resize policy for the container.
+                            This field cannot be set on ephemeral containers.
                           items:
-                            description: ContainerResizePolicy represents resource resize policy for the container.
+                            description: ContainerResizePolicy represents resource
+                              resize policy for the container.
                             properties:
                               resourceName:
                                 description: |-
@@ -3904,7 +4337,8 @@ spec:
 
                                 This field is immutable. It can only be set for containers.
                               items:
-                                description: ResourceClaim references one entry in PodSpec.ResourceClaims.
+                                description: ResourceClaim references one entry in
+                                  PodSpec.ResourceClaims.
                                 properties:
                                   name:
                                     description: |-
@@ -3982,7 +4416,8 @@ spec:
                             When rules are specified, container MUST set RestartPolicy explicitly
                             even it if matches the Pod's RestartPolicy.
                           items:
-                            description: ContainerRestartRule describes how a container exit is handled.
+                            description: ContainerRestartRule describes how a container
+                              exit is handled.
                             properties:
                               action:
                                 description: |-
@@ -3991,7 +4426,8 @@ spec:
                                   container.
                                 type: string
                               exitCodes:
-                                description: Represents the exit codes to check on container exits.
+                                description: Represents the exit codes to check on
+                                  container exits.
                                 properties:
                                   operator:
                                     description: |-
@@ -4068,14 +4504,16 @@ spec:
                                 add:
                                   description: Added capabilities
                                   items:
-                                    description: Capability represent POSIX capabilities type
+                                    description: Capability represent POSIX capabilities
+                                      type
                                     type: string
                                   type: array
                                   x-kubernetes-list-type: atomic
                                 drop:
                                   description: Removed capabilities
                                   items:
-                                    description: Capability represent POSIX capabilities type
+                                    description: Capability represent POSIX capabilities
+                                      type
                                     type: string
                                   type: array
                                   x-kubernetes-list-type: atomic
@@ -4137,16 +4575,20 @@ spec:
                                 Note that this field cannot be set when spec.os.name is windows.
                               properties:
                                 level:
-                                  description: Level is SELinux level label that applies to the container.
+                                  description: Level is SELinux level label that applies
+                                    to the container.
                                   type: string
                                 role:
-                                  description: Role is a SELinux role label that applies to the container.
+                                  description: Role is a SELinux role label that applies
+                                    to the container.
                                   type: string
                                 type:
-                                  description: Type is a SELinux type label that applies to the container.
+                                  description: Type is a SELinux type label that applies
+                                    to the container.
                                   type: string
                                 user:
-                                  description: User is a SELinux user label that applies to the container.
+                                  description: User is a SELinux user label that applies
+                                    to the container.
                                   type: string
                               type: object
                             seccompProfile:
@@ -4189,7 +4631,8 @@ spec:
                                     GMSA credential spec named by the GMSACredentialSpecName field.
                                   type: string
                                 gmsaCredentialSpecName:
-                                  description: GMSACredentialSpecName is the name of the GMSA credential spec to use.
+                                  description: GMSACredentialSpecName is the name
+                                    of the GMSA credential spec to use.
                                   type: string
                                 hostProcess:
                                   description: |-
@@ -4218,7 +4661,8 @@ spec:
                             More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
                           properties:
                             exec:
-                              description: Exec specifies a command to execute in the container.
+                              description: Exec specifies a command to execute in
+                                the container.
                               properties:
                                 command:
                                   description: |-
@@ -4242,7 +4686,8 @@ spec:
                               description: GRPC specifies a GRPC HealthCheckRequest.
                               properties:
                                 port:
-                                  description: Port number of the gRPC service. Number must be in the range 1 to 65535.
+                                  description: Port number of the gRPC service. Number
+                                    must be in the range 1 to 65535.
                                   format: int32
                                   type: integer
                                 service:
@@ -4257,7 +4702,8 @@ spec:
                               - port
                               type: object
                             httpGet:
-                              description: HTTPGet specifies an HTTP GET request to perform.
+                              description: HTTPGet specifies an HTTP GET request to
+                                perform.
                               properties:
                                 host:
                                   description: |-
@@ -4265,9 +4711,11 @@ spec:
                                     "Host" in httpHeaders instead.
                                   type: string
                                 httpHeaders:
-                                  description: Custom headers to set in the request. HTTP allows repeated headers.
+                                  description: Custom headers to set in the request.
+                                    HTTP allows repeated headers.
                                   items:
-                                    description: HTTPHeader describes a custom header to be used in HTTP probes
+                                    description: HTTPHeader describes a custom header
+                                      to be used in HTTP probes
                                     properties:
                                       name:
                                         description: |-
@@ -4322,10 +4770,12 @@ spec:
                               format: int32
                               type: integer
                             tcpSocket:
-                              description: TCPSocket specifies a connection to a TCP port.
+                              description: TCPSocket specifies a connection to a TCP
+                                port.
                               properties:
                                 host:
-                                  description: 'Optional: Host name to connect to, defaults to the pod IP.'
+                                  description: 'Optional: Host name to connect to,
+                                    defaults to the pod IP.'
                                   type: string
                                 port:
                                   anyOf:
@@ -4403,15 +4853,19 @@ spec:
                             Default is false.
                           type: boolean
                         volumeDevices:
-                          description: volumeDevices is the list of block devices to be used by the container.
+                          description: volumeDevices is the list of block devices
+                            to be used by the container.
                           items:
-                            description: volumeDevice describes a mapping of a raw block device within a container.
+                            description: volumeDevice describes a mapping of a raw
+                              block device within a container.
                             properties:
                               devicePath:
-                                description: devicePath is the path inside of the container that the device will be mapped to.
+                                description: devicePath is the path inside of the
+                                  container that the device will be mapped to.
                                 type: string
                               name:
-                                description: name must match the name of a persistentVolumeClaim in the pod
+                                description: name must match the name of a persistentVolumeClaim
+                                  in the pod
                                 type: string
                             required:
                             - devicePath
@@ -4426,7 +4880,8 @@ spec:
                             Pod volumes to mount into the container's filesystem.
                             Cannot be updated.
                           items:
-                            description: VolumeMount describes a mounting of a Volume within a container.
+                            description: VolumeMount describes a mounting of a Volume
+                              within a container.
                             properties:
                               mountPath:
                                 description: |-
@@ -4502,7 +4957,8 @@ spec:
                     type: array
                   extraVolumes:
                     items:
-                      description: Volume represents a named volume in a pod that may be accessed by any container in the pod.
+                      description: Volume represents a named volume in a pod that
+                        may be accessed by any container in the pod.
                       properties:
                         awsElasticBlockStore:
                           description: |-
@@ -4547,13 +5003,16 @@ spec:
                             are redirected to the disk.csi.azure.com CSI driver.
                           properties:
                             cachingMode:
-                              description: 'cachingMode is the Host Caching mode: None, Read Only, Read Write.'
+                              description: 'cachingMode is the Host Caching mode:
+                                None, Read Only, Read Write.'
                               type: string
                             diskName:
-                              description: diskName is the Name of the data disk in the blob storage
+                              description: diskName is the Name of the data disk in
+                                the blob storage
                               type: string
                             diskURI:
-                              description: diskURI is the URI of data disk in the blob storage
+                              description: diskURI is the URI of data disk in the
+                                blob storage
                               type: string
                             fsType:
                               default: ext4
@@ -4563,7 +5022,11 @@ spec:
                                 Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
                               type: string
                             kind:
-                              description: 'kind expected values are Shared: multiple blob disks per storage account  Dedicated: single blob disk per storage account  Managed: azure managed data disk (only in managed availability set). defaults to shared'
+                              description: 'kind expected values are Shared: multiple
+                                blob disks per storage account  Dedicated: single
+                                blob disk per storage account  Managed: azure managed
+                                data disk (only in managed availability set). defaults
+                                to shared'
                               type: string
                             readOnly:
                               default: false
@@ -4587,7 +5050,8 @@ spec:
                                 the ReadOnly setting in VolumeMounts.
                               type: boolean
                             secretName:
-                              description: secretName is the  name of secret that contains Azure Storage Account Name and Key
+                              description: secretName is the  name of secret that
+                                contains Azure Storage Account Name and Key
                               type: string
                             shareName:
                               description: shareName is the azure share Name
@@ -4610,7 +5074,8 @@ spec:
                               type: array
                               x-kubernetes-list-type: atomic
                             path:
-                              description: 'path is Optional: Used as the mounted root, rather than the full Ceph tree, default is /'
+                              description: 'path is Optional: Used as the mounted
+                                root, rather than the full Ceph tree, default is /'
                               type: string
                             readOnly:
                               description: |-
@@ -4692,7 +5157,8 @@ spec:
                           - volumeID
                           type: object
                         configMap:
-                          description: configMap represents a configMap that should populate this volume
+                          description: configMap represents a configMap that should
+                            populate this volume
                           properties:
                             defaultMode:
                               description: |-
@@ -4715,7 +5181,8 @@ spec:
                                 the volume setup will error unless it is marked optional. Paths must be
                                 relative and may not contain the '..' path or start with '..'.
                               items:
-                                description: Maps a string key to a path within a volume.
+                                description: Maps a string key to a path within a
+                                  volume.
                                 properties:
                                   key:
                                     description: key is the key to project.
@@ -4753,12 +5220,15 @@ spec:
                                 More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
                               type: string
                             optional:
-                              description: optional specify whether the ConfigMap or its keys must be defined
+                              description: optional specify whether the ConfigMap
+                                or its keys must be defined
                               type: boolean
                           type: object
                           x-kubernetes-map-type: atomic
                         csi:
-                          description: csi (Container Storage Interface) represents ephemeral storage that is handled by certain external CSI drivers.
+                          description: csi (Container Storage Interface) represents
+                            ephemeral storage that is handled by certain external
+                            CSI drivers.
                           properties:
                             driver:
                               description: |-
@@ -4806,7 +5276,8 @@ spec:
                           - driver
                           type: object
                         downwardAPI:
-                          description: downwardAPI represents downward API about the pod that should populate this volume
+                          description: downwardAPI represents downward API about the
+                            pod that should populate this volume
                           properties:
                             defaultMode:
                               description: |-
@@ -4821,18 +5292,24 @@ spec:
                               format: int32
                               type: integer
                             items:
-                              description: Items is a list of downward API volume file
+                              description: Items is a list of downward API volume
+                                file
                               items:
-                                description: DownwardAPIVolumeFile represents information to create the file containing the pod field
+                                description: DownwardAPIVolumeFile represents information
+                                  to create the file containing the pod field
                                 properties:
                                   fieldRef:
-                                    description: 'Required: Selects a field of the pod: only annotations, labels, name, namespace and uid are supported.'
+                                    description: 'Required: Selects a field of the
+                                      pod: only annotations, labels, name, namespace
+                                      and uid are supported.'
                                     properties:
                                       apiVersion:
-                                        description: Version of the schema the FieldPath is written in terms of, defaults to "v1".
+                                        description: Version of the schema the FieldPath
+                                          is written in terms of, defaults to "v1".
                                         type: string
                                       fieldPath:
-                                        description: Path of the field to select in the specified API version.
+                                        description: Path of the field to select in
+                                          the specified API version.
                                         type: string
                                     required:
                                     - fieldPath
@@ -4849,7 +5326,11 @@ spec:
                                     format: int32
                                     type: integer
                                   path:
-                                    description: 'Required: Path is  the relative path name of the file to be created. Must not be absolute or contain the ''..'' path. Must be utf-8 encoded. The first item of the relative path must not start with ''..'''
+                                    description: 'Required: Path is  the relative
+                                      path name of the file to be created. Must not
+                                      be absolute or contain the ''..'' path. Must
+                                      be utf-8 encoded. The first item of the relative
+                                      path must not start with ''..'''
                                     type: string
                                   resourceFieldRef:
                                     description: |-
@@ -4857,13 +5338,15 @@ spec:
                                       (limits.cpu, limits.memory, requests.cpu and requests.memory) are currently supported.
                                     properties:
                                       containerName:
-                                        description: 'Container name: required for volumes, optional for env vars'
+                                        description: 'Container name: required for
+                                          volumes, optional for env vars'
                                         type: string
                                       divisor:
                                         anyOf:
                                         - type: integer
                                         - type: string
-                                        description: Specifies the output format of the exposed resources, defaults to "1"
+                                        description: Specifies the output format of
+                                          the exposed resources, defaults to "1"
                                         pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
                                         x-kubernetes-int-or-string: true
                                       resource:
@@ -4995,10 +5478,12 @@ spec:
                                             For any other third-party types, APIGroup is required.
                                           type: string
                                         kind:
-                                          description: Kind is the type of resource being referenced
+                                          description: Kind is the type of resource
+                                            being referenced
                                           type: string
                                         name:
-                                          description: Name is the name of resource being referenced
+                                          description: Name is the name of resource
+                                            being referenced
                                           type: string
                                       required:
                                       - kind
@@ -5038,10 +5523,12 @@ spec:
                                             For any other third-party types, APIGroup is required.
                                           type: string
                                         kind:
-                                          description: Kind is the type of resource being referenced
+                                          description: Kind is the type of resource
+                                            being referenced
                                           type: string
                                         name:
-                                          description: Name is the name of resource being referenced
+                                          description: Name is the name of resource
+                                            being referenced
                                           type: string
                                         namespace:
                                           description: |-
@@ -5056,7 +5543,7 @@ spec:
                                     resources:
                                       description: |-
                                         resources represents the minimum resources the volume should have.
-                                        If RecoverVolumeExpansionFailure feature is enabled users are allowed to specify resource requirements
+                                        Users are allowed to specify resource requirements
                                         that are lower than previous value but must still be higher than capacity recorded in the
                                         status field of the claim.
                                         More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources
@@ -5087,17 +5574,21 @@ spec:
                                           type: object
                                       type: object
                                     selector:
-                                      description: selector is a label query over volumes to consider for binding.
+                                      description: selector is a label query over
+                                        volumes to consider for binding.
                                       properties:
                                         matchExpressions:
-                                          description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
+                                          description: matchExpressions is a list
+                                            of label selector requirements. The requirements
+                                            are ANDed.
                                           items:
                                             description: |-
                                               A label selector requirement is a selector that contains values, a key, and an operator that
                                               relates the key and values.
                                             properties:
                                               key:
-                                                description: key is the label key that the selector applies to.
+                                                description: key is the label key
+                                                  that the selector applies to.
                                                 type: string
                                               operator:
                                                 description: |-
@@ -5154,7 +5645,8 @@ spec:
                                         Value of Filesystem is implied when not included in claim spec.
                                       type: string
                                     volumeName:
-                                      description: volumeName is the binding reference to the PersistentVolume backing this claim.
+                                      description: volumeName is the binding reference
+                                        to the PersistentVolume backing this claim.
                                       type: string
                                   type: object
                               required:
@@ -5162,7 +5654,9 @@ spec:
                               type: object
                           type: object
                         fc:
-                          description: fc represents a Fibre Channel resource that is attached to a kubelet's host machine and then exposed to the pod.
+                          description: fc represents a Fibre Channel resource that
+                            is attached to a kubelet's host machine and then exposed
+                            to the pod.
                           properties:
                             fsType:
                               description: |-
@@ -5180,7 +5674,8 @@ spec:
                                 the ReadOnly setting in VolumeMounts.
                               type: boolean
                             targetWWNs:
-                              description: 'targetWWNs is Optional: FC target worldwide names (WWNs)'
+                              description: 'targetWWNs is Optional: FC target worldwide
+                                names (WWNs)'
                               items:
                                 type: string
                               type: array
@@ -5201,7 +5696,8 @@ spec:
                             Deprecated: FlexVolume is deprecated. Consider using a CSIDriver instead.
                           properties:
                             driver:
-                              description: driver is the name of the driver to use for this volume.
+                              description: driver is the name of the driver to use
+                                for this volume.
                               type: string
                             fsType:
                               description: |-
@@ -5212,7 +5708,8 @@ spec:
                             options:
                               additionalProperties:
                                 type: string
-                              description: 'options is Optional: this field holds extra command options if any.'
+                              description: 'options is Optional: this field holds
+                                extra command options if any.'
                               type: object
                             readOnly:
                               description: |-
@@ -5252,7 +5749,8 @@ spec:
                                 should be considered as deprecated
                               type: string
                             datasetUUID:
-                              description: datasetUUID is the UUID of the dataset. This is unique identifier of a Flocker dataset
+                              description: datasetUUID is the UUID of the dataset.
+                                This is unique identifier of a Flocker dataset
                               type: string
                           type: object
                         gcePersistentDisk:
@@ -5311,7 +5809,8 @@ spec:
                               description: repository is the URL
                               type: string
                             revision:
-                              description: revision is the commit hash for the specified revision.
+                              description: revision is the commit hash for the specified
+                                revision.
                               type: string
                           required:
                           - repository
@@ -5322,7 +5821,8 @@ spec:
                             Deprecated: Glusterfs is deprecated and the in-tree glusterfs type is no longer supported.
                           properties:
                             endpoints:
-                              description: endpoints is the endpoint name that details Glusterfs topology.
+                              description: endpoints is the endpoint name that details
+                                Glusterfs topology.
                               type: string
                             path:
                               description: |-
@@ -5404,10 +5904,12 @@ spec:
                             More info: https://kubernetes.io/docs/concepts/storage/volumes/#iscsi
                           properties:
                             chapAuthDiscovery:
-                              description: chapAuthDiscovery defines whether support iSCSI Discovery CHAP authentication
+                              description: chapAuthDiscovery defines whether support
+                                iSCSI Discovery CHAP authentication
                               type: boolean
                             chapAuthSession:
-                              description: chapAuthSession defines whether support iSCSI Session CHAP authentication
+                              description: chapAuthSession defines whether support
+                                iSCSI Session CHAP authentication
                               type: boolean
                             fsType:
                               description: |-
@@ -5449,7 +5951,8 @@ spec:
                                 Defaults to false.
                               type: boolean
                             secretRef:
-                              description: secretRef is the CHAP Secret for iSCSI target and initiator authentication
+                              description: secretRef is the CHAP Secret for iSCSI
+                                target and initiator authentication
                               properties:
                                 name:
                                   default: ""
@@ -5534,7 +6037,8 @@ spec:
                                 Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
                               type: string
                             pdID:
-                              description: pdID is the ID that identifies Photon Controller persistent disk
+                              description: pdID is the ID that identifies Photon Controller
+                                persistent disk
                               type: string
                           required:
                           - pdID
@@ -5558,13 +6062,15 @@ spec:
                                 the ReadOnly setting in VolumeMounts.
                               type: boolean
                             volumeID:
-                              description: volumeID uniquely identifies a Portworx volume
+                              description: volumeID uniquely identifies a Portworx
+                                volume
                               type: string
                           required:
                           - volumeID
                           type: object
                         projected:
-                          description: projected items for all in one resources secrets, configmaps, and downward API
+                          description: projected items for all in one resources secrets,
+                            configmaps, and downward API
                           properties:
                             defaultMode:
                               description: |-
@@ -5609,14 +6115,17 @@ spec:
                                           everything".
                                         properties:
                                           matchExpressions:
-                                            description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
+                                            description: matchExpressions is a list
+                                              of label selector requirements. The
+                                              requirements are ANDed.
                                             items:
                                               description: |-
                                                 A label selector requirement is a selector that contains values, a key, and an operator that
                                                 relates the key and values.
                                               properties:
                                                 key:
-                                                  description: key is the label key that the selector applies to.
+                                                  description: key is the label key
+                                                    that the selector applies to.
                                                   type: string
                                                 operator:
                                                   description: |-
@@ -5663,7 +6172,8 @@ spec:
                                           ClusterTrustBundles.
                                         type: boolean
                                       path:
-                                        description: Relative path from the volume root to write the bundle.
+                                        description: Relative path from the volume
+                                          root to write the bundle.
                                         type: string
                                       signerName:
                                         description: |-
@@ -5675,7 +6185,8 @@ spec:
                                     - path
                                     type: object
                                   configMap:
-                                    description: configMap information about the configMap data to project
+                                    description: configMap information about the configMap
+                                      data to project
                                     properties:
                                       items:
                                         description: |-
@@ -5687,7 +6198,8 @@ spec:
                                           the volume setup will error unless it is marked optional. Paths must be
                                           relative and may not contain the '..' path or start with '..'.
                                         items:
-                                          description: Maps a string key to a path within a volume.
+                                          description: Maps a string key to a path
+                                            within a volume.
                                           properties:
                                             key:
                                               description: key is the key to project.
@@ -5725,26 +6237,36 @@ spec:
                                           More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
                                         type: string
                                       optional:
-                                        description: optional specify whether the ConfigMap or its keys must be defined
+                                        description: optional specify whether the
+                                          ConfigMap or its keys must be defined
                                         type: boolean
                                     type: object
                                     x-kubernetes-map-type: atomic
                                   downwardAPI:
-                                    description: downwardAPI information about the downwardAPI data to project
+                                    description: downwardAPI information about the
+                                      downwardAPI data to project
                                     properties:
                                       items:
-                                        description: Items is a list of DownwardAPIVolume file
+                                        description: Items is a list of DownwardAPIVolume
+                                          file
                                         items:
-                                          description: DownwardAPIVolumeFile represents information to create the file containing the pod field
+                                          description: DownwardAPIVolumeFile represents
+                                            information to create the file containing
+                                            the pod field
                                           properties:
                                             fieldRef:
-                                              description: 'Required: Selects a field of the pod: only annotations, labels, name, namespace and uid are supported.'
+                                              description: 'Required: Selects a field
+                                                of the pod: only annotations, labels,
+                                                name, namespace and uid are supported.'
                                               properties:
                                                 apiVersion:
-                                                  description: Version of the schema the FieldPath is written in terms of, defaults to "v1".
+                                                  description: Version of the schema
+                                                    the FieldPath is written in terms
+                                                    of, defaults to "v1".
                                                   type: string
                                                 fieldPath:
-                                                  description: Path of the field to select in the specified API version.
+                                                  description: Path of the field to
+                                                    select in the specified API version.
                                                   type: string
                                               required:
                                               - fieldPath
@@ -5761,7 +6283,12 @@ spec:
                                               format: int32
                                               type: integer
                                             path:
-                                              description: 'Required: Path is  the relative path name of the file to be created. Must not be absolute or contain the ''..'' path. Must be utf-8 encoded. The first item of the relative path must not start with ''..'''
+                                              description: 'Required: Path is  the
+                                                relative path name of the file to
+                                                be created. Must not be absolute or
+                                                contain the ''..'' path. Must be utf-8
+                                                encoded. The first item of the relative
+                                                path must not start with ''..'''
                                               type: string
                                             resourceFieldRef:
                                               description: |-
@@ -5769,17 +6296,22 @@ spec:
                                                 (limits.cpu, limits.memory, requests.cpu and requests.memory) are currently supported.
                                               properties:
                                                 containerName:
-                                                  description: 'Container name: required for volumes, optional for env vars'
+                                                  description: 'Container name: required
+                                                    for volumes, optional for env
+                                                    vars'
                                                   type: string
                                                 divisor:
                                                   anyOf:
                                                   - type: integer
                                                   - type: string
-                                                  description: Specifies the output format of the exposed resources, defaults to "1"
+                                                  description: Specifies the output
+                                                    format of the exposed resources,
+                                                    defaults to "1"
                                                   pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
                                                   x-kubernetes-int-or-string: true
                                                 resource:
-                                                  description: 'Required: resource to select'
+                                                  description: 'Required: resource
+                                                    to select'
                                                   type: string
                                               required:
                                               - resource
@@ -5889,14 +6421,34 @@ spec:
                                         format: int32
                                         type: integer
                                       signerName:
-                                        description: Kubelet's generated CSRs will be addressed to this signer.
+                                        description: Kubelet's generated CSRs will
+                                          be addressed to this signer.
                                         type: string
+                                      userAnnotations:
+                                        additionalProperties:
+                                          type: string
+                                        description: |-
+                                          userAnnotations allow pod authors to pass additional information to
+                                          the signer implementation.  Kubernetes does not restrict or validate this
+                                          metadata in any way.
+
+                                          These values are copied verbatim into the `spec.unverifiedUserAnnotations` field of
+                                          the PodCertificateRequest objects that Kubelet creates.
+
+                                          Entries are subject to the same validation as object metadata annotations,
+                                          with the addition that all keys must be domain-prefixed. No restrictions
+                                          are placed on values, except an overall size limitation on the entire field.
+
+                                          Signers should document the keys and values they support. Signers should
+                                          deny requests that contain keys they do not recognize.
+                                        type: object
                                     required:
                                     - keyType
                                     - signerName
                                     type: object
                                   secret:
-                                    description: secret information about the secret data to project
+                                    description: secret information about the secret
+                                      data to project
                                     properties:
                                       items:
                                         description: |-
@@ -5908,7 +6460,8 @@ spec:
                                           the volume setup will error unless it is marked optional. Paths must be
                                           relative and may not contain the '..' path or start with '..'.
                                         items:
-                                          description: Maps a string key to a path within a volume.
+                                          description: Maps a string key to a path
+                                            within a volume.
                                           properties:
                                             key:
                                               description: key is the key to project.
@@ -5946,12 +6499,14 @@ spec:
                                           More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
                                         type: string
                                       optional:
-                                        description: optional field specify whether the Secret or its key must be defined
+                                        description: optional field specify whether
+                                          the Secret or its key must be defined
                                         type: boolean
                                     type: object
                                     x-kubernetes-map-type: atomic
                                   serviceAccountToken:
-                                    description: serviceAccountToken is information about the serviceAccountToken data to project
+                                    description: serviceAccountToken is information
+                                      about the serviceAccountToken data to project
                                     properties:
                                       audience:
                                         description: |-
@@ -6014,7 +6569,8 @@ spec:
                                 Defaults to serivceaccount user
                               type: string
                             volume:
-                              description: volume is a string that references an already created Quobyte volume by name.
+                              description: volume is a string that references an already
+                                created Quobyte volume by name.
                               type: string
                           required:
                           - registry
@@ -6108,10 +6664,12 @@ spec:
                                 Default is "xfs".
                               type: string
                             gateway:
-                              description: gateway is the host address of the ScaleIO API Gateway.
+                              description: gateway is the host address of the ScaleIO
+                                API Gateway.
                               type: string
                             protectionDomain:
-                              description: protectionDomain is the name of the ScaleIO Protection Domain for the configured storage.
+                              description: protectionDomain is the name of the ScaleIO
+                                Protection Domain for the configured storage.
                               type: string
                             readOnly:
                               description: |-
@@ -6135,7 +6693,8 @@ spec:
                               type: object
                               x-kubernetes-map-type: atomic
                             sslEnabled:
-                              description: sslEnabled Flag enable/disable SSL communication with Gateway, default false
+                              description: sslEnabled Flag enable/disable SSL communication
+                                with Gateway, default false
                               type: boolean
                             storageMode:
                               default: ThinProvisioned
@@ -6144,10 +6703,12 @@ spec:
                                 Default is ThinProvisioned.
                               type: string
                             storagePool:
-                              description: storagePool is the ScaleIO Storage Pool associated with the protection domain.
+                              description: storagePool is the ScaleIO Storage Pool
+                                associated with the protection domain.
                               type: string
                             system:
-                              description: system is the name of the storage system as configured in ScaleIO.
+                              description: system is the name of the storage system
+                                as configured in ScaleIO.
                               type: string
                             volumeName:
                               description: |-
@@ -6185,7 +6746,8 @@ spec:
                                 the volume setup will error unless it is marked optional. Paths must be
                                 relative and may not contain the '..' path or start with '..'.
                               items:
-                                description: Maps a string key to a path within a volume.
+                                description: Maps a string key to a path within a
+                                  volume.
                                 properties:
                                   key:
                                     description: key is the key to project.
@@ -6214,7 +6776,8 @@ spec:
                               type: array
                               x-kubernetes-list-type: atomic
                             optional:
-                              description: optional field specify whether the Secret or its keys must be defined
+                              description: optional field specify whether the Secret
+                                or its keys must be defined
                               type: boolean
                             secretName:
                               description: |-
@@ -6282,13 +6845,16 @@ spec:
                                 Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
                               type: string
                             storagePolicyID:
-                              description: storagePolicyID is the storage Policy Based Management (SPBM) profile ID associated with the StoragePolicyName.
+                              description: storagePolicyID is the storage Policy Based
+                                Management (SPBM) profile ID associated with the StoragePolicyName.
                               type: string
                             storagePolicyName:
-                              description: storagePolicyName is the storage Policy Based Management (SPBM) profile name.
+                              description: storagePolicyName is the storage Policy
+                                Based Management (SPBM) profile name.
                               type: string
                             volumePath:
-                              description: volumePath is the path that identifies vSphere volume vmdk
+                              description: volumePath is the path that identifies
+                                vSphere volume vmdk
                               type: string
                           required:
                           - volumePath
@@ -6315,12 +6881,130 @@ spec:
                           type: string
                         type: object
                     type: object
+                  probes:
+                    description: |-
+                      Probes defines probe configuration for Control Plane components.
+                      Global probe settings (Liveness, Readiness, Startup) apply to all components.
+                      Control Plane Component customisation has priority over these.
+                    properties:
+                      liveness:
+                        description: Liveness defines parameters for the liveness
+                          probe.
+                        properties:
+                          failureThreshold:
+                            description: FailureThreshold is the consecutive failure
+                              count required to consider the probe failed.
+                            format: int32
+                            minimum: 1
+                            type: integer
+                          initialDelaySeconds:
+                            description: InitialDelaySeconds is the number of seconds
+                              after the container has started before the probe is
+                              initiated.
+                            format: int32
+                            minimum: 0
+                            type: integer
+                          periodSeconds:
+                            description: PeriodSeconds is how often (in seconds) to
+                              perform the probe.
+                            format: int32
+                            minimum: 1
+                            type: integer
+                          successThreshold:
+                            description: |-
+                              SuccessThreshold is the minimum consecutive successes for the probe to be considered successful.
+                              Must be 1 for liveness and startup probes.
+                            format: int32
+                            minimum: 1
+                            type: integer
+                          timeoutSeconds:
+                            description: TimeoutSeconds is the number of seconds after
+                              which the probe times out.
+                            format: int32
+                            minimum: 1
+                            type: integer
+                        type: object
+                      readiness:
+                        description: Readiness defines parameters for the readiness
+                          probe.
+                        properties:
+                          failureThreshold:
+                            description: FailureThreshold is the consecutive failure
+                              count required to consider the probe failed.
+                            format: int32
+                            minimum: 1
+                            type: integer
+                          initialDelaySeconds:
+                            description: InitialDelaySeconds is the number of seconds
+                              after the container has started before the probe is
+                              initiated.
+                            format: int32
+                            minimum: 0
+                            type: integer
+                          periodSeconds:
+                            description: PeriodSeconds is how often (in seconds) to
+                              perform the probe.
+                            format: int32
+                            minimum: 1
+                            type: integer
+                          successThreshold:
+                            description: |-
+                              SuccessThreshold is the minimum consecutive successes for the probe to be considered successful.
+                              Must be 1 for liveness and startup probes.
+                            format: int32
+                            minimum: 1
+                            type: integer
+                          timeoutSeconds:
+                            description: TimeoutSeconds is the number of seconds after
+                              which the probe times out.
+                            format: int32
+                            minimum: 1
+                            type: integer
+                        type: object
+                      startup:
+                        description: Startup defines parameters for the startup probe.
+                        properties:
+                          failureThreshold:
+                            description: FailureThreshold is the consecutive failure
+                              count required to consider the probe failed.
+                            format: int32
+                            minimum: 1
+                            type: integer
+                          initialDelaySeconds:
+                            description: InitialDelaySeconds is the number of seconds
+                              after the container has started before the probe is
+                              initiated.
+                            format: int32
+                            minimum: 0
+                            type: integer
+                          periodSeconds:
+                            description: PeriodSeconds is how often (in seconds) to
+                              perform the probe.
+                            format: int32
+                            minimum: 1
+                            type: integer
+                          successThreshold:
+                            description: |-
+                              SuccessThreshold is the minimum consecutive successes for the probe to be considered successful.
+                              Must be 1 for liveness and startup probes.
+                            format: int32
+                            minimum: 1
+                            type: integer
+                          timeoutSeconds:
+                            description: TimeoutSeconds is the number of seconds after
+                              which the probe times out.
+                            format: int32
+                            minimum: 1
+                            type: integer
+                        type: object
+                    type: object
                   runtimeClassName:
                     type: string
                   serviceAccountName:
                     type: string
                   strategy:
-                    description: DeploymentStrategy describes how to replace existing pods with new ones.
+                    description: DeploymentStrategy describes how to replace existing
+                      pods with new ones.
                     properties:
                       rollingUpdate:
                         description: |-
@@ -6362,7 +7046,8 @@ spec:
                             x-kubernetes-int-or-string: true
                         type: object
                       type:
-                        description: Type of deployment. Can be "Recreate" or "RollingUpdate". Default is RollingUpdate.
+                        description: Type of deployment. Can be "Recreate" or "RollingUpdate".
+                          Default is RollingUpdate.
                         type: string
                     type: object
                   tolerations:
@@ -6384,9 +7069,10 @@ spec:
                         operator:
                           description: |-
                             Operator represents a key's relationship to the value.
-                            Valid operators are Exists and Equal. Defaults to Equal.
+                            Valid operators are Exists, Equal, Lt, and Gt. Defaults to Equal.
                             Exists is equivalent to wildcard for value, so that a pod can
                             tolerate all taints of a particular category.
+                            Lt and Gt perform numeric comparisons (requires feature gate TaintTolerationComparisonOperators).
                           type: string
                         tolerationSeconds:
                           description: |-
@@ -6405,7 +7091,8 @@ spec:
                     type: array
                   topologySpreadConstraints:
                     items:
-                      description: TopologySpreadConstraint specifies how to spread matching pods among the given topology.
+                      description: TopologySpreadConstraint specifies how to spread
+                        matching pods among the given topology.
                       properties:
                         labelSelector:
                           description: |-
@@ -6414,14 +7101,16 @@ spec:
                             in their corresponding topology domain.
                           properties:
                             matchExpressions:
-                              description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
+                              description: matchExpressions is a list of label selector
+                                requirements. The requirements are ANDed.
                               items:
                                 description: |-
                                   A label selector requirement is a selector that contains values, a key, and an operator that
                                   relates the key and values.
                                 properties:
                                   key:
-                                    description: key is the label key that the selector applies to.
+                                    description: key is the label key that the selector
+                                      applies to.
                                     type: string
                                   operator:
                                     description: |-
@@ -6584,7 +7273,8 @@ spec:
                       type: string
                     type: array
                   resources:
-                    description: ResourceRequirements describes the compute resource requirements.
+                    description: ResourceRequirements describes the compute resource
+                      requirements.
                     properties:
                       claims:
                         description: |-
@@ -6650,16 +7340,56 @@ spec:
                   - InternalIP
                   - ExternalIP
                   - Hostname
-                description: Configure the Kubelet options, such as the preferred address types, or the expected cgroupfs.
+                description: Configure the Kubelet options, such as the preferred
+                  address types, or the expected cgroupfs.
                 properties:
                   cgroupfs:
                     description: |-
                       CGroupFS defines the cgroup driver for Kubelet
                       https://kubernetes.io/docs/tasks/administer-cluster/kubeadm/configure-cgroup-driver/
+
+                      Deprecated: use ConfigurationJSONPatches.
                     enum:
                     - systemd
                     - cgroupfs
                     type: string
+                  configurationJSONPatches:
+                    description: |-
+                      ConfigurationJSONPatches contains the RFC 6902 JSON patches to customise the kubeadm generate configuration,
+                      useful to customise and mangling the configuration according to your needs;
+                      e.g.: configuring the cgroup driver used by Kubelet is possible via the following patch:
+
+                      [{"op": "replace", "path": "/cgroupDriver", "value": "systemd"}]
+                    items:
+                      properties:
+                        from:
+                          description: From specifies the source location for move
+                            or copy operations.
+                          type: string
+                        op:
+                          description: Op is the RFC 6902 JSON Patch operation.
+                          enum:
+                          - add
+                          - remove
+                          - replace
+                          - move
+                          - copy
+                          - test
+                          type: string
+                        path:
+                          description: Path specifies the target location in the JSON
+                            document. Use "/" to separate keys; "-" for appending
+                            to arrays.
+                          type: string
+                        value:
+                          description: Value is the operation value to be used when
+                            Op is add, replace, test.
+                          x-kubernetes-preserve-unknown-fields: true
+                      required:
+                      - op
+                      - path
+                      type: object
+                    type: array
                   preferredAddressTypes:
                     default:
                     - InternalIP
@@ -6685,6 +7415,66 @@ spec:
                   serviceType: LoadBalancer
                 description: Configure how the TenantControlPlane should be exposed.
                 properties:
+                  additionalServicePorts:
+                    description: |-
+                      AdditionalServicePorts adds extra ports to the Service that fronts the
+                      TenantControlPlane Pods. Useful when sidecars (such as a CSR signer)
+                      running alongside the kube-apiserver need to be reachable from tenant
+                      workers through the same Service endpoint.
+                    items:
+                      properties:
+                        appProtocol:
+                          description: |-
+                            The application protocol for this port.
+                            This is used as a hint for implementations to offer richer behavior for protocols that they understand.
+                            This field follows standard Kubernetes label syntax.
+                            Valid values are either:
+
+                            * Un-prefixed protocol names - reserved for IANA standard service names (as per
+                            RFC-6335 and https://www.iana.org/assignments/service-names).
+                          type: string
+                        name:
+                          description: |-
+                            The name of this port within the Service created by Kamaji.
+                            This must be a DNS_LABEL, must have unique names, and cannot be `kube-apiserver`, or `konnectivity-server`.
+                          type: string
+                        port:
+                          description: The port that will be exposed by this service.
+                          format: int32
+                          type: integer
+                        protocol:
+                          default: TCP
+                          description: The IP protocol for this port. Supports "TCP",
+                            "UDP", and "SCTP".
+                          enum:
+                          - TCP
+                          - UDP
+                          - SCTP
+                          type: string
+                        targetPort:
+                          anyOf:
+                          - type: integer
+                          - type: string
+                          description: |-
+                            Number or name of the port to access on the pods of the Tenant Control Plane.
+                            Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME.
+                            If this is a string, it will be looked up as a named port in the
+                            target Pod's container ports. If this is not specified, the value
+                            of the 'port' field is used (an identity map).
+                          x-kubernetes-int-or-string: true
+                      required:
+                      - name
+                      - port
+                      - targetPort
+                      type: object
+                    type: array
+                  advertiseAddress:
+                    description: |-
+                      AdvertiseAddress is the address advertised to tenant-side consumers (workers, konnectivity).
+                      When set, the management address (serviceAddress or LoadBalancer IP) is used for CAPI
+                      cluster-cache, while this address is used for kubeadm ControlPlaneEndpoint and cluster-info.
+                      Both addresses are included in the API server certificate SANs.
+                    type: string
                   certSANs:
                     description: |-
                       Configure additional Subject Address Names for the kube-apiserver certificate,
@@ -6700,6 +7490,44 @@ spec:
                     items:
                       type: string
                     type: array
+                  gateway:
+                    description: |-
+                      When specified, the KamajiControlPlane will be reachable using a Gateway API object
+                      deployed in the management cluster.
+                    properties:
+                      extraAnnotations:
+                        additionalProperties:
+                          type: string
+                        description: |-
+                          Defines the extra annotations for the Gateway object.
+                          Useful if you need Gateway or vendor-specific options.
+                        type: object
+                      extraLabels:
+                        additionalProperties:
+                          type: string
+                        description: Defines the extra labels for the Gateway object.
+                        type: object
+                      hostname:
+                        description: |-
+                          Defines the hostname for the Gateway object.
+                          When using a Gateway object the FQDN is automatically added to the Certificate SANs.
+                        minLength: 1
+                        type: string
+                      name:
+                        description: Defines the Gateway API name for the Gateway
+                          object.
+                        minLength: 1
+                        type: string
+                      namespace:
+                        description: Defines the Gateway API namespace for the Gateway
+                          object.
+                        minLength: 1
+                        type: string
+                    required:
+                    - hostname
+                    - name
+                    - namespace
+                    type: object
                   ingress:
                     description: |-
                       When specified, the KamajiControlPlane will be reachable using an Ingress object
@@ -6730,7 +7558,8 @@ spec:
                     - hostname
                     type: object
                   loadBalancerConfig:
-                    description: Optional configuration for the LoadBalancer service that exposes the Kamaji control plane.
+                    description: Optional configuration for the LoadBalancer service
+                      that exposes the Kamaji control plane.
                     properties:
                       loadBalancerClass:
                         description: |-
@@ -6769,7 +7598,8 @@ spec:
                     type: object
                   serviceType:
                     default: LoadBalancer
-                    description: Service Type string describes ingress methods for a service
+                    description: Service Type string describes ingress methods for
+                      a service
                     enum:
                     - ClusterIP
                     - NodePort
@@ -6777,12 +7607,20 @@ spec:
                     type: string
                 type: object
                 x-kubernetes-validations:
-                - message: LoadBalancerSourceRanges are supported only with LoadBalancer service type
-                  rule: '!has(self.loadBalancerConfig) || !has(self.loadBalancerConfig.loadBalancerSourceRanges) || (size(self.loadBalancerConfig.loadBalancerSourceRanges) == 0 || self.serviceType == ''LoadBalancer'')'
-                - message: LoadBalancerClass is supported only with LoadBalancer service type
-                  rule: '!has(self.loadBalancerConfig) || !has(self.loadBalancerConfig.loadBalancerClass) || self.serviceType == ''LoadBalancer'''
+                - message: LoadBalancerSourceRanges are supported only with LoadBalancer
+                    service type
+                  rule: '!has(self.loadBalancerConfig) || !has(self.loadBalancerConfig.loadBalancerSourceRanges)
+                    || (size(self.loadBalancerConfig.loadBalancerSourceRanges) ==
+                    0 || self.serviceType == ''LoadBalancer'')'
+                - message: LoadBalancerClass is supported only with LoadBalancer service
+                    type
+                  rule: '!has(self.loadBalancerConfig) || !has(self.loadBalancerConfig.loadBalancerClass)
+                    || self.serviceType == ''LoadBalancer'''
                 - message: LoadBalancerClass cannot be set or unset at runtime
-                  rule: self.serviceType != 'LoadBalancer' || (oldSelf.serviceType != 'LoadBalancer' && self.serviceType == 'LoadBalancer') || !has(self.loadBalancerConfig) || has(self.loadBalancerConfig) && has(self.loadBalancerConfig.loadBalancerClass) == has(oldSelf.loadBalancerConfig.loadBalancerClass)
+                  rule: self.serviceType != 'LoadBalancer' || (oldSelf.serviceType
+                    != 'LoadBalancer' && self.serviceType == 'LoadBalancer') || !has(self.loadBalancerConfig)
+                    || has(self.loadBalancerConfig) && has(self.loadBalancerConfig.loadBalancerClass)
+                    == has(oldSelf.loadBalancerConfig.loadBalancerClass)
               registry:
                 default: registry.k8s.io
                 description: |-
@@ -6797,7 +7635,8 @@ spec:
                 format: int32
                 type: integer
               scheduler:
-                description: ControlPlaneComponent allows the customization for the given component of the control plane.
+                description: ControlPlaneComponent allows the customization for the
+                  given component of the control plane.
                 properties:
                   containerImageName:
                     description: |-
@@ -6811,7 +7650,8 @@ spec:
                     type: array
                   extraVolumeMounts:
                     items:
-                      description: VolumeMount describes a mounting of a Volume within a container.
+                      description: VolumeMount describes a mounting of a Volume within
+                        a container.
                       properties:
                         mountPath:
                           description: |-
@@ -6871,8 +7711,123 @@ spec:
                       - name
                       type: object
                     type: array
+                  probes:
+                    description: Probes defines per-probe-type configuration.
+                    properties:
+                      liveness:
+                        description: Liveness defines parameters for the liveness
+                          probe.
+                        properties:
+                          failureThreshold:
+                            description: FailureThreshold is the consecutive failure
+                              count required to consider the probe failed.
+                            format: int32
+                            minimum: 1
+                            type: integer
+                          initialDelaySeconds:
+                            description: InitialDelaySeconds is the number of seconds
+                              after the container has started before the probe is
+                              initiated.
+                            format: int32
+                            minimum: 0
+                            type: integer
+                          periodSeconds:
+                            description: PeriodSeconds is how often (in seconds) to
+                              perform the probe.
+                            format: int32
+                            minimum: 1
+                            type: integer
+                          successThreshold:
+                            description: |-
+                              SuccessThreshold is the minimum consecutive successes for the probe to be considered successful.
+                              Must be 1 for liveness and startup probes.
+                            format: int32
+                            minimum: 1
+                            type: integer
+                          timeoutSeconds:
+                            description: TimeoutSeconds is the number of seconds after
+                              which the probe times out.
+                            format: int32
+                            minimum: 1
+                            type: integer
+                        type: object
+                      readiness:
+                        description: Readiness defines parameters for the readiness
+                          probe.
+                        properties:
+                          failureThreshold:
+                            description: FailureThreshold is the consecutive failure
+                              count required to consider the probe failed.
+                            format: int32
+                            minimum: 1
+                            type: integer
+                          initialDelaySeconds:
+                            description: InitialDelaySeconds is the number of seconds
+                              after the container has started before the probe is
+                              initiated.
+                            format: int32
+                            minimum: 0
+                            type: integer
+                          periodSeconds:
+                            description: PeriodSeconds is how often (in seconds) to
+                              perform the probe.
+                            format: int32
+                            minimum: 1
+                            type: integer
+                          successThreshold:
+                            description: |-
+                              SuccessThreshold is the minimum consecutive successes for the probe to be considered successful.
+                              Must be 1 for liveness and startup probes.
+                            format: int32
+                            minimum: 1
+                            type: integer
+                          timeoutSeconds:
+                            description: TimeoutSeconds is the number of seconds after
+                              which the probe times out.
+                            format: int32
+                            minimum: 1
+                            type: integer
+                        type: object
+                      startup:
+                        description: Startup defines parameters for the startup probe.
+                        properties:
+                          failureThreshold:
+                            description: FailureThreshold is the consecutive failure
+                              count required to consider the probe failed.
+                            format: int32
+                            minimum: 1
+                            type: integer
+                          initialDelaySeconds:
+                            description: InitialDelaySeconds is the number of seconds
+                              after the container has started before the probe is
+                              initiated.
+                            format: int32
+                            minimum: 0
+                            type: integer
+                          periodSeconds:
+                            description: PeriodSeconds is how often (in seconds) to
+                              perform the probe.
+                            format: int32
+                            minimum: 1
+                            type: integer
+                          successThreshold:
+                            description: |-
+                              SuccessThreshold is the minimum consecutive successes for the probe to be considered successful.
+                              Must be 1 for liveness and startup probes.
+                            format: int32
+                            minimum: 1
+                            type: integer
+                          timeoutSeconds:
+                            description: TimeoutSeconds is the number of seconds after
+                              which the probe times out.
+                            format: int32
+                            minimum: 1
+                            type: integer
+                        type: object
+                    type: object
                   resources:
-                    description: ResourceRequirements describes the compute resource requirements.
+                    description: ResourceRequirements describes the compute resource
+                      requirements.
                     properties:
                       claims:
                         description: |-
@@ -6942,7 +7897,8 @@ spec:
             properties:
               conditions:
                 items:
-                  description: Condition contains details for one aspect of the current state of this API Resource.
+                  description: Condition contains details for one aspect of the current
+                    state of this API Resource.
                   properties:
                     lastTransitionTime:
                       description: |-
@@ -7005,16 +7961,19 @@ spec:
                 description: The error message, if available, for the failing reconciliation.
                 type: string
               failureReason:
-                description: Share the failed process of the KamajiControlPlane provider which wasn't able to complete the reconciliation for the given resource.
+                description: Share the failed process of the KamajiControlPlane provider
+                  which wasn't able to complete the reconciliation for the given resource.
                 type: string
               initialized:
                 description: The TenantControlPlane has completed initialization.
                 type: boolean
               ready:
-                description: The Kamaji Control Plane is ready to link Cluster API with the Tenant Control Plane.
+                description: The Kamaji Control Plane is ready to link Cluster API
+                  with the Tenant Control Plane.
                 type: boolean
               readyReplicas:
-                description: Total number of fully running and ready control plane instances.
+                description: Total number of fully running and ready control plane
+                  instances.
                 format: int32
                 type: integer
               replicas:
@@ -7030,11 +7989,13 @@ spec:
                 format: int32
                 type: integer
               updatedReplicas:
-                description: Total number of non-terminated Pods targeted by this control plane that have the desired template spec.
+                description: Total number of non-terminated Pods targeted by this
+                  control plane that have the desired template spec.
                 format: int32
                 type: integer
               version:
-                description: String representing the minimum Kubernetes version for the control plane machines in the cluster.
+                description: String representing the minimum Kubernetes version for
+                  the control plane machines in the cluster.
                 type: string
             required:
             - externalManagedControlPlane
@@ -7083,7 +8044,8 @@ spec:
   - name: v1alpha1
     schema:
       openAPIV3Schema:
-        description: KamajiControlPlaneTemplate is the Schema for the kamajicontrolplanetemplates API.
+        description: KamajiControlPlaneTemplate is the Schema for the kamajicontrolplanetemplates
+          API.
         properties:
           apiVersion:
             description: |-
@@ -7103,10 +8065,12 @@ spec:
           metadata:
             type: object
           spec:
-            description: KamajiControlPlaneTemplateSpec defines the desired state of KamajiControlPlaneTemplate.
+            description: KamajiControlPlaneTemplateSpec defines the desired state
+              of KamajiControlPlaneTemplate.
             properties:
               template:
-                description: KamajiControlPlaneTemplateResource describes the data needed to create a KamajiControlPlane from a template.
+                description: KamajiControlPlaneTemplateResource describes the data
+                  needed to create a KamajiControlPlane from a template.
                 properties:
                   metadata:
                     description: |-
@@ -7135,7 +8099,8 @@ spec:
                   spec:
                     properties:
                       addons:
-                        description: The addons that must be managed by Kamaji, such as CoreDNS, kube-proxy, and konnectivity.
+                        description: The addons that must be managed by Kamaji, such
+                          as CoreDNS, kube-proxy, and konnectivity.
                         properties:
                           coreDNS:
                             description: |-
@@ -7161,7 +8126,9 @@ spec:
                                 type: string
                             type: object
                           konnectivity:
-                            description: Enables the Konnectivity addon in the Tenant Cluster, required if the worker nodes are in a different network.
+                            description: Enables the Konnectivity addon in the Tenant
+                              Cluster, required if the worker nodes are in a different
+                              network.
                             properties:
                               agent:
                                 default:
@@ -7187,11 +8154,13 @@ spec:
                                     type: boolean
                                   image:
                                     default: registry.k8s.io/kas-network-proxy/proxy-agent
-                                    description: AgentImage defines the container image for Konnectivity's agent.
+                                    description: AgentImage defines the container
+                                      image for Konnectivity's agent.
                                     type: string
                                   mode:
                                     default: DaemonSet
-                                    description: 'Mode allows specifying the Agent deployment mode: Deployment, or DaemonSet (default).'
+                                    description: 'Mode allows specifying the Agent
+                                      deployment mode: Deployment, or DaemonSet (default).'
                                     enum:
                                     - DaemonSet
                                     - Deployment
@@ -7227,9 +8196,10 @@ spec:
                                         operator:
                                           description: |-
                                             Operator represents a key's relationship to the value.
-                                            Valid operators are Exists and Equal. Defaults to Equal.
+                                            Valid operators are Exists, Equal, Lt, and Gt. Defaults to Equal.
                                             Exists is equivalent to wildcard for value, so that a pod can
                                             tolerate all taints of a particular category.
+                                            Lt and Gt perform numeric comparisons (requires feature gate TaintTolerationComparisonOperators).
                                           type: string
                                         tolerationSeconds:
                                           description: |-
@@ -7255,8 +8225,12 @@ spec:
                                     type: string
                                 type: object
                                 x-kubernetes-validations:
-                                - message: replicas must be 0 when mode is DaemonSet, and greater than 0 when mode is Deployment
-                                  rule: '!(self.mode == ''DaemonSet'' && has(self.replicas) && self.replicas != 0) && !(self.mode == ''Deployment'' && self.replicas == 0)'
+                                - message: replicas must be 0 (or unset) when mode
+                                    is DaemonSet, and greater than 0 (or unset) when
+                                    mode is Deployment
+                                  rule: '!(self.mode == ''DaemonSet'' && has(self.replicas)
+                                    && self.replicas != 0) && !(self.mode == ''Deployment''
+                                    && has(self.replicas) && self.replicas == 0)'
                               server:
                                 default:
                                   image: registry.k8s.io/kas-network-proxy/proxy-server
@@ -7273,14 +8247,17 @@ spec:
                                     type: array
                                   image:
                                     default: registry.k8s.io/kas-network-proxy/proxy-server
-                                    description: Container image used by the Konnectivity server.
+                                    description: Container image used by the Konnectivity
+                                      server.
                                     type: string
                                   port:
-                                    description: The port which Konnectivity server is listening to.
+                                    description: The port which Konnectivity server
+                                      is listening to.
                                     format: int32
                                     type: integer
                                   resources:
-                                    description: Resources define the amount of CPU and memory to allocate to the Konnectivity server.
+                                    description: Resources define the amount of CPU
+                                      and memory to allocate to the Konnectivity server.
                                     properties:
                                       claims:
                                         description: |-
@@ -7292,7 +8269,8 @@ spec:
 
                                           This field is immutable. It can only be set for containers.
                                         items:
-                                          description: ResourceClaim references one entry in PodSpec.ResourceClaims.
+                                          description: ResourceClaim references one
+                                            entry in PodSpec.ResourceClaims.
                                           properties:
                                             name:
                                               description: |-
@@ -7414,7 +8392,8 @@ spec:
                           type: string
                         type: array
                       apiServer:
-                        description: ControlPlaneComponent allows the customization for the given component of the control plane.
+                        description: ControlPlaneComponent allows the customization
+                          for the given component of the control plane.
                         properties:
                           containerImageName:
                             description: |-
@@ -7428,7 +8407,8 @@ spec:
                             type: array
                           extraVolumeMounts:
                             items:
-                              description: VolumeMount describes a mounting of a Volume within a container.
+                              description: VolumeMount describes a mounting of a Volume
+                                within a container.
                               properties:
                                 mountPath:
                                   description: |-
@@ -7488,8 +8468,127 @@ spec:
                               - name
                               type: object
                             type: array
+                          probes:
+                            description: Probes defines per-probe-type configuration.
+                            properties:
+                              liveness:
+                                description: Liveness defines parameters for the liveness
+                                  probe.
+                                properties:
+                                  failureThreshold:
+                                    description: FailureThreshold is the consecutive
+                                      failure count required to consider the probe
+                                      failed.
+                                    format: int32
+                                    minimum: 1
+                                    type: integer
+                                  initialDelaySeconds:
+                                    description: InitialDelaySeconds is the number
+                                      of seconds after the container has started before
+                                      the probe is initiated.
+                                    format: int32
+                                    minimum: 0
+                                    type: integer
+                                  periodSeconds:
+                                    description: PeriodSeconds is how often (in seconds)
+                                      to perform the probe.
+                                    format: int32
+                                    minimum: 1
+                                    type: integer
+                                  successThreshold:
+                                    description: |-
+                                      SuccessThreshold is the minimum consecutive successes for the probe to be considered successful.
+                                      Must be 1 for liveness and startup probes.
+                                    format: int32
+                                    minimum: 1
+                                    type: integer
+                                  timeoutSeconds:
+                                    description: TimeoutSeconds is the number of seconds
+                                      after which the probe times out.
+                                    format: int32
+                                    minimum: 1
+                                    type: integer
+                                type: object
+                              readiness:
+                                description: Readiness defines parameters for the
+                                  readiness probe.
+                                properties:
+                                  failureThreshold:
+                                    description: FailureThreshold is the consecutive
+                                      failure count required to consider the probe
+                                      failed.
+                                    format: int32
+                                    minimum: 1
+                                    type: integer
+                                  initialDelaySeconds:
+                                    description: InitialDelaySeconds is the number
+                                      of seconds after the container has started before
+                                      the probe is initiated.
+                                    format: int32
+                                    minimum: 0
+                                    type: integer
+                                  periodSeconds:
+                                    description: PeriodSeconds is how often (in seconds)
+                                      to perform the probe.
+                                    format: int32
+                                    minimum: 1
+                                    type: integer
+                                  successThreshold:
+                                    description: |-
+                                      SuccessThreshold is the minimum consecutive successes for the probe to be considered successful.
+                                      Must be 1 for liveness and startup probes.
+                                    format: int32
+                                    minimum: 1
+                                    type: integer
+                                  timeoutSeconds:
+                                    description: TimeoutSeconds is the number of seconds
+                                      after which the probe times out.
+                                    format: int32
+                                    minimum: 1
+                                    type: integer
+                                type: object
+                              startup:
+                                description: Startup defines parameters for the startup
+                                  probe.
+                                properties:
+                                  failureThreshold:
+                                    description: FailureThreshold is the consecutive
+                                      failure count required to consider the probe
+                                      failed.
+                                    format: int32
+                                    minimum: 1
+                                    type: integer
+                                  initialDelaySeconds:
+                                    description: InitialDelaySeconds is the number
+                                      of seconds after the container has started before
+                                      the probe is initiated.
+                                    format: int32
+                                    minimum: 0
+                                    type: integer
+                                  periodSeconds:
+                                    description: PeriodSeconds is how often (in seconds)
+                                      to perform the probe.
+                                    format: int32
+                                    minimum: 1
+                                    type: integer
+                                  successThreshold:
+                                    description: |-
+                                      SuccessThreshold is the minimum consecutive successes for the probe to be considered successful.
+                                      Must be 1 for liveness and startup probes.
+                                    format: int32
+                                    minimum: 1
+                                    type: integer
+                                  timeoutSeconds:
+                                    description: TimeoutSeconds is the number of seconds
+                                      after which the probe times out.
+                                    format: int32
+                                    minimum: 1
+                                    type: integer
+                                type: object
+                            type: object
                           resources:
-                            description: ResourceRequirements describes the compute resource requirements.
+                            description: ResourceRequirements describes the compute
+                              resource requirements.
                             properties:
                               claims:
                                 description: |-
@@ -7501,7 +8600,8 @@ spec:
 
                                   This field is immutable. It can only be set for containers.
                                 items:
-                                  description: ResourceClaim references one entry in PodSpec.ResourceClaims.
+                                  description: ResourceClaim references one entry
+                                    in PodSpec.ResourceClaims.
                                   properties:
                                     name:
                                       description: |-
@@ -7549,7 +8649,8 @@ spec:
                             type: object
                         type: object
                       controllerManager:
-                        description: ControlPlaneComponent allows the customization for the given component of the control plane.
+                        description: ControlPlaneComponent allows the customization
+                          for the given component of the control plane.
                         properties:
                           containerImageName:
                             description: |-
@@ -7563,7 +8664,8 @@ spec:
                             type: array
                           extraVolumeMounts:
                             items:
-                              description: VolumeMount describes a mounting of a Volume within a container.
+                              description: VolumeMount describes a mounting of a Volume
+                                within a container.
                               properties:
                                 mountPath:
                                   description: |-
@@ -7623,8 +8725,127 @@ spec:
                               - name
                               type: object
                             type: array
+                          probes:
+                            description: Probes defines per-probe-type configuration.
+                            properties:
+                              liveness:
+                                description: Liveness defines parameters for the liveness
+                                  probe.
+                                properties:
+                                  failureThreshold:
+                                    description: FailureThreshold is the consecutive
+                                      failure count required to consider the probe
+                                      failed.
+                                    format: int32
+                                    minimum: 1
+                                    type: integer
+                                  initialDelaySeconds:
+                                    description: InitialDelaySeconds is the number
+                                      of seconds after the container has started before
+                                      the probe is initiated.
+                                    format: int32
+                                    minimum: 0
+                                    type: integer
+                                  periodSeconds:
+                                    description: PeriodSeconds is how often (in seconds)
+                                      to perform the probe.
+                                    format: int32
+                                    minimum: 1
+                                    type: integer
+                                  successThreshold:
+                                    description: |-
+                                      SuccessThreshold is the minimum consecutive successes for the probe to be considered successful.
+                                      Must be 1 for liveness and startup probes.
+                                    format: int32
+                                    minimum: 1
+                                    type: integer
+                                  timeoutSeconds:
+                                    description: TimeoutSeconds is the number of seconds
+                                      after which the probe times out.
+                                    format: int32
+                                    minimum: 1
+                                    type: integer
+                                type: object
+                              readiness:
+                                description: Readiness defines parameters for the
+                                  readiness probe.
+                                properties:
+                                  failureThreshold:
+                                    description: FailureThreshold is the consecutive
+                                      failure count required to consider the probe
+                                      failed.
+                                    format: int32
+                                    minimum: 1
+                                    type: integer
+                                  initialDelaySeconds:
+                                    description: InitialDelaySeconds is the number
+                                      of seconds after the container has started before
+                                      the probe is initiated.
+                                    format: int32
+                                    minimum: 0
+                                    type: integer
+                                  periodSeconds:
+                                    description: PeriodSeconds is how often (in seconds)
+                                      to perform the probe.
+                                    format: int32
+                                    minimum: 1
+                                    type: integer
+                                  successThreshold:
+                                    description: |-
+                                      SuccessThreshold is the minimum consecutive successes for the probe to be considered successful.
+                                      Must be 1 for liveness and startup probes.
+                                    format: int32
+                                    minimum: 1
+                                    type: integer
+                                  timeoutSeconds:
+                                    description: TimeoutSeconds is the number of seconds
+                                      after which the probe times out.
+                                    format: int32
+                                    minimum: 1
+                                    type: integer
+                                type: object
+                              startup:
+                                description: Startup defines parameters for the startup
+                                  probe.
+                                properties:
+                                  failureThreshold:
+                                    description: FailureThreshold is the consecutive
+                                      failure count required to consider the probe
+                                      failed.
+                                    format: int32
+                                    minimum: 1
+                                    type: integer
+                                  initialDelaySeconds:
+                                    description: InitialDelaySeconds is the number
+                                      of seconds after the container has started before
+                                      the probe is initiated.
+                                    format: int32
+                                    minimum: 0
+                                    type: integer
+                                  periodSeconds:
+                                    description: PeriodSeconds is how often (in seconds)
+                                      to perform the probe.
+                                    format: int32
+                                    minimum: 1
+                                    type: integer
+                                  successThreshold:
+                                    description: |-
+                                      SuccessThreshold is the minimum consecutive successes for the probe to be considered successful.
+                                      Must be 1 for liveness and startup probes.
+                                    format: int32
+                                    minimum: 1
+                                    type: integer
+                                  timeoutSeconds:
+                                    description: TimeoutSeconds is the number of seconds
+                                      after which the probe times out.
+                                    format: int32
+                                    minimum: 1
+                                    type: integer
+                                type: object
+                            type: object
                           resources:
-                            description: ResourceRequirements describes the compute resource requirements.
+                            description: ResourceRequirements describes the compute
+                              resource requirements.
                             properties:
                               claims:
                                 description: |-
@@ -7636,7 +8857,8 @@ spec:
 
                                   This field is immutable. It can only be set for containers.
                                 items:
-                                  description: ResourceClaim references one entry in PodSpec.ResourceClaims.
+                                  description: ResourceClaim references one entry
+                                    in PodSpec.ResourceClaims.
                                   properties:
                                     name:
                                       description: |-
@@ -7688,8 +8910,28 @@ spec:
                           The Kamaji DataStore to use for the given TenantControlPlane.
                           Retrieve the list of the allowed ones by issuing "kubectl get datastores.kamaji.clastix.io".
                         type: string
+                      dataStoreOverrides:
+                        description: DataStoreOverrides defines which Kubernetes resources
+                          will be stored in dedicated datastores.
+                        items:
+                          description: DataStoreOverride defines which kubernetes
+                            resource will be stored in a dedicated datastore.
+                          properties:
+                            dataStore:
+                              description: DataStore specifies the DataStore that
+                                should be used to store the Kubernetes data for the
+                                given Resource.
+                              type: string
+                            resource:
+                              description: Resource specifies which kubernetes resource
+                                to target.
+                              type: string
+                          type: object
+                        type: array
                       dataStoreSchema:
-                        description: DataStoreSchema allows to specify the name of the database (for relational DataStores) or the key prefix (for etcd)
+                        description: DataStoreSchema allows to specify the name of
+                          the database (for relational DataStores) or the key prefix
+                          (for etcd)
                         type: string
                       dataStoreUsername:
                         description: |-
@@ -7702,7 +8944,8 @@ spec:
                         - message: changing the dataStoreUsername is not supported
                           rule: self == oldSelf
                       deployment:
-                        description: Configure how the TenantControlPlane Deployment object should be configured.
+                        description: Configure how the TenantControlPlane Deployment
+                          object should be configured.
                         properties:
                           additionalMetadata:
                             description: |-
@@ -7719,10 +8962,12 @@ spec:
                                 type: object
                             type: object
                           affinity:
-                            description: Affinity is a group of affinity scheduling rules.
+                            description: Affinity is a group of affinity scheduling
+                              rules.
                             properties:
                               nodeAffinity:
-                                description: Describes node affinity scheduling rules for the pod.
+                                description: Describes node affinity scheduling rules
+                                  for the pod.
                                 properties:
                                   preferredDuringSchedulingIgnoredDuringExecution:
                                     description: |-
@@ -7741,17 +8986,20 @@ spec:
                                         (i.e. it's a no-op). A null preferred scheduling term matches no objects (i.e. is also a no-op).
                                       properties:
                                         preference:
-                                          description: A node selector term, associated with the corresponding weight.
+                                          description: A node selector term, associated
+                                            with the corresponding weight.
                                           properties:
                                             matchExpressions:
-                                              description: A list of node selector requirements by node's labels.
+                                              description: A list of node selector
+                                                requirements by node's labels.
                                               items:
                                                 description: |-
                                                   A node selector requirement is a selector that contains values, a key, and an operator
                                                   that relates the key and values.
                                                 properties:
                                                   key:
-                                                    description: The label key that the selector applies to.
+                                                    description: The label key that
+                                                      the selector applies to.
                                                     type: string
                                                   operator:
                                                     description: |-
@@ -7776,14 +9024,16 @@ spec:
                                               type: array
                                               x-kubernetes-list-type: atomic
                                             matchFields:
-                                              description: A list of node selector requirements by node's fields.
+                                              description: A list of node selector
+                                                requirements by node's fields.
                                               items:
                                                 description: |-
                                                   A node selector requirement is a selector that contains values, a key, and an operator
                                                   that relates the key and values.
                                                 properties:
                                                   key:
-                                                    description: The label key that the selector applies to.
+                                                    description: The label key that
+                                                      the selector applies to.
                                                     type: string
                                                   operator:
                                                     description: |-
@@ -7810,7 +9060,9 @@ spec:
                                           type: object
                                           x-kubernetes-map-type: atomic
                                         weight:
-                                          description: Weight associated with matching the corresponding nodeSelectorTerm, in the range 1-100.
+                                          description: Weight associated with matching
+                                            the corresponding nodeSelectorTerm, in
+                                            the range 1-100.
                                           format: int32
                                           type: integer
                                       required:
@@ -7828,7 +9080,8 @@ spec:
                                       may or may not try to eventually evict the pod from its node.
                                     properties:
                                       nodeSelectorTerms:
-                                        description: Required. A list of node selector terms. The terms are ORed.
+                                        description: Required. A list of node selector
+                                          terms. The terms are ORed.
                                         items:
                                           description: |-
                                             A null or empty node selector term matches no objects. The requirements of
@@ -7836,14 +9089,16 @@ spec:
                                             The TopologySelectorTerm type implements a subset of the NodeSelectorTerm.
                                           properties:
                                             matchExpressions:
-                                              description: A list of node selector requirements by node's labels.
+                                              description: A list of node selector
+                                                requirements by node's labels.
                                               items:
                                                 description: |-
                                                   A node selector requirement is a selector that contains values, a key, and an operator
                                                   that relates the key and values.
                                                 properties:
                                                   key:
-                                                    description: The label key that the selector applies to.
+                                                    description: The label key that
+                                                      the selector applies to.
                                                     type: string
                                                   operator:
                                                     description: |-
@@ -7868,14 +9123,16 @@ spec:
                                               type: array
                                               x-kubernetes-list-type: atomic
                                             matchFields:
-                                              description: A list of node selector requirements by node's fields.
+                                              description: A list of node selector
+                                                requirements by node's fields.
                                               items:
                                                 description: |-
                                                   A node selector requirement is a selector that contains values, a key, and an operator
                                                   that relates the key and values.
                                                 properties:
                                                   key:
-                                                    description: The label key that the selector applies to.
+                                                    description: The label key that
+                                                      the selector applies to.
                                                     type: string
                                                   operator:
                                                     description: |-
@@ -7909,7 +9166,9 @@ spec:
                                     x-kubernetes-map-type: atomic
                                 type: object
                               podAffinity:
-                                description: Describes pod affinity scheduling rules (e.g. co-locate this pod in the same node, zone, etc. as some other pod(s)).
+                                description: Describes pod affinity scheduling rules
+                                  (e.g. co-locate this pod in the same node, zone,
+                                  etc. as some other pod(s)).
                                 properties:
                                   preferredDuringSchedulingIgnoredDuringExecution:
                                     description: |-
@@ -7923,10 +9182,13 @@ spec:
                                       "weight" to the sum if the node has pods which matches the corresponding podAffinityTerm; the
                                       node(s) with the highest sum are the most preferred.
                                     items:
-                                      description: The weights of all of the matched WeightedPodAffinityTerm fields are added per-node to find the most preferred node(s)
+                                      description: The weights of all of the matched
+                                        WeightedPodAffinityTerm fields are added per-node
+                                        to find the most preferred node(s)
                                       properties:
                                         podAffinityTerm:
-                                          description: Required. A pod affinity term, associated with the corresponding weight.
+                                          description: Required. A pod affinity term,
+                                            associated with the corresponding weight.
                                           properties:
                                             labelSelector:
                                               description: |-
@@ -7934,14 +9196,18 @@ spec:
                                                 If it's null, this PodAffinityTerm matches with no Pods.
                                               properties:
                                                 matchExpressions:
-                                                  description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
+                                                  description: matchExpressions is
+                                                    a list of label selector requirements.
+                                                    The requirements are ANDed.
                                                   items:
                                                     description: |-
                                                       A label selector requirement is a selector that contains values, a key, and an operator that
                                                       relates the key and values.
                                                     properties:
                                                       key:
-                                                        description: key is the label key that the selector applies to.
+                                                        description: key is the label
+                                                          key that the selector applies
+                                                          to.
                                                         type: string
                                                       operator:
                                                         description: |-
@@ -8011,14 +9277,18 @@ spec:
                                                 An empty selector ({}) matches all namespaces.
                                               properties:
                                                 matchExpressions:
-                                                  description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
+                                                  description: matchExpressions is
+                                                    a list of label selector requirements.
+                                                    The requirements are ANDed.
                                                   items:
                                                     description: |-
                                                       A label selector requirement is a selector that contains values, a key, and an operator that
                                                       relates the key and values.
                                                     properties:
                                                       key:
-                                                        description: key is the label key that the selector applies to.
+                                                        description: key is the label
+                                                          key that the selector applies
+                                                          to.
                                                         type: string
                                                       operator:
                                                         description: |-
@@ -8108,14 +9378,18 @@ spec:
                                             If it's null, this PodAffinityTerm matches with no Pods.
                                           properties:
                                             matchExpressions:
-                                              description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
+                                              description: matchExpressions is a list
+                                                of label selector requirements. The
+                                                requirements are ANDed.
                                               items:
                                                 description: |-
                                                   A label selector requirement is a selector that contains values, a key, and an operator that
                                                   relates the key and values.
                                                 properties:
                                                   key:
-                                                    description: key is the label key that the selector applies to.
+                                                    description: key is the label
+                                                      key that the selector applies
+                                                      to.
                                                     type: string
                                                   operator:
                                                     description: |-
@@ -8185,14 +9459,18 @@ spec:
                                             An empty selector ({}) matches all namespaces.
                                           properties:
                                             matchExpressions:
-                                              description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
+                                              description: matchExpressions is a list
+                                                of label selector requirements. The
+                                                requirements are ANDed.
                                               items:
                                                 description: |-
                                                   A label selector requirement is a selector that contains values, a key, and an operator that
                                                   relates the key and values.
                                                 properties:
                                                   key:
-                                                    description: key is the label key that the selector applies to.
+                                                    description: key is the label
+                                                      key that the selector applies
+                                                      to.
                                                     type: string
                                                   operator:
                                                     description: |-
@@ -8250,7 +9528,9 @@ spec:
                                     x-kubernetes-list-type: atomic
                                 type: object
                               podAntiAffinity:
-                                description: Describes pod anti-affinity scheduling rules (e.g. avoid putting this pod in the same node, zone, etc. as some other pod(s)).
+                                description: Describes pod anti-affinity scheduling
+                                  rules (e.g. avoid putting this pod in the same node,
+                                  zone, etc. as some other pod(s)).
                                 properties:
                                   preferredDuringSchedulingIgnoredDuringExecution:
                                     description: |-
@@ -8264,10 +9544,13 @@ spec:
                                       "weight" from the sum if the node has pods which matches the corresponding podAffinityTerm; the
                                       node(s) with the highest sum are the most preferred.
                                     items:
-                                      description: The weights of all of the matched WeightedPodAffinityTerm fields are added per-node to find the most preferred node(s)
+                                      description: The weights of all of the matched
+                                        WeightedPodAffinityTerm fields are added per-node
+                                        to find the most preferred node(s)
                                       properties:
                                         podAffinityTerm:
-                                          description: Required. A pod affinity term, associated with the corresponding weight.
+                                          description: Required. A pod affinity term,
+                                            associated with the corresponding weight.
                                           properties:
                                             labelSelector:
                                               description: |-
@@ -8275,14 +9558,18 @@ spec:
                                                 If it's null, this PodAffinityTerm matches with no Pods.
                                               properties:
                                                 matchExpressions:
-                                                  description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
+                                                  description: matchExpressions is
+                                                    a list of label selector requirements.
+                                                    The requirements are ANDed.
                                                   items:
                                                     description: |-
                                                       A label selector requirement is a selector that contains values, a key, and an operator that
                                                       relates the key and values.
                                                     properties:
                                                       key:
-                                                        description: key is the label key that the selector applies to.
+                                                        description: key is the label
+                                                          key that the selector applies
+                                                          to.
                                                         type: string
                                                       operator:
                                                         description: |-
@@ -8352,14 +9639,18 @@ spec:
                                                 An empty selector ({}) matches all namespaces.
                                               properties:
                                                 matchExpressions:
-                                                  description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
+                                                  description: matchExpressions is
+                                                    a list of label selector requirements.
+                                                    The requirements are ANDed.
                                                   items:
                                                     description: |-
                                                       A label selector requirement is a selector that contains values, a key, and an operator that
                                                       relates the key and values.
                                                     properties:
                                                       key:
-                                                        description: key is the label key that the selector applies to.
+                                                        description: key is the label
+                                                          key that the selector applies
+                                                          to.
                                                         type: string
                                                       operator:
                                                         description: |-
@@ -8449,14 +9740,18 @@ spec:
                                             If it's null, this PodAffinityTerm matches with no Pods.
                                           properties:
                                             matchExpressions:
-                                              description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
+                                              description: matchExpressions is a list
+                                                of label selector requirements. The
+                                                requirements are ANDed.
                                               items:
                                                 description: |-
                                                   A label selector requirement is a selector that contains values, a key, and an operator that
                                                   relates the key and values.
                                                 properties:
                                                   key:
-                                                    description: key is the label key that the selector applies to.
+                                                    description: key is the label
+                                                      key that the selector applies
+                                                      to.
                                                     type: string
                                                   operator:
                                                     description: |-
@@ -8526,14 +9821,18 @@ spec:
                                             An empty selector ({}) matches all namespaces.
                                           properties:
                                             matchExpressions:
-                                              description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
+                                              description: matchExpressions is a list
+                                                of label selector requirements. The
+                                                requirements are ANDed.
                                               items:
                                                 description: |-
                                                   A label selector requirement is a selector that contains values, a key, and an operator that
                                                   relates the key and values.
                                                 properties:
                                                   key:
-                                                    description: key is the label key that the selector applies to.
+                                                    description: key is the label
+                                                      key that the selector applies
+                                                      to.
                                                     type: string
                                                   operator:
                                                     description: |-
@@ -8598,10 +9897,12 @@ spec:
                               The ExternalClusterReference feature gate must be enabled with one of the available flags.
                             properties:
                               deploymentNamespace:
-                                description: The Namespace where the resulting TenantControlPlane must be deployed to.
+                                description: The Namespace where the resulting TenantControlPlane
+                                  must be deployed to.
                                 type: string
                               kubeconfigSecretKey:
-                                description: The key used to extract the kubeconfig from the specified Secret.
+                                description: The key used to extract the kubeconfig
+                                  from the specified Secret.
                                 minLength: 1
                                 type: string
                               kubeconfigSecretName:
@@ -8622,7 +9923,8 @@ spec:
                             type: object
                           extraContainers:
                             items:
-                              description: A single application container that you want to run within a pod.
+                              description: A single application container that you
+                                want to run within a pod.
                               properties:
                                 args:
                                   description: |-
@@ -8657,7 +9959,8 @@ spec:
                                     List of environment variables to set in the container.
                                     Cannot be updated.
                                   items:
-                                    description: EnvVar represents an environment variable present in a Container.
+                                    description: EnvVar represents an environment
+                                      variable present in a Container.
                                     properties:
                                       name:
                                         description: |-
@@ -8677,7 +9980,8 @@ spec:
                                           Defaults to "".
                                         type: string
                                       valueFrom:
-                                        description: Source for the environment variable's value. Cannot be used if value is not empty.
+                                        description: Source for the environment variable's
+                                          value. Cannot be used if value is not empty.
                                         properties:
                                           configMapKeyRef:
                                             description: Selects a key of a ConfigMap.
@@ -8695,7 +9999,8 @@ spec:
                                                   More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
                                                 type: string
                                               optional:
-                                                description: Specify whether the ConfigMap or its key must be defined
+                                                description: Specify whether the ConfigMap
+                                                  or its key must be defined
                                                 type: boolean
                                             required:
                                             - key
@@ -8707,10 +10012,13 @@ spec:
                                               spec.nodeName, spec.serviceAccountName, status.hostIP, status.podIP, status.podIPs.
                                             properties:
                                               apiVersion:
-                                                description: Version of the schema the FieldPath is written in terms of, defaults to "v1".
+                                                description: Version of the schema
+                                                  the FieldPath is written in terms
+                                                  of, defaults to "v1".
                                                 type: string
                                               fieldPath:
-                                                description: Path of the field to select in the specified API version.
+                                                description: Path of the field to
+                                                  select in the specified API version.
                                                 type: string
                                             required:
                                             - fieldPath
@@ -8744,7 +10052,8 @@ spec:
                                                   Must be relative and may not contain the '..' path or start with '..'.
                                                 type: string
                                               volumeName:
-                                                description: The name of the volume mount containing the env file.
+                                                description: The name of the volume
+                                                  mount containing the env file.
                                                 type: string
                                             required:
                                             - key
@@ -8758,27 +10067,34 @@ spec:
                                               (limits.cpu, limits.memory, limits.ephemeral-storage, requests.cpu, requests.memory and requests.ephemeral-storage) are currently supported.
                                             properties:
                                               containerName:
-                                                description: 'Container name: required for volumes, optional for env vars'
+                                                description: 'Container name: required
+                                                  for volumes, optional for env vars'
                                                 type: string
                                               divisor:
                                                 anyOf:
                                                 - type: integer
                                                 - type: string
-                                                description: Specifies the output format of the exposed resources, defaults to "1"
+                                                description: Specifies the output
+                                                  format of the exposed resources,
+                                                  defaults to "1"
                                                 pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
                                                 x-kubernetes-int-or-string: true
                                               resource:
-                                                description: 'Required: resource to select'
+                                                description: 'Required: resource to
+                                                  select'
                                                 type: string
                                             required:
                                             - resource
                                             type: object
                                             x-kubernetes-map-type: atomic
                                           secretKeyRef:
-                                            description: Selects a key of a secret in the pod's namespace
+                                            description: Selects a key of a secret
+                                              in the pod's namespace
                                             properties:
                                               key:
-                                                description: The key of the secret to select from.  Must be a valid secret key.
+                                                description: The key of the secret
+                                                  to select from.  Must be a valid
+                                                  secret key.
                                                 type: string
                                               name:
                                                 default: ""
@@ -8790,7 +10106,8 @@ spec:
                                                   More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
                                                 type: string
                                               optional:
-                                                description: Specify whether the Secret or its key must be defined
+                                                description: Specify whether the Secret
+                                                  or its key must be defined
                                                 type: boolean
                                             required:
                                             - key
@@ -8813,7 +10130,8 @@ spec:
                                     Values defined by an Env with a duplicate key will take precedence.
                                     Cannot be updated.
                                   items:
-                                    description: EnvFromSource represents the source of a set of ConfigMaps or Secrets
+                                    description: EnvFromSource represents the source
+                                      of a set of ConfigMaps or Secrets
                                     properties:
                                       configMapRef:
                                         description: The ConfigMap to select from
@@ -8828,7 +10146,8 @@ spec:
                                               More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
                                             type: string
                                           optional:
-                                            description: Specify whether the ConfigMap must be defined
+                                            description: Specify whether the ConfigMap
+                                              must be defined
                                             type: boolean
                                         type: object
                                         x-kubernetes-map-type: atomic
@@ -8850,7 +10169,8 @@ spec:
                                               More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
                                             type: string
                                           optional:
-                                            description: Specify whether the Secret must be defined
+                                            description: Specify whether the Secret
+                                              must be defined
                                             type: boolean
                                         type: object
                                         x-kubernetes-map-type: atomic
@@ -8885,7 +10205,8 @@ spec:
                                         More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
                                       properties:
                                         exec:
-                                          description: Exec specifies a command to execute in the container.
+                                          description: Exec specifies a command to
+                                            execute in the container.
                                           properties:
                                             command:
                                               description: |-
@@ -8900,7 +10221,8 @@ spec:
                                               x-kubernetes-list-type: atomic
                                           type: object
                                         httpGet:
-                                          description: HTTPGet specifies an HTTP GET request to perform.
+                                          description: HTTPGet specifies an HTTP GET
+                                            request to perform.
                                           properties:
                                             host:
                                               description: |-
@@ -8908,9 +10230,13 @@ spec:
                                                 "Host" in httpHeaders instead.
                                               type: string
                                             httpHeaders:
-                                              description: Custom headers to set in the request. HTTP allows repeated headers.
+                                              description: Custom headers to set in
+                                                the request. HTTP allows repeated
+                                                headers.
                                               items:
-                                                description: HTTPHeader describes a custom header to be used in HTTP probes
+                                                description: HTTPHeader describes
+                                                  a custom header to be used in HTTP
+                                                  probes
                                                 properties:
                                                   name:
                                                     description: |-
@@ -8918,7 +10244,8 @@ spec:
                                                       This will be canonicalized upon output, so case-variant names will be understood as the same header.
                                                     type: string
                                                   value:
-                                                    description: The header field value
+                                                    description: The header field
+                                                      value
                                                     type: string
                                                 required:
                                                 - name
@@ -8927,7 +10254,8 @@ spec:
                                               type: array
                                               x-kubernetes-list-type: atomic
                                             path:
-                                              description: Path to access on the HTTP server.
+                                              description: Path to access on the HTTP
+                                                server.
                                               type: string
                                             port:
                                               anyOf:
@@ -8947,10 +10275,12 @@ spec:
                                           - port
                                           type: object
                                         sleep:
-                                          description: Sleep represents a duration that the container should sleep.
+                                          description: Sleep represents a duration
+                                            that the container should sleep.
                                           properties:
                                             seconds:
-                                              description: Seconds is the number of seconds to sleep.
+                                              description: Seconds is the number of
+                                                seconds to sleep.
                                               format: int64
                                               type: integer
                                           required:
@@ -8963,7 +10293,8 @@ spec:
                                             lifecycle hooks will fail at runtime when it is specified.
                                           properties:
                                             host:
-                                              description: 'Optional: Host name to connect to, defaults to the pod IP.'
+                                              description: 'Optional: Host name to
+                                                connect to, defaults to the pod IP.'
                                               type: string
                                             port:
                                               anyOf:
@@ -8991,7 +10322,8 @@ spec:
                                         More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
                                       properties:
                                         exec:
-                                          description: Exec specifies a command to execute in the container.
+                                          description: Exec specifies a command to
+                                            execute in the container.
                                           properties:
                                             command:
                                               description: |-
@@ -9006,7 +10338,8 @@ spec:
                                               x-kubernetes-list-type: atomic
                                           type: object
                                         httpGet:
-                                          description: HTTPGet specifies an HTTP GET request to perform.
+                                          description: HTTPGet specifies an HTTP GET
+                                            request to perform.
                                           properties:
                                             host:
                                               description: |-
@@ -9014,9 +10347,13 @@ spec:
                                                 "Host" in httpHeaders instead.
                                               type: string
                                             httpHeaders:
-                                              description: Custom headers to set in the request. HTTP allows repeated headers.
+                                              description: Custom headers to set in
+                                                the request. HTTP allows repeated
+                                                headers.
                                               items:
-                                                description: HTTPHeader describes a custom header to be used in HTTP probes
+                                                description: HTTPHeader describes
+                                                  a custom header to be used in HTTP
+                                                  probes
                                                 properties:
                                                   name:
                                                     description: |-
@@ -9024,7 +10361,8 @@ spec:
                                                       This will be canonicalized upon output, so case-variant names will be understood as the same header.
                                                     type: string
                                                   value:
-                                                    description: The header field value
+                                                    description: The header field
+                                                      value
                                                     type: string
                                                 required:
                                                 - name
@@ -9033,7 +10371,8 @@ spec:
                                               type: array
                                               x-kubernetes-list-type: atomic
                                             path:
-                                              description: Path to access on the HTTP server.
+                                              description: Path to access on the HTTP
+                                                server.
                                               type: string
                                             port:
                                               anyOf:
@@ -9053,10 +10392,12 @@ spec:
                                           - port
                                           type: object
                                         sleep:
-                                          description: Sleep represents a duration that the container should sleep.
+                                          description: Sleep represents a duration
+                                            that the container should sleep.
                                           properties:
                                             seconds:
-                                              description: Seconds is the number of seconds to sleep.
+                                              description: Seconds is the number of
+                                                seconds to sleep.
                                               format: int64
                                               type: integer
                                           required:
@@ -9069,7 +10410,8 @@ spec:
                                             lifecycle hooks will fail at runtime when it is specified.
                                           properties:
                                             host:
-                                              description: 'Optional: Host name to connect to, defaults to the pod IP.'
+                                              description: 'Optional: Host name to
+                                                connect to, defaults to the pod IP.'
                                               type: string
                                             port:
                                               anyOf:
@@ -9099,7 +10441,8 @@ spec:
                                     More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
                                   properties:
                                     exec:
-                                      description: Exec specifies a command to execute in the container.
+                                      description: Exec specifies a command to execute
+                                        in the container.
                                       properties:
                                         command:
                                           description: |-
@@ -9123,7 +10466,8 @@ spec:
                                       description: GRPC specifies a GRPC HealthCheckRequest.
                                       properties:
                                         port:
-                                          description: Port number of the gRPC service. Number must be in the range 1 to 65535.
+                                          description: Port number of the gRPC service.
+                                            Number must be in the range 1 to 65535.
                                           format: int32
                                           type: integer
                                         service:
@@ -9138,7 +10482,8 @@ spec:
                                       - port
                                       type: object
                                     httpGet:
-                                      description: HTTPGet specifies an HTTP GET request to perform.
+                                      description: HTTPGet specifies an HTTP GET request
+                                        to perform.
                                       properties:
                                         host:
                                           description: |-
@@ -9146,9 +10491,11 @@ spec:
                                             "Host" in httpHeaders instead.
                                           type: string
                                         httpHeaders:
-                                          description: Custom headers to set in the request. HTTP allows repeated headers.
+                                          description: Custom headers to set in the
+                                            request. HTTP allows repeated headers.
                                           items:
-                                            description: HTTPHeader describes a custom header to be used in HTTP probes
+                                            description: HTTPHeader describes a custom
+                                              header to be used in HTTP probes
                                             properties:
                                               name:
                                                 description: |-
@@ -9165,7 +10512,8 @@ spec:
                                           type: array
                                           x-kubernetes-list-type: atomic
                                         path:
-                                          description: Path to access on the HTTP server.
+                                          description: Path to access on the HTTP
+                                            server.
                                           type: string
                                         port:
                                           anyOf:
@@ -9203,10 +10551,12 @@ spec:
                                       format: int32
                                       type: integer
                                     tcpSocket:
-                                      description: TCPSocket specifies a connection to a TCP port.
+                                      description: TCPSocket specifies a connection
+                                        to a TCP port.
                                       properties:
                                         host:
-                                          description: 'Optional: Host name to connect to, defaults to the pod IP.'
+                                          description: 'Optional: Host name to connect
+                                            to, defaults to the pod IP.'
                                           type: string
                                         port:
                                           anyOf:
@@ -9258,7 +10608,8 @@ spec:
                                     For more information See https://github.com/kubernetes/kubernetes/issues/108255.
                                     Cannot be updated.
                                   items:
-                                    description: ContainerPort represents a network port in a single container.
+                                    description: ContainerPort represents a network
+                                      port in a single container.
                                     properties:
                                       containerPort:
                                         description: |-
@@ -9267,7 +10618,8 @@ spec:
                                         format: int32
                                         type: integer
                                       hostIP:
-                                        description: What host IP to bind the external port to.
+                                        description: What host IP to bind the external
+                                          port to.
                                         type: string
                                       hostPort:
                                         description: |-
@@ -9305,7 +10657,8 @@ spec:
                                     More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
                                   properties:
                                     exec:
-                                      description: Exec specifies a command to execute in the container.
+                                      description: Exec specifies a command to execute
+                                        in the container.
                                       properties:
                                         command:
                                           description: |-
@@ -9329,7 +10682,8 @@ spec:
                                       description: GRPC specifies a GRPC HealthCheckRequest.
                                       properties:
                                         port:
-                                          description: Port number of the gRPC service. Number must be in the range 1 to 65535.
+                                          description: Port number of the gRPC service.
+                                            Number must be in the range 1 to 65535.
                                           format: int32
                                           type: integer
                                         service:
@@ -9344,7 +10698,8 @@ spec:
                                       - port
                                       type: object
                                     httpGet:
-                                      description: HTTPGet specifies an HTTP GET request to perform.
+                                      description: HTTPGet specifies an HTTP GET request
+                                        to perform.
                                       properties:
                                         host:
                                           description: |-
@@ -9352,9 +10707,11 @@ spec:
                                             "Host" in httpHeaders instead.
                                           type: string
                                         httpHeaders:
-                                          description: Custom headers to set in the request. HTTP allows repeated headers.
+                                          description: Custom headers to set in the
+                                            request. HTTP allows repeated headers.
                                           items:
-                                            description: HTTPHeader describes a custom header to be used in HTTP probes
+                                            description: HTTPHeader describes a custom
+                                              header to be used in HTTP probes
                                             properties:
                                               name:
                                                 description: |-
@@ -9371,7 +10728,8 @@ spec:
                                           type: array
                                           x-kubernetes-list-type: atomic
                                         path:
-                                          description: Path to access on the HTTP server.
+                                          description: Path to access on the HTTP
+                                            server.
                                           type: string
                                         port:
                                           anyOf:
@@ -9409,10 +10767,12 @@ spec:
                                       format: int32
                                       type: integer
                                     tcpSocket:
-                                      description: TCPSocket specifies a connection to a TCP port.
+                                      description: TCPSocket specifies a connection
+                                        to a TCP port.
                                       properties:
                                         host:
-                                          description: 'Optional: Host name to connect to, defaults to the pod IP.'
+                                          description: 'Optional: Host name to connect
+                                            to, defaults to the pod IP.'
                                           type: string
                                         port:
                                           anyOf:
@@ -9449,9 +10809,12 @@ spec:
                                       type: integer
                                   type: object
                                 resizePolicy:
-                                  description: Resources resize policy for the container.
+                                  description: |-
+                                    Resources resize policy for the container.
+                                    This field cannot be set on ephemeral containers.
                                   items:
-                                    description: ContainerResizePolicy represents resource resize policy for the container.
+                                    description: ContainerResizePolicy represents
+                                      resource resize policy for the container.
                                     properties:
                                       resourceName:
                                         description: |-
@@ -9485,7 +10848,8 @@ spec:
 
                                         This field is immutable. It can only be set for containers.
                                       items:
-                                        description: ResourceClaim references one entry in PodSpec.ResourceClaims.
+                                        description: ResourceClaim references one
+                                          entry in PodSpec.ResourceClaims.
                                         properties:
                                           name:
                                             description: |-
@@ -9563,7 +10927,8 @@ spec:
                                     When rules are specified, container MUST set RestartPolicy explicitly
                                     even it if matches the Pod's RestartPolicy.
                                   items:
-                                    description: ContainerRestartRule describes how a container exit is handled.
+                                    description: ContainerRestartRule describes how
+                                      a container exit is handled.
                                     properties:
                                       action:
                                         description: |-
@@ -9572,7 +10937,8 @@ spec:
                                           container.
                                         type: string
                                       exitCodes:
-                                        description: Represents the exit codes to check on container exits.
+                                        description: Represents the exit codes to
+                                          check on container exits.
                                         properties:
                                           operator:
                                             description: |-
@@ -9649,14 +11015,16 @@ spec:
                                         add:
                                           description: Added capabilities
                                           items:
-                                            description: Capability represent POSIX capabilities type
+                                            description: Capability represent POSIX
+                                              capabilities type
                                             type: string
                                           type: array
                                           x-kubernetes-list-type: atomic
                                         drop:
                                           description: Removed capabilities
                                           items:
-                                            description: Capability represent POSIX capabilities type
+                                            description: Capability represent POSIX
+                                              capabilities type
                                             type: string
                                           type: array
                                           x-kubernetes-list-type: atomic
@@ -9718,16 +11086,20 @@ spec:
                                         Note that this field cannot be set when spec.os.name is windows.
                                       properties:
                                         level:
-                                          description: Level is SELinux level label that applies to the container.
+                                          description: Level is SELinux level label
+                                            that applies to the container.
                                           type: string
                                         role:
-                                          description: Role is a SELinux role label that applies to the container.
+                                          description: Role is a SELinux role label
+                                            that applies to the container.
                                           type: string
                                         type:
-                                          description: Type is a SELinux type label that applies to the container.
+                                          description: Type is a SELinux type label
+                                            that applies to the container.
                                           type: string
                                         user:
-                                          description: User is a SELinux user label that applies to the container.
+                                          description: User is a SELinux user label
+                                            that applies to the container.
                                           type: string
                                       type: object
                                     seccompProfile:
@@ -9770,7 +11142,8 @@ spec:
                                             GMSA credential spec named by the GMSACredentialSpecName field.
                                           type: string
                                         gmsaCredentialSpecName:
-                                          description: GMSACredentialSpecName is the name of the GMSA credential spec to use.
+                                          description: GMSACredentialSpecName is the
+                                            name of the GMSA credential spec to use.
                                           type: string
                                         hostProcess:
                                           description: |-
@@ -9799,7 +11172,8 @@ spec:
                                     More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
                                   properties:
                                     exec:
-                                      description: Exec specifies a command to execute in the container.
+                                      description: Exec specifies a command to execute
+                                        in the container.
                                       properties:
                                         command:
                                           description: |-
@@ -9823,7 +11197,8 @@ spec:
                                       description: GRPC specifies a GRPC HealthCheckRequest.
                                       properties:
                                         port:
-                                          description: Port number of the gRPC service. Number must be in the range 1 to 65535.
+                                          description: Port number of the gRPC service.
+                                            Number must be in the range 1 to 65535.
                                           format: int32
                                           type: integer
                                         service:
@@ -9838,7 +11213,8 @@ spec:
                                       - port
                                       type: object
                                     httpGet:
-                                      description: HTTPGet specifies an HTTP GET request to perform.
+                                      description: HTTPGet specifies an HTTP GET request
+                                        to perform.
                                       properties:
                                         host:
                                           description: |-
@@ -9846,9 +11222,11 @@ spec:
                                             "Host" in httpHeaders instead.
                                           type: string
                                         httpHeaders:
-                                          description: Custom headers to set in the request. HTTP allows repeated headers.
+                                          description: Custom headers to set in the
+                                            request. HTTP allows repeated headers.
                                           items:
-                                            description: HTTPHeader describes a custom header to be used in HTTP probes
+                                            description: HTTPHeader describes a custom
+                                              header to be used in HTTP probes
                                             properties:
                                               name:
                                                 description: |-
@@ -9865,7 +11243,8 @@ spec:
                                           type: array
                                           x-kubernetes-list-type: atomic
                                         path:
-                                          description: Path to access on the HTTP server.
+                                          description: Path to access on the HTTP
+                                            server.
                                           type: string
                                         port:
                                           anyOf:
@@ -9903,10 +11282,12 @@ spec:
                                       format: int32
                                       type: integer
                                     tcpSocket:
-                                      description: TCPSocket specifies a connection to a TCP port.
+                                      description: TCPSocket specifies a connection
+                                        to a TCP port.
                                       properties:
                                         host:
-                                          description: 'Optional: Host name to connect to, defaults to the pod IP.'
+                                          description: 'Optional: Host name to connect
+                                            to, defaults to the pod IP.'
                                           type: string
                                         port:
                                           anyOf:
@@ -9984,15 +11365,20 @@ spec:
                                     Default is false.
                                   type: boolean
                                 volumeDevices:
-                                  description: volumeDevices is the list of block devices to be used by the container.
+                                  description: volumeDevices is the list of block
+                                    devices to be used by the container.
                                   items:
-                                    description: volumeDevice describes a mapping of a raw block device within a container.
+                                    description: volumeDevice describes a mapping
+                                      of a raw block device within a container.
                                     properties:
                                       devicePath:
-                                        description: devicePath is the path inside of the container that the device will be mapped to.
+                                        description: devicePath is the path inside
+                                          of the container that the device will be
+                                          mapped to.
                                         type: string
                                       name:
-                                        description: name must match the name of a persistentVolumeClaim in the pod
+                                        description: name must match the name of a
+                                          persistentVolumeClaim in the pod
                                         type: string
                                     required:
                                     - devicePath
@@ -10007,7 +11393,8 @@ spec:
                                     Pod volumes to mount into the container's filesystem.
                                     Cannot be updated.
                                   items:
-                                    description: VolumeMount describes a mounting of a Volume within a container.
+                                    description: VolumeMount describes a mounting
+                                      of a Volume within a container.
                                     properties:
                                       mountPath:
                                         description: |-
@@ -10024,7 +11411,8 @@ spec:
                                           (which defaults to None).
                                         type: string
                                       name:
-                                        description: This must match the Name of a Volume.
+                                        description: This must match the Name of a
+                                          Volume.
                                         type: string
                                       readOnly:
                                         description: |-
@@ -10083,7 +11471,8 @@ spec:
                             type: array
                           extraInitContainers:
                             items:
-                              description: A single application container that you want to run within a pod.
+                              description: A single application container that you
+                                want to run within a pod.
                               properties:
                                 args:
                                   description: |-
@@ -10118,7 +11507,8 @@ spec:
                                     List of environment variables to set in the container.
                                     Cannot be updated.
                                   items:
-                                    description: EnvVar represents an environment variable present in a Container.
+                                    description: EnvVar represents an environment
+                                      variable present in a Container.
                                     properties:
                                       name:
                                         description: |-
@@ -10138,7 +11528,8 @@ spec:
                                           Defaults to "".
                                         type: string
                                       valueFrom:
-                                        description: Source for the environment variable's value. Cannot be used if value is not empty.
+                                        description: Source for the environment variable's
+                                          value. Cannot be used if value is not empty.
                                         properties:
                                           configMapKeyRef:
                                             description: Selects a key of a ConfigMap.
@@ -10156,7 +11547,8 @@ spec:
                                                   More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
                                                 type: string
                                               optional:
-                                                description: Specify whether the ConfigMap or its key must be defined
+                                                description: Specify whether the ConfigMap
+                                                  or its key must be defined
                                                 type: boolean
                                             required:
                                             - key
@@ -10168,10 +11560,13 @@ spec:
                                               spec.nodeName, spec.serviceAccountName, status.hostIP, status.podIP, status.podIPs.
                                             properties:
                                               apiVersion:
-                                                description: Version of the schema the FieldPath is written in terms of, defaults to "v1".
+                                                description: Version of the schema
+                                                  the FieldPath is written in terms
+                                                  of, defaults to "v1".
                                                 type: string
                                               fieldPath:
-                                                description: Path of the field to select in the specified API version.
+                                                description: Path of the field to
+                                                  select in the specified API version.
                                                 type: string
                                             required:
                                             - fieldPath
@@ -10205,7 +11600,8 @@ spec:
                                                   Must be relative and may not contain the '..' path or start with '..'.
                                                 type: string
                                               volumeName:
-                                                description: The name of the volume mount containing the env file.
+                                                description: The name of the volume
+                                                  mount containing the env file.
                                                 type: string
                                             required:
                                             - key
@@ -10219,27 +11615,34 @@ spec:
                                               (limits.cpu, limits.memory, limits.ephemeral-storage, requests.cpu, requests.memory and requests.ephemeral-storage) are currently supported.
                                             properties:
                                               containerName:
-                                                description: 'Container name: required for volumes, optional for env vars'
+                                                description: 'Container name: required
+                                                  for volumes, optional for env vars'
                                                 type: string
                                               divisor:
                                                 anyOf:
                                                 - type: integer
                                                 - type: string
-                                                description: Specifies the output format of the exposed resources, defaults to "1"
+                                                description: Specifies the output
+                                                  format of the exposed resources,
+                                                  defaults to "1"
                                                 pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
                                                 x-kubernetes-int-or-string: true
                                               resource:
-                                                description: 'Required: resource to select'
+                                                description: 'Required: resource to
+                                                  select'
                                                 type: string
                                             required:
                                             - resource
                                             type: object
                                             x-kubernetes-map-type: atomic
                                           secretKeyRef:
-                                            description: Selects a key of a secret in the pod's namespace
+                                            description: Selects a key of a secret
+                                              in the pod's namespace
                                             properties:
                                               key:
-                                                description: The key of the secret to select from.  Must be a valid secret key.
+                                                description: The key of the secret
+                                                  to select from.  Must be a valid
+                                                  secret key.
                                                 type: string
                                               name:
                                                 default: ""
@@ -10251,7 +11654,8 @@ spec:
                                                   More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
                                                 type: string
                                               optional:
-                                                description: Specify whether the Secret or its key must be defined
+                                                description: Specify whether the Secret
+                                                  or its key must be defined
                                                 type: boolean
                                             required:
                                             - key
@@ -10274,7 +11678,8 @@ spec:
                                     Values defined by an Env with a duplicate key will take precedence.
                                     Cannot be updated.
                                   items:
-                                    description: EnvFromSource represents the source of a set of ConfigMaps or Secrets
+                                    description: EnvFromSource represents the source
+                                      of a set of ConfigMaps or Secrets
                                     properties:
                                       configMapRef:
                                         description: The ConfigMap to select from
@@ -10289,7 +11694,8 @@ spec:
                                               More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
                                             type: string
                                           optional:
-                                            description: Specify whether the ConfigMap must be defined
+                                            description: Specify whether the ConfigMap
+                                              must be defined
                                             type: boolean
                                         type: object
                                         x-kubernetes-map-type: atomic
@@ -10311,7 +11717,8 @@ spec:
                                               More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
                                             type: string
                                           optional:
-                                            description: Specify whether the Secret must be defined
+                                            description: Specify whether the Secret
+                                              must be defined
                                             type: boolean
                                         type: object
                                         x-kubernetes-map-type: atomic
@@ -10346,7 +11753,8 @@ spec:
                                         More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
                                       properties:
                                         exec:
-                                          description: Exec specifies a command to execute in the container.
+                                          description: Exec specifies a command to
+                                            execute in the container.
                                           properties:
                                             command:
                                               description: |-
@@ -10361,7 +11769,8 @@ spec:
                                               x-kubernetes-list-type: atomic
                                           type: object
                                         httpGet:
-                                          description: HTTPGet specifies an HTTP GET request to perform.
+                                          description: HTTPGet specifies an HTTP GET
+                                            request to perform.
                                           properties:
                                             host:
                                               description: |-
@@ -10369,9 +11778,13 @@ spec:
                                                 "Host" in httpHeaders instead.
                                               type: string
                                             httpHeaders:
-                                              description: Custom headers to set in the request. HTTP allows repeated headers.
+                                              description: Custom headers to set in
+                                                the request. HTTP allows repeated
+                                                headers.
                                               items:
-                                                description: HTTPHeader describes a custom header to be used in HTTP probes
+                                                description: HTTPHeader describes
+                                                  a custom header to be used in HTTP
+                                                  probes
                                                 properties:
                                                   name:
                                                     description: |-
@@ -10379,7 +11792,8 @@ spec:
                                                       This will be canonicalized upon output, so case-variant names will be understood as the same header.
                                                     type: string
                                                   value:
-                                                    description: The header field value
+                                                    description: The header field
+                                                      value
                                                     type: string
                                                 required:
                                                 - name
@@ -10388,7 +11802,8 @@ spec:
                                               type: array
                                               x-kubernetes-list-type: atomic
                                             path:
-                                              description: Path to access on the HTTP server.
+                                              description: Path to access on the HTTP
+                                                server.
                                               type: string
                                             port:
                                               anyOf:
@@ -10408,10 +11823,12 @@ spec:
                                           - port
                                           type: object
                                         sleep:
-                                          description: Sleep represents a duration that the container should sleep.
+                                          description: Sleep represents a duration
+                                            that the container should sleep.
                                           properties:
                                             seconds:
-                                              description: Seconds is the number of seconds to sleep.
+                                              description: Seconds is the number of
+                                                seconds to sleep.
                                               format: int64
                                               type: integer
                                           required:
@@ -10424,7 +11841,8 @@ spec:
                                             lifecycle hooks will fail at runtime when it is specified.
                                           properties:
                                             host:
-                                              description: 'Optional: Host name to connect to, defaults to the pod IP.'
+                                              description: 'Optional: Host name to
+                                                connect to, defaults to the pod IP.'
                                               type: string
                                             port:
                                               anyOf:
@@ -10452,7 +11870,8 @@ spec:
                                         More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
                                       properties:
                                         exec:
-                                          description: Exec specifies a command to execute in the container.
+                                          description: Exec specifies a command to
+                                            execute in the container.
                                           properties:
                                             command:
                                               description: |-
@@ -10467,7 +11886,8 @@ spec:
                                               x-kubernetes-list-type: atomic
                                           type: object
                                         httpGet:
-                                          description: HTTPGet specifies an HTTP GET request to perform.
+                                          description: HTTPGet specifies an HTTP GET
+                                            request to perform.
                                           properties:
                                             host:
                                               description: |-
@@ -10475,9 +11895,13 @@ spec:
                                                 "Host" in httpHeaders instead.
                                               type: string
                                             httpHeaders:
-                                              description: Custom headers to set in the request. HTTP allows repeated headers.
+                                              description: Custom headers to set in
+                                                the request. HTTP allows repeated
+                                                headers.
                                               items:
-                                                description: HTTPHeader describes a custom header to be used in HTTP probes
+                                                description: HTTPHeader describes
+                                                  a custom header to be used in HTTP
+                                                  probes
                                                 properties:
                                                   name:
                                                     description: |-
@@ -10485,7 +11909,8 @@ spec:
                                                       This will be canonicalized upon output, so case-variant names will be understood as the same header.
                                                     type: string
                                                   value:
-                                                    description: The header field value
+                                                    description: The header field
+                                                      value
                                                     type: string
                                                 required:
                                                 - name
@@ -10494,7 +11919,8 @@ spec:
                                               type: array
                                               x-kubernetes-list-type: atomic
                                             path:
-                                              description: Path to access on the HTTP server.
+                                              description: Path to access on the HTTP
+                                                server.
                                               type: string
                                             port:
                                               anyOf:
@@ -10514,10 +11940,12 @@ spec:
                                           - port
                                           type: object
                                         sleep:
-                                          description: Sleep represents a duration that the container should sleep.
+                                          description: Sleep represents a duration
+                                            that the container should sleep.
                                           properties:
                                             seconds:
-                                              description: Seconds is the number of seconds to sleep.
+                                              description: Seconds is the number of
+                                                seconds to sleep.
                                               format: int64
                                               type: integer
                                           required:
@@ -10530,7 +11958,8 @@ spec:
                                             lifecycle hooks will fail at runtime when it is specified.
                                           properties:
                                             host:
-                                              description: 'Optional: Host name to connect to, defaults to the pod IP.'
+                                              description: 'Optional: Host name to
+                                                connect to, defaults to the pod IP.'
                                               type: string
                                             port:
                                               anyOf:
@@ -10560,7 +11989,8 @@ spec:
                                     More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
                                   properties:
                                     exec:
-                                      description: Exec specifies a command to execute in the container.
+                                      description: Exec specifies a command to execute
+                                        in the container.
                                       properties:
                                         command:
                                           description: |-
@@ -10584,7 +12014,8 @@ spec:
                                       description: GRPC specifies a GRPC HealthCheckRequest.
                                       properties:
                                         port:
-                                          description: Port number of the gRPC service. Number must be in the range 1 to 65535.
+                                          description: Port number of the gRPC service.
+                                            Number must be in the range 1 to 65535.
                                           format: int32
                                           type: integer
                                         service:
@@ -10599,7 +12030,8 @@ spec:
                                       - port
                                       type: object
                                     httpGet:
-                                      description: HTTPGet specifies an HTTP GET request to perform.
+                                      description: HTTPGet specifies an HTTP GET request
+                                        to perform.
                                       properties:
                                         host:
                                           description: |-
@@ -10607,9 +12039,11 @@ spec:
                                             "Host" in httpHeaders instead.
                                           type: string
                                         httpHeaders:
-                                          description: Custom headers to set in the request. HTTP allows repeated headers.
+                                          description: Custom headers to set in the
+                                            request. HTTP allows repeated headers.
                                           items:
-                                            description: HTTPHeader describes a custom header to be used in HTTP probes
+                                            description: HTTPHeader describes a custom
+                                              header to be used in HTTP probes
                                             properties:
                                               name:
                                                 description: |-
@@ -10626,7 +12060,8 @@ spec:
                                           type: array
                                           x-kubernetes-list-type: atomic
                                         path:
-                                          description: Path to access on the HTTP server.
+                                          description: Path to access on the HTTP
+                                            server.
                                           type: string
                                         port:
                                           anyOf:
@@ -10664,10 +12099,12 @@ spec:
                                       format: int32
                                       type: integer
                                     tcpSocket:
-                                      description: TCPSocket specifies a connection to a TCP port.
+                                      description: TCPSocket specifies a connection
+                                        to a TCP port.
                                       properties:
                                         host:
-                                          description: 'Optional: Host name to connect to, defaults to the pod IP.'
+                                          description: 'Optional: Host name to connect
+                                            to, defaults to the pod IP.'
                                           type: string
                                         port:
                                           anyOf:
@@ -10719,7 +12156,8 @@ spec:
                                     For more information See https://github.com/kubernetes/kubernetes/issues/108255.
                                     Cannot be updated.
                                   items:
-                                    description: ContainerPort represents a network port in a single container.
+                                    description: ContainerPort represents a network
+                                      port in a single container.
                                     properties:
                                       containerPort:
                                         description: |-
@@ -10728,7 +12166,8 @@ spec:
                                         format: int32
                                         type: integer
                                       hostIP:
-                                        description: What host IP to bind the external port to.
+                                        description: What host IP to bind the external
+                                          port to.
                                         type: string
                                       hostPort:
                                         description: |-
@@ -10766,7 +12205,8 @@ spec:
                                     More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
                                   properties:
                                     exec:
-                                      description: Exec specifies a command to execute in the container.
+                                      description: Exec specifies a command to execute
+                                        in the container.
                                       properties:
                                         command:
                                           description: |-
@@ -10790,7 +12230,8 @@ spec:
                                       description: GRPC specifies a GRPC HealthCheckRequest.
                                       properties:
                                         port:
-                                          description: Port number of the gRPC service. Number must be in the range 1 to 65535.
+                                          description: Port number of the gRPC service.
+                                            Number must be in the range 1 to 65535.
                                           format: int32
                                           type: integer
                                         service:
@@ -10805,7 +12246,8 @@ spec:
                                       - port
                                       type: object
                                     httpGet:
-                                      description: HTTPGet specifies an HTTP GET request to perform.
+                                      description: HTTPGet specifies an HTTP GET request
+                                        to perform.
                                       properties:
                                         host:
                                           description: |-
@@ -10813,9 +12255,11 @@ spec:
                                             "Host" in httpHeaders instead.
                                           type: string
                                         httpHeaders:
-                                          description: Custom headers to set in the request. HTTP allows repeated headers.
+                                          description: Custom headers to set in the
+                                            request. HTTP allows repeated headers.
                                           items:
-                                            description: HTTPHeader describes a custom header to be used in HTTP probes
+                                            description: HTTPHeader describes a custom
+                                              header to be used in HTTP probes
                                             properties:
                                               name:
                                                 description: |-
@@ -10832,7 +12276,8 @@ spec:
                                           type: array
                                           x-kubernetes-list-type: atomic
                                         path:
-                                          description: Path to access on the HTTP server.
+                                          description: Path to access on the HTTP
+                                            server.
                                           type: string
                                         port:
                                           anyOf:
@@ -10870,10 +12315,12 @@ spec:
                                       format: int32
                                       type: integer
                                     tcpSocket:
-                                      description: TCPSocket specifies a connection to a TCP port.
+                                      description: TCPSocket specifies a connection
+                                        to a TCP port.
                                       properties:
                                         host:
-                                          description: 'Optional: Host name to connect to, defaults to the pod IP.'
+                                          description: 'Optional: Host name to connect
+                                            to, defaults to the pod IP.'
                                           type: string
                                         port:
                                           anyOf:
@@ -10910,9 +12357,12 @@ spec:
                                       type: integer
                                   type: object
                                 resizePolicy:
-                                  description: Resources resize policy for the container.
+                                  description: |-
+                                    Resources resize policy for the container.
+                                    This field cannot be set on ephemeral containers.
                                   items:
-                                    description: ContainerResizePolicy represents resource resize policy for the container.
+                                    description: ContainerResizePolicy represents
+                                      resource resize policy for the container.
                                     properties:
                                       resourceName:
                                         description: |-
@@ -10946,7 +12396,8 @@ spec:
 
                                         This field is immutable. It can only be set for containers.
                                       items:
-                                        description: ResourceClaim references one entry in PodSpec.ResourceClaims.
+                                        description: ResourceClaim references one
+                                          entry in PodSpec.ResourceClaims.
                                         properties:
                                           name:
                                             description: |-
@@ -11024,7 +12475,8 @@ spec:
                                     When rules are specified, container MUST set RestartPolicy explicitly
                                     even it if matches the Pod's RestartPolicy.
                                   items:
-                                    description: ContainerRestartRule describes how a container exit is handled.
+                                    description: ContainerRestartRule describes how
+                                      a container exit is handled.
                                     properties:
                                       action:
                                         description: |-
@@ -11033,7 +12485,8 @@ spec:
                                           container.
                                         type: string
                                       exitCodes:
-                                        description: Represents the exit codes to check on container exits.
+                                        description: Represents the exit codes to
+                                          check on container exits.
                                         properties:
                                           operator:
                                             description: |-
@@ -11110,14 +12563,16 @@ spec:
                                         add:
                                           description: Added capabilities
                                           items:
-                                            description: Capability represent POSIX capabilities type
+                                            description: Capability represent POSIX
+                                              capabilities type
                                             type: string
                                           type: array
                                           x-kubernetes-list-type: atomic
                                         drop:
                                           description: Removed capabilities
                                           items:
-                                            description: Capability represent POSIX capabilities type
+                                            description: Capability represent POSIX
+                                              capabilities type
                                             type: string
                                           type: array
                                           x-kubernetes-list-type: atomic
@@ -11179,16 +12634,20 @@ spec:
                                         Note that this field cannot be set when spec.os.name is windows.
                                       properties:
                                         level:
-                                          description: Level is SELinux level label that applies to the container.
+                                          description: Level is SELinux level label
+                                            that applies to the container.
                                           type: string
                                         role:
-                                          description: Role is a SELinux role label that applies to the container.
+                                          description: Role is a SELinux role label
+                                            that applies to the container.
                                           type: string
                                         type:
-                                          description: Type is a SELinux type label that applies to the container.
+                                          description: Type is a SELinux type label
+                                            that applies to the container.
                                           type: string
                                         user:
-                                          description: User is a SELinux user label that applies to the container.
+                                          description: User is a SELinux user label
+                                            that applies to the container.
                                           type: string
                                       type: object
                                     seccompProfile:
@@ -11231,7 +12690,8 @@ spec:
                                             GMSA credential spec named by the GMSACredentialSpecName field.
                                           type: string
                                         gmsaCredentialSpecName:
-                                          description: GMSACredentialSpecName is the name of the GMSA credential spec to use.
+                                          description: GMSACredentialSpecName is the
+                                            name of the GMSA credential spec to use.
                                           type: string
                                         hostProcess:
                                           description: |-
@@ -11260,7 +12720,8 @@ spec:
                                     More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
                                   properties:
                                     exec:
-                                      description: Exec specifies a command to execute in the container.
+                                      description: Exec specifies a command to execute
+                                        in the container.
                                       properties:
                                         command:
                                           description: |-
@@ -11284,7 +12745,8 @@ spec:
                                       description: GRPC specifies a GRPC HealthCheckRequest.
                                       properties:
                                         port:
-                                          description: Port number of the gRPC service. Number must be in the range 1 to 65535.
+                                          description: Port number of the gRPC service.
+                                            Number must be in the range 1 to 65535.
                                           format: int32
                                           type: integer
                                         service:
@@ -11299,7 +12761,8 @@ spec:
                                       - port
                                       type: object
                                     httpGet:
-                                      description: HTTPGet specifies an HTTP GET request to perform.
+                                      description: HTTPGet specifies an HTTP GET request
+                                        to perform.
                                       properties:
                                         host:
                                           description: |-
@@ -11307,9 +12770,11 @@ spec:
                                             "Host" in httpHeaders instead.
                                           type: string
                                         httpHeaders:
-                                          description: Custom headers to set in the request. HTTP allows repeated headers.
+                                          description: Custom headers to set in the
+                                            request. HTTP allows repeated headers.
                                           items:
-                                            description: HTTPHeader describes a custom header to be used in HTTP probes
+                                            description: HTTPHeader describes a custom
+                                              header to be used in HTTP probes
                                             properties:
                                               name:
                                                 description: |-
@@ -11326,7 +12791,8 @@ spec:
                                           type: array
                                           x-kubernetes-list-type: atomic
                                         path:
-                                          description: Path to access on the HTTP server.
+                                          description: Path to access on the HTTP
+                                            server.
                                           type: string
                                         port:
                                           anyOf:
@@ -11364,10 +12830,12 @@ spec:
                                       format: int32
                                       type: integer
                                     tcpSocket:
-                                      description: TCPSocket specifies a connection to a TCP port.
+                                      description: TCPSocket specifies a connection
+                                        to a TCP port.
                                       properties:
                                         host:
-                                          description: 'Optional: Host name to connect to, defaults to the pod IP.'
+                                          description: 'Optional: Host name to connect
+                                            to, defaults to the pod IP.'
                                           type: string
                                         port:
                                           anyOf:
@@ -11445,15 +12913,20 @@ spec:
                                     Default is false.
                                   type: boolean
                                 volumeDevices:
-                                  description: volumeDevices is the list of block devices to be used by the container.
+                                  description: volumeDevices is the list of block
+                                    devices to be used by the container.
                                   items:
-                                    description: volumeDevice describes a mapping of a raw block device within a container.
+                                    description: volumeDevice describes a mapping
+                                      of a raw block device within a container.
                                     properties:
                                       devicePath:
-                                        description: devicePath is the path inside of the container that the device will be mapped to.
+                                        description: devicePath is the path inside
+                                          of the container that the device will be
+                                          mapped to.
                                         type: string
                                       name:
-                                        description: name must match the name of a persistentVolumeClaim in the pod
+                                        description: name must match the name of a
+                                          persistentVolumeClaim in the pod
                                         type: string
                                     required:
                                     - devicePath
@@ -11468,7 +12941,8 @@ spec:
                                     Pod volumes to mount into the container's filesystem.
                                     Cannot be updated.
                                   items:
-                                    description: VolumeMount describes a mounting of a Volume within a container.
+                                    description: VolumeMount describes a mounting
+                                      of a Volume within a container.
                                     properties:
                                       mountPath:
                                         description: |-
@@ -11485,7 +12959,8 @@ spec:
                                           (which defaults to None).
                                         type: string
                                       name:
-                                        description: This must match the Name of a Volume.
+                                        description: This must match the Name of a
+                                          Volume.
                                         type: string
                                       readOnly:
                                         description: |-
@@ -11544,7 +13019,8 @@ spec:
                             type: array
                           extraVolumes:
                             items:
-                              description: Volume represents a named volume in a pod that may be accessed by any container in the pod.
+                              description: Volume represents a named volume in a pod
+                                that may be accessed by any container in the pod.
                               properties:
                                 awsElasticBlockStore:
                                   description: |-
@@ -11589,13 +13065,16 @@ spec:
                                     are redirected to the disk.csi.azure.com CSI driver.
                                   properties:
                                     cachingMode:
-                                      description: 'cachingMode is the Host Caching mode: None, Read Only, Read Write.'
+                                      description: 'cachingMode is the Host Caching
+                                        mode: None, Read Only, Read Write.'
                                       type: string
                                     diskName:
-                                      description: diskName is the Name of the data disk in the blob storage
+                                      description: diskName is the Name of the data
+                                        disk in the blob storage
                                       type: string
                                     diskURI:
-                                      description: diskURI is the URI of data disk in the blob storage
+                                      description: diskURI is the URI of data disk
+                                        in the blob storage
                                       type: string
                                     fsType:
                                       default: ext4
@@ -11605,7 +13084,11 @@ spec:
                                         Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
                                       type: string
                                     kind:
-                                      description: 'kind expected values are Shared: multiple blob disks per storage account  Dedicated: single blob disk per storage account  Managed: azure managed data disk (only in managed availability set). defaults to shared'
+                                      description: 'kind expected values are Shared:
+                                        multiple blob disks per storage account  Dedicated:
+                                        single blob disk per storage account  Managed:
+                                        azure managed data disk (only in managed availability
+                                        set). defaults to shared'
                                       type: string
                                     readOnly:
                                       default: false
@@ -11629,7 +13112,9 @@ spec:
                                         the ReadOnly setting in VolumeMounts.
                                       type: boolean
                                     secretName:
-                                      description: secretName is the  name of secret that contains Azure Storage Account Name and Key
+                                      description: secretName is the  name of secret
+                                        that contains Azure Storage Account Name and
+                                        Key
                                       type: string
                                     shareName:
                                       description: shareName is the azure share Name
@@ -11652,7 +13137,9 @@ spec:
                                       type: array
                                       x-kubernetes-list-type: atomic
                                     path:
-                                      description: 'path is Optional: Used as the mounted root, rather than the full Ceph tree, default is /'
+                                      description: 'path is Optional: Used as the
+                                        mounted root, rather than the full Ceph tree,
+                                        default is /'
                                       type: string
                                     readOnly:
                                       description: |-
@@ -11734,7 +13221,8 @@ spec:
                                   - volumeID
                                   type: object
                                 configMap:
-                                  description: configMap represents a configMap that should populate this volume
+                                  description: configMap represents a configMap that
+                                    should populate this volume
                                   properties:
                                     defaultMode:
                                       description: |-
@@ -11757,7 +13245,8 @@ spec:
                                         the volume setup will error unless it is marked optional. Paths must be
                                         relative and may not contain the '..' path or start with '..'.
                                       items:
-                                        description: Maps a string key to a path within a volume.
+                                        description: Maps a string key to a path within
+                                          a volume.
                                         properties:
                                           key:
                                             description: key is the key to project.
@@ -11795,12 +13284,15 @@ spec:
                                         More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
                                       type: string
                                     optional:
-                                      description: optional specify whether the ConfigMap or its keys must be defined
+                                      description: optional specify whether the ConfigMap
+                                        or its keys must be defined
                                       type: boolean
                                   type: object
                                   x-kubernetes-map-type: atomic
                                 csi:
-                                  description: csi (Container Storage Interface) represents ephemeral storage that is handled by certain external CSI drivers.
+                                  description: csi (Container Storage Interface) represents
+                                    ephemeral storage that is handled by certain external
+                                    CSI drivers.
                                   properties:
                                     driver:
                                       description: |-
@@ -11848,7 +13340,8 @@ spec:
                                   - driver
                                   type: object
                                 downwardAPI:
-                                  description: downwardAPI represents downward API about the pod that should populate this volume
+                                  description: downwardAPI represents downward API
+                                    about the pod that should populate this volume
                                   properties:
                                     defaultMode:
                                       description: |-
@@ -11863,18 +13356,26 @@ spec:
                                       format: int32
                                       type: integer
                                     items:
-                                      description: Items is a list of downward API volume file
+                                      description: Items is a list of downward API
+                                        volume file
                                       items:
-                                        description: DownwardAPIVolumeFile represents information to create the file containing the pod field
+                                        description: DownwardAPIVolumeFile represents
+                                          information to create the file containing
+                                          the pod field
                                         properties:
                                           fieldRef:
-                                            description: 'Required: Selects a field of the pod: only annotations, labels, name, namespace and uid are supported.'
+                                            description: 'Required: Selects a field
+                                              of the pod: only annotations, labels,
+                                              name, namespace and uid are supported.'
                                             properties:
                                               apiVersion:
-                                                description: Version of the schema the FieldPath is written in terms of, defaults to "v1".
+                                                description: Version of the schema
+                                                  the FieldPath is written in terms
+                                                  of, defaults to "v1".
                                                 type: string
                                               fieldPath:
-                                                description: Path of the field to select in the specified API version.
+                                                description: Path of the field to
+                                                  select in the specified API version.
                                                 type: string
                                             required:
                                             - fieldPath
@@ -11891,7 +13392,12 @@ spec:
                                             format: int32
                                             type: integer
                                           path:
-                                            description: 'Required: Path is  the relative path name of the file to be created. Must not be absolute or contain the ''..'' path. Must be utf-8 encoded. The first item of the relative path must not start with ''..'''
+                                            description: 'Required: Path is  the relative
+                                              path name of the file to be created.
+                                              Must not be absolute or contain the
+                                              ''..'' path. Must be utf-8 encoded.
+                                              The first item of the relative path
+                                              must not start with ''..'''
                                             type: string
                                           resourceFieldRef:
                                             description: |-
@@ -11899,17 +13405,21 @@ spec:
                                               (limits.cpu, limits.memory, requests.cpu and requests.memory) are currently supported.
                                             properties:
                                               containerName:
-                                                description: 'Container name: required for volumes, optional for env vars'
+                                                description: 'Container name: required
+                                                  for volumes, optional for env vars'
                                                 type: string
                                               divisor:
                                                 anyOf:
                                                 - type: integer
                                                 - type: string
-                                                description: Specifies the output format of the exposed resources, defaults to "1"
+                                                description: Specifies the output
+                                                  format of the exposed resources,
+                                                  defaults to "1"
                                                 pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
                                                 x-kubernetes-int-or-string: true
                                               resource:
-                                                description: 'Required: resource to select'
+                                                description: 'Required: resource to
+                                                  select'
                                                 type: string
                                             required:
                                             - resource
@@ -12037,10 +13547,12 @@ spec:
                                                     For any other third-party types, APIGroup is required.
                                                   type: string
                                                 kind:
-                                                  description: Kind is the type of resource being referenced
+                                                  description: Kind is the type of
+                                                    resource being referenced
                                                   type: string
                                                 name:
-                                                  description: Name is the name of resource being referenced
+                                                  description: Name is the name of
+                                                    resource being referenced
                                                   type: string
                                               required:
                                               - kind
@@ -12080,10 +13592,12 @@ spec:
                                                     For any other third-party types, APIGroup is required.
                                                   type: string
                                                 kind:
-                                                  description: Kind is the type of resource being referenced
+                                                  description: Kind is the type of
+                                                    resource being referenced
                                                   type: string
                                                 name:
-                                                  description: Name is the name of resource being referenced
+                                                  description: Name is the name of
+                                                    resource being referenced
                                                   type: string
                                                 namespace:
                                                   description: |-
@@ -12098,7 +13612,7 @@ spec:
                                             resources:
                                               description: |-
                                                 resources represents the minimum resources the volume should have.
-                                                If RecoverVolumeExpansionFailure feature is enabled users are allowed to specify resource requirements
+                                                Users are allowed to specify resource requirements
                                                 that are lower than previous value but must still be higher than capacity recorded in the
                                                 status field of the claim.
                                                 More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources
@@ -12129,17 +13643,22 @@ spec:
                                                   type: object
                                               type: object
                                             selector:
-                                              description: selector is a label query over volumes to consider for binding.
+                                              description: selector is a label query
+                                                over volumes to consider for binding.
                                               properties:
                                                 matchExpressions:
-                                                  description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
+                                                  description: matchExpressions is
+                                                    a list of label selector requirements.
+                                                    The requirements are ANDed.
                                                   items:
                                                     description: |-
                                                       A label selector requirement is a selector that contains values, a key, and an operator that
                                                       relates the key and values.
                                                     properties:
                                                       key:
-                                                        description: key is the label key that the selector applies to.
+                                                        description: key is the label
+                                                          key that the selector applies
+                                                          to.
                                                         type: string
                                                       operator:
                                                         description: |-
@@ -12196,7 +13715,9 @@ spec:
                                                 Value of Filesystem is implied when not included in claim spec.
                                               type: string
                                             volumeName:
-                                              description: volumeName is the binding reference to the PersistentVolume backing this claim.
+                                              description: volumeName is the binding
+                                                reference to the PersistentVolume
+                                                backing this claim.
                                               type: string
                                           type: object
                                       required:
@@ -12204,7 +13725,9 @@ spec:
                                       type: object
                                   type: object
                                 fc:
-                                  description: fc represents a Fibre Channel resource that is attached to a kubelet's host machine and then exposed to the pod.
+                                  description: fc represents a Fibre Channel resource
+                                    that is attached to a kubelet's host machine and
+                                    then exposed to the pod.
                                   properties:
                                     fsType:
                                       description: |-
@@ -12213,7 +13736,8 @@ spec:
                                         Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
                                       type: string
                                     lun:
-                                      description: 'lun is Optional: FC target lun number'
+                                      description: 'lun is Optional: FC target lun
+                                        number'
                                       format: int32
                                       type: integer
                                     readOnly:
@@ -12222,7 +13746,8 @@ spec:
                                         the ReadOnly setting in VolumeMounts.
                                       type: boolean
                                     targetWWNs:
-                                      description: 'targetWWNs is Optional: FC target worldwide names (WWNs)'
+                                      description: 'targetWWNs is Optional: FC target
+                                        worldwide names (WWNs)'
                                       items:
                                         type: string
                                       type: array
@@ -12243,7 +13768,8 @@ spec:
                                     Deprecated: FlexVolume is deprecated. Consider using a CSIDriver instead.
                                   properties:
                                     driver:
-                                      description: driver is the name of the driver to use for this volume.
+                                      description: driver is the name of the driver
+                                        to use for this volume.
                                       type: string
                                     fsType:
                                       description: |-
@@ -12254,7 +13780,8 @@ spec:
                                     options:
                                       additionalProperties:
                                         type: string
-                                      description: 'options is Optional: this field holds extra command options if any.'
+                                      description: 'options is Optional: this field
+                                        holds extra command options if any.'
                                       type: object
                                     readOnly:
                                       description: |-
@@ -12294,7 +13821,9 @@ spec:
                                         should be considered as deprecated
                                       type: string
                                     datasetUUID:
-                                      description: datasetUUID is the UUID of the dataset. This is unique identifier of a Flocker dataset
+                                      description: datasetUUID is the UUID of the
+                                        dataset. This is unique identifier of a Flocker
+                                        dataset
                                       type: string
                                   type: object
                                 gcePersistentDisk:
@@ -12353,7 +13882,8 @@ spec:
                                       description: repository is the URL
                                       type: string
                                     revision:
-                                      description: revision is the commit hash for the specified revision.
+                                      description: revision is the commit hash for
+                                        the specified revision.
                                       type: string
                                   required:
                                   - repository
@@ -12364,7 +13894,8 @@ spec:
                                     Deprecated: Glusterfs is deprecated and the in-tree glusterfs type is no longer supported.
                                   properties:
                                     endpoints:
-                                      description: endpoints is the endpoint name that details Glusterfs topology.
+                                      description: endpoints is the endpoint name
+                                        that details Glusterfs topology.
                                       type: string
                                     path:
                                       description: |-
@@ -12446,10 +13977,12 @@ spec:
                                     More info: https://kubernetes.io/docs/concepts/storage/volumes/#iscsi
                                   properties:
                                     chapAuthDiscovery:
-                                      description: chapAuthDiscovery defines whether support iSCSI Discovery CHAP authentication
+                                      description: chapAuthDiscovery defines whether
+                                        support iSCSI Discovery CHAP authentication
                                       type: boolean
                                     chapAuthSession:
-                                      description: chapAuthSession defines whether support iSCSI Session CHAP authentication
+                                      description: chapAuthSession defines whether
+                                        support iSCSI Session CHAP authentication
                                       type: boolean
                                     fsType:
                                       description: |-
@@ -12465,7 +13998,8 @@ spec:
                                         <target portal>:<volume name> will be created for the connection.
                                       type: string
                                     iqn:
-                                      description: iqn is the target iSCSI Qualified Name.
+                                      description: iqn is the target iSCSI Qualified
+                                        Name.
                                       type: string
                                     iscsiInterface:
                                       default: default
@@ -12474,7 +14008,8 @@ spec:
                                         Defaults to 'default' (tcp).
                                       type: string
                                     lun:
-                                      description: lun represents iSCSI Target Lun number.
+                                      description: lun represents iSCSI Target Lun
+                                        number.
                                       format: int32
                                       type: integer
                                     portals:
@@ -12491,7 +14026,8 @@ spec:
                                         Defaults to false.
                                       type: boolean
                                     secretRef:
-                                      description: secretRef is the CHAP Secret for iSCSI target and initiator authentication
+                                      description: secretRef is the CHAP Secret for
+                                        iSCSI target and initiator authentication
                                       properties:
                                         name:
                                           default: ""
@@ -12576,7 +14112,8 @@ spec:
                                         Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
                                       type: string
                                     pdID:
-                                      description: pdID is the ID that identifies Photon Controller persistent disk
+                                      description: pdID is the ID that identifies
+                                        Photon Controller persistent disk
                                       type: string
                                   required:
                                   - pdID
@@ -12600,13 +14137,15 @@ spec:
                                         the ReadOnly setting in VolumeMounts.
                                       type: boolean
                                     volumeID:
-                                      description: volumeID uniquely identifies a Portworx volume
+                                      description: volumeID uniquely identifies a
+                                        Portworx volume
                                       type: string
                                   required:
                                   - volumeID
                                   type: object
                                 projected:
-                                  description: projected items for all in one resources secrets, configmaps, and downward API
+                                  description: projected items for all in one resources
+                                    secrets, configmaps, and downward API
                                   properties:
                                     defaultMode:
                                       description: |-
@@ -12651,14 +14190,19 @@ spec:
                                                   everything".
                                                 properties:
                                                   matchExpressions:
-                                                    description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
+                                                    description: matchExpressions
+                                                      is a list of label selector
+                                                      requirements. The requirements
+                                                      are ANDed.
                                                     items:
                                                       description: |-
                                                         A label selector requirement is a selector that contains values, a key, and an operator that
                                                         relates the key and values.
                                                       properties:
                                                         key:
-                                                          description: key is the label key that the selector applies to.
+                                                          description: key is the
+                                                            label key that the selector
+                                                            applies to.
                                                           type: string
                                                         operator:
                                                           description: |-
@@ -12705,7 +14249,8 @@ spec:
                                                   ClusterTrustBundles.
                                                 type: boolean
                                               path:
-                                                description: Relative path from the volume root to write the bundle.
+                                                description: Relative path from the
+                                                  volume root to write the bundle.
                                                 type: string
                                               signerName:
                                                 description: |-
@@ -12717,7 +14262,8 @@ spec:
                                             - path
                                             type: object
                                           configMap:
-                                            description: configMap information about the configMap data to project
+                                            description: configMap information about
+                                              the configMap data to project
                                             properties:
                                               items:
                                                 description: |-
@@ -12729,10 +14275,12 @@ spec:
                                                   the volume setup will error unless it is marked optional. Paths must be
                                                   relative and may not contain the '..' path or start with '..'.
                                                 items:
-                                                  description: Maps a string key to a path within a volume.
+                                                  description: Maps a string key to
+                                                    a path within a volume.
                                                   properties:
                                                     key:
-                                                      description: key is the key to project.
+                                                      description: key is the key
+                                                        to project.
                                                       type: string
                                                     mode:
                                                       description: |-
@@ -12767,26 +14315,40 @@ spec:
                                                   More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
                                                 type: string
                                               optional:
-                                                description: optional specify whether the ConfigMap or its keys must be defined
+                                                description: optional specify whether
+                                                  the ConfigMap or its keys must be
+                                                  defined
                                                 type: boolean
                                             type: object
                                             x-kubernetes-map-type: atomic
                                           downwardAPI:
-                                            description: downwardAPI information about the downwardAPI data to project
+                                            description: downwardAPI information about
+                                              the downwardAPI data to project
                                             properties:
                                               items:
-                                                description: Items is a list of DownwardAPIVolume file
+                                                description: Items is a list of DownwardAPIVolume
+                                                  file
                                                 items:
-                                                  description: DownwardAPIVolumeFile represents information to create the file containing the pod field
+                                                  description: DownwardAPIVolumeFile
+                                                    represents information to create
+                                                    the file containing the pod field
                                                   properties:
                                                     fieldRef:
-                                                      description: 'Required: Selects a field of the pod: only annotations, labels, name, namespace and uid are supported.'
+                                                      description: 'Required: Selects
+                                                        a field of the pod: only annotations,
+                                                        labels, name, namespace and
+                                                        uid are supported.'
                                                       properties:
                                                         apiVersion:
-                                                          description: Version of the schema the FieldPath is written in terms of, defaults to "v1".
+                                                          description: Version of
+                                                            the schema the FieldPath
+                                                            is written in terms of,
+                                                            defaults to "v1".
                                                           type: string
                                                         fieldPath:
-                                                          description: Path of the field to select in the specified API version.
+                                                          description: Path of the
+                                                            field to select in the
+                                                            specified API version.
                                                           type: string
                                                       required:
                                                       - fieldPath
@@ -12803,7 +14365,14 @@ spec:
                                                       format: int32
                                                       type: integer
                                                     path:
-                                                      description: 'Required: Path is  the relative path name of the file to be created. Must not be absolute or contain the ''..'' path. Must be utf-8 encoded. The first item of the relative path must not start with ''..'''
+                                                      description: 'Required: Path
+                                                        is  the relative path name
+                                                        of the file to be created.
+                                                        Must not be absolute or contain
+                                                        the ''..'' path. Must be utf-8
+                                                        encoded. The first item of
+                                                        the relative path must not
+                                                        start with ''..'''
                                                       type: string
                                                     resourceFieldRef:
                                                       description: |-
@@ -12811,17 +14380,23 @@ spec:
                                                         (limits.cpu, limits.memory, requests.cpu and requests.memory) are currently supported.
                                                       properties:
                                                         containerName:
-                                                          description: 'Container name: required for volumes, optional for env vars'
+                                                          description: 'Container
+                                                            name: required for volumes,
+                                                            optional for env vars'
                                                           type: string
                                                         divisor:
                                                           anyOf:
                                                           - type: integer
                                                           - type: string
-                                                          description: Specifies the output format of the exposed resources, defaults to "1"
+                                                          description: Specifies the
+                                                            output format of the exposed
+                                                            resources, defaults to
+                                                            "1"
                                                           pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
                                                           x-kubernetes-int-or-string: true
                                                         resource:
-                                                          description: 'Required: resource to select'
+                                                          description: 'Required:
+                                                            resource to select'
                                                           type: string
                                                       required:
                                                       - resource
@@ -12931,14 +14506,34 @@ spec:
                                                 format: int32
                                                 type: integer
                                               signerName:
-                                                description: Kubelet's generated CSRs will be addressed to this signer.
+                                                description: Kubelet's generated CSRs
+                                                  will be addressed to this signer.
                                                 type: string
+                                              userAnnotations:
+                                                additionalProperties:
+                                                  type: string
+                                                description: |-
+                                                  userAnnotations allow pod authors to pass additional information to
+                                                  the signer implementation.  Kubernetes does not restrict or validate this
+                                                  metadata in any way.
+
+                                                  These values are copied verbatim into the `spec.unverifiedUserAnnotations` field of
+                                                  the PodCertificateRequest objects that Kubelet creates.
+
+                                                  Entries are subject to the same validation as object metadata annotations,
+                                                  with the addition that all keys must be domain-prefixed. No restrictions
+                                                  are placed on values, except an overall size limitation on the entire field.
+
+                                                  Signers should document the keys and values they support. Signers should
+                                                  deny requests that contain keys they do not recognize.
+                                                type: object
                                             required:
                                             - keyType
                                             - signerName
                                             type: object
                                           secret:
-                                            description: secret information about the secret data to project
+                                            description: secret information about
+                                              the secret data to project
                                             properties:
                                               items:
                                                 description: |-
@@ -12950,10 +14545,12 @@ spec:
                                                   the volume setup will error unless it is marked optional. Paths must be
                                                   relative and may not contain the '..' path or start with '..'.
                                                 items:
-                                                  description: Maps a string key to a path within a volume.
+                                                  description: Maps a string key to
+                                                    a path within a volume.
                                                   properties:
                                                     key:
-                                                      description: key is the key to project.
+                                                      description: key is the key
+                                                        to project.
                                                       type: string
                                                     mode:
                                                       description: |-
@@ -12988,12 +14585,16 @@ spec:
                                                   More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
                                                 type: string
                                               optional:
-                                                description: optional field specify whether the Secret or its key must be defined
+                                                description: optional field specify
+                                                  whether the Secret or its key must
+                                                  be defined
                                                 type: boolean
                                             type: object
                                             x-kubernetes-map-type: atomic
                                           serviceAccountToken:
-                                            description: serviceAccountToken is information about the serviceAccountToken data to project
+                                            description: serviceAccountToken is information
+                                              about the serviceAccountToken data to
+                                              project
                                             properties:
                                               audience:
                                                 description: |-
@@ -13056,7 +14657,8 @@ spec:
                                         Defaults to serivceaccount user
                                       type: string
                                     volume:
-                                      description: volume is a string that references an already created Quobyte volume by name.
+                                      description: volume is a string that references
+                                        an already created Quobyte volume by name.
                                       type: string
                                   required:
                                   - registry
@@ -13150,10 +14752,13 @@ spec:
                                         Default is "xfs".
                                       type: string
                                     gateway:
-                                      description: gateway is the host address of the ScaleIO API Gateway.
+                                      description: gateway is the host address of
+                                        the ScaleIO API Gateway.
                                       type: string
                                     protectionDomain:
-                                      description: protectionDomain is the name of the ScaleIO Protection Domain for the configured storage.
+                                      description: protectionDomain is the name of
+                                        the ScaleIO Protection Domain for the configured
+                                        storage.
                                       type: string
                                     readOnly:
                                       description: |-
@@ -13177,7 +14782,8 @@ spec:
                                       type: object
                                       x-kubernetes-map-type: atomic
                                     sslEnabled:
-                                      description: sslEnabled Flag enable/disable SSL communication with Gateway, default false
+                                      description: sslEnabled Flag enable/disable
+                                        SSL communication with Gateway, default false
                                       type: boolean
                                     storageMode:
                                       default: ThinProvisioned
@@ -13186,10 +14792,12 @@ spec:
                                         Default is ThinProvisioned.
                                       type: string
                                     storagePool:
-                                      description: storagePool is the ScaleIO Storage Pool associated with the protection domain.
+                                      description: storagePool is the ScaleIO Storage
+                                        Pool associated with the protection domain.
                                       type: string
                                     system:
-                                      description: system is the name of the storage system as configured in ScaleIO.
+                                      description: system is the name of the storage
+                                        system as configured in ScaleIO.
                                       type: string
                                     volumeName:
                                       description: |-
@@ -13227,7 +14835,8 @@ spec:
                                         the volume setup will error unless it is marked optional. Paths must be
                                         relative and may not contain the '..' path or start with '..'.
                                       items:
-                                        description: Maps a string key to a path within a volume.
+                                        description: Maps a string key to a path within
+                                          a volume.
                                         properties:
                                           key:
                                             description: key is the key to project.
@@ -13256,7 +14865,8 @@ spec:
                                       type: array
                                       x-kubernetes-list-type: atomic
                                     optional:
-                                      description: optional field specify whether the Secret or its keys must be defined
+                                      description: optional field specify whether
+                                        the Secret or its keys must be defined
                                       type: boolean
                                     secretName:
                                       description: |-
@@ -13324,13 +14934,17 @@ spec:
                                         Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
                                       type: string
                                     storagePolicyID:
-                                      description: storagePolicyID is the storage Policy Based Management (SPBM) profile ID associated with the StoragePolicyName.
+                                      description: storagePolicyID is the storage
+                                        Policy Based Management (SPBM) profile ID
+                                        associated with the StoragePolicyName.
                                       type: string
                                     storagePolicyName:
-                                      description: storagePolicyName is the storage Policy Based Management (SPBM) profile name.
+                                      description: storagePolicyName is the storage
+                                        Policy Based Management (SPBM) profile name.
                                       type: string
                                     volumePath:
-                                      description: volumePath is the path that identifies vSphere volume vmdk
+                                      description: volumePath is the path that identifies
+                                        vSphere volume vmdk
                                       type: string
                                   required:
                                   - volumePath
@@ -13357,12 +14971,134 @@ spec:
                                   type: string
                                 type: object
                             type: object
+                          probes:
+                            description: |-
+                              Probes defines probe configuration for Control Plane components.
+                              Global probe settings (Liveness, Readiness, Startup) apply to all components.
+                              Control Plane Component customisation has priority over these.
+                            properties:
+                              liveness:
+                                description: Liveness defines parameters for the liveness
+                                  probe.
+                                properties:
+                                  failureThreshold:
+                                    description: FailureThreshold is the consecutive
+                                      failure count required to consider the probe
+                                      failed.
+                                    format: int32
+                                    minimum: 1
+                                    type: integer
+                                  initialDelaySeconds:
+                                    description: InitialDelaySeconds is the number
+                                      of seconds after the container has started before
+                                      the probe is initiated.
+                                    format: int32
+                                    minimum: 0
+                                    type: integer
+                                  periodSeconds:
+                                    description: PeriodSeconds is how often (in seconds)
+                                      to perform the probe.
+                                    format: int32
+                                    minimum: 1
+                                    type: integer
+                                  successThreshold:
+                                    description: |-
+                                      SuccessThreshold is the minimum consecutive successes for the probe to be considered successful.
+                                      Must be 1 for liveness and startup probes.
+                                    format: int32
+                                    minimum: 1
+                                    type: integer
+                                  timeoutSeconds:
+                                    description: TimeoutSeconds is the number of seconds
+                                      after which the probe times out.
+                                    format: int32
+                                    minimum: 1
+                                    type: integer
+                                type: object
+                              readiness:
+                                description: Readiness defines parameters for the
+                                  readiness probe.
+                                properties:
+                                  failureThreshold:
+                                    description: FailureThreshold is the consecutive
+                                      failure count required to consider the probe
+                                      failed.
+                                    format: int32
+                                    minimum: 1
+                                    type: integer
+                                  initialDelaySeconds:
+                                    description: InitialDelaySeconds is the number
+                                      of seconds after the container has started before
+                                      the probe is initiated.
+                                    format: int32
+                                    minimum: 0
+                                    type: integer
+                                  periodSeconds:
+                                    description: PeriodSeconds is how often (in seconds)
+                                      to perform the probe.
+                                    format: int32
+                                    minimum: 1
+                                    type: integer
+                                  successThreshold:
+                                    description: |-
+                                      SuccessThreshold is the minimum consecutive successes for the probe to be considered successful.
+                                      Must be 1 for liveness and startup probes.
+                                    format: int32
+                                    minimum: 1
+                                    type: integer
+                                  timeoutSeconds:
+                                    description: TimeoutSeconds is the number of seconds
+                                      after which the probe times out.
+                                    format: int32
+                                    minimum: 1
+                                    type: integer
+                                type: object
+                              startup:
+                                description: Startup defines parameters for the startup
+                                  probe.
+                                properties:
+                                  failureThreshold:
+                                    description: FailureThreshold is the consecutive
+                                      failure count required to consider the probe
+                                      failed.
+                                    format: int32
+                                    minimum: 1
+                                    type: integer
+                                  initialDelaySeconds:
+                                    description: InitialDelaySeconds is the number
+                                      of seconds after the container has started before
+                                      the probe is initiated.
+                                    format: int32
+                                    minimum: 0
+                                    type: integer
+                                  periodSeconds:
+                                    description: PeriodSeconds is how often (in seconds)
+                                      to perform the probe.
+                                    format: int32
+                                    minimum: 1
+                                    type: integer
+                                  successThreshold:
+                                    description: |-
+                                      SuccessThreshold is the minimum consecutive successes for the probe to be considered successful.
+                                      Must be 1 for liveness and startup probes.
+                                    format: int32
+                                    minimum: 1
+                                    type: integer
+                                  timeoutSeconds:
+                                    description: TimeoutSeconds is the number of seconds
+                                      after which the probe times out.
+                                    format: int32
+                                    minimum: 1
+                                    type: integer
+                                type: object
+                            type: object
                           runtimeClassName:
                             type: string
                           serviceAccountName:
                             type: string
                           strategy:
-                            description: DeploymentStrategy describes how to replace existing pods with new ones.
+                            description: DeploymentStrategy describes how to replace
+                              existing pods with new ones.
                             properties:
                               rollingUpdate:
                                 description: |-
@@ -13404,7 +15140,8 @@ spec:
                                     x-kubernetes-int-or-string: true
                                 type: object
                               type:
-                                description: Type of deployment. Can be "Recreate" or "RollingUpdate". Default is RollingUpdate.
+                                description: Type of deployment. Can be "Recreate"
+                                  or "RollingUpdate". Default is RollingUpdate.
                                 type: string
                             type: object
                           tolerations:
@@ -13426,9 +15163,10 @@ spec:
                                 operator:
                                   description: |-
                                     Operator represents a key's relationship to the value.
-                                    Valid operators are Exists and Equal. Defaults to Equal.
+                                    Valid operators are Exists, Equal, Lt, and Gt. Defaults to Equal.
                                     Exists is equivalent to wildcard for value, so that a pod can
                                     tolerate all taints of a particular category.
+                                    Lt and Gt perform numeric comparisons (requires feature gate TaintTolerationComparisonOperators).
                                   type: string
                                 tolerationSeconds:
                                   description: |-
@@ -13447,7 +15185,8 @@ spec:
                             type: array
                           topologySpreadConstraints:
                             items:
-                              description: TopologySpreadConstraint specifies how to spread matching pods among the given topology.
+                              description: TopologySpreadConstraint specifies how
+                                to spread matching pods among the given topology.
                               properties:
                                 labelSelector:
                                   description: |-
@@ -13456,14 +15195,17 @@ spec:
                                     in their corresponding topology domain.
                                   properties:
                                     matchExpressions:
-                                      description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
+                                      description: matchExpressions is a list of label
+                                        selector requirements. The requirements are
+                                        ANDed.
                                       items:
                                         description: |-
                                           A label selector requirement is a selector that contains values, a key, and an operator that
                                           relates the key and values.
                                         properties:
                                           key:
-                                            description: key is the label key that the selector applies to.
+                                            description: key is the label key that
+                                              the selector applies to.
                                             type: string
                                           operator:
                                             description: |-
@@ -13626,7 +15368,8 @@ spec:
                               type: string
                             type: array
                           resources:
-                            description: ResourceRequirements describes the compute resource requirements.
+                            description: ResourceRequirements describes the compute
+                              resource requirements.
                             properties:
                               claims:
                                 description: |-
@@ -13638,7 +15381,8 @@ spec:
 
                                   This field is immutable. It can only be set for containers.
                                 items:
-                                  description: ResourceClaim references one entry in PodSpec.ResourceClaims.
+                                  description: ResourceClaim references one entry
+                                    in PodSpec.ResourceClaims.
                                   properties:
                                     name:
                                       description: |-
@@ -13692,16 +15436,56 @@ spec:
                           - InternalIP
                           - ExternalIP
                           - Hostname
-                        description: Configure the Kubelet options, such as the preferred address types, or the expected cgroupfs.
+                        description: Configure the Kubelet options, such as the preferred
+                          address types, or the expected cgroupfs.
                         properties:
                           cgroupfs:
                             description: |-
                               CGroupFS defines the cgroup driver for Kubelet
                               https://kubernetes.io/docs/tasks/administer-cluster/kubeadm/configure-cgroup-driver/
+
+                              Deprecated: use ConfigurationJSONPatches.
                             enum:
                             - systemd
                             - cgroupfs
                             type: string
+                          configurationJSONPatches:
+                            description: |-
+                              ConfigurationJSONPatches contains the RFC 6902 JSON patches to customise the kubeadm generate configuration,
+                              useful to customise and mangling the configuration according to your needs;
+                              e.g.: configuring the cgroup driver used by Kubelet is possible via the following patch:
+
+                              [{"op": "replace", "path": "/cgroupDriver", "value": "systemd"}]
+                            items:
+                              properties:
+                                from:
+                                  description: From specifies the source location
+                                    for move or copy operations.
+                                  type: string
+                                op:
+                                  description: Op is the RFC 6902 JSON Patch operation.
+                                  enum:
+                                  - add
+                                  - remove
+                                  - replace
+                                  - move
+                                  - copy
+                                  - test
+                                  type: string
+                                path:
+                                  description: Path specifies the target location
+                                    in the JSON document. Use "/" to separate keys;
+                                    "-" for appending to arrays.
+                                  type: string
+                                value:
+                                  description: Value is the operation value to be
+                                    used when Op is add, replace, test.
+                                  x-kubernetes-preserve-unknown-fields: true
+                              required:
+                              - op
+                              - path
+                              type: object
+                            type: array
                           preferredAddressTypes:
                             default:
                             - InternalIP
@@ -13725,8 +15509,70 @@ spec:
                       network:
                         default:
                           serviceType: LoadBalancer
-                        description: Configure how the TenantControlPlane should be exposed.
+                        description: Configure how the TenantControlPlane should be
+                          exposed.
                         properties:
+                          additionalServicePorts:
+                            description: |-
+                              AdditionalServicePorts adds extra ports to the Service that fronts the
+                              TenantControlPlane Pods. Useful when sidecars (such as a CSR signer)
+                              running alongside the kube-apiserver need to be reachable from tenant
+                              workers through the same Service endpoint.
+                            items:
+                              properties:
+                                appProtocol:
+                                  description: |-
+                                    The application protocol for this port.
+                                    This is used as a hint for implementations to offer richer behavior for protocols that they understand.
+                                    This field follows standard Kubernetes label syntax.
+                                    Valid values are either:
+
+                                    * Un-prefixed protocol names - reserved for IANA standard service names (as per
+                                    RFC-6335 and https://www.iana.org/assignments/service-names).
+                                  type: string
+                                name:
+                                  description: |-
+                                    The name of this port within the Service created by Kamaji.
+                                    This must be a DNS_LABEL, must have unique names, and cannot be `kube-apiserver`, or `konnectivity-server`.
+                                  type: string
+                                port:
+                                  description: The port that will be exposed by this
+                                    service.
+                                  format: int32
+                                  type: integer
+                                protocol:
+                                  default: TCP
+                                  description: The IP protocol for this port. Supports
+                                    "TCP", "UDP", and "SCTP".
+                                  enum:
+                                  - TCP
+                                  - UDP
+                                  - SCTP
+                                  type: string
+                                targetPort:
+                                  anyOf:
+                                  - type: integer
+                                  - type: string
+                                  description: |-
+                                    Number or name of the port to access on the pods of the Tenant Control Plane.
+                                    Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME.
+                                    If this is a string, it will be looked up as a named port in the
+                                    target Pod's container ports. If this is not specified, the value
+                                    of the 'port' field is used (an identity map).
+                                  x-kubernetes-int-or-string: true
+                              required:
+                              - name
+                              - port
+                              - targetPort
+                              type: object
+                            type: array
+                          advertiseAddress:
+                            description: |-
+                              AdvertiseAddress is the address advertised to tenant-side consumers (workers, konnectivity).
+                              When set, the management address (serviceAddress or LoadBalancer IP) is used for CAPI
+                              cluster-cache, while this address is used for kubeadm ControlPlaneEndpoint and cluster-info.
+                              Both addresses are included in the API server certificate SANs.
+                            type: string
                           certSANs:
                             description: |-
                               Configure additional Subject Address Names for the kube-apiserver certificate,
@@ -13742,13 +15588,53 @@ spec:
                             items:
                               type: string
                             type: array
+                          gateway:
+                            description: |-
+                              When specified, the KamajiControlPlane will be reachable using a Gateway API object
+                              deployed in the management cluster.
+                            properties:
+                              extraAnnotations:
+                                additionalProperties:
+                                  type: string
+                                description: |-
+                                  Defines the extra annotations for the Gateway object.
+                                  Useful if you need Gateway or vendor-specific options.
+                                type: object
+                              extraLabels:
+                                additionalProperties:
+                                  type: string
+                                description: Defines the extra labels for the Gateway
+                                  object.
+                                type: object
+                              hostname:
+                                description: |-
+                                  Defines the hostname for the Gateway object.
+                                  When using a Gateway object the FQDN is automatically added to the Certificate SANs.
+                                minLength: 1
+                                type: string
+                              name:
+                                description: Defines the Gateway API name for the
+                                  Gateway object.
+                                minLength: 1
+                                type: string
+                              namespace:
+                                description: Defines the Gateway API namespace for
+                                  the Gateway object.
+                                minLength: 1
+                                type: string
+                            required:
+                            - hostname
+                            - name
+                            - namespace
+                            type: object
                           ingress:
                             description: |-
                               When specified, the KamajiControlPlane will be reachable using an Ingress object
                               deployed in the management cluster.
                             properties:
                               className:
-                                description: Defines the Ingress Class for the Ingress object.
+                                description: Defines the Ingress Class for the Ingress
+                                  object.
                                 type: string
                               extraAnnotations:
                                 additionalProperties:
@@ -13760,7 +15646,8 @@ spec:
                               extraLabels:
                                 additionalProperties:
                                   type: string
-                                description: Defines the extra labels for the Ingress object.
+                                description: Defines the extra labels for the Ingress
+                                  object.
                                 type: object
                               hostname:
                                 description: |-
@@ -13772,7 +15659,8 @@ spec:
                             - hostname
                             type: object
                           loadBalancerConfig:
-                            description: Optional configuration for the LoadBalancer service that exposes the Kamaji control plane.
+                            description: Optional configuration for the LoadBalancer
+                              service that exposes the Kamaji control plane.
                             properties:
                               loadBalancerClass:
                                 description: |-
@@ -13811,7 +15699,8 @@ spec:
                             type: object
                           serviceType:
                             default: LoadBalancer
-                            description: Service Type string describes ingress methods for a service
+                            description: Service Type string describes ingress methods
+                              for a service
                             enum:
                             - ClusterIP
                             - NodePort
@@ -13819,12 +15708,20 @@ spec:
                             type: string
                         type: object
                         x-kubernetes-validations:
-                        - message: LoadBalancerSourceRanges are supported only with LoadBalancer service type
-                          rule: '!has(self.loadBalancerConfig) || !has(self.loadBalancerConfig.loadBalancerSourceRanges) || (size(self.loadBalancerConfig.loadBalancerSourceRanges) == 0 || self.serviceType == ''LoadBalancer'')'
-                        - message: LoadBalancerClass is supported only with LoadBalancer service type
-                          rule: '!has(self.loadBalancerConfig) || !has(self.loadBalancerConfig.loadBalancerClass) || self.serviceType == ''LoadBalancer'''
+                        - message: LoadBalancerSourceRanges are supported only with
+                            LoadBalancer service type
+                          rule: '!has(self.loadBalancerConfig) || !has(self.loadBalancerConfig.loadBalancerSourceRanges)
+                            || (size(self.loadBalancerConfig.loadBalancerSourceRanges)
+                            == 0 || self.serviceType == ''LoadBalancer'')'
+                        - message: LoadBalancerClass is supported only with LoadBalancer
+                            service type
+                          rule: '!has(self.loadBalancerConfig) || !has(self.loadBalancerConfig.loadBalancerClass)
+                            || self.serviceType == ''LoadBalancer'''
                         - message: LoadBalancerClass cannot be set or unset at runtime
-                          rule: self.serviceType != 'LoadBalancer' || (oldSelf.serviceType != 'LoadBalancer' && self.serviceType == 'LoadBalancer') || !has(self.loadBalancerConfig) || has(self.loadBalancerConfig) && has(self.loadBalancerConfig.loadBalancerClass) == has(oldSelf.loadBalancerConfig.loadBalancerClass)
+                          rule: self.serviceType != 'LoadBalancer' || (oldSelf.serviceType
+                            != 'LoadBalancer' && self.serviceType == 'LoadBalancer')
+                            || !has(self.loadBalancerConfig) || has(self.loadBalancerConfig)
+                            && has(self.loadBalancerConfig.loadBalancerClass) == has(oldSelf.loadBalancerConfig.loadBalancerClass)
                       registry:
                         default: registry.k8s.io
                         description: |-
@@ -13832,7 +15729,8 @@ spec:
                           Helpful if running in an air-gapped environment.
                         type: string
                       scheduler:
-                        description: ControlPlaneComponent allows the customization for the given component of the control plane.
+                        description: ControlPlaneComponent allows the customization
+                          for the given component of the control plane.
                         properties:
                           containerImageName:
                             description: |-
@@ -13846,7 +15744,8 @@ spec:
                             type: array
                           extraVolumeMounts:
                             items:
-                              description: VolumeMount describes a mounting of a Volume within a container.
+                              description: VolumeMount describes a mounting of a Volume
+                                within a container.
                               properties:
                                 mountPath:
                                   description: |-
@@ -13906,8 +15805,127 @@ spec:
                               - name
                               type: object
                             type: array
+                          probes:
+                            description: Probes defines per-probe-type configuration.
+                            properties:
+                              liveness:
+                                description: Liveness defines parameters for the liveness
+                                  probe.
+                                properties:
+                                  failureThreshold:
+                                    description: FailureThreshold is the consecutive
+                                      failure count required to consider the probe
+                                      failed.
+                                    format: int32
+                                    minimum: 1
+                                    type: integer
+                                  initialDelaySeconds:
+                                    description: InitialDelaySeconds is the number
+                                      of seconds after the container has started before
+                                      the probe is initiated.
+                                    format: int32
+                                    minimum: 0
+                                    type: integer
+                                  periodSeconds:
+                                    description: PeriodSeconds is how often (in seconds)
+                                      to perform the probe.
+                                    format: int32
+                                    minimum: 1
+                                    type: integer
+                                  successThreshold:
+                                    description: |-
+                                      SuccessThreshold is the minimum consecutive successes for the probe to be considered successful.
+                                      Must be 1 for liveness and startup probes.
+                                    format: int32
+                                    minimum: 1
+                                    type: integer
+                                  timeoutSeconds:
+                                    description: TimeoutSeconds is the number of seconds
+                                      after which the probe times out.
+                                    format: int32
+                                    minimum: 1
+                                    type: integer
+                                type: object
+                              readiness:
+                                description: Readiness defines parameters for the
+                                  readiness probe.
+                                properties:
+                                  failureThreshold:
+                                    description: FailureThreshold is the consecutive
+                                      failure count required to consider the probe
+                                      failed.
+                                    format: int32
+                                    minimum: 1
+                                    type: integer
+                                  initialDelaySeconds:
+                                    description: InitialDelaySeconds is the number
+                                      of seconds after the container has started before
+                                      the probe is initiated.
+                                    format: int32
+                                    minimum: 0
+                                    type: integer
+                                  periodSeconds:
+                                    description: PeriodSeconds is how often (in seconds)
+                                      to perform the probe.
+                                    format: int32
+                                    minimum: 1
+                                    type: integer
+                                  successThreshold:
+                                    description: |-
+                                      SuccessThreshold is the minimum consecutive successes for the probe to be considered successful.
+                                      Must be 1 for liveness and startup probes.
+                                    format: int32
+                                    minimum: 1
+                                    type: integer
+                                  timeoutSeconds:
+                                    description: TimeoutSeconds is the number of seconds
+                                      after which the probe times out.
+                                    format: int32
+                                    minimum: 1
+                                    type: integer
+                                type: object
+                              startup:
+                                description: Startup defines parameters for the startup
+                                  probe.
+                                properties:
+                                  failureThreshold:
+                                    description: FailureThreshold is the consecutive
+                                      failure count required to consider the probe
+                                      failed.
+                                    format: int32
+                                    minimum: 1
+                                    type: integer
+                                  initialDelaySeconds:
+                                    description: InitialDelaySeconds is the number
+                                      of seconds after the container has started before
+                                      the probe is initiated.
+                                    format: int32
+                                    minimum: 0
+                                    type: integer
+                                  periodSeconds:
+                                    description: PeriodSeconds is how often (in seconds)
+                                      to perform the probe.
+                                    format: int32
+                                    minimum: 1
+                                    type: integer
+                                  successThreshold:
+                                    description: |-
+                                      SuccessThreshold is the minimum consecutive successes for the probe to be considered successful.
+                                      Must be 1 for liveness and startup probes.
+                                    format: int32
+                                    minimum: 1
+                                    type: integer
+                                  timeoutSeconds:
+                                    description: TimeoutSeconds is the number of seconds
+                                      after which the probe times out.
+                                    format: int32
+                                    minimum: 1
+                                    type: integer
+                                type: object
+                            type: object
                           resources:
-                            description: ResourceRequirements describes the compute resource requirements.
+                            description: ResourceRequirements describes the compute
+                              resource requirements.
                             properties:
                               claims:
                                 description: |-
@@ -13919,7 +15937,8 @@ spec:
 
                                   This field is immutable. It can only be set for containers.
                                 items:
-                                  description: ResourceClaim references one entry in PodSpec.ResourceClaims.
+                                  description: ResourceClaim references one entry
+                                    in PodSpec.ResourceClaims.
                                   properties:
                                     name:
                                       description: |-
@@ -14158,6 +16177,7 @@ rules:
   - infrastructure.cluster.x-k8s.io
   resources:
   - metal3clusters
+  - metalstackclusters
   verbs:
   - get
   - list
@@ -14272,7 +16292,7 @@ spec:
         - --dynamic-infrastructure-clusters=${CACPPK_INFRASTRUCTURE_CLUSTERS:= }
         command:
         - /manager
-        image: docker.io/clastix/cluster-api-control-plane-provider-kamaji:v0.16.0
+        image: ghcr.io/cozystack/cozystack/cluster-api-control-plane-provider-kamaji:v0.19.0-cozystack.0@sha256:a0b8367f374432a5fa0b12018a35b0e4828466f53eb6de263d90c3408d9fd07d
         livenessProbe:
           httpGet:
             path: /healthz
diff --git a/packages/system/capi-providers-cpprovider/files/metadata.yaml b/packages/system/capi-providers-cpprovider/files/metadata.yaml
index d22c9ab029..ea3ceeaabb 100644
--- a/packages/system/capi-providers-cpprovider/files/metadata.yaml
+++ b/packages/system/capi-providers-cpprovider/files/metadata.yaml
@@ -5,6 +5,15 @@
 # update this file only when a new major or minor version is released
 apiVersion: clusterctl.cluster.x-k8s.io/v1alpha3
 releaseSeries:
+  - major: 0
+    minor: 19
+    contract: v1beta1
+  - major: 0
+    minor: 18
+    contract: v1beta1
+  - major: 0
+    minor: 17
+    contract: v1beta1
   - major: 0
     minor: 16
     contract: v1beta1
diff --git a/packages/system/capi-providers-cpprovider/images/cluster-api-control-plane-provider-kamaji.tag b/packages/system/capi-providers-cpprovider/images/cluster-api-control-plane-provider-kamaji.tag
new file mode 100644
index 0000000000..a32ca90854
--- /dev/null
+++ b/packages/system/capi-providers-cpprovider/images/cluster-api-control-plane-provider-kamaji.tag
@@ -0,0 +1 @@
+ghcr.io/cozystack/cozystack/cluster-api-control-plane-provider-kamaji:v0.19.0-cozystack.0@sha256:a0b8367f374432a5fa0b12018a35b0e4828466f53eb6de263d90c3408d9fd07d
diff --git a/packages/system/capi-providers-cpprovider/images/cluster-api-control-plane-provider-kamaji/Dockerfile b/packages/system/capi-providers-cpprovider/images/cluster-api-control-plane-provider-kamaji/Dockerfile
new file mode 100644
index 0000000000..1b89a27286
--- /dev/null
+++ b/packages/system/capi-providers-cpprovider/images/cluster-api-control-plane-provider-kamaji/Dockerfile
@@ -0,0 +1,48 @@
+# Builds the clastix/cluster-api-control-plane-provider-kamaji manager
+# binary from a tagged upstream release with a small backport patch.
+#
+# We pin to v0.19.0 because everything after it (upstream master, the
+# unreleased v0.20.0) renames api/v1alpha1 -> api/v1alpha2 wholesale and
+# ships a CRD that serves only v1alpha2 with no conversion webhook -
+# upgrading would orphan every existing KamajiControlPlane in the wild
+# until a manual rewrite. patches/0001-backport-additional-service-ports-pr347.diff
+# brings PR #347 (AdditionalServicePorts) back to the v1alpha1 schema,
+# which our chart relies on for the talos-trustd sidecar port. Once
+# upstream ships a real migration path, drop both this Dockerfile and the
+# patch and consume vanilla upstream images directly.
+FROM --platform=$BUILDPLATFORM golang:1.27@sha256:3680233e3204827fbdc66088528ae6d4b3d034f51d03a99d454f6de034888244 AS builder
+ARG GOPROXY
+
+# Upstream release tag. Bump together with patches/ when refreshing.
+ARG VERSION=v0.19.0
+ARG TARGETOS
+ARG TARGETARCH
+
+WORKDIR /workspace
+
+RUN curl -sSL "https://github.com/clastix/cluster-api-control-plane-provider-kamaji/archive/refs/tags/${VERSION}.tar.gz" \
+    | tar -xzf - --strip=1
+
+COPY patches /patches
+RUN git apply --recount /patches/*.diff
+
+# go build never compiles a _test.go, so nothing else runs the tests of the
+# packages the patches touch. Each package is tested from its own directory:
+# that finds the module it belongs to, and an empty list runs nothing.
+# The list is read into a variable first: a for loop drops the exit status
+# of a command substitution, so a patch git cannot read would leave the list
+# empty and the step green.
+RUN files=$(git apply --numstat --recount /patches/*.diff) || exit 1; \
+    for dir in $(printf '%s\n' "$files" | cut -f3 | grep '\.go$' | xargs -r -n1 dirname | sort -u); do \
+      (cd "$dir" && go test .) || exit 1; \
+    done
+
+RUN CGO_ENABLED=0 GOOS=${TARGETOS:-linux} GOARCH=${TARGETARCH} \
+    go build -a -o manager main.go
+
+FROM gcr.io/distroless/static:nonroot@sha256:e2e927ec666bae08560abb3c55d0659eceabb657f56b6782ab500a9fc7f555e3
+WORKDIR /
+COPY --from=builder /workspace/manager /manager
+USER 65532:65532
+
+ENTRYPOINT ["/manager"]
diff --git a/packages/system/capi-providers-cpprovider/images/cluster-api-control-plane-provider-kamaji/patches/0001-backport-additional-service-ports-pr347.diff b/packages/system/capi-providers-cpprovider/images/cluster-api-control-plane-provider-kamaji/patches/0001-backport-additional-service-ports-pr347.diff
new file mode 100644
index 0000000000..9b669f3128
--- /dev/null
+++ b/packages/system/capi-providers-cpprovider/images/cluster-api-control-plane-provider-kamaji/patches/0001-backport-additional-service-ports-pr347.diff
@@ -0,0 +1,297 @@
+diff --git a/api/v1alpha1/kamajicontrolplane_types.go b/api/v1alpha1/kamajicontrolplane_types.go
+index 3068fe5..bd1f229 100644
+--- a/api/v1alpha1/kamajicontrolplane_types.go
++++ b/api/v1alpha1/kamajicontrolplane_types.go
+@@ -109,6 +109,11 @@ type NetworkComponent struct {
+ 	AdvertiseAddress   string            `json:"advertiseAddress,omitempty"`
+ 	ServiceLabels      map[string]string `json:"serviceLabels,omitempty"`
+ 	ServiceAnnotations map[string]string `json:"serviceAnnotations,omitempty"`
++	// AdditionalServicePorts adds extra ports to the Service that fronts the
++	// TenantControlPlane Pods. Useful when sidecars (such as a CSR signer)
++	// running alongside the kube-apiserver need to be reachable from tenant
++	// workers through the same Service endpoint.
++	AdditionalServicePorts []kamajiv1alpha1.AdditionalPort `json:"additionalServicePorts,omitempty"`
+ 	// Configure additional Subject Address Names for the kube-apiserver certificate,
+ 	// useful if the TenantControlPlane is going to be exposed behind a FQDN with NAT.
+ 	CertSANs []string `json:"certSANs,omitempty"` //nolint:tagliatelle
+diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
+index 72e7c6d..a92e21d 100644
+--- a/api/v1alpha1/zz_generated.deepcopy.go
++++ b/api/v1alpha1/zz_generated.deepcopy.go
+@@ -551,6 +551,13 @@ func (in *NetworkComponent) DeepCopyInto(out *NetworkComponent) {
+ 			(*out)[key] = val
+ 		}
+ 	}
++	if in.AdditionalServicePorts != nil {
++		in, out := &in.AdditionalServicePorts, &out.AdditionalServicePorts
++		*out = make([]apiv1alpha1.AdditionalPort, len(*in))
++		for i := range *in {
++			(*in)[i].DeepCopyInto(&(*out)[i])
++		}
++	}
+ 	if in.CertSANs != nil {
+ 		in, out := &in.CertSANs, &out.CertSANs
+ 		*out = make([]string, len(*in))
+diff --git a/config/control-plane-components.yaml b/config/control-plane-components.yaml
+index adc08ba..85ef61a 100644
+--- a/config/control-plane-components.yaml
++++ b/config/control-plane-components.yaml
+@@ -7051,6 +7051,58 @@ spec:
+                   serviceType: LoadBalancer
+                 description: Configure how the TenantControlPlane should be exposed.
+                 properties:
++                  additionalServicePorts:
++                    description: |-
++                      AdditionalServicePorts adds extra ports to the Service that fronts the
++                      TenantControlPlane Pods. Useful when sidecars (such as a CSR signer)
++                      running alongside the kube-apiserver need to be reachable from tenant
++                      workers through the same Service endpoint.
++                    items:
++                      properties:
++                        appProtocol:
++                          description: |-
++                            The application protocol for this port.
++                            This is used as a hint for implementations to offer richer behavior for protocols that they understand.
++                            This field follows standard Kubernetes label syntax.
++                            Valid values are either:
++
++                            * Un-prefixed protocol names - reserved for IANA standard service names (as per
++                            RFC-6335 and https://www.iana.org/assignments/service-names).
++                          type: string
++                        name:
++                          description: |-
++                            The name of this port within the Service created by Kamaji.
++                            This must be a DNS_LABEL, must have unique names, and cannot be `kube-apiserver`, or `konnectivity-server`.
++                          type: string
++                        port:
++                          description: The port that will be exposed by this service.
++                          format: int32
++                          type: integer
++                        protocol:
++                          default: TCP
++                          description: The IP protocol for this port. Supports "TCP", "UDP", and "SCTP".
++                          enum:
++                          - TCP
++                          - UDP
++                          - SCTP
++                          type: string
++                        targetPort:
++                          anyOf:
++                          - type: integer
++                          - type: string
++                          description: |-
++                            Number or name of the port to access on the pods of the Tenant Control Plane.
++                            Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME.
++                            If this is a string, it will be looked up as a named port in the
++                            target Pod's container ports. If this is not specified, the value
++                            of the 'port' field is used (an identity map).
++                          x-kubernetes-int-or-string: true
++                      required:
++                      - name
++                      - port
++                      - targetPort
++                      type: object
++                    type: array
+                   advertiseAddress:
+                     description: |-
+                       AdvertiseAddress is the address advertised to tenant-side consumers (workers, konnectivity).
+@@ -14599,6 +14651,58 @@ spec:
+                           serviceType: LoadBalancer
+                         description: Configure how the TenantControlPlane should be exposed.
+                         properties:
++                          additionalServicePorts:
++                            description: |-
++                              AdditionalServicePorts adds extra ports to the Service that fronts the
++                              TenantControlPlane Pods. Useful when sidecars (such as a CSR signer)
++                              running alongside the kube-apiserver need to be reachable from tenant
++                              workers through the same Service endpoint.
++                            items:
++                              properties:
++                                appProtocol:
++                                  description: |-
++                                    The application protocol for this port.
++                                    This is used as a hint for implementations to offer richer behavior for protocols that they understand.
++                                    This field follows standard Kubernetes label syntax.
++                                    Valid values are either:
++
++                                    * Un-prefixed protocol names - reserved for IANA standard service names (as per
++                                    RFC-6335 and https://www.iana.org/assignments/service-names).
++                                  type: string
++                                name:
++                                  description: |-
++                                    The name of this port within the Service created by Kamaji.
++                                    This must be a DNS_LABEL, must have unique names, and cannot be `kube-apiserver`, or `konnectivity-server`.
++                                  type: string
++                                port:
++                                  description: The port that will be exposed by this service.
++                                  format: int32
++                                  type: integer
++                                protocol:
++                                  default: TCP
++                                  description: The IP protocol for this port. Supports "TCP", "UDP", and "SCTP".
++                                  enum:
++                                  - TCP
++                                  - UDP
++                                  - SCTP
++                                  type: string
++                                targetPort:
++                                  anyOf:
++                                  - type: integer
++                                  - type: string
++                                  description: |-
++                                    Number or name of the port to access on the pods of the Tenant Control Plane.
++                                    Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME.
++                                    If this is a string, it will be looked up as a named port in the
++                                    target Pod's container ports. If this is not specified, the value
++                                    of the 'port' field is used (an identity map).
++                                  x-kubernetes-int-or-string: true
++                              required:
++                              - name
++                              - port
++                              - targetPort
++                              type: object
++                            type: array
+                           advertiseAddress:
+                             description: |-
+                               AdvertiseAddress is the address advertised to tenant-side consumers (workers, konnectivity).
+diff --git a/config/crd/bases/controlplane.cluster.x-k8s.io_kamajicontrolplanes.yaml b/config/crd/bases/controlplane.cluster.x-k8s.io_kamajicontrolplanes.yaml
+index 6ab7db4..f30acc5 100644
+--- a/config/crd/bases/controlplane.cluster.x-k8s.io_kamajicontrolplanes.yaml
++++ b/config/crd/bases/controlplane.cluster.x-k8s.io_kamajicontrolplanes.yaml
+@@ -7399,6 +7399,59 @@ spec:
+                   serviceType: LoadBalancer
+                 description: Configure how the TenantControlPlane should be exposed.
+                 properties:
++                  additionalServicePorts:
++                    description: |-
++                      AdditionalServicePorts adds extra ports to the Service that fronts the
++                      TenantControlPlane Pods. Useful when sidecars (such as a CSR signer)
++                      running alongside the kube-apiserver need to be reachable from tenant
++                      workers through the same Service endpoint.
++                    items:
++                      properties:
++                        appProtocol:
++                          description: |-
++                            The application protocol for this port.
++                            This is used as a hint for implementations to offer richer behavior for protocols that they understand.
++                            This field follows standard Kubernetes label syntax.
++                            Valid values are either:
++
++                            * Un-prefixed protocol names - reserved for IANA standard service names (as per
++                            RFC-6335 and https://www.iana.org/assignments/service-names).
++                          type: string
++                        name:
++                          description: |-
++                            The name of this port within the Service created by Kamaji.
++                            This must be a DNS_LABEL, must have unique names, and cannot be `kube-apiserver`, or `konnectivity-server`.
++                          type: string
++                        port:
++                          description: The port that will be exposed by this service.
++                          format: int32
++                          type: integer
++                        protocol:
++                          default: TCP
++                          description: The IP protocol for this port. Supports "TCP",
++                            "UDP", and "SCTP".
++                          enum:
++                          - TCP
++                          - UDP
++                          - SCTP
++                          type: string
++                        targetPort:
++                          anyOf:
++                          - type: integer
++                          - type: string
++                          description: |-
++                            Number or name of the port to access on the pods of the Tenant Control Plane.
++                            Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME.
++                            If this is a string, it will be looked up as a named port in the
++                            target Pod's container ports. If this is not specified, the value
++                            of the 'port' field is used (an identity map).
++                          x-kubernetes-int-or-string: true
++                      required:
++                      - name
++                      - port
++                      - targetPort
++                      type: object
++                    type: array
+                   advertiseAddress:
+                     description: |-
+                       AdvertiseAddress is the address advertised to tenant-side consumers (workers, konnectivity).
+diff --git a/config/crd/bases/controlplane.cluster.x-k8s.io_kamajicontrolplanetemplates.yaml b/config/crd/bases/controlplane.cluster.x-k8s.io_kamajicontrolplanetemplates.yaml
+index dbac427..774dd8a 100644
+--- a/config/crd/bases/controlplane.cluster.x-k8s.io_kamajicontrolplanetemplates.yaml
++++ b/config/crd/bases/controlplane.cluster.x-k8s.io_kamajicontrolplanetemplates.yaml
+@@ -7490,6 +7490,60 @@ spec:
+                         description: Configure how the TenantControlPlane should be
+                           exposed.
+                         properties:
++                          additionalServicePorts:
++                            description: |-
++                              AdditionalServicePorts adds extra ports to the Service that fronts the
++                              TenantControlPlane Pods. Useful when sidecars (such as a CSR signer)
++                              running alongside the kube-apiserver need to be reachable from tenant
++                              workers through the same Service endpoint.
++                            items:
++                              properties:
++                                appProtocol:
++                                  description: |-
++                                    The application protocol for this port.
++                                    This is used as a hint for implementations to offer richer behavior for protocols that they understand.
++                                    This field follows standard Kubernetes label syntax.
++                                    Valid values are either:
++
++                                    * Un-prefixed protocol names - reserved for IANA standard service names (as per
++                                    RFC-6335 and https://www.iana.org/assignments/service-names).
++                                  type: string
++                                name:
++                                  description: |-
++                                    The name of this port within the Service created by Kamaji.
++                                    This must be a DNS_LABEL, must have unique names, and cannot be `kube-apiserver`, or `konnectivity-server`.
++                                  type: string
++                                port:
++                                  description: The port that will be exposed by this
++                                    service.
++                                  format: int32
++                                  type: integer
++                                protocol:
++                                  default: TCP
++                                  description: The IP protocol for this port. Supports
++                                    "TCP", "UDP", and "SCTP".
++                                  enum:
++                                  - TCP
++                                  - UDP
++                                  - SCTP
++                                  type: string
++                                targetPort:
++                                  anyOf:
++                                  - type: integer
++                                  - type: string
++                                  description: |-
++                                    Number or name of the port to access on the pods of the Tenant Control Plane.
++                                    Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME.
++                                    If this is a string, it will be looked up as a named port in the
++                                    target Pod's container ports. If this is not specified, the value
++                                    of the 'port' field is used (an identity map).
++                                  x-kubernetes-int-or-string: true
++                              required:
++                              - name
++                              - port
++                              - targetPort
++                              type: object
++                            type: array
+                           advertiseAddress:
+                             description: |-
+                               AdvertiseAddress is the address advertised to tenant-side consumers (workers, konnectivity).
+diff --git a/controllers/kamajicontrolplane_controller_tcp.go b/controllers/kamajicontrolplane_controller_tcp.go
+index f5cccff..78383e6 100644
+--- a/controllers/kamajicontrolplane_controller_tcp.go
++++ b/controllers/kamajicontrolplane_controller_tcp.go
+@@ -152,6 +152,7 @@ func (r *KamajiControlPlaneReconciler) createOrUpdateTenantControlPlane(ctx cont
+ 			tcp.Spec.ControlPlane.Service.ServiceType = kcp.Spec.Network.ServiceType
+ 			tcp.Spec.ControlPlane.Service.AdditionalMetadata.Labels = kcp.Spec.Network.ServiceLabels
+ 			tcp.Spec.ControlPlane.Service.AdditionalMetadata.Annotations = kcp.Spec.Network.ServiceAnnotations
++			tcp.Spec.ControlPlane.Service.AdditionalPorts = kcp.Spec.Network.AdditionalServicePorts
+ 
+ 			for _, i := range kcp.Spec.Network.CertSANs {
+ 				// validating CertSANs as soon as possible to avoid github.com/clastix/kamaji/issues/679:
diff --git a/packages/system/capi-providers-cpprovider/templates/configmaps.yaml b/packages/system/capi-providers-cpprovider/templates/configmaps.yaml
index 736c06a5c2..77af391a3c 100644
--- a/packages/system/capi-providers-cpprovider/templates/configmaps.yaml
+++ b/packages/system/capi-providers-cpprovider/templates/configmaps.yaml
@@ -1,7 +1,9 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: v0.16.0-cp
+  # Must match spec.version in templates/providers.yaml so the
+  # ControlPlaneProvider operator selects this components bundle.
+  name: v0.19.0-cozystack.0
   labels:
     cp-components: cozy
   annotations:
diff --git a/packages/system/capi-providers-cpprovider/templates/providers.yaml b/packages/system/capi-providers-cpprovider/templates/providers.yaml
index 71623a6ee5..a4eed70fa0 100644
--- a/packages/system/capi-providers-cpprovider/templates/providers.yaml
+++ b/packages/system/capi-providers-cpprovider/templates/providers.yaml
@@ -4,7 +4,12 @@ metadata:
   name: kamaji
 spec:
   # https://github.com/clastix/cluster-api-control-plane-provider-kamaji
-  version: v0.16.0-cp
+  # Pinned to v0.19.0 + a single backport patch
+  # (images/cluster-api-control-plane-provider-kamaji/patches/) because
+  # upstream master ships v1alpha2 only with no v1alpha1 conversion
+  # webhook. Bump along with UPSTREAM_VERSION / COZYSTACK_REV in the
+  # package Makefile.
+  version: v0.19.0-cozystack.0
   fetchConfig:
     selector:
       matchLabels:
diff --git a/packages/system/capi-providers-infraprovider-proxmox/.helmignore b/packages/system/capi-providers-infraprovider-proxmox/.helmignore
new file mode 100644
index 0000000000..aba9a295fe
--- /dev/null
+++ b/packages/system/capi-providers-infraprovider-proxmox/.helmignore
@@ -0,0 +1 @@
+files/*-components.yaml
diff --git a/packages/system/capi-providers-infraprovider-proxmox/Chart.yaml b/packages/system/capi-providers-infraprovider-proxmox/Chart.yaml
new file mode 100644
index 0000000000..a04e8890f0
--- /dev/null
+++ b/packages/system/capi-providers-infraprovider-proxmox/Chart.yaml
@@ -0,0 +1,3 @@
+apiVersion: v2
+name: cozy-capi-providers-infraprovider-proxmox
+version: 0.0.0 # Placeholder, the actual version will be automatically set during the build process
diff --git a/packages/system/capi-providers-infraprovider-proxmox/Makefile b/packages/system/capi-providers-infraprovider-proxmox/Makefile
new file mode 100644
index 0000000000..c1b91a014b
--- /dev/null
+++ b/packages/system/capi-providers-infraprovider-proxmox/Makefile
@@ -0,0 +1,25 @@
+export NAME=capi-providers-infraprovider-proxmox
+export NAMESPACE=cozy-cluster-api
+
+CAPMOX_VERSION=v0.7.7
+CAPMOX_URL=https://github.com/ionos-cloud/cluster-api-provider-proxmox/releases/download/$(CAPMOX_VERSION)
+# SHA-256 of the two release assets at CAPMOX_VERSION. A release tag can be moved;
+# these cannot. Bumping the version means recording the new sums here.
+CAPMOX_SHA256_COMPONENTS=831e3debeb677e9a73183dc858e9fd673f4346c18dafeb4cddee62823c059589
+CAPMOX_SHA256_METADATA=66a57b6865ed68cf4edf460dfa4c75fa7ff80f27e519a9a062cafceeabb88500
+
+include ../../../hack/package.mk
+
+# Refresh the vendored provider manifests. Bump CAPMOX_VERSION and the two sums,
+# run this, and update the version in templates/{configmaps,providers}.yaml to
+# match.
+#
+# gzip -n matters: without it the header carries a timestamp, so every
+# regeneration produces a different blob for identical input and the committed
+# artifact looks changed when it is not.
+.PHONY: components
+components:
+	curl -fL -o files/infrastructure-components.yaml $(CAPMOX_URL)/infrastructure-components.yaml
+	curl -fL -o files/metadata.yaml $(CAPMOX_URL)/metadata.yaml
+	printf '%s  files/infrastructure-components.yaml\n%s  files/metadata.yaml\n' $(CAPMOX_SHA256_COMPONENTS) $(CAPMOX_SHA256_METADATA) | sha256sum -c -
+	gzip -9 -n -c files/infrastructure-components.yaml > files/components.gz
diff --git a/packages/system/capi-providers-infraprovider-proxmox/files/components.gz b/packages/system/capi-providers-infraprovider-proxmox/files/components.gz
new file mode 100644
index 0000000000..f10e0ae7d4
Binary files /dev/null and b/packages/system/capi-providers-infraprovider-proxmox/files/components.gz differ
diff --git a/packages/system/capi-providers-infraprovider-proxmox/files/infrastructure-components.yaml b/packages/system/capi-providers-infraprovider-proxmox/files/infrastructure-components.yaml
new file mode 100644
index 0000000000..a4b677c7a6
--- /dev/null
+++ b/packages/system/capi-providers-infraprovider-proxmox/files/infrastructure-components.yaml
@@ -0,0 +1,4056 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  labels:
+    app.kubernetes.io/component: manager
+    app.kubernetes.io/created-by: cluster-api-provider-proxmox
+    app.kubernetes.io/instance: system
+    app.kubernetes.io/managed-by: kustomize
+    app.kubernetes.io/name: namespace
+    app.kubernetes.io/part-of: cluster-api-provider-proxmox
+    cluster.x-k8s.io/provider: infrastructure-proxmox
+    control-plane: controller-manager
+  name: capmox-system
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    cert-manager.io/inject-ca-from: capmox-system/capmox-serving-cert
+    controller-gen.kubebuilder.io/version: v0.16.5
+  labels:
+    cluster.x-k8s.io/provider: infrastructure-proxmox
+    cluster.x-k8s.io/v1beta1: v1alpha1
+  name: proxmoxclusters.infrastructure.cluster.x-k8s.io
+spec:
+  group: infrastructure.cluster.x-k8s.io
+  names:
+    categories:
+    - cluster-api
+    kind: ProxmoxCluster
+    listKind: ProxmoxClusterList
+    plural: proxmoxclusters
+    singular: proxmoxcluster
+  scope: Namespaced
+  versions:
+  - additionalPrinterColumns:
+    - description: Cluster
+      jsonPath: .metadata.labels['cluster\.x-k8s\.io/cluster-name']
+      name: Cluster
+      type: string
+    - description: Cluster infrastructure is ready
+      jsonPath: .status.ready
+      name: Ready
+      type: string
+    - description: API Endpoint
+      jsonPath: .spec.controlPlaneEndpoint
+      name: Endpoint
+      type: string
+    name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        description: ProxmoxCluster is the Schema for the proxmoxclusters API.
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: ProxmoxClusterSpec defines the desired state of a ProxmoxCluster.
+            properties:
+              allowedNodes:
+                description: |-
+                  AllowedNodes specifies all Proxmox nodes which will be considered
+                  for operations. This implies that VMs can be cloned on different nodes from
+                  the node which holds the VM template.
+                items:
+                  type: string
+                type: array
+              cloneSpec:
+                description: |-
+                  NodeCloneSpec is the configuration pertaining to all items configurable
+                  in the configuration and cloning of a proxmox VM. Multiple types of nodes can be specified.
+                properties:
+                  machineSpec:
+                    additionalProperties:
+                      description: ProxmoxMachineSpec defines the desired state of
+                        a ProxmoxMachine.
+                      properties:
+                        allowedNodes:
+                          description: |-
+                            AllowedNodes specifies all Proxmox nodes which will be considered
+                            for operations. This implies that VMs can be cloned on different nodes from
+                            the node which holds the VM template.
+
+                            This field is optional and should only be set if you want to restrict
+                            the nodes where the VM can be cloned.
+                            If not set, the ProxmoxCluster will be used to determine the nodes.
+                          items:
+                            type: string
+                          type: array
+                        checks:
+                          description: Checks defines possibles checks to skip.
+                          properties:
+                            skipCloudInitStatus:
+                              description: Skip checking CloudInit which can be very
+                                useful for specific Operating Systems like TalOS
+                              type: boolean
+                            skipQemuGuestAgent:
+                              description: Skip checking QEMU Agent readiness which
+                                can be very useful for specific Operating Systems
+                                like TalOS
+                              type: boolean
+                          type: object
+                        description:
+                          description: Description for the new VM.
+                          type: string
+                        disks:
+                          description: |-
+                            Disks contains a set of disk configuration options,
+                            which will be applied before the first startup.
+                          properties:
+                            bootVolume:
+                              description: |-
+                                BootVolume defines the storage size for the boot volume.
+                                This field is optional, and should only be set if you want
+                                to change the size of the boot volume.
+                              properties:
+                                disk:
+                                  description: |-
+                                    Disk is the name of the disk device, that should be resized.
+                                    Example values are: ide[0-3], scsi[0-30], sata[0-5].
+                                  type: string
+                                sizeGb:
+                                  description: |-
+                                    Size defines the size in gigabyte.
+
+                                    As Proxmox does not support shrinking, the size
+                                    must be bigger than the already configured size in the
+                                    template.
+                                  format: int32
+                                  minimum: 5
+                                  type: integer
+                              required:
+                              - disk
+                              - sizeGb
+                              type: object
+                              x-kubernetes-validations:
+                              - message: Value is immutable
+                                rule: self == oldSelf
+                          type: object
+                        format:
+                          description: Format for file storage. Only valid for full
+                            clone.
+                          enum:
+                          - raw
+                          - qcow2
+                          - vmdk
+                          type: string
+                        full:
+                          default: true
+                          description: |-
+                            Full Create a full copy of all disks.
+                            This is always done when you clone a normal VM.
+                            Create a Full clone by default.
+                          type: boolean
+                        memoryMiB:
+                          description: |-
+                            MemoryMiB is the size of a virtual machine's memory, in MiB.
+                            Defaults to the property value in the template from which the virtual machine is cloned.
+                          format: int32
+                          multipleOf: 8
+                          type: integer
+                        metadataSettings:
+                          description: MetadataSettings defines the metadata settings
+                            for this machine's VM.
+                          properties:
+                            providerIDInjection:
+                              description: |-
+                                ProviderIDInjection enables the injection of the `providerID` into the cloudinit metadata.
+                                this will basically set the `provider-id` field in the metadata to `proxmox://<instanceID>`.
+                              type: boolean
+                          type: object
+                        network:
+                          description: Network is the network configuration for this
+                            machine's VM.
+                          properties:
+                            additionalDevices:
+                              description: AdditionalDevices defines additional network
+                                devices bound to the virtual machine.
+                              items:
+                                description: AdditionalNetworkDevice the definition
+                                  of a Proxmox network device.
+                                properties:
+                                  bridge:
+                                    description: Bridge is the network bridge to attach
+                                      to the machine.
+                                    minLength: 1
+                                    type: string
+                                  dnsServers:
+                                    description: |-
+                                      DNSServers contains information about nameservers to be used for this interface.
+                                      If this field is not set, it will use the default dns servers from the ProxmoxCluster.
+                                    items:
+                                      type: string
+                                    minItems: 1
+                                    type: array
+                                  ipv4PoolRef:
+                                    description: |-
+                                      IPv4PoolRef is a reference to an IPAM Pool resource, which exposes IPv4 addresses.
+                                      The network device will use an available IP address from the referenced pool.
+                                      This can be combined with `IPv6PoolRef` in order to enable dual stack.
+                                    properties:
+                                      apiGroup:
+                                        description: |-
+                                          APIGroup is the group for the resource being referenced.
+                                          If APIGroup is not specified, the specified Kind must be in the core API group.
+                                          For any other third-party types, APIGroup is required.
+                                        type: string
+                                      kind:
+                                        description: Kind is the type of resource
+                                          being referenced
+                                        type: string
+                                      name:
+                                        description: Name is the name of resource
+                                          being referenced
+                                        type: string
+                                    required:
+                                    - kind
+                                    - name
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                    x-kubernetes-validations:
+                                    - message: ipv4PoolRef allows only IPAM apiGroup
+                                        ipam.cluster.x-k8s.io
+                                      rule: self.apiGroup == 'ipam.cluster.x-k8s.io'
+                                    - message: ipv4PoolRef allows either InClusterIPPool
+                                        or GlobalInClusterIPPool
+                                      rule: self.kind == 'InClusterIPPool' || self.kind
+                                        == 'GlobalInClusterIPPool'
+                                  ipv6PoolRef:
+                                    description: |-
+                                      IPv6PoolRef is a reference to an IPAM pool resource, which exposes IPv6 addresses.
+                                      The network device will use an available IP address from the referenced pool.
+                                      this can be combined with `IPv4PoolRef` in order to enable dual stack.
+                                    properties:
+                                      apiGroup:
+                                        description: |-
+                                          APIGroup is the group for the resource being referenced.
+                                          If APIGroup is not specified, the specified Kind must be in the core API group.
+                                          For any other third-party types, APIGroup is required.
+                                        type: string
+                                      kind:
+                                        description: Kind is the type of resource
+                                          being referenced
+                                        type: string
+                                      name:
+                                        description: Name is the name of resource
+                                          being referenced
+                                        type: string
+                                    required:
+                                    - kind
+                                    - name
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                    x-kubernetes-validations:
+                                    - message: ipv6PoolRef allows only IPAM apiGroup
+                                        ipam.cluster.x-k8s.io
+                                      rule: self.apiGroup == 'ipam.cluster.x-k8s.io'
+                                    - message: ipv6PoolRef allows either InClusterIPPool
+                                        or GlobalInClusterIPPool
+                                      rule: self.kind == 'InClusterIPPool' || self.kind
+                                        == 'GlobalInClusterIPPool'
+                                  linkMtu:
+                                    description: LinkMTU is the network device Maximum
+                                      Transmission Unit.
+                                    type: integer
+                                    x-kubernetes-validations:
+                                    - message: invalid MTU value
+                                      rule: self == 1 || ( self >= 576 && self <=
+                                        65520)
+                                  model:
+                                    default: virtio
+                                    description: Model is the network device model.
+                                    enum:
+                                    - e1000
+                                    - virtio
+                                    - rtl8139
+                                    - vmxnet3
+                                    type: string
+                                  mtu:
+                                    description: |-
+                                      MTU is the network device Maximum Transmission Unit.
+                                      When set to 1, virtio devices inherit the MTU value from the underlying bridge.
+                                    type: integer
+                                    x-kubernetes-validations:
+                                    - message: invalid MTU value
+                                      rule: self == 1 || ( self >= 576 && self <=
+                                        65520)
+                                  name:
+                                    description: |-
+                                      Name is the network device name.
+                                      Must be unique within the virtual machine and different from the primary device 'net0'.
+                                    minLength: 1
+                                    type: string
+                                    x-kubernetes-validations:
+                                    - message: additional network devices doesn't
+                                        allow net0
+                                      rule: self != 'net0'
+                                  routes:
+                                    description: Routes are the routes associated
+                                      with this interface.
+                                    items:
+                                      description: RouteSpec describes an IPv4/IPv6
+                                        Route.
+                                      properties:
+                                        metric:
+                                          description: Metric is the priority of the
+                                            route in the routing table.
+                                          format: int32
+                                          type: integer
+                                        table:
+                                          description: Table is the routing table
+                                            used for this route.
+                                          format: int32
+                                          type: integer
+                                        to:
+                                          description: To is the subnet to be routed.
+                                          type: string
+                                        via:
+                                          description: Via is the gateway to the subnet.
+                                          type: string
+                                      type: object
+                                    minItems: 1
+                                    type: array
+                                  routingPolicy:
+                                    description: RoutingPolicy is an interface-specific
+                                      policy inserted into FIB (forwarding information
+                                      base).
+                                    items:
+                                      description: RoutingPolicySpec is a Linux FIB
+                                        rule.
+                                      properties:
+                                        from:
+                                          description: From is the subnet of the source.
+                                          type: string
+                                        priority:
+                                          description: Priority is the position in
+                                            the ip rule FIB table.
+                                          format: int32
+                                          maximum: 4294967295
+                                          type: integer
+                                          x-kubernetes-validations:
+                                          - message: Cowardly refusing to insert FIB
+                                              rule matching kernel rules
+                                            rule: (self > 0 && self < 32765) || (self
+                                              > 32766)
+                                        table:
+                                          description: |-
+                                            Table is the routing table ID.
+                                            when used in the networks, the value should be the VRF Table.
+                                          format: int32
+                                          type: integer
+                                        to:
+                                          description: To is the subnet of the target.
+                                          type: string
+                                      type: object
+                                    minItems: 1
+                                    type: array
+                                  vlan:
+                                    description: VLAN is the network L2 VLAN.
+                                    maximum: 4094
+                                    minimum: 1
+                                    type: integer
+                                required:
+                                - bridge
+                                - name
+                                type: object
+                                x-kubernetes-validations:
+                                - message: at least one pool reference must be set,
+                                    either ipv4PoolRef or ipv6PoolRef
+                                  rule: self.ipv4PoolRef != null || self.ipv6PoolRef
+                                    != null
+                              type: array
+                              x-kubernetes-list-map-keys:
+                              - name
+                              x-kubernetes-list-type: map
+                            default:
+                              description: |-
+                                Default is the default network device,
+                                which will be used for the primary network interface.
+                                net0 is always the default network device.
+                              properties:
+                                bridge:
+                                  description: Bridge is the network bridge to attach
+                                    to the machine.
+                                  minLength: 1
+                                  type: string
+                                dnsServers:
+                                  description: |-
+                                    DNSServers contains information about nameservers to be used for this interface.
+                                    If this field is not set, it will use the default dns servers from the ProxmoxCluster.
+                                  items:
+                                    type: string
+                                  minItems: 1
+                                  type: array
+                                ipv4PoolRef:
+                                  description: |-
+                                    IPv4PoolRef is a reference to an IPAM Pool resource, which exposes IPv4 addresses.
+                                    The network device will use an available IP address from the referenced pool.
+                                    This can be combined with `IPv6PoolRef` in order to enable dual stack.
+                                  properties:
+                                    apiGroup:
+                                      description: |-
+                                        APIGroup is the group for the resource being referenced.
+                                        If APIGroup is not specified, the specified Kind must be in the core API group.
+                                        For any other third-party types, APIGroup is required.
+                                      type: string
+                                    kind:
+                                      description: Kind is the type of resource being
+                                        referenced
+                                      type: string
+                                    name:
+                                      description: Name is the name of resource being
+                                        referenced
+                                      type: string
+                                  required:
+                                  - kind
+                                  - name
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                  x-kubernetes-validations:
+                                  - message: ipv4PoolRef allows only IPAM apiGroup
+                                      ipam.cluster.x-k8s.io
+                                    rule: self.apiGroup == 'ipam.cluster.x-k8s.io'
+                                  - message: ipv4PoolRef allows either InClusterIPPool
+                                      or GlobalInClusterIPPool
+                                    rule: self.kind == 'InClusterIPPool' || self.kind
+                                      == 'GlobalInClusterIPPool'
+                                ipv6PoolRef:
+                                  description: |-
+                                    IPv6PoolRef is a reference to an IPAM pool resource, which exposes IPv6 addresses.
+                                    The network device will use an available IP address from the referenced pool.
+                                    this can be combined with `IPv4PoolRef` in order to enable dual stack.
+                                  properties:
+                                    apiGroup:
+                                      description: |-
+                                        APIGroup is the group for the resource being referenced.
+                                        If APIGroup is not specified, the specified Kind must be in the core API group.
+                                        For any other third-party types, APIGroup is required.
+                                      type: string
+                                    kind:
+                                      description: Kind is the type of resource being
+                                        referenced
+                                      type: string
+                                    name:
+                                      description: Name is the name of resource being
+                                        referenced
+                                      type: string
+                                  required:
+                                  - kind
+                                  - name
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                  x-kubernetes-validations:
+                                  - message: ipv6PoolRef allows only IPAM apiGroup
+                                      ipam.cluster.x-k8s.io
+                                    rule: self.apiGroup == 'ipam.cluster.x-k8s.io'
+                                  - message: ipv6PoolRef allows either InClusterIPPool
+                                      or GlobalInClusterIPPool
+                                    rule: self.kind == 'InClusterIPPool' || self.kind
+                                      == 'GlobalInClusterIPPool'
+                                model:
+                                  default: virtio
+                                  description: Model is the network device model.
+                                  enum:
+                                  - e1000
+                                  - virtio
+                                  - rtl8139
+                                  - vmxnet3
+                                  type: string
+                                mtu:
+                                  description: |-
+                                    MTU is the network device Maximum Transmission Unit.
+                                    When set to 1, virtio devices inherit the MTU value from the underlying bridge.
+                                  type: integer
+                                  x-kubernetes-validations:
+                                  - message: invalid MTU value
+                                    rule: self == 1 || ( self >= 576 && self <= 65520)
+                                vlan:
+                                  description: VLAN is the network L2 VLAN.
+                                  maximum: 4094
+                                  minimum: 1
+                                  type: integer
+                              required:
+                              - bridge
+                              type: object
+                            vrfs:
+                              description: Definition of a VRF Device.
+                              items:
+                                description: VRFDevice defines Virtual Routing Flow
+                                  devices.
+                                properties:
+                                  interfaces:
+                                    description: Interfaces is the list of proxmox
+                                      network devices managed by this virtual device.
+                                    items:
+                                      type: string
+                                    type: array
+                                  name:
+                                    description: |-
+                                      Name is the virtual network device name.
+                                      Must be unique within the virtual machine.
+                                    minLength: 3
+                                    type: string
+                                  routes:
+                                    description: Routes are the routes associated
+                                      with this interface.
+                                    items:
+                                      description: RouteSpec describes an IPv4/IPv6
+                                        Route.
+                                      properties:
+                                        metric:
+                                          description: Metric is the priority of the
+                                            route in the routing table.
+                                          format: int32
+                                          type: integer
+                                        table:
+                                          description: Table is the routing table
+                                            used for this route.
+                                          format: int32
+                                          type: integer
+                                        to:
+                                          description: To is the subnet to be routed.
+                                          type: string
+                                        via:
+                                          description: Via is the gateway to the subnet.
+                                          type: string
+                                      type: object
+                                    minItems: 1
+                                    type: array
+                                  routingPolicy:
+                                    description: RoutingPolicy is an interface-specific
+                                      policy inserted into FIB (forwarding information
+                                      base).
+                                    items:
+                                      description: RoutingPolicySpec is a Linux FIB
+                                        rule.
+                                      properties:
+                                        from:
+                                          description: From is the subnet of the source.
+                                          type: string
+                                        priority:
+                                          description: Priority is the position in
+                                            the ip rule FIB table.
+                                          format: int32
+                                          maximum: 4294967295
+                                          type: integer
+                                          x-kubernetes-validations:
+                                          - message: Cowardly refusing to insert FIB
+                                              rule matching kernel rules
+                                            rule: (self > 0 && self < 32765) || (self
+                                              > 32766)
+                                        table:
+                                          description: |-
+                                            Table is the routing table ID.
+                                            when used in the networks, the value should be the VRF Table.
+                                          format: int32
+                                          type: integer
+                                        to:
+                                          description: To is the subnet of the target.
+                                          type: string
+                                      type: object
+                                    minItems: 1
+                                    type: array
+                                  table:
+                                    description: Table is the ID of the routing table
+                                      used for the l3mdev vrf device.
+                                    format: int32
+                                    maximum: 4294967295
+                                    type: integer
+                                    x-kubernetes-validations:
+                                    - message: Cowardly refusing to insert l3mdev
+                                        rules into kernel tables
+                                      rule: (self > 0 && self < 254) || (self > 255)
+                                required:
+                                - name
+                                - table
+                                type: object
+                              type: array
+                              x-kubernetes-list-map-keys:
+                              - name
+                              x-kubernetes-list-type: map
+                          type: object
+                        numCores:
+                          description: |-
+                            NumCores is the number of cores per CPU socket in a virtual machine.
+                            Defaults to the property value in the template from which the virtual machine is cloned.
+                          format: int32
+                          minimum: 1
+                          type: integer
+                        numSockets:
+                          description: |-
+                            NumSockets is the number of CPU sockets in a virtual machine.
+                            Defaults to the property value in the template from which the virtual machine is cloned.
+                          format: int32
+                          minimum: 1
+                          type: integer
+                        pool:
+                          description: Pool Add the new VM to the specified pool.
+                          type: string
+                        providerID:
+                          description: |-
+                            ProviderID is the virtual machine BIOS UUID formatted as
+                            proxmox://6c3fa683-bef9-4425-b413-eaa45a9d6191
+                          type: string
+                        snapName:
+                          description: SnapName The name of the snapshot.
+                          type: string
+                        sourceNode:
+                          description: |-
+                            SourceNode is the initially selected proxmox node.
+                            This node will be used to locate the template VM, which will
+                            be used for cloning operations.
+
+                            Cloning will be performed according to the configuration.
+                            Setting the `Target` field will tell Proxmox to clone the
+                            VM on that target node.
+
+                            When Target is not set and the ProxmoxCluster contains
+                            a set of `AllowedNodes`, the algorithm will instead evenly
+                            distribute the VMs across the nodes from that list.
+
+                            If neither a `Target` nor `AllowedNodes` was set, the VM
+                            will be cloned onto the same node as SourceNode.
+                          minLength: 1
+                          type: string
+                        storage:
+                          description: Storage for full clone.
+                          type: string
+                        tags:
+                          description: Tags is a list of tags to be applied to the
+                            virtual machine.
+                          items:
+                            pattern: ^(?i)[a-z0-9_][a-z0-9_\-\+\.]*$
+                            type: string
+                          minItems: 1
+                          type: array
+                          x-kubernetes-list-type: set
+                        target:
+                          description: Target node. Only allowed if the original VM
+                            is on shared storage.
+                          type: string
+                        templateID:
+                          description: TemplateID the vm_template vmid used for cloning
+                            a new VM.
+                          format: int32
+                          type: integer
+                        templateSelector:
+                          description: TemplateSelector defines MatchTags for looking
+                            up VM templates.
+                          properties:
+                            matchTags:
+                              description: |-
+                                Specifies all tags to look for, when looking up the VM template.
+                                Passed tags must be an exact 1:1 match with the tags on the template you want to use.
+                                If multiple VM templates with the same set of tags are found, provisioning will fail.
+                              items:
+                                pattern: ^(?i)[a-z0-9_][a-z0-9_\-\+\.]*$
+                                type: string
+                              minItems: 1
+                              type: array
+                              x-kubernetes-list-type: set
+                          required:
+                          - matchTags
+                          type: object
+                        virtualMachineID:
+                          description: VirtualMachineID is the Proxmox identifier
+                            for the ProxmoxMachine VM.
+                          format: int64
+                          type: integer
+                        vmIDRange:
+                          description: VMIDRange is the range of VMIDs to use for
+                            VMs.
+                          properties:
+                            end:
+                              description: |-
+                                VMIDRangeEnd is the end of the VMID range to use for VMs.
+                                Only used if VMIDRangeStart is set.
+                              format: int64
+                              maximum: 999999999
+                              minimum: 100
+                              type: integer
+                            start:
+                              description: VMIDRangeStart is the start of the VMID
+                                range to use for VMs.
+                              format: int64
+                              maximum: 999999999
+                              minimum: 100
+                              type: integer
+                          required:
+                          - end
+                          - start
+                          type: object
+                          x-kubernetes-validations:
+                          - message: end should be greater than or equal to start
+                            rule: self.end >= self.start
+                      type: object
+                      x-kubernetes-validations:
+                      - message: Must set full=true when specifying format
+                        rule: self.full || !has(self.format)
+                      - message: Must set full=true when specifying storage
+                        rule: self.full || !has(self.storage)
+                    type: object
+                    x-kubernetes-validations:
+                    - message: Cowardly refusing to deploy cluster without control
+                        plane
+                      rule: has(self.controlPlane)
+                  sshAuthorizedKeys:
+                    description: SshAuthorizedKeys contains the authorized keys deployed
+                      to the PROXMOX VMs.
+                    items:
+                      type: string
+                    type: array
+                  virtualIPNetworkInterface:
+                    description: VirtualIPNetworkInterface is the interface the k8s
+                      control plane binds to.
+                    type: string
+                required:
+                - machineSpec
+                type: object
+              controlPlaneEndpoint:
+                description: ControlPlaneEndpoint represents the endpoint used to
+                  communicate with the control plane.
+                properties:
+                  host:
+                    description: host is the hostname on which the API server is serving.
+                    maxLength: 512
+                    type: string
+                  port:
+                    description: port is the port on which the API server is serving.
+                    format: int32
+                    type: integer
+                required:
+                - host
+                - port
+                type: object
+                x-kubernetes-validations:
+                - message: port must be within 1-65535
+                  rule: self.port > 0 && self.port < 65536
+              credentialsRef:
+                description: |-
+                  CredentialsRef is a reference to a Secret that contains the credentials to use for provisioning this cluster. If not
+                  supplied then the credentials of the controller will be used.
+                  if no namespace is provided, the namespace of the ProxmoxCluster will be used.
+                properties:
+                  name:
+                    description: name is unique within a namespace to reference a
+                      secret resource.
+                    type: string
+                  namespace:
+                    description: namespace defines the space within which the secret
+                      name must be unique.
+                    type: string
+                type: object
+                x-kubernetes-map-type: atomic
+              dnsServers:
+                description: DNSServers contains information about nameservers used
+                  by the machines.
+                items:
+                  type: string
+                minItems: 1
+                type: array
+              externalManagedControlPlane:
+                description: |-
+                  ExternalManagedControlPlane can be enabled to allow externally managed Control Planes to patch the
+                  Proxmox cluster with the Load Balancer IP provided by Control Plane provider.
+                type: boolean
+              ipv4Config:
+                description: |-
+                  IPv4Config contains information about available IPV4 address pools and the gateway.
+                  This can be combined with ipv6Config in order to enable dual stack.
+                  Either IPv4Config or IPv6Config must be provided.
+                properties:
+                  addresses:
+                    description: |-
+                      Addresses is a list of IP addresses that can be assigned. This set of
+                      addresses can be non-contiguous.
+                    items:
+                      type: string
+                    type: array
+                  gateway:
+                    description: Gateway
+                    type: string
+                  metric:
+                    default: 100
+                    description: Metric is the route priority applied to the default
+                      gateway
+                    format: int32
+                    type: integer
+                  prefix:
+                    description: Prefix is the network prefix to use.
+                    maximum: 128
+                    type: integer
+                required:
+                - addresses
+                - metric
+                - prefix
+                type: object
+                x-kubernetes-validations:
+                - message: IPv4Config addresses must be provided
+                  rule: self.addresses.size() > 0
+              ipv6Config:
+                description: |-
+                  IPv6Config contains information about available IPV6 address pools and the gateway.
+                  This can be combined with ipv4Config in order to enable dual stack.
+                  Either IPv4Config or IPv6Config must be provided.
+                properties:
+                  addresses:
+                    description: |-
+                      Addresses is a list of IP addresses that can be assigned. This set of
+                      addresses can be non-contiguous.
+                    items:
+                      type: string
+                    type: array
+                  gateway:
+                    description: Gateway
+                    type: string
+                  metric:
+                    default: 100
+                    description: Metric is the route priority applied to the default
+                      gateway
+                    format: int32
+                    type: integer
+                  prefix:
+                    description: Prefix is the network prefix to use.
+                    maximum: 128
+                    type: integer
+                required:
+                - addresses
+                - metric
+                - prefix
+                type: object
+                x-kubernetes-validations:
+                - message: IPv6Config addresses must be provided
+                  rule: self.addresses.size() > 0
+              schedulerHints:
+                description: |-
+                  SchedulerHints allows to influence the decision on where a VM will be scheduled. For example by applying a multiplicator
+                  to a node's resources, to allow for overprovisioning or to ensure a node will always have a safety buffer.
+                properties:
+                  memoryAdjustment:
+                    description: |-
+                      MemoryAdjustment allows to adjust a node's memory by a given percentage.
+                      For example, setting it to 300 allows to allocate 300% of a host's memory for VMs,
+                      and setting it to 95 limits memory allocation to 95% of a host's memory.
+                      Setting it to 0 entirely disables scheduling memory constraints.
+                      By default 100% of a node's memory will be used for allocation.
+                    format: int64
+                    type: integer
+                type: object
+            required:
+            - dnsServers
+            type: object
+            x-kubernetes-validations:
+            - message: at least one ip config must be set, either ipv4Config or ipv6Config
+              rule: self.ipv4Config != null || self.ipv6Config != null
+          status:
+            description: ProxmoxClusterStatus defines the observed state of a ProxmoxCluster.
+            properties:
+              conditions:
+                description: Conditions defines current service state of the ProxmoxCluster.
+                items:
+                  description: Condition defines an observation of a Cluster API resource
+                    operational state.
+                  properties:
+                    lastTransitionTime:
+                      description: |-
+                        lastTransitionTime is the last time the condition transitioned from one status to another.
+                        This should be when the underlying condition changed. If that is not known, then using the time when
+                        the API field changed is acceptable.
+                      format: date-time
+                      type: string
+                    message:
+                      description: |-
+                        message is a human readable message indicating details about the transition.
+                        This field may be empty.
+                      maxLength: 10240
+                      minLength: 1
+                      type: string
+                    reason:
+                      description: |-
+                        reason is the reason for the condition's last transition in CamelCase.
+                        The specific API may choose whether or not this field is considered a guaranteed API.
+                        This field may be empty.
+                      maxLength: 256
+                      minLength: 1
+                      type: string
+                    severity:
+                      description: |-
+                        severity provides an explicit classification of Reason code, so the users or machines can immediately
+                        understand the current situation and act accordingly.
+                        The Severity field MUST be set only when Status=False.
+                      maxLength: 32
+                      type: string
+                    status:
+                      description: status of the condition, one of True, False, Unknown.
+                      type: string
+                    type:
+                      description: |-
+                        type of condition in CamelCase or in foo.example.com/CamelCase.
+                        Many .condition.type values are consistent across resources like Available, but because arbitrary conditions
+                        can be useful (see .node.status.conditions), the ability to deconflict is important.
+                      maxLength: 256
+                      minLength: 1
+                      type: string
+                  required:
+                  - lastTransitionTime
+                  - status
+                  - type
+                  type: object
+                type: array
+              failureMessage:
+                description: |-
+                  FailureMessage will be set in the event that there is a terminal problem
+                  reconciling the Machine and will contain a more verbose string suitable
+                  for logging and human consumption.
+
+                  This field should not be set for transitive errors that a controller
+                  faces that are expected to be fixed automatically over
+                  time (like service outages), but instead indicate that something is
+                  fundamentally wrong with the Machine's spec or the configuration of
+                  the controller, and that manual intervention is required. Examples
+                  of terminal errors would be invalid combinations of settings in the
+                  spec, values that are unsupported by the controller, or the
+                  responsible controller itself being critically misconfigured.
+
+                  Any transient errors that occur during the reconciliation of ProxmoxMachines
+                  can be added as events to the ProxmoxCluster object and/or logged in the
+                  controller's output.
+                type: string
+              failureReason:
+                description: |-
+                  FailureReason will be set in the event that there is a terminal problem
+                  reconciling the Machine and will contain a succinct value suitable
+                  for machine interpretation.
+
+                  This field should not be set for transitive errors that a controller
+                  faces that are expected to be fixed automatically over
+                  time (like service outages), but instead indicate that something is
+                  fundamentally wrong with the Machine's spec or the configuration of
+                  the controller, and that manual intervention is required. Examples
+                  of terminal errors would be invalid combinations of settings in the
+                  spec, values that are unsupported by the controller, or the
+                  responsible controller itself being critically misconfigured.
+
+                  Any transient errors that occur during the reconciliation of ProxmoxCluster
+                  can be added as events to the ProxmoxCluster object and/or logged in the
+                  controller's output.
+                type: string
+              inClusterIpPoolRef:
+                description: InClusterIPPoolRef is the reference to the created in-cluster
+                  IP pool.
+                items:
+                  description: |-
+                    LocalObjectReference contains enough information to let you locate the
+                    referenced object inside the same namespace.
+                  properties:
+                    name:
+                      default: ""
+                      description: |-
+                        Name of the referent.
+                        This field is effectively required, but due to backwards compatibility is
+                        allowed to be empty. Instances of this type with an empty value here are
+                        almost certainly wrong.
+                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                      type: string
+                  type: object
+                  x-kubernetes-map-type: atomic
+                type: array
+              nodeLocations:
+                description: |-
+                  NodeLocations keeps track of which nodes have been selected
+                  for different machines.
+                properties:
+                  controlPlane:
+                    description: ControlPlane contains all deployed control plane
+                      nodes.
+                    items:
+                      description: |-
+                        NodeLocation holds information about a single VM
+                        in Proxmox.
+                      properties:
+                        machine:
+                          description: Machine is the reference to the ProxmoxMachine.
+                          properties:
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        node:
+                          description: Node is the Proxmox node.
+                          type: string
+                      required:
+                      - machine
+                      - node
+                      type: object
+                    type: array
+                  workers:
+                    description: Workers contains all deployed worker nodes.
+                    items:
+                      description: |-
+                        NodeLocation holds information about a single VM
+                        in Proxmox.
+                      properties:
+                        machine:
+                          description: Machine is the reference to the ProxmoxMachine.
+                          properties:
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        node:
+                          description: Node is the Proxmox node.
+                          type: string
+                      required:
+                      - machine
+                      - node
+                      type: object
+                    type: array
+                type: object
+              ready:
+                default: false
+                description: Ready indicates that the cluster is ready.
+                type: boolean
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    cert-manager.io/inject-ca-from: capmox-system/capmox-serving-cert
+    controller-gen.kubebuilder.io/version: v0.16.5
+  labels:
+    cluster.x-k8s.io/provider: infrastructure-proxmox
+    cluster.x-k8s.io/v1beta1: v1alpha1
+  name: proxmoxclustertemplates.infrastructure.cluster.x-k8s.io
+spec:
+  group: infrastructure.cluster.x-k8s.io
+  names:
+    categories:
+    - cluster-api
+    kind: ProxmoxClusterTemplate
+    listKind: ProxmoxClusterTemplateList
+    plural: proxmoxclustertemplates
+    shortNames:
+    - pct
+    singular: proxmoxclustertemplate
+  scope: Namespaced
+  versions:
+  - name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        description: ProxmoxClusterTemplate is the Schema for the proxmoxclustertemplates
+          API.
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: ProxmoxClusterTemplateSpec defines the desired state of ProxmoxClusterTemplate.
+            properties:
+              template:
+                description: ProxmoxClusterTemplateResource defines the spec and metadata
+                  for ProxmoxClusterTemplate supported by capi.
+                properties:
+                  metadata:
+                    description: |-
+                      Standard object's metadata.
+                      More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata
+                    properties:
+                      annotations:
+                        additionalProperties:
+                          type: string
+                        description: |-
+                          annotations is an unstructured key value map stored with a resource that may be
+                          set by external tools to store and retrieve arbitrary metadata. They are not
+                          queryable and should be preserved when modifying objects.
+                          More info: http://kubernetes.io/docs/user-guide/annotations
+                        type: object
+                      labels:
+                        additionalProperties:
+                          type: string
+                        description: |-
+                          labels is a map of string keys and values that can be used to organize and categorize
+                          (scope and select) objects. May match selectors of replication controllers
+                          and services.
+                          More info: http://kubernetes.io/docs/user-guide/labels
+                        type: object
+                    type: object
+                  spec:
+                    description: ProxmoxClusterSpec defines the desired state of a
+                      ProxmoxCluster.
+                    properties:
+                      allowedNodes:
+                        description: |-
+                          AllowedNodes specifies all Proxmox nodes which will be considered
+                          for operations. This implies that VMs can be cloned on different nodes from
+                          the node which holds the VM template.
+                        items:
+                          type: string
+                        type: array
+                      cloneSpec:
+                        description: |-
+                          NodeCloneSpec is the configuration pertaining to all items configurable
+                          in the configuration and cloning of a proxmox VM. Multiple types of nodes can be specified.
+                        properties:
+                          machineSpec:
+                            additionalProperties:
+                              description: ProxmoxMachineSpec defines the desired
+                                state of a ProxmoxMachine.
+                              properties:
+                                allowedNodes:
+                                  description: |-
+                                    AllowedNodes specifies all Proxmox nodes which will be considered
+                                    for operations. This implies that VMs can be cloned on different nodes from
+                                    the node which holds the VM template.
+
+                                    This field is optional and should only be set if you want to restrict
+                                    the nodes where the VM can be cloned.
+                                    If not set, the ProxmoxCluster will be used to determine the nodes.
+                                  items:
+                                    type: string
+                                  type: array
+                                checks:
+                                  description: Checks defines possibles checks to
+                                    skip.
+                                  properties:
+                                    skipCloudInitStatus:
+                                      description: Skip checking CloudInit which can
+                                        be very useful for specific Operating Systems
+                                        like TalOS
+                                      type: boolean
+                                    skipQemuGuestAgent:
+                                      description: Skip checking QEMU Agent readiness
+                                        which can be very useful for specific Operating
+                                        Systems like TalOS
+                                      type: boolean
+                                  type: object
+                                description:
+                                  description: Description for the new VM.
+                                  type: string
+                                disks:
+                                  description: |-
+                                    Disks contains a set of disk configuration options,
+                                    which will be applied before the first startup.
+                                  properties:
+                                    bootVolume:
+                                      description: |-
+                                        BootVolume defines the storage size for the boot volume.
+                                        This field is optional, and should only be set if you want
+                                        to change the size of the boot volume.
+                                      properties:
+                                        disk:
+                                          description: |-
+                                            Disk is the name of the disk device, that should be resized.
+                                            Example values are: ide[0-3], scsi[0-30], sata[0-5].
+                                          type: string
+                                        sizeGb:
+                                          description: |-
+                                            Size defines the size in gigabyte.
+
+                                            As Proxmox does not support shrinking, the size
+                                            must be bigger than the already configured size in the
+                                            template.
+                                          format: int32
+                                          minimum: 5
+                                          type: integer
+                                      required:
+                                      - disk
+                                      - sizeGb
+                                      type: object
+                                      x-kubernetes-validations:
+                                      - message: Value is immutable
+                                        rule: self == oldSelf
+                                  type: object
+                                format:
+                                  description: Format for file storage. Only valid
+                                    for full clone.
+                                  enum:
+                                  - raw
+                                  - qcow2
+                                  - vmdk
+                                  type: string
+                                full:
+                                  default: true
+                                  description: |-
+                                    Full Create a full copy of all disks.
+                                    This is always done when you clone a normal VM.
+                                    Create a Full clone by default.
+                                  type: boolean
+                                memoryMiB:
+                                  description: |-
+                                    MemoryMiB is the size of a virtual machine's memory, in MiB.
+                                    Defaults to the property value in the template from which the virtual machine is cloned.
+                                  format: int32
+                                  multipleOf: 8
+                                  type: integer
+                                metadataSettings:
+                                  description: MetadataSettings defines the metadata
+                                    settings for this machine's VM.
+                                  properties:
+                                    providerIDInjection:
+                                      description: |-
+                                        ProviderIDInjection enables the injection of the `providerID` into the cloudinit metadata.
+                                        this will basically set the `provider-id` field in the metadata to `proxmox://<instanceID>`.
+                                      type: boolean
+                                  type: object
+                                network:
+                                  description: Network is the network configuration
+                                    for this machine's VM.
+                                  properties:
+                                    additionalDevices:
+                                      description: AdditionalDevices defines additional
+                                        network devices bound to the virtual machine.
+                                      items:
+                                        description: AdditionalNetworkDevice the definition
+                                          of a Proxmox network device.
+                                        properties:
+                                          bridge:
+                                            description: Bridge is the network bridge
+                                              to attach to the machine.
+                                            minLength: 1
+                                            type: string
+                                          dnsServers:
+                                            description: |-
+                                              DNSServers contains information about nameservers to be used for this interface.
+                                              If this field is not set, it will use the default dns servers from the ProxmoxCluster.
+                                            items:
+                                              type: string
+                                            minItems: 1
+                                            type: array
+                                          ipv4PoolRef:
+                                            description: |-
+                                              IPv4PoolRef is a reference to an IPAM Pool resource, which exposes IPv4 addresses.
+                                              The network device will use an available IP address from the referenced pool.
+                                              This can be combined with `IPv6PoolRef` in order to enable dual stack.
+                                            properties:
+                                              apiGroup:
+                                                description: |-
+                                                  APIGroup is the group for the resource being referenced.
+                                                  If APIGroup is not specified, the specified Kind must be in the core API group.
+                                                  For any other third-party types, APIGroup is required.
+                                                type: string
+                                              kind:
+                                                description: Kind is the type of resource
+                                                  being referenced
+                                                type: string
+                                              name:
+                                                description: Name is the name of resource
+                                                  being referenced
+                                                type: string
+                                            required:
+                                            - kind
+                                            - name
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                            x-kubernetes-validations:
+                                            - message: ipv4PoolRef allows only IPAM
+                                                apiGroup ipam.cluster.x-k8s.io
+                                              rule: self.apiGroup == 'ipam.cluster.x-k8s.io'
+                                            - message: ipv4PoolRef allows either InClusterIPPool
+                                                or GlobalInClusterIPPool
+                                              rule: self.kind == 'InClusterIPPool'
+                                                || self.kind == 'GlobalInClusterIPPool'
+                                          ipv6PoolRef:
+                                            description: |-
+                                              IPv6PoolRef is a reference to an IPAM pool resource, which exposes IPv6 addresses.
+                                              The network device will use an available IP address from the referenced pool.
+                                              this can be combined with `IPv4PoolRef` in order to enable dual stack.
+                                            properties:
+                                              apiGroup:
+                                                description: |-
+                                                  APIGroup is the group for the resource being referenced.
+                                                  If APIGroup is not specified, the specified Kind must be in the core API group.
+                                                  For any other third-party types, APIGroup is required.
+                                                type: string
+                                              kind:
+                                                description: Kind is the type of resource
+                                                  being referenced
+                                                type: string
+                                              name:
+                                                description: Name is the name of resource
+                                                  being referenced
+                                                type: string
+                                            required:
+                                            - kind
+                                            - name
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                            x-kubernetes-validations:
+                                            - message: ipv6PoolRef allows only IPAM
+                                                apiGroup ipam.cluster.x-k8s.io
+                                              rule: self.apiGroup == 'ipam.cluster.x-k8s.io'
+                                            - message: ipv6PoolRef allows either InClusterIPPool
+                                                or GlobalInClusterIPPool
+                                              rule: self.kind == 'InClusterIPPool'
+                                                || self.kind == 'GlobalInClusterIPPool'
+                                          linkMtu:
+                                            description: LinkMTU is the network device
+                                              Maximum Transmission Unit.
+                                            type: integer
+                                            x-kubernetes-validations:
+                                            - message: invalid MTU value
+                                              rule: self == 1 || ( self >= 576 &&
+                                                self <= 65520)
+                                          model:
+                                            default: virtio
+                                            description: Model is the network device
+                                              model.
+                                            enum:
+                                            - e1000
+                                            - virtio
+                                            - rtl8139
+                                            - vmxnet3
+                                            type: string
+                                          mtu:
+                                            description: |-
+                                              MTU is the network device Maximum Transmission Unit.
+                                              When set to 1, virtio devices inherit the MTU value from the underlying bridge.
+                                            type: integer
+                                            x-kubernetes-validations:
+                                            - message: invalid MTU value
+                                              rule: self == 1 || ( self >= 576 &&
+                                                self <= 65520)
+                                          name:
+                                            description: |-
+                                              Name is the network device name.
+                                              Must be unique within the virtual machine and different from the primary device 'net0'.
+                                            minLength: 1
+                                            type: string
+                                            x-kubernetes-validations:
+                                            - message: additional network devices
+                                                doesn't allow net0
+                                              rule: self != 'net0'
+                                          routes:
+                                            description: Routes are the routes associated
+                                              with this interface.
+                                            items:
+                                              description: RouteSpec describes an
+                                                IPv4/IPv6 Route.
+                                              properties:
+                                                metric:
+                                                  description: Metric is the priority
+                                                    of the route in the routing table.
+                                                  format: int32
+                                                  type: integer
+                                                table:
+                                                  description: Table is the routing
+                                                    table used for this route.
+                                                  format: int32
+                                                  type: integer
+                                                to:
+                                                  description: To is the subnet to
+                                                    be routed.
+                                                  type: string
+                                                via:
+                                                  description: Via is the gateway
+                                                    to the subnet.
+                                                  type: string
+                                              type: object
+                                            minItems: 1
+                                            type: array
+                                          routingPolicy:
+                                            description: RoutingPolicy is an interface-specific
+                                              policy inserted into FIB (forwarding
+                                              information base).
+                                            items:
+                                              description: RoutingPolicySpec is a
+                                                Linux FIB rule.
+                                              properties:
+                                                from:
+                                                  description: From is the subnet
+                                                    of the source.
+                                                  type: string
+                                                priority:
+                                                  description: Priority is the position
+                                                    in the ip rule FIB table.
+                                                  format: int32
+                                                  maximum: 4294967295
+                                                  type: integer
+                                                  x-kubernetes-validations:
+                                                  - message: Cowardly refusing to
+                                                      insert FIB rule matching kernel
+                                                      rules
+                                                    rule: (self > 0 && self < 32765)
+                                                      || (self > 32766)
+                                                table:
+                                                  description: |-
+                                                    Table is the routing table ID.
+                                                    when used in the networks, the value should be the VRF Table.
+                                                  format: int32
+                                                  type: integer
+                                                to:
+                                                  description: To is the subnet of
+                                                    the target.
+                                                  type: string
+                                              type: object
+                                            minItems: 1
+                                            type: array
+                                          vlan:
+                                            description: VLAN is the network L2 VLAN.
+                                            maximum: 4094
+                                            minimum: 1
+                                            type: integer
+                                        required:
+                                        - bridge
+                                        - name
+                                        type: object
+                                        x-kubernetes-validations:
+                                        - message: at least one pool reference must
+                                            be set, either ipv4PoolRef or ipv6PoolRef
+                                          rule: self.ipv4PoolRef != null || self.ipv6PoolRef
+                                            != null
+                                      type: array
+                                      x-kubernetes-list-map-keys:
+                                      - name
+                                      x-kubernetes-list-type: map
+                                    default:
+                                      description: |-
+                                        Default is the default network device,
+                                        which will be used for the primary network interface.
+                                        net0 is always the default network device.
+                                      properties:
+                                        bridge:
+                                          description: Bridge is the network bridge
+                                            to attach to the machine.
+                                          minLength: 1
+                                          type: string
+                                        dnsServers:
+                                          description: |-
+                                            DNSServers contains information about nameservers to be used for this interface.
+                                            If this field is not set, it will use the default dns servers from the ProxmoxCluster.
+                                          items:
+                                            type: string
+                                          minItems: 1
+                                          type: array
+                                        ipv4PoolRef:
+                                          description: |-
+                                            IPv4PoolRef is a reference to an IPAM Pool resource, which exposes IPv4 addresses.
+                                            The network device will use an available IP address from the referenced pool.
+                                            This can be combined with `IPv6PoolRef` in order to enable dual stack.
+                                          properties:
+                                            apiGroup:
+                                              description: |-
+                                                APIGroup is the group for the resource being referenced.
+                                                If APIGroup is not specified, the specified Kind must be in the core API group.
+                                                For any other third-party types, APIGroup is required.
+                                              type: string
+                                            kind:
+                                              description: Kind is the type of resource
+                                                being referenced
+                                              type: string
+                                            name:
+                                              description: Name is the name of resource
+                                                being referenced
+                                              type: string
+                                          required:
+                                          - kind
+                                          - name
+                                          type: object
+                                          x-kubernetes-map-type: atomic
+                                          x-kubernetes-validations:
+                                          - message: ipv4PoolRef allows only IPAM
+                                              apiGroup ipam.cluster.x-k8s.io
+                                            rule: self.apiGroup == 'ipam.cluster.x-k8s.io'
+                                          - message: ipv4PoolRef allows either InClusterIPPool
+                                              or GlobalInClusterIPPool
+                                            rule: self.kind == 'InClusterIPPool' ||
+                                              self.kind == 'GlobalInClusterIPPool'
+                                        ipv6PoolRef:
+                                          description: |-
+                                            IPv6PoolRef is a reference to an IPAM pool resource, which exposes IPv6 addresses.
+                                            The network device will use an available IP address from the referenced pool.
+                                            this can be combined with `IPv4PoolRef` in order to enable dual stack.
+                                          properties:
+                                            apiGroup:
+                                              description: |-
+                                                APIGroup is the group for the resource being referenced.
+                                                If APIGroup is not specified, the specified Kind must be in the core API group.
+                                                For any other third-party types, APIGroup is required.
+                                              type: string
+                                            kind:
+                                              description: Kind is the type of resource
+                                                being referenced
+                                              type: string
+                                            name:
+                                              description: Name is the name of resource
+                                                being referenced
+                                              type: string
+                                          required:
+                                          - kind
+                                          - name
+                                          type: object
+                                          x-kubernetes-map-type: atomic
+                                          x-kubernetes-validations:
+                                          - message: ipv6PoolRef allows only IPAM
+                                              apiGroup ipam.cluster.x-k8s.io
+                                            rule: self.apiGroup == 'ipam.cluster.x-k8s.io'
+                                          - message: ipv6PoolRef allows either InClusterIPPool
+                                              or GlobalInClusterIPPool
+                                            rule: self.kind == 'InClusterIPPool' ||
+                                              self.kind == 'GlobalInClusterIPPool'
+                                        model:
+                                          default: virtio
+                                          description: Model is the network device
+                                            model.
+                                          enum:
+                                          - e1000
+                                          - virtio
+                                          - rtl8139
+                                          - vmxnet3
+                                          type: string
+                                        mtu:
+                                          description: |-
+                                            MTU is the network device Maximum Transmission Unit.
+                                            When set to 1, virtio devices inherit the MTU value from the underlying bridge.
+                                          type: integer
+                                          x-kubernetes-validations:
+                                          - message: invalid MTU value
+                                            rule: self == 1 || ( self >= 576 && self
+                                              <= 65520)
+                                        vlan:
+                                          description: VLAN is the network L2 VLAN.
+                                          maximum: 4094
+                                          minimum: 1
+                                          type: integer
+                                      required:
+                                      - bridge
+                                      type: object
+                                    vrfs:
+                                      description: Definition of a VRF Device.
+                                      items:
+                                        description: VRFDevice defines Virtual Routing
+                                          Flow devices.
+                                        properties:
+                                          interfaces:
+                                            description: Interfaces is the list of
+                                              proxmox network devices managed by this
+                                              virtual device.
+                                            items:
+                                              type: string
+                                            type: array
+                                          name:
+                                            description: |-
+                                              Name is the virtual network device name.
+                                              Must be unique within the virtual machine.
+                                            minLength: 3
+                                            type: string
+                                          routes:
+                                            description: Routes are the routes associated
+                                              with this interface.
+                                            items:
+                                              description: RouteSpec describes an
+                                                IPv4/IPv6 Route.
+                                              properties:
+                                                metric:
+                                                  description: Metric is the priority
+                                                    of the route in the routing table.
+                                                  format: int32
+                                                  type: integer
+                                                table:
+                                                  description: Table is the routing
+                                                    table used for this route.
+                                                  format: int32
+                                                  type: integer
+                                                to:
+                                                  description: To is the subnet to
+                                                    be routed.
+                                                  type: string
+                                                via:
+                                                  description: Via is the gateway
+                                                    to the subnet.
+                                                  type: string
+                                              type: object
+                                            minItems: 1
+                                            type: array
+                                          routingPolicy:
+                                            description: RoutingPolicy is an interface-specific
+                                              policy inserted into FIB (forwarding
+                                              information base).
+                                            items:
+                                              description: RoutingPolicySpec is a
+                                                Linux FIB rule.
+                                              properties:
+                                                from:
+                                                  description: From is the subnet
+                                                    of the source.
+                                                  type: string
+                                                priority:
+                                                  description: Priority is the position
+                                                    in the ip rule FIB table.
+                                                  format: int32
+                                                  maximum: 4294967295
+                                                  type: integer
+                                                  x-kubernetes-validations:
+                                                  - message: Cowardly refusing to
+                                                      insert FIB rule matching kernel
+                                                      rules
+                                                    rule: (self > 0 && self < 32765)
+                                                      || (self > 32766)
+                                                table:
+                                                  description: |-
+                                                    Table is the routing table ID.
+                                                    when used in the networks, the value should be the VRF Table.
+                                                  format: int32
+                                                  type: integer
+                                                to:
+                                                  description: To is the subnet of
+                                                    the target.
+                                                  type: string
+                                              type: object
+                                            minItems: 1
+                                            type: array
+                                          table:
+                                            description: Table is the ID of the routing
+                                              table used for the l3mdev vrf device.
+                                            format: int32
+                                            maximum: 4294967295
+                                            type: integer
+                                            x-kubernetes-validations:
+                                            - message: Cowardly refusing to insert
+                                                l3mdev rules into kernel tables
+                                              rule: (self > 0 && self < 254) || (self
+                                                > 255)
+                                        required:
+                                        - name
+                                        - table
+                                        type: object
+                                      type: array
+                                      x-kubernetes-list-map-keys:
+                                      - name
+                                      x-kubernetes-list-type: map
+                                  type: object
+                                numCores:
+                                  description: |-
+                                    NumCores is the number of cores per CPU socket in a virtual machine.
+                                    Defaults to the property value in the template from which the virtual machine is cloned.
+                                  format: int32
+                                  minimum: 1
+                                  type: integer
+                                numSockets:
+                                  description: |-
+                                    NumSockets is the number of CPU sockets in a virtual machine.
+                                    Defaults to the property value in the template from which the virtual machine is cloned.
+                                  format: int32
+                                  minimum: 1
+                                  type: integer
+                                pool:
+                                  description: Pool Add the new VM to the specified
+                                    pool.
+                                  type: string
+                                providerID:
+                                  description: |-
+                                    ProviderID is the virtual machine BIOS UUID formatted as
+                                    proxmox://6c3fa683-bef9-4425-b413-eaa45a9d6191
+                                  type: string
+                                snapName:
+                                  description: SnapName The name of the snapshot.
+                                  type: string
+                                sourceNode:
+                                  description: |-
+                                    SourceNode is the initially selected proxmox node.
+                                    This node will be used to locate the template VM, which will
+                                    be used for cloning operations.
+
+                                    Cloning will be performed according to the configuration.
+                                    Setting the `Target` field will tell Proxmox to clone the
+                                    VM on that target node.
+
+                                    When Target is not set and the ProxmoxCluster contains
+                                    a set of `AllowedNodes`, the algorithm will instead evenly
+                                    distribute the VMs across the nodes from that list.
+
+                                    If neither a `Target` nor `AllowedNodes` was set, the VM
+                                    will be cloned onto the same node as SourceNode.
+                                  minLength: 1
+                                  type: string
+                                storage:
+                                  description: Storage for full clone.
+                                  type: string
+                                tags:
+                                  description: Tags is a list of tags to be applied
+                                    to the virtual machine.
+                                  items:
+                                    pattern: ^(?i)[a-z0-9_][a-z0-9_\-\+\.]*$
+                                    type: string
+                                  minItems: 1
+                                  type: array
+                                  x-kubernetes-list-type: set
+                                target:
+                                  description: Target node. Only allowed if the original
+                                    VM is on shared storage.
+                                  type: string
+                                templateID:
+                                  description: TemplateID the vm_template vmid used
+                                    for cloning a new VM.
+                                  format: int32
+                                  type: integer
+                                templateSelector:
+                                  description: TemplateSelector defines MatchTags
+                                    for looking up VM templates.
+                                  properties:
+                                    matchTags:
+                                      description: |-
+                                        Specifies all tags to look for, when looking up the VM template.
+                                        Passed tags must be an exact 1:1 match with the tags on the template you want to use.
+                                        If multiple VM templates with the same set of tags are found, provisioning will fail.
+                                      items:
+                                        pattern: ^(?i)[a-z0-9_][a-z0-9_\-\+\.]*$
+                                        type: string
+                                      minItems: 1
+                                      type: array
+                                      x-kubernetes-list-type: set
+                                  required:
+                                  - matchTags
+                                  type: object
+                                virtualMachineID:
+                                  description: VirtualMachineID is the Proxmox identifier
+                                    for the ProxmoxMachine VM.
+                                  format: int64
+                                  type: integer
+                                vmIDRange:
+                                  description: VMIDRange is the range of VMIDs to
+                                    use for VMs.
+                                  properties:
+                                    end:
+                                      description: |-
+                                        VMIDRangeEnd is the end of the VMID range to use for VMs.
+                                        Only used if VMIDRangeStart is set.
+                                      format: int64
+                                      maximum: 999999999
+                                      minimum: 100
+                                      type: integer
+                                    start:
+                                      description: VMIDRangeStart is the start of
+                                        the VMID range to use for VMs.
+                                      format: int64
+                                      maximum: 999999999
+                                      minimum: 100
+                                      type: integer
+                                  required:
+                                  - end
+                                  - start
+                                  type: object
+                                  x-kubernetes-validations:
+                                  - message: end should be greater than or equal to
+                                      start
+                                    rule: self.end >= self.start
+                              type: object
+                              x-kubernetes-validations:
+                              - message: Must set full=true when specifying format
+                                rule: self.full || !has(self.format)
+                              - message: Must set full=true when specifying storage
+                                rule: self.full || !has(self.storage)
+                            type: object
+                            x-kubernetes-validations:
+                            - message: Cowardly refusing to deploy cluster without
+                                control plane
+                              rule: has(self.controlPlane)
+                          sshAuthorizedKeys:
+                            description: SshAuthorizedKeys contains the authorized
+                              keys deployed to the PROXMOX VMs.
+                            items:
+                              type: string
+                            type: array
+                          virtualIPNetworkInterface:
+                            description: VirtualIPNetworkInterface is the interface
+                              the k8s control plane binds to.
+                            type: string
+                        required:
+                        - machineSpec
+                        type: object
+                      controlPlaneEndpoint:
+                        description: ControlPlaneEndpoint represents the endpoint
+                          used to communicate with the control plane.
+                        properties:
+                          host:
+                            description: host is the hostname on which the API server
+                              is serving.
+                            maxLength: 512
+                            type: string
+                          port:
+                            description: port is the port on which the API server
+                              is serving.
+                            format: int32
+                            type: integer
+                        required:
+                        - host
+                        - port
+                        type: object
+                        x-kubernetes-validations:
+                        - message: port must be within 1-65535
+                          rule: self.port > 0 && self.port < 65536
+                      credentialsRef:
+                        description: |-
+                          CredentialsRef is a reference to a Secret that contains the credentials to use for provisioning this cluster. If not
+                          supplied then the credentials of the controller will be used.
+                          if no namespace is provided, the namespace of the ProxmoxCluster will be used.
+                        properties:
+                          name:
+                            description: name is unique within a namespace to reference
+                              a secret resource.
+                            type: string
+                          namespace:
+                            description: namespace defines the space within which
+                              the secret name must be unique.
+                            type: string
+                        type: object
+                        x-kubernetes-map-type: atomic
+                      dnsServers:
+                        description: DNSServers contains information about nameservers
+                          used by the machines.
+                        items:
+                          type: string
+                        minItems: 1
+                        type: array
+                      externalManagedControlPlane:
+                        description: |-
+                          ExternalManagedControlPlane can be enabled to allow externally managed Control Planes to patch the
+                          Proxmox cluster with the Load Balancer IP provided by Control Plane provider.
+                        type: boolean
+                      ipv4Config:
+                        description: |-
+                          IPv4Config contains information about available IPV4 address pools and the gateway.
+                          This can be combined with ipv6Config in order to enable dual stack.
+                          Either IPv4Config or IPv6Config must be provided.
+                        properties:
+                          addresses:
+                            description: |-
+                              Addresses is a list of IP addresses that can be assigned. This set of
+                              addresses can be non-contiguous.
+                            items:
+                              type: string
+                            type: array
+                          gateway:
+                            description: Gateway
+                            type: string
+                          metric:
+                            default: 100
+                            description: Metric is the route priority applied to the
+                              default gateway
+                            format: int32
+                            type: integer
+                          prefix:
+                            description: Prefix is the network prefix to use.
+                            maximum: 128
+                            type: integer
+                        required:
+                        - addresses
+                        - metric
+                        - prefix
+                        type: object
+                        x-kubernetes-validations:
+                        - message: IPv4Config addresses must be provided
+                          rule: self.addresses.size() > 0
+                      ipv6Config:
+                        description: |-
+                          IPv6Config contains information about available IPV6 address pools and the gateway.
+                          This can be combined with ipv4Config in order to enable dual stack.
+                          Either IPv4Config or IPv6Config must be provided.
+                        properties:
+                          addresses:
+                            description: |-
+                              Addresses is a list of IP addresses that can be assigned. This set of
+                              addresses can be non-contiguous.
+                            items:
+                              type: string
+                            type: array
+                          gateway:
+                            description: Gateway
+                            type: string
+                          metric:
+                            default: 100
+                            description: Metric is the route priority applied to the
+                              default gateway
+                            format: int32
+                            type: integer
+                          prefix:
+                            description: Prefix is the network prefix to use.
+                            maximum: 128
+                            type: integer
+                        required:
+                        - addresses
+                        - metric
+                        - prefix
+                        type: object
+                        x-kubernetes-validations:
+                        - message: IPv6Config addresses must be provided
+                          rule: self.addresses.size() > 0
+                      schedulerHints:
+                        description: |-
+                          SchedulerHints allows to influence the decision on where a VM will be scheduled. For example by applying a multiplicator
+                          to a node's resources, to allow for overprovisioning or to ensure a node will always have a safety buffer.
+                        properties:
+                          memoryAdjustment:
+                            description: |-
+                              MemoryAdjustment allows to adjust a node's memory by a given percentage.
+                              For example, setting it to 300 allows to allocate 300% of a host's memory for VMs,
+                              and setting it to 95 limits memory allocation to 95% of a host's memory.
+                              Setting it to 0 entirely disables scheduling memory constraints.
+                              By default 100% of a node's memory will be used for allocation.
+                            format: int64
+                            type: integer
+                        type: object
+                    required:
+                    - dnsServers
+                    type: object
+                required:
+                - spec
+                type: object
+            required:
+            - template
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    cert-manager.io/inject-ca-from: capmox-system/capmox-serving-cert
+    controller-gen.kubebuilder.io/version: v0.16.5
+  labels:
+    cluster.x-k8s.io/provider: infrastructure-proxmox
+    cluster.x-k8s.io/v1beta1: v1alpha1
+  name: proxmoxmachines.infrastructure.cluster.x-k8s.io
+spec:
+  group: infrastructure.cluster.x-k8s.io
+  names:
+    categories:
+    - cluster-api
+    - proxmox
+    kind: ProxmoxMachine
+    listKind: ProxmoxMachineList
+    plural: proxmoxmachines
+    shortNames:
+    - moxm
+    singular: proxmoxmachine
+  scope: Namespaced
+  versions:
+  - additionalPrinterColumns:
+    - description: Cluster to which this ProxmoxMachine belongs
+      jsonPath: .metadata.labels.cluster\.x-k8s\.io/cluster-name
+      name: Cluster
+      type: string
+    - description: Machine ready status
+      jsonPath: .status.ready
+      name: Ready
+      type: string
+    - description: Proxmox Node that the machine was deployed on
+      jsonPath: .status.proxmoxNode
+      name: Node
+      type: string
+    - description: Provider ID
+      jsonPath: .spec.providerID
+      name: Provider_ID
+      type: string
+    - description: Machine object which owns with this ProxmoxMachine
+      jsonPath: .metadata.ownerReferences[?(@.kind=="Machine")].name
+      name: Machine
+      type: string
+    name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        description: ProxmoxMachine is the Schema for the proxmoxmachines API.
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: ProxmoxMachineSpec defines the desired state of a ProxmoxMachine.
+            properties:
+              allowedNodes:
+                description: |-
+                  AllowedNodes specifies all Proxmox nodes which will be considered
+                  for operations. This implies that VMs can be cloned on different nodes from
+                  the node which holds the VM template.
+
+                  This field is optional and should only be set if you want to restrict
+                  the nodes where the VM can be cloned.
+                  If not set, the ProxmoxCluster will be used to determine the nodes.
+                items:
+                  type: string
+                type: array
+              checks:
+                description: Checks defines possibles checks to skip.
+                properties:
+                  skipCloudInitStatus:
+                    description: Skip checking CloudInit which can be very useful
+                      for specific Operating Systems like TalOS
+                    type: boolean
+                  skipQemuGuestAgent:
+                    description: Skip checking QEMU Agent readiness which can be very
+                      useful for specific Operating Systems like TalOS
+                    type: boolean
+                type: object
+              description:
+                description: Description for the new VM.
+                type: string
+              disks:
+                description: |-
+                  Disks contains a set of disk configuration options,
+                  which will be applied before the first startup.
+                properties:
+                  bootVolume:
+                    description: |-
+                      BootVolume defines the storage size for the boot volume.
+                      This field is optional, and should only be set if you want
+                      to change the size of the boot volume.
+                    properties:
+                      disk:
+                        description: |-
+                          Disk is the name of the disk device, that should be resized.
+                          Example values are: ide[0-3], scsi[0-30], sata[0-5].
+                        type: string
+                      sizeGb:
+                        description: |-
+                          Size defines the size in gigabyte.
+
+                          As Proxmox does not support shrinking, the size
+                          must be bigger than the already configured size in the
+                          template.
+                        format: int32
+                        minimum: 5
+                        type: integer
+                    required:
+                    - disk
+                    - sizeGb
+                    type: object
+                    x-kubernetes-validations:
+                    - message: Value is immutable
+                      rule: self == oldSelf
+                type: object
+              format:
+                description: Format for file storage. Only valid for full clone.
+                enum:
+                - raw
+                - qcow2
+                - vmdk
+                type: string
+              full:
+                default: true
+                description: |-
+                  Full Create a full copy of all disks.
+                  This is always done when you clone a normal VM.
+                  Create a Full clone by default.
+                type: boolean
+              memoryMiB:
+                description: |-
+                  MemoryMiB is the size of a virtual machine's memory, in MiB.
+                  Defaults to the property value in the template from which the virtual machine is cloned.
+                format: int32
+                multipleOf: 8
+                type: integer
+              metadataSettings:
+                description: MetadataSettings defines the metadata settings for this
+                  machine's VM.
+                properties:
+                  providerIDInjection:
+                    description: |-
+                      ProviderIDInjection enables the injection of the `providerID` into the cloudinit metadata.
+                      this will basically set the `provider-id` field in the metadata to `proxmox://<instanceID>`.
+                    type: boolean
+                type: object
+              network:
+                description: Network is the network configuration for this machine's
+                  VM.
+                properties:
+                  additionalDevices:
+                    description: AdditionalDevices defines additional network devices
+                      bound to the virtual machine.
+                    items:
+                      description: AdditionalNetworkDevice the definition of a Proxmox
+                        network device.
+                      properties:
+                        bridge:
+                          description: Bridge is the network bridge to attach to the
+                            machine.
+                          minLength: 1
+                          type: string
+                        dnsServers:
+                          description: |-
+                            DNSServers contains information about nameservers to be used for this interface.
+                            If this field is not set, it will use the default dns servers from the ProxmoxCluster.
+                          items:
+                            type: string
+                          minItems: 1
+                          type: array
+                        ipv4PoolRef:
+                          description: |-
+                            IPv4PoolRef is a reference to an IPAM Pool resource, which exposes IPv4 addresses.
+                            The network device will use an available IP address from the referenced pool.
+                            This can be combined with `IPv6PoolRef` in order to enable dual stack.
+                          properties:
+                            apiGroup:
+                              description: |-
+                                APIGroup is the group for the resource being referenced.
+                                If APIGroup is not specified, the specified Kind must be in the core API group.
+                                For any other third-party types, APIGroup is required.
+                              type: string
+                            kind:
+                              description: Kind is the type of resource being referenced
+                              type: string
+                            name:
+                              description: Name is the name of resource being referenced
+                              type: string
+                          required:
+                          - kind
+                          - name
+                          type: object
+                          x-kubernetes-map-type: atomic
+                          x-kubernetes-validations:
+                          - message: ipv4PoolRef allows only IPAM apiGroup ipam.cluster.x-k8s.io
+                            rule: self.apiGroup == 'ipam.cluster.x-k8s.io'
+                          - message: ipv4PoolRef allows either InClusterIPPool or
+                              GlobalInClusterIPPool
+                            rule: self.kind == 'InClusterIPPool' || self.kind == 'GlobalInClusterIPPool'
+                        ipv6PoolRef:
+                          description: |-
+                            IPv6PoolRef is a reference to an IPAM pool resource, which exposes IPv6 addresses.
+                            The network device will use an available IP address from the referenced pool.
+                            this can be combined with `IPv4PoolRef` in order to enable dual stack.
+                          properties:
+                            apiGroup:
+                              description: |-
+                                APIGroup is the group for the resource being referenced.
+                                If APIGroup is not specified, the specified Kind must be in the core API group.
+                                For any other third-party types, APIGroup is required.
+                              type: string
+                            kind:
+                              description: Kind is the type of resource being referenced
+                              type: string
+                            name:
+                              description: Name is the name of resource being referenced
+                              type: string
+                          required:
+                          - kind
+                          - name
+                          type: object
+                          x-kubernetes-map-type: atomic
+                          x-kubernetes-validations:
+                          - message: ipv6PoolRef allows only IPAM apiGroup ipam.cluster.x-k8s.io
+                            rule: self.apiGroup == 'ipam.cluster.x-k8s.io'
+                          - message: ipv6PoolRef allows either InClusterIPPool or
+                              GlobalInClusterIPPool
+                            rule: self.kind == 'InClusterIPPool' || self.kind == 'GlobalInClusterIPPool'
+                        linkMtu:
+                          description: LinkMTU is the network device Maximum Transmission
+                            Unit.
+                          type: integer
+                          x-kubernetes-validations:
+                          - message: invalid MTU value
+                            rule: self == 1 || ( self >= 576 && self <= 65520)
+                        model:
+                          default: virtio
+                          description: Model is the network device model.
+                          enum:
+                          - e1000
+                          - virtio
+                          - rtl8139
+                          - vmxnet3
+                          type: string
+                        mtu:
+                          description: |-
+                            MTU is the network device Maximum Transmission Unit.
+                            When set to 1, virtio devices inherit the MTU value from the underlying bridge.
+                          type: integer
+                          x-kubernetes-validations:
+                          - message: invalid MTU value
+                            rule: self == 1 || ( self >= 576 && self <= 65520)
+                        name:
+                          description: |-
+                            Name is the network device name.
+                            Must be unique within the virtual machine and different from the primary device 'net0'.
+                          minLength: 1
+                          type: string
+                          x-kubernetes-validations:
+                          - message: additional network devices doesn't allow net0
+                            rule: self != 'net0'
+                        routes:
+                          description: Routes are the routes associated with this
+                            interface.
+                          items:
+                            description: RouteSpec describes an IPv4/IPv6 Route.
+                            properties:
+                              metric:
+                                description: Metric is the priority of the route in
+                                  the routing table.
+                                format: int32
+                                type: integer
+                              table:
+                                description: Table is the routing table used for this
+                                  route.
+                                format: int32
+                                type: integer
+                              to:
+                                description: To is the subnet to be routed.
+                                type: string
+                              via:
+                                description: Via is the gateway to the subnet.
+                                type: string
+                            type: object
+                          minItems: 1
+                          type: array
+                        routingPolicy:
+                          description: RoutingPolicy is an interface-specific policy
+                            inserted into FIB (forwarding information base).
+                          items:
+                            description: RoutingPolicySpec is a Linux FIB rule.
+                            properties:
+                              from:
+                                description: From is the subnet of the source.
+                                type: string
+                              priority:
+                                description: Priority is the position in the ip rule
+                                  FIB table.
+                                format: int32
+                                maximum: 4294967295
+                                type: integer
+                                x-kubernetes-validations:
+                                - message: Cowardly refusing to insert FIB rule matching
+                                    kernel rules
+                                  rule: (self > 0 && self < 32765) || (self > 32766)
+                              table:
+                                description: |-
+                                  Table is the routing table ID.
+                                  when used in the networks, the value should be the VRF Table.
+                                format: int32
+                                type: integer
+                              to:
+                                description: To is the subnet of the target.
+                                type: string
+                            type: object
+                          minItems: 1
+                          type: array
+                        vlan:
+                          description: VLAN is the network L2 VLAN.
+                          maximum: 4094
+                          minimum: 1
+                          type: integer
+                      required:
+                      - bridge
+                      - name
+                      type: object
+                      x-kubernetes-validations:
+                      - message: at least one pool reference must be set, either ipv4PoolRef
+                          or ipv6PoolRef
+                        rule: self.ipv4PoolRef != null || self.ipv6PoolRef != null
+                    type: array
+                    x-kubernetes-list-map-keys:
+                    - name
+                    x-kubernetes-list-type: map
+                  default:
+                    description: |-
+                      Default is the default network device,
+                      which will be used for the primary network interface.
+                      net0 is always the default network device.
+                    properties:
+                      bridge:
+                        description: Bridge is the network bridge to attach to the
+                          machine.
+                        minLength: 1
+                        type: string
+                      dnsServers:
+                        description: |-
+                          DNSServers contains information about nameservers to be used for this interface.
+                          If this field is not set, it will use the default dns servers from the ProxmoxCluster.
+                        items:
+                          type: string
+                        minItems: 1
+                        type: array
+                      ipv4PoolRef:
+                        description: |-
+                          IPv4PoolRef is a reference to an IPAM Pool resource, which exposes IPv4 addresses.
+                          The network device will use an available IP address from the referenced pool.
+                          This can be combined with `IPv6PoolRef` in order to enable dual stack.
+                        properties:
+                          apiGroup:
+                            description: |-
+                              APIGroup is the group for the resource being referenced.
+                              If APIGroup is not specified, the specified Kind must be in the core API group.
+                              For any other third-party types, APIGroup is required.
+                            type: string
+                          kind:
+                            description: Kind is the type of resource being referenced
+                            type: string
+                          name:
+                            description: Name is the name of resource being referenced
+                            type: string
+                        required:
+                        - kind
+                        - name
+                        type: object
+                        x-kubernetes-map-type: atomic
+                        x-kubernetes-validations:
+                        - message: ipv4PoolRef allows only IPAM apiGroup ipam.cluster.x-k8s.io
+                          rule: self.apiGroup == 'ipam.cluster.x-k8s.io'
+                        - message: ipv4PoolRef allows either InClusterIPPool or GlobalInClusterIPPool
+                          rule: self.kind == 'InClusterIPPool' || self.kind == 'GlobalInClusterIPPool'
+                      ipv6PoolRef:
+                        description: |-
+                          IPv6PoolRef is a reference to an IPAM pool resource, which exposes IPv6 addresses.
+                          The network device will use an available IP address from the referenced pool.
+                          this can be combined with `IPv4PoolRef` in order to enable dual stack.
+                        properties:
+                          apiGroup:
+                            description: |-
+                              APIGroup is the group for the resource being referenced.
+                              If APIGroup is not specified, the specified Kind must be in the core API group.
+                              For any other third-party types, APIGroup is required.
+                            type: string
+                          kind:
+                            description: Kind is the type of resource being referenced
+                            type: string
+                          name:
+                            description: Name is the name of resource being referenced
+                            type: string
+                        required:
+                        - kind
+                        - name
+                        type: object
+                        x-kubernetes-map-type: atomic
+                        x-kubernetes-validations:
+                        - message: ipv6PoolRef allows only IPAM apiGroup ipam.cluster.x-k8s.io
+                          rule: self.apiGroup == 'ipam.cluster.x-k8s.io'
+                        - message: ipv6PoolRef allows either InClusterIPPool or GlobalInClusterIPPool
+                          rule: self.kind == 'InClusterIPPool' || self.kind == 'GlobalInClusterIPPool'
+                      model:
+                        default: virtio
+                        description: Model is the network device model.
+                        enum:
+                        - e1000
+                        - virtio
+                        - rtl8139
+                        - vmxnet3
+                        type: string
+                      mtu:
+                        description: |-
+                          MTU is the network device Maximum Transmission Unit.
+                          When set to 1, virtio devices inherit the MTU value from the underlying bridge.
+                        type: integer
+                        x-kubernetes-validations:
+                        - message: invalid MTU value
+                          rule: self == 1 || ( self >= 576 && self <= 65520)
+                      vlan:
+                        description: VLAN is the network L2 VLAN.
+                        maximum: 4094
+                        minimum: 1
+                        type: integer
+                    required:
+                    - bridge
+                    type: object
+                  vrfs:
+                    description: Definition of a VRF Device.
+                    items:
+                      description: VRFDevice defines Virtual Routing Flow devices.
+                      properties:
+                        interfaces:
+                          description: Interfaces is the list of proxmox network devices
+                            managed by this virtual device.
+                          items:
+                            type: string
+                          type: array
+                        name:
+                          description: |-
+                            Name is the virtual network device name.
+                            Must be unique within the virtual machine.
+                          minLength: 3
+                          type: string
+                        routes:
+                          description: Routes are the routes associated with this
+                            interface.
+                          items:
+                            description: RouteSpec describes an IPv4/IPv6 Route.
+                            properties:
+                              metric:
+                                description: Metric is the priority of the route in
+                                  the routing table.
+                                format: int32
+                                type: integer
+                              table:
+                                description: Table is the routing table used for this
+                                  route.
+                                format: int32
+                                type: integer
+                              to:
+                                description: To is the subnet to be routed.
+                                type: string
+                              via:
+                                description: Via is the gateway to the subnet.
+                                type: string
+                            type: object
+                          minItems: 1
+                          type: array
+                        routingPolicy:
+                          description: RoutingPolicy is an interface-specific policy
+                            inserted into FIB (forwarding information base).
+                          items:
+                            description: RoutingPolicySpec is a Linux FIB rule.
+                            properties:
+                              from:
+                                description: From is the subnet of the source.
+                                type: string
+                              priority:
+                                description: Priority is the position in the ip rule
+                                  FIB table.
+                                format: int32
+                                maximum: 4294967295
+                                type: integer
+                                x-kubernetes-validations:
+                                - message: Cowardly refusing to insert FIB rule matching
+                                    kernel rules
+                                  rule: (self > 0 && self < 32765) || (self > 32766)
+                              table:
+                                description: |-
+                                  Table is the routing table ID.
+                                  when used in the networks, the value should be the VRF Table.
+                                format: int32
+                                type: integer
+                              to:
+                                description: To is the subnet of the target.
+                                type: string
+                            type: object
+                          minItems: 1
+                          type: array
+                        table:
+                          description: Table is the ID of the routing table used for
+                            the l3mdev vrf device.
+                          format: int32
+                          maximum: 4294967295
+                          type: integer
+                          x-kubernetes-validations:
+                          - message: Cowardly refusing to insert l3mdev rules into
+                              kernel tables
+                            rule: (self > 0 && self < 254) || (self > 255)
+                      required:
+                      - name
+                      - table
+                      type: object
+                    type: array
+                    x-kubernetes-list-map-keys:
+                    - name
+                    x-kubernetes-list-type: map
+                type: object
+              numCores:
+                description: |-
+                  NumCores is the number of cores per CPU socket in a virtual machine.
+                  Defaults to the property value in the template from which the virtual machine is cloned.
+                format: int32
+                minimum: 1
+                type: integer
+              numSockets:
+                description: |-
+                  NumSockets is the number of CPU sockets in a virtual machine.
+                  Defaults to the property value in the template from which the virtual machine is cloned.
+                format: int32
+                minimum: 1
+                type: integer
+              pool:
+                description: Pool Add the new VM to the specified pool.
+                type: string
+              providerID:
+                description: |-
+                  ProviderID is the virtual machine BIOS UUID formatted as
+                  proxmox://6c3fa683-bef9-4425-b413-eaa45a9d6191
+                type: string
+              snapName:
+                description: SnapName The name of the snapshot.
+                type: string
+              sourceNode:
+                description: |-
+                  SourceNode is the initially selected proxmox node.
+                  This node will be used to locate the template VM, which will
+                  be used for cloning operations.
+
+                  Cloning will be performed according to the configuration.
+                  Setting the `Target` field will tell Proxmox to clone the
+                  VM on that target node.
+
+                  When Target is not set and the ProxmoxCluster contains
+                  a set of `AllowedNodes`, the algorithm will instead evenly
+                  distribute the VMs across the nodes from that list.
+
+                  If neither a `Target` nor `AllowedNodes` was set, the VM
+                  will be cloned onto the same node as SourceNode.
+                minLength: 1
+                type: string
+              storage:
+                description: Storage for full clone.
+                type: string
+              tags:
+                description: Tags is a list of tags to be applied to the virtual machine.
+                items:
+                  pattern: ^(?i)[a-z0-9_][a-z0-9_\-\+\.]*$
+                  type: string
+                minItems: 1
+                type: array
+                x-kubernetes-list-type: set
+              target:
+                description: Target node. Only allowed if the original VM is on shared
+                  storage.
+                type: string
+              templateID:
+                description: TemplateID the vm_template vmid used for cloning a new
+                  VM.
+                format: int32
+                type: integer
+              templateSelector:
+                description: TemplateSelector defines MatchTags for looking up VM
+                  templates.
+                properties:
+                  matchTags:
+                    description: |-
+                      Specifies all tags to look for, when looking up the VM template.
+                      Passed tags must be an exact 1:1 match with the tags on the template you want to use.
+                      If multiple VM templates with the same set of tags are found, provisioning will fail.
+                    items:
+                      pattern: ^(?i)[a-z0-9_][a-z0-9_\-\+\.]*$
+                      type: string
+                    minItems: 1
+                    type: array
+                    x-kubernetes-list-type: set
+                required:
+                - matchTags
+                type: object
+              virtualMachineID:
+                description: VirtualMachineID is the Proxmox identifier for the ProxmoxMachine
+                  VM.
+                format: int64
+                type: integer
+              vmIDRange:
+                description: VMIDRange is the range of VMIDs to use for VMs.
+                properties:
+                  end:
+                    description: |-
+                      VMIDRangeEnd is the end of the VMID range to use for VMs.
+                      Only used if VMIDRangeStart is set.
+                    format: int64
+                    maximum: 999999999
+                    minimum: 100
+                    type: integer
+                  start:
+                    description: VMIDRangeStart is the start of the VMID range to
+                      use for VMs.
+                    format: int64
+                    maximum: 999999999
+                    minimum: 100
+                    type: integer
+                required:
+                - end
+                - start
+                type: object
+                x-kubernetes-validations:
+                - message: end should be greater than or equal to start
+                  rule: self.end >= self.start
+            type: object
+            x-kubernetes-validations:
+            - message: must define either SourceNode with TemplateID, OR TemplateSelector
+              rule: '[has(self.sourceNode), has(self.templateSelector)].exists_one(c,
+                c)'
+            - message: must define either SourceNode with TemplateID, OR TemplateSelector.
+              rule: '[has(self.templateID), has(self.templateSelector)].exists_one(c,
+                c)'
+            - message: Must set full=true when specifying format
+              rule: self.full || !has(self.format)
+            - message: Must set full=true when specifying storage
+              rule: self.full || !has(self.storage)
+          status:
+            description: ProxmoxMachineStatus defines the observed state of a ProxmoxMachine.
+            properties:
+              addresses:
+                description: Addresses contains the Proxmox VM instance associated
+                  addresses.
+                items:
+                  description: MachineAddress contains information for the node's
+                    address.
+                  properties:
+                    address:
+                      description: address is the machine address.
+                      maxLength: 256
+                      minLength: 1
+                      type: string
+                    type:
+                      description: type is the machine address type, one of Hostname,
+                        ExternalIP, InternalIP, ExternalDNS or InternalDNS.
+                      enum:
+                      - Hostname
+                      - ExternalIP
+                      - InternalIP
+                      - ExternalDNS
+                      - InternalDNS
+                      type: string
+                  required:
+                  - address
+                  - type
+                  type: object
+                type: array
+              bootstrapDataProvided:
+                description: BootstrapDataProvided whether the virtual machine has
+                  an injected bootstrap data.
+                type: boolean
+              conditions:
+                description: Conditions defines current service state of the ProxmoxMachine.
+                items:
+                  description: Condition defines an observation of a Cluster API resource
+                    operational state.
+                  properties:
+                    lastTransitionTime:
+                      description: |-
+                        lastTransitionTime is the last time the condition transitioned from one status to another.
+                        This should be when the underlying condition changed. If that is not known, then using the time when
+                        the API field changed is acceptable.
+                      format: date-time
+                      type: string
+                    message:
+                      description: |-
+                        message is a human readable message indicating details about the transition.
+                        This field may be empty.
+                      maxLength: 10240
+                      minLength: 1
+                      type: string
+                    reason:
+                      description: |-
+                        reason is the reason for the condition's last transition in CamelCase.
+                        The specific API may choose whether or not this field is considered a guaranteed API.
+                        This field may be empty.
+                      maxLength: 256
+                      minLength: 1
+                      type: string
+                    severity:
+                      description: |-
+                        severity provides an explicit classification of Reason code, so the users or machines can immediately
+                        understand the current situation and act accordingly.
+                        The Severity field MUST be set only when Status=False.
+                      maxLength: 32
+                      type: string
+                    status:
+                      description: status of the condition, one of True, False, Unknown.
+                      type: string
+                    type:
+                      description: |-
+                        type of condition in CamelCase or in foo.example.com/CamelCase.
+                        Many .condition.type values are consistent across resources like Available, but because arbitrary conditions
+                        can be useful (see .node.status.conditions), the ability to deconflict is important.
+                      maxLength: 256
+                      minLength: 1
+                      type: string
+                  required:
+                  - lastTransitionTime
+                  - status
+                  - type
+                  type: object
+                type: array
+              failureMessage:
+                description: |-
+                  FailureMessage will be set in the event that there is a terminal problem
+                  reconciling the Machine and will contain a more verbose string suitable
+                  for logging and human consumption.
+
+                  This field should not be set for transitive errors that a controller
+                  faces that are expected to be fixed automatically over
+                  time (like service outages), but instead indicate that something is
+                  fundamentally wrong with the Machine's spec or the configuration of
+                  the controller, and that manual intervention is required. Examples
+                  of terminal errors would be invalid combinations of settings in the
+                  spec, values that are unsupported by the controller, or the
+                  responsible controller itself being critically misconfigured.
+
+                  Any transient errors that occur during the reconciliation of ProxmoxMachines
+                  can be added as events to the ProxmoxMachine object and/or logged in the
+                  controller's output.
+                type: string
+              failureReason:
+                description: |-
+                  FailureReason will be set in the event that there is a terminal problem
+                  reconciling the Machine and will contain a succinct value suitable
+                  for machine interpretation.
+
+                  This field should not be set for transitive errors that a controller
+                  faces that are expected to be fixed automatically over
+                  time (like service outages), but instead indicate that something is
+                  fundamentally wrong with the Machine's spec or the configuration of
+                  the controller, and that manual intervention is required. Examples
+                  of terminal errors would be invalid combinations of settings in the
+                  spec, values that are unsupported by the controller, or the
+                  responsible controller itself being critically misconfigured.
+
+                  Any transient errors that occur during the reconciliation of ProxmoxMachines
+                  can be added as events to the ProxmoxMachine object and/or logged in the
+                  controller's output.
+                type: string
+              ipAddresses:
+                additionalProperties:
+                  description: IPAddress defines the IP addresses of a network interface.
+                  properties:
+                    ipv4:
+                      description: IPV4 is the IPv4 address.
+                      type: string
+                    ipv6:
+                      description: IPV6 is the IPv6 address.
+                      type: string
+                  type: object
+                description: IPAddresses are the IP addresses used to access the virtual
+                  machine.
+                type: object
+              network:
+                description: |-
+                  Network returns the network status for each of the machine's configured.
+                  network interfaces.
+                items:
+                  description: NetworkStatus provides information about one of a VM's
+                    networks.
+                  properties:
+                    connected:
+                      description: |-
+                        Connected is a flag that indicates whether this network is currently
+                        connected to the VM.
+                      type: boolean
+                    ipAddrs:
+                      description: IPAddrs is one or more IP addresses reported by
+                        vm-tools.
+                      items:
+                        type: string
+                      type: array
+                    macAddr:
+                      description: MACAddr is the MAC address of the network device.
+                      type: string
+                    networkName:
+                      description: NetworkName is the name of the network.
+                      type: string
+                  required:
+                  - macAddr
+                  type: object
+                type: array
+              proxmoxNode:
+                description: |-
+                  ProxmoxNode is the name of the proxmox node, which was chosen for this
+                  machine to be deployed on.
+                type: string
+              ready:
+                description: Ready indicates the Docker infrastructure has been provisioned
+                  and is ready.
+                type: boolean
+              retryAfter:
+                description: RetryAfter tracks the time we can retry queueing a task.
+                format: date-time
+                type: string
+              taskRef:
+                description: |-
+                  TaskRef is a managed object reference to a Task related to the ProxmoxMachine.
+                  This value is set automatically at runtime and should not be set or
+                  modified by users.
+                type: string
+              vmStatus:
+                description: VMStatus is used to identify the virtual machine status.
+                type: string
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    cert-manager.io/inject-ca-from: capmox-system/capmox-serving-cert
+    controller-gen.kubebuilder.io/version: v0.16.5
+  labels:
+    cluster.x-k8s.io/provider: infrastructure-proxmox
+    cluster.x-k8s.io/v1beta1: v1alpha1
+  name: proxmoxmachinetemplates.infrastructure.cluster.x-k8s.io
+spec:
+  group: infrastructure.cluster.x-k8s.io
+  names:
+    categories:
+    - cluster-api
+    kind: ProxmoxMachineTemplate
+    listKind: ProxmoxMachineTemplateList
+    plural: proxmoxmachinetemplates
+    shortNames:
+    - pmt
+    singular: proxmoxmachinetemplate
+  scope: Namespaced
+  versions:
+  - name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        description: ProxmoxMachineTemplate is the Schema for the proxmoxmachinetemplates
+          API.
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: ProxmoxMachineTemplateSpec defines the desired state of ProxmoxMachineTemplate.
+            properties:
+              template:
+                description: ProxmoxMachineTemplateResource defines the spec and metadata
+                  for ProxmoxMachineTemplate supported by capi.
+                properties:
+                  metadata:
+                    description: |-
+                      Standard object's metadata.
+                      More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata
+                    properties:
+                      annotations:
+                        additionalProperties:
+                          type: string
+                        description: |-
+                          annotations is an unstructured key value map stored with a resource that may be
+                          set by external tools to store and retrieve arbitrary metadata. They are not
+                          queryable and should be preserved when modifying objects.
+                          More info: http://kubernetes.io/docs/user-guide/annotations
+                        type: object
+                      labels:
+                        additionalProperties:
+                          type: string
+                        description: |-
+                          labels is a map of string keys and values that can be used to organize and categorize
+                          (scope and select) objects. May match selectors of replication controllers
+                          and services.
+                          More info: http://kubernetes.io/docs/user-guide/labels
+                        type: object
+                    type: object
+                  spec:
+                    description: ProxmoxMachineSpec defines the desired state of a
+                      ProxmoxMachine.
+                    properties:
+                      allowedNodes:
+                        description: |-
+                          AllowedNodes specifies all Proxmox nodes which will be considered
+                          for operations. This implies that VMs can be cloned on different nodes from
+                          the node which holds the VM template.
+
+                          This field is optional and should only be set if you want to restrict
+                          the nodes where the VM can be cloned.
+                          If not set, the ProxmoxCluster will be used to determine the nodes.
+                        items:
+                          type: string
+                        type: array
+                      checks:
+                        description: Checks defines possibles checks to skip.
+                        properties:
+                          skipCloudInitStatus:
+                            description: Skip checking CloudInit which can be very
+                              useful for specific Operating Systems like TalOS
+                            type: boolean
+                          skipQemuGuestAgent:
+                            description: Skip checking QEMU Agent readiness which
+                              can be very useful for specific Operating Systems like
+                              TalOS
+                            type: boolean
+                        type: object
+                      description:
+                        description: Description for the new VM.
+                        type: string
+                      disks:
+                        description: |-
+                          Disks contains a set of disk configuration options,
+                          which will be applied before the first startup.
+                        properties:
+                          bootVolume:
+                            description: |-
+                              BootVolume defines the storage size for the boot volume.
+                              This field is optional, and should only be set if you want
+                              to change the size of the boot volume.
+                            properties:
+                              disk:
+                                description: |-
+                                  Disk is the name of the disk device, that should be resized.
+                                  Example values are: ide[0-3], scsi[0-30], sata[0-5].
+                                type: string
+                              sizeGb:
+                                description: |-
+                                  Size defines the size in gigabyte.
+
+                                  As Proxmox does not support shrinking, the size
+                                  must be bigger than the already configured size in the
+                                  template.
+                                format: int32
+                                minimum: 5
+                                type: integer
+                            required:
+                            - disk
+                            - sizeGb
+                            type: object
+                            x-kubernetes-validations:
+                            - message: Value is immutable
+                              rule: self == oldSelf
+                        type: object
+                      format:
+                        description: Format for file storage. Only valid for full
+                          clone.
+                        enum:
+                        - raw
+                        - qcow2
+                        - vmdk
+                        type: string
+                      full:
+                        default: true
+                        description: |-
+                          Full Create a full copy of all disks.
+                          This is always done when you clone a normal VM.
+                          Create a Full clone by default.
+                        type: boolean
+                      memoryMiB:
+                        description: |-
+                          MemoryMiB is the size of a virtual machine's memory, in MiB.
+                          Defaults to the property value in the template from which the virtual machine is cloned.
+                        format: int32
+                        multipleOf: 8
+                        type: integer
+                      metadataSettings:
+                        description: MetadataSettings defines the metadata settings
+                          for this machine's VM.
+                        properties:
+                          providerIDInjection:
+                            description: |-
+                              ProviderIDInjection enables the injection of the `providerID` into the cloudinit metadata.
+                              this will basically set the `provider-id` field in the metadata to `proxmox://<instanceID>`.
+                            type: boolean
+                        type: object
+                      network:
+                        description: Network is the network configuration for this
+                          machine's VM.
+                        properties:
+                          additionalDevices:
+                            description: AdditionalDevices defines additional network
+                              devices bound to the virtual machine.
+                            items:
+                              description: AdditionalNetworkDevice the definition
+                                of a Proxmox network device.
+                              properties:
+                                bridge:
+                                  description: Bridge is the network bridge to attach
+                                    to the machine.
+                                  minLength: 1
+                                  type: string
+                                dnsServers:
+                                  description: |-
+                                    DNSServers contains information about nameservers to be used for this interface.
+                                    If this field is not set, it will use the default dns servers from the ProxmoxCluster.
+                                  items:
+                                    type: string
+                                  minItems: 1
+                                  type: array
+                                ipv4PoolRef:
+                                  description: |-
+                                    IPv4PoolRef is a reference to an IPAM Pool resource, which exposes IPv4 addresses.
+                                    The network device will use an available IP address from the referenced pool.
+                                    This can be combined with `IPv6PoolRef` in order to enable dual stack.
+                                  properties:
+                                    apiGroup:
+                                      description: |-
+                                        APIGroup is the group for the resource being referenced.
+                                        If APIGroup is not specified, the specified Kind must be in the core API group.
+                                        For any other third-party types, APIGroup is required.
+                                      type: string
+                                    kind:
+                                      description: Kind is the type of resource being
+                                        referenced
+                                      type: string
+                                    name:
+                                      description: Name is the name of resource being
+                                        referenced
+                                      type: string
+                                  required:
+                                  - kind
+                                  - name
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                  x-kubernetes-validations:
+                                  - message: ipv4PoolRef allows only IPAM apiGroup
+                                      ipam.cluster.x-k8s.io
+                                    rule: self.apiGroup == 'ipam.cluster.x-k8s.io'
+                                  - message: ipv4PoolRef allows either InClusterIPPool
+                                      or GlobalInClusterIPPool
+                                    rule: self.kind == 'InClusterIPPool' || self.kind
+                                      == 'GlobalInClusterIPPool'
+                                ipv6PoolRef:
+                                  description: |-
+                                    IPv6PoolRef is a reference to an IPAM pool resource, which exposes IPv6 addresses.
+                                    The network device will use an available IP address from the referenced pool.
+                                    this can be combined with `IPv4PoolRef` in order to enable dual stack.
+                                  properties:
+                                    apiGroup:
+                                      description: |-
+                                        APIGroup is the group for the resource being referenced.
+                                        If APIGroup is not specified, the specified Kind must be in the core API group.
+                                        For any other third-party types, APIGroup is required.
+                                      type: string
+                                    kind:
+                                      description: Kind is the type of resource being
+                                        referenced
+                                      type: string
+                                    name:
+                                      description: Name is the name of resource being
+                                        referenced
+                                      type: string
+                                  required:
+                                  - kind
+                                  - name
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                  x-kubernetes-validations:
+                                  - message: ipv6PoolRef allows only IPAM apiGroup
+                                      ipam.cluster.x-k8s.io
+                                    rule: self.apiGroup == 'ipam.cluster.x-k8s.io'
+                                  - message: ipv6PoolRef allows either InClusterIPPool
+                                      or GlobalInClusterIPPool
+                                    rule: self.kind == 'InClusterIPPool' || self.kind
+                                      == 'GlobalInClusterIPPool'
+                                linkMtu:
+                                  description: LinkMTU is the network device Maximum
+                                    Transmission Unit.
+                                  type: integer
+                                  x-kubernetes-validations:
+                                  - message: invalid MTU value
+                                    rule: self == 1 || ( self >= 576 && self <= 65520)
+                                model:
+                                  default: virtio
+                                  description: Model is the network device model.
+                                  enum:
+                                  - e1000
+                                  - virtio
+                                  - rtl8139
+                                  - vmxnet3
+                                  type: string
+                                mtu:
+                                  description: |-
+                                    MTU is the network device Maximum Transmission Unit.
+                                    When set to 1, virtio devices inherit the MTU value from the underlying bridge.
+                                  type: integer
+                                  x-kubernetes-validations:
+                                  - message: invalid MTU value
+                                    rule: self == 1 || ( self >= 576 && self <= 65520)
+                                name:
+                                  description: |-
+                                    Name is the network device name.
+                                    Must be unique within the virtual machine and different from the primary device 'net0'.
+                                  minLength: 1
+                                  type: string
+                                  x-kubernetes-validations:
+                                  - message: additional network devices doesn't allow
+                                      net0
+                                    rule: self != 'net0'
+                                routes:
+                                  description: Routes are the routes associated with
+                                    this interface.
+                                  items:
+                                    description: RouteSpec describes an IPv4/IPv6
+                                      Route.
+                                    properties:
+                                      metric:
+                                        description: Metric is the priority of the
+                                          route in the routing table.
+                                        format: int32
+                                        type: integer
+                                      table:
+                                        description: Table is the routing table used
+                                          for this route.
+                                        format: int32
+                                        type: integer
+                                      to:
+                                        description: To is the subnet to be routed.
+                                        type: string
+                                      via:
+                                        description: Via is the gateway to the subnet.
+                                        type: string
+                                    type: object
+                                  minItems: 1
+                                  type: array
+                                routingPolicy:
+                                  description: RoutingPolicy is an interface-specific
+                                    policy inserted into FIB (forwarding information
+                                    base).
+                                  items:
+                                    description: RoutingPolicySpec is a Linux FIB
+                                      rule.
+                                    properties:
+                                      from:
+                                        description: From is the subnet of the source.
+                                        type: string
+                                      priority:
+                                        description: Priority is the position in the
+                                          ip rule FIB table.
+                                        format: int32
+                                        maximum: 4294967295
+                                        type: integer
+                                        x-kubernetes-validations:
+                                        - message: Cowardly refusing to insert FIB
+                                            rule matching kernel rules
+                                          rule: (self > 0 && self < 32765) || (self
+                                            > 32766)
+                                      table:
+                                        description: |-
+                                          Table is the routing table ID.
+                                          when used in the networks, the value should be the VRF Table.
+                                        format: int32
+                                        type: integer
+                                      to:
+                                        description: To is the subnet of the target.
+                                        type: string
+                                    type: object
+                                  minItems: 1
+                                  type: array
+                                vlan:
+                                  description: VLAN is the network L2 VLAN.
+                                  maximum: 4094
+                                  minimum: 1
+                                  type: integer
+                              required:
+                              - bridge
+                              - name
+                              type: object
+                              x-kubernetes-validations:
+                              - message: at least one pool reference must be set,
+                                  either ipv4PoolRef or ipv6PoolRef
+                                rule: self.ipv4PoolRef != null || self.ipv6PoolRef
+                                  != null
+                            type: array
+                            x-kubernetes-list-map-keys:
+                            - name
+                            x-kubernetes-list-type: map
+                          default:
+                            description: |-
+                              Default is the default network device,
+                              which will be used for the primary network interface.
+                              net0 is always the default network device.
+                            properties:
+                              bridge:
+                                description: Bridge is the network bridge to attach
+                                  to the machine.
+                                minLength: 1
+                                type: string
+                              dnsServers:
+                                description: |-
+                                  DNSServers contains information about nameservers to be used for this interface.
+                                  If this field is not set, it will use the default dns servers from the ProxmoxCluster.
+                                items:
+                                  type: string
+                                minItems: 1
+                                type: array
+                              ipv4PoolRef:
+                                description: |-
+                                  IPv4PoolRef is a reference to an IPAM Pool resource, which exposes IPv4 addresses.
+                                  The network device will use an available IP address from the referenced pool.
+                                  This can be combined with `IPv6PoolRef` in order to enable dual stack.
+                                properties:
+                                  apiGroup:
+                                    description: |-
+                                      APIGroup is the group for the resource being referenced.
+                                      If APIGroup is not specified, the specified Kind must be in the core API group.
+                                      For any other third-party types, APIGroup is required.
+                                    type: string
+                                  kind:
+                                    description: Kind is the type of resource being
+                                      referenced
+                                    type: string
+                                  name:
+                                    description: Name is the name of resource being
+                                      referenced
+                                    type: string
+                                required:
+                                - kind
+                                - name
+                                type: object
+                                x-kubernetes-map-type: atomic
+                                x-kubernetes-validations:
+                                - message: ipv4PoolRef allows only IPAM apiGroup ipam.cluster.x-k8s.io
+                                  rule: self.apiGroup == 'ipam.cluster.x-k8s.io'
+                                - message: ipv4PoolRef allows either InClusterIPPool
+                                    or GlobalInClusterIPPool
+                                  rule: self.kind == 'InClusterIPPool' || self.kind
+                                    == 'GlobalInClusterIPPool'
+                              ipv6PoolRef:
+                                description: |-
+                                  IPv6PoolRef is a reference to an IPAM pool resource, which exposes IPv6 addresses.
+                                  The network device will use an available IP address from the referenced pool.
+                                  this can be combined with `IPv4PoolRef` in order to enable dual stack.
+                                properties:
+                                  apiGroup:
+                                    description: |-
+                                      APIGroup is the group for the resource being referenced.
+                                      If APIGroup is not specified, the specified Kind must be in the core API group.
+                                      For any other third-party types, APIGroup is required.
+                                    type: string
+                                  kind:
+                                    description: Kind is the type of resource being
+                                      referenced
+                                    type: string
+                                  name:
+                                    description: Name is the name of resource being
+                                      referenced
+                                    type: string
+                                required:
+                                - kind
+                                - name
+                                type: object
+                                x-kubernetes-map-type: atomic
+                                x-kubernetes-validations:
+                                - message: ipv6PoolRef allows only IPAM apiGroup ipam.cluster.x-k8s.io
+                                  rule: self.apiGroup == 'ipam.cluster.x-k8s.io'
+                                - message: ipv6PoolRef allows either InClusterIPPool
+                                    or GlobalInClusterIPPool
+                                  rule: self.kind == 'InClusterIPPool' || self.kind
+                                    == 'GlobalInClusterIPPool'
+                              model:
+                                default: virtio
+                                description: Model is the network device model.
+                                enum:
+                                - e1000
+                                - virtio
+                                - rtl8139
+                                - vmxnet3
+                                type: string
+                              mtu:
+                                description: |-
+                                  MTU is the network device Maximum Transmission Unit.
+                                  When set to 1, virtio devices inherit the MTU value from the underlying bridge.
+                                type: integer
+                                x-kubernetes-validations:
+                                - message: invalid MTU value
+                                  rule: self == 1 || ( self >= 576 && self <= 65520)
+                              vlan:
+                                description: VLAN is the network L2 VLAN.
+                                maximum: 4094
+                                minimum: 1
+                                type: integer
+                            required:
+                            - bridge
+                            type: object
+                          vrfs:
+                            description: Definition of a VRF Device.
+                            items:
+                              description: VRFDevice defines Virtual Routing Flow
+                                devices.
+                              properties:
+                                interfaces:
+                                  description: Interfaces is the list of proxmox network
+                                    devices managed by this virtual device.
+                                  items:
+                                    type: string
+                                  type: array
+                                name:
+                                  description: |-
+                                    Name is the virtual network device name.
+                                    Must be unique within the virtual machine.
+                                  minLength: 3
+                                  type: string
+                                routes:
+                                  description: Routes are the routes associated with
+                                    this interface.
+                                  items:
+                                    description: RouteSpec describes an IPv4/IPv6
+                                      Route.
+                                    properties:
+                                      metric:
+                                        description: Metric is the priority of the
+                                          route in the routing table.
+                                        format: int32
+                                        type: integer
+                                      table:
+                                        description: Table is the routing table used
+                                          for this route.
+                                        format: int32
+                                        type: integer
+                                      to:
+                                        description: To is the subnet to be routed.
+                                        type: string
+                                      via:
+                                        description: Via is the gateway to the subnet.
+                                        type: string
+                                    type: object
+                                  minItems: 1
+                                  type: array
+                                routingPolicy:
+                                  description: RoutingPolicy is an interface-specific
+                                    policy inserted into FIB (forwarding information
+                                    base).
+                                  items:
+                                    description: RoutingPolicySpec is a Linux FIB
+                                      rule.
+                                    properties:
+                                      from:
+                                        description: From is the subnet of the source.
+                                        type: string
+                                      priority:
+                                        description: Priority is the position in the
+                                          ip rule FIB table.
+                                        format: int32
+                                        maximum: 4294967295
+                                        type: integer
+                                        x-kubernetes-validations:
+                                        - message: Cowardly refusing to insert FIB
+                                            rule matching kernel rules
+                                          rule: (self > 0 && self < 32765) || (self
+                                            > 32766)
+                                      table:
+                                        description: |-
+                                          Table is the routing table ID.
+                                          when used in the networks, the value should be the VRF Table.
+                                        format: int32
+                                        type: integer
+                                      to:
+                                        description: To is the subnet of the target.
+                                        type: string
+                                    type: object
+                                  minItems: 1
+                                  type: array
+                                table:
+                                  description: Table is the ID of the routing table
+                                    used for the l3mdev vrf device.
+                                  format: int32
+                                  maximum: 4294967295
+                                  type: integer
+                                  x-kubernetes-validations:
+                                  - message: Cowardly refusing to insert l3mdev rules
+                                      into kernel tables
+                                    rule: (self > 0 && self < 254) || (self > 255)
+                              required:
+                              - name
+                              - table
+                              type: object
+                            type: array
+                            x-kubernetes-list-map-keys:
+                            - name
+                            x-kubernetes-list-type: map
+                        type: object
+                      numCores:
+                        description: |-
+                          NumCores is the number of cores per CPU socket in a virtual machine.
+                          Defaults to the property value in the template from which the virtual machine is cloned.
+                        format: int32
+                        minimum: 1
+                        type: integer
+                      numSockets:
+                        description: |-
+                          NumSockets is the number of CPU sockets in a virtual machine.
+                          Defaults to the property value in the template from which the virtual machine is cloned.
+                        format: int32
+                        minimum: 1
+                        type: integer
+                      pool:
+                        description: Pool Add the new VM to the specified pool.
+                        type: string
+                      providerID:
+                        description: |-
+                          ProviderID is the virtual machine BIOS UUID formatted as
+                          proxmox://6c3fa683-bef9-4425-b413-eaa45a9d6191
+                        type: string
+                      snapName:
+                        description: SnapName The name of the snapshot.
+                        type: string
+                      sourceNode:
+                        description: |-
+                          SourceNode is the initially selected proxmox node.
+                          This node will be used to locate the template VM, which will
+                          be used for cloning operations.
+
+                          Cloning will be performed according to the configuration.
+                          Setting the `Target` field will tell Proxmox to clone the
+                          VM on that target node.
+
+                          When Target is not set and the ProxmoxCluster contains
+                          a set of `AllowedNodes`, the algorithm will instead evenly
+                          distribute the VMs across the nodes from that list.
+
+                          If neither a `Target` nor `AllowedNodes` was set, the VM
+                          will be cloned onto the same node as SourceNode.
+                        minLength: 1
+                        type: string
+                      storage:
+                        description: Storage for full clone.
+                        type: string
+                      tags:
+                        description: Tags is a list of tags to be applied to the virtual
+                          machine.
+                        items:
+                          pattern: ^(?i)[a-z0-9_][a-z0-9_\-\+\.]*$
+                          type: string
+                        minItems: 1
+                        type: array
+                        x-kubernetes-list-type: set
+                      target:
+                        description: Target node. Only allowed if the original VM
+                          is on shared storage.
+                        type: string
+                      templateID:
+                        description: TemplateID the vm_template vmid used for cloning
+                          a new VM.
+                        format: int32
+                        type: integer
+                      templateSelector:
+                        description: TemplateSelector defines MatchTags for looking
+                          up VM templates.
+                        properties:
+                          matchTags:
+                            description: |-
+                              Specifies all tags to look for, when looking up the VM template.
+                              Passed tags must be an exact 1:1 match with the tags on the template you want to use.
+                              If multiple VM templates with the same set of tags are found, provisioning will fail.
+                            items:
+                              pattern: ^(?i)[a-z0-9_][a-z0-9_\-\+\.]*$
+                              type: string
+                            minItems: 1
+                            type: array
+                            x-kubernetes-list-type: set
+                        required:
+                        - matchTags
+                        type: object
+                      virtualMachineID:
+                        description: VirtualMachineID is the Proxmox identifier for
+                          the ProxmoxMachine VM.
+                        format: int64
+                        type: integer
+                      vmIDRange:
+                        description: VMIDRange is the range of VMIDs to use for VMs.
+                        properties:
+                          end:
+                            description: |-
+                              VMIDRangeEnd is the end of the VMID range to use for VMs.
+                              Only used if VMIDRangeStart is set.
+                            format: int64
+                            maximum: 999999999
+                            minimum: 100
+                            type: integer
+                          start:
+                            description: VMIDRangeStart is the start of the VMID range
+                              to use for VMs.
+                            format: int64
+                            maximum: 999999999
+                            minimum: 100
+                            type: integer
+                        required:
+                        - end
+                        - start
+                        type: object
+                        x-kubernetes-validations:
+                        - message: end should be greater than or equal to start
+                          rule: self.end >= self.start
+                    type: object
+                    x-kubernetes-validations:
+                    - message: Must set full=true when specifying format
+                      rule: self.full || !has(self.format)
+                    - message: Must set full=true when specifying storage
+                      rule: self.full || !has(self.storage)
+                required:
+                - spec
+                type: object
+            required:
+            - template
+            type: object
+        type: object
+    served: true
+    storage: true
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  labels:
+    app.kubernetes.io/component: rbac
+    app.kubernetes.io/created-by: cluster-api-provider-proxmox
+    app.kubernetes.io/instance: controller-manager-sa
+    app.kubernetes.io/managed-by: kustomize
+    app.kubernetes.io/name: serviceaccount
+    app.kubernetes.io/part-of: cluster-api-provider-proxmox
+    cluster.x-k8s.io/provider: infrastructure-proxmox
+  name: capmox-controller-manager
+  namespace: capmox-system
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  labels:
+    app.kubernetes.io/component: rbac
+    app.kubernetes.io/created-by: cluster-api-provider-proxmox
+    app.kubernetes.io/instance: leader-election-role
+    app.kubernetes.io/managed-by: kustomize
+    app.kubernetes.io/name: role
+    app.kubernetes.io/part-of: cluster-api-provider-proxmox
+    cluster.x-k8s.io/provider: infrastructure-proxmox
+  name: capmox-leader-election-role
+  namespace: capmox-system
+rules:
+- apiGroups:
+  - ""
+  resources:
+  - configmaps
+  verbs:
+  - get
+  - list
+  - watch
+  - create
+  - update
+  - patch
+  - delete
+- apiGroups:
+  - coordination.k8s.io
+  resources:
+  - leases
+  verbs:
+  - get
+  - list
+  - watch
+  - create
+  - update
+  - patch
+  - delete
+- apiGroups:
+  - ""
+  resources:
+  - events
+  verbs:
+  - create
+  - patch
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  labels:
+    cluster.x-k8s.io/provider: infrastructure-proxmox
+  name: capmox-manager-role
+rules:
+- apiGroups:
+  - ""
+  resources:
+  - events
+  verbs:
+  - create
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - ""
+  resources:
+  - secrets
+  verbs:
+  - get
+  - list
+  - patch
+  - watch
+- apiGroups:
+  - cluster.x-k8s.io
+  resources:
+  - clusters
+  - clusters/status
+  - machines
+  - machines/status
+  verbs:
+  - get
+  - list
+  - patch
+  - watch
+- apiGroups:
+  - infrastructure.cluster.x-k8s.io
+  resources:
+  - proxmoxclusters
+  - proxmoxmachines
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - infrastructure.cluster.x-k8s.io
+  resources:
+  - proxmoxclusters/finalizers
+  - proxmoxmachines/finalizers
+  verbs:
+  - update
+- apiGroups:
+  - infrastructure.cluster.x-k8s.io
+  resources:
+  - proxmoxclusters/status
+  - proxmoxmachines/status
+  verbs:
+  - get
+  - patch
+  - update
+- apiGroups:
+  - ipam.cluster.x-k8s.io
+  resources:
+  - globalinclusterippools
+  - inclusterippools
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - ipam.cluster.x-k8s.io
+  resources:
+  - ipaddressclaims
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - update
+  - watch
+- apiGroups:
+  - ipam.cluster.x-k8s.io
+  resources:
+  - ipaddresses
+  verbs:
+  - get
+  - list
+  - watch
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  labels:
+    app.kubernetes.io/component: kube-rbac-proxy
+    app.kubernetes.io/created-by: cluster-api-provider-proxmox
+    app.kubernetes.io/instance: metrics-reader
+    app.kubernetes.io/managed-by: kustomize
+    app.kubernetes.io/name: clusterrole
+    app.kubernetes.io/part-of: cluster-api-provider-proxmox
+    cluster.x-k8s.io/provider: infrastructure-proxmox
+  name: capmox-metrics-reader
+rules:
+- nonResourceURLs:
+  - /metrics
+  verbs:
+  - get
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  labels:
+    app.kubernetes.io/component: kube-rbac-proxy
+    app.kubernetes.io/created-by: cluster-api-provider-proxmox
+    app.kubernetes.io/instance: proxy-role
+    app.kubernetes.io/managed-by: kustomize
+    app.kubernetes.io/name: clusterrole
+    app.kubernetes.io/part-of: cluster-api-provider-proxmox
+    cluster.x-k8s.io/provider: infrastructure-proxmox
+  name: capmox-proxy-role
+rules:
+- apiGroups:
+  - authentication.k8s.io
+  resources:
+  - tokenreviews
+  verbs:
+  - create
+- apiGroups:
+  - authorization.k8s.io
+  resources:
+  - subjectaccessreviews
+  verbs:
+  - create
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  labels:
+    app.kubernetes.io/component: rbac
+    app.kubernetes.io/created-by: cluster-api-provider-proxmox
+    app.kubernetes.io/instance: leader-election-rolebinding
+    app.kubernetes.io/managed-by: kustomize
+    app.kubernetes.io/name: rolebinding
+    app.kubernetes.io/part-of: cluster-api-provider-proxmox
+    cluster.x-k8s.io/provider: infrastructure-proxmox
+  name: capmox-leader-election-rolebinding
+  namespace: capmox-system
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: capmox-leader-election-role
+subjects:
+- kind: ServiceAccount
+  name: capmox-controller-manager
+  namespace: capmox-system
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  labels:
+    app.kubernetes.io/component: rbac
+    app.kubernetes.io/created-by: cluster-api-provider-proxmox
+    app.kubernetes.io/instance: manager-rolebinding
+    app.kubernetes.io/managed-by: kustomize
+    app.kubernetes.io/name: clusterrolebinding
+    app.kubernetes.io/part-of: cluster-api-provider-proxmox
+    cluster.x-k8s.io/provider: infrastructure-proxmox
+  name: capmox-manager-rolebinding
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: capmox-manager-role
+subjects:
+- kind: ServiceAccount
+  name: capmox-controller-manager
+  namespace: capmox-system
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  labels:
+    app.kubernetes.io/component: kube-rbac-proxy
+    app.kubernetes.io/created-by: cluster-api-provider-proxmox
+    app.kubernetes.io/instance: proxy-rolebinding
+    app.kubernetes.io/managed-by: kustomize
+    app.kubernetes.io/name: clusterrolebinding
+    app.kubernetes.io/part-of: cluster-api-provider-proxmox
+    cluster.x-k8s.io/provider: infrastructure-proxmox
+  name: capmox-proxy-rolebinding
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: capmox-proxy-role
+subjects:
+- kind: ServiceAccount
+  name: capmox-controller-manager
+  namespace: capmox-system
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  labels:
+    cluster.x-k8s.io/provider: infrastructure-proxmox
+    platform.ionos.com/secret-type: proxmox-credentials
+  name: capmox-manager-credentials
+  namespace: capmox-system
+stringData:
+  secret: ${PROXMOX_SECRET=""}
+  token: ${PROXMOX_TOKEN=""}
+  url: ${PROXMOX_URL=""}
+---
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    app.kubernetes.io/component: kube-rbac-proxy
+    app.kubernetes.io/created-by: cluster-api-provider-proxmox
+    app.kubernetes.io/instance: controller-manager-metrics-service
+    app.kubernetes.io/managed-by: kustomize
+    app.kubernetes.io/name: service
+    app.kubernetes.io/part-of: cluster-api-provider-proxmox
+    cluster.x-k8s.io/provider: infrastructure-proxmox
+    control-plane: controller-manager
+  name: capmox-controller-manager-metrics-service
+  namespace: capmox-system
+spec:
+  ports:
+  - name: https
+    port: 8443
+    protocol: TCP
+    targetPort: https
+  selector:
+    cluster.x-k8s.io/provider: infrastructure-proxmox
+    control-plane: controller-manager
+---
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    app.kubernetes.io/component: webhook
+    app.kubernetes.io/created-by: cluster-api-provider-proxmox
+    app.kubernetes.io/instance: webhook-service
+    app.kubernetes.io/managed-by: kustomize
+    app.kubernetes.io/name: service
+    app.kubernetes.io/part-of: cluster-api-provider-proxmox
+    cluster.x-k8s.io/provider: infrastructure-proxmox
+  name: capmox-webhook-service
+  namespace: capmox-system
+spec:
+  ports:
+  - port: 443
+    protocol: TCP
+    targetPort: 9443
+  selector:
+    cluster.x-k8s.io/provider: infrastructure-proxmox
+    control-plane: controller-manager
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  labels:
+    app.kubernetes.io/component: manager
+    app.kubernetes.io/created-by: cluster-api-provider-proxmox
+    app.kubernetes.io/instance: controller-manager
+    app.kubernetes.io/managed-by: kustomize
+    app.kubernetes.io/name: deployment
+    app.kubernetes.io/part-of: cluster-api-provider-proxmox
+    cluster.x-k8s.io/provider: infrastructure-proxmox
+    control-plane: controller-manager
+  name: capmox-controller-manager
+  namespace: capmox-system
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      cluster.x-k8s.io/provider: infrastructure-proxmox
+      control-plane: controller-manager
+  template:
+    metadata:
+      annotations:
+        kubectl.kubernetes.io/default-container: manager
+      labels:
+        cluster.x-k8s.io/provider: infrastructure-proxmox
+        control-plane: controller-manager
+    spec:
+      containers:
+      - args:
+        - --leader-elect
+        - --feature-gates=ClusterTopology=${ClusterTopology:=false}
+        - --diagnostics-address=${CAPI_DIAGNOSTICS_ADDRESS:=:8443}
+        - --insecure-diagnostics=${CAPI_INSECURE_DIAGNOSTICS:=false}
+        - --v=${CAPMOX_LOGLEVEL:=0}
+        env:
+        - name: PROXMOX_URL
+          valueFrom:
+            secretKeyRef:
+              key: url
+              name: capmox-manager-credentials
+        - name: PROXMOX_TOKEN
+          valueFrom:
+            secretKeyRef:
+              key: token
+              name: capmox-manager-credentials
+        - name: PROXMOX_SECRET
+          valueFrom:
+            secretKeyRef:
+              key: secret
+              name: capmox-manager-credentials
+        image: ghcr.io/ionos-cloud/cluster-api-provider-proxmox:v0.7.7
+        livenessProbe:
+          httpGet:
+            path: /healthz
+            port: 8081
+          initialDelaySeconds: 15
+          periodSeconds: 20
+        name: manager
+        ports:
+        - containerPort: 9443
+          name: webhook-server
+          protocol: TCP
+        readinessProbe:
+          httpGet:
+            path: /readyz
+            port: 8081
+          initialDelaySeconds: 5
+          periodSeconds: 10
+        resources:
+          limits:
+            cpu: 500m
+            memory: 128Mi
+          requests:
+            cpu: 10m
+            memory: 64Mi
+        securityContext:
+          allowPrivilegeEscalation: false
+          capabilities:
+            drop:
+            - ALL
+        volumeMounts:
+        - mountPath: /tmp/k8s-webhook-server/serving-certs
+          name: cert
+          readOnly: true
+      securityContext:
+        runAsNonRoot: true
+        seccompProfile:
+          type: RuntimeDefault
+      serviceAccountName: capmox-controller-manager
+      terminationGracePeriodSeconds: 10
+      volumes:
+      - name: cert
+        secret:
+          defaultMode: 420
+          secretName: webhook-server-cert
+---
+apiVersion: cert-manager.io/v1
+kind: Certificate
+metadata:
+  labels:
+    app.kubernetes.io/component: certificate
+    app.kubernetes.io/created-by: cluster-api-provider-proxmox
+    app.kubernetes.io/instance: serving-cert
+    app.kubernetes.io/managed-by: kustomize
+    app.kubernetes.io/name: certificate
+    app.kubernetes.io/part-of: cluster-api-provider-proxmox
+    cluster.x-k8s.io/provider: infrastructure-proxmox
+  name: capmox-serving-cert
+  namespace: capmox-system
+spec:
+  dnsNames:
+  - capmox-webhook-service.capmox-system.svc
+  - capmox-webhook-service.capmox-system.svc.cluster.local
+  issuerRef:
+    kind: Issuer
+    name: capmox-selfsigned-issuer
+  secretName: webhook-server-cert
+---
+apiVersion: cert-manager.io/v1
+kind: Issuer
+metadata:
+  labels:
+    app.kubernetes.io/component: certificate
+    app.kubernetes.io/created-by: cluster-api-provider-proxmox
+    app.kubernetes.io/instance: serving-cert
+    app.kubernetes.io/managed-by: kustomize
+    app.kubernetes.io/name: certificate
+    app.kubernetes.io/part-of: cluster-api-provider-proxmox
+    cluster.x-k8s.io/provider: infrastructure-proxmox
+  name: capmox-selfsigned-issuer
+  namespace: capmox-system
+spec:
+  selfSigned: {}
+---
+apiVersion: admissionregistration.k8s.io/v1
+kind: ValidatingWebhookConfiguration
+metadata:
+  annotations:
+    cert-manager.io/inject-ca-from: capmox-system/capmox-serving-cert
+  labels:
+    app.kubernetes.io/component: webhook
+    app.kubernetes.io/created-by: cluster-api-provider-proxmox
+    app.kubernetes.io/instance: validating-webhook-configuration
+    app.kubernetes.io/managed-by: kustomize
+    app.kubernetes.io/name: validatingwebhookconfiguration
+    app.kubernetes.io/part-of: cluster-api-provider-proxmox
+    cluster.x-k8s.io/provider: infrastructure-proxmox
+  name: capmox-validating-webhook-configuration
+webhooks:
+- admissionReviewVersions:
+  - v1
+  clientConfig:
+    service:
+      name: capmox-webhook-service
+      namespace: capmox-system
+      path: /validate-infrastructure-cluster-x-k8s-io-v1alpha1-proxmoxcluster
+  failurePolicy: Fail
+  matchPolicy: Equivalent
+  name: validation.proxmoxcluster.infrastructure.cluster.x-k8s.io
+  rules:
+  - apiGroups:
+    - infrastructure.cluster.x-k8s.io
+    apiVersions:
+    - v1alpha1
+    operations:
+    - CREATE
+    - UPDATE
+    resources:
+    - proxmoxclusters
+  sideEffects: None
+- admissionReviewVersions:
+  - v1
+  clientConfig:
+    service:
+      name: capmox-webhook-service
+      namespace: capmox-system
+      path: /validate-infrastructure-cluster-x-k8s-io-v1alpha1-proxmoxmachine
+  failurePolicy: Fail
+  matchPolicy: Equivalent
+  name: validation.proxmoxmachine.infrastructure.cluster.x-k8s.io
+  rules:
+  - apiGroups:
+    - infrastructure.cluster.x-k8s.io
+    apiVersions:
+    - v1alpha1
+    operations:
+    - CREATE
+    - UPDATE
+    resources:
+    - proxmoxmachines
+  sideEffects: None
diff --git a/packages/system/capi-providers-infraprovider-proxmox/files/metadata.yaml b/packages/system/capi-providers-infraprovider-proxmox/files/metadata.yaml
new file mode 100644
index 0000000000..2066af2568
--- /dev/null
+++ b/packages/system/capi-providers-infraprovider-proxmox/files/metadata.yaml
@@ -0,0 +1,25 @@
+---
+apiVersion: clusterctl.cluster.x-k8s.io/v1alpha3
+kind: Metadata
+releaseSeries:
+- major: 0
+  minor: 1
+  contract: v1beta1
+- major: 0
+  minor: 2
+  contract: v1beta1
+- major: 0
+  minor: 3
+  contract: v1beta1
+- major: 0
+  minor: 4
+  contract: v1beta1
+- major: 0
+  minor: 5
+  contract: v1beta1
+- major: 0
+  minor: 6
+  contract: v1beta1
+- major: 0
+  minor: 7
+  contract: v1beta1
diff --git a/packages/system/capi-providers-infraprovider-proxmox/templates/configmaps.yaml b/packages/system/capi-providers-infraprovider-proxmox/templates/configmaps.yaml
new file mode 100644
index 0000000000..460e844122
--- /dev/null
+++ b/packages/system/capi-providers-infraprovider-proxmox/templates/configmaps.yaml
@@ -0,0 +1,24 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: v0.7.7-infraprovider-proxmox
+  {{- /*
+    NOT 'infraprovider-components: cozy'. That label already identifies the
+    KubeVirt provider's ConfigMap, and a shared label would put both in the
+    same match. The operator would still install the right one — it keys every
+    matched ConfigMap by its name as the version and takes the one equal to
+    spec.version — but it builds that repository in a single pass and returns
+    an error for the whole list as soon as one match is malformed: a name that
+    does not parse as semver, or missing metadata. Sharing the label would let
+    a broken ConfigMap of one provider stop the other from being installed.
+    The kubeadm/talos bootstrap packages separate on a 'bootstrap-provider'
+    key for the same reason; this mirrors that.
+  */}}
+  labels:
+    infraprovider-provider: proxmox
+  annotations:
+    provider.cluster.x-k8s.io/compressed: "true"
+binaryData:
+  components: {{ .Files.Get "files/components.gz" | b64enc | quote }}
+data:
+  metadata: {{ .Files.Get "files/metadata.yaml" | quote }}
diff --git a/packages/system/capi-providers-infraprovider-proxmox/templates/providers.yaml b/packages/system/capi-providers-infraprovider-proxmox/templates/providers.yaml
new file mode 100644
index 0000000000..e04a04def5
--- /dev/null
+++ b/packages/system/capi-providers-infraprovider-proxmox/templates/providers.yaml
@@ -0,0 +1,28 @@
+apiVersion: operator.cluster.x-k8s.io/v1alpha2
+kind: InfrastructureProvider
+metadata:
+  name: proxmox
+spec:
+  # https://github.com/ionos-cloud/cluster-api-provider-proxmox
+  #
+  # Pinned to the v0.7 series: from v0.8 capmox declares the v1beta2 Cluster API
+  # contract, while the core provider shipped here is v1.10.1, which serves
+  # v1beta1. Bump this together with capi-providers-core, not on its own.
+  version: v0.7.7-infraprovider-proxmox
+  configSecret:
+    name: {{ .Values.credentialsSecretName | quote }}
+    namespace: {{ .Release.Namespace }}
+  fetchConfig:
+    selector:
+      matchLabels:
+        infraprovider-provider: proxmox
+  deployment:
+    containers:
+    - name: manager
+      resources:
+        limits:
+          cpu: 500m
+          memory: 256Mi
+        requests:
+          cpu: 10m
+          memory: 64Mi
diff --git a/packages/system/capi-providers-infraprovider-proxmox/values.yaml b/packages/system/capi-providers-infraprovider-proxmox/values.yaml
new file mode 100644
index 0000000000..9a37450758
--- /dev/null
+++ b/packages/system/capi-providers-infraprovider-proxmox/values.yaml
@@ -0,0 +1,26 @@
+## @section Proxmox API credentials
+##
+## capmox authenticates to Proxmox VE with an API token. The operator reads the
+## values below out of a Secret and injects them into the provider Deployment as
+## PROXMOX_URL / PROXMOX_TOKEN / PROXMOX_SECRET.
+##
+## The Secret is a precondition, not an optional extra: capi-operator fetches it
+## before it installs the provider, so while it is missing nothing is deployed
+## at all — no Deployment, no CRDs — and the InfrastructureProvider reports the
+## fetch error.
+##
+## Three things are easy to get wrong:
+##
+##   PROXMOX_URL    is the bare https://<host>:8006. capmox appends /api2/json
+##                  itself; a URL that already carries it sends every call to
+##                  /api2/json/api2/json/... and gets 501 back.
+##   PROXMOX_TOKEN  is the full token id, user@realm!tokenid — not the id alone.
+##   PROXMOX_SECRET is the UUID shown once when the token is created.
+##
+## Rotation is not picked up on its own. This chart runs capi-operator without
+## --watch-configsecret, and capmox reads PROXMOX_* from the environment at pod
+## start, so a rotated token takes effect only after the next provider reconcile
+## and a restart of the manager pod.
+##
+## @param {string} credentialsSecretName - Name of the Secret holding PROXMOX_URL, PROXMOX_TOKEN and PROXMOX_SECRET. It must live in this release's namespace and is NOT created by this chart: the token is a hypervisor credential and belongs to the platform's own secret management.
+credentialsSecretName: "capmox-config"
diff --git a/packages/system/capi-providers-infraprovider/Makefile b/packages/system/capi-providers-infraprovider/Makefile
index 042a4f0e0d..3c74597897 100644
--- a/packages/system/capi-providers-infraprovider/Makefile
+++ b/packages/system/capi-providers-infraprovider/Makefile
@@ -1,4 +1,20 @@
 export NAME=capi-providers-infraprovider
 export NAMESPACE=cozy-cluster-api
 
+include ../../../hack/common-envs.mk
 include ../../../hack/package.mk
+
+.PHONY: image
+
+UPSTREAM_VERSION = $(shell awk -F= '/^ARG VERSION=/{print $$2}' images/cluster-api-provider-kubevirt/Dockerfile)
+COZYSTACK_REV = 0
+
+image:
+	docker buildx build images/cluster-api-provider-kubevirt \
+		$(call image-tags,cluster-api-provider-kubevirt,$(UPSTREAM_VERSION)-cozystack.$(COZYSTACK_REV)) \
+		$(call cache-args,cluster-api-provider-kubevirt) \
+		--metadata-file images/cluster-api-provider-kubevirt.json \
+		$(BUILDX_ARGS)
+	digest=$$(yq -e '."containerimage.digest" | select(test("^sha256:[0-9a-f]{64}$$"))' images/cluster-api-provider-kubevirt.json -o json -r) && \
+		printf '%s\n' "$(REGISTRY)/cluster-api-provider-kubevirt:$(IMAGE_TAG)@$$digest" > images/cluster-api-provider-kubevirt.tag
+	rm -f images/cluster-api-provider-kubevirt.json
diff --git a/packages/system/capi-providers-infraprovider/files/components.gz b/packages/system/capi-providers-infraprovider/files/components.gz
index 3f6ae3c730..1ce41b0bff 100644
Binary files a/packages/system/capi-providers-infraprovider/files/components.gz and b/packages/system/capi-providers-infraprovider/files/components.gz differ
diff --git a/packages/system/capi-providers-infraprovider/files/infrastructure-components.yaml b/packages/system/capi-providers-infraprovider/files/infrastructure-components.yaml
index 2ae631ad7e..a65c5f90d9 100644
--- a/packages/system/capi-providers-infraprovider/files/infrastructure-components.yaml
+++ b/packages/system/capi-providers-infraprovider/files/infrastructure-components.yaml
@@ -9695,6 +9695,12 @@ rules:
   - get
   - patch
   - update
+- apiGroups:
+  - kubevirt.io
+  resources:
+  - virtualmachineinstancemigrations
+  verbs:
+  - create
 - apiGroups:
   - kubevirt.io
   resources:
diff --git a/packages/system/capi-providers-infraprovider/images/cluster-api-provider-kubevirt.tag b/packages/system/capi-providers-infraprovider/images/cluster-api-provider-kubevirt.tag
new file mode 100644
index 0000000000..924275aa06
--- /dev/null
+++ b/packages/system/capi-providers-infraprovider/images/cluster-api-provider-kubevirt.tag
@@ -0,0 +1 @@
+quay.io/capk/capk-manager:v0.1.10@sha256:87c2a80413a0f64f65326d379f4905d3f3f2eaf9dab8a6a67a7f7973ca85aef6
diff --git a/packages/system/capi-providers-infraprovider/images/cluster-api-provider-kubevirt/Dockerfile b/packages/system/capi-providers-infraprovider/images/cluster-api-provider-kubevirt/Dockerfile
new file mode 100644
index 0000000000..404e3020fd
--- /dev/null
+++ b/packages/system/capi-providers-infraprovider/images/cluster-api-provider-kubevirt/Dockerfile
@@ -0,0 +1,30 @@
+FROM --platform=$BUILDPLATFORM golang:1.27.1@sha256:3680233e3204827fbdc66088528ae6d4b3d034f51d03a99d454f6de034888244 AS builder
+ARG GOPROXY
+
+ARG VERSION=v0.1.10
+ARG COMMIT=6dbc11c4d0cbfbdcd618566538c10b0d4a07516b
+ARG TARGETOS
+ARG TARGETARCH
+
+WORKDIR /workspace
+
+RUN curl -fsSL "https://github.com/kubernetes-sigs/cluster-api-provider-kubevirt/archive/${COMMIT}.tar.gz" -o /tmp/source.tar.gz \
+    && tar -xzf /tmp/source.tar.gz --strip-components=1 \
+    && rm /tmp/source.tar.gz
+
+COPY patches /patches
+RUN git apply --check /patches/*.diff && git apply /patches/*.diff
+
+RUN --mount=type=cache,target=/go/pkg/mod \
+    --mount=type=cache,target=/root/.cache/go-build \
+    go test ./controllers ./pkg/...
+
+RUN --mount=type=cache,target=/go/pkg/mod \
+    --mount=type=cache,target=/root/.cache/go-build \
+    CGO_ENABLED=0 GOOS=${TARGETOS:-linux} GOARCH=${TARGETARCH} \
+    go build -trimpath -o /manager .
+
+FROM quay.io/capk/capk-manager:v0.1.10@sha256:87c2a80413a0f64f65326d379f4905d3f3f2eaf9dab8a6a67a7f7973ca85aef6
+COPY --from=builder --chmod=0755 /manager /manager
+USER 65532
+ENTRYPOINT ["/manager"]
diff --git a/packages/system/capi-providers-infraprovider/images/cluster-api-provider-kubevirt/UPSTREAM.md b/packages/system/capi-providers-infraprovider/images/cluster-api-provider-kubevirt/UPSTREAM.md
new file mode 100644
index 0000000000..c7594fdc93
--- /dev/null
+++ b/packages/system/capi-providers-infraprovider/images/cluster-api-provider-kubevirt/UPSTREAM.md
@@ -0,0 +1,5 @@
+The build stays on CAPK v0.1.10, commit `6dbc11c4d0cbfbdcd618566538c10b0d4a07516b`, and preserves its runtime image and API dependencies. The patch backports [guest node lookup #374](https://github.com/kubernetes-sigs/cluster-api-provider-kubevirt/pull/374), [uncordon after restart #389](https://github.com/kubernetes-sigs/cluster-api-provider-kubevirt/pull/389), and [migration before drain/delete #392](https://github.com/kubernetes-sigs/cluster-api-provider-kubevirt/pull/392). It bounds submission waiting to ten minutes, separately from the active migration and drain fallback windows, preserves each deadline across reconciles, and omits migration priority. CAPK v0.1.10 pins `kubevirt.io/api` v1.5.0, whose `VirtualMachineInstanceMigrationSpec` carries only `vmiName`; #392 sets `priority` against v1.9.0, where the field exists. The typed migration from #392 does not compile against the pinned API, which is why the patch builds the migration as an unstructured object and leaves priority to KubeVirt.
+
+`make image` runs the backported regression tests, builds the manager, and writes the resulting tag and digest to `images/cluster-api-provider-kubevirt.tag`. The InfrastructureProvider reads that file through `spec.deployment.containers[].imageUrl`, supported by CAPI operator v0.19.0. The compressed provider manifest contains the additional VMIM create permission. Keeping the image reference out of the gzip lets the existing image collection, promotion, and nightly mirror code see and rewrite it.
+
+The checked-in tag still points at the original upstream image, so applying the chart directly from this source tree does not install the backport. The regular main and release builds call this package's `image` target before packaging, and the release workflow commits the resulting digest pin with its other generated artifacts. A release containing the fix must therefore come from that trusted build path. Fork CI derives its repository allowlist from the base branch, so this new image repository requires a maintainer-owned build for pre-merge E2E validation; changing a fork's allowlist does not authorize publication.
diff --git a/packages/system/capi-providers-infraprovider/images/cluster-api-provider-kubevirt/patches/0001-backport-eviction-live-migration.diff b/packages/system/capi-providers-infraprovider/images/cluster-api-provider-kubevirt/patches/0001-backport-eviction-live-migration.diff
new file mode 100644
index 0000000000..16ead74e9f
--- /dev/null
+++ b/packages/system/capi-providers-infraprovider/images/cluster-api-provider-kubevirt/patches/0001-backport-eviction-live-migration.diff
@@ -0,0 +1,1151 @@
+diff --git a/api/v1alpha1/kubevirtcluster_types.go b/api/v1alpha1/kubevirtcluster_types.go
+index c13a714..f9aff9c 100644
+--- a/api/v1alpha1/kubevirtcluster_types.go
++++ b/api/v1alpha1/kubevirtcluster_types.go
+@@ -38,6 +38,18 @@ const ( //labels
+ const ( // annotations
+ 	VmiDeletionGraceTime       = "capk.cluster.x-k8s.io/vmi-deletion-grace-time"
+ 	VmiDeletionGraceTimeEscape = "capk.cluster.x-k8s.io~1vmi-deletion-grace-time"
++
++	// NodeCordonedByCapk is set on KubevirtMachine when CAPK cordons the
++	// guest node during an eviction drain. It is used to uncordon the node
++	// after the VMI is recreated on a different host.
++	NodeCordonedByCapk       = "capk.cluster.x-k8s.io/node-cordoned"
++	NodeCordonedByCapkEscape = "capk.cluster.x-k8s.io~1node-cordoned"
++
++	// VmiMigrationSubmitted stores an RFC3339 deadline for a submitted
++	// VirtualMachineInstanceMigration to start, separate from the active
++	// migration grace period. The value "draining" marks the drain+delete
++	// fallback, whose deadline must survive subsequent reconciles.
++	VmiMigrationSubmitted = "capk.cluster.x-k8s.io/migration-submitted"
+ )
+ 
+ // KubevirtClusterSpec defines the desired state of KubevirtCluster.
+diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
+index 19f9dc6..80cf730 100644
+--- a/config/rbac/role.yaml
++++ b/config/rbac/role.yaml
+@@ -71,6 +71,12 @@ rules:
+   - get
+   - patch
+   - update
++- apiGroups:
++  - kubevirt.io
++  resources:
++  - virtualmachineinstancemigrations
++  verbs:
++  - create
+ - apiGroups:
+   - kubevirt.io
+   resources:
+diff --git a/controllers/kubevirtmachine_controller.go b/controllers/kubevirtmachine_controller.go
+index 9832a96..9bf7a4a 100644
+--- a/controllers/kubevirtmachine_controller.go
++++ b/controllers/kubevirtmachine_controller.go
+@@ -66,6 +66,7 @@ type KubevirtMachineReconciler struct {
+ // +kubebuilder:rbac:groups="",resources=secrets;,verbs=get;list;watch;create;update;patch;delete
+ // +kubebuilder:rbac:groups=kubevirt.io,resources=virtualmachines;,verbs=get;create;update;patch;delete
+ // +kubebuilder:rbac:groups=kubevirt.io,resources=virtualmachineinstances;,verbs=get;delete
++// +kubebuilder:rbac:groups=kubevirt.io,resources=virtualmachineinstancemigrations;,verbs=create
+ // +kubebuilder:rbac:groups=cdi.kubevirt.io,resources=datavolumes;,verbs=get;list;watch
+ 
+ // Reconcile handles KubevirtMachine events.
+diff --git a/pkg/kubevirt/machine.go b/pkg/kubevirt/machine.go
+index 38a839d..74a591c 100644
+--- a/pkg/kubevirt/machine.go
++++ b/pkg/kubevirt/machine.go
+@@ -25,6 +25,7 @@ import (
+ 	corev1 "k8s.io/api/core/v1"
+ 	apierrors "k8s.io/apimachinery/pkg/api/errors"
+ 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
++	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+ 	"k8s.io/apimachinery/pkg/types"
+ 	kubedrain "k8s.io/kubectl/pkg/drain"
+ 	kubevirtv1 "kubevirt.io/api/core/v1"
+@@ -42,6 +43,7 @@ import (
+ 
+ const (
+ 	vmiDeleteGraceTimeoutDurationSeconds = 600 // 10 minutes
++	vmiMigrationSubmissionTimeout        = 10 * time.Minute
+ )
+ 
+ // Machine implement a service for managing the KubeVirt VM hosting a kubernetes node.
+@@ -413,14 +415,51 @@ func (m *Machine) Delete() error {
+ 
+ func (m *Machine) DrainNodeIfNeeded(wrkldClstr workloadcluster.WorkloadCluster) (time.Duration, error) {
+ 	if m.vmiInstance == nil || !m.shouldGracefulDeleteVMI() {
+-		if _, anntExists := m.machineContext.KubevirtMachine.Annotations[infrav1.VmiDeletionGraceTime]; anntExists {
+-			if err := m.removeGracePeriodAnnotation(); err != nil {
+-				return 100 * time.Millisecond, err
++		if err := m.cleanupMigrationAnnotations(); err != nil {
++			return 100 * time.Millisecond, err
++		}
++
++		// Only uncordon when the VMI is back and not being deleted. If the VMI
++		// is nil (not yet recreated) or still has a DeletionTimestamp, the
++		// eviction cycle is not complete and the node must stay cordoned.
++		if m.vmiInstance != nil && m.vmiInstance.DeletionTimestamp == nil {
++			if err := m.uncordonNodeIfNeeded(wrkldClstr); err != nil {
++				m.machineContext.Logger.Error(err, "failed to uncordon guest node")
++				return 100 * time.Millisecond, nil
+ 			}
+ 		}
++
+ 		return 0, nil
+ 	}
+ 
++	// For migratable VMIs, attempt live migration before the disruptive
++	// drain+delete path. If migration succeeds, the guest node is untouched.
++	// Once fallback starts, preserve its deadline and do not retry migration.
++	// A migration may still finish after its timeout; honor that success before
++	// draining or deleting a VMI which has already left the evacuation source.
++	if m.vmiInstance.IsMigratable() &&
++		(m.machineContext.KubevirtMachine.Annotations[infrav1.VmiMigrationSubmitted] != migrationDraining ||
++			m.vmiInstance.Status.NodeName != m.vmiInstance.Status.EvacuationNodeName) {
++		migrated, requeueAfter, err := m.tryMigrateVMI()
++		if err != nil {
++			return 0, err
++		}
++		if migrated {
++			if err := m.cleanupMigrationAnnotations(); err != nil {
++				return 100 * time.Millisecond, err
++			}
++			return 0, nil
++		}
++		if requeueAfter > 0 {
++			return requeueAfter, nil
++		}
++		// Enter fallback once. Persist its phase and fresh deadline together
++		// so retries cannot extend the drain timeout indefinitely.
++		if err := m.beginDrainFallback(); err != nil {
++			return 100 * time.Millisecond, err
++		}
++	}
++
+ 	exceeded, err := m.drainGracePeriodExceeded()
+ 	if err != nil {
+ 		return 0, err
+@@ -455,6 +494,21 @@ func (m *Machine) DrainNodeIfNeeded(wrkldClstr workloadcluster.WorkloadCluster)
+ 
+ const removeGracePeriodAnnotationPatch = `[{"op": "remove", "path": "/metadata/annotations/` + infrav1.VmiDeletionGraceTimeEscape + `"}]`
+ 
++const cleanupMigrationAnnotationsPatch = `{"metadata":{"annotations":{"` + infrav1.VmiMigrationSubmitted + `": null, "` + infrav1.VmiDeletionGraceTime + `": null}}}`
++
++const migrationDraining = "draining"
++
++func (m *Machine) beginDrainFallback() error {
++	graceTime := time.Now().Add(vmiDeleteGraceTimeoutDurationSeconds * time.Second).UTC().Format(time.RFC3339)
++	patch := fmt.Sprintf(`{"metadata":{"annotations":{"%s":"%s","%s":"%s"}}}`,
++		infrav1.VmiMigrationSubmitted, migrationDraining, infrav1.VmiDeletionGraceTime, graceTime)
++	patchRequest := client.RawPatch(types.MergePatchType, []byte(patch))
++	if err := m.client.Patch(m.machineContext, m.machineContext.KubevirtMachine, patchRequest); err != nil {
++		return fmt.Errorf("failed to start drain fallback on KubevirtMachine %s: %w", m.machineContext.KubevirtMachine.Name, err)
++	}
++	return nil
++}
++
+ func (m *Machine) removeGracePeriodAnnotation() error {
+ 	patch := client.RawPatch(types.JSONPatchType, []byte(removeGracePeriodAnnotationPatch))
+ 
+@@ -465,6 +519,188 @@ func (m *Machine) removeGracePeriodAnnotation() error {
+ 	return nil
+ }
+ 
++// cleanupMigrationAnnotations removes both the migration-submitted marker and
++// the grace period annotation in a single merge patch. Setting a key to null
++// in a merge patch removes it; if the key does not exist, it is a no-op.
++func (m *Machine) cleanupMigrationAnnotations() error {
++	annotations := m.machineContext.KubevirtMachine.Annotations
++	_, hasMigration := annotations[infrav1.VmiMigrationSubmitted]
++	_, hasGrace := annotations[infrav1.VmiDeletionGraceTime]
++	if !hasMigration && !hasGrace {
++		return nil
++	}
++
++	patchRequest := client.RawPatch(types.MergePatchType, []byte(cleanupMigrationAnnotationsPatch))
++	if err := m.client.Patch(m.machineContext, m.machineContext.KubevirtMachine, patchRequest); err != nil {
++		return fmt.Errorf("failed to clean up migration annotations on KubevirtMachine %s: %w", m.machineContext.KubevirtMachine.Name, err)
++	}
++	return nil
++}
++
++func (m *Machine) setNodeCordonedAnnotation() error {
++	patch := fmt.Sprintf(`{"metadata":{"annotations":{"%s": "true"}}}`, infrav1.NodeCordonedByCapk)
++	patchRequest := client.RawPatch(types.MergePatchType, []byte(patch))
++
++	if err := m.client.Patch(m.machineContext, m.machineContext.KubevirtMachine, patchRequest); err != nil {
++		return fmt.Errorf("failed to set the %s annotation on KubeVirtMachine %s; %w", infrav1.NodeCordonedByCapk, m.machineContext.KubevirtMachine.Name, err)
++	}
++
++	return nil
++}
++
++const removeNodeCordonedAnnotationPatch = `[{"op": "remove", "path": "/metadata/annotations/` + infrav1.NodeCordonedByCapkEscape + `"}]`
++
++func (m *Machine) removeNodeCordonedAnnotation() error {
++	patch := client.RawPatch(types.JSONPatchType, []byte(removeNodeCordonedAnnotationPatch))
++
++	if err := m.client.Patch(m.machineContext, m.machineContext.KubevirtMachine, patch); err != nil {
++		return fmt.Errorf("failed to remove the %s annotation from KubeVirtMachine %s; %w", infrav1.NodeCordonedByCapk, m.machineContext.KubevirtMachine.Name, err)
++	}
++
++	return nil
++}
++
++func (m *Machine) uncordonNodeIfNeeded(wrkldClstr workloadcluster.WorkloadCluster) error {
++	if _, exists := m.machineContext.KubevirtMachine.Annotations[infrav1.NodeCordonedByCapk]; !exists {
++		return nil
++	}
++
++	if wrkldClstr == nil {
++		m.machineContext.Logger.Info("Workload cluster client is nil, skipping uncordon")
++		return nil
++	}
++
++	kubeClient, err := wrkldClstr.GenerateWorkloadClusterK8sClient(m.machineContext)
++	if err != nil {
++		return fmt.Errorf("failed to get client to remote cluster for uncordon; %w", err)
++	}
++
++	nodeName := m.machineContext.KubevirtMachine.Name
++	node, err := kubeClient.CoreV1().Nodes().Get(m.machineContext, nodeName, metav1.GetOptions{})
++	if err != nil {
++		if apierrors.IsNotFound(err) {
++			m.machineContext.Logger.Info("Node not found during uncordon, removing annotation", "node", nodeName)
++			return m.removeNodeCordonedAnnotation()
++		}
++		return fmt.Errorf("unable to get node %q for uncordon: %w", nodeName, err)
++	}
++
++	if !node.Spec.Unschedulable {
++		m.machineContext.Logger.Info("Node is already schedulable, removing stale cordon annotation", "node", nodeName)
++		return m.removeNodeCordonedAnnotation()
++	}
++
++	drainer := &kubedrain.Helper{
++		Client: kubeClient,
++		Ctx:    m.machineContext,
++	}
++
++	m.machineContext.Logger.Info("Uncordoning guest node after VMI restart", "node", nodeName)
++	if err = kubedrain.RunCordonOrUncordon(drainer, node, false); err != nil {
++		return fmt.Errorf("unable to uncordon node %s: %w", nodeName, err)
++	}
++
++	return m.removeNodeCordonedAnnotation()
++}
++
++// tryMigrateVMI attempts to live-migrate a migratable VMI instead of the
++// disruptive drain+delete path. It returns:
++//   - migrated=true when the VMI has already moved to a different host
++//   - requeueAfter>0 when a migration is in progress or was just created
++//   - both zero when migration failed/timed out (caller should fall through to drain+delete)
++//
++// Submission has a separate deadline: a lost or unprocessed VMIM must not
++// block eviction indefinitely, while queueing must not consume the active
++// migration grace period, which starts when MigrationState is set.
++func (m *Machine) tryMigrateVMI() (migrated bool, requeueAfter time.Duration, err error) {
++	// If the VMI is already on a different node than the evacuation source,
++	// migration has succeeded -- no guest disruption needed.
++	if m.vmiInstance.Status.NodeName != m.vmiInstance.Status.EvacuationNodeName {
++		m.machineContext.Logger.Info("VMI successfully migrated, skipping drain+delete",
++			"from", m.vmiInstance.Status.EvacuationNodeName,
++			"to", m.vmiInstance.Status.NodeName)
++		return true, 0, nil
++	}
++
++	if ms := m.vmiInstance.Status.MigrationState; ms != nil {
++		if ms.Failed {
++			m.machineContext.Logger.Info("VMI migration failed, falling back to drain+delete",
++				"vmi", m.vmiInstance.Name)
++			return false, 0, nil
++		}
++		if !ms.Completed {
++			// Migration is actively in progress -- the grace period timer
++			// starts here (not when the migration CR was first created).
++			exceeded, err := m.drainGracePeriodExceeded()
++			if err != nil {
++				return false, 0, err
++			}
++			if exceeded {
++				m.machineContext.Logger.Info("Migration timeout exceeded while migration in progress, falling back to drain+delete",
++					"vmi", m.vmiInstance.Name)
++				return false, 0, nil
++			}
++			m.machineContext.Logger.Info("VMI migration in progress, waiting",
++				"vmi", m.vmiInstance.Name)
++			return false, 10 * time.Second, nil
++		}
++	}
++
++	// No active migration. Check if we've already submitted a migration CR
++	// on a previous reconcile (waiting for KubeVirt to pick it up).
++	if submitted, exists := m.machineContext.KubevirtMachine.Annotations[infrav1.VmiMigrationSubmitted]; exists {
++		deadline, err := time.Parse(time.RFC3339, submitted)
++		if err != nil || !time.Now().Before(deadline) {
++			m.machineContext.Logger.Info("Migration submission deadline expired or invalid, falling back to drain+delete",
++				"vmi", m.vmiInstance.Name)
++			return false, 0, nil
++		}
++		m.machineContext.Logger.Info("Migration already submitted, waiting for KubeVirt to start it",
++			"vmi", m.vmiInstance.Name)
++		return false, 10 * time.Second, nil
++	}
++
++	// First reconcile for this evacuation -- create a migration CR.
++	// Priority is reserved for virt-controller, including when KubeVirt
++	// enables MigrationPriorityQueue. Ordinary migrations retain cluster limits.
++	migration := &unstructured.Unstructured{Object: map[string]interface{}{
++		"apiVersion": "kubevirt.io/v1",
++		"kind":       "VirtualMachineInstanceMigration",
++		"metadata": map[string]interface{}{
++			"generateName": m.vmiInstance.Name + "-migration-",
++			"namespace":    m.vmiInstance.Namespace,
++		},
++		"spec": map[string]interface{}{
++			"vmiName": m.vmiInstance.Name,
++		},
++	}}
++
++	if err := m.client.Create(m.machineContext, migration); err != nil {
++		m.machineContext.Logger.Error(err, "Failed to create VirtualMachineInstanceMigration, falling back to drain+delete",
++			"vmi", m.vmiInstance.Name)
++		return false, 0, nil
++	}
++
++	if err := m.setMigrationSubmittedAnnotation(); err != nil {
++		return false, 0, err
++	}
++
++	m.machineContext.Logger.Info("Created VirtualMachineInstanceMigration for migratable VMI",
++		"migration", migration.GetName(), "vmi", m.vmiInstance.Name)
++
++	return false, 10 * time.Second, nil
++}
++
++func (m *Machine) setMigrationSubmittedAnnotation() error {
++	deadline := time.Now().Add(vmiMigrationSubmissionTimeout).UTC().Format(time.RFC3339)
++	patch := fmt.Sprintf(`{"metadata":{"annotations":{"%s": "%s"}}}`, infrav1.VmiMigrationSubmitted, deadline)
++	patchRequest := client.RawPatch(types.MergePatchType, []byte(patch))
++	if err := m.client.Patch(m.machineContext, m.machineContext.KubevirtMachine, patchRequest); err != nil {
++		return fmt.Errorf("failed to set the %s annotation on KubevirtMachine %s: %w", infrav1.VmiMigrationSubmitted, m.machineContext.KubevirtMachine.Name, err)
++	}
++	return nil
++}
++
+ func (m *Machine) shouldGracefulDeleteVMI() bool {
+ 	if m.vmiInstance.DeletionTimestamp != nil {
+ 		m.machineContext.Logger.V(4).Info("DrainNode: the virtualMachineInstance is already in deletion process. Nothing to do here")
+@@ -531,7 +767,7 @@ func (m *Machine) drainNode(wrkldClstr workloadcluster.WorkloadCluster) (time.Du
+ 		return 0, fmt.Errorf("failed to get client to remote cluster; %w", err)
+ 	}
+ 
+-	nodeName := m.vmiInstance.Status.EvacuationNodeName
++	nodeName := m.machineContext.KubevirtMachine.Name
+ 	node, err := kubeClient.CoreV1().Nodes().Get(m.machineContext, nodeName, metav1.GetOptions{})
+ 	if err != nil {
+ 		if apierrors.IsNotFound(err) {
+@@ -577,6 +813,11 @@ func (m *Machine) drainNode(wrkldClstr workloadcluster.WorkloadCluster) (time.Du
+ 		return 0, errors.Errorf("unable to cordon node %s: %v", nodeName, err)
+ 	}
+ 
++	if err = m.setNodeCordonedAnnotation(); err != nil {
++		m.machineContext.Logger.Error(err, "Failed to set node-cordoned annotation after cordon")
++		return 100 * time.Millisecond, nil
++	}
++
+ 	if err = kubedrain.RunNodeDrain(drainer, node.Name); err != nil {
+ 		// Machine will be re-reconciled after a drain failure.
+ 		m.machineContext.Logger.Error(err, "Drain failed, retry in a second", "node name", nodeName)
+diff --git a/pkg/kubevirt/machine_test.go b/pkg/kubevirt/machine_test.go
+index 1858970..3fc5506 100644
+--- a/pkg/kubevirt/machine_test.go
++++ b/pkg/kubevirt/machine_test.go
+@@ -28,6 +28,7 @@ import (
+ 	corev1 "k8s.io/api/core/v1"
+ 	apierrors "k8s.io/apimachinery/pkg/api/errors"
+ 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
++	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+ 	"k8s.io/apimachinery/pkg/runtime"
+ 	k8sfake "k8s.io/client-go/kubernetes/fake"
+ 	k8stesting "k8s.io/client-go/testing"
+@@ -321,7 +322,7 @@ var _ = Describe("With KubeVirt VM running", func() {
+ 	})
+ 
+ 	Context("test DrainNodeIfNeeded", func() {
+-		const nodeName = "control-plane1"
++		const hostNodeName = "host-node-1"
+ 
+ 		var (
+ 			wlCluster *mock.MockWorkloadCluster
+@@ -331,11 +332,15 @@ var _ = Describe("With KubeVirt VM running", func() {
+ 			virtualMachineInstance = testing.NewVirtualMachineInstance(kubevirtMachine)
+ 			strategy := kubevirtv1.EvictionStrategyExternal
+ 			virtualMachineInstance.Spec.EvictionStrategy = &strategy
+-			virtualMachineInstance.Status.EvacuationNodeName = nodeName
++			virtualMachineInstance.Status.EvacuationNodeName = hostNodeName
+ 
+ 			if kubevirtMachine.Annotations == nil {
+ 				kubevirtMachine.Annotations = make(map[string]string)
+ 			}
++			// The fixture is shared by specs; each eviction starts independently.
++			delete(kubevirtMachine.Annotations, v1alpha1.VmiDeletionGraceTime)
++			delete(kubevirtMachine.Annotations, v1alpha1.VmiMigrationSubmitted)
++			delete(kubevirtMachine.Annotations, v1alpha1.NodeCordonedByCapk)
+ 
+ 			mockCtrl := gomock.NewController(GinkgoT())
+ 			wlCluster = mock.NewMockWorkloadCluster(mockCtrl)
+@@ -460,7 +465,7 @@ var _ = Describe("With KubeVirt VM running", func() {
+ 			It("Should drain the node", func() {
+ 				node := &corev1.Node{
+ 					ObjectMeta: metav1.ObjectMeta{
+-						Name: nodeName,
++						Name: kubevirtMachineName,
+ 					},
+ 				}
+ 
+@@ -476,6 +481,11 @@ var _ = Describe("With KubeVirt VM running", func() {
+ 				Expect(err).NotTo(HaveOccurred())
+ 				Expect(requeueDuration).To(Equal(time.Duration(10 * time.Second)))
+ 
++				By("draining the guest node rather than looking up the physical host")
++				guestNode, err := cl.CoreV1().Nodes().Get(gocontext.Background(), kubevirtMachineName, metav1.GetOptions{})
++				Expect(err).ToNot(HaveOccurred())
++				Expect(guestNode.Spec.Unschedulable).To(BeTrue())
++
+ 				vmi := &kubevirtv1.VirtualMachineInstance{}
+ 				err = fakeClient.Get(gocontext.Background(), client.ObjectKey{Namespace: virtualMachineInstance.Namespace, Name: virtualMachineInstance.Name}, vmi)
+ 				Expect(err).To(HaveOccurred())
+@@ -486,6 +496,9 @@ var _ = Describe("With KubeVirt VM running", func() {
+ 				Expect(err).ToNot(HaveOccurred())
+ 				Expect(machine).ToNot(BeNil())
+ 				Expect(machine.Annotations).ToNot(HaveKey(v1alpha1.VmiDeletionGraceTime))
++
++				By("The node-cordoned annotation should be set after cordon")
++				Expect(machine.Annotations).To(HaveKey(v1alpha1.NodeCordonedByCapk))
+ 			})
+ 		})
+ 
+@@ -498,7 +511,7 @@ var _ = Describe("With KubeVirt VM running", func() {
+ 			It("Should not drain the node", func() {
+ 				node := &corev1.Node{
+ 					ObjectMeta: metav1.ObjectMeta{
+-						Name: nodeName,
++						Name: kubevirtMachineName,
+ 					},
+ 				}
+ 
+@@ -563,6 +576,672 @@ var _ = Describe("With KubeVirt VM running", func() {
+ 				Expect(machine.Annotations).ToNot(HaveKey(v1alpha1.VmiDeletionGraceTime))
+ 			})
+ 		})
++
++		Context("migration-first eviction for migratable VMIs", func() {
++			BeforeEach(func() {
++				virtualMachineInstance.Status.NodeName = hostNodeName
++				virtualMachineInstance.Status.Conditions = append(
++					virtualMachineInstance.Status.Conditions,
++					kubevirtv1.VirtualMachineInstanceCondition{
++						Type:   kubevirtv1.VirtualMachineInstanceIsMigratable,
++						Status: corev1.ConditionTrue,
++					},
++				)
++			})
++
++			Context("bounded fallback deadline", func() {
++				DescribeTable("preserves one fallback deadline across reconciles",
++					func(migrationFailed, deadlineExpired bool) {
++						virtualMachineInstance.Status.MigrationState = &kubevirtv1.VirtualMachineInstanceMigrationState{
++							Failed: migrationFailed, StartTimestamp: nowTimestamp(),
++						}
++						// Update the VMI already stored by the enclosing JustBeforeEach.
++						Expect(fakeClient.Update(gocontext.Background(), virtualMachineInstance)).To(Succeed())
++						kubevirtMachine.Annotations[v1alpha1.VmiMigrationSubmitted] = "true"
++						kubevirtMachine.Annotations[v1alpha1.VmiDeletionGraceTime] = time.Now().UTC().Add(-time.Minute).Format(time.RFC3339)
++						Expect(fakeClient.Update(gocontext.Background(), kubevirtMachine)).To(Succeed())
++
++						node := &corev1.Node{ObjectMeta: metav1.ObjectMeta{Name: kubevirtMachineName}}
++						cl := k8sfake.NewClientset(node)
++						cl.PrependReactor("list", "pods", func(action k8stesting.Action) (bool, runtime.Object, error) {
++							return true, nil, errors.New("drain has not completed")
++						})
++						calls := 2
++						if deadlineExpired {
++							calls = 1 // An expired fallback must not try another drain.
++						}
++						wlCluster.EXPECT().GenerateWorkloadClusterK8sClient(gomock.Any()).Return(cl, nil).Times(calls)
++						externalMachine, err := defaultTestMachine(machineContext, namespace, fakeClient, fakeVMCommandExecutor, []byte(sshKey))
++						Expect(err).NotTo(HaveOccurred())
++
++						By("starting a separate fallback window after failure or migration timeout")
++						requeue, err := externalMachine.DrainNodeIfNeeded(wlCluster)
++						Expect(err).NotTo(HaveOccurred())
++						Expect(requeue).To(Equal(time.Second))
++						Expect(kubevirtMachine.Annotations[v1alpha1.VmiMigrationSubmitted]).To(Equal("draining"))
++						firstDeadline, err := time.Parse(time.RFC3339, kubevirtMachine.Annotations[v1alpha1.VmiDeletionGraceTime])
++						Expect(err).NotTo(HaveOccurred())
++						Expect(firstDeadline.After(time.Now().UTC().Add(9 * time.Minute))).To(BeTrue())
++
++						By("reconciling again with the same failed or timed-out migration")
++						deadline := time.Now().UTC().Add(time.Minute).Format(time.RFC3339)
++						if deadlineExpired {
++							deadline = time.Now().UTC().Add(-time.Minute).Format(time.RFC3339)
++						}
++						kubevirtMachine.Annotations[v1alpha1.VmiDeletionGraceTime] = deadline
++						Expect(fakeClient.Update(gocontext.Background(), kubevirtMachine)).To(Succeed())
++						externalMachine, err = defaultTestMachine(machineContext, namespace, fakeClient, fakeVMCommandExecutor, []byte(sshKey))
++						Expect(err).NotTo(HaveOccurred())
++						requeue, err = externalMachine.DrainNodeIfNeeded(wlCluster)
++						Expect(err).NotTo(HaveOccurred())
++						vmi := &kubevirtv1.VirtualMachineInstance{}
++						err = fakeClient.Get(gocontext.Background(), client.ObjectKeyFromObject(virtualMachineInstance), vmi)
++						if deadlineExpired {
++							Expect(requeue).To(Equal(10 * time.Second))
++							Expect(apierrors.IsNotFound(err)).To(BeTrue())
++							Expect(kubevirtMachine.Annotations).NotTo(HaveKey(v1alpha1.VmiDeletionGraceTime))
++						} else {
++							Expect(requeue).To(Equal(time.Second))
++							Expect(err).NotTo(HaveOccurred())
++							Expect(kubevirtMachine.Annotations[v1alpha1.VmiDeletionGraceTime]).To(Equal(deadline))
++						}
++						migrations := &kubevirtv1.VirtualMachineInstanceMigrationList{}
++						Expect(fakeClient.List(gocontext.Background(), migrations)).To(Succeed())
++						Expect(migrations.Items).To(BeEmpty())
++					},
++					Entry("failed migration, fallback still has time", true, false),
++					Entry("failed migration, fallback has expired", true, true),
++					Entry("migration timeout, fallback still has time", false, false),
++					Entry("migration timeout, fallback has expired", false, true),
++				)
++
++				DescribeTable("cleans both annotations when migration succeeds",
++					func(phase string) {
++						virtualMachineInstance.Status.NodeName = "target-node-2"
++						Expect(fakeClient.Update(gocontext.Background(), virtualMachineInstance)).To(Succeed())
++						kubevirtMachine.Annotations[v1alpha1.VmiMigrationSubmitted] = phase
++						kubevirtMachine.Annotations[v1alpha1.VmiDeletionGraceTime] = time.Now().UTC().Add(time.Minute).Format(time.RFC3339)
++						Expect(fakeClient.Update(gocontext.Background(), kubevirtMachine)).To(Succeed())
++						wlCluster.EXPECT().GenerateWorkloadClusterK8sClient(gomock.Any()).Times(0)
++						externalMachine, err := defaultTestMachine(machineContext, namespace, fakeClient, fakeVMCommandExecutor, []byte(sshKey))
++						Expect(err).NotTo(HaveOccurred())
++						requeue, err := externalMachine.DrainNodeIfNeeded(wlCluster)
++						Expect(err).NotTo(HaveOccurred())
++						Expect(requeue).To(BeZero())
++						Expect(kubevirtMachine.Annotations).NotTo(HaveKey(v1alpha1.VmiMigrationSubmitted))
++						Expect(kubevirtMachine.Annotations).NotTo(HaveKey(v1alpha1.VmiDeletionGraceTime))
++						Expect(fakeClient.Get(gocontext.Background(), client.ObjectKeyFromObject(virtualMachineInstance), &kubevirtv1.VirtualMachineInstance{})).To(Succeed())
++					},
++					Entry("during the migration window", "true"),
++					Entry("late completion after fallback was entered", "draining"),
++				)
++
++				It("keeps the original state when the atomic fallback patch fails", func() {
++					virtualMachineInstance.Status.MigrationState = &kubevirtv1.VirtualMachineInstanceMigrationState{Failed: true}
++					Expect(fakeClient.Update(gocontext.Background(), virtualMachineInstance)).To(Succeed())
++					deadline := time.Now().UTC().Add(-time.Minute).Format(time.RFC3339)
++					kubevirtMachine.Annotations[v1alpha1.VmiMigrationSubmitted] = "true"
++					kubevirtMachine.Annotations[v1alpha1.VmiDeletionGraceTime] = deadline
++					Expect(fakeClient.Update(gocontext.Background(), kubevirtMachine)).To(Succeed())
++					wlCluster.EXPECT().GenerateWorkloadClusterK8sClient(gomock.Any()).Times(0)
++					externalMachine, err := defaultTestMachine(machineContext, namespace, fakeClient, fakeVMCommandExecutor, []byte(sshKey))
++					Expect(err).NotTo(HaveOccurred())
++					externalMachine.client = &fallbackPatchFailClient{Client: fakeClient}
++					_, err = externalMachine.DrainNodeIfNeeded(wlCluster)
++					Expect(err).To(MatchError(ContainSubstring("failed to start drain fallback")))
++					Expect(kubevirtMachine.Annotations[v1alpha1.VmiMigrationSubmitted]).To(Equal("true"))
++					Expect(kubevirtMachine.Annotations[v1alpha1.VmiDeletionGraceTime]).To(Equal(deadline))
++					Expect(fakeClient.Get(gocontext.Background(), client.ObjectKeyFromObject(virtualMachineInstance), &kubevirtv1.VirtualMachineInstance{})).To(Succeed())
++				})
++
++				It("removes fallback state after deletion without uncordoning before recreation", func() {
++					kubevirtMachine.Annotations[v1alpha1.VmiMigrationSubmitted] = "draining"
++					kubevirtMachine.Annotations[v1alpha1.VmiDeletionGraceTime] = time.Now().UTC().Add(time.Minute).Format(time.RFC3339)
++					kubevirtMachine.Annotations[v1alpha1.NodeCordonedByCapk] = "true"
++					Expect(fakeClient.Update(gocontext.Background(), kubevirtMachine)).To(Succeed())
++					externalMachine, err := defaultTestMachine(machineContext, namespace, fakeClient, fakeVMCommandExecutor, []byte(sshKey))
++					Expect(err).NotTo(HaveOccurred())
++					externalMachine.vmiInstance = nil
++					requeue, err := externalMachine.DrainNodeIfNeeded(nil)
++					Expect(err).NotTo(HaveOccurred())
++					Expect(requeue).To(BeZero())
++					Expect(kubevirtMachine.Annotations).NotTo(HaveKey(v1alpha1.VmiMigrationSubmitted))
++					Expect(kubevirtMachine.Annotations).NotTo(HaveKey(v1alpha1.VmiDeletionGraceTime))
++					Expect(kubevirtMachine.Annotations).To(HaveKey(v1alpha1.NodeCordonedByCapk))
++				})
++			})
++
++			When("no migration exists yet", func() {
++				It("Should create a VirtualMachineInstanceMigration and requeue", func() {
++					wlCluster.EXPECT().GenerateWorkloadClusterK8sClient(gomock.Any()).Times(0)
++
++					externalMachine, err := defaultTestMachine(machineContext, namespace, fakeClient, fakeVMCommandExecutor, []byte(sshKey))
++					Expect(err).NotTo(HaveOccurred())
++					recorder := &migrationRecordingClient{Client: externalMachine.client}
++					externalMachine.client = recorder
++
++					requeueDuration, err := externalMachine.DrainNodeIfNeeded(wlCluster)
++					Expect(err).NotTo(HaveOccurred())
++					Expect(requeueDuration).To(Equal(10 * time.Second))
++
++					By("VMI should still exist (not drained+deleted)")
++					vmi := &kubevirtv1.VirtualMachineInstance{}
++					err = fakeClient.Get(gocontext.Background(), client.ObjectKey{Namespace: virtualMachineInstance.Namespace, Name: virtualMachineInstance.Name}, vmi)
++					Expect(err).ToNot(HaveOccurred())
++
++					By("A VirtualMachineInstanceMigration should have been created")
++					migrationList := &kubevirtv1.VirtualMachineInstanceMigrationList{}
++					err = fakeClient.List(gocontext.Background(), migrationList, client.InNamespace(virtualMachineInstance.Namespace))
++					Expect(err).ToNot(HaveOccurred())
++					Expect(migrationList.Items).To(HaveLen(1))
++					Expect(migrationList.Items[0].Spec.VMIName).To(Equal(virtualMachineInstance.Name))
++
++					By("Migration must omit priority reserved for virt-controller")
++					Expect(recorder.created).ToNot(BeNil())
++					_, found, err := unstructured.NestedString(recorder.created.Object, "spec", "priority")
++					Expect(err).ToNot(HaveOccurred())
++					Expect(found).To(BeFalse())
++
++					By("Migration-submitted annotation should be set, but NOT the grace period timer")
++					updatedKM := &v1alpha1.KubevirtMachine{}
++					err = fakeClient.Get(gocontext.Background(), client.ObjectKeyFromObject(kubevirtMachine), updatedKM)
++					Expect(err).ToNot(HaveOccurred())
++					Expect(updatedKM.Annotations).To(HaveKey(v1alpha1.VmiMigrationSubmitted))
++					submissionDeadline, err := time.Parse(time.RFC3339, updatedKM.Annotations[v1alpha1.VmiMigrationSubmitted])
++					Expect(err).NotTo(HaveOccurred())
++					Expect(submissionDeadline).To(BeTemporally(">", time.Now().Add(9*time.Minute)))
++					Expect(submissionDeadline).To(BeTemporally("<=", time.Now().Add(10*time.Minute)))
++					Expect(updatedKM.Annotations).ToNot(HaveKey(v1alpha1.VmiDeletionGraceTime))
++				})
++			})
++
++			When("migration already submitted but not yet started by KubeVirt", func() {
++				BeforeEach(func() {
++					kubevirtMachine.Annotations[v1alpha1.VmiMigrationSubmitted] = time.Now().UTC().Add(5 * time.Minute).Format(time.RFC3339)
++				})
++
++				It("Should requeue without creating a duplicate migration", func() {
++					wlCluster.EXPECT().GenerateWorkloadClusterK8sClient(gomock.Any()).Times(0)
++
++					externalMachine, err := defaultTestMachine(machineContext, namespace, fakeClient, fakeVMCommandExecutor, []byte(sshKey))
++					Expect(err).NotTo(HaveOccurred())
++
++					requeueDuration, err := externalMachine.DrainNodeIfNeeded(wlCluster)
++					Expect(err).NotTo(HaveOccurred())
++					Expect(requeueDuration).To(Equal(10 * time.Second))
++
++					By("No new VirtualMachineInstanceMigration should have been created")
++					migrationList := &kubevirtv1.VirtualMachineInstanceMigrationList{}
++					err = fakeClient.List(gocontext.Background(), migrationList, client.InNamespace(virtualMachineInstance.Namespace))
++					Expect(err).ToNot(HaveOccurred())
++					Expect(migrationList.Items).To(BeEmpty())
++
++					By("Grace period timer should NOT be set yet")
++					updatedKM := &v1alpha1.KubevirtMachine{}
++					err = fakeClient.Get(gocontext.Background(), client.ObjectKeyFromObject(kubevirtMachine), updatedKM)
++					Expect(err).ToNot(HaveOccurred())
++					Expect(updatedKM.Annotations).ToNot(HaveKey(v1alpha1.VmiDeletionGraceTime))
++
++					deadline := updatedKM.Annotations[v1alpha1.VmiMigrationSubmitted]
++					machineContext.KubevirtMachine = updatedKM
++					externalMachine, err = defaultTestMachine(machineContext, namespace, fakeClient, fakeVMCommandExecutor, []byte(sshKey))
++					Expect(err).NotTo(HaveOccurred())
++					requeueDuration, err = externalMachine.DrainNodeIfNeeded(wlCluster)
++					Expect(err).NotTo(HaveOccurred())
++					Expect(requeueDuration).To(Equal(10 * time.Second))
++					Expect(fakeClient.Get(gocontext.Background(), client.ObjectKeyFromObject(updatedKM), updatedKM)).To(Succeed())
++					Expect(updatedKM.Annotations[v1alpha1.VmiMigrationSubmitted]).To(Equal(deadline))
++					Expect(updatedKM.Annotations).NotTo(HaveKey(v1alpha1.VmiDeletionGraceTime))
++					Expect(fakeClient.List(gocontext.Background(), migrationList)).To(Succeed())
++					Expect(migrationList.Items).To(BeEmpty())
++				})
++			})
++
++			DescribeTable("falls back when the submission deadline has expired or is invalid",
++				func(submissionDeadline string) {
++					kubevirtMachine.Annotations[v1alpha1.VmiMigrationSubmitted] = submissionDeadline
++					Expect(fakeClient.Update(gocontext.Background(), kubevirtMachine)).To(Succeed())
++					node := &corev1.Node{ObjectMeta: metav1.ObjectMeta{Name: kubevirtMachineName}}
++					cl := k8sfake.NewClientset(node)
++					cl.PrependReactor("list", "pods", func(action k8stesting.Action) (bool, runtime.Object, error) {
++						return true, nil, errors.New("drain has not completed")
++					})
++					wlCluster.EXPECT().GenerateWorkloadClusterK8sClient(gomock.Any()).Return(cl, nil).Times(1)
++					externalMachine, err := defaultTestMachine(machineContext, namespace, fakeClient, fakeVMCommandExecutor, []byte(sshKey))
++					Expect(err).NotTo(HaveOccurred())
++
++					requeue, err := externalMachine.DrainNodeIfNeeded(wlCluster)
++					Expect(err).NotTo(HaveOccurred())
++					Expect(requeue).To(Equal(time.Second))
++					Expect(kubevirtMachine.Annotations[v1alpha1.VmiMigrationSubmitted]).To(Equal("draining"))
++					fallbackDeadline, err := time.Parse(time.RFC3339, kubevirtMachine.Annotations[v1alpha1.VmiDeletionGraceTime])
++					Expect(err).NotTo(HaveOccurred())
++					Expect(fallbackDeadline).To(BeTemporally(">", time.Now().Add(9*time.Minute)))
++					Expect(fakeClient.Get(gocontext.Background(), client.ObjectKeyFromObject(virtualMachineInstance), &kubevirtv1.VirtualMachineInstance{})).To(Succeed())
++
++					kubevirtMachine.Annotations[v1alpha1.VmiDeletionGraceTime] = time.Now().UTC().Add(-time.Minute).Format(time.RFC3339)
++					Expect(fakeClient.Update(gocontext.Background(), kubevirtMachine)).To(Succeed())
++					externalMachine, err = defaultTestMachine(machineContext, namespace, fakeClient, fakeVMCommandExecutor, []byte(sshKey))
++					Expect(err).NotTo(HaveOccurred())
++					requeue, err = externalMachine.DrainNodeIfNeeded(wlCluster)
++					Expect(err).NotTo(HaveOccurred())
++					Expect(requeue).To(Equal(10 * time.Second))
++					err = fakeClient.Get(gocontext.Background(), client.ObjectKeyFromObject(virtualMachineInstance), &kubevirtv1.VirtualMachineInstance{})
++					Expect(apierrors.IsNotFound(err)).To(BeTrue())
++					migrationList := &kubevirtv1.VirtualMachineInstanceMigrationList{}
++					Expect(fakeClient.List(gocontext.Background(), migrationList)).To(Succeed())
++					Expect(migrationList.Items).To(BeEmpty())
++				},
++				Entry("expired deadline", time.Now().UTC().Add(-time.Minute).Format(time.RFC3339)),
++				Entry("legacy marker", "true"),
++				Entry("invalid timestamp", "not-a-timestamp"),
++				Entry("empty timestamp", ""),
++			)
++
++			When("migration is in progress", func() {
++				BeforeEach(func() {
++					virtualMachineInstance.Status.MigrationState = &kubevirtv1.VirtualMachineInstanceMigrationState{
++						StartTimestamp: nowTimestamp(),
++					}
++					graceTime := time.Now().UTC().Add(5 * time.Minute).Format(time.RFC3339)
++					kubevirtMachine.Annotations[v1alpha1.VmiDeletionGraceTime] = graceTime
++				})
++
++				It("Should requeue and wait for migration", func() {
++					wlCluster.EXPECT().GenerateWorkloadClusterK8sClient(gomock.Any()).Times(0)
++
++					externalMachine, err := defaultTestMachine(machineContext, namespace, fakeClient, fakeVMCommandExecutor, []byte(sshKey))
++					Expect(err).NotTo(HaveOccurred())
++
++					requeueDuration, err := externalMachine.DrainNodeIfNeeded(wlCluster)
++					Expect(err).NotTo(HaveOccurred())
++					Expect(requeueDuration).To(Equal(10 * time.Second))
++
++					By("VMI should still exist")
++					vmi := &kubevirtv1.VirtualMachineInstance{}
++					err = fakeClient.Get(gocontext.Background(), client.ObjectKey{Namespace: virtualMachineInstance.Namespace, Name: virtualMachineInstance.Name}, vmi)
++					Expect(err).ToNot(HaveOccurred())
++				})
++
++				It("starts a separate active migration window after the submission deadline", func() {
++					kubevirtMachine.Annotations[v1alpha1.VmiMigrationSubmitted] = time.Now().UTC().Add(-time.Minute).Format(time.RFC3339)
++					delete(kubevirtMachine.Annotations, v1alpha1.VmiDeletionGraceTime)
++					Expect(fakeClient.Update(gocontext.Background(), kubevirtMachine)).To(Succeed())
++					wlCluster.EXPECT().GenerateWorkloadClusterK8sClient(gomock.Any()).Times(0)
++					externalMachine, err := defaultTestMachine(machineContext, namespace, fakeClient, fakeVMCommandExecutor, []byte(sshKey))
++					Expect(err).NotTo(HaveOccurred())
++					requeue, err := externalMachine.DrainNodeIfNeeded(wlCluster)
++					Expect(err).NotTo(HaveOccurred())
++					Expect(requeue).To(Equal(10 * time.Second))
++					deadline, err := time.Parse(time.RFC3339, kubevirtMachine.Annotations[v1alpha1.VmiDeletionGraceTime])
++					Expect(err).NotTo(HaveOccurred())
++					Expect(deadline).To(BeTemporally(">", time.Now().Add(9*time.Minute)))
++					Expect(fakeClient.Get(gocontext.Background(), client.ObjectKeyFromObject(virtualMachineInstance), &kubevirtv1.VirtualMachineInstance{})).To(Succeed())
++				})
++			})
++
++			When("migration succeeded (VMI on different node)", func() {
++				BeforeEach(func() {
++					virtualMachineInstance.Status.NodeName = "target-node-2"
++					virtualMachineInstance.Status.MigrationState = &kubevirtv1.VirtualMachineInstanceMigrationState{
++						Completed:  true,
++						SourceNode: hostNodeName,
++						TargetNode: "target-node-2",
++					}
++				})
++
++				It("Should skip drain+delete and return success", func() {
++					wlCluster.EXPECT().GenerateWorkloadClusterK8sClient(gomock.Any()).Times(0)
++
++					externalMachine, err := defaultTestMachine(machineContext, namespace, fakeClient, fakeVMCommandExecutor, []byte(sshKey))
++					Expect(err).NotTo(HaveOccurred())
++
++					requeueDuration, err := externalMachine.DrainNodeIfNeeded(wlCluster)
++					Expect(err).NotTo(HaveOccurred())
++					Expect(requeueDuration).Should(BeZero())
++
++					By("VMI should still exist (not deleted)")
++					vmi := &kubevirtv1.VirtualMachineInstance{}
++					err = fakeClient.Get(gocontext.Background(), client.ObjectKey{Namespace: virtualMachineInstance.Namespace, Name: virtualMachineInstance.Name}, vmi)
++					Expect(err).ToNot(HaveOccurred())
++				})
++			})
++
++			When("migration failed", func() {
++				BeforeEach(func() {
++					virtualMachineInstance.Status.MigrationState = &kubevirtv1.VirtualMachineInstanceMigrationState{
++						Failed: true,
++					}
++				})
++
++				It("Should fall through to drain+delete", func() {
++					node := &corev1.Node{
++						ObjectMeta: metav1.ObjectMeta{
++							Name: kubevirtMachineName,
++						},
++					}
++					Expect(k8sfake.AddToScheme(setupRemoteScheme())).ToNot(HaveOccurred())
++					cl := k8sfake.NewClientset(node)
++					wlCluster.EXPECT().GenerateWorkloadClusterK8sClient(gomock.Any()).Return(cl, nil).Times(1)
++
++					externalMachine, err := defaultTestMachine(machineContext, namespace, fakeClient, fakeVMCommandExecutor, []byte(sshKey))
++					Expect(err).NotTo(HaveOccurred())
++
++					requeueDuration, err := externalMachine.DrainNodeIfNeeded(wlCluster)
++					Expect(err).NotTo(HaveOccurred())
++					Expect(requeueDuration).To(Equal(10 * time.Second))
++
++					By("VMI should be deleted (drain+delete fallback)")
++					vmi := &kubevirtv1.VirtualMachineInstance{}
++					err = fakeClient.Get(gocontext.Background(), client.ObjectKey{Namespace: virtualMachineInstance.Namespace, Name: virtualMachineInstance.Name}, vmi)
++					Expect(err).To(HaveOccurred())
++					Expect(apierrors.IsNotFound(err)).To(BeTrue())
++				})
++			})
++
++			When("migration timed out (grace period exceeded during migration)", func() {
++				BeforeEach(func() {
++					virtualMachineInstance.Status.MigrationState = &kubevirtv1.VirtualMachineInstanceMigrationState{
++						StartTimestamp: nowTimestamp(),
++					}
++					graceTime := time.Now().UTC().Add(-1 * time.Minute).Format(time.RFC3339)
++					kubevirtMachine.Annotations[v1alpha1.VmiDeletionGraceTime] = graceTime
++				})
++
++				It("Should fall through to drain+delete", func() {
++					node := &corev1.Node{
++						ObjectMeta: metav1.ObjectMeta{
++							Name: kubevirtMachineName,
++						},
++					}
++					Expect(k8sfake.AddToScheme(setupRemoteScheme())).ToNot(HaveOccurred())
++					cl := k8sfake.NewClientset(node)
++					wlCluster.EXPECT().GenerateWorkloadClusterK8sClient(gomock.Any()).Return(cl, nil).Times(1)
++
++					externalMachine, err := defaultTestMachine(machineContext, namespace, fakeClient, fakeVMCommandExecutor, []byte(sshKey))
++					Expect(err).NotTo(HaveOccurred())
++
++					requeueDuration, err := externalMachine.DrainNodeIfNeeded(wlCluster)
++					Expect(err).NotTo(HaveOccurred())
++					Expect(requeueDuration).To(Equal(10 * time.Second))
++
++					By("VMI should be deleted (drain+delete fallback)")
++					vmi := &kubevirtv1.VirtualMachineInstance{}
++					err = fakeClient.Get(gocontext.Background(), client.ObjectKey{Namespace: virtualMachineInstance.Namespace, Name: virtualMachineInstance.Name}, vmi)
++					Expect(err).To(HaveOccurred())
++					Expect(apierrors.IsNotFound(err)).To(BeTrue())
++				})
++			})
++
++			When("migration creation fails", func() {
++				It("Should fall through to drain+delete gracefully", func() {
++					node := &corev1.Node{
++						ObjectMeta: metav1.ObjectMeta{
++							Name: kubevirtMachineName,
++						},
++					}
++					Expect(k8sfake.AddToScheme(setupRemoteScheme())).ToNot(HaveOccurred())
++					cl := k8sfake.NewClientset(node)
++					wlCluster.EXPECT().GenerateWorkloadClusterK8sClient(gomock.Any()).Return(cl, nil).Times(1)
++
++					externalMachine, err := defaultTestMachine(machineContext, namespace, fakeClient, fakeVMCommandExecutor, []byte(sshKey))
++					Expect(err).NotTo(HaveOccurred())
++
++					By("Inject a create failure for migrations")
++					origClient := externalMachine.client
++					externalMachine.client = &migrationFailClient{Client: origClient}
++
++					requeueDuration, err := externalMachine.DrainNodeIfNeeded(wlCluster)
++					Expect(err).NotTo(HaveOccurred())
++					Expect(requeueDuration).To(Equal(10 * time.Second))
++
++					By("VMI should be deleted (drain+delete fallback)")
++					vmi := &kubevirtv1.VirtualMachineInstance{}
++					err = origClient.Get(gocontext.Background(), client.ObjectKey{Namespace: virtualMachineInstance.Namespace, Name: virtualMachineInstance.Name}, vmi)
++					Expect(err).To(HaveOccurred())
++					Expect(apierrors.IsNotFound(err)).To(BeTrue())
++				})
++			})
++		})
++
++		When("VMI was recreated after eviction and guest node is still cordoned", func() {
++			BeforeEach(func() {
++				virtualMachineInstance.Spec.EvictionStrategy = nil
++				virtualMachineInstance.Status.EvacuationNodeName = ""
++				kubevirtMachine.Annotations[v1alpha1.NodeCordonedByCapk] = "true"
++			})
++
++			It("Should uncordon the guest node and remove the annotation", func() {
++				node := &corev1.Node{
++					ObjectMeta: metav1.ObjectMeta{
++						Name: kubevirtMachineName,
++					},
++					Spec: corev1.NodeSpec{
++						Unschedulable: true,
++					},
++				}
++
++				Expect(k8sfake.AddToScheme(setupRemoteScheme())).ToNot(HaveOccurred())
++				cl := k8sfake.NewClientset(node)
++
++				wlCluster.EXPECT().GenerateWorkloadClusterK8sClient(gomock.Any()).Return(cl, nil).Times(1)
++
++				externalMachine, err := defaultTestMachine(machineContext, namespace, fakeClient, fakeVMCommandExecutor, []byte(sshKey))
++				Expect(err).NotTo(HaveOccurred())
++
++				requeueDuration, err := externalMachine.DrainNodeIfNeeded(wlCluster)
++				Expect(err).NotTo(HaveOccurred())
++				Expect(requeueDuration).Should(BeZero())
++
++				By("Guest node should be uncordoned")
++				updatedNode, err := cl.CoreV1().Nodes().Get(gocontext.Background(), kubevirtMachineName, metav1.GetOptions{})
++				Expect(err).ToNot(HaveOccurred())
++				Expect(updatedNode.Spec.Unschedulable).To(BeFalse())
++
++				By("The node-cordoned annotation should be removed")
++				kvMachine := &v1alpha1.KubevirtMachine{}
++				err = fakeClient.Get(gocontext.Background(), client.ObjectKey{Namespace: kubevirtMachine.Namespace, Name: kubevirtMachine.Name}, kvMachine)
++				Expect(err).ToNot(HaveOccurred())
++				Expect(kvMachine.Annotations).ToNot(HaveKey(v1alpha1.NodeCordonedByCapk))
++			})
++		})
++
++		When("VMI was recreated but guest node is already schedulable", func() {
++			BeforeEach(func() {
++				virtualMachineInstance.Spec.EvictionStrategy = nil
++				virtualMachineInstance.Status.EvacuationNodeName = ""
++				kubevirtMachine.Annotations[v1alpha1.NodeCordonedByCapk] = "true"
++			})
++
++			It("Should just remove the stale annotation", func() {
++				node := &corev1.Node{
++					ObjectMeta: metav1.ObjectMeta{
++						Name: kubevirtMachineName,
++					},
++					Spec: corev1.NodeSpec{
++						Unschedulable: false,
++					},
++				}
++
++				Expect(k8sfake.AddToScheme(setupRemoteScheme())).ToNot(HaveOccurred())
++				cl := k8sfake.NewClientset(node)
++
++				wlCluster.EXPECT().GenerateWorkloadClusterK8sClient(gomock.Any()).Return(cl, nil).Times(1)
++
++				externalMachine, err := defaultTestMachine(machineContext, namespace, fakeClient, fakeVMCommandExecutor, []byte(sshKey))
++				Expect(err).NotTo(HaveOccurred())
++
++				requeueDuration, err := externalMachine.DrainNodeIfNeeded(wlCluster)
++				Expect(err).NotTo(HaveOccurred())
++				Expect(requeueDuration).Should(BeZero())
++
++				By("The node-cordoned annotation should be removed")
++				kvMachine := &v1alpha1.KubevirtMachine{}
++				err = fakeClient.Get(gocontext.Background(), client.ObjectKey{Namespace: kubevirtMachine.Namespace, Name: kubevirtMachine.Name}, kvMachine)
++				Expect(err).ToNot(HaveOccurred())
++				Expect(kvMachine.Annotations).ToNot(HaveKey(v1alpha1.NodeCordonedByCapk))
++			})
++		})
++
++		When("No cordon annotation exists and no eviction in progress", func() {
++			BeforeEach(func() {
++				virtualMachineInstance.Spec.EvictionStrategy = nil
++				virtualMachineInstance.Status.EvacuationNodeName = ""
++			})
++
++			It("Should not attempt to uncordon", func() {
++				wlCluster.EXPECT().GenerateWorkloadClusterK8sClient(gomock.Any()).Times(0)
++
++				externalMachine, err := defaultTestMachine(machineContext, namespace, fakeClient, fakeVMCommandExecutor, []byte(sshKey))
++				Expect(err).NotTo(HaveOccurred())
++
++				requeueDuration, err := externalMachine.DrainNodeIfNeeded(wlCluster)
++				Expect(err).NotTo(HaveOccurred())
++				Expect(requeueDuration).Should(BeZero())
++			})
++		})
++
++		When("VMI still has DeletionTimestamp with cordon annotation present", func() {
++			BeforeEach(func() {
++				deletionTimeStamp := metav1.NewTime(time.Now().UTC().Add(-5 * time.Second))
++				virtualMachineInstance.DeletionTimestamp = &deletionTimeStamp
++				virtualMachineInstance.Finalizers = []string{"fake/finalizer"}
++				kubevirtMachine.Annotations[v1alpha1.NodeCordonedByCapk] = "true"
++			})
++
++			It("Should not uncordon while VMI is still being deleted", func() {
++				wlCluster.EXPECT().GenerateWorkloadClusterK8sClient(gomock.Any()).Times(0)
++
++				externalMachine, err := defaultTestMachine(machineContext, namespace, fakeClient, fakeVMCommandExecutor, []byte(sshKey))
++				Expect(err).NotTo(HaveOccurred())
++
++				requeueDuration, err := externalMachine.DrainNodeIfNeeded(wlCluster)
++				Expect(err).NotTo(HaveOccurred())
++				Expect(requeueDuration).Should(BeZero())
++
++				By("The node-cordoned annotation should still be present")
++				kvMachine := &v1alpha1.KubevirtMachine{}
++				err = fakeClient.Get(gocontext.Background(), client.ObjectKey{Namespace: kubevirtMachine.Namespace, Name: kubevirtMachine.Name}, kvMachine)
++				Expect(err).ToNot(HaveOccurred())
++				Expect(kvMachine.Annotations).To(HaveKey(v1alpha1.NodeCordonedByCapk))
++			})
++		})
++
++		When("VMI was recreated and guest node is not found", func() {
++			BeforeEach(func() {
++				virtualMachineInstance.Spec.EvictionStrategy = nil
++				virtualMachineInstance.Status.EvacuationNodeName = ""
++				kubevirtMachine.Annotations[v1alpha1.NodeCordonedByCapk] = "true"
++			})
++
++			It("Should remove the annotation when node is not found", func() {
++				Expect(k8sfake.AddToScheme(setupRemoteScheme())).ToNot(HaveOccurred())
++				cl := k8sfake.NewClientset()
++
++				wlCluster.EXPECT().GenerateWorkloadClusterK8sClient(gomock.Any()).Return(cl, nil).Times(1)
++
++				externalMachine, err := defaultTestMachine(machineContext, namespace, fakeClient, fakeVMCommandExecutor, []byte(sshKey))
++				Expect(err).NotTo(HaveOccurred())
++
++				requeueDuration, err := externalMachine.DrainNodeIfNeeded(wlCluster)
++				Expect(err).NotTo(HaveOccurred())
++				Expect(requeueDuration).Should(BeZero())
++
++				By("The node-cordoned annotation should be removed")
++				kvMachine := &v1alpha1.KubevirtMachine{}
++				err = fakeClient.Get(gocontext.Background(), client.ObjectKey{Namespace: kubevirtMachine.Namespace, Name: kubevirtMachine.Name}, kvMachine)
++				Expect(err).ToNot(HaveOccurred())
++				Expect(kvMachine.Annotations).ToNot(HaveKey(v1alpha1.NodeCordonedByCapk))
++			})
++		})
++
++		When("Cordon annotation present but workload cluster is nil", func() {
++			BeforeEach(func() {
++				virtualMachineInstance.Spec.EvictionStrategy = nil
++				virtualMachineInstance.Status.EvacuationNodeName = ""
++				kubevirtMachine.Annotations[v1alpha1.NodeCordonedByCapk] = "true"
++			})
++
++			It("Should skip uncordon without error and keep annotation", func() {
++				externalMachine, err := defaultTestMachine(machineContext, namespace, fakeClient, fakeVMCommandExecutor, []byte(sshKey))
++				Expect(err).NotTo(HaveOccurred())
++
++				requeueDuration, err := externalMachine.DrainNodeIfNeeded(nil)
++				Expect(err).NotTo(HaveOccurred())
++				Expect(requeueDuration).Should(BeZero())
++
++				By("The node-cordoned annotation should still be present")
++				kvMachine := &v1alpha1.KubevirtMachine{}
++				err = fakeClient.Get(gocontext.Background(), client.ObjectKey{Namespace: kubevirtMachine.Namespace, Name: kubevirtMachine.Name}, kvMachine)
++				Expect(err).ToNot(HaveOccurred())
++				Expect(kvMachine.Annotations).To(HaveKey(v1alpha1.NodeCordonedByCapk))
++			})
++		})
++
++		When("Cordon annotation present but workload cluster client fails", func() {
++			BeforeEach(func() {
++				virtualMachineInstance.Spec.EvictionStrategy = nil
++				virtualMachineInstance.Status.EvacuationNodeName = ""
++				kubevirtMachine.Annotations[v1alpha1.NodeCordonedByCapk] = "true"
++			})
++
++			It("Should requeue with 100ms on client error", func() {
++				fakeErr := errors.New("fake error: can't create workload cluster client")
++				wlCluster.EXPECT().GenerateWorkloadClusterK8sClient(gomock.Any()).Return(nil, fakeErr).Times(1)
++
++				externalMachine, err := defaultTestMachine(machineContext, namespace, fakeClient, fakeVMCommandExecutor, []byte(sshKey))
++				Expect(err).NotTo(HaveOccurred())
++
++				requeueDuration, err := externalMachine.DrainNodeIfNeeded(wlCluster)
++				Expect(err).NotTo(HaveOccurred())
++				Expect(requeueDuration).To(Equal(100 * time.Millisecond))
++
++				By("The node-cordoned annotation should still be present")
++				kvMachine := &v1alpha1.KubevirtMachine{}
++				err = fakeClient.Get(gocontext.Background(), client.ObjectKey{Namespace: kubevirtMachine.Namespace, Name: kubevirtMachine.Name}, kvMachine)
++				Expect(err).ToNot(HaveOccurred())
++				Expect(kvMachine.Annotations).To(HaveKey(v1alpha1.NodeCordonedByCapk))
++			})
++		})
++
++		When("Cordon annotation present but node get fails with non-NotFound error", func() {
++			BeforeEach(func() {
++				virtualMachineInstance.Spec.EvictionStrategy = nil
++				virtualMachineInstance.Status.EvacuationNodeName = ""
++				kubevirtMachine.Annotations[v1alpha1.NodeCordonedByCapk] = "true"
++			})
++
++			It("Should requeue with 100ms on node get error", func() {
++				node := &corev1.Node{
++					ObjectMeta: metav1.ObjectMeta{
++						Name: kubevirtMachineName,
++					},
++				}
++
++				Expect(k8sfake.AddToScheme(setupRemoteScheme())).ToNot(HaveOccurred())
++				cl := k8sfake.NewClientset(node)
++
++				fakeErr := errors.New("fake error: can't get node")
++				cl.PrependReactor("get", "nodes", func(action k8stesting.Action) (handled bool, ret runtime.Object, err error) {
++					return true, nil, fakeErr
++				})
++
++				wlCluster.EXPECT().GenerateWorkloadClusterK8sClient(gomock.Any()).Return(cl, nil).Times(1)
++
++				externalMachine, err := defaultTestMachine(machineContext, namespace, fakeClient, fakeVMCommandExecutor, []byte(sshKey))
++				Expect(err).NotTo(HaveOccurred())
++
++				requeueDuration, err := externalMachine.DrainNodeIfNeeded(wlCluster)
++				Expect(err).NotTo(HaveOccurred())
++				Expect(requeueDuration).To(Equal(100 * time.Millisecond))
++
++				By("The node-cordoned annotation should still be present")
++				kvMachine := &v1alpha1.KubevirtMachine{}
++				err = fakeClient.Get(gocontext.Background(), client.ObjectKey{Namespace: kubevirtMachine.Namespace, Name: kubevirtMachine.Name}, kvMachine)
++				Expect(err).ToNot(HaveOccurred())
++				Expect(kvMachine.Annotations).To(HaveKey(v1alpha1.NodeCordonedByCapk))
++			})
++		})
+ 	})
+ })
+ 
+@@ -1028,3 +1707,40 @@ func setupRemoteScheme() *runtime.Scheme {
+ 	}
+ 	return s
+ }
++
++func nowTimestamp() *metav1.Time {
++	t := metav1.Now()
++	return &t
++}
++
++// migrationFailClient wraps a controller-runtime client and fails Create
++// calls for VirtualMachineInstanceMigration objects.
++type migrationFailClient struct {
++	client.Client
++}
++
++func (c *migrationFailClient) Create(ctx gocontext.Context, obj client.Object, opts ...client.CreateOption) error {
++	if obj.GetObjectKind().GroupVersionKind().Kind == "VirtualMachineInstanceMigration" {
++		return fmt.Errorf("fake error: can't create migration")
++	}
++	return c.Client.Create(ctx, obj, opts...)
++}
++
++type migrationRecordingClient struct {
++	client.Client
++	created *unstructured.Unstructured
++}
++
++func (c *migrationRecordingClient) Create(ctx gocontext.Context, obj client.Object, opts ...client.CreateOption) error {
++	if migration, ok := obj.(*unstructured.Unstructured); ok && migration.GetKind() == "VirtualMachineInstanceMigration" {
++		c.created = migration.DeepCopy()
++	}
++	return c.Client.Create(ctx, obj, opts...)
++}
++
++// fallbackPatchFailClient simulates an API failure before either annotation is committed.
++type fallbackPatchFailClient struct{ client.Client }
++
++func (c *fallbackPatchFailClient) Patch(ctx gocontext.Context, obj client.Object, patch client.Patch, opts ...client.PatchOption) error {
++	return fmt.Errorf("fake error: can't patch fallback state")
++}
diff --git a/packages/system/capi-providers-infraprovider/templates/providers.yaml b/packages/system/capi-providers-infraprovider/templates/providers.yaml
index 3a73e32f8b..e00c076e1d 100644
--- a/packages/system/capi-providers-infraprovider/templates/providers.yaml
+++ b/packages/system/capi-providers-infraprovider/templates/providers.yaml
@@ -12,6 +12,7 @@ spec:
   deployment:
     containers:
     - name: manager
+      imageUrl: {{ .Files.Get "images/cluster-api-provider-kubevirt.tag" | trim | quote }}
       resources:
         limits:
           cpu: 500m
diff --git a/packages/system/capi-providers-ipam-in-cluster/.helmignore b/packages/system/capi-providers-ipam-in-cluster/.helmignore
new file mode 100644
index 0000000000..aba9a295fe
--- /dev/null
+++ b/packages/system/capi-providers-ipam-in-cluster/.helmignore
@@ -0,0 +1 @@
+files/*-components.yaml
diff --git a/packages/system/capi-providers-ipam-in-cluster/Chart.yaml b/packages/system/capi-providers-ipam-in-cluster/Chart.yaml
new file mode 100644
index 0000000000..e10aa623ca
--- /dev/null
+++ b/packages/system/capi-providers-ipam-in-cluster/Chart.yaml
@@ -0,0 +1,3 @@
+apiVersion: v2
+name: cozy-capi-providers-ipam-in-cluster
+version: 0.0.0 # Placeholder, the actual version will be automatically set during the build process
diff --git a/packages/system/capi-providers-ipam-in-cluster/Makefile b/packages/system/capi-providers-ipam-in-cluster/Makefile
new file mode 100644
index 0000000000..14829fd368
--- /dev/null
+++ b/packages/system/capi-providers-ipam-in-cluster/Makefile
@@ -0,0 +1,20 @@
+export NAME=capi-providers-ipam-in-cluster
+export NAMESPACE=cozy-cluster-api
+
+CAIP_VERSION=v1.0.3
+CAIP_URL=https://github.com/kubernetes-sigs/cluster-api-ipam-provider-in-cluster/releases/download/$(CAIP_VERSION)
+# SHA-256 of the two release assets at CAIP_VERSION. A release tag can be moved;
+# these cannot. Bumping the version means recording the new sums here.
+CAIP_SHA256_COMPONENTS=e3247a458e66e1eeca8bda05a6dfaa882dae29785072f41e7cf071ff8c70f695
+CAIP_SHA256_METADATA=dc1ebd036645e0e87e99dab275c312cf8f8f38aa68a12bc01ad2b1dd1d6bf20e
+
+include ../../../hack/package.mk
+
+# See the note in capi-providers-infraprovider-proxmox/Makefile: gzip -n keeps
+# the committed artifact reproducible.
+.PHONY: components
+components:
+	curl -fL -o files/ipam-components.yaml $(CAIP_URL)/ipam-components.yaml
+	curl -fL -o files/metadata.yaml $(CAIP_URL)/metadata.yaml
+	printf '%s  files/ipam-components.yaml\n%s  files/metadata.yaml\n' $(CAIP_SHA256_COMPONENTS) $(CAIP_SHA256_METADATA) | sha256sum -c -
+	gzip -9 -n -c files/ipam-components.yaml > files/components.gz
diff --git a/packages/system/capi-providers-ipam-in-cluster/files/components.gz b/packages/system/capi-providers-ipam-in-cluster/files/components.gz
new file mode 100644
index 0000000000..e72da4a0f6
Binary files /dev/null and b/packages/system/capi-providers-ipam-in-cluster/files/components.gz differ
diff --git a/packages/system/capi-providers-ipam-in-cluster/files/ipam-components.yaml b/packages/system/capi-providers-ipam-in-cluster/files/ipam-components.yaml
new file mode 100644
index 0000000000..099b6c042a
--- /dev/null
+++ b/packages/system/capi-providers-ipam-in-cluster/files/ipam-components.yaml
@@ -0,0 +1,1016 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  labels:
+    cluster.x-k8s.io/provider: ipam-in-cluster
+    control-plane: controller-manager
+  name: capi-ipam-in-cluster-system
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    cert-manager.io/inject-ca-from: capi-ipam-in-cluster-system/capi-ipam-in-cluster-serving-cert
+    controller-gen.kubebuilder.io/version: v0.17.2
+  labels:
+    cluster.x-k8s.io/provider: ipam-in-cluster
+    clusterctl.cluster.x-k8s.io/move-hierarchy: ""
+  name: globalinclusterippools.ipam.cluster.x-k8s.io
+spec:
+  conversion:
+    strategy: Webhook
+    webhook:
+      clientConfig:
+        service:
+          name: capi-ipam-in-cluster-webhook-service
+          namespace: capi-ipam-in-cluster-system
+          path: /convert
+      conversionReviewVersions:
+      - v1
+  group: ipam.cluster.x-k8s.io
+  names:
+    categories:
+    - cluster-api
+    kind: GlobalInClusterIPPool
+    listKind: GlobalInClusterIPPoolList
+    plural: globalinclusterippools
+    singular: globalinclusterippool
+  scope: Cluster
+  versions:
+  - additionalPrinterColumns:
+    - description: Subnet to allocate IPs from
+      jsonPath: .spec.subnet
+      name: Subnet
+      type: string
+    - description: First address of the range to allocate from
+      jsonPath: .spec.first
+      name: First
+      type: string
+    - description: Last address of the range to allocate from
+      jsonPath: .spec.last
+      name: Last
+      type: string
+    - description: Count of IPs configured for the pool
+      jsonPath: .status.ipAddresses.total
+      name: Total
+      type: integer
+    - description: Count of unallocated IPs in the pool
+      jsonPath: .status.ipAddresses.free
+      name: Free
+      type: integer
+    - description: Count of allocated IPs in the pool
+      jsonPath: .status.ipAddresses.used
+      name: Used
+      type: integer
+    deprecated: true
+    name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        description: |-
+          GlobalInClusterIPPool is the Schema for the global inclusterippools API.
+          This pool type is cluster scoped. IPAddressClaims can reference
+          pools of this type from any namespace.
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: InClusterIPPoolSpec defines the desired state of InClusterIPPool.
+            properties:
+              addresses:
+                description: |-
+                  Addresses is a list of IP addresses that can be assigned. This set of
+                  addresses can be non-contiguous. Can be omitted if subnet, or first and
+                  last is set.
+                items:
+                  type: string
+                type: array
+              end:
+                description: |-
+                  Last is the last address that can be assigned.
+                  Must come after first and needs to fit into a common subnet.
+                  If unset, the second last address of subnet will be used.
+                type: string
+              gateway:
+                description: Gateway
+                type: string
+              prefix:
+                description: |-
+                  Prefix is the network prefix to use.
+                  If unset the prefix from the subnet will be used.
+                maximum: 128
+                type: integer
+              start:
+                description: |-
+                  First is the first address that can be assigned.
+                  If unset, the second address of subnet will be used.
+                type: string
+              subnet:
+                description: |-
+                  Subnet is the subnet to assign IP addresses from.
+                  Can be omitted if addresses or first, last and prefix are set.
+                type: string
+            type: object
+          status:
+            description: InClusterIPPoolStatus defines the observed state of InClusterIPPool.
+            properties:
+              ipAddresses:
+                description: Addresses reports the count of total, free, and used
+                  IPs in the pool.
+                properties:
+                  free:
+                    description: |-
+                      Free is the count of unallocated IPs in the pool.
+                      Counts greater than int can contain will report as math.MaxInt.
+                    type: integer
+                  outOfRange:
+                    description: |-
+                      Out of Range is the count of allocated IPs in the pool that is not
+                      contained within spec.Addresses.
+                      Counts greater than int can contain will report as math.MaxInt.
+                    type: integer
+                  total:
+                    description: |-
+                      Total is the total number of IPs configured for the pool.
+                      Counts greater than int can contain will report as math.MaxInt.
+                    type: integer
+                  used:
+                    description: |-
+                      Used is the count of allocated IPs in the pool.
+                      Counts greater than int can contain will report as math.MaxInt.
+                    type: integer
+                required:
+                - free
+                - outOfRange
+                - total
+                - used
+                type: object
+            type: object
+        type: object
+    served: true
+    storage: false
+    subresources:
+      status: {}
+  - additionalPrinterColumns:
+    - description: List of addresses, to allocate from
+      jsonPath: .spec.addresses
+      name: Addresses
+      type: string
+    - description: Count of IPs configured for the pool
+      jsonPath: .status.ipAddresses.total
+      name: Total
+      type: integer
+    - description: Count of unallocated IPs in the pool
+      jsonPath: .status.ipAddresses.free
+      name: Free
+      type: integer
+    - description: Count of allocated IPs in the pool
+      jsonPath: .status.ipAddresses.used
+      name: Used
+      type: integer
+    name: v1alpha2
+    schema:
+      openAPIV3Schema:
+        description: |-
+          GlobalInClusterIPPool is the Schema for the global inclusterippools API.
+          This pool type is cluster scoped. IPAddressClaims can reference
+          pools of this type from any namespace.
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: InClusterIPPoolSpec defines the desired state of InClusterIPPool.
+            properties:
+              addresses:
+                description: |-
+                  Addresses is a list of IP addresses that can be assigned. This set of
+                  addresses can be non-contiguous.
+                items:
+                  type: string
+                type: array
+              allocateReservedIPAddresses:
+                description: |-
+                  AllocateReservedIPAddresses causes the provider to allocate the network
+                  address (the first address in the inferred subnet) and broadcast address
+                  (the last address in the inferred subnet) when IPv4. The provider will
+                  allocate the anycast address (the first address in the inferred
+                  subnet) when IPv6.
+                type: boolean
+              excludedAddresses:
+                description: |-
+                  ExcludedAddresses is a list of IP addresses, which will be excluded from
+                  the set of assignable IP addresses.
+                items:
+                  type: string
+                type: array
+              gateway:
+                description: Gateway
+                type: string
+              prefix:
+                description: Prefix is the network prefix to use.
+                maximum: 128
+                minimum: 0
+                type: integer
+            required:
+            - addresses
+            - prefix
+            type: object
+          status:
+            description: InClusterIPPoolStatus defines the observed state of InClusterIPPool.
+            properties:
+              ipAddresses:
+                description: Addresses reports the count of total, free, and used
+                  IPs in the pool.
+                properties:
+                  free:
+                    description: |-
+                      Free is the count of unallocated IPs in the pool.
+                      Counts greater than int can contain will report as math.MaxInt.
+                    type: integer
+                  outOfRange:
+                    description: |-
+                      Out of Range is the count of allocated IPs in the pool that is not
+                      contained within spec.Addresses.
+                      Counts greater than int can contain will report as math.MaxInt.
+                    type: integer
+                  total:
+                    description: |-
+                      Total is the total number of IPs configured for the pool.
+                      Counts greater than int can contain will report as math.MaxInt.
+                    type: integer
+                  used:
+                    description: |-
+                      Used is the count of allocated IPs in the pool.
+                      Counts greater than int can contain will report as math.MaxInt.
+                    type: integer
+                required:
+                - free
+                - outOfRange
+                - total
+                - used
+                type: object
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    cert-manager.io/inject-ca-from: capi-ipam-in-cluster-system/capi-ipam-in-cluster-serving-cert
+    controller-gen.kubebuilder.io/version: v0.17.2
+  labels:
+    cluster.x-k8s.io/provider: ipam-in-cluster
+    clusterctl.cluster.x-k8s.io/move-hierarchy: ""
+  name: inclusterippools.ipam.cluster.x-k8s.io
+spec:
+  conversion:
+    strategy: Webhook
+    webhook:
+      clientConfig:
+        service:
+          name: capi-ipam-in-cluster-webhook-service
+          namespace: capi-ipam-in-cluster-system
+          path: /convert
+      conversionReviewVersions:
+      - v1
+  group: ipam.cluster.x-k8s.io
+  names:
+    categories:
+    - cluster-api
+    kind: InClusterIPPool
+    listKind: InClusterIPPoolList
+    plural: inclusterippools
+    singular: inclusterippool
+  scope: Namespaced
+  versions:
+  - additionalPrinterColumns:
+    - description: Subnet to allocate IPs from
+      jsonPath: .spec.subnet
+      name: Subnet
+      type: string
+    - description: First address of the range to allocate from
+      jsonPath: .spec.first
+      name: First
+      type: string
+    - description: Last address of the range to allocate from
+      jsonPath: .spec.last
+      name: Last
+      type: string
+    - description: List of addresses, within the subnet, to allocate from
+      jsonPath: .spec.addresses
+      name: Addresses
+      type: string
+    - description: Count of IPs configured for the pool
+      jsonPath: .status.ipAddresses.total
+      name: Total
+      type: integer
+    - description: Count of unallocated IPs in the pool
+      jsonPath: .status.ipAddresses.free
+      name: Free
+      type: integer
+    - description: Count of allocated IPs in the pool
+      jsonPath: .status.ipAddresses.used
+      name: Used
+      type: integer
+    deprecated: true
+    name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        description: InClusterIPPool is the Schema for the inclusterippools API.
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: InClusterIPPoolSpec defines the desired state of InClusterIPPool.
+            properties:
+              addresses:
+                description: |-
+                  Addresses is a list of IP addresses that can be assigned. This set of
+                  addresses can be non-contiguous. Can be omitted if subnet, or first and
+                  last is set.
+                items:
+                  type: string
+                type: array
+              end:
+                description: |-
+                  Last is the last address that can be assigned.
+                  Must come after first and needs to fit into a common subnet.
+                  If unset, the second last address of subnet will be used.
+                type: string
+              gateway:
+                description: Gateway
+                type: string
+              prefix:
+                description: |-
+                  Prefix is the network prefix to use.
+                  If unset the prefix from the subnet will be used.
+                maximum: 128
+                type: integer
+              start:
+                description: |-
+                  First is the first address that can be assigned.
+                  If unset, the second address of subnet will be used.
+                type: string
+              subnet:
+                description: |-
+                  Subnet is the subnet to assign IP addresses from.
+                  Can be omitted if addresses or first, last and prefix are set.
+                type: string
+            type: object
+          status:
+            description: InClusterIPPoolStatus defines the observed state of InClusterIPPool.
+            properties:
+              ipAddresses:
+                description: Addresses reports the count of total, free, and used
+                  IPs in the pool.
+                properties:
+                  free:
+                    description: |-
+                      Free is the count of unallocated IPs in the pool.
+                      Counts greater than int can contain will report as math.MaxInt.
+                    type: integer
+                  outOfRange:
+                    description: |-
+                      Out of Range is the count of allocated IPs in the pool that is not
+                      contained within spec.Addresses.
+                      Counts greater than int can contain will report as math.MaxInt.
+                    type: integer
+                  total:
+                    description: |-
+                      Total is the total number of IPs configured for the pool.
+                      Counts greater than int can contain will report as math.MaxInt.
+                    type: integer
+                  used:
+                    description: |-
+                      Used is the count of allocated IPs in the pool.
+                      Counts greater than int can contain will report as math.MaxInt.
+                    type: integer
+                required:
+                - free
+                - outOfRange
+                - total
+                - used
+                type: object
+            type: object
+        type: object
+    served: true
+    storage: false
+    subresources:
+      status: {}
+  - additionalPrinterColumns:
+    - description: List of addresses, to allocate from
+      jsonPath: .spec.addresses
+      name: Addresses
+      type: string
+    - description: Count of IPs configured for the pool
+      jsonPath: .status.ipAddresses.total
+      name: Total
+      type: integer
+    - description: Count of unallocated IPs in the pool
+      jsonPath: .status.ipAddresses.free
+      name: Free
+      type: integer
+    - description: Count of allocated IPs in the pool
+      jsonPath: .status.ipAddresses.used
+      name: Used
+      type: integer
+    name: v1alpha2
+    schema:
+      openAPIV3Schema:
+        description: InClusterIPPool is the Schema for the inclusterippools API.
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: InClusterIPPoolSpec defines the desired state of InClusterIPPool.
+            properties:
+              addresses:
+                description: |-
+                  Addresses is a list of IP addresses that can be assigned. This set of
+                  addresses can be non-contiguous.
+                items:
+                  type: string
+                type: array
+              allocateReservedIPAddresses:
+                description: |-
+                  AllocateReservedIPAddresses causes the provider to allocate the network
+                  address (the first address in the inferred subnet) and broadcast address
+                  (the last address in the inferred subnet) when IPv4. The provider will
+                  allocate the anycast address (the first address in the inferred
+                  subnet) when IPv6.
+                type: boolean
+              excludedAddresses:
+                description: |-
+                  ExcludedAddresses is a list of IP addresses, which will be excluded from
+                  the set of assignable IP addresses.
+                items:
+                  type: string
+                type: array
+              gateway:
+                description: Gateway
+                type: string
+              prefix:
+                description: Prefix is the network prefix to use.
+                maximum: 128
+                minimum: 0
+                type: integer
+            required:
+            - addresses
+            - prefix
+            type: object
+          status:
+            description: InClusterIPPoolStatus defines the observed state of InClusterIPPool.
+            properties:
+              ipAddresses:
+                description: Addresses reports the count of total, free, and used
+                  IPs in the pool.
+                properties:
+                  free:
+                    description: |-
+                      Free is the count of unallocated IPs in the pool.
+                      Counts greater than int can contain will report as math.MaxInt.
+                    type: integer
+                  outOfRange:
+                    description: |-
+                      Out of Range is the count of allocated IPs in the pool that is not
+                      contained within spec.Addresses.
+                      Counts greater than int can contain will report as math.MaxInt.
+                    type: integer
+                  total:
+                    description: |-
+                      Total is the total number of IPs configured for the pool.
+                      Counts greater than int can contain will report as math.MaxInt.
+                    type: integer
+                  used:
+                    description: |-
+                      Used is the count of allocated IPs in the pool.
+                      Counts greater than int can contain will report as math.MaxInt.
+                    type: integer
+                required:
+                - free
+                - outOfRange
+                - total
+                - used
+                type: object
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  labels:
+    cluster.x-k8s.io/provider: ipam-in-cluster
+  name: capi-ipam-in-cluster-controller-manager
+  namespace: capi-ipam-in-cluster-system
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  labels:
+    cluster.x-k8s.io/provider: ipam-in-cluster
+  name: capi-ipam-in-cluster-leader-election-role
+  namespace: capi-ipam-in-cluster-system
+rules:
+- apiGroups:
+  - ""
+  resources:
+  - configmaps
+  verbs:
+  - get
+  - list
+  - watch
+  - create
+  - update
+  - patch
+  - delete
+- apiGroups:
+  - coordination.k8s.io
+  resources:
+  - leases
+  verbs:
+  - get
+  - list
+  - watch
+  - create
+  - update
+  - patch
+  - delete
+- apiGroups:
+  - ""
+  resources:
+  - events
+  verbs:
+  - create
+  - patch
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  labels:
+    cluster.x-k8s.io/provider: ipam-in-cluster
+  name: capi-ipam-in-cluster-manager-role
+rules:
+- apiGroups:
+  - cluster.x-k8s.io
+  resources:
+  - clusters
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - ipam.cluster.x-k8s.io
+  resources:
+  - globalinclusterippools
+  - inclusterippools
+  - ipaddresses
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - ipam.cluster.x-k8s.io
+  resources:
+  - globalinclusterippools/finalizers
+  - inclusterippools/finalizers
+  - ipaddressclaims/finalizers
+  - ipaddresses/finalizers
+  verbs:
+  - update
+- apiGroups:
+  - ipam.cluster.x-k8s.io
+  resources:
+  - globalinclusterippools/status
+  - inclusterippools/status
+  - ipaddressclaims/status
+  - ipaddresses/status
+  verbs:
+  - get
+  - patch
+  - update
+- apiGroups:
+  - ipam.cluster.x-k8s.io
+  resources:
+  - ipaddressclaims
+  verbs:
+  - get
+  - list
+  - patch
+  - update
+  - watch
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  labels:
+    cluster.x-k8s.io/provider: ipam-in-cluster
+  name: capi-ipam-in-cluster-metrics-reader
+rules:
+- nonResourceURLs:
+  - /metrics
+  verbs:
+  - get
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  labels:
+    cluster.x-k8s.io/provider: ipam-in-cluster
+  name: capi-ipam-in-cluster-proxy-role
+rules:
+- apiGroups:
+  - authentication.k8s.io
+  resources:
+  - tokenreviews
+  verbs:
+  - create
+- apiGroups:
+  - authorization.k8s.io
+  resources:
+  - subjectaccessreviews
+  verbs:
+  - create
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  labels:
+    cluster.x-k8s.io/provider: ipam-in-cluster
+  name: capi-ipam-in-cluster-leader-election-rolebinding
+  namespace: capi-ipam-in-cluster-system
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: capi-ipam-in-cluster-leader-election-role
+subjects:
+- kind: ServiceAccount
+  name: capi-ipam-in-cluster-controller-manager
+  namespace: capi-ipam-in-cluster-system
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  labels:
+    cluster.x-k8s.io/provider: ipam-in-cluster
+  name: capi-ipam-in-cluster-manager-rolebinding
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: capi-ipam-in-cluster-manager-role
+subjects:
+- kind: ServiceAccount
+  name: capi-ipam-in-cluster-controller-manager
+  namespace: capi-ipam-in-cluster-system
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  labels:
+    cluster.x-k8s.io/provider: ipam-in-cluster
+  name: capi-ipam-in-cluster-proxy-rolebinding
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: capi-ipam-in-cluster-proxy-role
+subjects:
+- kind: ServiceAccount
+  name: capi-ipam-in-cluster-controller-manager
+  namespace: capi-ipam-in-cluster-system
+---
+apiVersion: v1
+data:
+  controller_manager_config.yaml: |
+    apiVersion: controller-runtime.sigs.k8s.io/v1alpha1
+    kind: ControllerManagerConfig
+    health:
+      healthProbeBindAddress: :8081
+    metrics:
+      bindAddress: 127.0.0.1:8080
+    webhook:
+      port: 9443
+    leaderElection:
+      leaderElect: true
+      resourceName: 7bb7acb4.ipam.cluster.x-k8s.io
+kind: ConfigMap
+metadata:
+  labels:
+    cluster.x-k8s.io/provider: ipam-in-cluster
+  name: capi-ipam-in-cluster-manager-config
+  namespace: capi-ipam-in-cluster-system
+---
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    cluster.x-k8s.io/provider: ipam-in-cluster
+    control-plane: controller-manager
+  name: capi-ipam-in-cluster-controller-manager-metrics-service
+  namespace: capi-ipam-in-cluster-system
+spec:
+  ports:
+  - name: https
+    port: 8443
+    protocol: TCP
+    targetPort: https
+  selector:
+    cluster.x-k8s.io/provider: ipam-in-cluster
+    control-plane: controller-manager
+---
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    cluster.x-k8s.io/provider: ipam-in-cluster
+  name: capi-ipam-in-cluster-webhook-service
+  namespace: capi-ipam-in-cluster-system
+spec:
+  ports:
+  - port: 443
+    targetPort: webhook-server
+  selector:
+    cluster.x-k8s.io/provider: ipam-in-cluster
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  labels:
+    cluster.x-k8s.io/provider: ipam-in-cluster
+    control-plane: controller-manager
+  name: capi-ipam-in-cluster-controller-manager
+  namespace: capi-ipam-in-cluster-system
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      cluster.x-k8s.io/provider: ipam-in-cluster
+      control-plane: controller-manager
+  template:
+    metadata:
+      annotations:
+        kubectl.kubernetes.io/default-container: manager
+      labels:
+        cluster.x-k8s.io/provider: ipam-in-cluster
+        control-plane: controller-manager
+    spec:
+      containers:
+      - args:
+        - --leader-elect
+        command:
+        - /manager
+        image: registry.k8s.io/capi-ipam-ic/cluster-api-ipam-in-cluster-controller:v1.0.3
+        imagePullPolicy: IfNotPresent
+        livenessProbe:
+          httpGet:
+            path: /healthz
+            port: 8081
+          initialDelaySeconds: 15
+          periodSeconds: 20
+        name: manager
+        ports:
+        - containerPort: 9443
+          name: webhook-server
+          protocol: TCP
+        readinessProbe:
+          httpGet:
+            path: /readyz
+            port: 8081
+          initialDelaySeconds: 5
+          periodSeconds: 10
+        resources:
+          limits:
+            cpu: 500m
+            memory: 128Mi
+          requests:
+            cpu: 10m
+            memory: 64Mi
+        securityContext:
+          allowPrivilegeEscalation: false
+          capabilities:
+            drop:
+            - ALL
+          runAsGroup: 65532
+          runAsUser: 65532
+        volumeMounts:
+        - mountPath: /tmp/k8s-webhook-server/serving-certs
+          name: cert
+          readOnly: true
+      securityContext:
+        runAsNonRoot: true
+        seccompProfile:
+          type: RuntimeDefault
+      serviceAccountName: capi-ipam-in-cluster-controller-manager
+      terminationGracePeriodSeconds: 10
+      volumes:
+      - name: cert
+        secret:
+          secretName: capi-ipam-in-cluster-webhook-service-cert
+---
+apiVersion: cert-manager.io/v1
+kind: Certificate
+metadata:
+  labels:
+    cluster.x-k8s.io/provider: ipam-in-cluster
+  name: capi-ipam-in-cluster-serving-cert
+  namespace: capi-ipam-in-cluster-system
+spec:
+  dnsNames:
+  - capi-ipam-in-cluster-webhook-service.capi-ipam-in-cluster-system.svc
+  - capi-ipam-in-cluster-webhook-service.capi-ipam-in-cluster-system.svc.cluster.local
+  issuerRef:
+    kind: Issuer
+    name: capi-ipam-in-cluster-selfsigned-issuer
+  secretName: capi-ipam-in-cluster-webhook-service-cert
+  subject:
+    organizations:
+    - k8s-sig-cluster-lifecycle
+---
+apiVersion: cert-manager.io/v1
+kind: Issuer
+metadata:
+  labels:
+    cluster.x-k8s.io/provider: ipam-in-cluster
+  name: capi-ipam-in-cluster-selfsigned-issuer
+  namespace: capi-ipam-in-cluster-system
+spec:
+  selfSigned: {}
+---
+apiVersion: admissionregistration.k8s.io/v1
+kind: MutatingWebhookConfiguration
+metadata:
+  annotations:
+    cert-manager.io/inject-ca-from: capi-ipam-in-cluster-system/capi-ipam-in-cluster-serving-cert
+  labels:
+    cluster.x-k8s.io/provider: ipam-in-cluster
+  name: capi-ipam-in-cluster-mutating-webhook-configuration
+webhooks:
+- admissionReviewVersions:
+  - v1
+  - v1beta1
+  clientConfig:
+    service:
+      name: capi-ipam-in-cluster-webhook-service
+      namespace: capi-ipam-in-cluster-system
+      path: /mutate-ipam-cluster-x-k8s-io-v1alpha2-globalinclusterippool
+  failurePolicy: Fail
+  matchPolicy: Equivalent
+  name: default.globalinclusterippool.ipam.cluster.x-k8s.io
+  rules:
+  - apiGroups:
+    - ipam.cluster.x-k8s.io
+    apiVersions:
+    - v1alpha2
+    operations:
+    - CREATE
+    - UPDATE
+    resources:
+    - globalinclusterippools
+  sideEffects: None
+- admissionReviewVersions:
+  - v1
+  - v1beta1
+  clientConfig:
+    service:
+      name: capi-ipam-in-cluster-webhook-service
+      namespace: capi-ipam-in-cluster-system
+      path: /mutate-ipam-cluster-x-k8s-io-v1alpha2-inclusterippool
+  failurePolicy: Fail
+  matchPolicy: Equivalent
+  name: default.inclusterippool.ipam.cluster.x-k8s.io
+  rules:
+  - apiGroups:
+    - ipam.cluster.x-k8s.io
+    apiVersions:
+    - v1alpha2
+    operations:
+    - CREATE
+    - UPDATE
+    resources:
+    - inclusterippools
+  sideEffects: None
+---
+apiVersion: admissionregistration.k8s.io/v1
+kind: ValidatingWebhookConfiguration
+metadata:
+  annotations:
+    cert-manager.io/inject-ca-from: capi-ipam-in-cluster-system/capi-ipam-in-cluster-serving-cert
+  labels:
+    cluster.x-k8s.io/provider: ipam-in-cluster
+  name: capi-ipam-in-cluster-validating-webhook-configuration
+webhooks:
+- admissionReviewVersions:
+  - v1
+  - v1beta1
+  clientConfig:
+    service:
+      name: capi-ipam-in-cluster-webhook-service
+      namespace: capi-ipam-in-cluster-system
+      path: /validate-ipam-cluster-x-k8s-io-v1alpha2-globalinclusterippool
+  failurePolicy: Fail
+  matchPolicy: Equivalent
+  name: validation.globalinclusterippool.ipam.cluster.x-k8s.io
+  rules:
+  - apiGroups:
+    - ipam.cluster.x-k8s.io
+    apiVersions:
+    - v1alpha2
+    operations:
+    - CREATE
+    - UPDATE
+    - DELETE
+    resources:
+    - globalinclusterippools
+  sideEffects: None
+- admissionReviewVersions:
+  - v1
+  - v1beta1
+  clientConfig:
+    service:
+      name: capi-ipam-in-cluster-webhook-service
+      namespace: capi-ipam-in-cluster-system
+      path: /validate-ipam-cluster-x-k8s-io-v1alpha2-inclusterippool
+  failurePolicy: Fail
+  matchPolicy: Equivalent
+  name: validation.inclusterippool.ipam.cluster.x-k8s.io
+  rules:
+  - apiGroups:
+    - ipam.cluster.x-k8s.io
+    apiVersions:
+    - v1alpha2
+    operations:
+    - CREATE
+    - UPDATE
+    - DELETE
+    resources:
+    - inclusterippools
+  sideEffects: None
diff --git a/packages/system/capi-providers-ipam-in-cluster/files/metadata.yaml b/packages/system/capi-providers-ipam-in-cluster/files/metadata.yaml
new file mode 100644
index 0000000000..e782ff8185
--- /dev/null
+++ b/packages/system/capi-providers-ipam-in-cluster/files/metadata.yaml
@@ -0,0 +1,9 @@
+apiVersion: clusterctl.cluster.x-k8s.io/v1alpha3
+kind: Metadata
+releaseSeries:
+  - major: 0
+    minor: 1
+    contract: v1beta1
+  - major: 1
+    minor: 0
+    contract: v1beta1
diff --git a/packages/system/capi-providers-ipam-in-cluster/templates/configmaps.yaml b/packages/system/capi-providers-ipam-in-cluster/templates/configmaps.yaml
new file mode 100644
index 0000000000..baf830c9b5
--- /dev/null
+++ b/packages/system/capi-providers-ipam-in-cluster/templates/configmaps.yaml
@@ -0,0 +1,12 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: v1.0.3-ipam-in-cluster
+  labels:
+    ipamprovider-provider: in-cluster
+  annotations:
+    provider.cluster.x-k8s.io/compressed: "true"
+binaryData:
+  components: {{ .Files.Get "files/components.gz" | b64enc | quote }}
+data:
+  metadata: {{ .Files.Get "files/metadata.yaml" | quote }}
diff --git a/packages/system/capi-providers-ipam-in-cluster/templates/providers.yaml b/packages/system/capi-providers-ipam-in-cluster/templates/providers.yaml
new file mode 100644
index 0000000000..559dd77c6c
--- /dev/null
+++ b/packages/system/capi-providers-ipam-in-cluster/templates/providers.yaml
@@ -0,0 +1,27 @@
+apiVersion: operator.cluster.x-k8s.io/v1alpha2
+kind: IPAMProvider
+metadata:
+  name: in-cluster
+spec:
+  # https://github.com/kubernetes-sigs/cluster-api-ipam-provider-in-cluster
+  #
+  # Who needs this, and why it is not in a KubeVirt install: see the dependsOn
+  # edge in packages/core/platform/sources/capi-provider-infra-proxmox.yaml.
+  #
+  # v1.0.x, not v1.1.0: both serve InClusterIPPool v1alpha2, but the v1.0 series
+  # declares the v1beta1 contract that matches capi-providers-core v1.10.1.
+  version: v1.0.3-ipam-in-cluster
+  fetchConfig:
+    selector:
+      matchLabels:
+        ipamprovider-provider: in-cluster
+  deployment:
+    containers:
+    - name: manager
+      resources:
+        limits:
+          cpu: 500m
+          memory: 256Mi
+        requests:
+          cpu: 10m
+          memory: 64Mi
diff --git a/packages/system/cert-manager-crds/Makefile b/packages/system/cert-manager-crds/Makefile
index 7e7370ac2c..2abb5bd1e1 100644
--- a/packages/system/cert-manager-crds/Makefile
+++ b/packages/system/cert-manager-crds/Makefile
@@ -3,3 +3,6 @@ export NAMESPACE=cozy-cert-manager
 
 include ../../../hack/package.mk
 
+test:
+	helm unittest .
+
diff --git a/packages/system/cert-manager-crds/tests/resource_policy_test.yaml b/packages/system/cert-manager-crds/tests/resource_policy_test.yaml
new file mode 100644
index 0000000000..1cab7d2955
--- /dev/null
+++ b/packages/system/cert-manager-crds/tests/resource_policy_test.yaml
@@ -0,0 +1,24 @@
+# These CRDs carry helm.sh/resource-policy: keep, which is what stops a release
+# uninstall from deleting them and taking every Certificate, Issuer and Order in
+# the cluster with them. This suite pins it.
+#
+# The annotation comes from the upstream template, emitted under
+# `{{- if .Values.crds.keep }}`, and the value that switches it on is ours. The
+# templates themselves are refilled from the vendored upstream chart by
+# packages/system/cert-manager on its own `make update`.
+#
+# The wildcard scope covers a CRD that upstream starts shipping without editing
+# this file. The kind assertion catches a non-CRD document that carries the
+# annotation, which the annotation assertion on its own accepts.
+suite: cert-manager CRDs survive a release uninstall
+templates:
+  - templates/*.yaml
+tests:
+  - it: annotates every CustomResourceDefinition the chart renders
+    asserts:
+      - equal:
+          path: kind
+          value: CustomResourceDefinition
+      - equal:
+          path: metadata.annotations["helm.sh/resource-policy"]
+          value: keep
diff --git a/packages/system/cert-manager-issuers/templates/cluster-issuers.yaml b/packages/system/cert-manager-issuers/templates/cluster-issuers.yaml
index 72ec2874ce..a5ff1bddc1 100644
--- a/packages/system/cert-manager-issuers/templates/cluster-issuers.yaml
+++ b/packages/system/cert-manager-issuers/templates/cluster-issuers.yaml
@@ -2,10 +2,43 @@
 {{- $exposeIngress := (index .Values._cluster "expose-ingress") | default "tenant-root" }}
 {{- $gatewayEnabled := (index .Values._cluster "gateway-enabled") | default "false" }}
 {{- $provider := (index .Values._cluster "dns01-provider") | default "cloudflare" }}
+{{- /*
+  The solver points at the publishing tenant's Gateway, so what decides the
+  pin is the class THAT Gateway runs on: the platform default, since a
+  tenant's own class choice does not ride this channel.
+*/}}
+{{- /* Same handling as the two other readers of this key: unset falls back
+       to the bundled class, whitespace-only refuses. This reader decides
+       whether the solver keeps its sectionName pin, so a blank value
+       resolving quietly here would aim every HTTP-01 challenge in the
+       cluster at the wrong listener shape. */}}
+{{- $rawPublishingClass := (index .Values._cluster "gateway-class-name") | default "" }}
+{{- if and (ne $rawPublishingClass "") (eq (trim $rawPublishingClass) "") }}
+  {{- fail "packages/system/cert-manager-issuers: _cluster.gateway-class-name is only whitespace. The platform writes this from gateway.className; leave that unset for the bundled cilium class rather than blank." }}
+{{- end }}
+{{- $publishingClass := $rawPublishingClass | trim | default "cilium" }}
+{{- $edgeClasses := list }}
+{{- range splitList "," ((index .Values._cluster "gateway-edge-classes") | default "") }}
+  {{- $c := . | trim }}
+  {{- if $c }}
+    {{- $edgeClasses = append $edgeClasses $c }}
+  {{- end }}
+{{- end }}
+{{- $gatewayTLSTermination := ternary "edge" "gateway" (has $publishingClass $edgeClasses) }}
 
 {{- define "cert-manager-issuers.httpSolver" -}}
 {{- $gatewayEnabled := index . "gatewayEnabled" -}}
 {{- $exposeIngress := index . "exposeIngress" -}}
+{{- $gatewayAtEdge := eq (index . "gatewayTLSTermination") "edge" -}}
+{{- /*
+  The sectionName pin below is dropped when the publishing Gateway sits on
+  an edge-terminated class: such a Gateway has no listener named "http" (the
+  TenantGateway controller renders the apex and its wildcards as
+  hostname-pinned HTTP listeners and nothing else), so a pinned challenge
+  route would match no listener and the certificate would never issue.
+  Without the pin the route attaches by hostname, which those listeners
+  serve.
+*/}}
 {{- if eq $gatewayEnabled "true" }}
 http01:
   gatewayHTTPRoute:
@@ -14,7 +47,9 @@ http01:
       kind: Gateway
       name: cozystack
       namespace: {{ $exposeIngress }}
+      {{- if not $gatewayAtEdge }}
       sectionName: http
+      {{- end }}
 {{- else }}
 http01:
   ingress:
@@ -99,7 +134,7 @@ spec:
     - {{- if eq $solver "dns01" }}
         {{- include "cert-manager-issuers.dns01Solver" (dict "provider" $provider "values" .Values) | nindent 8 }}
       {{- else }}
-        {{- include "cert-manager-issuers.httpSolver" (dict "gatewayEnabled" $gatewayEnabled "exposeIngress" $exposeIngress) | nindent 8 }}
+        {{- include "cert-manager-issuers.httpSolver" (dict "gatewayEnabled" $gatewayEnabled "exposeIngress" $exposeIngress "gatewayTLSTermination" $gatewayTLSTermination) | nindent 8 }}
       {{- end }}
 
 ---
@@ -119,7 +154,7 @@ spec:
     - {{- if eq $solver "dns01" }}
         {{- include "cert-manager-issuers.dns01Solver" (dict "provider" $provider "values" .Values) | nindent 8 }}
       {{- else }}
-        {{- include "cert-manager-issuers.httpSolver" (dict "gatewayEnabled" $gatewayEnabled "exposeIngress" $exposeIngress) | nindent 8 }}
+        {{- include "cert-manager-issuers.httpSolver" (dict "gatewayEnabled" $gatewayEnabled "exposeIngress" $exposeIngress "gatewayTLSTermination" $gatewayTLSTermination) | nindent 8 }}
       {{- end }}
 
 ---
diff --git a/packages/system/cert-manager-issuers/tests/solver_test.yaml b/packages/system/cert-manager-issuers/tests/solver_test.yaml
index b7f1c5cac6..953d978bc0 100644
--- a/packages/system/cert-manager-issuers/tests/solver_test.yaml
+++ b/packages/system/cert-manager-issuers/tests/solver_test.yaml
@@ -198,3 +198,64 @@ tests:
     asserts:
       - failedTemplate:
           errorMessage: 'packages/system/cert-manager-issuers: unsupported dns01-provider="linode". Supported values: cloudflare, route53, digitalocean, rfc2136.'
+
+  - it: an edge-terminated publishing class drops the sectionName pin so the challenge attaches by hostname
+    set:
+      _cluster:
+        solver: http01
+        expose-ingress: tenant-root
+        gateway-enabled: "true"
+        gateway-class-name: cloudflare-tunnel
+        gateway-edge-classes: cloudflare-tunnel
+    asserts:
+      - documentIndex: 0
+        equal:
+          path: spec.acme.solvers[0].http01.gatewayHTTPRoute.parentRefs[0].name
+          value: cozystack
+      - documentIndex: 0
+        notExists:
+          path: spec.acme.solvers[0].http01.gatewayHTTPRoute.parentRefs[0].sectionName
+      - documentIndex: 1
+        notExists:
+          path: spec.acme.solvers[0].http01.gatewayHTTPRoute.parentRefs[0].sectionName
+
+  - it: a padded edge-terminated publishing class still drops the pin
+    set:
+      _cluster:
+        solver: http01
+        expose-ingress: tenant-root
+        gateway-enabled: "true"
+        gateway-class-name: "  cloudflare-tunnel  "
+        gateway-edge-classes: cloudflare-tunnel
+    asserts:
+      - documentIndex: 0
+        notExists:
+          path: spec.acme.solvers[0].http01.gatewayHTTPRoute.parentRefs[0].sectionName
+      - documentIndex: 1
+        notExists:
+          path: spec.acme.solvers[0].http01.gatewayHTTPRoute.parentRefs[0].sectionName
+
+  - it: a whitespace-only publishing class is refused rather than resolved
+    set:
+      _cluster:
+        solver: http01
+        expose-ingress: tenant-root
+        gateway-enabled: "true"
+        gateway-class-name: "   "
+    asserts:
+      - failedTemplate:
+          errorMessage: 'packages/system/cert-manager-issuers: _cluster.gateway-class-name is only whitespace. The platform writes this from gateway.className; leave that unset for the bundled cilium class rather than blank.'
+
+  - it: a publishing class that is not edge-terminated keeps the pin
+    set:
+      _cluster:
+        solver: http01
+        expose-ingress: tenant-root
+        gateway-enabled: "true"
+        gateway-class-name: cilium
+        gateway-edge-classes: cloudflare-tunnel
+    asserts:
+      - documentIndex: 0
+        equal:
+          path: spec.acme.solvers[0].http01.gatewayHTTPRoute.parentRefs[0].sectionName
+          value: http
diff --git a/packages/system/cert-manager-issuers/tests/standalone_render_test.yaml b/packages/system/cert-manager-issuers/tests/standalone_render_test.yaml
new file mode 100644
index 0000000000..5db14712b8
--- /dev/null
+++ b/packages/system/cert-manager-issuers/tests/standalone_render_test.yaml
@@ -0,0 +1,20 @@
+suite: cert-manager-issuers renders with no platform values injected
+release:
+  name: cert-manager-issuers
+  namespace: cozy-cert-manager
+
+# The platform injects _cluster through the cozystack-values Secret, so every
+# case that sets it itself renders fine whether or not values.yaml declares
+# the key. This case supplies nothing. Drop the declaration from values.yaml
+# and the render dies on "index of untyped nil" before a single assert runs;
+# the declaration is the only thing keeping the chart renderable outside a
+# cluster. No suite-level `templates:` list here on purpose: it would narrow
+# the render to the listed files and let a later template reintroduce the
+# same breakage unseen.
+
+tests:
+  - it: still renders the cluster issuers when _cluster is absent
+    asserts:
+      - template: templates/cluster-issuers.yaml
+        hasDocuments:
+          count: 3
diff --git a/packages/system/cert-manager-issuers/values.yaml b/packages/system/cert-manager-issuers/values.yaml
index 0b21fc9373..d3fca2c964 100644
--- a/packages/system/cert-manager-issuers/values.yaml
+++ b/packages/system/cert-manager-issuers/values.yaml
@@ -1,2 +1,6 @@
+# Injected by the platform from the cozystack-values Secret. The empty
+# default keeps the chart renderable on its own, outside a cluster.
+_cluster: {}
+
 cert-manager:
   installCRDs: true
diff --git a/packages/system/cert-manager/Makefile b/packages/system/cert-manager/Makefile
index c3ff574b72..a0885bf9aa 100644
--- a/packages/system/cert-manager/Makefile
+++ b/packages/system/cert-manager/Makefile
@@ -3,6 +3,9 @@ export NAMESPACE=cozy-$(NAME)
 
 include ../../../hack/package.mk
 
+test:
+	helm unittest .
+
 update:
 	rm -rf charts
 	helm repo add jetstack https://charts.jetstack.io
diff --git a/packages/system/cert-manager/tests/cainjector_resources_test.yaml b/packages/system/cert-manager/tests/cainjector_resources_test.yaml
new file mode 100644
index 0000000000..5dab84b0d8
--- /dev/null
+++ b/packages/system/cert-manager/tests/cainjector_resources_test.yaml
@@ -0,0 +1,30 @@
+suite: cert-manager cainjector resources
+
+# Pins the cainjector memory sizing that keeps CA injection working on a full
+# cozystack install. cainjector loads all ValidatingWebhookConfigurations,
+# APIServices and CRDs into its informer caches at startup; on a large cluster
+# that working set exceeds the old 128Mi limit, so the single leader-elected
+# cainjector Pod is OOMKilled during cache population and CrashLoops before it
+# ever injects a caBundle. Every webhook then keeps an empty caBundle and
+# admission calls fail with "x509: certificate signed by unknown authority"
+# (failurePolicy: Fail). This guards the override in values.yaml against a
+# blanket resource change or a `make update` silently lowering it again.
+
+templates:
+  - charts/cert-manager/templates/cainjector-deployment.yaml
+
+release:
+  name: cert-manager
+  namespace: cozy-cert-manager
+
+tests:
+  - it: sizes the cainjector memory limit above the OOM floor
+    asserts:
+      - isKind:
+          of: Deployment
+      - equal:
+          path: spec.template.spec.containers[0].resources.limits.memory
+          value: 512Mi
+      - equal:
+          path: spec.template.spec.containers[0].resources.requests.memory
+          value: 128Mi
diff --git a/packages/system/cert-manager/tests/controller_gateway_api_test.yaml b/packages/system/cert-manager/tests/controller_gateway_api_test.yaml
new file mode 100644
index 0000000000..5b142aa629
--- /dev/null
+++ b/packages/system/cert-manager/tests/controller_gateway_api_test.yaml
@@ -0,0 +1,82 @@
+suite: cert-manager controller config wiring
+
+# The host enables the Gateway API solver by passing a ControllerConfiguration
+# through this chart's `config` value from the platform bundle. It is not a
+# default of this package on purpose: the same chart is installed into tenant
+# clusters, where the Gateway API CRDs are an opt-in addon, and a controller
+# started with enableGatewayAPI and no CRDs exits at startup and crashloops.
+#
+# The first two tests pin the chart side of that contract with the exact
+# payload the host passes: a re-vendored chart that stops rendering `config`
+# into the ConfigMap, or stops mounting it and naming it in --config, would
+# turn the host flag into a silent no-op. The third pins the neutral default,
+# which is what keeps tenant clusters without the CRDs alive.
+
+templates:
+  - charts/cert-manager/templates/controller-config.yaml
+  - charts/cert-manager/templates/deployment.yaml
+
+release:
+  name: cert-manager
+  namespace: cozy-cert-manager
+
+tests:
+  - it: renders a ControllerConfiguration passed through config into the controller ConfigMap
+    template: charts/cert-manager/templates/controller-config.yaml
+    set:
+      cert-manager:
+        config:
+          apiVersion: controller.config.cert-manager.io/v1alpha1
+          kind: ControllerConfiguration
+          enableGatewayAPI: true
+    asserts:
+      - isKind:
+          of: ConfigMap
+      - equal:
+          path: metadata.name
+          value: cert-manager
+      - matchRegex:
+          path: data["config.yaml"]
+          pattern: '(?m)^apiVersion: controller\.config\.cert-manager\.io/v1alpha1$'
+      - matchRegex:
+          path: data["config.yaml"]
+          pattern: '(?m)^kind: ControllerConfiguration$'
+      - matchRegex:
+          path: data["config.yaml"]
+          pattern: '(?m)^enableGatewayAPI: true$'
+
+  - it: mounts that ConfigMap into the controller and names it in --config
+    template: charts/cert-manager/templates/deployment.yaml
+    set:
+      cert-manager:
+        config:
+          apiVersion: controller.config.cert-manager.io/v1alpha1
+          kind: ControllerConfiguration
+          enableGatewayAPI: true
+    asserts:
+      - isKind:
+          of: Deployment
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: --config=/var/cert-manager/config/config.yaml
+      - contains:
+          path: spec.template.spec.containers[0].volumeMounts
+          content:
+            name: config
+            mountPath: /var/cert-manager/config
+      - contains:
+          path: spec.template.spec.volumes
+          content:
+            name: config
+            configMap:
+              name: cert-manager
+
+  - it: ships no controller config by default, so the Gateway API solver stays off unless the installer asks
+    asserts:
+      - hasDocuments:
+          count: 0
+        template: charts/cert-manager/templates/controller-config.yaml
+      - notContains:
+          path: spec.template.spec.containers[0].args
+          content: --config=/var/cert-manager/config/config.yaml
+        template: charts/cert-manager/templates/deployment.yaml
diff --git a/packages/system/cert-manager/tests/webhook_secure_port_test.yaml b/packages/system/cert-manager/tests/webhook_secure_port_test.yaml
new file mode 100644
index 0000000000..6546b4bf53
--- /dev/null
+++ b/packages/system/cert-manager/tests/webhook_secure_port_test.yaml
@@ -0,0 +1,64 @@
+suite: cert-manager webhook secure port
+
+# Keeps the webhook off the kubelet's port. The values.yaml override this
+# guards carries the reasoning; it is not repeated here.
+#
+# The first test is the regression guard: it fails if the override is dropped
+# or if `make update` re-vendors a chart that ignores it, and it asserts the
+# listener flag together with the advertised containerPort so the two cannot
+# drift apart. The other two pin preconditions the fix depends on and already
+# hold on their own — that the port lives in the Pod's network namespace
+# rather than the node's, and that the Service reaches it by name, which is
+# what lets a port change roll out without dropping an endpoint.
+#
+# An upstream rename of the key needs no test: the vendored values.schema.json
+# sets additionalProperties: false, so the override would fail helm outright
+# rather than be silently ignored.
+
+templates:
+  - charts/cert-manager/templates/webhook-deployment.yaml
+  - charts/cert-manager/templates/webhook-service.yaml
+
+release:
+  name: cert-manager
+  namespace: cozy-cert-manager
+
+tests:
+  - it: serves the webhook on 10260, not the kubelet's 10250
+    template: charts/cert-manager/templates/webhook-deployment.yaml
+    asserts:
+      - isKind:
+          of: Deployment
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: --secure-port=10260
+      - equal:
+          path: spec.template.spec.containers[0].ports[0]
+          value:
+            name: https
+            protocol: TCP
+            containerPort: 10260
+
+  - it: keeps the webhook off the host network, so the port lives in the Pod netns
+    template: charts/cert-manager/templates/webhook-deployment.yaml
+    asserts:
+      # The template emits the key only when the value is truthy, so absence
+      # is the only shape a disabled hostNetwork can take here. isNullOrEmpty
+      # would not do: it fails on a path that does not exist.
+      - notExists:
+          path: spec.template.spec.hostNetwork
+
+  - it: resolves the Service to the webhook container by name, not by number
+    template: charts/cert-manager/templates/webhook-service.yaml
+    asserts:
+      - isKind:
+          of: Service
+      - equal:
+          path: spec.ports[0].name
+          value: https
+      - equal:
+          path: spec.ports[0].port
+          value: 443
+      - equal:
+          path: spec.ports[0].targetPort
+          value: https
diff --git a/packages/system/cert-manager/values.yaml b/packages/system/cert-manager/values.yaml
index e69de29bb2..48e7884b18 100644
--- a/packages/system/cert-manager/values.yaml
+++ b/packages/system/cert-manager/values.yaml
@@ -0,0 +1,74 @@
+cert-manager:
+  resources:
+    limits:
+      cpu: 500m
+      memory: 512Mi
+    requests:
+      cpu: 50m
+      memory: 128Mi
+  webhook:
+    # Upstream defaults securePort to 10250, the port the kubelet serves on.
+    # That default is chosen for GKE private clusters, where apiservers may
+    # reach nodes only on 443 and 10250; it costs nothing there and is unsafe
+    # here. When a connection to the webhook Service resolves to a node IP
+    # rather than a Pod IP, it reaches the kubelet, which completes the TLS
+    # handshake with its node serving certificate, and the apiserver rejects
+    # every cert-manager admission call cluster-wide with "x509: certificate
+    # is valid for <node>, not cert-manager-webhook.cozy-cert-manager.svc".
+    # The certificate is valid — it is simply the wrong server's — so the
+    # error reads as a cert-manager fault and hides the misroute that caused
+    # it. Serving on a port nothing else answers on turns that same misroute
+    # into a connection refusal, which names the real problem. This does not
+    # prevent the misroute; it removes the collision that makes one
+    # catastrophic and misattributed.
+    #
+    # What has to hold for 10260 to be an improvement is that nothing answers
+    # on it in the node's network namespace, since the misroute lands on a
+    # node IP. Nothing does, in either cluster this chart is installed into.
+    # On management nodes the only host-network workload of the kind that
+    # might is local-ccm, which links none of the cloud-provider framework
+    # that binds 10258 and 10260 by default, and binds no TCP port at all.
+    # No cloud-controller-manager runs on a tenant node either: the kubevirt
+    # one does build on that framework, but it is a pod-networked Deployment
+    # in the management cluster, so whatever it binds stays in a Pod's
+    # namespace. Anything host-network added later to either cluster has to
+    # keep clear of the port.
+    #
+    # Under webhook.hostNetwork the webhook itself would join that namespace,
+    # where the clusterwide policy in packages/system/cilium-networkpolicy
+    # denies 10250 from the world but has no entry for 10260. Enabling
+    # hostNetwork means revisiting that policy.
+    securePort: 10260
+    resources:
+      limits:
+        cpu: 200m
+        memory: 128Mi
+      requests:
+        cpu: 10m
+        memory: 32Mi
+  cainjector:
+    # cainjector loads all ValidatingWebhookConfigurations, APIServices and CRDs
+    # into its informer caches at startup. On a full cozystack install that
+    # working set exceeds 128Mi, so cainjector is OOMKilled during cache
+    # population and CrashLoops before it ever injects a caBundle. Because it
+    # runs as a single leader-elected replica, that stalls CA injection for the
+    # whole cluster: webhook ValidatingWebhookConfigurations keep an empty
+    # caBundle and every admission call fails with
+    # "x509: certificate signed by unknown authority" (failurePolicy: Fail).
+    # Size the limit to the controller's 512Mi and lift the request off the
+    # OOM floor so injection completes deterministically.
+    resources:
+      limits:
+        cpu: 200m
+        memory: 512Mi
+      requests:
+        cpu: 10m
+        memory: 128Mi
+  startupapicheck:
+    resources:
+      limits:
+        cpu: 100m
+        memory: 64Mi
+      requests:
+        cpu: 10m
+        memory: 16Mi
diff --git a/packages/system/cilium-networkpolicy/templates/networkpolicy.yaml b/packages/system/cilium-networkpolicy/templates/networkpolicy.yaml
index ef12d5d88a..8f16d5ad03 100644
--- a/packages/system/cilium-networkpolicy/templates/networkpolicy.yaml
+++ b/packages/system/cilium-networkpolicy/templates/networkpolicy.yaml
@@ -11,6 +11,7 @@ spec:
     - ports:
       - port: "2379"  # etcd
       - port: "2380"  # etcd
+      - port: "2383"  # etcd HTTP endpoints, split off 2379 in Talos v1.14
       - port: "3367"  # linstor
       # metallb speaker memberlist gossip is bound on both TCP and UDP on
       # host-network. Cilium PortProtocol matches all transport protocols
diff --git a/packages/system/cilium-networkpolicy/tests/networkpolicy_test.yaml b/packages/system/cilium-networkpolicy/tests/networkpolicy_test.yaml
index b16f6fa70f..1df5208788 100644
--- a/packages/system/cilium-networkpolicy/tests/networkpolicy_test.yaml
+++ b/packages/system/cilium-networkpolicy/tests/networkpolicy_test.yaml
@@ -75,13 +75,57 @@ tests:
           content:
             port: "9443"
 
+  - it: denies world ingress to the etcd client, peer and HTTP ports
+    # 2383 carries etcd's HTTP endpoints and JSON KV API since Talos v1.14.
+    asserts:
+      - contains:
+          path: spec.ingressDeny[0].toPorts[0].ports
+          content:
+            port: "2379"
+      - contains:
+          path: spec.ingressDeny[0].toPorts[0].ports
+          content:
+            port: "2380"
+      - contains:
+          path: spec.ingressDeny[0].toPorts[0].ports
+          content:
+            port: "2383"
+
   - it: drops the stale frr-mode metrics port now that frrk8s is the default
     # Port 7473 was metallb's legacy FRR-mode metrics endpoint. v0.16 disables
     # FRR mode by default and migrates BGP to frr-k8s; the port is no longer
     # bound by anything cozystack ships, so listing it in the deny rule is
     # misleading.
     asserts:
+      # Anchor the rule before asserting about it. notContains passes whenever
+      # its path resolves to something that lacks the content, and a different
+      # deny rule at [0] qualifies, so reordering spec.ingressDeny would leave
+      # this green while 7473 came back on the rule it names. A deny rule has no
+      # name, so the anchor is its selector, which is what identifies it rather
+      # than one of the ports it happens to list.
+      #
+      # The selector identifies it only while there is one rule to identify: a
+      # second world-scoped deny inserted ahead of this one would satisfy the
+      # selector and shift the real rule to [1], which is the reordering above.
+      # lengthEqual is what makes the selector sufficient.
+      # Both indexes in the path, not just the outer one. A second toPorts entry
+      # on the same rule carries its own ports list, so 7473 could come back
+      # there with the rule count and the selector both still satisfied.
+      - lengthEqual:
+          path: spec.ingressDeny
+          count: 1
+      - lengthEqual:
+          path: spec.ingressDeny[0].toPorts
+          count: 1
+      - contains:
+          path: spec.ingressDeny[0].fromEntities
+          content: world
+      # any: true matches on the port alone. Without it the comparison is a
+      # deep-equal against the whole entry, so 7473 re-added with a protocol
+      # beside it, which is how the neighbouring 7946 entry is written, would
+      # slip past a guard that looks like it forbids the port outright.
       - notContains:
           path: spec.ingressDeny[0].toPorts[0].ports
+          any: true
           content:
             port: "7473"
diff --git a/packages/system/cilium/Makefile b/packages/system/cilium/Makefile
index 722e4d7a74..249c583f3b 100644
--- a/packages/system/cilium/Makefile
+++ b/packages/system/cilium/Makefile
@@ -6,11 +6,25 @@ export NAMESPACE=cozy-$(NAME)
 include ../../../hack/common-envs.mk
 include ../../../hack/package.mk
 
+# hack/helm-unit-tests.sh discovers work by probing for this target, so a
+# package without one is skipped in silence however many suites sit under
+# tests/.
+#
+# Phony because hack/package.mk's .PHONY line deliberately does not carry
+# `test` -- it lists only the targets that file defines, and hack/package-mk-phony.bats
+# pins that -- so a path named `test` next to this Makefile would otherwise make
+# the target up to date and skip the recipe. That matters here beyond tidiness:
+# tests/kube_proxy_replacement_test.yaml is the pin two other packages' deny
+# policies rely on, and a skipped recipe removes it in silence.
+.PHONY: test
+test:
+	helm unittest .
+
 update:
 	rm -rf charts
 	helm repo add cilium https://helm.cilium.io/
 	helm repo update cilium
-	helm pull cilium/cilium --untar --untardir charts --version 1.19
+	helm pull cilium/cilium --untar --untardir charts --version 1.20
 	$(SED_INPLACE) -e '/Used in iptables/d' -e '/SYS_MODULE/d' charts/cilium/values.yaml
 	# Drop the whole k8s<1.30 AppArmor annotations block from the cilium-agent
 	# DaemonSet. Cozystack manages these annotations through cilium.podAnnotations
@@ -21,14 +35,63 @@ update:
 	@! grep -q 'container\.apparmor\.security\.beta\.kubernetes\.io' \
 		charts/cilium/templates/cilium-agent/daemonset.yaml || \
 		{ echo 'ERROR: perl patch did not remove the upstream AppArmor block from cilium-agent/daemonset.yaml (upstream template format may have changed)' >&2; exit 1; }
+	# Both images are pinned by the digest the vendored chart carries for the
+	# upstream image they start from; yq prints "null" for a missing key, which
+	# would otherwise be written into the Dockerfile.
+	version=$$(awk '$$1 == "version:" {print $$2}' charts/cilium/Chart.yaml) && \
+	agent=$$(yq e '.image.digest' charts/cilium/values.yaml) && \
+	operator=$$(yq e '.operator.image.genericDigest' charts/cilium/values.yaml) && \
+	case "$$agent$$operator" in *null*|"") echo "ERROR: charts/cilium/values.yaml lacks .image.digest or .operator.image.genericDigest" >&2; exit 1;; esac && \
+	$(SED_INPLACE) "s/ARG VERSION=.*/ARG VERSION=v$${version}@$${agent}/" images/cilium/Dockerfile && \
+	$(SED_INPLACE) -e "s/ARG VERSION=.*/ARG VERSION=v$${version}/" -e "s/ARG UPSTREAM_DIGEST=.*/ARG UPSTREAM_DIGEST=$${operator}/" images/cilium-operator/Dockerfile
+	# The operator patches are Go and touch several files, so they are checked
+	# against the whole source tree of the new tag, and the operator builder
+	# takes the Go toolchain of upstream's builder image, which compiles the
+	# upstream operator.
+	version=$$(awk '$$1 == "version:" {print $$2}' charts/cilium/Chart.yaml) && \
+	tmpdir=$$(mktemp -d) && \
+	{ curl --fail --silent --show-error --location -o "$$tmpdir/source.tar.gz" \
+		"https://github.com/cilium/cilium/archive/refs/tags/v$${version}.tar.gz" && \
+		mkdir "$$tmpdir/src" && tar -xzf "$$tmpdir/source.tar.gz" --strip-components=1 -C "$$tmpdir/src" || { rm -rf "$$tmpdir"; exit 1; }; } && \
+	source=$$(sha256sum "$$tmpdir/source.tar.gz" | cut -d' ' -f1) && \
+	$(SED_INPLACE) "s/ARG SOURCE_SHA256=.*/ARG SOURCE_SHA256=$${source}/" images/cilium-operator/Dockerfile && \
+	{ git -C "$$tmpdir/src" apply --check $(CURDIR)/images/cilium-operator/patches/*.diff || \
+		{ echo "ERROR: images/cilium-operator/patches/*.diff no longer apply to cilium v$${version}; regenerate them, or drop the ones the new tag already carries" >&2; \
+		rm -rf "$$tmpdir"; exit 1; }; } && \
+	golang=$$(sed -n 's/^ARG GOLANG_IMAGE=//p' "$$tmpdir/src/images/builder/Dockerfile") && \
+	{ [ -n "$$golang" ] || { echo "ERROR: no GOLANG_IMAGE in upstream images/builder/Dockerfile v$${version}" >&2; rm -rf "$$tmpdir"; exit 1; }; } && \
+	$(SED_INPLACE) "s|^FROM --platform=\$$BUILDPLATFORM [^ ]* AS builder$$|FROM --platform=\$$BUILDPLATFORM $${golang} AS builder|" images/cilium-operator/Dockerfile && \
+	{ grep -qF "FROM --platform=\$$BUILDPLATFORM $${golang} AS builder" images/cilium-operator/Dockerfile || \
+		{ echo "ERROR: the builder FROM line in images/cilium-operator/Dockerfile was not re-pinned; its shape no longer matches the update recipe" >&2; rm -rf "$$tmpdir"; exit 1; }; } && \
+	rm -rf "$$tmpdir"
+	# Verify the BPF patches still apply to the new upstream tag, so the bump
+	# author learns about drift immediately instead of at image build.
 	version=$$(awk '$$1 == "version:" {print $$2}' charts/cilium/Chart.yaml) && \
-	$(SED_INPLACE) "s/ARG VERSION=.*/ARG VERSION=v$${version}/" images/cilium/Dockerfile
+	tmpdir=$$(mktemp -d) && \
+	{ curl --fail --silent --show-error --location \
+		"https://raw.githubusercontent.com/cilium/cilium/v$${version}/bpf/bpf_host.c" \
+		-o "$$tmpdir/bpf_host.c" || { rm -rf "$$tmpdir"; exit 1; }; } && \
+	{ patch --dry-run --batch --forward --fuzz=0 -p1 -d "$$tmpdir" \
+		< images/cilium/patches/pass-ipv6-to-stack-when-ipv6-datapath-disabled.diff || \
+		{ echo "ERROR: images/cilium/patches/pass-ipv6-to-stack-when-ipv6-datapath-disabled.diff no longer applies to upstream bpf/bpf_host.c v$${version}; regenerate it for the new cilium version" >&2; \
+		rm -rf "$$tmpdir"; exit 1; }; } && \
+	mkdir -p "$$tmpdir/lib" && \
+	{ curl --fail --silent --show-error --location \
+		"https://raw.githubusercontent.com/cilium/cilium/v$${version}/bpf/lib/nodeport_egress.h" \
+		-o "$$tmpdir/lib/nodeport_egress.h" || { rm -rf "$$tmpdir"; exit 1; }; } && \
+	{ patch --dry-run --batch --forward --fuzz=0 -p1 -d "$$tmpdir" \
+		< images/cilium/patches/skip-snat-conflict-for-local-destinations.diff || \
+		{ echo "ERROR: images/cilium/patches/skip-snat-conflict-for-local-destinations.diff no longer applies to upstream bpf/lib/nodeport_egress.h v$${version}; regenerate it for the new cilium version" >&2; \
+		rm -rf "$$tmpdir"; exit 1; }; } && \
+	rm -rf "$$tmpdir"
 
-image:
+.PHONY: image image-cilium image-operator
+image: image-cilium image-operator
+
+image-cilium:
 	docker buildx build images/cilium \
 		$(call image-tags,cilium,$(CILIUM_TAG)) \
-		--cache-from type=registry,ref=$(REGISTRY)/cilium:latest \
-		--cache-to type=inline \
+		$(call cache-args,cilium) \
 		--metadata-file images/cilium.json \
 		$(BUILDX_ARGS)
 	REPOSITORY="$(REGISTRY)/cilium" \
@@ -38,3 +101,15 @@ image:
 	DIGEST=$$(yq e '."containerimage.digest"' images/cilium.json -o json -r) \
 		yq -i '.cilium.image.digest = strenv(DIGEST)' values.yaml
 	rm -f images/cilium.json
+
+# After image-cilium: both stamp values.yaml with yq -i, and two concurrent
+# writes under `make -j image` can drop one of the stamps.
+image-operator: image-cilium
+	docker buildx build images/cilium-operator \
+		$(call image-tags,cilium-operator,$(CILIUM_TAG)) \
+		$(call cache-args,cilium-operator) \
+		--metadata-file images/cilium-operator.json \
+		$(BUILDX_ARGS)
+	IMAGE="$(REGISTRY)/cilium-operator:$(IMAGE_TAG)@$$(yq e '."containerimage.digest"' images/cilium-operator.json -o json -r)" \
+		yq -i '.cilium.operator.image.override = strenv(IMAGE)' values.yaml
+	rm -f images/cilium-operator.json
diff --git a/packages/system/cilium/charts/cilium/.helmignore b/packages/system/cilium/charts/cilium/.helmignore
index f9dcfa99d4..f5119fc93e 100644
--- a/packages/system/cilium/charts/cilium/.helmignore
+++ b/packages/system/cilium/charts/cilium/.helmignore
@@ -22,3 +22,5 @@
 .idea/
 *.tmproj
 .vscode/
+*.tmpl
+*.gotmpl
diff --git a/packages/system/cilium/charts/cilium/Chart.yaml b/packages/system/cilium/charts/cilium/Chart.yaml
index 5fe2baedc8..1e9398ece8 100644
--- a/packages/system/cilium/charts/cilium/Chart.yaml
+++ b/packages/system/cilium/charts/cilium/Chart.yaml
@@ -74,9 +74,12 @@ annotations:
     be used for pooled IPAM (i.e. the multi-pool IPAM mode).\n- kind: CiliumGatewayClassConfig\n
     \ version: v2alpha1\n  name: ciliumgatewayclassconfigs.cilium.io\n  displayName:
     Cilium Gateway Class Config\n  description: |\n    CiliumGatewayClassConfig defines
-    a configuration for Gateway API GatewayClass.\n"
+    a configuration for Gateway API GatewayClass.\n- kind: CiliumDatapathPlugin\n
+    \ version: v2alpha1\n  name: ciliumdatapathplugins.cilium.io\n  displayName: Cilium
+    Datapath Plugin\n  description: |\n    CiliumDatapathPlugin is a plugin that extends
+    datapath functionality.\n"
 apiVersion: v2
-appVersion: 1.19.3
+appVersion: 1.20.2
 description: eBPF-based Networking, Security, and Observability
 home: https://cilium.io/
 icon: https://cdn.jsdelivr.net/gh/cilium/cilium@main/Documentation/images/logo-solo.svg
@@ -92,4 +95,4 @@ kubeVersion: '>= 1.21.0-0'
 name: cilium
 sources:
 - https://github.com/cilium/cilium
-version: 1.19.3
+version: 1.20.2
diff --git a/packages/system/cilium/charts/cilium/README.md b/packages/system/cilium/charts/cilium/README.md
index d7697c56cb..176771ad8b 100644
--- a/packages/system/cilium/charts/cilium/README.md
+++ b/packages/system/cilium/charts/cilium/README.md
@@ -1,12 +1,12 @@
 # cilium
 
-![Version: 1.19.3](https://img.shields.io/badge/Version-1.19.3-informational?style=flat-square) ![AppVersion: 1.19.3](https://img.shields.io/badge/AppVersion-1.19.3-informational?style=flat-square)
+![Version: 1.20.2](https://img.shields.io/badge/Version-1.20.2-informational?style=flat-square) ![AppVersion: 1.20.2](https://img.shields.io/badge/AppVersion-1.20.2-informational?style=flat-square)
 
 Cilium is open source software for providing and transparently securing
 network connectivity and loadbalancing between application workloads such as
 application containers or processes. Cilium operates at Layer 3/4 to provide
 traditional networking and security services as well as Layer 7 to protect and
-secure use of modern application protocols such as HTTP, gRPC and Kafka.
+secure use of modern application protocols such as HTTP and gRPC.
 
 A new Linux kernel technology called eBPF is at the foundation of Cilium.
 It supports dynamic insertion of eBPF bytecode into the Linux kernel at various
@@ -77,7 +77,7 @@ contributors across the globe, there is almost always someone available to help.
 | authentication.mutual.spire.enabled | bool | `false` | Enable SPIRE integration (beta) |
 | authentication.mutual.spire.install.agent.affinity | object | `{}` | SPIRE agent affinity configuration |
 | authentication.mutual.spire.install.agent.annotations | object | `{}` | SPIRE agent annotations |
-| authentication.mutual.spire.install.agent.image | object | `{"digest":"sha256:5106ac601272a88684db14daf7f54b9a45f31f77bb16a906bd5e87756ee7b97c","override":null,"pullPolicy":"IfNotPresent","repository":"ghcr.io/spiffe/spire-agent","tag":"1.9.6","useDigest":true}` | SPIRE agent image |
+| authentication.mutual.spire.install.agent.image | object | `{"digest":"sha256:41b0dcd8b258a69db9e2768292a060766fb76fd866e4bc925849981ea1b825ff","override":null,"pullPolicy":"IfNotPresent","repository":"ghcr.io/spiffe/spire-agent","tag":"1.15.3","useDigest":true}` | SPIRE agent image |
 | authentication.mutual.spire.install.agent.labels | object | `{}` | SPIRE agent labels |
 | authentication.mutual.spire.install.agent.nodeSelector | object | `{}` | SPIRE agent nodeSelector configuration ref: ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector |
 | authentication.mutual.spire.install.agent.podSecurityContext | object | `{}` | Security context to be added to spire agent pods. SecurityContext holds pod-level security attributes and common container settings. ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod |
@@ -89,7 +89,7 @@ contributors across the globe, there is almost always someone available to help.
 | authentication.mutual.spire.install.agent.tolerations | list | `[{"effect":"NoSchedule","key":"node.kubernetes.io/not-ready"},{"effect":"NoSchedule","key":"node-role.kubernetes.io/master"},{"effect":"NoSchedule","key":"node-role.kubernetes.io/control-plane"},{"effect":"NoSchedule","key":"node.cloudprovider.kubernetes.io/uninitialized","value":"true"},{"key":"CriticalAddonsOnly","operator":"Exists"}]` | SPIRE agent tolerations configuration By default it follows the same tolerations as the agent itself to allow the Cilium agent on this node to connect to SPIRE. ref: https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/ |
 | authentication.mutual.spire.install.enabled | bool | `true` | Enable SPIRE installation. This will only take effect only if authentication.mutual.spire.enabled is true |
 | authentication.mutual.spire.install.existingNamespace | bool | `false` | SPIRE namespace already exists. Set to true if Helm should not create, manage, and import the SPIRE namespace. |
-| authentication.mutual.spire.install.initImage | object | `{"digest":"sha256:1487d0af5f52b4ba31c7e465126ee2123fe3f2305d638e7827681e7cf6c83d5e","override":null,"pullPolicy":"IfNotPresent","repository":"docker.io/library/busybox","tag":"1.37.0","useDigest":true}` | init container image of SPIRE agent and server |
+| authentication.mutual.spire.install.initImage | object | `{"digest":"sha256:dc2d74b28e4cf8984fa52af1f39bc7c3d9c73760b41a74d629f5d11b1ab28616","override":null,"pullPolicy":"IfNotPresent","repository":"docker.io/library/busybox","tag":"1.38.0","useDigest":true}` | init container image of SPIRE agent and server |
 | authentication.mutual.spire.install.namespace | string | `"cilium-spire"` | SPIRE namespace to install into |
 | authentication.mutual.spire.install.server.affinity | object | `{}` | SPIRE server affinity configuration |
 | authentication.mutual.spire.install.server.annotations | object | `{}` | SPIRE server annotations |
@@ -99,7 +99,7 @@ contributors across the globe, there is almost always someone available to help.
 | authentication.mutual.spire.install.server.dataStorage.enabled | bool | `true` | Enable SPIRE server data storage |
 | authentication.mutual.spire.install.server.dataStorage.size | string | `"1Gi"` | Size of the SPIRE server data storage |
 | authentication.mutual.spire.install.server.dataStorage.storageClass | string | `nil` | StorageClass of the SPIRE server data storage |
-| authentication.mutual.spire.install.server.image | object | `{"digest":"sha256:59a0b92b39773515e25e68a46c40d3b931b9c1860bc445a79ceb45a805cab8b4","override":null,"pullPolicy":"IfNotPresent","repository":"ghcr.io/spiffe/spire-server","tag":"1.9.6","useDigest":true}` | SPIRE server image |
+| authentication.mutual.spire.install.server.image | object | `{"digest":"sha256:4082f30d3e0ddc4000a171392c4ea174345ee44d161ee917c70b97b2ecfba141","override":null,"pullPolicy":"IfNotPresent","repository":"ghcr.io/spiffe/spire-server","tag":"1.15.3","useDigest":true}` | SPIRE server image |
 | authentication.mutual.spire.install.server.initContainers | list | `[]` | SPIRE server init containers |
 | authentication.mutual.spire.install.server.labels | object | `{}` | SPIRE server labels |
 | authentication.mutual.spire.install.server.nodeSelector | object | `{}` | SPIRE server nodeSelector configuration ref: ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector |
@@ -140,7 +140,7 @@ contributors across the globe, there is almost always someone available to help.
 | bpf.ctAccounting | bool | `false` | Enable CT accounting for packets and bytes |
 | bpf.ctAnyMax | int | `262144` | Configure the maximum number of entries for the non-TCP connection tracking table. |
 | bpf.ctTcpMax | int | `524288` | Configure the maximum number of entries in the TCP connection tracking table. |
-| bpf.datapathMode | string | `veth` | Mode for Pod devices for the core datapath (veth, netkit, netkit-l2). Note netkit is incompatible with TPROXY (`bpf.tproxy`). |
+| bpf.datapathMode | string | `veth` | Mode for Pod devices for the core datapath (auto, veth, netkit, netkit-l2). Note netkit is incompatible with TPROXY (`bpf.tproxy`). |
 | bpf.disableExternalIPMitigation | bool | `false` | Disable ExternalIP mitigation (CVE-2020-8554) |
 | bpf.distributedLRU | object | `{"enabled":false}` | Control to use a distributed per-CPU backend memory for the core BPF LRU maps which Cilium uses. This improves performance significantly, but it is also recommended to increase BPF map sizing along with that. |
 | bpf.distributedLRU.enabled | bool | `false` | Enable distributed LRU backend memory. For compatibility with existing installations it is off by default. |
@@ -175,11 +175,12 @@ contributors across the globe, there is almost always someone available to help.
 | bpf.tproxy | bool | `false` | Configure the eBPF-based TPROXY (beta) to reduce reliance on iptables rules for implementing Layer 7 policy. Note this is incompatible with netkit (`bpf.datapathMode=netkit`, `bpf.datapathMode=netkit-l2`). |
 | bpf.vlanBypass | list | `[]` | Configure explicitly allowed VLAN id's for bpf logic bypass. [0] will allow all VLAN id's without any filtering. |
 | bpfClockProbe | bool | `false` | Enable BPF clock source probing for more efficient tick retrieval. |
-| certgen | object | `{"affinity":{},"annotations":{"cronJob":{},"job":{}},"cronJob":{"failedJobsHistoryLimit":1,"successfulJobsHistoryLimit":3},"extraVolumeMounts":[],"extraVolumes":[],"generateCA":true,"image":{"digest":"sha256:f0c656830e856d26b24b0e144df1f8b327d3b46748d76a630514111fc365b697","override":null,"pullPolicy":"IfNotPresent","repository":"quay.io/cilium/certgen","tag":"v0.4.1","useDigest":true},"nodeSelector":{},"podLabels":{},"priorityClassName":"","resources":{},"tolerations":[],"ttlSecondsAfterFinished":null}` | Configure certificate generation for Hubble integration. If hubble.tls.auto.method=cronJob, these values are used for the Kubernetes CronJob which will be scheduled regularly to (re)generate any certificates not provided manually. |
+| certgen | object | `{"affinity":{},"annotations":{"cronJob":{},"job":{}},"cronJob":{"failedJobsHistoryLimit":1,"successfulJobsHistoryLimit":3},"enforceCAValidityThroughoutLeavesDuration":true,"extraVolumeMounts":[],"extraVolumes":[],"generateCA":true,"image":{"digest":"sha256:14d29a176fc96d15b154559ce1a5baf01367c10baabfa7bb8028b72f087a56f0","override":null,"pullPolicy":"IfNotPresent","repository":"quay.io/cilium/certgen","tag":"v0.4.11","useDigest":true},"nodeSelector":{},"podLabels":{},"priorityClassName":"","resources":{},"tolerations":[],"ttlSecondsAfterFinished":null}` | Configure certificate generation for Hubble integration. If hubble.tls.auto.method=cronJob, these values are used for the Kubernetes CronJob which will be scheduled regularly to (re)generate any certificates not provided manually. |
 | certgen.affinity | object | `{}` | Affinity for certgen |
 | certgen.annotations | object | `{"cronJob":{},"job":{}}` | Annotations to be added to the hubble-certgen initial Job and CronJob |
 | certgen.cronJob.failedJobsHistoryLimit | int | `1` | The number of failed finished jobs to keep |
 | certgen.cronJob.successfulJobsHistoryLimit | int | `3` | The number of successful finished jobs to keep |
+| certgen.enforceCAValidityThroughoutLeavesDuration | bool | `true` | When set to true, certgen enforces that the certification authority chain remains valid for the entire duration of the leaf certificates to be generated, and fails with a hard error if that is not the case. This allows to flag early situations in which the CA certificates need to be manually regenerated, before they actually expire. |
 | certgen.extraVolumeMounts | list | `[]` | Additional certgen volumeMounts. |
 | certgen.extraVolumes | list | `[]` | Additional certgen volumes. |
 | certgen.generateCA | bool | `true` | When set to true the certificate authority secret is created. |
@@ -209,13 +210,15 @@ contributors across the globe, there is almost always someone available to help.
 | clustermesh.apiserver.etcd.resources | object | `{}` | Specifies the resources for etcd container in the apiserver |
 | clustermesh.apiserver.etcd.securityContext | object | `{"allowPrivilegeEscalation":false,"capabilities":{"drop":["ALL"]}}` | Security context to be added to clustermesh-apiserver etcd containers |
 | clustermesh.apiserver.etcd.storageMedium | string | `"Disk"` | Specifies whether etcd data is stored in a temporary volume backed by the node's default medium, such as disk, SSD or network storage (Disk), or RAM (Memory). The Memory option enables improved etcd read and write performance at the cost of additional memory usage, which counts against the memory limits of the container. |
+| clustermesh.apiserver.etcdQPS | int | `50` | Rate limit for the apiserver container while syncing Kubernetes resources from the local cluster to the local etcd. |
 | clustermesh.apiserver.extraArgs | list | `[]` | Additional clustermesh-apiserver arguments. |
 | clustermesh.apiserver.extraEnv | list | `[]` | Additional clustermesh-apiserver environment variables. |
 | clustermesh.apiserver.extraVolumeMounts | list | `[]` | Additional clustermesh-apiserver volumeMounts. |
 | clustermesh.apiserver.extraVolumes | list | `[]` | Additional clustermesh-apiserver volumes. |
 | clustermesh.apiserver.healthPort | int | `9880` | TCP port for the clustermesh-apiserver health API. |
-| clustermesh.apiserver.image | object | `{"digest":"sha256:a8136a7615d6c6041d3aa6f2674d17beaec238170d669507ccc05328a778e2b7","override":null,"pullPolicy":"IfNotPresent","repository":"quay.io/cilium/clustermesh-apiserver","tag":"v1.19.3","useDigest":true}` | Clustermesh API server image. |
+| clustermesh.apiserver.image | object | `{"digest":"sha256:e9ffc79baf76bb98efb87c01be3bca8da998779f4ccdafc97c74132b307305ce","override":null,"pullPolicy":"IfNotPresent","repository":"quay.io/cilium/clustermesh-apiserver","tag":"v1.20.2","useDigest":true}` | Clustermesh API server image. |
 | clustermesh.apiserver.kvstoremesh.enabled | bool | `true` | Enable KVStoreMesh. KVStoreMesh caches the information retrieved from the remote clusters in the local etcd instance (deprecated - KVStoreMesh will always be enabled once the option is removed). |
+| clustermesh.apiserver.kvstoremesh.etcdQPS | int | `100` | Rate limit for the kvstoremesh container while syncing resources from all remote clusters to the local etcd. |
 | clustermesh.apiserver.kvstoremesh.extraArgs | list | `[]` | Additional KVStoreMesh arguments. |
 | clustermesh.apiserver.kvstoremesh.extraEnv | list | `[]` | Additional KVStoreMesh environment variables. |
 | clustermesh.apiserver.kvstoremesh.extraVolumeMounts | list | `[]` | Additional KVStoreMesh volumeMounts. |
@@ -273,23 +276,16 @@ contributors across the globe, there is almost always someone available to help.
 | clustermesh.apiserver.service.nodePort | int | `32379` | Optional port to use as the node port for apiserver access. |
 | clustermesh.apiserver.service.type | string | `"NodePort"` | The type of service used for apiserver access. |
 | clustermesh.apiserver.terminationGracePeriodSeconds | int | `30` | terminationGracePeriodSeconds for the clustermesh-apiserver deployment |
-| clustermesh.apiserver.tls.admin | object | `{"cert":"","key":""}` | base64 encoded PEM values for the clustermesh-apiserver admin certificate and private key. Used if 'auto' is not enabled. |
-| clustermesh.apiserver.tls.admin.cert | string | `""` | Deprecated, as secrets will always need to be created externally if `auto` is disabled. |
-| clustermesh.apiserver.tls.admin.key | string | `""` | Deprecated, as secrets will always need to be created externally if `auto` is disabled. |
 | clustermesh.apiserver.tls.authMode | string | `"migration"` | Configure the clustermesh authentication mode. Supported values: - legacy:     All clusters access remote clustermesh instances with the same               username (i.e., remote). The "remote" certificate must be               generated with CN=remote if provided manually. - migration:  Intermediate mode required to upgrade from legacy to cluster               (and vice versa) with no disruption. Specifically, it enables               the creation of the per-cluster usernames, while still using               the common one for authentication. The "remote" certificate must               be generated with CN=remote if provided manually (same as legacy). - cluster:    Each cluster accesses remote etcd instances with a username               depending on the local cluster name (i.e., remote-<cluster-name>).               The "remote" certificate must be generated with CN=remote-<cluster-name>               if provided manually. Cluster mode is meaningful only when the same               CA is shared across all clusters part of the mesh. |
-| clustermesh.apiserver.tls.auto | object | `{"certManagerIssuerRef":{},"certValidityDuration":1095,"enabled":true,"method":"helm"}` | Configure automatic TLS certificates generation. A Kubernetes CronJob is used the generate any certificates not provided by the user at installation time. |
+| clustermesh.apiserver.tls.auto | object | `{"certManagerIssuerRef":{},"certValidityDuration":365,"enabled":true,"method":"helm","privateKey":{},"schedule":"0 0 1 */4 *","server":{"extraDnsNames":[],"extraIpAddresses":[]},"subject":{}}` | Configure automatic TLS certificates generation. A Kubernetes CronJob is used the generate any certificates not provided by the user at installation time. |
 | clustermesh.apiserver.tls.auto.certManagerIssuerRef | object | `{}` | certmanager issuer used when clustermesh.apiserver.tls.auto.method=certmanager. |
-| clustermesh.apiserver.tls.auto.certValidityDuration | int | `1095` | Generated certificates validity duration in days. |
+| clustermesh.apiserver.tls.auto.certValidityDuration | int | `365` | Generated certificates validity duration in days. |
 | clustermesh.apiserver.tls.auto.enabled | bool | `true` | When set to true, automatically generate a CA and certificates to enable mTLS between clustermesh-apiserver and external workload instances.  When set to false you need to pre-create the following secrets: - clustermesh-apiserver-server-cert - clustermesh-apiserver-admin-cert - clustermesh-apiserver-remote-cert - clustermesh-apiserver-local-cert The above secret should at least contains the keys `tls.crt` and `tls.key` and optionally `ca.crt` if a CA bundle is not configured. |
-| clustermesh.apiserver.tls.enableSecrets | deprecated | `true` | Allow users to provide their own certificates Users may need to provide their certificates using a mechanism that requires they provide their own secrets. This setting does not apply to any of the auto-generated mechanisms below, it only restricts the creation of secrets via the `tls-provided` templates. This option is deprecated as secrets are expected to be created externally when 'auto' is not enabled. |
-| clustermesh.apiserver.tls.remote | object | `{"cert":"","key":""}` | base64 encoded PEM values for the clustermesh-apiserver remote cluster certificate and private key. Used if 'auto' is not enabled. |
-| clustermesh.apiserver.tls.remote.cert | string | `""` | Deprecated, as secrets will always need to be created externally if `auto` is disabled. |
-| clustermesh.apiserver.tls.remote.key | string | `""` | Deprecated, as secrets will always need to be created externally if `auto` is disabled. |
-| clustermesh.apiserver.tls.server | object | `{"cert":"","extraDnsNames":[],"extraIpAddresses":[],"key":""}` | base64 encoded PEM values for the clustermesh-apiserver server certificate and private key. Used if 'auto' is not enabled. |
-| clustermesh.apiserver.tls.server.cert | string | `""` | Deprecated, as secrets will always need to be created externally if `auto` is disabled. |
-| clustermesh.apiserver.tls.server.extraDnsNames | list | `[]` | Extra DNS names added to certificate when it's auto generated |
-| clustermesh.apiserver.tls.server.extraIpAddresses | list | `[]` | Extra IP addresses added to certificate when it's auto generated |
-| clustermesh.apiserver.tls.server.key | string | `""` | Deprecated, as secrets will always need to be created externally if `auto` is disabled. |
+| clustermesh.apiserver.tls.auto.privateKey | object | `{}` | Private key options. These include the key algorithm and size, the used encoding and the rotation policy used when clustermesh.apiserver.tls.auto.method=certmanager. https://cert-manager.io/docs/reference/api-docs/#cert-manager.io/v1.CertificatePrivateKey |
+| clustermesh.apiserver.tls.auto.schedule | string | `"0 0 1 */4 *"` | Schedule for certificates regeneration (regardless of their expiration date). Only used if method is "cronJob". If nil, then no recurring job will be created. Instead, only the one-shot job is deployed to generate the certificates at installation time.  Due to the out-of-band distribution of client certs to external workloads the CA is (re)regenerated only if it is not provided as a helm value and the k8s secret is manually deleted.  Defaults to midnight of the first day of every fourth month. For syntax, see https://kubernetes.io/docs/concepts/workloads/controllers/cron-jobs/#schedule-syntax |
+| clustermesh.apiserver.tls.auto.server.extraDnsNames | list | `[]` | Extra DNS names added to certificate when it's auto generated |
+| clustermesh.apiserver.tls.auto.server.extraIpAddresses | list | `[]` | Extra IP addresses added to certificate when it's auto generated |
+| clustermesh.apiserver.tls.auto.subject | object | `{}` | X509Subject Full X509 name specification used when clustermesh.apiserver.tls.auto.method=certmanager. https://cert-manager.io/docs/reference/api-docs/#cert-manager.io/v1.X509Subject |
 | clustermesh.apiserver.tolerations | list | `[]` | Node tolerations for pod assignment on nodes with taints ref: https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/ |
 | clustermesh.apiserver.topologySpreadConstraints | list | `[]` | Pod topology spread constraints for clustermesh-apiserver |
 | clustermesh.apiserver.updateStrategy | object | `{"rollingUpdate":{"maxSurge":1,"maxUnavailable":0},"type":"RollingUpdate"}` | clustermesh-apiserver update strategy |
@@ -298,8 +294,8 @@ contributors across the globe, there is almost always someone available to help.
 | clustermesh.config.clusters | list | `[]` | Clusters to be peered in the mesh. @schema type: [object, array] @schema |
 | clustermesh.config.domain | string | `"mesh.cilium.io"` | Default dns domain for the Clustermesh API servers This is used in the case cluster addresses are not provided and IPs are used. |
 | clustermesh.config.enabled | bool | `false` | Enable the Clustermesh explicit configuration. If set to false, you need to provide the following resources yourself: - (Secret) cilium-clustermesh (used by cilium-agent/cilium-operator to connect to   the local etcd instance if KVStoreMesh is enabled or the remote clusters   if KVStoreMesh is disabled) - (Secret) cilium-kvstoremesh (used by KVStoreMesh to connect to the remote clusters) - (ConfigMap) clustermesh-remote-users (used to create one etcd user per remote cluster   if clustermesh-apiserver is used and `clustermesh.apiserver.tls.authMode` is not   set to `legacy`) |
+| clustermesh.defaultGlobalNamespace | bool | `true` | Default behavior of namespaces in Clustermesh.  A "global" namespace means its resources (CiliumEndpoints, CiliumIdentities, and Services) are exported and shared across all connected clusters in the mesh. This enables: - Cross-cluster pod-to-pod connectivity - Cross-cluster network policy enforcement (policies can match labels on pods in remote clusters) - Global services and Multi-Cluster Services (MCS-API)  A "local" namespace means its resources stay within the cluster and are NOT exported to other clusters. Cross-cluster communication and network policies will not work for pods in local namespaces.  If set to true, all namespaces are considered global by default unless explicitly annotated with clustermesh.cilium.io/global=false. If set to false, all namespaces are considered local by default unless explicitly annotated with clustermesh.cilium.io/global=true.  Note: For cross-cluster communication to work, BOTH the source and destination namespaces must be global. Additionally, for a service to be a Global Service, it must both reside in a global namespace AND be annotated with service.cilium.io/global=true. This setting improves scalability by limiting the amount of state synchronized across clusters.  Defaults to true (preserves existing behavior where all namespaces are global). |
 | clustermesh.enableEndpointSliceSynchronization | bool | `false` | Enable the synchronization of Kubernetes EndpointSlices corresponding to the remote endpoints of appropriately-annotated global services through ClusterMesh |
-| clustermesh.enableMCSAPISupport | bool | `false` | Enable Multi-Cluster Services API support (deprecated; use clustermesh.mcsapi.enabled) |
 | clustermesh.maxConnectedClusters | int | `255` | The maximum number of clusters to support in a ClusterMesh. This value cannot be changed on running clusters, and all clusters in a ClusterMesh must be configured with the same value. Values > 255 will decrease the maximum allocatable cluster-local identities. Supported values are 255 and 511. |
 | clustermesh.mcsapi.corednsAutoConfigure.affinity | object | `{}` | Affinity for coredns-mcsapi-autoconfig |
 | clustermesh.mcsapi.corednsAutoConfigure.annotations | object | `{}` | Annotations to be added to the coredns-mcsapi-autoconfig Job |
@@ -354,10 +350,14 @@ contributors across the globe, there is almost always someone available to help.
 | daemon.enableSourceIPVerification | bool | `true` | enableSourceIPVerification is a boolean flag to enable or disable the Source IP verification of endpoints. This flag is useful when Cilium is chained with other CNIs.  By default, this functionality is enabled |
 | daemon.runPath | string | `"/var/run/cilium"` | Configure where Cilium runtime state should be stored. |
 | dashboards | object | `{"annotations":{},"enabled":false,"label":"grafana_dashboard","labelValue":"1","namespace":null}` | Grafana dashboards for cilium-agent grafana can import dashboards based on the label and value ref: https://github.com/grafana/helm-charts/tree/main/charts/grafana#sidecar-for-dashboards |
+| datapathPlugins | object | `{"enabled":false,"stateDir":"/var/run/cilium/plugins"}` | Plugins to inject custom BPF into the datapath. |
+| datapathPlugins.enabled | bool | `false` | Enable datapath plugins. |
+| datapathPlugins.stateDir | string | `"/var/run/cilium/plugins"` | Parent directory for per-plugin state directories. |
 | debug.enabled | bool | `false` | Enable debug logging |
 | debug.metricsSamplingInterval | string | `"5m"` | Set the agent-internal metrics sampling frequency. This sets the frequency of the internal sampling of the agent metrics. These are available via the "cilium-dbg shell -- metrics -s" command and are part of the metrics HTML page included in the sysdump. @schema type: [null, string] @schema |
 | debug.verbose | string | `nil` | Configure verbosity levels for debug logging This option is used to enable debug messages for operations related to such sub-system such as (e.g. kvstore, envoy, datapath, policy, or tagged), and flow is for enabling debug messages emitted per request, message and connection. Multiple values can be set via a space-separated string (e.g. "datapath envoy").  Applicable values: - flow - kvstore - envoy - datapath - policy - tagged |
 | defaultLBServiceIPAM | string | `"lbipam"` | defaultLBServiceIPAM indicates the default LoadBalancer Service IPAM when no LoadBalancer class is set. Applicable values: lbipam, nodeipam, none |
+| devices | string | `""` | Specify which network interfaces can run the eBPF datapath. This means that a packet sent from a pod to a destination outside the cluster will be masqueraded (to an output device IPv4 address), if the output device runs the program. When not specified, probing will automatically detect devices that have a non-local route. This should be used only when auto-detection is not suitable. The devices are a comma-separated list and support '+' as a wildcard, e.g. "net0,eth+" matches "net0" and any device starting with "eth". A device can be excluded with "!", e.g. "net0,eth+,!eth0". |
 | directRoutingSkipUnreachable | bool | `false` | Enable skipping of PodCIDR routes between worker nodes if the worker nodes are in a different L2 network segment. |
 | disableEndpointCRD | bool | `false` | Disable the usage of CiliumEndpoint CRD. |
 | dnsPolicy | string | `""` | DNS policy for Cilium agent pods. Ref: https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/#pod-s-dns-policy |
@@ -368,7 +368,7 @@ contributors across the globe, there is almost always someone available to help.
 | dnsProxy.maxDeferredConnectionDeletes | int | `10000` | Maximum number of IPs to retain for expired DNS lookups with still-active connections. |
 | dnsProxy.minTtl | int | `0` | The minimum time, in seconds, to use DNS data for toFQDNs policies. If the upstream DNS server returns a DNS record with a shorter TTL, Cilium overwrites the TTL with this value. Setting this value to zero means that Cilium will honor the TTLs returned by the upstream DNS server. |
 | dnsProxy.preAllocateIdentities | bool | `true` | Pre-allocate ToFQDN identities. This reduces DNS proxy tail latency, at the potential cost of some unnecessary policymap entries. Disable this if you have a large (200+) number of unique ToFQDN selectors. |
-| dnsProxy.preCache | string | `""` | DNS cache data at this path is preloaded on agent startup. |
+| dnsProxy.preCache | string | `""` | DNS cache data at this path is preloaded on agent startup. (deprecated: will be removed in v1.21) |
 | dnsProxy.proxyPort | int | `0` | Global port on which the in-agent DNS proxy should listen. Default 0 is a OS-assigned port. |
 | dnsProxy.proxyResponseMaxDelay | string | `"100ms"` | The maximum time the DNS proxy holds an allowed DNS response before sending it along. Responses are sent as soon as the datapath is updated with the new IP information. |
 | dnsProxy.socketLingerTimeout | int | `10` | Timeout (in seconds) when closing the connection between the DNS proxy and the upstream server. If set to 0, the connection is closed immediately (with TCP RST). If set to -1, the connection is closed asynchronously in the background. |
@@ -386,7 +386,6 @@ contributors across the globe, there is almost always someone available to help.
 | enableNonDefaultDenyPolicies | bool | `true` | Enable Non-Default-Deny policies |
 | enableXTSocketFallback | bool | `true` | Enables the fallback compatibility solution for when the xt_socket kernel module is missing and it is needed for the datapath L7 redirection to work properly. See documentation for details on when this can be disabled: https://docs.cilium.io/en/stable/operations/system_requirements/#linux-kernel. |
 | encryption.enabled | bool | `false` | Enable transparent network encryption. |
-| encryption.ipsec.encryptedOverlay | bool | `false` | Enable IPsec encrypted overlay |
 | encryption.ipsec.interface | string | `""` | The interface to use for encrypted traffic. |
 | encryption.ipsec.keyFile | string | `"keys"` | Name of the key file inside the Kubernetes secret configured via secretName. |
 | encryption.ipsec.keyRotationDuration | string | `"5m"` | Maximum duration of the IPsec key rotation. The previous key will be removed after that delay. |
@@ -394,25 +393,25 @@ contributors across the globe, there is almost always someone available to help.
 | encryption.ipsec.mountPath | string | `"/etc/ipsec"` | Path to mount the secret inside the Cilium pod. |
 | encryption.ipsec.secretName | string | `"cilium-ipsec-keys"` | Name of the Kubernetes secret containing the encryption keys. |
 | encryption.nodeEncryption | bool | `false` | Enable encryption for pure node to node traffic. This option is only effective when encryption.type is set to "wireguard". |
-| encryption.strictMode | object | `{"allowRemoteNodeIdentities":false,"cidr":"","egress":{"allowRemoteNodeIdentities":false,"cidr":"","enabled":false},"enabled":false,"ingress":{"enabled":false}}` | Configure the Encryption Pod2Pod strict mode. |
-| encryption.strictMode.allowRemoteNodeIdentities | bool | `false` | Allow dynamic lookup of remote node identities. (deprecated: please use encryption.strictMode.egress.allowRemoteNodeIdentities) This is required when tunneling is used or direct routing is used and the node CIDR and pod CIDR overlap. |
-| encryption.strictMode.cidr | string | `""` | CIDR for the Encryption Pod2Pod strict mode. (deprecated: please use encryption.strictMode.egress.cidr) |
+| encryption.strictMode | object | `{"egress":{"allowRemoteNodeIdentities":false,"cidr":"","enabled":false},"ingress":{"enabled":false}}` | Configure the Encryption Pod2Pod strict mode. |
 | encryption.strictMode.egress.allowRemoteNodeIdentities | bool | `false` | Allow dynamic lookup of remote node identities. This is required when tunneling is used or direct routing is used and the node CIDR and pod CIDR overlap. |
 | encryption.strictMode.egress.cidr | string | `""` | CIDR for the Encryption Pod2Pod strict egress mode. |
 | encryption.strictMode.egress.enabled | bool | `false` | Enable strict egress encryption. |
-| encryption.strictMode.enabled | bool | `false` | Enable Encryption Pod2Pod strict mode. (deprecated: please use encryption.strictMode.egress.enabled) |
-| encryption.strictMode.ingress.enabled | bool | `false` | Enable strict ingress encryption. When enabled, all unencrypted overlay ingress traffic will be dropped. This option is only applicable when WireGuard and tunneling are enabled. |
+| encryption.strictMode.ingress.enabled | bool | `false` | Enable strict ingress encryption. When enabled, all unencrypted pod-to-pod ingress traffic will be dropped. This option requires WireGuard encryption. |
 | encryption.type | string | `"ipsec"` | Encryption method. Can be one of ipsec, wireguard or ztunnel. |
 | encryption.wireguard.persistentKeepalive | string | `"0s"` | Controls WireGuard PersistentKeepalive option. Set 0s to disable. |
-| encryption.ztunnel | object | `{"affinity":{},"annotations":{},"caAddress":"https://localhost:15012","extraEnv":[],"extraVolumeMounts":[],"extraVolumes":[],"healthPort":15021,"image":{"digest":null,"override":null,"pullPolicy":"IfNotPresent","repository":"docker.io/istio/ztunnel","tag":"1.28.0-distroless","useDigest":false},"nodeSelector":{"kubernetes.io/os":"linux"},"podAnnotations":{},"podLabels":{},"priorityClassName":null,"readinessProbe":{"failureThreshold":3,"initialDelaySeconds":0,"periodSeconds":10},"resources":{"requests":{"cpu":"200m","memory":"512Mi"}},"secrets":{"bootstrapRootCert":null},"terminationGracePeriodSeconds":30,"tolerations":[{"effect":"NoSchedule","operator":"Exists"},{"key":"CriticalAddonsOnly","operator":"Exists"},{"effect":"NoExecute","operator":"Exists"}],"updateStrategy":{"rollingUpdate":{"maxSurge":1,"maxUnavailable":0},"type":"RollingUpdate"}}` | ztunnel encryption configuration. ztunnel is Istio's purpose-built, per-node proxy for handling L4 traffic in ambient mesh mode. These settings only apply when encryption.type is set to "ztunnel". |
+| encryption.ztunnel | object | `{"affinity":{},"annotations":{},"ca":{"type":"internal"},"caAddress":"https://localhost:15012","extraEnv":[],"extraVolumeMounts":[],"extraVolumes":[],"healthPort":15021,"image":{"digest":"sha256:884de5adde400e39f58e36c7a729f7690466ca4a8eb4c2a8daa9c1c025115b24","override":null,"pullPolicy":"IfNotPresent","repository":"quay.io/cilium/ztunnel","tag":"v1.0.0","useDigest":true},"minReadySeconds":0,"nodeSelector":{"kubernetes.io/os":"linux"},"podAnnotations":{},"podLabels":{},"priorityClassName":null,"readinessProbe":{"failureThreshold":3,"initialDelaySeconds":0,"periodSeconds":10},"resources":{"requests":{"cpu":"200m","memory":"512Mi"}},"secrets":{"bootstrapRootCert":null},"terminationGracePeriodSeconds":30,"tolerations":[{"effect":"NoSchedule","operator":"Exists"},{"key":"CriticalAddonsOnly","operator":"Exists"},{"effect":"NoExecute","operator":"Exists"}],"updateStrategy":{"rollingUpdate":{"maxSurge":1,"maxUnavailable":0},"type":"RollingUpdate"}}` | ztunnel encryption configuration. ztunnel is Istio's purpose-built, per-node proxy for handling L4 traffic in ambient mesh mode. These settings only apply when encryption.type is set to "ztunnel". |
 | encryption.ztunnel.affinity | object | `{}` | Affinity for ztunnel pods. |
 | encryption.ztunnel.annotations | object | `{}` | Annotations to be added to all ztunnel resources. |
+| encryption.ztunnel.ca | object | `{"type":"internal"}` | CA backend used by ztunnel to issue workload identities. |
+| encryption.ztunnel.ca.type | string | `"internal"` | Type of CA. "spire" uses an external SPIRE server (the operator then manages SPIRE entries for enrolled namespaces). "internal" uses Cilium's built-in CA and skips the SPIRE enrollment reconciler. |
 | encryption.ztunnel.caAddress | string | `"https://localhost:15012"` | CA server address for certificate requests. |
 | encryption.ztunnel.extraEnv | list | `[]` | Additional ztunnel container environment variables. |
 | encryption.ztunnel.extraVolumeMounts | list | `[]` | Additional ztunnel volumeMounts. |
 | encryption.ztunnel.extraVolumes | list | `[]` | Additional ztunnel volumes. |
 | encryption.ztunnel.healthPort | int | `15021` | TCP port for the health API. |
-| encryption.ztunnel.image | object | `{"digest":null,"override":null,"pullPolicy":"IfNotPresent","repository":"docker.io/istio/ztunnel","tag":"1.28.0-distroless","useDigest":false}` | ztunnel container image. |
+| encryption.ztunnel.image | object | `{"digest":"sha256:884de5adde400e39f58e36c7a729f7690466ca4a8eb4c2a8daa9c1c025115b24","override":null,"pullPolicy":"IfNotPresent","repository":"quay.io/cilium/ztunnel","tag":"v1.0.0","useDigest":true}` | ztunnel container image. |
+| encryption.ztunnel.minReadySeconds | int | `0` | Minimum number of seconds for which a newly created ztunnel pod should be ready before it is considered available. |
 | encryption.ztunnel.nodeSelector | object | `{"kubernetes.io/os":"linux"}` | Node selector for ztunnel pods. |
 | encryption.ztunnel.podAnnotations | object | `{}` | Annotations to be added to ztunnel pods. |
 | encryption.ztunnel.podLabels | object | `{}` | Labels to be added to ztunnel pods. |
@@ -426,7 +425,7 @@ contributors across the globe, there is almost always someone available to help.
 | encryption.ztunnel.updateStrategy | object | `{"rollingUpdate":{"maxSurge":1,"maxUnavailable":0},"type":"RollingUpdate"}` | ztunnel update strategy. |
 | endpointHealthChecking.enabled | bool | `true` | Enable connectivity health checking between virtual endpoints. |
 | endpointLockdownOnMapOverflow | bool | `false` | Enable endpoint lockdown on policy map overflow. |
-| endpointPolicyUpdateTimeoutDuration | string | `nil` | Max duration to wait for envoy to respond to configuration changes. Default "10s". |
+| endpointPolicyUpdateTimeoutDuration | string | `""` | Max duration to wait for envoy to respond to configuration changes. Default "10s". |
 | endpointRoutes.enabled | bool | `false` | Enable use of per endpoint routes instead of routing via the cilium_host interface. |
 | eni.awsEnablePrefixDelegation | bool | `false` | Enable ENI prefix delegation |
 | eni.awsReleaseExcessIPs | bool | `false` | Release IPs not used from the ENI |
@@ -454,6 +453,7 @@ contributors across the globe, there is almost always someone available to help.
 | envoy.baseID | int | `0` |  Set Envoy'--base-id' to use when allocating shared memory regions. Only needs to be changed if multiple Envoy instances will run on the same node and may have conflicts. Supported values: 0 - 4294967295. Defaults to '0' |
 | envoy.bootstrapConfigMap | string | `nil` | ADVANCED OPTION: Bring your own custom Envoy bootstrap ConfigMap. Provide the name of a ConfigMap with a `bootstrap-config.json` key. When specified, Envoy will use this ConfigMap instead of the default provided by the chart. WARNING: Use of this setting has the potential to prevent cilium-envoy from starting up, and can cause unexpected behavior (e.g. due to syntax error or semantically incorrect configuration). Before submitting an issue, please ensure you have disabled this feature, as support cannot be provided for custom Envoy bootstrap configs. @schema type: [null, string] @schema |
 | envoy.clusterMaxConnections | int | `1024` | Maximum number of connections on Envoy clusters |
+| envoy.clusterMaxPendingRequests | int | `1024` | Maximum number of pending requests on Envoy clusters |
 | envoy.clusterMaxRequests | int | `1024` | Maximum number of requests on Envoy clusters |
 | envoy.connectTimeoutSeconds | int | `2` | Time in seconds after which a TCP connection attempt times out |
 | envoy.debug.admin.enabled | bool | `false` | Enable admin interface for cilium-envoy. This is useful for debugging and should not be enabled in production. |
@@ -470,13 +470,16 @@ contributors across the globe, there is almost always someone available to help.
 | envoy.httpRetryCount | int | `3` | Maximum number of retries for each HTTP request |
 | envoy.httpUpstreamLingerTimeout | string | `nil` | Time in seconds to block Envoy worker thread while an upstream HTTP connection is closing. If set to 0, the connection is closed immediately (with TCP RST). If set to -1, the connection is closed asynchronously in the background. |
 | envoy.idleTimeoutDurationSeconds | int | `60` | Set Envoy upstream HTTP idle connection timeout seconds. Does not apply to connections with pending requests. Default 60s |
-| envoy.image | object | `{"digest":"sha256:ba0ab8adac082d50d525fd2c5ba096c8facea3a471561b7c61c7a5b9c2e0de0d","override":null,"pullPolicy":"IfNotPresent","repository":"quay.io/cilium/cilium-envoy","tag":"v1.36.6-1776000132-2437d2edeaf4d9b56ef279bd0d71127440c067aa","useDigest":true}` | Envoy container image. |
+| envoy.image | object | `{"digest":"sha256:af7382699576b9e65e9184efa52eeca0b58aea70ad6e511bf260c91d9f740463","override":null,"pullPolicy":"IfNotPresent","repository":"quay.io/cilium/cilium-envoy","tag":"v1.37.6-1789133542-cbec91f666af0bf742da986d43832932dbb26b82","useDigest":true}` | Envoy container image. |
 | envoy.initContainers | list | `[]` | Init containers added to the cilium Envoy DaemonSet. |
 | envoy.initialFetchTimeoutSeconds | int | `30` | Time in seconds after which the initial fetch on an xDS stream is considered timed out |
 | envoy.livenessProbe.enabled | bool | `true` | Enable liveness probe for cilium-envoy |
 | envoy.livenessProbe.failureThreshold | int | `10` | failure threshold of liveness probe |
+| envoy.livenessProbe.initialDelaySeconds | int | `0` | Initial delay before the liveness probe begins |
 | envoy.livenessProbe.periodSeconds | int | `30` | interval between checks of the liveness probe |
+| envoy.livenessProbe.timeoutSeconds | int | `5` | Timeout for the liveness probe |
 | envoy.log.accessLogBufferSize | int | `4096` | Size of the Envoy access log buffer created within the agent in bytes. Tune this value up if you encounter "Envoy: Discarded truncated access log message" errors. Large request/response header sizes (e.g. 16KiB) will require a larger buffer size. |
+| envoy.log.accessLogEnabled | bool | `true` | Enable access log forwarding for integration with Hubble. |
 | envoy.log.defaultLevel | string | Defaults to the default log level of the Cilium Agent - `info` | Default log level of Envoy application log that is configured if Cilium debug / verbose logging isn't enabled. This option allows to have a different log level than the Cilium Agent - e.g. lower it to `critical`. Possible values: trace, debug, info, warning, error, critical, off |
 | envoy.log.format | string | `"[%Y-%m-%d %T.%e][%t][%l][%n] [%g:%#] %v"` | The format string to use for laying out the log message metadata of Envoy. If specified, Envoy will use text format output. This setting is mutually exclusive with envoy.log.format_json. |
 | envoy.log.format_json | string | `nil` | The JSON logging format to use for Envoy. This setting is mutually exclusive with envoy.log.format. ref: https://www.envoyproxy.io/docs/envoy/latest/api-v3/config/bootstrap/v3/bootstrap.proto#envoy-v3-api-field-config-bootstrap-v3-bootstrap-applicationlogconfig-logformat-json-format |
@@ -485,6 +488,8 @@ contributors across the globe, there is almost always someone available to help.
 | envoy.maxConnectionDurationSeconds | int | `0` | Set Envoy HTTP option max_connection_duration seconds. Default 0 (disable) |
 | envoy.maxGlobalDownstreamConnections | int | `50000` | Maximum number of global downstream connections |
 | envoy.maxRequestsPerConnection | int | `0` | ProxyMaxRequestsPerConnection specifies the max_requests_per_connection setting for Envoy |
+| envoy.minReadySeconds | int | `0` | Minimum number of seconds for which a newly created envoy pod should be ready before it is considered available. |
+| envoy.nodeLocality.enabled | bool | `false` | Enable node-locality support for cilium-envoy. When enabled, Cilium looks up the node zone from the topology label and passes it to the Envoy process via `--service-zone`. Startup fails if the zone cannot be resolved or the label is empty. |
 | envoy.nodeSelector | object | `{"kubernetes.io/os":"linux"}` | Node selector for cilium-envoy. |
 | envoy.podAnnotations | object | `{}` | Annotations to be added to envoy pods |
 | envoy.podLabels | object | `{}` | Labels to be added to envoy pods |
@@ -503,21 +508,26 @@ contributors across the globe, there is almost always someone available to help.
 | envoy.prometheus.serviceMonitor.relabelings | list | `[{"action":"replace","replacement":"${1}","sourceLabels":["__meta_kubernetes_pod_node_name"],"targetLabel":"node"}]` | Relabeling configs for the ServiceMonitor cilium-envoy or for cilium-agent with Envoy configured. |
 | envoy.prometheus.serviceMonitor.scrapeTimeout | string | `nil` | Timeout after which scrape is considered to be failed. |
 | envoy.readinessProbe.failureThreshold | int | `3` | failure threshold of readiness probe |
+| envoy.readinessProbe.initialDelaySeconds | int | `0` | Initial delay before the readiness probe begins |
 | envoy.readinessProbe.periodSeconds | int | `30` | interval between checks of the readiness probe |
+| envoy.readinessProbe.timeoutSeconds | int | `5` | Timeout for the readiness probe |
 | envoy.resources | object | `{}` | Envoy resource limits & requests ref: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ |
 | envoy.rollOutPods | bool | `false` | Roll out cilium envoy pods automatically when configmap is updated. |
-| envoy.securityContext.capabilities.envoy | list | `["NET_ADMIN","SYS_ADMIN"]` | Capabilities for the `cilium-envoy` container. Even though granted to the container, the cilium-envoy-starter wrapper drops all capabilities after forking the actual Envoy process. `NET_BIND_SERVICE` is the only capability that can be passed to the Envoy process by setting `envoy.securityContext.capabilities.keepNetBindService=true` (in addition to granting the capability to the container). Note: In case of embedded envoy, the capability must  be granted to the cilium-agent container. |
+| envoy.securityContext.capabilities.envoy | list | `["NET_ADMIN","SYS_ADMIN"]` | Capabilities for the `cilium-envoy` container. Even though granted to the container, the cilium-envoy-starter wrapper drops all capabilities after forking the actual Envoy process. `NET_BIND_SERVICE` is the only capability that can be passed to the Envoy process by setting `envoy.securityContext.capabilities.keepCapNetBindService=true` (in addition to granting the capability to the container). Note: In case of embedded envoy, the capability must  be granted to the cilium-agent container. |
 | envoy.securityContext.capabilities.keepCapNetBindService | bool | `false` | Keep capability `NET_BIND_SERVICE` for Envoy process. |
 | envoy.securityContext.privileged | bool | `false` | Run the pod with elevated privileges |
 | envoy.securityContext.seLinuxOptions | object | `{"level":"s0","type":"spc_t"}` | SELinux options for the `cilium-envoy` container |
 | envoy.startupProbe.enabled | bool | `true` | Enable startup probe for cilium-envoy |
 | envoy.startupProbe.failureThreshold | int | `105` | failure threshold of startup probe. 105 x 2s translates to the old behaviour of the readiness probe (120s delay + 30 x 3s) |
+| envoy.startupProbe.initialDelaySeconds | int | `5` | Initial delay before the startup probe begins |
 | envoy.startupProbe.periodSeconds | int | `2` | interval between checks of the startup probe |
+| envoy.startupProbe.timeoutSeconds | int | `5` | Timeout for the startup probe |
 | envoy.streamIdleTimeoutDurationSeconds | int | `300` | Set Envoy the amount of time that the connection manager will allow a stream to exist with no upstream or downstream activity. default 5 minutes |
 | envoy.terminationGracePeriodSeconds | int | `1` | Configure termination grace period for cilium-envoy DaemonSet. |
 | envoy.tolerations | list | `[{"operator":"Exists"}]` | Node tolerations for envoy scheduling to nodes with taints ref: https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/ |
 | envoy.updateStrategy | object | `{"rollingUpdate":{"maxUnavailable":2},"type":"RollingUpdate"}` | cilium-envoy update strategy ref: https://kubernetes.io/docs/concepts/workloads/controllers/daemonset/#updating-a-daemonset |
 | envoy.useOriginalSourceAddress | bool | `true` | For cases when CiliumEnvoyConfig is not used directly (Ingress, Gateway), configures Cilium BPF Metadata listener filter to use the original source address when extracting the metadata for a request. |
+| envoy.xdsMode | string | `ads` for new 1.20+ installations; none when `upgradeCompatibility` is set below `1.20` | xDS server operating mode for Envoy proxy configuration. Supported values are: "split" for the existing per-resource-type xDS, "ads" for the ADS (Aggregated Discovery Service) xDS, and "strict-ads" for ADS with strict snapshot cache behavior and generated snapshot consistency checks. Null value omits setting this option. Cilium Agent defaults missing option to "split" to keep upgrades in the legacy mode. |
 | envoy.xffNumTrustedHopsL7PolicyEgress | int | `0` | Number of trusted hops regarding the x-forwarded-for and related HTTP headers for the egress L7 policy enforcement Envoy listeners. |
 | envoy.xffNumTrustedHopsL7PolicyIngress | int | `0` | Number of trusted hops regarding the x-forwarded-for and related HTTP headers for the ingress L7 policy enforcement Envoy listeners. |
 | envoyConfig.enabled | bool | `false` | Enable CiliumEnvoyConfig CRD CiliumEnvoyConfig CRD can also be implicitly enabled by other options. |
@@ -549,6 +559,7 @@ contributors across the globe, there is almost always someone available to help.
 | gatewayAPI.secretsNamespace.create | bool | `true` | Create secrets namespace for Gateway API. |
 | gatewayAPI.secretsNamespace.name | string | `"cilium-secrets"` | Name of Gateway API secret namespace. |
 | gatewayAPI.secretsNamespace.sync | bool | `true` | Enable secret sync, which will make sure all TLS secrets used by Ingress are synced to secretsNamespace.name. If disabled, TLS secrets must be maintained externally. |
+| gatewayAPI.useRemoteAddress | bool | `true` | Configure whether to use the remote address of the client when determining the source IP. When enabled, the source IP is determined from the remote address instead of the proxy protocol header. |
 | gatewayAPI.xffNumTrustedHops | int | `0` | The number of additional GatewayAPI proxy hops from the right side of the HTTP header to trust when determining the origin client's IP address. |
 | gke.enabled | bool | `false` | Enable Google Kubernetes Engine integration |
 | healthCheckICMPFailureThreshold | int | `3` | Number of ICMP requests sent for each health check before marking a node or endpoint unreachable. |
@@ -571,6 +582,7 @@ contributors across the globe, there is almost always someone available to help.
 | hubble.export.static.fileCompress | bool | `false` | - Enable compression of rotated files. |
 | hubble.export.static.fileMaxBackups | int | `5` | - Defines max number of backup/rotated files. |
 | hubble.export.static.fileMaxSizeMb | int | `10` | - Defines max file size of output file before it gets rotated. |
+| hubble.hostUsers | bool | `nil` | Enable hostUsers for Hubble. This will allow use of user-namespaces for hubble components. Not all clusters support user-namespaces. See: https://kubernetes.io/docs/concepts/workloads/pods/user-namespaces/ |
 | hubble.listenAddress | string | `":4244"` | An additional address for Hubble to listen to. Set this field ":4244" if you are enabling Hubble Relay, as it assumes that Hubble is listening on port 4244. |
 | hubble.metrics | object | `{"dashboards":{"annotations":{},"enabled":false,"label":"grafana_dashboard","labelValue":"1","namespace":null},"dynamic":{"config":{"configMapName":"cilium-dynamic-metrics-config","content":[],"createConfigMap":true},"enabled":false},"enableOpenMetrics":false,"enabled":null,"port":9965,"serviceAnnotations":{},"serviceMonitor":{"annotations":{},"enabled":false,"interval":"10s","jobLabel":"","labels":{},"metricRelabelings":null,"relabelings":[{"action":"replace","replacement":"${1}","sourceLabels":["__meta_kubernetes_pod_node_name"],"targetLabel":"node"}],"scrapeTimeout":null,"tlsConfig":{}},"tls":{"enabled":false,"server":{"cert":"","existingSecret":"","extraDnsNames":[],"extraIpAddresses":[],"key":"","mtls":{"enabled":false,"key":"ca.crt","name":null,"useSecret":false}}}}` | Hubble metrics configuration. See https://docs.cilium.io/en/stable/observability/metrics/#hubble-metrics for more comprehensive documentation about Hubble metrics. |
 | hubble.metrics.dashboards | object | `{"annotations":{},"enabled":false,"label":"grafana_dashboard","labelValue":"1","namespace":null}` | Grafana dashboards for hubble grafana can import dashboards based on the label and value ref: https://github.com/grafana/helm-charts/tree/main/charts/grafana#sidecar-for-dashboards |
@@ -600,13 +612,12 @@ contributors across the globe, there is almost always someone available to help.
 | hubble.networkPolicyCorrelation | object | `{"enabled":true}` | Enables network policy correlation of Hubble flows, i.e. populating `egress_allowed_by`, `ingress_denied_by` fields with policy information. |
 | hubble.peerService.clusterDomain | string | `"cluster.local"` | The cluster domain to use to query the Hubble Peer service. It should be the local cluster. |
 | hubble.peerService.targetPort | int | `4244` | Target Port for the Peer service, must match the hubble.listenAddress' port. |
-| hubble.preferIpv6 | bool | `false` | Whether Hubble should prefer to announce IPv6 or IPv4 addresses if both are available. |
-| hubble.redact | object | `{"enabled":false,"http":{"headers":{"allow":[],"deny":[]},"urlQuery":false,"userInfo":true},"kafka":{"apiKey":true}}` | Enables redacting sensitive information present in Layer 7 flows. |
+| hubble.preferIpv6 | bool | `false` | Whether Hubble should prefer to announce IPv6 or IPv4 addresses if both are available. Deprecated: use top-level preferIpv6 instead. |
+| hubble.redact | object | `{"enabled":false,"http":{"headers":{"allow":[],"deny":[]},"urlQuery":false,"userInfo":true}}` | Enables redacting sensitive information present in Layer 7 flows. |
 | hubble.redact.http.headers.allow | list | `[]` | List of HTTP headers to allow: headers not matching will be redacted. Note: `allow` and `deny` lists cannot be used both at the same time, only one can be present. Example:   redact:     enabled: true     http:       headers:         allow:           - traceparent           - tracestate           - Cache-Control  You can specify the options from the helm CLI:   --set hubble.redact.enabled="true"   --set hubble.redact.http.headers.allow="traceparent,tracestate,Cache-Control" |
 | hubble.redact.http.headers.deny | list | `[]` | List of HTTP headers to deny: matching headers will be redacted. Note: `allow` and `deny` lists cannot be used both at the same time, only one can be present. Example:   redact:     enabled: true     http:       headers:         deny:           - Authorization           - Proxy-Authorization  You can specify the options from the helm CLI:   --set hubble.redact.enabled="true"   --set hubble.redact.http.headers.deny="Authorization,Proxy-Authorization" |
 | hubble.redact.http.urlQuery | bool | `false` | Enables redacting URL query (GET) parameters. Example:    redact:     enabled: true     http:       urlQuery: true  You can specify the options from the helm CLI:    --set hubble.redact.enabled="true"   --set hubble.redact.http.urlQuery="true" |
 | hubble.redact.http.userInfo | bool | `true` | Enables redacting user info, e.g., password when basic auth is used. Example:    redact:     enabled: true     http:       userInfo: true  You can specify the options from the helm CLI:    --set hubble.redact.enabled="true"   --set hubble.redact.http.userInfo="true" |
-| hubble.redact.kafka.apiKey | bool | `true` | Enables redacting Kafka's API key (deprecated, will be removed in v1.19). Example:    redact:     enabled: true     kafka:       apiKey: true  You can specify the options from the helm CLI:    --set hubble.redact.enabled="true"   --set hubble.redact.kafka.apiKey="true" |
 | hubble.relay.affinity | object | `{"podAffinity":{"requiredDuringSchedulingIgnoredDuringExecution":[{"labelSelector":{"matchLabels":{"k8s-app":"cilium"}},"topologyKey":"kubernetes.io/hostname"}]}}` | Affinity for hubble-replay |
 | hubble.relay.annotations | object | `{}` | Annotations to be added to all top-level hubble-relay objects (resources under templates/hubble-relay) |
 | hubble.relay.enabled | bool | `false` | Enable Hubble Relay (requires hubble.enabled=true) |
@@ -615,7 +626,7 @@ contributors across the globe, there is almost always someone available to help.
 | hubble.relay.extraVolumes | list | `[]` | Additional hubble-relay volumes. |
 | hubble.relay.gops.enabled | bool | `true` | Enable gops for hubble-relay |
 | hubble.relay.gops.port | int | `9893` | Configure gops listen port for hubble-relay |
-| hubble.relay.image | object | `{"digest":"sha256:5ee21d57b6ef2aa6db67e603a735fdceb162454b352b7335b651456e308f681b","override":null,"pullPolicy":"IfNotPresent","repository":"quay.io/cilium/hubble-relay","tag":"v1.19.3","useDigest":true}` | Hubble-relay container image. |
+| hubble.relay.image | object | `{"digest":"sha256:d309c977870e9dbede7122a10eee09a4c9d66685e8d52af62d9c3c113f815b0f","override":null,"pullPolicy":"IfNotPresent","repository":"quay.io/cilium/hubble-relay","tag":"v1.20.2","useDigest":true}` | Hubble-relay container image. |
 | hubble.relay.listenHost | string | `""` | Host to listen to. Specify an empty string to bind to all the interfaces. |
 | hubble.relay.listenPort | string | `"4245"` | Port to listen to. |
 | hubble.relay.logOptions | object | `{"format":null,"level":null}` | Logging configuration for hubble-relay. |
@@ -647,7 +658,7 @@ contributors across the globe, there is almost always someone available to help.
 | hubble.relay.resources | object | `{}` | Specifies the resources for the hubble-relay pods |
 | hubble.relay.retryTimeout | string | `nil` | Backoff duration to retry connecting to the local hubble instance in case of failure (e.g. "30s"). |
 | hubble.relay.rollOutPods | bool | `false` | Roll out Hubble Relay pods automatically when configmap is updated. |
-| hubble.relay.securityContext | object | `{"allowPrivilegeEscalation":false,"capabilities":{"drop":["ALL"]},"runAsGroup":65532,"runAsNonRoot":true,"runAsUser":65532,"seccompProfile":{"type":"RuntimeDefault"}}` | hubble-relay container security context |
+| hubble.relay.securityContext | object | `{"allowPrivilegeEscalation":false,"capabilities":{"drop":["ALL"]},"readOnlyRootFilesystem":true,"runAsGroup":65532,"runAsNonRoot":true,"runAsUser":65532,"seccompProfile":{"type":"RuntimeDefault"}}` | hubble-relay container security context |
 | hubble.relay.service | object | `{"nodePort":31234,"type":"ClusterIP"}` | hubble-relay service configuration. |
 | hubble.relay.service.nodePort | int | `31234` | - The port to use when the service type is set to NodePort. |
 | hubble.relay.service.type | string | `"ClusterIP"` | - The type of service used for Hubble Relay access, either ClusterIP, NodePort or LoadBalancer. |
@@ -670,13 +681,15 @@ contributors across the globe, there is almost always someone available to help.
 | hubble.relay.updateStrategy | object | `{"rollingUpdate":{"maxUnavailable":1},"type":"RollingUpdate"}` | hubble-relay update strategy |
 | hubble.skipUnknownCGroupIDs | bool | `true` | Skip Hubble events with unknown cgroup ids |
 | hubble.socketPath | string | `"/var/run/cilium/hubble.sock"` | Unix domain socket path to listen to when Hubble is enabled. |
-| hubble.tls | object | `{"auto":{"certManagerIssuerRef":{},"certValidityDuration":365,"enabled":true,"method":"helm","schedule":"0 0 1 */4 *"},"enabled":true,"server":{"cert":"","existingSecret":"","extraDnsNames":[],"extraIpAddresses":[],"key":""}}` | TLS configuration for Hubble |
-| hubble.tls.auto | object | `{"certManagerIssuerRef":{},"certValidityDuration":365,"enabled":true,"method":"helm","schedule":"0 0 1 */4 *"}` | Configure automatic TLS certificates generation. |
+| hubble.tls | object | `{"auto":{"certManagerIssuerRef":{},"certValidityDuration":365,"enabled":true,"method":"helm","privateKey":{},"schedule":"0 0 1 */4 *","subject":{}},"enabled":true,"server":{"cert":"","existingSecret":"","extraDnsNames":[],"extraIpAddresses":[],"key":""}}` | TLS configuration for Hubble |
+| hubble.tls.auto | object | `{"certManagerIssuerRef":{},"certValidityDuration":365,"enabled":true,"method":"helm","privateKey":{},"schedule":"0 0 1 */4 *","subject":{}}` | Configure automatic TLS certificates generation. |
 | hubble.tls.auto.certManagerIssuerRef | object | `{}` | certmanager issuer used when hubble.tls.auto.method=certmanager. |
 | hubble.tls.auto.certValidityDuration | int | `365` | Generated certificates validity duration in days.  Defaults to 365 days (1 year) because MacOS does not accept self-signed certificates with expirations > 825 days. |
 | hubble.tls.auto.enabled | bool | `true` | Auto-generate certificates. When set to true, automatically generate a CA and certificates to enable mTLS between Hubble server and Hubble Relay instances. If set to false, the certs for Hubble server need to be provided by setting appropriate values below. |
 | hubble.tls.auto.method | string | `"helm"` | Set the method to auto-generate certificates. Supported values: - helm:         This method uses Helm to generate all certificates. - cronJob:      This method uses a Kubernetes CronJob the generate any                 certificates not provided by the user at installation                 time. - certmanager:  This method use cert-manager to generate & rotate certificates. |
+| hubble.tls.auto.privateKey | object | `{}` | Private key options. These include the key algorithm and size, the used encoding and the rotation policy used when hubble.tls.auto.method=certmanager. https://cert-manager.io/docs/reference/api-docs/#cert-manager.io/v1.CertificatePrivateKey |
 | hubble.tls.auto.schedule | string | `"0 0 1 */4 *"` | Schedule for certificates regeneration (regardless of their expiration date). Only used if method is "cronJob". If nil, then no recurring job will be created. Instead, only the one-shot job is deployed to generate the certificates at installation time.  Defaults to midnight of the first day of every fourth month. For syntax, see https://kubernetes.io/docs/concepts/workloads/controllers/cron-jobs/#schedule-syntax |
+| hubble.tls.auto.subject | object | `{}` | X509Subject Full X509 name specification used when hubble.tls.auto.method=certmanager. https://cert-manager.io/docs/reference/api-docs/#cert-manager.io/v1.X509Subject |
 | hubble.tls.enabled | bool | `true` | Enable mutual TLS for listenAddress. Setting this value to false is highly discouraged as the Hubble API provides access to potentially sensitive network flow metadata and is exposed on the host network. |
 | hubble.tls.server | object | `{"cert":"","existingSecret":"","extraDnsNames":[],"extraIpAddresses":[],"key":""}` | The Hubble server certificate and private key |
 | hubble.tls.server.cert | string | `""` | base64 encoded PEM values for the Hubble server certificate (deprecated). Use existingSecret instead. |
@@ -689,19 +702,17 @@ contributors across the globe, there is almost always someone available to help.
 | hubble.ui.backend.extraEnv | list | `[]` | Additional hubble-ui backend environment variables. |
 | hubble.ui.backend.extraVolumeMounts | list | `[]` | Additional hubble-ui backend volumeMounts. |
 | hubble.ui.backend.extraVolumes | list | `[]` | Additional hubble-ui backend volumes. |
-| hubble.ui.backend.image | object | `{"digest":"sha256:db1454e45dc39ca41fbf7cad31eec95d99e5b9949c39daaad0fa81ef29d56953","override":null,"pullPolicy":"IfNotPresent","repository":"quay.io/cilium/hubble-ui-backend","tag":"v0.13.3","useDigest":true}` | Hubble-ui backend image. |
-| hubble.ui.backend.livenessProbe.enabled | bool | `false` | Enable liveness probe for Hubble-ui backend (requires Hubble-ui 0.12+) |
-| hubble.ui.backend.readinessProbe.enabled | bool | `false` | Enable readiness probe for Hubble-ui backend (requires Hubble-ui 0.12+) |
+| hubble.ui.backend.image | object | `{"digest":"sha256:83b3fc763f3d49948c306bf49b08277383e195904b9ca5c0c0022b2112628787","override":null,"pullPolicy":"IfNotPresent","repository":"quay.io/cilium/hubble-ui-backend","tag":"v0.13.6","useDigest":true}` | Hubble-ui backend image. |
 | hubble.ui.backend.resources | object | `{}` | Resource requests and limits for the 'backend' container of the 'hubble-ui' deployment. |
-| hubble.ui.backend.securityContext | object | `{"allowPrivilegeEscalation":false}` | Hubble-ui backend security context. |
+| hubble.ui.backend.securityContext | object | `{"allowPrivilegeEscalation":false,"capabilities":{"drop":["ALL"]}}` | Hubble-ui backend security context. |
 | hubble.ui.baseUrl | string | `"/"` | Defines base url prefix for all hubble-ui http requests. It needs to be changed in case if ingress for hubble-ui is configured under some sub-path. Trailing `/` is required for custom path, ex. `/service-map/` |
 | hubble.ui.enabled | bool | `false` | Whether to enable the Hubble UI. |
 | hubble.ui.frontend.extraEnv | list | `[]` | Additional hubble-ui frontend environment variables. |
 | hubble.ui.frontend.extraVolumeMounts | list | `[]` | Additional hubble-ui frontend volumeMounts. |
 | hubble.ui.frontend.extraVolumes | list | `[]` | Additional hubble-ui frontend volumes. |
-| hubble.ui.frontend.image | object | `{"digest":"sha256:661d5de7050182d495c6497ff0b007a7a1e379648e60830dd68c4d78ae21761d","override":null,"pullPolicy":"IfNotPresent","repository":"quay.io/cilium/hubble-ui","tag":"v0.13.3","useDigest":true}` | Hubble-ui frontend image. |
+| hubble.ui.frontend.image | object | `{"digest":"sha256:049a80a03585c043d0c3121bdc518c72b0fd42bae07e4bcce0fdb8f1e88041d0","override":null,"pullPolicy":"IfNotPresent","repository":"quay.io/cilium/hubble-ui","tag":"v0.13.6","useDigest":true}` | Hubble-ui frontend image. |
 | hubble.ui.frontend.resources | object | `{}` | Resource requests and limits for the 'frontend' container of the 'hubble-ui' deployment. |
-| hubble.ui.frontend.securityContext | object | `{"allowPrivilegeEscalation":false}` | Hubble-ui frontend security context. |
+| hubble.ui.frontend.securityContext | object | `{"allowPrivilegeEscalation":false,"capabilities":{"drop":["ALL"]}}` | Hubble-ui frontend security context. |
 | hubble.ui.frontend.server.ipv6 | object | `{"enabled":true}` | Controls server listener for ipv6 |
 | hubble.ui.ingress | object | `{"annotations":{},"className":"","enabled":false,"hosts":["chart-example.local"],"labels":{},"tls":[]}` | hubble-ui ingress configuration. |
 | hubble.ui.labels | object | `{}` | Additional labels to be added to 'hubble-ui' deployment object |
@@ -715,7 +726,7 @@ contributors across the globe, there is almost always someone available to help.
 | hubble.ui.priorityClassName | string | `""` | The priority class to use for hubble-ui |
 | hubble.ui.replicas | int | `1` | The number of replicas of Hubble UI to deploy. |
 | hubble.ui.rollOutPods | bool | `false` | Roll out Hubble-ui pods automatically when configmap is updated. |
-| hubble.ui.securityContext | object | `{"fsGroup":1001,"runAsGroup":1001,"runAsUser":1001}` | Security context to be added to Hubble UI pods |
+| hubble.ui.securityContext | object | `{"fsGroup":1001,"runAsGroup":1001,"runAsNonRoot":true,"runAsUser":1001,"seccompProfile":{"type":"RuntimeDefault"}}` | Security context to be added to Hubble UI pods |
 | hubble.ui.service | object | `{"annotations":{},"labels":{},"nodePort":31235,"type":"ClusterIP"}` | hubble-ui service configuration. |
 | hubble.ui.service.annotations | object | `{}` | Annotations to be added for the Hubble UI service |
 | hubble.ui.service.labels | object | `{}` | Labels to be added for the Hubble UI service |
@@ -733,7 +744,7 @@ contributors across the globe, there is almost always someone available to help.
 | identityAllocationMode | string | `"crd"` | Method to use for identity allocation (`crd`, `kvstore` or `doublewrite-readkvstore` / `doublewrite-readcrd` for migrating between identity backends). |
 | identityChangeGracePeriod | string | `"5s"` | Time to wait before using new identity on endpoint identity change. |
 | identityManagementMode | string | `"agent"` | Control whether CiliumIdentities are created by the agent ("agent"), the operator ("operator") or both ("both"). "Both" should be used only to migrate between "agent" and "operator". Operator-managed identities is a beta feature. |
-| image | object | `{"digest":"sha256:2e61680593cddca8b6c055f6d4c849d87a26a1c91c7e3b8b56c7fb76ab7b7b10","override":null,"pullPolicy":"IfNotPresent","repository":"quay.io/cilium/cilium","tag":"v1.19.3","useDigest":true}` | Agent container image. |
+| image | object | `{"digest":"sha256:2939231d0d3e3ebddcd80fffa168b7ddcc78fdf0dc864d1c8c126ff523c54f01","override":null,"pullPolicy":"IfNotPresent","repository":"quay.io/cilium/cilium","tag":"v1.20.2","useDigest":true}` | Agent container image. |
 | imagePullSecrets | list | `[]` | Configure image pull secrets for pulling container images |
 | ingressController.default | bool | `false` | Set cilium ingress controller to be the default ingress controller This will let cilium ingress controller route entries without ingress class set |
 | ingressController.defaultSecretName | string | `nil` | Default secret name for ingresses without .spec.tls[].secretName set. |
@@ -742,8 +753,11 @@ contributors across the globe, there is almost always someone available to help.
 | ingressController.enabled | bool | `false` | Enable cilium ingress controller This will automatically set enable-envoy-config as well. |
 | ingressController.enforceHttps | bool | `true` | Enforce https for host having matching TLS host in Ingress. Incoming traffic to http listener will return 308 http error code with respective location in header. |
 | ingressController.hostNetwork.enabled | bool | `false` | Configure whether the Envoy listeners should be exposed on the host network. |
+| ingressController.hostNetwork.httpPort | int | `0` | Configure a specific port on the host network that gets used for the shared HTTP listener. If unset or 0, sharedListenerPort is used. |
+| ingressController.hostNetwork.httpsPort | int | `0` | Configure a specific port on the host network that gets used for the shared HTTPS listener. If unset or 0, sharedListenerPort is used. |
 | ingressController.hostNetwork.nodes.matchLabels | object | `{}` | Specify the labels of the nodes where the Ingress listeners should be exposed  matchLabels:   kubernetes.io/os: linux   kubernetes.io/hostname: kind-worker |
 | ingressController.hostNetwork.sharedListenerPort | int | `8080` | Configure a specific port on the host network that gets used for the shared listener. |
+| ingressController.hostNetwork.tlsPassthroughPort | int | `0` | Configure a specific port on the host network that gets used for the shared TLS passthrough listener. If unset or 0, sharedListenerPort is used. |
 | ingressController.ingressLBAnnotationPrefixes | list | `["lbipam.cilium.io","nodeipam.cilium.io","service.beta.kubernetes.io","service.kubernetes.io","cloud.google.com"]` | IngressLBAnnotations are the annotation and label prefixes, which are used to filter annotations and/or labels to propagate from Ingress to the Load Balancer service |
 | ingressController.loadbalancerMode | string | `"dedicated"` | Default ingress load balancer mode Supported values: shared, dedicated For granular control, use the following annotations on the ingress resource: "ingress.cilium.io/loadbalancer-mode: dedicated" (or "shared"). |
 | ingressController.secretsNamespace | object | `{"create":true,"name":"cilium-secrets","sync":true}` | SecretsNamespace is the namespace in which envoy SDS will retrieve TLS secrets from. |
@@ -761,6 +775,8 @@ contributors across the globe, there is almost always someone available to help.
 | ingressController.service.name | string | `"cilium-ingress"` | Service name |
 | ingressController.service.secureNodePort | string | `nil` | Configure a specific nodePort for secure HTTPS traffic on the shared LB service |
 | ingressController.service.type | string | `"LoadBalancer"` | Service type for the shared LB service |
+| ingressController.useRemoteAddress | bool | `true` | Configure whether to use the remote address of the client when determining the source IP. When enabled, the source IP is determined from the remote address instead of the proxy protocol header. |
+| ingressController.xffNumTrustedHops | int | `0` | The number of additional Ingress proxy hops from the right side of the HTTP header to trust when determining the origin client's IP address. |
 | initResources | object | `{}` | resources & limits for the agent init containers |
 | installNoConntrackIptablesRules | bool | `false` | Install Iptables rules to skip netfilter connection tracking on all pod traffic. This option is only effective when Cilium is running in direct routing and full KPR mode. Moreover, this option cannot be enabled when Cilium is running in a managed Kubernetes environment or in a chained CNI setup. |
 | ipMasqAgent | object | `{"enabled":false}` | Configure the eBPF-based ip-masq-agent |
@@ -785,7 +801,8 @@ contributors across the globe, there is almost always someone available to help.
 | ipv4NativeRoutingCIDR | string | `""` | Allows to explicitly specify the IPv4 CIDR for native routing. When specified, Cilium assumes networking for this CIDR is preconfigured and hands traffic destined for that range to the Linux network stack without applying any SNAT. Generally speaking, specifying a native routing CIDR implies that Cilium can depend on the underlying networking stack to route packets to their destination. To offer a concrete example, if Cilium is configured to use direct routing and the Kubernetes CIDR is included in the native routing CIDR, the user must configure the routes to reach pods, either manually or by setting the auto-direct-node-routes flag. |
 | ipv6.enabled | bool | `false` | Enable IPv6 support. |
 | ipv6NativeRoutingCIDR | string | `""` | Allows to explicitly specify the IPv6 CIDR for native routing. When specified, Cilium assumes networking for this CIDR is preconfigured and hands traffic destined for that range to the Linux network stack without applying any SNAT. Generally speaking, specifying a native routing CIDR implies that Cilium can depend on the underlying networking stack to route packets to their destination. To offer a concrete example, if Cilium is configured to use direct routing and the Kubernetes CIDR is included in the native routing CIDR, the user must configure the routes to reach pods, either manually or by setting the auto-direct-node-routes flag. |
-| k8s | object | `{"requireIPv4PodCIDR":false,"requireIPv6PodCIDR":false}` | Configure Kubernetes specific configuration |
+| k8s | object | `{"apiServerURLs":null,"requireIPv4PodCIDR":false,"requireIPv6PodCIDR":false}` | Configure Kubernetes specific configuration |
+| k8s.apiServerURLs | string | `nil` | A space separated list of Kubernetes API server URLs to use with the client. For example "https://192.168.0.1:6443 https://192.168.0.2:6443" |
 | k8s.requireIPv4PodCIDR | bool | `false` | requireIPv4PodCIDR enables waiting for Kubernetes to provide the PodCIDR range via the Kubernetes node resource |
 | k8s.requireIPv6PodCIDR | bool | `false` | requireIPv6PodCIDR enables waiting for Kubernetes to provide the PodCIDR range via the Kubernetes node resource |
 | k8sClientExponentialBackoff | object | `{"backoffBaseSeconds":1,"backoffMaxDurationSeconds":120,"enabled":true}` | Configure exponential backoff for client-go in Cilium agent. |
@@ -798,6 +815,7 @@ contributors across the globe, there is almost always someone available to help.
 | k8sClientRateLimit.operator.burst | int | 200 | The burst request rate in requests per second. The rate limiter will allow short bursts with a higher rate. |
 | k8sClientRateLimit.operator.qps | int | 100 | The sustained request rate in requests per second. |
 | k8sClientRateLimit.qps | int | 10 | The sustained request rate in requests per second. |
+| k8sClusterNetworkPolicy.enabled | bool | `false` | Enable support for K8s Cluster Network Policy |
 | k8sNetworkPolicy.enabled | bool | `true` | Enable support for K8s NetworkPolicy |
 | k8sServiceHost | string | `""` | Kubernetes service host - use "auto" for automatic lookup from the cluster-info ConfigMap |
 | k8sServiceHostRef | object | `{"key":null,"name":null}` | Configure the Kubernetes service endpoint dynamically using a ConfigMap. Mutually exclusive with `k8sServiceHost`. |
@@ -814,9 +832,9 @@ contributors across the globe, there is almost always someone available to help.
 | l2NeighDiscovery.enabled | bool | `false` | Enable L2 neighbor discovery in the agent |
 | l2announcements | object | `{"enabled":false}` | Configure L2 announcements |
 | l2announcements.enabled | bool | `false` | Enable L2 announcements |
-| l2podAnnouncements | object | `{"enabled":false,"interface":"eth0"}` | Configure L2 pod announcements |
+| l2podAnnouncements | object | `{"enabled":false,"interfacePattern":""}` | Configure L2 pod announcements |
 | l2podAnnouncements.enabled | bool | `false` | Enable L2 pod announcements |
-| l2podAnnouncements.interface | string | `"eth0"` | Interface used for sending Gratuitous ARP pod announcements |
+| l2podAnnouncements.interfacePattern | string | `""` | A regular expression matching interfaces used for sending Gratuitous ARP pod announcements |
 | l7Proxy | bool | `true` | Enable Layer 7 network policy. |
 | livenessProbe.failureThreshold | int | `10` | failure threshold of liveness probe |
 | livenessProbe.periodSeconds | int | `30` | interval between checks of the liveness probe |
@@ -833,6 +851,7 @@ contributors across the globe, there is almost always someone available to help.
 | localRedirectPolicy | bool | `false` | Enable Local Redirect Policy (deprecated, please use 'localRedirectPolicies.enabled' instead) |
 | logSystemLoad | bool | `false` | Enables periodic logging of system load |
 | maglev | object | `{}` | Configure maglev consistent hashing |
+| minReadySeconds | int | `0` | Minimum number of seconds for which a newly created agent pod should be ready before it is considered available. Defaults to 0 (pod is considered available as soon as it is ready). ref: https://kubernetes.io/docs/tasks/manage-daemon/update-daemon-set/ |
 | monitor | object | `{"enabled":false}` | cilium-monitor sidecar. |
 | monitor.enabled | bool | `false` | Enable the cilium-monitor sidecar. |
 | name | string | `"cilium"` | Agent daemonset name. |
@@ -841,11 +860,13 @@ contributors across the globe, there is almost always someone available to help.
 | nat.mapStatsInterval | string | `"30s"` | Interval between how often SNAT map is counted for stats. |
 | nat46x64Gateway | object | `{"enabled":false}` | Configure standalone NAT46/NAT64 gateway |
 | nat46x64Gateway.enabled | bool | `false` | Enable RFC6052-prefixed translation |
+| nativeRoutingCIDRFromClusterPool | bool | `false` | Derive the native routing CIDRs from the cluster-pool IPAM CIDRs when ipv4NativeRoutingCIDR / ipv6NativeRoutingCIDR are not explicitly set. Only effective with ipam.mode=cluster-pool and requires exactly one CIDR per enabled IP family in clusterPoolIPv4PodCIDRList / clusterPoolIPv6PodCIDRList. |
 | nodeIPAM.enabled | bool | `false` | Configure Node IPAM ref: https://docs.cilium.io/en/stable/network/node-ipam/ |
-| nodePort | object | `{"addresses":null,"autoProtectPortRange":true,"bindProtection":true,"enableHealthCheck":true,"enableHealthCheckLoadBalancerIP":false}` | Configure N-S k8s service loadbalancing |
+| nodePort | object | `{"addresses":null,"autoProtectPortRange":true,"bindProtection":true,"enableDynamicSourceLookup":false,"enableHealthCheck":true,"enableHealthCheckLoadBalancerIP":false}` | Configure N-S k8s service loadbalancing |
 | nodePort.addresses | string | `nil` | List of CIDRs for choosing which IP addresses assigned to native devices are used for NodePort load-balancing. By default this is empty and the first suitable, preferably private, IPv4 and IPv6 address assigned to each device is used.  Example:    addresses: ["192.168.1.0/24", "2001::/64"]  |
 | nodePort.autoProtectPortRange | bool | `true` | Append NodePort range to ip_local_reserved_ports if clash with ephemeral ports is detected. |
 | nodePort.bindProtection | bool | `true` | Set to true to prevent applications binding to service ports. |
+| nodePort.enableDynamicSourceLookup | bool | `false` | Enable dynamic source IP resolution for SNAT via linux's routing table. The kernel must support this feature. |
 | nodePort.enableHealthCheck | bool | `true` | Enable healthcheck nodePort server for NodePort services |
 | nodePort.enableHealthCheckLoadBalancerIP | bool | `false` | Enable access of the healthcheck nodePort on the LoadBalancerIP. Needs EnableHealthCheck to be enabled |
 | nodeSelector | object | `{"kubernetes.io/os":"linux"}` | Node selector for cilium-agent. |
@@ -857,7 +878,8 @@ contributors across the globe, there is almost always someone available to help.
 | nodeinit.extraEnv | list | `[]` | Additional nodeinit environment variables. |
 | nodeinit.extraVolumeMounts | list | `[]` | Additional nodeinit volumeMounts. |
 | nodeinit.extraVolumes | list | `[]` | Additional nodeinit volumes. |
-| nodeinit.image | object | `{"digest":"sha256:50b9cf9c280096b59b80d2fc8ee6638facef79ac18998a22f0cbc40d5d28c16f","override":null,"pullPolicy":"IfNotPresent","repository":"quay.io/cilium/startup-script","tag":"1763560095-8f36c34","useDigest":true}` | node-init image. |
+| nodeinit.image | object | `{"digest":"sha256:f99e2beda7324e93ba04d6240d9626a6b9ab023d7d56e3b029d3d9c823ce63ef","override":null,"pullPolicy":"IfNotPresent","repository":"quay.io/cilium/startup-script","tag":"1782916218-36ae25f","useDigest":true}` | node-init image. |
+| nodeinit.minReadySeconds | int | `0` | Minimum number of seconds for which a newly created node-init pod should be ready before it is considered available. |
 | nodeinit.nodeSelector | object | `{"kubernetes.io/os":"linux"}` | Node labels for nodeinit pod assignment ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector |
 | nodeinit.podAnnotations | object | `{}` | Annotations to be added to node-init pods. |
 | nodeinit.podLabels | object | `{}` | Labels to be added to node-init pods. |
@@ -883,9 +905,10 @@ contributors across the globe, there is almost always someone available to help.
 | operator.extraVolumeMounts | list | `[]` | Additional cilium-operator volumeMounts. |
 | operator.extraVolumes | list | `[]` | Additional cilium-operator volumes. |
 | operator.hostNetwork | bool | `true` | HostNetwork setting |
+| operator.hostUsers | bool | `true` | HostUsers setting (must be true if hostNetwork is true) |
 | operator.identityGCInterval | string | `"15m0s"` | Interval for identity garbage collection. |
 | operator.identityHeartbeatTimeout | string | `"30m0s"` | Timeout for identity heartbeats. |
-| operator.image | object | `{"alibabacloudDigest":"sha256:176321a65123373ff8c7823b25183102cbad98375e8d6c80b96d68b6e8491103","awsDigest":"sha256:a53dcbfb77282bf2ddd3abbe60f6d49762e7c1389a36cb35b71d504644a56640","azureDigest":"sha256:699c1571a3df1a98882ee13610d47cffb7b34ee7e8d276096db798a5f6c7e4cb","genericDigest":"sha256:205b09b0ed6accbf9fe688d312a9f0fcfc6a316fc081c23fbffb472af5dd62cd","override":null,"pullPolicy":"IfNotPresent","repository":"quay.io/cilium/operator","suffix":"","tag":"v1.19.3","useDigest":true}` | cilium-operator image. |
+| operator.image | object | `{"alibabacloudDigest":"sha256:3c1536f099595c3d967d17d7f2ce290c6adea93777a514081e84a9d82e271e38","awsDigest":"sha256:0df92d10d2ec548052678b67809c1e613429931b2d5c1d6741fcef096bb0d2a3","azureDigest":"sha256:b304dc1ad8dd06abb2103bdb91c87dcc302d904e1e4cbe0afd231885d1f0194a","genericDigest":"sha256:64d8798350e8569b8e7622563fed6e44dce2625f311e4651b774816516c744fc","override":null,"pullPolicy":"IfNotPresent","repository":"quay.io/cilium/operator","suffix":"","tag":"v1.20.2","useDigest":true}` | cilium-operator image. |
 | operator.nodeGCInterval | string | `"5m0s"` | Interval for cilium node garbage collection. |
 | operator.nodeSelector | object | `{"kubernetes.io/os":"linux"}` | Node labels for cilium-operator pod assignment ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector |
 | operator.podAnnotations | object | `{}` | Annotations to be added to cilium-operator pods |
@@ -940,14 +963,15 @@ contributors across the globe, there is almost always someone available to help.
 | pprof.enabled | bool | `false` | Enable pprof for cilium-agent |
 | pprof.mutexProfileFraction | int | `0` | Enable mutex contention profiling for cilium-agent and set the fraction of sampled events (set to 1 to sample all events) |
 | pprof.port | int | `6060` | Configure pprof listen port for cilium-agent |
+| preferIpv6 | bool | `false` | Prefer IPv6 addresses over IPv4 when both are available for health probes and Hubble peer communication. |
 | preflight.affinity | object | `{"podAffinity":{"requiredDuringSchedulingIgnoredDuringExecution":[{"labelSelector":{"matchLabels":{"k8s-app":"cilium"}},"topologyKey":"kubernetes.io/hostname"}]}}` | Affinity for cilium-preflight |
 | preflight.annotations | object | `{}` | Annotations to be added to all top-level preflight objects (resources under templates/cilium-preflight) |
 | preflight.enabled | bool | `false` | Enable Cilium pre-flight resources (required for upgrade) |
-| preflight.envoy.image | object | `{"digest":"sha256:ba0ab8adac082d50d525fd2c5ba096c8facea3a471561b7c61c7a5b9c2e0de0d","override":null,"pullPolicy":"IfNotPresent","repository":"quay.io/cilium/cilium-envoy","tag":"v1.36.6-1776000132-2437d2edeaf4d9b56ef279bd0d71127440c067aa","useDigest":true}` | Envoy pre-flight image. |
+| preflight.envoy.image | object | `{"digest":"sha256:af7382699576b9e65e9184efa52eeca0b58aea70ad6e511bf260c91d9f740463","override":null,"pullPolicy":"IfNotPresent","repository":"quay.io/cilium/cilium-envoy","tag":"v1.37.6-1789133542-cbec91f666af0bf742da986d43832932dbb26b82","useDigest":true}` | Envoy pre-flight image. |
 | preflight.extraEnv | list | `[]` | Additional preflight environment variables. |
 | preflight.extraVolumeMounts | list | `[]` | Additional preflight volumeMounts. |
 | preflight.extraVolumes | list | `[]` | Additional preflight volumes. |
-| preflight.image | object | `{"digest":"sha256:2e61680593cddca8b6c055f6d4c849d87a26a1c91c7e3b8b56c7fb76ab7b7b10","override":null,"pullPolicy":"IfNotPresent","repository":"quay.io/cilium/cilium","tag":"v1.19.3","useDigest":true}` | Cilium pre-flight image. |
+| preflight.image | object | `{"digest":"sha256:2939231d0d3e3ebddcd80fffa168b7ddcc78fdf0dc864d1c8c126ff523c54f01","override":null,"pullPolicy":"IfNotPresent","repository":"quay.io/cilium/cilium","tag":"v1.20.2","useDigest":true}` | Cilium pre-flight image. |
 | preflight.nodeSelector | object | `{"kubernetes.io/os":"linux"}` | Node labels for preflight pod assignment ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector |
 | preflight.podAnnotations | object | `{}` | Annotations to be added to preflight pods |
 | preflight.podDisruptionBudget.enabled | bool | `false` | enable PodDisruptionBudget ref: https://kubernetes.io/docs/concepts/workloads/pods/disruptions/ |
@@ -962,7 +986,6 @@ contributors across the globe, there is almost always someone available to help.
 | preflight.resources | object | `{}` | preflight resource limits & requests ref: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ |
 | preflight.securityContext | object | `{"allowPrivilegeEscalation":false}` | Security context to be added to preflight pods |
 | preflight.terminationGracePeriodSeconds | int | `1` | Configure termination grace period for preflight Deployment and DaemonSet. |
-| preflight.tofqdnsPreCache | string | `""` | Path to write the `--tofqdns-pre-cache` file to. |
 | preflight.tolerations | list | `[{"operator":"Exists"}]` | Node tolerations for preflight scheduling to nodes with taints ref: https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/ |
 | preflight.updateStrategy | object | `{"type":"RollingUpdate"}` | preflight update strategy |
 | preflight.validateCNPs | bool | `true` | By default we should always validate the installed CNPs before upgrading Cilium. This will make sure the user will have the policies deployed in the cluster with the right schema. |
@@ -1009,12 +1032,13 @@ contributors across the globe, there is almost always someone available to help.
 | sleepAfterInit | bool | `false` | Do not run Cilium agent when running with clean mode. Useful to completely uninstall Cilium as it will stop Cilium from starting and create artifacts in the node. |
 | socketLB | object | `{"enabled":false}` | Configure socket LB |
 | socketLB.enabled | bool | `false` | Enable socket LB |
-| standaloneDnsProxy | object | `{"annotations":{},"automountServiceAccountToken":false,"debug":false,"enabled":false,"image":{"digest":"","override":null,"pullPolicy":"IfNotPresent","repository":"","tag":"","useDigest":true},"nodeSelector":{"kubernetes.io/os":"linux"},"rollOutPods":false,"serverPort":10095,"tolerations":[],"updateStrategy":{"rollingUpdate":{"maxSurge":2,"maxUnavailable":0},"type":"RollingUpdate"}}` | Standalone DNS Proxy Configuration Note: The standalone DNS proxy uses the agent's dnsProxy.* configuration for DNS settings (proxyPort, enableDnsCompression) to ensure consistency. |
+| standaloneDnsProxy | object | `{"annotations":{},"automountServiceAccountToken":false,"debug":false,"enabled":false,"image":{"digest":"","override":null,"pullPolicy":"IfNotPresent","repository":"","tag":"","useDigest":true},"minReadySeconds":5,"nodeSelector":{"kubernetes.io/os":"linux"},"rollOutPods":false,"serverPort":10095,"tolerations":[],"updateStrategy":{"rollingUpdate":{"maxSurge":2,"maxUnavailable":0},"type":"RollingUpdate"}}` | Standalone DNS Proxy Configuration Note: The standalone DNS proxy uses the agent's dnsProxy.* configuration for DNS settings (proxyPort, enableDnsCompression) to ensure consistency. |
 | standaloneDnsProxy.annotations | object | `{}` | Standalone DNS proxy annotations |
 | standaloneDnsProxy.automountServiceAccountToken | bool | `false` | Standalone DNS proxy auto mount service account token |
 | standaloneDnsProxy.debug | bool | `false` | Standalone DNS proxy debug mode |
 | standaloneDnsProxy.enabled | bool | `false` | Enable standalone DNS proxy (alpha feature) |
 | standaloneDnsProxy.image | object | `{"digest":"","override":null,"pullPolicy":"IfNotPresent","repository":"","tag":"","useDigest":true}` | Standalone DNS proxy image |
+| standaloneDnsProxy.minReadySeconds | int | `5` | Minimum number of seconds for which a newly created standalone DNS proxy pod should be ready before it is considered available. |
 | standaloneDnsProxy.nodeSelector | object | `{"kubernetes.io/os":"linux"}` | Standalone DNS proxy Node Selector |
 | standaloneDnsProxy.rollOutPods | bool | `false` | Roll out Standalone DNS proxy automatically when configmap is updated. |
 | standaloneDnsProxy.serverPort | int | `10095` | Standalone DNS proxy server port |
@@ -1048,7 +1072,7 @@ contributors across the globe, there is almost always someone available to help.
 | tunnelPort | int | Port 8472 for VXLAN, Port 6081 for Geneve | Configure VXLAN and Geneve tunnel port. |
 | tunnelProtocol | string | `"vxlan"` | Tunneling protocol to use in tunneling mode and for ad-hoc tunnels. Possible values:   - ""   - vxlan   - geneve |
 | tunnelSourcePortRange | string | 0-0 to let the kernel driver decide the range | Configure VXLAN and Geneve tunnel source port range hint. |
-| underlayProtocol | string | `"ipv4"` | IP family for the underlay. Possible values:   - "ipv4"   - "ipv6" |
+| underlayProtocol | string | `"auto"` | IP family for the underlay. Possible values:   - "ipv4"   - "ipv6"   - "auto" |
 | updateStrategy | object | `{"rollingUpdate":{"maxUnavailable":2},"type":"RollingUpdate"}` | Cilium agent update strategy |
 | upgradeCompatibility | string | `nil` | upgradeCompatibility helps users upgrading to ensure that the configMap for Cilium will not change critical values to ensure continued operation This flag is not required for new installations. For example: '1.7', '1.8', '1.9' |
 | vtep.cidr | string | `""` | A space separated list of VTEP device CIDRs, for example "1.1.1.0/24 1.1.2.0/24" |
diff --git a/packages/system/cilium/charts/cilium/README.md.gotmpl b/packages/system/cilium/charts/cilium/README.md.gotmpl
deleted file mode 100644
index 4aa7da8f95..0000000000
--- a/packages/system/cilium/charts/cilium/README.md.gotmpl
+++ /dev/null
@@ -1,54 +0,0 @@
-{{ template "chart.header" . }}
-
-{{ template "chart.deprecationWarning" . }}
-
-{{ template "chart.versionBadge" . }}{{ template "chart.typeBadge" . }}{{ template "chart.appVersionBadge" . }}
-
-Cilium is open source software for providing and transparently securing
-network connectivity and loadbalancing between application workloads such as
-application containers or processes. Cilium operates at Layer 3/4 to provide
-traditional networking and security services as well as Layer 7 to protect and
-secure use of modern application protocols such as HTTP, gRPC and Kafka.
-
-A new Linux kernel technology called eBPF is at the foundation of Cilium.
-It supports dynamic insertion of eBPF bytecode into the Linux kernel at various
-integration points such as: network IO, application sockets, and tracepoints
-to implement security, networking and visibility logic. eBPF is highly
-efficient and flexible.
-
-![Cilium feature overview](https://raw.githubusercontent.com/cilium/cilium/main/Documentation/images/cilium_overview.png)
-
-## Prerequisites
-
-* Kubernetes: `{{ template "chart.kubeVersion" . }}`
-* Helm: `>= 3.0`
-
-## Getting Started
-
-Try Cilium on any Kubernetes distribution in under 15 minutes:
-
-| Minikube | Self-Managed K8s | Amazon EKS | Google GKE | Microsoft AKS |
-|:-:|:-:|:-:|:-:|:-:|
-| [![Minikube](https://raw.githubusercontent.com/cilium/charts/master/images/minikube.svg)](https://docs.cilium.io/en/stable/gettingstarted/k8s-install-default/) | [![Self-Managed Kubernetes](https://raw.githubusercontent.com/cilium/charts/master/images/k8s.png)](https://docs.cilium.io/en/stable/gettingstarted/k8s-install-default/) | [![Amazon EKS](https://raw.githubusercontent.com/cilium/charts/master/images/aws.svg)](https://docs.cilium.io/en/stable/gettingstarted/k8s-install-default/) | [![Google GKE](https://raw.githubusercontent.com/cilium/charts/master/images/google-cloud.svg)](https://docs.cilium.io/en/stable/gettingstarted/k8s-install-default/) | [![Microsoft AKS](https://raw.githubusercontent.com/cilium/charts/master/images/azure.svg)](https://docs.cilium.io/en/stable/gettingstarted/k8s-install-default/) |
-
-Or, for a quick install with the default configuration:
-
-```
-$ helm repo add cilium https://helm.cilium.io/
-$ helm install cilium cilium/cilium --namespace=kube-system
-```
-
-After Cilium is installed, you can explore the features that Cilium has to
-offer from the [Getting Started Guides page](https://docs.cilium.io/en/stable/gettingstarted/).
-
-{{ template "chart.maintainersSection" . }}
-
-{{ template "chart.sourcesSection" . }}
-
-## Getting Help
-
-The best way to get help if you get stuck is to ask a question on the
-[Cilium Slack channel](https://slack.cilium.io). With Cilium
-contributors across the globe, there is almost always someone available to help.
-
-{{ template "chart.valuesSection" . }}
diff --git a/packages/system/cilium/charts/cilium/files/cilium-agent/dashboards/cilium-dashboard.json b/packages/system/cilium/charts/cilium/files/cilium-agent/dashboards/cilium-dashboard.json
index 1f0a1080d9..21d0cbf955 100644
--- a/packages/system/cilium/charts/cilium/files/cilium-agent/dashboards/cilium-dashboard.json
+++ b/packages/system/cilium/charts/cilium/files/cilium-agent/dashboards/cilium-dashboard.json
@@ -8249,7 +8249,7 @@
             "type": "prometheus",
             "uid": "${DS_PROMETHEUS}"
           },
-          "expr": "sum(cilium_policy_change_total{k8s_app=\"cilium\", pod=~\"$pod\", outcome=\"fail\"}) by (pod)",
+          "expr": "sum(cilium_policy_change_total{k8s_app=\"cilium\", pod=~\"$pod\", outcome=\"failure\"}) by (pod)",
           "format": "time_series",
           "intervalFactor": 1,
           "legendFormat": "policy change errors",
diff --git a/packages/system/cilium/charts/cilium/files/cilium-envoy/configmap/bootstrap-config.yaml b/packages/system/cilium/charts/cilium/files/cilium-envoy/configmap/bootstrap-config.yaml
index 90ebf4ac23..5dc399596f 100644
--- a/packages/system/cilium/charts/cilium/files/cilium-envoy/configmap/bootstrap-config.yaml
+++ b/packages/system/cilium/charts/cilium/files/cilium-envoy/configmap/bootstrap-config.yaml
@@ -1,6 +1,13 @@
+{{- $envoyXdsMode := include "envoyXdsMode" . -}}
 node:
   id: "host~127.0.0.1~no-id~localdomain"
   cluster: "ingress-cluster"
+{{- if .Values.envoy.nodeLocality.enabled }}
+clusterManager:
+  # Zone-aware load balancing depends on Envoy's local cluster wiring.
+  # Keep this aligned with a statically defined cluster name in this bootstrap.
+  localClusterName: "/cilium-locality-cluster"
+{{- end }}
 staticResources:
   listeners:
   {{- if .Values.envoy.prometheus.enabled }}
@@ -246,6 +253,11 @@ staticResources:
   - name: "xds-grpc-cilium"
     type: "STATIC"
     connectTimeout: "{{ .Values.envoy.connectTimeoutSeconds }}s"
+    circuitBreakers:
+      thresholds:
+      - maxRetries: {{ .Values.envoy.maxConcurrentRetries }}
+        maxConnections: {{ .Values.envoy.clusterMaxConnections }}
+        maxRequests: {{ .Values.envoy.clusterMaxRequests }}
     loadAssignment:
       clusterName: "xds-grpc-cilium"
       endpoints:
@@ -259,6 +271,28 @@ staticResources:
         "@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions"
         explicitHttpConfig:
           http2ProtocolOptions: {}
+  {{- if .Values.envoy.nodeLocality.enabled }}
+  - name: "/cilium-locality-cluster"
+    type: "EDS"
+    connectTimeout: "{{ .Values.envoy.connectTimeoutSeconds }}s"
+    edsClusterConfig:
+      edsConfig:
+        {{- if or (eq $envoyXdsMode "ads") (eq $envoyXdsMode "strict-ads") }}
+        ads: {}
+        resourceApiVersion: "V3"
+        {{- else }}
+        apiConfigSource:
+          apiType: "GRPC"
+          transportApiVersion: "V3"
+          grpcServices:
+          - envoyGrpc:
+              clusterName: "xds-grpc-cilium"
+          setNodeOnFirstMessageOnly: true
+        resourceApiVersion: "V3"
+        {{- end }}
+      serviceName: "/cilium-locality-cluster"
+    lbPolicy: "ROUND_ROBIN"
+  {{- end }}
   - name: "/envoy-admin"
     type: "STATIC"
     connectTimeout: "{{ .Values.envoy.connectTimeoutSeconds }}s"
@@ -271,6 +305,23 @@ staticResources:
               pipe:
                 path: "/var/run/cilium/envoy/sockets/admin.sock"
 dynamicResources:
+{{- if or (eq $envoyXdsMode "ads") (eq $envoyXdsMode "strict-ads") }}
+  adsConfig:
+    apiType: "GRPC"
+    transportApiVersion: "V3"
+    setNodeOnFirstMessageOnly: true
+    grpcServices:
+    - envoyGrpc:
+        clusterName: "xds-grpc-cilium"
+  ldsConfig:
+    initialFetchTimeout: "{{ .Values.envoy.initialFetchTimeoutSeconds }}s"
+    ads: {}
+    resourceApiVersion: "V3"
+  cdsConfig:
+    initialFetchTimeout: "{{ .Values.envoy.initialFetchTimeoutSeconds }}s"
+    ads: {}
+    resourceApiVersion: "V3"
+{{- else }}
   ldsConfig:
     initialFetchTimeout: "{{ .Values.envoy.initialFetchTimeoutSeconds }}s"
     apiConfigSource:
@@ -291,6 +342,7 @@ dynamicResources:
           clusterName: "xds-grpc-cilium"
       setNodeOnFirstMessageOnly: true
     resourceApiVersion: "V3"
+{{- end }}
 bootstrapExtensions:
 - name: "envoy.bootstrap.internal_listener"
   typedConfig:
diff --git a/packages/system/cilium/charts/cilium/files/nodeinit/prestop.bash b/packages/system/cilium/charts/cilium/files/nodeinit/prestop.bash
index e78f178a6c..ce94804624 100644
--- a/packages/system/cilium/charts/cilium/files/nodeinit/prestop.bash
+++ b/packages/system/cilium/charts/cilium/files/nodeinit/prestop.bash
@@ -32,9 +32,12 @@ rm -f /tmp/node-init.cilium.io
 touch /tmp/node-deinit.cilium.io
 
 {{- if .Values.nodeinit.reconfigureKubelet }}
-# Check if we're running on a GKE containerd flavor.
+# Check if we're running on GKE, identified by the
+# presence of the kubelet binary at GKE_KUBERNETES_BIN_DIR. This also matches
+# after startup.bash has replaced the real kubelet with the Cilium wrapper,
+# since the wrapper is installed at the same path.
 GKE_KUBERNETES_BIN_DIR="/home/kubernetes/bin"
-if [[ -f "${GKE_KUBERNETES_BIN_DIR}/gke" ]] && command -v containerd &>/dev/null; then
+if [[ -f "${GKE_KUBERNETES_BIN_DIR}/kubelet" ]]; then
   CONTAINERD_CONFIG="/etc/containerd/config.toml"
   echo "Reverting changes to the containerd configuration"
   sed -Ei "s/^\#(\s+conf_template)/\1/g" "${CONTAINERD_CONFIG}"
diff --git a/packages/system/cilium/charts/cilium/files/nodeinit/startup.bash b/packages/system/cilium/charts/cilium/files/nodeinit/startup.bash
index 68e6b50b33..a92cd3aa37 100644
--- a/packages/system/cilium/charts/cilium/files/nodeinit/startup.bash
+++ b/packages/system/cilium/charts/cilium/files/nodeinit/startup.bash
@@ -24,11 +24,11 @@ fi
 {{- end }}
 
 {{- if .Values.nodeinit.reconfigureKubelet }}
-# Check if we're running on a GKE containerd flavor as indicated by the presence
-# of the '--container-runtime-endpoint' flag in '/etc/default/kubelet'.
+# Check if we're running on GKE, identified by the
+# presence of the kubelet binary at GKE_KUBERNETES_BIN_DIR.
 GKE_KUBERNETES_BIN_DIR="/home/kubernetes/bin"
 KUBELET_DEFAULTS_FILE="/etc/default/kubelet"
-if [[ -f "${GKE_KUBERNETES_BIN_DIR}/gke" ]] && [[ $(grep -cF -- '--container-runtime-endpoint' "${KUBELET_DEFAULTS_FILE}") == "1" ]]; then
+if [[ -f "${GKE_KUBERNETES_BIN_DIR}/kubelet" ]]; then
   echo "GKE *_containerd flavor detected..."
 
   # (GKE *_containerd) Upon node restarts, GKE's containerd images seem to reset
diff --git a/packages/system/cilium/charts/cilium/templates/_extensions.tpl b/packages/system/cilium/charts/cilium/templates/_extensions.tpl
index 8c0e5c20ab..151911af9e 100644
--- a/packages/system/cilium/charts/cilium/templates/_extensions.tpl
+++ b/packages/system/cilium/charts/cilium/templates/_extensions.tpl
@@ -103,6 +103,45 @@ Allow packagers to add extra arguments to the clustermesh-apiserver kvstoremesh
 {{- define "clustermesh.kvstoremesh.args.extra" -}}
 {{- end }}
 
+{{/*
+Allow packagers to define the startup probe handler for the cilium-envoy container.
+*/}}
+{{- define "envoy.startupProbe" -}}
+httpGet:
+  host: {{ .Values.ipv4.enabled | ternary "127.0.0.1" "::1" | quote }}
+  path: /healthz
+  port: {{ .Values.envoy.healthPort }}
+  scheme: HTTP
+{{- end }}
+
+{{/*
+Allow packagers to define the liveness probe handler for the cilium-envoy container.
+*/}}
+{{- define "envoy.livenessProbe" -}}
+httpGet:
+  host: {{ .Values.ipv4.enabled | ternary "127.0.0.1" "::1" | quote }}
+  path: /healthz
+  port: {{ .Values.envoy.healthPort }}
+  scheme: HTTP
+{{- end }}
+
+{{/*
+Allow packagers to define the readiness probe handler for the cilium-envoy container.
+*/}}
+{{- define "envoy.readinessProbe" -}}
+httpGet:
+  host: {{ .Values.ipv4.enabled | ternary "127.0.0.1" "::1" | quote }}
+  path: /healthz
+  port: {{ .Values.envoy.healthPort }}
+  scheme: HTTP
+{{- end }}
+
+{{/*
+Allow packagers to add lifecycle hooks to the cilium-envoy container.
+*/}}
+{{- define "envoy.lifecycle" -}}
+{{- end }}
+
 {{/*
 Allow packagers to add init containers to the cilium-envoy pods.
 */}}
diff --git a/packages/system/cilium/charts/cilium/templates/_helpers.tpl b/packages/system/cilium/charts/cilium/templates/_helpers.tpl
index e90aa482e5..e84091845a 100644
--- a/packages/system/cilium/charts/cilium/templates/_helpers.tpl
+++ b/packages/system/cilium/charts/cilium/templates/_helpers.tpl
@@ -183,6 +183,19 @@ Return user specify envoy.enabled or default value based on the upgradeCompatibi
   {{- end }}
 {{- end }}
 
+{{/*
+Return user specified envoy.xdsMode or default value based on the upgradeCompatibility.
+*/}}
+{{- define "envoyXdsMode" }}
+  {{- if ne .Values.envoy.xdsMode nil }}
+    {{- .Values.envoy.xdsMode }}
+  {{- else }}
+    {{- if semverCompare ">=1.20" (default "1.20" .Values.upgradeCompatibility) }}
+      {{- "ads" }}
+    {{- end }}
+  {{- end }}
+{{- end }}
+
 {{/*
 Return user specify tls.readSecretsOnlyFromSecretsNamespace and take into account tls.secretsBackend
 */}}
diff --git a/packages/system/cilium/charts/cilium/templates/cilium-agent/clusterrole.yaml b/packages/system/cilium/charts/cilium/templates/cilium-agent/clusterrole.yaml
index 57b13447bf..40a9764be9 100644
--- a/packages/system/cilium/charts/cilium/templates/cilium-agent/clusterrole.yaml
+++ b/packages/system/cilium/charts/cilium/templates/cilium-agent/clusterrole.yaml
@@ -14,6 +14,7 @@ metadata:
   {{- end }}
   labels:
     app.kubernetes.io/part-of: cilium
+    helm.sh/chart: {{ include "cilium.chart" . }}
     {{- with .Values.commonLabels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
@@ -40,7 +41,6 @@ rules:
   - namespaces
   - services
   - pods
-  - endpoints
   - nodes
 {{- if not $readSecretsOnlyFromSecretsNamespace }}
   - secrets
@@ -111,6 +111,7 @@ rules:
   - ciliumcidrgroups
   - ciliuml2announcementpolicies
   - ciliumpodippools
+  - ciliumdatapathplugins
   verbs:
   - list
   - watch
@@ -153,4 +154,14 @@ rules:
   - ciliumbgpnodeconfigs/status
   verbs:
   - patch
+{{- if .Values.k8sClusterNetworkPolicy.enabled }}
+- apiGroups:
+  - policy.networking.k8s.io
+  resources:
+  - clusternetworkpolicies
+  verbs:
+  - get
+  - list
+  - watch
+{{- end }}
 {{- end }}
diff --git a/packages/system/cilium/charts/cilium/templates/cilium-agent/clusterrolebinding.yaml b/packages/system/cilium/charts/cilium/templates/cilium-agent/clusterrolebinding.yaml
index 0003b513a0..6a7ae27967 100644
--- a/packages/system/cilium/charts/cilium/templates/cilium-agent/clusterrolebinding.yaml
+++ b/packages/system/cilium/charts/cilium/templates/cilium-agent/clusterrolebinding.yaml
@@ -9,6 +9,7 @@ metadata:
   {{- end }}
   labels:
     app.kubernetes.io/part-of: cilium
+    helm.sh/chart: {{ include "cilium.chart" . }}
     {{- with .Values.commonLabels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
diff --git a/packages/system/cilium/charts/cilium/templates/cilium-agent/daemonset.yaml b/packages/system/cilium/charts/cilium/templates/cilium-agent/daemonset.yaml
index fff1b384e5..b936101c4b 100644
--- a/packages/system/cilium/charts/cilium/templates/cilium-agent/daemonset.yaml
+++ b/packages/system/cilium/charts/cilium/templates/cilium-agent/daemonset.yaml
@@ -26,6 +26,7 @@ metadata:
     k8s-app: cilium
     app.kubernetes.io/part-of: cilium
     app.kubernetes.io/name: cilium-agent
+    helm.sh/chart: {{ include "cilium.chart" . }}
     {{- with .Values.commonLabels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
@@ -36,6 +37,9 @@ metadata:
     {{- end }}
     {{- end }}
 spec:
+  {{- if .Values.minReadySeconds }}
+  minReadySeconds: {{ .Values.minReadySeconds }}
+  {{- end }}
   selector:
     matchLabels:
       k8s-app: cilium
@@ -65,6 +69,7 @@ spec:
         k8s-app: cilium
         app.kubernetes.io/name: cilium-agent
         app.kubernetes.io/part-of: cilium
+        helm.sh/chart: {{ include "cilium.chart" . }}
         {{- with .Values.commonLabels }}
         {{- toYaml . | nindent 8 }}
         {{- end }}
@@ -821,6 +826,9 @@ spec:
       automountServiceAccountToken: {{ .Values.serviceAccounts.cilium.automount }}
       terminationGracePeriodSeconds: {{ .Values.terminationGracePeriodSeconds }}
       hostNetwork: true
+      {{- if (semverCompare ">= 1.33-0" .Capabilities.KubeVersion.Version) }}
+      hostUsers: true
+      {{- end }}
       {{- include "cilium-agent.dnsPolicy" . | nindent 6 }}
       {{- if (eq .Values.scheduling.mode "anti-affinity")  }}
       {{- with .Values.affinity }}
@@ -836,7 +844,8 @@ spec:
       tolerations:
         {{- toYaml . | trim | nindent 8 }}
       {{- end }}
-      {{- if and .Values.clustermesh.config.enabled (not (and .Values.clustermesh.useAPIServer .Values.clustermesh.apiserver.kvstoremesh.enabled )) }}
+      {{/* TODO: remove hostAliases for the v1.21 release as this is now handled via a static dialer to avoid pod restart */}}
+      {{- if and .Values.clustermesh.config.enabled (not (and .Values.clustermesh.useAPIServer .Values.clustermesh.apiserver.kvstoremesh.enabled )) (not .Values.clustermesh.disableKubernetesHostAliases) }}
       hostAliases:
       {{- range $_, $cluster := (include "clustermesh-clusters" . | fromJson) }}
       {{- range $ip := $cluster.ips }}
diff --git a/packages/system/cilium/charts/cilium/templates/cilium-agent/dashboards-configmap.yaml b/packages/system/cilium/charts/cilium/templates/cilium-agent/dashboards-configmap.yaml
index c0ce2c2b1d..9ec0f7bcaf 100644
--- a/packages/system/cilium/charts/cilium/templates/cilium-agent/dashboards-configmap.yaml
+++ b/packages/system/cilium/charts/cilium/templates/cilium-agent/dashboards-configmap.yaml
@@ -12,6 +12,7 @@ metadata:
     k8s-app: cilium
     app.kubernetes.io/name: cilium-agent
     app.kubernetes.io/part-of: cilium
+    helm.sh/chart: {{ include "cilium.chart" $ }}
     {{- with $.Values.commonLabels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
diff --git a/packages/system/cilium/charts/cilium/templates/cilium-agent/role.yaml b/packages/system/cilium/charts/cilium/templates/cilium-agent/role.yaml
index df60d89b2b..95d6fcf2e8 100644
--- a/packages/system/cilium/charts/cilium/templates/cilium-agent/role.yaml
+++ b/packages/system/cilium/charts/cilium/templates/cilium-agent/role.yaml
@@ -13,6 +13,7 @@ metadata:
   {{- end }}
   labels:
     app.kubernetes.io/part-of: cilium
+    helm.sh/chart: {{ include "cilium.chart" . }}
     {{- with .Values.commonLabels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
@@ -41,6 +42,7 @@ metadata:
   {{- end }}
   labels:
     app.kubernetes.io/part-of: cilium
+    helm.sh/chart: {{ include "cilium.chart" . }}
 rules:
 - apiGroups:
   - ""
@@ -65,6 +67,7 @@ metadata:
   {{- end }}
   labels:
     app.kubernetes.io/part-of: cilium
+    helm.sh/chart: {{ include "cilium.chart" . }}
 rules:
 - apiGroups:
   - ""
@@ -89,6 +92,7 @@ metadata:
   {{- end }}
   labels:
     app.kubernetes.io/part-of: cilium
+    helm.sh/chart: {{ include "cilium.chart" . }}
 rules:
 - apiGroups:
   - ""
@@ -109,6 +113,7 @@ metadata:
   namespace: {{ .Values.bgpControlPlane.secretsNamespace.name | quote }}
   labels:
     app.kubernetes.io/part-of: cilium
+    helm.sh/chart: {{ include "cilium.chart" . }}
 rules:
 - apiGroups:
   - ""
@@ -133,6 +138,7 @@ metadata:
   {{- end }}
   labels:
     app.kubernetes.io/part-of: cilium
+    helm.sh/chart: {{ include "cilium.chart" . }}
 rules:
 - apiGroups:
   - ""
diff --git a/packages/system/cilium/charts/cilium/templates/cilium-agent/rolebinding.yaml b/packages/system/cilium/charts/cilium/templates/cilium-agent/rolebinding.yaml
index 5caf2f1540..85c7444c79 100644
--- a/packages/system/cilium/charts/cilium/templates/cilium-agent/rolebinding.yaml
+++ b/packages/system/cilium/charts/cilium/templates/cilium-agent/rolebinding.yaml
@@ -13,6 +13,7 @@ metadata:
   {{- end }}
   labels:
     app.kubernetes.io/part-of: cilium
+    helm.sh/chart: {{ include "cilium.chart" . }}
     {{- with .Values.commonLabels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
@@ -39,6 +40,7 @@ metadata:
   {{- end }}
   labels:
     app.kubernetes.io/part-of: cilium
+    helm.sh/chart: {{ include "cilium.chart" . }}
     {{- with .Values.commonLabels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
@@ -65,6 +67,7 @@ metadata:
   {{- end }}
   labels:
     app.kubernetes.io/part-of: cilium
+    helm.sh/chart: {{ include "cilium.chart" . }}
     {{- with .Values.commonLabels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
@@ -91,6 +94,7 @@ metadata:
   {{- end }}
   labels:
     app.kubernetes.io/part-of: cilium
+    helm.sh/chart: {{ include "cilium.chart" . }}
     {{- with .Values.commonLabels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
@@ -113,6 +117,7 @@ metadata:
   namespace: {{ .Values.bgpControlPlane.secretsNamespace.name | quote }}
   labels:
     app.kubernetes.io/part-of: cilium
+    helm.sh/chart: {{ include "cilium.chart" . }}
     {{- with .Values.commonLabels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
@@ -135,6 +140,7 @@ metadata:
   namespace: {{ .Values.tls.secretsNamespace.name | quote }}
   labels:
     app.kubernetes.io/part-of: cilium
+    helm.sh/chart: {{ include "cilium.chart" . }}
     {{- with .Values.commonLabels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
diff --git a/packages/system/cilium/charts/cilium/templates/cilium-agent/service.yaml b/packages/system/cilium/charts/cilium/templates/cilium-agent/service.yaml
index 8f89eba67c..6aa8d01dbd 100644
--- a/packages/system/cilium/charts/cilium/templates/cilium-agent/service.yaml
+++ b/packages/system/cilium/charts/cilium/templates/cilium-agent/service.yaml
@@ -14,6 +14,7 @@ metadata:
     k8s-app: cilium
     app.kubernetes.io/name: cilium-agent
     app.kubernetes.io/part-of: cilium
+    helm.sh/chart: {{ include "cilium.chart" . }}
     {{- with .Values.commonLabels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
@@ -46,6 +47,7 @@ metadata:
     k8s-app: cilium
     app.kubernetes.io/name: cilium-agent
     app.kubernetes.io/part-of: cilium
+    helm.sh/chart: {{ include "cilium.chart" . }}
     {{- with .Values.commonLabels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
diff --git a/packages/system/cilium/charts/cilium/templates/cilium-agent/servicemonitor.yaml b/packages/system/cilium/charts/cilium/templates/cilium-agent/servicemonitor.yaml
index 10be4cceb2..5330d8aa8e 100644
--- a/packages/system/cilium/charts/cilium/templates/cilium-agent/servicemonitor.yaml
+++ b/packages/system/cilium/charts/cilium/templates/cilium-agent/servicemonitor.yaml
@@ -8,6 +8,7 @@ metadata:
   labels:
     app.kubernetes.io/part-of: cilium
     app.kubernetes.io/name: cilium-agent
+    helm.sh/chart: {{ include "cilium.chart" . }}
     {{- with .Values.commonLabels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
diff --git a/packages/system/cilium/charts/cilium/templates/cilium-configmap.yaml b/packages/system/cilium/charts/cilium/templates/cilium-configmap.yaml
index 5d76944dd3..a49d25e624 100644
--- a/packages/system/cilium/charts/cilium/templates/cilium-configmap.yaml
+++ b/packages/system/cilium/charts/cilium/templates/cilium-configmap.yaml
@@ -8,8 +8,6 @@
 {{- $defaultOperatorApiServeAddr := "localhost:9234" -}}
 {{- $defaultBpfCtTcpMax := 524288 -}}
 {{- $defaultBpfCtAnyMax := 262144 -}}
-{{- $enableIdentityMark := "true" -}}
-{{- $fragmentTracking := "true" -}}
 {{- $defaultKubeProxyReplacement := "false" -}}
 {{- $azureUsePrimaryAddress := "true" -}}
 {{- $defaultK8sClientQPS := 5 -}}
@@ -285,12 +283,17 @@ data:
   ingress-lb-annotation-prefixes: {{ .Values.ingressController.ingressLBAnnotationPrefixes | join " " | quote }}
   ingress-default-lb-mode: {{ .Values.ingressController.loadbalancerMode }}
   ingress-shared-lb-service-name: {{ .Values.ingressController.service.name }}
+  ingress-default-xff-num-trusted-hops: {{ .Values.ingressController.xffNumTrustedHops | quote }}
+  ingress-use-remote-address: {{ .Values.ingressController.useRemoteAddress | quote }}
   {{- if and .Values.ingressController.defaultSecretNamespace .Values.ingressController.defaultSecretName }}
   ingress-default-secret-namespace: {{ .Values.ingressController.defaultSecretNamespace | quote }}
   ingress-default-secret-name: {{ .Values.ingressController.defaultSecretName | quote }}
   {{- end }}
   ingress-hostnetwork-enabled: {{ .Values.ingressController.hostNetwork.enabled | quote }}
   ingress-hostnetwork-shared-listener-port: {{ .Values.ingressController.hostNetwork.sharedListenerPort | quote }}
+  ingress-hostnetwork-http-listener-port: {{ .Values.ingressController.hostNetwork.httpPort | quote }}
+  ingress-hostnetwork-https-listener-port: {{ .Values.ingressController.hostNetwork.httpsPort | quote }}
+  ingress-hostnetwork-tls-passthrough-listener-port: {{ .Values.ingressController.hostNetwork.tlsPassthroughPort | quote }}
   ingress-hostnetwork-nodelabelselector: {{ include "mapToString" .Values.ingressController.hostNetwork.nodes.matchLabels | quote }}
 {{- end }}
 
@@ -301,6 +304,7 @@ data:
   enable-gateway-api-app-protocol: {{ or .Values.gatewayAPI.enableAppProtocol .Values.gatewayAPI.enableAlpn | quote }}
   enable-gateway-api-alpn: {{ .Values.gatewayAPI.enableAlpn | quote }}
   gateway-api-xff-num-trusted-hops: {{ .Values.gatewayAPI.xffNumTrustedHops | quote }}
+  gateway-api-use-remote-address: {{ .Values.gatewayAPI.useRemoteAddress | quote }}
   gateway-api-service-externaltrafficpolicy: {{ .Values.gatewayAPI.externalTrafficPolicy | quote }}
   gateway-api-secrets-namespace: {{ .Values.gatewayAPI.secretsNamespace.name | quote }}
   gateway-api-hostnetwork-enabled: {{ .Values.gatewayAPI.hostNetwork.enabled | quote }}
@@ -332,6 +336,10 @@ data:
   # address.
   enable-ipv6: {{ .Values.ipv6.enabled | quote }}
 
+{{- if eq .Values.preferIpv6 true }}
+  prefer-ipv6: "true"
+{{- end }}
+
 {{- if .Values.cleanState }}
   # If a serious issue occurs during Cilium startup, this
   # invasive option may be set to true to remove all persistent
@@ -483,9 +491,17 @@ data:
 {{- if hasKey .Values.bpf "lbSourceRangeAllTypes" }}
   bpf-lb-source-range-all-types: {{ .Values.bpf.lbSourceRangeAllTypes | quote }}
 {{- end }}
-{{- if hasKey .Values.bpf "lbAlgorithmAnnotation" }}
+{{- if or (hasKey .Values.bpf "lbAlgorithmAnnotation") .Values.gatewayAPI.enabled }}
+# When Gateway API is enabled this is forced to "true" so per-backend weights
+# on TCPRoute/UDPRoute take effect (Maglev honors the LB algorithm annotation only
+# when enabled). Paired with `bpf-lb-sock-hostns-only`, which is forced "true"
+# for the same reason.
+{{- if .Values.gatewayAPI.enabled }}
+  bpf-lb-algorithm-annotation: "true"
+{{- else }}
   bpf-lb-algorithm-annotation: {{ .Values.bpf.lbAlgorithmAnnotation | quote }}
 {{- end }}
+{{- end }}
 {{- if hasKey .Values.bpf "lbModeAnnotation" }}
   bpf-lb-mode-annotation: {{ .Values.bpf.lbModeAnnotation | quote }}
 {{- end }}
@@ -543,13 +559,13 @@ data:
 {{- if eq .Values.routingMode "native" }}
   {{- if and .Values.ipv4.enabled .Values.enableIPv4Masquerade (not .Values.ipMasqAgent.enabled) }}
     {{- if and (ne $ipam "eni") (ne $ipam "alibabacloud") }}
-      {{- if not .Values.ipv4NativeRoutingCIDR }}
+      {{- if and (not .Values.ipv4NativeRoutingCIDR) (not (and (eq $ipam "cluster-pool") .Values.nativeRoutingCIDRFromClusterPool)) }}
         {{- fail " ipv4NativeRoutingCIDR must be set when routingMode is native"}}
       {{- end }}
     {{- end }}
   {{- end }}
   {{- if and .Values.ipv6.enabled .Values.enableIPv6Masquerade (not .Values.ipMasqAgent.enabled) }}
-    {{- if not .Values.ipv6NativeRoutingCIDR }}
+    {{- if and (not .Values.ipv6NativeRoutingCIDR) (not (and (eq $ipam "cluster-pool") .Values.nativeRoutingCIDRFromClusterPool)) }}
       {{- fail "ipv6NativeRoutingCIDR must be set when routingMode is native"  }}
     {{- end }}
   {{- end }}
@@ -688,11 +704,6 @@ data:
   #  - portmap (Enables HostPort support for Cilium)
   cni-chaining-mode: {{ $cniChainingMode }}
 
-{{- if hasKey .Values "enableIdentityMark" }}
-  enable-identity-mark: {{ .Values.enableIdentityMark | quote }}
-{{- else if (ne $enableIdentityMark "true") }}
-  enable-identity-mark: "false"
-{{- end }}
 {{- if ne $cniChainingMode "portmap" }}
   # Disable the PodCIDR route to the cilium_host interface as it is not
   # required. While chaining, it is the responsibility of the underlying plugin
@@ -701,6 +712,10 @@ data:
 {{- end }}
 {{- end }}
 
+{{- if hasKey .Values "enableIdentityMark" }}
+  enable-identity-mark: {{ .Values.enableIdentityMark | quote }}
+{{- end }}
+
 {{- if (not (kindIs "invalid" .Values.enableIPv4Masquerade)) }}
   enable-ipv4-masquerade: {{.Values.enableIPv4Masquerade | quote }}
 {{- else }}
@@ -737,9 +752,6 @@ data:
 
     {{- if and .Values.encryption.ipsec.mountPath .Values.encryption.ipsec.keyFile }}
   ipsec-key-file: {{ .Values.encryption.ipsec.mountPath }}/{{ .Values.encryption.ipsec.keyFile }}
-    {{- end }}
-    {{- if .Values.encryption.ipsec.interface }}
-  encrypt-interface: {{ .Values.encryption.ipsec.interface }}
     {{- end }}
     {{- if hasKey .Values.encryption.ipsec "keyWatcher" }}
   enable-ipsec-key-watcher: {{ .Values.encryption.ipsec.keyWatcher | quote }}
@@ -747,7 +759,6 @@ data:
     {{- if .Values.encryption.ipsec.keyRotationDuration }}
   ipsec-key-rotation-duration: {{ include "validateDuration" .Values.encryption.ipsec.keyRotationDuration | quote }}
     {{- end }}
-  enable-ipsec-encrypted-overlay: {{ .Values.encryption.ipsec.encryptedOverlay | quote }}
   {{- else if eq .Values.encryption.type "wireguard" }}
   enable-wireguard: {{ .Values.encryption.enabled | quote }}
     {{- if .Values.encryption.wireguard.persistentKeepalive }}
@@ -755,19 +766,13 @@ data:
     {{- end }}
   {{- else if eq .Values.encryption.type "ztunnel" }}
   enable-ztunnel: {{ .Values.encryption.enabled | quote }}
+  ztunnel-ca-type: {{ .Values.encryption.ztunnel.ca.type | quote }}
   {{- end }}
   {{- if .Values.encryption.nodeEncryption }}
   encrypt-node: {{ .Values.encryption.nodeEncryption | quote }}
   {{- end }}
 {{- end }}
 
-{{- if .Values.encryption.strictMode.enabled }}
-  # --- DEPRECATED: Please use encryption.strictMode.egress.enabled instead
-  enable-encryption-strict-mode-egress: {{ .Values.encryption.strictMode.enabled | quote }}
-  encryption-strict-egress-cidr: {{ .Values.encryption.strictMode.cidr | quote }}
-  encryption-strict-egress-allow-remote-node-identities: {{ .Values.encryption.strictMode.allowRemoteNodeIdentities | quote }}
-{{- end }}
-
 {{- if .Values.encryption.strictMode.ingress.enabled }}
   enable-encryption-strict-mode-ingress: {{ .Values.encryption.strictMode.ingress.enabled | quote }}
 {{- end }}
@@ -822,17 +827,13 @@ data:
 
 {{- if hasKey .Values "fragmentTracking" }}
   enable-ipv4-fragment-tracking: {{ .Values.fragmentTracking | quote }}
-{{- else if (ne $fragmentTracking "true") }}
-  enable-ipv4-fragment-tracking: "false"
 {{- end }}
 
 {{- if .Values.nat46x64Gateway.enabled }}
   enable-nat46x64-gateway: {{ .Values.nat46x64Gateway.enabled | quote }}
 {{- end }}
 
-{{- if and .Values.hostFirewall .Values.hostFirewall.enabled }}
   enable-host-firewall: {{ .Values.hostFirewall.enabled | quote }}
-{{- end}}
 
 {{- if hasKey .Values "devices" }}
   # List of devices used to attach bpf_host.o (implements BPF NodePort,
@@ -858,9 +859,17 @@ data:
 {{- if hasKey $socketLB "enabled" }}
   bpf-lb-sock: {{ $socketLB.enabled | quote }}
 {{- end }}
-{{- if hasKey $socketLB "hostNamespaceOnly" }}
+{{- if or (hasKey $socketLB "hostNamespaceOnly") .Values.gatewayAPI.enabled }}
+# When Gateway API is enabled this is forced to "true" so per-backend weights
+# on TCPRoute/UDPRoute take effect (socket LB stays in the host namespace,
+# letting the Maglev LB mode apply). Paired with `bpf-lb-mode-annotation`,
+# which is forced "true" for the same reason.
+{{- if .Values.gatewayAPI.enabled }}
+  bpf-lb-sock-hostns-only: "true"
+{{- else }}
   bpf-lb-sock-hostns-only: {{ $socketLB.hostNamespaceOnly | quote }}
 {{- end }}
+{{- end }}
 {{- if hasKey $socketLB "terminatePodConnections" }}
   bpf-lb-sock-terminate-pod-connections: {{ $socketLB.terminatePodConnections | quote }}
 {{- end }}
@@ -882,6 +891,9 @@ data:
 {{- if hasKey .Values.nodePort "enableHealthCheck" }}
   enable-health-check-nodeport: {{ .Values.nodePort.enableHealthCheck | quote}}
 {{- end }}
+{{- if hasKey .Values.nodePort "enableDynamicSourceLookup" }}
+  enable-dynamic-source-lookup-nodeport: {{ .Values.nodePort.enableDynamicSourceLookup | quote}}
+{{- end }}
 {{- if .Values.gke.enabled }}
   enable-health-check-loadbalancer-ip: "true"
 {{- else if hasKey .Values.nodePort "enableHealthCheckLoadBalancerIP" }}
@@ -891,9 +903,6 @@ data:
   enable-auto-protect-node-port-range: {{ .Values.nodePort.autoProtectPortRange | quote }}
 {{- end }}
 {{- if hasKey .Values "loadBalancer" }}
-{{- if .Values.loadBalancer.standalone }}
-  bpf-lb-only: {{ .Values.loadBalancer.standalone | quote }}
-{{- end }}
 {{- if hasKey .Values.loadBalancer "mode" }}
   bpf-lb-mode: {{ .Values.loadBalancer.mode | quote }}
 {{- end }}
@@ -909,6 +918,9 @@ data:
 {{- if hasKey .Values.loadBalancer "serviceTopology" }}
   enable-service-topology: {{ .Values.loadBalancer.serviceTopology | quote }}
 {{- end }}
+{{- if hasKey .Values.loadBalancer "reflectorWaitTime" }}
+  lb-reflector-wait-time: {{ .Values.loadBalancer.reflectorWaitTime | quote }}
+{{- end }}
 {{- end }}
 
 {{- if hasKey .Values.maglev "tableSize" }}
@@ -956,7 +968,7 @@ data:
 {{- if hasKey .Values.k8s "requireIPv6PodCIDR" }}
   k8s-require-ipv6-pod-cidr: {{ .Values.k8s.requireIPv6PodCIDR | quote }}
 {{- end }}
-{{- if hasKey .Values.k8s "apiServerURLs" }}
+{{- if (not (kindIs "invalid" .Values.k8s.apiServerURLs)) }}
   k8s-api-server-urls: {{ .Values.k8s.apiServerURLs | quote }}
 {{- end }}
 {{- if and .Values.endpointRoutes .Values.endpointRoutes.enabled }}
@@ -967,6 +979,9 @@ data:
 {{- end }}
 {{- if hasKey .Values.k8sNetworkPolicy "enabled" }}
   enable-k8s-networkpolicy: {{ .Values.k8sNetworkPolicy.enabled | quote }}
+{{- end }}
+{{- if .Values.k8sClusterNetworkPolicy.enabled }}
+  enable-k8s-cluster-network-policy: "true"
 {{- end }}
   enable-endpoint-lockdown-on-policy-overflow: {{ .Values.endpointLockdownOnMapOverflow | quote }}
 {{- if .Values.cni.configMap }}
@@ -1107,10 +1122,6 @@ data:
 {{- end }}
 {{- end }}
 {{- end }}
-{{- if .Values.hubble.redact.kafka }}
-  # Enables redaction of the Kafka API key part in flows
-  hubble-redact-kafka-apikey: {{ .Values.hubble.redact.kafka.apiKey | quote }}
-{{- end }}
 {{- end }}
 {{- end }}
 {{- if .Values.hubble.export }}
@@ -1120,7 +1131,7 @@ data:
   hubble-export-file-max-size-mb: {{ .Values.hubble.export.fileMaxSizeMb | default .Values.hubble.export.static.fileMaxSizeMb | quote }}
   hubble-export-file-max-backups: {{ .Values.hubble.export.fileMaxBackups | default .Values.hubble.export.static.fileMaxBackups | quote }}
   hubble-export-file-compress: {{ .Values.hubble.export.fileCompress | default .Values.hubble.export.static.fileCompress | quote }}
-  hubble-export-aggregation-interval: {{ include "validateDuration" .Values.hubble.export.aggregationInterval | default .Values.hubble.export.static.aggregationInterval | quote }}
+  hubble-export-aggregation-interval: {{ include "validateDuration" (.Values.hubble.export.aggregationInterval | default .Values.hubble.export.static.aggregationInterval) | quote }}
   hubble-export-file-path: {{ .Values.hubble.export.static.filePath | quote }}
   hubble-export-fieldmask: {{ .Values.hubble.export.static.fieldMask | join " " | quote }}
   hubble-export-fieldaggregate: {{ .Values.hubble.export.static.fieldAggregate | join " " | quote }}
@@ -1148,7 +1159,7 @@ data:
   hubble-drop-events-interval: {{ .Values.hubble.dropEventEmitter.interval | quote }}
   hubble-drop-events-reasons: {{ .Values.hubble.dropEventEmitter.reasons | join " " | quote }}
 {{- end }}
-{{- if or (eq .Values.hubble.preferIpv6 true) (eq .Values.ipv4.enabled false) }}
+{{- if or (eq .Values.hubble.preferIpv6 true) (eq .Values.preferIpv6 true) (eq .Values.ipv4.enabled false) }}
   hubble-prefer-ipv6: "true"
 {{- end }}
 {{- if (not (kindIs "invalid" .Values.hubble.skipUnknownCGroupIDs)) }}
@@ -1194,10 +1205,26 @@ data:
 {{- if .Values.ipv4.enabled }}
   cluster-pool-ipv4-cidr: {{ .Values.ipam.operator.clusterPoolIPv4PodCIDRList | join " " | quote }}
   cluster-pool-ipv4-mask-size: {{ .Values.ipam.operator.clusterPoolIPv4MaskSize | quote }}
+{{- if and .Values.nativeRoutingCIDRFromClusterPool (not .Values.ipv4NativeRoutingCIDR) }}
+{{- $v4Pools := .Values.ipam.operator.clusterPoolIPv4PodCIDRList }}
+{{- if kindIs "string" $v4Pools }}{{- $v4Pools = splitList " " $v4Pools }}{{- end }}
+{{- if ne (len $v4Pools) 1 }}
+{{- fail "nativeRoutingCIDRFromClusterPool requires exactly one CIDR in ipam.operator.clusterPoolIPv4PodCIDRList; set ipv4NativeRoutingCIDR explicitly instead" }}
+{{- end }}
+  ipv4-native-routing-cidr: {{ first $v4Pools | quote }}
+{{- end }}
 {{- end }}
 {{- if .Values.ipv6.enabled }}
   cluster-pool-ipv6-cidr: {{ .Values.ipam.operator.clusterPoolIPv6PodCIDRList | join " " | quote }}
   cluster-pool-ipv6-mask-size: {{ .Values.ipam.operator.clusterPoolIPv6MaskSize | quote }}
+{{- if and .Values.nativeRoutingCIDRFromClusterPool (not .Values.ipv6NativeRoutingCIDR) }}
+{{- $v6Pools := .Values.ipam.operator.clusterPoolIPv6PodCIDRList }}
+{{- if kindIs "string" $v6Pools }}{{- $v6Pools = splitList " " $v6Pools }}{{- end }}
+{{- if ne (len $v6Pools) 1 }}
+{{- fail "nativeRoutingCIDRFromClusterPool requires exactly one CIDR in ipam.operator.clusterPoolIPv6PodCIDRList; set ipv6NativeRoutingCIDR explicitly instead" }}
+{{- end }}
+  ipv6-native-routing-cidr: {{ first $v6Pools | quote }}
+{{- end }}
 {{- end }}
 {{- end }}
 {{- if (eq $ipam "multi-pool") }}
@@ -1212,6 +1239,12 @@ data:
     {{- $attrs = append $attrs (printf "ipv6-cidrs:%s" (join "," $spec.ipv6.cidrs)) }}
     {{- $attrs = append $attrs (printf "ipv6-mask-size:%s" (toString $spec.ipv6.maskSize)) }}
     {{- end }}
+    {{- if hasKey $spec "allowFirstIP" }}
+    {{- $attrs = append $attrs (printf "allow-first-ip:%s" (toString $spec.allowFirstIP)) }}
+    {{- end }}
+    {{- if hasKey $spec "allowLastIP" }}
+    {{- $attrs = append $attrs (printf "allow-last-ip:%s" (toString $spec.allowLastIP)) }}
+    {{- end }}
     {{- $pools = append $pools (printf "%s=%s" $pool (join ";" $attrs)) }}
   {{- end }}
   auto-create-cilium-pod-ip-pools: {{ join "," $pools | quote }}
@@ -1287,8 +1320,6 @@ data:
   enable-l2-pod-announcements: {{ .Values.l2podAnnouncements.enabled | quote }}
   {{- if .Values.l2podAnnouncements.interfacePattern }}
   l2-pod-announcements-interface-pattern: {{ .Values.l2podAnnouncements.interfacePattern | quote }}
-  {{- else }}
-  l2-pod-announcements-interface: {{ .Values.l2podAnnouncements.interface | quote }}
   {{- end }}
 {{- end }}
 
@@ -1467,14 +1498,16 @@ data:
   proxy-max-concurrent-retries: {{ .Values.envoy.maxConcurrentRetries | quote }}
   proxy-use-original-source-address: {{ .Values.envoy.useOriginalSourceAddress | quote }}
   proxy-cluster-max-connections: {{ .Values.envoy.clusterMaxConnections | quote }}
+  proxy-cluster-max-pending-requests: {{ .Values.envoy.clusterMaxPendingRequests | quote }}
   proxy-cluster-max-requests: {{ .Values.envoy.clusterMaxRequests | quote }}
   http-retry-count: {{ .Values.envoy.httpRetryCount | quote }}
   http-stream-idle-timeout: {{ .Values.envoy.streamIdleTimeoutDurationSeconds | quote }}
+  envoy-node-locality-enabled: {{ .Values.envoy.nodeLocality.enabled | quote }}
 
   external-envoy-proxy: {{ include "envoyDaemonSetEnabled" . | quote }}
   envoy-base-id: {{ .Values.envoy.baseID | quote }}
 
-{{- if .Values.envoy.httpUpstreamLingerTimeout }}
+{{- if ne .Values.envoy.httpUpstreamLingerTimeout nil }}
   envoy-http-upstream-linger-timeout: {{ .Values.envoy.httpUpstreamLingerTimeout | quote }}
 {{- end }}
 
@@ -1488,18 +1521,25 @@ data:
 {{- if .Values.envoy.log.defaultLevel }}
   envoy-default-log-level: {{ .Values.envoy.log.defaultLevel | quote }}
 {{- end }}
+  envoy-access-log-enabled: {{ .Values.envoy.log.accessLogEnabled | quote }}
 {{- if .Values.envoy.log.accessLogBufferSize }}
   envoy-access-log-buffer-size: {{ .Values.envoy.log.accessLogBufferSize | quote }}
 {{- end }}
   envoy-keep-cap-netbindservice: {{ .Values.envoy.securityContext.capabilities.keepCapNetBindService | quote }}
 
+{{- $envoyXdsMode := include "envoyXdsMode" . }}
+{{- if ne $envoyXdsMode "" }}
+  envoy-xds-mode: {{ $envoyXdsMode | quote }}
+{{- end }}
+
 {{- if hasKey .Values.clustermesh "maxConnectedClusters" }}
   max-connected-clusters: {{ .Values.clustermesh.maxConnectedClusters | quote }}
 {{- end }}
   clustermesh-cache-ttl: {{ .Values.clustermesh.cacheTTL | quote }}
   clustermesh-enable-endpoint-sync: {{ .Values.clustermesh.enableEndpointSliceSynchronization | quote }}
-  clustermesh-enable-mcs-api: {{ (or .Values.clustermesh.mcsapi.enabled .Values.clustermesh.enableMCSAPISupport) | quote }}
+  clustermesh-enable-mcs-api: {{ .Values.clustermesh.mcsapi.enabled | quote }}
   clustermesh-mcs-api-install-crds: {{ .Values.clustermesh.mcsapi.installCRDs | quote }}
+  clustermesh-default-global-namespace: {{ .Values.clustermesh.defaultGlobalNamespace | quote }}
   policy-default-local-cluster: {{ .Values.clustermesh.policyDefaultLocalCluster | quote }}
 
   nat-map-stats-entries: {{ .Values.nat.mapStatsEntries | quote }}
@@ -1523,6 +1563,9 @@ data:
   {{- end }}
 {{- end }}
 
+  enable-datapath-plugins: {{ .Values.datapathPlugins.enabled | quote }}
+  datapath-plugins-state-dir: {{ .Values.datapathPlugins.stateDir | quote }}
+
 # Extra config allows adding arbitrary properties to the cilium config.
 # By putting it at the end of the ConfigMap, it's also possible to override existing properties.
 {{- if .Values.extraConfig }}
diff --git a/packages/system/cilium/charts/cilium/templates/cilium-envoy/daemonset.yaml b/packages/system/cilium/charts/cilium/templates/cilium-envoy/daemonset.yaml
index 2afc2e97e5..2b681ac64f 100644
--- a/packages/system/cilium/charts/cilium/templates/cilium-envoy/daemonset.yaml
+++ b/packages/system/cilium/charts/cilium/templates/cilium-envoy/daemonset.yaml
@@ -15,10 +15,14 @@ metadata:
     app.kubernetes.io/part-of: cilium
     app.kubernetes.io/name: cilium-envoy
     name: cilium-envoy
+    helm.sh/chart: {{ include "cilium.chart" . }}
     {{- with .Values.commonLabels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
 spec:
+  {{- if .Values.envoy.minReadySeconds }}
+  minReadySeconds: {{ .Values.envoy.minReadySeconds }}
+  {{- end }}
   selector:
     matchLabels:
       k8s-app: cilium-envoy
@@ -46,6 +50,7 @@ spec:
         name: cilium-envoy
         app.kubernetes.io/name: cilium-envoy
         app.kubernetes.io/part-of: cilium
+        helm.sh/chart: {{ include "cilium.chart" . }}
         {{- with .Values.commonLabels }}
         {{- toYaml . | nindent 8 }}
         {{- end }}
@@ -66,7 +71,55 @@ spec:
       securityContext:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- include "envoy.initContainers" . | nindent 6 }}
+
+
+      {{- $extraInitContainers := include "envoy.initContainers" . | trim }}
+      {{- if $extraInitContainers }}
+      {{- $extraInitContainers | nindent 6 }}
+      {{- end }}
+      {{- if .Values.envoy.nodeLocality.enabled }}
+      {{- if not $extraInitContainers }}
+      initContainers:
+      {{- end }}
+      - name: lookup-bootstrap-locality
+        image: {{ include "cilium.image" .Values.image }}
+        imagePullPolicy: {{ .Values.image.pullPolicy }}
+        command:
+          - /usr/bin/cilium-envoy-bootstrap-locality
+        args:
+          - --output=/var/run/cilium/envoy-locality-config/service-zone
+        env:
+        - name: K8S_NODE_NAME
+          valueFrom:
+            fieldRef:
+              apiVersion: v1
+              fieldPath: spec.nodeName
+        {{- if and .Values.k8sServiceHostRef.name .Values.k8sServiceHostRef.key }}
+        - name: KUBERNETES_SERVICE_HOST
+          valueFrom:
+            configMapKeyRef:
+              name: {{ .Values.k8sServiceHostRef.name }}
+              key: {{ .Values.k8sServiceHostRef.key }}
+        - name: KUBERNETES_SERVICE_PORT
+          value: {{ include "k8sServicePort" . }}
+        {{- end }}
+        {{- if .Values.k8sServiceHost }}
+        - name: KUBERNETES_SERVICE_HOST
+          value: {{ include "k8sServiceHost" . }}
+        - name: KUBERNETES_SERVICE_PORT
+          value: {{ include "k8sServicePort" . }}
+        {{- end }}
+        securityContext:
+          runAsUser: 0
+          allowPrivilegeEscalation: false
+          capabilities:
+            drop:
+            - ALL
+        volumeMounts:
+        - name: envoy-config-locality
+          mountPath: /var/run/cilium/envoy-locality-config
+          readOnly: false
+      {{- end }}
       containers:
       - name: cilium-envoy
         image: {{ include "cilium.image" .Values.envoy.image | quote }}
@@ -78,6 +131,10 @@ spec:
         - '--keep-cap-net-bind-service'
         {{- end }}
         - '--'
+        {{- if .Values.envoy.nodeLocality.enabled }}
+        - '--service-zone'
+        - '@/var/run/cilium/envoy-locality-config/service-zone'
+        {{- end }}
         - '-c /var/run/cilium/envoy/bootstrap-config.json'
         - '--base-id {{ int .Values.envoy.baseID }}'
         {{- if and (.Values.debug.enabled) (hasKey .Values.debug "verbose") (.Values.debug.verbose) (has "envoy" ( splitList " " .Values.debug.verbose )) }}
@@ -98,38 +155,36 @@ spec:
         {{- end }}
         {{- if .Values.envoy.startupProbe.enabled }}
         startupProbe:
-          httpGet:
-            host: {{ .Values.ipv4.enabled | ternary "127.0.0.1" "::1" | quote }}
-            path: /healthz
-            port: {{ .Values.envoy.healthPort }}
-            scheme: HTTP
+          {{- include "envoy.startupProbe" . | nindent 10 }}
           failureThreshold: {{ .Values.envoy.startupProbe.failureThreshold }}
           periodSeconds: {{ .Values.envoy.startupProbe.periodSeconds }}
           successThreshold: 1
-          initialDelaySeconds: 5
+          initialDelaySeconds: {{ .Values.envoy.startupProbe.initialDelaySeconds }}
+          timeoutSeconds: {{ .Values.envoy.startupProbe.timeoutSeconds }}
         {{- end }}
         {{- if .Values.envoy.livenessProbe.enabled }}
         livenessProbe:
-          httpGet:
-            host: {{ .Values.ipv4.enabled | ternary "127.0.0.1" "::1" | quote }}
-            path: /healthz
-            port: {{ .Values.envoy.healthPort }}
-            scheme: HTTP
+          {{- include "envoy.livenessProbe" . | nindent 10 }}
           periodSeconds: {{ .Values.envoy.livenessProbe.periodSeconds }}
           successThreshold: 1
           failureThreshold: {{ .Values.envoy.livenessProbe.failureThreshold }}
-          timeoutSeconds: 5
+          initialDelaySeconds: {{ .Values.envoy.livenessProbe.initialDelaySeconds }}
+          timeoutSeconds: {{ .Values.envoy.livenessProbe.timeoutSeconds }}
         {{- end }}
         readinessProbe:
-          httpGet:
-            host: {{ .Values.ipv4.enabled | ternary "127.0.0.1" "::1" | quote }}
-            path: /healthz
-            port: {{ .Values.envoy.healthPort }}
-            scheme: HTTP
+          {{- include "envoy.readinessProbe" . | nindent 10 }}
           periodSeconds: {{ .Values.envoy.readinessProbe.periodSeconds }}
           successThreshold: 1
           failureThreshold: {{ .Values.envoy.readinessProbe.failureThreshold }}
-          timeoutSeconds: 5
+          initialDelaySeconds: {{ .Values.envoy.readinessProbe.initialDelaySeconds }}
+          timeoutSeconds: {{ .Values.envoy.readinessProbe.timeoutSeconds }}
+
+        {{- $lifecycleHooks := include "envoy.lifecycle" . | trim }}
+        {{- if $lifecycleHooks }}
+        lifecycle:
+        {{- $lifecycleHooks | nindent 10 }}
+        {{- end }}
+
         env:
         - name: K8S_NODE_NAME
           valueFrom:
@@ -198,6 +253,11 @@ spec:
           mountPropagation: HostToContainer
         {{- end }}
         {{- include "envoy.volumeMounts.extra" . | nindent 8 }}
+        {{- if .Values.envoy.nodeLocality.enabled }}
+        - mountPath: /var/run/cilium/envoy-locality-config
+          name: envoy-config-locality
+          readOnly: true
+        {{- end }}
         {{- range .Values.envoy.extraHostPathMounts }}
         - name: {{ .name }}
           mountPath: {{ .mountPath }}
@@ -218,6 +278,9 @@ spec:
       automountServiceAccountToken: {{ .Values.serviceAccounts.envoy.automount }}
       terminationGracePeriodSeconds: {{ .Values.envoy.terminationGracePeriodSeconds }}
       hostNetwork: true
+      {{- if (semverCompare ">= 1.33-0" .Capabilities.KubeVersion.Version) }}
+      hostUsers: true
+      {{- end }}
       {{- if .Values.envoy.dnsPolicy }}
       dnsPolicy: {{ .Values.envoy.dnsPolicy }}
       {{- end }}
@@ -256,6 +319,10 @@ spec:
           type: DirectoryOrCreate
       {{- end }}
       {{- include "envoy.hostPathMounts.extra" . | nindent 4 }}
+      {{- if .Values.envoy.nodeLocality.enabled }}
+      - name: envoy-config-locality
+        emptyDir: {}
+      {{- end }}
       {{- range .Values.envoy.extraHostPathMounts }}
       - name: {{ .name }}
         hostPath:
diff --git a/packages/system/cilium/charts/cilium/templates/cilium-envoy/node-locality-clusterrole.yaml b/packages/system/cilium/charts/cilium/templates/cilium-envoy/node-locality-clusterrole.yaml
new file mode 100644
index 0000000000..68520ded9f
--- /dev/null
+++ b/packages/system/cilium/charts/cilium/templates/cilium-envoy/node-locality-clusterrole.yaml
@@ -0,0 +1,24 @@
+{{- $envoyDS := eq (include "envoyDaemonSetEnabled" .) "true" -}}
+{{- if and $envoyDS (not .Values.preflight.enabled) .Values.envoy.nodeLocality.enabled }}
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: cilium-envoy-node-locality
+  {{- with .Values.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  labels:
+    app.kubernetes.io/part-of: cilium
+    helm.sh/chart: {{ include "cilium.chart" . }}
+    {{- with .Values.commonLabels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+rules:
+- apiGroups:
+  - ""
+  resources:
+  - nodes
+  verbs:
+  - get
+{{- end }}
diff --git a/packages/system/cilium/charts/cilium/templates/cilium-envoy/node-locality-clusterrolebinding.yaml b/packages/system/cilium/charts/cilium/templates/cilium-envoy/node-locality-clusterrolebinding.yaml
new file mode 100644
index 0000000000..dbb4b5169e
--- /dev/null
+++ b/packages/system/cilium/charts/cilium/templates/cilium-envoy/node-locality-clusterrolebinding.yaml
@@ -0,0 +1,25 @@
+{{- $envoyDS := eq (include "envoyDaemonSetEnabled" .) "true" -}}
+{{- if and $envoyDS (not .Values.preflight.enabled) .Values.envoy.nodeLocality.enabled }}
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: cilium-envoy-node-locality
+  {{- with .Values.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  labels:
+    app.kubernetes.io/part-of: cilium
+    helm.sh/chart: {{ include "cilium.chart" . }}
+    {{- with .Values.commonLabels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: cilium-envoy-node-locality
+subjects:
+- kind: ServiceAccount
+  name: cilium-envoy
+  namespace: {{ include "cilium.namespace" . }}
+{{- end }}
diff --git a/packages/system/cilium/charts/cilium/templates/cilium-envoy/service.yaml b/packages/system/cilium/charts/cilium/templates/cilium-envoy/service.yaml
index 8da479437c..0e32e5cd83 100644
--- a/packages/system/cilium/charts/cilium/templates/cilium-envoy/service.yaml
+++ b/packages/system/cilium/charts/cilium/templates/cilium-envoy/service.yaml
@@ -19,6 +19,7 @@ metadata:
     k8s-app: cilium-envoy
     app.kubernetes.io/name: cilium-envoy
     app.kubernetes.io/part-of: cilium
+    helm.sh/chart: {{ include "cilium.chart" . }}
     io.cilium/app: proxy
     {{- with .Values.commonLabels }}
     {{- toYaml . | nindent 4 }}
diff --git a/packages/system/cilium/charts/cilium/templates/cilium-envoy/servicemonitor.yaml b/packages/system/cilium/charts/cilium/templates/cilium-envoy/servicemonitor.yaml
index 6c2bce3ce8..a16693b4b5 100644
--- a/packages/system/cilium/charts/cilium/templates/cilium-envoy/servicemonitor.yaml
+++ b/packages/system/cilium/charts/cilium/templates/cilium-envoy/servicemonitor.yaml
@@ -9,6 +9,7 @@ metadata:
   labels:
     app.kubernetes.io/part-of: cilium
     app.kubernetes.io/name: cilium-envoy
+    helm.sh/chart: {{ include "cilium.chart" . }}
     {{- with .Values.commonLabels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
diff --git a/packages/system/cilium/charts/cilium/templates/cilium-gateway-api-validating-admission-policy.yaml b/packages/system/cilium/charts/cilium/templates/cilium-gateway-api-validating-admission-policy.yaml
new file mode 100644
index 0000000000..69e1a0f1f2
--- /dev/null
+++ b/packages/system/cilium/charts/cilium/templates/cilium-gateway-api-validating-admission-policy.yaml
@@ -0,0 +1,44 @@
+{{- if .Values.gatewayAPI.enabled -}}
+{{- if ( or (eq (.Values.gatewayAPI.gatewayClass.create | toString) "true") (and (.Capabilities.APIVersions.Has "gateway.networking.k8s.io/v1/GatewayClass") (eq (.Values.gatewayAPI.gatewayClass.create | toString) "auto"))) }}
+apiVersion: admissionregistration.k8s.io/v1
+kind: ValidatingAdmissionPolicy
+metadata:
+  name: gateway.cilium.io
+  {{- with .Values.commonLabels }}
+  labels:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+spec:
+  failurePolicy: Fail
+  matchConstraints:
+    resourceRules:
+      - apiGroups: ["gateway.networking.k8s.io"]
+        apiVersions: ["v1"]
+        operations: ["CREATE", "UPDATE"]
+        resources: ["gateways"]
+  validations:
+    - expression: "object.spec.gatewayClassName != 'cilium' ||
+        (has(object.spec.listeners)) &&
+        object.spec.listeners.filter(e, has(e.tls) && has(e.tls.mode) && e.tls.mode == 'Terminate').all(e, e.tls.certificateRefs.size() == 1)"
+      message: "cilium GatewayClass requires exactly one certificateRef per listener when tls.mode is Terminate."
+      reason: Invalid
+---
+apiVersion: admissionregistration.k8s.io/v1
+kind: ValidatingAdmissionPolicyBinding
+metadata:
+  name: gateway.cilium.io
+  {{- with .Values.commonLabels }}
+  labels:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+spec:
+  policyName: gateway.cilium.io
+  validationActions: [Deny]
+  matchResources:
+    resourceRules:
+      - apiGroups: ["gateway.networking.k8s.io"]
+        apiVersions: ["v1"]
+        resources: ["gateways"]
+        operations: ["CREATE", "UPDATE"]
+{{- end}}
+{{- end}}
diff --git a/packages/system/cilium/charts/cilium/templates/cilium-ingress-service.yaml b/packages/system/cilium/charts/cilium/templates/cilium-ingress-service.yaml
index f25afeee2c..99add9c984 100644
--- a/packages/system/cilium/charts/cilium/templates/cilium-ingress-service.yaml
+++ b/packages/system/cilium/charts/cilium/templates/cilium-ingress-service.yaml
@@ -7,6 +7,7 @@ metadata:
   labels:
     cilium.io/ingress: "true"
     app.kubernetes.io/part-of: cilium
+    helm.sh/chart: {{ include "cilium.chart" . }}
     {{- if .Values.ingressController.service.labels }}
     {{- toYaml .Values.ingressController.service.labels | nindent 4 }}
     {{- end }}
@@ -55,6 +56,7 @@ metadata:
   name: {{ .Values.ingressController.service.name }}
   namespace: {{ include "cilium.namespace" . }}
   labels:
+    kubernetes.io/service-name: {{ .Values.ingressController.service.name }}
     {{- with .Values.commonLabels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
@@ -69,6 +71,8 @@ addressType: IPv4
 endpoints:
 - addresses:
   - "192.192.192.192"
+  conditions:
+    ready: true
 ports:
 - port: 9999
 {{- end }}
diff --git a/packages/system/cilium/charts/cilium/templates/cilium-nodeinit/daemonset.yaml b/packages/system/cilium/charts/cilium/templates/cilium-nodeinit/daemonset.yaml
index 4edbeada24..b23fa552b7 100644
--- a/packages/system/cilium/charts/cilium/templates/cilium-nodeinit/daemonset.yaml
+++ b/packages/system/cilium/charts/cilium/templates/cilium-nodeinit/daemonset.yaml
@@ -13,10 +13,14 @@ metadata:
     app: cilium-node-init
     app.kubernetes.io/part-of: cilium
     app.kubernetes.io/name: cilium-node-init
+    helm.sh/chart: {{ include "cilium.chart" . }}
     {{- with .Values.commonLabels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
 spec:
+  {{- if .Values.nodeinit.minReadySeconds }}
+  minReadySeconds: {{ .Values.nodeinit.minReadySeconds }}
+  {{- end }}
   selector:
     matchLabels:
       app: cilium-node-init
@@ -42,6 +46,7 @@ spec:
         app: cilium-node-init
         app.kubernetes.io/part-of: cilium
         app.kubernetes.io/name: cilium-node-init
+        helm.sh/chart: {{ include "cilium.chart" . }}
         {{- with .Values.commonLabels }}
         {{- toYaml . | nindent 8 }}
         {{- end }}
@@ -117,6 +122,9 @@ spec:
         {{- toYaml . | trim | nindent 8 }}
       {{- end }}
       hostPID: true
+      {{- if (semverCompare ">= 1.33-0" .Capabilities.KubeVersion.Version) }}
+      hostUsers: true
+      {{- end }}
       hostNetwork: true
       priorityClassName: {{ include "cilium.priorityClass" (list $ .Values.nodeinit.priorityClassName "system-node-critical") }}
       {{- if .Values.serviceAccounts.nodeinit.enabled }}
diff --git a/packages/system/cilium/charts/cilium/templates/cilium-operator/clusterrole.yaml b/packages/system/cilium/charts/cilium/templates/cilium-operator/clusterrole.yaml
index c147e2b55b..4d7c0907da 100644
--- a/packages/system/cilium/charts/cilium/templates/cilium-operator/clusterrole.yaml
+++ b/packages/system/cilium/charts/cilium/templates/cilium-operator/clusterrole.yaml
@@ -10,6 +10,7 @@ metadata:
   {{- end }}
   labels:
     app.kubernetes.io/part-of: cilium
+    helm.sh/chart: {{ include "cilium.chart" . }}
     {{- with .Values.commonLabels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
@@ -69,7 +70,7 @@ rules:
   resources:
   - endpointslices
   verbs:
-{{- if or .Values.clustermesh.enableEndpointSliceSynchronization .Values.clustermesh.mcsapi.enabled .Values.clustermesh.enableMCSAPISupport }}
+{{- if or .Values.clustermesh.enableEndpointSliceSynchronization .Values.clustermesh.mcsapi.enabled }}
   - create
   - update
   - delete
@@ -105,6 +106,7 @@ rules:
 {{- if or .Values.ingressController.enabled .Values.gatewayAPI.enabled .Values.bgpControlPlane.enabled $secretSyncEnabled }}
   - secrets
 {{- end }}
+  - serviceaccounts
   verbs:
   - get
   - list
@@ -114,7 +116,6 @@ rules:
   resources:
   # to perform the translation of a CNP that contains `ToGroup` to its endpoints
   - services
-  - endpoints
   verbs:
   - get
   - list
@@ -149,16 +150,18 @@ rules:
   - create
 {{- end }}
 - apiGroups:
+  # Watch CNP / CCNPs for validation and external groups.
   - cilium.io
   resources:
   - ciliumnetworkpolicies
   - ciliumclusterwidenetworkpolicies
   verbs:
-  # Create auto-generated CNPs and CCNPs from Policies that have 'toGroups'
+  # Create auto-generated CNPs and CCNPs from Policies that have 'toGroups'.
+  # This was removed in v1.20, but we must keep the permissions until v1.21 for
+  # upgrade phasing.
   - create
   - update
   - deletecollection
-  # To update the status of the CNPs and CCNPs
   - patch
   - get
   - list
@@ -169,7 +172,7 @@ rules:
   - ciliumnetworkpolicies/status
   - ciliumclusterwidenetworkpolicies/status
   verbs:
-  # Update the auto-generated CNPs and CCNPs status.
+  # Set validity status on CNP / CCNP.
   - patch
   - update
 - apiGroups:
@@ -217,9 +220,12 @@ rules:
   resources:
   - ciliumendpointslices
   - ciliumenvoyconfigs
+  - ciliumbgpclusterconfigs
+  - ciliumbgpnodeconfigoverrides
   - ciliumbgppeerconfigs
   - ciliumbgpadvertisements
   - ciliumbgpnodeconfigs
+  - ciliumcidrgroups
   verbs:
   - create
   - update
@@ -272,18 +278,30 @@ rules:
   - ciliuml2announcementpolicies.cilium.io
   - ciliumpodippools.cilium.io
   - ciliumgatewayclassconfigs.cilium.io
-{{- if and (or .Values.clustermesh.mcsapi.enabled .Values.clustermesh.enableMCSAPISupport) .Values.clustermesh.mcsapi.installCRDs }}
+{{- if and .Values.clustermesh.mcsapi.enabled .Values.clustermesh.mcsapi.installCRDs }}
   - serviceimports.multicluster.x-k8s.io
   - serviceexports.multicluster.x-k8s.io
 {{- end }}
+  - ciliumdatapathplugins.cilium.io
+- apiGroups:
+  - apiextensions.k8s.io
+  resources:
+  - customresourcedefinitions/status
+  verbs:
+  - update
+  resourceNames:
+  - ciliumbgpclusterconfigs.cilium.io
+  - ciliumbgppeerconfigs.cilium.io
+  - ciliumbgpadvertisements.cilium.io
+  - ciliumbgpnodeconfigs.cilium.io
+  - ciliumbgpnodeconfigoverrides.cilium.io
 - apiGroups:
   - cilium.io
   resources:
   - ciliumloadbalancerippools
   - ciliumpodippools
-  - ciliumbgpclusterconfigs
-  - ciliumbgpnodeconfigoverrides
   - ciliumbgppeerconfigs
+  - ciliumdatapathplugins
   verbs:
   - get
   - list
@@ -341,11 +359,15 @@ rules:
   resources:
   - gatewayclasses
   - gateways
+  - tcproutes
+  - udproutes
   - tlsroutes
   - httproutes
   - grpcroutes
   - referencegrants
   - referencepolicies
+  - backendtlspolicies
+  - listenersets
   verbs:
   - get
   - list
@@ -364,6 +386,10 @@ rules:
   - httproutes/status
   - grpcroutes/status
   - tlsroutes/status
+  - backendtlspolicies/status
+  - tcproutes/status
+  - udproutes/status
+  - listenersets/status
   verbs:
   - update
   - patch
@@ -382,8 +408,16 @@ rules:
   verbs:
   - update
   - patch
+- apiGroups:
+  - ""
+  resources:
+  - configmaps
+  verbs:
+  - get
+  - list
+  - watch  
 {{- end }}
-{{- if or .Values.gatewayAPI.enabled .Values.clustermesh.mcsapi.enabled .Values.clustermesh.enableMCSAPISupport }}
+{{- if or .Values.gatewayAPI.enabled .Values.clustermesh.mcsapi.enabled }}
 - apiGroups:
   - multicluster.x-k8s.io
   resources:
@@ -392,14 +426,14 @@ rules:
   - get
   - list
   - watch
-{{- if or .Values.clustermesh.mcsapi.enabled .Values.clustermesh.enableMCSAPISupport }}
+{{- if .Values.clustermesh.mcsapi.enabled }}
   - create
   - update
   - patch
   - delete
 {{- end }}
 {{- end }}
-{{- if or .Values.clustermesh.mcsapi.enabled .Values.clustermesh.enableMCSAPISupport }}
+{{- if .Values.clustermesh.mcsapi.enabled }}
 - apiGroups:
   - multicluster.x-k8s.io
   resources:
diff --git a/packages/system/cilium/charts/cilium/templates/cilium-operator/clusterrolebinding.yaml b/packages/system/cilium/charts/cilium/templates/cilium-operator/clusterrolebinding.yaml
index a1bed2d019..9ae8208813 100644
--- a/packages/system/cilium/charts/cilium/templates/cilium-operator/clusterrolebinding.yaml
+++ b/packages/system/cilium/charts/cilium/templates/cilium-operator/clusterrolebinding.yaml
@@ -9,6 +9,7 @@ metadata:
   {{- end }}
   labels:
     app.kubernetes.io/part-of: cilium
+    helm.sh/chart: {{ include "cilium.chart" . }}
     {{- with .Values.commonLabels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
diff --git a/packages/system/cilium/charts/cilium/templates/cilium-operator/dashboards-configmap.yaml b/packages/system/cilium/charts/cilium/templates/cilium-operator/dashboards-configmap.yaml
index 5b68b26194..90e91e74be 100644
--- a/packages/system/cilium/charts/cilium/templates/cilium-operator/dashboards-configmap.yaml
+++ b/packages/system/cilium/charts/cilium/templates/cilium-operator/dashboards-configmap.yaml
@@ -12,6 +12,7 @@ metadata:
     k8s-app: cilium
     app.kubernetes.io/name: cilium-operator
     app.kubernetes.io/part-of: cilium
+    helm.sh/chart: {{ include "cilium.chart" $ }}
     {{- with $.Values.commonLabels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
diff --git a/packages/system/cilium/charts/cilium/templates/cilium-operator/deployment.yaml b/packages/system/cilium/charts/cilium/templates/cilium-operator/deployment.yaml
index f4cddff8dd..1dd033a351 100644
--- a/packages/system/cilium/charts/cilium/templates/cilium-operator/deployment.yaml
+++ b/packages/system/cilium/charts/cilium/templates/cilium-operator/deployment.yaml
@@ -14,6 +14,7 @@ metadata:
     name: cilium-operator
     app.kubernetes.io/part-of: cilium
     app.kubernetes.io/name: cilium-operator
+    helm.sh/chart: {{ include "cilium.chart" . }}
     {{- with .Values.commonLabels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
@@ -60,6 +61,7 @@ spec:
         name: cilium-operator
         app.kubernetes.io/part-of: cilium
         app.kubernetes.io/name: cilium-operator
+        helm.sh/chart: {{ include "cilium.chart" . }}
         {{- with .Values.commonLabels }}
         {{- toYaml . | nindent 8 }}
         {{- end }}
@@ -98,7 +100,7 @@ spec:
             fieldRef:
               apiVersion: v1
               fieldPath: metadata.namespace
-        {{- if or .Values.clustermesh.enableEndpointSliceSynchronization .Values.clustermesh.mcsapi.enabled .Values.clustermesh.enableMCSAPISupport }}
+        {{- if or .Values.clustermesh.enableEndpointSliceSynchronization .Values.clustermesh.mcsapi.enabled }}
         - name: CILIUM_CLUSTERMESH_CONFIG
           value: /var/lib/cilium/clustermesh/
         {{- end }}
@@ -189,7 +191,9 @@ spec:
         ports:
         - name: health
           containerPort: 9234
+        {{- if .Values.operator.hostNetwork }}
           hostPort: 9234
+        {{- end }}
         {{- if .Values.operator.prometheus.enabled }}
         - name: prometheus
           containerPort: {{ .Values.operator.prometheus.port }}
@@ -235,7 +239,7 @@ spec:
           readOnly: true
         {{- end }}
         {{- end }}
-        {{- if or .Values.clustermesh.enableEndpointSliceSynchronization .Values.clustermesh.mcsapi.enabled .Values.clustermesh.enableMCSAPISupport }}
+        {{- if or .Values.clustermesh.enableEndpointSliceSynchronization .Values.clustermesh.mcsapi.enabled }}
         - name: clustermesh-secrets
           mountPath: /var/lib/cilium/clustermesh
           readOnly: true
@@ -278,6 +282,9 @@ spec:
         {{- end }}
         terminationMessagePolicy: FallbackToLogsOnError
       hostNetwork: {{ .Values.operator.hostNetwork }}
+      {{- if (semverCompare ">= 1.33-0" .Capabilities.KubeVersion.Version) }}
+      hostUsers: {{ .Values.operator.hostUsers }}
+      {{- end }}
       {{- if .Values.operator.dnsPolicy }}
       dnsPolicy: {{ .Values.operator.dnsPolicy }}
       {{- end }}
@@ -307,7 +314,8 @@ spec:
       nodeSelector:
         {{- toYaml . | trim | nindent 8 }}
       {{- end }}
-      {{- if and (or .Values.clustermesh.enableEndpointSliceSynchronization .Values.clustermesh.mcsapi.enabled .Values.clustermesh.enableMCSAPISupport) .Values.clustermesh.config.enabled (not (and .Values.clustermesh.useAPIServer .Values.clustermesh.apiserver.kvstoremesh.enabled )) }}
+      {{/* TODO: remove hostAliases for the v1.21 release as this is now handled via a static dialer to avoid pod restart */}}
+      {{- if and (or .Values.clustermesh.enableEndpointSliceSynchronization .Values.clustermesh.mcsapi.enabled) .Values.clustermesh.config.enabled (not (and .Values.clustermesh.useAPIServer .Values.clustermesh.apiserver.kvstoremesh.enabled )) (not .Values.clustermesh.disableKubernetesHostAliases) }}
       hostAliases:
       {{- range $_, $cluster := (include "clustermesh-clusters" . | fromJson) }}
       {{- range $ip := $cluster.ips }}
@@ -374,7 +382,7 @@ spec:
       {{- with .Values.operator.extraVolumes }}
       {{- toYaml . | nindent 6 }}
       {{- end }}
-      {{- if or .Values.clustermesh.enableEndpointSliceSynchronization .Values.clustermesh.mcsapi.enabled .Values.clustermesh.enableMCSAPISupport }}
+      {{- if or .Values.clustermesh.enableEndpointSliceSynchronization .Values.clustermesh.mcsapi.enabled }}
         # To read the clustermesh configuration
       - name: clustermesh-secrets
         projected:
diff --git a/packages/system/cilium/charts/cilium/templates/cilium-operator/poddisruptionbudget.yaml b/packages/system/cilium/charts/cilium/templates/cilium-operator/poddisruptionbudget.yaml
index ee543e9374..9cd55b2663 100644
--- a/packages/system/cilium/charts/cilium/templates/cilium-operator/poddisruptionbudget.yaml
+++ b/packages/system/cilium/charts/cilium/templates/cilium-operator/poddisruptionbudget.yaml
@@ -14,6 +14,7 @@ metadata:
     name: cilium-operator
     app.kubernetes.io/name: cilium-operator
     app.kubernetes.io/part-of: cilium
+    helm.sh/chart: {{ include "cilium.chart" . }}
     {{- with .Values.commonLabels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
diff --git a/packages/system/cilium/charts/cilium/templates/cilium-operator/role.yaml b/packages/system/cilium/charts/cilium/templates/cilium-operator/role.yaml
index 11515ced6c..e7b3552a88 100644
--- a/packages/system/cilium/charts/cilium/templates/cilium-operator/role.yaml
+++ b/packages/system/cilium/charts/cilium/templates/cilium-operator/role.yaml
@@ -1,6 +1,6 @@
 {{- $secretSyncEnabled := eq (include "secretSyncEnabled" .) "true" -}}
 
-{{- if and .Values.operator.enabled .Values.serviceAccounts.operator.create .Values.ingressController.enabled .Values.ingressController.secretsNamespace.sync .Values.ingressController.secretsNamespace.name }}
+{{- if and .Values.operator.enabled (not .Values.preflight.enabled) .Values.serviceAccounts.operator.create .Values.ingressController.enabled .Values.ingressController.secretsNamespace.sync .Values.ingressController.secretsNamespace.name }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
@@ -13,6 +13,7 @@ metadata:
   {{- end }}
   labels:
     app.kubernetes.io/part-of: cilium
+    helm.sh/chart: {{ include "cilium.chart" . }}
     {{- with .Values.commonLabels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
@@ -28,7 +29,7 @@ rules:
   - patch
 {{- end }}
 
-{{- if and .Values.operator.enabled .Values.serviceAccounts.operator.create .Values.gatewayAPI.enabled .Values.gatewayAPI.secretsNamespace.sync .Values.gatewayAPI.secretsNamespace.name }}
+{{- if and .Values.operator.enabled (not .Values.preflight.enabled) .Values.serviceAccounts.operator.create .Values.gatewayAPI.enabled .Values.gatewayAPI.secretsNamespace.sync .Values.gatewayAPI.secretsNamespace.name }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
@@ -41,6 +42,7 @@ metadata:
   {{- end }}
   labels:
     app.kubernetes.io/part-of: cilium
+    helm.sh/chart: {{ include "cilium.chart" . }}
     {{- with .Values.commonLabels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
@@ -56,7 +58,7 @@ rules:
   - patch
 {{- end }}
 
-{{- if and .Values.operator.enabled .Values.serviceAccounts.operator.create $secretSyncEnabled .Values.tls.secretsNamespace.name }}
+{{- if and .Values.operator.enabled (not .Values.preflight.enabled) .Values.serviceAccounts.operator.create $secretSyncEnabled .Values.tls.secretsNamespace.name }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
@@ -69,6 +71,7 @@ metadata:
   {{- end }}
   labels:
     app.kubernetes.io/part-of: cilium
+    helm.sh/chart: {{ include "cilium.chart" . }}
     {{- with .Values.commonLabels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
@@ -84,7 +87,7 @@ rules:
   - patch
 {{- end }}
 
-{{- if and .Values.operator.enabled .Values.serviceAccounts.operator.create }}
+{{- if and .Values.operator.enabled (not .Values.preflight.enabled) .Values.serviceAccounts.operator.create }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
@@ -97,6 +100,7 @@ metadata:
   {{- end }}
   labels:
     app.kubernetes.io/part-of: cilium
+    helm.sh/chart: {{ include "cilium.chart" . }}
     {{- with .Values.commonLabels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
@@ -114,4 +118,12 @@ rules:
   - get
   - list
   - watch
+- apiGroups:
+  - ""
+  resources:
+  - serviceaccounts
+  verbs:
+  - get
+  - list
+  - watch
 {{- end }}
diff --git a/packages/system/cilium/charts/cilium/templates/cilium-operator/rolebinding.yaml b/packages/system/cilium/charts/cilium/templates/cilium-operator/rolebinding.yaml
index 22ac17bc00..d84354e9b4 100644
--- a/packages/system/cilium/charts/cilium/templates/cilium-operator/rolebinding.yaml
+++ b/packages/system/cilium/charts/cilium/templates/cilium-operator/rolebinding.yaml
@@ -1,6 +1,6 @@
 {{- $secretSyncEnabled := eq (include "secretSyncEnabled" .) "true" -}}
 
-{{- if and .Values.operator.enabled .Values.serviceAccounts.operator.create .Values.ingressController.enabled .Values.ingressController.secretsNamespace.sync .Values.ingressController.secretsNamespace.name }}
+{{- if and .Values.operator.enabled (not .Values.preflight.enabled) .Values.serviceAccounts.operator.create .Values.ingressController.enabled .Values.ingressController.secretsNamespace.sync .Values.ingressController.secretsNamespace.name }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
@@ -9,6 +9,7 @@ metadata:
   namespace: {{ .Values.ingressController.secretsNamespace.name | quote }}
   labels:
     app.kubernetes.io/part-of: cilium
+    helm.sh/chart: {{ include "cilium.chart" . }}
     {{- with .Values.commonLabels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
@@ -26,7 +27,7 @@ subjects:
   namespace: {{ include "cilium.namespace" . }}
 {{- end }}
 
-{{- if and .Values.operator.enabled .Values.serviceAccounts.operator.create .Values.gatewayAPI.enabled .Values.gatewayAPI.secretsNamespace.sync .Values.gatewayAPI.secretsNamespace.name }}
+{{- if and .Values.operator.enabled (not .Values.preflight.enabled) .Values.serviceAccounts.operator.create .Values.gatewayAPI.enabled .Values.gatewayAPI.secretsNamespace.sync .Values.gatewayAPI.secretsNamespace.name }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
@@ -35,6 +36,7 @@ metadata:
   namespace: {{ .Values.gatewayAPI.secretsNamespace.name | quote }}
   labels:
     app.kubernetes.io/part-of: cilium
+    helm.sh/chart: {{ include "cilium.chart" . }}
     {{- with .Values.commonLabels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
@@ -52,7 +54,7 @@ subjects:
   namespace: {{ include "cilium.namespace" . }}
 {{- end }}
 
-{{- if and .Values.operator.enabled .Values.serviceAccounts.operator.create $secretSyncEnabled .Values.tls.secretsNamespace.name }}
+{{- if and .Values.operator.enabled (not .Values.preflight.enabled) .Values.serviceAccounts.operator.create $secretSyncEnabled .Values.tls.secretsNamespace.name }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
@@ -61,6 +63,7 @@ metadata:
   namespace: {{ .Values.tls.secretsNamespace.name | quote }}
   labels:
     app.kubernetes.io/part-of: cilium
+    helm.sh/chart: {{ include "cilium.chart" . }}
     {{- with .Values.commonLabels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
@@ -78,7 +81,7 @@ subjects:
   namespace: {{ include "cilium.namespace" . }}
 {{- end }}
 
-{{- if and .Values.operator.enabled .Values.serviceAccounts.operator.create }}
+{{- if and .Values.operator.enabled (not .Values.preflight.enabled) .Values.serviceAccounts.operator.create }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
@@ -87,6 +90,7 @@ metadata:
   namespace: {{ include "cilium.namespace" . }}
   labels:
     app.kubernetes.io/part-of: cilium
+    helm.sh/chart: {{ include "cilium.chart" . }}
     {{- with .Values.commonLabels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
diff --git a/packages/system/cilium/charts/cilium/templates/cilium-operator/service.yaml b/packages/system/cilium/charts/cilium/templates/cilium-operator/service.yaml
index da4c88c2bf..dd2fe49b19 100644
--- a/packages/system/cilium/charts/cilium/templates/cilium-operator/service.yaml
+++ b/packages/system/cilium/charts/cilium/templates/cilium-operator/service.yaml
@@ -13,6 +13,7 @@ metadata:
     name: cilium-operator
     app.kubernetes.io/part-of: cilium
     app.kubernetes.io/name: cilium-operator
+    helm.sh/chart: {{ include "cilium.chart" . }}
     {{- with .Values.commonLabels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
diff --git a/packages/system/cilium/charts/cilium/templates/cilium-operator/servicemonitor.yaml b/packages/system/cilium/charts/cilium/templates/cilium-operator/servicemonitor.yaml
index b0a91f437f..37920cae37 100644
--- a/packages/system/cilium/charts/cilium/templates/cilium-operator/servicemonitor.yaml
+++ b/packages/system/cilium/charts/cilium/templates/cilium-operator/servicemonitor.yaml
@@ -7,6 +7,7 @@ metadata:
   labels:
     app.kubernetes.io/part-of: cilium
     app.kubernetes.io/name: cilium-operator
+    helm.sh/chart: {{ include "cilium.chart" . }}
     {{- with .Values.commonLabels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
diff --git a/packages/system/cilium/charts/cilium/templates/cilium-preflight/clusterrole.yaml b/packages/system/cilium/charts/cilium/templates/cilium-preflight/clusterrole.yaml
index fbf511cd93..0730d9445f 100644
--- a/packages/system/cilium/charts/cilium/templates/cilium-preflight/clusterrole.yaml
+++ b/packages/system/cilium/charts/cilium/templates/cilium-preflight/clusterrole.yaml
@@ -14,6 +14,7 @@ metadata:
   {{- end }}
   labels:
     app.kubernetes.io/part-of: cilium
+    helm.sh/chart: {{ include "cilium.chart" . }}
     {{- with .Values.commonLabels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
@@ -40,7 +41,6 @@ rules:
   - namespaces
   - services
   - pods
-  - endpoints
   - nodes
 {{- if $readSecretsOnlyFromSecretsNamespace }}
   - secrets
@@ -111,6 +111,7 @@ rules:
   - ciliumcidrgroups
   - ciliuml2announcementpolicies
   - ciliumpodippools
+  - ciliumdatapathplugins
   verbs:
   - list
   - watch
@@ -153,4 +154,14 @@ rules:
   - ciliumbgpnodeconfigs/status
   verbs:
   - patch
+{{- if .Values.k8sClusterNetworkPolicy.enabled }}
+- apiGroups:
+  - policy.networking.k8s.io
+  resources:
+  - clusternetworkpolicies
+  verbs:
+  - get
+  - list
+  - watch
+{{- end }}
 {{- end }}
diff --git a/packages/system/cilium/charts/cilium/templates/cilium-preflight/clusterrolebinding.yaml b/packages/system/cilium/charts/cilium/templates/cilium-preflight/clusterrolebinding.yaml
index ec667ea023..19c02421cf 100644
--- a/packages/system/cilium/charts/cilium/templates/cilium-preflight/clusterrolebinding.yaml
+++ b/packages/system/cilium/charts/cilium/templates/cilium-preflight/clusterrolebinding.yaml
@@ -9,6 +9,7 @@ metadata:
   {{- end }}
   labels:
     app.kubernetes.io/part-of: cilium
+    helm.sh/chart: {{ include "cilium.chart" . }}
     {{- with .Values.commonLabels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
diff --git a/packages/system/cilium/charts/cilium/templates/cilium-preflight/daemonset.yaml b/packages/system/cilium/charts/cilium/templates/cilium-preflight/daemonset.yaml
index b5418fe5b2..77616e1e54 100644
--- a/packages/system/cilium/charts/cilium/templates/cilium-preflight/daemonset.yaml
+++ b/packages/system/cilium/charts/cilium/templates/cilium-preflight/daemonset.yaml
@@ -30,6 +30,7 @@ spec:
         app.kubernetes.io/part-of: cilium
         k8s-app: cilium-pre-flight-check
         app.kubernetes.io/name: cilium-pre-flight-check
+        helm.sh/chart: {{ include "cilium.chart" . }}
         kubernetes.io/cluster-service: "true"
         {{- with .Values.commonLabels }}
         {{- toYaml . | nindent 8 }}
@@ -114,76 +115,6 @@ spec:
             {{- toYaml . | trim | nindent 14 }}
           {{- end }}
           terminationMessagePolicy: FallbackToLogsOnError
-        {{- if ne .Values.preflight.tofqdnsPreCache "" }}
-        - name: cilium-pre-flight-fqdn-precache
-          image: {{ include "cilium.image" .Values.preflight.image | quote }}
-          imagePullPolicy: {{ .Values.preflight.image.pullPolicy }}
-          name: cilium-pre-flight-fqdn-precache
-          command: ["/bin/sh"]
-          args:
-          - -ec
-          - |
-            cilium-dbg preflight fqdn-poller --tofqdns-pre-cache {{ .Values.preflight.tofqdnsPreCache }};
-            touch /tmp/ready-tofqdns-precache;
-          livenessProbe:
-            exec:
-              command:
-              - cat
-              - /tmp/read-tofqdns-precachey
-            initialDelaySeconds: 5
-            periodSeconds: 5
-          readinessProbe:
-            exec:
-              command:
-              - cat
-              - /tmp/read-tofqdns-precachey
-            initialDelaySeconds: 5
-            periodSeconds: 5
-          env:
-          {{- if and .Values.k8sServiceHostRef.name .Values.k8sServiceHostRef.key }}
-          - name: KUBERNETES_SERVICE_HOST
-            valueFrom:
-              configMapKeyRef:
-                name: {{ .Values.k8sServiceHostRef.name }}
-                key: {{ .Values.k8sServiceHostRef.key }}
-          - name: KUBERNETES_SERVICE_PORT
-            value: {{ include "k8sServicePort" . }}
-          {{- end }}
-          {{- if .Values.k8sServiceHost }}
-          - name: KUBERNETES_SERVICE_HOST
-            value: {{ include "k8sServiceHost" . }}
-          - name: KUBERNETES_SERVICE_PORT
-            value: {{ include "k8sServicePort" . }}
-          {{- end }}
-          volumeMounts:
-          - name: cilium-run
-            mountPath: /var/run/cilium
-          {{- if .Values.etcd.enabled }}
-          - name: etcd-config-path
-            mountPath: /var/lib/etcd-config
-            readOnly: true
-          {{- if .Values.etcd.ssl }}
-          - name: etcd-secrets
-            mountPath: /var/lib/etcd-secrets
-            readOnly: true
-          {{- end }}
-          {{- end }}
-          {{- with .Values.preflight.extraVolumeMounts }}
-          {{- toYaml . | nindent 10 }}
-          {{- end }}
-          {{- with .Values.preflight.extraEnv }}
-          {{- toYaml . | trim | nindent 10 }}
-          {{- end }}
-          {{- with .Values.preflight.resources }}
-          resources:
-            {{- toYaml . | trim | nindent 12 }}
-          {{- end }}
-          {{- with .Values.preflight.securityContext }}
-          securityContext:
-            {{- toYaml . | trim | nindent 14 }}
-          {{- end }}
-          terminationMessagePolicy: FallbackToLogsOnError
-        {{- end }}
         {{- if $envoyDS }}
         - name: cilium-pre-flight-envoy
           image: {{ include "cilium.image" .Values.preflight.envoy.image | quote }}
@@ -224,6 +155,9 @@ spec:
           terminationMessagePolicy: FallbackToLogsOnError
         {{- end }}
       hostNetwork: true
+      {{- if (semverCompare ">= 1.33-0" .Capabilities.KubeVersion.Version) }}
+      hostUsers: true
+      {{- end }}
       dnsPolicy: ClusterFirstWithHostNet
       restartPolicy: Always
       priorityClassName: {{ include "cilium.priorityClass" (list $ .Values.preflight.priorityClassName "system-node-critical") }}
diff --git a/packages/system/cilium/charts/cilium/templates/cilium-preflight/deployment.yaml b/packages/system/cilium/charts/cilium/templates/cilium-preflight/deployment.yaml
index 6218b46054..448c3a8a6f 100644
--- a/packages/system/cilium/charts/cilium/templates/cilium-preflight/deployment.yaml
+++ b/packages/system/cilium/charts/cilium/templates/cilium-preflight/deployment.yaml
@@ -11,6 +11,7 @@ metadata:
   labels:
     app.kubernetes.io/part-of: cilium
     app.kubernetes.io/name: cilium-pre-flight-check
+    helm.sh/chart: {{ include "cilium.chart" . }}
     {{- with .Values.commonLabels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
@@ -30,6 +31,7 @@ spec:
         k8s-app: cilium-pre-flight-check-deployment
         kubernetes.io/cluster-service: "true"
         app.kubernetes.io/name: cilium-pre-flight-check
+        helm.sh/chart: {{ include "cilium.chart" . }}
         {{- with .Values.commonLabels }}
         {{- toYaml . | nindent 8 }}
         {{- end }}
@@ -92,6 +94,9 @@ spec:
       {{- toYaml . | trim | nindent 6 }}
       {{- end }}
       hostNetwork: true
+      {{- if (semverCompare ">= 1.33-0" .Capabilities.KubeVersion.Version) }}
+      hostUsers: true
+      {{- end }}
       restartPolicy: Always
       priorityClassName: {{ include "cilium.priorityClass" (list $ .Values.preflight.priorityClassName "system-cluster-critical") }}
       serviceAccountName: {{ .Values.serviceAccounts.preflight.name | quote }}
diff --git a/packages/system/cilium/charts/cilium/templates/cilium-preflight/poddisruptionbudget.yaml b/packages/system/cilium/charts/cilium/templates/cilium-preflight/poddisruptionbudget.yaml
index 576d9d3568..ce0183326c 100644
--- a/packages/system/cilium/charts/cilium/templates/cilium-preflight/poddisruptionbudget.yaml
+++ b/packages/system/cilium/charts/cilium/templates/cilium-preflight/poddisruptionbudget.yaml
@@ -13,6 +13,7 @@ metadata:
     k8s-app: cilium-pre-flight-check-deployment
     app.kubernetes.io/part-of: cilium
     app.kubernetes.io/name: cilium-pre-flight-check
+    helm.sh/chart: {{ include "cilium.chart" . }}
     kubernetes.io/cluster-service: "true"
     {{- with .Values.commonLabels }}
     {{- toYaml . | nindent 4 }}
diff --git a/packages/system/cilium/charts/cilium/templates/cilium-resource-quota.yaml b/packages/system/cilium/charts/cilium/templates/cilium-resource-quota.yaml
index 5647652cbe..df36c94be9 100644
--- a/packages/system/cilium/charts/cilium/templates/cilium-resource-quota.yaml
+++ b/packages/system/cilium/charts/cilium/templates/cilium-resource-quota.yaml
@@ -24,6 +24,7 @@ metadata:
   namespace: {{ include "cilium.namespace" . }}
   labels:
     app.kubernetes.io/part-of: cilium
+    helm.sh/chart: {{ include "cilium.chart" . }}
     {{- with .Values.commonLabels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
diff --git a/packages/system/cilium/charts/cilium/templates/cilium-secrets-namespace.yaml b/packages/system/cilium/charts/cilium/templates/cilium-secrets-namespace.yaml
index 600ccfebac..b9bc489b97 100644
--- a/packages/system/cilium/charts/cilium/templates/cilium-secrets-namespace.yaml
+++ b/packages/system/cilium/charts/cilium/templates/cilium-secrets-namespace.yaml
@@ -9,6 +9,7 @@
 {{- $_ := set $secretNamespaces .Values.tls.secretsNamespace.name 1 -}}
 {{- end -}}
 
+{{- if (not .Values.preflight.enabled) -}}
 {{- range $name, $_ := $secretNamespaces }}
 ---
 apiVersion: v1
@@ -17,6 +18,7 @@ metadata:
   name: {{ $name | quote }}
   labels:
     app.kubernetes.io/part-of: cilium
+    helm.sh/chart: {{ include "cilium.chart" $ }}
     {{- with $.Values.commonLabels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
@@ -27,4 +29,5 @@ metadata:
     {{- with $.Values.secretsNamespaceAnnotations }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
-{{- end}}
+{{- end -}}
+{{- end -}}
diff --git a/packages/system/cilium/charts/cilium/templates/clustermesh-apiserver/_helpers.tpl b/packages/system/cilium/charts/cilium/templates/clustermesh-apiserver/_helpers.tpl
index a90bccaa54..cb74e5171a 100644
--- a/packages/system/cilium/charts/cilium/templates/clustermesh-apiserver/_helpers.tpl
+++ b/packages/system/cilium/charts/cilium/templates/clustermesh-apiserver/_helpers.tpl
@@ -13,3 +13,20 @@ remote-{{ .Values.cluster.name }}
 remote
 {{- end -}}
 {{- end -}}
+
+{{- define "clustermesh-apiserver-generate-certs.server-common-name" -}}
+{{- (printf "clustermesh-apiserver.%s.svc" (include "cilium.namespace" .)) -}}
+{{- end -}}
+
+{{- define "clustermesh-apiserver-generate-certs.server-dns-names" -}}
+{{- $default := (list (include "clustermesh-apiserver-generate-certs.server-common-name" .) "*.mesh.cilium.io") -}}
+{{- $deprecated := dig "server" "extraDnsNames" (list) .Values.clustermesh.apiserver.tls -}}
+{{- $extra := .Values.clustermesh.apiserver.tls.auto.server.extraDnsNames | default $deprecated -}}
+{{- concat $default $extra | toYaml -}}
+{{- end -}}
+
+{{- define "clustermesh-apiserver-generate-certs.server-ip-addresses" -}}
+{{- $deprecated := dig "server" "extraIpAddresses" (list) .Values.clustermesh.apiserver.tls -}}
+{{- $extra := .Values.clustermesh.apiserver.tls.auto.server.extraIpAddresses | default $deprecated -}}
+{{- concat (list "127.0.0.1" "::1") $extra | toYaml -}}
+{{- end -}}
diff --git a/packages/system/cilium/charts/cilium/templates/clustermesh-apiserver/clusterrole.yaml b/packages/system/cilium/charts/cilium/templates/clustermesh-apiserver/clusterrole.yaml
index 88288eb812..59f5273dd1 100644
--- a/packages/system/cilium/charts/cilium/templates/clustermesh-apiserver/clusterrole.yaml
+++ b/packages/system/cilium/charts/cilium/templates/clustermesh-apiserver/clusterrole.yaml
@@ -5,6 +5,7 @@ metadata:
   name: clustermesh-apiserver
   labels:
     app.kubernetes.io/part-of: cilium
+    helm.sh/chart: {{ include "cilium.chart" . }}
     {{- with .Values.commonLabels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
@@ -35,7 +36,6 @@ rules:
 - apiGroups:
   - ""
   resources:
-  - endpoints
   - namespaces
   - services
   verbs:
@@ -50,7 +50,7 @@ rules:
   - get
   - list
   - watch
-{{- if or .Values.clustermesh.mcsapi.enabled .Values.clustermesh.enableMCSAPISupport }}
+{{- if .Values.clustermesh.mcsapi.enabled }}
 - apiGroups:
   - multicluster.x-k8s.io
   resources:
diff --git a/packages/system/cilium/charts/cilium/templates/clustermesh-apiserver/clusterrolebinding.yaml b/packages/system/cilium/charts/cilium/templates/clustermesh-apiserver/clusterrolebinding.yaml
index efbcf1381c..44f9fc7786 100644
--- a/packages/system/cilium/charts/cilium/templates/clustermesh-apiserver/clusterrolebinding.yaml
+++ b/packages/system/cilium/charts/cilium/templates/clustermesh-apiserver/clusterrolebinding.yaml
@@ -5,6 +5,7 @@ metadata:
   name: clustermesh-apiserver
   labels:
     app.kubernetes.io/part-of: cilium
+    helm.sh/chart: {{ include "cilium.chart" . }}
     {{- with .Values.commonLabels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
diff --git a/packages/system/cilium/charts/cilium/templates/clustermesh-apiserver/deployment.yaml b/packages/system/cilium/charts/cilium/templates/clustermesh-apiserver/deployment.yaml
index 1146209af7..a0cc703940 100644
--- a/packages/system/cilium/charts/cilium/templates/clustermesh-apiserver/deployment.yaml
+++ b/packages/system/cilium/charts/cilium/templates/clustermesh-apiserver/deployment.yaml
@@ -15,6 +15,7 @@ metadata:
     k8s-app: clustermesh-apiserver
     app.kubernetes.io/part-of: cilium
     app.kubernetes.io/name: clustermesh-apiserver
+    helm.sh/chart: {{ include "cilium.chart" . }}
     {{- with .Values.commonLabels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
@@ -45,6 +46,7 @@ spec:
         app.kubernetes.io/part-of: cilium
         app.kubernetes.io/name: clustermesh-apiserver
         k8s-app: clustermesh-apiserver
+        helm.sh/chart: {{ include "cilium.chart" . }}
         {{- with .Values.commonLabels }}
         {{- toYaml . | nindent 8 }}
         {{- end }}
@@ -195,7 +197,7 @@ spec:
         - --cluster-name=$(CLUSTER_NAME)
         - --cluster-id=$(CLUSTER_ID)
         - --kvstore-opt=etcd.config=/var/lib/cilium/etcd-config.yaml
-        - --kvstore-opt=etcd.qps=20
+        - --kvstore-opt=etcd.qps={{ .Values.clustermesh.apiserver.etcdQPS }}
         - --kvstore-opt=etcd.bootstrapQps=10000
         {{- if hasKey .Values.clustermesh "maxConnectedClusters" }}
         - --max-connected-clusters={{ .Values.clustermesh.maxConnectedClusters }}
@@ -209,12 +211,13 @@ spec:
         - --prometheus-serve-addr=:{{ .Values.clustermesh.apiserver.metrics.port }}
         - --controller-group-metrics=all
         {{- end }}
-        {{- if or .Values.clustermesh.mcsapi.enabled .Values.clustermesh.enableMCSAPISupport }}
+        {{- if .Values.clustermesh.mcsapi.enabled }}
         - --clustermesh-enable-mcs-api
         {{- end }}
         {{- if .Values.ciliumEndpointSlice.enabled }}
         - --enable-cilium-endpoint-slice
         {{- end }}
+        - --clustermesh-default-global-namespace={{ .Values.clustermesh.defaultGlobalNamespace }}
         {{- include "clustermesh.apiserver.args.extra" . | nindent 8 }}
         {{- with .Values.clustermesh.apiserver.extraArgs }}
         {{- toYaml . | trim | nindent 8 }}
@@ -296,7 +299,7 @@ spec:
         - --cluster-name=$(CLUSTER_NAME)
         - --cluster-id=$(CLUSTER_ID)
         - --kvstore-opt=etcd.config=/var/lib/cilium/etcd-config.yaml
-        - --kvstore-opt=etcd.qps=100
+        - --kvstore-opt=etcd.qps={{ .Values.clustermesh.apiserver.kvstoremesh.etcdQPS }}
         {{- if ne .Values.clustermesh.apiserver.kvstoremesh.kvstoreMode "external" }}
         - --kvstore-opt=etcd.bootstrapQps=10000
         {{- end }}
@@ -507,7 +510,8 @@ spec:
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- if and .Values.clustermesh.config.enabled .Values.clustermesh.apiserver.kvstoremesh.enabled }}
+      {{/* TODO: remove hostAliases for the v1.21 release as this is now handled via a static dialer to avoid pod restart */}}
+      {{- if and .Values.clustermesh.config.enabled .Values.clustermesh.apiserver.kvstoremesh.enabled (not .Values.clustermesh.disableKubernetesHostAliases) }}
       hostAliases:
       {{- range $_, $cluster := (include "clustermesh-clusters" . | fromJson) }}
       {{- range $ip := $cluster.ips }}
diff --git a/packages/system/cilium/charts/cilium/templates/clustermesh-apiserver/metrics-service.yaml b/packages/system/cilium/charts/cilium/templates/clustermesh-apiserver/metrics-service.yaml
index 587c9b13df..57245c746a 100644
--- a/packages/system/cilium/charts/cilium/templates/clustermesh-apiserver/metrics-service.yaml
+++ b/packages/system/cilium/charts/cilium/templates/clustermesh-apiserver/metrics-service.yaml
@@ -16,6 +16,7 @@ metadata:
     app.kubernetes.io/part-of: cilium
     app.kubernetes.io/name: clustermesh-apiserver
     app.kubernetes.io/component: metrics
+    helm.sh/chart: {{ include "cilium.chart" . }}
     {{- with .Values.commonLabels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
diff --git a/packages/system/cilium/charts/cilium/templates/clustermesh-apiserver/poddisruptionbudget.yaml b/packages/system/cilium/charts/cilium/templates/clustermesh-apiserver/poddisruptionbudget.yaml
index 2ead8f29e6..2cab906d2b 100644
--- a/packages/system/cilium/charts/cilium/templates/clustermesh-apiserver/poddisruptionbudget.yaml
+++ b/packages/system/cilium/charts/cilium/templates/clustermesh-apiserver/poddisruptionbudget.yaml
@@ -13,6 +13,7 @@ metadata:
     k8s-app: clustermesh-apiserver
     app.kubernetes.io/part-of: cilium
     app.kubernetes.io/name: clustermesh-apiserver
+    helm.sh/chart: {{ include "cilium.chart" . }}
     {{- with .Values.commonLabels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
diff --git a/packages/system/cilium/charts/cilium/templates/clustermesh-apiserver/service.yaml b/packages/system/cilium/charts/cilium/templates/clustermesh-apiserver/service.yaml
index 5e20234bd3..4f6ffacb59 100644
--- a/packages/system/cilium/charts/cilium/templates/clustermesh-apiserver/service.yaml
+++ b/packages/system/cilium/charts/cilium/templates/clustermesh-apiserver/service.yaml
@@ -8,6 +8,7 @@ metadata:
     k8s-app: clustermesh-apiserver
     app.kubernetes.io/part-of: cilium
     app.kubernetes.io/name: clustermesh-apiserver
+    helm.sh/chart: {{ include "cilium.chart" . }}
     {{- with .Values.commonLabels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
diff --git a/packages/system/cilium/charts/cilium/templates/clustermesh-apiserver/servicemonitor.yaml b/packages/system/cilium/charts/cilium/templates/clustermesh-apiserver/servicemonitor.yaml
index a9d4d5bcfa..ca441e4d3a 100644
--- a/packages/system/cilium/charts/cilium/templates/clustermesh-apiserver/servicemonitor.yaml
+++ b/packages/system/cilium/charts/cilium/templates/clustermesh-apiserver/servicemonitor.yaml
@@ -12,6 +12,7 @@ metadata:
   labels:
     app.kubernetes.io/part-of: cilium
     app.kubernetes.io/name: clustermesh-apiserver
+    helm.sh/chart: {{ include "cilium.chart" . }}
     {{- with .Values.commonLabels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
diff --git a/packages/system/cilium/charts/cilium/templates/clustermesh-apiserver/tls-certmanager/admin-secret.yaml b/packages/system/cilium/charts/cilium/templates/clustermesh-apiserver/tls-certmanager/admin-secret.yaml
index 7a2713b6d4..0777624cbb 100644
--- a/packages/system/cilium/charts/cilium/templates/clustermesh-apiserver/tls-certmanager/admin-secret.yaml
+++ b/packages/system/cilium/charts/cilium/templates/clustermesh-apiserver/tls-certmanager/admin-secret.yaml
@@ -16,6 +16,14 @@ metadata:
 spec:
   issuerRef:
     {{- toYaml .Values.clustermesh.apiserver.tls.auto.certManagerIssuerRef | nindent 4 }}
+  {{- with .Values.clustermesh.apiserver.tls.auto.subject }}
+  subject:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- with .Values.clustermesh.apiserver.tls.auto.privateKey }}
+  privateKey:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
   secretName: clustermesh-apiserver-admin-cert
   commonName: {{ include "clustermesh-apiserver-generate-certs.admin-common-name" . }}
   duration: {{ printf "%dh0m0s" (mul .Values.clustermesh.apiserver.tls.auto.certValidityDuration 24) }}
diff --git a/packages/system/cilium/charts/cilium/templates/clustermesh-apiserver/tls-certmanager/local-secret.yaml b/packages/system/cilium/charts/cilium/templates/clustermesh-apiserver/tls-certmanager/local-secret.yaml
index 376fd61b1b..611600a450 100644
--- a/packages/system/cilium/charts/cilium/templates/clustermesh-apiserver/tls-certmanager/local-secret.yaml
+++ b/packages/system/cilium/charts/cilium/templates/clustermesh-apiserver/tls-certmanager/local-secret.yaml
@@ -16,6 +16,14 @@ metadata:
 spec:
   issuerRef:
     {{- toYaml .Values.clustermesh.apiserver.tls.auto.certManagerIssuerRef | nindent 4 }}
+  {{- with .Values.clustermesh.apiserver.tls.auto.subject }}
+  subject:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- with .Values.clustermesh.apiserver.tls.auto.privateKey }}
+  privateKey:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
   secretName: clustermesh-apiserver-local-cert
   commonName: {{ include "clustermesh-apiserver-generate-certs.local-common-name" . }}
   duration: {{ printf "%dh0m0s" (mul .Values.clustermesh.apiserver.tls.auto.certValidityDuration 24) }}
diff --git a/packages/system/cilium/charts/cilium/templates/clustermesh-apiserver/tls-certmanager/remote-secret.yaml b/packages/system/cilium/charts/cilium/templates/clustermesh-apiserver/tls-certmanager/remote-secret.yaml
index 94ab411959..d6a3a9a355 100644
--- a/packages/system/cilium/charts/cilium/templates/clustermesh-apiserver/tls-certmanager/remote-secret.yaml
+++ b/packages/system/cilium/charts/cilium/templates/clustermesh-apiserver/tls-certmanager/remote-secret.yaml
@@ -16,6 +16,14 @@ metadata:
 spec:
   issuerRef:
     {{- toYaml .Values.clustermesh.apiserver.tls.auto.certManagerIssuerRef | nindent 4 }}
+  {{- with .Values.clustermesh.apiserver.tls.auto.subject }}
+  subject:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- with .Values.clustermesh.apiserver.tls.auto.privateKey }}
+  privateKey:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
   secretName: clustermesh-apiserver-remote-cert
   commonName: {{ include "clustermesh-apiserver-generate-certs.remote-common-name" . }}
   duration: {{ printf "%dh0m0s" (mul .Values.clustermesh.apiserver.tls.auto.certValidityDuration 24) }}
diff --git a/packages/system/cilium/charts/cilium/templates/clustermesh-apiserver/tls-certmanager/server-secret.yaml b/packages/system/cilium/charts/cilium/templates/clustermesh-apiserver/tls-certmanager/server-secret.yaml
index a8772ae265..6a597b01a8 100644
--- a/packages/system/cilium/charts/cilium/templates/clustermesh-apiserver/tls-certmanager/server-secret.yaml
+++ b/packages/system/cilium/charts/cilium/templates/clustermesh-apiserver/tls-certmanager/server-secret.yaml
@@ -5,31 +5,30 @@ kind: Certificate
 metadata:
   name: clustermesh-apiserver-server-cert
   namespace: {{ include "cilium.namespace" . }}
-  {{- with .Values.clustermesh.annotations }}
   {{- with .Values.commonLabels }}
   labels:
     {{- toYaml . | nindent 4 }}
   {{- end }}
+  {{- with .Values.clustermesh.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
   issuerRef:
     {{- toYaml .Values.clustermesh.apiserver.tls.auto.certManagerIssuerRef | nindent 4 }}
+  {{- with .Values.clustermesh.apiserver.tls.auto.subject }}
+  subject:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- with .Values.clustermesh.apiserver.tls.auto.privateKey }}
+  privateKey:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
   secretName: clustermesh-apiserver-server-cert
-  commonName: clustermesh-apiserver.cilium.io
+  commonName: {{ include "clustermesh-apiserver-generate-certs.server-common-name" . }}
   dnsNames:
-  - clustermesh-apiserver.cilium.io
-  - "*.mesh.cilium.io"
-  - "clustermesh-apiserver.{{ include "cilium.namespace" . }}.svc"
-  {{- range $dns := .Values.clustermesh.apiserver.tls.server.extraDnsNames }}
-  - {{ $dns | quote }}
-  {{- end }}
+  {{- include "clustermesh-apiserver-generate-certs.server-dns-names" . | nindent 2 }}
   ipAddresses:
-  - "127.0.0.1"
-  - "::1"
-  {{- range $ip := .Values.clustermesh.apiserver.tls.server.extraIpAddresses }}
-  - {{ $ip | quote }}
-  {{- end }}
+  {{- include "clustermesh-apiserver-generate-certs.server-ip-addresses" . | nindent 2 }}
   duration: {{ printf "%dh0m0s" (mul .Values.clustermesh.apiserver.tls.auto.certValidityDuration 24) }}
 {{- end }}
diff --git a/packages/system/cilium/charts/cilium/templates/clustermesh-apiserver/tls-cronjob/_job-spec.tpl b/packages/system/cilium/charts/cilium/templates/clustermesh-apiserver/tls-cronjob/_job-spec.tpl
index 2fdccf47fd..611e44b3b2 100644
--- a/packages/system/cilium/charts/cilium/templates/clustermesh-apiserver/tls-cronjob/_job-spec.tpl
+++ b/packages/system/cilium/charts/cilium/templates/clustermesh-apiserver/tls-cronjob/_job-spec.tpl
@@ -36,25 +36,17 @@ spec:
             - "--ca-secret-namespace={{ include "cilium.namespace" . }}"
             - "--ca-secret-name=cilium-ca"
             - "--ca-common-name=Cilium CA"
+            - "--ca-enforce-validity-throughout-leaves-duration={{ .Values.certgen.enforceCAValidityThroughoutLeavesDuration }}"
           env:
             - name: CILIUM_CERTGEN_CONFIG
               value: |
                 certs:
                 - name: clustermesh-apiserver-server-cert
                   namespace: {{ include "cilium.namespace" . }}
-                  commonName: "clustermesh-apiserver.cilium.io"
+                  commonName: {{ include "clustermesh-apiserver-generate-certs.server-common-name" . }}
                   hosts:
-                  - "clustermesh-apiserver.cilium.io"
-                  - "*.mesh.cilium.io"
-                  - "clustermesh-apiserver.{{ include "cilium.namespace" . }}.svc"
-                  {{- range $dns := .Values.clustermesh.apiserver.tls.server.extraDnsNames }}
-                  - {{ $dns | quote }}
-                  {{- end }}
-                  - "127.0.0.1"
-                  - "::1"
-                  {{- range $ip := .Values.clustermesh.apiserver.tls.server.extraIpAddresses }}
-                  - {{ $ip | quote }}
-                  {{- end }}
+                  {{- include "clustermesh-apiserver-generate-certs.server-dns-names" . | nindent 18 }}
+                  {{- include "clustermesh-apiserver-generate-certs.server-ip-addresses" . | nindent 18 }}
                   usage:
                   - signing
                   - key encipherment
diff --git a/packages/system/cilium/charts/cilium/templates/clustermesh-apiserver/tls-cronjob/cronjob.yaml b/packages/system/cilium/charts/cilium/templates/clustermesh-apiserver/tls-cronjob/cronjob.yaml
index 4b88d92cf4..6a16ea69d1 100644
--- a/packages/system/cilium/charts/cilium/templates/clustermesh-apiserver/tls-cronjob/cronjob.yaml
+++ b/packages/system/cilium/charts/cilium/templates/clustermesh-apiserver/tls-cronjob/cronjob.yaml
@@ -11,6 +11,7 @@ metadata:
   labels:
     k8s-app: clustermesh-apiserver-generate-certs
     app.kubernetes.io/part-of: cilium
+    helm.sh/chart: {{ include "cilium.chart" . }}
     {{- with .Values.commonLabels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
diff --git a/packages/system/cilium/charts/cilium/templates/clustermesh-apiserver/tls-cronjob/job.yaml b/packages/system/cilium/charts/cilium/templates/clustermesh-apiserver/tls-cronjob/job.yaml
index 574aee13e6..90618e9380 100644
--- a/packages/system/cilium/charts/cilium/templates/clustermesh-apiserver/tls-cronjob/job.yaml
+++ b/packages/system/cilium/charts/cilium/templates/clustermesh-apiserver/tls-cronjob/job.yaml
@@ -20,6 +20,7 @@ metadata:
     {{- toYaml . | nindent 4 }}
     {{- end }}
     app.kubernetes.io/part-of: cilium
+    helm.sh/chart: {{ include "cilium.chart" . }}
   {{- if or .Values.certgen.annotations.job .Values.clustermesh.annotations }}
   annotations:
     {{- with .Values.certgen.annotations.job }}
diff --git a/packages/system/cilium/charts/cilium/templates/clustermesh-apiserver/tls-cronjob/role.yaml b/packages/system/cilium/charts/cilium/templates/clustermesh-apiserver/tls-cronjob/role.yaml
index 1f6dc153d0..abeab10b87 100644
--- a/packages/system/cilium/charts/cilium/templates/clustermesh-apiserver/tls-cronjob/role.yaml
+++ b/packages/system/cilium/charts/cilium/templates/clustermesh-apiserver/tls-cronjob/role.yaml
@@ -10,6 +10,7 @@ metadata:
   {{- end }}
   labels:
     app.kubernetes.io/part-of: cilium
+    helm.sh/chart: {{ include "cilium.chart" . }}
     {{- with .Values.commonLabels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
diff --git a/packages/system/cilium/charts/cilium/templates/clustermesh-apiserver/tls-cronjob/rolebinding.yaml b/packages/system/cilium/charts/cilium/templates/clustermesh-apiserver/tls-cronjob/rolebinding.yaml
index 6e5dd695ff..9ea680c54c 100644
--- a/packages/system/cilium/charts/cilium/templates/clustermesh-apiserver/tls-cronjob/rolebinding.yaml
+++ b/packages/system/cilium/charts/cilium/templates/clustermesh-apiserver/tls-cronjob/rolebinding.yaml
@@ -10,6 +10,7 @@ metadata:
   {{- end }}
   labels:
     app.kubernetes.io/part-of: cilium
+    helm.sh/chart: {{ include "cilium.chart" . }}
     {{- with .Values.commonLabels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
diff --git a/packages/system/cilium/charts/cilium/templates/clustermesh-apiserver/tls-helm/server-secret.yaml b/packages/system/cilium/charts/cilium/templates/clustermesh-apiserver/tls-helm/server-secret.yaml
index 0df9a20d65..7a2647ae8e 100644
--- a/packages/system/cilium/charts/cilium/templates/clustermesh-apiserver/tls-helm/server-secret.yaml
+++ b/packages/system/cilium/charts/cilium/templates/clustermesh-apiserver/tls-helm/server-secret.yaml
@@ -1,8 +1,8 @@
 {{- if and (and .Values.clustermesh.useAPIServer (eq .Values.clustermesh.apiserver.kvstoremesh.kvstoreMode "internal")) .Values.clustermesh.apiserver.tls.auto.enabled (eq .Values.clustermesh.apiserver.tls.auto.method "helm") }}
 {{- $_ := include "cilium.ca.setup" . -}}
-{{- $cn := "clustermesh-apiserver.cilium.io" }}
-{{- $ip := concat (list "127.0.0.1" "::1") .Values.clustermesh.apiserver.tls.server.extraIpAddresses }}
-{{- $dns := concat (list $cn "*.mesh.cilium.io" (printf "clustermesh-apiserver.%s.svc" (include "cilium.namespace" .))) .Values.clustermesh.apiserver.tls.server.extraDnsNames }}
+{{- $cn := include "clustermesh-apiserver-generate-certs.server-common-name" . }}
+{{- $ip := include "clustermesh-apiserver-generate-certs.server-ip-addresses" . | fromYamlArray }}
+{{- $dns := include "clustermesh-apiserver-generate-certs.server-dns-names" . | fromYamlArray }}
 {{- $cert := genSignedCert $cn $ip $dns (.Values.clustermesh.apiserver.tls.auto.certValidityDuration | int) .commonCA -}}
 ---
 apiVersion: v1
diff --git a/packages/system/cilium/charts/cilium/templates/clustermesh-apiserver/tls-provided/admin-secret.yaml b/packages/system/cilium/charts/cilium/templates/clustermesh-apiserver/tls-provided/admin-secret.yaml
deleted file mode 100644
index 24a8f1c9f3..0000000000
--- a/packages/system/cilium/charts/cilium/templates/clustermesh-apiserver/tls-provided/admin-secret.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-{{- if and (and .Values.clustermesh.useAPIServer (eq .Values.clustermesh.apiserver.kvstoremesh.kvstoreMode "internal")) (not .Values.clustermesh.apiserver.tls.auto.enabled) }}
-{{- if .Values.clustermesh.apiserver.tls.enableSecrets }}
-apiVersion: v1
-kind: Secret
-metadata:
-  name: clustermesh-apiserver-admin-cert
-  namespace: {{ include "cilium.namespace" . }}
-  {{- with .Values.commonLabels }}
-  labels:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-  {{- with .Values.clustermesh.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-type: kubernetes.io/tls
-data:
-  ca.crt: {{ .Values.tls.ca.cert }}
-  tls.crt: {{ .Values.clustermesh.apiserver.tls.admin.cert | required "missing clustermesh.apiserver.tls.admin.cert" }}
-  tls.key: {{ .Values.clustermesh.apiserver.tls.admin.key  | required "missing clustermesh.apiserver.tls.admin.key"  }}
-{{- end }}
-{{- end }}
diff --git a/packages/system/cilium/charts/cilium/templates/clustermesh-apiserver/tls-provided/remote-secret.yaml b/packages/system/cilium/charts/cilium/templates/clustermesh-apiserver/tls-provided/remote-secret.yaml
deleted file mode 100644
index 46a1b6c4b1..0000000000
--- a/packages/system/cilium/charts/cilium/templates/clustermesh-apiserver/tls-provided/remote-secret.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-{{- if and .Values.clustermesh.useAPIServer (eq .Values.clustermesh.apiserver.kvstoremesh.kvstoreMode "internal") (not .Values.clustermesh.apiserver.tls.auto.enabled) }}
-{{- if .Values.clustermesh.apiserver.tls.enableSecrets }}
-apiVersion: v1
-kind: Secret
-metadata:
-  name: clustermesh-apiserver-remote-cert
-  namespace: {{ include "cilium.namespace" . }}
-  {{- with .Values.commonLabels }}
-  labels:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-  {{- with .Values.clustermesh.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-type: kubernetes.io/tls
-data:
-  ca.crt: {{ .Values.tls.ca.cert }}
-  tls.crt: {{ .Values.clustermesh.apiserver.tls.remote.cert | required "missing clustermesh.apiserver.tls.remote.cert" }}
-  tls.key: {{ .Values.clustermesh.apiserver.tls.remote.key  | required "missing clustermesh.apiserver.tls.remote.key"  }}
-{{- end }}
-{{- end }}
diff --git a/packages/system/cilium/charts/cilium/templates/clustermesh-apiserver/tls-provided/server-secret.yaml b/packages/system/cilium/charts/cilium/templates/clustermesh-apiserver/tls-provided/server-secret.yaml
deleted file mode 100644
index 02b23986fe..0000000000
--- a/packages/system/cilium/charts/cilium/templates/clustermesh-apiserver/tls-provided/server-secret.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-{{- if and (and .Values.clustermesh.useAPIServer (eq .Values.clustermesh.apiserver.kvstoremesh.kvstoreMode "internal")) (not .Values.clustermesh.apiserver.tls.auto.enabled) }}
-{{- if .Values.clustermesh.apiserver.tls.enableSecrets }}
-apiVersion: v1
-kind: Secret
-metadata:
-  name: clustermesh-apiserver-server-cert
-  namespace: {{ include "cilium.namespace" . }}
-  {{- with .Values.commonLabels }}
-  labels:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-  {{- with .Values.clustermesh.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-type: kubernetes.io/tls
-data:
-  ca.crt: {{ .Values.tls.ca.cert }}
-  tls.crt: {{ .Values.clustermesh.apiserver.tls.server.cert | required "missing clustermesh.apiserver.tls.server.cert" }}
-  tls.key: {{ .Values.clustermesh.apiserver.tls.server.key  | required "missing clustermesh.apiserver.tls.server.key"  }}
-{{- end }}
-{{- end }}
diff --git a/packages/system/cilium/charts/cilium/templates/clustermesh-apiserver/users-configmap.yaml b/packages/system/cilium/charts/cilium/templates/clustermesh-apiserver/users-configmap.yaml
index d742e4e7d2..901097027d 100644
--- a/packages/system/cilium/charts/cilium/templates/clustermesh-apiserver/users-configmap.yaml
+++ b/packages/system/cilium/charts/cilium/templates/clustermesh-apiserver/users-configmap.yaml
@@ -14,6 +14,7 @@ metadata:
   {{- end }}
   labels:
     app.kubernetes.io/part-of: cilium
+    helm.sh/chart: {{ include "cilium.chart" . }}
     {{- with .Values.commonLabels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
diff --git a/packages/system/cilium/charts/cilium/templates/clustermesh-config/_helpers.tpl b/packages/system/cilium/charts/cilium/templates/clustermesh-config/_helpers.tpl
index abe9bdb8bf..0240fa6873 100644
--- a/packages/system/cilium/charts/cilium/templates/clustermesh-config/_helpers.tpl
+++ b/packages/system/cilium/charts/cilium/templates/clustermesh-config/_helpers.tpl
@@ -42,6 +42,12 @@ trusted-ca-file: /var/lib/cilium/clustermesh/common-etcd-client-ca.crt
 key-file: /var/lib/cilium/clustermesh/{{ $prefix }}etcd-client.key
 cert-file: /var/lib/cilium/clustermesh/{{ $prefix }}etcd-client.crt
 {{- end }}
+
+{{- if and (not $local_etcd) (eq $override "") ($cluster.ips) }}
+cilium-host-aliases:
+- hostname: {{ $cluster.name }}.{{ $domain }}
+  ips: {{ toYaml $cluster.ips | nindent 4 }}
+{{- end }}
 {{- end }}
 
 {{- define "clustermesh-clusters" }}
diff --git a/packages/system/cilium/charts/cilium/templates/clustermesh-coredns-mcsapi/clusterrole.yaml b/packages/system/cilium/charts/cilium/templates/clustermesh-coredns-mcsapi/clusterrole.yaml
index 08fcea1bba..34e30eaf76 100644
--- a/packages/system/cilium/charts/cilium/templates/clustermesh-coredns-mcsapi/clusterrole.yaml
+++ b/packages/system/cilium/charts/cilium/templates/clustermesh-coredns-mcsapi/clusterrole.yaml
@@ -1,4 +1,4 @@
-{{- if and (or .Values.clustermesh.mcsapi.enabled .Values.clustermesh.enableMCSAPISupport) .Values.clustermesh.mcsapi.corednsAutoConfigure.enabled }}
+{{- if and .Values.clustermesh.mcsapi.enabled .Values.clustermesh.mcsapi.corednsAutoConfigure.enabled }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
@@ -6,6 +6,7 @@ metadata:
   name: coredns-mcsapi
   labels:
     app.kubernetes.io/part-of: cilium
+    helm.sh/chart: {{ include "cilium.chart" . }}
     {{- with .Values.commonLabels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
diff --git a/packages/system/cilium/charts/cilium/templates/clustermesh-coredns-mcsapi/clusterrolebinding.yaml b/packages/system/cilium/charts/cilium/templates/clustermesh-coredns-mcsapi/clusterrolebinding.yaml
index 7a1867f5aa..056a0439cb 100644
--- a/packages/system/cilium/charts/cilium/templates/clustermesh-coredns-mcsapi/clusterrolebinding.yaml
+++ b/packages/system/cilium/charts/cilium/templates/clustermesh-coredns-mcsapi/clusterrolebinding.yaml
@@ -1,10 +1,11 @@
-{{- if and (or .Values.clustermesh.mcsapi.enabled .Values.clustermesh.enableMCSAPISupport) .Values.clustermesh.mcsapi.corednsAutoConfigure.enabled }}
+{{- if and .Values.clustermesh.mcsapi.enabled .Values.clustermesh.mcsapi.corednsAutoConfigure.enabled }}
 kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: coredns-mcsapi
   labels:
     app.kubernetes.io/part-of: cilium
+    helm.sh/chart: {{ include "cilium.chart" . }}
     {{- with .Values.commonLabels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
diff --git a/packages/system/cilium/charts/cilium/templates/clustermesh-coredns-mcsapi/job-clusterrole.yaml b/packages/system/cilium/charts/cilium/templates/clustermesh-coredns-mcsapi/job-clusterrole.yaml
index ac339f9fe4..c92c5ce70d 100644
--- a/packages/system/cilium/charts/cilium/templates/clustermesh-coredns-mcsapi/job-clusterrole.yaml
+++ b/packages/system/cilium/charts/cilium/templates/clustermesh-coredns-mcsapi/job-clusterrole.yaml
@@ -1,4 +1,4 @@
-{{- if and (or .Values.clustermesh.mcsapi.enabled .Values.clustermesh.enableMCSAPISupport) .Values.clustermesh.mcsapi.corednsAutoConfigure.enabled }}
+{{- if and .Values.clustermesh.mcsapi.enabled .Values.clustermesh.mcsapi.corednsAutoConfigure.enabled }}
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
diff --git a/packages/system/cilium/charts/cilium/templates/clustermesh-coredns-mcsapi/job-clusterrolebinding.yaml b/packages/system/cilium/charts/cilium/templates/clustermesh-coredns-mcsapi/job-clusterrolebinding.yaml
index 4b70ccf4a2..db08707aca 100644
--- a/packages/system/cilium/charts/cilium/templates/clustermesh-coredns-mcsapi/job-clusterrolebinding.yaml
+++ b/packages/system/cilium/charts/cilium/templates/clustermesh-coredns-mcsapi/job-clusterrolebinding.yaml
@@ -1,4 +1,4 @@
-{{- if and (or .Values.clustermesh.mcsapi.enabled .Values.clustermesh.enableMCSAPISupport) .Values.clustermesh.mcsapi.corednsAutoConfigure.enabled }}
+{{- if and .Values.clustermesh.mcsapi.enabled .Values.clustermesh.mcsapi.corednsAutoConfigure.enabled }}
 kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
diff --git a/packages/system/cilium/charts/cilium/templates/clustermesh-coredns-mcsapi/job-role.yaml b/packages/system/cilium/charts/cilium/templates/clustermesh-coredns-mcsapi/job-role.yaml
index 52f42fae22..eba219a0a7 100644
--- a/packages/system/cilium/charts/cilium/templates/clustermesh-coredns-mcsapi/job-role.yaml
+++ b/packages/system/cilium/charts/cilium/templates/clustermesh-coredns-mcsapi/job-role.yaml
@@ -1,4 +1,4 @@
-{{- if and (or .Values.clustermesh.mcsapi.enabled .Values.clustermesh.enableMCSAPISupport) .Values.clustermesh.mcsapi.corednsAutoConfigure.enabled }}
+{{- if and .Values.clustermesh.mcsapi.enabled .Values.clustermesh.mcsapi.corednsAutoConfigure.enabled }}
 kind: Role
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
diff --git a/packages/system/cilium/charts/cilium/templates/clustermesh-coredns-mcsapi/job-rolebinding.yaml b/packages/system/cilium/charts/cilium/templates/clustermesh-coredns-mcsapi/job-rolebinding.yaml
index f5caf1a11c..7cfd543474 100644
--- a/packages/system/cilium/charts/cilium/templates/clustermesh-coredns-mcsapi/job-rolebinding.yaml
+++ b/packages/system/cilium/charts/cilium/templates/clustermesh-coredns-mcsapi/job-rolebinding.yaml
@@ -1,4 +1,4 @@
-{{- if and (or .Values.clustermesh.mcsapi.enabled .Values.clustermesh.enableMCSAPISupport) .Values.clustermesh.mcsapi.corednsAutoConfigure.enabled }}
+{{- if and .Values.clustermesh.mcsapi.enabled .Values.clustermesh.mcsapi.corednsAutoConfigure.enabled }}
 kind: RoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
diff --git a/packages/system/cilium/charts/cilium/templates/clustermesh-coredns-mcsapi/job-serviceaccount.yaml b/packages/system/cilium/charts/cilium/templates/clustermesh-coredns-mcsapi/job-serviceaccount.yaml
index 4e572a1305..01e4ea2ba7 100644
--- a/packages/system/cilium/charts/cilium/templates/clustermesh-coredns-mcsapi/job-serviceaccount.yaml
+++ b/packages/system/cilium/charts/cilium/templates/clustermesh-coredns-mcsapi/job-serviceaccount.yaml
@@ -1,4 +1,4 @@
-{{- if and (or .Values.clustermesh.mcsapi.enabled .Values.clustermesh.enableMCSAPISupport) .Values.clustermesh.mcsapi.corednsAutoConfigure.enabled .Values.serviceAccounts.corednsMCSAPI.create }}
+{{- if and .Values.clustermesh.mcsapi.enabled .Values.clustermesh.mcsapi.corednsAutoConfigure.enabled .Values.serviceAccounts.corednsMCSAPI.create }}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
diff --git a/packages/system/cilium/charts/cilium/templates/clustermesh-coredns-mcsapi/job.yaml b/packages/system/cilium/charts/cilium/templates/clustermesh-coredns-mcsapi/job.yaml
index 9f9c3ccd92..bcfcb7558d 100644
--- a/packages/system/cilium/charts/cilium/templates/clustermesh-coredns-mcsapi/job.yaml
+++ b/packages/system/cilium/charts/cilium/templates/clustermesh-coredns-mcsapi/job.yaml
@@ -1,4 +1,4 @@
-{{- if and (or .Values.clustermesh.mcsapi.enabled .Values.clustermesh.enableMCSAPISupport) .Values.clustermesh.mcsapi.corednsAutoConfigure.enabled }}
+{{- if and .Values.clustermesh.mcsapi.enabled .Values.clustermesh.mcsapi.corednsAutoConfigure.enabled }}
 ---
 apiVersion: batch/v1
 kind: Job
@@ -11,6 +11,7 @@ metadata:
     {{- toYaml . | nindent 4 }}
     {{- end }}
     app.kubernetes.io/part-of: cilium
+    helm.sh/chart: {{ include "cilium.chart" . }}
   annotations:
     "helm.sh/hook": post-install,post-upgrade
     {{- with .Values.clustermesh.annotations }}
diff --git a/packages/system/cilium/charts/cilium/templates/hubble-relay/deployment.yaml b/packages/system/cilium/charts/cilium/templates/hubble-relay/deployment.yaml
index e7805c2300..584b46cb24 100644
--- a/packages/system/cilium/charts/cilium/templates/hubble-relay/deployment.yaml
+++ b/packages/system/cilium/charts/cilium/templates/hubble-relay/deployment.yaml
@@ -12,6 +12,7 @@ metadata:
     k8s-app: hubble-relay
     app.kubernetes.io/name: hubble-relay
     app.kubernetes.io/part-of: cilium
+    helm.sh/chart: {{ include "cilium.chart" . }}
     {{- with .Values.commonLabels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
@@ -43,6 +44,7 @@ spec:
         k8s-app: hubble-relay
         app.kubernetes.io/name: hubble-relay
         app.kubernetes.io/part-of: cilium
+        helm.sh/chart: {{ include "cilium.chart" . }}
         {{- with .Values.commonLabels }}
         {{- toYaml . | nindent 8 }}
         {{- end }}
@@ -50,6 +52,11 @@ spec:
         {{- toYaml . | nindent 8 }}
         {{- end }}
     spec:
+      {{- if (semverCompare ">= 1.33-0" .Capabilities.KubeVersion.Version) }}
+      {{- if kindIs "bool" .Values.hubble.hostUsers }}
+      hostUsers: {{ .Values.hubble.hostUsers }}
+      {{- end }}
+      {{- end }}
       {{- with .Values.hubble.relay.podSecurityContext }}
       securityContext:
         {{- toYaml . | nindent 8 }}
@@ -122,6 +129,8 @@ spec:
             {{- toYaml . | trim | nindent 12 }}
           {{- end }}
           volumeMounts:
+          - name: tmp-volume
+            mountPath: /tmp
           - name: config
             mountPath: /etc/hubble-relay
             readOnly: true
@@ -164,6 +173,8 @@ spec:
         {{- toYaml . | trim | nindent 8 }}
       {{- end }}
       volumes:
+      - name: tmp-volume
+        emptyDir: {}
       - name: config
         configMap:
           name: hubble-relay-config
diff --git a/packages/system/cilium/charts/cilium/templates/hubble-relay/poddisruptionbudget.yaml b/packages/system/cilium/charts/cilium/templates/hubble-relay/poddisruptionbudget.yaml
index 5f28b83f83..7ac34184b8 100644
--- a/packages/system/cilium/charts/cilium/templates/hubble-relay/poddisruptionbudget.yaml
+++ b/packages/system/cilium/charts/cilium/templates/hubble-relay/poddisruptionbudget.yaml
@@ -13,6 +13,7 @@ metadata:
     k8s-app: hubble-relay
     app.kubernetes.io/name: hubble-relay
     app.kubernetes.io/part-of: cilium
+    helm.sh/chart: {{ include "cilium.chart" . }}
     {{- with .Values.commonLabels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
diff --git a/packages/system/cilium/charts/cilium/templates/hubble-relay/service.yaml b/packages/system/cilium/charts/cilium/templates/hubble-relay/service.yaml
index db00b47306..e345ccf0d1 100644
--- a/packages/system/cilium/charts/cilium/templates/hubble-relay/service.yaml
+++ b/packages/system/cilium/charts/cilium/templates/hubble-relay/service.yaml
@@ -16,6 +16,7 @@ metadata:
     k8s-app: hubble-relay
     app.kubernetes.io/name: hubble-relay
     app.kubernetes.io/part-of: cilium
+    helm.sh/chart: {{ include "cilium.chart" . }}
     {{- with .Values.commonLabels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
diff --git a/packages/system/cilium/charts/cilium/templates/hubble-relay/servicemonitor.yaml b/packages/system/cilium/charts/cilium/templates/hubble-relay/servicemonitor.yaml
index e4b62ce087..9d4b936f4a 100644
--- a/packages/system/cilium/charts/cilium/templates/hubble-relay/servicemonitor.yaml
+++ b/packages/system/cilium/charts/cilium/templates/hubble-relay/servicemonitor.yaml
@@ -7,6 +7,7 @@ metadata:
   labels:
     app.kubernetes.io/part-of: cilium
     app.kubernetes.io/name: hubble-relay
+    helm.sh/chart: {{ include "cilium.chart" . }}
     {{- with .Values.commonLabels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
diff --git a/packages/system/cilium/charts/cilium/templates/hubble-ui/clusterrole.yaml b/packages/system/cilium/charts/cilium/templates/hubble-ui/clusterrole.yaml
index ebb8cbd6b6..71f7ef3ed7 100644
--- a/packages/system/cilium/charts/cilium/templates/hubble-ui/clusterrole.yaml
+++ b/packages/system/cilium/charts/cilium/templates/hubble-ui/clusterrole.yaml
@@ -9,6 +9,7 @@ metadata:
   {{- end }}
   labels:
     app.kubernetes.io/part-of: cilium
+    helm.sh/chart: {{ include "cilium.chart" . }}
     {{- with .Values.commonLabels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
@@ -18,7 +19,6 @@ rules:
   - ""
   resources:
   - componentstatuses
-  - endpoints
   - namespaces
   - nodes
   - pods
diff --git a/packages/system/cilium/charts/cilium/templates/hubble-ui/clusterrolebinding.yaml b/packages/system/cilium/charts/cilium/templates/hubble-ui/clusterrolebinding.yaml
index 55ee9ecc6d..ae8677fcaa 100644
--- a/packages/system/cilium/charts/cilium/templates/hubble-ui/clusterrolebinding.yaml
+++ b/packages/system/cilium/charts/cilium/templates/hubble-ui/clusterrolebinding.yaml
@@ -9,6 +9,7 @@ metadata:
   {{- end }}
   labels:
     app.kubernetes.io/part-of: cilium
+    helm.sh/chart: {{ include "cilium.chart" . }}
     {{- with .Values.commonLabels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
diff --git a/packages/system/cilium/charts/cilium/templates/hubble-ui/deployment.yaml b/packages/system/cilium/charts/cilium/templates/hubble-ui/deployment.yaml
index 07a94dce55..9220dddab9 100644
--- a/packages/system/cilium/charts/cilium/templates/hubble-ui/deployment.yaml
+++ b/packages/system/cilium/charts/cilium/templates/hubble-ui/deployment.yaml
@@ -12,6 +12,7 @@ metadata:
     k8s-app: hubble-ui
     app.kubernetes.io/name: hubble-ui
     app.kubernetes.io/part-of: cilium
+    helm.sh/chart: {{ include "cilium.chart" . }}
     {{- with .Values.commonLabels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
@@ -42,6 +43,7 @@ spec:
         k8s-app: hubble-ui
         app.kubernetes.io/name: hubble-ui
         app.kubernetes.io/part-of: cilium
+        helm.sh/chart: {{ include "cilium.chart" . }}
         {{- with .Values.commonLabels }}
         {{- toYaml . | nindent 8 }}
         {{- end }}
@@ -49,6 +51,11 @@ spec:
         {{- toYaml . | nindent 8 }}
         {{- end }}
     spec:
+      {{- if (semverCompare ">= 1.33-0" .Capabilities.KubeVersion.Version) }}
+      {{- if kindIs "bool" .Values.hubble.hostUsers }}
+      hostUsers: {{ .Values.hubble.hostUsers }}
+      {{- end }}
+      {{- end }}
       {{- with .Values.hubble.ui.securityContext }}
       securityContext:
         {{- omit . "enabled" | toYaml | nindent 8 }}
@@ -123,18 +130,6 @@ spec:
         {{- with .Values.hubble.ui.backend.extraEnv }}
         {{- toYaml . | trim | nindent 8 }}
         {{- end }}
-        {{- if .Values.hubble.ui.backend.livenessProbe.enabled }}
-        livenessProbe:
-          httpGet:
-            path: /healthz
-            port: 8090
-        {{- end }}
-        {{- if .Values.hubble.ui.backend.readinessProbe.enabled }}
-        readinessProbe:
-          httpGet:
-            path: /healthz
-            port: 8090
-        {{- end }}
         ports:
         - name: grpc
           containerPort: 8090
@@ -188,7 +183,8 @@ spec:
         {{- if .Values.hubble.ui.tmpVolume }}
           {{- toYaml .Values.hubble.ui.tmpVolume | nindent 8 }}
         {{- else }}
-        emptyDir: {}
+        emptyDir:
+          sizeLimit: 256Mi
         {{- end }}
       {{- if .Values.hubble.relay.tls.server.enabled }}
       - name: hubble-ui-client-certs
diff --git a/packages/system/cilium/charts/cilium/templates/hubble-ui/ingress.yaml b/packages/system/cilium/charts/cilium/templates/hubble-ui/ingress.yaml
index ab85ef5f5d..1542997b9d 100644
--- a/packages/system/cilium/charts/cilium/templates/hubble-ui/ingress.yaml
+++ b/packages/system/cilium/charts/cilium/templates/hubble-ui/ingress.yaml
@@ -9,6 +9,7 @@ metadata:
     k8s-app: hubble-ui
     app.kubernetes.io/name: hubble-ui
     app.kubernetes.io/part-of: cilium
+    helm.sh/chart: {{ include "cilium.chart" . }}
     {{- with .Values.commonLabels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
diff --git a/packages/system/cilium/charts/cilium/templates/hubble-ui/poddisruptionbudget.yaml b/packages/system/cilium/charts/cilium/templates/hubble-ui/poddisruptionbudget.yaml
index 93e909fb33..bfd29bd33b 100644
--- a/packages/system/cilium/charts/cilium/templates/hubble-ui/poddisruptionbudget.yaml
+++ b/packages/system/cilium/charts/cilium/templates/hubble-ui/poddisruptionbudget.yaml
@@ -13,6 +13,7 @@ metadata:
     k8s-app: hubble-ui
     app.kubernetes.io/name: hubble-ui
     app.kubernetes.io/part-of: cilium
+    helm.sh/chart: {{ include "cilium.chart" . }}
     {{- with .Values.commonLabels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
diff --git a/packages/system/cilium/charts/cilium/templates/hubble-ui/service.yaml b/packages/system/cilium/charts/cilium/templates/hubble-ui/service.yaml
index ade023fe8b..97c632af60 100644
--- a/packages/system/cilium/charts/cilium/templates/hubble-ui/service.yaml
+++ b/packages/system/cilium/charts/cilium/templates/hubble-ui/service.yaml
@@ -18,6 +18,7 @@ metadata:
     k8s-app: hubble-ui
     app.kubernetes.io/name: hubble-ui
     app.kubernetes.io/part-of: cilium
+    helm.sh/chart: {{ include "cilium.chart" . }}
     {{- with .Values.commonLabels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
diff --git a/packages/system/cilium/charts/cilium/templates/hubble/dashboards-configmap.yaml b/packages/system/cilium/charts/cilium/templates/hubble/dashboards-configmap.yaml
index 2862a84dbb..b8e1b93bcf 100644
--- a/packages/system/cilium/charts/cilium/templates/hubble/dashboards-configmap.yaml
+++ b/packages/system/cilium/charts/cilium/templates/hubble/dashboards-configmap.yaml
@@ -12,6 +12,7 @@ metadata:
     k8s-app: hubble
     app.kubernetes.io/name: hubble
     app.kubernetes.io/part-of: cilium
+    helm.sh/chart: {{ include "cilium.chart" $ }}
 
     {{- with $.Values.commonLabels }}
     {{- toYaml . | nindent 4 }}
diff --git a/packages/system/cilium/charts/cilium/templates/hubble/metrics-service.yaml b/packages/system/cilium/charts/cilium/templates/hubble/metrics-service.yaml
index c2488990b7..2e354307d0 100644
--- a/packages/system/cilium/charts/cilium/templates/hubble/metrics-service.yaml
+++ b/packages/system/cilium/charts/cilium/templates/hubble/metrics-service.yaml
@@ -8,6 +8,7 @@ metadata:
     k8s-app: hubble
     app.kubernetes.io/name: hubble
     app.kubernetes.io/part-of: cilium
+    helm.sh/chart: {{ include "cilium.chart" . }}
     {{- with .Values.commonLabels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
diff --git a/packages/system/cilium/charts/cilium/templates/hubble/peer-service.yaml b/packages/system/cilium/charts/cilium/templates/hubble/peer-service.yaml
index 60aab5ae08..3e4e0b716a 100644
--- a/packages/system/cilium/charts/cilium/templates/hubble/peer-service.yaml
+++ b/packages/system/cilium/charts/cilium/templates/hubble/peer-service.yaml
@@ -12,6 +12,7 @@ metadata:
     k8s-app: cilium
     app.kubernetes.io/part-of: cilium
     app.kubernetes.io/name: hubble-peer
+    helm.sh/chart: {{ include "cilium.chart" . }}
     {{- with .Values.commonLabels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
diff --git a/packages/system/cilium/charts/cilium/templates/hubble/servicemonitor.yaml b/packages/system/cilium/charts/cilium/templates/hubble/servicemonitor.yaml
index 909f05ed2e..808541af49 100644
--- a/packages/system/cilium/charts/cilium/templates/hubble/servicemonitor.yaml
+++ b/packages/system/cilium/charts/cilium/templates/hubble/servicemonitor.yaml
@@ -7,6 +7,7 @@ metadata:
   labels:
     app.kubernetes.io/part-of: cilium
     app.kubernetes.io/name: hubble
+    helm.sh/chart: {{ include "cilium.chart" . }}
     {{- with .Values.commonLabels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
diff --git a/packages/system/cilium/charts/cilium/templates/hubble/tls-certmanager/metrics-server-secret.yaml b/packages/system/cilium/charts/cilium/templates/hubble/tls-certmanager/metrics-server-secret.yaml
index 36c4770738..9fea9b0428 100644
--- a/packages/system/cilium/charts/cilium/templates/hubble/tls-certmanager/metrics-server-secret.yaml
+++ b/packages/system/cilium/charts/cilium/templates/hubble/tls-certmanager/metrics-server-secret.yaml
@@ -18,6 +18,14 @@ metadata:
 spec:
   issuerRef:
     {{- toYaml .Values.hubble.tls.auto.certManagerIssuerRef | nindent 4 }}
+  {{- with .Values.hubble.tls.auto.subject }}
+  subject:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- with .Values.hubble.tls.auto.privateKey }}
+  privateKey:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
   secretName: hubble-metrics-server-certs
   commonName: {{ $cn | quote }}
   dnsNames:
diff --git a/packages/system/cilium/charts/cilium/templates/hubble/tls-certmanager/relay-client-secret.yaml b/packages/system/cilium/charts/cilium/templates/hubble/tls-certmanager/relay-client-secret.yaml
index 7850b5ab4e..500fffa94f 100644
--- a/packages/system/cilium/charts/cilium/templates/hubble/tls-certmanager/relay-client-secret.yaml
+++ b/packages/system/cilium/charts/cilium/templates/hubble/tls-certmanager/relay-client-secret.yaml
@@ -16,6 +16,14 @@ metadata:
 spec:
   issuerRef:
     {{- toYaml .Values.hubble.tls.auto.certManagerIssuerRef | nindent 4 }}
+  {{- with .Values.hubble.tls.auto.subject }}
+  subject:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- with .Values.hubble.tls.auto.privateKey }}
+  privateKey:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
   secretName: hubble-relay-client-certs
   commonName: "*.hubble-relay.cilium.io"
   dnsNames:
diff --git a/packages/system/cilium/charts/cilium/templates/hubble/tls-certmanager/relay-server-secret.yaml b/packages/system/cilium/charts/cilium/templates/hubble/tls-certmanager/relay-server-secret.yaml
index 2b3eb778d9..369e0814d6 100644
--- a/packages/system/cilium/charts/cilium/templates/hubble/tls-certmanager/relay-server-secret.yaml
+++ b/packages/system/cilium/charts/cilium/templates/hubble/tls-certmanager/relay-server-secret.yaml
@@ -16,6 +16,14 @@ metadata:
 spec:
   issuerRef:
     {{- toYaml .Values.hubble.tls.auto.certManagerIssuerRef | nindent 4 }}
+  {{- with .Values.hubble.tls.auto.subject }}
+  subject:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- with .Values.hubble.tls.auto.privateKey }}
+  privateKey:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
   secretName: hubble-relay-server-certs
   commonName: "*.hubble-relay.cilium.io"
   dnsNames:
diff --git a/packages/system/cilium/charts/cilium/templates/hubble/tls-certmanager/server-secret.yaml b/packages/system/cilium/charts/cilium/templates/hubble/tls-certmanager/server-secret.yaml
index 394c221a61..36a653bed0 100644
--- a/packages/system/cilium/charts/cilium/templates/hubble/tls-certmanager/server-secret.yaml
+++ b/packages/system/cilium/charts/cilium/templates/hubble/tls-certmanager/server-secret.yaml
@@ -18,6 +18,14 @@ metadata:
 spec:
   issuerRef:
     {{- toYaml .Values.hubble.tls.auto.certManagerIssuerRef | nindent 4 }}
+  {{- with .Values.hubble.tls.auto.subject }}
+  subject:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- with .Values.hubble.tls.auto.privateKey }}
+  privateKey:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
   secretName: hubble-server-certs
   commonName: {{ $cn | quote }}
   dnsNames:
diff --git a/packages/system/cilium/charts/cilium/templates/hubble/tls-certmanager/ui-client-certs.yaml b/packages/system/cilium/charts/cilium/templates/hubble/tls-certmanager/ui-client-certs.yaml
index 0111834b96..37ebd6d0e3 100644
--- a/packages/system/cilium/charts/cilium/templates/hubble/tls-certmanager/ui-client-certs.yaml
+++ b/packages/system/cilium/charts/cilium/templates/hubble/tls-certmanager/ui-client-certs.yaml
@@ -16,6 +16,14 @@ metadata:
 spec:
   issuerRef:
     {{- toYaml .Values.hubble.tls.auto.certManagerIssuerRef | nindent 4 }}
+  {{- with .Values.hubble.tls.auto.subject }}
+  subject:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- with .Values.hubble.tls.auto.privateKey }}
+  privateKey:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
   secretName: hubble-ui-client-certs
   commonName: "*.hubble-ui.cilium.io"
   dnsNames:
diff --git a/packages/system/cilium/charts/cilium/templates/hubble/tls-cronjob/_job-spec.tpl b/packages/system/cilium/charts/cilium/templates/hubble/tls-cronjob/_job-spec.tpl
index 06fb334782..b45c90c967 100644
--- a/packages/system/cilium/charts/cilium/templates/hubble/tls-cronjob/_job-spec.tpl
+++ b/packages/system/cilium/charts/cilium/templates/hubble/tls-cronjob/_job-spec.tpl
@@ -39,6 +39,7 @@ spec:
             - "--ca-secret-namespace={{ include "cilium.namespace" . }}"
             - "--ca-secret-name=cilium-ca"
             - "--ca-common-name=Cilium CA"
+            - "--ca-enforce-validity-throughout-leaves-duration={{ .Values.certgen.enforceCAValidityThroughoutLeavesDuration }}"
           env:
             - name: CILIUM_CERTGEN_CONFIG
               value: |
diff --git a/packages/system/cilium/charts/cilium/templates/hubble/tls-cronjob/cronjob.yaml b/packages/system/cilium/charts/cilium/templates/hubble/tls-cronjob/cronjob.yaml
index b49c00a60d..954dda7b4b 100644
--- a/packages/system/cilium/charts/cilium/templates/hubble/tls-cronjob/cronjob.yaml
+++ b/packages/system/cilium/charts/cilium/templates/hubble/tls-cronjob/cronjob.yaml
@@ -8,6 +8,7 @@ metadata:
     k8s-app: hubble-generate-certs
     app.kubernetes.io/name: hubble-generate-certs
     app.kubernetes.io/part-of: cilium
+    helm.sh/chart: {{ include "cilium.chart" . }}
     {{- with .Values.commonLabels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
diff --git a/packages/system/cilium/charts/cilium/templates/hubble/tls-cronjob/job.yaml b/packages/system/cilium/charts/cilium/templates/hubble/tls-cronjob/job.yaml
index 96371916a1..f963ae8609 100644
--- a/packages/system/cilium/charts/cilium/templates/hubble/tls-cronjob/job.yaml
+++ b/packages/system/cilium/charts/cilium/templates/hubble/tls-cronjob/job.yaml
@@ -18,6 +18,7 @@ metadata:
     k8s-app: hubble-generate-certs
     app.kubernetes.io/name: hubble-generate-certs
     app.kubernetes.io/part-of: cilium
+    helm.sh/chart: {{ include "cilium.chart" . }}
     {{- with .Values.commonLabels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
diff --git a/packages/system/cilium/charts/cilium/templates/hubble/tls-cronjob/role.yaml b/packages/system/cilium/charts/cilium/templates/hubble/tls-cronjob/role.yaml
index 9cd40721e5..66117f0d59 100644
--- a/packages/system/cilium/charts/cilium/templates/hubble/tls-cronjob/role.yaml
+++ b/packages/system/cilium/charts/cilium/templates/hubble/tls-cronjob/role.yaml
@@ -10,6 +10,7 @@ metadata:
   {{- end }}
   labels:
     app.kubernetes.io/part-of: cilium
+    helm.sh/chart: {{ include "cilium.chart" . }}
     {{- with .Values.commonLabels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
diff --git a/packages/system/cilium/charts/cilium/templates/hubble/tls-cronjob/rolebinding.yaml b/packages/system/cilium/charts/cilium/templates/hubble/tls-cronjob/rolebinding.yaml
index 4c3a88a346..422751d638 100644
--- a/packages/system/cilium/charts/cilium/templates/hubble/tls-cronjob/rolebinding.yaml
+++ b/packages/system/cilium/charts/cilium/templates/hubble/tls-cronjob/rolebinding.yaml
@@ -10,6 +10,7 @@ metadata:
   {{- end }}
   labels:
     app.kubernetes.io/part-of: cilium
+    helm.sh/chart: {{ include "cilium.chart" . }}
     {{- with .Values.commonLabels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
diff --git a/packages/system/cilium/charts/cilium/templates/spire/agent/daemonset.yaml b/packages/system/cilium/charts/cilium/templates/spire/agent/daemonset.yaml
index 00bfee91db..f1bdde2cfa 100644
--- a/packages/system/cilium/charts/cilium/templates/spire/agent/daemonset.yaml
+++ b/packages/system/cilium/charts/cilium/templates/spire/agent/daemonset.yaml
@@ -92,10 +92,13 @@ spec:
           resources:
             {{- toYaml . | trim | nindent 12 }}
           {{- end }}
+          ports:
+          - name: http
+            containerPort: 4251
           livenessProbe:
             httpGet:
               path: /live
-              port: 4251
+              port: http
             failureThreshold: 2
             initialDelaySeconds: 15
             periodSeconds: 60
@@ -103,7 +106,7 @@ spec:
           readinessProbe:
             httpGet:
               path: /ready
-              port: 4251
+              port: http
             initialDelaySeconds: 5
             periodSeconds: 5
       {{- with .Values.authentication.mutual.spire.install.agent.affinity }}
diff --git a/packages/system/cilium/charts/cilium/templates/spire/server/statefulset.yaml b/packages/system/cilium/charts/cilium/templates/spire/server/statefulset.yaml
index 23dda2c0dc..9c2e1cb0a7 100644
--- a/packages/system/cilium/charts/cilium/templates/spire/server/statefulset.yaml
+++ b/packages/system/cilium/charts/cilium/templates/spire/server/statefulset.yaml
@@ -43,6 +43,9 @@ spec:
       priorityClassName: {{ include "cilium.priorityClass" (list $ .Values.authentication.mutual.spire.install.server.priorityClassName "system-node-critical") }}
       serviceAccountName: {{ .Values.authentication.mutual.spire.install.server.serviceAccount.name }}
       shareProcessNamespace: true
+      {{- if (semverCompare ">= 1.33-0" .Capabilities.KubeVersion.Version) }}
+      hostUsers: true
+      {{- end }}
       {{- with .Values.authentication.mutual.spire.install.server.podSecurityContext }}
       securityContext:
         {{- toYaml . | nindent 8 }}
@@ -81,6 +84,8 @@ spec:
         ports:
         - name: grpc
           containerPort: 8081
+        - name: http
+          containerPort: 8080
         volumeMounts:
         - name: spire-config
           mountPath: /run/spire/config
@@ -96,7 +101,7 @@ spec:
         livenessProbe:
           httpGet:
             path: /live
-            port: 8080
+            port: http
           failureThreshold: 2
           initialDelaySeconds: 15
           periodSeconds: 60
@@ -104,7 +109,7 @@ spec:
         readinessProbe:
           httpGet:
             path: /ready
-            port: 8080
+            port: http
           initialDelaySeconds: 5
           periodSeconds: 5
         {{- with .Values.authentication.mutual.spire.install.server.securityContext }}
diff --git a/packages/system/cilium/charts/cilium/templates/standalone-dns-proxy/daemonset.yaml b/packages/system/cilium/charts/cilium/templates/standalone-dns-proxy/daemonset.yaml
index 7ea150a4e9..499104c640 100644
--- a/packages/system/cilium/charts/cilium/templates/standalone-dns-proxy/daemonset.yaml
+++ b/packages/system/cilium/charts/cilium/templates/standalone-dns-proxy/daemonset.yaml
@@ -14,11 +14,14 @@ metadata:
     app.kubernetes.io/part-of: cilium
     app.kubernetes.io/name: standalone-dns-proxy
     name: standalone-dns-proxy
+    helm.sh/chart: {{ include "cilium.chart" . }}
     {{- with .Values.commonLabels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
 spec:
-  minReadySeconds: 5
+  {{- if .Values.standaloneDnsProxy.minReadySeconds }}
+  minReadySeconds: {{ .Values.standaloneDnsProxy.minReadySeconds }}
+  {{- end }}
   {{- with .Values.standaloneDnsProxy.updateStrategy }}
   updateStrategy:
     {{- toYaml . | nindent 4 }}
@@ -39,11 +42,15 @@ spec:
         name: standalone-dns-proxy
         app.kubernetes.io/name: standalone-dns-proxy
         app.kubernetes.io/part-of: cilium
+        helm.sh/chart: {{ include "cilium.chart" . }}
         {{- with .Values.commonLabels }}
           {{- toYaml . | nindent 8 }}
         {{- end }}
     spec:
       hostNetwork: true
+      {{- if (semverCompare ">= 1.33-0" .Capabilities.KubeVersion.Version) }}
+      hostUsers: true
+      {{- end }}
       automountServiceAccountToken: {{ .Values.standaloneDnsProxy.automountServiceAccountToken }}
       {{- with .Values.standaloneDnsProxy.nodeSelector }}
       nodeSelector:
diff --git a/packages/system/cilium/charts/cilium/templates/validate.yaml b/packages/system/cilium/charts/cilium/templates/validate.yaml
index ac3164b615..6e80a8ca94 100644
--- a/packages/system/cilium/charts/cilium/templates/validate.yaml
+++ b/packages/system/cilium/charts/cilium/templates/validate.yaml
@@ -202,6 +202,18 @@
   {{- end }}
 {{- end }}
 
+{{- if and
+  .Values.clustermesh.useAPIServer
+  (not .Values.clustermesh.apiserver.tls.auto.enabled)
+  (or
+    (dig "server" "cert" "" .Values.clustermesh.apiserver.tls )
+    (dig "admin" "cert" "" .Values.clustermesh.apiserver.tls )
+    (dig "remote" "cert" "" .Values.clustermesh.apiserver.tls )
+  )
+}}
+  {{- fail "The support for providing Cluster Mesh certs and keys as helm values has been removed. You must enable auto-generation or pre-create the corresponding secrets" }}
+{{- end }}
+
 {{/* validate ClusterMesh */}}
 {{- if and (ne (int .Values.clustermesh.maxConnectedClusters) 255) (ne (int .Values.clustermesh.maxConnectedClusters) 511) }}
   {{- fail "max-connected-clusters must be set to 255 or 511" }}
@@ -239,3 +251,8 @@
     {{- end }}
   {{- end }}
 {{- end }}
+
+{{/* validate IPAM ENI */}}
+{{- if and (eq .Values.ipam.mode "eni") (not .Values.eni.enabled) }}
+  {{ fail "ipam.mode=eni requires eni.enabled=true" }}
+{{- end }}
diff --git a/packages/system/cilium/charts/cilium/templates/warnings.txt b/packages/system/cilium/charts/cilium/templates/warnings.txt
index 8cc823b3e5..3b8d114526 100644
--- a/packages/system/cilium/charts/cilium/templates/warnings.txt
+++ b/packages/system/cilium/charts/cilium/templates/warnings.txt
@@ -10,4 +10,19 @@
   their corresponding exporter type ('hubble.export.static', 'hubble.export.dynamic.config.content')
   and will be removed in v1.19.
 {{- end -}}
+{{- if and .Values.hubble.relay.enabled (not .Values.hubble.relay.tls.server.enabled) -}}
+- WARNING: TLS is not enabled for the Hubble Relay server (hubble.relay.tls.server.enabled=false).
+  This means Hubble Relay communications may not be encrypted. For more information about the security
+  implications and suggested controls, please see: https://docs.cilium.io/en/stable/security/threat-model/#hubble-data-attacker
+{{- end -}}
+{{- if and .Values.hubble.ui.ingress.enabled (not .Values.hubble.ui.ingress.tls) -}}
+- WARNING: Hubble UI ingress is enabled without TLS (hubble.ui.ingress.tls is not configured).
+  This may expose the Hubble UI over plaintext HTTP. Consider configuring hubble.ui.ingress.tls
+  to secure access with HTTPS. For more information about the security implications
+  and suggested controls, please see: https://docs.cilium.io/en/stable/security/threat-model/#hubble-data-attacker
+{{- end -}}
+{{- if and (eq .Values.ipam.mode "eni") .Values.ipv6.enabled -}}
+- WARNING: IPv6 support in the ENI IPAM mode (ipam.mode=eni, ipv6.enabled=true) is a beta feature.
+  Please use it with caution and report any issues you encounter: https://github.com/cilium/cilium/issues/new?template=bug_report.yaml
+{{- end -}}
 {{- end -}}
diff --git a/packages/system/cilium/charts/cilium/templates/ztunnel/daemonset.yaml b/packages/system/cilium/charts/cilium/templates/ztunnel/daemonset.yaml
index f936306834..cff646def8 100644
--- a/packages/system/cilium/charts/cilium/templates/ztunnel/daemonset.yaml
+++ b/packages/system/cilium/charts/cilium/templates/ztunnel/daemonset.yaml
@@ -13,11 +13,15 @@ metadata:
     app: ztunnel-cilium
     app.kubernetes.io/part-of: cilium
     app.kubernetes.io/name: ztunnel-cilium
+    helm.sh/chart: {{ include "cilium.chart" . }}
     {{- with .Values.commonLabels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
 spec:
   revisionHistoryLimit: 10
+  {{- if .Values.encryption.ztunnel.minReadySeconds }}
+  minReadySeconds: {{ .Values.encryption.ztunnel.minReadySeconds }}
+  {{- end }}
   selector:
     matchLabels:
       app: ztunnel-cilium
@@ -36,6 +40,7 @@ spec:
         app: ztunnel-cilium
         app.kubernetes.io/part-of: cilium
         app.kubernetes.io/name: ztunnel-cilium
+        helm.sh/chart: {{ include "cilium.chart" . }}
         {{- with .Values.commonLabels }}
         {{- toYaml . | nindent 8 }}
         {{- end }}
diff --git a/packages/system/cilium/charts/cilium/templates/ztunnel/secret.yaml b/packages/system/cilium/charts/cilium/templates/ztunnel/secret.yaml
index 520857dc39..60311bc67e 100644
--- a/packages/system/cilium/charts/cilium/templates/ztunnel/secret.yaml
+++ b/packages/system/cilium/charts/cilium/templates/ztunnel/secret.yaml
@@ -13,6 +13,7 @@ metadata:
   labels:
     app.kubernetes.io/part-of: cilium
     app.kubernetes.io/name: ztunnel-cilium
+    helm.sh/chart: {{ include "cilium.chart" . }}
     {{- with .Values.commonLabels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
diff --git a/packages/system/cilium/charts/cilium/values.schema.json b/packages/system/cilium/charts/cilium/values.schema.json
index 65c84af513..12c92959d5 100644
--- a/packages/system/cilium/charts/cilium/values.schema.json
+++ b/packages/system/cilium/charts/cilium/values.schema.json
@@ -768,6 +768,9 @@
           },
           "type": "object"
         },
+        "enforceCAValidityThroughoutLeavesDuration": {
+          "type": "boolean"
+        },
         "extraVolumeMounts": {
           "items": {},
           "type": "array"
@@ -1015,6 +1018,9 @@
               },
               "type": "object"
             },
+            "etcdQPS": {
+              "type": "integer"
+            },
             "extraArgs": {
               "items": {},
               "type": "array"
@@ -1065,6 +1071,9 @@
                 "enabled": {
                   "type": "boolean"
                 },
+                "etcdQPS": {
+                  "type": "integer"
+                },
                 "extraArgs": {
                   "items": {},
                   "type": "array"
@@ -1398,17 +1407,6 @@
             },
             "tls": {
               "properties": {
-                "admin": {
-                  "properties": {
-                    "cert": {
-                      "type": "string"
-                    },
-                    "key": {
-                      "type": "string"
-                    }
-                  },
-                  "type": "object"
-                },
                 "authMode": {
                   "type": "string"
                 },
@@ -1425,39 +1423,28 @@
                     },
                     "method": {
                       "type": "string"
-                    }
-                  },
-                  "type": "object"
-                },
-                "enableSecrets": {
-                  "type": "boolean"
-                },
-                "remote": {
-                  "properties": {
-                    "cert": {
-                      "type": "string"
                     },
-                    "key": {
-                      "type": "string"
-                    }
-                  },
-                  "type": "object"
-                },
-                "server": {
-                  "properties": {
-                    "cert": {
-                      "type": "string"
+                    "privateKey": {
+                      "type": "object"
                     },
-                    "extraDnsNames": {
-                      "items": {},
-                      "type": "array"
+                    "schedule": {
+                      "type": "string"
                     },
-                    "extraIpAddresses": {
-                      "items": {},
-                      "type": "array"
+                    "server": {
+                      "properties": {
+                        "extraDnsNames": {
+                          "items": {},
+                          "type": "array"
+                        },
+                        "extraIpAddresses": {
+                          "items": {},
+                          "type": "array"
+                        }
+                      },
+                      "type": "object"
                     },
-                    "key": {
-                      "type": "string"
+                    "subject": {
+                      "type": "object"
                     }
                   },
                   "type": "object"
@@ -1522,10 +1509,10 @@
           },
           "type": "object"
         },
-        "enableEndpointSliceSynchronization": {
+        "defaultGlobalNamespace": {
           "type": "boolean"
         },
-        "enableMCSAPISupport": {
+        "enableEndpointSliceSynchronization": {
           "type": "boolean"
         },
         "maxConnectedClusters": {
@@ -1799,6 +1786,17 @@
       },
       "type": "object"
     },
+    "datapathPlugins": {
+      "properties": {
+        "enabled": {
+          "type": "boolean"
+        },
+        "stateDir": {
+          "type": "string"
+        }
+      },
+      "type": "object"
+    },
     "debug": {
       "properties": {
         "enabled": {
@@ -1822,6 +1820,13 @@
     "defaultLBServiceIPAM": {
       "type": "string"
     },
+    "devices": {
+      "type": [
+        "null",
+        "string",
+        "array"
+      ]
+    },
     "directRoutingSkipUnreachable": {
       "type": "boolean"
     },
@@ -1923,9 +1928,6 @@
         },
         "ipsec": {
           "properties": {
-            "encryptedOverlay": {
-              "type": "boolean"
-            },
             "interface": {
               "type": "string"
             },
@@ -1952,12 +1954,6 @@
         },
         "strictMode": {
           "properties": {
-            "allowRemoteNodeIdentities": {
-              "type": "boolean"
-            },
-            "cidr": {
-              "type": "string"
-            },
             "egress": {
               "properties": {
                 "allowRemoteNodeIdentities": {
@@ -1972,9 +1968,6 @@
               },
               "type": "object"
             },
-            "enabled": {
-              "type": "boolean"
-            },
             "ingress": {
               "properties": {
                 "enabled": {
@@ -2005,6 +1998,17 @@
             "annotations": {
               "type": "object"
             },
+            "ca": {
+              "properties": {
+                "type": {
+                  "enum": [
+                    "spire",
+                    "internal"
+                  ]
+                }
+              },
+              "type": "object"
+            },
             "caAddress": {
               "type": "string"
             },
@@ -2026,10 +2030,7 @@
             "image": {
               "properties": {
                 "digest": {
-                  "type": [
-                    "null",
-                    "string"
-                  ]
+                  "type": "string"
                 },
                 "override": {
                   "type": [
@@ -2052,6 +2053,9 @@
               },
               "type": "object"
             },
+            "minReadySeconds": {
+              "type": "integer"
+            },
             "nodeSelector": {
               "properties": {
                 "kubernetes.io/os": {
@@ -2190,7 +2194,7 @@
       "type": "boolean"
     },
     "endpointPolicyUpdateTimeoutDuration": {
-      "type": "null"
+      "type": "string"
     },
     "endpointRoutes": {
       "properties": {
@@ -2421,6 +2425,9 @@
         "clusterMaxConnections": {
           "type": "integer"
         },
+        "clusterMaxPendingRequests": {
+          "type": "integer"
+        },
         "clusterMaxRequests": {
           "type": "integer"
         },
@@ -2486,7 +2493,10 @@
           "type": "integer"
         },
         "httpUpstreamLingerTimeout": {
-          "type": "null"
+          "type": [
+            "null",
+            "integer"
+          ]
         },
         "idleTimeoutDurationSeconds": {
           "type": "integer"
@@ -2532,8 +2542,14 @@
             "failureThreshold": {
               "type": "integer"
             },
+            "initialDelaySeconds": {
+              "type": "integer"
+            },
             "periodSeconds": {
               "type": "integer"
+            },
+            "timeoutSeconds": {
+              "type": "integer"
             }
           },
           "type": "object"
@@ -2546,6 +2562,9 @@
                 "integer"
               ]
             },
+            "accessLogEnabled": {
+              "type": "boolean"
+            },
             "defaultLevel": {
               "oneOf": [
                 {
@@ -2594,6 +2613,17 @@
         "maxRequestsPerConnection": {
           "type": "integer"
         },
+        "minReadySeconds": {
+          "type": "integer"
+        },
+        "nodeLocality": {
+          "properties": {
+            "enabled": {
+              "type": "boolean"
+            }
+          },
+          "type": "object"
+        },
         "nodeSelector": {
           "properties": {
             "kubernetes.io/os": {
@@ -2708,8 +2738,14 @@
             "failureThreshold": {
               "type": "integer"
             },
+            "initialDelaySeconds": {
+              "type": "integer"
+            },
             "periodSeconds": {
               "type": "integer"
+            },
+            "timeoutSeconds": {
+              "type": "integer"
             }
           },
           "type": "object"
@@ -2768,8 +2804,14 @@
             "failureThreshold": {
               "type": "integer"
             },
+            "initialDelaySeconds": {
+              "type": "integer"
+            },
             "periodSeconds": {
               "type": "integer"
+            },
+            "timeoutSeconds": {
+              "type": "integer"
             }
           },
           "type": "object"
@@ -2816,6 +2858,20 @@
         "useOriginalSourceAddress": {
           "type": "boolean"
         },
+        "xdsMode": {
+          "oneOf": [
+            {
+              "type": "null"
+            },
+            {
+              "enum": [
+                "split",
+                "ads",
+                "strict-ads"
+              ]
+            }
+          ]
+        },
         "xffNumTrustedHopsL7PolicyEgress": {
           "type": "integer"
         },
@@ -2922,7 +2978,10 @@
         "gatewayClass": {
           "properties": {
             "create": {
-              "type": "string"
+              "type": [
+                "boolean",
+                "string"
+              ]
             }
           },
           "type": "object"
@@ -2957,6 +3016,12 @@
           },
           "type": "object"
         },
+        "useRemoteAddress": {
+          "type": [
+            "null",
+            "boolean"
+          ]
+        },
         "xffNumTrustedHops": {
           "type": "integer"
         }
@@ -3131,6 +3196,12 @@
           },
           "type": "object"
         },
+        "hostUsers": {
+          "type": [
+            "null",
+            "boolean"
+          ]
+        },
         "listenAddress": {
           "type": "string"
         },
@@ -3295,7 +3366,10 @@
                           "type": "string"
                         },
                         "name": {
-                          "type": "null"
+                          "type": [
+                            "null",
+                            "string"
+                          ]
                         },
                         "useSecret": {
                           "type": "boolean"
@@ -3362,14 +3436,6 @@
                 }
               },
               "type": "object"
-            },
-            "kafka": {
-              "properties": {
-                "apiKey": {
-                  "type": "boolean"
-                }
-              },
-              "type": "object"
             }
           },
           "type": "object"
@@ -3653,6 +3719,9 @@
                   },
                   "type": "object"
                 },
+                "readOnlyRootFilesystem": {
+                  "type": "boolean"
+                },
                 "runAsGroup": {
                   "type": "integer"
                 },
@@ -3804,8 +3873,14 @@
                 "method": {
                   "type": "string"
                 },
+                "privateKey": {
+                  "type": "object"
+                },
                 "schedule": {
                   "type": "string"
+                },
+                "subject": {
+                  "type": "object"
                 }
               },
               "type": "object"
@@ -3886,22 +3961,6 @@
                   },
                   "type": "object"
                 },
-                "livenessProbe": {
-                  "properties": {
-                    "enabled": {
-                      "type": "boolean"
-                    }
-                  },
-                  "type": "object"
-                },
-                "readinessProbe": {
-                  "properties": {
-                    "enabled": {
-                      "type": "boolean"
-                    }
-                  },
-                  "type": "object"
-                },
                 "resources": {
                   "type": "object"
                 },
@@ -3909,6 +3968,21 @@
                   "properties": {
                     "allowPrivilegeEscalation": {
                       "type": "boolean"
+                    },
+                    "capabilities": {
+                      "properties": {
+                        "drop": {
+                          "items": {
+                            "anyOf": [
+                              {
+                                "type": "string"
+                              }
+                            ]
+                          },
+                          "type": "array"
+                        }
+                      },
+                      "type": "object"
                     }
                   },
                   "type": "object"
@@ -3969,6 +4043,21 @@
                   "properties": {
                     "allowPrivilegeEscalation": {
                       "type": "boolean"
+                    },
+                    "capabilities": {
+                      "properties": {
+                        "drop": {
+                          "items": {
+                            "anyOf": [
+                              {
+                                "type": "string"
+                              }
+                            ]
+                          },
+                          "type": "array"
+                        }
+                      },
+                      "type": "object"
                     }
                   },
                   "type": "object"
@@ -4082,8 +4171,19 @@
                 "runAsGroup": {
                   "type": "integer"
                 },
+                "runAsNonRoot": {
+                  "type": "boolean"
+                },
                 "runAsUser": {
                   "type": "integer"
+                },
+                "seccompProfile": {
+                  "properties": {
+                    "type": {
+                      "type": "string"
+                    }
+                  },
+                  "type": "object"
                 }
               },
               "type": "object"
@@ -4250,6 +4350,12 @@
             "enabled": {
               "type": "boolean"
             },
+            "httpPort": {
+              "type": "integer"
+            },
+            "httpsPort": {
+              "type": "integer"
+            },
             "nodes": {
               "properties": {
                 "matchLabels": {
@@ -4260,6 +4366,9 @@
             },
             "sharedListenerPort": {
               "type": "integer"
+            },
+            "tlsPassthroughPort": {
+              "type": "integer"
             }
           },
           "type": "object"
@@ -4352,6 +4461,15 @@
             }
           },
           "type": "object"
+        },
+        "useRemoteAddress": {
+          "type": [
+            "null",
+            "boolean"
+          ]
+        },
+        "xffNumTrustedHops": {
+          "type": "integer"
         }
       },
       "type": "object"
@@ -4493,6 +4611,12 @@
     },
     "k8s": {
       "properties": {
+        "apiServerURLs": {
+          "type": [
+            "null",
+            "string"
+          ]
+        },
         "requireIPv4PodCIDR": {
           "type": "boolean"
         },
@@ -4550,6 +4674,14 @@
       },
       "type": "object"
     },
+    "k8sClusterNetworkPolicy": {
+      "properties": {
+        "enabled": {
+          "type": "boolean"
+        }
+      },
+      "type": "object"
+    },
     "k8sNetworkPolicy": {
       "properties": {
         "enabled": {
@@ -4635,7 +4767,7 @@
         "enabled": {
           "type": "boolean"
         },
-        "interface": {
+        "interfacePattern": {
           "type": "string"
         }
       },
@@ -4707,6 +4839,9 @@
     "maglev": {
       "type": "object"
     },
+    "minReadySeconds": {
+      "type": "integer"
+    },
     "monitor": {
       "properties": {
         "enabled": {
@@ -4743,6 +4878,9 @@
       },
       "type": "object"
     },
+    "nativeRoutingCIDRFromClusterPool": {
+      "type": "boolean"
+    },
     "nodeIPAM": {
       "properties": {
         "enabled": {
@@ -4766,6 +4904,9 @@
         "bindProtection": {
           "type": "boolean"
         },
+        "enableDynamicSourceLookup": {
+          "type": "boolean"
+        },
         "enableHealthCheck": {
           "type": "boolean"
         },
@@ -4838,6 +4979,9 @@
           },
           "type": "object"
         },
+        "minReadySeconds": {
+          "type": "integer"
+        },
         "nodeSelector": {
           "properties": {
             "kubernetes.io/os": {
@@ -5083,6 +5227,9 @@
         "hostNetwork": {
           "type": "boolean"
         },
+        "hostUsers": {
+          "type": "boolean"
+        },
         "identityGCInterval": {
           "type": "string"
         },
@@ -5501,6 +5648,9 @@
       },
       "type": "object"
     },
+    "preferIpv6": {
+      "type": "boolean"
+    },
     "preflight": {
       "properties": {
         "affinity": {
@@ -5688,9 +5838,6 @@
         "terminationGracePeriodSeconds": {
           "type": "integer"
         },
-        "tofqdnsPreCache": {
-          "type": "string"
-        },
         "tolerations": {
           "items": {
             "anyOf": [
@@ -6300,6 +6447,9 @@
           },
           "type": "object"
         },
+        "minReadySeconds": {
+          "type": "integer"
+        },
         "nodeSelector": {
           "properties": {
             "kubernetes.io/os": {
diff --git a/packages/system/cilium/charts/cilium/values.yaml b/packages/system/cilium/charts/cilium/values.yaml
index 66f7698280..d30b8762d2 100644
--- a/packages/system/cilium/charts/cilium/values.yaml
+++ b/packages/system/cilium/charts/cilium/values.yaml
@@ -247,10 +247,10 @@ image:
   # @schema
   override: ~
   repository: "quay.io/cilium/cilium"
-  tag: "v1.19.3"
+  tag: "v1.20.2"
   pullPolicy: "IfNotPresent"
   # cilium-digest
-  digest: sha256:2e61680593cddca8b6c055f6d4c849d87a26a1c91c7e3b8b56c7fb76ab7b7b10
+  digest: sha256:2939231d0d3e3ebddcd80fffa168b7ddcc78fdf0dc864d1c8c126ff523c54f01
   useDigest: true
 # -- Scheduling configurations for cilium pods
 scheduling:
@@ -426,6 +426,10 @@ securityContext:
       # If available, SYS_ADMIN can be removed.
       #- PERFMON
       #- BPF
+# -- Minimum number of seconds for which a newly created agent pod should be ready
+# before it is considered available. Defaults to 0 (pod is considered available as soon as it is ready).
+# ref: https://kubernetes.io/docs/tasks/manage-daemon/update-daemon-set/
+minReadySeconds: 0
 # -- Cilium agent update strategy
 updateStrategy:
   type: RollingUpdate
@@ -501,10 +505,8 @@ l2announcements:
 l2podAnnouncements:
   # -- Enable L2 pod announcements
   enabled: false
-  # -- Interface used for sending Gratuitous ARP pod announcements
-  interface: "eth0"
   # -- A regular expression matching interfaces used for sending Gratuitous ARP pod announcements
-  # interfacePattern: ""
+  interfacePattern: ""
 # -- This feature set enables virtual BGP routers to be created via BGP CRDs.
 bgpControlPlane:
   # -- Enables the BGP control plane.
@@ -739,7 +741,7 @@ bpf:
   # supported kernels.
   # @default -- `true`
   enableTCX: true
-  # -- (string) Mode for Pod devices for the core datapath (veth, netkit, netkit-l2).
+  # -- (string) Mode for Pod devices for the core datapath (auto, veth, netkit, netkit-l2).
   # Note netkit is incompatible with TPROXY (`bpf.tproxy`).
   # @default -- `veth`
   datapathMode: veth
@@ -863,6 +865,12 @@ conntrackGCMaxInterval: ""
 # -- (string) Configure timeout in which Cilium will exit if CRDs are not available
 # @default -- `"5m"`
 crdWaitTimeout: ""
+# -- Plugins to inject custom BPF into the datapath.
+datapathPlugins:
+  # -- Enable datapath plugins.
+  enabled: false
+  # -- Parent directory for per-plugin state directories.
+  stateDir: /var/run/cilium/plugins
 daemon:
   # -- Configure where Cilium runtime state should be stored.
   runPath: "/var/run/cilium"
@@ -911,13 +919,18 @@ tmpVolume: {}
 #   sizeLimit: "100Mi"
 #   medium: "Memory"
 
+# @schema
+# type: [null, string, array]
+# @schema
 # -- Specify which network interfaces can run the eBPF datapath. This means
 # that a packet sent from a pod to a destination outside the cluster will be
 # masqueraded (to an output device IPv4 address), if the output device runs the
 # program. When not specified, probing will automatically detect devices that have
-# a non-local route. This should be used only when autodetection is not suitable.
-# devices: ""
-
+# a non-local route. This should be used only when auto-detection is not suitable.
+# The devices are a comma-separated list and support '+' as a wildcard, e.g.
+# "net0,eth+" matches "net0" and any device starting with "eth". A device can be
+# excluded with "!", e.g. "net0,eth+,!eth0".
+devices: ""
 # -- Forces the auto-detection of devices, even if specific devices are explicitly listed
 forceDeviceDetection: false
 # -- Chains to ignore when installing feeder rules.
@@ -981,6 +994,14 @@ ingressController:
   enforceHttps: true
   # -- Enable proxy protocol for all Ingress listeners. Note that _only_ Proxy protocol traffic will be accepted once this is enabled.
   enableProxyProtocol: false
+  # @schema
+  # type: [null, boolean]
+  # @schema
+  # -- Configure whether to use the remote address of the client when determining the source IP.
+  # When enabled, the source IP is determined from the remote address instead of the proxy protocol header.
+  useRemoteAddress: true
+  # -- The number of additional Ingress proxy hops from the right side of the HTTP header to trust when determining the origin client's IP address.
+  xffNumTrustedHops: 0
   # -- IngressLBAnnotations are the annotation and label prefixes, which are used to filter annotations and/or labels to propagate from Ingress to the Load Balancer service
   ingressLBAnnotationPrefixes: ['lbipam.cilium.io', 'nodeipam.cilium.io', 'service.beta.kubernetes.io', 'service.kubernetes.io', 'cloud.google.com']
   # @schema
@@ -1049,6 +1070,15 @@ ingressController:
     enabled: false
     # -- Configure a specific port on the host network that gets used for the shared listener.
     sharedListenerPort: 8080
+    # -- Configure a specific port on the host network that gets used for the shared HTTP listener.
+    # If unset or 0, sharedListenerPort is used.
+    httpPort: 0
+    # -- Configure a specific port on the host network that gets used for the shared HTTPS listener.
+    # If unset or 0, sharedListenerPort is used.
+    httpsPort: 0
+    # -- Configure a specific port on the host network that gets used for the shared TLS passthrough listener.
+    # If unset or 0, sharedListenerPort is used.
+    tlsPassthroughPort: 0
     # Specify the nodes where the Ingress listeners should be exposed
     nodes:
       # -- Specify the labels of the nodes where the Ingress listeners should be exposed
@@ -1063,6 +1093,12 @@ gatewayAPI:
   enabled: false
   # -- Enable proxy protocol for all GatewayAPI listeners. Note that _only_ Proxy protocol traffic will be accepted once this is enabled.
   enableProxyProtocol: false
+  # @schema
+  # type: [null, boolean]
+  # @schema
+  # -- Configure whether to use the remote address of the client when determining the source IP.
+  # When enabled, the source IP is determined from the remote address instead of the proxy protocol header.
+  useRemoteAddress: true
   # -- Enable Backend Protocol selection support (GEP-1911) for Gateway API via appProtocol.
   enableAppProtocol: false
   # -- Enable ALPN for all listeners configured with Gateway API. ALPN will attempt HTTP/2, then HTTP 1.1.
@@ -1075,6 +1111,9 @@ gatewayAPI:
   # ref: https://kubernetes.io/docs/reference/networking/virtual-ips/#external-traffic-policy
   externalTrafficPolicy: Cluster
   gatewayClass:
+    # @schema
+    # type: [boolean, string]
+    # @schema
     # -- Enable creation of GatewayClass resource
     # The default value is 'auto' which decides according to presence of gateway.networking.k8s.io/v1/GatewayClass in the cluster.
     # Other possible values are 'true' and 'false', which will either always or never create the GatewayClass, respectively.
@@ -1115,13 +1154,6 @@ encryption:
   nodeEncryption: false
   # -- Configure the Encryption Pod2Pod strict mode.
   strictMode:
-    # -- Enable Encryption Pod2Pod strict mode. (deprecated: please use encryption.strictMode.egress.enabled)
-    enabled: false
-    # -- CIDR for the Encryption Pod2Pod strict mode. (deprecated: please use encryption.strictMode.egress.cidr)
-    cidr: ""
-    # -- Allow dynamic lookup of remote node identities. (deprecated: please use encryption.strictMode.egress.allowRemoteNodeIdentities)
-    # This is required when tunneling is used or direct routing is used and the node CIDR and pod CIDR overlap.
-    allowRemoteNodeIdentities: false
     egress:
       # -- Enable strict egress encryption.
       enabled: false
@@ -1132,8 +1164,8 @@ encryption:
       allowRemoteNodeIdentities: false
     ingress:
       # -- Enable strict ingress encryption.
-      # When enabled, all unencrypted overlay ingress traffic will be dropped.
-      # This option is only applicable when WireGuard and tunneling are enabled.
+      # When enabled, all unencrypted pod-to-pod ingress traffic will be dropped.
+      # This option requires WireGuard encryption.
       enabled: false
   ipsec:
     # -- Name of the key file inside the Kubernetes secret configured via secretName.
@@ -1150,8 +1182,6 @@ encryption:
     # -- Maximum duration of the IPsec key rotation. The previous key will be
     # removed after that delay.
     keyRotationDuration: "5m"
-    # -- Enable IPsec encrypted overlay
-    encryptedOverlay: false
   wireguard:
     # -- Controls WireGuard PersistentKeepalive option. Set 0s to disable.
     persistentKeepalive: 0s
@@ -1159,20 +1189,26 @@ encryption:
   # ztunnel is Istio's purpose-built, per-node proxy for handling L4 traffic in ambient mesh mode.
   # These settings only apply when encryption.type is set to "ztunnel".
   ztunnel:
+    # -- CA backend used by ztunnel to issue workload identities.
+    ca:
+      # @schema
+      # enum: [spire, internal]
+      # @schema
+      # -- Type of CA. "spire" uses an external SPIRE server (the operator
+      # then manages SPIRE entries for enrolled namespaces). "internal" uses
+      # Cilium's built-in CA and skips the SPIRE enrollment reconciler.
+      type: internal
     # -- ztunnel container image.
     image:
       # @schema
       # type: [null, string]
       # @schema
       override: ~
-      repository: "docker.io/istio/ztunnel"
-      tag: "1.28.0-distroless"
+      repository: "quay.io/cilium/ztunnel"
+      tag: "v1.0.0"
       pullPolicy: "IfNotPresent"
-      # @schema
-      # type: [null, string]
-      # @schema
-      digest: ~
-      useDigest: false
+      digest: "sha256:884de5adde400e39f58e36c7a729f7690466ca4a8eb4c2a8daa9c1c025115b24"
+      useDigest: true
     # -- CA server address for certificate requests.
     caAddress: "https://localhost:15012"
     # -- TCP port for the health API.
@@ -1182,6 +1218,9 @@ encryption:
       requests:
         cpu: 200m
         memory: 512Mi
+    # -- Minimum number of seconds for which a newly created ztunnel pod should be ready
+    # before it is considered available.
+    minReadySeconds: 0
     # -- ztunnel update strategy.
     updateStrategy:
       type: RollingUpdate
@@ -1237,7 +1276,7 @@ endpointHealthChecking:
   # -- Enable connectivity health checking between virtual endpoints.
   enabled: true
 # -- Max duration to wait for envoy to respond to configuration changes. Default "10s".
-endpointPolicyUpdateTimeoutDuration: null
+endpointPolicyUpdateTimeoutDuration: ""
 endpointRoutes:
   # @schema
   # type: [boolean, string]
@@ -1248,6 +1287,9 @@ endpointRoutes:
 k8sNetworkPolicy:
   # -- Enable support for K8s NetworkPolicy
   enabled: true
+k8sClusterNetworkPolicy:
+  # -- Enable support for K8s Cluster Network Policy
+  enabled: false
 # -- Enable endpoint lockdown on policy map overflow.
 endpointLockdownOnMapOverflow: false
 eni:
@@ -1317,6 +1359,9 @@ eni:
 gke:
   # -- Enable Google Kubernetes Engine integration
   enabled: false
+# -- Prefer IPv6 addresses over IPv4 when both are available for health probes
+# and Hubble peer communication.
+preferIpv6: false
 # -- Enable connectivity health checking.
 healthChecking: true
 # -- TCP port for the agent health API. This is not the port for cilium-health.
@@ -1346,14 +1391,20 @@ socketLB:
 certgen:
   # -- When set to true the certificate authority secret is created.
   generateCA: true
+  # -- When set to true, certgen enforces that the certification authority chain
+  # remains valid for the entire duration of the leaf certificates to be generated,
+  # and fails with a hard error if that is not the case. This allows to flag early
+  # situations in which the CA certificates need to be manually regenerated, before
+  # they actually expire.
+  enforceCAValidityThroughoutLeavesDuration: true
   image:
     # @schema
     # type: [null, string]
     # @schema
     override: ~
     repository: "quay.io/cilium/certgen"
-    tag: "v0.4.1"
-    digest: "sha256:f0c656830e856d26b24b0e144df1f8b327d3b46748d76a630514111fc365b697"
+    tag: "v0.4.11"
+    digest: "sha256:14d29a176fc96d15b154559ce1a5baf01367c10baabfa7bb8028b72f087a56f0"
     useDigest: true
     pullPolicy: "IfNotPresent"
   # @schema
@@ -1393,6 +1444,14 @@ certgen:
 hubble:
   # -- Enable Hubble (true by default).
   enabled: true
+  # @schema
+  # type: [null, boolean]
+  # @schema
+  # -- (bool) Enable hostUsers for Hubble.
+  # This will allow use of user-namespaces for hubble components. Not all
+  # clusters support user-namespaces.
+  # See: https://kubernetes.io/docs/concepts/workloads/pods/user-namespaces/
+  hostUsers: ~
   # -- Annotations to be added to all top-level hubble objects (resources under templates/hubble)
   annotations: {}
   # -- Buffer size of the channel Hubble uses to receive monitor events. If this
@@ -1461,6 +1520,9 @@ hubble:
           # This option has no effect when TLS is disabled.
           enabled: false
           useSecret: false
+          # @schema
+          # type: [null, string]
+          # @schema
           # -- Name of the ConfigMap containing the CA to validate client certificates against.
           # If mTLS is enabled and this is unspecified, it will default to the
           # same CA used for Hubble metrics server certificates.
@@ -1596,25 +1658,12 @@ hubble:
         #   --set hubble.redact.enabled="true"
         #   --set hubble.redact.http.headers.deny="Authorization,Proxy-Authorization"
         deny: []
-    kafka:
-      # -- Enables redacting Kafka's API key (deprecated, will be removed in v1.19).
-      # Example:
-      #
-      #   redact:
-      #     enabled: true
-      #     kafka:
-      #       apiKey: true
-      #
-      # You can specify the options from the helm CLI:
-      #
-      #   --set hubble.redact.enabled="true"
-      #   --set hubble.redact.kafka.apiKey="true"
-      apiKey: true
   # -- An additional address for Hubble to listen to.
   # Set this field ":4244" if you are enabling Hubble Relay, as it assumes that
   # Hubble is listening on port 4244.
   listenAddress: ":4244"
   # -- Whether Hubble should prefer to announce IPv6 or IPv4 addresses if both are available.
+  # Deprecated: use top-level preferIpv6 instead.
   preferIpv6: false
   # @schema
   # type: [null, boolean]
@@ -1674,6 +1723,21 @@ hubble:
       #   name: ca-issuer
       # -- certmanager issuer used when hubble.tls.auto.method=certmanager.
       certManagerIssuerRef: {}
+      # [Example]
+      # subject:
+      #   countries:
+      #     - US
+      #   provinces:
+      #     - California
+      # -- X509Subject Full X509 name specification used when hubble.tls.auto.method=certmanager.
+      # https://cert-manager.io/docs/reference/api-docs/#cert-manager.io/v1.X509Subject
+      subject: {}
+      # [Example]
+      # privateKey:
+      #   algorithm: ECDSA
+      # -- Private key options. These include the key algorithm and size, the used encoding and the rotation policy used when hubble.tls.auto.method=certmanager.
+      # https://cert-manager.io/docs/reference/api-docs/#cert-manager.io/v1.CertificatePrivateKey
+      privateKey: {}
     # -- The Hubble server certificate and private key
     server:
       # -- Name of the Secret containing the certificate and key for the Hubble server.
@@ -1701,9 +1765,9 @@ hubble:
       # @schema
       override: ~
       repository: "quay.io/cilium/hubble-relay"
-      tag: "v1.19.3"
+      tag: "v1.20.2"
       # hubble-relay-digest
-      digest: sha256:5ee21d57b6ef2aa6db67e603a735fdceb162454b352b7335b651456e308f681b
+      digest: sha256:d309c977870e9dbede7122a10eee09a4c9d66685e8d52af62d9c3c113f815b0f
       useDigest: true
       pullPolicy: "IfNotPresent"
     # -- Specifies the resources for the hubble-relay pods
@@ -1783,7 +1847,7 @@ hubble:
         type: RuntimeDefault
     # -- hubble-relay container security context
     securityContext:
-      # readOnlyRootFilesystem: true
+      readOnlyRootFilesystem: true
       allowPrivilegeEscalation: false
       runAsNonRoot: true
       runAsUser: 65532
@@ -1978,25 +2042,23 @@ hubble:
         # @schema
         override: ~
         repository: "quay.io/cilium/hubble-ui-backend"
-        tag: "v0.13.3"
-        digest: "sha256:db1454e45dc39ca41fbf7cad31eec95d99e5b9949c39daaad0fa81ef29d56953"
+        tag: "v0.13.6"
+        digest: "sha256:83b3fc763f3d49948c306bf49b08277383e195904b9ca5c0c0022b2112628787"
         useDigest: true
         pullPolicy: "IfNotPresent"
       # -- Hubble-ui backend security context.
       securityContext:
+        # readOnlyRootFilesystem: true
         allowPrivilegeEscalation: false
+        capabilities:
+          drop:
+            - ALL
       # -- Additional hubble-ui backend environment variables.
       extraEnv: []
       # -- Additional hubble-ui backend volumes.
       extraVolumes: []
       # -- Additional hubble-ui backend volumeMounts.
       extraVolumeMounts: []
-      livenessProbe:
-        # -- Enable liveness probe for Hubble-ui backend (requires Hubble-ui 0.12+)
-        enabled: false
-      readinessProbe:
-        # -- Enable readiness probe for Hubble-ui backend (requires Hubble-ui 0.12+)
-        enabled: false
       # -- Resource requests and limits for the 'backend' container of the 'hubble-ui' deployment.
       resources: {}
       #   limits:
@@ -2013,13 +2075,17 @@ hubble:
         # @schema
         override: ~
         repository: "quay.io/cilium/hubble-ui"
-        tag: "v0.13.3"
-        digest: "sha256:661d5de7050182d495c6497ff0b007a7a1e379648e60830dd68c4d78ae21761d"
+        tag: "v0.13.6"
+        digest: "sha256:049a80a03585c043d0c3121bdc518c72b0fd42bae07e4bcce0fdb8f1e88041d0"
         useDigest: true
         pullPolicy: "IfNotPresent"
       # -- Hubble-ui frontend security context.
       securityContext:
+        # readOnlyRootFilesystem: true
         allowPrivilegeEscalation: false
+        capabilities:
+          drop:
+            - ALL
       # -- Additional hubble-ui frontend environment variables.
       extraEnv: []
       # -- Additional hubble-ui frontend volumes.
@@ -2096,9 +2162,12 @@ hubble:
         maxUnavailable: 1
     # -- Security context to be added to Hubble UI pods
     securityContext:
+      runAsNonRoot: true
       runAsUser: 1001
       runAsGroup: 1001
       fsGroup: 1001
+      seccompProfile:
+        type: RuntimeDefault
     # -- hubble-ui service configuration.
     service:
       # -- Annotations to be added for the Hubble UI service
@@ -2251,6 +2320,8 @@ ipam:
     #       cidrs:
     #         - 10.10.0.0/8
     #       maskSize: 24
+    #     allowFirstIP: true
+    #     allowLastIP: true
     #   other:
     #     ipv6:
     #       cidrs:
@@ -2330,9 +2401,12 @@ k8s:
   # -- requireIPv6PodCIDR enables waiting for Kubernetes to provide the PodCIDR
   # range via the Kubernetes node resource
   requireIPv6PodCIDR: false
+  # @schema
+  # type: [null, string]
+  # @schema
   # -- A space separated list of Kubernetes API server URLs to use with the client.
   # For example "https://192.168.0.1:6443 https://192.168.0.2:6443"
-  # apiServerURLs: ""
+  apiServerURLs: ~
 # -- Keep the deprecated selector labels when deploying Cilium DaemonSet.
 keepDeprecatedLabels: false
 # -- Keep the deprecated probes when deploying Cilium DaemonSet
@@ -2462,16 +2536,18 @@ ipv4NativeRoutingCIDR: ""
 # the user must configure the routes to reach pods, either manually or by
 # setting the auto-direct-node-routes flag.
 ipv6NativeRoutingCIDR: ""
+# -- Derive the native routing CIDRs from the cluster-pool IPAM CIDRs when
+# ipv4NativeRoutingCIDR / ipv6NativeRoutingCIDR are not explicitly set.
+# Only effective with ipam.mode=cluster-pool and requires exactly one CIDR
+# per enabled IP family in clusterPoolIPv4PodCIDRList /
+# clusterPoolIPv6PodCIDRList.
+nativeRoutingCIDRFromClusterPool: false
 # -- cilium-monitor sidecar.
 monitor:
   # -- Enable the cilium-monitor sidecar.
   enabled: false
 # -- Configure service load balancing
 loadBalancer:
-  # -- standalone enables the standalone L4LB which does not connect to
-  # kube-apiserver.
-  # standalone: false
-
   # -- algorithm is the name of the load balancing algorithm for backend
   # selection e.g. random or maglev
   # algorithm: random
@@ -2493,6 +2569,14 @@ loadBalancer:
   # -- serviceTopology enables K8s Topology Aware Hints -based service
   # endpoints filtering
   serviceTopology: false
+  # -- reflectorWaitTime is the maximum amount of time the K8s reflector waits
+  # to fill its events buffer. A higher wait time will reduce processing of
+  # transient states and increases throughput as it gives bigger batches
+  # downstream for processing. Batching also helps to combine related objects,
+  # e.g. a Service may have multiple associated EndpointSlices and preferably
+  # these would be processed together.
+  # reflectorWaitTime: "500ms"
+
   # -- L7 LoadBalancer
   l7:
     # -- Enable L7 service load balancing via envoy proxy.
@@ -2539,6 +2623,9 @@ nodePort:
   # -- Enable access of the healthcheck nodePort on the LoadBalancerIP. Needs
   # EnableHealthCheck to be enabled
   enableHealthCheckLoadBalancerIP: false
+  # -- Enable dynamic source IP resolution for SNAT via linux's routing table.
+  # The kernel must support this feature.
+  enableDynamicSourceLookup: false
 # policyAuditMode: false
 
 # -- The agent can be put into one of the three policy enforcement modes:
@@ -2631,6 +2718,19 @@ dashboards:
   annotations: {}
 # Configure Cilium Envoy options.
 envoy:
+  # @schema
+  # oneOf:
+  # - type: [null]
+  # - enum: ["split", "ads", "strict-ads"]
+  # @schema
+  # -- xDS server operating mode for Envoy proxy configuration. Supported
+  # values are: "split" for the existing per-resource-type xDS,
+  # "ads" for the ADS (Aggregated Discovery Service) xDS, and
+  # "strict-ads" for ADS with strict snapshot cache behavior and generated
+  # snapshot consistency checks. Null value omits setting this option.
+  # Cilium Agent defaults missing option to "split" to keep upgrades in the legacy mode.
+  # @default -- `ads` for new 1.20+ installations; none when `upgradeCompatibility` is set below `1.20`
+  xdsMode: ~
   # @schema
   # type: [null, boolean]
   # @schema
@@ -2680,6 +2780,8 @@ envoy:
     # Tune this value up if you encounter "Envoy: Discarded truncated access log message" errors.
     # Large request/response header sizes (e.g. 16KiB) will require a larger buffer size.
     accessLogBufferSize: 4096
+    # -- Enable access log forwarding for integration with Hubble.
+    accessLogEnabled: true
   # -- Time in seconds after which a TCP connection attempt times out
   connectTimeoutSeconds: 2
   # -- Time in seconds after which the initial fetch on an xDS stream is considered timed out
@@ -2688,6 +2790,8 @@ envoy:
   maxConcurrentRetries: 128
   # -- Maximum number of connections on Envoy clusters
   clusterMaxConnections: 1024
+  # -- Maximum number of pending requests on Envoy clusters
+  clusterMaxPendingRequests: 1024
   # -- Maximum number of requests on Envoy clusters
   clusterMaxRequests: 1024
   # -- Maximum number of global downstream connections
@@ -2716,6 +2820,9 @@ envoy:
   # @schema
   # -- Max duration to wait for endpoint policies to be restored on restart. Default "3m".
   policyRestoreTimeoutDuration: null
+  # @schema
+  # type: [null, integer]
+  # @schema
   # -- Time in seconds to block Envoy worker thread while an upstream HTTP connection is closing. If set to 0, the connection is closed immediately (with TCP RST). If set to -1, the connection is closed asynchronously in the background.
   httpUpstreamLingerTimeout: null
   # -- Envoy container image.
@@ -2725,9 +2832,9 @@ envoy:
     # @schema
     override: ~
     repository: "quay.io/cilium/cilium-envoy"
-    tag: "v1.36.6-1776000132-2437d2edeaf4d9b56ef279bd0d71127440c067aa"
+    tag: "v1.37.6-1789133542-cbec91f666af0bf742da986d43832932dbb26b82"
     pullPolicy: "IfNotPresent"
-    digest: "sha256:ba0ab8adac082d50d525fd2c5ba096c8facea3a471561b7c61c7a5b9c2e0de0d"
+    digest: "sha256:af7382699576b9e65e9184efa52eeca0b58aea70ad6e511bf260c91d9f740463"
     useDigest: true
   # -- Init containers added to the cilium Envoy DaemonSet.
   initContainers: []
@@ -2754,6 +2861,9 @@ envoy:
   terminationGracePeriodSeconds: 1
   # -- TCP port for the health API.
   healthPort: 9878
+  # -- Minimum number of seconds for which a newly created envoy pod should be ready
+  # before it is considered available.
+  minReadySeconds: 0
   # -- cilium-envoy update strategy
   # ref: https://kubernetes.io/docs/concepts/workloads/controllers/daemonset/#updating-a-daemonset
   updateStrategy:
@@ -2774,6 +2884,12 @@ envoy:
   # type: [null, string]
   # @schema
   bootstrapConfigMap: ~
+  # Enable node locality lookup and pass resolved zone to cilium-envoy via `--service-zone`.
+  nodeLocality:
+    # -- Enable node-locality support for cilium-envoy.
+    # When enabled, Cilium looks up the node zone from the topology label and passes it to the Envoy process via `--service-zone`.
+    # Startup fails if the zone cannot be resolved or the label is empty.
+    enabled: false
   # -- Annotations to be added to all top-level cilium-envoy objects (resources under templates/cilium-envoy)
   annotations: {}
   # -- Security Context for cilium-envoy pods.
@@ -2803,6 +2919,10 @@ envoy:
     failureThreshold: 105
     # -- interval between checks of the startup probe
     periodSeconds: 2
+    # -- Initial delay before the startup probe begins
+    initialDelaySeconds: 5
+    # -- Timeout for the startup probe
+    timeoutSeconds: 5
   livenessProbe:
     # -- Enable liveness probe for cilium-envoy
     enabled: true
@@ -2810,11 +2930,19 @@ envoy:
     failureThreshold: 10
     # -- interval between checks of the liveness probe
     periodSeconds: 30
+    # -- Initial delay before the liveness probe begins
+    initialDelaySeconds: 0
+    # -- Timeout for the liveness probe
+    timeoutSeconds: 5
   readinessProbe:
     # -- failure threshold of readiness probe
     failureThreshold: 3
     # -- interval between checks of the readiness probe
     periodSeconds: 30
+    # -- Initial delay before the readiness probe begins
+    initialDelaySeconds: 0
+    # -- Timeout for the readiness probe
+    timeoutSeconds: 5
   securityContext:
     # -- User to run the pod with
     # runAsUser: 0
@@ -2832,7 +2960,7 @@ envoy:
       # Even though granted to the container, the cilium-envoy-starter wrapper drops
       # all capabilities after forking the actual Envoy process.
       # `NET_BIND_SERVICE` is the only capability that can be passed to the Envoy process by
-      # setting `envoy.securityContext.capabilities.keepNetBindService=true` (in addition to granting the
+      # setting `envoy.securityContext.capabilities.keepCapNetBindService=true` (in addition to granting the
       # capability to the container).
       # Note: In case of embedded envoy, the capability must  be granted to the cilium-agent container.
       envoy:
@@ -3055,7 +3183,8 @@ tunnelProtocol: ""
 # Possible values:
 #   - "ipv4"
 #   - "ipv6"
-# @default -- `"ipv4"`
+#   - "auto"
+# @default -- `"auto"`
 underlayProtocol: ""
 # -- Enable native-routing mode or tunneling mode.
 # Possible values:
@@ -3110,15 +3239,15 @@ operator:
     # @schema
     override: ~
     repository: "quay.io/cilium/operator"
-    tag: "v1.19.3"
+    tag: "v1.20.2"
     # operator-generic-digest
-    genericDigest: sha256:205b09b0ed6accbf9fe688d312a9f0fcfc6a316fc081c23fbffb472af5dd62cd
+    genericDigest: sha256:64d8798350e8569b8e7622563fed6e44dce2625f311e4651b774816516c744fc
     # operator-azure-digest
-    azureDigest: sha256:699c1571a3df1a98882ee13610d47cffb7b34ee7e8d276096db798a5f6c7e4cb
+    azureDigest: sha256:b304dc1ad8dd06abb2103bdb91c87dcc302d904e1e4cbe0afd231885d1f0194a
     # operator-aws-digest
-    awsDigest: sha256:a53dcbfb77282bf2ddd3abbe60f6d49762e7c1389a36cb35b71d504644a56640
+    awsDigest: sha256:0df92d10d2ec548052678b67809c1e613429931b2d5c1d6741fcef096bb0d2a3
     # operator-alibabacloud-digest
-    alibabacloudDigest: sha256:176321a65123373ff8c7823b25183102cbad98375e8d6c80b96d68b6e8491103
+    alibabacloudDigest: sha256:3c1536f099595c3d967d17d7f2ce290c6adea93777a514081e84a9d82e271e38
     useDigest: true
     pullPolicy: "IfNotPresent"
     suffix: ""
@@ -3195,6 +3324,8 @@ operator:
   annotations: {}
   # -- HostNetwork setting
   hostNetwork: true
+  # -- HostUsers setting (must be true if hostNetwork is true)
+  hostUsers: true
   # -- Security context to be added to cilium-operator pods
   podSecurityContext:
     seccompProfile:
@@ -3354,12 +3485,15 @@ nodeinit:
     # @schema
     override: ~
     repository: "quay.io/cilium/startup-script"
-    tag: "1763560095-8f36c34"
-    digest: "sha256:50b9cf9c280096b59b80d2fc8ee6638facef79ac18998a22f0cbc40d5d28c16f"
+    tag: "1782916218-36ae25f"
+    digest: "sha256:f99e2beda7324e93ba04d6240d9626a6b9ab023d7d56e3b029d3d9c823ce63ef"
     useDigest: true
     pullPolicy: "IfNotPresent"
   # -- The priority class to use for the nodeinit pod.
   priorityClassName: ""
+  # -- Minimum number of seconds for which a newly created node-init pod should be ready
+  # before it is considered available.
+  minReadySeconds: 0
   # -- node-init update strategy
   updateStrategy:
     type: RollingUpdate
@@ -3443,9 +3577,9 @@ preflight:
     # @schema
     override: ~
     repository: "quay.io/cilium/cilium"
-    tag: "v1.19.3"
+    tag: "v1.20.2"
     # cilium-digest
-    digest: sha256:2e61680593cddca8b6c055f6d4c849d87a26a1c91c7e3b8b56c7fb76ab7b7b10
+    digest: sha256:2939231d0d3e3ebddcd80fffa168b7ddcc78fdf0dc864d1c8c126ff523c54f01
     useDigest: true
     pullPolicy: "IfNotPresent"
   envoy:
@@ -3456,9 +3590,9 @@ preflight:
       # @schema
       override: ~
       repository: "quay.io/cilium/cilium-envoy"
-      tag: "v1.36.6-1776000132-2437d2edeaf4d9b56ef279bd0d71127440c067aa"
+      tag: "v1.37.6-1789133542-cbec91f666af0bf742da986d43832932dbb26b82"
       pullPolicy: "IfNotPresent"
-      digest: "sha256:ba0ab8adac082d50d525fd2c5ba096c8facea3a471561b7c61c7a5b9c2e0de0d"
+      digest: "sha256:af7382699576b9e65e9184efa52eeca0b58aea70ad6e511bf260c91d9f740463"
       useDigest: true
   # -- The priority class to use for the preflight pod.
   priorityClassName: ""
@@ -3540,8 +3674,6 @@ preflight:
     allowPrivilegeEscalation: false
   #   runAsUser: 0
 
-  # -- Path to write the `--tofqdns-pre-cache` file to.
-  tofqdnsPreCache: ""
   # -- Configure termination grace period for preflight Deployment and DaemonSet.
   terminationGracePeriodSeconds: 1
   # -- By default we should always validate the installed CNPs before upgrading
@@ -3576,8 +3708,33 @@ clustermesh:
   # -- Enable the synchronization of Kubernetes EndpointSlices corresponding to
   # the remote endpoints of appropriately-annotated global services through ClusterMesh
   enableEndpointSliceSynchronization: false
-  # -- Enable Multi-Cluster Services API support (deprecated; use clustermesh.mcsapi.enabled)
-  enableMCSAPISupport: false
+  # -- Default behavior of namespaces in Clustermesh.
+  #
+  # A "global" namespace means its resources (CiliumEndpoints, CiliumIdentities,
+  # and Services) are exported and shared across all connected clusters in the mesh.
+  # This enables:
+  # - Cross-cluster pod-to-pod connectivity
+  # - Cross-cluster network policy enforcement (policies can match labels on pods in remote clusters)
+  # - Global services and Multi-Cluster Services (MCS-API)
+  #
+  # A "local" namespace means its resources stay within the cluster and are NOT
+  # exported to other clusters. Cross-cluster communication and network policies
+  # will not work for pods in local namespaces.
+  #
+  # If set to true, all namespaces are considered global by default unless
+  # explicitly annotated with clustermesh.cilium.io/global=false.
+  # If set to false, all namespaces are considered local by default unless
+  # explicitly annotated with clustermesh.cilium.io/global=true.
+  #
+  # Note: For cross-cluster communication to work, BOTH the source and destination
+  # namespaces must be global. Additionally, for a service to be a Global Service,
+  # it must both reside in a global namespace AND be annotated with
+  # service.cilium.io/global=true.
+  # This setting improves scalability by limiting the amount of state synchronized
+  # across clusters.
+  #
+  # Defaults to true (preserves existing behavior where all namespaces are global).
+  defaultGlobalNamespace: true
   # -- Control whether policy rules assume by default the local cluster if not explicitly selected
   policyDefaultLocalCluster: true
   # -- Annotations to be added to all top-level clustermesh objects (resources under templates/clustermesh-apiserver and templates/clustermesh-config)
@@ -3702,15 +3859,18 @@ clustermesh:
       # @schema
       override: ~
       repository: "quay.io/cilium/clustermesh-apiserver"
-      tag: "v1.19.3"
+      tag: "v1.20.2"
       # clustermesh-apiserver-digest
-      digest: sha256:a8136a7615d6c6041d3aa6f2674d17beaec238170d669507ccc05328a778e2b7
+      digest: sha256:e9ffc79baf76bb98efb87c01be3bca8da998779f4ccdafc97c74132b307305ce
       useDigest: true
       pullPolicy: "IfNotPresent"
     # -- TCP port for the clustermesh-apiserver health API.
     healthPort: 9880
     # -- Configuration for the clustermesh-apiserver readiness probe.
     readinessProbe: {}
+    # -- Rate limit for the apiserver container while syncing Kubernetes
+    # resources from the local cluster to the local etcd.
+    etcdQPS: 50
     etcd:
       # The etcd binary is included in the clustermesh API server image, so the same image from above is reused.
       # Independent override isn't supported, because clustermesh-apiserver is tested against the etcd version it is
@@ -3764,6 +3924,9 @@ clustermesh:
       healthPort: 9881
       # -- Configuration for the KVStoreMesh readiness probe.
       readinessProbe: {}
+      # -- Rate limit for the kvstoremesh container while syncing resources
+      # from all remote clusters to the local etcd.
+      etcdQPS: 100
       # -- Additional KVStoreMesh arguments.
       extraArgs: []
       # -- Additional KVStoreMesh environment variables.
@@ -3968,15 +4131,6 @@ clustermesh:
       #               if provided manually. Cluster mode is meaningful only when the same
       #               CA is shared across all clusters part of the mesh.
       authMode: migration
-      # -- (deprecated) Allow users to provide their own certificates
-      # Users may need to provide their certificates using
-      # a mechanism that requires they provide their own secrets.
-      # This setting does not apply to any of the auto-generated
-      # mechanisms below, it only restricts the creation of secrets
-      # via the `tls-provided` templates.
-      # This option is deprecated as secrets are expected to be created
-      # externally when 'auto' is not enabled.
-      enableSecrets: true
       # -- Configure automatic TLS certificates generation.
       # A Kubernetes CronJob is used the generate any
       # certificates not provided by the user at installation
@@ -4001,7 +4155,7 @@ clustermesh:
         # - certmanager:  This method use cert-manager to generate & rotate certificates.
         method: helm
         # -- Generated certificates validity duration in days.
-        certValidityDuration: 1095
+        certValidityDuration: 365
         # -- Schedule for certificates regeneration (regardless of their expiration date).
         # Only used if method is "cronJob". If nil, then no recurring job will be created.
         # Instead, only the one-shot job is deployed to generate the certificates at
@@ -4011,11 +4165,9 @@ clustermesh:
         # CA is (re)regenerated only if it is not provided as a helm value and the k8s
         # secret is manually deleted.
         #
-        # Defaults to none. Commented syntax gives midnight of the first day of every
-        # fourth month. For syntax, see
+        # Defaults to midnight of the first day of every fourth month. For syntax, see
         # https://kubernetes.io/docs/concepts/workloads/controllers/cron-jobs/#schedule-syntax
-        # schedule: "0 0 1 */4 *"
-
+        schedule: "0 0 1 */4 *"
         # [Example]
         # certManagerIssuerRef:
         #   group: cert-manager.io
@@ -4023,31 +4175,27 @@ clustermesh:
         #   name: ca-issuer
         # -- certmanager issuer used when clustermesh.apiserver.tls.auto.method=certmanager.
         certManagerIssuerRef: {}
-      # -- base64 encoded PEM values for the clustermesh-apiserver server certificate and private key.
-      # Used if 'auto' is not enabled.
-      server:
-        # -- Deprecated, as secrets will always need to be created externally if `auto` is disabled.
-        cert: ""
-        # -- Deprecated, as secrets will always need to be created externally if `auto` is disabled.
-        key: ""
-        # -- Extra DNS names added to certificate when it's auto generated
-        extraDnsNames: []
-        # -- Extra IP addresses added to certificate when it's auto generated
-        extraIpAddresses: []
-      # -- base64 encoded PEM values for the clustermesh-apiserver admin certificate and private key.
-      # Used if 'auto' is not enabled.
-      admin:
-        # -- Deprecated, as secrets will always need to be created externally if `auto` is disabled.
-        cert: ""
-        # -- Deprecated, as secrets will always need to be created externally if `auto` is disabled.
-        key: ""
-      # -- base64 encoded PEM values for the clustermesh-apiserver remote cluster certificate and private key.
-      # Used if 'auto' is not enabled.
-      remote:
-        # -- Deprecated, as secrets will always need to be created externally if `auto` is disabled.
-        cert: ""
-        # -- Deprecated, as secrets will always need to be created externally if `auto` is disabled.
-        key: ""
+        # [Example]
+        # subject:
+        #   countries:
+        #     - US
+        #   provinces:
+        #     - California
+        # -- X509Subject Full X509 name specification used when clustermesh.apiserver.tls.auto.method=certmanager.
+        # https://cert-manager.io/docs/reference/api-docs/#cert-manager.io/v1.X509Subject
+        subject: {}
+        # [Example]
+        # privateKey:
+        #   algorithm: ECDSA
+        # -- Private key options. These include the key algorithm and size, the used encoding and the rotation policy used when clustermesh.apiserver.tls.auto.method=certmanager.
+        # https://cert-manager.io/docs/reference/api-docs/#cert-manager.io/v1.CertificatePrivateKey
+        privateKey: {}
+        # Extra configurations for the auto generated server certificate.
+        server:
+          # -- Extra DNS names added to certificate when it's auto generated
+          extraDnsNames: []
+          # -- Extra IP addresses added to certificate when it's auto generated
+          extraIpAddresses: []
     # clustermesh-apiserver Prometheus metrics configuration
     metrics:
       # -- Enables exporting apiserver metrics in OpenMetrics format.
@@ -4179,7 +4327,7 @@ dnsProxy:
   # overwrites the TTL with this value. Setting this value to zero means that
   # Cilium will honor the TTLs returned by the upstream DNS server.
   minTtl: 0
-  # -- DNS cache data at this path is preloaded on agent startup.
+  # -- DNS cache data at this path is preloaded on agent startup. (deprecated: will be removed in v1.21)
   preCache: ""
   # -- Global port on which the in-agent DNS proxy should listen. Default 0 is a OS-assigned port.
   proxyPort: 0
@@ -4211,6 +4359,9 @@ authentication:
   # Configuration for Cilium's service-to-service mutual authentication using TLS handshakes.
   # Note that this is not full mTLS support without also enabling encryption of some form.
   # Current encryption options are WireGuard or IPsec, configured in encryption block above.
+  #
+  # Deprecated as of Cilium v1.20, this feature will be removed in Cilium v1.21.
+  # See https://github.com/cilium/cilium/issues/47132 for details.
   mutual:
     # -- Port on the agent where mutual authentication handshakes between agents will be performed
     port: 4250
@@ -4238,8 +4389,8 @@ authentication:
           # @schema
           override: ~
           repository: "docker.io/library/busybox"
-          tag: "1.37.0"
-          digest: "sha256:1487d0af5f52b4ba31c7e465126ee2123fe3f2305d638e7827681e7cf6c83d5e"
+          tag: "1.38.0"
+          digest: "sha256:dc2d74b28e4cf8984fa52af1f39bc7c3d9c73760b41a74d629f5d11b1ab28616"
           useDigest: true
           pullPolicy: "IfNotPresent"
         # SPIRE agent configuration
@@ -4253,8 +4404,8 @@ authentication:
             # @schema
             override: ~
             repository: "ghcr.io/spiffe/spire-agent"
-            tag: "1.9.6"
-            digest: "sha256:5106ac601272a88684db14daf7f54b9a45f31f77bb16a906bd5e87756ee7b97c"
+            tag: "1.15.3"
+            digest: "sha256:41b0dcd8b258a69db9e2768292a060766fb76fd866e4bc925849981ea1b825ff"
             useDigest: true
             pullPolicy: "IfNotPresent"
           # -- SPIRE agent service account
@@ -4308,8 +4459,8 @@ authentication:
             # @schema
             override: ~
             repository: "ghcr.io/spiffe/spire-server"
-            tag: "1.9.6"
-            digest: "sha256:59a0b92b39773515e25e68a46c40d3b931b9c1860bc445a79ceb45a805cab8b4"
+            tag: "1.15.3"
+            digest: "sha256:4082f30d3e0ddc4000a171392c4ea174345ee44d161ee917c70b97b2ecfba141"
             useDigest: true
             pullPolicy: "IfNotPresent"
           # -- SPIRE server service account
@@ -4415,6 +4566,9 @@ standaloneDnsProxy:
   tolerations: []
   # -- Standalone DNS proxy auto mount service account token
   automountServiceAccountToken: false
+  # -- Minimum number of seconds for which a newly created standalone DNS proxy pod should be ready
+  # before it is considered available.
+  minReadySeconds: 5
   # -- Standalone DNS proxy update strategy
   updateStrategy:
     type: RollingUpdate
diff --git a/packages/system/cilium/charts/cilium/values.yaml.tmpl b/packages/system/cilium/charts/cilium/values.yaml.tmpl
deleted file mode 100644
index 8039b40c74..0000000000
--- a/packages/system/cilium/charts/cilium/values.yaml.tmpl
+++ /dev/null
@@ -1,4477 +0,0 @@
-
-# @schema
-# type: [null, string]
-# @schema
-# -- namespaceOverride allows to override the destination namespace for Cilium resources.
-namespaceOverride: ""
-# @schema
-# type: [null, object]
-# @schema
-# -- commonLabels allows users to add common labels for all Cilium resources.
-commonLabels: {}
-
-# @schema
-# type: [null, string]
-# @schema
-# -- upgradeCompatibility helps users upgrading to ensure that the configMap for
-# Cilium will not change critical values to ensure continued operation
-# This flag is not required for new installations.
-# For example: '1.7', '1.8', '1.9'
-upgradeCompatibility: null
-debug:
-  # -- Enable debug logging
-  enabled: false
-  # @schema
-  # type: [null, string]
-  # @schema
-  # -- Configure verbosity levels for debug logging
-  # This option is used to enable debug messages for operations related to such
-  # sub-system such as (e.g. kvstore, envoy, datapath, policy, or tagged), and flow is
-  # for enabling debug messages emitted per request, message and connection.
-  # Multiple values can be set via a space-separated string (e.g. "datapath envoy").
-  #
-  # Applicable values:
-  # - flow
-  # - kvstore
-  # - envoy
-  # - datapath
-  # - policy
-  # - tagged
-  verbose: ~
-
-  # -- Set the agent-internal metrics sampling frequency. This sets the
-  # frequency of the internal sampling of the agent metrics. These are
-  # available via the "cilium-dbg shell -- metrics -s" command and are
-  # part of the metrics HTML page included in the sysdump.
-  # @schema
-  # type: [null, string]
-  # @schema
-  metricsSamplingInterval: "5m"
-rbac:
-  # -- Enable creation of Resource-Based Access Control configuration.
-  create: true
-
-# -- Configure image pull secrets for pulling container images
-imagePullSecrets: []
-# - name: "image-pull-secret"
-
-# -- Configure iptables--random-fully. Disabled by default. View https://github.com/cilium/cilium/issues/13037 for more information.
-iptablesRandomFully: false
-
-# -- (string) Kubernetes config path
-# @default -- `"~/.kube/config"`
-kubeConfigPath: ""
-# -- Configure the Kubernetes service endpoint dynamically using a ConfigMap. Mutually exclusive with `k8sServiceHost`.
-k8sServiceHostRef:
-  # @schema
-  # type: [string, null]
-  # @schema
-  # -- (string) name of the ConfigMap containing the Kubernetes service endpoint
-  name:
-  # @schema
-  # type: [string, null]
-  # @schema
-  # -- (string) Key in the ConfigMap containing the Kubernetes service endpoint
-  key:
-# -- (string) Kubernetes service host - use "auto" for automatic lookup from the cluster-info ConfigMap
-k8sServiceHost: ""
-# @schema
-# type: [string, integer]
-# @schema
-# -- (string) Kubernetes service port
-k8sServicePort: ""
-# @schema
-# type: [null, string]
-# @schema
-# -- (string) When `k8sServiceHost=auto`, allows to customize the configMap name. It defaults to `cluster-info`.
-k8sServiceLookupConfigMapName: ""
-# @schema
-# type: [null, string]
-# @schema
-# -- (string) When `k8sServiceHost=auto`, allows to customize the namespace that contains `k8sServiceLookupConfigMapName`. It defaults to `kube-public`.
-k8sServiceLookupNamespace: ""
-# -- Configure the client side rate limit for the agent
-#
-# If the amount of requests to the Kubernetes API server exceeds the configured
-# rate limit, the agent will start to throttle requests by delaying
-# them until there is budget or the request times out.
-k8sClientRateLimit:
-  # @schema
-  # type: [null, integer]
-  # @schema
-  # -- (int) The sustained request rate in requests per second.
-  # @default -- 10
-  qps:
-  # @schema
-  # type: [null, integer]
-  # @schema
-  # -- (int) The burst request rate in requests per second.
-  # The rate limiter will allow short bursts with a higher rate.
-  # @default -- 20
-  burst:
-  # -- Configure the client side rate limit for the Cilium Operator
-  operator:
-    # @schema
-    # type: [null, integer]
-    # @schema
-    # -- (int) The sustained request rate in requests per second.
-    # @default -- 100
-    qps:
-    # @schema
-    # type: [null, integer]
-    # @schema
-    # -- (int) The burst request rate in requests per second.
-    # The rate limiter will allow short bursts with a higher rate.
-    # @default -- 200
-    burst:
-
-# -- Configure exponential backoff for client-go in Cilium agent.
-k8sClientExponentialBackoff:
-  # -- Enable exponential backoff for client-go in Cilium agent.
-  enabled: true
-  # -- Configure base (in seconds) for exponential backoff.
-  backoffBaseSeconds: 1
-  # -- Configure maximum duration (in seconds) for exponential backoff.
-  backoffMaxDurationSeconds: 120
-
-cluster:
-  # -- Name of the cluster. Only required for Cluster Mesh and mutual authentication with SPIRE.
-  # It must respect the following constraints:
-  # * It must contain at most 32 characters;
-  # * It must begin and end with a lower case alphanumeric character;
-  # * It may contain lower case alphanumeric characters and dashes between.
-  # The "default" name cannot be used if the Cluster ID is different from 0.
-  name: default
-  # -- (int) Unique ID of the cluster. Must be unique across all connected
-  # clusters and in the range of 1 to 255. Only required for Cluster Mesh,
-  # may be 0 if Cluster Mesh is not used.
-  id: 0
-# -- Define serviceAccount names for components.
-# @default -- Component's fully qualified name.
-serviceAccounts:
-  cilium:
-    create: true
-    name: cilium
-    automount: true
-    annotations: {}
-  nodeinit:
-    create: true
-    # -- Enabled is temporary until https://github.com/cilium/cilium-cli/issues/1396 is implemented.
-    # Cilium CLI doesn't create the SAs for node-init, thus the workaround. Helm is not affected by
-    # this issue. Name and automount can be configured, if enabled is set to true.
-    # Otherwise, they are ignored. Enabled can be removed once the issue is fixed.
-    # Cilium-nodeinit DS must also be fixed.
-    enabled: false
-    name: cilium-nodeinit
-    automount: true
-    annotations: {}
-  envoy:
-    create: true
-    name: cilium-envoy
-    automount: true
-    annotations: {}
-  operator:
-    create: true
-    name: cilium-operator
-    automount: true
-    annotations: {}
-  preflight:
-    create: true
-    name: cilium-pre-flight
-    automount: true
-    annotations: {}
-  relay:
-    create: true
-    name: hubble-relay
-    automount: false
-    annotations: {}
-  ui:
-    create: true
-    name: hubble-ui
-    automount: true
-    annotations: {}
-  clustermeshApiserver:
-    create: true
-    name: clustermesh-apiserver
-    automount: true
-    annotations: {}
-  # -- Clustermeshcertgen is used if clustermesh.apiserver.tls.auto.method=cronJob
-  clustermeshcertgen:
-    create: true
-    name: clustermesh-apiserver-generate-certs
-    automount: true
-    annotations: {}
-  # -- Hubblecertgen is used if hubble.tls.auto.method=cronJob
-  hubblecertgen:
-    create: true
-    name: hubble-generate-certs
-    automount: true
-    annotations: {}
-  # -- CorednsMCSAPI is used if clustermesh.mcsapi.corednsAutoConfigure.enabled=true
-  corednsMCSAPI:
-    create: true
-    name: cilium-coredns-mcsapi-autoconfig
-    automount: true
-    annotations: {}
-  # -- Ztunnel is used if encryption.type=ztunnel
-  ztunnel:
-    create: true
-    name: ztunnel-cilium
-    automount: false
-    annotations: {}
-# -- Configure termination grace period for cilium-agent DaemonSet.
-terminationGracePeriodSeconds: 1
-# -- Install the cilium agent resources.
-agent: true
-# -- Agent daemonset name.
-name: cilium
-# -- Roll out cilium agent pods automatically when configmap is updated.
-rollOutCiliumPods: false
-# -- Configuration for the ConfigMap drift detection feature.
-# When enabled, the agent continuously watches the cilium-config ConfigMap
-# and exposes a cilium_drift_checker_config_delta Prometheus metric reporting
-# the number of keys that differ between the ConfigMap and the agent's active
-# settings. A non-zero value indicates that the agent has not yet applied all
-# current ConfigMap changes and needs to be restarted.
-configDriftDetection:
-  # -- Enable watching of the cilium-config ConfigMap and reflecting its
-  # contents into the agent's internal DynamicConfig table.
-  enabled: true
-  # -- Enable the drift checker which compares the DynamicConfig table against
-  # the agent's active settings and publishes the
-  # cilium_drift_checker_config_delta metric.
-  driftChecker: true
-  # -- List of config-map keys to ignore when computing the drift delta.
-  ignoredKeys: []
-# -- Agent container image.
-image:
-  # @schema
-  # type: [null, string]
-  # @schema
-  override: ~
-  repository: "${CILIUM_REPO}"
-  tag: "${CILIUM_VERSION}"
-  pullPolicy: "${PULL_POLICY}"
-  # cilium-digest
-  digest: ${CILIUM_DIGEST}
-  useDigest: ${USE_DIGESTS}
-# -- Scheduling configurations for cilium pods
-scheduling:
-  # @schema
-  # enum: ["anti-affinity", "kube-scheduler"]
-  # @schema
-  # -- Mode specifies how Cilium daemonset pods should be scheduled to Nodes.
-  # `anti-affinity` mode applies a pod anti-affinity rule to the cilium daemonset.
-  # Pod anti-affinity may significantly impact scheduling throughput for large clusters.
-  # See: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#inter-pod-affinity-and-anti-affinity
-  # `kube-scheduler` mode forgoes the anti-affinity rule for full scheduling throughput.
-  # Kube-scheduler avoids host port conflict when scheduling pods.
-  # @default -- Defaults to apply a pod anti-affinity rule to the agent pod - `anti-affinity`
-  mode: anti-affinity
-# -- Affinity for cilium-agent.
-affinity:
-  podAntiAffinity:
-    requiredDuringSchedulingIgnoredDuringExecution:
-      - topologyKey: kubernetes.io/hostname
-        labelSelector:
-          matchLabels:
-            k8s-app: cilium
-# -- Node selector for cilium-agent.
-nodeSelector:
-  kubernetes.io/os: linux
-# -- Node tolerations for agent scheduling to nodes with taints
-# ref: https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/
-tolerations:
-  - operator: Exists
-    # - key: "key"
-    #   operator: "Equal|Exists"
-    #   value: "value"
-    #   effect: "NoSchedule|PreferNoSchedule|NoExecute(1.6 only)"
-# -- The priority class to use for cilium-agent.
-priorityClassName: ""
-# -- DNS policy for Cilium agent pods.
-# Ref: https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/#pod-s-dns-policy
-dnsPolicy: ""
-# -- Additional containers added to the cilium DaemonSet.
-extraContainers: []
-# -- Additional initContainers added to the cilium Daemonset.
-extraInitContainers: []
-# -- Additional agent container arguments.
-extraArgs: []
-# -- Additional agent container environment variables.
-extraEnv: []
-# -- Additional agent hostPath mounts.
-extraHostPathMounts: []
-# - name: host-mnt-data
-#   mountPath: /host/mnt/data
-#   hostPath: /mnt/data
-#   hostPathType: Directory
-#   readOnly: true
-#   mountPropagation: HostToContainer
-
-# -- Additional agent volumes.
-extraVolumes: []
-# -- Additional agent volumeMounts.
-extraVolumeMounts: []
-# -- extraConfig allows you to specify additional configuration parameters to be
-# included in the cilium-config configmap.
-extraConfig: {}
-#  my-config-a: "1234"
-#  my-config-b: |-
-#    test 1
-#    test 2
-#    test 3
-
-# -- Annotations to be added to all top-level cilium-agent objects (resources under templates/cilium-agent)
-annotations: {}
-# -- Security Context for cilium-agent pods.
-podSecurityContext:
-  # -- AppArmorProfile options for the `cilium-agent` and init containers
-  appArmorProfile:
-    type: "Unconfined"
-  seccompProfile:
-    type: "Unconfined"
-# -- Annotations to be added to agent pods
-podAnnotations: {}
-# -- Labels to be added to agent pods
-podLabels: {}
-# -- Agent resource limits & requests
-# ref: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
-resources: {}
-#   limits:
-#     cpu: 4000m
-#     memory: 4Gi
-#   requests:
-#     cpu: 100m
-#     memory: 512Mi
-
-# -- resources & limits for the agent init containers
-initResources: {}
-securityContext:
-  # -- User to run the pod with
-  # runAsUser: 0
-  # -- disable privilege escalation
-  allowPrivilegeEscalation: false
-  # -- Run the pod with elevated privileges
-  privileged: false
-  # -- SELinux options for the `cilium-agent` and init containers
-  seLinuxOptions:
-    level: 's0'
-    # Running with spc_t since we have removed the privileged mode.
-    # Users can change it to a different type as long as they have the
-    # type available on the system.
-    type: 'spc_t'
-  capabilities:
-    # -- Capabilities for the `cilium-agent` container
-    ciliumAgent:
-      # Use to set socket permission
-      - CHOWN
-      # Used to terminate envoy child process
-      - KILL
-      # Used since cilium modifies routing tables, etc...
-      - NET_ADMIN
-      # Used since cilium creates raw sockets, etc...
-      - NET_RAW
-      # Used since cilium monitor uses mmap
-      - IPC_LOCK
-      # Used in iptables. Consider removing once we are iptables-free
-      - SYS_MODULE
-      # Needed to switch network namespaces (used for health endpoint, socket-LB).
-      # We need it for now but might not need it for >= 5.11 specially
-      # for the 'SYS_RESOURCE'.
-      # In >= 5.8 there's already BPF and PERMON capabilities
-      - SYS_ADMIN
-      # Could be an alternative for the SYS_ADMIN for the RLIMIT_NPROC
-      - SYS_RESOURCE
-      # Both PERFMON and BPF requires kernel 5.8, container runtime
-      # cri-o >= v1.22.0 or containerd >= v1.5.0.
-      # If available, SYS_ADMIN can be removed.
-      #- PERFMON
-      #- BPF
-      # Allow discretionary access control (e.g. required for package installation)
-      - DAC_OVERRIDE
-      # Allow to set Access Control Lists (ACLs) on arbitrary files (e.g. required for package installation)
-      - FOWNER
-      # Allow to execute program that changes GID (e.g. required for package installation)
-      - SETGID
-      # Allow to execute program that changes UID (e.g. required for package installation)
-      - SETUID
-      # Allow to read dmesg and get kernel pointers when kptr_restrict=1
-      - SYSLOG
-    # -- Capabilities for the `mount-cgroup` init container
-    mountCgroup:
-      # Only used for 'mount' cgroup
-      - SYS_ADMIN
-      # Used for nsenter
-      - SYS_CHROOT
-      - SYS_PTRACE
-    # -- capabilities for the `apply-sysctl-overwrites` init container
-    applySysctlOverwrites:
-      # Required in order to access host's /etc/sysctl.d dir
-      - SYS_ADMIN
-      # Used for nsenter
-      - SYS_CHROOT
-      - SYS_PTRACE
-    # -- Capabilities for the `clean-cilium-state` init container
-    cleanCiliumState:
-      # Most of the capabilities here are the same ones used in the
-      # cilium-agent's container because this container can be used to
-      # uninstall all Cilium resources, and therefore it is likely that
-      # will need the same capabilities.
-      # Used since cilium modifies routing tables, etc...
-      - NET_ADMIN
-      # Used in iptables. Consider removing once we are iptables-free
-      - SYS_MODULE
-      # We need it for now but might not need it for >= 5.11 specially
-      # for the 'SYS_RESOURCE'.
-      # In >= 5.8 there's already BPF and PERMON capabilities
-      - SYS_ADMIN
-      # Could be an alternative for the SYS_ADMIN for the RLIMIT_NPROC
-      - SYS_RESOURCE
-      # Both PERFMON and BPF requires kernel 5.8, container runtime
-      # cri-o >= v1.22.0 or containerd >= v1.5.0.
-      # If available, SYS_ADMIN can be removed.
-      #- PERFMON
-      #- BPF
-# -- Cilium agent update strategy
-updateStrategy:
-  type: RollingUpdate
-  rollingUpdate:
-    # @schema
-    # type: [integer, string]
-    # @schema
-    maxUnavailable: 2
-# Configuration Values for cilium-agent
-aksbyocni:
-  # -- Enable AKS BYOCNI integration.
-  # Note that this is incompatible with AKS clusters not created in BYOCNI mode:
-  # use Azure integration (`azure.enabled`) instead.
-  enabled: false
-# @schema
-# type: [boolean, string]
-# @schema
-# -- Enable installation of PodCIDR routes between worker
-# nodes if worker nodes share a common L2 network segment.
-autoDirectNodeRoutes: false
-# -- Enable skipping of PodCIDR routes between worker
-# nodes if the worker nodes are in a different L2 network segment.
-directRoutingSkipUnreachable: false
-# -- Annotate k8s node upon initialization with Cilium's metadata.
-annotateK8sNode: false
-azure:
-  # -- Enable Azure integration.
-  # Note that this is incompatible with AKS clusters created in BYOCNI mode: use
-  # AKS BYOCNI integration (`aksbyocni.enabled`) instead.
-  enabled: false
-  # usePrimaryAddress: false
-  # resourceGroup: group1
-  # subscriptionID: 00000000-0000-0000-0000-000000000000
-  # tenantID: 00000000-0000-0000-0000-000000000000
-  # clientID: 00000000-0000-0000-0000-000000000000
-  # clientSecret: 00000000-0000-0000-0000-000000000000
-  # userAssignedIdentityID: 00000000-0000-0000-0000-000000000000
-  nodeSpec:
-    azureInterfaceName: ""
-alibabacloud:
-  # -- Enable AlibabaCloud ENI integration
-  enabled: false
-  nodeSpec:
-    vSwitches: []
-    vSwitchTags: []
-    securityGroups: []
-    securityGroupTags: []
-# -- Enable bandwidth manager to optimize TCP and UDP workloads and allow
-# for rate-limiting traffic from individual Pods with EDT (Earliest Departure
-# Time) through the "kubernetes.io/egress-bandwidth" Pod annotation.
-bandwidthManager:
-  # -- Enable bandwidth manager infrastructure (also prerequirement for BBR)
-  enabled: false
-  # -- Activate BBR TCP congestion control for Pods
-  bbr: false
-  # -- Activate BBR TCP congestion control for Pods in the host namespace only.
-  bbrHostNamespaceOnly: false
-# -- Configure standalone NAT46/NAT64 gateway
-nat46x64Gateway:
-  # -- Enable RFC6052-prefixed translation
-  enabled: false
-# -- Configure L2 announcements
-l2announcements:
-  # -- Enable L2 announcements
-  enabled: false
-  # -- If a lease is not renewed for X duration, the current leader is considered dead, a new leader is picked
-  # leaseDuration: 15s
-  # -- The interval at which the leader will renew the lease
-  # leaseRenewDeadline: 5s
-  # -- The timeout between retries if renewal fails
-  # leaseRetryPeriod: 2s
-# -- Configure L2 pod announcements
-l2podAnnouncements:
-  # -- Enable L2 pod announcements
-  enabled: false
-  # -- Interface used for sending Gratuitous ARP pod announcements
-  interface: "eth0"
-  # -- A regular expression matching interfaces used for sending Gratuitous ARP pod announcements
-  # interfacePattern: ""
-# -- This feature set enables virtual BGP routers to be created via BGP CRDs.
-bgpControlPlane:
-  # -- Enables the BGP control plane.
-  enabled: false
-  # -- SecretsNamespace is the namespace which BGP support will retrieve secrets from.
-  secretsNamespace:
-    # -- Create secrets namespace for BGP secrets.
-    create: false
-    # -- The name of the secret namespace to which Cilium agents are given read access
-    name: kube-system
-  # -- Status reporting settings
-  statusReport:
-    # -- Enable/Disable BGP status reporting
-    # It is recommended to enable status reporting in general, but if you have any issue
-    # such as high API server load, you can disable it by setting this to false.
-    enabled: true
-  # -- BGP router-id allocation mode
-  routerIDAllocation:
-    # -- BGP router-id allocation mode. In default mode, the router-id is derived from the IPv4 address if it is available, or else it is determined by the lower 32 bits of the MAC address.
-    mode: "default"
-    # -- IP pool to allocate the BGP router-id from when the mode is ip-pool.
-    ipPool: ""
-  # -- Legacy BGP ORIGIN attribute settings
-  legacyOriginAttribute:
-    # -- Enable/Disable advertising LoadBalancerIP routes with the legacy
-    # BGP ORIGIN attribute value INCOMPLETE (2) instead of the default IGP (0).
-    # Enable for compatibility with the legacy behavior of MetalLB integration.
-    enabled: false
-pmtuDiscovery:
-  # -- Enable path MTU discovery to send ICMP fragmentation-needed replies to
-  # the client.
-  enabled: false
-  # -- Enable kernel probing path MTU discovery for Pods which uses different message
-  # sizes to search for correct MTU value.
-  # Valid values are: always, blackhole, disabled and unset (or empty). If value
-  # is 'unset' or left empty then will not try to override setting.
-  packetizationLayerPMTUDMode: "blackhole"
-bpf:
-  autoMount:
-    # -- Enable automatic mount of BPF filesystem
-    # When `autoMount` is enabled, the BPF filesystem is mounted at
-    # `bpf.root` path on the underlying host and inside the cilium agent pod.
-    # If users disable `autoMount`, it's expected that users have mounted
-    # bpffs filesystem at the specified `bpf.root` volume, and then the
-    # volume will be mounted inside the cilium agent pod at the same path.
-    enabled: true
-  # -- Configure the mount point for the BPF filesystem
-  root: /sys/fs/bpf
-  # -- Enables pre-allocation of eBPF map values. This increases
-  # memory usage but can reduce latency.
-  preallocateMaps: false
-  # @schema
-  # type: [null, integer]
-  # @schema
-  # -- (int) Configure the maximum number of entries in auth map.
-  # @default -- `524288`
-  authMapMax: ~
-  # -- Enable CT accounting for packets and bytes
-  ctAccounting: false
-  # @schema
-  # type: [null, integer]
-  # @schema
-  # -- (int) Configure the maximum number of entries in the TCP connection tracking
-  # table.
-  # @default -- `524288`
-  ctTcpMax: ~
-  # @schema
-  # type: [null, integer]
-  # @schema
-  # -- (int) Configure the maximum number of entries for the non-TCP connection
-  # tracking table.
-  # @default -- `262144`
-  ctAnyMax: ~
-  # -- Control to use a distributed per-CPU backend memory for the core BPF LRU maps
-  # which Cilium uses. This improves performance significantly, but it is also
-  # recommended to increase BPF map sizing along with that.
-  distributedLRU:
-      # -- Enable distributed LRU backend memory. For compatibility with existing
-      # installations it is off by default.
-      enabled: false
-  # -- Control events generated by the Cilium datapath exposed to Cilium monitor and Hubble.
-  # Helm configuration for BPF events map rate limiting is experimental and might change
-  # in upcoming releases.
-  events:
-    # -- Default settings for all types of events except dbg.
-    default:
-      # @schema
-      # type: [null, integer]
-      # @schema
-      # -- (int) Configure the limit of messages per second that can be written to
-      # BPF events map. The number of messages is averaged, meaning that if no messages
-      # were written to the map over 5 seconds, it's possible to write more events
-      # in the 6th second. If rateLimit is greater than 0, non-zero value for burstLimit must
-      # also be provided lest the configuration is considered invalid. Setting both burstLimit
-      # and rateLimit to 0 disables BPF events rate limiting.
-      # @default -- `0`
-      rateLimit: ~
-      # @schema
-      # type: [null, integer]
-      # @schema
-      # -- (int) Configure the maximum number of messages that can be written to BPF events
-      # map in 1 second. If burstLimit is greater than 0, non-zero value for rateLimit must
-      # also be provided lest the configuration is considered invalid. Setting both burstLimit
-      # and rateLimit to 0 disables BPF events rate limiting.
-      # @default -- `0`
-      burstLimit: ~
-    drop:
-      # -- Enable drop events.
-      enabled: true
-    policyVerdict:
-      # -- Enable policy verdict events.
-      enabled: true
-    trace:
-      # -- Enable trace events.
-      enabled: true
-  # @schema
-  # type: [null, integer]
-  # @schema
-  # -- Configure the maximum number of service entries in the
-  # load balancer maps.
-  lbMapMax: 65536
-  # @schema
-  # type: [null, integer]
-  # @schema
-  # -- (int) Configure the maximum number of entries for the NAT table.
-  # @default -- `524288`
-  natMax: ~
-  # @schema
-  # type: [null, integer]
-  # @schema
-  # -- (int) Configure the maximum number of entries for the neighbor table.
-  # @default -- `524288`
-  neighMax: ~
-  # @schema
-  # type: [null, integer]
-  # @schema
-  # @default -- `16384`
-  # -- (int) Configures the maximum number of entries for the node table.
-  nodeMapMax: ~
-  # -- Configure the maximum number of entries in endpoint policy map (per endpoint).
-  # @schema
-  # type: [null, integer]
-  # @schema
-  policyMapMax: 16384
-  # -- (float64) Configure threshold for emitting pressure metrics of policy maps.
-  # @schema
-  # type: [null, number]
-  # @schema
-  # @default -- `0.1`
-  policyMapPressureMetricsThreshold: ~
-  # -- Configure the maximum number of entries in global policy stats map.
-  # @schema
-  # type: [null, integer]
-  # @schema
-  policyStatsMapMax: 65536
-  # @schema
-  # type: [null, number, string]
-  # @schema
-  # -- (float64) Configure auto-sizing for all BPF maps based on available memory.
-  # ref: https://docs.cilium.io/en/stable/network/ebpf/maps/
-  # @default -- `0.0025`
-  mapDynamicSizeRatio: ~
-  # -- Configure the level of aggregation for monitor notifications.
-  # Valid options are none, low, medium, maximum.
-  monitorAggregation: medium
-  # -- Configure the typical time between monitor notifications for
-  # active connections.
-  monitorInterval: "5s"
-  # -- Configure which TCP flags trigger notifications when seen for the
-  # first time in a connection.
-  monitorFlags: "all"
-  # -- (bool) Allow cluster external access to ClusterIP services.
-  # @default -- `false`
-  lbExternalClusterIP: false
-  # -- (bool) Enable loadBalancerSourceRanges CIDR filtering for all service
-  # types, not just LoadBalancer services. The corresponding NodePort and
-  # ClusterIP (if enabled for cluster-external traffic) will also apply the
-  # CIDR filter.
-  # @default -- `false`
-  lbSourceRangeAllTypes: false
-  # -- (bool) Enable the option to define the load balancing algorithm on
-  # a per-service basis through service.cilium.io/lb-algorithm annotation.
-  # @default -- `false`
-  lbAlgorithmAnnotation: false
-  # -- (bool) Enable the option to define the load balancing mode (SNAT or DSR)
-  # on a per-service basis through service.cilium.io/forwarding-mode annotation.
-  # @default -- `false`
-  lbModeAnnotation: false
-  # @schema
-  # type: [null, boolean]
-  # @schema
-  # -- (bool) Enable native IP masquerade support in eBPF
-  # @default -- `false`
-  masquerade: ~
-  # @schema
-  # type: [null, boolean]
-  # @schema
-  # -- (bool) Configure whether direct routing mode should route traffic via
-  # host stack (true) or directly and more efficiently out of BPF (false) if
-  # the kernel supports it. The latter has the implication that it will also
-  # bypass netfilter in the host namespace.
-  # @default -- `false`
-  hostLegacyRouting: ~
-  # @schema
-  # type: [null, boolean]
-  # @schema
-  # -- (bool) Configure the eBPF-based TPROXY (beta) to reduce reliance on iptables rules
-  # for implementing Layer 7 policy. Note this is incompatible with netkit (`bpf.datapathMode=netkit`,
-  # `bpf.datapathMode=netkit-l2`).
-  # @default -- `false`
-  tproxy: ~
-  # @schema
-  # type: [null, array]
-  # @schema
-  # -- (list) Configure explicitly allowed VLAN id's for bpf logic bypass.
-  # [0] will allow all VLAN id's without any filtering.
-  # @default -- `[]`
-  vlanBypass: ~
-  # -- Configure the IP tracing option type.
-  # This option is used to specify the IP option type to use for tracing.
-  # The value must be an integer between 0 and 255.
-  # @schema
-  # type: [null, integer]
-  # minimum: 0
-  # maximum: 255
-  # @schema
-  monitorTraceIPOption: 0
-  # -- (bool) Disable ExternalIP mitigation (CVE-2020-8554)
-  # @default -- `false`
-  disableExternalIPMitigation: false
-  # -- (bool) Attach endpoint programs using tcx instead of legacy tc hooks on
-  # supported kernels.
-  # @default -- `true`
-  enableTCX: true
-  # -- (string) Mode for Pod devices for the core datapath (veth, netkit, netkit-l2).
-  # Note netkit is incompatible with TPROXY (`bpf.tproxy`).
-  # @default -- `veth`
-  datapathMode: veth
-# -- Enable BPF clock source probing for more efficient tick retrieval.
-bpfClockProbe: false
-# -- Clean all eBPF datapath state from the initContainer of the cilium-agent
-# DaemonSet.
-#
-# WARNING: Use with care!
-cleanBpfState: false
-# -- Clean all local Cilium state from the initContainer of the cilium-agent
-# DaemonSet. Implies cleanBpfState: true.
-#
-# WARNING: Use with care!
-cleanState: false
-# -- Wait for KUBE-PROXY-CANARY iptables rule to appear in "wait-for-kube-proxy"
-# init container before launching cilium-agent.
-# More context can be found in the commit message of below PR
-# https://github.com/cilium/cilium/pull/20123
-waitForKubeProxy: false
-cni:
-  # -- Install the CNI configuration and binary files into the filesystem.
-  install: true
-  # -- Remove the CNI configuration and binary files on agent shutdown. Enable this
-  # if you're removing Cilium from the cluster. Disable this to prevent the CNI
-  # configuration file from being removed during agent upgrade, which can cause
-  # nodes to go unmanageable.
-  uninstall: false
-  # @schema
-  # type: [null, string]
-  # @schema
-  # -- Configure chaining on top of other CNI plugins. Possible values:
-  #  - none
-  #  - aws-cni
-  #  - flannel
-  #  - generic-veth
-  #  - portmap
-  chainingMode: ~
-  # @schema
-  # type: [null, string]
-  # @schema
-  # -- A CNI network name in to which the Cilium plugin should be added as a chained plugin.
-  # This will cause the agent to watch for a CNI network with this network name. When it is
-  # found, this will be used as the basis for Cilium's CNI configuration file. If this is
-  # set, it assumes a chaining mode of generic-veth. As a special case, a chaining mode
-  # of aws-cni implies a chainingTarget of aws-cni.
-  chainingTarget: ~
-  # -- Make Cilium take ownership over the `/etc/cni/net.d` directory on the
-  # node, renaming all non-Cilium CNI configurations to `*.cilium_bak`.
-  # This ensures no Pods can be scheduled using other CNI plugins during Cilium
-  # agent downtime.
-  exclusive: true
-  # -- Configure the log file for CNI logging with retention policy of 7 days.
-  # Disable CNI file logging by setting this field to empty explicitly.
-  logFile: /var/run/cilium/cilium-cni.log
-  # -- Skip writing of the CNI configuration. This can be used if
-  # writing of the CNI configuration is performed by external automation.
-  customConf: false
-  # -- Configure the path to the CNI configuration directory on the host.
-  confPath: /etc/cni/net.d
-  # -- Configure the path to the CNI binary directory on the host.
-  binPath: /opt/cni/bin
-  # -- Specify the path to a CNI config to read from on agent start.
-  # This can be useful if you want to manage your CNI
-  # configuration outside of a Kubernetes environment. This parameter is
-  # mutually exclusive with the 'cni.configMap' parameter. The agent will
-  # write this to 05-cilium.conflist on startup.
-  # readCniConf: /host/etc/cni/net.d/05-sample.conflist.input
-
-  # -- When defined, configMap will mount the provided value as ConfigMap and
-  # interpret the 'cni.configMapKey' value as CNI configuration file and write it
-  # when the agent starts up.
-  configMap: ""
-
-  # -- Configure the key in the CNI ConfigMap to read the contents of
-  # the CNI configuration from. For this to be effective, the 'cni.configMap'
-  # parameter must be specified too.
-  # Note that the 'cni.configMap' parameter is the name of the ConfigMap, while
-  # 'cni.configMapKey' is the name of the key in the ConfigMap data containing
-  # the actual configuration.
-  configMapKey: cni-config
-  # -- Configure the path to where to mount the ConfigMap inside the agent pod.
-  confFileMountPath: /tmp/cni-configuration
-  # -- Configure the path to where the CNI configuration directory is mounted
-  # inside the agent pod.
-  hostConfDirMountPath: /host/etc/cni/net.d
-  # -- Specifies the resources for the cni initContainer
-  resources:
-    requests:
-      # @schema
-      # type: [integer, string]
-      # @schema
-      cpu: 100m
-      memory: 10Mi
-    limits:
-      # @schema
-      # type: [integer, string]
-      # @schema
-      cpu: 1
-      memory: 1Gi
-  # -- Enable route MTU for pod netns when CNI chaining is used
-  enableRouteMTUForCNIChaining: false
-  # -- Enable the removal of iptables rules created by the AWS CNI VPC plugin.
-  iptablesRemoveAWSRules: true
-# @schema
-# type: [null, number]
-# @schema
-# -- (float64) Ratio of the connectivity probe frequency vs resource usage, a float in
-# [0, 1]. 0 will give more frequent probing, 1 will give less frequent probing. Probing
-# frequency is dynamically adjusted based on the cluster size.
-# @default -- `0.5`
-connectivityProbeFrequencyRatio: ~
-# -- (string) Configure how frequently garbage collection should occur for the datapath
-# connection tracking table.
-# @default -- `"0s"`
-conntrackGCInterval: ""
-# -- (string) Configure the maximum frequency for the garbage collection of the
-# connection tracking table. Only affects the automatic computation for the frequency
-# and has no effect when 'conntrackGCInterval' is set. This can be set to more frequently
-# clean up unused identities created from ToFQDN policies.
-conntrackGCMaxInterval: ""
-# -- (string) Configure timeout in which Cilium will exit if CRDs are not available
-# @default -- `"5m"`
-crdWaitTimeout: ""
-daemon:
-  # -- Configure where Cilium runtime state should be stored.
-  runPath: "/var/run/cilium"
-  # @schema
-  # type: [null, string]
-  # @schema
-  # -- Configure a custom list of possible configuration override sources
-  # The default is "config-map:cilium-config,cilium-node-config". For supported
-  # values, see the help text for the build-config subcommand.
-  # Note that this value should be a comma-separated string.
-  configSources: ~
-  # @schema
-  # type: [null, string]
-  # @schema
-  # -- allowedConfigOverrides is a list of config-map keys that can be overridden.
-  # That is to say, if this value is set, config sources (excepting the first one) can
-  # only override keys in this list.
-  #
-  # This takes precedence over blockedConfigOverrides.
-  #
-  # By default, all keys may be overridden. To disable overrides, set this to "none" or
-  # change the configSources variable.
-  allowedConfigOverrides: ~
-  # @schema
-  # type: [null, string]
-  # @schema
-  # -- blockedConfigOverrides is a list of config-map keys that may not be overridden.
-  # In other words, if any of these keys appear in a configuration source excepting the
-  # first one, they will be ignored
-  #
-  # This is ignored if allowedConfigOverrides is set.
-  #
-  # By default, all keys may be overridden.
-  blockedConfigOverrides: ~
-  # @schema
-  # type: [null, boolean]
-  # @schema
-  # -- enableSourceIPVerification is a boolean flag to enable or disable the Source IP verification
-  # of endpoints. This flag is useful when Cilium is chained with other CNIs.
-  #
-  # By default, this functionality is enabled
-  enableSourceIPVerification: true
-
-# -- Configure temporary volume for cilium-agent
-tmpVolume: {}
-  # emptyDir:
-  #   sizeLimit: "100Mi"
-  #   medium: "Memory"
-
-# -- Specify which network interfaces can run the eBPF datapath. This means
-# that a packet sent from a pod to a destination outside the cluster will be
-# masqueraded (to an output device IPv4 address), if the output device runs the
-# program. When not specified, probing will automatically detect devices that have
-# a non-local route. This should be used only when autodetection is not suitable.
-# devices: ""
-
-# -- Forces the auto-detection of devices, even if specific devices are explicitly listed
-forceDeviceDetection: false
-
-# -- Chains to ignore when installing feeder rules.
-# disableIptablesFeederRules: ""
-
-# -- Limit iptables-based egress masquerading to interface selector.
-# egressMasqueradeInterfaces: ""
-
-# -- Enable setting identity mark for local traffic.
-# enableIdentityMark: true
-
-# -- CiliumEndpointSlice configuration options.
-ciliumEndpointSlice:
-  # -- Enable Cilium EndpointSlice feature.
-  enabled: false
-  # -- List of rate limit options to be used for the CiliumEndpointSlice controller.
-  # Each object in the list must have the following fields:
-  # nodes: Count of nodes at which to apply the rate limit.
-  # limit: The sustained request rate in requests per second. The maximum rate that can be configured is 50.
-  # burst: The burst request rate in requests per second. The maximum burst that can be configured is 100.
-  rateLimits:
-  - nodes: 0
-    limit: 10
-    burst: 20
-  - nodes: 100
-    limit: 50
-    burst: 100
-
-# @schema
-# enum: ["agent", "operator", "both"]
-# @schema
-# -- Control whether CiliumIdentities are created by the agent ("agent"), the operator ("operator") or both ("both").
-# "Both" should be used only to migrate between "agent" and "operator".
-# Operator-managed identities is a beta feature.
-identityManagementMode: "agent"
-
-envoyConfig:
-  # -- Enable CiliumEnvoyConfig CRD
-  # CiliumEnvoyConfig CRD can also be implicitly enabled by other options.
-  enabled: false
-  # -- SecretsNamespace is the namespace in which envoy SDS will retrieve secrets from.
-  secretsNamespace:
-    # -- Create secrets namespace for CiliumEnvoyConfig CRDs.
-    create: true
-    # -- The name of the secret namespace to which Cilium agents are given read access.
-    name: cilium-secrets
-  # -- Interval in which an attempt is made to reconcile failed EnvoyConfigs. If the duration is zero, the retry is deactivated.
-  retryInterval: 15s
-ingressController:
-  # -- Enable cilium ingress controller
-  # This will automatically set enable-envoy-config as well.
-  enabled: false
-  # -- Set cilium ingress controller to be the default ingress controller
-  # This will let cilium ingress controller route entries without ingress class set
-  default: false
-  # -- Default ingress load balancer mode
-  # Supported values: shared, dedicated
-  # For granular control, use the following annotations on the ingress resource:
-  # "ingress.cilium.io/loadbalancer-mode: dedicated" (or "shared").
-  loadbalancerMode: dedicated
-  # -- Enforce https for host having matching TLS host in Ingress.
-  # Incoming traffic to http listener will return 308 http error code with respective location in header.
-  enforceHttps: true
-  # -- Enable proxy protocol for all Ingress listeners. Note that _only_ Proxy protocol traffic will be accepted once this is enabled.
-  enableProxyProtocol: false
-  # -- IngressLBAnnotations are the annotation and label prefixes, which are used to filter annotations and/or labels to propagate from Ingress to the Load Balancer service
-  ingressLBAnnotationPrefixes: ['lbipam.cilium.io', 'nodeipam.cilium.io', 'service.beta.kubernetes.io', 'service.kubernetes.io', 'cloud.google.com']
-  # @schema
-  # type: [null, string]
-  # @schema
-  # -- Default secret namespace for ingresses without .spec.tls[].secretName set.
-  defaultSecretNamespace:
-  # @schema
-  # type: [null, string]
-  # @schema
-  # -- Default secret name for ingresses without .spec.tls[].secretName set.
-  defaultSecretName:
-  # -- SecretsNamespace is the namespace in which envoy SDS will retrieve TLS secrets from.
-  secretsNamespace:
-    # -- Create secrets namespace for Ingress.
-    create: true
-    # -- Name of Ingress secret namespace.
-    name: cilium-secrets
-    # -- Enable secret sync, which will make sure all TLS secrets used by Ingress are synced to secretsNamespace.name.
-    # If disabled, TLS secrets must be maintained externally.
-    sync: true
-  # -- Load-balancer service in shared mode.
-  # This is a single load-balancer service for all Ingress resources.
-  service:
-    # -- Service name
-    name: cilium-ingress
-    # -- Labels to be added for the shared LB service
-    labels: {}
-    # -- Annotations to be added for the shared LB service
-    annotations: {}
-    # -- Service type for the shared LB service
-    type: LoadBalancer
-    # @schema
-    # type: [null, integer]
-    # @schema
-    # -- Configure a specific nodePort for insecure HTTP traffic on the shared LB service
-    insecureNodePort: ~
-    # @schema
-    # type: [null, integer]
-    # @schema
-    # -- Configure a specific nodePort for secure HTTPS traffic on the shared LB service
-    secureNodePort: ~
-    # @schema
-    # type: [null, string]
-    # @schema
-    # -- Configure a specific loadBalancerClass on the shared LB service (requires Kubernetes 1.24+)
-    loadBalancerClass: ~
-    # @schema
-    # type: [null, string]
-    # @schema
-    # -- Configure a specific loadBalancerIP on the shared LB service
-    loadBalancerIP: ~
-    # @schema
-    # type: [null, boolean]
-    # @schema
-    # -- Configure if node port allocation is required for LB service
-    # ref: https://kubernetes.io/docs/concepts/services-networking/service/#load-balancer-nodeport-allocation
-    allocateLoadBalancerNodePorts: ~
-    # -- Control how traffic from external sources is routed to the LoadBalancer Kubernetes Service for Cilium Ingress in shared mode.
-    # Valid values are "Cluster" and "Local".
-    # ref: https://kubernetes.io/docs/reference/networking/virtual-ips/#external-traffic-policy
-    externalTrafficPolicy: Cluster
-  # Host Network related configuration
-  hostNetwork:
-    # -- Configure whether the Envoy listeners should be exposed on the host network.
-    enabled: false
-    # -- Configure a specific port on the host network that gets used for the shared listener.
-    sharedListenerPort: 8080
-    # Specify the nodes where the Ingress listeners should be exposed
-    nodes:
-      # -- Specify the labels of the nodes where the Ingress listeners should be exposed
-      #
-      # matchLabels:
-      #   kubernetes.io/os: linux
-      #   kubernetes.io/hostname: kind-worker
-      matchLabels: {}
-gatewayAPI:
-  # -- Enable support for Gateway API in cilium
-  # This will automatically set enable-envoy-config as well.
-  enabled: false
-  # -- Enable proxy protocol for all GatewayAPI listeners. Note that _only_ Proxy protocol traffic will be accepted once this is enabled.
-  enableProxyProtocol: false
-  # -- Enable Backend Protocol selection support (GEP-1911) for Gateway API via appProtocol.
-  enableAppProtocol: false
-  # -- Enable ALPN for all listeners configured with Gateway API. ALPN will attempt HTTP/2, then HTTP 1.1.
-  # Note that this will also enable `appProtocol` support, and services that wish to use HTTP/2 will need to indicate that via their `appProtocol`.
-  enableAlpn: false
-  # -- The number of additional GatewayAPI proxy hops from the right side of the HTTP header to trust when determining the origin client's IP address.
-  xffNumTrustedHops: 0
-  # -- Control how traffic from external sources is routed to the LoadBalancer Kubernetes Service for all Cilium GatewayAPI Gateway instances. Valid values are "Cluster" and "Local".
-  # Note that this value will be ignored when `hostNetwork.enabled == true`.
-  # ref: https://kubernetes.io/docs/reference/networking/virtual-ips/#external-traffic-policy
-  externalTrafficPolicy: Cluster
-
-  gatewayClass:
-    # -- Enable creation of GatewayClass resource
-    # The default value is 'auto' which decides according to presence of gateway.networking.k8s.io/v1/GatewayClass in the cluster.
-    # Other possible values are 'true' and 'false', which will either always or never create the GatewayClass, respectively.
-    create: auto
-
-  # -- SecretsNamespace is the namespace in which envoy SDS will retrieve TLS secrets from.
-  secretsNamespace:
-    # -- Create secrets namespace for Gateway API.
-    create: true
-    # -- Name of Gateway API secret namespace.
-    name: cilium-secrets
-    # -- Enable secret sync, which will make sure all TLS secrets used by Ingress are synced to secretsNamespace.name.
-    # If disabled, TLS secrets must be maintained externally.
-    sync: true
-  # Host Network related configuration
-  hostNetwork:
-    # -- Configure whether the Envoy listeners should be exposed on the host network.
-    enabled: false
-    # Specify the nodes where the Ingress listeners should be exposed
-    nodes:
-      # -- Specify the labels of the nodes where the Ingress listeners should be exposed
-      #
-      # matchLabels:
-      #   kubernetes.io/os: linux
-      #   kubernetes.io/hostname: kind-worker
-      matchLabels: {}
-
-# -- Enables the fallback compatibility solution for when the xt_socket kernel
-# module is missing and it is needed for the datapath L7 redirection to work
-# properly. See documentation for details on when this can be disabled:
-# https://docs.cilium.io/en/stable/operations/system_requirements/#linux-kernel.
-enableXTSocketFallback: true
-encryption:
-  # -- Enable transparent network encryption.
-  enabled: false
-  # -- Encryption method. Can be one of ipsec, wireguard or ztunnel.
-  type: ipsec
-  # -- Enable encryption for pure node to node traffic.
-  # This option is only effective when encryption.type is set to "wireguard".
-  nodeEncryption: false
-  # -- Configure the Encryption Pod2Pod strict mode.
-  strictMode:
-    # -- Enable Encryption Pod2Pod strict mode. (deprecated: please use encryption.strictMode.egress.enabled)
-    enabled: false
-    # -- CIDR for the Encryption Pod2Pod strict mode. (deprecated: please use encryption.strictMode.egress.cidr)
-    cidr: ""
-    # -- Allow dynamic lookup of remote node identities. (deprecated: please use encryption.strictMode.egress.allowRemoteNodeIdentities)
-    # This is required when tunneling is used or direct routing is used and the node CIDR and pod CIDR overlap.
-    allowRemoteNodeIdentities: false
-    egress:
-      # -- Enable strict egress encryption.
-      enabled: false
-      # -- CIDR for the Encryption Pod2Pod strict egress mode.
-      cidr: ""
-      # -- Allow dynamic lookup of remote node identities.
-      # This is required when tunneling is used or direct routing is used and the node CIDR and pod CIDR overlap.
-      allowRemoteNodeIdentities: false
-    ingress:
-      # -- Enable strict ingress encryption.
-      # When enabled, all unencrypted overlay ingress traffic will be dropped.
-      # This option is only applicable when WireGuard and tunneling are enabled.
-      enabled: false
-  ipsec:
-    # -- Name of the key file inside the Kubernetes secret configured via secretName.
-    keyFile: keys
-    # -- Path to mount the secret inside the Cilium pod.
-    mountPath: /etc/ipsec
-    # -- Name of the Kubernetes secret containing the encryption keys.
-    secretName: cilium-ipsec-keys
-    # -- The interface to use for encrypted traffic.
-    interface: ""
-    # -- Enable the key watcher. If disabled, a restart of the agent will be
-    # necessary on key rotations.
-    keyWatcher: true
-    # -- Maximum duration of the IPsec key rotation. The previous key will be
-    # removed after that delay.
-    keyRotationDuration: "5m"
-    # -- Enable IPsec encrypted overlay
-    encryptedOverlay: false
-  wireguard:
-    # -- Controls WireGuard PersistentKeepalive option. Set 0s to disable.
-    persistentKeepalive: 0s
-  # -- ztunnel encryption configuration.
-  # ztunnel is Istio's purpose-built, per-node proxy for handling L4 traffic in ambient mesh mode.
-  # These settings only apply when encryption.type is set to "ztunnel".
-  ztunnel:
-    # -- ztunnel container image.
-    image:
-      # @schema
-      # type: [null, string]
-      # @schema
-      override: ~
-      repository: "docker.io/istio/ztunnel"
-      tag: "1.28.0-distroless"
-      pullPolicy: "IfNotPresent"
-      # @schema
-      # type: [null, string]
-      # @schema
-      digest: ~
-      useDigest: false
-    # -- CA server address for certificate requests.
-    caAddress: "https://localhost:15012"
-    # -- TCP port for the health API.
-    healthPort: 15021
-    # -- ztunnel resource limits & requests.
-    resources:
-      requests:
-        cpu: 200m
-        memory: 512Mi
-    # -- ztunnel update strategy.
-    updateStrategy:
-      type: RollingUpdate
-      rollingUpdate:
-        maxSurge: 1
-        maxUnavailable: 0
-    # -- Configure termination grace period for ztunnel DaemonSet.
-    terminationGracePeriodSeconds: 30
-    # -- Readiness probe configuration.
-    readinessProbe:
-      initialDelaySeconds: 0
-      periodSeconds: 10
-      failureThreshold: 3
-    # -- Node selector for ztunnel pods.
-    nodeSelector:
-      kubernetes.io/os: linux
-    # -- Node tolerations for ztunnel scheduling.
-    tolerations:
-      - effect: NoSchedule
-        operator: Exists
-      - key: CriticalAddonsOnly
-        operator: Exists
-      - effect: NoExecute
-        operator: Exists
-    # -- Affinity for ztunnel pods.
-    affinity: {}
-    # @schema
-    # type: [null, string]
-    # @schema
-    # -- The priority class to use for ztunnel pods.
-    priorityClassName: ~
-    # -- Annotations to be added to all ztunnel resources.
-    annotations: {}
-    # -- Annotations to be added to ztunnel pods.
-    podAnnotations: {}
-    # -- Labels to be added to ztunnel pods.
-    podLabels: {}
-    # -- Additional ztunnel container environment variables.
-    extraEnv: []
-    # -- Additional ztunnel volumes.
-    extraVolumes: []
-    # -- Additional ztunnel volumeMounts.
-    extraVolumeMounts: []
-    # -- ztunnel secrets configuration.
-    secrets:
-      # -- Base64-encoded bootstrap root certificate content.
-      # If not provided, the secret must be created manually before deploying.
-      # @schema
-      # type: [null, string]
-      # @schema
-      bootstrapRootCert: ~
-endpointHealthChecking:
-  # -- Enable connectivity health checking between virtual endpoints.
-  enabled: true
-# -- Max duration to wait for envoy to respond to configuration changes. Default "10s".
-endpointPolicyUpdateTimeoutDuration: null
-endpointRoutes:
-  # @schema
-  # type: [boolean, string]
-  # @schema
-  # -- Enable use of per endpoint routes instead of routing via
-  # the cilium_host interface.
-  enabled: false
-k8sNetworkPolicy:
-  # -- Enable support for K8s NetworkPolicy
-  enabled: true
-# -- Enable endpoint lockdown on policy map overflow.
-endpointLockdownOnMapOverflow: false
-eni:
-  # -- Enable Elastic Network Interface (ENI) integration.
-  enabled: false
-  # -- Release IPs not used from the ENI
-  awsReleaseExcessIPs: false
-  # -- Enable ENI prefix delegation
-  awsEnablePrefixDelegation: false
-  # -- EC2 API endpoint to use
-  ec2APIEndpoint: ""
-  # -- Tags to apply to the newly created ENIs
-  eniTags: {}
-  # -- Interval for garbage collection of unattached ENIs. Set to "0s" to disable.
-  # @default -- `"5m"`
-  gcInterval: ""
-  # -- Additional tags attached to ENIs created by Cilium.
-  # Dangling ENIs with this tag will be garbage collected
-  # @default -- `{"io.cilium/cilium-managed":"true,"io.cilium/cluster-name":"<auto-detected>"}`
-  gcTags: {}
-  # -- If using IAM role for Service Accounts will not try to
-  # inject identity values from cilium-aws kubernetes secret.
-  # Adds annotation to service account if managed by Helm.
-  # See https://github.com/aws/amazon-eks-pod-identity-webhook
-  iamRole: ""
-  # -- Filter via subnet IDs which will dictate which subnets are going to be used to create new ENIs
-  # Important note: This requires that each instance has an ENI with a matching subnet attached
-  # when Cilium is deployed. If you only want to control subnets for ENIs attached by Cilium,
-  # use the CNI configuration file settings (cni.customConf) instead.
-  subnetIDsFilter: []
-  # -- Filter via tags (k=v) which will dictate which subnets are going to be used to create new ENIs
-  # Important note: This requires that each instance has an ENI with a matching subnet attached
-  # when Cilium is deployed. If you only want to control subnets for ENIs attached by Cilium,
-  # use the CNI configuration file settings (cni.customConf) instead.
-  subnetTagsFilter: []
-  # -- Filter via AWS EC2 Instance tags (k=v) which will dictate which AWS EC2 Instances
-  # are going to be used to create new ENIs
-  instanceTagsFilter: []
-  # -- NodeSpec configuration for the ENI
-  nodeSpec:
-    # -- First interface index to use for IP allocation
-    # @schema
-    # type: [null, integer]
-    # @schema
-    firstInterfaceIndex: ~
-    # -- Subnet IDs to use for IP allocation
-    subnetIDs: []
-    # -- Subnet tags to use for IP allocation
-    subnetTags: []
-    # -- Security groups to use for IP allocation
-    securityGroups: []
-    # -- Security group tags to use for IP allocation
-    securityGroupTags: []
-    # -- Exclude interface tags to use for IP allocation
-    excludeInterfaceTags: []
-    # -- Use primary address for IP allocation
-    usePrimaryAddress: false
-    # -- Disable prefix delegation for IP allocation
-    disablePrefixDelegation: false
-    # -- Delete ENI on termination
-    # @schema
-    # type: [null, boolean]
-    # @schema
-    deleteOnTermination: ~
-
-# fragmentTracking enables IPv4 fragment tracking support in the datapath.
-# fragmentTracking: true
-gke:
-  # -- Enable Google Kubernetes Engine integration
-  enabled: false
-# -- Enable connectivity health checking.
-healthChecking: true
-# -- TCP port for the agent health API. This is not the port for cilium-health.
-healthPort: 9879
-# -- Number of ICMP requests sent for each health check before marking a node or endpoint unreachable.
-healthCheckICMPFailureThreshold: 3
-# -- Configure the host firewall.
-hostFirewall:
-  # -- Enables the enforcement of host policies in the eBPF datapath.
-  enabled: false
-# -- Enable routing to a service that has zero endpoints
-enableNoServiceEndpointsRoutable: true
-# -- Configure socket LB
-socketLB:
-  # -- Enable socket LB
-  enabled: false
-  # -- Disable socket lb for non-root ns. This is used to enable Istio routing rules.
-  # hostNamespaceOnly: false
-  # -- Enable terminating pod connections to deleted service backends.
-  # terminatePodConnections: true
-  # -- Enables tracing for socket-based load balancing.
-  # tracing: true
-# -- Configure certificate generation for Hubble integration.
-# If hubble.tls.auto.method=cronJob, these values are used
-# for the Kubernetes CronJob which will be scheduled regularly to
-# (re)generate any certificates not provided manually.
-certgen:
-  # -- When set to true the certificate authority secret is created.
-  generateCA: true
-  image:
-    # @schema
-    # type: [null, string]
-    # @schema
-    override: ~
-    repository: "${CERTGEN_REPO}"
-    tag: "${CERTGEN_VERSION}"
-    digest: "${CERTGEN_DIGEST}"
-    useDigest: true
-    pullPolicy: "${PULL_POLICY}"
-  # @schema
-  # type: [null, integer]
-  # @schema
-  # -- Seconds after which the completed job pod will be deleted
-  ttlSecondsAfterFinished: null
-  # -- Labels to be added to hubble-certgen pods
-  podLabels: {}
-  # -- Annotations to be added to the hubble-certgen initial Job and CronJob
-  annotations:
-    job: {}
-    cronJob: {}
-  # -- Node selector for certgen
-  # ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector
-  nodeSelector: {}
-  # -- Priority class for certgen
-  # ref: https://kubernetes.io/docs/concepts/scheduling-eviction/pod-priority-preemption/#priorityclass
-  priorityClassName: ""
-  # -- Node tolerations for pod assignment on nodes with taints
-  # ref: https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/
-  tolerations: []
-  # -- Resource limits for certgen
-  # ref: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers
-  resources: {}
-  # -- Additional certgen volumes.
-  extraVolumes: []
-  # -- Additional certgen volumeMounts.
-  extraVolumeMounts: []
-  # -- Affinity for certgen
-  affinity: {}
-  cronJob:
-    # -- The number of successful finished jobs to keep
-    successfulJobsHistoryLimit: 3
-    # -- The number of failed finished jobs to keep
-    failedJobsHistoryLimit: 1
-hubble:
-  # -- Enable Hubble (true by default).
-  enabled: true
-  # -- Annotations to be added to all top-level hubble objects (resources under templates/hubble)
-  annotations: {}
-  # -- Buffer size of the channel Hubble uses to receive monitor events. If this
-  # value is not set, the queue size is set to the default monitor queue size.
-  # eventQueueSize: ""
-
-  # -- Number of recent flows for Hubble to cache. Defaults to 4095.
-  # Possible values are:
-  #   1, 3, 7, 15, 31, 63, 127, 255, 511, 1023,
-  #   2047, 4095, 8191, 16383, 32767, 65535
-  # eventBufferCapacity: "4095"
-
-  # -- The interval at which Hubble will send out lost events from the Observer server, if any.
-  # lostEventSendInterval: 1s
-
-  # -- Hubble metrics configuration.
-  # See https://docs.cilium.io/en/stable/observability/metrics/#hubble-metrics
-  # for more comprehensive documentation about Hubble metrics.
-  metrics:
-    # @schema
-    # type: [null, array]
-    # @schema
-    # -- Configures the list of metrics to collect. If empty or null, metrics
-    # are disabled.
-    # Example:
-    #
-    #   enabled:
-    #   - dns:query;ignoreAAAA
-    #   - drop
-    #   - tcp
-    #   - flow
-    #   - icmp
-    #   - http
-    #
-    # You can specify the list of metrics from the helm CLI:
-    #
-    #   --set hubble.metrics.enabled="{dns:query;ignoreAAAA,drop,tcp,flow,icmp,http}"
-    #
-    enabled: ~
-    # -- Enables exporting hubble metrics in OpenMetrics format.
-    enableOpenMetrics: false
-    # -- Configure the port the hubble metric server listens on.
-    port: 9965
-    tls:
-      # Enable hubble metrics server TLS.
-      enabled: false
-      # Configure hubble metrics server TLS.
-      server:
-        # -- Name of the Secret containing the certificate and key for the Hubble metrics server.
-        # If specified, cert and key are ignored.
-        existingSecret: ""
-        # -- base64 encoded PEM values for the Hubble metrics server certificate (deprecated).
-        # Use existingSecret instead.
-        cert: ""
-        # -- base64 encoded PEM values for the Hubble metrics server key (deprecated).
-        # Use existingSecret instead.
-        key: ""
-        # -- Extra DNS names added to certificate when it's auto generated
-        extraDnsNames: []
-        # -- Extra IP addresses added to certificate when it's auto generated
-        extraIpAddresses: []
-        # -- Configure mTLS for the Hubble metrics server.
-        mtls:
-          # When set to true enforces mutual TLS between Hubble Metrics server and its clients.
-          # False allow non-mutual TLS connections.
-          # This option has no effect when TLS is disabled.
-          enabled: false
-          useSecret: false
-          # -- Name of the ConfigMap containing the CA to validate client certificates against.
-          # If mTLS is enabled and this is unspecified, it will default to the
-          # same CA used for Hubble metrics server certificates.
-          name: ~
-          # -- Entry of the ConfigMap containing the CA.
-          key: ca.crt
-    # -- Annotations to be added to hubble-metrics service.
-    serviceAnnotations: {}
-    serviceMonitor:
-      # -- Create ServiceMonitor resources for Prometheus Operator.
-      # This requires the prometheus CRDs to be available.
-      # ref: https://github.com/prometheus-operator/prometheus-operator/blob/main/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml)
-      enabled: false
-      # -- Labels to add to ServiceMonitor hubble
-      labels: {}
-      # -- Annotations to add to ServiceMonitor hubble
-      annotations: {}
-      # -- jobLabel to add for ServiceMonitor hubble
-      jobLabel: ""
-      # -- Interval for scrape metrics.
-      interval: "10s"
-      # @schema
-      # type: [null, string]
-      # @schema
-      # -- Timeout after which scrape is considered to be failed.
-      scrapeTimeout: ~
-      # -- Relabeling configs for the ServiceMonitor hubble
-      relabelings:
-        - sourceLabels:
-            - __meta_kubernetes_pod_node_name
-          targetLabel: node
-          action: replace
-          replacement: ${1}
-      # @schema
-      # type: [null, array]
-      # @schema
-      # -- Metrics relabeling configs for the ServiceMonitor hubble
-      metricRelabelings: ~
-      # Configure TLS for the ServiceMonitor.
-      # Note, when using TLS you will either need to specify
-      # tlsConfig.insecureSkipVerify or specify a CA to use.
-      tlsConfig: {}
-    # -- Grafana dashboards for hubble
-    # grafana can import dashboards based on the label and value
-    # ref: https://github.com/grafana/helm-charts/tree/main/charts/grafana#sidecar-for-dashboards
-    dashboards:
-      enabled: false
-      label: grafana_dashboard
-      # @schema
-      # type: [null, string]
-      # @schema
-      namespace: ~
-      labelValue: "1"
-      annotations: {}
-    # Dynamic metrics  may be reconfigured without a need of agent restarts.
-    dynamic:
-      enabled: false
-      config:
-        # ---- Name of configmap with configuration that may be altered to reconfigure metric handlers within a running agent.
-        configMapName: cilium-dynamic-metrics-config
-        # ---- True if helm installer should create config map.
-        # Switch to false if you want to self maintain the file content.
-        createConfigMap: true
-        # ---- Exporters configuration in YAML format.
-        content: []
-        # - name: dns
-        #   contextOptions: []
-        #   includeFilters: []
-        #   excludeFilters: []
-  # -- Unix domain socket path to listen to when Hubble is enabled.
-  socketPath: /var/run/cilium/hubble.sock
-  # -- Enables network policy correlation of Hubble flows, i.e. populating `egress_allowed_by`, `ingress_denied_by` fields with policy information.
-  networkPolicyCorrelation:
-    # @default -- `true`
-    enabled: true
-  # -- Enables redacting sensitive information present in Layer 7 flows.
-  redact:
-    enabled: false
-    http:
-      # -- Enables redacting URL query (GET) parameters.
-      # Example:
-      #
-      #   redact:
-      #     enabled: true
-      #     http:
-      #       urlQuery: true
-      #
-      # You can specify the options from the helm CLI:
-      #
-      #   --set hubble.redact.enabled="true"
-      #   --set hubble.redact.http.urlQuery="true"
-      urlQuery: false
-      # -- Enables redacting user info, e.g., password when basic auth is used.
-      # Example:
-      #
-      #   redact:
-      #     enabled: true
-      #     http:
-      #       userInfo: true
-      #
-      # You can specify the options from the helm CLI:
-      #
-      #   --set hubble.redact.enabled="true"
-      #   --set hubble.redact.http.userInfo="true"
-      userInfo: true
-      headers:
-        # -- List of HTTP headers to allow: headers not matching will be redacted. Note: `allow` and `deny` lists cannot be used both at the same time, only one can be present.
-        # Example:
-        #   redact:
-        #     enabled: true
-        #     http:
-        #       headers:
-        #         allow:
-        #           - traceparent
-        #           - tracestate
-        #           - Cache-Control
-        #
-        # You can specify the options from the helm CLI:
-        #   --set hubble.redact.enabled="true"
-        #   --set hubble.redact.http.headers.allow="traceparent,tracestate,Cache-Control"
-        allow: []
-        # -- List of HTTP headers to deny: matching headers will be redacted. Note: `allow` and `deny` lists cannot be used both at the same time, only one can be present.
-        # Example:
-        #   redact:
-        #     enabled: true
-        #     http:
-        #       headers:
-        #         deny:
-        #           - Authorization
-        #           - Proxy-Authorization
-        #
-        # You can specify the options from the helm CLI:
-        #   --set hubble.redact.enabled="true"
-        #   --set hubble.redact.http.headers.deny="Authorization,Proxy-Authorization"
-        deny: []
-    kafka:
-      # -- Enables redacting Kafka's API key (deprecated, will be removed in v1.19).
-      # Example:
-      #
-      #   redact:
-      #     enabled: true
-      #     kafka:
-      #       apiKey: true
-      #
-      # You can specify the options from the helm CLI:
-      #
-      #   --set hubble.redact.enabled="true"
-      #   --set hubble.redact.kafka.apiKey="true"
-      apiKey: true
-  # -- An additional address for Hubble to listen to.
-  # Set this field ":4244" if you are enabling Hubble Relay, as it assumes that
-  # Hubble is listening on port 4244.
-  listenAddress: ":4244"
-  # -- Whether Hubble should prefer to announce IPv6 or IPv4 addresses if both are available.
-  preferIpv6: false
-  # @schema
-  # type: [null, boolean]
-  # @schema
-  # -- (bool) Skip Hubble events with unknown cgroup ids
-  # @default -- `true`
-  skipUnknownCGroupIDs: ~
-  peerService:
-    # -- Service Port for the Peer service.
-    # If not set, it is dynamically assigned to port 443 if TLS is enabled and to
-    # port 80 if not.
-    # servicePort: 80
-    # -- Target Port for the Peer service, must match the hubble.listenAddress'
-    # port.
-    targetPort: 4244
-    # -- The cluster domain to use to query the Hubble Peer service. It should
-    # be the local cluster.
-    clusterDomain: cluster.local
-  # -- TLS configuration for Hubble
-  tls:
-    # -- Enable mutual TLS for listenAddress. Setting this value to false is
-    # highly discouraged as the Hubble API provides access to potentially
-    # sensitive network flow metadata and is exposed on the host network.
-    enabled: true
-    # -- Configure automatic TLS certificates generation.
-    auto:
-      # -- Auto-generate certificates.
-      # When set to true, automatically generate a CA and certificates to
-      # enable mTLS between Hubble server and Hubble Relay instances. If set to
-      # false, the certs for Hubble server need to be provided by setting
-      # appropriate values below.
-      enabled: true
-      # -- Set the method to auto-generate certificates. Supported values:
-      # - helm:         This method uses Helm to generate all certificates.
-      # - cronJob:      This method uses a Kubernetes CronJob the generate any
-      #                 certificates not provided by the user at installation
-      #                 time.
-      # - certmanager:  This method use cert-manager to generate & rotate certificates.
-      method: helm
-      # -- Generated certificates validity duration in days.
-      #
-      # Defaults to 365 days (1 year) because MacOS does not accept
-      # self-signed certificates with expirations > 825 days.
-      certValidityDuration: 365
-      # -- Schedule for certificates regeneration (regardless of their expiration date).
-      # Only used if method is "cronJob". If nil, then no recurring job will be created.
-      # Instead, only the one-shot job is deployed to generate the certificates at
-      # installation time.
-      #
-      # Defaults to midnight of the first day of every fourth month. For syntax, see
-      # https://kubernetes.io/docs/concepts/workloads/controllers/cron-jobs/#schedule-syntax
-      schedule: "0 0 1 */4 *"
-      # [Example]
-      # certManagerIssuerRef:
-      #   group: cert-manager.io
-      #   kind: ClusterIssuer
-      #   name: ca-issuer
-      # -- certmanager issuer used when hubble.tls.auto.method=certmanager.
-      certManagerIssuerRef: {}
-    # -- The Hubble server certificate and private key
-    server:
-      # -- Name of the Secret containing the certificate and key for the Hubble server.
-      # If specified, cert and key are ignored.
-      existingSecret: ""
-      # -- base64 encoded PEM values for the Hubble server certificate (deprecated).
-      # Use existingSecret instead.
-      cert: ""
-      # -- base64 encoded PEM values for the Hubble server key (deprecated).
-      # Use existingSecret instead.
-      key: ""
-      # -- Extra DNS names added to certificate when it's auto generated
-      extraDnsNames: []
-      # -- Extra IP addresses added to certificate when it's auto generated
-      extraIpAddresses: []
-  relay:
-    # -- Enable Hubble Relay (requires hubble.enabled=true)
-    enabled: false
-    # -- Roll out Hubble Relay pods automatically when configmap is updated.
-    rollOutPods: false
-    # -- Hubble-relay container image.
-    image:
-      # @schema
-      # type: [null, string]
-      # @schema
-      override: ~
-      repository: "${HUBBLE_RELAY_REPO}"
-      tag: "${CILIUM_VERSION}"
-      # hubble-relay-digest
-      digest: ${HUBBLE_RELAY_DIGEST}
-      useDigest: ${USE_DIGESTS}
-      pullPolicy: "${PULL_POLICY}"
-    # -- Specifies the resources for the hubble-relay pods
-    resources: {}
-    # -- Number of replicas run for the hubble-relay deployment.
-    replicas: 1
-    # -- Affinity for hubble-replay
-    affinity:
-      podAffinity:
-        requiredDuringSchedulingIgnoredDuringExecution:
-          - topologyKey: kubernetes.io/hostname
-            labelSelector:
-              matchLabels:
-                k8s-app: cilium
-    # -- Pod topology spread constraints for hubble-relay
-    topologySpreadConstraints: []
-    #   - maxSkew: 1
-    #     topologyKey: topology.kubernetes.io/zone
-    #     whenUnsatisfiable: DoNotSchedule
-
-    # -- Node labels for pod assignment
-    # ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector
-    nodeSelector:
-      kubernetes.io/os: linux
-    # -- Node tolerations for pod assignment on nodes with taints
-    # ref: https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/
-    tolerations: []
-    # -- Additional hubble-relay environment variables.
-    extraEnv: []
-    # -- Annotations to be added to all top-level hubble-relay objects (resources under templates/hubble-relay)
-    annotations: {}
-    # -- Annotations to be added to hubble-relay pods
-    podAnnotations: {}
-    # -- Labels to be added to hubble-relay pods
-    podLabels: {}
-    # PodDisruptionBudget settings
-    podDisruptionBudget:
-      # -- enable PodDisruptionBudget
-      # ref: https://kubernetes.io/docs/concepts/workloads/pods/disruptions/
-      enabled: false
-      # @schema
-      # type: [null, integer, string]
-      # @schema
-      # -- Minimum number/percentage of pods that should remain scheduled.
-      # When it's set, maxUnavailable must be disabled by `maxUnavailable: null`
-      minAvailable: null
-      # @schema
-      # type: [null, integer, string]
-      # @schema
-      # -- Maximum number/percentage of pods that may be made unavailable
-      maxUnavailable: 1
-      # @schema
-      # type: [null, string]
-      # @schema
-      # -- How are unhealthy, but running, pods counted for eviction
-      unhealthyPodEvictionPolicy: null
-    # -- The priority class to use for hubble-relay
-    priorityClassName: ""
-    # -- Configure termination grace period for hubble relay Deployment.
-    terminationGracePeriodSeconds: 1
-    # -- hubble-relay update strategy
-    updateStrategy:
-      type: RollingUpdate
-      rollingUpdate:
-        # @schema
-        # type: [integer, string]
-        # @schema
-        maxUnavailable: 1
-    # -- Additional hubble-relay volumes.
-    extraVolumes: []
-    # -- Additional hubble-relay volumeMounts.
-    extraVolumeMounts: []
-    # -- hubble-relay pod security context
-    podSecurityContext:
-      fsGroup: 65532
-      seccompProfile:
-        type: RuntimeDefault
-    # -- hubble-relay container security context
-    securityContext:
-      # readOnlyRootFilesystem: true
-      allowPrivilegeEscalation: false
-      runAsNonRoot: true
-      runAsUser: 65532
-      runAsGroup: 65532
-      seccompProfile:
-        type: RuntimeDefault
-      capabilities:
-        drop:
-          - ALL
-    # -- hubble-relay service configuration.
-    service:
-      # --- The type of service used for Hubble Relay access, either ClusterIP, NodePort or LoadBalancer.
-      type: ClusterIP
-      # --- The port to use when the service type is set to NodePort.
-      nodePort: 31234
-    # -- Host to listen to. Specify an empty string to bind to all the interfaces.
-    listenHost: ""
-    # -- Port to listen to.
-    listenPort: "4245"
-    # -- TLS configuration for Hubble Relay
-    tls:
-      # -- The hubble-relay client certificate and private key.
-      # This keypair is presented to Hubble server instances for mTLS
-      # authentication and is required when hubble.tls.enabled is true.
-      # These values need to be set manually if hubble.tls.auto.enabled is false.
-      client:
-        # -- Name of the Secret containing the certificate and key for the Hubble metrics server.
-        # If specified, cert and key are ignored.
-        existingSecret: ""
-        # -- base64 encoded PEM values for the Hubble relay client certificate (deprecated).
-        # Use existingSecret instead.
-        cert: ""
-        # -- base64 encoded PEM values for the Hubble relay client key (deprecated).
-        # Use existingSecret instead.
-        key: ""
-      # -- The hubble-relay server certificate and private key
-      server:
-        # When set to true, enable TLS on for Hubble Relay server
-        # (ie: for clients connecting to the Hubble Relay API).
-        enabled: false
-        # When set to true enforces mutual TLS between Hubble Relay server and its clients.
-        # False allow non-mutual TLS connections.
-        # This option has no effect when TLS is disabled.
-        mtls: false
-        # -- Name of the Secret containing the certificate and key for the Hubble relay server.
-        # If specified, cert and key are ignored.
-        existingSecret: ""
-        # -- base64 encoded PEM values for the Hubble relay server certificate (deprecated).
-        # Use existingSecret instead.
-        cert: ""
-        # -- base64 encoded PEM values for the Hubble relay server key (deprecated).
-        # Use existingSecret instead.
-        key: ""
-        # -- extra DNS names added to certificate when its auto gen
-        extraDnsNames: []
-        # -- extra IP addresses added to certificate when its auto gen
-        extraIpAddresses: []
-        # DNS name used by the backend to connect to the relay
-        # This is a simple workaround as the relay certificates are currently hardcoded to
-        # *.hubble-relay.cilium.io
-        # See https://github.com/cilium/cilium/pull/28709#discussion_r1371792546
-        # For GKE Dataplane V2 this should be set to relay.kube-system.svc.cluster.local
-        relayName: "ui.hubble-relay.cilium.io"
-    # @schema
-    # type: [null, string]
-    # @schema
-    # -- Backoff duration to retry connecting to the local hubble instance in case of failure (e.g. "30s").
-    retryTimeout: ~
-    # @schema
-    # type: [null, integer]
-    # @schema
-    # -- (int) Max number of flows that can be buffered for sorting before being sent to the
-    # client (per request) (e.g. 100).
-    sortBufferLenMax: ~
-    # @schema
-    # type: [null, string]
-    # @schema
-    # -- When the per-request flows sort buffer is not full, a flow is drained every
-    # time this timeout is reached (only affects requests in follow-mode) (e.g. "1s").
-    sortBufferDrainTimeout: ~
-    # -- Port to use for the k8s service backed by hubble-relay pods.
-    # If not set, it is dynamically assigned to port 443 if TLS is enabled and to
-    # port 80 if not.
-    # servicePort: 80
-
-    # -- Enable prometheus metrics for hubble-relay on the configured port at
-    # /metrics
-    prometheus:
-      enabled: false
-      port: 9966
-      serviceMonitor:
-        # -- Enable service monitors.
-        # This requires the prometheus CRDs to be available (see https://github.com/prometheus-operator/prometheus-operator/blob/main/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml)
-        enabled: false
-        # -- Labels to add to ServiceMonitor hubble-relay
-        labels: {}
-        # -- Annotations to add to ServiceMonitor hubble-relay
-        annotations: {}
-        # -- Interval for scrape metrics.
-        interval: "10s"
-        # @schema
-        # type: [null, string]
-        # @schema
-        # -- Timeout after which scrape is considered to be failed.
-        scrapeTimeout: ~
-        # -- Specify the Kubernetes namespace where Prometheus expects to find
-        # service monitors configured.
-        # namespace: ""
-        # @schema
-        # type: [null, array]
-        # @schema
-        # -- Relabeling configs for the ServiceMonitor hubble-relay
-        relabelings: ~
-        # @schema
-        # type: [null, array]
-        # @schema
-        # -- Metrics relabeling configs for the ServiceMonitor hubble-relay
-        metricRelabelings: ~
-    gops:
-      # -- Enable gops for hubble-relay
-      enabled: true
-      # -- Configure gops listen port for hubble-relay
-      port: 9893
-    pprof:
-      # -- Enable pprof for hubble-relay
-      enabled: false
-      # -- Configure pprof listen address for hubble-relay
-      address: localhost
-      # -- Configure pprof listen port for hubble-relay
-      port: 6062
-      # -- Enable mutex contention profiling for hubble-relay and set the fraction of sampled events (set to 1 to sample all events)
-      mutexProfileFraction: 0
-      # -- Enable goroutine blocking profiling for hubble-relay and set the rate of sampled events in nanoseconds (set to 1 to sample all events [warning: performance overhead])
-      blockProfileRate: 0
-    # -- Logging configuration for hubble-relay.
-    logOptions:
-      # @schema
-      # type: [null, string]
-      # @schema
-      # -- Log format for hubble-relay. Valid values are: text, text-ts, json, json-ts.
-      # @default -- text-ts
-      format: ~
-      # @schema
-      # type: [null, string]
-      # @schema
-      # -- Log level for hubble-relay. Valid values are: debug, info, warn, error.
-      # @default -- info
-      level: ~
-  ui:
-    # -- Whether to enable the Hubble UI.
-    enabled: false
-    standalone:
-      # -- When true, it will allow installing the Hubble UI only, without checking dependencies.
-      # It is useful if a cluster already has cilium and Hubble relay installed and you just
-      # want Hubble UI to be deployed.
-      # When installed via helm, installing UI should be done via `helm upgrade` and when installed via the cilium cli, then `cilium hubble enable --ui`
-      enabled: false
-      tls:
-        # -- When deploying Hubble UI in standalone, with tls enabled for Hubble relay, it is required
-        # to provide a volume for mounting the client certificates.
-        certsVolume: {}
-        #   projected:
-        #     defaultMode: 0400
-        #     sources:
-        #     - secret:
-        #         name: hubble-ui-client-certs
-        #         items:
-        #         - key: tls.crt
-        #           path: client.crt
-        #         - key: tls.key
-        #           path: client.key
-        #         - key: ca.crt
-        #           path: hubble-relay-ca.crt
-    # -- Roll out Hubble-ui pods automatically when configmap is updated.
-    rollOutPods: false
-    tls:
-      client:
-        # -- Name of the Secret containing the client certificate and key for Hubble UI
-        # If specified, cert and key are ignored.
-        existingSecret: ""
-        # -- base64 encoded PEM values for the Hubble UI client certificate (deprecated).
-        # Use existingSecret instead.
-        cert: ""
-        # -- base64 encoded PEM values for the Hubble UI client key (deprecated).
-        # Use existingSecret instead.
-        key: ""
-    backend:
-      # -- Hubble-ui backend image.
-      image:
-        # @schema
-        # type: [null, string]
-        # @schema
-        override: ~
-        repository: "${HUBBLE_UI_BACKEND_REPO}"
-        tag: "${HUBBLE_UI_BACKEND_VERSION}"
-        digest: "${HUBBLE_UI_BACKEND_DIGEST}"
-        useDigest: true
-        pullPolicy: "${PULL_POLICY}"
-      # -- Hubble-ui backend security context.
-      securityContext:
-        allowPrivilegeEscalation: false
-      # -- Additional hubble-ui backend environment variables.
-      extraEnv: []
-      # -- Additional hubble-ui backend volumes.
-      extraVolumes: []
-      # -- Additional hubble-ui backend volumeMounts.
-      extraVolumeMounts: []
-      livenessProbe:
-        # -- Enable liveness probe for Hubble-ui backend (requires Hubble-ui 0.12+)
-        enabled: false
-      readinessProbe:
-        # -- Enable readiness probe for Hubble-ui backend (requires Hubble-ui 0.12+)
-        enabled: false
-      # -- Resource requests and limits for the 'backend' container of the 'hubble-ui' deployment.
-      resources: {}
-      #   limits:
-      #     cpu: 1000m
-      #     memory: 1024M
-      #   requests:
-      #     cpu: 100m
-      #     memory: 64Mi
-    frontend:
-      # -- Hubble-ui frontend image.
-      image:
-        # @schema
-        # type: [null, string]
-        # @schema
-        override: ~
-        repository: "${HUBBLE_UI_FRONTEND_REPO}"
-        tag: "${HUBBLE_UI_FRONTEND_VERSION}"
-        digest: "${HUBBLE_UI_FRONTEND_DIGEST}"
-        useDigest: true
-        pullPolicy: "${PULL_POLICY}"
-      # -- Hubble-ui frontend security context.
-      securityContext:
-        allowPrivilegeEscalation: false
-      # -- Additional hubble-ui frontend environment variables.
-      extraEnv: []
-      # -- Additional hubble-ui frontend volumes.
-      extraVolumes: []
-      # -- Additional hubble-ui frontend volumeMounts.
-      extraVolumeMounts: []
-      # -- Resource requests and limits for the 'frontend' container of the 'hubble-ui' deployment.
-      resources: {}
-      #   limits:
-      #     cpu: 1000m
-      #     memory: 1024M
-      #   requests:
-      #     cpu: 100m
-      #     memory: 64Mi
-      server:
-        # -- Controls server listener for ipv6
-        ipv6:
-          enabled: true
-    # -- The number of replicas of Hubble UI to deploy.
-    replicas: 1
-    # -- Annotations to be added to all top-level hubble-ui objects (resources under templates/hubble-ui)
-    annotations: {}
-    # -- Additional labels to be added to 'hubble-ui' deployment object
-    labels: {}
-    # -- Annotations to be added to hubble-ui pods
-    podAnnotations: {}
-    # -- Labels to be added to hubble-ui pods
-    podLabels: {}
-    # PodDisruptionBudget settings
-    podDisruptionBudget:
-      # -- enable PodDisruptionBudget
-      # ref: https://kubernetes.io/docs/concepts/workloads/pods/disruptions/
-      enabled: false
-      # @schema
-      # type: [null, integer, string]
-      # @schema
-      # -- Minimum number/percentage of pods that should remain scheduled.
-      # When it's set, maxUnavailable must be disabled by `maxUnavailable: null`
-      minAvailable: null
-      # @schema
-      # type: [null, integer, string]
-      # @schema
-      # -- Maximum number/percentage of pods that may be made unavailable
-      maxUnavailable: 1
-      # @schema
-      # type: [null, string]
-      # @schema
-      # -- How are unhealthy, but running, pods counted for eviction
-      unhealthyPodEvictionPolicy: null
-    # -- Affinity for hubble-ui
-    affinity: {}
-    # -- Pod topology spread constraints for hubble-ui
-    topologySpreadConstraints: []
-    #   - maxSkew: 1
-    #     topologyKey: topology.kubernetes.io/zone
-    #     whenUnsatisfiable: DoNotSchedule
-
-    # -- Node labels for pod assignment
-    # ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector
-    nodeSelector:
-      kubernetes.io/os: linux
-    # -- Node tolerations for pod assignment on nodes with taints
-    # ref: https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/
-    tolerations: []
-    # -- The priority class to use for hubble-ui
-    priorityClassName: ""
-    # -- hubble-ui update strategy.
-    updateStrategy:
-      type: RollingUpdate
-      rollingUpdate:
-        # @schema
-        # type: [integer, string]
-        # @schema
-        maxUnavailable: 1
-    # -- Security context to be added to Hubble UI pods
-    securityContext:
-      runAsUser: 1001
-      runAsGroup: 1001
-      fsGroup: 1001
-    # -- hubble-ui service configuration.
-    service:
-      # -- Annotations to be added for the Hubble UI service
-      annotations: {}
-      # -- Labels to be added for the Hubble UI service
-      labels: {}
-      # --- The type of service used for Hubble UI access, either ClusterIP or NodePort.
-      type: ClusterIP
-      # --- The port to use when the service type is set to NodePort.
-      nodePort: 31235
-    # -- Defines base url prefix for all hubble-ui http requests.
-    # It needs to be changed in case if ingress for hubble-ui is configured under some sub-path.
-    # Trailing `/` is required for custom path, ex. `/service-map/`
-    baseUrl: "/"
-    # -- hubble-ui ingress configuration.
-    ingress:
-      enabled: false
-      annotations: {}
-      # kubernetes.io/ingress.class: nginx
-      # kubernetes.io/tls-acme: "true"
-      className: ""
-      hosts:
-        - chart-example.local
-      labels: {}
-      tls: []
-      #  - secretName: chart-example-tls
-      #    hosts:
-      #      - chart-example.local
-
-    # -- Configure temporary volume for hubble-ui
-    tmpVolume: {}
-      # emptyDir:
-      #   # sizeLimit: "100Mi"
-      #   # medium: "Memory"
-
-  # -- Hubble flows export.
-  export:
-    # --- Static exporter configuration.
-    # Static exporter is bound to agent lifecycle.
-    static:
-      enabled: false
-      filePath: /var/run/cilium/hubble/events.log
-      fieldMask: []
-      # - time
-      # - source
-      # - destination
-      # - verdict
-      fieldAggregate: []
-      # - time
-      # - source
-      # - destination
-      # - verdict
-      # --- Defines the interval at which to aggregate before exporting Hubble flows.
-      #     Aggregation feature is only enabled when fieldAggregate is specified and aggregationInterval > 0s.
-      aggregationInterval: "0s"
-      allowList: []
-      # - '{"verdict":["DROPPED","ERROR"]}'
-      denyList: []
-      # - '{"source_pod":["kube-system/"]}'
-      # - '{"destination_pod":["kube-system/"]}'
-      # --- Defines max file size of output file before it gets rotated.
-      fileMaxSizeMb: 10
-      # --- Defines max number of backup/rotated files.
-      fileMaxBackups: 5
-      # --- Enable compression of rotated files.
-      fileCompress: false
-    # --- Dynamic exporters configuration.
-    # Dynamic exporters may be reconfigured without a need of agent restarts.
-    dynamic:
-      enabled: false
-      config:
-        # ---- Name of configmap with configuration that may be altered to reconfigure exporters within a running agents.
-        configMapName: cilium-flowlog-config
-        # ---- True if helm installer should create config map.
-        # Switch to false if you want to self maintain the file content.
-        createConfigMap: true
-        # ---- Exporters configuration in YAML format.
-        content:
-          - name: all
-            fieldMask: []
-            fieldAggregate: []
-            aggregationInterval: "0s"
-            includeFilters: []
-            excludeFilters: []
-            filePath: "/var/run/cilium/hubble/events.log"
-            fileMaxSizeMb: 10
-            fileMaxBackups: 5
-            fileCompress: false
-            #   - name: "test002"
-            #     filePath: "/var/log/network/flow-log/pa/test002.log"
-            #     fieldMask: ["source.namespace", "source.pod_name", "destination.namespace", "destination.pod_name", "verdict"]
-            #     includeFilters:
-            #     - source_pod: ["default/"]
-            #       event_type:
-            #       - type: 1
-            #     - destination_pod: ["frontend/nginx-975996d4c-7hhgt"]
-            #     excludeFilters: []
-            #     fileMaxSizeMb: 1
-            #     fileMaxBackups: 10
-            #     fileCompress: true
-            #     end: "2023-10-09T23:59:59-07:00"
-
-  # -- Emit v1.Events related to pods on detection of packet drops.
-  #    This feature is alpha, please provide feedback at https://github.com/cilium/cilium/issues/33975.
-  dropEventEmitter:
-    enabled: false
-    # --- Minimum time between emitting same events.
-    interval: 2m
-    # --- Drop reasons to emit events for.
-    # ref: https://docs.cilium.io/en/stable/_api/v1/flow/README/#dropreason
-    reasons:
-      - auth_required
-      - policy_denied
-
-# -- Method to use for identity allocation (`crd`, `kvstore` or `doublewrite-readkvstore` / `doublewrite-readcrd` for migrating between identity backends).
-identityAllocationMode: "crd"
-# -- (string) Time to wait before using new identity on endpoint identity change.
-# @default -- `"5s"`
-identityChangeGracePeriod: ""
-# -- Install Iptables rules to skip netfilter connection tracking on all pod
-# traffic. This option is only effective when Cilium is running in direct
-# routing and full KPR mode. Moreover, this option cannot be enabled when Cilium
-# is running in a managed Kubernetes environment or in a chained CNI setup.
-installNoConntrackIptablesRules: false
-ipam:
-  # -- Configure IP Address Management mode.
-  # ref: https://docs.cilium.io/en/stable/network/concepts/ipam/
-  mode: "cluster-pool"
-  # -- Maximum rate at which the CiliumNode custom resource is updated.
-  ciliumNodeUpdateRate: "15s"
-  # -- Pre-allocation settings for IPAM in Multi-Pool mode
-  multiPoolPreAllocation: ""
-  # -- Install ingress/egress routes through uplink on host for Pods when working with delegated IPAM plugin.
-  installUplinkRoutesForDelegatedIPAM: false
-  operator:
-    # @schema
-    # type: [array, string]
-    # @schema
-    # -- IPv4 CIDR list range to delegate to individual nodes for IPAM.
-    clusterPoolIPv4PodCIDRList: ["10.0.0.0/8"]
-    # -- IPv4 CIDR mask size to delegate to individual nodes for IPAM.
-    clusterPoolIPv4MaskSize: 24
-    # @schema
-    # type: [array, string]
-    # @schema
-    # -- IPv6 CIDR list range to delegate to individual nodes for IPAM.
-    clusterPoolIPv6PodCIDRList: ["fd00::/104"]
-    # -- IPv6 CIDR mask size to delegate to individual nodes for IPAM.
-    clusterPoolIPv6MaskSize: 120
-    # -- IP pools to auto-create in multi-pool IPAM mode.
-    autoCreateCiliumPodIPPools: {}
-    #   default:
-    #     ipv4:
-    #       cidrs:
-    #         - 10.10.0.0/8
-    #       maskSize: 24
-    #   other:
-    #     ipv6:
-    #       cidrs:
-    #         - fd00:100::/80
-    #       maskSize: 96
-    # @schema
-    # type: [null, integer]
-    # @schema
-    # -- (int) The maximum burst size when rate limiting access to external APIs.
-    # Also known as the token bucket capacity.
-    # @default -- `20`
-    externalAPILimitBurstSize: ~
-    # @schema
-    # type: [null, number]
-    # @schema
-    # -- (float) The maximum queries per second when rate limiting access to
-    # external APIs. Also known as the bucket refill rate, which is used to
-    # refill the bucket up to the burst size capacity.
-    # @default -- `4.0`
-    externalAPILimitQPS: ~
-  # -- NodeSpec configuration for the IPAM
-  nodeSpec:
-    # -- IPAM min allocate
-    # @schema
-    # type: [null, integer]
-    # @schema
-    ipamMinAllocate: ~
-    # -- IPAM pre allocate
-    # @schema
-    # type: [null, integer]
-    # @schema
-    ipamPreAllocate: ~
-    # -- IPAM max allocate
-    # @schema
-    # type: [null, integer]
-    # @schema
-    ipamMaxAllocate: ~
-    # -- IPAM static IP tags (currently only works with AWS and Azure)
-    ipamStaticIPTags: []
-# @schema
-# type: [string]
-# @schema
-# -- defaultLBServiceIPAM indicates the default LoadBalancer Service IPAM when
-# no LoadBalancer class is set. Applicable values: lbipam, nodeipam, none
-defaultLBServiceIPAM: lbipam
-nodeIPAM:
-  # -- Configure Node IPAM
-  # ref: https://docs.cilium.io/en/stable/network/node-ipam/
-  enabled: false
-# @schema
-# type: [null, string]
-# @schema
-# -- The api-rate-limit option can be used to overwrite individual settings of the default configuration for rate limiting calls to the Cilium Agent API
-apiRateLimit: ~
-# -- Configure the eBPF-based ip-masq-agent
-ipMasqAgent:
-  enabled: false
-# the config of nonMasqueradeCIDRs
-# config:
-#   nonMasqueradeCIDRs: []
-#   masqLinkLocal: false
-#   masqLinkLocalIPv6: false
-
-# iptablesLockTimeout defines the iptables "--wait" option when invoked from Cilium.
-# iptablesLockTimeout: "5s"
-ipv4:
-  # -- Enable IPv4 support.
-  enabled: true
-ipv6:
-  # -- Enable IPv6 support.
-  enabled: false
-# -- Configure Kubernetes specific configuration
-k8s:
-  # -- requireIPv4PodCIDR enables waiting for Kubernetes to provide the PodCIDR
-  # range via the Kubernetes node resource
-  requireIPv4PodCIDR: false
-  # -- requireIPv6PodCIDR enables waiting for Kubernetes to provide the PodCIDR
-  # range via the Kubernetes node resource
-  requireIPv6PodCIDR: false
-  # -- A space separated list of Kubernetes API server URLs to use with the client.
-  # For example "https://192.168.0.1:6443 https://192.168.0.2:6443"
-  # apiServerURLs: ""
-
-# -- Keep the deprecated selector labels when deploying Cilium DaemonSet.
-keepDeprecatedLabels: false
-# -- Keep the deprecated probes when deploying Cilium DaemonSet
-keepDeprecatedProbes: false
-startupProbe:
-  # -- failure threshold of startup probe.
-  # Allow Cilium to take up to 600s to start up (300 attempts with 2s between attempts).
-  failureThreshold: 300
-  # -- interval between checks of the startup probe
-  periodSeconds: 2
-livenessProbe:
-  # -- failure threshold of liveness probe
-  failureThreshold: 10
-  # -- interval between checks of the liveness probe
-  periodSeconds: 30
-  # -- whether to require k8s connectivity as part of the check.
-  requireK8sConnectivity: false
-readinessProbe:
-  # -- failure threshold of readiness probe
-  failureThreshold: 3
-  # -- interval between checks of the readiness probe
-  periodSeconds: 30
-# -- Configure the kube-proxy replacement in Cilium BPF datapath
-# Valid options are "true" or "false".
-# ref: https://docs.cilium.io/en/stable/network/kubernetes/kubeproxy-free/
-  # @schema@
-  # type: [string, boolean]
-  # @schema@
-kubeProxyReplacement: "false"
-
-# -- healthz server bind address for the kube-proxy replacement.
-# To enable set the value to '0.0.0.0:10256' for all ipv4
-# addresses and this '[::]:10256' for all ipv6 addresses.
-# By default it is disabled.
-kubeProxyReplacementHealthzBindAddr: ""
-l2NeighDiscovery:
-  # -- Enable L2 neighbor discovery in the agent
-  enabled: false
-# -- Enable Layer 7 network policy.
-l7Proxy: true
-
-# -- Enable Local Redirect Policy (deprecated, please use 'localRedirectPolicies.enabled' instead)
-localRedirectPolicy: false
-
-localRedirectPolicies:
-  # -- Enable local redirect policies.
-  enabled: false
-
-  # -- Limit the allowed addresses in Address Matcher rule of
-  # Local Redirect Policies to the given CIDRs.
-  # @schema@
-  # type: [null, array]
-  # @schema@
-  addressMatcherCIDRs: ~
-
-# To include or exclude matched resources from cilium identity evaluation
-# labels: ""
-
-# logOptions allows you to define logging options. eg:
-# logOptions:
-#   format: json
-
-# -- Enables periodic logging of system load
-logSystemLoad: false
-# -- Configure maglev consistent hashing
-maglev: {}
-# -- tableSize is the size (parameter M) for the backend table of one
-# service entry
-# tableSize:
-
-# -- hashSeed is the cluster-wide base64 encoded seed for the hashing
-# hashSeed:
-
-# @schema
-# type: [null, boolean]
-# @schema
-# -- (bool) Enables masquerading of IPv4 traffic leaving the node from endpoints.
-# @default -- `true` unless ipam eni mode is active
-enableIPv4Masquerade: ~
-# -- Enables masquerading of IPv6 traffic leaving the node from endpoints.
-enableIPv6Masquerade: true
-# -- Enables masquerading to the source of the route for traffic leaving the node from endpoints.
-enableMasqueradeRouteSource: false
-# -- Enables IPv4 BIG TCP support which increases maximum IPv4 GSO/GRO limits for nodes and pods
-enableIPv4BIGTCP: false
-# -- Enables IPv6 BIG TCP support which increases maximum IPv6 GSO/GRO limits for nodes and pods
-enableIPv6BIGTCP: false
-
-nat:
-  # -- Number of the top-k SNAT map connections to track in Cilium statedb.
-  mapStatsEntries: 32
-  # -- Interval between how often SNAT map is counted for stats.
-  mapStatsInterval: 30s
-
-egressGateway:
-  # -- Enables egress gateway to redirect and SNAT the traffic that leaves the
-  # cluster.
-  enabled: false
-  # -- Time between triggers of egress gateway state reconciliations
-  reconciliationTriggerInterval: 1s
-  # -- Maximum number of entries in egress gateway policy map
-  # maxPolicyEntries: 16384
-vtep:
-  # -- Enables VXLAN Tunnel Endpoint (VTEP) Integration (beta) to allow
-  # Cilium-managed pods to talk to third party VTEP devices over Cilium tunnel.
-  enabled: false
-  # -- A space separated list of VTEP device endpoint IPs, for example "1.1.1.1  1.1.2.1"
-  endpoint: ""
-  # -- A space separated list of VTEP device CIDRs, for example "1.1.1.0/24 1.1.2.0/24"
-  cidr: ""
-  # -- VTEP CIDRs Mask that applies to all VTEP CIDRs, for example "255.255.255.0"
-  mask: ""
-  # -- A space separated list of VTEP device MAC addresses (VTEP MAC), for example "x:x:x:x:x:x  y:y:y:y:y:y:y"
-  mac: ""
-# -- (string) Allows to explicitly specify the IPv4 CIDR for native routing.
-# When specified, Cilium assumes networking for this CIDR is preconfigured and
-# hands traffic destined for that range to the Linux network stack without
-# applying any SNAT.
-# Generally speaking, specifying a native routing CIDR implies that Cilium can
-# depend on the underlying networking stack to route packets to their
-# destination. To offer a concrete example, if Cilium is configured to use
-# direct routing and the Kubernetes CIDR is included in the native routing CIDR,
-# the user must configure the routes to reach pods, either manually or by
-# setting the auto-direct-node-routes flag.
-ipv4NativeRoutingCIDR: ""
-# -- (string) Allows to explicitly specify the IPv6 CIDR for native routing.
-# When specified, Cilium assumes networking for this CIDR is preconfigured and
-# hands traffic destined for that range to the Linux network stack without
-# applying any SNAT.
-# Generally speaking, specifying a native routing CIDR implies that Cilium can
-# depend on the underlying networking stack to route packets to their
-# destination. To offer a concrete example, if Cilium is configured to use
-# direct routing and the Kubernetes CIDR is included in the native routing CIDR,
-# the user must configure the routes to reach pods, either manually or by
-# setting the auto-direct-node-routes flag.
-ipv6NativeRoutingCIDR: ""
-# -- cilium-monitor sidecar.
-monitor:
-  # -- Enable the cilium-monitor sidecar.
-  enabled: false
-# -- Configure service load balancing
-loadBalancer:
-  # -- standalone enables the standalone L4LB which does not connect to
-  # kube-apiserver.
-  # standalone: false
-
-  # -- algorithm is the name of the load balancing algorithm for backend
-  # selection e.g. random or maglev
-  # algorithm: random
-
-  # -- mode is the operation mode of load balancing for remote backends
-  # e.g. snat, dsr, hybrid
-  # mode: snat
-
-  # -- acceleration is the option to accelerate service handling via XDP
-  # Applicable values can be: disabled (do not use XDP), native (XDP BPF
-  # program is run directly out of the networking driver's early receive
-  # path), or best-effort (use native mode XDP acceleration on devices
-  # that support it).
-  acceleration: disabled
-  # -- dsrDispatch configures whether IP option (opt), IPIP encapsulation (ipip),
-  # Geneve Class Option (geneve) used to pass a service IP and port to remote backend
-  # dsrDispatch: opt
-
-  # -- serviceTopology enables K8s Topology Aware Hints -based service
-  # endpoints filtering
-  serviceTopology: false
-
-  # -- L7 LoadBalancer
-  l7:
-    # -- Enable L7 service load balancing via envoy proxy.
-    # The request to a k8s service, which has specific annotation e.g. service.cilium.io/lb-l7,
-    # will be forwarded to the local backend proxy to be load balanced to the service endpoints.
-    # Please refer to docs for supported annotations for more configuration.
-    #
-    # Applicable values:
-    #   - envoy: Enable L7 load balancing via envoy proxy. This will automatically set enable-envoy-config as well.
-    #   - disabled: Disable L7 load balancing by way of service annotation.
-    backend: disabled
-    # -- List of ports from service to be automatically redirected to above backend.
-    # Any service exposing one of these ports will be automatically redirected.
-    # Fine-grained control can be achieved by using the service annotation.
-    ports: []
-    # -- Default LB algorithm
-    # The default LB algorithm to be used for services, which can be overridden by the
-    # service annotation (e.g. service.cilium.io/lb-l7-algorithm)
-    # Applicable values: round_robin, least_request, random
-    algorithm: round_robin
-# -- Configure N-S k8s service loadbalancing
-nodePort:
-  # -- Port range to use for NodePort services.
-  # range: "30000,32767"
-
-  # @schema
-  # type: [null, string, array]
-  # @schema
-  # -- List of CIDRs for choosing which IP addresses assigned to native devices are used for NodePort load-balancing.
-  # By default this is empty and the first suitable, preferably private, IPv4 and IPv6 address assigned to each device is used.
-  #
-  # Example:
-  #
-  #   addresses: ["192.168.1.0/24", "2001::/64"]
-  #
-  addresses: ~
-
-  # -- Set to true to prevent applications binding to service ports.
-  bindProtection: true
-  # -- Append NodePort range to ip_local_reserved_ports if clash with ephemeral
-  # ports is detected.
-  autoProtectPortRange: true
-  # -- Enable healthcheck nodePort server for NodePort services
-  enableHealthCheck: true
-  # -- Enable access of the healthcheck nodePort on the LoadBalancerIP. Needs
-  # EnableHealthCheck to be enabled
-  enableHealthCheckLoadBalancerIP: false
-# policyAuditMode: false
-
-# -- The agent can be put into one of the three policy enforcement modes:
-# default, always and never.
-# ref: https://docs.cilium.io/en/stable/security/policy/intro/#policy-enforcement-modes
-policyEnforcementMode: "default"
-# @schema
-# type: [null, string, array]
-# @schema
-# -- policyCIDRMatchMode is a list of entities that may be selected by CIDR selector.
-# The possible value is "nodes".
-policyCIDRMatchMode:
-pprof:
-  # -- Enable pprof for cilium-agent
-  enabled: false
-  # -- Configure pprof listen address for cilium-agent
-  address: localhost
-  # -- Configure pprof listen port for cilium-agent
-  port: 6060
-  # -- Enable mutex contention profiling for cilium-agent and set the fraction of sampled events (set to 1 to sample all events)
-  mutexProfileFraction: 0
-  # -- Enable goroutine blocking profiling for cilium-agent and set the rate of sampled events in nanoseconds (set to 1 to sample all events [warning: performance overhead])
-  blockProfileRate: 0
-# -- Configure prometheus metrics on the configured port at /metrics
-prometheus:
-  metricsService: false
-  enabled: false
-  port: 9962
-  serviceMonitor:
-    # -- Enable service monitors.
-    # This requires the prometheus CRDs to be available (see https://github.com/prometheus-operator/prometheus-operator/blob/main/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml)
-    enabled: false
-    # -- Labels to add to ServiceMonitor cilium-agent
-    labels: {}
-    # -- Annotations to add to ServiceMonitor cilium-agent
-    annotations: {}
-    # -- jobLabel to add for ServiceMonitor cilium-agent
-    jobLabel: ""
-    # -- Interval for scrape metrics.
-    interval: "10s"
-    # @schema
-    # type: [null, string]
-    # @schema
-    # -- Timeout after which scrape is considered to be failed.
-    scrapeTimeout: ~
-    # -- Specify the Kubernetes namespace where Prometheus expects to find
-    # service monitors configured.
-    # namespace: ""
-    # -- Relabeling configs for the ServiceMonitor cilium-agent
-    relabelings:
-      - sourceLabels:
-          - __meta_kubernetes_pod_node_name
-        targetLabel: node
-        action: replace
-        replacement: ${1}
-    # @schema
-    # type: [null, array]
-    # @schema
-    # -- Metrics relabeling configs for the ServiceMonitor cilium-agent
-    metricRelabelings: ~
-    # -- Set to `true` and helm will not check for monitoring.coreos.com/v1 CRDs before deploying
-    trustCRDsExist: false
-  # @schema
-  # type: [null, array]
-  # @schema
-  # -- Metrics that should be enabled or disabled from the default metric list.
-  # The list is expected to be separated by a space. (+metric_foo to enable
-  # metric_foo , -metric_bar to disable metric_bar).
-  # ref: https://docs.cilium.io/en/stable/observability/metrics/
-  metrics: ~
-  # --- Enable controller group metrics for monitoring specific Cilium
-  # subsystems. The list is a list of controller group names. The special
-  # values of "all" and "none" are supported. The set of controller
-  # group names is not guaranteed to be stable between Cilium versions.
-  controllerGroupMetrics:
-    - write-cni-file
-    - sync-host-ips
-    - sync-lb-maps-with-k8s-services
-# -- Grafana dashboards for cilium-agent
-# grafana can import dashboards based on the label and value
-# ref: https://github.com/grafana/helm-charts/tree/main/charts/grafana#sidecar-for-dashboards
-dashboards:
-  enabled: false
-  label: grafana_dashboard
-  # @schema
-  # type: [null, string]
-  # @schema
-  namespace: ~
-  labelValue: "1"
-  annotations: {}
-# Configure Cilium Envoy options.
-envoy:
-  # @schema
-  # type: [null, boolean]
-  # @schema
-  # -- Enable Envoy Proxy in standalone DaemonSet.
-  # This field is enabled by default for new installation.
-  # @default -- `true` for new installation
-  enabled: ~
-  # -- (int)
-  # Set Envoy'--base-id' to use when allocating shared memory regions.
-  # Only needs to be changed if multiple Envoy instances will run on the same node and may have conflicts. Supported values: 0 - 4294967295. Defaults to '0'
-  baseID: 0
-  log:
-    # @schema
-    # type: [null, string]
-    # @schema
-    # -- The format string to use for laying out the log message metadata of Envoy. If specified, Envoy will use text format output.
-    # This setting is mutually exclusive with envoy.log.format_json.
-    format: "[%Y-%m-%d %T.%e][%t][%l][%n] [%g:%#] %v"
-    # @schema
-    # type: [null, object]
-    # @schema
-    # -- The JSON logging format to use for Envoy. This setting is mutually exclusive with envoy.log.format.
-    # ref: https://www.envoyproxy.io/docs/envoy/latest/api-v3/config/bootstrap/v3/bootstrap.proto#envoy-v3-api-field-config-bootstrap-v3-bootstrap-applicationlogconfig-logformat-json-format
-    format_json: null
-      # date: "%Y-%m-%dT%T.%e"
-      # thread_id: "%t"
-      # source_line: "%s:%#"
-      # level: "%l"
-      # logger: "%n"
-      # message: "%j"
-    # -- Path to a separate Envoy log file, if any. Defaults to /dev/stdout.
-    path: ""
-    # @schema
-    # oneOf:
-    # - type: [null]
-    # - enum: [trace,debug,info,warning,error,critical,off]
-    # @schema
-    # -- Default log level of Envoy application log that is configured if Cilium debug / verbose logging isn't enabled.
-    # This option allows to have a different log level than the Cilium Agent - e.g. lower it to `critical`.
-    # Possible values: trace, debug, info, warning, error, critical, off
-    # @default -- Defaults to the default log level of the Cilium Agent - `info`
-    defaultLevel: ~
-    # @schema
-    # type: [null, integer]
-    # @schema
-    # -- Size of the Envoy access log buffer created within the agent in bytes.
-    # Tune this value up if you encounter "Envoy: Discarded truncated access log message" errors.
-    # Large request/response header sizes (e.g. 16KiB) will require a larger buffer size.
-    accessLogBufferSize: 4096
-  # -- Time in seconds after which a TCP connection attempt times out
-  connectTimeoutSeconds: 2
-  # -- Time in seconds after which the initial fetch on an xDS stream is considered timed out
-  initialFetchTimeoutSeconds: 30
-  # -- Maximum number of concurrent retries on Envoy clusters
-  maxConcurrentRetries: 128
-  # -- Maximum number of connections on Envoy clusters
-  clusterMaxConnections: 1024
-  # -- Maximum number of requests on Envoy clusters
-  clusterMaxRequests: 1024
-  # -- Maximum number of global downstream connections
-  maxGlobalDownstreamConnections: 50000
-  # -- Maximum number of retries for each HTTP request
-  httpRetryCount: 3
-  # -- ProxyMaxRequestsPerConnection specifies the max_requests_per_connection setting for Envoy
-  maxRequestsPerConnection: 0
-  # -- Set Envoy HTTP option max_connection_duration seconds. Default 0 (disable)
-  maxConnectionDurationSeconds: 0
-  # -- Set Envoy upstream HTTP idle connection timeout seconds.
-  # Does not apply to connections with pending requests. Default 60s
-  idleTimeoutDurationSeconds: 60
-  # -- Set Envoy the amount of time that the connection manager will allow a stream to exist with no upstream or downstream activity.
-  # default 5 minutes
-  streamIdleTimeoutDurationSeconds: 300
-  # -- Number of trusted hops regarding the x-forwarded-for and related HTTP headers for the ingress L7 policy enforcement Envoy listeners.
-  xffNumTrustedHopsL7PolicyIngress: 0
-  # -- Number of trusted hops regarding the x-forwarded-for and related HTTP headers for the egress L7 policy enforcement Envoy listeners.
-  xffNumTrustedHopsL7PolicyEgress: 0
-  # -- For cases when CiliumEnvoyConfig is not used directly (Ingress, Gateway), configures Cilium BPF Metadata listener filter
-  # to use the original source address when extracting the metadata for a request.
-  useOriginalSourceAddress: true
-  # @schema
-  # type: [null, string]
-  # @schema
-  # -- Max duration to wait for endpoint policies to be restored on restart. Default "3m".
-  policyRestoreTimeoutDuration: null
-  # -- Time in seconds to block Envoy worker thread while an upstream HTTP connection is closing. If set to 0, the connection is closed immediately (with TCP RST). If set to -1, the connection is closed asynchronously in the background.
-  httpUpstreamLingerTimeout: null
-  # -- Envoy container image.
-  image:
-    # @schema
-    # type: [null, string]
-    # @schema
-    override: ~
-    repository: "${CILIUM_ENVOY_REPO}"
-    tag: "${CILIUM_ENVOY_VERSION}"
-    pullPolicy: "${PULL_POLICY}"
-    digest: "${CILIUM_ENVOY_DIGEST}"
-    useDigest: true
-  # -- Init containers added to the cilium Envoy DaemonSet.
-  initContainers: []
-  # -- Additional containers added to the cilium Envoy DaemonSet.
-  extraContainers: []
-  # -- Additional envoy container arguments.
-  extraArgs: []
-  # -- Additional envoy container environment variables.
-  extraEnv: []
-  # -- Additional envoy hostPath mounts.
-  extraHostPathMounts: []
-  # - name: host-mnt-data
-  #   mountPath: /host/mnt/data
-  #   hostPath: /mnt/data
-  #   hostPathType: Directory
-  #   readOnly: true
-  #   mountPropagation: HostToContainer
-
-  # -- Additional envoy volumes.
-  extraVolumes: []
-  # -- Additional envoy volumeMounts.
-  extraVolumeMounts: []
-  # -- Configure termination grace period for cilium-envoy DaemonSet.
-  terminationGracePeriodSeconds: 1
-  # -- TCP port for the health API.
-  healthPort: 9878
-  # -- cilium-envoy update strategy
-  # ref: https://kubernetes.io/docs/concepts/workloads/controllers/daemonset/#updating-a-daemonset
-  updateStrategy:
-    type: RollingUpdate
-    rollingUpdate:
-      # @schema
-      # type: [integer, string]
-      # @schema
-      maxUnavailable: 2
-  # -- Roll out cilium envoy pods automatically when configmap is updated.
-  rollOutPods: false
-  # -- ADVANCED OPTION: Bring your own custom Envoy bootstrap ConfigMap. Provide the name of a ConfigMap with a `bootstrap-config.json` key.
-  # When specified, Envoy will use this ConfigMap instead of the default provided by the chart.
-  # WARNING: Use of this setting has the potential to prevent cilium-envoy from starting up, and can cause unexpected behavior (e.g. due to
-  # syntax error or semantically incorrect configuration). Before submitting an issue, please ensure you have disabled this feature, as support
-  # cannot be provided for custom Envoy bootstrap configs.
-  # @schema
-  # type: [null, string]
-  # @schema
-  bootstrapConfigMap: ~
-  # -- Annotations to be added to all top-level cilium-envoy objects (resources under templates/cilium-envoy)
-  annotations: {}
-  # -- Security Context for cilium-envoy pods.
-  podSecurityContext:
-    # -- AppArmorProfile options for the `cilium-agent` and init containers
-    appArmorProfile:
-      type: "Unconfined"
-  # -- Annotations to be added to envoy pods
-  podAnnotations: {}
-  # -- Labels to be added to envoy pods
-  podLabels: {}
-  # -- Envoy resource limits & requests
-  # ref: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
-  resources: {}
-  #   limits:
-  #     cpu: 4000m
-  #     memory: 4Gi
-  #   requests:
-  #     cpu: 100m
-  #     memory: 512Mi
-
-  startupProbe:
-    # -- Enable startup probe for cilium-envoy
-    enabled: true
-    # -- failure threshold of startup probe.
-    # 105 x 2s translates to the old behaviour of the readiness probe (120s delay + 30 x 3s)
-    failureThreshold: 105
-    # -- interval between checks of the startup probe
-    periodSeconds: 2
-  livenessProbe:
-    # -- Enable liveness probe for cilium-envoy
-    enabled: true
-    # -- failure threshold of liveness probe
-    failureThreshold: 10
-    # -- interval between checks of the liveness probe
-    periodSeconds: 30
-  readinessProbe:
-    # -- failure threshold of readiness probe
-    failureThreshold: 3
-    # -- interval between checks of the readiness probe
-    periodSeconds: 30
-  securityContext:
-    # -- User to run the pod with
-    # runAsUser: 0
-    # -- Run the pod with elevated privileges
-    privileged: false
-    # -- SELinux options for the `cilium-envoy` container
-    seLinuxOptions:
-      level: 's0'
-      # Running with spc_t since we have removed the privileged mode.
-      # Users can change it to a different type as long as they have the
-      # type available on the system.
-      type: 'spc_t'
-    capabilities:
-      # -- Capabilities for the `cilium-envoy` container.
-      # Even though granted to the container, the cilium-envoy-starter wrapper drops
-      # all capabilities after forking the actual Envoy process.
-      # `NET_BIND_SERVICE` is the only capability that can be passed to the Envoy process by
-      # setting `envoy.securityContext.capabilities.keepNetBindService=true` (in addition to granting the
-      # capability to the container).
-      # Note: In case of embedded envoy, the capability must  be granted to the cilium-agent container.
-      envoy:
-        # Used since cilium proxy uses setting IPPROTO_IP/IP_TRANSPARENT
-        - NET_ADMIN
-        # We need it for now but might not need it for >= 5.11 specially
-        # for the 'SYS_RESOURCE'.
-        # In >= 5.8 there's already BPF and PERMON capabilities
-        - SYS_ADMIN
-        # Both PERFMON and BPF requires kernel 5.8, container runtime
-        # cri-o >= v1.22.0 or containerd >= v1.5.0.
-        # If available, SYS_ADMIN can be removed.
-        #- PERFMON
-        #- BPF
-      # -- Keep capability `NET_BIND_SERVICE` for Envoy process.
-      keepCapNetBindService: false
-  # -- Affinity for cilium-envoy.
-  affinity:
-    podAntiAffinity:
-      requiredDuringSchedulingIgnoredDuringExecution:
-        - topologyKey: kubernetes.io/hostname
-          labelSelector:
-            matchLabels:
-              k8s-app: cilium-envoy
-    podAffinity:
-      requiredDuringSchedulingIgnoredDuringExecution:
-      - topologyKey: kubernetes.io/hostname
-        labelSelector:
-          matchLabels:
-            k8s-app: cilium
-    nodeAffinity:
-      requiredDuringSchedulingIgnoredDuringExecution:
-        nodeSelectorTerms:
-          - matchExpressions:
-            - key: cilium.io/no-schedule
-              operator: NotIn
-              values:
-              - "true"
-  # -- Node selector for cilium-envoy.
-  nodeSelector:
-    kubernetes.io/os: linux
-  # -- Node tolerations for envoy scheduling to nodes with taints
-  # ref: https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/
-  tolerations:
-    - operator: Exists
-      # - key: "key"
-      #   operator: "Equal|Exists"
-      #   value: "value"
-      #   effect: "NoSchedule|PreferNoSchedule|NoExecute(1.6 only)"
-  # @schema
-  # type: [null, string]
-  # @schema
-  # -- The priority class to use for cilium-envoy.
-  priorityClassName: ~
-  # @schema
-  # type: [null, string]
-  # @schema
-  # -- DNS policy for Cilium envoy pods.
-  # Ref: https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/#pod-s-dns-policy
-  dnsPolicy: ~
-  debug:
-    admin:
-      # -- Enable admin interface for cilium-envoy.
-      # This is useful for debugging and should not be enabled in production.
-      enabled: false
-      # -- Port number (bound to loopback interface).
-      # kubectl port-forward can be used to access the admin interface.
-      port: 9901
-  # -- Configure Cilium Envoy Prometheus options.
-  # Note that some of these apply to either cilium-agent or cilium-envoy.
-  prometheus:
-    # -- Enable prometheus metrics for cilium-envoy
-    enabled: true
-    serviceMonitor:
-      # -- Enable service monitors.
-      # This requires the prometheus CRDs to be available (see https://github.com/prometheus-operator/prometheus-operator/blob/main/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml)
-      # Note that this setting applies to both cilium-envoy _and_ cilium-agent
-      # with Envoy enabled.
-      enabled: false
-      # -- Labels to add to ServiceMonitor cilium-envoy
-      labels: {}
-      # -- Annotations to add to ServiceMonitor cilium-envoy
-      annotations: {}
-      # -- Interval for scrape metrics.
-      interval: "10s"
-      # @schema
-      # type: [null, string]
-      # @schema
-      # -- Timeout after which scrape is considered to be failed.
-      scrapeTimeout: ~
-      # -- Specify the Kubernetes namespace where Prometheus expects to find
-      # service monitors configured.
-      # namespace: ""
-      # -- Relabeling configs for the ServiceMonitor cilium-envoy
-      # or for cilium-agent with Envoy configured.
-      relabelings:
-        - sourceLabels:
-            - __meta_kubernetes_pod_node_name
-          targetLabel: node
-          action: replace
-          replacement: ${1}
-      # @schema
-      # type: [null, array]
-      # @schema
-      # -- Metrics relabeling configs for the ServiceMonitor cilium-envoy
-      # or for cilium-agent with Envoy configured.
-      metricRelabelings: ~
-    # -- Serve prometheus metrics for cilium-envoy on the configured port
-    port: "9964"
-
-# -- Enable/Disable use of node label based identity
-nodeSelectorLabels: false
-
-# To include or exclude matched resources from cilium node identity evaluation
-# List of labels just like --labels flag (.Values.labels)
-# nodeLabels: ""
-
-# -- Enable resource quotas for priority classes used in the cluster.
-resourceQuotas:
-  enabled: false
-  cilium:
-    hard:
-      # 5k nodes * 2 DaemonSets (Cilium and cilium node init)
-      pods: "10k"
-  operator:
-    hard:
-      # 15 "clusterwide" Cilium Operator pods for HA
-      pods: "15"
-# Need to document default
-##################
-
-# -- Annotations to be added to all cilium-secret namespaces (resources under templates/cilium-secrets-namespace)
-secretsNamespaceAnnotations: {}
-# -- Labels to be added to all cilium-secret namespaces (resources under templates/cilium-secrets-namespace)
-secretsNamespaceLabels: {}
-
-# -- Do not run Cilium agent when running with clean mode. Useful to completely
-# uninstall Cilium as it will stop Cilium from starting and create artifacts
-# in the node.
-sleepAfterInit: false
-# -- Synchronize Kubernetes nodes to kvstore and perform CNP GC.
-synchronizeK8sNodes: true
-# -- Configure TLS configuration in the agent.
-tls:
-  # @schema
-  # type: [null, string]
-  # @schema
-  # -- This configures how the Cilium agent loads the secrets used TLS-aware CiliumNetworkPolicies
-  # (namely the secrets referenced by terminatingTLS and originatingTLS).
-  # This value is DEPRECATED and will be removed in a future version.
-  # Use `tls.readSecretsOnlyFromSecretsNamespace` instead.
-  # Possible values:
-  #   - local
-  #   - k8s
-  secretsBackend: ~
-  # @schema
-  # type: [null, boolean]
-  # @schema
-  # -- Configure if the Cilium Agent will only look in `tls.secretsNamespace` for
-  #    CiliumNetworkPolicy relevant Secrets.
-  #    If false, the Cilium Agent will be granted READ (GET/LIST/WATCH) access
-  #    to _all_ secrets in the entire cluster. This is not recommended and is
-  #    included for backwards compatibility.
-  #    This value obsoletes `tls.secretsBackend`, with `true` == `local` in the old
-  #    setting, and `false` == `k8s`.
-  readSecretsOnlyFromSecretsNamespace: ~
-  # -- Configures where secrets used in CiliumNetworkPolicies will be looked for
-  secretsNamespace:
-    # -- Create secrets namespace for TLS Interception secrets.
-    create: true
-    # -- Name of TLS Interception secret namespace.
-    name: cilium-secrets
-  # -- Configures settings for synchronization of TLS Interception Secrets
-  secretSync:
-    # @schema
-    # type: [null, boolean]
-    # @schema
-    # -- Enable synchronization of Secrets for TLS Interception. If disabled and
-    # tls.readSecretsOnlyFromSecretsNamespace is set to 'false', then secrets will be read directly by the agent.
-    enabled: ~
-  # -- Base64 encoded PEM values for the CA certificate and private key.
-  # This can be used as common CA to generate certificates used by hubble and clustermesh components.
-  # It is neither required nor used when cert-manager is used to generate the certificates.
-  ca:
-    # -- Optional CA cert. If it is provided, it will be used by cilium to
-    # generate all other certificates. Otherwise, an ephemeral CA is generated.
-    cert: ""
-    # -- Optional CA private key. If it is provided, it will be used by cilium to
-    # generate all other certificates. Otherwise, an ephemeral CA is generated.
-    key: ""
-    # -- Generated certificates validity duration in days. This will be used for auto generated CA.
-    certValidityDuration: 1095
-  # -- Configure the CA trust bundle used for the validation of the certificates
-  # leveraged by hubble and clustermesh. When enabled, it overrides the content of the
-  # 'ca.crt' field of the respective certificates, allowing for CA rotation with no down-time.
-  caBundle:
-    # -- Enable the use of the CA trust bundle.
-    enabled: false
-    # -- Name of the ConfigMap containing the CA trust bundle.
-    name: cilium-root-ca.crt
-    # -- Entry of the ConfigMap containing the CA trust bundle.
-    key: ca.crt
-    # -- Use a Secret instead of a ConfigMap.
-    useSecret: false
-    # If uncommented, creates the ConfigMap and fills it with the specified content.
-    # Otherwise, the ConfigMap is assumed to be already present in .Release.Namespace.
-    #
-    # content: |
-    #   -----BEGIN CERTIFICATE-----
-    #   ...
-    #   -----END CERTIFICATE-----
-    #   -----BEGIN CERTIFICATE-----
-    #   ...
-    #   -----END CERTIFICATE-----
-# -- Tunneling protocol to use in tunneling mode and for ad-hoc tunnels.
-# Possible values:
-#   - ""
-#   - vxlan
-#   - geneve
-# @default -- `"vxlan"`
-tunnelProtocol: ""
-# -- IP family for the underlay.
-# Possible values:
-#   - "ipv4"
-#   - "ipv6"
-# @default -- `"ipv4"`
-underlayProtocol: ""
-# -- Enable native-routing mode or tunneling mode.
-# Possible values:
-#   - ""
-#   - native
-#   - tunnel
-# @default -- `"tunnel"`
-routingMode: ""
-# -- Configure VXLAN and Geneve tunnel port.
-# @default -- Port 8472 for VXLAN, Port 6081 for Geneve
-tunnelPort: 0
-# -- Configure VXLAN and Geneve tunnel source port range hint.
-# @default -- 0-0 to let the kernel driver decide the range
-tunnelSourcePortRange: 0-0
-# -- Configure what the response should be to traffic for a service without backends.
-# Possible values:
-#  - reject (default)
-#  - drop
-serviceNoBackendResponse: reject
-# -- Configure what the response should be to pod egress traffic denied by network policy.
-# Possible values:
-#  - none (default)
-#  - icmp
-policyDenyResponse: none
-# -- Configure the underlying network MTU to overwrite auto-detected MTU.
-# This value doesn't change the host network interface MTU i.e. eth0 or ens0.
-# It changes the MTU for cilium_net@cilium_host, cilium_host@cilium_net,
-# cilium_vxlan and lxc_health interfaces.
-MTU: 0
-# -- Disable the usage of CiliumEndpoint CRD.
-disableEndpointCRD: false
-wellKnownIdentities:
-  # -- Enable the use of well-known identities.
-  enabled: false
-etcd:
-  # -- Enable etcd mode for the agent.
-  enabled: false
-  # -- List of etcd endpoints
-  endpoints:
-    - https://CHANGE-ME:2379
-  # -- Enable use of TLS/SSL for connectivity to etcd.
-  ssl: false
-operator:
-  # -- Enable the cilium-operator component (required).
-  enabled: true
-  # -- Roll out cilium-operator pods automatically when configmap is updated.
-  rollOutPods: false
-  # -- cilium-operator image.
-  image:
-    # @schema
-    # type: [null, string]
-    # @schema
-    override: ~
-    repository: "${CILIUM_OPERATOR_BASE_REPO}"
-    tag: "${CILIUM_VERSION}"
-    # operator-generic-digest
-    genericDigest: ${OPERATOR_GENERIC_DIGEST}
-    # operator-azure-digest
-    azureDigest: ${OPERATOR_AZURE_DIGEST}
-    # operator-aws-digest
-    awsDigest: ${OPERATOR_AWS_DIGEST}
-    # operator-alibabacloud-digest
-    alibabacloudDigest: ${OPERATOR_ALIBABACLOUD_DIGEST}
-    useDigest: ${USE_DIGESTS}
-    pullPolicy: "${PULL_POLICY}"
-    suffix: "${CILIUM_OPERATOR_SUFFIX}"
-  # -- Number of replicas to run for the cilium-operator deployment
-  replicas: 2
-  # -- The priority class to use for cilium-operator
-  priorityClassName: ""
-  # -- DNS policy for Cilium operator pods.
-  # Ref: https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/#pod-s-dns-policy
-  dnsPolicy: ""
-  # -- cilium-operator update strategy
-  updateStrategy:
-    type: RollingUpdate
-    rollingUpdate:
-      # @schema
-      # type: [integer, string]
-      # @schema
-      maxSurge: 25%
-      # @schema
-      # type: [integer, string]
-      # @schema
-      maxUnavailable: 50%
-  # -- Affinity for cilium-operator
-  affinity:
-    podAntiAffinity:
-      requiredDuringSchedulingIgnoredDuringExecution:
-        - topologyKey: kubernetes.io/hostname
-          labelSelector:
-            matchLabels:
-              io.cilium/app: operator
-  # -- Pod topology spread constraints for cilium-operator
-  topologySpreadConstraints: []
-  #   - maxSkew: 1
-  #     topologyKey: topology.kubernetes.io/zone
-  #     whenUnsatisfiable: DoNotSchedule
-
-  # -- Node labels for cilium-operator pod assignment
-  # ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector
-  nodeSelector:
-    kubernetes.io/os: linux
-  # -- Node tolerations for cilium-operator scheduling to nodes with taints
-  # ref: https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/
-  # Toleration for agentNotReadyTaintKey taint is always added to cilium-operator pods.
-  # @schema
-  # type: [null, array]
-  # @schema
-  tolerations:
-    - key: "node-role.kubernetes.io/control-plane"
-      operator: Exists
-    - key: "node-role.kubernetes.io/master" #deprecated
-      operator: Exists
-    - key: "node.kubernetes.io/not-ready"
-      operator: Exists
-    - key: "node.cloudprovider.kubernetes.io/uninitialized"
-      operator: Exists
-  # -- Additional cilium-operator container arguments.
-  extraArgs: []
-  # -- Additional cilium-operator environment variables.
-  extraEnv: []
-  # -- Additional cilium-operator hostPath mounts.
-  extraHostPathMounts: []
-  # - name: host-mnt-data
-  #   mountPath: /host/mnt/data
-  #   hostPath: /mnt/data
-  #   hostPathType: Directory
-  #   readOnly: true
-  #   mountPropagation: HostToContainer
-
-  # -- Additional cilium-operator volumes.
-  extraVolumes: []
-  # -- Additional cilium-operator volumeMounts.
-  extraVolumeMounts: []
-  # -- Annotations to be added to all top-level cilium-operator objects (resources under templates/cilium-operator)
-  annotations: {}
-  # -- HostNetwork setting
-  hostNetwork: true
-  # -- Security context to be added to cilium-operator pods
-  podSecurityContext:
-    seccompProfile:
-      type: RuntimeDefault
-  # -- Annotations to be added to cilium-operator pods
-  podAnnotations: {}
-  # -- Labels to be added to cilium-operator pods
-  podLabels: {}
-  # PodDisruptionBudget settings
-  podDisruptionBudget:
-    # -- enable PodDisruptionBudget
-    # ref: https://kubernetes.io/docs/concepts/workloads/pods/disruptions/
-    enabled: false
-    # @schema
-    # type: [null, integer, string]
-    # @schema
-    # -- Minimum number/percentage of pods that should remain scheduled.
-    # When it's set, maxUnavailable must be disabled by `maxUnavailable: null`
-    minAvailable: null
-    # @schema
-    # type: [null, integer, string]
-    # @schema
-    # -- Maximum number/percentage of pods that may be made unavailable
-    maxUnavailable: 1
-    # @schema
-    # type: [null, string]
-    # @schema
-    # -- How are unhealthy, but running, pods counted for eviction
-    unhealthyPodEvictionPolicy: null
-  # -- cilium-operator resource limits & requests
-  # ref: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
-  resources: {}
-  #   limits:
-  #     cpu: 1000m
-  #     memory: 1Gi
-  #   requests:
-  #     cpu: 100m
-  #     memory: 128Mi
-
-  # -- Security context to be added to cilium-operator pods
-  securityContext:
-    capabilities:
-      drop:
-      - ALL
-    allowPrivilegeEscalation: false
-  # runAsUser: 0
-
-  # -- Interval for endpoint garbage collection.
-  endpointGCInterval: "5m0s"
-  # -- Interval for cilium node garbage collection.
-  nodeGCInterval: "5m0s"
-  # -- Interval for identity garbage collection.
-  identityGCInterval: "15m0s"
-  # -- Timeout for identity heartbeats.
-  identityHeartbeatTimeout: "30m0s"
-  pprof:
-    # -- Enable pprof for cilium-operator
-    enabled: false
-    # -- Configure pprof listen address for cilium-operator
-    address: localhost
-    # -- Configure pprof listen port for cilium-operator
-    port: 6061
-    # -- Enable mutex contention profiling for cilium-operator and set the fraction of sampled events (set to 1 to sample all events)
-    mutexProfileFraction: 0
-    # -- Enable goroutine blocking profiling for cilium-operator and set the rate of sampled events in nanoseconds (set to 1 to sample all events [warning: performance overhead])
-    blockProfileRate: 0
-  # -- Enable prometheus metrics for cilium-operator on the configured port at
-  # /metrics
-  prometheus:
-    metricsService: false
-    enabled: true
-    port: 9963
-    serviceMonitor:
-      # -- Enable service monitors.
-      # This requires the prometheus CRDs to be available (see https://github.com/prometheus-operator/prometheus-operator/blob/main/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml)
-      enabled: false
-      # -- Labels to add to ServiceMonitor cilium-operator
-      labels: {}
-      # -- Annotations to add to ServiceMonitor cilium-operator
-      annotations: {}
-      # -- jobLabel to add for ServiceMonitor cilium-operator
-      jobLabel: ""
-      # -- Interval for scrape metrics.
-      interval: "10s"
-      # @schema
-      # type: [null, string]
-      # @schema
-      # -- Timeout after which scrape is considered to be failed.
-      scrapeTimeout: ~
-      # @schema
-      # type: [null, array]
-      # @schema
-      # -- Relabeling configs for the ServiceMonitor cilium-operator
-      relabelings: ~
-      # @schema
-      # type: [null, array]
-      # @schema
-      # -- Metrics relabeling configs for the ServiceMonitor cilium-operator
-      metricRelabelings: ~
-    # -- TLS configuration for Prometheus
-    tls:
-      enabled: false
-      server:
-        # -- Name of the Secret containing the certificate, key and CA files for the Prometheus server.
-        existingSecret: ""
-        mtls:
-          # When set to true enforces mutual TLS between Operator Prometheus server and its clients.
-          # False allow non-mutual TLS connections.
-          # This option has no effect when TLS is disabled.
-          enabled: false
-  # -- Grafana dashboards for cilium-operator
-  # grafana can import dashboards based on the label and value
-  # ref: https://github.com/grafana/helm-charts/tree/main/charts/grafana#sidecar-for-dashboards
-  dashboards:
-    enabled: false
-    label: grafana_dashboard
-    # @schema
-    # type: [null, string]
-    # @schema
-    namespace: ~
-    labelValue: "1"
-    annotations: {}
-  # -- Skip CRDs creation for cilium-operator
-  skipCRDCreation: false
-  # -- Remove Cilium node taint from Kubernetes nodes that have a healthy Cilium
-  # pod running.
-  removeNodeTaints: true
-  # @schema
-  # type: [null, boolean]
-  # @schema
-  # -- Taint nodes where Cilium is scheduled but not running. This prevents pods
-  # from being scheduled to nodes where Cilium is not the default CNI provider.
-  # @default -- same as removeNodeTaints
-  setNodeTaints: ~
-  # -- Set Node condition NetworkUnavailable to 'false' with the reason
-  # 'CiliumIsUp' for nodes that have a healthy Cilium pod.
-  setNodeNetworkStatus: true
-  unmanagedPodWatcher:
-    # -- Restart any pod that are not managed by Cilium.
-    restart: true
-    # -- Interval, in seconds, to check if there are any pods that are not
-    # managed by Cilium.
-    intervalSeconds: 15
-    # -- Selector for pods that should be restarted when not managed by Cilium.
-    # If not set, defaults to built-in selector "k8s-app=kube-dns". Set to empty string to select all pods.
-    # @schema
-    # type: [null, string]
-    # @schema
-    selector: ~
-nodeinit:
-  # -- Enable the node initialization DaemonSet
-  enabled: false
-  # -- node-init image.
-  image:
-    # @schema
-    # type: [null, string]
-    # @schema
-    override: ~
-    repository: "${CILIUM_NODEINIT_REPO}"
-    tag: "${CILIUM_NODEINIT_VERSION}"
-    digest: "${CILIUM_NODEINIT_DIGEST}"
-    useDigest: true
-    pullPolicy: "${PULL_POLICY}"
-  # -- The priority class to use for the nodeinit pod.
-  priorityClassName: ""
-  # -- node-init update strategy
-  updateStrategy:
-    type: RollingUpdate
-  # -- Additional nodeinit environment variables.
-  extraEnv: []
-  # -- Additional nodeinit volumes.
-  extraVolumes: []
-  # -- Additional nodeinit volumeMounts.
-  extraVolumeMounts: []
-  # -- Affinity for cilium-nodeinit
-  affinity: {}
-  # -- Node labels for nodeinit pod assignment
-  # ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector
-  nodeSelector:
-    kubernetes.io/os: linux
-  # -- Node tolerations for nodeinit scheduling to nodes with taints
-  # ref: https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/
-  tolerations:
-    - operator: Exists
-      # - key: "key"
-      #   operator: "Equal|Exists"
-      #   value: "value"
-      #   effect: "NoSchedule|PreferNoSchedule|NoExecute(1.6 only)"
-  # -- Annotations to be added to all top-level nodeinit objects (resources under templates/cilium-nodeinit)
-  annotations: {}
-  # -- Annotations to be added to node-init pods.
-  podAnnotations: {}
-  # -- Labels to be added to node-init pods.
-  podLabels: {}
-  # -- Security Context for cilium-node-init pods.
-  podSecurityContext:
-    # -- AppArmorProfile options for the `cilium-node-init` and init containers
-    appArmorProfile:
-      type: "Unconfined"
-  # -- nodeinit resource limits & requests
-  # ref: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
-  resources:
-    requests:
-      # @schema
-      # type: [integer, string]
-      # @schema
-      cpu: 100m
-      memory: 100Mi
-  # -- Security context to be added to nodeinit pods.
-  securityContext:
-    allowPrivilegeEscalation: false
-    privileged: false
-    seLinuxOptions:
-      level: 's0'
-      # Running with spc_t since we have removed the privileged mode.
-      # Users can change it to a different type as long as they have the
-      # type available on the system.
-      type: 'spc_t'
-    capabilities:
-      add:
-        # Used in iptables. Consider removing once we are iptables-free
-        - SYS_MODULE
-        # Used for nsenter
-        - NET_ADMIN
-        - SYS_ADMIN
-        - SYS_CHROOT
-        - SYS_PTRACE
-  # -- bootstrapFile is the location of the file where the bootstrap timestamp is
-  # written by the node-init DaemonSet
-  bootstrapFile: "/tmp/cilium-bootstrap.d/cilium-bootstrap-time"
-  # -- wait for Cloud init to finish on the host and assume the node has cloud init installed
-  waitForCloudInit: false
-  # -- startup offers way to customize startup nodeinit script (pre and post position)
-  startup:
-    preScript: ""
-    postScript: ""
-  # -- prestop offers way to customize prestop nodeinit script (pre and post position)
-  prestop:
-    preScript: ""
-    postScript: ""
-preflight:
-  # -- Enable Cilium pre-flight resources (required for upgrade)
-  enabled: false
-  # -- Cilium pre-flight image.
-  image:
-    # @schema
-    # type: [null, string]
-    # @schema
-    override: ~
-    repository: "${CILIUM_REPO}"
-    tag: "${CILIUM_VERSION}"
-    # cilium-digest
-    digest: ${CILIUM_DIGEST}
-    useDigest: ${USE_DIGESTS}
-    pullPolicy: "${PULL_POLICY}"
-  envoy:
-    # -- Envoy pre-flight image.
-    image:
-      # @schema
-      # type: [null, string]
-      # @schema
-      override: ~
-      repository: "${CILIUM_ENVOY_REPO}"
-      tag: "${CILIUM_ENVOY_VERSION}"
-      pullPolicy: "${PULL_POLICY}"
-      digest: "${CILIUM_ENVOY_DIGEST}"
-      useDigest: true
-  # -- The priority class to use for the preflight pod.
-  priorityClassName: ""
-  # -- preflight update strategy
-  updateStrategy:
-    type: RollingUpdate
-  # -- Additional preflight environment variables.
-  extraEnv: []
-  # -- Additional preflight volumes.
-  extraVolumes: []
-  # -- Additional preflight volumeMounts.
-  extraVolumeMounts: []
-  # -- Affinity for cilium-preflight
-  affinity:
-    podAffinity:
-      requiredDuringSchedulingIgnoredDuringExecution:
-        - topologyKey: kubernetes.io/hostname
-          labelSelector:
-            matchLabels:
-              k8s-app: cilium
-  # -- Node labels for preflight pod assignment
-  # ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector
-  nodeSelector:
-    kubernetes.io/os: linux
-  # -- Node tolerations for preflight scheduling to nodes with taints
-  # ref: https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/
-  tolerations:
-    - operator: Exists
-      # - key: "key"
-      #   operator: "Equal|Exists"
-      #   value: "value"
-      #   effect: "NoSchedule|PreferNoSchedule|NoExecute(1.6 only)"
-  # -- Annotations to be added to all top-level preflight objects (resources under templates/cilium-preflight)
-  annotations: {}
-  # -- Security context to be added to preflight pods.
-  podSecurityContext: {}
-  # -- Annotations to be added to preflight pods
-  podAnnotations: {}
-  # -- Labels to be added to the preflight pod.
-  podLabels: {}
-  # PodDisruptionBudget settings
-  podDisruptionBudget:
-    # -- enable PodDisruptionBudget
-    # ref: https://kubernetes.io/docs/concepts/workloads/pods/disruptions/
-    enabled: false
-    # @schema
-    # type: [null, integer, string]
-    # @schema
-    # -- Minimum number/percentage of pods that should remain scheduled.
-    # When it's set, maxUnavailable must be disabled by `maxUnavailable: null`
-    minAvailable: null
-    # @schema
-    # type: [null, integer, string]
-    # @schema
-    # -- Maximum number/percentage of pods that may be made unavailable
-    maxUnavailable: 1
-    # @schema
-    # type: [null, string]
-    # @schema
-    # -- How are unhealthy, but running, pods counted for eviction
-    unhealthyPodEvictionPolicy: null
-  # -- preflight resource limits & requests
-  # ref: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
-  resources: {}
-  #   limits:
-  #     cpu: 4000m
-  #     memory: 4Gi
-  #   requests:
-  #     cpu: 100m
-  #     memory: 512Mi
-
-  readinessProbe:
-    # -- For how long kubelet should wait before performing the first probe
-    initialDelaySeconds: 5
-    # -- interval between checks of the readiness probe
-    periodSeconds: 5
-  # -- Security context to be added to preflight pods
-  securityContext:
-    allowPrivilegeEscalation: false
-  #   runAsUser: 0
-
-  # -- Path to write the `--tofqdns-pre-cache` file to.
-  tofqdnsPreCache: ""
-  # -- Configure termination grace period for preflight Deployment and DaemonSet.
-  terminationGracePeriodSeconds: 1
-  # -- By default we should always validate the installed CNPs before upgrading
-  # Cilium. This will make sure the user will have the policies deployed in the
-  # cluster with the right schema.
-  validateCNPs: true
-# -- Explicitly enable or disable priority class.
-# .Capabilities.KubeVersion is unsettable in `helm template` calls,
-# it depends on k8s libraries version that Helm was compiled against.
-# This option allows to explicitly disable setting the priority class, which
-# is useful for rendering charts for gke clusters in advance.
-enableCriticalPriorityClass: true
-# disableEnvoyVersionCheck removes the check for Envoy, which can be useful
-# on AArch64 as the images do not currently ship a version of Envoy.
-#disableEnvoyVersionCheck: false
-clustermesh:
-  # -- Deploy clustermesh-apiserver for clustermesh. This option is typically
-  # used with ``clustermesh.config.enabled=true``. Refer to the
-  # ``clustermesh.config.enabled=true``documentation for more information.
-  useAPIServer: false
-  # -- The maximum number of clusters to support in a ClusterMesh. This value
-  # cannot be changed on running clusters, and all clusters in a ClusterMesh
-  # must be configured with the same value. Values > 255 will decrease the
-  # maximum allocatable cluster-local identities.
-  # Supported values are 255 and 511.
-  maxConnectedClusters: 255
-  # -- The time to live for the cache of a remote cluster after connectivity is
-  # lost. If the connection is not re-established within this duration, the
-  # cached data is revoked to prevent stale state. If not specified or set to
-  # 0s, the cache is never revoked (default).
-  cacheTTL: "0s"
-  # -- Enable the synchronization of Kubernetes EndpointSlices corresponding to
-  # the remote endpoints of appropriately-annotated global services through ClusterMesh
-  enableEndpointSliceSynchronization: false
-  # -- Enable Multi-Cluster Services API support (deprecated; use clustermesh.mcsapi.enabled)
-  enableMCSAPISupport: false
-  # -- Control whether policy rules assume by default the local cluster if not explicitly selected
-  policyDefaultLocalCluster: true
-
-  # -- Annotations to be added to all top-level clustermesh objects (resources under templates/clustermesh-apiserver and templates/clustermesh-config)
-  annotations: {}
-  # -- Clustermesh explicit configuration.
-  config:
-    # -- Enable the Clustermesh explicit configuration.
-    # If set to false, you need to provide the following resources yourself:
-    # - (Secret) cilium-clustermesh (used by cilium-agent/cilium-operator to connect to
-    #   the local etcd instance if KVStoreMesh is enabled or the remote clusters
-    #   if KVStoreMesh is disabled)
-    # - (Secret) cilium-kvstoremesh (used by KVStoreMesh to connect to the remote clusters)
-    # - (ConfigMap) clustermesh-remote-users (used to create one etcd user per remote cluster
-    #   if clustermesh-apiserver is used and `clustermesh.apiserver.tls.authMode` is not
-    #   set to `legacy`)
-    enabled: false
-    # -- Default dns domain for the Clustermesh API servers
-    # This is used in the case cluster addresses are not provided
-    # and IPs are used.
-    domain: mesh.cilium.io
-    # -- Clusters to be peered in the mesh.
-    # @schema
-    # type: [object, array]
-    # @schema
-    clusters: []
-    # You can use a dict of clusters (recommended):
-    # clusters:
-    #   # -- Name of the cluster
-    #   cluster1:
-    #     # -- Whether to enable this cluster in the mesh. Optional, defaults to true.
-    #     enabled: true
-    #     # -- Address of the cluster, use this if you created DNS records for
-    #     # the cluster Clustermesh API server.
-    #     address: cluster1.mesh.cilium.io
-    #     # -- Port of the cluster Clustermesh API server.
-    #     port: 2379
-    #     # -- IPs of the cluster Clustermesh API server, use multiple ones when
-    #     # you have multiple IPs to access the Clustermesh API server.
-    #     ips:
-    #     - 172.18.255.201
-    #     # -- (deprecated) base64 encoded PEM values for the cluster client certificate, private key and certificate authority.
-    #     # These fields can (and should) be omitted in case the CA is shared across clusters. In that case, the
-    #     # "remote" private key and certificate available in the local cluster are automatically used instead.
-    #     tls:
-    #       cert: ""
-    #       key: ""
-    #       caCert: ""
-    #
-    # Or alternatively you can use a list of clusters:
-    # clusters:
-    #   # -- Name of the cluster
-    # - name: cluster1
-    #   # -- Address of the cluster, use this if you created DNS records for
-    #   # the cluster Clustermesh API server.
-    #   address: cluster1.mesh.cilium.io
-    #   # -- Port of the cluster Clustermesh API server.
-    #   port: 2379
-    #   # -- IPs of the cluster Clustermesh API server, use multiple ones when
-    #   # you have multiple IPs to access the Clustermesh API server.
-    #   ips:
-    #   - 172.18.255.201
-    #   # -- (deprecated) base64 encoded PEM values for the cluster client certificate, private key and certificate authority.
-    #   # These fields can (and should) be omitted in case the CA is shared across clusters. In that case, the
-    #   # "remote" private key and certificate available in the local cluster are automatically used instead.
-    #   tls:
-    #     cert: ""
-    #     key: ""
-    #     caCert: ""
-  mcsapi:
-    # -- Enable Multi-Cluster Services API support
-    enabled: false
-    # -- Enabled MCS-API CRDs auto-installation
-    installCRDs: true
-    corednsAutoConfigure:
-      # -- Enable auto-configuration of CoreDNS for Multi-Cluster Services API.
-      #    CoreDNS MUST be at least in version v1.12.2 to run this.
-      enabled: false
-      coredns:
-        # -- The Deployment for the cluster CoreDNS service
-        deploymentName: coredns
-        # -- The Service Account name for the cluster CoreDNS service
-        serviceAccountName: coredns
-        # -- The ConfigMap name for the cluster CoreDNS service
-        configMapName: coredns
-        # -- The namespace for the cluster CoreDNS service
-        namespace: kube-system
-        # -- The cluster domain for the cluster CoreDNS service
-        clusterDomain: cluster.local
-        # -- The clusterset domain for the cluster CoreDNS service
-        clustersetDomain: clusterset.local
-      # -- Additional arguments to `clustermesh-apiserver coredns-mcsapi-auto-configure`.
-      extraArgs: []
-      # -- Seconds after which the completed job pod will be deleted
-      ttlSecondsAfterFinished: 1800
-      # -- Labels to be added to coredns-mcsapi-autoconfig pods
-      podLabels: {}
-      # -- Annotations to be added to the coredns-mcsapi-autoconfig Job
-      annotations: {}
-      # -- Node selector for coredns-mcsapi-autoconfig
-      # ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector
-      nodeSelector: {}
-      # -- Priority class for coredns-mcsapi-autoconfig
-      # ref: https://kubernetes.io/docs/concepts/scheduling-eviction/pod-priority-preemption/#priorityclass
-      priorityClassName: ""
-      # -- Node tolerations for pod assignment on nodes with taints
-      # ref: https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/
-      tolerations: []
-      # -- Resource limits for coredns-mcsapi-autoconfig
-      # ref: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers
-      resources: {}
-      # -- Additional coredns-mcsapi-autoconfig volumes.
-      extraVolumes: []
-      # -- Additional coredns-mcsapi-autoconfig volumeMounts.
-      extraVolumeMounts: []
-      # -- Affinity for coredns-mcsapi-autoconfig
-      affinity: {}
-  apiserver:
-    # -- Clustermesh API server image.
-    image:
-      # @schema
-      # type: [null, string]
-      # @schema
-      override: ~
-      repository: "${CLUSTERMESH_APISERVER_REPO}"
-      tag: "${CILIUM_VERSION}"
-      # clustermesh-apiserver-digest
-      digest: ${CLUSTERMESH_APISERVER_DIGEST}
-      useDigest: ${USE_DIGESTS}
-      pullPolicy: "${PULL_POLICY}"
-
-    # -- TCP port for the clustermesh-apiserver health API.
-    healthPort: 9880
-    # -- Configuration for the clustermesh-apiserver readiness probe.
-    readinessProbe: {}
-
-    etcd:
-      # The etcd binary is included in the clustermesh API server image, so the same image from above is reused.
-      # Independent override isn't supported, because clustermesh-apiserver is tested against the etcd version it is
-      # built with.
-
-      # -- Specifies the resources for etcd container in the apiserver
-      resources: {}
-      #   requests:
-      #     cpu: 200m
-      #     memory: 256Mi
-      #   limits:
-      #     cpu: 1000m
-      #     memory: 256Mi
-
-      # -- Security context to be added to clustermesh-apiserver etcd containers
-      securityContext:
-        allowPrivilegeEscalation: false
-        capabilities:
-          drop:
-            - ALL
-      # -- lifecycle setting for the etcd container
-      lifecycle: {}
-      init:
-        # -- Specifies the resources for etcd init container in the apiserver
-        resources: {}
-        #   requests:
-        #     cpu: 100m
-        #     memory: 100Mi
-        #   limits:
-        #     cpu: 100m
-        #     memory: 100Mi
-
-        # -- Additional arguments to `clustermesh-apiserver etcdinit`.
-        extraArgs: []
-        # -- Additional environment variables to `clustermesh-apiserver etcdinit`.
-        extraEnv: []
-
-      # @schema
-      # enum: [Disk, Memory]
-      # @schema
-      # -- Specifies whether etcd data is stored in a temporary volume backed by
-      # the node's default medium, such as disk, SSD or network storage (Disk), or
-      # RAM (Memory). The Memory option enables improved etcd read and write
-      # performance at the cost of additional memory usage, which counts against
-      # the memory limits of the container.
-      storageMedium: Disk
-
-    kvstoremesh:
-      # -- Enable KVStoreMesh. KVStoreMesh caches the information retrieved
-      # from the remote clusters in the local etcd instance (deprecated - KVStoreMesh will always be enabled once the option is removed).
-      enabled: true
-
-      # -- TCP port for the KVStoreMesh health API.
-      healthPort: 9881
-      # -- Configuration for the KVStoreMesh readiness probe.
-      readinessProbe: {}
-
-      # -- Additional KVStoreMesh arguments.
-      extraArgs: []
-      # -- Additional KVStoreMesh environment variables.
-      extraEnv: []
-      # -- Resource requests and limits for the KVStoreMesh container
-      resources: {}
-      #   requests:
-      #     cpu: 100m
-      #     memory: 64Mi
-      #   limits:
-      #     cpu: 1000m
-      #     memory: 1024M
-
-      # -- Additional KVStoreMesh volumeMounts.
-      extraVolumeMounts: []
-      # -- KVStoreMesh Security context
-      securityContext:
-        allowPrivilegeEscalation: false
-        capabilities:
-          drop:
-            - ALL
-      # -- lifecycle setting for the KVStoreMesh container
-      lifecycle: {}
-      # -- Specify the KVStore mode when running KVStoreMesh
-      # Supported values:
-      # - "internal": remote cluster identities are cached in etcd that runs as a sidecar within ``clustermesh-apiserver`` pod.
-      # - "external": ``clustermesh-apiserver`` will sync remote cluster information to the etcd used as kvstore. This can't be enabled with crd identity allocation mode.
-      kvstoreMode: "internal"
-    service:
-      # -- (bool) Set externallyCreated to true to create the clustermesh-apiserver service outside this helm chart.
-      # For example after external load balancer controllers are created.
-      externallyCreated: false
-      # -- The type of service used for apiserver access.
-      type: NodePort
-      # -- Optional port to use as the node port for apiserver access.
-      nodePort: 32379
-      # -- Annotations for the clustermesh-apiserver service.
-      # Example annotations to configure an internal load balancer on different cloud providers:
-      # * AKS: service.beta.kubernetes.io/azure-load-balancer-internal: "true"
-      # * EKS: service.beta.kubernetes.io/aws-load-balancer-scheme: "internal"
-      # * GKE: networking.gke.io/load-balancer-type: "Internal"
-      annotations: {}
-      # -- Labels for the clustermesh-apiserver service.
-      labels: {}
-      # @schema
-      # enum: [Local, Cluster]
-      # @schema
-      # -- The externalTrafficPolicy of service used for apiserver access.
-      externalTrafficPolicy: Cluster
-      # @schema
-      # enum: [Local, Cluster]
-      # @schema
-      # -- The internalTrafficPolicy of service used for apiserver access.
-      internalTrafficPolicy: Cluster
-      # @schema
-      # enum: [HAOnly, Always, Never]
-      # @schema
-      # -- Defines when to enable session affinity.
-      # Each replica in a clustermesh-apiserver deployment runs its own discrete
-      # etcd cluster. Remote clients connect to one of the replicas through a
-      # shared Kubernetes Service. A client reconnecting to a different backend
-      # will require a full resync to ensure data integrity. Session affinity
-      # can reduce the likelihood of this happening, but may not be supported
-      # by all cloud providers.
-      # Possible values:
-      #  - "HAOnly" (default) Only enable session affinity for deployments with more than 1 replica.
-      #  - "Always" Always enable session affinity.
-      #  - "Never" Never enable session affinity. Useful in environments where
-      #            session affinity is not supported, but may lead to slightly
-      #            degraded performance due to more frequent reconnections.
-      enableSessionAffinity: "HAOnly"
-      # @schema
-      # type: [null, string]
-      # @schema
-      # -- Configure a loadBalancerClass.
-      # Allows to configure the loadBalancerClass on the clustermesh-apiserver
-      # LB service in case the Service type is set to LoadBalancer
-      # (requires Kubernetes 1.24+).
-      loadBalancerClass: ~
-      # @schema
-      # type: [null, string]
-      # @schema
-      # -- Configure a specific loadBalancerIP.
-      # Allows to configure a specific loadBalancerIP on the clustermesh-apiserver
-      # LB service in case the Service type is set to LoadBalancer.
-      loadBalancerIP: ~
-      # -- Configure loadBalancerSourceRanges.
-      # Allows to configure the source IP ranges allowed to access the
-      # clustermesh-apiserver LB service in case the Service type is set to LoadBalancer.
-      loadBalancerSourceRanges: []
-    # -- Number of replicas run for the clustermesh-apiserver deployment.
-    replicas: 1
-    # -- lifecycle setting for the apiserver container
-    lifecycle: {}
-    # -- terminationGracePeriodSeconds for the clustermesh-apiserver deployment
-    terminationGracePeriodSeconds: 30
-    # -- Additional clustermesh-apiserver arguments.
-    extraArgs: []
-    # -- Additional clustermesh-apiserver environment variables.
-    extraEnv: []
-    # -- Additional clustermesh-apiserver volumes.
-    extraVolumes: []
-    # -- Additional clustermesh-apiserver volumeMounts.
-    extraVolumeMounts: []
-    # -- Security context to be added to clustermesh-apiserver containers
-    securityContext:
-      allowPrivilegeEscalation: false
-      capabilities:
-        drop:
-          - ALL
-    # -- Security context to be added to clustermesh-apiserver pods
-    podSecurityContext:
-      runAsNonRoot: true
-      runAsUser: 65532
-      runAsGroup: 65532
-      fsGroup: 65532
-    # -- Annotations to be added to clustermesh-apiserver pods
-    podAnnotations: {}
-    # -- Labels to be added to clustermesh-apiserver pods
-    podLabels: {}
-    # PodDisruptionBudget settings
-    podDisruptionBudget:
-      # -- enable PodDisruptionBudget
-      # ref: https://kubernetes.io/docs/concepts/workloads/pods/disruptions/
-      enabled: false
-      # @schema
-      # type: [null, integer, string]
-      # @schema
-      # -- Minimum number/percentage of pods that should remain scheduled.
-      # When it's set, maxUnavailable must be disabled by `maxUnavailable: null`
-      minAvailable: null
-      # @schema
-      # type: [null, integer, string]
-      # @schema
-      # -- Maximum number/percentage of pods that may be made unavailable
-      maxUnavailable: 1
-      # @schema
-      # type: [null, string]
-      # @schema
-      # -- How are unhealthy, but running, pods counted for eviction
-      unhealthyPodEvictionPolicy: null
-    # -- Resource requests and limits for the clustermesh-apiserver
-    resources: {}
-    #   requests:
-    #     cpu: 100m
-    #     memory: 64Mi
-    #   limits:
-    #     cpu: 1000m
-    #     memory: 1024M
-
-    # -- Affinity for clustermesh.apiserver
-    affinity:
-      podAntiAffinity:
-        preferredDuringSchedulingIgnoredDuringExecution:
-          - weight: 100
-            podAffinityTerm:
-              labelSelector:
-                matchLabels:
-                  k8s-app: clustermesh-apiserver
-              topologyKey: kubernetes.io/hostname
-    # -- Pod topology spread constraints for clustermesh-apiserver
-    topologySpreadConstraints: []
-    #   - maxSkew: 1
-    #     topologyKey: topology.kubernetes.io/zone
-    #     whenUnsatisfiable: DoNotSchedule
-
-    # -- Node labels for pod assignment
-    # ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector
-    nodeSelector:
-      kubernetes.io/os: linux
-    # -- Node tolerations for pod assignment on nodes with taints
-    # ref: https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/
-    tolerations: []
-    # -- clustermesh-apiserver update strategy
-    updateStrategy:
-      type: RollingUpdate
-      rollingUpdate:
-        # @schema
-        # type: [integer, string]
-        # @schema
-        maxSurge: 1
-        # @schema
-        # type: [integer, string]
-        # @schema
-        maxUnavailable: 0
-    # -- The priority class to use for clustermesh-apiserver
-    priorityClassName: ""
-    tls:
-      # -- Configure the clustermesh authentication mode.
-      # Supported values:
-      # - legacy:     All clusters access remote clustermesh instances with the same
-      #               username (i.e., remote). The "remote" certificate must be
-      #               generated with CN=remote if provided manually.
-      # - migration:  Intermediate mode required to upgrade from legacy to cluster
-      #               (and vice versa) with no disruption. Specifically, it enables
-      #               the creation of the per-cluster usernames, while still using
-      #               the common one for authentication. The "remote" certificate must
-      #               be generated with CN=remote if provided manually (same as legacy).
-      # - cluster:    Each cluster accesses remote etcd instances with a username
-      #               depending on the local cluster name (i.e., remote-<cluster-name>).
-      #               The "remote" certificate must be generated with CN=remote-<cluster-name>
-      #               if provided manually. Cluster mode is meaningful only when the same
-      #               CA is shared across all clusters part of the mesh.
-      authMode: migration
-      # -- (deprecated) Allow users to provide their own certificates
-      # Users may need to provide their certificates using
-      # a mechanism that requires they provide their own secrets.
-      # This setting does not apply to any of the auto-generated
-      # mechanisms below, it only restricts the creation of secrets
-      # via the `tls-provided` templates.
-      # This option is deprecated as secrets are expected to be created
-      # externally when 'auto' is not enabled.
-      enableSecrets: true
-      # -- Configure automatic TLS certificates generation.
-      # A Kubernetes CronJob is used the generate any
-      # certificates not provided by the user at installation
-      # time.
-      auto:
-        # -- When set to true, automatically generate a CA and certificates to
-        # enable mTLS between clustermesh-apiserver and external workload instances.
-        #
-        # When set to false you need to pre-create the following secrets:
-        # - clustermesh-apiserver-server-cert
-        # - clustermesh-apiserver-admin-cert
-        # - clustermesh-apiserver-remote-cert
-        # - clustermesh-apiserver-local-cert
-        # The above secret should at least contains the keys `tls.crt` and `tls.key`
-        # and optionally `ca.crt` if a CA bundle is not configured.
-        enabled: true
-        # Sets the method to auto-generate certificates. Supported values:
-        # - helm:         This method uses Helm to generate all certificates.
-        # - cronJob:      This method uses a Kubernetes CronJob the generate any
-        #                 certificates not provided by the user at installation
-        #                 time.
-        # - certmanager:  This method use cert-manager to generate & rotate certificates.
-        method: helm
-        # -- Generated certificates validity duration in days.
-        certValidityDuration: 1095
-        # -- Schedule for certificates regeneration (regardless of their expiration date).
-        # Only used if method is "cronJob". If nil, then no recurring job will be created.
-        # Instead, only the one-shot job is deployed to generate the certificates at
-        # installation time.
-        #
-        # Due to the out-of-band distribution of client certs to external workloads the
-        # CA is (re)regenerated only if it is not provided as a helm value and the k8s
-        # secret is manually deleted.
-        #
-        # Defaults to none. Commented syntax gives midnight of the first day of every
-        # fourth month. For syntax, see
-        # https://kubernetes.io/docs/concepts/workloads/controllers/cron-jobs/#schedule-syntax
-        # schedule: "0 0 1 */4 *"
-
-        # [Example]
-        # certManagerIssuerRef:
-        #   group: cert-manager.io
-        #   kind: ClusterIssuer
-        #   name: ca-issuer
-        # -- certmanager issuer used when clustermesh.apiserver.tls.auto.method=certmanager.
-        certManagerIssuerRef: {}
-
-      # -- base64 encoded PEM values for the clustermesh-apiserver server certificate and private key.
-      # Used if 'auto' is not enabled.
-      server:
-        # -- Deprecated, as secrets will always need to be created externally if `auto` is disabled.
-        cert: ""
-        # -- Deprecated, as secrets will always need to be created externally if `auto` is disabled.
-        key: ""
-        # -- Extra DNS names added to certificate when it's auto generated
-        extraDnsNames: []
-        # -- Extra IP addresses added to certificate when it's auto generated
-        extraIpAddresses: []
-      # -- base64 encoded PEM values for the clustermesh-apiserver admin certificate and private key.
-      # Used if 'auto' is not enabled.
-      admin:
-        # -- Deprecated, as secrets will always need to be created externally if `auto` is disabled.
-        cert: ""
-        # -- Deprecated, as secrets will always need to be created externally if `auto` is disabled.
-        key: ""
-      # -- base64 encoded PEM values for the clustermesh-apiserver remote cluster certificate and private key.
-      # Used if 'auto' is not enabled.
-      remote:
-        # -- Deprecated, as secrets will always need to be created externally if `auto` is disabled.
-        cert: ""
-        # -- Deprecated, as secrets will always need to be created externally if `auto` is disabled.
-        key: ""
-    # clustermesh-apiserver Prometheus metrics configuration
-    metrics:
-      # -- Enables exporting apiserver metrics in OpenMetrics format.
-      enabled: true
-      # -- Configure the port the apiserver metric server listens on.
-      port: 9962
-      kvstoremesh:
-        # -- Enables exporting KVStoreMesh metrics in OpenMetrics format.
-        enabled: true
-        # -- Configure the port the KVStoreMesh metric server listens on.
-        port: 9964
-      etcd:
-        # -- Enables exporting etcd metrics in OpenMetrics format.
-        enabled: true
-        # -- Set level of detail for etcd metrics; specify 'extensive' to include server side gRPC histogram metrics.
-        mode: basic
-        # -- Configure the port the etcd metric server listens on.
-        port: 9963
-      serviceMonitor:
-        # -- Enable service monitor.
-        # This requires the prometheus CRDs to be available (see https://github.com/prometheus-operator/prometheus-operator/blob/main/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml)
-        enabled: false
-        # -- Labels to add to ServiceMonitor clustermesh-apiserver
-        labels: {}
-        # -- Annotations to add to ServiceMonitor clustermesh-apiserver
-        annotations: {}
-        # -- Specify the Kubernetes namespace where Prometheus expects to find
-        # service monitors configured.
-        # namespace: ""
-
-        # -- Interval for scrape metrics (apiserver metrics)
-        interval: "10s"
-        # @schema
-        # type: [null, string]
-        # @schema
-        # -- Timeout after which scrape is considered to be failed.
-        scrapeTimeout: ~
-        # @schema
-        # type: [null, array]
-        # @schema
-        # -- Relabeling configs for the ServiceMonitor clustermesh-apiserver (apiserver metrics)
-        relabelings: ~
-        # @schema
-        # type: [null, array]
-        # @schema
-        # -- Metrics relabeling configs for the ServiceMonitor clustermesh-apiserver (apiserver metrics)
-        metricRelabelings: ~
-        kvstoremesh:
-          # -- Interval for scrape metrics (KVStoreMesh metrics)
-          interval: "10s"
-          # @schema
-          # type: [null, string]
-          # @schema
-          # -- Timeout after which scrape is considered to be failed.
-          scrapeTimeout: ~
-          # @schema
-          # type: [null, array]
-          # @schema
-          # -- Relabeling configs for the ServiceMonitor clustermesh-apiserver (KVStoreMesh metrics)
-          relabelings: ~
-          # @schema
-          # type: [null, array]
-          # @schema
-          # -- Metrics relabeling configs for the ServiceMonitor clustermesh-apiserver (KVStoreMesh metrics)
-          metricRelabelings: ~
-        etcd:
-          # -- Interval for scrape metrics (etcd metrics)
-          interval: "10s"
-          # @schema
-          # type: [null, string]
-          # @schema
-          # -- Timeout after which scrape is considered to be failed.
-          scrapeTimeout: ~
-          # @schema
-          # type: [null, array]
-          # @schema
-          # -- Relabeling configs for the ServiceMonitor clustermesh-apiserver (etcd metrics)
-          relabelings: ~
-          # @schema
-          # type: [null, array]
-          # @schema
-          # -- Metrics relabeling configs for the ServiceMonitor clustermesh-apiserver (etcd metrics)
-          metricRelabelings: ~
-# -- Configure cgroup related configuration
-cgroup:
-  autoMount:
-    # -- Enable auto mount of cgroup2 filesystem.
-    # When `autoMount` is enabled, cgroup2 filesystem is mounted at
-    # `cgroup.hostRoot` path on the underlying host and inside the cilium agent pod.
-    # If users disable `autoMount`, it's expected that users have mounted
-    # cgroup2 filesystem at the specified `cgroup.hostRoot` volume, and then the
-    # volume will be mounted inside the cilium agent pod at the same path.
-    enabled: true
-    # -- Init Container Cgroup Automount resource limits & requests
-    resources: {}
-    #   limits:
-    #     cpu: 100m
-    #     memory: 128Mi
-    #   requests:
-    #     cpu: 100m
-    #     memory: 128Mi
-  # -- Configure cgroup root where cgroup2 filesystem is mounted on the host (see also: `cgroup.autoMount`)
-  hostRoot: /run/cilium/cgroupv2
-# -- Configure sysctl override described in #20072.
-sysctlfix:
-  # -- Enable the sysctl override. When enabled, the init container will mount the /proc of the host so that the `sysctlfix` utility can execute.
-  enabled: true
-# -- Configure whether to unload DNS policy rules on graceful shutdown
-# dnsPolicyUnloadOnShutdown: false
-
-# -- Configure the key of the taint indicating that Cilium is not ready on the node.
-# When set to a value starting with `ignore-taint.cluster-autoscaler.kubernetes.io/`, the Cluster Autoscaler will ignore the taint on its decisions, allowing the cluster to scale up.
-agentNotReadyTaintKey: "node.cilium.io/agent-not-ready"
-dnsProxy:
-  # -- Timeout (in seconds) when closing the connection between the DNS proxy and the upstream server. If set to 0, the connection is closed immediately (with TCP RST). If set to -1, the connection is closed asynchronously in the background.
-  socketLingerTimeout: 10
-  # -- DNS response code for rejecting DNS requests, available options are '[nameError refused]'.
-  dnsRejectResponseCode: refused
-  # -- Allow the DNS proxy to compress responses to endpoints that are larger than 512 Bytes or the EDNS0 option, if present.
-  enableDnsCompression: true
-  # -- Maximum number of IPs to maintain per FQDN name for each endpoint.
-  endpointMaxIpPerHostname: 1000
-  # -- Time during which idle but previously active connections with expired DNS lookups are still considered alive.
-  idleConnectionGracePeriod: 0s
-  # -- Maximum number of IPs to retain for expired DNS lookups with still-active connections.
-  maxDeferredConnectionDeletes: 10000
-  # -- The minimum time, in seconds, to use DNS data for toFQDNs policies. If
-  # the upstream DNS server returns a DNS record with a shorter TTL, Cilium
-  # overwrites the TTL with this value. Setting this value to zero means that
-  # Cilium will honor the TTLs returned by the upstream DNS server.
-  minTtl: 0
-  # -- DNS cache data at this path is preloaded on agent startup.
-  preCache: ""
-  # -- Global port on which the in-agent DNS proxy should listen. Default 0 is a OS-assigned port.
-  proxyPort: 0
-  # -- The maximum time the DNS proxy holds an allowed DNS response before sending it along. Responses are sent as soon as the datapath is updated with the new IP information.
-  proxyResponseMaxDelay: 100ms
-  # -- DNS proxy operation mode (true/false, or unset to use version dependent defaults)
-  # enableTransparentMode: true
-  # -- Pre-allocate ToFQDN identities. This reduces DNS proxy tail latency, at the potential cost of some
-  # unnecessary policymap entries. Disable this if you have a large (200+) number of unique ToFQDN selectors.
-  preAllocateIdentities: true
-# -- SCTP Configuration Values
-sctp:
-  # -- Enable SCTP support. NOTE: Currently, SCTP support does not support rewriting ports or multihoming.
-  enabled: false
-# -- Enable Non-Default-Deny policies
-enableNonDefaultDenyPolicies: true
-# Configuration for types of authentication for Cilium (beta)
-authentication:
-  # -- Enable authentication processing and garbage collection.
-  # Note that if disabled, policy enforcement will still block requests that require authentication.
-  # But the resulting authentication requests for these requests will not be processed, therefore the requests not be allowed.
-  enabled: false
-  # -- Buffer size of the channel Cilium uses to receive authentication events from the signal map.
-  queueSize: 1024
-  # -- Buffer size of the channel Cilium uses to receive certificate expiration events from auth handlers.
-  rotatedIdentitiesQueueSize: 1024
-  # -- Interval for garbage collection of auth map entries.
-  gcInterval: "5m0s"
-  # Configuration for Cilium's service-to-service mutual authentication using TLS handshakes.
-  # Note that this is not full mTLS support without also enabling encryption of some form.
-  # Current encryption options are WireGuard or IPsec, configured in encryption block above.
-  mutual:
-    # -- Port on the agent where mutual authentication handshakes between agents will be performed
-    port: 4250
-    # -- Timeout for connecting to the remote node TCP socket
-    connectTimeout: 5s
-    # Settings for SPIRE
-    spire:
-      # -- Enable SPIRE integration (beta)
-      enabled: false
-      # -- Annotations to be added to all top-level spire objects (resources under templates/spire)
-      annotations: {}
-      # Settings to control the SPIRE installation and configuration
-      install:
-        # -- Enable SPIRE installation.
-        # This will only take effect only if authentication.mutual.spire.enabled is true
-        enabled: true
-        # -- SPIRE namespace to install into
-        namespace: cilium-spire
-        # -- SPIRE namespace already exists. Set to true if Helm should not create, manage, and import the SPIRE namespace.
-        existingNamespace: false
-        # -- init container image of SPIRE agent and server
-        initImage:
-          # @schema
-          # type: [null, string]
-          # @schema
-          override: ~
-          repository: "${SPIRE_INIT_REPO}"
-          tag: "${SPIRE_INIT_VERSION}"
-          digest: "${SPIRE_INIT_DIGEST}"
-          useDigest: true
-          pullPolicy: "${PULL_POLICY}"
-        # SPIRE agent configuration
-        agent:
-          # -- The priority class to use for the spire agent
-          priorityClassName: ""
-          # -- SPIRE agent image
-          image:
-            # @schema
-            # type: [null, string]
-            # @schema
-            override: ~
-            repository: "${SPIRE_AGENT_REPO}"
-            tag: "${SPIRE_AGENT_VERSION}"
-            digest: "${SPIRE_AGENT_DIGEST}"
-            useDigest: true
-            pullPolicy: "${PULL_POLICY}"
-          # -- SPIRE agent service account
-          serviceAccount:
-            create: true
-            name: spire-agent
-          # -- SPIRE agent annotations
-          annotations: {}
-          # -- SPIRE agent labels
-          labels: {}
-          # -- container resource limits & requests
-          resources: {}
-          # -- SPIRE Workload Attestor kubelet verification.
-          skipKubeletVerification: true
-          # -- SPIRE agent tolerations configuration
-          # By default it follows the same tolerations as the agent itself
-          # to allow the Cilium agent on this node to connect to SPIRE.
-          # ref: https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/
-          tolerations:
-            - key: node.kubernetes.io/not-ready
-              effect: NoSchedule
-            - key: node-role.kubernetes.io/master
-              effect: NoSchedule
-            - key: node-role.kubernetes.io/control-plane
-              effect: NoSchedule
-            - key: node.cloudprovider.kubernetes.io/uninitialized
-              effect: NoSchedule
-              value: "true"
-            - key: CriticalAddonsOnly
-              operator: "Exists"
-          # -- SPIRE agent affinity configuration
-          affinity: {}
-          # -- SPIRE agent nodeSelector configuration
-          # ref: ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector
-          nodeSelector: {}
-          # -- Security context to be added to spire agent pods.
-          # SecurityContext holds pod-level security attributes and common container settings.
-          # ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod
-          podSecurityContext: {}
-          # -- Security context to be added to spire agent containers.
-          # SecurityContext holds pod-level security attributes and common container settings.
-          # ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container
-          securityContext: {}
-        server:
-          # -- The priority class to use for the spire server
-          priorityClassName: ""
-          # -- SPIRE server image
-          image:
-            # @schema
-            # type: [null, string]
-            # @schema
-            override: ~
-            repository: "${SPIRE_SERVER_REPO}"
-            tag: "${SPIRE_SERVER_VERSION}"
-            digest: "${SPIRE_SERVER_DIGEST}"
-            useDigest: true
-            pullPolicy: "${PULL_POLICY}"
-          # -- SPIRE server service account
-          serviceAccount:
-            create: true
-            name: spire-server
-          # -- SPIRE server init containers
-          initContainers: []
-          # -- SPIRE server annotations
-          annotations: {}
-          # -- SPIRE server labels
-          labels: {}
-          # SPIRE server service configuration
-          # -- container resource limits & requests
-          resources: {}
-          service:
-            # -- Service type for the SPIRE server service
-            type: ClusterIP
-            # -- Annotations to be added to the SPIRE server service
-            annotations: {}
-            # -- Labels to be added to the SPIRE server service
-            labels: {}
-          # -- SPIRE server affinity configuration
-          affinity: {}
-          # -- SPIRE server nodeSelector configuration
-          # ref: ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector
-          nodeSelector: {}
-          # -- SPIRE server tolerations configuration
-          # ref: https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/
-          tolerations: []
-          # SPIRE server datastorage configuration
-          dataStorage:
-            # -- Enable SPIRE server data storage
-            enabled: true
-            # -- Size of the SPIRE server data storage
-            size: 1Gi
-            # -- Access mode of the SPIRE server data storage
-            accessMode: ReadWriteOnce
-            # @schema
-            # type: [null, string]
-            # @schema
-            # -- StorageClass of the SPIRE server data storage
-            storageClass: null
-          # -- Security context to be added to spire server pods.
-          # SecurityContext holds pod-level security attributes and common container settings.
-          # ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod
-          podSecurityContext: {}
-          # -- Security context to be added to spire server containers.
-          # SecurityContext holds pod-level security attributes and common container settings.
-          # ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container
-          securityContext: {}
-          # SPIRE CA configuration
-          ca:
-            # -- SPIRE CA key type
-            # AWS requires the use of RSA. EC cryptography is not supported
-            keyType: "rsa-4096"
-            # -- SPIRE CA Subject
-            subject:
-              country: "US"
-              organization: "SPIRE"
-              commonName: "Cilium SPIRE CA"
-      # @schema
-      # type: [null, string]
-      # @schema
-      # -- SPIRE server address used by Cilium Operator
-      #
-      # If k8s Service DNS along with port number is used (e.g. <service-name>.<namespace>.svc(.*):<port-number> format),
-      # Cilium Operator will resolve its address by looking up the clusterIP from Service resource.
-      #
-      # Example values: 10.0.0.1:8081, spire-server.cilium-spire.svc:8081
-      serverAddress: ~
-      # -- SPIFFE trust domain to use for fetching certificates
-      trustDomain: spiffe.cilium
-      # -- SPIRE socket path where the SPIRE delegated api agent is listening
-      adminSocketPath: /run/spire/sockets/admin.sock
-      # -- SPIRE socket path where the SPIRE workload agent is listening.
-      # Applies to both the Cilium Agent and Operator
-      agentSocketPath: /run/spire/sockets/agent/agent.sock
-      # -- SPIRE connection timeout
-      connectionTimeout: 30s
-# -- Enable Internal Traffic Policy
-enableInternalTrafficPolicy: true
-# -- Enable LoadBalancer IP Address Management
-enableLBIPAM: true
-# -- Standalone DNS Proxy Configuration
-# Note: The standalone DNS proxy uses the agent's dnsProxy.* configuration
-# for DNS settings (proxyPort, enableDnsCompression) to ensure consistency.
-standaloneDnsProxy:
-  # -- Enable standalone DNS proxy (alpha feature)
-  enabled: false
-  # -- Roll out Standalone DNS proxy automatically when configmap is updated.
-  rollOutPods: false
-  # -- Standalone DNS proxy annotations
-  annotations: {}
-  # -- Standalone DNS proxy debug mode
-  debug: false
-  # -- Standalone DNS proxy server port
-  serverPort: 10095
-  # -- Standalone DNS proxy Node Selector
-  nodeSelector:
-    kubernetes.io/os: linux
-  # -- Standalone DNS proxy tolerations
-  tolerations: []
-  # -- Standalone DNS proxy auto mount service account token
-  automountServiceAccountToken: false
-  # -- Standalone DNS proxy update strategy
-  updateStrategy:
-    type: RollingUpdate
-    rollingUpdate:
-      maxSurge: 2
-      maxUnavailable: 0
-  # -- Standalone DNS proxy image
-  image:
-    # @schema
-    # type: [null, string]
-    # @schema
-    override: ~
-    repository: "${STANDALONE_DNS_PROXY_REPO}"
-    tag: "${STANDALONE_DNS_PROXY_VERSION}"
-    digest: "${STANDALONE_DNS_PROXY_DIGEST}"
-    useDigest: ${USE_DIGESTS}
-    pullPolicy: "${PULL_POLICY}"
diff --git a/packages/system/cilium/files/ipam-migration.sh b/packages/system/cilium/files/ipam-migration.sh
new file mode 100755
index 0000000000..002a1bf786
--- /dev/null
+++ b/packages/system/cilium/files/ipam-migration.sh
@@ -0,0 +1,376 @@
+#!/bin/bash
+# Moves a cluster installed under ipam.mode kubernetes onto the cluster-pool
+# allocation that values-kubeovn.yaml configures. Runs as a post-upgrade hook,
+# once the agents and the operator run in cluster-pool mode.
+#
+# First kube-ovn is told to stay out of Cilium's way, before any agent moves.
+# The pool goes into excludeIps of kube-ovn's default subnet, so kube-ovn never
+# hands a pod an address Cilium is about to take. A fresh install gets that
+# exclusion from --default-exclude-ips, which kube-ovn reads only when it
+# creates the subnet. Each node's current Ingress IP goes in too when it lies
+# outside the pool. After the move the agent keeps the old Ingress IP in its
+# ipcache as reserved:ingress, so a pod must never get it later. The old router
+# IP is dropped from the ipcache and goes back to kube-ovn. If kube-ovn has
+# already handed out addresses from the pool, the run stops here, before any
+# agent moves onto them. It also stops when the pool lies outside that subnet,
+# because Cilium's addresses would then sit outside kube-ovn's subnets, where
+# Gateway API traffic between nodes breaks, and when the pool has fewer blocks
+# than there are nodes.
+#
+# Then every CiliumNode is moved. cilium-operator gives a CiliumNode a pool
+# CIDR only while its spec.ipam.podCIDRs is empty, and every agent that ran in
+# ipam.mode kubernetes has copied Node.spec.podCIDR into that field. Left alone,
+# the operator records "allocator not configured for the requested CIDR" in the
+# CiliumNode status, the spec keeps the old /24, and the agents go on taking
+# their router and Ingress IPs from it. Clearing the field any earlier does not
+# hold, because an agent still in ipam.mode kubernetes writes it back on its
+# next local node update. So for every CiliumNode this clears a CIDR outside
+# the pool, waits for the operator to allocate one inside it, and restarts the
+# agent when its router or Ingress IP is not inside the node's allocation, one
+# node at a time, because an agent reads its allocation only when it starts.
+set -euo pipefail
+shopt -s inherit_errexit
+
+: "${NAMESPACE:?}" "${POOL:?}" "${MASK:?}"
+ALLOCATION_TIMEOUT=${ALLOCATION_TIMEOUT:-180}
+AGENT_TIMEOUT=${AGENT_TIMEOUT:-180}
+POLL_INTERVAL=${POLL_INTERVAL:-2}
+
+log() {
+  printf '%s %s\n' "$(date -u +%Y-%m-%dT%H:%M:%SZ)" "$*"
+}
+
+ip_to_int() {
+  local a b c d
+  IFS=. read -r a b c d <<<"$1"
+  echo $(( (a << 24) | (b << 16) | (c << 8) | d ))
+}
+
+int_to_ip() {
+  echo "$(( $1 >> 24 & 255 )).$(( $1 >> 16 & 255 )).$(( $1 >> 8 & 255 )).$(( $1 & 255 ))"
+}
+
+# Prints the first and last address of an IPv4 CIDR as integers.
+cidr_bounds() {
+  local first size
+  first=$(ip_to_int "${1%/*}")
+  size=$(( 1 << (32 - ${1#*/}) ))
+  first=$(( first - first % size ))
+  echo "$first $(( first + size - 1 ))"
+}
+
+# Prints the bounds of an address or of a range in either form kube-ovn writes,
+# first..last in excludeIps and first-last in status.v4usingIPrange.
+entry_bounds() {
+  local first last
+  case $1 in
+    *..*) first=${1%%..*} last=${1##*..} ;;
+    *-*) first=${1%%-*} last=${1##*-} ;;
+    *) first=$1 last=$1 ;;
+  esac
+  echo "$(ip_to_int "$first") $(ip_to_int "$last")"
+}
+
+# contains <cidr> <cidr or address>, IPv4 only.
+contains() {
+  local outer_first outer_last inner_first inner_last
+  read -r outer_first outer_last <<<"$(cidr_bounds "$1")"
+  case $2 in
+    */*) read -r inner_first inner_last <<<"$(cidr_bounds "$2")" ;;
+    *) inner_first=$(ip_to_int "$2") inner_last=$inner_first ;;
+  esac
+  [ "$inner_first" -ge "$outer_first" ] && [ "$inner_last" -le "$outer_last" ]
+}
+
+in_any() {
+  local cidrs=$1 value=$2 cidr
+  for cidr in $cidrs; do
+    if contains "$cidr" "$value"; then
+      return 0
+    fi
+  done
+  return 1
+}
+
+# covered <excludeIps JSON> <first> <last> succeeds when one entry spans the
+# whole first..last range, given as integers.
+covered() {
+  local entry entry_first entry_last
+  for entry in $(jq -r '.[] | select(contains(":") | not)' <<<"$1"); do
+    read -r entry_first entry_last <<<"$(entry_bounds "$entry")"
+    if [ "$entry_first" -le "$2" ] && [ "$entry_last" -ge "$3" ]; then
+      return 0
+    fi
+  done
+  return 1
+}
+
+# overlaps <comma-separated ranges> <CIDRs> succeeds when one of the ranges, in
+# the form kube-ovn writes its status, overlaps one of the CIDRs.
+overlaps() {
+  local entry entry_first entry_last cidr first last
+  for entry in $(tr ',' ' ' <<<"$1"); do
+    read -r entry_first entry_last <<<"$(entry_bounds "$entry")"
+    for cidr in $2; do
+      read -r first last <<<"$(cidr_bounds "$cidr")"
+      if [ "$entry_first" -le "$last" ] && [ "$entry_last" -ge "$first" ]; then
+        return 0
+      fi
+    done
+  done
+  return 1
+}
+
+# check_capacity <CiliumNode list JSON>
+# The operator gives every CiliumNode one /MASK block of the pool. A node
+# cleared beyond that would wait for a CIDR that never comes, and its agent
+# loses pod networking on its next restart, so the run stops before anything
+# is changed.
+check_capacity() {
+  local nodes blocks=0 pool prefix
+  nodes=$(jq '.items | length' <<<"$1")
+  for pool in $POOL; do
+    prefix=${pool#*/}
+    if [ "$MASK" -lt "$prefix" ]; then
+      log "the /$MASK blocks are wider than the pool $pool. Nothing was changed"
+      return 1
+    fi
+    blocks=$(( blocks + (1 << (MASK - prefix)) ))
+  done
+  if [ "$nodes" -gt "$blocks" ]; then
+    log "there are $nodes CiliumNodes but $POOL holds only $blocks /$MASK blocks. Nothing was changed"
+    return 1
+  fi
+}
+
+# exclude_from_kube_ovn <CiliumNode list JSON>
+exclude_from_kube_ovn() {
+  local ciliumnodes=$1 attempt subnet name cidr excludes pools pool first last ip add busy deadline current ipobjects ipname node
+  if [ -z "$(kubectl get customresourcedefinition subnets.kubeovn.io --ignore-not-found -o name)" ]; then
+    log "kube-ovn is not installed, nothing to exclude"
+    return 0
+  fi
+  # kube-ovn rewrites excludeIps into its own canonical form, so a patch can
+  # race with it. The test operation turns that into a failed patch, and the
+  # subnet is read again.
+  for attempt in 1 2 3 4 5; do
+    subnet=$(kubectl get subnets.kubeovn.io -o json | jq -c '[.items[] | select(.spec.default == true)] | first // empty')
+    if [ -z "$subnet" ]; then
+      log "kube-ovn has no default subnet, nothing to exclude"
+      return 0
+    fi
+    name=$(jq -r '.metadata.name' <<<"$subnet")
+    cidr=$(jq -r '.spec.cidrBlock | split(",") | map(select(contains(":") | not)) | first // empty' <<<"$subnet")
+    excludes=$(jq -c '.spec.excludeIps // []' <<<"$subnet")
+    add=()
+    pools=''
+    for pool in $POOL; do
+      if [ -z "$cidr" ] || ! contains "$cidr" "$pool"; then
+        log "$pool lies outside subnet $name (${cidr:-no IPv4 block}). networking.podCIDR has to match the cidrBlock of $name, otherwise the agents would take their addresses from outside kube-ovn's subnets. Nothing was changed"
+        return 1
+      fi
+      pools="${pools:+$pools }$pool"
+      read -r first last <<<"$(cidr_bounds "$pool")"
+      if ! covered "$excludes" "$first" "$last"; then
+        add+=("$(int_to_ip "$first")..$(int_to_ip "$last")")
+      fi
+    done
+    for ip in $(jq -r '.items[].spec.ingress.ipv4 // empty' <<<"$ciliumnodes"); do
+      if [ -z "$cidr" ] || ! contains "$cidr" "$ip" || in_any "$POOL" "$ip"; then
+        continue
+      fi
+      first=$(ip_to_int "$ip")
+      if ! covered "$excludes" "$first" "$first"; then
+        add+=("$ip")
+      fi
+    done
+    if [ "${#add[@]}" -eq 0 ]; then
+      log "subnet $name already excludes the pool and the current Ingress IPs"
+      break
+    fi
+    log "subnet $name: excluding ${add[*]} from kube-ovn allocation"
+    if kubectl patch subnets.kubeovn.io "$name" --type=json \
+      -p "[{\"op\":\"test\",\"path\":\"/spec/excludeIps\",\"value\":$excludes},{\"op\":\"replace\",\"path\":\"/spec/excludeIps\",\"value\":$(jq -c '. + $ARGS.positional' --args "${add[@]}" <<<"$excludes")}]"; then
+      break
+    fi
+    if [ "$attempt" -eq 5 ]; then
+      log "subnet $name kept changing under the patch, giving up"
+      return 1
+    fi
+    log "subnet $name changed while it was being patched, reading it again"
+    sleep "$POLL_INTERVAL"
+  done
+  busy=$(tr ',' '\n' <<<"$(jq -r '.status.v4usingIPrange // ""' <<<"$subnet")" | while read -r entry; do
+    if [ -n "$entry" ] && overlaps "$entry" "$pools"; then
+      echo "$entry"
+    fi
+  done | paste -sd ' ' -)
+  if [ -n "$busy" ]; then
+    log "subnet $name has already handed out $busy from $pools. Recreate the pods holding them, kube-ovn now places them elsewhere, and the next upgrade attempt moves the agents"
+    return 1
+  fi
+  # kube-ovn applies excludeIps to its allocator asynchronously and then
+  # rewrites the subnet status. Once status.v4availableIPrange stops offering
+  # the pool, nothing new can land in it. status.v4usingIPrange cannot answer
+  # what is still in it, because kube-ovn leaves excluded addresses out of it,
+  # so the IP objects it keeps per allocation are read instead. That also
+  # covers a run where an earlier attempt already added the exclusion.
+  deadline=$(( $(date +%s) + ALLOCATION_TIMEOUT ))
+  while :; do
+    current=$(kubectl get subnets.kubeovn.io "$name" -o json)
+    if ! overlaps "$(jq -r '.status.v4availableIPrange // ""' <<<"$current")" "$pools"; then
+      break
+    fi
+    if [ "$(date +%s)" -ge "$deadline" ]; then
+      log "subnet $name still offers addresses from $pools after ${ALLOCATION_TIMEOUT}s, kube-ovn has not applied the exclusion"
+      return 1
+    fi
+    sleep "$POLL_INTERVAL"
+  done
+  ipobjects=$(kubectl get ips.kubeovn.io -o json \
+    | jq -c --arg s "$name" '[.items[] | select(.spec.subnet == $s) | {name: .metadata.name, ip: (.spec.v4IpAddress // "")}]')
+  busy=$(jq -r '.[] | "\(.name) \(.ip)"' <<<"$ipobjects" | while read -r ipname ip; do
+    if [ -n "$ip" ] && in_any "$pools" "$ip"; then
+      echo "$ipname=$ip"
+    fi
+  done | paste -sd ' ' -)
+  if [ -n "$busy" ]; then
+    log "subnet $name still has $busy in use inside $pools. Recreate those pods, kube-ovn now places them elsewhere, and the next upgrade attempt moves the agents"
+    return 1
+  fi
+  # A pod that holds a node's current Ingress IP keeps the address after the
+  # move, and that node keeps it in its ipcache as reserved:ingress, so the pod
+  # stays unreachable from there until it is recreated.
+  jq -r --argjson cn "$ciliumnodes" '
+    ([$cn.items[] | select(.spec.ingress.ipv4) | {key: .spec.ingress.ipv4, value: .metadata.name}] | from_entries) as $ingress
+    | .[] | select($ingress[.ip]) | "\(.name) \(.ip) \($ingress[.ip])"' <<<"$ipobjects" \
+    | while read -r ipname ip node; do
+      if ! in_any "$POOL" "$ip"; then
+        log "$ipname holds $ip, the Ingress IP of $node before the move. Recreate it once the run is done, $node keeps that address as reserved:ingress"
+      fi
+    done
+}
+
+ipv4_pod_cidrs() {
+  jq -r '.spec.ipam.podCIDRs // [] | .[] | select(contains(":") | not)'
+}
+
+# Prints the node's spec.ipam.podCIDRs as a JSON array when an IPv4 entry lies
+# outside the pool, and nothing otherwise.
+stale_cidrs() {
+  local node cidr
+  node=$(kubectl get ciliumnode "$1" -o json)
+  for cidr in $(ipv4_pod_cidrs <<<"$node"); do
+    if ! in_any "$POOL" "$cidr"; then
+      jq -c '.spec.ipam.podCIDRs' <<<"$node"
+      return 0
+    fi
+  done
+}
+
+# The test operation turns a value written after it was read, by the operator
+# or by an agent, into a failed patch instead of a lost update.
+clear_cidrs() {
+  log "$1: clearing spec.ipam.podCIDRs $2"
+  kubectl patch ciliumnode "$1" --type=json \
+    -p "[{\"op\":\"test\",\"path\":\"/spec/ipam/podCIDRs\",\"value\":$2},{\"op\":\"remove\",\"path\":\"/spec/ipam/podCIDRs\"}]"
+}
+
+# Prints the node's IPv4 podCIDRs once there are some and all of them lie
+# inside the pool.
+wait_for_pool_cidrs() {
+  local deadline cidrs cidr allocated outside
+  deadline=$(( $(date +%s) + ALLOCATION_TIMEOUT ))
+  while :; do
+    cidrs=$(kubectl get ciliumnode "$1" -o json | ipv4_pod_cidrs) || cidrs=
+    allocated=''
+    outside=''
+    for cidr in $cidrs; do
+      if in_any "$POOL" "$cidr"; then
+        allocated="${allocated:+$allocated }$cidr"
+      else
+        outside=1
+      fi
+    done
+    if [ -n "$allocated" ] && [ -z "$outside" ]; then
+      echo "$allocated"
+      return 0
+    fi
+    if [ "$(date +%s)" -ge "$deadline" ]; then
+      return 1
+    fi
+    sleep "$POLL_INTERVAL"
+  done
+}
+
+# Succeeds when the agent has published a router IP and it, and the Ingress IP
+# when there is one, lie inside the given CIDRs. Fails on any other answer,
+# including a failed read.
+agent_inside() {
+  local node router ingress
+  node=$(kubectl get ciliumnode "$1" -o json) || return 1
+  router=$(jq -r '[.spec.addresses[]? | select(.type == "CiliumInternalIP") | .ip | select(contains(":") | not)] | first // empty' <<<"$node")
+  ingress=$(jq -r '.spec.ingress.ipv4 // empty' <<<"$node")
+  [ -n "$router" ] || return 1
+  in_any "$2" "$router" || return 1
+  [ -z "$ingress" ] || in_any "$2" "$ingress"
+}
+
+agent_pods() {
+  kubectl -n "$NAMESPACE" get pods -l k8s-app=cilium --field-selector "spec.nodeName=$1" -o json \
+    | jq -r '.items[] | "\(.metadata.name) \([.status.conditions[]? | select(.type == "Ready") | .status] | first // "Unknown")"'
+}
+
+restart_agent() {
+  local node=$1 cidrs=$2 ready pods pod deadline
+  ready=$(kubectl get node "$node" --ignore-not-found -o json | jq -r '[.status.conditions[]? | select(.type == "Ready") | .status] | first // empty') || return 1
+  if [ "$ready" != True ]; then
+    log "$node: node is not Ready, its agent takes its addresses from $cidrs when it starts"
+    return 0
+  fi
+  pods=$(agent_pods "$node") || return 1
+  pod=$(awk 'NR == 1 { print $1 }' <<<"$pods")
+  if [ -z "$pod" ]; then
+    log "$node: no agent pod, the next one takes its addresses from $cidrs"
+    return 0
+  fi
+  log "$node: restarting $pod so the agent takes its addresses from $cidrs"
+  kubectl -n "$NAMESPACE" delete pod "$pod" --wait=false
+  deadline=$(( $(date +%s) + AGENT_TIMEOUT ))
+  while :; do
+    if agent_pods "$node" | awk -v old="$pod" '$1 != old && $2 == "True" { found = 1 } END { exit !found }' \
+      && agent_inside "$node" "$cidrs"; then
+      log "$node: agent ready on $cidrs"
+      return 0
+    fi
+    if [ "$(date +%s)" -ge "$deadline" ]; then
+      log "$node: agent not ready on $cidrs after ${AGENT_TIMEOUT}s"
+      return 1
+    fi
+    sleep "$POLL_INTERVAL"
+  done
+}
+
+ciliumnodes=$(kubectl get ciliumnodes -o json)
+check_capacity "$ciliumnodes"
+exclude_from_kube_ovn "$ciliumnodes"
+failed=0
+for node in $(jq -r '.items[].metadata.name' <<<"$ciliumnodes"); do
+  stale=$(stale_cidrs "$node")
+  if [ -n "$stale" ]; then
+    clear_cidrs "$node" "$stale"
+  fi
+  if ! cidrs=$(wait_for_pool_cidrs "$node"); then
+    log "$node: no CIDR from $POOL after ${ALLOCATION_TIMEOUT}s, see status.ipam.operator-status of the CiliumNode and the cilium-operator log"
+    failed=1
+    continue
+  fi
+  if agent_inside "$node" "$cidrs"; then
+    log "$node: agent on $cidrs"
+    continue
+  fi
+  if ! restart_agent "$node" "$cidrs"; then
+    failed=1
+  fi
+done
+exit "$failed"
diff --git a/packages/system/cilium/images/cilium-operator/Dockerfile b/packages/system/cilium/images/cilium-operator/Dockerfile
new file mode 100644
index 0000000000..19b3db09f0
--- /dev/null
+++ b/packages/system/cilium/images/cilium-operator/Dockerfile
@@ -0,0 +1,51 @@
+ARG VERSION=v1.20.2
+ARG SOURCE_SHA256=2d9dd9697bf59dc592053734ac0dffe63892fc3e1a4d1fd28e1f44a0c5a49916
+ARG UPSTREAM_DIGEST=sha256:64d8798350e8569b8e7622563fed6e44dce2625f311e4651b774816516c744fc
+
+# The Go toolchain of upstream's builder image (images/builder/Dockerfile),
+# which compiles the upstream operator.
+FROM --platform=$BUILDPLATFORM docker.io/library/golang:1.26.8@sha256:3c3e25a4da13fd0478eed2df1eb35a0e667094a7124d3993a6a1d30f71c17e79 AS builder
+ARG GOPROXY
+ARG VERSION
+ARG SOURCE_SHA256
+
+WORKDIR /go/src/github.com/cilium/cilium
+
+RUN curl -fsSL -o /tmp/source.tar.gz https://github.com/cilium/cilium/archive/refs/tags/${VERSION}.tar.gz && \
+    echo "${SOURCE_SHA256}  /tmp/source.tar.gz" | sha256sum -c - && \
+    tar -xzf /tmp/source.tar.gz --strip-components=1 && rm /tmp/source.tar.gz
+
+COPY patches /patches
+RUN git apply /patches/*.diff
+
+ENV GOFLAGS=-mod=vendor CGO_ENABLED=0
+
+# go build never compiles a _test.go, so nothing else runs the tests of the
+# packages the patches touch. Each package is tested from its own directory:
+# that finds the module it belongs to, and an empty list runs nothing.
+# The list is read into a variable first: a for loop drops the exit status
+# of a command substitution, so a patch git cannot read would leave the list
+# empty and the step green.
+RUN files=$(git apply --numstat /patches/*.diff) || exit 1; \
+    for dir in $(printf '%s\n' "$files" | cut -f3 | grep '\.go$' | xargs -r -n1 dirname | sort -u); do \
+      (cd "$dir" && go test .) || exit 1; \
+    done
+
+# Declared after the tests so they run once on the build platform rather than
+# once per target platform.
+ARG TARGETOS
+ARG TARGETARCH
+
+# Same tags and version variable as upstream's cilium-operator-generic target.
+# The version keeps upstream's "<version> <revision> <date>" shape, which
+# pkg/version.FromString needs to fill the operator's version metric; the
+# revision field marks this build apart from the upstream one. The date is the
+# commit time GitHub stamps on every file of the tag archive, so the same
+# inputs give the same binary.
+RUN GOOS=$TARGETOS GOARCH=$TARGETARCH go build \
+    -tags osusergo,ipam_provider_operator \
+    -ldflags "-s -w -X 'github.com/cilium/cilium/pkg/version.ciliumVersion=${VERSION#v} cozystack-patched $(date -u -d @$(stat -c %Y VERSION) +%Y-%m-%dT%H:%M:%SZ)'" \
+    -o /out/cilium-operator-generic ./operator
+
+FROM quay.io/cilium/operator-generic:${VERSION}@${UPSTREAM_DIGEST}
+COPY --from=builder /out/cilium-operator-generic /usr/bin/cilium-operator-generic
diff --git a/packages/system/cilium/images/cilium-operator/patches/conflict-https-and-tls-passthrough-unless-passthrough-is-narrower.diff b/packages/system/cilium/images/cilium-operator/patches/conflict-https-and-tls-passthrough-unless-passthrough-is-narrower.diff
new file mode 100644
index 0000000000..640d407c35
--- /dev/null
+++ b/packages/system/cilium/images/cilium-operator/patches/conflict-https-and-tls-passthrough-unless-passthrough-is-narrower.diff
@@ -0,0 +1,1012 @@
+Accept an HTTPS-terminate and a TLS-passthrough listener on one port when the
+passthrough hostname is strictly narrower than the HTTPS one.
+
+Downstream only: Gateway API leaves cross-protocol listeners on one port to
+the implementation (kubernetes-sigs/gateway-api#4271), and upstream Cilium
+waits for that before changing the rule. Drop it once a shipped Cilium
+release accepts the pair on its own.
+
+diff --git a/operator/pkg/gateway-api/gateway_reconcile_test.go b/operator/pkg/gateway-api/gateway_reconcile_test.go
+index 4dcdcacc6f..fab15d5f85 100644
+--- a/operator/pkg/gateway-api/gateway_reconcile_test.go
++++ b/operator/pkg/gateway-api/gateway_reconcile_test.go
+@@ -334,6 +334,8 @@ func Test_Conformance(t *testing.T) {
+ 		{name: "gateway-multi-port-https-with-multi-port-tls-passthrough", gateway: []gwDetails{{FullName: types.NamespacedName{Name: "multi-port-https-with-multi-port-tls-passthrough", Namespace: "gateway-conformance-infra"}}}},
+ 		{name: "gateway-cross-protocol-same-hostname", gateway: []gwDetails{{FullName: types.NamespacedName{Name: "cross-protocol-same-hostname", Namespace: "gateway-conformance-infra"}}}},
+ 		{name: "gateway-cross-protocol-same-port-same-hostname", gateway: []gwDetails{{FullName: types.NamespacedName{Name: "cross-protocol-same-port-same-hostname", Namespace: "gateway-conformance-infra"}, wantErr: true}}},
++		{name: "gateway-cross-protocol-same-port-wildcard-and-specific-hostname", gateway: []gwDetails{{FullName: types.NamespacedName{Name: "cross-protocol-same-port-wildcard-and-specific-hostname", Namespace: "gateway-conformance-infra"}}}},
++		{name: "gateway-cross-protocol-same-port-wildcard-passthrough-and-specific-https", gateway: []gwDetails{{FullName: types.NamespacedName{Name: "cross-protocol-same-port-wildcard-passthrough-and-specific-https", Namespace: "gateway-conformance-infra"}, wantErr: true}}},
+ 		{name: "gateway-ns-restricted-same-hostname", gateway: []gwDetails{{FullName: types.NamespacedName{Name: "ns-restricted-same-hostname", Namespace: "gateway-conformance-infra"}}}},
+ 		{name: "gatewayclassconfig-nodeport", gateway: []gwDetails{{FullName: types.NamespacedName{Name: "nodeport-gateway", Namespace: "gateway-conformance-infra"}}}},
+ 		// hostNetwork mode tests
+diff --git a/operator/pkg/gateway-api/status_listener.go b/operator/pkg/gateway-api/status_listener.go
+index dfa93f6c01..9359c041e9 100644
+--- a/operator/pkg/gateway-api/status_listener.go
++++ b/operator/pkg/gateway-api/status_listener.go
+@@ -242,12 +242,22 @@ func (m *ListenerStatusManager) listenerPairConflict(first, second *gatewayv1.Li
+ 		return gatewayv1.ListenerReasonProtocolConflict, true
+ 	}
+ 
+-	// HTTPS termination and TLS passthrough both consume the SNI of the same
+-	// port, so they conflict whenever their hostnames can match the same value.
++	// HTTPS termination and TLS passthrough share the SNI of the port. Envoy
++	// picks the most specific server_names match before transport protocol,
++	// so the pair is served when the passthrough hostname is strictly narrower
++	// than the HTTPS one. The passthrough chains take their server_names from
++	// the attached TLSRoutes, which are confined to the listener hostname, so
++	// any other overlap lets a route claim the HTTPS listener's exact name and
++	// produce two chains with the same match, which Envoy rejects for the
++	// whole listener.
+ 	if m.isHTTPSAndTLSPassthroughPair(first, second) {
+-		if helpers.SNIHostnamesIntersect(
+-			helpers.ListenerHostname(first), helpers.ListenerHostname(second),
+-		) {
++		https, passthrough := first, second
++		if helpers.IsTLSPassthroughListener(first) {
++			https, passthrough = second, first
++		}
++		h := m.normalizedListenerHostname(https)
++		p := m.normalizedListenerHostname(passthrough)
++		if helpers.SNIHostnamesIntersect(h, p) && !strictlyNarrowerHostname(p, h) {
+ 			return gatewayv1.ListenerReasonProtocolConflict, true
+ 		}
+ 		return "", false
+@@ -263,6 +273,22 @@ func (m *ListenerStatusManager) listenerPairConflict(first, second *gatewayv1.Li
+ 	return "", false
+ }
+ 
++// strictlyNarrowerHostname reports whether every SNI narrow matches is also
++// matched by wide, and the two differ. Both are normalized, "*" standing for
++// a listener without a hostname.
++func strictlyNarrowerHostname(narrow, wide string) bool {
++	if narrow == wide {
++		return false
++	}
++	if wide == "*" {
++		return true
++	}
++	if !strings.HasPrefix(wide, "*.") {
++		return false
++	}
++	return strings.HasSuffix(narrow, wide[1:])
++}
++
+ func (m *ListenerStatusManager) isL4Protocol(p gatewayv1.ProtocolType) bool {
+ 	return p == gatewayv1.TCPProtocolType || p == gatewayv1.UDPProtocolType
+ }
+@@ -291,7 +317,7 @@ func (m *ListenerStatusManager) listenerConflictMessage(
+ 		)
+ 	case m.isHTTPSAndTLSPassthroughPair(self, other):
+ 		return fmt.Sprintf(
+-			"Listener conflicts with listener %q: same port %d has overlapping HTTPS and TLS passthrough hostnames.",
++			"Listener conflicts with listener %q: same port %d has overlapping HTTPS and TLS passthrough hostnames, and the TLS passthrough hostname is not strictly narrower than the HTTPS one.",
+ 			other.Name, self.Port,
+ 		)
+ 	default:
+diff --git a/operator/pkg/gateway-api/status_listener_conflict_test.go b/operator/pkg/gateway-api/status_listener_conflict_test.go
+index 4052bfd6d9..89bea36ba1 100644
+--- a/operator/pkg/gateway-api/status_listener_conflict_test.go
++++ b/operator/pkg/gateway-api/status_listener_conflict_test.go
+@@ -117,12 +117,55 @@ func Test_listenerPairConflict(t *testing.T) {
+ 			wantOK:     true,
+ 		},
+ 		{
+-			name:       "https and tls passthrough wildcard overlap conflict",
++			name:       "https and tls passthrough identical wildcard hostname conflict",
+ 			first:      muxedListener("a", gatewayv1.HTTPSProtocolType, 443, "*.example.com"),
+-			second:     tlsPassthroughListener("b", 443, "foo.example.com"),
++			second:     tlsPassthroughListener("b", 443, "*.example.com"),
+ 			wantReason: gatewayv1.ListenerReasonProtocolConflict,
+ 			wantOK:     true,
+ 		},
++		{
++			name:       "https and tls passthrough both catch-all conflict",
++			first:      muxedListener("a", gatewayv1.HTTPSProtocolType, 443, ""),
++			second:     tlsPassthroughListener("b", 443, ""),
++			wantReason: gatewayv1.ListenerReasonProtocolConflict,
++			wantOK:     true,
++		},
++		{
++			name:   "wildcard https and specific tls passthrough coexist",
++			first:  muxedListener("a", gatewayv1.HTTPSProtocolType, 443, "*.example.com"),
++			second: tlsPassthroughListener("b", 443, "foo.example.com"),
++		},
++		{
++			// A TLSRoute on the wildcard passthrough listener may claim
++			// foo.example.com and give its chain the HTTPS chain's match.
++			name:       "specific https and wildcard tls passthrough conflict",
++			first:      muxedListener("a", gatewayv1.HTTPSProtocolType, 443, "foo.example.com"),
++			second:     tlsPassthroughListener("b", 443, "*.example.com"),
++			wantReason: gatewayv1.ListenerReasonProtocolConflict,
++			wantOK:     true,
++		},
++		{
++			name:       "catch-all tls passthrough and specific https conflict",
++			first:      tlsPassthroughListener("a", 443, ""),
++			second:     muxedListener("b", gatewayv1.HTTPSProtocolType, 443, "foo.example.com"),
++			wantReason: gatewayv1.ListenerReasonProtocolConflict,
++			wantOK:     true,
++		},
++		{
++			name:   "narrower wildcard tls passthrough under wider wildcard https coexist",
++			first:  muxedListener("a", gatewayv1.HTTPSProtocolType, 443, "*.example.com"),
++			second: tlsPassthroughListener("b", 443, "*.db.example.com"),
++		},
++		{
++			name:   "wildcard https and its apex tls passthrough coexist",
++			first:  muxedListener("a", gatewayv1.HTTPSProtocolType, 443, "*.example.com"),
++			second: tlsPassthroughListener("b", 443, "example.com"),
++		},
++		{
++			name:   "catch-all https and specific tls passthrough coexist",
++			first:  muxedListener("a", gatewayv1.HTTPSProtocolType, 443, ""),
++			second: tlsPassthroughListener("b", 443, "foo.example.com"),
++		},
+ 		{
+ 			name:   "https and tls passthrough disjoint hostnames coexist",
+ 			first:  muxedListener("a", gatewayv1.HTTPSProtocolType, 443, "foo.example.com"),
+@@ -203,7 +246,7 @@ func Test_conflictsWithinSource(t *testing.T) {
+ 		assert.Equal(t, gatewayv1.ListenerReasonProtocolConflict, conflicts["b"].reason)
+ 	})
+ 
+-	t.Run("https and tls passthrough overlap keeps existing message", func(t *testing.T) {
++	t.Run("https and tls passthrough overlap names the narrower passthrough rule", func(t *testing.T) {
+ 		gw := gatewayWithConflictListeners(
+ 			muxedListener("https", gatewayv1.HTTPSProtocolType, 443, "api.example.test"),
+ 			tlsPassthroughListener("tls-passthrough", 443, "api.example.test"),
+@@ -211,20 +254,39 @@ func Test_conflictsWithinSource(t *testing.T) {
+ 		conflicts := manager.conflictsWithinSource(gw.Spec.Listeners)
+ 		assert.Equal(t, gatewayv1.ListenerReasonProtocolConflict, conflicts["https"].reason)
+ 		assert.Equal(t,
+-			`Listener conflicts with listener "tls-passthrough": same port 443 has overlapping HTTPS and TLS passthrough hostnames.`,
++			`Listener conflicts with listener "tls-passthrough": same port 443 has overlapping HTTPS and TLS passthrough hostnames, and the TLS passthrough hostname is not strictly narrower than the HTTPS one.`,
+ 			conflicts["https"].message)
+ 	})
++
++	t.Run("wildcard tls passthrough over specific https names the narrower passthrough rule", func(t *testing.T) {
++		gw := gatewayWithConflictListeners(
++			muxedListener("https", gatewayv1.HTTPSProtocolType, 443, "api.example.test"),
++			tlsPassthroughListener("tls-passthrough", 443, "*.example.test"),
++		)
++		conflicts := manager.conflictsWithinSource(gw.Spec.Listeners)
++		assert.Equal(t,
++			`Listener conflicts with listener "https": same port 443 has overlapping HTTPS and TLS passthrough hostnames, and the TLS passthrough hostname is not strictly narrower than the HTTPS one.`,
++			conflicts["tls-passthrough"].message)
++	})
+ }
+ 
+ func Test_acceptedListeners(t *testing.T) {
+ 	t.Run("later listener loses against an accepted listener", func(t *testing.T) {
+ 		accepted := &acceptedListeners{}
+-		accepted.accept(*muxedListener("gw-https", gatewayv1.HTTPSProtocolType, 443, "*.example.com"))
++		accepted.accept(*muxedListener("gw-https", gatewayv1.HTTPSProtocolType, 443, "foo.example.com"))
+ 
+ 		reason := accepted.checkConflict(*tlsPassthroughListener("ls-tls", 443, "foo.example.com"))
+ 		assert.Equal(t, gatewayv1.ListenerReasonProtocolConflict, reason)
+ 	})
+ 
++	t.Run("more specific tls passthrough beside an accepted wildcard https is accepted", func(t *testing.T) {
++		accepted := &acceptedListeners{}
++		accepted.accept(*muxedListener("gw-https", gatewayv1.HTTPSProtocolType, 443, "*.example.com"))
++
++		reason := accepted.checkConflict(*tlsPassthroughListener("ls-tls", 443, "foo.example.com"))
++		assert.Empty(t, string(reason))
++	})
++
+ 	t.Run("distinct hostname on the same protocol is accepted", func(t *testing.T) {
+ 		accepted := &acceptedListeners{}
+ 		accepted.accept(*muxedListener("first", gatewayv1.HTTPProtocolType, 80, "foo.example.com"))
+diff --git a/operator/pkg/gateway-api/testdata/gateway/gateway-cross-protocol-same-port-same-hostname/output/cross-protocol-same-port-same-hostname.yaml b/operator/pkg/gateway-api/testdata/gateway/gateway-cross-protocol-same-port-same-hostname/output/cross-protocol-same-port-same-hostname.yaml
+index c23386ddf6..c580ce3cae 100644
+--- a/operator/pkg/gateway-api/testdata/gateway/gateway-cross-protocol-same-port-same-hostname/output/cross-protocol-same-port-same-hostname.yaml
++++ b/operator/pkg/gateway-api/testdata/gateway/gateway-cross-protocol-same-port-same-hostname/output/cross-protocol-same-port-same-hostname.yaml
+@@ -47,12 +47,12 @@ status:
+     - attachedRoutes: 1
+       conditions:
+         - lastTransitionTime: "2026-05-05T19:06:19Z"
+-          message: 'Listener conflicts with listener "tls-passthrough": same port 443 has overlapping HTTPS and TLS passthrough hostnames.'
++          message: 'Listener conflicts with listener "tls-passthrough": same port 443 has overlapping HTTPS and TLS passthrough hostnames, and the TLS passthrough hostname is not strictly narrower than the HTTPS one.'
+           reason: ProtocolConflict
+           status: "True"
+           type: Conflicted
+         - lastTransitionTime: "2026-05-05T19:06:19Z"
+-          message: 'Listener not valid. Listener conflicts with listener "tls-passthrough": same port 443 has overlapping HTTPS and TLS passthrough hostnames.'
++          message: 'Listener not valid. Listener conflicts with listener "tls-passthrough": same port 443 has overlapping HTTPS and TLS passthrough hostnames, and the TLS passthrough hostname is not strictly narrower than the HTTPS one.'
+           reason: Invalid
+           status: "False"
+           type: Accepted
+@@ -70,12 +70,12 @@ status:
+     - attachedRoutes: 1
+       conditions:
+         - lastTransitionTime: "2026-05-05T19:06:19Z"
+-          message: 'Listener conflicts with listener "https": same port 443 has overlapping HTTPS and TLS passthrough hostnames.'
++          message: 'Listener conflicts with listener "https": same port 443 has overlapping HTTPS and TLS passthrough hostnames, and the TLS passthrough hostname is not strictly narrower than the HTTPS one.'
+           reason: ProtocolConflict
+           status: "True"
+           type: Conflicted
+         - lastTransitionTime: "2026-05-05T19:06:19Z"
+-          message: 'Listener not valid. Listener conflicts with listener "https": same port 443 has overlapping HTTPS and TLS passthrough hostnames.'
++          message: 'Listener not valid. Listener conflicts with listener "https": same port 443 has overlapping HTTPS and TLS passthrough hostnames, and the TLS passthrough hostname is not strictly narrower than the HTTPS one.'
+           reason: Invalid
+           status: "False"
+           type: Accepted
+diff --git a/operator/pkg/gateway-api/testdata/gateway/gateway-cross-protocol-same-port-wildcard-and-specific-hostname/input/cross-protocol-same-port-wildcard-and-specific-hostname.yaml b/operator/pkg/gateway-api/testdata/gateway/gateway-cross-protocol-same-port-wildcard-and-specific-hostname/input/cross-protocol-same-port-wildcard-and-specific-hostname.yaml
+new file mode 100644
+index 0000000000..8d6a7c75ec
+--- /dev/null
++++ b/operator/pkg/gateway-api/testdata/gateway/gateway-cross-protocol-same-port-wildcard-and-specific-hostname/input/cross-protocol-same-port-wildcard-and-specific-hostname.yaml
+@@ -0,0 +1,92 @@
++apiVersion: gateway.networking.k8s.io/v1
++kind: Gateway
++metadata:
++  name: cross-protocol-same-port-wildcard-and-specific-hostname
++  namespace: gateway-conformance-infra
++spec:
++  gatewayClassName: cilium
++  listeners:
++    - name: https
++      protocol: HTTPS
++      port: 443
++      hostname: "*.example.test"
++      tls:
++        certificateRefs:
++          - group: ""
++            kind: Secret
++            name: cross-protocol-tls
++            namespace: gateway-conformance-infra
++      allowedRoutes:
++        namespaces:
++          from: Same
++    - name: tls-passthrough
++      protocol: TLS
++      port: 443
++      hostname: "api.example.test"
++      tls:
++        mode: Passthrough
++      allowedRoutes:
++        namespaces:
++          from: Same
++        kinds:
++          - kind: TLSRoute
++---
++apiVersion: gateway.networking.k8s.io/v1
++kind: HTTPRoute
++metadata:
++  name: https-route
++  namespace: gateway-conformance-infra
++spec:
++  parentRefs:
++    - name: cross-protocol-same-port-wildcard-and-specific-hostname
++      sectionName: https
++  hostnames:
++    - web.example.test
++  rules:
++    - matches:
++        - path:
++            type: PathPrefix
++            value: /secure
++      backendRefs:
++        - name: infra-backend-v1
++          port: 8080
++---
++apiVersion: gateway.networking.k8s.io/v1alpha2
++kind: TLSRoute
++metadata:
++  name: tls-route
++  namespace: gateway-conformance-infra
++spec:
++  parentRefs:
++    - name: cross-protocol-same-port-wildcard-and-specific-hostname
++      namespace: gateway-conformance-infra
++      sectionName: tls-passthrough
++  hostnames:
++    - api.example.test
++  rules:
++    - backendRefs:
++        - name: tls-backend
++          port: 443
++---
++apiVersion: v1
++kind: Secret
++metadata:
++  name: cross-protocol-tls
++  namespace: gateway-conformance-infra
++type: kubernetes.io/tls
++data:
++  tls.crt: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUVORENDQXB5Z0F3SUJBZ0lSQUtEL0JMRkJmd0tJWjBXR3JIdFRINmd3RFFZSktvWklodmNOQVFFTEJRQXcKZHpFZU1Cd0dBMVVFQ2hNVmJXdGpaWEowSUdSbGRtVnNiM0J0Wlc1MElFTkJNU1l3SkFZRFZRUUxEQjEwWVcxdApZV05vUUdabFpHOXlZUzVzWVc0Z0tGUmhiU0JOWVdOb0tURXRNQ3NHQTFVRUF3d2tiV3RqWlhKMElIUmhiVzFoClkyaEFabVZrYjNKaExteGhiaUFvVkdGdElFMWhZMmdwTUI0WERUSXpNREl5TVRFeE1EZzBNMW9YRFRJMU1EVXkKTVRFeU1EZzBNMW93VVRFbk1DVUdBMVVFQ2hNZWJXdGpaWEowSUdSbGRtVnNiM0J0Wlc1MElHTmxjblJwWm1sagpZWFJsTVNZd0pBWURWUVFMREIxMFlXMXRZV05vUUdabFpHOXlZUzVzWVc0Z0tGUmhiU0JOWVdOb0tUQ0NBU0l3CkRRWUpLb1pJaHZjTkFRRUJCUUFEZ2dFUEFEQ0NBUW9DZ2dFQkFNSVp5KzBKUlZqcXBXZ2VxMmRQKzFvbGlPNEEKQ2Zabk1nNHRTcVBhbGhEUUw2TWY2OEhZTGZpenlKSXBSek1KOTA1cllkMEFjbVhtdS9nMEVvOHlrSHhGRHo1VApzZVBzMlhRbmc4TU40YXpzUm1tMWw0Zjc0b3Zhd1F6UWNiODIyUVAxQ1M2SUxaM1Z0d05qUmgybkF3dGhZQk1vCkNrbmdER2VROEdsMHRqSExGbkJkVGRTd1FSbUUyanREQmNBZ3lFR3BxKzZSZVl0Ky80N25ObjdkQ2Z0c1ZxaEUKQllyOVhIM2l0ZWZIbXNiZmo3eldGYnB0ZGtvN3E5bE1Id25CZCswaGQ0ME1tSklYTVpyT0dHRlpqYXdKREJxUwpzQnEyUTNsNlhRejhYN1AvR0E0RG44aDR3M3JwcG1pYU43TE9tR1hla2kzeFgyd3FuTSswczZhWlpac0NBd0VBCkFhTmhNRjh3RGdZRFZSMFBBUUgvQkFRREFnV2dNQk1HQTFVZEpRUU1NQW9HQ0NzR0FRVUZCd01CTUI0R0ExVWQKSXdRWU1CYUFGR1EyREIwNkNkUUZRQnNZUHllME5Cd0VyVU5FTUJjR0ExVWRFUVFRTUE2Q0RIVnVhWFIwWlhOMApMbU52YlRBTkJna3Foa2lHOXcwQkFRc0ZBQU9DQVlFQXJ0SGRLV1hSNmFFTHBmYWwxN2JpYWJDUHZJRjlqNm53CnVEemNkTVlRTHJYbThNK05IZTh4M2RwSTd1M2xsdE8rZHpMbmcrblZLUU9SM2FsUUFDU21SRDljN2llOGVUNWQKN3pLT1RrNmtlWTE5NUkxd1ZWNGpiTkxiTldhOXk0UkpRUlR2QkxBdkFQOU5WdFV3MlEvdy9FclVUcVN5eitvYgpkd250NGdZQ3c2ZEdubHVMeGxmRjM0REI5S2ZsdlZOU25reU1CL2dzQjRBM3IxR1BPSW8wR3lmNzRpZzNGV3JTCndIWUtuQmJ0WmZZTzBKVjBMQ29QeUhlOGcwWGFqWmU4RENiUC9FNlNtbFROQW1KRVNWamlnVFRjSUJBa0ZJK24KdG9CQWR4ZmhqS1VHYUNsT0hTMjljcGFpeW5qU2F5R200UmtIa3g3bWNBdWE5bFdQZjdwU2EzbUNjRmIrd0ZyMwpBQmtIRFBKSDJhY2ZhVUsxdmdLVGdPd2NHLzZLQTgyMC9QcmFvU2loTGFQSy9BN2VnNzdyMUVlWXB0ME5lcHBiClhqdlVwM1ltVmxJTVpYUHpyak9zYXN0b0RTcnN5Z2o1amRWdG00UHNsdjluUGh6RHJCamxacEVKU2NXNEpsYisKNnd0ZDdwMDNVREJTS2ZUYlZST1ZBZTVtdkp2QTBob1MKLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
++  tls.key: LS0tLS1CRUdJTiBQUklWQVRFIEtFWS0tLS0tCk1JSUV2QUlCQURBTkJna3Foa2lHOXcwQkFRRUZBQVNDQktZd2dnU2lBZ0VBQW9JQkFRRENHY3Z0Q1VWWTZxVm8KSHF0blQvdGFKWWp1QUFuR1p6SU9MVXFqMnBZUTBDK2pIK3ZCMkMzNHM4aVNLVWN6Q2ZkT2EySGRBSEpsNXJ2NApOQktQTXBCOFJROCtVN0hqN05sMEo0UEREZUdzN0VacHRaZUgrK0tMMnNFTTBIRy9OdGtEOVFrdWlDMmQxYmNEClkwWWRwd01MWVdBVEtBcEo0QXhua1BCcGRMWXh5eFp3WFUzVXNFRVpoTm83UXdYQUlNaEJxYXZ1a1htTGZ2K08KNXpaKzNRbjdiRmFvUkFXSy9WeDk0clhueDVyRzM0KzgxaFc2YlhaS082dlpUQjhKd1hmdElYZU5ESmlTRnpHYQp6aGhoV1kyc0NRd2FrckFhdGtONWVsME0vRit6L3hnUEE1L0llTU42NmFab21qZXl6cGhsM3BJdDhWOXNLcHpQCnRMT21tV0diQWdNQkFBRUNnZ0VBRWpBU29NSjJvZzlTc24vMU5iZ1Q2RzJOK0NjK3d6MldQaWZXVDZaQzI0NTIKZUVXY2RNeUoranoyZFdPeXpVQ0kwT3RVL3oxMGVzSDFLUnZRQldVS2p1cDF0RFJwZmQ4S3ZVeWFseU5zMnlSRQpzTkVZUXVEQ2FMSjExbnFOdmdvb3FhdERVZjNtc0Z4L1NxejV1L3VUV0hTbWFRVWVlYStwMmVhRjhJdkVLc1FmCjZRTmtsa2VIc3YrR1ZQditpaWJmYlhYbmU2STVhVjM1UmM0UTA4elJDZ1lYL0JOMUFZWFY2aG80UkM5ZFpWR1AKSlVrU0x6UmFkZWdvay9FT05La3JxTFpPRkpWYjJ3dEZxODVnSjAxbE9ETS9najdHcU01OU0vd2s1NUNhUUlSRAo5eDVINFg0cnBNMnJobWlOTGtJTjB0R0xLTzhYMzF1cDdoVHg5YnZKY1FLQmdRRDUxTUxXWVlVUHovdW12U3JOClFPVDlVaEVISS9ieHRDYldRdGhXM0wxcXJWVDdEQjhKa28vNi94WWxYaGw3bndWd0p6MjRqSmY5dnV4V2JCcEwKSFpSZjBRc0RPMi9PNHJxaEtEb3YvR01VQ3gyc2h6YytKN2srVDkzS05WQU5ZYTA1Z3VxTWVCOG4zMEhQcm9rRgpMZ2loVkZGMjBrOVo2U2liVXZnVE1wRjFFd0tCZ1FERzVNQmdjOG9GWG1sci83cEhLaXpDNEYzZURBWFV4VkhNCldDSWJTd015ek9YS3FEY2RYTkR6OGNRcmpoS2EyckQxZktoRTBvUlIrUXZIejhJUEMrME1zVDdRNlFzSUhZajUKQ1h1YkhyMHM1azhQSkFwK0xrMkVkSGVQWlFNL0kvdmovZ1N3eG5KOVFzNjRGV1oyNUs5elluTk5zaW9qUWVsNwpXVm1JOUlWYVdRS0JnRDNCWWdnc1F3QU5vVjh1RTQ1NUpDR2FUNnM4TUthK3FYcjlPd3o5czdUUzg5YTZ3RkZWCmNWSFNERjlnUzF4TGlzU1dicU5YM1pwVHY0ZjlZT0tBaFZUS0Q3YlUwbWFKbFNpUkVSRWJpa0pDSFN1d29PODAKVW80Y24rNkVEeTIvbjFwQUNrcCt4dlRNTXpCckxHT2paVzY3c1FkMkpUZE1jMFV4MVRDcHAxc1JBb0dBYUVWSQpyY2hHWXlZcDhwcXcxOW8rZVRRVFFmUGZvcnFIdGErR3dmUkRpd0JzZ0NCTU5MS1NRVUhBZkcwUlIrbmExL2d3CloxUk9Wb05RTDhLMXBCbkdmdDcxWmFTblNldmlBVjE5VmNkNXVlNU1DRTRHeWp3UUc1N0xoM3VYaGlTaFM5ZkMKTWNMNEJyOWRqSmg3alYwNnRpMG84ZFN6enFRaGVhOVFCMExhSHBFQ2dZQXBjOG9Cb2lLNjlzMHdYeUk0K1BoeApTY0JKMFhxREJZRmt4eVhyOFk1cEVhckVhcUN0bDFPUFBNT2lRUkRXb3hSUitGd0EvMGxhU2ZoNXh3MFUzYitxCmlaMlhwa3JiUXAwMzRyQzBVUjZwK0ttMVN2OUFWQ0FDQWpyY1EzTlphZjhiRE9XcXZwbGE3QXVxMG9HOGk2VVgKaEVLQ0tmL04zZ0Uxb01yVHhWelVEUT09Ci0tLS0tRU5EIFBSSVZBVEUgS0VZLS0tLS0K
++---
++apiVersion: v1
++kind: Service
++metadata:
++  name: cilium-gateway-cross-protocol-same-port-wildcard-and-87ff7df5mg
++  namespace: gateway-conformance-infra
++spec:
++  type: LoadBalancer
++status:
++  loadBalancer:
++    ingress:
++      - ip: 172.18.255.200
++        ipMode: VIP
+diff --git a/operator/pkg/gateway-api/testdata/gateway/gateway-cross-protocol-same-port-wildcard-and-specific-hostname/output/cec-cross-protocol-same-port-wildcard-and-specific-hostname.yaml b/operator/pkg/gateway-api/testdata/gateway/gateway-cross-protocol-same-port-wildcard-and-specific-hostname/output/cec-cross-protocol-same-port-wildcard-and-specific-hostname.yaml
+new file mode 100644
+index 0000000000..eba82452c2
+--- /dev/null
++++ b/operator/pkg/gateway-api/testdata/gateway/gateway-cross-protocol-same-port-wildcard-and-specific-hostname/output/cec-cross-protocol-same-port-wildcard-and-specific-hostname.yaml
+@@ -0,0 +1,166 @@
++metadata:
++  annotations:
++    cec.cilium.io/use-original-source-address: "false"
++  labels:
++    gateway.networking.k8s.io/gateway-name: cross-protocol-same-port-wildcard-and-specific-hostname
++  name: cilium-gateway-cross-protocol-same-port-wildcard-and-87ff7df5mg
++  namespace: gateway-conformance-infra
++  ownerReferences:
++  - apiVersion: gateway.networking.k8s.io/v1
++    controller: true
++    kind: Gateway
++    name: cross-protocol-same-port-wildcard-and-specific-hostname
++    uid: ""
++  resourceVersion: "1"
++spec:
++  backendServices:
++  - name: infra-backend-v1
++    namespace: gateway-conformance-infra
++    number:
++    - "8080"
++  - name: tls-backend
++    namespace: gateway-conformance-infra
++    number:
++    - "443"
++  resources:
++  - '@type': type.googleapis.com/envoy.config.listener.v3.Listener
++    filterChains:
++    - filterChainMatch:
++        transportProtocol: raw_buffer
++      filters:
++      - name: envoy.filters.network.http_connection_manager
++        typedConfig:
++          '@type': type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
++          commonHttpProtocolOptions:
++            maxStreamDuration: 0s
++          httpFilters:
++          - name: envoy.filters.http.grpc_web
++            typedConfig:
++              '@type': type.googleapis.com/envoy.extensions.filters.http.grpc_web.v3.GrpcWeb
++          - name: envoy.filters.http.grpc_stats
++            typedConfig:
++              '@type': type.googleapis.com/envoy.extensions.filters.http.grpc_stats.v3.FilterConfig
++              emitFilterState: true
++              enableUpstreamStats: true
++          - name: envoy.filters.http.router
++            typedConfig:
++              '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
++          internalAddressConfig: {}
++          rds:
++            routeConfigName: listener-insecure
++          statPrefix: listener-insecure
++          streamIdleTimeout: 300s
++          upgradeConfigs:
++          - upgradeType: websocket
++          useRemoteAddress: true
++    - filterChainMatch:
++        serverNames:
++        - '*.example.test'
++        transportProtocol: tls
++      filters:
++      - name: envoy.filters.network.http_connection_manager
++        typedConfig:
++          '@type': type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
++          commonHttpProtocolOptions:
++            maxStreamDuration: 0s
++          httpFilters:
++          - name: envoy.filters.http.grpc_web
++            typedConfig:
++              '@type': type.googleapis.com/envoy.extensions.filters.http.grpc_web.v3.GrpcWeb
++          - name: envoy.filters.http.grpc_stats
++            typedConfig:
++              '@type': type.googleapis.com/envoy.extensions.filters.http.grpc_stats.v3.FilterConfig
++              emitFilterState: true
++              enableUpstreamStats: true
++          - name: envoy.filters.http.router
++            typedConfig:
++              '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
++          internalAddressConfig: {}
++          rds:
++            routeConfigName: listener-secure
++          statPrefix: listener-secure
++          streamIdleTimeout: 300s
++          upgradeConfigs:
++          - upgradeType: websocket
++          useRemoteAddress: true
++      transportSocket:
++        name: envoy.transport_sockets.tls
++        typedConfig:
++          '@type': type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext
++          commonTlsContext:
++            tlsCertificateSdsSecretConfigs:
++            - name: cilium-secrets/cilium-sync-secret-9e3240dd5d81ba618935c49937e7e7dbefac584583bbc8129c126827692366f5
++    - filterChainMatch:
++        serverNames:
++        - api.example.test
++        transportProtocol: tls
++      filters:
++      - name: envoy.filters.network.tcp_proxy
++        typedConfig:
++          '@type': type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy
++          cluster: gateway-conformance-infra:tls-backend:443
++          statPrefix: tls-passthrough:api.example.test
++    listenerFilters:
++    - name: envoy.filters.listener.tls_inspector
++      typedConfig:
++        '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector
++    name: listener
++    socketOptions:
++    - description: Enable TCP keep-alive (default to enabled)
++      intValue: "1"
++      level: "1"
++      name: "9"
++    - description: TCP keep-alive idle time (in seconds) (defaults to 10s)
++      intValue: "10"
++      level: "6"
++      name: "4"
++    - description: TCP keep-alive probe intervals (in seconds) (defaults to 5s)
++      intValue: "5"
++      level: "6"
++      name: "5"
++    - description: TCP keep-alive probe max failures.
++      intValue: "10"
++      level: "6"
++      name: "6"
++  - '@type': type.googleapis.com/envoy.config.route.v3.RouteConfiguration
++    name: listener-insecure
++  - '@type': type.googleapis.com/envoy.config.route.v3.RouteConfiguration
++    name: listener-secure
++    virtualHosts:
++    - domains:
++      - web.example.test
++      - web.example.test:*
++      name: web.example.test
++      routes:
++      - match:
++          pathSeparatedPrefix: /secure
++        route:
++          cluster: gateway-conformance-infra:infra-backend-v1:8080
++          maxStreamDuration:
++            maxStreamDuration: 0s
++  - '@type': type.googleapis.com/envoy.config.cluster.v3.Cluster
++    edsClusterConfig:
++      serviceName: gateway-conformance-infra/infra-backend-v1:8080
++    name: gateway-conformance-infra:infra-backend-v1:8080
++    outlierDetection:
++      splitExternalLocalOriginErrors: true
++    type: EDS
++    typedExtensionProtocolOptions:
++      envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
++        '@type': type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions
++        commonHttpProtocolOptions:
++          idleTimeout: 60s
++        useDownstreamProtocolConfig:
++          http2ProtocolOptions: {}
++  - '@type': type.googleapis.com/envoy.config.cluster.v3.Cluster
++    edsClusterConfig:
++      serviceName: gateway-conformance-infra/tls-backend:443
++    name: gateway-conformance-infra:tls-backend:443
++    outlierDetection:
++      splitExternalLocalOriginErrors: true
++    type: EDS
++  services:
++  - name: cilium-gateway-cross-protocol-same-port-wildcard-and-87ff7df5mg
++    namespace: gateway-conformance-infra
++    ports:
++    - 443
+\ No newline at end of file
+diff --git a/operator/pkg/gateway-api/testdata/gateway/gateway-cross-protocol-same-port-wildcard-and-specific-hostname/output/cross-protocol-same-port-wildcard-and-specific-hostname.yaml b/operator/pkg/gateway-api/testdata/gateway/gateway-cross-protocol-same-port-wildcard-and-specific-hostname/output/cross-protocol-same-port-wildcard-and-specific-hostname.yaml
+new file mode 100644
+index 0000000000..57de1fd72d
+--- /dev/null
++++ b/operator/pkg/gateway-api/testdata/gateway/gateway-cross-protocol-same-port-wildcard-and-specific-hostname/output/cross-protocol-same-port-wildcard-and-specific-hostname.yaml
+@@ -0,0 +1,93 @@
++apiVersion: gateway.networking.k8s.io/v1
++kind: Gateway
++metadata:
++  name: cross-protocol-same-port-wildcard-and-specific-hostname
++  namespace: gateway-conformance-infra
++  resourceVersion: "1000"
++spec:
++  gatewayClassName: cilium
++  listeners:
++  - allowedRoutes:
++      namespaces:
++        from: Same
++    hostname: '*.example.test'
++    name: https
++    port: 443
++    protocol: HTTPS
++    tls:
++      certificateRefs:
++      - group: ""
++        kind: Secret
++        name: cross-protocol-tls
++        namespace: gateway-conformance-infra
++  - allowedRoutes:
++      kinds:
++      - kind: TLSRoute
++      namespaces:
++        from: Same
++    hostname: api.example.test
++    name: tls-passthrough
++    port: 443
++    protocol: TLS
++    tls:
++      mode: Passthrough
++status:
++  addresses:
++  - type: IPAddress
++    value: 172.18.255.200
++  conditions:
++  - lastTransitionTime: "2026-10-08T17:18:53Z"
++    message: Gateway successfully scheduled
++    reason: Accepted
++    status: "True"
++    type: Accepted
++  - lastTransitionTime: "2026-10-08T17:18:53Z"
++    message: Gateway Programmed
++    reason: Programmed
++    status: "True"
++    type: Programmed
++  listeners:
++  - attachedRoutes: 1
++    conditions:
++    - lastTransitionTime: "2026-10-08T17:18:53Z"
++      message: Resolved Refs
++      reason: ResolvedRefs
++      status: "True"
++      type: ResolvedRefs
++    - lastTransitionTime: "2026-10-08T17:18:53Z"
++      message: Listener Accepted
++      reason: Accepted
++      status: "True"
++      type: Accepted
++    - lastTransitionTime: "2026-10-08T17:18:53Z"
++      message: Listener Programmed
++      reason: Programmed
++      status: "True"
++      type: Programmed
++    name: https
++    supportedKinds:
++    - group: gateway.networking.k8s.io
++      kind: HTTPRoute
++    - group: gateway.networking.k8s.io
++      kind: GRPCRoute
++  - attachedRoutes: 1
++    conditions:
++    - lastTransitionTime: "2026-10-08T17:18:53Z"
++      message: Resolved Refs
++      reason: ResolvedRefs
++      status: "True"
++      type: ResolvedRefs
++    - lastTransitionTime: "2026-10-08T17:18:53Z"
++      message: Listener Accepted
++      reason: Accepted
++      status: "True"
++      type: Accepted
++    - lastTransitionTime: "2026-10-08T17:18:53Z"
++      message: Listener Programmed
++      reason: Programmed
++      status: "True"
++      type: Programmed
++    name: tls-passthrough
++    supportedKinds:
++    - group: gateway.networking.k8s.io
++      kind: TLSRoute
+\ No newline at end of file
+diff --git a/operator/pkg/gateway-api/testdata/gateway/gateway-cross-protocol-same-port-wildcard-and-specific-hostname/output/httproute-https-route.yaml b/operator/pkg/gateway-api/testdata/gateway/gateway-cross-protocol-same-port-wildcard-and-specific-hostname/output/httproute-https-route.yaml
+new file mode 100644
+index 0000000000..bdc9de14e6
+--- /dev/null
++++ b/operator/pkg/gateway-api/testdata/gateway/gateway-cross-protocol-same-port-wildcard-and-specific-hostname/output/httproute-https-route.yaml
+@@ -0,0 +1,37 @@
++apiVersion: gateway.networking.k8s.io/v1
++kind: HTTPRoute
++metadata:
++  name: https-route
++  namespace: gateway-conformance-infra
++  resourceVersion: "1000"
++spec:
++  hostnames:
++  - web.example.test
++  parentRefs:
++  - name: cross-protocol-same-port-wildcard-and-specific-hostname
++    sectionName: https
++  rules:
++  - backendRefs:
++    - name: infra-backend-v1
++      port: 8080
++    matches:
++    - path:
++        type: PathPrefix
++        value: /secure
++status:
++  parents:
++  - conditions:
++    - lastTransitionTime: "2026-10-08T17:18:53Z"
++      message: Accepted HTTPRoute
++      reason: Accepted
++      status: "True"
++      type: Accepted
++    - lastTransitionTime: "2026-10-08T17:18:53Z"
++      message: Service reference is valid
++      reason: ResolvedRefs
++      status: "True"
++      type: ResolvedRefs
++    controllerName: io.cilium/gateway-controller
++    parentRef:
++      name: cross-protocol-same-port-wildcard-and-specific-hostname
++      sectionName: https
+\ No newline at end of file
+diff --git a/operator/pkg/gateway-api/testdata/gateway/gateway-cross-protocol-same-port-wildcard-and-specific-hostname/output/tlsroute-tls-route.yaml b/operator/pkg/gateway-api/testdata/gateway/gateway-cross-protocol-same-port-wildcard-and-specific-hostname/output/tlsroute-tls-route.yaml
+new file mode 100644
+index 0000000000..e1fdb07da3
+--- /dev/null
++++ b/operator/pkg/gateway-api/testdata/gateway/gateway-cross-protocol-same-port-wildcard-and-specific-hostname/output/tlsroute-tls-route.yaml
+@@ -0,0 +1,35 @@
++apiVersion: gateway.networking.k8s.io/v1
++kind: TLSRoute
++metadata:
++  name: tls-route
++  namespace: gateway-conformance-infra
++  resourceVersion: "1000"
++spec:
++  hostnames:
++  - api.example.test
++  parentRefs:
++  - name: cross-protocol-same-port-wildcard-and-specific-hostname
++    namespace: gateway-conformance-infra
++    sectionName: tls-passthrough
++  rules:
++  - backendRefs:
++    - name: tls-backend
++      port: 443
++status:
++  parents:
++  - conditions:
++    - lastTransitionTime: "2026-10-08T17:18:53Z"
++      message: Accepted TLSRoute
++      reason: Accepted
++      status: "True"
++      type: Accepted
++    - lastTransitionTime: "2026-10-08T17:18:53Z"
++      message: Service reference is valid
++      reason: ResolvedRefs
++      status: "True"
++      type: ResolvedRefs
++    controllerName: io.cilium/gateway-controller
++    parentRef:
++      name: cross-protocol-same-port-wildcard-and-specific-hostname
++      namespace: gateway-conformance-infra
++      sectionName: tls-passthrough
+\ No newline at end of file
+diff --git a/operator/pkg/gateway-api/testdata/gateway/gateway-cross-protocol-same-port-wildcard-passthrough-and-specific-https/input/cross-protocol-same-port-wildcard-passthrough-and-specific-https.yaml b/operator/pkg/gateway-api/testdata/gateway/gateway-cross-protocol-same-port-wildcard-passthrough-and-specific-https/input/cross-protocol-same-port-wildcard-passthrough-and-specific-https.yaml
+new file mode 100644
+index 0000000000..bbe345cb30
+--- /dev/null
++++ b/operator/pkg/gateway-api/testdata/gateway/gateway-cross-protocol-same-port-wildcard-passthrough-and-specific-https/input/cross-protocol-same-port-wildcard-passthrough-and-specific-https.yaml
+@@ -0,0 +1,92 @@
++apiVersion: gateway.networking.k8s.io/v1
++kind: Gateway
++metadata:
++  name: cross-protocol-same-port-wildcard-passthrough-and-specific-https
++  namespace: gateway-conformance-infra
++spec:
++  gatewayClassName: cilium
++  listeners:
++    - name: https
++      protocol: HTTPS
++      port: 443
++      hostname: "api.example.test"
++      tls:
++        certificateRefs:
++          - group: ""
++            kind: Secret
++            name: cross-protocol-tls
++            namespace: gateway-conformance-infra
++      allowedRoutes:
++        namespaces:
++          from: Same
++    - name: tls-passthrough
++      protocol: TLS
++      port: 443
++      hostname: "*.example.test"
++      tls:
++        mode: Passthrough
++      allowedRoutes:
++        namespaces:
++          from: Same
++        kinds:
++          - kind: TLSRoute
++---
++apiVersion: gateway.networking.k8s.io/v1
++kind: HTTPRoute
++metadata:
++  name: https-route
++  namespace: gateway-conformance-infra
++spec:
++  parentRefs:
++    - name: cross-protocol-same-port-wildcard-passthrough-and-specific-https
++      sectionName: https
++  hostnames:
++    - api.example.test
++  rules:
++    - matches:
++        - path:
++            type: PathPrefix
++            value: /secure
++      backendRefs:
++        - name: infra-backend-v1
++          port: 8080
++---
++apiVersion: gateway.networking.k8s.io/v1alpha2
++kind: TLSRoute
++metadata:
++  name: tls-route
++  namespace: gateway-conformance-infra
++spec:
++  parentRefs:
++    - name: cross-protocol-same-port-wildcard-passthrough-and-specific-https
++      namespace: gateway-conformance-infra
++      sectionName: tls-passthrough
++  hostnames:
++    - api.example.test
++  rules:
++    - backendRefs:
++        - name: tls-backend
++          port: 443
++---
++apiVersion: v1
++kind: Secret
++metadata:
++  name: cross-protocol-tls
++  namespace: gateway-conformance-infra
++type: kubernetes.io/tls
++data:
++  tls.crt: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUVORENDQXB5Z0F3SUJBZ0lSQUtEL0JMRkJmd0tJWjBXR3JIdFRINmd3RFFZSktvWklodmNOQVFFTEJRQXcKZHpFZU1Cd0dBMVVFQ2hNVmJXdGpaWEowSUdSbGRtVnNiM0J0Wlc1MElFTkJNU1l3SkFZRFZRUUxEQjEwWVcxdApZV05vUUdabFpHOXlZUzVzWVc0Z0tGUmhiU0JOWVdOb0tURXRNQ3NHQTFVRUF3d2tiV3RqWlhKMElIUmhiVzFoClkyaEFabVZrYjNKaExteGhiaUFvVkdGdElFMWhZMmdwTUI0WERUSXpNREl5TVRFeE1EZzBNMW9YRFRJMU1EVXkKTVRFeU1EZzBNMW93VVRFbk1DVUdBMVVFQ2hNZWJXdGpaWEowSUdSbGRtVnNiM0J0Wlc1MElHTmxjblJwWm1sagpZWFJsTVNZd0pBWURWUVFMREIxMFlXMXRZV05vUUdabFpHOXlZUzVzWVc0Z0tGUmhiU0JOWVdOb0tUQ0NBU0l3CkRRWUpLb1pJaHZjTkFRRUJCUUFEZ2dFUEFEQ0NBUW9DZ2dFQkFNSVp5KzBKUlZqcXBXZ2VxMmRQKzFvbGlPNEEKQ2Zabk1nNHRTcVBhbGhEUUw2TWY2OEhZTGZpenlKSXBSek1KOTA1cllkMEFjbVhtdS9nMEVvOHlrSHhGRHo1VApzZVBzMlhRbmc4TU40YXpzUm1tMWw0Zjc0b3Zhd1F6UWNiODIyUVAxQ1M2SUxaM1Z0d05qUmgybkF3dGhZQk1vCkNrbmdER2VROEdsMHRqSExGbkJkVGRTd1FSbUUyanREQmNBZ3lFR3BxKzZSZVl0Ky80N25ObjdkQ2Z0c1ZxaEUKQllyOVhIM2l0ZWZIbXNiZmo3eldGYnB0ZGtvN3E5bE1Id25CZCswaGQ0ME1tSklYTVpyT0dHRlpqYXdKREJxUwpzQnEyUTNsNlhRejhYN1AvR0E0RG44aDR3M3JwcG1pYU43TE9tR1hla2kzeFgyd3FuTSswczZhWlpac0NBd0VBCkFhTmhNRjh3RGdZRFZSMFBBUUgvQkFRREFnV2dNQk1HQTFVZEpRUU1NQW9HQ0NzR0FRVUZCd01CTUI0R0ExVWQKSXdRWU1CYUFGR1EyREIwNkNkUUZRQnNZUHllME5Cd0VyVU5FTUJjR0ExVWRFUVFRTUE2Q0RIVnVhWFIwWlhOMApMbU52YlRBTkJna3Foa2lHOXcwQkFRc0ZBQU9DQVlFQXJ0SGRLV1hSNmFFTHBmYWwxN2JpYWJDUHZJRjlqNm53CnVEemNkTVlRTHJYbThNK05IZTh4M2RwSTd1M2xsdE8rZHpMbmcrblZLUU9SM2FsUUFDU21SRDljN2llOGVUNWQKN3pLT1RrNmtlWTE5NUkxd1ZWNGpiTkxiTldhOXk0UkpRUlR2QkxBdkFQOU5WdFV3MlEvdy9FclVUcVN5eitvYgpkd250NGdZQ3c2ZEdubHVMeGxmRjM0REI5S2ZsdlZOU25reU1CL2dzQjRBM3IxR1BPSW8wR3lmNzRpZzNGV3JTCndIWUtuQmJ0WmZZTzBKVjBMQ29QeUhlOGcwWGFqWmU4RENiUC9FNlNtbFROQW1KRVNWamlnVFRjSUJBa0ZJK24KdG9CQWR4ZmhqS1VHYUNsT0hTMjljcGFpeW5qU2F5R200UmtIa3g3bWNBdWE5bFdQZjdwU2EzbUNjRmIrd0ZyMwpBQmtIRFBKSDJhY2ZhVUsxdmdLVGdPd2NHLzZLQTgyMC9QcmFvU2loTGFQSy9BN2VnNzdyMUVlWXB0ME5lcHBiClhqdlVwM1ltVmxJTVpYUHpyak9zYXN0b0RTcnN5Z2o1amRWdG00UHNsdjluUGh6RHJCamxacEVKU2NXNEpsYisKNnd0ZDdwMDNVREJTS2ZUYlZST1ZBZTVtdkp2QTBob1MKLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
++  tls.key: LS0tLS1CRUdJTiBQUklWQVRFIEtFWS0tLS0tCk1JSUV2QUlCQURBTkJna3Foa2lHOXcwQkFRRUZBQVNDQktZd2dnU2lBZ0VBQW9JQkFRRENHY3Z0Q1VWWTZxVm8KSHF0blQvdGFKWWp1QUFuR1p6SU9MVXFqMnBZUTBDK2pIK3ZCMkMzNHM4aVNLVWN6Q2ZkT2EySGRBSEpsNXJ2NApOQktQTXBCOFJROCtVN0hqN05sMEo0UEREZUdzN0VacHRaZUgrK0tMMnNFTTBIRy9OdGtEOVFrdWlDMmQxYmNEClkwWWRwd01MWVdBVEtBcEo0QXhua1BCcGRMWXh5eFp3WFUzVXNFRVpoTm83UXdYQUlNaEJxYXZ1a1htTGZ2K08KNXpaKzNRbjdiRmFvUkFXSy9WeDk0clhueDVyRzM0KzgxaFc2YlhaS082dlpUQjhKd1hmdElYZU5ESmlTRnpHYQp6aGhoV1kyc0NRd2FrckFhdGtONWVsME0vRit6L3hnUEE1L0llTU42NmFab21qZXl6cGhsM3BJdDhWOXNLcHpQCnRMT21tV0diQWdNQkFBRUNnZ0VBRWpBU29NSjJvZzlTc24vMU5iZ1Q2RzJOK0NjK3d6MldQaWZXVDZaQzI0NTIKZUVXY2RNeUoranoyZFdPeXpVQ0kwT3RVL3oxMGVzSDFLUnZRQldVS2p1cDF0RFJwZmQ4S3ZVeWFseU5zMnlSRQpzTkVZUXVEQ2FMSjExbnFOdmdvb3FhdERVZjNtc0Z4L1NxejV1L3VUV0hTbWFRVWVlYStwMmVhRjhJdkVLc1FmCjZRTmtsa2VIc3YrR1ZQditpaWJmYlhYbmU2STVhVjM1UmM0UTA4elJDZ1lYL0JOMUFZWFY2aG80UkM5ZFpWR1AKSlVrU0x6UmFkZWdvay9FT05La3JxTFpPRkpWYjJ3dEZxODVnSjAxbE9ETS9najdHcU01OU0vd2s1NUNhUUlSRAo5eDVINFg0cnBNMnJobWlOTGtJTjB0R0xLTzhYMzF1cDdoVHg5YnZKY1FLQmdRRDUxTUxXWVlVUHovdW12U3JOClFPVDlVaEVISS9ieHRDYldRdGhXM0wxcXJWVDdEQjhKa28vNi94WWxYaGw3bndWd0p6MjRqSmY5dnV4V2JCcEwKSFpSZjBRc0RPMi9PNHJxaEtEb3YvR01VQ3gyc2h6YytKN2srVDkzS05WQU5ZYTA1Z3VxTWVCOG4zMEhQcm9rRgpMZ2loVkZGMjBrOVo2U2liVXZnVE1wRjFFd0tCZ1FERzVNQmdjOG9GWG1sci83cEhLaXpDNEYzZURBWFV4VkhNCldDSWJTd015ek9YS3FEY2RYTkR6OGNRcmpoS2EyckQxZktoRTBvUlIrUXZIejhJUEMrME1zVDdRNlFzSUhZajUKQ1h1YkhyMHM1azhQSkFwK0xrMkVkSGVQWlFNL0kvdmovZ1N3eG5KOVFzNjRGV1oyNUs5elluTk5zaW9qUWVsNwpXVm1JOUlWYVdRS0JnRDNCWWdnc1F3QU5vVjh1RTQ1NUpDR2FUNnM4TUthK3FYcjlPd3o5czdUUzg5YTZ3RkZWCmNWSFNERjlnUzF4TGlzU1dicU5YM1pwVHY0ZjlZT0tBaFZUS0Q3YlUwbWFKbFNpUkVSRWJpa0pDSFN1d29PODAKVW80Y24rNkVEeTIvbjFwQUNrcCt4dlRNTXpCckxHT2paVzY3c1FkMkpUZE1jMFV4MVRDcHAxc1JBb0dBYUVWSQpyY2hHWXlZcDhwcXcxOW8rZVRRVFFmUGZvcnFIdGErR3dmUkRpd0JzZ0NCTU5MS1NRVUhBZkcwUlIrbmExL2d3CloxUk9Wb05RTDhLMXBCbkdmdDcxWmFTblNldmlBVjE5VmNkNXVlNU1DRTRHeWp3UUc1N0xoM3VYaGlTaFM5ZkMKTWNMNEJyOWRqSmg3alYwNnRpMG84ZFN6enFRaGVhOVFCMExhSHBFQ2dZQXBjOG9Cb2lLNjlzMHdYeUk0K1BoeApTY0JKMFhxREJZRmt4eVhyOFk1cEVhckVhcUN0bDFPUFBNT2lRUkRXb3hSUitGd0EvMGxhU2ZoNXh3MFUzYitxCmlaMlhwa3JiUXAwMzRyQzBVUjZwK0ttMVN2OUFWQ0FDQWpyY1EzTlphZjhiRE9XcXZwbGE3QXVxMG9HOGk2VVgKaEVLQ0tmL04zZ0Uxb01yVHhWelVEUT09Ci0tLS0tRU5EIFBSSVZBVEUgS0VZLS0tLS0K
++---
++apiVersion: v1
++kind: Service
++metadata:
++  name: cilium-gateway-cross-protocol-same-port-wildcard-and-87ff7df5mg
++  namespace: gateway-conformance-infra
++spec:
++  type: LoadBalancer
++status:
++  loadBalancer:
++    ingress:
++      - ip: 172.18.255.200
++        ipMode: VIP
+diff --git a/operator/pkg/gateway-api/testdata/gateway/gateway-cross-protocol-same-port-wildcard-passthrough-and-specific-https/output/cross-protocol-same-port-wildcard-passthrough-and-specific-https.yaml b/operator/pkg/gateway-api/testdata/gateway/gateway-cross-protocol-same-port-wildcard-passthrough-and-specific-https/output/cross-protocol-same-port-wildcard-passthrough-and-specific-https.yaml
+new file mode 100644
+index 0000000000..0d001313c6
+--- /dev/null
++++ b/operator/pkg/gateway-api/testdata/gateway/gateway-cross-protocol-same-port-wildcard-passthrough-and-specific-https/output/cross-protocol-same-port-wildcard-passthrough-and-specific-https.yaml
+@@ -0,0 +1,94 @@
++apiVersion: gateway.networking.k8s.io/v1
++kind: Gateway
++metadata:
++  name: cross-protocol-same-port-wildcard-passthrough-and-specific-https
++  namespace: gateway-conformance-infra
++  resourceVersion: "1000"
++spec:
++  gatewayClassName: cilium
++  listeners:
++  - allowedRoutes:
++      namespaces:
++        from: Same
++    hostname: api.example.test
++    name: https
++    port: 443
++    protocol: HTTPS
++    tls:
++      certificateRefs:
++      - group: ""
++        kind: Secret
++        name: cross-protocol-tls
++        namespace: gateway-conformance-infra
++  - allowedRoutes:
++      kinds:
++      - kind: TLSRoute
++      namespaces:
++        from: Same
++    hostname: '*.example.test'
++    name: tls-passthrough
++    port: 443
++    protocol: TLS
++    tls:
++      mode: Passthrough
++status:
++  conditions:
++  - lastTransitionTime: "2026-10-08T20:27:40Z"
++    message: No Accepted Listeners
++    reason: ListenersNotValid
++    status: "False"
++    type: Accepted
++  - lastTransitionTime: "2026-10-08T20:27:40Z"
++    message: No Accepted Listeners
++    reason: ListenersNotValid
++    status: "False"
++    type: Programmed
++  listeners:
++  - attachedRoutes: 1
++    conditions:
++    - lastTransitionTime: "2026-10-08T20:27:40Z"
++      message: 'Listener conflicts with listener "tls-passthrough": same port 443
++        has overlapping HTTPS and TLS passthrough hostnames, and the TLS passthrough hostname is not strictly narrower than the HTTPS one.'
++      reason: ProtocolConflict
++      status: "True"
++      type: Conflicted
++    - lastTransitionTime: "2026-10-08T20:27:40Z"
++      message: 'Listener not valid. Listener conflicts with listener "tls-passthrough":
++        same port 443 has overlapping HTTPS and TLS passthrough hostnames, and the TLS passthrough hostname is not strictly narrower than the HTTPS one.'
++      reason: Invalid
++      status: "False"
++      type: Accepted
++    - lastTransitionTime: "2026-10-08T20:27:40Z"
++      message: Address not ready yet
++      reason: Pending
++      status: "False"
++      type: Programmed
++    name: https
++    supportedKinds:
++    - group: gateway.networking.k8s.io
++      kind: HTTPRoute
++    - group: gateway.networking.k8s.io
++      kind: GRPCRoute
++  - attachedRoutes: 1
++    conditions:
++    - lastTransitionTime: "2026-10-08T20:27:40Z"
++      message: 'Listener conflicts with listener "https": same port 443 has overlapping
++        HTTPS and TLS passthrough hostnames, and the TLS passthrough hostname is not strictly narrower than the HTTPS one.'
++      reason: ProtocolConflict
++      status: "True"
++      type: Conflicted
++    - lastTransitionTime: "2026-10-08T20:27:40Z"
++      message: 'Listener not valid. Listener conflicts with listener "https": same
++        port 443 has overlapping HTTPS and TLS passthrough hostnames, and the TLS passthrough hostname is not strictly narrower than the HTTPS one.'
++      reason: Invalid
++      status: "False"
++      type: Accepted
++    - lastTransitionTime: "2026-10-08T20:27:40Z"
++      message: Address not ready yet
++      reason: Pending
++      status: "False"
++      type: Programmed
++    name: tls-passthrough
++    supportedKinds:
++    - group: gateway.networking.k8s.io
++      kind: TLSRoute
+\ No newline at end of file
+diff --git a/operator/pkg/gateway-api/testdata/gateway/gateway-cross-protocol-same-port-wildcard-passthrough-and-specific-https/output/httproute-https-route.yaml b/operator/pkg/gateway-api/testdata/gateway/gateway-cross-protocol-same-port-wildcard-passthrough-and-specific-https/output/httproute-https-route.yaml
+new file mode 100644
+index 0000000000..597d8b47bf
+--- /dev/null
++++ b/operator/pkg/gateway-api/testdata/gateway/gateway-cross-protocol-same-port-wildcard-passthrough-and-specific-https/output/httproute-https-route.yaml
+@@ -0,0 +1,37 @@
++apiVersion: gateway.networking.k8s.io/v1
++kind: HTTPRoute
++metadata:
++  name: https-route
++  namespace: gateway-conformance-infra
++  resourceVersion: "1000"
++spec:
++  hostnames:
++  - api.example.test
++  parentRefs:
++  - name: cross-protocol-same-port-wildcard-passthrough-and-specific-https
++    sectionName: https
++  rules:
++  - backendRefs:
++    - name: infra-backend-v1
++      port: 8080
++    matches:
++    - path:
++        type: PathPrefix
++        value: /secure
++status:
++  parents:
++  - conditions:
++    - lastTransitionTime: "2026-10-08T20:27:40Z"
++      message: Accepted HTTPRoute
++      reason: Accepted
++      status: "True"
++      type: Accepted
++    - lastTransitionTime: "2026-10-08T20:27:40Z"
++      message: Service reference is valid
++      reason: ResolvedRefs
++      status: "True"
++      type: ResolvedRefs
++    controllerName: io.cilium/gateway-controller
++    parentRef:
++      name: cross-protocol-same-port-wildcard-passthrough-and-specific-https
++      sectionName: https
+\ No newline at end of file
+diff --git a/operator/pkg/gateway-api/testdata/gateway/gateway-cross-protocol-same-port-wildcard-passthrough-and-specific-https/output/tlsroute-tls-route.yaml b/operator/pkg/gateway-api/testdata/gateway/gateway-cross-protocol-same-port-wildcard-passthrough-and-specific-https/output/tlsroute-tls-route.yaml
+new file mode 100644
+index 0000000000..ec1d83a139
+--- /dev/null
++++ b/operator/pkg/gateway-api/testdata/gateway/gateway-cross-protocol-same-port-wildcard-passthrough-and-specific-https/output/tlsroute-tls-route.yaml
+@@ -0,0 +1,35 @@
++apiVersion: gateway.networking.k8s.io/v1
++kind: TLSRoute
++metadata:
++  name: tls-route
++  namespace: gateway-conformance-infra
++  resourceVersion: "1000"
++spec:
++  hostnames:
++  - api.example.test
++  parentRefs:
++  - name: cross-protocol-same-port-wildcard-passthrough-and-specific-https
++    namespace: gateway-conformance-infra
++    sectionName: tls-passthrough
++  rules:
++  - backendRefs:
++    - name: tls-backend
++      port: 443
++status:
++  parents:
++  - conditions:
++    - lastTransitionTime: "2026-10-08T20:27:40Z"
++      message: Accepted TLSRoute
++      reason: Accepted
++      status: "True"
++      type: Accepted
++    - lastTransitionTime: "2026-10-08T20:27:40Z"
++      message: Service reference is valid
++      reason: ResolvedRefs
++      status: "True"
++      type: ResolvedRefs
++    controllerName: io.cilium/gateway-controller
++    parentRef:
++      name: cross-protocol-same-port-wildcard-passthrough-and-specific-https
++      namespace: gateway-conformance-infra
++      sectionName: tls-passthrough
+\ No newline at end of file
+diff --git a/operator/pkg/gateway-api/testdata/gateway/tlsroute-mixed-protocol-listeners/output/gateway-tlsroute-mixed.yaml b/operator/pkg/gateway-api/testdata/gateway/tlsroute-mixed-protocol-listeners/output/gateway-tlsroute-mixed.yaml
+index 1b0efa2e09..668b20f2cc 100644
+--- a/operator/pkg/gateway-api/testdata/gateway/tlsroute-mixed-protocol-listeners/output/gateway-tlsroute-mixed.yaml
++++ b/operator/pkg/gateway-api/testdata/gateway/tlsroute-mixed-protocol-listeners/output/gateway-tlsroute-mixed.yaml
+@@ -71,14 +71,14 @@ status:
+         - lastTransitionTime: "2025-07-01T14:29:32Z"
+           message:
+             'Listener conflicts with listener "tls": same port 443 has overlapping
+-            HTTPS and TLS passthrough hostnames.'
++            HTTPS and TLS passthrough hostnames, and the TLS passthrough hostname is not strictly narrower than the HTTPS one.'
+           reason: ProtocolConflict
+           status: "True"
+           type: Conflicted
+         - lastTransitionTime: "2025-07-01T14:29:32Z"
+           message:
+             'Listener not valid. Listener conflicts with listener "tls": same port
+-            443 has overlapping HTTPS and TLS passthrough hostnames.'
++            443 has overlapping HTTPS and TLS passthrough hostnames, and the TLS passthrough hostname is not strictly narrower than the HTTPS one.'
+           reason: Invalid
+           status: "False"
+           type: Accepted
+@@ -98,14 +98,14 @@ status:
+         - lastTransitionTime: "2025-07-01T14:29:32Z"
+           message:
+             'Listener conflicts with listener "https": same port 443 has overlapping
+-            HTTPS and TLS passthrough hostnames.'
++            HTTPS and TLS passthrough hostnames, and the TLS passthrough hostname is not strictly narrower than the HTTPS one.'
+           reason: ProtocolConflict
+           status: "True"
+           type: Conflicted
+         - lastTransitionTime: "2025-07-01T14:29:32Z"
+           message:
+             'Listener not valid. Listener conflicts with listener "https": same
+-            port 443 has overlapping HTTPS and TLS passthrough hostnames.'
++            port 443 has overlapping HTTPS and TLS passthrough hostnames, and the TLS passthrough hostname is not strictly narrower than the HTTPS one.'
+           reason: Invalid
+           status: "False"
+           type: Accepted
diff --git a/packages/system/cilium/images/cilium-operator/patches/merge-https-and-tls-passthrough-sharing-a-port.diff b/packages/system/cilium/images/cilium-operator/patches/merge-https-and-tls-passthrough-sharing-a-port.diff
new file mode 100644
index 0000000000..0fb4cef902
--- /dev/null
+++ b/packages/system/cilium/images/cilium-operator/patches/merge-https-and-tls-passthrough-sharing-a-port.diff
@@ -0,0 +1,1300 @@
+Serve HTTPS and TLS passthrough on a shared port from one Envoy listener in
+the per-port translation path, so a Gateway with passthrough on two ports no
+longer emits two listeners named listener-<port> (cilium/cilium#48269).
+
+Upstream: cilium/cilium#49248. Drop it once a shipped Cilium release
+carries the fix.
+
+diff --git a/operator/pkg/gateway-api/gateway_reconcile_test.go b/operator/pkg/gateway-api/gateway_reconcile_test.go
+index 312439798f..440e54033e 100644
+--- a/operator/pkg/gateway-api/gateway_reconcile_test.go
++++ b/operator/pkg/gateway-api/gateway_reconcile_test.go
+@@ -331,6 +331,8 @@ func Test_Conformance(t *testing.T) {
+ 			{FullName: types.NamespacedName{Name: "gateway-tlsroute-mixed", Namespace: "gateway-conformance-infra"}},
+ 		}},
+ 		{name: "gateway-multi-port-tls-passthrough", gateway: []gwDetails{{FullName: types.NamespacedName{Name: "multi-port-tls-passthrough", Namespace: "gateway-conformance-infra"}}}},
++		{name: "gateway-same-port-https-and-tls-passthrough-with-second-passthrough-port", gateway: []gwDetails{{FullName: types.NamespacedName{Name: "same-port-https-and-tls-passthrough-with-second-passthrough-port", Namespace: "gateway-conformance-infra"}}}},
++		{name: "gateway-same-port-https-and-tls-passthrough-with-second-https-port", gateway: []gwDetails{{FullName: types.NamespacedName{Name: "same-port-https-and-tls-passthrough-with-second-https-port", Namespace: "gateway-conformance-infra"}}}},
+ 		{name: "gateway-multi-port-https-with-multi-port-tls-passthrough", gateway: []gwDetails{{FullName: types.NamespacedName{Name: "multi-port-https-with-multi-port-tls-passthrough", Namespace: "gateway-conformance-infra"}}}},
+ 		{name: "gateway-cross-protocol-same-hostname", gateway: []gwDetails{{FullName: types.NamespacedName{Name: "cross-protocol-same-hostname", Namespace: "gateway-conformance-infra"}}}},
+ 		{name: "gateway-cross-protocol-same-port-same-hostname", gateway: []gwDetails{{FullName: types.NamespacedName{Name: "cross-protocol-same-port-same-hostname", Namespace: "gateway-conformance-infra"}, wantErr: true}}},
+diff --git a/operator/pkg/gateway-api/testdata/gateway/gateway-same-port-https-and-tls-passthrough-with-second-https-port/input/same-port-https-and-tls-passthrough-with-second-https-port.yaml b/operator/pkg/gateway-api/testdata/gateway/gateway-same-port-https-and-tls-passthrough-with-second-https-port/input/same-port-https-and-tls-passthrough-with-second-https-port.yaml
+new file mode 100644
+index 0000000000..7e1a231f36
+--- /dev/null
++++ b/operator/pkg/gateway-api/testdata/gateway/gateway-same-port-https-and-tls-passthrough-with-second-https-port/input/same-port-https-and-tls-passthrough-with-second-https-port.yaml
+@@ -0,0 +1,117 @@
++apiVersion: gateway.networking.k8s.io/v1
++kind: Gateway
++metadata:
++  name: same-port-https-and-tls-passthrough-with-second-https-port
++  namespace: gateway-conformance-infra
++spec:
++  gatewayClassName: cilium
++  listeners:
++    - name: https-443
++      protocol: HTTPS
++      port: 443
++      hostname: "web.example.test"
++      tls:
++        certificateRefs:
++          - group: ""
++            kind: Secret
++            name: multi-port-https-tls
++            namespace: gateway-conformance-infra
++      allowedRoutes:
++        namespaces:
++          from: Same
++    - name: https-8443
++      protocol: HTTPS
++      port: 8443
++      hostname: "api.example.test"
++      tls:
++        certificateRefs:
++          - group: ""
++            kind: Secret
++            name: multi-port-https-tls
++            namespace: gateway-conformance-infra
++      allowedRoutes:
++        namespaces:
++          from: Same
++    - name: tls-443
++      protocol: TLS
++      port: 443
++      hostname: "a.example.test"
++      tls:
++        mode: Passthrough
++      allowedRoutes:
++        namespaces:
++          from: Same
++        kinds:
++          - kind: TLSRoute
++---
++apiVersion: gateway.networking.k8s.io/v1
++kind: HTTPRoute
++metadata:
++  name: web-route
++  namespace: gateway-conformance-infra
++spec:
++  parentRefs:
++    - name: same-port-https-and-tls-passthrough-with-second-https-port
++      sectionName: https-443
++  hostnames:
++    - web.example.test
++  rules:
++    - backendRefs:
++        - name: infra-backend-v1
++          port: 8080
++---
++apiVersion: gateway.networking.k8s.io/v1
++kind: HTTPRoute
++metadata:
++  name: api-route
++  namespace: gateway-conformance-infra
++spec:
++  parentRefs:
++    - name: same-port-https-and-tls-passthrough-with-second-https-port
++      sectionName: https-8443
++  hostnames:
++    - api.example.test
++  rules:
++    - backendRefs:
++        - name: infra-backend-v1
++          port: 8080
++---
++apiVersion: gateway.networking.k8s.io/v1alpha2
++kind: TLSRoute
++metadata:
++  name: tls-route-a
++  namespace: gateway-conformance-infra
++spec:
++  parentRefs:
++    - name: same-port-https-and-tls-passthrough-with-second-https-port
++      namespace: gateway-conformance-infra
++      sectionName: tls-443
++  hostnames:
++    - a.example.test
++  rules:
++    - backendRefs:
++        - name: tls-backend
++          port: 443
++---
++apiVersion: v1
++kind: Secret
++metadata:
++  name: multi-port-https-tls
++  namespace: gateway-conformance-infra
++type: kubernetes.io/tls
++data:
++  tls.crt: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUVORENDQXB5Z0F3SUJBZ0lSQUtEL0JMRkJmd0tJWjBXR3JIdFRINmd3RFFZSktvWklodmNOQVFFTEJRQXcKZHpFZU1Cd0dBMVVFQ2hNVmJXdGpaWEowSUdSbGRtVnNiM0J0Wlc1MElFTkJNU1l3SkFZRFZRUUxEQjEwWVcxdApZV05vUUdabFpHOXlZUzVzWVc0Z0tGUmhiU0JOWVdOb0tURXRNQ3NHQTFVRUF3d2tiV3RqWlhKMElIUmhiVzFoClkyaEFabVZrYjNKaExteGhiaUFvVkdGdElFMWhZMmdwTUI0WERUSXpNREl5TVRFeE1EZzBNMW9YRFRJMU1EVXkKTVRFeU1EZzBNMW93VVRFbk1DVUdBMVVFQ2hNZWJXdGpaWEowSUdSbGRtVnNiM0J0Wlc1MElHTmxjblJwWm1sagpZWFJsTVNZd0pBWURWUVFMREIxMFlXMXRZV05vUUdabFpHOXlZUzVzWVc0Z0tGUmhiU0JOWVdOb0tUQ0NBU0l3CkRRWUpLb1pJaHZjTkFRRUJCUUFEZ2dFUEFEQ0NBUW9DZ2dFQkFNSVp5KzBKUlZqcXBXZ2VxMmRQKzFvbGlPNEEKQ2Zabk1nNHRTcVBhbGhEUUw2TWY2OEhZTGZpenlKSXBSek1KOTA1cllkMEFjbVhtdS9nMEVvOHlrSHhGRHo1VApzZVBzMlhRbmc4TU40YXpzUm1tMWw0Zjc0b3Zhd1F6UWNiODIyUVAxQ1M2SUxaM1Z0d05qUmgybkF3dGhZQk1vCkNrbmdER2VROEdsMHRqSExGbkJkVGRTd1FSbUUyanREQmNBZ3lFR3BxKzZSZVl0Ky80N25ObjdkQ2Z0c1ZxaEUKQllyOVhIM2l0ZWZIbXNiZmo3eldGYnB0ZGtvN3E5bE1Id25CZCswaGQ0ME1tSklYTVpyT0dHRlpqYXdKREJxUwpzQnEyUTNsNlhRejhYN1AvR0E0RG44aDR3M3JwcG1pYU43TE9tR1hla2kzeFgyd3FuTSswczZhWlpac0NBd0VBCkFhTmhNRjh3RGdZRFZSMFBBUUgvQkFRREFnV2dNQk1HQTFVZEpRUU1NQW9HQ0NzR0FRVUZCd01CTUI0R0ExVWQKSXdRWU1CYUFGR1EyREIwNkNkUUZRQnNZUHllME5Cd0VyVU5FTUJjR0ExVWRFUVFRTUE2Q0RIVnVhWFIwWlhOMApMbU52YlRBTkJna3Foa2lHOXcwQkFRc0ZBQU9DQVlFQXJ0SGRLV1hSNmFFTHBmYWwxN2JpYWJDUHZJRjlqNm53CnVEemNkTVlRTHJYbThNK05IZTh4M2RwSTd1M2xsdE8rZHpMbmcrblZLUU9SM2FsUUFDU21SRDljN2llOGVUNWQKN3pLT1RrNmtlWTE5NUkxd1ZWNGpiTkxiTldhOXk0UkpRUlR2QkxBdkFQOU5WdFV3MlEvdy9FclVUcVN5eitvYgpkd250NGdZQ3c2ZEdubHVMeGxmRjM0REI5S2ZsdlZOU25reU1CL2dzQjRBM3IxR1BPSW8wR3lmNzRpZzNGV3JTCndIWUtuQmJ0WmZZTzBKVjBMQ29QeUhlOGcwWGFqWmU4RENiUC9FNlNtbFROQW1KRVNWamlnVFRjSUJBa0ZJK24KdG9CQWR4ZmhqS1VHYUNsT0hTMjljcGFpeW5qU2F5R200UmtIa3g3bWNBdWE5bFdQZjdwU2EzbUNjRmIrd0ZyMwpBQmtIRFBKSDJhY2ZhVUsxdmdLVGdPd2NHLzZLQTgyMC9QcmFvU2loTGFQSy9BN2VnNzdyMUVlWXB0ME5lcHBiClhqdlVwM1ltVmxJTVpYUHpyak9zYXN0b0RTcnN5Z2o1amRWdG00UHNsdjluUGh6RHJCamxacEVKU2NXNEpsYisKNnd0ZDdwMDNVREJTS2ZUYlZST1ZBZTVtdkp2QTBob1MKLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
++  tls.key: LS0tLS1CRUdJTiBQUklWQVRFIEtFWS0tLS0tCk1JSUV2QUlCQURBTkJna3Foa2lHOXcwQkFRRUZBQVNDQktZd2dnU2lBZ0VBQW9JQkFRRENHY3Z0Q1VWWTZxVm8KSHF0blQvdGFKWWp1QUFuR1p6SU9MVXFqMnBZUTBDK2pIK3ZCMkMzNHM4aVNLVWN6Q2ZkT2EySGRBSEpsNXJ2NApOQktQTXBCOFJROCtVN0hqN05sMEo0UEREZUdzN0VacHRaZUgrK0tMMnNFTTBIRy9OdGtEOVFrdWlDMmQxYmNEClkwWWRwd01MWVdBVEtBcEo0QXhua1BCcGRMWXh5eFp3WFUzVXNFRVpoTm83UXdYQUlNaEJxYXZ1a1htTGZ2K08KNXpaKzNRbjdiRmFvUkFXSy9WeDk0clhueDVyRzM0KzgxaFc2YlhaS082dlpUQjhKd1hmdElYZU5ESmlTRnpHYQp6aGhoV1kyc0NRd2FrckFhdGtONWVsME0vRit6L3hnUEE1L0llTU42NmFab21qZXl6cGhsM3BJdDhWOXNLcHpQCnRMT21tV0diQWdNQkFBRUNnZ0VBRWpBU29NSjJvZzlTc24vMU5iZ1Q2RzJOK0NjK3d6MldQaWZXVDZaQzI0NTIKZUVXY2RNeUoranoyZFdPeXpVQ0kwT3RVL3oxMGVzSDFLUnZRQldVS2p1cDF0RFJwZmQ4S3ZVeWFseU5zMnlSRQpzTkVZUXVEQ2FMSjExbnFOdmdvb3FhdERVZjNtc0Z4L1NxejV1L3VUV0hTbWFRVWVlYStwMmVhRjhJdkVLc1FmCjZRTmtsa2VIc3YrR1ZQditpaWJmYlhYbmU2STVhVjM1UmM0UTA4elJDZ1lYL0JOMUFZWFY2aG80UkM5ZFpWR1AKSlVrU0x6UmFkZWdvay9FT05La3JxTFpPRkpWYjJ3dEZxODVnSjAxbE9ETS9najdHcU01OU0vd2s1NUNhUUlSRAo5eDVINFg0cnBNMnJobWlOTGtJTjB0R0xLTzhYMzF1cDdoVHg5YnZKY1FLQmdRRDUxTUxXWVlVUHovdW12U3JOClFPVDlVaEVISS9ieHRDYldRdGhXM0wxcXJWVDdEQjhKa28vNi94WWxYaGw3bndWd0p6MjRqSmY5dnV4V2JCcEwKSFpSZjBRc0RPMi9PNHJxaEtEb3YvR01VQ3gyc2h6YytKN2srVDkzS05WQU5ZYTA1Z3VxTWVCOG4zMEhQcm9rRgpMZ2loVkZGMjBrOVo2U2liVXZnVE1wRjFFd0tCZ1FERzVNQmdjOG9GWG1sci83cEhLaXpDNEYzZURBWFV4VkhNCldDSWJTd015ek9YS3FEY2RYTkR6OGNRcmpoS2EyckQxZktoRTBvUlIrUXZIejhJUEMrME1zVDdRNlFzSUhZajUKQ1h1YkhyMHM1azhQSkFwK0xrMkVkSGVQWlFNL0kvdmovZ1N3eG5KOVFzNjRGV1oyNUs5elluTk5zaW9qUWVsNwpXVm1JOUlWYVdRS0JnRDNCWWdnc1F3QU5vVjh1RTQ1NUpDR2FUNnM4TUthK3FYcjlPd3o5czdUUzg5YTZ3RkZWCmNWSFNERjlnUzF4TGlzU1dicU5YM1pwVHY0ZjlZT0tBaFZUS0Q3YlUwbWFKbFNpUkVSRWJpa0pDSFN1d29PODAKVW80Y24rNkVEeTIvbjFwQUNrcCt4dlRNTXpCckxHT2paVzY3c1FkMkpUZE1jMFV4MVRDcHAxc1JBb0dBYUVWSQpyY2hHWXlZcDhwcXcxOW8rZVRRVFFmUGZvcnFIdGErR3dmUkRpd0JzZ0NCTU5MS1NRVUhBZkcwUlIrbmExL2d3CloxUk9Wb05RTDhLMXBCbkdmdDcxWmFTblNldmlBVjE5VmNkNXVlNU1DRTRHeWp3UUc1N0xoM3VYaGlTaFM5ZkMKTWNMNEJyOWRqSmg3alYwNnRpMG84ZFN6enFRaGVhOVFCMExhSHBFQ2dZQXBjOG9Cb2lLNjlzMHdYeUk0K1BoeApTY0JKMFhxREJZRmt4eVhyOFk1cEVhckVhcUN0bDFPUFBNT2lRUkRXb3hSUitGd0EvMGxhU2ZoNXh3MFUzYitxCmlaMlhwa3JiUXAwMzRyQzBVUjZwK0ttMVN2OUFWQ0FDQWpyY1EzTlphZjhiRE9XcXZwbGE3QXVxMG9HOGk2VVgKaEVLQ0tmL04zZ0Uxb01yVHhWelVEUT09Ci0tLS0tRU5EIFBSSVZBVEUgS0VZLS0tLS0K
++---
++apiVersion: v1
++kind: Service
++metadata:
++  name: cilium-gateway-same-port-https-and-tls-passthrough-w-bc7tk66g54
++  namespace: gateway-conformance-infra
++spec:
++  type: LoadBalancer
++status:
++  loadBalancer:
++    ingress:
++      - ip: 172.18.255.200
++        ipMode: VIP
+diff --git a/operator/pkg/gateway-api/testdata/gateway/gateway-same-port-https-and-tls-passthrough-with-second-https-port/output/cec-same-port-https-and-tls-passthrough-with-second-https-port.yaml b/operator/pkg/gateway-api/testdata/gateway/gateway-same-port-https-and-tls-passthrough-with-second-https-port/output/cec-same-port-https-and-tls-passthrough-with-second-https-port.yaml
+new file mode 100644
+index 0000000000..a95db00c68
+--- /dev/null
++++ b/operator/pkg/gateway-api/testdata/gateway/gateway-same-port-https-and-tls-passthrough-with-second-https-port/output/cec-same-port-https-and-tls-passthrough-with-second-https-port.yaml
+@@ -0,0 +1,219 @@
++metadata:
++  annotations:
++    cec.cilium.io/use-original-source-address: "false"
++  labels:
++    gateway.networking.k8s.io/gateway-name: same-port-https-and-tls-passthrough-with-second-https-port
++  name: cilium-gateway-same-port-https-and-tls-passthrough-w-bc7tk66g54
++  namespace: gateway-conformance-infra
++  ownerReferences:
++  - apiVersion: gateway.networking.k8s.io/v1
++    controller: true
++    kind: Gateway
++    name: same-port-https-and-tls-passthrough-with-second-https-port
++    uid: ""
++  resourceVersion: "1"
++spec:
++  backendServices:
++  - name: infra-backend-v1
++    namespace: gateway-conformance-infra
++    number:
++    - "8080"
++  - name: tls-backend
++    namespace: gateway-conformance-infra
++    number:
++    - "443"
++  resources:
++  - '@type': type.googleapis.com/envoy.config.listener.v3.Listener
++    filterChains:
++    - filterChainMatch:
++        serverNames:
++        - web.example.test
++        transportProtocol: tls
++      filters:
++      - name: envoy.filters.network.http_connection_manager
++        typedConfig:
++          '@type': type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
++          commonHttpProtocolOptions:
++            maxStreamDuration: 0s
++          httpFilters:
++          - name: envoy.filters.http.grpc_web
++            typedConfig:
++              '@type': type.googleapis.com/envoy.extensions.filters.http.grpc_web.v3.GrpcWeb
++          - name: envoy.filters.http.grpc_stats
++            typedConfig:
++              '@type': type.googleapis.com/envoy.extensions.filters.http.grpc_stats.v3.FilterConfig
++              emitFilterState: true
++              enableUpstreamStats: true
++          - name: envoy.filters.http.router
++            typedConfig:
++              '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
++          internalAddressConfig: {}
++          rds:
++            routeConfigName: listener-443
++          statPrefix: listener-443
++          streamIdleTimeout: 300s
++          upgradeConfigs:
++          - upgradeType: websocket
++          useRemoteAddress: true
++      transportSocket:
++        name: envoy.transport_sockets.tls
++        typedConfig:
++          '@type': type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext
++          commonTlsContext:
++            tlsCertificateSdsSecretConfigs:
++            - name: cilium-secrets/cilium-sync-secret-62f4462c70564aa40ef22396762652f4b3bd572448747e332d134b0c028c0cfb
++    - filterChainMatch:
++        serverNames:
++        - a.example.test
++        transportProtocol: tls
++      filters:
++      - name: envoy.filters.network.tcp_proxy
++        typedConfig:
++          '@type': type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy
++          cluster: gateway-conformance-infra:tls-backend:443
++          statPrefix: tls-passthrough:a.example.test
++    listenerFilters:
++    - name: envoy.filters.listener.tls_inspector
++      typedConfig:
++        '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector
++    name: listener-443
++    socketOptions:
++    - description: Enable TCP keep-alive (default to enabled)
++      intValue: "1"
++      level: "1"
++      name: "9"
++    - description: TCP keep-alive idle time (in seconds) (defaults to 10s)
++      intValue: "10"
++      level: "6"
++      name: "4"
++    - description: TCP keep-alive probe intervals (in seconds) (defaults to 5s)
++      intValue: "5"
++      level: "6"
++      name: "5"
++    - description: TCP keep-alive probe max failures.
++      intValue: "10"
++      level: "6"
++      name: "6"
++  - '@type': type.googleapis.com/envoy.config.listener.v3.Listener
++    filterChains:
++    - filterChainMatch:
++        serverNames:
++        - api.example.test
++        transportProtocol: tls
++      filters:
++      - name: envoy.filters.network.http_connection_manager
++        typedConfig:
++          '@type': type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
++          commonHttpProtocolOptions:
++            maxStreamDuration: 0s
++          httpFilters:
++          - name: envoy.filters.http.grpc_web
++            typedConfig:
++              '@type': type.googleapis.com/envoy.extensions.filters.http.grpc_web.v3.GrpcWeb
++          - name: envoy.filters.http.grpc_stats
++            typedConfig:
++              '@type': type.googleapis.com/envoy.extensions.filters.http.grpc_stats.v3.FilterConfig
++              emitFilterState: true
++              enableUpstreamStats: true
++          - name: envoy.filters.http.router
++            typedConfig:
++              '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
++          internalAddressConfig: {}
++          rds:
++            routeConfigName: listener-8443
++          statPrefix: listener-8443
++          streamIdleTimeout: 300s
++          upgradeConfigs:
++          - upgradeType: websocket
++          useRemoteAddress: true
++      transportSocket:
++        name: envoy.transport_sockets.tls
++        typedConfig:
++          '@type': type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext
++          commonTlsContext:
++            tlsCertificateSdsSecretConfigs:
++            - name: cilium-secrets/cilium-sync-secret-62f4462c70564aa40ef22396762652f4b3bd572448747e332d134b0c028c0cfb
++    listenerFilters:
++    - name: envoy.filters.listener.tls_inspector
++      typedConfig:
++        '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector
++    name: listener-8443
++    socketOptions:
++    - description: Enable TCP keep-alive (default to enabled)
++      intValue: "1"
++      level: "1"
++      name: "9"
++    - description: TCP keep-alive idle time (in seconds) (defaults to 10s)
++      intValue: "10"
++      level: "6"
++      name: "4"
++    - description: TCP keep-alive probe intervals (in seconds) (defaults to 5s)
++      intValue: "5"
++      level: "6"
++      name: "5"
++    - description: TCP keep-alive probe max failures.
++      intValue: "10"
++      level: "6"
++      name: "6"
++  - '@type': type.googleapis.com/envoy.config.route.v3.RouteConfiguration
++    name: listener-insecure
++  - '@type': type.googleapis.com/envoy.config.route.v3.RouteConfiguration
++    name: listener-443
++    virtualHosts:
++    - domains:
++      - web.example.test
++      - web.example.test:*
++      name: web.example.test
++      routes:
++      - match:
++          prefix: /
++        route:
++          cluster: gateway-conformance-infra:infra-backend-v1:8080
++          maxStreamDuration:
++            maxStreamDuration: 0s
++  - '@type': type.googleapis.com/envoy.config.route.v3.RouteConfiguration
++    name: listener-8443
++    virtualHosts:
++    - domains:
++      - api.example.test
++      - api.example.test:*
++      name: api.example.test
++      routes:
++      - match:
++          prefix: /
++        route:
++          cluster: gateway-conformance-infra:infra-backend-v1:8080
++          maxStreamDuration:
++            maxStreamDuration: 0s
++  - '@type': type.googleapis.com/envoy.config.cluster.v3.Cluster
++    edsClusterConfig:
++      serviceName: gateway-conformance-infra/infra-backend-v1:8080
++    name: gateway-conformance-infra:infra-backend-v1:8080
++    outlierDetection:
++      splitExternalLocalOriginErrors: true
++    type: EDS
++    typedExtensionProtocolOptions:
++      envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
++        '@type': type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions
++        commonHttpProtocolOptions:
++          idleTimeout: 60s
++        useDownstreamProtocolConfig:
++          http2ProtocolOptions: {}
++  - '@type': type.googleapis.com/envoy.config.cluster.v3.Cluster
++    edsClusterConfig:
++      serviceName: gateway-conformance-infra/tls-backend:443
++    name: gateway-conformance-infra:tls-backend:443
++    outlierDetection:
++      splitExternalLocalOriginErrors: true
++    type: EDS
++  services:
++  - listener: listener-443
++    name: cilium-gateway-same-port-https-and-tls-passthrough-w-bc7tk66g54
++    namespace: gateway-conformance-infra
++    ports:
++    - 443
++  - listener: listener-8443
++    name: cilium-gateway-same-port-https-and-tls-passthrough-w-bc7tk66g54
++    namespace: gateway-conformance-infra
++    ports:
++    - 8443
+\ No newline at end of file
+diff --git a/operator/pkg/gateway-api/testdata/gateway/gateway-same-port-https-and-tls-passthrough-with-second-https-port/output/httproute-api-route.yaml b/operator/pkg/gateway-api/testdata/gateway/gateway-same-port-https-and-tls-passthrough-with-second-https-port/output/httproute-api-route.yaml
+new file mode 100644
+index 0000000000..840d18527b
+--- /dev/null
++++ b/operator/pkg/gateway-api/testdata/gateway/gateway-same-port-https-and-tls-passthrough-with-second-https-port/output/httproute-api-route.yaml
+@@ -0,0 +1,33 @@
++apiVersion: gateway.networking.k8s.io/v1
++kind: HTTPRoute
++metadata:
++  name: api-route
++  namespace: gateway-conformance-infra
++  resourceVersion: "1000"
++spec:
++  hostnames:
++  - api.example.test
++  parentRefs:
++  - name: same-port-https-and-tls-passthrough-with-second-https-port
++    sectionName: https-8443
++  rules:
++  - backendRefs:
++    - name: infra-backend-v1
++      port: 8080
++status:
++  parents:
++  - conditions:
++    - lastTransitionTime: "2026-10-08T17:18:53Z"
++      message: Accepted HTTPRoute
++      reason: Accepted
++      status: "True"
++      type: Accepted
++    - lastTransitionTime: "2026-10-08T17:18:53Z"
++      message: Service reference is valid
++      reason: ResolvedRefs
++      status: "True"
++      type: ResolvedRefs
++    controllerName: io.cilium/gateway-controller
++    parentRef:
++      name: same-port-https-and-tls-passthrough-with-second-https-port
++      sectionName: https-8443
+\ No newline at end of file
+diff --git a/operator/pkg/gateway-api/testdata/gateway/gateway-same-port-https-and-tls-passthrough-with-second-https-port/output/httproute-web-route.yaml b/operator/pkg/gateway-api/testdata/gateway/gateway-same-port-https-and-tls-passthrough-with-second-https-port/output/httproute-web-route.yaml
+new file mode 100644
+index 0000000000..15324fecd6
+--- /dev/null
++++ b/operator/pkg/gateway-api/testdata/gateway/gateway-same-port-https-and-tls-passthrough-with-second-https-port/output/httproute-web-route.yaml
+@@ -0,0 +1,33 @@
++apiVersion: gateway.networking.k8s.io/v1
++kind: HTTPRoute
++metadata:
++  name: web-route
++  namespace: gateway-conformance-infra
++  resourceVersion: "1000"
++spec:
++  hostnames:
++  - web.example.test
++  parentRefs:
++  - name: same-port-https-and-tls-passthrough-with-second-https-port
++    sectionName: https-443
++  rules:
++  - backendRefs:
++    - name: infra-backend-v1
++      port: 8080
++status:
++  parents:
++  - conditions:
++    - lastTransitionTime: "2026-10-08T17:18:53Z"
++      message: Accepted HTTPRoute
++      reason: Accepted
++      status: "True"
++      type: Accepted
++    - lastTransitionTime: "2026-10-08T17:18:53Z"
++      message: Service reference is valid
++      reason: ResolvedRefs
++      status: "True"
++      type: ResolvedRefs
++    controllerName: io.cilium/gateway-controller
++    parentRef:
++      name: same-port-https-and-tls-passthrough-with-second-https-port
++      sectionName: https-443
+\ No newline at end of file
+diff --git a/operator/pkg/gateway-api/testdata/gateway/gateway-same-port-https-and-tls-passthrough-with-second-https-port/output/same-port-https-and-tls-passthrough-with-second-https-port.yaml b/operator/pkg/gateway-api/testdata/gateway/gateway-same-port-https-and-tls-passthrough-with-second-https-port/output/same-port-https-and-tls-passthrough-with-second-https-port.yaml
+new file mode 100644
+index 0000000000..960bb02ce0
+--- /dev/null
++++ b/operator/pkg/gateway-api/testdata/gateway/gateway-same-port-https-and-tls-passthrough-with-second-https-port/output/same-port-https-and-tls-passthrough-with-second-https-port.yaml
+@@ -0,0 +1,129 @@
++apiVersion: gateway.networking.k8s.io/v1
++kind: Gateway
++metadata:
++  name: same-port-https-and-tls-passthrough-with-second-https-port
++  namespace: gateway-conformance-infra
++  resourceVersion: "1000"
++spec:
++  gatewayClassName: cilium
++  listeners:
++  - allowedRoutes:
++      namespaces:
++        from: Same
++    hostname: web.example.test
++    name: https-443
++    port: 443
++    protocol: HTTPS
++    tls:
++      certificateRefs:
++      - group: ""
++        kind: Secret
++        name: multi-port-https-tls
++        namespace: gateway-conformance-infra
++  - allowedRoutes:
++      namespaces:
++        from: Same
++    hostname: api.example.test
++    name: https-8443
++    port: 8443
++    protocol: HTTPS
++    tls:
++      certificateRefs:
++      - group: ""
++        kind: Secret
++        name: multi-port-https-tls
++        namespace: gateway-conformance-infra
++  - allowedRoutes:
++      kinds:
++      - kind: TLSRoute
++      namespaces:
++        from: Same
++    hostname: a.example.test
++    name: tls-443
++    port: 443
++    protocol: TLS
++    tls:
++      mode: Passthrough
++status:
++  addresses:
++  - type: IPAddress
++    value: 172.18.255.200
++  conditions:
++  - lastTransitionTime: "2026-10-08T17:18:53Z"
++    message: Gateway successfully scheduled
++    reason: Accepted
++    status: "True"
++    type: Accepted
++  - lastTransitionTime: "2026-10-08T17:18:53Z"
++    message: Gateway Programmed
++    reason: Programmed
++    status: "True"
++    type: Programmed
++  listeners:
++  - attachedRoutes: 1
++    conditions:
++    - lastTransitionTime: "2026-10-08T17:18:53Z"
++      message: Resolved Refs
++      reason: ResolvedRefs
++      status: "True"
++      type: ResolvedRefs
++    - lastTransitionTime: "2026-10-08T17:18:53Z"
++      message: Listener Accepted
++      reason: Accepted
++      status: "True"
++      type: Accepted
++    - lastTransitionTime: "2026-10-08T17:18:53Z"
++      message: Listener Programmed
++      reason: Programmed
++      status: "True"
++      type: Programmed
++    name: https-443
++    supportedKinds:
++    - group: gateway.networking.k8s.io
++      kind: HTTPRoute
++    - group: gateway.networking.k8s.io
++      kind: GRPCRoute
++  - attachedRoutes: 1
++    conditions:
++    - lastTransitionTime: "2026-10-08T17:18:53Z"
++      message: Resolved Refs
++      reason: ResolvedRefs
++      status: "True"
++      type: ResolvedRefs
++    - lastTransitionTime: "2026-10-08T17:18:53Z"
++      message: Listener Accepted
++      reason: Accepted
++      status: "True"
++      type: Accepted
++    - lastTransitionTime: "2026-10-08T17:18:53Z"
++      message: Listener Programmed
++      reason: Programmed
++      status: "True"
++      type: Programmed
++    name: https-8443
++    supportedKinds:
++    - group: gateway.networking.k8s.io
++      kind: HTTPRoute
++    - group: gateway.networking.k8s.io
++      kind: GRPCRoute
++  - attachedRoutes: 1
++    conditions:
++    - lastTransitionTime: "2026-10-08T17:18:53Z"
++      message: Resolved Refs
++      reason: ResolvedRefs
++      status: "True"
++      type: ResolvedRefs
++    - lastTransitionTime: "2026-10-08T17:18:53Z"
++      message: Listener Accepted
++      reason: Accepted
++      status: "True"
++      type: Accepted
++    - lastTransitionTime: "2026-10-08T17:18:53Z"
++      message: Listener Programmed
++      reason: Programmed
++      status: "True"
++      type: Programmed
++    name: tls-443
++    supportedKinds:
++    - group: gateway.networking.k8s.io
++      kind: TLSRoute
+\ No newline at end of file
+diff --git a/operator/pkg/gateway-api/testdata/gateway/gateway-same-port-https-and-tls-passthrough-with-second-https-port/output/tlsroute-tls-route-a.yaml b/operator/pkg/gateway-api/testdata/gateway/gateway-same-port-https-and-tls-passthrough-with-second-https-port/output/tlsroute-tls-route-a.yaml
+new file mode 100644
+index 0000000000..7d0675488c
+--- /dev/null
++++ b/operator/pkg/gateway-api/testdata/gateway/gateway-same-port-https-and-tls-passthrough-with-second-https-port/output/tlsroute-tls-route-a.yaml
+@@ -0,0 +1,35 @@
++apiVersion: gateway.networking.k8s.io/v1
++kind: TLSRoute
++metadata:
++  name: tls-route-a
++  namespace: gateway-conformance-infra
++  resourceVersion: "1000"
++spec:
++  hostnames:
++  - a.example.test
++  parentRefs:
++  - name: same-port-https-and-tls-passthrough-with-second-https-port
++    namespace: gateway-conformance-infra
++    sectionName: tls-443
++  rules:
++  - backendRefs:
++    - name: tls-backend
++      port: 443
++status:
++  parents:
++  - conditions:
++    - lastTransitionTime: "2026-10-08T17:18:53Z"
++      message: Accepted TLSRoute
++      reason: Accepted
++      status: "True"
++      type: Accepted
++    - lastTransitionTime: "2026-10-08T17:18:53Z"
++      message: Service reference is valid
++      reason: ResolvedRefs
++      status: "True"
++      type: ResolvedRefs
++    controllerName: io.cilium/gateway-controller
++    parentRef:
++      name: same-port-https-and-tls-passthrough-with-second-https-port
++      namespace: gateway-conformance-infra
++      sectionName: tls-443
+\ No newline at end of file
+diff --git a/operator/pkg/gateway-api/testdata/gateway/gateway-same-port-https-and-tls-passthrough-with-second-passthrough-port/input/same-port-https-and-tls-passthrough-with-second-passthrough-port.yaml b/operator/pkg/gateway-api/testdata/gateway/gateway-same-port-https-and-tls-passthrough-with-second-passthrough-port/input/same-port-https-and-tls-passthrough-with-second-passthrough-port.yaml
+new file mode 100644
+index 0000000000..eacf269cd5
+--- /dev/null
++++ b/operator/pkg/gateway-api/testdata/gateway/gateway-same-port-https-and-tls-passthrough-with-second-passthrough-port/input/same-port-https-and-tls-passthrough-with-second-passthrough-port.yaml
+@@ -0,0 +1,116 @@
++apiVersion: gateway.networking.k8s.io/v1
++kind: Gateway
++metadata:
++  name: same-port-https-and-tls-passthrough-with-second-passthrough-port
++  namespace: gateway-conformance-infra
++spec:
++  gatewayClassName: cilium
++  listeners:
++    - name: https-443
++      protocol: HTTPS
++      port: 443
++      hostname: "web.example.test"
++      tls:
++        certificateRefs:
++          - group: ""
++            kind: Secret
++            name: multi-port-https-tls
++            namespace: gateway-conformance-infra
++      allowedRoutes:
++        namespaces:
++          from: Same
++    - name: tls-443
++      protocol: TLS
++      port: 443
++      hostname: "a.example.test"
++      tls:
++        mode: Passthrough
++      allowedRoutes:
++        namespaces:
++          from: Same
++        kinds:
++          - kind: TLSRoute
++    - name: tls-8443
++      protocol: TLS
++      port: 8443
++      hostname: "b.example.test"
++      tls:
++        mode: Passthrough
++      allowedRoutes:
++        namespaces:
++          from: Same
++        kinds:
++          - kind: TLSRoute
++---
++apiVersion: gateway.networking.k8s.io/v1
++kind: HTTPRoute
++metadata:
++  name: web-route
++  namespace: gateway-conformance-infra
++spec:
++  parentRefs:
++    - name: same-port-https-and-tls-passthrough-with-second-passthrough-port
++      sectionName: https-443
++  hostnames:
++    - web.example.test
++  rules:
++    - backendRefs:
++        - name: infra-backend-v1
++          port: 8080
++---
++apiVersion: gateway.networking.k8s.io/v1alpha2
++kind: TLSRoute
++metadata:
++  name: tls-route-a
++  namespace: gateway-conformance-infra
++spec:
++  parentRefs:
++    - name: same-port-https-and-tls-passthrough-with-second-passthrough-port
++      namespace: gateway-conformance-infra
++      sectionName: tls-443
++  hostnames:
++    - a.example.test
++  rules:
++    - backendRefs:
++        - name: tls-backend
++          port: 443
++---
++apiVersion: gateway.networking.k8s.io/v1alpha2
++kind: TLSRoute
++metadata:
++  name: tls-route-b
++  namespace: gateway-conformance-infra
++spec:
++  parentRefs:
++    - name: same-port-https-and-tls-passthrough-with-second-passthrough-port
++      namespace: gateway-conformance-infra
++      sectionName: tls-8443
++  hostnames:
++    - b.example.test
++  rules:
++    - backendRefs:
++        - name: tls-backend-2
++          port: 443
++---
++apiVersion: v1
++kind: Secret
++metadata:
++  name: multi-port-https-tls
++  namespace: gateway-conformance-infra
++type: kubernetes.io/tls
++data:
++  tls.crt: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUVORENDQXB5Z0F3SUJBZ0lSQUtEL0JMRkJmd0tJWjBXR3JIdFRINmd3RFFZSktvWklodmNOQVFFTEJRQXcKZHpFZU1Cd0dBMVVFQ2hNVmJXdGpaWEowSUdSbGRtVnNiM0J0Wlc1MElFTkJNU1l3SkFZRFZRUUxEQjEwWVcxdApZV05vUUdabFpHOXlZUzVzWVc0Z0tGUmhiU0JOWVdOb0tURXRNQ3NHQTFVRUF3d2tiV3RqWlhKMElIUmhiVzFoClkyaEFabVZrYjNKaExteGhiaUFvVkdGdElFMWhZMmdwTUI0WERUSXpNREl5TVRFeE1EZzBNMW9YRFRJMU1EVXkKTVRFeU1EZzBNMW93VVRFbk1DVUdBMVVFQ2hNZWJXdGpaWEowSUdSbGRtVnNiM0J0Wlc1MElHTmxjblJwWm1sagpZWFJsTVNZd0pBWURWUVFMREIxMFlXMXRZV05vUUdabFpHOXlZUzVzWVc0Z0tGUmhiU0JOWVdOb0tUQ0NBU0l3CkRRWUpLb1pJaHZjTkFRRUJCUUFEZ2dFUEFEQ0NBUW9DZ2dFQkFNSVp5KzBKUlZqcXBXZ2VxMmRQKzFvbGlPNEEKQ2Zabk1nNHRTcVBhbGhEUUw2TWY2OEhZTGZpenlKSXBSek1KOTA1cllkMEFjbVhtdS9nMEVvOHlrSHhGRHo1VApzZVBzMlhRbmc4TU40YXpzUm1tMWw0Zjc0b3Zhd1F6UWNiODIyUVAxQ1M2SUxaM1Z0d05qUmgybkF3dGhZQk1vCkNrbmdER2VROEdsMHRqSExGbkJkVGRTd1FSbUUyanREQmNBZ3lFR3BxKzZSZVl0Ky80N25ObjdkQ2Z0c1ZxaEUKQllyOVhIM2l0ZWZIbXNiZmo3eldGYnB0ZGtvN3E5bE1Id25CZCswaGQ0ME1tSklYTVpyT0dHRlpqYXdKREJxUwpzQnEyUTNsNlhRejhYN1AvR0E0RG44aDR3M3JwcG1pYU43TE9tR1hla2kzeFgyd3FuTSswczZhWlpac0NBd0VBCkFhTmhNRjh3RGdZRFZSMFBBUUgvQkFRREFnV2dNQk1HQTFVZEpRUU1NQW9HQ0NzR0FRVUZCd01CTUI0R0ExVWQKSXdRWU1CYUFGR1EyREIwNkNkUUZRQnNZUHllME5Cd0VyVU5FTUJjR0ExVWRFUVFRTUE2Q0RIVnVhWFIwWlhOMApMbU52YlRBTkJna3Foa2lHOXcwQkFRc0ZBQU9DQVlFQXJ0SGRLV1hSNmFFTHBmYWwxN2JpYWJDUHZJRjlqNm53CnVEemNkTVlRTHJYbThNK05IZTh4M2RwSTd1M2xsdE8rZHpMbmcrblZLUU9SM2FsUUFDU21SRDljN2llOGVUNWQKN3pLT1RrNmtlWTE5NUkxd1ZWNGpiTkxiTldhOXk0UkpRUlR2QkxBdkFQOU5WdFV3MlEvdy9FclVUcVN5eitvYgpkd250NGdZQ3c2ZEdubHVMeGxmRjM0REI5S2ZsdlZOU25reU1CL2dzQjRBM3IxR1BPSW8wR3lmNzRpZzNGV3JTCndIWUtuQmJ0WmZZTzBKVjBMQ29QeUhlOGcwWGFqWmU4RENiUC9FNlNtbFROQW1KRVNWamlnVFRjSUJBa0ZJK24KdG9CQWR4ZmhqS1VHYUNsT0hTMjljcGFpeW5qU2F5R200UmtIa3g3bWNBdWE5bFdQZjdwU2EzbUNjRmIrd0ZyMwpBQmtIRFBKSDJhY2ZhVUsxdmdLVGdPd2NHLzZLQTgyMC9QcmFvU2loTGFQSy9BN2VnNzdyMUVlWXB0ME5lcHBiClhqdlVwM1ltVmxJTVpYUHpyak9zYXN0b0RTcnN5Z2o1amRWdG00UHNsdjluUGh6RHJCamxacEVKU2NXNEpsYisKNnd0ZDdwMDNVREJTS2ZUYlZST1ZBZTVtdkp2QTBob1MKLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
++  tls.key: LS0tLS1CRUdJTiBQUklWQVRFIEtFWS0tLS0tCk1JSUV2QUlCQURBTkJna3Foa2lHOXcwQkFRRUZBQVNDQktZd2dnU2lBZ0VBQW9JQkFRRENHY3Z0Q1VWWTZxVm8KSHF0blQvdGFKWWp1QUFuR1p6SU9MVXFqMnBZUTBDK2pIK3ZCMkMzNHM4aVNLVWN6Q2ZkT2EySGRBSEpsNXJ2NApOQktQTXBCOFJROCtVN0hqN05sMEo0UEREZUdzN0VacHRaZUgrK0tMMnNFTTBIRy9OdGtEOVFrdWlDMmQxYmNEClkwWWRwd01MWVdBVEtBcEo0QXhua1BCcGRMWXh5eFp3WFUzVXNFRVpoTm83UXdYQUlNaEJxYXZ1a1htTGZ2K08KNXpaKzNRbjdiRmFvUkFXSy9WeDk0clhueDVyRzM0KzgxaFc2YlhaS082dlpUQjhKd1hmdElYZU5ESmlTRnpHYQp6aGhoV1kyc0NRd2FrckFhdGtONWVsME0vRit6L3hnUEE1L0llTU42NmFab21qZXl6cGhsM3BJdDhWOXNLcHpQCnRMT21tV0diQWdNQkFBRUNnZ0VBRWpBU29NSjJvZzlTc24vMU5iZ1Q2RzJOK0NjK3d6MldQaWZXVDZaQzI0NTIKZUVXY2RNeUoranoyZFdPeXpVQ0kwT3RVL3oxMGVzSDFLUnZRQldVS2p1cDF0RFJwZmQ4S3ZVeWFseU5zMnlSRQpzTkVZUXVEQ2FMSjExbnFOdmdvb3FhdERVZjNtc0Z4L1NxejV1L3VUV0hTbWFRVWVlYStwMmVhRjhJdkVLc1FmCjZRTmtsa2VIc3YrR1ZQditpaWJmYlhYbmU2STVhVjM1UmM0UTA4elJDZ1lYL0JOMUFZWFY2aG80UkM5ZFpWR1AKSlVrU0x6UmFkZWdvay9FT05La3JxTFpPRkpWYjJ3dEZxODVnSjAxbE9ETS9najdHcU01OU0vd2s1NUNhUUlSRAo5eDVINFg0cnBNMnJobWlOTGtJTjB0R0xLTzhYMzF1cDdoVHg5YnZKY1FLQmdRRDUxTUxXWVlVUHovdW12U3JOClFPVDlVaEVISS9ieHRDYldRdGhXM0wxcXJWVDdEQjhKa28vNi94WWxYaGw3bndWd0p6MjRqSmY5dnV4V2JCcEwKSFpSZjBRc0RPMi9PNHJxaEtEb3YvR01VQ3gyc2h6YytKN2srVDkzS05WQU5ZYTA1Z3VxTWVCOG4zMEhQcm9rRgpMZ2loVkZGMjBrOVo2U2liVXZnVE1wRjFFd0tCZ1FERzVNQmdjOG9GWG1sci83cEhLaXpDNEYzZURBWFV4VkhNCldDSWJTd015ek9YS3FEY2RYTkR6OGNRcmpoS2EyckQxZktoRTBvUlIrUXZIejhJUEMrME1zVDdRNlFzSUhZajUKQ1h1YkhyMHM1azhQSkFwK0xrMkVkSGVQWlFNL0kvdmovZ1N3eG5KOVFzNjRGV1oyNUs5elluTk5zaW9qUWVsNwpXVm1JOUlWYVdRS0JnRDNCWWdnc1F3QU5vVjh1RTQ1NUpDR2FUNnM4TUthK3FYcjlPd3o5czdUUzg5YTZ3RkZWCmNWSFNERjlnUzF4TGlzU1dicU5YM1pwVHY0ZjlZT0tBaFZUS0Q3YlUwbWFKbFNpUkVSRWJpa0pDSFN1d29PODAKVW80Y24rNkVEeTIvbjFwQUNrcCt4dlRNTXpCckxHT2paVzY3c1FkMkpUZE1jMFV4MVRDcHAxc1JBb0dBYUVWSQpyY2hHWXlZcDhwcXcxOW8rZVRRVFFmUGZvcnFIdGErR3dmUkRpd0JzZ0NCTU5MS1NRVUhBZkcwUlIrbmExL2d3CloxUk9Wb05RTDhLMXBCbkdmdDcxWmFTblNldmlBVjE5VmNkNXVlNU1DRTRHeWp3UUc1N0xoM3VYaGlTaFM5ZkMKTWNMNEJyOWRqSmg3alYwNnRpMG84ZFN6enFRaGVhOVFCMExhSHBFQ2dZQXBjOG9Cb2lLNjlzMHdYeUk0K1BoeApTY0JKMFhxREJZRmt4eVhyOFk1cEVhckVhcUN0bDFPUFBNT2lRUkRXb3hSUitGd0EvMGxhU2ZoNXh3MFUzYitxCmlaMlhwa3JiUXAwMzRyQzBVUjZwK0ttMVN2OUFWQ0FDQWpyY1EzTlphZjhiRE9XcXZwbGE3QXVxMG9HOGk2VVgKaEVLQ0tmL04zZ0Uxb01yVHhWelVEUT09Ci0tLS0tRU5EIFBSSVZBVEUgS0VZLS0tLS0K
++---
++apiVersion: v1
++kind: Service
++metadata:
++  name: cilium-gateway-same-port-https-and-tls-passthrough-w-kdh28ck9f2
++  namespace: gateway-conformance-infra
++spec:
++  type: LoadBalancer
++status:
++  loadBalancer:
++    ingress:
++      - ip: 172.18.255.200
++        ipMode: VIP
+diff --git a/operator/pkg/gateway-api/testdata/gateway/gateway-same-port-https-and-tls-passthrough-with-second-passthrough-port/output/cec-same-port-https-and-tls-passthrough-with-second-passthrough-port.yaml b/operator/pkg/gateway-api/testdata/gateway/gateway-same-port-https-and-tls-passthrough-with-second-passthrough-port/output/cec-same-port-https-and-tls-passthrough-with-second-passthrough-port.yaml
+new file mode 100644
+index 0000000000..0afca9b32d
+--- /dev/null
++++ b/operator/pkg/gateway-api/testdata/gateway/gateway-same-port-https-and-tls-passthrough-with-second-passthrough-port/output/cec-same-port-https-and-tls-passthrough-with-second-passthrough-port.yaml
+@@ -0,0 +1,189 @@
++metadata:
++  annotations:
++    cec.cilium.io/use-original-source-address: "false"
++  labels:
++    gateway.networking.k8s.io/gateway-name: same-port-https-and-tls-passthrough-with-second-pass-2d4m8htd97
++  name: cilium-gateway-same-port-https-and-tls-passthrough-w-kdh28ck9f2
++  namespace: gateway-conformance-infra
++  ownerReferences:
++  - apiVersion: gateway.networking.k8s.io/v1
++    controller: true
++    kind: Gateway
++    name: same-port-https-and-tls-passthrough-with-second-passthrough-port
++    uid: ""
++  resourceVersion: "1"
++spec:
++  backendServices:
++  - name: infra-backend-v1
++    namespace: gateway-conformance-infra
++    number:
++    - "8080"
++  - name: tls-backend
++    namespace: gateway-conformance-infra
++    number:
++    - "443"
++  - name: tls-backend-2
++    namespace: gateway-conformance-infra
++    number:
++    - "443"
++  resources:
++  - '@type': type.googleapis.com/envoy.config.listener.v3.Listener
++    filterChains:
++    - filterChainMatch:
++        serverNames:
++        - web.example.test
++        transportProtocol: tls
++      filters:
++      - name: envoy.filters.network.http_connection_manager
++        typedConfig:
++          '@type': type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
++          commonHttpProtocolOptions:
++            maxStreamDuration: 0s
++          httpFilters:
++          - name: envoy.filters.http.grpc_web
++            typedConfig:
++              '@type': type.googleapis.com/envoy.extensions.filters.http.grpc_web.v3.GrpcWeb
++          - name: envoy.filters.http.grpc_stats
++            typedConfig:
++              '@type': type.googleapis.com/envoy.extensions.filters.http.grpc_stats.v3.FilterConfig
++              emitFilterState: true
++              enableUpstreamStats: true
++          - name: envoy.filters.http.router
++            typedConfig:
++              '@type': type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
++          internalAddressConfig: {}
++          rds:
++            routeConfigName: listener-443
++          statPrefix: listener-443
++          streamIdleTimeout: 300s
++          upgradeConfigs:
++          - upgradeType: websocket
++          useRemoteAddress: true
++      transportSocket:
++        name: envoy.transport_sockets.tls
++        typedConfig:
++          '@type': type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext
++          commonTlsContext:
++            tlsCertificateSdsSecretConfigs:
++            - name: cilium-secrets/cilium-sync-secret-62f4462c70564aa40ef22396762652f4b3bd572448747e332d134b0c028c0cfb
++    - filterChainMatch:
++        serverNames:
++        - a.example.test
++        transportProtocol: tls
++      filters:
++      - name: envoy.filters.network.tcp_proxy
++        typedConfig:
++          '@type': type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy
++          cluster: gateway-conformance-infra:tls-backend:443
++          statPrefix: tls-passthrough:a.example.test
++    listenerFilters:
++    - name: envoy.filters.listener.tls_inspector
++      typedConfig:
++        '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector
++    name: listener-443
++    socketOptions:
++    - description: Enable TCP keep-alive (default to enabled)
++      intValue: "1"
++      level: "1"
++      name: "9"
++    - description: TCP keep-alive idle time (in seconds) (defaults to 10s)
++      intValue: "10"
++      level: "6"
++      name: "4"
++    - description: TCP keep-alive probe intervals (in seconds) (defaults to 5s)
++      intValue: "5"
++      level: "6"
++      name: "5"
++    - description: TCP keep-alive probe max failures.
++      intValue: "10"
++      level: "6"
++      name: "6"
++  - '@type': type.googleapis.com/envoy.config.listener.v3.Listener
++    filterChains:
++    - filterChainMatch:
++        serverNames:
++        - b.example.test
++        transportProtocol: tls
++      filters:
++      - name: envoy.filters.network.tcp_proxy
++        typedConfig:
++          '@type': type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy
++          cluster: gateway-conformance-infra:tls-backend-2:443
++          statPrefix: tls-passthrough:b.example.test
++    listenerFilters:
++    - name: envoy.filters.listener.tls_inspector
++      typedConfig:
++        '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector
++    name: listener-8443
++    socketOptions:
++    - description: Enable TCP keep-alive (default to enabled)
++      intValue: "1"
++      level: "1"
++      name: "9"
++    - description: TCP keep-alive idle time (in seconds) (defaults to 10s)
++      intValue: "10"
++      level: "6"
++      name: "4"
++    - description: TCP keep-alive probe intervals (in seconds) (defaults to 5s)
++      intValue: "5"
++      level: "6"
++      name: "5"
++    - description: TCP keep-alive probe max failures.
++      intValue: "10"
++      level: "6"
++      name: "6"
++  - '@type': type.googleapis.com/envoy.config.route.v3.RouteConfiguration
++    name: listener-insecure
++  - '@type': type.googleapis.com/envoy.config.route.v3.RouteConfiguration
++    name: listener-443
++    virtualHosts:
++    - domains:
++      - web.example.test
++      - web.example.test:*
++      name: web.example.test
++      routes:
++      - match:
++          prefix: /
++        route:
++          cluster: gateway-conformance-infra:infra-backend-v1:8080
++          maxStreamDuration:
++            maxStreamDuration: 0s
++  - '@type': type.googleapis.com/envoy.config.cluster.v3.Cluster
++    edsClusterConfig:
++      serviceName: gateway-conformance-infra/infra-backend-v1:8080
++    name: gateway-conformance-infra:infra-backend-v1:8080
++    outlierDetection:
++      splitExternalLocalOriginErrors: true
++    type: EDS
++    typedExtensionProtocolOptions:
++      envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
++        '@type': type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions
++        commonHttpProtocolOptions:
++          idleTimeout: 60s
++        useDownstreamProtocolConfig:
++          http2ProtocolOptions: {}
++  - '@type': type.googleapis.com/envoy.config.cluster.v3.Cluster
++    edsClusterConfig:
++      serviceName: gateway-conformance-infra/tls-backend-2:443
++    name: gateway-conformance-infra:tls-backend-2:443
++    outlierDetection:
++      splitExternalLocalOriginErrors: true
++    type: EDS
++  - '@type': type.googleapis.com/envoy.config.cluster.v3.Cluster
++    edsClusterConfig:
++      serviceName: gateway-conformance-infra/tls-backend:443
++    name: gateway-conformance-infra:tls-backend:443
++    outlierDetection:
++      splitExternalLocalOriginErrors: true
++    type: EDS
++  services:
++  - listener: listener-443
++    name: cilium-gateway-same-port-https-and-tls-passthrough-w-kdh28ck9f2
++    namespace: gateway-conformance-infra
++    ports:
++    - 443
++  - listener: listener-8443
++    name: cilium-gateway-same-port-https-and-tls-passthrough-w-kdh28ck9f2
++    namespace: gateway-conformance-infra
++    ports:
++    - 8443
+\ No newline at end of file
+diff --git a/operator/pkg/gateway-api/testdata/gateway/gateway-same-port-https-and-tls-passthrough-with-second-passthrough-port/output/httproute-web-route.yaml b/operator/pkg/gateway-api/testdata/gateway/gateway-same-port-https-and-tls-passthrough-with-second-passthrough-port/output/httproute-web-route.yaml
+new file mode 100644
+index 0000000000..213d17b8f4
+--- /dev/null
++++ b/operator/pkg/gateway-api/testdata/gateway/gateway-same-port-https-and-tls-passthrough-with-second-passthrough-port/output/httproute-web-route.yaml
+@@ -0,0 +1,33 @@
++apiVersion: gateway.networking.k8s.io/v1
++kind: HTTPRoute
++metadata:
++  name: web-route
++  namespace: gateway-conformance-infra
++  resourceVersion: "1000"
++spec:
++  hostnames:
++  - web.example.test
++  parentRefs:
++  - name: same-port-https-and-tls-passthrough-with-second-passthrough-port
++    sectionName: https-443
++  rules:
++  - backendRefs:
++    - name: infra-backend-v1
++      port: 8080
++status:
++  parents:
++  - conditions:
++    - lastTransitionTime: "2026-10-08T17:18:53Z"
++      message: Accepted HTTPRoute
++      reason: Accepted
++      status: "True"
++      type: Accepted
++    - lastTransitionTime: "2026-10-08T17:18:53Z"
++      message: Service reference is valid
++      reason: ResolvedRefs
++      status: "True"
++      type: ResolvedRefs
++    controllerName: io.cilium/gateway-controller
++    parentRef:
++      name: same-port-https-and-tls-passthrough-with-second-passthrough-port
++      sectionName: https-443
+\ No newline at end of file
+diff --git a/operator/pkg/gateway-api/testdata/gateway/gateway-same-port-https-and-tls-passthrough-with-second-passthrough-port/output/same-port-https-and-tls-passthrough-with-second-passthrough-port.yaml b/operator/pkg/gateway-api/testdata/gateway/gateway-same-port-https-and-tls-passthrough-with-second-passthrough-port/output/same-port-https-and-tls-passthrough-with-second-passthrough-port.yaml
+new file mode 100644
+index 0000000000..0d6a29ab4a
+--- /dev/null
++++ b/operator/pkg/gateway-api/testdata/gateway/gateway-same-port-https-and-tls-passthrough-with-second-passthrough-port/output/same-port-https-and-tls-passthrough-with-second-passthrough-port.yaml
+@@ -0,0 +1,125 @@
++apiVersion: gateway.networking.k8s.io/v1
++kind: Gateway
++metadata:
++  name: same-port-https-and-tls-passthrough-with-second-passthrough-port
++  namespace: gateway-conformance-infra
++  resourceVersion: "1000"
++spec:
++  gatewayClassName: cilium
++  listeners:
++  - allowedRoutes:
++      namespaces:
++        from: Same
++    hostname: web.example.test
++    name: https-443
++    port: 443
++    protocol: HTTPS
++    tls:
++      certificateRefs:
++      - group: ""
++        kind: Secret
++        name: multi-port-https-tls
++        namespace: gateway-conformance-infra
++  - allowedRoutes:
++      kinds:
++      - kind: TLSRoute
++      namespaces:
++        from: Same
++    hostname: a.example.test
++    name: tls-443
++    port: 443
++    protocol: TLS
++    tls:
++      mode: Passthrough
++  - allowedRoutes:
++      kinds:
++      - kind: TLSRoute
++      namespaces:
++        from: Same
++    hostname: b.example.test
++    name: tls-8443
++    port: 8443
++    protocol: TLS
++    tls:
++      mode: Passthrough
++status:
++  addresses:
++  - type: IPAddress
++    value: 172.18.255.200
++  conditions:
++  - lastTransitionTime: "2026-10-08T17:18:53Z"
++    message: Gateway successfully scheduled
++    reason: Accepted
++    status: "True"
++    type: Accepted
++  - lastTransitionTime: "2026-10-08T17:18:53Z"
++    message: Gateway Programmed
++    reason: Programmed
++    status: "True"
++    type: Programmed
++  listeners:
++  - attachedRoutes: 1
++    conditions:
++    - lastTransitionTime: "2026-10-08T17:18:53Z"
++      message: Resolved Refs
++      reason: ResolvedRefs
++      status: "True"
++      type: ResolvedRefs
++    - lastTransitionTime: "2026-10-08T17:18:53Z"
++      message: Listener Accepted
++      reason: Accepted
++      status: "True"
++      type: Accepted
++    - lastTransitionTime: "2026-10-08T17:18:53Z"
++      message: Listener Programmed
++      reason: Programmed
++      status: "True"
++      type: Programmed
++    name: https-443
++    supportedKinds:
++    - group: gateway.networking.k8s.io
++      kind: HTTPRoute
++    - group: gateway.networking.k8s.io
++      kind: GRPCRoute
++  - attachedRoutes: 1
++    conditions:
++    - lastTransitionTime: "2026-10-08T17:18:53Z"
++      message: Resolved Refs
++      reason: ResolvedRefs
++      status: "True"
++      type: ResolvedRefs
++    - lastTransitionTime: "2026-10-08T17:18:53Z"
++      message: Listener Accepted
++      reason: Accepted
++      status: "True"
++      type: Accepted
++    - lastTransitionTime: "2026-10-08T17:18:53Z"
++      message: Listener Programmed
++      reason: Programmed
++      status: "True"
++      type: Programmed
++    name: tls-443
++    supportedKinds:
++    - group: gateway.networking.k8s.io
++      kind: TLSRoute
++  - attachedRoutes: 1
++    conditions:
++    - lastTransitionTime: "2026-10-08T17:18:53Z"
++      message: Resolved Refs
++      reason: ResolvedRefs
++      status: "True"
++      type: ResolvedRefs
++    - lastTransitionTime: "2026-10-08T17:18:53Z"
++      message: Listener Accepted
++      reason: Accepted
++      status: "True"
++      type: Accepted
++    - lastTransitionTime: "2026-10-08T17:18:53Z"
++      message: Listener Programmed
++      reason: Programmed
++      status: "True"
++      type: Programmed
++    name: tls-8443
++    supportedKinds:
++    - group: gateway.networking.k8s.io
++      kind: TLSRoute
+\ No newline at end of file
+diff --git a/operator/pkg/gateway-api/testdata/gateway/gateway-same-port-https-and-tls-passthrough-with-second-passthrough-port/output/tlsroute-tls-route-a.yaml b/operator/pkg/gateway-api/testdata/gateway/gateway-same-port-https-and-tls-passthrough-with-second-passthrough-port/output/tlsroute-tls-route-a.yaml
+new file mode 100644
+index 0000000000..d859d5dcce
+--- /dev/null
++++ b/operator/pkg/gateway-api/testdata/gateway/gateway-same-port-https-and-tls-passthrough-with-second-passthrough-port/output/tlsroute-tls-route-a.yaml
+@@ -0,0 +1,35 @@
++apiVersion: gateway.networking.k8s.io/v1
++kind: TLSRoute
++metadata:
++  name: tls-route-a
++  namespace: gateway-conformance-infra
++  resourceVersion: "1000"
++spec:
++  hostnames:
++  - a.example.test
++  parentRefs:
++  - name: same-port-https-and-tls-passthrough-with-second-passthrough-port
++    namespace: gateway-conformance-infra
++    sectionName: tls-443
++  rules:
++  - backendRefs:
++    - name: tls-backend
++      port: 443
++status:
++  parents:
++  - conditions:
++    - lastTransitionTime: "2026-10-08T17:18:53Z"
++      message: Accepted TLSRoute
++      reason: Accepted
++      status: "True"
++      type: Accepted
++    - lastTransitionTime: "2026-10-08T17:18:53Z"
++      message: Service reference is valid
++      reason: ResolvedRefs
++      status: "True"
++      type: ResolvedRefs
++    controllerName: io.cilium/gateway-controller
++    parentRef:
++      name: same-port-https-and-tls-passthrough-with-second-passthrough-port
++      namespace: gateway-conformance-infra
++      sectionName: tls-443
+\ No newline at end of file
+diff --git a/operator/pkg/gateway-api/testdata/gateway/gateway-same-port-https-and-tls-passthrough-with-second-passthrough-port/output/tlsroute-tls-route-b.yaml b/operator/pkg/gateway-api/testdata/gateway/gateway-same-port-https-and-tls-passthrough-with-second-passthrough-port/output/tlsroute-tls-route-b.yaml
+new file mode 100644
+index 0000000000..1ddedaf4d0
+--- /dev/null
++++ b/operator/pkg/gateway-api/testdata/gateway/gateway-same-port-https-and-tls-passthrough-with-second-passthrough-port/output/tlsroute-tls-route-b.yaml
+@@ -0,0 +1,35 @@
++apiVersion: gateway.networking.k8s.io/v1
++kind: TLSRoute
++metadata:
++  name: tls-route-b
++  namespace: gateway-conformance-infra
++  resourceVersion: "1000"
++spec:
++  hostnames:
++  - b.example.test
++  parentRefs:
++  - name: same-port-https-and-tls-passthrough-with-second-passthrough-port
++    namespace: gateway-conformance-infra
++    sectionName: tls-8443
++  rules:
++  - backendRefs:
++    - name: tls-backend-2
++      port: 443
++status:
++  parents:
++  - conditions:
++    - lastTransitionTime: "2026-10-08T17:18:53Z"
++      message: Accepted TLSRoute
++      reason: Accepted
++      status: "True"
++      type: Accepted
++    - lastTransitionTime: "2026-10-08T17:18:53Z"
++      message: Service reference is valid
++      reason: ResolvedRefs
++      status: "True"
++      type: ResolvedRefs
++    controllerName: io.cilium/gateway-controller
++    parentRef:
++      name: same-port-https-and-tls-passthrough-with-second-passthrough-port
++      namespace: gateway-conformance-infra
++      sectionName: tls-8443
+\ No newline at end of file
+diff --git a/operator/pkg/model/translation/cec_translator.go b/operator/pkg/model/translation/cec_translator.go
+index a83070a9f3..c042e87b9b 100644
+--- a/operator/pkg/model/translation/cec_translator.go
++++ b/operator/pkg/model/translation/cec_translator.go
+@@ -233,10 +233,15 @@ func (i *cecTranslator) desiredServicesWithPortsSplit(namespace string, name str
+ 		})
+ 	}
+ 
+-	// TLS passthrough ports.
++	// TLS passthrough ports. A port shared with HTTPS is already mapped to
++	// its HTTPS listener above, which also carries the passthrough chains.
++	sharedPorts := httpsAndTLSPassthroughPorts(m)
+ 	if m.NeedsPerPortTLSPassthroughListeners() {
+ 		// One entry per TLS passthrough port.
+ 		for _, port := range m.TLSPassthroughPorts() {
++			if sharedPorts[port] {
++				continue
++			}
+ 			envoyListenerName := listenerNameForPort(port)
+ 			result = append(result, &ciliumv2.ServiceListener{
+ 				Namespace: namespace,
+@@ -248,7 +253,7 @@ func (i *cecTranslator) desiredServicesWithPortsSplit(namespace string, name str
+ 	} else {
+ 		var ptPorts []uint16
+ 		for _, tlsl := range m.TLSPassthrough {
+-			if len(tlsl.Routes) > 0 {
++			if len(tlsl.Routes) > 0 && !sharedPorts[tlsl.Port] {
+ 				ptPorts = append(ptPorts, uint16(tlsl.Port))
+ 			}
+ 		}
+diff --git a/operator/pkg/model/translation/envoy_listener.go b/operator/pkg/model/translation/envoy_listener.go
+index f0a88163a6..ec6f7245fb 100644
+--- a/operator/pkg/model/translation/envoy_listener.go
++++ b/operator/pkg/model/translation/envoy_listener.go
+@@ -55,6 +55,22 @@ func listenerNameForPort(port uint32) string {
+ 	return fmt.Sprintf("%s-%d", listenerName, port)
+ }
+ 
++// httpsAndTLSPassthroughPorts returns the ports that carry both an HTTPS
++// listener and a routed TLS passthrough listener.
++func httpsAndTLSPassthroughPorts(m *model.Model) map[uint32]bool {
++	https := map[uint32]bool{}
++	for _, p := range m.HTTPSPortsSorted() {
++		https[p] = true
++	}
++	shared := map[uint32]bool{}
++	for _, p := range m.TLSPassthroughPorts() {
++		if https[p] {
++			shared[p] = true
++		}
++	}
++	return shared
++}
++
+ type ListenerMutator func(*envoy_config_listener.Listener) *envoy_config_listener.Listener
+ 
+ func withProxyProtocol() ListenerMutator {
+@@ -411,6 +427,12 @@ func (i *cecTranslator) desiredEnvoyListenerPerPort(m *model.Model) ([]ciliumv2.
+ 		tlsPassthroughPorts[p] = true
+ 	}
+ 
++	// A port carrying both HTTPS and TLS passthrough gets a single Envoy
++	// listener holding both sets of filter chains: Envoy rejects a resource set
++	// with two listeners of the same name, and two listeners would not share
++	// the port anyway.
++	sharedPorts := httpsAndTLSPassthroughPorts(m)
++
+ 	hasInsecure := false
+ 	for _, l := range m.HTTP {
+ 		if len(l.TLS) == 0 && !tlsPassthroughPorts[l.Port] {
+@@ -419,7 +441,7 @@ func (i *cecTranslator) desiredEnvoyListenerPerPort(m *model.Model) ([]ciliumv2.
+ 		}
+ 	}
+ 
+-	hasTLSPassthroughForBase := !needsPerPortTLS && m.IsTLSPassthroughListenerConfigured()
++	hasTLSPassthroughForBase := !needsPerPortTLS && m.IsTLSPassthroughListenerConfigured() && len(sharedPorts) == 0
+ 
+ 	if hasInsecure || hasTLSPassthroughForBase {
+ 		var filterChains []*envoy_config_listener.FilterChain
+@@ -477,6 +499,9 @@ func (i *cecTranslator) desiredEnvoyListenerPerPort(m *model.Model) ([]ciliumv2.
+ 		if err != nil {
+ 			return nil, err
+ 		}
++		if sharedPorts[port] {
++			httpsFC = append(httpsFC, tlsPassthroughFilterChainsForPort(port, m)...)
++		}
+ 		if len(httpsFC) == 0 {
+ 			continue
+ 		}
+@@ -506,6 +531,9 @@ func (i *cecTranslator) desiredEnvoyListenerPerPort(m *model.Model) ([]ciliumv2.
+ 	// One Listener per TLS passthrough port.
+ 	if needsPerPortTLS {
+ 		for _, port := range m.TLSPassthroughPorts() {
++			if sharedPorts[port] {
++				continue
++			}
+ 			lName := listenerNameForPort(port)
+ 
+ 			tlsFC := tlsPassthroughFilterChainsForPort(port, m)
diff --git a/packages/system/cilium/images/cilium/Dockerfile b/packages/system/cilium/images/cilium/Dockerfile
index 32fc6fb8a0..28f7dab25a 100644
--- a/packages/system/cilium/images/cilium/Dockerfile
+++ b/packages/system/cilium/images/cilium/Dockerfile
@@ -1,2 +1,35 @@
-ARG VERSION=v1.19.3
-FROM quay.io/cilium/cilium:${VERSION}
+ARG VERSION=v1.20.2@sha256:2939231d0d3e3ebddcd80fffa168b7ddcc78fdf0dc864d1c8c126ff523c54f01
+
+FROM quay.io/cilium/cilium:${VERSION} AS upstream
+
+# The upstream runtime image ships no `patch`; apply the BPF patches in a
+# throwaway alpine stage and copy the results back over the upstream image.
+# The agent compiles BPF at startup from /var/lib/cilium/bpf, so replacing
+# the source files is sufficient.
+FROM docker.io/library/alpine:3.22@sha256:5291449c3df73caf6ed85e649dec1b9e818b39a5d8c871e97afc13e9cd5e8fa8 AS patcher
+RUN apk add --no-cache patch
+WORKDIR /work
+COPY --from=upstream /var/lib/cilium/bpf/bpf_host.c ./bpf_host.c
+COPY patches/pass-ipv6-to-stack-when-ipv6-datapath-disabled.diff /patches/
+# --fuzz=0: any upstream drift in the patched context must fail the build, loudly.
+RUN patch --batch --forward --fuzz=0 -p1 < /patches/pass-ipv6-to-stack-when-ipv6-datapath-disabled.diff || { \
+      echo 'ERROR: the IPv6 passthrough patch no longer applies to bpf/bpf_host.c.' >&2; \
+      echo 'Upstream cilium changed the host-firewall protocol switches (version bump?).' >&2; \
+      echo 'Regenerate packages/system/cilium/images/cilium/patches/*.diff against the new tag.' >&2; \
+      exit 1; }
+RUN test "$(grep -c 'cozystack-ipv6-passthrough' bpf_host.c)" = 3 || { \
+      echo 'ERROR: expected exactly 3 cozystack-ipv6-passthrough markers in bpf_host.c' >&2; \
+      exit 1; }
+COPY --from=upstream /var/lib/cilium/bpf/lib/nodeport_egress.h ./lib/nodeport_egress.h
+COPY patches/skip-snat-conflict-for-local-destinations.diff /patches/
+RUN patch --batch --forward --fuzz=0 -p1 < /patches/skip-snat-conflict-for-local-destinations.diff || { \
+      echo 'ERROR: the cilium/cilium#49232 backport no longer applies to bpf/lib/nodeport_egress.h.' >&2; \
+      echo 'If the new tag already carries cilium/cilium#49232, drop the patch; otherwise regenerate it.' >&2; \
+      exit 1; }
+RUN test "$(grep -c -e 'See comment in nodeport_has_nat_conflict_ipv4' -e 'Host traffic to a local endpoint never leaves the node' lib/nodeport_egress.h)" = 2 || { \
+      echo 'ERROR: expected both cilium/cilium#49232 hunks in nodeport_egress.h' >&2; \
+      exit 1; }
+
+FROM upstream
+COPY --from=patcher /work/bpf_host.c /var/lib/cilium/bpf/bpf_host.c
+COPY --from=patcher /work/lib/nodeport_egress.h /var/lib/cilium/bpf/lib/nodeport_egress.h
diff --git a/packages/system/cilium/images/cilium/patches/pass-ipv6-to-stack-when-ipv6-datapath-disabled.diff b/packages/system/cilium/images/cilium/patches/pass-ipv6-to-stack-when-ipv6-datapath-disabled.diff
new file mode 100644
index 0000000000..d51f66e92c
--- /dev/null
+++ b/packages/system/cilium/images/cilium/patches/pass-ipv6-to-stack-when-ipv6-datapath-disabled.diff
@@ -0,0 +1,73 @@
+Pass IPv6 to the kernel stack when the IPv6 datapath is disabled.
+
+Generated against cilium v1.20.2 bpf/bpf_host.c (first written for v1.19.3).
+v1.20 moved the ARP case of do_netdev under ENABLE_IPV4, so this patch's
+ETH_P_IPV6 case in do_netdev now sits directly before `default:`, outside
+the ENABLE_IPV4 block; the behaviour is unchanged. With ENABLE_HOST_FIREWALL defined
+but ENABLE_IPV6 not compiled in, the protocol-switch default case drops
+all IPv6 as DROP_UNKNOWN_L3 ("Unsupported L3 protocol") before any policy
+evaluation, in both directions. That breaks ICMPv6 Neighbor Discovery
+and BGP unnumbered over link-local addresses on IPv6/L3 fabrics, and no
+CiliumClusterwideNetworkPolicy can allow the traffic back. Upstream report:
+https://github.com/cilium/cilium/issues/33155 (closed stale, not fixed).
+
+Three of the four DROP_UNKNOWN_L3 sites are covered: do_netdev (ingress and
+from-host), cil_to_netdev (egress), and host_ingress_policy (cil_to_host).
+The fourth site, from_host_to_lxc (host to local pod), is intentionally not
+covered: with the IPv6 datapath disabled bpf_lxc drops IPv6 regardless of the
+host firewall, so a passthrough there would restore nothing.
+
+Regenerate for a new cilium version by re-applying the same three cases and
+running `make update`, which dry-runs this patch against the new tag.
+
+--- a/bpf_host.c
++++ b/bpf_host.c
+@@ -1277,6 +1277,18 @@
+ 
+ 		break;
+ #endif /* ENABLE_IPV4 */
++#ifndef ENABLE_IPV6
++	/* cozystack-ipv6-passthrough: the IPv6 datapath is not compiled in, but
++	 * the node may still rely on IPv6 (ICMPv6 ND, BGP unnumbered over
++	 * link-local). Mirror the !ENABLE_HOST_FIREWALL behaviour and pass IPv6
++	 * to the kernel stack instead of dropping it as unknown L3.
++	 */
++	case bpf_htons(ETH_P_IPV6):
++		send_trace_notify(ctx, obs_point, identity, UNKNOWN_ID, TRACE_EP_ID_UNKNOWN,
++				  ctx->ingress_ifindex, trace.reason, trace.monitor, proto);
++		ret = CTX_ACT_OK;
++		break;
++#endif /* !ENABLE_IPV6 */
+ 	default:
+ 		send_trace_notify(ctx, obs_point, identity, UNKNOWN_ID, TRACE_EP_ID_UNKNOWN,
+ 				  ctx->ingress_ifindex, trace.reason, trace.monitor, proto);
+@@ -1523,6 +1535,14 @@
+ 					    src_sec_identity, &trace, &ext_err);
+ 		break;
+ # endif
++# ifndef ENABLE_IPV6
++	/* cozystack-ipv6-passthrough: IPv6 datapath disabled; let the kernel
++	 * stack handle host IPv6 instead of dropping it as unknown L3.
++	 */
++	case bpf_htons(ETH_P_IPV6):
++		ret = CTX_ACT_OK;
++		break;
++# endif /* !ENABLE_IPV6 */
+ # ifdef ENABLE_IPV4
+ 	case bpf_htons(ETH_P_IP): {
+ 		ret = handle_to_netdev_ipv4(ctx, magic == MARK_MAGIC_PROXY_EGRESS,
+@@ -1748,6 +1768,14 @@
+ 
+ 		break;
+ # endif
++# ifndef ENABLE_IPV6
++	/* cozystack-ipv6-passthrough: IPv6 datapath disabled; pass IPv6
++	 * destined to the host to the kernel stack instead of dropping it.
++	 */
++	case bpf_htons(ETH_P_IPV6):
++		ret = CTX_ACT_OK;
++		break;
++# endif /* !ENABLE_IPV6 */
+ # ifdef ENABLE_IPV4
+ 	case bpf_htons(ETH_P_IP):
+ 		if (use_tailcall) {
diff --git a/packages/system/cilium/images/cilium/patches/skip-snat-conflict-for-local-destinations.diff b/packages/system/cilium/images/cilium/patches/skip-snat-conflict-for-local-destinations.diff
new file mode 100644
index 0000000000..152188a0c2
--- /dev/null
+++ b/packages/system/cilium/images/cilium/patches/skip-snat-conflict-for-local-destinations.diff
@@ -0,0 +1,49 @@
+Skip NodePort SNAT conflict handling for host traffic to a local endpoint.
+
+The bpf/lib/nodeport_egress.h hunks of
+https://github.com/cilium/cilium/pull/49232, verbatim, applied to cilium
+v1.20.2. The PR is cited, not a commit of it, because its branch is
+rewritten until it merges. Upstream commit 990f79be17 ("bpf,nodeport:
+generalize SNAT conflict detection") runs the conflict path
+for any host-marked packet on every bpf_host device, and that path replaces
+MARK_MAGIC_HOST with MARK_MAGIC_SNAT_DONE. With kube-ovn chaining, host
+traffic to a local pod leaves through ovn0, so the pod sees it as world:
+kubelet probes fail under default-deny ingress policies and a world deny
+drops the API server calling a webhook on its own node. Upstream report:
+https://github.com/cilium/cilium/issues/49208, downstream tracking:
+https://github.com/cozystack/cozystack/issues/4781.
+
+Drop this patch by hand once a cilium release we ship carries the fix.
+Nothing detects that: `make update` and the image build fail only when a
+hunk stops applying, and a fix that lands upstream in another place leaves
+this one applying cleanly as a second, redundant early return.
+
+--- a/lib/nodeport_egress.h
++++ b/lib/nodeport_egress.h
+@@ -46,6 +46,10 @@
+ 	 * already reserved.
+ 	 */
+ 	if (magic == MARK_MAGIC_HOST || (ep && (ep->flags & ENDPOINT_F_HOST))) {
++		/* See comment in nodeport_has_nat_conflict_ipv4(). */
++		if (__lookup_ip6_endpoint((union v6addr *)&ip6->daddr))
++			return false;
++
+ 		ipv6_addr_copy(&target->addr, (union v6addr *)&ip6->saddr);
+ 		target->needs_ct = true;
+ 		return true;
+@@ -314,6 +318,15 @@
+ 	 * already reserved.
+ 	 */
+ 	if (magic == MARK_MAGIC_HOST || (ep && (ep->flags & ENDPOINT_F_HOST))) {
++		/* Host traffic to a local endpoint never leaves the node, so it
++		 * cannot collide with egress SNAT and must keep MARK_MAGIC_HOST.
++		 * The SNAT path would replace that mark with MARK_MAGIC_SNAT_DONE,
++		 * and with CNI chaining the destination endpoint would then see
++		 * the source as world.
++		 */
++		if (__lookup_ip4_endpoint(ip4->daddr))
++			return false;
++
+ 		target->addr = ip4->saddr;
+ 		target->needs_ct = true;
+ 		return true;
diff --git a/packages/system/cilium/templates/ipam-migration.yaml b/packages/system/cilium/templates/ipam-migration.yaml
new file mode 100644
index 0000000000..929d5e3c5b
--- /dev/null
+++ b/packages/system/cilium/templates/ipam-migration.yaml
@@ -0,0 +1,165 @@
+{{- /*
+Moves a cluster installed under ipam.mode kubernetes onto the cluster-pool
+allocation, see files/ipam-migration.sh for the mechanism. Rendered only where
+the mode is cluster-pool, which today means the kube-ovn variants, and only as
+a post-upgrade hook. A fresh install creates its CiliumNodes empty and the
+operator fills them from the pool, while on an upgrade the work has to wait
+until no agent runs in ipam.mode kubernetes any more.
+
+The Job runs on the host network with the API endpoint the agent itself uses,
+because it restarts the agents that program the pod network it would otherwise
+depend on.
+*/}}
+{{- if eq .Values.cilium.ipam.mode "cluster-pool" }}
+{{- $name := "cilium-ipam-migration" }}
+{{- $hook := "post-upgrade" }}
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ $name }}
+  namespace: {{ .Release.Namespace }}
+  annotations:
+    helm.sh/hook: {{ $hook }}
+    helm.sh/hook-weight: "-1"
+    helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: {{ $name }}
+  annotations:
+    helm.sh/hook: {{ $hook }}
+    helm.sh/hook-weight: "-1"
+    helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
+rules:
+  - apiGroups: ["cilium.io"]
+    resources: ["ciliumnodes"]
+    verbs: ["get", "list", "patch"]
+  - apiGroups: [""]
+    resources: ["nodes"]
+    verbs: ["get"]
+  - apiGroups: ["kubeovn.io"]
+    resources: ["subnets"]
+    verbs: ["get", "list", "patch"]
+  - apiGroups: ["kubeovn.io"]
+    resources: ["ips"]
+    verbs: ["list"]
+  - apiGroups: ["apiextensions.k8s.io"]
+    resources: ["customresourcedefinitions"]
+    resourceNames: ["subnets.kubeovn.io"]
+    verbs: ["get"]
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: {{ $name }}
+  annotations:
+    helm.sh/hook: {{ $hook }}
+    helm.sh/hook-weight: "-1"
+    helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: {{ $name }}
+subjects:
+  - kind: ServiceAccount
+    name: {{ $name }}
+    namespace: {{ .Release.Namespace }}
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: {{ $name }}
+  namespace: {{ .Release.Namespace }}
+  annotations:
+    helm.sh/hook: {{ $hook }}
+    helm.sh/hook-weight: "-1"
+    helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
+rules:
+  - apiGroups: [""]
+    resources: ["pods"]
+    verbs: ["list", "delete"]
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: {{ $name }}
+  namespace: {{ .Release.Namespace }}
+  annotations:
+    helm.sh/hook: {{ $hook }}
+    helm.sh/hook-weight: "-1"
+    helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: {{ $name }}
+subjects:
+  - kind: ServiceAccount
+    name: {{ $name }}
+    namespace: {{ .Release.Namespace }}
+---
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: {{ $name }}
+  namespace: {{ .Release.Namespace }}
+  annotations:
+    helm.sh/hook: {{ $hook }}
+    helm.sh/hook-weight: "0"
+    # A failed Job stays for `kubectl logs`, a succeeded one is removed.
+    helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
+spec:
+  backoffLimit: 0
+  template:
+    spec:
+      serviceAccountName: {{ $name }}
+      restartPolicy: Never
+      hostNetwork: true
+      tolerations:
+        - operator: Exists
+      securityContext:
+        runAsNonRoot: true
+        runAsUser: 65534
+        seccompProfile:
+          type: RuntimeDefault
+      volumes:
+        - name: home
+          emptyDir: {}
+      containers:
+        - name: migrate
+          image: {{ .Values.ipamMigration.image | quote }}
+          command: ["/bin/bash", "-c"]
+          args:
+            - |
+{{ .Files.Get "files/ipam-migration.sh" | indent 14 }}
+          env:
+            - name: NAMESPACE
+              value: {{ .Release.Namespace | quote }}
+            - name: POOL
+              value: {{ join " " .Values.cilium.ipam.operator.clusterPoolIPv4PodCIDRList | quote }}
+            - name: MASK
+              value: {{ .Values.cilium.ipam.operator.clusterPoolIPv4MaskSize | quote }}
+            - name: HOME
+              value: /tmp
+            {{- with .Values.cilium.k8sServiceHost }}
+            - name: KUBERNETES_SERVICE_HOST
+              value: {{ . | quote }}
+            - name: KUBERNETES_SERVICE_PORT
+              value: {{ $.Values.cilium.k8sServicePort | quote }}
+            {{- end }}
+          resources:
+            requests:
+              cpu: 10m
+              memory: 32Mi
+            limits:
+              memory: 128Mi
+          securityContext:
+            allowPrivilegeEscalation: false
+            readOnlyRootFilesystem: true
+            capabilities:
+              drop: ["ALL"]
+          volumeMounts:
+            - name: home
+              mountPath: /tmp
+{{- end }}
diff --git a/packages/system/cilium/templates/kube-proxy-replacement-beacon.yaml b/packages/system/cilium/templates/kube-proxy-replacement-beacon.yaml
new file mode 100644
index 0000000000..71242f374f
--- /dev/null
+++ b/packages/system/cilium/templates/kube-proxy-replacement-beacon.yaml
@@ -0,0 +1,59 @@
+{{- /*
+Render-time signal for a required Cozystack networking invariant.
+
+Cozystack supports this chart only with kubeProxyReplacement: true. The
+platform does not supply a supported alternative owner for ClusterIP
+translation when it is false; in the kube-ovn management topology kube-proxy
+is absent and packages/system/kubeovn/values.yaml explicitly disables the OVN
+service load balancer. A false value can therefore break Service connectivity.
+
+It also removes the pre-policy translation that the source-side webhook denies
+in packages/system/ingress-nginx and packages/system/kubeovn-webhook rely on.
+That does not make either webhook fail open: both policies also carry a
+target-side ingressDeny evaluated after any translation. Even a second,
+unsupported change that introduced another service load balancer would still
+meet that deny.
+
+A ConfigMap rather than `fail`, deliberately. A field override may already be
+running, and this guard keeps the unsupported state visible without turning
+every reconciliation into a render failure. The beacon is diagnostic, not an
+opt-in compatibility mode; the repair is always to restore the required value.
+
+`.Values.cilium.kubeProxyReplacement` reads the coalesced value, so this fires
+both on an explicit flip to false and on the umbrella key being deleted, which
+falls back to the vendored chart's own "false" default.
+
+tests/kube_proxy_replacement_test.yaml pins the value itself and carries the
+full service-routing and policy argument.
+*/}}
+{{- $cilium := index .Values "cilium" | default dict }}
+{{- $kpr := dig "kubeProxyReplacement" "" $cilium }}
+{{- if ne (toString $kpr) "true" }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ .Release.Name }}-kube-proxy-replacement-off
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/name: cilium
+    app.kubernetes.io/instance: {{ .Release.Name }}
+data:
+  status: "kube-proxy-replacement-off"
+  kubeProxyReplacement: {{ toString $kpr | quote }}
+  message: |
+    cilium.kubeProxyReplacement is {{ toString $kpr | quote }}, not "true".
+
+    Cozystack supports this chart only when cilium.kubeProxyReplacement is "true".
+    The current platform topology has no supported replacement for Cilium's
+    ClusterIP translation; on kube-ovn, kube-proxy is absent and the OVN service
+    load balancer is disabled. Service connectivity may fail in this state.
+
+    The source-side admission-webhook denies also lose their pre-DNAT match, but
+    both policies retain a target-side ingressDeny. This override does not imply
+    that either webhook is reachable through its Service.
+
+    Restore cilium.kubeProxyReplacement to true. Disabling the webhook policies
+    does not make this networking configuration supported.
+{{- end }}
diff --git a/packages/system/cilium/tests/agent_resources_test.yaml b/packages/system/cilium/tests/agent_resources_test.yaml
new file mode 100644
index 0000000000..c6792fbbb2
--- /dev/null
+++ b/packages/system/cilium/tests/agent_resources_test.yaml
@@ -0,0 +1,107 @@
+suite: cilium-agent memory requests and limits
+
+# The cilium-agent DaemonSet ran with no resources at all, which put it in the
+# Talos userspace OOM handler's victim set: that handler (v1.12+) only ever
+# selects cgroups that lack memory.max, and picks by QoS class rather than by
+# what caused the pressure. Losing cilium-agent on a node takes that node's
+# datapath programming with it.
+#
+# The limit is what sets memory.max, and it is set on the POD cgroup only when
+# EVERY container in the pod has one — so all seven are asserted here, not just
+# the agent. Five of the init containers take their values from initResources;
+# install-cni-binaries carries upstream's own cni.resources and is asserted to
+# document that it is already covered rather than overlooked.
+#
+# Both keys are set from the umbrella values.yaml against the vendored subchart.
+# An upstream bump that renames or relocates either one renders nothing and
+# leaves no other trace, silently returning the pod to the victim set; catching
+# that is the main thing these assertions are for.
+release:
+  name: cilium
+  namespace: cozy-cilium
+tests:
+  - it: cilium-agent declares a memory limit and request
+    template: charts/cilium/templates/cilium-agent/daemonset.yaml
+    documentSelector:
+      path: kind
+      value: DaemonSet
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[?(@.name=="cilium-agent")].resources.limits.memory
+          value: 24Gi
+      - equal:
+          path: spec.template.spec.containers[?(@.name=="cilium-agent")].resources.requests.memory
+          value: 256Mi
+
+  # Pinning a map size or changing the ratio resizes these maps on most nodes,
+  # and the agent recreates a map whose size changed, dropping its conntrack
+  # and NAT state; a pinned size also caps connection capacity on large nodes.
+  # The neighbor size is also the one cilium does not reject above
+  # LimitTableMax, so pinning it can push the maps past the ceiling the agent
+  # memory limit is sized for.
+  - it: BPF CT, NAT, neighbor and socket rev-NAT map sizes are left to the dynamic ratio
+    template: charts/cilium/templates/cilium-configmap.yaml
+    documentSelector:
+      path: metadata.name
+      value: cilium-config
+    asserts:
+      - equal:
+          path: data["bpf-map-dynamic-size-ratio"]
+          value: "0.0025"
+      - notExists:
+          path: data["bpf-ct-global-tcp-max"]
+      - notExists:
+          path: data["bpf-ct-global-any-max"]
+      - notExists:
+          path: data["bpf-nat-global-max"]
+      - notExists:
+          path: data["bpf-neigh-global-max"]
+      - notExists:
+          path: data["bpf-sock-rev-map-max"]
+
+  # Asserted one container at a time. A negated matcher over the init container
+  # list reads as if it covers them all but passes vacuously, so each limit is
+  # pinned explicitly instead.
+  - it: every cilium-agent init container declares a memory limit
+    template: charts/cilium/templates/cilium-agent/daemonset.yaml
+    documentSelector:
+      path: kind
+      value: DaemonSet
+    asserts:
+      - equal:
+          path: spec.template.spec.initContainers[?(@.name=="config")].resources.limits.memory
+          value: 256Mi
+      - equal:
+          path: spec.template.spec.initContainers[?(@.name=="mount-cgroup")].resources.limits.memory
+          value: 256Mi
+      - equal:
+          path: spec.template.spec.initContainers[?(@.name=="apply-sysctl-overwrites")].resources.limits.memory
+          value: 256Mi
+      - equal:
+          path: spec.template.spec.initContainers[?(@.name=="mount-bpf-fs")].resources.limits.memory
+          value: 256Mi
+      - equal:
+          path: spec.template.spec.initContainers[?(@.name=="clean-cilium-state")].resources.limits.memory
+          value: 256Mi
+      # Upstream's cni.resources, not initResources — pinned so a bump that
+      # drops it is caught here rather than by a pod that quietly loses
+      # memory.max.
+      - equal:
+          path: spec.template.spec.initContainers[?(@.name=="install-cni-binaries")].resources.limits.memory
+          value: 1Gi
+
+  # cilium-envoy is a second DaemonSet on the same nodes. Its limit predates
+  # this suite; it is pinned here because the pod-level argument above applies
+  # to it identically.
+  - it: cilium-envoy declares a memory limit and request
+    template: charts/cilium/templates/cilium-envoy/daemonset.yaml
+    documentSelector:
+      path: kind
+      value: DaemonSet
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[?(@.name=="cilium-envoy")].resources.limits.memory
+          value: 1Gi
+      - equal:
+          path: spec.template.spec.containers[?(@.name=="cilium-envoy")].resources.requests.memory
+          value: 512Mi
diff --git a/packages/system/cilium/tests/envoy_xds_mode_test.yaml b/packages/system/cilium/tests/envoy_xds_mode_test.yaml
new file mode 100644
index 0000000000..9bbc9dffc9
--- /dev/null
+++ b/packages/system/cilium/tests/envoy_xds_mode_test.yaml
@@ -0,0 +1,27 @@
+suite: cilium-envoy keeps per-type xDS
+
+# The 1.20 chart defaults envoy-xds-mode to "ads" and gives cilium-envoy an
+# adsConfig bootstrap. A 1.19 agent serves only per-type xDS and a 1.20 agent
+# in ADS mode serves only ADS, so while the agent and envoy DaemonSets roll,
+# every node whose two pods differ in version leaves envoy without config.
+# values.yaml pins split; these assert both halves of what it renders.
+tests:
+  - it: the agent serves per-type xDS
+    template: charts/cilium/templates/cilium-configmap.yaml
+    documentSelector:
+      path: kind
+      value: ConfigMap
+    asserts:
+      - equal:
+          path: data["envoy-xds-mode"]
+          value: split
+
+  - it: the envoy bootstrap asks for per-type xDS, not ADS
+    template: charts/cilium/templates/cilium-envoy/configmap.yaml
+    asserts:
+      - notMatchRegex:
+          path: data["bootstrap-config.json"]
+          pattern: adsConfig
+      - matchRegex:
+          path: data["bootstrap-config.json"]
+          pattern: apiConfigSource
diff --git a/packages/system/cilium/tests/ipam_pool_test.yaml b/packages/system/cilium/tests/ipam_pool_test.yaml
new file mode 100644
index 0000000000..4ef0348a5a
--- /dev/null
+++ b/packages/system/cilium/tests/ipam_pool_test.yaml
@@ -0,0 +1,205 @@
+suite: cilium takes its own addresses from a block kube-ovn does not allocate from
+
+# On the kube-ovn variants Cilium is chained behind kube-ovn and allocates no
+# pod addresses, but its router IP and its Gateway API Ingress IP come from the
+# agent's allocation CIDR. values-kubeovn.yaml moves that CIDR from
+# Node.spec.podCIDR, which the documented installs slice from the same range
+# kube-ovn allocates pods from, to the last /21 of the pod CIDR, which kube-ovn
+# excludes. The platform passes the block derived from networking.podCIDR, and
+# the default here matches 10.244.0.0/16. The variants where Cilium is the only
+# CNI keep ipam.mode kubernetes, because there Node.spec.podCIDR is the pod
+# range and nothing else allocates from it.
+#
+# Asserted on the rendered cilium-config keys rather than on .Values, so an
+# upstream chart bump that renames them reddens here. One test per valuesFiles
+# combination that packages/core/platform/sources/networking.yaml installs.
+release:
+  name: cilium
+  namespace: cozy-cilium
+tests:
+  - it: the kubeovn-cilium variant allocates /29s from the last /21 of the default pod CIDR
+    template: charts/cilium/templates/cilium-configmap.yaml
+    values:
+      - ../values-talos.yaml
+      - ../values-kubeovn.yaml
+    documentSelector:
+      path: kind
+      value: ConfigMap
+    asserts:
+      - equal:
+          path: data.ipam
+          value: cluster-pool
+      - equal:
+          path: data["cluster-pool-ipv4-cidr"]
+          value: 10.244.248.0/21
+      - equal:
+          path: data["cluster-pool-ipv4-mask-size"]
+          value: "29"
+
+  - it: the kubeovn-cilium-generic variant allocates from the same block
+    template: charts/cilium/templates/cilium-configmap.yaml
+    values:
+      - ../values-apparmor.yaml
+      - ../values-kubeovn.yaml
+    documentSelector:
+      path: kind
+      value: ConfigMap
+    asserts:
+      - equal:
+          path: data.ipam
+          value: cluster-pool
+      - equal:
+          path: data["cluster-pool-ipv4-cidr"]
+          value: 10.244.248.0/21
+
+  - it: the cilium variant keeps ipam kubernetes
+    template: charts/cilium/templates/cilium-configmap.yaml
+    values:
+      - ../values-talos.yaml
+    documentSelector:
+      path: kind
+      value: ConfigMap
+    asserts:
+      - equal:
+          path: data.ipam
+          value: kubernetes
+
+  - it: the cilium-kilo variant keeps ipam kubernetes
+    template: charts/cilium/templates/cilium-configmap.yaml
+    values:
+      - ../values-talos.yaml
+      - ../values-kilo.yaml
+    documentSelector:
+      path: kind
+      value: ConfigMap
+    asserts:
+      - equal:
+          path: data.ipam
+          value: kubernetes
+
+  - it: the cilium-generic variant keeps ipam kubernetes
+    template: charts/cilium/templates/cilium-configmap.yaml
+    values:
+      - ../values-apparmor.yaml
+    documentSelector:
+      path: kind
+      value: ConfigMap
+    asserts:
+      - equal:
+          path: data.ipam
+          value: kubernetes
+
+  - it: chart defaults, which guest clusters install, keep ipam kubernetes
+    template: charts/cilium/templates/cilium-configmap.yaml
+    documentSelector:
+      path: kind
+      value: ConfigMap
+    asserts:
+      - equal:
+          path: data.ipam
+          value: kubernetes
+
+  - it: the migration hook is not rendered where the mode stays kubernetes
+    template: templates/ipam-migration.yaml
+    values:
+      - ../values-talos.yaml
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  # Post-upgrade only. Before the upgrade the agents still run ipam.mode
+  # kubernetes and write Node.spec.podCIDR back into any CiliumNode cleared
+  # under them, and a fresh install has nothing to move.
+  - it: the kubeovn-cilium variant moves the agents after an upgrade and does nothing on install
+    template: templates/ipam-migration.yaml
+    values:
+      - ../values-talos.yaml
+      - ../values-kubeovn.yaml
+    asserts:
+      - hasDocuments:
+          count: 6
+      - equal:
+          path: metadata.annotations["helm.sh/hook"]
+          value: post-upgrade
+
+  # The post-upgrade run restarts the agents that program the pod network, so
+  # the Job must not depend on it: host network, and the API endpoint the agent
+  # itself uses (KubePrism on Talos) rather than the Service ClusterIP.
+  - it: the hook Job runs on the host network against the agent's API endpoint
+    template: templates/ipam-migration.yaml
+    values:
+      - ../values-talos.yaml
+      - ../values-kubeovn.yaml
+    documentSelector:
+      path: kind
+      value: Job
+    asserts:
+      - equal:
+          path: spec.template.spec.hostNetwork
+          value: true
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: KUBERNETES_SERVICE_HOST
+            value: localhost
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: KUBERNETES_SERVICE_PORT
+            value: "7445"
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: POOL
+            value: 10.244.248.0/21
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: MASK
+            value: "29"
+      - matchRegex:
+          path: spec.template.spec.containers[0].args[0]
+          pattern: "Runs as a post-upgrade hook"
+
+  - it: the hook Job takes the pool from the same value the operator does
+    template: templates/ipam-migration.yaml
+    values:
+      - ../values-talos.yaml
+      - ../values-kubeovn.yaml
+    set:
+      cilium.ipam.operator.clusterPoolIPv4PodCIDRList:
+        - 10.42.248.0/22
+        - 10.42.252.0/22
+    documentSelector:
+      path: kind
+      value: Job
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: POOL
+            value: 10.42.248.0/22 10.42.252.0/22
+
+  # The usage check reads kube-ovn's IP objects, because the subnet status
+  # leaves excluded addresses out once the block is excluded.
+  - it: the hook can list kube-ovn IP objects and patch the subnet
+    template: templates/ipam-migration.yaml
+    values:
+      - ../values-talos.yaml
+      - ../values-kubeovn.yaml
+    documentSelector:
+      path: kind
+      value: ClusterRole
+    asserts:
+      - contains:
+          path: rules
+          content:
+            apiGroups: ["kubeovn.io"]
+            resources: ["ips"]
+            verbs: ["list"]
+      - contains:
+          path: rules
+          content:
+            apiGroups: ["kubeovn.io"]
+            resources: ["subnets"]
+            verbs: ["get", "list", "patch"]
diff --git a/packages/system/cilium/tests/kube_proxy_replacement_test.yaml b/packages/system/cilium/tests/kube_proxy_replacement_test.yaml
new file mode 100644
index 0000000000..68339899ca
--- /dev/null
+++ b/packages/system/cilium/tests/kube_proxy_replacement_test.yaml
@@ -0,0 +1,182 @@
+suite: cilium owns service load-balancing
+
+# This pins a required service-routing value. Read this before changing
+# kubeProxyReplacement in values.yaml or in any variant values file.
+#
+# packages/system/ingress-nginx and packages/system/kubeovn-webhook each ship a
+# CiliumClusterwideNetworkPolicy that denies pod egress to their admission
+# webhook. Both name only the webhook's BACKEND port (8443) and select the
+# webhook pods by label; neither names the Service frontend, because Cilium
+# cannot express a frontend in a deny rule -- it resolves `toServices` only
+# inside allow rules, and an egressDeny whose sole destination is an unresolved
+# toServices reaches the datapath as a wildcard, denying every destination on
+# that port for every selected pod.
+#
+# Naming the backend alone still covers a pod dialling the ClusterIP, because
+# Cilium translates the service before it enforces egress policy. In Cilium
+# v1.20.2 the chart forces bpf-lb-sock-hostns-only whenever Gateway API is on,
+# so socket LB leaves pod-namespace connections alone and bpf/bpf_lxc.c
+# translates them per packet: it runs __per_packet_lb_svc_xlate_4 and
+# lb4_local() and only then tail-calls CILIUM_CALL_IPV4_FROM_LXC_CONT into
+# handle_ipv4_from_lxc, where policy_can_egress4 evaluates the rule. By that
+# point the destination is the backend pod on 8443, which is what the rules
+# match.
+#
+# That ordering exists only while Cilium is the thing doing the DNAT, and the
+# value asserted below is what makes it so: kubeProxyReplacement, true here
+# against an upstream chart default of "false". Cozystack supplies no supported
+# alternative service load balancer for false; on the kube-ovn management
+# topology kube-proxy is absent and ENABLE_LB is also false. Turning this value
+# off therefore leaves ClusterIP routing without a supported owner and can break
+# Service connectivity. It does not by itself make either webhook reachable.
+#
+# Both policies also carry a target-side ingressDeny on their own webhook pods
+# for the same port, and that half does NOT depend on this value: it is
+# evaluated on the destination's ingress path, after whatever DNAT already
+# happened, so it enforces whoever performs the translation. If a second
+# unsupported configuration change supplied a different translator,
+# kubeProxyReplacement=false would remove the source-side match before DNAT but
+# leave the target-side rules standing. That is defence in depth, not a reason
+# to relax this pin: the source-side form is what still denies while the webhook
+# endpoint's own policy is being recomputed or has overflowed its map, and the
+# target-side form is what survives a different service-LB implementation.
+# Neither subsumes the other, each carries its own cost, and both are argued in
+# the templates next to the rules rather than here.
+#
+# The other half of the guard is behavioural rather than static: the
+# admission-webhook-deny-still-enforced case in
+# hack/e2e-chainsaw/gateway/chainsaw-test.yaml connects to the admission
+# Service's ClusterIP from a pod and requires the connect to fail, so the effect
+# is asserted against a live cluster and not only reasoned about here.
+#
+# Asserted on the rendered ConfigMap key rather than on .Values, so an upstream
+# bump that renames the key or stops honouring our override is caught too --
+# that is silent in exactly the same way, and the same argument the
+# agent_resources_test.yaml suite next door makes for its own assertions.
+#
+# One variant per test, spelling out the valuesFiles combination that
+# packages/core/platform/sources/networking.yaml actually installs, so a future
+# variant file that overrides the value reddens here rather than shipping. Guest
+# clusters install this chart with no variant values file at all
+# (sources/kubernetes-application.yaml), which the defaults case covers.
+release:
+  name: cilium
+  namespace: cozy-cilium
+tests:
+  - it: chart defaults keep Cilium in charge of service load-balancing
+    template: charts/cilium/templates/cilium-configmap.yaml
+    documentSelector:
+      path: kind
+      value: ConfigMap
+    asserts:
+      - equal:
+          path: data["kube-proxy-replacement"]
+          value: "true"
+
+  - it: the cilium variant keeps it
+    template: charts/cilium/templates/cilium-configmap.yaml
+    values:
+      - ../values-talos.yaml
+    documentSelector:
+      path: kind
+      value: ConfigMap
+    asserts:
+      - equal:
+          path: data["kube-proxy-replacement"]
+          value: "true"
+
+  - it: the cilium-kilo variant keeps it
+    template: charts/cilium/templates/cilium-configmap.yaml
+    values:
+      - ../values-talos.yaml
+      - ../values-kilo.yaml
+    documentSelector:
+      path: kind
+      value: ConfigMap
+    asserts:
+      - equal:
+          path: data["kube-proxy-replacement"]
+          value: "true"
+
+  - it: the cilium-generic variant keeps it
+    template: charts/cilium/templates/cilium-configmap.yaml
+    values:
+      - ../values-apparmor.yaml
+    documentSelector:
+      path: kind
+      value: ConfigMap
+    asserts:
+      - equal:
+          path: data["kube-proxy-replacement"]
+          value: "true"
+
+  - it: the kubeovn-cilium variant keeps it
+    template: charts/cilium/templates/cilium-configmap.yaml
+    values:
+      - ../values-talos.yaml
+      - ../values-kubeovn.yaml
+    documentSelector:
+      path: kind
+      value: ConfigMap
+    asserts:
+      - equal:
+          path: data["kube-proxy-replacement"]
+          value: "true"
+
+  - it: the kubeovn-cilium-generic variant keeps it
+    template: charts/cilium/templates/cilium-configmap.yaml
+    values:
+      - ../values-apparmor.yaml
+      - ../values-kubeovn.yaml
+    documentSelector:
+      path: kind
+      value: ConfigMap
+    asserts:
+      - equal:
+          path: data["kube-proxy-replacement"]
+          value: "true"
+
+  # The beacon is the only half of this guard that can fire in the field. The
+  # pin above catches a cozystack commit changing the default; nothing in this
+  # repo observes a live cluster's values, so an operator override reaches a
+  # running cluster unobserved. The ConfigMap keeps that unsupported state
+  # visible without making each reconciliation fail to render; it is not an
+  # alternative supported mode.
+  - it: emits no beacon while Cilium owns service load-balancing
+    template: templates/kube-proxy-replacement-beacon.yaml
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  - it: emits a visible beacon when the value is turned off
+    template: templates/kube-proxy-replacement-beacon.yaml
+    set:
+      cilium.kubeProxyReplacement: false
+    asserts:
+      - hasDocuments:
+          count: 1
+      - isKind:
+          of: ConfigMap
+      - equal:
+          path: data.status
+          value: kube-proxy-replacement-off
+      - equal:
+          path: data.kubeProxyReplacement
+          value: "false"
+      - matchRegex:
+          path: data.message
+          pattern: "supports this chart only when"
+
+  # The string form is what the upstream chart's own default uses, and the
+  # subchart's value coalesces into the parent, so this is also the shape a
+  # deleted umbrella key falls back to.
+  - it: treats the string form as off too
+    template: templates/kube-proxy-replacement-beacon.yaml
+    set:
+      cilium.kubeProxyReplacement: "false"
+    asserts:
+      - hasDocuments:
+          count: 1
+      - equal:
+          path: data.kubeProxyReplacement
+          value: "false"
diff --git a/packages/system/cilium/values-kubeovn.yaml b/packages/system/cilium/values-kubeovn.yaml
index 62c75b29ed..2ad8770fb4 100644
--- a/packages/system/cilium/values-kubeovn.yaml
+++ b/packages/system/cilium/values-kubeovn.yaml
@@ -17,3 +17,20 @@ cilium:
   enableIdentityMark: false
   forceDeviceDetection: true
   devices: "ovn0 genev_sys_6081"
+  # Chained behind kube-ovn, Cilium allocates no pod addresses, but the agent
+  # still takes its router IP (cilium_host) and the per-node Gateway API Ingress
+  # IP from its own allocation CIDR. In ipam.mode kubernetes that CIDR is
+  # Node.spec.podCIDR, which the documented installs slice from the same range
+  # kube-ovn allocates pods from, so kube-ovn sooner or later hands a pod an
+  # address Cilium already holds. cluster-pool gives Cilium a block of its own,
+  # the last /21 of the pod CIDR, which kube-ovn is told to exclude. The
+  # platform derives both from networking.podCIDR, see
+  # cozystack.platform.ciliumPool, and the value below matches the default
+  # 10.244.0.0/16. templates/ipam-migration.yaml moves clusters installed under
+  # ipam.mode kubernetes onto the block.
+  ipam:
+    mode: cluster-pool
+    operator:
+      clusterPoolIPv4PodCIDRList:
+        - 10.244.248.0/21
+      clusterPoolIPv4MaskSize: 29
diff --git a/packages/system/cilium/values.yaml b/packages/system/cilium/values.yaml
index 3ea063783b..732fd4151e 100644
--- a/packages/system/cilium/values.yaml
+++ b/packages/system/cilium/values.yaml
@@ -1,5 +1,31 @@
 cilium:
+  # Required for the supported service-routing topology. Cozystack does not
+  # provide a supported alternative owner for ClusterIP translation when this
+  # is false; on kube-ovn, kube-proxy is absent and the OVN service load balancer
+  # is explicitly disabled. A false value can therefore break Service
+  # connectivity. tests/kube_proxy_replacement_test.yaml asserts the rendered
+  # value across the defaults and every variant valuesFiles combination.
+  #
+  # The source-side admission-webhook denies in packages/system/ingress-nginx
+  # and packages/system/kubeovn-webhook also rely on Cilium translating the
+  # Service before egress policy. Both policies retain a target-side ingressDeny,
+  # so even a second unsupported change that introduced another translator would
+  # not make the webhooks fail open.
+  #
+  # No test here can observe a live cluster's values, so an operator override in
+  # the field is caught only by templates/kube-proxy-replacement-beacon.yaml,
+  # which renders a status ConfigMap whenever this is not true. The beacon keeps
+  # a live unsupported override visible; it is not an alternative supported
+  # mode, and the required remediation is to restore true.
   kubeProxyReplacement: true
+  # Upstream cilium with hostFirewall enabled and the IPv6 datapath disabled
+  # (ipv6.enabled=false, the default here) drops ALL node IPv6 before any
+  # policy evaluation ("Unsupported L3 protocol", DROP_UNKNOWN_L3 in
+  # bpf/bpf_host.c), breaking ICMPv6 Neighbor Discovery and BGP unnumbered on
+  # IPv6/L3 fabrics. The cozystack cilium image carries a BPF patch
+  # (images/cilium/patches/) that passes IPv6 to the kernel stack instead.
+  # Consequence: Cilium host policies apply to IPv4 only; node IPv6 is not
+  # filtered by Cilium.
   hostFirewall:
     enabled: true
   hubble:
@@ -15,10 +41,16 @@ cilium:
     mode: "kubernetes"
   image:
     repository: ghcr.io/cozystack/cozystack/cilium
-    tag: 1.19.3
-    digest: "sha256:94dc74c9301f0da5695c80e77b77ee0486ad0086b5be60a94136a2cafd410b73"
+    tag: v1.6.0
+    digest: "sha256:136a7dfff4d6adcd448424c2354144160028a8e96eb6558b917fd3ee6d7b39fe"
   envoy:
     enabled: true
+    # Keep the per-type xDS the 1.19 agent and envoy speak. The 1.20 chart
+    # defaults to ADS, which a 1.19 agent never serves and a 1.20 agent in
+    # ADS mode serves exclusively, so while the agent and envoy DaemonSets
+    # roll, a node with mixed versions gives envoy no config. Moving to ADS
+    # needs a step of its own once every node runs 1.20.
+    xdsMode: split
     # Upstream default is {} — no requests/limits. The embedded envoy DaemonSet
     # idles at ~100 MB RAM/node and grows under L7 traffic; without requests
     # the DaemonSet schedules onto any node with no reserved headroom, and
@@ -30,9 +62,88 @@ cilium:
         memory: 512Mi
       limits:
         memory: 1Gi
+  # The cilium-agent DaemonSet had the same gap the envoy DaemonSet above
+  # already closed. Beyond the node-headroom argument, a memory limit is what
+  # sets memory.max on the pod cgroup, and the Talos userspace OOM handler
+  # (v1.12+) only ever selects cgroups that lack it — so an unlimited agent is
+  # an eviction candidate on every node regardless of what caused the pressure.
+  #
+  # The limit has to hold the agent's BPF maps as well as its heap. Read at
+  # cilium 1.19.5: the CT, NAT, neighbor and socket rev-NAT maps are sized as a
+  # share of total node RAM (bpf-map-dynamic-size-ratio, 0.0025 by default),
+  # each capped at 16Mi entries (LimitTableMax). They are LRU hash maps, which
+  # the kernel always preallocates in full, and since Linux 5.11 that memory is
+  # charged to the memcg of the process that creates them, i.e. this container.
+  # A map reused from bpffs stays charged to whoever created it, so a limit too
+  # small for the maps first fails on the start that recreates them: after a
+  # reboot, or when an upgrade changes a map's size or layout. Policy maps do
+  # not scale with RAM: they are LPM tries sized by bpf.policyMapMax that
+  # allocate per entry.
+  #
+  # One DaemonSet serves every node, so the limit cannot follow node RAM and
+  # covers the map ceiling instead: just under 20Gi of kernel memory with every
+  # map at 16Mi entries for both IPv4 and IPv6 (IPv6 is off by default, but
+  # turning it on must not bring the OOM back), plus 4Gi for the agent itself,
+  # the figure from the upstream values' commented example. A limit is a
+  # ceiling, not a reservation, so it costs no schedulable memory. What it does
+  # cost is the backstop against a leak in the agent itself: on every node the
+  # agent is stopped at 24Gi minus its own map memory, which on most nodes is
+  # no practical backstop. memory.max still keeps the pod out of the Talos
+  # handler's victim set, which is what the limit is for. Pinning the map sizes
+  # instead would cap connection capacity on large nodes and, on upgrade,
+  # recreate the maps and drop their conntrack and NAT state.
+  resources:
+    requests:
+      cpu: 100m
+      memory: 256Mi
+    limits:
+      memory: 24Gi
+  # Shared by the agent's init containers (config, mount-cgroup, mount-bpf-fs,
+  # apply-sysctl-overwrites, clean-cilium-state). All are short-lived setup
+  # steps, but each one still has to carry a limit for the pod cgroup to get
+  # memory.max at all.
+  initResources:
+    requests:
+      cpu: 10m
+      memory: 32Mi
+    limits:
+      memory: 256Mi
   gatewayAPI:
     enabled: true
+    # Upstream default is false — Envoy then advertises no ALPN protocols on
+    # TLS-terminating Gateway listeners, and browsers (which negotiate HTTP/2
+    # exclusively through TLS ALPN "h2") silently fall back to HTTP/1.1 on
+    # every request. ingress-nginx, which the Gateway API path replaces,
+    # advertised h2 out of the box, so false here is a client-visible
+    # regression, not a neutral default. With true, ALPN offers h2 then
+    # http/1.1 — clients without HTTP/2 keep negotiating http/1.1 unchanged.
+    # This only affects the client↔gateway hop: gateway↔backend stays
+    # HTTP/1.1 unless a Service opts in per GEP-1911 via appProtocol
+    # kubernetes.io/h2c (enableAlpn also switches that support on; no
+    # cozystack-shipped Service declares such a value today).
+    # Platform-managed clusters can flip this through the platform chart's
+    # gateway.http2 value, which overrides this default either way.
+    enableAlpn: true
   rollOutCiliumPods: true
   operator:
+    # A rebuild of the upstream operator carrying the Go patches in
+    # images/cilium-operator/patches/: it accepts an HTTPS listener and a TLS
+    # passthrough listener on one port when the passthrough hostname is
+    # strictly narrower, and serves such a port from one Envoy listener.
+    # `make image` stamps the ref; until it does, the committed value is the
+    # unpatched upstream operator the rebuild starts from, so a tree rendered
+    # without a build still pulls an image that exists.
+    image:
+      override: "quay.io/cilium/operator-generic:v1.20.2@sha256:64d8798350e8569b8e7622563fed6e44dce2625f311e4651b774816516c744fc"
     rollOutPods: true
     replicas: 1
+    resources:
+      limits:
+        cpu: 1000m
+        memory: 1Gi
+      requests:
+        cpu: 100m
+        memory: 128Mi
+# kubectl and jq for the hook Jobs in templates/ipam-migration.yaml.
+ipamMigration:
+  image: docker.io/alpine/k8s:1.36.2@sha256:44ef4942e171939b9c665a4a84beb80e2dcdb9a24330d4651cfdfd2e9deecc47
diff --git a/packages/system/clickhouse-rd/cozyrds/clickhouse.yaml b/packages/system/clickhouse-rd/cozyrds/clickhouse.yaml
index fc4d1d4098..5bcd734675 100644
--- a/packages/system/clickhouse-rd/cozyrds/clickhouse.yaml
+++ b/packages/system/clickhouse-rd/cozyrds/clickhouse.yaml
@@ -8,7 +8,7 @@ spec:
     singular: clickhouse
     plural: clickhouses
     openAPISchema: |-
-      {"title":"Chart Values","type":"object","properties":{"replicas":{"description":"Number of ClickHouse replicas.","type":"integer","default":2},"shards":{"description":"Number of ClickHouse shards.","type":"integer","default":1},"resources":{"description":"Explicit CPU and memory configuration for each ClickHouse replica. When omitted, the preset defined in `resourcesPreset` is applied.","type":"object","default":{},"properties":{"cpu":{"description":"CPU available to each replica.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Memory (RAM) available to each replica.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}},"resourcesPreset":{"description":"Default sizing preset used when `resources` is omitted.","type":"string","default":"t1.small","enum":["t1.nano","t1.micro","t1.small","t1.medium","t1.large","t1.xlarge","t1.2xlarge","t1.4xlarge","c1.nano","c1.micro","c1.small","c1.medium","c1.large","c1.xlarge","c1.2xlarge","c1.4xlarge","s1.nano","s1.micro","s1.small","s1.medium","s1.large","s1.xlarge","s1.2xlarge","s1.4xlarge","u1.nano","u1.micro","u1.small","u1.medium","u1.large","u1.xlarge","u1.2xlarge","u1.4xlarge","m1.nano","m1.micro","m1.small","m1.medium","m1.large","m1.xlarge","m1.2xlarge","m1.4xlarge","nano","micro","small","medium","large","xlarge","2xlarge"]},"size":{"description":"Persistent Volume Claim size available for application data.","default":"10Gi","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"storageClass":{"description":"StorageClass used to store the data.","type":"string","default":"","x-kubernetes-validations":[{"rule":"self == oldSelf","message":"storageClass is immutable"}]},"logStorageSize":{"description":"Size of Persistent Volume for logs.","default":"2Gi","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"logTTL":{"description":"TTL (expiration time) for `query_log` and `query_thread_log`.","type":"integer","default":15},"users":{"description":"Users configuration map.","type":"object","default":{},"additionalProperties":{"type":"object","properties":{"password":{"description":"Password for the user.","type":"string"},"readonly":{"description":"User is readonly (default: false).","type":"boolean"}}}},"backup":{"description":"Backup configuration.","type":"object","default":{},"required":["enabled"],"properties":{"cleanupStrategy":{"description":"Legacy. Restic retention policy passed to the legacy CronJob (`restic forget …`). Unused by the Altinity strategy.","type":"string","default":"--keep-last=3 --keep-daily=3 --keep-within-weekly=1m"},"enabled":{"description":"Enable backup integration. Materialises the chart-emitted `<release>-backup-s3` Secret consumed by the Altinity backup strategy and, when `schedule` is non-empty, also renders the legacy chart-managed CronJob.","type":"boolean","default":false},"endpoint":{"description":"DEPRECATED. S3 endpoint URL for the legacy chart-emitted sidecar.","type":"string","default":""},"resticPassword":{"description":"Legacy. Password for Restic backup encryption used by the legacy CronJob. Unused by the Altinity strategy.","type":"string","default":"<password>"},"s3AccessKey":{"description":"DEPRECATED. Tenants no longer supply S3 keys; the platform-managed Bucket Secret is the source of truth. Optional now so `useSystemBucket: true` tenants can omit it.","type":"string","default":"<your-access-key>"},"s3Bucket":{"description":"DEPRECATED. Optional; see `s3Region`.","type":"string","default":"s3.example.org/clickhouse-backups"},"s3CredentialsSecret":{"description":"DEPRECATED. Pre-existing Secret reference for the legacy chart-emitted sidecar. The platform flow projects `cozy-backups-creds` instead.","type":"object","default":{},"properties":{"accessKeyIDKey":{"description":"Key in the Secret holding the access key ID. Defaults to `accessKey`.","type":"string","default":""},"bucketKey":{"description":"Key in the Secret holding the bucket name. Defaults to `bucketName`.","type":"string","default":""},"endpointKey":{"description":"Key in the Secret holding the S3 endpoint URL. Defaults to `endpoint`.","type":"string","default":""},"name":{"description":"Name of the Secret in the application namespace. Empty means the chart materialises `<release>-backup-s3` from the legacy `s3*` fields.","type":"string","default":""},"regionKey":{"description":"Key in the Secret holding the S3 region. Defaults to `region`.","type":"string","default":""},"secretAccessKeyKey":{"description":"Key in the Secret holding the secret access key. Defaults to `secretKey`.","type":"string","default":""}}},"s3PathOverride":{"description":"DEPRECATED. Object-key prefix inside the legacy `s3Bucket`; the new platform flow scopes by namespace automatically.","type":"string","default":""},"s3Region":{"description":"DEPRECATED. Per-tenant S3 configuration is being phased out in favour of the platform-managed `cozy-default` BackupClass. Optional now so tenants on `useSystemBucket: true` can omit it.","type":"string","default":"us-east-1"},"s3SecretKey":{"description":"DEPRECATED. Optional; see `s3AccessKey`.","type":"string","default":"<your-secret-key>"},"schedule":{"description":"Legacy. Cron schedule for the chart-emitted CronJob that runs the dump+restic backup. Empty (default) skips the legacy CronJob; recommended when a `BackupClass` + `Plan` from `backups.cozystack.io` already drives backup orchestration via the Altinity strategy.","type":"string","default":""},"useSystemBucket":{"description":"Opt-in: when true, the chart-emitted `<release>-backup-s3` Secret is skipped and the `clickhouse-backup` sidecar reads bucket coordinates + S3 credentials from the platform-projected `cozy-backups-creds` Secret. `S3_PATH` is set to `<namespace>/<release>` for cross-tenant isolation. Use together with the platform `cozy-default` BackupClass — tenants do not need to fill any `s3*` field below.","type":"boolean","default":false}}},"clickhouseKeeper":{"description":"ClickHouse Keeper configuration.","type":"object","default":{},"properties":{"enabled":{"description":"Deploy ClickHouse Keeper for cluster coordination.","type":"boolean","default":true},"replicas":{"description":"Number of Keeper replicas.","type":"integer","default":3},"resourcesPreset":{"description":"Default sizing preset.","type":"string","default":"t1.micro","enum":["t1.nano","t1.micro","t1.small","t1.medium","t1.large","t1.xlarge","t1.2xlarge","t1.4xlarge","c1.nano","c1.micro","c1.small","c1.medium","c1.large","c1.xlarge","c1.2xlarge","c1.4xlarge","s1.nano","s1.micro","s1.small","s1.medium","s1.large","s1.xlarge","s1.2xlarge","s1.4xlarge","u1.nano","u1.micro","u1.small","u1.medium","u1.large","u1.xlarge","u1.2xlarge","u1.4xlarge","m1.nano","m1.micro","m1.small","m1.medium","m1.large","m1.xlarge","m1.2xlarge","m1.4xlarge","nano","micro","small","medium","large","xlarge","2xlarge"]},"size":{"description":"Persistent Volume Claim size available for application data.","default":"1Gi","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}}}}
+      {"title":"Chart Values","type":"object","properties":{"replicas":{"description":"Number of ClickHouse replicas.","type":"integer","default":2},"shards":{"description":"Number of ClickHouse shards.","type":"integer","default":1},"resources":{"description":"Explicit CPU and memory configuration for each ClickHouse replica. When omitted, the preset defined in `resourcesPreset` is applied.","type":"object","default":{},"properties":{"cpu":{"description":"CPU available to each replica.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Memory (RAM) available to each replica.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}},"resourcesPreset":{"description":"Default sizing preset used when `resources` is omitted.","type":"string","default":"t1.small","enum":["t1.nano","t1.micro","t1.small","t1.medium","t1.large","t1.xlarge","t1.2xlarge","t1.4xlarge","c1.nano","c1.micro","c1.small","c1.medium","c1.large","c1.xlarge","c1.2xlarge","c1.4xlarge","s1.nano","s1.micro","s1.small","s1.medium","s1.large","s1.xlarge","s1.2xlarge","s1.4xlarge","u1.nano","u1.micro","u1.small","u1.medium","u1.large","u1.xlarge","u1.2xlarge","u1.4xlarge","m1.nano","m1.micro","m1.small","m1.medium","m1.large","m1.xlarge","m1.2xlarge","m1.4xlarge","nano","micro","small","medium","large","xlarge","2xlarge"]},"size":{"description":"Persistent Volume Claim size available for application data.","default":"10Gi","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"storageClass":{"description":"StorageClass used to store the data.","type":"string","default":"","x-kubernetes-validations":[{"rule":"self == oldSelf","message":"storageClass is immutable"}],"x-cozystack-options":{"source":"storageclass"}},"version":{"description":"ClickHouse major.minor version to deploy. Applies to both the ClickHouse server and ClickHouse Keeper images. Downgrading to an older major is unsafe (ClickHouse cannot read data written by a newer server and Keeper snapshots are not backward compatible) — only increase this value.","type":"string","default":"v24.9","enum":["v25.8","v25.3","v24.9"]},"logStorageSize":{"description":"Size of Persistent Volume for logs.","default":"2Gi","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"logTTL":{"description":"TTL (expiration time) for `query_log` and `query_thread_log`.","type":"integer","default":15},"users":{"description":"Users configuration map.","type":"object","default":{},"additionalProperties":{"type":"object","properties":{"password":{"description":"Password for the user.","type":"string"},"readonly":{"description":"User is readonly (default: false).","type":"boolean"}}}},"backup":{"description":"Backup configuration.","type":"object","default":{},"required":["enabled"],"properties":{"cleanupStrategy":{"description":"Legacy. Restic retention policy passed to the legacy CronJob (`restic forget …`). Unused by the Altinity strategy.","type":"string","default":"--keep-last=3 --keep-daily=3 --keep-within-weekly=1m"},"enabled":{"description":"Enable backup integration. Materialises the chart-emitted `<release>-backup-s3` Secret consumed by the Altinity backup strategy and, when `schedule` is non-empty, also renders the legacy chart-managed CronJob.","type":"boolean","default":false},"endpoint":{"description":"DEPRECATED. S3 endpoint URL for the legacy chart-emitted sidecar.","type":"string","default":""},"endpointCA":{"description":"CA bundle the sidecar trusts when the S3 endpoint's certificate is signed by a private CA (e.g. Cozystack's in-cluster SeaweedFS). Applies to both the per-tenant and the `useSystemBucket` flow, and to the `clickhouse-backup` sidecar only — the legacy `schedule` CronJob writes to S3 through restic and does not consume it, so a private-CA endpoint combined with `schedule` still fails TLS. Use the BackupClass flow for such an endpoint.","type":"object","default":{},"properties":{"key":{"description":"Key inside the Secret holding the PEM CA bundle. Defaults to `ca.crt`.","type":"string","default":"ca.crt"},"name":{"description":"Name of the Secret in the application namespace. Empty (default) mounts nothing and leaves the sidecar on the system trust store only.","type":"string","default":""}}},"resticPassword":{"description":"Legacy. Password for Restic backup encryption used by the legacy CronJob. Unused by the Altinity strategy.","type":"string","default":"<password>"},"s3AccessKey":{"description":"DEPRECATED. Tenants no longer supply S3 keys; the platform-managed Bucket Secret is the source of truth. Optional now so `useSystemBucket: true` tenants can omit it.","type":"string","default":"<your-access-key>"},"s3Bucket":{"description":"DEPRECATED. Optional; see `s3Region`.","type":"string","default":"s3.example.org/clickhouse-backups"},"s3CredentialsSecret":{"description":"DEPRECATED. Pre-existing Secret reference for the legacy chart-emitted sidecar. The platform flow projects `cozy-backups-creds` instead.","type":"object","default":{},"properties":{"accessKeyIDKey":{"description":"Key in the Secret holding the access key ID. Defaults to `accessKey`.","type":"string","default":""},"bucketKey":{"description":"Key in the Secret holding the bucket name. Defaults to `bucketName`.","type":"string","default":""},"endpointKey":{"description":"Key in the Secret holding the S3 endpoint URL. Defaults to `endpoint`.","type":"string","default":""},"name":{"description":"Name of the Secret in the application namespace. Empty means the chart materialises `<release>-backup-s3` from the legacy `s3*` fields.","type":"string","default":""},"regionKey":{"description":"Key in the Secret holding the S3 region. Defaults to `region`.","type":"string","default":""},"secretAccessKeyKey":{"description":"Key in the Secret holding the secret access key. Defaults to `secretKey`.","type":"string","default":""}}},"s3PathOverride":{"description":"DEPRECATED. Object-key prefix inside the legacy `s3Bucket`; the new platform flow scopes by namespace automatically.","type":"string","default":""},"s3Region":{"description":"DEPRECATED. Per-tenant S3 configuration is being phased out in favour of the platform-managed `cozy-default` BackupClass. Optional now so tenants on `useSystemBucket: true` can omit it.","type":"string","default":"us-east-1"},"s3SecretKey":{"description":"DEPRECATED. Optional; see `s3AccessKey`.","type":"string","default":"<your-secret-key>"},"schedule":{"description":"Legacy. Cron schedule for the chart-emitted CronJob that runs the dump+restic backup. Empty (default) skips the legacy CronJob; recommended when a `BackupClass` + `Plan` from `backups.cozystack.io` already drives backup orchestration via the Altinity strategy.","type":"string","default":""},"useSystemBucket":{"description":"Opt-in: when true, the chart-emitted `<release>-backup-s3` Secret is skipped and the `clickhouse-backup` sidecar reads bucket coordinates + S3 credentials from the platform-projected `cozy-backups-creds` Secret. `S3_PATH` is set to `<namespace>/<release>` for cross-tenant isolation. Use together with the platform `cozy-default` BackupClass — tenants do not need to fill any `s3*` field below.","type":"boolean","default":false}}},"clickhouseKeeper":{"description":"ClickHouse Keeper configuration.","type":"object","default":{},"properties":{"enabled":{"description":"Deploy ClickHouse Keeper for cluster coordination.","type":"boolean","default":true},"replicas":{"description":"Number of Keeper replicas.","type":"integer","default":3},"resourcesPreset":{"description":"Default sizing preset.","type":"string","default":"t1.micro","enum":["t1.nano","t1.micro","t1.small","t1.medium","t1.large","t1.xlarge","t1.2xlarge","t1.4xlarge","c1.nano","c1.micro","c1.small","c1.medium","c1.large","c1.xlarge","c1.2xlarge","c1.4xlarge","s1.nano","s1.micro","s1.small","s1.medium","s1.large","s1.xlarge","s1.2xlarge","s1.4xlarge","u1.nano","u1.micro","u1.small","u1.medium","u1.large","u1.xlarge","u1.2xlarge","u1.4xlarge","m1.nano","m1.micro","m1.small","m1.medium","m1.large","m1.xlarge","m1.2xlarge","m1.4xlarge","nano","micro","small","medium","large","xlarge","2xlarge"]},"size":{"description":"Persistent Volume Claim size available for application data.","default":"1Gi","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}}}}
   release:
     prefix: clickhouse-
     labels:
@@ -24,7 +24,7 @@ spec:
     description: Managed ClickHouse service
     tags: []
     icon: PHN2ZyB3aWR0aD0iMTQ0IiBoZWlnaHQ9IjE0NCIgdmlld0JveD0iMCAwIDE0NCAxNDQiIGZpbGw9Im5vbmUiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+CjxyZWN0IHdpZHRoPSIxNDQiIGhlaWdodD0iMTQ0IiByeD0iMjQiIGZpbGw9InVybCgjcGFpbnQwX2xpbmVhcl82ODNfMzIwMikiLz4KPHBhdGggZD0iTTIzIDEwNUgzNFYxMTZIMjNWMTA1WiIgZmlsbD0iI0ZGMDAwMCIvPgo8cGF0aCBkPSJNMjMgMjhIMzRWMTA1SDIzVjI4Wk00NSAyOEg1NS45OTk5VjExNkg0NVYyOFpNNjYuOTk5OSAyOEg3Ny45OTk5VjExNkg2Ni45OTk5VjI4Wk04OC45OTk5IDI4SDk5Ljk5OTlWMTE2SDg4Ljk5OTlWMjhaTTExMSA2My43NDk5SDEyMlY4MC4yNDk5SDExMVY2My43NDk5WiIgZmlsbD0id2hpdGUiLz4KPGRlZnM+CjxsaW5lYXJHcmFkaWVudCBpZD0icGFpbnQwX2xpbmVhcl82ODNfMzIwMiIgeDE9Ii0wLjQ5OTk5OCIgeTE9IjEuNSIgeDI9IjE1My41IiB5Mj0iMTYyIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+CjxzdG9wIHN0b3AtY29sb3I9IiNGRkNDMDAiLz4KPHN0b3Agb2Zmc2V0PSIxIiBzdG9wLWNvbG9yPSIjRkY3QTAwIi8+CjwvbGluZWFyR3JhZGllbnQ+CjwvZGVmcz4KPC9zdmc+Cg==
-    keysOrder: [["apiVersion"], ["appVersion"], ["kind"], ["metadata"], ["metadata", "name"], ["spec", "replicas"], ["spec", "shards"], ["spec", "resources"], ["spec", "resourcesPreset"], ["spec", "size"], ["spec", "storageClass"], ["spec", "logStorageSize"], ["spec", "logTTL"], ["spec", "users"], ["spec", "backup"], ["spec", "backup", "enabled"], ["spec", "backup", "useSystemBucket"], ["spec", "backup", "s3Region"], ["spec", "backup", "s3Bucket"], ["spec", "backup", "endpoint"], ["spec", "backup", "s3PathOverride"], ["spec", "backup", "schedule"], ["spec", "backup", "cleanupStrategy"], ["spec", "backup", "s3AccessKey"], ["spec", "backup", "s3SecretKey"], ["spec", "backup", "resticPassword"], ["spec", "backup", "s3CredentialsSecret"], ["spec", "backup", "s3CredentialsSecret", "name"], ["spec", "backup", "s3CredentialsSecret", "bucketKey"], ["spec", "backup", "s3CredentialsSecret", "endpointKey"], ["spec", "backup", "s3CredentialsSecret", "regionKey"], ["spec", "backup", "s3CredentialsSecret", "accessKeyIDKey"], ["spec", "backup", "s3CredentialsSecret", "secretAccessKeyKey"], ["spec", "clickhouseKeeper"], ["spec", "clickhouseKeeper", "enabled"], ["spec", "clickhouseKeeper", "size"], ["spec", "clickhouseKeeper", "resourcesPreset"], ["spec", "clickhouseKeeper", "replicas"]]
+    keysOrder: [["apiVersion"], ["appVersion"], ["kind"], ["metadata"], ["metadata", "name"], ["spec", "replicas"], ["spec", "shards"], ["spec", "resources"], ["spec", "resourcesPreset"], ["spec", "size"], ["spec", "storageClass"], ["spec", "version"], ["spec", "logStorageSize"], ["spec", "logTTL"], ["spec", "users"], ["spec", "backup"], ["spec", "backup", "enabled"], ["spec", "backup", "useSystemBucket"], ["spec", "backup", "s3Region"], ["spec", "backup", "s3Bucket"], ["spec", "backup", "endpoint"], ["spec", "backup", "s3PathOverride"], ["spec", "backup", "schedule"], ["spec", "backup", "cleanupStrategy"], ["spec", "backup", "s3AccessKey"], ["spec", "backup", "s3SecretKey"], ["spec", "backup", "resticPassword"], ["spec", "backup", "s3CredentialsSecret"], ["spec", "backup", "s3CredentialsSecret", "name"], ["spec", "backup", "s3CredentialsSecret", "bucketKey"], ["spec", "backup", "s3CredentialsSecret", "endpointKey"], ["spec", "backup", "s3CredentialsSecret", "regionKey"], ["spec", "backup", "s3CredentialsSecret", "accessKeyIDKey"], ["spec", "backup", "s3CredentialsSecret", "secretAccessKeyKey"], ["spec", "backup", "endpointCA"], ["spec", "backup", "endpointCA", "name"], ["spec", "backup", "endpointCA", "key"], ["spec", "clickhouseKeeper"], ["spec", "clickhouseKeeper", "enabled"], ["spec", "clickhouseKeeper", "size"], ["spec", "clickhouseKeeper", "resourcesPreset"], ["spec", "clickhouseKeeper", "replicas"]]
   secrets:
     exclude: []
     include:
diff --git a/packages/system/computeplane-rd/Chart.yaml b/packages/system/computeplane-rd/Chart.yaml
new file mode 100644
index 0000000000..b68629b27c
--- /dev/null
+++ b/packages/system/computeplane-rd/Chart.yaml
@@ -0,0 +1,3 @@
+apiVersion: v2
+name: computeplane-rd
+version: 0.0.0 # Placeholder, the actual version will be automatically set during the build process
diff --git a/packages/system/computeplane-rd/Makefile b/packages/system/computeplane-rd/Makefile
new file mode 100644
index 0000000000..48d5e88140
--- /dev/null
+++ b/packages/system/computeplane-rd/Makefile
@@ -0,0 +1,4 @@
+export NAME=computeplane-rd
+export NAMESPACE=cozy-system
+
+include ../../../hack/package.mk
diff --git a/packages/system/computeplane-rd/cozyrds/computeplane.yaml b/packages/system/computeplane-rd/cozyrds/computeplane.yaml
new file mode 100644
index 0000000000..c84d39b782
--- /dev/null
+++ b/packages/system/computeplane-rd/cozyrds/computeplane.yaml
@@ -0,0 +1,45 @@
+apiVersion: cozystack.io/v1alpha1
+kind: ApplicationDefinition
+metadata:
+  name: computeplane
+spec:
+  application:
+    kind: ComputePlane
+    singular: computeplane
+    plural: computeplanes
+    openAPISchema: |-
+      {"title":"Chart Values","type":"object","properties":{"nodeGroups":{"description":"Worker node groups of the ComputePlane cluster (cluster shape only — the security posture is fixed by the module and cannot be overridden through this knob: the module forwards only the documented per-pool fields to the `kubernetes-nodes` pool chart, so any other `NodeGroup` field, e.g. `talos`/`version`/`images`, is silently dropped — accepted but inert). Same structure as the `kubernetes` application's `nodeGroups`. When left empty, the module itself materialises a default scale-from-zero `md0` pool with `roles: [ingress-nginx]` (the wrapped `kubernetes` chart no longer injects one after the Phase 2 split), so the cluster sits idle until a pending Pod (e.g. the ingress-nginx controller) triggers the cluster-autoscaler. Supplied groups are authoritative (not merged with the default), so at least one of them must carry `roles: [ingress-nginx]` — enforced at render time. Each supplied pool key must be at most 15 characters so its `kubernetes-nodes-computeplane-cluster-<pool>` HelmRelease name fits Helm's 53-character limit — also enforced at render time.","type":"object","default":{},"additionalProperties":{"type":"object","required":["diskSize","instanceType","maxReplicas","minReplicas"],"properties":{"diskSize":{"description":"System disk size for the worker VM. Carries the Talos OS image, kubelet state, containerd image cache, and any local-path PVCs.","default":"20Gi","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"gpus":{"description":"List of GPUs to attach (NVIDIA driver requires at least 4 GiB RAM).","type":"array","items":{"type":"object","required":["name"],"properties":{"name":{"description":"Name of GPU, such as \"nvidia.com/AD102GL_L40S\".","type":"string","x-cozystack-options":{"source":"gpu"}}}}},"instanceType":{"description":"Virtual machine instance type.","type":"string","default":"u1.medium","x-cozystack-options":{"source":"instancetype"}},"kubelet":{"description":"Kubelet resource reservations for this node group.","type":"object","properties":{"evictionHardMemory":{"description":"Hard eviction threshold for memory (absolute like 200Mi or percentage like 7%).","type":"string","default":"7%"},"evictionSoftMemory":{"description":"Soft eviction threshold for memory (absolute like 1Gi or percentage like 10%).","type":"string","default":"10%"},"kubeReservedCpu":{"description":"CPU reserved for kubelet and container runtime. Auto-computed from instanceType if empty.","type":"string"},"kubeReservedMemory":{"description":"Memory reserved for kubelet and container runtime. Auto-computed from instanceType if empty.","type":"string"},"systemReservedCpu":{"description":"CPU reserved for host OS. Auto-computed from instanceType if empty.","type":"string"},"systemReservedMemory":{"description":"Memory reserved for host OS. Auto-computed from instanceType if empty.","type":"string"}}},"maxReplicas":{"description":"Maximum number of replicas.","type":"integer","default":10},"minReplicas":{"description":"Minimum number of replicas.","type":"integer","default":0},"resources":{"description":"Explicit CPU and memory for each worker node, as an alternative to `instanceType` sizing. Set both `cpu` and `memory` together or neither.","type":"object","properties":{"cpu":{"description":"CPU available.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Memory (RAM) available.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}},"roles":{"description":"List of node roles. At least one group must carry `ingress-nginx` — the module pins the ingress-nginx addon on, and its controller only schedules onto nodes with that role (enforced at render time).","type":"array","items":{"type":"string"}},"storageClass":{"description":"StorageClass for worker node persistent disks. When empty, the `kubernetes-nodes` pool chart applies its own default (`replicated`).","type":"string","x-cozystack-options":{"source":"storageclass"}}}}}}}
+  release:
+    prefix: ""
+    labels:
+      sharding.fluxcd.io/key: tenants
+      internal.cozystack.io/tenantmodule: "true"
+    chartRef:
+      kind: ExternalArtifact
+      name: cozystack-computeplane-application-kubevirt-computeplane
+      namespace: cozy-system
+  dashboard:
+    category: Administration
+    singular: ComputePlane
+    plural: ComputePlanes
+    name: computeplane
+    module: true
+    description: Managed, isolated environment for running code-executing apps
+    icon: <svg width="144" height="144" viewBox="0 0 144 144" fill="none" xmlns="http://www.w3.org/2000/svg">
<rect width="144" height="144" rx="24" fill="url(#paint0_linear_681_2845)"/>
<path d="M71.9968 19C70.3039 19.0002 68.9312 20.5322 68.9314 22.4221C68.9314 22.4511 68.9373 22.4788 68.9379 22.5076C68.9354 22.7644 68.9231 23.0737 68.9314 23.2973C68.9717 24.3873 69.2082 25.2216 69.3506 26.2258C69.6084 28.3752 69.8245 30.1569 69.6912 31.813C69.5615 32.4375 69.1037 33.0086 68.6956 33.4056L68.6235 34.7086C66.7839 34.8617 64.9319 35.1421 63.0821 35.5641C55.1226 37.3798 48.2695 41.4991 43.052 47.0609C42.7134 46.8288 42.1211 46.4019 41.945 46.2712C41.3977 46.3454 40.8445 46.5151 40.1241 46.0935C38.7522 45.1657 37.5028 43.8851 35.991 42.3424C35.2982 41.6044 34.7966 40.9018 33.9735 40.1904C33.7866 40.0289 33.5014 39.8104 33.2923 39.6442C32.6489 39.1288 31.89 38.86 31.157 38.8348C30.2147 38.8024 29.3075 39.1725 28.7138 39.9206C27.6584 41.2506 27.9963 43.2833 29.4671 44.4614C29.482 44.4734 29.4979 44.4827 29.5129 44.4943C29.715 44.6589 29.9625 44.8698 30.1483 45.0076C31.0217 45.6555 31.8195 45.9872 32.6897 46.5015C34.5231 47.6391 36.043 48.5823 37.2486 49.7196C37.7194 50.2237 37.8016 51.1122 37.8643 51.4964L38.8468 52.3782C33.5872 60.3308 31.153 70.1539 32.5915 80.1627L31.3077 80.5378C30.9693 80.9768 30.4912 81.6676 29.9911 81.8738C28.4138 82.3729 26.6387 82.5562 24.4956 82.7819C23.4894 82.866 22.6213 82.8158 21.5546 83.0188C21.3198 83.0635 20.9927 83.1491 20.7358 83.2097C20.7269 83.2116 20.7186 83.2142 20.7096 83.2162C20.6956 83.2195 20.6772 83.2263 20.6638 83.2294C18.857 83.668 17.6963 85.3365 18.0699 86.9805C18.4437 88.6248 20.2086 89.6248 22.0262 89.2312C22.0393 89.2282 22.0584 89.2277 22.072 89.2246C22.0926 89.2199 22.1106 89.2099 22.131 89.2049C22.3844 89.149 22.7019 89.0868 22.9236 89.0272C23.9723 88.7451 24.7318 88.3306 25.6746 87.9677C27.7029 87.2368 29.3828 86.6262 31.0195 86.3883C31.703 86.3345 32.4232 86.812 32.7814 87.0134L34.1177 86.7831C37.1926 96.3613 43.6366 104.103 51.7963 108.961L51.2396 110.303C51.4403 110.824 51.6616 111.53 51.5121 112.045C50.9171 113.595 49.898 115.231 48.7374 117.055C48.1755 117.898 47.6004 118.552 47.0934 119.516C46.972 119.747 46.8175 120.102 46.7004 120.346C45.9125 122.039 46.4904 123.99 48.0038 124.722C49.5268 125.459 51.4171 124.682 52.2352 122.985C52.2364 122.982 52.2406 122.98 52.2417 122.978C52.2426 122.976 52.2409 122.973 52.2417 122.971C52.3582 122.731 52.5233 122.415 52.6216 122.188C53.056 121.189 53.2005 120.332 53.5059 119.365C54.317 117.318 54.7626 115.17 55.8791 113.832C56.1849 113.466 56.6833 113.325 57.2001 113.186L57.8944 111.922C65.008 114.665 72.9705 115.402 80.9245 113.587C82.7391 113.173 84.4908 112.637 86.1843 111.994C86.3794 112.342 86.742 113.011 86.8393 113.179C87.3644 113.351 87.9377 113.439 88.4047 114.133C89.2401 115.567 89.8114 117.263 90.5073 119.312C90.8128 120.279 90.9638 121.136 91.3981 122.136C91.4971 122.363 91.6614 122.684 91.778 122.925C92.5944 124.628 94.4907 125.407 96.0159 124.669C97.5292 123.937 98.1077 121.986 97.3194 120.293C97.2023 120.049 97.0412 119.695 96.9198 119.464C96.4127 118.499 95.8377 117.852 95.2758 117.009C94.1152 115.185 93.1526 113.67 92.5575 112.12C92.3087 111.32 92.5995 110.823 92.7933 110.303C92.6772 110.17 92.4288 109.414 92.2824 109.059C100.762 104.029 107.017 95.9985 109.955 86.7239C110.351 86.7865 111.041 86.9091 111.265 86.9542C111.726 86.6487 112.149 86.2501 112.981 86.3159C114.617 86.5537 116.297 87.1645 118.326 87.8953C119.268 88.2581 120.028 88.6793 121.077 88.9614C121.298 89.021 121.616 89.0766 121.869 89.1325C121.889 89.1375 121.908 89.1475 121.928 89.1522C121.942 89.1553 121.961 89.1558 121.974 89.1588C123.792 89.552 125.557 88.5526 125.93 86.9081C126.303 85.2641 125.143 83.5952 123.336 83.157C123.074 83.097 122.701 82.995 122.446 82.9465C121.379 82.7435 120.511 82.7935 119.505 82.7095C117.361 82.4839 115.586 82.3004 114.009 81.8014C113.366 81.5507 112.908 80.7819 112.686 80.4655L111.448 80.1035C112.09 75.438 111.917 70.5825 110.806 65.7243C109.685 60.8208 107.704 56.3361 105.062 52.3848C105.379 52.0948 105.979 51.5612 106.149 51.4043C106.199 50.8517 106.156 50.2722 106.725 49.6603C107.931 48.523 109.451 47.5799 111.284 46.4423C112.154 45.9279 112.959 45.5964 113.832 44.9484C114.03 44.8019 114.299 44.5699 114.507 44.4022C115.977 43.2237 116.316 41.1911 115.26 39.8614C114.204 38.5317 112.159 38.4065 110.688 39.585C110.479 39.7516 110.195 39.9688 110.007 40.1312C109.184 40.8426 108.676 41.5452 107.983 42.2832C106.471 43.8259 105.222 45.113 103.85 46.0409C103.255 46.3885 102.385 46.2682 101.99 46.2449L100.824 47.0806C94.1753 40.0763 85.1235 35.5982 75.3766 34.7283C75.3494 34.3179 75.3137 33.5761 75.3046 33.3529C74.9056 32.9693 74.4235 32.6418 74.3024 31.813C74.1691 30.1569 74.3917 28.3752 74.6496 26.2258C74.7919 25.2216 75.0284 24.3873 75.0688 23.2973C75.078 23.0495 75.0632 22.69 75.0622 22.4221C75.062 20.5322 73.6898 18.9998 71.9968 19ZM68.1585 42.8886L67.248 59.0447L67.1825 59.0776C67.1214 60.5229 65.9375 61.677 64.4839 61.677C63.8884 61.677 63.3388 61.4849 62.8922 61.1571L62.866 61.1703L49.6807 51.7794C53.7331 47.7759 58.9164 44.8172 64.89 43.4546C65.9812 43.2056 67.0719 43.0209 68.1585 42.8886ZM75.8417 42.8886C82.8159 43.7504 89.2657 46.9232 94.2081 51.786L81.108 61.1176L81.0621 61.0979C79.8994 61.9512 78.2611 61.7394 77.3548 60.5978C76.9835 60.1301 76.7887 59.5801 76.7653 59.0249L76.7522 59.0184L75.8417 42.8886ZM44.8991 57.814L56.9382 68.633L56.9251 68.6988C58.0117 69.6479 58.172 71.2949 57.2657 72.4368C56.8944 72.9045 56.3975 73.2182 55.8639 73.3647L55.8508 73.4173L40.4188 77.8923C39.6334 70.6765 41.3261 63.6621 44.8991 57.814ZM99.0094 57.8206C100.798 60.7336 102.153 63.9871 102.959 67.5143C103.756 70.9991 103.956 74.4778 103.627 77.8397L88.1166 73.3515L88.1035 73.2857C86.7145 72.9043 85.8609 71.4848 86.1843 70.0611C86.3168 69.4778 86.6249 68.9844 87.0423 68.6198L87.0358 68.5869L99.0094 57.8206ZM69.5274 69.4688H74.4596L77.5251 73.3186L76.4247 78.1226L71.9968 80.2614L67.5558 78.1161L66.4554 73.312L69.5274 69.4688ZM85.3393 82.6437C85.5489 82.6331 85.7576 82.652 85.9616 82.6898L85.9878 82.6569L101.95 85.3682C99.6142 91.9624 95.144 97.675 89.1711 101.498L82.9747 86.4606L82.9944 86.4343C82.4252 85.1055 82.9948 83.5472 84.3044 82.9135C84.6397 82.7513 84.99 82.6614 85.3393 82.6437ZM58.5298 82.7095C59.748 82.7267 60.8406 83.5761 61.1237 84.822C61.2562 85.4052 61.1917 85.9831 60.973 86.4935L61.0189 86.5527L54.888 101.439C49.1559 97.7432 44.5904 92.2099 42.1481 85.4208L57.9731 82.7227L57.9993 82.7556C58.1763 82.7229 58.3558 82.7071 58.5298 82.7095ZM71.8986 89.2312C72.3229 89.2155 72.7534 89.303 73.1627 89.501C73.6992 89.7606 74.1136 90.1692 74.3745 90.6592H74.4334L82.2346 104.821C81.2221 105.162 80.1813 105.454 79.1167 105.697C73.1505 107.058 67.2032 106.645 61.818 104.802L69.5995 90.6658H69.6126C70.0795 89.7888 70.965 89.2656 71.8986 89.2312Z" fill="white" stroke="white" stroke-width="0.25"/>
<defs>
<linearGradient id="paint0_linear_681_2845" x1="10" y1="15.5" x2="144" y2="131.5" gradientUnits="userSpaceOnUse">
<stop stop-color="#4D87FF"/>
<stop offset="1" stop-color="#0547D0"/>
</linearGradient>
</defs>
</svg>

+    keysOrder: [["apiVersion"], ["appVersion"], ["kind"], ["metadata"], ["metadata", "name"], ["spec", "nodeGroups"]]
+  secrets:
+    # Tenant-visible secrets are an allowlist: only resources matching an
+    # include selector are labelled tenantresource and surfaced by
+    # cozystack-api (an empty include list withholds everything, and the
+    # exclude branch is never load-bearing). The ComputePlane's Kamaji
+    # kubeconfig Secrets are therefore withheld by construction — the
+    # operator-retained credential never reaches the tenant regardless of
+    # release naming.
+    exclude: []
+    include: []
+  services:
+    exclude: []
+    include: []
+  ingresses:
+    exclude: []
+    include: []
diff --git a/packages/system/http-cache-rd/templates/cozyrd.yaml b/packages/system/computeplane-rd/templates/cozyrd.yaml
similarity index 100%
rename from packages/system/http-cache-rd/templates/cozyrd.yaml
rename to packages/system/computeplane-rd/templates/cozyrd.yaml
diff --git a/packages/system/http-cache-rd/values.yaml b/packages/system/computeplane-rd/values.yaml
similarity index 100%
rename from packages/system/http-cache-rd/values.yaml
rename to packages/system/computeplane-rd/values.yaml
diff --git a/packages/system/coredns/Makefile b/packages/system/coredns/Makefile
index 0278004016..7ae42f72aa 100644
--- a/packages/system/coredns/Makefile
+++ b/packages/system/coredns/Makefile
@@ -10,7 +10,7 @@ update:
 	rm -rf charts
 	helm repo add cozy-coredns https://coredns.github.io/helm
 	helm repo update cozy-coredns
-	helm pull cozy-coredns/coredns --untar --untardir charts
+	helm pull cozy-coredns/coredns --untar --untardir charts --version 1.46.0
 	# Drop vendored upstream helm-unittest fixtures: they hard-code
 	# upstream defaults (test-release-coredns names, no
 	# k8sAppLabelOverride, no service.name override) and fail under
diff --git a/packages/system/coredns/charts/coredns/Chart.yaml b/packages/system/coredns/charts/coredns/Chart.yaml
index f3e9282fc2..44c1cb2bc1 100644
--- a/packages/system/coredns/charts/coredns/Chart.yaml
+++ b/packages/system/coredns/charts/coredns/Chart.yaml
@@ -1,9 +1,9 @@
 annotations:
   artifacthub.io/changes: |
-    - kind: changed
-      description: Bump to CoreDNS 1.12.3
+    - kind: added
+      description: Add scrapeTimeout, scheme, honorLabels, tlsConfig, relabelings, and metricRelabelings options to ServiceMonitor endpoint
 apiVersion: v2
-appVersion: 1.12.3
+appVersion: 1.13.1
 description: CoreDNS is a DNS server that chains plugins and provides Kubernetes DNS
   Services
 home: https://coredns.io
@@ -21,4 +21,4 @@ name: coredns
 sources:
 - https://github.com/coredns/coredns
 type: application
-version: 1.43.2
+version: 1.46.0
diff --git a/packages/system/coredns/charts/coredns/README.md b/packages/system/coredns/charts/coredns/README.md
index 1ba154d48a..7e5895821e 100644
--- a/packages/system/coredns/charts/coredns/README.md
+++ b/packages/system/coredns/charts/coredns/README.md
@@ -108,7 +108,7 @@ The command removes all the Kubernetes components associated with the chart and
 ## Configuration
 
 | Parameter                                      | Description                                                                                                                               | Default                                                      |
-| :--------------------------------------------- | :---------------------------------------------------------------------------------------------------------------------------------------- | :----------------------------------------------------------- |
+| :--------------------------------------------- |:------------------------------------------------------------------------------------------------------------------------------------------| :----------------------------------------------------------- |
 | `image.repository`                             | The image repository to pull from                                                                                                         | coredns/coredns                                              |
 | `image.tag`                                    | The image tag to pull from (derived from Chart.yaml)                                                                                      | ``                                                      |
 | `image.pullPolicy`                             | Image pull policy                                                                                                                         | IfNotPresent                                                 |
@@ -126,6 +126,12 @@ The command removes all the Kubernetes components associated with the chart and
 | `prometheus.monitor.additionalLabels`          | Additional labels that can be used so ServiceMonitor will be discovered by Prometheus                                                     | {}                                                           |
 | `prometheus.monitor.namespace`                 | Selector to select which namespaces the Endpoints objects are discovered from.                                                            | `""`                                                         |
 | `prometheus.monitor.interval`                  | Scrape interval for polling the metrics endpoint. (E.g. "30s")                                                                            | `""`                                                         |
+| `prometheus.monitor.scrapeTimeout`             | Timeout for each scrape request. (E.g. "10s")                                                                                             | `""`                                                         |
+| `prometheus.monitor.scheme`                    | HTTP scheme used for scraping. (`http` or `https`)                                                                                        | `""`                                                         |
+| `prometheus.monitor.honorLabels`               | Honor labels from the target when scraping                                                                                                | `false`                                                      |
+| `prometheus.monitor.tlsConfig`                 | TLS configuration for the metrics endpoint (e.g. `insecureSkipVerify`, certificates)                                                     | `{}`                                                         |
+| `prometheus.monitor.relabelings`               | List of target relabeling rules applied before scraping                                                                                   | `[]`                                                         |
+| `prometheus.monitor.metricRelabelings`         | List of metric relabeling rules applied after scraping                                                                                    | `[]`                                                         |
 | `prometheus.monitor.selector`                  | Service selector                                                                                                                          | `{}`                                                         |
 | `service.clusterIP`                            | IP address to assign to service                                                                                                           | `""`                                                         |
 | `service.clusterIPs`                           | IP addresses to assign to service                                                                                                         | `[]`                                                         |
@@ -140,6 +146,7 @@ The command removes all the Kubernetes components associated with the chart and
 | `serviceAccount.name`                          | If not set & create is true, use template fullname                                                                                        |                                                              |
 | `rbac.create`                                  | If true, create & use RBAC resources                                                                                                      | true                                                         |
 | `rbac.pspEnable`                               | Specifies whether a PodSecurityPolicy should be created.                                                                                  | `false`                                                      |
+| `rbac.multiclusterEnable`                      | Specifies whether the kubernetes plugin multicluster RBAC should be created.                                                              | `false`                                                      |
 | `isClusterService`                             | Specifies whether chart should be deployed as cluster-service or normal k8s app.                                                          | true                                                         |
 | `priorityClassName`                            | Name of Priority Class to assign pods                                                                                                     | `""`                                                         |
 | `securityContext`                              | securityContext definition for pods                                                                                                       | capabilities.add.NET_BIND_SERVICE                            |
@@ -164,13 +171,15 @@ The command removes all the Kubernetes components associated with the chart and
 | `extraVolumes`                                 | Optional array of volumes to create                                                                                                       | []                                                           |
 | `extraVolumeMounts`                            | Optional array of volumes to mount inside the CoreDNS container                                                                           | []                                                           |
 | `extraSecrets`                                 | Optional array of secrets to mount inside the CoreDNS container                                                                           | []                                                           |
-| `env`                                          | Optional array of environment variables for CoreDNS container                                                                           | []                                                           |
+| `env`                                          | Optional array of environment variables for CoreDNS container                                                                             | []                                                           |
 | `customLabels`                                 | Optional labels for Deployment(s), Pod, Service, ServiceMonitor objects                                                                   | {}                                                           |
 | `customAnnotations`                            | Optional annotations for Deployment(s), Pod, Service, ServiceMonitor objects                                                              |
 | `rollingUpdate.maxUnavailable`                 | Maximum number of unavailable replicas during rolling update                                                                              | `1`                                                          |
 | `rollingUpdate.maxSurge`                       | Maximum number of pods created above desired number of pods                                                                               | `25%`                                                        |
 | `podDisruptionBudget`                          | Optional PodDisruptionBudget                                                                                                              | {}                                                           |
 | `podAnnotations`                               | Optional Pod only Annotations                                                                                                             | {}                                                           |
+| `podLabels`                                    | Optional Pod only Labels                                                                                                                  | {}                                                           |
+| `dnsConfig`                                    | Optional Pod DNS configuration. When set, `dnsPolicy` is automatically set to `None`                                                      | {}                                                           |
 | `terminationGracePeriodSeconds`                | Optional duration in seconds the pod needs to terminate gracefully.                                                                       | 30                                                           |
 | `hpa.enabled`                                  | Enable Hpa autoscaler instead of proportional one                                                                                         | `false`                                                      |
 | `hpa.minReplicas`                              | Hpa minimum number of CoreDNS replicas                                                                                                    | `1`                                                          |
@@ -208,6 +217,8 @@ The command removes all the Kubernetes components associated with the chart and
 | `deployment.name`                              | Name of the deployment if `deployment.enabled` is true. Otherwise the name of an existing deployment for the autoscaler or HPA to target. | `""`                                                         |
 | `deployment.annotations`                       | Annotations to add to the main deployment                                                                                                 | `{}`                                                         |
 | `deployment.selector`                          | Pod selector                                                                                                                              | `{}`                                                         |
+| `deployment.dnsPolicy`                         | DNS policy for the pod (Default, ClusterFirst, ClusterFirstWithHostNet, None)                                                             | `"Default"`                                                  |
+| `deployment.dnsConfig`                         | Custom DNS configuration (nameservers, searches, options). Required when dnsPolicy is "None"                                              | `{}`                                                         |
 | `clusterRole.nameOverride`                     | ClusterRole name override                                                                                                                 |                                                              |
 
 See `values.yaml` for configuration notes. Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,
diff --git a/packages/system/coredns/charts/coredns/templates/clusterrole.yaml b/packages/system/coredns/charts/coredns/templates/clusterrole.yaml
index ecdeafae47..63ba17fd03 100644
--- a/packages/system/coredns/charts/coredns/templates/clusterrole.yaml
+++ b/packages/system/coredns/charts/coredns/templates/clusterrole.yaml
@@ -4,6 +4,10 @@ kind: ClusterRole
 metadata:
   name: {{ template "coredns.clusterRoleName" . }}
   labels: {{- include "coredns.labels" . | nindent 4 }}
+{{- with .Values.customAnnotations }}
+  annotations:
+{{- toYaml . | nindent 4 }}
+{{- end }}
 rules:
 - apiGroups:
   - ""
@@ -33,4 +37,14 @@ rules:
   resourceNames:
   - {{ template "coredns.fullname" . }}
 {{- end }}
+{{- if .Values.rbac.multiclusterEnable }}
+- apiGroups:
+  - multicluster.x-k8s.io
+  resources:
+  - serviceexports
+  - serviceimports
+  verbs:
+  - list
+  - watch
+{{- end }}
 {{- end }}
diff --git a/packages/system/coredns/charts/coredns/templates/clusterrolebinding.yaml b/packages/system/coredns/charts/coredns/templates/clusterrolebinding.yaml
index ebeaf14312..4537c93738 100644
--- a/packages/system/coredns/charts/coredns/templates/clusterrolebinding.yaml
+++ b/packages/system/coredns/charts/coredns/templates/clusterrolebinding.yaml
@@ -4,6 +4,10 @@ kind: ClusterRoleBinding
 metadata:
   name: {{ template "coredns.clusterRoleName" . }}
   labels: {{- include "coredns.labels" . | nindent 4 }}
+{{- with .Values.customAnnotations }}
+  annotations:
+{{- toYaml . | nindent 4 }}
+{{- end }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
diff --git a/packages/system/coredns/charts/coredns/templates/deployment.yaml b/packages/system/coredns/charts/coredns/templates/deployment.yaml
index a0119aa31c..62d9c76818 100644
--- a/packages/system/coredns/charts/coredns/templates/deployment.yaml
+++ b/packages/system/coredns/charts/coredns/templates/deployment.yaml
@@ -49,6 +49,9 @@ spec:
         app.kubernetes.io/instance: {{ .Release.Name | quote }}
 {{- if .Values.customLabels }}
 {{ toYaml .Values.customLabels | indent 8 }}
+{{- end }}
+{{- if .Values.podLabels }}
+{{ toYaml .Values.podLabels | indent 8 }}
 {{- end }}
       annotations:
         checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
@@ -66,15 +69,25 @@ spec:
       terminationGracePeriodSeconds: {{ .Values.terminationGracePeriodSeconds }}
       {{- end }}
       serviceAccountName: {{ template "coredns.serviceAccountName" . }}
+      {{- if eq .Values.automountServiceAccountToken false }}
+      automountServiceAccountToken: false
+      {{- end }}
       {{- if .Values.priorityClassName }}
       priorityClassName: {{ .Values.priorityClassName | quote }}
       {{- end }}
       {{- if .Values.isClusterService }}
-      dnsPolicy: Default
+      dnsPolicy: {{ .Values.deployment.dnsPolicy }}
+      {{- end }}
+      {{- if and (eq .Values.deployment.dnsPolicy "None") (not .Values.deployment.dnsConfig) }}
+      {{- fail "dnsConfig is required when dnsPolicy is set to None" }}
+      {{- end }}
+      {{- with .Values.deployment.dnsConfig }}
+      dnsConfig:
+        {{- toYaml . | nindent 8 }}
       {{- end }}
       {{- if .Values.affinity }}
       affinity:
-{{ toYaml .Values.affinity | indent 8 }}
+{{ tpl (toYaml .Values.affinity) $ | indent 8 }}
       {{- end }}
       {{- if .Values.topologySpreadConstraints }}
       topologySpreadConstraints:
diff --git a/packages/system/coredns/charts/coredns/templates/servicemonitor.yaml b/packages/system/coredns/charts/coredns/templates/servicemonitor.yaml
index 53f8bdb5d8..cf2eb3cfdc 100644
--- a/packages/system/coredns/charts/coredns/templates/servicemonitor.yaml
+++ b/packages/system/coredns/charts/coredns/templates/servicemonitor.yaml
@@ -37,4 +37,25 @@ spec:
       {{- if .Values.prometheus.monitor.interval }}
       interval: {{ .Values.prometheus.monitor.interval }}
       {{- end }}
+      {{- if .Values.prometheus.monitor.scrapeTimeout }}
+      scrapeTimeout: {{ .Values.prometheus.monitor.scrapeTimeout }}
+      {{- end }}
+      {{- if .Values.prometheus.monitor.scheme }}
+      scheme: {{ .Values.prometheus.monitor.scheme }}
+      {{- end }}
+      {{- if .Values.prometheus.monitor.honorLabels }}
+      honorLabels: {{ .Values.prometheus.monitor.honorLabels }}
+      {{- end }}
+      {{- with .Values.prometheus.monitor.tlsConfig }}
+      tlsConfig:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.prometheus.monitor.relabelings }}
+      relabelings:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.prometheus.monitor.metricRelabelings }}
+      metricRelabelings:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
 {{- end }}
diff --git a/packages/system/coredns/charts/coredns/values.yaml b/packages/system/coredns/charts/coredns/values.yaml
index 9f05dbad69..2616b389fa 100644
--- a/packages/system/coredns/charts/coredns/values.yaml
+++ b/packages/system/coredns/charts/coredns/values.yaml
@@ -34,6 +34,8 @@ terminationGracePeriodSeconds: 30
 podAnnotations: {}
 #  cluster-autoscaler.kubernetes.io/safe-to-evict: "false"
 
+podLabels: {}
+
 serviceType: "ClusterIP"
 
 prometheus:
@@ -48,6 +50,12 @@ prometheus:
     additionalLabels: {}
     namespace: ""
     interval: ""
+    scrapeTimeout: ""
+    scheme: ""
+    honorLabels: false
+    tlsConfig: {}
+    relabelings: []
+    metricRelabelings: []
     selector: {}
 
 service:
@@ -403,6 +411,23 @@ deployment:
   annotations: {}
   ## Pod selector
   selector: {}
+  # dnsPolicy determines how DNS resolution is handled for the pod.
+  # When isClusterService is true, this defaults to "Default" to avoid circular DNS resolution.
+  # Options: Default, ClusterFirst, ClusterFirstWithHostNet, None
+  # If set to "None", you must provide dnsConfig.
+  dnsPolicy: "Default"
+  # dnsConfig allows fine-grained DNS configuration for the pod.
+  # Only used when dnsPolicy is set to "None" or when custom DNS settings are needed.
+  # Example:
+  #   dnsConfig:
+  #     nameservers:
+  #       - 8.8.8.8
+  #     searches:
+  #       - my.dns.search.suffix
+  #     options:
+  #       - name: ndots
+  #         value: "2"
+  dnsConfig: {}
 
 # Configures initcontainers for the coredns deployment.
 initContainers: []
diff --git a/packages/system/cozy-proxy/charts/cozy-proxy/Chart.yaml b/packages/system/cozy-proxy/charts/cozy-proxy/Chart.yaml
index 58f166f622..d3b7bb18aa 100644
--- a/packages/system/cozy-proxy/charts/cozy-proxy/Chart.yaml
+++ b/packages/system/cozy-proxy/charts/cozy-proxy/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 name: cozy-proxy
 description: A simple kube-proxy addon for 1:1 NAT services in Kubernetes using an NFT backend
 type: application
-version: 0.3.0
-appVersion: 0.3.0
+version: 0.4.0
+appVersion: 0.4.0
diff --git a/packages/system/cozy-proxy/charts/cozy-proxy/values.yaml b/packages/system/cozy-proxy/charts/cozy-proxy/values.yaml
index e143e92609..e83f27e4c6 100644
--- a/packages/system/cozy-proxy/charts/cozy-proxy/values.yaml
+++ b/packages/system/cozy-proxy/charts/cozy-proxy/values.yaml
@@ -1,6 +1,6 @@
 image:
   repository: ghcr.io/cozystack/cozystack/cozy-proxy
-  tag: v0.3.0
+  tag: v0.4.0
   pullPolicy: IfNotPresent
 
 daemonset:
diff --git a/packages/system/cozystack-api/Makefile b/packages/system/cozystack-api/Makefile
index e8fc82c103..b65f540926 100644
--- a/packages/system/cozystack-api/Makefile
+++ b/packages/system/cozystack-api/Makefile
@@ -24,8 +24,7 @@ image: image-cozystack-api
 image-cozystack-api:
 	docker buildx build -f images/cozystack-api/Dockerfile ../../.. \
 		$(call image-tags,cozystack-api,v$(COZYSTACK_VERSION)) \
-		--cache-from type=registry,ref=$(REGISTRY)/cozystack-api:latest \
-		--cache-to type=inline \
+		$(call cache-args,cozystack-api) \
 		--metadata-file images/cozystack-api.json \
 		$(BUILDX_ARGS)
 	IMAGE="$(REGISTRY)/cozystack-api:$(IMAGE_TAG)@$$(yq e '."containerimage.digest"' images/cozystack-api.json -o json -r)" \
diff --git a/packages/system/cozystack-api/images/cozystack-api/Dockerfile b/packages/system/cozystack-api/images/cozystack-api/Dockerfile
index 4ad9548583..7d9f6220d0 100644
--- a/packages/system/cozystack-api/images/cozystack-api/Dockerfile
+++ b/packages/system/cozystack-api/images/cozystack-api/Dockerfile
@@ -1,4 +1,5 @@
-FROM golang:1.26-alpine AS builder
+FROM --platform=$BUILDPLATFORM golang:1.27-alpine@sha256:8a5910f31396cd4d89662f56c68b3ae31d374308270a1c3bd96672ee5ed43414 AS builder
+ARG GOPROXY
 
 ARG TARGETOS
 ARG TARGETARCH
@@ -6,7 +7,7 @@ ARG TARGETARCH
 WORKDIR /workspace
 
 COPY go.mod go.sum ./
-RUN GOOS=$TARGETOS GOARCH=$TARGETARCH go mod download
+RUN for attempt in 1 2 3; do GOOS=$TARGETOS GOARCH=$TARGETARCH go mod download && break; [ "$attempt" = 3 ] && exit 1; sleep $((attempt * 10)); done
 
 COPY api api/
 COPY pkg pkg/
diff --git a/packages/system/cozystack-api/templates/apiservice.yaml b/packages/system/cozystack-api/templates/apiservice.yaml
index 3cd3665b75..a1b57fb20d 100644
--- a/packages/system/cozystack-api/templates/apiservice.yaml
+++ b/packages/system/cozystack-api/templates/apiservice.yaml
@@ -27,3 +27,18 @@ spec:
     name: cozystack-api
     namespace: cozy-system
   version: v1alpha1
+---
+apiVersion: apiregistration.k8s.io/v1
+kind: APIService
+metadata:
+  annotations:
+    cert-manager.io/inject-ca-from: "{{ .Release.Namespace }}/cozystack-api"
+  name: v1alpha1.sdn.cozystack.io
+spec:
+  group: sdn.cozystack.io
+  groupPriorityMinimum: 1000
+  versionPriority: 15
+  service:
+    name: cozystack-api
+    namespace: cozy-system
+  version: v1alpha1
diff --git a/packages/system/cozystack-api/templates/deployment.yaml b/packages/system/cozystack-api/templates/deployment.yaml
index 9febfe1e3e..6c9f6bde23 100644
--- a/packages/system/cozystack-api/templates/deployment.yaml
+++ b/packages/system/cozystack-api/templates/deployment.yaml
@@ -39,6 +39,10 @@ spec:
           - name: cozystack-api-certs
             mountPath: /tmp/cozystack-api-certs
             readOnly: true
+        {{- with .Values.cozystackAPI.resources }}
+        resources:
+          {{- toYaml . | nindent 10 }}
+        {{- end }}
       volumes:
         - name: cozystack-api-certs
           secret:
diff --git a/packages/system/cozystack-api/templates/hook.yaml b/packages/system/cozystack-api/templates/hook.yaml
index 852b2db020..036ff495ab 100644
--- a/packages/system/cozystack-api/templates/hook.yaml
+++ b/packages/system/cozystack-api/templates/hook.yaml
@@ -16,9 +16,18 @@ spec:
         policy.cozystack.io/allow-to-apiserver: "true"
     spec:
       serviceAccountName: "cozystack-api-hook"
+      securityContext:
+        runAsNonRoot: true
+        runAsUser: 65534
+        seccompProfile:
+          type: RuntimeDefault
       containers:
         - name: kubectl
-          image: docker.io/alpine/k8s:1.33.4
+          image: docker.io/alpine/k8s:1.36.2
+          securityContext:
+            allowPrivilegeEscalation: false
+            capabilities:
+              drop: ["ALL"]
           command:
           - sh
           args:
diff --git a/packages/system/cozystack-api/templates/rbac.yaml b/packages/system/cozystack-api/templates/rbac.yaml
index 0429b9ef6d..b5501b8cce 100644
--- a/packages/system/cozystack-api/templates/rbac.yaml
+++ b/packages/system/cozystack-api/templates/rbac.yaml
@@ -6,6 +6,12 @@ rules:
 - apiGroups: [""]
   resources: ["namespaces", "secrets", "services"]
   verbs: ["get", "watch", "list"]
+# Hierarchical tenant quota admission reads the rendered ResourceQuota usage of
+# a parent tenant's pool to carve a child's allocation out of what is actually
+# left (see pkg/registry/apps/application/quota.go).
+- apiGroups: [""]
+  resources: ["resourcequotas"]
+  verbs: ["get", "watch", "list"]
 - apiGroups: ["rbac.authorization.k8s.io"]
   resources: ["rolebindings"]
   verbs: ["get", "watch", "list"]
@@ -21,6 +27,61 @@ rules:
 - apiGroups: ["cozystack.io"]
   resources: ["*"]
   verbs: ["get", "watch", "list"]
+# Marketplace Tap resource: disconnecting a tap deletes its (cluster-scoped)
+# PackageSource and the tap-managed registration Package that de-registers its
+# apps. The tap's Flux OCIRepository is read here for List/Get/Watch; its write
+# verbs are scoped to a namespaced Role in cozy-system (see tap-source-role.yaml),
+# since the API only ever manages tap sources there.
+- apiGroups: ["cozystack.io"]
+  resources: ["packagesources", "packages"]
+  verbs: ["delete"]
+- apiGroups: ["source.toolkit.fluxcd.io"]
+  resources: ["ocirepositories"]
+  verbs: ["get", "list", "watch"]
 - apiGroups: ["helm.toolkit.fluxcd.io"]
   resources: ["*"]
   verbs: ["*"]
+# Read-only sources for the Option (dropdown) resource providers.
+- apiGroups: [""]
+  resources: ["nodes", "persistentvolumeclaims"]
+  verbs: ["get", "watch", "list"]
+- apiGroups: ["kubevirt.io"]
+  resources: ["kubevirts"]
+  verbs: ["get", "watch", "list"]
+# The image picker drops golden images whose import Failed.
+- apiGroups: ["cdi.kubevirt.io"]
+  resources: ["datavolumes"]
+  verbs: ["get", "watch", "list"]
+- apiGroups: ["instancetype.kubevirt.io"]
+  resources: ["virtualmachineclusterinstancetypes", "virtualmachineclusterpreferences"]
+  verbs: ["get", "watch", "list"]
+- apiGroups: ["k8s.cni.cncf.io"]
+  resources: ["network-attachment-definitions"]
+  verbs: ["get", "watch", "list"]
+- apiGroups: ["storage.k8s.io"]
+  resources: ["storageclasses"]
+  verbs: ["get", "watch", "list"]
+- apiGroups: ["backups.cozystack.io"]
+  resources: ["backupclasses", "plans", "backups"]
+  verbs: ["get", "watch", "list"]
+- apiGroups: ["apps.cozystack.io"]
+  resources: ["vmdisks"]
+  verbs: ["get", "watch", "list"]
+# The sourceRef picker on a VMImportTask is an Option provider, which lists
+# the sources through the dynamic client under this ServiceAccount. Without
+# the group here the provider registers and then answers with an empty list,
+# so the form offers no connection to import from.
+- apiGroups: ["forklift.cozystack.io"]
+  resources: ["vmimportsources"]
+  verbs: ["get", "watch", "list"]
+# The VM picker reads the machine list the migration controller publishes for
+# each source. Read-only, and only ever fetched by a name derived from the
+# source the tenant already chose.
+- apiGroups: [""]
+  resources: ["configmaps"]
+  verbs: ["get", "watch", "list"]
+# The SecurityGroup resource is a projection over CiliumNetworkPolicy: the
+# storage CRUDs these objects with the cozystack-api ServiceAccount.
+- apiGroups: ["cilium.io"]
+  resources: ["ciliumnetworkpolicies"]
+  verbs: ["get", "watch", "list", "create", "update", "patch", "delete"]
diff --git a/packages/system/cozystack-api/templates/tap-source-role.yaml b/packages/system/cozystack-api/templates/tap-source-role.yaml
new file mode 100644
index 0000000000..af338c2150
--- /dev/null
+++ b/packages/system/cozystack-api/templates/tap-source-role.yaml
@@ -0,0 +1,27 @@
+# The cozystack-api ServiceAccount creates, updates, and deletes a community
+# tap's Flux OCIRepository, but only ever in cozy-system. Keep those write verbs
+# in a namespaced Role here (list/watch/get stay cluster-wide in the ClusterRole
+# for the aggregated watch cache) rather than granting them cluster-wide.
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: cozystack-api-tap-sources
+  namespace: cozy-system
+rules:
+- apiGroups: ["source.toolkit.fluxcd.io"]
+  resources: ["ocirepositories"]
+  verbs: ["create", "update", "patch", "delete"]
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: cozystack-api-tap-sources
+  namespace: cozy-system
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: cozystack-api-tap-sources
+subjects:
+- kind: ServiceAccount
+  name: cozystack-api
+  namespace: cozy-system
diff --git a/packages/system/cozystack-api/tests/hook_securitycontext_test.yaml b/packages/system/cozystack-api/tests/hook_securitycontext_test.yaml
new file mode 100644
index 0000000000..b465d2ed5e
--- /dev/null
+++ b/packages/system/cozystack-api/tests/hook_securitycontext_test.yaml
@@ -0,0 +1,45 @@
+suite: cozystack-api post-upgrade hook runs non-root
+
+# The hook only renders when the legacy cozystack-api DaemonSet still exists
+# (lookup-gated), so mock that DaemonSet to drive the render, then pin the
+# non-root securityContext so it cannot regress to running kubectl as root.
+release:
+  name: cozystack-api
+  namespace: cozy-system
+templates:
+  - templates/hook.yaml
+kubernetesProvider:
+  scheme:
+    "apps/v1/DaemonSet":
+      gvr:
+        group: "apps"
+        version: "v1"
+        resource: "daemonsets"
+      namespaced: true
+  objects:
+    - kind: DaemonSet
+      apiVersion: apps/v1
+      metadata:
+        name: cozystack-api
+        namespace: cozy-system
+tests:
+  - it: post-upgrade hook Job runs under a restrictive non-root securityContext
+    documentSelector:
+      path: kind
+      value: Job
+    asserts:
+      - equal:
+          path: spec.template.spec.securityContext.runAsNonRoot
+          value: true
+      - equal:
+          path: spec.template.spec.securityContext.runAsUser
+          value: 65534
+      - equal:
+          path: spec.template.spec.securityContext.seccompProfile.type
+          value: RuntimeDefault
+      - equal:
+          path: spec.template.spec.containers[0].securityContext.allowPrivilegeEscalation
+          value: false
+      - contains:
+          path: spec.template.spec.containers[0].securityContext.capabilities.drop
+          content: ALL
diff --git a/packages/system/cozystack-api/tests/rbac_test.yaml b/packages/system/cozystack-api/tests/rbac_test.yaml
new file mode 100644
index 0000000000..18d4eb460e
--- /dev/null
+++ b/packages/system/cozystack-api/tests/rbac_test.yaml
@@ -0,0 +1,95 @@
+suite: cozystack-api ClusterRole grants Option provider sources
+templates:
+  - templates/rbac.yaml
+
+release:
+  name: cozystack-api
+  namespace: cozy-system
+
+# The Option (dropdown) providers run with the cozystack-api ServiceAccount's
+# privileged client, so every GVR a provider lists must be granted on this
+# ClusterRole. The plan/backup providers list namespaced plans/backups in the
+# backups.cozystack.io group; without read access there the apiserver returns
+# forbidden and List silently drops those dropdowns (Get returns 500). The
+# bare cozystack.io grant does NOT cover backups.cozystack.io — RBAC matches
+# the API group string exactly.
+#
+# The last two tests bound the role from two directions, and neither covers the
+# other. The count bound pins the list at exactly twenty-one: templates/rbac.yaml
+# carries no template directives, so anything appended makes rules[21] exist and
+# anything dropped takes rules[20] away, whatever the rule is called. It says
+# nothing about a grant swapped in for an existing one, because the count does
+# not move under a swap. The spelling assert catches that case for the one rule
+# it names, and misses every other wording of it, because helm-unittest compares
+# each field it is handed by value equality and `any: true` only selects which
+# fields are compared. Changing the rule count on purpose means moving both
+# indices below, which is the review this role should get.
+
+tests:
+  - it: grants read on backups.cozystack.io plans and backups for the plan/backup providers
+    asserts:
+      - contains:
+          path: rules
+          content:
+            apiGroups: ["backups.cozystack.io"]
+            resources: ["backupclasses", "plans", "backups"]
+            verbs: ["get", "watch", "list"]
+
+  - it: grants full access on cilium.io ciliumnetworkpolicies for SecurityGroup storage
+    asserts:
+      - contains:
+          path: rules
+          content:
+            apiGroups: ["cilium.io"]
+            resources: ["ciliumnetworkpolicies"]
+            verbs: ["get", "watch", "list", "create", "update", "patch", "delete"]
+
+  # The marketplace tap flow: disconnecting a tap deletes its cluster-scoped
+  # PackageSource and the tap-managed registration Package that de-registers its
+  # apps, and the tap's Flux OCIRepository is read to report status. These grants
+  # live on this ClusterRole because the tap handler runs with the cozystack-api
+  # ServiceAccount's client.
+  - it: grants delete on cozystack.io packagesources and packages for tap disconnect
+    asserts:
+      - contains:
+          path: rules
+          content:
+            apiGroups: ["cozystack.io"]
+            resources: ["packagesources", "packages"]
+            verbs: ["delete"]
+
+  - it: grants read on source.toolkit.fluxcd.io ocirepositories for tap status
+    asserts:
+      - contains:
+          path: rules
+          content:
+            apiGroups: ["source.toolkit.fluxcd.io"]
+            resources: ["ocirepositories"]
+            verbs: ["get", "list", "watch"]
+
+  - it: grants read on cdi.kubevirt.io datavolumes for the image provider
+    asserts:
+      - contains:
+          path: rules
+          content:
+            apiGroups: ["cdi.kubevirt.io"]
+            resources: ["datavolumes"]
+            verbs: ["get", "watch", "list"]
+
+  - it: does not grant objectstorage.k8s.io bucketclasses (no provider reads it)
+    asserts:
+      - notContains:
+          path: rules
+          content:
+            apiGroups: ["objectstorage.k8s.io"]
+            resources: ["bucketclasses"]
+            verbs: ["get", "watch", "list"]
+
+  - it: ships exactly the twenty-one rules this role is pinned to
+    asserts:
+      # Both directions. A dropped grant is the failure this suite is about:
+      # the apiserver returns forbidden and List silently drops the dropdown.
+      - exists:
+          path: rules[20]
+      - notExists:
+          path: rules[21]
diff --git a/packages/system/cozystack-api/tests/resources_test.yaml b/packages/system/cozystack-api/tests/resources_test.yaml
new file mode 100644
index 0000000000..ad26231922
--- /dev/null
+++ b/packages/system/cozystack-api/tests/resources_test.yaml
@@ -0,0 +1,40 @@
+suite: cozystack-api resources knob
+templates:
+  - templates/deployment.yaml
+
+release:
+  name: cozystack-api
+  namespace: cozy-system
+
+# The shipped default is `{}`, which renders no resources key at all, so no
+# existing pod moves on upgrade; only an admin who sets the value under the
+# Package CR gets requests or limits. The empty default is what makes the change
+# safe to land, hence a case on each half.
+
+tests:
+  - it: the shipped default renders no resources key
+    asserts:
+      - isKind:
+          of: Deployment
+      - notExists:
+          path: spec.template.spec.containers[0].resources
+
+  - it: a set value renders on the container, not the pod
+    set:
+      cozystackAPI.resources:
+        requests:
+          cpu: 5m
+          memory: 160Mi
+        limits:
+          cpu: 500m
+          memory: 512Mi
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].resources
+          value:
+            requests:
+              cpu: 5m
+              memory: 160Mi
+            limits:
+              cpu: 500m
+              memory: 512Mi
diff --git a/packages/system/cozystack-api/tests/standalone_render_test.yaml b/packages/system/cozystack-api/tests/standalone_render_test.yaml
new file mode 100644
index 0000000000..ebf4a48120
--- /dev/null
+++ b/packages/system/cozystack-api/tests/standalone_render_test.yaml
@@ -0,0 +1,23 @@
+suite: cozystack-api renders with no platform values injected
+release:
+  name: cozystack-api
+  namespace: cozy-system
+
+# The platform injects _cluster through the cozystack-values Secret, so every
+# case that sets it itself renders fine whether or not values.yaml declares
+# the key. This case supplies nothing. Drop the declaration from values.yaml
+# and the render dies on "index of untyped nil" before a single assert runs;
+# the declaration is the only thing keeping the chart renderable outside a
+# cluster. No suite-level `templates:` list here on purpose: it would narrow
+# the render to the listed files and let a later template reintroduce the
+# same breakage unseen.
+
+tests:
+  - it: exposes nothing when _cluster is absent
+    asserts:
+      - template: templates/api-ingress.yaml
+        hasDocuments:
+          count: 0
+      - template: templates/api-tlsroute.yaml
+        hasDocuments:
+          count: 0
diff --git a/packages/system/cozystack-api/values.yaml b/packages/system/cozystack-api/values.yaml
index c40c19ed0a..f58daa9375 100644
--- a/packages/system/cozystack-api/values.yaml
+++ b/packages/system/cozystack-api/values.yaml
@@ -1,3 +1,10 @@
+# Injected by the platform from the cozystack-values Secret. The empty
+# default keeps the chart renderable on its own, outside a cluster.
+_cluster: {}
+
 cozystackAPI:
-  image: ghcr.io/cozystack/cozystack/cozystack-api:v1.4.0-rc.2@sha256:2f46d4d3ef0789621583379fdf0bed66b7623b5504f60500167801f994b22bae
+  image: ghcr.io/cozystack/cozystack/cozystack-api:v1.6.0@sha256:c4d374a9bc5e6f6e66d24b29396f1eae9d7f06fd268ff767d05c45ca35e84e2e
   replicas: 2
+  # Empty by default: no resources block is rendered, so requests and limits are
+  # opt-in. Idle usage (measured) is ~130-143Mi — keep a limit above that.
+  resources: {}
diff --git a/packages/system/cozystack-basics/templates/clusterroles.yaml b/packages/system/cozystack-basics/templates/clusterroles.yaml
index f270f4e19b..9807d32f15 100644
--- a/packages/system/cozystack-basics/templates/clusterroles.yaml
+++ b/packages/system/cozystack-basics/templates/clusterroles.yaml
@@ -33,6 +33,9 @@ rules:
 - apiGroups: ["apps.cozystack.io"]
   resources: ['*']
   verbs: ['*']
+- apiGroups: ["sdn.cozystack.io"]
+  resources: ["securitygroups"]
+  verbs: ['*']
 - apiGroups:
   - cozystack.io
   resources:
@@ -44,6 +47,8 @@ rules:
   resources:
   - tenantmodules
   - tenantsecrets
+  - options
+  - taps
   verbs: ["get", "list", "watch"]
 ---
 # == view cluster role ==
@@ -84,6 +89,14 @@ rules:
   - get
   - list
   - watch
+- apiGroups:
+  - sdn.cozystack.io
+  resources:
+  - securitygroups
+  verbs:
+  - get
+  - list
+  - watch
 - apiGroups:
   - ""
   resources:
@@ -119,6 +132,32 @@ rules:
   - workloadmonitors
   - workloads
   verbs: ["get", "list", "watch"]
+- apiGroups:
+  - core.cozystack.io
+  resources:
+  - options
+  - taps
+  verbs: ["get", "list", "watch"]
+{{/* Read-only visibility into the objects that govern read-replica autoscaling of a
+     tenant's own databases: the KEDA ScaledObject the chart renders into the tenant
+     namespace and the keda-hpa-<release> HorizontalPodAutoscaler KEDA creates beside
+     it. Without this a tenant who enables autoscaling.enabled but mis-set serverAddress
+     (its own Monitoring stack has no kube_pod_labels) has no in-band way to see the
+     FailedGetExternalMetric / TriggerError that keeps autoscaling from actuating - the
+     error would otherwise surface only in a root-scoped alert they cannot reach. Read
+     verbs only: the objects are managed by the chart / KEDA, not edited by the tenant.
+     (Go-template comment, stripped at render — a `#` YAML comment would be copied
+     verbatim into every rendered manifest in every tenant and drift out of date.) */}}
+- apiGroups:
+  - keda.sh
+  resources:
+  - scaledobjects
+  verbs: ["get", "list", "watch"]
+- apiGroups:
+  - autoscaling
+  resources:
+  - horizontalpodautoscalers
+  verbs: ["get", "list", "watch"]
 ---
 # == use cluster role ==
 # Aggregates view + all roles labeled for use access
@@ -156,6 +195,17 @@ rules:
   verbs:
   - get
   - update
+# Power controls (start/stop/restart) for VMs owned by the tenant.
+# Operational, like console/vnc above, so granted at the "use" level
+# (aggregates into admin and super-admin). Without these the dashboard
+# power buttons return 403 even for tenant admins.
+- apiGroups: ["subresources.kubevirt.io"]
+  resources:
+  - virtualmachines/start
+  - virtualmachines/stop
+  - virtualmachines/restart
+  verbs:
+  - update
 - apiGroups:
   - core.cozystack.io
   resources:
@@ -207,7 +257,6 @@ rules:
   - foos
   - foundationdbs
   - harbors
-  - httpcaches
   - kafkas
   - kuberneteses
   - mariadbs
@@ -221,6 +270,7 @@ rules:
   - redises
   - seaweedfses
   - tcpbalancers
+  - valkeys
   - virtualmachines
   - vmdisks
   - vminstances
@@ -232,6 +282,14 @@ rules:
   - update
   - patch
   - delete
+- apiGroups: ["sdn.cozystack.io"]
+  resources:
+  - securitygroups
+  verbs:
+  - create
+  - update
+  - patch
+  - delete
 ---
 # == super admin cluster role ==
 # Aggregates admin + all roles labeled for super-admin access
diff --git a/packages/system/cozystack-basics/templates/dashboard-role.yaml b/packages/system/cozystack-basics/templates/dashboard-role.yaml
index f76563192b..edbd4ac2c0 100644
--- a/packages/system/cozystack-basics/templates/dashboard-role.yaml
+++ b/packages/system/cozystack-basics/templates/dashboard-role.yaml
@@ -1,6 +1,6 @@
 ---
 # == dashboard role ==
-# Single namespaced role for tenant dashboard access to helm resources
+# Single namespaced role for tenant dashboard access to shared cozy-public resources
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
diff --git a/packages/system/cozystack-basics/templates/database-external-tls-policy.yaml b/packages/system/cozystack-basics/templates/database-external-tls-policy.yaml
new file mode 100644
index 0000000000..484b7cc4b3
--- /dev/null
+++ b/packages/system/cozystack-basics/templates/database-external-tls-policy.yaml
@@ -0,0 +1,94 @@
+{{- /* Render only where the ValidatingAdmissionPolicy API is served. Same guard as gateway-hostname-policy.yaml. */}}
+{{- if .Capabilities.APIVersions.Has "admissionregistration.k8s.io/v1/ValidatingAdmissionPolicy" }}
+---
+# Refuses a database exposed outside the cluster with TLS off. The kinds are
+# served by the aggregated cozystack-api, which runs cluster policies through
+# its own admission chain, so the policy binds to them like to any built-in.
+#
+# Only engines whose tls.enabled decides whether the server takes plaintext
+# belong here. Redis does: with TLS on it serves the TLS port only, and the
+# chart never infers TLS, so external needs an explicit true. Postgres does
+# not: CNPG pins ssl=on and its default pg_hba takes plaintext from any client
+# that asks, whatever the chart's tls.enabled, which only adds the external
+# name to the certificate.
+#
+# TLS is fixed when a Redis instance is created; the operator's RedisFailover
+# schema refuses a change, but this API accepts it. A spec's tls.enabled is
+# therefore a request, not the instance's state, and cannot prove on UPDATE
+# that an instance has TLS. So external access can be turned on only at
+# creation, where tls.enabled does decide the instance.
+#
+# The RedisFailover schema does not exist before the first reconcile, so
+# nothing else stops TLS from being dropped from a release admitted as
+# external with TLS. tls.enabled is therefore frozen while external stays on.
+# Withdrawing external access in the same edit lifts the freeze, which keeps a
+# way out for an instance whose tls.enabled was flipped before this policy;
+# the callers trusted by cozystack-tenant-host-policy are exempt, to repair
+# one without withdrawing it. An instance exposed in plaintext before this
+# policy stays editable otherwise.
+apiVersion: admissionregistration.k8s.io/v1
+kind: ValidatingAdmissionPolicy
+metadata:
+  name: cozystack-database-external-tls-policy
+  labels:
+    internal.cozystack.io/managed-by-cozystack: ""
+spec:
+  failurePolicy: Fail
+  matchConstraints:
+    resourceRules:
+    - apiGroups: ["apps.cozystack.io"]
+      apiVersions: ["v1alpha1"]
+      operations: ["CREATE", "UPDATE"]
+      resources: ["redises"]
+  variables:
+  - name: newExternal
+    expression: >-
+      has(object.spec) && has(object.spec.external) && object.spec.external == true
+  - name: newTLS
+    expression: >-
+      has(object.spec) && has(object.spec.tls) && has(object.spec.tls.enabled) &&
+      object.spec.tls.enabled == true
+  - name: oldExternal
+    expression: >-
+      oldObject != null && has(oldObject.spec) && has(oldObject.spec.external) &&
+      oldObject.spec.external == true
+  - name: oldTLS
+    expression: >-
+      oldObject != null && has(oldObject.spec) && has(oldObject.spec.tls) &&
+      has(oldObject.spec.tls.enabled) && oldObject.spec.tls.enabled == true
+  - name: trustedCaller
+    expression: >-
+      has(request.userInfo.groups) && request.userInfo.groups.exists(g,
+        g == "system:masters" ||
+        g == "system:serviceaccounts:cozy-system" ||
+        g == "system:serviceaccounts:cozy-cert-manager" ||
+        g == "system:serviceaccounts:cozy-fluxcd" ||
+        g == "system:serviceaccounts:kube-system")
+  validations:
+  - expression: >-
+      !variables.newExternal ||
+      (oldObject == null ? variables.newTLS : variables.oldExternal)
+    messageExpression: >-
+      oldObject == null
+        ? "Redis " + object.metadata.name + ": external: true requires tls.enabled: true, because a plaintext endpoint must not be exposed outside the cluster and Redis does not turn TLS on by itself. Set tls.enabled: true or set external: false."
+        : "Redis " + object.metadata.name + ": external access can only be enabled when an instance is created, together with tls.enabled: true, because TLS cannot be added to an existing instance and its spec does not prove which one it has. Keep external: false, or create a new instance with tls.enabled: true and external: true and move the clients to it."
+    reason: Invalid
+  - expression: >-
+      oldObject == null || !(variables.oldExternal && variables.newExternal) ||
+      variables.oldTLS == variables.newTLS || variables.trustedCaller
+    messageExpression: >-
+      "Redis " + object.metadata.name + ": tls.enabled cannot change while external access is on, because TLS is fixed when an instance is created. " +
+      (variables.newTLS ? "" : "Set external: false in the same edit, or ") +
+      "create a new instance with tls.enabled: true and move the clients to it."
+    reason: Invalid
+---
+apiVersion: admissionregistration.k8s.io/v1
+kind: ValidatingAdmissionPolicyBinding
+metadata:
+  name: cozystack-database-external-tls-policy
+  labels:
+    internal.cozystack.io/managed-by-cozystack: ""
+spec:
+  policyName: cozystack-database-external-tls-policy
+  validationActions: [Deny]
+{{- end }}
diff --git a/packages/system/cozystack-basics/templates/gateway-hostname-policy.yaml b/packages/system/cozystack-basics/templates/gateway-hostname-policy.yaml
index 193ac9efab..2dc0e4d75b 100644
--- a/packages/system/cozystack-basics/templates/gateway-hostname-policy.yaml
+++ b/packages/system/cozystack-basics/templates/gateway-hostname-policy.yaml
@@ -1,3 +1,5 @@
+{{- /* Render only where the ValidatingAdmissionPolicy API is served (GA since Kubernetes 1.30; the management cluster requires 1.33+). Same guard as packages/core/platform/templates/deletion-protection.yaml. */}}
+{{- if .Capabilities.APIVersions.Has "admissionregistration.k8s.io/v1/ValidatingAdmissionPolicy" }}
 ---
 apiVersion: admissionregistration.k8s.io/v1
 kind: ValidatingAdmissionPolicy
@@ -25,13 +27,26 @@ spec:
          ? namespaceObject.metadata.labels["namespace.cozystack.io/host"]
          : ""
   validations:
+  # Both operands of the hostname match are normalized with .lowerAscii():
+  # the listener hostname is already lowercase (the CRD pattern permits
+  # nothing else), but tenantHost
+  # comes from the namespace.cozystack.io/host label value, which
+  # Kubernetes permits to carry uppercase. Unlike the Ingress policy this
+  # one never compares against the platform root-host.
+  #
+  # The leading `tenantHost == "" ||` makes this policy fail OPEN when the
+  # host label is absent or empty, unlike its fail-closed siblings. That is
+  # the platform's documented fail-open exception, with its compensating
+  # control and its limits — see docs/security/threat-model.md. Changing
+  # that posture is a security-model decision, not a side effect of
+  # normalizing case, so the behavior is left as it was and pinned by test.
   - expression: >-
       variables.tenantHost == "" ||
       !has(object.spec.listeners) ||
       object.spec.listeners.all(l,
         !has(l.hostname) ||
-        l.hostname == variables.tenantHost ||
-        l.hostname.endsWith("." + variables.tenantHost)
+        l.hostname.lowerAscii() == variables.tenantHost.lowerAscii() ||
+        l.hostname.lowerAscii().endsWith("." + variables.tenantHost.lowerAscii())
       )
     messageExpression: >-
       "Gateway listener hostname must equal " + variables.tenantHost +
@@ -154,3 +169,4 @@ metadata:
 spec:
   policyName: cozystack-namespace-host-label-policy
   validationActions: [Deny]
+{{- end }}
diff --git a/packages/system/cozystack-basics/templates/ingress-hostname-policy.yaml b/packages/system/cozystack-basics/templates/ingress-hostname-policy.yaml
new file mode 100644
index 0000000000..b8373b1dc9
--- /dev/null
+++ b/packages/system/cozystack-basics/templates/ingress-hostname-policy.yaml
@@ -0,0 +1,114 @@
+{{/*
+  cozystack-ingress-hostname-policy
+
+  Legacy-Ingress counterpart of the Gateway and Route hostname VAPs in
+  this package. Gateway API is opt-in and off by default; in the default
+  configuration tenant applications publish through a legacy
+  networking.k8s.io/Ingress (see packages/apps/harbor). This VAP gives
+  the default Ingress path a tenant-scoped hostname constraint, in the
+  same family as the Gateway and Route policies.
+
+  Scope: only Ingresses in tenant-* namespaces are gated. cozy-*
+  namespaces are cluster-admin-managed and trusted to publish under any
+  apex (they back platform services like dashboard, harbor, bucket).
+
+  Rule: a tenant Ingress hostname is allowed when it is within the
+  namespace's own apex (the namespace.cozystack.io/host label), OR when
+  it is a concrete (non-wildcard) name that lies entirely outside the
+  platform root apex (_cluster.root-host) — the latter lets a tenant
+  route its own external custom domain (for example via the kubernetes
+  app's Proxied exposeMethod, which routes a user-supplied domain to a
+  nested cluster). A hostname that falls under the platform root apex but
+  outside the namespace's own apex is rejected; so is a wildcard taken
+  through the outside-root path, because a wildcard such as *.<root-parent>
+  would also match the platform root apex itself. Both hostname carriers
+  are checked:
+   - spec.rules[].host   — routing host. A rule without a host (absent or
+     empty) matches all inbound HTTP on the shared ingress-nginx, an
+     unbounded catch-all, so every rule must carry a non-empty host — a
+     missing or empty host is rejected.
+   - spec.tls[].hosts[]  — TLS SNI hosts.
+  spec.defaultBackend (a catch-all for otherwise-unmatched traffic) is
+  also rejected.
+
+  The policy renders only when _cluster.root-host is set; without it the
+  "outside the root apex" test is undefined and the policy could not
+  constrain anything, so it is omitted rather than shipped in a state
+  that admits everything.
+*/}}
+{{- /*
+  CEL safety note: has() only works on field access expressions, not on
+  top-level variables. namespaceObject is a top-level var supplied by
+  the apiserver, so the nil check uses `== null` first; the nested
+  has() then walks into metadata.labels safely. See the feedback memory
+  cel-has-field-only.md.
+
+  Case handling: every comparison below normalizes both operands with
+  .lowerAscii(), and for this policy that is load-bearing rather than
+  hardening. The resource-side host is always lowercase — kube-apiserver
+  permits only lowercase in spec.rules[].host and spec.tls[].hosts[],
+  wildcards included, and rejects the rest before this VAP runs — but BOTH apex operands can carry
+  uppercase: the namespace.cozystack.io/host label VALUE (Kubernetes
+  permits uppercase in a label value) and the templated root-host, a
+  free-form platform value that nothing validates for case.
+
+  An uppercase root-host is the dangerous direction. The outside-root
+  branch below admits a host lying entirely outside the platform apex,
+  and it decides that by comparing the lowercase host against this
+  templated literal. Un-normalized, that comparison can never match, the
+  exclusion silently stops excluding, and the policy degenerates into
+  "admit any non-wildcard host" — every non-wildcard platform-apex name a
+  tenant asks for is granted, including the root apex itself. Only the
+  anti-wildcard gate still holds.
+
+  A mixed-case apex LABEL is the milder direction: it wrongly denies a
+  tenant its own legitimate in-apex hostname rather than granting it
+  someone else's.
+
+  Defense-in-depth contract: this VAP is fail-closed. A tenant-*
+  namespace without `namespace.cozystack.io/host` is rejected (not
+  silently allowed) so a missing or scrubbed own-apex label cannot open
+  the Ingress path by itself. The only legitimate state where the label
+  is absent is an in-flight namespace creation that hasn't finished
+  labelling yet — in which case the caller should retry.
+*/}}
+{{- $rootHost := index .Values._cluster "root-host" }}
+{{- /* Also gate on the ValidatingAdmissionPolicy API (GA since Kubernetes 1.30; the management cluster requires 1.33+), so a cluster without it does not get an unrenderable resource. Same guard as packages/core/platform/templates/deletion-protection.yaml. */}}
+{{- if and $rootHost (.Capabilities.APIVersions.Has "admissionregistration.k8s.io/v1/ValidatingAdmissionPolicy") }}
+{{- $A := `namespaceObject.metadata.labels["namespace.cozystack.io/host"]` }}
+{{- $celValidator := printf `(namespaceObject == null || !has(namespaceObject.metadata.labels) || !("namespace.cozystack.io/host" in namespaceObject.metadata.labels)) ? false : (!has(object.spec.defaultBackend) && (!has(object.spec.rules) || object.spec.rules.all(r, has(r.host) && r.host != "" && (r.host.lowerAscii() == %s.lowerAscii() || r.host.lowerAscii().endsWith("." + %s.lowerAscii()) || (!r.host.lowerAscii().startsWith("*.") && !(r.host.lowerAscii() == %q.lowerAscii() || r.host.lowerAscii().endsWith(%q.lowerAscii())))))) && (!has(object.spec.tls) || object.spec.tls.all(t, !has(t.hosts) || t.hosts.all(h, h != "" && (h.lowerAscii() == %s.lowerAscii() || h.lowerAscii().endsWith("." + %s.lowerAscii()) || (!h.lowerAscii().startsWith("*.") && !(h.lowerAscii() == %q.lowerAscii() || h.lowerAscii().endsWith(%q.lowerAscii()))))))))` $A $A $rootHost (printf ".%s" $rootHost) $A $A $rootHost (printf ".%s" $rootHost) -}}
+---
+apiVersion: admissionregistration.k8s.io/v1
+kind: ValidatingAdmissionPolicy
+metadata:
+  name: cozystack-ingress-hostname-policy
+  labels:
+    internal.cozystack.io/managed-by-cozystack: ""
+spec:
+  failurePolicy: Fail
+  matchConstraints:
+    resourceRules:
+    - apiGroups: ["networking.k8s.io"]
+      apiVersions: ["v1"]
+      operations: ["CREATE", "UPDATE"]
+      resources: ["ingresses"]
+  matchConditions:
+  - name: tenant-namespace
+    expression: object.metadata.namespace.startsWith("tenant-")
+  validations:
+  - expression: >-
+      {{ $celValidator }}
+    messageExpression: >-
+      "Ingress hostnames must be within the namespace's namespace.cozystack.io/host apex, or be a concrete name outside the platform apex {{ $rootHost }}; a hostname under {{ $rootHost }} but outside the namespace apex, a wildcard taken through the outside-apex path, a rule without a host, and spec.defaultBackend are not allowed (namespace " + object.metadata.namespace + ")"
+    reason: Forbidden
+---
+apiVersion: admissionregistration.k8s.io/v1
+kind: ValidatingAdmissionPolicyBinding
+metadata:
+  name: cozystack-ingress-hostname-policy
+  labels:
+    internal.cozystack.io/managed-by-cozystack: ""
+spec:
+  policyName: cozystack-ingress-hostname-policy
+  validationActions: [Deny]
+{{- end }}
diff --git a/packages/system/cozystack-basics/templates/monitoring-external-services.yaml b/packages/system/cozystack-basics/templates/monitoring-external-services.yaml
index e36540c46a..dcf77c40b0 100644
--- a/packages/system/cozystack-basics/templates/monitoring-external-services.yaml
+++ b/packages/system/cozystack-basics/templates/monitoring-external-services.yaml
@@ -1,3 +1,29 @@
+{{- /*
+  These ExternalName Services live in cozy-monitoring and redirect
+  vlinsert-generic / vminsert-* to the platform monitoring stack the root
+  tenant hosts in tenant-root. They only make sense when tenant-root actually
+  runs that stack (Tenant/root spec.monitoring=true). When it does not, the
+  redirects resolve to nothing: fluent-bit ships to vlinsert-generic and its
+  chunks dead-end at a non-existent tenant-root VictoriaLogs, dropping logs
+  silently (issue #3181).
+
+  Gate on _cluster.monitoring-enabled, fed from the platform
+  monitoring.rootEnabled value. This is the single source of truth: it lands in
+  the cozystack-values Secret, and changing it re-renders this chart (helm-
+  controller watches the Secret referenced by valuesFrom). Do NOT read the live
+  Tenant/root spec.monitoring here: cozystack-basics is an operator-generated
+  HelmRelease with drift detection off, so helm-controller re-renders only on
+  install/upgrade/values-change — never on a reconcile tick or when a `lookup`
+  result changes. A lookup would therefore go stale in both directions when the
+  Tenant CR is toggled out-of-band. Operators must keep monitoring.rootEnabled
+  in sync with Tenant/root spec.monitoring; flipping monitoring.rootEnabled is
+  what refreshes these redirects.
+
+  `default dict` guards a null/absent _cluster (missing Secret / dry-run); the
+  "true" default preserves the historical always-create behaviour for
+  cozystack-values Secrets written before this key existed.
+*/ -}}
+{{- if eq (toString (index (.Values._cluster | default dict) "monitoring-enabled" | default "true")) "true" }}
 ---
 apiVersion: v1
 kind: Service
@@ -25,3 +51,4 @@ metadata:
 spec:
   type: ExternalName
   externalName: vminsert-longterm.tenant-root.svc.cluster.local
+{{- end }}
diff --git a/packages/system/cozystack-basics/templates/route-hostname-policy.yaml b/packages/system/cozystack-basics/templates/route-hostname-policy.yaml
index cde87d2494..00c8df7dc0 100644
--- a/packages/system/cozystack-basics/templates/route-hostname-policy.yaml
+++ b/packages/system/cozystack-basics/templates/route-hostname-policy.yaml
@@ -3,23 +3,32 @@
 
   Layer 7 of the Gateway API security model (see
   packages/extra/gateway/README.md). The Gateway-side VAPs already in
-  this package validate Gateway listener hostnames; this VAP closes
+  this package validate Gateway listener hostnames; these VAPs close
   the same surface at the route level so a tenant carrying RBAC for
-  HTTPRoute / TLSRoute in its own namespace cannot publish hostnames
-  that fall outside its apex.
+  HTTPRoute, TLSRoute or GRPCRoute in its own namespace cannot publish
+  hostnames that fall outside its apex.
 
   Scope: only routes in tenant-* namespaces are gated. cozy-*
   namespaces are cluster-admin-managed and trusted to publish under
   any apex (they back platform services like dashboard, harbor,
   bucket).
 
-  Two pairs of resources are rendered:
-   - VAP + Binding for HTTPRoute (gateway.networking.k8s.io/v1)
-   - VAP + Binding for TLSRoute (gateway.networking.k8s.io/v1alpha2)
+  Three pairs of resources are rendered: a VAP + Binding each for
+  HTTPRoute, TLSRoute and GRPCRoute. Which API versions each one matches
+  is stated once, in the rule itself, rather than restated here. All
+  three share one CEL expression, so every rule stated below about
+  hostnames holds for all three kinds.
 
-  TLSRoute stays at v1alpha2 in Gateway API v1.4–v1.5; its promotion
-  to v1 is tracked upstream and we will follow the rename when it
-  lands.
+  GRPCRoute is gated for the same reason as the other two. The port-443
+  listeners the tenant gateway controller renders pin
+  allowedRoutes.kinds to HTTPRoute and TLSRoute, but the port-80
+  listener leaves kinds unset, and an unset kinds list resolves to
+  whatever the listener protocol supports -- for HTTP that includes
+  GRPCRoute, which carries spec.hostnames of its own.
+
+  Each rule names every version the vendored bundle serves for its
+  resource. hack/route-hostname-policy-version-coverage.bats pins those
+  lists to the bundle and carries the reason a shorter one is unsafe.
 */}}
 {{- /*
   CEL safety note: has() only works on field access expressions, not
@@ -34,8 +43,36 @@
   open Layer 7 by itself. The only legitimate state where the
   label is absent is an in-flight namespace creation that hasn't
   finished labelling yet — in which case the caller should retry.
+
+  spec.hostnames must be present and non-empty, not waved through when
+  missing. A route that names no hostname does not match nothing: under
+  Gateway API it inherits the hostnames of every listener it attaches to.
+  `all()` over an empty list is vacuously true, so the empty list needs
+  the same treatment as the absent field.
+
+  Requiring the route to name its own hostnames is what makes them
+  comparable against the tenant apex at all — CEL has no cross-object
+  lookup, so a VAP cannot resolve the parent Gateway to learn what would
+  otherwise be inherited.
+
+  For two of the three kinds nothing else enforces presence: the
+  httproutes and grpcroutes schemas leave spec.hostnames optional at
+  every version the vendored bundle serves, so this policy is the only
+  rejection a hostname-less route of those kinds meets. tlsroutes is
+  mixed — v1 and v1alpha3 mark the field required with minItems: 1,
+  v1alpha2 marks neither — so there too the policy is what closes the
+  gap while v1alpha2 is served.
 */}}
-{{- $celValidator := `(namespaceObject == null || !has(namespaceObject.metadata.labels) || !("namespace.cozystack.io/host" in namespaceObject.metadata.labels)) ? false : (!has(object.spec.hostnames) || object.spec.hostnames.all(h, h == namespaceObject.metadata.labels["namespace.cozystack.io/host"] || h.endsWith("." + namespaceObject.metadata.labels["namespace.cozystack.io/host"])))` -}}
+{{- /*
+  Both operands of the hostname comparison are normalized with
+  .lowerAscii() as defense-in-depth: the route hostname is already
+  lowercase (the CRD pattern permits nothing else), but the apex operand is the
+  namespace.cozystack.io/host label value, which Kubernetes permits to
+  carry uppercase.
+*/}}
+{{- $celValidator := `(namespaceObject == null || !has(namespaceObject.metadata.labels) || !("namespace.cozystack.io/host" in namespaceObject.metadata.labels)) ? false : (has(object.spec.hostnames) && size(object.spec.hostnames) > 0 && object.spec.hostnames.all(h, h.lowerAscii() == namespaceObject.metadata.labels["namespace.cozystack.io/host"].lowerAscii() || h.lowerAscii().endsWith("." + namespaceObject.metadata.labels["namespace.cozystack.io/host"].lowerAscii())))` -}}
+{{- /* Render only where the ValidatingAdmissionPolicy API is served (GA since Kubernetes 1.30; the management cluster requires 1.33+). Same guard as packages/core/platform/templates/deletion-protection.yaml. */}}
+{{- if .Capabilities.APIVersions.Has "admissionregistration.k8s.io/v1/ValidatingAdmissionPolicy" }}
 ---
 apiVersion: admissionregistration.k8s.io/v1
 kind: ValidatingAdmissionPolicy
@@ -58,7 +95,7 @@ spec:
   - expression: >-
       {{ $celValidator }}
     messageExpression: >-
-      "HTTPRoute hostnames must equal the namespace's namespace.cozystack.io/host label or be subdomains of it (namespace " + object.metadata.namespace + ")"
+      "HTTPRoute must declare spec.hostnames, and each hostname must equal the namespace's namespace.cozystack.io/host label or be a subdomain of it (namespace " + object.metadata.namespace + ")"
     reason: Forbidden
 ---
 apiVersion: admissionregistration.k8s.io/v1
@@ -82,7 +119,7 @@ spec:
   matchConstraints:
     resourceRules:
     - apiGroups: ["gateway.networking.k8s.io"]
-      apiVersions: ["v1alpha2"]
+      apiVersions: ["v1", "v1alpha2", "v1alpha3"]
       operations: ["CREATE", "UPDATE"]
       resources: ["tlsroutes"]
   matchConditions:
@@ -92,7 +129,7 @@ spec:
   - expression: >-
       {{ $celValidator }}
     messageExpression: >-
-      "TLSRoute hostnames must equal the namespace's namespace.cozystack.io/host label or be subdomains of it (namespace " + object.metadata.namespace + ")"
+      "TLSRoute must declare spec.hostnames, and each hostname must equal the namespace's namespace.cozystack.io/host label or be a subdomain of it (namespace " + object.metadata.namespace + ")"
     reason: Forbidden
 ---
 apiVersion: admissionregistration.k8s.io/v1
@@ -104,3 +141,38 @@ metadata:
 spec:
   policyName: cozystack-route-hostname-policy-tls
   validationActions: [Deny]
+---
+apiVersion: admissionregistration.k8s.io/v1
+kind: ValidatingAdmissionPolicy
+metadata:
+  name: cozystack-route-hostname-policy-grpc
+  labels:
+    internal.cozystack.io/managed-by-cozystack: ""
+spec:
+  failurePolicy: Fail
+  matchConstraints:
+    resourceRules:
+    - apiGroups: ["gateway.networking.k8s.io"]
+      apiVersions: ["v1"]
+      operations: ["CREATE", "UPDATE"]
+      resources: ["grpcroutes"]
+  matchConditions:
+  - name: tenant-namespace
+    expression: object.metadata.namespace.startsWith("tenant-")
+  validations:
+  - expression: >-
+      {{ $celValidator }}
+    messageExpression: >-
+      "GRPCRoute must declare spec.hostnames, and each hostname must equal the namespace's namespace.cozystack.io/host label or be a subdomain of it (namespace " + object.metadata.namespace + ")"
+    reason: Forbidden
+---
+apiVersion: admissionregistration.k8s.io/v1
+kind: ValidatingAdmissionPolicyBinding
+metadata:
+  name: cozystack-route-hostname-policy-grpc
+  labels:
+    internal.cozystack.io/managed-by-cozystack: ""
+spec:
+  policyName: cozystack-route-hostname-policy-grpc
+  validationActions: [Deny]
+{{- end }}
diff --git a/packages/system/cozystack-basics/tests/clusterroles-options_test.yaml b/packages/system/cozystack-basics/tests/clusterroles-options_test.yaml
new file mode 100644
index 0000000000..f64c152765
--- /dev/null
+++ b/packages/system/cozystack-basics/tests/clusterroles-options_test.yaml
@@ -0,0 +1,108 @@
+suite: cozystack-basics tenant ClusterRoles grant read on core.cozystack.io options
+
+templates:
+  - templates/clusterroles.yaml
+
+release:
+  name: cozystack-basics
+  namespace: cozy-system
+
+# The dashboard's dynamic dropdowns (x-cozystack-options) read the virtual
+# core.cozystack.io/options resource. The tenant view aggregation must grant
+# read on it so every access level from view upward can populate dropdowns;
+# the apiserver-side grant is moot for human tenants without this.
+tests:
+  - it: cozy:tenant:view:base grants read on core.cozystack.io options and taps
+    documentSelector:
+      path: metadata.name
+      value: cozy:tenant:view:base
+    asserts:
+      - contains:
+          path: rules
+          content:
+            apiGroups: ["core.cozystack.io"]
+            resources: ["options", "taps"]
+            verbs: ["get", "list", "watch"]
+
+  # The tenant ServiceAccount role carries its own core.cozystack.io grant, so
+  # the marketplace taps listing has to be added there too or the dashboard's
+  # tap views are empty for the tenant's own controllers.
+  - it: cozy:tenant:base grants read on core.cozystack.io options and taps
+    documentSelector:
+      path: metadata.name
+      value: cozy:tenant:base
+    asserts:
+      - contains:
+          path: rules
+          content:
+            apiGroups: ["core.cozystack.io"]
+            resources: ["tenantmodules", "tenantsecrets", "options", "taps"]
+            verbs: ["get", "list", "watch"]
+
+  - it: cozy:tenant:base grants full access on sdn.cozystack.io securitygroups
+    documentSelector:
+      path: metadata.name
+      value: cozy:tenant:base
+    asserts:
+      - contains:
+          path: rules
+          content:
+            apiGroups: ["sdn.cozystack.io"]
+            resources: ["securitygroups"]
+            verbs: ['*']
+
+  - it: cozy:tenant:view:base grants read on sdn.cozystack.io securitygroups
+    documentSelector:
+      path: metadata.name
+      value: cozy:tenant:view:base
+    asserts:
+      - contains:
+          path: rules
+          content:
+            apiGroups: ["sdn.cozystack.io"]
+            resources: ["securitygroups"]
+            verbs: ["get", "list", "watch"]
+
+  # A tenant must be able to READ the ScaledObject + keda-hpa-<release> HPA that
+  # govern autoscaling of their own database, or the FailedGetExternalMetric /
+  # TriggerError that keeps a misconfigured autoscaler from actuating is invisible
+  # to them (it otherwise surfaces only in a root-scoped alert). Read verbs only.
+  - it: cozy:tenant:view:base grants read on keda.sh scaledobjects
+    documentSelector:
+      path: metadata.name
+      value: cozy:tenant:view:base
+    asserts:
+      - contains:
+          path: rules
+          content:
+            apiGroups: ["keda.sh"]
+            resources: ["scaledobjects"]
+            verbs: ["get", "list", "watch"]
+
+  - it: cozy:tenant:view:base grants read on autoscaling horizontalpodautoscalers
+    documentSelector:
+      path: metadata.name
+      value: cozy:tenant:view:base
+    asserts:
+      - contains:
+          path: rules
+          content:
+            apiGroups: ["autoscaling"]
+            resources: ["horizontalpodautoscalers"]
+            verbs: ["get", "list", "watch"]
+
+  # cozy:tenant:base aggregates only into the tenant ServiceAccount role, so the
+  # human admin/super-admin tiers need their own securitygroups write grant —
+  # mirroring how apps.cozystack.io is granted at admin:base — or a tenant admin
+  # could read but never manage their own SecurityGroups.
+  - it: cozy:tenant:admin:base grants write on sdn.cozystack.io securitygroups
+    documentSelector:
+      path: metadata.name
+      value: cozy:tenant:admin:base
+    asserts:
+      - contains:
+          path: rules
+          content:
+            apiGroups: ["sdn.cozystack.io"]
+            resources: ["securitygroups"]
+            verbs: ["create", "update", "patch", "delete"]
diff --git a/packages/system/cozystack-basics/tests/clusterroles-tenant-admin-aggregation_test.yaml b/packages/system/cozystack-basics/tests/clusterroles-tenant-admin-aggregation_test.yaml
new file mode 100644
index 0000000000..35843ba36a
--- /dev/null
+++ b/packages/system/cozystack-basics/tests/clusterroles-tenant-admin-aggregation_test.yaml
@@ -0,0 +1,36 @@
+suite: cozystack-basics tenant admin aggregation stays open to out-of-chart grants
+
+templates:
+  - templates/clusterroles.yaml
+
+release:
+  name: cozystack-basics
+  namespace: cozy-system
+
+# cozy:tenant:admin:base enumerates the apps.cozystack.io resources a tenant
+# owner may write, so an application removed from the catalog loses its entry
+# there. Platform migration 57 re-grants a removed application's kind on the
+# clusters that still run an instance, by applying its own ClusterRole under the
+# label below. Change the label or turn cozy:tenant:admin into a plain role and
+# that grant silently stops reaching anyone, on exactly the clusters whose
+# owners need it to remove what they have left.
+tests:
+  - it: cozy:tenant:admin aggregates every ClusterRole labelled for tenant admin
+    documentSelector:
+      path: metadata.name
+      value: cozy:tenant:admin
+    asserts:
+      - contains:
+          path: aggregationRule.clusterRoleSelectors
+          content:
+            matchLabels:
+              rbac.cozystack.io/aggregate-to-tenant-admin: "true"
+
+  - it: cozy:tenant:admin:base reaches tenant admins through that same label
+    documentSelector:
+      path: metadata.name
+      value: cozy:tenant:admin:base
+    asserts:
+      - equal:
+          path: metadata.labels["rbac.cozystack.io/aggregate-to-tenant-admin"]
+          value: "true"
diff --git a/packages/system/cozystack-basics/tests/dashboard-role_test.yaml b/packages/system/cozystack-basics/tests/dashboard-role_test.yaml
new file mode 100644
index 0000000000..115c8239de
--- /dev/null
+++ b/packages/system/cozystack-basics/tests/dashboard-role_test.yaml
@@ -0,0 +1,27 @@
+suite: cozystack-basics tenant dashboard Role grants read on cozy-public resources
+
+templates:
+  - templates/dashboard-role.yaml
+
+release:
+  name: cozystack-basics
+  namespace: cozy-system
+
+# The vm-disk source image dropdown reads the image option source from
+# cozystack-api, which lists the goldens with its own identity and leaves out
+# those whose import failed. Tenants need no read on cozy-public PVCs for it.
+tests:
+  - it: cozy:tenant:dashboard grants no read on persistentvolumeclaims in cozy-public
+    documentSelector:
+      path: metadata.name
+      value: cozy:tenant:dashboard
+    asserts:
+      - equal:
+          path: metadata.namespace
+          value: cozy-public
+      - notContains:
+          path: rules
+          content:
+            apiGroups: [""]
+            resources: ["persistentvolumeclaims"]
+          any: true
diff --git a/packages/system/cozystack-basics/tests/database-external-tls-policy_test.yaml b/packages/system/cozystack-basics/tests/database-external-tls-policy_test.yaml
new file mode 100644
index 0000000000..9bd0b5d199
--- /dev/null
+++ b/packages/system/cozystack-basics/tests/database-external-tls-policy_test.yaml
@@ -0,0 +1,34 @@
+suite: database external-TLS policy renders with its binding
+templates:
+  - templates/database-external-tls-policy.yaml
+release:
+  name: cozystack-basics
+  namespace: cozy-system
+# The policy's decisions are evaluated by
+# pkg/registry/apps/application/external_tls_policy_test.go, which compiles
+# this template with the apiserver's own CEL compiler; this suite covers the
+# render: both documents come out and the binding denies on this policy.
+capabilities:
+  apiVersions:
+    - admissionregistration.k8s.io/v1/ValidatingAdmissionPolicy
+tests:
+  - it: renders the policy and a Deny binding to it
+    asserts:
+      - hasDocuments:
+          count: 2
+      - documentIndex: 0
+        equal:
+          path: kind
+          value: ValidatingAdmissionPolicy
+      - documentIndex: 0
+        equal:
+          path: metadata.name
+          value: cozystack-database-external-tls-policy
+      - documentIndex: 1
+        equal:
+          path: spec.policyName
+          value: cozystack-database-external-tls-policy
+      - documentIndex: 1
+        equal:
+          path: spec.validationActions
+          value: [Deny]
diff --git a/packages/system/cozystack-basics/tests/gateway-hostname-policy_test.yaml b/packages/system/cozystack-basics/tests/gateway-hostname-policy_test.yaml
index 50940dee43..d1d1bef40d 100644
--- a/packages/system/cozystack-basics/tests/gateway-hostname-policy_test.yaml
+++ b/packages/system/cozystack-basics/tests/gateway-hostname-policy_test.yaml
@@ -19,6 +19,13 @@ release:
 # Both gates are dropped; inheritance now flows via the label
 # selector on Gateway.spec.listeners[].allowedRoutes.
 
+# The template now gates on the ValidatingAdmissionPolicy API (GA since
+# Kubernetes 1.30); helm-unittest's default capability set omits it, so every
+# rendering test declares it, exactly as the platform deletion-protection suite.
+capabilities:
+  apiVersions:
+    - admissionregistration.k8s.io/v1/ValidatingAdmissionPolicy
+
 tests:
   - it: renders 3 VAPs + 3 Bindings (6 documents total)
     asserts:
@@ -68,11 +75,52 @@ tests:
       - documentIndex: 0
         matchRegex:
           path: spec.validations[0].expression
-          pattern: 'l\.hostname\.endsWith'
+          pattern: 'l\.hostname\.lowerAscii\(\)\.endsWith'
       - documentIndex: 0
         matchRegex:
           path: spec.validations[0].expression
           pattern: 'variables\.tenantHost'
+      # Both operands normalized with lowerAscii() — tenantHost comes from
+      # the label value, which may carry uppercase even though the listener
+      # hostname is lowercase-only. Unlike the Ingress policy this one never
+      # compares against the platform root host, so the normalization here
+      # only stops a mixed-case apex from wrongly denying a tenant its own
+      # listener.
+      #
+      # Both comparisons are pinned as whole operand PAIRS. This policy has
+      # no runtime probe of its own — it relies on these renderings — so a
+      # pattern matching a lone `.lowerAscii()` somewhere in the expression
+      # would let either operand lose its normalization unnoticed.
+      - documentIndex: 0
+        matchRegex:
+          path: spec.validations[0].expression
+          pattern: 'l\.hostname\.lowerAscii\(\) == variables\.tenantHost\.lowerAscii\(\)'
+      - documentIndex: 0
+        matchRegex:
+          path: spec.validations[0].expression
+          pattern: 'l\.hostname\.lowerAscii\(\)\.endsWith\("\." \+ variables\.tenantHost\.lowerAscii\(\)\)'
+
+  - it: cozystack-gateway-hostname-policy admits any listener hostname when the host label is absent or empty
+    # Pins the documented fail-open exception, so that changing it has to be
+    # a deliberate act rather than a silent one. The leading
+    # `tenantHost == "" ||` admits a Gateway with any listener hostname when
+    # the namespace.cozystack.io/host label is absent or empty — the
+    # opposite of the sibling Route and Ingress policies, which fail closed
+    # on the same input. docs/security/threat-model.md records this as the
+    # platform's one fail-open exception and states that the Gateway-side
+    # guarantee is conditional on the label being present; the compensating
+    # control is that the platform sets the label at tenant creation and the
+    # host-label policy keeps it immutable. This test asserts the shape the
+    # threat model describes, so that a change to the posture shows up here
+    # and gets made against that document rather than by accident.
+    asserts:
+      # Anchored: the empty-host short-circuit must be the FIRST operand, and
+      # `||` is what makes it admit. Rewriting it to the siblings' fail-closed
+      # `tenantHost == "" ? false :` breaks this pattern, which is the point.
+      - documentIndex: 0
+        matchRegex:
+          path: spec.validations[0].expression
+          pattern: '^variables\.tenantHost == "" \|\|'
 
   - it: cozystack-gateway-hostname-policy Binding is fail-closed (validationActions Deny)
     asserts:
diff --git a/packages/system/cozystack-basics/tests/hostname-policies-capability-gate_test.yaml b/packages/system/cozystack-basics/tests/hostname-policies-capability-gate_test.yaml
new file mode 100644
index 0000000000..61b8be5072
--- /dev/null
+++ b/packages/system/cozystack-basics/tests/hostname-policies-capability-gate_test.yaml
@@ -0,0 +1,34 @@
+suite: cozystack-basics VAP policies are gated on the ValidatingAdmissionPolicy API
+templates:
+  - templates/route-hostname-policy.yaml
+  - templates/gateway-hostname-policy.yaml
+  - templates/ingress-hostname-policy.yaml
+  - templates/database-external-tls-policy.yaml
+release:
+  name: cozystack-basics
+  namespace: cozy-system
+# root-host is set so the ingress policy's own value gate passes; with it set,
+# the only reason any of these templates render nothing is the missing
+# ValidatingAdmissionPolicy API declared below. helm-unittest's per-test
+# capabilities merge rather than replace the suite's, so the absent case is a
+# separate suite pinned at suite level (mirrors the platform notes gate suite).
+set:
+  _cluster:
+    root-host: example.org
+capabilities:
+  apiVersions: []
+tests:
+  - it: none of the VAP policies render when the API is unavailable
+    asserts:
+      - hasDocuments:
+          count: 0
+        template: templates/route-hostname-policy.yaml
+      - hasDocuments:
+          count: 0
+        template: templates/gateway-hostname-policy.yaml
+      - hasDocuments:
+          count: 0
+        template: templates/ingress-hostname-policy.yaml
+      - hasDocuments:
+          count: 0
+        template: templates/database-external-tls-policy.yaml
diff --git a/packages/system/cozystack-basics/tests/ingress-hostname-policy_test.yaml b/packages/system/cozystack-basics/tests/ingress-hostname-policy_test.yaml
new file mode 100644
index 0000000000..abf109795d
--- /dev/null
+++ b/packages/system/cozystack-basics/tests/ingress-hostname-policy_test.yaml
@@ -0,0 +1,302 @@
+suite: cozystack-ingress-hostname-policy VAP
+templates:
+  - templates/ingress-hostname-policy.yaml
+
+release:
+  name: cozystack-basics
+  namespace: cozy-system
+
+# The policy templates the platform root apex (_cluster.root-host) into
+# its CEL and renders only when that value is set, so every rendering
+# test supplies it. RFC 2606 example.org stands in for the platform apex.
+set:
+  _cluster:
+    root-host: example.org
+
+# The template now also gates on the ValidatingAdmissionPolicy API (GA since
+# Kubernetes 1.30); helm-unittest's default capability set omits it, so every
+# rendering test declares it, exactly as the platform deletion-protection suite.
+capabilities:
+  apiVersions:
+    - admissionregistration.k8s.io/v1/ValidatingAdmissionPolicy
+
+tests:
+  - it: renders ValidatingAdmissionPolicy + Binding for legacy Ingress
+    # Legacy Ingress (networking.k8s.io/v1) is the default ingress path
+    # when Gateway API is off. This template gates that path in the same
+    # family as the Gateway/route VAPs: 1 VAP + 1 Binding = 2 docs total.
+    asserts:
+      - hasDocuments:
+          count: 2
+      - documentIndex: 0
+        equal:
+          path: kind
+          value: ValidatingAdmissionPolicy
+      - documentIndex: 0
+        equal:
+          path: metadata.name
+          value: cozystack-ingress-hostname-policy
+      - documentIndex: 1
+        equal:
+          path: kind
+          value: ValidatingAdmissionPolicyBinding
+      - documentIndex: 1
+        equal:
+          path: metadata.name
+          value: cozystack-ingress-hostname-policy
+
+  - it: gates on tenant-* namespace prefix via matchConditions
+    asserts:
+      - documentIndex: 0
+        equal:
+          path: spec.matchConditions[0].name
+          value: tenant-namespace
+      - documentIndex: 0
+        equal:
+          path: spec.matchConditions[0].expression
+          value: object.metadata.namespace.startsWith("tenant-")
+
+  - it: targets networking.k8s.io v1 Ingress on CREATE and UPDATE
+    asserts:
+      - documentIndex: 0
+        equal:
+          path: spec.matchConstraints.resourceRules[0].apiGroups
+          value: ["networking.k8s.io"]
+      - documentIndex: 0
+        equal:
+          path: spec.matchConstraints.resourceRules[0].apiVersions
+          value: ["v1"]
+      - documentIndex: 0
+        equal:
+          path: spec.matchConstraints.resourceRules[0].resources
+          value: ["ingresses"]
+      - documentIndex: 0
+        equal:
+          path: spec.matchConstraints.resourceRules[0].operations
+          value: ["CREATE", "UPDATE"]
+
+  - it: validates both rules[].host and tls[].hosts against namespace.cozystack.io/host label
+    asserts:
+      - documentIndex: 0
+        matchRegex:
+          path: spec.validations[0].expression
+          pattern: 'object\.spec\.rules\.all\(r,'
+      - documentIndex: 0
+        matchRegex:
+          path: spec.validations[0].expression
+          pattern: 'object\.spec\.tls\.all\(t,'
+      - documentIndex: 0
+        matchRegex:
+          path: spec.validations[0].expression
+          pattern: 't\.hosts\.all\(h,'
+      - documentIndex: 0
+        matchRegex:
+          path: spec.validations[0].expression
+          pattern: 'namespace\.cozystack\.io/host'
+
+  - it: normalizes both operands of every comparison with lowerAscii
+    # The resource-side host is already lowercase, but the apex
+    # operand is the namespace.cozystack.io/host label VALUE, which
+    # Kubernetes permits to carry uppercase.
+    #
+    # Each pattern pins a whole operand PAIR, not a lone `.lowerAscii()`
+    # anywhere in the expression: the apex label appears four times here
+    # (equality and endsWith, on the rules[].host and tls[].hosts[]
+    # branches), so a pattern that merely looks for a normalized label
+    # still matches when one of the four loses its normalization. Pin the
+    # exact comparison each time, so dropping any single operand is caught.
+    asserts:
+      # rules[].host — exact apex match, then dot-bounded subdomain.
+      - documentIndex: 0
+        matchRegex:
+          path: spec.validations[0].expression
+          pattern: 'r\.host\.lowerAscii\(\) == namespaceObject\.metadata\.labels\["namespace\.cozystack\.io/host"\]\.lowerAscii\(\)'
+      - documentIndex: 0
+        matchRegex:
+          path: spec.validations[0].expression
+          pattern: 'r\.host\.lowerAscii\(\)\.endsWith\("\." \+ namespaceObject\.metadata\.labels\["namespace\.cozystack\.io/host"\]\.lowerAscii\(\)\)'
+      # tls[].hosts[] — the same two comparisons, denying on their own.
+      - documentIndex: 0
+        matchRegex:
+          path: spec.validations[0].expression
+          pattern: 'h\.lowerAscii\(\) == namespaceObject\.metadata\.labels\["namespace\.cozystack\.io/host"\]\.lowerAscii\(\)'
+      - documentIndex: 0
+        matchRegex:
+          path: spec.validations[0].expression
+          pattern: 'h\.lowerAscii\(\)\.endsWith\("\." \+ namespaceObject\.metadata\.labels\["namespace\.cozystack\.io/host"\]\.lowerAscii\(\)\)'
+      # The templated root-host literal, on both branches.
+      - documentIndex: 0
+        matchRegex:
+          path: spec.validations[0].expression
+          pattern: '"example\.org"\.lowerAscii\(\)'
+
+  - it: normalizes an uppercase templated root apex so the outside-root escape stays closed
+    # _cluster.root-host is a free-form platform value with no lowercase
+    # validation, so an operator can set Example.ORG. The outside-root branch
+    # admits any non-wildcard host that is NOT under the root apex, and it
+    # compares against this templated literal. Un-normalized, the comparison
+    # never matches a real (lowercase) host, the exclusion silently stops
+    # excluding, and the policy degenerates into "admit any non-wildcard host"
+    # — a tenant could then take a hostname under the platform apex that
+    # belongs to another tenant. Rendering with an uppercase root is the only
+    # way to pin that; every other case here renders the lowercase default and
+    # would pass either way.
+    set:
+      _cluster:
+        root-host: Example.ORG
+    asserts:
+      # All four occurrences are pinned as whole operand pairs — equality and
+      # endsWith, on the rules[].host and tls[].hosts[] branches. A pattern
+      # that merely looks for a normalized root literal somewhere would still
+      # match with one of the four stripped: leaving the suffix operands
+      # normalized while dropping the equality ones makes the outside-root
+      # branch admit the bare root apex itself.
+      - documentIndex: 0
+        matchRegex:
+          path: spec.validations[0].expression
+          pattern: 'r\.host\.lowerAscii\(\) == "Example\.ORG"\.lowerAscii\(\)'
+      - documentIndex: 0
+        matchRegex:
+          path: spec.validations[0].expression
+          pattern: 'r\.host\.lowerAscii\(\)\.endsWith\("\.Example\.ORG"\.lowerAscii\(\)\)'
+      - documentIndex: 0
+        matchRegex:
+          path: spec.validations[0].expression
+          pattern: 'h\.lowerAscii\(\) == "Example\.ORG"\.lowerAscii\(\)'
+      - documentIndex: 0
+        matchRegex:
+          path: spec.validations[0].expression
+          pattern: 'h\.lowerAscii\(\)\.endsWith\("\.Example\.ORG"\.lowerAscii\(\)\)'
+
+  - it: allows a hostname outside the platform root apex (external custom domain)
+    # Narrow rule: a tenant may route its own domain that lies entirely
+    # outside the platform root apex (templated from _cluster.root-host).
+    # Pin the not-under-root clause for both rules and tls so this
+    # allowance is not silently dropped — it is the path the kubernetes
+    # app's Proxied exposeMethod relies on to route a user-supplied domain.
+    asserts:
+      - documentIndex: 0
+        matchRegex:
+          path: spec.validations[0].expression
+          pattern: '!\(r\.host\.lowerAscii\(\) == "example\.org"\.lowerAscii\(\) \|\| r\.host\.lowerAscii\(\)\.endsWith\("\.example\.org"\.lowerAscii\(\)\)\)'
+      - documentIndex: 0
+        matchRegex:
+          path: spec.validations[0].expression
+          pattern: '!\(h\.lowerAscii\(\) == "example\.org"\.lowerAscii\(\) \|\| h\.lowerAscii\(\)\.endsWith\("\.example\.org"\.lowerAscii\(\)\)\)'
+
+  - it: does not let a wildcard use the outside-root path (would match the platform apex)
+    # A wildcard on the root's parent label (e.g. *.org when root is
+    # example.org) is "outside root" by the plain string test but matches
+    # the bare platform apex at ingress-nginx. The outside-root branch is
+    # therefore gated on the host not being a wildcard, so such a host is
+    # denied (a wildcard is only admitted when it is under the own apex).
+    asserts:
+      - documentIndex: 0
+        matchRegex:
+          path: spec.validations[0].expression
+          pattern: '!r\.host\.lowerAscii\(\)\.startsWith\("\*\."\) && !\(r\.host\.lowerAscii\(\) == "example\.org"\.lowerAscii\(\)'
+      - documentIndex: 0
+        matchRegex:
+          path: spec.validations[0].expression
+          pattern: '!h\.lowerAscii\(\)\.startsWith\("\*\."\) && !\(h\.lowerAscii\(\) == "example\.org"\.lowerAscii\(\)'
+
+  - it: allows a wildcard under the own apex (own-apex path is not wildcard-gated)
+    # The !startsWith("*.") gate applies ONLY to the outside-root branch.
+    # A wildcard under the tenant's own apex (e.g. *.test.example.org)
+    # reaches the allow via the own-apex endsWith clause, which is a
+    # standalone disjunct BEFORE the wildcard-gated group. Pin that
+    # ordering so a future "gate all wildcards" change cannot silently
+    # deny an own-apex wildcard cert.
+    asserts:
+      - documentIndex: 0
+        matchRegex:
+          path: spec.validations[0].expression
+          pattern: 'r\.host\.lowerAscii\(\)\.endsWith\("\." \+ namespaceObject\.metadata\.labels\["namespace\.cozystack\.io/host"\]\.lowerAscii\(\)\) \|\| \(!r\.host\.lowerAscii\(\)\.startsWith\("\*\."\)'
+      - documentIndex: 0
+        matchRegex:
+          path: spec.validations[0].expression
+          pattern: 'h\.lowerAscii\(\)\.endsWith\("\." \+ namespaceObject\.metadata\.labels\["namespace\.cozystack\.io/host"\]\.lowerAscii\(\)\) \|\| \(!h\.lowerAscii\(\)\.startsWith\("\*\."\)'
+
+  - it: rejects a hostless or empty-host catch-all rule
+    # A legacy Ingress rule with no .host (absent OR empty string) matches
+    # ALL inbound HTTP on the shared ingress-nginx — an unbounded catch-all.
+    # Unlike a Gateway route (bounded by its parent Gateway's
+    # already-validated listeners), such a rule has no bound, so every rule
+    # MUST carry a non-empty host. Pin both has(r.host) and r.host != "" —
+    # the empty-string guard matters because an empty host would otherwise
+    # satisfy the "outside the root apex" branch and be admitted.
+    asserts:
+      - documentIndex: 0
+        matchRegex:
+          path: spec.validations[0].expression
+          pattern: 'object\.spec\.rules\.all\(r,\s*has\(r\.host\) && r\.host != ""'
+      - documentIndex: 0
+        matchRegex:
+          path: spec.validations[0].expression
+          pattern: 't\.hosts\.all\(h,\s*h != ""'
+
+  - it: rejects a tenant Ingress default backend (a catch-all for unmatched traffic)
+    asserts:
+      - documentIndex: 0
+        matchRegex:
+          path: spec.validations[0].expression
+          pattern: '!has\(object\.spec\.defaultBackend\)'
+
+  - it: validation actions are Deny so requests fail closed
+    asserts:
+      - documentIndex: 1
+        equal:
+          path: spec.validationActions
+          value: [Deny]
+
+  - it: failurePolicy is Fail so admission errors deny instead of allow
+    asserts:
+      - documentIndex: 0
+        equal:
+          path: spec.failurePolicy
+          value: Fail
+
+  - it: CEL is fail-closed when namespace has no host label (returns false, not true)
+    # Regression guard mirroring the route policy: a tenant-* namespace
+    # missing its own-apex namespace.cozystack.io/host label must be
+    # DENIED, not silently allowed. Pin the false branch and the exact
+    # nil-guard structure so nobody flips it back without a test failure.
+    asserts:
+      - documentIndex: 0
+        matchRegex:
+          path: spec.validations[0].expression
+          pattern: '\)\s*\?\s*false\s*:'
+      - documentIndex: 0
+        matchRegex:
+          path: spec.validations[0].expression
+          pattern: 'namespaceObject\s*==\s*null'
+      - documentIndex: 0
+        matchRegex:
+          path: spec.validations[0].expression
+          pattern: '!has\(namespaceObject\.metadata\.labels\)'
+      - documentIndex: 0
+        matchRegex:
+          path: spec.validations[0].expression
+          pattern: '!\("namespace\.cozystack\.io/host" in namespaceObject\.metadata\.labels\)'
+
+  - it: reason is Forbidden and message references the host label
+    asserts:
+      - documentIndex: 0
+        equal:
+          path: spec.validations[0].reason
+          value: Forbidden
+      - documentIndex: 0
+        matchRegex:
+          path: spec.validations[0].messageExpression
+          pattern: 'namespace\.cozystack\.io/host'
+
+  - it: omits the policy when the platform root apex is unset (no fail-open)
+    # Without _cluster.root-host the "outside the root apex" test is
+    # undefined, so the policy could not constrain anything. Render nothing
+    # rather than ship a policy that would admit every hostname.
+    set:
+      _cluster:
+        root-host: ""
+    asserts:
+      - hasDocuments:
+          count: 0
diff --git a/packages/system/cozystack-basics/tests/monitoring-external-services_test.yaml b/packages/system/cozystack-basics/tests/monitoring-external-services_test.yaml
new file mode 100644
index 0000000000..ec961de314
--- /dev/null
+++ b/packages/system/cozystack-basics/tests/monitoring-external-services_test.yaml
@@ -0,0 +1,81 @@
+suite: monitoring ExternalName redirects in cozy-monitoring
+templates:
+  - templates/monitoring-external-services.yaml
+
+release:
+  name: cozystack-basics
+  namespace: cozy-system
+
+# The vlinsert-generic / vminsert-shortterm / vminsert-longterm ExternalName
+# Services redirect cozy-monitoring at the platform monitoring stack the root
+# tenant hosts in tenant-root. They only resolve when the root tenant actually
+# runs that stack (Tenant/root spec.monitoring=true). When it is off the
+# redirects dead-end and fluent-bit silently drops logs (issue #3181), so they
+# must NOT be rendered.
+#
+# The render is gated solely on _cluster.monitoring-enabled (fed from the
+# platform monitoring.rootEnabled value; operators keep it in sync with
+# Tenant/root spec.monitoring). The "true" default preserves the historical
+# always-create behaviour for cozystack-values Secrets written before the key
+# existed, and a null _cluster must not panic. The cases below pin the full
+# contract: enabled, disabled, default, and the nil guard.
+tests:
+  - it: renders all three ExternalName redirects when monitoring-enabled is "true"
+    set:
+      _cluster:
+        monitoring-enabled: "true"
+    asserts:
+      - hasDocuments:
+          count: 3
+      - equal:
+          path: metadata.name
+          value: vlinsert-generic
+        documentIndex: 0
+      - equal:
+          path: metadata.namespace
+          value: cozy-monitoring
+        documentIndex: 0
+      - equal:
+          path: metadata.name
+          value: vminsert-shortterm
+        documentIndex: 1
+      - equal:
+          path: metadata.name
+          value: vminsert-longterm
+        documentIndex: 2
+
+  - it: keeps the redirects (default) when monitoring-enabled is absent
+    asserts:
+      - hasDocuments:
+          count: 3
+
+  - it: omits all redirects when monitoring-enabled is "false"
+    set:
+      _cluster:
+        monitoring-enabled: "false"
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  # Guard: a null _cluster (missing cozystack-values Secret / dry-run) must not
+  # panic the render; `index (.Values._cluster | default dict) ...` falls back
+  # to the "true" default and keeps the redirects.
+  - it: keeps the redirects (no panic) when _cluster is null
+    set:
+      _cluster: null
+    asserts:
+      - hasDocuments:
+          count: 3
+
+  - it: vlinsert-generic still points at tenant-root when rendered
+    set:
+      _cluster:
+        monitoring-enabled: "true"
+    documentIndex: 0
+    asserts:
+      - equal:
+          path: spec.type
+          value: ExternalName
+      - equal:
+          path: spec.externalName
+          value: vlinsert-generic.tenant-root.svc.cluster.local
diff --git a/packages/system/cozystack-basics/tests/route-hostname-policy_test.yaml b/packages/system/cozystack-basics/tests/route-hostname-policy_test.yaml
index 36f87c7a47..9d33d6569d 100644
--- a/packages/system/cozystack-basics/tests/route-hostname-policy_test.yaml
+++ b/packages/system/cozystack-basics/tests/route-hostname-policy_test.yaml
@@ -6,18 +6,25 @@ release:
   name: cozystack-basics
   namespace: cozy-system
 
+# The template now gates on the ValidatingAdmissionPolicy API (GA since
+# Kubernetes 1.30); helm-unittest's default capability set omits it, so every
+# rendering test declares it, exactly as the platform deletion-protection suite.
+capabilities:
+  apiVersions:
+    - admissionregistration.k8s.io/v1/ValidatingAdmissionPolicy
+
 tests:
-  - it: renders ValidatingAdmissionPolicy + Binding for HTTPRoute and TLSRoute (Layer 7)
+  - it: renders ValidatingAdmissionPolicy + Binding for HTTPRoute, TLSRoute and GRPCRoute (Layer 7)
     # Layer 7 (route-hostname VAP) is the only VAP rendered by THIS
-    # template: 2 docs (VAP + Binding) × 2 route kinds (HTTPRoute,
-    # TLSRoute) = 4 docs total. Layers 2-5 live in
+    # template: 2 docs (VAP + Binding) × 3 route kinds (HTTPRoute,
+    # TLSRoute, GRPCRoute) = 6 docs total. Layers 2-5 live in
     # gateway-hostname-policy.yaml. Pin both counts so the 7-layer
     # security model documented in README.md is enforced at render
     # time — a maintainer dropping one of the VAPs without updating
     # the docs trips one of these counts.
     asserts:
       - hasDocuments:
-          count: 4
+          count: 6
       - documentIndex: 0
         equal:
           path: kind
@@ -30,6 +37,22 @@ tests:
         equal:
           path: kind
           value: ValidatingAdmissionPolicyBinding
+      - documentIndex: 2
+        equal:
+          path: metadata.name
+          value: cozystack-route-hostname-policy-tls
+      - documentIndex: 3
+        equal:
+          path: kind
+          value: ValidatingAdmissionPolicyBinding
+      - documentIndex: 4
+        equal:
+          path: metadata.name
+          value: cozystack-route-hostname-policy-grpc
+      - documentIndex: 5
+        equal:
+          path: kind
+          value: ValidatingAdmissionPolicyBinding
 
   - it: gates on tenant-* namespace prefix via matchConditions
     asserts:
@@ -41,6 +64,14 @@ tests:
         equal:
           path: spec.matchConditions[0].expression
           value: object.metadata.namespace.startsWith("tenant-")
+      - documentIndex: 2
+        equal:
+          path: spec.matchConditions[0].expression
+          value: object.metadata.namespace.startsWith("tenant-")
+      - documentIndex: 4
+        equal:
+          path: spec.matchConditions[0].expression
+          value: object.metadata.namespace.startsWith("tenant-")
 
   - it: validates HTTPRoute hostnames against namespace.cozystack.io/host label
     asserts:
@@ -53,14 +84,158 @@ tests:
           path: spec.validations[0].expression
           pattern: 'namespace\.cozystack\.io/host'
 
-  - it: validation actions are Deny so requests fail closed
+  - it: normalizes both operands of every comparison with lowerAscii
+    # The route hostname is already lowercase, but the apex operand
+    # is the namespace.cozystack.io/host label VALUE, which Kubernetes
+    # permits to carry uppercase.
+    #
+    # Both comparisons are pinned as whole operand pairs, for HTTPRoute
+    # (doc 0) and TLSRoute (doc 2), which share one CEL validator with
+    # GRPCRoute (doc 4): a pattern
+    # matching a lone `.lowerAscii()` somewhere in the expression still
+    # matches when one operand loses its normalization.
+    asserts:
+      - documentIndex: 0
+        matchRegex:
+          path: spec.validations[0].expression
+          pattern: 'h\.lowerAscii\(\) == namespaceObject\.metadata\.labels\["namespace\.cozystack\.io/host"\]\.lowerAscii\(\)'
+      - documentIndex: 0
+        matchRegex:
+          path: spec.validations[0].expression
+          pattern: 'h\.lowerAscii\(\)\.endsWith\("\." \+ namespaceObject\.metadata\.labels\["namespace\.cozystack\.io/host"\]\.lowerAscii\(\)\)'
+      - documentIndex: 2
+        matchRegex:
+          path: spec.validations[0].expression
+          pattern: 'h\.lowerAscii\(\) == namespaceObject\.metadata\.labels\["namespace\.cozystack\.io/host"\]\.lowerAscii\(\)'
+      - documentIndex: 2
+        matchRegex:
+          path: spec.validations[0].expression
+          pattern: 'h\.lowerAscii\(\)\.endsWith\("\." \+ namespaceObject\.metadata\.labels\["namespace\.cozystack\.io/host"\]\.lowerAscii\(\)\)'
+      - documentIndex: 4
+        matchRegex:
+          path: spec.validations[0].expression
+          pattern: 'h\.lowerAscii\(\) == namespaceObject\.metadata\.labels\["namespace\.cozystack\.io/host"\]\.lowerAscii\(\)'
+      - documentIndex: 4
+        matchRegex:
+          path: spec.validations[0].expression
+          pattern: 'h\.lowerAscii\(\)\.endsWith\("\." \+ namespaceObject\.metadata\.labels\["namespace\.cozystack\.io/host"\]\.lowerAscii\(\)\)'
+
+  # A Binding whose policyName points at another policy renders fine and
+  # leaves its own policy inert, so the pair is pinned together: which
+  # policy is bound, and that the binding denies.
+  - it: each binding denies for the policy it names
     asserts:
       - documentIndex: 1
+        equal:
+          path: spec.policyName
+          value: cozystack-route-hostname-policy
+      - documentIndex: 3
+        equal:
+          path: spec.policyName
+          value: cozystack-route-hostname-policy-tls
+      - documentIndex: 5
+        equal:
+          path: spec.policyName
+          value: cozystack-route-hostname-policy-grpc
+      - documentIndex: 1
+        equal:
+          path: spec.validationActions
+          value: [Deny]
+      - documentIndex: 3
+        equal:
+          path: spec.validationActions
+          value: [Deny]
+      - documentIndex: 5
         equal:
           path: spec.validationActions
           value: [Deny]
 
-  - it: targets gateway.networking.k8s.io v1 HTTPRoute and v1alpha2 TLSRoute
+  # A route that omits spec.hostnames does not match nothing: under Gateway API
+  # it inherits the hostnames of the listener it attaches to, which is the
+  # boundary this policy exists to hold. An earlier form of the expression
+  # opened with `!has(object.spec.hostnames) ||`, so that route satisfied the
+  # first operand and was admitted with no hostname examined at all. An empty
+  # list is the same shape reached a different way: has() is true on it, and
+  # all() over an empty list is vacuously true. Both operands are pinned here,
+  # and the old short-circuit is pinned absent, because either one alone is
+  # enough to admit the whole shape again.
+  #
+  # Addressed by documentSelector rather than documentIndex: the three policies
+  # rendered by this template share one CEL string, so an assertion tied to a
+  # position would slide onto another policy if the documents were reordered
+  # and stay green either way. Each policy is named separately so a failure says
+  # which one lost the guard.
+  - it: HTTPRoute policy requires spec.hostnames to be present and non-empty
+    asserts:
+      - documentSelector:
+          path: spec.matchConstraints.resourceRules[0].resources[0]
+          value: httproutes
+        matchRegex:
+          path: spec.validations[0].expression
+          pattern: 'has\(object\.spec\.hostnames\)\s*&&\s*size\(object\.spec\.hostnames\)\s*>\s*0\s*&&'
+      - documentSelector:
+          path: spec.matchConstraints.resourceRules[0].resources[0]
+          value: httproutes
+        notMatchRegex:
+          path: spec.validations[0].expression
+          pattern: '!has\(object\.spec\.hostnames\)'
+
+  - it: TLSRoute policy requires spec.hostnames to be present and non-empty
+    asserts:
+      - documentSelector:
+          path: spec.matchConstraints.resourceRules[0].resources[0]
+          value: tlsroutes
+        matchRegex:
+          path: spec.validations[0].expression
+          pattern: 'has\(object\.spec\.hostnames\)\s*&&\s*size\(object\.spec\.hostnames\)\s*>\s*0\s*&&'
+      - documentSelector:
+          path: spec.matchConstraints.resourceRules[0].resources[0]
+          value: tlsroutes
+        notMatchRegex:
+          path: spec.validations[0].expression
+          pattern: '!has\(object\.spec\.hostnames\)'
+
+  - it: GRPCRoute policy requires spec.hostnames to be present and non-empty
+    asserts:
+      - documentSelector:
+          path: spec.matchConstraints.resourceRules[0].resources[0]
+          value: grpcroutes
+        matchRegex:
+          path: spec.validations[0].expression
+          pattern: 'has\(object\.spec\.hostnames\)\s*&&\s*size\(object\.spec\.hostnames\)\s*>\s*0\s*&&'
+      - documentSelector:
+          path: spec.matchConstraints.resourceRules[0].resources[0]
+          value: grpcroutes
+        notMatchRegex:
+          path: spec.validations[0].expression
+          pattern: '!has\(object\.spec\.hostnames\)'
+
+  # The denial a hostname-less route now gets has to name the reason. Without
+  # this the operator reads "hostnames must equal the label or be subdomains of
+  # it" against a route that declares no hostnames at all, and the message
+  # describes a rule the route does not visibly break.
+  - it: denial message names the missing-hostnames case for every route kind
+    asserts:
+      - documentSelector:
+          path: spec.matchConstraints.resourceRules[0].resources[0]
+          value: httproutes
+        matchRegex:
+          path: spec.validations[0].messageExpression
+          pattern: 'HTTPRoute must declare spec\.hostnames'
+      - documentSelector:
+          path: spec.matchConstraints.resourceRules[0].resources[0]
+          value: tlsroutes
+        matchRegex:
+          path: spec.validations[0].messageExpression
+          pattern: 'TLSRoute must declare spec\.hostnames'
+      - documentSelector:
+          path: spec.matchConstraints.resourceRules[0].resources[0]
+          value: grpcroutes
+        matchRegex:
+          path: spec.validations[0].messageExpression
+          pattern: 'GRPCRoute must declare spec\.hostnames'
+
+  - it: targets every served HTTPRoute, TLSRoute and GRPCRoute version in gateway.networking.k8s.io
     asserts:
       - documentIndex: 0
         equal:
@@ -70,14 +245,38 @@ tests:
         equal:
           path: spec.matchConstraints.resourceRules[0].resources
           value: ["httproutes"]
+      - documentIndex: 2
+        equal:
+          path: spec.matchConstraints.resourceRules[0].apiGroups
+          value: ["gateway.networking.k8s.io"]
       - documentIndex: 2
         equal:
           path: spec.matchConstraints.resourceRules[0].resources
           value: ["tlsroutes"]
+      # Every version the vendored bundle serves for each kind, pinned to
+      # exact values so a change here is deliberate. The reason a shorter
+      # list is unsafe lives in
+      # hack/route-hostname-policy-version-coverage.bats.
+      - documentIndex: 0
+        equal:
+          path: spec.matchConstraints.resourceRules[0].apiVersions
+          value: ["v1", "v1beta1"]
       - documentIndex: 2
         equal:
           path: spec.matchConstraints.resourceRules[0].apiVersions
-          value: ["v1alpha2"]
+          value: ["v1", "v1alpha2", "v1alpha3"]
+      - documentIndex: 4
+        equal:
+          path: spec.matchConstraints.resourceRules[0].apiGroups
+          value: ["gateway.networking.k8s.io"]
+      - documentIndex: 4
+        equal:
+          path: spec.matchConstraints.resourceRules[0].resources
+          value: ["grpcroutes"]
+      - documentIndex: 4
+        equal:
+          path: spec.matchConstraints.resourceRules[0].apiVersions
+          value: ["v1"]
 
   - it: failurePolicy is Fail so admission errors deny instead of allow
     asserts:
@@ -89,13 +288,16 @@ tests:
         equal:
           path: spec.failurePolicy
           value: Fail
+      - documentIndex: 4
+        equal:
+          path: spec.failurePolicy
+          value: Fail
 
   - it: CEL is fail-closed when namespace has no host label (returns false, not true)
-    # Regression guard: an earlier draft used `... ? true : (...)` which
+    # Regression guard: an earlier form used `... ? true : (...)`, which
     # silently allowed routes in any tenant-* namespace where the layer-5
-    # label was missing or scrubbed. Fixing this is the whole point of the
-    # round-6 hardening pass — pin the false branch in the CEL string so
-    # nobody flips it back without an explicit test failure.
+    # label was missing or scrubbed. Pin the false branch in the CEL string
+    # so nobody flips it back without an explicit test failure.
     asserts:
       - documentIndex: 0
         matchRegex:
@@ -105,6 +307,10 @@ tests:
         matchRegex:
           path: spec.validations[0].expression
           pattern: '\)\s*\?\s*false\s*:'
+      - documentIndex: 4
+        matchRegex:
+          path: spec.validations[0].expression
+          pattern: '\)\s*\?\s*false\s*:'
       - documentIndex: 0
         matchRegex:
           path: spec.validations[0].expression
diff --git a/packages/system/cozystack-controller/Makefile b/packages/system/cozystack-controller/Makefile
index 60eb0fce88..eabe2752cf 100644
--- a/packages/system/cozystack-controller/Makefile
+++ b/packages/system/cozystack-controller/Makefile
@@ -4,14 +4,16 @@ NAMESPACE=cozy-system
 include ../../../hack/common-envs.mk
 include ../../../hack/package.mk
 
+test:
+	helm unittest .
+
 image: image-cozystack-controller
 
 image-cozystack-controller:
 	docker buildx build -f images/cozystack-controller/Dockerfile ../../.. \
 		$(call image-tags,cozystack-controller,v$(COZYSTACK_VERSION)) \
 		--build-arg VERSION=v$(COZYSTACK_VERSION) \
-		--cache-from type=registry,ref=$(REGISTRY)/cozystack-controller:latest \
-		--cache-to type=inline \
+		$(call cache-args,cozystack-controller) \
 		--metadata-file images/cozystack-controller.json \
 		$(BUILDX_ARGS)
 	IMAGE="$(REGISTRY)/cozystack-controller:$(IMAGE_TAG)@$$(yq e '."containerimage.digest"' images/cozystack-controller.json -o json -r)" \
diff --git a/packages/system/cozystack-controller/definitions/cozystack.io_workloadmonitors.yaml b/packages/system/cozystack-controller/definitions/cozystack.io_workloadmonitors.yaml
index 5c1318c04a..b0198acb9f 100644
--- a/packages/system/cozystack-controller/definitions/cozystack.io_workloadmonitors.yaml
+++ b/packages/system/cozystack-controller/definitions/cozystack.io_workloadmonitors.yaml
@@ -84,6 +84,7 @@ spec:
                 additionalProperties:
                   type: string
                 description: Selector is a label selector to find workloads to monitor
+                minProperties: 1
                 type: object
               type:
                 description: Type specifies the type of the workload
@@ -101,6 +102,11 @@ spec:
                 description: AvailableReplicas is the number of ready replicas
                 format: int32
                 type: integer
+              message:
+                description: |-
+                  Message names what keeps the workload from being operational, when the
+                  controller can tell.
+                type: string
               observedReplicas:
                 description: ObservedReplicas is the total number of pods observed
                 format: int32
@@ -109,6 +115,11 @@ spec:
                 description: Operational indicates if the workload meets all operational
                   requirements
                 type: boolean
+              reason:
+                description: |-
+                  Reason is a machine-readable cause for Message, such as
+                  DataVolumeNotReady.
+                type: string
             type: object
         type: object
     served: true
diff --git a/packages/system/cozystack-controller/definitions/gateway.cozystack.io_tenantgateways.yaml b/packages/system/cozystack-controller/definitions/gateway.cozystack.io_tenantgateways.yaml
index 4d05d974e7..b9c81d5dbc 100644
--- a/packages/system/cozystack-controller/definitions/gateway.cozystack.io_tenantgateways.yaml
+++ b/packages/system/cozystack-controller/definitions/gateway.cozystack.io_tenantgateways.yaml
@@ -56,31 +56,51 @@ spec:
           metadata:
             type: object
           spec:
-            description: TenantGatewaySpec describes the desired state of a per-tenant
-              Gateway.
+            description: |-
+              TenantGatewaySpec describes the desired state of a per-tenant Gateway.
+
+              The rules on tlsPassthroughListeners are enforced both at admission
+              and in the controller; a few have no admission form and surface as
+              Ready=False instead. The reasoning is in
+              packages/extra/gateway/README.md.
             properties:
               apex:
                 description: |-
                   Apex is the tenant's apex hostname. The Gateway listeners are
-                  constrained to this apex and its subdomains.
+                  constrained to this apex and its subdomains, and the
+                  controller-owned http-to-https redirect route declares this apex
+                  and its wildcard as its hostnames, so an empty value renders a
+                  route the apiserver rejects on its hostname schema.
+                maxLength: 253
+                minLength: 1
                 type: string
               attachedNamespaces:
                 description: |-
                   AttachedNamespaces lists namespace names that are allowed to
                   attach HTTPRoute or TLSRoute to this tenant's Gateway. The
-                  publishing tenant namespace is implicit. Selector is by built-in
-                  kubernetes.io/metadata.name (kube-apiserver-written, unspoofable).
+                  publishing tenant namespace is implicit. The controller grants
+                  access by stamping the namespace.cozystack.io/gateway label on
+                  each listed namespace. Writing it requires patch on Namespace,
+                  which tenants do not hold. The label reaches the HTTPS-terminate
+                  listeners and the port-443 passthrough listeners; the port-80
+                  listener and the native-port listeners from
+                  tlsPassthroughListeners select on kubernetes.io/metadata.name
+                  instead, so listing a namespace here does not let it attach to a
+                  database port.
                 items:
                   type: string
                 type: array
               certMode:
                 default: http01
                 description: |-
-                  CertMode selects between HTTP-01 per-listener Certificates and
-                  a wildcard cert via DNS-01.
+                  CertMode selects between HTTP-01 per-listener Certificates, a
+                  wildcard cert via DNS-01, an operator-supplied wildcard Secret,
+                  and edge (no certificates: TLS ends at the class provider's edge).
                 enum:
                 - http01
                 - dns01
+                - existingSecret
+                - edge
                 type: string
               dns01:
                 description: |-
@@ -268,17 +288,153 @@ spec:
                 - letsencrypt-prod
                 - letsencrypt-stage
                 type: string
+              tlsPassthroughListeners:
+                description: |-
+                  TLSPassthroughListeners declares layer-4 TLS-passthrough
+                  listeners on the tenant Gateway. The controller renders one
+                  "tls-<name>" listener per entry — on the entry's native Port,
+                  mode Passthrough, matching the entry's per-engine SNI Hostname —
+                  alongside the layer-7 terminate listeners. This lets a database
+                  engine present its own certificate directly to clients while
+                  sharing the tenant Gateway's address. It is independent of
+                  TLSPassthroughServices, the passthrough-on-443 form; the
+                  two do not replace each other.
+
+                  The listener is all this field creates. Nothing is routed until a
+                  TLSRoute attaches to it by sectionName "tls-<name>" and names a
+                  backend Service, and the backend must present its own certificate
+                  for the listener's Hostname — a passthrough listener never
+                  terminates TLS, so the Gateway neither holds nor issues that
+                  certificate. Until such a route attaches and its backend
+                  resolves, the entry publishes the port and answers nothing on it.
+                  Under certMode http01 its hostname is reserved from the moment it
+                  is declared: no HTTPS-terminate listener or certificate is
+                  rendered for it on 443, route or no route.
+                items:
+                  description: |-
+                    TLSPassthroughListener declares one layer-4 TLS-passthrough listener
+                    on the tenant Gateway. Unlike the layer-7 terminate listeners the
+                    controller renders for published HTTP apps, a passthrough listener
+                    does not terminate TLS: the ClientHello SNI selects the backend and
+                    the raw TLS stream is forwarded to the TLSRoute-named service, so a
+                    native database protocol that speaks its own TLS reaches clients
+                    without the Gateway ever holding the private key. Each listener owns
+                    a distinct native port and a per-engine SNI hostname.
+                  properties:
+                    hostname:
+                      description: |-
+                        Hostname is the SNI the listener matches on the incoming
+                        ClientHello. It routes the raw TLS stream by SNI, so give each
+                        engine its own per-engine subdomain (e.g.
+                        "postgres.foo.example.com") or a left-most-label wildcard (e.g.
+                        "*.db.foo.example.com"). Must be an exact RFC 1123 hostname or a
+                        wildcard hostname, and must fall within the tenant apex — equal to
+                        Apex or a subdomain of it — since every listener on the tenant
+                        Gateway is constrained to the apex.
+                      maxLength: 253
+                      minLength: 1
+                      pattern: ^(\*\.)?[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                      type: string
+                    name:
+                      description: |-
+                        Name identifies the listener within the tenant Gateway. It
+                        becomes the rendered Gateway listener name "tls-<name>" and the
+                        sectionName a TLSRoute attaches to. Must be a DNS-1123 label
+                        (lowercase alphanumerics and '-', starting and ending with an
+                        alphanumeric) and unique across the list.
+                      maxLength: 63
+                      minLength: 1
+                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                      type: string
+                    port:
+                      description: |-
+                        Port is the TCP port this passthrough listener is published on,
+                        on the tenant Gateway's shared address. Set it to the engine's
+                        native port (e.g. 5432 for PostgreSQL). Must be 1..65535, unique
+                        across the list, and neither 80 nor 443 — the Gateway's own http
+                        (80) and TLS-terminate (443) listeners already own those ports.
+                        It is not an access boundary: an implementation may serve every
+                        port of the Gateway from one proxy listener matched by SNI alone,
+                        and Cilium does so until the Gateway carries a configuration that
+                        splits it per port, so the hostname is what gates reach.
+                      format: int32
+                      maximum: 65535
+                      minimum: 1
+                      type: integer
+                  required:
+                  - hostname
+                  - name
+                  - port
+                  type: object
+                maxItems: 62
+                type: array
+                x-kubernetes-list-map-keys:
+                - name
+                x-kubernetes-list-type: map
               tlsPassthroughServices:
                 description: |-
                   TLSPassthroughServices names services exposed via TLS-passthrough
                   (mode: Passthrough listeners). Each service gets a dedicated
                   listener; HTTPRoutes attach to TLS-terminate listeners instead.
+                  Not rendered when CertMode=edge.
+
+                  An entry becomes both the listener name tls-<svc> and the listener
+                  hostname <svc>.<apex>, and Gateway API bounds each at 253
+                  characters. An entry that overflows either one renders a listener
+                  the apiserver refuses, and that refusal takes the whole Gateway
+                  with it rather than the one listener.
                 items:
+                  maxLength: 249
+                  pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
                   type: string
+                maxItems: 62
                 type: array
+              wildcardSecretRef:
+                description: |-
+                  WildcardSecretRef names a pre-existing TLS Secret in the
+                  TenantGateway's own namespace used for the wildcard and apex
+                  listeners when CertMode=existingSecret. Required in that mode;
+                  ignored otherwise. The Secret must be of type kubernetes.io/tls
+                  and cover the tenant apex (and *.apex). Cross-namespace refs are
+                  intentionally unsupported to avoid requiring a ReferenceGrant.
+                properties:
+                  name:
+                    default: ""
+                    description: |-
+                      Name of the referent.
+                      This field is effectively required, but due to backwards compatibility is
+                      allowed to be empty. Instances of this type with an empty value here are
+                      almost certainly wrong.
+                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                    type: string
+                type: object
+                x-kubernetes-map-type: atomic
             required:
             - apex
             type: object
+            x-kubernetes-validations:
+            - message: 'tlsPassthroughListeners: ports 80 and 443 are reserved for
+                the Gateway''s own http and TLS-terminate listeners; use the engine''s
+                native port'
+              rule: '!has(self.tlsPassthroughListeners) || self.tlsPassthroughListeners.all(l,
+                l.port != 80 && l.port != 443)'
+            - message: 'tlsPassthroughListeners: each listener must occupy a distinct
+                port'
+              rule: '!has(self.tlsPassthroughListeners) || self.tlsPassthroughListeners.all(l,
+                self.tlsPassthroughListeners.filter(o, o.port == l.port).size() ==
+                1)'
+            - message: 'tlsPassthroughListeners: hostname must equal the tenant apex
+                or be a subdomain of it'
+              rule: '!has(self.tlsPassthroughListeners) || self.tlsPassthroughListeners.all(l,
+                l.hostname == self.apex || l.hostname.endsWith(''.'' + self.apex))'
+            - message: 'tlsPassthroughListeners: name collides with a tlsPassthroughServices
+                entry; both render a tls-<name> Gateway listener'
+              rule: '!has(self.tlsPassthroughListeners) || !has(self.tlsPassthroughServices)
+                || self.tlsPassthroughListeners.all(l, !(l.name in self.tlsPassthroughServices))'
+            - message: 'tlsPassthroughListeners: unsupported with certMode edge, which
+                terminates TLS upstream and renders no TLS listener to sit beside'
+              rule: '!has(self.tlsPassthroughListeners) || size(self.tlsPassthroughListeners)
+                == 0 || !has(self.certMode) || self.certMode != ''edge'''
           status:
             description: TenantGatewayStatus reports the observed state of the tenant's
               Gateway.
diff --git a/packages/system/cozystack-controller/definitions/internal.cozystack.io_tenantprojections.yaml b/packages/system/cozystack-controller/definitions/internal.cozystack.io_tenantprojections.yaml
new file mode 100644
index 0000000000..e8e261e0e7
--- /dev/null
+++ b/packages/system/cozystack-controller/definitions/internal.cozystack.io_tenantprojections.yaml
@@ -0,0 +1,174 @@
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.16.4
+  name: tenantprojections.internal.cozystack.io
+spec:
+  group: internal.cozystack.io
+  names:
+    kind: TenantProjection
+    listKind: TenantProjectionList
+    plural: tenantprojections
+    shortNames:
+    - tproj
+    singular: tenantprojection
+  scope: Namespaced
+  versions:
+  - additionalPrinterColumns:
+    - jsonPath: .status.conditions[?(@.type=="Ready")].status
+      name: Ready
+      type: string
+    - jsonPath: .metadata.creationTimestamp
+      name: Age
+      type: date
+    name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        description: |-
+          TenantProjection is the Schema for the tenantprojections API.
+          It is a namespaced, platform-internal sentinel a chart renders to declare
+          which of an application's Secrets should be published to the tenant as a
+          key-free copy. The cozystack-controller reconciles the projected Secret
+          from this object and owns it via an OwnerReference back to this sentinel.
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: TenantProjectionSpec declares the projections to publish
+              for a tenant.
+            properties:
+              projections:
+                description: |-
+                  Projections is the list of artifacts to publish from source Secrets
+                  in this namespace.
+                items:
+                  description: |-
+                    TenantProjectionEntry declares one artifact to project from a source
+                    Secret into a tenant-visible, key-free Secret.
+                  properties:
+                    sourceKey:
+                      default: ca.crt
+                      description: |-
+                        SourceKey is the key inside the source Secret holding the CA
+                        certificate in PEM form. The certificate is always republished
+                        under "ca.crt", whatever it is called at the source.
+                      type: string
+                    sourceSecretName:
+                      description: |-
+                        SourceSecretName names the Secret in the TenantProjection's own
+                        namespace holding the material to project. Only the extracted,
+                        key-free certificate is ever published, so naming a Secret that
+                        also carries private key material does not widen tenant visibility.
+                      minLength: 1
+                      type: string
+                    type:
+                      description: Type selects what to project. CACert is the only
+                        supported type.
+                      enum:
+                      - CACert
+                      type: string
+                  required:
+                  - sourceSecretName
+                  - type
+                  type: object
+                minItems: 1
+                type: array
+            required:
+            - projections
+            type: object
+          status:
+            description: TenantProjectionStatus reports the observed state of the
+              projections.
+            properties:
+              conditions:
+                description: |-
+                  Conditions describes the current state of the TenantProjection.
+                  Standard condition types: Ready. Ready is False with reason
+                  SourceNotFound while a referenced source Secret does not exist.
+                items:
+                  description: Condition contains details for one aspect of the current
+                    state of this API Resource.
+                  properties:
+                    lastTransitionTime:
+                      description: |-
+                        lastTransitionTime is the last time the condition transitioned from one status to another.
+                        This should be when the underlying condition changed.  If that is not known, then using the time when the API field changed is acceptable.
+                      format: date-time
+                      type: string
+                    message:
+                      description: |-
+                        message is a human readable message indicating details about the transition.
+                        This may be an empty string.
+                      maxLength: 32768
+                      type: string
+                    observedGeneration:
+                      description: |-
+                        observedGeneration represents the .metadata.generation that the condition was set based upon.
+                        For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date
+                        with respect to the current state of the instance.
+                      format: int64
+                      minimum: 0
+                      type: integer
+                    reason:
+                      description: |-
+                        reason contains a programmatic identifier indicating the reason for the condition's last transition.
+                        Producers of specific condition types may define expected values and meanings for this field,
+                        and whether the values are considered a guaranteed API.
+                        The value should be a CamelCase string.
+                        This field may not be empty.
+                      maxLength: 1024
+                      minLength: 1
+                      pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
+                      type: string
+                    status:
+                      description: status of the condition, one of True, False, Unknown.
+                      enum:
+                      - "True"
+                      - "False"
+                      - Unknown
+                      type: string
+                    type:
+                      description: type of condition in CamelCase or in foo.example.com/CamelCase.
+                      maxLength: 316
+                      pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
+                      type: string
+                  required:
+                  - lastTransitionTime
+                  - message
+                  - reason
+                  - status
+                  - type
+                  type: object
+                type: array
+                x-kubernetes-list-map-keys:
+                - type
+                x-kubernetes-list-type: map
+              observedGeneration:
+                description: |-
+                  ObservedGeneration mirrors the .metadata.generation reflected in the
+                  latest reconciled state.
+                format: int64
+                type: integer
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}
diff --git a/packages/system/cozystack-controller/images/cozystack-controller/Dockerfile b/packages/system/cozystack-controller/images/cozystack-controller/Dockerfile
index acba9e016e..e76b328802 100644
--- a/packages/system/cozystack-controller/images/cozystack-controller/Dockerfile
+++ b/packages/system/cozystack-controller/images/cozystack-controller/Dockerfile
@@ -1,4 +1,5 @@
-FROM golang:1.26-alpine AS builder
+FROM --platform=$BUILDPLATFORM golang:1.27-alpine@sha256:8a5910f31396cd4d89662f56c68b3ae31d374308270a1c3bd96672ee5ed43414 AS builder
+ARG GOPROXY
 
 ARG TARGETOS
 ARG TARGETARCH
@@ -7,7 +8,7 @@ ARG VERSION=dev
 WORKDIR /workspace
 
 COPY go.mod go.sum ./
-RUN GOOS=$TARGETOS GOARCH=$TARGETARCH go mod download
+RUN for attempt in 1 2 3; do GOOS=$TARGETOS GOARCH=$TARGETARCH go mod download && break; [ "$attempt" = 3 ] && exit 1; sleep $((attempt * 10)); done
 
 COPY api api/
 COPY pkg pkg/
diff --git a/packages/system/cozystack-controller/templates/deployment.yaml b/packages/system/cozystack-controller/templates/deployment.yaml
index aab7bbe1eb..298a84b44d 100644
--- a/packages/system/cozystack-controller/templates/deployment.yaml
+++ b/packages/system/cozystack-controller/templates/deployment.yaml
@@ -5,7 +5,7 @@ metadata:
   labels:
     app: cozystack-controller
 spec:
-  replicas: 1
+  replicas: {{ .Values.cozystackController.replicas }}
   selector:
     matchLabels:
       app: cozystack-controller
@@ -19,6 +19,7 @@ spec:
       - name: cozystack-controller
         image: "{{ .Values.cozystackController.image }}"
         args:
+        - --leader-elect
         {{- if .Values.cozystackController.debug }}
         - --zap-log-level=debug
         {{- else }}
@@ -27,3 +28,10 @@ spec:
         {{- if .Values.cozystackController.disableTelemetry }}
         - --disable-telemetry
         {{- end }}
+        {{- with .Values.cozystackController.seaweedfsMetricsEndpoint }}
+        - --seaweedfs-metrics-endpoint={{ . }}
+        {{- end }}
+        {{- with .Values.cozystackController.resources }}
+        resources:
+          {{- toYaml . | nindent 10 }}
+        {{- end }}
diff --git a/packages/system/cozystack-controller/templates/leader-election-role.yaml b/packages/system/cozystack-controller/templates/leader-election-role.yaml
new file mode 100644
index 0000000000..1a07d8c17d
--- /dev/null
+++ b/packages/system/cozystack-controller/templates/leader-election-role.yaml
@@ -0,0 +1,28 @@
+# Leader election (--leader-elect) writes a Lease in the manager's own namespace
+# — controller-runtime defaults LeaderElectionNamespace to the pod's namespace —
+# so the grant stays namespaced rather than giving the controller Lease writes in
+# every namespace, where a compromised controller could disturb another
+# component's election.
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: cozystack-controller-leader-election
+  namespace: cozy-system
+rules:
+- apiGroups: ["coordination.k8s.io"]
+  resources: ["leases"]
+  verbs: ["get", "list", "watch", "create", "update", "patch"]
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: cozystack-controller-leader-election
+  namespace: cozy-system
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: cozystack-controller-leader-election
+subjects:
+- kind: ServiceAccount
+  name: cozystack-controller
+  namespace: cozy-system
diff --git a/packages/system/cozystack-controller/templates/rbac.yaml b/packages/system/cozystack-controller/templates/rbac.yaml
index bd7b429083..e40ab90804 100644
--- a/packages/system/cozystack-controller/templates/rbac.yaml
+++ b/packages/system/cozystack-controller/templates/rbac.yaml
@@ -14,17 +14,62 @@ rules:
 - apiGroups: ["gateway.networking.k8s.io"]
   resources: ["gateways/status", "httproutes/status", "tlsroutes/status"]
   verbs: ["get", "update", "patch"]
+# Read-only, to report a class whose supportedFeatures leave out a
+# route kind the tenant Gateway renders listeners for.
+- apiGroups: ["gateway.networking.k8s.io"]
+  resources: ["gatewayclasses"]
+  verbs: ["get", "list", "watch"]
 # TenantGatewayReconciler renders the per-tenant Issuer and the
 # wildcard / per-listener Certificates the Gateway listeners reference.
 - apiGroups: ["cert-manager.io"]
   resources: ["issuers", "certificates"]
   verbs: ["get", "list", "watch", "create", "update", "patch", "delete"]
+# TenantLogRoutingReconciler patches the forced-upgrade request annotations on
+# cozy-monitoring/monitoring-agents when a namespace monitoring label changes.
 - apiGroups: ["helm.toolkit.fluxcd.io"]
   resources: ["helmreleases"]
   verbs: ["get", "list", "watch", "patch", "update"]
+# TapMaterializerReconciler manages the finalizer and materialized-revision
+# annotation on a community tap's OCIRepository. Read (get/list/watch) is
+# covered by the catch-all rule below; the update/patch it needs are scoped to a
+# namespaced Role in cozy-system (see tap-source-role.yaml), since the
+# materializer only ever touches tap sources there. PackageSource writes it
+# performs are already covered by the cozystack.io:*/* rule above.
+# CACertReconciler reconciles TenantProjection sentinels a chart renders and
+# writes their Ready status. It never creates or deletes a sentinel; that is
+# the chart's (helm-controller's) job. No tenant role grants any verb on
+# internal.cozystack.io, which is what keeps sentinels out of tenant reach.
+- apiGroups: ["internal.cozystack.io"]
+  resources: ["tenantprojections"]
+  verbs: ["get", "list", "watch"]
+- apiGroups: ["internal.cozystack.io"]
+  resources: ["tenantprojections/status"]
+  verbs: ["get", "update", "patch"]
 - apiGroups: [""]
   resources: ["namespaces"]
   verbs: ["get", "list", "watch", "patch", "update"]
+# TenantQuotaReconciler manages the per-namespace "tenant-quota-allocated"
+# ResourceQuota that enforces each tenant's share of its parent pool, and emits
+# events on the tenant namespace when sub-tenant quotas overcommit the budget.
+- apiGroups: [""]
+  resources: ["resourcequotas"]
+  verbs: ["get", "list", "watch", "create", "update", "patch", "delete"]
+- apiGroups: [""]
+  resources: ["events"]
+  verbs: ["create", "patch"]
+# Two reconcilers share this one Secret write grant on the platform controller's
+# own ServiceAccount; it widens no tenant's RBAC. WildcardSecretReconciler
+# replicates the operator wildcard TLS Secret into each tenant namespace;
+# CACertReconciler writes — and withdraws — the key-free "<release>.tenant-ca"
+# projection, deleting only a projection it owns by owner reference, never a
+# foreign Secret. Read was already covered by the catch-all rule below;
+# create/update/patch/delete are the new grants.
+- apiGroups: [""]
+  resources: ["secrets"]
+  verbs: ["get", "list", "watch", "create", "update", "patch", "delete"]
+# Leader election (--leader-elect) is granted by a namespaced Role in cozy-system
+# (see leader-election-role.yaml): the Lease lives in the controller's own
+# namespace, so the write does not need to reach every namespace.
 - apiGroups: ['*']
   resources: ['*']
   verbs: ["get", "list", "watch"]
diff --git a/packages/system/cozystack-controller/templates/tap-source-role.yaml b/packages/system/cozystack-controller/templates/tap-source-role.yaml
new file mode 100644
index 0000000000..b43bdf9239
--- /dev/null
+++ b/packages/system/cozystack-controller/templates/tap-source-role.yaml
@@ -0,0 +1,28 @@
+# The tap materializer updates a community tap's OCIRepository (its finalizer and
+# materialized-revision annotation), but only ever in cozy-system. Keep those
+# write verbs in a namespaced Role here rather than granting them cluster-wide;
+# get/list/watch stay cluster-wide (the catch-all rule in rbac.yaml) for the
+# controller-runtime informer.
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: cozystack-controller-tap-sources
+  namespace: cozy-system
+rules:
+- apiGroups: ["source.toolkit.fluxcd.io"]
+  resources: ["ocirepositories"]
+  verbs: ["update", "patch"]
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: cozystack-controller-tap-sources
+  namespace: cozy-system
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: cozystack-controller-tap-sources
+subjects:
+- kind: ServiceAccount
+  name: cozystack-controller
+  namespace: cozy-system
diff --git a/packages/system/cozystack-controller/tests/leader_election_test.yaml b/packages/system/cozystack-controller/tests/leader_election_test.yaml
new file mode 100644
index 0000000000..5e38e8d2fb
--- /dev/null
+++ b/packages/system/cozystack-controller/tests/leader_election_test.yaml
@@ -0,0 +1,93 @@
+suite: cozystack-controller runs one active manager
+templates:
+  - templates/deployment.yaml
+  - templates/rbac.yaml
+  - templates/leader-election-role.yaml
+
+release:
+  name: cozystack-controller
+  namespace: cozy-system
+
+# Eight reconcilers in this manager write (HelmRelease patches, Gateway and
+# Certificate renders, ResourceQuota, Secret replication, CA projection), so a
+# second replica is only safe behind leader election. --leader-elect is passed
+# unconditionally and the Lease grant ships with it; raising replicas then adds a
+# standby rather than a second writer.
+#
+# The Lease grant is namespaced on purpose: the lock lives in the manager's own
+# namespace, so the ClusterRole does not hand out Lease writes in every
+# namespace.
+
+tests:
+  - it: the manager always asks for leader election
+    template: templates/deployment.yaml
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: --leader-elect
+
+  - it: replicas defaults to the previously hardcoded 1
+    template: templates/deployment.yaml
+    asserts:
+      - equal:
+          path: spec.replicas
+          value: 1
+
+  - it: replicas value drives spec.replicas
+    set:
+      cozystackController.replicas: 2
+    template: templates/deployment.yaml
+    asserts:
+      - equal:
+          path: spec.replicas
+          value: 2
+
+  - it: the Lease verbs come from a namespaced Role in cozy-system
+    template: templates/leader-election-role.yaml
+    documentSelector:
+      path: kind
+      value: Role
+    asserts:
+      - equal:
+          path: metadata.name
+          value: cozystack-controller-leader-election
+      - equal:
+          path: metadata.namespace
+          value: cozy-system
+      - contains:
+          path: rules
+          content:
+            apiGroups: ["coordination.k8s.io"]
+            resources: ["leases"]
+            verbs: ["get", "list", "watch", "create", "update", "patch"]
+
+  - it: the Lease Role reaches the controller ServiceAccount in cozy-system
+    template: templates/leader-election-role.yaml
+    documentSelector:
+      path: kind
+      value: RoleBinding
+    asserts:
+      - equal:
+          path: roleRef.name
+          value: cozystack-controller-leader-election
+      - contains:
+          path: subjects
+          content:
+            kind: ServiceAccount
+            name: cozystack-controller
+            namespace: cozy-system
+
+  - it: the ClusterRole grants no Lease write, so no other namespace is reachable
+    template: templates/rbac.yaml
+    documentSelector:
+      path: kind
+      value: ClusterRole
+    asserts:
+      # Match on the resource alone (any: true), not on the exact rule spelling, so
+      # the assertion fails for any ClusterRole rule that hands out leases — e.g.
+      # one with verbs: ["*"] — instead of only for the rule shape used above.
+      - notContains:
+          path: rules
+          content:
+            resources: ["leases"]
+          any: true
diff --git a/packages/system/cozystack-controller/tests/rbac_test.yaml b/packages/system/cozystack-controller/tests/rbac_test.yaml
new file mode 100644
index 0000000000..891e28870b
--- /dev/null
+++ b/packages/system/cozystack-controller/tests/rbac_test.yaml
@@ -0,0 +1,38 @@
+suite: cozystack-controller ClusterRole grants the shared Secret write
+templates:
+  - templates/rbac.yaml
+
+release:
+  name: cozystack-controller
+  namespace: cozy-system
+
+# One Secret write grant serves two reconcilers (WildcardSecret replication and
+# CACert projection, including "delete"); it scopes the platform controller's own
+# ServiceAccount and widens no tenant's RBAC. This rule gates both features, so pin it.
+#
+# This suite pins the rule as written and nothing more. helm-unittest compares
+# every field it is handed by value equality -- `any: true` changes which fields
+# are compared, not how -- which is what a positive pin wants and what an upper
+# bound on the grant cannot use: no spelling of `notContains` bounds what a verbs
+# list may hold, so `verbs: ["get", "*"]` satisfies every one of them. The upper
+# bound therefore lives in
+# hack/cozystack-controller-secret-rbac.bats, which unions the verbs every
+# rendered rule confers on core Secrets and compares that set with the declared
+# one. Extend that file, not this one, when the question is what the controller
+# may do to a Secret.
+
+tests:
+  - it: grants the ClusterRole every verb both reconcilers need, including delete
+    documentSelector:
+      path: kind
+      value: ClusterRole
+    asserts:
+      - equal:
+          path: metadata.name
+          value: cozystack-controller
+      - contains:
+          path: rules
+          content:
+            apiGroups: [""]
+            resources: ["secrets"]
+            verbs: ["get", "list", "watch", "create", "update", "patch", "delete"]
diff --git a/packages/system/cozystack-controller/tests/resources_test.yaml b/packages/system/cozystack-controller/tests/resources_test.yaml
new file mode 100644
index 0000000000..bbf9f3cfbc
--- /dev/null
+++ b/packages/system/cozystack-controller/tests/resources_test.yaml
@@ -0,0 +1,39 @@
+suite: cozystack-controller resources knob
+templates:
+  - templates/deployment.yaml
+
+release:
+  name: cozystack-controller
+  namespace: cozy-system
+
+# Same contract as cozystack-api: the shipped `{}` renders no resources key, so
+# the default render stays byte-identical to the hardcoded chart and only an
+# admin who sets the value gets requests or limits.
+
+tests:
+  - it: the shipped default renders no resources key
+    asserts:
+      - isKind:
+          of: Deployment
+      - notExists:
+          path: spec.template.spec.containers[0].resources
+
+  - it: a set value renders on the container, not the pod
+    set:
+      cozystackController.resources:
+        requests:
+          cpu: 1m
+          memory: 96Mi
+        limits:
+          cpu: 500m
+          memory: 512Mi
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].resources
+          value:
+            requests:
+              cpu: 1m
+              memory: 96Mi
+            limits:
+              cpu: 500m
+              memory: 512Mi
diff --git a/packages/system/cozystack-controller/tests/workloadmonitor_crd_test.yaml b/packages/system/cozystack-controller/tests/workloadmonitor_crd_test.yaml
new file mode 100644
index 0000000000..714df116a6
--- /dev/null
+++ b/packages/system/cozystack-controller/tests/workloadmonitor_crd_test.yaml
@@ -0,0 +1,15 @@
+suite: WorkloadMonitor CRD
+templates:
+  - templates/crds/crds.yaml
+
+# An empty selector matches every object of each watched kind in the
+# namespace, DataVolumes included, so the API refuses one.
+tests:
+  - it: requires at least one selector label
+    documentSelector:
+      path: metadata.name
+      value: workloadmonitors.cozystack.io
+    asserts:
+      - equal:
+          path: spec.versions[0].schema.openAPIV3Schema.properties.spec.properties.selector.minProperties
+          value: 1
diff --git a/packages/system/cozystack-controller/values.yaml b/packages/system/cozystack-controller/values.yaml
index ece8a00559..4c98be23a0 100644
--- a/packages/system/cozystack-controller/values.yaml
+++ b/packages/system/cozystack-controller/values.yaml
@@ -1,4 +1,17 @@
 cozystackController:
-  image: ghcr.io/cozystack/cozystack/cozystack-controller:v1.4.0-rc.2@sha256:059175f04a930f530e8f9ff6e563466e64a9d3761af6f98348aceb373c25fbd4
+  image: ghcr.io/cozystack/cozystack/cozystack-controller:v1.6.0@sha256:b01f6fe6e8fe6426b112fbda2b4abac946b4e45cd118137c9001c9e6ee784b3d
   debug: false
   disableTelemetry: false
+  # Base URL of a Prometheus-compatible query API to fetch SeaweedFS bucket
+  # size metrics from, for deployments where SeaweedFS and the monitoring
+  # stack that scrapes it run in a separate cluster. Empty keeps discovery
+  # via the namespace.cozystack.io/monitoring label.
+  seaweedfsMetricsEndpoint: ""
+  # Raising this gives the reconciliation loop a standby, not a second writer:
+  # the chart always passes --leader-elect, so exactly one manager holds the
+  # Lease and runs the reconcilers. With the default of 1 the extra Lease is
+  # the only difference from the previous hardcoded value.
+  replicas: 1
+  # Empty by default: no resources block is rendered, so requests and limits are
+  # opt-in. Idle usage (measured) is ~69Mi — keep a limit above that.
+  resources: {}
diff --git a/packages/system/cozystack-scheduler/Chart.yaml b/packages/system/cozystack-scheduler/Chart.yaml
index f2dd13eeaf..fe283fe273 100644
--- a/packages/system/cozystack-scheduler/Chart.yaml
+++ b/packages/system/cozystack-scheduler/Chart.yaml
@@ -1,3 +1,3 @@
 apiVersion: v2
 name: cozy-cozystack-scheduler
-version: 0.3.0
+version: 0.4.0
diff --git a/packages/system/cozystack-scheduler/charts/cozystack-scheduler/Chart.yaml b/packages/system/cozystack-scheduler/charts/cozystack-scheduler/Chart.yaml
index f2dd13eeaf..fe283fe273 100644
--- a/packages/system/cozystack-scheduler/charts/cozystack-scheduler/Chart.yaml
+++ b/packages/system/cozystack-scheduler/charts/cozystack-scheduler/Chart.yaml
@@ -1,3 +1,3 @@
 apiVersion: v2
 name: cozy-cozystack-scheduler
-version: 0.3.0
+version: 0.4.0
diff --git a/packages/system/cozystack-scheduler/charts/cozystack-scheduler/values.yaml b/packages/system/cozystack-scheduler/charts/cozystack-scheduler/values.yaml
index 55b6faff14..281e123152 100644
--- a/packages/system/cozystack-scheduler/charts/cozystack-scheduler/values.yaml
+++ b/packages/system/cozystack-scheduler/charts/cozystack-scheduler/values.yaml
@@ -1,4 +1,4 @@
-image: ghcr.io/cozystack/cozystack/cozystack-scheduler:v0.3.0@sha256:89c285c5c5fe3ed8d7d597acf32fc9f045394e0f8efafd1878d6080cf112f6c2
+image: ghcr.io/cozystack/cozystack/cozystack-scheduler:v0.4.0@sha256:7b4ba25bc8b3adbcbe780f6ab064f813f3e01a0f5829cfd4a2a33fb06822731a
 replicas: 1
 # defaultLabelSelectorKeys overrides the pod label keys used to auto-populate
 # nil LabelSelectors in SchedulingClass affinity and topology spread terms.
diff --git a/packages/system/cozystack-scheduler/examples/demo/00-helpers.sh b/packages/system/cozystack-scheduler/examples/demo/00-helpers.sh
new file mode 100755
index 0000000000..1cd66446e0
--- /dev/null
+++ b/packages/system/cozystack-scheduler/examples/demo/00-helpers.sh
@@ -0,0 +1,121 @@
+#!/bin/bash
+# Helper functions for the scheduling classes demo
+# Source this file in other scripts: source "$(dirname "$0")/00-helpers.sh"
+
+# ANSI color codes
+export RED='\033[0;31m'
+export GREEN='\033[0;32m'
+export YELLOW='\033[1;33m'
+export BLUE='\033[0;34m'
+export MAGENTA='\033[0;35m'
+export CYAN='\033[0;36m'
+export WHITE='\033[1;37m'
+export NC='\033[0m' # No Color
+export BOLD='\033[1m'
+
+log_info() {
+    echo -e "${BLUE}ℹ${NC} $*" >&2
+}
+
+log_success() {
+    echo -e "${GREEN}✔${NC} $*" >&2
+}
+
+log_warning() {
+    echo -e "${YELLOW}⚠${NC} $*" >&2
+}
+
+log_error() {
+    echo -e "${RED}✖${NC} $*" >&2
+}
+
+log_step() {
+    echo -e "\n${MAGENTA}${BOLD}▶ $*${NC}" >&2
+}
+
+log_command() {
+    echo -e "${WHITE}  \$ $*${NC}" >&2
+}
+
+separator() {
+    echo -e "\n${CYAN}────────────────────────────────────────────────────────────${NC}\n" >&2
+}
+
+print_header() {
+    local title="$1"
+    echo -e "\n${MAGENTA}${BOLD}╔════════════════════════════════════════════════════════════╗${NC}" >&2
+    echo -e "${MAGENTA}${BOLD}║${NC} ${WHITE}${BOLD}$title${NC}" >&2
+    echo -e "${MAGENTA}${BOLD}╚════════════════════════════════════════════════════════════╝${NC}\n" >&2
+}
+
+# Display a YAML manifest with syntax highlighting (just colored output)
+show_manifest() {
+    echo -e "${YELLOW}$1${NC}" >&2
+}
+
+# Wait for user to press any key
+pause() {
+    echo -e "\n${CYAN}Press any key to continue...${NC}" >&2
+    read -rsn1
+}
+
+# Wait for pods to appear and stabilize
+wait_for_pods() {
+    local namespace="$1"
+    local label="${2:-}"
+    local timeout="${3:-120}"
+    local elapsed=0
+
+    log_info "Waiting for pods in $namespace..."
+    while true; do
+        local count
+        if [[ -n "$label" ]]; then
+            count=$(kubectl get pods -n "$namespace" -l "$label" --no-headers 2>/dev/null | wc -l)
+        else
+            count=$(kubectl get pods -n "$namespace" --no-headers 2>/dev/null | wc -l)
+        fi
+        if [[ "$count" -gt 0 ]]; then
+            break
+        fi
+        if [[ $elapsed -ge $timeout ]]; then
+            log_warning "Timed out waiting for pods"
+            return 1
+        fi
+        sleep 2
+        elapsed=$((elapsed + 2))
+    done
+    # Give pods a moment to get node assignments
+    sleep 3
+}
+
+# Show pods with node placement
+show_pods() {
+    local namespace="$1"
+    echo "" >&2
+    kubectl get pods -n "$namespace" -o wide 2>&1 >&2
+    echo "" >&2
+}
+
+# Wait for a Redis resource to be ready (HelmRelease applied)
+wait_for_redis_ready() {
+    local namespace="$1"
+    local name="$2"
+    local timeout="${3:-180}"
+    local elapsed=0
+
+    log_info "Waiting for Redis $name in $namespace to become ready..."
+    while true; do
+        local phase
+        phase=$(kubectl get redis "$name" -n "$namespace" -o jsonpath='{.status.conditions[0].status}' 2>/dev/null || echo "")
+        if [[ "$phase" == "True" ]]; then
+            log_success "Redis $name is ready"
+            break
+        fi
+        if [[ $elapsed -ge $timeout ]]; then
+            log_warning "Timed out waiting for Redis to be ready, continuing anyway..."
+            break
+        fi
+        sleep 5
+        elapsed=$((elapsed + 5))
+    done
+}
diff --git a/packages/system/cozystack-scheduler/examples/demo/01-scheduling-classes.sh b/packages/system/cozystack-scheduler/examples/demo/01-scheduling-classes.sh
new file mode 100755
index 0000000000..2ef6e9778a
--- /dev/null
+++ b/packages/system/cozystack-scheduler/examples/demo/01-scheduling-classes.sh
@@ -0,0 +1,133 @@
+#!/bin/bash
+# Script 01: Create SchedulingClasses
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "$SCRIPT_DIR/00-helpers.sh"
+
+print_header "Step 1: Create SchedulingClasses"
+
+# --- pin-to-node2 ---
+log_step "SchedulingClass: pin-to-node2"
+log_info "All pods will always be scheduled to node2."
+
+show_manifest "apiVersion: cozystack.io/v1alpha1
+kind: SchedulingClass
+metadata:
+  name: pin-to-node2
+spec:
+  nodeSelector:
+    kubernetes.io/hostname: node2"
+
+pause
+
+kubectl apply -f - <<'EOF'
+apiVersion: cozystack.io/v1alpha1
+kind: SchedulingClass
+metadata:
+  name: pin-to-node2
+spec:
+  nodeSelector:
+    kubernetes.io/hostname: node2
+EOF
+
+log_success "Created SchedulingClass pin-to-node2"
+
+separator
+
+# --- one-per-node ---
+log_step "SchedulingClass: one-per-node"
+log_info "Pods of the same application will never share a node."
+
+show_manifest "apiVersion: cozystack.io/v1alpha1
+kind: SchedulingClass
+metadata:
+  name: one-per-node
+spec:
+  podAntiAffinity:
+    requiredDuringSchedulingIgnoredDuringExecution:
+    - topologyKey: kubernetes.io/hostname"
+
+pause
+
+kubectl apply -f - <<'EOF'
+apiVersion: cozystack.io/v1alpha1
+kind: SchedulingClass
+metadata:
+  name: one-per-node
+spec:
+  podAntiAffinity:
+    requiredDuringSchedulingIgnoredDuringExecution:
+    - topologyKey: kubernetes.io/hostname
+EOF
+
+log_success "Created SchedulingClass one-per-node"
+
+separator
+
+# --- spread-evenly ---
+log_step "SchedulingClass: spread-evenly"
+log_info "Pods will be spread evenly across nodes (maxSkew=1)."
+
+show_manifest "apiVersion: cozystack.io/v1alpha1
+kind: SchedulingClass
+metadata:
+  name: spread-evenly
+spec:
+  topologySpreadConstraints:
+  - maxSkew: 1
+    topologyKey: kubernetes.io/hostname
+    whenUnsatisfiable: DoNotSchedule"
+
+pause
+
+kubectl apply -f - <<'EOF'
+apiVersion: cozystack.io/v1alpha1
+kind: SchedulingClass
+metadata:
+  name: spread-evenly
+spec:
+  topologySpreadConstraints:
+  - maxSkew: 1
+    topologyKey: kubernetes.io/hostname
+    whenUnsatisfiable: DoNotSchedule
+EOF
+
+log_success "Created SchedulingClass spread-evenly"
+
+separator
+
+# --- colocate ---
+log_step "SchedulingClass: colocate"
+log_info "All pods of the same application will land on the same node."
+
+show_manifest "apiVersion: cozystack.io/v1alpha1
+kind: SchedulingClass
+metadata:
+  name: colocate
+spec:
+  podAffinity:
+    requiredDuringSchedulingIgnoredDuringExecution:
+    - topologyKey: kubernetes.io/hostname"
+
+pause
+
+kubectl apply -f - <<'EOF'
+apiVersion: cozystack.io/v1alpha1
+kind: SchedulingClass
+metadata:
+  name: colocate
+spec:
+  podAffinity:
+    requiredDuringSchedulingIgnoredDuringExecution:
+    - topologyKey: kubernetes.io/hostname
+EOF
+
+log_success "Created SchedulingClass colocate"
+
+separator
+log_success "All SchedulingClasses created."
+log_command "kubectl get schedulingclasses"
+kubectl get schedulingclasses >&2
+
+echo -e "\n${GREEN}${BOLD}Next step:${NC} ./02-create-tenants.sh"
diff --git a/packages/system/cozystack-scheduler/examples/demo/02-create-tenants.sh b/packages/system/cozystack-scheduler/examples/demo/02-create-tenants.sh
new file mode 100755
index 0000000000..7a9d6b9d38
--- /dev/null
+++ b/packages/system/cozystack-scheduler/examples/demo/02-create-tenants.sh
@@ -0,0 +1,121 @@
+#!/bin/bash
+# Script 02: Create tenants, one per scheduling class
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "$SCRIPT_DIR/00-helpers.sh"
+
+print_header "Step 2: Create Tenants"
+
+# --- tenant colocate ---
+log_step "Tenant: colocate (schedulingClass: colocate)"
+
+show_manifest "apiVersion: apps.cozystack.io/v1alpha1
+kind: Tenant
+metadata:
+  name: colocate
+  namespace: tenant-root
+spec:
+  schedulingClass: colocate"
+
+pause
+
+kubectl apply -f - <<'EOF'
+apiVersion: apps.cozystack.io/v1alpha1
+kind: Tenant
+metadata:
+  name: colocate
+  namespace: tenant-root
+spec:
+  schedulingClass: colocate
+EOF
+
+log_success "Created tenant colocate"
+
+separator
+
+# --- tenant onepernode ---
+log_step "Tenant: onepernode (schedulingClass: one-per-node)"
+
+show_manifest "apiVersion: apps.cozystack.io/v1alpha1
+kind: Tenant
+metadata:
+  name: onepernode
+  namespace: tenant-root
+spec:
+  schedulingClass: one-per-node"
+
+pause
+
+kubectl apply -f - <<'EOF'
+apiVersion: apps.cozystack.io/v1alpha1
+kind: Tenant
+metadata:
+  name: onepernode
+  namespace: tenant-root
+spec:
+  schedulingClass: one-per-node
+EOF
+
+log_success "Created tenant onepernode"
+
+separator
+
+# --- tenant spread ---
+log_step "Tenant: spread (schedulingClass: spread-evenly)"
+
+show_manifest "apiVersion: apps.cozystack.io/v1alpha1
+kind: Tenant
+metadata:
+  name: spread
+  namespace: tenant-root
+spec:
+  schedulingClass: spread-evenly"
+
+pause
+
+kubectl apply -f - <<'EOF'
+apiVersion: apps.cozystack.io/v1alpha1
+kind: Tenant
+metadata:
+  name: spread
+  namespace: tenant-root
+spec:
+  schedulingClass: spread-evenly
+EOF
+
+log_success "Created tenant spread"
+
+separator
+
+# --- tenant node2 ---
+log_step "Tenant: node2 (schedulingClass: pin-to-node2)"
+
+show_manifest "apiVersion: apps.cozystack.io/v1alpha1
+kind: Tenant
+metadata:
+  name: node2
+  namespace: tenant-root
+spec:
+  schedulingClass: pin-to-node2"
+
+pause
+
+kubectl apply -f - <<'EOF'
+apiVersion: apps.cozystack.io/v1alpha1
+kind: Tenant
+metadata:
+  name: node2
+  namespace: tenant-root
+spec:
+  schedulingClass: pin-to-node2
+EOF
+
+log_success "Created tenant node2"
+
+separator
+log_success "All tenants created."
+log_command "kubectl get tenants -n tenant-root"
+kubectl get tenants -n tenant-root >&2
+
+echo -e "\n${GREEN}${BOLD}Next step:${NC} ./03-colocate-demo.sh"
diff --git a/packages/system/cozystack-scheduler/examples/demo/03-colocate-demo.sh b/packages/system/cozystack-scheduler/examples/demo/03-colocate-demo.sh
new file mode 100755
index 0000000000..9019a00a26
--- /dev/null
+++ b/packages/system/cozystack-scheduler/examples/demo/03-colocate-demo.sh
@@ -0,0 +1,69 @@
+#!/bin/bash
+# Script 03: Colocate demo - all pods of a Redis land on the same node
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "$SCRIPT_DIR/00-helpers.sh"
+
+NAMESPACE="tenant-colocate"
+REDIS_NAME="redis-demo"
+
+print_header "Step 3: Colocate Demo"
+
+log_step "Creating Redis in $NAMESPACE (1 replica + 3 sentinels)"
+
+show_manifest "apiVersion: apps.cozystack.io/v1alpha1
+kind: Redis
+metadata:
+  name: $REDIS_NAME
+  namespace: $NAMESPACE
+spec:
+  replicas: 1
+  storageClass: local
+  resourcesPreset: nano
+  authEnabled: false"
+
+pause
+
+kubectl apply -f - <<EOF
+apiVersion: apps.cozystack.io/v1alpha1
+kind: Redis
+metadata:
+  name: $REDIS_NAME
+  namespace: $NAMESPACE
+spec:
+  replicas: 1
+  storageClass: local
+  resourcesPreset: nano
+  authEnabled: false
+EOF
+
+log_success "Redis $REDIS_NAME created"
+
+separator
+
+log_step "Waiting for pods to be scheduled..."
+wait_for_redis_ready "$NAMESPACE" "$REDIS_NAME"
+wait_for_pods "$NAMESPACE"
+
+log_step "All pods should be on the SAME node:"
+show_pods "$NAMESPACE"
+
+pause
+
+separator
+
+log_step "Scaling up replicas to 9..."
+log_command "kubectl patch redis $REDIS_NAME -n $NAMESPACE --type=merge -p '{\"spec\":{\"replicas\":9}}'"
+
+kubectl patch redis "$REDIS_NAME" -n "$NAMESPACE" --type=merge -p '{"spec":{"replicas":9}}'
+
+log_info "Waiting for new pods..."
+sleep 15
+
+log_step "All pods (storage + sentinels) are still on the same node:"
+show_pods "$NAMESPACE"
+
+separator
+log_success "Colocate demo complete. All pods landed on one node."
+echo -e "\n${GREEN}${BOLD}Next step:${NC} ./04-colocate-second-redis.sh"
diff --git a/packages/system/cozystack-scheduler/examples/demo/04-colocate-second-redis.sh b/packages/system/cozystack-scheduler/examples/demo/04-colocate-second-redis.sh
new file mode 100755
index 0000000000..eea8c6ffc8
--- /dev/null
+++ b/packages/system/cozystack-scheduler/examples/demo/04-colocate-second-redis.sh
@@ -0,0 +1,61 @@
+#!/bin/bash
+# Script 04: Second Redis in colocate tenant - shows cross-app independence
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "$SCRIPT_DIR/00-helpers.sh"
+
+NAMESPACE="tenant-colocate"
+REDIS_NAME="redis-demo2"
+
+print_header "Step 4: Colocate - Second Redis (cross-app independence)"
+
+log_step "Cleaning up $REDIS_NAME if it already exists..."
+kubectl delete redis "$REDIS_NAME" -n "$NAMESPACE" --ignore-not-found >&2
+sleep 3
+
+separator
+
+log_step "Creating a second Redis in $NAMESPACE"
+log_info "This Redis will colocate its own pods together,"
+log_info "but may land on a DIFFERENT node than the first Redis."
+
+show_manifest "apiVersion: apps.cozystack.io/v1alpha1
+kind: Redis
+metadata:
+  name: $REDIS_NAME
+  namespace: $NAMESPACE
+spec:
+  replicas: 1
+  storageClass: local
+  resourcesPreset: nano
+  authEnabled: false"
+
+pause
+
+kubectl apply -f - <<EOF
+apiVersion: apps.cozystack.io/v1alpha1
+kind: Redis
+metadata:
+  name: $REDIS_NAME
+  namespace: $NAMESPACE
+spec:
+  replicas: 1
+  storageClass: local
+  resourcesPreset: nano
+  authEnabled: false
+EOF
+
+log_success "Redis $REDIS_NAME created"
+
+log_step "Waiting for pods to be scheduled..."
+wait_for_redis_ready "$NAMESPACE" "$REDIS_NAME"
+wait_for_pods "$NAMESPACE"
+
+log_step "Pod placement for both Redis instances:"
+log_info "Each Redis colocates its own pods, but the two Redises are independent."
+show_pods "$NAMESPACE"
+
+separator
+log_success "Second Redis demo complete."
+echo -e "\n${GREEN}${BOLD}Next step:${NC} ./05-colocate-cleanup.sh"
diff --git a/packages/system/cozystack-scheduler/examples/demo/05-colocate-cleanup.sh b/packages/system/cozystack-scheduler/examples/demo/05-colocate-cleanup.sh
new file mode 100755
index 0000000000..8baca4a4c0
--- /dev/null
+++ b/packages/system/cozystack-scheduler/examples/demo/05-colocate-cleanup.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+# Script 05: Clean up Redis instances in tenant-colocate
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "$SCRIPT_DIR/00-helpers.sh"
+
+NAMESPACE="tenant-colocate"
+
+print_header "Step 5: Clean up tenant-colocate"
+
+log_step "Deleting all Redis instances in $NAMESPACE..."
+
+kubectl delete redis --all -n "$NAMESPACE" --ignore-not-found >&2
+
+log_info "Waiting for pods to terminate..."
+sleep 10
+
+log_step "Remaining pods:"
+show_pods "$NAMESPACE"
+
+separator
+log_success "Cleanup complete."
+echo -e "\n${GREEN}${BOLD}Next step:${NC} ./06-onepernode-demo.sh"
diff --git a/packages/system/cozystack-scheduler/examples/demo/06-onepernode-demo.sh b/packages/system/cozystack-scheduler/examples/demo/06-onepernode-demo.sh
new file mode 100755
index 0000000000..f656422ac7
--- /dev/null
+++ b/packages/system/cozystack-scheduler/examples/demo/06-onepernode-demo.sh
@@ -0,0 +1,92 @@
+#!/bin/bash
+# Script 06: One-per-node demo - anti-affinity prevents pods on the same node
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "$SCRIPT_DIR/00-helpers.sh"
+
+NAMESPACE="tenant-onepernode"
+REDIS_NAME="redis-demo"
+
+print_header "Step 6: One-per-node Demo"
+
+log_step "Creating Redis in $NAMESPACE (1 replica)"
+log_info "We'll also reduce sentinels to 2 (1 storage + 2 sentinels = 3 pods for 3 nodes)."
+
+show_manifest "apiVersion: apps.cozystack.io/v1alpha1
+kind: Redis
+metadata:
+  name: $REDIS_NAME
+  namespace: $NAMESPACE
+spec:
+  replicas: 1
+  storageClass: local
+  resourcesPreset: nano
+  authEnabled: false"
+
+pause
+
+kubectl apply -f - <<EOF
+apiVersion: apps.cozystack.io/v1alpha1
+kind: Redis
+metadata:
+  name: $REDIS_NAME
+  namespace: $NAMESPACE
+spec:
+  replicas: 1
+  storageClass: local
+  resourcesPreset: nano
+  authEnabled: false
+EOF
+
+log_success "Redis $REDIS_NAME created"
+
+log_info "Waiting for RedisFailover to appear..."
+sleep 10
+
+log_step "Patching RedisFailover to use 2 sentinels instead of 3"
+log_info "With 3 nodes and anti-affinity, 1 storage + 3 sentinels = 4 pods won't fit."
+log_command "kubectl patch rf $REDIS_NAME -n $NAMESPACE --type=merge -p '{\"spec\":{\"sentinel\":{\"replicas\":2}}}'"
+
+kubectl patch rf redis-"$REDIS_NAME" -n "$NAMESPACE" --type=merge -p '{"spec":{"sentinel":{"replicas":2}}}'
+
+log_info "Waiting for pods to be scheduled..."
+wait_for_pods "$NAMESPACE"
+sleep 5
+
+log_step "Each pod is on a different node (1 storage + 2 sentinels on 3 nodes):"
+show_pods "$NAMESPACE"
+
+pause
+
+separator
+
+log_step "Scaling up to 3 replicas..."
+log_command "kubectl patch redis $REDIS_NAME -n $NAMESPACE --type=merge -p '{\"spec\":{\"replicas\":3}}'"
+
+kubectl patch redis "$REDIS_NAME" -n "$NAMESPACE" --type=merge -p '{"spec":{"replicas":3}}'
+
+log_info "Waiting for new pods..."
+sleep 15
+
+log_step "Some pods should now be Pending (anti-affinity prevents scheduling):"
+show_pods "$NAMESPACE"
+
+pause
+
+separator
+
+log_step "Describing a Pending pod to see why it can't be scheduled..."
+PENDING_POD=$(kubectl get pods -n "$NAMESPACE" --field-selector=status.phase=Pending -o jsonpath='{.items[0].metadata.name}' 2>/dev/null || echo "")
+
+if [[ -n "$PENDING_POD" ]]; then
+    log_command "kubectl describe pod $PENDING_POD -n $NAMESPACE | tail -10"
+    kubectl describe pod "$PENDING_POD" -n "$NAMESPACE" 2>&1 | tail -10 >&2
+else
+    log_warning "No Pending pods found (pods may still be initializing)."
+    log_command "kubectl get pods -n $NAMESPACE -o wide"
+fi
+
+separator
+log_success "One-per-node demo complete. Anti-affinity prevents co-scheduling."
+echo -e "\n${GREEN}${BOLD}Next step:${NC} ./07-onepernode-second-redis.sh"
diff --git a/packages/system/cozystack-scheduler/examples/demo/07-onepernode-second-redis.sh b/packages/system/cozystack-scheduler/examples/demo/07-onepernode-second-redis.sh
new file mode 100755
index 0000000000..e86a07e81a
--- /dev/null
+++ b/packages/system/cozystack-scheduler/examples/demo/07-onepernode-second-redis.sh
@@ -0,0 +1,68 @@
+#!/bin/bash
+# Script 07: Second Redis in one-per-node tenant - shows cross-app independence
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "$SCRIPT_DIR/00-helpers.sh"
+
+NAMESPACE="tenant-onepernode"
+REDIS_NAME="redis-demo2"
+
+print_header "Step 7: One-per-node - Second Redis (cross-app independence)"
+
+log_step "Cleaning up $REDIS_NAME if it already exists..."
+kubectl delete redis "$REDIS_NAME" -n "$NAMESPACE" --ignore-not-found >&2
+sleep 3
+
+separator
+
+log_step "Creating a second Redis in $NAMESPACE"
+log_info "Anti-affinity only applies WITHIN the same application."
+log_info "This second Redis has no anti-affinity against the first one."
+
+show_manifest "apiVersion: apps.cozystack.io/v1alpha1
+kind: Redis
+metadata:
+  name: $REDIS_NAME
+  namespace: $NAMESPACE
+spec:
+  replicas: 1
+  storageClass: local
+  resourcesPreset: nano
+  authEnabled: false"
+
+pause
+
+kubectl apply -f - <<EOF
+apiVersion: apps.cozystack.io/v1alpha1
+kind: Redis
+metadata:
+  name: $REDIS_NAME
+  namespace: $NAMESPACE
+spec:
+  replicas: 1
+  storageClass: local
+  resourcesPreset: nano
+  authEnabled: false
+EOF
+
+log_success "Redis $REDIS_NAME created"
+
+log_info "Waiting for RedisFailover to appear..."
+sleep 10
+
+log_step "Patching sentinels to 2 for the second Redis as well"
+kubectl patch rf redis-"$REDIS_NAME" -n "$NAMESPACE" --type=merge -p '{"spec":{"sentinel":{"replicas":2}}}'
+
+log_info "Waiting for pods to be scheduled..."
+wait_for_pods "$NAMESPACE"
+sleep 5
+
+log_step "Pod placement for both Redis instances:"
+log_info "Each Redis spreads its own pods one-per-node independently."
+log_info "The two Redises CAN share nodes — anti-affinity is per-application."
+show_pods "$NAMESPACE"
+
+separator
+log_success "Second Redis demo complete."
+echo -e "\n${GREEN}${BOLD}Next step:${NC} ./08-onepernode-cleanup.sh"
diff --git a/packages/system/cozystack-scheduler/examples/demo/08-onepernode-cleanup.sh b/packages/system/cozystack-scheduler/examples/demo/08-onepernode-cleanup.sh
new file mode 100755
index 0000000000..071a5ff2ee
--- /dev/null
+++ b/packages/system/cozystack-scheduler/examples/demo/08-onepernode-cleanup.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+# Script 08: Clean up Redis instances in tenant-onepernode
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "$SCRIPT_DIR/00-helpers.sh"
+
+NAMESPACE="tenant-onepernode"
+
+print_header "Step 8: Clean up tenant-onepernode"
+
+log_step "Deleting all Redis instances in $NAMESPACE..."
+
+kubectl delete redis --all -n "$NAMESPACE" --ignore-not-found >&2
+
+log_info "Waiting for pods to terminate..."
+sleep 10
+
+log_step "Remaining pods:"
+show_pods "$NAMESPACE"
+
+separator
+log_success "Cleanup complete."
+echo -e "\n${GREEN}${BOLD}Next step:${NC} ./09-spread-demo.sh"
diff --git a/packages/system/cozystack-scheduler/examples/demo/09-spread-demo.sh b/packages/system/cozystack-scheduler/examples/demo/09-spread-demo.sh
new file mode 100755
index 0000000000..91d3b35f98
--- /dev/null
+++ b/packages/system/cozystack-scheduler/examples/demo/09-spread-demo.sh
@@ -0,0 +1,73 @@
+#!/bin/bash
+# Script 09: Spread-evenly demo - topology spread constraints
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "$SCRIPT_DIR/00-helpers.sh"
+
+NAMESPACE="tenant-spread"
+REDIS_NAME="redis-demo"
+
+print_header "Step 9: Spread-evenly Demo"
+
+log_step "Creating Redis in $NAMESPACE (1 replica)"
+
+show_manifest "apiVersion: apps.cozystack.io/v1alpha1
+kind: Redis
+metadata:
+  name: $REDIS_NAME
+  namespace: $NAMESPACE
+spec:
+  replicas: 1
+  storageClass: local
+  resourcesPreset: nano
+  authEnabled: false"
+
+pause
+
+kubectl apply -f - <<EOF
+apiVersion: apps.cozystack.io/v1alpha1
+kind: Redis
+metadata:
+  name: $REDIS_NAME
+  namespace: $NAMESPACE
+spec:
+  replicas: 1
+  storageClass: local
+  resourcesPreset: nano
+  authEnabled: false
+EOF
+
+log_success "Redis $REDIS_NAME created"
+
+log_info "Waiting for pods to be scheduled..."
+wait_for_redis_ready "$NAMESPACE" "$REDIS_NAME"
+wait_for_pods "$NAMESPACE"
+
+log_step "Initial pod distribution (1 storage + 3 sentinels):"
+show_pods "$NAMESPACE"
+
+pause
+
+separator
+
+log_step "Scaling up to 9 replicas..."
+log_command "kubectl patch redis $REDIS_NAME -n $NAMESPACE --type=merge -p '{\"spec\":{\"replicas\":9}}'"
+
+kubectl patch redis "$REDIS_NAME" -n "$NAMESPACE" --type=merge -p '{"spec":{"replicas":9}}'
+
+log_info "Waiting for new pods..."
+sleep 20
+
+log_step "Pods should be evenly distributed across all nodes (maxSkew=1):"
+show_pods "$NAMESPACE"
+
+separator
+
+log_step "Pod count per node:"
+kubectl get pods -n "$NAMESPACE" -o wide --no-headers 2>/dev/null \
+    | awk '{print $7}' | sort | uniq -c | sort -rn >&2
+
+separator
+log_success "Spread-evenly demo complete. Pods are balanced across nodes."
+echo -e "\n${GREEN}${BOLD}Next step:${NC} ./10-spread-cleanup.sh"
diff --git a/packages/system/cozystack-scheduler/examples/demo/10-spread-cleanup.sh b/packages/system/cozystack-scheduler/examples/demo/10-spread-cleanup.sh
new file mode 100755
index 0000000000..9049aff59c
--- /dev/null
+++ b/packages/system/cozystack-scheduler/examples/demo/10-spread-cleanup.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+# Script 10: Clean up Redis instances in tenant-spread
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "$SCRIPT_DIR/00-helpers.sh"
+
+NAMESPACE="tenant-spread"
+
+print_header "Step 10: Clean up tenant-spread"
+
+log_step "Deleting all Redis instances in $NAMESPACE..."
+
+kubectl delete redis --all -n "$NAMESPACE" --ignore-not-found >&2
+
+log_info "Waiting for pods to terminate..."
+sleep 10
+
+log_step "Remaining pods:"
+show_pods "$NAMESPACE"
+
+separator
+log_success "Cleanup complete."
+echo -e "\n${GREEN}${BOLD}Next step:${NC} ./11-node2-demo.sh"
diff --git a/packages/system/cozystack-scheduler/examples/demo/11-node2-demo.sh b/packages/system/cozystack-scheduler/examples/demo/11-node2-demo.sh
new file mode 100755
index 0000000000..a3ae32ec77
--- /dev/null
+++ b/packages/system/cozystack-scheduler/examples/demo/11-node2-demo.sh
@@ -0,0 +1,94 @@
+#!/bin/bash
+# Script 11: Pin-to-node2 demo - all pods on a specific node
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "$SCRIPT_DIR/00-helpers.sh"
+
+NAMESPACE="tenant-node2"
+REDIS1="redis-demo"
+REDIS2="redis-demo2"
+
+print_header "Step 11: Pin-to-node2 Demo"
+
+log_step "Creating first Redis in $NAMESPACE"
+
+show_manifest "apiVersion: apps.cozystack.io/v1alpha1
+kind: Redis
+metadata:
+  name: $REDIS1
+  namespace: $NAMESPACE
+spec:
+  replicas: 1
+  storageClass: local
+  resourcesPreset: nano
+  authEnabled: false"
+
+pause
+
+kubectl apply -f - <<EOF
+apiVersion: apps.cozystack.io/v1alpha1
+kind: Redis
+metadata:
+  name: $REDIS1
+  namespace: $NAMESPACE
+spec:
+  replicas: 1
+  storageClass: local
+  resourcesPreset: nano
+  authEnabled: false
+EOF
+
+log_success "Redis $REDIS1 created"
+
+log_info "Waiting for pods to be scheduled..."
+wait_for_redis_ready "$NAMESPACE" "$REDIS1"
+wait_for_pods "$NAMESPACE"
+
+log_step "All pods should be on node2:"
+show_pods "$NAMESPACE"
+
+pause
+
+separator
+
+log_step "Creating a second Redis in $NAMESPACE"
+
+show_manifest "apiVersion: apps.cozystack.io/v1alpha1
+kind: Redis
+metadata:
+  name: $REDIS2
+  namespace: $NAMESPACE
+spec:
+  replicas: 1
+  storageClass: local
+  resourcesPreset: nano
+  authEnabled: false"
+
+pause
+
+kubectl apply -f - <<EOF
+apiVersion: apps.cozystack.io/v1alpha1
+kind: Redis
+metadata:
+  name: $REDIS2
+  namespace: $NAMESPACE
+spec:
+  replicas: 1
+  storageClass: local
+  resourcesPreset: nano
+  authEnabled: false
+EOF
+
+log_success "Redis $REDIS2 created"
+
+log_info "Waiting for pods to be scheduled..."
+wait_for_redis_ready "$NAMESPACE" "$REDIS2"
+wait_for_pods "$NAMESPACE"
+
+log_step "Both Redis instances — all pods pinned to node2:"
+show_pods "$NAMESPACE"
+
+separator
+log_success "Pin-to-node2 demo complete."
+echo -e "\n${GREEN}${BOLD}Next step:${NC} ./12-node2-cleanup.sh"
diff --git a/packages/system/cozystack-scheduler/examples/demo/12-node2-cleanup.sh b/packages/system/cozystack-scheduler/examples/demo/12-node2-cleanup.sh
new file mode 100755
index 0000000000..ed48988d04
--- /dev/null
+++ b/packages/system/cozystack-scheduler/examples/demo/12-node2-cleanup.sh
@@ -0,0 +1,23 @@
+#!/bin/bash
+# Script 12: Clean up Redis instances in tenant-node2
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "$SCRIPT_DIR/00-helpers.sh"
+
+NAMESPACE="tenant-node2"
+
+print_header "Step 12: Clean up tenant-node2"
+
+log_step "Deleting all Redis instances in $NAMESPACE..."
+
+kubectl delete redis --all -n "$NAMESPACE" --ignore-not-found >&2
+
+log_info "Waiting for pods to terminate..."
+sleep 10
+
+log_step "Remaining pods:"
+show_pods "$NAMESPACE"
+
+separator
+log_success "Cleanup complete. Demo finished!"
diff --git a/packages/system/cozystack-scheduler/examples/demo/13-teardown.sh b/packages/system/cozystack-scheduler/examples/demo/13-teardown.sh
new file mode 100755
index 0000000000..529df7b255
--- /dev/null
+++ b/packages/system/cozystack-scheduler/examples/demo/13-teardown.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+# Script 13: Tear down all tenants and scheduling classes
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "$SCRIPT_DIR/00-helpers.sh"
+
+print_header "Teardown: Remove tenants and scheduling classes"
+
+log_step "Deleting tenants..."
+for t in colocate onepernode spread node2; do
+    kubectl delete tenant "$t" -n tenant-root --ignore-not-found >&2
+done
+
+log_info "Waiting for tenant namespaces to be cleaned up..."
+sleep 15
+
+log_step "Deleting scheduling classes..."
+for sc in colocate one-per-node spread-evenly pin-to-node2; do
+    kubectl delete schedulingclass "$sc" --ignore-not-found >&2
+done
+
+separator
+log_success "Teardown complete."
diff --git a/packages/system/dashboard/.gitignore b/packages/system/dashboard/.gitignore
index 927de37f8e..f4059509c0 100644
--- a/packages/system/dashboard/.gitignore
+++ b/packages/system/dashboard/.gitignore
@@ -1,2 +1,2 @@
-.tmp-cozystack-ui
 images/token-proxy/token-proxy
+images/*.json
diff --git a/packages/system/dashboard/Makefile b/packages/system/dashboard/Makefile
index 1d090ae38d..52d9c79be7 100644
--- a/packages/system/dashboard/Makefile
+++ b/packages/system/dashboard/Makefile
@@ -5,7 +5,7 @@ include ../../../hack/common-envs.mk
 include ../../../hack/package.mk
 
 .PHONY: image image-console image-token-proxy test test-go test-helm
-.PHONY: clone-console build-console update-values-console clean-console
+.PHONY: build-console update-values-console
 .NOTPARALLEL: image
 
 test: test-helm test-go
@@ -18,49 +18,30 @@ test-go:
 
 image: image-console image-token-proxy
 
-CONSOLE_REPO ?= https://github.com/cozystack/cozystack-ui.git
-CONSOLE_BRANCH ?= main
-
-image-console: clone-console build-console update-values-console clean-console
-
-clone-console:
-	rm -rf .tmp-cozystack-ui
-	git clone --depth 1 --branch $(CONSOLE_BRANCH) $(CONSOLE_REPO) .tmp-cozystack-ui
+image-console: build-console update-values-console
 
+# Console source lives in-tree under images/console (vendored from the former
+# cozystack-ui repo). Build from that context directly — no clone step.
 build-console:
-	docker buildx build .tmp-cozystack-ui \
-		--file .tmp-cozystack-ui/Containerfile \
-		--provenance false \
-		--builder=$(BUILDER) \
-		--platform=linux/amd64 \
+	docker buildx build images/console \
+		--file images/console/Containerfile \
 		$(call image-tags,cozystack-ui,v$(COZYSTACK_VERSION)) \
-		--cache-from type=registry,ref=$(REGISTRY)/cozystack-ui:latest \
-		--cache-to type=inline \
+		$(call cache-args,cozystack-ui) \
 		--metadata-file images/console.json \
-		--build-arg APP_VERSION=$(COZYSTACK_VERSION) \
-		--push=$(PUSH) \
-		--label "org.opencontainers.image.source=https://github.com/cozystack/cozystack-ui" \
-		--load=$(LOAD)
+		--build-arg APP_VERSION=$(if $(COZYSTACK_VERSION),v$(COZYSTACK_VERSION),) \
+		$(BUILDX_ARGS)
 
 update-values-console:
 	IMAGE="$(REGISTRY)/cozystack-ui:$(IMAGE_TAG)@$$(yq e '."containerimage.digest"' images/console.json -r)" \
 		yq -i '.console.image = strenv(IMAGE)' values.yaml
-
-clean-console:
-	rm -rf .tmp-cozystack-ui images/console.json
+	rm -f images/console.json
 
 image-token-proxy:
 	docker buildx build images/token-proxy \
-		--provenance false \
-		--builder=$(BUILDER) \
-		--platform=linux/amd64 \
 		$(call image-tags,token-proxy,v$(COZYSTACK_VERSION)) \
-		--cache-from type=registry,ref=$(REGISTRY)/token-proxy:latest \
-		--cache-to type=inline \
+		$(call cache-args,token-proxy) \
 		--metadata-file images/token-proxy.json \
-		--push=$(PUSH) \
-		--label "org.opencontainers.image.source=https://github.com/cozystack/cozystack" \
-		--load=$(LOAD)
+		$(BUILDX_ARGS)
 	IMAGE="$(REGISTRY)/token-proxy:$(IMAGE_TAG)@$$(yq e '."containerimage.digest"' images/token-proxy.json -r)" \
 		yq -i '.tokenProxy.image = strenv(IMAGE)' values.yaml
 	rm -f images/token-proxy.json
diff --git a/packages/system/dashboard/images/console/.gitignore b/packages/system/dashboard/images/console/.gitignore
new file mode 100644
index 0000000000..932d940605
--- /dev/null
+++ b/packages/system/dashboard/images/console/.gitignore
@@ -0,0 +1,11 @@
+node_modules
+dist
+.DS_Store
+*.log
+.env
+.env.local
+.vite
+.turbo
+tsconfig.tsbuildinfo
+**/tsconfig.tsbuildinfo
+kubeconfig
diff --git a/packages/system/dashboard/images/console/.npmrc b/packages/system/dashboard/images/console/.npmrc
new file mode 100644
index 0000000000..4c2f52b3be
--- /dev/null
+++ b/packages/system/dashboard/images/console/.npmrc
@@ -0,0 +1,2 @@
+auto-install-peers=true
+strict-peer-dependencies=false
diff --git a/packages/system/dashboard/images/console/CLAUDE.md b/packages/system/dashboard/images/console/CLAUDE.md
new file mode 100644
index 0000000000..2acf80504b
--- /dev/null
+++ b/packages/system/dashboard/images/console/CLAUDE.md
@@ -0,0 +1,197 @@
+# cozystack-ui
+
+Cozystack Marketplace + Console — a **pure SPA that talks directly to the
+Kubernetes API**. No BFF, no backend, no codegen. UI entities are discovered
+at runtime from `ApplicationDefinition` CRDs in the cluster.
+
+## Development model
+
+This UI is **developed entirely by Claude**. There is no human author writing
+features in parallel. Every file in this repo was produced through a Claude
+session and every change should be reviewable as a small, self-contained PR.
+Implications:
+
+- Keep modules small and obvious. The next Claude session has no tribal
+  knowledge — only what's in code, tests, and this file.
+- Prefer convention over abstraction. Three similar widgets are better than a
+  premature factory.
+- If you're tempted to write a comment explaining *what* the code does, rename
+  things instead. Only comment the non-obvious *why* (constraints, k8s quirks,
+  workarounds) — and keep it to one short line.
+- Don't leave half-finished scaffolding behind. If you start a refactor and
+  bail, revert it.
+
+## Stack
+
+- **pnpm workspace** — `apps/console` is the SPA; `packages/{k8s-client,ui,types}` are workspace deps.
+- **React 19 + Vite 8 + TypeScript ~6.0** with `module: esnext`,
+  `moduleResolution: bundler`, `verbatimModuleSyntax`, `allowImportingTsExtensions`,
+  `erasableSyntaxOnly`, `noUnusedLocals`, `noUnusedParameters`.
+- **Tailwind 4** via `@tailwindcss/vite` + **Base UI** (`@base-ui/react`) for primitives.
+- **React Query** for caching; custom watch layer streams chunked JSON events.
+- **RJSF** (`@rjsf/core` + `validator-ajv8`) for application config forms.
+- **Vitest + jsdom + @testing-library/react** for tests.
+- **Monaco** for YAML view, **noVNC** for the VM console tab.
+
+## Dev loop
+
+```sh
+pnpm install
+kubectl proxy --port 8001          # required — terminates TLS, proxies /api + /apis
+pnpm dev                            # http://localhost:3001
+pnpm typecheck                      # tsc --noEmit across the workspace
+pnpm test                           # vitest run
+pnpm lint                           # eslint
+pnpm build                          # tsc check + vite build into apps/console/dist
+```
+
+The Vite dev server proxies `/api`, `/apis`, and `/k8s` (VNC WebSocket prefix)
+to `kubectl proxy`. In production, nginx (see `Containerfile`) proxies the
+same paths to `kubernetes.default.svc` without touching any credential header,
+so the request carries the user's own `Authorization` from the gatekeeper and
+the apiserver checks that user's RBAC.
+
+## Code style
+
+- **No semicolons.** Match the surrounding code — every file in the tree
+  follows this. Don't reformat existing files.
+- **Always import with explicit `.ts` / `.tsx` extensions** — required by
+  `allowImportingTsExtensions` and the way packages re-export.
+- **`import type { ... }` for type-only imports** — required by `verbatimModuleSyntax`.
+- **Path aliases**: `@/` → `apps/console/src/`, plus the workspace deps
+  `@cozystack/{k8s-client,ui,types}`. Don't reach into `../../packages/...`.
+- **No `any`.** Use `unknown` and narrow, or a precise local interface.
+  `as any` casts in older files are debt to pay down, not a pattern to extend.
+- **No new top-level deps without a reason in the PR description.** This is a
+  static SPA that ships to every Cozystack cluster — bundle size matters.
+
+## Architecture rules
+
+1. **Talk to the Kubernetes API directly.** Use `@cozystack/k8s-client`
+   (`useK8sList`, `useK8sGet`, `useK8sCreate`, `useK8sUpdate`, `useK8sDelete`).
+   Don't add a backend, server route, or proxy of your own.
+2. **Discover, don't hardcode.** The marketplace, sidebar, detail pages, and
+   forms are all driven from `ApplicationDefinition` resources
+   (`cozystack.io/v1alpha1`). Adding a new application kind to Cozystack
+   should require zero UI changes — if it doesn't, fix the generic path
+   instead of adding a special case.
+3. **`useK8sList` already does watches.** It seeds with a LIST then upgrades
+   to a chunked-encoding WATCH against the same `resourceVersion`. Don't
+   poll. Don't add `refetchInterval`. If you need a one-shot, pass
+   `{ watch: false }`.
+4. **Tenant scoping.** Most resources live in `tenant-<name>` namespaces.
+   Pull the active tenant from `useTenantContext()` — never read the
+   namespace from a URL param or guess it.
+5. **Auth.** In production the SPA sits behind oauth2-proxy. The client
+   relies on cookies forwarded by nginx, and `/oauth2/userinfo` returns the
+   logged-in user. There is no token handling in the SPA itself.
+
+## Forms (RJSF) pipeline
+
+Every application's configure form is built from
+`ApplicationDefinition.spec.application.openAPISchema` (a JSON-encoded OpenAPI
+schema). The pipeline in `apps/console/src/components/SchemaForm.tsx`:
+
+1. `sanitizeSchema` strips Kubernetes-specific extensions
+   (`x-kubernetes-int-or-string`, `x-kubernetes-preserve-unknown-fields`) and
+   renames `"Chart Values"` → `"Parameters"`.
+2. `keysOrderToUiSchema` reads `spec.dashboard.keysOrder` and emits per-level
+   `ui:order` arrays.
+3. A chain of `addXxxWidgets(schema, uiSchema)` walks the schema and binds
+   widgets:
+   - any field carrying the `x-cozystack-options` schema keyword → `DynamicOptionsWidget`, a runtime dropdown populated from the cluster's `Option` resource (`core.cozystack.io`) keyed by the keyword's `source`; `addDynamicOptionWidgets` (`lib/dynamic-options.ts`) recurses into `properties`, array `items` and `additionalProperties`, and replaces the former field-name-bound `StorageClassWidget` / `BackupClassWidget` / `VMDiskWidget`.
+   - object carrying `x-cozystack-no-enable-switch: true` → rendered by `CustomObjectFieldTemplate` as a fieldset saying it has no enable switch and that an `enabled` field in YAML does nothing. Declared in `values.yaml` as `## @x-cozystack-no-enable-switch true` on the `@field` line it belongs to, and generated through to `values.schema.json` and the ApplicationDefinition. Must be declared rather than inferred from the object's fields: an unrelated `valuesOverride`-only object would otherwise inherit the copy, and adding a second field would silently drop it.
+   - object with `additionalProperties: <schema>` → `AdditionalPropertiesField`
+   - credential-shaped fields (`password`, `*token`, `*accessKey`, …) →
+     `SensitiveStringWidget` — see `lib/sensitive-fields.ts` and its tests for
+     the exact matching rules.
+4. Defaults are emitted to the parent once per schema via `getDefaultFormState`
+   so the first submit always carries a populated spec.
+
+When you add a new widget binding:
+
+- Add it to the chain in `SchemaForm.tsx` in a deterministic order.
+- Walk `properties` *and* `items` for arrays. Do **not** walk
+  `oneOf`/`anyOf`/`allOf` unless a real chart needs it — there's a
+  "pin broken behaviour" test that documents this gap intentionally.
+- Don't mutate the input `uiSchema`. Return a new object. There are tests
+  asserting this.
+
+## Project layout
+
+```
+apps/console/
+  src/
+    App.tsx, main.tsx              # entry + routing
+    routes/                         # one file per top-level page
+      detail/                       # ApplicationDetailPage + tabs (Overview, Workloads, …)
+    components/                     # page-level components, form widgets, command palette
+    lib/                            # app-definitions, tenant-context, sensitive-fields, …
+    hooks/
+  test/setup.ts                     # vitest + jest-dom + manual RTL cleanup
+packages/
+  k8s-client/   # K8sClient (list/get/create/update/patch/delete/watch) + React Query hooks
+  ui/           # AppShell, Sidebar, Header, Button, StatusBadge, Spinner, Dropdown, Section
+  types/        # ApplicationDefinition, ApplicationInstance, Tenant, TenantNamespace, group/version constants
+Containerfile                       # multi-stage build → nginx-unprivileged on :8080
+.github/workflows/                  # test.yaml (typecheck + vitest), build.yaml (multi-arch image to ghcr)
+```
+
+## Keyboard and clipboard input
+
+Both VM console tabs take keyboard input and a paste, and that surface has a
+history of defects that every local oracle missed. If you touch it, read this
+first.
+
+- **A synthetic event is not an oracle.** `new KeyboardEvent(...)` dispatched
+  from a script does not reach xterm at all, and a `ClipboardEvent` dispatched
+  straight at the paste sink skips the real keyboard entirely. Drive the real
+  thing (`Input.dispatchKeyEvent` over CDP, `press_key` in the chrome-devtools
+  MCP) and confirm the probe can see anything at all by sending a plain letter
+  first. A probe that reports "no defect" without that control has reported
+  nothing.
+- **Say what the lower layer already received.** noVNC sends a modifier down to
+  the guest the moment it is pressed and releases it only on keyup, so a paste
+  that starts while the chord is held types chords rather than characters —
+  under Ctrl an `m` is Return. `typeKeystrokes` releases the host's modifiers
+  before the first character for exactly this reason.
+- **Work the matrix, not one case:** platform × chord × modifiers held before
+  the action. Ctrl+V does not paste on macOS, and xterm turns Ctrl with a
+  letter into a control byte, so "works on my machine" covers one cell of six.
+- **Never type part of a paste.** A character the keymap cannot produce changes
+  what the rest means, and the newline after it still submits:
+  `rm -rf /srv/данные` becomes `rm -rf /srv`. Refuse the whole paste and say so
+  before anything is sent.
+- **A fake with no keyboard state cannot show any of this.** `FakeRFB` in
+  `VncTab.clipboard.test.tsx` tracks which modifiers the guest believes are
+  down and records what it received, chords marked. Assert on that, not on a
+  list of `sendKey` calls.
+
+## Testing
+
+- Tests live next to the code they cover (`SensitiveStringWidget.test.tsx`,
+  `sensitive-fields.test.ts`). Co-locate; don't centralise.
+- `apps/console/test/setup.ts` wires `@testing-library/jest-dom` and registers
+  `afterEach(cleanup)` manually — vitest is **not** run with `globals: true`,
+  so `expect`, `describe`, etc. must be imported explicitly.
+- When you fix a subtle widget bug, write the test first. The
+  `addSensitiveStringWidgets` suite is the model: small focused cases, one
+  invariant per `it`, and a "pin broken behaviour" group for known gaps.
+
+## CI
+
+`test.yaml` runs `pnpm typecheck` + `pnpm test` on every push and PR.
+`build.yaml` builds and pushes a multi-arch image to
+`ghcr.io/<repo>` on `main` and `v*` tags. Don't add other workflows without a
+clear reason — keep CI fast.
+
+## What goes in a good PR here
+
+- One feature or one fix per branch. Small enough that a human can review it
+  in a few minutes without context.
+- A title that follows the conventional-commit style already in use
+  (`feat(console): …`, `fix(forms): …`, `fix(external-ips): …`).
+- If you touched form logic, add or update tests.
+- If you added a new application kind to the sidebar/marketplace, double-check
+  that the generic path handles it instead of special-casing.
+- Don't bundle drive-by reformatting with a behavioural change.
diff --git a/packages/system/dashboard/images/console/Containerfile b/packages/system/dashboard/images/console/Containerfile
new file mode 100644
index 0000000000..84d634f467
--- /dev/null
+++ b/packages/system/dashboard/images/console/Containerfile
@@ -0,0 +1,109 @@
+ARG NODE_VERSION=22-alpine@sha256:0a7108bf6c7bf5de370ffb1a3ed6be93d405b43ff159f681a8d18c0e2bc2e402
+
+# Stage 1: Install dependencies and build
+FROM --platform=$BUILDPLATFORM node:${NODE_VERSION} AS builder
+
+ARG APP_VERSION
+ENV VITE_APP_VERSION=${APP_VERSION}
+
+# Pin to the version in package.json's packageManager field so the image build
+# matches CI and the lockfile, rather than drifting to a newer pnpm major.
+RUN corepack enable && corepack prepare pnpm@11.1.2 --activate
+
+WORKDIR /src
+
+# Workspace manifests first for cached installs.
+COPY pnpm-workspace.yaml package.json pnpm-lock.yaml ./
+COPY apps/console/package.json apps/console/
+COPY packages/ui/package.json packages/ui/
+COPY packages/types/package.json packages/types/
+COPY packages/k8s-client/package.json packages/k8s-client/
+
+RUN pnpm install --frozen-lockfile
+
+COPY apps/console/ apps/console/
+COPY packages/ packages/
+COPY tsconfig.base.json ./
+
+RUN pnpm --filter @cozystack/console build
+
+# Stage 2: Serve with nginx
+FROM nginxinc/nginx-unprivileged:1.29-alpine@sha256:0c79d56aee561a1d81c63f00eee5fb5fe29279560cdc55e91425133104c7fbe6
+
+COPY --from=builder /src/apps/console/dist /usr/share/nginx/html
+
+COPY <<'EOF' /etc/nginx/conf.d/default.conf
+map $http_upgrade $connection_upgrade {
+    default upgrade;
+    '' close;
+}
+
+# An OIDC access token with many group claims pushes the Cookie header past the
+# 8k default, and a header field must fit in a single buffer. Kept here rather
+# than inside the server block: a field read before the Host header has selected
+# the virtual server is measured against the default server's buffers, so the
+# same lines inside a server block cover this one only while it stays default.
+client_header_buffer_size 16k;
+large_client_header_buffers 4 16k;
+
+server {
+    listen       8080 default_server;
+    listen       [::]:8080 default_server;
+    server_name  _;
+
+    root /usr/share/nginx/html;
+    index index.html;
+
+    # Kubernetes API proxy for both core and aggregated groups.
+    # Chunked-encoding watches require proxy_buffering off and a long timeout.
+    location /apis {
+        proxy_http_version 1.1;
+        proxy_buffering off;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection $connection_upgrade;
+        proxy_set_header X-Forwarded-Proto $scheme;
+        proxy_set_header Host kubernetes.default.svc;
+        proxy_read_timeout 86400s;
+        proxy_send_timeout 86400s;
+        proxy_pass https://kubernetes.default.svc:443;
+    }
+
+    location /api {
+        proxy_http_version 1.1;
+        proxy_buffering off;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection $connection_upgrade;
+        proxy_set_header X-Forwarded-Proto $scheme;
+        proxy_set_header Host kubernetes.default.svc;
+        proxy_read_timeout 86400s;
+        proxy_send_timeout 86400s;
+        proxy_pass https://kubernetes.default.svc:443;
+    }
+
+    # /k8s prefix for VNC WebSocket compatibility
+    location /k8s/ {
+        proxy_http_version 1.1;
+        proxy_buffering off;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection $connection_upgrade;
+        proxy_set_header X-Forwarded-Proto $scheme;
+        proxy_set_header Host kubernetes.default.svc;
+        proxy_read_timeout 86400s;
+        proxy_send_timeout 86400s;
+        rewrite /k8s/(.*) /$1 break;
+        proxy_pass https://kubernetes.default.svc:443;
+    }
+
+    # SPA fallback: serve index.html for all frontend routes.
+    location / {
+        try_files $uri $uri/ /index.html;
+    }
+
+    location /healthcheck {
+        access_log off;
+        return 200 "Healthy\n";
+    }
+}
+EOF
+
+EXPOSE 8080
diff --git a/packages/system/dashboard/images/console/README.md b/packages/system/dashboard/images/console/README.md
new file mode 100644
index 0000000000..7c3b2e6e82
--- /dev/null
+++ b/packages/system/dashboard/images/console/README.md
@@ -0,0 +1,46 @@
+# cozystack-ui
+
+Cozystack Marketplace and Console UI — a pure SPA that talks directly to the
+Kubernetes API. No BFF, no controller-generated configuration: all UI entities
+are discovered dynamically from `ApplicationDefinitions` in the cluster.
+
+## Structure
+
+- `apps/console` — React + Vite SPA
+- `packages/k8s-client` — fetch-based Kubernetes client with watch
+- `packages/ui` — shared UI components (Tailwind + Base UI)
+- `packages/types` — shared TypeScript types
+
+## Requirements
+
+- Node.js ≥ 20
+- pnpm ≥ 9
+- `kubectl proxy` for local development (proxies `/api` and `/apis`)
+
+## Development
+
+```sh
+pnpm install
+# in one terminal:
+kubectl proxy --port 8001
+# in another terminal:
+pnpm dev
+```
+
+The app becomes available at <http://localhost:3001/>.
+
+## Build
+
+```sh
+pnpm build
+```
+
+The console is built into `apps/console/dist/`.
+
+## Test
+
+```sh
+pnpm test
+```
+
+Runs the workspace test suites (vitest + jsdom for the console).
diff --git a/packages/system/dashboard/images/console/apps/console/index.html b/packages/system/dashboard/images/console/apps/console/index.html
new file mode 100644
index 0000000000..d630245c7e
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/index.html
@@ -0,0 +1,13 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <link rel="icon" type="image/svg+xml" href="/favicon.svg" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Cozystack</title>
+  </head>
+  <body>
+    <div id="root"></div>
+    <script type="module" src="/src/main.tsx"></script>
+  </body>
+</html>
diff --git a/packages/system/dashboard/images/console/apps/console/package.json b/packages/system/dashboard/images/console/apps/console/package.json
new file mode 100644
index 0000000000..fcddb70237
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/package.json
@@ -0,0 +1,52 @@
+{
+  "name": "@cozystack/console",
+  "private": true,
+  "version": "0.0.0",
+  "type": "module",
+  "scripts": {
+    "dev": "vite",
+    "build": "tsc --noEmit && vite build",
+    "lint": "eslint . --max-warnings 3",
+    "test": "vitest run",
+    "test:watch": "vitest",
+    "typecheck": "tsc --noEmit",
+    "preview": "vite preview"
+  },
+  "dependencies": {
+    "@base-ui/react": "^1.4.1",
+    "@cozystack/k8s-client": "workspace:*",
+    "@cozystack/types": "workspace:*",
+    "@cozystack/ui": "workspace:*",
+    "@monaco-editor/react": "^4.7.0",
+    "@novnc/novnc": "^1.6.0",
+    "@rjsf/core": "^5.24.8",
+    "@rjsf/utils": "^5.24.8",
+    "@rjsf/validator-ajv8": "^5.24.8",
+    "@tanstack/react-query": "^5.96.2",
+    "@xterm/addon-fit": "^0.11.0",
+    "@xterm/xterm": "^6.0.0",
+    "js-yaml": "^4.1.0",
+    "lucide-react": "^0.484.0",
+    "monaco-editor": "^0.55.1",
+    "react": "^19.2.4",
+    "react-dom": "^19.2.4",
+    "react-router": "^7.6.1",
+    "simple-icons": "^16.22.0"
+  },
+  "devDependencies": {
+    "@tailwindcss/vite": "^4.2.2",
+    "@testing-library/jest-dom": "^6.9.1",
+    "@testing-library/react": "^16.3.2",
+    "@testing-library/user-event": "^14.6.1",
+    "@types/js-yaml": "^4.0.9",
+    "@types/react": "^19.2.14",
+    "@types/react-dom": "^19.2.3",
+    "@vitejs/plugin-react": "^6.0.1",
+    "@vitest/ui": "^4.1.6",
+    "jsdom": "^29.1.1",
+    "tailwindcss": "^4.2.2",
+    "typescript": "~6.0.2",
+    "vite": "^8.0.4",
+    "vitest": "^4.1.6"
+  }
+}
diff --git a/packages/system/dashboard/images/console/apps/console/public/favicon.svg b/packages/system/dashboard/images/console/apps/console/public/favicon.svg
new file mode 100644
index 0000000000..4009994582
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/public/favicon.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" role="img" viewBox="46 45.5 309 309"><title>cozystack-icon-color</title><path fill="#1a1a1a" d="M0 0h400v400H0z"/><path fill="#fff" d="M325.397 129.47c.37 1.461.575 2.976.6 4.516v.022l.003.281v131.156c0 6.742-3.452 13.007-9.133 16.613l-.015.01-.239.148-.008.006-.01.007-105.648 64.673c-2.394 1.466-5.024 2.376-7.711 2.729l-2.815.369v-17.612l1.19-.728 105.649-64.673c.536-.328.863-.913.863-1.542V137.222l1.085-.743 12.368-8.453 2.944-2.012.877 3.456zM200.579 67.6118l-1.19.7285L93.7404 133.014c-.5359.328-.8637.914-.8637 1.542v128.223l-1.0842.742-12.3687 8.454-2.944 2.011-.8767-3.456c-.3705-1.461-.5754-2.974-.6005-4.514v-.022L75 265.713V134.556c0-6.742 3.4518-13.008 9.1329-16.614l.0078-.005.0077-.004.2387-.149.0078-.006.0103-.005L190.053 53.099c2.394-1.4653 5.024-2.3757 7.711-2.7289L200.579 50v17.6118zm57.286 155.5512c7.685 2.715 7.3 11.646.671 15.668l-34.714 20.262c-5.218 3.015-10.384 6.128-15.673 9.017-8.37 4.568-14.99-.494-22.04-4.568l-18.037-10.549-16.416-9.553c-3.594-2.091-10.363-5.251-12.102-9.019-1.025-2.217-1.094-4.756-.192-7.028.941-2.348 2.434-3.278 4.661-4.186 2.037.342 5.367 2.739 7.26 3.814 11.054 6.267 21.913 12.918 32.964 19.192 4.214 2.197 8.424 5.504 12.877 7.102 7.313 2.625 15.075-3.787 21.072-7.243l23.908-13.898c4.985-2.925 10.672-6.439 15.761-9.011zm.084-31.871c1.973.807 3.282 1.724 4.397 3.606 1.148 1.94 1.458 4.26.861 6.431-.703 2.616-2.243 4.171-4.491 5.522l-34.864 20.436c-5.855 3.433-12.227 7.581-18.389 10.201-6.695 2.846-14.331-2.832-19.766-5.986l-18.761-10.985-15.476-9.079c-5.697-3.326-15.017-6.741-12.254-15.148.832-2.53 2.355-3.641 4.588-4.814 1.733.026 10.476 5.451 12.407 6.574l28.182 16.552c5.931 3.499 14.42 10.127 21.525 6.793 5.613-2.632 11.277-6.452 16.725-9.593 11.757-6.78 23.38-14.04 35.316-20.51zm-59.169-62.369c4.265-.295 6.503-.106 10.325 2.07l34.222 19.839 10.877 6.261c3.792 2.187 7.903 3.792 9.051 8.443.526 2.197.142 4.513-1.072 6.423-1.721 2.767-7.835 5.732-10.893 7.533l-16.94 9.995-16.842 9.9c-4.156 2.438-9.213 5.916-13.811 6.978-3.357.275-6.465.087-9.466-1.625-3.996-2.281-7.973-4.644-11.94-6.971l-22.253-13.061-12.237-7.164c-1.747-1.026-4.639-2.502-6.079-3.718-4.396-3.715-3.739-10.686 1.138-13.661 3.135-1.913 5.945-3.529 8.956-5.269l16.483-9.509 15.698-9.018c4.252-2.473 10.122-6.45 14.783-7.446z"/></svg>
diff --git a/packages/system/dashboard/images/console/apps/console/src/App.routing.test.tsx b/packages/system/dashboard/images/console/apps/console/src/App.routing.test.tsx
new file mode 100644
index 0000000000..4081ecf5bb
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/App.routing.test.tsx
@@ -0,0 +1,164 @@
+import { describe, it, expect, vi, beforeAll } from "vitest"
+import { screen, waitFor } from "@testing-library/react"
+import { useLocation } from "react-router"
+import {
+  K8sClient,
+  type K8sList,
+  type APIGroupList,
+} from "@cozystack/k8s-client"
+import App from "./App.tsx"
+import { renderWithK8sProvider } from "./test-utils/render.tsx"
+
+// Echoes the router location so a redirect can be asserted by URL.
+function LocationProbe() {
+  const { pathname } = useLocation()
+  return <div data-testid="location">{pathname}</div>
+}
+
+function makeClient(tenants: unknown[] = []): K8sClient {
+  const client = new K8sClient()
+  vi.spyOn(client, "list").mockImplementation(async (_g, _v, plural) => {
+    return {
+      apiVersion: "v1",
+      kind: `${plural}List`,
+      metadata: {},
+      items: plural === "tenantnamespaces" ? tenants : [],
+    } as K8sList<unknown>
+  })
+  vi.spyOn(client, "getApiGroups").mockResolvedValue({
+    kind: "APIGroupList",
+    apiVersion: "v1",
+    groups: [],
+  } as APIGroupList)
+  vi.spyOn(client, "create").mockResolvedValue({
+    apiVersion: "authorization.k8s.io/v1",
+    kind: "SelfSubjectAccessReview",
+    metadata: { name: "" },
+    spec: {},
+    status: { allowed: false },
+  } as unknown)
+  return client
+}
+
+// TenantProvider reads window.localStorage on mount; provide a minimal
+// in-memory shim for the test environment when one is not present.
+beforeAll(() => {
+  if (typeof globalThis.localStorage?.getItem !== "function") {
+    const store = new Map<string, string>()
+    vi.stubGlobal("localStorage", {
+      getItem: (k: string) => store.get(k) ?? null,
+      setItem: (k: string, v: string) => void store.set(k, v),
+      removeItem: (k: string) => void store.delete(k),
+      clear: () => store.clear(),
+    })
+  }
+})
+
+describe("default landing", () => {
+  it("opens the Console when no path is given", async () => {
+    const client = makeClient()
+    renderWithK8sProvider(<App />, { client, initialRoute: "/" })
+
+    // ConsoleOverview's no-tenant state: reached only under /console, and it
+    // needs no cluster data, so it is a stable marker for "we landed here".
+    expect(
+      await screen.findByText(/Select a tenant to view its deployed applications/i),
+    ).toBeTruthy()
+    // The catalog must not be what greets the user. Matching on the heading
+    // rather than the text keeps the Marketplace *tab* from satisfying this.
+    expect(screen.queryByRole("heading", { name: "Marketplace", level: 1 })).toBeNull()
+  })
+
+  it("still serves the Marketplace when it is asked for directly", async () => {
+    const client = makeClient()
+    renderWithK8sProvider(<App />, { client, initialRoute: "/marketplace" })
+
+    expect(
+      await screen.findByRole("heading", { name: "Marketplace", level: 1 }),
+    ).toBeTruthy()
+  })
+
+  it("sends the old Marketplace Repositories URL to the Admin portal", async () => {
+    // Without the redirect the :appName catch-all would render an order page
+    // for an application called "taps".
+    const client = makeClient()
+    renderWithK8sProvider(
+      <>
+        <App />
+        <LocationProbe />
+      </>,
+      { client, initialRoute: "/marketplace/taps" },
+    )
+
+    expect(
+      await screen.findByRole("heading", { name: "Repositories", level: 1 }),
+    ).toBeTruthy()
+    expect(screen.getByTestId("location").textContent).toBe("/admin/taps")
+  })
+})
+
+describe("runtime config", () => {
+  it("reaches the tree through AppConfigContext", async () => {
+    const client = makeClient()
+    renderWithK8sProvider(<App config={{ version: "v0.0.0-test" }} />, {
+      client,
+      initialRoute: "/",
+    })
+
+    // The header prints config.version verbatim, so it is the cheapest proof
+    // that the loaded config is published to the whole tree (routes read the
+    // same context for serviceDomain).
+    expect(await screen.findByText("v0.0.0-test")).toBeTruthy()
+  })
+})
+
+describe("shell subtitle", () => {
+  // The picker only renders its "Tenant /" label once a tenant list has
+  // arrived; asserting against an empty list passes whether or not the picker
+  // is there, because its empty and loading branches say something else.
+  // The picker labels itself "Tenant"; the admin route is Modules rather than
+  // the tenant list, whose own "Tenant" create button would match too.
+  const TENANTS = ["tenant-acme", "tenant-globex"].map((name) => ({
+    apiVersion: "core.cozystack.io/v1alpha1",
+    kind: "TenantNamespace",
+    metadata: { name, labels: {} },
+  }))
+
+  // Every cluster-scoped prefix, and a deeper path under each, so dropping one
+  // from the list fails here instead of passing quietly.
+  const CLUSTER_SCOPED = [
+    "/admin/capacity/cluster",
+    "/admin/backups/backupclasses",
+    "/admin/external-ips",
+    "/admin/modules",
+  ]
+
+  it.each(CLUSTER_SCOPED)("hides the tenant picker on %s", async (route) => {
+    const client = makeClient(TENANTS)
+    renderWithK8sProvider(<App />, { client, initialRoute: route })
+
+    // The marker is on every Breadcrumb branch, so absence means the subtitle
+    // was not rendered at all rather than that the list had not arrived.
+    await waitFor(() => expect(screen.queryByText("Loading tenants…")).toBeNull())
+    expect(screen.queryByTestId("tenant-picker")).toBeNull()
+  })
+
+  // The tenant list is scoped by the picker's own selection, so it needs the
+  // picker even though it lives under /admin.
+  it.each(["/admin/tenants", "/admin/vminstances", "/admin/vminstances/db1"])(
+    "keeps the tenant picker on %s",
+    async (route) => {
+      const client = makeClient(TENANTS)
+      renderWithK8sProvider(<App />, { client, initialRoute: route })
+
+      expect(await screen.findByTestId("tenant-picker")).toBeTruthy()
+    },
+  )
+
+  it("still shows the tenant picker outside the admin portal", async () => {
+    const client = makeClient(TENANTS)
+    renderWithK8sProvider(<App />, { client, initialRoute: "/console" })
+
+    expect(await screen.findByTestId("tenant-picker")).toBeTruthy()
+  })
+})
diff --git a/packages/system/dashboard/images/console/apps/console/src/App.tsx b/packages/system/dashboard/images/console/apps/console/src/App.tsx
new file mode 100644
index 0000000000..c800cb287e
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/App.tsx
@@ -0,0 +1,101 @@
+import { Navigate, Route, Routes, useLocation } from "react-router"
+import { AppShell } from "@cozystack/ui"
+import { TenantProvider } from "./lib/tenant-provider.tsx"
+import { Breadcrumb } from "./components/Breadcrumb.tsx"
+import { MarketplacePage } from "./routes/MarketplacePage.tsx"
+import { ConsolePage } from "./routes/ConsolePage.tsx"
+import { AdminPage } from "./routes/AdminPage.tsx"
+import {
+  useAdminSidebarSections,
+  useCanSeeAdmin,
+  useConsoleSidebarSections,
+  useMarketplaceSidebarSections,
+} from "./routes/sidebar-sections.tsx"
+import type { HeaderTab } from "@cozystack/ui"
+import { CommandPaletteProvider } from "./components/command-palette/command-palette-provider.tsx"
+import { useCommandPalette } from "./components/command-palette/use-command-palette.ts"
+import { CommandPalette } from "./components/command-palette/command-palette.tsx"
+import { AppConfigContext, useAppConfig, type AppConfig } from "./lib/config.ts"
+import { DEFAULT_LANDING_PATH } from "./lib/portal.ts"
+
+// Admin pages whose content does not depend on the selected tenant, so the
+// picker has nothing to say on them. /admin/tenants is deliberately absent:
+// its rows come from the picker-filtered context list, unlike Modules and
+// External IPs which list tenant namespaces themselves.
+const CLUSTER_SCOPED_ADMIN = [
+  "/admin/capacity",
+  "/admin/backups/backupclasses",
+  "/admin/external-ips",
+  "/admin/modules",
+]
+
+function Shell({ username }: { username?: string }) {
+  const config = useAppConfig()
+  const { pathname } = useLocation()
+  const inMarketplace = pathname.startsWith("/marketplace")
+  const inAdmin = pathname.startsWith("/admin")
+  // Only the genuinely cluster-scoped admin pages have no tenant to show. The
+  // rest of /admin mounts the same tenant-scoped resource pages as /console
+  // (see lib/portal.ts), and those resolve their namespace from the tenant
+  // context, so hiding the picker there would leave the active tenant both
+  // invisible and unchangeable.
+  // Anchored on a segment boundary: an unanchored prefix would also swallow a
+  // sibling route that merely starts with the same characters.
+  const inClusterScope = CLUSTER_SCOPED_ADMIN.some(
+    (prefix) => pathname === prefix || pathname.startsWith(`${prefix}/`),
+  )
+  const marketplaceSections = useMarketplaceSidebarSections()
+  const consoleSections = useConsoleSidebarSections()
+  const adminSections = useAdminSidebarSections()
+  const canSeeAdmin = useCanSeeAdmin()
+  const sections = inAdmin
+    ? adminSections
+    : inMarketplace
+      ? marketplaceSections
+      : consoleSections
+  const { toggle } = useCommandPalette()
+
+  const tabs: HeaderTab[] = [
+    { id: "console", label: "Console", to: "/console", highlight: true },
+    { id: "marketplace", label: "Marketplace", to: "/marketplace" },
+    ...(canSeeAdmin ? [{ id: "admin", label: "Admin", to: "/admin" }] : []),
+  ]
+
+  return (
+    <AppShell
+      tabs={tabs}
+      sections={sections}
+      subtitle={inClusterScope ? undefined : <Breadcrumb />}
+      onSearchClick={toggle}
+      version={config.version || import.meta.env.VITE_APP_VERSION}
+      logoSvg={config.logoSvg}
+      logoText={config.logoText}
+      username={username}
+    >
+      <CommandPalette />
+      <Routes>
+        <Route path="/" element={<Navigate to={DEFAULT_LANDING_PATH} replace />} />
+        <Route path="/marketplace/*" element={<MarketplacePage />} />
+        <Route path="/console/*" element={<ConsolePage />} />
+        <Route path="/admin/*" element={<AdminPage />} />
+      </Routes>
+    </AppShell>
+  )
+}
+
+export interface AppProps {
+  config?: AppConfig
+  username?: string
+}
+
+export default function App({ config = {}, username }: AppProps) {
+  return (
+    <AppConfigContext.Provider value={config}>
+      <TenantProvider>
+        <CommandPaletteProvider>
+          <Shell username={username} />
+        </CommandPaletteProvider>
+      </TenantProvider>
+    </AppConfigContext.Provider>
+  )
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/__tests__/k8s-client/client.subresource.test.ts b/packages/system/dashboard/images/console/apps/console/src/__tests__/k8s-client/client.subresource.test.ts
new file mode 100644
index 0000000000..219ef3c536
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/__tests__/k8s-client/client.subresource.test.ts
@@ -0,0 +1,118 @@
+import { describe, it, expect, vi, afterEach } from "vitest"
+import { K8sClient } from "@cozystack/k8s-client"
+
+function fakeResponse(opts: {
+  ok?: boolean
+  status?: number
+  statusText?: string
+  body?: string
+}): Response {
+  return {
+    ok: opts.ok ?? true,
+    status: opts.status ?? 200,
+    statusText: opts.statusText ?? "OK",
+    text: async () => opts.body ?? "",
+    json: async () => JSON.parse(opts.body ?? "null"),
+  } as unknown as Response
+}
+
+afterEach(() => {
+  vi.unstubAllGlobals()
+})
+
+describe("K8sClient.subresource", () => {
+  it("PUTs to /{plural}/{name}/{subresource} under the aggregated API group", async () => {
+    const fetchMock = vi.fn(async () => fakeResponse({ body: "" }))
+    vi.stubGlobal("fetch", fetchMock)
+    const client = new K8sClient({ baseUrl: "/base" })
+
+    await client.subresource(
+      "subresources.kubevirt.io",
+      "v1",
+      "virtualmachines",
+      "vm-instance-demo",
+      "start",
+      "tenant-root",
+    )
+
+    expect(fetchMock).toHaveBeenCalledWith(
+      "/base/apis/subresources.kubevirt.io/v1/namespaces/tenant-root/virtualmachines/vm-instance-demo/start",
+      expect.objectContaining({ method: "PUT" }),
+    )
+  })
+
+  it("POSTs when method is POST", async () => {
+    const fetchMock = vi.fn(async () => fakeResponse({ body: "" }))
+    vi.stubGlobal("fetch", fetchMock)
+    const client = new K8sClient()
+
+    await client.subresource(
+      "subresources.kubevirt.io",
+      "v1",
+      "virtualmachines",
+      "vm",
+      "restart",
+      "ns",
+      {},
+      "POST",
+    )
+
+    expect(fetchMock).toHaveBeenCalledWith(
+      expect.any(String),
+      expect.objectContaining({ method: "POST" }),
+    )
+  })
+})
+
+describe("K8sClient.request empty-body handling", () => {
+  it("returns undefined for an empty 2xx body (KubeVirt action subresources)", async () => {
+    // virtualmachines/{name}/start|stop|restart answer 2xx with no body;
+    // JSON.parse("") would throw "Unexpected end of JSON input".
+    vi.stubGlobal("fetch", vi.fn(async () => fakeResponse({ status: 200, body: "" })))
+    const client = new K8sClient()
+
+    const result = await client.subresource(
+      "subresources.kubevirt.io",
+      "v1",
+      "virtualmachines",
+      "vm",
+      "stop",
+    )
+
+    expect(result).toBeUndefined()
+  })
+
+  it("parses the JSON body when a 2xx response is non-empty", async () => {
+    vi.stubGlobal(
+      "fetch",
+      vi.fn(async () => fakeResponse({ status: 200, body: JSON.stringify({ kind: "VirtualMachine" }) })),
+    )
+    const client = new K8sClient()
+
+    const result = await client.get("kubevirt.io", "v1", "virtualmachines", "vm", "ns")
+
+    expect(result).toEqual({ kind: "VirtualMachine" })
+  })
+
+  it("short-circuits to undefined on 204 No Content without reading the body", async () => {
+    const textSpy = vi.fn(async () => "should-not-be-read")
+    vi.stubGlobal(
+      "fetch",
+      vi.fn(
+        async () =>
+          ({
+            ok: true,
+            status: 204,
+            statusText: "No Content",
+            text: textSpy,
+          }) as unknown as Response,
+      ),
+    )
+    const client = new K8sClient()
+
+    const result = await client.delete("", "v1", "configmaps", "cm", "ns")
+
+    expect(result).toBeUndefined()
+    expect(textSpy).not.toHaveBeenCalled()
+  })
+})
diff --git a/packages/system/dashboard/images/console/apps/console/src/__tests__/k8s-client/client.unauthorized.test.ts b/packages/system/dashboard/images/console/apps/console/src/__tests__/k8s-client/client.unauthorized.test.ts
new file mode 100644
index 0000000000..2d6fbbbeca
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/__tests__/k8s-client/client.unauthorized.test.ts
@@ -0,0 +1,170 @@
+import { describe, it, expect, vi, afterEach } from "vitest"
+import { K8sClient, K8sApiError } from "@cozystack/k8s-client"
+
+function fakeResponse(opts: {
+  ok?: boolean
+  status?: number
+  statusText?: string
+  body?: string
+}): Response {
+  return {
+    ok: opts.ok ?? true,
+    status: opts.status ?? 200,
+    statusText: opts.statusText ?? "OK",
+    text: async () => opts.body ?? "",
+    json: async () => JSON.parse(opts.body ?? "null"),
+  } as unknown as Response
+}
+
+const unauthorized = () =>
+  fakeResponse({ ok: false, status: 401, statusText: "Unauthorized" })
+
+afterEach(() => {
+  vi.unstubAllGlobals()
+  vi.restoreAllMocks()
+})
+
+describe("K8sClient onUnauthorized (401) handling", () => {
+  it("invokes onUnauthorized exactly once when a request returns 401", async () => {
+    const onUnauthorized = vi.fn()
+    vi.stubGlobal("fetch", vi.fn(async () => unauthorized()))
+    const client = new K8sClient({ onUnauthorized })
+
+    await expect(client.get("", "v1", "pods", "p", "ns")).rejects.toThrow(
+      K8sApiError,
+    )
+
+    expect(onUnauthorized).toHaveBeenCalledTimes(1)
+  })
+
+  it("invokes onUnauthorized only once across two concurrent 401s", async () => {
+    const onUnauthorized = vi.fn()
+    vi.stubGlobal("fetch", vi.fn(async () => unauthorized()))
+    const client = new K8sClient({ onUnauthorized })
+
+    // The unauthorizedHandled latch must collapse a redirect storm when many
+    // in-flight calls 401 at once into a single re-auth navigation.
+    await Promise.allSettled([
+      client.get("", "v1", "pods", "a", "ns"),
+      client.get("", "v1", "pods", "b", "ns"),
+    ])
+
+    expect(onUnauthorized).toHaveBeenCalledTimes(1)
+  })
+
+  it("re-arms the latch after a success so a later 401 handles again", async () => {
+    const onUnauthorized = vi.fn()
+    const responses = [
+      unauthorized(),
+      fakeResponse({ body: JSON.stringify({ kind: "Pod" }) }),
+      unauthorized(),
+    ]
+    let call = 0
+    vi.stubGlobal("fetch", vi.fn(async () => responses[call++]))
+    const client = new K8sClient({ onUnauthorized })
+
+    // A 2xx in between means the session recovered, so the next expiry is a
+    // new episode. Without the re-arm a custom in-page handler would fire
+    // once for the client's whole lifetime.
+    await expect(client.get("", "v1", "pods", "p", "ns")).rejects.toThrow(
+      K8sApiError,
+    )
+    await client.get("", "v1", "pods", "p", "ns")
+    await expect(client.get("", "v1", "pods", "p", "ns")).rejects.toThrow(
+      K8sApiError,
+    )
+
+    expect(onUnauthorized).toHaveBeenCalledTimes(2)
+  })
+
+  it("does not invoke onUnauthorized on a non-401 error", async () => {
+    const onUnauthorized = vi.fn()
+    vi.stubGlobal(
+      "fetch",
+      vi.fn(async () =>
+        fakeResponse({
+          ok: false,
+          status: 403,
+          statusText: "Forbidden",
+          body: JSON.stringify({ message: "forbidden" }),
+        }),
+      ),
+    )
+    const client = new K8sClient({ onUnauthorized })
+
+    await expect(client.get("", "v1", "pods", "p", "ns")).rejects.toThrow(
+      K8sApiError,
+    )
+
+    expect(onUnauthorized).not.toHaveBeenCalled()
+  })
+
+  it("does not invoke onUnauthorized on a successful response", async () => {
+    const onUnauthorized = vi.fn()
+    vi.stubGlobal(
+      "fetch",
+      vi.fn(async () => fakeResponse({ body: JSON.stringify({ kind: "Pod" }) })),
+    )
+    const client = new K8sClient({ onUnauthorized })
+
+    await client.get("", "v1", "pods", "p", "ns")
+
+    expect(onUnauthorized).not.toHaveBeenCalled()
+  })
+
+  it("invokes onUnauthorized when the watch stream returns 401", async () => {
+    const onUnauthorized = vi.fn()
+    vi.stubGlobal("fetch", vi.fn(async () => unauthorized()))
+    const client = new K8sClient({ onUnauthorized })
+
+    // watch() is fire-and-forget; resolve once its onError fires.
+    await new Promise<void>((resolve) => {
+      client.watch(
+        "",
+        "v1",
+        "pods",
+        "ns",
+        "0",
+        () => {},
+        () => resolve(),
+      )
+    })
+
+    expect(onUnauthorized).toHaveBeenCalledTimes(1)
+  })
+})
+
+describe("K8sClient default unauthorized handler", () => {
+  it("redirects to /oauth2/sign_in with the current location preserved as rd", async () => {
+    // jsdom's location.assign is non-configurable, so swap the whole object.
+    const original = window.location
+    const assign = vi.fn()
+    Object.defineProperty(window, "location", {
+      configurable: true,
+      value: { pathname: "/apps/postgres", search: "?tab=config", hash: "#x", assign },
+    })
+    vi.stubGlobal("fetch", vi.fn(async () => unauthorized()))
+    // No onUnauthorized override -> the browser default redirect kicks in.
+    const client = new K8sClient()
+
+    try {
+      await expect(client.get("", "v1", "pods", "p", "ns")).rejects.toThrow(
+        K8sApiError,
+      )
+
+      // Relative rd (no origin) preserves the destination without tripping
+      // oauth2-proxy's open-redirect rejection. The target must stay
+      // /oauth2/sign_in: token-proxy (oidc-enabled=false) serves no
+      // /oauth2/start, so that path falls through to its catch-all.
+      expect(assign).toHaveBeenCalledTimes(1)
+      expect(assign).toHaveBeenCalledWith(
+        `/oauth2/sign_in?rd=${encodeURIComponent("/apps/postgres?tab=config#x")}`,
+      )
+    } finally {
+      Object.defineProperty(window, "location", {
+        configurable: true,
+        value: original,
+      })
+    }
+  })
+})
diff --git a/packages/system/dashboard/images/console/apps/console/src/__tests__/k8s-client/provider.test.tsx b/packages/system/dashboard/images/console/apps/console/src/__tests__/k8s-client/provider.test.tsx
new file mode 100644
index 0000000000..97c56912ee
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/__tests__/k8s-client/provider.test.tsx
@@ -0,0 +1,53 @@
+import { describe, it, expect } from "vitest"
+import { render } from "@testing-library/react"
+import { K8sClient, K8sProvider, useK8sClient } from "@cozystack/k8s-client"
+
+function ClientCapture({ onClient }: { onClient: (c: K8sClient) => void }) {
+  const c = useK8sClient()
+  onClient(c)
+  return null
+}
+
+describe("K8sProvider", () => {
+  it("passes the injected client through to useK8sClient", () => {
+    const injected = new K8sClient({ baseUrl: "/injected" })
+    let captured: K8sClient | null = null
+    render(
+      <K8sProvider client={injected}>
+        <ClientCapture onClient={(c) => (captured = c)} />
+      </K8sProvider>,
+    )
+    expect(captured).toBe(injected)
+  })
+
+  it("constructs its own client when none is injected", () => {
+    let captured: K8sClient | null = null
+    render(
+      <K8sProvider>
+        <ClientCapture onClient={(c) => (captured = c)} />
+      </K8sProvider>,
+    )
+    expect(captured).toBeInstanceOf(K8sClient)
+  })
+
+  it("constructs a client from the provided config when no client is injected", () => {
+    let captured: K8sClient | null = null
+    render(
+      <K8sProvider config={{ baseUrl: "/from-config" }}>
+        <ClientCapture onClient={(c) => (captured = c)} />
+      </K8sProvider>,
+    )
+    expect(captured).toBeInstanceOf(K8sClient)
+  })
+
+  it("prefers the injected client over the config when both are supplied", () => {
+    const injected = new K8sClient({ baseUrl: "/injected" })
+    let captured: K8sClient | null = null
+    render(
+      <K8sProvider client={injected} config={{ baseUrl: "/ignored" }}>
+        <ClientCapture onClient={(c) => (captured = c)} />
+      </K8sProvider>,
+    )
+    expect(captured).toBe(injected)
+  })
+})
diff --git a/packages/system/dashboard/images/console/apps/console/src/__tests__/k8s-client/useApiGroupAvailable.test.tsx b/packages/system/dashboard/images/console/apps/console/src/__tests__/k8s-client/useApiGroupAvailable.test.tsx
new file mode 100644
index 0000000000..c606ac6102
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/__tests__/k8s-client/useApiGroupAvailable.test.tsx
@@ -0,0 +1,121 @@
+import { describe, it, expect, vi } from "vitest"
+import { renderHook, waitFor } from "@testing-library/react"
+import { QueryClient, QueryClientProvider } from "@tanstack/react-query"
+import {
+  K8sClient,
+  K8sProvider,
+  useApiGroupAvailable,
+  type APIGroupList,
+} from "@cozystack/k8s-client"
+import type { ReactNode } from "react"
+
+function makeWrapper(client: K8sClient) {
+  const queryClient = new QueryClient({
+    defaultOptions: { queries: { retry: false, gcTime: 0 } },
+  })
+  return function Wrapper({ children }: { children: ReactNode }) {
+    return (
+      <QueryClientProvider client={queryClient}>
+        <K8sProvider client={client} queryClient={queryClient}>
+          {children}
+        </K8sProvider>
+      </QueryClientProvider>
+    )
+  }
+}
+
+const sampleGroups: APIGroupList = {
+  kind: "APIGroupList",
+  apiVersion: "v1",
+  groups: [
+    {
+      name: "metrics.k8s.io",
+      versions: [{ groupVersion: "metrics.k8s.io/v1beta1", version: "v1beta1" }],
+      preferredVersion: { groupVersion: "metrics.k8s.io/v1beta1", version: "v1beta1" },
+    },
+    {
+      name: "apps",
+      versions: [{ groupVersion: "apps/v1", version: "v1" }],
+      preferredVersion: { groupVersion: "apps/v1", version: "v1" },
+    },
+  ],
+}
+
+describe("useApiGroupAvailable", () => {
+  it("starts in loading state with available=false", () => {
+    const client = new K8sClient()
+    vi.spyOn(client, "getApiGroups").mockImplementation(
+      () => new Promise(() => {}),
+    )
+    const { result } = renderHook(() => useApiGroupAvailable("metrics.k8s.io"), {
+      wrapper: makeWrapper(client),
+    })
+    expect(result.current.isLoading).toBe(true)
+    expect(result.current.available).toBe(false)
+  })
+
+  it("reports available=true when the group is present", async () => {
+    const client = new K8sClient()
+    vi.spyOn(client, "getApiGroups").mockResolvedValue(sampleGroups)
+    const { result } = renderHook(() => useApiGroupAvailable("metrics.k8s.io"), {
+      wrapper: makeWrapper(client),
+    })
+    await waitFor(() => expect(result.current.isLoading).toBe(false))
+    expect(result.current.available).toBe(true)
+  })
+
+  it("reports available=false when the group is missing", async () => {
+    const client = new K8sClient()
+    vi.spyOn(client, "getApiGroups").mockResolvedValue(sampleGroups)
+    const { result } = renderHook(() => useApiGroupAvailable("custom.metrics.k8s.io"), {
+      wrapper: makeWrapper(client),
+    })
+    await waitFor(() => expect(result.current.isLoading).toBe(false))
+    expect(result.current.available).toBe(false)
+  })
+
+  it("fetches /apis once for multiple consumers", async () => {
+    const client = new K8sClient()
+    const spy = vi.spyOn(client, "getApiGroups").mockResolvedValue(sampleGroups)
+    const Wrapper = makeWrapper(client)
+
+    function Twin() {
+      const a = useApiGroupAvailable("metrics.k8s.io")
+      const b = useApiGroupAvailable("apps")
+      return (
+        <p>
+          {String(a.available)}-{String(b.available)}
+        </p>
+      )
+    }
+
+    const { result: hookA } = renderHook(
+      () => useApiGroupAvailable("metrics.k8s.io"),
+      { wrapper: Wrapper },
+    )
+    const { result: hookB } = renderHook(
+      () => useApiGroupAvailable("apps"),
+      { wrapper: Wrapper },
+    )
+
+    await waitFor(() => expect(hookA.current.isLoading).toBe(false))
+    await waitFor(() => expect(hookB.current.isLoading).toBe(false))
+
+    // Both hooks share the same provider and cache, so /apis is called
+    // exactly once for the lifetime of this provider tree. Twin is unused
+    // here but kept declared to document the multi-consumer shape we
+    // protect against.
+    expect(spy).toHaveBeenCalledTimes(1)
+    void Twin
+  })
+
+  it("surfaces an error and reports available=false", async () => {
+    const client = new K8sClient()
+    vi.spyOn(client, "getApiGroups").mockRejectedValue(new Error("no /apis"))
+    const { result } = renderHook(() => useApiGroupAvailable("metrics.k8s.io"), {
+      wrapper: makeWrapper(client),
+    })
+    await waitFor(() => expect(result.current.isLoading).toBe(false))
+    expect(result.current.available).toBe(false)
+  })
+})
diff --git a/packages/system/dashboard/images/console/apps/console/src/__tests__/k8s-client/useK8sSubresource.test.tsx b/packages/system/dashboard/images/console/apps/console/src/__tests__/k8s-client/useK8sSubresource.test.tsx
new file mode 100644
index 0000000000..b885b89c6a
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/__tests__/k8s-client/useK8sSubresource.test.tsx
@@ -0,0 +1,127 @@
+import { describe, it, expect, vi } from "vitest"
+import { renderHook, act } from "@testing-library/react"
+import { QueryClient, QueryClientProvider } from "@tanstack/react-query"
+import { K8sClient, K8sProvider, useK8sSubresource } from "@cozystack/k8s-client"
+import type { ReactNode } from "react"
+
+const actionRef = {
+  apiGroup: "subresources.kubevirt.io",
+  apiVersion: "v1",
+  plural: "virtualmachines",
+  name: "vm-instance-demo",
+  namespace: "tenant-root",
+}
+
+// The VirtualMachine (with its status) is served under kubevirt.io, not the
+// subresources.kubevirt.io aggregated API the action endpoint lives under.
+const statusRef = {
+  apiGroup: "kubevirt.io",
+  apiVersion: "v1",
+  plural: "virtualmachines",
+  namespace: "tenant-root",
+}
+
+function setup(gcTime = 0) {
+  const client = new K8sClient()
+  vi.spyOn(client, "subresource").mockResolvedValue(undefined)
+  const queryClient = new QueryClient({
+    defaultOptions: { queries: { retry: false, gcTime } },
+  })
+  const invalidateSpy = vi.spyOn(queryClient, "invalidateQueries")
+  function wrapper({ children }: { children: ReactNode }) {
+    return (
+      <QueryClientProvider client={queryClient}>
+        <K8sProvider client={client} queryClient={queryClient}>
+          {children}
+        </K8sProvider>
+      </QueryClientProvider>
+    )
+  }
+  return { client, queryClient, invalidateSpy, wrapper }
+}
+
+describe("useK8sSubresource", () => {
+  it("calls the action subresource with a default empty body", async () => {
+    const { client, wrapper } = setup()
+    const { result } = renderHook(() => useK8sSubresource(actionRef), { wrapper })
+
+    await act(async () => {
+      await result.current.mutateAsync({ subresource: "start" })
+    })
+
+    expect(client.subresource).toHaveBeenCalledWith(
+      "subresources.kubevirt.io",
+      "v1",
+      "virtualmachines",
+      "vm-instance-demo",
+      "start",
+      "tenant-root",
+      {},
+      undefined,
+    )
+  })
+
+  it("invalidates the action ref's own resource key when no invalidate target is given", async () => {
+    const { invalidateSpy, wrapper } = setup()
+    const { result } = renderHook(() => useK8sSubresource(actionRef), { wrapper })
+
+    await act(async () => {
+      await result.current.mutateAsync({ subresource: "start" })
+    })
+
+    expect(invalidateSpy).toHaveBeenCalledWith({
+      queryKey: ["k8s", "subresources.kubevirt.io", "v1", "virtualmachines", "tenant-root"],
+    })
+  })
+
+  it("invalidates the target resource (kubevirt.io) when invalidate is supplied", async () => {
+    const { invalidateSpy, wrapper } = setup()
+    const { result } = renderHook(
+      () => useK8sSubresource(actionRef, { invalidate: statusRef }),
+      { wrapper },
+    )
+
+    await act(async () => {
+      await result.current.mutateAsync({ subresource: "start" })
+    })
+
+    // Regression guard: the key must be built from the kubevirt.io status ref,
+    // otherwise it never matches the query that holds printableStatus.
+    expect(invalidateSpy).toHaveBeenCalledWith({
+      queryKey: ["k8s", "kubevirt.io", "v1", "virtualmachines", "tenant-root"],
+    })
+    expect(invalidateSpy).not.toHaveBeenCalledWith({
+      queryKey: ["k8s", "subresources.kubevirt.io", "v1", "virtualmachines", "tenant-root"],
+    })
+  })
+
+  it("invalidates a metadata.name field-selected list of the target resource", async () => {
+    // gcTime Infinity so the manually seeded (observer-less) query isn't
+    // garbage-collected before we read its post-invalidation state.
+    const { queryClient, wrapper } = setup(Infinity)
+    // The watch-based status read keys its list query with a field-selector.
+    // The resource-prefix invalidation must reach it (React Query prefix match),
+    // not just an unfiltered list — otherwise the post-action refresh is dead.
+    const fieldSelectedListKey = [
+      "k8s",
+      "kubevirt.io",
+      "v1",
+      "virtualmachines",
+      "tenant-root",
+      "",
+      "metadata.name=vm-instance-demo",
+    ]
+    queryClient.setQueryData(fieldSelectedListKey, { items: [] })
+    expect(queryClient.getQueryState(fieldSelectedListKey)?.isInvalidated).toBe(false)
+
+    const { result } = renderHook(
+      () => useK8sSubresource(actionRef, { invalidate: statusRef }),
+      { wrapper },
+    )
+    await act(async () => {
+      await result.current.mutateAsync({ subresource: "start" })
+    })
+
+    expect(queryClient.getQueryState(fieldSelectedListKey)?.isInvalidated).toBe(true)
+  })
+})
diff --git a/packages/system/dashboard/images/console/apps/console/src/__tests__/k8s-client/useSelfSubjectAccessReview.test.tsx b/packages/system/dashboard/images/console/apps/console/src/__tests__/k8s-client/useSelfSubjectAccessReview.test.tsx
new file mode 100644
index 0000000000..2dc7baa531
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/__tests__/k8s-client/useSelfSubjectAccessReview.test.tsx
@@ -0,0 +1,174 @@
+import { describe, it, expect, vi } from "vitest"
+import { renderHook, waitFor } from "@testing-library/react"
+import { QueryClient, QueryClientProvider } from "@tanstack/react-query"
+import {
+  K8sClient,
+  K8sProvider,
+  useSelfSubjectAccessReview,
+  type SelfSubjectAccessReview,
+} from "@cozystack/k8s-client"
+import type { ReactNode } from "react"
+
+function makeWrapper(client: K8sClient) {
+  const queryClient = new QueryClient({
+    defaultOptions: { queries: { retry: false, gcTime: 0 } },
+  })
+  return function Wrapper({ children }: { children: ReactNode }) {
+    return (
+      <QueryClientProvider client={queryClient}>
+        <K8sProvider client={client} queryClient={queryClient}>
+          {children}
+        </K8sProvider>
+      </QueryClientProvider>
+    )
+  }
+}
+
+function ssarResult(allowed: boolean): SelfSubjectAccessReview {
+  return {
+    apiVersion: "authorization.k8s.io/v1",
+    kind: "SelfSubjectAccessReview",
+    metadata: { name: "" },
+    spec: { resourceAttributes: { resource: "nodes", verb: "list" } },
+    status: { allowed },
+  }
+}
+
+describe("useSelfSubjectAccessReview", () => {
+  it("starts in loading state with allowed=false", () => {
+    const client = new K8sClient()
+    vi.spyOn(client, "create").mockImplementation(() => new Promise(() => {}))
+    const { result } = renderHook(
+      () =>
+        useSelfSubjectAccessReview({
+          resourceAttributes: { resource: "nodes", verb: "list" },
+        }),
+      { wrapper: makeWrapper(client) },
+    )
+    expect(result.current.isLoading).toBe(true)
+    expect(result.current.allowed).toBe(false)
+  })
+
+  it("reports allowed=true when the API responds with status.allowed=true", async () => {
+    const client = new K8sClient()
+    vi.spyOn(client, "create").mockResolvedValue(ssarResult(true))
+    const { result } = renderHook(
+      () =>
+        useSelfSubjectAccessReview({
+          resourceAttributes: { resource: "nodes", verb: "list" },
+        }),
+      { wrapper: makeWrapper(client) },
+    )
+    await waitFor(() => expect(result.current.isLoading).toBe(false))
+    expect(result.current.allowed).toBe(true)
+  })
+
+  it("reports allowed=false explicitly when status.allowed=false", async () => {
+    const client = new K8sClient()
+    vi.spyOn(client, "create").mockResolvedValue(ssarResult(false))
+    const { result } = renderHook(
+      () =>
+        useSelfSubjectAccessReview({
+          resourceAttributes: { resource: "nodes", verb: "list" },
+        }),
+      { wrapper: makeWrapper(client) },
+    )
+    await waitFor(() => expect(result.current.isLoading).toBe(false))
+    expect(result.current.allowed).toBe(false)
+  })
+
+  it("POSTs once for two consumers asking the same question", async () => {
+    const client = new K8sClient()
+    const spy = vi.spyOn(client, "create").mockResolvedValue(ssarResult(true))
+    const Wrapper = makeWrapper(client)
+    const { result: a } = renderHook(
+      () =>
+        useSelfSubjectAccessReview({
+          resourceAttributes: { resource: "nodes", verb: "list" },
+        }),
+      { wrapper: Wrapper },
+    )
+    const { result: b } = renderHook(
+      () =>
+        useSelfSubjectAccessReview({
+          resourceAttributes: { resource: "nodes", verb: "list" },
+        }),
+      { wrapper: Wrapper },
+    )
+    await waitFor(() => expect(a.current.isLoading).toBe(false))
+    await waitFor(() => expect(b.current.isLoading).toBe(false))
+    expect(spy).toHaveBeenCalledTimes(1)
+  })
+
+  it("POSTs twice when two consumers ask different questions", async () => {
+    const client = new K8sClient()
+    const spy = vi.spyOn(client, "create").mockResolvedValue(ssarResult(true))
+    const Wrapper = makeWrapper(client)
+    const { result: a } = renderHook(
+      () =>
+        useSelfSubjectAccessReview({
+          resourceAttributes: { resource: "nodes", verb: "list" },
+        }),
+      { wrapper: Wrapper },
+    )
+    const { result: b } = renderHook(
+      () =>
+        useSelfSubjectAccessReview({
+          resourceAttributes: { resource: "pods", verb: "list" },
+        }),
+      { wrapper: Wrapper },
+    )
+    await waitFor(() => expect(a.current.isLoading).toBe(false))
+    await waitFor(() => expect(b.current.isLoading).toBe(false))
+    expect(spy).toHaveBeenCalledTimes(2)
+  })
+
+  it("surfaces the error and reports allowed=false on API failure", async () => {
+    const client = new K8sClient()
+    const err = new Error("server error")
+    vi.spyOn(client, "create").mockRejectedValue(err)
+    const { result } = renderHook(
+      () =>
+        useSelfSubjectAccessReview({
+          resourceAttributes: { resource: "nodes", verb: "list" },
+        }),
+      { wrapper: makeWrapper(client) },
+    )
+    await waitFor(() => expect(result.current.isLoading).toBe(false))
+    expect(result.current.allowed).toBe(false)
+    expect(result.current.error).toBeTruthy()
+  })
+
+  it("sends the spec verbatim in the POST body", async () => {
+    const client = new K8sClient()
+    const spy = vi.spyOn(client, "create").mockResolvedValue(ssarResult(true))
+    const { result } = renderHook(
+      () =>
+        useSelfSubjectAccessReview({
+          resourceAttributes: {
+            group: "metrics.k8s.io",
+            resource: "nodes",
+            verb: "list",
+          },
+        }),
+      { wrapper: makeWrapper(client) },
+    )
+    await waitFor(() => expect(result.current.isLoading).toBe(false))
+    expect(spy).toHaveBeenCalledWith(
+      "authorization.k8s.io",
+      "v1",
+      "selfsubjectaccessreviews",
+      expect.objectContaining({
+        kind: "SelfSubjectAccessReview",
+        apiVersion: "authorization.k8s.io/v1",
+        spec: {
+          resourceAttributes: {
+            group: "metrics.k8s.io",
+            resource: "nodes",
+            verb: "list",
+          },
+        },
+      }),
+    )
+  })
+})
diff --git a/packages/system/dashboard/images/console/apps/console/src/components/AdditionalPropertiesEditor.tsx b/packages/system/dashboard/images/console/apps/console/src/components/AdditionalPropertiesEditor.tsx
new file mode 100644
index 0000000000..718a1149d6
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/components/AdditionalPropertiesEditor.tsx
@@ -0,0 +1,131 @@
+import { useState } from "react"
+import Form from "@rjsf/core"
+import validator from "@rjsf/validator-ajv8"
+import type { RJSFSchema } from "@rjsf/utils"
+import { customTemplates, customWidgets } from "./rjsf-registry.ts"
+
+interface AdditionalPropertiesEditorProps {
+  value: Record<string, unknown>
+  onChange: (value: Record<string, unknown>) => void
+  readonly?: boolean
+  title?: string
+  description?: string
+  required?: boolean
+  itemSchema: RJSFSchema
+}
+
+export function AdditionalPropertiesEditor({
+  value,
+  onChange,
+  readonly,
+  title,
+  description,
+  required,
+  itemSchema,
+}: AdditionalPropertiesEditorProps) {
+  const [newKey, setNewKey] = useState("")
+
+  const keys = Object.keys(value || {})
+
+  const handleAddKey = () => {
+    if (!newKey.trim()) return
+    if (value && newKey in value) {
+      alert(`Key "${newKey}" already exists`)
+      return
+    }
+
+    // Initialize with default value from schema
+    const defaultValue = itemSchema.type === "object" ? {} : itemSchema.default ?? ""
+    onChange({ ...value, [newKey]: defaultValue })
+    setNewKey("")
+  }
+
+  const handleRemoveKey = (key: string) => {
+    const newValue = { ...value }
+    delete newValue[key]
+    onChange(newValue)
+  }
+
+  const handleValueChange = (key: string, newVal: unknown) => {
+    onChange({ ...value, [key]: newVal })
+  }
+
+  return (
+    <div className="field">
+      {title && (
+        <label className="control-label mb-2 block text-sm font-medium text-slate-700">
+          {title}
+          {required && <span className="required ml-1 text-red-500">*</span>}
+        </label>
+      )}
+      {description && <p className="field-description mb-3 text-xs text-slate-500">{description}</p>}
+
+      <div className="space-y-3">
+        {keys.map((key) => (
+          <div key={key} className="rounded-lg border border-slate-200 bg-slate-50 p-4">
+            <div className="mb-2 flex items-center justify-between">
+              <div className="font-mono text-sm font-semibold text-slate-900">{key}</div>
+              {!readonly && (
+                <button
+                  type="button"
+                  onClick={() => handleRemoveKey(key)}
+                  className="rounded-md border border-red-300 bg-white px-2 py-1 text-xs font-medium text-red-600 hover:bg-red-50"
+                >
+                  × Remove
+                </button>
+              )}
+            </div>
+            <div className="rounded-md bg-white p-3">
+              <Form
+                schema={itemSchema}
+                formData={value[key]}
+                validator={validator}
+                templates={customTemplates}
+                widgets={customWidgets}
+                onChange={(e) => handleValueChange(key, e.formData)}
+                disabled={readonly}
+                liveValidate={false}
+                showErrorList={false}
+                uiSchema={{
+                  "ui:submitButtonOptions": { norender: true },
+                }}
+              >
+                {/* No submit button */}
+              </Form>
+            </div>
+          </div>
+        ))}
+
+        {keys.length === 0 && readonly && (
+          <div className="text-sm text-slate-500 italic">No entries</div>
+        )}
+
+        {!readonly && (
+          <div className="flex gap-2">
+            <input
+              type="text"
+              value={newKey}
+              onChange={(e) => setNewKey(e.target.value)}
+              onKeyDown={(e) => {
+                if (e.key === "Enter") {
+                  e.preventDefault()
+                  handleAddKey()
+                }
+              }}
+              placeholder="Enter key name..."
+              className="flex-1 rounded-lg border border-slate-300 bg-white px-3 py-2 text-sm text-slate-900 placeholder:text-slate-400 outline-none focus:border-blue-400 focus:ring-1 focus:ring-blue-400"
+            />
+            <button
+              type="button"
+              onClick={handleAddKey}
+              disabled={!newKey.trim()}
+              className="rounded-md border border-slate-300 bg-white px-3 py-2 text-sm font-medium text-slate-700 hover:bg-slate-50 disabled:opacity-50 disabled:cursor-not-allowed"
+            >
+              + Add
+            </button>
+          </div>
+        )}
+      </div>
+    </div>
+  )
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/components/AdditionalPropertiesField.test.tsx b/packages/system/dashboard/images/console/apps/console/src/components/AdditionalPropertiesField.test.tsx
new file mode 100644
index 0000000000..1e23caf124
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/components/AdditionalPropertiesField.test.tsx
@@ -0,0 +1,98 @@
+import { describe, it, expect } from "vitest"
+import { render, screen } from "@testing-library/react"
+import { SchemaForm } from "./SchemaForm.tsx"
+import { IMMUTABLE_HELP_TEXT } from "../lib/immutable-paths.ts"
+
+const schemaWithMap = JSON.stringify({
+  type: "object",
+  properties: {
+    labels: {
+      type: "object",
+      additionalProperties: { type: "string" },
+      "x-kubernetes-validations": [
+        { rule: "self == oldSelf", message: "labels are immutable" },
+      ],
+    },
+  },
+})
+
+const noop = () => {}
+
+describe("AdditionalPropertiesField immutable", () => {
+  it("renders Add/Remove controls when not immutable", () => {
+    render(
+      <SchemaForm
+        openAPISchema={schemaWithMap}
+        formData={{ labels: { env: "prod" } }}
+        onChange={noop}
+      />,
+    )
+    expect(screen.getByPlaceholderText("Enter key name...")).toBeInTheDocument()
+    expect(screen.getByRole("button", { name: /add/i })).toBeInTheDocument()
+    expect(screen.getByRole("button", { name: /remove/i })).toBeInTheDocument()
+  })
+
+  it("treats nested *-not-last on additionalProperties as whole-map disabled in the UI; overlay matches", () => {
+    // Per-value-immutable schema (additionalProperties carries a nested
+    // CEL rule). The UI freezes the whole map and the overlay freezes the
+    // whole map (see overlayImmutable's additionalProperties branch).
+    // Both sides therefore agree: YAML-editor bypasses that add or rename
+    // keys are caught by the overlay before the PUT lands.
+    const nestedImmutableSchema = JSON.stringify({
+      type: "object",
+      properties: {
+        labels: {
+          type: "object",
+          additionalProperties: {
+            type: "object",
+            properties: {
+              value: {
+                type: "string",
+                "x-kubernetes-validations": [
+                  { rule: "self == oldSelf", message: "value is immutable" },
+                ],
+              },
+            },
+          },
+        },
+      },
+    })
+    render(
+      <SchemaForm
+        openAPISchema={nestedImmutableSchema}
+        formData={{ labels: { env: { value: "prod" } } }}
+        onChange={noop}
+        immutableMode="enforce"
+      />,
+    )
+    expect(
+      screen.queryByPlaceholderText("Enter key name..."),
+    ).not.toBeInTheDocument()
+    expect(screen.getByText(IMMUTABLE_HELP_TEXT)).toBeInTheDocument()
+  })
+
+  it("hides Add/Remove and disables inner fields when the map is immutable in enforce mode", () => {
+    render(
+      <SchemaForm
+        openAPISchema={schemaWithMap}
+        formData={{ labels: { env: "prod" } }}
+        onChange={noop}
+        immutableMode="enforce"
+      />,
+    )
+    expect(
+      screen.queryByPlaceholderText("Enter key name..."),
+    ).not.toBeInTheDocument()
+    expect(
+      screen.queryByRole("button", { name: /add/i }),
+    ).not.toBeInTheDocument()
+    expect(
+      screen.queryByRole("button", { name: /remove/i }),
+    ).not.toBeInTheDocument()
+
+    const innerInput = screen.getByDisplayValue("prod") as HTMLInputElement
+    expect(innerInput).toBeDisabled()
+
+    expect(screen.getByText(IMMUTABLE_HELP_TEXT)).toBeInTheDocument()
+  })
+})
diff --git a/packages/system/dashboard/images/console/apps/console/src/components/AdditionalPropertiesField.tsx b/packages/system/dashboard/images/console/apps/console/src/components/AdditionalPropertiesField.tsx
new file mode 100644
index 0000000000..e2c0371ebd
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/components/AdditionalPropertiesField.tsx
@@ -0,0 +1,145 @@
+import { useState, useMemo } from "react"
+import type { FieldProps, RJSFSchema, TemplatesType } from "@rjsf/utils"
+import { RJSF_ID_SEPARATOR } from "../lib/rjsf-ids.ts"
+import Form from "@rjsf/core"
+import validator from "@rjsf/validator-ajv8"
+import { customTemplates, customWidgets } from "./rjsf-registry.ts"
+import { addDynamicOptionWidgets } from "../lib/dynamic-options.ts"
+
+export function AdditionalPropertiesField(props: FieldProps) {
+  const { schema, formData, onChange, readonly, disabled, name, required, idSchema } =
+    props
+  const [newKey, setNewKey] = useState("")
+
+  // Get the schema for items from additionalProperties
+  const itemSchema = useMemo(
+    () => (schema.additionalProperties as RJSFSchema) || {},
+    [schema.additionalProperties],
+  )
+  const keys = Object.keys(formData || {})
+
+  // The nested <Form> renders its own subtree, so it needs its own uiSchema to
+  // bind x-cozystack-options fields (e.g. nodeGroups.*.instanceType) to the
+  // DynamicOptionsWidget — the parent SchemaForm's uiSchema does not reach here.
+  const itemUiSchema = useMemo(() => addDynamicOptionWidgets(itemSchema), [itemSchema])
+
+  // Create templates without submit button for nested forms
+  const templatesWithoutSubmit = useMemo<Partial<TemplatesType>>(() => {
+    return {
+      ...customTemplates,
+      ButtonTemplates: {
+        ...customTemplates.ButtonTemplates,
+        SubmitButton: () => null,
+      },
+    }
+  }, [])
+
+  const handleAddKey = () => {
+    if (!newKey.trim()) return
+    if (formData && newKey in formData) {
+      alert(`Key "${newKey}" already exists`)
+      return
+    }
+
+    // Initialize with default value from schema
+    const defaultValue = itemSchema.type === "object" ? {} : itemSchema.default ?? ""
+    onChange({ ...formData, [newKey]: defaultValue })
+    setNewKey("")
+  }
+
+  const handleRemoveKey = (key: string) => {
+    const newValue = { ...formData }
+    delete newValue[key]
+    onChange(newValue)
+  }
+
+  const handleValueChange = (key: string, newVal: unknown) => {
+    onChange({ ...formData, [key]: newVal })
+  }
+
+  const isReadonly = readonly || disabled
+
+  return (
+    <div className="form-group field">
+      {name && (
+        <label className="control-label mb-2 block text-sm font-medium text-slate-700">
+          {name}
+          {required && <span className="required ml-1 text-red-500">*</span>}
+        </label>
+      )}
+      {schema.description && (
+        <p className="field-description mb-3 text-xs text-slate-500">{schema.description}</p>
+      )}
+
+      <div className="space-y-3">
+        {keys.map((key) => (
+          <div key={key} className="rounded-lg border border-slate-200 bg-slate-50 p-4">
+            <div className="mb-2 flex items-center justify-between">
+              <div className="font-mono text-sm font-semibold text-slate-900">{key}</div>
+              {!isReadonly && (
+                <button
+                  type="button"
+                  onClick={() => handleRemoveKey(key)}
+                  className="rounded-md border border-red-300 bg-white px-2 py-1 text-xs font-medium text-red-600 hover:bg-red-50"
+                >
+                  × Remove
+                </button>
+              )}
+            </div>
+            <div className="rounded-md bg-white p-3">
+              <Form
+                tagName="div"
+                // Continue the outer form's id namespace into this entry.
+                // Without it the nested form restarts at "root", so a map
+                // entry's field renders as root_<field> while its validation
+                // error names <outer>.<key>.<field>, and nothing resolves it.
+                idPrefix={`${idSchema.$id}${RJSF_ID_SEPARATOR}${key}`}
+                idSeparator={RJSF_ID_SEPARATOR}
+                schema={itemSchema}
+                uiSchema={itemUiSchema}
+                formData={formData[key]}
+                validator={validator}
+                templates={templatesWithoutSubmit}
+                widgets={customWidgets}
+                onChange={(e) => handleValueChange(key, e.formData)}
+                disabled={isReadonly}
+                liveValidate={false}
+                showErrorList={false}
+              />
+            </div>
+          </div>
+        ))}
+
+        {keys.length === 0 && isReadonly && (
+          <div className="text-sm text-slate-500 italic">No entries</div>
+        )}
+
+        {!isReadonly && (
+          <div className="flex gap-2">
+            <input
+              type="text"
+              value={newKey}
+              onChange={(e) => setNewKey(e.target.value)}
+              onKeyDown={(e) => {
+                if (e.key === "Enter") {
+                  e.preventDefault()
+                  handleAddKey()
+                }
+              }}
+              placeholder="Enter key name..."
+              className="flex-1 rounded-lg border border-slate-300 bg-white px-3 py-2 text-sm text-slate-900 placeholder:text-slate-400 outline-none focus:border-blue-400 focus:ring-1 focus:ring-blue-400"
+            />
+            <button
+              type="button"
+              onClick={handleAddKey}
+              disabled={!newKey.trim()}
+              className="rounded-md border border-slate-300 bg-white px-3 py-2 text-sm font-medium text-slate-700 hover:bg-slate-50 disabled:opacity-50 disabled:cursor-not-allowed"
+            >
+              + Add
+            </button>
+          </div>
+        )}
+      </div>
+    </div>
+  )
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/components/AdditionalPropertiesWidget.tsx b/packages/system/dashboard/images/console/apps/console/src/components/AdditionalPropertiesWidget.tsx
new file mode 100644
index 0000000000..da378c4cc7
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/components/AdditionalPropertiesWidget.tsx
@@ -0,0 +1,121 @@
+import { useState } from "react"
+import type { WidgetProps, RJSFSchema } from "@rjsf/utils"
+import Form from "@rjsf/core"
+import validator from "@rjsf/validator-ajv8"
+import { customTemplates, customWidgets } from "./rjsf-registry.ts"
+
+export function AdditionalPropertiesWidget(props: WidgetProps) {
+  const { schema, value, onChange, readonly, disabled, label, required } = props
+  const [newKey, setNewKey] = useState("")
+
+  // Get the schema for items from additionalProperties
+  const itemSchema = (schema.additionalProperties as RJSFSchema) || {}
+  const keys = Object.keys(value || {})
+
+  const handleAddKey = () => {
+    if (!newKey.trim()) return
+    if (value && newKey in value) {
+      alert(`Key "${newKey}" already exists`)
+      return
+    }
+
+    // Initialize with default value from schema
+    const defaultValue = itemSchema.type === "object" ? {} : itemSchema.default ?? ""
+    onChange({ ...value, [newKey]: defaultValue })
+    setNewKey("")
+  }
+
+  const handleRemoveKey = (key: string) => {
+    const newValue = { ...value }
+    delete newValue[key]
+    onChange(newValue)
+  }
+
+  const handleValueChange = (key: string, newVal: unknown) => {
+    onChange({ ...value, [key]: newVal })
+  }
+
+  const isReadonly = readonly || disabled
+
+  return (
+    <div className="field">
+      {label && (
+        <label className="control-label mb-2 block text-sm font-medium text-slate-700">
+          {label}
+          {required && <span className="required ml-1 text-red-500">*</span>}
+        </label>
+      )}
+      {schema.description && (
+        <p className="field-description mb-3 text-xs text-slate-500">{schema.description}</p>
+      )}
+
+      <div className="space-y-3">
+        {keys.map((key) => (
+          <div key={key} className="rounded-lg border border-slate-200 bg-slate-50 p-4">
+            <div className="mb-2 flex items-center justify-between">
+              <div className="font-mono text-sm font-semibold text-slate-900">{key}</div>
+              {!isReadonly && (
+                <button
+                  type="button"
+                  onClick={() => handleRemoveKey(key)}
+                  className="rounded-md border border-red-300 bg-white px-2 py-1 text-xs font-medium text-red-600 hover:bg-red-50"
+                >
+                  × Remove
+                </button>
+              )}
+            </div>
+            <div className="rounded-md bg-white p-3">
+              <Form
+                tagName="div"
+                schema={itemSchema}
+                formData={value[key]}
+                validator={validator}
+                templates={customTemplates}
+                widgets={customWidgets}
+                onChange={(e) => handleValueChange(key, e.formData)}
+                disabled={isReadonly}
+                liveValidate={false}
+                showErrorList={false}
+                uiSchema={{
+                  "ui:submitButtonOptions": { norender: true },
+                }}
+              >
+                {/* No submit button */}
+              </Form>
+            </div>
+          </div>
+        ))}
+
+        {keys.length === 0 && isReadonly && (
+          <div className="text-sm text-slate-500 italic">No entries</div>
+        )}
+
+        {!isReadonly && (
+          <div className="flex gap-2">
+            <input
+              type="text"
+              value={newKey}
+              onChange={(e) => setNewKey(e.target.value)}
+              onKeyDown={(e) => {
+                if (e.key === "Enter") {
+                  e.preventDefault()
+                  handleAddKey()
+                }
+              }}
+              placeholder="Enter key name..."
+              className="flex-1 rounded-lg border border-slate-300 bg-white px-3 py-2 text-sm text-slate-900 placeholder:text-slate-400 outline-none focus:border-blue-400 focus:ring-1 focus:ring-blue-400"
+            />
+            <button
+              type="button"
+              onClick={handleAddKey}
+              disabled={!newKey.trim()}
+              className="rounded-md border border-slate-300 bg-white px-3 py-2 text-sm font-medium text-slate-700 hover:bg-slate-50 disabled:opacity-50 disabled:cursor-not-allowed"
+            >
+              + Add
+            </button>
+          </div>
+        )}
+      </div>
+    </div>
+  )
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/components/AppCard.tsx b/packages/system/dashboard/images/console/apps/console/src/components/AppCard.tsx
new file mode 100644
index 0000000000..f0af08d124
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/components/AppCard.tsx
@@ -0,0 +1,39 @@
+import { Link } from "react-router"
+import type { ApplicationDefinition } from "@cozystack/types"
+import {
+  appDisplayName,
+  iconDataUrl,
+} from "../lib/app-definitions.ts"
+
+interface AppCardProps {
+  ad: ApplicationDefinition
+  to: string
+}
+
+export function AppCard({ ad, to }: AppCardProps) {
+  const icon = iconDataUrl(ad)
+  const name = appDisplayName(ad)
+  const description = ad.spec?.dashboard?.description ?? ""
+  return (
+    <Link
+      to={to}
+      className="group flex w-80 items-start gap-3 rounded-lg border border-slate-200 bg-white p-4 transition-shadow hover:shadow-sm"
+    >
+      <div className="size-11 shrink-0 overflow-hidden rounded-md bg-slate-100">
+        {icon ? (
+          <img src={icon} alt={name} className="h-full w-full" />
+        ) : (
+          <div className="flex h-full w-full items-center justify-center text-sm font-semibold text-slate-400">
+            {name.slice(0, 2).toUpperCase()}
+          </div>
+        )}
+      </div>
+      <div className="min-w-0 flex-1">
+        <h3 className="truncate text-sm font-semibold text-slate-900 group-hover:text-blue-700">
+          {name}
+        </h3>
+        <p className="mt-0.5 line-clamp-2 text-xs text-slate-500">{description}</p>
+      </div>
+    </Link>
+  )
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/components/Breadcrumb.tsx b/packages/system/dashboard/images/console/apps/console/src/components/Breadcrumb.tsx
new file mode 100644
index 0000000000..19b1b2cae3
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/components/Breadcrumb.tsx
@@ -0,0 +1,45 @@
+import { Dropdown } from "@cozystack/ui"
+import { tenantDisplayName, useTenantContext } from "../lib/tenant-context.tsx"
+
+/**
+ * Subtitle bar that sits under the header and surfaces the active tenant.
+ */
+export function Breadcrumb() {
+  const { tenants, selectedTenant, selectTenant, isLoading } = useTenantContext()
+
+  if (isLoading && !tenants.length) {
+    return (
+      <span data-testid="tenant-picker" className="text-slate-400">
+        Loading tenants…
+      </span>
+    )
+  }
+  if (!tenants.length) {
+    return (
+      <span data-testid="tenant-picker" className="text-amber-600">
+        No tenants found
+      </span>
+    )
+  }
+
+  return (
+    <span data-testid="tenant-picker" className="inline-flex items-center gap-1.5">
+      <span className="text-slate-400">Tenant</span>
+      <span className="text-slate-400">/</span>
+      {tenants.length > 1 ? (
+        <Dropdown
+          value={selectedTenant ?? ""}
+          onChange={selectTenant}
+          options={tenants.map((t) => {
+            const name = tenantDisplayName(t)
+            return { value: name, label: name }
+          })}
+          size="sm"
+          className="min-w-[140px]"
+        />
+      ) : (
+        <span className="font-medium text-slate-900">{selectedTenant}</span>
+      )}
+    </span>
+  )
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/components/CustomObjectFieldTemplate.notoggle.test.tsx b/packages/system/dashboard/images/console/apps/console/src/components/CustomObjectFieldTemplate.notoggle.test.tsx
new file mode 100644
index 0000000000..de6df1fba3
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/components/CustomObjectFieldTemplate.notoggle.test.tsx
@@ -0,0 +1,93 @@
+import { describe, expect, it } from "vitest"
+import { render, screen } from "@testing-library/react"
+import type { ObjectFieldTemplateProps, ObjectFieldTemplatePropertyType } from "@rjsf/utils"
+import { CustomObjectFieldTemplate } from "./CustomObjectFieldTemplate.tsx"
+
+const prop = (name: string): ObjectFieldTemplatePropertyType => ({
+  name,
+  content: <div data-testid={`field-${name}`} />,
+  disabled: false,
+  readonly: false,
+  hidden: false,
+})
+
+// One cast at the fixture boundary keeps every render call below fully typed;
+// `registry` is a large RJSF object this template never reads.
+const base = {
+  idSchema: { $id: "root_addons_cilium" },
+  schema: { "x-cozystack-no-enable-switch": true },
+  title: "cilium",
+  description: "Cilium CNI plugin.",
+  formData: {},
+  properties: [],
+  onAddClick: () => () => {},
+  registry: {},
+} as unknown as ObjectFieldTemplateProps
+
+describe("addons with no enable switch", () => {
+  it("says the switch is absent when the schema declares it", () => {
+    render(<CustomObjectFieldTemplate {...base} properties={[prop("valuesOverride")]} />)
+    expect(screen.getByText(/No enable switch/)).toBeTruthy()
+    expect(screen.queryByRole("checkbox")).toBeNull()
+  })
+
+  it("warns that an enabled field in YAML does nothing", () => {
+    render(<CustomObjectFieldTemplate {...base} properties={[prop("valuesOverride")]} />)
+    expect(screen.getByText(/adding an enabled field in YAML has no effect/i)).toBeTruthy()
+  })
+
+  // The three addons in this class are not all always-on: verticalPodAutoscaler
+  // follows addons.monitoringAgents.enabled. Only the schema description knows
+  // which is which, so the fixed copy must not claim any of them is mandatory.
+  it("leaves the reason to the schema description", () => {
+    render(
+      <CustomObjectFieldTemplate
+        {...base}
+        title="verticalPodAutoscaler"
+        description="Vertical Pod Autoscaler. Installed and removed together with addons.monitoringAgents.enabled; this section only overrides its Helm values."
+        properties={[prop("valuesOverride")]}
+      />,
+    )
+    // Anchor on the no-toggle branch: the default renderer also prints the
+    // description and neither forbidden phrase, so without this the assertions
+    // below hold whether or not the branch was taken.
+    expect(screen.getByText(/No enable switch/)).toBeTruthy()
+    expect(screen.getByText(/together with addons.monitoringAgents.enabled/)).toBeTruthy()
+    expect(screen.queryByText(/cannot be disabled/)).toBeNull()
+    expect(screen.queryByText(/Always on/)).toBeNull()
+  })
+
+  it("does not infer addon copy from a valuesOverride-only shape", () => {
+    render(
+      <CustomObjectFieldTemplate
+        {...base}
+        schema={{}}
+        properties={[prop("valuesOverride")]}
+      />,
+    )
+    expect(screen.queryByText(/No enable switch/)).toBeNull()
+    expect(screen.getByTestId("field-valuesOverride")).toBeTruthy()
+  })
+
+  it("keeps the notice when another configuration field is added", () => {
+    render(
+      <CustomObjectFieldTemplate
+        {...base}
+        properties={[prop("valuesOverride"), prop("config")]}
+      />,
+    )
+    expect(screen.getByText(/No enable switch/)).toBeTruthy()
+    expect(screen.getByTestId("field-config")).toBeTruthy()
+  })
+
+  it("leaves a toggleable addon alone", () => {
+    render(
+      <CustomObjectFieldTemplate
+        {...base}
+        properties={[prop("enabled"), prop("valuesOverride")]}
+      />,
+    )
+    expect(screen.queryByText(/No enable switch/)).toBeNull()
+    expect(screen.getByTestId("field-enabled")).toBeTruthy()
+  })
+})
diff --git a/packages/system/dashboard/images/console/apps/console/src/components/CustomObjectFieldTemplate.tsx b/packages/system/dashboard/images/console/apps/console/src/components/CustomObjectFieldTemplate.tsx
new file mode 100644
index 0000000000..97f8fc4b3e
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/components/CustomObjectFieldTemplate.tsx
@@ -0,0 +1,152 @@
+import type {
+  ObjectFieldTemplateProps,
+  ObjectFieldTemplatePropertyType,
+  RJSFSchema,
+  StrictRJSFSchema,
+  FormContextType,
+} from "@rjsf/utils"
+
+type CozystackSchema = RJSFSchema & {
+  "x-cozystack-no-enable-switch"?: boolean
+}
+
+function isSimpleField(schema: RJSFSchema | undefined): boolean {
+  if (!schema) return true
+  const type = schema.type
+  if (type === "object") return false
+  if (type === "array") {
+    const itemType = (schema.items as RJSFSchema | undefined)?.type
+    return itemType === "integer" || itemType === "string" || itemType === "number"
+  }
+  if (schema.anyOf || schema.oneOf || schema.allOf) {
+    if (schema["x-kubernetes-int-or-string"]) return true
+    return false
+  }
+  return true
+}
+
+function groupByComplexity(
+  properties: ObjectFieldTemplatePropertyType[],
+  parentSchema: StrictRJSFSchema,
+) {
+  type Group = { simple: boolean; items: ObjectFieldTemplatePropertyType[] }
+  const groups: Group[] = []
+  let current: Group | null = null
+
+  for (const prop of properties) {
+    const fieldSchema = parentSchema?.properties?.[prop.name] as RJSFSchema | undefined
+    const simple = isSimpleField(fieldSchema)
+    if (!current || current.simple !== simple) {
+      current = { simple, items: [] }
+      groups.push(current)
+    }
+    current.items.push(prop)
+  }
+  return groups
+}
+
+export function CustomObjectFieldTemplate<
+  T = unknown,
+  S extends StrictRJSFSchema = RJSFSchema,
+  F extends FormContextType = FormContextType,
+>(props: ObjectFieldTemplateProps<T, S, F>) {
+  const { formData } = props
+
+  // Addon pattern: has 'enabled' + other config fields → conditional expand
+  const hasEnabledField = props.properties.some((p) => p.name === "enabled")
+  const hasOtherFields = props.properties.some((p) => p.name !== "enabled")
+  const isAddon = hasEnabledField && hasOtherFields
+
+  // This must be declared by schema rather than inferred from the current
+  // fields: an unrelated valuesOverride-only object must not inherit addon
+  // copy, and adding another config field must not silently remove the notice.
+  const hasNoToggle =
+    !hasEnabledField &&
+    (props.schema as CozystackSchema)["x-cozystack-no-enable-switch"] === true
+
+  if (hasNoToggle) {
+    return (
+      <fieldset id={props.idSchema.$id} className="border border-slate-200 rounded-lg p-3 mb-3">
+        {props.title && (
+          <legend className="text-xs font-semibold text-slate-700 px-1">{props.title}</legend>
+        )}
+        <p className="text-xs text-slate-500 mb-2">
+          No enable switch. Adding an enabled field in YAML has no effect.
+        </p>
+        {props.description && (
+          <p className="field-description text-xs text-slate-400 mb-2">{props.description}</p>
+        )}
+        {props.properties.map((prop) => (
+          <div key={prop.name}>{prop.content}</div>
+        ))}
+      </fieldset>
+    )
+  }
+
+  if (isAddon) {
+    const isEnabled = (formData as { enabled?: unknown } | undefined)?.enabled === true
+    const enabledProp = props.properties.find((p) => p.name === "enabled")
+    const otherProps = props.properties.filter((p) => p.name !== "enabled")
+    const groups = groupByComplexity(otherProps, props.schema)
+
+    return (
+      <fieldset id={props.idSchema.$id} className="border border-slate-200 rounded-lg p-3 mb-3">
+        {props.title && (
+          <legend className="text-xs font-semibold text-slate-700 px-1">{props.title}</legend>
+        )}
+        {props.description && (
+          <p className="field-description text-xs text-slate-400 mb-2">{props.description}</p>
+        )}
+
+        {enabledProp && <div className="mb-2">{enabledProp.content}</div>}
+
+        {isEnabled && otherProps.length > 0 && (
+          <div className="pl-4 border-l-2 border-blue-200 space-y-0.5">
+            {groups.map((group, i) =>
+              group.simple ? (
+                <div key={i} className="grid-fields grid grid-cols-2 gap-x-3 xl:grid-cols-3">
+                  {group.items.map((prop) => (
+                    <div key={prop.name} className={group.items.length === 1 ? "col-span-full" : ""}>{prop.content}</div>
+                  ))}
+                </div>
+              ) : (
+                group.items.map((prop) => (
+                  <div key={prop.name}>{prop.content}</div>
+                ))
+              )
+            )}
+          </div>
+        )}
+
+        {!isEnabled && otherProps.length > 0 && (
+          <p className="text-xs text-slate-400 italic mt-1.5">
+            Enable this addon to configure additional settings
+          </p>
+        )}
+      </fieldset>
+    )
+  }
+
+  // Default: smart 2-column grid for simple fields, full width for complex
+  const groups = groupByComplexity(props.properties, props.schema)
+
+  return (
+    <fieldset id={props.idSchema.$id}>
+      {props.title && <legend>{props.title}</legend>}
+      {props.description && <p className="field-description">{props.description}</p>}
+      {groups.map((group, i) =>
+        group.simple ? (
+          <div key={i} className="grid-fields grid grid-cols-2 gap-x-3 xl:grid-cols-3">
+            {group.items.map((prop) => (
+              <div key={prop.name} className={group.items.length === 1 ? "col-span-full" : ""}>{prop.content}</div>
+            ))}
+          </div>
+        ) : (
+          group.items.map((prop) => (
+            <div key={prop.name}>{prop.content}</div>
+          ))
+        )
+      )}
+    </fieldset>
+  )
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/components/DynamicOptionsWidget.test.tsx b/packages/system/dashboard/images/console/apps/console/src/components/DynamicOptionsWidget.test.tsx
new file mode 100644
index 0000000000..9047e24fbf
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/components/DynamicOptionsWidget.test.tsx
@@ -0,0 +1,229 @@
+import { useState } from "react"
+import { describe, it, expect, vi } from "vitest"
+import { screen, fireEvent, waitFor } from "@testing-library/react"
+import type { WidgetProps } from "@rjsf/utils"
+import type { K8sList } from "@cozystack/k8s-client"
+import { DynamicOptionsWidget } from "./DynamicOptionsWidget.tsx"
+import { createMockK8sClient } from "../test-utils/mock-k8s-client.ts"
+import { renderWithK8sProvider } from "../test-utils/render.tsx"
+
+vi.mock("../lib/tenant-context.tsx", () => ({
+  useTenantContext: () => ({
+    tenants: [],
+    selectedTenant: "root",
+    selectTenant: () => {},
+    tenantNamespace: "tenant-root",
+    isLoading: false,
+    error: null,
+  }),
+}))
+
+interface OptionItem {
+  value: string
+  label?: string
+  description?: string
+  default?: boolean
+}
+
+function option(name: string, items: OptionItem[]) {
+  return {
+    apiVersion: "core.cozystack.io/v1alpha1",
+    kind: "Option",
+    metadata: { name },
+    spec: { items },
+  }
+}
+
+function list(...options: ReturnType<typeof option>[]): K8sList<unknown> {
+  return {
+    apiVersion: "core.cozystack.io/v1alpha1",
+    kind: "OptionList",
+    metadata: { resourceVersion: "1" },
+    items: options,
+  }
+}
+
+type ListResult = K8sList<unknown> | (() => K8sList<unknown> | Promise<K8sList<unknown>>)
+
+function clientWith(result: ListResult) {
+  return createMockK8sClient({
+    lists: [
+      {
+        apiGroup: "core.cozystack.io",
+        apiVersion: "v1alpha1",
+        plural: "options",
+        namespace: "tenant-root",
+        result,
+      },
+    ],
+  })
+}
+
+const NEVER_RESOLVES = () => new Promise<K8sList<unknown>>(() => {})
+
+function makeProps(overrides: Partial<WidgetProps> = {}, source = "storageclass"): WidgetProps {
+  const base = {
+    id: "field",
+    name: "field",
+    label: "field",
+    value: undefined as unknown,
+    onChange: vi.fn(),
+    onBlur: vi.fn(),
+    onFocus: vi.fn(),
+    required: false,
+    disabled: false,
+    readonly: false,
+    autofocus: false,
+    placeholder: "",
+    options: {},
+    schema: { type: "string", "x-cozystack-options": { source } },
+    uiSchema: {},
+    formContext: {},
+    rawErrors: [],
+    hideError: false,
+    multiple: false,
+    registry: {},
+  }
+  return { ...base, ...overrides } as unknown as WidgetProps
+}
+
+describe("DynamicOptionsWidget", () => {
+  it("auto-selects the server-marked default item exactly once when no value is set", async () => {
+    const onChange = vi.fn()
+    renderWithK8sProvider(
+      <DynamicOptionsWidget {...makeProps({ onChange })} />,
+      { client: clientWith(list(option("storageclass", [{ value: "fast" }, { value: "standard", default: true }]))) },
+    )
+
+    await waitFor(() => expect(onChange).toHaveBeenCalledWith("standard"))
+    expect(onChange).toHaveBeenCalledTimes(1)
+  })
+
+  it("does not auto-commit when no item is marked default (preserves the VMDisk invariant)", async () => {
+    // The old VMDiskWidget deliberately never auto-selected the first disk —
+    // auto-committing dropped the user's choice on a fast submit. The generic
+    // widget only auto-selects when the server marks item.default, so a
+    // default-less source (e.g. vmdisk) must stay untouched on load.
+    const onChange = vi.fn()
+    renderWithK8sProvider(
+      <DynamicOptionsWidget {...makeProps({ onChange }, "vmdisk")} />,
+      { client: clientWith(list(option("vmdisk", [{ value: "disk-a" }, { value: "disk-b" }]))) },
+    )
+
+    await screen.findByRole("option", { name: /disk-a/ })
+    expect(onChange).not.toHaveBeenCalled()
+  })
+
+  it("lists the Option resource namespaced to the active tenant", async () => {
+    // The Option CRD is namespaced (tenant-scoped); querying it cluster-wide
+    // would return nothing. Pin the namespaced LIST.
+    const client = clientWith(list(option("storageclass", [{ value: "fast" }])))
+    renderWithK8sProvider(<DynamicOptionsWidget {...makeProps()} />, { client })
+
+    await screen.findByRole("option", { name: /fast/ })
+    expect(client.list).toHaveBeenCalledWith(
+      "core.cozystack.io",
+      "v1alpha1",
+      "options",
+      "tenant-root",
+      expect.anything(),
+    )
+  })
+
+  // RJSF's generated id has to reach the DOM: focus-first-error resolves the
+  // offending field by that id, so a select without one leaves a blocked
+  // submit scrolling nowhere on every x-cozystack-options field.
+  it("puts the generated id on the select", async () => {
+    renderWithK8sProvider(
+      <DynamicOptionsWidget {...makeProps({ id: "root_gpus_0_name" })} />,
+      { client: clientWith(list(option("storageclass", [{ value: "fast" }]))) },
+    )
+
+    await screen.findByRole("option", { name: /^fast$/ })
+    expect(screen.getByRole("combobox")).toHaveAttribute("id", "root_gpus_0_name")
+  })
+
+  it("shows an explicit placeholder instead of the first option when required and empty", async () => {
+    renderWithK8sProvider(
+      // No default item, so the auto-default effect stays idle and the
+      // value-less required state is observable.
+      <DynamicOptionsWidget {...makeProps({ required: true })} />,
+      { client: clientWith(list(option("storageclass", [{ value: "fast" }, { value: "slow" }]))) },
+    )
+
+    await screen.findByRole("option", { name: /^fast$/ })
+    const select = screen.getByRole("combobox") as HTMLSelectElement
+    expect(select.value).toBe("")
+    expect(screen.getByRole("option", { name: /select an option/i })).toBeInTheDocument()
+    expect((screen.getByRole("option", { name: /^fast$/ }) as HTMLOptionElement).selected).toBe(false)
+  })
+
+  it("keeps a committed value visible while the list is still loading", () => {
+    renderWithK8sProvider(
+      <DynamicOptionsWidget {...makeProps({ required: true, value: "custom-x" })} />,
+      { client: clientWith(NEVER_RESOLVES) },
+    )
+
+    const select = screen.getByRole("combobox") as HTMLSelectElement
+    expect(select.value).toBe("custom-x")
+    expect(screen.getByRole("option", { name: /custom-x/ })).toBeInTheDocument()
+  })
+
+  it("lets the user clear an optional field that has a server default (no snap-back)", async () => {
+    // The auto-default must fire only once; clearing must stick rather than the
+    // effect immediately re-applying the default. Needs a stateful host so the
+    // cleared value actually flows back and could (wrongly) re-trigger the effect.
+    function Host() {
+      const [value, setValue] = useState<string | undefined>(undefined)
+      return (
+        <DynamicOptionsWidget
+          {...makeProps({ value, onChange: setValue as (v: unknown) => void })}
+        />
+      )
+    }
+    renderWithK8sProvider(<Host />, {
+      client: clientWith(
+        list(option("storageclass", [{ value: "fast" }, { value: "standard", default: true }])),
+      ),
+    })
+
+    const select = (await screen.findByRole("combobox")) as HTMLSelectElement
+    await waitFor(() => expect(select.value).toBe("standard"))
+
+    fireEvent.change(select, { target: { value: "" } })
+    await waitFor(() => expect(select.value).toBe(""))
+    // The default must not re-apply after a deliberate clear.
+    expect(select.value).toBe("")
+  })
+
+  it("emits undefined (not an empty string) when an optional field is cleared", async () => {
+    const onChange = vi.fn()
+    renderWithK8sProvider(
+      // No default item, so clearing is not immediately re-applied.
+      <DynamicOptionsWidget {...makeProps({ value: "fast", onChange })} />,
+      { client: clientWith(list(option("storageclass", [{ value: "fast" }, { value: "slow" }]))) },
+    )
+
+    await screen.findByRole("option", { name: /^fast$/ })
+    fireEvent.change(screen.getByRole("combobox"), { target: { value: "" } })
+    expect(onChange).toHaveBeenCalledWith(undefined)
+  })
+
+  it("renders labels and resolves items only from the Option whose name matches the source", async () => {
+    renderWithK8sProvider(
+      <DynamicOptionsWidget {...makeProps({}, "backupclass")} />,
+      {
+        client: clientWith(
+          list(
+            option("storageclass", [{ value: "fast", label: "Fast SSD" }]),
+            option("backupclass", [{ value: "s3", label: "S3 bucket" }]),
+          ),
+        ),
+      },
+    )
+
+    expect(await screen.findByRole("option", { name: "S3 bucket" })).toBeInTheDocument()
+    // The unrelated source's items must not leak in.
+    expect(screen.queryByRole("option", { name: "Fast SSD" })).not.toBeInTheDocument()
+  })
+})
diff --git a/packages/system/dashboard/images/console/apps/console/src/components/DynamicOptionsWidget.tsx b/packages/system/dashboard/images/console/apps/console/src/components/DynamicOptionsWidget.tsx
new file mode 100644
index 0000000000..f4e1f7fe5b
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/components/DynamicOptionsWidget.tsx
@@ -0,0 +1,131 @@
+import { useEffect, useRef } from "react"
+import type { WidgetProps } from "@rjsf/utils"
+import { useK8sGet, useK8sList } from "@cozystack/k8s-client"
+import { useTenantContext } from "../lib/tenant-context.tsx"
+import { resolveSource } from "../lib/dynamic-options.ts"
+
+/**
+ * Generic dropdown widget driven by the `x-cozystack-options` schema keyword.
+ *
+ * A string field annotated with `{ "x-cozystack-options": { "source": "gpu" } }`
+ * is rendered as a <select> populated from the cluster. Options are served by
+ * the cozystack-api `Option` resource (core.cozystack.io/v1alpha1): one object
+ * per named source, computed server-side with privileged access, so tenants
+ * need no direct read on Nodes / KubeVirt / instancetypes / etc.
+ *
+ * This single widget replaces the former per-field widgets (StorageClass,
+ * VMDisk, BackupClass): the server marks the preselected entry via
+ * `item.default` (e.g. the default StorageClass) and ships display labels
+ * (e.g. disk size), so the UX is identical everywhere.
+ */
+
+interface OptionItem {
+  value: string
+  label?: string
+  description?: string
+  default?: boolean
+}
+
+export interface OptionObject {
+  apiVersion: string
+  kind: string
+  metadata: { name: string }
+  spec?: { items?: OptionItem[] }
+}
+
+export function DynamicOptionsWidget(props: WidgetProps) {
+  const { id, value, onChange, required, disabled, readonly, schema, registry } = props
+  const { tenantNamespace } = useTenantContext()
+
+  const rawSource = (schema as { "x-cozystack-options"?: { source?: string } })?.[
+    "x-cozystack-options"
+  ]?.source
+
+  const rootFormData = (registry?.formContext as { rootFormData?: unknown })?.rootFormData
+  const { name: source, parameterised } = resolveSource(rawSource, rootFormData)
+
+  // A parameterised source is deliberately absent from the Option list — it
+  // describes nothing without its argument — so it is fetched by name instead.
+  const { data: optionList, isLoading: listLoading } = useK8sList<OptionObject>(
+    {
+      apiGroup: "core.cozystack.io",
+      apiVersion: "v1alpha1",
+      plural: "options",
+      namespace: tenantNamespace ?? undefined,
+    },
+    { enabled: !!tenantNamespace && !parameterised },
+  )
+
+  const { data: option, isLoading: getLoading } = useK8sGet<OptionObject>(
+    {
+      apiGroup: "core.cozystack.io",
+      apiVersion: "v1alpha1",
+      plural: "options",
+      name: source ?? "",
+      namespace: tenantNamespace ?? "",
+    },
+    { enabled: !!tenantNamespace && parameterised && !!source },
+  )
+
+  const isLoading = parameterised ? getLoading : listLoading
+
+  const items: OptionItem[] = parameterised
+    ? (option?.spec?.items ?? [])
+    : (optionList?.items?.find((o) => o.metadata.name === source)?.spec?.items ?? [])
+
+  const currentValue = typeof value === "string" ? value : ""
+  const hasCurrentInList = items.some((it) => it.value === currentValue)
+  const defaultItem = items.find((it) => it.default)
+
+  // Auto-select the server-marked default (e.g. the default StorageClass) once
+  // on initial load. The ref latches after the first auto-default and is never
+  // reset, so deliberately clearing an optional field sticks — re-arming it
+  // here would let the effect immediately re-apply the default and make the
+  // field impossible to clear.
+  const hasAutoDefaulted = useRef(false)
+  useEffect(() => {
+    if (!hasAutoDefaulted.current && !value && defaultItem && !isLoading) {
+      hasAutoDefaulted.current = true
+      onChange(defaultItem.value)
+    }
+  }, [value, defaultItem, isLoading, onChange])
+
+  const placeholder = isLoading
+    ? "Loading..."
+    : // A dependent dropdown with nothing to depend on yet is waiting, not
+      // empty, and saying so points at the field that unblocks it.
+      parameterised && !source
+      ? "Select a source first..."
+      : items.length === 0
+        ? "No options available"
+        : required
+          ? "Select an option..."
+          : "-- None --"
+
+  return (
+    <select
+      id={id}
+      value={currentValue}
+      onChange={(e) => onChange(e.target.value || undefined)}
+      disabled={disabled || readonly}
+      required={required}
+      className="w-full rounded-lg border border-slate-300 bg-white pl-3 pr-8 py-2 text-sm text-slate-900 outline-none focus:border-blue-400 focus:ring-1 focus:ring-blue-400 disabled:opacity-50 disabled:cursor-not-allowed"
+    >
+      {/* Explicit placeholder so a value-less required select shows it instead
+          of silently displaying the first option. */}
+      <option value="" disabled={required}>
+        {placeholder}
+      </option>
+      {/* Keep the committed value visible even before the list loads, so an
+          async re-render never drops the parent's selection. */}
+      {currentValue && !hasCurrentInList && (
+        <option value={currentValue}>{currentValue}</option>
+      )}
+      {items.map((it) => (
+        <option key={it.value} value={it.value} title={it.description}>
+          {it.label || it.value}
+        </option>
+      ))}
+    </select>
+  )
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/components/FreeformObjectField.test.tsx b/packages/system/dashboard/images/console/apps/console/src/components/FreeformObjectField.test.tsx
new file mode 100644
index 0000000000..00577d4895
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/components/FreeformObjectField.test.tsx
@@ -0,0 +1,122 @@
+import { createRef, useState } from "react"
+import { describe, it, expect, vi } from "vitest"
+import { act, fireEvent, render, screen } from "@testing-library/react"
+import type { FieldProps } from "@rjsf/utils"
+import { SchemaForm, type SchemaFormHandle } from "./SchemaForm.tsx"
+import { FreeformObjectField } from "./FreeformObjectField.tsx"
+import { IMMUTABLE_HELP_TEXT } from "../lib/immutable-paths.ts"
+
+const schema = {
+  type: "object",
+  properties: {
+    users: { type: "object", additionalProperties: { type: "object", properties: { password: { type: "string" } } } },
+    config: { type: "object", properties: {
+      merge: { type: "object", default: {}, "x-kubernetes-preserve-unknown-fields": true },
+      resolver: { type: "object", additionalProperties: true },
+    } },
+  },
+}
+
+function setup(initial: unknown = { users: {}, config: { merge: {}, resolver: {} } }, openAPISchema: unknown = schema, immutableMode?: "enforce") {
+  const ref = createRef<SchemaFormHandle>()
+  const changed = vi.fn()
+  function Controlled() {
+    const [data, setData] = useState(initial)
+    return <SchemaForm ref={ref} openAPISchema={JSON.stringify(openAPISchema)} formData={data} onChange={(next) => { changed(next); setData(next) }} immutableMode={immutableMode} />
+  }
+  render(<Controlled />)
+  const validate = () => {
+    let valid = false
+    act(() => { valid = ref.current!.validate() })
+    return valid
+  }
+  return { changed, validate }
+}
+
+describe("free-form object editing", () => {
+  it("preserves typed whitespace instead of reformatting each valid keystroke", () => {
+    const { changed, validate } = setup()
+    const text = '{ "jetstream": true, "subjects": ["one"] }\n'
+    fireEvent.change(screen.getByLabelText("merge"), { target: { value: text } })
+    expect(screen.getByLabelText("merge")).toHaveValue(text)
+    expect(changed.mock.lastCall![0].config.merge).toEqual({ jetstream: true, subjects: ["one"] })
+    expect(validate()).toBe(true)
+  })
+
+  it("edits both NATS objects and preserves nested types and the typed users editor", () => {
+    const { changed, validate } = setup()
+    const merge = { accounts: { A: { jetstream: { max_streams: 2 }, enabled: false, subjects: ["a", "b"], extra: null } } }
+    fireEvent.change(screen.getByLabelText("merge"), { target: { value: JSON.stringify(merge) } })
+    fireEvent.change(screen.getByLabelText("resolver"), { target: { value: '{"type":"full","dir":"/data"}' } })
+    expect(changed.mock.lastCall![0].config).toEqual({ merge, resolver: { type: "full", dir: "/data" } })
+    expect(screen.getByPlaceholderText("Enter key name...")).toBeInTheDocument()
+    expect(validate()).toBe(true)
+  })
+
+  it.each(["{", "", "[]", "null", "12", '"text"'])("blocks submission for %j and recovers after correction", (input) => {
+    const { validate } = setup()
+    fireEvent.change(screen.getByLabelText("merge"), { target: { value: input } })
+    expect(screen.getByLabelText("merge")).toHaveValue(input)
+    expect(screen.getByText("Enter a valid JSON object.")).toBeInTheDocument()
+    expect(validate()).toBe(false)
+    fireEvent.change(screen.getByLabelText("merge"), { target: { value: '{"jetstream":true}' } })
+    expect(validate()).toBe(true)
+  })
+
+  it("renders existing values and allows replacing them with an empty object", () => {
+    const { changed, validate } = setup({ config: { merge: { accounts: { A: { jetstream: true } } }, resolver: {} } })
+    expect(JSON.parse((screen.getByLabelText("merge") as HTMLTextAreaElement).value)).toEqual({ accounts: { A: { jetstream: true } } })
+    fireEvent.change(screen.getByLabelText("merge"), { target: { value: "{}" } })
+    expect(changed.mock.lastCall![0].config.merge).toEqual({})
+    expect(validate()).toBe(true)
+  })
+
+  it("keeps immutable objects disabled with their explanation", () => {
+    setup({ settings: { enabled: true } }, { type: "object", properties: { settings: { type: "object", additionalProperties: true, "x-kubernetes-validations": [{ rule: "self == oldSelf" }] } } }, "enforce")
+    expect(screen.getByLabelText("settings")).toBeDisabled()
+    expect(screen.getByText(IMMUTABLE_HELP_TEXT)).toBeInTheDocument()
+  })
+
+  it("marks a valid JSON object that fails the schema as invalid and points at its errors", () => {
+    const { validate } = setup({ settings: {} }, { type: "object", properties: { settings: { type: "object", additionalProperties: true, minProperties: 1 } } })
+    const field = screen.getByLabelText("settings")
+    expect(field).toHaveAttribute("aria-invalid", "false")
+    expect(validate()).toBe(false)
+    expect(field).toHaveAttribute("aria-invalid", "true")
+    expect(field.getAttribute("aria-describedby")!.split(" ")).toContain("root_settings__error")
+    expect(document.getElementById("root_settings__error")).toBeInTheDocument()
+    expect(screen.queryByText("Enter a valid JSON object.")).not.toBeInTheDocument()
+    fireEvent.change(field, { target: { value: '{"enabled":true}' } })
+    expect(validate()).toBe(true)
+    expect(field).toHaveAttribute("aria-invalid", "false")
+    expect(field.getAttribute("aria-describedby")!.split(" ")).not.toContain("root_settings__error")
+  })
+
+  it("does not point at an error list that hideError keeps from rendering", () => {
+    const props = {
+      schema: { type: "object", additionalProperties: true },
+      formData: {},
+      onChange: vi.fn(),
+      idSchema: { $id: "root_settings" },
+      name: "settings",
+      required: false,
+      readonly: false,
+      disabled: false,
+      uiSchema: {},
+      rawErrors: ["must NOT have fewer than 1 properties"],
+      hideError: true,
+      registry: {},
+    } as unknown as FieldProps
+    render(<FreeformObjectField {...props} />)
+    const field = screen.getByLabelText("settings")
+    expect(field).toHaveAttribute("aria-invalid", "true")
+    expect(field.getAttribute("aria-describedby")!.split(" ")).not.toContain("root_settings__error")
+  })
+
+  it("reaches free-form objects nested in arrays", () => {
+    const { changed, validate } = setup({ items: [{ options: {} }] }, { type: "object", properties: { items: { type: "array", items: { type: "object", properties: { options: { type: "object", additionalProperties: true } } } } } })
+    fireEvent.change(screen.getByLabelText("options"), { target: { value: '{"nested":[1,true]}' } })
+    expect(changed.mock.lastCall![0].items[0].options).toEqual({ nested: [1, true] })
+    expect(validate()).toBe(true)
+  })
+})
diff --git a/packages/system/dashboard/images/console/apps/console/src/components/FreeformObjectField.tsx b/packages/system/dashboard/images/console/apps/console/src/components/FreeformObjectField.tsx
new file mode 100644
index 0000000000..ef18841b88
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/components/FreeformObjectField.tsx
@@ -0,0 +1,66 @@
+import { useState } from "react"
+import { errorId } from "@rjsf/utils"
+import type { FieldProps } from "@rjsf/utils"
+
+function displayValue(value: unknown) {
+  return typeof value === "string" ? value : JSON.stringify(value ?? {}, null, 2)
+}
+
+export function FreeformObjectField({
+  schema, formData, onChange, idSchema, name, required, readonly, disabled, uiSchema, rawErrors, hideError,
+}: FieldProps) {
+  const source = displayValue(formData)
+  const [draft, setDraft] = useState<{ source: string, text: string } | null>(null)
+  const value = draft?.source === source ? draft.text : source
+  const invalid = typeof formData === "string"
+  // A parsed object can still fail the schema, and RJSF lists those errors
+  // under the field template rather than here.
+  const hasSchemaErrors = Boolean(rawErrors?.length)
+  const helpId = `${idSchema.$id}__json_help`
+  const describedBy = [
+    helpId,
+    ...(uiSchema?.["ui:help"] ? [`${idSchema.$id}__help`] : []),
+    ...(hasSchemaErrors && !hideError ? [errorId(idSchema)] : []),
+  ].join(" ")
+
+  return (
+    <div className="form-group field">
+      <label htmlFor={idSchema.$id} className="control-label mb-2 block text-sm font-medium text-slate-700">
+        {schema.title ?? name}
+        {required && <span className="required ml-1 text-red-500">*</span>}
+      </label>
+      {schema.description && <p className="mb-3 text-xs text-slate-500">{schema.description}</p>}
+      <textarea
+        id={idSchema.$id}
+        value={value}
+        rows={8}
+        readOnly={readonly}
+        disabled={disabled}
+        spellCheck={false}
+        aria-invalid={invalid || hasSchemaErrors}
+        aria-describedby={describedBy}
+        className="w-full rounded-lg border border-slate-300 bg-white p-3 font-mono text-sm text-slate-900 outline-none focus:border-blue-400 focus:ring-1 focus:ring-blue-400 disabled:opacity-50"
+        onChange={(event) => {
+          const text = event.target.value
+          const change = (next: unknown) => {
+            setDraft({ source: displayValue(next), text })
+            onChange(next)
+          }
+          try {
+            const parsed: unknown = JSON.parse(text)
+            if (parsed !== null && typeof parsed === "object" && !Array.isArray(parsed)) {
+              change(parsed)
+              return
+            }
+          } catch {
+            // Keep incomplete input in formData so schema validation blocks submission.
+          }
+          change(text)
+        }}
+      />
+      <p id={helpId} className={invalid ? "mt-1 text-xs text-red-600" : "mt-1 text-xs text-slate-500"}>
+        {invalid ? "Enter a valid JSON object." : "Enter a JSON object. Nested objects and arrays are supported."}
+      </p>
+    </div>
+  )
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/components/InstanceCard.tsx b/packages/system/dashboard/images/console/apps/console/src/components/InstanceCard.tsx
new file mode 100644
index 0000000000..3abe0f50b2
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/components/InstanceCard.tsx
@@ -0,0 +1,51 @@
+import { Link } from "react-router"
+import { StatusBadge } from "@cozystack/ui"
+import type {
+  ApplicationDefinition,
+  ApplicationInstance,
+} from "@cozystack/types"
+import { appDisplayName, iconDataUrl } from "../lib/app-definitions.ts"
+import { formatAge, readyCondition } from "../lib/status.ts"
+
+interface InstanceCardProps {
+  ad: ApplicationDefinition
+  instance: ApplicationInstance
+}
+
+export function InstanceCard({ ad, instance }: InstanceCardProps) {
+  const icon = iconDataUrl(ad)
+  const displayKind = appDisplayName(ad)
+  const ready = readyCondition(instance)
+  const plural = ad.spec?.application.plural ?? ""
+
+  return (
+    <Link
+      to={`/console/${plural}/${instance.metadata.name}`}
+      className="group flex w-80 items-center justify-between gap-3 rounded-lg border border-slate-200 bg-white px-4 py-3 transition-shadow hover:shadow-sm"
+    >
+      <div className="flex min-w-0 items-center gap-3">
+        <div className="size-9 shrink-0 overflow-hidden rounded-md bg-slate-100">
+          {icon ? (
+            <img src={icon} alt={displayKind} className="h-full w-full" />
+          ) : null}
+        </div>
+        <div className="min-w-0">
+          <p className="truncate text-sm font-semibold text-slate-900 group-hover:text-blue-700">
+            {instance.metadata.name}
+          </p>
+          <p className="truncate text-xs text-slate-500">{displayKind}</p>
+        </div>
+      </div>
+      <div className="flex shrink-0 items-center gap-3 text-xs text-slate-500">
+        {ready ? (
+          <StatusBadge tone={ready.status === "True" ? "ok" : "warn"}>
+            {ready.status === "True" ? "Ready" : (ready.reason ?? "NotReady")}
+          </StatusBadge>
+        ) : (
+          <StatusBadge tone="muted">Unknown</StatusBadge>
+        )}
+        <span className="tabular-nums">{formatAge(instance.metadata.creationTimestamp)}</span>
+      </div>
+    </Link>
+  )
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/components/KeyValueEditor.tsx b/packages/system/dashboard/images/console/apps/console/src/components/KeyValueEditor.tsx
new file mode 100644
index 0000000000..43c5c5067c
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/components/KeyValueEditor.tsx
@@ -0,0 +1,117 @@
+import { useEffect, useRef, useState } from "react"
+
+interface KeyValuePair {
+  key: string
+  value: string
+}
+
+interface KeyValueEditorProps {
+  value: Record<string, unknown>
+  onChange: (value: Record<string, unknown>) => void
+  readonly?: boolean
+}
+
+function toPairs(value: Record<string, unknown>): KeyValuePair[] {
+  return Object.entries(value || {}).map(([key, val]) => ({
+    key,
+    value: typeof val === "string" ? val : JSON.stringify(val),
+  }))
+}
+
+export function KeyValueEditor({ value, onChange, readonly }: KeyValueEditorProps) {
+  const [pairs, setPairs] = useState<KeyValuePair[]>(() => toPairs(value))
+  // Tracks whether the latest value change originated inside this component.
+  // If so, the incoming prop update is our own echo and we skip re-sync.
+  const internalChange = useRef(false)
+
+  useEffect(() => {
+    if (internalChange.current) {
+      internalChange.current = false
+      return
+    }
+    setPairs(toPairs(value))
+  }, [value])
+
+  const updatePairs = (newPairs: KeyValuePair[]) => {
+    internalChange.current = true
+    setPairs(newPairs)
+    const obj: Record<string, unknown> = {}
+    for (const pair of newPairs) {
+      if (pair.key.trim()) {
+        try {
+          obj[pair.key] = JSON.parse(pair.value)
+        } catch {
+          obj[pair.key] = pair.value
+        }
+      }
+    }
+    onChange(obj)
+  }
+
+  const addPair = () => {
+    updatePairs([...pairs, { key: "", value: "" }])
+  }
+
+  const removePair = (index: number) => {
+    updatePairs(pairs.filter((_, i) => i !== index))
+  }
+
+  const updateKey = (index: number, key: string) => {
+    const newPairs = [...pairs]
+    newPairs[index] = { ...newPairs[index], key }
+    updatePairs(newPairs)
+  }
+
+  const updateValue = (index: number, value: string) => {
+    const newPairs = [...pairs]
+    newPairs[index] = { ...newPairs[index], value }
+    updatePairs(newPairs)
+  }
+
+  if (readonly && pairs.length === 0) {
+    return <div className="text-sm text-slate-500 italic">No overrides</div>
+  }
+
+  return (
+    <div className="space-y-2">
+      {pairs.map((pair, index) => (
+        <div key={index} className="flex gap-2 items-start">
+          <input
+            type="text"
+            placeholder="key"
+            value={pair.key}
+            onChange={(e) => updateKey(index, e.target.value)}
+            disabled={readonly}
+            className="flex-1 rounded-lg border border-slate-300 bg-white px-3 py-2 text-sm text-slate-900 placeholder:text-slate-400 outline-none focus:border-blue-400 focus:ring-1 focus:ring-blue-400 disabled:bg-slate-50 disabled:text-slate-500"
+          />
+          <input
+            type="text"
+            placeholder="value"
+            value={pair.value}
+            onChange={(e) => updateValue(index, e.target.value)}
+            disabled={readonly}
+            className="flex-1 rounded-lg border border-slate-300 bg-white px-3 py-2 text-sm text-slate-900 placeholder:text-slate-400 outline-none focus:border-blue-400 focus:ring-1 focus:ring-blue-400 disabled:bg-slate-50 disabled:text-slate-500"
+          />
+          {!readonly && (
+            <button
+              type="button"
+              onClick={() => removePair(index)}
+              className="rounded-md border border-red-300 bg-white px-3 py-2 text-sm font-medium text-red-600 hover:bg-red-50"
+            >
+              × Remove
+            </button>
+          )}
+        </div>
+      ))}
+      {!readonly && (
+        <button
+          type="button"
+          onClick={addPair}
+          className="rounded-md border border-slate-300 bg-white px-3 py-1.5 text-sm font-medium text-slate-700 hover:bg-slate-50"
+        >
+          + Add Override
+        </button>
+      )}
+    </div>
+  )
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/components/QuotaDisplay.tsx b/packages/system/dashboard/images/console/apps/console/src/components/QuotaDisplay.tsx
new file mode 100644
index 0000000000..aa0613d28d
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/components/QuotaDisplay.tsx
@@ -0,0 +1,305 @@
+import { useEffect, useState } from "react"
+import { useK8sList } from "@cozystack/k8s-client"
+import type { K8sResource } from "@cozystack/k8s-client"
+import { parseQuantity, humanizeBytes, humanizeCpu } from "../lib/k8s-quantity.ts"
+
+interface ResourceQuotaSpec {
+  hard?: Record<string, string>
+}
+
+interface ResourceQuotaStatus {
+  hard?: Record<string, string>
+  used?: Record<string, string>
+}
+
+export interface ResourceQuota extends K8sResource<ResourceQuotaSpec, ResourceQuotaStatus> {
+  kind: "ResourceQuota"
+}
+
+export interface QuotaEntry {
+  label: string
+  usedRaw: string
+  hardRaw: string
+  usedNum: number
+  hardNum: number
+  /** Capped at 100 for visual gauge rendering */
+  pct: number
+  /** Real percentage, may exceed 100 when over-limit */
+  pctReal: number
+  display: string
+}
+
+const DISPLAY_KEYS: Array<{
+  key: string
+  label: string
+  format: (n: number) => string
+}> = [
+  { key: "limits.cpu", label: "CPU", format: humanizeCpu },
+  { key: "limits.memory", label: "Memory", format: humanizeBytes },
+  { key: "requests.storage", label: "Storage", format: humanizeBytes },
+  { key: "services.loadbalancers", label: "Load Balancers", format: (n) => String(n) },
+  { key: "persistentvolumeclaims", label: "PVCs", format: (n) => String(n) },
+]
+
+function buildEntries(hard: Record<string, string>, used: Record<string, string>): QuotaEntry[] {
+  const entries: QuotaEntry[] = []
+  for (const { key, label, format } of DISPLAY_KEYS) {
+    const hardRaw = hard[key]
+    if (!hardRaw) continue
+    const usedRaw = used[key] ?? "0"
+    const hardNum = parseQuantity(hardRaw)
+    const usedNum = parseQuantity(usedRaw)
+    if (hardNum <= 0) continue
+    const pctReal = (usedNum / hardNum) * 100
+    const pct = Math.min(100, pctReal)
+    entries.push({ label, usedRaw, hardRaw, usedNum, hardNum, pct, pctReal, display: `${format(usedNum)} / ${format(hardNum)}` })
+  }
+  return entries
+}
+
+/**
+ * Aggregates multiple ResourceQuota objects for the same namespace following
+ * Kubernetes semantics: the most restrictive hard limit wins (min), and used
+ * is the maximum across all quotas that bound a given key.
+ *
+ * QuotaDisplay reads canonical Kubernetes keys (requests.cpu, limits.memory,
+ * etc.) while the cozystack-tenants chart editor uses short keys (cpu, memory)
+ * that cozy-lib.resources.flatten translates downstream — the asymmetry is
+ * intentional; do not "align" them.
+ */
+function aggregateQuotas(quotas: ResourceQuota[]): { hard: Record<string, string>; used: Record<string, string> } {
+  const hard: Record<string, string> = {}
+  const used: Record<string, string> = {}
+
+  for (const q of quotas) {
+    const qHard = q.status?.hard ?? {}
+    const qUsed = q.status?.used ?? {}
+
+    for (const [key, val] of Object.entries(qHard)) {
+      if (!(key in hard) || parseQuantity(val) < parseQuantity(hard[key])) {
+        hard[key] = val
+      }
+    }
+
+    // Only track used for keys bounded by this specific quota object
+    for (const [key, val] of Object.entries(qUsed)) {
+      if (key in qHard) {
+        if (!(key in used) || parseQuantity(val) > parseQuantity(used[key])) {
+          used[key] = val
+        }
+      }
+    }
+  }
+
+  return { hard, used }
+}
+
+function gaugeStrokeColor(pct: number): string {
+  if (pct >= 90) return "#ef4444"
+  if (pct >= 80) return "#f59e0b"
+  return "#3b82f6"
+}
+
+function gaugeTrackColor(pct: number): string {
+  if (pct >= 90) return "#fee2e2"
+  if (pct >= 80) return "#fef3c7"
+  return "#dbeafe"
+}
+
+function gaugeBgClass(pct: number): string {
+  if (pct >= 90) return "bg-red-50 ring-1 ring-red-100"
+  if (pct >= 80) return "bg-amber-50 ring-1 ring-amber-100"
+  return "bg-slate-50 ring-1 ring-slate-100"
+}
+
+interface ArcGaugeProps {
+  pct: number
+  size?: number
+  strokeWidth?: number
+  delay?: number
+}
+
+function ArcGauge({ pct, size = 72, strokeWidth = 6, delay = 0 }: ArcGaugeProps) {
+  const [drawn, setDrawn] = useState(false)
+
+  useEffect(() => {
+    const t = setTimeout(() => setDrawn(true), 60 + delay)
+    return () => clearTimeout(t)
+  }, [delay])
+
+  const r = (size - strokeWidth) / 2
+  const circumference = 2 * Math.PI * r
+  const dashoffset = drawn ? circumference * (1 - Math.min(pct, 100) / 100) : circumference
+  const stroke = gaugeStrokeColor(pct)
+  const track = gaugeTrackColor(pct)
+
+  return (
+    <svg
+      width={size}
+      height={size}
+      style={{ transform: "rotate(-90deg)" }}
+      aria-hidden="true"
+    >
+      <circle cx={size / 2} cy={size / 2} r={r} fill="none" stroke={track} strokeWidth={strokeWidth} />
+      <circle
+        cx={size / 2}
+        cy={size / 2}
+        r={r}
+        fill="none"
+        stroke={stroke}
+        strokeWidth={strokeWidth}
+        strokeLinecap="round"
+        strokeDasharray={circumference}
+        strokeDashoffset={dashoffset}
+        style={{ transition: `stroke-dashoffset 0.85s cubic-bezier(0.4, 0, 0.2, 1) ${delay}ms` }}
+      />
+    </svg>
+  )
+}
+
+interface GaugeCardProps {
+  entry: QuotaEntry
+  index: number
+}
+
+export function GaugeCard({ entry, index }: GaugeCardProps) {
+  const stroke = gaugeStrokeColor(entry.pct)
+  const isOver = entry.usedNum > entry.hardNum
+
+  return (
+    <div
+      className={`relative flex flex-col items-center gap-1.5 rounded-xl px-3 py-3 ${gaugeBgClass(entry.pct)}`}
+      role="progressbar"
+      aria-valuenow={Math.round(entry.pctReal)}
+      aria-valuemin={0}
+      aria-valuemax={100}
+      aria-label={`${entry.label}: ${entry.display}`}
+    >
+      <div className="relative flex items-center justify-center">
+        <ArcGauge pct={entry.pct} size={72} strokeWidth={6} delay={index * 80} />
+        <div className="absolute inset-0 flex flex-col items-center justify-center">
+          <span className="font-mono text-[13px] font-semibold leading-none" style={{ color: stroke }}>
+            {Math.round(entry.pctReal)}%
+          </span>
+        </div>
+        {isOver && (
+          <span className="absolute -right-1 -top-1 flex size-4 items-center justify-center rounded-full bg-red-500 text-[9px] font-bold text-white leading-none">
+            !
+          </span>
+        )}
+      </div>
+      <div className="text-center">
+        <div className="text-[10px] font-semibold uppercase tracking-wider text-slate-500">{entry.label}</div>
+        <div className="mt-0.5 font-mono text-[10px] text-slate-400">{entry.display}</div>
+      </div>
+    </div>
+  )
+}
+
+interface QuotaBarsProps {
+  hard: Record<string, string>
+  used: Record<string, string>
+  compact?: boolean
+}
+
+export function QuotaBars({ hard, used, compact = false }: QuotaBarsProps) {
+  const entries = buildEntries(hard, used)
+  if (entries.length === 0) return null
+
+  if (compact) {
+    return (
+      <div className="flex flex-wrap gap-x-3 gap-y-1">
+        {entries.map((e) => (
+          <div key={e.label} title={`${e.label}: ${e.display}`} className="flex items-center gap-1.5 min-w-0">
+            <div className="relative h-1.5 w-14 overflow-hidden rounded-full bg-slate-100">
+              <div
+                className="absolute inset-y-0 left-0 rounded-full transition-all duration-700"
+                style={{ width: `${e.pct}%`, backgroundColor: gaugeStrokeColor(e.pct) }}
+              />
+            </div>
+            <span className="font-mono text-[10px] text-slate-500 shrink-0">{Math.round(e.pctReal)}%</span>
+          </div>
+        ))}
+      </div>
+    )
+  }
+
+  return (
+    <div className="space-y-2.5">
+      {entries.map((e) => (
+        <div key={e.label} className="flex items-center gap-3">
+          <span className="w-24 shrink-0 text-xs font-medium text-slate-600">{e.label}</span>
+          <div className="relative flex-1 h-2 overflow-hidden rounded-full bg-slate-100">
+            <div
+              className="absolute inset-y-0 left-0 rounded-full transition-all duration-700"
+              style={{ width: `${e.pct}%`, backgroundColor: gaugeStrokeColor(e.pct) }}
+            />
+          </div>
+          <span className="w-28 text-right font-mono text-xs text-slate-500">{e.display}</span>
+        </div>
+      ))}
+    </div>
+  )
+}
+
+interface QuotaPanelProps {
+  namespace: string
+}
+
+export function QuotaPanel({ namespace }: QuotaPanelProps) {
+  const { data, isLoading } = useK8sList<ResourceQuota>(
+    { apiGroup: "", apiVersion: "v1", plural: "resourcequotas", namespace },
+    { enabled: !!namespace }
+  )
+
+  if (isLoading) return null
+
+  const quotas = data?.items ?? []
+  if (quotas.length === 0) return null
+
+  const { hard, used } = aggregateQuotas(quotas)
+
+  const entries = buildEntries(hard, used)
+  if (entries.length === 0) return null
+
+  const hasCritical = entries.some((e) => e.pct >= 90)
+  const hasWarning = entries.some((e) => e.pct >= 80)
+
+  return (
+    <div className={`rounded-xl border p-4 ${hasCritical ? "border-red-200" : hasWarning ? "border-amber-200" : "border-slate-200"} bg-white`}>
+      <div className="mb-3 flex items-center justify-between">
+        <h3 className="text-xs font-semibold uppercase tracking-wider text-slate-500">Resource Quotas</h3>
+        {hasCritical && (
+          <span className="rounded-full bg-red-100 px-2 py-0.5 text-[11px] font-semibold text-red-600">Critical</span>
+        )}
+        {!hasCritical && hasWarning && (
+          <span className="rounded-full bg-amber-100 px-2 py-0.5 text-[11px] font-semibold text-amber-600">Warning</span>
+        )}
+      </div>
+      <div
+        className="grid gap-3"
+        style={{ gridTemplateColumns: `repeat(${Math.min(entries.length, 5)}, minmax(0, 1fr))` }}
+      >
+        {entries.map((entry, i) => (
+          <GaugeCard key={entry.label} entry={entry} index={i} />
+        ))}
+      </div>
+    </div>
+  )
+}
+
+interface TenantQuotaCompactProps {
+  /** Pre-fetched ResourceQuota objects for this tenant's namespace. */
+  quotas: ResourceQuota[]
+}
+
+export function TenantQuotaCompact({ quotas }: TenantQuotaCompactProps) {
+  if (!quotas.length) return <span className="text-xs text-slate-400">—</span>
+
+  const { hard, used } = aggregateQuotas(quotas)
+
+  const entries = buildEntries(hard, used)
+  if (entries.length === 0) return <span className="text-xs text-slate-400">—</span>
+
+  return <QuotaBars hard={hard} used={used} compact />
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/components/ResourceQuotasField.tsx b/packages/system/dashboard/images/console/apps/console/src/components/ResourceQuotasField.tsx
new file mode 100644
index 0000000000..f8638c5012
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/components/ResourceQuotasField.tsx
@@ -0,0 +1,288 @@
+import { useState, useEffect, useRef } from "react"
+import type { FieldProps } from "@rjsf/utils"
+import { X, Plus } from "lucide-react"
+
+type QuotaMap = Record<string, string>
+
+interface KnownRow {
+  key: string
+  label: string
+  placeholder: string
+  suffix?: string
+  units?: readonly string[]
+  defaultUnit?: string
+}
+
+const KNOWN_ROWS: KnownRow[] = [
+  { key: "cpu", label: "CPU", placeholder: "e.g. 10", suffix: "cores" },
+  { key: "memory", label: "Memory", placeholder: "e.g. 20", units: ["Mi", "Gi", "Ti"] as const, defaultUnit: "Gi" },
+  { key: "storage", label: "Storage", placeholder: "e.g. 100", units: ["Mi", "Gi", "Ti"] as const, defaultUnit: "Gi" },
+  { key: "services.loadbalancers", label: "Load Balancers", placeholder: "e.g. 5", suffix: "LBs" },
+]
+
+const KNOWN_KEYS = new Set(KNOWN_ROWS.map((r) => r.key))
+
+// Accepts count/<resource> and extended resource patterns like <resource>.<group>
+const VALID_CUSTOM_KEY = /^(?:count\/[a-z0-9]([a-z0-9._-]*[a-z0-9])?|[a-z0-9]([a-z0-9._/-]*[a-z0-9])?)$/
+
+function parseSize(val: string | number, units: readonly string[]): { num: string; unit: string } {
+  // val can arrive as a number from user-authored YAML (e.g. `cpu: 10`)
+  const valStr = String(val)
+  // Match longest suffix first to avoid partial matches
+  const sorted = [...units].sort((a, b) => b.length - a.length)
+  for (const u of sorted) {
+    if (valStr.endsWith(u)) return { num: valStr.slice(0, -u.length), unit: u }
+  }
+  // Strip any trailing alphabetic chars so we don't corrupt data on save
+  const numericPart = valStr.replace(/[A-Za-z]+$/, "")
+  return { num: numericPart || valStr, unit: units[0] ?? "" }
+}
+
+function formatSize(num: string, unit: string): string {
+  const n = num.trim()
+  if (!n) return ""
+  return `${n}${unit}`
+}
+
+interface KnownRowEditorProps {
+  row: KnownRow
+  value: string | undefined
+  onChange: (val: string | undefined) => void
+  readonly?: boolean
+}
+
+function KnownRowEditor({ row, value, onChange, readonly }: KnownRowEditorProps) {
+  // Track checkbox state independently so clearing the number input doesn't
+  // uncheck the row — the cleared state is buffered locally and not propagated.
+  const [checked, setChecked] = useState(value !== undefined && value !== "")
+  const [localNum, setLocalNum] = useState(() => {
+    if (!value) return ""
+    return row.units ? parseSize(value, row.units).num : value
+  })
+  const [localUnit, setLocalUnit] = useState(() => {
+    if (!value || !row.units) return row.defaultUnit ?? row.units?.[0] ?? ""
+    return parseSize(value, row.units).unit
+  })
+
+  // expectedValueRef tracks values we emitted ourselves so we can distinguish
+  // an external reset (e.g. form data cleared from outside) from our own onChange.
+  const expectedValueRef = useRef(value)
+
+  useEffect(() => {
+    if (value === expectedValueRef.current) return
+    expectedValueRef.current = value
+    const hasValue = value !== undefined && value !== ""
+    setChecked(hasValue)
+    if (hasValue && value) {
+      // eslint-disable-next-line react-hooks/set-state-in-effect -- re-syncs local inputs after an external reset of the form value
+      setLocalNum(row.units ? parseSize(value, row.units).num : value)
+      if (row.units) setLocalUnit(parseSize(value, row.units).unit)
+    } else {
+      setLocalNum("")
+    }
+  // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [value])
+
+  const enabled = checked
+
+  const handleToggle = () => {
+    if (enabled) {
+      setChecked(false)
+      setLocalNum("")
+      expectedValueRef.current = undefined
+      onChange(undefined)
+    } else {
+      setChecked(true)
+      // Don't propagate until the user fills in a number
+    }
+  }
+
+  const handleNumChange = (num: string) => {
+    setLocalNum(num)
+    const trimmed = num.trim()
+    if (!trimmed) {
+      // Clear from parent data but keep checkbox checked locally
+      expectedValueRef.current = undefined
+      onChange(undefined)
+      return
+    }
+    const next = row.units ? formatSize(trimmed, localUnit) : trimmed
+    expectedValueRef.current = next
+    onChange(next)
+  }
+
+  const handleUnitChange = (unit: string) => {
+    setLocalUnit(unit)
+    if (localNum.trim()) {
+      const next = formatSize(localNum, unit)
+      expectedValueRef.current = next
+      onChange(next)
+    }
+  }
+
+  return (
+    <div className={`flex items-center gap-3 rounded-lg border px-3 py-2 transition-colors ${enabled ? "border-slate-200 bg-white" : "border-dashed border-slate-200 bg-slate-50/50"}`}>
+      {!readonly && (
+        <input
+          type="checkbox"
+          checked={enabled}
+          onChange={handleToggle}
+          className="size-4 rounded border-slate-300 accent-blue-600"
+        />
+      )}
+      <span className={`w-28 shrink-0 text-sm font-medium ${enabled ? "text-slate-800" : "text-slate-400"}`}>
+        {row.label}
+      </span>
+      {enabled ? (
+        <div className="flex flex-1 items-center gap-1.5">
+          <input
+            type="text"
+            value={localNum}
+            onChange={(e) => handleNumChange(e.target.value)}
+            placeholder={row.placeholder}
+            disabled={readonly}
+            className="w-28 rounded-md border border-slate-300 bg-white px-2.5 py-1.5 text-sm text-slate-900 outline-none focus:border-blue-400 focus:ring-1 focus:ring-blue-400 disabled:bg-slate-50 disabled:text-slate-500"
+          />
+          {row.units ? (
+            <select
+              value={localUnit}
+              onChange={(e) => handleUnitChange(e.target.value)}
+              disabled={readonly}
+              className="rounded-md border border-slate-300 bg-white px-2 py-1.5 text-sm text-slate-700 outline-none focus:border-blue-400 focus:ring-1 focus:ring-blue-400 disabled:bg-slate-50"
+            >
+              {row.units.map((u) => (
+                <option key={u} value={u}>{u}</option>
+              ))}
+            </select>
+          ) : (
+            <span className="text-sm text-slate-400">{row.suffix}</span>
+          )}
+        </div>
+      ) : (
+        <span className="flex-1 text-sm text-slate-400 italic">not set</span>
+      )}
+    </div>
+  )
+}
+
+export function ResourceQuotasField(props: FieldProps) {
+  const { schema, formData, onChange, readonly, disabled, name, required } = props
+  const isReadonly = readonly || disabled
+
+  const data: QuotaMap = formData ?? {}
+  const customKeys = Object.keys(data).filter((k) => !KNOWN_KEYS.has(k))
+
+  const [newKey, setNewKey] = useState("")
+  const [newVal, setNewVal] = useState("")
+  const [keyError, setKeyError] = useState("")
+
+  const update = (key: string, val: string | undefined) => {
+    const next = { ...data }
+    if (val === undefined || val.trim() === "") {
+      delete next[key]
+    } else {
+      next[key] = val
+    }
+    onChange(next)
+  }
+
+  const addCustom = () => {
+    const k = newKey.trim()
+    const v = newVal.trim()
+    if (!k || !v) return
+    if (!VALID_CUSTOM_KEY.test(k)) {
+      setKeyError("Invalid key format")
+      return
+    }
+    setKeyError("")
+    update(k, v)
+    setNewKey("")
+    setNewVal("")
+  }
+
+  return (
+    <div className="form-group field">
+      {name && (
+        <label className="control-label mb-2 block text-sm font-medium text-slate-700">
+          {name}
+          {required && <span className="required ml-1 text-red-500">*</span>}
+        </label>
+      )}
+      {schema.description && (
+        <p className="field-description mb-3 text-xs text-slate-500">{schema.description}</p>
+      )}
+
+      <div className="space-y-1.5">
+        {KNOWN_ROWS.map((row) => (
+          <KnownRowEditor
+            key={row.key}
+            row={row}
+            value={data[row.key] as string | undefined}
+            onChange={(val) => update(row.key, val)}
+            readonly={isReadonly}
+          />
+        ))}
+
+        {customKeys.length > 0 && (
+          <div className="mt-3 space-y-1.5">
+            <p className="text-xs font-medium text-slate-500 uppercase tracking-wide">Custom quotas</p>
+            {customKeys.map((k) => (
+              <div key={k} className="flex items-center gap-2">
+                <span className="w-40 shrink-0 font-mono text-xs text-slate-600">{k}</span>
+                <input
+                  type="text"
+                  value={data[k] as string}
+                  onChange={(e) => update(k, e.target.value)}
+                  disabled={isReadonly}
+                  className="flex-1 rounded-md border border-slate-300 bg-white px-2.5 py-1.5 text-sm text-slate-900 outline-none focus:border-blue-400 focus:ring-1 focus:ring-blue-400 disabled:bg-slate-50"
+                />
+                {!isReadonly && (
+                  <button
+                    type="button"
+                    onClick={() => update(k, undefined)}
+                    className="rounded-md p-1.5 text-slate-400 hover:bg-red-50 hover:text-red-500"
+                  >
+                    <X className="size-3.5" />
+                  </button>
+                )}
+              </div>
+            ))}
+          </div>
+        )}
+
+        {!isReadonly && (
+          <div className="mt-3 space-y-1">
+            <div className="flex items-center gap-2 pt-2 border-t border-slate-100">
+              <div className="flex flex-col gap-0.5">
+                <input
+                  type="text"
+                  value={newKey}
+                  onChange={(e) => { setNewKey(e.target.value); setKeyError("") }}
+                  placeholder="custom key"
+                  className={`w-40 rounded-md border px-2.5 py-1.5 text-sm font-mono text-slate-900 outline-none focus:ring-1 focus:ring-blue-400 placeholder:font-sans placeholder:text-slate-400 ${keyError ? "border-red-400 focus:border-red-400" : "border-slate-300 bg-white focus:border-blue-400"}`}
+                />
+              </div>
+              <input
+                type="text"
+                value={newVal}
+                onChange={(e) => setNewVal(e.target.value)}
+                placeholder="value"
+                onKeyDown={(e) => { if (e.key === "Enter") { e.preventDefault(); addCustom() } }}
+                className="flex-1 rounded-md border border-slate-300 bg-white px-2.5 py-1.5 text-sm text-slate-900 outline-none focus:border-blue-400 focus:ring-1 focus:ring-blue-400 placeholder:text-slate-400"
+              />
+              <button
+                type="button"
+                onClick={addCustom}
+                disabled={!newKey.trim() || !newVal.trim()}
+                className="flex items-center gap-1 rounded-md border border-slate-300 bg-white px-2.5 py-1.5 text-sm font-medium text-slate-700 hover:bg-slate-50 disabled:opacity-40 disabled:cursor-not-allowed"
+              >
+                <Plus className="size-3.5" /> Add
+              </button>
+            </div>
+            {keyError && <p className="text-xs text-red-500">{keyError}</p>}
+          </div>
+        )}
+      </div>
+    </div>
+  )
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/components/SchemaForm.test.tsx b/packages/system/dashboard/images/console/apps/console/src/components/SchemaForm.test.tsx
new file mode 100644
index 0000000000..4aabf4d6c5
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/components/SchemaForm.test.tsx
@@ -0,0 +1,258 @@
+import { createRef } from "react"
+import { describe, it, expect } from "vitest"
+import { render, screen, act } from "@testing-library/react"
+import { SchemaForm, type SchemaFormHandle } from "./SchemaForm.tsx"
+import { IMMUTABLE_HELP_TEXT } from "../lib/immutable-paths.ts"
+
+const schema = JSON.stringify({
+  type: "object",
+  properties: {
+    version: {
+      type: "string",
+      "x-kubernetes-validations": [
+        { rule: "self == oldSelf", message: "version is immutable" },
+      ],
+    },
+    description: {
+      type: "string",
+    },
+  },
+})
+
+const noop = () => {}
+
+describe("SchemaForm immutableMode", () => {
+  it("renders fields editable and without help text when immutableMode is omitted", () => {
+    render(
+      <SchemaForm
+        openAPISchema={schema}
+        formData={{ version: "1.0", description: "hi" }}
+        onChange={noop}
+      />,
+    )
+    const versionInput = screen.getByLabelText("version") as HTMLInputElement
+    expect(versionInput).not.toBeDisabled()
+    expect(screen.queryByText(IMMUTABLE_HELP_TEXT)).not.toBeInTheDocument()
+  })
+
+  it("greys out immutable fields and shows help text when immutableMode is enforce", () => {
+    render(
+      <SchemaForm
+        openAPISchema={schema}
+        formData={{ version: "1.0", description: "hi" }}
+        onChange={noop}
+        immutableMode="enforce"
+      />,
+    )
+    const versionInput = screen.getByLabelText("version") as HTMLInputElement
+    expect(versionInput).toBeDisabled()
+    const descriptionInput = screen.getByLabelText(
+      "description",
+    ) as HTMLInputElement
+    expect(descriptionInput).not.toBeDisabled()
+    expect(screen.getByText(IMMUTABLE_HELP_TEXT)).toBeInTheDocument()
+  })
+
+  it("treats immutableMode='off' the same as omitting the prop", () => {
+    render(
+      <SchemaForm
+        openAPISchema={schema}
+        formData={{ version: "1.0", description: "hi" }}
+        onChange={noop}
+        immutableMode="off"
+      />,
+    )
+    const versionInput = screen.getByLabelText("version") as HTMLInputElement
+    expect(versionInput).not.toBeDisabled()
+    expect(screen.queryByText(IMMUTABLE_HELP_TEXT)).not.toBeInTheDocument()
+  })
+
+  it("greys out every element of a whole-array immutable field", () => {
+    // *-as-last: the items schema itself carries the rule, so the entire
+    // array is immutable. RJSF receives ui:disabled on `items` and
+    // disables each element's input.
+    const wholeArraySchema = JSON.stringify({
+      type: "object",
+      properties: {
+        tags: {
+          type: "array",
+          items: {
+            type: "string",
+            "x-kubernetes-validations": [
+              { rule: "self == oldSelf", message: "tags is immutable" },
+            ],
+          },
+        },
+      },
+    })
+    render(
+      <SchemaForm
+        openAPISchema={wholeArraySchema}
+        formData={{ tags: ["alpha", "beta"] }}
+        onChange={noop}
+        immutableMode="enforce"
+      />,
+    )
+    expect(screen.getByDisplayValue("alpha")).toBeDisabled()
+    expect(screen.getByDisplayValue("beta")).toBeDisabled()
+    expect(screen.getAllByText(IMMUTABLE_HELP_TEXT).length).toBeGreaterThan(0)
+    // Mirroring the AdditionalPropertiesField map case: the array
+    // wrapper is disabled, so RJSF disables Add (and per-element
+    // Remove) too. Otherwise the user could append an entry that the
+    // overlay would silently drop on save.
+    expect(screen.getByRole("button", { name: /add/i })).toBeDisabled()
+  })
+
+  it("binds the key/value editor to an additionalProperties map nested in array items", () => {
+    // spec.strategies[].parameters shape: an array of objects each carrying a
+    // free-form string map. Native rendering shows no Add control here (the
+    // custom ObjectFieldTemplate drops it), so an empty map would be
+    // uneditable — the walker must reach into items and attach the field.
+    const arrayMapSchema = JSON.stringify({
+      type: "object",
+      properties: {
+        strategies: {
+          type: "array",
+          items: {
+            type: "object",
+            properties: {
+              parameters: {
+                type: "object",
+                additionalProperties: { type: "string" },
+              },
+            },
+          },
+        },
+      },
+    })
+    render(
+      <SchemaForm
+        openAPISchema={arrayMapSchema}
+        formData={{ strategies: [{ parameters: {} }] }}
+        onChange={noop}
+      />,
+    )
+    // AdditionalPropertiesField exposes an explicit add-key input even when the
+    // map is empty; native additionalProperties rendering would not.
+    expect(screen.getByPlaceholderText("Enter key name...")).toBeInTheDocument()
+  })
+
+  it("greys out immutable nested fields inside array items", () => {
+    const arraySchema = JSON.stringify({
+      type: "object",
+      properties: {
+        volumes: {
+          type: "array",
+          items: {
+            type: "object",
+            properties: {
+              name: {
+                type: "string",
+                "x-kubernetes-validations": [
+                  { rule: "self == oldSelf", message: "name immutable" },
+                ],
+              },
+              size: { type: "string" },
+            },
+          },
+        },
+      },
+    })
+    render(
+      <SchemaForm
+        openAPISchema={arraySchema}
+        formData={{ volumes: [{ name: "disk1", size: "10Gi" }] }}
+        onChange={noop}
+        immutableMode="enforce"
+      />,
+    )
+    const nameInput = screen.getByDisplayValue("disk1") as HTMLInputElement
+    const sizeInput = screen.getByDisplayValue("10Gi") as HTMLInputElement
+    expect(nameInput).toBeDisabled()
+    expect(sizeInput).not.toBeDisabled()
+    expect(screen.getByText(IMMUTABLE_HELP_TEXT)).toBeInTheDocument()
+  })
+})
+
+describe("SchemaForm validate handle", () => {
+  const requiredSchema = JSON.stringify({
+    type: "object",
+    required: ["name"],
+    properties: { name: { type: "string" }, note: { type: "string" } },
+  })
+
+  function validate(ref: React.RefObject<SchemaFormHandle | null>): boolean | undefined {
+    let result: boolean | undefined
+    act(() => {
+      result = ref.current?.validate()
+    })
+    return result
+  }
+
+  it("reports invalid through the ref when a required field is missing", () => {
+    const ref = createRef<SchemaFormHandle>()
+    render(
+      <SchemaForm ref={ref} openAPISchema={requiredSchema} formData={{}} onChange={noop} />,
+    )
+
+    expect(validate(ref)).toBe(false)
+  })
+
+  it("focuses the first offending field so a blocked submit is not silent", () => {
+    const ref = createRef<SchemaFormHandle>()
+    render(
+      <SchemaForm ref={ref} openAPISchema={requiredSchema} formData={{}} onChange={noop} />,
+    )
+
+    validate(ref)
+    expect(document.activeElement).toBe(document.getElementById("root_name"))
+  })
+
+  // #3135's own example lives inside an additionalProperties map, and those
+  // render in a nested form. Until that form continued the outer id namespace
+  // it restarted at "root", so the error named nodeGroups.md0.instanceType
+  // while the DOM held root_instanceType and the submit stayed silent.
+  it("focuses a required field inside an additionalProperties map", () => {
+    const mapSchema = JSON.stringify({
+      type: "object",
+      properties: {
+        nodeGroups: {
+          type: "object",
+          additionalProperties: {
+            type: "object",
+            required: ["instanceType"],
+            properties: { instanceType: { type: "string" } },
+          },
+        },
+      },
+    })
+    const ref = createRef<SchemaFormHandle>()
+    render(
+      <SchemaForm
+        ref={ref}
+        openAPISchema={mapSchema}
+        formData={{ nodeGroups: { md0: {} } }}
+        onChange={noop}
+      />,
+    )
+
+    expect(validate(ref)).toBe(false)
+    expect(document.activeElement).toBe(
+      document.getElementById("root_nodeGroups_md0_instanceType"),
+    )
+  })
+
+  it("reports valid through the ref once the required field is populated", () => {
+    const ref = createRef<SchemaFormHandle>()
+    render(
+      <SchemaForm
+        ref={ref}
+        openAPISchema={requiredSchema}
+        formData={{ name: "demo-disk" }}
+        onChange={noop}
+      />,
+    )
+
+    expect(validate(ref)).toBe(true)
+  })
+})
diff --git a/packages/system/dashboard/images/console/apps/console/src/components/SchemaForm.tsx b/packages/system/dashboard/images/console/apps/console/src/components/SchemaForm.tsx
new file mode 100644
index 0000000000..186876c47f
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/components/SchemaForm.tsx
@@ -0,0 +1,377 @@
+import { useMemo, useEffect, useRef, forwardRef, useImperativeHandle } from "react"
+import Form from "@rjsf/core"
+import validator from "@rjsf/validator-ajv8"
+import { getDefaultFormState } from "@rjsf/utils"
+import type { RJSFSchema, UiSchema, TemplatesType } from "@rjsf/utils"
+import { keysOrderToUiSchema, sanitizeSchema } from "../lib/keys-order.ts"
+import { focusFirstError } from "@/lib/focus-first-error.ts"
+import { RJSF_ID_PREFIX, RJSF_ID_SEPARATOR } from "../lib/rjsf-ids.ts"
+import { addSensitiveStringWidgets } from "../lib/sensitive-fields.ts"
+import {
+  IMMUTABLE_HELP_TEXT,
+  findImmutablePaths,
+  type ImmutablePath,
+} from "../lib/immutable-paths.ts"
+import { customTemplates, customWidgets } from "./rjsf-registry.ts"
+import { addDynamicOptionWidgets } from "../lib/dynamic-options.ts"
+import { AdditionalPropertiesField } from "./AdditionalPropertiesField.tsx"
+import { FreeformObjectField } from "./FreeformObjectField.tsx"
+import { ResourceQuotasField } from "./ResourceQuotasField.tsx"
+import { SourceField } from "./SourceField.tsx"
+import "./schema-form.css"
+
+/**
+ * Recursively find all fields with additionalProperties schema and add widget.
+ * Walks nested objects AND array items, so a map nested inside array elements
+ * (e.g. spec.strategies[].parameters) gets the key/value editor too — without
+ * this, such maps fall back to native rendering whose Add control the custom
+ * ObjectFieldTemplate omits, leaving empty maps with no way to add entries.
+ */
+function addAdditionalPropertiesWidgets(schema: RJSFSchema, uiSchema: UiSchema = {}): UiSchema {
+  if (!schema || typeof schema !== "object") return uiSchema
+
+  const properties = schema.properties
+  if (!properties || typeof properties !== "object") return uiSchema
+
+  const result = { ...uiSchema }
+
+  for (const [key, value] of Object.entries(properties)) {
+    if (typeof value === "object" && value !== null) {
+      const bound = bindAdditionalProperties(value as RJSFSchema, result[key] as UiSchema | undefined)
+      if (bound !== undefined) result[key] = bound
+    }
+  }
+
+  return result
+}
+
+/**
+ * Minimal structural view of a JSON-schema node used by the walk below.
+ * RJSFSchema is intersected with an `any` index signature, so reading fields
+ * straight off it yields `any`; routing through this interface keeps the walk
+ * typed without an `as any` cast.
+ */
+interface SchemaNode {
+  type?: string | string[]
+  properties?: Record<string, unknown>
+  additionalProperties?: unknown
+  items?: unknown
+}
+
+/**
+ * Resolve the uiSchema fragment for one schema node: bind the custom field to
+ * an additionalProperties map, recurse into nested objects, or recurse into
+ * array `items`. Returns the (possibly unchanged) ui fragment.
+ */
+function bindAdditionalProperties(
+  fieldSchema: RJSFSchema,
+  uiNode: UiSchema | undefined,
+): UiSchema | undefined {
+  const node: SchemaNode = fieldSchema
+
+  if (
+    node.type === "object" &&
+    (!node.properties || Object.keys(node.properties).length === 0) &&
+    node.additionalProperties === true
+  ) {
+    return { ...uiNode, "ui:field": "FreeformObjectField" }
+  }
+
+  const isAdditionalPropertiesMap =
+    node.type === "object" &&
+    (!node.properties || Object.keys(node.properties).length === 0) &&
+    typeof node.additionalProperties === "object" &&
+    node.additionalProperties !== null
+
+  if (isAdditionalPropertiesMap) {
+    return { ...uiNode, "ui:field": "AdditionalPropertiesField" }
+  }
+
+  if (node.properties) {
+    return addAdditionalPropertiesWidgets(fieldSchema, uiNode)
+  }
+
+  const items = node.items
+  if (
+    node.type === "array" &&
+    items &&
+    typeof items === "object" &&
+    !Array.isArray(items)
+  ) {
+    const itemsUi = bindAdditionalProperties(items as RJSFSchema, uiNode?.items)
+    if (itemsUi !== undefined) {
+      return { ...uiNode, items: itemsUi }
+    }
+  }
+
+  return uiNode
+}
+
+/**
+ * Apply ui:disabled + ui:help to every path the schema declares immutable.
+ * The disabled flag (not readonly) gives the grey-out treatment specified
+ * by product. Wildcard "*" segments translate to "items" for arrays. For
+ * object maps (additionalProperties) the disabled flag is set on the
+ * field itself so AdditionalPropertiesField hides Add/Remove controls and
+ * disables the nested forms — see the comment at the additionalProperties
+ * branch below for the UX trade-off.
+ *
+ * NOTE: this walker navigates the sanitised schema (which still carries
+ * `properties`, `items` and `additionalProperties` structurally). The
+ * immutable-path *set* is harvested separately from the *raw* schema via
+ * findImmutablePaths, since sanitizeSchema strips x-kubernetes-validations
+ * on its way to AJV. If a future sanitisation step ever rewrites those
+ * structural keys, this walker needs to be updated in lockstep.
+ */
+function addImmutableReadonly(
+  schema: RJSFSchema,
+  uiSchema: UiSchema,
+  paths: readonly ImmutablePath[],
+): UiSchema {
+  if (paths.length === 0) return uiSchema
+  const next: UiSchema = { ...uiSchema }
+  for (const path of paths) {
+    applyImmutablePath(schema, next, path, 0)
+  }
+  return next
+}
+
+function applyImmutablePath(
+  schemaNode: unknown,
+  uiNode: Record<string, unknown>,
+  path: ImmutablePath,
+  depth: number,
+): void {
+  if (depth === path.length) {
+    uiNode["ui:disabled"] = true
+    uiNode["ui:help"] = IMMUTABLE_HELP_TEXT
+    return
+  }
+  const seg = path[depth]
+  const schemaObj =
+    schemaNode && typeof schemaNode === "object" && !Array.isArray(schemaNode)
+      ? (schemaNode as Record<string, unknown>)
+      : null
+  if (seg === "*") {
+    if (schemaObj && schemaObj.items) {
+      const isLast = depth === path.length - 1
+      if (isLast) {
+        // Whole-array immutable: mark the wrapper itself disabled so
+        // RJSF's ArrayFieldTemplate hides Add/Remove and disables every
+        // element. Mirrors the additionalProperties-map handling below;
+        // without this the user could click Add, fill an entry, and
+        // watch it silently disappear on save when overlay clones source.
+        uiNode["ui:disabled"] = true
+        uiNode["ui:help"] = IMMUTABLE_HELP_TEXT
+        return
+      }
+      const childUi = ensureChild(uiNode, "items")
+      applyImmutablePath(schemaObj.items, childUi, path, depth + 1)
+      return
+    }
+    // additionalProperties object map. Per-value immutability is rendered
+    // here as whole-map immutability: the field itself is marked disabled,
+    // AdditionalPropertiesField hides Add/Remove and disables every inner
+    // input. Splitting "keys editable, values frozen" needs custom plumbing
+    // through that field plus a UX decision on whether deleting an entry
+    // counts as mutating its value — deliberately deferred until a real
+    // schema asks for it.
+    uiNode["ui:disabled"] = true
+    uiNode["ui:help"] = IMMUTABLE_HELP_TEXT
+    return
+  }
+  const childSchema = schemaObj
+    ? (schemaObj.properties as Record<string, unknown> | undefined)?.[seg]
+    : undefined
+  const childUi = ensureChild(uiNode, seg)
+  applyImmutablePath(childSchema, childUi, path, depth + 1)
+}
+
+function ensureChild(
+  uiNode: Record<string, unknown>,
+  key: string,
+): Record<string, unknown> {
+  const existing = uiNode[key]
+  if (existing && typeof existing === "object" && !Array.isArray(existing)) {
+    const cloned = { ...(existing as Record<string, unknown>) }
+    uiNode[key] = cloned
+    return cloned
+  }
+  const fresh: Record<string, unknown> = {}
+  uiNode[key] = fresh
+  return fresh
+}
+
+interface SchemaFormProps {
+  openAPISchema: string
+  keysOrder?: string[][]
+  formData: unknown
+  onChange: (data: unknown) => void
+  children?: React.ReactNode
+  /**
+   * When "enforce", fields whose schema carries a CEL immutability rule
+   * (`self == oldSelf`) are rendered greyed out (disabled) with helper
+   * text. Default "off" keeps every field editable — used for create
+   * flows.
+   */
+  immutableMode?: "enforce" | "off"
+}
+
+export interface SchemaFormHandle {
+  /**
+   * Run RJSF validation against the current form data and render any errors
+   * inline. Returns whether the form is valid. The Deploy button lives
+   * outside this component and bypasses RJSF's own submit, so callers gate
+   * their submit on this before sending the resource to the API.
+   */
+  validate: () => boolean
+}
+
+export const SchemaForm = forwardRef<SchemaFormHandle, SchemaFormProps>(function SchemaForm({
+  openAPISchema,
+  keysOrder,
+  formData,
+  onChange,
+  children,
+  immutableMode,
+}: SchemaFormProps, ref) {
+  const formRef = useRef<Form>(null)
+  useImperativeHandle(
+    ref,
+    () => ({ validate: () => formRef.current?.validateForm() ?? true }),
+    [],
+  )
+
+  // Parse the raw schema once, then derive the sanitised RJSFSchema and the
+  // immutable-path set from it. We keep the raw object around so we don't
+  // re-parse the same string twice on every render. The contract is "same
+  // openAPISchema string ⇒ same parsedSchema reference"; the dependent
+  // memos rely on that identity to avoid recomputation.
+  const parsedSchema = useMemo<unknown>(() => {
+    try {
+      return JSON.parse(openAPISchema)
+    } catch {
+      return {}
+    }
+  }, [openAPISchema])
+
+  const schema = useMemo<RJSFSchema>(
+    () => sanitizeSchema(parsedSchema) as RJSFSchema,
+    [parsedSchema],
+  )
+
+  const onChangeRef = useRef(onChange)
+  onChangeRef.current = onChange
+  const formDataRef = useRef(formData)
+  formDataRef.current = formData
+  const emittedSchemaRef = useRef<RJSFSchema | null>(null)
+
+  // Emit defaults to parent once per schema so spec is never empty on first submit.
+  // Uses formDataRef (current parent state, not the initial mount snapshot) so
+  // user input is preserved when the parent recomputes openAPISchema due to
+  // async sibling data (e.g. instancesData loading) — without this,
+  // getDefaultFormState would re-emit defaults computed from the stale initial
+  // formData and wipe whatever the user already typed.
+  useEffect(() => {
+    if (!schema || Object.keys(schema).length === 0) return
+    if (emittedSchemaRef.current === schema) return
+    emittedSchemaRef.current = schema
+    const defaults = getDefaultFormState(validator, schema, formDataRef.current ?? {}, schema)
+    onChangeRef.current(defaults)
+  }, [schema])
+
+  const immutablePaths = useMemo<ImmutablePath[]>(
+    () => (immutableMode === "enforce" ? findImmutablePaths(parsedSchema) : []),
+    [parsedSchema, immutableMode],
+  )
+
+  const uiSchema = useMemo<UiSchema>(() => {
+    const baseUiSchema: UiSchema = {
+      "ui:submitButtonOptions": { norender: true },
+      ...keysOrderToUiSchema(keysOrder),
+      // Use SourceField for mutually exclusive source fields
+      source: {
+        "ui:field": "SourceField",
+      },
+    }
+
+    // Bind every field carrying x-cozystack-options to the single generic
+    // DynamicOptionsWidget (GPU, instanceType, instanceProfile, network,
+    // image, storagePool, storageClass, vmdisk — populated from the cluster
+    // via the cozystack-api Option resource).
+    const withDynamicOptions = addDynamicOptionWidgets(schema, baseUiSchema)
+
+    // Automatically add AdditionalPropertiesField for fields with additionalProperties schema
+    const withAdditionalProps = addAdditionalPropertiesWidgets(schema, withDynamicOptions)
+
+    // Mask credential-shaped string fields (access/secret keys, passwords, tokens).
+    const withSensitive = addSensitiveStringWidgets(schema, withAdditionalProps)
+
+    // Override resourceQuotas field with structured quota editor.
+    // Scoped to schemas where resourceQuotas has additionalProperties: {type: "string"}
+    // (the cozystack-tenants chart shape) to avoid activating on unrelated CRDs.
+    const rqSchema = schema.properties?.resourceQuotas as
+      | { additionalProperties?: { type?: unknown } }
+      | undefined
+    if (rqSchema && rqSchema.additionalProperties?.type === "string") {
+      withSensitive.resourceQuotas = {
+        ...withSensitive.resourceQuotas,
+        "ui:field": "ResourceQuotasField",
+      }
+    }
+
+    return addImmutableReadonly(schema, withSensitive, immutablePaths)
+  }, [keysOrder, schema, immutablePaths])
+
+  const customFields = useMemo(
+    () => ({
+      AdditionalPropertiesField: AdditionalPropertiesField,
+      FreeformObjectField: FreeformObjectField,
+      ResourceQuotasField: ResourceQuotasField,
+      SourceField: SourceField,
+    }),
+    []
+  )
+
+  // Create templates without submit button
+  const templatesWithoutSubmit = useMemo<Partial<TemplatesType>>(() => {
+    return {
+      ...customTemplates,
+      ButtonTemplates: {
+        ...customTemplates.ButtonTemplates,
+        SubmitButton: () => null,
+      },
+    }
+  }, [])
+
+  return (
+    <div className="rjsf-container">
+      <Form
+        ref={formRef}
+        tagName="div"
+        schema={schema}
+        uiSchema={uiSchema}
+        formData={formData}
+        validator={validator}
+        templates={templatesWithoutSubmit}
+        widgets={customWidgets}
+        fields={customFields}
+        // A widget sees only its own value, but a dropdown may be scoped by a
+        // choice made elsewhere in the form — the VMs of the import source the
+        // user just picked. Handing the whole object down is what lets an
+        // option source name reference a sibling field.
+        formContext={{ rootFormData: formData }}
+        onChange={(e) => onChange(e.formData)}
+        liveValidate={false}
+        showErrorList={false}
+        idPrefix={RJSF_ID_PREFIX}
+        idSeparator={RJSF_ID_SEPARATOR}
+        focusOnFirstError={(error) =>
+          focusFirstError(error, RJSF_ID_PREFIX, RJSF_ID_SEPARATOR)
+        }
+      >
+        {children}
+      </Form>
+    </div>
+  )
+})
diff --git a/packages/system/dashboard/images/console/apps/console/src/components/SensitiveStringWidget.test.tsx b/packages/system/dashboard/images/console/apps/console/src/components/SensitiveStringWidget.test.tsx
new file mode 100644
index 0000000000..f0ff91f627
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/components/SensitiveStringWidget.test.tsx
@@ -0,0 +1,174 @@
+import { useState } from "react"
+import { describe, it, expect, vi } from "vitest"
+import { render, screen } from "@testing-library/react"
+import userEvent from "@testing-library/user-event"
+import type { WidgetProps } from "@rjsf/utils"
+import { SensitiveStringWidget } from "./SensitiveStringWidget.tsx"
+
+function makeProps(overrides: Partial<WidgetProps> = {}): WidgetProps {
+  const base = {
+    id: "sensitive",
+    name: "sensitive",
+    label: "sensitive",
+    value: undefined as unknown,
+    onChange: vi.fn(),
+    onBlur: vi.fn(),
+    onFocus: vi.fn(),
+    required: false,
+    disabled: false,
+    readonly: false,
+    autofocus: false,
+    placeholder: "",
+    options: {},
+    schema: { type: "string" },
+    uiSchema: {},
+    formContext: {},
+    rawErrors: [],
+    hideError: false,
+    multiple: false,
+    registry: {},
+  }
+  return { ...base, ...overrides } as unknown as WidgetProps
+}
+
+function renderWithLabel(props: WidgetProps) {
+  return render(
+    <>
+      <label htmlFor={props.id}>access key</label>
+      <SensitiveStringWidget {...props} />
+    </>,
+  )
+}
+
+const TOGGLE_NAME = /toggle credential visibility/i
+
+describe("SensitiveStringWidget", () => {
+  it("renders a real <input> control associated with its label, regardless of state", () => {
+    renderWithLabel(makeProps({ value: "super-secret" }))
+
+    const input = screen.getByLabelText("access key") as HTMLInputElement
+    expect(input.tagName).toBe("INPUT")
+    expect(input.type).toBe("password")
+    expect(input.value).toBe("super-secret")
+  })
+
+  it("flips the input type from password to text when the toggle is pressed", async () => {
+    const user = userEvent.setup()
+    renderWithLabel(makeProps({ value: "super-secret" }))
+
+    const toggle = screen.getByRole("button", { name: TOGGLE_NAME })
+    expect(toggle).toHaveAttribute("aria-pressed", "false")
+
+    await user.click(toggle)
+
+    expect(toggle).toHaveAttribute("aria-pressed", "true")
+    expect((screen.getByLabelText("access key") as HTMLInputElement).type).toBe("text")
+  })
+
+  it("keeps the toggle's accessible name stable across state changes", async () => {
+    const user = userEvent.setup()
+    renderWithLabel(makeProps({ value: "super-secret" }))
+
+    const toggle = screen.getByRole("button", { name: TOGGLE_NAME })
+    await user.click(toggle)
+
+    // Same button is still findable by the same stable name after pressing.
+    expect(screen.getByRole("button", { name: TOGGLE_NAME })).toBe(toggle)
+  })
+
+  it("hides the value again after a second toggle press", async () => {
+    const user = userEvent.setup()
+    renderWithLabel(makeProps({ value: "super-secret" }))
+
+    const toggle = screen.getByRole("button", { name: TOGGLE_NAME })
+    await user.click(toggle)
+    await user.click(toggle)
+
+    expect(toggle).toHaveAttribute("aria-pressed", "false")
+    expect((screen.getByLabelText("access key") as HTMLInputElement).type).toBe("password")
+  })
+
+  it("carries the project's input styling in both states (no shape change on toggle)", async () => {
+    const user = userEvent.setup()
+    renderWithLabel(makeProps({ value: "super-secret" }))
+
+    const input = screen.getByLabelText("access key") as HTMLInputElement
+    expect(input).toHaveClass("rounded-md")
+    expect(input).toHaveClass("border")
+
+    await user.click(screen.getByRole("button", { name: TOGGLE_NAME }))
+
+    expect(input).toHaveClass("rounded-md")
+    expect(input).toHaveClass("border")
+  })
+
+  it("opts the input out of browser password-manager autofill", () => {
+    renderWithLabel(makeProps({ value: "super-secret" }))
+
+    const input = screen.getByLabelText("access key") as HTMLInputElement
+    expect(input).toHaveAttribute("autocomplete", "new-password")
+  })
+
+  it("forwards typing into onChange without requiring the toggle first", async () => {
+    const user = userEvent.setup()
+    const onChange = vi.fn()
+
+    function Host() {
+      const [value, setValue] = useState<string | undefined>("")
+      return (
+        <>
+          <label htmlFor="sensitive">access key</label>
+          <SensitiveStringWidget
+            {...makeProps({
+              value,
+              onChange: (next) => {
+                onChange(next)
+                setValue(next as string | undefined)
+              },
+            })}
+          />
+        </>
+      )
+    }
+    render(<Host />)
+
+    await user.type(screen.getByLabelText("access key"), "abc")
+
+    expect(onChange).toHaveBeenLastCalledWith("abc")
+  })
+
+  it("emits undefined when the input is cleared", async () => {
+    const user = userEvent.setup()
+    const onChange = vi.fn()
+    renderWithLabel(makeProps({ value: "secret", onChange }))
+
+    await user.clear(screen.getByLabelText("access key") as HTMLInputElement)
+
+    expect(onChange).toHaveBeenLastCalledWith(undefined)
+  })
+
+  it("keeps the reveal toggle usable when the form is readonly", async () => {
+    const user = userEvent.setup()
+    renderWithLabel(makeProps({ value: "secret", readonly: true }))
+
+    const input = screen.getByLabelText("access key") as HTMLInputElement
+    expect(input).toHaveAttribute("readonly")
+
+    await user.click(screen.getByRole("button", { name: TOGGLE_NAME }))
+
+    expect(input.type).toBe("text")
+    expect(input.value).toBe("secret")
+  })
+
+  it("keeps the reveal toggle usable when the form is disabled", async () => {
+    const user = userEvent.setup()
+    renderWithLabel(makeProps({ value: "secret", disabled: true }))
+
+    const input = screen.getByLabelText("access key") as HTMLInputElement
+    expect(input).toBeDisabled()
+
+    await user.click(screen.getByRole("button", { name: TOGGLE_NAME }))
+
+    expect(input.type).toBe("text")
+  })
+})
diff --git a/packages/system/dashboard/images/console/apps/console/src/components/SensitiveStringWidget.tsx b/packages/system/dashboard/images/console/apps/console/src/components/SensitiveStringWidget.tsx
new file mode 100644
index 0000000000..26e8f61857
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/components/SensitiveStringWidget.tsx
@@ -0,0 +1,56 @@
+import { useState } from "react"
+import { Eye, EyeOff } from "lucide-react"
+import type { WidgetProps } from "@rjsf/utils"
+
+// Matches the styling applied to `input[type="text"]` in schema-form.css.
+// The CSS rule there is keyed on the `type` attribute, so a `type="password"`
+// input would otherwise fall back to native browser chrome and visibly differ
+// from neighbouring fields every time the user toggles reveal.
+const INPUT_CLASS =
+  "w-full rounded-md border border-slate-200 bg-white px-2.5 py-1.5 text-sm text-slate-900 shadow-sm outline-none transition-shadow focus:border-blue-500 focus:ring-2 focus:ring-blue-500/20 disabled:opacity-50 disabled:cursor-not-allowed"
+
+const TOGGLE_CLASS =
+  "flex size-8 shrink-0 items-center justify-center rounded-md text-slate-500 hover:bg-slate-100"
+
+export function SensitiveStringWidget(props: WidgetProps) {
+  const { id, value, onChange, required, disabled, readonly, autofocus, placeholder } = props
+  const [revealed, setRevealed] = useState(false)
+
+  const stringValue = typeof value === "string" ? value : ""
+
+  return (
+    <div className="flex items-center gap-2">
+      <input
+        id={id}
+        type={revealed ? "text" : "password"}
+        // Best-effort hint to skip browser password-manager autofill on this
+        // ad-hoc credential field. Browser behaviour varies; `new-password` is
+        // the most reliable value but the prompt is not fully suppressible.
+        autoComplete="new-password"
+        autoFocus={autofocus}
+        placeholder={placeholder}
+        value={stringValue}
+        required={required}
+        disabled={disabled}
+        readOnly={readonly}
+        onChange={(event) => {
+          // Empty string is coerced to undefined so the surrounding form
+          // drops the key from the spec entirely on clear, matching the
+          // convention used by the other custom widgets in this folder.
+          const next = event.target.value
+          onChange(next === "" ? undefined : next)
+        }}
+        className={INPUT_CLASS}
+      />
+      <button
+        type="button"
+        onClick={() => setRevealed((prev) => !prev)}
+        aria-label="Toggle credential visibility"
+        aria-pressed={revealed}
+        className={TOGGLE_CLASS}
+      >
+        {revealed ? <EyeOff className="size-4" /> : <Eye className="size-4" />}
+      </button>
+    </div>
+  )
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/components/SourceField.test.tsx b/packages/system/dashboard/images/console/apps/console/src/components/SourceField.test.tsx
new file mode 100644
index 0000000000..101060357c
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/components/SourceField.test.tsx
@@ -0,0 +1,130 @@
+import { describe, it, expect, vi } from "vitest"
+import { screen, fireEvent } from "@testing-library/react"
+import type { FieldProps } from "@rjsf/utils"
+import { SourceField } from "./SourceField.tsx"
+import { createMockK8sClient } from "../test-utils/mock-k8s-client.ts"
+import { renderWithK8sProvider } from "../test-utils/render.tsx"
+
+vi.mock("../lib/tenant-context.tsx", () => ({
+  useTenantContext: () => ({
+    tenants: [],
+    selectedTenant: "root",
+    selectTenant: () => {},
+    tenantNamespace: "tenant-root",
+    isLoading: false,
+    error: null,
+  }),
+}))
+
+const schema = {
+  type: "object",
+  properties: {
+    image: { type: "object", properties: { name: { type: "string" } } },
+  },
+}
+
+function renderImagePicker() {
+  const client = createMockK8sClient({
+    lists: [
+      {
+        apiGroup: "core.cozystack.io",
+        apiVersion: "v1alpha1",
+        plural: "options",
+        namespace: "tenant-root",
+        result: {
+          apiVersion: "core.cozystack.io/v1alpha1",
+          kind: "OptionList",
+          metadata: { resourceVersion: "1" },
+          items: [
+            {
+              apiVersion: "core.cozystack.io/v1alpha1",
+              kind: "Option",
+              metadata: { name: "image" },
+              spec: { items: [{ value: "fedora" }] },
+            },
+          ],
+        },
+      },
+      // A golden whose import failed still has its PVC; the image option
+      // source leaves it out, a raw PVC listing would not.
+      {
+        apiGroup: "",
+        apiVersion: "v1",
+        plural: "persistentvolumeclaims",
+        namespace: "cozy-public",
+        result: {
+          apiVersion: "v1",
+          kind: "PersistentVolumeClaimList",
+          metadata: { resourceVersion: "1" },
+          items: [
+            { apiVersion: "v1", kind: "PersistentVolumeClaim", metadata: { name: "vm-default-images-ubuntu", namespace: "cozy-public" } },
+          ],
+        },
+      },
+    ],
+  })
+  const props = {
+    schema,
+    formData: { image: { name: "" } },
+    onChange: vi.fn(),
+    name: "source",
+    required: false,
+    idSchema: { $id: "root_source" },
+  } as unknown as FieldProps
+  return renderWithK8sProvider(<SourceField {...props} />, { client })
+}
+
+describe("SourceField image picker", () => {
+  it("offers the images the image option source serves", async () => {
+    renderImagePicker()
+    expect(await screen.findByRole("option", { name: "fedora" })).toBeInTheDocument()
+    expect(screen.queryByRole("option", { name: "ubuntu" })).not.toBeInTheDocument()
+  })
+})
+
+// The shipped vm-disk shape: each branch marks its own leaf required, and
+// `source` itself is not, so validation reports `.source.http.url`.
+const sourceSchema = {
+  type: "object",
+  description: "The source image location used to create a disk.",
+  properties: {
+    http: {
+      type: "object",
+      required: ["url"],
+      properties: { url: { type: "string", title: "URL" } },
+    },
+    disk: {
+      type: "object",
+      required: ["name"],
+      properties: { name: { type: "string", title: "Name" } },
+    },
+  },
+}
+
+function props(overrides: Partial<FieldProps> = {}): FieldProps {
+  return {
+    schema: sourceSchema,
+    formData: {},
+    onChange: vi.fn(),
+    name: "source",
+    required: false,
+    idSchema: { $id: "root_source" },
+    ...overrides,
+  } as unknown as FieldProps
+}
+
+describe("SourceField", () => {
+  // Validation reports the branch leaf, and focus-first-error resolves the
+  // field by RJSF's generated id, so the control has to carry it or a blocked
+  // submit scrolls nowhere. Nothing else in the widget renders that id.
+  it("puts the generated id on the selected branch's control", () => {
+    renderWithK8sProvider(<SourceField {...props()} />, {
+      client: createMockK8sClient({ lists: [] }),
+    })
+
+    fireEvent.click(screen.getByRole("radio", { name: /http/i }))
+
+    expect(document.getElementById("root_source_http_url")).not.toBeNull()
+  })
+
+})
diff --git a/packages/system/dashboard/images/console/apps/console/src/components/SourceField.tsx b/packages/system/dashboard/images/console/apps/console/src/components/SourceField.tsx
new file mode 100644
index 0000000000..ed5a6dcefa
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/components/SourceField.tsx
@@ -0,0 +1,244 @@
+import { useState } from "react"
+import type { FieldProps } from "@rjsf/utils"
+import { useK8sList } from "@cozystack/k8s-client"
+import { RJSF_ID_SEPARATOR } from "../lib/rjsf-ids.ts"
+import { APPS_GROUP, APPS_VERSION } from "@cozystack/types"
+import { useTenantContext } from "../lib/tenant-context.tsx"
+import type { OptionObject } from "./DynamicOptionsWidget.tsx"
+
+interface VMDisk {
+  apiVersion: string
+  kind: string
+  metadata: { name: string; namespace: string }
+  spec: { storage: string }
+}
+
+function useVMDiskOptions(tenantNamespace: string | null | undefined) {
+  const { data, isLoading } = useK8sList<VMDisk>({
+    apiGroup: APPS_GROUP,
+    apiVersion: APPS_VERSION,
+    plural: "vmdisks",
+    namespace: tenantNamespace ?? undefined,
+  })
+  return { disks: data?.items ?? [], isLoading }
+}
+
+// Not a raw PVC listing: a golden whose import failed still has its PVC.
+function useImageOptions(tenantNamespace: string | null | undefined) {
+  const { data, isLoading } = useK8sList<OptionObject>(
+    {
+      apiGroup: "core.cozystack.io",
+      apiVersion: "v1alpha1",
+      plural: "options",
+      namespace: tenantNamespace ?? undefined,
+    },
+    { enabled: !!tenantNamespace },
+  )
+  const images = (
+    data?.items?.find((o) => o.metadata.name === "image")?.spec?.items ?? []
+  ).map((it) => it.value)
+  return { images, isLoading }
+}
+
+interface SourceOptionSchema {
+  type?: unknown
+  title?: string
+  description?: string
+  required?: string[]
+  properties?: Record<string, SourceOptionSchema>
+}
+
+export function SourceField(props: FieldProps) {
+  const { schema, formData, onChange, name, required, idSchema } = props
+  const properties = (schema.properties || {}) as Record<string, SourceOptionSchema | undefined>
+  const options = Object.keys(properties)
+  const { tenantNamespace } = useTenantContext()
+  const { disks, isLoading: disksLoading } = useVMDiskOptions(tenantNamespace)
+  const { images, isLoading: imagesLoading } = useImageOptions(tenantNamespace)
+
+  // Determine which option is currently selected
+  const currentOption = formData
+    ? options.find((opt: string) => formData[opt] !== undefined && formData[opt] !== null)
+    : undefined
+
+  const [selected, setSelected] = useState<string | undefined>(currentOption)
+
+  const handleSelect = (option: string) => {
+    setSelected(option)
+    const prop = properties[option]
+    // If the property is an empty object marker (like upload: {}), set it to {}
+    // Otherwise initialize with default value or empty object
+    const defaultValue =
+      prop && typeof prop === "object" && Object.keys(prop.properties || {}).length === 0
+        ? {}
+        : prop && typeof prop === "object" && prop.type === "object"
+          ? {}
+          : ""
+    onChange({ [option]: defaultValue })
+  }
+
+  const handleClear = () => {
+    setSelected(undefined)
+    onChange(undefined)
+  }
+
+  const renderFieldInput = (option: string) => {
+    const prop = properties[option]
+    if (!prop || typeof prop !== "object") return null
+
+    // If it's an empty object marker (like upload: {}), show confirmation message
+    if (Object.keys(prop.properties || {}).length === 0) {
+      return (
+        <div className="ml-6 mt-2 rounded-md bg-blue-50 border border-blue-200 p-3">
+          <p className="text-sm text-blue-900 font-medium">
+            ✓ {option} selected
+          </p>
+          <p className="text-xs text-blue-700 mt-1">
+            {prop.description || "No additional configuration needed"}
+          </p>
+          {option === "upload" && (
+            <p className="text-xs text-blue-600 mt-2">
+              After creating the disk, you can upload an image using the UI or virtctl command.
+            </p>
+          )}
+        </div>
+      )
+    }
+
+    // Render input fields for the selected option
+    const subProps = prop.properties || {}
+    return (
+      <div className="ml-6 mt-2 space-y-2">
+        {Object.entries(subProps).map(([key, subProp]) => {
+          const currentValue = (formData?.[option] as Record<string, string>)?.[key] || ""
+          const handleChange = (val: string) => {
+            onChange({
+              [option]: {
+                ...(formData?.[option] as Record<string, unknown>),
+                [key]: val,
+              },
+            })
+          }
+
+          const isDiskName = option === "disk" && key === "name"
+          const isImageName = option === "image" && key === "name"
+          // RJSF's id for this control. Its required sub-fields are what
+          // validation reports (source.http.url, not source), so the focus
+          // helper resolves the field by this id and finds nothing without it.
+          const fieldId = [idSchema.$id, option, key].join(RJSF_ID_SEPARATOR)
+
+          return (
+            <div key={key} className="flex flex-col gap-1">
+              <label htmlFor={fieldId} className="text-sm font-medium text-slate-700">
+                {subProp.title || key}
+                {prop.required?.includes(key) && <span className="text-red-500 ml-1">*</span>}
+              </label>
+              {subProp.description && (
+                <p className="text-xs text-slate-500">{subProp.description}</p>
+              )}
+              {isDiskName ? (
+                <select
+                  id={fieldId}
+                  value={currentValue}
+                  onChange={(e) => handleChange(e.target.value)}
+                  disabled={disksLoading}
+                  className="w-full rounded-lg border border-slate-300 bg-white pl-3 pr-8 py-2 text-sm text-slate-900 outline-none focus:border-blue-400 focus:ring-1 focus:ring-blue-400 disabled:opacity-50"
+                >
+                  <option value="">-- Select disk --</option>
+                  {disksLoading ? (
+                    <option value="" disabled>Loading...</option>
+                  ) : disks.length === 0 ? (
+                    <option value="" disabled>No disks available</option>
+                  ) : (
+                    disks.map((disk) => (
+                      <option key={disk.metadata.name} value={disk.metadata.name}>
+                        {disk.metadata.name} ({disk.spec.storage})
+                      </option>
+                    ))
+                  )}
+                </select>
+              ) : isImageName ? (
+                <select
+                  id={fieldId}
+                  value={currentValue}
+                  onChange={(e) => handleChange(e.target.value)}
+                  disabled={imagesLoading}
+                  className="w-full rounded-lg border border-slate-300 bg-white pl-3 pr-8 py-2 text-sm text-slate-900 outline-none focus:border-blue-400 focus:ring-1 focus:ring-blue-400 disabled:opacity-50"
+                >
+                  <option value="">-- Select image --</option>
+                  {imagesLoading ? (
+                    <option value="" disabled>Loading...</option>
+                  ) : images.length === 0 ? (
+                    <option value="" disabled>No images available</option>
+                  ) : (
+                    images.map((img) => (
+                      <option key={img} value={img}>{img}</option>
+                    ))
+                  )}
+                </select>
+              ) : (
+                <input
+                  id={fieldId}
+                  type="text"
+                  value={currentValue}
+                  onChange={(e) => handleChange(e.target.value)}
+                  placeholder={subProp.title || key}
+                  className="rounded-lg border border-slate-300 bg-white px-3 py-2 text-sm text-slate-900 outline-none focus:border-blue-400 focus:ring-1 focus:ring-blue-400"
+                />
+              )}
+            </div>
+          )
+        })}
+      </div>
+    )
+  }
+
+  return (
+    <div className="field">
+      <label className="control-label mb-2 block">
+        {name}
+        {required && <span className="required ml-1">*</span>}
+      </label>
+      {schema.description && <p className="field-description mb-3">{schema.description}</p>}
+
+      <div className="space-y-2">
+        {options.map((option: string) => {
+          const prop = properties[option]
+          const optionDescription =
+            typeof prop === "object" && prop ? prop.description : undefined
+          const isSelected = selected === option
+
+          return (
+            <div key={option} className="rounded-lg border border-slate-200 p-3">
+              <label className="flex items-start gap-2 cursor-pointer">
+                <input
+                  type="radio"
+                  name={`${idSchema.$id}-source`}
+                  checked={isSelected}
+                  onChange={() => handleSelect(option)}
+                  className="mt-0.5 size-4 rounded-full border-slate-300 text-blue-600 focus:ring-blue-500"
+                />
+                <div className="flex-1">
+                  <div className="text-sm font-medium text-slate-900">{option}</div>
+                  {optionDescription && (
+                    <div className="text-xs text-slate-500 mt-0.5">{optionDescription}</div>
+                  )}
+                  {isSelected && renderFieldInput(option)}
+                </div>
+              </label>
+            </div>
+          )
+        })}
+        {selected && (
+          <button
+            type="button"
+            onClick={handleClear}
+            className="mt-2 text-xs text-slate-500 hover:text-slate-700"
+          >
+            Clear selection
+          </button>
+        )}
+      </div>
+    </div>
+  )
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/components/SourceWidget.tsx b/packages/system/dashboard/images/console/apps/console/src/components/SourceWidget.tsx
new file mode 100644
index 0000000000..b4165475cd
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/components/SourceWidget.tsx
@@ -0,0 +1,157 @@
+import { useState, useEffect } from "react"
+import type { WidgetProps } from "@rjsf/utils"
+
+interface SourceOptionSchema {
+  type?: unknown
+  title?: string
+  description?: string
+  required?: string[]
+  properties?: Record<string, SourceOptionSchema>
+}
+
+export function SourceWidget(props: WidgetProps) {
+  const { schema, value, onChange, id, label, required } = props
+  const properties = (schema.properties || {}) as Record<string, SourceOptionSchema | undefined>
+  const options = Object.keys(properties)
+
+  const currentOption = value
+    ? options.find((opt: string) => value[opt] !== undefined && value[opt] !== null)
+    : undefined
+
+  const [selected, setSelected] = useState<string | undefined>(currentOption)
+
+  // Re-sync when value changes externally (e.g. async load in edit forms)
+  useEffect(() => {
+    const opt = value
+      ? options.find((o: string) => value[o] !== undefined && value[o] !== null)
+      : undefined
+    // eslint-disable-next-line react-hooks/set-state-in-effect -- re-syncs the selected option when the value is loaded asynchronously
+    setSelected(opt)
+  }, [value])
+
+  const handleSelect = (option: string) => {
+    setSelected(option)
+    const prop = properties[option]
+    // If the property is an empty object marker (like upload: {}), set it to {}
+    // Otherwise initialize with default value or empty object
+    const defaultValue =
+      prop && typeof prop === "object" && Object.keys(prop.properties || {}).length === 0
+        ? {}
+        : prop && typeof prop === "object" && prop.type === "object"
+          ? {}
+          : ""
+    onChange({ [option]: defaultValue })
+  }
+
+  const handleClear = () => {
+    setSelected(undefined)
+    onChange(undefined)
+  }
+
+  const renderFieldInput = (option: string) => {
+    const prop = properties[option]
+    if (!prop || typeof prop !== "object") return null
+
+    // If it's an empty object marker (like upload: {}), show confirmation message
+    if (Object.keys(prop.properties || {}).length === 0) {
+      return (
+        <div className="ml-6 mt-2 rounded-md bg-blue-50 border border-blue-200 p-3">
+          <p className="text-sm text-blue-900 font-medium">
+            ✓ {option} selected
+          </p>
+          <p className="text-xs text-blue-700 mt-1">
+            {prop.description || "No additional configuration needed"}
+          </p>
+          {option === "upload" && (
+            <p className="text-xs text-blue-600 mt-2">
+              After creating the disk, you can upload an image using the UI or virtctl command.
+            </p>
+          )}
+        </div>
+      )
+    }
+
+    // Render input fields for the selected option
+    const subProps = prop.properties || {}
+    return (
+      <div className="ml-6 mt-2 space-y-2">
+        {Object.entries(subProps).map(([key, subProp]) => (
+          <div key={key} className="flex flex-col gap-1">
+            <label className="text-sm font-medium text-slate-700">
+              {subProp.title || key}
+              {prop.required?.includes(key) && <span className="text-red-500 ml-1">*</span>}
+            </label>
+            {subProp.description && (
+              <p className="text-xs text-slate-500">{subProp.description}</p>
+            )}
+            <input
+              type="text"
+              value={(value?.[option] as Record<string, string>)?.[key] || ""}
+              onChange={(e) => {
+                onChange({
+                  [option]: {
+                    ...(value?.[option] as Record<string, unknown>),
+                    [key]: e.target.value,
+                  },
+                })
+              }}
+              placeholder={subProp.title || key}
+              className="rounded-lg border border-slate-300 bg-white px-3 py-2 text-sm text-slate-900 outline-none focus:border-blue-400 focus:ring-1 focus:ring-blue-400"
+            />
+          </div>
+        ))}
+      </div>
+    )
+  }
+
+  return (
+    <div className="field">
+      {label && (
+        <label className="control-label mb-2 block">
+          {label}
+          {required && <span className="required ml-1">*</span>}
+        </label>
+      )}
+      {schema.description && <p className="field-description mb-3">{schema.description}</p>}
+
+      <div className="space-y-2">
+        {options.map((option: string) => {
+          const prop = properties[option]
+          const optionDescription =
+            typeof prop === "object" && prop ? prop.description : undefined
+          const isSelected = selected === option
+
+          return (
+            <div key={option} className="rounded-lg border border-slate-200 p-3">
+              <label className="flex items-start gap-2 cursor-pointer">
+                <input
+                  type="radio"
+                  name={`${id}-source`}
+                  checked={isSelected}
+                  onChange={() => handleSelect(option)}
+                  className="mt-0.5 size-4 rounded-full border-slate-300 text-blue-600 focus:ring-blue-500"
+                />
+                <div className="flex-1">
+                  <div className="text-sm font-medium text-slate-900">{option}</div>
+                  {optionDescription && (
+                    <div className="text-xs text-slate-500 mt-0.5">{optionDescription}</div>
+                  )}
+                </div>
+              </label>
+              {isSelected && renderFieldInput(option)}
+            </div>
+          )
+        })}
+        {selected && (
+          <button
+            type="button"
+            onClick={handleClear}
+            className="mt-2 text-xs text-slate-500 hover:text-slate-700"
+          >
+            Clear selection
+          </button>
+        )}
+      </div>
+    </div>
+  )
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/components/WorkloadCell.tsx b/packages/system/dashboard/images/console/apps/console/src/components/WorkloadCell.tsx
new file mode 100644
index 0000000000..87c0104501
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/components/WorkloadCell.tsx
@@ -0,0 +1,55 @@
+import { useMemo } from "react"
+import { Link } from "react-router"
+import { useApplicationDefinitions } from "../lib/app-definitions.ts"
+import { useTenantContext } from "../lib/tenant-context.tsx"
+import { TENANT_NAMESPACE_PREFIX } from "../lib/constants.ts"
+
+interface WorkloadCellProps {
+  /** Namespace the workload lives in (tenant-<name> for tenant workloads). */
+  namespace: string
+  /** Application kind (apps.cozystack.io/application.kind), or "—" when unknown. */
+  kind: string
+  /** Application instance name. */
+  name: string
+}
+
+/**
+ * Renders a consuming workload (the owning application) as a deep-link to its
+ * Console Workloads tab, with the kind shown as a subtitle. The link is only active for
+ * real app instances: the kind must resolve to a plural via ApplicationDefinitions
+ * and the workload must live in a tenant namespace (so the Console tenant
+ * context can be switched on click). Shared by every per-resource drill-down.
+ */
+export function WorkloadCell({ namespace, kind, name }: WorkloadCellProps) {
+  const { data: appDefs } = useApplicationDefinitions()
+  const { selectTenant } = useTenantContext()
+
+  const plural = useMemo(() => {
+    for (const ad of appDefs?.items ?? []) {
+      if (ad.spec?.application.kind === kind) return ad.spec?.application.plural
+    }
+    return undefined
+  }, [appDefs, kind])
+
+  const tenant = namespace.startsWith(TENANT_NAMESPACE_PREFIX)
+    ? namespace.slice(TENANT_NAMESPACE_PREFIX.length)
+    : null
+  const href = plural && tenant ? `/console/${plural}/${name}/workloads` : null
+
+  return (
+    <>
+      {href ? (
+        <Link
+          to={href}
+          onClick={() => tenant && selectTenant(tenant)}
+          className="font-medium text-blue-700 hover:text-blue-800 hover:underline"
+        >
+          {name}
+        </Link>
+      ) : (
+        <span className="font-medium text-slate-700">{name}</span>
+      )}
+      {kind !== "—" ? <div className="text-xs text-slate-400">{kind}</div> : null}
+    </>
+  )
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/components/YamlEditor.tsx b/packages/system/dashboard/images/console/apps/console/src/components/YamlEditor.tsx
new file mode 100644
index 0000000000..4ac86b30ad
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/components/YamlEditor.tsx
@@ -0,0 +1,44 @@
+import { useEffect, useRef } from "react"
+import Editor, { type OnMount } from "@monaco-editor/react"
+import "../lib/monaco-setup.ts"
+
+interface YamlEditorProps {
+  value: string
+  onChange: (value: string) => void
+  readOnly?: boolean
+  height?: string | number
+}
+
+export function YamlEditor({ value, onChange, readOnly, height = "100%" }: YamlEditorProps) {
+  const editorRef = useRef<Parameters<OnMount>[0] | null>(null)
+
+  useEffect(() => {
+    const model = editorRef.current?.getModel()
+    if (model && model.getValue() !== value) {
+      model.setValue(value)
+    }
+  }, [value])
+
+  return (
+    <Editor
+      height={height}
+      defaultLanguage="yaml"
+      theme="vs-light"
+      value={value}
+      onMount={(editor) => {
+        editorRef.current = editor
+      }}
+      onChange={(next) => onChange(next ?? "")}
+      options={{
+        readOnly,
+        minimap: { enabled: false },
+        fontSize: 13,
+        scrollBeyondLastLine: false,
+        tabSize: 2,
+        automaticLayout: true,
+        renderLineHighlight: "none",
+        lineNumbersMinChars: 3,
+      }}
+    />
+  )
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/components/cluster-usage/ClusterStorageSection.test.tsx b/packages/system/dashboard/images/console/apps/console/src/components/cluster-usage/ClusterStorageSection.test.tsx
new file mode 100644
index 0000000000..f65ab0e05c
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/components/cluster-usage/ClusterStorageSection.test.tsx
@@ -0,0 +1,90 @@
+import { describe, it, expect, vi } from "vitest"
+import { screen, within, waitFor } from "@testing-library/react"
+import { K8sClient, K8sApiError, type K8sList } from "@cozystack/k8s-client"
+import { ClusterStorageSection } from "./ClusterStorageSection.tsx"
+import { renderWithK8sProvider } from "../../test-utils/render.tsx"
+
+let pvcSeq = 0
+function pvc(namespace: string, storageClassName: string, requested: string, capacity?: string) {
+  return {
+    apiVersion: "v1",
+    kind: "PersistentVolumeClaim",
+    metadata: { name: `pvc-${pvcSeq++}`, namespace },
+    spec: { storageClassName, resources: { requests: { storage: requested } } },
+    status: { phase: "Bound", capacity: capacity ? { storage: capacity } : undefined },
+  }
+}
+
+function makeClient(pvcs: unknown[]): K8sClient {
+  const client = new K8sClient()
+  vi.spyOn(client, "list").mockImplementation(async (_g, _v, plural) => {
+    return {
+      apiVersion: "v1",
+      kind: `${plural}List`,
+      metadata: {},
+      items: plural === "persistentvolumeclaims" ? pvcs : [],
+    } as K8sList<unknown>
+  })
+  return client
+}
+
+function makeFailingClient(error: Error): K8sClient {
+  const client = new K8sClient()
+  vi.spyOn(client, "list").mockRejectedValue(error)
+  return client
+}
+
+describe("ClusterStorageSection", () => {
+  it("aggregates tenant PVCs by storage class and excludes non-tenant namespaces", async () => {
+    const client = makeClient([
+      pvc("tenant-foo", "replicated", "5Gi"),
+      pvc("tenant-bar", "replicated", "10Gi"),
+      // System namespace must be excluded.
+      pvc("cozy-system", "replicated", "100Gi"),
+    ])
+    const { container } = renderWithK8sProvider(<ClusterStorageSection />, { client })
+    const row = await waitForRow(container, "replicated")
+    // Two tenant PVCs (the cozy-system one is excluded).
+    expect(within(row).getByText("2")).toBeInTheDocument()
+  })
+
+  it("links a storage class to its per-class drill-down", async () => {
+    const client = makeClient([pvc("tenant-foo", "replicated", "5Gi")])
+    renderWithK8sProvider(<ClusterStorageSection />, { client })
+    const link = await screen.findByRole("link", { name: "replicated" })
+    expect(link).toHaveAttribute("href", "/admin/capacity/cluster/sc/replicated")
+  })
+
+  it("shows an empty state when no tenant PVCs exist", async () => {
+    const client = makeClient([pvc("cozy-system", "replicated", "100Gi")])
+    renderWithK8sProvider(<ClusterStorageSection />, { client })
+    expect(
+      await screen.findByText(/no persistent volume claims found/i),
+    ).toBeInTheDocument()
+  })
+
+  it("shows a permission notice when the PVC list is forbidden", async () => {
+    // A 403 must not be silently rendered as an empty "no PVCs found" state.
+    const client = makeFailingClient(new K8sApiError(403, { message: "forbidden" }))
+    renderWithK8sProvider(<ClusterStorageSection />, { client })
+    expect(
+      await screen.findByText(/you do not have permission to view persistent volume claims/i),
+    ).toBeInTheDocument()
+    expect(screen.queryByText(/no persistent volume claims found/i)).not.toBeInTheDocument()
+  })
+
+  it("shows a failure notice when the PVC list errors", async () => {
+    const client = makeFailingClient(new K8sApiError(500, { message: "boom" }))
+    renderWithK8sProvider(<ClusterStorageSection />, { client })
+    expect(
+      await screen.findByText(/failed to load persistent volume claims/i),
+    ).toBeInTheDocument()
+  })
+})
+
+async function waitForRow(container: HTMLElement, sc: string): Promise<HTMLElement> {
+  await waitFor(() =>
+    expect(container.querySelector(`[data-storageclass-row="${sc}"]`)).not.toBeNull(),
+  )
+  return container.querySelector(`[data-storageclass-row="${sc}"]`) as HTMLElement
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/components/cluster-usage/ClusterStorageSection.tsx b/packages/system/dashboard/images/console/apps/console/src/components/cluster-usage/ClusterStorageSection.tsx
new file mode 100644
index 0000000000..6e9f1b9be0
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/components/cluster-usage/ClusterStorageSection.tsx
@@ -0,0 +1,123 @@
+import { useMemo } from "react"
+import { Link } from "react-router"
+import { Section, Spinner } from "@cozystack/ui"
+import { useK8sList, K8sApiError } from "@cozystack/k8s-client"
+import { parseQuantity, humanizeBytes } from "../../lib/k8s-quantity.ts"
+import { TENANT_NAMESPACE_PREFIX } from "../../lib/constants.ts"
+import type { Pvc } from "../../lib/cluster-usage/types.ts"
+
+interface StorageClassRow {
+  storageClass: string
+  pvcs: number
+  requested: number
+  bound: number
+}
+
+const NO_CLASS = "(no class)"
+
+/**
+ * Persistent Storage panel on the Cluster page: PersistentVolumeClaims across
+ * tenant namespaces aggregated by StorageClass (claim count, total requested,
+ * total bound capacity). Unlike the node-allocatable resources above there is
+ * no fixed cap — dynamic provisioners have no cluster-wide allocatable — so
+ * this is a usage tally rather than a gauge. Each StorageClass links to a
+ * per-class drill-down of the consuming workloads.
+ */
+export function ClusterStorageSection() {
+  const { data, isLoading, error } = useK8sList<Pvc>({
+    apiGroup: "",
+    apiVersion: "v1",
+    plural: "persistentvolumeclaims",
+  })
+
+  const rows = useMemo<StorageClassRow[]>(() => {
+    const byClass = new Map<string, StorageClassRow>()
+    for (const pvc of data?.items ?? []) {
+      const ns = pvc.metadata.namespace ?? ""
+      if (!ns.startsWith(TENANT_NAMESPACE_PREFIX)) continue
+      const sc = pvc.spec?.storageClassName || NO_CLASS
+      const requested = parseQuantity(pvc.spec?.resources?.requests?.storage ?? "0")
+      const bound = parseQuantity(pvc.status?.capacity?.storage ?? "0")
+      const existing = byClass.get(sc)
+      if (existing) {
+        existing.pvcs += 1
+        existing.requested += requested
+        existing.bound += bound
+      } else {
+        byClass.set(sc, { storageClass: sc, pvcs: 1, requested, bound })
+      }
+    }
+    return [...byClass.values()].sort((a, b) => a.storageClass.localeCompare(b.storageClass))
+  }, [data])
+
+  if (isLoading) {
+    return (
+      <div className="flex items-center gap-2 text-sm text-slate-500">
+        <Spinner /> Loading…
+      </div>
+    )
+  }
+
+  if (error) {
+    const forbidden = error instanceof K8sApiError && error.status === 403
+    return (
+      <Section>
+        <p className="px-2 py-4 text-sm text-red-700">
+          {forbidden
+            ? "You do not have permission to view persistent volume claims."
+            : `Failed to load persistent volume claims: ${error.message}`}
+        </p>
+      </Section>
+    )
+  }
+
+  if (rows.length === 0) {
+    return (
+      <Section>
+        <p className="py-6 text-center text-sm text-slate-500">
+          No persistent volume claims found.
+        </p>
+      </Section>
+    )
+  }
+
+  return (
+    <Section>
+      <table className="w-full text-sm">
+        <thead>
+          <tr className="border-b border-slate-200 bg-slate-50 text-left">
+            <th className="px-3 py-2 font-medium text-slate-600">Storage Class</th>
+            <th className="px-3 py-2 text-right font-medium text-slate-600">PVCs</th>
+            <th className="px-3 py-2 text-right font-medium text-slate-600">Requested</th>
+            <th className="px-3 py-2 text-right font-medium text-slate-600">Bound</th>
+          </tr>
+        </thead>
+        <tbody className="divide-y divide-slate-100">
+          {rows.map((r) => (
+            <tr key={r.storageClass} data-storageclass-row={r.storageClass} className="hover:bg-slate-50">
+              <td className="px-3 py-2">
+                {r.storageClass === NO_CLASS ? (
+                  <span className="font-medium text-slate-700">{r.storageClass}</span>
+                ) : (
+                  <Link
+                    to={`/admin/capacity/cluster/sc/${r.storageClass}`}
+                    className="font-medium break-all text-blue-700 hover:text-blue-800 hover:underline"
+                  >
+                    {r.storageClass}
+                  </Link>
+                )}
+              </td>
+              <td className="px-3 py-2 text-right tabular-nums text-slate-600">{r.pvcs}</td>
+              <td className="px-3 py-2 text-right tabular-nums text-slate-700">
+                {humanizeBytes(r.requested)}
+              </td>
+              <td className="px-3 py-2 text-right tabular-nums text-slate-600">
+                {r.bound > 0 ? humanizeBytes(r.bound) : "—"}
+              </td>
+            </tr>
+          ))}
+        </tbody>
+      </table>
+    </Section>
+  )
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/components/cluster-usage/ClusterUsageAggregates.test.tsx b/packages/system/dashboard/images/console/apps/console/src/components/cluster-usage/ClusterUsageAggregates.test.tsx
new file mode 100644
index 0000000000..ccaeb92b1e
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/components/cluster-usage/ClusterUsageAggregates.test.tsx
@@ -0,0 +1,126 @@
+import { describe, it, expect } from "vitest"
+import { render, screen } from "@testing-library/react"
+import { MemoryRouter } from "react-router"
+import { ClusterUsageAggregates } from "./ClusterUsageAggregates.tsx"
+import type { AggregateResources } from "../../lib/cluster-usage/types.ts"
+import type { NodeSummary } from "../../hooks/useClusterUsageData.tsx"
+
+function empty(): AggregateResources {
+  return {
+    standard: {
+      cpu: { capacity: 0, allocatable: 0, requested: 0 },
+      memory: { capacity: 0, allocatable: 0, requested: 0 },
+      "ephemeral-storage": { capacity: 0, allocatable: 0, requested: 0 },
+      pods: { capacity: 0, allocatable: 0, requested: 0 },
+    },
+    extended: {},
+  }
+}
+
+function summary(overrides: Partial<NodeSummary> = {}): NodeSummary {
+  return { total: 0, ready: 0, notReady: 0, schedulingDisabled: 0, ...overrides }
+}
+
+function renderAgg(props: Parameters<typeof ClusterUsageAggregates>[0]) {
+  return render(
+    <MemoryRouter>
+      <ClusterUsageAggregates {...props} />
+    </MemoryRouter>,
+  )
+}
+
+function rowLabels(container: HTMLElement): (string | null)[] {
+  return Array.from(container.querySelectorAll("[data-resource-row]")).map((el) =>
+    el.getAttribute("data-resource-row"),
+  )
+}
+
+describe("ClusterUsageAggregates", () => {
+  it("renders the node-summary header line", () => {
+    renderAgg({
+      aggregates: empty(),
+      nodeSummary: summary({ total: 12, ready: 10, notReady: 1, schedulingDisabled: 1 }),
+    })
+    expect(screen.getByText("12 nodes")).toBeInTheDocument()
+    expect(
+      screen.getByText(/10 Ready · 1 NotReady · 1 SchedulingDisabled/),
+    ).toBeInTheDocument()
+  })
+
+  it("uses singular 'node' in the header for a one-node cluster", () => {
+    renderAgg({ aggregates: empty(), nodeSummary: summary({ total: 1, ready: 1 }) })
+    expect(screen.getByText("1 node")).toBeInTheDocument()
+  })
+
+  it("renders the standard resources as rows top-to-bottom in order CPU, Memory, Storage, Pods", () => {
+    const { container } = renderAgg({ aggregates: empty(), nodeSummary: summary() })
+    expect(rowLabels(container)).toEqual(["CPU", "Memory", "Storage", "Pods"])
+  })
+
+  it("appends extended-resource rows after the standard rows, sorted alphabetically by key", () => {
+    const agg = empty()
+    agg.extended["nvidia.com/gpu"] = { capacity: 4, allocatable: 4, requested: 1 }
+    agg.extended["amd.com/gpu"] = { capacity: 2, allocatable: 2, requested: 0 }
+    const { container } = renderAgg({ aggregates: agg, nodeSummary: summary() })
+    expect(rowLabels(container)).toEqual([
+      "CPU",
+      "Memory",
+      "Storage",
+      "Pods",
+      "amd.com/gpu",
+      "nvidia.com/gpu",
+    ])
+  })
+
+  it("links requestable resource rows to the per-resource drill-down", () => {
+    const agg = empty()
+    agg.extended["nvidia.com/gpu"] = { capacity: 4, allocatable: 4, requested: 1 }
+    renderAgg({ aggregates: agg, nodeSummary: summary() })
+    expect(screen.getByRole("link", { name: "CPU" })).toHaveAttribute(
+      "href",
+      "/admin/capacity/cluster/r/cpu",
+    )
+    expect(screen.getByRole("link", { name: "nvidia.com/gpu" })).toHaveAttribute(
+      "href",
+      "/admin/capacity/cluster/r/nvidia.com/gpu",
+    )
+  })
+
+  it("does not link the Pods count row (not a requestable resource)", () => {
+    renderAgg({ aggregates: empty(), nodeSummary: summary() })
+    expect(screen.queryByRole("link", { name: "Pods" })).toBeNull()
+    expect(screen.getByText("Pods")).toBeInTheDocument()
+  })
+
+  it("shows an em-dash in the Used cell when no usage data is present", () => {
+    const agg = empty()
+    agg.standard.cpu = { capacity: 8, allocatable: 8, requested: 2 }
+    const { container } = renderAgg({ aggregates: agg, nodeSummary: summary({ total: 1 }) })
+    const cpuRow = container.querySelector('[data-resource-row="CPU"]') as HTMLElement
+    const cells = cpuRow.querySelectorAll("td")
+    // Last column is Used.
+    expect(cells[cells.length - 1].textContent).toBe("—")
+  })
+
+  it("shows the Used value when usage data is present", () => {
+    const agg = empty()
+    agg.standard.cpu = { capacity: 8, allocatable: 8, requested: 2, used: 1 }
+    const { container } = renderAgg({ aggregates: agg, nodeSummary: summary({ total: 1 }) })
+    const cpuRow = container.querySelector('[data-resource-row="CPU"]') as HTMLElement
+    const cells = cpuRow.querySelectorAll("td")
+    expect(cells[cells.length - 1].textContent).not.toBe("—")
+  })
+
+  it("replaces Requested numbers with an em-dash tooltip when pods are unavailable", () => {
+    const agg = empty()
+    agg.standard.cpu = { capacity: 8, allocatable: 8, requested: 3 }
+    renderAgg({
+      aggregates: agg,
+      nodeSummary: summary({ total: 1, ready: 1 }),
+      podsUnavailable: true,
+    })
+    expect(
+      screen.getAllByTitle("Requires cluster-wide pod read access").length,
+    ).toBeGreaterThan(0)
+  })
+})
diff --git a/packages/system/dashboard/images/console/apps/console/src/components/cluster-usage/ClusterUsageAggregates.tsx b/packages/system/dashboard/images/console/apps/console/src/components/cluster-usage/ClusterUsageAggregates.tsx
new file mode 100644
index 0000000000..10cce5d746
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/components/cluster-usage/ClusterUsageAggregates.tsx
@@ -0,0 +1,172 @@
+import { Link } from "react-router"
+import { humanizeBytes, humanizeCpu } from "../../lib/k8s-quantity.ts"
+import type {
+  AggregateResources,
+  ResourceTotals,
+  StandardResourceKey,
+} from "../../lib/cluster-usage/types.ts"
+import type { NodeSummary } from "../../hooks/useClusterUsageData.tsx"
+import { ClusterUsageGauges } from "./ClusterUsageGauges.tsx"
+
+interface ClusterUsageAggregatesProps {
+  aggregates: AggregateResources
+  /** Counts shown in the panel header — Ready / NotReady / SchedulingDisabled. */
+  nodeSummary: NodeSummary
+  /**
+   * When true, every Requested figure is replaced with an em dash and a
+   * tooltip explaining that cluster-wide pod read access is required.
+   * Set by the page when the underlying pods watch failed.
+   */
+  podsUnavailable?: boolean
+}
+
+type ResourceFormat = "cpu" | "bytes" | "count"
+
+interface ResourceRow {
+  /** Display label. */
+  label: string
+  totals: ResourceTotals
+  format: ResourceFormat
+  /**
+   * Resource key as it appears in pod container requests, used to build the
+   * drill-down link. Null for rows that are not a requestable resource
+   * (e.g. the node Pods count), which then render without a link.
+   */
+  linkKey: string | null
+}
+
+const STANDARD_ROWS: { key: StandardResourceKey; label: string; format: ResourceFormat; requestable: boolean }[] = [
+  { key: "cpu", label: "CPU", format: "cpu", requestable: true },
+  { key: "memory", label: "Memory", format: "bytes", requestable: true },
+  { key: "ephemeral-storage", label: "Storage", format: "bytes", requestable: true },
+  { key: "pods", label: "Pods", format: "count", requestable: false },
+]
+
+function formatValue(value: number, format: ResourceFormat): string {
+  switch (format) {
+    case "cpu":
+      return humanizeCpu(value)
+    case "bytes":
+      return humanizeBytes(value)
+    case "count":
+    default:
+      return value % 1 === 0 ? `${value}` : value.toFixed(2)
+  }
+}
+
+function percent(value: number, allocatable: number): number | null {
+  if (allocatable <= 0) return null
+  return Math.min(100, Math.round((value / allocatable) * 100))
+}
+
+/**
+ * Top panel of the Cluster Usage admin page. A header line shows total
+ * node count broken down by Ready / NotReady / SchedulingDisabled,
+ * followed by a single resources table laid out TOP-TO-BOTTOM: one row per
+ * resource (the standard scheduler resources first, then every extended
+ * resource discovered in node.status.capacity, alphabetical, full key
+ * verbatim). Each requestable resource row links to a drill-down showing
+ * which tenants/workloads consume it.
+ */
+export function ClusterUsageAggregates({
+  aggregates,
+  nodeSummary,
+  podsUnavailable = false,
+}: ClusterUsageAggregatesProps) {
+  const extendedKeys = Object.keys(aggregates.extended).sort()
+
+  const rows: ResourceRow[] = [
+    ...STANDARD_ROWS.map((r) => ({
+      label: r.label,
+      totals: aggregates.standard[r.key],
+      format: r.format,
+      linkKey: r.requestable ? r.key : null,
+    })),
+    ...extendedKeys.map((key) => ({
+      label: key,
+      totals: aggregates.extended[key],
+      format: "count" as ResourceFormat,
+      linkKey: key,
+    })),
+  ]
+
+  const REQUESTED_UNAVAILABLE_REASON = "Requires cluster-wide pod read access"
+
+  return (
+    <div className="space-y-4">
+      <div className="flex flex-wrap items-baseline gap-x-3 gap-y-1 text-sm">
+        <span className="font-medium text-slate-800">
+          {nodeSummary.total} node{nodeSummary.total === 1 ? "" : "s"}
+        </span>
+        <span className="text-xs text-slate-500">
+          {nodeSummary.ready} Ready · {nodeSummary.notReady} NotReady ·{" "}
+          {nodeSummary.schedulingDisabled} SchedulingDisabled
+        </span>
+      </div>
+
+      <ClusterUsageGauges aggregates={aggregates} podsUnavailable={podsUnavailable} />
+
+      <div className="overflow-hidden rounded-lg border border-slate-200 bg-white shadow-sm">
+        <table className="w-full text-sm">
+          <thead>
+            <tr className="border-b border-slate-200 bg-slate-50 text-left">
+              <th className="px-3 py-2 font-medium text-slate-600">Resource</th>
+              <th className="px-3 py-2 text-right font-medium text-slate-600">Capacity</th>
+              <th className="px-3 py-2 text-right font-medium text-slate-600">Allocatable</th>
+              <th className="px-3 py-2 text-right font-medium text-slate-600">Requested</th>
+              <th className="px-3 py-2 text-right font-medium text-slate-600">Used</th>
+            </tr>
+          </thead>
+          <tbody className="divide-y divide-slate-100">
+            {rows.map((row) => {
+              const allocatableZero = row.totals.allocatable <= 0
+              const requestedPct = percent(row.totals.requested, row.totals.allocatable)
+              const usedDefined = row.totals.used !== undefined
+              return (
+                <tr
+                  key={row.label}
+                  data-resource-row={row.label}
+                  className="hover:bg-slate-50"
+                >
+                  <td className="px-3 py-2">
+                    {row.linkKey ? (
+                      <Link
+                        to={`/admin/capacity/cluster/r/${row.linkKey}`}
+                        className="font-medium break-all text-blue-700 hover:text-blue-800 hover:underline"
+                      >
+                        {row.label}
+                      </Link>
+                    ) : (
+                      <span className="font-medium break-all text-slate-700">{row.label}</span>
+                    )}
+                  </td>
+                  <td className="px-3 py-2 text-right tabular-nums text-slate-600">
+                    {allocatableZero ? "—" : formatValue(row.totals.capacity, row.format)}
+                  </td>
+                  <td className="px-3 py-2 text-right tabular-nums text-slate-600">
+                    {allocatableZero ? "—" : formatValue(row.totals.allocatable, row.format)}
+                  </td>
+                  <td
+                    className="px-3 py-2 text-right tabular-nums text-slate-700"
+                    title={podsUnavailable ? REQUESTED_UNAVAILABLE_REASON : undefined}
+                  >
+                    {podsUnavailable || allocatableZero
+                      ? "—"
+                      : `${formatValue(row.totals.requested, row.format)}${
+                          requestedPct !== null ? ` (${requestedPct}%)` : ""
+                        }`}
+                  </td>
+                  <td className="px-3 py-2 text-right tabular-nums text-slate-600">
+                    {usedDefined && !allocatableZero
+                      ? formatValue(row.totals.used ?? 0, row.format)
+                      : "—"}
+                  </td>
+                </tr>
+              )
+            })}
+          </tbody>
+        </table>
+      </div>
+    </div>
+  )
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/components/cluster-usage/ClusterUsageGauges.tsx b/packages/system/dashboard/images/console/apps/console/src/components/cluster-usage/ClusterUsageGauges.tsx
new file mode 100644
index 0000000000..9a07cf118f
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/components/cluster-usage/ClusterUsageGauges.tsx
@@ -0,0 +1,97 @@
+import { Link } from "react-router"
+import { GaugeCard, type QuotaEntry } from "../QuotaDisplay.tsx"
+import { humanizeBytes, humanizeCpu } from "../../lib/k8s-quantity.ts"
+import type {
+  AggregateResources,
+  ResourceTotals,
+  StandardResourceKey,
+} from "../../lib/cluster-usage/types.ts"
+
+interface ClusterUsageGaugesProps {
+  aggregates: AggregateResources
+  /** When true, Requested is unknown, so the request-vs-allocatable gauges are hidden. */
+  podsUnavailable?: boolean
+}
+
+// `linkKey` is the resource key used to deep-link the gauge to the per-resource
+// consumer drill-down. Pods is not a requestable container resource, so it has
+// no drill-down (matching the resources table).
+const STANDARD: {
+  key: StandardResourceKey
+  label: string
+  format: (n: number) => string
+  linkKey: string | null
+}[] = [
+  { key: "cpu", label: "CPU", format: humanizeCpu, linkKey: "cpu" },
+  { key: "memory", label: "Memory", format: humanizeBytes, linkKey: "memory" },
+  { key: "ephemeral-storage", label: "Storage", format: humanizeBytes, linkKey: "ephemeral-storage" },
+  { key: "pods", label: "Pods", format: (n) => String(n), linkKey: null },
+]
+
+/** Build a quota-style gauge entry from cluster totals (requested vs allocatable). */
+function entryFrom(
+  label: string,
+  totals: ResourceTotals | undefined,
+  format: (n: number) => string,
+): QuotaEntry | null {
+  if (!totals || totals.allocatable <= 0) return null
+  const usedNum = totals.requested
+  const hardNum = totals.allocatable
+  const pctReal = (usedNum / hardNum) * 100
+  return {
+    label,
+    usedRaw: String(usedNum),
+    hardRaw: String(hardNum),
+    usedNum,
+    hardNum,
+    pct: Math.min(100, pctReal),
+    pctReal,
+    display: `${format(usedNum)} / ${format(hardNum)}`,
+  }
+}
+
+/**
+ * Cluster-wide allocation gauges: one ring per resource showing Requested vs
+ * Allocatable, reusing the quota GaugeCard so it matches the per-tenant quota
+ * rings. Each ring links to the per-resource consumer drill-down (except Pods,
+ * which is not a requestable resource). Hidden when the cluster-wide pods list
+ * is unavailable (Requested would be unknown and every ring would read 0%).
+ */
+export function ClusterUsageGauges({
+  aggregates,
+  podsUnavailable = false,
+}: ClusterUsageGaugesProps) {
+  if (podsUnavailable) return null
+
+  const extendedKeys = Object.keys(aggregates.extended).sort()
+  const cards: { entry: QuotaEntry; linkKey: string | null }[] = [
+    ...STANDARD.map((s) => ({
+      entry: entryFrom(s.label, aggregates.standard[s.key], s.format),
+      linkKey: s.linkKey,
+    })),
+    ...extendedKeys.map((k) => ({
+      entry: entryFrom(k, aggregates.extended[k], (n) => String(n)),
+      linkKey: k,
+    })),
+  ].filter((c): c is { entry: QuotaEntry; linkKey: string | null } => c.entry !== null)
+
+  if (cards.length === 0) return null
+
+  return (
+    <div className="grid grid-cols-2 gap-3 sm:grid-cols-3 lg:grid-cols-6">
+      {cards.map(({ entry, linkKey }, i) =>
+        linkKey ? (
+          <Link
+            key={entry.label}
+            to={`/admin/capacity/cluster/r/${linkKey}`}
+            className="block rounded-xl outline-none transition hover:opacity-90 focus-visible:ring-2 focus-visible:ring-blue-400"
+          >
+            <GaugeCard entry={entry} index={i} />
+          </Link>
+        ) : (
+          <GaugeCard key={entry.label} entry={entry} index={i} />
+        ),
+      )}
+    </div>
+  )
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/components/cluster-usage/ClusterUsageTable.test.tsx b/packages/system/dashboard/images/console/apps/console/src/components/cluster-usage/ClusterUsageTable.test.tsx
new file mode 100644
index 0000000000..55a38778f6
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/components/cluster-usage/ClusterUsageTable.test.tsx
@@ -0,0 +1,205 @@
+import { describe, it, expect } from "vitest"
+import { render as rtlRender, screen, within } from "@testing-library/react"
+import userEvent from "@testing-library/user-event"
+import { MemoryRouter } from "react-router"
+import { ClusterUsageTable } from "./ClusterUsageTable.tsx"
+import type { NodeRow } from "../../lib/cluster-usage/types.ts"
+
+// The table renders <Link>s for resource row labels, so every render needs a
+// router context.
+function render(ui: Parameters<typeof rtlRender>[0]) {
+  return rtlRender(<MemoryRouter>{ui}</MemoryRouter>)
+}
+
+function row(name: string, overrides: Partial<NodeRow> = {}): NodeRow {
+  return {
+    name,
+    ready: true,
+    schedulable: true,
+    pressureConditions: [],
+    roles: [],
+    taints: [],
+    age: "1d",
+    creationTimestamp: "2026-05-25T00:00:00Z",
+    standard: {
+      cpu: { capacity: 8, allocatable: 8, requested: 1 },
+      memory: { capacity: 16 * 1024 ** 3, allocatable: 16 * 1024 ** 3, requested: 0 },
+      "ephemeral-storage": { capacity: 0, allocatable: 0, requested: 0 },
+      pods: { capacity: 110, allocatable: 110, requested: 0 },
+    },
+    extended: {},
+    ...overrides,
+  }
+}
+
+function attrRow(container: HTMLElement, key: string): HTMLElement {
+  return container.querySelector(`[data-attribute-row="${key}"]`) as HTMLElement
+}
+
+function nodeCols(container: HTMLElement): (string | null)[] {
+  return Array.from(container.querySelectorAll("[data-node-col]")).map((el) =>
+    el.getAttribute("data-node-col"),
+  )
+}
+
+function thead(container: HTMLElement): HTMLElement {
+  return container.querySelector("thead") as HTMLElement
+}
+
+describe("ClusterUsageTable (transposed: nodes are columns)", () => {
+  it("renders one column per node, sorted by name ascending", () => {
+    const { container } = render(
+      <ClusterUsageTable rows={[row("worker-b"), row("worker-a")]} extendedKeys={[]} />,
+    )
+    expect(nodeCols(container)).toEqual(["worker-a", "worker-b"])
+  })
+
+  it("lays out resource rows top-to-bottom: CPU, Memory, then extended in order", () => {
+    const { container } = render(
+      <ClusterUsageTable
+        rows={[row("n", { extended: { "nvidia.com/gpu": { capacity: 2, allocatable: 2, requested: 1 } } })]}
+        extendedKeys={["nvidia.com/gpu", "amd.com/gpu"]}
+      />,
+    )
+    const order = Array.from(container.querySelectorAll("[data-attribute-row]")).map((el) =>
+      el.getAttribute("data-attribute-row"),
+    )
+    expect(order).toEqual(["cpu", "memory", "nvidia.com/gpu", "amd.com/gpu"])
+  })
+
+  it("links resource row labels (CPU, Memory, extended) to the per-resource drill-down", () => {
+    render(
+      <ClusterUsageTable
+        rows={[row("n", { extended: { "nvidia.com/gpu": { capacity: 2, allocatable: 2, requested: 1 } } })]}
+        extendedKeys={["nvidia.com/gpu"]}
+      />,
+    )
+    expect(screen.getByRole("link", { name: "CPU" })).toHaveAttribute(
+      "href",
+      "/admin/capacity/cluster/r/cpu",
+    )
+    expect(screen.getByRole("link", { name: "Memory" })).toHaveAttribute(
+      "href",
+      "/admin/capacity/cluster/r/memory",
+    )
+    expect(screen.getByRole("link", { name: "nvidia.com/gpu" })).toHaveAttribute(
+      "href",
+      "/admin/capacity/cluster/r/nvidia.com/gpu",
+    )
+    // The node name in the header is not a link.
+    expect(screen.queryByRole("link", { name: "n" })).toBeNull()
+  })
+
+  it("renders Status / Roles / Age inside each node's column header, not as rows", () => {
+    const { container } = render(
+      <ClusterUsageTable
+        rows={[
+          row("ok", { ready: true, roles: ["control-plane"], age: "21h" }),
+          row("bad", { ready: false, roles: [] }),
+          row("cordoned", { schedulable: false }),
+        ]}
+        extendedKeys={[]}
+      />,
+    )
+    const head = thead(container)
+    expect(within(head).getByText("Ready")).toBeInTheDocument()
+    expect(within(head).getByText("NotReady")).toBeInTheDocument()
+    expect(within(head).getByText(/scheduling.?disabled/i)).toBeInTheDocument()
+    expect(within(head).getByText("control-plane")).toBeInTheDocument()
+    expect(within(head).getByText(/21h/)).toBeInTheDocument()
+    // No Status/Roles/Age body rows remain.
+    expect(attrRow(container, "status")).toBeNull()
+    expect(attrRow(container, "age")).toBeNull()
+  })
+
+  it("flags pressure conditions with a chip in the header", () => {
+    const { container } = render(
+      <ClusterUsageTable
+        rows={[row("pressured", { pressureConditions: ["MemoryPressure"] })]}
+        extendedKeys={[]}
+      />,
+    )
+    expect(within(thead(container)).getByText("MemoryPressure")).toBeInTheDocument()
+  })
+
+  it("renders an em dash for a node header without roles", () => {
+    const { container } = render(
+      <ClusterUsageTable rows={[row("worker", { roles: [] })]} extendedKeys={[]} />,
+    )
+    expect(within(thead(container)).getByText("—")).toBeInTheDocument()
+  })
+
+  it("renders em dash in an extended-resource row for a node that does not expose it", () => {
+    const { container } = render(
+      <ClusterUsageTable rows={[row("plain", { extended: {} })]} extendedKeys={["nvidia.com/gpu"]} />,
+    )
+    expect(within(attrRow(container, "nvidia.com/gpu")).getByText("—")).toBeInTheDocument()
+  })
+
+  it("collapses extended-resource cells to em dash for a NotReady node", () => {
+    const gpu = { "nvidia.com/gpu": { capacity: 2, allocatable: 2, requested: 1 } }
+    const { container } = render(
+      <ClusterUsageTable
+        rows={[row("ready-gpu", { ready: true, extended: gpu }), row("down-gpu", { ready: false, extended: gpu })]}
+        extendedKeys={["nvidia.com/gpu"]}
+      />,
+    )
+    expect(within(attrRow(container, "nvidia.com/gpu")).getAllByText("capacity 2")).toHaveLength(1)
+  })
+
+  it("renders em dashes in the CPU and Memory rows when the node is NotReady", () => {
+    const { container } = render(
+      <ClusterUsageTable rows={[row("dead", { ready: false })]} extendedKeys={[]} />,
+    )
+    expect(within(attrRow(container, "cpu")).getByText("—")).toBeInTheDocument()
+    expect(within(attrRow(container, "memory")).getByText("—")).toBeInTheDocument()
+  })
+
+  it("hides a node column when filtered out by name (case-insensitive)", async () => {
+    const user = userEvent.setup()
+    const { container } = render(
+      <ClusterUsageTable
+        rows={[row("worker-cpu-1"), row("worker-gpu-1"), row("ctrl-1")]}
+        extendedKeys={[]}
+      />,
+    )
+    await user.type(screen.getByLabelText("Filter nodes"), "GPU")
+    expect(nodeCols(container)).toEqual(["worker-gpu-1"])
+  })
+
+  it("filters node columns by role substring", async () => {
+    const user = userEvent.setup()
+    const { container } = render(
+      <ClusterUsageTable
+        rows={[row("a", { roles: ["control-plane"] }), row("b", { roles: ["worker"] })]}
+        extendedKeys={[]}
+      />,
+    )
+    await user.type(screen.getByLabelText("Filter nodes"), "control")
+    expect(nodeCols(container)).toEqual(["a"])
+  })
+
+  it("replaces the Requested line with an em-dash tooltip when podsUnavailable", () => {
+    const { container } = render(
+      <ClusterUsageTable
+        rows={[
+          row("loaded", {
+            standard: {
+              cpu: { capacity: 8, allocatable: 8, requested: 4 },
+              memory: { capacity: 16 * 1024 ** 3, allocatable: 16 * 1024 ** 3, requested: 0 },
+              "ephemeral-storage": { capacity: 0, allocatable: 0, requested: 0 },
+              pods: { capacity: 110, allocatable: 110, requested: 0 },
+            },
+          }),
+        ]}
+        extendedKeys={[]}
+        podsUnavailable
+      />,
+    )
+    const cpu = attrRow(container, "cpu")
+    expect(
+      cpu.querySelectorAll('[title="Requires cluster-wide pod read access"]').length,
+    ).toBeGreaterThan(0)
+    expect(within(cpu).queryByText(/4 \/ 8 req/)).toBeNull()
+  })
+})
diff --git a/packages/system/dashboard/images/console/apps/console/src/components/cluster-usage/ClusterUsageTable.tsx b/packages/system/dashboard/images/console/apps/console/src/components/cluster-usage/ClusterUsageTable.tsx
new file mode 100644
index 0000000000..e17143e252
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/components/cluster-usage/ClusterUsageTable.tsx
@@ -0,0 +1,255 @@
+import { useMemo, useState, type ReactNode } from "react"
+import { Link } from "react-router"
+import { humanizeBytes, humanizeCpu } from "../../lib/k8s-quantity.ts"
+import type { NodeRow, ResourceTotals } from "../../lib/cluster-usage/types.ts"
+
+interface ClusterUsageTableProps {
+  rows: NodeRow[]
+  extendedKeys: string[]
+  /** True when pods-list cluster-wide failed — Requested cells become em dashes with a tooltip. */
+  podsUnavailable?: boolean
+}
+
+const REQUESTED_UNAVAILABLE_REASON = "Requires cluster-wide pod read access"
+
+function statusLabel(row: NodeRow): string {
+  if (!row.ready) return "NotReady"
+  if (!row.schedulable) return "SchedulingDisabled"
+  return "Ready"
+}
+
+function cpuCell(totals: ResourceTotals, ready: boolean, podsUnavailable: boolean) {
+  if (!ready || totals.allocatable <= 0) {
+    return <div className="text-xs text-slate-400">—</div>
+  }
+  const hasUsed = totals.used !== undefined
+  return (
+    <div className="space-y-0.5 text-xs">
+      {hasUsed ? (
+        <div className="tabular-nums text-slate-700">
+          {humanizeCpu(totals.used ?? 0)} / {humanizeCpu(totals.allocatable)} used
+        </div>
+      ) : null}
+      {podsUnavailable ? (
+        <div className="text-slate-400" title={REQUESTED_UNAVAILABLE_REASON}>
+          — req
+        </div>
+      ) : (
+        <div className="tabular-nums text-slate-500">
+          {humanizeCpu(totals.requested)} / {humanizeCpu(totals.allocatable)} req
+        </div>
+      )}
+    </div>
+  )
+}
+
+function memoryCell(totals: ResourceTotals, ready: boolean, podsUnavailable: boolean) {
+  if (!ready || totals.allocatable <= 0) {
+    return <div className="text-xs text-slate-400">—</div>
+  }
+  const hasUsed = totals.used !== undefined
+  return (
+    <div className="space-y-0.5 text-xs">
+      {hasUsed ? (
+        <div className="tabular-nums text-slate-700">
+          {humanizeBytes(totals.used ?? 0)} / {humanizeBytes(totals.allocatable)} used
+        </div>
+      ) : null}
+      {podsUnavailable ? (
+        <div className="text-slate-400" title={REQUESTED_UNAVAILABLE_REASON}>
+          — req
+        </div>
+      ) : (
+        <div className="tabular-nums text-slate-500">
+          {humanizeBytes(totals.requested)} / {humanizeBytes(totals.allocatable)} req
+        </div>
+      )}
+    </div>
+  )
+}
+
+function extendedCell(
+  totals: ResourceTotals | undefined,
+  ready: boolean,
+  podsUnavailable: boolean,
+) {
+  if (!ready || !totals) return <span className="text-xs text-slate-400">—</span>
+  return (
+    <div className="space-y-0.5 text-xs tabular-nums text-slate-700">
+      <div>
+        {podsUnavailable ? (
+          <span className="text-slate-400" title={REQUESTED_UNAVAILABLE_REASON}>
+            —
+          </span>
+        ) : (
+          totals.requested
+        )}{" "}
+        / {totals.allocatable}
+      </div>
+      <div className="text-slate-400">capacity {totals.capacity}</div>
+    </div>
+  )
+}
+
+function statusContent(r: NodeRow) {
+  return (
+    <div className="space-y-1">
+      <div className="text-xs text-slate-700">{statusLabel(r)}</div>
+      {r.pressureConditions.length > 0 ? (
+        <div className="flex flex-wrap gap-1">
+          {r.pressureConditions.map((p) => (
+            <span
+              key={p}
+              className="rounded-full bg-amber-50 px-2 py-0.5 text-[11px] text-amber-800"
+            >
+              {p}
+            </span>
+          ))}
+        </div>
+      ) : null}
+      {r.taints.length > 0 ? (
+        <div className="text-[11px] text-slate-500">+tainted {r.taints.length}</div>
+      ) : null}
+    </div>
+  )
+}
+
+function rolesContent(r: NodeRow) {
+  if (r.roles.length === 0) return <span className="text-xs text-slate-400">—</span>
+  return (
+    <div className="flex flex-wrap gap-1 text-xs text-slate-700">
+      {r.roles.map((role) => (
+        <span key={role} className="rounded-full bg-slate-100 px-2 py-0.5">
+          {role}
+        </span>
+      ))}
+    </div>
+  )
+}
+
+function matchesFilter(row: NodeRow, q: string): boolean {
+  const needle = q.trim().toLowerCase()
+  if (!needle) return true
+  if (row.name.toLowerCase().includes(needle)) return true
+  if (row.roles.some((r) => r.toLowerCase().includes(needle))) return true
+  return false
+}
+
+/**
+ * Per-node table, transposed: each NODE is a column and each attribute
+ * (Status, Roles, CPU, Memory, every discovered extended-resource key, then
+ * Age) is a row, read top-to-bottom. The first column is a sticky label
+ * column; node columns scroll horizontally when they overflow. The filter
+ * input narrows which node columns are shown (by name or role).
+ *
+ * NotReady nodes show em dashes for CPU / Memory because status.capacity
+ * stops being authoritative. When the cluster-wide pods list failed,
+ * Requested figures are replaced by an em dash with an explanatory tooltip.
+ */
+export function ClusterUsageTable({
+  rows,
+  extendedKeys,
+  podsUnavailable = false,
+}: ClusterUsageTableProps) {
+  const [filter, setFilter] = useState("")
+
+  const visibleNodes = useMemo(
+    () =>
+      rows
+        .filter((r) => matchesFilter(r, filter))
+        .sort((a, b) => a.name.localeCompare(b.name)),
+    [rows, filter],
+  )
+
+  const labelCell = "sticky left-0 z-10 bg-white px-4 py-3 text-xs font-medium text-slate-600"
+  const labelHeader =
+    "sticky left-0 z-10 bg-slate-50 px-4 py-3 text-xs font-medium uppercase tracking-wider text-slate-500"
+
+  // Resource rows only — node metadata (Status / Roles / Age) is rendered in
+  // each node's column header instead. Every row is a requestable resource,
+  // so its label deep-links to the per-resource consumer drill-down.
+  const attributeRows: {
+    key: string
+    label: string
+    mono?: boolean
+    linkKey?: string
+    render: (r: NodeRow) => ReactNode
+  }[] = [
+    { key: "cpu", label: "CPU", linkKey: "cpu", render: (r) => cpuCell(r.standard.cpu, r.ready, podsUnavailable) },
+    { key: "memory", label: "Memory", linkKey: "memory", render: (r) => memoryCell(r.standard.memory, r.ready, podsUnavailable) },
+    ...extendedKeys.map((k) => ({
+      key: k,
+      label: k,
+      mono: true,
+      linkKey: k,
+      render: (r: NodeRow) => extendedCell(r.extended[k], r.ready, podsUnavailable),
+    })),
+  ]
+
+  return (
+    <div className="space-y-3">
+      <div className="flex items-center justify-between gap-2">
+        <input
+          type="search"
+          placeholder="Filter nodes by name or role…"
+          value={filter}
+          onChange={(e) => setFilter(e.target.value)}
+          aria-label="Filter nodes"
+          className="w-64 max-w-full rounded border border-slate-200 px-3 py-1.5 text-sm focus:border-blue-500 focus:outline-none"
+        />
+        <span className="text-xs text-slate-500">
+          {visibleNodes.length} of {rows.length}
+        </span>
+      </div>
+      <div className="overflow-x-auto rounded-lg border border-slate-200 bg-white shadow-sm">
+        <table className="w-full text-sm">
+          <thead>
+            <tr className="border-b border-slate-200 bg-slate-50 text-left">
+              <th className={labelHeader}>Node</th>
+              {visibleNodes.map((n) => (
+                <th
+                  key={n.name}
+                  data-node-col={n.name}
+                  className="min-w-44 px-4 py-3 text-left align-top font-normal"
+                >
+                  <div className="space-y-1.5">
+                    <div className="text-sm font-semibold text-slate-900">{n.name}</div>
+                    {statusContent(n)}
+                    {rolesContent(n)}
+                    <div className="text-[11px] tabular-nums text-slate-400">Age {n.age}</div>
+                  </div>
+                </th>
+              ))}
+            </tr>
+          </thead>
+          <tbody className="divide-y divide-slate-100">
+            {attributeRows.map((attr) => (
+              <tr key={attr.key} data-attribute-row={attr.key} className="hover:bg-slate-50">
+                <th
+                  scope="row"
+                  className={`${labelCell} text-left align-top ${attr.mono ? "font-mono" : ""}`}
+                >
+                  {attr.linkKey ? (
+                    <Link
+                      to={`/admin/capacity/cluster/r/${attr.linkKey}`}
+                      className="text-blue-700 hover:text-blue-800 hover:underline"
+                    >
+                      {attr.label}
+                    </Link>
+                  ) : (
+                    attr.label
+                  )}
+                </th>
+                {visibleNodes.map((n) => (
+                  <td key={n.name} className="px-4 py-3 align-top">
+                    {attr.render(n)}
+                  </td>
+                ))}
+              </tr>
+            ))}
+          </tbody>
+        </table>
+      </div>
+    </div>
+  )
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/components/command-palette/command-palette-provider.tsx b/packages/system/dashboard/images/console/apps/console/src/components/command-palette/command-palette-provider.tsx
new file mode 100644
index 0000000000..9f4c5b7fc9
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/components/command-palette/command-palette-provider.tsx
@@ -0,0 +1,24 @@
+import { useState, useCallback, useMemo } from "react"
+import { useHotkey } from "./use-hotkey"
+import { CommandPaletteContext } from "./use-command-palette.ts"
+
+export function CommandPaletteProvider({ children }: { children: React.ReactNode }) {
+  const [open, setOpen] = useState(false)
+
+  const toggle = useCallback(() => {
+    setOpen((prev) => !prev)
+  }, [])
+
+  useHotkey(toggle)
+
+  const value = useMemo(
+    () => ({ open, setOpen, toggle }),
+    [open, toggle]
+  )
+
+  return (
+    <CommandPaletteContext.Provider value={value}>
+      {children}
+    </CommandPaletteContext.Provider>
+  )
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/components/command-palette/command-palette.tsx b/packages/system/dashboard/images/console/apps/console/src/components/command-palette/command-palette.tsx
new file mode 100644
index 0000000000..327c6ddf97
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/components/command-palette/command-palette.tsx
@@ -0,0 +1,248 @@
+import { useState, useCallback, useRef, useEffect, forwardRef } from "react"
+import { useLocation } from "react-router"
+import { Search, ChevronRight, ArrowLeft } from "lucide-react"
+import {
+  DialogRoot,
+  DialogPortal,
+  DialogBackdrop,
+  DialogPopup,
+} from "../ui/dialog"
+import { cn } from "@cozystack/ui"
+import { useIsMac } from "../../hooks/use-is-mac"
+import { useKeyboardNav } from "./use-keyboard-nav"
+import { useCommandItems } from "./use-command-items"
+import { useCommandPalette } from "./use-command-palette"
+import type { NavigationLevel } from "./types"
+
+export function CommandPalette() {
+  const { open, setOpen } = useCommandPalette()
+  const [query, setQuery] = useState("")
+  const [level, setLevel] = useState<NavigationLevel>({ type: "root" })
+  const inputRef = useRef<HTMLInputElement>(null)
+  const location = useLocation()
+  const isMac = useIsMac()
+
+  // Reset local state when palette closes
+  useEffect(() => {
+    if (!open) {
+      // eslint-disable-next-line react-hooks/set-state-in-effect -- resets the palette when it closes, whoever closed it
+      setQuery("")
+      setLevel({ type: "root" })
+    }
+  }, [open])
+
+  const close = useCallback(() => {
+    setOpen(false)
+  }, [setOpen])
+
+  // Close on route change
+  useEffect(() => {
+    close()
+  }, [location.pathname, close])
+
+  const navigate = useCallback((next: NavigationLevel) => {
+    setLevel(next)
+    setQuery("")
+  }, [])
+
+  const goBack = useCallback(() => {
+    if (level.type === "instance") {
+      setLevel({
+        type: "resource",
+        plural: level.plural,
+        label: level.resourceLabel,
+        icon: level.icon,
+      })
+    } else {
+      setLevel({ type: "root" })
+    }
+    setQuery("")
+  }, [level])
+
+  const { items, isLoading } = useCommandItems(query, level, navigate, close)
+  const { highlightedIndex, onKeyDown: navKeyDown, setItemRef } =
+    useKeyboardNav(items)
+
+  const handleOpenChange = useCallback(
+    (nextOpen: boolean) => {
+      setOpen(nextOpen)
+    },
+    [setOpen]
+  )
+
+  const handleSelect = useCallback(
+    (index: number) => {
+      items[index]?.onSelect()
+    },
+    [items]
+  )
+
+  const handleKeyDown = useCallback(
+    (e: React.KeyboardEvent) => {
+      // Backspace on empty input → go back
+      if (e.key === "Backspace" && query === "" && level.type !== "root") {
+        e.preventDefault()
+        goBack()
+        return
+      }
+      navKeyDown(e)
+    },
+    [query, level.type, goBack, navKeyDown]
+  )
+
+  useEffect(() => {
+    if (open) {
+      requestAnimationFrame(() => inputRef.current?.focus())
+    }
+  }, [open])
+
+  // Group items by group label (preserve order)
+  const grouped: { label: string; items: { item: (typeof items)[0]; globalIndex: number }[] }[] = []
+  const groupMap = new Map<string, number>()
+  for (let i = 0; i < items.length; i++) {
+    const item = items[i]
+    const groupLabel = item.group ?? ""
+    let idx = groupMap.get(groupLabel)
+    if (idx === undefined) {
+      idx = grouped.length
+      groupMap.set(groupLabel, idx)
+      grouped.push({ label: groupLabel, items: [] })
+    }
+    grouped[idx].items.push({ item, globalIndex: i })
+  }
+
+  const breadcrumb =
+    level.type === "resource"
+      ? level.label
+      : level.type === "instance"
+        ? level.label
+        : null
+
+  return (
+    <DialogRoot open={open} onOpenChange={handleOpenChange} modal>
+      <DialogPortal>
+        <DialogBackdrop />
+        <DialogPopup
+          className="w-full max-w-[640px] overflow-hidden p-0"
+          aria-label="Command palette"
+        >
+          {/* Header with optional back + search */}
+          <div className="flex items-center gap-2 border-b border-slate-100 px-4" onKeyDown={handleKeyDown}>
+            {breadcrumb ? (
+              <button
+                type="button"
+                onClick={goBack}
+                className="flex items-center gap-1 shrink-0 rounded-md px-2 py-1 text-xs font-medium text-slate-500 bg-slate-100 hover:bg-slate-200 hover:text-slate-900 transition-colors"
+              >
+                <ArrowLeft className="h-3 w-3" />
+                {breadcrumb}
+              </button>
+            ) : (
+              <Search className="h-4 w-4 shrink-0 text-slate-400" />
+            )}
+            <input
+              ref={inputRef}
+              value={query}
+              onChange={(e) => setQuery(e.target.value)}
+              placeholder={
+                breadcrumb
+                  ? `Search in ${breadcrumb}...`
+                  : "Type a command or search..."
+              }
+              className="h-12 w-full bg-transparent text-sm text-slate-900 outline-none placeholder:text-slate-400"
+            />
+            {!breadcrumb && (
+              <kbd className="pointer-events-none ml-1 hidden shrink-0 select-none items-center rounded-md border border-slate-200 bg-slate-50 px-1.5 py-0.5 font-mono text-[10px] font-medium text-slate-500 sm:flex">
+                {isMac ? "⌘K" : "Ctrl+K"}
+              </kbd>
+            )}
+          </div>
+
+          {/* Results list */}
+          <div
+            className="max-h-[320px] overflow-y-auto p-1.5"
+            role="listbox"
+            aria-label="Results"
+          >
+            {items.length === 0 && !isLoading && (
+              <div className="py-8 text-center text-sm text-slate-400">
+                No results found.
+              </div>
+            )}
+
+            {isLoading && items.length === 0 && (
+              <div className="py-8 text-center text-sm text-slate-400">
+                Loading…
+              </div>
+            )}
+
+            {grouped.map((group) => (
+              <div key={group.label} role="group" aria-label={group.label}>
+                {group.label && (
+                  <div className="px-2 pb-1 pt-2 text-[10px] font-semibold uppercase tracking-widest text-slate-400">
+                    {group.label}
+                  </div>
+                )}
+                {group.items.map(({ item, globalIndex }) => (
+                  <PaletteItem
+                    key={item.id}
+                    ref={(el) => setItemRef(globalIndex, el)}
+                    highlighted={globalIndex === highlightedIndex}
+                    icon={item.icon}
+                    label={item.label}
+                    description={item.description}
+                    drilldown={item.drilldown}
+                    onSelect={() => handleSelect(globalIndex)}
+                  />
+                ))}
+              </div>
+            ))}
+          </div>
+        </DialogPopup>
+      </DialogPortal>
+    </DialogRoot>
+  )
+}
+
+const PaletteItem = forwardRef<
+  HTMLDivElement,
+  {
+    highlighted: boolean
+    icon?: React.ReactNode
+    label: string
+    description?: string
+    drilldown?: boolean
+    onSelect: () => void
+  }
+>(function PaletteItem(
+  { highlighted, icon, label, description, drilldown, onSelect },
+  ref
+) {
+  return (
+    <div
+      ref={ref}
+      role="option"
+      aria-selected={highlighted}
+      className={cn(
+        "relative flex cursor-default items-center gap-2.5 rounded-lg px-2.5 py-2 text-sm outline-none select-none transition-colors",
+        highlighted ? "bg-blue-50 text-blue-900" : "text-slate-700 hover:bg-slate-50"
+      )}
+      onClick={onSelect}
+    >
+      {icon && (
+        <span className="flex h-5 w-5 items-center justify-center shrink-0">
+          {icon}
+        </span>
+      )}
+      <span className="flex-1 truncate font-medium">{label}</span>
+      {description && (
+        <span className={cn("text-xs truncate max-w-[180px]", highlighted ? "text-blue-500" : "text-slate-400")}>
+          {description}
+        </span>
+      )}
+      {drilldown && (
+        <ChevronRight className={cn("h-3.5 w-3.5 shrink-0", highlighted ? "text-blue-400" : "text-slate-300")} />
+      )}
+    </div>
+  )
+})
diff --git a/packages/system/dashboard/images/console/apps/console/src/components/command-palette/types.ts b/packages/system/dashboard/images/console/apps/console/src/components/command-palette/types.ts
new file mode 100644
index 0000000000..94579163eb
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/components/command-palette/types.ts
@@ -0,0 +1,29 @@
+import type { K8sResource } from "@cozystack/k8s-client"
+
+export interface CommandItem {
+  id: string
+  label: string
+  description?: string
+  icon?: React.ReactNode
+  group?: string
+  drilldown?: boolean
+  keywords?: string[]
+  onSelect: () => void
+}
+
+export type NavigationLevel =
+  | { type: "root" }
+  | {
+      type: "resource"
+      plural: string
+      label: string
+      icon?: string
+    }
+  | {
+      type: "instance"
+      plural: string
+      instance: K8sResource
+      label: string
+      resourceLabel: string
+      icon?: string
+    }
diff --git a/packages/system/dashboard/images/console/apps/console/src/components/command-palette/use-command-items.tsx b/packages/system/dashboard/images/console/apps/console/src/components/command-palette/use-command-items.tsx
new file mode 100644
index 0000000000..1d6df0c83c
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/components/command-palette/use-command-items.tsx
@@ -0,0 +1,328 @@
+import { useMemo } from "react"
+import { useNavigate } from "react-router"
+import { useQueries } from "@tanstack/react-query"
+import { useApplicationDefinitions, iconDataUrl, appDisplayName } from "../../lib/app-definitions"
+import { useK8sList, useK8sClient } from "@cozystack/k8s-client"
+import type { K8sResource } from "@cozystack/k8s-client"
+import { APPS_GROUP, APPS_VERSION } from "@cozystack/types"
+import { useTenantContext } from "../../lib/tenant-context"
+import type { CommandItem, NavigationLevel } from "./types"
+
+function matchesQuery(item: CommandItem, query: string): boolean {
+  const q = query.toLowerCase()
+  if (item.label.toLowerCase().includes(q)) return true
+  if (item.description?.toLowerCase().includes(q)) return true
+  if (item.keywords?.some((kw) => kw.toLowerCase().includes(q))) return true
+  return false
+}
+
+function adIcon(icon?: string): React.ReactNode {
+  if (!icon) return undefined
+  return <img src={icon} alt="" className="h-4 w-4" />
+}
+
+interface UseCommandItemsResult {
+  items: CommandItem[]
+  isLoading: boolean
+}
+
+export function useCommandItems(
+  query: string,
+  level: NavigationLevel,
+  navigate: (level: NavigationLevel) => void,
+  close: () => void
+): UseCommandItemsResult {
+  const router = useNavigate()
+  const client = useK8sClient()
+  const { tenantNamespace } = useTenantContext()
+  const { data: adList } = useApplicationDefinitions()
+
+  const ads = adList?.items || []
+
+  // For resource-level drill-down: fetch instances of one type
+  const resourcePlural = level.type === "resource" ? level.plural : ""
+  const { data: singleResourceData, isLoading: singleLoading } = useK8sList(
+    {
+      apiGroup: APPS_GROUP,
+      apiVersion: APPS_VERSION,
+      plural: resourcePlural,
+      namespace: tenantNamespace ?? undefined,
+    },
+    { enabled: !!resourcePlural && !!tenantNamespace }
+  )
+
+  // For search mode: fetch all instances of all apps using useQueries
+  const hasQuery = query.trim().length > 0
+  const allInstancesQueries = useQueries({
+    queries: (ads || []).map((ad) => {
+      const plural = ad.spec?.application.plural ?? ""
+      return {
+        queryKey: [
+          "k8s",
+          APPS_GROUP,
+          APPS_VERSION,
+          plural,
+          tenantNamespace ?? "",
+          "",
+          "",
+        ] as const,
+        queryFn: () =>
+          client.list<K8sResource>(APPS_GROUP, APPS_VERSION, plural, tenantNamespace ?? undefined),
+        enabled: hasQuery && !!plural && !!tenantNamespace,
+      }
+    }),
+  })
+
+  // --- Root level items ---
+  const rootItems = useMemo((): CommandItem[] => {
+    const items: CommandItem[] = []
+
+    for (const ad of ads) {
+      const plural = ad.spec?.application.plural ?? ""
+      if (!plural) continue
+      const name = appDisplayName(ad)
+      const icon = iconDataUrl(ad)
+
+      items.push({
+        id: `root-${plural}`,
+        label: name,
+        description: plural,
+        icon: adIcon(icon),
+        group: "Applications",
+        drilldown: true,
+        keywords: [plural],
+        onSelect: () =>
+          navigate({
+            type: "resource",
+            plural,
+            label: name,
+            icon,
+          }),
+      })
+    }
+
+    items.push({
+      id: "root-marketplace",
+      label: "Marketplace",
+      description: "Browse available apps",
+      group: "Quick Actions",
+      keywords: ["marketplace", "catalog", "apps"],
+      onSelect: () => {
+        close()
+        router("/marketplace")
+      },
+    })
+
+    items.push({
+      id: "root-console",
+      label: "Console",
+      description: "All instances overview",
+      group: "Quick Actions",
+      keywords: ["home", "dashboard", "console"],
+      onSelect: () => {
+        close()
+        router("/console")
+      },
+    })
+
+    return items
+  }, [ads, navigate, router, close])
+
+  // --- Resource level items (instances + create) ---
+  const resourceItems = useMemo((): CommandItem[] => {
+    if (level.type !== "resource") return []
+
+    const items: CommandItem[] = []
+    const instances = singleResourceData?.items ?? []
+
+    for (const inst of instances) {
+      items.push({
+        id: `res-${inst.metadata.name}`,
+        label: inst.metadata.name,
+        drilldown: true,
+        icon: adIcon(level.icon),
+        onSelect: () =>
+          navigate({
+            type: "instance",
+            plural: level.plural,
+            instance: inst,
+            label: inst.metadata.name,
+            resourceLabel: level.label,
+            icon: level.icon,
+          }),
+      })
+    }
+
+    items.push({
+      id: "res-create",
+      label: `Create new ${level.label}`,
+      group: "Actions",
+      keywords: ["create", "new", "deploy"],
+      onSelect: () => {
+        close()
+        router(`/console/${level.plural}/create`)
+      },
+    })
+
+    return items
+  }, [level, singleResourceData, router, navigate, close])
+
+  // --- Instance level items (actions) ---
+  const instanceItems = useMemo((): CommandItem[] => {
+    if (level.type !== "instance") return []
+
+    const items: CommandItem[] = []
+    const { plural, instance } = level
+
+    items.push({
+      id: "inst-open",
+      label: "Open detail page",
+      onSelect: () => {
+        close()
+        router(`/console/${plural}/${instance.metadata.name}`)
+      },
+    })
+
+    items.push({
+      id: "inst-edit",
+      label: "Edit",
+      onSelect: () => {
+        close()
+        router(`/console/${plural}/${instance.metadata.name}/edit`)
+      },
+    })
+
+    items.push({
+      id: "inst-yaml",
+      label: "View YAML",
+      onSelect: () => {
+        close()
+        router(`/console/${plural}/${instance.metadata.name}?tab=yaml`)
+      },
+    })
+
+    return items
+  }, [level, router, close])
+
+  // --- Flat search across everything ---
+  const searchItems = useMemo((): CommandItem[] => {
+    const items: CommandItem[] = []
+
+    // All resource types
+    for (const ad of ads) {
+      const plural = ad.spec?.application.plural ?? ""
+      if (!plural) continue
+      const name = appDisplayName(ad)
+      const icon = iconDataUrl(ad)
+
+      items.push({
+        id: `search-nav-${plural}`,
+        label: name,
+        description: plural,
+        icon: adIcon(icon),
+        group: "Navigate",
+        drilldown: true,
+        keywords: [plural],
+        onSelect: () =>
+          navigate({
+            type: "resource",
+            plural,
+            label: name,
+            icon,
+          }),
+      })
+
+      items.push({
+        id: `search-create-${plural}`,
+        label: `Create ${name}`,
+        description: plural,
+        icon: adIcon(icon),
+        group: "Create New",
+        keywords: ["create", "new", "deploy", plural],
+        onSelect: () => {
+          close()
+          router(`/console/${plural}/create`)
+        },
+      })
+    }
+
+    // All instances from all apps
+    for (let i = 0; i < ads.length; i++) {
+      const ad = ads[i]
+      const plural = ad.spec?.application.plural ?? ""
+      const name = appDisplayName(ad)
+      const icon = iconDataUrl(ad)
+      const queryResult = allInstancesQueries[i]
+      const instances = queryResult?.data?.items ?? []
+
+      for (const inst of instances) {
+        const instance = inst
+        items.push({
+          id: `search-inst-${plural}-${instance.metadata.name}`,
+          label: instance.metadata.name,
+          description: name,
+          icon: adIcon(icon),
+          group: "Instances",
+          drilldown: true,
+          keywords: [instance.metadata.name, plural, name],
+          onSelect: () =>
+            navigate({
+              type: "instance",
+              plural,
+              instance,
+              label: instance.metadata.name,
+              resourceLabel: name,
+              icon,
+            }),
+        })
+      }
+    }
+
+    // Static actions
+    items.push({
+      id: "search-marketplace",
+      label: "Marketplace",
+      description: "Browse available apps",
+      group: "Quick Actions",
+      keywords: ["marketplace", "catalog", "apps"],
+      onSelect: () => {
+        close()
+        router("/marketplace")
+      },
+    })
+
+    items.push({
+      id: "search-console",
+      label: "Console",
+      description: "All instances overview",
+      group: "Quick Actions",
+      keywords: ["home", "dashboard", "console"],
+      onSelect: () => {
+        close()
+        router("/console")
+      },
+    })
+
+    return items
+  }, [ads, router, navigate, close, allInstancesQueries])
+
+  // --- Select items based on mode ---
+  const currentItems = useMemo(() => {
+    if (hasQuery) {
+      return searchItems.filter((item) => matchesQuery(item, query))
+    }
+    switch (level.type) {
+      case "root":
+        return rootItems
+      case "resource":
+        return resourceItems
+      case "instance":
+        return instanceItems
+    }
+  }, [hasQuery, query, level.type, searchItems, rootItems, resourceItems, instanceItems])
+
+  const searchLoading = hasQuery && allInstancesQueries.some((q) => q.isLoading)
+  const isLoading = (level.type === "resource" && singleLoading) || searchLoading
+
+  return { items: currentItems, isLoading }
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/components/command-palette/use-command-palette.ts b/packages/system/dashboard/images/console/apps/console/src/components/command-palette/use-command-palette.ts
new file mode 100644
index 0000000000..58c49879a7
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/components/command-palette/use-command-palette.ts
@@ -0,0 +1,19 @@
+import { createContext, useContext } from "react"
+
+interface CommandPaletteContextValue {
+  open: boolean
+  setOpen: (open: boolean) => void
+  toggle: () => void
+}
+
+export const CommandPaletteContext = createContext<CommandPaletteContextValue | undefined>(
+  undefined
+)
+
+export function useCommandPalette() {
+  const context = useContext(CommandPaletteContext)
+  if (!context) {
+    throw new Error("useCommandPalette must be used within CommandPaletteProvider")
+  }
+  return context
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/components/command-palette/use-hotkey.ts b/packages/system/dashboard/images/console/apps/console/src/components/command-palette/use-hotkey.ts
new file mode 100644
index 0000000000..e106dd5bc5
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/components/command-palette/use-hotkey.ts
@@ -0,0 +1,33 @@
+import { useEffect, useCallback } from "react"
+
+function isEditableElement(el: EventTarget | null): boolean {
+  if (!el || !(el instanceof HTMLElement)) return false
+  const tag = el.tagName
+  if (tag === "INPUT" || tag === "TEXTAREA" || tag === "SELECT") return true
+  if (el.isContentEditable) return true
+  if (el.closest("[data-slot='input']")) return true
+  return false
+}
+
+export function useHotkey(onToggle: () => void) {
+  const handler = useCallback(
+    (e: KeyboardEvent) => {
+      if ((e.metaKey || e.ctrlKey) && e.key === "k") {
+        e.preventDefault()
+        onToggle()
+        return
+      }
+
+      if (e.key === "/" && !isEditableElement(e.target)) {
+        e.preventDefault()
+        onToggle()
+      }
+    },
+    [onToggle]
+  )
+
+  useEffect(() => {
+    document.addEventListener("keydown", handler)
+    return () => document.removeEventListener("keydown", handler)
+  }, [handler])
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/components/command-palette/use-keyboard-nav.ts b/packages/system/dashboard/images/console/apps/console/src/components/command-palette/use-keyboard-nav.ts
new file mode 100644
index 0000000000..da0dfdd4eb
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/components/command-palette/use-keyboard-nav.ts
@@ -0,0 +1,64 @@
+import { useState, useCallback, useEffect, useRef, useMemo } from "react"
+import type { CommandItem } from "./types"
+
+export function useKeyboardNav(items: CommandItem[]) {
+  const [highlightedIndex, setHighlightedIndex] = useState(0)
+  const itemRefs = useRef<Map<number, HTMLElement>>(new Map())
+
+  const itemsKey = useMemo(() => items.map((i) => i.id).join(","), [items])
+
+  useEffect(() => {
+    // eslint-disable-next-line react-hooks/set-state-in-effect -- moves the highlight back to the top when the item list changes
+    setHighlightedIndex(0)
+  }, [itemsKey])
+
+  useEffect(() => {
+    const el = itemRefs.current.get(highlightedIndex)
+    el?.scrollIntoView({ block: "nearest" })
+  }, [highlightedIndex])
+
+  const setItemRef = useCallback((index: number, el: HTMLElement | null) => {
+    if (el) {
+      itemRefs.current.set(index, el)
+    } else {
+      itemRefs.current.delete(index)
+    }
+  }, [])
+
+  const onKeyDown = useCallback(
+    (e: React.KeyboardEvent) => {
+      if (items.length === 0) return
+
+      switch (e.key) {
+        case "ArrowDown": {
+          e.preventDefault()
+          setHighlightedIndex((i) => (i + 1) % items.length)
+          break
+        }
+        case "ArrowUp": {
+          e.preventDefault()
+          setHighlightedIndex((i) => (i - 1 + items.length) % items.length)
+          break
+        }
+        case "Home": {
+          e.preventDefault()
+          setHighlightedIndex(0)
+          break
+        }
+        case "End": {
+          e.preventDefault()
+          setHighlightedIndex(items.length - 1)
+          break
+        }
+        case "Enter": {
+          e.preventDefault()
+          items[highlightedIndex]?.onSelect()
+          break
+        }
+      }
+    },
+    [items, highlightedIndex]
+  )
+
+  return { highlightedIndex, onKeyDown, setItemRef }
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/components/rjsf-registry.ts b/packages/system/dashboard/images/console/apps/console/src/components/rjsf-registry.ts
new file mode 100644
index 0000000000..f7e793a143
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/components/rjsf-registry.ts
@@ -0,0 +1,34 @@
+import type { TemplatesType } from "@rjsf/utils"
+import { CustomObjectFieldTemplate } from "./CustomObjectFieldTemplate.tsx"
+import {
+  AddButton,
+  ArrayFieldItemTemplate,
+  CopyButton,
+  HiddenButton,
+  RemoveButton,
+  SubmitButton,
+} from "./rjsf-templates.tsx"
+import { SourceWidget } from "./SourceWidget.tsx"
+import { DynamicOptionsWidget } from "./DynamicOptionsWidget.tsx"
+import { AdditionalPropertiesWidget } from "./AdditionalPropertiesWidget.tsx"
+import { SensitiveStringWidget } from "./SensitiveStringWidget.tsx"
+
+export const customTemplates = {
+  ObjectFieldTemplate: CustomObjectFieldTemplate,
+  ArrayFieldItemTemplate: ArrayFieldItemTemplate,
+  ButtonTemplates: {
+    AddButton,
+    RemoveButton,
+    CopyButton,
+    MoveUpButton: HiddenButton,
+    MoveDownButton: HiddenButton,
+    SubmitButton,
+  },
+} as const satisfies Partial<TemplatesType>
+
+export const customWidgets = {
+  SourceWidget: SourceWidget,
+  DynamicOptionsWidget: DynamicOptionsWidget,
+  AdditionalPropertiesWidget: AdditionalPropertiesWidget,
+  SensitiveStringWidget: SensitiveStringWidget,
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/components/rjsf-templates.tsx b/packages/system/dashboard/images/console/apps/console/src/components/rjsf-templates.tsx
new file mode 100644
index 0000000000..aaad61de1f
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/components/rjsf-templates.tsx
@@ -0,0 +1,83 @@
+import type {
+  IconButtonProps,
+  ArrayFieldTemplateItemType,
+  FormContextType,
+  RJSFSchema,
+  StrictRJSFSchema,
+  SubmitButtonProps,
+} from "@rjsf/utils"
+
+function IconButton<
+  T = unknown,
+  S extends StrictRJSFSchema = RJSFSchema,
+  F extends FormContextType = FormContextType,
+>(props: IconButtonProps<T, S, F>) {
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  const { icon, className, uiSchema, registry, iconType, ...btnProps } = props
+  return (
+    <button
+      type="button"
+      className={className}
+      {...btnProps}
+    >
+      {icon}
+    </button>
+  )
+}
+
+const buttonClassName =
+  "rounded-md border border-slate-200 bg-white px-3 py-1.5 text-sm font-medium text-slate-600 shadow-sm hover:bg-slate-50 hover:border-slate-300 transition-colors"
+
+const removeButtonClassName =
+  "rounded-md border border-red-200 bg-white px-3 py-1.5 text-sm font-medium text-red-600 shadow-sm hover:bg-red-50 hover:border-red-300 transition-colors"
+
+export function ArrayFieldItemTemplate<
+  T = unknown,
+  S extends StrictRJSFSchema = RJSFSchema,
+  F extends FormContextType = FormContextType,
+>(props: ArrayFieldTemplateItemType<T, S, F>) {
+  const { children, hasRemove, index, onDropIndexClick, disabled, readonly, schema } = props
+  const isNumeric = schema.type === 'integer' || schema.type === 'number'
+  return (
+    <div className="array-item-row group flex items-center gap-1.5 mb-1">
+      <div className={isNumeric ? 'w-36 shrink-0' : 'flex-1'}>{children}</div>
+      {hasRemove && (
+        <button
+          type="button"
+          aria-label="Remove"
+          className="opacity-0 group-hover:opacity-100 size-[26px] flex-shrink-0 flex items-center justify-center rounded-full border border-red-200 bg-white text-red-400 text-sm leading-none hover:bg-red-50 hover:text-red-600 hover:border-red-300 disabled:opacity-30 transition-all duration-150"
+          onClick={onDropIndexClick(index)}
+          disabled={disabled || readonly}
+        >
+          ×
+        </button>
+      )}
+    </div>
+  )
+}
+
+export function AddButton(props: IconButtonProps) {
+  return (
+    <IconButton
+      {...props}
+      icon="+ add"
+      className="mt-0.5 flex items-center gap-1 px-2 py-1 text-xs font-medium text-slate-500 hover:text-blue-600 rounded-md border border-dashed border-slate-300 hover:border-blue-400 hover:bg-blue-50/60 bg-white transition-all duration-150 cursor-pointer"
+    />
+  )
+}
+
+export function RemoveButton(props: IconButtonProps) {
+  return <IconButton {...props} icon="× Remove" className={removeButtonClassName} />
+}
+
+export function CopyButton(props: IconButtonProps) {
+  return <IconButton {...props} icon="Copy" className={buttonClassName} />
+}
+
+export function SubmitButton(props: SubmitButtonProps) {
+  return <IconButton {...props} icon="Submit" className={buttonClassName} />
+}
+
+export function HiddenButton() {
+  return null
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/components/schema-form.css b/packages/system/dashboard/images/console/apps/console/src/components/schema-form.css
new file mode 100644
index 0000000000..9d62a611df
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/components/schema-form.css
@@ -0,0 +1,110 @@
+/*
+ * Minimal styling for @rjsf/core's default theme. RJSF ships no styles; this
+ * file adds the bare minimum so the form is readable on Tailwind pages.
+ */
+@reference "@cozystack/ui/styles";
+
+.rjsf-container .field {
+  @apply mb-3;
+}
+.rjsf-container .field > label,
+.rjsf-container .control-label {
+  @apply mb-1 block text-xs font-medium text-slate-600;
+}
+.rjsf-container .field-description {
+  @apply mt-0.5 text-xs text-slate-400;
+}
+.rjsf-container .required {
+  @apply ml-0.5 text-red-500;
+}
+.rjsf-container input[type="text"],
+.rjsf-container input[type="number"],
+.rjsf-container input[type="email"],
+.rjsf-container textarea {
+  @apply w-full rounded-md border border-slate-200 bg-white px-2.5 py-1.5 text-sm text-slate-900 shadow-sm outline-none transition-shadow focus:border-blue-500 focus:ring-2 focus:ring-blue-500/20;
+}
+.rjsf-container select {
+  @apply w-full rounded-md border border-slate-200 bg-white pl-2.5 pr-8 py-1.5 text-sm text-slate-900 shadow-sm outline-none transition-shadow focus:border-blue-500 focus:ring-2 focus:ring-blue-500/20;
+}
+.rjsf-container input[type="checkbox"] {
+  @apply mr-2 size-4 rounded border-slate-300 accent-blue-600 focus:ring-2 focus:ring-blue-500/20;
+}
+.rjsf-container fieldset {
+  @apply mt-1.5 mb-3 rounded-lg border border-slate-200 bg-white p-3 shadow-sm;
+}
+.rjsf-container fieldset > legend {
+  @apply -ml-1 px-1 text-xs font-semibold text-slate-700;
+}
+.rjsf-container fieldset fieldset {
+  @apply bg-slate-50/70 shadow-none p-2.5;
+}
+.rjsf-container .btn-add,
+.rjsf-container .object-property-expand button,
+.rjsf-container .array-item-add button,
+.rjsf-container .array-item-remove button,
+.rjsf-container .array-item-move-up button,
+.rjsf-container .array-item-move-down button {
+  @apply rounded-md border border-slate-200 bg-white px-2.5 py-1 text-xs font-medium text-slate-600 shadow-sm hover:bg-slate-50 hover:border-slate-300 transition-colors;
+}
+.rjsf-container .text-danger {
+  @apply text-xs text-red-500;
+}
+/* Hide auto-generated labels for primitive array items (e.g. "fieldName-1") */
+.rjsf-container .field-array-of-integer .control-label,
+.rjsf-container .field-array-of-string .control-label,
+.rjsf-container .field-array-of-number .control-label {
+  display: none;
+}
+/* Remove bottom margin from fields inside array item rows (template handles spacing) */
+.rjsf-container .array-item-list .field {
+  margin-bottom: 0;
+}
+/* Compact fields inside simple-field grid columns */
+.rjsf-container .grid-fields {
+  padding-left: 7px;
+}
+.rjsf-container .grid-fields .field {
+  margin-bottom: 0.5rem;
+}
+.rjsf-container .grid-fields .field-description {
+  display: -webkit-box;
+  -webkit-line-clamp: 1;
+  -webkit-box-orient: vertical;
+  overflow: hidden;
+  cursor: default;
+}
+/* Boolean fields lack a control-label — add equivalent top offset so they align with adjacent fields */
+.rjsf-container .grid-fields .field-boolean {
+  padding-top: 1.25rem;
+}
+/* Array item row: hover highlight */
+.rjsf-container .array-item-row {
+  border-radius: 0.375rem;
+  padding: 0.125rem 0.375rem;
+  margin-left: -0.375rem;
+  margin-right: -0.375rem;
+  transition: background-color 0.1s ease;
+}
+.rjsf-container .array-item-row:hover {
+  background-color: rgb(248 250 252);
+}
+/* Monospace + muted-code treatment for numeric array inputs (ports, counts, etc.) */
+.rjsf-container .field-array-of-integer input[type="number"],
+.rjsf-container .field-array-of-number input[type="number"] {
+  font-family: ui-monospace, 'SF Mono', Menlo, monospace;
+  font-size: 0.8rem;
+  letter-spacing: 0.03em;
+  background-color: rgb(248 250 252);
+}
+/* Spinner arrows hidden for port-number inputs — value is exact, arrows add noise */
+.rjsf-container .field-array-of-integer input[type="number"]::-webkit-inner-spin-button,
+.rjsf-container .field-array-of-integer input[type="number"]::-webkit-outer-spin-button,
+.rjsf-container .field-array-of-number input[type="number"]::-webkit-inner-spin-button,
+.rjsf-container .field-array-of-number input[type="number"]::-webkit-outer-spin-button {
+  -webkit-appearance: none;
+  margin: 0;
+}
+.rjsf-container .field-array-of-integer input[type="number"],
+.rjsf-container .field-array-of-number input[type="number"] {
+  -moz-appearance: textfield;
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/components/ui/dialog.tsx b/packages/system/dashboard/images/console/apps/console/src/components/ui/dialog.tsx
new file mode 100644
index 0000000000..fb6980d711
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/components/ui/dialog.tsx
@@ -0,0 +1,79 @@
+import { Dialog as DialogPrimitive } from "@base-ui/react/dialog"
+import { cn } from "@cozystack/ui"
+
+const DialogRoot = DialogPrimitive.Root
+
+const DialogPortal = DialogPrimitive.Portal
+
+const DialogClose = DialogPrimitive.Close
+
+function DialogBackdrop({
+  className,
+  ...props
+}: DialogPrimitive.Backdrop.Props) {
+  return (
+    <DialogPrimitive.Backdrop
+      data-slot="dialog-backdrop"
+      className={cn(
+        "fixed inset-0 z-50 bg-black/25 backdrop-blur-sm transition-opacity duration-150 data-[open]:opacity-100 data-[closed]:opacity-0",
+        className
+      )}
+      {...props}
+    />
+  )
+}
+
+function DialogPopup({
+  className,
+  children,
+  ...props
+}: DialogPrimitive.Popup.Props) {
+  return (
+    <DialogPrimitive.Popup
+      data-slot="dialog-popup"
+      className={cn(
+        "fixed top-[14%] left-1/2 z-50 -translate-x-1/2 rounded-xl bg-white text-slate-900 shadow-[0_20px_60px_rgba(0,0,0,0.18)] ring-1 ring-slate-900/8 outline-none transition-all duration-150",
+        className
+      )}
+      {...props}
+    >
+      {children}
+    </DialogPrimitive.Popup>
+  )
+}
+
+function DialogTitle({
+  className,
+  ...props
+}: DialogPrimitive.Title.Props) {
+  return (
+    <DialogPrimitive.Title
+      data-slot="dialog-title"
+      className={cn("text-lg font-semibold", className)}
+      {...props}
+    />
+  )
+}
+
+function DialogDescription({
+  className,
+  ...props
+}: DialogPrimitive.Description.Props) {
+  return (
+    <DialogPrimitive.Description
+      data-slot="dialog-description"
+      className={cn("text-sm text-slate-500", className)}
+      {...props}
+    />
+  )
+}
+
+export {
+  DialogRoot,
+  DialogPortal,
+  DialogBackdrop,
+  DialogPopup,
+  DialogTitle,
+  DialogDescription,
+  DialogClose,
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/hooks/use-is-mac.ts b/packages/system/dashboard/images/console/apps/console/src/hooks/use-is-mac.ts
new file mode 100644
index 0000000000..8a939c4e80
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/hooks/use-is-mac.ts
@@ -0,0 +1,12 @@
+import { useState, useEffect } from "react"
+
+export function useIsMac(): boolean {
+  const [isMac, setIsMac] = useState(false)
+
+  useEffect(() => {
+    // eslint-disable-next-line react-hooks/set-state-in-effect -- a lazy initial state would change what the first render returns
+    setIsMac(navigator.platform.toUpperCase().indexOf("MAC") >= 0)
+  }, [])
+
+  return isMac
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/hooks/useBackupClassAdminAccess.ts b/packages/system/dashboard/images/console/apps/console/src/hooks/useBackupClassAdminAccess.ts
new file mode 100644
index 0000000000..5d8ca7c5d4
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/hooks/useBackupClassAdminAccess.ts
@@ -0,0 +1,20 @@
+import { useSelfSubjectAccessReview } from "@cozystack/k8s-client"
+
+// BackupClass is cluster-scoped, and tenants already hold get/list/watch on it,
+// so a read gate would not exclude them — only write does. Gating on `update`
+// is what makes the Backup Classes area admin-only. Fail closed: loading and
+// error states resolve as "not allowed" so the sidebar entry never flickers in
+// then out.
+export function useBackupClassAdminAccess(): { allowed: boolean; isLoading: boolean } {
+  const review = useSelfSubjectAccessReview({
+    resourceAttributes: {
+      group: "backups.cozystack.io",
+      resource: "backupclasses",
+      verb: "update",
+    },
+  })
+  return {
+    isLoading: review.isLoading,
+    allowed: !review.isLoading && !review.error && review.allowed,
+  }
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/hooks/useClusterUsageAccess.ts b/packages/system/dashboard/images/console/apps/console/src/hooks/useClusterUsageAccess.ts
new file mode 100644
index 0000000000..3679493608
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/hooks/useClusterUsageAccess.ts
@@ -0,0 +1,16 @@
+import { useSelfSubjectAccessReview } from "@cozystack/k8s-client"
+
+// The Capacity area (Cluster / Nodes / Storage and the per-resource
+// drill-downs) reads cluster-scoped objects — nodes, and pods/PVCs across every
+// tenant namespace — that tenant users cannot list. Gate the whole area on
+// `nodes/list` as the "cluster operator" proxy. Fail closed: loading and error
+// resolve as "not allowed" so the sidebar entry never flickers in then out.
+export function useClusterUsageAccess(): { allowed: boolean; isLoading: boolean } {
+  const review = useSelfSubjectAccessReview({
+    resourceAttributes: { resource: "nodes", verb: "list" },
+  })
+  return {
+    isLoading: review.isLoading,
+    allowed: !review.isLoading && !review.error && review.allowed,
+  }
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/hooks/useClusterUsageData.test.tsx b/packages/system/dashboard/images/console/apps/console/src/hooks/useClusterUsageData.test.tsx
new file mode 100644
index 0000000000..a6532e9664
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/hooks/useClusterUsageData.test.tsx
@@ -0,0 +1,161 @@
+import { describe, it, expect, vi } from "vitest"
+import { renderHook, waitFor } from "@testing-library/react"
+import { QueryClient, QueryClientProvider } from "@tanstack/react-query"
+import {
+  K8sClient,
+  K8sProvider,
+  K8sApiError,
+  type APIGroupList,
+  type K8sList,
+} from "@cozystack/k8s-client"
+import type { ReactNode } from "react"
+import { useClusterUsageData } from "./useClusterUsageData.tsx"
+import { nodesListFixture } from "../test-utils/fixtures/nodes.ts"
+import { podsListFixture } from "../test-utils/fixtures/pods.ts"
+import { nodeMetricsListFixture } from "../test-utils/fixtures/node-metrics.ts"
+
+function makeWrapper(client: K8sClient) {
+  const queryClient = new QueryClient({
+    defaultOptions: { queries: { retry: false, gcTime: 0 } },
+  })
+  return function Wrapper({ children }: { children: ReactNode }) {
+    return (
+      <QueryClientProvider client={queryClient}>
+        <K8sProvider client={client} queryClient={queryClient}>
+          {children}
+        </K8sProvider>
+      </QueryClientProvider>
+    )
+  }
+}
+
+const groupsWithMetrics: APIGroupList = {
+  kind: "APIGroupList",
+  apiVersion: "v1",
+  groups: [
+    {
+      name: "metrics.k8s.io",
+      versions: [{ groupVersion: "metrics.k8s.io/v1beta1", version: "v1beta1" }],
+      preferredVersion: { groupVersion: "metrics.k8s.io/v1beta1", version: "v1beta1" },
+    },
+  ],
+}
+
+const groupsWithoutMetrics: APIGroupList = {
+  kind: "APIGroupList",
+  apiVersion: "v1",
+  groups: [
+    {
+      name: "apps",
+      versions: [{ groupVersion: "apps/v1", version: "v1" }],
+      preferredVersion: { groupVersion: "apps/v1", version: "v1" },
+    },
+  ],
+}
+
+function stubList(
+  client: K8sClient,
+  responses: Partial<Record<string, K8sList<unknown> | K8sApiError>>,
+) {
+  vi.spyOn(client, "list").mockImplementation(async (apiGroup, _v, plural) => {
+    // Key by (apiGroup|plural). The metrics.k8s.io node listing uses
+    // plural=nodes too, so we can't disambiguate on plural alone.
+    const key = `${apiGroup}|${plural}`
+    const r = responses[key]
+    if (r instanceof K8sApiError) throw r
+    return (r ?? { apiVersion: "v1", kind: `${plural}List`, metadata: {}, items: [] }) as K8sList<
+      unknown
+    >
+  })
+}
+
+describe("useClusterUsageData", () => {
+  it("reports isLoading=true on first render", () => {
+    const client = new K8sClient()
+    stubList(client, {})
+    vi.spyOn(client, "getApiGroups").mockImplementation(() => new Promise(() => {}))
+    const { result } = renderHook(() => useClusterUsageData(), {
+      wrapper: makeWrapper(client),
+    })
+    expect(result.current.isLoading).toBe(true)
+  })
+
+  it("returns aggregates and per-node rows derived from nodes + pods + metrics", async () => {
+    const client = new K8sClient()
+    stubList(client, {
+      "|nodes": nodesListFixture,
+      "|pods": podsListFixture,
+      "metrics.k8s.io|nodes": nodeMetricsListFixture,
+    })
+    vi.spyOn(client, "getApiGroups").mockResolvedValue(groupsWithMetrics)
+    const { result } = renderHook(() => useClusterUsageData(), {
+      wrapper: makeWrapper(client),
+    })
+    await waitFor(() => expect(result.current.isLoading).toBe(false))
+    expect(result.current.metricsAvailable).toBe(true)
+    expect(result.current.perNode.map((r) => r.name)).toEqual([
+      "cp-1",
+      "worker-1",
+      "worker-gpu-1",
+    ])
+    expect(result.current.aggregates.extended["nvidia.com/gpu"].capacity).toBe(1)
+    // Used overlay must be populated from the metrics fixture.
+    expect(result.current.aggregates.standard.cpu.used).toBeGreaterThan(0)
+  })
+
+  it("never lists NodeMetrics when metrics.k8s.io is not registered", async () => {
+    const client = new K8sClient()
+    const listSpy = vi.spyOn(client, "list").mockImplementation(
+      async (_g, _v, plural) => {
+        if (plural === "nodes")
+          return nodesListFixture as unknown as K8sList<unknown>
+        if (plural === "pods")
+          return podsListFixture as unknown as K8sList<unknown>
+        return { apiVersion: "v1", kind: `${plural}List`, metadata: {}, items: [] }
+      },
+    )
+    vi.spyOn(client, "getApiGroups").mockResolvedValue(groupsWithoutMetrics)
+    const { result } = renderHook(() => useClusterUsageData(), {
+      wrapper: makeWrapper(client),
+    })
+    await waitFor(() => expect(result.current.isLoading).toBe(false))
+    expect(result.current.metricsAvailable).toBe(false)
+    const metricsCalls = listSpy.mock.calls.filter(
+      (call) => call[0] === "metrics.k8s.io",
+    )
+    expect(metricsCalls).toHaveLength(0)
+    expect(result.current.aggregates.standard.cpu.used).toBeUndefined()
+  })
+
+  it("treats a metrics-API 403 as 'no usage data' without crashing", async () => {
+    const client = new K8sClient()
+    vi.spyOn(client, "list").mockImplementation(async (g, _v, plural) => {
+      if (g === "metrics.k8s.io") throw new K8sApiError(403, "forbidden")
+      if (plural === "nodes") return nodesListFixture as unknown as K8sList<unknown>
+      if (plural === "pods") return podsListFixture as unknown as K8sList<unknown>
+      return { apiVersion: "v1", kind: `${plural}List`, metadata: {}, items: [] }
+    })
+    vi.spyOn(client, "getApiGroups").mockResolvedValue(groupsWithMetrics)
+    const { result } = renderHook(() => useClusterUsageData(), {
+      wrapper: makeWrapper(client),
+    })
+    await waitFor(() => expect(result.current.isLoading).toBe(false))
+    expect(result.current.metricsAvailable).toBe(true)
+    expect(result.current.aggregates.standard.cpu.used).toBeUndefined()
+    expect(result.current.error).toBeNull()
+  })
+
+  it("surfaces a nodes-list error as the hook error", async () => {
+    const client = new K8sClient()
+    vi.spyOn(client, "list").mockImplementation(async (_g, _v, plural) => {
+      if (plural === "nodes") throw new K8sApiError(500, "boom")
+      return { apiVersion: "v1", kind: `${plural}List`, metadata: {}, items: [] }
+    })
+    vi.spyOn(client, "getApiGroups").mockResolvedValue(groupsWithoutMetrics)
+    const { result } = renderHook(() => useClusterUsageData(), {
+      wrapper: makeWrapper(client),
+    })
+    await waitFor(() => expect(result.current.error).toBeTruthy())
+    expect(result.current.error?.message).toContain("boom")
+  })
+})
diff --git a/packages/system/dashboard/images/console/apps/console/src/hooks/useClusterUsageData.tsx b/packages/system/dashboard/images/console/apps/console/src/hooks/useClusterUsageData.tsx
new file mode 100644
index 0000000000..921da5eb39
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/hooks/useClusterUsageData.tsx
@@ -0,0 +1,164 @@
+import { useMemo } from "react"
+import {
+  useK8sList,
+  useApiGroupAvailable,
+  K8sApiError,
+  type K8sList,
+} from "@cozystack/k8s-client"
+import { aggregateNodeResources } from "../lib/cluster-usage/aggregate.ts"
+import { derivePerNodeRows } from "../lib/cluster-usage/per-node.ts"
+import type {
+  AggregateResources,
+  Node,
+  NodeMetrics,
+  NodeRow,
+  Pod,
+} from "../lib/cluster-usage/types.ts"
+
+/**
+ * Polling interval for NodeMetrics. Matches the default
+ * --metric-resolution of metrics-server (15s) plus a small buffer; a
+ * faster cadence returns identical values and wastes requests.
+ */
+export const CLUSTER_USAGE_METRICS_REFETCH_MS = 30_000
+
+export interface NodeSummary {
+  total: number
+  ready: number
+  notReady: number
+  schedulingDisabled: number
+}
+
+interface ClusterUsageData {
+  nodes: Node[]
+  pods: Pod[]
+  metrics: NodeMetrics[] | undefined
+  aggregates: AggregateResources
+  perNode: NodeRow[]
+  nodeSummary: NodeSummary
+  isLoading: boolean
+  /**
+   * The hook's primary error: a nodes-list failure. Pods and metrics
+   * failures are surfaced through their own flags so callers can degrade
+   * gracefully instead of replacing the whole page with an error block.
+   */
+  error: Error | null
+  /** HTTP status of `error`, if it was a K8sApiError. */
+  errorStatus: number | null
+  /** True when the cluster-wide pods list failed. Requested values are unreliable. */
+  podsUnavailable: boolean
+  metricsAvailable: boolean
+}
+
+/**
+ * Composite hook that powers the Cluster Usage admin page. Subscribes
+ * to nodes and pods via K8s watches (push-based updates, no polling),
+ * and — only when metrics.k8s.io is discovered on the cluster — polls
+ * NodeMetrics on a 30-second cadence. metrics.k8s.io is not watchable,
+ * so a refetch interval is the only option; the rest of the page works
+ * fine without it.
+ *
+ * The pods watch is cluster-wide and unfiltered. On a multi-thousand-
+ * pod cluster that is a few megabytes of JSON kept hot in memory plus
+ * continuous patch events. The trade-off is accepted for now because
+ * (a) Requested totals need every pod regardless of namespace, and
+ * (b) the watch already exists for the rest of the console. If the
+ * cost ever becomes painful, the natural follow-up is a field-selector
+ * projection on spec.nodeName + containers[*].resources.requests, or
+ * a server-side aggregation endpoint.
+ *
+ * A 403 on the metrics fetch is treated as 'no usage data, no
+ * page-level error' — the Used overlay disappears, the rest of the
+ * panel still renders. A pods-list error is surfaced through the
+ * `podsUnavailable` flag so the page can degrade gracefully. A
+ * nodes-list error is the only kind that takes over the page; everything
+ * downstream of it is undefined.
+ */
+export function useClusterUsageData(): ClusterUsageData {
+  const nodesQuery = useK8sList<Node>({
+    apiGroup: "",
+    apiVersion: "v1",
+    plural: "nodes",
+  })
+
+  const podsQuery = useK8sList<Pod>({
+    apiGroup: "",
+    apiVersion: "v1",
+    plural: "pods",
+  })
+
+  const { available: metricsAvailable, isLoading: metricsDiscoveryLoading } =
+    useApiGroupAvailable("metrics.k8s.io")
+
+  const metricsQuery = useK8sList<NodeMetrics>(
+    {
+      apiGroup: "metrics.k8s.io",
+      apiVersion: "v1beta1",
+      plural: "nodes",
+    },
+    {
+      enabled: metricsAvailable,
+      watch: false,
+      refetchInterval: CLUSTER_USAGE_METRICS_REFETCH_MS,
+    },
+  )
+
+  const nodes = useMemo<Node[]>(
+    () => nodesQuery.data?.items ?? [],
+    [nodesQuery.data],
+  )
+  const pods = useMemo<Pod[]>(() => podsQuery.data?.items ?? [], [podsQuery.data])
+  const metricsItems = useMemo(
+    () => metricsQueryItems(metricsQuery.data, metricsQuery.error),
+    [metricsQuery.data, metricsQuery.error],
+  )
+
+  const aggregates = useMemo(
+    () => aggregateNodeResources(nodes, pods, metricsItems),
+    [nodes, pods, metricsItems],
+  )
+  const perNode = useMemo(
+    () => derivePerNodeRows(nodes, pods, metricsItems),
+    [nodes, pods, metricsItems],
+  )
+  const nodeSummary = useMemo<NodeSummary>(() => {
+    let ready = 0
+    let notReady = 0
+    let schedulingDisabled = 0
+    for (const row of perNode) {
+      if (!row.ready) notReady++
+      else if (!row.schedulable) schedulingDisabled++
+      else ready++
+    }
+    return { total: perNode.length, ready, notReady, schedulingDisabled }
+  }, [perNode])
+
+  const nodesError = (nodesQuery.error as Error | null) ?? null
+  const errorStatus = nodesError instanceof K8sApiError ? nodesError.status : null
+
+  return {
+    nodes,
+    pods,
+    metrics: metricsItems,
+    aggregates,
+    perNode,
+    nodeSummary,
+    isLoading:
+      nodesQuery.isLoading || podsQuery.isLoading || metricsDiscoveryLoading,
+    // Pods and metrics errors are not promoted to page-level errors.
+    // The caller renders cell-level placeholders instead.
+    error: nodesError,
+    errorStatus,
+    podsUnavailable: podsQuery.error != null,
+    metricsAvailable,
+  }
+}
+
+function metricsQueryItems(
+  list: K8sList<NodeMetrics> | undefined,
+  error: unknown,
+): NodeMetrics[] | undefined {
+  if (error) return undefined
+  if (!list) return undefined
+  return list.items
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/index.css b/packages/system/dashboard/images/console/apps/console/src/index.css
new file mode 100644
index 0000000000..139255db26
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/index.css
@@ -0,0 +1 @@
+@import "@cozystack/ui/styles";
diff --git a/packages/system/dashboard/images/console/apps/console/src/lib/app-definitions.test.ts b/packages/system/dashboard/images/console/apps/console/src/lib/app-definitions.test.ts
new file mode 100644
index 0000000000..70f800a72b
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/lib/app-definitions.test.ts
@@ -0,0 +1,48 @@
+import { describe, it, expect } from "vitest"
+import { releasePrefix } from "./app-definitions.ts"
+import type { ApplicationDefinition } from "@cozystack/types"
+
+function ad(overrides: Partial<ApplicationDefinition> = {}): ApplicationDefinition {
+  return {
+    apiVersion: "cozystack.io/v1alpha1",
+    kind: "ApplicationDefinition",
+    metadata: { name: "virtual-machine" },
+    spec: {
+      application: {
+        kind: "VMInstance",
+        plural: "vminstances",
+        singular: "vm-instance",
+        openAPISchema: "{}",
+      },
+    },
+    ...overrides,
+  }
+}
+
+describe("releasePrefix", () => {
+  it("returns the explicit release.prefix when set", () => {
+    expect(
+      releasePrefix(
+        ad({
+          spec: {
+            application: {
+              kind: "VMInstance",
+              plural: "vminstances",
+              singular: "vm-instance",
+              openAPISchema: "{}",
+            },
+            release: { prefix: "custom-" },
+          },
+        }),
+      ),
+    ).toBe("custom-")
+  })
+
+  it("falls back to '<singular>-' when release.prefix is unset", () => {
+    expect(releasePrefix(ad())).toBe("vm-instance-")
+  })
+
+  it("falls back to '<metadata.name>-' when neither prefix nor spec is present", () => {
+    expect(releasePrefix(ad({ spec: undefined }))).toBe("virtual-machine-")
+  })
+})
diff --git a/packages/system/dashboard/images/console/apps/console/src/lib/app-definitions.ts b/packages/system/dashboard/images/console/apps/console/src/lib/app-definitions.ts
new file mode 100644
index 0000000000..a330b69132
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/lib/app-definitions.ts
@@ -0,0 +1,136 @@
+import { useMemo } from "react"
+import {
+  useK8sList,
+  type ResourceRef,
+  type K8sList,
+} from "@cozystack/k8s-client"
+import {
+  COZYSTACK_GROUP,
+  COZYSTACK_VERSION,
+  APPS_GROUP,
+  APPS_VERSION,
+  type ApplicationDefinition,
+  type ApplicationInstance,
+} from "@cozystack/types"
+
+const APPLICATION_DEFINITIONS_REF: ResourceRef = {
+  apiGroup: COZYSTACK_GROUP,
+  apiVersion: COZYSTACK_VERSION,
+  plural: "applicationdefinitions",
+}
+
+export function useApplicationDefinitions() {
+  return useK8sList<ApplicationDefinition>(APPLICATION_DEFINITIONS_REF)
+}
+
+export function useApplicationDefinition(name: string | undefined) {
+  const list = useApplicationDefinitions()
+  return {
+    ...list,
+    data: useMemo(
+      () => (name ? list.data?.items.find((i) => i.metadata.name === name) : undefined),
+      [list.data, name],
+    ),
+  }
+}
+
+export function appInstanceRef(ad: ApplicationDefinition, namespace?: string): ResourceRef {
+  return {
+    apiGroup: APPS_GROUP,
+    apiVersion: APPS_VERSION,
+    plural: ad.spec?.application.plural ?? "",
+    namespace,
+  }
+}
+
+export function useApplicationInstances(
+  ad: ApplicationDefinition | undefined,
+  namespace: string | undefined,
+) {
+  return useK8sList<ApplicationInstance>(
+    {
+      apiGroup: APPS_GROUP,
+      apiVersion: APPS_VERSION,
+      plural: ad?.spec?.application.plural ?? "",
+      namespace,
+    },
+    { enabled: !!ad && !!namespace && !!ad.spec?.application.plural },
+  )
+}
+
+/**
+ * Cozystack-native order: IaaS → PaaS → NaaS → Administration, with anything
+ * else appended alphabetically. Kept in one place so the sidebar, the
+ * marketplace and any future UI stay consistent.
+ */
+export const CATEGORY_ORDER = ["IaaS", "PaaS", "NaaS", "Administration"]
+
+export function compareCategories(a: string, b: string): number {
+  const ai = CATEGORY_ORDER.indexOf(a)
+  const bi = CATEGORY_ORDER.indexOf(b)
+  if (ai !== -1 && bi !== -1) return ai - bi
+  if (ai !== -1) return -1
+  if (bi !== -1) return 1
+  return a.localeCompare(b)
+}
+
+/**
+ * Group application definitions by `dashboard.category`. Undefined category is
+ * bucketed under "Other". Items inside a category are sorted alphabetically by
+ * name, categories follow the Cozystack canonical order.
+ */
+export function groupByCategory(
+  list: K8sList<ApplicationDefinition> | undefined,
+  opts: { includeModules?: boolean; includeTenant?: boolean } = {},
+): { category: string; items: ApplicationDefinition[] }[] {
+  if (!list) return []
+  const { includeModules = false, includeTenant = false } = opts
+  const map = new Map<string, ApplicationDefinition[]>()
+  for (const ad of list.items) {
+    if (!includeModules && isTenantModule(ad)) continue
+    if (!includeTenant && ad.spec?.application.kind === "Tenant") continue
+    const category = ad.spec?.dashboard?.category ?? "Other"
+    const bucket = map.get(category) ?? []
+    bucket.push(ad)
+    map.set(category, bucket)
+  }
+  return [...map.entries()]
+    .map(([category, items]) => ({
+      category,
+      items: items.sort((a, b) => a.metadata.name.localeCompare(b.metadata.name)),
+    }))
+    .sort((a, b) => compareCategories(a.category, b.category))
+}
+
+export function iconDataUrl(ad: ApplicationDefinition): string | undefined {
+  const icon = ad.spec?.dashboard?.icon
+  if (!icon) return undefined
+  return `data:image/svg+xml;base64,${icon}`
+}
+
+export function appDisplayName(ad: ApplicationDefinition): string {
+  return ad.spec?.application.kind ?? ad.metadata.name
+}
+
+/**
+ * The release prefix (usually `<kind>-`) is prepended to every resource created
+ * by the application chart (Deployments, Services, Secrets, ...). We use it to
+ * narrow list queries when we render a deployed application detail page.
+ */
+export function releasePrefix(ad: ApplicationDefinition): string {
+  return ad.spec?.release?.prefix ?? `${ad.spec?.application.singular ?? ad.metadata.name}-`
+}
+
+/**
+ * Tenant modules are singleton add-ons (etcd, ingress, monitoring,
+ * seaweedfs, info) enabled through Tenant.spec flags. They are recognised
+ * by `spec.dashboard.module === true` *and* `category === "Administration"`.
+ * The `module` flag alone isn't enough: Harbor is flagged `module: true`
+ * but sits under PaaS and is a regular multi-instance application.
+ */
+export function isTenantModule(ad: ApplicationDefinition): boolean {
+  return (
+    ad.spec?.dashboard?.module === true &&
+    ad.spec?.dashboard?.category === "Administration"
+  )
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/lib/app-resource.ts b/packages/system/dashboard/images/console/apps/console/src/lib/app-resource.ts
new file mode 100644
index 0000000000..14cf6641be
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/lib/app-resource.ts
@@ -0,0 +1,30 @@
+import {
+  APPS_GROUP,
+  APPS_VERSION,
+  type ApplicationDefinition,
+  type ApplicationInstance,
+} from "@cozystack/types"
+
+/**
+ * Compose a fully-qualified Kubernetes resource for an application.
+ *
+ * The object has the shape accepted by `POST /apis/apps.cozystack.io/v1alpha1
+ * /namespaces/<ns>/<plural>` and `PUT .../<name>` — i.e. the standard resource
+ * wrapper built from the AD's kind + the user-provided name and spec.
+ */
+export function composeResource(
+  ad: ApplicationDefinition,
+  namespace: string,
+  name: string,
+  spec: unknown,
+): ApplicationInstance {
+  return {
+    apiVersion: `${APPS_GROUP}/${APPS_VERSION}`,
+    kind: ad.spec?.application.kind ?? "",
+    metadata: {
+      name,
+      namespace,
+    },
+    spec: (spec ?? {}) as Record<string, unknown>,
+  }
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/lib/backup-utils.test.ts b/packages/system/dashboard/images/console/apps/console/src/lib/backup-utils.test.ts
new file mode 100644
index 0000000000..1ed6ce5734
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/lib/backup-utils.test.ts
@@ -0,0 +1,45 @@
+import { describe, it, expect } from "vitest"
+import { enrichSchemaWithEnums } from "./backup-utils.ts"
+
+describe("enrichSchemaWithEnums", () => {
+  it("returns non-object schemas unchanged", () => {
+    expect(enrichSchemaWithEnums(null, [], {})).toBeNull()
+    expect(enrichSchemaWithEnums("string", [], {})).toBe("string")
+  })
+
+  it("leaves the schema untouched when no path matches the enum map", () => {
+    const schema = { type: "string" }
+    expect(enrichSchemaWithEnums(schema, ["foo"], { bar: ["a", "b"] })).toEqual({
+      type: "string",
+    })
+  })
+
+  it("attaches enum values at a top-level path", () => {
+    const schema = { type: "string" }
+    expect(enrichSchemaWithEnums(schema, ["mode"], { mode: ["a", "b"] })).toEqual({
+      type: "string",
+      enum: ["a", "b"],
+    })
+  })
+
+  it("attaches enum values at a nested path", () => {
+    const schema = {
+      type: "object",
+      properties: { mode: { type: "string" } },
+    }
+    const result = enrichSchemaWithEnums(schema, ["spec"], {
+      "spec.mode": ["a", "b"],
+    })
+    expect(result.properties.mode).toEqual({ type: "string", enum: ["a", "b"] })
+  })
+
+  it("does not mutate the caller's path array", () => {
+    const path = ["spec"]
+    enrichSchemaWithEnums(
+      { properties: { mode: { type: "string" } } },
+      path,
+      { "spec.mode": ["a", "b"] },
+    )
+    expect(path).toEqual(["spec"])
+  })
+})
diff --git a/packages/system/dashboard/images/console/apps/console/src/lib/backup-utils.ts b/packages/system/dashboard/images/console/apps/console/src/lib/backup-utils.ts
new file mode 100644
index 0000000000..b555a8bb99
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/lib/backup-utils.ts
@@ -0,0 +1,32 @@
+export interface BackupFormRef {
+  apiGroup?: string
+  kind?: string
+  name?: string
+}
+
+export function enrichSchemaWithEnums(
+  schema: unknown,
+  path: string[],
+  enumMap: Record<string, string[]>
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+): any {
+  if (!schema || typeof schema !== "object") return schema
+
+  const currentPath = path.join(".")
+  const result = { ...(schema as Record<string, unknown>) }
+
+  if (enumMap[currentPath]) {
+    result.enum = enumMap[currentPath]
+  }
+
+  if (result.properties && typeof result.properties === "object") {
+    result.properties = Object.fromEntries(
+      Object.entries(result.properties as Record<string, unknown>).map(([key, value]) => [
+        key,
+        enrichSchemaWithEnums(value, [...path, key], enumMap),
+      ])
+    )
+  }
+
+  return result
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/lib/cluster-usage/aggregate.test.ts b/packages/system/dashboard/images/console/apps/console/src/lib/cluster-usage/aggregate.test.ts
new file mode 100644
index 0000000000..ff9dc6415a
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/lib/cluster-usage/aggregate.test.ts
@@ -0,0 +1,167 @@
+import { describe, it, expect } from "vitest"
+import { aggregateNodeResources } from "./aggregate.ts"
+import type { Node, Pod, NodeMetrics } from "./types.ts"
+
+function node(name: string, capacity: Record<string, string>): Node {
+  return {
+    apiVersion: "v1",
+    kind: "Node",
+    metadata: { name },
+    status: { capacity, allocatable: capacity, conditions: [] },
+  }
+}
+
+function pod(
+  name: string,
+  nodeName: string | undefined,
+  requests: Record<string, string>,
+): Pod {
+  return {
+    apiVersion: "v1",
+    kind: "Pod",
+    metadata: { name, namespace: "ns" },
+    spec: { nodeName, containers: [{ name: "c", resources: { requests } }] },
+  }
+}
+
+function metric(name: string, cpu: string, memory: string): NodeMetrics {
+  return {
+    apiVersion: "metrics.k8s.io/v1beta1",
+    kind: "NodeMetrics",
+    metadata: { name },
+    usage: { cpu, memory },
+  }
+}
+
+describe("aggregateNodeResources", () => {
+  it("returns zeroed standard totals for an empty cluster", () => {
+    const a = aggregateNodeResources([], [], undefined)
+    expect(a.standard.cpu).toEqual({ capacity: 0, allocatable: 0, requested: 0 })
+    expect(a.standard.memory).toEqual({ capacity: 0, allocatable: 0, requested: 0 })
+    expect(a.standard["ephemeral-storage"]).toEqual({
+      capacity: 0,
+      allocatable: 0,
+      requested: 0,
+    })
+    expect(a.standard.pods).toEqual({ capacity: 0, allocatable: 0, requested: 0 })
+    expect(a.extended).toEqual({})
+  })
+
+  it("sums capacity and allocatable across nodes", () => {
+    const a = aggregateNodeResources(
+      [
+        node("a", { cpu: "4", memory: "8Gi", "ephemeral-storage": "100Gi", pods: "110" }),
+        node("b", { cpu: "8", memory: "32Gi", "ephemeral-storage": "500Gi", pods: "220" }),
+      ],
+      [],
+      undefined,
+    )
+    expect(a.standard.cpu.capacity).toBe(12)
+    expect(a.standard.cpu.allocatable).toBe(12)
+    expect(a.standard.memory.capacity).toBe((8 + 32) * 1024 ** 3)
+    expect(a.standard.pods.capacity).toBe(330)
+  })
+
+  it("groups extended resource keys verbatim", () => {
+    const a = aggregateNodeResources(
+      [
+        node("a", { cpu: "4", "nvidia.com/gpu": "2" }),
+        node("b", { cpu: "8", "amd.com/gpu": "1" }),
+      ],
+      [],
+      undefined,
+    )
+    expect(a.extended["nvidia.com/gpu"].capacity).toBe(2)
+    expect(a.extended["amd.com/gpu"].capacity).toBe(1)
+  })
+
+  it("sums pod requests scoped to scheduled pods only", () => {
+    const a = aggregateNodeResources(
+      [node("a", { cpu: "8", memory: "16Gi" })],
+      [
+        pod("p1", "a", { cpu: "500m", memory: "1Gi" }),
+        pod("p2", "a", { cpu: "1", memory: "2Gi" }),
+        pod("unscheduled", undefined, { cpu: "100m", memory: "256Mi" }),
+      ],
+      undefined,
+    )
+    expect(a.standard.cpu.requested).toBe(1.5)
+    expect(a.standard.memory.requested).toBe(3 * 1024 ** 3)
+  })
+
+  it("skips pods scheduled on unknown nodes", () => {
+    const a = aggregateNodeResources(
+      [node("a", { cpu: "8" })],
+      [pod("rogue", "ghost-node", { cpu: "500m" })],
+      undefined,
+    )
+    expect(a.standard.cpu.requested).toBe(0)
+  })
+
+  it("excludes terminal (Succeeded/Failed) pods from requested totals", () => {
+    const terminal = (name: string, phase: string): Pod => ({
+      ...pod(name, "a", { cpu: "1", memory: "2Gi" }),
+      status: { phase },
+    })
+    const a = aggregateNodeResources(
+      [node("a", { cpu: "8", memory: "16Gi" })],
+      [
+        pod("running", "a", { cpu: "500m", memory: "1Gi" }),
+        terminal("completed", "Succeeded"),
+        terminal("crashed", "Failed"),
+      ],
+      undefined,
+    )
+    expect(a.standard.cpu.requested).toBe(0.5)
+    expect(a.standard.memory.requested).toBe(1024 ** 3)
+  })
+
+  it("sums extended-resource requests under the extended bucket", () => {
+    const a = aggregateNodeResources(
+      [node("a", { cpu: "8", "nvidia.com/gpu": "2" })],
+      [pod("p", "a", { cpu: "200m", "nvidia.com/gpu": "1" })],
+      undefined,
+    )
+    expect(a.extended["nvidia.com/gpu"].requested).toBe(1)
+  })
+
+  it("populates used for cpu and memory when metrics are supplied", () => {
+    const a = aggregateNodeResources(
+      [node("a", { cpu: "8", memory: "16Gi" })],
+      [],
+      [metric("a", "1500m", "4Gi")],
+    )
+    expect(a.standard.cpu.used).toBe(1.5)
+    expect(a.standard.memory.used).toBe(4 * 1024 ** 3)
+  })
+
+  it("reports cpu used in cores from nanocore metrics, not raw nanocores", () => {
+    const a = aggregateNodeResources(
+      [node("a", { cpu: "288", memory: "256Gi" })],
+      [],
+      [metric("a", "2785315627n", "14417112Ki")],
+    )
+    expect(a.standard.cpu.used).toBeCloseTo(2.785, 3)
+    expect(a.standard.memory.used).toBe(14417112 * 1024)
+  })
+
+  it("leaves used undefined when metrics is undefined", () => {
+    const a = aggregateNodeResources(
+      [node("a", { cpu: "8", memory: "16Gi" })],
+      [],
+      undefined,
+    )
+    expect(a.standard.cpu.used).toBeUndefined()
+    expect(a.standard.memory.used).toBeUndefined()
+  })
+
+  it("never reports used for ephemeral-storage or pods", () => {
+    const a = aggregateNodeResources(
+      [node("a", { cpu: "8", memory: "16Gi", "ephemeral-storage": "100Gi", pods: "110" })],
+      [],
+      [metric("a", "1", "2Gi")],
+    )
+    expect(a.standard["ephemeral-storage"].used).toBeUndefined()
+    expect(a.standard.pods.used).toBeUndefined()
+  })
+})
diff --git a/packages/system/dashboard/images/console/apps/console/src/lib/cluster-usage/aggregate.ts b/packages/system/dashboard/images/console/apps/console/src/lib/cluster-usage/aggregate.ts
new file mode 100644
index 0000000000..5b6b40ce31
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/lib/cluster-usage/aggregate.ts
@@ -0,0 +1,102 @@
+import { parseQuantity } from "../k8s-quantity.ts"
+import { getExtendedResourceKeys } from "./extended-resources.ts"
+import type {
+  AggregateResources,
+  Node,
+  NodeMetrics,
+  Pod,
+  ResourceTotals,
+  StandardResourceKey,
+} from "./types.ts"
+import { STANDARD_RESOURCE_KEYS, STANDARD_RESOURCE_KEY_SET } from "./types.ts"
+
+function emptyTotals(): ResourceTotals {
+  return { capacity: 0, allocatable: 0, requested: 0 }
+}
+
+/**
+ * Whether a pod contributes to requested totals: it must be scheduled to a
+ * known node and not terminal. Terminal pods (Succeeded/Failed) still appear in
+ * API lists but no longer hold schedulable requests, and unscheduled/orphaned
+ * pods aren't attributable to cluster capacity — counting either would inflate
+ * the totals. Shared with the per-resource drill-down so its "Requested" tally
+ * reconciles with this aggregate (only requests count, never limits).
+ */
+export function podCountsTowardRequested(pod: Pod, knownNodes: Set<string>): boolean {
+  const nodeName = pod.spec?.nodeName
+  if (!nodeName || !knownNodes.has(nodeName)) return false
+  const phase = pod.status?.phase
+  return phase !== "Succeeded" && phase !== "Failed"
+}
+
+/**
+ * Computes cluster-wide totals for every standard and extended resource.
+ *
+ * Capacity and allocatable are summed from each node's status maps.
+ * Requested is summed only from pods that are scheduled (have a
+ * spec.nodeName) and whose nodeName actually appears in the node list;
+ * unscheduled or orphaned pods are skipped so the per-node and aggregate
+ * numbers stay reconcilable.
+ *
+ * Used is only populated for cpu and memory, mirroring what
+ * metrics.k8s.io reports; ephemeral-storage and pods never get a 'used'
+ * value because the API simply does not expose one.
+ */
+export function aggregateNodeResources(
+  nodes: Node[],
+  pods: Pod[],
+  metrics: NodeMetrics[] | undefined,
+): AggregateResources {
+  const standard: Record<StandardResourceKey, ResourceTotals> = {
+    cpu: emptyTotals(),
+    memory: emptyTotals(),
+    "ephemeral-storage": emptyTotals(),
+    pods: emptyTotals(),
+  }
+  const extended: Record<string, ResourceTotals> = {}
+  const knownNodes = new Set(nodes.map((n) => n.metadata.name))
+  const extendedKeys = getExtendedResourceKeys(nodes)
+  for (const key of extendedKeys) extended[key] = emptyTotals()
+
+  for (const node of nodes) {
+    const capacity = node.status?.capacity ?? {}
+    const allocatable = node.status?.allocatable ?? {}
+    for (const key of STANDARD_RESOURCE_KEYS) {
+      standard[key].capacity += parseQuantity(capacity[key] ?? "0")
+      standard[key].allocatable += parseQuantity(allocatable[key] ?? "0")
+    }
+    for (const key of extendedKeys) {
+      extended[key].capacity += parseQuantity(capacity[key] ?? "0")
+      extended[key].allocatable += parseQuantity(allocatable[key] ?? "0")
+    }
+  }
+
+  for (const pod of pods) {
+    if (!podCountsTowardRequested(pod, knownNodes)) continue
+    for (const container of pod.spec?.containers ?? []) {
+      const requests = container.resources?.requests
+      if (!requests) continue
+      for (const [key, value] of Object.entries(requests)) {
+        if (STANDARD_RESOURCE_KEY_SET.has(key)) {
+          standard[key as StandardResourceKey].requested += parseQuantity(value)
+        } else if (extended[key]) {
+          extended[key].requested += parseQuantity(value)
+        }
+      }
+    }
+  }
+
+  if (metrics) {
+    let cpuUsed = 0
+    let memoryUsed = 0
+    for (const m of metrics) {
+      if (!knownNodes.has(m.metadata.name)) continue
+      cpuUsed += parseQuantity(m.usage?.cpu ?? "0")
+      memoryUsed += parseQuantity(m.usage?.memory ?? "0")
+    }
+    standard.cpu.used = cpuUsed
+    standard.memory.used = memoryUsed
+  }
+
+  return { standard, extended }
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/lib/cluster-usage/extended-resources.test.ts b/packages/system/dashboard/images/console/apps/console/src/lib/cluster-usage/extended-resources.test.ts
new file mode 100644
index 0000000000..0ced00bdb1
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/lib/cluster-usage/extended-resources.test.ts
@@ -0,0 +1,76 @@
+import { describe, it, expect } from "vitest"
+import { getExtendedResourceKeys } from "./extended-resources.ts"
+import type { Node } from "./types.ts"
+
+function makeNode(name: string, capacity: Record<string, string>): Node {
+  return {
+    apiVersion: "v1",
+    kind: "Node",
+    metadata: { name },
+    status: { capacity },
+  }
+}
+
+describe("getExtendedResourceKeys", () => {
+  it("returns an empty array for no nodes", () => {
+    expect(getExtendedResourceKeys([])).toEqual([])
+  })
+
+  it("strips out standard resources cpu, memory, ephemeral-storage, pods", () => {
+    const nodes = [
+      makeNode("a", {
+        cpu: "8",
+        memory: "32Gi",
+        "ephemeral-storage": "500Gi",
+        pods: "110",
+      }),
+    ]
+    expect(getExtendedResourceKeys(nodes)).toEqual([])
+  })
+
+  it("strips hugepages-* in any variant", () => {
+    const nodes = [
+      makeNode("a", {
+        cpu: "8",
+        "hugepages-2Mi": "0",
+        "hugepages-1Gi": "0",
+      }),
+    ]
+    expect(getExtendedResourceKeys(nodes)).toEqual([])
+  })
+
+  it("collects extended keys verbatim", () => {
+    const nodes = [makeNode("a", { cpu: "8", "nvidia.com/gpu": "1" })]
+    expect(getExtendedResourceKeys(nodes)).toEqual(["nvidia.com/gpu"])
+  })
+
+  it("dedupes keys appearing on multiple nodes", () => {
+    const nodes = [
+      makeNode("a", { "nvidia.com/gpu": "1" }),
+      makeNode("b", { "nvidia.com/gpu": "2" }),
+    ]
+    expect(getExtendedResourceKeys(nodes)).toEqual(["nvidia.com/gpu"])
+  })
+
+  it("sorts keys alphabetically for stable rendering", () => {
+    const nodes = [
+      makeNode("a", { "nvidia.com/gpu": "1" }),
+      makeNode("b", { "amd.com/gpu": "1", "hami.io/vgpu": "4" }),
+    ]
+    expect(getExtendedResourceKeys(nodes)).toEqual([
+      "amd.com/gpu",
+      "hami.io/vgpu",
+      "nvidia.com/gpu",
+    ])
+  })
+
+  it("ignores nodes without status.capacity", () => {
+    const node: Node = {
+      apiVersion: "v1",
+      kind: "Node",
+      metadata: { name: "drained" },
+    }
+    expect(getExtendedResourceKeys([node])).toEqual([])
+  })
+})
+
diff --git a/packages/system/dashboard/images/console/apps/console/src/lib/cluster-usage/extended-resources.ts b/packages/system/dashboard/images/console/apps/console/src/lib/cluster-usage/extended-resources.ts
new file mode 100644
index 0000000000..a8b06f7eea
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/lib/cluster-usage/extended-resources.ts
@@ -0,0 +1,22 @@
+import { isExtendedResourceKey } from "./types.ts"
+import type { Node } from "./types.ts"
+
+/**
+ * Returns the sorted, deduplicated set of extended-resource keys present
+ * in any node's `status.capacity` across the cluster. Standard scheduler
+ * resources (cpu, memory, ephemeral-storage, pods) and every hugepages-*
+ * variant are filtered out — the rest is whatever the cluster exposes,
+ * rendered verbatim. There is intentionally no vendor allow-list: a new
+ * accelerator surfaces in the UI the moment a node exposing it joins.
+ */
+export function getExtendedResourceKeys(nodes: Node[]): string[] {
+  const set = new Set<string>()
+  for (const node of nodes) {
+    const capacity = node.status?.capacity
+    if (!capacity) continue
+    for (const key of Object.keys(capacity)) {
+      if (isExtendedResourceKey(key)) set.add(key)
+    }
+  }
+  return [...set].sort()
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/lib/cluster-usage/per-node.test.ts b/packages/system/dashboard/images/console/apps/console/src/lib/cluster-usage/per-node.test.ts
new file mode 100644
index 0000000000..ba888cdced
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/lib/cluster-usage/per-node.test.ts
@@ -0,0 +1,229 @@
+import { describe, it, expect, vi, beforeAll, afterAll } from "vitest"
+import { derivePerNodeRows } from "./per-node.ts"
+import type { Node, Pod, NodeMetrics } from "./types.ts"
+
+beforeAll(() => {
+  vi.useFakeTimers()
+  vi.setSystemTime(new Date("2026-05-26T00:00:00Z"))
+})
+
+afterAll(() => {
+  vi.useRealTimers()
+})
+
+function nodeWith(
+  name: string,
+  fields: {
+    capacity?: Record<string, string>
+    allocatable?: Record<string, string>
+    labels?: Record<string, string>
+    ready?: boolean
+    pressure?: string[]
+    unschedulable?: boolean
+    taints?: Array<{ key: string; value?: string; effect: string }>
+    creationTimestamp?: string
+  } = {},
+): Node {
+  const capacity = fields.capacity ?? { cpu: "4", memory: "8Gi" }
+  const allocatable = fields.allocatable ?? capacity
+  const conditions: Node["status"] = { capacity, allocatable, conditions: [] }
+  conditions.conditions?.push({
+    type: "Ready",
+    status: fields.ready === false ? "False" : "True",
+  })
+  for (const p of fields.pressure ?? []) {
+    conditions.conditions?.push({ type: p, status: "True" })
+  }
+  return {
+    apiVersion: "v1",
+    kind: "Node",
+    metadata: {
+      name,
+      labels: fields.labels,
+      creationTimestamp: fields.creationTimestamp ?? "2026-05-25T00:00:00Z",
+    },
+    spec: { unschedulable: fields.unschedulable, taints: fields.taints },
+    status: conditions,
+  } as Node
+}
+
+function pod(
+  name: string,
+  nodeName: string | undefined,
+  requests: Record<string, string>,
+): Pod {
+  return {
+    apiVersion: "v1",
+    kind: "Pod",
+    metadata: { name, namespace: "ns" },
+    spec: { nodeName, containers: [{ name: "c", resources: { requests } }] },
+  }
+}
+
+function metric(name: string, cpu: string, memory: string): NodeMetrics {
+  return {
+    apiVersion: "metrics.k8s.io/v1beta1",
+    kind: "NodeMetrics",
+    metadata: { name },
+    usage: { cpu, memory },
+  }
+}
+
+describe("derivePerNodeRows", () => {
+  it("returns one row per node, sorted by name", () => {
+    const rows = derivePerNodeRows(
+      [nodeWith("b"), nodeWith("a"), nodeWith("c")],
+      [],
+      undefined,
+    )
+    expect(rows.map((r) => r.name)).toEqual(["a", "b", "c"])
+  })
+
+  it("computes age relative to the stubbed clock", () => {
+    const rows = derivePerNodeRows(
+      [nodeWith("a", { creationTimestamp: "2026-05-25T03:00:00Z" })],
+      [],
+      undefined,
+    )
+    expect(rows[0].age).toBe("21h")
+  })
+
+  it("detects ready vs notready conditions", () => {
+    const rows = derivePerNodeRows(
+      [nodeWith("a", { ready: true }), nodeWith("b", { ready: false })],
+      [],
+      undefined,
+    )
+    expect(rows[0].ready).toBe(true)
+    expect(rows[1].ready).toBe(false)
+  })
+
+  it("collects pressure conditions with status=True", () => {
+    const rows = derivePerNodeRows(
+      [nodeWith("a", { pressure: ["MemoryPressure", "DiskPressure"] })],
+      [],
+      undefined,
+    )
+    expect(rows[0].pressureConditions).toEqual(["MemoryPressure", "DiskPressure"])
+  })
+
+  it("derives roles from node-role.kubernetes.io labels", () => {
+    const rows = derivePerNodeRows(
+      [
+        nodeWith("a", {
+          labels: {
+            "node-role.kubernetes.io/control-plane": "",
+            "node-role.kubernetes.io/worker": "",
+          },
+        }),
+      ],
+      [],
+      undefined,
+    )
+    expect(rows[0].roles.sort()).toEqual(["control-plane", "worker"])
+  })
+
+  it("falls back to kubernetes.io/role label when present", () => {
+    const rows = derivePerNodeRows(
+      [nodeWith("a", { labels: { "kubernetes.io/role": "ingress" } })],
+      [],
+      undefined,
+    )
+    expect(rows[0].roles).toEqual(["ingress"])
+  })
+
+  it("returns no roles for a label-less node", () => {
+    const rows = derivePerNodeRows([nodeWith("a", { labels: {} })], [], undefined)
+    expect(rows[0].roles).toEqual([])
+  })
+
+  it("filters out an empty role suffix (`node-role.kubernetes.io/=`)", () => {
+    const rows = derivePerNodeRows(
+      [nodeWith("a", { labels: { "node-role.kubernetes.io/": "" } })],
+      [],
+      undefined,
+    )
+    expect(rows[0].roles).toEqual([])
+  })
+
+  it("reports schedulable=false when spec.unschedulable=true", () => {
+    const rows = derivePerNodeRows(
+      [nodeWith("a", { unschedulable: true })],
+      [],
+      undefined,
+    )
+    expect(rows[0].schedulable).toBe(false)
+  })
+
+  it("collects taint keys when present", () => {
+    const rows = derivePerNodeRows(
+      [
+        nodeWith("a", {
+          taints: [{ key: "node.kubernetes.io/unschedulable", effect: "NoSchedule" }],
+        }),
+      ],
+      [],
+      undefined,
+    )
+    expect(rows[0].taints).toEqual(["node.kubernetes.io/unschedulable"])
+  })
+
+  it("scopes requested totals to pods scheduled on that node", () => {
+    const rows = derivePerNodeRows(
+      [
+        nodeWith("a", { capacity: { cpu: "8", memory: "16Gi" } }),
+        nodeWith("b", { capacity: { cpu: "8", memory: "16Gi" } }),
+      ],
+      [
+        pod("p1", "a", { cpu: "500m", memory: "1Gi" }),
+        pod("p2", "b", { cpu: "1", memory: "4Gi" }),
+      ],
+      undefined,
+    )
+    expect(rows[0].standard.cpu.requested).toBe(0.5)
+    expect(rows[1].standard.cpu.requested).toBe(1)
+  })
+
+  it("populates used per node when metrics are supplied", () => {
+    const rows = derivePerNodeRows(
+      [nodeWith("a", { capacity: { cpu: "8", memory: "16Gi" } })],
+      [],
+      [metric("a", "1500m", "4Gi")],
+    )
+    expect(rows[0].standard.cpu.used).toBe(1.5)
+    expect(rows[0].standard.memory.used).toBe(4 * 1024 ** 3)
+  })
+
+  it("reports cpu used in cores from nanocore metrics, not raw nanocores", () => {
+    const rows = derivePerNodeRows(
+      [nodeWith("a", { capacity: { cpu: "288", memory: "256Gi" } })],
+      [],
+      [metric("a", "2785315627n", "14417112Ki")],
+    )
+    expect(rows[0].standard.cpu.used).toBeCloseTo(2.785, 3)
+    expect(rows[0].standard.memory.used).toBe(14417112 * 1024)
+  })
+
+  it("leaves used undefined per node when metrics are undefined", () => {
+    const rows = derivePerNodeRows(
+      [nodeWith("a", { capacity: { cpu: "8", memory: "16Gi" } })],
+      [],
+      undefined,
+    )
+    expect(rows[0].standard.cpu.used).toBeUndefined()
+  })
+
+  it("includes extended-resource columns per node", () => {
+    const rows = derivePerNodeRows(
+      [
+        nodeWith("a", { capacity: { cpu: "8", "nvidia.com/gpu": "1" } }),
+        nodeWith("b", { capacity: { cpu: "8" } }),
+      ],
+      [pod("p", "a", { "nvidia.com/gpu": "1" })],
+      undefined,
+    )
+    expect(rows[0].extended["nvidia.com/gpu"].capacity).toBe(1)
+    expect(rows[0].extended["nvidia.com/gpu"].requested).toBe(1)
+    expect(rows[1].extended["nvidia.com/gpu"]).toBeUndefined()
+  })
+})
diff --git a/packages/system/dashboard/images/console/apps/console/src/lib/cluster-usage/per-node.ts b/packages/system/dashboard/images/console/apps/console/src/lib/cluster-usage/per-node.ts
new file mode 100644
index 0000000000..921a7b5bd9
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/lib/cluster-usage/per-node.ts
@@ -0,0 +1,143 @@
+import { parseQuantity } from "../k8s-quantity.ts"
+import { formatAge } from "../status.ts"
+import {
+  STANDARD_RESOURCE_KEYS,
+  STANDARD_RESOURCE_KEY_SET,
+  isExtendedResourceKey,
+} from "./types.ts"
+import type {
+  Node,
+  NodeMetrics,
+  NodeRow,
+  Pod,
+  ResourceTotals,
+  StandardResourceKey,
+} from "./types.ts"
+
+const PRESSURE_TYPES = new Set([
+  "MemoryPressure",
+  "DiskPressure",
+  "PIDPressure",
+  "NetworkUnavailable",
+])
+
+function rolesFromLabels(labels: Record<string, string> | undefined): string[] {
+  if (!labels) return []
+  const roles = new Set<string>()
+  const PREFIX = "node-role.kubernetes.io/"
+  for (const key of Object.keys(labels)) {
+    if (key.startsWith(PREFIX)) {
+      const role = key.slice(PREFIX.length)
+      // Some clusters write `node-role.kubernetes.io/=...` with an empty
+      // role part; skip those to avoid an empty pill in the UI.
+      if (role.length > 0) roles.add(role)
+    }
+  }
+  if (roles.size === 0) {
+    const legacy = labels["kubernetes.io/role"]
+    if (legacy) roles.add(legacy)
+  }
+  return [...roles]
+}
+
+function emptyTotals(): ResourceTotals {
+  return { capacity: 0, allocatable: 0, requested: 0 }
+}
+
+/**
+ * Builds one NodeRow per cluster node, sorted by name. Each row carries
+ * the totals for that node only — capacity and allocatable from
+ * node.status, requested summed from pods bound to that node, and used
+ * from the matching NodeMetrics entry when metrics are supplied.
+ *
+ * Pods without a spec.nodeName or scheduled on an unknown node are
+ * skipped so per-node requested totals stay consistent with the
+ * cluster-wide aggregate computed by aggregateNodeResources.
+ */
+export function derivePerNodeRows(
+  nodes: Node[],
+  pods: Pod[],
+  metrics: NodeMetrics[] | undefined,
+): NodeRow[] {
+  const metricsByName = new Map<string, NodeMetrics>()
+  for (const m of metrics ?? []) {
+    metricsByName.set(m.metadata.name, m)
+  }
+
+  const podsByNode = new Map<string, Pod[]>()
+  for (const pod of pods) {
+    const nodeName = pod.spec?.nodeName
+    if (!nodeName) continue
+    const bucket = podsByNode.get(nodeName) ?? []
+    bucket.push(pod)
+    podsByNode.set(nodeName, bucket)
+  }
+
+  const rows: NodeRow[] = []
+  for (const node of nodes) {
+    const capacity = node.status?.capacity ?? {}
+    const allocatable = node.status?.allocatable ?? {}
+    const standard: Record<StandardResourceKey, ResourceTotals> = {
+      cpu: emptyTotals(),
+      memory: emptyTotals(),
+      "ephemeral-storage": emptyTotals(),
+      pods: emptyTotals(),
+    }
+    const extended: Record<string, ResourceTotals> = {}
+
+    for (const key of STANDARD_RESOURCE_KEYS) {
+      standard[key].capacity = parseQuantity(capacity[key] ?? "0")
+      standard[key].allocatable = parseQuantity(allocatable[key] ?? "0")
+    }
+    for (const key of Object.keys(capacity)) {
+      if (!isExtendedResourceKey(key)) continue
+      extended[key] = {
+        capacity: parseQuantity(capacity[key] ?? "0"),
+        allocatable: parseQuantity(allocatable[key] ?? "0"),
+        requested: 0,
+      }
+    }
+
+    for (const pod of podsByNode.get(node.metadata.name) ?? []) {
+      for (const container of pod.spec?.containers ?? []) {
+        const requests = container.resources?.requests
+        if (!requests) continue
+        for (const [key, value] of Object.entries(requests)) {
+          if (STANDARD_RESOURCE_KEY_SET.has(key)) {
+            standard[key as StandardResourceKey].requested += parseQuantity(value)
+          } else if (extended[key]) {
+            extended[key].requested += parseQuantity(value)
+          }
+        }
+      }
+    }
+
+    const metric = metricsByName.get(node.metadata.name)
+    if (metric) {
+      standard.cpu.used = parseQuantity(metric.usage?.cpu ?? "0")
+      standard.memory.used = parseQuantity(metric.usage?.memory ?? "0")
+    }
+
+    const conditions = node.status?.conditions ?? []
+    const readyCondition = conditions.find((c) => c.type === "Ready")
+    const pressureConditions = conditions
+      .filter((c) => PRESSURE_TYPES.has(c.type) && c.status === "True")
+      .map((c) => c.type)
+
+    rows.push({
+      name: node.metadata.name,
+      ready: readyCondition?.status === "True",
+      schedulable: !node.spec?.unschedulable,
+      pressureConditions,
+      roles: rolesFromLabels(node.metadata.labels),
+      taints: (node.spec?.taints ?? []).map((t) => t.key),
+      age: formatAge(node.metadata.creationTimestamp),
+      creationTimestamp: node.metadata.creationTimestamp,
+      standard,
+      extended,
+    })
+  }
+
+  rows.sort((a, b) => a.name.localeCompare(b.name))
+  return rows
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/lib/cluster-usage/types.ts b/packages/system/dashboard/images/console/apps/console/src/lib/cluster-usage/types.ts
new file mode 100644
index 0000000000..b9087157de
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/lib/cluster-usage/types.ts
@@ -0,0 +1,135 @@
+import type { K8sResource } from "@cozystack/k8s-client"
+
+/**
+ * Minimal Kubernetes Node shape needed by the cluster-usage page. Only
+ * the fields the page actually reads are declared; the rest of the K8s
+ * Node object is ignored. Status fields are optional to match the
+ * realistic case where a NotReady node may not have populated all of
+ * its capacity / allocatable map yet.
+ */
+
+export interface NodeCondition {
+  type: string
+  status: "True" | "False" | "Unknown"
+  reason?: string
+  message?: string
+  lastTransitionTime?: string
+}
+
+export interface NodeStatus {
+  capacity?: Record<string, string>
+  allocatable?: Record<string, string>
+  conditions?: NodeCondition[]
+}
+
+export interface NodeTaint {
+  key: string
+  value?: string
+  effect: string
+  timeAdded?: string
+}
+
+export interface NodeSpec {
+  unschedulable?: boolean
+  taints?: NodeTaint[]
+  providerID?: string
+}
+
+export type Node = K8sResource<NodeSpec, NodeStatus>
+
+export interface PodContainer {
+  name: string
+  resources?: {
+    requests?: Record<string, string>
+    limits?: Record<string, string>
+  }
+}
+
+export interface PodSpec {
+  nodeName?: string
+  containers: PodContainer[]
+}
+
+export interface PodStatus {
+  phase?: string
+}
+
+export type Pod = K8sResource<PodSpec, PodStatus>
+
+export interface PvcSpec {
+  storageClassName?: string
+  resources?: { requests?: Record<string, string> }
+}
+
+export interface PvcStatus {
+  phase?: string
+  capacity?: Record<string, string>
+}
+
+export type Pvc = K8sResource<PvcSpec, PvcStatus>
+
+export interface NodeMetricsUsage {
+  cpu: string
+  memory: string
+}
+
+export type NodeMetrics = K8sResource<unknown, unknown> & {
+  usage?: NodeMetricsUsage
+  timestamp?: string
+  window?: string
+}
+
+/**
+ * Standard, well-known resource keys present in node.status.capacity.
+ * Everything else is treated as an extended resource and rendered
+ * verbatim by the cluster-usage page.
+ */
+export const STANDARD_RESOURCE_KEYS = ["cpu", "memory", "ephemeral-storage", "pods"] as const
+
+export type StandardResourceKey = (typeof STANDARD_RESOURCE_KEYS)[number]
+
+export const STANDARD_RESOURCE_KEY_SET: ReadonlySet<string> = new Set(STANDARD_RESOURCE_KEYS)
+
+/**
+ * Whether a key from `node.status.capacity` should be treated as an
+ * extended resource. Standard scheduler resources and every hugepages-*
+ * variant return false; everything else returns true.
+ */
+export function isExtendedResourceKey(key: string): boolean {
+  if (STANDARD_RESOURCE_KEY_SET.has(key)) return false
+  if (key.startsWith("hugepages-")) return false
+  return true
+}
+
+/** A resource snapshot in canonical units — cores for CPU, bytes elsewhere. */
+export interface ResourceTotals {
+  capacity: number
+  allocatable: number
+  requested: number
+  /** Present only when metrics.k8s.io reported a usage figure for this resource. */
+  used?: number
+}
+
+export interface AggregateResources {
+  /** Standard resources keyed by their canonical name. */
+  standard: Record<StandardResourceKey, ResourceTotals>
+  /** Extended resources keyed by their full Kubernetes key (e.g. `nvidia.com/gpu`). */
+  extended: Record<string, ResourceTotals>
+}
+
+export interface NodeRow {
+  name: string
+  ready: boolean
+  schedulable: boolean
+  /** Free-form condition types found with status=True, e.g. MemoryPressure. */
+  pressureConditions: string[]
+  /** Roles inferred from `node-role.kubernetes.io/*` and `kubernetes.io/role` labels. */
+  roles: string[]
+  taints: string[]
+  age: string
+  creationTimestamp?: string
+  /** Standard resource totals on this single node. */
+  standard: Record<StandardResourceKey, ResourceTotals>
+  /** Extended resource totals on this single node, keyed by full key. */
+  extended: Record<string, ResourceTotals>
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/lib/config.test.ts b/packages/system/dashboard/images/console/apps/console/src/lib/config.test.ts
new file mode 100644
index 0000000000..44cbe07e39
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/lib/config.test.ts
@@ -0,0 +1,97 @@
+import { describe, it, expect, vi, afterEach } from "vitest"
+import { loadConfig } from "./config.ts"
+
+type Route = (url: string) => Response | undefined
+
+function mockFetch(route: Route) {
+  const spy = vi.fn(async (input: string | URL) => {
+    const url = typeof input === "string" ? input : input.toString()
+    const resp = route(url)
+    if (!resp) throw new Error(`network error: ${url}`)
+    return resp
+  })
+  vi.stubGlobal("fetch", spy)
+  return spy
+}
+
+function json(body: unknown): Response {
+  return new Response(JSON.stringify(body), {
+    status: 200,
+    headers: { "Content-Type": "application/json" },
+  })
+}
+
+const STATIC = "/branding/config.json"
+const API = "/api/v1/namespaces/cozy-dashboard/configmaps/cozy-dashboard-console-config"
+
+afterEach(() => {
+  vi.unstubAllGlobals()
+})
+
+describe("loadConfig", () => {
+  it("reads branding from the static asset without touching the kube-api", async () => {
+    const fetchSpy = mockFetch((url) =>
+      url === STATIC ? json({ titleText: "Acme", logoText: "Acme Cloud" }) : undefined,
+    )
+    const cfg = await loadConfig()
+    expect(cfg).toEqual({ titleText: "Acme", logoText: "Acme Cloud" })
+    expect(fetchSpy).toHaveBeenCalledTimes(1)
+    expect(fetchSpy.mock.calls[0][0]).toBe(STATIC)
+  })
+
+  it("uses the static asset even when branding is empty, never falling through to the kube-api", async () => {
+    const fetchSpy = mockFetch((url) => (url === STATIC ? json({}) : json({ data: {} })))
+    const cfg = await loadConfig()
+    expect(cfg).toEqual({})
+    expect(fetchSpy.mock.calls.every((c) => c[0] === STATIC)).toBe(true)
+  })
+
+  it("falls back to the kube-api ConfigMap when the static asset is missing", async () => {
+    mockFetch((url) => {
+      if (url === STATIC) return new Response("not found", { status: 404 })
+      if (url === API) return json({ data: { "config.json": JSON.stringify({ titleText: "Fallback" }) } })
+      return undefined
+    })
+    const cfg = await loadConfig()
+    expect(cfg).toEqual({ titleText: "Fallback" })
+  })
+
+  it("falls back to the kube-api when the static path serves the SPA index.html", async () => {
+    mockFetch((url) => {
+      // A chart without the mount serves index.html (HTML, not JSON) at 200.
+      if (url === STATIC) return new Response("<!doctype html><html></html>", { status: 200 })
+      if (url === API) return json({ data: { "config.json": JSON.stringify({ logoText: "FromApi" }) } })
+      return undefined
+    })
+    const cfg = await loadConfig()
+    expect(cfg).toEqual({ logoText: "FromApi" })
+  })
+
+  it("ignores a JSON body served at a non-200 status and falls back", async () => {
+    // A branded-looking error body must not be mistaken for config.
+    mockFetch((url) => {
+      if (url === STATIC) return new Response(JSON.stringify({ titleText: "Error" }), { status: 503 })
+      if (url === API) return json({ data: { "config.json": JSON.stringify({ titleText: "FromApi" }) } })
+      return undefined
+    })
+    const cfg = await loadConfig()
+    expect(cfg).toEqual({ titleText: "FromApi" })
+  })
+
+  it("ignores a JSON scalar at 200 and falls back", async () => {
+    // typeof 5 !== "object": a scalar body is not a config object.
+    mockFetch((url) => {
+      if (url === STATIC) return json(5)
+      if (url === API) return json({ data: { "config.json": JSON.stringify({ titleText: "FromApi" }) } })
+      return undefined
+    })
+    const cfg = await loadConfig()
+    expect(cfg).toEqual({ titleText: "FromApi" })
+  })
+
+  it("returns an empty config when neither source is available", async () => {
+    mockFetch(() => undefined)
+    const cfg = await loadConfig()
+    expect(cfg).toEqual({})
+  })
+})
diff --git a/packages/system/dashboard/images/console/apps/console/src/lib/config.ts b/packages/system/dashboard/images/console/apps/console/src/lib/config.ts
new file mode 100644
index 0000000000..9d60354119
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/lib/config.ts
@@ -0,0 +1,92 @@
+import { createContext, useContext } from "react"
+
+export interface AppConfig {
+  titleText?: string
+  footerText?: string
+  logoText?: string
+  logoSvg?: string
+  iconSvg?: string
+  // Platform version injected at deploy time by the chart (from the console
+  // image tag), so a promoted-by-retag image reports the stable version rather
+  // than the rc version baked into the bundle at build. Falls back to the
+  // build-time VITE_APP_VERSION when absent.
+  version?: string
+  // DNS suffix shown after a LoadBalancer Service name on the Services tab.
+  // Absent when the platform leaves publishing.serviceDomain empty; the tab
+  // then shows no hostname.
+  serviceDomain?: string
+}
+
+export const AppConfigContext = createContext<AppConfig>({})
+
+export function useAppConfig(): AppConfig {
+  return useContext(AppConfigContext)
+}
+
+const CONFIG_NAMESPACE = "cozy-dashboard"
+const CONFIG_MAP_NAME = "cozy-dashboard-console-config"
+
+// Branding served as a static asset by the console, mounted from the same
+// ConfigMap. Read with no kube-api call at all, so branding renders even when
+// the apiserver rejects the session's token (a dashboard login the kube-api
+// does not authenticate) and without depending on the console-config-reader
+// RBAC that the kube-api read otherwise needs.
+const BRANDING_STATIC_PATH = "/branding/config.json"
+
+// Static-first has two static-fetch outcomes and both are instant: the mounted
+// file returns 200 JSON, or (chart without the mount) nginx serves index.html.
+// The only slow path is a partially-stalled pod; a short budget then caps the
+// static leg before the kube-api fallback, so worst case is this + the API's 5s
+// rather than 5s + 5s. On the shipped chart the fallback never runs.
+const BRANDING_STATIC_TIMEOUT_MS = 1500
+
+function fetchWithTimeout(url: string, ms = 5000): Promise<Response> {
+  const ctrl = new AbortController()
+  const timer = setTimeout(() => ctrl.abort(), ms)
+  return fetch(url, { signal: ctrl.signal }).finally(() => clearTimeout(timer))
+}
+
+export async function loadConfig(): Promise<AppConfig> {
+  const fromStatic = await loadStaticConfig()
+  if (fromStatic) return fromStatic
+  return loadConfigFromApi()
+}
+
+async function loadStaticConfig(): Promise<AppConfig | undefined> {
+  try {
+    const resp = await fetchWithTimeout(BRANDING_STATIC_PATH, BRANDING_STATIC_TIMEOUT_MS)
+    if (!resp.ok) return undefined
+    const cfg: unknown = await resp.json()
+    // A chart without the branding mount serves the SPA index.html here; its
+    // non-JSON body throws above, so only a real config object reaches this.
+    return cfg && typeof cfg === "object" ? (cfg as AppConfig) : undefined
+  } catch {
+    return undefined
+  }
+}
+
+async function loadConfigFromApi(): Promise<AppConfig> {
+  try {
+    const resp = await fetchWithTimeout(
+      `/api/v1/namespaces/${CONFIG_NAMESPACE}/configmaps/${CONFIG_MAP_NAME}`,
+    )
+    if (!resp.ok) return {}
+    const cm = await resp.json()
+    const raw = cm?.data?.["config.json"]
+    if (!raw) return {}
+    return JSON.parse(raw) as AppConfig
+  } catch {
+    return {}
+  }
+}
+
+export async function loadUsername(): Promise<string | undefined> {
+  try {
+    const resp = await fetchWithTimeout("/oauth2/userinfo")
+    if (!resp.ok) return undefined
+    const info = await resp.json() as { user?: string; email?: string }
+    return info.email ?? info.user ?? undefined
+  } catch {
+    return undefined
+  }
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/lib/constants.ts b/packages/system/dashboard/images/console/apps/console/src/lib/constants.ts
new file mode 100644
index 0000000000..9a29f3b9e4
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/lib/constants.ts
@@ -0,0 +1,17 @@
+/**
+ * Namespace that hosts the top-level tenants (every tenant chart creates its
+ * own namespace named `tenant-<name>`; the root tenant lives in `tenant-root`
+ * and its children live there as well).
+ */
+export const ROOT_TENANT_NAMESPACE = "tenant-root"
+
+export const TENANT_NAMESPACE_PREFIX = "tenant-"
+
+export function tenantNamespace(tenantName: string): string {
+  return `${TENANT_NAMESPACE_PREFIX}${tenantName}`
+}
+
+/**
+ * Local storage key for remembering the tenant the user last selected.
+ */
+export const SELECTED_TENANT_KEY = "cozystack-ui:selected-tenant"
diff --git a/packages/system/dashboard/images/console/apps/console/src/lib/crd-option-sources.test.ts b/packages/system/dashboard/images/console/apps/console/src/lib/crd-option-sources.test.ts
new file mode 100644
index 0000000000..52279746d8
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/lib/crd-option-sources.test.ts
@@ -0,0 +1,166 @@
+import { describe, it, expect } from "vitest"
+import { graftOptionSources } from "./crd-option-sources.ts"
+
+interface SchemaNode {
+  type?: string
+  properties?: Record<string, SchemaNode>
+  items?: SchemaNode
+  "x-cozystack-options"?: { source: string }
+}
+
+describe("graftOptionSources", () => {
+  it("grafts a source onto a nested field (applicationRef.kind)", () => {
+    const spec: SchemaNode = {
+      type: "object",
+      properties: {
+        applicationRef: {
+          type: "object",
+          properties: {
+            kind: { type: "string" },
+            name: { type: "string" },
+          },
+        },
+      },
+    }
+
+    const out = graftOptionSources(spec, {
+      "options.cozystack.io/source.applicationRef.kind": "appkind",
+    }) as SchemaNode
+
+    expect(out.properties?.applicationRef?.properties?.kind?.["x-cozystack-options"]).toEqual({
+      source: "appkind",
+    })
+    // Sibling left untouched.
+    expect(
+      out.properties?.applicationRef?.properties?.name?.["x-cozystack-options"],
+    ).toBeUndefined()
+  })
+
+  it("grafts a source onto a top-level spec field (backupClassName)", () => {
+    const spec: SchemaNode = {
+      type: "object",
+      properties: { backupClassName: { type: "string" } },
+    }
+
+    const out = graftOptionSources(spec, {
+      "options.cozystack.io/source.backupClassName": "backupclass",
+    }) as SchemaNode
+
+    expect(out.properties?.backupClassName?.["x-cozystack-options"]).toEqual({
+      source: "backupclass",
+    })
+  })
+
+  it("applies every source annotation on a CRD (BackupJob shape)", () => {
+    const spec: SchemaNode = {
+      type: "object",
+      properties: {
+        applicationRef: { type: "object", properties: { kind: { type: "string" } } },
+        planRef: { type: "object", properties: { name: { type: "string" } } },
+        backupClassName: { type: "string" },
+      },
+    }
+
+    const out = graftOptionSources(spec, {
+      "controller-gen.kubebuilder.io/version": "v0.16.4",
+      "options.cozystack.io/source.applicationRef.kind": "appkind",
+      "options.cozystack.io/source.planRef.name": "plan",
+      "options.cozystack.io/source.backupClassName": "backupclass",
+    }) as SchemaNode
+
+    expect(out.properties?.applicationRef?.properties?.kind?.["x-cozystack-options"]).toEqual({
+      source: "appkind",
+    })
+    expect(out.properties?.planRef?.properties?.name?.["x-cozystack-options"]).toEqual({
+      source: "plan",
+    })
+    expect(out.properties?.backupClassName?.["x-cozystack-options"]).toEqual({
+      source: "backupclass",
+    })
+  })
+
+  it("ignores annotations without the option-source prefix", () => {
+    const spec: SchemaNode = {
+      type: "object",
+      properties: { backupClassName: { type: "string" } },
+    }
+
+    const out = graftOptionSources(spec, {
+      "controller-gen.kubebuilder.io/version": "v0.16.4",
+      "options.cozystack.io/other": "noise",
+    }) as SchemaNode
+
+    expect(out.properties?.backupClassName?.["x-cozystack-options"]).toBeUndefined()
+  })
+
+  it("is a no-op for a path that does not exist in the schema", () => {
+    const spec: SchemaNode = {
+      type: "object",
+      properties: { backupClassName: { type: "string" } },
+    }
+
+    expect(() =>
+      graftOptionSources(spec, {
+        "options.cozystack.io/source.missing.field": "appkind",
+      }),
+    ).not.toThrow()
+  })
+
+  it("does not mutate the input schema, including nested nodes", () => {
+    const spec: SchemaNode = {
+      type: "object",
+      properties: {
+        backupClassName: { type: "string" },
+        applicationRef: { type: "object", properties: { kind: { type: "string" } } },
+      },
+    }
+
+    graftOptionSources(spec, {
+      "options.cozystack.io/source.backupClassName": "backupclass",
+      "options.cozystack.io/source.applicationRef.kind": "appkind",
+    })
+
+    // Both a top-level field and a nested one must be left untouched, so a
+    // future shallow/partial clone that corrupts deep nodes can't slip through.
+    expect(spec.properties?.backupClassName?.["x-cozystack-options"]).toBeUndefined()
+    expect(spec.properties?.applicationRef?.properties?.kind?.["x-cozystack-options"]).toBeUndefined()
+  })
+
+  it("grafts a source onto a field inside a list (VMImportTask vms)", () => {
+    const spec: SchemaNode = {
+      type: "object",
+      properties: {
+        vms: {
+          type: "array",
+          items: {
+            type: "object",
+            properties: {
+              id: { type: "string" },
+              instanceType: { type: "string" },
+            },
+          },
+        },
+      },
+    }
+
+    const out = graftOptionSources(spec, {
+      "options.cozystack.io/source.vms.instanceType": "instancetype",
+    }) as SchemaNode
+
+    expect(
+      out.properties?.vms?.items?.properties?.instanceType?.["x-cozystack-options"],
+    ).toEqual({ source: "instancetype" })
+    // The sibling inside the same item is left alone.
+    expect(out.properties?.vms?.items?.properties?.id?.["x-cozystack-options"]).toBeUndefined()
+  })
+
+  it("returns the schema unchanged when there are no annotations", () => {
+    const spec: SchemaNode = {
+      type: "object",
+      properties: { backupClassName: { type: "string" } },
+    }
+
+    expect(graftOptionSources(spec, undefined)).toBe(spec)
+    expect(graftOptionSources(spec, {})).toEqual(spec)
+  })
+})
diff --git a/packages/system/dashboard/images/console/apps/console/src/lib/crd-option-sources.ts b/packages/system/dashboard/images/console/apps/console/src/lib/crd-option-sources.ts
new file mode 100644
index 0000000000..c5855f594f
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/lib/crd-option-sources.ts
@@ -0,0 +1,64 @@
+/**
+ * Graft the `x-cozystack-options` vendor keyword back onto a CRD's spec schema
+ * from its metadata annotations.
+ *
+ * The backups.cozystack.io CRDs cannot carry `x-cozystack-options` in their
+ * OpenAPI schema: apiextensions `JSONSchemaProps` is a closed struct that only
+ * preserves `x-kubernetes-*` extensions, and server-side apply rejects any
+ * other `x-` key outright. The field→source mapping the dropdowns need is
+ * therefore stored in CRD metadata annotations (which the apiserver does
+ * preserve) and reattached client-side here, so DynamicOptionsWidget — which
+ * reads `x-cozystack-options.source` off the schema node — keeps working.
+ *
+ * Annotation contract (emitted by kubebuilder markers on the Go types):
+ *   options.cozystack.io/source.<dotted spec-relative path> = <option source>
+ * e.g. `options.cozystack.io/source.applicationRef.kind: appkind`.
+ */
+
+const SOURCE_ANNOTATION_PREFIX = "options.cozystack.io/source."
+
+/**
+ * Return a copy of `specSchema` with `x-cozystack-options: { source }` set on
+ * every field named by a matching annotation. The input is not mutated. Paths
+ * that do not resolve in the schema are skipped silently.
+ */
+export function graftOptionSources(
+  specSchema: unknown,
+  annotations: Record<string, string> | undefined | null,
+): unknown {
+  if (!specSchema || typeof specSchema !== "object" || !annotations) {
+    return specSchema
+  }
+
+  const cloned = structuredClone(specSchema)
+
+  for (const [key, source] of Object.entries(annotations)) {
+    if (!source || !key.startsWith(SOURCE_ANNOTATION_PREFIX)) continue
+    const path = key.slice(SOURCE_ANNOTATION_PREFIX.length).split(".")
+    applySource(cloned, path, source)
+  }
+
+  return cloned
+}
+
+function applySource(specSchema: unknown, path: string[], source: string): void {
+  let node = specSchema
+  for (const segment of path) {
+    // An array is transparent in the annotation path: `vms.instanceType` means
+    // the field on each item, matching how addDynamicOptionWidgets already
+    // recurses into `items`. Without this an annotation on a field inside a
+    // list resolves to nothing and the dropdown silently never appears.
+    const items = (node as { items?: unknown })?.items
+    if (items && typeof items === "object" && !(node as { properties?: unknown })?.properties) {
+      node = items
+    }
+    const properties = (node as { properties?: Record<string, unknown> })?.properties
+    if (!properties || typeof properties !== "object" || !(segment in properties)) {
+      return
+    }
+    node = properties[segment]
+  }
+  if (node && typeof node === "object") {
+    ;(node as Record<string, unknown>)["x-cozystack-options"] = { source }
+  }
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/lib/dynamic-options.test.ts b/packages/system/dashboard/images/console/apps/console/src/lib/dynamic-options.test.ts
new file mode 100644
index 0000000000..a6014fc7fb
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/lib/dynamic-options.test.ts
@@ -0,0 +1,200 @@
+import { describe, it, expect } from "vitest"
+import type { RJSFSchema, UiSchema } from "@rjsf/utils"
+import { addDynamicOptionWidgets } from "./dynamic-options.ts"
+
+describe("addDynamicOptionWidgets", () => {
+  it("binds a top-level field carrying x-cozystack-options to the widget", () => {
+    const schema: RJSFSchema = {
+      type: "object",
+      properties: {
+        backupClassName: {
+          type: "string",
+          "x-cozystack-options": { source: "backupclass" },
+        } as RJSFSchema,
+        unrelated: { type: "string" },
+      },
+    }
+
+    const ui = addDynamicOptionWidgets(schema)
+
+    expect(ui.backupClassName?.["ui:widget"]).toBe("DynamicOptionsWidget")
+    expect(ui.unrelated).toBeUndefined()
+  })
+
+  it("recurses into nested object properties (applicationRef.kind)", () => {
+    // Mirrors the backup CRD shape: applicationRef.kind -> appkind source,
+    // applicationRef.name left as plain string (served by client enumMap).
+    const schema: RJSFSchema = {
+      type: "object",
+      properties: {
+        applicationRef: {
+          type: "object",
+          properties: {
+            kind: {
+              type: "string",
+              "x-cozystack-options": { source: "appkind" },
+            } as RJSFSchema,
+            name: { type: "string" },
+          },
+        },
+        backupClassName: {
+          type: "string",
+          "x-cozystack-options": { source: "backupclass" },
+        } as RJSFSchema,
+      },
+    }
+
+    const ui = addDynamicOptionWidgets(schema)
+
+    expect(ui.applicationRef?.kind?.["ui:widget"]).toBe("DynamicOptionsWidget")
+    expect(ui.applicationRef?.name?.["ui:widget"]).toBeUndefined()
+    expect(ui.backupClassName?.["ui:widget"]).toBe("DynamicOptionsWidget")
+  })
+
+  it("recurses into a nested reference object (planRef.name)", () => {
+    const schema: RJSFSchema = {
+      type: "object",
+      properties: {
+        planRef: {
+          type: "object",
+          properties: {
+            name: {
+              type: "string",
+              "x-cozystack-options": { source: "plan" },
+            } as RJSFSchema,
+          },
+        },
+      },
+    }
+
+    const ui = addDynamicOptionWidgets(schema)
+
+    expect(ui.planRef?.name?.["ui:widget"]).toBe("DynamicOptionsWidget")
+  })
+
+  it("recurses into array items (vm-instance disks[].name)", () => {
+    const schema: RJSFSchema = {
+      type: "object",
+      properties: {
+        disks: {
+          type: "array",
+          items: {
+            type: "object",
+            properties: {
+              name: {
+                type: "string",
+                "x-cozystack-options": { source: "vmdisk" },
+              } as RJSFSchema,
+              size: { type: "string" },
+            },
+          },
+        } as RJSFSchema,
+      },
+    }
+
+    const ui = addDynamicOptionWidgets(schema)
+
+    expect(ui.disks?.items?.name?.["ui:widget"]).toBe("DynamicOptionsWidget")
+    expect(ui.disks?.items?.size?.["ui:widget"]).toBeUndefined()
+  })
+
+  it("recurses into additionalProperties maps (kubernetes nodeGroups.*.instanceType)", () => {
+    const schema: RJSFSchema = {
+      type: "object",
+      properties: {
+        nodeGroups: {
+          type: "object",
+          additionalProperties: {
+            type: "object",
+            properties: {
+              instanceType: {
+                type: "string",
+                "x-cozystack-options": { source: "instancetype" },
+              } as RJSFSchema,
+            },
+          },
+        } as RJSFSchema,
+      },
+    }
+
+    const ui = addDynamicOptionWidgets(schema)
+
+    expect(ui.nodeGroups?.additionalProperties?.instanceType?.["ui:widget"]).toBe(
+      "DynamicOptionsWidget",
+    )
+  })
+
+  it("pins the current 'oneOf/anyOf/allOf branches are not walked' limitation", () => {
+    // FIXME: extend the walker to recurse into oneOf/anyOf/allOf. Once that
+    // lands, flip this to expect the inner field to bind DynamicOptionsWidget.
+    // Matches the same intentional gap pinned in sensitive-fields.test.ts.
+    const schema: RJSFSchema = {
+      type: "object",
+      properties: {
+        source: {
+          oneOf: [
+            {
+              type: "object",
+              properties: {
+                storageClass: {
+                  type: "string",
+                  "x-cozystack-options": { source: "storageclass" },
+                } as RJSFSchema,
+              },
+            },
+          ],
+        },
+      },
+    }
+
+    const ui = addDynamicOptionWidgets(schema)
+
+    expect(ui.source).toBeUndefined()
+  })
+
+  it("does not mutate the input uiSchema (returns fresh objects at every level)", () => {
+    const schema: RJSFSchema = {
+      type: "object",
+      properties: {
+        applicationRef: {
+          type: "object",
+          properties: {
+            kind: {
+              type: "string",
+              "x-cozystack-options": { source: "appkind" },
+            } as RJSFSchema,
+          },
+        },
+      },
+    }
+    const input: UiSchema = { applicationRef: { kind: { "ui:title": "Kind" } } }
+    const snapshot = JSON.parse(JSON.stringify(input))
+
+    const out = addDynamicOptionWidgets(schema, input)
+
+    // The input object graph is left byte-identical.
+    expect(input).toEqual(snapshot)
+    // The result and every touched sub-object are new references.
+    expect(out).not.toBe(input)
+    expect(out.applicationRef).not.toBe(input.applicationRef)
+  })
+
+  it("preserves an existing uiSchema while adding widgets", () => {
+    const schema: RJSFSchema = {
+      type: "object",
+      properties: {
+        backupClassName: {
+          type: "string",
+          "x-cozystack-options": { source: "backupclass" },
+        } as RJSFSchema,
+      },
+    }
+
+    const ui = addDynamicOptionWidgets(schema, {
+      backupClassName: { "ui:title": "Backup Class" },
+    })
+
+    expect(ui.backupClassName?.["ui:widget"]).toBe("DynamicOptionsWidget")
+    expect(ui.backupClassName?.["ui:title"]).toBe("Backup Class")
+  })
+})
diff --git a/packages/system/dashboard/images/console/apps/console/src/lib/dynamic-options.ts b/packages/system/dashboard/images/console/apps/console/src/lib/dynamic-options.ts
new file mode 100644
index 0000000000..26cbef41a5
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/lib/dynamic-options.ts
@@ -0,0 +1,83 @@
+import type { RJSFSchema, UiSchema } from "@rjsf/utils"
+
+/**
+ * Walk a (sanitised) JSON schema and build a uiSchema that binds every field
+ * carrying the `x-cozystack-options` vendor keyword to the generic
+ * DynamicOptionsWidget. Recurses into `properties`, array `items` and
+ * `additionalProperties` so nested fields (e.g. vm-instance `disks[].name`,
+ * kubernetes `nodeGroups.*.instanceType`) are covered too.
+ *
+ * Shared by SchemaForm (top-level form) and AdditionalPropertiesField (the
+ * custom map editor renders its own nested <Form>, so it must build the item
+ * uiSchema with this same helper or the nested dropdowns are lost).
+ */
+function buildUi(node: unknown, ui: Record<string, unknown> = {}): Record<string, unknown> {
+  if (!node || typeof node !== "object") return ui
+  const n = node as Record<string, unknown>
+  const result = { ...ui }
+
+  if (n["x-cozystack-options"]) {
+    result["ui:widget"] = "DynamicOptionsWidget"
+  }
+
+  const props = n.properties
+  if (props && typeof props === "object") {
+    for (const [key, child] of Object.entries(props as Record<string, unknown>)) {
+      const childUi = buildUi(child, result[key] as Record<string, unknown>)
+      if (Object.keys(childUi).length > 0) result[key] = childUi
+    }
+  }
+
+  if (n.items && typeof n.items === "object") {
+    const itemsUi = buildUi(n.items, result.items as Record<string, unknown>)
+    if (Object.keys(itemsUi).length > 0) result.items = itemsUi
+  }
+
+  if (n.additionalProperties && typeof n.additionalProperties === "object") {
+    const apUi = buildUi(
+      n.additionalProperties,
+      result.additionalProperties as Record<string, unknown>,
+    )
+    if (Object.keys(apUi).length > 0) result.additionalProperties = apUi
+  }
+
+  return result
+}
+
+export function addDynamicOptionWidgets(schema: RJSFSchema, uiSchema: UiSchema = {}): UiSchema {
+  return buildUi(schema, uiSchema as Record<string, unknown>) as UiSchema
+}
+
+/**
+ * Resolves `{path.to.field}` placeholders in an option source against the whole
+ * form, so a dropdown can be scoped by a choice made elsewhere in it.
+ *
+ * Returns null when a placeholder has no value yet — the field it depends on is
+ * still empty, and asking the server for `vmimportvm.` would only 404.
+ */
+export function resolveSource(
+  source: string | undefined,
+  root: unknown,
+): { name: string | null; parameterised: boolean } {
+  if (!source) return { name: null, parameterised: false }
+  if (!source.includes("{")) return { name: source, parameterised: false }
+
+  let missing = false
+  const name = source.replace(/\{([^}]+)\}/g, (_, path: string) => {
+    const resolved = path
+      .split(".")
+      .reduce<unknown>(
+        (acc, key) =>
+          acc && typeof acc === "object"
+            ? (acc as Record<string, unknown>)[key]
+            : undefined,
+        root,
+      )
+    if (typeof resolved !== "string" || resolved === "") {
+      missing = true
+      return ""
+    }
+    return resolved
+  })
+  return { name: missing ? null : name, parameterised: true }
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/lib/focus-first-error.test.ts b/packages/system/dashboard/images/console/apps/console/src/lib/focus-first-error.test.ts
new file mode 100644
index 0000000000..cf075b3985
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/lib/focus-first-error.test.ts
@@ -0,0 +1,179 @@
+import { describe, it, expect, beforeEach, vi } from "vitest"
+import { focusFirstError } from "@/lib/focus-first-error.ts"
+
+describe("focusFirstError", () => {
+  beforeEach(() => {
+    document.body.innerHTML = ""
+    // jsdom has no layout, so scrollIntoView is absent. Stub it so the call can
+    // be asserted: focus() is passed preventScroll, which disables the
+    // browser's own scroll-on-focus, making this the only thing that brings
+    // the field into view.
+    HTMLElement.prototype.scrollIntoView = vi.fn()
+  })
+
+  it("focuses the field carrying the generated id", () => {
+    document.body.innerHTML = `<input id="root_name" />`
+    const field = document.getElementById("root_name")
+
+    focusFirstError({ property: ".name" })
+
+    expect(document.activeElement).toBe(field)
+  })
+
+  // RJSF flattens the instance path with dots, so this is the shape a nested
+  // field actually arrives as. A decoy sharing the prefix keeps the assertion
+  // from passing on the descendant fallback alone.
+  it("resolves a nested property path", () => {
+    document.body.innerHTML = `
+      <input id="root_spec_firstname_decoy" />
+      <input id="root_spec_firstname" />
+    `
+    const field = document.getElementById("root_spec_firstname")
+
+    focusFirstError({ property: ".spec.firstname" })
+
+    expect(document.activeElement).toBe(field)
+  })
+
+  it("resolves an array item path", () => {
+    document.body.innerHTML = `<input id="root_items_0_name" />`
+    const field = document.getElementById("root_items_0_name")
+
+    focusFirstError({ property: ".items.0.name" })
+
+    expect(document.activeElement).toBe(field)
+  })
+
+  // A map key can itself contain a dot -- a mariadb user `john.doe`, a registry
+  // mirror `ghcr.io` -- and the flattened path cannot say whether a dot
+  // separates two properties or sits inside one, so both readings are tried.
+  it("resolves a property whose own name contains a dot", () => {
+    document.body.innerHTML = `<input id="root_users_john.doe_maxUserConnections" />`
+    const field = document.getElementById("root_users_john.doe_maxUserConnections")
+
+    focusFirstError({ property: ".users.john.doe.maxUserConnections" })
+
+    expect(document.activeElement).toBe(field)
+  })
+
+  it("prefers the plain split when both readings are present", () => {
+    document.body.innerHTML = `
+      <input id="root_a.b" />
+      <input id="root_a_b" />
+    `
+    const plain = document.getElementById("root_a_b")
+
+    focusFirstError({ property: ".a.b" })
+
+    expect(document.activeElement).toBe(plain)
+  })
+
+  it("uses the same custom prefix and separator as the form", () => {
+    document.body.innerHTML = `<input id="form/spec/name" />`
+    const field = document.getElementById("form/spec/name")
+
+    focusFirstError({ property: ".spec.name" }, "form", "/")
+
+    expect(document.activeElement).toBe(field)
+  })
+
+  // vm-disk marks source.http.url required, not source, so this is the shape
+  // validation actually reports for a SourceField. The widget sets the id on
+  // its own control; the exact lookup is what has to find it.
+  it("focuses a SourceField sub-control by its generated id", () => {
+    document.body.innerHTML = `
+      <input type="radio" name="root_source-source" value="http" />
+      <input id="root_source_http_url" />
+    `
+    const field = document.getElementById("root_source_http_url")
+
+    focusFirstError({ property: ".source.http.url" })
+
+    expect(document.activeElement).toBe(field)
+  })
+
+  // A radio group carries only `name="<id>-source"`, so the name half of the
+  // fallback is the only thing that can reach it.
+  it("falls back to the name attribute for a radio group with no id", () => {
+    document.body.innerHTML = `
+      <input type="radio" name="root_source-source" value="http" />
+      <input type="radio" name="root_source-source" value="pvc" />
+    `
+    const first = document.querySelector<HTMLInputElement>('input[value="http"]')
+
+    focusFirstError({ property: ".source" })
+
+    expect(document.getElementById("root_source")).toBeNull()
+    expect(document.activeElement).toBe(first)
+  })
+
+  // A bare prefix match would grab any sibling whose id merely starts with the
+  // same string, scrolling to a field the user was not asked about.
+  it("does not fall back to a sibling that merely shares the prefix", () => {
+    document.body.innerHTML = `<input id="root_database" />`
+
+    focusFirstError({ property: ".data" })
+
+    expect(document.getElementById("root_data")).toBeNull()
+    expect(document.activeElement).toBe(document.body)
+  })
+
+  it("falls back to a nested input under the errored object", () => {
+    document.body.innerHTML = `
+      <input id="root_database" />
+      <input id="root_data_host" />
+    `
+    const nested = document.getElementById("root_data_host")
+
+    focusFirstError({ property: ".data" })
+
+    expect(document.activeElement).toBe(nested)
+  })
+
+  // The x-cozystack-options fields (storageClass, backupClass, VM disks, GPU
+  // names) render through DynamicOptionsWidget as a select, not an input.
+  it("focuses a select carrying the generated id", () => {
+    document.body.innerHTML = `<select id="root_gpus_0_name"></select>`
+    const field = document.getElementById("root_gpus_0_name")
+
+    focusFirstError({ property: ".gpus.0.name" })
+
+    expect(document.activeElement).toBe(field)
+  })
+
+  it("falls back to a nested select under the errored object", () => {
+    document.body.innerHTML = `<select id="root_gpus_0_name"></select>`
+    const field = document.getElementById("root_gpus_0_name")
+
+    focusFirstError({ property: ".gpus.0" })
+
+    expect(document.activeElement).toBe(field)
+  })
+
+  it("scrolls the field into view, not only focuses it", () => {
+    document.body.innerHTML = `<input id="root_name" />`
+    const field = document.getElementById("root_name") as HTMLElement
+
+    focusFirstError({ property: ".name" })
+
+    expect(field.scrollIntoView).toHaveBeenCalledWith({ block: "center" })
+  })
+
+  it("escapes a quote in the generated id rather than breaking the selector", () => {
+    // Only the fallback interpolates the id into a quoted attribute selector,
+    // so the exact lookup has to miss for this to bite: an unescaped quote
+    // ends the selector string early and querySelector throws SyntaxError.
+    document.body.innerHTML = `<input id='root_a"b_child' />`
+    const field = document.getElementById('root_a"b_child')
+
+    expect(() => focusFirstError({ property: '.a"b' })).not.toThrow()
+    expect(document.activeElement).toBe(field)
+  })
+
+  it("does nothing when the field is nowhere in the document", () => {
+    document.body.innerHTML = `<input id="root_other" />`
+
+    expect(() => focusFirstError({ property: ".missing" })).not.toThrow()
+    expect(document.activeElement).toBe(document.body)
+  })
+})
diff --git a/packages/system/dashboard/images/console/apps/console/src/lib/focus-first-error.ts b/packages/system/dashboard/images/console/apps/console/src/lib/focus-first-error.ts
new file mode 100644
index 0000000000..cda8842b26
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/lib/focus-first-error.ts
@@ -0,0 +1,85 @@
+import type { RJSFValidationError } from "@rjsf/utils"
+
+/**
+ * RJSF builds `property` as the JSON-pointer instance path with the slashes
+ * swapped for dots (`processRawValidationErrors.js`), so the path is always
+ * dotted and never bracketed -- an array index arrives as `.items.0.name`.
+ */
+function propertySegments(property: string): string[] {
+  return property.split(".").filter((segment) => segment !== "")
+}
+
+/**
+ * The flattening is lossy: a dot inside one property name is indistinguishable
+ * from the separator between two, and a map keyed `john.doe` or `ghcr.io`
+ * produces exactly that. So try the plain split first, then every way of
+ * gluing adjacent segments back together with the dot they may have come from.
+ * Bounded, because the count doubles with each segment and only the first
+ * matching id is used.
+ */
+function candidateIds(
+  segments: string[],
+  idPrefix: string,
+  idSeparator: string,
+): string[] {
+  const ids: string[] = []
+  const build = (index: number, parts: string[]) => {
+    if (ids.length >= 64) return
+    if (index === segments.length) {
+      ids.push([idPrefix, ...parts].join(idSeparator))
+      return
+    }
+    build(index + 1, [...parts, segments[index]])
+    if (parts.length > 0) {
+      const glued = `${parts[parts.length - 1]}.${segments[index]}`
+      build(index + 1, [...parts.slice(0, -1), glued])
+    }
+  }
+  build(0, [])
+  return ids
+}
+
+/**
+ * Errors render inline with the error list hidden, so a blocked submit is
+ * invisible unless the offending field is brought into view. RJSF's built-in
+ * focus resolves the field through `form.elements`, which the `tagName="div"`
+ * form does not have, so resolve it by generated id instead.
+ *
+ * Not every widget puts that id on a control, so fall back to a descendant,
+ * matched on a segment boundary: a bare prefix would let an error on `data`
+ * grab the sibling `database`, scrolling to the wrong field. The `name` half
+ * catches a radio group, which carries `name="<id>-source"` and no id.
+ *
+ * A widget that renders neither is unreachable, which is why the widgets this
+ * console binds set the generated id themselves rather than relying on this.
+ */
+export function focusFirstError(
+  error: Pick<RJSFValidationError, "property">,
+  idPrefix = "root",
+  idSeparator = "_",
+) {
+  const candidates = candidateIds(
+    propertySegments(error.property ?? ""),
+    idPrefix,
+    idSeparator,
+  )
+  const id = candidates[0]
+  const quote = (v: string) => v.replace(/["\\]/g, "\\$&")
+  const escaped = quote(id)
+  const escapedSeparator = quote(idSeparator)
+  // Not every widget puts the id on a form control, so match any of them
+  // rather than inputs alone.
+  const controls = ["input", "select", "textarea"]
+  const fallback = [
+    ...controls.map((tag) => `${tag}[id^="${escaped}${escapedSeparator}"]`),
+    ...controls.map((tag) => `${tag}[name^="${escaped}-"]`),
+  ].join(", ")
+  // An exact id is unambiguous, so try every candidate before falling back to
+  // the heuristic descendant match, which only makes sense for the plain split.
+  const exact = candidates
+    .map((candidate) => document.getElementById(candidate))
+    .find((element): element is HTMLElement => element !== null)
+  const field = exact ?? document.querySelector<HTMLElement>(fallback)
+  field?.scrollIntoView?.({ block: "center" })
+  field?.focus?.({ preventScroll: true })
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/lib/humanize.ts b/packages/system/dashboard/images/console/apps/console/src/lib/humanize.ts
new file mode 100644
index 0000000000..0d3b0262f9
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/lib/humanize.ts
@@ -0,0 +1,12 @@
+/**
+ * Insert spaces between camel-cased words but keep consecutive capital
+ * acronyms together: `VMInstance` → `VM Instance`, `HTTPCache` → `HTTP Cache`,
+ * `ClickHouse` → `ClickHouse` (unchanged), `OpenBAO` → `Open BAO`.
+ */
+export function humanizeKind(kind: string): string {
+  return kind
+    .replace(/([a-z])([A-Z])/g, "$1 $2")
+    .replace(/([A-Z]+)([A-Z][a-z])/g, "$1 $2")
+    .replace(/\s+/g, " ")
+    .trim()
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/lib/immutable-paths.test.ts b/packages/system/dashboard/images/console/apps/console/src/lib/immutable-paths.test.ts
new file mode 100644
index 0000000000..ef7c76290d
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/lib/immutable-paths.test.ts
@@ -0,0 +1,534 @@
+import { describe, it, expect, vi } from "vitest"
+import { findImmutablePaths, overlayImmutable } from "./immutable-paths.ts"
+
+const cel = {
+  "x-kubernetes-validations": [
+    { rule: "self == oldSelf", message: "immutable" },
+  ],
+}
+
+describe("findImmutablePaths", () => {
+  it("returns empty array for non-object input", () => {
+    expect(findImmutablePaths(null)).toEqual([])
+    expect(findImmutablePaths(undefined)).toEqual([])
+    expect(findImmutablePaths("string")).toEqual([])
+    expect(findImmutablePaths(42)).toEqual([])
+  })
+
+  it("returns empty array when no validations are present", () => {
+    expect(
+      findImmutablePaths({
+        type: "object",
+        properties: { foo: { type: "string" } },
+      }),
+    ).toEqual([])
+  })
+
+  it("ignores validations whose rule is not self == oldSelf", () => {
+    expect(
+      findImmutablePaths({
+        properties: {
+          foo: {
+            type: "string",
+            "x-kubernetes-validations": [{ rule: "self.size() > 0" }],
+          },
+        },
+      }),
+    ).toEqual([])
+  })
+
+  it("finds a top-level immutable property", () => {
+    const schema = {
+      properties: {
+        storageClass: { type: "string", ...cel },
+        size: { type: "string" },
+      },
+    }
+    expect(findImmutablePaths(schema)).toEqual([["storageClass"]])
+  })
+
+  it("finds nested immutable properties", () => {
+    const schema = {
+      properties: {
+        spec: {
+          properties: {
+            backup: {
+              properties: {
+                storageClass: { type: "string", ...cel },
+              },
+            },
+          },
+        },
+      },
+    }
+    expect(findImmutablePaths(schema)).toEqual([
+      ["spec", "backup", "storageClass"],
+    ])
+  })
+
+  it("uses \"*\" for array items", () => {
+    const schema = {
+      properties: {
+        disks: {
+          type: "array",
+          items: { type: "string", ...cel },
+        },
+      },
+    }
+    expect(findImmutablePaths(schema)).toEqual([["disks", "*"]])
+  })
+
+  it("descends into array items to find nested immutable fields", () => {
+    const schema = {
+      properties: {
+        disks: {
+          type: "array",
+          items: {
+            type: "object",
+            properties: {
+              name: { type: "string", ...cel },
+              size: { type: "string" },
+            },
+          },
+        },
+      },
+    }
+    expect(findImmutablePaths(schema)).toEqual([["disks", "*", "name"]])
+  })
+
+  it("uses \"*\" for additionalProperties object maps", () => {
+    const schema = {
+      properties: {
+        labels: {
+          type: "object",
+          additionalProperties: { type: "string", ...cel },
+        },
+      },
+    }
+    expect(findImmutablePaths(schema)).toEqual([["labels", "*"]])
+  })
+
+  it("treats parent as immutable when a oneOf branch carries the rule", () => {
+    const schema = {
+      properties: {
+        size: {
+          oneOf: [{ type: "integer" }, { type: "string", ...cel }],
+        },
+      },
+    }
+    expect(findImmutablePaths(schema)).toEqual([["size"]])
+  })
+
+  it("treats parent as immutable when anyOf/allOf carries the rule", () => {
+    expect(
+      findImmutablePaths({
+        properties: {
+          foo: { anyOf: [{ ...cel }] },
+        },
+      }),
+    ).toEqual([["foo"]])
+    expect(
+      findImmutablePaths({
+        properties: {
+          bar: { allOf: [{ ...cel }] },
+        },
+      }),
+    ).toEqual([["bar"]])
+  })
+
+  it("handles root-level immutable schema (no properties)", () => {
+    expect(findImmutablePaths(cel)).toEqual([[]])
+  })
+
+  it("does NOT walk into properties beneath oneOf/anyOf/allOf branches (pinned current behaviour)", () => {
+    // Tracked in cozystack/cozystack-ui#8.
+    // The walker recognises *parent* immutability when any branch carries
+    // the rule, but it does not descend into a branch's `properties` to
+    // discover per-field immutability inside the branch. CRDs that use
+    // allOf composition for property merging are not covered.
+    // Pinned as current behaviour; revisit if a real schema needs it.
+    const schema = {
+      type: "object",
+      allOf: [
+        {
+          properties: {
+            storageClass: { type: "string", ...cel },
+          },
+        },
+      ],
+    }
+    expect(findImmutablePaths(schema)).toEqual([])
+  })
+
+  it("collects multiple immutable paths in deterministic order", () => {
+    const schema = {
+      properties: {
+        a: { type: "string", ...cel },
+        b: {
+          properties: {
+            c: { type: "string", ...cel },
+          },
+        },
+      },
+    }
+    expect(findImmutablePaths(schema)).toEqual([["a"], ["b", "c"]])
+  })
+})
+
+describe("overlayImmutable", () => {
+  it("returns a deep clone when paths is empty", () => {
+    const submitted = { foo: "x", arr: [1, 2] }
+    const original = { foo: "y", arr: [9] }
+    const result = overlayImmutable(submitted, original, [])
+    expect(result).toEqual(submitted)
+    expect(result).not.toBe(submitted)
+    expect((result as { arr: number[] }).arr).not.toBe(submitted.arr)
+  })
+
+  it("overlays a top-level immutable field", () => {
+    const submitted = { storageClass: "fast", size: "10Gi" }
+    const original = { storageClass: "slow", size: "5Gi" }
+    expect(
+      overlayImmutable(submitted, original, [["storageClass"]]),
+    ).toEqual({ storageClass: "slow", size: "10Gi" })
+  })
+
+  it("preserves siblings when overlaying nested fields", () => {
+    const submitted = {
+      spec: { backup: { storageClass: "fast", schedule: "*/5" } },
+    }
+    const original = {
+      spec: { backup: { storageClass: "slow", schedule: "*/1" } },
+    }
+    expect(
+      overlayImmutable(submitted, original, [
+        ["spec", "backup", "storageClass"],
+      ]),
+    ).toEqual({
+      spec: { backup: { storageClass: "slow", schedule: "*/5" } },
+    })
+  })
+
+  it("inserts the immutable field if it is missing from submitted but present in original", () => {
+    const submitted = { size: "10Gi" } as Record<string, unknown>
+    const original = { size: "5Gi", storageClass: "slow" }
+    expect(
+      overlayImmutable(submitted, original, [["storageClass"]]),
+    ).toEqual({ size: "10Gi", storageClass: "slow" })
+  })
+
+  it("keeps the submitted value when the immutable field is absent from original", () => {
+    // Persisted spec doesn't have the field (server-default, status echo gap,
+    // freshly-loaded resource). overlay must not blank user's input with undefined.
+    expect(
+      overlayImmutable(
+        { storageClass: "fast", size: "10Gi" },
+        { size: "5Gi" } as Record<string, unknown>,
+        [["storageClass"]],
+      ),
+    ).toEqual({ storageClass: "fast", size: "10Gi" })
+  })
+
+  it("aligns array length to original when array element path is immutable", () => {
+    const submitted = { disks: ["x", "y", "z"] }
+    const original = { disks: ["a", "b"] }
+    expect(
+      overlayImmutable(submitted, original, [["disks", "*"]]),
+    ).toEqual({ disks: ["a", "b"] })
+  })
+
+  it("extends submitted array when original is longer", () => {
+    const submitted = { disks: ["x"] }
+    const original = { disks: ["a", "b"] }
+    expect(
+      overlayImmutable(submitted, original, [["disks", "*"]]),
+    ).toEqual({ disks: ["a", "b"] })
+  })
+
+  it("overlays nested array-item field when only that field is immutable", () => {
+    const submitted = {
+      disks: [
+        { name: "renamed1", size: "10Gi" },
+        { name: "renamed2", size: "20Gi" },
+      ],
+    }
+    const original = {
+      disks: [
+        { name: "disk1", size: "5Gi" },
+        { name: "disk2", size: "5Gi" },
+      ],
+    }
+    expect(
+      overlayImmutable(submitted, original, [["disks", "*", "name"]]),
+    ).toEqual({
+      disks: [
+        { name: "disk1", size: "10Gi" },
+        { name: "disk2", size: "20Gi" },
+      ],
+    })
+  })
+
+  it("tolerates null/undefined values along the path without blanking the user input", () => {
+    expect(
+      overlayImmutable({}, { storageClass: "slow" }, [["storageClass"]]),
+    ).toEqual({ storageClass: "slow" })
+    // Source has no value at the path: keep target's value rather than
+    // erasing the field — see "keeps submitted value when … absent from original".
+    expect(
+      overlayImmutable({ storageClass: "fast" }, {}, [["storageClass"]]),
+    ).toEqual({ storageClass: "fast" })
+  })
+
+  it("skips overlay (with warn) when the user shrunk an array with per-element-nested-immutable fields", () => {
+    // Index-aligned overlay corrupts which element was deleted when the
+    // length changed (it re-anchors source values onto surviving indices).
+    // Skip the overlay for this path and let admission enforce the rule.
+    const warn = vi.spyOn(console, "warn").mockImplementation(() => {})
+    const submitted = { disks: [{ name: "renamed", size: "10Gi" }] }
+    const original = {
+      disks: [
+        { name: "disk1", size: "5Gi" },
+        { name: "disk2", size: "5Gi" },
+      ],
+    }
+    expect(
+      overlayImmutable(submitted, original, [["disks", "*", "name"]]),
+    ).toEqual({ disks: [{ name: "renamed", size: "10Gi" }] })
+    expect(warn).toHaveBeenCalled()
+    warn.mockRestore()
+  })
+
+  it("skips overlay (with warn) when the user deleted the first of two immutable-named entries", () => {
+    // Direct repro of the index-anchored swap bug discovered in review:
+    // submitted shrinks from 2 to 1 and the naive overlay would assign
+    // source[0].name to the surviving entry. We bail instead.
+    const warn = vi.spyOn(console, "warn").mockImplementation(() => {})
+    const submitted = { disks: [{ name: "b", size: "2Gi" }] }
+    const original = {
+      disks: [
+        { name: "a", size: "1Gi" },
+        { name: "b", size: "2Gi" },
+      ],
+    }
+    expect(
+      overlayImmutable(submitted, original, [["disks", "*", "name"]]),
+    ).toEqual({ disks: [{ name: "b", size: "2Gi" }] })
+    expect(warn).toHaveBeenCalled()
+    warn.mockRestore()
+  })
+
+  it("warns and clones original when a top-level wildcard immutable path is supplied", () => {
+    // findImmutablePaths emits [["*"]] for schemas whose root is an array
+    // or map carrying the rule on items/additionalProperties. The naive
+    // overlay would no-op (the loop's return value was discarded). Match
+    // the root-immutable handling: warn and replace wholesale.
+    const warn = vi.spyOn(console, "warn").mockImplementation(() => {})
+    const submitted = ["x", "y"]
+    const original = ["a", "b"]
+    expect(overlayImmutable(submitted, original, [["*"]])).toEqual(original)
+    expect(warn).toHaveBeenCalled()
+    warn.mockRestore()
+  })
+
+  it("freezes a whole additionalProperties map when * is the last segment", () => {
+    // The schema declares every value in the map immutable. We treat this as
+    // whole-map immutable: defence-in-depth must reject mutations from the
+    // YAML editor or devtools, not just the form.
+    type LabelsObj = { labels: Record<string, string> }
+    const submitted: LabelsObj = {
+      labels: { env: "prod-changed", added: "new" },
+    }
+    const original: LabelsObj = {
+      labels: { env: "prod", legacy: "v1" },
+    }
+    expect(
+      overlayImmutable(submitted, original, [["labels", "*"]]),
+    ).toEqual({ labels: { env: "prod", legacy: "v1" } })
+  })
+
+  it("freezes the whole map even when only a nested value subkey carries the rule", () => {
+    // Previously the overlay merged per-entry for *-not-last on a map,
+    // which let a YAML-editor bypass add new keys that the form would
+    // have refused. The UI marks the whole map ui:disabled; the overlay
+    // now matches: drop added keys, reinstate removed keys, reset every
+    // value to source. Different-content semantics (allow add) would need
+    // both sides to change together — see PR description's UX trade-off.
+    type Entry = { value: string; note: string }
+    type LabelsObj = { labels: Record<string, Entry> }
+    const submitted: LabelsObj = {
+      labels: {
+        env: { value: "changed", note: "edit" },
+        new: { value: "novel", note: "added" },
+      },
+    }
+    const original: LabelsObj = {
+      labels: {
+        env: { value: "prod", note: "orig" },
+        legacy: { value: "v1", note: "old" },
+      },
+    }
+    expect(
+      overlayImmutable(submitted, original, [["labels", "*", "value"]]),
+    ).toEqual({
+      labels: {
+        env: { value: "prod", note: "orig" },
+        legacy: { value: "v1", note: "old" },
+      },
+    })
+  })
+
+  it("materialises an immutable leaf when its ancestor is missing in target", () => {
+    // A YAML edit that strips the parent object must not strip the immutable
+    // leaf with it. foundationdb's storage.storageClass is a shipped path of
+    // this shape.
+    const submitted = { spec: {} } as Record<string, unknown>
+    const original = {
+      spec: { storage: { storageClass: "replicated", size: "10Gi" } },
+    }
+    const result = overlayImmutable(submitted, original, [
+      ["spec", "storage", "storageClass"],
+    ])
+    expect(result).toEqual({ spec: { storage: { storageClass: "replicated" } } })
+  })
+
+  it("materialises an immutable leaf when its ancestor is null in target", () => {
+    // `storage:` with nothing under it parses to null, not to a missing key,
+    // so the walker has to treat it the same as absent.
+    const submitted = { spec: { storage: null } } as Record<string, unknown>
+    const original = {
+      spec: { storage: { storageClass: "replicated", size: "10Gi" } },
+    }
+    const result = overlayImmutable(submitted, original, [
+      ["spec", "storage", "storageClass"],
+    ])
+    expect(result).toEqual({ spec: { storage: { storageClass: "replicated" } } })
+  })
+
+  it("preserves a scalar submitted at an immutable leaf's ancestor", () => {
+    const submitted = { spec: { storage: "keep-me" } } as Record<string, unknown>
+    const original = {
+      spec: { storage: { storageClass: "replicated", size: "10Gi" } },
+    }
+    const result = overlayImmutable(submitted, original, [
+      ["spec", "storage", "storageClass"],
+    ])
+    expect(result).toEqual({ spec: { storage: "keep-me" } })
+  })
+
+  it("leaves a null ancestor alone when original has no leaf to restore", () => {
+    // Materialising on the ancestor merely existing would trade the user's
+    // explicit null for an empty object with nothing put back into it.
+    const submitted = { spec: null } as Record<string, unknown>
+    const original = { spec: { storage: { size: "10Gi" } } }
+    const result = overlayImmutable(submitted, original, [
+      ["spec", "storage", "storageClass"],
+    ])
+    expect(result).toEqual({ spec: null })
+  })
+
+  // No shipped schema nests a wildcard under an immutable path yet; these pin
+  // the two answers the leaf check gives when one does. A granular wildcard
+  // overlays element by element against what the user submitted, so an
+  // ancestor they deleted is not rebuilt to hold entries they removed.
+  it("leaves a deleted ancestor alone when a granular wildcard sits under it", () => {
+    const submitted = { spec: null } as Record<string, unknown>
+    const original = { spec: { items: [{ storageClass: "replicated" }] } }
+    const result = overlayImmutable(submitted, original, [
+      ["spec", "items", "*", "storageClass"],
+    ])
+    expect(result).toEqual({ spec: null })
+  })
+
+  // A trailing wildcard freezes the whole collection instead, so there the
+  // ancestor is rebuilt and the collection comes back.
+  it("rebuilds a deleted ancestor when the wildcard is the immutable leaf", () => {
+    const submitted = { spec: null } as Record<string, unknown>
+    const original = { spec: { items: [{ storageClass: "replicated" }] } }
+    const result = overlayImmutable(submitted, original, [["spec", "items", "*"]])
+    expect(result).toEqual({
+      spec: { items: [{ storageClass: "replicated" }] },
+    })
+  })
+
+  it("array reordering by the user with index-aligned overlay re-anchors source values to the new index (pinned current behaviour)", () => {
+    // Tracked in cozystack/cozystack-ui#10.
+    // The overlay walks by index, not by content identity. Reordering an
+    // immutable array maps source[i] onto target[i]'s new value — which
+    // for a per-element-name-immutable schema swaps the names back to the
+    // source order. Pinned as current behaviour. Identity-based matching
+    // (e.g. by a stable id field) would be a separate change.
+    const submitted = {
+      disks: [
+        { name: "b", size: "2Gi" },
+        { name: "a", size: "1Gi" },
+      ],
+    }
+    const original = {
+      disks: [
+        { name: "a", size: "1Gi" },
+        { name: "b", size: "2Gi" },
+      ],
+    }
+    expect(
+      overlayImmutable(submitted, original, [["disks", "*", "name"]]),
+    ).toEqual({
+      disks: [
+        { name: "a", size: "2Gi" },
+        { name: "b", size: "1Gi" },
+      ],
+    })
+  })
+
+  it("does not mutate inputs", () => {
+    const submitted = { storageClass: "fast", arr: [1, 2] }
+    const original = { storageClass: "slow", arr: [9] }
+    overlayImmutable(submitted, original, [["storageClass"]])
+    expect(submitted).toEqual({ storageClass: "fast", arr: [1, 2] })
+    expect(original).toEqual({ storageClass: "slow", arr: [9] })
+  })
+
+  it("warns and returns a clone of original when the root path is immutable", () => {
+    const warn = vi.spyOn(console, "warn").mockImplementation(() => {})
+    const submitted = { foo: "x", bar: "y" }
+    const original = { foo: "X", bar: "Y" }
+    const result = overlayImmutable(submitted, original, [[]])
+    expect(result).toEqual(original)
+    expect(warn).toHaveBeenCalledTimes(1)
+    expect(warn.mock.calls[0][0]).toMatch(/root-level immutable/i)
+    warn.mockRestore()
+  })
+
+  it("keeps user-added array entries with their submitted (non-source-derived) name", () => {
+    // User added two entries past the original length. The nested
+    // immutable field has no source counterpart for those new indices,
+    // so the submitted values must survive unchanged.
+    const submitted = {
+      disks: [
+        { name: "a", size: "1Gi" },
+        { name: "b", size: "2Gi" },
+        { name: "c", size: "3Gi" },
+      ],
+    }
+    const original = { disks: [{ name: "A", size: "9Gi" }] }
+    expect(
+      overlayImmutable(submitted, original, [["disks", "*", "name"]]),
+    ).toEqual({
+      disks: [
+        { name: "A", size: "1Gi" },
+        { name: "b", size: "2Gi" },
+        { name: "c", size: "3Gi" },
+      ],
+    })
+  })
+
+  it("does not access prototype methods unsafely when the field is missing on both sides", () => {
+    // Regression: targetObj.hasOwnProperty was used directly, tripping
+    // no-prototype-builtins. Cover the path explicitly: neither side has
+    // the immutable field — overlay must be a no-op without throwing.
+    const submitted = { other: "x" } as Record<string, unknown>
+    const original = { other: "y" } as Record<string, unknown>
+    expect(
+      overlayImmutable(submitted, original, [["storageClass"]]),
+    ).toEqual({ other: "x" })
+  })
+})
diff --git a/packages/system/dashboard/images/console/apps/console/src/lib/immutable-paths.ts b/packages/system/dashboard/images/console/apps/console/src/lib/immutable-paths.ts
new file mode 100644
index 0000000000..2bf6ccebd2
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/lib/immutable-paths.ts
@@ -0,0 +1,282 @@
+/**
+ * Discovery and enforcement of Kubernetes-style immutability rules
+ * (`x-kubernetes-validations: [{rule: "self == oldSelf"}]`) on OpenAPI/JSON
+ * schemas served by Cozystack ApplicationDefinitions and CRDs.
+ *
+ * The UI strips this extension before handing the schema to AJV (which has no
+ * CEL evaluator); the paths it announces are used to (a) mark form fields as
+ * read-only in edit mode and (b) overlay the original values into PUT bodies
+ * so the API server never observes a change on those paths.
+ */
+
+export type ImmutablePath = readonly string[]
+
+export const IMMUTABLE_HELP_TEXT =
+  "This field cannot be changed after creation."
+
+const IMMUTABILITY_RULE = "self == oldSelf"
+
+const isPlainObject = (v: unknown): v is Record<string, unknown> =>
+  v !== null && typeof v === "object" && !Array.isArray(v)
+
+const hasImmutabilityRule = (node: unknown): boolean => {
+  if (!isPlainObject(node)) return false
+  const validations = node["x-kubernetes-validations"]
+  if (!Array.isArray(validations)) return false
+  return validations.some(
+    (v) => isPlainObject(v) && v.rule === IMMUTABILITY_RULE,
+  )
+}
+
+const branchHasImmutability = (node: unknown): boolean => {
+  if (!isPlainObject(node)) return false
+  if (hasImmutabilityRule(node)) return true
+  for (const key of ["oneOf", "anyOf", "allOf"] as const) {
+    const branches = node[key]
+    if (Array.isArray(branches) && branches.some(branchHasImmutability)) {
+      return true
+    }
+  }
+  return false
+}
+
+export function findImmutablePaths(schema: unknown): ImmutablePath[] {
+  const out: string[][] = []
+  walk(schema, [], out)
+  return out
+}
+
+function walk(node: unknown, path: string[], out: string[][]): void {
+  if (!isPlainObject(node)) return
+
+  if (branchHasImmutability(node)) {
+    out.push([...path])
+    return
+  }
+
+  const properties = node.properties
+  if (isPlainObject(properties)) {
+    for (const [key, value] of Object.entries(properties)) {
+      walk(value, [...path, key], out)
+    }
+  }
+
+  const items = node.items
+  if (isPlainObject(items)) {
+    walk(items, [...path, "*"], out)
+  }
+
+  const additional = node.additionalProperties
+  if (isPlainObject(additional)) {
+    walk(additional, [...path, "*"], out)
+  }
+}
+
+export function overlayImmutable<T>(
+  submitted: T,
+  original: T,
+  paths: readonly ImmutablePath[],
+): T {
+  if (paths.some((p) => p.length === 0)) {
+    // The schema flags the whole subtree as immutable; whatever the user
+    // changed in the form is dropped on the floor. That's almost always a
+    // schema-authoring mistake (rule belongs on a property, not the root)
+    // so make it visible in the console.
+    console.warn(
+      "overlayImmutable: a root-level immutable path was supplied; " +
+        "the submitted value is replaced wholesale by the original.",
+    )
+    return deepClone(original)
+  }
+  if (paths.some((p) => p[0] === "*")) {
+    // A leading wildcard would land at the very top of the structure and
+    // overlay nothing useful (the root is an array or map, not an object
+    // we can deepen into). Mirror the root-immutable handling: warn and
+    // hand back a clone of original.
+    console.warn(
+      "overlayImmutable: a top-level wildcard immutable path was supplied; " +
+        "the submitted value is replaced wholesale by the original.",
+    )
+    return deepClone(original)
+  }
+  const next = deepClone(submitted)
+  for (const path of paths) {
+    if (wildcardArrayLengthChanged(next, original, path)) {
+      // Index-aligned overlay corrupts the user's deletion/insertion when
+      // a per-element-nested-immutable path crosses an array whose length
+      // changed. The UI greys those fields out, so the only ways to land
+      // here are the YAML editor or devtools — the API server will reject
+      // a per-element mutation via CEL. Skip the overlay (warn for diag)
+      // rather than silently re-anchor source values to user indices.
+      console.warn(
+        "overlayImmutable: array length changed at wildcard segment of",
+        path.join("."),
+        "— skipping overlay for this path; admission will enforce.",
+      )
+      continue
+    }
+    overlayPath(next, original, path, 0)
+  }
+  return next
+}
+
+function wildcardArrayLengthChanged(
+  submitted: unknown,
+  original: unknown,
+  path: ImmutablePath,
+): boolean {
+  let subCur: unknown = submitted
+  let origCur: unknown = original
+  for (let i = 0; i < path.length; i++) {
+    const seg = path[i]
+    if (seg === "*") {
+      // Whole-array immutability (*-last) is fine to overlay even when the
+      // user changed the length — the semantics is "freeze, replace from
+      // source", and that's exactly what the *-last branch does.
+      const isLast = i === path.length - 1
+      if (isLast) return false
+      // Per-element-nested immutability (*-not-last) is the case that can
+      // silently corrupt on SHRINK (we'd re-anchor source values onto the
+      // user's surviving indices, which may belong to a different element
+      // than the user thought they kept). On grow the shared indices stay
+      // put and the new entries past source.length keep the user's values,
+      // so growth is safe to overlay.
+      if (Array.isArray(subCur) && Array.isArray(origCur)) {
+        return subCur.length < origCur.length
+      }
+      return false
+    }
+    if (!isPlainObject(subCur) || !isPlainObject(origCur)) return false
+    subCur = (subCur as Record<string, unknown>)[seg]
+    origCur = (origCur as Record<string, unknown>)[seg]
+  }
+  return false
+}
+
+/**
+ * Whether source still holds a value at the end of the remaining path.
+ * Materialising a missing intermediate object is only justified when there is
+ * a leaf to restore into it — keyed on the ancestor merely existing, an
+ * explicit null the user parked at that ancestor would be replaced by an empty
+ * object with nothing put back.
+ */
+function sourceHasLeaf(
+  source: unknown,
+  path: ImmutablePath,
+  depth: number,
+): boolean {
+  if (depth === path.length) return source !== undefined
+  const seg = path[depth]
+  if (seg === "*") {
+    // A trailing wildcard freezes the whole collection, so source holding it
+    // is the value to restore. A wildcard with more path under it overlays
+    // element by element against the collection the user submitted, so one
+    // they removed has already answered what belongs there -- materialising
+    // it would put the deleted entries back.
+    return depth === path.length - 1 && source !== undefined
+  }
+  if (!isPlainObject(source)) return false
+  return sourceHasLeaf(source[seg], path, depth + 1)
+}
+
+function overlayPath(
+  target: unknown,
+  source: unknown,
+  path: ImmutablePath,
+  depth: number,
+): unknown {
+  if (depth === path.length) {
+    // End of the path: copy the source value. If source has nothing at
+    // this position keep what the user submitted (avoids blanking fields
+    // that the persisted spec doesn't echo back).
+    if (source === undefined) return target
+    return deepClone(source)
+  }
+  const seg = path[depth]
+  if (seg === "*") {
+    return overlayWildcard(target, source, path, depth)
+  }
+  const sourceObj = isPlainObject(source) ? source : undefined
+  const sourceVal = sourceObj ? sourceObj[seg] : undefined
+  const targetObj = isPlainObject(target)
+    ? (target as Record<string, unknown>)
+    : // A YAML edit can drop the whole intermediate object; materialise it so
+      // the immutable leaf underneath is still restored from source. Only when
+      // source actually has that leaf, so a null the user parked here is not
+      // traded for an empty object holding nothing.
+      (target === undefined || target === null) &&
+        sourceHasLeaf(sourceVal, path, depth + 1)
+      ? {}
+      : null
+  if (!targetObj) return target
+  if (
+    sourceVal === undefined &&
+    !Object.prototype.hasOwnProperty.call(targetObj, seg)
+  ) {
+    // Neither side has anything at this path; nothing to overlay or insert.
+    return targetObj
+  }
+  targetObj[seg] = overlayPath(targetObj[seg], sourceVal, path, depth + 1)
+  return targetObj
+}
+
+/**
+ * A wildcard segment represents either "every element of an array" or
+ * "every entry of an object map" (additionalProperties). The walker emits
+ * the same "*" symbol for both because the schema decides at runtime
+ * which kind of node sits at the path; we dispatch on the actual value
+ * shape here.
+ *
+ * Whole-collection immutable (*-last): replace target with a deep clone
+ * of source, freezing the collection wholesale. Granular immutable
+ * (*-not-last): iterate the user's collection (so adds and removes
+ * survive) and overlay the nested immutable subfield from source on
+ * shared elements/keys.
+ */
+function overlayWildcard(
+  target: unknown,
+  source: unknown,
+  path: ImmutablePath,
+  depth: number,
+): unknown {
+  const isLast = depth === path.length - 1
+
+  if (Array.isArray(source)) {
+    if (isLast) return deepClone(source)
+    const targetArr = Array.isArray(target) ? target : []
+    const out: unknown[] = []
+    for (let i = 0; i < targetArr.length; i++) {
+      if (i < source.length) {
+        out[i] = overlayPath(targetArr[i], source[i], path, depth + 1)
+      } else {
+        out[i] = deepClone(targetArr[i])
+      }
+    }
+    return out
+  }
+
+  if (isPlainObject(source)) {
+    // For additionalProperties (object maps) we freeze the whole map
+    // regardless of whether * is last or not. The UI marks the field
+    // ui:disabled and hides Add/Remove, so this overlay aligns the
+    // defence-in-depth (YAML editor / devtools) with what the form
+    // already enforces — added keys are dropped, removed keys are
+    // reinstated, every value is reset to source.
+    return deepClone(source)
+  }
+
+  return target
+}
+
+function deepClone<T>(value: T): T {
+  if (value === null || value === undefined) return value
+  if (Array.isArray(value)) return value.map(deepClone) as unknown as T
+  if (typeof value === "object") {
+    const out: Record<string, unknown> = {}
+    for (const [k, v] of Object.entries(value as Record<string, unknown>)) {
+      out[k] = deepClone(v)
+    }
+    return out as unknown as T
+  }
+  return value
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/lib/k8s-quantity.test.ts b/packages/system/dashboard/images/console/apps/console/src/lib/k8s-quantity.test.ts
new file mode 100644
index 0000000000..064ed2857c
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/lib/k8s-quantity.test.ts
@@ -0,0 +1,139 @@
+import { describe, it, expect } from "vitest"
+import { parseQuantity, humanizeBytes, humanizeCpu } from "./k8s-quantity.ts"
+
+describe("parseQuantity", () => {
+  it("returns 0 for the empty string", () => {
+    expect(parseQuantity("")).toBe(0)
+  })
+
+  it("parses milli suffix to a fractional value", () => {
+    expect(parseQuantity("500m")).toBe(0.5)
+  })
+
+  it("parses milli values greater than one core", () => {
+    expect(parseQuantity("1500m")).toBe(1.5)
+  })
+
+  it("parses Ki as 1024", () => {
+    expect(parseQuantity("1Ki")).toBe(1024)
+  })
+
+  it("parses Mi as 1024 squared", () => {
+    expect(parseQuantity("1Mi")).toBe(1024 ** 2)
+  })
+
+  it("parses Gi as 1024 cubed", () => {
+    expect(parseQuantity("1Gi")).toBe(1024 ** 3)
+  })
+
+  it("parses Ti as 1024 to the fourth", () => {
+    expect(parseQuantity("1Ti")).toBe(1024 ** 4)
+  })
+
+  it("parses Pi as 1024 to the fifth", () => {
+    expect(parseQuantity("1Pi")).toBe(1024 ** 5)
+  })
+
+  it("parses Ei as 1024 to the sixth", () => {
+    expect(parseQuantity("1Ei")).toBe(1024 ** 6)
+  })
+
+  it("parses decimal k suffix as 1000", () => {
+    expect(parseQuantity("1k")).toBe(1000)
+  })
+
+  it("parses decimal M suffix as 1000 squared", () => {
+    expect(parseQuantity("1M")).toBe(1_000_000)
+  })
+
+  it("parses decimal G suffix as 1000 cubed", () => {
+    expect(parseQuantity("1G")).toBe(1_000_000_000)
+  })
+
+  it("parses nano suffix — metrics-server reports CPU usage in nanocores", () => {
+    expect(parseQuantity("2785315627n")).toBeCloseTo(2.785315627, 6)
+  })
+
+  it("parses micro suffix as a millionth", () => {
+    expect(parseQuantity("500u")).toBe(500 / 1e6)
+  })
+
+  it("parses zero nanocores", () => {
+    expect(parseQuantity("0n")).toBe(0)
+  })
+
+  it("parses a bare integer", () => {
+    expect(parseQuantity("42")).toBe(42)
+  })
+
+  it("parses a bare decimal", () => {
+    expect(parseQuantity("1.5")).toBe(1.5)
+  })
+
+  it("parses a fractional Gi value", () => {
+    expect(parseQuantity("1.5Gi")).toBe(1.5 * 1024 ** 3)
+  })
+
+  it("falls back to 0 for unparseable input", () => {
+    expect(parseQuantity("abc")).toBe(0)
+  })
+
+  it("returns 0 for a bare suffix instead of poisoning totals with NaN", () => {
+    // A malformed quantity (just a suffix, no number) must not propagate NaN
+    // into the aggregated totals and UI percentages.
+    expect(parseQuantity("m")).toBe(0)
+    expect(parseQuantity("Gi")).toBe(0)
+    expect(parseQuantity("Ki")).toBe(0)
+  })
+
+  it("parses zero", () => {
+    expect(parseQuantity("0")).toBe(0)
+  })
+
+  it("parses zero with a suffix", () => {
+    expect(parseQuantity("0Gi")).toBe(0)
+  })
+})
+
+describe("humanizeBytes", () => {
+  it("formats sub-kilobyte values with a B suffix", () => {
+    expect(humanizeBytes(0)).toBe("0B")
+    expect(humanizeBytes(1023)).toBe("1023B")
+  })
+
+  it("formats kilobytes as Ki without decimals", () => {
+    expect(humanizeBytes(1024)).toBe("1Ki")
+    expect(humanizeBytes(512 * 1024)).toBe("512Ki")
+  })
+
+  it("formats megabytes as Mi without decimals", () => {
+    expect(humanizeBytes(1024 ** 2)).toBe("1Mi")
+  })
+
+  it("formats gigabytes as Gi with one decimal", () => {
+    expect(humanizeBytes(1.5 * 1024 ** 3)).toBe("1.5Gi")
+  })
+
+  it("formats terabytes as Ti with one decimal", () => {
+    expect(humanizeBytes(1024 ** 4)).toBe("1.0Ti")
+  })
+})
+
+describe("humanizeCpu", () => {
+  it("formats zero as 0m", () => {
+    expect(humanizeCpu(0)).toBe("0m")
+  })
+
+  it("formats half a core as 500m", () => {
+    expect(humanizeCpu(0.5)).toBe("500m")
+  })
+
+  it("formats an integer core count without decimals", () => {
+    expect(humanizeCpu(1)).toBe("1")
+    expect(humanizeCpu(2)).toBe("2")
+  })
+
+  it("formats a non-integer core count with two decimals", () => {
+    expect(humanizeCpu(1.5)).toBe("1.50")
+  })
+})
diff --git a/packages/system/dashboard/images/console/apps/console/src/lib/k8s-quantity.ts b/packages/system/dashboard/images/console/apps/console/src/lib/k8s-quantity.ts
new file mode 100644
index 0000000000..8ed3a512ef
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/lib/k8s-quantity.ts
@@ -0,0 +1,43 @@
+/**
+ * Parse a Kubernetes resource.Quantity string into a numeric value in
+ * the canonical units (cores for CPU, bytes for memory). Extracted from
+ * the QuotaDisplay helpers; nano/micro (n/u) support was added on top for
+ * the nanocore CPU values metrics-server reports. See the test file for
+ * the pinned edge cases.
+ */
+export function parseQuantity(s: string): number {
+  if (!s) return 0
+  // A malformed quantity (e.g. a bare suffix like "m") parses to NaN, which
+  // would poison every total and percentage it feeds into. Treat it as 0.
+  const n = parseFloat(s)
+  if (!Number.isFinite(n)) return 0
+  if (s.endsWith("m")) return n / 1000
+  // Decimal SI sub-units — metrics-server reports CPU usage in nanocores
+  if (s.endsWith("n")) return n / 1e9
+  if (s.endsWith("u")) return n / 1e6
+  // Binary SI suffixes (powers of 1024)
+  if (s.endsWith("Ki")) return n * 1024
+  if (s.endsWith("Mi")) return n * 1024 ** 2
+  if (s.endsWith("Gi")) return n * 1024 ** 3
+  if (s.endsWith("Ti")) return n * 1024 ** 4
+  if (s.endsWith("Pi")) return n * 1024 ** 5
+  if (s.endsWith("Ei")) return n * 1024 ** 6
+  // Decimal SI suffixes (powers of 1000) — Kubernetes uses lowercase k
+  if (s.endsWith("k")) return n * 1000
+  if (s.endsWith("M")) return n * 1000 ** 2
+  if (s.endsWith("G")) return n * 1000 ** 3
+  return n
+}
+
+export function humanizeBytes(bytes: number): string {
+  if (bytes >= 1024 ** 4) return `${(bytes / 1024 ** 4).toFixed(1)}Ti`
+  if (bytes >= 1024 ** 3) return `${(bytes / 1024 ** 3).toFixed(1)}Gi`
+  if (bytes >= 1024 ** 2) return `${(bytes / 1024 ** 2).toFixed(0)}Mi`
+  if (bytes >= 1024) return `${(bytes / 1024).toFixed(0)}Ki`
+  return `${bytes}B`
+}
+
+export function humanizeCpu(val: number): string {
+  if (val < 1) return `${Math.round(val * 1000)}m`
+  return `${val % 1 === 0 ? val : val.toFixed(2)}`
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/lib/keys-order.test.ts b/packages/system/dashboard/images/console/apps/console/src/lib/keys-order.test.ts
new file mode 100644
index 0000000000..c281b4cba7
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/lib/keys-order.test.ts
@@ -0,0 +1,101 @@
+import { describe, it, expect } from "vitest"
+import { keysOrderToUiSchema, sanitizeSchema } from "./keys-order.ts"
+
+describe("keysOrderToUiSchema", () => {
+  it("returns empty object for missing/empty input", () => {
+    expect(keysOrderToUiSchema(undefined)).toEqual({})
+    expect(keysOrderToUiSchema([])).toEqual({})
+  })
+
+  it("ignores meta paths (apiVersion, kind, metadata) and only emits spec keys", () => {
+    const ui = keysOrderToUiSchema([
+      ["apiVersion"],
+      ["kind"],
+      ["metadata"],
+      ["metadata", "name"],
+      ["spec", "storageClass"],
+      ["spec", "size"],
+    ])
+    expect(ui).toEqual({ "ui:order": ["storageClass", "size", "*"] })
+  })
+
+  it("nests ui:order per parent path", () => {
+    const ui = keysOrderToUiSchema([
+      ["spec", "nodeGroups"],
+      ["spec", "nodeGroups", "md0"],
+      ["spec", "nodeGroups", "md0", "minReplicas"],
+      ["spec", "nodeGroups", "md0", "maxReplicas"],
+    ])
+    expect(ui).toEqual({
+      "ui:order": ["nodeGroups", "*"],
+      nodeGroups: {
+        "ui:order": ["md0", "*"],
+        md0: {
+          "ui:order": ["minReplicas", "maxReplicas", "*"],
+        },
+      },
+    })
+  })
+})
+
+describe("sanitizeSchema", () => {
+  it("returns scalars and null unchanged", () => {
+    expect(sanitizeSchema(null)).toBe(null)
+    expect(sanitizeSchema(42)).toBe(42)
+    expect(sanitizeSchema("x")).toBe("x")
+  })
+
+  it("recurses into arrays", () => {
+    const input = [{ type: "string" }, { type: "integer" }]
+    expect(sanitizeSchema(input)).toEqual(input)
+  })
+
+  it("coerces x-kubernetes-int-or-string to string type and drops anyOf", () => {
+    const out = sanitizeSchema({
+      "x-kubernetes-int-or-string": true,
+      anyOf: [{ type: "integer" }, { type: "string" }],
+    })
+    expect(out.type).toBe("string")
+    expect(out.anyOf).toBeUndefined()
+  })
+
+  it("coerces x-kubernetes-preserve-unknown-fields on a propertyless object", () => {
+    const out = sanitizeSchema({
+      "x-kubernetes-preserve-unknown-fields": true,
+    })
+    expect(out.type).toBe("object")
+    expect(out.additionalProperties).toBe(true)
+  })
+
+  it("rewrites \"Chart Values\" title to \"Parameters\"", () => {
+    expect(sanitizeSchema({ title: "Chart Values" }).title).toBe("Parameters")
+    expect(sanitizeSchema({ title: "Other" }).title).toBe("Other")
+  })
+
+  it("strips x-kubernetes-validations from any level", () => {
+    const input = {
+      properties: {
+        storageClass: {
+          type: "string",
+          "x-kubernetes-validations": [
+            { rule: "self == oldSelf", message: "immutable" },
+          ],
+        },
+        nested: {
+          properties: {
+            inner: {
+              type: "integer",
+              "x-kubernetes-validations": [{ rule: "self > 0" }],
+            },
+          },
+        },
+      },
+    }
+    const out = sanitizeSchema(input)
+    expect(out.properties.storageClass["x-kubernetes-validations"]).toBeUndefined()
+    expect(
+      out.properties.nested.properties.inner["x-kubernetes-validations"],
+    ).toBeUndefined()
+    expect(out.properties.storageClass.type).toBe("string")
+  })
+})
diff --git a/packages/system/dashboard/images/console/apps/console/src/lib/keys-order.ts b/packages/system/dashboard/images/console/apps/console/src/lib/keys-order.ts
new file mode 100644
index 0000000000..080f5ea963
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/lib/keys-order.ts
@@ -0,0 +1,101 @@
+import type { UiSchema } from "@rjsf/utils"
+
+/**
+ * ApplicationDefinition.spec.dashboard.keysOrder is a list of key paths that
+ * tell the dashboard in what order to render form fields. Entries that refer
+ * to `apiVersion`, `kind` or `metadata` are meta and handled outside of the
+ * spec form — we only care about paths starting with `spec`.
+ *
+ * Example:
+ *   keysOrder = [
+ *     ["apiVersion"],
+ *     ["kind"],
+ *     ["metadata"],
+ *     ["metadata", "name"],
+ *     ["spec", "storageClass"],
+ *     ["spec", "nodeGroups"],
+ *     ["spec", "nodeGroups", "md0"],
+ *     ["spec", "nodeGroups", "md0", "minReplicas"],
+ *     ["spec", "nodeGroups", "md0", "maxReplicas"],
+ *   ]
+ *
+ * This function returns a UiSchema where `ui:order` arrays are assembled per
+ * nesting level so that RJSF renders top-level spec keys, then nested keys,
+ * in the requested order.
+ */
+export function keysOrderToUiSchema(
+  keysOrder: ReadonlyArray<ReadonlyArray<string>> | undefined,
+): UiSchema {
+  if (!keysOrder || keysOrder.length === 0) return {}
+
+  // Group paths by their parent path.
+  const groups = new Map<string, string[]>()
+  for (const path of keysOrder) {
+    if (path.length < 2 || path[0] !== "spec") continue
+    const parent = path.slice(0, -1).join(".")
+    const key = path[path.length - 1]
+    const arr = groups.get(parent) ?? []
+    if (!arr.includes(key)) arr.push(key)
+    groups.set(parent, arr)
+  }
+
+  const root: UiSchema = {}
+  for (const [parent, order] of groups) {
+    // Strip the leading "spec" since RJSF is applied to the spec subtree.
+    const parts = parent.split(".").slice(1)
+    let target: Record<string, unknown> = root as Record<string, unknown>
+    for (const p of parts) {
+      target[p] = target[p] ?? {}
+      target = target[p] as Record<string, unknown>
+    }
+    target["ui:order"] = [...order, "*"]
+  }
+  return root
+}
+
+/**
+ * Cozystack OpenAPI schemas use Kubernetes-specific extensions that JSON
+ * Schema validators don't understand. The ones we care about:
+ *
+ *   - `x-kubernetes-int-or-string` together with `anyOf: [{integer},{string}]`
+ *     — the field accepts either; we let the form render a text input and
+ *     cast on submit.
+ *   - `x-kubernetes-preserve-unknown-fields: true` on an object without
+ *     properties — arbitrary nested values allowed. Left as a "raw" object
+ *     (handled via additionalProperties: true).
+ *   - `x-kubernetes-validations` — CEL rules. We drop them here entirely.
+ *     AJV has no CEL evaluator so the rules are pure noise to the form
+ *     validator; immutability is harvested up-front by `findImmutablePaths`
+ *     on the raw schema (see lib/immutable-paths.ts) and surfaced through
+ *     uiSchema, not through AJV.
+ */
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export function sanitizeSchema(schema: any): any {
+  if (!schema || typeof schema !== "object") return schema
+  if (Array.isArray(schema)) return schema.map(sanitizeSchema)
+
+  const out: Record<string, unknown> = {}
+  for (const [k, v] of Object.entries(schema)) {
+    if (k === "anyOf" && schema["x-kubernetes-int-or-string"]) continue
+    // CEL validations have no JSON-Schema validator-side semantics; the UI
+    // extracts immutability paths up-front in SchemaForm and then strips
+    // the rules so AJV doesn't waste cycles traversing them.
+    if (k === "x-kubernetes-validations") continue
+    out[k] = sanitizeSchema(v)
+  }
+
+  if (schema["x-kubernetes-int-or-string"]) {
+    out.type = "string"
+  }
+  if (schema["x-kubernetes-preserve-unknown-fields"] && !schema.properties) {
+    out.type = "object"
+    out.additionalProperties = true
+  }
+
+  // Replace "Chart Values" title with "Parameters"
+  if (out.title === "Chart Values") {
+    out.title = "Parameters"
+  }
+
+  return out
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/lib/labels.ts b/packages/system/dashboard/images/console/apps/console/src/lib/labels.ts
new file mode 100644
index 0000000000..a889979da2
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/lib/labels.ts
@@ -0,0 +1,27 @@
+import type {
+  ApplicationDefinition,
+  ApplicationInstance,
+} from "@cozystack/types"
+import { APPS_GROUP } from "@cozystack/types"
+
+/**
+ * Build a label selector that matches all Kubernetes objects created by the
+ * application chart for a specific instance. Cozystack helm templates stamp
+ * every resource with:
+ *
+ *   apps.cozystack.io/application.kind: <Kind>
+ *   apps.cozystack.io/application.name: <instanceName>
+ *
+ * We filter by both so sibling applications in the same namespace don't bleed
+ * into the detail view.
+ */
+export function appInstanceLabel(
+  ad: ApplicationDefinition,
+  instance: ApplicationInstance,
+): string {
+  const kind = ad.spec?.application.kind ?? ""
+  return [
+    `${APPS_GROUP}/application.kind=${kind}`,
+    `${APPS_GROUP}/application.name=${instance.metadata.name}`,
+  ].join(",")
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/lib/migration.ts b/packages/system/dashboard/images/console/apps/console/src/lib/migration.ts
new file mode 100644
index 0000000000..040964fc3d
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/lib/migration.ts
@@ -0,0 +1,85 @@
+/**
+ * Shared shapes and helpers for the forklift.cozystack.io console pages.
+ *
+ * The API is a pair split by lifecycle: a VMImportSource is a long-lived
+ * connection whose readiness is a condition, and a VMImportTask is a one-shot
+ * operation with a phase and per-machine progress. Deleting a task leaves the
+ * disks and instances it produced in place.
+ */
+
+export const MIGRATION_GROUP = "forklift.cozystack.io"
+export const MIGRATION_VERSION = "v1alpha1"
+
+export type MigrationResourceType = "vmimportsources" | "vmimporttasks"
+
+export interface MigrationCondition {
+  type: string
+  status: string
+  reason?: string
+  message?: string
+}
+
+export interface VMImportVMStatus {
+  id: string
+  name?: string
+  phase?: string
+  progress?: number
+  vmInstance?: string
+  disks?: string[]
+  message?: string
+}
+
+export interface MigrationResource {
+  apiVersion: string
+  kind: string
+  metadata: {
+    name: string
+    namespace?: string
+    creationTimestamp?: string
+  }
+  spec?: {
+    // VMImportSource
+    type?: string
+    url?: string
+    // VMImportTask
+    sourceRef?: { name?: string }
+    storageClass?: string
+    vms?: Array<{
+      id: string
+      name?: string
+      instanceType?: string
+      instanceProfile?: string
+    }>
+  }
+  status?: {
+    phase?: string
+    message?: string
+    startedAt?: string
+    completedAt?: string
+    vms?: VMImportVMStatus[]
+    conditions?: MigrationCondition[]
+  }
+}
+
+export function readyCondition(resource: MigrationResource): MigrationCondition | undefined {
+  return resource.status?.conditions?.find((c) => c.type === "Ready")
+}
+
+/**
+ * Whole-task progress as the mean over its machines, so a two-machine import
+ * with one finished disk reads 50% rather than jumping between per-machine
+ * numbers. Returns null when there is nothing to average yet.
+ */
+export function taskProgress(resource: MigrationResource): number | null {
+  const vms = resource.status?.vms
+  if (!vms || vms.length === 0) return null
+  const total = vms.reduce((sum, vm) => sum + (vm.progress ?? 0), 0)
+  return Math.round(total / vms.length)
+}
+
+/** Tone for a phase or condition string, shared by the list and detail pages. */
+export function phaseTone(phase: string | undefined): "ok" | "error" | "warn" {
+  if (phase === "Succeeded" || phase === "Ready" || phase === "True") return "ok"
+  if (phase === "Failed" || phase === "False") return "error"
+  return "warn"
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/lib/monaco-setup.test.ts b/packages/system/dashboard/images/console/apps/console/src/lib/monaco-setup.test.ts
new file mode 100644
index 0000000000..e9642ab589
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/lib/monaco-setup.test.ts
@@ -0,0 +1,40 @@
+import { describe, it, expect, vi } from "vitest"
+
+// Mock the heavy/browser-only modules so the setup can be imported in jsdom and
+// we can assert how it wires things — without loading real monaco or workers.
+const configSpy = vi.fn()
+vi.mock("@monaco-editor/react", () => ({ loader: { config: configSpy } }))
+vi.mock("monaco-editor", () => ({ editor: {} }))
+
+class EditorWorker {}
+class JsonWorker {}
+class OtherWorker {}
+vi.mock("monaco-editor/esm/vs/editor/editor.worker?worker", () => ({ default: EditorWorker }))
+vi.mock("monaco-editor/esm/vs/language/json/json.worker?worker", () => ({ default: JsonWorker }))
+vi.mock("monaco-editor/esm/vs/language/css/css.worker?worker", () => ({ default: OtherWorker }))
+vi.mock("monaco-editor/esm/vs/language/html/html.worker?worker", () => ({ default: OtherWorker }))
+vi.mock("monaco-editor/esm/vs/language/typescript/ts.worker?worker", () => ({
+  default: OtherWorker,
+}))
+
+interface MonacoEnv {
+  getWorker(workerId: string, label: string): Worker
+}
+
+describe("monaco-setup", () => {
+  it("points @monaco-editor/react at the bundled monaco so it never loads from a CDN", async () => {
+    await import("./monaco-setup.ts")
+    expect(configSpy).toHaveBeenCalledWith(
+      expect.objectContaining({ monaco: expect.anything() }),
+    )
+  })
+
+  it("routes language workers to the bundled copies and falls back to the editor worker", async () => {
+    await import("./monaco-setup.ts")
+    const env = (self as unknown as { MonacoEnvironment?: MonacoEnv }).MonacoEnvironment
+    if (!env) throw new Error("monaco-setup did not install MonacoEnvironment")
+    expect(env.getWorker("x", "json")).toBeInstanceOf(JsonWorker)
+    // unknown labels (e.g. yaml) get the base editor worker
+    expect(env.getWorker("x", "yaml")).toBeInstanceOf(EditorWorker)
+  })
+})
diff --git a/packages/system/dashboard/images/console/apps/console/src/lib/monaco-setup.ts b/packages/system/dashboard/images/console/apps/console/src/lib/monaco-setup.ts
new file mode 100644
index 0000000000..f07323d09f
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/lib/monaco-setup.ts
@@ -0,0 +1,33 @@
+import * as monaco from "monaco-editor"
+import { loader } from "@monaco-editor/react"
+import EditorWorker from "monaco-editor/esm/vs/editor/editor.worker?worker"
+import JsonWorker from "monaco-editor/esm/vs/language/json/json.worker?worker"
+import CssWorker from "monaco-editor/esm/vs/language/css/css.worker?worker"
+import HtmlWorker from "monaco-editor/esm/vs/language/html/html.worker?worker"
+import TsWorker from "monaco-editor/esm/vs/language/typescript/ts.worker?worker"
+
+// Self-host monaco. Without loader.config the @monaco-editor/react default
+// loader fetches the whole editor from jsDelivr at runtime, which stalls
+// forever on air-gapped or flaky networks. Pointing it at the bundled copy and
+// routing the language workers to bundled copies keeps everything on the app's
+// own origin.
+const WORKERS: Record<string, new () => Worker> = {
+  json: JsonWorker,
+  css: CssWorker,
+  scss: CssWorker,
+  less: CssWorker,
+  html: HtmlWorker,
+  handlebars: HtmlWorker,
+  razor: HtmlWorker,
+  typescript: TsWorker,
+  javascript: TsWorker,
+}
+
+self.MonacoEnvironment = {
+  getWorker(_workerId: string, label: string): Worker {
+    const WorkerCtor = WORKERS[label] ?? EditorWorker
+    return new WorkerCtor()
+  },
+}
+
+loader.config({ monaco })
diff --git a/packages/system/dashboard/images/console/apps/console/src/lib/platform.ts b/packages/system/dashboard/images/console/apps/console/src/lib/platform.ts
new file mode 100644
index 0000000000..9d95127210
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/lib/platform.ts
@@ -0,0 +1,12 @@
+/**
+ * Whether the paste chord on this machine is Cmd rather than Ctrl.
+ *
+ * Read at the moment a key is handled rather than through a hook: the console
+ * tabs hold a live socket, and a state change that lands after the first
+ * render would tear the session down and rebuild it.
+ */
+export function pastesWithMeta(): boolean {
+  if (typeof navigator === "undefined") return false
+  const platform = navigator.platform ?? ""
+  return /mac|iphone|ipad|ipod/i.test(platform)
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/lib/portal.ts b/packages/system/dashboard/images/console/apps/console/src/lib/portal.ts
new file mode 100644
index 0000000000..b6b4179852
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/lib/portal.ts
@@ -0,0 +1,22 @@
+import { useLocation } from "react-router"
+
+/**
+ * Resource pages (list/detail/edit/order) are mounted under both /console and
+ * /admin, so their internal navigation must stay within whichever portal the
+ * user is browsing. Returns the active portal's base path; callers keep an
+ * explicit "/console" only for deliberate "back to console home" fallbacks.
+ */
+export function useResourceBasePath(): "/console" | "/admin" {
+  const { pathname } = useLocation()
+  return pathname.startsWith("/admin") ? "/admin" : "/console"
+}
+
+/**
+ * Where the app lands when it is opened without a path.
+ *
+ * The Console is the entry point: it shows what the user already runs, which is
+ * what someone opening the dashboard almost always came for. The Marketplace is
+ * a place you go deliberately, when you want to add something new — reachable
+ * from its own tab, from the Console overview, and from the command palette.
+ */
+export const DEFAULT_LANDING_PATH = "/console"
diff --git a/packages/system/dashboard/images/console/apps/console/src/lib/prepare-update.test.ts b/packages/system/dashboard/images/console/apps/console/src/lib/prepare-update.test.ts
new file mode 100644
index 0000000000..40afffadd9
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/lib/prepare-update.test.ts
@@ -0,0 +1,76 @@
+import { describe, it, expect, vi } from "vitest"
+import { prepareUpdateSpec } from "./prepare-update.ts"
+
+const immutableStorageClassSchema = JSON.stringify({
+  type: "object",
+  properties: {
+    storageClass: {
+      type: "string",
+      "x-kubernetes-validations": [
+        { rule: "self == oldSelf", message: "immutable" },
+      ],
+    },
+    size: { type: "string" },
+  },
+})
+
+const schemaWithoutImmutability = JSON.stringify({
+  type: "object",
+  properties: {
+    storageClass: { type: "string" },
+    size: { type: "string" },
+  },
+})
+
+describe("prepareUpdateSpec", () => {
+  it("overlays immutable values from initialSpec into submitted spec", () => {
+    const submitted = { storageClass: "fast", size: "10Gi" }
+    const initial = { storageClass: "slow", size: "5Gi" }
+    expect(
+      prepareUpdateSpec(submitted, initial, immutableStorageClassSchema),
+    ).toEqual({ storageClass: "slow", size: "10Gi" })
+  })
+
+  it("returns a clone of submitted unchanged when the schema declares no immutability", () => {
+    const submitted = { storageClass: "fast", size: "10Gi" }
+    const initial = { storageClass: "slow", size: "5Gi" }
+    const result = prepareUpdateSpec(submitted, initial, schemaWithoutImmutability)
+    expect(result).toEqual(submitted)
+    expect(result).not.toBe(submitted)
+  })
+
+  it("returns a clone of submitted unchanged when the schema is malformed JSON", () => {
+    const warn = vi.spyOn(console, "warn").mockImplementation(() => {})
+    const submitted = { storageClass: "fast" }
+    const initial = { storageClass: "slow" }
+    const result = prepareUpdateSpec(submitted, initial, "not-json")
+    expect(result).toEqual(submitted)
+    warn.mockRestore()
+  })
+
+  it("does not mutate inputs", () => {
+    const submitted = { storageClass: "fast", size: "10Gi" }
+    const initial = { storageClass: "slow", size: "5Gi" }
+    prepareUpdateSpec(submitted, initial, immutableStorageClassSchema)
+    expect(submitted).toEqual({ storageClass: "fast", size: "10Gi" })
+    expect(initial).toEqual({ storageClass: "slow", size: "5Gi" })
+  })
+
+  it("returns submitted unchanged when original is undefined or null", () => {
+    const submitted = { storageClass: "fast", size: "10Gi" }
+    expect(
+      prepareUpdateSpec(submitted, undefined, immutableStorageClassSchema),
+    ).toEqual(submitted)
+    expect(
+      prepareUpdateSpec(submitted, null, immutableStorageClassSchema),
+    ).toEqual(submitted)
+  })
+
+  it("warns to console when the schema cannot be parsed", () => {
+    const warn = vi.spyOn(console, "warn").mockImplementation(() => {})
+    prepareUpdateSpec({ storageClass: "fast" }, { storageClass: "slow" }, "{")
+    expect(warn).toHaveBeenCalled()
+    expect(warn.mock.calls[0][0]).toMatch(/openAPISchema/)
+    warn.mockRestore()
+  })
+})
diff --git a/packages/system/dashboard/images/console/apps/console/src/lib/prepare-update.ts b/packages/system/dashboard/images/console/apps/console/src/lib/prepare-update.ts
new file mode 100644
index 0000000000..7ad5efb82e
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/lib/prepare-update.ts
@@ -0,0 +1,49 @@
+import {
+  findImmutablePaths,
+  overlayImmutable,
+  type ImmutablePath,
+} from "./immutable-paths.ts"
+
+/**
+ * Build the spec to PUT during an edit, overlaying immutable values from
+ * the original spec so that the API server sees no delta on paths whose
+ * schema carries `x-kubernetes-validations: [{rule: "self == oldSelf"}]`.
+ *
+ * Defence-in-depth: even if the form's read-only state is bypassed (via
+ * the YAML editor, devtools, or a UI bug) the outgoing body still
+ * matches the persisted spec on those paths.
+ *
+ * Edge cases:
+ *  - When `original` is null/undefined there is nothing meaningful to
+ *    overlay (typically the resource hasn't loaded yet, or the persisted
+ *    spec was empty). We return the submitted value unchanged rather than
+ *    blanking immutable fields with undefined.
+ *  - When the schema string cannot be parsed we log a warning so the
+ *    misconfiguration is at least visible in DevTools, then return the
+ *    submitted value unchanged.
+ */
+export function prepareUpdateSpec<T>(
+  submitted: T,
+  original: T | null | undefined,
+  openAPISchema: string,
+): T {
+  if (original === undefined || original === null) {
+    return cloneShallowAsDeep(submitted)
+  }
+  let paths: ImmutablePath[]
+  try {
+    paths = findImmutablePaths(JSON.parse(openAPISchema))
+  } catch {
+    console.warn(
+      "prepareUpdateSpec: failed to parse openAPISchema; " +
+        "skipping immutable-field overlay.",
+    )
+    paths = []
+  }
+  return overlayImmutable(submitted, original, paths)
+}
+
+function cloneShallowAsDeep<T>(value: T): T {
+  if (value === null || value === undefined) return value
+  return JSON.parse(JSON.stringify(value)) as T
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/lib/resolveSource.test.ts b/packages/system/dashboard/images/console/apps/console/src/lib/resolveSource.test.ts
new file mode 100644
index 0000000000..fb68e872f3
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/lib/resolveSource.test.ts
@@ -0,0 +1,52 @@
+import { describe, expect, it } from "vitest"
+import { resolveSource } from "./dynamic-options.ts"
+
+describe("resolveSource", () => {
+  it("leaves a plain source alone", () => {
+    expect(resolveSource("storageclass", {})).toEqual({
+      name: "storageclass",
+      parameterised: false,
+    })
+  })
+
+  it("substitutes a sibling field", () => {
+    const root = { sourceRef: { name: "vcenter-lab" } }
+    expect(resolveSource("vmimportvm.{sourceRef.name}", root)).toEqual({
+      name: "vmimportvm.vcenter-lab",
+      parameterised: true,
+    })
+  })
+
+  // The field it depends on is still empty. Asking for `vmimportvm.` would only
+  // 404, and the widget shows "select a source first" instead.
+  it("yields no name while the referenced field is unset", () => {
+    expect(resolveSource("vmimportvm.{sourceRef.name}", {})).toEqual({
+      name: null,
+      parameterised: true,
+    })
+    expect(resolveSource("vmimportvm.{sourceRef.name}", { sourceRef: {} })).toEqual({
+      name: null,
+      parameterised: true,
+    })
+    expect(
+      resolveSource("vmimportvm.{sourceRef.name}", { sourceRef: { name: "" } }),
+    ).toEqual({ name: null, parameterised: true })
+  })
+
+  // A path through something that is not an object must not throw: form data is
+  // whatever the user has typed so far.
+  it("survives a path that does not lead anywhere", () => {
+    expect(resolveSource("vmimportvm.{a.b.c}", { a: "string" })).toEqual({
+      name: null,
+      parameterised: true,
+    })
+    expect(resolveSource("vmimportvm.{a.b}", null)).toEqual({
+      name: null,
+      parameterised: true,
+    })
+  })
+
+  it("treats a missing source as nothing to resolve", () => {
+    expect(resolveSource(undefined, {})).toEqual({ name: null, parameterised: false })
+  })
+})
diff --git a/packages/system/dashboard/images/console/apps/console/src/lib/rjsf-ids.ts b/packages/system/dashboard/images/console/apps/console/src/lib/rjsf-ids.ts
new file mode 100644
index 0000000000..40edfa32b8
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/lib/rjsf-ids.ts
@@ -0,0 +1,9 @@
+/**
+ * RJSF's id configuration, shared rather than repeated: `SchemaForm` passes it
+ * to the form, `AdditionalPropertiesField` continues it into the nested form it
+ * mounts per map entry, and `focusFirstError` rebuilds an id from an error's
+ * property path. If those three disagree, a blocked submit resolves no element
+ * and scrolls nowhere.
+ */
+export const RJSF_ID_PREFIX = "root"
+export const RJSF_ID_SEPARATOR = "_"
diff --git a/packages/system/dashboard/images/console/apps/console/src/lib/sensitive-fields.test.ts b/packages/system/dashboard/images/console/apps/console/src/lib/sensitive-fields.test.ts
new file mode 100644
index 0000000000..8a04bf7b48
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/lib/sensitive-fields.test.ts
@@ -0,0 +1,271 @@
+import { describe, it, expect } from "vitest"
+import type { RJSFSchema, UiSchema } from "@rjsf/utils"
+import { addSensitiveStringWidgets, isSensitiveFieldName } from "./sensitive-fields.ts"
+
+describe("isSensitiveFieldName", () => {
+  it("matches the canonical S3/postgres credential field names", () => {
+    expect(isSensitiveFieldName("s3AccessKey")).toBe(true)
+    expect(isSensitiveFieldName("s3SecretKey")).toBe(true)
+    expect(isSensitiveFieldName("secretAccessKey")).toBe(true)
+    expect(isSensitiveFieldName("secretAccessKeyKey")).toBe(true)
+    expect(isSensitiveFieldName("accessKey")).toBe(true)
+    expect(isSensitiveFieldName("access_key")).toBe(true)
+    expect(isSensitiveFieldName("secret_key")).toBe(true)
+  })
+
+  it("matches generic password/token/private-key/api-key style names", () => {
+    expect(isSensitiveFieldName("password")).toBe(true)
+    expect(isSensitiveFieldName("rootPassword")).toBe(true)
+    expect(isSensitiveFieldName("passwordConfirmation")).toBe(true)
+    expect(isSensitiveFieldName("passwd")).toBe(true)
+    expect(isSensitiveFieldName("token")).toBe(true)
+    expect(isSensitiveFieldName("bearerToken")).toBe(true)
+    expect(isSensitiveFieldName("api_token")).toBe(true)
+    expect(isSensitiveFieldName("apiKey")).toBe(true)
+    expect(isSensitiveFieldName("api_key")).toBe(true)
+    expect(isSensitiveFieldName("privateKey")).toBe(true)
+    expect(isSensitiveFieldName("private_key")).toBe(true)
+  })
+
+  it("is case-insensitive", () => {
+    expect(isSensitiveFieldName("PASSWORD")).toBe(true)
+    expect(isSensitiveFieldName("S3SECRETKEY")).toBe(true)
+  })
+
+  it("does not match neighbouring/non-secret names", () => {
+    expect(isSensitiveFieldName("storageClass")).toBe(false)
+    expect(isSensitiveFieldName("backupClassName")).toBe(false)
+    expect(isSensitiveFieldName("bucket")).toBe(false)
+    expect(isSensitiveFieldName("region")).toBe(false)
+    expect(isSensitiveFieldName("publicKey")).toBe(false)
+    expect(isSensitiveFieldName("keyName")).toBe(false)
+    expect(isSensitiveFieldName("name")).toBe(false)
+  })
+
+  it("respects word boundaries to avoid false positives on token/passwd", () => {
+    // `token` is matched only as the trailing word.
+    expect(isSensitiveFieldName("tokenAudience")).toBe(false)
+    expect(isSensitiveFieldName("tokenizer")).toBe(false)
+    expect(isSensitiveFieldName("csrfTokenName")).toBe(false)
+    // `passwd` likewise — `passwdFile` is a path, not a credential.
+    expect(isSensitiveFieldName("passwdFile")).toBe(false)
+    expect(isSensitiveFieldName("etcPasswdPath")).toBe(false)
+  })
+})
+
+describe("addSensitiveStringWidgets", () => {
+  it("adds the widget to a top-level sensitive string field", () => {
+    const schema: RJSFSchema = {
+      type: "object",
+      properties: {
+        s3AccessKey: { type: "string" },
+        bucket: { type: "string" },
+      },
+    }
+    const result = addSensitiveStringWidgets(schema, {})
+    expect(result.s3AccessKey).toEqual({ "ui:widget": "SensitiveStringWidget" })
+    expect(result.bucket).toBeUndefined()
+  })
+
+  it("recurses into nested object schemas", () => {
+    const schema: RJSFSchema = {
+      type: "object",
+      properties: {
+        backup: {
+          type: "object",
+          properties: {
+            s3SecretKey: { type: "string" },
+            bucket: { type: "string" },
+          },
+        },
+      },
+    }
+    const result = addSensitiveStringWidgets(schema, {}) as Record<string, UiSchema>
+    expect(result.backup?.s3SecretKey).toEqual({ "ui:widget": "SensitiveStringWidget" })
+    expect(result.backup?.bucket).toBeUndefined()
+  })
+
+  it("masks individual string items when the array key itself is sensitive", () => {
+    const schema: RJSFSchema = {
+      type: "object",
+      properties: {
+        apiKey: { type: "array", items: { type: "string" } },
+      },
+    }
+    const result = addSensitiveStringWidgets(schema, {}) as Record<string, UiSchema>
+    const itemsUi = (result.apiKey as { items?: UiSchema } | undefined)?.items
+    expect(itemsUi?.["ui:widget"]).toBe("SensitiveStringWidget")
+  })
+
+  it("leaves array-of-strings unmasked when the array key is not sensitive", () => {
+    const schema: RJSFSchema = {
+      type: "object",
+      properties: {
+        labels: { type: "array", items: { type: "string" } },
+      },
+    }
+    const result = addSensitiveStringWidgets(schema, {})
+    expect(result.labels).toBeUndefined()
+  })
+
+  it("recurses into array items expressed as a tuple of schemas", () => {
+    const schema: RJSFSchema = {
+      type: "object",
+      properties: {
+        rotations: {
+          type: "array",
+          items: [
+            {
+              type: "object",
+              properties: {
+                password: { type: "string" },
+              },
+            },
+          ],
+        },
+      },
+    }
+    const result = addSensitiveStringWidgets(schema, {}) as Record<string, UiSchema>
+    const itemsUi = (result.rotations as { items?: Record<string, UiSchema> } | undefined)?.items
+    expect(itemsUi?.password).toEqual({ "ui:widget": "SensitiveStringWidget" })
+  })
+
+  it("recurses into array item objects", () => {
+    const schema: RJSFSchema = {
+      type: "object",
+      properties: {
+        users: {
+          type: "array",
+          items: {
+            type: "object",
+            properties: {
+              name: { type: "string" },
+              password: { type: "string" },
+            },
+          },
+        },
+      },
+    }
+    const result = addSensitiveStringWidgets(schema, {}) as Record<string, UiSchema>
+    const itemsUi = (result.users as { items?: Record<string, UiSchema> } | undefined)?.items
+    expect(itemsUi?.password).toEqual({ "ui:widget": "SensitiveStringWidget" })
+    expect(itemsUi?.name).toBeUndefined()
+  })
+
+  it("ignores non-string fields even with sensitive names", () => {
+    const schema: RJSFSchema = {
+      type: "object",
+      properties: {
+        accessKey: { type: "integer" },
+        password: { type: "boolean" },
+      },
+    }
+    const result = addSensitiveStringWidgets(schema, {})
+    expect(result.accessKey).toBeUndefined()
+    expect(result.password).toBeUndefined()
+  })
+
+  it("ignores string fields with an enum (rendered as select)", () => {
+    const schema: RJSFSchema = {
+      type: "object",
+      properties: {
+        password: { type: "string", enum: ["weak", "strong"] },
+      },
+    }
+    const result = addSensitiveStringWidgets(schema, {})
+    expect(result.password).toBeUndefined()
+  })
+
+  it("does not overwrite an existing ui:widget on the same field", () => {
+    const schema: RJSFSchema = {
+      type: "object",
+      properties: {
+        accessKey: { type: "string" },
+      },
+    }
+    const initial: UiSchema = {
+      accessKey: { "ui:widget": "SomeOtherWidget" },
+    }
+    const result = addSensitiveStringWidgets(schema, initial)
+    expect(result.accessKey).toEqual({ "ui:widget": "SomeOtherWidget" })
+  })
+
+  it("preserves unrelated uiSchema entries while adding the widget", () => {
+    const schema: RJSFSchema = {
+      type: "object",
+      properties: {
+        s3AccessKey: { type: "string" },
+        bucket: { type: "string" },
+      },
+    }
+    const initial: UiSchema = {
+      bucket: { "ui:placeholder": "my-bucket" },
+    }
+    const result = addSensitiveStringWidgets(schema, initial)
+    expect(result.s3AccessKey).toEqual({ "ui:widget": "SensitiveStringWidget" })
+    expect(result.bucket).toEqual({ "ui:placeholder": "my-bucket" })
+  })
+
+  it("returns the input uiSchema untouched when the schema has no properties", () => {
+    const initial: UiSchema = { "ui:order": ["a", "b"] }
+    expect(addSensitiveStringWidgets({} as RJSFSchema, initial)).toEqual(initial)
+  })
+
+  it("does not mutate the input uiSchema when array items propagate the widget", () => {
+    const schema: RJSFSchema = {
+      type: "object",
+      properties: {
+        apiKey: { type: "array", items: { type: "string" } },
+      },
+    }
+    const initial: UiSchema = { apiKey: { items: { "ui:placeholder": "foo" } } }
+    const snapshot: UiSchema = JSON.parse(JSON.stringify(initial))
+    addSensitiveStringWidgets(schema, initial)
+    expect(initial).toEqual(snapshot)
+  })
+
+  it("does not mutate the input uiSchema when array items contain a sensitive object field", () => {
+    const schema: RJSFSchema = {
+      type: "object",
+      properties: {
+        users: {
+          type: "array",
+          items: {
+            type: "object",
+            properties: {
+              name: { type: "string" },
+              password: { type: "string" },
+            },
+          },
+        },
+      },
+    }
+    const initial: UiSchema = {
+      users: { items: { name: { "ui:placeholder": "alice" } } },
+    }
+    const snapshot: UiSchema = JSON.parse(JSON.stringify(initial))
+    addSensitiveStringWidgets(schema, initial)
+    expect(initial).toEqual(snapshot)
+  })
+
+  it("pins the current 'oneOf branches are not walked' limitation", () => {
+    // FIXME: extend addSensitiveStringWidgets to recurse into oneOf/anyOf/allOf.
+    // Once that is implemented, flip this test to expect the inner field to
+    // be masked instead of being left untouched.
+    const schema: RJSFSchema = {
+      type: "object",
+      properties: {
+        auth: {
+          oneOf: [
+            {
+              type: "object",
+              properties: { password: { type: "string" } },
+            },
+          ],
+        },
+      },
+    } as RJSFSchema
+    const result = addSensitiveStringWidgets(schema, {})
+    expect(result.auth).toBeUndefined()
+  })
+})
diff --git a/packages/system/dashboard/images/console/apps/console/src/lib/sensitive-fields.ts b/packages/system/dashboard/images/console/apps/console/src/lib/sensitive-fields.ts
new file mode 100644
index 0000000000..104e3e9931
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/lib/sensitive-fields.ts
@@ -0,0 +1,169 @@
+import type { RJSFSchema, UiSchema } from "@rjsf/utils"
+
+// Word tokens that look like credentials wherever they appear in the
+// field name. `password` covers `password`, `rootPassword`,
+// `passwordConfirmation`; the `*key` entries cover S3-style credentials
+// in any prefix (`s3AccessKey`, `myApiKey`, etc.).
+const ANYWHERE_TOKENS: ReadonlySet<string> = new Set([
+  "accesskey",
+  "secretkey",
+  "secretaccesskey",
+  "password",
+  "apikey",
+  "privatekey",
+])
+
+// Word tokens that look like credentials ONLY when they are the last
+// word of the field name, to avoid masking unrelated identifiers that
+// happen to contain the word. `bearerToken`/`api_token` match;
+// `tokenAudience`/`csrfTokenName`/`passwdFile` do not.
+const SUFFIX_ONLY_TOKENS: ReadonlySet<string> = new Set([
+  "token",
+  "passwd",
+])
+
+/**
+ * Split a field name into lower-case word parts, treating both
+ * camelCase boundaries and `_` / `-` / `.` as word separators. Digits
+ * stay attached to the preceding letter (`s3` ⇒ `s3`).
+ */
+function splitWords(name: string): string[] {
+  return name
+    .replace(/([a-z0-9])([A-Z])/g, "$1 $2")
+    .split(/[\s_\-.]+/)
+    .filter(Boolean)
+    .map((part) => part.toLowerCase())
+}
+
+/**
+ * Return every joined run of consecutive word parts, so that
+ * `secretAccessKey` and `secret_access_key` both produce the chunk
+ * `secretaccesskey` for matching, without the detector having to
+ * enumerate every casing/concatenation variant.
+ */
+function chunks(words: string[]): string[] {
+  const out: string[] = []
+  for (let start = 0; start < words.length; start++) {
+    let chunk = ""
+    for (let end = start; end < words.length; end++) {
+      chunk += words[end]
+      out.push(chunk)
+    }
+  }
+  return out
+}
+
+/**
+ * Returns true when a field name looks like a credential by convention.
+ * Cozystack chart schemas do not annotate sensitive fields with a
+ * `format: password` hint, so detection is purely name-based. The match
+ * is on word boundaries (camelCase / `_` / `-` / `.`) rather than a raw
+ * substring, so neighbours like `tokenAudience` or `passwdFile` stay
+ * out of the set.
+ */
+export function isSensitiveFieldName(name: string): boolean {
+  const words = splitWords(name)
+  if (words.length === 0) return false
+
+  for (const chunk of chunks(words)) {
+    if (ANYWHERE_TOKENS.has(chunk)) return true
+  }
+
+  const last = words[words.length - 1]
+  return SUFFIX_ONLY_TOKENS.has(last)
+}
+
+interface JsonSchemaLike {
+  type?: string
+  enum?: unknown[]
+  properties?: Record<string, JsonSchemaLike>
+  // JSON Schema allows `items` to be a single schema or a tuple of schemas.
+  items?: JsonSchemaLike | JsonSchemaLike[]
+}
+
+/**
+ * Recursively walks `schema` and, for every string field whose name matches
+ * a sensitive pattern, sets `ui:widget` to `SensitiveStringWidget` on the
+ * corresponding entry in `uiSchema`. Existing widget bindings are preserved.
+ *
+ * The input `uiSchema` is not mutated; the returned object is independent.
+ *
+ * Limitation: only `properties` and `items` subtrees are walked. Fields
+ * inside `oneOf` / `anyOf` / `allOf` branches are NOT inspected — see the
+ * "pin broken behaviour" test in sensitive-fields.test.ts. Extend when a
+ * chart in the catalogue starts using that shape.
+ */
+export function addSensitiveStringWidgets(
+  schema: RJSFSchema,
+  uiSchema: UiSchema = {},
+): UiSchema {
+  if (!schema || typeof schema !== "object") return uiSchema
+  const properties = (schema as JsonSchemaLike).properties
+  if (!properties) return uiSchema
+
+  const result: UiSchema = { ...uiSchema }
+
+  for (const [key, fieldSchema] of Object.entries(properties)) {
+    if (!fieldSchema || typeof fieldSchema !== "object") continue
+
+    const existing = (result[key] ?? {}) as UiSchema
+    const alreadyHasWidget = typeof existing["ui:widget"] === "string"
+
+    const isLeafString =
+      fieldSchema.type === "string" && !Array.isArray(fieldSchema.enum)
+
+    if (isLeafString && isSensitiveFieldName(key) && !alreadyHasWidget) {
+      result[key] = { ...existing, "ui:widget": "SensitiveStringWidget" }
+      continue
+    }
+
+    if (fieldSchema.properties) {
+      result[key] = addSensitiveStringWidgets(
+        fieldSchema as RJSFSchema,
+        existing,
+      )
+      continue
+    }
+
+    if (fieldSchema.type === "array" && fieldSchema.items) {
+      const itemSchemas = Array.isArray(fieldSchema.items)
+        ? fieldSchema.items
+        : [fieldSchema.items]
+      // Shallow-copy so we never write through into the caller's items
+      // sub-object — see "does not mutate the input uiSchema" tests.
+      const merged: UiSchema = { ...((existing.items ?? {}) as UiSchema) }
+      let mutated = false
+      const keyIsSensitive = isSensitiveFieldName(key)
+      for (const itemSchema of itemSchemas) {
+        if (!itemSchema) continue
+        if (itemSchema.properties) {
+          const next = addSensitiveStringWidgets(
+            itemSchema as RJSFSchema,
+            merged,
+          )
+          for (const [k, v] of Object.entries(next)) merged[k] = v
+          mutated = true
+          continue
+        }
+        // Array of scalar credentials, e.g. `apiKey: { items: {type:"string"} }`.
+        // The array key itself is the only signal we have for individual items,
+        // so propagate the widget down only when the array's name matches.
+        const itemIsLeafString =
+          itemSchema.type === "string" && !Array.isArray(itemSchema.enum)
+        if (
+          itemIsLeafString &&
+          keyIsSensitive &&
+          typeof merged["ui:widget"] !== "string"
+        ) {
+          merged["ui:widget"] = "SensitiveStringWidget"
+          mutated = true
+        }
+      }
+      if (mutated) {
+        result[key] = { ...existing, items: merged }
+      }
+    }
+  }
+
+  return result
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/lib/serial-stream.test.ts b/packages/system/dashboard/images/console/apps/console/src/lib/serial-stream.test.ts
new file mode 100644
index 0000000000..bf2bc935f3
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/lib/serial-stream.test.ts
@@ -0,0 +1,193 @@
+import { describe, it, expect, vi, afterEach } from "vitest"
+import { openSerialStream, serialConsoleUrl, type SerialSocket } from "./serial-stream.ts"
+
+class FakeSocket implements SerialSocket {
+  static last: FakeSocket | null = null
+  sent: unknown[] = []
+  closed = false
+  binaryType = ""
+  onopen: (() => void) | null = null
+  onclose: ((e: { code: number; reason: string }) => void) | null = null
+  onerror: (() => void) | null = null
+  onmessage: ((e: { data: unknown }) => void) | null = null
+
+  url: string
+  protocols?: string | string[]
+
+  constructor(url: string, protocols?: string | string[]) {
+    this.url = url
+    this.protocols = protocols
+    FakeSocket.last = this
+  }
+
+  send(data: unknown) {
+    this.sent.push(data)
+  }
+
+  close() {
+    this.closed = true
+  }
+}
+
+function open(handlers: Parameters<typeof openSerialStream>[1] = {}) {
+  const stream = openSerialStream("ws://host/console", handlers, (url, protocols) => new FakeSocket(url, protocols))
+  const socket = FakeSocket.last!
+  return { stream, socket }
+}
+
+function decodeSent(value: unknown): string {
+  return new TextDecoder().decode(value as Uint8Array)
+}
+
+afterEach(() => {
+  FakeSocket.last = null
+})
+
+describe("serialConsoleUrl", () => {
+  it("addresses the VMI console subresource through the /k8s prefix", () => {
+    expect(serialConsoleUrl("http:", "console.example", "tenant-root", "vm-demo")).toBe(
+      "ws://console.example/k8s/apis/subresources.kubevirt.io/v1/namespaces/tenant-root/virtualmachineinstances/vm-demo/console",
+    )
+  })
+
+  it("upgrades to wss when the page is served over https", () => {
+    expect(serialConsoleUrl("https:", "console.example", "ns", "vm")).toMatch(/^wss:\/\//)
+  })
+})
+
+describe("openSerialStream", () => {
+  it("asks for the protocol virt-api speaks", () => {
+    const { socket } = open()
+
+    expect(socket.protocols).toEqual(["plain.kubevirt.io"])
+  })
+
+  it("sends keystrokes as binary — virt-api drops text frames on the floor", () => {
+    const { stream, socket } = open()
+    socket.onopen?.()
+
+    stream.send("ls\n")
+
+    expect(socket.sent).toHaveLength(1)
+    expect(ArrayBuffer.isView(socket.sent[0])).toBe(true)
+    expect(decodeSent(socket.sent[0])).toBe("ls\n")
+  })
+
+  it("encodes non-ASCII as UTF-8 rather than one byte per character", () => {
+    const { stream, socket } = open()
+    socket.onopen?.()
+
+    stream.send("привет")
+
+    expect(decodeSent(socket.sent[0])).toBe("привет")
+    expect((socket.sent[0] as Uint8Array).length).toBe(12)
+  })
+
+  it("decodes what the guest writes back", () => {
+    const onData = vi.fn()
+    const { socket } = open({ onData })
+
+    socket.onmessage?.({ data: new TextEncoder().encode("hello").buffer })
+
+    expect(onData).toHaveBeenCalledWith("hello")
+  })
+
+  it("keeps multi-byte characters whole across chunk boundaries", () => {
+    const onData = vi.fn()
+    const { socket } = open({ onData })
+    const bytes = new TextEncoder().encode("привет")
+
+    socket.onmessage?.({ data: bytes.slice(0, 5).buffer })
+    socket.onmessage?.({ data: bytes.slice(5).buffer })
+
+    expect(onData.mock.calls.map(([text]) => text).join("")).toBe("привет")
+  })
+
+  it("reports the connection opening and closing", () => {
+    const onOpen = vi.fn()
+    const onClose = vi.fn()
+    const { socket } = open({ onOpen, onClose })
+
+    socket.onopen?.()
+    socket.onclose?.({ code: 1006, reason: "gone" })
+
+    expect(onOpen).toHaveBeenCalled()
+    expect(onClose).toHaveBeenCalledWith({ code: 1006, reason: "gone" })
+  })
+
+  it("holds what is typed before the socket opens, then flushes it once", () => {
+    const { stream, socket } = open()
+
+    // WebSocket.send() throws InvalidStateError while the socket is still
+    // CONNECTING, and the terminal is interactive from the moment it renders.
+    stream.send("who")
+    stream.send("ami\n")
+    expect(socket.sent).toEqual([])
+
+    socket.onopen?.()
+
+    expect(socket.sent).toHaveLength(1)
+    expect(decodeSent(socket.sent[0])).toBe("whoami\n")
+  })
+
+  it("discards what was held when the socket closes before it opens", () => {
+    const onClose = vi.fn()
+    const { stream, socket } = open({ onClose })
+
+    stream.send("never-sent")
+    socket.onclose?.({ code: 1006, reason: "refused" })
+    socket.onopen?.()
+
+    expect(socket.sent).toEqual([])
+    expect(onClose).toHaveBeenCalledTimes(1)
+  })
+
+  it("drops writes once closed instead of throwing at the caller", () => {
+    const { stream, socket } = open()
+    socket.onopen?.()
+
+    stream.close()
+    stream.send("ignored")
+
+    expect(socket.closed).toBe(true)
+    expect(socket.sent).toEqual([])
+  })
+
+  it("ignores a frame that arrives after the stream was closed", () => {
+    const onData = vi.fn()
+    const { stream, socket } = open({ onData })
+    socket.onopen?.()
+
+    stream.close()
+    // A frame already in flight would otherwise be written into a terminal
+    // the effect cleanup has disposed.
+    socket.onmessage?.({ data: new TextEncoder().encode("late").buffer })
+
+    expect(onData).not.toHaveBeenCalled()
+  })
+
+  it("reports what the server said, not a synthetic error, when both fire", () => {
+    const onClose = vi.fn()
+    const { socket } = open({ onClose })
+
+    // onerror carries no reason; the close right behind it does.
+    socket.onerror?.()
+    socket.onclose?.({ code: 1008, reason: "Forbidden: user cannot get console" })
+
+    expect(onClose).toHaveBeenCalledTimes(1)
+    expect(onClose).toHaveBeenCalledWith({
+      code: 1008,
+      reason: "Forbidden: user cannot get console",
+    })
+  })
+
+  it("reports a close only once, however the socket ends", () => {
+    const onClose = vi.fn()
+    const { socket } = open({ onClose })
+
+    socket.onerror?.()
+    socket.onclose?.({ code: 1006, reason: "" })
+
+    expect(onClose).toHaveBeenCalledTimes(1)
+  })
+})
diff --git a/packages/system/dashboard/images/console/apps/console/src/lib/serial-stream.ts b/packages/system/dashboard/images/console/apps/console/src/lib/serial-stream.ts
new file mode 100644
index 0000000000..30c280f8d3
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/lib/serial-stream.ts
@@ -0,0 +1,134 @@
+/**
+ * Byte stream to a VM's serial console.
+ *
+ * KubeVirt exposes the guest's serial port as a websocket subresource. Unlike
+ * the VNC console it carries text, so a paste is one write rather than an
+ * emulated key press per character, and the guest's output arrives as text the
+ * user can select and copy.
+ *
+ * virt-api negotiates the `plain.kubevirt.io` subprotocol and reads binary
+ * frames only: a text frame is accepted by the socket and then silently
+ * dropped, which looks exactly like a dead console.
+ */
+
+const SUBPROTOCOL = "plain.kubevirt.io"
+
+export interface SerialSocket {
+  binaryType: string
+  onopen: (() => void) | null
+  onclose: ((event: { code: number; reason: string }) => void) | null
+  onerror: (() => void) | null
+  onmessage: ((event: { data: unknown }) => void) | null
+  send(data: Uint8Array): void
+  close(): void
+}
+
+export interface SerialStreamHandlers {
+  onData?: (text: string) => void
+  onOpen?: () => void
+  onClose?: (event: { code: number; reason: string }) => void
+}
+
+export interface SerialStream {
+  send(text: string): void
+  close(): void
+}
+
+export function serialConsoleUrl(
+  protocol: string,
+  host: string,
+  namespace: string,
+  vmName: string,
+): string {
+  const scheme = protocol === "https:" ? "wss:" : "ws:"
+  return `${scheme}//${host}/k8s/apis/subresources.kubevirt.io/v1/namespaces/${namespace}/virtualmachineinstances/${vmName}/console`
+}
+
+/**
+ * Frames arrive as ArrayBuffer in the browser, but a proxy or a test harness
+ * may hand over a view or an object from another realm, where `instanceof`
+ * is false for the very same type.
+ */
+function toBytes(data: unknown): Uint8Array | null {
+  if (ArrayBuffer.isView(data)) {
+    const view = data as ArrayBufferView
+    return new Uint8Array(view.buffer, view.byteOffset, view.byteLength)
+  }
+  if (Object.prototype.toString.call(data) === "[object ArrayBuffer]") {
+    return new Uint8Array(data as ArrayBuffer)
+  }
+  return null
+}
+
+type SocketFactory = (url: string, protocols: string[]) => SerialSocket
+
+const defaultFactory: SocketFactory = (url, protocols) =>
+  new WebSocket(url, protocols) as unknown as SerialSocket
+
+export function openSerialStream(
+  url: string,
+  handlers: SerialStreamHandlers = {},
+  createSocket: SocketFactory = defaultFactory,
+): SerialStream {
+  const socket = createSocket(url, [SUBPROTOCOL])
+  socket.binaryType = "arraybuffer"
+
+  const encoder = new TextEncoder()
+  // Streaming: a UTF-8 character can straddle two frames, and decoding each
+  // frame on its own would turn it into replacement characters.
+  const decoder = new TextDecoder("utf-8", { fatal: false })
+
+  // The socket is not writable until it opens, and WebSocket.send() throws
+  // InvalidStateError while it is still CONNECTING. The terminal is live from
+  // the moment it is rendered, so anything typed before then is held and
+  // flushed rather than thrown away.
+  let state: "connecting" | "open" | "closed" = "connecting"
+  let pending = ""
+  let errored = false
+
+  const finish = (event: { code: number; reason: string }) => {
+    if (state === "closed") return
+    state = "closed"
+    pending = ""
+    handlers.onClose?.(event)
+  }
+
+  socket.onopen = () => {
+    state = "open"
+    if (pending) {
+      socket.send(encoder.encode(pending))
+      pending = ""
+    }
+    handlers.onOpen?.()
+  }
+  socket.onmessage = (event) => {
+    if (state === "closed") return
+    const bytes = toBytes(event.data)
+    if (!bytes) return
+    handlers.onData?.(decoder.decode(bytes, { stream: true }))
+  }
+  // onerror carries no reason and is always followed by onclose, which does:
+  // reporting the synthetic one first would hide "1008 Forbidden" behind
+  // "connection error".
+  socket.onerror = () => {
+    errored = true
+  }
+  socket.onclose = (event) =>
+    finish(errored && event.code === 1005 ? { code: 1006, reason: "connection error" } : event)
+
+  return {
+    send(text: string) {
+      if (state === "closed") return
+      if (state === "connecting") {
+        pending += text
+        return
+      }
+      socket.send(encoder.encode(text))
+    },
+    close() {
+      state = "closed"
+      pending = ""
+      socket.close()
+    },
+  }
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/lib/sidebar-icons.test.tsx b/packages/system/dashboard/images/console/apps/console/src/lib/sidebar-icons.test.tsx
new file mode 100644
index 0000000000..f8766bc5db
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/lib/sidebar-icons.test.tsx
@@ -0,0 +1,47 @@
+import { describe, it, expect } from "vitest"
+import { render } from "@testing-library/react"
+import { simpleIconSlug, lucideIcon, simpleIconComponent } from "./sidebar-icons.tsx"
+
+describe("simpleIconSlug", () => {
+  it("returns a Simple Icons slug for a known brand kind", () => {
+    expect(simpleIconSlug("Postgres")).toBe("postgresql")
+  })
+
+  it("returns undefined for a kind with no brand logo", () => {
+    expect(simpleIconSlug("Tenant")).toBeUndefined()
+  })
+
+  it("returns undefined for Bucket — Amazon S3 was removed from Simple Icons", () => {
+    expect(simpleIconSlug("Bucket")).toBeUndefined()
+  })
+})
+
+describe("lucideIcon", () => {
+  it("provides a Lucide fallback for Bucket", () => {
+    expect(lucideIcon("Bucket")).toBeDefined()
+  })
+})
+
+describe("simpleIconComponent", () => {
+  it("renders the icon from a bundled data URI, never a CDN", () => {
+    const slug = simpleIconSlug("Postgres")
+    if (!slug) throw new Error("expected Postgres to have a slug")
+    const Icon = simpleIconComponent(slug)
+    const { container } = render(<Icon />)
+
+    const style = container.querySelector("span")?.getAttribute("style") ?? ""
+    expect(style).toContain("data:image/svg+xml")
+    // The mask must be a local data URI — no remote fetch of any kind.
+    expect(style).not.toContain("jsdelivr")
+    expect(style).not.toContain("cdn")
+    expect(style).not.toContain("https://")
+  })
+
+  it("renders an empty placeholder for an unknown slug instead of throwing", () => {
+    const Icon = simpleIconComponent("definitely-not-a-real-slug")
+    const { container } = render(<Icon />)
+    const span = container.querySelector("span")
+    expect(span).not.toBeNull()
+    expect(span?.getAttribute("style") ?? "").not.toContain("data:image/svg+xml")
+  })
+})
diff --git a/packages/system/dashboard/images/console/apps/console/src/lib/sidebar-icons.tsx b/packages/system/dashboard/images/console/apps/console/src/lib/sidebar-icons.tsx
new file mode 100644
index 0000000000..cb79c68e11
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/lib/sidebar-icons.tsx
@@ -0,0 +1,139 @@
+import type { ComponentType } from "react"
+import {
+  Database,
+  Globe,
+  HardDrive,
+  Info,
+  Monitor,
+  Network,
+  Server,
+  Users,
+  type LucideIcon,
+} from "lucide-react"
+import {
+  siApachekafka,
+  siClickhouse,
+  siEtcd,
+  siHarbor,
+  siKubernetes,
+  siMariadb,
+  siMongodb,
+  siNatsdotio,
+  siNginx,
+  siOpensearch,
+  siPostgresql,
+  siPrometheus,
+  siQdrant,
+  siRabbitmq,
+  siRedis,
+  siVault,
+  siWireguard,
+  type SimpleIcon as SimpleIconData,
+} from "simple-icons"
+
+/**
+ * TODO(bff): move both of these mappings to the server. Ideally each
+ * ApplicationDefinition carries a `spec.dashboard.iconSlug` (Simple Icons
+ * slug) or `spec.dashboard.iconLucide` (a Lucide name) so the frontend
+ * doesn't need a hardcoded table. Until then we keep the mapping here and
+ * fall through to the generic Lucide fallback.
+ */
+const KIND_TO_SIMPLE_ICON: Record<string, SimpleIconData> = {
+  // PaaS
+  ClickHouse: siClickhouse,
+  Harbor: siHarbor,
+  Kafka: siApachekafka,
+  MariaDB: siMariadb,
+  MongoDB: siMongodb,
+  NATS: siNatsdotio,
+  OpenBAO: siVault,
+  Postgres: siPostgresql,
+  Qdrant: siQdrant,
+  RabbitMQ: siRabbitmq,
+  Redis: siRedis,
+
+  // NaaS
+  VPN: siWireguard,
+
+  // Administration
+  Etcd: siEtcd,
+  Ingress: siNginx,
+  Kubernetes: siKubernetes,
+  Monitoring: siPrometheus,
+  OpenSearch: siOpensearch,
+}
+
+const ICON_BY_SLUG: Record<string, SimpleIconData> = Object.fromEntries(
+  Object.values(KIND_TO_SIMPLE_ICON).map((icon) => [icon.slug, icon]),
+)
+
+/**
+ * Lucide fallbacks for kinds that don't have a canonical brand logo in
+ * Simple Icons.
+ */
+const KIND_TO_LUCIDE_ICON: Record<string, LucideIcon | ComponentType<{ className?: string }>> = {
+  BootBox: Server,
+  // Amazon S3's logo was removed from Simple Icons, so the S3-compatible
+  // Bucket kind falls back to a generic storage glyph.
+  Bucket: Database,
+  ExternalDNS: Globe,
+  TCPBalancer: Network,
+  FoundationDB: Database,
+  Info: Info,
+  SeaweedFS: Database,
+  Tenant: Users,
+  VirtualPrivateCloud: Network,
+  VMDisk: HardDrive,
+  VMInstance: Monitor,
+}
+
+export function simpleIconSlug(kind: string): string | undefined {
+  return KIND_TO_SIMPLE_ICON[kind]?.slug
+}
+
+export function lucideIcon(
+  kind: string,
+): LucideIcon | ComponentType<{ className?: string }> | undefined {
+  return KIND_TO_LUCIDE_ICON[kind]
+}
+
+/**
+ * Build a monochromatic icon component that renders the Simple Icons SVG as a
+ * CSS `mask-image`. The span takes its colour from `currentColor`, so active
+ * sidebar items pick up the blue accent and inactive ones stay slate-400 —
+ * exactly like the Lucide icons next to them.
+ *
+ * The SVG is inlined from the bundled simple-icons package as a data URI, so it
+ * is served from the app's own origin — nothing is fetched from a CDN.
+ */
+export function simpleIconComponent(slug: string): ComponentType<{ className?: string }> {
+  const icon: SimpleIconData | undefined = ICON_BY_SLUG[slug]
+  if (!icon) {
+    // Unknown slug — render an empty placeholder rather than throwing.
+    return function MissingIcon({ className }) {
+      return <span aria-hidden className={className} />
+    }
+  }
+  const svg = `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="${icon.path}"/></svg>`
+  const url = `url("data:image/svg+xml,${encodeURIComponent(svg)}")`
+  return function SimpleIcon({ className }) {
+    return (
+      <span
+        aria-hidden
+        className={className}
+        style={{
+          display: "inline-block",
+          backgroundColor: "currentColor",
+          maskImage: url,
+          WebkitMaskImage: url,
+          maskSize: "contain",
+          WebkitMaskSize: "contain",
+          maskRepeat: "no-repeat",
+          WebkitMaskRepeat: "no-repeat",
+          maskPosition: "center",
+          WebkitMaskPosition: "center",
+        }}
+      />
+    )
+  }
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/lib/status.test.ts b/packages/system/dashboard/images/console/apps/console/src/lib/status.test.ts
new file mode 100644
index 0000000000..022637fa2b
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/lib/status.test.ts
@@ -0,0 +1,57 @@
+import { describe, it, expect } from "vitest"
+import type { K8sCondition } from "@cozystack/k8s-client"
+import type { ApplicationInstance } from "@cozystack/types"
+import { readyCondition } from "./status.ts"
+
+function instance(kind: string, ...conditions: K8sCondition[]): ApplicationInstance {
+  return {
+    apiVersion: "apps.cozystack.io/v1alpha1",
+    kind,
+    metadata: { name: "x" },
+    status: { conditions },
+  } as ApplicationInstance
+}
+
+const ready: K8sCondition = { type: "Ready", status: "True", reason: "InstallSucceeded" }
+
+describe("readyCondition", () => {
+  it("returns Ready when the application has no WorkloadsReady", () => {
+    expect(readyCondition(instance("Postgres", ready))?.status).toBe("True")
+  })
+
+  it("is not ready while a DataVolume is not ready, whatever Ready says", () => {
+    const got = readyCondition(
+      instance("VMDisk", ready, {
+        type: "WorkloadsReady",
+        status: "False",
+        reason: "DataVolumeNotReady",
+        message: "DataVolume x is ImportInProgress",
+      }),
+    )
+    expect(got?.status).toBe("False")
+    expect(got?.reason).toBe("DataVolumeNotReady")
+    expect(got?.message).toBe("DataVolume x is ImportInProgress")
+  })
+
+  // A stopped VM has no pod, so its monitor reports it not operational.
+  it("stays ready for a halted VM whose workloads are not ready for no named reason", () => {
+    const got = readyCondition(
+      instance("VMInstance", ready, {
+        type: "WorkloadsReady",
+        status: "False",
+        reason: "WorkloadMonitorCheck",
+        message: "One or more workloads are not operational",
+      }),
+    )
+    expect(got?.status).toBe("True")
+    expect(got?.reason).toBe("InstallSucceeded")
+  })
+
+  it("keeps a failing Ready ahead of the workloads", () => {
+    const failed: K8sCondition = { type: "Ready", status: "False", reason: "InstallFailed" }
+    const got = readyCondition(
+      instance("VMDisk", failed, { type: "WorkloadsReady", status: "False", reason: "DataVolumeNotReady" }),
+    )
+    expect(got?.reason).toBe("InstallFailed")
+  })
+})
diff --git a/packages/system/dashboard/images/console/apps/console/src/lib/status.ts b/packages/system/dashboard/images/console/apps/console/src/lib/status.ts
new file mode 100644
index 0000000000..b678aa1b41
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/lib/status.ts
@@ -0,0 +1,32 @@
+import type { K8sCondition } from "@cozystack/k8s-client"
+import type { ApplicationInstance } from "@cozystack/types"
+
+// Ready follows the Helm release only, so a vm-disk whose DataVolume never
+// populates is Ready. Other WorkloadsReady=False causes are left out on purpose:
+// a stopped VM has no pod and reports that too.
+const dataVolumeNotReady = "DataVolumeNotReady"
+
+export function readyCondition(
+  instance: ApplicationInstance | undefined,
+): K8sCondition | undefined {
+  const conditions = instance?.status?.conditions
+  const ready = conditions?.find((c) => c.type === "Ready")
+  const workloads = conditions?.find((c) => c.type === "WorkloadsReady")
+  if (ready?.status === "True" && workloads?.reason === dataVolumeNotReady && workloads.status !== "True") {
+    return workloads
+  }
+  return ready
+}
+
+export function formatAge(timestamp: string | undefined): string {
+  if (!timestamp) return "—"
+  const diff = Date.now() - new Date(timestamp).getTime()
+  const s = Math.floor(diff / 1000)
+  if (s < 60) return `${s}s`
+  const m = Math.floor(s / 60)
+  if (m < 60) return `${m}m`
+  const h = Math.floor(m / 60)
+  if (h < 24) return `${h}h`
+  const d = Math.floor(h / 24)
+  return `${d}d`
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/lib/taps.ts b/packages/system/dashboard/images/console/apps/console/src/lib/taps.ts
new file mode 100644
index 0000000000..263887aaaf
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/lib/taps.ts
@@ -0,0 +1,47 @@
+import {
+  useK8sList,
+  useK8sCreate,
+  useK8sDelete,
+  type ResourceRef,
+} from "@cozystack/k8s-client"
+import { CORE_GROUP, CORE_VERSION, type Tap } from "@cozystack/types"
+
+// Cluster-scoped: no namespace key.
+const TAPS_REF: ResourceRef = {
+  apiGroup: CORE_GROUP,
+  apiVersion: CORE_VERSION,
+  plural: "taps",
+}
+
+export function useTaps() {
+  return useK8sList<Tap>(TAPS_REF)
+}
+
+export function useConnectTap() {
+  return useK8sCreate<Tap>(TAPS_REF)
+}
+
+export function useDisconnectTap() {
+  return useK8sDelete(TAPS_REF)
+}
+
+/**
+ * deriveTapName mirrors the server's Flux source naming (tap-<org>-<repo>) from
+ * an oci:// URL, so the create request carries the name the server assigns to
+ * the tap's source object. A tapped repository keeps its own declared
+ * PackageSource name(s), materialized later, so the source is the tap's stable
+ * identity rather than a name derived from the artifact.
+ */
+export function deriveTapName(url: string): string {
+  let body = url.replace(/^oci:\/\//, "")
+  const at = body.indexOf("@")
+  if (at >= 0) body = body.slice(0, at)
+  const lastSlash = body.lastIndexOf("/")
+  const lastColon = body.lastIndexOf(":")
+  if (lastColon > lastSlash) body = body.slice(0, lastColon)
+  const segs = body.split("/").filter(Boolean)
+  const repo = segs[segs.length - 1] ?? ""
+  const org = segs.length >= 3 ? segs[segs.length - 2] : ""
+  const base = org ? `${org}-${repo}` : repo
+  return "tap-" + base.toLowerCase().replace(/[^a-z0-9-]+/g, "-")
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/lib/tenant-context.tsx b/packages/system/dashboard/images/console/apps/console/src/lib/tenant-context.tsx
new file mode 100644
index 0000000000..817e6f4b48
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/lib/tenant-context.tsx
@@ -0,0 +1,42 @@
+import { createContext, useContext } from "react"
+import type { TenantNamespace } from "@cozystack/types"
+import { TENANT_NAMESPACE_PREFIX } from "./constants.ts"
+
+export interface TenantContextValue {
+  /**
+   * Flat list of every TenantNamespace in the cluster, ordered by display
+   * name (the namespace prefix stripped). Callers typically only need
+   * `selectedTenant` / `tenantNamespace`, but the full list is exposed for
+   * pickers and breadcrumbs.
+   */
+  tenants: TenantNamespace[]
+  /** Display name (namespace minus the `tenant-` prefix). */
+  selectedTenant: string | null
+  selectTenant: (name: string) => void
+  /** Namespace of the selected tenant — `tenant-<name>`. */
+  tenantNamespace: string | null
+  isLoading: boolean
+  error: unknown
+}
+
+export const TenantContext = createContext<TenantContextValue | null>(null)
+
+function displayName(ns: TenantNamespace): string {
+  const name = ns.metadata.name
+  return name.startsWith(TENANT_NAMESPACE_PREFIX)
+    ? name.slice(TENANT_NAMESPACE_PREFIX.length)
+    : name
+}
+
+export function useTenantContext(): TenantContextValue {
+  const ctx = useContext(TenantContext)
+  if (!ctx) throw new Error("useTenantContext must be used inside TenantProvider")
+  return ctx
+}
+
+/**
+ * Pull the display name of a TenantNamespace (no `tenant-` prefix).
+ */
+export function tenantDisplayName(ns: TenantNamespace): string {
+  return displayName(ns)
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/lib/tenant-provider.tsx b/packages/system/dashboard/images/console/apps/console/src/lib/tenant-provider.tsx
new file mode 100644
index 0000000000..1bfeff572c
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/lib/tenant-provider.tsx
@@ -0,0 +1,62 @@
+import { useEffect, useMemo, useState, type ReactNode } from "react"
+import { useK8sList } from "@cozystack/k8s-client"
+import type { TenantNamespace } from "@cozystack/types"
+import { SELECTED_TENANT_KEY, TENANT_NAMESPACE_PREFIX } from "./constants.ts"
+import { TenantContext, tenantDisplayName, type TenantContextValue } from "./tenant-context.tsx"
+
+export function TenantProvider({ children }: { children: ReactNode }) {
+  const [selectedTenant, setSelectedTenant] = useState<string | null>(() => {
+    if (typeof window === "undefined") return null
+    return window.localStorage.getItem(SELECTED_TENANT_KEY)
+  })
+
+  const ns = selectedTenant ? `${TENANT_NAMESPACE_PREFIX}${selectedTenant}` : null
+
+  // TenantNamespace is cluster-scoped, filter by parent tenant label
+  // to show only child tenants of the selected tenant
+  const labelSelector = ns ? `tenant.cozystack.io/${ns}` : undefined
+
+  const list = useK8sList<TenantNamespace>(
+    {
+      apiGroup: "core.cozystack.io",
+      apiVersion: "v1alpha1",
+      plural: "tenantnamespaces",
+    },
+    { labelSelector }
+  )
+
+  const tenants = useMemo<TenantNamespace[]>(() => {
+    return (list.data?.items ?? [])
+      .slice()
+      .sort((a, b) => tenantDisplayName(a).localeCompare(tenantDisplayName(b)))
+  }, [list.data])
+
+  useEffect(() => {
+    if (!tenants.length) return
+    if (selectedTenant && tenants.some((t) => tenantDisplayName(t) === selectedTenant)) return
+    const fallback =
+      tenants.find((t) => tenantDisplayName(t) === "root") ?? tenants[0]
+    // eslint-disable-next-line react-hooks/set-state-in-effect -- falls back to an existing tenant once the list has loaded
+    setSelectedTenant(tenantDisplayName(fallback))
+  }, [tenants, selectedTenant])
+
+  const selectTenant = (name: string) => {
+    setSelectedTenant(name)
+    try {
+      window.localStorage.setItem(SELECTED_TENANT_KEY, name)
+    } catch {
+      // ignore storage quota / private-mode failures
+    }
+  }
+
+  const value: TenantContextValue = {
+    tenants,
+    selectedTenant,
+    selectTenant,
+    tenantNamespace: list.isLoading ? null : ns,
+    isLoading: list.isLoading,
+    error: list.error,
+  }
+
+  return <TenantContext.Provider value={value}>{children}</TenantContext.Provider>
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/lib/tenant-tree.ts b/packages/system/dashboard/images/console/apps/console/src/lib/tenant-tree.ts
new file mode 100644
index 0000000000..a8f474bf98
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/lib/tenant-tree.ts
@@ -0,0 +1,102 @@
+import type { TenantNamespace } from "@cozystack/types"
+import { tenantDisplayName } from "./tenant-context.tsx"
+
+const ANCESTOR_LABEL_PREFIX = "tenant.cozystack.io/"
+
+export interface TenantTreeNode {
+  tn: TenantNamespace
+  /** Namespace of the nearest *visible* ancestor; undefined for forest roots. */
+  parentNs?: string
+  children: TenantTreeNode[]
+  depth: number
+}
+
+export function ancestorNamespaces(tn: TenantNamespace): string[] {
+  return Object.keys(tn.metadata.labels ?? {})
+    .filter((k) => k.startsWith(ANCESTOR_LABEL_PREFIX))
+    .map((k) => k.slice(ANCESTOR_LABEL_PREFIX.length))
+    .filter((ns) => ns !== tn.metadata.name)
+}
+
+/**
+ * Build a forest out of the visible TenantNamespaces. Each TN labels itself
+ * with its full ancestor chain (`tenant.cozystack.io/<ancestor-ns>`), so the
+ * parent is the deepest ancestor present in the visible set. A node whose
+ * ancestors are all invisible (no access up the hierarchy) becomes a root.
+ */
+export function buildTenantForest(tns: TenantNamespace[]): TenantTreeNode[] {
+  const visible = new Map(tns.map((tn) => [tn.metadata.name, tn]))
+  const nodes = new Map<string, TenantTreeNode>(
+    tns.map((tn) => [tn.metadata.name, { tn, children: [], depth: 0 }]),
+  )
+
+  const roots: TenantTreeNode[] = []
+  for (const node of nodes.values()) {
+    const candidates = ancestorNamespaces(node.tn).filter((ns) => visible.has(ns))
+    // Deepest visible ancestor = the one with the most ancestors of its own.
+    candidates.sort(
+      (a, b) =>
+        ancestorNamespaces(visible.get(b)!).length -
+        ancestorNamespaces(visible.get(a)!).length,
+    )
+    const parentNs = candidates[0]
+    if (parentNs) {
+      node.parentNs = parentNs
+      nodes.get(parentNs)!.children.push(node)
+    } else {
+      roots.push(node)
+    }
+  }
+
+  const sortRec = (list: TenantTreeNode[], depth: number) => {
+    list.sort((a, b) => a.tn.metadata.name.localeCompare(b.tn.metadata.name))
+    for (const n of list) {
+      n.depth = depth
+      sortRec(n.children, depth + 1)
+    }
+  }
+  sortRec(roots, 0)
+  return roots
+}
+
+/** Depth-first row order, skipping the children of collapsed nodes. */
+export function flattenTenantForest(
+  roots: TenantTreeNode[],
+  collapsed: Set<string>,
+): TenantTreeNode[] {
+  const out: TenantTreeNode[] = []
+  const walk = (n: TenantTreeNode) => {
+    out.push(n)
+    if (!collapsed.has(n.tn.metadata.name)) n.children.forEach(walk)
+  }
+  roots.forEach(walk)
+  return out
+}
+
+/**
+ * Row label relative to the visible parent: `tenant-whmcs-crpjxhwm` under
+ * `tenant-whmcs` shows as `crpjxhwm`. Forest roots keep their full display
+ * name — there is no parent on screen to be relative to.
+ */
+export function relativeTenantName(node: TenantTreeNode): string {
+  const ns = node.tn.metadata.name
+  if (node.parentNs && ns.startsWith(`${node.parentNs}-`)) {
+    return ns.slice(node.parentNs.length + 1)
+  }
+  return tenantDisplayName(node.tn)
+}
+
+/**
+ * The namespace of a node's *real* parent, which is not always the one it
+ * hangs under in the visible forest: a node whose real parent is inaccessible
+ * is bridged onto its nearest visible ancestor instead. Tenant namespaces are
+ * named hierarchically (`tenant-a-b` sits under `tenant-a`), so among the
+ * node's own ancestor labels the real parent is the longest that prefixes it.
+ * Returns undefined for the hierarchy root, which has no ancestors at all.
+ */
+export function realParentNamespace(tn: TenantNamespace): string | undefined {
+  const ns = tn.metadata.name
+  return ancestorNamespaces(tn)
+    .filter((ancestor) => ns.startsWith(`${ancestor}-`))
+    .sort((a, b) => b.length - a.length)[0]
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/lib/use-crd-schema.ts b/packages/system/dashboard/images/console/apps/console/src/lib/use-crd-schema.ts
new file mode 100644
index 0000000000..027aac8a7c
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/lib/use-crd-schema.ts
@@ -0,0 +1,56 @@
+import { useK8sGet } from "@cozystack/k8s-client"
+import { graftOptionSources } from "./crd-option-sources.ts"
+
+interface CRDVersion {
+  name: string
+  storage?: boolean
+  schema?: {
+    openAPIV3Schema?: {
+      properties?: {
+        spec?: unknown
+      }
+    }
+  }
+}
+
+interface CRD {
+  apiVersion: string
+  kind: string
+  metadata: {
+    name: string
+    annotations?: Record<string, string>
+  }
+  spec: {
+    group: string
+    versions: CRDVersion[]
+  }
+}
+
+/**
+ * Hook to fetch OpenAPI schema from a CRD's spec field
+ */
+export function useCRDSchema(crdName: string) {
+  const { data: crd, isLoading, error } = useK8sGet<CRD>(
+    {
+      apiGroup: "apiextensions.k8s.io",
+      apiVersion: "v1",
+      plural: "customresourcedefinitions",
+      name: crdName,
+    },
+    { enabled: !!crdName },
+  )
+
+  // Use the storage version (authoritative) or fall back to the first listed version
+  const version = crd?.spec?.versions?.find((v) => v.storage) ?? crd?.spec?.versions?.[0]
+  const specSchema = version?.schema?.openAPIV3Schema?.properties?.spec
+
+  // Reattach the x-cozystack-options dropdown hints the apiserver strips from
+  // the CRD schema; they are carried in metadata annotations instead.
+  const schema = graftOptionSources(specSchema, crd?.metadata?.annotations)
+
+  return {
+    schema: schema ? JSON.stringify(schema) : null,
+    isLoading,
+    error,
+  }
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/lib/vnc-keymap.test.ts b/packages/system/dashboard/images/console/apps/console/src/lib/vnc-keymap.test.ts
new file mode 100644
index 0000000000..e4b13bcbe6
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/lib/vnc-keymap.test.ts
@@ -0,0 +1,79 @@
+import { describe, it, expect } from "vitest"
+import { planKeystrokes, type Keystroke } from "./vnc-keymap.ts"
+
+function codes(strokes: Keystroke[]): string[] {
+  return strokes.map((s) => `${s.code}${s.shift ? "+shift" : ""}`)
+}
+
+describe("planKeystrokes", () => {
+  it("maps plain letters to their own keys", () => {
+    const { keystrokes, unsupported } = planKeystrokes("abz")
+
+    expect(codes(keystrokes)).toEqual(["KeyA", "KeyB", "KeyZ"])
+    expect(unsupported).toEqual([])
+  })
+
+  it("shifts capitals and the upper-register punctuation", () => {
+    expect(codes(planKeystrokes("A!?").keystrokes)).toEqual([
+      "KeyA+shift",
+      "Digit1+shift",
+      "Slash+shift",
+    ])
+  })
+
+  it("carries the Unicode code point as the keysym", () => {
+    expect(planKeystrokes("aA").keystrokes.map((s) => s.keysym)).toEqual([0x61, 0x41])
+  })
+
+  it("prefers the main block over the 102nd key for characters reachable on both", () => {
+    // "<" sits on IntlBackslash in the layout table and on Comma+Shift. A US
+    // keyboard usually has no 102nd key, so the main block must win.
+    expect(codes(planKeystrokes("<>").keystrokes)).toEqual(["Comma+shift", "Period+shift"])
+  })
+
+  it("reaches every printable ASCII character", () => {
+    const ascii = Array.from({ length: 0x7f - 0x20 }, (_, i) => String.fromCharCode(0x20 + i)).join(
+      "",
+    )
+
+    expect(planKeystrokes(ascii).unsupported).toEqual([])
+  })
+})
+
+describe("planKeystrokes whitespace handling", () => {
+  it("maps space, tab and newline to their own keys", () => {
+    const { keystrokes } = planKeystrokes(" \t\n")
+
+    expect(codes(keystrokes)).toEqual(["Space", "Tab", "Enter"])
+    expect(keystrokes.map((s) => s.keysym)).toEqual([0x20, 0xff09, 0xff0d])
+  })
+
+  it("collapses CRLF into a single Enter", () => {
+    expect(codes(planKeystrokes("a\r\nb").keystrokes)).toEqual(["KeyA", "Enter", "KeyB"])
+  })
+
+  it("treats a bare CR as Enter", () => {
+    expect(codes(planKeystrokes("a\rb").keystrokes)).toEqual(["KeyA", "Enter", "KeyB"])
+  })
+})
+
+describe("planKeystrokes unsupported characters", () => {
+  it("reports characters the layout cannot reach and skips them", () => {
+    const { keystrokes, unsupported } = planKeystrokes("aфb")
+
+    expect(codes(keystrokes)).toEqual(["KeyA", "KeyB"])
+    expect(unsupported).toEqual(["ф"])
+  })
+
+  it("reports each unsupported character once, in order of appearance", () => {
+    expect(planKeystrokes("яф-я").unsupported).toEqual(["я", "ф"])
+  })
+
+  it("reports control characters rather than dropping them silently", () => {
+    expect(planKeystrokes("a\u0007b").unsupported).toEqual(["\u0007"])
+  })
+
+  it("counts an astral code point as one unsupported character", () => {
+    expect(planKeystrokes("a🙂").unsupported).toEqual(["🙂"])
+  })
+})
diff --git a/packages/system/dashboard/images/console/apps/console/src/lib/vnc-keymap.ts b/packages/system/dashboard/images/console/apps/console/src/lib/vnc-keymap.ts
new file mode 100644
index 0000000000..ddddd1f83f
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/lib/vnc-keymap.ts
@@ -0,0 +1,131 @@
+/**
+ * Turn text into the key presses that reproduce it on a US guest keyboard.
+ *
+ * KubeVirt's VNC console carries no clipboard channel: qemu only forwards RFB
+ * cut-text to a `qemu-vdagent` chardev, and virt-launcher does not add one
+ * (`pkg/virt-launcher/virtwrap/converter/compute/graphics.go` emits a bare
+ * `<graphics type='vnc'>`). Pasting therefore means typing, one key at a time.
+ *
+ * What a scancode means is decided by the guest, and nothing in the RFB stream
+ * says which layout it has active, so this assumes US — the layout a default
+ * cloud image boots with. On a guest sitting in another layout the characters
+ * would arrive wrong, which is why `unsupported` exists and why the serial
+ * console, where text travels as bytes, is the better road for text.
+ *
+ * The table below was generated from @kubevirt-ui-ext/vnc-keymaps (MIT,
+ * github.com/kubevirt-ui/vnc-keymaps), itself derived from the X11 xkb data,
+ * and cross-checked against noVNC's DOM-code-to-scancode table.
+ */
+
+export interface Keystroke {
+  /** DOM code of the physical key, which noVNC maps to an XT scancode. */
+  code: string
+  keysym: number
+  shift: boolean
+}
+
+export interface KeystrokePlan {
+  keystrokes: Keystroke[]
+  /** Distinct characters no key on this layout produces, in input order. */
+  unsupported: string[]
+}
+
+// The 48 character keys of a 102-key keyboard, in row order. The row strings
+// below are indexed by this array, one code point per key.
+const KEYS = [
+  "Digit1", "Digit2", "Digit3", "Digit4", "Digit5", "Digit6",
+  "Digit7", "Digit8", "Digit9", "Digit0", "Minus", "Equal",
+  "KeyQ", "KeyW", "KeyE", "KeyR", "KeyT", "KeyY",
+  "KeyU", "KeyI", "KeyO", "KeyP", "BracketLeft", "BracketRight",
+  "Backslash", "KeyA", "KeyS", "KeyD", "KeyF", "KeyG",
+  "KeyH", "KeyJ", "KeyK", "KeyL", "Semicolon", "Quote",
+  "Backquote", "IntlBackslash", "KeyZ", "KeyX", "KeyC", "KeyV",
+  "KeyB", "KeyN", "KeyM", "Comma", "Period", "Slash",
+]
+
+// The 102nd key is absent from most keyboards this console is driven from, and
+// it duplicates characters the main block already carries. It is filled in
+// last so the main block always wins a tie.
+const INTL_BACKSLASH = KEYS.indexOf("IntlBackslash")
+
+const BASE_ROW = "1234567890-=qwertyuiop[]\\asdfghjkl;'`<zxcvbnm,./"
+const SHIFT_ROW = "!@#$%^&*()_+QWERTYUIOP{}|ASDFGHJKL:\"~>ZXCVBNM<>?"
+
+const XK_RETURN = 0xff0d
+const XK_TAB = 0xff09
+const XK_SPACE = 0x20
+
+export const XK_SHIFT_L = 0xffe1
+
+/** X11 encodes anything past Latin-1 as the code point in the Unicode plane. */
+function keysymOf(char: string): number {
+  const codePoint = char.codePointAt(0) ?? 0
+  return codePoint <= 0xff ? codePoint : 0x01000000 + codePoint
+}
+
+function buildCharKeys(): Map<string, Keystroke> {
+  const map = new Map<string, Keystroke>()
+
+  const add = (index: number, char: string, shift: boolean) => {
+    if (char === " " || map.has(char)) return
+    map.set(char, { code: KEYS[index], keysym: keysymOf(char), shift })
+  }
+
+  const levels = [
+    [BASE_ROW, false],
+    [SHIFT_ROW, true],
+  ] as const
+
+  for (const [row, shift] of levels) {
+    const chars = [...row]
+    for (let i = 0; i < chars.length; i++) {
+      if (i === INTL_BACKSLASH) continue
+      add(i, chars[i], shift)
+    }
+  }
+
+  // The 102nd key only after every other key of every level, so it is used
+  // only for characters the main block cannot reach at all.
+  for (const [row, shift] of levels) {
+    add(INTL_BACKSLASH, [...row][INTL_BACKSLASH], shift)
+  }
+
+  return map
+}
+
+const CHAR_KEYS = buildCharKeys()
+
+const FIXED_KEYS: Record<string, Keystroke> = {
+  " ": { code: "Space", keysym: XK_SPACE, shift: false },
+  "\t": { code: "Tab", keysym: XK_TAB, shift: false },
+  "\n": { code: "Enter", keysym: XK_RETURN, shift: false },
+}
+
+/**
+ * Plan the key presses for `text`. Characters the layout cannot produce are
+ * collected in `unsupported` instead of being typed as something else — a
+ * paste that silently drops or mistypes characters is worse than one that
+ * says what it could not send.
+ */
+export function planKeystrokes(text: string): KeystrokePlan {
+  const keystrokes: Keystroke[] = []
+  const unsupported: string[] = []
+  const seenUnsupported = new Set<string>()
+
+  // CR, CRLF and LF all mean one Enter.
+  const normalised = text.replace(/\r\n?/g, "\n")
+
+  for (const char of normalised) {
+    const stroke = FIXED_KEYS[char] ?? CHAR_KEYS.get(char)
+    if (stroke) {
+      keystrokes.push(stroke)
+      continue
+    }
+    if (!seenUnsupported.has(char)) {
+      seenUnsupported.add(char)
+      unsupported.push(char)
+    }
+  }
+
+  return { keystrokes, unsupported }
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/lib/vnc-typing.test.ts b/packages/system/dashboard/images/console/apps/console/src/lib/vnc-typing.test.ts
new file mode 100644
index 0000000000..a9b43ff213
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/lib/vnc-typing.test.ts
@@ -0,0 +1,251 @@
+import { describe, it, expect, vi } from "vitest"
+import { planKeystrokes } from "./vnc-keymap.ts"
+import { typeKeystrokes, DEFAULT_KEY_DELAY_MS, type KeySender } from "./vnc-typing.ts"
+
+interface SentKey {
+  keysym: number
+  code: string
+  down: boolean
+}
+
+function recorder(): { sender: KeySender; sent: SentKey[] } {
+  const sent: SentKey[] = []
+  return {
+    sent,
+    sender: {
+      sendKey: (keysym, code, down) => {
+        sent.push({ keysym, code, down })
+      },
+    },
+  }
+}
+
+const noSleep = () => Promise.resolve()
+
+function trace(sent: SentKey[]): string[] {
+  return sent.map((k) => `${k.code}${k.down ? "↓" : "↑"}`)
+}
+
+// Every run opens by releasing the modifiers the host may still be holding,
+// waiting out what is left of noVNC's delivery window, then releasing the
+// chord modifiers once more — all before the first character.
+const HOST_RELEASES = 8
+const CHORD_RELEASES = 6
+const PRELUDE = HOST_RELEASES + CHORD_RELEASES
+// The wait itself is a sleep with no key event behind it.
+const PRELUDE_SLEEPS = PRELUDE + 1
+
+function typedTrace(sent: SentKey[]): string[] {
+  return trace(sent.slice(PRELUDE))
+}
+
+describe("typeKeystrokes", () => {
+  it("presses and releases each key in order", async () => {
+    const { sender, sent } = recorder()
+
+    const result = await typeKeystrokes(sender, planKeystrokes("ab").keystrokes, {
+      sleep: noSleep,
+    })
+
+    expect(typedTrace(sent)).toEqual(["KeyA↓", "KeyA↑", "KeyB↓", "KeyB↑"])
+    expect(result).toEqual({ typed: 2, stopped: "done" })
+  })
+
+  it("holds Shift across a run of shifted characters and releases it once", async () => {
+    const { sender, sent } = recorder()
+
+    await typeKeystrokes(sender, planKeystrokes("ABc").keystrokes, { sleep: noSleep })
+
+    // The repeat for a late-delivered chord modifier lands in the middle and
+    // deliberately leaves Shift alone: that one is ours, held for the capitals.
+    expect(typedTrace(sent)).toEqual([
+      "ShiftLeft↓",
+      "KeyA↓",
+      "KeyA↑",
+      "KeyB↓",
+      "KeyB↑",
+      "ShiftLeft↑",
+      "KeyC↓",
+      "KeyC↑",
+    ])
+  })
+
+  it("releases a held modifier when the text ends", async () => {
+    const { sender, sent } = recorder()
+
+    await typeKeystrokes(sender, planKeystrokes("A").keystrokes, { sleep: noSleep })
+
+    expect(trace(sent).at(-1)).toBe("ShiftLeft↑")
+  })
+
+  it("waits between key events so the guest keyboard buffer keeps up", async () => {
+    const { sender } = recorder()
+    const sleep = vi.fn(() => Promise.resolve())
+
+    await typeKeystrokes(sender, planKeystrokes("ab").keystrokes, {
+      sleep,
+      delayMs: 7,
+    })
+
+    expect(sleep).toHaveBeenCalledTimes(PRELUDE_SLEEPS + 4)
+    expect(sleep).toHaveBeenCalledWith(7)
+  })
+
+  it("paces itself at the measured default when no delay is given", async () => {
+    const { sender } = recorder()
+    const sleep = vi.fn(() => Promise.resolve())
+
+    await typeKeystrokes(sender, planKeystrokes("a").keystrokes, { sleep })
+
+    // Measured, not chosen: at no pacing a 1000-character paste came back
+    // with characters dropped and reordered, while 25 ms round-tripped clean.
+    expect(sleep).toHaveBeenCalledWith(DEFAULT_KEY_DELAY_MS)
+    expect(DEFAULT_KEY_DELAY_MS).toBe(25)
+  })
+
+  it("releases the chord modifiers again once a late delivery could have landed", async () => {
+    const { sender, sent } = recorder()
+
+    await typeKeystrokes(sender, planKeystrokes("abcdef").keystrokes, { sleep: noSleep })
+
+    // On a Windows host noVNC sits on the first Ctrl for 100 ms and hands it
+    // to the guest on a timer, which fires after the prelude has run. The
+    // repeat is what catches that, and it happens once, not per character.
+    const releases = trace(sent).filter((k) => k === "ControlLeft↑")
+    expect(releases).toHaveLength(2)
+  })
+
+  it("reports progress as characters land", async () => {
+    const { sender } = recorder()
+    const onProgress = vi.fn()
+
+    await typeKeystrokes(sender, planKeystrokes("abc").keystrokes, {
+      sleep: noSleep,
+      onProgress,
+    })
+
+    expect(onProgress.mock.calls).toEqual([
+      [1, 3],
+      [2, 3],
+      [3, 3],
+    ])
+  })
+})
+
+describe("typeKeystrokes and the host's own modifiers", () => {
+  it("releases every modifier the host may hold before the first character", async () => {
+    const { sender, sent } = recorder()
+
+    await typeKeystrokes(sender, planKeystrokes("a").keystrokes, { sleep: noSleep })
+
+    // The paste begins while the user is still holding the shortcut, and the
+    // guest was told that modifier is down. Typing into that state sends
+    // chords, not characters: under Ctrl an "m" is Return.
+    expect(trace(sent).slice(0, HOST_RELEASES)).toEqual([
+      "ControlLeft↑",
+      "ControlRight↑",
+      "AltLeft↑",
+      "AltRight↑",
+      "MetaLeft↑",
+      "MetaRight↑",
+      "ShiftLeft↑",
+      "ShiftRight↑",
+    ])
+  })
+
+  it("does not send the prelude when there is nothing to type", async () => {
+    const { sender, sent } = recorder()
+
+    await typeKeystrokes(sender, planKeystrokes("").keystrokes, { sleep: noSleep })
+
+    expect(sent).toEqual([])
+  })
+})
+
+describe("typeKeystrokes interruption", () => {
+  it("stops on abort and releases the modifier it was holding", async () => {
+    const { sender, sent } = recorder()
+    const controller = new AbortController()
+
+    const result = await typeKeystrokes(sender, planKeystrokes("ABC").keystrokes, {
+      sleep: noSleep,
+      signal: controller.signal,
+      // Cancel once a character has gone in, which is where a user cancelling
+      // a paste actually lands.
+      onProgress: (typed) => {
+        if (typed >= 1) controller.abort()
+      },
+    })
+
+    expect(result.stopped).toBe("aborted")
+    expect(result.typed).toBe(1)
+    expect(trace(sent).at(-1)).toBe("ShiftLeft↑")
+    expect(typedTrace(sent)[0]).toBe("ShiftLeft↓")
+  })
+
+  it("stops typing when the session drops and sends nothing more", async () => {
+    const { sender, sent } = recorder()
+    let connected = true
+
+    const result = await typeKeystrokes(sender, planKeystrokes("abc").keystrokes, {
+      sleep: noSleep,
+      isConnected: () => connected,
+      // Drop it after a character, where a session actually goes: inside the
+      // prelude nothing is pressed yet, so the assertion would hold no matter
+      // what the loop did.
+      onProgress: (typed) => {
+        if (typed >= 1) connected = false
+      },
+    })
+
+    expect(result).toEqual({ typed: 1, stopped: "disconnected" })
+    expect(typedTrace(sent)).toEqual(["KeyA↓", "KeyA↑"])
+  })
+
+  it("does not try to release modifiers into a dropped session", async () => {
+    const { sender, sent } = recorder()
+    let connected = true
+
+    // Shift goes down for the capital, then the session drops: the release
+    // must not be sent into a socket that is gone.
+    await typeKeystrokes(sender, planKeystrokes("AB").keystrokes, {
+      sleep: noSleep,
+      isConnected: () => connected,
+      onProgress: (typed) => {
+        if (typed >= 1) connected = false
+      },
+    })
+
+    expect(typedTrace(sent)).toEqual(["ShiftLeft↓", "KeyA↓", "KeyA↑"])
+  })
+
+  it("leaves the last modifier alone when the session dies on the final character", async () => {
+    const { sender, sent } = recorder()
+    let connected = true
+
+    // One character, so the drop lands after the loop has finished and the run
+    // reaches its closing release — the one path where it is reachable at all.
+    await typeKeystrokes(sender, planKeystrokes("A").keystrokes, {
+      sleep: noSleep,
+      isConnected: () => connected,
+      onProgress: (typed) => {
+        if (typed >= 1) connected = false
+      },
+    })
+
+    expect(typedTrace(sent)).toEqual(["ShiftLeft↓", "KeyA↓", "KeyA↑"])
+    expect(trace(sent).at(-1)).not.toBe("ShiftLeft↑")
+  })
+
+  it("sends nothing at all when the session is already down", async () => {
+    const { sender, sent } = recorder()
+
+    const result = await typeKeystrokes(sender, planKeystrokes("a").keystrokes, {
+      sleep: noSleep,
+      isConnected: () => false,
+    })
+
+    expect(sent).toEqual([])
+    expect(result).toEqual({ typed: 0, stopped: "disconnected" })
+  })
+})
diff --git a/packages/system/dashboard/images/console/apps/console/src/lib/vnc-typing.ts b/packages/system/dashboard/images/console/apps/console/src/lib/vnc-typing.ts
new file mode 100644
index 0000000000..f68a4a77c0
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/lib/vnc-typing.ts
@@ -0,0 +1,162 @@
+import { XK_SHIFT_L, type Keystroke } from "./vnc-keymap.ts"
+
+/**
+ * Feed a planned key sequence to an RFB session.
+ *
+ * Every event is spaced out: qemu drains the emulated keyboard controller at
+ * its own pace and a burst loses characters silently, which is why the
+ * upstream KubeVirt console paces its paste the same way.
+ */
+
+export interface KeySender {
+  sendKey(keysym: number, code: string, down: boolean): void
+}
+
+export interface TypeKeystrokesOptions {
+  delayMs?: number
+  /**
+   * How much of the modifier-delivery window is still ahead when this paste
+   * starts, measured from the keydown that triggered it.
+   */
+  settleMs?: number
+  signal?: AbortSignal
+  isConnected?: () => boolean
+  onProgress?: (typed: number, total: number) => void
+  /** Injectable for tests; production uses a real timer. */
+  sleep?: (ms: number) => Promise<void>
+}
+
+export interface TypeKeystrokesResult {
+  typed: number
+  stopped: "done" | "aborted" | "disconnected"
+}
+
+export const DEFAULT_KEY_DELAY_MS = 25
+
+/**
+ * How long noVNC may sit on a modifier before handing it to the guest.
+ *
+ * On a Windows host the first Ctrl keydown sends nothing to the guest: it arms
+ * AltGr detection and starts a 100 ms timer. The modifier is delivered once,
+ * by whichever comes first — that timer, or the next keyup, since
+ * `_handleKeyUp` interrupts the sequence too and the V release is not
+ * intercepted. Both land within this window of the keydown, so a release sent
+ * after it has closed is the one the guest keeps.
+ */
+export const LATE_MODIFIER_WINDOW_MS = 100
+
+const SHIFT_KEY = { keysym: XK_SHIFT_L, code: "ShiftLeft" }
+
+// Shift is ours to hold for capitals, so the repeat leaves it alone; the late
+// delivery only ever concerns the chord modifiers.
+const CHORD_MODIFIERS: ReadonlyArray<{ keysym: number; code: string }> = [
+  { keysym: 0xffe3, code: "ControlLeft" },
+  { keysym: 0xffe4, code: "ControlRight" },
+  { keysym: 0xffe9, code: "AltLeft" },
+  { keysym: 0xffea, code: "AltRight" },
+  { keysym: 0xffe7, code: "MetaLeft" },
+  { keysym: 0xffe8, code: "MetaRight" },
+]
+
+/**
+ * Every modifier the guest may currently believe is down.
+ *
+ * The paste starts while the user is still holding the shortcut, and noVNC
+ * told the guest about that modifier the moment it was pressed — the release
+ * only follows on keyup. Typing into that state does not send characters, it
+ * sends chords: under Ctrl an `m` is Return, so the guest runs whatever the
+ * line already held. On macOS noVNC maps Cmd to Alt, so the same happens
+ * there under Alt.
+ */
+const HOST_MODIFIERS: ReadonlyArray<{ keysym: number; code: string }> = [
+  { keysym: 0xffe3, code: "ControlLeft" },
+  { keysym: 0xffe4, code: "ControlRight" },
+  { keysym: 0xffe9, code: "AltLeft" },
+  { keysym: 0xffea, code: "AltRight" },
+  { keysym: 0xffe7, code: "MetaLeft" },
+  { keysym: 0xffe8, code: "MetaRight" },
+  { keysym: XK_SHIFT_L, code: "ShiftLeft" },
+  { keysym: 0xffe2, code: "ShiftRight" },
+]
+
+function timerSleep(ms: number): Promise<void> {
+  return new Promise((resolve) => setTimeout(resolve, ms))
+}
+
+export async function typeKeystrokes(
+  sender: KeySender,
+  keystrokes: readonly Keystroke[],
+  options: TypeKeystrokesOptions = {},
+): Promise<TypeKeystrokesResult> {
+  const {
+    delayMs = DEFAULT_KEY_DELAY_MS,
+    settleMs = LATE_MODIFIER_WINDOW_MS,
+    signal,
+    isConnected = () => true,
+    onProgress,
+    sleep = timerSleep,
+  } = options
+
+  let heldShift = false
+  let typed = 0
+
+
+  const press = async (keysym: number, code: string, down: boolean) => {
+    sender.sendKey(keysym, code, down)
+    await sleep(delayMs)
+  }
+
+  const releaseModifiers = async () => {
+    if (heldShift) {
+      await press(SHIFT_KEY.keysym, SHIFT_KEY.code, false)
+      heldShift = false
+    }
+  }
+
+  // Clear the host's modifiers before the first character, so the paste types
+  // what was pasted rather than chords built from it.
+  if (keystrokes.length > 0) {
+    for (const modifier of HOST_MODIFIERS) {
+      if (!isConnected()) return { typed, stopped: "disconnected" }
+      await press(modifier.keysym, modifier.code, false)
+    }
+
+    // The delivery happens within a window of the keydown, which is before
+    // this paste began — so waiting out whatever is left of it, and only then
+    // releasing again, is what puts the guest in a known state. Doing it after
+    // a count of characters instead lets those characters through as chords.
+    const spentOnPrelude = HOST_MODIFIERS.length * delayMs
+    const remaining = settleMs - spentOnPrelude
+    if (remaining > 0) await sleep(remaining)
+
+    for (const modifier of CHORD_MODIFIERS) {
+      if (!isConnected()) return { typed, stopped: "disconnected" }
+      await press(modifier.keysym, modifier.code, false)
+    }
+  }
+
+  for (const stroke of keystrokes) {
+    // A dropped session takes precedence: releasing a modifier into a socket
+    // that is gone is pointless, and the caller needs to hear why we stopped.
+    if (!isConnected()) return { typed, stopped: "disconnected" }
+    if (signal?.aborted) {
+      await releaseModifiers()
+      return { typed, stopped: "aborted" }
+    }
+
+    if (heldShift !== stroke.shift) {
+      await press(SHIFT_KEY.keysym, SHIFT_KEY.code, stroke.shift)
+      heldShift = stroke.shift
+    }
+
+    await press(stroke.keysym, stroke.code, true)
+    await press(stroke.keysym, stroke.code, false)
+
+    typed++
+    onProgress?.(typed, keystrokes.length)
+  }
+
+  if (!isConnected()) return { typed, stopped: "disconnected" }
+  await releaseModifiers()
+  return { typed, stopped: "done" }
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/lib/workload.ts b/packages/system/dashboard/images/console/apps/console/src/lib/workload.ts
new file mode 100644
index 0000000000..af7766cf0b
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/lib/workload.ts
@@ -0,0 +1,23 @@
+import { APPS_GROUP } from "@cozystack/types"
+
+/**
+ * Derive the owning application (kind + name) of a resource from its labels.
+ * Cozystack's lineage controller stamps apps.cozystack.io/application.{kind,name}
+ * on every workload object (Pods, PVCs, Services, …); we fall back to the Helm
+ * instance/name labels and finally to the resource's own name so nothing is
+ * silently dropped.
+ */
+export function workloadOwner(
+  labels: Record<string, string> | undefined,
+  fallbackName: string,
+): { kind: string; name: string } {
+  const l = labels ?? {}
+  const kind = l[`${APPS_GROUP}/application.kind`]
+  const name =
+    l[`${APPS_GROUP}/application.name`] ??
+    l["app.kubernetes.io/instance"] ??
+    l["app.kubernetes.io/name"]
+  if (kind && name) return { kind, name }
+  if (name) return { kind: kind ?? "—", name }
+  return { kind: kind ?? "—", name: fallbackName }
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/main.tsx b/packages/system/dashboard/images/console/apps/console/src/main.tsx
new file mode 100644
index 0000000000..d8a6965a24
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/main.tsx
@@ -0,0 +1,21 @@
+import { StrictMode } from "react"
+import { createRoot } from "react-dom/client"
+import { BrowserRouter } from "react-router"
+import { K8sProvider } from "@cozystack/k8s-client"
+import "./index.css"
+import App from "./App.tsx"
+import { loadConfig, loadUsername } from "./lib/config.ts"
+
+Promise.all([loadConfig(), loadUsername()]).then(([config, username]) => {
+  if (config.titleText) document.title = config.titleText
+
+  createRoot(document.getElementById("root")!).render(
+    <StrictMode>
+      <K8sProvider>
+        <BrowserRouter>
+          <App config={config} username={username} />
+        </BrowserRouter>
+      </K8sProvider>
+    </StrictMode>,
+  )
+})
diff --git a/packages/system/dashboard/images/console/apps/console/src/novnc.d.ts b/packages/system/dashboard/images/console/apps/console/src/novnc.d.ts
new file mode 100644
index 0000000000..2e138787b7
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/novnc.d.ts
@@ -0,0 +1,32 @@
+declare module '@novnc/novnc/lib/rfb' {
+  export default class RFB {
+    constructor(
+      target: HTMLElement,
+      url: string,
+      options?: {
+        credentials?: { username?: string; password?: string; target?: string }
+        repeaterID?: string
+        shared?: boolean
+      }
+    )
+    disconnect(): void
+    sendCredentials(creds: { username?: string; password?: string; target?: string }): void
+    sendKey(keysym: number, code: string, down?: boolean): void
+    sendCtrlAltDel(): void
+    focus(): void
+    blur(): void
+    clipboardPasteFrom(text: string): void
+    scaleViewport: boolean
+    resizeSession: boolean
+    showDotCursor: boolean
+    background: string
+    qualityLevel: number
+    compressionLevel: number
+    viewOnly: boolean
+    focusOnClick: boolean
+    clipViewport: boolean
+    dragViewport: boolean
+    addEventListener(type: string, listener: EventListener): void
+    removeEventListener(type: string, listener: EventListener): void
+  }
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/routes/AdminPage.routing.test.tsx b/packages/system/dashboard/images/console/apps/console/src/routes/AdminPage.routing.test.tsx
new file mode 100644
index 0000000000..f53d3e7545
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/routes/AdminPage.routing.test.tsx
@@ -0,0 +1,155 @@
+import { describe, it, expect, vi, beforeAll } from "vitest"
+import { screen } from "@testing-library/react"
+import { Route, Routes, useLocation } from "react-router"
+import {
+  K8sClient,
+  type K8sList,
+  type APIGroupList,
+  type SelfSubjectAccessReview,
+} from "@cozystack/k8s-client"
+import { AdminPage } from "./AdminPage.tsx"
+import { TenantProvider } from "../lib/tenant-provider.tsx"
+import { renderWithK8sProvider } from "../test-utils/render.tsx"
+
+// Minimal Info ApplicationDefinition so InfoRedirect can resolve the default
+// admin landing to its generic detail route.
+const INFO_AD = {
+  apiVersion: "cozystack.io/v1alpha1",
+  kind: "ApplicationDefinition",
+  metadata: { name: "info" },
+  spec: {
+    application: { kind: "Info", plural: "infos", singular: "info" },
+    dashboard: { module: true, category: "Administration" },
+  },
+}
+
+// Echoes the router location so a redirect chain can be asserted by URL.
+function LocationProbe() {
+  const { pathname } = useLocation()
+  return <div>{pathname}</div>
+}
+
+/**
+ * Answer each SelfSubjectAccessReview by its requested resource so the two
+ * admin gates (nodes/list for Cluster Usage, backupclasses/update for Backup
+ * Classes) can be exercised independently.
+ */
+function makeClient(allow: Record<string, boolean>): K8sClient {
+  const client = new K8sClient()
+  vi.spyOn(client, "list").mockImplementation(async (_g, _v, plural) => {
+    return {
+      apiVersion: "v1",
+      kind: `${plural}List`,
+      metadata: {},
+      items: plural === "applicationdefinitions" ? [INFO_AD] : [],
+    } as K8sList<unknown>
+  })
+  vi.spyOn(client, "getApiGroups").mockResolvedValue({
+    kind: "APIGroupList",
+    apiVersion: "v1",
+    groups: [],
+  } as APIGroupList)
+  vi.spyOn(client, "create").mockImplementation(async (_g, _v, _p, body) => {
+    const resource =
+      (body as SelfSubjectAccessReview).spec?.resourceAttributes?.resource ?? ""
+    return {
+      ...(body as object),
+      status: { allowed: allow[resource] === true },
+    } as unknown
+  })
+  return client
+}
+
+// TenantProvider reads window.localStorage on mount; provide a minimal
+// in-memory shim for the test environment when one is not present.
+beforeAll(() => {
+  if (typeof globalThis.localStorage?.getItem !== "function") {
+    const store = new Map<string, string>()
+    vi.stubGlobal("localStorage", {
+      getItem: (k: string) => store.get(k) ?? null,
+      setItem: (k: string, v: string) => void store.set(k, v),
+      removeItem: (k: string) => void store.delete(k),
+      clear: () => store.clear(),
+    })
+  }
+})
+
+describe("AdminPage routing & access gate", () => {
+  it("renders the Cluster Usage page at /capacity/cluster for an operator", async () => {
+    renderWithK8sProvider(<AdminPage />, {
+      client: makeClient({ nodes: true }),
+      initialRoute: "/capacity/cluster",
+    })
+    expect(await screen.findByText("Cluster")).toBeInTheDocument()
+  })
+
+  it("redirects the index route to Administration (Tenants)", async () => {
+    renderWithK8sProvider(
+      <>
+        <LocationProbe />
+        <Routes>
+          <Route
+            path="/admin/*"
+            element={
+              <TenantProvider>
+                <AdminPage />
+              </TenantProvider>
+            }
+          />
+        </Routes>
+      </>,
+      { client: makeClient({}), initialRoute: "/admin" },
+    )
+    expect(await screen.findByText("/admin/tenants")).toBeInTheDocument()
+  })
+
+  it("allows Administration (Tenants) even when the user has no operator area", async () => {
+    // Administration needs no special permission, so the portal has no
+    // top-level gate any more — a user with neither operator area still
+    // reaches the Tenants page.
+    renderWithK8sProvider(
+      <TenantProvider>
+        <AdminPage />
+      </TenantProvider>,
+      { client: makeClient({ nodes: false, backupclasses: false }), initialRoute: "/tenants" },
+    )
+    expect(
+      await screen.findByRole("heading", { name: "Tenants" }),
+    ).toBeInTheDocument()
+  })
+
+  it("serves Repositories under Administration, with no operator area", async () => {
+    renderWithK8sProvider(
+      <TenantProvider>
+        <AdminPage />
+      </TenantProvider>,
+      { client: makeClient({ nodes: false, backupclasses: false }), initialRoute: "/taps" },
+    )
+    expect(
+      await screen.findByRole("heading", { name: "Repositories" }),
+    ).toBeInTheDocument()
+  })
+
+  it("guards capacity routes for a backup-only operator hitting a capacity URL", async () => {
+    // The capacity area must stay closed without nodes/list, even though the
+    // portal itself is now ungated.
+    renderWithK8sProvider(<AdminPage />, {
+      client: makeClient({ nodes: false, backupclasses: true }),
+      initialRoute: "/capacity/cluster",
+    })
+    expect(
+      await screen.findByText(/you do not have permission to view cluster capacity/i),
+    ).toBeInTheDocument()
+    expect(screen.queryByText("Cluster")).not.toBeInTheDocument()
+  })
+
+  it("guards backup-class routes for a capacity-only operator hitting a backups URL", async () => {
+    renderWithK8sProvider(<AdminPage />, {
+      client: makeClient({ nodes: true, backupclasses: false }),
+      initialRoute: "/backups/backupclasses",
+    })
+    expect(
+      await screen.findByText(/you do not have permission to manage backup classes/i),
+    ).toBeInTheDocument()
+  })
+})
diff --git a/packages/system/dashboard/images/console/apps/console/src/routes/AdminPage.tsx b/packages/system/dashboard/images/console/apps/console/src/routes/AdminPage.tsx
new file mode 100644
index 0000000000..53152429df
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/routes/AdminPage.tsx
@@ -0,0 +1,59 @@
+import { Navigate, Route, Routes } from "react-router"
+import { ClusterUsagePage } from "./ClusterUsagePage.tsx"
+import { ClusterUsageResourcePage } from "./ClusterUsageResourcePage.tsx"
+import { StorageClassUsagePage } from "./StorageClassUsagePage.tsx"
+import { StoragePage } from "./StoragePage.tsx"
+import { NodesPage } from "./NodesPage.tsx"
+import { BackupClassListPage } from "./BackupClassListPage.tsx"
+import { BackupClassCreatePage } from "./BackupClassCreatePage.tsx"
+import { BackupClassDetailPage } from "./BackupClassDetailPage.tsx"
+import { BackupClassEditPage } from "./BackupClassEditPage.tsx"
+import { BackupClassAdminGuard } from "./BackupClassAdminGuard.tsx"
+import { CapacityAdminGuard } from "./CapacityAdminGuard.tsx"
+import { InfoRedirect } from "./InfoRedirect.tsx"
+import { ModulesPage } from "./ModulesPage.tsx"
+import { ExternalIpsPage } from "./ExternalIpsPage.tsx"
+import { TenantsPage } from "./TenantsPage.tsx"
+import { TapsPage } from "./TapsPage.tsx"
+import { ApplicationOrderPage } from "./ApplicationOrderPage.tsx"
+import { ApplicationEditRoute } from "./detail/ApplicationEditRoute.tsx"
+import { ApplicationDetailPage } from "./detail/ApplicationDetailPage.tsx"
+import { ApplicationListPage } from "./ApplicationListPage.tsx"
+
+/**
+ * Admin portal at /admin/*. Administration (Info, Modules, External IPs,
+ * Repositories, Tenants) is always accessible, so the portal itself carries no gate. The two
+ * cluster-wide operator areas keep their own independent permissions: Capacity
+ * (nodes/list) and Backup Classes (backupclasses/update). Each is wrapped in a
+ * layout guard that closes the direct-URL hole the sidebar already hides, so a
+ * user without an area can never reach its pages even by typing the URL.
+ */
+export function AdminPage() {
+  return (
+    <Routes>
+      <Route index element={<Navigate to="tenants" replace />} />
+      <Route element={<CapacityAdminGuard />}>
+        <Route path="capacity/cluster" element={<ClusterUsagePage />} />
+        <Route path="capacity/cluster/r/*" element={<ClusterUsageResourcePage />} />
+        <Route path="capacity/cluster/sc/*" element={<StorageClassUsagePage />} />
+        <Route path="capacity/storage" element={<StoragePage />} />
+        <Route path="capacity/nodes" element={<NodesPage />} />
+      </Route>
+      <Route element={<BackupClassAdminGuard />}>
+        <Route path="backups/backupclasses" element={<BackupClassListPage />} />
+        <Route path="backups/backupclasses/create" element={<BackupClassCreatePage />} />
+        <Route path="backups/backupclasses/:name" element={<BackupClassDetailPage />} />
+        <Route path="backups/backupclasses/:name/edit" element={<BackupClassEditPage />} />
+      </Route>
+      <Route path="info" element={<InfoRedirect />} />
+      <Route path="modules" element={<ModulesPage />} />
+      <Route path="external-ips" element={<ExternalIpsPage />} />
+      <Route path="taps" element={<TapsPage />} />
+      <Route path="tenants" element={<TenantsPage />} />
+      <Route path="new/:appName" element={<ApplicationOrderPage />} />
+      <Route path=":plural/:name/edit" element={<ApplicationEditRoute />} />
+      <Route path=":plural/:name/*" element={<ApplicationDetailPage />} />
+      <Route path=":plural" element={<ApplicationListPage />} />
+    </Routes>
+  )
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/routes/ApplicationListPage.test.tsx b/packages/system/dashboard/images/console/apps/console/src/routes/ApplicationListPage.test.tsx
new file mode 100644
index 0000000000..b64e5d89b2
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/routes/ApplicationListPage.test.tsx
@@ -0,0 +1,49 @@
+import { describe, it, expect, vi } from "vitest"
+import { render, screen } from "@testing-library/react"
+import { MemoryRouter, Routes, Route } from "react-router"
+
+// Drive the two upstream hooks per test; the page's guards are the unit under test.
+const h = vi.hoisted(() => ({
+  defs: { data: undefined as unknown, isLoading: true },
+  instances: { data: undefined as unknown, isLoading: false },
+}))
+
+vi.mock("../lib/app-definitions.ts", () => ({
+  useApplicationDefinitions: () => h.defs,
+  useApplicationInstances: () => h.instances,
+  iconDataUrl: () => null,
+  appDisplayName: () => "App",
+}))
+vi.mock("../lib/tenant-context.tsx", () => ({
+  useTenantContext: () => ({ tenantNamespace: "tenant-test", selectedTenant: "test" }),
+}))
+
+const { ApplicationListPage } = await import("./ApplicationListPage.tsx")
+
+function renderAt(plural: string) {
+  return render(
+    <MemoryRouter initialEntries={[`/console/${plural}`]}>
+      <Routes>
+        <Route path="/console/:plural" element={<ApplicationListPage />} />
+      </Routes>
+    </MemoryRouter>,
+  )
+}
+
+describe("ApplicationListPage guards", () => {
+  it("shows the unknown-type message once defs have loaded and the plural is unrecognized", () => {
+    // Regression: previously `defsLoading || (!ad && plural)` kept the spinner
+    // up forever for an unknown plural, so this branch was unreachable.
+    h.defs = { data: { items: [] }, isLoading: false }
+    renderAt("nonexistent")
+    expect(screen.getByText("Unknown application type.")).toBeInTheDocument()
+    expect(screen.queryByText("Loading…")).not.toBeInTheDocument()
+  })
+
+  it("still shows the spinner while definitions are loading", () => {
+    h.defs = { data: undefined, isLoading: true }
+    renderAt("postgreses")
+    expect(screen.getByText("Loading…")).toBeInTheDocument()
+    expect(screen.queryByText("Unknown application type.")).not.toBeInTheDocument()
+  })
+})
diff --git a/packages/system/dashboard/images/console/apps/console/src/routes/ApplicationListPage.tsx b/packages/system/dashboard/images/console/apps/console/src/routes/ApplicationListPage.tsx
new file mode 100644
index 0000000000..6d906b7017
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/routes/ApplicationListPage.tsx
@@ -0,0 +1,139 @@
+import { useMemo } from "react"
+import { Link, useNavigate, useParams } from "react-router"
+import { Plus } from "lucide-react"
+import { Button, Section, Spinner, StatusBadge } from "@cozystack/ui"
+import type { ApplicationInstance } from "@cozystack/types"
+import { useApplicationDefinitions, useApplicationInstances, iconDataUrl, appDisplayName } from "../lib/app-definitions.ts"
+import { useTenantContext } from "../lib/tenant-context.tsx"
+import { formatAge, readyCondition } from "../lib/status.ts"
+import { humanizeKind } from "../lib/humanize.ts"
+import { useResourceBasePath } from "../lib/portal.ts"
+
+/**
+ * Generic instances list for a given AD plural. Reads the AD, pulls its
+ * instances from the selected tenant namespace and renders a table.
+ */
+export function ApplicationListPage() {
+  const { plural } = useParams<{ plural: string }>()
+  const navigate = useNavigate()
+  const basePath = useResourceBasePath()
+  const { tenantNamespace, selectedTenant } = useTenantContext()
+  const { data: defs, isLoading: defsLoading } = useApplicationDefinitions()
+
+  const ad = useMemo(
+    () => defs?.items.find((d) => d.spec?.application.plural === plural),
+    [defs, plural],
+  )
+
+  const { data, isLoading } = useApplicationInstances(ad, tenantNamespace ?? undefined)
+  const items = data?.items ?? []
+
+  if (defsLoading) {
+    return (
+      <div className="flex items-center gap-2 p-6 text-sm text-slate-500">
+        <Spinner /> Loading…
+      </div>
+    )
+  }
+  // defs have loaded; an unresolved plural is genuinely unknown, not pending.
+  if (!ad) {
+    return <div className="p-6 text-sm text-red-600">Unknown application type.</div>
+  }
+
+  const kind = ad.spec?.application.kind ?? ad.metadata.name
+  const icon = iconDataUrl(ad)
+  const pluralLabel = humanizeKind(kind)
+
+  return (
+    <div className="p-6">
+      <div className="mb-5 flex items-end justify-between gap-4">
+        <div className="flex items-center gap-3">
+          {icon && (
+            <div className="size-11 shrink-0 overflow-hidden rounded-md bg-slate-100">
+              <img src={icon} alt="" className="h-full w-full" />
+            </div>
+          )}
+          <div>
+            <h1 className="text-xl font-semibold text-slate-900">{pluralLabel}</h1>
+            <p className="mt-0.5 text-sm text-slate-500">
+              {ad.spec?.dashboard?.description ?? `Manage ${appDisplayName(ad)} instances`}
+              {selectedTenant && (
+                <>
+                  {" "}· Tenant <code className="text-slate-700">{selectedTenant}</code>
+                </>
+              )}
+            </p>
+          </div>
+        </div>
+        <Link to={`${basePath}/new/${ad.metadata.name}`}>
+          <Button variant="primary" size="sm">
+            <Plus className="size-3.5" /> Deploy {humanizeKind(kind)}
+          </Button>
+        </Link>
+      </div>
+
+      {isLoading ? (
+        <div className="flex items-center gap-2 text-sm text-slate-500">
+          <Spinner /> Loading…
+        </div>
+      ) : items.length === 0 ? (
+        <Section>
+          <div className="py-8 text-center">
+            <p className="text-sm text-slate-500">No {pluralLabel.toLowerCase()} yet.</p>
+            <Link to={`${basePath}/new/${ad.metadata.name}`} className="mt-3 inline-flex">
+              <Button variant="primary" size="sm">
+                <Plus className="size-3.5" /> Deploy the first one
+              </Button>
+            </Link>
+          </div>
+        </Section>
+      ) : (
+        <Section bodyClassName="p-0">
+          <table className="w-full text-sm">
+            <thead>
+              <tr className="border-b border-slate-200 bg-slate-50 text-left text-xs font-medium uppercase tracking-wider text-slate-500">
+                <th className="px-4 py-3">Name</th>
+                <th className="px-4 py-3">Status</th>
+                <th className="px-4 py-3">Version</th>
+                <th className="px-4 py-3">Age</th>
+              </tr>
+            </thead>
+            <tbody className="divide-y divide-slate-100">
+              {items.map((inst: ApplicationInstance) => {
+                const ready = readyCondition(inst)
+                return (
+                  <tr
+                    key={inst.metadata.name}
+                    onClick={() => navigate(`${basePath}/${plural}/${inst.metadata.name}`)}
+                    className="cursor-pointer transition-colors duration-100 hover:bg-slate-50"
+                  >
+                    <td className="px-4 py-3 font-mono text-xs text-slate-800">
+                      {inst.metadata.name}
+                    </td>
+                    <td className="px-4 py-3">
+                      {inst.metadata.deletionTimestamp ? (
+                        <StatusBadge tone="muted">Terminating</StatusBadge>
+                      ) : ready ? (
+                        <StatusBadge tone={ready.status === "True" ? "ok" : "warn"}>
+                          {ready.status === "True" ? "Ready" : (ready.reason ?? "NotReady")}
+                        </StatusBadge>
+                      ) : (
+                        <StatusBadge tone="muted">Unknown</StatusBadge>
+                      )}
+                    </td>
+                    <td className="px-4 py-3 font-mono text-xs text-slate-600">
+                      {inst.status?.version ?? "—"}
+                    </td>
+                    <td className="px-4 py-3 tabular-nums text-xs text-slate-500">
+                      {formatAge(inst.metadata.creationTimestamp)}
+                    </td>
+                  </tr>
+                )
+              })}
+            </tbody>
+          </table>
+        </Section>
+      )}
+    </div>
+  )
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/routes/ApplicationOrderPage.freeform.test.tsx b/packages/system/dashboard/images/console/apps/console/src/routes/ApplicationOrderPage.freeform.test.tsx
new file mode 100644
index 0000000000..fb0e7d1fb2
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/routes/ApplicationOrderPage.freeform.test.tsx
@@ -0,0 +1,90 @@
+import { beforeEach, describe, expect, it, vi } from "vitest"
+import { fireEvent, render, screen } from "@testing-library/react"
+import userEvent from "@testing-library/user-event"
+import { MemoryRouter } from "react-router"
+
+const h = vi.hoisted(() => ({
+  create: vi.fn(),
+  update: vi.fn(),
+  ad: {
+    spec: {
+      application: {
+        kind: "NATS", plural: "natses", singular: "nats",
+        openAPISchema: JSON.stringify({
+          type: "object",
+          properties: {
+            config: {
+              type: "object",
+              properties: {
+                merge: { type: "object", "x-kubernetes-preserve-unknown-fields": true },
+                resolver: { type: "object", additionalProperties: true },
+              },
+            },
+          },
+        }),
+      },
+      dashboard: {},
+    },
+  },
+}))
+
+vi.mock("../lib/tenant-context.tsx", () => ({
+  useTenantContext: () => ({ tenantNamespace: "tenant-test" }),
+}))
+vi.mock("../lib/app-definitions.ts", () => ({
+  useApplicationDefinition: () => ({ data: h.ad, isLoading: false, error: null }),
+  appDisplayName: () => "NATS", iconDataUrl: () => null,
+}))
+vi.mock("@cozystack/k8s-client", () => ({
+  useK8sCreate: () => ({ mutateAsync: h.create, isPending: false }),
+  useK8sUpdate: () => ({ mutateAsync: h.update, isPending: false }),
+  K8sApiError: class extends Error {},
+}))
+vi.mock("../components/YamlEditor.tsx", () => ({
+  YamlEditor: ({ value }: { value: string }) => <textarea data-testid="yaml" readOnly value={value} />,
+}))
+
+const { ApplicationOrderPage } = await import("./ApplicationOrderPage.tsx")
+const merge = { accounts: { A: { jetstream: { max_streams: 2 }, subjects: ["one"], enabled: false } } }
+
+describe("ApplicationOrderPage free-form objects", () => {
+  beforeEach(() => {
+    h.create.mockReset().mockResolvedValue({})
+    h.update.mockReset().mockResolvedValue({})
+  })
+
+  it("sends nested objects on create after a form/YAML round trip", async () => {
+    const user = userEvent.setup()
+    render(<MemoryRouter><ApplicationOrderPage appNameOverride="nats" /></MemoryRouter>)
+    await user.type(screen.getByPlaceholderText("nats"), "demo")
+    fireEvent.change(screen.getByLabelText("merge"), { target: { value: JSON.stringify(merge) } })
+    fireEvent.change(screen.getByLabelText("resolver"), { target: { value: '{"type":"full"}' } })
+    await user.click(screen.getByRole("button", { name: /^yaml$/i }))
+    await screen.findByTestId("yaml")
+    await user.click(screen.getByRole("button", { name: /^form$/i }))
+    expect(JSON.parse((screen.getByLabelText("merge") as HTMLTextAreaElement).value)).toEqual(merge)
+    await user.click(screen.getByRole("button", { name: /^deploy$/i }))
+    expect(h.create).toHaveBeenCalledOnce()
+    expect(h.create.mock.calls[0][0].spec.config).toEqual({ merge, resolver: { type: "full" } })
+  })
+
+  it("preserves existing nested settings and saves an edited object", async () => {
+    const user = userEvent.setup()
+    render(<MemoryRouter><ApplicationOrderPage appNameOverride="nats" editMode={{ name: "demo", initialSpec: { config: { merge, resolver: { type: "full" } } } }} /></MemoryRouter>)
+    expect(JSON.parse((screen.getByLabelText("merge") as HTMLTextAreaElement).value)).toEqual(merge)
+    fireEvent.change(screen.getByLabelText("resolver"), { target: { value: "{}" } })
+    await user.click(screen.getByRole("button", { name: /^save$/i }))
+    expect(h.update).toHaveBeenCalledOnce()
+    expect(h.update.mock.calls[0][0].spec.config).toEqual({ merge, resolver: {} })
+  })
+
+  it.each([false, true])("blocks invalid JSON from the API in edit mode %s", async (edit) => {
+    const user = userEvent.setup()
+    render(<MemoryRouter><ApplicationOrderPage appNameOverride="nats" editMode={edit ? { name: "demo", initialSpec: { config: { merge } } } : undefined} /></MemoryRouter>)
+    if (!edit) await user.type(screen.getByPlaceholderText("nats"), "demo")
+    fireEvent.change(screen.getByLabelText("merge"), { target: { value: "{" } })
+    await user.click(screen.getByRole("button", { name: edit ? /^save$/i : /^deploy$/i }))
+    expect(h.create).not.toHaveBeenCalled()
+    expect(h.update).not.toHaveBeenCalled()
+  })
+})
diff --git a/packages/system/dashboard/images/console/apps/console/src/routes/ApplicationOrderPage.test.tsx b/packages/system/dashboard/images/console/apps/console/src/routes/ApplicationOrderPage.test.tsx
new file mode 100644
index 0000000000..8993974ac9
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/routes/ApplicationOrderPage.test.tsx
@@ -0,0 +1,105 @@
+import { forwardRef, useImperativeHandle } from "react"
+import { describe, it, expect, vi, beforeEach } from "vitest"
+import { render, screen } from "@testing-library/react"
+import userEvent from "@testing-library/user-event"
+import { MemoryRouter } from "react-router"
+
+// The Deploy button bypasses RJSF; in form mode the gate calls
+// SchemaForm.validate(), in YAML mode it is skipped. Mock SchemaForm so the
+// test drives that boolean directly, and YamlEditor so Monaco stays out.
+const h = vi.hoisted(() => ({
+  validateReturn: true,
+  createMutateAsync: vi.fn(),
+  updateMutateAsync: vi.fn(),
+  ad: {
+    spec: {
+      application: {
+        kind: "VirtualMachine",
+        plural: "virtualmachines",
+        singular: "virtualmachine",
+        openAPISchema: JSON.stringify({ type: "object", properties: {} }),
+      },
+      dashboard: {},
+    },
+  },
+}))
+
+vi.mock("../lib/tenant-context.tsx", () => ({
+  useTenantContext: () => ({ tenantNamespace: "tenant-test" }),
+}))
+vi.mock("../lib/app-definitions.ts", () => ({
+  useApplicationDefinition: () => ({ data: h.ad, isLoading: false, error: null }),
+  appDisplayName: () => "Virtual Machine",
+  iconDataUrl: () => null,
+}))
+vi.mock("@cozystack/k8s-client", () => ({
+  useK8sCreate: () => ({ mutateAsync: h.createMutateAsync, isPending: false }),
+  useK8sUpdate: () => ({ mutateAsync: h.updateMutateAsync, isPending: false }),
+  K8sApiError: class K8sApiError extends Error {},
+}))
+vi.mock("../components/SchemaForm.tsx", () => ({
+  SchemaForm: forwardRef<{ validate: () => boolean }, Record<string, unknown>>(
+    function MockSchemaForm(_props, ref) {
+      useImperativeHandle(ref, () => ({ validate: () => h.validateReturn }))
+      return null
+    },
+  ),
+}))
+vi.mock("../components/YamlEditor.tsx", () => ({
+  YamlEditor: ({ value }: { value: string }) => <textarea data-testid="yaml" readOnly value={value} />,
+}))
+
+const { ApplicationOrderPage } = await import("./ApplicationOrderPage.tsx")
+
+function renderPage() {
+  return render(
+    <MemoryRouter>
+      <ApplicationOrderPage appNameOverride="virtualmachine" />
+    </MemoryRouter>,
+  )
+}
+
+describe("ApplicationOrderPage submit validation gate", () => {
+  beforeEach(() => {
+    h.createMutateAsync.mockReset()
+    h.createMutateAsync.mockResolvedValue({})
+    h.updateMutateAsync.mockReset()
+    h.updateMutateAsync.mockResolvedValue({})
+    h.validateReturn = true
+  })
+
+  it("does not POST in form mode when the form fails RJSF validation", async () => {
+    h.validateReturn = false
+    const user = userEvent.setup()
+    renderPage()
+
+    await user.type(screen.getByRole("textbox"), "demo-vm")
+    await user.click(screen.getByRole("button", { name: /^deploy$/i }))
+
+    expect(h.createMutateAsync).not.toHaveBeenCalled()
+  })
+
+  it("POSTs in form mode when the form passes validation", async () => {
+    h.validateReturn = true
+    const user = userEvent.setup()
+    renderPage()
+
+    await user.type(screen.getByRole("textbox"), "demo-vm")
+    await user.click(screen.getByRole("button", { name: /^deploy$/i }))
+
+    expect(h.createMutateAsync).toHaveBeenCalledTimes(1)
+  })
+
+  it("skips the gate in YAML mode even when validation would fail", async () => {
+    // In YAML mode the spec is hand-authored, so the gate must not block it.
+    h.validateReturn = false
+    const user = userEvent.setup()
+    renderPage()
+
+    await user.type(screen.getByRole("textbox"), "demo-vm")
+    await user.click(screen.getByRole("button", { name: /yaml/i }))
+    await user.click(screen.getByRole("button", { name: /^deploy$/i }))
+
+    expect(h.createMutateAsync).toHaveBeenCalledTimes(1)
+  })
+})
diff --git a/packages/system/dashboard/images/console/apps/console/src/routes/ApplicationOrderPage.tsx b/packages/system/dashboard/images/console/apps/console/src/routes/ApplicationOrderPage.tsx
new file mode 100644
index 0000000000..ea49f48944
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/routes/ApplicationOrderPage.tsx
@@ -0,0 +1,319 @@
+import { lazy, Suspense, useEffect, useMemo, useRef, useState } from "react"
+import { useNavigate, useParams, useSearchParams } from "react-router"
+import { ChevronLeft, FileCode, FormInput } from "lucide-react"
+import yaml from "js-yaml"
+import { Button, Spinner, cn } from "@cozystack/ui"
+import { useK8sCreate, useK8sUpdate, K8sApiError } from "@cozystack/k8s-client"
+import { APPS_GROUP, APPS_VERSION } from "@cozystack/types"
+import {
+  useApplicationDefinition,
+  appDisplayName,
+  iconDataUrl,
+} from "../lib/app-definitions.ts"
+import { useTenantContext } from "../lib/tenant-context.tsx"
+import { useResourceBasePath } from "../lib/portal.ts"
+import { composeResource } from "../lib/app-resource.ts"
+import { prepareUpdateSpec } from "../lib/prepare-update.ts"
+import { SchemaForm, type SchemaFormHandle } from "../components/SchemaForm.tsx"
+
+// Lazy-load the YAML editor so monaco and its workers are code-split into their
+// own chunk, fetched only when the YAML view is opened.
+const YamlEditor = lazy(() =>
+  import("../components/YamlEditor.tsx").then((m) => ({ default: m.YamlEditor })),
+)
+
+type Mode = "form" | "yaml"
+
+interface ApplicationOrderPageProps {
+  /** When provided, the page pre-fills the form with this spec and PUTs on save. */
+  editMode?: { name: string; initialSpec: unknown }
+  /** Override the AD name that would otherwise come from the URL. */
+  appNameOverride?: string
+}
+
+export function ApplicationOrderPage({
+  editMode,
+  appNameOverride,
+}: ApplicationOrderPageProps) {
+  const routeParams = useParams<{ appName: string }>()
+  const appName = appNameOverride ?? routeParams.appName
+  const { data: ad, isLoading, error } = useApplicationDefinition(appName)
+  const { tenantNamespace } = useTenantContext()
+  const [searchParams] = useSearchParams()
+  const navigate = useNavigate()
+  const basePath = useResourceBasePath()
+
+  const [name, setName] = useState(editMode?.name ?? searchParams.get("name") ?? "")
+  const [spec, setSpec] = useState<unknown>(editMode?.initialSpec ?? {})
+  const [mode, setMode] = useState<Mode>("form")
+  const [yamlText, setYamlText] = useState("")
+  const [yamlError, setYamlError] = useState<string | null>(null)
+  // Snapshot of the persisted spec captured the first time we see an
+  // editMode prop. ApplicationEditRoute reconstructs `editMode` on every
+  // React-Query refetch, so reading `editMode.initialSpec` at save time
+  // would pick up whatever the cluster has right now, not what the user
+  // saw when they opened the form. The ref locks the overlay source to
+  // the value the user actually viewed.
+  const initialSpecRef = useRef<unknown>(editMode?.initialSpec)
+  const initialSpecCapturedRef = useRef(false)
+  const schemaFormRef = useRef<SchemaFormHandle>(null)
+  useEffect(() => {
+    if (editMode && !initialSpecCapturedRef.current) {
+      initialSpecCapturedRef.current = true
+      initialSpecRef.current = editMode.initialSpec
+    }
+  }, [editMode])
+
+  const plural = ad?.spec?.application.plural ?? ""
+
+  const create = useK8sCreate({
+    apiGroup: APPS_GROUP,
+    apiVersion: APPS_VERSION,
+    plural,
+    namespace: tenantNamespace ?? undefined,
+  })
+  const update = useK8sUpdate({
+    apiGroup: APPS_GROUP,
+    apiVersion: APPS_VERSION,
+    plural,
+    namespace: tenantNamespace ?? undefined,
+  })
+
+  const resource = useMemo(() => {
+    if (!ad || !tenantNamespace) return null
+    return composeResource(ad, tenantNamespace, name || "<name>", spec)
+  }, [ad, tenantNamespace, name, spec])
+
+  /** Switch into YAML mode: serialize current state. */
+  const enterYaml = () => {
+    if (resource) setYamlText(yaml.dump(resource))
+    setYamlError(null)
+    setMode("yaml")
+  }
+
+  /** Switch into form mode: parse YAML back to name/spec. */
+  const enterForm = () => {
+    try {
+      const parsed = yaml.load(yamlText) as {
+        metadata?: { name?: string }
+        spec?: unknown
+      }
+      if (parsed?.metadata?.name) setName(parsed.metadata.name)
+      if (parsed?.spec !== undefined) setSpec(parsed.spec)
+      setYamlError(null)
+      setMode("form")
+    } catch (err) {
+      setYamlError((err as Error).message)
+    }
+  }
+
+  /** Build resource from whichever editor is currently active. */
+  const snapshot = () => {
+    if (mode === "yaml") {
+      const parsed = yaml.load(yamlText) as {
+        metadata?: { name?: string }
+        spec?: unknown
+      }
+      return {
+        name: parsed?.metadata?.name ?? name,
+        spec: parsed?.spec ?? spec,
+      }
+    }
+    return { name, spec }
+  }
+
+  const submit = async () => {
+    if (!ad || !tenantNamespace) return
+    const snap = snapshot()
+    if (!snap.name) {
+      alert("Please set a resource name.")
+      return
+    }
+    // The Deploy button lives outside RJSF and bypasses its submit, so trigger
+    // validation explicitly in form mode. RJSF renders the errors inline; abort
+    // so an invalid spec (e.g. a disk row left without a name) is never sent to
+    // the API. YAML mode hand-authors the spec and is left to the API to reject.
+    if (mode === "form" && schemaFormRef.current && !schemaFormRef.current.validate()) {
+      return
+    }
+    const body = composeResource(ad, tenantNamespace, snap.name, snap.spec)
+    try {
+      if (editMode) {
+        // initialSpecRef holds the value the user saw when the form
+        // opened; if the resource is mutated externally between mount and
+        // Save, the overlay reinstates the mount-time value. That's the
+        // documented trade-off — re-mount to pick up fresh state.
+        body.spec = prepareUpdateSpec<Record<string, unknown>>(
+          body.spec ?? {},
+          (initialSpecRef.current ?? {}) as Record<string, unknown>,
+          ad.spec?.application.openAPISchema ?? "",
+        )
+        await update.mutateAsync(body)
+      } else {
+        await create.mutateAsync(body)
+      }
+      navigate(`${basePath}/${plural}/${snap.name}`)
+    } catch (err) {
+      if (err instanceof K8sApiError) {
+        alert(`Failed: ${err.message}`)
+      } else {
+        alert(`Failed: ${(err as Error).message}`)
+      }
+    }
+  }
+
+  if (isLoading) {
+    return (
+      <div className="flex items-center gap-2 p-8 text-slate-500">
+        <Spinner /> Loading application…
+      </div>
+    )
+  }
+  if (error || !ad) {
+    return (
+      <div className="p-8 text-red-600">
+        Application <code>{appName}</code> not found.
+      </div>
+    )
+  }
+
+  const icon = iconDataUrl(ad)
+  const displayName = appDisplayName(ad)
+  const description = ad.spec?.dashboard?.description
+  return (
+    <div className="flex h-full flex-col">
+      <div className="border-b border-slate-200 bg-white px-6 pt-4 pb-3">
+        <button
+          type="button"
+          onClick={() => editMode ? navigate(`${basePath}/${plural}/${editMode.name}`) : navigate(-1)}
+          className="mb-2 flex items-center gap-1 text-xs text-slate-500 hover:text-slate-900"
+        >
+          <ChevronLeft className="size-3.5" /> Back
+        </button>
+        <div className="flex items-center justify-between gap-4">
+          <div className="flex items-center gap-3">
+            <div className="size-11 shrink-0 overflow-hidden rounded-md bg-slate-100">
+              {icon ? (
+                <img src={icon} alt={displayName} className="h-full w-full" />
+              ) : null}
+            </div>
+            <div>
+              <p className="text-xs uppercase tracking-wider text-slate-500">
+                {displayName}
+              </p>
+              <h1 className="text-lg font-semibold text-slate-900">
+                {editMode ? `Edit ${editMode.name}` : `Deploy new ${ad.spec?.application.singular ?? "instance"}`}
+              </h1>
+              {description && (
+                <p className="mt-0.5 text-xs text-slate-500">{description}</p>
+              )}
+            </div>
+          </div>
+          <div className="flex items-center gap-2">
+            <div className="inline-flex rounded-lg border border-slate-200 bg-slate-50 p-0.5">
+              <button
+                type="button"
+                aria-pressed={mode === "form"}
+                onClick={() => (mode === "yaml" ? enterForm() : undefined)}
+                className={cn(
+                  "flex items-center gap-1.5 rounded-md px-2.5 py-1 text-xs font-medium transition-all",
+                  mode === "form"
+                    ? "bg-white text-blue-700 shadow-sm ring-1 ring-slate-200"
+                    : "text-slate-500 hover:text-slate-700",
+                )}
+              >
+                <FormInput className="size-3.5" /> Form
+              </button>
+              <button
+                type="button"
+                aria-pressed={mode === "yaml"}
+                onClick={() => (mode === "form" ? enterYaml() : undefined)}
+                className={cn(
+                  "flex items-center gap-1.5 rounded-md px-2.5 py-1 text-xs font-medium transition-all",
+                  mode === "yaml"
+                    ? "bg-white text-blue-700 shadow-sm ring-1 ring-slate-200"
+                    : "text-slate-500 hover:text-slate-700",
+                )}
+              >
+                <FileCode className="size-3.5" /> YAML
+              </button>
+            </div>
+            <Button
+              variant="outline"
+              size="sm"
+              onClick={() => editMode ? navigate(`${basePath}/${plural}/${editMode.name}`) : navigate(-1)}
+              disabled={create.isPending || update.isPending}
+            >
+              Cancel
+            </Button>
+            <Button
+              variant="primary"
+              size="sm"
+              onClick={submit}
+              disabled={create.isPending || update.isPending || !tenantNamespace}
+            >
+              {(create.isPending || update.isPending) && <Spinner className="text-white" />}
+              {editMode ? "Save" : "Deploy"}
+            </Button>
+          </div>
+        </div>
+      </div>
+
+      {mode === "form" ? (
+        <div className="flex-1 overflow-auto bg-slate-50 p-4">
+          <div className="space-y-3">
+            <div className="rounded-lg border border-slate-200 bg-white p-4">
+              <label className="mb-1 block text-xs font-medium text-slate-600">
+                Name <span className="text-red-500">*</span>
+              </label>
+              <input
+                type="text"
+                value={name}
+                onChange={(e) => setName(e.target.value)}
+                disabled={!!editMode}
+                placeholder={ad.spec?.application.singular ?? "name"}
+                className="w-full rounded-lg border border-slate-200 bg-white px-3 py-2 text-sm text-slate-900 shadow-sm outline-none transition-shadow focus:border-blue-500 focus:ring-2 focus:ring-blue-500/20 disabled:bg-slate-50 disabled:text-slate-400"
+              />
+              {tenantNamespace && (
+                <p className="mt-1.5 text-xs text-slate-500">
+                  Namespace: <code className="text-slate-700">{tenantNamespace}</code>
+                </p>
+              )}
+            </div>
+            {ad.spec?.application.openAPISchema && (
+              <div className="rounded-lg border border-slate-200 bg-white p-4">
+                <SchemaForm
+                  ref={schemaFormRef}
+                  openAPISchema={ad.spec.application.openAPISchema}
+                  keysOrder={ad.spec?.dashboard?.keysOrder}
+                  formData={spec}
+                  onChange={setSpec}
+                  immutableMode={editMode ? "enforce" : "off"}
+                />
+              </div>
+            )}
+          </div>
+        </div>
+      ) : (
+        <div className="flex flex-1 flex-col bg-white">
+          {yamlError && (
+            <div className="border-b border-red-200 bg-red-50 px-6 py-2 text-xs text-red-700">
+              {yamlError}
+            </div>
+          )}
+          <div className="flex-1">
+            <Suspense
+              fallback={
+                <div className="flex h-full items-center justify-center">
+                  <Spinner />
+                </div>
+              }
+            >
+              <YamlEditor value={yamlText} onChange={setYamlText} />
+            </Suspense>
+          </div>
+        </div>
+      )}
+    </div>
+  )
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/routes/BackupClassAdminGuard.test.tsx b/packages/system/dashboard/images/console/apps/console/src/routes/BackupClassAdminGuard.test.tsx
new file mode 100644
index 0000000000..d45b4653e9
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/routes/BackupClassAdminGuard.test.tsx
@@ -0,0 +1,70 @@
+import { describe, it, expect, vi } from "vitest"
+import { screen, waitFor } from "@testing-library/react"
+import { Route, Routes } from "react-router"
+import { K8sClient, K8sApiError } from "@cozystack/k8s-client"
+import { renderWithK8sProvider } from "../test-utils/render.tsx"
+import { BackupClassAdminGuard } from "./BackupClassAdminGuard.tsx"
+
+type SsarOutcome = { allowed: boolean } | "pending" | K8sApiError
+
+function makeClient(outcome: SsarOutcome): K8sClient {
+  const client = new K8sClient({ baseUrl: "/mock" })
+  vi.spyOn(client, "create").mockImplementation(async (_g, _v, _p, body) => {
+    if (outcome === "pending") return new Promise(() => {}) as never
+    if (outcome instanceof K8sApiError) throw outcome
+    return { ...(body as object), status: { allowed: outcome.allowed } }
+  })
+  return client
+}
+
+function renderGuard(client: K8sClient) {
+  return renderWithK8sProvider(
+    <Routes>
+      <Route element={<BackupClassAdminGuard />}>
+        <Route path="bc" element={<div>BACKUP CLASSES CONTENT</div>} />
+      </Route>
+    </Routes>,
+    { client, initialRoute: "/bc" },
+  )
+}
+
+describe("BackupClassAdminGuard", () => {
+  it("renders the child route when update is allowed", async () => {
+    renderGuard(makeClient({ allowed: true }))
+    await waitFor(() =>
+      expect(screen.getByText("BACKUP CLASSES CONTENT")).toBeInTheDocument(),
+    )
+  })
+
+  it("renders permission-denied instead of the child route when update is denied", async () => {
+    renderGuard(makeClient({ allowed: false }))
+    await waitFor(() =>
+      expect(
+        screen.getByText(/do not have permission to manage backup classes/i),
+      ).toBeInTheDocument(),
+    )
+    expect(screen.queryByText("BACKUP CLASSES CONTENT")).not.toBeInTheDocument()
+    expect(screen.getByRole("link", { name: /back to console/i })).toHaveAttribute(
+      "href",
+      "/console",
+    )
+  })
+
+  it("fails closed (denied) on SSAR error", async () => {
+    renderGuard(makeClient(new K8sApiError(500, "boom")))
+    await waitFor(() =>
+      expect(
+        screen.getByText(/do not have permission to manage backup classes/i),
+      ).toBeInTheDocument(),
+    )
+    expect(screen.queryByText("BACKUP CLASSES CONTENT")).not.toBeInTheDocument()
+  })
+
+  it("shows neither content nor denial while the review is loading", () => {
+    renderGuard(makeClient("pending"))
+    expect(screen.queryByText("BACKUP CLASSES CONTENT")).not.toBeInTheDocument()
+    expect(
+      screen.queryByText(/do not have permission to manage backup classes/i),
+    ).not.toBeInTheDocument()
+  })
+})
diff --git a/packages/system/dashboard/images/console/apps/console/src/routes/BackupClassAdminGuard.tsx b/packages/system/dashboard/images/console/apps/console/src/routes/BackupClassAdminGuard.tsx
new file mode 100644
index 0000000000..afb711d70e
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/routes/BackupClassAdminGuard.tsx
@@ -0,0 +1,39 @@
+import { Link, Outlet } from "react-router"
+import { Section, Spinner } from "@cozystack/ui"
+import { useBackupClassAdminAccess } from "../hooks/useBackupClassAdminAccess.ts"
+
+/**
+ * Layout route guard for the Backup Classes pages. Renders the matched child
+ * route only for users who may update backup classes; everyone else gets a
+ * permission-denied message with a link back to the console instead of the
+ * page (and instead of a browser 403 on direct URL navigation).
+ */
+export function BackupClassAdminGuard() {
+  const { allowed, isLoading } = useBackupClassAdminAccess()
+
+  if (isLoading) {
+    return (
+      <div className="flex items-center gap-2 p-6 text-sm text-slate-500">
+        <Spinner /> Loading…
+      </div>
+    )
+  }
+
+  if (!allowed) {
+    return (
+      <div className="p-6">
+        <Section>
+          <div className="px-2 py-4 text-sm text-slate-700">
+            You do not have permission to manage backup classes.{" "}
+            <Link to="/console" className="text-blue-700 underline hover:text-blue-800">
+              Back to console
+            </Link>
+            .
+          </div>
+        </Section>
+      </div>
+    )
+  }
+
+  return <Outlet />
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/routes/BackupClassCreatePage.tsx b/packages/system/dashboard/images/console/apps/console/src/routes/BackupClassCreatePage.tsx
new file mode 100644
index 0000000000..09a8578de4
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/routes/BackupClassCreatePage.tsx
@@ -0,0 +1,142 @@
+import { useState } from "react"
+import { Link, useNavigate } from "react-router"
+import { ArrowLeft, Archive, Save } from "lucide-react"
+import { Button, Section, Spinner } from "@cozystack/ui"
+import { useK8sCreate, type K8sResource } from "@cozystack/k8s-client"
+import { useCRDSchema } from "../lib/use-crd-schema.ts"
+import { SchemaForm } from "../components/SchemaForm.tsx"
+
+// BackupClass is cluster-scoped; the guard wrapping this route already
+// enforces that only an SSAR-allowed admin reaches it.
+export function BackupClassCreatePage() {
+  const navigate = useNavigate()
+  const [formData, setFormData] = useState<unknown>({})
+  const [name, setName] = useState("")
+
+  const { schema, isLoading: schemaLoading } = useCRDSchema(
+    "backupclasses.backups.cozystack.io",
+  )
+
+  const createMutation = useK8sCreate<K8sResource>({
+    apiGroup: "backups.cozystack.io",
+    apiVersion: "v1alpha1",
+    plural: "backupclasses",
+  })
+
+  const listPath = "/admin/backups/backupclasses"
+
+  const handleSubmit = async () => {
+    if (!name.trim()) {
+      alert("Name is required")
+      return
+    }
+    const resource: K8sResource = {
+      apiVersion: "backups.cozystack.io/v1alpha1",
+      kind: "BackupClass",
+      metadata: { name: name.trim() },
+      spec: formData,
+    }
+    try {
+      await createMutation.mutateAsync(resource)
+      navigate(`${listPath}/${encodeURIComponent(name.trim())}`)
+    } catch (err) {
+      alert(`Failed to create Backup Class: ${(err as Error).message}`)
+    }
+  }
+
+  if (schemaLoading) {
+    return (
+      <div className="flex items-center gap-2 p-8 text-slate-500">
+        <Spinner /> Loading schema…
+      </div>
+    )
+  }
+
+  if (!schema) {
+    return (
+      <div className="p-8 text-red-600">
+        Failed to load Backup Class schema. Please refresh the page.
+      </div>
+    )
+  }
+
+  return (
+    <div className="p-6">
+      <Link
+        to={listPath}
+        className="mb-4 inline-flex items-center gap-1 text-xs text-slate-500 hover:text-slate-700"
+      >
+        <ArrowLeft className="size-3.5" /> Backups
+      </Link>
+
+      <div className="mb-5 flex items-center gap-3">
+        <div className="flex size-11 shrink-0 items-center justify-center rounded-md bg-slate-100">
+          <Archive className="size-6 text-slate-600" />
+        </div>
+        <div>
+          <h1 className="text-lg font-semibold text-slate-900">Create Backup Class</h1>
+          <p className="text-xs text-slate-500">
+            Define a backup strategy for one or more application kinds
+          </p>
+        </div>
+      </div>
+
+      <Section>
+        <div className="space-y-4 p-5">
+          <div>
+            <label className="mb-1 block text-sm font-medium text-slate-700">
+              Name <span className="text-red-500">*</span>
+            </label>
+            <input
+              type="text"
+              value={name}
+              onChange={(e) => setName(e.target.value)}
+              placeholder="my-backup-class"
+              className="w-full rounded-lg border border-slate-300 bg-white px-3 py-2 text-sm text-slate-900 outline-none focus:border-blue-400 focus:ring-1 focus:ring-blue-400"
+              required
+            />
+          </div>
+
+          <div>
+            <SchemaForm
+              openAPISchema={schema}
+              formData={formData}
+              onChange={setFormData}
+            >
+              <div className="hidden" />
+            </SchemaForm>
+          </div>
+        </div>
+
+        <div className="flex items-center gap-2 border-t border-slate-200 px-5 py-3">
+          <Button
+            type="button"
+            variant="primary"
+            size="sm"
+            onClick={handleSubmit}
+            disabled={createMutation.isPending}
+          >
+            {createMutation.isPending ? (
+              <>
+                <Spinner /> Creating…
+              </>
+            ) : (
+              <>
+                <Save className="size-3.5" /> Create
+              </>
+            )}
+          </Button>
+          <Button
+            type="button"
+            variant="outline"
+            size="sm"
+            onClick={() => navigate(listPath)}
+            disabled={createMutation.isPending}
+          >
+            Cancel
+          </Button>
+        </div>
+      </Section>
+    </div>
+  )
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/routes/BackupClassDetailPage.tsx b/packages/system/dashboard/images/console/apps/console/src/routes/BackupClassDetailPage.tsx
new file mode 100644
index 0000000000..fb00fda96e
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/routes/BackupClassDetailPage.tsx
@@ -0,0 +1,141 @@
+import { Link, useNavigate, useParams } from "react-router"
+import yaml from "js-yaml"
+import { ArrowLeft, Archive, Edit, Trash2 } from "lucide-react"
+import { Button, Section, Spinner } from "@cozystack/ui"
+import { useK8sDelete, useK8sGet, type K8sResource } from "@cozystack/k8s-client"
+import { formatAge } from "../lib/status.ts"
+
+export function BackupClassDetailPage() {
+  const { name } = useParams<{ name: string }>()
+  const navigate = useNavigate()
+
+  // BackupClass is cluster-scoped — not tenant-namespaced.
+  const { data: backupClass, isLoading, error } = useK8sGet<K8sResource>(
+    {
+      apiGroup: "backups.cozystack.io",
+      apiVersion: "v1alpha1",
+      plural: "backupclasses",
+      name: name ?? "",
+    },
+    { enabled: !!name },
+  )
+
+  const deleteMutation = useK8sDelete({
+    apiGroup: "backups.cozystack.io",
+    apiVersion: "v1alpha1",
+    plural: "backupclasses",
+  })
+
+  const handleDelete = async () => {
+    if (!name) return
+    if (!confirm(`Delete Backup Class "${name}"? This cannot be undone.`)) return
+    try {
+      await deleteMutation.mutateAsync(name)
+      navigate("/admin/backups/backupclasses")
+    } catch (err) {
+      alert(`Failed to delete Backup Class: ${(err as Error).message}`)
+    }
+  }
+
+  if (isLoading) {
+    return (
+      <div className="flex items-center gap-2 p-6 text-sm text-slate-500">
+        <Spinner /> Loading…
+      </div>
+    )
+  }
+
+  if (error) {
+    return (
+      <div className="p-6 text-sm text-red-600">
+        Failed to load Backup Class: {(error as Error).message}
+      </div>
+    )
+  }
+
+  if (!backupClass) {
+    return <div className="p-6 text-sm text-red-600">Backup Class not found.</div>
+  }
+
+  const labelEntries = Object.entries(backupClass.metadata.labels ?? {})
+
+  return (
+    <div className="p-6">
+      <Link
+        to="/admin/backups/backupclasses"
+        className="mb-4 inline-flex items-center gap-1 text-xs text-slate-500 hover:text-slate-700"
+      >
+        <ArrowLeft className="size-3.5" /> Backups
+      </Link>
+
+      <div className="mb-5 flex items-end justify-between gap-4">
+        <div className="flex items-center gap-3">
+          <div className="flex size-11 shrink-0 items-center justify-center rounded-md bg-slate-100">
+            <Archive className="size-6 text-slate-600" />
+          </div>
+          <div>
+            <h1 className="text-lg font-semibold text-slate-900">
+              {backupClass.metadata.name}
+            </h1>
+            <p className="text-xs text-slate-500">Backup Class</p>
+          </div>
+        </div>
+        <div className="flex items-center gap-2">
+          <Link to={`/admin/backups/backupclasses/${backupClass.metadata.name}/edit`}>
+            <Button variant="primary" size="sm">
+              <Edit className="size-3.5" /> Edit
+            </Button>
+          </Link>
+          <Button
+            variant="destructive"
+            size="sm"
+            onClick={handleDelete}
+            disabled={deleteMutation.isPending}
+          >
+            <Trash2 className="size-3.5" /> Delete
+          </Button>
+        </div>
+      </div>
+
+      <div className="grid gap-4 md:grid-cols-3">
+        <Section title="Details" className="md:col-span-1">
+          <dl className="space-y-2.5 text-sm">
+            <div className="flex items-center justify-between">
+              <dt className="text-slate-500">Name</dt>
+              <dd className="font-mono text-xs text-slate-700">
+                {backupClass.metadata.name}
+              </dd>
+            </div>
+            <div className="flex items-center justify-between">
+              <dt className="text-slate-500">Age</dt>
+              <dd className="tabular-nums text-slate-700">
+                {formatAge(backupClass.metadata.creationTimestamp)}
+              </dd>
+            </div>
+          </dl>
+          {labelEntries.length > 0 && (
+            <div className="mt-3 border-t border-slate-100 pt-3">
+              <p className="mb-1.5 text-xs text-slate-500">Labels</p>
+              <div className="flex flex-wrap gap-1.5">
+                {labelEntries.map(([k, v]) => (
+                  <span
+                    key={k}
+                    className="inline-flex rounded bg-slate-100 px-1.5 py-0.5 font-mono text-[11px] text-slate-700"
+                  >
+                    {k}={v}
+                  </span>
+                ))}
+              </div>
+            </div>
+          )}
+        </Section>
+
+        <Section title="Spec" className="md:col-span-2" bodyClassName="p-0">
+          <pre className="max-h-[60vh] overflow-auto p-5 text-xs leading-relaxed text-slate-800">
+            {yaml.dump(backupClass.spec ?? {})}
+          </pre>
+        </Section>
+      </div>
+    </div>
+  )
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/routes/BackupClassEditPage.tsx b/packages/system/dashboard/images/console/apps/console/src/routes/BackupClassEditPage.tsx
new file mode 100644
index 0000000000..e33c0c8548
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/routes/BackupClassEditPage.tsx
@@ -0,0 +1,162 @@
+import { useEffect, useRef, useState } from "react"
+import { Link, useNavigate, useParams } from "react-router"
+import { ArrowLeft, Archive, Save } from "lucide-react"
+import { Button, Section, Spinner } from "@cozystack/ui"
+import { useK8sGet, useK8sUpdate, type K8sResource } from "@cozystack/k8s-client"
+import { useCRDSchema } from "../lib/use-crd-schema.ts"
+import { prepareUpdateSpec } from "../lib/prepare-update.ts"
+import { SchemaForm } from "../components/SchemaForm.tsx"
+
+// BackupClass is cluster-scoped — editable by cluster admins, not tenant
+// users. The API server's RBAC is the real gate; a tenant-scoped user's PUT
+// here simply 403s and surfaces in the error alert.
+export function BackupClassEditPage() {
+  const { name } = useParams<{ name: string }>()
+  const navigate = useNavigate()
+  const [formData, setFormData] = useState<unknown>({})
+  const initializedRef = useRef(false)
+  // Snapshot of spec at form-init time, used as the immutable-overlay source
+  // in prepareUpdateSpec so refetches can't change what gets PUT.
+  const initialSpecRef = useRef<unknown>(null)
+
+  const { schema, isLoading: schemaLoading } = useCRDSchema(
+    "backupclasses.backups.cozystack.io",
+  )
+
+  const {
+    data: resource,
+    isLoading: resourceLoading,
+    error,
+  } = useK8sGet<K8sResource>(
+    {
+      apiGroup: "backups.cozystack.io",
+      apiVersion: "v1alpha1",
+      plural: "backupclasses",
+      name: name ?? "",
+    },
+    { enabled: !!name },
+  )
+
+  const updateMutation = useK8sUpdate<K8sResource>({
+    apiGroup: "backups.cozystack.io",
+    apiVersion: "v1alpha1",
+    plural: "backupclasses",
+  })
+
+  // Initialise form data from the resource once, so a refetch mid-edit
+  // doesn't clobber in-progress changes.
+  useEffect(() => {
+    if (resource?.spec && !initializedRef.current) {
+      initializedRef.current = true
+      setFormData(resource.spec)
+      initialSpecRef.current = resource.spec
+    }
+  }, [resource])
+
+  const detailPath = `/admin/backups/backupclasses/${name}`
+
+  const handleSubmit = async () => {
+    if (!resource || !schema) return
+    const updated: K8sResource = {
+      ...resource,
+      spec: prepareUpdateSpec(formData, initialSpecRef.current, schema),
+    }
+    try {
+      await updateMutation.mutateAsync(updated)
+      navigate(detailPath)
+    } catch (err) {
+      alert(`Failed to update Backup Class: ${(err as Error).message}`)
+    }
+  }
+
+  if (schemaLoading || resourceLoading) {
+    return (
+      <div className="flex items-center gap-2 p-8 text-slate-500">
+        <Spinner /> Loading…
+      </div>
+    )
+  }
+
+  if (error) {
+    return (
+      <div className="p-8 text-red-600">
+        Failed to load Backup Class: {(error as Error).message}
+      </div>
+    )
+  }
+
+  if (!resource) {
+    return <div className="p-8 text-red-600">Backup Class not found.</div>
+  }
+
+  if (!schema) {
+    return (
+      <div className="p-8 text-red-600">
+        Failed to load schema. Please refresh the page.
+      </div>
+    )
+  }
+
+  return (
+    <div className="p-6">
+      <Link
+        to={detailPath}
+        className="mb-4 inline-flex items-center gap-1 text-xs text-slate-500 hover:text-slate-700"
+      >
+        <ArrowLeft className="size-3.5" /> {name}
+      </Link>
+
+      <div className="mb-5 flex items-center gap-3">
+        <div className="flex size-11 shrink-0 items-center justify-center rounded-md bg-slate-100">
+          <Archive className="size-6 text-slate-600" />
+        </div>
+        <div>
+          <h1 className="text-lg font-semibold text-slate-900">Edit Backup Class</h1>
+          <p className="text-xs text-slate-500">{name}</p>
+        </div>
+      </div>
+
+      <Section>
+        <div className="space-y-4 p-5">
+          <SchemaForm
+            openAPISchema={schema}
+            formData={formData}
+            onChange={setFormData}
+            immutableMode="enforce"
+          >
+            <div className="hidden" />
+          </SchemaForm>
+        </div>
+
+        <div className="flex items-center gap-2 border-t border-slate-200 px-5 py-3">
+          <Button
+            type="button"
+            variant="primary"
+            size="sm"
+            onClick={handleSubmit}
+            disabled={updateMutation.isPending}
+          >
+            {updateMutation.isPending ? (
+              <>
+                <Spinner /> Saving…
+              </>
+            ) : (
+              <>
+                <Save className="size-3.5" /> Save
+              </>
+            )}
+          </Button>
+          <Button
+            type="button"
+            variant="outline"
+            size="sm"
+            onClick={() => navigate(detailPath)}
+            disabled={updateMutation.isPending}
+          >
+            Cancel
+          </Button>
+        </div>
+      </Section>
+    </div>
+  )
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/routes/BackupClassListPage.tsx b/packages/system/dashboard/images/console/apps/console/src/routes/BackupClassListPage.tsx
new file mode 100644
index 0000000000..d05dab63f3
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/routes/BackupClassListPage.tsx
@@ -0,0 +1,234 @@
+import { Link } from "react-router"
+import { Archive, ChevronRight, Plus } from "lucide-react"
+import { Button, Section, Spinner, StatusBadge } from "@cozystack/ui"
+import { useK8sGet, useK8sList, type K8sResource } from "@cozystack/k8s-client"
+import type { ApplicationInstance } from "@cozystack/types"
+import { useTenantContext } from "../lib/tenant-context.tsx"
+import { useApplicationDefinitions, iconDataUrl } from "../lib/app-definitions.ts"
+import { formatAge, readyCondition } from "../lib/status.ts"
+
+// Hardcoded: cozy-backups in tenant-root is the cluster's system backup
+// bucket. Swap this for a discovery hook once cozystack exposes a canonical
+// reference (e.g. via a status field on BackupClass or a known label).
+function SystemBackupBucketPanel() {
+  const { selectTenant } = useTenantContext()
+  const { data: bucket, isLoading } = useK8sGet<ApplicationInstance>({
+    apiGroup: "apps.cozystack.io",
+    apiVersion: "v1alpha1",
+    plural: "buckets",
+    name: "cozy-backups",
+    namespace: "tenant-root",
+  })
+  // Reuse the Bucket ApplicationDefinition's own icon (the same red S3
+  // glyph rendered on deployed-app cards) so the bucket here is visually
+  // recognisable as a Bucket app.
+  const { data: appDefs } = useApplicationDefinitions()
+  const bucketAd = appDefs?.items.find((d) => d.spec?.application.kind === "Bucket")
+  const bucketIcon = bucketAd ? iconDataUrl(bucketAd) : undefined
+
+  if (isLoading) {
+    return (
+      <Section className="h-full" bodyClassName="p-0">
+        <div className="flex h-full items-center gap-2 p-4 text-sm text-slate-500">
+          <Spinner /> Loading system backup bucket…
+        </div>
+      </Section>
+    )
+  }
+
+  // Bucket missing (or unreachable) — surface as an attention-grabbing
+  // placeholder rather than hiding, so an admin can't miss the gap.
+  if (!bucket) {
+    return (
+      <Section className="h-full" bodyClassName="p-0">
+        <div className="flex h-full items-center justify-between gap-4 p-4">
+          <div className="flex items-center gap-3">
+            <div className="flex size-11 shrink-0 items-center justify-center rounded-md bg-amber-50">
+              <Archive className="size-6 text-amber-600" />
+            </div>
+            <div>
+              <div className="text-sm font-medium text-slate-900">cozy-backups</div>
+              <div className="text-xs text-slate-500">
+                Not deployed on this cluster
+              </div>
+            </div>
+          </div>
+          <StatusBadge tone="warn">Not configured</StatusBadge>
+        </div>
+      </Section>
+    )
+  }
+
+  const ready = readyCondition(bucket)
+  const tone = ready?.status === "True" ? "ok" : ready ? "warn" : "muted"
+  const label =
+    ready?.status === "True" ? "Ready" : (ready?.reason ?? "Unknown")
+
+  return (
+    <Section className="h-full" bodyClassName="p-0">
+      <Link
+        to="/console/buckets/cozy-backups"
+        onClick={() => selectTenant("root")}
+        className="flex h-full items-center justify-between gap-4 p-4 hover:bg-slate-50"
+      >
+        <div className="flex items-center gap-3">
+          <div className="flex size-11 shrink-0 items-center justify-center overflow-hidden rounded-md bg-slate-100">
+            {bucketIcon ? (
+              <img src={bucketIcon} alt="" className="h-full w-full" />
+            ) : (
+              <Archive className="size-6 text-slate-600" />
+            )}
+          </div>
+          <div>
+            <div className="text-sm font-medium text-slate-900">cozy-backups</div>
+            <div className="text-xs text-slate-500">
+              System backup bucket · {formatAge(bucket.metadata.creationTimestamp)}
+            </div>
+          </div>
+        </div>
+        <div className="flex items-center gap-2">
+          <StatusBadge tone={tone}>{label}</StatusBadge>
+          <ChevronRight className="size-4 text-slate-400" />
+        </div>
+      </Link>
+    </Section>
+  )
+}
+
+// Cluster-wide count of backup artifacts. List call omits the namespace so it
+// hits the all-namespaces endpoint; the click target is the per-tenant list
+// page, which scopes to whatever tenant the admin has selected.
+function BackupArtifactsCountPanel() {
+  const { data, isLoading } = useK8sList<K8sResource>({
+    apiGroup: "backups.cozystack.io",
+    apiVersion: "v1alpha1",
+    plural: "backups",
+  })
+
+  if (isLoading) {
+    return (
+      <Section className="h-full" bodyClassName="p-0">
+        <div className="flex h-full items-center gap-2 p-4 text-sm text-slate-500">
+          <Spinner /> Loading backup artifacts…
+        </div>
+      </Section>
+    )
+  }
+
+  const count = data?.items?.length ?? 0
+
+  return (
+    <Section className="h-full" bodyClassName="p-0">
+      <Link
+        to="/console/backups/backups"
+        className="flex h-full items-center justify-between gap-4 p-4 hover:bg-slate-50"
+      >
+        <div className="flex items-center gap-3">
+          <div className="flex size-11 shrink-0 items-center justify-center rounded-md bg-slate-100">
+            <Archive className="size-6 text-slate-600" />
+          </div>
+          <div>
+            <div className="text-lg font-semibold tabular-nums text-slate-900">{count}</div>
+            <div className="text-xs text-slate-500">Backup artifacts count</div>
+          </div>
+        </div>
+        <ChevronRight className="size-4 text-slate-400" />
+      </Link>
+    </Section>
+  )
+}
+
+export function BackupClassListPage() {
+  // BackupClass is cluster-scoped — not tenant-namespaced.
+  const { data, isLoading, error } = useK8sList<K8sResource>({
+    apiGroup: "backups.cozystack.io",
+    apiVersion: "v1alpha1",
+    plural: "backupclasses",
+  })
+
+  const items = data?.items ?? []
+
+  if (isLoading) {
+    return (
+      <div className="flex items-center gap-2 p-6 text-sm text-slate-500">
+        <Spinner /> Loading…
+      </div>
+    )
+  }
+
+  if (error) {
+    return (
+      <div className="p-6 text-sm text-red-600">
+        Failed to load Backup Classes: {(error as Error).message}
+      </div>
+    )
+  }
+
+  return (
+    <div className="p-6">
+      <div className="mb-5">
+        <h1 className="text-lg font-semibold text-slate-900">Backups</h1>
+        <p className="text-xs text-slate-500">System storage and classes configuration</p>
+      </div>
+
+      <div className="mb-4 grid gap-4 md:grid-cols-2">
+        <SystemBackupBucketPanel />
+        <BackupArtifactsCountPanel />
+      </div>
+
+      <Section>
+        <div className="flex items-center justify-between gap-4 border-b border-slate-200 px-5 py-3">
+          <div>
+            <h2 className="text-sm font-medium text-slate-900">Backup Classes</h2>
+            <p className="text-xs text-slate-500">
+              {items.length} {items.length === 1 ? "item" : "items"}
+            </p>
+          </div>
+          <Link to="/admin/backups/backupclasses/create">
+            <Button variant="primary" size="sm">
+              <Plus className="size-3.5" /> Create Backup Class
+            </Button>
+          </Link>
+        </div>
+        {items.length === 0 ? (
+          <div className="py-12 text-center text-sm text-slate-500">
+            No backup classes found.
+          </div>
+        ) : (
+          <div className="overflow-x-auto">
+            <table className="w-full">
+              <thead>
+                <tr className="border-b border-slate-200 text-left text-xs font-medium uppercase tracking-wider text-slate-500">
+                  <th className="px-5 py-3">Name</th>
+                  <th className="px-5 py-3">Age</th>
+                </tr>
+              </thead>
+              <tbody>
+                {items.map((item) => (
+                  <tr
+                    key={item.metadata.name}
+                    className="border-b border-slate-100 hover:bg-slate-50"
+                  >
+                    <td className="px-5 py-3 text-sm font-medium">
+                      <Link
+                        to={`/admin/backups/backupclasses/${item.metadata.name}`}
+                        className="text-blue-600 hover:underline"
+                      >
+                        {item.metadata.name}
+                      </Link>
+                    </td>
+                    <td className="px-5 py-3 text-sm text-slate-600">
+                      {item.metadata.creationTimestamp
+                        ? formatAge(item.metadata.creationTimestamp)
+                        : "-"}
+                    </td>
+                  </tr>
+                ))}
+              </tbody>
+            </table>
+          </div>
+        )}
+      </Section>
+    </div>
+  )
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/routes/BackupCreatePage.test.tsx b/packages/system/dashboard/images/console/apps/console/src/routes/BackupCreatePage.test.tsx
new file mode 100644
index 0000000000..7df6883324
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/routes/BackupCreatePage.test.tsx
@@ -0,0 +1,107 @@
+import { forwardRef, useEffect, useImperativeHandle } from "react"
+import { describe, it, expect, vi, beforeEach } from "vitest"
+import { render, screen } from "@testing-library/react"
+import userEvent from "@testing-library/user-event"
+import { MemoryRouter } from "react-router"
+
+// The submit button bypasses RJSF; the gate calls SchemaForm.validate(). Mock
+// SchemaForm so the test drives that boolean directly and emits a spec that
+// satisfies the page's own manual required-field checks, isolating the gate.
+const h = vi.hoisted(() => ({
+  validateReturn: true,
+  createMutateAsync: vi.fn(),
+  validSpec: {
+    applicationRef: { kind: "VirtualMachine", name: "demo" },
+    strategyRef: { kind: "Strategy", name: "s3" },
+    takenAt: "2024-01-01T00:00:00Z",
+  },
+  // Spec the mocked SchemaForm emits into the page on mount; reset per test.
+  emitSpec: {} as unknown,
+}))
+
+vi.mock("../lib/tenant-context.tsx", () => ({
+  useTenantContext: () => ({ tenantNamespace: "tenant-test" }),
+}))
+vi.mock("../lib/app-definitions.ts", () => ({
+  useApplicationDefinitions: () => ({ data: { items: [] } }),
+}))
+vi.mock("../lib/use-crd-schema.ts", () => ({
+  useCRDSchema: () => ({
+    schema: JSON.stringify({ type: "object", properties: {} }),
+    isLoading: false,
+  }),
+}))
+vi.mock("@cozystack/k8s-client", () => ({
+  useK8sCreate: () => ({ mutateAsync: h.createMutateAsync, isPending: false }),
+  useK8sList: () => ({ data: undefined }),
+}))
+vi.mock("../components/SchemaForm.tsx", () => ({
+  SchemaForm: forwardRef<{ validate: () => boolean }, { onChange: (d: unknown) => void }>(
+    function MockSchemaForm({ onChange }, ref) {
+      useImperativeHandle(ref, () => ({ validate: () => h.validateReturn }))
+      useEffect(() => {
+        onChange(h.emitSpec)
+      }, [onChange])
+      return null
+    },
+  ),
+}))
+
+const { BackupCreatePage } = await import("./BackupCreatePage.tsx")
+
+function renderPage() {
+  return render(
+    <MemoryRouter>
+      <BackupCreatePage />
+    </MemoryRouter>,
+  )
+}
+
+describe("BackupCreatePage submit validation gate", () => {
+  beforeEach(() => {
+    h.createMutateAsync.mockReset()
+    h.createMutateAsync.mockResolvedValue({})
+    h.validateReturn = true
+    h.emitSpec = h.validSpec
+  })
+
+  it("does not POST when the form fails RJSF validation", async () => {
+    h.validateReturn = false
+    const user = userEvent.setup()
+    renderPage()
+
+    await user.type(screen.getByRole("textbox"), "my-backup")
+    await user.click(screen.getByRole("button", { name: /create/i }))
+
+    expect(h.createMutateAsync).not.toHaveBeenCalled()
+  })
+
+  it("POSTs when the form passes validation", async () => {
+    h.validateReturn = true
+    const user = userEvent.setup()
+    renderPage()
+
+    await user.type(screen.getByRole("textbox"), "my-backup")
+    await user.click(screen.getByRole("button", { name: /create/i }))
+
+    expect(h.createMutateAsync).toHaveBeenCalledTimes(1)
+  })
+
+  it("runs RJSF validation before the page-level required-field alerts", async () => {
+    // Form is RJSF-invalid AND a page-required field is missing. The gate must
+    // fire first, so no alert() is shown — proving validate() runs before the
+    // manual checks (under the old ordering the applicationRef alert fired).
+    h.validateReturn = false
+    h.emitSpec = {}
+    const alertSpy = vi.spyOn(window, "alert").mockImplementation(() => {})
+    const user = userEvent.setup()
+    renderPage()
+
+    await user.type(screen.getByRole("textbox"), "my-backup")
+    await user.click(screen.getByRole("button", { name: /create/i }))
+
+    expect(h.createMutateAsync).not.toHaveBeenCalled()
+    expect(alertSpy).not.toHaveBeenCalled()
+    alertSpy.mockRestore()
+  })
+})
diff --git a/packages/system/dashboard/images/console/apps/console/src/routes/BackupCreatePage.tsx b/packages/system/dashboard/images/console/apps/console/src/routes/BackupCreatePage.tsx
new file mode 100644
index 0000000000..62fef9af9f
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/routes/BackupCreatePage.tsx
@@ -0,0 +1,222 @@
+import { useState, useMemo, useRef } from "react"
+import { useNavigate } from "react-router"
+import { Archive, Save } from "lucide-react"
+import { Button, Section, Spinner } from "@cozystack/ui"
+import { useK8sCreate, useK8sList } from "@cozystack/k8s-client"
+import type { K8sResource } from "@cozystack/k8s-client"
+import { useTenantContext } from "../lib/tenant-context.tsx"
+import { useApplicationDefinitions } from "../lib/app-definitions.ts"
+import { useCRDSchema } from "../lib/use-crd-schema.ts"
+import { SchemaForm, type SchemaFormHandle } from "../components/SchemaForm.tsx"
+import { enrichSchemaWithEnums, type BackupFormRef } from "../lib/backup-utils.ts"
+
+interface BackupFormData {
+  applicationRef?: BackupFormRef
+  strategyRef?: BackupFormRef
+  takenAt?: string
+}
+
+export function BackupCreatePage() {
+  const navigate = useNavigate()
+  const { tenantNamespace } = useTenantContext()
+  const { data: appDefs } = useApplicationDefinitions()
+  const [formData, setFormData] = useState<BackupFormData>({})
+  const [name, setName] = useState("")
+  const schemaFormRef = useRef<SchemaFormHandle>(null)
+
+  // Get base schema from CRD
+  const { schema: baseSchema, isLoading: schemaLoading } = useCRDSchema(
+    "backups.backups.cozystack.io"
+  )
+
+  // Get instances for selected kind
+  const selectedKind = formData?.applicationRef?.kind
+  const selectedAppDef = useMemo(
+    () => appDefs?.items.find(d => d.spec?.application.kind === selectedKind),
+    [appDefs, selectedKind]
+  )
+
+  const { data: instancesData } = useK8sList<K8sResource>({
+    apiGroup: "apps.cozystack.io",
+    apiVersion: "v1alpha1",
+    plural: selectedAppDef?.spec?.application.plural ?? "",
+    namespace: tenantNamespace ?? "",
+  }, { enabled: !!selectedAppDef && !!tenantNamespace })
+
+  const createMutation = useK8sCreate({
+    apiGroup: "backups.cozystack.io",
+    apiVersion: "v1alpha1",
+    plural: "backups",
+    namespace: tenantNamespace ?? "",
+  })
+
+  const schema = useMemo(() => {
+    if (!baseSchema) return null
+
+    const base = JSON.parse(baseSchema)
+    const instances = instancesData?.items.map((inst) => inst.metadata.name) ?? []
+
+    const enumMap: Record<string, string[]> = {}
+
+    // applicationRef.kind is a dynamic dropdown driven by the CRD's
+    // x-cozystack-options keyword (appkind source), rendered by
+    // DynamicOptionsWidget. applicationRef.name stays on the client-side enumMap
+    // because it depends on the chosen kind — a context the Option contract
+    // cannot express.
+    if (selectedKind && instances.length > 0) {
+      enumMap["applicationRef.name"] = instances
+    }
+
+    // Enrich schema with enum values
+    const enriched = enrichSchemaWithEnums(base, [], enumMap)
+
+    // Add default values for apiGroup fields
+    if (enriched.properties?.applicationRef?.properties?.apiGroup) {
+      enriched.properties.applicationRef.properties.apiGroup.default = "apps.cozystack.io"
+    }
+    if (enriched.properties?.strategyRef?.properties?.apiGroup) {
+      enriched.properties.strategyRef.properties.apiGroup.default = "strategy.backups.cozystack.io"
+    }
+
+    return JSON.stringify(enriched)
+  }, [baseSchema, instancesData, selectedKind])
+
+  const handleSubmit = async () => {
+    if (!name.trim()) {
+      alert("Name is required")
+      return
+    }
+
+    // Run RJSF validation before the page-level checks so schema-required
+    // fields render inline errors instead of being masked by the alerts below.
+    if (schemaFormRef.current && !schemaFormRef.current.validate()) return
+
+    if (!formData.applicationRef?.kind || !formData.applicationRef?.name) {
+      alert("Application reference is required")
+      return
+    }
+
+    if (!formData.strategyRef?.kind || !formData.strategyRef?.name) {
+      alert("Strategy reference is required")
+      return
+    }
+
+    if (!formData.takenAt) {
+      alert("Taken at timestamp is required")
+      return
+    }
+
+    const resource = {
+      apiVersion: "backups.cozystack.io/v1alpha1",
+      kind: "Backup",
+      metadata: {
+        name: name.trim(),
+        namespace: tenantNamespace ?? undefined,
+      },
+      spec: formData,
+    }
+
+    try {
+      await createMutation.mutateAsync(resource)
+      navigate("/console/backups/backups")
+    } catch (err) {
+      alert(`Failed to create Backup: ${(err as Error).message}`)
+    }
+  }
+
+  const handleCancel = () => {
+    navigate("/console/backups/backups")
+  }
+
+  if (schemaLoading) {
+    return (
+      <div className="flex items-center gap-2 p-8 text-slate-500">
+        <Spinner /> Loading schema...
+      </div>
+    )
+  }
+
+  if (!schema) {
+    return (
+      <div className="p-8 text-red-600">
+        Failed to load Backup schema. Please refresh the page.
+      </div>
+    )
+  }
+
+  return (
+    <div className="p-6">
+      <div className="mb-5 flex items-center gap-3">
+        <div className="flex size-11 shrink-0 items-center justify-center rounded-md bg-slate-100">
+          <Archive className="size-6 text-slate-600" />
+        </div>
+        <div>
+          <h1 className="text-lg font-semibold text-slate-900">Create Backup</h1>
+          <p className="text-xs text-slate-500">
+            Create a backup snapshot for an application
+          </p>
+        </div>
+      </div>
+
+      <div>
+        <Section>
+          <div className="space-y-4 p-5">
+            <div>
+              <label className="block text-sm font-medium text-slate-700 mb-1">
+                Backup Name <span className="text-red-500">*</span>
+              </label>
+              <input
+                type="text"
+                value={name}
+                onChange={(e) => setName(e.target.value)}
+                placeholder="my-backup"
+                className="w-full rounded-lg border border-slate-300 bg-white px-3 py-2 text-sm text-slate-900 outline-none focus:border-blue-400 focus:ring-1 focus:ring-blue-400"
+                required
+              />
+            </div>
+
+            <div>
+              <SchemaForm
+                ref={schemaFormRef}
+                openAPISchema={schema}
+                formData={formData}
+                onChange={setFormData as (data: unknown) => void}
+              >
+                <div className="hidden" />
+              </SchemaForm>
+            </div>
+          </div>
+
+          <div className="flex items-center gap-2 border-t border-slate-200 px-5 py-3">
+            <Button
+              type="button"
+              variant="primary"
+              size="sm"
+              onClick={handleSubmit}
+              disabled={createMutation.isPending}
+            >
+              {createMutation.isPending ? (
+                <>
+                  <Spinner /> Creating...
+                </>
+              ) : (
+                <>
+                  <Save className="size-3.5" /> Create
+                </>
+              )}
+            </Button>
+            <Button
+              type="button"
+              variant="outline"
+              size="sm"
+              onClick={handleCancel}
+              disabled={createMutation.isPending}
+            >
+              Cancel
+            </Button>
+          </div>
+        </Section>
+      </div>
+    </div>
+  )
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/routes/BackupJobCreatePage.test.tsx b/packages/system/dashboard/images/console/apps/console/src/routes/BackupJobCreatePage.test.tsx
new file mode 100644
index 0000000000..e517713575
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/routes/BackupJobCreatePage.test.tsx
@@ -0,0 +1,102 @@
+import { forwardRef, useEffect, useImperativeHandle } from "react"
+import { describe, it, expect, vi, beforeEach } from "vitest"
+import { render, screen } from "@testing-library/react"
+import userEvent from "@testing-library/user-event"
+import { MemoryRouter } from "react-router"
+
+// The submit button bypasses RJSF; the gate calls SchemaForm.validate(). Mock
+// SchemaForm so the test drives that boolean directly and emits a spec that
+// satisfies the page's own manual required-field checks, isolating the gate.
+const h = vi.hoisted(() => ({
+  validateReturn: true,
+  createMutateAsync: vi.fn(),
+  validSpec: {
+    applicationRef: { kind: "VirtualMachine", name: "demo" },
+    backupClassName: "s3",
+  },
+  emitSpec: {} as unknown,
+}))
+
+vi.mock("../lib/tenant-context.tsx", () => ({
+  useTenantContext: () => ({ tenantNamespace: "tenant-test" }),
+}))
+vi.mock("../lib/app-definitions.ts", () => ({
+  useApplicationDefinitions: () => ({ data: { items: [] } }),
+}))
+vi.mock("../lib/use-crd-schema.ts", () => ({
+  useCRDSchema: () => ({
+    schema: JSON.stringify({ type: "object", properties: {} }),
+    isLoading: false,
+  }),
+}))
+vi.mock("@cozystack/k8s-client", () => ({
+  useK8sCreate: () => ({ mutateAsync: h.createMutateAsync, isPending: false }),
+  useK8sList: () => ({ data: undefined }),
+}))
+vi.mock("../components/SchemaForm.tsx", () => ({
+  SchemaForm: forwardRef<{ validate: () => boolean }, { onChange: (d: unknown) => void }>(
+    function MockSchemaForm({ onChange }, ref) {
+      useImperativeHandle(ref, () => ({ validate: () => h.validateReturn }))
+      useEffect(() => {
+        onChange(h.emitSpec)
+      }, [onChange])
+      return null
+    },
+  ),
+}))
+
+const { BackupJobCreatePage } = await import("./BackupJobCreatePage.tsx")
+
+function renderPage() {
+  return render(
+    <MemoryRouter>
+      <BackupJobCreatePage />
+    </MemoryRouter>,
+  )
+}
+
+describe("BackupJobCreatePage submit validation gate", () => {
+  beforeEach(() => {
+    h.createMutateAsync.mockReset()
+    h.createMutateAsync.mockResolvedValue({})
+    h.validateReturn = true
+    h.emitSpec = h.validSpec
+  })
+
+  it("does not POST when the form fails RJSF validation", async () => {
+    h.validateReturn = false
+    const user = userEvent.setup()
+    renderPage()
+
+    await user.type(screen.getByRole("textbox"), "my-job")
+    await user.click(screen.getByRole("button", { name: /create/i }))
+
+    expect(h.createMutateAsync).not.toHaveBeenCalled()
+  })
+
+  it("POSTs when the form passes validation", async () => {
+    h.validateReturn = true
+    const user = userEvent.setup()
+    renderPage()
+
+    await user.type(screen.getByRole("textbox"), "my-job")
+    await user.click(screen.getByRole("button", { name: /create/i }))
+
+    expect(h.createMutateAsync).toHaveBeenCalledTimes(1)
+  })
+
+  it("runs RJSF validation before the page-level required-field alerts", async () => {
+    h.validateReturn = false
+    h.emitSpec = {}
+    const alertSpy = vi.spyOn(window, "alert").mockImplementation(() => {})
+    const user = userEvent.setup()
+    renderPage()
+
+    await user.type(screen.getByRole("textbox"), "my-job")
+    await user.click(screen.getByRole("button", { name: /create/i }))
+
+    expect(h.createMutateAsync).not.toHaveBeenCalled()
+    expect(alertSpy).not.toHaveBeenCalled()
+    alertSpy.mockRestore()
+  })
+})
diff --git a/packages/system/dashboard/images/console/apps/console/src/routes/BackupJobCreatePage.tsx b/packages/system/dashboard/images/console/apps/console/src/routes/BackupJobCreatePage.tsx
new file mode 100644
index 0000000000..8857829d84
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/routes/BackupJobCreatePage.tsx
@@ -0,0 +1,244 @@
+import { useState, useMemo, useRef } from "react"
+import { useNavigate } from "react-router"
+import { Archive, Save } from "lucide-react"
+import { Button, Section, Spinner } from "@cozystack/ui"
+import { useK8sCreate, useK8sList } from "@cozystack/k8s-client"
+import type { K8sResource } from "@cozystack/k8s-client"
+import { useTenantContext } from "../lib/tenant-context.tsx"
+import { useApplicationDefinitions } from "../lib/app-definitions.ts"
+import { useCRDSchema } from "../lib/use-crd-schema.ts"
+import { SchemaForm, type SchemaFormHandle } from "../components/SchemaForm.tsx"
+import { enrichSchemaWithEnums, type BackupFormRef } from "../lib/backup-utils.ts"
+
+interface BackupJobFormData {
+  applicationRef?: BackupFormRef
+  backupClassName?: string
+  planRef?: BackupFormRef
+}
+
+export function BackupJobCreatePage() {
+  const navigate = useNavigate()
+  const { tenantNamespace } = useTenantContext()
+  const { data: appDefs } = useApplicationDefinitions()
+  const [formData, setFormData] = useState<BackupJobFormData>({})
+  const [name, setName] = useState("")
+  const schemaFormRef = useRef<SchemaFormHandle>(null)
+
+  // Get base schema from CRD
+  const { schema: baseSchema, isLoading: schemaLoading } = useCRDSchema(
+    "backupjobs.backups.cozystack.io"
+  )
+
+  // backupClassName, planRef.name and applicationRef.kind are dynamic dropdowns
+  // driven by the CRD's x-cozystack-options keyword (backupclass / plan /
+  // appkind sources), rendered by DynamicOptionsWidget. Only applicationRef.name
+  // stays on the client-side enumMap below, because it depends on the chosen
+  // kind — a context the Option contract cannot express.
+
+  // Resolve instances for the selected application kind (used for the
+  // applicationRef.name enum below). The kind is an appkind dropdown regardless
+  // of apiGroup; only the name enum is gated to apps.cozystack.io — the one
+  // apiGroup ApplicationDefinitions cover.
+  // Strict undefined check so an explicit empty string from the user means
+  // "no group" — clearing the field opts out of the cozystack defaults.
+  const selectedKind = formData?.applicationRef?.kind
+  const rawApiGroup = formData?.applicationRef?.apiGroup
+  const selectedApiGroup = rawApiGroup === undefined ? "apps.cozystack.io" : rawApiGroup
+  const selectedAppDef = useMemo(
+    () => appDefs?.items.find(d => d.spec?.application.kind === selectedKind),
+    [appDefs, selectedKind]
+  )
+
+  const { data: instancesData } = useK8sList<K8sResource>({
+    apiGroup: "apps.cozystack.io",
+    apiVersion: "v1alpha1",
+    plural: selectedAppDef?.spec?.application.plural ?? "",
+    namespace: tenantNamespace ?? "",
+  }, { enabled: !!selectedAppDef && !!tenantNamespace && selectedApiGroup === "apps.cozystack.io" })
+
+  const createMutation = useK8sCreate({
+    apiGroup: "backups.cozystack.io",
+    apiVersion: "v1alpha1",
+    plural: "backupjobs",
+    namespace: tenantNamespace ?? "",
+  })
+
+  const schema = useMemo(() => {
+    if (!baseSchema) return null
+
+    let base
+    try {
+      base = JSON.parse(baseSchema)
+    } catch (e) {
+      console.error("Failed to parse BackupJob schema:", e)
+      return null
+    }
+    const instances = instancesData?.items.map((inst) => inst.metadata.name) ?? []
+
+    const enumMap: Record<string, string[]> = {}
+    // applicationRef.name depends on the selected kind, so it cannot be served
+    // by the Option contract — keep it on the client-side enumMap.
+    if (selectedApiGroup === "apps.cozystack.io" && selectedKind && instances.length > 0) {
+      enumMap["applicationRef.name"] = instances
+    }
+
+    const enriched = enrichSchemaWithEnums(base, [], enumMap)
+
+    // Default the optional apiGroup to apps.cozystack.io so the cozystack-
+    // managed kinds match without the user typing the group manually.
+    if (enriched.properties?.applicationRef?.properties?.apiGroup) {
+      enriched.properties.applicationRef.properties.apiGroup.default = "apps.cozystack.io"
+    }
+
+    return JSON.stringify(enriched)
+  }, [baseSchema, instancesData, selectedKind, selectedApiGroup])
+
+  const handleSubmit = async () => {
+    if (!tenantNamespace) {
+      alert("Tenant namespace is not available. Please refresh.")
+      return
+    }
+
+    if (!name.trim()) {
+      alert("Name is required")
+      return
+    }
+
+    // Run RJSF validation before the page-level checks so schema-required
+    // fields render inline errors instead of being masked by the alerts below.
+    if (schemaFormRef.current && !schemaFormRef.current.validate()) return
+
+    if (!formData.applicationRef?.kind || !formData.applicationRef?.name) {
+      alert("Application reference is required")
+      return
+    }
+
+    if (!formData.backupClassName) {
+      alert("Backup class name is required")
+      return
+    }
+
+    // planRef is optional metadata recording which Plan triggered the job. The
+    // dropdown ships an empty sentinel; strip it so the API never receives
+    // `planRef: { name: "" }`, which would otherwise round-trip as a malformed
+    // LocalObjectReference.
+    const spec = { ...formData }
+    if (!spec.planRef?.name) {
+      delete spec.planRef
+    }
+
+    const resource = {
+      apiVersion: "backups.cozystack.io/v1alpha1",
+      kind: "BackupJob",
+      metadata: {
+        name: name.trim(),
+        namespace: tenantNamespace ?? undefined,
+      },
+      spec,
+    }
+
+    try {
+      await createMutation.mutateAsync(resource)
+      navigate("/console/backups/backupjobs")
+    } catch (err) {
+      alert(`Failed to create BackupJob: ${(err as Error).message}`)
+    }
+  }
+
+  const handleCancel = () => {
+    navigate("/console/backups/backupjobs")
+  }
+
+  if (schemaLoading) {
+    return (
+      <div className="flex items-center gap-2 p-8 text-slate-500">
+        <Spinner /> Loading schema...
+      </div>
+    )
+  }
+
+  if (!schema) {
+    return (
+      <div className="p-8 text-red-600">
+        Failed to load BackupJob schema. Please refresh the page.
+      </div>
+    )
+  }
+
+  return (
+    <div className="p-6">
+      <div className="mb-5 flex items-center gap-3">
+        <div className="flex size-11 shrink-0 items-center justify-center rounded-md bg-slate-100">
+          <Archive className="size-6 text-slate-600" />
+        </div>
+        <div>
+          <h1 className="text-lg font-semibold text-slate-900">Create Backup Job</h1>
+          <p className="text-xs text-slate-500">
+            Trigger a backup of an application instance
+          </p>
+        </div>
+      </div>
+
+      <div>
+        <Section>
+          <div className="space-y-4 p-5">
+            <div>
+              <label htmlFor="backup-job-name" className="block text-sm font-medium text-slate-700 mb-1">
+                Backup Job Name <span className="text-red-500">*</span>
+              </label>
+              <input
+                id="backup-job-name"
+                type="text"
+                value={name}
+                onChange={(e) => setName(e.target.value)}
+                placeholder="my-backup-job"
+                className="w-full rounded-lg border border-slate-300 bg-white px-3 py-2 text-sm text-slate-900 outline-none focus:border-blue-400 focus:ring-1 focus:ring-blue-400"
+                required
+              />
+            </div>
+
+            <div>
+              <SchemaForm
+                ref={schemaFormRef}
+                openAPISchema={schema}
+                formData={formData}
+                onChange={setFormData as (data: unknown) => void}
+              >
+                <div className="hidden" />
+              </SchemaForm>
+            </div>
+          </div>
+
+          <div className="flex items-center gap-2 border-t border-slate-200 px-5 py-3">
+            <Button
+              type="button"
+              variant="primary"
+              size="sm"
+              onClick={handleSubmit}
+              disabled={createMutation.isPending}
+            >
+              {createMutation.isPending ? (
+                <>
+                  <Spinner /> Creating...
+                </>
+              ) : (
+                <>
+                  <Save className="size-3.5" /> Create
+                </>
+              )}
+            </Button>
+            <Button
+              type="button"
+              variant="outline"
+              size="sm"
+              onClick={handleCancel}
+              disabled={createMutation.isPending}
+            >
+              Cancel
+            </Button>
+          </div>
+        </Section>
+      </div>
+    </div>
+  )
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/routes/BackupPlanCreatePage.test.tsx b/packages/system/dashboard/images/console/apps/console/src/routes/BackupPlanCreatePage.test.tsx
new file mode 100644
index 0000000000..3f2f1b0401
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/routes/BackupPlanCreatePage.test.tsx
@@ -0,0 +1,102 @@
+import { forwardRef, useEffect, useImperativeHandle } from "react"
+import { describe, it, expect, vi, beforeEach } from "vitest"
+import { render, screen } from "@testing-library/react"
+import userEvent from "@testing-library/user-event"
+import { MemoryRouter } from "react-router"
+
+// The submit button bypasses RJSF; the gate calls SchemaForm.validate(). Mock
+// SchemaForm so the test drives that boolean directly and emits a spec that
+// satisfies the page's own manual required-field checks, isolating the gate.
+const h = vi.hoisted(() => ({
+  validateReturn: true,
+  createMutateAsync: vi.fn(),
+  validSpec: {
+    applicationRef: { kind: "VirtualMachine", name: "demo" },
+    backupClassName: "s3",
+  },
+  emitSpec: {} as unknown,
+}))
+
+vi.mock("../lib/tenant-context.tsx", () => ({
+  useTenantContext: () => ({ tenantNamespace: "tenant-test" }),
+}))
+vi.mock("../lib/app-definitions.ts", () => ({
+  useApplicationDefinitions: () => ({ data: { items: [] } }),
+}))
+vi.mock("../lib/use-crd-schema.ts", () => ({
+  useCRDSchema: () => ({
+    schema: JSON.stringify({ type: "object", properties: {} }),
+    isLoading: false,
+  }),
+}))
+vi.mock("@cozystack/k8s-client", () => ({
+  useK8sCreate: () => ({ mutateAsync: h.createMutateAsync, isPending: false }),
+  useK8sList: () => ({ data: undefined }),
+}))
+vi.mock("../components/SchemaForm.tsx", () => ({
+  SchemaForm: forwardRef<{ validate: () => boolean }, { onChange: (d: unknown) => void }>(
+    function MockSchemaForm({ onChange }, ref) {
+      useImperativeHandle(ref, () => ({ validate: () => h.validateReturn }))
+      useEffect(() => {
+        onChange(h.emitSpec)
+      }, [onChange])
+      return null
+    },
+  ),
+}))
+
+const { BackupPlanCreatePage } = await import("./BackupPlanCreatePage.tsx")
+
+function renderPage() {
+  return render(
+    <MemoryRouter>
+      <BackupPlanCreatePage />
+    </MemoryRouter>,
+  )
+}
+
+describe("BackupPlanCreatePage submit validation gate", () => {
+  beforeEach(() => {
+    h.createMutateAsync.mockReset()
+    h.createMutateAsync.mockResolvedValue({})
+    h.validateReturn = true
+    h.emitSpec = h.validSpec
+  })
+
+  it("does not POST when the form fails RJSF validation", async () => {
+    h.validateReturn = false
+    const user = userEvent.setup()
+    renderPage()
+
+    await user.type(screen.getByRole("textbox"), "my-plan")
+    await user.click(screen.getByRole("button", { name: /create/i }))
+
+    expect(h.createMutateAsync).not.toHaveBeenCalled()
+  })
+
+  it("POSTs when the form passes validation", async () => {
+    h.validateReturn = true
+    const user = userEvent.setup()
+    renderPage()
+
+    await user.type(screen.getByRole("textbox"), "my-plan")
+    await user.click(screen.getByRole("button", { name: /create/i }))
+
+    expect(h.createMutateAsync).toHaveBeenCalledTimes(1)
+  })
+
+  it("runs RJSF validation before the page-level required-field alerts", async () => {
+    h.validateReturn = false
+    h.emitSpec = {}
+    const alertSpy = vi.spyOn(window, "alert").mockImplementation(() => {})
+    const user = userEvent.setup()
+    renderPage()
+
+    await user.type(screen.getByRole("textbox"), "my-plan")
+    await user.click(screen.getByRole("button", { name: /create/i }))
+
+    expect(h.createMutateAsync).not.toHaveBeenCalled()
+    expect(alertSpy).not.toHaveBeenCalled()
+    alertSpy.mockRestore()
+  })
+})
diff --git a/packages/system/dashboard/images/console/apps/console/src/routes/BackupPlanCreatePage.tsx b/packages/system/dashboard/images/console/apps/console/src/routes/BackupPlanCreatePage.tsx
new file mode 100644
index 0000000000..b194b41fe9
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/routes/BackupPlanCreatePage.tsx
@@ -0,0 +1,238 @@
+import { useState, useMemo, useRef } from "react"
+import { useNavigate } from "react-router"
+import { Archive, Save } from "lucide-react"
+import { Button, Section, Spinner } from "@cozystack/ui"
+import { useK8sCreate, useK8sList } from "@cozystack/k8s-client"
+import type { K8sResource } from "@cozystack/k8s-client"
+import { useTenantContext } from "../lib/tenant-context.tsx"
+import { useApplicationDefinitions } from "../lib/app-definitions.ts"
+import { useCRDSchema } from "../lib/use-crd-schema.ts"
+import { SchemaForm, type SchemaFormHandle } from "../components/SchemaForm.tsx"
+import { enrichSchemaWithEnums, type BackupFormRef } from "../lib/backup-utils.ts"
+
+interface PlanFormData {
+  applicationRef?: BackupFormRef
+  backupClassName?: string
+}
+
+export function BackupPlanCreatePage() {
+  const navigate = useNavigate()
+  const { tenantNamespace } = useTenantContext()
+  const { data: appDefs } = useApplicationDefinitions()
+  const [formData, setFormData] = useState<PlanFormData>({})
+  const [name, setName] = useState("")
+  const schemaFormRef = useRef<SchemaFormHandle>(null)
+
+  // Get base schema from CRD
+  const { schema: baseSchema, isLoading: schemaLoading } = useCRDSchema(
+    "plans.backups.cozystack.io"
+  )
+
+  // backupClassName and applicationRef.kind are dynamic dropdowns driven by the
+  // CRD's x-cozystack-options keyword (backupclass / appkind sources), rendered
+  // by DynamicOptionsWidget. Only applicationRef.name stays on the client-side
+  // enumMap below, because it depends on the chosen kind — a context the Option
+  // contract cannot express.
+
+  // Get instances for selected kind.
+  // Strict undefined check so an explicit empty string from the user means
+  // "no group" — clearing the field opts out of the cozystack defaults.
+  const selectedKind = formData?.applicationRef?.kind
+  const rawApiGroup = formData?.applicationRef?.apiGroup
+  const selectedApiGroup = rawApiGroup === undefined ? "apps.cozystack.io" : rawApiGroup
+  const selectedAppDef = useMemo(
+    () => appDefs?.items.find(d => d.spec?.application.kind === selectedKind),
+    [appDefs, selectedKind]
+  )
+
+  const { data: instancesData } = useK8sList<K8sResource>({
+    apiGroup: "apps.cozystack.io",
+    apiVersion: "v1alpha1",
+    plural: selectedAppDef?.spec?.application.plural ?? "",
+    namespace: tenantNamespace ?? "",
+  }, { enabled: !!selectedAppDef && !!tenantNamespace && selectedApiGroup === "apps.cozystack.io" })
+
+  const createMutation = useK8sCreate({
+    apiGroup: "backups.cozystack.io",
+    apiVersion: "v1alpha1",
+    plural: "plans",
+    namespace: tenantNamespace ?? "",
+  })
+
+  const schema = useMemo(() => {
+    if (!baseSchema) return null
+
+    let base
+    try {
+      base = JSON.parse(baseSchema)
+    } catch (e) {
+      console.error("Failed to parse Plan schema:", e)
+      return null
+    }
+    const instances = instancesData?.items.map((inst) => inst.metadata.name) ?? []
+
+    const enumMap: Record<string, string[]> = {}
+
+    // applicationRef.name depends on the selected kind, so it cannot be served
+    // by the Option contract — keep it on the client-side enumMap. Only fill it
+    // when the cozystack apiGroup matches (ApplicationDefinitions cover it).
+    if (selectedApiGroup === "apps.cozystack.io" && selectedKind && instances.length > 0) {
+      enumMap["applicationRef.name"] = instances
+    }
+
+    // Enrich schema with enum values
+    const enriched = enrichSchemaWithEnums(base, [], enumMap)
+
+    // Add default value for apiGroup
+    if (enriched.properties?.applicationRef?.properties?.apiGroup) {
+      enriched.properties.applicationRef.properties.apiGroup.default = "apps.cozystack.io"
+    }
+
+    // Pre-fill cron with a daily 02:00 default so the user starts with a
+    // valid expression they can edit, rather than an empty required field.
+    if (enriched.properties?.schedule?.properties?.cron) {
+      enriched.properties.schedule.properties.cron.default = "0 2 * * *"
+    }
+
+    return JSON.stringify(enriched)
+  }, [baseSchema, instancesData, selectedKind, selectedApiGroup])
+
+  const handleSubmit = async () => {
+    if (!tenantNamespace) {
+      alert("Tenant namespace is not available. Please refresh.")
+      return
+    }
+
+    if (!name.trim()) {
+      alert("Name is required")
+      return
+    }
+
+    // Run RJSF validation before the page-level checks so schema-required
+    // fields render inline errors instead of being masked by the alerts below.
+    if (schemaFormRef.current && !schemaFormRef.current.validate()) return
+
+    if (!formData.applicationRef?.kind || !formData.applicationRef?.name) {
+      alert("Application reference is required")
+      return
+    }
+
+    if (!formData.backupClassName) {
+      alert("Backup class name is required")
+      return
+    }
+
+    const resource = {
+      apiVersion: "backups.cozystack.io/v1alpha1",
+      kind: "Plan",
+      metadata: {
+        name: name.trim(),
+        namespace: tenantNamespace ?? undefined,
+      },
+      spec: formData,
+    }
+
+    try {
+      await createMutation.mutateAsync(resource)
+      navigate("/console/backups/plans")
+    } catch (err) {
+      alert(`Failed to create Plan: ${(err as Error).message}`)
+    }
+  }
+
+  const handleCancel = () => {
+    navigate("/console/backups/plans")
+  }
+
+  if (schemaLoading) {
+    return (
+      <div className="flex items-center gap-2 p-8 text-slate-500">
+        <Spinner /> Loading schema...
+      </div>
+    )
+  }
+
+  if (!schema) {
+    return (
+      <div className="p-8 text-red-600">
+        Failed to load Plan schema. Please refresh the page.
+      </div>
+    )
+  }
+
+  return (
+    <div className="p-6">
+      <div className="mb-5 flex items-center gap-3">
+        <div className="flex size-11 shrink-0 items-center justify-center rounded-md bg-slate-100">
+          <Archive className="size-6 text-slate-600" />
+        </div>
+        <div>
+          <h1 className="text-lg font-semibold text-slate-900">Create Plan</h1>
+          <p className="text-xs text-slate-500">
+            Configure a backup plan for your application
+          </p>
+        </div>
+      </div>
+
+      <div>
+        <Section>
+          <div className="space-y-4 p-5">
+            <div>
+              <label className="block text-sm font-medium text-slate-700 mb-1">
+                Plan Name <span className="text-red-500">*</span>
+              </label>
+              <input
+                type="text"
+                value={name}
+                onChange={(e) => setName(e.target.value)}
+                placeholder="my-backup-plan"
+                className="w-full rounded-lg border border-slate-300 bg-white px-3 py-2 text-sm text-slate-900 outline-none focus:border-blue-400 focus:ring-1 focus:ring-blue-400"
+                required
+              />
+            </div>
+
+            <div>
+              <SchemaForm
+                ref={schemaFormRef}
+                openAPISchema={schema}
+                formData={formData}
+                onChange={setFormData as (data: unknown) => void}
+              >
+                <div className="hidden" />
+              </SchemaForm>
+            </div>
+          </div>
+
+          <div className="flex items-center gap-2 border-t border-slate-200 px-5 py-3">
+            <Button
+              type="button"
+              variant="primary"
+              size="sm"
+              onClick={handleSubmit}
+              disabled={createMutation.isPending}
+            >
+              {createMutation.isPending ? (
+                <>
+                  <Spinner /> Creating...
+                </>
+              ) : (
+                <>
+                  <Save className="size-3.5" /> Create
+                </>
+              )}
+            </Button>
+            <Button
+              type="button"
+              variant="outline"
+              size="sm"
+              onClick={handleCancel}
+              disabled={createMutation.isPending}
+            >
+              Cancel
+            </Button>
+          </div>
+        </Section>
+      </div>
+    </div>
+  )
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/routes/BackupResourceEditPage.test.tsx b/packages/system/dashboard/images/console/apps/console/src/routes/BackupResourceEditPage.test.tsx
new file mode 100644
index 0000000000..10968664c8
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/routes/BackupResourceEditPage.test.tsx
@@ -0,0 +1,83 @@
+import { forwardRef, useEffect, useImperativeHandle } from "react"
+import { describe, it, expect, vi, beforeEach } from "vitest"
+import { render, screen } from "@testing-library/react"
+import userEvent from "@testing-library/user-event"
+import { MemoryRouter } from "react-router"
+
+// The Save button bypasses RJSF; the gate calls SchemaForm.validate(). Mock
+// SchemaForm so the test drives that boolean directly, isolating the gate.
+const h = vi.hoisted(() => ({
+  validateReturn: true,
+  updateMutateAsync: vi.fn(),
+  resource: {
+    apiVersion: "backups.cozystack.io/v1alpha1",
+    kind: "Backup",
+    metadata: { name: "demo", namespace: "tenant-test" },
+    spec: { foo: "bar" },
+  },
+}))
+
+const overrideSchema = JSON.stringify({
+  type: "object",
+  properties: { foo: { type: "string" } },
+})
+
+vi.mock("../lib/tenant-context.tsx", () => ({
+  useTenantContext: () => ({ tenantNamespace: "tenant-test" }),
+}))
+vi.mock("../lib/use-crd-schema.ts", () => ({
+  useCRDSchema: () => ({ schema: overrideSchema, isLoading: false }),
+}))
+vi.mock("@cozystack/k8s-client", () => ({
+  useK8sGet: () => ({ data: h.resource, isLoading: false, error: null }),
+  useK8sUpdate: () => ({ mutateAsync: h.updateMutateAsync, isPending: false }),
+}))
+vi.mock("../components/SchemaForm.tsx", () => ({
+  SchemaForm: forwardRef<{ validate: () => boolean }, { onChange: (d: unknown) => void }>(
+    function MockSchemaForm({ onChange }, ref) {
+      useImperativeHandle(ref, () => ({ validate: () => h.validateReturn }))
+      useEffect(() => {
+        onChange({ foo: "baz" })
+      }, [onChange])
+      return null
+    },
+  ),
+}))
+
+const { BackupResourceEditPage } = await import("./BackupResourceEditPage.tsx")
+
+function renderPage() {
+  return render(
+    <MemoryRouter>
+      <BackupResourceEditPage resourceType="backups" title="Backups" overrideSchema={overrideSchema} />
+    </MemoryRouter>,
+  )
+}
+
+describe("BackupResourceEditPage submit validation gate", () => {
+  beforeEach(() => {
+    h.updateMutateAsync.mockReset()
+    h.updateMutateAsync.mockResolvedValue({})
+    h.validateReturn = true
+  })
+
+  it("does not PUT when the form fails RJSF validation", async () => {
+    h.validateReturn = false
+    const user = userEvent.setup()
+    renderPage()
+
+    await user.click(screen.getByRole("button", { name: /save/i }))
+
+    expect(h.updateMutateAsync).not.toHaveBeenCalled()
+  })
+
+  it("PUTs when the form passes validation", async () => {
+    h.validateReturn = true
+    const user = userEvent.setup()
+    renderPage()
+
+    await user.click(screen.getByRole("button", { name: /save/i }))
+
+    expect(h.updateMutateAsync).toHaveBeenCalledTimes(1)
+  })
+})
diff --git a/packages/system/dashboard/images/console/apps/console/src/routes/BackupResourceEditPage.tsx b/packages/system/dashboard/images/console/apps/console/src/routes/BackupResourceEditPage.tsx
new file mode 100644
index 0000000000..5d748f1f87
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/routes/BackupResourceEditPage.tsx
@@ -0,0 +1,199 @@
+import { useEffect, useRef, useState } from "react"
+import { useNavigate, useParams } from "react-router"
+import { Archive, Save } from "lucide-react"
+import { Button, Section, Spinner } from "@cozystack/ui"
+import { useK8sGet, useK8sUpdate } from "@cozystack/k8s-client"
+import type { K8sResource } from "@cozystack/k8s-client"
+import { useTenantContext } from "../lib/tenant-context.tsx"
+import { useCRDSchema } from "../lib/use-crd-schema.ts"
+import { prepareUpdateSpec } from "../lib/prepare-update.ts"
+import { SchemaForm, type SchemaFormHandle } from "../components/SchemaForm.tsx"
+
+interface BackupResourceEditPageProps {
+  resourceType: "plans" | "backupjobs" | "backups" | "restorejobs"
+  title: string
+  overrideSchema?: string
+}
+
+export function BackupResourceEditPage({
+  resourceType,
+  title,
+  overrideSchema,
+}: BackupResourceEditPageProps) {
+  const { name } = useParams<{ name: string }>()
+  const navigate = useNavigate()
+  const { tenantNamespace } = useTenantContext()
+  const [formData, setFormData] = useState<unknown>({})
+  const initializedRef = useRef(false)
+  // Snapshot of resource.spec at the moment the form initialised. Used as
+  // the source for the immutable-field overlay so the value the user saw
+  // in the form is the value that goes into the PUT, regardless of any
+  // React-Query refetches in between.
+  const initialSpecRef = useRef<unknown>(null)
+  const schemaFormRef = useRef<SchemaFormHandle>(null)
+
+  // Map resourceType to CRD name
+  const crdNameMap = {
+    plans: "plans.backups.cozystack.io",
+    backupjobs: "backupjobs.backups.cozystack.io",
+    backups: "backups.backups.cozystack.io",
+    restorejobs: "restorejobs.backups.cozystack.io",
+  }
+
+  const { schema: crdSchema, isLoading: schemaLoading } = useCRDSchema(crdNameMap[resourceType])
+
+  // Use override schema if provided, otherwise use CRD schema
+  const schema = overrideSchema || crdSchema
+
+  // Fetch existing resource
+  const { data: resource, isLoading: resourceLoading, error } = useK8sGet<K8sResource>(
+    {
+      apiGroup: "backups.cozystack.io",
+      apiVersion: "v1alpha1",
+      plural: resourceType,
+      name: name ?? "",
+      namespace: tenantNamespace ?? "",
+    },
+    { enabled: !!name && !!tenantNamespace },
+  )
+
+  const updateMutation = useK8sUpdate({
+    apiGroup: "backups.cozystack.io",
+    apiVersion: "v1alpha1",
+    plural: resourceType,
+    namespace: tenantNamespace ?? "",
+  })
+
+  // Initialize form data from resource only once to avoid overwriting in-progress edits on refetch
+  useEffect(() => {
+    if (resource?.spec && !initializedRef.current) {
+      initializedRef.current = true
+      setFormData(resource.spec)
+      initialSpecRef.current = resource.spec
+    }
+  }, [resource])
+
+  const handleSubmit = async () => {
+    if (!resource) return
+    if (!schema) return
+
+    // The submit button lives outside RJSF and bypasses its validation, so
+    // trigger it explicitly; an invalid spec renders errors inline and aborts.
+    if (schemaFormRef.current && !schemaFormRef.current.validate()) return
+
+    const updated = {
+      ...resource,
+      spec: prepareUpdateSpec(formData, initialSpecRef.current, schema),
+    }
+
+    try {
+      await updateMutation.mutateAsync(updated)
+      navigate(`/console/backups/${resourceType}`)
+    } catch (err) {
+      alert(`Failed to update ${title.slice(0, -1)}: ${(err as Error).message}`)
+    }
+  }
+
+  const handleCancel = () => {
+    navigate(`/console/backups/${resourceType}`)
+  }
+
+  if (schemaLoading || resourceLoading) {
+    return (
+      <div className="flex items-center gap-2 p-8 text-slate-500">
+        <Spinner /> Loading...
+      </div>
+    )
+  }
+
+  if (error) {
+    return (
+      <div className="p-8 text-red-600">
+        Failed to load {title.slice(0, -1)}: {(error as Error).message}
+      </div>
+    )
+  }
+
+  if (!resource) {
+    return (
+      <div className="p-8 text-red-600">
+        {title.slice(0, -1)} not found.
+      </div>
+    )
+  }
+
+  if (!schema) {
+    return (
+      <div className="p-8 text-red-600">
+        Failed to load schema. Please refresh the page.
+      </div>
+    )
+  }
+
+  return (
+    <div className="p-6">
+      <div className="mb-5 flex items-center gap-3">
+        <div className="flex size-11 shrink-0 items-center justify-center rounded-md bg-slate-100">
+          <Archive className="size-6 text-slate-600" />
+        </div>
+        <div>
+          <h1 className="text-lg font-semibold text-slate-900">
+            Edit {title.slice(0, -1)}
+          </h1>
+          <p className="text-xs text-slate-500">
+            {name}
+          </p>
+        </div>
+      </div>
+
+      <div>
+        <Section>
+          <div className="space-y-4 p-5">
+            {schema && (
+              <div>
+                <SchemaForm
+                  ref={schemaFormRef}
+                  openAPISchema={schema}
+                  formData={formData}
+                  onChange={setFormData}
+                  immutableMode="enforce"
+                >
+                  <div className="hidden" />
+                </SchemaForm>
+              </div>
+            )}
+          </div>
+
+          <div className="flex items-center gap-2 border-t border-slate-200 px-5 py-3">
+            <Button
+              type="button"
+              variant="primary"
+              size="sm"
+              onClick={handleSubmit}
+              disabled={updateMutation.isPending}
+            >
+              {updateMutation.isPending ? (
+                <>
+                  <Spinner /> Saving...
+                </>
+              ) : (
+                <>
+                  <Save className="size-3.5" /> Save
+                </>
+              )}
+            </Button>
+            <Button
+              type="button"
+              variant="outline"
+              size="sm"
+              onClick={handleCancel}
+              disabled={updateMutation.isPending}
+            >
+              Cancel
+            </Button>
+          </div>
+        </Section>
+      </div>
+    </div>
+  )
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/routes/BackupResourceListPage.tsx b/packages/system/dashboard/images/console/apps/console/src/routes/BackupResourceListPage.tsx
new file mode 100644
index 0000000000..eacdc513e7
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/routes/BackupResourceListPage.tsx
@@ -0,0 +1,210 @@
+import { Link } from "react-router"
+import { Archive, Plus, Edit, Trash2 } from "lucide-react"
+import { Button, Section, Spinner } from "@cozystack/ui"
+import { useK8sList, useK8sDelete } from "@cozystack/k8s-client"
+import { useTenantContext } from "../lib/tenant-context.tsx"
+import { formatAge } from "../lib/status.ts"
+
+interface BackupResource {
+  apiVersion: string
+  kind: string
+  metadata: {
+    name: string
+    namespace?: string
+    creationTimestamp?: string
+  }
+  spec?: {
+    applicationRef?: {
+      apiGroup?: string
+      kind?: string
+      name?: string
+    }
+    targetApplicationRef?: {
+      apiGroup?: string
+      kind?: string
+      name?: string
+    }
+  }
+  status?: {
+    phase?: string
+    conditions?: Array<{
+      type: string
+      status: string
+      reason?: string
+      message?: string
+    }>
+  }
+}
+
+interface BackupResourceListPageProps {
+  resourceType: "plans" | "backupjobs" | "backups" | "restorejobs"
+  title: string
+}
+
+export function BackupResourceListPage({ resourceType, title }: BackupResourceListPageProps) {
+  const { tenantNamespace } = useTenantContext()
+
+  const { data, isLoading, error, refetch } = useK8sList<BackupResource>({
+    apiGroup: "backups.cozystack.io",
+    apiVersion: "v1alpha1",
+    plural: resourceType,
+    namespace: tenantNamespace ?? "",
+  }, { enabled: !!tenantNamespace })
+
+  const deleteMutation = useK8sDelete({
+    apiGroup: "backups.cozystack.io",
+    apiVersion: "v1alpha1",
+    plural: resourceType,
+    namespace: tenantNamespace ?? "",
+  })
+
+  const items = data?.items ?? []
+
+  const handleDelete = async (name: string) => {
+    const singularTitle = title.slice(0, -1) // Remove 's' from plural
+    if (!confirm(`Delete ${singularTitle} "${name}"? This cannot be undone.`)) return
+
+    try {
+      await deleteMutation.mutateAsync(name)
+      refetch()
+    } catch (err) {
+      alert(`Failed to delete: ${(err as Error).message}`)
+    }
+  }
+
+  if (isLoading) {
+    return (
+      <div className="flex items-center gap-2 p-6 text-sm text-slate-500">
+        <Spinner /> Loading…
+      </div>
+    )
+  }
+
+  if (error) {
+    return (
+      <div className="p-6 text-sm text-red-600">
+        Failed to load {title}: {(error as Error).message}
+      </div>
+    )
+  }
+
+  return (
+    <div className="p-6">
+      <div className="mb-5 flex items-end justify-between gap-4">
+        <div className="flex items-center gap-3">
+          <div className="flex size-11 shrink-0 items-center justify-center rounded-md bg-slate-100">
+            <Archive className="size-6 text-slate-600" />
+          </div>
+          <div>
+            <h1 className="text-lg font-semibold text-slate-900">{title}</h1>
+            <p className="text-xs text-slate-500">
+              {items.length} {items.length === 1 ? "item" : "items"}
+            </p>
+          </div>
+        </div>
+        {resourceType !== "backups" && (
+          <Link to={`/console/backups/${resourceType}/create`}>
+            <Button variant="primary" size="sm">
+              <Plus className="size-3.5" /> Create {title.slice(0, -1)}
+            </Button>
+          </Link>
+        )}
+      </div>
+
+      <Section>
+        {items.length === 0 ? (
+          <div className="py-12 text-center text-sm text-slate-500">
+            No {title.toLowerCase()} found in this namespace.
+          </div>
+        ) : (
+          <div className="overflow-x-auto">
+            <table className="w-full">
+              <thead>
+                <tr className="border-b border-slate-200 text-left text-xs font-medium uppercase tracking-wider text-slate-500">
+                  <th className="px-5 py-3">Name</th>
+                  <th className="px-5 py-3">Application</th>
+                  <th className="px-5 py-3">Namespace</th>
+                  <th className="px-5 py-3">Status</th>
+                  <th className="px-5 py-3">Age</th>
+                  <th className="px-5 py-3 text-right">Actions</th>
+                </tr>
+              </thead>
+              <tbody>
+                {items.map((item) => {
+                  const phase = item.status?.phase
+                  const ready = item.status?.conditions?.find((c) => c.type === "Ready")
+                  const statusText = phase || ready?.status || "Unknown"
+                  const statusTone =
+                    statusText === "Completed" || statusText === "True" ? "ok" :
+                    statusText === "Failed" || statusText === "False" ? "error" :
+                    "warn"
+
+                  const appRef = resourceType === "restorejobs"
+                    ? item.spec?.targetApplicationRef
+                    : item.spec?.applicationRef
+                  const appRefText = appRef?.kind && appRef?.name
+                    ? `${appRef.kind}/${appRef.name}`
+                    : appRef?.name || "-"
+
+                  return (
+                    <tr
+                      key={item.metadata.name}
+                      className="border-b border-slate-100 hover:bg-slate-50"
+                    >
+                      <td className="px-5 py-3 text-sm font-medium text-slate-900">
+                        {item.metadata.name}
+                      </td>
+                      <td className="px-5 py-3 text-sm text-slate-600">
+                        {appRefText}
+                      </td>
+                      <td className="px-5 py-3 text-sm text-slate-600">
+                        {item.metadata.namespace}
+                      </td>
+                      <td className="px-5 py-3">
+                        <span
+                          className={`inline-flex rounded-full px-2 py-0.5 text-xs font-medium ${
+                            statusTone === "ok"
+                              ? "bg-green-100 text-green-800"
+                              : statusTone === "error"
+                                ? "bg-red-100 text-red-800"
+                                : "bg-yellow-100 text-yellow-800"
+                          }`}
+                        >
+                          {statusText}
+                        </span>
+                      </td>
+                      <td className="px-5 py-3 text-sm text-slate-600">
+                        {item.metadata.creationTimestamp
+                          ? formatAge(item.metadata.creationTimestamp)
+                          : "-"}
+                      </td>
+                      <td className="px-5 py-3 text-right">
+                        <div className="flex items-center justify-end gap-2">
+                          <Link
+                            to={`/console/backups/${resourceType}/${item.metadata.name}/edit`}
+                          >
+                            <Button variant="outline" size="sm">
+                              <Edit className="size-3.5" /> Edit
+                            </Button>
+                          </Link>
+                          <Button
+                            variant="destructive"
+                            size="sm"
+                            onClick={() => handleDelete(item.metadata.name)}
+                            disabled={deleteMutation.isPending}
+                          >
+                            <Trash2 className="size-3.5" /> Delete
+                          </Button>
+                        </div>
+                      </td>
+                    </tr>
+                  )
+                })}
+              </tbody>
+            </table>
+          </div>
+        )}
+      </Section>
+    </div>
+  )
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/routes/BackupRestoreJobCreatePage.test.tsx b/packages/system/dashboard/images/console/apps/console/src/routes/BackupRestoreJobCreatePage.test.tsx
new file mode 100644
index 0000000000..770f32e751
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/routes/BackupRestoreJobCreatePage.test.tsx
@@ -0,0 +1,101 @@
+import { forwardRef, useEffect, useImperativeHandle } from "react"
+import { describe, it, expect, vi, beforeEach } from "vitest"
+import { render, screen } from "@testing-library/react"
+import userEvent from "@testing-library/user-event"
+import { MemoryRouter } from "react-router"
+
+// The submit button bypasses RJSF; the gate calls SchemaForm.validate(). Mock
+// SchemaForm so the test drives that boolean directly and emits a spec that
+// satisfies the page's own manual required-field checks, isolating the gate.
+const h = vi.hoisted(() => ({
+  validateReturn: true,
+  createMutateAsync: vi.fn(),
+  validSpec: {
+    backupRef: { name: "backup-1" },
+  },
+  emitSpec: {} as unknown,
+}))
+
+vi.mock("../lib/tenant-context.tsx", () => ({
+  useTenantContext: () => ({ tenantNamespace: "tenant-test" }),
+}))
+vi.mock("../lib/app-definitions.ts", () => ({
+  useApplicationDefinitions: () => ({ data: { items: [] } }),
+}))
+vi.mock("../lib/use-crd-schema.ts", () => ({
+  useCRDSchema: () => ({
+    schema: JSON.stringify({ type: "object", properties: {} }),
+    isLoading: false,
+  }),
+}))
+vi.mock("@cozystack/k8s-client", () => ({
+  useK8sCreate: () => ({ mutateAsync: h.createMutateAsync, isPending: false }),
+  useK8sList: () => ({ data: undefined }),
+}))
+vi.mock("../components/SchemaForm.tsx", () => ({
+  SchemaForm: forwardRef<{ validate: () => boolean }, { onChange: (d: unknown) => void }>(
+    function MockSchemaForm({ onChange }, ref) {
+      useImperativeHandle(ref, () => ({ validate: () => h.validateReturn }))
+      useEffect(() => {
+        onChange(h.emitSpec)
+      }, [onChange])
+      return null
+    },
+  ),
+}))
+
+const { BackupRestoreJobCreatePage } = await import("./BackupRestoreJobCreatePage.tsx")
+
+function renderPage() {
+  return render(
+    <MemoryRouter>
+      <BackupRestoreJobCreatePage />
+    </MemoryRouter>,
+  )
+}
+
+describe("BackupRestoreJobCreatePage submit validation gate", () => {
+  beforeEach(() => {
+    h.createMutateAsync.mockReset()
+    h.createMutateAsync.mockResolvedValue({})
+    h.validateReturn = true
+    h.emitSpec = h.validSpec
+  })
+
+  it("does not POST when the form fails RJSF validation", async () => {
+    h.validateReturn = false
+    const user = userEvent.setup()
+    renderPage()
+
+    await user.type(screen.getByRole("textbox"), "my-restore")
+    await user.click(screen.getByRole("button", { name: /create/i }))
+
+    expect(h.createMutateAsync).not.toHaveBeenCalled()
+  })
+
+  it("POSTs when the form passes validation", async () => {
+    h.validateReturn = true
+    const user = userEvent.setup()
+    renderPage()
+
+    await user.type(screen.getByRole("textbox"), "my-restore")
+    await user.click(screen.getByRole("button", { name: /create/i }))
+
+    expect(h.createMutateAsync).toHaveBeenCalledTimes(1)
+  })
+
+  it("runs RJSF validation before the page-level required-field alerts", async () => {
+    h.validateReturn = false
+    h.emitSpec = {}
+    const alertSpy = vi.spyOn(window, "alert").mockImplementation(() => {})
+    const user = userEvent.setup()
+    renderPage()
+
+    await user.type(screen.getByRole("textbox"), "my-restore")
+    await user.click(screen.getByRole("button", { name: /create/i }))
+
+    expect(h.createMutateAsync).not.toHaveBeenCalled()
+    expect(alertSpy).not.toHaveBeenCalled()
+    alertSpy.mockRestore()
+  })
+})
diff --git a/packages/system/dashboard/images/console/apps/console/src/routes/BackupRestoreJobCreatePage.tsx b/packages/system/dashboard/images/console/apps/console/src/routes/BackupRestoreJobCreatePage.tsx
new file mode 100644
index 0000000000..6dbcf32d38
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/routes/BackupRestoreJobCreatePage.tsx
@@ -0,0 +1,267 @@
+import { useState, useMemo, useRef } from "react"
+import { useNavigate } from "react-router"
+import { Archive, Save } from "lucide-react"
+import { Button, Section, Spinner } from "@cozystack/ui"
+import { useK8sCreate, useK8sList } from "@cozystack/k8s-client"
+import type { K8sResource } from "@cozystack/k8s-client"
+import { useTenantContext } from "../lib/tenant-context.tsx"
+import { useApplicationDefinitions } from "../lib/app-definitions.ts"
+import { useCRDSchema } from "../lib/use-crd-schema.ts"
+import { SchemaForm, type SchemaFormHandle } from "../components/SchemaForm.tsx"
+import { enrichSchemaWithEnums, type BackupFormRef } from "../lib/backup-utils.ts"
+
+interface RestoreJobFormData {
+  backupRef?: BackupFormRef
+  targetApplicationRef?: BackupFormRef
+}
+
+export function BackupRestoreJobCreatePage() {
+  const navigate = useNavigate()
+  const { tenantNamespace } = useTenantContext()
+  const { data: appDefs } = useApplicationDefinitions()
+  const [formData, setFormData] = useState<RestoreJobFormData>({})
+  const [name, setName] = useState("")
+  const schemaFormRef = useRef<SchemaFormHandle>(null)
+
+  // Get base schema from CRD
+  const { schema: baseSchema, isLoading: schemaLoading } = useCRDSchema(
+    "restorejobs.backups.cozystack.io"
+  )
+
+  // backupRef.name and targetApplicationRef.kind are dynamic dropdowns driven by
+  // the CRD's x-cozystack-options keyword (backup / appkind sources), rendered
+  // by DynamicOptionsWidget. Only targetApplicationRef.name stays on the
+  // client-side enumMap below, because it depends on the chosen kind — a context
+  // the Option contract cannot express.
+
+  // Get instances for selected target kind.
+  // Strict undefined check so an explicit empty string from the user means
+  // "no group" — clearing the field opts out of the cozystack defaults.
+  const selectedKind = formData?.targetApplicationRef?.kind
+  const rawApiGroup = formData?.targetApplicationRef?.apiGroup
+  const selectedApiGroup = rawApiGroup === undefined ? "apps.cozystack.io" : rawApiGroup
+  const selectedAppDef = useMemo(
+    () => appDefs?.items.find(d => d.spec?.application.kind === selectedKind),
+    [appDefs, selectedKind]
+  )
+
+  const { data: instancesData } = useK8sList<K8sResource>({
+    apiGroup: "apps.cozystack.io",
+    apiVersion: "v1alpha1",
+    plural: selectedAppDef?.spec?.application.plural ?? "",
+    namespace: tenantNamespace ?? "",
+  }, { enabled: !!selectedAppDef && !!tenantNamespace && selectedApiGroup === "apps.cozystack.io" })
+
+  const createMutation = useK8sCreate({
+    apiGroup: "backups.cozystack.io",
+    apiVersion: "v1alpha1",
+    plural: "restorejobs",
+    namespace: tenantNamespace ?? "",
+  })
+
+  const schema = useMemo(() => {
+    if (!baseSchema) return null
+
+    let base
+    try {
+      base = JSON.parse(baseSchema)
+    } catch (e) {
+      console.error("Failed to parse RestoreJob schema:", e)
+      return null
+    }
+    const instances = instancesData?.items.map((inst) => inst.metadata.name) ?? []
+
+    const enumMap: Record<string, string[]> = {}
+
+    // targetApplicationRef.name depends on the selected kind, so it cannot be
+    // served by the Option contract — keep it on the client-side enumMap. Only
+    // fill it when the cozystack apiGroup matches (ApplicationDefinitions cover
+    // apps.cozystack.io only — for any other apiGroup the name field has no enum
+    // and stays free-text). The kind itself is always an appkind dropdown.
+    if (selectedApiGroup === "apps.cozystack.io" && selectedKind && instances.length > 0) {
+      enumMap["targetApplicationRef.name"] = instances
+    }
+
+    // Enrich schema with enum values
+    const enriched = enrichSchemaWithEnums(base, [], enumMap)
+
+    // Add default value for apiGroup
+    if (enriched.properties?.targetApplicationRef?.properties?.apiGroup) {
+      enriched.properties.targetApplicationRef.properties.apiGroup.default = "apps.cozystack.io"
+    }
+
+    // The CRD ships backupRef.name with `default: ""` (k8s LocalObjectReference
+    // convention). Strip it so the DynamicOptionsWidget starts from a clean
+    // empty value and the chosen value is the single source of truth, rather
+    // than RJSF re-applying the empty default on re-render.
+    if (enriched.properties?.backupRef?.properties?.name?.default !== undefined) {
+      delete enriched.properties.backupRef.properties.name.default
+    }
+
+    // spec.options is a driver-specific blob — the CRD declares it as
+    // `type: object` + `x-kubernetes-preserve-unknown-fields: true`, which
+    // sanitizeSchema flattens to `additionalProperties: true`. RJSF then has
+    // no widget for it. Rewrite to a typed map so AdditionalPropertiesField
+    // auto-attaches and the user gets a key/value editor.
+    if (enriched.properties?.options) {
+      delete enriched.properties.options["x-kubernetes-preserve-unknown-fields"]
+      enriched.properties.options.type = "object"
+      enriched.properties.options.additionalProperties = { type: "string" }
+      enriched.properties.options.properties = enriched.properties.options.properties ?? {}
+    }
+
+    return JSON.stringify(enriched)
+  }, [baseSchema, instancesData, selectedKind, selectedApiGroup])
+
+  const handleSubmit = async () => {
+    if (!tenantNamespace) {
+      alert("Tenant namespace is not available. Please refresh.")
+      return
+    }
+
+    if (!name.trim()) {
+      alert("Name is required")
+      return
+    }
+
+    // Run RJSF validation before the page-level checks so schema-required
+    // fields render inline errors instead of being masked by the alerts below.
+    if (schemaFormRef.current && !schemaFormRef.current.validate()) return
+
+    if (!formData.backupRef?.name) {
+      alert("Backup reference is required")
+      return
+    }
+
+    // targetApplicationRef is optional in the CRD — when omitted, the driver
+    // restores into the same application referenced by the backup. Reject
+    // partial input (kind without name or vice versa), but accept an empty ref.
+    const target = formData.targetApplicationRef
+    const hasTargetKind = !!target?.kind
+    const hasTargetName = !!target?.name
+    if (hasTargetKind !== hasTargetName) {
+      alert("Target reference requires both Kind and Name, or leave both empty to restore into the source application")
+      return
+    }
+
+    // Strip an empty targetApplicationRef so the API does not receive an empty
+    // object that the API server would reject as malformed.
+    const spec = { ...formData }
+    if (!hasTargetKind && !hasTargetName) {
+      delete spec.targetApplicationRef
+    }
+
+    const resource = {
+      apiVersion: "backups.cozystack.io/v1alpha1",
+      kind: "RestoreJob",
+      metadata: {
+        name: name.trim(),
+        namespace: tenantNamespace ?? undefined,
+      },
+      spec,
+    }
+
+    try {
+      await createMutation.mutateAsync(resource)
+      navigate("/console/backups/restorejobs")
+    } catch (err) {
+      alert(`Failed to create RestoreJob: ${(err as Error).message}`)
+    }
+  }
+
+  const handleCancel = () => {
+    navigate("/console/backups/restorejobs")
+  }
+
+  if (schemaLoading) {
+    return (
+      <div className="flex items-center gap-2 p-8 text-slate-500">
+        <Spinner /> Loading schema...
+      </div>
+    )
+  }
+
+  if (!schema) {
+    return (
+      <div className="p-8 text-red-600">
+        Failed to load RestoreJob schema. Please refresh the page.
+      </div>
+    )
+  }
+
+  return (
+    <div className="p-6">
+      <div className="mb-5 flex items-center gap-3">
+        <div className="flex size-11 shrink-0 items-center justify-center rounded-md bg-slate-100">
+          <Archive className="size-6 text-slate-600" />
+        </div>
+        <div>
+          <h1 className="text-lg font-semibold text-slate-900">Create Restore Job</h1>
+          <p className="text-xs text-slate-500">
+            Restore a backup to an application instance
+          </p>
+        </div>
+      </div>
+
+      <div>
+        <Section>
+          <div className="space-y-4 p-5">
+            <div>
+              <label className="block text-sm font-medium text-slate-700 mb-1">
+                Restore Job Name <span className="text-red-500">*</span>
+              </label>
+              <input
+                type="text"
+                value={name}
+                onChange={(e) => setName(e.target.value)}
+                placeholder="my-restore-job"
+                className="w-full rounded-lg border border-slate-300 bg-white px-3 py-2 text-sm text-slate-900 outline-none focus:border-blue-400 focus:ring-1 focus:ring-blue-400"
+                required
+              />
+            </div>
+
+            <div>
+              <SchemaForm
+                ref={schemaFormRef}
+                openAPISchema={schema}
+                formData={formData}
+                onChange={setFormData as (data: unknown) => void}
+              >
+                <div className="hidden" />
+              </SchemaForm>
+            </div>
+          </div>
+
+          <div className="flex items-center gap-2 border-t border-slate-200 px-5 py-3">
+            <Button
+              type="button"
+              variant="primary"
+              size="sm"
+              onClick={handleSubmit}
+              disabled={createMutation.isPending}
+            >
+              {createMutation.isPending ? (
+                <>
+                  <Spinner /> Creating...
+                </>
+              ) : (
+                <>
+                  <Save className="size-3.5" /> Create
+                </>
+              )}
+            </Button>
+            <Button
+              type="button"
+              variant="outline"
+              size="sm"
+              onClick={handleCancel}
+              disabled={createMutation.isPending}
+            >
+              Cancel
+            </Button>
+          </div>
+        </Section>
+      </div>
+    </div>
+  )
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/routes/CapacityAdminGuard.test.tsx b/packages/system/dashboard/images/console/apps/console/src/routes/CapacityAdminGuard.test.tsx
new file mode 100644
index 0000000000..4956e486e1
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/routes/CapacityAdminGuard.test.tsx
@@ -0,0 +1,70 @@
+import { describe, it, expect, vi } from "vitest"
+import { screen, waitFor } from "@testing-library/react"
+import { Route, Routes } from "react-router"
+import { K8sClient, K8sApiError } from "@cozystack/k8s-client"
+import { renderWithK8sProvider } from "../test-utils/render.tsx"
+import { CapacityAdminGuard } from "./CapacityAdminGuard.tsx"
+
+type SsarOutcome = { allowed: boolean } | "pending" | K8sApiError
+
+function makeClient(outcome: SsarOutcome): K8sClient {
+  const client = new K8sClient({ baseUrl: "/mock" })
+  vi.spyOn(client, "create").mockImplementation(async (_g, _v, _p, body) => {
+    if (outcome === "pending") return new Promise(() => {}) as never
+    if (outcome instanceof K8sApiError) throw outcome
+    return { ...(body as object), status: { allowed: outcome.allowed } }
+  })
+  return client
+}
+
+function renderGuard(client: K8sClient) {
+  return renderWithK8sProvider(
+    <Routes>
+      <Route element={<CapacityAdminGuard />}>
+        <Route path="cap" element={<div>CAPACITY CONTENT</div>} />
+      </Route>
+    </Routes>,
+    { client, initialRoute: "/cap" },
+  )
+}
+
+describe("CapacityAdminGuard", () => {
+  it("renders the child route when nodes/list is allowed", async () => {
+    renderGuard(makeClient({ allowed: true }))
+    await waitFor(() =>
+      expect(screen.getByText("CAPACITY CONTENT")).toBeInTheDocument(),
+    )
+  })
+
+  it("renders permission-denied instead of the child route when denied", async () => {
+    renderGuard(makeClient({ allowed: false }))
+    await waitFor(() =>
+      expect(
+        screen.getByText(/do not have permission to view cluster capacity/i),
+      ).toBeInTheDocument(),
+    )
+    expect(screen.queryByText("CAPACITY CONTENT")).not.toBeInTheDocument()
+    expect(screen.getByRole("link", { name: /back to console/i })).toHaveAttribute(
+      "href",
+      "/console",
+    )
+  })
+
+  it("fails closed (denied) on SSAR error", async () => {
+    renderGuard(makeClient(new K8sApiError(500, "boom")))
+    await waitFor(() =>
+      expect(
+        screen.getByText(/do not have permission to view cluster capacity/i),
+      ).toBeInTheDocument(),
+    )
+    expect(screen.queryByText("CAPACITY CONTENT")).not.toBeInTheDocument()
+  })
+
+  it("shows neither content nor denial while the review is loading", () => {
+    renderGuard(makeClient("pending"))
+    expect(screen.queryByText("CAPACITY CONTENT")).not.toBeInTheDocument()
+    expect(
+      screen.queryByText(/do not have permission to view cluster capacity/i),
+    ).not.toBeInTheDocument()
+  })
+})
diff --git a/packages/system/dashboard/images/console/apps/console/src/routes/CapacityAdminGuard.tsx b/packages/system/dashboard/images/console/apps/console/src/routes/CapacityAdminGuard.tsx
new file mode 100644
index 0000000000..7941aa3341
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/routes/CapacityAdminGuard.tsx
@@ -0,0 +1,39 @@
+import { Link, Outlet } from "react-router"
+import { Section, Spinner } from "@cozystack/ui"
+import { useClusterUsageAccess } from "../hooks/useClusterUsageAccess.ts"
+
+/**
+ * Layout route guard for the Capacity pages (Cluster / Nodes / Storage and the
+ * per-resource drill-downs). Renders the matched child route only for users who
+ * may list cluster nodes; everyone else gets a permission-denied message
+ * instead of the page (and instead of a browser 403 on direct URL navigation).
+ */
+export function CapacityAdminGuard() {
+  const { allowed, isLoading } = useClusterUsageAccess()
+
+  if (isLoading) {
+    return (
+      <div className="flex items-center gap-2 p-6 text-sm text-slate-500">
+        <Spinner /> Loading…
+      </div>
+    )
+  }
+
+  if (!allowed) {
+    return (
+      <div className="p-6">
+        <Section>
+          <div className="px-2 py-4 text-sm text-slate-700">
+            You do not have permission to view cluster capacity.{" "}
+            <Link to="/console" className="text-blue-700 underline hover:text-blue-800">
+              Back to console
+            </Link>
+            .
+          </div>
+        </Section>
+      </div>
+    )
+  }
+
+  return <Outlet />
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/routes/ClusterUsagePage.test.tsx b/packages/system/dashboard/images/console/apps/console/src/routes/ClusterUsagePage.test.tsx
new file mode 100644
index 0000000000..4a2da18ad6
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/routes/ClusterUsagePage.test.tsx
@@ -0,0 +1,185 @@
+import { describe, it, expect, vi } from "vitest"
+import { screen, waitFor } from "@testing-library/react"
+import {
+  K8sClient,
+  K8sApiError,
+  type APIGroupList,
+  type K8sList,
+} from "@cozystack/k8s-client"
+import { ClusterUsagePage } from "./ClusterUsagePage.tsx"
+import { renderWithK8sProvider } from "../test-utils/render.tsx"
+import { nodesListFixture } from "../test-utils/fixtures/nodes.ts"
+import { podsListFixture } from "../test-utils/fixtures/pods.ts"
+import { nodeMetricsListFixture } from "../test-utils/fixtures/node-metrics.ts"
+
+const groupsWithMetrics: APIGroupList = {
+  kind: "APIGroupList",
+  apiVersion: "v1",
+  groups: [
+    {
+      name: "metrics.k8s.io",
+      versions: [{ groupVersion: "metrics.k8s.io/v1beta1", version: "v1beta1" }],
+      preferredVersion: { groupVersion: "metrics.k8s.io/v1beta1", version: "v1beta1" },
+    },
+  ],
+}
+
+const groupsWithoutMetrics: APIGroupList = {
+  kind: "APIGroupList",
+  apiVersion: "v1",
+  groups: [],
+}
+
+function makeClient(
+  config: {
+    nodes?: K8sList<unknown> | K8sApiError | "pending"
+    pods?: K8sList<unknown> | K8sApiError
+    metrics?: K8sList<unknown> | K8sApiError
+    groups?: APIGroupList
+  } = {},
+): K8sClient {
+  const client = new K8sClient()
+  vi.spyOn(client, "list").mockImplementation(async (g, _v, plural) => {
+    if (g === "metrics.k8s.io") {
+      if (config.metrics instanceof K8sApiError) throw config.metrics
+      return (config.metrics ?? {
+        apiVersion: "metrics.k8s.io/v1beta1",
+        kind: "NodeMetricsList",
+        metadata: {},
+        items: [],
+      }) as K8sList<unknown>
+    }
+    if (plural === "nodes") {
+      if (config.nodes === "pending") return new Promise(() => ({})) as never
+      if (config.nodes instanceof K8sApiError) throw config.nodes
+      return (config.nodes ?? {
+        apiVersion: "v1",
+        kind: "NodeList",
+        metadata: {},
+        items: [],
+      }) as K8sList<unknown>
+    }
+    if (plural === "pods") {
+      if (config.pods instanceof K8sApiError) throw config.pods
+      return (config.pods ?? {
+        apiVersion: "v1",
+        kind: "PodList",
+        metadata: {},
+        items: [],
+      }) as K8sList<unknown>
+    }
+    return { apiVersion: "v1", kind: `${plural}List`, metadata: {}, items: [] }
+  })
+  vi.spyOn(client, "getApiGroups").mockResolvedValue(
+    config.groups ?? groupsWithoutMetrics,
+  )
+  return client
+}
+
+describe("ClusterUsagePage", () => {
+  it("renders a spinner while nodes are loading", () => {
+    const client = makeClient({ nodes: "pending" })
+    renderWithK8sProvider(<ClusterUsagePage />, { client })
+    expect(screen.getByText(/loading/i)).toBeInTheDocument()
+  })
+
+  it("renders the aggregate resources table on a healthy cluster with metrics", async () => {
+    const client = makeClient({
+      nodes: nodesListFixture,
+      pods: podsListFixture,
+      metrics: nodeMetricsListFixture,
+      groups: groupsWithMetrics,
+    })
+    const { container } = renderWithK8sProvider(<ClusterUsagePage />, { client })
+    expect(await screen.findByText("Cluster")).toBeInTheDocument()
+    expect(await screen.findAllByText(/allocatable/i)).not.toHaveLength(0)
+    // The per-node table moved to its own Nodes page; this page now shows
+    // only the cluster-wide resources table.
+    await waitFor(() =>
+      expect(container.querySelector('[data-resource-row="CPU"]')).not.toBeNull(),
+    )
+    expect(screen.queryByText("worker-gpu-1")).toBeNull()
+  })
+
+  it("renders the empty state when no nodes exist", async () => {
+    const client = makeClient({
+      nodes: {
+        apiVersion: "v1",
+        kind: "NodeList",
+        metadata: {},
+        items: [],
+      } as K8sList<unknown>,
+      pods: {
+        apiVersion: "v1",
+        kind: "PodList",
+        metadata: {},
+        items: [],
+      } as K8sList<unknown>,
+    })
+    renderWithK8sProvider(<ClusterUsagePage />, { client })
+    expect(await screen.findByText(/no nodes found/i)).toBeInTheDocument()
+  })
+
+  it("renders an error block when the nodes-list call fails", async () => {
+    const client = makeClient({ nodes: new K8sApiError(500, "server error") })
+    renderWithK8sProvider(<ClusterUsagePage />, { client })
+    await waitFor(() => {
+      expect(screen.getByText(/failed to load cluster nodes/i)).toBeInTheDocument()
+    })
+  })
+
+  it("renders a permission-denied block with a back link on 403", async () => {
+    const client = makeClient({ nodes: new K8sApiError(403, "forbidden") })
+    renderWithK8sProvider(<ClusterUsagePage />, { client })
+    expect(
+      await screen.findByText(/you do not have permission to view cluster nodes/i),
+    ).toBeInTheDocument()
+    const back = screen.getByRole("link", { name: /back to console/i })
+    expect(back.getAttribute("href")).toBe("/console")
+  })
+
+  it("propagates pods-unavailable to the aggregate panel and the table", async () => {
+    const client = makeClient({
+      nodes: nodesListFixture,
+      pods: new K8sApiError(403, "no pod read"),
+      groups: groupsWithoutMetrics,
+    })
+    renderWithK8sProvider(<ClusterUsagePage />, { client })
+    await screen.findAllByText(/allocatable/i)
+    expect(
+      screen.getAllByTitle("Requires cluster-wide pod read access").length,
+    ).toBeGreaterThan(0)
+  })
+
+  it("renders the node-summary line in the aggregates header", async () => {
+    const client = makeClient({
+      nodes: nodesListFixture,
+      pods: podsListFixture,
+      groups: groupsWithoutMetrics,
+    })
+    renderWithK8sProvider(<ClusterUsagePage />, { client })
+    await screen.findByText("3 nodes")
+    expect(
+      screen.getByText(/3 Ready · 0 NotReady · 0 SchedulingDisabled/),
+    ).toBeInTheDocument()
+  })
+
+  it("shows only em-dashes in the aggregate Used column when metrics-server is not registered", async () => {
+    const client = makeClient({
+      nodes: nodesListFixture,
+      pods: podsListFixture,
+      groups: groupsWithoutMetrics,
+    })
+    const { container } = renderWithK8sProvider(<ClusterUsagePage />, { client })
+    // Wait for the page to settle by waiting on an aggregate label.
+    await screen.findAllByText(/allocatable/i)
+    // The aggregate resources table always renders a Used column; without
+    // metrics every Used cell (last column of each resource row) is "—".
+    const rows = container.querySelectorAll("[data-resource-row]")
+    expect(rows.length).toBeGreaterThan(0)
+    for (const row of rows) {
+      const cells = row.querySelectorAll("td")
+      expect(cells[cells.length - 1].textContent).toBe("—")
+    }
+  })
+})
diff --git a/packages/system/dashboard/images/console/apps/console/src/routes/ClusterUsagePage.tsx b/packages/system/dashboard/images/console/apps/console/src/routes/ClusterUsagePage.tsx
new file mode 100644
index 0000000000..872bf65e70
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/routes/ClusterUsagePage.tsx
@@ -0,0 +1,75 @@
+import { Link } from "react-router"
+import { Section, Spinner } from "@cozystack/ui"
+import { useClusterUsageData } from "../hooks/useClusterUsageData.tsx"
+import { ClusterUsageAggregates } from "../components/cluster-usage/ClusterUsageAggregates.tsx"
+
+/**
+ * Administration → Cluster Usage. Single cluster-scoped page that
+ * renders aggregate utilisation on top and a per-node table below.
+ * Both panels read from the same useClusterUsageData composite hook,
+ * so they always agree on totals.
+ *
+ * Tenant-scoped users never reach this page through normal navigation
+ * because the sidebar entry is gated by a SelfSubjectAccessReview on
+ * `nodes list`. On direct URL navigation a 403 message with a link
+ * back to the console is shown instead of a browser 403; richer
+ * page-level fallbacks (read-only view via cached metrics, etc.) are
+ * explicitly out of scope for the first iteration.
+ */
+export function ClusterUsagePage() {
+  const {
+    nodes,
+    aggregates,
+    nodeSummary,
+    isLoading,
+    error,
+    errorStatus,
+    podsUnavailable,
+  } = useClusterUsageData()
+
+  return (
+    <div className="space-y-6 p-6">
+      <div>
+        <h1 className="text-xl font-semibold text-slate-900">Cluster</h1>
+        <p className="mt-0.5 text-sm text-slate-500">
+          Cluster-scoped capacity, allocation and usage across all nodes,
+          including any discovered extended resources.
+        </p>
+      </div>
+      {isLoading ? (
+        <div className="flex items-center gap-2 text-sm text-slate-500">
+          <Spinner /> Loading…
+        </div>
+      ) : error ? (
+        <Section>
+          {errorStatus === 403 ? (
+            <div className="px-2 py-4 text-sm text-slate-700">
+              You do not have permission to view cluster nodes.{" "}
+              <Link
+                to="/console"
+                className="text-blue-700 underline hover:text-blue-800"
+              >
+                Back to console
+              </Link>
+              .
+            </div>
+          ) : (
+            <div className="px-2 py-4 text-sm text-red-700">
+              Failed to load cluster nodes: {error.message}
+            </div>
+          )}
+        </Section>
+      ) : nodes.length === 0 ? (
+        <Section>
+          <p className="py-6 text-center text-sm text-slate-500">No nodes found.</p>
+        </Section>
+      ) : (
+        <ClusterUsageAggregates
+          aggregates={aggregates}
+          nodeSummary={nodeSummary}
+          podsUnavailable={podsUnavailable}
+        />
+      )}
+    </div>
+  )
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/routes/ClusterUsageResourcePage.test.tsx b/packages/system/dashboard/images/console/apps/console/src/routes/ClusterUsageResourcePage.test.tsx
new file mode 100644
index 0000000000..f71af205d8
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/routes/ClusterUsageResourcePage.test.tsx
@@ -0,0 +1,273 @@
+import { describe, it, expect, vi, beforeAll } from "vitest"
+import { screen, within } from "@testing-library/react"
+import { Route, Routes } from "react-router"
+import { K8sClient, K8sApiError, type K8sList } from "@cozystack/k8s-client"
+import { ClusterUsageResourcePage } from "./ClusterUsageResourcePage.tsx"
+import { aggregateNodeResources } from "../lib/cluster-usage/aggregate.ts"
+import { humanizeCpu } from "../lib/k8s-quantity.ts"
+import type { Node, Pod } from "../lib/cluster-usage/types.ts"
+import { TenantProvider } from "../lib/tenant-provider.tsx"
+import { renderWithK8sProvider } from "../test-utils/render.tsx"
+
+interface PodOpts {
+  nodeName?: string | null
+  phase?: string
+  limits?: Record<string, string>[]
+}
+
+function pod(
+  namespace: string,
+  name: string,
+  labels: Record<string, string>,
+  requests: Record<string, string>[],
+  opts: PodOpts = {},
+) {
+  const { nodeName = "node-1", phase = "Running", limits } = opts
+  return {
+    apiVersion: "v1",
+    kind: "Pod",
+    metadata: { name, namespace, labels },
+    spec: {
+      ...(nodeName ? { nodeName } : {}),
+      containers: requests.map((r, i) => ({
+        name: `c${i}`,
+        resources: { requests: r, ...(limits?.[i] ? { limits: limits[i] } : {}) },
+      })),
+    },
+    status: { phase },
+  }
+}
+
+function node(name: string) {
+  return {
+    apiVersion: "v1",
+    kind: "Node",
+    metadata: { name },
+    status: { capacity: {}, allocatable: {} },
+  }
+}
+
+function appDef(kind: string, plural: string) {
+  return {
+    apiVersion: "cozystack.io/v1alpha1",
+    kind: "ApplicationDefinition",
+    metadata: { name: plural },
+    spec: { application: { kind, plural, singular: kind.toLowerCase() } },
+  }
+}
+
+const GPU = "nvidia.com/gpu"
+const DEFAULT_NODES = [node("node-1")]
+
+function makeClient(
+  pods: unknown[],
+  appDefs: unknown[] = [],
+  nodes: unknown[] = DEFAULT_NODES,
+): K8sClient {
+  const client = new K8sClient()
+  vi.spyOn(client, "list").mockImplementation(async (_g, _v, plural) => {
+    const items =
+      plural === "applicationdefinitions"
+        ? appDefs
+        : plural === "tenantnamespaces"
+          ? []
+          : plural === "nodes"
+            ? nodes
+            : pods
+    return {
+      apiVersion: "v1",
+      kind: `${plural}List`,
+      metadata: {},
+      items,
+    } as K8sList<unknown>
+  })
+  return client
+}
+
+// Only the pod list fails. Rejecting every list would render the same notice
+// no matter which request broke, so the test could not tell them apart.
+function makeFailingClient(error: Error): K8sClient {
+  const client = new K8sClient()
+  vi.spyOn(client, "list").mockImplementation(async (_g, _v, plural) => {
+    if (plural === "pods") throw error
+    return {
+      apiVersion: "v1",
+      kind: `${plural}List`,
+      metadata: {},
+      items: plural === "nodes" ? DEFAULT_NODES : [],
+    } as K8sList<unknown>
+  })
+  return client
+}
+
+function renderResource(client: K8sClient, resource: string) {
+  return renderWithK8sProvider(
+    <TenantProvider>
+      <Routes>
+        <Route path="/r/*" element={<ClusterUsageResourcePage />} />
+      </Routes>
+    </TenantProvider>,
+    { client, initialRoute: `/r/${resource}` },
+  )
+}
+
+// TenantProvider reads window.localStorage on mount.
+beforeAll(() => {
+  if (typeof globalThis.localStorage?.getItem !== "function") {
+    const store = new Map<string, string>()
+    vi.stubGlobal("localStorage", {
+      getItem: (k: string) => store.get(k) ?? null,
+      setItem: (k: string, v: string) => void store.set(k, v),
+      removeItem: (k: string) => void store.delete(k),
+      clear: () => store.clear(),
+    })
+  }
+})
+
+describe("ClusterUsageResourcePage", () => {
+  it("groups consumers of a resource by tenant namespace and owning app, summing requests", async () => {
+    const client = makeClient([
+      pod(
+        "tenant-foo",
+        "vm1-abc",
+        {
+          "apps.cozystack.io/application.kind": "VMInstance",
+          "apps.cozystack.io/application.name": "vm1",
+        },
+        [{ [GPU]: "2" }],
+      ),
+      pod(
+        "tenant-foo",
+        "vm1-def",
+        {
+          "apps.cozystack.io/application.kind": "VMInstance",
+          "apps.cozystack.io/application.name": "vm1",
+        },
+        [{ [GPU]: "1" }],
+      ),
+      // No GPU request → must be excluded.
+      pod("tenant-bar", "web-1", { "app.kubernetes.io/instance": "web" }, [
+        { cpu: "500m" },
+      ]),
+    ])
+    renderResource(client, GPU)
+
+    const row = await screen.findByText("vm1")
+    const tr = row.closest("tr") as HTMLElement
+    expect(within(tr).getByText("tenant-foo")).toBeInTheDocument()
+    // Kind is shown as a subtitle within the Workload cell.
+    expect(within(tr).getByText("VMInstance")).toBeInTheDocument()
+    const cells = tr.querySelectorAll("td")
+    // Columns: Tenant | Workload | Requested — last cell is the summed request.
+    expect(cells[cells.length - 1].textContent).toBe("3")
+    expect(screen.queryByText("tenant-bar")).toBeNull()
+  })
+
+  it("links a consumer to its deployed application page in the Console", async () => {
+    const client = makeClient(
+      [
+        pod(
+          "tenant-root",
+          "demo-vm-launcher",
+          {
+            "apps.cozystack.io/application.kind": "VMInstance",
+            "apps.cozystack.io/application.name": "demo-vm",
+          },
+          [{ [GPU]: "1" }],
+        ),
+      ],
+      [appDef("VMInstance", "vminstances")],
+    )
+    renderResource(client, GPU)
+
+    const link = await screen.findByRole("link", { name: "demo-vm" })
+    expect(link).toHaveAttribute("href", "/console/vminstances/demo-vm/workloads")
+  })
+
+  it("does not link a consumer whose kind is not a known application", async () => {
+    const client = makeClient(
+      [
+        pod("tenant-root", "rogue", { "app.kubernetes.io/instance": "rogue" }, [
+          { [GPU]: "1" },
+        ]),
+      ],
+      [appDef("VMInstance", "vminstances")],
+    )
+    renderResource(client, GPU)
+    // Owner falls back to the Helm instance label; with no matching app
+    // definition it must render as plain text, not a link.
+    await screen.findByText("rogue")
+    expect(screen.queryByRole("link", { name: "rogue" })).toBeNull()
+  })
+
+  it("shows an empty state when nothing requests the resource", async () => {
+    const client = makeClient([
+      pod("tenant-bar", "web-1", { "app.kubernetes.io/instance": "web" }, [
+        { cpu: "500m" },
+      ]),
+    ])
+    renderResource(client, GPU)
+    expect(
+      await screen.findByText(/no workloads are requesting/i),
+    ).toBeInTheDocument()
+  })
+
+  it("shows a permission notice when the pod list is forbidden", async () => {
+    const client = makeFailingClient(new K8sApiError(403, { message: "forbidden" }))
+    renderResource(client, GPU)
+    expect(
+      await screen.findByText(/you do not have permission to view cluster usage/i),
+    ).toBeInTheDocument()
+  })
+
+  it("shows a failure notice when the pod list errors", async () => {
+    const client = makeFailingClient(new K8sApiError(500, { message: "boom" }))
+    renderResource(client, GPU)
+    expect(await screen.findByText(/failed to load cluster usage: boom/i)).toBeInTheDocument()
+  })
+
+  it("renders the resource key as the page heading", async () => {
+    const client = makeClient([])
+    renderResource(client, GPU)
+    expect(await screen.findByRole("heading", { name: GPU })).toBeInTheDocument()
+  })
+
+  it("counts requested like the aggregate: requests only, scheduled non-terminal pods", async () => {
+    const pods = [
+      pod("tenant-foo", "alpha-0", { "app.kubernetes.io/instance": "alpha" }, [{ cpu: "500m" }]),
+      pod("tenant-foo", "beta-0", { "app.kubernetes.io/instance": "beta" }, [{ cpu: "250m" }]),
+      // limits-only → excluded (the aggregate counts requests, never limits)
+      pod("tenant-foo", "gamma-0", { "app.kubernetes.io/instance": "gamma" }, [{}], {
+        limits: [{ cpu: "1" }],
+      }),
+      // terminal → excluded
+      pod("tenant-foo", "delta-0", { "app.kubernetes.io/instance": "delta" }, [{ cpu: "1" }], {
+        phase: "Succeeded",
+      }),
+      // unscheduled → excluded
+      pod("tenant-foo", "epsilon-0", { "app.kubernetes.io/instance": "epsilon" }, [{ cpu: "1" }], {
+        nodeName: null,
+      }),
+      // scheduled to an unknown node → excluded
+      pod("tenant-foo", "zeta-0", { "app.kubernetes.io/instance": "zeta" }, [{ cpu: "1" }], {
+        nodeName: "ghost",
+      }),
+    ]
+    const nodes = [node("node-1")]
+    renderResource(makeClient(pods, [], nodes), "cpu")
+
+    // The displayed total reconciles with aggregateNodeResources over the same
+    // input (all pods are tenant-scoped here, so the subset equals the whole).
+    const expected = aggregateNodeResources(nodes as Node[], pods as Pod[], undefined).standard.cpu
+      .requested
+    const totalRow = (await screen.findByText(/tenant total/i)).closest("tr") as HTMLElement
+    const totalCells = totalRow.querySelectorAll("td")
+    expect(totalCells[totalCells.length - 1].textContent).toBe(humanizeCpu(expected))
+
+    expect(screen.getByText("alpha")).toBeInTheDocument()
+    expect(screen.getByText("beta")).toBeInTheDocument()
+    for (const excluded of ["gamma", "delta", "epsilon", "zeta"]) {
+      expect(screen.queryByText(excluded)).toBeNull()
+    }
+  })
+})
diff --git a/packages/system/dashboard/images/console/apps/console/src/routes/ClusterUsageResourcePage.tsx b/packages/system/dashboard/images/console/apps/console/src/routes/ClusterUsageResourcePage.tsx
new file mode 100644
index 0000000000..866b678723
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/routes/ClusterUsageResourcePage.tsx
@@ -0,0 +1,176 @@
+import { useMemo } from "react"
+import { Link, useParams } from "react-router"
+import { Section, Spinner } from "@cozystack/ui"
+import { useK8sList, K8sApiError } from "@cozystack/k8s-client"
+import { ChevronLeft } from "lucide-react"
+import { parseQuantity, humanizeBytes, humanizeCpu } from "../lib/k8s-quantity.ts"
+import { workloadOwner } from "../lib/workload.ts"
+import { podCountsTowardRequested } from "../lib/cluster-usage/aggregate.ts"
+import { TENANT_NAMESPACE_PREFIX } from "../lib/constants.ts"
+import { WorkloadCell } from "../components/WorkloadCell.tsx"
+import type { Node, Pod } from "../lib/cluster-usage/types.ts"
+
+/**
+ * Admin → Resources → per-resource drill-down. Given a resource key
+ * (e.g. `cpu`, `memory`, or an extended resource like
+ * `nvidia.com/GH100_H200_SXM_141GB`) this lists the tenant workloads requesting
+ * it, grouped by namespace and owning application. To stay consistent with the
+ * Cluster page headline it counts the same way the aggregate does — requests
+ * only (never limits), scheduled non-terminal pods only — but scoped to tenant
+ * namespaces, so the Total is the tenant portion of the cluster-wide figure
+ * (system/control-plane usage is excluded).
+ *
+ * Ownership is read from pod labels — Cozystack stamps
+ * `apps.cozystack.io/application.{kind,name}` on every workload pod; we
+ * fall back to the Helm `app.kubernetes.io/{instance,name}` labels and finally
+ * to the bare pod name so nothing is silently dropped.
+ *
+ * The resource key arrives via a splat param (`cluster-usage/r/*`) so keys
+ * containing slashes (every `vendor.com/model` GPU name) survive routing
+ * without encoding.
+ */
+
+interface UsageRow {
+  namespace: string
+  kind: string
+  name: string
+  pods: number
+  requested: number
+}
+
+function formatResource(resource: string, value: number): string {
+  if (resource === "cpu") return humanizeCpu(value)
+  if (resource === "memory" || resource === "ephemeral-storage") {
+    return humanizeBytes(value)
+  }
+  return value % 1 === 0 ? `${value}` : value.toFixed(2)
+}
+
+/** Sum a single resource's requests across a pod's containers (requests only). */
+function podRequestedResource(pod: Pod, resource: string): number {
+  let total = 0
+  for (const container of pod.spec?.containers ?? []) {
+    const value = container.resources?.requests?.[resource]
+    if (value !== undefined) total += parseQuantity(value)
+  }
+  return total
+}
+
+export function ClusterUsageResourcePage() {
+  const params = useParams()
+  const resource = params["*"] ?? ""
+
+  const pods = useK8sList<Pod>({ apiGroup: "", apiVersion: "v1", plural: "pods" })
+  const nodes = useK8sList<Node>({ apiGroup: "", apiVersion: "v1", plural: "nodes" })
+  const isLoading = pods.isLoading || nodes.isLoading
+  const error = pods.error ?? nodes.error
+
+  const { rows, totalRequested } = useMemo(() => {
+    const knownNodes = new Set((nodes.data?.items ?? []).map((n) => n.metadata.name))
+    const byKey = new Map<string, UsageRow>()
+    let totalRequested = 0
+    for (const pod of pods.data?.items ?? []) {
+      // Match the aggregate's definition of "requested" so this breakdown
+      // reconciles with the headline number it drills into.
+      if (!podCountsTowardRequested(pod, knownNodes)) continue
+      const requested = podRequestedResource(pod, resource)
+      if (requested <= 0) continue
+      const namespace = pod.metadata.namespace ?? "—"
+      // Tenant-scoped: skip system/control-plane namespaces (cozy-*, kube-system,
+      // …). The Total is therefore the tenant portion of the cluster figure.
+      if (!namespace.startsWith(TENANT_NAMESPACE_PREFIX)) continue
+      const { kind, name } = workloadOwner(pod.metadata.labels, pod.metadata.name)
+      const key = `${namespace}/${kind}/${name}`
+      const existing = byKey.get(key)
+      if (existing) {
+        existing.pods += 1
+        existing.requested += requested
+      } else {
+        byKey.set(key, { namespace, kind, name, pods: 1, requested })
+      }
+      totalRequested += requested
+    }
+    const rows = [...byKey.values()].sort((a, b) => b.requested - a.requested)
+    return { rows, totalRequested }
+  }, [pods.data, nodes.data, resource])
+
+  return (
+    <div className="space-y-6 p-6">
+      <div>
+        <Link
+          to="/admin/capacity/cluster"
+          className="mb-2 inline-flex items-center gap-1 text-sm text-slate-500 hover:text-slate-700"
+        >
+          <ChevronLeft className="size-3.5" /> Cluster
+        </Link>
+        <h1 className="font-mono text-xl font-semibold break-all text-slate-900">
+          {resource}
+        </h1>
+        <p className="mt-0.5 text-sm text-slate-500">
+          Tenant workloads requesting this resource, grouped by namespace and
+          owning application (derived from pod labels). System and control-plane
+          usage is excluded, so the total is the tenant portion of the
+          cluster-wide figure.
+        </p>
+      </div>
+
+      {isLoading ? (
+        <div className="flex items-center gap-2 text-sm text-slate-500">
+          <Spinner /> Loading…
+        </div>
+      ) : error ? (
+        <Section>
+          <div className="px-2 py-4 text-sm text-red-700">
+            {error instanceof K8sApiError && error.status === 403
+              ? "You do not have permission to view cluster usage."
+              : `Failed to load cluster usage: ${error.message}`}
+          </div>
+        </Section>
+      ) : rows.length === 0 ? (
+        <Section>
+          <p className="py-6 text-center text-sm text-slate-500">
+            No workloads are requesting{" "}
+            <span className="font-mono">{resource}</span>.
+          </p>
+        </Section>
+      ) : (
+        <Section>
+          <table className="w-full text-sm">
+            <thead>
+              <tr className="border-b border-slate-200 bg-slate-50 text-left">
+                <th className="px-3 py-2 font-medium text-slate-600">Tenant (namespace)</th>
+                <th className="px-3 py-2 font-medium text-slate-600">Workload</th>
+                <th className="px-3 py-2 text-right font-medium text-slate-600">Requested</th>
+              </tr>
+            </thead>
+            <tbody className="divide-y divide-slate-100">
+              {rows.map((r) => {
+                return (
+                  <tr key={`${r.namespace}/${r.kind}/${r.name}`} className="hover:bg-slate-50">
+                    <td className="px-3 py-2 text-slate-700">{r.namespace}</td>
+                    <td className="px-3 py-2">
+                      <WorkloadCell namespace={r.namespace} kind={r.kind} name={r.name} />
+                    </td>
+                    <td className="px-3 py-2 text-right tabular-nums text-slate-700">
+                      {formatResource(resource, r.requested)}
+                    </td>
+                  </tr>
+                )
+              })}
+            </tbody>
+            <tfoot>
+              <tr className="border-t border-slate-200 bg-slate-50 font-medium">
+                <td className="px-3 py-2 text-slate-700" colSpan={2}>
+                  Tenant total · {rows.length} workload{rows.length === 1 ? "" : "s"}
+                </td>
+                <td className="px-3 py-2 text-right tabular-nums text-slate-700">
+                  {formatResource(resource, totalRequested)}
+                </td>
+              </tr>
+            </tfoot>
+          </table>
+        </Section>
+      )}
+    </div>
+  )
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/routes/ConsoleOverview.tsx b/packages/system/dashboard/images/console/apps/console/src/routes/ConsoleOverview.tsx
new file mode 100644
index 0000000000..13060d78fe
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/routes/ConsoleOverview.tsx
@@ -0,0 +1,96 @@
+import { useMemo } from "react"
+import { Link } from "react-router"
+import { Plus } from "lucide-react"
+import { Spinner, Button } from "@cozystack/ui"
+import type { ApplicationDefinition, ApplicationInstance } from "@cozystack/types"
+import {
+  isTenantModule,
+  useApplicationDefinitions,
+  useApplicationInstances,
+} from "../lib/app-definitions.ts"
+import { useTenantContext } from "../lib/tenant-context.tsx"
+import { InstanceCard } from "../components/InstanceCard.tsx"
+import { QuotaPanel } from "../components/QuotaDisplay.tsx"
+
+function TenantApps({ ad, namespace }: { ad: ApplicationDefinition; namespace: string }) {
+  const { data } = useApplicationInstances(ad, namespace)
+  const items = data?.items ?? []
+  if (items.length === 0) return null
+  return (
+    <section>
+      <h2 className="mb-2 flex items-center gap-2 text-xs font-semibold uppercase tracking-wider text-slate-400">
+        {ad.spec?.application.kind}
+        <span className="rounded-full bg-slate-100 px-1.5 text-[10px] font-medium text-slate-600">
+          {items.length}
+        </span>
+      </h2>
+      <div className="flex flex-wrap gap-2">
+        {items.map((inst: ApplicationInstance) => (
+          <InstanceCard
+            key={inst.metadata.name}
+            ad={ad}
+            instance={inst}
+          />
+        ))}
+      </div>
+    </section>
+  )
+}
+
+export function ConsoleOverview() {
+  const { data, isLoading } = useApplicationDefinitions()
+  const { tenantNamespace, selectedTenant } = useTenantContext()
+
+  const ads = useMemo(
+    () =>
+      (data?.items ?? [])
+        .filter((ad) => !isTenantModule(ad) && ad.spec?.application.kind !== "Tenant")
+        .slice()
+        .sort((a, b) =>
+          (a.spec?.application.kind ?? "").localeCompare(
+            b.spec?.application.kind ?? "",
+          ),
+        ),
+    [data],
+  )
+
+  if (!tenantNamespace) {
+    return (
+      <div className="p-6 text-sm text-slate-500">
+        Select a tenant to view its deployed applications.
+      </div>
+    )
+  }
+
+  return (
+    <div className="p-6">
+      <div className="mb-5 flex items-end justify-between">
+        <div>
+          <h1 className="text-xl font-semibold text-slate-900">Deployed applications</h1>
+          <p className="mt-0.5 text-sm text-slate-500">
+            Tenant <code className="text-slate-700">{selectedTenant}</code> ·{" "}
+            <code className="text-slate-400">{tenantNamespace}</code>
+          </p>
+        </div>
+        <Link to="/marketplace">
+          <Button variant="primary" size="sm">
+            <Plus className="size-3.5" /> Deploy application
+          </Button>
+        </Link>
+      </div>
+      <QuotaPanel namespace={tenantNamespace} />
+
+      {isLoading ? (
+        <div className="mt-6 flex items-center gap-2 text-sm text-slate-500">
+          <Spinner /> Loading…
+        </div>
+      ) : (
+        <div className="mt-6 space-y-6">
+          {ads.map((ad) => (
+            <TenantApps key={ad.metadata.name} ad={ad} namespace={tenantNamespace} />
+          ))}
+        </div>
+      )}
+    </div>
+  )
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/routes/ConsolePage.routing.test.tsx b/packages/system/dashboard/images/console/apps/console/src/routes/ConsolePage.routing.test.tsx
new file mode 100644
index 0000000000..7c6d1209c7
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/routes/ConsolePage.routing.test.tsx
@@ -0,0 +1,73 @@
+import { describe, it, expect, vi, beforeAll } from "vitest"
+import { screen, waitFor } from "@testing-library/react"
+import {
+  K8sClient,
+  type K8sList,
+  type APIGroupList,
+} from "@cozystack/k8s-client"
+import { ConsolePage } from "./ConsolePage.tsx"
+import { TenantProvider } from "../lib/tenant-provider.tsx"
+import { renderWithK8sProvider } from "../test-utils/render.tsx"
+
+function makeClient(): K8sClient {
+  const client = new K8sClient()
+  vi.spyOn(client, "list").mockImplementation(async (_g, _v, plural) => {
+    if (plural === "tenantnamespaces") {
+      return {
+        apiVersion: "core.cozystack.io/v1alpha1",
+        kind: "TenantNamespaceList",
+        metadata: {},
+        items: [],
+      } as K8sList<unknown>
+    }
+    return {
+      apiVersion: "v1",
+      kind: `${plural}List`,
+      metadata: {},
+      items: [],
+    } as K8sList<unknown>
+  })
+  vi.spyOn(client, "getApiGroups").mockResolvedValue({
+    kind: "APIGroupList",
+    apiVersion: "v1",
+    groups: [],
+  } as APIGroupList)
+  vi.spyOn(client, "create").mockResolvedValue({
+    apiVersion: "authorization.k8s.io/v1",
+    kind: "SelfSubjectAccessReview",
+    metadata: { name: "" },
+    spec: {},
+    status: { allowed: false },
+  } as unknown)
+  return client
+}
+
+// TenantProvider reads window.localStorage on mount; provide a minimal
+// in-memory shim for the test environment when one is not present.
+beforeAll(() => {
+  if (typeof globalThis.localStorage?.getItem !== "function") {
+    const store = new Map<string, string>()
+    vi.stubGlobal("localStorage", {
+      getItem: (k: string) => store.get(k) ?? null,
+      setItem: (k: string, v: string) => void store.set(k, v),
+      removeItem: (k: string) => void store.delete(k),
+      clear: () => store.clear(),
+    })
+  }
+})
+
+describe("ConsolePage routing", () => {
+  it("no longer serves the Cluster Usage page under console (moved to /admin)", async () => {
+    const client = makeClient()
+    renderWithK8sProvider(
+      <TenantProvider>
+        <ConsolePage />
+      </TenantProvider>,
+      { client, initialRoute: "/cluster-usage" },
+    )
+    // "cluster-usage" now falls through to the generic :plural list route, so
+    // the Cluster Usage page's unique subtitle must not appear.
+    await waitFor(() => expect(client.list).toHaveBeenCalled())
+    expect(screen.queryByText(/Cluster-scoped capacity/i)).toBeNull()
+  })
+})
diff --git a/packages/system/dashboard/images/console/apps/console/src/routes/ConsolePage.tsx b/packages/system/dashboard/images/console/apps/console/src/routes/ConsolePage.tsx
new file mode 100644
index 0000000000..37caae92f6
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/routes/ConsolePage.tsx
@@ -0,0 +1,105 @@
+import { Route, Routes } from "react-router"
+import { ConsoleOverview } from "./ConsoleOverview.tsx"
+import { ApplicationListPage } from "./ApplicationListPage.tsx"
+import { ApplicationDetailPage } from "./detail/ApplicationDetailPage.tsx"
+import { ApplicationEditRoute } from "./detail/ApplicationEditRoute.tsx"
+import { BackupResourceListPage } from "./BackupResourceListPage.tsx"
+import { BackupResourceEditPage } from "./BackupResourceEditPage.tsx"
+import { BackupPlanCreatePage } from "./BackupPlanCreatePage.tsx"
+import { BackupJobCreatePage } from "./BackupJobCreatePage.tsx"
+import { BackupCreatePage } from "./BackupCreatePage.tsx"
+import { BackupRestoreJobCreatePage } from "./BackupRestoreJobCreatePage.tsx"
+import { MigrationResourceListPage } from "./MigrationResourceListPage.tsx"
+import { MigrationSourceCreatePage } from "./MigrationSourceCreatePage.tsx"
+import { MigrationSourceEditPage } from "./MigrationSourceEditPage.tsx"
+import { MigrationTaskCreatePage } from "./MigrationTaskCreatePage.tsx"
+import { MigrationTaskDetailPage } from "./MigrationTaskDetailPage.tsx"
+import { ApplicationOrderPage } from "./ApplicationOrderPage.tsx"
+
+export function ConsolePage() {
+  return (
+    <Routes>
+      <Route index element={<ConsoleOverview />} />
+      <Route
+        path="backups/plans"
+        element={<BackupResourceListPage resourceType="plans" title="Plans" />}
+      />
+      <Route
+        path="backups/plans/create"
+        element={<BackupPlanCreatePage />}
+      />
+      <Route
+        path="backups/plans/:name/edit"
+        element={<BackupResourceEditPage resourceType="plans" title="Plans" />}
+      />
+      <Route
+        path="backups/backupjobs"
+        element={<BackupResourceListPage resourceType="backupjobs" title="Backup Jobs" />}
+      />
+      <Route
+        path="backups/backupjobs/create"
+        element={<BackupJobCreatePage />}
+      />
+      <Route
+        path="backups/backupjobs/:name/edit"
+        element={<BackupResourceEditPage resourceType="backupjobs" title="Backup Jobs" />}
+      />
+      <Route
+        path="backups/backups"
+        element={<BackupResourceListPage resourceType="backups" title="Backups" />}
+      />
+      <Route
+        path="backups/backups/create"
+        element={<BackupCreatePage />}
+      />
+      <Route
+        path="backups/backups/:name/edit"
+        element={<BackupResourceEditPage resourceType="backups" title="Backups" />}
+      />
+      <Route
+        path="backups/restorejobs"
+        element={<BackupResourceListPage resourceType="restorejobs" title="Restore Jobs" />}
+      />
+      <Route
+        path="backups/restorejobs/create"
+        element={<BackupRestoreJobCreatePage />}
+      />
+      <Route
+        path="backups/restorejobs/:name/edit"
+        element={<BackupResourceEditPage resourceType="restorejobs" title="Restore Jobs" />}
+      />
+      {/* Migration routes precede the generic `:plural` catch-alls below, which
+          would otherwise swallow /console/migration/* as an application kind. */}
+      <Route
+        path="migration/vmimportsources"
+        element={<MigrationResourceListPage resourceType="vmimportsources" title="Sources" />}
+      />
+      <Route
+        path="migration/vmimportsources/create"
+        element={<MigrationSourceCreatePage />}
+      />
+      {/* Sources are editable, tasks are not: a task's spec is immutable on
+          admission, so an edit form would only offer rejected changes. */}
+      <Route
+        path="migration/vmimportsources/:name/edit"
+        element={<MigrationSourceEditPage />}
+      />
+      <Route
+        path="migration/vmimporttasks"
+        element={<MigrationResourceListPage resourceType="vmimporttasks" title="Imports" />}
+      />
+      <Route
+        path="migration/vmimporttasks/create"
+        element={<MigrationTaskCreatePage />}
+      />
+      <Route
+        path="migration/vmimporttasks/:name"
+        element={<MigrationTaskDetailPage />}
+      />
+      <Route path="new/:appName" element={<ApplicationOrderPage />} />
+      <Route path=":plural/:name/edit" element={<ApplicationEditRoute />} />
+      <Route path=":plural/:name/*" element={<ApplicationDetailPage />} />
+      <Route path=":plural" element={<ApplicationListPage />} />
+    </Routes>
+  )
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/routes/ExternalIpsPage.tsx b/packages/system/dashboard/images/console/apps/console/src/routes/ExternalIpsPage.tsx
new file mode 100644
index 0000000000..6771e5ad95
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/routes/ExternalIpsPage.tsx
@@ -0,0 +1,152 @@
+import { useCallback, useEffect, useMemo, useState } from "react"
+import { Globe } from "lucide-react"
+import { useK8sList, type K8sResource } from "@cozystack/k8s-client"
+import { Section, Spinner } from "@cozystack/ui"
+import type { TenantNamespace } from "@cozystack/types"
+import { formatAge } from "../lib/status.ts"
+
+interface ServiceSpec {
+  type?: string
+  ports?: { port: number; protocol?: string; name?: string; nodePort?: number }[]
+  clusterIP?: string
+}
+
+interface ServiceStatus {
+  loadBalancer?: {
+    ingress?: { ip?: string; hostname?: string }[]
+  }
+}
+
+/**
+ * Administration → External IPs. One table of `LoadBalancer` services across
+ * every tenant namespace the user can see (all visible TenantNamespaces, not
+ * just the selected subtree). Namespaces without such services — or where the
+ * service list is not permitted — contribute no rows.
+ */
+export function ExternalIpsPage() {
+  const { data: tnList, isLoading: tnLoading } = useK8sList<TenantNamespace>({
+    apiGroup: "core.cozystack.io",
+    apiVersion: "v1alpha1",
+    plural: "tenantnamespaces",
+  })
+
+  const tenants = useMemo(
+    () =>
+      (tnList?.items ?? [])
+        .slice()
+        .sort((a, b) => a.metadata.name.localeCompare(b.metadata.name)),
+    [tnList],
+  )
+
+  // Every namespace reports its LoadBalancer count once settled, so the page
+  // can tell "still loading" apart from "nothing anywhere".
+  const [counts, setCounts] = useState<Record<string, number>>({})
+  const onCount = useCallback((ns: string, n: number) => {
+    setCounts((prev) => (prev[ns] === n ? prev : { ...prev, [ns]: n }))
+  }, [])
+
+  const allSettled =
+    !tnLoading && tenants.every((t) => counts[t.metadata.name] !== undefined)
+  const total = tenants.reduce((s, t) => s + (counts[t.metadata.name] ?? 0), 0)
+
+  return (
+    <div className="p-6">
+      <div className="mb-5 flex items-center gap-3">
+        <div className="flex size-10 items-center justify-center rounded-md bg-slate-100 text-slate-500">
+          <Globe className="size-5" />
+        </div>
+        <div>
+          <h1 className="text-xl font-semibold text-slate-900">External IPs</h1>
+          <p className="mt-0.5 text-sm text-slate-500">
+            LoadBalancer services across every tenant you can access.
+          </p>
+        </div>
+      </div>
+
+      {/* Row providers stay mounted (their watches feed the counts), so hide
+          the empty table with CSS instead of unmounting it. */}
+      <div className={total === 0 ? "hidden" : undefined}>
+        <Section bodyClassName="p-0">
+          <table className="w-full text-sm">
+            <thead>
+              <tr className="border-b border-slate-200 bg-slate-50 text-left text-xs font-medium uppercase tracking-wider text-slate-500">
+                <th className="px-4 py-3">Namespace</th>
+                <th className="px-4 py-3">Service</th>
+                <th className="px-4 py-3">External</th>
+                <th className="px-4 py-3">Ports</th>
+                <th className="px-4 py-3">Age</th>
+              </tr>
+            </thead>
+            <tbody className="divide-y divide-slate-100">
+              {tenants.map((tn) => (
+                <TenantIpsRows key={tn.metadata.name} tn={tn} onCount={onCount} />
+              ))}
+            </tbody>
+          </table>
+        </Section>
+      </div>
+
+      {!allSettled ? (
+        <div className="flex items-center gap-2 text-sm text-slate-500">
+          <Spinner /> Loading…
+        </div>
+      ) : total === 0 ? (
+        <Section>
+          <p className="py-6 text-center text-sm text-slate-500">
+            No LoadBalancer services in any accessible tenant.
+          </p>
+        </Section>
+      ) : null}
+    </div>
+  )
+}
+
+function TenantIpsRows({
+  tn,
+  onCount,
+}: {
+  tn: TenantNamespace
+  onCount: (ns: string, n: number) => void
+}) {
+  const ns = tn.metadata.name
+  const { data, isLoading, error } = useK8sList<K8sResource<ServiceSpec, ServiceStatus>>(
+    { apiGroup: "", apiVersion: "v1", plural: "services", namespace: ns },
+    { fieldSelector: "spec.type=LoadBalancer" },
+  )
+  const items = data?.items ?? []
+
+  useEffect(() => {
+    // A forbidden namespace settles as empty rather than blocking the page.
+    if (!isLoading) onCount(ns, error ? 0 : items.length)
+  }, [ns, isLoading, error, items.length, onCount])
+
+  if (isLoading || error) return null
+
+  return (
+    <>
+      {items.map((svc) => {
+        const lb = svc.status?.loadBalancer?.ingress?.[0]
+        const external = lb?.ip ?? lb?.hostname ?? "Pending"
+        return (
+          <tr key={`${ns}/${svc.metadata.name}`}>
+            <td className="px-4 py-3 font-mono text-xs text-slate-600">{ns}</td>
+            <td className="px-4 py-3 font-mono text-xs text-slate-800">
+              {svc.metadata.name}
+            </td>
+            <td className="px-4 py-3 font-mono text-xs text-slate-700">
+              {external}
+            </td>
+            <td className="px-4 py-3 text-slate-600">
+              {svc.spec?.ports
+                ?.map((p) => `${p.port}/${p.protocol ?? "TCP"}`)
+                .join(", ") ?? "—"}
+            </td>
+            <td className="px-4 py-3 tabular-nums text-xs text-slate-500">
+              {formatAge(svc.metadata.creationTimestamp)}
+            </td>
+          </tr>
+        )
+      })}
+    </>
+  )
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/routes/InfoRedirect.tsx b/packages/system/dashboard/images/console/apps/console/src/routes/InfoRedirect.tsx
new file mode 100644
index 0000000000..6795765a96
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/routes/InfoRedirect.tsx
@@ -0,0 +1,22 @@
+import { Navigate } from "react-router"
+import { useApplicationDefinitions } from "../lib/app-definitions.ts"
+import { useResourceBasePath } from "../lib/portal.ts"
+
+/**
+ * `/console/info` (and `/admin/info`) is a convenience path for the Info
+ * singleton. We resolve the AD lazily and redirect to the generic detail route
+ * for whatever plural it declares (typically `infos`), staying in the active
+ * portal so /admin/info lands under /admin.
+ */
+export function InfoRedirect() {
+  const { data, isLoading } = useApplicationDefinitions()
+  const base = useResourceBasePath()
+  if (isLoading) return null
+  const ad = data?.items.find((d) => d.spec?.application.kind === "Info")
+  // Stay in the active portal on the miss too — hardcoding /console here is
+  // what the docstring above promises not to do, and it throws an admin out of
+  // /admin whenever the Info definition is absent or its query errored.
+  if (!ad) return <Navigate to={base} replace />
+  const plural = ad.spec?.application.plural ?? "infos"
+  return <Navigate to={`${base}/${plural}/info`} replace />
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/routes/MarketplaceList.tsx b/packages/system/dashboard/images/console/apps/console/src/routes/MarketplaceList.tsx
new file mode 100644
index 0000000000..130f156a4f
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/routes/MarketplaceList.tsx
@@ -0,0 +1,68 @@
+import { useMemo } from "react"
+import { useParams } from "react-router"
+import { Spinner } from "@cozystack/ui"
+import {
+  useApplicationDefinitions,
+  groupByCategory,
+} from "../lib/app-definitions.ts"
+import { AppCard } from "../components/AppCard.tsx"
+
+export function MarketplaceList() {
+  const { data, isLoading, error } = useApplicationDefinitions()
+  const { category: rawCategory } = useParams<{ category?: string }>()
+  const category = rawCategory ? decodeURIComponent(rawCategory) : null
+
+  // Modules are configured per-tenant under Administration → Modules, not
+  // installed from the marketplace. Likewise Tenant itself lives in its own
+  // Administration → Tenants page.
+  const categories = useMemo(() => groupByCategory(data), [data])
+  const visible = useMemo(
+    () => (category ? categories.filter((c) => c.category === category) : categories),
+    [categories, category],
+  )
+
+  if (isLoading) {
+    return (
+      <div className="flex items-center gap-2 p-6 text-sm text-slate-500">
+        <Spinner /> Loading marketplace…
+      </div>
+    )
+  }
+  if (error) {
+    return (
+      <div className="p-6 text-sm text-red-600">
+        Failed to load ApplicationDefinitions: {(error as Error).message}
+      </div>
+    )
+  }
+
+  return (
+    <div className="p-6">
+      <div className="mb-5">
+        <h1 className="text-xl font-semibold text-slate-900">Marketplace</h1>
+        <p className="mt-0.5 text-sm text-slate-500">
+          Pick an application to deploy into the selected tenant.
+        </p>
+      </div>
+      {visible.length === 0 && (
+        <div className="rounded-lg border border-dashed border-slate-300 bg-white p-12 text-center text-sm text-slate-500">
+          No applications in this category.
+        </div>
+      )}
+      <div className="space-y-6">
+        {visible.map(({ category, items }) => (
+          <section key={category}>
+            <h2 className="mb-2 text-xs font-semibold uppercase tracking-wider text-slate-400">
+              {category}
+            </h2>
+            <div className="flex flex-wrap gap-3">
+              {items.map((ad) => (
+                <AppCard key={ad.metadata.name} ad={ad} to={`/marketplace/${ad.metadata.name}`} />
+              ))}
+            </div>
+          </section>
+        ))}
+      </div>
+    </div>
+  )
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/routes/MarketplacePage.tsx b/packages/system/dashboard/images/console/apps/console/src/routes/MarketplacePage.tsx
new file mode 100644
index 0000000000..87875ea594
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/routes/MarketplacePage.tsx
@@ -0,0 +1,15 @@
+import { Navigate, Route, Routes } from "react-router"
+import { MarketplaceList } from "./MarketplaceList.tsx"
+import { ApplicationOrderPage } from "./ApplicationOrderPage.tsx"
+
+export function MarketplacePage() {
+  return (
+    <Routes>
+      <Route index element={<MarketplaceList />} />
+      <Route path="c/:category" element={<MarketplaceList />} />
+      {/* Repositories moved to Admin; must precede the :appName catch-all. */}
+      <Route path="taps" element={<Navigate to="/admin/taps" replace />} />
+      <Route path=":appName" element={<ApplicationOrderPage />} />
+    </Routes>
+  )
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/routes/MigrationResourceListPage.tsx b/packages/system/dashboard/images/console/apps/console/src/routes/MigrationResourceListPage.tsx
new file mode 100644
index 0000000000..55ba1a0694
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/routes/MigrationResourceListPage.tsx
@@ -0,0 +1,219 @@
+import { Link, useNavigate } from "react-router"
+import { Plus, Trash2, Import, Plug, Pencil } from "lucide-react"
+import { Button, Section, Spinner } from "@cozystack/ui"
+import { useK8sList, useK8sDelete } from "@cozystack/k8s-client"
+import { useTenantContext } from "../lib/tenant-context.tsx"
+import { formatAge } from "../lib/status.ts"
+import {
+  MIGRATION_GROUP,
+  MIGRATION_VERSION,
+  type MigrationResource,
+  type MigrationResourceType,
+  readyCondition,
+  taskProgress,
+} from "../lib/migration.ts"
+
+interface MigrationResourceListPageProps {
+  resourceType: MigrationResourceType
+  title: string
+}
+
+export function MigrationResourceListPage({ resourceType, title }: MigrationResourceListPageProps) {
+  const { tenantNamespace } = useTenantContext()
+  const navigate = useNavigate()
+  const isTask = resourceType === "vmimporttasks"
+
+  const { data, isLoading, error, refetch } = useK8sList<MigrationResource>({
+    apiGroup: MIGRATION_GROUP,
+    apiVersion: MIGRATION_VERSION,
+    plural: resourceType,
+    namespace: tenantNamespace ?? "",
+  }, { enabled: !!tenantNamespace })
+
+  const deleteMutation = useK8sDelete({
+    apiGroup: MIGRATION_GROUP,
+    apiVersion: MIGRATION_VERSION,
+    plural: resourceType,
+    namespace: tenantNamespace ?? "",
+  })
+
+  const items = data?.items ?? []
+
+  const handleDelete = async (name: string) => {
+    // Spelling out that the imported machines survive matters here: deleting a
+    // finished import is the normal way to tidy up, and a tenant who fears it
+    // will delete the VMs will simply never clean anything up.
+    const warning = isTask
+      ? `Delete import task "${name}"? Imported disks and instances are not affected.`
+      : `Delete connection "${name}"? Imports already completed are not affected.`
+    if (!confirm(warning)) return
+
+    try {
+      await deleteMutation.mutateAsync(name)
+      refetch()
+    } catch (err) {
+      alert(`Failed to delete: ${(err as Error).message}`)
+    }
+  }
+
+  if (isLoading) {
+    return (
+      <div className="flex items-center gap-2 p-6 text-sm text-slate-500">
+        <Spinner /> Loading…
+      </div>
+    )
+  }
+
+  if (error) {
+    return (
+      <div className="p-6 text-sm text-red-600">
+        Failed to load {title}: {(error as Error).message}
+      </div>
+    )
+  }
+
+  const Icon = isTask ? Import : Plug
+
+  return (
+    <div className="p-6">
+      <div className="mb-5 flex items-end justify-between gap-4">
+        <div className="flex items-center gap-3">
+          <div className="flex size-11 shrink-0 items-center justify-center rounded-md bg-slate-100">
+            <Icon className="size-6 text-slate-600" />
+          </div>
+          <div>
+            <h1 className="text-lg font-semibold text-slate-900">{title}</h1>
+            <p className="text-xs text-slate-500">
+              {items.length} {items.length === 1 ? "item" : "items"}
+            </p>
+          </div>
+        </div>
+        <Link to={`/console/migration/${resourceType}/create`}>
+          <Button variant="primary" size="sm">
+            <Plus className="size-3.5" /> {isTask ? "New import" : "Add connection"}
+          </Button>
+        </Link>
+      </div>
+
+      <Section>
+        {items.length === 0 ? (
+          <div className="py-12 text-center text-sm text-slate-500">
+            {isTask
+              ? "No imports yet. Add a connection first, then start an import."
+              : "No connections yet. Add one to import machines from vSphere."}
+          </div>
+        ) : (
+          <div className="overflow-x-auto">
+            <table className="w-full">
+              <thead>
+                <tr className="border-b border-slate-200 text-left text-xs font-medium uppercase tracking-wider text-slate-500">
+                  <th className="px-5 py-3">Name</th>
+                  <th className="px-5 py-3">{isTask ? "Source" : "Endpoint"}</th>
+                  <th className="px-5 py-3">{isTask ? "Machines" : "Type"}</th>
+                  <th className="px-5 py-3">Status</th>
+                  <th className="px-5 py-3">Age</th>
+                  <th className="px-5 py-3 text-right">Actions</th>
+                </tr>
+              </thead>
+              <tbody>
+                {items.map((item) => {
+                  const ready = readyCondition(item)
+                  const statusText = isTask
+                    ? (item.status?.phase ?? "Pending")
+                    : ready?.status === "True"
+                      ? "Ready"
+                      : (ready?.reason ?? "Pending")
+                  const statusTone =
+                    statusText === "Succeeded" || statusText === "Ready" ? "ok" :
+                    statusText === "Failed" ? "error" :
+                    "warn"
+
+                  const second = isTask ? item.spec?.sourceRef?.name : item.spec?.url
+                  const third = isTask
+                    ? `${item.spec?.vms?.length ?? 0}`
+                    : (item.spec?.type ?? "-")
+
+                  const progress = isTask ? taskProgress(item) : null
+
+                  return (
+                    <tr
+                      key={item.metadata.name}
+                      className="border-b border-slate-100 hover:bg-slate-50"
+                    >
+                      <td className="px-5 py-3 text-sm font-medium text-slate-900">
+                        {isTask ? (
+                          <Link
+                            to={`/console/migration/vmimporttasks/${item.metadata.name}`}
+                            className="text-blue-700 hover:underline"
+                          >
+                            {item.metadata.name}
+                          </Link>
+                        ) : (
+                          item.metadata.name
+                        )}
+                      </td>
+                      <td className="px-5 py-3 text-sm text-slate-600">{second ?? "-"}</td>
+                      <td className="px-5 py-3 text-sm text-slate-600">{third}</td>
+                      <td className="px-5 py-3">
+                        <div className="flex items-center gap-2">
+                          <span
+                            className={`inline-flex rounded-full px-2 py-0.5 text-xs font-medium ${
+                              statusTone === "ok"
+                                ? "bg-green-100 text-green-800"
+                                : statusTone === "error"
+                                  ? "bg-red-100 text-red-800"
+                                  : "bg-yellow-100 text-yellow-800"
+                            }`}
+                          >
+                            {statusText}
+                          </span>
+                          {progress !== null && progress > 0 && progress < 100 && (
+                            <span className="text-xs text-slate-500">{progress}%</span>
+                          )}
+                        </div>
+                      </td>
+                      <td className="px-5 py-3 text-sm text-slate-600">
+                        {item.metadata.creationTimestamp
+                          ? formatAge(item.metadata.creationTimestamp)
+                          : "-"}
+                      </td>
+                      <td className="px-5 py-3 text-right">
+                        <div className="flex items-center justify-end gap-2">
+                          {/* Connections are long-lived and their credentials
+                              rotate, so they are editable. An import task is a
+                              finished record whose spec the API server refuses
+                              to change, so it gets no edit action. */}
+                          {resourceType === "vmimportsources" && (
+                            <Button
+                              variant="outline"
+                              size="sm"
+                              onClick={() =>
+                                navigate(
+                                  `/console/migration/vmimportsources/${item.metadata.name}/edit`,
+                                )
+                              }
+                            >
+                              <Pencil className="size-3.5" /> Edit
+                            </Button>
+                          )}
+                          <Button
+                            variant="destructive"
+                            size="sm"
+                            onClick={() => handleDelete(item.metadata.name)}
+                            disabled={deleteMutation.isPending}
+                          >
+                            <Trash2 className="size-3.5" /> Delete
+                          </Button>
+                        </div>
+                      </td>
+                    </tr>
+                  )
+                })}
+              </tbody>
+            </table>
+          </div>
+        )}
+      </Section>
+    </div>
+  )
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/routes/MigrationSourceCreatePage.tsx b/packages/system/dashboard/images/console/apps/console/src/routes/MigrationSourceCreatePage.tsx
new file mode 100644
index 0000000000..2509b99e0b
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/routes/MigrationSourceCreatePage.tsx
@@ -0,0 +1,147 @@
+import { useRef, useState } from "react"
+import { useNavigate } from "react-router"
+import { Plug, Save } from "lucide-react"
+import { Button, Section, Spinner } from "@cozystack/ui"
+import { useK8sCreate } from "@cozystack/k8s-client"
+import { useTenantContext } from "../lib/tenant-context.tsx"
+import { useCRDSchema } from "../lib/use-crd-schema.ts"
+import { SchemaForm, type SchemaFormHandle } from "../components/SchemaForm.tsx"
+import { MIGRATION_GROUP, MIGRATION_VERSION } from "../lib/migration.ts"
+
+export function MigrationSourceCreatePage() {
+  const navigate = useNavigate()
+  const { tenantNamespace } = useTenantContext()
+  const [formData, setFormData] = useState<Record<string, unknown>>({})
+  const [name, setName] = useState("")
+  const schemaFormRef = useRef<SchemaFormHandle>(null)
+
+  const { schema, isLoading: schemaLoading } = useCRDSchema("vmimportsources.forklift.cozystack.io")
+
+  const createMutation = useK8sCreate({
+    apiGroup: MIGRATION_GROUP,
+    apiVersion: MIGRATION_VERSION,
+    plural: "vmimportsources",
+    namespace: tenantNamespace ?? "",
+  })
+
+  const handleSubmit = async () => {
+    if (!tenantNamespace) {
+      alert("Tenant namespace is not available. Please refresh.")
+      return
+    }
+    if (!name.trim()) {
+      alert("Name is required")
+      return
+    }
+    if (schemaFormRef.current && !schemaFormRef.current.validate()) return
+
+    const resource = {
+      apiVersion: `${MIGRATION_GROUP}/${MIGRATION_VERSION}`,
+      kind: "VMImportSource",
+      metadata: {
+        name: name.trim(),
+        namespace: tenantNamespace,
+      },
+      spec: formData,
+    }
+
+    try {
+      await createMutation.mutateAsync(resource)
+      navigate("/console/migration/vmimportsources")
+    } catch (err) {
+      alert(`Failed to create connection: ${(err as Error).message}`)
+    }
+  }
+
+  if (schemaLoading) {
+    return (
+      <div className="flex items-center gap-2 p-8 text-slate-500">
+        <Spinner /> Loading schema...
+      </div>
+    )
+  }
+
+  if (!schema) {
+    return (
+      <div className="p-8 text-red-600">
+        Failed to load the VMImportSource schema. Is the migration-controller package enabled?
+      </div>
+    )
+  }
+
+  return (
+    <div className="p-6">
+      <div className="mb-5 flex items-center gap-3">
+        <div className="flex size-11 shrink-0 items-center justify-center rounded-md bg-slate-100">
+          <Plug className="size-6 text-slate-600" />
+        </div>
+        <div>
+          <h1 className="text-lg font-semibold text-slate-900">Add source connection</h1>
+          <p className="text-xs text-slate-500">
+            Register a vCenter to import machines from. The connection is tested before
+            anything else happens.
+          </p>
+        </div>
+      </div>
+
+      <Section>
+        <div className="space-y-4 p-5">
+          <div>
+            <label htmlFor="source-name" className="mb-1 block text-sm font-medium text-slate-700">
+              Connection name <span className="text-red-500">*</span>
+            </label>
+            <input
+              id="source-name"
+              type="text"
+              value={name}
+              onChange={(e) => setName(e.target.value)}
+              placeholder="vcenter-prod"
+              className="w-full rounded-lg border border-slate-300 bg-white px-3 py-2 text-sm text-slate-900 outline-none focus:border-blue-400 focus:ring-1 focus:ring-blue-400"
+              required
+            />
+          </div>
+
+          <div>
+            <SchemaForm
+              ref={schemaFormRef}
+              openAPISchema={schema}
+              formData={formData}
+              onChange={(data) => setFormData((data ?? {}) as Record<string, unknown>)}
+            >
+              <div className="hidden" />
+            </SchemaForm>
+          </div>
+        </div>
+
+        <div className="flex items-center gap-2 border-t border-slate-200 px-5 py-3">
+          <Button
+            type="button"
+            variant="primary"
+            size="sm"
+            onClick={handleSubmit}
+            disabled={createMutation.isPending}
+          >
+            {createMutation.isPending ? (
+              <>
+                <Spinner /> Creating...
+              </>
+            ) : (
+              <>
+                <Save className="size-3.5" /> Create
+              </>
+            )}
+          </Button>
+          <Button
+            type="button"
+            variant="outline"
+            size="sm"
+            onClick={() => navigate("/console/migration/vmimportsources")}
+            disabled={createMutation.isPending}
+          >
+            Cancel
+          </Button>
+        </div>
+      </Section>
+    </div>
+  )
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/routes/MigrationSourceEditPage.tsx b/packages/system/dashboard/images/console/apps/console/src/routes/MigrationSourceEditPage.tsx
new file mode 100644
index 0000000000..9b7890c8fe
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/routes/MigrationSourceEditPage.tsx
@@ -0,0 +1,176 @@
+import { useEffect, useRef, useState } from "react"
+import { useNavigate, useParams } from "react-router"
+import { Plug, Save } from "lucide-react"
+import { Button, Section, Spinner } from "@cozystack/ui"
+import { useK8sGet, useK8sUpdate } from "@cozystack/k8s-client"
+import { useTenantContext } from "../lib/tenant-context.tsx"
+import { useCRDSchema } from "../lib/use-crd-schema.ts"
+import { prepareUpdateSpec } from "../lib/prepare-update.ts"
+import { SchemaForm, type SchemaFormHandle } from "../components/SchemaForm.tsx"
+import {
+  MIGRATION_GROUP,
+  MIGRATION_VERSION,
+  type MigrationResource,
+} from "../lib/migration.ts"
+
+/**
+ * Editing a connection, which import tasks deliberately do not get.
+ *
+ * A source is long-lived: passwords rotate, a CA expires, and an ESXi host
+ * moves to an address the cluster can reach. Without this page the only way to
+ * change any of that is kubectl, which is not an answer for the audience this
+ * API is for. A task is the opposite — a one-shot operation whose every spec
+ * field is immutable on admission, so an edit form for one would offer changes
+ * the API server rejects.
+ */
+export function MigrationSourceEditPage() {
+  const { name } = useParams<{ name: string }>()
+  const navigate = useNavigate()
+  const { tenantNamespace } = useTenantContext()
+  const [formData, setFormData] = useState<Record<string, unknown>>({})
+  const initializedRef = useRef(false)
+  // The spec as it was when the form initialised, so the immutable-field
+  // overlay writes back what the user actually saw rather than whatever a
+  // refetch produced in the meantime.
+  const initialSpecRef = useRef<unknown>(null)
+  const schemaFormRef = useRef<SchemaFormHandle>(null)
+
+  const { schema, isLoading: schemaLoading } = useCRDSchema("vmimportsources.forklift.cozystack.io")
+
+  const { data: resource, isLoading: resourceLoading, error } = useK8sGet<MigrationResource>(
+    {
+      apiGroup: MIGRATION_GROUP,
+      apiVersion: MIGRATION_VERSION,
+      plural: "vmimportsources",
+      name: name ?? "",
+      namespace: tenantNamespace ?? "",
+    },
+    { enabled: !!name && !!tenantNamespace },
+  )
+
+  const updateMutation = useK8sUpdate({
+    apiGroup: MIGRATION_GROUP,
+    apiVersion: MIGRATION_VERSION,
+    plural: "vmimportsources",
+    namespace: tenantNamespace ?? "",
+  })
+
+  // Initialised once: a refetch mid-edit must not discard what is being typed.
+  useEffect(() => {
+    if (resource?.spec && !initializedRef.current) {
+      initializedRef.current = true
+      setFormData(resource.spec)
+      initialSpecRef.current = resource.spec
+    }
+  }, [resource])
+
+  const handleSubmit = async () => {
+    if (!resource || !schema) return
+
+    // The save button sits outside RJSF and bypasses its validation, so ask
+    // for it explicitly; an invalid spec renders inline and aborts the write.
+    if (schemaFormRef.current && !schemaFormRef.current.validate()) return
+
+    const updated = {
+      ...resource,
+      spec: prepareUpdateSpec(formData, initialSpecRef.current, schema),
+    }
+
+    try {
+      await updateMutation.mutateAsync(updated)
+      navigate("/console/migration/vmimportsources")
+    } catch (err) {
+      alert(`Failed to update connection: ${(err as Error).message}`)
+    }
+  }
+
+  if (schemaLoading || resourceLoading) {
+    return (
+      <div className="flex items-center gap-2 p-8 text-slate-500">
+        <Spinner /> Loading...
+      </div>
+    )
+  }
+
+  if (error) {
+    return (
+      <div className="p-8 text-red-600">
+        Failed to load connection: {(error as Error).message}
+      </div>
+    )
+  }
+
+  if (!resource) {
+    return <div className="p-8 text-red-600">Connection not found.</div>
+  }
+
+  if (!schema) {
+    return (
+      <div className="p-8 text-red-600">
+        Failed to load schema. Please refresh the page.
+      </div>
+    )
+  }
+
+  return (
+    <div className="p-6">
+      <div className="mb-5 flex items-center gap-3">
+        <div className="flex size-11 shrink-0 items-center justify-center rounded-md bg-slate-100">
+          <Plug className="size-6 text-slate-600" />
+        </div>
+        <div>
+          <h1 className="text-lg font-semibold text-slate-900">Edit connection</h1>
+          <p className="text-xs text-slate-500">{name}</p>
+        </div>
+      </div>
+
+      <Section>
+        <div className="space-y-4 p-5">
+          <p className="text-xs text-slate-500">
+            Changing the credentials re-tests the connection. Imports already
+            completed are not affected; an import still running keeps the
+            credentials it started with.
+          </p>
+          <SchemaForm
+            ref={schemaFormRef}
+            openAPISchema={schema}
+            formData={formData}
+            onChange={(data) => setFormData((data ?? {}) as Record<string, unknown>)}
+            immutableMode="enforce"
+          >
+            <div className="hidden" />
+          </SchemaForm>
+        </div>
+
+        <div className="flex items-center gap-2 border-t border-slate-200 px-5 py-3">
+          <Button
+            type="button"
+            variant="primary"
+            size="sm"
+            onClick={handleSubmit}
+            disabled={updateMutation.isPending}
+          >
+            {updateMutation.isPending ? (
+              <>
+                <Spinner /> Saving...
+              </>
+            ) : (
+              <>
+                <Save className="size-3.5" /> Save
+              </>
+            )}
+          </Button>
+          <Button
+            type="button"
+            variant="outline"
+            size="sm"
+            onClick={() => navigate("/console/migration/vmimportsources")}
+            disabled={updateMutation.isPending}
+          >
+            Cancel
+          </Button>
+        </div>
+      </Section>
+    </div>
+  )
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/routes/MigrationTaskCreatePage.tsx b/packages/system/dashboard/images/console/apps/console/src/routes/MigrationTaskCreatePage.tsx
new file mode 100644
index 0000000000..44f470cdf0
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/routes/MigrationTaskCreatePage.tsx
@@ -0,0 +1,200 @@
+import { useMemo, useRef, useState } from "react"
+import { useNavigate } from "react-router"
+import { Import, Save } from "lucide-react"
+import { Button, Section, Spinner } from "@cozystack/ui"
+import { useK8sCreate, useK8sList } from "@cozystack/k8s-client"
+import { useTenantContext } from "../lib/tenant-context.tsx"
+import { useCRDSchema } from "../lib/use-crd-schema.ts"
+import { SchemaForm, type SchemaFormHandle } from "../components/SchemaForm.tsx"
+import {
+  MIGRATION_GROUP,
+  MIGRATION_VERSION,
+  type MigrationResource,
+  readyCondition,
+} from "../lib/migration.ts"
+
+export function MigrationTaskCreatePage() {
+  const navigate = useNavigate()
+  const { tenantNamespace } = useTenantContext()
+  const [formData, setFormData] = useState<Record<string, unknown>>({})
+  const [name, setName] = useState("")
+  const schemaFormRef = useRef<SchemaFormHandle>(null)
+
+  const { schema, isLoading: schemaLoading } = useCRDSchema("vmimporttasks.forklift.cozystack.io")
+
+  // sourceRef.name is a dropdown served by the vmimportsource option provider,
+  // but the list is also read here to warn about a connection that is not ready
+  // yet: starting an import against one only produces a task that sits Pending.
+  const { data: sources } = useK8sList<MigrationResource>({
+    apiGroup: MIGRATION_GROUP,
+    apiVersion: MIGRATION_VERSION,
+    plural: "vmimportsources",
+    namespace: tenantNamespace ?? "",
+  }, { enabled: !!tenantNamespace })
+
+  const createMutation = useK8sCreate({
+    apiGroup: MIGRATION_GROUP,
+    apiVersion: MIGRATION_VERSION,
+    plural: "vmimporttasks",
+    namespace: tenantNamespace ?? "",
+  })
+
+  const selectedSource = (formData as { sourceRef?: { name?: string } }).sourceRef?.name
+  const sourceWarning = useMemo(() => {
+    const items = sources?.items ?? []
+    if (items.length === 0) {
+      return "No source connections exist yet. Add one before starting an import."
+    }
+    if (!selectedSource) return null
+    const source = items.find((s) => s.metadata.name === selectedSource)
+    if (!source) return null
+    const ready = readyCondition(source)
+    if (ready?.status === "True") return null
+    return `Connection "${selectedSource}" is not ready${
+      ready?.message ? `: ${ready.message}` : ""
+    }. The import will wait until it is.`
+  }, [sources, selectedSource])
+
+  const handleSubmit = async () => {
+    if (!tenantNamespace) {
+      alert("Tenant namespace is not available. Please refresh.")
+      return
+    }
+    if (!name.trim()) {
+      alert("Name is required")
+      return
+    }
+    if (schemaFormRef.current && !schemaFormRef.current.validate()) return
+
+    const spec = formData as { sourceRef?: { name?: string }; vms?: unknown[] }
+    if (!spec.sourceRef?.name) {
+      alert("A source connection is required")
+      return
+    }
+    if (!spec.vms || spec.vms.length === 0) {
+      alert("Add at least one machine to import")
+      return
+    }
+
+    const resource = {
+      apiVersion: `${MIGRATION_GROUP}/${MIGRATION_VERSION}`,
+      kind: "VMImportTask",
+      metadata: {
+        name: name.trim(),
+        namespace: tenantNamespace,
+      },
+      spec: formData,
+    }
+
+    try {
+      await createMutation.mutateAsync(resource)
+      navigate("/console/migration/vmimporttasks")
+    } catch (err) {
+      alert(`Failed to start the import: ${(err as Error).message}`)
+    }
+  }
+
+  if (schemaLoading) {
+    return (
+      <div className="flex items-center gap-2 p-8 text-slate-500">
+        <Spinner /> Loading schema...
+      </div>
+    )
+  }
+
+  if (!schema) {
+    return (
+      <div className="p-8 text-red-600">
+        Failed to load the VMImportTask schema. Is the migration-controller package enabled?
+      </div>
+    )
+  }
+
+  return (
+    <div className="p-6">
+      <div className="mb-5 flex items-center gap-3">
+        <div className="flex size-11 shrink-0 items-center justify-center rounded-md bg-slate-100">
+          <Import className="size-6 text-slate-600" />
+        </div>
+        <div>
+          <h1 className="text-lg font-semibold text-slate-900">New import</h1>
+          <p className="text-xs text-slate-500">
+            Name the machines to import. Each one becomes a virtual machine with its own
+            disks, which stay after this import is deleted.
+          </p>
+        </div>
+      </div>
+
+      <Section>
+        <div className="space-y-4 p-5">
+          <div>
+            <label htmlFor="task-name" className="mb-1 block text-sm font-medium text-slate-700">
+              Import name <span className="text-red-500">*</span>
+            </label>
+            <input
+              id="task-name"
+              type="text"
+              value={name}
+              onChange={(e) => setName(e.target.value)}
+              placeholder="import-web-tier"
+              className="w-full rounded-lg border border-slate-300 bg-white px-3 py-2 text-sm text-slate-900 outline-none focus:border-blue-400 focus:ring-1 focus:ring-blue-400"
+              required
+            />
+          </div>
+
+          {sourceWarning && (
+            <div className="rounded-lg border border-yellow-200 bg-yellow-50 px-3 py-2 text-xs text-yellow-800">
+              {sourceWarning}
+            </div>
+          )}
+
+          <div className="rounded-lg border border-slate-200 bg-slate-50 px-3 py-2 text-xs text-slate-600">
+            Each machine is identified by its managed-object reference from vSphere
+            (<code className="font-mono">vm-1234</code>) — visible in the vSphere client
+            URL, or from <code className="font-mono">govc ls -i</code>.
+          </div>
+
+          <div>
+            <SchemaForm
+              ref={schemaFormRef}
+              openAPISchema={schema}
+              formData={formData}
+              onChange={(data) => setFormData((data ?? {}) as Record<string, unknown>)}
+            >
+              <div className="hidden" />
+            </SchemaForm>
+          </div>
+        </div>
+
+        <div className="flex items-center gap-2 border-t border-slate-200 px-5 py-3">
+          <Button
+            type="button"
+            variant="primary"
+            size="sm"
+            onClick={handleSubmit}
+            disabled={createMutation.isPending}
+          >
+            {createMutation.isPending ? (
+              <>
+                <Spinner /> Starting...
+              </>
+            ) : (
+              <>
+                <Save className="size-3.5" /> Start import
+              </>
+            )}
+          </Button>
+          <Button
+            type="button"
+            variant="outline"
+            size="sm"
+            onClick={() => navigate("/console/migration/vmimporttasks")}
+            disabled={createMutation.isPending}
+          >
+            Cancel
+          </Button>
+        </div>
+      </Section>
+    </div>
+  )
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/routes/MigrationTaskDetailPage.tsx b/packages/system/dashboard/images/console/apps/console/src/routes/MigrationTaskDetailPage.tsx
new file mode 100644
index 0000000000..98ebac05b3
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/routes/MigrationTaskDetailPage.tsx
@@ -0,0 +1,195 @@
+import { Link, useParams } from "react-router"
+import { Import } from "lucide-react"
+import { Section, Spinner } from "@cozystack/ui"
+import { useK8sGet } from "@cozystack/k8s-client"
+import { useTenantContext } from "../lib/tenant-context.tsx"
+import { formatAge } from "../lib/status.ts"
+import {
+  MIGRATION_GROUP,
+  MIGRATION_VERSION,
+  type MigrationResource,
+  phaseTone,
+  taskProgress,
+} from "../lib/migration.ts"
+
+function PhaseBadge({ phase }: { phase: string | undefined }) {
+  const tone = phaseTone(phase)
+  return (
+    <span
+      className={`inline-flex rounded-full px-2 py-0.5 text-xs font-medium ${
+        tone === "ok"
+          ? "bg-green-100 text-green-800"
+          : tone === "error"
+            ? "bg-red-100 text-red-800"
+            : "bg-yellow-100 text-yellow-800"
+      }`}
+    >
+      {phase ?? "Pending"}
+    </span>
+  )
+}
+
+export function MigrationTaskDetailPage() {
+  const { name } = useParams<{ name: string }>()
+  const { tenantNamespace } = useTenantContext()
+
+  const { data: task, isLoading, error } = useK8sGet<MigrationResource>(
+    {
+      apiGroup: MIGRATION_GROUP,
+      apiVersion: MIGRATION_VERSION,
+      plural: "vmimporttasks",
+      name: name ?? "",
+      namespace: tenantNamespace ?? "",
+    },
+    { enabled: !!name && !!tenantNamespace },
+  )
+
+  if (isLoading) {
+    return (
+      <div className="flex items-center gap-2 p-6 text-sm text-slate-500">
+        <Spinner /> Loading…
+      </div>
+    )
+  }
+
+  if (error || !task) {
+    return (
+      <div className="p-6 text-sm text-red-600">
+        Failed to load import {name}: {(error as Error | null)?.message ?? "not found"}
+      </div>
+    )
+  }
+
+  const vms = task.status?.vms ?? []
+  const overall = taskProgress(task)
+
+  return (
+    <div className="p-6">
+      <div className="mb-5 flex items-center gap-3">
+        <div className="flex size-11 shrink-0 items-center justify-center rounded-md bg-slate-100">
+          <Import className="size-6 text-slate-600" />
+        </div>
+        <div>
+          <h1 className="text-lg font-semibold text-slate-900">{task.metadata.name}</h1>
+          <p className="text-xs text-slate-500">
+            from{" "}
+            <Link
+              to="/console/migration/vmimportsources"
+              className="text-blue-700 hover:underline"
+            >
+              {task.spec?.sourceRef?.name ?? "-"}
+            </Link>
+            {task.metadata.creationTimestamp
+              ? ` · started ${formatAge(task.metadata.creationTimestamp)} ago`
+              : ""}
+          </p>
+        </div>
+        <div className="ml-auto flex items-center gap-3">
+          {overall !== null && overall < 100 && (
+            <span className="text-sm text-slate-500">{overall}%</span>
+          )}
+          <PhaseBadge phase={task.status?.phase} />
+        </div>
+      </div>
+
+      {task.status?.message && (
+        <div
+          className={`mb-4 rounded-lg border px-3 py-2 text-xs ${
+            task.status.phase === "Failed"
+              ? "border-red-200 bg-red-50 text-red-800"
+              : "border-slate-200 bg-slate-50 text-slate-600"
+          }`}
+        >
+          {task.status.message}
+        </div>
+      )}
+
+      <Section>
+        {vms.length === 0 ? (
+          <div className="py-12 text-center text-sm text-slate-500">
+            Nothing has started yet. The import waits until its connection is ready.
+          </div>
+        ) : (
+          <div className="overflow-x-auto">
+            <table className="w-full">
+              <thead>
+                <tr className="border-b border-slate-200 text-left text-xs font-medium uppercase tracking-wider text-slate-500">
+                  <th className="px-5 py-3">Source machine</th>
+                  <th className="px-5 py-3">Phase</th>
+                  <th className="px-5 py-3">Progress</th>
+                  <th className="px-5 py-3">Virtual machine</th>
+                  <th className="px-5 py-3">Disks</th>
+                </tr>
+              </thead>
+              <tbody>
+                {vms.map((vm) => (
+                  <tr key={vm.id} className="border-b border-slate-100">
+                    <td className="px-5 py-3 text-sm text-slate-900">
+                      <div className="font-medium">{vm.name || vm.id}</div>
+                      {vm.name && <div className="font-mono text-xs text-slate-500">{vm.id}</div>}
+                    </td>
+                    <td className="px-5 py-3">
+                      <PhaseBadge phase={vm.phase} />
+                      {vm.message && (
+                        <div className="mt-1 max-w-md text-xs text-slate-500">{vm.message}</div>
+                      )}
+                    </td>
+                    <td className="px-5 py-3">
+                      <div className="flex items-center gap-2">
+                        <div className="h-1.5 w-24 overflow-hidden rounded-full bg-slate-200">
+                          <div
+                            className={`h-full rounded-full ${
+                              vm.phase === "Failed" ? "bg-red-400" : "bg-blue-500"
+                            }`}
+                            style={{ width: `${Math.min(100, Math.max(0, vm.progress ?? 0))}%` }}
+                          />
+                        </div>
+                        <span className="text-xs text-slate-500">{vm.progress ?? 0}%</span>
+                      </div>
+                    </td>
+                    <td className="px-5 py-3 text-sm text-slate-600">
+                      {vm.vmInstance ? (
+                        <Link
+                          to={`/console/vminstances/${vm.vmInstance}`}
+                          className="text-blue-700 hover:underline"
+                        >
+                          {vm.vmInstance}
+                        </Link>
+                      ) : (
+                        "-"
+                      )}
+                    </td>
+                    <td className="px-5 py-3 text-sm text-slate-600">
+                      {vm.disks && vm.disks.length > 0 ? (
+                        <div className="flex flex-col gap-0.5">
+                          {vm.disks.map((disk) => (
+                            <Link
+                              key={disk}
+                              to={`/console/vmdisks/${disk}`}
+                              className="text-blue-700 hover:underline"
+                            >
+                              {disk}
+                            </Link>
+                          ))}
+                        </div>
+                      ) : (
+                        "-"
+                      )}
+                    </td>
+                  </tr>
+                ))}
+              </tbody>
+            </table>
+          </div>
+        )}
+      </Section>
+
+      {/* Stated on the page rather than only in docs: a tenant who is unsure
+          whether cleaning up destroys their machines will never clean up. */}
+      <p className="mt-4 text-xs text-slate-500">
+        Imported machines and disks are ordinary Cozystack objects. Deleting this import
+        removes only the migration machinery.
+      </p>
+    </div>
+  )
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/routes/ModulesPage.test.tsx b/packages/system/dashboard/images/console/apps/console/src/routes/ModulesPage.test.tsx
new file mode 100644
index 0000000000..f130d5a39b
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/routes/ModulesPage.test.tsx
@@ -0,0 +1,200 @@
+import { describe, it, expect, vi, beforeAll } from "vitest"
+import { screen } from "@testing-library/react"
+import userEvent from "@testing-library/user-event"
+import {
+  K8sClient,
+  type K8sList,
+  type APIGroupList,
+} from "@cozystack/k8s-client"
+import { ModulesPage } from "./ModulesPage.tsx"
+import { TenantProvider } from "../lib/tenant-provider.tsx"
+import { SELECTED_TENANT_KEY } from "../lib/constants.ts"
+import { renderWithK8sProvider } from "../test-utils/render.tsx"
+
+function moduleAd(kind: string, plural: string) {
+  return {
+    apiVersion: "cozystack.io/v1alpha1",
+    kind: "ApplicationDefinition",
+    metadata: { name: kind.toLowerCase() },
+    spec: {
+      application: { kind, plural, singular: kind.toLowerCase() },
+      dashboard: { module: true, category: "Administration", description: kind },
+    },
+  }
+}
+
+// root runs monitoring + its own info; kvaps runs its own info and inherits
+// monitoring from root; nobody provides etcd.
+const ROOT_TN = {
+  apiVersion: "core.cozystack.io/v1alpha1",
+  kind: "TenantNamespace",
+  metadata: {
+    name: "tenant-root",
+    labels: {
+      "tenant.cozystack.io/tenant-root": "",
+      "namespace.cozystack.io/monitoring": "tenant-root",
+      "namespace.cozystack.io/info": "tenant-root",
+    },
+  },
+}
+
+const KVAPS_TN = {
+  apiVersion: "core.cozystack.io/v1alpha1",
+  kind: "TenantNamespace",
+  metadata: {
+    name: "tenant-kvaps",
+    labels: {
+      "tenant.cozystack.io/tenant-root": "",
+      "tenant.cozystack.io/tenant-kvaps": "",
+      "namespace.cozystack.io/monitoring": "tenant-root",
+      "namespace.cozystack.io/info": "tenant-kvaps",
+    },
+  },
+}
+
+const TENANT_MODULES = [
+  {
+    apiVersion: "core.cozystack.io/v1alpha1",
+    kind: "TenantModule",
+    metadata: {
+      name: "monitoring",
+      namespace: "tenant-root",
+      labels: { "apps.cozystack.io/application.kind": "Monitoring" },
+    },
+  },
+]
+
+function makeClient(
+  extraModules: unknown[] = [],
+  tns: unknown[] = [ROOT_TN, KVAPS_TN],
+): K8sClient {
+  const client = new K8sClient()
+  vi.spyOn(client, "list").mockImplementation(async (_g, _v, plural) => {
+    const items =
+      plural === "applicationdefinitions"
+        ? [moduleAd("Info", "infos"), moduleAd("Monitoring", "monitorings"), moduleAd("Etcd", "etcds")]
+        : plural === "tenantnamespaces"
+          ? tns
+          : plural === "tenantmodules"
+            ? [...TENANT_MODULES, ...extraModules]
+            : []
+    return {
+      apiVersion: "v1",
+      kind: `${plural}List`,
+      metadata: {},
+      items,
+    } as K8sList<unknown>
+  })
+  vi.spyOn(client, "getApiGroups").mockResolvedValue({
+    kind: "APIGroupList",
+    apiVersion: "v1",
+    groups: [],
+  } as APIGroupList)
+  return client
+}
+
+beforeAll(() => {
+  const store = new Map<string, string>([[SELECTED_TENANT_KEY, "kvaps"]])
+  vi.stubGlobal("localStorage", {
+    getItem: (k: string) => store.get(k) ?? null,
+    setItem: (k: string, v: string) => void store.set(k, v),
+    removeItem: (k: string) => void store.delete(k),
+    clear: () => store.clear(),
+  })
+})
+
+describe("ModulesPage tenant tree with module chips", () => {
+  it("shows local and inherited chips per tenant by provider namespace", async () => {
+    renderWithK8sProvider(
+      <TenantProvider>
+        <ModulesPage />
+      </TenantProvider>,
+      { client: makeClient(), initialRoute: "/admin/modules" },
+    )
+
+    // root shows its local monitoring chip.
+    expect(await screen.findByText("root")).toBeInTheDocument()
+    expect(screen.getByTitle("Monitoring runs in root")).toBeInTheDocument()
+
+    // kvaps ends up with no chips at all (info filtered, monitoring covered
+    // by root's own chip) — the whole tenant is hidden, and root shows the
+    // hidden-children counter instead.
+    expect(screen.queryByText("kvaps")).not.toBeInTheDocument()
+    expect(screen.getByText("+ 1 tenant")).toBeInTheDocument()
+
+    // Info is installed everywhere by default — filtered out entirely.
+    expect(screen.queryByText("Info")).not.toBeInTheDocument()
+
+    // kvaps inherits monitoring from root, but root's row already shows the
+    // module as its own green chip — no redundant inherited chip.
+    expect(screen.queryByTitle("Inherited from tenant root, which you cannot open")).not.toBeInTheDocument()
+
+    // Nobody provides etcd → no Etcd chip anywhere.
+    expect(screen.queryByText("Etcd")).not.toBeInTheDocument()
+  })
+
+  it("collapses a tenant's chips and subtenants via the name toggle", async () => {
+    const user = userEvent.setup()
+    renderWithK8sProvider(
+      <TenantProvider>
+        <ModulesPage />
+      </TenantProvider>,
+      { client: makeClient(), initialRoute: "/admin/modules" },
+    )
+
+    expect(await screen.findByTitle("Monitoring runs in root")).toBeInTheDocument()
+    // root is the only expandable node in this fixture.
+    await user.click(screen.getByTitle("Collapse"))
+    expect(screen.queryByTitle("Monitoring runs in root")).not.toBeInTheDocument()
+    expect(screen.queryByText("+ 1 tenant")).not.toBeInTheDocument()
+    await user.click(screen.getByTitle("Expand"))
+    expect(await screen.findByTitle("Monitoring runs in root")).toBeInTheDocument()
+  })
+
+  it("shows the inherited chip when the providing tenant is not accessible", async () => {
+    // Only kvaps is visible; monitoring comes from tenant-root, which the
+    // user cannot see — the inherited chip is the only trace of the module.
+    renderWithK8sProvider(
+      <TenantProvider>
+        <ModulesPage />
+      </TenantProvider>,
+      { client: makeClient([], [KVAPS_TN]), initialRoute: "/admin/modules" },
+    )
+
+    const chip = await screen.findByTitle("Inherited from tenant root, which you cannot open")
+    expect(chip).toBeInTheDocument()
+    // The chip is deliberately inert: it is rendered only when the providing
+    // tenant is NOT visible, so opening it would deny the instance GET and
+    // switch the active tenant to a namespace outside the visible set, which
+    // the selector then bounces to an arbitrary fallback. It states where the
+    // module comes from and nothing more.
+    expect(chip.tagName).toBe("DIV")
+    expect(chip).not.toHaveAttribute("type", "button")
+  })
+
+  it("shows a chip from the TenantModule watch even before provider labels land", async () => {
+    // A freshly toggled module can surface as a TenantModule before the
+    // TenantNamespace labels update — either live signal must produce a chip.
+    renderWithK8sProvider(
+      <TenantProvider>
+        <ModulesPage />
+      </TenantProvider>,
+      {
+        client: makeClient([
+          {
+            apiVersion: "core.cozystack.io/v1alpha1",
+            kind: "TenantModule",
+            metadata: {
+              name: "etcd",
+              namespace: "tenant-kvaps",
+              labels: { "apps.cozystack.io/application.kind": "Etcd" },
+            },
+          },
+        ]),
+        initialRoute: "/admin/modules",
+      },
+    )
+
+    expect(await screen.findByTitle("Etcd runs in kvaps")).toBeInTheDocument()
+  })
+})
diff --git a/packages/system/dashboard/images/console/apps/console/src/routes/ModulesPage.tsx b/packages/system/dashboard/images/console/apps/console/src/routes/ModulesPage.tsx
new file mode 100644
index 0000000000..0699e1ff11
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/routes/ModulesPage.tsx
@@ -0,0 +1,401 @@
+import { useMemo, useState, type ReactNode } from "react"
+import { useNavigate } from "react-router"
+import { ArrowUpFromLine, ChevronDown, ChevronRight } from "lucide-react"
+import { Section, Spinner, StatusBadge } from "@cozystack/ui"
+import {
+  useK8sList,
+  type K8sResource,
+} from "@cozystack/k8s-client"
+import type {
+  ApplicationDefinition,
+  ApplicationInstance,
+  TenantNamespace,
+} from "@cozystack/types"
+import {
+  iconDataUrl,
+  isTenantModule,
+  useApplicationDefinitions,
+} from "../lib/app-definitions.ts"
+import { useResourceBasePath } from "../lib/portal.ts"
+import { useTenantContext } from "../lib/tenant-context.tsx"
+import {
+  buildTenantForest,
+  relativeTenantName,
+  type TenantTreeNode,
+} from "../lib/tenant-tree.ts"
+import { TENANT_NAMESPACE_PREFIX } from "../lib/constants.ts"
+import { humanizeKind } from "../lib/humanize.ts"
+import { readyCondition } from "../lib/status.ts"
+
+const TENANT_MODULES_REF = {
+  apiGroup: "core.cozystack.io",
+  apiVersion: "v1alpha1",
+  plural: "tenantmodules",
+}
+
+const APP_KIND_LABEL = "apps.cozystack.io/application.kind"
+const PROVIDER_LABEL_PREFIX = "namespace.cozystack.io/"
+
+/**
+ * Administration → Modules: the tenant hierarchy as a connector-line tree —
+ * each tenant's name is followed by its module chips, with child tenants
+ * hanging off a trunk that drops from the parent's name. Per tenant the
+ * `namespace.cozystack.io/<module>` label on its TenantNamespace names the
+ * providing namespace: the tenant itself → a local chip; an inaccessible
+ * ancestor → an inherited chip (blue, up arrow). When the provider is on
+ * screen its own chip already shows the module, so no inherited chip repeats
+ * it. Tenants whose whole subtree has no modules collapse into a
+ * "+ N tenants" pseudo-branch. Clicking a chip opens the module in whichever
+ * tenant runs it.
+ */
+export function ModulesPage() {
+  const { data: defs, isLoading: defsLoading } = useApplicationDefinitions()
+  const { selectTenant } = useTenantContext()
+  const basePath = useResourceBasePath()
+  const navigate = useNavigate()
+  const [collapsed, setCollapsed] = useState<Set<string>>(new Set())
+
+  const toggleCollapse = (ns: string) => {
+    setCollapsed((prev) => {
+      const next = new Set(prev)
+      if (next.has(ns)) next.delete(ns)
+      else next.add(ns)
+      return next
+    })
+  }
+
+  const { data: tnList, isLoading: tnLoading } = useK8sList<TenantNamespace>({
+    apiGroup: "core.cozystack.io",
+    apiVersion: "v1alpha1",
+    plural: "tenantnamespaces",
+  })
+
+  // Cluster-wide TenantModule registry — carries the instance name per
+  // (namespace, kind) for chip navigation targets.
+  const { data: tmList } = useK8sList<K8sResource>(TENANT_MODULES_REF)
+
+  const modules = useMemo(
+    () =>
+      (defs?.items ?? [])
+        .filter(isTenantModule)
+        // Info is installed everywhere by default — pure noise here; it has
+        // its own row action on the Tenants page.
+        .filter((ad) => ad.spec?.application.kind !== "Info")
+        .sort((a, b) =>
+          (a.spec?.application.kind ?? "").localeCompare(
+            b.spec?.application.kind ?? "",
+          ),
+        ),
+    [defs],
+  )
+
+  // TenantModules carry the instance name and a conditions-based status in
+  // the same shape as application instances.
+  const tms = useMemo(() => {
+    const map = new Map<string, K8sResource>()
+    for (const tm of tmList?.items ?? []) {
+      const kind = tm.metadata.labels?.[APP_KIND_LABEL]
+      const ns = tm.metadata.namespace
+      if (kind && ns) map.set(`${ns}/${kind}`, tm)
+    }
+    return map
+  }, [tmList])
+
+  const roots = useMemo(
+    () => buildTenantForest(tnList?.items ?? []),
+    [tnList],
+  )
+
+  const visibleNs = useMemo(
+    () => new Set((tnList?.items ?? []).map((tn) => tn.metadata.name)),
+    [tnList],
+  )
+
+  // Tenants with no modules anywhere in their subtree are hidden entirely; a
+  // chipless tenant stays only as the container of chipful descendants.
+  const visibleRoots = useMemo(
+    () => roots.filter((r) => subtreeHasModules(r, modules, tms, visibleNs)),
+    [roots, modules, tms, visibleNs],
+  )
+
+  // Open the module instance in the tenant that runs it: the area's own
+  // tenant for local chips, the providing ancestor for inherited ones.
+  const openModule = (providerNs: string, ad: ApplicationDefinition) => {
+    const kind = ad.spec?.application.kind ?? ad.metadata.name
+    const plural = ad.spec?.application.plural ?? ad.metadata.name
+    const name =
+      tms.get(`${providerNs}/${kind}`)?.metadata.name ?? kind.toLowerCase()
+    selectTenant(providerNs.slice(TENANT_NAMESPACE_PREFIX.length))
+    navigate(`${basePath}/${plural}/${name}`)
+  }
+
+  if (defsLoading || tnLoading) {
+    return (
+      <div className="flex items-center gap-2 p-6 text-sm text-slate-500">
+        <Spinner /> Loading modules…
+      </div>
+    )
+  }
+
+  return (
+    <div className="p-6">
+      <div className="mb-5">
+        <h1 className="text-xl font-semibold text-slate-900">Modules</h1>
+        <p className="mt-0.5 text-sm text-slate-500">
+          Modules per tenant across everything you can access.
+        </p>
+      </div>
+
+      {visibleRoots.length === 0 || modules.length === 0 ? (
+        <Section>
+          <p className="py-6 text-center text-sm text-slate-500">No modules.</p>
+        </Section>
+      ) : (
+        <div className="space-y-6">
+          {visibleRoots.map((node) => (
+            <TenantSubtree
+              key={node.tn.metadata.name}
+              node={node}
+              modules={modules}
+              tms={tms}
+              visibleNs={visibleNs}
+              collapsed={collapsed}
+              onToggle={toggleCollapse}
+              onOpen={openModule}
+            />
+          ))}
+        </div>
+      )}
+    </div>
+  )
+}
+
+interface ModuleChip {
+  ad: ApplicationDefinition
+  kind: string
+  provider: string
+  inherited: boolean
+  ready: ReturnType<typeof readyCondition>
+}
+
+function moduleChips(
+  node: TenantTreeNode,
+  modules: ApplicationDefinition[],
+  tms: Map<string, K8sResource>,
+  visibleNs: Set<string>,
+): ModuleChip[] {
+  const ns = node.tn.metadata.name
+  const labels = node.tn.metadata.labels ?? {}
+
+  return modules.flatMap((ad) => {
+    const kind = ad.spec?.application.kind ?? ad.metadata.name
+    // Both lists are live watches, and on a module toggle the TenantModule and
+    // the provider label can land in either order — show the chip on whichever
+    // signal arrives first.
+    const provider =
+      labels[PROVIDER_LABEL_PREFIX + kind.toLowerCase()] ||
+      (tms.has(`${ns}/${kind}`) ? ns : undefined)
+    if (!provider) return []
+    const inherited = provider !== ns
+    // An inherited chip duplicates the provider's own chip whenever that
+    // tenant is on screen — show it only when the provider is not accessible.
+    if (inherited && visibleNs.has(provider)) return []
+    const ready = readyCondition(
+      (tms.get(`${provider}/${kind}`) ?? {}) as ApplicationInstance,
+    )
+    return [{ ad, kind, provider, inherited, ready }]
+  })
+}
+
+function subtreeHasModules(
+  node: TenantTreeNode,
+  modules: ApplicationDefinition[],
+  tms: Map<string, K8sResource>,
+  visibleNs: Set<string>,
+): boolean {
+  return (
+    moduleChips(node, modules, tms, visibleNs).length > 0 ||
+    node.children.some((c) => subtreeHasModules(c, modules, tms, visibleNs))
+  )
+}
+
+/**
+ * One branch of the tree: a continuous vertical trunk drops out of the
+ * parent's area (or continues from the previous sibling's branch) and ends in
+ * a horizontal stub pointing at this row. Non-last branches keep the trunk
+ * running through their whole subtree so it reaches the next sibling.
+ */
+function Branch({
+  isLast,
+  children,
+}: {
+  isLast: boolean
+  children: ReactNode
+}) {
+  return (
+    <div className="relative pl-10">
+      {/* Rounded elbow: drops from the parent above and curves into the row. */}
+      <span className="absolute left-2 top-0 h-[34px] w-4 rounded-bl border-b border-l border-slate-300" />
+      {/* Trunk continues through non-last branches to reach the next sibling. */}
+      {!isLast && (
+        <span className="absolute left-2 top-0 h-full w-px bg-slate-300" />
+      )}
+      <div className="pt-6">{children}</div>
+    </div>
+  )
+}
+
+function TenantSubtree({
+  node,
+  modules,
+  tms,
+  visibleNs,
+  collapsed,
+  onToggle,
+  onOpen,
+}: {
+  node: TenantTreeNode
+  modules: ApplicationDefinition[]
+  tms: Map<string, K8sResource>
+  visibleNs: Set<string>
+  collapsed: Set<string>
+  onToggle: (ns: string) => void
+  onOpen: (providerNs: string, ad: ApplicationDefinition) => void
+}) {
+  const ns = node.tn.metadata.name
+  const chips = moduleChips(node, modules, tms, visibleNs)
+  const shown = node.children.filter((c) =>
+    subtreeHasModules(c, modules, tms, visibleNs),
+  )
+  const hidden = node.children.length - shown.length
+  const hasBranches = shown.length > 0 || hidden > 0
+  const isCollapsed = collapsed.has(ns)
+
+  return (
+    <div>
+      <div className="flex items-center gap-1.5">
+        <p className="truncate text-[15px] font-medium text-slate-900">
+          {relativeTenantName(node)}
+        </p>
+        {(chips.length > 0 || hasBranches) && (
+          <button
+            type="button"
+            onClick={() => onToggle(ns)}
+            title={isCollapsed ? "Expand" : "Collapse"}
+            className="shrink-0 rounded p-0.5 text-slate-400 hover:bg-slate-100 hover:text-slate-700"
+          >
+            {isCollapsed ? (
+              <ChevronRight className="size-4" />
+            ) : (
+              <ChevronDown className="size-4" />
+            )}
+          </button>
+        )}
+      </div>
+      {!isCollapsed && (
+        <>
+      {chips.length > 0 && (
+        // The trunk starts right under the parent's name and runs past the
+        // chips down to the child branches.
+        <div className="relative mt-6">
+          {hasBranches && (
+            // Reaches up through the name→chips gap so the trunk still plugs
+            // into the parent's name.
+            <span className="absolute -top-6 left-2 h-[calc(100%+1.5rem)] w-px bg-slate-300" />
+          )}
+          {/* Chips step aside for the trunk only when one passes; a childless
+              tenant keeps them flush with its own name. */}
+          <div className={`flex flex-wrap gap-2 ${hasBranches ? "pl-7" : ""}`}>
+          {chips.map(({ ad, kind, provider, inherited, ready }) => {
+            const icon = iconDataUrl(ad)
+            // An inherited chip is shown only when its providing tenant is NOT
+            // visible to the user, so there is nothing to open: the instance
+            // GET would be denied and switching the active tenant to a
+            // namespace outside the visible set bounces the selector to an
+            // arbitrary fallback. It stays as a read-only badge that says where
+            // the module comes from.
+            const Chip = inherited ? "div" : "button"
+            return (
+              <Chip
+                key={ad.metadata.name}
+                {...(inherited
+                  ? {}
+                  : { type: "button" as const, onClick: () => onOpen(provider, ad) })}
+                title={
+                  inherited
+                    ? `Inherited from tenant ${provider.slice(TENANT_NAMESPACE_PREFIX.length)}, which you cannot open`
+                    : `${humanizeKind(kind)} runs in ${relativeTenantName(node)}`
+                }
+                className={`group flex w-80 items-center justify-between gap-3 rounded-lg border px-4 py-3 ${
+                  inherited
+                    ? "cursor-default border-blue-200 bg-blue-50"
+                    : "border-slate-200 bg-white transition-shadow hover:shadow-sm"
+                }`}
+              >
+                <div className="flex min-w-0 items-center gap-3">
+                  <div className="size-9 shrink-0 overflow-hidden rounded-md bg-slate-100">
+                    {icon ? (
+                      <img src={icon} alt="" className="h-full w-full" />
+                    ) : null}
+                  </div>
+                  <div className="min-w-0 text-left">
+                    <p className="truncate text-sm font-semibold text-slate-900 group-hover:text-blue-700">
+                      {humanizeKind(kind)}
+                    </p>
+                    <p
+                      className={`truncate font-mono text-[11px] ${inherited ? "text-blue-600" : "text-slate-400"}`}
+                    >
+                      {provider}
+                    </p>
+                  </div>
+                </div>
+                <div className="flex shrink-0 items-center gap-2">
+                  {ready ? (
+                    <StatusBadge tone={ready.status === "True" ? "ok" : "warn"}>
+                      {ready.status === "True" ? "Ready" : (ready.reason ?? "NotReady")}
+                    </StatusBadge>
+                  ) : (
+                    <StatusBadge tone="muted">Unknown</StatusBadge>
+                  )}
+                  {inherited && (
+                    <ArrowUpFromLine className="size-3 text-blue-600" />
+                  )}
+                </div>
+              </Chip>
+            )
+          })}
+          </div>
+        </div>
+      )}
+          {hasBranches && (
+            <div>
+              {shown.map((child, i) => (
+                <Branch
+                  key={child.tn.metadata.name}
+                  isLast={i === shown.length - 1 && hidden === 0}
+                >
+                  <TenantSubtree
+                    node={child}
+                    modules={modules}
+                    tms={tms}
+                    visibleNs={visibleNs}
+                    collapsed={collapsed}
+                    onToggle={onToggle}
+                    onOpen={onOpen}
+                  />
+                </Branch>
+              ))}
+              {hidden > 0 && (
+                <Branch isLast>
+                  <span className="text-xs text-slate-400">
+                    + {hidden} tenant{hidden > 1 ? "s" : ""}
+                  </span>
+                </Branch>
+              )}
+            </div>
+          )}
+        </>
+      )}
+    </div>
+  )
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/routes/NodesPage.test.tsx b/packages/system/dashboard/images/console/apps/console/src/routes/NodesPage.test.tsx
new file mode 100644
index 0000000000..df7b53e3d2
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/routes/NodesPage.test.tsx
@@ -0,0 +1,77 @@
+import { describe, it, expect, vi } from "vitest"
+import { screen, waitFor } from "@testing-library/react"
+import {
+  K8sClient,
+  K8sApiError,
+  type K8sList,
+  type APIGroupList,
+} from "@cozystack/k8s-client"
+import { NodesPage } from "./NodesPage.tsx"
+import { renderWithK8sProvider } from "../test-utils/render.tsx"
+import { nodesListFixture } from "../test-utils/fixtures/nodes.ts"
+import { podsListFixture } from "../test-utils/fixtures/pods.ts"
+
+function makeClient(
+  config: { nodes?: K8sList<unknown> | K8sApiError; pods?: K8sList<unknown> } = {},
+): K8sClient {
+  const client = new K8sClient()
+  vi.spyOn(client, "list").mockImplementation(async (g, _v, plural) => {
+    if (g === "metrics.k8s.io") {
+      return {
+        apiVersion: "metrics.k8s.io/v1beta1",
+        kind: "NodeMetricsList",
+        metadata: {},
+        items: [],
+      } as K8sList<unknown>
+    }
+    if (plural === "nodes") {
+      if (config.nodes instanceof K8sApiError) throw config.nodes
+      return (config.nodes ?? nodesListFixture) as K8sList<unknown>
+    }
+    if (plural === "pods") {
+      return (config.pods ?? podsListFixture) as K8sList<unknown>
+    }
+    return { apiVersion: "v1", kind: `${plural}List`, metadata: {}, items: [] }
+  })
+  vi.spyOn(client, "getApiGroups").mockResolvedValue({
+    kind: "APIGroupList",
+    apiVersion: "v1",
+    groups: [],
+  } as APIGroupList)
+  return client
+}
+
+describe("NodesPage", () => {
+  it("renders the transposed node table with nodes as columns", async () => {
+    const { container } = renderWithK8sProvider(<NodesPage />, { client: makeClient() })
+    expect(await screen.findByText("Nodes")).toBeInTheDocument()
+    // Node names appear as column headers, attributes as rows.
+    expect(await screen.findByText("worker-gpu-1")).toBeInTheDocument()
+    await waitFor(() =>
+      expect(container.querySelector('[data-attribute-row="cpu"]')).not.toBeNull(),
+    )
+    expect(container.querySelector('[data-attribute-row="memory"]')).not.toBeNull()
+  })
+
+  it("renders a permission-denied block with a back link on 403", async () => {
+    renderWithK8sProvider(<NodesPage />, {
+      client: makeClient({ nodes: new K8sApiError(403, "forbidden") }),
+    })
+    expect(
+      await screen.findByText(/you do not have permission to view cluster nodes/i),
+    ).toBeInTheDocument()
+    expect(screen.getByRole("link", { name: /back to console/i }).getAttribute("href")).toBe(
+      "/console",
+    )
+  })
+
+  it("renders the empty state when no nodes exist", async () => {
+    renderWithK8sProvider(<NodesPage />, {
+      client: makeClient({
+        nodes: { apiVersion: "v1", kind: "NodeList", metadata: {}, items: [] } as K8sList<unknown>,
+        pods: { apiVersion: "v1", kind: "PodList", metadata: {}, items: [] } as K8sList<unknown>,
+      }),
+    })
+    expect(await screen.findByText(/no nodes found/i)).toBeInTheDocument()
+  })
+})
diff --git a/packages/system/dashboard/images/console/apps/console/src/routes/NodesPage.tsx b/packages/system/dashboard/images/console/apps/console/src/routes/NodesPage.tsx
new file mode 100644
index 0000000000..d91d47efa6
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/routes/NodesPage.tsx
@@ -0,0 +1,60 @@
+import { Link } from "react-router"
+import { Section, Spinner } from "@cozystack/ui"
+import { useClusterUsageData } from "../hooks/useClusterUsageData.tsx"
+import { ClusterUsageTable } from "../components/cluster-usage/ClusterUsageTable.tsx"
+
+/**
+ * Admin → Resources → Nodes. The per-node breakdown, split out of the
+ * Cluster Usage page onto its own tab. Reads the same useClusterUsageData
+ * composite hook and renders the transposed node table (nodes as columns,
+ * resources/attributes as rows). Gated the same way as Cluster Usage: a
+ * direct hit without `nodes/list` shows a 403 notice with a link back.
+ */
+export function NodesPage() {
+  const { nodes, perNode, aggregates, isLoading, error, errorStatus, podsUnavailable } =
+    useClusterUsageData()
+  const extendedKeys = Object.keys(aggregates.extended).sort()
+
+  return (
+    <div className="space-y-6 p-6">
+      <div>
+        <h1 className="text-xl font-semibold text-slate-900">Nodes</h1>
+        <p className="mt-0.5 text-sm text-slate-500">
+          Per-node capacity, allocation and usage across the cluster, including
+          any discovered extended resources.
+        </p>
+      </div>
+      {isLoading ? (
+        <div className="flex items-center gap-2 text-sm text-slate-500">
+          <Spinner /> Loading…
+        </div>
+      ) : error ? (
+        <Section>
+          {errorStatus === 403 ? (
+            <div className="px-2 py-4 text-sm text-slate-700">
+              You do not have permission to view cluster nodes.{" "}
+              <Link to="/console" className="text-blue-700 underline hover:text-blue-800">
+                Back to console
+              </Link>
+              .
+            </div>
+          ) : (
+            <div className="px-2 py-4 text-sm text-red-700">
+              Failed to load cluster nodes: {error.message}
+            </div>
+          )}
+        </Section>
+      ) : nodes.length === 0 ? (
+        <Section>
+          <p className="py-6 text-center text-sm text-slate-500">No nodes found.</p>
+        </Section>
+      ) : (
+        <ClusterUsageTable
+          rows={perNode}
+          extendedKeys={extendedKeys}
+          podsUnavailable={podsUnavailable}
+        />
+      )}
+    </div>
+  )
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/routes/StorageClassUsagePage.test.tsx b/packages/system/dashboard/images/console/apps/console/src/routes/StorageClassUsagePage.test.tsx
new file mode 100644
index 0000000000..8b4019583b
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/routes/StorageClassUsagePage.test.tsx
@@ -0,0 +1,151 @@
+import { describe, it, expect, vi, beforeAll } from "vitest"
+import { screen, within } from "@testing-library/react"
+import { Route, Routes } from "react-router"
+import { K8sClient, K8sApiError, type K8sList } from "@cozystack/k8s-client"
+import { StorageClassUsagePage } from "./StorageClassUsagePage.tsx"
+import { TenantProvider } from "../lib/tenant-provider.tsx"
+import { renderWithK8sProvider } from "../test-utils/render.tsx"
+
+let seq = 0
+function pvc(
+  namespace: string,
+  storageClassName: string,
+  requested: string,
+  labels: Record<string, string> = {},
+) {
+  return {
+    apiVersion: "v1",
+    kind: "PersistentVolumeClaim",
+    metadata: { name: `pvc-${seq++}`, namespace, labels },
+    spec: { storageClassName, resources: { requests: { storage: requested } } },
+    status: { phase: "Bound" },
+  }
+}
+
+function appDef(kind: string, plural: string) {
+  return {
+    apiVersion: "cozystack.io/v1alpha1",
+    kind: "ApplicationDefinition",
+    metadata: { name: plural },
+    spec: { application: { kind, plural, singular: kind.toLowerCase() } },
+  }
+}
+
+const VM_LABELS = {
+  "apps.cozystack.io/application.kind": "VMInstance",
+  "apps.cozystack.io/application.name": "vm1",
+}
+
+function makeClient(pvcs: unknown[], appDefs: unknown[] = []): K8sClient {
+  const client = new K8sClient()
+  vi.spyOn(client, "list").mockImplementation(async (_g, _v, plural) => {
+    const items =
+      plural === "persistentvolumeclaims"
+        ? pvcs
+        : plural === "applicationdefinitions"
+          ? appDefs
+          : []
+    return { apiVersion: "v1", kind: `${plural}List`, metadata: {}, items } as K8sList<unknown>
+  })
+  return client
+}
+
+// Only the PVC list fails. Rejecting every list would render the same notice
+// no matter which request broke, so the test could not tell them apart.
+function makeFailingClient(error: Error): K8sClient {
+  const client = new K8sClient()
+  vi.spyOn(client, "list").mockImplementation(async (_g, _v, plural) => {
+    if (plural === "persistentvolumeclaims") throw error
+    return { apiVersion: "v1", kind: `${plural}List`, metadata: {}, items: [] } as K8sList<unknown>
+  })
+  return client
+}
+
+function renderPage(client: K8sClient, sc: string) {
+  return renderWithK8sProvider(
+    <TenantProvider>
+      <Routes>
+        <Route path="/sc/*" element={<StorageClassUsagePage />} />
+      </Routes>
+    </TenantProvider>,
+    { client, initialRoute: `/sc/${sc}` },
+  )
+}
+
+beforeAll(() => {
+  if (typeof globalThis.localStorage?.getItem !== "function") {
+    const store = new Map<string, string>()
+    vi.stubGlobal("localStorage", {
+      getItem: (k: string) => store.get(k) ?? null,
+      setItem: (k: string, v: string) => void store.set(k, v),
+      removeItem: (k: string) => void store.delete(k),
+      clear: () => store.clear(),
+    })
+  }
+})
+
+describe("StorageClassUsagePage", () => {
+  it("groups PVCs of the storage class by owning workload, summing requests", async () => {
+    const client = makeClient(
+      [
+        pvc("tenant-foo", "replicated", "5Gi", VM_LABELS),
+        pvc("tenant-foo", "replicated", "5Gi", VM_LABELS),
+        // Different storage class — excluded.
+        pvc("tenant-foo", "fast", "20Gi", VM_LABELS),
+        // Non-tenant namespace — excluded.
+        pvc("cozy-system", "replicated", "100Gi"),
+      ],
+      [appDef("VMInstance", "vminstances")],
+    )
+    const { container } = renderPage(client, "replicated")
+
+    await screen.findByText("vm1")
+    expect(screen.getByText("tenant-foo")).toBeInTheDocument()
+    // 5Gi + 5Gi = 10Gi requested (the fast/system PVCs are excluded). The value
+    // appears in both the row and the total footer.
+    const tbody = container.querySelector("tbody") as HTMLElement
+    expect(within(tbody).getByText(/10(\.0)?Gi/)).toBeInTheDocument()
+    expect(screen.queryByText("cozy-system")).toBeNull()
+  })
+
+  it("links the workload to its application page", async () => {
+    const client = makeClient(
+      [pvc("tenant-root", "replicated", "5Gi", {
+        "apps.cozystack.io/application.kind": "VMInstance",
+        "apps.cozystack.io/application.name": "demo-vm",
+      })],
+      [appDef("VMInstance", "vminstances")],
+    )
+    renderPage(client, "replicated")
+    const link = await screen.findByRole("link", { name: "demo-vm" })
+    expect(link).toHaveAttribute("href", "/console/vminstances/demo-vm/workloads")
+  })
+
+  it("shows an empty state when nothing uses the class", async () => {
+    const client = makeClient([pvc("tenant-foo", "fast", "5Gi", VM_LABELS)])
+    renderPage(client, "replicated")
+    expect(await screen.findByText(/no tenant workloads use/i)).toBeInTheDocument()
+  })
+
+  it("shows a permission notice when the PVC list is forbidden", async () => {
+    const client = makeFailingClient(new K8sApiError(403, { message: "forbidden" }))
+    renderPage(client, "replicated")
+    expect(
+      await screen.findByText(/you do not have permission to view persistent volume claims/i),
+    ).toBeInTheDocument()
+  })
+
+  it("shows a failure notice when the PVC list errors", async () => {
+    const client = makeFailingClient(new K8sApiError(500, { message: "boom" }))
+    renderPage(client, "replicated")
+    expect(
+      await screen.findByText(/failed to load persistent volume claims: boom/i),
+    ).toBeInTheDocument()
+  })
+
+  it("renders the storage class as the heading", async () => {
+    const client = makeClient([])
+    renderPage(client, "replicated")
+    expect(await screen.findByRole("heading", { name: "replicated" })).toBeInTheDocument()
+  })
+})
diff --git a/packages/system/dashboard/images/console/apps/console/src/routes/StorageClassUsagePage.tsx b/packages/system/dashboard/images/console/apps/console/src/routes/StorageClassUsagePage.tsx
new file mode 100644
index 0000000000..6232de34c6
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/routes/StorageClassUsagePage.tsx
@@ -0,0 +1,128 @@
+import { useMemo } from "react"
+import { Link, useParams } from "react-router"
+import { Section, Spinner } from "@cozystack/ui"
+import { useK8sList, K8sApiError } from "@cozystack/k8s-client"
+import { ChevronLeft } from "lucide-react"
+import { parseQuantity, humanizeBytes } from "../lib/k8s-quantity.ts"
+import { workloadOwner } from "../lib/workload.ts"
+import { TENANT_NAMESPACE_PREFIX } from "../lib/constants.ts"
+import { WorkloadCell } from "../components/WorkloadCell.tsx"
+import type { Pvc } from "../lib/cluster-usage/types.ts"
+
+interface UsageRow {
+  namespace: string
+  kind: string
+  name: string
+  requested: number
+}
+
+/**
+ * Admin → Resources → per-StorageClass drill-down. Reached from the Persistent
+ * Storage panel (/admin/capacity/cluster/sc/<class>). Lists the workloads that
+ * own PersistentVolumeClaims in that StorageClass across tenant namespaces,
+ * summing requested storage and grouping by the owning application (the same
+ * Workload abstraction used for the node-resource drill-down). The class name
+ * arrives via a splat param so names with slashes survive routing.
+ */
+export function StorageClassUsagePage() {
+  const params = useParams()
+  const storageClass = params["*"] ?? ""
+
+  const { data, isLoading, error } = useK8sList<Pvc>({
+    apiGroup: "",
+    apiVersion: "v1",
+    plural: "persistentvolumeclaims",
+  })
+
+  const { rows, totalRequested } = useMemo(() => {
+    const byKey = new Map<string, UsageRow>()
+    let totalRequested = 0
+    for (const pvc of data?.items ?? []) {
+      if ((pvc.spec?.storageClassName || "") !== storageClass) continue
+      const namespace = pvc.metadata.namespace ?? "—"
+      if (!namespace.startsWith(TENANT_NAMESPACE_PREFIX)) continue
+      const requested = parseQuantity(pvc.spec?.resources?.requests?.storage ?? "0")
+      const { kind, name } = workloadOwner(pvc.metadata.labels, pvc.metadata.name)
+      const key = `${namespace}/${kind}/${name}`
+      const existing = byKey.get(key)
+      if (existing) existing.requested += requested
+      else byKey.set(key, { namespace, kind, name, requested })
+      totalRequested += requested
+    }
+    const rows = [...byKey.values()].sort((a, b) => b.requested - a.requested)
+    return { rows, totalRequested }
+  }, [data, storageClass])
+
+  return (
+    <div className="space-y-6 p-6">
+      <div>
+        <Link
+          to="/admin/capacity/cluster"
+          className="mb-2 inline-flex items-center gap-1 text-sm text-slate-500 hover:text-slate-700"
+        >
+          <ChevronLeft className="size-3.5" /> Cluster
+        </Link>
+        <h1 className="font-mono text-xl font-semibold break-all text-slate-900">{storageClass}</h1>
+        <p className="mt-0.5 text-sm text-slate-500">
+          Workloads with PersistentVolumeClaims in this StorageClass across all
+          tenants, with their total requested storage.
+        </p>
+      </div>
+
+      {isLoading ? (
+        <div className="flex items-center gap-2 text-sm text-slate-500">
+          <Spinner /> Loading…
+        </div>
+      ) : error ? (
+        <Section>
+          <div className="px-2 py-4 text-sm text-red-700">
+            {error instanceof K8sApiError && error.status === 403
+              ? "You do not have permission to view persistent volume claims."
+              : `Failed to load persistent volume claims: ${error.message}`}
+          </div>
+        </Section>
+      ) : rows.length === 0 ? (
+        <Section>
+          <p className="py-6 text-center text-sm text-slate-500">
+            No tenant workloads use <span className="font-mono">{storageClass}</span>.
+          </p>
+        </Section>
+      ) : (
+        <Section>
+          <table className="w-full text-sm">
+            <thead>
+              <tr className="border-b border-slate-200 bg-slate-50 text-left">
+                <th className="px-3 py-2 font-medium text-slate-600">Tenant (namespace)</th>
+                <th className="px-3 py-2 font-medium text-slate-600">Workload</th>
+                <th className="px-3 py-2 text-right font-medium text-slate-600">Requested</th>
+              </tr>
+            </thead>
+            <tbody className="divide-y divide-slate-100">
+              {rows.map((r) => (
+                <tr key={`${r.namespace}/${r.kind}/${r.name}`} className="hover:bg-slate-50">
+                  <td className="px-3 py-2 text-slate-700">{r.namespace}</td>
+                  <td className="px-3 py-2">
+                    <WorkloadCell namespace={r.namespace} kind={r.kind} name={r.name} />
+                  </td>
+                  <td className="px-3 py-2 text-right tabular-nums text-slate-700">
+                    {humanizeBytes(r.requested)}
+                  </td>
+                </tr>
+              ))}
+            </tbody>
+            <tfoot>
+              <tr className="border-t border-slate-200 bg-slate-50 font-medium">
+                <td className="px-3 py-2 text-slate-700" colSpan={2}>
+                  Total · {rows.length} workload{rows.length === 1 ? "" : "s"}
+                </td>
+                <td className="px-3 py-2 text-right tabular-nums text-slate-700">
+                  {humanizeBytes(totalRequested)}
+                </td>
+              </tr>
+            </tfoot>
+          </table>
+        </Section>
+      )}
+    </div>
+  )
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/routes/StoragePage.tsx b/packages/system/dashboard/images/console/apps/console/src/routes/StoragePage.tsx
new file mode 100644
index 0000000000..08e7735db5
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/routes/StoragePage.tsx
@@ -0,0 +1,20 @@
+import { ClusterStorageSection } from "../components/cluster-usage/ClusterStorageSection.tsx"
+
+/**
+ * Admin → Capacity → Storage. PersistentVolumeClaims across tenant namespaces
+ * aggregated by StorageClass; each class drills down to the consuming
+ * workloads. Split out of the Cluster page onto its own tab.
+ */
+export function StoragePage() {
+  return (
+    <div className="space-y-6 p-6">
+      <div>
+        <h1 className="text-xl font-semibold text-slate-900">Storage</h1>
+        <p className="mt-0.5 text-sm text-slate-500">
+          PersistentVolumeClaims across all tenants, grouped by StorageClass.
+        </p>
+      </div>
+      <ClusterStorageSection />
+    </div>
+  )
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/routes/TapsPage.tsx b/packages/system/dashboard/images/console/apps/console/src/routes/TapsPage.tsx
new file mode 100644
index 0000000000..6a05a9dde4
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/routes/TapsPage.tsx
@@ -0,0 +1,211 @@
+import { useState } from "react"
+import { Package, ShieldAlert } from "lucide-react"
+import { Spinner, StatusBadge } from "@cozystack/ui"
+import { K8sApiError } from "@cozystack/k8s-client"
+import { CORE_GROUP, CORE_VERSION, type Tap } from "@cozystack/types"
+import {
+  useTaps,
+  useConnectTap,
+  useDisconnectTap,
+  deriveTapName,
+} from "../lib/taps.ts"
+
+export function TapsPage() {
+  const { data, isLoading, error } = useTaps()
+  const connect = useConnectTap()
+  const disconnect = useDisconnectTap()
+
+  const [url, setUrl] = useState("")
+  const [secret, setSecret] = useState("")
+  const [query, setQuery] = useState("")
+
+  const onConnect = async () => {
+    const trimmed = url.trim()
+    if (!trimmed) return
+    const body: Tap = {
+      apiVersion: `${CORE_GROUP}/${CORE_VERSION}`,
+      kind: "Tap",
+      metadata: { name: deriveTapName(trimmed) },
+      spec: { url: trimmed, secretRef: secret.trim() || undefined },
+    }
+    try {
+      await connect.mutateAsync(body)
+      setUrl("")
+      setSecret("")
+    } catch (err) {
+      const message = err instanceof K8sApiError ? err.message : String(err)
+      alert(`Failed to connect repository: ${message}`)
+    }
+  }
+
+  const onDisconnect = async (name: string) => {
+    if (!confirm(`Disconnect repository "${name}"? Installed packages stay installed.`)) return
+    try {
+      await disconnect.mutateAsync(name)
+    } catch (err) {
+      const message = err instanceof K8sApiError ? err.message : String(err)
+      alert(`Failed to disconnect: ${message}`)
+    }
+  }
+
+  const taps = data?.items ?? []
+  const q = query.trim().toLowerCase()
+  const visibleTaps = q === "" ? taps : taps.filter((tap) => tapMatches(tap, q))
+
+  return (
+    <div className="p-6">
+      <div className="mb-5">
+        <h1 className="text-xl font-semibold text-slate-900">Repositories</h1>
+        <p className="mt-0.5 text-sm text-slate-500">
+          External-Apps repositories connected to this cluster and the packages they expose.
+        </p>
+      </div>
+
+      <div className="mb-4 rounded-md border border-amber-200 bg-amber-50 px-3 py-2 text-xs text-amber-800">
+        Connecting a repository runs its charts in the management cluster. Connect only sources you
+        trust. The index verifies signatures at publication time; connecting does not verify them.
+      </div>
+
+      <div className="mb-6 flex flex-wrap items-end gap-2 rounded-lg border border-slate-200 bg-white p-4">
+        <label className="flex flex-col text-xs font-medium text-slate-500">
+          Repository (oci:// reference)
+          <input
+            className="mt-1 w-96 rounded-md border border-slate-300 px-2 py-1.5 text-sm text-slate-900"
+            placeholder="oci://ghcr.io/org/repo:tag"
+            value={url}
+            onChange={(e) => setUrl(e.target.value)}
+          />
+        </label>
+        <label className="flex flex-col text-xs font-medium text-slate-500">
+          Pull secret (optional, for private repositories)
+          <input
+            className="mt-1 w-64 rounded-md border border-slate-300 px-2 py-1.5 text-sm text-slate-900"
+            placeholder="cozy-system Secret name"
+            value={secret}
+            onChange={(e) => setSecret(e.target.value)}
+          />
+        </label>
+        <button
+          type="button"
+          className="inline-flex items-center rounded-md bg-slate-900 px-3 py-1.5 text-sm font-medium text-white hover:bg-slate-700 disabled:opacity-50"
+          disabled={!url.trim() || connect.isPending}
+          onClick={onConnect}
+        >
+          Connect
+        </button>
+      </div>
+
+      {isLoading && (
+        <div className="flex items-center gap-2 text-sm text-slate-500">
+          <Spinner /> Loading repositories…
+        </div>
+      )}
+      {error && (
+        <div className="text-sm text-red-600">
+          Failed to load repositories: {(error as Error).message}
+        </div>
+      )}
+
+      {!isLoading && !error && taps.length === 0 && (
+        <div className="rounded-lg border border-dashed border-slate-300 bg-white p-12 text-center text-sm text-slate-500">
+          No repositories connected yet. Connect one above, or with{" "}
+          <code>cozypkg tap</code>.
+        </div>
+      )}
+
+      {taps.length > 0 && (
+        <input
+          className="mb-3 w-96 rounded-md border border-slate-300 px-2 py-1.5 text-sm text-slate-900"
+          placeholder="Search repositories and packages…"
+          value={query}
+          onChange={(e) => setQuery(e.target.value)}
+        />
+      )}
+
+      {taps.length > 0 && visibleTaps.length === 0 && (
+        <div className="rounded-lg border border-dashed border-slate-300 bg-white p-8 text-center text-sm text-slate-500">
+          No repositories or packages match “{query}”.
+        </div>
+      )}
+
+      <div className="space-y-3">
+        {visibleTaps.map((tap) => (
+          <TapCard key={tap.metadata.name} tap={tap} onDisconnect={onDisconnect} />
+        ))}
+      </div>
+    </div>
+  )
+}
+
+// tapMatches reports whether a tap's name, source, or any of its packages match
+// the lowercased query.
+function tapMatches(tap: Tap, q: string): boolean {
+  if (tap.metadata.name.toLowerCase().includes(q)) return true
+  const spec = tap.spec ?? {}
+  if ((spec.source?.name ?? "").toLowerCase().includes(q)) return true
+  return (spec.packages ?? []).some((p) =>
+    [p.name, p.kind, p.description, p.category, ...(p.tags ?? [])]
+      .filter(Boolean)
+      .some((s) => (s as string).toLowerCase().includes(q)),
+  )
+}
+
+function TapCard({ tap, onDisconnect }: { tap: Tap; onDisconnect: (name: string) => void }) {
+  const name = tap.metadata.name
+  const spec = tap.spec ?? {}
+  const packages = spec.packages ?? []
+  return (
+    <div className="rounded-lg border border-slate-200 bg-white p-4">
+      <div className="flex items-start justify-between gap-3">
+        <div>
+          <div className="flex items-center gap-2">
+            <h3 className="text-sm font-semibold text-slate-900">{name}</h3>
+            <span className="rounded bg-slate-100 px-1.5 py-0.5 text-xs text-slate-500">
+              {spec.community ? "external" : "official"}
+            </span>
+            <StatusBadge tone={spec.ready ? "ok" : "warn"}>
+              {spec.ready ? "Ready" : "Pending"}
+            </StatusBadge>
+          </div>
+          {spec.source?.kind && (
+            <p className="mt-0.5 text-xs text-slate-500">
+              {spec.source.kind} {spec.source.name}
+            </p>
+          )}
+          {!spec.ready && spec.message && (
+            <p className="mt-0.5 text-xs text-amber-600">{spec.message}</p>
+          )}
+        </div>
+        {spec.community && (
+          <button
+            type="button"
+            className="inline-flex items-center rounded-md border border-slate-300 px-2.5 py-1 text-xs font-medium text-slate-700 hover:bg-slate-50"
+            onClick={() => onDisconnect(name)}
+          >
+            Disconnect
+          </button>
+        )}
+      </div>
+
+      {packages.length > 0 && (
+        <ul className="mt-3 flex flex-wrap gap-2">
+          {packages.map((pkg) => (
+            <li
+              key={pkg.name}
+              className="flex items-center gap-1 rounded-md border border-slate-200 px-2 py-1 text-xs text-slate-700"
+              title={pkg.description}
+            >
+              <Package className="size-3 text-slate-400" />
+              {pkg.kind || pkg.name}
+              {pkg.privileged && (
+                <span className="flex items-center gap-0.5 text-amber-600">
+                  <ShieldAlert className="size-3" /> privileged
+                </span>
+              )}
+            </li>
+          ))}
+        </ul>
+      )}
+    </div>
+  )
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/routes/TenantsPage.test.tsx b/packages/system/dashboard/images/console/apps/console/src/routes/TenantsPage.test.tsx
new file mode 100644
index 0000000000..035b10fe16
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/routes/TenantsPage.test.tsx
@@ -0,0 +1,111 @@
+import { describe, it, expect, vi, beforeAll } from "vitest"
+import { screen } from "@testing-library/react"
+import userEvent from "@testing-library/user-event"
+import {
+  K8sClient,
+  type K8sList,
+  type APIGroupList,
+} from "@cozystack/k8s-client"
+import { TenantsPage } from "./TenantsPage.tsx"
+import { TenantProvider } from "../lib/tenant-provider.tsx"
+import { SELECTED_TENANT_KEY } from "../lib/constants.ts"
+import { renderWithK8sProvider } from "../test-utils/render.tsx"
+
+function tn(name: string, ancestors: string[]) {
+  const labels: Record<string, string> = {}
+  for (const a of [...ancestors, name]) labels[`tenant.cozystack.io/${a}`] = ""
+  return {
+    apiVersion: "core.cozystack.io/v1alpha1",
+    kind: "TenantNamespace",
+    metadata: { name, labels },
+  }
+}
+
+// Selected tenant "whmcs". The user can see the subtree except
+// tenant-whmcs-a — its child tenant-whmcs-a-b must still render, attached to
+// the nearest visible ancestor.
+const VISIBLE = [
+  tn("tenant-whmcs", ["tenant-root"]),
+  tn("tenant-whmcs-x", ["tenant-root", "tenant-whmcs"]),
+  tn("tenant-whmcs-a-b", ["tenant-root", "tenant-whmcs", "tenant-whmcs-a"]),
+]
+
+function makeClient(): K8sClient {
+  const client = new K8sClient()
+  vi.spyOn(client, "list").mockImplementation(async (_g, _v, plural) => {
+    const items = plural === "tenantnamespaces" ? VISIBLE : []
+    return {
+      apiVersion: "v1",
+      kind: `${plural}List`,
+      metadata: {},
+      items,
+    } as K8sList<unknown>
+  })
+  vi.spyOn(client, "getApiGroups").mockResolvedValue({
+    kind: "APIGroupList",
+    apiVersion: "v1",
+    groups: [],
+  } as APIGroupList)
+  return client
+}
+
+beforeAll(() => {
+  const store = new Map<string, string>([[SELECTED_TENANT_KEY, "whmcs"]])
+  vi.stubGlobal("localStorage", {
+    getItem: (k: string) => store.get(k) ?? null,
+    setItem: (k: string, v: string) => void store.set(k, v),
+    removeItem: (k: string) => void store.delete(k),
+    clear: () => store.clear(),
+  })
+})
+
+describe("TenantsPage tree", () => {
+  it("renders the visible subtree and bridges over an invisible parent", async () => {
+    renderWithK8sProvider(
+      <TenantProvider>
+        <TenantsPage />
+      </TenantProvider>,
+      { client: makeClient(), initialRoute: "/admin/tenants" },
+    )
+
+    // All visible nodes render with names relative to their visible parent,
+    // including the one whose direct parent (tenant-whmcs-a) is not
+    // accessible — it bridges to tenant-whmcs and shows the remaining path.
+    expect(await screen.findByText("x")).toBeInTheDocument()
+    expect(await screen.findByText("a-b")).toBeInTheDocument()
+
+    // Every node offers sub-tenant creation at its own level.
+    expect(
+      screen.getByTitle("Create a sub-tenant under whmcs-a-b"),
+    ).toBeInTheDocument()
+
+    // Edit is offered only where the node's REAL parent is readable, because
+    // that is where its Tenant CR lives. Here that is tenant-whmcs-x alone:
+    // the forest root's parent (tenant-root) is invisible, and so is
+    // tenant-whmcs-a-b's real parent (tenant-whmcs-a) — the latter is the
+    // bridged row, whose Edit used to be live and pointed at a CR named "a-b"
+    // in tenant-whmcs, which does not exist.
+    const editButtons = screen.getAllByRole("button", { name: /edit/i })
+    expect(editButtons).toHaveLength(1)
+    expect(screen.getByTitle("Edit tenant whmcs-x")).toBeInTheDocument()
+    expect(screen.queryByTitle("Edit tenant whmcs-a-b")).not.toBeInTheDocument()
+  })
+
+  it("collapses a subtree via the row toggle", async () => {
+    const user = userEvent.setup()
+    renderWithK8sProvider(
+      <TenantProvider>
+        <TenantsPage />
+      </TenantProvider>,
+      { client: makeClient(), initialRoute: "/admin/tenants" },
+    )
+
+    expect(await screen.findByText("x")).toBeInTheDocument()
+    // whmcs is the only node with children → the only collapse toggle.
+    await user.click(screen.getByTitle("Collapse"))
+    expect(screen.queryByText("x")).not.toBeInTheDocument()
+    expect(screen.queryByText("a-b")).not.toBeInTheDocument()
+    await user.click(screen.getByTitle("Expand"))
+    expect(await screen.findByText("x")).toBeInTheDocument()
+  })
+})
diff --git a/packages/system/dashboard/images/console/apps/console/src/routes/TenantsPage.tsx b/packages/system/dashboard/images/console/apps/console/src/routes/TenantsPage.tsx
new file mode 100644
index 0000000000..2366ee320a
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/routes/TenantsPage.tsx
@@ -0,0 +1,281 @@
+import { useMemo, useState } from "react"
+import { useNavigate } from "react-router"
+import { Plus, Edit, Info, ChevronDown, ChevronRight, CornerDownRight } from "lucide-react"
+import { Spinner, Section, Button } from "@cozystack/ui"
+import { useK8sList } from "@cozystack/k8s-client"
+import { useResourceBasePath } from "../lib/portal.ts"
+import { useTenantContext, tenantDisplayName } from "../lib/tenant-context.tsx"
+import {
+  ancestorNamespaces,
+  buildTenantForest,
+  realParentNamespace,
+  flattenTenantForest,
+  relativeTenantName,
+  type TenantTreeNode,
+} from "../lib/tenant-tree.ts"
+import { TENANT_NAMESPACE_PREFIX } from "../lib/constants.ts"
+import { formatAge } from "../lib/status.ts"
+import { TenantQuotaCompact } from "../components/QuotaDisplay.tsx"
+import type { ResourceQuota } from "../components/QuotaDisplay.tsx"
+
+interface TenantModule {
+  apiVersion: string
+  kind: string
+  metadata: {
+    name: string
+    namespace: string
+  }
+}
+
+const HOST_LABEL = "namespace.cozystack.io/host"
+
+type TreeNode = TenantTreeNode
+
+/**
+ * The Tenant CR of a namespace lives in its parent's namespace under the
+ * short name: `tenant-whmcs-jzmnbwum` under `tenant-whmcs` is CR `jzmnbwum`.
+ * Root-level children (`tenant-kvaps` under `tenant-root`) collapse to the
+ * same rule via the plain `tenant-` prefix strip.
+ */
+function tenantCrName(ns: string, parentNs: string): string {
+  return ns.startsWith(`${parentNs}-`)
+    ? ns.slice(parentNs.length + 1)
+    : ns.slice(TENANT_NAMESPACE_PREFIX.length)
+}
+
+export function TenantsPage() {
+  const { tenants, selectTenant, isLoading } = useTenantContext()
+  const basePath = useResourceBasePath()
+  const navigate = useNavigate()
+  const [collapsed, setCollapsed] = useState<Set<string>>(new Set())
+
+  const toggleCollapse = (ns: string) => {
+    setCollapsed((prev) => {
+      const next = new Set(prev)
+      if (next.has(ns)) next.delete(ns)
+      else next.add(ns)
+      return next
+    })
+  }
+
+  // Get TenantModules from all namespaces to show modules for each tenant
+  const { data: modulesData } = useK8sList<TenantModule>({
+    apiGroup: "core.cozystack.io",
+    apiVersion: "v1alpha1",
+    plural: "tenantmodules",
+  })
+
+  // Cluster-wide ResourceQuota list — one watch instead of N per row
+  const { data: quotasData } = useK8sList<ResourceQuota>({
+    apiGroup: "",
+    apiVersion: "v1",
+    plural: "resourcequotas",
+  })
+
+  // Group non-info modules by namespace (info is always the default, never shown)
+  const modulesByNamespace = useMemo(() => {
+    const map = new Map<string, string[]>()
+    for (const mod of modulesData?.items ?? []) {
+      if (mod.metadata.name === "info") continue
+      const ns = mod.metadata.namespace
+      if (!map.has(ns)) map.set(ns, [])
+      map.get(ns)!.push(mod.metadata.name)
+    }
+    return map
+  }, [modulesData])
+
+  const quotasByNamespace = useMemo(() => {
+    const map = new Map<string, ResourceQuota[]>()
+    for (const q of quotasData?.items ?? []) {
+      const ns = q.metadata.namespace ?? ""
+      if (!map.has(ns)) map.set(ns, [])
+      map.get(ns)!.push(q)
+    }
+    return map
+  }, [quotasData])
+
+  // Which namespaces the user can actually read, for deciding whether a node's
+  // Tenant CR is reachable at all.
+  const visibleNs = useMemo(
+    () => new Set(tenants.map((t) => t.metadata.name)),
+    [tenants],
+  )
+
+  // The context list is the selected tenant's visible subtree (self included).
+  const rows = useMemo(
+    () => flattenTenantForest(buildTenantForest(tenants), collapsed),
+    [tenants, collapsed],
+  )
+
+  // Per-tenant Info: switch the active tenant, then let InfoRedirect resolve
+  // the Info AD's detail route inside the current portal.
+  const openInfo = (node: TreeNode) => {
+    selectTenant(tenantDisplayName(node.tn))
+    navigate(`${basePath}/info`)
+  }
+
+  // Creating a sub-tenant under an arbitrary node reuses the tenant-scoped
+  // order page: switch the active tenant to that node first, then order a
+  // Tenant there. Same drill pattern as inherited modules.
+  const createUnder = (node: TreeNode) => {
+    selectTenant(tenantDisplayName(node.tn))
+    navigate(`${basePath}/new/tenant`)
+  }
+
+  // A node's Tenant CR lives in its REAL parent's namespace, which is not
+  // necessarily the parent it hangs under: a node whose real parent is
+  // inaccessible is bridged onto the nearest visible ancestor. Deriving the CR
+  // from that bridged ancestor names a CR that does not exist, so the edit
+  // target comes from realParentNamespace instead — and is offered only when
+  // that namespace is actually readable, since otherwise there is no CR the
+  // user could open. The hierarchy root (no ancestor labels at all) is
+  // self-referential: its CR (`root`) lives in its own namespace.
+  const isTrueRoot = (node: TreeNode) =>
+    !node.parentNs && ancestorNamespaces(node.tn).length === 0
+  const editParentNs = (node: TreeNode) => {
+    if (isTrueRoot(node)) return node.tn.metadata.name
+    const real = realParentNamespace(node.tn)
+    return real && visibleNs.has(real) ? real : undefined
+  }
+  const canEdit = (node: TreeNode) => !!editParentNs(node)
+  const editNode = (node: TreeNode) => {
+    const parentNs = editParentNs(node)
+    if (!parentNs) return
+    selectTenant(parentNs.slice(TENANT_NAMESPACE_PREFIX.length))
+    navigate(`${basePath}/tenants/${tenantCrName(node.tn.metadata.name, parentNs)}/edit`)
+  }
+
+  return (
+    <div className="p-6">
+      <div className="mb-5 flex items-end justify-between">
+        <div>
+          <h1 className="text-xl font-semibold text-slate-900">Tenants</h1>
+          <p className="mt-0.5 text-sm text-slate-500">
+            The visible tenant hierarchy. Create a sub-tenant at any level with
+            its row's <Plus className="inline size-3" /> button.
+          </p>
+        </div>
+      </div>
+      {isLoading ? (
+        <div className="flex items-center gap-2 text-sm text-slate-500">
+          <Spinner /> Loading…
+        </div>
+      ) : rows.length === 0 ? (
+        <Section>
+          <p className="py-6 text-center text-sm text-slate-500">No tenants yet.</p>
+        </Section>
+      ) : (
+        <Section bodyClassName="p-0">
+          <table className="w-full text-sm">
+            <thead>
+              <tr className="border-b border-slate-200 bg-slate-50 text-left text-xs font-medium uppercase tracking-wider text-slate-500">
+                <th className="px-4 py-3">Tenant</th>
+                <th className="px-4 py-3">Host</th>
+                <th className="px-4 py-3">Modules</th>
+                <th className="px-4 py-3">Quotas</th>
+                <th className="px-4 py-3">Age</th>
+                <th className="px-4 py-3"></th>
+              </tr>
+            </thead>
+            <tbody className="divide-y divide-slate-100">
+              {rows.map((node) => {
+                const ns = node.tn.metadata.name
+                const modules = modulesByNamespace.get(ns) ?? []
+                const tenantQuotas = quotasByNamespace.get(ns) ?? []
+                const host = node.tn.metadata.labels?.[HOST_LABEL]
+                return (
+                  <tr key={ns} className="hover:bg-slate-50">
+                    <td className="px-4 py-3">
+                      <div
+                        className="flex items-center gap-1.5"
+                        style={{ paddingLeft: `${node.depth * 20}px` }}
+                      >
+                        {node.children.length > 0 ? (
+                          <button
+                            type="button"
+                            onClick={() => toggleCollapse(ns)}
+                            title={collapsed.has(ns) ? "Expand" : "Collapse"}
+                            className="shrink-0 rounded p-0.5 text-slate-400 hover:bg-slate-100 hover:text-slate-700"
+                          >
+                            {collapsed.has(ns) ? (
+                              <ChevronRight className="size-3.5" />
+                            ) : (
+                              <ChevronDown className="size-3.5" />
+                            )}
+                          </button>
+                        ) : node.depth > 0 ? (
+                          <CornerDownRight className="size-3.5 shrink-0 text-slate-300" />
+                        ) : null}
+                        <div className="min-w-0">
+                          <p className="truncate text-sm font-medium text-slate-900">
+                            {relativeTenantName(node)}
+                          </p>
+                          <p className="truncate font-mono text-[11px] text-slate-400">
+                            {ns}
+                          </p>
+                        </div>
+                      </div>
+                    </td>
+                    <td className="px-4 py-3 text-xs text-slate-600">{host ?? "—"}</td>
+                    <td className="px-4 py-3">
+                      {modules.length > 0 ? (
+                        <div className="flex flex-wrap gap-1">
+                          {modules.map((m) => (
+                            <span
+                              key={m}
+                              className="rounded-full bg-slate-100 px-2 py-0.5 text-[11px] text-slate-600"
+                            >
+                              {m}
+                            </span>
+                          ))}
+                        </div>
+                      ) : (
+                        <span className="text-xs text-slate-400">—</span>
+                      )}
+                    </td>
+                    <td className="px-4 py-3 max-w-xs">
+                      <TenantQuotaCompact quotas={tenantQuotas} />
+                    </td>
+                    <td className="px-4 py-3 tabular-nums text-xs text-slate-500">
+                      {formatAge(node.tn.metadata.creationTimestamp)}
+                    </td>
+                    <td className="px-4 py-3">
+                      <div className="flex justify-end gap-1.5">
+                        <Button
+                          variant="outline"
+                          size="sm"
+                          onClick={() => openInfo(node)}
+                          title={`Open Info of ${tenantDisplayName(node.tn)}`}
+                        >
+                          <Info className="size-3" /> Info
+                        </Button>
+                        <Button
+                          variant="outline"
+                          size="sm"
+                          onClick={() => createUnder(node)}
+                          title={`Create a sub-tenant under ${tenantDisplayName(node.tn)}`}
+                        >
+                          <Plus className="size-3" /> Tenant
+                        </Button>
+                        {canEdit(node) && (
+                          <Button
+                            variant="outline"
+                            size="sm"
+                            onClick={() => editNode(node)}
+                            title={`Edit tenant ${tenantDisplayName(node.tn)}`}
+                          >
+                            <Edit className="size-3" /> Edit
+                          </Button>
+                        )}
+                      </div>
+                    </td>
+                  </tr>
+                )
+              })}
+            </tbody>
+          </table>
+        </Section>
+      )}
+    </div>
+  )
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/routes/detail/ApplicationDetailPage.test.tsx b/packages/system/dashboard/images/console/apps/console/src/routes/detail/ApplicationDetailPage.test.tsx
new file mode 100644
index 0000000000..a015a98bff
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/routes/detail/ApplicationDetailPage.test.tsx
@@ -0,0 +1,152 @@
+import { describe, it, expect, vi } from "vitest"
+import { render, screen } from "@testing-library/react"
+import { MemoryRouter, Routes, Route } from "react-router"
+import { K8sApiError } from "@cozystack/k8s-client"
+
+// Drive useK8sGet's result per test; the page's loading/error guards are the unit under test.
+const h = vi.hoisted(() => ({
+  get: { data: undefined as unknown, isLoading: true, error: undefined as unknown },
+  appKind: "Postgres",
+  appPlural: "postgreses",
+  tabLabels: [] as string[],
+  configMaps: [] as unknown[],
+  configMapsError: undefined as unknown,
+}))
+
+vi.mock("@cozystack/k8s-client", async (importOriginal) => ({
+  K8sApiError: (await importOriginal<typeof import("@cozystack/k8s-client")>()).K8sApiError,
+  useK8sGet: () => h.get,
+  useK8sDelete: () => ({ mutateAsync: vi.fn() }),
+  // Presence probes (use-resource-presence.ts) — report empty lists.
+  useK8sList: (ref: { plural: string }) => ref.plural === "configmaps"
+    ? { data: { items: h.configMaps }, error: h.configMapsError, isLoading: false }
+    : { data: { items: [] }, isLoading: false },
+}))
+vi.mock("../../lib/app-definitions.ts", () => ({
+  useApplicationDefinitions: () => ({
+    data: {
+      items: [
+        {
+          metadata: { name: "app" },
+          spec: { application: { plural: h.appPlural, kind: h.appKind } },
+        },
+      ],
+    },
+  }),
+  appDisplayName: () => h.appKind,
+  iconDataUrl: () => null,
+  releasePrefix: () => "",
+  isTenantModule: () => false,
+}))
+vi.mock("../../lib/tenant-context.tsx", () => ({
+  useTenantContext: () => ({ tenantNamespace: "tenant-test" }),
+}))
+// Stub the tab tree — the loading/error branches return before any tab renders,
+// and these modules pull heavy deps (noVNC, Monaco) we don't want in jsdom.
+// The tab bar is the unit under test for ordering, so it records what it is given.
+vi.mock("./tabs.tsx", () => ({
+  TabBar: ({ tabs }: { tabs: { label: string }[] }) => {
+    h.tabLabels = tabs.map((t) => t.label)
+    return null
+  },
+}))
+vi.mock("./OverviewTab.tsx", () => ({ OverviewTab: () => null }))
+vi.mock("./WorkloadsTab.tsx", () => ({ WorkloadsTab: () => null }))
+vi.mock("./ServicesTab.tsx", () => ({ ServicesTab: () => null }))
+vi.mock("./IngressesTab.tsx", () => ({ IngressesTab: () => null }))
+vi.mock("./SecretsTab.tsx", () => ({ SecretsTab: () => null }))
+vi.mock("./EventsTab.tsx", () => ({ EventsTab: () => null }))
+vi.mock("./VncTab.tsx", () => ({ VncTab: () => null }))
+vi.mock("./SerialTab.tsx", () => ({ SerialTab: () => null }))
+vi.mock("./VMPowerControls.tsx", () => ({ VMPowerControls: () => null }))
+
+const { ApplicationDetailPage } = await import("./ApplicationDetailPage.tsx")
+
+function renderPage() {
+  return render(
+    <MemoryRouter initialEntries={[`/console/${h.appPlural}/demo`]}>
+      <Routes>
+        <Route path="/console/:plural/:name" element={<ApplicationDetailPage />} />
+      </Routes>
+    </MemoryRouter>,
+  )
+}
+
+describe("ApplicationDetailPage guards", () => {
+  it("renders the not-found message on a failed GET instead of an infinite spinner", () => {
+    // Regression: previously `isLoading || !instance || !ad` ran before the
+    // error branch, so a failed GET (isLoading=false, instance=undefined) spun
+    // forever and the error branch was unreachable.
+    h.get = { data: undefined, isLoading: false, error: new Error("403 Forbidden") }
+    renderPage()
+    expect(screen.getByText("not found.", { exact: false })).toBeInTheDocument()
+    expect(screen.queryByText("Loading…")).not.toBeInTheDocument()
+  })
+
+  it("still shows the spinner while the instance is loading", () => {
+    h.get = { data: undefined, isLoading: true, error: undefined }
+    renderPage()
+    expect(screen.getByText("Loading…")).toBeInTheDocument()
+  })
+})
+
+describe("ApplicationDetailPage tabs for a virtual machine", () => {
+  it("leads with the consoles, serial first", () => {
+    h.appKind = "VMInstance"
+    h.appPlural = "vminstances"
+    h.get = {
+      data: { kind: "VMInstance", metadata: { name: "demo", namespace: "tenant-test" } },
+      isLoading: false,
+      error: undefined,
+    }
+    h.tabLabels = []
+
+    renderPage()
+
+    // Reaching a console is why people open a VM, and serial is the one that
+    // carries text. VNC stays for the cases it cannot reach.
+    expect(h.tabLabels).toEqual([
+      "Overview",
+      "Console",
+      "VNC",
+      "Workloads",
+      "Services",
+      "Events",
+    ])
+  })
+})
+
+describe("ApplicationDetailPage configuration", () => {
+  it("offers ConfigMaps declared by the application's resource map", () => {
+    h.appKind = "FoundationDB"
+    h.appPlural = "foundationdbs"
+    h.get = {
+      data: { kind: "FoundationDB", metadata: { name: "demo", namespace: "tenant-test" } },
+      isLoading: false,
+      error: undefined,
+    }
+    h.configMaps = [{ metadata: { name: "demo-resourcemap" }, data: {
+      resources: "- apiVersion: v1\n  kind: ConfigMap\n  name: foundationdb-demo-config",
+    } }]
+    h.tabLabels = []
+    renderPage()
+    expect(h.tabLabels).toContain("ConfigMaps")
+  })
+
+  it("drops the ConfigMaps tab when the resource map stops being readable", () => {
+    h.appKind = "FoundationDB"
+    h.appPlural = "foundationdbs"
+    h.get = {
+      data: { kind: "FoundationDB", metadata: { name: "demo", namespace: "tenant-test" } },
+      isLoading: false,
+      error: undefined,
+    }
+    h.configMaps = [{ metadata: { name: "demo-resourcemap" }, data: {
+      resources: "- apiVersion: v1\n  kind: ConfigMap\n  name: foundationdb-demo-config",
+    } }]
+    h.configMapsError = new K8sApiError(403, "forbidden")
+    h.tabLabels = []
+    renderPage()
+    expect(h.tabLabels).not.toContain("ConfigMaps")
+  })
+})
diff --git a/packages/system/dashboard/images/console/apps/console/src/routes/detail/ApplicationDetailPage.tsx b/packages/system/dashboard/images/console/apps/console/src/routes/detail/ApplicationDetailPage.tsx
new file mode 100644
index 0000000000..55fa684b83
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/routes/detail/ApplicationDetailPage.tsx
@@ -0,0 +1,269 @@
+import { lazy, Suspense, useMemo } from "react"
+import {
+  Link,
+  Navigate,
+  Route,
+  Routes,
+  useNavigate,
+  useParams,
+} from "react-router"
+import { ChevronLeft, Edit, Trash2 } from "lucide-react"
+import { Button, Spinner, StatusBadge } from "@cozystack/ui"
+import {
+  useK8sGet,
+  useK8sDelete,
+} from "@cozystack/k8s-client"
+import {
+  APPS_GROUP,
+  APPS_VERSION,
+  type ApplicationInstance,
+} from "@cozystack/types"
+import { useApplicationDefinitions, isTenantModule } from "../../lib/app-definitions.ts"
+import { useTenantContext } from "../../lib/tenant-context.tsx"
+import {
+  appDisplayName,
+  iconDataUrl,
+} from "../../lib/app-definitions.ts"
+import { readyCondition } from "../../lib/status.ts"
+import { TabBar } from "./tabs.tsx"
+import { OverviewTab } from "./OverviewTab.tsx"
+import { WorkloadsTab } from "./WorkloadsTab.tsx"
+import { ServicesTab } from "./ServicesTab.tsx"
+import { IngressesTab } from "./IngressesTab.tsx"
+import { SecretsTab } from "./SecretsTab.tsx"
+import { EventsTab } from "./EventsTab.tsx"
+import { VncTab } from "./VncTab.tsx"
+// Lazy-loaded so xterm and its stylesheet are code-split into their own chunk,
+// fetched only when a VM's console is opened. Every dashboard page reaches this
+// file, and most of them never touch a VM.
+const SerialTab = lazy(() => import("./SerialTab.tsx").then((m) => ({ default: m.SerialTab })))
+import { VMPowerControls } from "./VMPowerControls.tsx"
+import { useResourceBasePath } from "../../lib/portal.ts"
+import { useResourcePresence } from "./use-resource-presence.ts"
+import { useApplicationConfigMaps } from "./use-app-configmaps.ts"
+import { ConfigMapsTab } from "./ConfigMapsTab.tsx"
+
+export function ApplicationDetailPage() {
+  const { plural, name } = useParams<{ plural: string; name: string }>()
+  const { data: defs } = useApplicationDefinitions()
+  const { tenantNamespace } = useTenantContext()
+  const navigate = useNavigate()
+  const basePath = useResourceBasePath()
+
+  const ad = useMemo(
+    () =>
+      defs?.items.find((d) => d.spec?.application.plural === plural),
+    [defs, plural],
+  )
+
+  const { data: instance, isLoading, error } = useK8sGet<ApplicationInstance>(
+    {
+      apiGroup: APPS_GROUP,
+      apiVersion: APPS_VERSION,
+      plural: plural ?? "",
+      name: name ?? "",
+      namespace: tenantNamespace ?? "",
+    },
+    {
+      enabled: !!plural && !!name && !!tenantNamespace,
+      refetchInterval: 5000, // Auto-refresh every 5 seconds
+    },
+  )
+
+  const del = useK8sDelete({
+    apiGroup: APPS_GROUP,
+    apiVersion: APPS_VERSION,
+    plural: plural ?? "",
+    namespace: tenantNamespace ?? undefined,
+  })
+
+  const presence = useResourcePresence(ad, instance)
+  const configMaps = useApplicationConfigMaps(ad, instance, tenantNamespace ?? undefined)
+
+  if (!plural || !name) return <Navigate to="/console" replace />
+  // Check the fetch error before the loading guard: on a failed GET, isLoading
+  // is false and instance stays undefined, so a !instance-first guard would
+  // spin forever and never reach this branch.
+  if (error) {
+    return (
+      <div className="p-8 text-red-600">
+        Application <code>{name}</code> not found.
+      </div>
+    )
+  }
+  if (isLoading || !instance || !ad) {
+    return (
+      <div className="flex items-center gap-2 p-8 text-slate-500">
+        <Spinner /> Loading…
+      </div>
+    )
+  }
+
+  const handleDelete = async () => {
+    if (!confirm(`Delete ${appDisplayName(ad)} "${name}"? This cannot be undone.`)) return
+    try {
+      await del.mutateAsync(name)
+      navigate(`${basePath}/${plural}`)
+    } catch (err) {
+      alert((err as Error).message)
+    }
+  }
+
+  const ready = readyCondition(instance)
+  const icon = iconDataUrl(ad)
+  const base = `${basePath}/${plural}/${name}`
+  const kind = ad.spec?.application.kind
+
+  // Module singletons are reached from the admin trees (Info from Tenants,
+  // every other module from Modules), not from an instance list — send Back
+  // where the user came from instead of the meaningless one-item list.
+  const backTarget = isTenantModule(ad)
+    ? basePath === "/admin"
+      ? kind === "Info"
+        ? "/admin/tenants"
+        : "/admin/modules"
+      : basePath
+    : `${basePath}/${plural}`
+
+  // Absolute URLs so NavLink always rewrites the whole "/<plural>/<name>/..."
+  // suffix instead of appending to the current tab path.
+  const tabs = [{ to: base, label: "Overview", end: true }]
+
+  // Different tab sets for different resource types
+  if (kind === "VMDisk") {
+    // VMDisk: storage-only resource, no workloads/services/ingresses/secrets
+    tabs.push({ to: `${base}/events`, label: "Events", end: false })
+  } else if (kind === "VMInstance") {
+    // VMInstance: VM-specific tabs (no ingresses/secrets). The consoles come
+    // first because reaching one is why people open a VM. Serial leads: text
+    // goes in and out of it directly, while VNC is the one to use where the
+    // serial port cannot reach — a desktop, a bootloader, Windows.
+    tabs.push(
+      { to: `${base}/serial`, label: "Console", end: false },
+      { to: `${base}/vnc`, label: "VNC", end: false },
+      { to: `${base}/workloads`, label: "Workloads", end: false },
+      { to: `${base}/services`, label: "Services", end: false },
+      { to: `${base}/events`, label: "Events", end: false },
+    )
+  } else {
+    // Other resources: offer only the tabs the instance has content for.
+    // Presence is watch-driven, so a tab appears as soon as the chart creates
+    // its first matching resource (e.g. while an app is still provisioning).
+    if (presence.workloads) {
+      tabs.push({ to: `${base}/workloads`, label: "Workloads", end: false })
+    }
+    if (presence.services) {
+      tabs.push({ to: `${base}/services`, label: "Services", end: false })
+    }
+    if (presence.ingresses) {
+      tabs.push({ to: `${base}/ingresses`, label: "Ingresses", end: false })
+    }
+    if (configMaps.names.length > 0 || configMaps.error) {
+      tabs.push({ to: `${base}/configmaps`, label: "ConfigMaps", end: false })
+    }
+    tabs.push(
+      { to: `${base}/secrets`, label: "Secrets", end: false },
+      { to: `${base}/events`, label: "Events", end: false },
+    )
+  }
+
+  return (
+    <div className="flex h-full flex-col">
+      <div className="border-b border-slate-200 bg-white px-6 pt-4">
+        <button
+          type="button"
+          onClick={() => navigate(backTarget)}
+          className="mb-2 flex items-center gap-1 text-xs text-slate-500 hover:text-slate-900"
+        >
+          <ChevronLeft className="size-3.5" /> Back
+        </button>
+        <div className="flex items-start justify-between gap-4">
+          <div className="flex items-center gap-3">
+            <div className="size-11 shrink-0 overflow-hidden rounded-md bg-slate-100">
+              {icon ? <img src={icon} alt="" className="h-full w-full" /> : null}
+            </div>
+            <div>
+              <p className="text-xs uppercase tracking-wider text-slate-500">
+                {appDisplayName(ad)}
+              </p>
+              <h1 className="text-lg font-semibold text-slate-900">{name}</h1>
+            </div>
+            {instance?.metadata.deletionTimestamp ? (
+              <StatusBadge tone="muted">Terminating</StatusBadge>
+            ) : ready ? (
+              <StatusBadge tone={ready.status === "True" ? "ok" : "warn"}>
+                {ready.status === "True" ? "Ready" : (ready.reason ?? "NotReady")}
+              </StatusBadge>
+            ) : null}
+          </div>
+          <div className="flex items-center gap-2">
+            {kind === "VMInstance" && (
+              <VMPowerControls ad={ad} instance={instance} />
+            )}
+            <Link to={`${base}/edit`}>
+              <Button variant="outline" size="sm">
+                <Edit className="size-3.5" /> Edit
+              </Button>
+            </Link>
+            <Button
+              variant="destructive"
+              size="sm"
+              onClick={handleDelete}
+              disabled={del.isPending}
+            >
+              <Trash2 className="size-3.5" /> Delete
+            </Button>
+          </div>
+        </div>
+        <div className="mt-3 -mb-px">
+          <TabBar tabs={tabs} />
+        </div>
+      </div>
+
+      <div className="flex-1 overflow-auto">
+        <Routes>
+          <Route index element={<OverviewTab ad={ad} instance={instance} />} />
+          <Route
+            path="workloads"
+            element={<WorkloadsTab ad={ad} instance={instance} />}
+          />
+          <Route
+            path="services"
+            element={<ServicesTab ad={ad} instance={instance} />}
+          />
+          <Route
+            path="ingresses"
+            element={<IngressesTab ad={ad} instance={instance} />}
+          />
+          <Route
+            path="configmaps"
+            element={<ConfigMapsTab namespace={tenantNamespace ?? ""} names={configMaps.names} error={configMaps.error} />}
+          />
+          <Route
+            path="secrets"
+            element={<SecretsTab ad={ad} instance={instance} />}
+          />
+          <Route
+            path="events"
+            element={<EventsTab ad={ad} instance={instance} />}
+          />
+          <Route
+            path="serial"
+            element={
+              <Suspense
+                fallback={
+                  <div className="flex h-full items-center justify-center p-6">
+                    <Spinner />
+                  </div>
+                }
+              >
+                <SerialTab ad={ad} instance={instance} />
+              </Suspense>
+            }
+          />
+          <Route path="vnc" element={<VncTab ad={ad} instance={instance} />} />
+        </Routes>
+      </div>
+    </div>
+  )
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/routes/detail/ApplicationEditRoute.tsx b/packages/system/dashboard/images/console/apps/console/src/routes/detail/ApplicationEditRoute.tsx
new file mode 100644
index 0000000000..5e4827ccb5
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/routes/detail/ApplicationEditRoute.tsx
@@ -0,0 +1,56 @@
+import { useMemo } from "react"
+import { useParams } from "react-router"
+import { Spinner } from "@cozystack/ui"
+import { useK8sGet } from "@cozystack/k8s-client"
+import {
+  APPS_GROUP,
+  APPS_VERSION,
+  type ApplicationInstance,
+} from "@cozystack/types"
+import { useApplicationDefinitions } from "../../lib/app-definitions.ts"
+import { useTenantContext } from "../../lib/tenant-context.tsx"
+import { ApplicationOrderPage } from "../ApplicationOrderPage.tsx"
+
+/**
+ * Fetches the existing application instance and hands it to ApplicationOrder
+ * Page in edit mode, so the same form serves both create and update flows.
+ */
+export function ApplicationEditRoute() {
+  const { plural, name } = useParams<{ plural: string; name: string }>()
+  const { data: defs } = useApplicationDefinitions()
+  const { tenantNamespace } = useTenantContext()
+
+  const ad = useMemo(
+    () => defs?.items.find((d) => d.spec?.application.plural === plural),
+    [defs, plural],
+  )
+
+  const { data: instance, isLoading } = useK8sGet<ApplicationInstance>(
+    {
+      apiGroup: APPS_GROUP,
+      apiVersion: APPS_VERSION,
+      plural: plural ?? "",
+      name: name ?? "",
+      namespace: tenantNamespace ?? "",
+    },
+    { enabled: !!plural && !!name && !!tenantNamespace },
+  )
+
+  if (isLoading) {
+    return (
+      <div className="flex items-center gap-2 p-8 text-slate-500">
+        <Spinner /> Loading…
+      </div>
+    )
+  }
+  if (!ad || !instance) {
+    return <div className="p-8 text-red-600">Not found.</div>
+  }
+
+  return (
+    <ApplicationOrderPage
+      appNameOverride={ad.metadata.name}
+      editMode={{ name: instance.metadata.name, initialSpec: instance.spec ?? {} }}
+    />
+  )
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/routes/detail/ConfigMapsTab.test.tsx b/packages/system/dashboard/images/console/apps/console/src/routes/detail/ConfigMapsTab.test.tsx
new file mode 100644
index 0000000000..23030d5d43
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/routes/detail/ConfigMapsTab.test.tsx
@@ -0,0 +1,128 @@
+import { afterEach, describe, expect, it, vi } from "vitest"
+import { act, fireEvent, screen, waitFor } from "@testing-library/react"
+import { K8sApiError, K8sClient } from "@cozystack/k8s-client"
+import type { ApplicationDefinition, ApplicationInstance } from "@cozystack/types"
+import { renderWithK8sProvider } from "../../test-utils/render.tsx"
+import { ConfigMapsTab } from "./ConfigMapsTab.tsx"
+import { configMapNames, useApplicationConfigMaps } from "./use-app-configmaps.ts"
+
+const namespace = "tenant-test"
+const clusterFile = "demo:example@192.0.2.1:4500"
+const ad: ApplicationDefinition = {
+  apiVersion: "cozystack.io/v1alpha1", kind: "ApplicationDefinition",
+  metadata: { name: "foundationdb" },
+  spec: { application: { kind: "FoundationDB", plural: "foundationdbs", singular: "foundationdb", openAPISchema: "{}" } },
+}
+const instance: ApplicationInstance = {
+  apiVersion: "apps.cozystack.io/v1alpha1", kind: "FoundationDB",
+  metadata: { name: "demo", namespace },
+}
+const resources = "- apiVersion: v1\n  kind: ConfigMap\n  name: foundationdb-demo-config"
+
+function Configuration() {
+  const maps = useApplicationConfigMaps(ad, instance, namespace)
+  return <ConfigMapsTab namespace={namespace} names={maps.names} error={maps.error} />
+}
+
+function makeClient(error?: Error, map = resources) {
+  const client = new K8sClient()
+  vi.spyOn(client, "watch").mockReturnValue(() => {})
+  vi.spyOn(client, "list").mockImplementation(async (_group, _version, _plural, ns, options) => {
+    expect(ns).toBe(namespace)
+    const name = options?.fieldSelector?.replace("metadata.name=", "")
+    if (name === "foundationdb-demo-resourcemap") {
+      return { apiVersion: "v1", kind: "ConfigMapList", metadata: { resourceVersion: "1" }, items: [
+        { metadata: { name, namespace }, data: { resources: map } },
+      ] }
+    }
+    expect(name).toBe("foundationdb-demo-config")
+    if (error) throw error
+    return { apiVersion: "v1", kind: "ConfigMapList", metadata: { resourceVersion: "1" }, items: [
+      { metadata: { name: "foundationdb-demo-config", namespace }, data: { "cluster-file": clusterFile } },
+    ] }
+  })
+  return client
+}
+
+afterEach(() => {
+  vi.restoreAllMocks()
+  vi.unstubAllGlobals()
+})
+
+describe("application ConfigMaps", () => {
+  it("discovers and reads only the named ConfigMaps in the active namespace", async () => {
+    const client = makeClient()
+    renderWithK8sProvider(<Configuration />, { client })
+    expect(await screen.findByText(clusterFile)).toBeInTheDocument()
+    expect(client.list).toHaveBeenCalledWith("", "v1", "configmaps", namespace, {
+      labelSelector: undefined, fieldSelector: "metadata.name=foundationdb-demo-resourcemap",
+    })
+    expect(client.list).toHaveBeenCalledWith("", "v1", "configmaps", namespace, {
+      labelSelector: undefined, fieldSelector: "metadata.name=foundationdb-demo-config",
+    })
+    expect(client.watch).toHaveBeenCalledWith("", "v1", "configmaps", namespace, "1",
+      expect.any(Function), expect.any(Function), {
+        labelSelector: undefined, fieldSelector: "metadata.name=foundationdb-demo-config",
+      })
+  })
+
+  it("copies the cluster file without base64 decoding", async () => {
+    const writeText = vi.fn().mockResolvedValue(undefined)
+    vi.stubGlobal("navigator", { clipboard: { writeText } })
+    renderWithK8sProvider(<Configuration />, { client: makeClient() })
+    fireEvent.click(await screen.findByRole("button", { name: "Copy cluster-file" }))
+    await waitFor(() => expect(writeText).toHaveBeenCalledWith(clusterFile))
+    expect(await screen.findByText("Copied.")).toBeInTheDocument()
+  })
+
+  it("reports a clipboard failure", async () => {
+    vi.stubGlobal("navigator", { clipboard: { writeText: vi.fn().mockRejectedValue(new Error("Denied")) } })
+    renderWithK8sProvider(<Configuration />, { client: makeClient() })
+    fireEvent.click(await screen.findByRole("button", { name: "Copy cluster-file" }))
+    expect(await screen.findByRole("status")).toHaveTextContent("Could not copy")
+  })
+
+  it("shows a read denial instead of reporting an empty ConfigMap", async () => {
+    renderWithK8sProvider(<Configuration />, { client: makeClient(new K8sApiError(403, "ConfigMap access denied")) })
+    expect(await screen.findByRole("alert")).toHaveTextContent("ConfigMap access denied")
+    expect(screen.queryByText("No configuration values.")).not.toBeInTheDocument()
+  })
+
+  it.each([403, 404])("drops the ConfigMaps when the resource map answers %i after a successful read", async (status) => {
+    const client = makeClient()
+    const { queryClient } = renderWithK8sProvider(<Configuration />, { client })
+    expect(await screen.findByText(clusterFile)).toBeInTheDocument()
+    vi.mocked(client.list).mockRejectedValue(new K8sApiError(status, "resource map unavailable"))
+    await act(() => queryClient.invalidateQueries())
+    expect(await screen.findByText("No ConfigMaps.")).toBeInTheDocument()
+    expect(screen.queryByText(clusterFile)).not.toBeInTheDocument()
+    expect(screen.queryByRole("alert")).not.toBeInTheDocument()
+  })
+
+  it("drops a malformed-map error when the resource map turns forbidden", async () => {
+    const client = makeClient(undefined, "not a list")
+    const { queryClient } = renderWithK8sProvider(<Configuration />, { client })
+    expect(await screen.findByRole("alert")).toHaveTextContent("must contain a list")
+    vi.mocked(client.list).mockRejectedValue(new K8sApiError(403, "resource map unavailable"))
+    await act(() => queryClient.invalidateQueries())
+    expect(await screen.findByText("No ConfigMaps.")).toBeInTheDocument()
+    expect(screen.queryByRole("alert")).not.toBeInTheDocument()
+  })
+
+  it("ignores non-ConfigMap and cross-namespace entries and removes duplicate names", () => {
+    expect(configMapNames(JSON.stringify([
+      { apiVersion: "v1", kind: "ConfigMap", name: "connection" },
+      { apiVersion: "v1", kind: "ConfigMap", name: "connection", namespace },
+      { apiVersion: "v1", kind: "ConfigMap", name: "foreign", namespace: "tenant-other" },
+      { apiVersion: "v1", kind: "Secret", name: "password" },
+      { apiVersion: "other/v1", kind: "ConfigMap", name: "unrelated" },
+      null,
+    ]), namespace)).toEqual(["connection"])
+  })
+
+  it("rejects malformed maps and unsafe resource names", () => {
+    expect(() => configMapNames("{broken", namespace)).toThrow()
+    expect(() => configMapNames("not a list", namespace)).toThrow("must contain a list")
+    expect(() => configMapNames(resources.replace("foundationdb-demo-config", "../secrets"), namespace)).toThrow("invalid ConfigMap name")
+  })
+})
diff --git a/packages/system/dashboard/images/console/apps/console/src/routes/detail/ConfigMapsTab.tsx b/packages/system/dashboard/images/console/apps/console/src/routes/detail/ConfigMapsTab.tsx
new file mode 100644
index 0000000000..c883c827b1
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/routes/detail/ConfigMapsTab.tsx
@@ -0,0 +1,57 @@
+import { useState } from "react"
+import { useK8sList } from "@cozystack/k8s-client"
+import { Button, Section, Spinner } from "@cozystack/ui"
+import type { ConfigMap } from "./use-app-configmaps.ts"
+
+function ConfigValue({ name, value }: { name: string, value: string }) {
+  const [copyResult, setCopyResult] = useState<{ value: string, copied: boolean } | null>(null)
+  const copy = async () => {
+    try {
+      await navigator.clipboard.writeText(value)
+      setCopyResult({ value, copied: true })
+    } catch {
+      setCopyResult({ value, copied: false })
+    }
+  }
+  return (
+    <div className="space-y-2 p-4">
+      <div className="flex items-center justify-between gap-3">
+        <code className="break-all text-xs">{name}</code>
+        <Button size="sm" variant="outline" disabled={!navigator.clipboard} onClick={copy}>
+          Copy {name}
+        </Button>
+      </div>
+      <pre className="max-h-64 overflow-auto whitespace-pre-wrap break-all rounded bg-slate-900 p-3 text-xs text-slate-100">{value || "(empty)"}</pre>
+      {copyResult?.value === value && <p role="status" className="text-xs">{copyResult.copied ? "Copied." : "Could not copy. Select and copy the value manually."}</p>}
+    </div>
+  )
+}
+
+function ConfigMapItem({ namespace, name }: { namespace: string, name: string }) {
+  const { data, isLoading, error } = useK8sList<ConfigMap>(
+    { apiGroup: "", apiVersion: "v1", plural: "configmaps", namespace },
+    { enabled: !!namespace, fieldSelector: `metadata.name=${name}`, retry: false },
+  )
+  const item = data?.items.find((entry) => entry.metadata.name === name)
+  return (
+    <Section title={name} bodyClassName="p-0">
+      {error ? <p role="alert" className="p-4 text-red-600">{error.message}</p>
+        : isLoading ? <div className="flex items-center gap-2 p-4"><Spinner /> Loading…</div>
+        : !item ? <p className="p-4">ConfigMap is not available yet.</p>
+        : Object.keys(item.data ?? {}).length === 0 ? <p className="p-4">No configuration values.</p>
+        : <div className="divide-y divide-slate-100">{Object.entries(item.data ?? {}).map(([key, value]) => (
+          <ConfigValue key={key} name={key} value={value} />
+        ))}</div>}
+    </Section>
+  )
+}
+
+export function ConfigMapsTab({ namespace, names, error }: { namespace: string, names: string[], error: Error | null }) {
+  return (
+    <div className="space-y-6 p-6">
+      {error ? <p role="alert" className="text-red-600">{error.message}</p>
+        : names.length === 0 ? <p>No ConfigMaps.</p>
+        : names.map((name) => <ConfigMapItem key={`${namespace}/${name}`} namespace={namespace} name={name} />)}
+    </div>
+  )
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/routes/detail/EventsTab.test.tsx b/packages/system/dashboard/images/console/apps/console/src/routes/detail/EventsTab.test.tsx
new file mode 100644
index 0000000000..7958bffdb2
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/routes/detail/EventsTab.test.tsx
@@ -0,0 +1,106 @@
+import { describe, it, expect, vi, afterEach } from "vitest"
+import { waitFor, cleanup } from "@testing-library/react"
+import { K8sClient } from "@cozystack/k8s-client"
+import { renderWithK8sProvider } from "../../test-utils/render.tsx"
+import { EventsTab } from "./EventsTab.tsx"
+import type { ApplicationDefinition, ApplicationInstance } from "@cozystack/types"
+
+vi.mock("../../lib/tenant-context.tsx", () => ({
+  useTenantContext: () => ({
+    tenants: [],
+    selectedTenant: "root",
+    selectTenant: () => {},
+    tenantNamespace: "tenant-root",
+    isLoading: false,
+    error: null,
+  }),
+}))
+
+function makeAd(release?: { prefix?: string }): ApplicationDefinition {
+  return {
+    apiVersion: "cozystack.io/v1alpha1",
+    kind: "ApplicationDefinition",
+    metadata: { name: "virtual-machine" },
+    spec: {
+      application: {
+        kind: "VMInstance",
+        plural: "vminstances",
+        singular: "vm-instance",
+        openAPISchema: "{}",
+      },
+      ...(release ? { release } : {}),
+    },
+  }
+}
+
+const instance: ApplicationInstance = {
+  apiVersion: "apps.cozystack.io/v1alpha1",
+  kind: "VMInstance",
+  metadata: { name: "demo-vm", namespace: "tenant-root" },
+}
+
+function makeClient() {
+  const client = new K8sClient()
+  vi.spyOn(client, "list").mockResolvedValue({
+    apiVersion: "v1",
+    kind: "List",
+    metadata: {},
+    items: [],
+  })
+  vi.spyOn(client, "watch").mockReturnValue(() => {})
+  return client
+}
+
+afterEach(() => {
+  cleanup()
+  vi.restoreAllMocks()
+})
+
+describe("EventsTab Helm release selector", () => {
+  it("builds the Helm instance selector from the prefixed release name", async () => {
+    const client = makeClient()
+    renderWithK8sProvider(<EventsTab ad={makeAd()} instance={instance} />, { client })
+
+    // releasePrefix falls back to "<singular>-" so the Helm release is
+    // "vm-instance-demo-vm" — the label child Pods/PVCs actually carry.
+    await waitFor(() =>
+      expect(client.list).toHaveBeenCalledWith(
+        "",
+        "v1",
+        "pods",
+        "tenant-root",
+        expect.objectContaining({
+          labelSelector: "app.kubernetes.io/instance=vm-instance-demo-vm",
+        }),
+      ),
+    )
+    // The old empty-string fallback queried the bare app name, matching nothing.
+    expect(client.list).not.toHaveBeenCalledWith(
+      "",
+      "v1",
+      "pods",
+      "tenant-root",
+      expect.objectContaining({ labelSelector: "app.kubernetes.io/instance=demo-vm" }),
+    )
+  })
+
+  it("honors an explicit release.prefix", async () => {
+    const client = makeClient()
+    renderWithK8sProvider(
+      <EventsTab ad={makeAd({ prefix: "custom-" })} instance={instance} />,
+      { client },
+    )
+
+    await waitFor(() =>
+      expect(client.list).toHaveBeenCalledWith(
+        "",
+        "v1",
+        "persistentvolumeclaims",
+        "tenant-root",
+        expect.objectContaining({
+          labelSelector: "app.kubernetes.io/instance=custom-demo-vm",
+        }),
+      ),
+    )
+  })
+})
diff --git a/packages/system/dashboard/images/console/apps/console/src/routes/detail/EventsTab.tsx b/packages/system/dashboard/images/console/apps/console/src/routes/detail/EventsTab.tsx
new file mode 100644
index 0000000000..70b16d69cd
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/routes/detail/EventsTab.tsx
@@ -0,0 +1,236 @@
+import { useK8sList } from "@cozystack/k8s-client"
+import { Section, Spinner } from "@cozystack/ui"
+import type {
+  ApplicationDefinition,
+  ApplicationInstance,
+} from "@cozystack/types"
+import { useTenantContext } from "../../lib/tenant-context.tsx"
+import { releasePrefix } from "../../lib/app-definitions.ts"
+import { formatAge } from "../../lib/status.ts"
+
+interface EventsTabProps {
+  ad: ApplicationDefinition
+  instance: ApplicationInstance
+}
+
+interface K8sEvent {
+  apiVersion: string
+  kind: string
+  metadata: {
+    name: string
+    namespace: string
+    creationTimestamp: string
+  }
+  involvedObject?: {
+    apiVersion?: string
+    kind?: string
+    name?: string
+    namespace?: string
+    uid?: string
+  }
+  type?: string
+  reason?: string
+  message?: string
+  source?: {
+    component?: string
+    host?: string
+  }
+  firstTimestamp?: string
+  lastTimestamp?: string
+  count?: number
+}
+
+interface K8sPod {
+  apiVersion: string
+  kind: string
+  metadata: {
+    name: string
+  }
+}
+
+interface K8sPVC {
+  apiVersion: string
+  kind: string
+  metadata: {
+    name: string
+  }
+}
+
+export function EventsTab({ ad, instance }: EventsTabProps) {
+  const { tenantNamespace } = useTenantContext()
+
+  const helmReleaseName = releasePrefix(ad) + instance.metadata.name
+
+  const appLabelSelector = [
+    `apps.cozystack.io/application.name=${instance.metadata.name}`,
+    `apps.cozystack.io/application.kind=${instance.kind}`,
+  ].join(",")
+
+  const helmLabelSelector = `app.kubernetes.io/instance=${helmReleaseName}`
+
+  // Load Pods belonging to this application (by app label)
+  const { data: podsList } = useK8sList<K8sPod>(
+    {
+      apiGroup: "",
+      apiVersion: "v1",
+      plural: "pods",
+      namespace: tenantNamespace ?? undefined,
+    },
+    {
+      enabled: !!tenantNamespace,
+      labelSelector: appLabelSelector,
+    },
+  )
+
+  // Load Pods belonging to Helm-managed child resources
+  const { data: helmPodsList } = useK8sList<K8sPod>(
+    {
+      apiGroup: "",
+      apiVersion: "v1",
+      plural: "pods",
+      namespace: tenantNamespace ?? undefined,
+    },
+    {
+      enabled: !!tenantNamespace,
+      labelSelector: helmLabelSelector,
+    },
+  )
+
+  // Load PVCs belonging to this application (by app label)
+  const { data: pvcList } = useK8sList<K8sPVC>(
+    {
+      apiGroup: "",
+      apiVersion: "v1",
+      plural: "persistentvolumeclaims",
+      namespace: tenantNamespace ?? undefined,
+    },
+    {
+      enabled: !!tenantNamespace,
+      labelSelector: appLabelSelector,
+    },
+  )
+
+  // Load PVCs belonging to Helm-managed child resources
+  const { data: helmPvcList } = useK8sList<K8sPVC>(
+    {
+      apiGroup: "",
+      apiVersion: "v1",
+      plural: "persistentvolumeclaims",
+      namespace: tenantNamespace ?? undefined,
+    },
+    {
+      enabled: !!tenantNamespace,
+      labelSelector: helmLabelSelector,
+    },
+  )
+
+  const { data: eventsList, isLoading } = useK8sList<K8sEvent>(
+    {
+      apiGroup: "",
+      apiVersion: "v1",
+      plural: "events",
+      namespace: tenantNamespace ?? undefined,
+    },
+    {
+      enabled: !!tenantNamespace,
+    },
+  )
+
+  // Build set of resource names that belong to this application.
+  // helmReleaseName covers the HelmRelease object itself and any Helm-managed
+  // child resources that share the same name (e.g. DataVolume for VMDisk).
+  const allEvents = eventsList?.items || []
+  const pods = [...(podsList?.items || []), ...(helmPodsList?.items || [])]
+  const pvcs = [...(pvcList?.items || []), ...(helmPvcList?.items || [])]
+  const relatedResourceNames = new Set<string>([
+    instance.metadata.name,
+    helmReleaseName,
+    ...pods.map((pod) => pod.metadata.name),
+    ...pvcs.map((pvc) => pvc.metadata.name),
+  ])
+
+  // Filter events related to this application
+  const events = allEvents.filter(
+    (event) => event.involvedObject?.name && relatedResourceNames.has(event.involvedObject.name)
+  )
+
+  // Sort by lastTimestamp descending (most recent first)
+  const sortedEvents = [...events].sort((a, b) => {
+    const timeA = a.lastTimestamp || a.firstTimestamp || a.metadata.creationTimestamp
+    const timeB = b.lastTimestamp || b.firstTimestamp || b.metadata.creationTimestamp
+    return new Date(timeB).getTime() - new Date(timeA).getTime()
+  })
+
+  if (isLoading) {
+    return (
+      <div className="p-6">
+        <Section title="Events" bodyClassName="p-0">
+          <div className="flex items-center gap-2 px-5 py-4 text-xs text-slate-500">
+            <Spinner /> Loading events…
+          </div>
+        </Section>
+      </div>
+    )
+  }
+
+  if (events.length === 0) {
+    return (
+      <div className="p-6">
+        <Section title="Events" bodyClassName="p-0">
+          <div className="px-5 py-4 text-center text-sm text-slate-500">
+            No events found for this resource.
+          </div>
+        </Section>
+      </div>
+    )
+  }
+
+  return (
+    <div className="p-6">
+      <Section title="Events" bodyClassName="p-0">
+        <ul className="divide-y divide-slate-100">
+          {sortedEvents.map((event) => {
+            const timestamp = event.lastTimestamp || event.firstTimestamp || event.metadata.creationTimestamp
+            const from = event.source?.component || event.source?.host || "-"
+            const typeColor = event.type === "Warning" ? "text-amber-600" : "text-slate-600"
+            const objectName = event.involvedObject
+              ? `${event.involvedObject.kind}/${event.involvedObject.name}`
+              : "-"
+
+            return (
+              <li key={event.metadata.name} className="px-5 py-3">
+                <div className="flex items-start gap-3">
+                  <div className="flex-shrink-0">
+                    <span className={`text-xs font-medium ${typeColor}`}>
+                      {event.type || "Normal"}
+                    </span>
+                  </div>
+                  <div className="flex-1 min-w-0">
+                    <div className="flex items-baseline gap-2 mb-1">
+                      <span className="font-mono text-xs text-slate-700">
+                        {objectName}
+                      </span>
+                      <span className="text-xs font-medium text-slate-900">
+                        {event.reason}
+                      </span>
+                    </div>
+                    <p className="text-sm text-slate-600 break-words">
+                      {event.message}
+                    </p>
+                    <div className="flex items-center gap-3 mt-1.5 text-xs text-slate-500">
+                      <span>{formatAge(timestamp)}</span>
+                      {event.count && event.count > 1 && (
+                        <span>×{event.count}</span>
+                      )}
+                      <span>{from}</span>
+                    </div>
+                  </div>
+                </div>
+              </li>
+            )
+          })}
+        </ul>
+      </Section>
+    </div>
+  )
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/routes/detail/IngressesTab.tsx b/packages/system/dashboard/images/console/apps/console/src/routes/detail/IngressesTab.tsx
new file mode 100644
index 0000000000..628c2714a2
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/routes/detail/IngressesTab.tsx
@@ -0,0 +1,72 @@
+import { useK8sList, type K8sResource } from "@cozystack/k8s-client"
+import { Section, Spinner } from "@cozystack/ui"
+import type { ApplicationDefinition, ApplicationInstance } from "@cozystack/types"
+import { appInstanceLabel } from "../../lib/labels.ts"
+
+interface IngressSpec {
+  rules?: {
+    host?: string
+    http?: { paths?: { path?: string; backend?: { service?: { name: string } } }[] }
+  }[]
+  tls?: { hosts?: string[] }[]
+}
+
+export function IngressesTab({
+  ad,
+  instance,
+}: {
+  ad: ApplicationDefinition
+  instance: ApplicationInstance
+}) {
+  const ns = instance.metadata.namespace ?? ""
+  const { data, isLoading } = useK8sList<K8sResource<IngressSpec>>(
+    { apiGroup: "networking.k8s.io", apiVersion: "v1", plural: "ingresses", namespace: ns },
+    { labelSelector: appInstanceLabel(ad, instance) },
+  )
+  const items = data?.items ?? []
+
+  return (
+    <div className="p-6">
+      <Section title="Ingresses" bodyClassName="p-0">
+        {isLoading ? (
+          <div className="flex items-center gap-2 px-5 py-4 text-xs text-slate-500">
+            <Spinner /> Loading…
+          </div>
+        ) : items.length === 0 ? (
+          <div className="px-5 py-6 text-sm text-slate-500">No ingresses.</div>
+        ) : (
+          <ul className="divide-y divide-slate-100">
+            {items.map((ing) => (
+              <li key={ing.metadata.name} className="px-5 py-3">
+                <p className="font-mono text-xs text-slate-800">
+                  {ing.metadata.name}
+                </p>
+                <ul className="mt-1.5 space-y-1 text-xs text-slate-600">
+                  {ing.spec?.rules?.map((rule, idx) => (
+                    <li key={idx} className="flex flex-wrap gap-x-2">
+                      {rule.host && (
+                        <a
+                          href={`https://${rule.host}`}
+                          target="_blank"
+                          rel="noopener noreferrer"
+                          className="font-medium text-blue-700 hover:underline"
+                        >
+                          {rule.host}
+                        </a>
+                      )}
+                      {rule.http?.paths?.map((p, i) => (
+                        <span key={i} className="text-slate-500">
+                          {p.path ?? "/"} → {p.backend?.service?.name}
+                        </span>
+                      ))}
+                    </li>
+                  ))}
+                </ul>
+              </li>
+            ))}
+          </ul>
+        )}
+      </Section>
+    </div>
+  )
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/routes/detail/OverviewTab.tsx b/packages/system/dashboard/images/console/apps/console/src/routes/detail/OverviewTab.tsx
new file mode 100644
index 0000000000..a1e3f8c2cf
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/routes/detail/OverviewTab.tsx
@@ -0,0 +1,66 @@
+import yaml from "js-yaml"
+import { Section, StatusBadge } from "@cozystack/ui"
+import type {
+  ApplicationDefinition,
+  ApplicationInstance,
+} from "@cozystack/types"
+import { formatAge, readyCondition } from "../../lib/status.ts"
+
+interface OverviewTabProps {
+  ad: ApplicationDefinition
+  instance: ApplicationInstance
+}
+
+export function OverviewTab({ instance }: OverviewTabProps) {
+  const ready = readyCondition(instance)
+  return (
+    <div className="grid gap-4 p-6 md:grid-cols-3">
+      <Section title="Details" className="md:col-span-1">
+        <dl className="space-y-2.5 text-sm">
+          <div className="flex items-center justify-between">
+            <dt className="text-slate-500">Status</dt>
+            <dd>
+              {ready ? (
+                <StatusBadge tone={ready.status === "True" ? "ok" : "warn"}>
+                  {ready.status === "True" ? "Ready" : (ready.reason ?? "NotReady")}
+                </StatusBadge>
+              ) : (
+                <StatusBadge tone="muted">Unknown</StatusBadge>
+              )}
+            </dd>
+          </div>
+          <div className="flex items-center justify-between">
+            <dt className="text-slate-500">Namespace</dt>
+            <dd className="font-mono text-xs text-slate-700">
+              {instance.metadata.namespace}
+            </dd>
+          </div>
+          <div className="flex items-center justify-between">
+            <dt className="text-slate-500">Age</dt>
+            <dd className="tabular-nums text-slate-700">
+              {formatAge(instance.metadata.creationTimestamp)}
+            </dd>
+          </div>
+          {instance.status?.version && (
+            <div className="flex items-center justify-between">
+              <dt className="text-slate-500">Version</dt>
+              <dd className="font-mono text-xs text-slate-700">
+                {instance.status.version}
+              </dd>
+            </div>
+          )}
+        </dl>
+        {ready?.message && (
+          <p className="mt-3 border-t border-slate-100 pt-3 text-xs text-slate-500">
+            {ready.message}
+          </p>
+        )}
+      </Section>
+      <Section title="Spec" className="md:col-span-2" bodyClassName="p-0">
+        <pre className="max-h-[60vh] overflow-auto p-5 text-xs leading-relaxed text-slate-800">
+          {yaml.dump(instance.spec ?? {})}
+        </pre>
+      </Section>
+    </div>
+  )
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/routes/detail/SecretsTab.tsx b/packages/system/dashboard/images/console/apps/console/src/routes/detail/SecretsTab.tsx
new file mode 100644
index 0000000000..ac6f5df0a6
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/routes/detail/SecretsTab.tsx
@@ -0,0 +1,261 @@
+import { useState } from "react"
+import { Check, Eye, EyeOff, Copy, ChevronDown, ChevronRight } from "lucide-react"
+import {
+  useK8sGet,
+  useK8sList,
+  type K8sResource,
+} from "@cozystack/k8s-client"
+import { Section, Spinner } from "@cozystack/ui"
+import type { ApplicationDefinition, ApplicationInstance } from "@cozystack/types"
+import { appInstanceLabel } from "../../lib/labels.ts"
+import { formatAge } from "../../lib/status.ts"
+import { TENANT_NAMESPACE_PREFIX } from "../../lib/constants.ts"
+
+const SECRETS_REF = {
+  apiGroup: "",
+  apiVersion: "v1",
+  plural: "secrets",
+}
+
+interface SecretLike {
+  type?: string
+  data?: Record<string, string>
+  stringData?: Record<string, string>
+}
+
+function decodeValue(raw: string | undefined): string {
+  if (!raw) return ""
+  try {
+    return atob(raw)
+  } catch {
+    return raw
+  }
+}
+
+function SecretRow({
+  namespace,
+  name,
+  keyName,
+  base64Value,
+  forceReveal,
+  apiRef = SECRETS_REF,
+}: {
+  namespace: string
+  name: string
+  keyName: string
+  base64Value: string
+  forceReveal?: boolean
+  apiRef?: typeof SECRETS_REF
+}) {
+  const [revealed, setRevealed] = useState(false)
+  const [expanded, setExpanded] = useState(false)
+  const [copyState, setCopyState] = useState<"idle" | "ok" | "failed">("idle")
+  const shouldReveal = forceReveal || revealed
+  const { data } = useK8sGet<K8sResource<unknown, unknown> & SecretLike>(
+    { ...apiRef, namespace, name },
+    { enabled: shouldReveal },
+  )
+  // The list already carries the value, so copying works while it stays
+  // masked on screen; the GET only freshens it once revealed.
+  const fullValue =
+    decodeValue(data?.data?.[keyName]) || data?.stringData?.[keyName] || decodeValue(base64Value)
+
+  // writeText rejects on a denied permission or an insecure context, and an
+  // uncaught rejection here would leave the button silent — the user would have
+  // no way to tell the copy from a no-op.
+  const handleCopy = async () => {
+    try {
+      await navigator.clipboard.writeText(fullValue)
+      setCopyState("ok")
+    } catch {
+      setCopyState("failed")
+    }
+    setTimeout(() => setCopyState("idle"), 1500)
+  }
+
+  const isLarge = fullValue.split('\n').length > 5 || fullValue.length > 200
+
+  return (
+    <div className="flex items-start justify-between gap-3 px-5 py-2 text-sm">
+      <code className="shrink-0 text-xs text-slate-500 pt-1">{keyName}</code>
+      <div className="flex-1">
+        {shouldReveal ? (
+          <>
+            <pre className={`whitespace-pre-wrap break-all font-mono text-[11px] leading-tight overflow-auto rounded bg-slate-900 text-slate-100 p-2 ${
+              expanded ? 'max-h-96' : 'max-h-20'
+            }`}>
+              {fullValue || "(empty)"}
+            </pre>
+            {isLarge && (
+              <button
+                type="button"
+                onClick={() => setExpanded((v) => !v)}
+                className="mt-1 text-xs text-blue-600 hover:text-blue-700"
+              >
+                {expanded ? "Show less" : "Show more"}
+              </button>
+            )}
+          </>
+        ) : (
+          <span className="text-slate-400">••••••••</span>
+        )}
+      </div>
+      <div className="flex shrink-0 items-center gap-1 pt-1">
+        <button
+          type="button"
+          onClick={() => setRevealed((v) => !v)}
+          className="rounded p-1 text-slate-500 hover:bg-slate-100"
+          title={revealed ? "Hide" : "Reveal"}
+        >
+          {revealed ? <EyeOff className="size-3.5" /> : <Eye className="size-3.5" />}
+        </button>
+        <button
+          type="button"
+          disabled={!navigator.clipboard}
+          onClick={handleCopy}
+          className="rounded p-1 text-slate-500 hover:bg-slate-100 disabled:opacity-30"
+          title={copyState === "ok" ? "Copied!" : copyState === "failed" ? "Copy failed" : "Copy"}
+        >
+          {copyState === "ok" ? (
+            <Check className="size-3.5 text-emerald-600" />
+          ) : copyState === "failed" ? (
+            <Copy className="size-3.5 text-red-600" />
+          ) : (
+            <Copy className="size-3.5" />
+          )}
+        </button>
+      </div>
+    </div>
+  )
+}
+
+function SecretItem({
+  secret,
+  namespace,
+  apiRef = SECRETS_REF,
+}: {
+  secret: K8sResource & SecretLike
+  namespace: string
+  apiRef?: typeof SECRETS_REF
+}) {
+  const [isExpanded, setIsExpanded] = useState(false)
+  const [revealAll, setRevealAll] = useState(false)
+  const keys = Object.keys(secret.data ?? {})
+
+  return (
+    <li>
+      <div className="flex items-center justify-between px-5 py-3 text-sm">
+        <button
+          type="button"
+          onClick={() => setIsExpanded((v) => !v)}
+          className="flex flex-1 items-center gap-2 text-left hover:bg-slate-50 -mx-5 px-5 py-3 -my-3"
+        >
+          {isExpanded ? (
+            <ChevronDown className="size-4 shrink-0 text-slate-400" />
+          ) : (
+            <ChevronRight className="size-4 shrink-0 text-slate-400" />
+          )}
+          <div className="text-left">
+            <p className="font-mono text-xs text-slate-800">
+              {secret.metadata.name}
+            </p>
+            <p className="text-xs text-slate-500">
+              {secret.type ?? "Opaque"} · {keys.length} key{keys.length !== 1 ? "s" : ""}
+            </p>
+          </div>
+        </button>
+        <div className="flex items-center gap-3">
+          <button
+            type="button"
+            onClick={() => setRevealAll((v) => !v)}
+            className="rounded p-1 text-slate-500 hover:bg-slate-100"
+            title={revealAll ? "Hide all keys" : "Reveal all keys"}
+          >
+            {revealAll ? <EyeOff className="size-4" /> : <Eye className="size-4" />}
+          </button>
+          <span className="tabular-nums text-xs text-slate-500">
+            {formatAge(secret.metadata.creationTimestamp)}
+          </span>
+        </div>
+      </div>
+      {isExpanded && keys.length > 0 && (
+        <div className="border-t border-slate-100 bg-slate-50">
+          {keys.map((k) => (
+            <SecretRow
+              key={k}
+              namespace={namespace}
+              name={secret.metadata.name}
+              keyName={k}
+              base64Value={secret.data?.[k] ?? ""}
+              forceReveal={revealAll}
+              apiRef={apiRef}
+            />
+          ))}
+        </div>
+      )}
+    </li>
+  )
+}
+
+export function SecretsTab({
+  ad,
+  instance,
+}: {
+  ad: ApplicationDefinition
+  instance: ApplicationInstance
+}) {
+  const appKind = ad.spec?.application.kind
+  const statusNamespace =
+    typeof instance.status?.namespace === "string"
+      ? instance.status.namespace
+      : undefined
+  const ns = appKind === "Tenant"
+    ? statusNamespace ?? instance.metadata.namespace ?? ""
+    : instance.metadata.namespace ?? ""
+
+  // Use TenantSecrets API for all applications in tenant namespaces
+  const isInTenantNamespace = ns.startsWith(TENANT_NAMESPACE_PREFIX)
+
+  const apiRef = isInTenantNamespace
+    ? {
+        apiGroup: "core.cozystack.io",
+        apiVersion: "v1alpha1",
+        plural: "tenantsecrets",
+      }
+    : SECRETS_REF
+
+  const labelSelector = appKind === "Tenant"
+    ? undefined // For Tenant resource itself, show all secrets in tenant namespace
+    : appInstanceLabel(ad, instance) // For other apps, filter by application labels
+
+  const { data, isLoading } = useK8sList<K8sResource & SecretLike>(
+    { ...apiRef, namespace: ns },
+    {
+      labelSelector,
+      // TenantSecrets Watch ignores labelSelector (cozystack#2527), so disable
+      // live updates and rely on List which honors the selector correctly.
+      watch: !isInTenantNamespace,
+    },
+  )
+
+  const items = data?.items ?? []
+  return (
+    <div className="p-6">
+      <Section title="Secrets" bodyClassName="p-0">
+        {isLoading ? (
+          <div className="flex items-center gap-2 px-5 py-4 text-xs text-slate-500">
+            <Spinner /> Loading…
+          </div>
+        ) : items.length === 0 ? (
+          <div className="px-5 py-6 text-sm text-slate-500">No secrets.</div>
+        ) : (
+          <ul className="divide-y divide-slate-100">
+            {items.map((sec) => (
+              <SecretItem key={sec.metadata.name} secret={sec} namespace={ns} apiRef={apiRef} />
+            ))}
+          </ul>
+        )}
+      </Section>
+    </div>
+  )
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/routes/detail/SerialTab.test.tsx b/packages/system/dashboard/images/console/apps/console/src/routes/detail/SerialTab.test.tsx
new file mode 100644
index 0000000000..1cd2c3e1f4
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/routes/detail/SerialTab.test.tsx
@@ -0,0 +1,345 @@
+import { describe, it, expect, vi, afterEach, beforeEach } from "vitest"
+import { screen, waitFor, cleanup } from "@testing-library/react"
+import { K8sClient } from "@cozystack/k8s-client"
+import { renderWithK8sProvider } from "../../test-utils/render.tsx"
+import { SerialTab } from "./SerialTab.tsx"
+import type { ApplicationDefinition, ApplicationInstance } from "@cozystack/types"
+
+const { terminals } = vi.hoisted(() => {
+  const terminals: Array<Record<string, unknown>> = []
+  return { terminals }
+})
+
+// xterm draws through canvas APIs jsdom does not implement; the tab's own
+// wiring is what these tests are about.
+vi.mock("@xterm/xterm", () => ({
+  Terminal: class {
+    written: string[] = []
+    onDataHandler: ((data: string) => void) | null = null
+    constructor(options: unknown) {
+      terminals.push({ options, instance: this })
+    }
+    loadAddon() {}
+    open() {}
+    focus() {}
+    dispose() {}
+    selection = ""
+    keyHandler: ((event: KeyboardEvent) => boolean) | null = null
+    hasSelection() {
+      return this.selection !== ""
+    }
+    getSelection() {
+      return this.selection
+    }
+    attachCustomKeyEventHandler(handler: (event: KeyboardEvent) => boolean) {
+      this.keyHandler = handler
+    }
+    write(text: string) {
+      this.written.push(text)
+    }
+    onData(handler: (data: string) => void) {
+      this.onDataHandler = handler
+      return { dispose: () => {} }
+    }
+  },
+}))
+
+vi.mock("@xterm/addon-fit", () => ({
+  FitAddon: class {
+    fit() {}
+  },
+}))
+
+vi.mock("@xterm/xterm/css/xterm.css", () => ({}))
+
+// jsdom ships no ResizeObserver; every browser the console targets has one.
+class FakeResizeObserver {
+  observe() {}
+  unobserve() {}
+  disconnect() {}
+}
+
+const sockets: FakeWebSocket[] = []
+
+class FakeWebSocket {
+  url: string
+  protocols?: string | string[]
+  binaryType = ""
+  sent: Uint8Array[] = []
+  closed = false
+  onopen: (() => void) | null = null
+  onclose: ((e: { code: number; reason: string }) => void) | null = null
+  onerror: (() => void) | null = null
+  onmessage: ((e: { data: unknown }) => void) | null = null
+
+  constructor(url: string, protocols?: string | string[]) {
+    this.url = url
+    this.protocols = protocols
+    sockets.push(this)
+  }
+
+  send(data: Uint8Array) {
+    this.sent.push(data)
+  }
+
+  close() {
+    this.closed = true
+  }
+}
+
+function makeAd(kind: string): ApplicationDefinition {
+  return {
+    apiVersion: "cozystack.io/v1alpha1",
+    kind: "ApplicationDefinition",
+    metadata: { name: "virtual-machine" },
+    spec: {
+      application: { kind, plural: "vminstances", singular: "vm-instance", openAPISchema: "{}" },
+    },
+  }
+}
+
+const instance: ApplicationInstance = {
+  apiVersion: "apps.cozystack.io/v1alpha1",
+  kind: "VMInstance",
+  metadata: { name: "demo-vm", namespace: "tenant-root" },
+}
+
+function makeClient(printableStatus = "Running") {
+  const client = new K8sClient()
+  vi.spyOn(client, "list").mockResolvedValue({
+    apiVersion: "kubevirt.io/v1",
+    kind: "VirtualMachineList",
+    metadata: {},
+    items: [
+      {
+        apiVersion: "kubevirt.io/v1",
+        kind: "VirtualMachine",
+        metadata: { name: "vm-instance-demo-vm" },
+        status: { printableStatus },
+      },
+    ],
+  })
+  vi.spyOn(client, "watch").mockReturnValue(() => {})
+  return client
+}
+
+beforeEach(() => {
+  vi.stubGlobal("ResizeObserver", FakeResizeObserver)
+})
+
+afterEach(() => {
+  cleanup()
+  sockets.length = 0
+  terminals.length = 0
+  vi.unstubAllGlobals()
+  vi.restoreAllMocks()
+})
+
+describe("SerialTab gating", () => {
+  it("offers nothing for a non-VM application and never queries", () => {
+    const client = makeClient()
+    renderWithK8sProvider(<SerialTab ad={makeAd("Postgres")} instance={instance} />, { client })
+
+    expect(screen.getByText(/only available for VMInstance/i)).toBeInTheDocument()
+    expect(client.list).not.toHaveBeenCalled()
+    expect(sockets).toHaveLength(0)
+  })
+
+  it("opens no console while the VM is stopped", async () => {
+    vi.stubGlobal("WebSocket", FakeWebSocket)
+    renderWithK8sProvider(<SerialTab ad={makeAd("VMInstance")} instance={instance} />, {
+      client: makeClient("Stopped"),
+    })
+
+    await waitFor(() =>
+      expect(screen.getByText(/virtual machine is not running/i)).toBeInTheDocument(),
+    )
+    expect(sockets).toHaveLength(0)
+  })
+})
+
+describe("SerialTab console stream", () => {
+  it("connects to the VMI console subresource for the resolved VM name", async () => {
+    vi.stubGlobal("WebSocket", FakeWebSocket)
+    renderWithK8sProvider(<SerialTab ad={makeAd("VMInstance")} instance={instance} />, {
+      client: makeClient(),
+    })
+
+    await waitFor(() => expect(sockets).toHaveLength(1))
+    expect(sockets[0].url).toBe(
+      "ws://localhost:3000/k8s/apis/subresources.kubevirt.io/v1/namespaces/tenant-root/virtualmachineinstances/vm-instance-demo-vm/console",
+    )
+    expect(sockets[0].protocols).toEqual(["plain.kubevirt.io"])
+  })
+
+  it("writes what the guest sends into the terminal", async () => {
+    vi.stubGlobal("WebSocket", FakeWebSocket)
+    renderWithK8sProvider(<SerialTab ad={makeAd("VMInstance")} instance={instance} />, {
+      client: makeClient(),
+    })
+
+    await waitFor(() => expect(sockets).toHaveLength(1))
+    sockets[0].onopen?.()
+    sockets[0].onmessage?.({ data: new TextEncoder().encode("login: ").buffer })
+
+    const terminal = terminals[0].instance as { written: string[] }
+    await waitFor(() => expect(terminal.written).toEqual(["login: "]))
+  })
+
+  it("sends what the user types as binary", async () => {
+    vi.stubGlobal("WebSocket", FakeWebSocket)
+    renderWithK8sProvider(<SerialTab ad={makeAd("VMInstance")} instance={instance} />, {
+      client: makeClient(),
+    })
+
+    await waitFor(() => expect(sockets).toHaveLength(1))
+    sockets[0].onopen?.()
+    const terminal = terminals[0].instance as { onDataHandler: ((d: string) => void) | null }
+    terminal.onDataHandler?.("ls\n")
+
+    expect(sockets[0].sent).toHaveLength(1)
+    expect(new TextDecoder().decode(sockets[0].sent[0])).toBe("ls\n")
+  })
+
+  it("shows the connection state once the socket opens", async () => {
+    vi.stubGlobal("WebSocket", FakeWebSocket)
+    renderWithK8sProvider(<SerialTab ad={makeAd("VMInstance")} instance={instance} />, {
+      client: makeClient(),
+    })
+
+    await waitFor(() => expect(sockets).toHaveLength(1))
+    expect(screen.getByText(/connecting/i)).toBeInTheDocument()
+
+    sockets[0].onopen?.()
+
+    expect(await screen.findByText(/^Connected$/)).toBeInTheDocument()
+  })
+
+  it("surfaces an unclean close instead of looking idle", async () => {
+    vi.stubGlobal("WebSocket", FakeWebSocket)
+    renderWithK8sProvider(<SerialTab ad={makeAd("VMInstance")} instance={instance} />, {
+      client: makeClient(),
+    })
+
+    await waitFor(() => expect(sockets).toHaveLength(1))
+    sockets[0].onopen?.()
+    sockets[0].onclose?.({ code: 1006, reason: "" })
+
+    expect(await screen.findByText(/connection closed \(1006\)/i)).toBeInTheDocument()
+  })
+
+  it("copies the selection on the terminal's own chord, not on plain Ctrl+C", async () => {
+    const writeText = vi.fn().mockResolvedValue(undefined)
+    vi.stubGlobal("navigator", { ...navigator, clipboard: { writeText } })
+    vi.stubGlobal("WebSocket", FakeWebSocket)
+    renderWithK8sProvider(<SerialTab ad={makeAd("VMInstance")} instance={instance} />, {
+      client: makeClient(),
+    })
+
+    await waitFor(() => expect(terminals).toHaveLength(1))
+    const terminal = terminals[0].instance as {
+      selection: string
+      keyHandler: ((event: KeyboardEvent) => boolean) | null
+    }
+    terminal.selection = "copied from the guest"
+
+    const chord = (init: KeyboardEventInit) =>
+      terminal.keyHandler?.(new KeyboardEvent("keydown", { code: "KeyC", ...init }))
+
+    // Plain Ctrl+C is the interrupt and must reach the guest untouched.
+    expect(chord({ ctrlKey: true })).toBe(true)
+    expect(writeText).not.toHaveBeenCalled()
+
+    expect(chord({ ctrlKey: true, shiftKey: true })).toBe(false)
+    expect(writeText).toHaveBeenCalledWith("copied from the guest")
+  })
+
+  it("leaves Ctrl+V to the terminal on a Mac, where the browser pastes on Cmd+V", async () => {
+    vi.spyOn(navigator, "platform", "get").mockReturnValue("MacIntel")
+    vi.stubGlobal("WebSocket", FakeWebSocket)
+    renderWithK8sProvider(<SerialTab ad={makeAd("VMInstance")} instance={instance} />, {
+      client: makeClient(),
+    })
+
+    await waitFor(() => expect(terminals).toHaveLength(1))
+    const terminal = terminals[0].instance as {
+      keyHandler: ((event: KeyboardEvent) => boolean) | null
+    }
+
+    expect(
+      terminal.keyHandler?.(new KeyboardEvent("keydown", { code: "KeyV", ctrlKey: true })),
+    ).toBe(true)
+  })
+
+  it("hands Ctrl+V back to the browser instead of letting xterm send SYN", async () => {
+    vi.stubGlobal("WebSocket", FakeWebSocket)
+    renderWithK8sProvider(<SerialTab ad={makeAd("VMInstance")} instance={instance} />, {
+      client: makeClient(),
+    })
+
+    await waitFor(() => expect(terminals).toHaveLength(1))
+    const terminal = terminals[0].instance as {
+      keyHandler: ((event: KeyboardEvent) => boolean) | null
+    }
+
+    // xterm turns Ctrl with a letter into a control byte and cancels the
+    // keydown, which kills the browser's own paste. Returning false keeps
+    // xterm out of it.
+    const handled = terminal.keyHandler?.(
+      new KeyboardEvent("keydown", { code: "KeyV", ctrlKey: true }),
+    )
+
+    expect(handled).toBe(false)
+  })
+
+  it("leaves other Ctrl chords to the terminal", async () => {
+    vi.stubGlobal("WebSocket", FakeWebSocket)
+    renderWithK8sProvider(<SerialTab ad={makeAd("VMInstance")} instance={instance} />, {
+      client: makeClient(),
+    })
+
+    await waitFor(() => expect(terminals).toHaveLength(1))
+    const terminal = terminals[0].instance as {
+      keyHandler: ((event: KeyboardEvent) => boolean) | null
+    }
+
+    // Ctrl+D, Ctrl+Z and friends are the terminal's business.
+    expect(
+      terminal.keyHandler?.(new KeyboardEvent("keydown", { code: "KeyD", ctrlKey: true })),
+    ).toBe(true)
+  })
+
+  it("leaves the copy chord to the guest when nothing is selected", async () => {
+    const writeText = vi.fn().mockResolvedValue(undefined)
+    vi.stubGlobal("navigator", { ...navigator, clipboard: { writeText } })
+    vi.stubGlobal("WebSocket", FakeWebSocket)
+    renderWithK8sProvider(<SerialTab ad={makeAd("VMInstance")} instance={instance} />, {
+      client: makeClient(),
+    })
+
+    await waitFor(() => expect(terminals).toHaveLength(1))
+    const terminal = terminals[0].instance as {
+      keyHandler: ((event: KeyboardEvent) => boolean) | null
+    }
+
+    const handled = terminal.keyHandler?.(
+      new KeyboardEvent("keydown", { code: "KeyC", metaKey: true }),
+    )
+
+    expect(handled).toBe(true)
+    expect(writeText).not.toHaveBeenCalled()
+  })
+
+  it("closes the socket when the tab goes away", async () => {
+    vi.stubGlobal("WebSocket", FakeWebSocket)
+    const { unmount } = renderWithK8sProvider(
+      <SerialTab ad={makeAd("VMInstance")} instance={instance} />,
+      { client: makeClient() },
+    )
+
+    await waitFor(() => expect(sockets).toHaveLength(1))
+    unmount()
+
+    expect(sockets[0].closed).toBe(true)
+  })
+})
diff --git a/packages/system/dashboard/images/console/apps/console/src/routes/detail/SerialTab.tsx b/packages/system/dashboard/images/console/apps/console/src/routes/detail/SerialTab.tsx
new file mode 100644
index 0000000000..ce62bd7f02
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/routes/detail/SerialTab.tsx
@@ -0,0 +1,233 @@
+import { useEffect, useRef, useState } from "react"
+import { Monitor, RotateCcw, Terminal as TerminalIcon } from "lucide-react"
+import { Terminal } from "@xterm/xterm"
+import { FitAddon } from "@xterm/addon-fit"
+import "@xterm/xterm/css/xterm.css"
+import { useK8sList, type K8sResource } from "@cozystack/k8s-client"
+import type { ApplicationDefinition, ApplicationInstance } from "@cozystack/types"
+import { releasePrefix } from "../../lib/app-definitions.ts"
+import { pastesWithMeta } from "../../lib/platform.ts"
+import { openSerialStream, serialConsoleUrl, type SerialStream } from "../../lib/serial-stream.ts"
+
+type ConnectionPhase = "connecting" | "connected" | "closed"
+
+async function copySelection(text: string) {
+  try {
+    await navigator.clipboard?.writeText(text)
+  } catch {
+    // No clipboard permission, or a page served over plain http where the API
+    // is absent. The selection stays selected, so the browser's own copy works.
+  }
+}
+
+interface SerialTabProps {
+  ad: ApplicationDefinition
+  instance: ApplicationInstance
+}
+
+export function SerialTab({ ad, instance }: SerialTabProps) {
+  const ns = instance.metadata.namespace
+  const appKind = ad.spec?.application.kind
+  // Same resolution as VncTab and VMPowerControls: the cozystack app name maps
+  // to "<release.prefix><name>", and all three must target the same object.
+  const vmName = `${releasePrefix(ad)}${instance.metadata.name}`
+
+  const { data: vmList, isLoading: vmLoading } = useK8sList<
+    K8sResource<unknown, { printableStatus?: string }>
+  >(
+    {
+      apiGroup: "kubevirt.io",
+      apiVersion: "v1",
+      plural: "virtualmachines",
+      namespace: ns ?? "",
+    },
+    {
+      enabled: appKind === "VMInstance" && !!ns,
+      fieldSelector: `metadata.name=${vmName}`,
+    },
+  )
+  const powerStatus = vmList?.items[0]?.status?.printableStatus
+  const isRunning = powerStatus === "Running"
+
+  const hostRef = useRef<HTMLDivElement>(null)
+  const [phase, setPhase] = useState<ConnectionPhase>("connecting")
+  const [error, setError] = useState<string | null>(null)
+  const [connectionKey, setConnectionKey] = useState(0)
+
+  useEffect(() => {
+    const host = hostRef.current
+    if (!host || appKind !== "VMInstance" || !isRunning || !ns) return
+
+    setPhase("connecting")
+    setError(null)
+
+
+    const terminal = new Terminal({
+      cursorBlink: true,
+      fontFamily: "ui-monospace, SFMono-Regular, Menlo, monospace",
+      fontSize: 13,
+      lineHeight: 1.25,
+      scrollback: 5000,
+      theme: {
+        background: "#0d0f14",
+        foreground: "#cbd5e1",
+        cursor: "#cbd5e1",
+        selectionBackground: "#334155",
+      },
+    })
+    const fit = new FitAddon()
+    terminal.loadAddon(fit)
+    terminal.open(host)
+    fit.fit()
+
+    let stream: SerialStream | null = null
+
+    terminal.attachCustomKeyEventHandler((event) => {
+      if (event.type !== "keydown") return true
+
+      // Copy keeps the terminal's own meaning of Ctrl+C (interrupt) intact, so
+      // copying goes through the chord terminals use for it.
+      const copyChord = (event.ctrlKey && event.shiftKey) || event.metaKey
+      if (copyChord && event.code === "KeyC" && terminal.hasSelection()) {
+        void copySelection(terminal.getSelection())
+        return false
+      }
+
+      // Cmd+V and Shift+Insert paste by themselves, but Ctrl+V does not:
+      // xterm turns Ctrl with a letter into a control byte and cancels the
+      // keydown, so the browser's paste never runs and the guest receives SYN
+      // (0x16) instead. Handing the event back to the browser costs the
+      // terminal's quoted-insert, which is the trade worth making where
+      // Ctrl+V is the paste chord. On a Mac it is not — the browser pastes on
+      // Cmd+V — so there the terminal keeps the key.
+      if (
+        !pastesWithMeta() &&
+        event.ctrlKey &&
+        !event.shiftKey &&
+        !event.altKey &&
+        event.code === "KeyV"
+      ) {
+        return false
+      }
+
+      return true
+    })
+
+    stream = openSerialStream(
+      serialConsoleUrl(window.location.protocol, window.location.host, ns!, vmName),
+      {
+        onOpen: () => {
+          setPhase("connected")
+          terminal.focus()
+        },
+        onData: (text) => terminal.write(text),
+        onClose: ({ code, reason }) => {
+          setPhase("closed")
+          if (code !== 1000) setError(reason || `connection closed (${code})`)
+        },
+      },
+    )
+
+    const input = terminal.onData((data) => stream?.send(data))
+
+    const resize = new ResizeObserver(() => fit.fit())
+    resize.observe(host)
+
+    return () => {
+      resize.disconnect()
+      input.dispose()
+      stream?.close()
+      terminal.dispose()
+    }
+  }, [appKind, ns, vmName, isRunning, connectionKey])
+
+  if (appKind !== "VMInstance") {
+    return (
+      <div className="flex h-full items-center justify-center p-6">
+        <div className="flex flex-col items-center gap-2 text-center">
+          <TerminalIcon className="h-8 w-8 text-slate-300" />
+          <p className="text-sm text-slate-500">
+            The serial console is only available for VMInstance.
+          </p>
+        </div>
+      </div>
+    )
+  }
+
+  if (vmLoading) {
+    return (
+      <div className="flex h-full items-center justify-center p-6">
+        <p className="text-sm text-slate-500">Loading…</p>
+      </div>
+    )
+  }
+
+  if (!isRunning) {
+    return (
+      <div className="flex h-full items-center justify-center p-6">
+        <div className="flex flex-col items-center gap-2 text-center">
+          <Monitor className="h-8 w-8 text-slate-300" />
+          <p className="text-sm text-slate-500">
+            The virtual machine is not running
+            {powerStatus ? ` (status: ${powerStatus})` : ""}. Start it to use the serial console.
+          </p>
+        </div>
+      </div>
+    )
+  }
+
+  const connected = phase === "connected"
+  const statusColor =
+    phase === "connected" ? "bg-emerald-500" : phase === "closed" ? "bg-red-500" : "bg-amber-400"
+  const statusLabel =
+    phase === "connected" ? "Connected" : phase === "closed" ? "Disconnected" : "Connecting…"
+
+  return (
+    <div className="flex h-full flex-col p-4">
+      <div className="flex flex-1 flex-col overflow-hidden rounded-xl shadow-[0_4px_24px_rgba(0,0,0,0.12)] ring-1 ring-slate-900/8">
+        <div className="flex shrink-0 items-center justify-between bg-[#1e2330] px-3 py-2">
+          <div className="flex items-center gap-3">
+            <div className="flex items-center gap-1.5">
+              <span className="relative flex h-2 w-2">
+                {connected && (
+                  <span className="absolute inline-flex h-full w-full animate-ping rounded-full bg-emerald-400 opacity-60" />
+                )}
+                <span className={`relative inline-flex h-2 w-2 rounded-full ${statusColor}`} />
+              </span>
+              <span className="text-[11px] font-medium tracking-wide text-slate-400">
+                {statusLabel}
+              </span>
+            </div>
+
+            <div className="h-3.5 w-px bg-slate-700" />
+
+            <div className="flex items-center gap-1.5 text-[11px] text-slate-500">
+              <TerminalIcon className="h-3 w-3" />
+              <span className="font-mono">{instance.metadata.name}</span>
+            </div>
+          </div>
+
+          <button
+            type="button"
+            onClick={() => setConnectionKey((k) => k + 1)}
+            title="Reconnect"
+            className="flex cursor-pointer items-center gap-1 rounded px-1.5 py-1 text-slate-500 transition-colors hover:bg-slate-700/60 hover:text-slate-200"
+          >
+            <RotateCcw className="h-3.5 w-3.5" />
+          </button>
+        </div>
+
+        <div className="relative flex-1 overflow-hidden bg-[#0d0f14]">
+          {error && !connected && (
+            <div className="absolute inset-x-0 top-0 z-10 bg-red-950/70 px-3 py-1.5 text-[11px] text-red-300">
+              {error}
+            </div>
+          )}
+          {/* The terminal sizes itself to this box, so the breathing room has
+              to be padding on it rather than a margin further out. */}
+          <div ref={hostRef} className="h-full w-full px-3 pt-2 pb-3" />
+        </div>
+      </div>
+    </div>
+  )
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/routes/detail/ServicesTab.test.tsx b/packages/system/dashboard/images/console/apps/console/src/routes/detail/ServicesTab.test.tsx
new file mode 100644
index 0000000000..fbe0d23cc3
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/routes/detail/ServicesTab.test.tsx
@@ -0,0 +1,145 @@
+import { describe, it, expect, vi, afterEach } from "vitest"
+import { screen, waitFor, cleanup } from "@testing-library/react"
+import { K8sClient } from "@cozystack/k8s-client"
+import { renderWithK8sProvider } from "../../test-utils/render.tsx"
+import { AppConfigContext } from "../../lib/config.ts"
+import { ServicesTab } from "./ServicesTab.tsx"
+import type { ApplicationDefinition, ApplicationInstance } from "@cozystack/types"
+
+const ad: ApplicationDefinition = {
+  apiVersion: "cozystack.io/v1alpha1",
+  kind: "ApplicationDefinition",
+  metadata: { name: "tcp-balancer" },
+  spec: {
+    application: {
+      kind: "TCPBalancer",
+      plural: "tcpbalancers",
+      singular: "tcpbalancer",
+      openAPISchema: "{}",
+    },
+  },
+}
+
+const instance: ApplicationInstance = {
+  apiVersion: "apps.cozystack.io/v1alpha1",
+  kind: "TCPBalancer",
+  metadata: { name: "demo", namespace: "tenant-root" },
+}
+
+function makeClient(items: unknown[]) {
+  const client = new K8sClient()
+  vi.spyOn(client, "list").mockResolvedValue({
+    apiVersion: "v1",
+    kind: "List",
+    metadata: {},
+    items,
+  })
+  vi.spyOn(client, "watch").mockReturnValue(() => {})
+  return client
+}
+
+afterEach(() => {
+  cleanup()
+  vi.restoreAllMocks()
+})
+
+describe("ServicesTab external IP", () => {
+  it("shows the LoadBalancer external IP from status, not just the cluster IP", async () => {
+    const client = makeClient([
+      {
+        metadata: { name: "demo", namespace: "tenant-root" },
+        spec: { type: "LoadBalancer", clusterIP: "10.96.1.2", ports: [{ port: 80 }] },
+        status: { loadBalancer: { ingress: [{ ip: "192.0.2.50" }] } },
+      },
+    ])
+    renderWithK8sProvider(<ServicesTab ad={ad} instance={instance} />, { client })
+
+    // Regression for #3111: the assigned MetalLB IP must be surfaced, not hidden.
+    await waitFor(() => expect(screen.getByText("192.0.2.50")).toBeInTheDocument())
+    expect(screen.getByText("10.96.1.2")).toBeInTheDocument()
+  })
+
+  it("falls back to the hostname, then to Pending, for a LoadBalancer", async () => {
+    const client = makeClient([
+      {
+        metadata: { name: "by-host", namespace: "tenant-root" },
+        spec: { type: "LoadBalancer", clusterIP: "10.96.1.3", ports: [{ port: 443 }] },
+        status: { loadBalancer: { ingress: [{ hostname: "lb.example.com" }] } },
+      },
+      {
+        metadata: { name: "pending", namespace: "tenant-root" },
+        spec: { type: "LoadBalancer", clusterIP: "10.96.1.4", ports: [{ port: 443 }] },
+        status: {},
+      },
+    ])
+    renderWithK8sProvider(<ServicesTab ad={ad} instance={instance} />, { client })
+
+    await waitFor(() => expect(screen.getByText("lb.example.com")).toBeInTheDocument())
+    expect(screen.getByText("Pending")).toBeInTheDocument()
+  })
+
+  it("does not show an external IP for a ClusterIP service", async () => {
+    const client = makeClient([
+      {
+        metadata: { name: "internal", namespace: "tenant-root" },
+        spec: { type: "ClusterIP", clusterIP: "10.96.1.5", ports: [{ port: 8080 }] },
+      },
+    ])
+    renderWithK8sProvider(<ServicesTab ad={ad} instance={instance} />, { client })
+
+    await waitFor(() => expect(screen.getByText("internal")).toBeInTheDocument())
+    expect(screen.queryByText("Pending")).not.toBeInTheDocument()
+    // The External IP cell renders an em dash for non-LoadBalancer services.
+    expect(screen.getAllByText("—").length).toBeGreaterThan(0)
+  })
+})
+
+describe("ServicesTab connection hostname", () => {
+  const lbService = {
+    metadata: { name: "demo", namespace: "tenant-root" },
+    spec: { type: "LoadBalancer", clusterIP: "10.96.1.2", ports: [{ port: 5432 }] },
+    status: { loadBalancer: { ingress: [{ ip: "192.0.2.50" }] } },
+  }
+
+  it("renders <service>.<serviceDomain> for a LoadBalancer, even while the IP is pending", async () => {
+    const client = makeClient([lbService, { ...lbService, metadata: { name: "late" }, status: {} }])
+    renderWithK8sProvider(
+      <AppConfigContext.Provider value={{ serviceDomain: "svc.example.org" }}>
+        <ServicesTab ad={ad} instance={instance} />
+      </AppConfigContext.Provider>,
+      { client },
+    )
+
+    await waitFor(() => expect(screen.getByText("demo.svc.example.org")).toBeInTheDocument())
+    expect(screen.getByText("late.svc.example.org")).toBeInTheDocument()
+    expect(screen.getByText("Pending")).toBeInTheDocument()
+  })
+
+  it("renders no hostname when the platform configured no serviceDomain", async () => {
+    // Nothing in the platform publishes DNS for a guessed name, so the tab
+    // must not invent one: neither "demo." nor a tenant-derived suffix.
+    const client = makeClient([lbService])
+    renderWithK8sProvider(<ServicesTab ad={ad} instance={instance} />, { client })
+
+    await waitFor(() => expect(screen.getByText("192.0.2.50")).toBeInTheDocument())
+    expect(screen.queryByText(/^demo\./)).not.toBeInTheDocument()
+  })
+
+  it("renders no hostname for a ClusterIP service", async () => {
+    const client = makeClient([
+      {
+        metadata: { name: "internal", namespace: "tenant-root" },
+        spec: { type: "ClusterIP", clusterIP: "10.96.1.5", ports: [{ port: 8080 }] },
+      },
+    ])
+    renderWithK8sProvider(
+      <AppConfigContext.Provider value={{ serviceDomain: "svc.example.org" }}>
+        <ServicesTab ad={ad} instance={instance} />
+      </AppConfigContext.Provider>,
+      { client },
+    )
+
+    await waitFor(() => expect(screen.getByText("internal")).toBeInTheDocument())
+    expect(screen.queryByText(/^internal\./)).not.toBeInTheDocument()
+  })
+})
diff --git a/packages/system/dashboard/images/console/apps/console/src/routes/detail/ServicesTab.tsx b/packages/system/dashboard/images/console/apps/console/src/routes/detail/ServicesTab.tsx
new file mode 100644
index 0000000000..81e6301d6e
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/routes/detail/ServicesTab.tsx
@@ -0,0 +1,101 @@
+import { useK8sList, type K8sResource } from "@cozystack/k8s-client"
+import { Section, Spinner } from "@cozystack/ui"
+import type { ApplicationDefinition, ApplicationInstance } from "@cozystack/types"
+import { appInstanceLabel } from "../../lib/labels.ts"
+import { formatAge } from "../../lib/status.ts"
+import { useAppConfig } from "../../lib/config.ts"
+
+interface ServiceSpec {
+  type?: string
+  clusterIP?: string
+  ports?: { port: number; protocol?: string; name?: string }[]
+}
+
+interface ServiceStatus {
+  loadBalancer?: {
+    ingress?: { ip?: string; hostname?: string }[]
+  }
+}
+
+export function ServicesTab({
+  ad,
+  instance,
+}: {
+  ad: ApplicationDefinition
+  instance: ApplicationInstance
+}) {
+  const ns = instance.metadata.namespace ?? ""
+  const { data, isLoading } = useK8sList<K8sResource<ServiceSpec, ServiceStatus>>(
+    { apiGroup: "", apiVersion: "v1", plural: "services", namespace: ns },
+    { labelSelector: appInstanceLabel(ad, instance) },
+  )
+  const items = data?.items ?? []
+  const { serviceDomain } = useAppConfig()
+
+  return (
+    <div className="p-6">
+      <Section title="Services" bodyClassName="p-0">
+        {isLoading ? (
+          <div className="flex items-center gap-2 px-5 py-4 text-xs text-slate-500">
+            <Spinner /> Loading…
+          </div>
+        ) : items.length === 0 ? (
+          <div className="px-5 py-6 text-sm text-slate-500">No services.</div>
+        ) : (
+          <table className="w-full text-sm">
+            <thead>
+              <tr className="border-b border-slate-200 bg-slate-50 text-left text-xs font-medium uppercase tracking-wider text-slate-500">
+                <th className="px-4 py-3">Name</th>
+                <th className="px-4 py-3">Type</th>
+                <th className="px-4 py-3">Cluster IP</th>
+                <th className="px-4 py-3">External IP</th>
+                <th className="px-4 py-3">Ports</th>
+                <th className="px-4 py-3">Age</th>
+              </tr>
+            </thead>
+            <tbody className="divide-y divide-slate-100">
+              {items.map((svc) => {
+                const isLoadBalancer = svc.spec?.type === "LoadBalancer"
+                const lb = svc.status?.loadBalancer?.ingress?.[0]
+                const external = isLoadBalancer
+                  ? (lb?.ip ?? lb?.hostname ?? "Pending")
+                  : "—"
+                // Only when the operator configured a suffix: nothing in the
+                // platform publishes DNS for these names, so no fallback.
+                const hostname =
+                  isLoadBalancer && serviceDomain
+                    ? `${svc.metadata.name}.${serviceDomain}`
+                    : undefined
+                return (
+                  <tr key={svc.metadata.name} className="hover:bg-slate-50">
+                    <td className="px-4 py-3 font-mono text-xs text-slate-800">
+                      {svc.metadata.name}
+                    </td>
+                    <td className="px-4 py-3 text-slate-700">
+                      {svc.spec?.type ?? "ClusterIP"}
+                    </td>
+                    <td className="px-4 py-3 font-mono text-xs text-slate-600">
+                      {svc.spec?.clusterIP ?? "—"}
+                    </td>
+                    <td className="px-4 py-3 font-mono text-xs text-slate-700">
+                      <div>{external}</div>
+                      {hostname && <div className="text-slate-500">{hostname}</div>}
+                    </td>
+                    <td className="px-4 py-3 text-slate-700">
+                      {svc.spec?.ports
+                        ?.map((p) => `${p.port}/${p.protocol ?? "TCP"}`)
+                        .join(", ") ?? "—"}
+                    </td>
+                    <td className="px-4 py-3 tabular-nums text-slate-500">
+                      {formatAge(svc.metadata.creationTimestamp)}
+                    </td>
+                  </tr>
+                )
+              })}
+            </tbody>
+          </table>
+        )}
+      </Section>
+    </div>
+  )
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/routes/detail/VMPowerControls.test.tsx b/packages/system/dashboard/images/console/apps/console/src/routes/detail/VMPowerControls.test.tsx
new file mode 100644
index 0000000000..e9b41ef16c
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/routes/detail/VMPowerControls.test.tsx
@@ -0,0 +1,147 @@
+import { describe, it, expect, vi, afterEach } from "vitest"
+import { screen, waitFor, cleanup } from "@testing-library/react"
+import userEvent from "@testing-library/user-event"
+import { K8sClient } from "@cozystack/k8s-client"
+import { renderWithK8sProvider } from "../../test-utils/render.tsx"
+import { VMPowerControls } from "./VMPowerControls.tsx"
+import type { ApplicationDefinition, ApplicationInstance } from "@cozystack/types"
+
+function makeAd(release?: { prefix?: string }): ApplicationDefinition {
+  return {
+    apiVersion: "cozystack.io/v1alpha1",
+    kind: "ApplicationDefinition",
+    metadata: { name: "virtual-machine" },
+    spec: {
+      application: {
+        kind: "VMInstance",
+        plural: "vminstances",
+        singular: "vm-instance",
+        openAPISchema: "{}",
+      },
+      ...(release ? { release } : {}),
+    },
+  }
+}
+
+const instance: ApplicationInstance = {
+  apiVersion: "apps.cozystack.io/v1alpha1",
+  kind: "VMInstance",
+  metadata: { name: "demo-vm", namespace: "tenant-root" },
+}
+
+function makeClient(printableStatus?: string) {
+  const client = new K8sClient()
+  vi.spyOn(client, "list").mockResolvedValue({
+    apiVersion: "kubevirt.io/v1",
+    kind: "VirtualMachineList",
+    metadata: {},
+    items: [
+      {
+        apiVersion: "kubevirt.io/v1",
+        kind: "VirtualMachine",
+        metadata: { name: "vm-instance-demo-vm" },
+        status: { printableStatus },
+      },
+    ],
+  })
+  // No resourceVersion above means useK8sList never upgrades to a watch, but
+  // stub it anyway so a future change can't make the test hit the network.
+  vi.spyOn(client, "watch").mockReturnValue(() => {})
+  vi.spyOn(client, "subresource").mockResolvedValue(undefined)
+  return client
+}
+
+afterEach(() => {
+  cleanup()
+  vi.restoreAllMocks()
+})
+
+describe("VMPowerControls VM-name resolution", () => {
+  it("field-selects the VM name from the singular when release.prefix is unset", async () => {
+    const client = makeClient("Stopped")
+    renderWithK8sProvider(<VMPowerControls ad={makeAd()} instance={instance} />, { client })
+
+    await waitFor(() =>
+      expect(client.list).toHaveBeenCalledWith(
+        "kubevirt.io",
+        "v1",
+        "virtualmachines",
+        "tenant-root",
+        expect.objectContaining({ fieldSelector: "metadata.name=vm-instance-demo-vm" }),
+      ),
+    )
+  })
+
+  it("field-selects the VM name from an explicit release.prefix", async () => {
+    const client = makeClient("Stopped")
+    renderWithK8sProvider(
+      <VMPowerControls ad={makeAd({ prefix: "custom-" })} instance={instance} />,
+      { client },
+    )
+
+    await waitFor(() =>
+      expect(client.list).toHaveBeenCalledWith(
+        "kubevirt.io",
+        "v1",
+        "virtualmachines",
+        "tenant-root",
+        expect.objectContaining({ fieldSelector: "metadata.name=custom-demo-vm" }),
+      ),
+    )
+  })
+})
+
+describe("VMPowerControls button state", () => {
+  it("enables Start and disables Stop/Restart when the VM is Stopped", async () => {
+    const client = makeClient("Stopped")
+    renderWithK8sProvider(<VMPowerControls ad={makeAd()} instance={instance} />, { client })
+
+    await waitFor(() => expect(screen.getByText("Stopped")).toBeInTheDocument())
+    expect(screen.getByRole("button", { name: "Start" })).toBeEnabled()
+    expect(screen.getByRole("button", { name: "Restart" })).toBeDisabled()
+    expect(screen.getByRole("button", { name: "Stop" })).toBeDisabled()
+  })
+
+  it("disables Start and enables Stop/Restart when the VM is Running", async () => {
+    const client = makeClient("Running")
+    renderWithK8sProvider(<VMPowerControls ad={makeAd()} instance={instance} />, { client })
+
+    await waitFor(() => expect(screen.getByText("Running")).toBeInTheDocument())
+    expect(screen.getByRole("button", { name: "Start" })).toBeDisabled()
+    expect(screen.getByRole("button", { name: "Restart" })).toBeEnabled()
+    expect(screen.getByRole("button", { name: "Stop" })).toBeEnabled()
+  })
+
+  it("treats a Paused VM like a running one for Stop/Restart (it still has a VMI)", async () => {
+    const client = makeClient("Paused")
+    renderWithK8sProvider(<VMPowerControls ad={makeAd()} instance={instance} />, { client })
+
+    await waitFor(() => expect(screen.getByText("Paused")).toBeInTheDocument())
+    expect(screen.getByRole("button", { name: "Start" })).toBeDisabled()
+    expect(screen.getByRole("button", { name: "Restart" })).toBeEnabled()
+    expect(screen.getByRole("button", { name: "Stop" })).toBeEnabled()
+  })
+})
+
+describe("VMPowerControls actions", () => {
+  it("invokes the start action against the subresources.kubevirt.io API", async () => {
+    const client = makeClient("Stopped")
+    renderWithK8sProvider(<VMPowerControls ad={makeAd()} instance={instance} />, { client })
+
+    const user = userEvent.setup()
+    const startButton = await screen.findByRole("button", { name: "Start" })
+    await waitFor(() => expect(startButton).toBeEnabled())
+    await user.click(startButton)
+
+    expect(client.subresource).toHaveBeenCalledWith(
+      "subresources.kubevirt.io",
+      "v1",
+      "virtualmachines",
+      "vm-instance-demo-vm",
+      "start",
+      "tenant-root",
+      {},
+      undefined,
+    )
+  })
+})
diff --git a/packages/system/dashboard/images/console/apps/console/src/routes/detail/VMPowerControls.tsx b/packages/system/dashboard/images/console/apps/console/src/routes/detail/VMPowerControls.tsx
new file mode 100644
index 0000000000..62805b1498
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/routes/detail/VMPowerControls.tsx
@@ -0,0 +1,125 @@
+import { useState } from "react"
+import { Play, Square, RotateCw } from "lucide-react"
+import { Button, StatusBadge } from "@cozystack/ui"
+import {
+  useK8sList,
+  useK8sSubresource,
+  type K8sResource,
+} from "@cozystack/k8s-client"
+import type { ApplicationDefinition, ApplicationInstance } from "@cozystack/types"
+import { releasePrefix } from "../../lib/app-definitions.ts"
+
+// KubeVirt serves the VirtualMachine object under kubevirt.io and the
+// start/stop/restart action endpoints under the subresources.kubevirt.io
+// aggregated API. Tenant access to the action subresources is granted by the
+// cozy:tenant:use ClusterRole (verb "update").
+const KUBEVIRT_GROUP = "kubevirt.io"
+const KUBEVIRT_SUBRESOURCE_GROUP = "subresources.kubevirt.io"
+const KUBEVIRT_VERSION = "v1"
+
+interface VMStatus {
+  printableStatus?: string
+}
+
+type Power = "start" | "stop" | "restart"
+
+export function VMPowerControls({
+  ad,
+  instance,
+}: {
+  ad: ApplicationDefinition
+  instance: ApplicationInstance
+}) {
+  const ns = instance.metadata.namespace ?? ""
+  // The cozystack app name (e.g. "demo-vm") maps to the KubeVirt VirtualMachine
+  // named "<release.prefix><name>" (e.g. "vm-instance-demo-vm"). releasePrefix()
+  // discovers the prefix from the ApplicationDefinition (falling back to
+  // "<singular>-") so this resolves identically to VncTab — never hardcode it.
+  const vmName = `${releasePrefix(ad)}${instance.metadata.name}`
+
+  // The VirtualMachine object (and its status) is served under kubevirt.io.
+  // List it by a metadata.name field-selector rather than a one-shot get so the
+  // useK8sList watch layer streams printableStatus transitions live — no poll.
+  const vmListRef = {
+    apiGroup: KUBEVIRT_GROUP,
+    apiVersion: KUBEVIRT_VERSION,
+    plural: "virtualmachines",
+    namespace: ns,
+  }
+  const { data: vmList } = useK8sList<K8sResource<unknown, VMStatus>>(vmListRef, {
+    enabled: !!vmName && !!ns,
+    fieldSelector: `metadata.name=${vmName}`,
+  })
+  const vm = vmList?.items[0]
+
+  const action = useK8sSubresource(
+    {
+      apiGroup: KUBEVIRT_SUBRESOURCE_GROUP,
+      apiVersion: KUBEVIRT_VERSION,
+      plural: "virtualmachines",
+      name: vmName,
+      namespace: ns,
+    },
+    // The action endpoints live under subresources.kubevirt.io, but the status
+    // lives on the VirtualMachine under kubevirt.io. Invalidate that resource so
+    // the field-selected list above refetches immediately (the watch would catch
+    // up on its own, but this makes the button feedback instant).
+    { invalidate: vmListRef },
+  )
+
+  const [pending, setPending] = useState<Power | null>(null)
+
+  const status = vm?.status?.printableStatus
+  const isRunning = status === "Running"
+  const isStopped = status === "Stopped"
+  // A paused VM still has a running VirtualMachineInstance, so stop/restart
+  // apply to it just as they do to a running one.
+  const hasRunningInstance = isRunning || status === "Paused"
+  const busy = action.isPending || pending !== null
+
+  const run = async (sub: Power, confirmMsg?: string) => {
+    if (confirmMsg && !confirm(confirmMsg)) return
+    setPending(sub)
+    try {
+      await action.mutateAsync({ subresource: sub })
+    } catch (err) {
+      alert(`Failed to ${sub} VM: ${(err as Error).message}`)
+    } finally {
+      setPending(null)
+    }
+  }
+
+  return (
+    <div className="flex items-center gap-2">
+      {status && (
+        <StatusBadge tone={isRunning ? "ok" : "warn"}>{status}</StatusBadge>
+      )}
+      <Button
+        variant="outline"
+        size="sm"
+        disabled={busy || !isStopped}
+        onClick={() => run("start")}
+      >
+        <Play className="size-3.5" /> Start
+      </Button>
+      <Button
+        variant="outline"
+        size="sm"
+        disabled={busy || !hasRunningInstance}
+        onClick={() =>
+          run("restart", `Restart VM "${instance.metadata.name}"?`)
+        }
+      >
+        <RotateCw className="size-3.5" /> Restart
+      </Button>
+      <Button
+        variant="outline"
+        size="sm"
+        disabled={busy || !hasRunningInstance}
+        onClick={() => run("stop", `Stop VM "${instance.metadata.name}"?`)}
+      >
+        <Square className="size-3.5" /> Stop
+      </Button>
+    </div>
+  )
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/routes/detail/VncTab.clipboard.test.tsx b/packages/system/dashboard/images/console/apps/console/src/routes/detail/VncTab.clipboard.test.tsx
new file mode 100644
index 0000000000..a9d3c02dce
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/routes/detail/VncTab.clipboard.test.tsx
@@ -0,0 +1,516 @@
+import { describe, it, expect, vi, afterEach } from "vitest"
+import { screen, waitFor, cleanup, act, fireEvent } from "@testing-library/react"
+import userEvent from "@testing-library/user-event"
+import { K8sClient } from "@cozystack/k8s-client"
+import { renderWithK8sProvider } from "../../test-utils/render.tsx"
+import { VncTab } from "./VncTab.tsx"
+import type { ApplicationDefinition, ApplicationInstance } from "@cozystack/types"
+
+const { FakeRFB } = vi.hoisted(() => {
+  const MODIFIERS: Record<string, string> = {
+    ControlLeft: "Ctrl",
+    ControlRight: "Ctrl",
+    AltLeft: "Alt",
+    AltRight: "AltGr",
+    MetaLeft: "Meta",
+    MetaRight: "Meta",
+    ShiftLeft: "Shift",
+    ShiftRight: "Shift",
+  }
+
+  // Latin-1 keysyms are the code point; anything past it is offset into the
+  // Unicode plane. Function keysyms (0xff00..0xffff) are neither — Enter is
+  // 0xff0d, and treating it as an offset yields a negative code point, which
+  // throws where an assertion should have been.
+  const FUNCTION_KEYSYMS: Record<number, string> = { 0xff0d: "⏎", 0xff09: "⇥" }
+
+  function charFor(keysym: number): string {
+    if (keysym in FUNCTION_KEYSYMS) return FUNCTION_KEYSYMS[keysym]
+    if (keysym >= 0x01000000) return String.fromCodePoint(keysym - 0x01000000)
+    if (keysym <= 0xff) return String.fromCodePoint(keysym)
+    return `<keysym 0x${keysym.toString(16)}>`
+  }
+
+  /**
+   * Stands in for noVNC, and models the one thing a list of sendKey calls
+   * cannot: the guest's keyboard state. A character typed while Ctrl is down
+   * does not reach the guest as that character — it reaches it as a chord,
+   * which is how a paste can run a command nobody pasted.
+   */
+  class FakeRFB extends EventTarget {
+    static instances: FakeRFB[] = []
+    sendKey = vi.fn((keysym: number, code: string, down: boolean) => {
+      if (this.armed) {
+        if (this.armed.afterEvents <= 0) {
+          const { code: armedCode } = this.armed
+          this.armed = null
+          this.sendKey(armedCode.startsWith("Control") ? 0xffe3 : 0xffe9, armedCode, true)
+        } else {
+          this.armed.afterEvents--
+        }
+      }
+      const modifier = MODIFIERS[code]
+      if (modifier) {
+        if (down) this.held.add(modifier)
+        else this.held.delete(modifier)
+        return
+      }
+      if (!down) return
+      const char = charFor(keysym)
+      const chord = [...this.held].filter((m) => m !== "Shift")
+      this.guestSaw += chord.length > 0 ? `<${chord.join("+")}+${char}>` : char
+    })
+    disconnect = vi.fn()
+    sendCtrlAltDel = vi.fn()
+    focus = vi.fn()
+    scaleViewport = false
+    resizeSession = false
+    canvas: HTMLCanvasElement
+    /** Modifiers the guest currently believes are down. */
+    held = new Set<string>()
+    /** A modifier noVNC is sitting on, and how many events until it lands. */
+    armed: { code: string; afterEvents: number } | null = null
+    /** What the guest ended up receiving, chords marked. */
+    guestSaw = ""
+
+    // The real RFB builds a focusable canvas inside the target element and
+    // takes the keyboard from it; the paste shortcut keys off exactly that.
+    constructor(target: HTMLElement) {
+      super()
+      this.canvas = document.createElement("canvas")
+      this.canvas.tabIndex = -1
+      target.appendChild(this.canvas)
+      FakeRFB.instances.push(this)
+    }
+
+    /** noVNC sends a modifier down the moment it is pressed on the canvas. */
+    pressModifier(code: string) {
+      this.sendKey(code.startsWith("Control") ? 0xffe3 : 0xffe9, code, true)
+    }
+
+    /**
+     * The Windows path. The keydown tells the guest nothing and arms AltGr
+     * detection; the modifier is delivered once, by noVNC's own 100 ms timer
+     * or by the next keyup, whichever comes first. Both land within that
+     * window of the keydown — which is to say, while the paste is still in
+     * its opening releases, not after a character has been typed. The fake
+     * delivers partway through the opening releases, where noVNC's own timer
+     * lands at the default pace, so the test cannot choose the moment.
+     */
+    armHeldModifier(code: string, afterEvents = 4) {
+      this.armed = { code, afterEvents }
+    }
+  }
+  return { FakeRFB }
+})
+
+vi.mock("@novnc/novnc/lib/rfb", () => ({ default: FakeRFB }))
+
+const ad: ApplicationDefinition = {
+  apiVersion: "cozystack.io/v1alpha1",
+  kind: "ApplicationDefinition",
+  metadata: { name: "virtual-machine" },
+  spec: {
+    application: {
+      kind: "VMInstance",
+      plural: "vminstances",
+      singular: "vm-instance",
+      openAPISchema: "{}",
+    },
+  },
+}
+
+const instance: ApplicationInstance = {
+  apiVersion: "apps.cozystack.io/v1alpha1",
+  kind: "VMInstance",
+  metadata: { name: "demo-vm", namespace: "tenant-root" },
+}
+
+function runningClient() {
+  const client = new K8sClient()
+  vi.spyOn(client, "list").mockResolvedValue({
+    apiVersion: "kubevirt.io/v1",
+    kind: "VirtualMachineList",
+    metadata: {},
+    items: [
+      {
+        apiVersion: "kubevirt.io/v1",
+        kind: "VirtualMachine",
+        metadata: { name: "vm-instance-demo-vm" },
+        status: { printableStatus: "Running" },
+      },
+    ],
+  })
+  vi.spyOn(client, "watch").mockReturnValue(() => {})
+  return client
+}
+
+interface Session {
+  rfb: InstanceType<typeof FakeRFB>
+  sink: HTMLTextAreaElement
+  unmount: () => void
+}
+
+async function connectedSession(keyDelayMs: number | undefined = 0): Promise<Session> {
+  const { container, unmount } = renderWithK8sProvider(
+    <VncTab ad={ad} instance={instance} keyDelayMs={keyDelayMs} />,
+    { client: runningClient() },
+  )
+
+  await waitFor(() => expect(FakeRFB.instances).toHaveLength(1))
+  const rfb = FakeRFB.instances[0]
+  act(() => {
+    rfb.dispatchEvent(new CustomEvent("connect"))
+  })
+  rfb.canvas.focus()
+
+  const sink = container.querySelector("textarea")
+  if (!sink) throw new Error("paste sink missing")
+  return { rfb, sink, unmount }
+}
+
+function pressPaste(init: KeyboardEventInit = {}): KeyboardEvent {
+  const event = new KeyboardEvent("keydown", {
+    key: "v",
+    code: "KeyV",
+    ctrlKey: true,
+    bubbles: true,
+    cancelable: true,
+    ...init,
+  })
+  act(() => {
+    ;(document.activeElement ?? document).dispatchEvent(event)
+  })
+  return event
+}
+
+function paste(sink: HTMLTextAreaElement, text: string) {
+  fireEvent.paste(sink, { clipboardData: { getData: () => text } })
+}
+
+function pressedKeys(rfb: InstanceType<typeof FakeRFB>): string[] {
+  return rfb.sendKey.mock.calls.filter(([, , down]) => down).map(([, code]) => code)
+}
+
+afterEach(() => {
+  cleanup()
+  FakeRFB.instances.length = 0
+  vi.restoreAllMocks()
+})
+
+describe("VncTab paste shortcut", () => {
+  it("moves the focus to the paste sink on Ctrl+V", async () => {
+    const { sink } = await connectedSession()
+
+    pressPaste()
+
+    expect(document.activeElement).toBe(sink)
+  })
+
+  it("ignores Cmd+V where the platform pastes with Ctrl", async () => {
+    const { rfb, sink } = await connectedSession()
+
+    // Taking both chords costs the guest one it has its own use for.
+    pressPaste({ ctrlKey: false, metaKey: true })
+
+    expect(document.activeElement).toBe(rfb.canvas)
+    expect(document.activeElement).not.toBe(sink)
+  })
+
+  it("takes Cmd+V, and leaves Ctrl+V to the guest, on a Mac", async () => {
+    vi.spyOn(navigator, "platform", "get").mockReturnValue("MacIntel")
+    const { rfb, sink } = await connectedSession()
+
+    pressPaste()
+    expect(document.activeElement).toBe(rfb.canvas)
+
+    pressPaste({ ctrlKey: false, metaKey: true })
+    expect(document.activeElement).toBe(sink)
+  })
+
+  it("hides the shortcut from noVNC, which would cancel the paste", async () => {
+    const { rfb } = await connectedSession()
+    const seenByNoVnc = vi.fn()
+    rfb.canvas.addEventListener("keydown", seenByNoVnc)
+
+    const event = pressPaste()
+
+    expect(seenByNoVnc).not.toHaveBeenCalled()
+    // Not prevented: cancelling the keydown would cancel the browser's paste.
+    expect(event.defaultPrevented).toBe(false)
+  })
+
+  it("leaves a bare V to the guest", async () => {
+    const { sink, rfb } = await connectedSession()
+
+    pressPaste({ ctrlKey: false })
+
+    expect(document.activeElement).toBe(rfb.canvas)
+    expect(document.activeElement).not.toBe(sink)
+  })
+
+  it("ignores the shortcut while the focus sits outside the console", async () => {
+    const { sink } = await connectedSession()
+    const outside = document.createElement("input")
+    document.body.appendChild(outside)
+    outside.focus()
+
+    pressPaste()
+
+    expect(document.activeElement).toBe(outside)
+    expect(document.activeElement).not.toBe(sink)
+    outside.remove()
+  })
+})
+
+describe("VncTab pasted text", () => {
+  it("types what the browser pasted into the session", async () => {
+    const { rfb, sink } = await connectedSession()
+
+    pressPaste()
+    paste(sink, "hi")
+
+    await waitFor(() => expect(pressedKeys(rfb)).toEqual(["KeyH", "KeyI"]))
+  })
+
+  it("does not type the paste as chords while the modifier is still held", async () => {
+    const { rfb, sink } = await connectedSession()
+
+    // The user is still holding Ctrl: noVNC told the guest so the moment the
+    // key went down, and the release only comes on keyup.
+    rfb.pressModifier("ControlLeft")
+
+    pressPaste()
+    paste(sink, "cm")
+
+    await waitFor(() => expect(rfb.guestSaw.length).toBeGreaterThanOrEqual(2))
+    // Typed under Ctrl these are not characters at all: Ctrl+C interrupts and
+    // Ctrl+M is Return, so the guest runs whatever was on the line.
+    expect(rfb.guestSaw).toBe("cm")
+  })
+
+  it("does not type the paste as chords while Cmd is still held", async () => {
+    vi.spyOn(navigator, "platform", "get").mockReturnValue("MacIntel")
+    const { rfb, sink } = await connectedSession()
+
+    // noVNC maps Cmd to Alt_L, so a Cmd+V paste arrives as Alt chords.
+    rfb.pressModifier("MetaLeft")
+
+    pressPaste({ ctrlKey: false, metaKey: true })
+    paste(sink, "ab")
+
+    await waitFor(() => expect(rfb.guestSaw.length).toBeGreaterThanOrEqual(2))
+    expect(rfb.guestSaw).toBe("ab")
+  })
+
+  it("renders a newline the guest received instead of throwing on its keysym", async () => {
+    const { rfb, sink } = await connectedSession()
+
+    pressPaste()
+    paste(sink, "hi\n")
+
+    // Enter is keysym 0xff0d, which is neither Latin-1 nor a Unicode offset.
+    await waitFor(() => expect(rfb.guestSaw).toBe("hi⏎"))
+  })
+
+  it("types plain characters when the host was sitting on the modifier", async () => {
+    const { rfb, sink } = await connectedSession()
+
+    // noVNC has not told the guest about Ctrl yet; it will, on its own, while
+    // the paste is still opening.
+    rfb.armHeldModifier("ControlLeft")
+
+    pressPaste()
+    paste(sink, "mkdir")
+
+    // Under a held Ctrl these are chords, and Ctrl+M is Return, so the guest
+    // would submit whatever the line already held.
+    await waitFor(() => expect(rfb.guestSaw).toBe("mkdir"))
+  })
+
+  it("hands the keyboard back to the console", async () => {
+    const { rfb, sink } = await connectedSession()
+
+    pressPaste()
+    paste(sink, "x")
+
+    await waitFor(() => expect(rfb.focus).toHaveBeenCalled())
+  })
+
+  it("stops typing when the tab is unmounted mid-paste", async () => {
+    const { rfb, sink, unmount } = await connectedSession()
+
+    pressPaste()
+    paste(sink, "abcdefghijklmnopqrstuvwxyz")
+    await waitFor(() => expect(rfb.guestSaw.length).toBeGreaterThan(0))
+    unmount()
+
+    const atUnmount = rfb.guestSaw.length
+    await new Promise((resolve) => setTimeout(resolve, 200))
+
+    // A character may already be in flight; the loop must not run on.
+    expect(rfb.guestSaw.length - atUnmount).toBeLessThanOrEqual(1)
+    expect(rfb.guestSaw.length).toBeLessThan(26)
+  })
+
+  it("types nothing once the session has dropped", async () => {
+    const { rfb, sink } = await connectedSession()
+    act(() => {
+      rfb.dispatchEvent(new CustomEvent("disconnect", { detail: { clean: true } }))
+    })
+
+    paste(sink, "gone")
+
+    await waitFor(() => expect(rfb.sendKey).not.toHaveBeenCalled())
+  })
+
+  it("refuses a second paste while the first is still typing", async () => {
+    const { rfb, sink } = await connectedSession()
+
+    pressPaste()
+    paste(sink, "aaaa")
+    paste(sink, "zzzz")
+
+    // Real timers: the run is a prelude, four characters and one repeat, so
+    // give it room rather than racing the default timeout under load.
+    await waitFor(() => expect(screen.getByText(/^Connected$/)).toBeInTheDocument(), {
+      timeout: 5000,
+    })
+    expect(rfb.guestSaw).toBe("aaaa")
+  })
+
+  it("says a paste was cut short rather than reporting it as finished", async () => {
+    const { rfb, sink } = await connectedSession()
+
+    pressPaste()
+    paste(sink, "abcdefghij")
+    await waitFor(() => expect(rfb.sendKey).toHaveBeenCalled())
+    act(() => {
+      rfb.dispatchEvent(new CustomEvent("disconnect", { detail: { clean: false, reason: "gone" } }))
+    })
+
+    expect(await screen.findByText(/paste stopped after \d+/i)).toBeInTheDocument()
+  })
+
+  it("abandons the paste when the session is torn down and rebuilt", async () => {
+    const { rfb, sink } = await connectedSession()
+
+    pressPaste()
+    paste(sink, "abcdefghijklmnop")
+    await waitFor(() => expect(rfb.sendKey).toHaveBeenCalled())
+
+    // Reconnect tears the session down and builds a new one. The paste
+    // belongs to the old session and must not continue into either.
+    await userEvent.click(screen.getByTitle("Reconnect"))
+    await waitFor(() => expect(FakeRFB.instances).toHaveLength(2))
+    const replacement = FakeRFB.instances[1]
+    act(() => {
+      replacement.dispatchEvent(new CustomEvent("connect"))
+    })
+
+    const beforeWait = rfb.guestSaw.length
+    await new Promise((resolve) => setTimeout(resolve, 250))
+
+    expect(replacement.guestSaw).toBe("")
+    expect(rfb.guestSaw.length - beforeWait).toBeLessThanOrEqual(1)
+  })
+
+  it("keeps nothing of the pasted text in the sink", async () => {
+    const { sink } = await connectedSession()
+
+    pressPaste()
+    paste(sink, "secret")
+
+    expect(sink.value).toBe("")
+  })
+})
+
+describe("VncTab paste shortcut on other keyboard layouts", () => {
+  it("matches the chord by the character, not only by the physical key", async () => {
+    const { sink } = await connectedSession()
+
+    // On Dvorak the V character does not sit on the KeyV position.
+    pressPaste({ code: "Period", key: "v" })
+
+    expect(document.activeElement).toBe(sink)
+  })
+})
+
+describe("VncTab paste when the clipboard gives nothing", () => {
+  it("says the clipboard was blocked and takes the keyboard back", async () => {
+    // The session has to come up on real timers: waitFor never advances under
+    // fake ones, and a hung await here leaks them into the next test.
+    const { rfb, sink } = await connectedSession()
+
+    // An empty or refused clipboard raises no paste event at all.
+    pressPaste()
+    expect(document.activeElement).toBe(sink)
+
+    expect(await screen.findByText(/clipboard blocked/i)).toBeInTheDocument()
+    expect(rfb.focus).toHaveBeenCalled()
+  })
+})
+
+describe("VncTab paste feedback in the toolbar", () => {
+  it("paces itself at the measured default when the caller gives no delay", async () => {
+    // Rendered without the prop, because nothing else reads the component's
+    // own default: setting it to zero would otherwise leave the suite green
+    // while the guest drops characters.
+    const { container } = renderWithK8sProvider(<VncTab ad={ad} instance={instance} />, {
+      client: runningClient(),
+    })
+    await waitFor(() => expect(FakeRFB.instances).toHaveLength(1))
+    const rfb = FakeRFB.instances[0]
+    act(() => {
+      rfb.dispatchEvent(new CustomEvent("connect"))
+    })
+    rfb.canvas.focus()
+    const sink = container.querySelector("textarea")
+    if (!sink) throw new Error("paste sink missing")
+
+    const started = Date.now()
+    pressPaste()
+    paste(sink, "ab")
+    await waitFor(() => expect(rfb.guestSaw).toBe("ab"), { timeout: 5000 })
+
+    // Fourteen opening releases and two characters at 25 ms a piece.
+    expect(Date.now() - started).toBeGreaterThan(200)
+  })
+
+  it("counts the characters while they are typed", async () => {
+    // The one test that needs real pacing: with no delay the run finishes
+    // before a count can be observed.
+    const { sink } = await connectedSession(5)
+
+    pressPaste()
+    paste(sink, "abcdef")
+
+    // The count starts after the prelude, so match any position rather than
+    // racing the first one.
+    expect(await screen.findByText(/pasting \d+\/6/i, undefined, { timeout: 5000 })).toBeInTheDocument()
+    await waitFor(() => expect(screen.getByText(/^Connected$/)).toBeInTheDocument(), {
+      timeout: 5000,
+    })
+  })
+
+  it("sends nothing at all when a character cannot be typed", async () => {
+    const { rfb, sink } = await connectedSession()
+
+    // Dropping the Cyrillic and typing the rest would run "rm -rf /srv",
+    // newline included, before any notice reached the user.
+    pressPaste()
+    paste(sink, "rm -rf /srv/данные\n")
+
+    expect(await screen.findByText(/nothing sent/i)).toBeInTheDocument()
+    expect(rfb.guestSaw).toBe("")
+  })
+
+  it("counts the distinct characters it could not type", async () => {
+    const { sink } = await connectedSession()
+
+    pressPaste()
+    paste(sink, "привет")
+
+    expect(await screen.findByText(/6 chars not on layout/i)).toBeInTheDocument()
+  })
+})
diff --git a/packages/system/dashboard/images/console/apps/console/src/routes/detail/VncTab.test.tsx b/packages/system/dashboard/images/console/apps/console/src/routes/detail/VncTab.test.tsx
new file mode 100644
index 0000000000..c6c884e438
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/routes/detail/VncTab.test.tsx
@@ -0,0 +1,142 @@
+import { describe, it, expect, vi, afterEach } from "vitest"
+import { screen, waitFor, cleanup } from "@testing-library/react"
+import { K8sClient } from "@cozystack/k8s-client"
+import { renderWithK8sProvider } from "../../test-utils/render.tsx"
+import { VncTab } from "./VncTab.tsx"
+import { VMPowerControls } from "./VMPowerControls.tsx"
+import type { ApplicationDefinition, ApplicationInstance } from "@cozystack/types"
+
+function makeAd(kind: string, release?: { prefix?: string }): ApplicationDefinition {
+  return {
+    apiVersion: "cozystack.io/v1alpha1",
+    kind: "ApplicationDefinition",
+    metadata: { name: "virtual-machine" },
+    spec: {
+      application: {
+        kind,
+        plural: "vminstances",
+        singular: "vm-instance",
+        openAPISchema: "{}",
+      },
+      ...(release ? { release } : {}),
+    },
+  }
+}
+
+const instance: ApplicationInstance = {
+  apiVersion: "apps.cozystack.io/v1alpha1",
+  kind: "VMInstance",
+  metadata: { name: "demo-vm", namespace: "tenant-root" },
+}
+
+// Stopped keeps VncTab off the noVNC code path (no websocket in jsdom) while
+// still exercising the name resolution and the gating branches.
+function makeClient(printableStatus = "Stopped") {
+  const client = new K8sClient()
+  vi.spyOn(client, "list").mockResolvedValue({
+    apiVersion: "kubevirt.io/v1",
+    kind: "VirtualMachineList",
+    metadata: {},
+    items: [
+      {
+        apiVersion: "kubevirt.io/v1",
+        kind: "VirtualMachine",
+        metadata: { name: "vm-instance-demo-vm" },
+        status: { printableStatus },
+      },
+    ],
+  })
+  vi.spyOn(client, "watch").mockReturnValue(() => {})
+  return client
+}
+
+function fieldSelector(client: K8sClient): string | undefined {
+  const calls = (client.list as unknown as { mock: { calls: unknown[][] } }).mock.calls
+  const search = calls[0]?.[4] as { fieldSelector?: string } | undefined
+  return search?.fieldSelector
+}
+
+afterEach(() => {
+  cleanup()
+  vi.restoreAllMocks()
+})
+
+describe("VncTab gating", () => {
+  it("shows the VMInstance-only notice and never queries for non-VM apps", () => {
+    const client = makeClient()
+    renderWithK8sProvider(
+      <VncTab ad={makeAd("Postgres")} instance={instance} />,
+      { client },
+    )
+
+    expect(screen.getByText(/VNC is only available for VMInstance/i)).toBeInTheDocument()
+    expect(client.list).not.toHaveBeenCalled()
+  })
+
+  it("shows the not-running notice when the VM is stopped", async () => {
+    const client = makeClient("Stopped")
+    renderWithK8sProvider(<VncTab ad={makeAd("VMInstance")} instance={instance} />, { client })
+
+    await waitFor(() =>
+      expect(screen.getByText(/virtual machine is not running/i)).toBeInTheDocument(),
+    )
+  })
+})
+
+describe("VncTab VM-name resolution", () => {
+  it("field-selects the name from the singular when release.prefix is unset", async () => {
+    const client = makeClient()
+    renderWithK8sProvider(<VncTab ad={makeAd("VMInstance")} instance={instance} />, { client })
+
+    await waitFor(() =>
+      expect(client.list).toHaveBeenCalledWith(
+        "kubevirt.io",
+        "v1",
+        "virtualmachines",
+        "tenant-root",
+        expect.objectContaining({ fieldSelector: "metadata.name=vm-instance-demo-vm" }),
+      ),
+    )
+  })
+
+  it("field-selects the name from an explicit release.prefix", async () => {
+    const client = makeClient()
+    renderWithK8sProvider(
+      <VncTab ad={makeAd("VMInstance", { prefix: "custom-" })} instance={instance} />,
+      { client },
+    )
+
+    await waitFor(() =>
+      expect(client.list).toHaveBeenCalledWith(
+        "kubevirt.io",
+        "v1",
+        "virtualmachines",
+        "tenant-root",
+        expect.objectContaining({ fieldSelector: "metadata.name=custom-demo-vm" }),
+      ),
+    )
+  })
+})
+
+describe("VMPowerControls and VncTab agree on the VirtualMachine name", () => {
+  it.each([
+    ["unset prefix", undefined],
+    ["explicit prefix", { prefix: "custom-" }],
+  ])("resolve the identical name (%s)", async (_label, release) => {
+    const pcClient = makeClient()
+    renderWithK8sProvider(
+      <VMPowerControls ad={makeAd("VMInstance", release)} instance={instance} />,
+      { client: pcClient },
+    )
+    await waitFor(() => expect(pcClient.list).toHaveBeenCalled())
+
+    const vncClient = makeClient()
+    renderWithK8sProvider(
+      <VncTab ad={makeAd("VMInstance", release)} instance={instance} />,
+      { client: vncClient },
+    )
+    await waitFor(() => expect(vncClient.list).toHaveBeenCalled())
+
+    expect(fieldSelector(pcClient)).toBe(fieldSelector(vncClient))
+  })
+})
diff --git a/packages/system/dashboard/images/console/apps/console/src/routes/detail/VncTab.tsx b/packages/system/dashboard/images/console/apps/console/src/routes/detail/VncTab.tsx
new file mode 100644
index 0000000000..ad314b48e9
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/routes/detail/VncTab.tsx
@@ -0,0 +1,533 @@
+import { useCallback, useEffect, useRef, useState } from "react"
+import { Monitor, Maximize2, Minimize2, Power, RotateCcw, Terminal } from "lucide-react"
+import { useK8sList, type K8sResource } from "@cozystack/k8s-client"
+import type { ApplicationDefinition, ApplicationInstance } from "@cozystack/types"
+import { releasePrefix } from "../../lib/app-definitions.ts"
+import { pastesWithMeta } from "../../lib/platform.ts"
+import { planKeystrokes } from "../../lib/vnc-keymap.ts"
+import {
+  typeKeystrokes,
+  DEFAULT_KEY_DELAY_MS,
+  LATE_MODIFIER_WINDOW_MS,
+  type KeySender,
+} from "../../lib/vnc-typing.ts"
+
+// How long a one-off paste notice stays in the toolbar before the status
+// returns to the connection state.
+const PASTE_NOTICE_MS = 5000
+
+// How long the hidden sink may hold the keyboard while waiting for the paste
+// the shortcut should have produced.
+const SINK_FOCUS_TIMEOUT_MS = 300
+
+type PasteState =
+  | { kind: "idle" }
+  | { kind: "typing"; typed: number; total: number }
+  | { kind: "blocked" }
+  | { kind: "skipped"; count: number }
+  | { kind: "interrupted"; typed: number }
+
+interface VncTabProps {
+  ad: ApplicationDefinition
+  instance: ApplicationInstance
+  /** Injectable so tests do not run at the pace of a real keyboard. */
+  keyDelayMs?: number
+}
+
+export function VncTab({ ad, instance, keyDelayMs = DEFAULT_KEY_DELAY_MS }: VncTabProps) {
+  const ns = instance.metadata.namespace
+  const appKind = ad.spec?.application.kind
+  // The cozystack app name (e.g. "demo-vm") maps to the KubeVirt VirtualMachine
+  // / VirtualMachineInstance named "<release.prefix><name>". releasePrefix()
+  // discovers the prefix from the ApplicationDefinition (falling back to
+  // "<singular>-") so this resolves identically to VMPowerControls — both must
+  // target the same object, so neither may hardcode the prefix.
+  const vmName = `${releasePrefix(ad)}${instance.metadata.name}`
+
+  // Don't open a VNC websocket unless the VM is actually running — there is no
+  // VirtualMachineInstance to attach to otherwise, and the socket would just
+  // error out. List the VirtualMachine by a metadata.name field-selector so the
+  // useK8sList watch layer streams power-state transitions live — no poll.
+  const { data: vmList, isLoading: vmLoading } = useK8sList<
+    K8sResource<unknown, { printableStatus?: string }>
+  >(
+    {
+      apiGroup: "kubevirt.io",
+      apiVersion: "v1",
+      plural: "virtualmachines",
+      namespace: ns ?? "",
+    },
+    {
+      enabled: appKind === "VMInstance" && !!ns,
+      fieldSelector: `metadata.name=${vmName}`,
+    },
+  )
+  const powerStatus = vmList?.items[0]?.status?.printableStatus
+  const isRunning = powerStatus === "Running"
+
+  const containerRef = useRef<HTMLDivElement>(null)
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any -- noVNC RFB has no bundled types
+  const rfbRef = useRef<any>(null)
+  const [connected, setConnected] = useState(false)
+  const [loading, setLoading] = useState(true)
+  const [error, setError] = useState<string | null>(null)
+  const [fullscreen, setFullscreen] = useState(false)
+  const [connectionKey, setConnectionKey] = useState(0)
+  const [desktopSize, setDesktopSize] = useState<{ width: number; height: number } | null>(null)
+  const [paste, setPaste] = useState<PasteState>({ kind: "idle" })
+  const senderRef = useRef<KeySender | null>(null)
+  const pastingRef = useRef(false)
+  const pasteAbortRef = useRef<AbortController | null>(null)
+  // When the shortcut was pressed, so the paste knows how much of noVNC's
+  // modifier-delivery window is still ahead of it.
+  const shortcutAtRef = useRef(0)
+  const pasteSinkRef = useRef<HTMLTextAreaElement>(null)
+  const sinkTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null)
+
+  useEffect(() => {
+    if (!containerRef.current || appKind !== "VMInstance" || !isRunning) return
+
+    const el = containerRef.current
+    while (el.firstChild) el.removeChild(el.firstChild)
+
+    setLoading(true)
+    setError(null)
+    setConnected(false)
+    setPaste({ kind: "idle" })
+    senderRef.current = null
+
+    const wsProtocol = window.location.protocol === "https:" ? "wss:" : "ws:"
+    const wsUrl = `${wsProtocol}//${window.location.host}/k8s/apis/subresources.kubevirt.io/v1/namespaces/${ns}/virtualmachineinstances/${vmName}/vnc`
+
+    // Prevent stale import resolutions from firing after cleanup or reconnect
+    let cancelled = false
+
+    import("@novnc/novnc/lib/rfb")
+      .then((module) => {
+        if (cancelled || !containerRef.current) return
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        const RFB = (module as any).default?.default ?? module.default
+        try {
+          const rfb = new RFB(el, wsUrl, { credentials: {} })
+          rfb.scaleViewport = true
+          rfb.resizeSession = true
+
+          // Guard each handler: if rfbRef was replaced by a newer session, ignore
+          rfb.addEventListener("connect", () => {
+            if (rfbRef.current !== rfb) return
+            setLoading(false)
+            setConnected(true)
+            setError(null)
+            senderRef.current = {
+              sendKey: (keysym: number, code: string, down: boolean) =>
+                rfb.sendKey(keysym, code, down),
+            }
+            requestAnimationFrame(() => {
+              const canvas = el.querySelector("canvas")
+              if (canvas) setDesktopSize({ width: canvas.width, height: canvas.height })
+            })
+          })
+
+          // eslint-disable-next-line @typescript-eslint/no-explicit-any
+          rfb.addEventListener("disconnect", (e: any) => {
+            if (rfbRef.current !== rfb) return
+            setConnected(false)
+            setLoading(false)
+            senderRef.current = null
+            if (!e.detail?.clean) setError(`Connection lost: ${e.detail?.reason ?? "unknown"}`)
+          })
+
+          // eslint-disable-next-line @typescript-eslint/no-explicit-any
+          rfb.addEventListener("securityfailure", (e: any) => {
+            if (rfbRef.current !== rfb) return
+            setConnected(false)
+            setLoading(false)
+            senderRef.current = null
+            setError(`Security failure: ${e.detail?.status ?? "authentication failed"}`)
+          })
+
+          rfbRef.current = rfb
+        } catch (err) {
+          if (!cancelled) {
+            setLoading(false)
+            setError(`Failed to initialize VNC: ${(err as Error).message}`)
+          }
+        }
+      })
+      .catch((err) => {
+        if (!cancelled) {
+          setLoading(false)
+          setError(`Failed to load VNC library: ${err.message}`)
+        }
+      })
+
+    return () => {
+      cancelled = true
+      // Stop an in-flight paste explicitly. noVNC's "disconnect" event arrives
+      // asynchronously, by which point the guard below has already dropped it,
+      // so senderRef would otherwise stay non-null and the typing loop would
+      // run on past the unmount.
+      pasteAbortRef.current?.abort()
+      senderRef.current = null
+      if (rfbRef.current) {
+        try {
+          rfbRef.current.disconnect()
+        } catch {
+          /* ignore: socket may already be closed */
+        }
+        rfbRef.current = null
+      }
+    }
+  }, [appKind, ns, vmName, isRunning, connectionKey])
+
+  useEffect(() => {
+    const handler = () => setFullscreen(!!document.fullscreenElement)
+    document.addEventListener("fullscreenchange", handler)
+    return () => document.removeEventListener("fullscreenchange", handler)
+  }, [])
+
+  // There is no clipboard channel behind this console: qemu only forwards RFB
+  // cut-text to a vdagent chardev and virt-launcher attaches none. So a paste
+  // is typed, one key at a time, on the layout the guest has active.
+  const typeIntoGuest = useCallback(async (text: string) => {
+    const sender = senderRef.current
+    if (!sender || pastingRef.current) return
+    pastingRef.current = true
+    try {
+      const { keystrokes, unsupported } = planKeystrokes(text)
+
+      // Typing the rest would run a different command than the one pasted: a
+      // dropped character inside a path still leaves a valid path, and the
+      // newline after it still submits. "rm -rf /srv/данные" becomes
+      // "rm -rf /srv". So nothing is sent, and the notice comes first.
+      if (unsupported.length > 0) {
+        setPaste({ kind: "skipped", count: unsupported.length })
+        return
+      }
+
+      if (keystrokes.length > 0) {
+        const controller = new AbortController()
+        pasteAbortRef.current = controller
+        setPaste({ kind: "typing", typed: 0, total: keystrokes.length })
+        const elapsed = shortcutAtRef.current ? Date.now() - shortcutAtRef.current : 0
+        const result = await typeKeystrokes(sender, keystrokes, {
+          delayMs: keyDelayMs,
+          settleMs: Math.max(0, LATE_MODIFIER_WINDOW_MS - elapsed),
+          signal: controller.signal,
+          // Identity rather than liveness. The cleanup below aborts an
+          // in-flight paste, so a replacement session cannot be reached in
+          // practice; asking whether this sender is still the current one
+          // costs nothing and does not depend on that ordering holding.
+          isConnected: () => senderRef.current === sender,
+          onProgress: (typed, total) => setPaste({ kind: "typing", typed, total }),
+        })
+        pasteAbortRef.current = null
+        if (result.stopped !== "done") {
+          setPaste({ kind: "interrupted", typed: result.typed })
+          return
+        }
+      }
+      setPaste({ kind: "idle" })
+    } finally {
+      pastingRef.current = false
+    }
+  }, [keyDelayMs])
+
+  useEffect(() => {
+    if (!connected) return
+
+    const handler = (e: KeyboardEvent) => {
+      const isV = e.code === "KeyV" || e.key.toLowerCase() === "v"
+      if (!isV || e.altKey || e.shiftKey) return
+      // Only the chord this platform actually pastes with. Taking the other
+      // one buys nothing — the browser does not paste on Ctrl+V on a Mac —
+      // and costs the guest a key it has its own use for, such as visual
+      // block in vim or a paste from the guest's own clipboard on Windows.
+      if (pastesWithMeta() ? !e.metaKey : !e.ctrlKey) return
+      // Only when the console itself holds the keyboard — a paste into the
+      // page's own inputs must keep working.
+      const el = containerRef.current
+      const sink = pasteSinkRef.current
+      if (!el || !sink || !document.activeElement) return
+      if (!el.contains(document.activeElement)) return
+
+      // Deliberately no preventDefault: the browser hands the clipboard over
+      // for free when the paste lands in a focused text field, while
+      // navigator.clipboard.readText() would put a permission prompt between
+      // the user and every paste. Moving the focus here, inside the keydown,
+      // is what redirects the paste into the sink.
+      //
+      // stopPropagation is what keeps noVNC from seeing the shortcut: it calls
+      // preventDefault() on keydown, which would cancel the paste outright and
+      // send the guest a Ctrl+V it cannot use.
+      e.stopPropagation()
+      shortcutAtRef.current = Date.now()
+      sink.value = ""
+      sink.focus()
+
+      // An empty or refused clipboard raises no paste event at all, and the
+      // console would sit there with the keyboard parked in an invisible box.
+      if (sinkTimerRef.current) clearTimeout(sinkTimerRef.current)
+      sinkTimerRef.current = setTimeout(() => {
+        sinkTimerRef.current = null
+        if (document.activeElement !== sink) return
+        rfbRef.current?.focus()
+        setPaste({ kind: "blocked" })
+      }, SINK_FOCUS_TIMEOUT_MS)
+    }
+
+    document.addEventListener("keydown", handler, true)
+    return () => document.removeEventListener("keydown", handler, true)
+  }, [connected])
+
+  useEffect(
+    () => () => {
+      if (sinkTimerRef.current) clearTimeout(sinkTimerRef.current)
+    },
+    [],
+  )
+
+  const handleSinkPaste = (e: React.ClipboardEvent<HTMLTextAreaElement>) => {
+    e.preventDefault()
+    if (sinkTimerRef.current) {
+      clearTimeout(sinkTimerRef.current)
+      sinkTimerRef.current = null
+    }
+    const text = e.clipboardData?.getData("text/plain") ?? ""
+    rfbRef.current?.focus()
+    if (text) void typeIntoGuest(text)
+  }
+
+  const handleSinkBlur = () => {
+    if (pasteSinkRef.current) pasteSinkRef.current.value = ""
+  }
+
+  // One-off notices clear themselves; a paste in progress reports until it ends.
+  useEffect(() => {
+    if (paste.kind === "idle" || paste.kind === "typing") return
+    const timer = setTimeout(() => setPaste({ kind: "idle" }), PASTE_NOTICE_MS)
+    return () => clearTimeout(timer)
+  }, [paste])
+
+  if (appKind !== "VMInstance") {
+    return (
+      <div className="flex h-full items-center justify-center p-6">
+        <div className="flex flex-col items-center gap-2 text-center">
+          <Terminal className="h-8 w-8 text-slate-300" />
+          <p className="text-sm text-slate-500">VNC is only available for VMInstance.</p>
+        </div>
+      </div>
+    )
+  }
+
+  if (vmLoading) {
+    return (
+      <div className="flex h-full items-center justify-center p-6">
+        <p className="text-sm text-slate-500">Loading…</p>
+      </div>
+    )
+  }
+
+  if (!isRunning) {
+    return (
+      <div className="flex h-full items-center justify-center p-6">
+        <div className="flex flex-col items-center gap-2 text-center">
+          <Monitor className="h-8 w-8 text-slate-300" />
+          <p className="text-sm text-slate-500">
+            The virtual machine is not running
+            {powerStatus ? ` (status: ${powerStatus})` : ""}. Start it to use the VNC console.
+          </p>
+        </div>
+      </div>
+    )
+  }
+
+  const handleFullscreen = () => {
+    const wrapper = containerRef.current?.parentElement
+    if (!wrapper) return
+    if (!document.fullscreenElement) {
+      wrapper.requestFullscreen()
+    } else {
+      document.exitFullscreen()
+    }
+  }
+
+  const handleReconnect = () => {
+    if (rfbRef.current) {
+      try {
+        rfbRef.current.disconnect()
+      } catch {
+        /* ignore: socket may already be closed */
+      }
+      rfbRef.current = null
+    }
+    setDesktopSize(null)
+    setConnectionKey((k) => k + 1)
+  }
+
+  const statusColor = connected ? "bg-emerald-500" : loading ? "bg-amber-400" : "bg-red-500"
+  const connectionLabel = connected ? "Connected" : loading ? "Connecting…" : "Disconnected"
+  const statusLabel =
+    paste.kind === "typing"
+      ? `Pasting ${paste.typed}/${paste.total}`
+      : paste.kind === "blocked"
+        ? "Clipboard blocked"
+        : paste.kind === "skipped"
+          ? `${paste.count} chars not on layout — nothing sent`
+          : paste.kind === "interrupted"
+            ? `Paste stopped after ${paste.typed}`
+            : connectionLabel
+
+  return (
+    <div className="flex h-full flex-col p-4">
+      {/* Outer panel — shadow bridges the light page and dark terminal */}
+      <div className="flex flex-1 flex-col overflow-hidden rounded-xl shadow-[0_4px_24px_rgba(0,0,0,0.12)] ring-1 ring-slate-900/8">
+        {/* ── Toolbar ── */}
+        <div className="flex shrink-0 items-center justify-between bg-[#1e2330] px-3 py-2">
+          {/* Left: status pill + vm name */}
+          <div className="flex items-center gap-3">
+            <div className="flex items-center gap-1.5">
+              <span className="relative flex h-2 w-2">
+                {connected && (
+                  <span className="absolute inline-flex h-full w-full animate-ping rounded-full bg-emerald-400 opacity-60" />
+                )}
+                <span className={`relative inline-flex h-2 w-2 rounded-full ${statusColor}`} />
+              </span>
+              <span className="text-[11px] font-medium tracking-wide text-slate-400">
+                {statusLabel}
+              </span>
+            </div>
+
+            <div className="h-3.5 w-px bg-slate-700" />
+
+            <div className="flex items-center gap-1.5 text-[11px] text-slate-500">
+              <Terminal className="h-3 w-3" />
+              <span className="font-mono">{instance.metadata.name}</span>
+            </div>
+          </div>
+
+          {/* Right: action buttons */}
+          <div className="flex items-center gap-0.5">
+            {connected && (
+              <ToolbarButton
+                onClick={() => rfbRef.current?.sendCtrlAltDel()}
+                title="Ctrl+Alt+Del"
+              >
+                <Power className="h-3.5 w-3.5" />
+              </ToolbarButton>
+            )}
+
+            <div className="mx-1 h-3.5 w-px bg-slate-700" />
+
+            <ToolbarButton
+              onClick={handleFullscreen}
+              title={fullscreen ? "Exit fullscreen" : "Fullscreen"}
+            >
+              {fullscreen ? (
+                <Minimize2 className="h-3.5 w-3.5" />
+              ) : (
+                <Maximize2 className="h-3.5 w-3.5" />
+              )}
+            </ToolbarButton>
+
+            <ToolbarButton onClick={handleReconnect} disabled={loading} title="Reconnect">
+              <RotateCcw className={`h-3.5 w-3.5 ${loading ? "animate-spin" : ""}`} />
+            </ToolbarButton>
+          </div>
+        </div>
+
+        {/* ── Canvas area ── */}
+        <div
+          className="relative flex-1 overflow-hidden bg-black"
+          style={
+            desktopSize
+              ? {
+                  aspectRatio: `${desktopSize.width} / ${desktopSize.height}`,
+                  width: "100%",
+                  flex: "unset",
+                }
+              : undefined
+          }
+        >
+          {/* Loading overlay */}
+          {loading && (
+            <div className="absolute inset-0 z-10 flex flex-col items-center justify-center gap-3 bg-[#0d0f14]">
+              <div className="flex gap-1">
+                {[0, 1, 2].map((i) => (
+                  <span
+                    key={i}
+                    className="h-1.5 w-1.5 animate-bounce rounded-full bg-slate-600"
+                    style={{ animationDelay: `${i * 0.15}s` }}
+                  />
+                ))}
+              </div>
+              <p className="text-[11px] font-medium tracking-widest text-slate-600 uppercase">
+                Connecting
+              </p>
+            </div>
+          )}
+
+          {/* Error overlay */}
+          {error && !loading && (
+            <div className="absolute inset-0 z-10 flex flex-col items-center justify-center gap-4 bg-[#0d0f14] p-8">
+              <div className="flex h-10 w-10 items-center justify-center rounded-full bg-red-900/40 ring-1 ring-red-800/60">
+                <Terminal className="h-5 w-5 text-red-400" />
+              </div>
+              <div className="text-center">
+                <p className="text-sm font-medium text-red-400">Connection failed</p>
+                <p className="mt-1 text-xs text-slate-600">{error}</p>
+              </div>
+              <button
+                type="button"
+                onClick={handleReconnect}
+                className="flex items-center gap-1.5 rounded-md bg-slate-800 px-3 py-1.5 text-xs font-medium text-slate-300 ring-1 ring-slate-700 transition-colors hover:bg-slate-700 hover:text-white"
+              >
+                <RotateCcw className="h-3 w-3" /> Reconnect
+              </button>
+            </div>
+          )}
+
+          {/* Invisible sink that catches the browser paste. It sits outside the
+              noVNC container, which is emptied on every reconnect. */}
+          <textarea
+            ref={pasteSinkRef}
+            onPaste={handleSinkPaste}
+            onBlur={handleSinkBlur}
+            tabIndex={-1}
+            aria-hidden="true"
+            className="pointer-events-none absolute top-0 left-0 h-px w-px resize-none border-0 p-0 opacity-0 outline-none"
+          />
+
+          <div ref={containerRef} className="absolute inset-0" />
+        </div>
+      </div>
+    </div>
+  )
+}
+
+function ToolbarButton({
+  onClick,
+  title,
+  disabled,
+  label,
+  children,
+}: {
+  onClick: () => void
+  title: string
+  disabled?: boolean
+  label?: string
+  children: React.ReactNode
+}) {
+  return (
+    <button
+      type="button"
+      onClick={onClick}
+      disabled={disabled}
+      title={title}
+      className="flex cursor-pointer items-center gap-1 rounded px-1.5 py-1 text-slate-500 transition-colors hover:bg-slate-700/60 hover:text-slate-200 disabled:cursor-not-allowed disabled:opacity-30"
+    >
+      {children}
+      {label && <span className="text-[10px] font-medium">{label}</span>}
+    </button>
+  )
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/routes/detail/WorkloadsTab.tsx b/packages/system/dashboard/images/console/apps/console/src/routes/detail/WorkloadsTab.tsx
new file mode 100644
index 0000000000..96bd5b7739
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/routes/detail/WorkloadsTab.tsx
@@ -0,0 +1,151 @@
+import { useK8sList, type K8sResource } from "@cozystack/k8s-client"
+import { Section, Spinner, StatusBadge } from "@cozystack/ui"
+import type { ApplicationDefinition, ApplicationInstance } from "@cozystack/types"
+import { appInstanceLabel } from "../../lib/labels.ts"
+import { formatAge } from "../../lib/status.ts"
+
+interface WorkloadStatus {
+  replicas?: number
+  readyReplicas?: number
+  availableReplicas?: number
+}
+
+interface PodStatus {
+  phase?: string
+  containerStatuses?: { ready: boolean; restartCount: number }[]
+}
+
+function WorkloadList({
+  title,
+  ref,
+  label,
+}: {
+  title: string
+  ref: { apiGroup: string; apiVersion: string; plural: string; namespace: string }
+  label: string
+}) {
+  const { data, isLoading } = useK8sList<K8sResource<unknown, WorkloadStatus>>(ref, {
+    labelSelector: label,
+  })
+  const items = data?.items ?? []
+  if (isLoading) {
+    return (
+      <Section title={title} bodyClassName="p-0">
+        <div className="flex items-center gap-2 px-5 py-4 text-xs text-slate-500">
+          <Spinner /> Loading…
+        </div>
+      </Section>
+    )
+  }
+  if (items.length === 0) return null
+
+  return (
+    <Section title={title} bodyClassName="p-0">
+      <ul className="divide-y divide-slate-100">
+        {items.map((item) => {
+          const status = item.status
+          const ready = status?.readyReplicas ?? 0
+          const desired = status?.replicas ?? 0
+          return (
+            <li
+              key={item.metadata.name}
+              className="flex items-center justify-between px-5 py-2.5 text-sm"
+            >
+              <span className="font-mono text-xs text-slate-800">
+                {item.metadata.name}
+              </span>
+              <span className="flex items-center gap-3 text-xs text-slate-500 tabular-nums">
+                <span>
+                  {ready}/{desired}
+                </span>
+                <span>{formatAge(item.metadata.creationTimestamp)}</span>
+              </span>
+            </li>
+          )
+        })}
+      </ul>
+    </Section>
+  )
+}
+
+function PodsList({ namespace, label }: { namespace: string; label: string }) {
+  const { data, isLoading } = useK8sList<K8sResource<unknown, PodStatus>>(
+    { apiGroup: "", apiVersion: "v1", plural: "pods", namespace },
+    { labelSelector: label },
+  )
+  const items = data?.items ?? []
+  if (isLoading) {
+    return (
+      <Section title="Pods" bodyClassName="p-0">
+        <div className="flex items-center gap-2 px-5 py-4 text-xs text-slate-500">
+          <Spinner /> Loading…
+        </div>
+      </Section>
+    )
+  }
+  if (items.length === 0) return null
+
+  return (
+    <Section title="Pods" bodyClassName="p-0">
+      <ul className="divide-y divide-slate-100">
+        {items.map((pod) => {
+          const ready =
+            pod.status?.containerStatuses?.filter((c) => c.ready).length ?? 0
+          const total = pod.status?.containerStatuses?.length ?? 0
+          const phase = pod.status?.phase ?? "Unknown"
+          return (
+            <li
+              key={pod.metadata.name}
+              className="flex items-center justify-between px-5 py-2.5 text-sm"
+            >
+              <span className="font-mono text-xs text-slate-800">
+                {pod.metadata.name}
+              </span>
+              <span className="flex items-center gap-3 text-xs text-slate-500 tabular-nums">
+                <StatusBadge tone={phase === "Running" ? "ok" : "warn"}>
+                  {phase}
+                </StatusBadge>
+                <span>
+                  {ready}/{total}
+                </span>
+                <span>{formatAge(pod.metadata.creationTimestamp)}</span>
+              </span>
+            </li>
+          )
+        })}
+      </ul>
+    </Section>
+  )
+}
+
+export function WorkloadsTab({
+  ad,
+  instance,
+}: {
+  ad: ApplicationDefinition
+  instance: ApplicationInstance
+}) {
+  const ns = instance.metadata.namespace ?? ""
+  const label = appInstanceLabel(ad, instance)
+
+  return (
+    <div className="space-y-4 p-6">
+      <WorkloadList
+        title="Deployments"
+        label={label}
+        ref={{ apiGroup: "apps", apiVersion: "v1", plural: "deployments", namespace: ns }}
+      />
+      <WorkloadList
+        title="StatefulSets"
+        label={label}
+        ref={{ apiGroup: "apps", apiVersion: "v1", plural: "statefulsets", namespace: ns }}
+      />
+      <WorkloadList
+        title="DaemonSets"
+        label={label}
+        ref={{ apiGroup: "apps", apiVersion: "v1", plural: "daemonsets", namespace: ns }}
+      />
+      <PodsList namespace={ns} label={label} />
+    </div>
+  )
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/routes/detail/tabs.tsx b/packages/system/dashboard/images/console/apps/console/src/routes/detail/tabs.tsx
new file mode 100644
index 0000000000..47c0e85a11
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/routes/detail/tabs.tsx
@@ -0,0 +1,32 @@
+import { NavLink } from "react-router"
+import { cn } from "@cozystack/ui"
+
+export interface Tab {
+  to: string
+  label: string
+  end?: boolean
+}
+
+export function TabBar({ tabs }: { tabs: Tab[] }) {
+  return (
+    <div className="flex gap-0.5">
+      {tabs.map((tab) => (
+        <NavLink
+          key={tab.to}
+          to={tab.to}
+          end={tab.end ?? false}
+          className={({ isActive }) =>
+            cn(
+              "relative border-b-2 px-3 py-2 text-sm transition-all duration-150",
+              isActive
+                ? "border-blue-600 font-medium text-blue-700"
+                : "border-transparent text-slate-500 hover:text-slate-800 hover:border-slate-300",
+            )
+          }
+        >
+          {tab.label}
+        </NavLink>
+      ))}
+    </div>
+  )
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/routes/detail/use-app-configmaps.ts b/packages/system/dashboard/images/console/apps/console/src/routes/detail/use-app-configmaps.ts
new file mode 100644
index 0000000000..5d35c0586a
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/routes/detail/use-app-configmaps.ts
@@ -0,0 +1,48 @@
+import { useMemo } from "react"
+import { JSON_SCHEMA, load } from "js-yaml"
+import { K8sApiError, useK8sList, type K8sResource } from "@cozystack/k8s-client"
+import type { ApplicationDefinition, ApplicationInstance } from "@cozystack/types"
+import { releasePrefix } from "../../lib/app-definitions.ts"
+
+export type ConfigMap = K8sResource & { data?: Record<string, string> }
+
+export function configMapNames(resources: string | undefined, namespace: string): string[] {
+  if (!resources) return []
+  const entries: unknown = load(resources, { schema: JSON_SCHEMA })
+  if (!Array.isArray(entries)) throw new Error("The application's resource map must contain a list.")
+  const names = new Set<string>()
+  for (const value of entries as unknown[]) {
+    if (!value || typeof value !== "object") continue
+    const entry = value as Record<string, unknown>
+    if (entry.apiVersion !== "v1" || entry.kind !== "ConfigMap") continue
+    if (entry.namespace && entry.namespace !== namespace) continue
+    if (typeof entry.name !== "string" || entry.name.length > 253 ||
+      !/^[a-z0-9](?:[a-z0-9.-]*[a-z0-9])?$/.test(entry.name)) {
+      throw new Error("The application's resource map contains an invalid ConfigMap name.")
+    }
+    names.add(entry.name)
+  }
+  return [...names]
+}
+
+export function useApplicationConfigMaps(
+  ad: ApplicationDefinition | undefined,
+  instance: ApplicationInstance | undefined,
+  namespace: string | undefined,
+) {
+  const name = ad && instance ? `${releasePrefix(ad)}${instance.metadata.name}-resourcemap` : ""
+  const query = useK8sList<ConfigMap>(
+    { apiGroup: "", apiVersion: "v1", plural: "configmaps", namespace },
+    { enabled: !!name && !!namespace, fieldSelector: `metadata.name=${name}`, retry: false },
+  )
+  const unavailable = query.error && query.error instanceof K8sApiError && [403, 404].includes(query.error.status)
+  const resources = unavailable ? undefined : query.data?.items.find((item) => item.metadata.name === name)?.data?.resources
+  const parsed = useMemo(() => {
+    try {
+      return { names: configMapNames(resources, namespace ?? ""), error: null }
+    } catch (error) {
+      return { names: [], error: error instanceof Error ? error : new Error("Invalid resource map.") }
+    }
+  }, [resources, namespace])
+  return { ...parsed, isLoading: query.isLoading, error: parsed.error ?? (unavailable ? null : query.error) ?? null }
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/routes/detail/use-resource-presence.ts b/packages/system/dashboard/images/console/apps/console/src/routes/detail/use-resource-presence.ts
new file mode 100644
index 0000000000..dee91d2a9a
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/routes/detail/use-resource-presence.ts
@@ -0,0 +1,58 @@
+import { useK8sList, type K8sResource } from "@cozystack/k8s-client"
+import type { ApplicationDefinition, ApplicationInstance } from "@cozystack/types"
+import { appInstanceLabel } from "../../lib/labels.ts"
+
+export interface ResourcePresence {
+  workloads: boolean
+  services: boolean
+  ingresses: boolean
+}
+
+/**
+ * Probe which resource groups an application instance actually owns, so the
+ * detail page can offer only the tabs that have content — e.g. Info creates
+ * secrets but no workloads, services or ingresses. The probes use the exact
+ * list refs and label selector of the corresponding tabs, so React Query
+ * shares one cache entry (and one watch) per list between probe and tab.
+ */
+export function useResourcePresence(
+  ad: ApplicationDefinition | undefined,
+  instance: ApplicationInstance | undefined,
+): ResourcePresence {
+  const ns = instance?.metadata.namespace ?? ""
+  const label = ad && instance ? appInstanceLabel(ad, instance) : ""
+  const opts = { labelSelector: label, enabled: !!ns && !!label }
+
+  const deployments = useK8sList<K8sResource>(
+    { apiGroup: "apps", apiVersion: "v1", plural: "deployments", namespace: ns },
+    opts,
+  )
+  const statefulsets = useK8sList<K8sResource>(
+    { apiGroup: "apps", apiVersion: "v1", plural: "statefulsets", namespace: ns },
+    opts,
+  )
+  const daemonsets = useK8sList<K8sResource>(
+    { apiGroup: "apps", apiVersion: "v1", plural: "daemonsets", namespace: ns },
+    opts,
+  )
+  const pods = useK8sList<K8sResource>(
+    { apiGroup: "", apiVersion: "v1", plural: "pods", namespace: ns },
+    opts,
+  )
+  const services = useK8sList<K8sResource>(
+    { apiGroup: "", apiVersion: "v1", plural: "services", namespace: ns },
+    opts,
+  )
+  const ingresses = useK8sList<K8sResource>(
+    { apiGroup: "networking.k8s.io", apiVersion: "v1", plural: "ingresses", namespace: ns },
+    opts,
+  )
+
+  const has = (q: { data?: { items: unknown[] } }) => (q.data?.items.length ?? 0) > 0
+
+  return {
+    workloads: has(deployments) || has(statefulsets) || has(daemonsets) || has(pods),
+    services: has(services),
+    ingresses: has(ingresses),
+  }
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/routes/sidebar-sections.test.tsx b/packages/system/dashboard/images/console/apps/console/src/routes/sidebar-sections.test.tsx
new file mode 100644
index 0000000000..efb69dc7b5
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/routes/sidebar-sections.test.tsx
@@ -0,0 +1,256 @@
+import { describe, it, expect, vi } from "vitest"
+import { renderHook, waitFor } from "@testing-library/react"
+import { QueryClient, QueryClientProvider } from "@tanstack/react-query"
+import {
+  K8sClient,
+  K8sProvider,
+  type K8sList,
+  type SelfSubjectAccessReview,
+} from "@cozystack/k8s-client"
+import type { ReactNode } from "react"
+import {
+  useAdminSidebarSections,
+  useCanSeeAdmin,
+  useConsoleSidebarSections,
+  useMarketplaceSidebarSections,
+} from "./sidebar-sections.tsx"
+
+const emptyAppDefList: K8sList<unknown> = {
+  apiVersion: "cozystack.io/v1alpha1",
+  kind: "ApplicationDefinitionList",
+  metadata: {},
+  items: [],
+}
+
+// The admin gates issue two SSARs (nodes/list for Cluster Usage,
+// backupclasses/update for Backup Classes); answer each by requested resource.
+function makeClient(
+  allow: Record<string, boolean | "pending">,
+  appDefs: K8sList<unknown> = emptyAppDefList,
+): K8sClient {
+  const client = new K8sClient()
+  vi.spyOn(client, "list").mockResolvedValue(appDefs as K8sList<unknown>)
+  vi.spyOn(client, "create").mockImplementation(async (_g, _v, _p, body) => {
+    const resource =
+      (body as SelfSubjectAccessReview).spec?.resourceAttributes?.resource ?? ""
+    if (allow[resource] === "pending") return new Promise(() => ({})) as never
+    return {
+      ...(body as object),
+      status: { allowed: allow[resource] === true },
+    } as unknown
+  })
+  return client
+}
+
+function makeWrapper(client: K8sClient) {
+  const queryClient = new QueryClient({
+    defaultOptions: { queries: { retry: false, gcTime: 0 } },
+  })
+  return function Wrapper({ children }: { children: ReactNode }) {
+    return (
+      <QueryClientProvider client={queryClient}>
+        <K8sProvider client={client} queryClient={queryClient}>
+          {children}
+        </K8sProvider>
+      </QueryClientProvider>
+    )
+  }
+}
+
+function findItem(
+  sections: { title: string; items: { label: string; to: string }[] }[],
+  label: string,
+) {
+  for (const section of sections) {
+    const found = section.items.find((i) => i.label === label)
+    if (found) return found
+  }
+  return undefined
+}
+
+function hasItemTo(
+  sections: { items: { to: string }[] }[],
+  to: string,
+) {
+  return sections.some((s) => s.items.some((i) => i.to === to))
+}
+
+function sectionIndex(sections: { title: string }[], title: string) {
+  return sections.findIndex((s) => s.title === title)
+}
+
+describe("useConsoleSidebarSections — admin areas moved out", () => {
+  it("keeps the per-tenant Backups group but drops Cluster Usage and admin Backup Classes", async () => {
+    const client = makeClient({ nodes: true, backupclasses: true })
+    const { result } = renderHook(() => useConsoleSidebarSections(), {
+      wrapper: makeWrapper(client),
+    })
+    await waitFor(() => expect(result.current.length).toBeGreaterThan(0))
+    // Per-tenant backups stay in Console.
+    expect(findItem(result.current, "Plans")?.to).toBe("/console/backups/plans")
+    // Cluster-wide admin areas are gone from Console.
+    expect(findItem(result.current, "Cluster")).toBeUndefined()
+    expect(hasItemTo(result.current, "/console/backups/backupclasses")).toBe(false)
+    // Administration moved to the Admin portal.
+    expect(sectionIndex(result.current, "Administration")).toBe(-1)
+    expect(findItem(result.current, "Info")).toBeUndefined()
+    expect(findItem(result.current, "Tenants")).toBeUndefined()
+  })
+
+  // Migration is a tenant area, not an admin one: a tenant registers their own
+  // vCenter and runs their own imports, so it belongs beside Backups in Console
+  // rather than in the admin portal.
+  it("offers the Migration group with both source and import entries", async () => {
+    const client = makeClient({ nodes: true, backupclasses: true })
+    const { result } = renderHook(() => useConsoleSidebarSections(), {
+      wrapper: makeWrapper(client),
+    })
+    await waitFor(() => expect(result.current.length).toBeGreaterThan(0))
+    expect(findItem(result.current, "Sources")?.to).toBe("/console/migration/vmimportsources")
+    expect(findItem(result.current, "Imports")?.to).toBe("/console/migration/vmimporttasks")
+    expect(result.current.some((s) => s.title === "Migration")).toBe(true)
+  })
+})
+
+function appDef(name: string, kind: string, category: string, module = false) {
+  return {
+    apiVersion: "cozystack.io/v1alpha1",
+    kind: "ApplicationDefinition",
+    metadata: { name },
+    spec: {
+      application: { kind, plural: `${name}s` },
+      dashboard: { category, ...(module ? { module: true } : {}) },
+    },
+  }
+}
+
+// A tapped repository brings its own category next to the built-in ones.
+const tappedAppDefs: K8sList<unknown> = {
+  ...emptyAppDefList,
+  items: [
+    appDef("postgres", "Postgres", "PaaS"),
+    appDef("vminstance", "VMInstance", "IaaS"),
+    appDef("oberonvm", "OberonVM", "Paleocomputing"),
+    appDef("ingress", "Ingress", "Administration", true),
+    appDef("seaweedfs", "SeaweedFS", "Administration"),
+  ],
+}
+
+describe("custom categories from tapped repositories", () => {
+  it("lists a tapped category in the marketplace sidebar after the built-in ones", async () => {
+    const client = makeClient({}, tappedAppDefs)
+    const { result } = renderHook(() => useMarketplaceSidebarSections(), {
+      wrapper: makeWrapper(client),
+    })
+    await waitFor(() =>
+      expect(findItem(result.current, "Paleocomputing")?.to).toBe(
+        "/marketplace/c/Paleocomputing",
+      ),
+    )
+    const labels = result.current[0].items.map((i) => i.label)
+    expect(labels).toEqual(["Marketplace", "IaaS", "PaaS", "Paleocomputing"])
+  })
+
+  it("gives a tapped category its own console section and keeps Administration out", async () => {
+    const client = makeClient({}, tappedAppDefs)
+    const { result } = renderHook(() => useConsoleSidebarSections(), {
+      wrapper: makeWrapper(client),
+    })
+    await waitFor(() => expect(sectionIndex(result.current, "Paleocomputing")).not.toBe(-1))
+    expect(hasItemTo(result.current, "/console/oberonvms")).toBe(true)
+    expect(sectionIndex(result.current, "PaaS")).toBeLessThan(
+      sectionIndex(result.current, "Paleocomputing"),
+    )
+    expect(sectionIndex(result.current, "Administration")).toBe(-1)
+  })
+})
+
+describe("useMarketplaceSidebarSections", () => {
+  it("leaves Repositories to the Admin portal", () => {
+    const client = makeClient({})
+    const { result } = renderHook(() => useMarketplaceSidebarSections(), {
+      wrapper: makeWrapper(client),
+    })
+    expect(findItem(result.current, "Marketplace")?.to).toBe("/marketplace")
+    expect(findItem(result.current, "Repositories")).toBeUndefined()
+  })
+})
+
+describe("useAdminSidebarSections", () => {
+  it("always shows Administration, even with no operator permissions", async () => {
+    const client = makeClient({ nodes: false, backupclasses: false })
+    const { result } = renderHook(() => useAdminSidebarSections(), {
+      wrapper: makeWrapper(client),
+    })
+    // Administration is present immediately — it needs no permission review.
+    expect(findItem(result.current, "Tenants")?.to).toBe("/admin/tenants")
+    expect(findItem(result.current, "Modules")?.to).toBe("/admin/modules")
+    // Per-tenant Info moved into the Tenants tree rows — no sidebar entry.
+    expect(findItem(result.current, "Info")).toBeUndefined()
+    expect(findItem(result.current, "External IPs")?.to).toBe("/admin/external-ips")
+    expect(findItem(result.current, "Repositories")?.to).toBe("/admin/taps")
+    // No operator area leaks in while the gates deny.
+    await waitFor(() => expect(client.create).toHaveBeenCalled())
+    expect(findItem(result.current, "Cluster")).toBeUndefined()
+    expect(findItem(result.current, "Backup Classes")).toBeUndefined()
+  })
+
+  it("shows Cluster Usage and Backup Classes when both gates allow", async () => {
+    const client = makeClient({ nodes: true, backupclasses: true })
+    const { result } = renderHook(() => useAdminSidebarSections(), {
+      wrapper: makeWrapper(client),
+    })
+    await waitFor(() =>
+      expect(findItem(result.current, "Cluster")).toBeDefined(),
+    )
+    expect(findItem(result.current, "Cluster")?.to).toBe("/admin/capacity/cluster")
+    expect(findItem(result.current, "Backup Classes")?.to).toBe(
+      "/admin/backups/backupclasses",
+    )
+    // Administration renders above the gated operator areas.
+    const admin = sectionIndex(result.current, "Administration")
+    expect(admin).toBe(0)
+    expect(admin).toBeLessThan(sectionIndex(result.current, "Capacity"))
+    expect(admin).toBeLessThan(sectionIndex(result.current, "Backups"))
+  })
+
+  it("shows only Backup Classes when the user lacks nodes/list", async () => {
+    const client = makeClient({ nodes: false, backupclasses: true })
+    const { result } = renderHook(() => useAdminSidebarSections(), {
+      wrapper: makeWrapper(client),
+    })
+    await waitFor(() =>
+      expect(findItem(result.current, "Backup Classes")).toBeDefined(),
+    )
+    expect(findItem(result.current, "Cluster")).toBeUndefined()
+  })
+
+  it("shows only Cluster Usage when the user cannot manage backup classes", async () => {
+    const client = makeClient({ nodes: true, backupclasses: false })
+    const { result } = renderHook(() => useAdminSidebarSections(), {
+      wrapper: makeWrapper(client),
+    })
+    await waitFor(() =>
+      expect(findItem(result.current, "Cluster")).toBeDefined(),
+    )
+    expect(findItem(result.current, "Backup Classes")).toBeUndefined()
+  })
+})
+
+describe("useCanSeeAdmin", () => {
+  // The Admin tab is always visible now: Administration needs no permission.
+  it("is true regardless of operator permissions", () => {
+    for (const perms of [
+      { nodes: true, backupclasses: true },
+      { nodes: true, backupclasses: false },
+      { nodes: false, backupclasses: true },
+      { nodes: false, backupclasses: false },
+    ]) {
+      const client = makeClient(perms)
+      const { result } = renderHook(() => useCanSeeAdmin(), {
+        wrapper: makeWrapper(client),
+      })
+      expect(result.current).toBe(true)
+    }
+  })
+})
diff --git a/packages/system/dashboard/images/console/apps/console/src/routes/sidebar-sections.tsx b/packages/system/dashboard/images/console/apps/console/src/routes/sidebar-sections.tsx
new file mode 100644
index 0000000000..d5d1008137
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/routes/sidebar-sections.tsx
@@ -0,0 +1,224 @@
+import { useMemo } from "react"
+import {
+  Archive,
+  Cloud,
+  Database,
+  Gauge,
+  Globe,
+  HardDrive,
+  Import,
+  LayoutGrid,
+  Layers,
+  Network,
+  Package,
+  Plug,
+  Server,
+  ToyBrick,
+  Users,
+  type LucideIcon,
+} from "lucide-react"
+import type { SidebarSection } from "@cozystack/ui"
+import { useBackupClassAdminAccess } from "../hooks/useBackupClassAdminAccess.ts"
+import { useClusterUsageAccess } from "../hooks/useClusterUsageAccess.ts"
+import { useApplicationDefinitions, groupByCategory, isTenantModule } from "../lib/app-definitions.ts"
+import { humanizeKind } from "../lib/humanize.ts"
+import {
+  lucideIcon,
+  simpleIconComponent,
+  simpleIconSlug,
+} from "../lib/sidebar-icons.tsx"
+import type { ComponentType } from "react"
+
+// Lives in the Admin portal; any other category, tapped ones included, gets an entry.
+const ADMIN_CATEGORY = "Administration"
+const CATEGORY_ICON: Record<string, LucideIcon> = {
+  IaaS: Cloud,
+  PaaS: Database,
+  NaaS: Network,
+}
+
+/**
+ * Marketplace sidebar: a flat list of filters — "All applications" followed
+ * by every category in {@link groupByCategory} order (IaaS, PaaS, NaaS, then
+ * the rest alphabetically), Administration excepted. Category links rely on pathname-based matching
+ * (`/marketplace/c/<category>`) so NavLink correctly highlights the active
+ * entry; see MarketplaceList for the counterpart.
+ */
+export function useMarketplaceSidebarSections(): SidebarSection[] {
+  const { data } = useApplicationDefinitions()
+  const grouped = useMemo(() => groupByCategory(data), [data])
+
+  return useMemo<SidebarSection[]>(() => {
+    const ordered = grouped
+      .map((g) => g.category)
+      .filter((c) => c !== ADMIN_CATEGORY)
+
+    return [
+      {
+        title: "Marketplace",
+        items: [
+          { label: "Marketplace", to: "/marketplace", end: true, icon: LayoutGrid },
+          ...ordered.map((category) => ({
+            label: category,
+            to: `/marketplace/c/${encodeURIComponent(category)}`,
+            icon: CATEGORY_ICON[category] ?? LayoutGrid,
+          })),
+        ],
+      },
+    ]
+  }, [grouped])
+}
+
+/**
+ * Console sidebar: every non-module, non-Tenant ApplicationDefinition in the
+ * cluster as a separate entry grouped by category in {@link groupByCategory}
+ * order, Administration excepted, plus the per-tenant
+ * Backups section. Administration (Info, Modules, External IPs, Tenants) now
+ * lives in the Admin portal — see {@link useAdminSidebarSections}.
+ */
+export function useConsoleSidebarSections(): SidebarSection[] {
+  const { data } = useApplicationDefinitions()
+  const grouped = useMemo(() => groupByCategory(data), [data])
+
+  return useMemo<SidebarSection[]>(() => {
+    const sorted = grouped.filter(({ category }) => category !== ADMIN_CATEGORY)
+
+    const categorySections: SidebarSection[] = sorted.map(({ category, items }) => ({
+      title: category,
+      items: items.map((ad) => {
+        const kind = ad.spec?.application.kind ?? ad.metadata.name
+        const plural = ad.spec?.application.plural ?? ad.metadata.name
+        const slug = simpleIconSlug(kind)
+        const lucide = lucideIcon(kind)
+        const icon: ComponentType<{ className?: string }> | LucideIcon =
+          slug ? simpleIconComponent(slug) : (lucide ?? Layers)
+        return {
+          label: humanizeKind(kind),
+          to: `/console/${plural}`,
+          icon,
+        }
+      }),
+    }))
+
+    const backupsSection: SidebarSection = {
+      title: "Backups",
+      items: [
+        { label: "Plans", to: "/console/backups/plans", icon: Archive },
+        { label: "Backup Jobs", to: "/console/backups/backupjobs", icon: Archive },
+        { label: "Backups", to: "/console/backups/backups", icon: Archive },
+        { label: "Restore Jobs", to: "/console/backups/restorejobs", icon: Archive },
+      ],
+    }
+
+    const migrationSection: SidebarSection = {
+      title: "Migration",
+      items: [
+        { label: "Sources", to: "/console/migration/vmimportsources", icon: Plug },
+        { label: "Imports", to: "/console/migration/vmimporttasks", icon: Import },
+      ],
+    }
+
+    return [...categorySections, backupsSection, migrationSection]
+  }, [grouped])
+}
+
+/**
+ * Access check for the Admin portal. The portal hosts two cluster-wide
+ * operator areas with independent permissions: Cluster Usage (proxied by
+ * `nodes/list`) and Backup Classes (`backupclasses/update`, via
+ * {@link useBackupClassAdminAccess}). A user sees the portal if they can use
+ * at least one. `isLoading` lets route guards wait instead of redirecting
+ * mid-flight; the per-area booleans gate the individual sidebar entries.
+ */
+export function useAdminAccess(): {
+  allowed: boolean
+  isLoading: boolean
+  canClusterUsage: boolean
+  canBackupClasses: boolean
+} {
+  const clusterUsage = useClusterUsageAccess()
+  const backupClasses = useBackupClassAdminAccess()
+  const canClusterUsage = clusterUsage.allowed
+  const canBackupClasses = backupClasses.allowed
+  return {
+    isLoading: clusterUsage.isLoading || backupClasses.isLoading,
+    allowed: canClusterUsage || canBackupClasses,
+    canClusterUsage,
+    canBackupClasses,
+  }
+}
+
+/**
+ * The Admin tab is always visible: Administration (Info, Modules, External IPs,
+ * Repositories, Tenants) needs no special permission. The gated Capacity/Backup-Classes areas
+ * keep their own per-area guards inside the portal.
+ */
+export function useCanSeeAdmin(): boolean {
+  return true
+}
+
+/**
+ * Admin sidebar: Administration first (always visible, no permission needed —
+ * Tenants, Modules, External IPs, Repositories; per-tenant Info is a row action
+ * in the Tenants tree), then the cluster-wide operator areas (Capacity and Backup
+ * Classes). Each operator area is gated by its own permission so the sidebar
+ * never shows an area the user cannot open.
+ */
+export function useAdminSidebarSections(): SidebarSection[] {
+  const { canClusterUsage, canBackupClasses } = useAdminAccess()
+  const { data: defs } = useApplicationDefinitions()
+  // Per-tenant Info lives as a row action in the Tenants tree, so the Tenants
+  // entry stays highlighted while an Info detail page is open. Every other
+  // module's detail page keeps Modules highlighted instead.
+  const infoPlural =
+    defs?.items.find((d) => d.spec?.application.kind === "Info")?.spec?.application
+      .plural ?? "infos"
+  const modulePaths = (defs?.items ?? [])
+    .filter(isTenantModule)
+    .filter((d) => d.spec?.application.kind !== "Info")
+    .map((d) => `/admin/${d.spec?.application.plural ?? d.metadata.name}`)
+    .sort()
+    .join(",")
+  return useMemo<SidebarSection[]>(() => {
+    const sections: SidebarSection[] = [
+      {
+        title: "Administration",
+        items: [
+          {
+            label: "Tenants",
+            to: "/admin/tenants",
+            icon: Users,
+            alsoMatch: [`/admin/${infoPlural}`, "/admin/info"],
+          },
+          {
+            label: "Modules",
+            to: "/admin/modules",
+            icon: ToyBrick,
+            alsoMatch: modulePaths ? modulePaths.split(",") : undefined,
+          },
+          { label: "External IPs", to: "/admin/external-ips", icon: Globe },
+          { label: "Repositories", to: "/admin/taps", icon: Package },
+        ],
+      },
+    ]
+    if (canClusterUsage) {
+      sections.push({
+        title: "Capacity",
+        items: [
+          { label: "Cluster", to: "/admin/capacity/cluster", icon: Gauge },
+          { label: "Nodes", to: "/admin/capacity/nodes", icon: Server },
+          { label: "Storage", to: "/admin/capacity/storage", icon: HardDrive },
+        ],
+      })
+    }
+    if (canBackupClasses) {
+      sections.push({
+        title: "Backups",
+        items: [
+          { label: "Backup Classes", to: "/admin/backups/backupclasses", icon: Archive },
+        ],
+      })
+    }
+    return sections
+  }, [canClusterUsage, canBackupClasses, infoPlural, modulePaths])
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/test-utils/fixtures/node-metrics.ts b/packages/system/dashboard/images/console/apps/console/src/test-utils/fixtures/node-metrics.ts
new file mode 100644
index 0000000000..6813ae7d35
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/test-utils/fixtures/node-metrics.ts
@@ -0,0 +1,54 @@
+import type { K8sList, K8sResource } from "@cozystack/k8s-client"
+
+interface NodeMetricsUsage {
+  cpu: string
+  memory: string
+}
+
+interface NodeMetricsFields {
+  usage?: NodeMetricsUsage
+  timestamp?: string
+  window?: string
+}
+
+export type NodeMetricsFixture = K8sResource<unknown, unknown> & NodeMetricsFields
+
+/**
+ * NodeMetrics entries matching the node fixtures. metrics.k8s.io reports
+ * actual usage as Kubernetes quantities just like capacity, so the same
+ * parseQuantity path renders both numbers.
+ */
+
+export const metricsControlPlane: NodeMetricsFixture = {
+  apiVersion: "metrics.k8s.io/v1beta1",
+  kind: "NodeMetrics",
+  metadata: { name: "cp-1" },
+  usage: { cpu: "150m", memory: "1500Mi" },
+  timestamp: "2026-05-26T17:00:00Z",
+  window: "30s",
+}
+
+export const metricsWorker: NodeMetricsFixture = {
+  apiVersion: "metrics.k8s.io/v1beta1",
+  kind: "NodeMetrics",
+  metadata: { name: "worker-1" },
+  usage: { cpu: "400m", memory: "8Gi" },
+  timestamp: "2026-05-26T17:00:00Z",
+  window: "30s",
+}
+
+export const metricsGpuWorker: NodeMetricsFixture = {
+  apiVersion: "metrics.k8s.io/v1beta1",
+  kind: "NodeMetrics",
+  metadata: { name: "worker-gpu-1" },
+  usage: { cpu: "2", memory: "20Gi" },
+  timestamp: "2026-05-26T17:00:00Z",
+  window: "30s",
+}
+
+export const nodeMetricsListFixture: K8sList<NodeMetricsFixture> = {
+  apiVersion: "metrics.k8s.io/v1beta1",
+  kind: "NodeMetricsList",
+  metadata: { resourceVersion: "300" },
+  items: [metricsControlPlane, metricsWorker, metricsGpuWorker],
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/test-utils/fixtures/nodes.ts b/packages/system/dashboard/images/console/apps/console/src/test-utils/fixtures/nodes.ts
new file mode 100644
index 0000000000..8a7c7349eb
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/test-utils/fixtures/nodes.ts
@@ -0,0 +1,86 @@
+import type { K8sList, K8sResource } from "@cozystack/k8s-client"
+
+/**
+ * Three node fixtures cover the three shapes the cluster-usage page must
+ * render: control-plane (no extended resources), plain worker, worker
+ * with a single NVIDIA GPU. Numbers are small but realistic and chosen
+ * so hand-computed aggregates over the set stay obvious.
+ *
+ * creationTimestamp is fixed; tests that assert on Age must stub the
+ * clock via vi.setSystemTime.
+ */
+
+interface NodeStatus {
+  capacity?: Record<string, string>
+  allocatable?: Record<string, string>
+  conditions?: Array<{
+    type: string
+    status: "True" | "False" | "Unknown"
+    reason?: string
+    message?: string
+  }>
+}
+
+export type NodeFixture = K8sResource<unknown, NodeStatus>
+
+export const nodeControlPlane: NodeFixture = {
+  apiVersion: "v1",
+  kind: "Node",
+  metadata: {
+    name: "cp-1",
+    creationTimestamp: "2026-01-01T00:00:00Z",
+    labels: { "node-role.kubernetes.io/control-plane": "" },
+  },
+  status: {
+    capacity: { cpu: "4", memory: "8Gi", "ephemeral-storage": "100Gi", pods: "110" },
+    allocatable: { cpu: "4", memory: "8Gi", "ephemeral-storage": "100Gi", pods: "110" },
+    conditions: [{ type: "Ready", status: "True" }],
+  },
+}
+
+export const nodeWorker: NodeFixture = {
+  apiVersion: "v1",
+  kind: "Node",
+  metadata: {
+    name: "worker-1",
+    creationTimestamp: "2026-02-01T00:00:00Z",
+  },
+  status: {
+    capacity: { cpu: "8", memory: "32Gi", "ephemeral-storage": "500Gi", pods: "220" },
+    allocatable: { cpu: "8", memory: "32Gi", "ephemeral-storage": "500Gi", pods: "220" },
+    conditions: [{ type: "Ready", status: "True" }],
+  },
+}
+
+export const nodeGpuWorker: NodeFixture = {
+  apiVersion: "v1",
+  kind: "Node",
+  metadata: {
+    name: "worker-gpu-1",
+    creationTimestamp: "2026-03-01T00:00:00Z",
+  },
+  status: {
+    capacity: {
+      cpu: "16",
+      memory: "64Gi",
+      "ephemeral-storage": "1Ti",
+      pods: "220",
+      "nvidia.com/gpu": "1",
+    },
+    allocatable: {
+      cpu: "16",
+      memory: "64Gi",
+      "ephemeral-storage": "1Ti",
+      pods: "220",
+      "nvidia.com/gpu": "1",
+    },
+    conditions: [{ type: "Ready", status: "True" }],
+  },
+}
+
+export const nodesListFixture: K8sList<NodeFixture> = {
+  apiVersion: "v1",
+  kind: "NodeList",
+  metadata: { resourceVersion: "100" },
+  items: [nodeControlPlane, nodeWorker, nodeGpuWorker],
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/test-utils/fixtures/pods.ts b/packages/system/dashboard/images/console/apps/console/src/test-utils/fixtures/pods.ts
new file mode 100644
index 0000000000..6346b1c18a
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/test-utils/fixtures/pods.ts
@@ -0,0 +1,98 @@
+import type { K8sList, K8sResource } from "@cozystack/k8s-client"
+
+interface PodSpec {
+  nodeName?: string
+  containers: Array<{
+    name: string
+    resources?: {
+      requests?: Record<string, string>
+      limits?: Record<string, string>
+    }
+  }>
+}
+
+interface PodStatus {
+  phase?: string
+}
+
+export type PodFixture = K8sResource<PodSpec, PodStatus>
+
+/**
+ * Pod fixtures aligned with the node fixtures: one bound to each node,
+ * one bound to the GPU worker requesting one nvidia.com/gpu, and one
+ * unscheduled pod (no spec.nodeName) so the per-node aggregator can be
+ * verified to skip it correctly. Requests are deliberately small so the
+ * sums are obvious by inspection.
+ */
+
+export const podOnControlPlane: PodFixture = {
+  apiVersion: "v1",
+  kind: "Pod",
+  metadata: { name: "system-pod", namespace: "kube-system" },
+  spec: {
+    nodeName: "cp-1",
+    containers: [
+      {
+        name: "main",
+        resources: { requests: { cpu: "200m", memory: "256Mi" } },
+      },
+    ],
+  },
+  status: { phase: "Running" },
+}
+
+export const podOnWorker: PodFixture = {
+  apiVersion: "v1",
+  kind: "Pod",
+  metadata: { name: "tenant-pod", namespace: "tenant-root" },
+  spec: {
+    nodeName: "worker-1",
+    containers: [
+      {
+        name: "app",
+        resources: { requests: { cpu: "500m", memory: "1Gi" } },
+      },
+    ],
+  },
+  status: { phase: "Running" },
+}
+
+export const podOnGpuWorker: PodFixture = {
+  apiVersion: "v1",
+  kind: "Pod",
+  metadata: { name: "gpu-pod", namespace: "tenant-ml" },
+  spec: {
+    nodeName: "worker-gpu-1",
+    containers: [
+      {
+        name: "model",
+        resources: {
+          requests: { cpu: "100m", memory: "128Mi", "nvidia.com/gpu": "1" },
+        },
+      },
+    ],
+  },
+  status: { phase: "Running" },
+}
+
+export const podUnscheduled: PodFixture = {
+  apiVersion: "v1",
+  kind: "Pod",
+  metadata: { name: "pending-pod", namespace: "default" },
+  spec: {
+    containers: [
+      {
+        name: "main",
+        resources: { requests: { cpu: "1", memory: "2Gi" } },
+      },
+    ],
+  },
+  status: { phase: "Pending" },
+}
+
+export const podsListFixture: K8sList<PodFixture> = {
+  apiVersion: "v1",
+  kind: "PodList",
+  metadata: { resourceVersion: "200" },
+  items: [podOnControlPlane, podOnWorker, podOnGpuWorker, podUnscheduled],
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/test-utils/mock-k8s-client.ts b/packages/system/dashboard/images/console/apps/console/src/test-utils/mock-k8s-client.ts
new file mode 100644
index 0000000000..16a207f9e4
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/test-utils/mock-k8s-client.ts
@@ -0,0 +1,78 @@
+import { vi } from "vitest"
+import { K8sClient, K8sApiError, type K8sList } from "@cozystack/k8s-client"
+
+interface ListOverride {
+  apiGroup: string
+  apiVersion: string
+  plural: string
+  namespace?: string
+  result: K8sList<unknown> | (() => K8sList<unknown> | Promise<K8sList<unknown>>) | K8sApiError
+}
+
+interface GetOverride {
+  apiGroup: string
+  apiVersion: string
+  plural: string
+  name: string
+  namespace?: string
+  result: unknown | (() => unknown | Promise<unknown>) | K8sApiError
+}
+
+export interface MockK8sClientOverrides {
+  lists?: ListOverride[]
+  gets?: GetOverride[]
+}
+
+/**
+ * Build a K8sClient instance whose network-facing methods (list/get/watch)
+ * resolve from in-memory overrides instead of fetch. The underlying object
+ * is a real K8sClient so any method this factory does not stub — including
+ * ones added to the production class after this file was written — falls
+ * through to the real implementation; tests that touch new methods are
+ * expected to spy on them explicitly via vi.spyOn on the returned instance.
+ *
+ * Watch is stubbed to return a noop cleanup function.
+ */
+export function createMockK8sClient(overrides: MockK8sClientOverrides = {}): K8sClient {
+  const client = new K8sClient({ baseUrl: "/mock" })
+
+  vi.spyOn(client, "list").mockImplementation(
+    async (apiGroup, apiVersion, plural, namespace) => {
+      const match = overrides.lists?.find(
+        (o) =>
+          o.apiGroup === apiGroup &&
+          o.apiVersion === apiVersion &&
+          o.plural === plural &&
+          (o.namespace ?? undefined) === (namespace ?? undefined),
+      )
+      if (!match) {
+        return { apiVersion, kind: `${plural}List`, metadata: {}, items: [] } as K8sList<unknown>
+      }
+      if (match.result instanceof K8sApiError) throw match.result
+      const value = typeof match.result === "function" ? await match.result() : match.result
+      return value as K8sList<unknown>
+    },
+  )
+
+  vi.spyOn(client, "get").mockImplementation(
+    async (apiGroup, apiVersion, plural, name, namespace) => {
+      const match = overrides.gets?.find(
+        (o) =>
+          o.apiGroup === apiGroup &&
+          o.apiVersion === apiVersion &&
+          o.plural === plural &&
+          o.name === name &&
+          (o.namespace ?? undefined) === (namespace ?? undefined),
+      )
+      if (!match) {
+        throw new K8sApiError(404, { message: `mock: no get override for ${plural}/${name}` })
+      }
+      if (match.result instanceof K8sApiError) throw match.result
+      return typeof match.result === "function" ? await match.result() : match.result
+    },
+  )
+
+  vi.spyOn(client, "watch").mockReturnValue(() => {})
+
+  return client
+}
diff --git a/packages/system/dashboard/images/console/apps/console/src/test-utils/render.test.tsx b/packages/system/dashboard/images/console/apps/console/src/test-utils/render.test.tsx
new file mode 100644
index 0000000000..be842e2925
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/test-utils/render.test.tsx
@@ -0,0 +1,72 @@
+import { describe, it, expect } from "vitest"
+import { waitFor } from "@testing-library/react"
+import { useK8sList } from "@cozystack/k8s-client"
+import { createMockK8sClient } from "./mock-k8s-client.ts"
+import { renderWithK8sProvider } from "./render.tsx"
+import { nodesListFixture, type NodeFixture } from "./fixtures/nodes.ts"
+
+function NodeNameList() {
+  const { data, isLoading } = useK8sList<NodeFixture>(
+    { apiGroup: "", apiVersion: "v1", plural: "nodes" },
+    { watch: false },
+  )
+  if (isLoading) return <p>loading</p>
+  return (
+    <ul>
+      {data?.items.map((n) => <li key={n.metadata.name}>{n.metadata.name}</li>)}
+    </ul>
+  )
+}
+
+describe("renderWithK8sProvider", () => {
+  it("renders a component that consumes useK8sList against an injected mock", async () => {
+    const client = createMockK8sClient({
+      lists: [
+        {
+          apiGroup: "",
+          apiVersion: "v1",
+          plural: "nodes",
+          result: nodesListFixture,
+        },
+      ],
+    })
+
+    const { findByText } = renderWithK8sProvider(<NodeNameList />, { client })
+
+    expect(await findByText("cp-1")).toBeInTheDocument()
+    expect(await findByText("worker-1")).toBeInTheDocument()
+    expect(await findByText("worker-gpu-1")).toBeInTheDocument()
+  })
+
+  it("routes the list call through the mock with the requested resource", async () => {
+    const client = createMockK8sClient({
+      lists: [
+        {
+          apiGroup: "",
+          apiVersion: "v1",
+          plural: "nodes",
+          result: nodesListFixture,
+        },
+      ],
+    })
+
+    renderWithK8sProvider(<NodeNameList />, { client })
+
+    await waitFor(() => {
+      expect(client.list).toHaveBeenCalledWith(
+        "",
+        "v1",
+        "nodes",
+        undefined,
+        expect.any(Object),
+      )
+    })
+  })
+
+  it("returns the queryClient so tests can clear or inspect the cache", () => {
+    const client = createMockK8sClient()
+    const { queryClient } = renderWithK8sProvider(<p>hello</p>, { client })
+    expect(queryClient).toBeDefined()
+    expect(queryClient.getQueryCache).toBeInstanceOf(Function)
+  })
+})
diff --git a/packages/system/dashboard/images/console/apps/console/src/test-utils/render.tsx b/packages/system/dashboard/images/console/apps/console/src/test-utils/render.tsx
new file mode 100644
index 0000000000..04adc5d25a
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/src/test-utils/render.tsx
@@ -0,0 +1,31 @@
+import { render, type RenderResult } from "@testing-library/react"
+import { QueryClient } from "@tanstack/react-query"
+import { K8sProvider, type K8sClient } from "@cozystack/k8s-client"
+import { MemoryRouter } from "react-router"
+import type { ReactElement } from "react"
+
+export interface RenderWithK8sOptions {
+  client: K8sClient
+  initialRoute?: string
+}
+
+/**
+ * Wraps a React tree in the minimum context needed to exercise K8s hooks
+ * in isolation: a fresh QueryClient with retries off and no garbage
+ * collection, the K8sProvider with the injected client, and a
+ * MemoryRouter so components that use react-router do not blow up.
+ */
+export function renderWithK8sProvider(
+  ui: ReactElement,
+  options: RenderWithK8sOptions,
+): RenderResult & { queryClient: QueryClient } {
+  const queryClient = new QueryClient({
+    defaultOptions: { queries: { retry: false, gcTime: 0 } },
+  })
+  const result = render(
+    <K8sProvider client={options.client} queryClient={queryClient}>
+      <MemoryRouter initialEntries={[options.initialRoute ?? "/"]}>{ui}</MemoryRouter>
+    </K8sProvider>,
+  )
+  return Object.assign(result, { queryClient })
+}
diff --git a/packages/system/dashboard/images/console/apps/console/test/setup.ts b/packages/system/dashboard/images/console/apps/console/test/setup.ts
new file mode 100644
index 0000000000..8d02416c98
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/test/setup.ts
@@ -0,0 +1,10 @@
+import "@testing-library/jest-dom/vitest"
+import { afterEach } from "vitest"
+import { cleanup } from "@testing-library/react"
+
+// React Testing Library auto-registers cleanup via a global `afterEach`
+// hook; that hook only exists when vitest is run with `globals: true`.
+// We use explicit imports in tests, so wire cleanup up manually here.
+afterEach(() => {
+  cleanup()
+})
diff --git a/packages/system/dashboard/images/console/apps/console/tsconfig.json b/packages/system/dashboard/images/console/apps/console/tsconfig.json
new file mode 100644
index 0000000000..82e0a3d648
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/tsconfig.json
@@ -0,0 +1,17 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.tsbuildinfo",
+    "types": ["vite/client", "@testing-library/jest-dom"],
+    "noEmit": true,
+    "baseUrl": ".",
+    "paths": {
+      "@/*": ["./src/*"],
+      "@cozystack/types": ["../../packages/types/src"],
+      "@cozystack/ui": ["../../packages/ui/src"],
+      "@cozystack/ui/*": ["../../packages/ui/src/*"],
+      "@cozystack/k8s-client": ["../../packages/k8s-client/src"]
+    }
+  },
+  "include": ["src"]
+}
diff --git a/packages/system/dashboard/images/console/apps/console/vite.config.ts b/packages/system/dashboard/images/console/apps/console/vite.config.ts
new file mode 100644
index 0000000000..d4a3b517b8
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/vite.config.ts
@@ -0,0 +1,40 @@
+import { defineConfig } from "vite"
+import react from "@vitejs/plugin-react"
+import tailwindcss from "@tailwindcss/vite"
+import path from "path"
+
+/**
+ * The dev server proxies `/api` and `/apis` to `kubectl proxy --port 8001`
+ * (over HTTP, not HTTPS — kubectl proxy terminates TLS locally).
+ * The VNC console streams over a WebSocket, so `ws: true` is set on the
+ * proxies below to forward the upgrade to kubectl proxy.
+ */
+export default defineConfig({
+  plugins: [react(), tailwindcss()],
+  resolve: {
+    alias: {
+      "@": path.resolve(__dirname, "./src"),
+    },
+  },
+  server: {
+    port: 3001,
+    proxy: {
+      "/k8s": {
+        target: "http://localhost:8001",
+        changeOrigin: true,
+        rewrite: (path) => path.replace(/^\/k8s/, ""),
+        ws: true,
+      },
+      "/apis": {
+        target: "http://localhost:8001",
+        changeOrigin: true,
+        ws: true,
+      },
+      "/api": {
+        target: "http://localhost:8001",
+        changeOrigin: true,
+        ws: true,
+      },
+    },
+  },
+})
diff --git a/packages/system/dashboard/images/console/apps/console/vitest.config.ts b/packages/system/dashboard/images/console/apps/console/vitest.config.ts
new file mode 100644
index 0000000000..d4decf5a52
--- /dev/null
+++ b/packages/system/dashboard/images/console/apps/console/vitest.config.ts
@@ -0,0 +1,17 @@
+import { defineConfig } from "vitest/config"
+import react from "@vitejs/plugin-react"
+import path from "path"
+
+export default defineConfig({
+  plugins: [react()],
+  resolve: {
+    alias: {
+      "@": path.resolve(__dirname, "./src"),
+    },
+  },
+  test: {
+    environment: "jsdom",
+    setupFiles: ["./test/setup.ts"],
+    include: ["src/**/*.{test,spec}.{ts,tsx}"],
+  },
+})
diff --git a/packages/system/dashboard/images/console/eslint.config.js b/packages/system/dashboard/images/console/eslint.config.js
new file mode 100644
index 0000000000..050f5f0e98
--- /dev/null
+++ b/packages/system/dashboard/images/console/eslint.config.js
@@ -0,0 +1,23 @@
+import js from '@eslint/js'
+import globals from 'globals'
+import reactHooks from 'eslint-plugin-react-hooks'
+import reactRefresh from 'eslint-plugin-react-refresh'
+import tseslint from 'typescript-eslint'
+import { defineConfig, globalIgnores } from 'eslint/config'
+
+export default defineConfig([
+  globalIgnores(['dist', 'node_modules', '**/dist/**', '**/node_modules/**']),
+  {
+    files: ['**/*.{ts,tsx}'],
+    extends: [
+      js.configs.recommended,
+      tseslint.configs.recommended,
+      reactHooks.configs.flat.recommended,
+      reactRefresh.configs.vite,
+    ],
+    languageOptions: {
+      ecmaVersion: 2020,
+      globals: globals.browser,
+    },
+  },
+])
diff --git a/packages/system/dashboard/images/console/package.json b/packages/system/dashboard/images/console/package.json
new file mode 100644
index 0000000000..0033fef6f1
--- /dev/null
+++ b/packages/system/dashboard/images/console/package.json
@@ -0,0 +1,24 @@
+{
+  "name": "cozystack-ui",
+  "private": true,
+  "type": "module",
+  "packageManager": "pnpm@11.1.2",
+  "scripts": {
+    "dev": "pnpm --filter @cozystack/console dev",
+    "build": "pnpm -r build",
+    "build:console": "pnpm --filter @cozystack/console build",
+    "lint": "pnpm -r lint",
+    "test": "pnpm -r --if-present test",
+    "typecheck": "pnpm -r typecheck"
+  },
+  "devDependencies": {
+    "@eslint/js": "^9.39.4",
+    "@types/node": "^24.12.2",
+    "eslint": "^9.39.4",
+    "eslint-plugin-react-hooks": "^7.0.1",
+    "eslint-plugin-react-refresh": "^0.5.2",
+    "globals": "^17.4.0",
+    "typescript": "~6.0.2",
+    "typescript-eslint": "^8.58.0"
+  }
+}
diff --git a/packages/system/dashboard/images/console/packages/k8s-client/package.json b/packages/system/dashboard/images/console/packages/k8s-client/package.json
new file mode 100644
index 0000000000..300c03f68a
--- /dev/null
+++ b/packages/system/dashboard/images/console/packages/k8s-client/package.json
@@ -0,0 +1,24 @@
+{
+  "name": "@cozystack/k8s-client",
+  "private": true,
+  "version": "0.0.0",
+  "type": "module",
+  "main": "./src/index.ts",
+  "types": "./src/index.ts",
+  "exports": {
+    ".": "./src/index.ts"
+  },
+  "scripts": {
+    "typecheck": "tsc --noEmit"
+  },
+  "dependencies": {
+    "@tanstack/react-query": "^5.62.2"
+  },
+  "peerDependencies": {
+    "react": "^19.0.0"
+  },
+  "devDependencies": {
+    "@types/react": "^19.2.14",
+    "typescript": "~6.0.2"
+  }
+}
diff --git a/packages/system/dashboard/images/console/packages/k8s-client/src/client.ts b/packages/system/dashboard/images/console/packages/k8s-client/src/client.ts
new file mode 100644
index 0000000000..12f50e0fdc
--- /dev/null
+++ b/packages/system/dashboard/images/console/packages/k8s-client/src/client.ts
@@ -0,0 +1,396 @@
+export interface K8sClientConfig {
+  baseUrl?: string
+  getToken?: () => Promise<string>
+  onUnauthorized?: () => void
+}
+
+// /oauth2/sign_in is the only sign-in entry both gatekeeper modes serve:
+// oauth2-proxy jumps straight to the provider there (--skip-provider-button)
+// and token-proxy renders its token form; /oauth2/start is oauth2-proxy-only.
+function defaultOnUnauthorized(): void {
+  if (typeof window === "undefined") return
+  const rd = window.location.pathname + window.location.search + window.location.hash
+  window.location.assign(`/oauth2/sign_in?rd=${encodeURIComponent(rd)}`)
+}
+
+export class K8sApiError extends Error {
+  status: number
+  body: unknown
+
+  constructor(status: number, body: unknown) {
+    const msg =
+      typeof body === "object" && body !== null && "message" in body
+        ? (body as { message: string }).message
+        : typeof body === "string" && body.length > 0 && body.length < 200
+          ? body
+          : `Server returned ${status}`
+    super(msg)
+    this.name = "K8sApiError"
+    this.status = status
+    this.body = body
+  }
+}
+
+export class K8sClient {
+  private baseUrl: string
+  private getToken?: () => Promise<string>
+  private onUnauthorized: () => void
+  private unauthorizedHandled = false
+
+  constructor(config: K8sClientConfig = {}) {
+    this.baseUrl = config.baseUrl ?? ""
+    this.getToken = config.getToken
+    this.onUnauthorized = config.onUnauthorized ?? defaultOnUnauthorized
+  }
+
+  private handleUnauthorized(): void {
+    if (this.unauthorizedHandled) return
+    this.unauthorizedHandled = true
+    this.onUnauthorized()
+  }
+
+  private async request<T>(path: string, init?: RequestInit): Promise<T> {
+    const headers: Record<string, string> = {
+      "Content-Type": "application/json",
+      ...(init?.headers as Record<string, string>),
+    }
+
+    if (this.getToken) {
+      const token = await this.getToken()
+      headers["Authorization"] = `Bearer ${token}`
+    }
+
+    let res: Response
+    try {
+      res = await fetch(`${this.baseUrl}${path}`, {
+        ...init,
+        headers,
+      })
+    } catch {
+      throw new K8sApiError(0, "Unable to connect to the server")
+    }
+
+    if (!res.ok) {
+      let body: unknown
+      try {
+        const text = await res.text()
+        try {
+          body = JSON.parse(text)
+        } catch {
+          body = text
+        }
+      } catch {
+        body = `Server returned ${res.status} ${res.statusText}`
+      }
+      if (res.status === 401) this.handleUnauthorized()
+      throw new K8sApiError(res.status, body)
+    }
+
+    // A 2xx means the session is alive again, so re-arm the latch: the default
+    // handler navigates away, but a custom one may re-auth in place.
+    this.unauthorizedHandled = false
+
+    if (res.status === 204) return undefined as T
+    // Some endpoints (e.g. KubeVirt action subresources like
+    // virtualmachines/{name}/restart) return 2xx with an empty body;
+    // res.json() would throw "Unexpected end of JSON input" on "".
+    const text = await res.text()
+    if (!text) return undefined as T
+    return JSON.parse(text) as T
+  }
+
+  private buildPath(
+    apiGroup: string,
+    apiVersion: string,
+    plural: string,
+    namespace?: string,
+    name?: string,
+  ): string {
+    const base = apiGroup
+      ? `/apis/${apiGroup}/${apiVersion}`
+      : `/api/${apiVersion}`
+    const ns = namespace ? `/namespaces/${namespace}` : ""
+    const resource = `/${plural}`
+    const item = name ? `/${name}` : ""
+    return `${base}${ns}${resource}${item}`
+  }
+
+  list<T>(
+    apiGroup: string,
+    apiVersion: string,
+    plural: string,
+    namespace?: string,
+    search?: { labelSelector?: string; fieldSelector?: string },
+  ): Promise<K8sList<T>> {
+    const path = this.buildPath(apiGroup, apiVersion, plural, namespace)
+    const params = new URLSearchParams()
+    if (search?.labelSelector) params.set("labelSelector", search.labelSelector)
+    if (search?.fieldSelector) params.set("fieldSelector", search.fieldSelector)
+    const qs = params.toString()
+    return this.request<K8sList<T>>(qs ? `${path}?${qs}` : path)
+  }
+
+  get<T>(
+    apiGroup: string,
+    apiVersion: string,
+    plural: string,
+    name: string,
+    namespace?: string,
+  ): Promise<T> {
+    const path = this.buildPath(apiGroup, apiVersion, plural, namespace, name)
+    return this.request<T>(path)
+  }
+
+  create<T>(
+    apiGroup: string,
+    apiVersion: string,
+    plural: string,
+    body: T,
+    namespace?: string,
+  ): Promise<T> {
+    const path = this.buildPath(apiGroup, apiVersion, plural, namespace)
+    return this.request<T>(path, {
+      method: "POST",
+      body: JSON.stringify(body),
+    })
+  }
+
+  update<T>(
+    apiGroup: string,
+    apiVersion: string,
+    plural: string,
+    name: string,
+    body: T,
+    namespace?: string,
+  ): Promise<T> {
+    const path = this.buildPath(apiGroup, apiVersion, plural, namespace, name)
+    return this.request<T>(path, {
+      method: "PUT",
+      body: JSON.stringify(body),
+    })
+  }
+
+  patch<T>(
+    apiGroup: string,
+    apiVersion: string,
+    plural: string,
+    name: string,
+    patch: unknown,
+    namespace?: string,
+    type: "merge" | "strategic" | "json" = "merge",
+  ): Promise<T> {
+    const path = this.buildPath(apiGroup, apiVersion, plural, namespace, name)
+    const contentType =
+      type === "merge"
+        ? "application/merge-patch+json"
+        : type === "strategic"
+          ? "application/strategic-merge-patch+json"
+          : "application/json-patch+json"
+    return this.request<T>(path, {
+      method: "PATCH",
+      headers: { "Content-Type": contentType },
+      body: JSON.stringify(patch),
+    })
+  }
+
+  delete(
+    apiGroup: string,
+    apiVersion: string,
+    plural: string,
+    name: string,
+    namespace?: string,
+  ): Promise<unknown> {
+    const path = this.buildPath(apiGroup, apiVersion, plural, namespace, name)
+    return this.request(path, { method: "DELETE" })
+  }
+
+  /**
+   * Call a resource subresource (e.g. KubeVirt's
+   * subresources.kubevirt.io virtualmachines/{name}/start|stop|restart).
+   * Defaults to PUT, which is what the KubeVirt action subresources expect;
+   * pass an empty object as body when the subresource takes no options.
+   */
+  subresource<T>(
+    apiGroup: string,
+    apiVersion: string,
+    plural: string,
+    name: string,
+    subresource: string,
+    namespace?: string,
+    body?: unknown,
+    method: "PUT" | "POST" = "PUT",
+  ): Promise<T> {
+    const path = `${this.buildPath(apiGroup, apiVersion, plural, namespace, name)}/${subresource}`
+    return this.request<T>(path, {
+      method,
+      body: body !== undefined ? JSON.stringify(body) : undefined,
+    })
+  }
+
+  dryRunCreate<T>(
+    apiGroup: string,
+    apiVersion: string,
+    plural: string,
+    body: T,
+    namespace?: string,
+  ): Promise<T> {
+    const path = this.buildPath(apiGroup, apiVersion, plural, namespace)
+    return this.request<T>(`${path}?dryRun=All`, {
+      method: "POST",
+      body: JSON.stringify(body),
+    })
+  }
+
+  getApiGroups(): Promise<APIGroupList> {
+    return this.request<APIGroupList>("/apis")
+  }
+
+  watch<T>(
+    apiGroup: string,
+    apiVersion: string,
+    plural: string,
+    namespace: string | undefined,
+    resourceVersion: string,
+    onEvent: (event: WatchEvent<T>) => void,
+    onError?: (error: Error) => void,
+    search?: { labelSelector?: string; fieldSelector?: string },
+  ): () => void {
+    const path = this.buildPath(apiGroup, apiVersion, plural, namespace)
+    const params = new URLSearchParams({
+      watch: "true",
+      resourceVersion,
+      allowWatchBookmarks: "true",
+    })
+    if (search?.labelSelector) params.set("labelSelector", search.labelSelector)
+    if (search?.fieldSelector) params.set("fieldSelector", search.fieldSelector)
+
+    const controller = new AbortController()
+
+    const run = async () => {
+      try {
+        const headers: Record<string, string> = {}
+        if (this.getToken) {
+          const token = await this.getToken()
+          headers["Authorization"] = `Bearer ${token}`
+        }
+
+        const res = await fetch(`${this.baseUrl}${path}?${params}`, {
+          headers,
+          signal: controller.signal,
+        })
+
+        if (!res.ok) {
+          if (res.status === 401) this.handleUnauthorized()
+          throw new K8sApiError(
+            res.status,
+            await res.json().catch(() => res.statusText),
+          )
+        }
+        this.unauthorizedHandled = false
+        if (!res.body) throw new Error("No response body for watch")
+
+        const reader = res.body.getReader()
+        const decoder = new TextDecoder()
+        let buffer = ""
+
+        while (true) {
+          const { done, value } = await reader.read()
+          if (done) break
+
+          buffer += decoder.decode(value, { stream: true })
+          const lines = buffer.split("\n")
+          buffer = lines.pop() ?? ""
+
+          for (const line of lines) {
+            if (!line.trim()) continue
+            try {
+              const event = JSON.parse(line) as WatchEvent<T>
+              onEvent(event)
+            } catch {
+              // skip malformed lines
+            }
+          }
+        }
+
+        if (!controller.signal.aborted) {
+          onError?.(new Error("Watch stream ended"))
+        }
+      } catch (err) {
+        if (controller.signal.aborted) return
+        onError?.(err instanceof Error ? err : new Error(String(err)))
+      }
+    }
+
+    run()
+
+    return () => controller.abort()
+  }
+}
+
+export interface K8sMetadata {
+  name: string
+  namespace?: string
+  uid?: string
+  resourceVersion?: string
+  creationTimestamp?: string
+  deletionTimestamp?: string
+  labels?: Record<string, string>
+  annotations?: Record<string, string>
+  generation?: number
+  finalizers?: string[]
+  ownerReferences?: K8sOwnerReference[]
+}
+
+export interface K8sOwnerReference {
+  apiVersion: string
+  kind: string
+  name: string
+  uid: string
+  controller?: boolean
+  blockOwnerDeletion?: boolean
+}
+
+export interface K8sResource<Spec = unknown, Status = unknown> {
+  apiVersion: string
+  kind: string
+  metadata: K8sMetadata
+  spec?: Spec
+  status?: Status
+}
+
+export interface K8sList<T> {
+  apiVersion: string
+  kind: string
+  metadata: { resourceVersion?: string }
+  items: T[]
+}
+
+export interface K8sCondition {
+  type: string
+  status: "True" | "False" | "Unknown"
+  reason?: string
+  message?: string
+  lastTransitionTime?: string
+}
+
+export interface WatchEvent<T> {
+  type: "ADDED" | "MODIFIED" | "DELETED" | "BOOKMARK" | "ERROR"
+  object: T
+}
+
+export interface APIGroupVersion {
+  groupVersion: string
+  version: string
+}
+
+export interface APIGroup {
+  name: string
+  versions: APIGroupVersion[]
+  preferredVersion?: APIGroupVersion
+}
+
+export interface APIGroupList {
+  kind: string
+  apiVersion: string
+  groups: APIGroup[]
+}
diff --git a/packages/system/dashboard/images/console/packages/k8s-client/src/hooks.ts b/packages/system/dashboard/images/console/packages/k8s-client/src/hooks.ts
new file mode 100644
index 0000000000..e88e73cb10
--- /dev/null
+++ b/packages/system/dashboard/images/console/packages/k8s-client/src/hooks.ts
@@ -0,0 +1,264 @@
+import {
+  useQuery,
+  useMutation,
+  useQueryClient,
+  type UseQueryOptions,
+} from "@tanstack/react-query"
+import { useEffect, useRef } from "react"
+import { useK8sClient } from "./provider.tsx"
+import type { K8sList, K8sResource } from "./client.ts"
+
+export interface ResourceRef {
+  apiGroup: string
+  apiVersion: string
+  plural: string
+  namespace?: string
+}
+
+export function useK8sList<T extends K8sResource>(
+  ref: ResourceRef,
+  options?: Omit<UseQueryOptions<K8sList<T>>, "queryKey" | "queryFn"> & {
+    watch?: boolean
+    labelSelector?: string
+    fieldSelector?: string
+  },
+) {
+  const client = useK8sClient()
+  const queryClient = useQueryClient()
+  const { labelSelector, fieldSelector, watch: watchOpt, ...queryOptions } = options ?? {}
+  const queryKey = k8sListKey(ref, labelSelector, fieldSelector)
+  const enabled = queryOptions.enabled !== false
+  const watchEnabled = watchOpt !== false
+  const cleanupRef = useRef<(() => void) | null>(null)
+
+  const query = useQuery<K8sList<T>>({
+    queryKey,
+    queryFn: () =>
+      client.list<T>(ref.apiGroup, ref.apiVersion, ref.plural, ref.namespace, {
+        labelSelector,
+        fieldSelector,
+      }),
+    ...queryOptions,
+  })
+
+  const resourceVersion = query.data?.metadata?.resourceVersion
+
+  useEffect(() => {
+    cleanupRef.current?.()
+    cleanupRef.current = null
+
+    if (!enabled || !watchEnabled || !resourceVersion) return
+
+    cleanupRef.current = client.watch<T>(
+      ref.apiGroup,
+      ref.apiVersion,
+      ref.plural,
+      ref.namespace,
+      resourceVersion,
+      (event) => {
+        if (event.type === "BOOKMARK") return
+        if (event.type === "ERROR") {
+          queryClient.invalidateQueries({ queryKey })
+          return
+        }
+        queryClient.setQueryData<K8sList<T>>(queryKey, (old) => {
+          if (!old) return old
+          const items = [...old.items]
+          const idx = items.findIndex(
+            (i) =>
+              i.metadata.name === event.object.metadata.name &&
+              i.metadata.namespace === event.object.metadata.namespace,
+          )
+          switch (event.type) {
+            case "ADDED":
+              if (idx === -1) items.push(event.object)
+              else items[idx] = event.object
+              break
+            case "MODIFIED":
+              if (idx >= 0) items[idx] = event.object
+              else items.push(event.object)
+              break
+            case "DELETED":
+              if (idx >= 0) items.splice(idx, 1)
+              break
+          }
+          return { ...old, items }
+        })
+      },
+      () => {
+        setTimeout(() => {
+          queryClient.invalidateQueries({ queryKey })
+        }, 1000)
+      },
+      {
+        labelSelector,
+        fieldSelector,
+      },
+    )
+
+    return () => {
+      cleanupRef.current?.()
+      cleanupRef.current = null
+    }
+  }, [
+    resourceVersion,
+    enabled,
+    watchEnabled,
+    ref.apiGroup,
+    ref.apiVersion,
+    ref.plural,
+    ref.namespace,
+    labelSelector,
+    fieldSelector,
+  ])
+
+  return query
+}
+
+export function useK8sGet<T extends K8sResource>(
+  ref: ResourceRef & { name: string },
+  options?: Omit<UseQueryOptions<T>, "queryKey" | "queryFn">,
+) {
+  const client = useK8sClient()
+  const queryKey = k8sGetKey(ref)
+
+  return useQuery<T>({
+    queryKey,
+    queryFn: () =>
+      client.get<T>(ref.apiGroup, ref.apiVersion, ref.plural, ref.name, ref.namespace),
+    ...options,
+  })
+}
+
+export function useK8sCreate<T extends K8sResource>(ref: ResourceRef) {
+  const client = useK8sClient()
+  const queryClient = useQueryClient()
+
+  return useMutation({
+    mutationFn: (body: T) =>
+      client.create<T>(ref.apiGroup, ref.apiVersion, ref.plural, body, ref.namespace),
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: k8sListKey(ref) })
+    },
+  })
+}
+
+export function useK8sUpdate<T extends K8sResource>(ref: ResourceRef) {
+  const client = useK8sClient()
+  const queryClient = useQueryClient()
+
+  return useMutation({
+    mutationFn: (body: T) =>
+      client.update<T>(
+        ref.apiGroup,
+        ref.apiVersion,
+        ref.plural,
+        body.metadata.name,
+        body,
+        ref.namespace,
+      ),
+    onSuccess: (data, variables) => {
+      const getKey = k8sGetKey({ ...ref, name: variables.metadata.name })
+      queryClient.setQueryData(getKey, data)
+      queryClient.invalidateQueries({ queryKey: k8sListKey(ref) })
+    },
+  })
+}
+
+export function useK8sDelete(ref: ResourceRef) {
+  const client = useK8sClient()
+  const queryClient = useQueryClient()
+
+  return useMutation({
+    mutationFn: (name: string) =>
+      client.delete(ref.apiGroup, ref.apiVersion, ref.plural, name, ref.namespace),
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: k8sListKey(ref) })
+    },
+  })
+}
+
+/**
+ * Mutation hook for calling a resource subresource action (e.g. KubeVirt
+ * virtualmachines/{name}/start|stop|restart). On success it invalidates every
+ * GET and LIST cache for the target resource so its status (e.g.
+ * printableStatus) refetches.
+ *
+ * The action endpoint and the resource whose status you want to refresh can
+ * live under different API groups — KubeVirt serves the actions under
+ * `subresources.kubevirt.io` but the VirtualMachine (with its status) under
+ * `kubevirt.io`. Pass `options.invalidate` with the target resource's ref so
+ * the invalidation hits the query that holds the status; without it the keys
+ * never match and the refresh does nothing.
+ *
+ * Invalidation keys off the resource prefix `["k8s", group, version, plural,
+ * namespace]`, which React Query prefix-matches against both the by-name GET
+ * key and any field/label-selected LIST key — so a status read via a
+ * `metadata.name` field-selected `useK8sList` (the watch-based, no-poll path)
+ * is refreshed too.
+ */
+export function useK8sSubresource(
+  ref: ResourceRef & { name: string },
+  options?: { invalidate?: ResourceRef },
+) {
+  const client = useK8sClient()
+  const queryClient = useQueryClient()
+  const invalidateRef = options?.invalidate ?? ref
+
+  return useMutation({
+    mutationFn: ({
+      subresource,
+      body,
+      method,
+    }: {
+      subresource: string
+      body?: unknown
+      method?: "PUT" | "POST"
+    }) =>
+      client.subresource(
+        ref.apiGroup,
+        ref.apiVersion,
+        ref.plural,
+        ref.name,
+        subresource,
+        ref.namespace,
+        body ?? {},
+        method,
+      ),
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: k8sResourceKey(invalidateRef) })
+    },
+  })
+}
+
+/**
+ * Prefix shared by every GET and LIST key for a resource in a namespace.
+ * React Query prefix-matches on this, so invalidating it refreshes the by-name
+ * GET and every selector-scoped LIST of that resource at once.
+ */
+function k8sResourceKey(ref: ResourceRef) {
+  return ["k8s", ref.apiGroup, ref.apiVersion, ref.plural, ref.namespace ?? ""] as const
+}
+
+function k8sListKey(ref: ResourceRef, labelSelector?: string, fieldSelector?: string) {
+  return [
+    "k8s",
+    ref.apiGroup,
+    ref.apiVersion,
+    ref.plural,
+    ref.namespace ?? "",
+    labelSelector ?? "",
+    fieldSelector ?? "",
+  ] as const
+}
+
+function k8sGetKey(ref: ResourceRef & { name: string }) {
+  return [
+    "k8s",
+    ref.apiGroup,
+    ref.apiVersion,
+    ref.plural,
+    ref.namespace ?? "",
+    ref.name,
+  ] as const
+}
diff --git a/packages/system/dashboard/images/console/packages/k8s-client/src/index.ts b/packages/system/dashboard/images/console/packages/k8s-client/src/index.ts
new file mode 100644
index 0000000000..dbc579b6a7
--- /dev/null
+++ b/packages/system/dashboard/images/console/packages/k8s-client/src/index.ts
@@ -0,0 +1,35 @@
+export { K8sClient, K8sApiError } from "./client.ts"
+export type {
+  K8sClientConfig,
+  K8sResource,
+  K8sMetadata,
+  K8sOwnerReference,
+  K8sList,
+  K8sCondition,
+  WatchEvent,
+  APIGroup,
+  APIGroupList,
+  APIGroupVersion,
+} from "./client.ts"
+
+export { K8sProvider, useK8sClient, useConnectionError } from "./provider.tsx"
+
+export {
+  useK8sList,
+  useK8sGet,
+  useK8sCreate,
+  useK8sUpdate,
+  useK8sDelete,
+  useK8sSubresource,
+} from "./hooks.ts"
+export type { ResourceRef } from "./hooks.ts"
+
+export { useApiGroupAvailable } from "./useApiGroupAvailable.ts"
+
+export { useSelfSubjectAccessReview } from "./useSelfSubjectAccessReview.ts"
+export type {
+  SelfSubjectAccessReview,
+  SelfSubjectAccessReviewSpec,
+  ResourceAttributes,
+  NonResourceAttributes,
+} from "./useSelfSubjectAccessReview.ts"
diff --git a/packages/system/dashboard/images/console/packages/k8s-client/src/provider.tsx b/packages/system/dashboard/images/console/packages/k8s-client/src/provider.tsx
new file mode 100644
index 0000000000..04bce763a6
--- /dev/null
+++ b/packages/system/dashboard/images/console/packages/k8s-client/src/provider.tsx
@@ -0,0 +1,89 @@
+import { createContext, useContext, useMemo, useState, useEffect, type ReactNode } from "react"
+import { QueryClient, QueryClientProvider, useQueryClient } from "@tanstack/react-query"
+import { K8sClient, type K8sClientConfig } from "./client.ts"
+
+const K8sClientContext = createContext<K8sClient | null>(null)
+
+const defaultQueryClient = new QueryClient({
+  defaultOptions: {
+    queries: {
+      staleTime: 30_000,
+      retry: (failureCount, error) => {
+        if (
+          error &&
+          "status" in error &&
+          ((error as { status: number }).status === 401 ||
+            (error as { status: number }).status === 403)
+        )
+          return false
+        return failureCount < 3
+      },
+      retryDelay: (attempt) => Math.min(1000 * 2 ** attempt, 15000),
+      refetchOnWindowFocus: false,
+      refetchOnReconnect: true,
+      placeholderData: (prev: unknown) => prev,
+    },
+  },
+})
+
+interface K8sProviderProps {
+  config?: K8sClientConfig
+  /**
+   * Pre-built K8sClient instance. When supplied, replaces the client that
+   * would otherwise be constructed from `config`. Primary use case: tests
+   * that need to inject a mock; production code should pass `config` and
+   * let the provider build the real client.
+   */
+  client?: K8sClient
+  queryClient?: QueryClient
+  children: ReactNode
+}
+
+export function K8sProvider({ config, client, queryClient, children }: K8sProviderProps) {
+  const resolved = useMemo(() => client ?? new K8sClient(config), [client, config])
+  const qc = queryClient ?? defaultQueryClient
+
+  return (
+    <QueryClientProvider client={qc}>
+      <K8sClientContext.Provider value={resolved}>{children}</K8sClientContext.Provider>
+    </QueryClientProvider>
+  )
+}
+
+export function useConnectionError(): boolean {
+  const queryClient = useQueryClient()
+  const [hasError, setHasError] = useState(false)
+
+  useEffect(() => {
+    const cache = queryClient.getQueryCache()
+    const isConnectionError = (err: unknown) => {
+      if (!err || typeof err !== "object") return false
+      const status = (err as { status?: number }).status
+      if (status === 401 || status === 403) return false
+      return true
+    }
+    const check = () => {
+      const queries = cache.getAll()
+      const anyFailing = queries.some(
+        (q) => q.state.error != null && isConnectionError(q.state.error),
+      )
+      const allHealthy =
+        queries.length > 0 &&
+        queries.every((q) => q.state.error == null || !isConnectionError(q.state.error))
+      if (allHealthy) setHasError(false)
+      else if (anyFailing) setHasError(true)
+    }
+    const unsubscribe = cache.subscribe(check)
+    return unsubscribe
+  }, [queryClient])
+
+  return hasError
+}
+
+export function useK8sClient(): K8sClient {
+  const client = useContext(K8sClientContext)
+  if (!client) {
+    throw new Error("useK8sClient must be used within a K8sProvider")
+  }
+  return client
+}
diff --git a/packages/system/dashboard/images/console/packages/k8s-client/src/useApiGroupAvailable.ts b/packages/system/dashboard/images/console/packages/k8s-client/src/useApiGroupAvailable.ts
new file mode 100644
index 0000000000..712d8eb5d1
--- /dev/null
+++ b/packages/system/dashboard/images/console/packages/k8s-client/src/useApiGroupAvailable.ts
@@ -0,0 +1,30 @@
+import { useQuery } from "@tanstack/react-query"
+import { useK8sClient } from "./provider.tsx"
+import type { APIGroupList } from "./client.ts"
+
+/**
+ * Returns whether a specific Kubernetes API group is registered on the
+ * cluster, derived from a single `/apis` discovery call shared across
+ * all consumers. Result is cached for the lifetime of the QueryClient
+ * (staleTime: Infinity) — discovery is rarely meaningful to re-poll
+ * within a session, and callers can invalidate the "k8s-api-groups"
+ * query key explicitly if the use case ever arises.
+ *
+ * Errors are absorbed silently and reported as available=false: the
+ * caller is asking a discovery question, and "we cannot find out" is
+ * functionally identical to "not registered" for the cluster-usage
+ * page's gating logic.
+ */
+export function useApiGroupAvailable(
+  groupName: string,
+): { available: boolean; isLoading: boolean } {
+  const client = useK8sClient()
+  const query = useQuery<APIGroupList>({
+    queryKey: ["k8s-api-groups"],
+    queryFn: () => client.getApiGroups(),
+    staleTime: Infinity,
+    refetchOnWindowFocus: false,
+  })
+  const available = query.data?.groups.some((g) => g.name === groupName) ?? false
+  return { available, isLoading: query.isLoading }
+}
diff --git a/packages/system/dashboard/images/console/packages/k8s-client/src/useSelfSubjectAccessReview.ts b/packages/system/dashboard/images/console/packages/k8s-client/src/useSelfSubjectAccessReview.ts
new file mode 100644
index 0000000000..eb99135282
--- /dev/null
+++ b/packages/system/dashboard/images/console/packages/k8s-client/src/useSelfSubjectAccessReview.ts
@@ -0,0 +1,93 @@
+import { useQuery } from "@tanstack/react-query"
+import { useK8sClient } from "./provider.tsx"
+import type { K8sResource } from "./client.ts"
+
+export interface ResourceAttributes {
+  namespace?: string
+  verb?: string
+  group?: string
+  version?: string
+  resource?: string
+  subresource?: string
+  name?: string
+}
+
+export interface NonResourceAttributes {
+  path?: string
+  verb?: string
+}
+
+export interface SelfSubjectAccessReviewSpec {
+  resourceAttributes?: ResourceAttributes
+  nonResourceAttributes?: NonResourceAttributes
+}
+
+interface SelfSubjectAccessReviewStatus {
+  allowed: boolean
+  denied?: boolean
+  reason?: string
+  evaluationError?: string
+}
+
+export type SelfSubjectAccessReview = K8sResource<
+  SelfSubjectAccessReviewSpec,
+  SelfSubjectAccessReviewStatus
+>
+
+function ssarCacheKey(spec: SelfSubjectAccessReviewSpec): readonly string[] {
+  const r = spec.resourceAttributes ?? {}
+  const n = spec.nonResourceAttributes ?? {}
+  return [
+    "ssar",
+    r.namespace ?? "",
+    r.group ?? "",
+    r.version ?? "",
+    r.resource ?? "",
+    r.subresource ?? "",
+    r.verb ?? "",
+    r.name ?? "",
+    n.path ?? "",
+    n.verb ?? "",
+  ]
+}
+
+/**
+ * Issues a SelfSubjectAccessReview against the cluster and returns
+ * whether the current user is allowed to perform the requested action.
+ * The result is cached per spec for the lifetime of the QueryClient
+ * (staleTime: Infinity, refetchOnWindowFocus disabled) — discovery-style
+ * permission checks rarely change mid-session, and a revoked grant
+ * surfaces on the next page load.
+ *
+ * Errors are absorbed and surfaced as allowed=false. Callers asking
+ * 'can I see this UI section' are functionally indifferent to 'denied'
+ * versus 'cannot determine'; in both cases the section stays hidden.
+ */
+export function useSelfSubjectAccessReview(
+  spec: SelfSubjectAccessReviewSpec,
+): { allowed: boolean; isLoading: boolean; error: Error | null } {
+  const client = useK8sClient()
+  const queryKey = ssarCacheKey(spec)
+  const query = useQuery<SelfSubjectAccessReview>({
+    queryKey,
+    queryFn: () =>
+      client.create<SelfSubjectAccessReview>(
+        "authorization.k8s.io",
+        "v1",
+        "selfsubjectaccessreviews",
+        {
+          apiVersion: "authorization.k8s.io/v1",
+          kind: "SelfSubjectAccessReview",
+          metadata: { name: "" },
+          spec,
+        },
+      ),
+    staleTime: Infinity,
+    refetchOnWindowFocus: false,
+  })
+  return {
+    allowed: query.data?.status?.allowed ?? false,
+    isLoading: query.isLoading,
+    error: (query.error as Error | null) ?? null,
+  }
+}
diff --git a/packages/system/dashboard/images/console/packages/k8s-client/tsconfig.json b/packages/system/dashboard/images/console/packages/k8s-client/tsconfig.json
new file mode 100644
index 0000000000..25e8cea979
--- /dev/null
+++ b/packages/system/dashboard/images/console/packages/k8s-client/tsconfig.json
@@ -0,0 +1,7 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "noEmit": true
+  },
+  "include": ["src/**/*"]
+}
diff --git a/packages/system/dashboard/images/console/packages/types/package.json b/packages/system/dashboard/images/console/packages/types/package.json
new file mode 100644
index 0000000000..bb71b5935d
--- /dev/null
+++ b/packages/system/dashboard/images/console/packages/types/package.json
@@ -0,0 +1,20 @@
+{
+  "name": "@cozystack/types",
+  "private": true,
+  "version": "0.0.0",
+  "type": "module",
+  "main": "./src/index.ts",
+  "types": "./src/index.ts",
+  "exports": {
+    ".": "./src/index.ts"
+  },
+  "scripts": {
+    "typecheck": "tsc --noEmit"
+  },
+  "dependencies": {
+    "@cozystack/k8s-client": "workspace:*"
+  },
+  "devDependencies": {
+    "typescript": "~6.0.2"
+  }
+}
diff --git a/packages/system/dashboard/images/console/packages/types/src/cozystack.ts b/packages/system/dashboard/images/console/packages/types/src/cozystack.ts
new file mode 100644
index 0000000000..3d4c253eb3
--- /dev/null
+++ b/packages/system/dashboard/images/console/packages/types/src/cozystack.ts
@@ -0,0 +1,134 @@
+import type { K8sCondition, K8sResource } from "@cozystack/k8s-client"
+
+export const COZYSTACK_GROUP = "cozystack.io"
+export const COZYSTACK_VERSION = "v1alpha1"
+
+export const APPS_GROUP = "apps.cozystack.io"
+export const APPS_VERSION = "v1alpha1"
+
+export const CORE_GROUP = "core.cozystack.io"
+export const CORE_VERSION = "v1alpha1"
+
+/**
+ * Tap is the read-only marketplace view of one connected External-Apps
+ * repository and the packages it exposes. The dashboard lists Taps to show
+ * connected repositories, and creates/deletes them to connect/disconnect.
+ * A Tap never carries a pull credential.
+ */
+export interface Tap extends K8sResource<TapSpec> {
+  kind: "Tap"
+}
+
+export interface TapSpec {
+  source?: { kind?: string; name?: string }
+  community?: boolean
+  ready?: boolean
+  message?: string
+  packages?: TapPackage[]
+  /** Connect-time inputs only; never populated on read. */
+  url?: string
+  tag?: string
+  secretRef?: string
+}
+
+export interface TapPackage {
+  name: string
+  kind?: string
+  component?: string
+  description?: string
+  category?: string
+  tags?: string[]
+  icon?: string
+  privileged?: boolean
+}
+
+/**
+ * ApplicationDefinition describes a single application kind available in the
+ * cluster (postgres, kafka, kubernetes, tenant, etc.). The UI reads all ADs to
+ * build the marketplace dynamically.
+ */
+export interface ApplicationDefinition extends K8sResource<ApplicationDefinitionSpec> {
+  kind: "ApplicationDefinition"
+}
+
+export interface ApplicationDefinitionSpec {
+  application: {
+    kind: string
+    plural: string
+    singular: string
+    /** JSON-encoded OpenAPI schema for the application values. */
+    openAPISchema: string
+  }
+  dashboard?: {
+    category?: string
+    description?: string
+    /** Base64-encoded SVG icon. */
+    icon?: string
+    /** Ordered list of key paths used to render the form top-to-bottom. */
+    keysOrder?: string[][]
+    /**
+     * Tenant module: singleton add-on managed via `Tenant.spec.<name>=true`.
+     * UI must hide these from the regular marketplace and category nav, and
+     * surface them under Administration → Modules.
+     */
+    module?: boolean
+  }
+  release?: {
+    prefix?: string
+    chartRef?: {
+      kind: string
+      name: string
+      namespace: string
+    }
+    labels?: Record<string, string>
+  }
+  secrets?: {
+    include?: string[]
+    exclude?: string[]
+  }
+}
+
+/**
+ * Generic Cozystack application instance — Postgres, Kafka, Kubernetes, VPN,
+ * etc. All of them share the same shape: a free-form `spec` driven by the
+ * application's OpenAPI schema, plus a conditions-based `status`.
+ */
+export interface ApplicationInstance
+  extends K8sResource<Record<string, unknown>, ApplicationInstanceStatus> {}
+
+export interface ApplicationInstanceStatus {
+  conditions?: K8sCondition[]
+  version?: string
+  [k: string]: unknown
+}
+
+/**
+ * Tenant is a special instance of the `tenants` application that also creates
+ * a child namespace named `tenant-<name>` for hosting further applications.
+ */
+export interface Tenant extends ApplicationInstance {
+  kind: "Tenant"
+  spec?: {
+    host?: string
+    etcd?: boolean
+    ingress?: boolean
+    monitoring?: boolean
+    seaweedfs?: boolean
+    isolated?: boolean
+    resourceQuotas?: Record<string, string>
+    [k: string]: unknown
+  }
+  status?: ApplicationInstanceStatus & {
+    namespace?: string
+  }
+}
+
+/**
+ * TenantNamespace (`core.cozystack.io/v1alpha1`) is a cluster-scoped
+ * aggregation that tracks every namespace owned by a tenant. Its name is the
+ * namespace itself (e.g. `tenant-kvaps`) and the labels encode the tenant
+ * hierarchy and which parent namespace each tenant module is installed into.
+ */
+export interface TenantNamespace extends K8sResource {
+  kind: "TenantNamespace"
+}
diff --git a/packages/system/dashboard/images/console/packages/types/src/index.ts b/packages/system/dashboard/images/console/packages/types/src/index.ts
new file mode 100644
index 0000000000..e74e53c0e6
--- /dev/null
+++ b/packages/system/dashboard/images/console/packages/types/src/index.ts
@@ -0,0 +1,20 @@
+export type {
+  ApplicationDefinition,
+  ApplicationDefinitionSpec,
+  ApplicationInstance,
+  ApplicationInstanceStatus,
+  Tap,
+  TapSpec,
+  TapPackage,
+  Tenant,
+  TenantNamespace,
+} from "./cozystack.ts"
+
+export {
+  COZYSTACK_GROUP,
+  COZYSTACK_VERSION,
+  APPS_GROUP,
+  APPS_VERSION,
+  CORE_GROUP,
+  CORE_VERSION,
+} from "./cozystack.ts"
diff --git a/packages/system/dashboard/images/console/packages/types/tsconfig.json b/packages/system/dashboard/images/console/packages/types/tsconfig.json
new file mode 100644
index 0000000000..aa4a01b68a
--- /dev/null
+++ b/packages/system/dashboard/images/console/packages/types/tsconfig.json
@@ -0,0 +1,10 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "noEmit": true,
+    "paths": {
+      "@cozystack/k8s-client": ["../k8s-client/src"]
+    }
+  },
+  "include": ["src/**/*"]
+}
diff --git a/packages/system/dashboard/images/console/packages/ui/package.json b/packages/system/dashboard/images/console/packages/ui/package.json
new file mode 100644
index 0000000000..470e279902
--- /dev/null
+++ b/packages/system/dashboard/images/console/packages/ui/package.json
@@ -0,0 +1,35 @@
+{
+  "name": "@cozystack/ui",
+  "private": true,
+  "version": "0.0.0",
+  "type": "module",
+  "main": "./src/index.ts",
+  "types": "./src/index.ts",
+  "exports": {
+    ".": "./src/index.ts",
+    "./styles": "./src/index.css",
+    "./logo": "./src/assets/logo.svg"
+  },
+  "scripts": {
+    "typecheck": "tsc --noEmit"
+  },
+  "dependencies": {
+    "@base-ui-components/react": "^1.0.0-beta.4",
+    "@fontsource-variable/geist": "^5.2.8",
+    "class-variance-authority": "^0.7.1",
+    "clsx": "^2.1.1",
+    "lucide-react": "^0.484.0",
+    "tailwind-merge": "^3.5.0",
+    "tailwindcss": "^4.2.2"
+  },
+  "peerDependencies": {
+    "react": "^19.0.0",
+    "react-dom": "^19.0.0",
+    "react-router": "^7.0.0"
+  },
+  "devDependencies": {
+    "@types/react": "^19.2.14",
+    "@types/react-dom": "^19.2.3",
+    "typescript": "~6.0.2"
+  }
+}
diff --git a/packages/system/dashboard/images/console/packages/ui/src/assets.d.ts b/packages/system/dashboard/images/console/packages/ui/src/assets.d.ts
new file mode 100644
index 0000000000..82feb649b0
--- /dev/null
+++ b/packages/system/dashboard/images/console/packages/ui/src/assets.d.ts
@@ -0,0 +1,4 @@
+declare module "*.svg" {
+  const url: string
+  export default url
+}
diff --git a/packages/system/dashboard/images/console/packages/ui/src/assets/logo.svg b/packages/system/dashboard/images/console/packages/ui/src/assets/logo.svg
new file mode 100644
index 0000000000..a7adbd3804
--- /dev/null
+++ b/packages/system/dashboard/images/console/packages/ui/src/assets/logo.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" role="img" viewBox="106 111 1141 231"><title>cozystack-horizontal-black</title><path d="M296.546 172.978c.279 1.102.433 2.245.452 3.408v.016l.002.212v98.987c0 5.088-2.599 9.816-6.877 12.538l-.012.007-.179.112-.006.005-.008.005-79.552 48.81c-1.802 1.106-3.783 1.793-5.805 2.06l-2.121.278v-13.292l.897-.55 79.552-48.809c.403-.248.65-.69.65-1.164v-96.773l.816-.56 9.314-6.38 2.217-1.519.66 2.609zm-93.986-46.686l-.897.55-79.552 48.81c-.403.248-.65.69-.65 1.164v96.773l-.816.559-9.314 6.381-2.217 1.518-.66-2.609c-.279-1.102-.433-2.244-.452-3.407v-.016l-.002-.212v-98.987c0-5.088 2.599-9.817 6.877-12.539l.006-.004.006-.002.179-.113.006-.005.008-.004 79.552-48.81c1.802-1.106 3.783-1.793 5.805-2.06l2.121-.279v13.292zm43.135 117.397c5.787 2.05 5.497 8.79.505 11.826l-26.138 15.292c-3.93 2.275-7.82 4.625-11.802 6.805-6.303 3.448-11.288-.373-16.596-3.448l-13.582-7.961-12.361-7.21c-2.706-1.578-7.803-3.963-9.113-6.806-.771-1.674-.824-3.59-.144-5.305.708-1.772 1.833-2.474 3.51-3.159 1.533.258 4.04 2.067 5.466 2.879 8.324 4.729 16.5 9.748 24.822 14.484 3.173 1.658 6.343 4.154 9.696 5.36 5.506 1.981 11.351-2.859 15.867-5.467l18.002-10.489c3.754-2.207 8.036-4.859 11.868-6.801zm553.544-69.619c7.303.093 13.831 1.304 19.583 3.63 5.802 2.327 10.604 5.677 14.406 10.051 3.851 4.327 6.502 9.586 7.953 15.774l-16.807 2.653c-.75-3.769-2.351-7.004-4.802-9.702-2.451-2.746-5.452-4.839-9.003-6.282-3.551-1.489-7.403-2.257-11.554-2.303-4.002-.093-7.678.465-11.03 1.674-3.301 1.21-5.952 2.909-7.953 5.096-1.95 2.187-2.926 4.7-2.927 7.538 0 2.792.877 5.049 2.627 6.771 1.751 1.721 3.902 3.094 6.453 4.118 2.6.977 5.176 1.792 7.727 2.443l19.958 5.236c2.501.651 5.327 1.535 8.479 2.652 3.201 1.07 6.277 2.582 9.228 4.536 3.001 1.954 5.477 4.561 7.428 7.818 1.951 3.211 2.927 7.259 2.927 12.145 0 5.072-1.101 9.539-3.302 13.401-2.201 3.816-5.227 7.027-9.078 9.633-3.802 2.559-8.204 4.49-13.205 5.793-5.002 1.303-10.28 1.955-15.832 1.955-7.753 0-14.756-1.234-21.008-3.7-6.202-2.513-11.329-6.072-15.381-10.679-4.002-4.653-6.602-10.168-7.803-16.543l16.356-2.302c1.65 6.142 5.102 10.934 10.354 14.378 5.252 3.396 11.379 5.095 18.382 5.095 4.352 0 8.354-.628 12.005-1.885 3.651-1.302 6.577-3.14 8.778-5.513 2.251-2.42 3.377-5.305 3.377-8.655 0-1.815-.35-3.421-1.051-4.817-.65-1.396-1.576-2.606-2.776-3.63-1.15-1.07-2.576-1.977-4.276-2.721-1.651-.792-3.477-1.466-5.478-2.025l-27.685-7.608c-2.701-.745-5.452-1.698-8.253-2.862-2.801-1.209-5.378-2.769-7.729-4.676-2.301-1.955-4.176-4.351-5.627-7.19-1.45-2.885-2.176-6.375-2.176-10.47 0-6.188 1.701-11.424 5.102-15.705 3.451-4.327 8.104-7.584 13.956-9.771 5.852-2.234 12.405-3.351 19.657-3.351zM397.095 174c12.455 0 22.759 2.932 30.912 8.795 8.203 5.863 13.906 13.75 17.107 23.662l-15.906 3.979c-2.101-7.027-5.853-12.542-11.255-16.543-5.352-4.002-12.305-6.003-20.858-6.003-7.653 0-14.03 1.605-19.132 4.816-5.102 3.211-8.954 7.702-11.555 13.472-2.551 5.77-3.827 12.494-3.827 20.172-.05 7.677 1.201 14.401 3.752 20.171 2.601 5.771 6.453 10.261 11.555 13.472 5.152 3.211 11.554 4.817 19.207 4.817 8.553 0 15.506-2.002 20.858-6.003 5.402-4.049 9.154-9.563 11.255-16.543l15.906 3.978c-3.201 9.912-8.904 17.799-17.107 23.662-8.153 5.863-18.457 8.795-30.912 8.795-10.804 0-20.008-2.187-27.611-6.561-7.603-4.421-13.43-10.563-17.482-18.427C348 245.847 346 236.726 346 226.35c0-10.377 2-19.498 6.002-27.362 4.052-7.864 9.879-13.983 17.482-18.357 7.603-4.421 16.807-6.631 27.611-6.631zm111.634 0c10.754 0 19.933 2.21 27.536 6.631 7.653 4.374 13.48 10.493 17.482 18.357 4.002 7.864 6.002 16.985 6.002 27.362 0 10.376-2 19.497-6.002 27.361-4.002 7.864-9.829 14.006-17.482 18.427-7.603 4.374-16.781 6.561-27.536 6.561-10.804 0-20.008-2.187-27.611-6.561-7.603-4.421-13.43-10.563-17.481-18.427-4.002-7.864-6.002-16.985-6.002-27.361 0-10.377 2-19.498 6.002-27.362 4.051-7.864 9.878-13.983 17.481-18.357 7.603-4.421 16.807-6.631 27.611-6.631zm585.771 0c12.46 0 22.76 2.932 30.92 8.795 8.2 5.863 13.9 13.75 17.1 23.662l-15.9 3.979c-2.1-7.027-5.85-12.542-11.26-16.543-5.35-4.002-12.3-6.003-20.86-6.003-7.65 0-14.03 1.605-19.13 4.816s-8.95 7.702-11.55 13.472c-2.55 5.77-3.83 12.494-3.83 20.172-.05 7.677 1.2 14.401 3.75 20.171 2.6 5.771 6.46 10.261 11.56 13.472 5.15 3.211 11.55 4.817 19.2 4.817 8.56 0 15.51-2.002 20.86-6.003 5.41-4.049 9.16-9.563 11.26-16.543l15.9 3.978c-3.2 9.912-8.9 17.799-17.1 23.662-8.16 5.863-18.46 8.795-30.92 8.795-10.8 0-20-2.187-27.61-6.561-7.6-4.421-13.43-10.563-17.48-18.427-4-7.864-6-16.985-6-27.361 0-10.377 2-19.498 6-27.362 4.05-7.864 9.88-13.983 17.48-18.357 7.61-4.421 16.81-6.631 27.61-6.631zm-440.656 4.468l-54.847 84.317h53.827v13.82h-81.062v-2.303l55.146-84.457h-53.113v-13.75h80.049v2.373zm55.068 39.855l26.186-42.228h18.307l-36.54 58.98v41.53h-15.906v-41.53l-36.539-58.98h18.308l26.184 42.228zm230.566-28.478h-35.939v86.76h-15.682v-86.76h-35.938v-13.75h87.559v13.75zm96.402 86.76h-16.28l-8-22.684h-44.344l-7.905 22.684h-16.282l35.114-100.51h22.587l35.11 100.51zM1176.72 223l45.25-46.905h19.5l-47.79 49.068 51.32 51.442h-20.11l-48.17-48.021v48.021h-15.68v-100.51h15.68V223zm-667.991-35.11c-7.653-.093-14.03 1.466-19.132 4.676-5.052 3.211-8.854 7.725-11.405 13.541-2.551 5.817-3.851 12.565-3.901 20.243-.05 7.677 1.2 14.401 3.751 20.171 2.551 5.724 6.378 10.191 11.479 13.402 5.153 3.211 11.555 4.84 19.208 4.887 7.653.093 14.006-1.466 19.058-4.677 5.102-3.257 8.929-7.771 11.48-13.541 2.551-5.817 3.826-12.564 3.826-20.242 0-7.678-1.275-14.379-3.826-20.103-2.551-5.77-6.378-10.26-11.48-13.471-5.052-3.21-11.405-4.84-19.058-4.886zm-262.97 31.746c1.485.609 2.47 1.301 3.31 2.721.865 1.464 1.098 3.215.649 4.854-.53 1.974-1.689 3.148-3.382 4.168l-26.252 15.423c-4.409 2.591-9.207 5.722-13.847 7.699-5.041 2.148-10.791-2.137-14.883-4.518l-14.127-8.291-11.654-6.851c-4.29-2.511-11.307-5.088-9.226-11.433.626-1.909 1.772-2.748 3.454-3.634 1.305.02 7.888 4.115 9.343 4.962l21.22 12.493c4.466 2.64 10.858 7.643 16.208 5.126 4.227-1.986 8.491-4.869 12.594-7.24 8.853-5.117 17.604-10.596 26.593-15.479zm726.264 20.604h34.757l-17.481-49.572-17.276 49.572zm-770.818-67.676c3.211-.222 4.897-.079 7.774 1.563l25.769 14.973 8.19 4.725c2.856 1.651 5.951 2.862 6.816 6.372.396 1.659.106 3.406-.808 4.848-1.295 2.088-5.899 4.326-8.202 5.685l-12.756 7.543-12.681 7.472c-3.13 1.84-6.937 4.465-10.4 5.267-2.527.207-4.868.066-7.128-1.227-3.008-1.721-6.003-3.504-8.99-5.261l-16.757-9.857-9.214-5.407c-1.315-.774-3.493-1.888-4.577-2.806-3.31-2.804-2.816-8.065.857-10.31 2.36-1.444 4.476-2.664 6.744-3.977l12.411-7.177 11.82-6.805c3.202-1.867 7.622-4.869 11.132-5.621z"/></svg>
diff --git a/packages/system/dashboard/images/console/packages/ui/src/components/Dropdown.tsx b/packages/system/dashboard/images/console/packages/ui/src/components/Dropdown.tsx
new file mode 100644
index 0000000000..c5d9bd1fa8
--- /dev/null
+++ b/packages/system/dashboard/images/console/packages/ui/src/components/Dropdown.tsx
@@ -0,0 +1,126 @@
+import { useState, useRef, useEffect, type ReactNode } from "react"
+import { ChevronDown } from "lucide-react"
+
+interface Option {
+  value: string
+  label: string | ReactNode
+  disabled?: boolean
+}
+
+interface DropdownProps {
+  value: string
+  onChange: (value: string) => void
+  options: Option[]
+  placeholder?: string
+  className?: string
+  disabled?: boolean
+  size?: "default" | "sm"
+  /** Show a search input. Defaults to true when options > 20. */
+  searchable?: boolean
+}
+
+export function Dropdown({
+  value,
+  onChange,
+  options,
+  placeholder = "Select...",
+  className = "",
+  disabled,
+  size = "default",
+  searchable,
+}: DropdownProps) {
+  const [open, setOpen] = useState(false)
+  const [search, setSearch] = useState("")
+  const ref = useRef<HTMLDivElement>(null)
+  const searchRef = useRef<HTMLInputElement>(null)
+  const showSearch = searchable ?? options.length > 20
+
+  useEffect(() => {
+    if (!open) return
+    const handler = (e: MouseEvent) => {
+      if (ref.current && !ref.current.contains(e.target as Node)) setOpen(false)
+    }
+    document.addEventListener("mousedown", handler)
+    return () => document.removeEventListener("mousedown", handler)
+  }, [open])
+
+  useEffect(() => {
+    if (open && showSearch) searchRef.current?.focus()
+    if (!open) setSearch("")
+  }, [open, showSearch])
+
+  const selected = options.find((o) => o.value === value)
+  const filtered = search
+    ? options.filter(
+        (o) =>
+          String(o.label).toLowerCase().includes(search.toLowerCase()) ||
+          o.value.toLowerCase().includes(search.toLowerCase()),
+      )
+    : options
+
+  const triggerSizeClass =
+    size === "sm"
+      ? "gap-1 rounded-md border-slate-200 px-2 py-0.5 text-sm font-medium text-slate-900"
+      : "gap-2 rounded-lg border-slate-300 px-3 py-2 text-sm"
+
+  return (
+    <div className={`relative ${className}`} ref={ref}>
+      <button
+        type="button"
+        disabled={disabled}
+        onClick={() => setOpen(!open)}
+        className={`flex w-full items-center justify-between border bg-white text-left outline-none transition-colors hover:bg-slate-50 focus:border-blue-400 ${triggerSizeClass} ${
+          disabled ? "bg-slate-50 text-slate-400" : ""
+        }`}
+      >
+        <span className={selected ? "" : "text-slate-400"}>
+          {selected ? selected.label : placeholder}
+        </span>
+        <ChevronDown
+          className={`shrink-0 text-slate-400 transition-transform ${
+            open ? "rotate-180" : ""
+          } ${size === "sm" ? "h-3 w-3" : "h-4 w-4"}`}
+        />
+      </button>
+      {open && (
+        <div className="absolute z-30 mt-1 w-full min-w-[160px] rounded-lg border border-slate-200 bg-white shadow-lg">
+          {showSearch && (
+            <div className="border-b border-slate-100 px-3 py-2">
+              <input
+                ref={searchRef}
+                type="text"
+                value={search}
+                onChange={(e) => setSearch(e.target.value)}
+                placeholder="Search..."
+                className="w-full text-sm outline-none placeholder:text-slate-400"
+              />
+            </div>
+          )}
+          <div className="max-h-60 overflow-auto py-1">
+            {filtered.map((opt) => (
+              <button
+                key={opt.value}
+                type="button"
+                disabled={opt.disabled}
+                onClick={() => {
+                  onChange(opt.value)
+                  setOpen(false)
+                }}
+                className={`flex w-full items-center px-3 py-1.5 text-left text-sm transition-colors ${
+                  opt.value === value
+                    ? "bg-blue-50 font-medium text-blue-700"
+                    : "text-slate-700 hover:bg-slate-50"
+                } ${opt.disabled ? "cursor-not-allowed opacity-40" : ""}`}
+              >
+                {opt.label}
+              </button>
+            ))}
+            {filtered.length === 0 && (
+              <div className="px-3 py-2 text-sm text-slate-400">No results</div>
+            )}
+          </div>
+        </div>
+      )}
+    </div>
+  )
+}
diff --git a/packages/system/dashboard/images/console/packages/ui/src/components/Logo.tsx b/packages/system/dashboard/images/console/packages/ui/src/components/Logo.tsx
new file mode 100644
index 0000000000..7ac43454da
--- /dev/null
+++ b/packages/system/dashboard/images/console/packages/ui/src/components/Logo.tsx
@@ -0,0 +1,26 @@
+import logoUrl from "../assets/logo.svg"
+
+interface LogoProps {
+  className?: string
+  title?: string
+  /** Base64-encoded SVG to use instead of the default logo. */
+  svgContent?: string
+  /** Plain text label to render when no SVG is provided. */
+  text?: string
+}
+
+export function Logo({ className, title = "Cozystack", svgContent, text }: LogoProps) {
+  if (svgContent) {
+    return (
+      <img
+        src={`data:image/svg+xml;base64,${svgContent}`}
+        alt={title}
+        className={className}
+      />
+    )
+  }
+  if (text) {
+    return <span className={className}>{text}</span>
+  }
+  return <img src={logoUrl} alt={title} className={className} />
+}
diff --git a/packages/system/dashboard/images/console/packages/ui/src/components/Section.tsx b/packages/system/dashboard/images/console/packages/ui/src/components/Section.tsx
new file mode 100644
index 0000000000..1c15bcd5d0
--- /dev/null
+++ b/packages/system/dashboard/images/console/packages/ui/src/components/Section.tsx
@@ -0,0 +1,44 @@
+import type { ReactNode } from "react"
+import { cn } from "../lib/utils.ts"
+
+interface SectionProps {
+  title?: ReactNode
+  description?: ReactNode
+  actions?: ReactNode
+  className?: string
+  bodyClassName?: string
+  children?: ReactNode
+}
+
+/**
+ * A padded, bordered panel used for grouping content on detail/create pages.
+ * Matches the Cozystack design language: white card, slate-200 border,
+ * rounded-lg, generous padding.
+ */
+export function Section({
+  title,
+  description,
+  actions,
+  className,
+  bodyClassName,
+  children,
+}: SectionProps) {
+  return (
+    <section className={cn("rounded-lg border border-slate-200 bg-white shadow-xs", className)}>
+      {(title || actions) && (
+        <header className="flex items-center justify-between gap-3 border-b border-slate-200 px-5 py-3">
+          <div>
+            {title && (
+              <h2 className="text-base font-semibold text-slate-900">{title}</h2>
+            )}
+            {description && (
+              <p className="mt-0.5 text-xs text-slate-500">{description}</p>
+            )}
+          </div>
+          {actions && <div className="shrink-0">{actions}</div>}
+        </header>
+      )}
+      <div className={cn("p-5", bodyClassName)}>{children}</div>
+    </section>
+  )
+}
diff --git a/packages/system/dashboard/images/console/packages/ui/src/components/Spinner.tsx b/packages/system/dashboard/images/console/packages/ui/src/components/Spinner.tsx
new file mode 100644
index 0000000000..045a00e619
--- /dev/null
+++ b/packages/system/dashboard/images/console/packages/ui/src/components/Spinner.tsx
@@ -0,0 +1,6 @@
+import { Loader2 } from "lucide-react"
+import { cn } from "../lib/utils.ts"
+
+export function Spinner({ className }: { className?: string }) {
+  return <Loader2 className={cn("h-4 w-4 animate-spin text-slate-400", className)} />
+}
diff --git a/packages/system/dashboard/images/console/packages/ui/src/components/StatusBadge.tsx b/packages/system/dashboard/images/console/packages/ui/src/components/StatusBadge.tsx
new file mode 100644
index 0000000000..071cc179b6
--- /dev/null
+++ b/packages/system/dashboard/images/console/packages/ui/src/components/StatusBadge.tsx
@@ -0,0 +1,40 @@
+import { cn } from "../lib/utils.ts"
+
+type Tone = "ok" | "warn" | "error" | "muted" | "info"
+
+interface StatusBadgeProps {
+  tone?: Tone
+  children: React.ReactNode
+  className?: string
+}
+
+const toneClasses: Record<Tone, string> = {
+  ok: "bg-emerald-50 text-emerald-700 ring-1 ring-emerald-200",
+  warn: "bg-amber-50 text-amber-700 ring-1 ring-amber-200",
+  error: "bg-red-50 text-red-700 ring-1 ring-red-200",
+  muted: "bg-slate-100 text-slate-500",
+  info: "bg-blue-50 text-blue-700 ring-1 ring-blue-200",
+}
+
+const dotClasses: Record<Tone, string> = {
+  ok: "bg-emerald-500",
+  warn: "bg-amber-500",
+  error: "bg-red-500",
+  muted: "bg-slate-400",
+  info: "bg-blue-500",
+}
+
+export function StatusBadge({ tone = "muted", children, className }: StatusBadgeProps) {
+  return (
+    <span
+      className={cn(
+        "inline-flex items-center gap-1.5 rounded-full px-2 py-0.5 text-xs font-medium",
+        toneClasses[tone],
+        className,
+      )}
+    >
+      <span className={cn("size-1.5 shrink-0 rounded-full", dotClasses[tone])} />
+      {children}
+    </span>
+  )
+}
diff --git a/packages/system/dashboard/images/console/packages/ui/src/components/layout/AppShell.tsx b/packages/system/dashboard/images/console/packages/ui/src/components/layout/AppShell.tsx
new file mode 100644
index 0000000000..6d8b1721d9
--- /dev/null
+++ b/packages/system/dashboard/images/console/packages/ui/src/components/layout/AppShell.tsx
@@ -0,0 +1,67 @@
+import { useState, type ReactNode } from "react"
+import { Outlet } from "react-router"
+import { Header, type HeaderTab } from "./Header.tsx"
+import { Sidebar, type SidebarSection } from "./Sidebar.tsx"
+
+interface AppShellProps {
+  sections: SidebarSection[]
+  /** Small breadcrumb-like bar below the header (tenant selector, etc.). */
+  subtitle?: ReactNode
+  tabs?: HeaderTab[]
+  username?: string
+  userSettingsUrl?: string
+  signOutUrl?: string
+  onSearchClick?: () => void
+  version?: string
+  children?: ReactNode
+  logoSvg?: string
+  logoText?: string
+}
+
+export function AppShell({
+  sections,
+  subtitle,
+  tabs,
+  username,
+  userSettingsUrl,
+  signOutUrl,
+  onSearchClick,
+  version,
+  children,
+  logoSvg,
+  logoText,
+}: AppShellProps) {
+  const [scrolled, setScrolled] = useState(false)
+
+  return (
+    <div className="flex h-screen flex-col bg-slate-50">
+      <Header
+        tabs={tabs}
+        username={username}
+        userSettingsUrl={userSettingsUrl}
+        signOutUrl={signOutUrl}
+        onSearchClick={onSearchClick}
+        version={version}
+        scrolled={scrolled}
+        logoSvg={logoSvg}
+        logoText={logoText}
+      />
+      <div className="flex flex-1 overflow-hidden">
+        <Sidebar sections={sections} />
+        <div className="flex flex-1 flex-col overflow-hidden">
+          {subtitle && (
+            <div className="flex items-center gap-1.5 border-b border-slate-200 bg-white px-6 py-2 text-sm text-slate-600">
+              {subtitle}
+            </div>
+          )}
+          <main
+            className="flex-1 overflow-auto"
+            onScroll={(e) => setScrolled((e.currentTarget as HTMLElement).scrollTop > 0)}
+          >
+            {children ?? <Outlet />}
+          </main>
+        </div>
+      </div>
+    </div>
+  )
+}
diff --git a/packages/system/dashboard/images/console/packages/ui/src/components/layout/Header.tsx b/packages/system/dashboard/images/console/packages/ui/src/components/layout/Header.tsx
new file mode 100644
index 0000000000..7213c23057
--- /dev/null
+++ b/packages/system/dashboard/images/console/packages/ui/src/components/layout/Header.tsx
@@ -0,0 +1,144 @@
+import { useState } from "react"
+import { Link, useLocation } from "react-router"
+import { Search, User, Settings, LogOut } from "lucide-react"
+import { Logo } from "../Logo.tsx"
+import { cn } from "../../lib/utils.ts"
+
+export interface HeaderTab {
+  id: string
+  label: string
+  to: string
+  /** Bold emphasis, for the primary tab the app treats as its entry point. */
+  highlight?: boolean
+  /** External target — skips client routing. */
+  external?: boolean
+}
+
+interface HeaderProps {
+  tabs?: HeaderTab[]
+  username?: string
+  userSettingsUrl?: string
+  signOutUrl?: string
+  onSearchClick?: () => void
+  version?: string
+  scrolled?: boolean
+  logoSvg?: string
+  logoText?: string
+}
+
+const DEFAULT_TABS: HeaderTab[] = [
+  { id: "console", label: "Console", to: "/console", highlight: true },
+  { id: "marketplace", label: "Marketplace", to: "/marketplace" },
+]
+
+export function Header({
+  tabs = DEFAULT_TABS,
+  username,
+  userSettingsUrl,
+  signOutUrl,
+  onSearchClick,
+  version,
+  scrolled,
+  logoSvg,
+  logoText,
+}: HeaderProps) {
+  const location = useLocation()
+  const [showUserMenu, setShowUserMenu] = useState(false)
+
+  return (
+    <header
+      className={cn(
+        "flex h-14 shrink-0 items-center justify-between border-b border-slate-200 bg-white px-4 transition-shadow duration-200",
+        scrolled && "shadow-sm",
+      )}
+    >
+      <div className="flex items-center gap-6">
+        <Link to="/" className="flex items-center gap-2">
+          <Logo className="h-9 w-auto" svgContent={logoSvg} text={logoText} />
+          {version && (
+            <span className="text-xs font-medium text-slate-400">{version}</span>
+          )}
+        </Link>
+        <nav className="flex items-center gap-1">
+          {tabs.map((t) => {
+            const active = location.pathname.startsWith(t.to)
+            const className = cn(
+              "rounded-md px-3 py-1.5 text-sm transition-colors",
+              active
+                ? "bg-blue-50 font-semibold text-blue-700"
+                : t.highlight
+                  ? "font-semibold text-slate-900 hover:bg-slate-100"
+                  : "text-slate-500 hover:bg-slate-100 hover:text-slate-700",
+            )
+            return t.external ? (
+              <a
+                key={t.id}
+                href={t.to}
+                target="_blank"
+                rel="noopener noreferrer"
+                className={className}
+              >
+                {t.label}
+              </a>
+            ) : (
+              <Link key={t.id} to={t.to} className={className}>
+                {t.label}
+              </Link>
+            )
+          })}
+        </nav>
+      </div>
+
+      <div className="flex items-center gap-1">
+        <button
+          type="button"
+          onClick={onSearchClick}
+          className="rounded-md p-2 text-slate-500 hover:bg-slate-100 hover:text-slate-700"
+        >
+          <Search className="h-[18px] w-[18px]" />
+        </button>
+        <div className="mx-2 h-5 w-px bg-slate-200" />
+
+        <div className="relative">
+          <button
+            type="button"
+            onClick={() => setShowUserMenu((v) => !v)}
+            className="flex items-center gap-2 rounded-md px-2 py-1 hover:bg-slate-100"
+          >
+            <User className="h-[18px] w-[18px] text-slate-400" />
+            <span className="text-sm text-slate-600">{username ?? "\u00A0"}</span>
+          </button>
+          {showUserMenu && (
+            <>
+              <div
+                className="fixed inset-0 z-40"
+                onClick={() => setShowUserMenu(false)}
+              />
+              <div className="absolute right-0 top-10 z-50 w-48 rounded-lg border border-slate-200 bg-white py-1 shadow-lg">
+                {userSettingsUrl && (
+                  <a
+                    href={userSettingsUrl}
+                    target="_blank"
+                    rel="noopener noreferrer"
+                    className="flex items-center gap-2.5 px-3 py-2 text-sm text-slate-600 hover:bg-slate-50"
+                    onClick={() => setShowUserMenu(false)}
+                  >
+                    <Settings className="h-4 w-4" />
+                    User Settings
+                  </a>
+                )}
+                <a
+                  href={signOutUrl ?? "/oauth2/sign_out?rd=/"}
+                  className="flex items-center gap-2.5 px-3 py-2 text-sm text-red-600 hover:bg-red-50"
+                >
+                  <LogOut className="h-4 w-4" />
+                  Sign Out
+                </a>
+              </div>
+            </>
+          )}
+        </div>
+      </div>
+    </header>
+  )
+}
diff --git a/packages/system/dashboard/images/console/packages/ui/src/components/layout/Sidebar.tsx b/packages/system/dashboard/images/console/packages/ui/src/components/layout/Sidebar.tsx
new file mode 100644
index 0000000000..0f9ba2f113
--- /dev/null
+++ b/packages/system/dashboard/images/console/packages/ui/src/components/layout/Sidebar.tsx
@@ -0,0 +1,117 @@
+import { useState, type ComponentType, type ReactNode } from "react"
+import { NavLink, useLocation } from "react-router"
+import { ChevronUp } from "lucide-react"
+import { cn } from "../../lib/utils.ts"
+
+export interface SidebarItem {
+  label: string
+  to: string
+  icon?: ComponentType<{ className?: string }>
+  badge?: ReactNode
+  end?: boolean
+  /**
+   * Extra pathname prefixes that keep this entry highlighted — for pages that
+   * belong to the section but live on another route (e.g. Tenants stays lit
+   * on the per-tenant Info detail page).
+   */
+  alsoMatch?: string[]
+}
+
+export interface SidebarSection {
+  title: string
+  items: SidebarItem[]
+}
+
+interface SidebarProps {
+  sections: SidebarSection[]
+}
+
+export function Sidebar({ sections }: SidebarProps) {
+  const location = useLocation()
+  const search = location.search
+  // Track only explicit overrides. Missing keys default to "open" so sections
+  // added after mount (e.g. once ApplicationDefinitions finish loading) are
+  // expanded automatically without waiting for a toggle.
+  const [collapsed, setCollapsed] = useState<Record<string, boolean>>({})
+
+  if (sections.length === 0) return null
+
+  const isOpen = (title: string) => !collapsed[title]
+  const toggleSection = (title: string) => {
+    setCollapsed((prev) => ({ ...prev, [title]: !prev[title] }))
+  }
+
+  return (
+    <aside className="flex w-52 shrink-0 flex-col border-r border-slate-200 bg-white">
+      <nav className="flex-1 overflow-y-auto py-3">
+        {sections.map((section) => (
+          <div key={section.title} className="mb-1">
+            <button
+              type="button"
+              onClick={() => toggleSection(section.title)}
+              className="flex w-full items-center justify-between px-4 py-1.5 text-xs font-semibold uppercase tracking-wider text-slate-400 hover:text-slate-600"
+            >
+              {section.title}
+              <ChevronUp
+                className={cn(
+                  "h-3.5 w-3.5 transition-transform",
+                  !isOpen(section.title) && "rotate-180",
+                )}
+              />
+            </button>
+            {isOpen(section.title) && (
+              <div className="mt-0.5 space-y-0.5 px-2">
+                {section.items.map((item) => {
+                  // Whole-segment match: a bare startsWith would light up
+                  // /admin/apps for /admin/apps-v2.
+                  const extraActive =
+                    item.alsoMatch?.some(
+                      (p) =>
+                        location.pathname === p ||
+                        location.pathname.startsWith(`${p}/`),
+                    ) ?? false
+                  return (
+                    <NavLink
+                      key={item.to}
+                      to={`${item.to}${search}`}
+                      end={item.end ?? false}
+                      className={({ isActive }) =>
+                        cn(
+                          "relative flex w-full items-center gap-2.5 rounded-md px-3 py-1.5 text-[13px] transition-all duration-150",
+                          isActive || extraActive
+                            ? "bg-blue-50 font-medium text-blue-700 before:absolute before:left-0 before:top-1/2 before:h-4 before:w-0.5 before:-translate-y-1/2 before:rounded-full before:bg-blue-500 before:content-['']"
+                            : "text-slate-600 hover:bg-slate-50 hover:text-slate-900",
+                        )
+                      }
+                    >
+                      {({ isActive }) => (
+                        <>
+                          {item.icon && (
+                            <item.icon
+                              className={cn(
+                                "h-4 w-4 shrink-0 transition-colors",
+                                isActive || extraActive
+                                  ? "text-blue-500"
+                                  : "text-slate-400",
+                              )}
+                            />
+                          )}
+                          <span className="flex-1 truncate">{item.label}</span>
+                          {item.badge != null && (
+                            <span className="shrink-0 text-xs text-slate-400">
+                              {item.badge}
+                            </span>
+                          )}
+                        </>
+                      )}
+                    </NavLink>
+                  )
+                })}
+              </div>
+            )}
+          </div>
+        ))}
+      </nav>
+    </aside>
+  )
+}
diff --git a/packages/system/dashboard/images/console/packages/ui/src/components/ui/button.tsx b/packages/system/dashboard/images/console/packages/ui/src/components/ui/button.tsx
new file mode 100644
index 0000000000..6c8cc3287c
--- /dev/null
+++ b/packages/system/dashboard/images/console/packages/ui/src/components/ui/button.tsx
@@ -0,0 +1,51 @@
+import { forwardRef, type ButtonHTMLAttributes } from "react"
+import { cva, type VariantProps } from "class-variance-authority"
+
+import { cn } from "../../lib/utils.ts"
+
+const buttonVariants = cva(
+  "inline-flex shrink-0 items-center justify-center gap-1.5 rounded-lg border border-transparent text-sm font-medium whitespace-nowrap transition-all duration-150 outline-none select-none focus-visible:ring-2 focus-visible:ring-slate-400 focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 active:scale-[0.97] [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
+  {
+    variants: {
+      variant: {
+        default: "bg-slate-900 text-white shadow-xs hover:bg-slate-800 hover:shadow-sm",
+        outline:
+          "border-slate-300 bg-white text-slate-900 shadow-xs hover:bg-slate-50 hover:shadow-sm",
+        secondary: "bg-slate-100 text-slate-900 hover:bg-slate-200",
+        ghost: "text-slate-700 hover:bg-slate-100",
+        destructive: "bg-red-50 text-red-600 ring-1 ring-red-200 hover:bg-red-100",
+        primary:
+          "bg-gradient-to-b from-blue-500 to-blue-600 text-white shadow-sm shadow-blue-200 hover:from-blue-400 hover:to-blue-500 hover:shadow-md hover:shadow-blue-200",
+        link: "text-blue-600 underline-offset-4 hover:underline",
+      },
+      size: {
+        default: "h-8 gap-1.5 px-2.5",
+        sm: "h-7 gap-1 px-2 text-[0.8rem]",
+        lg: "h-9 gap-1.5 px-3",
+        icon: "size-8",
+      },
+    },
+    defaultVariants: {
+      variant: "default",
+      size: "default",
+    },
+  },
+)
+
+export type ButtonProps = ButtonHTMLAttributes<HTMLButtonElement> &
+  VariantProps<typeof buttonVariants>
+
+export const Button = forwardRef<HTMLButtonElement, ButtonProps>(function Button(
+  { className, variant, size, ...props },
+  ref,
+) {
+  return (
+    <button
+      ref={ref}
+      className={cn(buttonVariants({ variant, size }), className)}
+      {...props}
+    />
+  )
+})
+
+export { buttonVariants }
diff --git a/packages/system/dashboard/images/console/packages/ui/src/index.css b/packages/system/dashboard/images/console/packages/ui/src/index.css
new file mode 100644
index 0000000000..0edc9f5201
--- /dev/null
+++ b/packages/system/dashboard/images/console/packages/ui/src/index.css
@@ -0,0 +1,86 @@
+@import "tailwindcss";
+@import "@fontsource-variable/geist";
+
+/*
+ * Make Tailwind scan workspace packages and apps so utility classes from
+ * @cozystack/ui components are emitted in the final stylesheet. Without these
+ * `@source` directives the default scanner only picks up files near this CSS
+ * file, so classes used in sibling workspace packages get dropped as unused.
+ */
+@source "./**/*.{ts,tsx}";
+@source "../../../apps/**/src/**/*.{ts,tsx}";
+@source "../../../packages/**/src/**/*.{ts,tsx}";
+
+@custom-variant dark (&:is(.dark *));
+
+@theme inline {
+  --font-heading: var(--font-sans);
+  --font-sans: "Geist Variable", system-ui, -apple-system, sans-serif;
+  --color-background: var(--background);
+  --color-foreground: var(--foreground);
+  --color-card: var(--card);
+  --color-card-foreground: var(--card-foreground);
+  --color-primary: var(--primary);
+  --color-primary-foreground: var(--primary-foreground);
+  --color-secondary: var(--secondary);
+  --color-secondary-foreground: var(--secondary-foreground);
+  --color-muted: var(--muted);
+  --color-muted-foreground: var(--muted-foreground);
+  --color-accent: var(--accent);
+  --color-accent-foreground: var(--accent-foreground);
+  --color-destructive: var(--destructive);
+  --color-border: var(--border);
+  --color-input: var(--input);
+  --color-ring: var(--ring);
+  --radius-sm: calc(var(--radius) * 0.6);
+  --radius-md: calc(var(--radius) * 0.8);
+  --radius-lg: var(--radius);
+  --radius-xl: calc(var(--radius) * 1.4);
+  --animate-fade-up: fade-up 0.4s ease both;
+}
+
+:root {
+  --background: oklch(1 0 0);
+  --foreground: oklch(0.145 0 0);
+  --card: oklch(1 0 0);
+  --card-foreground: oklch(0.145 0 0);
+  --primary: oklch(0.205 0 0);
+  --primary-foreground: oklch(0.985 0 0);
+  --secondary: oklch(0.97 0 0);
+  --secondary-foreground: oklch(0.205 0 0);
+  --muted: oklch(0.97 0 0);
+  --muted-foreground: oklch(0.556 0 0);
+  --accent: oklch(0.97 0 0);
+  --accent-foreground: oklch(0.205 0 0);
+  --destructive: oklch(0.577 0.245 27.325);
+  --border: oklch(0.922 0 0);
+  --input: oklch(0.922 0 0);
+  --ring: oklch(0.708 0 0);
+  --radius: 0.625rem;
+}
+
+@keyframes fade-up {
+  from {
+    opacity: 0;
+    transform: translateY(8px);
+  }
+  to {
+    opacity: 1;
+    transform: translateY(0);
+  }
+}
+
+@layer base {
+  html,
+  body {
+    height: 100%;
+  }
+  body {
+    @apply bg-slate-50 text-slate-900 antialiased;
+    font-family: var(--font-sans);
+    font-feature-settings: "ss01", "cv11";
+  }
+  * {
+    border-color: var(--border);
+  }
+}
diff --git a/packages/system/dashboard/images/console/packages/ui/src/index.ts b/packages/system/dashboard/images/console/packages/ui/src/index.ts
new file mode 100644
index 0000000000..76bd224a11
--- /dev/null
+++ b/packages/system/dashboard/images/console/packages/ui/src/index.ts
@@ -0,0 +1,21 @@
+// Layout
+export { AppShell } from "./components/layout/AppShell.tsx"
+export { Header } from "./components/layout/Header.tsx"
+export {
+  Sidebar,
+  type SidebarItem,
+  type SidebarSection,
+} from "./components/layout/Sidebar.tsx"
+
+export { type HeaderTab } from "./components/layout/Header.tsx"
+
+// UI primitives
+export { Button, buttonVariants, type ButtonProps } from "./components/ui/button.tsx"
+export { StatusBadge } from "./components/StatusBadge.tsx"
+export { Spinner } from "./components/Spinner.tsx"
+export { Logo } from "./components/Logo.tsx"
+export { Section } from "./components/Section.tsx"
+export { Dropdown } from "./components/Dropdown.tsx"
+
+// Utilities
+export { cn } from "./lib/utils.ts"
diff --git a/packages/system/dashboard/images/console/packages/ui/src/lib/utils.ts b/packages/system/dashboard/images/console/packages/ui/src/lib/utils.ts
new file mode 100644
index 0000000000..bd0c391ddd
--- /dev/null
+++ b/packages/system/dashboard/images/console/packages/ui/src/lib/utils.ts
@@ -0,0 +1,6 @@
+import { clsx, type ClassValue } from "clsx"
+import { twMerge } from "tailwind-merge"
+
+export function cn(...inputs: ClassValue[]) {
+  return twMerge(clsx(inputs))
+}
diff --git a/packages/system/dashboard/images/console/packages/ui/tsconfig.json b/packages/system/dashboard/images/console/packages/ui/tsconfig.json
new file mode 100644
index 0000000000..25e8cea979
--- /dev/null
+++ b/packages/system/dashboard/images/console/packages/ui/tsconfig.json
@@ -0,0 +1,7 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "noEmit": true
+  },
+  "include": ["src/**/*"]
+}
diff --git a/packages/system/dashboard/images/console/pnpm-lock.yaml b/packages/system/dashboard/images/console/pnpm-lock.yaml
new file mode 100644
index 0000000000..9d90b0c5cc
--- /dev/null
+++ b/packages/system/dashboard/images/console/pnpm-lock.yaml
@@ -0,0 +1,3511 @@
+lockfileVersion: '9.0'
+
+settings:
+  autoInstallPeers: true
+  excludeLinksFromLockfile: false
+
+importers:
+
+  .:
+    devDependencies:
+      '@eslint/js':
+        specifier: ^9.39.4
+        version: 9.39.4
+      '@types/node':
+        specifier: ^24.12.2
+        version: 24.12.2
+      eslint:
+        specifier: ^9.39.4
+        version: 9.39.4(jiti@2.6.1)
+      eslint-plugin-react-hooks:
+        specifier: ^7.0.1
+        version: 7.1.1(eslint@9.39.4(jiti@2.6.1))
+      eslint-plugin-react-refresh:
+        specifier: ^0.5.2
+        version: 0.5.2(eslint@9.39.4(jiti@2.6.1))
+      globals:
+        specifier: ^17.4.0
+        version: 17.5.0
+      typescript:
+        specifier: ~6.0.2
+        version: 6.0.3
+      typescript-eslint:
+        specifier: ^8.58.0
+        version: 8.58.2(eslint@9.39.4(jiti@2.6.1))(typescript@6.0.3)
+
+  apps/console:
+    dependencies:
+      '@base-ui/react':
+        specifier: ^1.4.1
+        version: 1.4.1(@types/react@19.2.14)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
+      '@cozystack/k8s-client':
+        specifier: workspace:*
+        version: link:../../packages/k8s-client
+      '@cozystack/types':
+        specifier: workspace:*
+        version: link:../../packages/types
+      '@cozystack/ui':
+        specifier: workspace:*
+        version: link:../../packages/ui
+      '@monaco-editor/react':
+        specifier: ^4.7.0
+        version: 4.7.0(monaco-editor@0.55.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
+      '@novnc/novnc':
+        specifier: ^1.6.0
+        version: 1.6.0
+      '@rjsf/core':
+        specifier: ^5.24.8
+        version: 5.24.13(@rjsf/utils@5.24.13(react@19.2.5))(react@19.2.5)
+      '@rjsf/utils':
+        specifier: ^5.24.8
+        version: 5.24.13(react@19.2.5)
+      '@rjsf/validator-ajv8':
+        specifier: ^5.24.8
+        version: 5.24.13(@rjsf/utils@5.24.13(react@19.2.5))
+      '@tanstack/react-query':
+        specifier: ^5.96.2
+        version: 5.99.1(react@19.2.5)
+      '@xterm/addon-fit':
+        specifier: ^0.11.0
+        version: 0.11.0
+      '@xterm/xterm':
+        specifier: ^6.0.0
+        version: 6.0.0
+      js-yaml:
+        specifier: ^4.1.0
+        version: 4.1.1
+      lucide-react:
+        specifier: ^0.484.0
+        version: 0.484.0(react@19.2.5)
+      monaco-editor:
+        specifier: ^0.55.1
+        version: 0.55.1
+      react:
+        specifier: ^19.2.4
+        version: 19.2.5
+      react-dom:
+        specifier: ^19.2.4
+        version: 19.2.5(react@19.2.5)
+      react-router:
+        specifier: ^7.6.1
+        version: 7.14.1(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
+      simple-icons:
+        specifier: ^16.22.0
+        version: 16.22.0
+    devDependencies:
+      '@tailwindcss/vite':
+        specifier: ^4.2.2
+        version: 4.2.2(vite@8.0.8(@types/node@24.12.2)(jiti@2.6.1))
+      '@testing-library/jest-dom':
+        specifier: ^6.9.1
+        version: 6.9.1
+      '@testing-library/react':
+        specifier: ^16.3.2
+        version: 16.3.2(@testing-library/dom@10.4.1)(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
+      '@testing-library/user-event':
+        specifier: ^14.6.1
+        version: 14.6.1(@testing-library/dom@10.4.1)
+      '@types/js-yaml':
+        specifier: ^4.0.9
+        version: 4.0.9
+      '@types/react':
+        specifier: ^19.2.14
+        version: 19.2.14
+      '@types/react-dom':
+        specifier: ^19.2.3
+        version: 19.2.3(@types/react@19.2.14)
+      '@vitejs/plugin-react':
+        specifier: ^6.0.1
+        version: 6.0.1(vite@8.0.8(@types/node@24.12.2)(jiti@2.6.1))
+      '@vitest/ui':
+        specifier: ^4.1.6
+        version: 4.1.6(vitest@4.1.6)
+      jsdom:
+        specifier: ^29.1.1
+        version: 29.1.1
+      tailwindcss:
+        specifier: ^4.2.2
+        version: 4.2.2
+      typescript:
+        specifier: ~6.0.2
+        version: 6.0.3
+      vite:
+        specifier: ^8.0.4
+        version: 8.0.8(@types/node@24.12.2)(jiti@2.6.1)
+      vitest:
+        specifier: ^4.1.6
+        version: 4.1.6(@types/node@24.12.2)(@vitest/ui@4.1.6)(jsdom@29.1.1)(vite@8.0.8(@types/node@24.12.2)(jiti@2.6.1))
+
+  packages/k8s-client:
+    dependencies:
+      '@tanstack/react-query':
+        specifier: ^5.62.2
+        version: 5.99.1(react@19.2.5)
+      react:
+        specifier: ^19.0.0
+        version: 19.2.5
+    devDependencies:
+      '@types/react':
+        specifier: ^19.2.14
+        version: 19.2.14
+      typescript:
+        specifier: ~6.0.2
+        version: 6.0.3
+
+  packages/types:
+    dependencies:
+      '@cozystack/k8s-client':
+        specifier: workspace:*
+        version: link:../k8s-client
+    devDependencies:
+      typescript:
+        specifier: ~6.0.2
+        version: 6.0.3
+
+  packages/ui:
+    dependencies:
+      '@base-ui-components/react':
+        specifier: ^1.0.0-beta.4
+        version: 1.0.0-rc.0(@types/react@19.2.14)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
+      '@fontsource-variable/geist':
+        specifier: ^5.2.8
+        version: 5.2.8
+      class-variance-authority:
+        specifier: ^0.7.1
+        version: 0.7.1
+      clsx:
+        specifier: ^2.1.1
+        version: 2.1.1
+      lucide-react:
+        specifier: ^0.484.0
+        version: 0.484.0(react@19.2.5)
+      react:
+        specifier: ^19.0.0
+        version: 19.2.5
+      react-dom:
+        specifier: ^19.0.0
+        version: 19.2.5(react@19.2.5)
+      react-router:
+        specifier: ^7.0.0
+        version: 7.14.1(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
+      tailwind-merge:
+        specifier: ^3.5.0
+        version: 3.5.0
+      tailwindcss:
+        specifier: ^4.2.2
+        version: 4.2.2
+    devDependencies:
+      '@types/react':
+        specifier: ^19.2.14
+        version: 19.2.14
+      '@types/react-dom':
+        specifier: ^19.2.3
+        version: 19.2.3(@types/react@19.2.14)
+      typescript:
+        specifier: ~6.0.2
+        version: 6.0.3
+
+packages:
+
+  '@adobe/css-tools@4.4.4':
+    resolution: {integrity: sha512-Elp+iwUx5rN5+Y8xLt5/GRoG20WGoDCQ/1Fb+1LiGtvwbDavuSk0jhD/eZdckHAuzcDzccnkv+rEjyWfRx18gg==}
+
+  '@asamuzakjp/css-color@5.1.11':
+    resolution: {integrity: sha512-KVw6qIiCTUQhByfTd78h2yD1/00waTmm9uy/R7Ck/ctUyAPj+AEDLkQIdJW0T8+qGgj3j5bpNKK7Q3G+LedJWg==}
+    engines: {node: ^20.19.0 || ^22.12.0 || >=24.0.0}
+
+  '@asamuzakjp/dom-selector@7.1.1':
+    resolution: {integrity: sha512-67RZDnYRc8H/8MLDgQCDE//zoqVFwajkepHZgmXrbwybzXOEwOWGPYGmALYl9J2DOLfFPPs6kKCqmbzV895hTQ==}
+    engines: {node: ^20.19.0 || ^22.12.0 || >=24.0.0}
+
+  '@asamuzakjp/generational-cache@1.0.1':
+    resolution: {integrity: sha512-wajfB8KqzMCN2KGNFdLkReeHncd0AslUSrvHVvvYWuU8ghncRJoA50kT3zP9MVL0+9g4/67H+cdvBskj9THPzg==}
+    engines: {node: ^20.19.0 || ^22.12.0 || >=24.0.0}
+
+  '@asamuzakjp/nwsapi@2.3.9':
+    resolution: {integrity: sha512-n8GuYSrI9bF7FFZ/SjhwevlHc8xaVlb/7HmHelnc/PZXBD2ZR49NnN9sMMuDdEGPeeRQ5d0hqlSlEpgCX3Wl0Q==}
+
+  '@babel/code-frame@7.29.0':
+    resolution: {integrity: sha512-9NhCeYjq9+3uxgdtp20LSiJXJvN0FeCtNGpJxuMFZ1Kv3cWUNb6DOhJwUvcVCzKGR66cw4njwM6hrJLqgOwbcw==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/compat-data@7.29.0':
+    resolution: {integrity: sha512-T1NCJqT/j9+cn8fvkt7jtwbLBfLC/1y1c7NtCeXFRgzGTsafi68MRv8yzkYSapBnFA6L3U2VSc02ciDzoAJhJg==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/core@7.29.0':
+    resolution: {integrity: sha512-CGOfOJqWjg2qW/Mb6zNsDm+u5vFQ8DxXfbM09z69p5Z6+mE1ikP2jUXw+j42Pf1XTYED2Rni5f95npYeuwMDQA==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/generator@7.29.1':
+    resolution: {integrity: sha512-qsaF+9Qcm2Qv8SRIMMscAvG4O3lJ0F1GuMo5HR/Bp02LopNgnZBC/EkbevHFeGs4ls/oPz9v+Bsmzbkbe+0dUw==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helper-compilation-targets@7.28.6':
+    resolution: {integrity: sha512-JYtls3hqi15fcx5GaSNL7SCTJ2MNmjrkHXg4FSpOA/grxK8KwyZ5bubHsCq8FXCkua6xhuaaBit+3b7+VZRfcA==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helper-globals@7.28.0':
+    resolution: {integrity: sha512-+W6cISkXFa1jXsDEdYA8HeevQT/FULhxzR99pxphltZcVaugps53THCeiWA8SguxxpSp3gKPiuYfSWopkLQ4hw==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helper-module-imports@7.28.6':
+    resolution: {integrity: sha512-l5XkZK7r7wa9LucGw9LwZyyCUscb4x37JWTPz7swwFE/0FMQAGpiWUZn8u9DzkSBWEcK25jmvubfpw2dnAMdbw==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helper-module-transforms@7.28.6':
+    resolution: {integrity: sha512-67oXFAYr2cDLDVGLXTEABjdBJZ6drElUSI7WKp70NrpyISso3plG9SAGEF6y7zbha/wOzUByWWTJvEDVNIUGcA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
+  '@babel/helper-string-parser@7.27.1':
+    resolution: {integrity: sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helper-validator-identifier@7.28.5':
+    resolution: {integrity: sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helper-validator-option@7.27.1':
+    resolution: {integrity: sha512-YvjJow9FxbhFFKDSuFnVCe2WxXk1zWc22fFePVNEaWJEu8IrZVlda6N0uHwzZrUM1il7NC9Mlp4MaJYbYd9JSg==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helpers@7.29.2':
+    resolution: {integrity: sha512-HoGuUs4sCZNezVEKdVcwqmZN8GoHirLUcLaYVNBK2J0DadGtdcqgr3BCbvH8+XUo4NGjNl3VOtSjEKNzqfFgKw==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/parser@7.29.2':
+    resolution: {integrity: sha512-4GgRzy/+fsBa72/RZVJmGKPmZu9Byn8o4MoLpmNe1m8ZfYnz5emHLQz3U4gLud6Zwl0RZIcgiLD7Uq7ySFuDLA==}
+    engines: {node: '>=6.0.0'}
+    hasBin: true
+
+  '@babel/runtime@7.29.2':
+    resolution: {integrity: sha512-JiDShH45zKHWyGe4ZNVRrCjBz8Nh9TMmZG1kh4QTK8hCBTWBi8Da+i7s1fJw7/lYpM4ccepSNfqzZ/QvABBi5g==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/template@7.28.6':
+    resolution: {integrity: sha512-YA6Ma2KsCdGb+WC6UpBVFJGXL58MDA6oyONbjyF/+5sBgxY/dwkhLogbMT2GXXyU84/IhRw/2D1Os1B/giz+BQ==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/traverse@7.29.0':
+    resolution: {integrity: sha512-4HPiQr0X7+waHfyXPZpWPfWL/J7dcN1mx9gL6WdQVMbPnF3+ZhSMs8tCxN7oHddJE9fhNE7+lxdnlyemKfJRuA==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/types@7.29.0':
+    resolution: {integrity: sha512-LwdZHpScM4Qz8Xw2iKSzS+cfglZzJGvofQICy7W7v4caru4EaAmyUuO6BGrbyQ2mYV11W0U8j5mBhd14dd3B0A==}
+    engines: {node: '>=6.9.0'}
+
+  '@base-ui-components/react@1.0.0-rc.0':
+    resolution: {integrity: sha512-9lhUFbJcbXvc9KulLev1WTFxS/alJRBWDH/ibKSQaNvmDwMFS2gKp1sTeeldYSfKuS/KC1w2MZutc0wHu2hRHQ==}
+    engines: {node: '>=14.0.0'}
+    deprecated: Package was renamed to @base-ui/react
+    peerDependencies:
+      '@types/react': ^17 || ^18 || ^19
+      react: ^17 || ^18 || ^19
+      react-dom: ^17 || ^18 || ^19
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+
+  '@base-ui-components/utils@0.2.2':
+    resolution: {integrity: sha512-rNJCD6TFy3OSRDKVHJDzLpxO3esTV1/drRtWNUpe7rCpPN9HZVHUCuP+6rdDYDGWfXnQHbqi05xOyRP2iZAlkw==}
+    deprecated: Package was renamed to @base-ui/utils
+    peerDependencies:
+      '@types/react': ^17 || ^18 || ^19
+      react: ^17 || ^18 || ^19
+      react-dom: ^17 || ^18 || ^19
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+
+  '@base-ui/react@1.4.1':
+    resolution: {integrity: sha512-Ab5/LIhcmL8BQcsBUYiOfkSDRdLpvgUBzMK30cu684JPcLclYlztharvCZyNNgzJtbAiREzI9q0pI5erHCMgCw==}
+    engines: {node: '>=14.0.0'}
+    peerDependencies:
+      '@date-fns/tz': ^1.2.0
+      '@types/react': ^17 || ^18 || ^19
+      date-fns: ^4.0.0
+      react: ^17 || ^18 || ^19
+      react-dom: ^17 || ^18 || ^19
+    peerDependenciesMeta:
+      '@date-fns/tz':
+        optional: true
+      '@types/react':
+        optional: true
+      date-fns:
+        optional: true
+
+  '@base-ui/utils@0.2.8':
+    resolution: {integrity: sha512-jvOi+c+ftGlGotNcKnzPVg2IhCaDTB6/6R3JeqdjdXktuAJi3wKH9T7+svuaKh1mmfVU11UWzUZVH74JDfi/wQ==}
+    peerDependencies:
+      '@types/react': ^17 || ^18 || ^19
+      react: ^17 || ^18 || ^19
+      react-dom: ^17 || ^18 || ^19
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+
+  '@bramus/specificity@2.4.2':
+    resolution: {integrity: sha512-ctxtJ/eA+t+6q2++vj5j7FYX3nRu311q1wfYH3xjlLOsczhlhxAg2FWNUXhpGvAw3BWo1xBcvOV6/YLc2r5FJw==}
+    hasBin: true
+
+  '@csstools/color-helpers@6.0.2':
+    resolution: {integrity: sha512-LMGQLS9EuADloEFkcTBR3BwV/CGHV7zyDxVRtVDTwdI2Ca4it0CCVTT9wCkxSgokjE5Ho41hEPgb8OEUwoXr6Q==}
+    engines: {node: '>=20.19.0'}
+
+  '@csstools/css-calc@3.2.0':
+    resolution: {integrity: sha512-bR9e6o2BDB12jzN/gIbjHa5wLJ4UjD1CB9pM7ehlc0ddk6EBz+yYS1EV2MF55/HUxrHcB/hehAyt5vhsA3hx7w==}
+    engines: {node: '>=20.19.0'}
+    peerDependencies:
+      '@csstools/css-parser-algorithms': ^4.0.0
+      '@csstools/css-tokenizer': ^4.0.0
+
+  '@csstools/css-color-parser@4.1.0':
+    resolution: {integrity: sha512-U0KhLYmy2GVj6q4T3WaAe6NPuFYCPQoE3b0dRGxejWDgcPp8TP7S5rVdM5ZrFaqu4N67X8YaPBw14dQSYx3IyQ==}
+    engines: {node: '>=20.19.0'}
+    peerDependencies:
+      '@csstools/css-parser-algorithms': ^4.0.0
+      '@csstools/css-tokenizer': ^4.0.0
+
+  '@csstools/css-parser-algorithms@4.0.0':
+    resolution: {integrity: sha512-+B87qS7fIG3L5h3qwJ/IFbjoVoOe/bpOdh9hAjXbvx0o8ImEmUsGXN0inFOnk2ChCFgqkkGFQ+TpM5rbhkKe4w==}
+    engines: {node: '>=20.19.0'}
+    peerDependencies:
+      '@csstools/css-tokenizer': ^4.0.0
+
+  '@csstools/css-syntax-patches-for-csstree@1.1.3':
+    resolution: {integrity: sha512-SH60bMfrRCJF3morcdk57WklujF4Jr/EsQUzqkarfHXEFcAR1gg7fS/chAE922Sehgzc1/+Tz5H3Ypa1HiEKrg==}
+    peerDependencies:
+      css-tree: ^3.2.1
+    peerDependenciesMeta:
+      css-tree:
+        optional: true
+
+  '@csstools/css-tokenizer@4.0.0':
+    resolution: {integrity: sha512-QxULHAm7cNu72w97JUNCBFODFaXpbDg+dP8b/oWFAZ2MTRppA3U00Y2L1HqaS4J6yBqxwa/Y3nMBaxVKbB/NsA==}
+    engines: {node: '>=20.19.0'}
+
+  '@emnapi/core@1.9.2':
+    resolution: {integrity: sha512-UC+ZhH3XtczQYfOlu3lNEkdW/p4dsJ1r/bP7H8+rhao3TTTMO1ATq/4DdIi23XuGoFY+Cz0JmCbdVl0hz9jZcA==}
+
+  '@emnapi/runtime@1.9.2':
+    resolution: {integrity: sha512-3U4+MIWHImeyu1wnmVygh5WlgfYDtyf0k8AbLhMFxOipihf6nrWC4syIm/SwEeec0mNSafiiNnMJwbza/Is6Lw==}
+
+  '@emnapi/wasi-threads@1.2.1':
+    resolution: {integrity: sha512-uTII7OYF+/Mes/MrcIOYp5yOtSMLBWSIoLPpcgwipoiKbli6k322tcoFsxoIIxPDqW01SQGAgko4EzZi2BNv2w==}
+
+  '@eslint-community/eslint-utils@4.9.1':
+    resolution: {integrity: sha512-phrYmNiYppR7znFEdqgfWHXR6NCkZEK7hwWDHZUjit/2/U0r6XvkDl0SYnoM51Hq7FhCGdLDT6zxCCOY1hexsQ==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      eslint: ^6.0.0 || ^7.0.0 || >=8.0.0
+
+  '@eslint-community/regexpp@4.12.2':
+    resolution: {integrity: sha512-EriSTlt5OC9/7SXkRSCAhfSxxoSUgBm33OH+IkwbdpgoqsSsUg7y3uh+IICI/Qg4BBWr3U2i39RpmycbxMq4ew==}
+    engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0}
+
+  '@eslint/config-array@0.21.2':
+    resolution: {integrity: sha512-nJl2KGTlrf9GjLimgIru+V/mzgSK0ABCDQRvxw5BjURL7WfH5uoWmizbH7QB6MmnMBd8cIC9uceWnezL1VZWWw==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
+  '@eslint/config-helpers@0.4.2':
+    resolution: {integrity: sha512-gBrxN88gOIf3R7ja5K9slwNayVcZgK6SOUORm2uBzTeIEfeVaIhOpCtTox3P6R7o2jLFwLFTLnC7kU/RGcYEgw==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
+  '@eslint/core@0.17.0':
+    resolution: {integrity: sha512-yL/sLrpmtDaFEiUj1osRP4TI2MDz1AddJL+jZ7KSqvBuliN4xqYY54IfdN8qD8Toa6g1iloph1fxQNkjOxrrpQ==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
+  '@eslint/eslintrc@3.3.5':
+    resolution: {integrity: sha512-4IlJx0X0qftVsN5E+/vGujTRIFtwuLbNsVUe7TO6zYPDR1O6nFwvwhIKEKSrl6dZchmYBITazxKoUYOjdtjlRg==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
+  '@eslint/js@9.39.4':
+    resolution: {integrity: sha512-nE7DEIchvtiFTwBw4Lfbu59PG+kCofhjsKaCWzxTpt4lfRjRMqG6uMBzKXuEcyXhOHoUp9riAm7/aWYGhXZ9cw==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
+  '@eslint/object-schema@2.1.7':
+    resolution: {integrity: sha512-VtAOaymWVfZcmZbp6E2mympDIHvyjXs/12LqWYjVw6qjrfF+VK+fyG33kChz3nnK+SU5/NeHOqrTEHS8sXO3OA==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
+  '@eslint/plugin-kit@0.4.1':
+    resolution: {integrity: sha512-43/qtrDUokr7LJqoF2c3+RInu/t4zfrpYdoSDfYyhg52rwLV6TnOvdG4fXm7IkSB3wErkcmJS9iEhjVtOSEjjA==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
+  '@exodus/bytes@1.15.0':
+    resolution: {integrity: sha512-UY0nlA+feH81UGSHv92sLEPLCeZFjXOuHhrIo0HQydScuQc8s0A7kL/UdgwgDq8g8ilksmuoF35YVTNphV2aBQ==}
+    engines: {node: ^20.19.0 || ^22.12.0 || >=24.0.0}
+    peerDependencies:
+      '@noble/hashes': ^1.8.0 || ^2.0.0
+    peerDependenciesMeta:
+      '@noble/hashes':
+        optional: true
+
+  '@floating-ui/core@1.7.5':
+    resolution: {integrity: sha512-1Ih4WTWyw0+lKyFMcBHGbb5U5FtuHJuujoyyr5zTaWS5EYMeT6Jb2AuDeftsCsEuchO+mM2ij5+q9crhydzLhQ==}
+
+  '@floating-ui/dom@1.7.6':
+    resolution: {integrity: sha512-9gZSAI5XM36880PPMm//9dfiEngYoC6Am2izES1FF406YFsjvyBMmeJ2g4SAju3xWwtuynNRFL2s9hgxpLI5SQ==}
+
+  '@floating-ui/react-dom@2.1.8':
+    resolution: {integrity: sha512-cC52bHwM/n/CxS87FH0yWdngEZrjdtLW/qVruo68qg+prK7ZQ4YGdut2GyDVpoGeAYe/h899rVeOVm6Oi40k2A==}
+    peerDependencies:
+      react: '>=16.8.0'
+      react-dom: '>=16.8.0'
+
+  '@floating-ui/utils@0.2.11':
+    resolution: {integrity: sha512-RiB/yIh78pcIxl6lLMG0CgBXAZ2Y0eVHqMPYugu+9U0AeT6YBeiJpf7lbdJNIugFP5SIjwNRgo4DhR1Qxi26Gg==}
+
+  '@fontsource-variable/geist@5.2.8':
+    resolution: {integrity: sha512-cJ6m9e+8MQ5dCYJsLylfZrgBh6KkG4bOLckB35Tr9J/EqdkEM6QllH5PxqP1dhTvFup+HtMRPuz9xOjxXJggxw==}
+
+  '@humanfs/core@0.19.2':
+    resolution: {integrity: sha512-UhXNm+CFMWcbChXywFwkmhqjs3PRCmcSa/hfBgLIb7oQ5HNb1wS0icWsGtSAUNgefHeI+eBrA8I1fxmbHsGdvA==}
+    engines: {node: '>=18.18.0'}
+
+  '@humanfs/node@0.16.8':
+    resolution: {integrity: sha512-gE1eQNZ3R++kTzFUpdGlpmy8kDZD/MLyHqDwqjkVQI0JMdI1D51sy1H958PNXYkM2rAac7e5/CnIKZrHtPh3BQ==}
+    engines: {node: '>=18.18.0'}
+
+  '@humanfs/types@0.15.0':
+    resolution: {integrity: sha512-ZZ1w0aoQkwuUuC7Yf+7sdeaNfqQiiLcSRbfI08oAxqLtpXQr9AIVX7Ay7HLDuiLYAaFPu8oBYNq/QIi9URHJ3Q==}
+    engines: {node: '>=18.18.0'}
+
+  '@humanwhocodes/module-importer@1.0.1':
+    resolution: {integrity: sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==}
+    engines: {node: '>=12.22'}
+
+  '@humanwhocodes/retry@0.4.3':
+    resolution: {integrity: sha512-bV0Tgo9K4hfPCek+aMAn81RppFKv2ySDQeMoSZuvTASywNTnVJCArCZE2FWqpvIatKu7VMRLWlR1EazvVhDyhQ==}
+    engines: {node: '>=18.18'}
+
+  '@jridgewell/gen-mapping@0.3.13':
+    resolution: {integrity: sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==}
+
+  '@jridgewell/remapping@2.3.5':
+    resolution: {integrity: sha512-LI9u/+laYG4Ds1TDKSJW2YPrIlcVYOwi2fUC6xB43lueCjgxV4lffOCZCtYFiH6TNOX+tQKXx97T4IKHbhyHEQ==}
+
+  '@jridgewell/resolve-uri@3.1.2':
+    resolution: {integrity: sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==}
+    engines: {node: '>=6.0.0'}
+
+  '@jridgewell/sourcemap-codec@1.5.5':
+    resolution: {integrity: sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==}
+
+  '@jridgewell/trace-mapping@0.3.31':
+    resolution: {integrity: sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==}
+
+  '@monaco-editor/loader@1.7.0':
+    resolution: {integrity: sha512-gIwR1HrJrrx+vfyOhYmCZ0/JcWqG5kbfG7+d3f/C1LXk2EvzAbHSg3MQ5lO2sMlo9izoAZ04shohfKLVT6crVA==}
+
+  '@monaco-editor/react@4.7.0':
+    resolution: {integrity: sha512-cyzXQCtO47ydzxpQtCGSQGOC8Gk3ZUeBXFAxD+CWXYFo5OqZyZUonFl0DwUlTyAfRHntBfw2p3w4s9R6oe1eCA==}
+    peerDependencies:
+      monaco-editor: '>= 0.25.0 < 1'
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
+      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
+
+  '@napi-rs/wasm-runtime@1.1.4':
+    resolution: {integrity: sha512-3NQNNgA1YSlJb/kMH1ildASP9HW7/7kYnRI2szWJaofaS1hWmbGI4H+d3+22aGzXXN9IJ+n+GiFVcGipJP18ow==}
+    peerDependencies:
+      '@emnapi/core': ^1.7.1
+      '@emnapi/runtime': ^1.7.1
+
+  '@novnc/novnc@1.6.0':
+    resolution: {integrity: sha512-CJrmdSe9Yt2ZbLsJpVFoVkEu0KICEvnr3njW25Nz0jodaiFJtg8AYLGZogRYy0/N5HUWkGUsCmegKXYBSqwygw==}
+
+  '@oxc-project/types@0.124.0':
+    resolution: {integrity: sha512-VBFWMTBvHxS11Z5Lvlr3IWgrwhMTXV+Md+EQF0Xf60+wAdsGFTBx7X7K/hP4pi8N7dcm1RvcHwDxZ16Qx8keUg==}
+
+  '@polka/url@1.0.0-next.29':
+    resolution: {integrity: sha512-wwQAWhWSuHaag8c4q/KN/vCoeOJYshAIvMQwD4GpSb3OiZklFfvAgmj0VCBBImRpuF/aFgIRzllXlVX93Jevww==}
+
+  '@rjsf/core@5.24.13':
+    resolution: {integrity: sha512-ONTr14s7LFIjx2VRFLuOpagL76sM/HPy6/OhdBfq6UukINmTIs6+aFN0GgcR0aXQHFDXQ7f/fel0o/SO05Htdg==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@rjsf/utils': ^5.24.x
+      react: ^16.14.0 || >=17
+
+  '@rjsf/utils@5.24.13':
+    resolution: {integrity: sha512-rNF8tDxIwTtXzz5O/U23QU73nlhgQNYJ+Sv5BAwQOIyhIE2Z3S5tUiSVMwZHt0julkv/Ryfwi+qsD4FiE5rOuw==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      react: ^16.14.0 || >=17
+
+  '@rjsf/validator-ajv8@5.24.13':
+    resolution: {integrity: sha512-oWHP7YK581M8I5cF1t+UXFavnv+bhcqjtL1a7MG/Kaffi0EwhgcYjODrD8SsnrhncsEYMqSECr4ZOEoirnEUWw==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@rjsf/utils': ^5.24.x
+
+  '@rolldown/binding-android-arm64@1.0.0-rc.15':
+    resolution: {integrity: sha512-YYe6aWruPZDtHNpwu7+qAHEMbQ/yRl6atqb/AhznLTnD3UY99Q1jE7ihLSahNWkF4EqRPVC4SiR4O0UkLK02tA==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm64]
+    os: [android]
+
+  '@rolldown/binding-darwin-arm64@1.0.0-rc.15':
+    resolution: {integrity: sha512-oArR/ig8wNTPYsXL+Mzhs0oxhxfuHRfG7Ikw7jXsw8mYOtk71W0OkF2VEVh699pdmzjPQsTjlD1JIOoHkLP1Fg==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@rolldown/binding-darwin-x64@1.0.0-rc.15':
+    resolution: {integrity: sha512-YzeVqOqjPYvUbJSWJ4EDL8ahbmsIXQpgL3JVipmN+MX0XnXMeWomLN3Fb+nwCmP/jfyqte5I3XRSm7OfQrbyxw==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [x64]
+    os: [darwin]
+
+  '@rolldown/binding-freebsd-x64@1.0.0-rc.15':
+    resolution: {integrity: sha512-9Erhx956jeQ0nNTyif1+QWAXDRD38ZNjr//bSHrt6wDwB+QkAfl2q6Mn1k6OBPerznjRmbM10lgRb1Pli4xZPw==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [x64]
+    os: [freebsd]
+
+  '@rolldown/binding-linux-arm-gnueabihf@1.0.0-rc.15':
+    resolution: {integrity: sha512-cVwk0w8QbZJGTnP/AHQBs5yNwmpgGYStL88t4UIaqcvYJWBfS0s3oqVLZPwsPU6M0zlW4GqjP0Zq5MnAGwFeGA==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm]
+    os: [linux]
+
+  '@rolldown/binding-linux-arm64-gnu@1.0.0-rc.15':
+    resolution: {integrity: sha512-eBZ/u8iAK9SoHGanqe/jrPnY0JvBN6iXbVOsbO38mbz+ZJsaobExAm1Iu+rxa4S1l2FjG0qEZn4Rc6X8n+9M+w==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm64]
+    os: [linux]
+    libc: [glibc]
+
+  '@rolldown/binding-linux-arm64-musl@1.0.0-rc.15':
+    resolution: {integrity: sha512-ZvRYMGrAklV9PEkgt4LQM6MjQX2P58HPAuecwYObY2DhS2t35R0I810bKi0wmaYORt6m/2Sm+Z+nFgb0WhXNcQ==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm64]
+    os: [linux]
+    libc: [musl]
+
+  '@rolldown/binding-linux-ppc64-gnu@1.0.0-rc.15':
+    resolution: {integrity: sha512-VDpgGBzgfg5hLg+uBpCLoFG5kVvEyafmfxGUV0UHLcL5irxAK7PKNeC2MwClgk6ZAiNhmo9FLhRYgvMmedLtnQ==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [ppc64]
+    os: [linux]
+    libc: [glibc]
+
+  '@rolldown/binding-linux-s390x-gnu@1.0.0-rc.15':
+    resolution: {integrity: sha512-y1uXY3qQWCzcPgRJATPSOUP4tCemh4uBdY7e3EZbVwCJTY3gLJWnQABgeUetvED+bt1FQ01OeZwvhLS2bpNrAQ==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [s390x]
+    os: [linux]
+    libc: [glibc]
+
+  '@rolldown/binding-linux-x64-gnu@1.0.0-rc.15':
+    resolution: {integrity: sha512-023bTPBod7J3Y/4fzAN6QtpkSABR0rigtrwaP+qSEabUh5zf6ELr9Nc7GujaROuPY3uwdSIXWrvhn1KxOvurWA==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [x64]
+    os: [linux]
+    libc: [glibc]
+
+  '@rolldown/binding-linux-x64-musl@1.0.0-rc.15':
+    resolution: {integrity: sha512-witB2O0/hU4CgfOOKUoeFgQ4GktPi1eEbAhaLAIpgD6+ZnhcPkUtPsoKKHRzmOoWPZue46IThdSgdo4XneOLYw==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [x64]
+    os: [linux]
+    libc: [musl]
+
+  '@rolldown/binding-openharmony-arm64@1.0.0-rc.15':
+    resolution: {integrity: sha512-UCL68NJ0Ud5zRipXZE9dF5PmirzJE4E4BCIOOssEnM7wLDsxjc6Qb0sGDxTNRTP53I6MZpygyCpY8Aa8sPfKPg==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm64]
+    os: [openharmony]
+
+  '@rolldown/binding-wasm32-wasi@1.0.0-rc.15':
+    resolution: {integrity: sha512-ApLruZq/ig+nhaE7OJm4lDjayUnOHVUa77zGeqnqZ9pn0ovdVbbNPerVibLXDmWeUZXjIYIT8V3xkT58Rm9u5Q==}
+    engines: {node: '>=14.0.0'}
+    cpu: [wasm32]
+
+  '@rolldown/binding-win32-arm64-msvc@1.0.0-rc.15':
+    resolution: {integrity: sha512-KmoUoU7HnN+Si5YWJigfTws1jz1bKBYDQKdbLspz0UaqjjFkddHsqorgiW1mxcAj88lYUE6NC/zJNwT+SloqtA==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [arm64]
+    os: [win32]
+
+  '@rolldown/binding-win32-x64-msvc@1.0.0-rc.15':
+    resolution: {integrity: sha512-3P2A8L+x75qavWLe/Dll3EYBJLQmtkJN8rfh+U/eR3MqMgL/h98PhYI+JFfXuDPgPeCB7iZAKiqii5vqOvnA0g==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    cpu: [x64]
+    os: [win32]
+
+  '@rolldown/pluginutils@1.0.0-rc.15':
+    resolution: {integrity: sha512-UromN0peaE53IaBRe9W7CjrZgXl90fqGpK+mIZbA3qSTeYqg3pqpROBdIPvOG3F5ereDHNwoHBI2e50n1BDr1g==}
+
+  '@rolldown/pluginutils@1.0.0-rc.7':
+    resolution: {integrity: sha512-qujRfC8sFVInYSPPMLQByRh7zhwkGFS4+tyMQ83srV1qrxL4g8E2tyxVVyxd0+8QeBM1mIk9KbWxkegRr76XzA==}
+
+  '@standard-schema/spec@1.1.0':
+    resolution: {integrity: sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w==}
+
+  '@tailwindcss/node@4.2.2':
+    resolution: {integrity: sha512-pXS+wJ2gZpVXqFaUEjojq7jzMpTGf8rU6ipJz5ovJV6PUGmlJ+jvIwGrzdHdQ80Sg+wmQxUFuoW1UAAwHNEdFA==}
+
+  '@tailwindcss/oxide-android-arm64@4.2.2':
+    resolution: {integrity: sha512-dXGR1n+P3B6748jZO/SvHZq7qBOqqzQ+yFrXpoOWWALWndF9MoSKAT3Q0fYgAzYzGhxNYOoysRvYlpixRBBoDg==}
+    engines: {node: '>= 20'}
+    cpu: [arm64]
+    os: [android]
+
+  '@tailwindcss/oxide-darwin-arm64@4.2.2':
+    resolution: {integrity: sha512-iq9Qjr6knfMpZHj55/37ouZeykwbDqF21gPFtfnhCCKGDcPI/21FKC9XdMO/XyBM7qKORx6UIhGgg6jLl7BZlg==}
+    engines: {node: '>= 20'}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@tailwindcss/oxide-darwin-x64@4.2.2':
+    resolution: {integrity: sha512-BlR+2c3nzc8f2G639LpL89YY4bdcIdUmiOOkv2GQv4/4M0vJlpXEa0JXNHhCHU7VWOKWT/CjqHdTP8aUuDJkuw==}
+    engines: {node: '>= 20'}
+    cpu: [x64]
+    os: [darwin]
+
+  '@tailwindcss/oxide-freebsd-x64@4.2.2':
+    resolution: {integrity: sha512-YUqUgrGMSu2CDO82hzlQ5qSb5xmx3RUrke/QgnoEx7KvmRJHQuZHZmZTLSuuHwFf0DJPybFMXMYf+WJdxHy/nQ==}
+    engines: {node: '>= 20'}
+    cpu: [x64]
+    os: [freebsd]
+
+  '@tailwindcss/oxide-linux-arm-gnueabihf@4.2.2':
+    resolution: {integrity: sha512-FPdhvsW6g06T9BWT0qTwiVZYE2WIFo2dY5aCSpjG/S/u1tby+wXoslXS0kl3/KXnULlLr1E3NPRRw0g7t2kgaQ==}
+    engines: {node: '>= 20'}
+    cpu: [arm]
+    os: [linux]
+
+  '@tailwindcss/oxide-linux-arm64-gnu@4.2.2':
+    resolution: {integrity: sha512-4og1V+ftEPXGttOO7eCmW7VICmzzJWgMx+QXAJRAhjrSjumCwWqMfkDrNu1LXEQzNAwz28NCUpucgQPrR4S2yw==}
+    engines: {node: '>= 20'}
+    cpu: [arm64]
+    os: [linux]
+    libc: [glibc]
+
+  '@tailwindcss/oxide-linux-arm64-musl@4.2.2':
+    resolution: {integrity: sha512-oCfG/mS+/+XRlwNjnsNLVwnMWYH7tn/kYPsNPh+JSOMlnt93mYNCKHYzylRhI51X+TbR+ufNhhKKzm6QkqX8ag==}
+    engines: {node: '>= 20'}
+    cpu: [arm64]
+    os: [linux]
+    libc: [musl]
+
+  '@tailwindcss/oxide-linux-x64-gnu@4.2.2':
+    resolution: {integrity: sha512-rTAGAkDgqbXHNp/xW0iugLVmX62wOp2PoE39BTCGKjv3Iocf6AFbRP/wZT/kuCxC9QBh9Pu8XPkv/zCZB2mcMg==}
+    engines: {node: '>= 20'}
+    cpu: [x64]
+    os: [linux]
+    libc: [glibc]
+
+  '@tailwindcss/oxide-linux-x64-musl@4.2.2':
+    resolution: {integrity: sha512-XW3t3qwbIwiSyRCggeO2zxe3KWaEbM0/kW9e8+0XpBgyKU4ATYzcVSMKteZJ1iukJ3HgHBjbg9P5YPRCVUxlnQ==}
+    engines: {node: '>= 20'}
+    cpu: [x64]
+    os: [linux]
+    libc: [musl]
+
+  '@tailwindcss/oxide-wasm32-wasi@4.2.2':
+    resolution: {integrity: sha512-eKSztKsmEsn1O5lJ4ZAfyn41NfG7vzCg496YiGtMDV86jz1q/irhms5O0VrY6ZwTUkFy/EKG3RfWgxSI3VbZ8Q==}
+    engines: {node: '>=14.0.0'}
+    cpu: [wasm32]
+    bundledDependencies:
+      - '@napi-rs/wasm-runtime'
+      - '@emnapi/core'
+      - '@emnapi/runtime'
+      - '@tybys/wasm-util'
+      - '@emnapi/wasi-threads'
+      - tslib
+
+  '@tailwindcss/oxide-win32-arm64-msvc@4.2.2':
+    resolution: {integrity: sha512-qPmaQM4iKu5mxpsrWZMOZRgZv1tOZpUm+zdhhQP0VhJfyGGO3aUKdbh3gDZc/dPLQwW4eSqWGrrcWNBZWUWaXQ==}
+    engines: {node: '>= 20'}
+    cpu: [arm64]
+    os: [win32]
+
+  '@tailwindcss/oxide-win32-x64-msvc@4.2.2':
+    resolution: {integrity: sha512-1T/37VvI7WyH66b+vqHj/cLwnCxt7Qt3WFu5Q8hk65aOvlwAhs7rAp1VkulBJw/N4tMirXjVnylTR72uI0HGcA==}
+    engines: {node: '>= 20'}
+    cpu: [x64]
+    os: [win32]
+
+  '@tailwindcss/oxide@4.2.2':
+    resolution: {integrity: sha512-qEUA07+E5kehxYp9BVMpq9E8vnJuBHfJEC0vPC5e7iL/hw7HR61aDKoVoKzrG+QKp56vhNZe4qwkRmMC0zDLvg==}
+    engines: {node: '>= 20'}
+
+  '@tailwindcss/vite@4.2.2':
+    resolution: {integrity: sha512-mEiF5HO1QqCLXoNEfXVA1Tzo+cYsrqV7w9Juj2wdUFyW07JRenqMG225MvPwr3ZD9N1bFQj46X7r33iHxLUW0w==}
+    peerDependencies:
+      vite: ^5.2.0 || ^6 || ^7 || ^8
+
+  '@tanstack/query-core@5.99.1':
+    resolution: {integrity: sha512-5E8xwxyWvr22yt7zvzP3KOZ5TUElOdVA45NP3/Ao1m9mvc9i18NLTDe9m3M00BH2DR5J20cv7xckMPlhKNs+vQ==}
+
+  '@tanstack/react-query@5.99.1':
+    resolution: {integrity: sha512-akg5GdwW70lvJvCqVHZ7tizGyc+TATjUzKX9RuF1xknhEe/1leofXk7YLYbrbRsuhNbHJBAayaQUMvvOFZ5L5g==}
+    peerDependencies:
+      react: ^18 || ^19
+
+  '@testing-library/dom@10.4.1':
+    resolution: {integrity: sha512-o4PXJQidqJl82ckFaXUeoAW+XysPLauYI43Abki5hABd853iMhitooc6znOnczgbTYmEP6U6/y1ZyKAIsvMKGg==}
+    engines: {node: '>=18'}
+
+  '@testing-library/jest-dom@6.9.1':
+    resolution: {integrity: sha512-zIcONa+hVtVSSep9UT3jZ5rizo2BsxgyDYU7WFD5eICBE7no3881HGeb/QkGfsJs6JTkY1aQhT7rIPC7e+0nnA==}
+    engines: {node: '>=14', npm: '>=6', yarn: '>=1'}
+
+  '@testing-library/react@16.3.2':
+    resolution: {integrity: sha512-XU5/SytQM+ykqMnAnvB2umaJNIOsLF3PVv//1Ew4CTcpz0/BRyy/af40qqrt7SjKpDdT1saBMc42CUok5gaw+g==}
+    engines: {node: '>=18'}
+    peerDependencies:
+      '@testing-library/dom': ^10.0.0
+      '@types/react': ^18.0.0 || ^19.0.0
+      '@types/react-dom': ^18.0.0 || ^19.0.0
+      react: ^18.0.0 || ^19.0.0
+      react-dom: ^18.0.0 || ^19.0.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+
+  '@testing-library/user-event@14.6.1':
+    resolution: {integrity: sha512-vq7fv0rnt+QTXgPxr5Hjc210p6YKq2kmdziLgnsZGgLJ9e6VAShx1pACLuRjd/AS/sr7phAR58OIIpf0LlmQNw==}
+    engines: {node: '>=12', npm: '>=6'}
+    peerDependencies:
+      '@testing-library/dom': '>=7.21.4'
+
+  '@tybys/wasm-util@0.10.1':
+    resolution: {integrity: sha512-9tTaPJLSiejZKx+Bmog4uSubteqTvFrVrURwkmHixBo0G4seD0zUxp98E1DzUBJxLQ3NPwXrGKDiVjwx/DpPsg==}
+
+  '@types/aria-query@5.0.4':
+    resolution: {integrity: sha512-rfT93uj5s0PRL7EzccGMs3brplhcrghnDoV26NqKhCAS1hVo+WdNsPvE/yb6ilfr5hi2MEk6d5EWJTKdxg8jVw==}
+
+  '@types/chai@5.2.3':
+    resolution: {integrity: sha512-Mw558oeA9fFbv65/y4mHtXDs9bPnFMZAL/jxdPFUpOHHIXX91mcgEHbS5Lahr+pwZFR8A7GQleRWeI6cGFC2UA==}
+
+  '@types/deep-eql@4.0.2':
+    resolution: {integrity: sha512-c9h9dVVMigMPc4bwTvC5dxqtqJZwQPePsWjPlpSOnojbor6pGqdk541lfA7AqFQr5pB1BRdq0juY9db81BwyFw==}
+
+  '@types/estree@1.0.8':
+    resolution: {integrity: sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==}
+
+  '@types/js-yaml@4.0.9':
+    resolution: {integrity: sha512-k4MGaQl5TGo/iipqb2UDG2UwjXziSWkh0uysQelTlJpX1qGlpUZYm8PnO4DxG1qBomtJUdYJ6qR6xdIah10JLg==}
+
+  '@types/json-schema@7.0.15':
+    resolution: {integrity: sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==}
+
+  '@types/node@24.12.2':
+    resolution: {integrity: sha512-A1sre26ke7HDIuY/M23nd9gfB+nrmhtYyMINbjI1zHJxYteKR6qSMX56FsmjMcDb3SMcjJg5BiRRgOCC/yBD0g==}
+
+  '@types/react-dom@19.2.3':
+    resolution: {integrity: sha512-jp2L/eY6fn+KgVVQAOqYItbF0VY/YApe5Mz2F0aykSO8gx31bYCZyvSeYxCHKvzHG5eZjc+zyaS5BrBWya2+kQ==}
+    peerDependencies:
+      '@types/react': ^19.2.0
+
+  '@types/react@19.2.14':
+    resolution: {integrity: sha512-ilcTH/UniCkMdtexkoCN0bI7pMcJDvmQFPvuPvmEaYA/NSfFTAgdUSLAoVjaRJm7+6PvcM+q1zYOwS4wTYMF9w==}
+
+  '@types/trusted-types@2.0.7':
+    resolution: {integrity: sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==}
+
+  '@typescript-eslint/eslint-plugin@8.58.2':
+    resolution: {integrity: sha512-aC2qc5thQahutKjP+cl8cgN9DWe3ZUqVko30CMSZHnFEHyhOYoZSzkGtAI2mcwZ38xeImDucI4dnqsHiOYuuCw==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+    peerDependencies:
+      '@typescript-eslint/parser': ^8.58.2
+      eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
+      typescript: '>=4.8.4 <6.1.0'
+
+  '@typescript-eslint/parser@8.58.2':
+    resolution: {integrity: sha512-/Zb/xaIDfxeJnvishjGdcR4jmr7S+bda8PKNhRGdljDM+elXhlvN0FyPSsMnLmJUrVG9aPO6dof80wjMawsASg==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+    peerDependencies:
+      eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
+      typescript: '>=4.8.4 <6.1.0'
+
+  '@typescript-eslint/project-service@8.58.2':
+    resolution: {integrity: sha512-Cq6UfpZZk15+r87BkIh5rDpi38W4b+Sjnb8wQCPPDDweS/LRCFjCyViEbzHk5Ck3f2QDfgmlxqSa7S7clDtlfg==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+    peerDependencies:
+      typescript: '>=4.8.4 <6.1.0'
+
+  '@typescript-eslint/scope-manager@8.58.2':
+    resolution: {integrity: sha512-SgmyvDPexWETQek+qzZnrG6844IaO02UVyOLhI4wpo82dpZJY9+6YZCKAMFzXb7qhx37mFK1QcPQ18tud+vo6Q==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
+  '@typescript-eslint/tsconfig-utils@8.58.2':
+    resolution: {integrity: sha512-3SR+RukipDvkkKp/d0jP0dyzuls3DbGmwDpVEc5wqk5f38KFThakqAAO0XMirWAE+kT00oTauTbzMFGPoAzB0A==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+    peerDependencies:
+      typescript: '>=4.8.4 <6.1.0'
+
+  '@typescript-eslint/type-utils@8.58.2':
+    resolution: {integrity: sha512-Z7EloNR/B389FvabdGeTo2XMs4W9TjtPiO9DAsmT0yom0bwlPyRjkJ1uCdW1DvrrrYP50AJZ9Xc3sByZA9+dcg==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+    peerDependencies:
+      eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
+      typescript: '>=4.8.4 <6.1.0'
+
+  '@typescript-eslint/types@8.58.2':
+    resolution: {integrity: sha512-9TukXyATBQf/Jq9AMQXfvurk+G5R2MwfqQGDR2GzGz28HvY/lXNKGhkY+6IOubwcquikWk5cjlgPvD2uAA7htQ==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
+  '@typescript-eslint/typescript-estree@8.58.2':
+    resolution: {integrity: sha512-ELGuoofuhhoCvNbQjFFiobFcGgcDCEm0ThWdmO4Z0UzLqPXS3KFvnEZ+SHewwOYHjM09tkzOWXNTv9u6Gqtyuw==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+    peerDependencies:
+      typescript: '>=4.8.4 <6.1.0'
+
+  '@typescript-eslint/utils@8.58.2':
+    resolution: {integrity: sha512-QZfjHNEzPY8+l0+fIXMvuQ2sJlplB4zgDZvA+NmvZsZv3EQwOcc1DuIU1VJUTWZ/RKouBMhDyNaBMx4sWvrzRA==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+    peerDependencies:
+      eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
+      typescript: '>=4.8.4 <6.1.0'
+
+  '@typescript-eslint/visitor-keys@8.58.2':
+    resolution: {integrity: sha512-f1WO2Lx8a9t8DARmcWAUPJbu0G20bJlj8L4z72K00TMeJAoyLr/tHhI/pzYBLrR4dXWkcxO1cWYZEOX8DKHTqA==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
+  '@vitejs/plugin-react@6.0.1':
+    resolution: {integrity: sha512-l9X/E3cDb+xY3SWzlG1MOGt2usfEHGMNIaegaUGFsLkb3RCn/k8/TOXBcab+OndDI4TBtktT8/9BwwW8Vi9KUQ==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    peerDependencies:
+      '@rolldown/plugin-babel': ^0.1.7 || ^0.2.0
+      babel-plugin-react-compiler: ^1.0.0
+      vite: ^8.0.0
+    peerDependenciesMeta:
+      '@rolldown/plugin-babel':
+        optional: true
+      babel-plugin-react-compiler:
+        optional: true
+
+  '@vitest/expect@4.1.6':
+    resolution: {integrity: sha512-7EHDquPthALSV0jhhjgEW8FXaviMx7rSqu8W6oqCoAuOhKov814P99QDV1pxMA3QPv21YudvJngIhjrNI4opLg==}
+
+  '@vitest/mocker@4.1.6':
+    resolution: {integrity: sha512-MCFc63czMjEInOlcY2cpQCvCN+KgbAn+60xu9cMgP4sKaLC5JNAKw7JH8QdAnoAC88hW1IiSNZ+GgVXlN1UcMQ==}
+    peerDependencies:
+      msw: ^2.4.9
+      vite: ^6.0.0 || ^7.0.0 || ^8.0.0
+    peerDependenciesMeta:
+      msw:
+        optional: true
+      vite:
+        optional: true
+
+  '@vitest/pretty-format@4.1.6':
+    resolution: {integrity: sha512-h5SxD/IzNhZYnrSZRsUZQIC+vD0GY8cUvq0iwsmkFKixRCKLLWqCXa/FIQ4S1R+sI+PGoojkHsdNrbZiM9Qpgw==}
+
+  '@vitest/runner@4.1.6':
+    resolution: {integrity: sha512-nOPCmn2+yD0ZNmKdsXGv/UxMMWbMuKeD6GyYncNwdkYDxpQvrPSKYj2rWuDjC2Y4b6w6hjip5dBKFzEUuZe3vA==}
+
+  '@vitest/snapshot@4.1.6':
+    resolution: {integrity: sha512-YhsdE6xAVfTDmzjxL2ZDUvjj+ZsgyOKe+TdQzqkD72wIOmHka8NuGQ6NpTNZv9D2Z63fbwWKJPeVpEw4EQgYxw==}
+
+  '@vitest/spy@4.1.6':
+    resolution: {integrity: sha512-JFKxMx6udhwKh/Ldo270e17QX710vgunMkuPAvXjHSvC6oqLWAHhVhjg/I71q0u0CBSErIODV1Kjv0FQNSWjdg==}
+
+  '@vitest/ui@4.1.6':
+    resolution: {integrity: sha512-wiu5em68DfGv/2HFvI1Njr7JI2CHcBlQvereSzVG8my53PRxjTNOCsD9VOkRKrsJBDHmyuXvosxWZw7T91a2mw==}
+    peerDependencies:
+      vitest: 4.1.6
+
+  '@vitest/utils@4.1.6':
+    resolution: {integrity: sha512-FxIY+U81R3LGKCxaHHFRQ5+g6/iRgGLmeHWdp2Amj4ljQRrEIWHmZyDfDYBRZlpyqA7qKxtS9DD1dhk8RnRIVQ==}
+
+  '@xterm/addon-fit@0.11.0':
+    resolution: {integrity: sha512-jYcgT6xtVYhnhgxh3QgYDnnNMYTcf8ElbxxFzX0IZo+vabQqSPAjC3c1wJrKB5E19VwQei89QCiZZP86DCPF7g==}
+
+  '@xterm/xterm@6.0.0':
+    resolution: {integrity: sha512-TQwDdQGtwwDt+2cgKDLn0IRaSxYu1tSUjgKarSDkUM0ZNiSRXFpjxEsvc/Zgc5kq5omJ+V0a8/kIM2WD3sMOYg==}
+
+  acorn-jsx@5.3.2:
+    resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
+    peerDependencies:
+      acorn: ^6.0.0 || ^7.0.0 || ^8.0.0
+
+  acorn@8.16.0:
+    resolution: {integrity: sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==}
+    engines: {node: '>=0.4.0'}
+    hasBin: true
+
+  ajv-formats@2.1.1:
+    resolution: {integrity: sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==}
+    peerDependencies:
+      ajv: ^8.0.0
+    peerDependenciesMeta:
+      ajv:
+        optional: true
+
+  ajv@6.14.0:
+    resolution: {integrity: sha512-IWrosm/yrn43eiKqkfkHis7QioDleaXQHdDVPKg0FSwwd/DuvyX79TZnFOnYpB7dcsFAMmtFztZuXPDvSePkFw==}
+
+  ajv@8.18.0:
+    resolution: {integrity: sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==}
+
+  ansi-regex@5.0.1:
+    resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==}
+    engines: {node: '>=8'}
+
+  ansi-styles@4.3.0:
+    resolution: {integrity: sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==}
+    engines: {node: '>=8'}
+
+  ansi-styles@5.2.0:
+    resolution: {integrity: sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==}
+    engines: {node: '>=10'}
+
+  argparse@2.0.1:
+    resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==}
+
+  aria-query@5.3.0:
+    resolution: {integrity: sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==}
+
+  aria-query@5.3.2:
+    resolution: {integrity: sha512-COROpnaoap1E2F000S62r6A60uHZnmlvomhfyT2DlTcrY1OrBKn2UhH7qn5wTC9zMvD0AY7csdPSNwKP+7WiQw==}
+    engines: {node: '>= 0.4'}
+
+  assertion-error@2.0.1:
+    resolution: {integrity: sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA==}
+    engines: {node: '>=12'}
+
+  balanced-match@1.0.2:
+    resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==}
+
+  balanced-match@4.0.4:
+    resolution: {integrity: sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==}
+    engines: {node: 18 || 20 || >=22}
+
+  baseline-browser-mapping@2.10.20:
+    resolution: {integrity: sha512-1AaXxEPfXT+GvTBJFuy4yXVHWJBXa4OdbIebGN/wX5DlsIkU0+wzGnd2lOzokSk51d5LUmqjgBLRLlypLUqInQ==}
+    engines: {node: '>=6.0.0'}
+    hasBin: true
+
+  bidi-js@1.0.3:
+    resolution: {integrity: sha512-RKshQI1R3YQ+n9YJz2QQ147P66ELpa1FQEg20Dk8oW9t2KgLbpDLLp9aGZ7y8WHSshDknG0bknqGw5/tyCs5tw==}
+
+  brace-expansion@1.1.14:
+    resolution: {integrity: sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g==}
+
+  brace-expansion@5.0.5:
+    resolution: {integrity: sha512-VZznLgtwhn+Mact9tfiwx64fA9erHH/MCXEUfB/0bX/6Fz6ny5EGTXYltMocqg4xFAQZtnO3DHWWXi8RiuN7cQ==}
+    engines: {node: 18 || 20 || >=22}
+
+  browserslist@4.28.2:
+    resolution: {integrity: sha512-48xSriZYYg+8qXna9kwqjIVzuQxi+KYWp2+5nCYnYKPTr0LvD89Jqk2Or5ogxz0NUMfIjhh2lIUX/LyX9B4oIg==}
+    engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7}
+    hasBin: true
+
+  callsites@3.1.0:
+    resolution: {integrity: sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==}
+    engines: {node: '>=6'}
+
+  caniuse-lite@1.0.30001788:
+    resolution: {integrity: sha512-6q8HFp+lOQtcf7wBK+uEenxymVWkGKkjFpCvw5W25cmMwEDU45p1xQFBQv8JDlMMry7eNxyBaR+qxgmTUZkIRQ==}
+
+  chai@6.2.2:
+    resolution: {integrity: sha512-NUPRluOfOiTKBKvWPtSD4PhFvWCqOi0BGStNWs57X9js7XGTprSmFoz5F0tWhR4WPjNeR9jXqdC7/UpSJTnlRg==}
+    engines: {node: '>=18'}
+
+  chalk@4.1.2:
+    resolution: {integrity: sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==}
+    engines: {node: '>=10'}
+
+  class-variance-authority@0.7.1:
+    resolution: {integrity: sha512-Ka+9Trutv7G8M6WT6SeiRWz792K5qEqIGEGzXKhAE6xOWAY6pPH8U+9IY3oCMv6kqTmLsv7Xh/2w2RigkePMsg==}
+
+  clsx@2.1.1:
+    resolution: {integrity: sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==}
+    engines: {node: '>=6'}
+
+  color-convert@2.0.1:
+    resolution: {integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==}
+    engines: {node: '>=7.0.0'}
+
+  color-name@1.1.4:
+    resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==}
+
+  compute-gcd@1.2.1:
+    resolution: {integrity: sha512-TwMbxBNz0l71+8Sc4czv13h4kEqnchV9igQZBi6QUaz09dnz13juGnnaWWJTRsP3brxOoxeB4SA2WELLw1hCtg==}
+
+  compute-lcm@1.1.2:
+    resolution: {integrity: sha512-OFNPdQAXnQhDSKioX8/XYT6sdUlXwpeMjfd6ApxMJfyZ4GxmLR1xvMERctlYhlHwIiz6CSpBc2+qYKjHGZw4TQ==}
+
+  concat-map@0.0.1:
+    resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==}
+
+  convert-source-map@2.0.0:
+    resolution: {integrity: sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==}
+
+  cookie@1.1.1:
+    resolution: {integrity: sha512-ei8Aos7ja0weRpFzJnEA9UHJ/7XQmqglbRwnf2ATjcB9Wq874VKH9kfjjirM6UhU2/E5fFYadylyhFldcqSidQ==}
+    engines: {node: '>=18'}
+
+  cross-spawn@7.0.6:
+    resolution: {integrity: sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==}
+    engines: {node: '>= 8'}
+
+  css-tree@3.2.1:
+    resolution: {integrity: sha512-X7sjQzceUhu1u7Y/ylrRZFU2FS6LRiFVp6rKLPg23y3x3c3DOKAwuXGDp+PAGjh6CSnCjYeAul8pcT8bAl+lSA==}
+    engines: {node: ^10 || ^12.20.0 || ^14.13.0 || >=15.0.0}
+
+  css.escape@1.5.1:
+    resolution: {integrity: sha512-YUifsXXuknHlUsmlgyY0PKzgPOr7/FjCePfHNt0jxm83wHZi44VDMQ7/fGNkjY3/jV1MC+1CmZbaHzugyeRtpg==}
+
+  csstype@3.2.3:
+    resolution: {integrity: sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ==}
+
+  data-urls@7.0.0:
+    resolution: {integrity: sha512-23XHcCF+coGYevirZceTVD7NdJOqVn+49IHyxgszm+JIiHLoB2TkmPtsYkNWT1pvRSGkc35L6NHs0yHkN2SumA==}
+    engines: {node: ^20.19.0 || ^22.12.0 || >=24.0.0}
+
+  debug@4.4.3:
+    resolution: {integrity: sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==}
+    engines: {node: '>=6.0'}
+    peerDependencies:
+      supports-color: '*'
+    peerDependenciesMeta:
+      supports-color:
+        optional: true
+
+  decimal.js@10.6.0:
+    resolution: {integrity: sha512-YpgQiITW3JXGntzdUmyUR1V812Hn8T1YVXhCu+wO3OpS4eU9l4YdD3qjyiKdV6mvV29zapkMeD390UVEf2lkUg==}
+
+  deep-is@0.1.4:
+    resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==}
+
+  dequal@2.0.3:
+    resolution: {integrity: sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==}
+    engines: {node: '>=6'}
+
+  detect-libc@2.1.2:
+    resolution: {integrity: sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==}
+    engines: {node: '>=8'}
+
+  dom-accessibility-api@0.5.16:
+    resolution: {integrity: sha512-X7BJ2yElsnOJ30pZF4uIIDfBEVgF4XEBxL9Bxhy6dnrm5hkzqmsWHGTiHqRiITNhMyFLyAiWndIJP7Z1NTteDg==}
+
+  dom-accessibility-api@0.6.3:
+    resolution: {integrity: sha512-7ZgogeTnjuHbo+ct10G9Ffp0mif17idi0IyWNVA/wcwcm7NPOD/WEHVP3n7n3MhXqxoIYm8d6MuZohYWIZ4T3w==}
+
+  dompurify@3.2.7:
+    resolution: {integrity: sha512-WhL/YuveyGXJaerVlMYGWhvQswa7myDG17P7Vu65EWC05o8vfeNbvNf4d/BOvH99+ZW+LlQsc1GDKMa1vNK6dw==}
+
+  electron-to-chromium@1.5.340:
+    resolution: {integrity: sha512-908qahOGocRMinT2nM3ajCEM99H4iPdv84eagPP3FfZy/1ZGeOy2CZYzjhms81ckOPCXPlW7LkY4XpxD8r1DrA==}
+
+  enhanced-resolve@5.20.1:
+    resolution: {integrity: sha512-Qohcme7V1inbAfvjItgw0EaxVX5q2rdVEZHRBrEQdRZTssLDGsL8Lwrznl8oQ/6kuTJONLaDcGjkNP247XEhcA==}
+    engines: {node: '>=10.13.0'}
+
+  entities@8.0.0:
+    resolution: {integrity: sha512-zwfzJecQ/Uej6tusMqwAqU/6KL2XaB2VZ2Jg54Je6ahNBGNH6Ek6g3jjNCF0fG9EWQKGZNddNjU5F1ZQn/sBnA==}
+    engines: {node: '>=20.19.0'}
+
+  es-module-lexer@2.1.0:
+    resolution: {integrity: sha512-n27zTYMjYu1aj4MjCWzSP7G9r75utsaoc8m61weK+W8JMBGGQybd43GstCXZ3WNmSFtGT9wi59qQTW6mhTR5LQ==}
+
+  escalade@3.2.0:
+    resolution: {integrity: sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==}
+    engines: {node: '>=6'}
+
+  escape-string-regexp@4.0.0:
+    resolution: {integrity: sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==}
+    engines: {node: '>=10'}
+
+  eslint-plugin-react-hooks@7.1.1:
+    resolution: {integrity: sha512-f2I7Gw6JbvCexzIInuSbZpfdQ44D7iqdWX01FKLvrPgqxoE7oMj8clOfto8U6vYiz4yd5oKu39rRSVOe1zRu0g==}
+    engines: {node: '>=18'}
+    peerDependencies:
+      eslint: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0 || ^9.0.0 || ^10.0.0
+
+  eslint-plugin-react-refresh@0.5.2:
+    resolution: {integrity: sha512-hmgTH57GfzoTFjVN0yBwTggnsVUF2tcqi7RJZHqi9lIezSs4eFyAMktA68YD4r5kNw1mxyY4dmkyoFDb3FIqrA==}
+    peerDependencies:
+      eslint: ^9 || ^10
+
+  eslint-scope@8.4.0:
+    resolution: {integrity: sha512-sNXOfKCn74rt8RICKMvJS7XKV/Xk9kA7DyJr8mJik3S7Cwgy3qlkkmyS2uQB3jiJg6VNdZd/pDBJu0nvG2NlTg==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
+  eslint-visitor-keys@3.4.3:
+    resolution: {integrity: sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+
+  eslint-visitor-keys@4.2.1:
+    resolution: {integrity: sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
+  eslint-visitor-keys@5.0.1:
+    resolution: {integrity: sha512-tD40eHxA35h0PEIZNeIjkHoDR4YjjJp34biM0mDvplBe//mB+IHCqHDGV7pxF+7MklTvighcCPPZC7ynWyjdTA==}
+    engines: {node: ^20.19.0 || ^22.13.0 || >=24}
+
+  eslint@9.39.4:
+    resolution: {integrity: sha512-XoMjdBOwe/esVgEvLmNsD3IRHkm7fbKIUGvrleloJXUZgDHig2IPWNniv+GwjyJXzuNqVjlr5+4yVUZjycJwfQ==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+    deprecated: This version is no longer supported. Please see https://eslint.org/version-support for other options.
+    hasBin: true
+    peerDependencies:
+      jiti: '*'
+    peerDependenciesMeta:
+      jiti:
+        optional: true
+
+  espree@10.4.0:
+    resolution: {integrity: sha512-j6PAQ2uUr79PZhBjP5C5fhl8e39FmRnOjsD5lGnWrFU8i2G776tBK7+nP8KuQUTTyAZUwfQqXAgrVH5MbH9CYQ==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
+  esquery@1.7.0:
+    resolution: {integrity: sha512-Ap6G0WQwcU/LHsvLwON1fAQX9Zp0A2Y6Y/cJBl9r/JbW90Zyg4/zbG6zzKa2OTALELarYHmKu0GhpM5EO+7T0g==}
+    engines: {node: '>=0.10'}
+
+  esrecurse@4.3.0:
+    resolution: {integrity: sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==}
+    engines: {node: '>=4.0'}
+
+  estraverse@5.3.0:
+    resolution: {integrity: sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==}
+    engines: {node: '>=4.0'}
+
+  estree-walker@3.0.3:
+    resolution: {integrity: sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==}
+
+  esutils@2.0.3:
+    resolution: {integrity: sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==}
+    engines: {node: '>=0.10.0'}
+
+  expect-type@1.3.0:
+    resolution: {integrity: sha512-knvyeauYhqjOYvQ66MznSMs83wmHrCycNEN6Ao+2AeYEfxUIkuiVxdEa1qlGEPK+We3n0THiDciYSsCcgW/DoA==}
+    engines: {node: '>=12.0.0'}
+
+  fast-deep-equal@3.1.3:
+    resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==}
+
+  fast-json-stable-stringify@2.1.0:
+    resolution: {integrity: sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==}
+
+  fast-levenshtein@2.0.6:
+    resolution: {integrity: sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==}
+
+  fast-uri@3.1.0:
+    resolution: {integrity: sha512-iPeeDKJSWf4IEOasVVrknXpaBV0IApz/gp7S2bb7Z4Lljbl2MGJRqInZiUrQwV16cpzw/D3S5j5Julj/gT52AA==}
+
+  fdir@6.5.0:
+    resolution: {integrity: sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==}
+    engines: {node: '>=12.0.0'}
+    peerDependencies:
+      picomatch: ^3 || ^4
+    peerDependenciesMeta:
+      picomatch:
+        optional: true
+
+  fflate@0.8.2:
+    resolution: {integrity: sha512-cPJU47OaAoCbg0pBvzsgpTPhmhqI5eJjh/JIu8tPj5q+T7iLvW/JAYUqmE7KOB4R1ZyEhzBaIQpQpardBF5z8A==}
+
+  file-entry-cache@8.0.0:
+    resolution: {integrity: sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==}
+    engines: {node: '>=16.0.0'}
+
+  find-up@5.0.0:
+    resolution: {integrity: sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==}
+    engines: {node: '>=10'}
+
+  flat-cache@4.0.1:
+    resolution: {integrity: sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==}
+    engines: {node: '>=16'}
+
+  flatted@3.4.2:
+    resolution: {integrity: sha512-PjDse7RzhcPkIJwy5t7KPWQSZ9cAbzQXcafsetQoD7sOJRQlGikNbx7yZp2OotDnJyrDcbyRq3Ttb18iYOqkxA==}
+
+  fsevents@2.3.3:
+    resolution: {integrity: sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==}
+    engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
+    os: [darwin]
+
+  gensync@1.0.0-beta.2:
+    resolution: {integrity: sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==}
+    engines: {node: '>=6.9.0'}
+
+  glob-parent@6.0.2:
+    resolution: {integrity: sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==}
+    engines: {node: '>=10.13.0'}
+
+  globals@14.0.0:
+    resolution: {integrity: sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==}
+    engines: {node: '>=18'}
+
+  globals@17.5.0:
+    resolution: {integrity: sha512-qoV+HK2yFl/366t2/Cb3+xxPUo5BuMynomoDmiaZBIdbs+0pYbjfZU+twLhGKp4uCZ/+NbtpVepH5bGCxRyy2g==}
+    engines: {node: '>=18'}
+
+  graceful-fs@4.2.11:
+    resolution: {integrity: sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==}
+
+  has-flag@4.0.0:
+    resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==}
+    engines: {node: '>=8'}
+
+  hermes-estree@0.25.1:
+    resolution: {integrity: sha512-0wUoCcLp+5Ev5pDW2OriHC2MJCbwLwuRx+gAqMTOkGKJJiBCLjtrvy4PWUGn6MIVefecRpzoOZ/UV6iGdOr+Cw==}
+
+  hermes-parser@0.25.1:
+    resolution: {integrity: sha512-6pEjquH3rqaI6cYAXYPcz9MS4rY6R4ngRgrgfDshRptUZIc3lw0MCIJIGDj9++mfySOuPTHB4nrSW99BCvOPIA==}
+
+  html-encoding-sniffer@6.0.0:
+    resolution: {integrity: sha512-CV9TW3Y3f8/wT0BRFc1/KAVQ3TUHiXmaAb6VW9vtiMFf7SLoMd1PdAc4W3KFOFETBJUb90KatHqlsZMWV+R9Gg==}
+    engines: {node: ^20.19.0 || ^22.12.0 || >=24.0.0}
+
+  ignore@5.3.2:
+    resolution: {integrity: sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==}
+    engines: {node: '>= 4'}
+
+  ignore@7.0.5:
+    resolution: {integrity: sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==}
+    engines: {node: '>= 4'}
+
+  import-fresh@3.3.1:
+    resolution: {integrity: sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==}
+    engines: {node: '>=6'}
+
+  imurmurhash@0.1.4:
+    resolution: {integrity: sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==}
+    engines: {node: '>=0.8.19'}
+
+  indent-string@4.0.0:
+    resolution: {integrity: sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==}
+    engines: {node: '>=8'}
+
+  is-extglob@2.1.1:
+    resolution: {integrity: sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==}
+    engines: {node: '>=0.10.0'}
+
+  is-glob@4.0.3:
+    resolution: {integrity: sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==}
+    engines: {node: '>=0.10.0'}
+
+  is-potential-custom-element-name@1.0.1:
+    resolution: {integrity: sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==}
+
+  isexe@2.0.0:
+    resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==}
+
+  jiti@2.6.1:
+    resolution: {integrity: sha512-ekilCSN1jwRvIbgeg/57YFh8qQDNbwDb9xT/qu2DAHbFFZUicIl4ygVaAvzveMhMVr3LnpSKTNnwt8PoOfmKhQ==}
+    hasBin: true
+
+  js-tokens@4.0.0:
+    resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==}
+
+  js-yaml@4.1.1:
+    resolution: {integrity: sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==}
+    hasBin: true
+
+  jsdom@29.1.1:
+    resolution: {integrity: sha512-ECi4Fi2f7BdJtUKTflYRTiaMxIB0O6zfR1fX0GXpUrf6flp8QIYn1UT20YQqdSOfk2dfkCwS8LAFoJDEppNK5Q==}
+    engines: {node: ^20.19.0 || ^22.13.0 || >=24.0.0}
+    peerDependencies:
+      canvas: ^3.0.0
+    peerDependenciesMeta:
+      canvas:
+        optional: true
+
+  jsesc@3.1.0:
+    resolution: {integrity: sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==}
+    engines: {node: '>=6'}
+    hasBin: true
+
+  json-buffer@3.0.1:
+    resolution: {integrity: sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==}
+
+  json-schema-compare@0.2.2:
+    resolution: {integrity: sha512-c4WYmDKyJXhs7WWvAWm3uIYnfyWFoIp+JEoX34rctVvEkMYCPGhXtvmFFXiffBbxfZsvQ0RNnV5H7GvDF5HCqQ==}
+
+  json-schema-merge-allof@0.8.1:
+    resolution: {integrity: sha512-CTUKmIlPJbsWfzRRnOXz+0MjIqvnleIXwFTzz+t9T86HnYX/Rozria6ZVGLktAU9e+NygNljveP+yxqtQp/Q4w==}
+    engines: {node: '>=12.0.0'}
+
+  json-schema-traverse@0.4.1:
+    resolution: {integrity: sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==}
+
+  json-schema-traverse@1.0.0:
+    resolution: {integrity: sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==}
+
+  json-stable-stringify-without-jsonify@1.0.1:
+    resolution: {integrity: sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==}
+
+  json5@2.2.3:
+    resolution: {integrity: sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==}
+    engines: {node: '>=6'}
+    hasBin: true
+
+  jsonpointer@5.0.1:
+    resolution: {integrity: sha512-p/nXbhSEcu3pZRdkW1OfJhpsVtW1gd4Wa1fnQc9YLiTfAjn0312eMKimbdIQzuZl9aa9xUGaRlP9T/CJE/ditQ==}
+    engines: {node: '>=0.10.0'}
+
+  keyv@4.5.4:
+    resolution: {integrity: sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==}
+
+  levn@0.4.1:
+    resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==}
+    engines: {node: '>= 0.8.0'}
+
+  lightningcss-android-arm64@1.32.0:
+    resolution: {integrity: sha512-YK7/ClTt4kAK0vo6w3X+Pnm0D2cf2vPHbhOXdoNti1Ga0al1P4TBZhwjATvjNwLEBCnKvjJc2jQgHXH0NEwlAg==}
+    engines: {node: '>= 12.0.0'}
+    cpu: [arm64]
+    os: [android]
+
+  lightningcss-darwin-arm64@1.32.0:
+    resolution: {integrity: sha512-RzeG9Ju5bag2Bv1/lwlVJvBE3q6TtXskdZLLCyfg5pt+HLz9BqlICO7LZM7VHNTTn/5PRhHFBSjk5lc4cmscPQ==}
+    engines: {node: '>= 12.0.0'}
+    cpu: [arm64]
+    os: [darwin]
+
+  lightningcss-darwin-x64@1.32.0:
+    resolution: {integrity: sha512-U+QsBp2m/s2wqpUYT/6wnlagdZbtZdndSmut/NJqlCcMLTWp5muCrID+K5UJ6jqD2BFshejCYXniPDbNh73V8w==}
+    engines: {node: '>= 12.0.0'}
+    cpu: [x64]
+    os: [darwin]
+
+  lightningcss-freebsd-x64@1.32.0:
+    resolution: {integrity: sha512-JCTigedEksZk3tHTTthnMdVfGf61Fky8Ji2E4YjUTEQX14xiy/lTzXnu1vwiZe3bYe0q+SpsSH/CTeDXK6WHig==}
+    engines: {node: '>= 12.0.0'}
+    cpu: [x64]
+    os: [freebsd]
+
+  lightningcss-linux-arm-gnueabihf@1.32.0:
+    resolution: {integrity: sha512-x6rnnpRa2GL0zQOkt6rts3YDPzduLpWvwAF6EMhXFVZXD4tPrBkEFqzGowzCsIWsPjqSK+tyNEODUBXeeVHSkw==}
+    engines: {node: '>= 12.0.0'}
+    cpu: [arm]
+    os: [linux]
+
+  lightningcss-linux-arm64-gnu@1.32.0:
+    resolution: {integrity: sha512-0nnMyoyOLRJXfbMOilaSRcLH3Jw5z9HDNGfT/gwCPgaDjnx0i8w7vBzFLFR1f6CMLKF8gVbebmkUN3fa/kQJpQ==}
+    engines: {node: '>= 12.0.0'}
+    cpu: [arm64]
+    os: [linux]
+    libc: [glibc]
+
+  lightningcss-linux-arm64-musl@1.32.0:
+    resolution: {integrity: sha512-UpQkoenr4UJEzgVIYpI80lDFvRmPVg6oqboNHfoH4CQIfNA+HOrZ7Mo7KZP02dC6LjghPQJeBsvXhJod/wnIBg==}
+    engines: {node: '>= 12.0.0'}
+    cpu: [arm64]
+    os: [linux]
+    libc: [musl]
+
+  lightningcss-linux-x64-gnu@1.32.0:
+    resolution: {integrity: sha512-V7Qr52IhZmdKPVr+Vtw8o+WLsQJYCTd8loIfpDaMRWGUZfBOYEJeyJIkqGIDMZPwPx24pUMfwSxxI8phr/MbOA==}
+    engines: {node: '>= 12.0.0'}
+    cpu: [x64]
+    os: [linux]
+    libc: [glibc]
+
+  lightningcss-linux-x64-musl@1.32.0:
+    resolution: {integrity: sha512-bYcLp+Vb0awsiXg/80uCRezCYHNg1/l3mt0gzHnWV9XP1W5sKa5/TCdGWaR/zBM2PeF/HbsQv/j2URNOiVuxWg==}
+    engines: {node: '>= 12.0.0'}
+    cpu: [x64]
+    os: [linux]
+    libc: [musl]
+
+  lightningcss-win32-arm64-msvc@1.32.0:
+    resolution: {integrity: sha512-8SbC8BR40pS6baCM8sbtYDSwEVQd4JlFTOlaD3gWGHfThTcABnNDBda6eTZeqbofalIJhFx0qKzgHJmcPTnGdw==}
+    engines: {node: '>= 12.0.0'}
+    cpu: [arm64]
+    os: [win32]
+
+  lightningcss-win32-x64-msvc@1.32.0:
+    resolution: {integrity: sha512-Amq9B/SoZYdDi1kFrojnoqPLxYhQ4Wo5XiL8EVJrVsB8ARoC1PWW6VGtT0WKCemjy8aC+louJnjS7U18x3b06Q==}
+    engines: {node: '>= 12.0.0'}
+    cpu: [x64]
+    os: [win32]
+
+  lightningcss@1.32.0:
+    resolution: {integrity: sha512-NXYBzinNrblfraPGyrbPoD19C1h9lfI/1mzgWYvXUTe414Gz/X1FD2XBZSZM7rRTrMA8JL3OtAaGifrIKhQ5yQ==}
+    engines: {node: '>= 12.0.0'}
+
+  locate-path@6.0.0:
+    resolution: {integrity: sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==}
+    engines: {node: '>=10'}
+
+  lodash-es@4.18.1:
+    resolution: {integrity: sha512-J8xewKD/Gk22OZbhpOVSwcs60zhd95ESDwezOFuA3/099925PdHJ7OFHNTGtajL3AlZkykD32HykiMo+BIBI8A==}
+
+  lodash.merge@4.6.2:
+    resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
+
+  lodash@4.18.1:
+    resolution: {integrity: sha512-dMInicTPVE8d1e5otfwmmjlxkZoUpiVLwyeTdUsi/Caj/gfzzblBcCE5sRHV/AsjuCmxWrte2TNGSYuCeCq+0Q==}
+
+  loose-envify@1.4.0:
+    resolution: {integrity: sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==}
+    hasBin: true
+
+  lru-cache@11.3.6:
+    resolution: {integrity: sha512-Gf/KoL3C/MlI7Bt0PGI9I+TeTC/I6r/csU58N4BSNc4lppLBeKsOdFYkK+dX0ABDUMJNfCHTyPpzwwO21Awd3A==}
+    engines: {node: 20 || >=22}
+
+  lru-cache@5.1.1:
+    resolution: {integrity: sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==}
+
+  lucide-react@0.484.0:
+    resolution: {integrity: sha512-oZy8coK9kZzvqhSgfbGkPtTgyjpBvs3ukLgDPv14dSOZtBtboryWF5o8i3qen7QbGg7JhiJBz5mK1p8YoMZTLQ==}
+    peerDependencies:
+      react: ^16.5.1 || ^17.0.0 || ^18.0.0 || ^19.0.0
+
+  lz-string@1.5.0:
+    resolution: {integrity: sha512-h5bgJWpxJNswbU7qCrV0tIKQCaS3blPDrqKWx+QxzuzL1zGUzij9XCWLrSLsJPu5t+eWA/ycetzYAO5IOMcWAQ==}
+    hasBin: true
+
+  magic-string@0.30.21:
+    resolution: {integrity: sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==}
+
+  markdown-to-jsx@7.7.17:
+    resolution: {integrity: sha512-7mG/1feQ0TX5I7YyMZVDgCC/y2I3CiEhIRQIhyov9nGBP5eoVrOXXHuL5ZP8GRfxVZKRiXWJgwXkb9It+nQZfQ==}
+    engines: {node: '>= 10'}
+    peerDependencies:
+      react: '>= 0.14.0'
+    peerDependenciesMeta:
+      react:
+        optional: true
+
+  marked@14.0.0:
+    resolution: {integrity: sha512-uIj4+faQ+MgHgwUW1l2PsPglZLOLOT1uErt06dAPtx2kjteLAkbsd/0FiYg/MGS+i7ZKLb7w2WClxHkzOOuryQ==}
+    engines: {node: '>= 18'}
+    hasBin: true
+
+  mdn-data@2.27.1:
+    resolution: {integrity: sha512-9Yubnt3e8A0OKwxYSXyhLymGW4sCufcLG6VdiDdUGVkPhpqLxlvP5vl1983gQjJl3tqbrM731mjaZaP68AgosQ==}
+
+  min-indent@1.0.1:
+    resolution: {integrity: sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==}
+    engines: {node: '>=4'}
+
+  minimatch@10.2.5:
+    resolution: {integrity: sha512-MULkVLfKGYDFYejP07QOurDLLQpcjk7Fw+7jXS2R2czRQzR56yHRveU5NDJEOviH+hETZKSkIk5c+T23GjFUMg==}
+    engines: {node: 18 || 20 || >=22}
+
+  minimatch@3.1.5:
+    resolution: {integrity: sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==}
+
+  monaco-editor@0.55.1:
+    resolution: {integrity: sha512-jz4x+TJNFHwHtwuV9vA9rMujcZRb0CEilTEwG2rRSpe/A7Jdkuj8xPKttCgOh+v/lkHy7HsZ64oj+q3xoAFl9A==}
+
+  mrmime@2.0.1:
+    resolution: {integrity: sha512-Y3wQdFg2Va6etvQ5I82yUhGdsKrcYox6p7FfL1LbK2J4V01F9TGlepTIhnK24t7koZibmg82KGglhA1XK5IsLQ==}
+    engines: {node: '>=10'}
+
+  ms@2.1.3:
+    resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==}
+
+  nanoid@3.3.11:
+    resolution: {integrity: sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==}
+    engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
+    hasBin: true
+
+  natural-compare@1.4.0:
+    resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==}
+
+  node-releases@2.0.37:
+    resolution: {integrity: sha512-1h5gKZCF+pO/o3Iqt5Jp7wc9rH3eJJ0+nh/CIoiRwjRxde/hAHyLPXYN4V3CqKAbiZPSeJFSWHmJsbkicta0Eg==}
+
+  object-assign@4.1.1:
+    resolution: {integrity: sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==}
+    engines: {node: '>=0.10.0'}
+
+  obug@2.1.1:
+    resolution: {integrity: sha512-uTqF9MuPraAQ+IsnPf366RG4cP9RtUi7MLO1N3KEc+wb0a6yKpeL0lmk2IB1jY5KHPAlTc6T/JRdC/YqxHNwkQ==}
+
+  optionator@0.9.4:
+    resolution: {integrity: sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==}
+    engines: {node: '>= 0.8.0'}
+
+  p-limit@3.1.0:
+    resolution: {integrity: sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==}
+    engines: {node: '>=10'}
+
+  p-locate@5.0.0:
+    resolution: {integrity: sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==}
+    engines: {node: '>=10'}
+
+  parent-module@1.0.1:
+    resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==}
+    engines: {node: '>=6'}
+
+  parse5@8.0.1:
+    resolution: {integrity: sha512-z1e/HMG90obSGeidlli3hj7cbocou0/wa5HacvI3ASx34PecNjNQeaHNo5WIZpWofN9kgkqV1q5YvXe3F0FoPw==}
+
+  path-exists@4.0.0:
+    resolution: {integrity: sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==}
+    engines: {node: '>=8'}
+
+  path-key@3.1.1:
+    resolution: {integrity: sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==}
+    engines: {node: '>=8'}
+
+  pathe@2.0.3:
+    resolution: {integrity: sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w==}
+
+  picocolors@1.1.1:
+    resolution: {integrity: sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==}
+
+  picomatch@4.0.4:
+    resolution: {integrity: sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==}
+    engines: {node: '>=12'}
+
+  postcss@8.5.10:
+    resolution: {integrity: sha512-pMMHxBOZKFU6HgAZ4eyGnwXF/EvPGGqUr0MnZ5+99485wwW41kW91A4LOGxSHhgugZmSChL5AlElNdwlNgcnLQ==}
+    engines: {node: ^10 || ^12 || >=14}
+
+  prelude-ls@1.2.1:
+    resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
+    engines: {node: '>= 0.8.0'}
+
+  pretty-format@27.5.1:
+    resolution: {integrity: sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+
+  prop-types@15.8.1:
+    resolution: {integrity: sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==}
+
+  punycode@2.3.1:
+    resolution: {integrity: sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==}
+    engines: {node: '>=6'}
+
+  react-dom@19.2.5:
+    resolution: {integrity: sha512-J5bAZz+DXMMwW/wV3xzKke59Af6CHY7G4uYLN1OvBcKEsWOs4pQExj86BBKamxl/Ik5bx9whOrvBlSDfWzgSag==}
+    peerDependencies:
+      react: ^19.2.5
+
+  react-is@16.13.1:
+    resolution: {integrity: sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==}
+
+  react-is@17.0.2:
+    resolution: {integrity: sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==}
+
+  react-is@18.3.1:
+    resolution: {integrity: sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==}
+
+  react-router@7.14.1:
+    resolution: {integrity: sha512-5BCvFskyAAVumqhEKh/iPhLOIkfxcEUz8WqFIARCkMg8hZZzDYX9CtwxXA0e+qT8zAxmMC0x3Ckb9iMONwc5jg==}
+    engines: {node: '>=20.0.0'}
+    peerDependencies:
+      react: '>=18'
+      react-dom: '>=18'
+    peerDependenciesMeta:
+      react-dom:
+        optional: true
+
+  react@19.2.5:
+    resolution: {integrity: sha512-llUJLzz1zTUBrskt2pwZgLq59AemifIftw4aB7JxOqf1HY2FDaGDxgwpAPVzHU1kdWabH7FauP4i1oEeer2WCA==}
+    engines: {node: '>=0.10.0'}
+
+  redent@3.0.0:
+    resolution: {integrity: sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==}
+    engines: {node: '>=8'}
+
+  require-from-string@2.0.2:
+    resolution: {integrity: sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==}
+    engines: {node: '>=0.10.0'}
+
+  reselect@5.1.1:
+    resolution: {integrity: sha512-K/BG6eIky/SBpzfHZv/dd+9JBFiS4SWV7FIujVyJRux6e45+73RaUHXLmIR1f7WOMaQ0U1km6qwklRQxpJJY0w==}
+
+  resolve-from@4.0.0:
+    resolution: {integrity: sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==}
+    engines: {node: '>=4'}
+
+  rolldown@1.0.0-rc.15:
+    resolution: {integrity: sha512-Ff31guA5zT6WjnGp0SXw76X6hzGRk/OQq2hE+1lcDe+lJdHSgnSX6nK3erbONHyCbpSj9a9E+uX/OvytZoWp2g==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    hasBin: true
+
+  saxes@6.0.0:
+    resolution: {integrity: sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==}
+    engines: {node: '>=v12.22.7'}
+
+  scheduler@0.27.0:
+    resolution: {integrity: sha512-eNv+WrVbKu1f3vbYJT/xtiF5syA5HPIMtf9IgY/nKg0sWqzAUEvqY/xm7OcZc/qafLx/iO9FgOmeSAp4v5ti/Q==}
+
+  semver@6.3.1:
+    resolution: {integrity: sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==}
+    hasBin: true
+
+  semver@7.7.4:
+    resolution: {integrity: sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==}
+    engines: {node: '>=10'}
+    hasBin: true
+
+  set-cookie-parser@2.7.2:
+    resolution: {integrity: sha512-oeM1lpU/UvhTxw+g3cIfxXHyJRc/uidd3yK1P242gzHds0udQBYzs3y8j4gCCW+ZJ7ad0yctld8RYO+bdurlvw==}
+
+  shebang-command@2.0.0:
+    resolution: {integrity: sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==}
+    engines: {node: '>=8'}
+
+  shebang-regex@3.0.0:
+    resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==}
+    engines: {node: '>=8'}
+
+  siginfo@2.0.0:
+    resolution: {integrity: sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g==}
+
+  simple-icons@16.22.0:
+    resolution: {integrity: sha512-/raPcEWh89R2O2IMmHum6W2dF99NNX3yWikVXKUalkDIWz3Rw/S2S+oDPTgJcIGsRh+25m0y8vj4aBaV/KPz3Q==}
+    engines: {node: '>=0.12.18'}
+
+  sirv@3.0.2:
+    resolution: {integrity: sha512-2wcC/oGxHis/BoHkkPwldgiPSYcpZK3JU28WoMVv55yHJgcZ8rlXvuG9iZggz+sU1d4bRgIGASwyWqjxu3FM0g==}
+    engines: {node: '>=18'}
+
+  source-map-js@1.2.1:
+    resolution: {integrity: sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==}
+    engines: {node: '>=0.10.0'}
+
+  stackback@0.0.2:
+    resolution: {integrity: sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==}
+
+  state-local@1.0.7:
+    resolution: {integrity: sha512-HTEHMNieakEnoe33shBYcZ7NX83ACUjCu8c40iOGEZsngj9zRnkqS9j1pqQPXwobB0ZcVTk27REb7COQ0UR59w==}
+
+  std-env@4.1.0:
+    resolution: {integrity: sha512-Rq7ybcX2RuC55r9oaPVEW7/xu3tj8u4GeBYHBWCychFtzMIr86A7e3PPEBPT37sHStKX3+TiX/Fr/ACmJLVlLQ==}
+
+  strip-indent@3.0.0:
+    resolution: {integrity: sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==}
+    engines: {node: '>=8'}
+
+  strip-json-comments@3.1.1:
+    resolution: {integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==}
+    engines: {node: '>=8'}
+
+  supports-color@7.2.0:
+    resolution: {integrity: sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==}
+    engines: {node: '>=8'}
+
+  symbol-tree@3.2.4:
+    resolution: {integrity: sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==}
+
+  tabbable@6.4.0:
+    resolution: {integrity: sha512-05PUHKSNE8ou2dwIxTngl4EzcnsCDZGJ/iCLtDflR/SHB/ny14rXc+qU5P4mG9JkusiV7EivzY9Mhm55AzAvCg==}
+
+  tailwind-merge@3.5.0:
+    resolution: {integrity: sha512-I8K9wewnVDkL1NTGoqWmVEIlUcB9gFriAEkXkfCjX5ib8ezGxtR3xD7iZIxrfArjEsH7F1CHD4RFUtxefdqV/A==}
+
+  tailwindcss@4.2.2:
+    resolution: {integrity: sha512-KWBIxs1Xb6NoLdMVqhbhgwZf2PGBpPEiwOqgI4pFIYbNTfBXiKYyWoTsXgBQ9WFg/OlhnvHaY+AEpW7wSmFo2Q==}
+
+  tapable@2.3.2:
+    resolution: {integrity: sha512-1MOpMXuhGzGL5TTCZFItxCc0AARf1EZFQkGqMm7ERKj8+Hgr5oLvJOVFcC+lRmR8hCe2S3jC4T5D7Vg/d7/fhA==}
+    engines: {node: '>=6'}
+
+  tinybench@2.9.0:
+    resolution: {integrity: sha512-0+DUvqWMValLmha6lr4kD8iAMK1HzV0/aKnCtWb9v9641TnP/MFb7Pc2bxoxQjTXAErryXVgUOfv2YqNllqGeg==}
+
+  tinyexec@1.1.2:
+    resolution: {integrity: sha512-dAqSqE/RabpBKI8+h26GfLq6Vb3JVXs30XYQjdMjaj/c2tS8IYYMbIzP599KtRj7c57/wYApb3QjgRgXmrCukA==}
+    engines: {node: '>=18'}
+
+  tinyglobby@0.2.16:
+    resolution: {integrity: sha512-pn99VhoACYR8nFHhxqix+uvsbXineAasWm5ojXoN8xEwK5Kd3/TrhNn1wByuD52UxWRLy8pu+kRMniEi6Eq9Zg==}
+    engines: {node: '>=12.0.0'}
+
+  tinyrainbow@3.1.0:
+    resolution: {integrity: sha512-Bf+ILmBgretUrdJxzXM0SgXLZ3XfiaUuOj/IKQHuTXip+05Xn+uyEYdVg0kYDipTBcLrCVyUzAPz7QmArb0mmw==}
+    engines: {node: '>=14.0.0'}
+
+  tldts-core@7.0.30:
+    resolution: {integrity: sha512-uiHN8PIB1VmWyS98eZYja4xzlYqeFZVjb4OuYlJQnZAuJhMw4PbKQOKgHKhBdJR3FE/t5mUQ1Kd80++B+qhD1Q==}
+
+  tldts@7.0.30:
+    resolution: {integrity: sha512-ELrFxuqsDdHUwoh0XxDbxuLD3Wnz49Z57IFvTtvWy1hJdcMZjXLIuonjilCiWHlT2GbE4Wlv1wKVTzDFnXH1aw==}
+    hasBin: true
+
+  totalist@3.0.1:
+    resolution: {integrity: sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==}
+    engines: {node: '>=6'}
+
+  tough-cookie@6.0.1:
+    resolution: {integrity: sha512-LktZQb3IeoUWB9lqR5EWTHgW/VTITCXg4D21M+lvybRVdylLrRMnqaIONLVb5mav8vM19m44HIcGq4qASeu2Qw==}
+    engines: {node: '>=16'}
+
+  tr46@6.0.0:
+    resolution: {integrity: sha512-bLVMLPtstlZ4iMQHpFHTR7GAGj2jxi8Dg0s2h2MafAE4uSWF98FC/3MomU51iQAMf8/qDUbKWf5GxuvvVcXEhw==}
+    engines: {node: '>=20'}
+
+  ts-api-utils@2.5.0:
+    resolution: {integrity: sha512-OJ/ibxhPlqrMM0UiNHJ/0CKQkoKF243/AEmplt3qpRgkW8VG7IfOS41h7V8TjITqdByHzrjcS/2si+y4lIh8NA==}
+    engines: {node: '>=18.12'}
+    peerDependencies:
+      typescript: '>=4.8.4'
+
+  tslib@2.8.1:
+    resolution: {integrity: sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==}
+
+  type-check@0.4.0:
+    resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==}
+    engines: {node: '>= 0.8.0'}
+
+  typescript-eslint@8.58.2:
+    resolution: {integrity: sha512-V8iSng9mRbdZjl54VJ9NKr6ZB+dW0J3TzRXRGcSbLIej9jV86ZRtlYeTKDR/QLxXykocJ5icNzbsl2+5TzIvcQ==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+    peerDependencies:
+      eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
+      typescript: '>=4.8.4 <6.1.0'
+
+  typescript@6.0.3:
+    resolution: {integrity: sha512-y2TvuxSZPDyQakkFRPZHKFm+KKVqIisdg9/CZwm9ftvKXLP8NRWj38/ODjNbr43SsoXqNuAisEf1GdCxqWcdBw==}
+    engines: {node: '>=14.17'}
+    hasBin: true
+
+  undici-types@7.16.0:
+    resolution: {integrity: sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==}
+
+  undici@7.25.0:
+    resolution: {integrity: sha512-xXnp4kTyor2Zq+J1FfPI6Eq3ew5h6Vl0F/8d9XU5zZQf1tX9s2Su1/3PiMmUANFULpmksxkClamIZcaUqryHsQ==}
+    engines: {node: '>=20.18.1'}
+
+  update-browserslist-db@1.2.3:
+    resolution: {integrity: sha512-Js0m9cx+qOgDxo0eMiFGEueWztz+d4+M3rGlmKPT+T4IS/jP4ylw3Nwpu6cpTTP8R1MAC1kF4VbdLt3ARf209w==}
+    hasBin: true
+    peerDependencies:
+      browserslist: '>= 4.21.0'
+
+  uri-js@4.4.1:
+    resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==}
+
+  use-sync-external-store@1.6.0:
+    resolution: {integrity: sha512-Pp6GSwGP/NrPIrxVFAIkOQeyw8lFenOHijQWkUTrDvrF4ALqylP2C/KCkeS9dpUM3KvYRQhna5vt7IL95+ZQ9w==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
+
+  validate.io-array@1.0.6:
+    resolution: {integrity: sha512-DeOy7CnPEziggrOO5CZhVKJw6S3Yi7e9e65R1Nl/RTN1vTQKnzjfvks0/8kQ40FP/dsjRAOd4hxmJ7uLa6vxkg==}
+
+  validate.io-function@1.0.2:
+    resolution: {integrity: sha512-LlFybRJEriSuBnUhQyG5bwglhh50EpTL2ul23MPIuR1odjO7XaMLFV8vHGwp7AZciFxtYOeiSCT5st+XSPONiQ==}
+
+  validate.io-integer-array@1.0.0:
+    resolution: {integrity: sha512-mTrMk/1ytQHtCY0oNO3dztafHYyGU88KL+jRxWuzfOmQb+4qqnWmI+gykvGp8usKZOM0H7keJHEbRaFiYA0VrA==}
+
+  validate.io-integer@1.0.5:
+    resolution: {integrity: sha512-22izsYSLojN/P6bppBqhgUDjCkr5RY2jd+N2a3DCAUey8ydvrZ/OkGvFPR7qfOpwR2LC5p4Ngzxz36g5Vgr/hQ==}
+
+  validate.io-number@1.0.3:
+    resolution: {integrity: sha512-kRAyotcbNaSYoDnXvb4MHg/0a1egJdLwS6oJ38TJY7aw9n93Fl/3blIXdyYvPOp55CNxywooG/3BcrwNrBpcSg==}
+
+  vite@8.0.8:
+    resolution: {integrity: sha512-dbU7/iLVa8KZALJyLOBOQ88nOXtNG8vxKuOT4I2mD+Ya70KPceF4IAmDsmU0h1Qsn5bPrvsY9HJstCRh3hG6Uw==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    hasBin: true
+    peerDependencies:
+      '@types/node': ^20.19.0 || >=22.12.0
+      '@vitejs/devtools': ^0.1.0
+      esbuild: ^0.27.0 || ^0.28.0
+      jiti: '>=1.21.0'
+      less: ^4.0.0
+      sass: ^1.70.0
+      sass-embedded: ^1.70.0
+      stylus: '>=0.54.8'
+      sugarss: ^5.0.0
+      terser: ^5.16.0
+      tsx: ^4.8.1
+      yaml: ^2.4.2
+    peerDependenciesMeta:
+      '@types/node':
+        optional: true
+      '@vitejs/devtools':
+        optional: true
+      esbuild:
+        optional: true
+      jiti:
+        optional: true
+      less:
+        optional: true
+      sass:
+        optional: true
+      sass-embedded:
+        optional: true
+      stylus:
+        optional: true
+      sugarss:
+        optional: true
+      terser:
+        optional: true
+      tsx:
+        optional: true
+      yaml:
+        optional: true
+
+  vitest@4.1.6:
+    resolution: {integrity: sha512-6lvjbS3p9b4CrdCmguzbh2/4uoXhGE2q71R4OX5sqF9R1bo9Xd6fGrMAfvp5wnCzlBnFVdCOp6onuTQVbo8iUQ==}
+    engines: {node: ^20.0.0 || ^22.0.0 || >=24.0.0}
+    hasBin: true
+    peerDependencies:
+      '@edge-runtime/vm': '*'
+      '@opentelemetry/api': ^1.9.0
+      '@types/node': ^20.0.0 || ^22.0.0 || >=24.0.0
+      '@vitest/browser-playwright': 4.1.6
+      '@vitest/browser-preview': 4.1.6
+      '@vitest/browser-webdriverio': 4.1.6
+      '@vitest/coverage-istanbul': 4.1.6
+      '@vitest/coverage-v8': 4.1.6
+      '@vitest/ui': 4.1.6
+      happy-dom: '*'
+      jsdom: '*'
+      vite: ^6.0.0 || ^7.0.0 || ^8.0.0
+    peerDependenciesMeta:
+      '@edge-runtime/vm':
+        optional: true
+      '@opentelemetry/api':
+        optional: true
+      '@types/node':
+        optional: true
+      '@vitest/browser-playwright':
+        optional: true
+      '@vitest/browser-preview':
+        optional: true
+      '@vitest/browser-webdriverio':
+        optional: true
+      '@vitest/coverage-istanbul':
+        optional: true
+      '@vitest/coverage-v8':
+        optional: true
+      '@vitest/ui':
+        optional: true
+      happy-dom:
+        optional: true
+      jsdom:
+        optional: true
+
+  w3c-xmlserializer@5.0.0:
+    resolution: {integrity: sha512-o8qghlI8NZHU1lLPrpi2+Uq7abh4GGPpYANlalzWxyWteJOCsr/P+oPBA49TOLu5FTZO4d3F9MnWJfiMo4BkmA==}
+    engines: {node: '>=18'}
+
+  webidl-conversions@8.0.1:
+    resolution: {integrity: sha512-BMhLD/Sw+GbJC21C/UgyaZX41nPt8bUTg+jWyDeg7e7YN4xOM05YPSIXceACnXVtqyEw/LMClUQMtMZ+PGGpqQ==}
+    engines: {node: '>=20'}
+
+  whatwg-mimetype@5.0.0:
+    resolution: {integrity: sha512-sXcNcHOC51uPGF0P/D4NVtrkjSU2fNsm9iog4ZvZJsL3rjoDAzXZhkm2MWt1y+PUdggKAYVoMAIYcs78wJ51Cw==}
+    engines: {node: '>=20'}
+
+  whatwg-url@16.0.1:
+    resolution: {integrity: sha512-1to4zXBxmXHV3IiSSEInrreIlu02vUOvrhxJJH5vcxYTBDAx51cqZiKdyTxlecdKNSjj8EcxGBxNf6Vg+945gw==}
+    engines: {node: ^20.19.0 || ^22.12.0 || >=24.0.0}
+
+  which@2.0.2:
+    resolution: {integrity: sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==}
+    engines: {node: '>= 8'}
+    hasBin: true
+
+  why-is-node-running@2.3.0:
+    resolution: {integrity: sha512-hUrmaWBdVDcxvYqnyh09zunKzROWjbZTiNy8dBEjkS7ehEDQibXJ7XvlmtbwuTclUiIyN+CyXQD4Vmko8fNm8w==}
+    engines: {node: '>=8'}
+    hasBin: true
+
+  word-wrap@1.2.5:
+    resolution: {integrity: sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==}
+    engines: {node: '>=0.10.0'}
+
+  xml-name-validator@5.0.0:
+    resolution: {integrity: sha512-EvGK8EJ3DhaHfbRlETOWAS5pO9MZITeauHKJyb8wyajUfQUenkIg2MvLDTZ4T/TgIcm3HU0TFBgWWboAZ30UHg==}
+    engines: {node: '>=18'}
+
+  xmlchars@2.2.0:
+    resolution: {integrity: sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==}
+
+  yallist@3.1.1:
+    resolution: {integrity: sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==}
+
+  yocto-queue@0.1.0:
+    resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==}
+    engines: {node: '>=10'}
+
+  zod-validation-error@4.0.2:
+    resolution: {integrity: sha512-Q6/nZLe6jxuU80qb/4uJ4t5v2VEZ44lzQjPDhYJNztRQ4wyWc6VF3D3Kb/fAuPetZQnhS3hnajCf9CsWesghLQ==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      zod: ^3.25.0 || ^4.0.0
+
+  zod@4.3.6:
+    resolution: {integrity: sha512-rftlrkhHZOcjDwkGlnUtZZkvaPHCsDATp4pGpuOOMDaTdDDXF91wuVDJoWoPsKX/3YPQ5fHuF3STjcYyKr+Qhg==}
+
+snapshots:
+
+  '@adobe/css-tools@4.4.4': {}
+
+  '@asamuzakjp/css-color@5.1.11':
+    dependencies:
+      '@asamuzakjp/generational-cache': 1.0.1
+      '@csstools/css-calc': 3.2.0(@csstools/css-parser-algorithms@4.0.0(@csstools/css-tokenizer@4.0.0))(@csstools/css-tokenizer@4.0.0)
+      '@csstools/css-color-parser': 4.1.0(@csstools/css-parser-algorithms@4.0.0(@csstools/css-tokenizer@4.0.0))(@csstools/css-tokenizer@4.0.0)
+      '@csstools/css-parser-algorithms': 4.0.0(@csstools/css-tokenizer@4.0.0)
+      '@csstools/css-tokenizer': 4.0.0
+
+  '@asamuzakjp/dom-selector@7.1.1':
+    dependencies:
+      '@asamuzakjp/generational-cache': 1.0.1
+      '@asamuzakjp/nwsapi': 2.3.9
+      bidi-js: 1.0.3
+      css-tree: 3.2.1
+      is-potential-custom-element-name: 1.0.1
+
+  '@asamuzakjp/generational-cache@1.0.1': {}
+
+  '@asamuzakjp/nwsapi@2.3.9': {}
+
+  '@babel/code-frame@7.29.0':
+    dependencies:
+      '@babel/helper-validator-identifier': 7.28.5
+      js-tokens: 4.0.0
+      picocolors: 1.1.1
+
+  '@babel/compat-data@7.29.0': {}
+
+  '@babel/core@7.29.0':
+    dependencies:
+      '@babel/code-frame': 7.29.0
+      '@babel/generator': 7.29.1
+      '@babel/helper-compilation-targets': 7.28.6
+      '@babel/helper-module-transforms': 7.28.6(@babel/core@7.29.0)
+      '@babel/helpers': 7.29.2
+      '@babel/parser': 7.29.2
+      '@babel/template': 7.28.6
+      '@babel/traverse': 7.29.0
+      '@babel/types': 7.29.0
+      '@jridgewell/remapping': 2.3.5
+      convert-source-map: 2.0.0
+      debug: 4.4.3
+      gensync: 1.0.0-beta.2
+      json5: 2.2.3
+      semver: 6.3.1
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/generator@7.29.1':
+    dependencies:
+      '@babel/parser': 7.29.2
+      '@babel/types': 7.29.0
+      '@jridgewell/gen-mapping': 0.3.13
+      '@jridgewell/trace-mapping': 0.3.31
+      jsesc: 3.1.0
+
+  '@babel/helper-compilation-targets@7.28.6':
+    dependencies:
+      '@babel/compat-data': 7.29.0
+      '@babel/helper-validator-option': 7.27.1
+      browserslist: 4.28.2
+      lru-cache: 5.1.1
+      semver: 6.3.1
+
+  '@babel/helper-globals@7.28.0': {}
+
+  '@babel/helper-module-imports@7.28.6':
+    dependencies:
+      '@babel/traverse': 7.29.0
+      '@babel/types': 7.29.0
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/helper-module-transforms@7.28.6(@babel/core@7.29.0)':
+    dependencies:
+      '@babel/core': 7.29.0
+      '@babel/helper-module-imports': 7.28.6
+      '@babel/helper-validator-identifier': 7.28.5
+      '@babel/traverse': 7.29.0
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/helper-string-parser@7.27.1': {}
+
+  '@babel/helper-validator-identifier@7.28.5': {}
+
+  '@babel/helper-validator-option@7.27.1': {}
+
+  '@babel/helpers@7.29.2':
+    dependencies:
+      '@babel/template': 7.28.6
+      '@babel/types': 7.29.0
+
+  '@babel/parser@7.29.2':
+    dependencies:
+      '@babel/types': 7.29.0
+
+  '@babel/runtime@7.29.2': {}
+
+  '@babel/template@7.28.6':
+    dependencies:
+      '@babel/code-frame': 7.29.0
+      '@babel/parser': 7.29.2
+      '@babel/types': 7.29.0
+
+  '@babel/traverse@7.29.0':
+    dependencies:
+      '@babel/code-frame': 7.29.0
+      '@babel/generator': 7.29.1
+      '@babel/helper-globals': 7.28.0
+      '@babel/parser': 7.29.2
+      '@babel/template': 7.28.6
+      '@babel/types': 7.29.0
+      debug: 4.4.3
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/types@7.29.0':
+    dependencies:
+      '@babel/helper-string-parser': 7.27.1
+      '@babel/helper-validator-identifier': 7.28.5
+
+  '@base-ui-components/react@1.0.0-rc.0(@types/react@19.2.14)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)':
+    dependencies:
+      '@babel/runtime': 7.29.2
+      '@base-ui-components/utils': 0.2.2(@types/react@19.2.14)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
+      '@floating-ui/react-dom': 2.1.8(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
+      '@floating-ui/utils': 0.2.11
+      react: 19.2.5
+      react-dom: 19.2.5(react@19.2.5)
+      reselect: 5.1.1
+      tabbable: 6.4.0
+      use-sync-external-store: 1.6.0(react@19.2.5)
+    optionalDependencies:
+      '@types/react': 19.2.14
+
+  '@base-ui-components/utils@0.2.2(@types/react@19.2.14)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)':
+    dependencies:
+      '@babel/runtime': 7.29.2
+      '@floating-ui/utils': 0.2.11
+      react: 19.2.5
+      react-dom: 19.2.5(react@19.2.5)
+      reselect: 5.1.1
+      use-sync-external-store: 1.6.0(react@19.2.5)
+    optionalDependencies:
+      '@types/react': 19.2.14
+
+  '@base-ui/react@1.4.1(@types/react@19.2.14)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)':
+    dependencies:
+      '@babel/runtime': 7.29.2
+      '@base-ui/utils': 0.2.8(@types/react@19.2.14)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
+      '@floating-ui/react-dom': 2.1.8(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
+      '@floating-ui/utils': 0.2.11
+      react: 19.2.5
+      react-dom: 19.2.5(react@19.2.5)
+      use-sync-external-store: 1.6.0(react@19.2.5)
+    optionalDependencies:
+      '@types/react': 19.2.14
+
+  '@base-ui/utils@0.2.8(@types/react@19.2.14)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)':
+    dependencies:
+      '@babel/runtime': 7.29.2
+      '@floating-ui/utils': 0.2.11
+      react: 19.2.5
+      react-dom: 19.2.5(react@19.2.5)
+      reselect: 5.1.1
+      use-sync-external-store: 1.6.0(react@19.2.5)
+    optionalDependencies:
+      '@types/react': 19.2.14
+
+  '@bramus/specificity@2.4.2':
+    dependencies:
+      css-tree: 3.2.1
+
+  '@csstools/color-helpers@6.0.2': {}
+
+  '@csstools/css-calc@3.2.0(@csstools/css-parser-algorithms@4.0.0(@csstools/css-tokenizer@4.0.0))(@csstools/css-tokenizer@4.0.0)':
+    dependencies:
+      '@csstools/css-parser-algorithms': 4.0.0(@csstools/css-tokenizer@4.0.0)
+      '@csstools/css-tokenizer': 4.0.0
+
+  '@csstools/css-color-parser@4.1.0(@csstools/css-parser-algorithms@4.0.0(@csstools/css-tokenizer@4.0.0))(@csstools/css-tokenizer@4.0.0)':
+    dependencies:
+      '@csstools/color-helpers': 6.0.2
+      '@csstools/css-calc': 3.2.0(@csstools/css-parser-algorithms@4.0.0(@csstools/css-tokenizer@4.0.0))(@csstools/css-tokenizer@4.0.0)
+      '@csstools/css-parser-algorithms': 4.0.0(@csstools/css-tokenizer@4.0.0)
+      '@csstools/css-tokenizer': 4.0.0
+
+  '@csstools/css-parser-algorithms@4.0.0(@csstools/css-tokenizer@4.0.0)':
+    dependencies:
+      '@csstools/css-tokenizer': 4.0.0
+
+  '@csstools/css-syntax-patches-for-csstree@1.1.3(css-tree@3.2.1)':
+    optionalDependencies:
+      css-tree: 3.2.1
+
+  '@csstools/css-tokenizer@4.0.0': {}
+
+  '@emnapi/core@1.9.2':
+    dependencies:
+      '@emnapi/wasi-threads': 1.2.1
+      tslib: 2.8.1
+    optional: true
+
+  '@emnapi/runtime@1.9.2':
+    dependencies:
+      tslib: 2.8.1
+    optional: true
+
+  '@emnapi/wasi-threads@1.2.1':
+    dependencies:
+      tslib: 2.8.1
+    optional: true
+
+  '@eslint-community/eslint-utils@4.9.1(eslint@9.39.4(jiti@2.6.1))':
+    dependencies:
+      eslint: 9.39.4(jiti@2.6.1)
+      eslint-visitor-keys: 3.4.3
+
+  '@eslint-community/regexpp@4.12.2': {}
+
+  '@eslint/config-array@0.21.2':
+    dependencies:
+      '@eslint/object-schema': 2.1.7
+      debug: 4.4.3
+      minimatch: 3.1.5
+    transitivePeerDependencies:
+      - supports-color
+
+  '@eslint/config-helpers@0.4.2':
+    dependencies:
+      '@eslint/core': 0.17.0
+
+  '@eslint/core@0.17.0':
+    dependencies:
+      '@types/json-schema': 7.0.15
+
+  '@eslint/eslintrc@3.3.5':
+    dependencies:
+      ajv: 6.14.0
+      debug: 4.4.3
+      espree: 10.4.0
+      globals: 14.0.0
+      ignore: 5.3.2
+      import-fresh: 3.3.1
+      js-yaml: 4.1.1
+      minimatch: 3.1.5
+      strip-json-comments: 3.1.1
+    transitivePeerDependencies:
+      - supports-color
+
+  '@eslint/js@9.39.4': {}
+
+  '@eslint/object-schema@2.1.7': {}
+
+  '@eslint/plugin-kit@0.4.1':
+    dependencies:
+      '@eslint/core': 0.17.0
+      levn: 0.4.1
+
+  '@exodus/bytes@1.15.0': {}
+
+  '@floating-ui/core@1.7.5':
+    dependencies:
+      '@floating-ui/utils': 0.2.11
+
+  '@floating-ui/dom@1.7.6':
+    dependencies:
+      '@floating-ui/core': 1.7.5
+      '@floating-ui/utils': 0.2.11
+
+  '@floating-ui/react-dom@2.1.8(react-dom@19.2.5(react@19.2.5))(react@19.2.5)':
+    dependencies:
+      '@floating-ui/dom': 1.7.6
+      react: 19.2.5
+      react-dom: 19.2.5(react@19.2.5)
+
+  '@floating-ui/utils@0.2.11': {}
+
+  '@fontsource-variable/geist@5.2.8': {}
+
+  '@humanfs/core@0.19.2':
+    dependencies:
+      '@humanfs/types': 0.15.0
+
+  '@humanfs/node@0.16.8':
+    dependencies:
+      '@humanfs/core': 0.19.2
+      '@humanfs/types': 0.15.0
+      '@humanwhocodes/retry': 0.4.3
+
+  '@humanfs/types@0.15.0': {}
+
+  '@humanwhocodes/module-importer@1.0.1': {}
+
+  '@humanwhocodes/retry@0.4.3': {}
+
+  '@jridgewell/gen-mapping@0.3.13':
+    dependencies:
+      '@jridgewell/sourcemap-codec': 1.5.5
+      '@jridgewell/trace-mapping': 0.3.31
+
+  '@jridgewell/remapping@2.3.5':
+    dependencies:
+      '@jridgewell/gen-mapping': 0.3.13
+      '@jridgewell/trace-mapping': 0.3.31
+
+  '@jridgewell/resolve-uri@3.1.2': {}
+
+  '@jridgewell/sourcemap-codec@1.5.5': {}
+
+  '@jridgewell/trace-mapping@0.3.31':
+    dependencies:
+      '@jridgewell/resolve-uri': 3.1.2
+      '@jridgewell/sourcemap-codec': 1.5.5
+
+  '@monaco-editor/loader@1.7.0':
+    dependencies:
+      state-local: 1.0.7
+
+  '@monaco-editor/react@4.7.0(monaco-editor@0.55.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)':
+    dependencies:
+      '@monaco-editor/loader': 1.7.0
+      monaco-editor: 0.55.1
+      react: 19.2.5
+      react-dom: 19.2.5(react@19.2.5)
+
+  '@napi-rs/wasm-runtime@1.1.4(@emnapi/core@1.9.2)(@emnapi/runtime@1.9.2)':
+    dependencies:
+      '@emnapi/core': 1.9.2
+      '@emnapi/runtime': 1.9.2
+      '@tybys/wasm-util': 0.10.1
+    optional: true
+
+  '@novnc/novnc@1.6.0': {}
+
+  '@oxc-project/types@0.124.0': {}
+
+  '@polka/url@1.0.0-next.29': {}
+
+  '@rjsf/core@5.24.13(@rjsf/utils@5.24.13(react@19.2.5))(react@19.2.5)':
+    dependencies:
+      '@rjsf/utils': 5.24.13(react@19.2.5)
+      lodash: 4.18.1
+      lodash-es: 4.18.1
+      markdown-to-jsx: 7.7.17(react@19.2.5)
+      prop-types: 15.8.1
+      react: 19.2.5
+
+  '@rjsf/utils@5.24.13(react@19.2.5)':
+    dependencies:
+      json-schema-merge-allof: 0.8.1
+      jsonpointer: 5.0.1
+      lodash: 4.18.1
+      lodash-es: 4.18.1
+      react: 19.2.5
+      react-is: 18.3.1
+
+  '@rjsf/validator-ajv8@5.24.13(@rjsf/utils@5.24.13(react@19.2.5))':
+    dependencies:
+      '@rjsf/utils': 5.24.13(react@19.2.5)
+      ajv: 8.18.0
+      ajv-formats: 2.1.1(ajv@8.18.0)
+      lodash: 4.18.1
+      lodash-es: 4.18.1
+
+  '@rolldown/binding-android-arm64@1.0.0-rc.15':
+    optional: true
+
+  '@rolldown/binding-darwin-arm64@1.0.0-rc.15':
+    optional: true
+
+  '@rolldown/binding-darwin-x64@1.0.0-rc.15':
+    optional: true
+
+  '@rolldown/binding-freebsd-x64@1.0.0-rc.15':
+    optional: true
+
+  '@rolldown/binding-linux-arm-gnueabihf@1.0.0-rc.15':
+    optional: true
+
+  '@rolldown/binding-linux-arm64-gnu@1.0.0-rc.15':
+    optional: true
+
+  '@rolldown/binding-linux-arm64-musl@1.0.0-rc.15':
+    optional: true
+
+  '@rolldown/binding-linux-ppc64-gnu@1.0.0-rc.15':
+    optional: true
+
+  '@rolldown/binding-linux-s390x-gnu@1.0.0-rc.15':
+    optional: true
+
+  '@rolldown/binding-linux-x64-gnu@1.0.0-rc.15':
+    optional: true
+
+  '@rolldown/binding-linux-x64-musl@1.0.0-rc.15':
+    optional: true
+
+  '@rolldown/binding-openharmony-arm64@1.0.0-rc.15':
+    optional: true
+
+  '@rolldown/binding-wasm32-wasi@1.0.0-rc.15':
+    dependencies:
+      '@emnapi/core': 1.9.2
+      '@emnapi/runtime': 1.9.2
+      '@napi-rs/wasm-runtime': 1.1.4(@emnapi/core@1.9.2)(@emnapi/runtime@1.9.2)
+    optional: true
+
+  '@rolldown/binding-win32-arm64-msvc@1.0.0-rc.15':
+    optional: true
+
+  '@rolldown/binding-win32-x64-msvc@1.0.0-rc.15':
+    optional: true
+
+  '@rolldown/pluginutils@1.0.0-rc.15': {}
+
+  '@rolldown/pluginutils@1.0.0-rc.7': {}
+
+  '@standard-schema/spec@1.1.0': {}
+
+  '@tailwindcss/node@4.2.2':
+    dependencies:
+      '@jridgewell/remapping': 2.3.5
+      enhanced-resolve: 5.20.1
+      jiti: 2.6.1
+      lightningcss: 1.32.0
+      magic-string: 0.30.21
+      source-map-js: 1.2.1
+      tailwindcss: 4.2.2
+
+  '@tailwindcss/oxide-android-arm64@4.2.2':
+    optional: true
+
+  '@tailwindcss/oxide-darwin-arm64@4.2.2':
+    optional: true
+
+  '@tailwindcss/oxide-darwin-x64@4.2.2':
+    optional: true
+
+  '@tailwindcss/oxide-freebsd-x64@4.2.2':
+    optional: true
+
+  '@tailwindcss/oxide-linux-arm-gnueabihf@4.2.2':
+    optional: true
+
+  '@tailwindcss/oxide-linux-arm64-gnu@4.2.2':
+    optional: true
+
+  '@tailwindcss/oxide-linux-arm64-musl@4.2.2':
+    optional: true
+
+  '@tailwindcss/oxide-linux-x64-gnu@4.2.2':
+    optional: true
+
+  '@tailwindcss/oxide-linux-x64-musl@4.2.2':
+    optional: true
+
+  '@tailwindcss/oxide-wasm32-wasi@4.2.2':
+    optional: true
+
+  '@tailwindcss/oxide-win32-arm64-msvc@4.2.2':
+    optional: true
+
+  '@tailwindcss/oxide-win32-x64-msvc@4.2.2':
+    optional: true
+
+  '@tailwindcss/oxide@4.2.2':
+    optionalDependencies:
+      '@tailwindcss/oxide-android-arm64': 4.2.2
+      '@tailwindcss/oxide-darwin-arm64': 4.2.2
+      '@tailwindcss/oxide-darwin-x64': 4.2.2
+      '@tailwindcss/oxide-freebsd-x64': 4.2.2
+      '@tailwindcss/oxide-linux-arm-gnueabihf': 4.2.2
+      '@tailwindcss/oxide-linux-arm64-gnu': 4.2.2
+      '@tailwindcss/oxide-linux-arm64-musl': 4.2.2
+      '@tailwindcss/oxide-linux-x64-gnu': 4.2.2
+      '@tailwindcss/oxide-linux-x64-musl': 4.2.2
+      '@tailwindcss/oxide-wasm32-wasi': 4.2.2
+      '@tailwindcss/oxide-win32-arm64-msvc': 4.2.2
+      '@tailwindcss/oxide-win32-x64-msvc': 4.2.2
+
+  '@tailwindcss/vite@4.2.2(vite@8.0.8(@types/node@24.12.2)(jiti@2.6.1))':
+    dependencies:
+      '@tailwindcss/node': 4.2.2
+      '@tailwindcss/oxide': 4.2.2
+      tailwindcss: 4.2.2
+      vite: 8.0.8(@types/node@24.12.2)(jiti@2.6.1)
+
+  '@tanstack/query-core@5.99.1': {}
+
+  '@tanstack/react-query@5.99.1(react@19.2.5)':
+    dependencies:
+      '@tanstack/query-core': 5.99.1
+      react: 19.2.5
+
+  '@testing-library/dom@10.4.1':
+    dependencies:
+      '@babel/code-frame': 7.29.0
+      '@babel/runtime': 7.29.2
+      '@types/aria-query': 5.0.4
+      aria-query: 5.3.0
+      dom-accessibility-api: 0.5.16
+      lz-string: 1.5.0
+      picocolors: 1.1.1
+      pretty-format: 27.5.1
+
+  '@testing-library/jest-dom@6.9.1':
+    dependencies:
+      '@adobe/css-tools': 4.4.4
+      aria-query: 5.3.2
+      css.escape: 1.5.1
+      dom-accessibility-api: 0.6.3
+      picocolors: 1.1.1
+      redent: 3.0.0
+
+  '@testing-library/react@16.3.2(@testing-library/dom@10.4.1)(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)':
+    dependencies:
+      '@babel/runtime': 7.29.2
+      '@testing-library/dom': 10.4.1
+      react: 19.2.5
+      react-dom: 19.2.5(react@19.2.5)
+    optionalDependencies:
+      '@types/react': 19.2.14
+      '@types/react-dom': 19.2.3(@types/react@19.2.14)
+
+  '@testing-library/user-event@14.6.1(@testing-library/dom@10.4.1)':
+    dependencies:
+      '@testing-library/dom': 10.4.1
+
+  '@tybys/wasm-util@0.10.1':
+    dependencies:
+      tslib: 2.8.1
+    optional: true
+
+  '@types/aria-query@5.0.4': {}
+
+  '@types/chai@5.2.3':
+    dependencies:
+      '@types/deep-eql': 4.0.2
+      assertion-error: 2.0.1
+
+  '@types/deep-eql@4.0.2': {}
+
+  '@types/estree@1.0.8': {}
+
+  '@types/js-yaml@4.0.9': {}
+
+  '@types/json-schema@7.0.15': {}
+
+  '@types/node@24.12.2':
+    dependencies:
+      undici-types: 7.16.0
+
+  '@types/react-dom@19.2.3(@types/react@19.2.14)':
+    dependencies:
+      '@types/react': 19.2.14
+
+  '@types/react@19.2.14':
+    dependencies:
+      csstype: 3.2.3
+
+  '@types/trusted-types@2.0.7':
+    optional: true
+
+  '@typescript-eslint/eslint-plugin@8.58.2(@typescript-eslint/parser@8.58.2(eslint@9.39.4(jiti@2.6.1))(typescript@6.0.3))(eslint@9.39.4(jiti@2.6.1))(typescript@6.0.3)':
+    dependencies:
+      '@eslint-community/regexpp': 4.12.2
+      '@typescript-eslint/parser': 8.58.2(eslint@9.39.4(jiti@2.6.1))(typescript@6.0.3)
+      '@typescript-eslint/scope-manager': 8.58.2
+      '@typescript-eslint/type-utils': 8.58.2(eslint@9.39.4(jiti@2.6.1))(typescript@6.0.3)
+      '@typescript-eslint/utils': 8.58.2(eslint@9.39.4(jiti@2.6.1))(typescript@6.0.3)
+      '@typescript-eslint/visitor-keys': 8.58.2
+      eslint: 9.39.4(jiti@2.6.1)
+      ignore: 7.0.5
+      natural-compare: 1.4.0
+      ts-api-utils: 2.5.0(typescript@6.0.3)
+      typescript: 6.0.3
+    transitivePeerDependencies:
+      - supports-color
+
+  '@typescript-eslint/parser@8.58.2(eslint@9.39.4(jiti@2.6.1))(typescript@6.0.3)':
+    dependencies:
+      '@typescript-eslint/scope-manager': 8.58.2
+      '@typescript-eslint/types': 8.58.2
+      '@typescript-eslint/typescript-estree': 8.58.2(typescript@6.0.3)
+      '@typescript-eslint/visitor-keys': 8.58.2
+      debug: 4.4.3
+      eslint: 9.39.4(jiti@2.6.1)
+      typescript: 6.0.3
+    transitivePeerDependencies:
+      - supports-color
+
+  '@typescript-eslint/project-service@8.58.2(typescript@6.0.3)':
+    dependencies:
+      '@typescript-eslint/tsconfig-utils': 8.58.2(typescript@6.0.3)
+      '@typescript-eslint/types': 8.58.2
+      debug: 4.4.3
+      typescript: 6.0.3
+    transitivePeerDependencies:
+      - supports-color
+
+  '@typescript-eslint/scope-manager@8.58.2':
+    dependencies:
+      '@typescript-eslint/types': 8.58.2
+      '@typescript-eslint/visitor-keys': 8.58.2
+
+  '@typescript-eslint/tsconfig-utils@8.58.2(typescript@6.0.3)':
+    dependencies:
+      typescript: 6.0.3
+
+  '@typescript-eslint/type-utils@8.58.2(eslint@9.39.4(jiti@2.6.1))(typescript@6.0.3)':
+    dependencies:
+      '@typescript-eslint/types': 8.58.2
+      '@typescript-eslint/typescript-estree': 8.58.2(typescript@6.0.3)
+      '@typescript-eslint/utils': 8.58.2(eslint@9.39.4(jiti@2.6.1))(typescript@6.0.3)
+      debug: 4.4.3
+      eslint: 9.39.4(jiti@2.6.1)
+      ts-api-utils: 2.5.0(typescript@6.0.3)
+      typescript: 6.0.3
+    transitivePeerDependencies:
+      - supports-color
+
+  '@typescript-eslint/types@8.58.2': {}
+
+  '@typescript-eslint/typescript-estree@8.58.2(typescript@6.0.3)':
+    dependencies:
+      '@typescript-eslint/project-service': 8.58.2(typescript@6.0.3)
+      '@typescript-eslint/tsconfig-utils': 8.58.2(typescript@6.0.3)
+      '@typescript-eslint/types': 8.58.2
+      '@typescript-eslint/visitor-keys': 8.58.2
+      debug: 4.4.3
+      minimatch: 10.2.5
+      semver: 7.7.4
+      tinyglobby: 0.2.16
+      ts-api-utils: 2.5.0(typescript@6.0.3)
+      typescript: 6.0.3
+    transitivePeerDependencies:
+      - supports-color
+
+  '@typescript-eslint/utils@8.58.2(eslint@9.39.4(jiti@2.6.1))(typescript@6.0.3)':
+    dependencies:
+      '@eslint-community/eslint-utils': 4.9.1(eslint@9.39.4(jiti@2.6.1))
+      '@typescript-eslint/scope-manager': 8.58.2
+      '@typescript-eslint/types': 8.58.2
+      '@typescript-eslint/typescript-estree': 8.58.2(typescript@6.0.3)
+      eslint: 9.39.4(jiti@2.6.1)
+      typescript: 6.0.3
+    transitivePeerDependencies:
+      - supports-color
+
+  '@typescript-eslint/visitor-keys@8.58.2':
+    dependencies:
+      '@typescript-eslint/types': 8.58.2
+      eslint-visitor-keys: 5.0.1
+
+  '@vitejs/plugin-react@6.0.1(vite@8.0.8(@types/node@24.12.2)(jiti@2.6.1))':
+    dependencies:
+      '@rolldown/pluginutils': 1.0.0-rc.7
+      vite: 8.0.8(@types/node@24.12.2)(jiti@2.6.1)
+
+  '@vitest/expect@4.1.6':
+    dependencies:
+      '@standard-schema/spec': 1.1.0
+      '@types/chai': 5.2.3
+      '@vitest/spy': 4.1.6
+      '@vitest/utils': 4.1.6
+      chai: 6.2.2
+      tinyrainbow: 3.1.0
+
+  '@vitest/mocker@4.1.6(vite@8.0.8(@types/node@24.12.2)(jiti@2.6.1))':
+    dependencies:
+      '@vitest/spy': 4.1.6
+      estree-walker: 3.0.3
+      magic-string: 0.30.21
+    optionalDependencies:
+      vite: 8.0.8(@types/node@24.12.2)(jiti@2.6.1)
+
+  '@vitest/pretty-format@4.1.6':
+    dependencies:
+      tinyrainbow: 3.1.0
+
+  '@vitest/runner@4.1.6':
+    dependencies:
+      '@vitest/utils': 4.1.6
+      pathe: 2.0.3
+
+  '@vitest/snapshot@4.1.6':
+    dependencies:
+      '@vitest/pretty-format': 4.1.6
+      '@vitest/utils': 4.1.6
+      magic-string: 0.30.21
+      pathe: 2.0.3
+
+  '@vitest/spy@4.1.6': {}
+
+  '@vitest/ui@4.1.6(vitest@4.1.6)':
+    dependencies:
+      '@vitest/utils': 4.1.6
+      fflate: 0.8.2
+      flatted: 3.4.2
+      pathe: 2.0.3
+      sirv: 3.0.2
+      tinyglobby: 0.2.16
+      tinyrainbow: 3.1.0
+      vitest: 4.1.6(@types/node@24.12.2)(@vitest/ui@4.1.6)(jsdom@29.1.1)(vite@8.0.8(@types/node@24.12.2)(jiti@2.6.1))
+
+  '@vitest/utils@4.1.6':
+    dependencies:
+      '@vitest/pretty-format': 4.1.6
+      convert-source-map: 2.0.0
+      tinyrainbow: 3.1.0
+
+  '@xterm/addon-fit@0.11.0': {}
+
+  '@xterm/xterm@6.0.0': {}
+
+  acorn-jsx@5.3.2(acorn@8.16.0):
+    dependencies:
+      acorn: 8.16.0
+
+  acorn@8.16.0: {}
+
+  ajv-formats@2.1.1(ajv@8.18.0):
+    optionalDependencies:
+      ajv: 8.18.0
+
+  ajv@6.14.0:
+    dependencies:
+      fast-deep-equal: 3.1.3
+      fast-json-stable-stringify: 2.1.0
+      json-schema-traverse: 0.4.1
+      uri-js: 4.4.1
+
+  ajv@8.18.0:
+    dependencies:
+      fast-deep-equal: 3.1.3
+      fast-uri: 3.1.0
+      json-schema-traverse: 1.0.0
+      require-from-string: 2.0.2
+
+  ansi-regex@5.0.1: {}
+
+  ansi-styles@4.3.0:
+    dependencies:
+      color-convert: 2.0.1
+
+  ansi-styles@5.2.0: {}
+
+  argparse@2.0.1: {}
+
+  aria-query@5.3.0:
+    dependencies:
+      dequal: 2.0.3
+
+  aria-query@5.3.2: {}
+
+  assertion-error@2.0.1: {}
+
+  balanced-match@1.0.2: {}
+
+  balanced-match@4.0.4: {}
+
+  baseline-browser-mapping@2.10.20: {}
+
+  bidi-js@1.0.3:
+    dependencies:
+      require-from-string: 2.0.2
+
+  brace-expansion@1.1.14:
+    dependencies:
+      balanced-match: 1.0.2
+      concat-map: 0.0.1
+
+  brace-expansion@5.0.5:
+    dependencies:
+      balanced-match: 4.0.4
+
+  browserslist@4.28.2:
+    dependencies:
+      baseline-browser-mapping: 2.10.20
+      caniuse-lite: 1.0.30001788
+      electron-to-chromium: 1.5.340
+      node-releases: 2.0.37
+      update-browserslist-db: 1.2.3(browserslist@4.28.2)
+
+  callsites@3.1.0: {}
+
+  caniuse-lite@1.0.30001788: {}
+
+  chai@6.2.2: {}
+
+  chalk@4.1.2:
+    dependencies:
+      ansi-styles: 4.3.0
+      supports-color: 7.2.0
+
+  class-variance-authority@0.7.1:
+    dependencies:
+      clsx: 2.1.1
+
+  clsx@2.1.1: {}
+
+  color-convert@2.0.1:
+    dependencies:
+      color-name: 1.1.4
+
+  color-name@1.1.4: {}
+
+  compute-gcd@1.2.1:
+    dependencies:
+      validate.io-array: 1.0.6
+      validate.io-function: 1.0.2
+      validate.io-integer-array: 1.0.0
+
+  compute-lcm@1.1.2:
+    dependencies:
+      compute-gcd: 1.2.1
+      validate.io-array: 1.0.6
+      validate.io-function: 1.0.2
+      validate.io-integer-array: 1.0.0
+
+  concat-map@0.0.1: {}
+
+  convert-source-map@2.0.0: {}
+
+  cookie@1.1.1: {}
+
+  cross-spawn@7.0.6:
+    dependencies:
+      path-key: 3.1.1
+      shebang-command: 2.0.0
+      which: 2.0.2
+
+  css-tree@3.2.1:
+    dependencies:
+      mdn-data: 2.27.1
+      source-map-js: 1.2.1
+
+  css.escape@1.5.1: {}
+
+  csstype@3.2.3: {}
+
+  data-urls@7.0.0:
+    dependencies:
+      whatwg-mimetype: 5.0.0
+      whatwg-url: 16.0.1
+    transitivePeerDependencies:
+      - '@noble/hashes'
+
+  debug@4.4.3:
+    dependencies:
+      ms: 2.1.3
+
+  decimal.js@10.6.0: {}
+
+  deep-is@0.1.4: {}
+
+  dequal@2.0.3: {}
+
+  detect-libc@2.1.2: {}
+
+  dom-accessibility-api@0.5.16: {}
+
+  dom-accessibility-api@0.6.3: {}
+
+  dompurify@3.2.7:
+    optionalDependencies:
+      '@types/trusted-types': 2.0.7
+
+  electron-to-chromium@1.5.340: {}
+
+  enhanced-resolve@5.20.1:
+    dependencies:
+      graceful-fs: 4.2.11
+      tapable: 2.3.2
+
+  entities@8.0.0: {}
+
+  es-module-lexer@2.1.0: {}
+
+  escalade@3.2.0: {}
+
+  escape-string-regexp@4.0.0: {}
+
+  eslint-plugin-react-hooks@7.1.1(eslint@9.39.4(jiti@2.6.1)):
+    dependencies:
+      '@babel/core': 7.29.0
+      '@babel/parser': 7.29.2
+      eslint: 9.39.4(jiti@2.6.1)
+      hermes-parser: 0.25.1
+      zod: 4.3.6
+      zod-validation-error: 4.0.2(zod@4.3.6)
+    transitivePeerDependencies:
+      - supports-color
+
+  eslint-plugin-react-refresh@0.5.2(eslint@9.39.4(jiti@2.6.1)):
+    dependencies:
+      eslint: 9.39.4(jiti@2.6.1)
+
+  eslint-scope@8.4.0:
+    dependencies:
+      esrecurse: 4.3.0
+      estraverse: 5.3.0
+
+  eslint-visitor-keys@3.4.3: {}
+
+  eslint-visitor-keys@4.2.1: {}
+
+  eslint-visitor-keys@5.0.1: {}
+
+  eslint@9.39.4(jiti@2.6.1):
+    dependencies:
+      '@eslint-community/eslint-utils': 4.9.1(eslint@9.39.4(jiti@2.6.1))
+      '@eslint-community/regexpp': 4.12.2
+      '@eslint/config-array': 0.21.2
+      '@eslint/config-helpers': 0.4.2
+      '@eslint/core': 0.17.0
+      '@eslint/eslintrc': 3.3.5
+      '@eslint/js': 9.39.4
+      '@eslint/plugin-kit': 0.4.1
+      '@humanfs/node': 0.16.8
+      '@humanwhocodes/module-importer': 1.0.1
+      '@humanwhocodes/retry': 0.4.3
+      '@types/estree': 1.0.8
+      ajv: 6.14.0
+      chalk: 4.1.2
+      cross-spawn: 7.0.6
+      debug: 4.4.3
+      escape-string-regexp: 4.0.0
+      eslint-scope: 8.4.0
+      eslint-visitor-keys: 4.2.1
+      espree: 10.4.0
+      esquery: 1.7.0
+      esutils: 2.0.3
+      fast-deep-equal: 3.1.3
+      file-entry-cache: 8.0.0
+      find-up: 5.0.0
+      glob-parent: 6.0.2
+      ignore: 5.3.2
+      imurmurhash: 0.1.4
+      is-glob: 4.0.3
+      json-stable-stringify-without-jsonify: 1.0.1
+      lodash.merge: 4.6.2
+      minimatch: 3.1.5
+      natural-compare: 1.4.0
+      optionator: 0.9.4
+    optionalDependencies:
+      jiti: 2.6.1
+    transitivePeerDependencies:
+      - supports-color
+
+  espree@10.4.0:
+    dependencies:
+      acorn: 8.16.0
+      acorn-jsx: 5.3.2(acorn@8.16.0)
+      eslint-visitor-keys: 4.2.1
+
+  esquery@1.7.0:
+    dependencies:
+      estraverse: 5.3.0
+
+  esrecurse@4.3.0:
+    dependencies:
+      estraverse: 5.3.0
+
+  estraverse@5.3.0: {}
+
+  estree-walker@3.0.3:
+    dependencies:
+      '@types/estree': 1.0.8
+
+  esutils@2.0.3: {}
+
+  expect-type@1.3.0: {}
+
+  fast-deep-equal@3.1.3: {}
+
+  fast-json-stable-stringify@2.1.0: {}
+
+  fast-levenshtein@2.0.6: {}
+
+  fast-uri@3.1.0: {}
+
+  fdir@6.5.0(picomatch@4.0.4):
+    optionalDependencies:
+      picomatch: 4.0.4
+
+  fflate@0.8.2: {}
+
+  file-entry-cache@8.0.0:
+    dependencies:
+      flat-cache: 4.0.1
+
+  find-up@5.0.0:
+    dependencies:
+      locate-path: 6.0.0
+      path-exists: 4.0.0
+
+  flat-cache@4.0.1:
+    dependencies:
+      flatted: 3.4.2
+      keyv: 4.5.4
+
+  flatted@3.4.2: {}
+
+  fsevents@2.3.3:
+    optional: true
+
+  gensync@1.0.0-beta.2: {}
+
+  glob-parent@6.0.2:
+    dependencies:
+      is-glob: 4.0.3
+
+  globals@14.0.0: {}
+
+  globals@17.5.0: {}
+
+  graceful-fs@4.2.11: {}
+
+  has-flag@4.0.0: {}
+
+  hermes-estree@0.25.1: {}
+
+  hermes-parser@0.25.1:
+    dependencies:
+      hermes-estree: 0.25.1
+
+  html-encoding-sniffer@6.0.0:
+    dependencies:
+      '@exodus/bytes': 1.15.0
+    transitivePeerDependencies:
+      - '@noble/hashes'
+
+  ignore@5.3.2: {}
+
+  ignore@7.0.5: {}
+
+  import-fresh@3.3.1:
+    dependencies:
+      parent-module: 1.0.1
+      resolve-from: 4.0.0
+
+  imurmurhash@0.1.4: {}
+
+  indent-string@4.0.0: {}
+
+  is-extglob@2.1.1: {}
+
+  is-glob@4.0.3:
+    dependencies:
+      is-extglob: 2.1.1
+
+  is-potential-custom-element-name@1.0.1: {}
+
+  isexe@2.0.0: {}
+
+  jiti@2.6.1: {}
+
+  js-tokens@4.0.0: {}
+
+  js-yaml@4.1.1:
+    dependencies:
+      argparse: 2.0.1
+
+  jsdom@29.1.1:
+    dependencies:
+      '@asamuzakjp/css-color': 5.1.11
+      '@asamuzakjp/dom-selector': 7.1.1
+      '@bramus/specificity': 2.4.2
+      '@csstools/css-syntax-patches-for-csstree': 1.1.3(css-tree@3.2.1)
+      '@exodus/bytes': 1.15.0
+      css-tree: 3.2.1
+      data-urls: 7.0.0
+      decimal.js: 10.6.0
+      html-encoding-sniffer: 6.0.0
+      is-potential-custom-element-name: 1.0.1
+      lru-cache: 11.3.6
+      parse5: 8.0.1
+      saxes: 6.0.0
+      symbol-tree: 3.2.4
+      tough-cookie: 6.0.1
+      undici: 7.25.0
+      w3c-xmlserializer: 5.0.0
+      webidl-conversions: 8.0.1
+      whatwg-mimetype: 5.0.0
+      whatwg-url: 16.0.1
+      xml-name-validator: 5.0.0
+    transitivePeerDependencies:
+      - '@noble/hashes'
+
+  jsesc@3.1.0: {}
+
+  json-buffer@3.0.1: {}
+
+  json-schema-compare@0.2.2:
+    dependencies:
+      lodash: 4.18.1
+
+  json-schema-merge-allof@0.8.1:
+    dependencies:
+      compute-lcm: 1.1.2
+      json-schema-compare: 0.2.2
+      lodash: 4.18.1
+
+  json-schema-traverse@0.4.1: {}
+
+  json-schema-traverse@1.0.0: {}
+
+  json-stable-stringify-without-jsonify@1.0.1: {}
+
+  json5@2.2.3: {}
+
+  jsonpointer@5.0.1: {}
+
+  keyv@4.5.4:
+    dependencies:
+      json-buffer: 3.0.1
+
+  levn@0.4.1:
+    dependencies:
+      prelude-ls: 1.2.1
+      type-check: 0.4.0
+
+  lightningcss-android-arm64@1.32.0:
+    optional: true
+
+  lightningcss-darwin-arm64@1.32.0:
+    optional: true
+
+  lightningcss-darwin-x64@1.32.0:
+    optional: true
+
+  lightningcss-freebsd-x64@1.32.0:
+    optional: true
+
+  lightningcss-linux-arm-gnueabihf@1.32.0:
+    optional: true
+
+  lightningcss-linux-arm64-gnu@1.32.0:
+    optional: true
+
+  lightningcss-linux-arm64-musl@1.32.0:
+    optional: true
+
+  lightningcss-linux-x64-gnu@1.32.0:
+    optional: true
+
+  lightningcss-linux-x64-musl@1.32.0:
+    optional: true
+
+  lightningcss-win32-arm64-msvc@1.32.0:
+    optional: true
+
+  lightningcss-win32-x64-msvc@1.32.0:
+    optional: true
+
+  lightningcss@1.32.0:
+    dependencies:
+      detect-libc: 2.1.2
+    optionalDependencies:
+      lightningcss-android-arm64: 1.32.0
+      lightningcss-darwin-arm64: 1.32.0
+      lightningcss-darwin-x64: 1.32.0
+      lightningcss-freebsd-x64: 1.32.0
+      lightningcss-linux-arm-gnueabihf: 1.32.0
+      lightningcss-linux-arm64-gnu: 1.32.0
+      lightningcss-linux-arm64-musl: 1.32.0
+      lightningcss-linux-x64-gnu: 1.32.0
+      lightningcss-linux-x64-musl: 1.32.0
+      lightningcss-win32-arm64-msvc: 1.32.0
+      lightningcss-win32-x64-msvc: 1.32.0
+
+  locate-path@6.0.0:
+    dependencies:
+      p-locate: 5.0.0
+
+  lodash-es@4.18.1: {}
+
+  lodash.merge@4.6.2: {}
+
+  lodash@4.18.1: {}
+
+  loose-envify@1.4.0:
+    dependencies:
+      js-tokens: 4.0.0
+
+  lru-cache@11.3.6: {}
+
+  lru-cache@5.1.1:
+    dependencies:
+      yallist: 3.1.1
+
+  lucide-react@0.484.0(react@19.2.5):
+    dependencies:
+      react: 19.2.5
+
+  lz-string@1.5.0: {}
+
+  magic-string@0.30.21:
+    dependencies:
+      '@jridgewell/sourcemap-codec': 1.5.5
+
+  markdown-to-jsx@7.7.17(react@19.2.5):
+    optionalDependencies:
+      react: 19.2.5
+
+  marked@14.0.0: {}
+
+  mdn-data@2.27.1: {}
+
+  min-indent@1.0.1: {}
+
+  minimatch@10.2.5:
+    dependencies:
+      brace-expansion: 5.0.5
+
+  minimatch@3.1.5:
+    dependencies:
+      brace-expansion: 1.1.14
+
+  monaco-editor@0.55.1:
+    dependencies:
+      dompurify: 3.2.7
+      marked: 14.0.0
+
+  mrmime@2.0.1: {}
+
+  ms@2.1.3: {}
+
+  nanoid@3.3.11: {}
+
+  natural-compare@1.4.0: {}
+
+  node-releases@2.0.37: {}
+
+  object-assign@4.1.1: {}
+
+  obug@2.1.1: {}
+
+  optionator@0.9.4:
+    dependencies:
+      deep-is: 0.1.4
+      fast-levenshtein: 2.0.6
+      levn: 0.4.1
+      prelude-ls: 1.2.1
+      type-check: 0.4.0
+      word-wrap: 1.2.5
+
+  p-limit@3.1.0:
+    dependencies:
+      yocto-queue: 0.1.0
+
+  p-locate@5.0.0:
+    dependencies:
+      p-limit: 3.1.0
+
+  parent-module@1.0.1:
+    dependencies:
+      callsites: 3.1.0
+
+  parse5@8.0.1:
+    dependencies:
+      entities: 8.0.0
+
+  path-exists@4.0.0: {}
+
+  path-key@3.1.1: {}
+
+  pathe@2.0.3: {}
+
+  picocolors@1.1.1: {}
+
+  picomatch@4.0.4: {}
+
+  postcss@8.5.10:
+    dependencies:
+      nanoid: 3.3.11
+      picocolors: 1.1.1
+      source-map-js: 1.2.1
+
+  prelude-ls@1.2.1: {}
+
+  pretty-format@27.5.1:
+    dependencies:
+      ansi-regex: 5.0.1
+      ansi-styles: 5.2.0
+      react-is: 17.0.2
+
+  prop-types@15.8.1:
+    dependencies:
+      loose-envify: 1.4.0
+      object-assign: 4.1.1
+      react-is: 16.13.1
+
+  punycode@2.3.1: {}
+
+  react-dom@19.2.5(react@19.2.5):
+    dependencies:
+      react: 19.2.5
+      scheduler: 0.27.0
+
+  react-is@16.13.1: {}
+
+  react-is@17.0.2: {}
+
+  react-is@18.3.1: {}
+
+  react-router@7.14.1(react-dom@19.2.5(react@19.2.5))(react@19.2.5):
+    dependencies:
+      cookie: 1.1.1
+      react: 19.2.5
+      set-cookie-parser: 2.7.2
+    optionalDependencies:
+      react-dom: 19.2.5(react@19.2.5)
+
+  react@19.2.5: {}
+
+  redent@3.0.0:
+    dependencies:
+      indent-string: 4.0.0
+      strip-indent: 3.0.0
+
+  require-from-string@2.0.2: {}
+
+  reselect@5.1.1: {}
+
+  resolve-from@4.0.0: {}
+
+  rolldown@1.0.0-rc.15:
+    dependencies:
+      '@oxc-project/types': 0.124.0
+      '@rolldown/pluginutils': 1.0.0-rc.15
+    optionalDependencies:
+      '@rolldown/binding-android-arm64': 1.0.0-rc.15
+      '@rolldown/binding-darwin-arm64': 1.0.0-rc.15
+      '@rolldown/binding-darwin-x64': 1.0.0-rc.15
+      '@rolldown/binding-freebsd-x64': 1.0.0-rc.15
+      '@rolldown/binding-linux-arm-gnueabihf': 1.0.0-rc.15
+      '@rolldown/binding-linux-arm64-gnu': 1.0.0-rc.15
+      '@rolldown/binding-linux-arm64-musl': 1.0.0-rc.15
+      '@rolldown/binding-linux-ppc64-gnu': 1.0.0-rc.15
+      '@rolldown/binding-linux-s390x-gnu': 1.0.0-rc.15
+      '@rolldown/binding-linux-x64-gnu': 1.0.0-rc.15
+      '@rolldown/binding-linux-x64-musl': 1.0.0-rc.15
+      '@rolldown/binding-openharmony-arm64': 1.0.0-rc.15
+      '@rolldown/binding-wasm32-wasi': 1.0.0-rc.15
+      '@rolldown/binding-win32-arm64-msvc': 1.0.0-rc.15
+      '@rolldown/binding-win32-x64-msvc': 1.0.0-rc.15
+
+  saxes@6.0.0:
+    dependencies:
+      xmlchars: 2.2.0
+
+  scheduler@0.27.0: {}
+
+  semver@6.3.1: {}
+
+  semver@7.7.4: {}
+
+  set-cookie-parser@2.7.2: {}
+
+  shebang-command@2.0.0:
+    dependencies:
+      shebang-regex: 3.0.0
+
+  shebang-regex@3.0.0: {}
+
+  siginfo@2.0.0: {}
+
+  simple-icons@16.22.0: {}
+
+  sirv@3.0.2:
+    dependencies:
+      '@polka/url': 1.0.0-next.29
+      mrmime: 2.0.1
+      totalist: 3.0.1
+
+  source-map-js@1.2.1: {}
+
+  stackback@0.0.2: {}
+
+  state-local@1.0.7: {}
+
+  std-env@4.1.0: {}
+
+  strip-indent@3.0.0:
+    dependencies:
+      min-indent: 1.0.1
+
+  strip-json-comments@3.1.1: {}
+
+  supports-color@7.2.0:
+    dependencies:
+      has-flag: 4.0.0
+
+  symbol-tree@3.2.4: {}
+
+  tabbable@6.4.0: {}
+
+  tailwind-merge@3.5.0: {}
+
+  tailwindcss@4.2.2: {}
+
+  tapable@2.3.2: {}
+
+  tinybench@2.9.0: {}
+
+  tinyexec@1.1.2: {}
+
+  tinyglobby@0.2.16:
+    dependencies:
+      fdir: 6.5.0(picomatch@4.0.4)
+      picomatch: 4.0.4
+
+  tinyrainbow@3.1.0: {}
+
+  tldts-core@7.0.30: {}
+
+  tldts@7.0.30:
+    dependencies:
+      tldts-core: 7.0.30
+
+  totalist@3.0.1: {}
+
+  tough-cookie@6.0.1:
+    dependencies:
+      tldts: 7.0.30
+
+  tr46@6.0.0:
+    dependencies:
+      punycode: 2.3.1
+
+  ts-api-utils@2.5.0(typescript@6.0.3):
+    dependencies:
+      typescript: 6.0.3
+
+  tslib@2.8.1:
+    optional: true
+
+  type-check@0.4.0:
+    dependencies:
+      prelude-ls: 1.2.1
+
+  typescript-eslint@8.58.2(eslint@9.39.4(jiti@2.6.1))(typescript@6.0.3):
+    dependencies:
+      '@typescript-eslint/eslint-plugin': 8.58.2(@typescript-eslint/parser@8.58.2(eslint@9.39.4(jiti@2.6.1))(typescript@6.0.3))(eslint@9.39.4(jiti@2.6.1))(typescript@6.0.3)
+      '@typescript-eslint/parser': 8.58.2(eslint@9.39.4(jiti@2.6.1))(typescript@6.0.3)
+      '@typescript-eslint/typescript-estree': 8.58.2(typescript@6.0.3)
+      '@typescript-eslint/utils': 8.58.2(eslint@9.39.4(jiti@2.6.1))(typescript@6.0.3)
+      eslint: 9.39.4(jiti@2.6.1)
+      typescript: 6.0.3
+    transitivePeerDependencies:
+      - supports-color
+
+  typescript@6.0.3: {}
+
+  undici-types@7.16.0: {}
+
+  undici@7.25.0: {}
+
+  update-browserslist-db@1.2.3(browserslist@4.28.2):
+    dependencies:
+      browserslist: 4.28.2
+      escalade: 3.2.0
+      picocolors: 1.1.1
+
+  uri-js@4.4.1:
+    dependencies:
+      punycode: 2.3.1
+
+  use-sync-external-store@1.6.0(react@19.2.5):
+    dependencies:
+      react: 19.2.5
+
+  validate.io-array@1.0.6: {}
+
+  validate.io-function@1.0.2: {}
+
+  validate.io-integer-array@1.0.0:
+    dependencies:
+      validate.io-array: 1.0.6
+      validate.io-integer: 1.0.5
+
+  validate.io-integer@1.0.5:
+    dependencies:
+      validate.io-number: 1.0.3
+
+  validate.io-number@1.0.3: {}
+
+  vite@8.0.8(@types/node@24.12.2)(jiti@2.6.1):
+    dependencies:
+      lightningcss: 1.32.0
+      picomatch: 4.0.4
+      postcss: 8.5.10
+      rolldown: 1.0.0-rc.15
+      tinyglobby: 0.2.16
+    optionalDependencies:
+      '@types/node': 24.12.2
+      fsevents: 2.3.3
+      jiti: 2.6.1
+
+  vitest@4.1.6(@types/node@24.12.2)(@vitest/ui@4.1.6)(jsdom@29.1.1)(vite@8.0.8(@types/node@24.12.2)(jiti@2.6.1)):
+    dependencies:
+      '@vitest/expect': 4.1.6
+      '@vitest/mocker': 4.1.6(vite@8.0.8(@types/node@24.12.2)(jiti@2.6.1))
+      '@vitest/pretty-format': 4.1.6
+      '@vitest/runner': 4.1.6
+      '@vitest/snapshot': 4.1.6
+      '@vitest/spy': 4.1.6
+      '@vitest/utils': 4.1.6
+      es-module-lexer: 2.1.0
+      expect-type: 1.3.0
+      magic-string: 0.30.21
+      obug: 2.1.1
+      pathe: 2.0.3
+      picomatch: 4.0.4
+      std-env: 4.1.0
+      tinybench: 2.9.0
+      tinyexec: 1.1.2
+      tinyglobby: 0.2.16
+      tinyrainbow: 3.1.0
+      vite: 8.0.8(@types/node@24.12.2)(jiti@2.6.1)
+      why-is-node-running: 2.3.0
+    optionalDependencies:
+      '@types/node': 24.12.2
+      '@vitest/ui': 4.1.6(vitest@4.1.6)
+      jsdom: 29.1.1
+    transitivePeerDependencies:
+      - msw
+
+  w3c-xmlserializer@5.0.0:
+    dependencies:
+      xml-name-validator: 5.0.0
+
+  webidl-conversions@8.0.1: {}
+
+  whatwg-mimetype@5.0.0: {}
+
+  whatwg-url@16.0.1:
+    dependencies:
+      '@exodus/bytes': 1.15.0
+      tr46: 6.0.0
+      webidl-conversions: 8.0.1
+    transitivePeerDependencies:
+      - '@noble/hashes'
+
+  which@2.0.2:
+    dependencies:
+      isexe: 2.0.0
+
+  why-is-node-running@2.3.0:
+    dependencies:
+      siginfo: 2.0.0
+      stackback: 0.0.2
+
+  word-wrap@1.2.5: {}
+
+  xml-name-validator@5.0.0: {}
+
+  xmlchars@2.2.0: {}
+
+  yallist@3.1.1: {}
+
+  yocto-queue@0.1.0: {}
+
+  zod-validation-error@4.0.2(zod@4.3.6):
+    dependencies:
+      zod: 4.3.6
+
+  zod@4.3.6: {}
diff --git a/packages/system/dashboard/images/console/pnpm-workspace.yaml b/packages/system/dashboard/images/console/pnpm-workspace.yaml
new file mode 100644
index 0000000000..0e5a0737c3
--- /dev/null
+++ b/packages/system/dashboard/images/console/pnpm-workspace.yaml
@@ -0,0 +1,3 @@
+packages:
+  - "packages/*"
+  - "apps/*"
diff --git a/packages/system/dashboard/images/console/tsconfig.base.json b/packages/system/dashboard/images/console/tsconfig.base.json
new file mode 100644
index 0000000000..18e9d3a7c1
--- /dev/null
+++ b/packages/system/dashboard/images/console/tsconfig.base.json
@@ -0,0 +1,18 @@
+{
+  "compilerOptions": {
+    "target": "es2023",
+    "lib": ["ES2023", "DOM", "DOM.Iterable"],
+    "module": "esnext",
+    "skipLibCheck": true,
+    "moduleResolution": "bundler",
+    "allowImportingTsExtensions": true,
+    "verbatimModuleSyntax": true,
+    "moduleDetection": "force",
+    "jsx": "react-jsx",
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
+    "erasableSyntaxOnly": true,
+    "noFallthroughCasesInSwitch": true,
+    "ignoreDeprecations": "6.0"
+  }
+}
diff --git a/packages/system/dashboard/images/console/tsconfig.json b/packages/system/dashboard/images/console/tsconfig.json
new file mode 100644
index 0000000000..d6634a424c
--- /dev/null
+++ b/packages/system/dashboard/images/console/tsconfig.json
@@ -0,0 +1,4 @@
+{
+  "files": [],
+  "include": []
+}
diff --git a/packages/system/dashboard/images/token-proxy/Dockerfile b/packages/system/dashboard/images/token-proxy/Dockerfile
index 81136d3aca..e45ad872b4 100644
--- a/packages/system/dashboard/images/token-proxy/Dockerfile
+++ b/packages/system/dashboard/images/token-proxy/Dockerfile
@@ -1,16 +1,18 @@
-FROM golang:1.26-alpine AS builder
+FROM --platform=$BUILDPLATFORM golang:1.27-alpine@sha256:8a5910f31396cd4d89662f56c68b3ae31d374308270a1c3bd96672ee5ed43414 AS builder
+ARG GOPROXY
 
 ARG TARGETOS
 ARG TARGETARCH
 
 COPY go.mod go.sum /src/
-COPY *.go /src/
 WORKDIR /src
+RUN for attempt in 1 2 3; do go mod download && break; [ "$attempt" = 3 ] && exit 1; sleep $((attempt * 10)); done
+COPY *.go /src/
 
 # Build the whole package, not main.go alone, so a future split into
 # helper files does not silently drop them from the binary. go build
 # excludes _test.go files automatically.
-RUN go build -o /token-proxy -ldflags '-extldflags "-static" -w -s' .
+RUN GOOS=$TARGETOS GOARCH=$TARGETARCH go build -o /token-proxy -ldflags '-extldflags "-static" -w -s' .
 
 FROM scratch
 
diff --git a/packages/system/dashboard/images/token-proxy/go.mod b/packages/system/dashboard/images/token-proxy/go.mod
index 2b045361a6..1a73605e3b 100644
--- a/packages/system/dashboard/images/token-proxy/go.mod
+++ b/packages/system/dashboard/images/token-proxy/go.mod
@@ -1,23 +1,23 @@
 module token-proxy
 
-go 1.26.2
+go 1.27.1
 
 require (
 	github.com/gorilla/securecookie v1.1.2
-	github.com/lestrrat-go/httprc/v3 v3.0.5
-	github.com/lestrrat-go/jwx/v3 v3.1.0
+	github.com/lestrrat-go/httprc/v3 v3.0.6
+	github.com/lestrrat-go/jwx/v3 v3.3.0
 )
 
 require (
 	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.1 // indirect
 	github.com/goccy/go-json v0.10.6 // indirect
 	github.com/lestrrat-go/blackmagic v1.0.4 // indirect
-	github.com/lestrrat-go/dsig v1.2.1 // indirect
+	github.com/lestrrat-go/dsig v1.4.0 // indirect
 	github.com/lestrrat-go/dsig-secp256k1 v1.0.0 // indirect
 	github.com/lestrrat-go/httpcc v1.0.1 // indirect
 	github.com/lestrrat-go/option/v2 v2.0.0 // indirect
 	github.com/segmentio/asm v1.2.1 // indirect
 	github.com/valyala/fastjson v1.6.10 // indirect
-	golang.org/x/crypto v0.50.0 // indirect
-	golang.org/x/sys v0.43.0 // indirect
+	golang.org/x/crypto v0.57.0 // indirect
+	golang.org/x/sys v0.48.0 // indirect
 )
diff --git a/packages/system/dashboard/images/token-proxy/go.sum b/packages/system/dashboard/images/token-proxy/go.sum
index 4c75483c64..00aeb9f092 100644
--- a/packages/system/dashboard/images/token-proxy/go.sum
+++ b/packages/system/dashboard/images/token-proxy/go.sum
@@ -1,6 +1,4 @@
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
-github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.1 h1:5RVFMOWjMyRy8cARdy79nAmgYw3hK/4HUq48LQ6Wwqo=
 github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.1/go.mod h1:ZXNYxsqcloTdSy/rNShjYzMhyjf0LaoftYK0p+A3h40=
 github.com/goccy/go-json v0.10.6 h1:p8HrPJzOakx/mn/bQtjgNjdTcN+/S6FcG2CTtQOrHVU=
@@ -11,33 +9,32 @@ github.com/gorilla/securecookie v1.1.2 h1:YCIWL56dvtr73r6715mJs5ZvhtnY73hBvEF8kX
 github.com/gorilla/securecookie v1.1.2/go.mod h1:NfCASbcHqRSY+3a8tlWJwsQap2VX5pwzwo4h3eOamfo=
 github.com/lestrrat-go/blackmagic v1.0.4 h1:IwQibdnf8l2KoO+qC3uT4OaTWsW7tuRQXy9TRN9QanA=
 github.com/lestrrat-go/blackmagic v1.0.4/go.mod h1:6AWFyKNNj0zEXQYfTMPfZrAXUWUfTIZ5ECEUEJaijtw=
-github.com/lestrrat-go/dsig v1.2.1 h1:MwxzZhE4+4fguHi+uDALKVlC3Cn+O1QU1Q/F8D7hVIc=
-github.com/lestrrat-go/dsig v1.2.1/go.mod h1:RD2eOaidyPvpc7IJQoO3Qq52RWdy8ZcJs8lrOnoa1Kc=
+github.com/lestrrat-go/dsig v1.4.0 h1:g7LUjK8cT74A5DzBXJI5HzsJuLhoYN0Wzj4nuOMIrH8=
+github.com/lestrrat-go/dsig v1.4.0/go.mod h1:I8Nddg/vN2cUl/h8N7SRRApLnNNeyZPIqLYpvpOtGGo=
 github.com/lestrrat-go/dsig-secp256k1 v1.0.0 h1:JpDe4Aybfl0soBvoVwjqDbp+9S1Y2OM7gcrVVMFPOzY=
 github.com/lestrrat-go/dsig-secp256k1 v1.0.0/go.mod h1:CxUgAhssb8FToqbL8NjSPoGQlnO4w3LG1P0qPWQm/NU=
 github.com/lestrrat-go/httpcc v1.0.1 h1:ydWCStUeJLkpYyjLDHihupbn2tYmZ7m22BGkcvZZrIE=
 github.com/lestrrat-go/httpcc v1.0.1/go.mod h1:qiltp3Mt56+55GPVCbTdM9MlqhvzyuL6W/NMDA8vA5E=
-github.com/lestrrat-go/httprc/v3 v3.0.5 h1:S+Mb4L2I+bM6JGTibLmxExhyTOqnXjqx+zi9MoXw/TM=
-github.com/lestrrat-go/httprc/v3 v3.0.5/go.mod h1:mSMtkZW92Z98M5YoNNztbRGxbXHql7tSitCvaxvo9l0=
-github.com/lestrrat-go/jwx/v3 v3.1.0 h1:AyyLtxc0QM75F75JroWgt1phwC7X+wOb3XKhH7XBZWw=
-github.com/lestrrat-go/jwx/v3 v3.1.0/go.mod h1:uw/MN2M/Xiu4FhwcIwH11Zsh9JWx9SWzgALl7/uIEkU=
+github.com/lestrrat-go/httprc/v3 v3.0.6 h1:4FpLQ18KK/ypPbVU3NLWJNRvH3kcYiqKqWfKGqNWxxI=
+github.com/lestrrat-go/httprc/v3 v3.0.6/go.mod h1:mSMtkZW92Z98M5YoNNztbRGxbXHql7tSitCvaxvo9l0=
+github.com/lestrrat-go/jwx/v3 v3.3.0 h1:OXcYvQOQ7cxWzeZ/Q9sYk8ABe/kCSI371WmuACiCT+4=
+github.com/lestrrat-go/jwx/v3 v3.3.0/go.mod h1:eIJhDcKHBwcgxqv8RiIylV67TVl1wJp/265IAHY1Db8=
 github.com/lestrrat-go/option/v2 v2.0.0 h1:XxrcaJESE1fokHy3FpaQ/cXW8ZsIdWcdFzzLOcID3Ss=
 github.com/lestrrat-go/option/v2 v2.0.0/go.mod h1:oSySsmzMoR0iRzCDCaUfsCzxQHUEuhOViQObyy7S6Vg=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/segmentio/asm v1.2.1 h1:DTNbBqs57ioxAD4PrArqftgypG4/qNpXoJx8TVXxPR0=
 github.com/segmentio/asm v1.2.1/go.mod h1:BqMnlJP91P8d+4ibuonYZw9mfnzI9HfxselHZr5aAcs=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
-github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
+github.com/stretchr/testify v1.12.1 h1:EuwCh5fleGS7H32xRwO3wRGT7DxrDhLAT6FF8MpWDWE=
+github.com/stretchr/testify v1.12.1/go.mod h1:MDEgiDPPsNp5cuIrHPPCyornHKgEVbtFUmoNlxoYthg=
 github.com/valyala/fastjson v1.6.10 h1:/yjJg8jaVQdYR3arGxPE2X5z89xrlhS0eGXdv+ADTh4=
 github.com/valyala/fastjson v1.6.10/go.mod h1:e6FubmQouUNP73jtMLmcbxS6ydWIpOfhz34TSfO3JaE=
-golang.org/x/crypto v0.50.0 h1:zO47/JPrL6vsNkINmLoo/PH1gcxpls50DNogFvB5ZGI=
-golang.org/x/crypto v0.50.0/go.mod h1:3muZ7vA7PBCE6xgPX7nkzzjiUq87kRItoJQM1Yo8S+Q=
-golang.org/x/sys v0.43.0 h1:Rlag2XtaFTxp19wS8MXlJwTvoh8ArU6ezoyFsMyCTNI=
-golang.org/x/sys v0.43.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
+go.yaml.in/yaml/v3 v3.0.5 h1:N6y/pJk8buWs9NY5ERU2HSMfm+IuD/OtfdAnq6kESPw=
+go.yaml.in/yaml/v3 v3.0.5/go.mod h1:HVTZu1O7/Vkt2N+BFy8Zza+lnLsABggaTM2ZpNIGuKg=
+golang.org/x/crypto v0.57.0 h1:3ZVCjf8Ggz7zneR/EHRVx68Ctf+2pmIMP2UFhh9cC6M=
+golang.org/x/crypto v0.57.0/go.mod h1:Fdz0i5U6CoizGwLda9DttjSk6qlZo25zYNtR+ycvuZA=
+golang.org/x/sys v0.48.0 h1:bbX/i/6MgT9BVLM9RT1thmxL04yeTAhbEz4SyadbXoo=
+golang.org/x/sys v0.48.0/go.mod h1:hNLxWAXmnKAxqDtdwIYC4bM9oQPEecfsnNMuSxOs3og=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
-gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/packages/system/dashboard/images/token-proxy/main.go b/packages/system/dashboard/images/token-proxy/main.go
index 3fb2ce7a7f..caae63ec71 100644
--- a/packages/system/dashboard/images/token-proxy/main.go
+++ b/packages/system/dashboard/images/token-proxy/main.go
@@ -10,6 +10,7 @@ import (
 	"flag"
 	"fmt"
 	"html/template"
+	"io/fs"
 	"log"
 	"net/http"
 	"net/http/httputil"
@@ -37,6 +38,7 @@ var (
 	jwksURL                         string
 	saTokenPath                     string
 	saCACertPath                    string
+	brandingConfigPath              string
 )
 
 func init() {
@@ -51,6 +53,12 @@ func init() {
 	flag.StringVar(&jwksURL, "jwks-url", "https://kubernetes.default.svc/openid/v1/jwks", "JWKS URL for token verification")
 	flag.StringVar(&saTokenPath, "sa-token-path", "/var/run/secrets/kubernetes.io/serviceaccount/token", "Path to service account token")
 	flag.StringVar(&saCACertPath, "sa-ca-cert-path", "/var/run/secrets/kubernetes.io/serviceaccount/ca.crt", "Path to service account CA certificate")
+	// The dashboard branding lives in the cozy-dashboard-console-config
+	// ConfigMap, which the SPA reaches only through the authenticated kube-api.
+	// Mounting the same config.json here gives the pre-auth login page a source
+	// for the deployment's branding; an absent or unreadable file falls back to
+	// the unbranded page, so a cluster without branding renders as before.
+	flag.StringVar(&brandingConfigPath, "branding-config-path", "/etc/cozystack/branding/config.json", "Path to the dashboard branding config.json mounted from the console ConfigMap")
 }
 
 // newJWKCache builds the JWK cache used to verify Kubernetes-issued JWTs.
@@ -144,7 +152,7 @@ var loginTmpl = template.Must(template.New("login").Parse(`
 <html lang="en">
 <head>
 	<meta charset="UTF-8">
-	<title>Login</title>
+	<title>{{.Title}}</title>
 	<style>
 		body {
 			margin: 0;
@@ -163,6 +171,16 @@ var loginTmpl = template.Must(template.New("login").Parse(`
 			width: 400px;
 			text-align: center;
 		}
+		.logo {
+			max-width: 220px;
+			max-height: 72px;
+			margin-bottom: 1rem;
+		}
+		.brand {
+			margin: 0 0 1rem;
+			font-size: 1.3rem;
+			color: #333;
+		}
 		h2 {
 			margin-bottom: 1rem;
 			color: #333;
@@ -203,6 +221,8 @@ var loginTmpl = template.Must(template.New("login").Parse(`
 </head>
 <body>
 	<div class="card">
+		{{if .LogoSrc}}<img class="logo" src="{{.LogoSrc}}" alt="{{.Title}}" />{{end}}
+		{{if .Heading}}<h1 class="brand">{{.Heading}}</h1>{{end}}
 		<h2>Kubernetes API Token</h2>
 		{{if .Err}}<p class="error">{{.Err}}</p>{{end}}
 		<form method="POST" action="{{.Action}}">
@@ -213,6 +233,75 @@ var loginTmpl = template.Must(template.New("login").Parse(`
 </body>
 </html>`))
 
+// brandingConfig mirrors the subset of the dashboard console config.json that
+// the login page can render. Its JSON tags match the keys the SPA reads from
+// the cozy-dashboard-console-config ConfigMap, so operators set branding once.
+type brandingConfig struct {
+	TitleText string `json:"titleText"`
+	LogoText  string `json:"logoText"`
+	LogoSvg   string `json:"logoSvg"`
+}
+
+// loadBranding reads the mounted branding config.json. Any failure yields the
+// zero value, which newLoginData turns into the historical unbranded page
+// rather than a hard error. It is called per request so a ConfigMap edit is
+// picked up without restarting the pod — the gatekeeper Deployment carries no
+// checksum/config annotation, unlike the console.
+func loadBranding(path string) brandingConfig {
+	var b brandingConfig
+	if path == "" {
+		return b
+	}
+	data, err := os.ReadFile(path)
+	if err != nil {
+		// A missing file is the normal "no branding configured" case; anything
+		// else (a broken mount, permissions) is worth a line so it is visible.
+		if !errors.Is(err, fs.ErrNotExist) {
+			log.Printf("branding: cannot read %s: %v", path, err)
+		}
+		return b
+	}
+	if err := json.Unmarshal(data, &b); err != nil {
+		log.Printf("branding: ignoring invalid %s: %v", path, err)
+	}
+	return b
+}
+
+// loginData is the template model for loginTmpl.
+type loginData struct {
+	Action  string
+	Err     string
+	Title   string
+	Heading string
+	// LogoSrc is an <img> data: URI. logoSvg is already base64-encoded in the
+	// console config.json — the SPA's Logo.tsx drops it straight after the same
+	// prefix — so it is only prefixed here, never re-encoded. It is typed
+	// template.URL because html/template rewrites a data: URI in a src
+	// attribute to #ZgotmplZ otherwise; serving the SVG through an <img> keeps
+	// any embedded script inert rather than inlining it into the page.
+	LogoSrc template.URL
+}
+
+// logoDataURIPrefix is the only scheme LogoSrc ever carries; because LogoSrc is
+// template.URL (URL filtering off), the single construction site below must be
+// the only thing that ever assigns it.
+const logoDataURIPrefix = "data:image/svg+xml;base64,"
+
+func newLoginData(action, errMsg, brandingPath string) loginData {
+	d := loginData{Action: action, Err: errMsg, Title: "Login"}
+	b := loadBranding(brandingPath)
+	if b.TitleText != "" {
+		d.Title = b.TitleText
+	}
+	if b.LogoText != "" {
+		d.Heading = b.LogoText
+	}
+	if b.LogoSvg != "" {
+		d.LogoSrc = template.URL(logoDataURIPrefix + b.LogoSvg)
+	}
+	return d
+}
+
 /* ----------------------------- JWK cache -------------------------------- */
 
 var (
@@ -385,17 +474,11 @@ func main() {
 	http.HandleFunc(signIn, func(w http.ResponseWriter, r *http.Request) {
 		switch r.Method {
 		case http.MethodGet:
-			_ = loginTmpl.Execute(w, struct {
-				Action string
-				Err    string
-			}{Action: signIn})
+			_ = loginTmpl.Execute(w, newLoginData(signIn, "", brandingConfigPath))
 		case http.MethodPost:
 			token := strings.TrimSpace(r.FormValue("token"))
 			if token == "" {
-				_ = loginTmpl.Execute(w, struct {
-					Action string
-					Err    string
-				}{Action: signIn, Err: "Token required"})
+				_ = loginTmpl.Execute(w, newLoginData(signIn, "Token required", brandingConfigPath))
 				return
 			}
 
@@ -407,10 +490,7 @@ func main() {
 				if errors.Is(err, errJWKSNotReady) {
 					msg = "Service is starting, please retry in a moment"
 				}
-				_ = loginTmpl.Execute(w, struct {
-					Action string
-					Err    string
-				}{Action: signIn, Err: msg})
+				_ = loginTmpl.Execute(w, newLoginData(signIn, msg, brandingConfigPath))
 				return
 			}
 
diff --git a/packages/system/dashboard/images/token-proxy/main_test.go b/packages/system/dashboard/images/token-proxy/main_test.go
index a792f5061e..7b14448629 100644
--- a/packages/system/dashboard/images/token-proxy/main_test.go
+++ b/packages/system/dashboard/images/token-proxy/main_test.go
@@ -1,6 +1,7 @@
 package main
 
 import (
+	"bytes"
 	"context"
 	"crypto/ecdsa"
 	"crypto/elliptic"
@@ -8,8 +9,11 @@ import (
 	"crypto/tls"
 	"crypto/x509"
 	"crypto/x509/pkix"
+	"encoding/base64"
+	"encoding/json"
 	"encoding/pem"
 	"errors"
+	"html/template"
 	"math/big"
 	"net/http"
 	"net/http/httptest"
@@ -405,3 +409,134 @@ func TestHealthzReady_ReportsCacheState(t *testing.T) {
 // the entire fix turns on this option, so a future upstream rename
 // surfaces as a build error here instead of a silent semantic change.
 var _ jwk.RegisterOption = jwk.WithWaitReady(false)
+
+// writeBranding writes a branding config.json to a temp dir, mirroring how the
+// cozy-dashboard-console-config ConfigMap is projected into the container.
+func writeBranding(t *testing.T, json string) string {
+	t.Helper()
+	p := filepath.Join(t.TempDir(), "config.json")
+	if err := os.WriteFile(p, []byte(json), 0o600); err != nil {
+		t.Fatalf("write branding: %v", err)
+	}
+	return p
+}
+
+// TestNewLoginData_DefaultsWithoutBranding pins the fallback: with no branding
+// file the login page keeps its historical unbranded shape (title "Login", no
+// logo, no brand heading). A missing file must never break sign-in.
+func TestNewLoginData_DefaultsWithoutBranding(t *testing.T) {
+	d := newLoginData("/oauth2/sign_in", "", filepath.Join(t.TempDir(), "absent.json"))
+	if d.Title != "Login" {
+		t.Errorf("Title = %q, want Login", d.Title)
+	}
+	if d.Heading != "" {
+		t.Errorf("Heading = %q, want empty", d.Heading)
+	}
+	if d.LogoSrc != "" {
+		t.Errorf("LogoSrc = %q, want empty", d.LogoSrc)
+	}
+}
+
+// TestNewLoginData_AppliesBranding proves the branding keys from the console
+// ConfigMap reach the login model: titleText -> <title>, logoText -> heading,
+// logoSvg -> an <img> data: URI.
+//
+// logoSvg in config.json is already base64 (the SPA's Logo.tsx consumes it
+// that way), so the value must be prefixed verbatim, never re-encoded. The
+// decode-back assertion is the contract: a second encoding would make the
+// payload decode to the base64 text instead of the original SVG, i.e. a broken
+// image on every cluster that configured a logo.
+func TestNewLoginData_AppliesBranding(t *testing.T) {
+	svg := "<svg xmlns=\"http://www.w3.org/2000/svg\"></svg>"
+	svgB64 := base64.StdEncoding.EncodeToString([]byte(svg))
+	p := writeBranding(t, `{"titleText":"Acme Cloud","logoText":"Acme","logoSvg":`+quoteJSON(svgB64)+`}`)
+	d := newLoginData("/oauth2/sign_in", "", p)
+	if d.Title != "Acme Cloud" {
+		t.Errorf("Title = %q, want Acme Cloud", d.Title)
+	}
+	if d.Heading != "Acme" {
+		t.Errorf("Heading = %q, want Acme", d.Heading)
+	}
+	want := template.URL("data:image/svg+xml;base64," + svgB64)
+	if d.LogoSrc != want {
+		t.Errorf("LogoSrc = %q, want %q (logoSvg must not be re-encoded)", d.LogoSrc, want)
+	}
+	// The data: prefix is mandatory because LogoSrc is template.URL: nothing
+	// without it may reach the field.
+	const prefix = "data:image/svg+xml;base64,"
+	if !strings.HasPrefix(string(d.LogoSrc), prefix) {
+		t.Fatalf("LogoSrc %q lacks the fixed %q prefix", d.LogoSrc, prefix)
+	}
+	decoded, err := base64.StdEncoding.DecodeString(strings.TrimPrefix(string(d.LogoSrc), prefix))
+	if err != nil {
+		t.Fatalf("payload is not valid base64: %v", err)
+	}
+	if string(decoded) != svg {
+		t.Errorf("payload decodes to %q, want the original SVG %q (double-encoded)", decoded, svg)
+	}
+}
+
+// TestNewLoginData_MalformedBrandingFallsBack proves a corrupt config.json
+// degrades to the unbranded page instead of erroring the handler.
+func TestNewLoginData_MalformedBrandingFallsBack(t *testing.T) {
+	p := writeBranding(t, `{not json`)
+	d := newLoginData("/oauth2/sign_in", "", p)
+	if d.Title != "Login" || d.Heading != "" || d.LogoSrc != "" {
+		t.Errorf("malformed branding leaked into %+v", d)
+	}
+}
+
+// TestLoginTemplate_RendersBranding executes the real template and asserts the
+// branded title, heading and logo data URI survive rendering — in particular
+// that html/template does not rewrite the data: URI to #ZgotmplZ, which would
+// silently blank the logo.
+func TestLoginTemplate_RendersBranding(t *testing.T) {
+	svg := "<svg xmlns=\"http://www.w3.org/2000/svg\"></svg>"
+	svgB64 := base64.StdEncoding.EncodeToString([]byte(svg))
+	p := writeBranding(t, `{"titleText":"Acme Cloud","logoText":"Acme","logoSvg":`+quoteJSON(svgB64)+`}`)
+	var buf bytes.Buffer
+	if err := loginTmpl.Execute(&buf, newLoginData("/oauth2/sign_in", "", p)); err != nil {
+		t.Fatalf("execute: %v", err)
+	}
+	out := buf.String()
+	if strings.Contains(out, "#ZgotmplZ") {
+		t.Fatal("logo data URI was sanitized to #ZgotmplZ")
+	}
+	// The SVG mime "+" renders as the HTML entity &#43; inside the attribute,
+	// which the browser decodes back to "+"; assert on the surviving prefix and
+	// the operator's base64 payload verbatim (re-encoding it would change it).
+	for _, want := range []string{
+		"<title>Acme Cloud</title>",
+		`class="brand">Acme</h1>`,
+		`src="data:image/svg`,
+		"base64," + svgB64,
+		"Kubernetes API Token",
+	} {
+		if !strings.Contains(out, want) {
+			t.Errorf("rendered page missing %q", want)
+		}
+	}
+}
+
+// TestLoginTemplate_RendersUnbranded pins the default page: title "Login", no
+// logo <img>, no brand heading.
+func TestLoginTemplate_RendersUnbranded(t *testing.T) {
+	var buf bytes.Buffer
+	if err := loginTmpl.Execute(&buf, newLoginData("/oauth2/sign_in", "", "")); err != nil {
+		t.Fatalf("execute: %v", err)
+	}
+	out := buf.String()
+	if !strings.Contains(out, "<title>Login</title>") {
+		t.Error("default page lost its <title>Login</title>")
+	}
+	if strings.Contains(out, "class=\"logo\"") || strings.Contains(out, "class=\"brand\"") {
+		t.Error("unbranded page rendered a logo or brand heading")
+	}
+}
+
+// quoteJSON returns s as a JSON string literal so an SVG with quotes embeds
+// cleanly into the test fixtures above.
+func quoteJSON(s string) string {
+	b, _ := json.Marshal(s)
+	return string(b)
+}
diff --git a/packages/system/dashboard/images/token-proxy/verify_test.go b/packages/system/dashboard/images/token-proxy/verify_test.go
new file mode 100644
index 0000000000..32c6900e0c
--- /dev/null
+++ b/packages/system/dashboard/images/token-proxy/verify_test.go
@@ -0,0 +1,161 @@
+package main
+
+import (
+	"crypto/rand"
+	"crypto/rsa"
+	"crypto/x509"
+	"encoding/base64"
+	"encoding/json"
+	"errors"
+	"net/http"
+	"net/http/httptest"
+	"testing"
+	"time"
+
+	"github.com/lestrrat-go/jwx/v3/jwa"
+	"github.com/lestrrat-go/jwx/v3/jwk"
+	"github.com/lestrrat-go/jwx/v3/jws"
+	"github.com/lestrrat-go/jwx/v3/jwt"
+)
+
+const testKid = "k1"
+
+// serveJWKS points the package-level cache at a TLS server publishing pub
+// the way kube-apiserver does, and waits until the set is loaded.
+func serveJWKS(t *testing.T, pub *rsa.PublicKey) {
+	t.Helper()
+	key, err := jwk.Import(pub)
+	if err != nil {
+		t.Fatalf("import public key: %v", err)
+	}
+	for k, v := range map[string]any{jwk.KeyIDKey: testKid, jwk.AlgorithmKey: jwa.RS256(), jwk.KeyUsageKey: "sig"} {
+		if err := key.Set(k, v); err != nil {
+			t.Fatalf("set %s: %v", k, err)
+		}
+	}
+	set := jwk.NewSet()
+	if err := set.AddKey(key); err != nil {
+		t.Fatalf("add key: %v", err)
+	}
+	body, err := json.Marshal(set)
+	if err != nil {
+		t.Fatalf("marshal jwks: %v", err)
+	}
+	srv := httptest.NewTLSServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
+		w.Header().Set("Content-Type", "application/jwk-set+json")
+		_, _ = w.Write(body)
+	}))
+	t.Cleanup(srv.Close)
+
+	ctx := t.Context()
+	cache, err := newJWKCache(ctx, srv.URL, writeServerCA(t, srv), writeFakeSAToken(t))
+	if err != nil {
+		t.Fatalf("newJWKCache: %v", err)
+	}
+	if _, err := cache.Refresh(ctx, srv.URL); err != nil {
+		t.Fatalf("Refresh: %v", err)
+	}
+	prevCache, prevURL := jwkCache, jwksURL
+	jwkCache, jwksURL = cache, srv.URL
+	t.Cleanup(func() { jwkCache, jwksURL = prevCache, prevURL })
+}
+
+func newRSAKey(t *testing.T) *rsa.PrivateKey {
+	t.Helper()
+	k, err := rsa.GenerateKey(rand.Reader, 2048)
+	if err != nil {
+		t.Fatalf("generate rsa key: %v", err)
+	}
+	return k
+}
+
+func claims(t *testing.T, notBefore, expiry time.Time) jwt.Token {
+	t.Helper()
+	tok, err := jwt.NewBuilder().
+		Subject("system:serviceaccount:tenant-root:dashboard").
+		IssuedAt(notBefore).
+		NotBefore(notBefore).
+		Expiration(expiry).
+		Build()
+	if err != nil {
+		t.Fatalf("build claims: %v", err)
+	}
+	return tok
+}
+
+// sign signs tok with alg and key, putting kid in the protected header
+// unless kid is empty.
+func sign(t *testing.T, tok jwt.Token, alg jwa.SignatureAlgorithm, key any, kid string) string {
+	t.Helper()
+	hdr := jws.NewHeaders()
+	if kid != "" {
+		if err := hdr.Set(jws.KeyIDKey, kid); err != nil {
+			t.Fatalf("set kid: %v", err)
+		}
+	}
+	signed, err := jwt.Sign(tok, jwt.WithKey(alg, key, jws.WithProtectedHeaders(hdr)))
+	if err != nil {
+		t.Fatalf("sign: %v", err)
+	}
+	return string(signed)
+}
+
+func TestVerifyAndParseJWT_AcceptsValidToken(t *testing.T) {
+	priv := newRSAKey(t)
+	serveJWKS(t, &priv.PublicKey)
+	now := time.Now()
+	exp := now.Add(time.Hour).Truncate(time.Second)
+
+	tok, err := verifyAndParseJWT(t.Context(), sign(t, claims(t, now.Add(-time.Minute), exp), jwa.RS256(), priv, testKid))
+	if err != nil {
+		t.Fatalf("a token signed by the published key must verify: %v", err)
+	}
+	if got, ok := tok.Expiration(); !ok || !got.Equal(exp) {
+		t.Fatalf("expiration = %v (present %v), want %v", got, ok, exp)
+	}
+	if got := getClaim(tok, "sub"); got != "system:serviceaccount:tenant-root:dashboard" {
+		t.Fatalf("sub claim = %v", got)
+	}
+}
+
+// Every token below must be refused, and refused as invalid rather than as
+// the cold-start errJWKSNotReady, which the sign-in page words differently.
+func TestVerifyAndParseJWT_RejectsInvalidTokens(t *testing.T) {
+	priv := newRSAKey(t)
+	serveJWKS(t, &priv.PublicKey)
+	now := time.Now()
+	valid := func() jwt.Token { return claims(t, now.Add(-time.Minute), now.Add(time.Hour)) }
+
+	pubDER, err := x509.MarshalPKIXPublicKey(&priv.PublicKey)
+	if err != nil {
+		t.Fatalf("marshal public key: %v", err)
+	}
+	payload, err := json.Marshal(valid())
+	if err != nil {
+		t.Fatalf("marshal claims: %v", err)
+	}
+	b64 := base64.RawURLEncoding.EncodeToString
+	unsigned := b64([]byte(`{"alg":"none","kid":"`+testKid+`"}`)) + "." + b64(payload) + "."
+
+	cases := map[string]string{
+		"expired":          sign(t, claims(t, now.Add(-2*time.Hour), now.Add(-time.Hour)), jwa.RS256(), priv, testKid),
+		"not yet valid":    sign(t, claims(t, now.Add(time.Hour), now.Add(2*time.Hour)), jwa.RS256(), priv, testKid),
+		"foreign key":      sign(t, valid(), jwa.RS256(), newRSAKey(t), testKid),
+		"unknown kid":      sign(t, valid(), jwa.RS256(), priv, "k2"),
+		"no kid":           sign(t, valid(), jwa.RS256(), priv, ""),
+		"alg none":         unsigned,
+		"hs256 public key": sign(t, valid(), jwa.HS256(), pubDER, testKid),
+		"not a jwt":        "not-a-jwt",
+	}
+	for name, raw := range cases {
+		t.Run(name, func(t *testing.T) {
+			_, err := verifyAndParseJWT(t.Context(), raw)
+			if err == nil {
+				t.Fatal("token must be rejected")
+			}
+			if errors.Is(err, errJWKSNotReady) {
+				t.Fatalf("rejection reported as cold start: %v", err)
+			}
+		})
+	}
+}
diff --git a/packages/system/dashboard/templates/configmap.yaml b/packages/system/dashboard/templates/configmap.yaml
index 921dc62a0c..0db74ce0a6 100644
--- a/packages/system/dashboard/templates/configmap.yaml
+++ b/packages/system/dashboard/templates/configmap.yaml
@@ -1,7 +1,34 @@
 {{- $branding := .Values._cluster.branding | default dict }}
+{{- /* Surface the platform version to the SPA at deploy time, derived from the
+       console image tag (build stamps it vX.Y.Z; promotion rewrites rc->stable).
+       This decouples the displayed version from the VITE_APP_VERSION baked into
+       the bundle, so a promoted-by-retag image reports the stable version. */}}
+{{- $tag := .Values.console.image | toString | splitList "@" | first | splitList ":" | last }}
+{{- /* Serve only the console's white-labeling keys — documented in the website
+       white-labeling guide (recorded here in docs/changelogs/v1.0.3.md) and
+       typed as AppConfig in images/console/.../lib/config.ts. pick is an
+       allow-list, so the Keycloak branding keys (brandName, brandHtmlName,
+       loginTheme, loginThemeImage — the last an OCI reference that may point at
+       a private registry) are dropped: this config.json is now a static asset
+       reachable by anyone past the proxy, and Keycloak reads its keys from
+       _cluster.branding directly. */}}
+{{- $config := pick $branding "titleText" "tenantText" "footerText" "logoText" "logoSvg" "iconSvg" }}
+{{- /* Require digits then a dot (v1.5.0 / 1.5.0), so a tagless ref whose last
+       ":"-segment is a repo path with a port (ghcr.io:443/.../console -> last
+       "443/.../console") does not get mistaken for a version. */}}
+{{- if regexMatch "^v?[0-9]+\\." $tag }}
+{{- /* Keep the tag verbatim (vX.Y.Z), matching the operator's COZYSTACK_VERSION
+       and the vX.Y.Z release tags, rather than stripping the leading v. */}}
+{{- $_ := set $config "version" $tag }}
+{{- end }}
+{{- /* Omitted when empty: the console treats a missing key as "show no
+       hostname", so an empty string must not reach config.json. */}}
+{{- with index .Values._cluster "service-domain" }}
+{{- $_ := set $config "serviceDomain" . }}
+{{- end }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
   name: cozy-dashboard-console-config
 data:
-  config.json: {{ $branding | toJson | quote }}
+  config.json: {{ $config | toJson | quote }}
diff --git a/packages/system/dashboard/templates/console.yaml b/packages/system/dashboard/templates/console.yaml
index 43ce4a2f72..c4e6415789 100644
--- a/packages/system/dashboard/templates/console.yaml
+++ b/packages/system/dashboard/templates/console.yaml
@@ -85,6 +85,14 @@ spec:
               type: RuntimeDefault
           terminationMessagePath: /dev/termination-log
           terminationMessagePolicy: File
+          # Serve the branding config.json as a static asset under the web root
+          # so the SPA reads it with no kube-api call — branding then renders
+          # even when the apiserver rejects the session's token, and without the
+          # console-config-reader RBAC the kube-api read otherwise needs.
+          volumeMounts:
+            - name: branding
+              mountPath: /usr/share/nginx/html/branding
+              readOnly: true
       dnsPolicy: ClusterFirst
       enableServiceLinks: false
       hostIPC: false
@@ -95,3 +103,15 @@ spec:
       schedulerName: default-scheduler
       serviceAccountName: cozy-dashboard-console
       terminationGracePeriodSeconds: 30
+      volumes:
+        # optional: without the ConfigMap the SPA falls back to the kube-api,
+        # so a missing branding source is not worth failing the pod on. items
+        # restricts the mount to config.json so no other key the ConfigMap may
+        # grow becomes a file under the public web root.
+        - name: branding
+          configMap:
+            name: cozy-dashboard-console-config
+            optional: true
+            items:
+              - key: config.json
+                path: config.json
diff --git a/packages/system/dashboard/templates/gatekeeper.yaml b/packages/system/dashboard/templates/gatekeeper.yaml
index 8d4b13f74b..dce5dcd84a 100644
--- a/packages/system/dashboard/templates/gatekeeper.yaml
+++ b/packages/system/dashboard/templates/gatekeeper.yaml
@@ -1,4 +1,5 @@
 {{- $host := index .Values._cluster "root-host" }}
+{{- $realm := index .Values._cluster "oidc-realm-name" | default "cozy" }}
 {{- $oidcEnabled := index .Values._cluster "oidc-enabled" }}
 {{- $oidcInsecureSkipVerify := index .Values._cluster "oidc-insecure-skip-verify" }}
 {{- $keycloakInternalUrl := index .Values._cluster "keycloak-internal-url" | default "" }}
@@ -55,19 +56,21 @@ spec:
             - --upstream=http://cozy-dashboard-console.{{ .Release.Namespace }}.svc:8080
             - --http-address=0.0.0.0:8000
             - --redirect-url=https://dashboard.{{ $host }}/oauth2/callback
-            - --oidc-issuer-url=https://keycloak.{{ $host }}/realms/cozy
+            - --oidc-issuer-url=https://keycloak.{{ $host }}/realms/{{ $realm }}
             {{- if $keycloakInternalUrl }}
             - --skip-oidc-discovery
-            - --login-url=https://keycloak.{{ $host }}/realms/cozy/protocol/openid-connect/auth
+            - --login-url=https://keycloak.{{ $host }}/realms/{{ $realm }}/protocol/openid-connect/auth
             - --redeem-url={{ $keycloakInternalUrl }}/protocol/openid-connect/token
             - --oidc-jwks-url={{ $keycloakInternalUrl }}/protocol/openid-connect/certs
             - --validate-url={{ $keycloakInternalUrl }}/protocol/openid-connect/userinfo
             - --backend-logout-url={{ $keycloakInternalUrl }}/protocol/openid-connect/logout?id_token_hint={id_token}
             {{- else }}
-            - --backend-logout-url=https://keycloak.{{ $host }}/realms/cozy/protocol/openid-connect/logout?id_token_hint={id_token}
+            - --backend-logout-url=https://keycloak.{{ $host }}/realms/{{ $realm }}/protocol/openid-connect/logout?id_token_hint={id_token}
             {{- end }}
             - --whitelist-domain=keycloak.{{ $host }}
             - --email-domain=*
+            - --api-route=^/api(/|$)
+            - --api-route=^/apis(/|$)
             - --pass-access-token=true
             - --pass-authorization-header=true
             - --cookie-refresh=3m
@@ -75,7 +78,14 @@ spec:
             - --cookie-secure=true
             - --cookie-secret=$(OAUTH2_PROXY_COOKIE_SECRET)
             - --skip-provider-button
-            - --scope=openid email profile offline_access
+            # No offline_access: that scope makes Keycloak issue an *offline*
+            # refresh token, which is decoupled from the SSO session and is NOT
+            # revoked by logout (end_session). Since oauth2-proxy keeps the
+            # refresh token in the kc-access cookie and silently refreshes it,
+            # a copied cookie would stay valid for the whole offline-session
+            # lifetime (~30d) even after the user logs out. An online refresh
+            # token is bound to the SSO session and is revoked on logout.
+            - --scope=openid email profile
             {{- if eq $oidcInsecureSkipVerify "true" }}
             - --ssl-insecure-skip-verify=true
             {{- end }}
@@ -170,6 +180,12 @@ spec:
             timeoutSeconds: 2
             successThreshold: 1
             failureThreshold: 3
+          # The branding config.json the SPA reads via the kube-api is mounted
+          # here so the pre-auth login page can render the same title and logo.
+          volumeMounts:
+            - name: branding
+              mountPath: /etc/cozystack/branding
+              readOnly: true
         {{- end }}
           ports:
             - name: proxy
@@ -196,3 +212,12 @@ spec:
               type: RuntimeDefault
           terminationMessagePath: /dev/termination-log
           terminationMessagePolicy: File
+        {{- if ne $oidcEnabled "true" }}
+      volumes:
+        # optional: the login page degrades to its unbranded default if the
+        # ConfigMap is missing, so a start-up dependency is not worth failing on.
+        - name: branding
+          configMap:
+            name: cozy-dashboard-console-config
+            optional: true
+        {{- end }}
diff --git a/packages/system/dashboard/templates/ingress.yaml b/packages/system/dashboard/templates/ingress.yaml
index 0f1b6df3cd..18e87c1b1c 100644
--- a/packages/system/dashboard/templates/ingress.yaml
+++ b/packages/system/dashboard/templates/ingress.yaml
@@ -4,16 +4,20 @@
 {{- $exposeServices := splitList "," ((index .Values._cluster "expose-services") | default "") }}
 {{- $exposeIngress := (index .Values._cluster "expose-ingress") | default "tenant-root" }}
 {{- $gatewayEnabled := (index .Values._cluster "gateway-enabled") | default "false" }}
+{{- $wildcardSecret := (index .Values._cluster "wildcard-secret-name") | default "" }}
 
 {{- if and (has "dashboard" $exposeServices) (ne $gatewayEnabled "true") }}
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   annotations:
+    {{- /* Operator wildcard mode: nginx serves the default SSL cert, so skip per-host ACME. */}}
+    {{- if not $wildcardSecret }}
     cert-manager.io/cluster-issuer: {{ $clusterIssuer }}
     {{- if eq $solver "http01" }}
     acme.cert-manager.io/http01-ingress-ingressclassname: {{ $exposeIngress }}
     {{- end }}
+    {{- end }}
     nginx.ingress.kubernetes.io/rewrite-target: /
     nginx.ingress.kubernetes.io/server-snippet: |
       location ~* ^/openapi-ui {
@@ -42,5 +46,10 @@ spec:
   tls:
     - hosts:
         - dashboard.{{ $host }}
+      {{- /* Operator wildcard mode: no per-host secret — ingress-nginx falls
+             back to the default SSL certificate while the tls section keeps
+             the HTTP-to-HTTPS redirect enforced. */}}
+      {{- if not $wildcardSecret }}
       secretName: dashboard-web-tls
+      {{- end }}
 {{- end }}
diff --git a/packages/system/dashboard/templates/keycloakclient.yaml b/packages/system/dashboard/templates/keycloakclient.yaml
index fa33fea4a8..27d5a032aa 100644
--- a/packages/system/dashboard/templates/keycloakclient.yaml
+++ b/packages/system/dashboard/templates/keycloakclient.yaml
@@ -64,11 +64,16 @@ spec:
   directAccess: true
   public: false
   webUrl: "https://dashboard.{{ $host }}"
+  webOrigins:
+    - "+"
   defaultClientScopes:
     - groups
     - kubernetes-client
-  optionalClientScopes:
-    - offline_access
+  # offline_access is intentionally not offered: an offline refresh token
+  # survives logout (see the proxy Deployment's --scope). NB the
+  # keycloak-operator only adds client scopes, so dropping this does not strip
+  # the realm-default offline_access from an already-created client; the proxy
+  # --scope change is what prevents issuance.
   attributes:
     post.logout.redirect.uris: "+"
     client.session.idle.timeout: "86400"
diff --git a/packages/system/dashboard/templates/rbac.yaml b/packages/system/dashboard/templates/rbac.yaml
index f581ce42ed..cf4b898a94 100644
--- a/packages/system/dashboard/templates/rbac.yaml
+++ b/packages/system/dashboard/templates/rbac.yaml
@@ -28,6 +28,18 @@ rules:
   - get
   - list
   - watch
+- apiGroups:
+  - apiextensions.k8s.io
+  resources:
+  - customresourcedefinitions
+  resourceNames:
+  - plans.backups.cozystack.io
+  - backupjobs.backups.cozystack.io
+  - restorejobs.backups.cozystack.io
+  - backups.backups.cozystack.io
+  - backupclasses.backups.cozystack.io
+  verbs:
+  - get
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
diff --git a/packages/system/dashboard/tests/configmap_service_domain_test.yaml b/packages/system/dashboard/tests/configmap_service_domain_test.yaml
new file mode 100644
index 0000000000..f31a6240fb
--- /dev/null
+++ b/packages/system/dashboard/tests/configmap_service_domain_test.yaml
@@ -0,0 +1,44 @@
+suite: console config.json service-domain wiring
+templates:
+  - templates/configmap.yaml
+
+release:
+  name: dashboard
+  namespace: cozy-dashboard
+
+# The console reads config.json once at startup and treats a missing
+# serviceDomain as "show no hostname". The chart therefore omits
+# the key when _cluster.service-domain is unset or empty, and copies the value
+# verbatim when set. Pin all three, next to the existing branding merge, so a
+# refactor of the $config assembly cannot drop the key or start shipping an
+# empty string the console would have to special-case.
+
+tests:
+  - it: omits serviceDomain when service-domain is unset
+    set:
+      _cluster:
+        root-host: example.org
+    asserts:
+      - notMatchRegex:
+          path: data["config.json"]
+          pattern: serviceDomain
+
+  - it: omits serviceDomain when service-domain is empty
+    set:
+      _cluster:
+        root-host: example.org
+        service-domain: ""
+    asserts:
+      - notMatchRegex:
+          path: data["config.json"]
+          pattern: serviceDomain
+
+  - it: writes serviceDomain when service-domain is set
+    set:
+      _cluster:
+        root-host: example.org
+        service-domain: svc.example.org
+    asserts:
+      - matchRegex:
+          path: data["config.json"]
+          pattern: '"serviceDomain":"svc\.example\.org"'
diff --git a/packages/system/dashboard/tests/console_test.yaml b/packages/system/dashboard/tests/console_test.yaml
new file mode 100644
index 0000000000..6cfd362983
--- /dev/null
+++ b/packages/system/dashboard/tests/console_test.yaml
@@ -0,0 +1,89 @@
+suite: console branding static mount
+templates:
+  # configmap.yaml is included by console.yaml for its checksum annotation, so
+  # it must be rendered too or the include fails under helm-unittest.
+  - templates/console.yaml
+  - templates/configmap.yaml
+
+release:
+  name: dashboard
+  namespace: cozy-dashboard
+
+# The SPA fetches /branding/config.json (see config.ts BRANDING_STATIC_PATH),
+# which nginx serves from the cozy-dashboard-console-config ConfigMap mounted at
+# /usr/share/nginx/html/branding. That path is made of three literals in three
+# files that must agree: the ConfigMap data key config.json, the mountPath
+# directory branding, and the SPA URL. Pin the two this chart owns so a rename
+# is a test failure instead of a silent fall-back to the kube-api. The volume is
+# optional so a cluster without branding still starts.
+
+tests:
+  - it: mounts the branding ConfigMap under the nginx web root
+    template: templates/console.yaml
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].volumeMounts[0].name
+          value: branding
+      # mountPath directory + the config.json key below = the SPA's
+      # /branding/config.json. Both halves are pinned across the two files.
+      - equal:
+          path: spec.template.spec.containers[0].volumeMounts[0].mountPath
+          value: /usr/share/nginx/html/branding
+      - equal:
+          path: spec.template.spec.containers[0].volumeMounts[0].readOnly
+          value: true
+      # items restricts the mount to config.json, so no other key the ConfigMap
+      # may grow leaks as a file under the public web root.
+      - contains:
+          path: spec.template.spec.volumes
+          content:
+            name: branding
+            configMap:
+              name: cozy-dashboard-console-config
+              optional: true
+              items:
+                - key: config.json
+                  path: config.json
+
+  - it: publishes the config.json key the mount serves
+    template: templates/configmap.yaml
+    documentIndex: 0
+    asserts:
+      - isKind:
+          of: ConfigMap
+      - equal:
+          path: metadata.name
+          value: cozy-dashboard-console-config
+      - exists:
+          path: data["config.json"]
+
+  # The served file is a static asset reachable by anyone past the proxy, so it
+  # must not carry Keycloak-only branding (loginThemeImage can reference a
+  # private registry). config.json is picked down to the documented white-label
+  # keys; the two Keycloak-only keys must be absent, and tenantText must survive.
+  - it: serves white-label keys but not Keycloak-only branding
+    template: templates/configmap.yaml
+    documentIndex: 0
+    set:
+      _cluster:
+        branding:
+          titleText: Acme
+          tenantText: Acme Tenant
+          logoText: Acme Cloud
+          loginTheme: acme
+          loginThemeImage: registry.example.com/acme-keycloak-theme:v1
+    asserts:
+      - matchRegex:
+          path: data["config.json"]
+          pattern: '"titleText":"Acme"'
+      - matchRegex:
+          path: data["config.json"]
+          pattern: '"tenantText":"Acme Tenant"'
+      # Anchor to the JSON key forms so loginTheme does not merely match inside
+      # loginThemeImage: both keys must be genuinely absent.
+      - notMatchRegex:
+          path: data["config.json"]
+          pattern: '"loginTheme":'
+      - notMatchRegex:
+          path: data["config.json"]
+          pattern: '"loginThemeImage":'
diff --git a/packages/system/dashboard/tests/gatekeeper_test.yaml b/packages/system/dashboard/tests/gatekeeper_test.yaml
index acff91da92..3b8efd7edd 100644
--- a/packages/system/dashboard/tests/gatekeeper_test.yaml
+++ b/packages/system/dashboard/tests/gatekeeper_test.yaml
@@ -50,6 +50,69 @@ tests:
       - equal:
           path: spec.template.spec.containers[0].ports[0].containerPort
           value: 8000
+      # The pre-auth login page reads its branding from the same
+      # cozy-dashboard-console-config ConfigMap the SPA consumes, mounted
+      # read-only. The volume is optional so a cluster without branding still
+      # starts and renders the historical unbranded page.
+      - equal:
+          path: spec.template.spec.containers[0].volumeMounts[0].name
+          value: branding
+      - equal:
+          path: spec.template.spec.containers[0].volumeMounts[0].mountPath
+          value: /etc/cozystack/branding
+      - equal:
+          path: spec.template.spec.containers[0].volumeMounts[0].readOnly
+          value: true
+      - contains:
+          path: spec.template.spec.volumes
+          content:
+            name: branding
+            configMap:
+              name: cozy-dashboard-console-config
+              optional: true
+
+  # The OIDC branch runs oauth2-proxy, whose login is served by Keycloak (already
+  # branded via the realm theme), so the branding ConfigMap must not be mounted
+  # there — pin its absence so a refactor that hoists the volume out of the
+  # non-OIDC guard is a test failure.
+  - it: oidc-enabled=true does not mount the branding config
+    set:
+      _cluster:
+        root-host: example.org
+        oidc-enabled: "true"
+    asserts:
+      - notExists:
+          path: spec.template.spec.volumes
+      - notExists:
+          path: spec.template.spec.containers[0].volumeMounts
+
+  # authentication.oidc.enabled defaults to false while keycloakInternalUrl now
+  # defaults to the in-cluster Service, so THIS pair — OIDC off, internal URL
+  # set — is what most clusters actually render. The internal-URL block is
+  # nested inside the oidc-enabled guard, so it cannot leak into the
+  # token-proxy branch today; pin that, because a refactor which hoists the
+  # block out would otherwise ship silently.
+  - it: oidc-enabled=false ignores a set keycloak-internal-url
+    set:
+      _cluster:
+        root-host: example.org
+        oidc-enabled: "false"
+        keycloak-internal-url: http://keycloak-http.cozy-keycloak.svc:8080/realms/cozy
+      tokenProxy:
+        image: example.invalid/token-proxy:test
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].name
+          value: token-proxy
+      - notContains:
+          path: spec.template.spec.containers[0].args
+          content: --skip-oidc-discovery
+      - notContains:
+          path: spec.template.spec.containers[0].args
+          content: --redeem-url=http://keycloak-http.cozy-keycloak.svc:8080/realms/cozy/protocol/openid-connect/token
+      - notContains:
+          path: spec.template.spec.containers[0].args
+          content: --oidc-jwks-url=http://keycloak-http.cozy-keycloak.svc:8080/realms/cozy/protocol/openid-connect/certs
 
   - it: oidc-enabled=true renders auth-proxy with /ping probes and no startupProbe
     set:
@@ -74,3 +137,151 @@ tests:
       - equal:
           path: spec.template.spec.containers[0].ports[0].containerPort
           value: 8000
+
+  # keycloak-internal-url arrives on the _cluster channel from
+  # authentication.oidc.keycloakInternalUrl in packages/core/platform. Its
+  # default is the in-cluster Keycloak Service, so the value asserted below is
+  # what a stock cluster ships: oauth2-proxy skips OIDC discovery and talks to
+  # the Service for token/jwks/userinfo/logout, which keeps the dashboard
+  # independent of the root ingress serving keycloak.<host> at startup. The
+  # browser-facing URLs (redirect, login) must stay on the external host —
+  # routing them to a cluster-internal address would send the user's browser to
+  # an unreachable URL.
+  - it: default in-cluster keycloak URL skips discovery and keeps browser URLs external
+    set:
+      _cluster:
+        root-host: example.org
+        oidc-enabled: "true"
+        keycloak-internal-url: http://keycloak-http.cozy-keycloak.svc:8080/realms/cozy
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: --skip-oidc-discovery
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: --redeem-url=http://keycloak-http.cozy-keycloak.svc:8080/realms/cozy/protocol/openid-connect/token
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: --oidc-jwks-url=http://keycloak-http.cozy-keycloak.svc:8080/realms/cozy/protocol/openid-connect/certs
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: --validate-url=http://keycloak-http.cozy-keycloak.svc:8080/realms/cozy/protocol/openid-connect/userinfo
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: --backend-logout-url=http://keycloak-http.cozy-keycloak.svc:8080/realms/cozy/protocol/openid-connect/logout?id_token_hint={id_token}
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: --redirect-url=https://dashboard.example.org/oauth2/callback
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: --login-url=https://keycloak.example.org/realms/cozy/protocol/openid-connect/auth
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: --oidc-issuer-url=https://keycloak.example.org/realms/cozy
+
+  - it: an explicit keycloak-internal-url override wins over the default
+    set:
+      _cluster:
+        root-host: example.org
+        oidc-enabled: "true"
+        keycloak-internal-url: http://keycloak.example.test:8080/realms/other
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: --skip-oidc-discovery
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: --redeem-url=http://keycloak.example.test:8080/realms/other/protocol/openid-connect/token
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: --oidc-jwks-url=http://keycloak.example.test:8080/realms/other/protocol/openid-connect/certs
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: --validate-url=http://keycloak.example.test:8080/realms/other/protocol/openid-connect/userinfo
+      - notContains:
+          path: spec.template.spec.containers[0].args
+          content: --redeem-url=http://keycloak-http.cozy-keycloak.svc:8080/realms/cozy/protocol/openid-connect/token
+
+  # The escape hatch: an operator who sets keycloakInternalUrl back to "" gets
+  # the historical shape — full OIDC discovery against the external issuer, no
+  # backend URLs pinned. It must keep working, so pin it.
+  #
+  # --skip-oidc-discovery carries the whole meaning here. All five in-cluster
+  # args live inside one {{- if $keycloakInternalUrl }} block in the template,
+  # so its absence structurally guarantees the absence of the other four; the
+  # notContains assertions below then pin the regression that actually threatens
+  # this branch — the in-cluster default leaking back in. Asserting an arg count
+  # instead would couple this OIDC test to every unrelated gatekeeper flag.
+  - it: empty keycloak-internal-url restores external OIDC discovery
+    set:
+      _cluster:
+        root-host: example.org
+        oidc-enabled: "true"
+        keycloak-internal-url: ""
+    asserts:
+      - notContains:
+          path: spec.template.spec.containers[0].args
+          content: --skip-oidc-discovery
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: --oidc-issuer-url=https://keycloak.example.org/realms/cozy
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: --backend-logout-url=https://keycloak.example.org/realms/cozy/protocol/openid-connect/logout?id_token_hint={id_token}
+      - notContains:
+          path: spec.template.spec.containers[0].args
+          content: --redeem-url=http://keycloak-http.cozy-keycloak.svc:8080/realms/cozy/protocol/openid-connect/token
+      - notContains:
+          path: spec.template.spec.containers[0].args
+          content: --oidc-jwks-url=http://keycloak-http.cozy-keycloak.svc:8080/realms/cozy/protocol/openid-connect/certs
+      - notContains:
+          path: spec.template.spec.containers[0].args
+          content: --validate-url=http://keycloak-http.cozy-keycloak.svc:8080/realms/cozy/protocol/openid-connect/userinfo
+      - notContains:
+          path: spec.template.spec.containers[0].args
+          content: --backend-logout-url=http://keycloak-http.cozy-keycloak.svc:8080/realms/cozy/protocol/openid-connect/logout?id_token_hint={id_token}
+
+  # The realm segment of the browser-facing issuer/login/logout URLs is driven
+  # by _cluster.oidc-realm-name (authentication.oidc.realmName in the platform).
+  # A renamed realm must reach every one of them; a URL left on the literal
+  # "cozy" would send the browser to a realm the apiserver OIDC issuer no longer
+  # matches, silently breaking SSO.
+  - it: threads a custom realm name through the browser-facing OIDC URLs
+    set:
+      _cluster:
+        root-host: example.org
+        oidc-enabled: "true"
+        oidc-realm-name: acme
+        keycloak-internal-url: http://keycloak-http.cozy-keycloak.svc:8080/realms/acme
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: --oidc-issuer-url=https://keycloak.example.org/realms/acme
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: --login-url=https://keycloak.example.org/realms/acme/protocol/openid-connect/auth
+      - notContains:
+          path: spec.template.spec.containers[0].args
+          content: --oidc-issuer-url=https://keycloak.example.org/realms/cozy
+
+  # The external-discovery branch (empty internal URL) builds its own
+  # backend-logout-url on the browser host, so the realm segment there must
+  # follow oidc-realm-name too; reverting $realm in that branch alone would
+  # otherwise survive the suite.
+  - it: threads a custom realm into the external-discovery logout URL
+    set:
+      _cluster:
+        root-host: example.org
+        oidc-enabled: "true"
+        oidc-realm-name: acme
+        keycloak-internal-url: ""
+    asserts:
+      - notContains:
+          path: spec.template.spec.containers[0].args
+          content: --skip-oidc-discovery
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: --backend-logout-url=https://keycloak.example.org/realms/acme/protocol/openid-connect/logout?id_token_hint={id_token}
+      - notContains:
+          path: spec.template.spec.containers[0].args
+          content: --backend-logout-url=https://keycloak.example.org/realms/cozy/protocol/openid-connect/logout?id_token_hint={id_token}
diff --git a/packages/system/dashboard/tests/ingress_wildcard_test.yaml b/packages/system/dashboard/tests/ingress_wildcard_test.yaml
new file mode 100644
index 0000000000..fab9576770
--- /dev/null
+++ b/packages/system/dashboard/tests/ingress_wildcard_test.yaml
@@ -0,0 +1,48 @@
+suite: dashboard ingress wildcard mode drops per-host ACME
+templates:
+  - templates/ingress.yaml
+
+release:
+  name: dashboard
+  namespace: cozy-dashboard
+
+# In operator-supplied wildcard mode (_cluster.wildcard-secret-name set)
+# the ingress controller serves the wildcard as its default SSL cert, so
+# the dashboard Ingress must not request its own cert-manager cert: the
+# cert-manager annotation and the per-host tls secretName are dropped
+# (the tls section stays so the HTTPS redirect keeps working against
+# the default SSL certificate). Without wildcard mode the per-host ACME
+# path is unchanged.
+
+tests:
+  - it: drops cert-manager annotation and tls secretName when wildcard secret is set
+    set:
+      _cluster:
+        root-host: example.org
+        expose-services: "dashboard"
+        gateway-enabled: "false"
+        wildcard-secret-name: wildcard-tls
+    asserts:
+      - equal:
+          path: kind
+          value: Ingress
+      - notExists:
+          path: metadata.annotations["cert-manager.io/cluster-issuer"]
+      - exists:
+          path: spec.tls
+      - notExists:
+          path: spec.tls[0].secretName
+
+  - it: keeps cert-manager annotation and tls secretName without wildcard secret
+    set:
+      _cluster:
+        root-host: example.org
+        expose-services: "dashboard"
+        gateway-enabled: "false"
+    asserts:
+      - equal:
+          path: metadata.annotations["cert-manager.io/cluster-issuer"]
+          value: letsencrypt-prod
+      - equal:
+          path: spec.tls[0].secretName
+          value: dashboard-web-tls
diff --git a/packages/system/dashboard/tests/standalone_render_test.yaml b/packages/system/dashboard/tests/standalone_render_test.yaml
new file mode 100644
index 0000000000..a2f2553d36
--- /dev/null
+++ b/packages/system/dashboard/tests/standalone_render_test.yaml
@@ -0,0 +1,23 @@
+suite: dashboard renders with no platform values injected
+release:
+  name: dashboard
+  namespace: cozy-dashboard
+
+# The platform injects _cluster through the cozystack-values Secret, so every
+# case that sets it itself renders fine whether or not values.yaml declares
+# the key. This case supplies nothing. Drop the declaration from values.yaml
+# and the render dies on "index of untyped nil" before a single assert runs;
+# the declaration is the only thing keeping the chart renderable outside a
+# cluster. No suite-level `templates:` list here on purpose: it would narrow
+# the render to the listed files and let a later template reintroduce the
+# same breakage unseen.
+
+tests:
+  - it: exposes nothing when _cluster is absent
+    asserts:
+      - template: templates/ingress.yaml
+        hasDocuments:
+          count: 0
+      - template: templates/httproute.yaml
+        hasDocuments:
+          count: 0
diff --git a/packages/system/dashboard/values.yaml b/packages/system/dashboard/values.yaml
index 80daacd9f6..11bb0dcade 100644
--- a/packages/system/dashboard/values.yaml
+++ b/packages/system/dashboard/values.yaml
@@ -1,4 +1,8 @@
+# Injected by the platform from the cozystack-values Secret. The empty
+# default keeps the chart renderable on its own, outside a cluster.
+_cluster: {}
+
 console:
-  image: ghcr.io/cozystack/cozystack/cozystack-ui:v1.4.0-rc.2@sha256:7e3d2f132de5ac2071a8f90fc15d4cc1f3f773c1589108d9e232f073d10812b6
+  image: ghcr.io/cozystack/cozystack/cozystack-ui:v1.6.0@sha256:ad0e132ce506bbc9e0f6a5dfb94311c9bbc08da3d8eca84eb0e527ba6c1a8897
 tokenProxy:
-  image: ghcr.io/cozystack/cozystack/token-proxy:v1.4.0-rc.2@sha256:ef3ea9deb9f63d61917d4409b4c408a48a2b55e519da0c95754d05b9b652401c
+  image: ghcr.io/cozystack/cozystack/token-proxy:v1.6.0@sha256:97124c012246c33cdcac60e8f884097b48c0081624716fe8161efc2b3ceeb2a8
diff --git a/packages/system/etcd-operator-crds/.helmignore b/packages/system/etcd-operator-crds/.helmignore
new file mode 100644
index 0000000000..ff3a0bcd6c
--- /dev/null
+++ b/packages/system/etcd-operator-crds/.helmignore
@@ -0,0 +1,2 @@
+.helmignore
+Makefile
diff --git a/packages/system/etcd-operator-crds/Chart.yaml b/packages/system/etcd-operator-crds/Chart.yaml
new file mode 100644
index 0000000000..4cc4dd60d0
--- /dev/null
+++ b/packages/system/etcd-operator-crds/Chart.yaml
@@ -0,0 +1,5 @@
+apiVersion: v2
+name: cozy-etcd-operator-crds
+description: CRDs for the cozystack etcd-operator (etcd-operator.cozystack.io/v1alpha2)
+type: application
+version: 0.0.0 # Placeholder, the actual version will be automatically set during the build process
diff --git a/packages/system/etcd-operator-crds/Makefile b/packages/system/etcd-operator-crds/Makefile
new file mode 100644
index 0000000000..02327e2197
--- /dev/null
+++ b/packages/system/etcd-operator-crds/Makefile
@@ -0,0 +1,30 @@
+export NAME=etcd-operator-crds
+export NAMESPACE=cozy-etcd-operator
+
+include ../../../hack/package.mk
+
+test:
+	helm unittest .
+
+# Pinned ref of github.com/cozystack/etcd-operator to vendor CRDs from.
+ETCD_OPERATOR_REF ?= v0.5.6
+
+# controller-gen writes the CRDs to charts/etcd-operator/crd-bases/ upstream (there
+# is no config/crd kustomization). Vendor each verbatim and stamp
+# helm.sh/resource-policy: keep so a chart uninstall never garbage-collects the
+# CRDs and, with them, every EtcdCluster/EtcdMember/EtcdSnapshot in the cluster.
+# The stamp is anchored on a line upstream controls, so count the result: one
+# annotation per CRD, or the update fails. templates/ is replaced only after
+# every CRD has been counted, so a failure leaves the vendored files as they
+# were.
+CRDS = etcdclusters etcddefragpolicies etcddefrags etcdmembers etcdsnapshots
+update:
+	@set -e; tmp=$$(mktemp -d); trap 'rm -rf "$$tmp"' EXIT; \
+	for c in $(CRDS); do \
+	  curl -fsSL "https://raw.githubusercontent.com/cozystack/etcd-operator/$(ETCD_OPERATOR_REF)/charts/etcd-operator/crd-bases/etcd-operator.cozystack.io_$$c.yaml" -o "$$tmp/$$c.src"; \
+	  awk '/^    controller-gen.kubebuilder.io\/version:/{print; print "    helm.sh/resource-policy: keep"; next} {print}' "$$tmp/$$c.src" > "$$tmp/$$c.yaml"; \
+	  n=$$(grep -c '^    helm.sh/resource-policy: keep$$' "$$tmp/$$c.yaml" || true); \
+	  [ "$$n" -eq 1 ] || { echo "$$c: stamped $$n keep annotations, expected 1" >&2; exit 1; }; \
+	done; \
+	rm -rf templates; mkdir templates; \
+	for c in $(CRDS); do mv "$$tmp/$$c.yaml" templates/$$c.yaml; done
diff --git a/packages/system/etcd-operator-crds/templates/etcdclusters.yaml b/packages/system/etcd-operator-crds/templates/etcdclusters.yaml
new file mode 100644
index 0000000000..3d2d0f4c57
--- /dev/null
+++ b/packages/system/etcd-operator-crds/templates/etcdclusters.yaml
@@ -0,0 +1,3304 @@
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.18.0
+    helm.sh/resource-policy: keep
+  name: etcdclusters.etcd-operator.cozystack.io
+spec:
+  group: etcd-operator.cozystack.io
+  names:
+    kind: EtcdCluster
+    listKind: EtcdClusterList
+    plural: etcdclusters
+    singular: etcdcluster
+  scope: Namespaced
+  versions:
+  - additionalPrinterColumns:
+    - jsonPath: .spec.version
+      name: Version
+      type: string
+    - jsonPath: .spec.replicas
+      name: Replicas
+      type: integer
+    - jsonPath: .status.readyMembers
+      name: Ready
+      type: integer
+    - jsonPath: .metadata.creationTimestamp
+      name: Age
+      type: date
+    name: v1alpha2
+    schema:
+      openAPIV3Schema:
+        description: EtcdCluster is the Schema for the etcdclusters API.
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: |-
+              EtcdClusterSpec defines the desired state of an etcd cluster.
+
+              CEL validation rules (k8s 1.29+ apiserver-enforced; both
+              CustomResourceValidationExpressions and the quantity() extension
+              are GA in 1.29):
+
+                - storage.medium=Memory + replicas=0 wedges the cluster on resume
+                  (the dormant flip deletes the Pod and the tmpfs goes with it but
+                  the resume path treats the member as if its data were preserved).
+                  Reject the combination outright; recreate is the only safe path.
+
+                - storage.medium=Memory requires storage.size > 0. Without a SizeLimit
+                  the tmpfs is unbounded against node memory, which defeats the whole
+                  point of opting into memory backing.
+            properties:
+              additionalMetadata:
+                description: |-
+                  AdditionalMetadata holds extra labels and annotations the operator
+                  merges onto every object it creates for this cluster — member Pods,
+                  the per-member data PVCs, the client and headless Services, the
+                  PodDisruptionBudget, and the EtcdMember CRs. Operator-owned keys
+                  (the app.kubernetes.io/* set and the cluster/role labels, and any
+                  operator-set annotation) always win on collision, so this cannot be
+                  used to shadow the operator's own metadata.
+
+                  Like spec.resources, changes take effect on newly-created objects
+                  (scale-up, replacement); the operator does not re-stamp existing
+                  Pods in place. The value is latched through status.observed with the
+                  rest of the target spec, so a mid-flight edit only applies once the
+                  current target is reached.
+                properties:
+                  annotations:
+                    additionalProperties:
+                      type: string
+                    description: Annotations are extra annotations merged onto created
+                      objects.
+                    type: object
+                  labels:
+                    additionalProperties:
+                      type: string
+                    description: |-
+                      Labels are extra labels merged onto created objects. Operator-owned
+                      label keys take precedence on collision.
+                    type: object
+                type: object
+              affinity:
+                description: |-
+                  Affinity sets the scheduling affinity/anti-affinity for member Pods.
+                  Passed straight through to each member Pod's spec.affinity. A common
+                  use is a pod anti-affinity on app.kubernetes.io/instance=<cluster> to
+                  keep members off the same node.
+
+                  Updates take effect on newly-created members (scale-up, replacement);
+                  the operator does not roll existing Pods to apply an affinity change
+                  in place.
+                properties:
+                  nodeAffinity:
+                    description: Describes node affinity scheduling rules for the
+                      pod.
+                    properties:
+                      preferredDuringSchedulingIgnoredDuringExecution:
+                        description: |-
+                          The scheduler will prefer to schedule pods to nodes that satisfy
+                          the affinity expressions specified by this field, but it may choose
+                          a node that violates one or more of the expressions. The node that is
+                          most preferred is the one with the greatest sum of weights, i.e.
+                          for each node that meets all of the scheduling requirements (resource
+                          request, requiredDuringScheduling affinity expressions, etc.),
+                          compute a sum by iterating through the elements of this field and adding
+                          "weight" to the sum if the node matches the corresponding matchExpressions; the
+                          node(s) with the highest sum are the most preferred.
+                        items:
+                          description: |-
+                            An empty preferred scheduling term matches all objects with implicit weight 0
+                            (i.e. it's a no-op). A null preferred scheduling term matches no objects (i.e. is also a no-op).
+                          properties:
+                            preference:
+                              description: A node selector term, associated with the
+                                corresponding weight.
+                              properties:
+                                matchExpressions:
+                                  description: A list of node selector requirements
+                                    by node's labels.
+                                  items:
+                                    description: |-
+                                      A node selector requirement is a selector that contains values, a key, and an operator
+                                      that relates the key and values.
+                                    properties:
+                                      key:
+                                        description: The label key that the selector
+                                          applies to.
+                                        type: string
+                                      operator:
+                                        description: |-
+                                          Represents a key's relationship to a set of values.
+                                          Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt.
+                                        type: string
+                                      values:
+                                        description: |-
+                                          An array of string values. If the operator is In or NotIn,
+                                          the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                          the values array must be empty. If the operator is Gt or Lt, the values
+                                          array must have a single element, which will be interpreted as an integer.
+                                          This array is replaced during a strategic merge patch.
+                                        items:
+                                          type: string
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                    required:
+                                    - key
+                                    - operator
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                matchFields:
+                                  description: A list of node selector requirements
+                                    by node's fields.
+                                  items:
+                                    description: |-
+                                      A node selector requirement is a selector that contains values, a key, and an operator
+                                      that relates the key and values.
+                                    properties:
+                                      key:
+                                        description: The label key that the selector
+                                          applies to.
+                                        type: string
+                                      operator:
+                                        description: |-
+                                          Represents a key's relationship to a set of values.
+                                          Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt.
+                                        type: string
+                                      values:
+                                        description: |-
+                                          An array of string values. If the operator is In or NotIn,
+                                          the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                          the values array must be empty. If the operator is Gt or Lt, the values
+                                          array must have a single element, which will be interpreted as an integer.
+                                          This array is replaced during a strategic merge patch.
+                                        items:
+                                          type: string
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                    required:
+                                    - key
+                                    - operator
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            weight:
+                              description: Weight associated with matching the corresponding
+                                nodeSelectorTerm, in the range 1-100.
+                              format: int32
+                              type: integer
+                          required:
+                          - preference
+                          - weight
+                          type: object
+                        type: array
+                        x-kubernetes-list-type: atomic
+                      requiredDuringSchedulingIgnoredDuringExecution:
+                        description: |-
+                          If the affinity requirements specified by this field are not met at
+                          scheduling time, the pod will not be scheduled onto the node.
+                          If the affinity requirements specified by this field cease to be met
+                          at some point during pod execution (e.g. due to an update), the system
+                          may or may not try to eventually evict the pod from its node.
+                        properties:
+                          nodeSelectorTerms:
+                            description: Required. A list of node selector terms.
+                              The terms are ORed.
+                            items:
+                              description: |-
+                                A null or empty node selector term matches no objects. The requirements of
+                                them are ANDed.
+                                The TopologySelectorTerm type implements a subset of the NodeSelectorTerm.
+                              properties:
+                                matchExpressions:
+                                  description: A list of node selector requirements
+                                    by node's labels.
+                                  items:
+                                    description: |-
+                                      A node selector requirement is a selector that contains values, a key, and an operator
+                                      that relates the key and values.
+                                    properties:
+                                      key:
+                                        description: The label key that the selector
+                                          applies to.
+                                        type: string
+                                      operator:
+                                        description: |-
+                                          Represents a key's relationship to a set of values.
+                                          Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt.
+                                        type: string
+                                      values:
+                                        description: |-
+                                          An array of string values. If the operator is In or NotIn,
+                                          the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                          the values array must be empty. If the operator is Gt or Lt, the values
+                                          array must have a single element, which will be interpreted as an integer.
+                                          This array is replaced during a strategic merge patch.
+                                        items:
+                                          type: string
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                    required:
+                                    - key
+                                    - operator
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                matchFields:
+                                  description: A list of node selector requirements
+                                    by node's fields.
+                                  items:
+                                    description: |-
+                                      A node selector requirement is a selector that contains values, a key, and an operator
+                                      that relates the key and values.
+                                    properties:
+                                      key:
+                                        description: The label key that the selector
+                                          applies to.
+                                        type: string
+                                      operator:
+                                        description: |-
+                                          Represents a key's relationship to a set of values.
+                                          Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt.
+                                        type: string
+                                      values:
+                                        description: |-
+                                          An array of string values. If the operator is In or NotIn,
+                                          the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                          the values array must be empty. If the operator is Gt or Lt, the values
+                                          array must have a single element, which will be interpreted as an integer.
+                                          This array is replaced during a strategic merge patch.
+                                        items:
+                                          type: string
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                    required:
+                                    - key
+                                    - operator
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            type: array
+                            x-kubernetes-list-type: atomic
+                        required:
+                        - nodeSelectorTerms
+                        type: object
+                        x-kubernetes-map-type: atomic
+                    type: object
+                  podAffinity:
+                    description: Describes pod affinity scheduling rules (e.g. co-locate
+                      this pod in the same node, zone, etc. as some other pod(s)).
+                    properties:
+                      preferredDuringSchedulingIgnoredDuringExecution:
+                        description: |-
+                          The scheduler will prefer to schedule pods to nodes that satisfy
+                          the affinity expressions specified by this field, but it may choose
+                          a node that violates one or more of the expressions. The node that is
+                          most preferred is the one with the greatest sum of weights, i.e.
+                          for each node that meets all of the scheduling requirements (resource
+                          request, requiredDuringScheduling affinity expressions, etc.),
+                          compute a sum by iterating through the elements of this field and adding
+                          "weight" to the sum if the node has pods which matches the corresponding podAffinityTerm; the
+                          node(s) with the highest sum are the most preferred.
+                        items:
+                          description: The weights of all of the matched WeightedPodAffinityTerm
+                            fields are added per-node to find the most preferred node(s)
+                          properties:
+                            podAffinityTerm:
+                              description: Required. A pod affinity term, associated
+                                with the corresponding weight.
+                              properties:
+                                labelSelector:
+                                  description: |-
+                                    A label query over a set of resources, in this case pods.
+                                    If it's null, this PodAffinityTerm matches with no Pods.
+                                  properties:
+                                    matchExpressions:
+                                      description: matchExpressions is a list of label
+                                        selector requirements. The requirements are
+                                        ANDed.
+                                      items:
+                                        description: |-
+                                          A label selector requirement is a selector that contains values, a key, and an operator that
+                                          relates the key and values.
+                                        properties:
+                                          key:
+                                            description: key is the label key that
+                                              the selector applies to.
+                                            type: string
+                                          operator:
+                                            description: |-
+                                              operator represents a key's relationship to a set of values.
+                                              Valid operators are In, NotIn, Exists and DoesNotExist.
+                                            type: string
+                                          values:
+                                            description: |-
+                                              values is an array of string values. If the operator is In or NotIn,
+                                              the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                              the values array must be empty. This array is replaced during a strategic
+                                              merge patch.
+                                            items:
+                                              type: string
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                        required:
+                                        - key
+                                        - operator
+                                        type: object
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    matchLabels:
+                                      additionalProperties:
+                                        type: string
+                                      description: |-
+                                        matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                        map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                        operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                      type: object
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                matchLabelKeys:
+                                  description: |-
+                                    MatchLabelKeys is a set of pod label keys to select which pods will
+                                    be taken into consideration. The keys are used to lookup values from the
+                                    incoming pod labels, those key-value labels are merged with `labelSelector` as `key in (value)`
+                                    to select the group of existing pods which pods will be taken into consideration
+                                    for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+                                    pod labels will be ignored. The default value is empty.
+                                    The same key is forbidden to exist in both matchLabelKeys and labelSelector.
+                                    Also, matchLabelKeys cannot be set when labelSelector isn't set.
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                mismatchLabelKeys:
+                                  description: |-
+                                    MismatchLabelKeys is a set of pod label keys to select which pods will
+                                    be taken into consideration. The keys are used to lookup values from the
+                                    incoming pod labels, those key-value labels are merged with `labelSelector` as `key notin (value)`
+                                    to select the group of existing pods which pods will be taken into consideration
+                                    for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+                                    pod labels will be ignored. The default value is empty.
+                                    The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
+                                    Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                namespaceSelector:
+                                  description: |-
+                                    A label query over the set of namespaces that the term applies to.
+                                    The term is applied to the union of the namespaces selected by this field
+                                    and the ones listed in the namespaces field.
+                                    null selector and null or empty namespaces list means "this pod's namespace".
+                                    An empty selector ({}) matches all namespaces.
+                                  properties:
+                                    matchExpressions:
+                                      description: matchExpressions is a list of label
+                                        selector requirements. The requirements are
+                                        ANDed.
+                                      items:
+                                        description: |-
+                                          A label selector requirement is a selector that contains values, a key, and an operator that
+                                          relates the key and values.
+                                        properties:
+                                          key:
+                                            description: key is the label key that
+                                              the selector applies to.
+                                            type: string
+                                          operator:
+                                            description: |-
+                                              operator represents a key's relationship to a set of values.
+                                              Valid operators are In, NotIn, Exists and DoesNotExist.
+                                            type: string
+                                          values:
+                                            description: |-
+                                              values is an array of string values. If the operator is In or NotIn,
+                                              the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                              the values array must be empty. This array is replaced during a strategic
+                                              merge patch.
+                                            items:
+                                              type: string
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                        required:
+                                        - key
+                                        - operator
+                                        type: object
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    matchLabels:
+                                      additionalProperties:
+                                        type: string
+                                      description: |-
+                                        matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                        map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                        operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                      type: object
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                namespaces:
+                                  description: |-
+                                    namespaces specifies a static list of namespace names that the term applies to.
+                                    The term is applied to the union of the namespaces listed in this field
+                                    and the ones selected by namespaceSelector.
+                                    null or empty namespaces list and null namespaceSelector means "this pod's namespace".
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                topologyKey:
+                                  description: |-
+                                    This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching
+                                    the labelSelector in the specified namespaces, where co-located is defined as running on a node
+                                    whose value of the label with key topologyKey matches that of any node on which any of the
+                                    selected pods is running.
+                                    Empty topologyKey is not allowed.
+                                  type: string
+                              required:
+                              - topologyKey
+                              type: object
+                            weight:
+                              description: |-
+                                weight associated with matching the corresponding podAffinityTerm,
+                                in the range 1-100.
+                              format: int32
+                              type: integer
+                          required:
+                          - podAffinityTerm
+                          - weight
+                          type: object
+                        type: array
+                        x-kubernetes-list-type: atomic
+                      requiredDuringSchedulingIgnoredDuringExecution:
+                        description: |-
+                          If the affinity requirements specified by this field are not met at
+                          scheduling time, the pod will not be scheduled onto the node.
+                          If the affinity requirements specified by this field cease to be met
+                          at some point during pod execution (e.g. due to a pod label update), the
+                          system may or may not try to eventually evict the pod from its node.
+                          When there are multiple elements, the lists of nodes corresponding to each
+                          podAffinityTerm are intersected, i.e. all terms must be satisfied.
+                        items:
+                          description: |-
+                            Defines a set of pods (namely those matching the labelSelector
+                            relative to the given namespace(s)) that this pod should be
+                            co-located (affinity) or not co-located (anti-affinity) with,
+                            where co-located is defined as running on a node whose value of
+                            the label with key <topologyKey> matches that of any node on which
+                            a pod of the set of pods is running
+                          properties:
+                            labelSelector:
+                              description: |-
+                                A label query over a set of resources, in this case pods.
+                                If it's null, this PodAffinityTerm matches with no Pods.
+                              properties:
+                                matchExpressions:
+                                  description: matchExpressions is a list of label
+                                    selector requirements. The requirements are ANDed.
+                                  items:
+                                    description: |-
+                                      A label selector requirement is a selector that contains values, a key, and an operator that
+                                      relates the key and values.
+                                    properties:
+                                      key:
+                                        description: key is the label key that the
+                                          selector applies to.
+                                        type: string
+                                      operator:
+                                        description: |-
+                                          operator represents a key's relationship to a set of values.
+                                          Valid operators are In, NotIn, Exists and DoesNotExist.
+                                        type: string
+                                      values:
+                                        description: |-
+                                          values is an array of string values. If the operator is In or NotIn,
+                                          the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                          the values array must be empty. This array is replaced during a strategic
+                                          merge patch.
+                                        items:
+                                          type: string
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                    required:
+                                    - key
+                                    - operator
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                matchLabels:
+                                  additionalProperties:
+                                    type: string
+                                  description: |-
+                                    matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                    map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                    operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                  type: object
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            matchLabelKeys:
+                              description: |-
+                                MatchLabelKeys is a set of pod label keys to select which pods will
+                                be taken into consideration. The keys are used to lookup values from the
+                                incoming pod labels, those key-value labels are merged with `labelSelector` as `key in (value)`
+                                to select the group of existing pods which pods will be taken into consideration
+                                for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+                                pod labels will be ignored. The default value is empty.
+                                The same key is forbidden to exist in both matchLabelKeys and labelSelector.
+                                Also, matchLabelKeys cannot be set when labelSelector isn't set.
+                              items:
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            mismatchLabelKeys:
+                              description: |-
+                                MismatchLabelKeys is a set of pod label keys to select which pods will
+                                be taken into consideration. The keys are used to lookup values from the
+                                incoming pod labels, those key-value labels are merged with `labelSelector` as `key notin (value)`
+                                to select the group of existing pods which pods will be taken into consideration
+                                for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+                                pod labels will be ignored. The default value is empty.
+                                The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
+                                Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
+                              items:
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            namespaceSelector:
+                              description: |-
+                                A label query over the set of namespaces that the term applies to.
+                                The term is applied to the union of the namespaces selected by this field
+                                and the ones listed in the namespaces field.
+                                null selector and null or empty namespaces list means "this pod's namespace".
+                                An empty selector ({}) matches all namespaces.
+                              properties:
+                                matchExpressions:
+                                  description: matchExpressions is a list of label
+                                    selector requirements. The requirements are ANDed.
+                                  items:
+                                    description: |-
+                                      A label selector requirement is a selector that contains values, a key, and an operator that
+                                      relates the key and values.
+                                    properties:
+                                      key:
+                                        description: key is the label key that the
+                                          selector applies to.
+                                        type: string
+                                      operator:
+                                        description: |-
+                                          operator represents a key's relationship to a set of values.
+                                          Valid operators are In, NotIn, Exists and DoesNotExist.
+                                        type: string
+                                      values:
+                                        description: |-
+                                          values is an array of string values. If the operator is In or NotIn,
+                                          the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                          the values array must be empty. This array is replaced during a strategic
+                                          merge patch.
+                                        items:
+                                          type: string
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                    required:
+                                    - key
+                                    - operator
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                matchLabels:
+                                  additionalProperties:
+                                    type: string
+                                  description: |-
+                                    matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                    map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                    operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                  type: object
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            namespaces:
+                              description: |-
+                                namespaces specifies a static list of namespace names that the term applies to.
+                                The term is applied to the union of the namespaces listed in this field
+                                and the ones selected by namespaceSelector.
+                                null or empty namespaces list and null namespaceSelector means "this pod's namespace".
+                              items:
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            topologyKey:
+                              description: |-
+                                This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching
+                                the labelSelector in the specified namespaces, where co-located is defined as running on a node
+                                whose value of the label with key topologyKey matches that of any node on which any of the
+                                selected pods is running.
+                                Empty topologyKey is not allowed.
+                              type: string
+                          required:
+                          - topologyKey
+                          type: object
+                        type: array
+                        x-kubernetes-list-type: atomic
+                    type: object
+                  podAntiAffinity:
+                    description: Describes pod anti-affinity scheduling rules (e.g.
+                      avoid putting this pod in the same node, zone, etc. as some
+                      other pod(s)).
+                    properties:
+                      preferredDuringSchedulingIgnoredDuringExecution:
+                        description: |-
+                          The scheduler will prefer to schedule pods to nodes that satisfy
+                          the anti-affinity expressions specified by this field, but it may choose
+                          a node that violates one or more of the expressions. The node that is
+                          most preferred is the one with the greatest sum of weights, i.e.
+                          for each node that meets all of the scheduling requirements (resource
+                          request, requiredDuringScheduling anti-affinity expressions, etc.),
+                          compute a sum by iterating through the elements of this field and adding
+                          "weight" to the sum if the node has pods which matches the corresponding podAffinityTerm; the
+                          node(s) with the highest sum are the most preferred.
+                        items:
+                          description: The weights of all of the matched WeightedPodAffinityTerm
+                            fields are added per-node to find the most preferred node(s)
+                          properties:
+                            podAffinityTerm:
+                              description: Required. A pod affinity term, associated
+                                with the corresponding weight.
+                              properties:
+                                labelSelector:
+                                  description: |-
+                                    A label query over a set of resources, in this case pods.
+                                    If it's null, this PodAffinityTerm matches with no Pods.
+                                  properties:
+                                    matchExpressions:
+                                      description: matchExpressions is a list of label
+                                        selector requirements. The requirements are
+                                        ANDed.
+                                      items:
+                                        description: |-
+                                          A label selector requirement is a selector that contains values, a key, and an operator that
+                                          relates the key and values.
+                                        properties:
+                                          key:
+                                            description: key is the label key that
+                                              the selector applies to.
+                                            type: string
+                                          operator:
+                                            description: |-
+                                              operator represents a key's relationship to a set of values.
+                                              Valid operators are In, NotIn, Exists and DoesNotExist.
+                                            type: string
+                                          values:
+                                            description: |-
+                                              values is an array of string values. If the operator is In or NotIn,
+                                              the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                              the values array must be empty. This array is replaced during a strategic
+                                              merge patch.
+                                            items:
+                                              type: string
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                        required:
+                                        - key
+                                        - operator
+                                        type: object
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    matchLabels:
+                                      additionalProperties:
+                                        type: string
+                                      description: |-
+                                        matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                        map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                        operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                      type: object
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                matchLabelKeys:
+                                  description: |-
+                                    MatchLabelKeys is a set of pod label keys to select which pods will
+                                    be taken into consideration. The keys are used to lookup values from the
+                                    incoming pod labels, those key-value labels are merged with `labelSelector` as `key in (value)`
+                                    to select the group of existing pods which pods will be taken into consideration
+                                    for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+                                    pod labels will be ignored. The default value is empty.
+                                    The same key is forbidden to exist in both matchLabelKeys and labelSelector.
+                                    Also, matchLabelKeys cannot be set when labelSelector isn't set.
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                mismatchLabelKeys:
+                                  description: |-
+                                    MismatchLabelKeys is a set of pod label keys to select which pods will
+                                    be taken into consideration. The keys are used to lookup values from the
+                                    incoming pod labels, those key-value labels are merged with `labelSelector` as `key notin (value)`
+                                    to select the group of existing pods which pods will be taken into consideration
+                                    for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+                                    pod labels will be ignored. The default value is empty.
+                                    The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
+                                    Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                namespaceSelector:
+                                  description: |-
+                                    A label query over the set of namespaces that the term applies to.
+                                    The term is applied to the union of the namespaces selected by this field
+                                    and the ones listed in the namespaces field.
+                                    null selector and null or empty namespaces list means "this pod's namespace".
+                                    An empty selector ({}) matches all namespaces.
+                                  properties:
+                                    matchExpressions:
+                                      description: matchExpressions is a list of label
+                                        selector requirements. The requirements are
+                                        ANDed.
+                                      items:
+                                        description: |-
+                                          A label selector requirement is a selector that contains values, a key, and an operator that
+                                          relates the key and values.
+                                        properties:
+                                          key:
+                                            description: key is the label key that
+                                              the selector applies to.
+                                            type: string
+                                          operator:
+                                            description: |-
+                                              operator represents a key's relationship to a set of values.
+                                              Valid operators are In, NotIn, Exists and DoesNotExist.
+                                            type: string
+                                          values:
+                                            description: |-
+                                              values is an array of string values. If the operator is In or NotIn,
+                                              the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                              the values array must be empty. This array is replaced during a strategic
+                                              merge patch.
+                                            items:
+                                              type: string
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                        required:
+                                        - key
+                                        - operator
+                                        type: object
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    matchLabels:
+                                      additionalProperties:
+                                        type: string
+                                      description: |-
+                                        matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                        map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                        operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                      type: object
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                namespaces:
+                                  description: |-
+                                    namespaces specifies a static list of namespace names that the term applies to.
+                                    The term is applied to the union of the namespaces listed in this field
+                                    and the ones selected by namespaceSelector.
+                                    null or empty namespaces list and null namespaceSelector means "this pod's namespace".
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                topologyKey:
+                                  description: |-
+                                    This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching
+                                    the labelSelector in the specified namespaces, where co-located is defined as running on a node
+                                    whose value of the label with key topologyKey matches that of any node on which any of the
+                                    selected pods is running.
+                                    Empty topologyKey is not allowed.
+                                  type: string
+                              required:
+                              - topologyKey
+                              type: object
+                            weight:
+                              description: |-
+                                weight associated with matching the corresponding podAffinityTerm,
+                                in the range 1-100.
+                              format: int32
+                              type: integer
+                          required:
+                          - podAffinityTerm
+                          - weight
+                          type: object
+                        type: array
+                        x-kubernetes-list-type: atomic
+                      requiredDuringSchedulingIgnoredDuringExecution:
+                        description: |-
+                          If the anti-affinity requirements specified by this field are not met at
+                          scheduling time, the pod will not be scheduled onto the node.
+                          If the anti-affinity requirements specified by this field cease to be met
+                          at some point during pod execution (e.g. due to a pod label update), the
+                          system may or may not try to eventually evict the pod from its node.
+                          When there are multiple elements, the lists of nodes corresponding to each
+                          podAffinityTerm are intersected, i.e. all terms must be satisfied.
+                        items:
+                          description: |-
+                            Defines a set of pods (namely those matching the labelSelector
+                            relative to the given namespace(s)) that this pod should be
+                            co-located (affinity) or not co-located (anti-affinity) with,
+                            where co-located is defined as running on a node whose value of
+                            the label with key <topologyKey> matches that of any node on which
+                            a pod of the set of pods is running
+                          properties:
+                            labelSelector:
+                              description: |-
+                                A label query over a set of resources, in this case pods.
+                                If it's null, this PodAffinityTerm matches with no Pods.
+                              properties:
+                                matchExpressions:
+                                  description: matchExpressions is a list of label
+                                    selector requirements. The requirements are ANDed.
+                                  items:
+                                    description: |-
+                                      A label selector requirement is a selector that contains values, a key, and an operator that
+                                      relates the key and values.
+                                    properties:
+                                      key:
+                                        description: key is the label key that the
+                                          selector applies to.
+                                        type: string
+                                      operator:
+                                        description: |-
+                                          operator represents a key's relationship to a set of values.
+                                          Valid operators are In, NotIn, Exists and DoesNotExist.
+                                        type: string
+                                      values:
+                                        description: |-
+                                          values is an array of string values. If the operator is In or NotIn,
+                                          the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                          the values array must be empty. This array is replaced during a strategic
+                                          merge patch.
+                                        items:
+                                          type: string
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                    required:
+                                    - key
+                                    - operator
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                matchLabels:
+                                  additionalProperties:
+                                    type: string
+                                  description: |-
+                                    matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                    map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                    operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                  type: object
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            matchLabelKeys:
+                              description: |-
+                                MatchLabelKeys is a set of pod label keys to select which pods will
+                                be taken into consideration. The keys are used to lookup values from the
+                                incoming pod labels, those key-value labels are merged with `labelSelector` as `key in (value)`
+                                to select the group of existing pods which pods will be taken into consideration
+                                for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+                                pod labels will be ignored. The default value is empty.
+                                The same key is forbidden to exist in both matchLabelKeys and labelSelector.
+                                Also, matchLabelKeys cannot be set when labelSelector isn't set.
+                              items:
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            mismatchLabelKeys:
+                              description: |-
+                                MismatchLabelKeys is a set of pod label keys to select which pods will
+                                be taken into consideration. The keys are used to lookup values from the
+                                incoming pod labels, those key-value labels are merged with `labelSelector` as `key notin (value)`
+                                to select the group of existing pods which pods will be taken into consideration
+                                for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+                                pod labels will be ignored. The default value is empty.
+                                The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
+                                Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
+                              items:
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            namespaceSelector:
+                              description: |-
+                                A label query over the set of namespaces that the term applies to.
+                                The term is applied to the union of the namespaces selected by this field
+                                and the ones listed in the namespaces field.
+                                null selector and null or empty namespaces list means "this pod's namespace".
+                                An empty selector ({}) matches all namespaces.
+                              properties:
+                                matchExpressions:
+                                  description: matchExpressions is a list of label
+                                    selector requirements. The requirements are ANDed.
+                                  items:
+                                    description: |-
+                                      A label selector requirement is a selector that contains values, a key, and an operator that
+                                      relates the key and values.
+                                    properties:
+                                      key:
+                                        description: key is the label key that the
+                                          selector applies to.
+                                        type: string
+                                      operator:
+                                        description: |-
+                                          operator represents a key's relationship to a set of values.
+                                          Valid operators are In, NotIn, Exists and DoesNotExist.
+                                        type: string
+                                      values:
+                                        description: |-
+                                          values is an array of string values. If the operator is In or NotIn,
+                                          the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                          the values array must be empty. This array is replaced during a strategic
+                                          merge patch.
+                                        items:
+                                          type: string
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                    required:
+                                    - key
+                                    - operator
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                matchLabels:
+                                  additionalProperties:
+                                    type: string
+                                  description: |-
+                                    matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                    map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                    operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                  type: object
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            namespaces:
+                              description: |-
+                                namespaces specifies a static list of namespace names that the term applies to.
+                                The term is applied to the union of the namespaces listed in this field
+                                and the ones selected by namespaceSelector.
+                                null or empty namespaces list and null namespaceSelector means "this pod's namespace".
+                              items:
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            topologyKey:
+                              description: |-
+                                This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching
+                                the labelSelector in the specified namespaces, where co-located is defined as running on a node
+                                whose value of the label with key topologyKey matches that of any node on which any of the
+                                selected pods is running.
+                                Empty topologyKey is not allowed.
+                              type: string
+                          required:
+                          - topologyKey
+                          type: object
+                        type: array
+                        x-kubernetes-list-type: atomic
+                    type: object
+                type: object
+              auth:
+                description: |-
+                  Auth configures in-etcd authentication. Absent means no auth
+                  (anonymous access on the client API, subject only to TLS). See
+                  AuthSpec for the single-user parity model and its constraints
+                  (requires spec.tls.client; immutable post-create).
+                properties:
+                  enabled:
+                    description: |-
+                      Enabled turns on etcd authentication. The operator provisions the
+                      root user + role and runs `auth enable` once the cluster has
+                      converged to a healthy quorum (see status.authEnabled). Mirrors
+                      `etcdctl auth enable` and the AuthStatusResponse.Enabled field.
+
+                      Requires spec.tls.client to be set: auth credentials must not cross
+                      a plaintext wire. Immutable post-create — enabling or disabling auth
+                      on a live cluster mutates persisted data-store state in lockstep with
+                      the operator's own client, which this version does not roll back, so
+                      the field is frozen the same way spec.tls is. Delete and recreate to
+                      change it.
+                    type: boolean
+                  rootCredentialsSecretRef:
+                    description: |-
+                      RootCredentialsSecretRef references a Secret in the cluster's
+                      namespace holding the etcd root user's credentials. Required when
+                      Enabled is true (CEL-enforced).
+
+                      The Secret is expected to be of type kubernetes.io/basic-auth: the
+                      operator reads the `password` key and provisions the etcd `root` user
+                      with it. The `username` key is for consumers (e.g. a Kamaji DataStore
+                      pointing at the same Secret) and must be "root" — the etcd user is
+                      always root, since etcd requires a user named root to enable auth.
+
+                      Immutable post-create (part of the immutable auth subtree). The
+                      operator reads the password on every dial; changing the Secret's
+                      contents after auth is enabled would desync the operator from etcd —
+                      in-place password rotation is not supported in this version, recreate
+                      to change.
+                    properties:
+                      name:
+                        default: ""
+                        description: |-
+                          Name of the referent.
+                          This field is effectively required, but due to backwards compatibility is
+                          allowed to be empty. Instances of this type with an empty value here are
+                          almost certainly wrong.
+                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                        type: string
+                    type: object
+                    x-kubernetes-map-type: atomic
+                type: object
+              bootstrap:
+                description: |-
+                  Bootstrap configures one-time cluster initialization options. It is
+                  consulted only at first bootstrap (while status.clusterID is unset)
+                  and is immutable post-create. Absent means a normal empty-cluster
+                  bootstrap.
+                properties:
+                  restore:
+                    description: |-
+                      Restore initializes the new cluster from an existing etcd snapshot
+                      instead of an empty data dir. Absent means a normal empty bootstrap.
+                    properties:
+                      source:
+                        description: |-
+                          Source is where the snapshot is read from (S3 or PVC). Same shape as
+                          an EtcdSnapshot destination.
+                        properties:
+                          pvc:
+                            description: PVC stores the snapshot on a PersistentVolumeClaim.
+                            properties:
+                              claimName:
+                                description: ClaimName is the name of a PVC in the
+                                  cluster's namespace.
+                                minLength: 1
+                                type: string
+                              subPath:
+                                description: SubPath is an optional subdirectory within
+                                  the volume.
+                                type: string
+                            required:
+                            - claimName
+                            type: object
+                          s3:
+                            description: S3 stores the snapshot in an S3-compatible
+                              object store.
+                            properties:
+                              bucket:
+                                description: Bucket is the destination bucket.
+                                minLength: 1
+                                type: string
+                              credentialsSecretRef:
+                                description: |-
+                                  CredentialsSecretRef references a Secret in the cluster's namespace
+                                  holding AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY keys.
+                                properties:
+                                  name:
+                                    default: ""
+                                    description: |-
+                                      Name of the referent.
+                                      This field is effectively required, but due to backwards compatibility is
+                                      allowed to be empty. Instances of this type with an empty value here are
+                                      almost certainly wrong.
+                                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                    type: string
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              endpoint:
+                                description: |-
+                                  Endpoint is the S3 endpoint URL (e.g. "https://s3.amazonaws.com" or a
+                                  MinIO/Ceph endpoint).
+                                minLength: 1
+                                type: string
+                              forcePathStyle:
+                                description: |-
+                                  ForcePathStyle selects path-style addressing (bucket in the path
+                                  rather than the host). MinIO/Ceph typically require true.
+                                type: boolean
+                              key:
+                                description: |-
+                                  Key is an optional object-key prefix within the bucket. The operator
+                                  appends "<snapshot-name>.db".
+                                type: string
+                              region:
+                                description: Region is the S3 region. Optional for
+                                  endpoints that ignore it.
+                                type: string
+                            required:
+                            - bucket
+                            - credentialsSecretRef
+                            - endpoint
+                            type: object
+                        type: object
+                        x-kubernetes-validations:
+                        - message: exactly one of destination.s3 or destination.pvc
+                            must be set
+                          rule: has(self.s3) != has(self.pvc)
+                    required:
+                    - source
+                    type: object
+                    x-kubernetes-validations:
+                    - message: bootstrap.restore.source.s3.key must be the exact (non-empty)
+                        object key for a restore source
+                      rule: '!has(self.source.s3) || (has(self.source.s3.key) && size(self.source.s3.key)
+                        > 0)'
+                    - message: bootstrap.restore.source.pvc.subPath must be the exact
+                        (non-empty) snapshot file path for a restore source
+                      rule: '!has(self.source.pvc) || (has(self.source.pvc.subPath)
+                        && size(self.source.pvc.subPath) > 0)'
+                type: object
+              imagePullSecrets:
+                description: |-
+                  ImagePullSecrets is a list of Secret references in the cluster's
+                  namespace used to pull the etcd (and restore initContainer) image from
+                  a private registry — e.g. an air-gapped mirror behind credentials.
+                  Passed straight through to each member Pod's spec.imagePullSecrets.
+
+                  Changes take effect on newly-created members (scale-up, replacement);
+                  the operator does not roll existing Pods. Latched through
+                  status.observed.
+                items:
+                  description: |-
+                    LocalObjectReference contains enough information to let you locate the
+                    referenced object inside the same namespace.
+                  properties:
+                    name:
+                      default: ""
+                      description: |-
+                        Name of the referent.
+                        This field is effectively required, but due to backwards compatibility is
+                        allowed to be empty. Instances of this type with an empty value here are
+                        almost certainly wrong.
+                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                      type: string
+                  type: object
+                  x-kubernetes-map-type: atomic
+                type: array
+              options:
+                description: |-
+                  Options carries etcd server tuning flags (backend quota,
+                  auto-compaction, raft snapshot count) passed to each member's
+                  command line. A closed typed set — see EtcdOptions for why there
+                  is deliberately no free-form flag map.
+
+                  Updates take effect on newly-created members (scale-up,
+                  replacement); the operator does not roll existing Pods to apply a
+                  tuning change in place.
+                properties:
+                  autoCompactionMode:
+                    description: |-
+                      AutoCompactionMode sets --auto-compaction-mode: how
+                      AutoCompactionRetention is interpreted, "periodic" (time-based)
+                      or "revision" (revision-count-based). Absent means etcd's default
+                      ("periodic" — though compaction only activates when a retention
+                      is set).
+                    enum:
+                    - periodic
+                    - revision
+                    type: string
+                  autoCompactionRetention:
+                    description: |-
+                      AutoCompactionRetention sets --auto-compaction-retention. In
+                      periodic mode a duration ("5m", "1h"; a bare integer means hours);
+                      in revision mode a revision count. Absent or "0" disables
+                      auto-compaction. The pattern admits what etcd itself parses: a
+                      bare non-negative integer or a Go duration.
+                    pattern: ^([0-9]+(\.[0-9]+)?(ms|s|m|h))+$|^[0-9]+$
+                    type: string
+                  quotaBackendBytes:
+                    description: |-
+                      QuotaBackendBytes sets --quota-backend-bytes: the backend database
+                      size limit in bytes before the member raises the cluster-wide
+                      NOSPACE alarm. 0 or absent means etcd's built-in default (2GiB).
+                      etcd's documented practical maximum is 8GiB.
+                    format: int64
+                    minimum: 0
+                    type: integer
+                  snapshotCount:
+                    description: |-
+                      SnapshotCount sets --snapshot-count: the number of committed
+                      raft entries to retain in memory before triggering an internal
+                      raft snapshot (this is unrelated to EtcdSnapshot backups). Absent
+                      means etcd's built-in default. Lower values trade replay speed on
+                      restart for a smaller memory footprint.
+                    format: int64
+                    minimum: 1
+                    type: integer
+                type: object
+              progressDeadlineSeconds:
+                default: 600
+                description: |-
+                  ProgressDeadlineSeconds bounds the time the operator spends trying to
+                  reach a desired state before abandoning the in-flight target and
+                  adopting whatever the user has set as the new spec. Defaults to 600
+                  (10 minutes). A patch to status.progressDeadline can shorten this for
+                  a stuck reconcile (set it to "now" to abort immediately).
+                format: int32
+                minimum: 1
+                type: integer
+              replicas:
+                default: 3
+                description: |-
+                  Replicas is the desired number of cluster members. Should be odd.
+                  A value of 0 parks the cluster ("scale to zero"): the operator
+                  flips spec.dormant=true on the surviving EtcdMember, which causes
+                  the member controller to delete that member's Pod. The EtcdMember
+                  CR and its PVC are preserved (the PVC stays owned by the same
+                  EtcdMember across the pause). Scaling back up to >=1 flips
+                  spec.dormant=false on the same member; etcd resumes from its
+                  existing data dir with the same ClusterID and member ID.
+                format: int32
+                minimum: 0
+                type: integer
+              resources:
+                description: |-
+                  Resources sets the etcd container's resource requests and limits.
+                  When omitted, the operator falls back to a conservative default
+                  (100m CPU + 128Mi memory requests, no limits) suitable for
+                  kicking the tyres but not for production. Memory-backed clusters
+                  specifically should set limits.memory covering the tmpfs SizeLimit
+                  plus etcd's own headroom.
+
+                  Updates take effect on newly-created members (scale-up,
+                  replacement). The operator does not roll existing Pods to apply
+                  a resource change in place — wire a VerticalPodAutoscaler at
+                  targetRef={kind: EtcdCluster, name: <cluster>} for that, or
+                  delete one Pod at a time to recreate them with the new spec.
+                properties:
+                  claims:
+                    description: |-
+                      Claims lists the names of resources, defined in spec.resourceClaims,
+                      that are used by this container.
+
+                      This is an alpha field and requires enabling the
+                      DynamicResourceAllocation feature gate.
+
+                      This field is immutable. It can only be set for containers.
+                    items:
+                      description: ResourceClaim references one entry in PodSpec.ResourceClaims.
+                      properties:
+                        name:
+                          description: |-
+                            Name must match the name of one entry in pod.spec.resourceClaims of
+                            the Pod where this field is used. It makes that resource available
+                            inside a container.
+                          type: string
+                        request:
+                          description: |-
+                            Request is the name chosen for a request in the referenced claim.
+                            If empty, everything from the claim is made available, otherwise
+                            only the result of this request.
+                          type: string
+                      required:
+                      - name
+                      type: object
+                    type: array
+                    x-kubernetes-list-map-keys:
+                    - name
+                    x-kubernetes-list-type: map
+                  limits:
+                    additionalProperties:
+                      anyOf:
+                      - type: integer
+                      - type: string
+                      pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                      x-kubernetes-int-or-string: true
+                    description: |-
+                      Limits describes the maximum amount of compute resources allowed.
+                      More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+                    type: object
+                  requests:
+                    additionalProperties:
+                      anyOf:
+                      - type: integer
+                      - type: string
+                      pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                      x-kubernetes-int-or-string: true
+                    description: |-
+                      Requests describes the minimum amount of compute resources required.
+                      If Requests is omitted for a container, it defaults to Limits if that is explicitly specified,
+                      otherwise to an implementation-defined value. Requests cannot exceed Limits.
+                      More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+                    type: object
+                type: object
+              storage:
+                default:
+                  medium: ""
+                  size: 1Gi
+                description: |-
+                  Storage configures the per-member data directory: size and medium
+                  (PVC or tmpfs). The size shrink-rejection and medium immutability
+                  rules live as field-level CEL on the inner fields; the spec-level
+                  CEL above couples replicas and storage.medium.
+                properties:
+                  medium:
+                    default: ""
+                    description: |-
+                      Medium selects the volume backend: "" (PVC) or "Memory" (tmpfs
+                      emptyDir). See the StorageMedium type doc for operational trade-offs.
+
+                      Immutable: changing the medium on an existing cluster would orphan
+                      the previous PVC (or tmpfs) and the rolling-migrate path is not
+                      implemented. The default ("") is set explicitly so the apiserver
+                      always stores the field on Create — without it, a first-time set
+                      from absent → Memory would slip past the transition rule.
+                    enum:
+                    - ""
+                    - Memory
+                    type: string
+                    x-kubernetes-validations:
+                    - message: spec.storage.medium is immutable; delete and recreate
+                        the cluster to change the storage backend
+                      rule: self == oldSelf
+                  size:
+                    anyOf:
+                    - type: integer
+                    - type: string
+                    default: 1Gi
+                    description: |-
+                      Size is the requested capacity per member. For Medium="" (PVC) this
+                      is the PVC's requested storage. For Medium="Memory" this is the
+                      tmpfs emptyDir's SizeLimit.
+
+                      Shrinking is rejected on UPDATE: PVCs cannot shrink and tmpfs
+                      SizeLimit reduction does not free already-allocated memory.
+                    pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                    x-kubernetes-int-or-string: true
+                    x-kubernetes-validations:
+                    - message: spec.storage.size cannot be shrunk
+                      rule: quantity(string(self)).compareTo(quantity(string(oldSelf)))
+                        >= 0
+                  storageClassName:
+                    description: |-
+                      StorageClassName selects the StorageClass for the per-member PVC.
+                      Mirrors corev1.PersistentVolumeClaimSpec.StorageClassName semantics:
+                      nil (the default) uses the namespace's default StorageClass; the
+                      empty string explicitly disables dynamic provisioning (a
+                      pre-provisioned PV must already match the PVC selector); any other
+                      value names a specific StorageClass.
+
+                      Ignored when Medium=Memory (no PVC is created).
+
+                      Immutable post-create — PersistentVolumeClaim.spec.storageClassName
+                      is itself immutable after PVC creation, so honouring a mid-life
+                      change would require a rolling PVC-recreation flow that this
+                      operator does not perform. The immutability rules live at the
+                      EtcdClusterSpec level (alongside the other pointer-field rules)
+                      because *string transition CEL on the inner field cannot fire when
+                      the field is being added from nil.
+                    type: string
+                type: object
+              tls:
+                description: |-
+                  TLS configures transport-layer security for the etcd client and
+                  peer APIs. Absent means plaintext on both surfaces. The whole
+                  subtree is immutable post-create — the immutability rules live at
+                  the EtcdClusterSpec level (above) because pointer-field transition
+                  rules don't fire when the field is being added (nil → set) and we
+                  want to reject that direction too.
+                properties:
+                  client:
+                    description: |-
+                      Client configures TLS for the etcd client API (port 2379). Absent
+                      means plaintext. See ClientTLS for the mTLS-toggle semantics.
+                    properties:
+                      certManager:
+                        description: |-
+                          CertManager configures operator-driven TLS material provisioning
+                          via cert-manager.io/v1 Certificate resources. Mutually exclusive
+                          with ServerSecretRef. The operator owns the emitted Certificates
+                          (they GC with the EtcdCluster) and the resulting Secrets are
+                          mounted into the etcd Pods the same way BYO Secrets are.
+                        properties:
+                          operatorClientIssuerRef:
+                            description: |-
+                              OperatorClientIssuerRef is the Issuer or ClusterIssuer that will
+                              sign the operator's etcd-client identity. Presence ⇒ client mTLS
+                              is on; absence ⇒ server-TLS only. Resulting Secret name is
+                              "<cluster>-operator-client-tls".
+
+                              In the happy path the same Issuer signs both server and operator-
+                              client certs, so the CA visible in each Secret's ca.crt is the
+                              same content, doubling as etcd's --trusted-ca-file. Splitting the
+                              two Issuers across separate root CAs requires the user to ensure
+                              the trust bundle on the server side covers both — that case is an
+                              edge of this v1.
+                            properties:
+                              kind:
+                                default: Issuer
+                                description: |-
+                                  Kind is either "Issuer" or "ClusterIssuer". Defaults to "Issuer"
+                                  — a namespaced issuer living next to the EtcdCluster.
+                                enum:
+                                - Issuer
+                                - ClusterIssuer
+                                type: string
+                              name:
+                                description: Name is the issuer resource's name.
+                                minLength: 1
+                                type: string
+                            required:
+                            - name
+                            type: object
+                          serverIssuerRef:
+                            description: |-
+                              ServerIssuerRef is the Issuer or ClusterIssuer that will sign the
+                              etcd server cert. Resulting Secret name is
+                              "<cluster>-server-tls".
+                            properties:
+                              kind:
+                                default: Issuer
+                                description: |-
+                                  Kind is either "Issuer" or "ClusterIssuer". Defaults to "Issuer"
+                                  — a namespaced issuer living next to the EtcdCluster.
+                                enum:
+                                - Issuer
+                                - ClusterIssuer
+                                type: string
+                              name:
+                                description: Name is the issuer resource's name.
+                                minLength: 1
+                                type: string
+                            required:
+                            - name
+                            type: object
+                        required:
+                        - serverIssuerRef
+                        type: object
+                      operatorClientSecretRef:
+                        description: |-
+                          OperatorClientSecretRef points at a Secret in the cluster's
+                          namespace holding the operator's etcd-client identity (tls.crt,
+                          tls.key). Setting this enables mTLS — etcd is started with
+                          --client-cert-auth=true and the operator presents this cert when
+                          dialing. Leaving it unset selects server-TLS-only mode.
+
+                          Cannot be combined with CertManager; use
+                          CertManager.OperatorClientIssuerRef instead.
+                        properties:
+                          name:
+                            default: ""
+                            description: |-
+                              Name of the referent.
+                              This field is effectively required, but due to backwards compatibility is
+                              allowed to be empty. Instances of this type with an empty value here are
+                              almost certainly wrong.
+                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                            type: string
+                        type: object
+                        x-kubernetes-map-type: atomic
+                      serverSecretRef:
+                        description: |-
+                          ServerSecretRef points at a Secret in the cluster's namespace
+                          holding the etcd server cert in the standard kubernetes.io/tls
+                          shape: tls.crt, tls.key, and ca.crt. ca.crt is always required
+                          (the operator's own etcd client needs it to verify the server,
+                          and when mTLS is on it doubles as --trusted-ca-file).
+
+                          Mutually exclusive with CertManager.
+                        properties:
+                          name:
+                            default: ""
+                            description: |-
+                              Name of the referent.
+                              This field is effectively required, but due to backwards compatibility is
+                              allowed to be empty. Instances of this type with an empty value here are
+                              almost certainly wrong.
+                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                            type: string
+                        type: object
+                        x-kubernetes-map-type: atomic
+                    type: object
+                    x-kubernetes-validations:
+                    - message: exactly one of spec.tls.client.serverSecretRef or spec.tls.client.certManager
+                        must be set
+                      rule: has(self.serverSecretRef) != has(self.certManager)
+                    - message: spec.tls.client.operatorClientSecretRef cannot be combined
+                        with certManager; use certManager.operatorClientIssuerRef
+                      rule: '!has(self.certManager) || !has(self.operatorClientSecretRef)'
+                  peer:
+                    description: |-
+                      Peer configures TLS for the etcd peer API (port 2380). Absent
+                      means plaintext. When set, peer is always mTLS — etcd's peer mesh
+                      is symmetric and there is no useful encrypt-only-no-identity mode
+                      for it.
+                    properties:
+                      certManager:
+                        description: |-
+                          CertManager configures operator-driven TLS material provisioning
+                          for the peer plane via cert-manager.io/v1 Certificate resources.
+                          Mutually exclusive with SecretRef.
+                        properties:
+                          issuerRef:
+                            description: |-
+                              IssuerRef is the Issuer or ClusterIssuer that signs the peer cert.
+                              Peer is symmetric (same cert serves and dials), so this single
+                              Issuer covers both directions of peer mTLS. Resulting Secret name
+                              is "<cluster>-peer-tls".
+                            properties:
+                              kind:
+                                default: Issuer
+                                description: |-
+                                  Kind is either "Issuer" or "ClusterIssuer". Defaults to "Issuer"
+                                  — a namespaced issuer living next to the EtcdCluster.
+                                enum:
+                                - Issuer
+                                - ClusterIssuer
+                                type: string
+                              name:
+                                description: Name is the issuer resource's name.
+                                minLength: 1
+                                type: string
+                            required:
+                            - name
+                            type: object
+                        required:
+                        - issuerRef
+                        type: object
+                      secretRef:
+                        description: |-
+                          SecretRef points at a Secret in the cluster's namespace holding
+                          the peer cert+key in the standard kubernetes.io/tls shape:
+                          tls.crt, tls.key, ca.crt. ca.crt is required (peer is symmetric
+                          — same cert is used to serve inbound and dial outbound peer
+                          connections — and --peer-trusted-ca-file is always populated).
+                          The peer cert MUST carry both serverAuth and clientAuth in EKU.
+
+                          Mutually exclusive with CertManager.
+                        properties:
+                          name:
+                            default: ""
+                            description: |-
+                              Name of the referent.
+                              This field is effectively required, but due to backwards compatibility is
+                              allowed to be empty. Instances of this type with an empty value here are
+                              almost certainly wrong.
+                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                            type: string
+                        type: object
+                        x-kubernetes-map-type: atomic
+                    type: object
+                    x-kubernetes-validations:
+                    - message: exactly one of spec.tls.peer.secretRef or spec.tls.peer.certManager
+                        must be set
+                      rule: has(self.secretRef) != has(self.certManager)
+                type: object
+              topologySpreadConstraints:
+                description: |-
+                  TopologySpreadConstraints controls how member Pods are spread across
+                  topology domains (zones, nodes). Passed straight through to each
+                  member Pod's spec.topologySpreadConstraints.
+
+                  Updates take effect on newly-created members (scale-up, replacement);
+                  the operator does not roll existing Pods to apply a change in place.
+                items:
+                  description: TopologySpreadConstraint specifies how to spread matching
+                    pods among the given topology.
+                  properties:
+                    labelSelector:
+                      description: |-
+                        LabelSelector is used to find matching pods.
+                        Pods that match this label selector are counted to determine the number of pods
+                        in their corresponding topology domain.
+                      properties:
+                        matchExpressions:
+                          description: matchExpressions is a list of label selector
+                            requirements. The requirements are ANDed.
+                          items:
+                            description: |-
+                              A label selector requirement is a selector that contains values, a key, and an operator that
+                              relates the key and values.
+                            properties:
+                              key:
+                                description: key is the label key that the selector
+                                  applies to.
+                                type: string
+                              operator:
+                                description: |-
+                                  operator represents a key's relationship to a set of values.
+                                  Valid operators are In, NotIn, Exists and DoesNotExist.
+                                type: string
+                              values:
+                                description: |-
+                                  values is an array of string values. If the operator is In or NotIn,
+                                  the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                  the values array must be empty. This array is replaced during a strategic
+                                  merge patch.
+                                items:
+                                  type: string
+                                type: array
+                                x-kubernetes-list-type: atomic
+                            required:
+                            - key
+                            - operator
+                            type: object
+                          type: array
+                          x-kubernetes-list-type: atomic
+                        matchLabels:
+                          additionalProperties:
+                            type: string
+                          description: |-
+                            matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                            map is equivalent to an element of matchExpressions, whose key field is "key", the
+                            operator is "In", and the values array contains only "value". The requirements are ANDed.
+                          type: object
+                      type: object
+                      x-kubernetes-map-type: atomic
+                    matchLabelKeys:
+                      description: |-
+                        MatchLabelKeys is a set of pod label keys to select the pods over which
+                        spreading will be calculated. The keys are used to lookup values from the
+                        incoming pod labels, those key-value labels are ANDed with labelSelector
+                        to select the group of existing pods over which spreading will be calculated
+                        for the incoming pod. The same key is forbidden to exist in both MatchLabelKeys and LabelSelector.
+                        MatchLabelKeys cannot be set when LabelSelector isn't set.
+                        Keys that don't exist in the incoming pod labels will
+                        be ignored. A null or empty list means only match against labelSelector.
+
+                        This is a beta field and requires the MatchLabelKeysInPodTopologySpread feature gate to be enabled (enabled by default).
+                      items:
+                        type: string
+                      type: array
+                      x-kubernetes-list-type: atomic
+                    maxSkew:
+                      description: |-
+                        MaxSkew describes the degree to which pods may be unevenly distributed.
+                        When `whenUnsatisfiable=DoNotSchedule`, it is the maximum permitted difference
+                        between the number of matching pods in the target topology and the global minimum.
+                        The global minimum is the minimum number of matching pods in an eligible domain
+                        or zero if the number of eligible domains is less than MinDomains.
+                        For example, in a 3-zone cluster, MaxSkew is set to 1, and pods with the same
+                        labelSelector spread as 2/2/1:
+                        In this case, the global minimum is 1.
+                        | zone1 | zone2 | zone3 |
+                        |  P P  |  P P  |   P   |
+                        - if MaxSkew is 1, incoming pod can only be scheduled to zone3 to become 2/2/2;
+                        scheduling it onto zone1(zone2) would make the ActualSkew(3-1) on zone1(zone2)
+                        violate MaxSkew(1).
+                        - if MaxSkew is 2, incoming pod can be scheduled onto any zone.
+                        When `whenUnsatisfiable=ScheduleAnyway`, it is used to give higher precedence
+                        to topologies that satisfy it.
+                        It's a required field. Default value is 1 and 0 is not allowed.
+                      format: int32
+                      type: integer
+                    minDomains:
+                      description: |-
+                        MinDomains indicates a minimum number of eligible domains.
+                        When the number of eligible domains with matching topology keys is less than minDomains,
+                        Pod Topology Spread treats "global minimum" as 0, and then the calculation of Skew is performed.
+                        And when the number of eligible domains with matching topology keys equals or greater than minDomains,
+                        this value has no effect on scheduling.
+                        As a result, when the number of eligible domains is less than minDomains,
+                        scheduler won't schedule more than maxSkew Pods to those domains.
+                        If value is nil, the constraint behaves as if MinDomains is equal to 1.
+                        Valid values are integers greater than 0.
+                        When value is not nil, WhenUnsatisfiable must be DoNotSchedule.
+
+                        For example, in a 3-zone cluster, MaxSkew is set to 2, MinDomains is set to 5 and pods with the same
+                        labelSelector spread as 2/2/2:
+                        | zone1 | zone2 | zone3 |
+                        |  P P  |  P P  |  P P  |
+                        The number of domains is less than 5(MinDomains), so "global minimum" is treated as 0.
+                        In this situation, new pod with the same labelSelector cannot be scheduled,
+                        because computed skew will be 3(3 - 0) if new Pod is scheduled to any of the three zones,
+                        it will violate MaxSkew.
+                      format: int32
+                      type: integer
+                    nodeAffinityPolicy:
+                      description: |-
+                        NodeAffinityPolicy indicates how we will treat Pod's nodeAffinity/nodeSelector
+                        when calculating pod topology spread skew. Options are:
+                        - Honor: only nodes matching nodeAffinity/nodeSelector are included in the calculations.
+                        - Ignore: nodeAffinity/nodeSelector are ignored. All nodes are included in the calculations.
+
+                        If this value is nil, the behavior is equivalent to the Honor policy.
+                      type: string
+                    nodeTaintsPolicy:
+                      description: |-
+                        NodeTaintsPolicy indicates how we will treat node taints when calculating
+                        pod topology spread skew. Options are:
+                        - Honor: nodes without taints, along with tainted nodes for which the incoming pod
+                        has a toleration, are included.
+                        - Ignore: node taints are ignored. All nodes are included.
+
+                        If this value is nil, the behavior is equivalent to the Ignore policy.
+                      type: string
+                    topologyKey:
+                      description: |-
+                        TopologyKey is the key of node labels. Nodes that have a label with this key
+                        and identical values are considered to be in the same topology.
+                        We consider each <key, value> as a "bucket", and try to put balanced number
+                        of pods into each bucket.
+                        We define a domain as a particular instance of a topology.
+                        Also, we define an eligible domain as a domain whose nodes meet the requirements of
+                        nodeAffinityPolicy and nodeTaintsPolicy.
+                        e.g. If TopologyKey is "kubernetes.io/hostname", each Node is a domain of that topology.
+                        And, if TopologyKey is "topology.kubernetes.io/zone", each zone is a domain of that topology.
+                        It's a required field.
+                      type: string
+                    whenUnsatisfiable:
+                      description: |-
+                        WhenUnsatisfiable indicates how to deal with a pod if it doesn't satisfy
+                        the spread constraint.
+                        - DoNotSchedule (default) tells the scheduler not to schedule it.
+                        - ScheduleAnyway tells the scheduler to schedule the pod in any location,
+                          but giving higher precedence to topologies that would help reduce the
+                          skew.
+                        A constraint is considered "Unsatisfiable" for an incoming pod
+                        if and only if every possible node assignment for that pod would violate
+                        "MaxSkew" on some topology.
+                        For example, in a 3-zone cluster, MaxSkew is set to 1, and pods with the same
+                        labelSelector spread as 3/1/1:
+                        | zone1 | zone2 | zone3 |
+                        | P P P |   P   |   P   |
+                        If WhenUnsatisfiable is set to DoNotSchedule, incoming pod can only be scheduled
+                        to zone2(zone3) to become 3/2/1(3/1/2) as ActualSkew(2-1) on zone2(zone3) satisfies
+                        MaxSkew(1). In other words, the cluster can still be imbalanced, but scheduler
+                        won't make it *more* imbalanced.
+                        It's a required field.
+                      type: string
+                  required:
+                  - maxSkew
+                  - topologyKey
+                  - whenUnsatisfiable
+                  type: object
+                type: array
+              version:
+                description: Version is the desired etcd version (e.g. "3.6.11").
+                pattern: ^\d+\.\d+\.\d+$
+                type: string
+            required:
+            - version
+            type: object
+            x-kubernetes-validations:
+            - message: 'spec.replicas=0 with spec.storage.medium=Memory is unsupported:
+                pausing a memory-backed cluster wedges on resume. Delete and recreate
+                the cluster instead.'
+              rule: '!(has(self.replicas) && self.replicas == 0 && has(self.storage)
+                && has(self.storage.medium) && self.storage.medium == ''Memory'')'
+            - message: spec.storage.size must be > 0 when spec.storage.medium=Memory
+                (the tmpfs sizeLimit cannot be zero).
+              rule: '!(has(self.storage) && has(self.storage.medium) && self.storage.medium
+                == ''Memory'') || quantity(string(self.storage.size)).isGreaterThan(quantity(''0''))'
+            - message: spec.tls cannot be added to or removed from an existing cluster;
+                delete and recreate
+              rule: has(self.tls) == has(oldSelf.tls)
+            - message: spec.tls is immutable post-create; delete and recreate the
+                cluster to change TLS configuration
+              rule: '!has(self.tls) || !has(oldSelf.tls) || self.tls == oldSelf.tls'
+            - message: spec.storage.storageClassName cannot be added to or removed
+                from an existing cluster; delete and recreate
+              rule: has(self.storage.storageClassName) == has(oldSelf.storage.storageClassName)
+            - message: spec.storage.storageClassName is immutable post-create (a PVC's
+                storageClassName itself is immutable, and the operator does not roll
+                PVCs); delete and recreate the cluster to change the StorageClass
+              rule: '!has(self.storage.storageClassName) || !has(oldSelf.storage.storageClassName)
+                || self.storage.storageClassName == oldSelf.storage.storageClassName'
+            - message: spec.auth cannot be added to or removed from an existing cluster;
+                delete and recreate
+              rule: has(self.auth) == has(oldSelf.auth)
+            - message: spec.auth is immutable post-create; delete and recreate the
+                cluster to change auth configuration
+              rule: '!has(self.auth) || !has(oldSelf.auth) || self.auth == oldSelf.auth'
+            - message: spec.auth.enabled requires spec.tls.client (auth credentials
+                must not cross a plaintext connection)
+              rule: '!(has(self.auth) && self.auth.enabled) || (has(self.tls) && has(self.tls.client))'
+            - message: spec.auth.enabled requires spec.auth.rootCredentialsSecretRef
+              rule: '!(has(self.auth) && self.auth.enabled) || has(self.auth.rootCredentialsSecretRef)'
+            - message: spec.bootstrap cannot be added to or removed from an existing
+                cluster; it is consulted only at first bootstrap
+              rule: has(self.bootstrap) == has(oldSelf.bootstrap)
+            - message: spec.bootstrap is immutable post-create; it is consulted only
+                at first bootstrap
+              rule: '!has(self.bootstrap) || !has(oldSelf.bootstrap) || self.bootstrap
+                == oldSelf.bootstrap'
+            - message: 'spec.bootstrap.restore is unsupported with spec.storage.medium=Memory:
+                the restored data dir is tmpfs, so any seed Pod restart re-restores
+                the snapshot — reverting writes (single member) or breaking the cluster
+                with a fresh ID it can''t rejoin (multi-member). Use persistent storage
+                to restore.'
+              rule: '!(has(self.bootstrap) && has(self.bootstrap.restore)) || !(has(self.storage)
+                && has(self.storage.medium) && self.storage.medium == ''Memory'')'
+          status:
+            description: EtcdClusterStatus defines the observed state of an etcd cluster.
+            properties:
+              authEnabled:
+                description: |-
+                  AuthEnabled is true once the operator has successfully run
+                  `auth enable` against the cluster. It is latched (never cleared —
+                  spec.auth.enabled is immutable) and is the single signal every
+                  operator etcd dial consults to decide whether to present the root
+                  credentials: false ⇒ dial anonymously (auth not yet on, e.g. during
+                  the bootstrap window before the cluster has converged), true ⇒ dial
+                  as root. Decoupling this from spec.auth.enabled is what makes
+                  the bootstrap window correct — clientv3 attempts an Authenticate RPC
+                  on connect when a username is set, which fails until auth is enabled.
+                type: boolean
+              brokenMembers:
+                description: |-
+                  BrokenMembers is the count of members the operator considers broken.
+                  While the auto-replacement predicate is a stub it is always 0; surfaced
+                  here so the predicate has a tested call site and the field already
+                  exists when the policy lands.
+                format: int32
+                type: integer
+              clusterID:
+                description: |-
+                  ClusterID is the etcd cluster ID in hex (e.g. "769f1c9e0d723d0b"),
+                  set after initial bootstrap. Stored as a string because uint64 values
+                  can exceed JSON's safe integer range.
+                type: string
+              clusterToken:
+                description: |-
+                  ClusterToken is the value passed to etcd's --initial-cluster-token,
+                  recorded at bootstrap. Reused for all subsequent scale-up operations
+                  so existing clusters keep their original token even if the derivation
+                  rule changes in a later release.
+                type: string
+              conditions:
+                description: Conditions represent the latest available observations
+                  of the cluster's state.
+                items:
+                  description: Condition contains details for one aspect of the current
+                    state of this API Resource.
+                  properties:
+                    lastTransitionTime:
+                      description: |-
+                        lastTransitionTime is the last time the condition transitioned from one status to another.
+                        This should be when the underlying condition changed.  If that is not known, then using the time when the API field changed is acceptable.
+                      format: date-time
+                      type: string
+                    message:
+                      description: |-
+                        message is a human readable message indicating details about the transition.
+                        This may be an empty string.
+                      maxLength: 32768
+                      type: string
+                    observedGeneration:
+                      description: |-
+                        observedGeneration represents the .metadata.generation that the condition was set based upon.
+                        For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date
+                        with respect to the current state of the instance.
+                      format: int64
+                      minimum: 0
+                      type: integer
+                    reason:
+                      description: |-
+                        reason contains a programmatic identifier indicating the reason for the condition's last transition.
+                        Producers of specific condition types may define expected values and meanings for this field,
+                        and whether the values are considered a guaranteed API.
+                        The value should be a CamelCase string.
+                        This field may not be empty.
+                      maxLength: 1024
+                      minLength: 1
+                      pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
+                      type: string
+                    status:
+                      description: status of the condition, one of True, False, Unknown.
+                      enum:
+                      - "True"
+                      - "False"
+                      - Unknown
+                      type: string
+                    type:
+                      description: type of condition in CamelCase or in foo.example.com/CamelCase.
+                      maxLength: 316
+                      pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
+                      type: string
+                  required:
+                  - lastTransitionTime
+                  - message
+                  - reason
+                  - status
+                  - type
+                  type: object
+                type: array
+              observed:
+                description: |-
+                  Observed is the locked-in desired state the operator is currently
+                  reconciling toward. The reconciler ignores spec changes while a target
+                  is in flight; Observed is only updated from spec when the current
+                  target is met or its deadline has expired. nil before the first
+                  reconcile.
+                properties:
+                  additionalMetadata:
+                    description: |-
+                      AdditionalMetadata is the locked target extra labels/annotations
+                      stamped onto objects created for this cluster. Latched with the rest
+                      of the target spec so a mid-flight metadata edit only applies to
+                      objects created once the current target is reached.
+                    properties:
+                      annotations:
+                        additionalProperties:
+                          type: string
+                        description: Annotations are extra annotations merged onto
+                          created objects.
+                        type: object
+                      labels:
+                        additionalProperties:
+                          type: string
+                        description: |-
+                          Labels are extra labels merged onto created objects. Operator-owned
+                          label keys take precedence on collision.
+                        type: object
+                    type: object
+                  affinity:
+                    description: |-
+                      Affinity is the locked target scheduling affinity for member Pods.
+                      Latched alongside the rest of the target spec so a mid-flight change
+                      only applies to members created once the current target is reached.
+                    properties:
+                      nodeAffinity:
+                        description: Describes node affinity scheduling rules for
+                          the pod.
+                        properties:
+                          preferredDuringSchedulingIgnoredDuringExecution:
+                            description: |-
+                              The scheduler will prefer to schedule pods to nodes that satisfy
+                              the affinity expressions specified by this field, but it may choose
+                              a node that violates one or more of the expressions. The node that is
+                              most preferred is the one with the greatest sum of weights, i.e.
+                              for each node that meets all of the scheduling requirements (resource
+                              request, requiredDuringScheduling affinity expressions, etc.),
+                              compute a sum by iterating through the elements of this field and adding
+                              "weight" to the sum if the node matches the corresponding matchExpressions; the
+                              node(s) with the highest sum are the most preferred.
+                            items:
+                              description: |-
+                                An empty preferred scheduling term matches all objects with implicit weight 0
+                                (i.e. it's a no-op). A null preferred scheduling term matches no objects (i.e. is also a no-op).
+                              properties:
+                                preference:
+                                  description: A node selector term, associated with
+                                    the corresponding weight.
+                                  properties:
+                                    matchExpressions:
+                                      description: A list of node selector requirements
+                                        by node's labels.
+                                      items:
+                                        description: |-
+                                          A node selector requirement is a selector that contains values, a key, and an operator
+                                          that relates the key and values.
+                                        properties:
+                                          key:
+                                            description: The label key that the selector
+                                              applies to.
+                                            type: string
+                                          operator:
+                                            description: |-
+                                              Represents a key's relationship to a set of values.
+                                              Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt.
+                                            type: string
+                                          values:
+                                            description: |-
+                                              An array of string values. If the operator is In or NotIn,
+                                              the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                              the values array must be empty. If the operator is Gt or Lt, the values
+                                              array must have a single element, which will be interpreted as an integer.
+                                              This array is replaced during a strategic merge patch.
+                                            items:
+                                              type: string
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                        required:
+                                        - key
+                                        - operator
+                                        type: object
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    matchFields:
+                                      description: A list of node selector requirements
+                                        by node's fields.
+                                      items:
+                                        description: |-
+                                          A node selector requirement is a selector that contains values, a key, and an operator
+                                          that relates the key and values.
+                                        properties:
+                                          key:
+                                            description: The label key that the selector
+                                              applies to.
+                                            type: string
+                                          operator:
+                                            description: |-
+                                              Represents a key's relationship to a set of values.
+                                              Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt.
+                                            type: string
+                                          values:
+                                            description: |-
+                                              An array of string values. If the operator is In or NotIn,
+                                              the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                              the values array must be empty. If the operator is Gt or Lt, the values
+                                              array must have a single element, which will be interpreted as an integer.
+                                              This array is replaced during a strategic merge patch.
+                                            items:
+                                              type: string
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                        required:
+                                        - key
+                                        - operator
+                                        type: object
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                weight:
+                                  description: Weight associated with matching the
+                                    corresponding nodeSelectorTerm, in the range 1-100.
+                                  format: int32
+                                  type: integer
+                              required:
+                              - preference
+                              - weight
+                              type: object
+                            type: array
+                            x-kubernetes-list-type: atomic
+                          requiredDuringSchedulingIgnoredDuringExecution:
+                            description: |-
+                              If the affinity requirements specified by this field are not met at
+                              scheduling time, the pod will not be scheduled onto the node.
+                              If the affinity requirements specified by this field cease to be met
+                              at some point during pod execution (e.g. due to an update), the system
+                              may or may not try to eventually evict the pod from its node.
+                            properties:
+                              nodeSelectorTerms:
+                                description: Required. A list of node selector terms.
+                                  The terms are ORed.
+                                items:
+                                  description: |-
+                                    A null or empty node selector term matches no objects. The requirements of
+                                    them are ANDed.
+                                    The TopologySelectorTerm type implements a subset of the NodeSelectorTerm.
+                                  properties:
+                                    matchExpressions:
+                                      description: A list of node selector requirements
+                                        by node's labels.
+                                      items:
+                                        description: |-
+                                          A node selector requirement is a selector that contains values, a key, and an operator
+                                          that relates the key and values.
+                                        properties:
+                                          key:
+                                            description: The label key that the selector
+                                              applies to.
+                                            type: string
+                                          operator:
+                                            description: |-
+                                              Represents a key's relationship to a set of values.
+                                              Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt.
+                                            type: string
+                                          values:
+                                            description: |-
+                                              An array of string values. If the operator is In or NotIn,
+                                              the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                              the values array must be empty. If the operator is Gt or Lt, the values
+                                              array must have a single element, which will be interpreted as an integer.
+                                              This array is replaced during a strategic merge patch.
+                                            items:
+                                              type: string
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                        required:
+                                        - key
+                                        - operator
+                                        type: object
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    matchFields:
+                                      description: A list of node selector requirements
+                                        by node's fields.
+                                      items:
+                                        description: |-
+                                          A node selector requirement is a selector that contains values, a key, and an operator
+                                          that relates the key and values.
+                                        properties:
+                                          key:
+                                            description: The label key that the selector
+                                              applies to.
+                                            type: string
+                                          operator:
+                                            description: |-
+                                              Represents a key's relationship to a set of values.
+                                              Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt.
+                                            type: string
+                                          values:
+                                            description: |-
+                                              An array of string values. If the operator is In or NotIn,
+                                              the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                              the values array must be empty. If the operator is Gt or Lt, the values
+                                              array must have a single element, which will be interpreted as an integer.
+                                              This array is replaced during a strategic merge patch.
+                                            items:
+                                              type: string
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                        required:
+                                        - key
+                                        - operator
+                                        type: object
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                type: array
+                                x-kubernetes-list-type: atomic
+                            required:
+                            - nodeSelectorTerms
+                            type: object
+                            x-kubernetes-map-type: atomic
+                        type: object
+                      podAffinity:
+                        description: Describes pod affinity scheduling rules (e.g.
+                          co-locate this pod in the same node, zone, etc. as some
+                          other pod(s)).
+                        properties:
+                          preferredDuringSchedulingIgnoredDuringExecution:
+                            description: |-
+                              The scheduler will prefer to schedule pods to nodes that satisfy
+                              the affinity expressions specified by this field, but it may choose
+                              a node that violates one or more of the expressions. The node that is
+                              most preferred is the one with the greatest sum of weights, i.e.
+                              for each node that meets all of the scheduling requirements (resource
+                              request, requiredDuringScheduling affinity expressions, etc.),
+                              compute a sum by iterating through the elements of this field and adding
+                              "weight" to the sum if the node has pods which matches the corresponding podAffinityTerm; the
+                              node(s) with the highest sum are the most preferred.
+                            items:
+                              description: The weights of all of the matched WeightedPodAffinityTerm
+                                fields are added per-node to find the most preferred
+                                node(s)
+                              properties:
+                                podAffinityTerm:
+                                  description: Required. A pod affinity term, associated
+                                    with the corresponding weight.
+                                  properties:
+                                    labelSelector:
+                                      description: |-
+                                        A label query over a set of resources, in this case pods.
+                                        If it's null, this PodAffinityTerm matches with no Pods.
+                                      properties:
+                                        matchExpressions:
+                                          description: matchExpressions is a list
+                                            of label selector requirements. The requirements
+                                            are ANDed.
+                                          items:
+                                            description: |-
+                                              A label selector requirement is a selector that contains values, a key, and an operator that
+                                              relates the key and values.
+                                            properties:
+                                              key:
+                                                description: key is the label key
+                                                  that the selector applies to.
+                                                type: string
+                                              operator:
+                                                description: |-
+                                                  operator represents a key's relationship to a set of values.
+                                                  Valid operators are In, NotIn, Exists and DoesNotExist.
+                                                type: string
+                                              values:
+                                                description: |-
+                                                  values is an array of string values. If the operator is In or NotIn,
+                                                  the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                                  the values array must be empty. This array is replaced during a strategic
+                                                  merge patch.
+                                                items:
+                                                  type: string
+                                                type: array
+                                                x-kubernetes-list-type: atomic
+                                            required:
+                                            - key
+                                            - operator
+                                            type: object
+                                          type: array
+                                          x-kubernetes-list-type: atomic
+                                        matchLabels:
+                                          additionalProperties:
+                                            type: string
+                                          description: |-
+                                            matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                            map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                            operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                          type: object
+                                      type: object
+                                      x-kubernetes-map-type: atomic
+                                    matchLabelKeys:
+                                      description: |-
+                                        MatchLabelKeys is a set of pod label keys to select which pods will
+                                        be taken into consideration. The keys are used to lookup values from the
+                                        incoming pod labels, those key-value labels are merged with `labelSelector` as `key in (value)`
+                                        to select the group of existing pods which pods will be taken into consideration
+                                        for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+                                        pod labels will be ignored. The default value is empty.
+                                        The same key is forbidden to exist in both matchLabelKeys and labelSelector.
+                                        Also, matchLabelKeys cannot be set when labelSelector isn't set.
+                                      items:
+                                        type: string
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    mismatchLabelKeys:
+                                      description: |-
+                                        MismatchLabelKeys is a set of pod label keys to select which pods will
+                                        be taken into consideration. The keys are used to lookup values from the
+                                        incoming pod labels, those key-value labels are merged with `labelSelector` as `key notin (value)`
+                                        to select the group of existing pods which pods will be taken into consideration
+                                        for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+                                        pod labels will be ignored. The default value is empty.
+                                        The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
+                                        Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
+                                      items:
+                                        type: string
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    namespaceSelector:
+                                      description: |-
+                                        A label query over the set of namespaces that the term applies to.
+                                        The term is applied to the union of the namespaces selected by this field
+                                        and the ones listed in the namespaces field.
+                                        null selector and null or empty namespaces list means "this pod's namespace".
+                                        An empty selector ({}) matches all namespaces.
+                                      properties:
+                                        matchExpressions:
+                                          description: matchExpressions is a list
+                                            of label selector requirements. The requirements
+                                            are ANDed.
+                                          items:
+                                            description: |-
+                                              A label selector requirement is a selector that contains values, a key, and an operator that
+                                              relates the key and values.
+                                            properties:
+                                              key:
+                                                description: key is the label key
+                                                  that the selector applies to.
+                                                type: string
+                                              operator:
+                                                description: |-
+                                                  operator represents a key's relationship to a set of values.
+                                                  Valid operators are In, NotIn, Exists and DoesNotExist.
+                                                type: string
+                                              values:
+                                                description: |-
+                                                  values is an array of string values. If the operator is In or NotIn,
+                                                  the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                                  the values array must be empty. This array is replaced during a strategic
+                                                  merge patch.
+                                                items:
+                                                  type: string
+                                                type: array
+                                                x-kubernetes-list-type: atomic
+                                            required:
+                                            - key
+                                            - operator
+                                            type: object
+                                          type: array
+                                          x-kubernetes-list-type: atomic
+                                        matchLabels:
+                                          additionalProperties:
+                                            type: string
+                                          description: |-
+                                            matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                            map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                            operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                          type: object
+                                      type: object
+                                      x-kubernetes-map-type: atomic
+                                    namespaces:
+                                      description: |-
+                                        namespaces specifies a static list of namespace names that the term applies to.
+                                        The term is applied to the union of the namespaces listed in this field
+                                        and the ones selected by namespaceSelector.
+                                        null or empty namespaces list and null namespaceSelector means "this pod's namespace".
+                                      items:
+                                        type: string
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    topologyKey:
+                                      description: |-
+                                        This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching
+                                        the labelSelector in the specified namespaces, where co-located is defined as running on a node
+                                        whose value of the label with key topologyKey matches that of any node on which any of the
+                                        selected pods is running.
+                                        Empty topologyKey is not allowed.
+                                      type: string
+                                  required:
+                                  - topologyKey
+                                  type: object
+                                weight:
+                                  description: |-
+                                    weight associated with matching the corresponding podAffinityTerm,
+                                    in the range 1-100.
+                                  format: int32
+                                  type: integer
+                              required:
+                              - podAffinityTerm
+                              - weight
+                              type: object
+                            type: array
+                            x-kubernetes-list-type: atomic
+                          requiredDuringSchedulingIgnoredDuringExecution:
+                            description: |-
+                              If the affinity requirements specified by this field are not met at
+                              scheduling time, the pod will not be scheduled onto the node.
+                              If the affinity requirements specified by this field cease to be met
+                              at some point during pod execution (e.g. due to a pod label update), the
+                              system may or may not try to eventually evict the pod from its node.
+                              When there are multiple elements, the lists of nodes corresponding to each
+                              podAffinityTerm are intersected, i.e. all terms must be satisfied.
+                            items:
+                              description: |-
+                                Defines a set of pods (namely those matching the labelSelector
+                                relative to the given namespace(s)) that this pod should be
+                                co-located (affinity) or not co-located (anti-affinity) with,
+                                where co-located is defined as running on a node whose value of
+                                the label with key <topologyKey> matches that of any node on which
+                                a pod of the set of pods is running
+                              properties:
+                                labelSelector:
+                                  description: |-
+                                    A label query over a set of resources, in this case pods.
+                                    If it's null, this PodAffinityTerm matches with no Pods.
+                                  properties:
+                                    matchExpressions:
+                                      description: matchExpressions is a list of label
+                                        selector requirements. The requirements are
+                                        ANDed.
+                                      items:
+                                        description: |-
+                                          A label selector requirement is a selector that contains values, a key, and an operator that
+                                          relates the key and values.
+                                        properties:
+                                          key:
+                                            description: key is the label key that
+                                              the selector applies to.
+                                            type: string
+                                          operator:
+                                            description: |-
+                                              operator represents a key's relationship to a set of values.
+                                              Valid operators are In, NotIn, Exists and DoesNotExist.
+                                            type: string
+                                          values:
+                                            description: |-
+                                              values is an array of string values. If the operator is In or NotIn,
+                                              the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                              the values array must be empty. This array is replaced during a strategic
+                                              merge patch.
+                                            items:
+                                              type: string
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                        required:
+                                        - key
+                                        - operator
+                                        type: object
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    matchLabels:
+                                      additionalProperties:
+                                        type: string
+                                      description: |-
+                                        matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                        map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                        operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                      type: object
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                matchLabelKeys:
+                                  description: |-
+                                    MatchLabelKeys is a set of pod label keys to select which pods will
+                                    be taken into consideration. The keys are used to lookup values from the
+                                    incoming pod labels, those key-value labels are merged with `labelSelector` as `key in (value)`
+                                    to select the group of existing pods which pods will be taken into consideration
+                                    for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+                                    pod labels will be ignored. The default value is empty.
+                                    The same key is forbidden to exist in both matchLabelKeys and labelSelector.
+                                    Also, matchLabelKeys cannot be set when labelSelector isn't set.
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                mismatchLabelKeys:
+                                  description: |-
+                                    MismatchLabelKeys is a set of pod label keys to select which pods will
+                                    be taken into consideration. The keys are used to lookup values from the
+                                    incoming pod labels, those key-value labels are merged with `labelSelector` as `key notin (value)`
+                                    to select the group of existing pods which pods will be taken into consideration
+                                    for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+                                    pod labels will be ignored. The default value is empty.
+                                    The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
+                                    Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                namespaceSelector:
+                                  description: |-
+                                    A label query over the set of namespaces that the term applies to.
+                                    The term is applied to the union of the namespaces selected by this field
+                                    and the ones listed in the namespaces field.
+                                    null selector and null or empty namespaces list means "this pod's namespace".
+                                    An empty selector ({}) matches all namespaces.
+                                  properties:
+                                    matchExpressions:
+                                      description: matchExpressions is a list of label
+                                        selector requirements. The requirements are
+                                        ANDed.
+                                      items:
+                                        description: |-
+                                          A label selector requirement is a selector that contains values, a key, and an operator that
+                                          relates the key and values.
+                                        properties:
+                                          key:
+                                            description: key is the label key that
+                                              the selector applies to.
+                                            type: string
+                                          operator:
+                                            description: |-
+                                              operator represents a key's relationship to a set of values.
+                                              Valid operators are In, NotIn, Exists and DoesNotExist.
+                                            type: string
+                                          values:
+                                            description: |-
+                                              values is an array of string values. If the operator is In or NotIn,
+                                              the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                              the values array must be empty. This array is replaced during a strategic
+                                              merge patch.
+                                            items:
+                                              type: string
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                        required:
+                                        - key
+                                        - operator
+                                        type: object
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    matchLabels:
+                                      additionalProperties:
+                                        type: string
+                                      description: |-
+                                        matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                        map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                        operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                      type: object
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                namespaces:
+                                  description: |-
+                                    namespaces specifies a static list of namespace names that the term applies to.
+                                    The term is applied to the union of the namespaces listed in this field
+                                    and the ones selected by namespaceSelector.
+                                    null or empty namespaces list and null namespaceSelector means "this pod's namespace".
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                topologyKey:
+                                  description: |-
+                                    This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching
+                                    the labelSelector in the specified namespaces, where co-located is defined as running on a node
+                                    whose value of the label with key topologyKey matches that of any node on which any of the
+                                    selected pods is running.
+                                    Empty topologyKey is not allowed.
+                                  type: string
+                              required:
+                              - topologyKey
+                              type: object
+                            type: array
+                            x-kubernetes-list-type: atomic
+                        type: object
+                      podAntiAffinity:
+                        description: Describes pod anti-affinity scheduling rules
+                          (e.g. avoid putting this pod in the same node, zone, etc.
+                          as some other pod(s)).
+                        properties:
+                          preferredDuringSchedulingIgnoredDuringExecution:
+                            description: |-
+                              The scheduler will prefer to schedule pods to nodes that satisfy
+                              the anti-affinity expressions specified by this field, but it may choose
+                              a node that violates one or more of the expressions. The node that is
+                              most preferred is the one with the greatest sum of weights, i.e.
+                              for each node that meets all of the scheduling requirements (resource
+                              request, requiredDuringScheduling anti-affinity expressions, etc.),
+                              compute a sum by iterating through the elements of this field and adding
+                              "weight" to the sum if the node has pods which matches the corresponding podAffinityTerm; the
+                              node(s) with the highest sum are the most preferred.
+                            items:
+                              description: The weights of all of the matched WeightedPodAffinityTerm
+                                fields are added per-node to find the most preferred
+                                node(s)
+                              properties:
+                                podAffinityTerm:
+                                  description: Required. A pod affinity term, associated
+                                    with the corresponding weight.
+                                  properties:
+                                    labelSelector:
+                                      description: |-
+                                        A label query over a set of resources, in this case pods.
+                                        If it's null, this PodAffinityTerm matches with no Pods.
+                                      properties:
+                                        matchExpressions:
+                                          description: matchExpressions is a list
+                                            of label selector requirements. The requirements
+                                            are ANDed.
+                                          items:
+                                            description: |-
+                                              A label selector requirement is a selector that contains values, a key, and an operator that
+                                              relates the key and values.
+                                            properties:
+                                              key:
+                                                description: key is the label key
+                                                  that the selector applies to.
+                                                type: string
+                                              operator:
+                                                description: |-
+                                                  operator represents a key's relationship to a set of values.
+                                                  Valid operators are In, NotIn, Exists and DoesNotExist.
+                                                type: string
+                                              values:
+                                                description: |-
+                                                  values is an array of string values. If the operator is In or NotIn,
+                                                  the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                                  the values array must be empty. This array is replaced during a strategic
+                                                  merge patch.
+                                                items:
+                                                  type: string
+                                                type: array
+                                                x-kubernetes-list-type: atomic
+                                            required:
+                                            - key
+                                            - operator
+                                            type: object
+                                          type: array
+                                          x-kubernetes-list-type: atomic
+                                        matchLabels:
+                                          additionalProperties:
+                                            type: string
+                                          description: |-
+                                            matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                            map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                            operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                          type: object
+                                      type: object
+                                      x-kubernetes-map-type: atomic
+                                    matchLabelKeys:
+                                      description: |-
+                                        MatchLabelKeys is a set of pod label keys to select which pods will
+                                        be taken into consideration. The keys are used to lookup values from the
+                                        incoming pod labels, those key-value labels are merged with `labelSelector` as `key in (value)`
+                                        to select the group of existing pods which pods will be taken into consideration
+                                        for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+                                        pod labels will be ignored. The default value is empty.
+                                        The same key is forbidden to exist in both matchLabelKeys and labelSelector.
+                                        Also, matchLabelKeys cannot be set when labelSelector isn't set.
+                                      items:
+                                        type: string
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    mismatchLabelKeys:
+                                      description: |-
+                                        MismatchLabelKeys is a set of pod label keys to select which pods will
+                                        be taken into consideration. The keys are used to lookup values from the
+                                        incoming pod labels, those key-value labels are merged with `labelSelector` as `key notin (value)`
+                                        to select the group of existing pods which pods will be taken into consideration
+                                        for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+                                        pod labels will be ignored. The default value is empty.
+                                        The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
+                                        Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
+                                      items:
+                                        type: string
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    namespaceSelector:
+                                      description: |-
+                                        A label query over the set of namespaces that the term applies to.
+                                        The term is applied to the union of the namespaces selected by this field
+                                        and the ones listed in the namespaces field.
+                                        null selector and null or empty namespaces list means "this pod's namespace".
+                                        An empty selector ({}) matches all namespaces.
+                                      properties:
+                                        matchExpressions:
+                                          description: matchExpressions is a list
+                                            of label selector requirements. The requirements
+                                            are ANDed.
+                                          items:
+                                            description: |-
+                                              A label selector requirement is a selector that contains values, a key, and an operator that
+                                              relates the key and values.
+                                            properties:
+                                              key:
+                                                description: key is the label key
+                                                  that the selector applies to.
+                                                type: string
+                                              operator:
+                                                description: |-
+                                                  operator represents a key's relationship to a set of values.
+                                                  Valid operators are In, NotIn, Exists and DoesNotExist.
+                                                type: string
+                                              values:
+                                                description: |-
+                                                  values is an array of string values. If the operator is In or NotIn,
+                                                  the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                                  the values array must be empty. This array is replaced during a strategic
+                                                  merge patch.
+                                                items:
+                                                  type: string
+                                                type: array
+                                                x-kubernetes-list-type: atomic
+                                            required:
+                                            - key
+                                            - operator
+                                            type: object
+                                          type: array
+                                          x-kubernetes-list-type: atomic
+                                        matchLabels:
+                                          additionalProperties:
+                                            type: string
+                                          description: |-
+                                            matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                            map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                            operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                          type: object
+                                      type: object
+                                      x-kubernetes-map-type: atomic
+                                    namespaces:
+                                      description: |-
+                                        namespaces specifies a static list of namespace names that the term applies to.
+                                        The term is applied to the union of the namespaces listed in this field
+                                        and the ones selected by namespaceSelector.
+                                        null or empty namespaces list and null namespaceSelector means "this pod's namespace".
+                                      items:
+                                        type: string
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    topologyKey:
+                                      description: |-
+                                        This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching
+                                        the labelSelector in the specified namespaces, where co-located is defined as running on a node
+                                        whose value of the label with key topologyKey matches that of any node on which any of the
+                                        selected pods is running.
+                                        Empty topologyKey is not allowed.
+                                      type: string
+                                  required:
+                                  - topologyKey
+                                  type: object
+                                weight:
+                                  description: |-
+                                    weight associated with matching the corresponding podAffinityTerm,
+                                    in the range 1-100.
+                                  format: int32
+                                  type: integer
+                              required:
+                              - podAffinityTerm
+                              - weight
+                              type: object
+                            type: array
+                            x-kubernetes-list-type: atomic
+                          requiredDuringSchedulingIgnoredDuringExecution:
+                            description: |-
+                              If the anti-affinity requirements specified by this field are not met at
+                              scheduling time, the pod will not be scheduled onto the node.
+                              If the anti-affinity requirements specified by this field cease to be met
+                              at some point during pod execution (e.g. due to a pod label update), the
+                              system may or may not try to eventually evict the pod from its node.
+                              When there are multiple elements, the lists of nodes corresponding to each
+                              podAffinityTerm are intersected, i.e. all terms must be satisfied.
+                            items:
+                              description: |-
+                                Defines a set of pods (namely those matching the labelSelector
+                                relative to the given namespace(s)) that this pod should be
+                                co-located (affinity) or not co-located (anti-affinity) with,
+                                where co-located is defined as running on a node whose value of
+                                the label with key <topologyKey> matches that of any node on which
+                                a pod of the set of pods is running
+                              properties:
+                                labelSelector:
+                                  description: |-
+                                    A label query over a set of resources, in this case pods.
+                                    If it's null, this PodAffinityTerm matches with no Pods.
+                                  properties:
+                                    matchExpressions:
+                                      description: matchExpressions is a list of label
+                                        selector requirements. The requirements are
+                                        ANDed.
+                                      items:
+                                        description: |-
+                                          A label selector requirement is a selector that contains values, a key, and an operator that
+                                          relates the key and values.
+                                        properties:
+                                          key:
+                                            description: key is the label key that
+                                              the selector applies to.
+                                            type: string
+                                          operator:
+                                            description: |-
+                                              operator represents a key's relationship to a set of values.
+                                              Valid operators are In, NotIn, Exists and DoesNotExist.
+                                            type: string
+                                          values:
+                                            description: |-
+                                              values is an array of string values. If the operator is In or NotIn,
+                                              the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                              the values array must be empty. This array is replaced during a strategic
+                                              merge patch.
+                                            items:
+                                              type: string
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                        required:
+                                        - key
+                                        - operator
+                                        type: object
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    matchLabels:
+                                      additionalProperties:
+                                        type: string
+                                      description: |-
+                                        matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                        map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                        operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                      type: object
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                matchLabelKeys:
+                                  description: |-
+                                    MatchLabelKeys is a set of pod label keys to select which pods will
+                                    be taken into consideration. The keys are used to lookup values from the
+                                    incoming pod labels, those key-value labels are merged with `labelSelector` as `key in (value)`
+                                    to select the group of existing pods which pods will be taken into consideration
+                                    for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+                                    pod labels will be ignored. The default value is empty.
+                                    The same key is forbidden to exist in both matchLabelKeys and labelSelector.
+                                    Also, matchLabelKeys cannot be set when labelSelector isn't set.
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                mismatchLabelKeys:
+                                  description: |-
+                                    MismatchLabelKeys is a set of pod label keys to select which pods will
+                                    be taken into consideration. The keys are used to lookup values from the
+                                    incoming pod labels, those key-value labels are merged with `labelSelector` as `key notin (value)`
+                                    to select the group of existing pods which pods will be taken into consideration
+                                    for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+                                    pod labels will be ignored. The default value is empty.
+                                    The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
+                                    Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                namespaceSelector:
+                                  description: |-
+                                    A label query over the set of namespaces that the term applies to.
+                                    The term is applied to the union of the namespaces selected by this field
+                                    and the ones listed in the namespaces field.
+                                    null selector and null or empty namespaces list means "this pod's namespace".
+                                    An empty selector ({}) matches all namespaces.
+                                  properties:
+                                    matchExpressions:
+                                      description: matchExpressions is a list of label
+                                        selector requirements. The requirements are
+                                        ANDed.
+                                      items:
+                                        description: |-
+                                          A label selector requirement is a selector that contains values, a key, and an operator that
+                                          relates the key and values.
+                                        properties:
+                                          key:
+                                            description: key is the label key that
+                                              the selector applies to.
+                                            type: string
+                                          operator:
+                                            description: |-
+                                              operator represents a key's relationship to a set of values.
+                                              Valid operators are In, NotIn, Exists and DoesNotExist.
+                                            type: string
+                                          values:
+                                            description: |-
+                                              values is an array of string values. If the operator is In or NotIn,
+                                              the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                              the values array must be empty. This array is replaced during a strategic
+                                              merge patch.
+                                            items:
+                                              type: string
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                        required:
+                                        - key
+                                        - operator
+                                        type: object
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    matchLabels:
+                                      additionalProperties:
+                                        type: string
+                                      description: |-
+                                        matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                        map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                        operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                      type: object
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                namespaces:
+                                  description: |-
+                                    namespaces specifies a static list of namespace names that the term applies to.
+                                    The term is applied to the union of the namespaces listed in this field
+                                    and the ones selected by namespaceSelector.
+                                    null or empty namespaces list and null namespaceSelector means "this pod's namespace".
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                topologyKey:
+                                  description: |-
+                                    This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching
+                                    the labelSelector in the specified namespaces, where co-located is defined as running on a node
+                                    whose value of the label with key topologyKey matches that of any node on which any of the
+                                    selected pods is running.
+                                    Empty topologyKey is not allowed.
+                                  type: string
+                              required:
+                              - topologyKey
+                              type: object
+                            type: array
+                            x-kubernetes-list-type: atomic
+                        type: object
+                    type: object
+                  imagePullSecrets:
+                    description: |-
+                      ImagePullSecrets is the locked target pull-secret list for member
+                      Pods. Latched with the rest of the target spec.
+                    items:
+                      description: |-
+                        LocalObjectReference contains enough information to let you locate the
+                        referenced object inside the same namespace.
+                      properties:
+                        name:
+                          default: ""
+                          description: |-
+                            Name of the referent.
+                            This field is effectively required, but due to backwards compatibility is
+                            allowed to be empty. Instances of this type with an empty value here are
+                            almost certainly wrong.
+                            More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                          type: string
+                      type: object
+                      x-kubernetes-map-type: atomic
+                    type: array
+                  options:
+                    description: |-
+                      Options is the locked target etcd tuning flags for member Pods.
+                      Latched with the rest of the target spec so a mid-flight tuning
+                      edit only applies to members created once the current target is
+                      reached.
+                    properties:
+                      autoCompactionMode:
+                        description: |-
+                          AutoCompactionMode sets --auto-compaction-mode: how
+                          AutoCompactionRetention is interpreted, "periodic" (time-based)
+                          or "revision" (revision-count-based). Absent means etcd's default
+                          ("periodic" — though compaction only activates when a retention
+                          is set).
+                        enum:
+                        - periodic
+                        - revision
+                        type: string
+                      autoCompactionRetention:
+                        description: |-
+                          AutoCompactionRetention sets --auto-compaction-retention. In
+                          periodic mode a duration ("5m", "1h"; a bare integer means hours);
+                          in revision mode a revision count. Absent or "0" disables
+                          auto-compaction. The pattern admits what etcd itself parses: a
+                          bare non-negative integer or a Go duration.
+                        pattern: ^([0-9]+(\.[0-9]+)?(ms|s|m|h))+$|^[0-9]+$
+                        type: string
+                      quotaBackendBytes:
+                        description: |-
+                          QuotaBackendBytes sets --quota-backend-bytes: the backend database
+                          size limit in bytes before the member raises the cluster-wide
+                          NOSPACE alarm. 0 or absent means etcd's built-in default (2GiB).
+                          etcd's documented practical maximum is 8GiB.
+                        format: int64
+                        minimum: 0
+                        type: integer
+                      snapshotCount:
+                        description: |-
+                          SnapshotCount sets --snapshot-count: the number of committed
+                          raft entries to retain in memory before triggering an internal
+                          raft snapshot (this is unrelated to EtcdSnapshot backups). Absent
+                          means etcd's built-in default. Lower values trade replay speed on
+                          restart for a smaller memory footprint.
+                        format: int64
+                        minimum: 1
+                        type: integer
+                    type: object
+                  replicas:
+                    description: Replicas is the locked target replica count.
+                    format: int32
+                    type: integer
+                  resources:
+                    description: |-
+                      Resources is the locked target etcd container resources. The
+                      locking pattern prevents a mid-flight resource change from being
+                      honoured on newly-created members until the current target is
+                      reached or its deadline expires.
+                    properties:
+                      claims:
+                        description: |-
+                          Claims lists the names of resources, defined in spec.resourceClaims,
+                          that are used by this container.
+
+                          This is an alpha field and requires enabling the
+                          DynamicResourceAllocation feature gate.
+
+                          This field is immutable. It can only be set for containers.
+                        items:
+                          description: ResourceClaim references one entry in PodSpec.ResourceClaims.
+                          properties:
+                            name:
+                              description: |-
+                                Name must match the name of one entry in pod.spec.resourceClaims of
+                                the Pod where this field is used. It makes that resource available
+                                inside a container.
+                              type: string
+                            request:
+                              description: |-
+                                Request is the name chosen for a request in the referenced claim.
+                                If empty, everything from the claim is made available, otherwise
+                                only the result of this request.
+                              type: string
+                          required:
+                          - name
+                          type: object
+                        type: array
+                        x-kubernetes-list-map-keys:
+                        - name
+                        x-kubernetes-list-type: map
+                      limits:
+                        additionalProperties:
+                          anyOf:
+                          - type: integer
+                          - type: string
+                          pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                          x-kubernetes-int-or-string: true
+                        description: |-
+                          Limits describes the maximum amount of compute resources allowed.
+                          More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+                        type: object
+                      requests:
+                        additionalProperties:
+                          anyOf:
+                          - type: integer
+                          - type: string
+                          pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                          x-kubernetes-int-or-string: true
+                        description: |-
+                          Requests describes the minimum amount of compute resources required.
+                          If Requests is omitted for a container, it defaults to Limits if that is explicitly specified,
+                          otherwise to an implementation-defined value. Requests cannot exceed Limits.
+                          More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+                        type: object
+                    type: object
+                  storage:
+                    description: |-
+                      Storage is the locked target storage configuration. The locking
+                      pattern prevents a mid-flight size grow from being honoured until
+                      the current target is reached or its deadline expires. (Medium
+                      can't change at all post-create — that's enforced by spec-level
+                      CEL.)
+                    properties:
+                      medium:
+                        default: ""
+                        description: |-
+                          Medium selects the volume backend: "" (PVC) or "Memory" (tmpfs
+                          emptyDir). See the StorageMedium type doc for operational trade-offs.
+
+                          Immutable: changing the medium on an existing cluster would orphan
+                          the previous PVC (or tmpfs) and the rolling-migrate path is not
+                          implemented. The default ("") is set explicitly so the apiserver
+                          always stores the field on Create — without it, a first-time set
+                          from absent → Memory would slip past the transition rule.
+                        enum:
+                        - ""
+                        - Memory
+                        type: string
+                        x-kubernetes-validations:
+                        - message: spec.storage.medium is immutable; delete and recreate
+                            the cluster to change the storage backend
+                          rule: self == oldSelf
+                      size:
+                        anyOf:
+                        - type: integer
+                        - type: string
+                        default: 1Gi
+                        description: |-
+                          Size is the requested capacity per member. For Medium="" (PVC) this
+                          is the PVC's requested storage. For Medium="Memory" this is the
+                          tmpfs emptyDir's SizeLimit.
+
+                          Shrinking is rejected on UPDATE: PVCs cannot shrink and tmpfs
+                          SizeLimit reduction does not free already-allocated memory.
+                        pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                        x-kubernetes-int-or-string: true
+                        x-kubernetes-validations:
+                        - message: spec.storage.size cannot be shrunk
+                          rule: quantity(string(self)).compareTo(quantity(string(oldSelf)))
+                            >= 0
+                      storageClassName:
+                        description: |-
+                          StorageClassName selects the StorageClass for the per-member PVC.
+                          Mirrors corev1.PersistentVolumeClaimSpec.StorageClassName semantics:
+                          nil (the default) uses the namespace's default StorageClass; the
+                          empty string explicitly disables dynamic provisioning (a
+                          pre-provisioned PV must already match the PVC selector); any other
+                          value names a specific StorageClass.
+
+                          Ignored when Medium=Memory (no PVC is created).
+
+                          Immutable post-create — PersistentVolumeClaim.spec.storageClassName
+                          is itself immutable after PVC creation, so honouring a mid-life
+                          change would require a rolling PVC-recreation flow that this
+                          operator does not perform. The immutability rules live at the
+                          EtcdClusterSpec level (alongside the other pointer-field rules)
+                          because *string transition CEL on the inner field cannot fire when
+                          the field is being added from nil.
+                        type: string
+                    type: object
+                  topologySpreadConstraints:
+                    description: |-
+                      TopologySpreadConstraints is the locked target spread configuration
+                      for member Pods. Latched with the rest of the target spec.
+                    items:
+                      description: TopologySpreadConstraint specifies how to spread
+                        matching pods among the given topology.
+                      properties:
+                        labelSelector:
+                          description: |-
+                            LabelSelector is used to find matching pods.
+                            Pods that match this label selector are counted to determine the number of pods
+                            in their corresponding topology domain.
+                          properties:
+                            matchExpressions:
+                              description: matchExpressions is a list of label selector
+                                requirements. The requirements are ANDed.
+                              items:
+                                description: |-
+                                  A label selector requirement is a selector that contains values, a key, and an operator that
+                                  relates the key and values.
+                                properties:
+                                  key:
+                                    description: key is the label key that the selector
+                                      applies to.
+                                    type: string
+                                  operator:
+                                    description: |-
+                                      operator represents a key's relationship to a set of values.
+                                      Valid operators are In, NotIn, Exists and DoesNotExist.
+                                    type: string
+                                  values:
+                                    description: |-
+                                      values is an array of string values. If the operator is In or NotIn,
+                                      the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                      the values array must be empty. This array is replaced during a strategic
+                                      merge patch.
+                                    items:
+                                      type: string
+                                    type: array
+                                    x-kubernetes-list-type: atomic
+                                required:
+                                - key
+                                - operator
+                                type: object
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            matchLabels:
+                              additionalProperties:
+                                type: string
+                              description: |-
+                                matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                operator is "In", and the values array contains only "value". The requirements are ANDed.
+                              type: object
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        matchLabelKeys:
+                          description: |-
+                            MatchLabelKeys is a set of pod label keys to select the pods over which
+                            spreading will be calculated. The keys are used to lookup values from the
+                            incoming pod labels, those key-value labels are ANDed with labelSelector
+                            to select the group of existing pods over which spreading will be calculated
+                            for the incoming pod. The same key is forbidden to exist in both MatchLabelKeys and LabelSelector.
+                            MatchLabelKeys cannot be set when LabelSelector isn't set.
+                            Keys that don't exist in the incoming pod labels will
+                            be ignored. A null or empty list means only match against labelSelector.
+
+                            This is a beta field and requires the MatchLabelKeysInPodTopologySpread feature gate to be enabled (enabled by default).
+                          items:
+                            type: string
+                          type: array
+                          x-kubernetes-list-type: atomic
+                        maxSkew:
+                          description: |-
+                            MaxSkew describes the degree to which pods may be unevenly distributed.
+                            When `whenUnsatisfiable=DoNotSchedule`, it is the maximum permitted difference
+                            between the number of matching pods in the target topology and the global minimum.
+                            The global minimum is the minimum number of matching pods in an eligible domain
+                            or zero if the number of eligible domains is less than MinDomains.
+                            For example, in a 3-zone cluster, MaxSkew is set to 1, and pods with the same
+                            labelSelector spread as 2/2/1:
+                            In this case, the global minimum is 1.
+                            | zone1 | zone2 | zone3 |
+                            |  P P  |  P P  |   P   |
+                            - if MaxSkew is 1, incoming pod can only be scheduled to zone3 to become 2/2/2;
+                            scheduling it onto zone1(zone2) would make the ActualSkew(3-1) on zone1(zone2)
+                            violate MaxSkew(1).
+                            - if MaxSkew is 2, incoming pod can be scheduled onto any zone.
+                            When `whenUnsatisfiable=ScheduleAnyway`, it is used to give higher precedence
+                            to topologies that satisfy it.
+                            It's a required field. Default value is 1 and 0 is not allowed.
+                          format: int32
+                          type: integer
+                        minDomains:
+                          description: |-
+                            MinDomains indicates a minimum number of eligible domains.
+                            When the number of eligible domains with matching topology keys is less than minDomains,
+                            Pod Topology Spread treats "global minimum" as 0, and then the calculation of Skew is performed.
+                            And when the number of eligible domains with matching topology keys equals or greater than minDomains,
+                            this value has no effect on scheduling.
+                            As a result, when the number of eligible domains is less than minDomains,
+                            scheduler won't schedule more than maxSkew Pods to those domains.
+                            If value is nil, the constraint behaves as if MinDomains is equal to 1.
+                            Valid values are integers greater than 0.
+                            When value is not nil, WhenUnsatisfiable must be DoNotSchedule.
+
+                            For example, in a 3-zone cluster, MaxSkew is set to 2, MinDomains is set to 5 and pods with the same
+                            labelSelector spread as 2/2/2:
+                            | zone1 | zone2 | zone3 |
+                            |  P P  |  P P  |  P P  |
+                            The number of domains is less than 5(MinDomains), so "global minimum" is treated as 0.
+                            In this situation, new pod with the same labelSelector cannot be scheduled,
+                            because computed skew will be 3(3 - 0) if new Pod is scheduled to any of the three zones,
+                            it will violate MaxSkew.
+                          format: int32
+                          type: integer
+                        nodeAffinityPolicy:
+                          description: |-
+                            NodeAffinityPolicy indicates how we will treat Pod's nodeAffinity/nodeSelector
+                            when calculating pod topology spread skew. Options are:
+                            - Honor: only nodes matching nodeAffinity/nodeSelector are included in the calculations.
+                            - Ignore: nodeAffinity/nodeSelector are ignored. All nodes are included in the calculations.
+
+                            If this value is nil, the behavior is equivalent to the Honor policy.
+                          type: string
+                        nodeTaintsPolicy:
+                          description: |-
+                            NodeTaintsPolicy indicates how we will treat node taints when calculating
+                            pod topology spread skew. Options are:
+                            - Honor: nodes without taints, along with tainted nodes for which the incoming pod
+                            has a toleration, are included.
+                            - Ignore: node taints are ignored. All nodes are included.
+
+                            If this value is nil, the behavior is equivalent to the Ignore policy.
+                          type: string
+                        topologyKey:
+                          description: |-
+                            TopologyKey is the key of node labels. Nodes that have a label with this key
+                            and identical values are considered to be in the same topology.
+                            We consider each <key, value> as a "bucket", and try to put balanced number
+                            of pods into each bucket.
+                            We define a domain as a particular instance of a topology.
+                            Also, we define an eligible domain as a domain whose nodes meet the requirements of
+                            nodeAffinityPolicy and nodeTaintsPolicy.
+                            e.g. If TopologyKey is "kubernetes.io/hostname", each Node is a domain of that topology.
+                            And, if TopologyKey is "topology.kubernetes.io/zone", each zone is a domain of that topology.
+                            It's a required field.
+                          type: string
+                        whenUnsatisfiable:
+                          description: |-
+                            WhenUnsatisfiable indicates how to deal with a pod if it doesn't satisfy
+                            the spread constraint.
+                            - DoNotSchedule (default) tells the scheduler not to schedule it.
+                            - ScheduleAnyway tells the scheduler to schedule the pod in any location,
+                              but giving higher precedence to topologies that would help reduce the
+                              skew.
+                            A constraint is considered "Unsatisfiable" for an incoming pod
+                            if and only if every possible node assignment for that pod would violate
+                            "MaxSkew" on some topology.
+                            For example, in a 3-zone cluster, MaxSkew is set to 1, and pods with the same
+                            labelSelector spread as 3/1/1:
+                            | zone1 | zone2 | zone3 |
+                            | P P P |   P   |   P   |
+                            If WhenUnsatisfiable is set to DoNotSchedule, incoming pod can only be scheduled
+                            to zone2(zone3) to become 3/2/1(3/1/2) as ActualSkew(2-1) on zone2(zone3) satisfies
+                            MaxSkew(1). In other words, the cluster can still be imbalanced, but scheduler
+                            won't make it *more* imbalanced.
+                            It's a required field.
+                          type: string
+                      required:
+                      - maxSkew
+                      - topologyKey
+                      - whenUnsatisfiable
+                      type: object
+                    type: array
+                  version:
+                    description: Version is the locked target etcd version.
+                    type: string
+                required:
+                - replicas
+                - storage
+                - version
+                type: object
+              progressDeadline:
+                description: |-
+                  ProgressDeadline is the time at which the in-flight reconciliation
+                  will be abandoned in favor of the latest spec. Cleared when the
+                  cluster reaches Observed. Patch this to a time in the past to abort
+                  a stuck reconcile.
+                format: date-time
+                type: string
+              readyMembers:
+                description: |-
+                  ReadyMembers is the count of members that are healthy and serving.
+                  Also exposed as Scale.Status.Replicas via the /scale subresource so
+                  kubectl scale and clients like VerticalPodAutoscaler can read
+                  "current scale" without a custom status field.
+                format: int32
+                type: integer
+              selector:
+                description: |-
+                  Selector is the label-selector form ("etcd-operator.cozystack.io/cluster=<name>")
+                  matching every Pod owned by this cluster. Surfaced for the /scale
+                  subresource — the VPA admission controller reads it via Scales().Get()
+                  to know which Pods to inject recommendations into. Plain users won't
+                  see this field directly.
+                type: string
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources:
+      scale:
+        labelSelectorPath: .status.selector
+        specReplicasPath: .spec.replicas
+        statusReplicasPath: .status.readyMembers
+      status: {}
diff --git a/packages/system/etcd-operator-crds/templates/etcddefragpolicies.yaml b/packages/system/etcd-operator-crds/templates/etcddefragpolicies.yaml
new file mode 100644
index 0000000000..685086d830
--- /dev/null
+++ b/packages/system/etcd-operator-crds/templates/etcddefragpolicies.yaml
@@ -0,0 +1,318 @@
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.18.0
+    helm.sh/resource-policy: keep
+  name: etcddefragpolicies.etcd-operator.cozystack.io
+spec:
+  group: etcd-operator.cozystack.io
+  names:
+    kind: EtcdDefragPolicy
+    listKind: EtcdDefragPolicyList
+    plural: etcddefragpolicies
+    singular: etcddefragpolicy
+  scope: Namespaced
+  versions:
+  - additionalPrinterColumns:
+    - jsonPath: .spec.clusterRef.name
+      name: Cluster
+      type: string
+    - jsonPath: .spec.schedule.cron
+      name: Schedule
+      type: string
+    - jsonPath: .spec.schedule.timezone
+      name: Timezone
+      type: string
+    - jsonPath: .spec.suspend
+      name: Suspend
+      type: boolean
+    - jsonPath: .status.lastScheduleTime
+      name: Last Schedule
+      type: date
+    - jsonPath: .metadata.creationTimestamp
+      name: Age
+      type: date
+    name: v1alpha2
+    schema:
+      openAPIV3Schema:
+        description: |-
+          EtcdDefragPolicy is the Schema for the etcddefragpolicies API. It stamps out
+          EtcdDefrag runs on a cron schedule so the operator drives recurring
+          defragmentation itself. Each run is a discrete, auditable EtcdDefrag owned by
+          the policy.
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: |-
+              EtcdDefragPolicySpec is the desired state of an EtcdDefragPolicy: a recurring
+              schedule that stamps out EtcdDefrag runs against one EtcdCluster, so the
+              operator absorbs the cadence instead of relying on an external CronJob.
+            properties:
+              clusterRef:
+                description: |-
+                  ClusterRef names the EtcdCluster (same namespace) each stamped EtcdDefrag
+                  targets.
+                properties:
+                  name:
+                    default: ""
+                    description: |-
+                      Name of the referent.
+                      This field is effectively required, but due to backwards compatibility is
+                      allowed to be empty. Instances of this type with an empty value here are
+                      almost certainly wrong.
+                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                    type: string
+                type: object
+                x-kubernetes-map-type: atomic
+              concurrencyPolicy:
+                default: Forbid
+                description: |-
+                  ConcurrencyPolicy decides what a due tick does when a previous stamped run
+                  is still active. Defaults to Forbid.
+                enum:
+                - Allow
+                - Forbid
+                type: string
+              historyLimit:
+                description: |-
+                  HistoryLimit caps how many finished (Complete/Failed) EtcdDefrags stamped
+                  by this policy are retained; the oldest beyond the limit are deleted.
+                  Absent leaves cleanup to each run's ttlSecondsAfterFinished.
+                format: int32
+                minimum: 0
+                type: integer
+              rule:
+                description: |-
+                  Rule is stamped verbatim into each EtcdDefrag; it decides which members a
+                  run touches. Absent stamps runs with no rule (the default gate).
+                properties:
+                  all:
+                    description: |-
+                      All defragments every member unconditionally, regardless of size — the
+                      explicit "do it now". Mutually exclusive with the threshold fields below.
+                    type: boolean
+                  freeSpaceAbove:
+                    anyOf:
+                    - type: integer
+                    - type: string
+                    description: |-
+                      FreeSpaceAbove defragments a member whose reclaimable space
+                      (DbSize-DbSizeInUse) exceeds this. The primary, always-applied gate.
+                      Absent means the built-in default (200Mi).
+                    pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                    x-kubernetes-int-or-string: true
+                  minReclaim:
+                    anyOf:
+                    - type: integer
+                    - type: string
+                    description: |-
+                      MinReclaim floors the quota arm: even under quota pressure, skip a member
+                      that would reclaim less than this. Only meaningful with QuotaUsageAbove,
+                      and must not exceed FreeSpaceAbove. Absent means the built-in default
+                      (32Mi).
+                    pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                    x-kubernetes-int-or-string: true
+                  quotaUsageAbove:
+                    description: |-
+                      QuotaUsageAbove: when DbSize exceeds this fraction of the backend quota
+                      (approaching NOSPACE), lower the reclaimable floor to MinReclaim so small
+                      wins are taken under pressure. A member is never defragmented when its
+                      reclaimable space is below MinReclaim. Integer percent 1..99 with a "%"
+                      suffix, e.g. "80%"; 100% is rejected because a backend never exceeds its
+                      quota (etcd raises NOSPACE first), so the arm could never fire.
+                    pattern: ^[1-9][0-9]?%$
+                    type: string
+                type: object
+                x-kubernetes-validations:
+                - message: rule.all cannot be combined with freeSpaceAbove/quotaUsageAbove/minReclaim
+                  rule: '!(has(self.all) && self.all) || (!has(self.freeSpaceAbove)
+                    && !has(self.quotaUsageAbove) && !has(self.minReclaim))'
+                - message: freeSpaceAbove must be greater than 0
+                  rule: '!has(self.freeSpaceAbove) || quantity(string(self.freeSpaceAbove)).isGreaterThan(quantity(''0''))'
+                - message: minReclaim must be greater than 0
+                  rule: '!has(self.minReclaim) || quantity(string(self.minReclaim)).isGreaterThan(quantity(''0''))'
+                - message: minReclaim is only meaningful with quotaUsageAbove
+                  rule: '!has(self.minReclaim) || has(self.quotaUsageAbove)'
+                - message: minReclaim must not exceed freeSpaceAbove
+                  rule: '!(has(self.minReclaim) && has(self.freeSpaceAbove)) || quantity(string(self.minReclaim)).compareTo(quantity(string(self.freeSpaceAbove)))
+                    <= 0'
+              schedule:
+                description: Schedule names when a run is stamped.
+                properties:
+                  cron:
+                    description: |-
+                      Cron is a standard five-field cron expression (e.g. "0 3 * * *" for 03:00).
+                      Descriptors (@daily) and a TZ=/CRON_TZ= prefix are rejected; use Timezone
+                      for the zone.
+                    minLength: 1
+                    type: string
+                    x-kubernetes-validations:
+                    - message: set the zone in schedule.timezone, not a TZ= prefix
+                      rule: '!self.contains(''TZ='')'
+                  timezone:
+                    description: |-
+                      Timezone is an IANA zone name (e.g. "Europe/Moscow") the cron expression is
+                      read in. Absent reads it in UTC.
+                    type: string
+                required:
+                - cron
+                type: object
+              startingDeadlineSeconds:
+                description: |-
+                  StartingDeadlineSeconds bounds how late a missed tick may still be started.
+                  If the operator was down (or the tick forbidden) and more than this many
+                  seconds have passed since the scheduled time, that tick is skipped rather
+                  than started late. Absent means no deadline.
+
+                  Capped at ten years: the value is multiplied out to a time.Duration, which
+                  overflows past ~292 years and wraps to a negative window that silently
+                  suppresses every tick. Anything near the cap already means "no deadline".
+                format: int64
+                maximum: 315360000
+                minimum: 0
+                type: integer
+              suspend:
+                description: |-
+                  Suspend pauses stamping. Runs already in flight are left alone. On resume
+                  the single most recent missed tick may be stamped (subject to
+                  StartingDeadlineSeconds); earlier missed ticks are never replayed.
+                type: boolean
+              ttlSecondsAfterFinished:
+                description: |-
+                  TTLSecondsAfterFinished is stamped into each EtcdDefrag so a stamped run
+                  garbage-collects itself once finished. Complements HistoryLimit.
+                format: int32
+                minimum: 0
+                type: integer
+            required:
+            - clusterRef
+            - schedule
+            type: object
+            x-kubernetes-validations:
+            - message: spec.clusterRef.name is required
+              rule: size(self.clusterRef.name) != 0
+          status:
+            description: EtcdDefragPolicyStatus is the observed state of an EtcdDefragPolicy.
+            properties:
+              active:
+                description: Active references the stamped EtcdDefrags that have not
+                  yet finished.
+                items:
+                  description: |-
+                    LocalObjectReference contains enough information to let you locate the
+                    referenced object inside the same namespace.
+                  properties:
+                    name:
+                      default: ""
+                      description: |-
+                        Name of the referent.
+                        This field is effectively required, but due to backwards compatibility is
+                        allowed to be empty. Instances of this type with an empty value here are
+                        almost certainly wrong.
+                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                      type: string
+                  type: object
+                  x-kubernetes-map-type: atomic
+                type: array
+                x-kubernetes-list-type: atomic
+              conditions:
+                description: |-
+                  Conditions represent the latest observations — notably why stamping is
+                  paused (Suspended) or not happening (InvalidSchedule).
+                items:
+                  description: Condition contains details for one aspect of the current
+                    state of this API Resource.
+                  properties:
+                    lastTransitionTime:
+                      description: |-
+                        lastTransitionTime is the last time the condition transitioned from one status to another.
+                        This should be when the underlying condition changed.  If that is not known, then using the time when the API field changed is acceptable.
+                      format: date-time
+                      type: string
+                    message:
+                      description: |-
+                        message is a human readable message indicating details about the transition.
+                        This may be an empty string.
+                      maxLength: 32768
+                      type: string
+                    observedGeneration:
+                      description: |-
+                        observedGeneration represents the .metadata.generation that the condition was set based upon.
+                        For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date
+                        with respect to the current state of the instance.
+                      format: int64
+                      minimum: 0
+                      type: integer
+                    reason:
+                      description: |-
+                        reason contains a programmatic identifier indicating the reason for the condition's last transition.
+                        Producers of specific condition types may define expected values and meanings for this field,
+                        and whether the values are considered a guaranteed API.
+                        The value should be a CamelCase string.
+                        This field may not be empty.
+                      maxLength: 1024
+                      minLength: 1
+                      pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
+                      type: string
+                    status:
+                      description: status of the condition, one of True, False, Unknown.
+                      enum:
+                      - "True"
+                      - "False"
+                      - Unknown
+                      type: string
+                    type:
+                      description: type of condition in CamelCase or in foo.example.com/CamelCase.
+                      maxLength: 316
+                      pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
+                      type: string
+                  required:
+                  - lastTransitionTime
+                  - message
+                  - reason
+                  - status
+                  - type
+                  type: object
+                type: array
+              lastScheduleTime:
+                description: |-
+                  LastScheduleTime is the scheduled time of the most recent tick the policy
+                  stamped a run for, or consumed by skipping under ConcurrencyPolicy. It
+                  anchors the next tick, so a tick is never acted on twice. A tick dropped
+                  for being too far in the past does not advance it; those are reported as
+                  MissedSchedule events.
+                format: date-time
+                type: string
+              lastSuccessfulTime:
+                description: LastSuccessfulTime is when a stamped run most recently
+                  reached Complete.
+                format: date-time
+                type: string
+            type: object
+        type: object
+        x-kubernetes-validations:
+        - message: 'metadata.name must be 52 characters or fewer: it becomes a label
+            value on each stamped EtcdDefrag'
+          rule: size(self.metadata.name) <= 52
+    served: true
+    storage: true
+    subresources:
+      status: {}
diff --git a/packages/system/etcd-operator-crds/templates/etcddefrags.yaml b/packages/system/etcd-operator-crds/templates/etcddefrags.yaml
new file mode 100644
index 0000000000..68f260c58f
--- /dev/null
+++ b/packages/system/etcd-operator-crds/templates/etcddefrags.yaml
@@ -0,0 +1,279 @@
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.18.0
+    helm.sh/resource-policy: keep
+  name: etcddefrags.etcd-operator.cozystack.io
+spec:
+  group: etcd-operator.cozystack.io
+  names:
+    kind: EtcdDefrag
+    listKind: EtcdDefragList
+    plural: etcddefrags
+    singular: etcddefrag
+  scope: Namespaced
+  versions:
+  - additionalPrinterColumns:
+    - jsonPath: .spec.clusterRef.name
+      name: Cluster
+      type: string
+    - jsonPath: .status.phase
+      name: Phase
+      type: string
+    - jsonPath: .status.defragmented
+      name: Defragmented
+      type: integer
+    - jsonPath: .metadata.creationTimestamp
+      name: Age
+      type: date
+    name: v1alpha2
+    schema:
+      openAPIV3Schema:
+        description: |-
+          EtcdDefrag is the Schema for the etcddefrags API. It requests a one-shot,
+          run-to-completion defragmentation of an EtcdCluster's members. Like
+          EtcdSnapshot it is a record: the operator drives it through status.phase and
+          it never re-runs.
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: |-
+              EtcdDefragSpec is the desired state of an EtcdDefrag: a one-shot request to
+              defragment an EtcdCluster's members.
+            properties:
+              clusterRef:
+                description: ClusterRef names the EtcdCluster (same namespace) to
+                  defragment.
+                properties:
+                  name:
+                    default: ""
+                    description: |-
+                      Name of the referent.
+                      This field is effectively required, but due to backwards compatibility is
+                      allowed to be empty. Instances of this type with an empty value here are
+                      almost certainly wrong.
+                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                    type: string
+                type: object
+                x-kubernetes-map-type: atomic
+              rule:
+                description: |-
+                  Rule decides which members this run touches. Absent is equivalent to an
+                  empty rule: the default gate (freeSpaceAbove 200Mi). To defragment every
+                  member unconditionally, set rule.all: true.
+                properties:
+                  all:
+                    description: |-
+                      All defragments every member unconditionally, regardless of size — the
+                      explicit "do it now". Mutually exclusive with the threshold fields below.
+                    type: boolean
+                  freeSpaceAbove:
+                    anyOf:
+                    - type: integer
+                    - type: string
+                    description: |-
+                      FreeSpaceAbove defragments a member whose reclaimable space
+                      (DbSize-DbSizeInUse) exceeds this. The primary, always-applied gate.
+                      Absent means the built-in default (200Mi).
+                    pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                    x-kubernetes-int-or-string: true
+                  minReclaim:
+                    anyOf:
+                    - type: integer
+                    - type: string
+                    description: |-
+                      MinReclaim floors the quota arm: even under quota pressure, skip a member
+                      that would reclaim less than this. Only meaningful with QuotaUsageAbove,
+                      and must not exceed FreeSpaceAbove. Absent means the built-in default
+                      (32Mi).
+                    pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                    x-kubernetes-int-or-string: true
+                  quotaUsageAbove:
+                    description: |-
+                      QuotaUsageAbove: when DbSize exceeds this fraction of the backend quota
+                      (approaching NOSPACE), lower the reclaimable floor to MinReclaim so small
+                      wins are taken under pressure. A member is never defragmented when its
+                      reclaimable space is below MinReclaim. Integer percent 1..99 with a "%"
+                      suffix, e.g. "80%"; 100% is rejected because a backend never exceeds its
+                      quota (etcd raises NOSPACE first), so the arm could never fire.
+                    pattern: ^[1-9][0-9]?%$
+                    type: string
+                type: object
+                x-kubernetes-validations:
+                - message: rule.all cannot be combined with freeSpaceAbove/quotaUsageAbove/minReclaim
+                  rule: '!(has(self.all) && self.all) || (!has(self.freeSpaceAbove)
+                    && !has(self.quotaUsageAbove) && !has(self.minReclaim))'
+                - message: freeSpaceAbove must be greater than 0
+                  rule: '!has(self.freeSpaceAbove) || quantity(string(self.freeSpaceAbove)).isGreaterThan(quantity(''0''))'
+                - message: minReclaim must be greater than 0
+                  rule: '!has(self.minReclaim) || quantity(string(self.minReclaim)).isGreaterThan(quantity(''0''))'
+                - message: minReclaim is only meaningful with quotaUsageAbove
+                  rule: '!has(self.minReclaim) || has(self.quotaUsageAbove)'
+                - message: minReclaim must not exceed freeSpaceAbove
+                  rule: '!(has(self.minReclaim) && has(self.freeSpaceAbove)) || quantity(string(self.minReclaim)).compareTo(quantity(string(self.freeSpaceAbove)))
+                    <= 0'
+              ttlSecondsAfterFinished:
+                description: |-
+                  TTLSecondsAfterFinished records how long after a terminal phase this
+                  object should be garbage-collected — meaningful for objects a scheduler
+                  stamps out. Acted on by the reconciling controller; the API server does not
+                  garbage-collect custom resources on its own. Absent means the record is kept.
+                format: int32
+                minimum: 0
+                type: integer
+            required:
+            - clusterRef
+            type: object
+            x-kubernetes-validations:
+            - message: spec.clusterRef.name is required
+              rule: size(self.clusterRef.name) != 0
+          status:
+            description: EtcdDefragStatus is the observed state of an EtcdDefrag.
+            properties:
+              completedAt:
+                description: CompletedAt is when the sweep reached a terminal phase.
+                format: date-time
+                type: string
+              conditions:
+                description: |-
+                  Conditions represent the latest available observations — including why a
+                  Pending run is being deferred (e.g. the cluster is not fully healthy).
+                items:
+                  description: Condition contains details for one aspect of the current
+                    state of this API Resource.
+                  properties:
+                    lastTransitionTime:
+                      description: |-
+                        lastTransitionTime is the last time the condition transitioned from one status to another.
+                        This should be when the underlying condition changed.  If that is not known, then using the time when the API field changed is acceptable.
+                      format: date-time
+                      type: string
+                    message:
+                      description: |-
+                        message is a human readable message indicating details about the transition.
+                        This may be an empty string.
+                      maxLength: 32768
+                      type: string
+                    observedGeneration:
+                      description: |-
+                        observedGeneration represents the .metadata.generation that the condition was set based upon.
+                        For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date
+                        with respect to the current state of the instance.
+                      format: int64
+                      minimum: 0
+                      type: integer
+                    reason:
+                      description: |-
+                        reason contains a programmatic identifier indicating the reason for the condition's last transition.
+                        Producers of specific condition types may define expected values and meanings for this field,
+                        and whether the values are considered a guaranteed API.
+                        The value should be a CamelCase string.
+                        This field may not be empty.
+                      maxLength: 1024
+                      minLength: 1
+                      pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
+                      type: string
+                    status:
+                      description: status of the condition, one of True, False, Unknown.
+                      enum:
+                      - "True"
+                      - "False"
+                      - Unknown
+                      type: string
+                    type:
+                      description: type of condition in CamelCase or in foo.example.com/CamelCase.
+                      maxLength: 316
+                      pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
+                      type: string
+                  required:
+                  - lastTransitionTime
+                  - message
+                  - reason
+                  - status
+                  - type
+                  type: object
+                type: array
+              defragmented:
+                description: Defragmented counts members actually defragmented this
+                  run.
+                format: int32
+                type: integer
+              members:
+                description: Members holds the per-member outcome of the sweep, keyed
+                  by member name.
+                items:
+                  description: MemberDefragStatus is the outcome of defragmenting
+                    a single member.
+                  properties:
+                    dbSizeAfter:
+                      description: DBSizeAfter is the physical backend size after
+                        defragmenting.
+                      format: int64
+                      type: integer
+                    dbSizeBefore:
+                      description: DBSizeBefore is the member's physical backend size
+                        before defragmenting.
+                      format: int64
+                      type: integer
+                    finishedAt:
+                      description: FinishedAt is when this member was processed.
+                      format: date-time
+                      type: string
+                    name:
+                      description: Name is the EtcdMember this row describes.
+                      type: string
+                    outcome:
+                      description: Outcome is the result of processing this member.
+                      type: string
+                    reason:
+                      description: |-
+                        Reason qualifies the outcome (e.g. BelowThreshold, ClusterNotHealthy,
+                        RPCError), in condition-reason style.
+                      type: string
+                    reclaimedBytes:
+                      description: ReclaimedBytes is DBSizeBefore-DBSizeAfter for
+                        a completed defrag.
+                      format: int64
+                      type: integer
+                    role:
+                      description: Role is the member's raft role at the time it was
+                        processed.
+                      type: string
+                  required:
+                  - name
+                  type: object
+                type: array
+                x-kubernetes-list-map-keys:
+                - name
+                x-kubernetes-list-type: map
+              phase:
+                description: Phase is the high-level lifecycle phase.
+                type: string
+              startedAt:
+                description: StartedAt is when the sweep began.
+                format: date-time
+                type: string
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}
diff --git a/packages/system/etcd-operator-crds/templates/etcdmembers.yaml b/packages/system/etcd-operator-crds/templates/etcdmembers.yaml
new file mode 100644
index 0000000000..b127ee3c63
--- /dev/null
+++ b/packages/system/etcd-operator-crds/templates/etcdmembers.yaml
@@ -0,0 +1,1709 @@
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.18.0
+    helm.sh/resource-policy: keep
+  name: etcdmembers.etcd-operator.cozystack.io
+spec:
+  group: etcd-operator.cozystack.io
+  names:
+    kind: EtcdMember
+    listKind: EtcdMemberList
+    plural: etcdmembers
+    singular: etcdmember
+  scope: Namespaced
+  versions:
+  - additionalPrinterColumns:
+    - jsonPath: .spec.clusterName
+      name: Cluster
+      type: string
+    - jsonPath: .spec.version
+      name: Version
+      type: string
+    - jsonPath: .status.version
+      name: Running
+      type: string
+    - jsonPath: .status.conditions[?(@.type=="Ready")].status
+      name: Ready
+      type: string
+    - jsonPath: .metadata.creationTimestamp
+      name: Age
+      type: date
+    name: v1alpha2
+    schema:
+      openAPIV3Schema:
+        description: |-
+          EtcdMember represents a single member of an etcd cluster.
+          EtcdMember resources are created and deleted by the EtcdCluster controller.
+          Users should not create these directly.
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: |-
+              EtcdMemberSpec defines the desired state of a single etcd member.
+              Created and managed by the EtcdCluster controller.
+            properties:
+              additionalMetadata:
+                description: |-
+                  AdditionalMetadata mirrors EtcdCluster.spec.additionalMetadata at the
+                  time this member was created. The member controller merges it onto the
+                  member's Pod (operator-owned label keys win on collision).
+                properties:
+                  annotations:
+                    additionalProperties:
+                      type: string
+                    description: Annotations are extra annotations merged onto created
+                      objects.
+                    type: object
+                  labels:
+                    additionalProperties:
+                      type: string
+                    description: |-
+                      Labels are extra labels merged onto created objects. Operator-owned
+                      label keys take precedence on collision.
+                    type: object
+                type: object
+              affinity:
+                description: |-
+                  Affinity mirrors EtcdCluster.spec.affinity at the time this member was
+                  created. The member controller passes it straight to the Pod's
+                  spec.affinity at build time.
+                properties:
+                  nodeAffinity:
+                    description: Describes node affinity scheduling rules for the
+                      pod.
+                    properties:
+                      preferredDuringSchedulingIgnoredDuringExecution:
+                        description: |-
+                          The scheduler will prefer to schedule pods to nodes that satisfy
+                          the affinity expressions specified by this field, but it may choose
+                          a node that violates one or more of the expressions. The node that is
+                          most preferred is the one with the greatest sum of weights, i.e.
+                          for each node that meets all of the scheduling requirements (resource
+                          request, requiredDuringScheduling affinity expressions, etc.),
+                          compute a sum by iterating through the elements of this field and adding
+                          "weight" to the sum if the node matches the corresponding matchExpressions; the
+                          node(s) with the highest sum are the most preferred.
+                        items:
+                          description: |-
+                            An empty preferred scheduling term matches all objects with implicit weight 0
+                            (i.e. it's a no-op). A null preferred scheduling term matches no objects (i.e. is also a no-op).
+                          properties:
+                            preference:
+                              description: A node selector term, associated with the
+                                corresponding weight.
+                              properties:
+                                matchExpressions:
+                                  description: A list of node selector requirements
+                                    by node's labels.
+                                  items:
+                                    description: |-
+                                      A node selector requirement is a selector that contains values, a key, and an operator
+                                      that relates the key and values.
+                                    properties:
+                                      key:
+                                        description: The label key that the selector
+                                          applies to.
+                                        type: string
+                                      operator:
+                                        description: |-
+                                          Represents a key's relationship to a set of values.
+                                          Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt.
+                                        type: string
+                                      values:
+                                        description: |-
+                                          An array of string values. If the operator is In or NotIn,
+                                          the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                          the values array must be empty. If the operator is Gt or Lt, the values
+                                          array must have a single element, which will be interpreted as an integer.
+                                          This array is replaced during a strategic merge patch.
+                                        items:
+                                          type: string
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                    required:
+                                    - key
+                                    - operator
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                matchFields:
+                                  description: A list of node selector requirements
+                                    by node's fields.
+                                  items:
+                                    description: |-
+                                      A node selector requirement is a selector that contains values, a key, and an operator
+                                      that relates the key and values.
+                                    properties:
+                                      key:
+                                        description: The label key that the selector
+                                          applies to.
+                                        type: string
+                                      operator:
+                                        description: |-
+                                          Represents a key's relationship to a set of values.
+                                          Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt.
+                                        type: string
+                                      values:
+                                        description: |-
+                                          An array of string values. If the operator is In or NotIn,
+                                          the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                          the values array must be empty. If the operator is Gt or Lt, the values
+                                          array must have a single element, which will be interpreted as an integer.
+                                          This array is replaced during a strategic merge patch.
+                                        items:
+                                          type: string
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                    required:
+                                    - key
+                                    - operator
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            weight:
+                              description: Weight associated with matching the corresponding
+                                nodeSelectorTerm, in the range 1-100.
+                              format: int32
+                              type: integer
+                          required:
+                          - preference
+                          - weight
+                          type: object
+                        type: array
+                        x-kubernetes-list-type: atomic
+                      requiredDuringSchedulingIgnoredDuringExecution:
+                        description: |-
+                          If the affinity requirements specified by this field are not met at
+                          scheduling time, the pod will not be scheduled onto the node.
+                          If the affinity requirements specified by this field cease to be met
+                          at some point during pod execution (e.g. due to an update), the system
+                          may or may not try to eventually evict the pod from its node.
+                        properties:
+                          nodeSelectorTerms:
+                            description: Required. A list of node selector terms.
+                              The terms are ORed.
+                            items:
+                              description: |-
+                                A null or empty node selector term matches no objects. The requirements of
+                                them are ANDed.
+                                The TopologySelectorTerm type implements a subset of the NodeSelectorTerm.
+                              properties:
+                                matchExpressions:
+                                  description: A list of node selector requirements
+                                    by node's labels.
+                                  items:
+                                    description: |-
+                                      A node selector requirement is a selector that contains values, a key, and an operator
+                                      that relates the key and values.
+                                    properties:
+                                      key:
+                                        description: The label key that the selector
+                                          applies to.
+                                        type: string
+                                      operator:
+                                        description: |-
+                                          Represents a key's relationship to a set of values.
+                                          Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt.
+                                        type: string
+                                      values:
+                                        description: |-
+                                          An array of string values. If the operator is In or NotIn,
+                                          the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                          the values array must be empty. If the operator is Gt or Lt, the values
+                                          array must have a single element, which will be interpreted as an integer.
+                                          This array is replaced during a strategic merge patch.
+                                        items:
+                                          type: string
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                    required:
+                                    - key
+                                    - operator
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                matchFields:
+                                  description: A list of node selector requirements
+                                    by node's fields.
+                                  items:
+                                    description: |-
+                                      A node selector requirement is a selector that contains values, a key, and an operator
+                                      that relates the key and values.
+                                    properties:
+                                      key:
+                                        description: The label key that the selector
+                                          applies to.
+                                        type: string
+                                      operator:
+                                        description: |-
+                                          Represents a key's relationship to a set of values.
+                                          Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt.
+                                        type: string
+                                      values:
+                                        description: |-
+                                          An array of string values. If the operator is In or NotIn,
+                                          the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                          the values array must be empty. If the operator is Gt or Lt, the values
+                                          array must have a single element, which will be interpreted as an integer.
+                                          This array is replaced during a strategic merge patch.
+                                        items:
+                                          type: string
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                    required:
+                                    - key
+                                    - operator
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            type: array
+                            x-kubernetes-list-type: atomic
+                        required:
+                        - nodeSelectorTerms
+                        type: object
+                        x-kubernetes-map-type: atomic
+                    type: object
+                  podAffinity:
+                    description: Describes pod affinity scheduling rules (e.g. co-locate
+                      this pod in the same node, zone, etc. as some other pod(s)).
+                    properties:
+                      preferredDuringSchedulingIgnoredDuringExecution:
+                        description: |-
+                          The scheduler will prefer to schedule pods to nodes that satisfy
+                          the affinity expressions specified by this field, but it may choose
+                          a node that violates one or more of the expressions. The node that is
+                          most preferred is the one with the greatest sum of weights, i.e.
+                          for each node that meets all of the scheduling requirements (resource
+                          request, requiredDuringScheduling affinity expressions, etc.),
+                          compute a sum by iterating through the elements of this field and adding
+                          "weight" to the sum if the node has pods which matches the corresponding podAffinityTerm; the
+                          node(s) with the highest sum are the most preferred.
+                        items:
+                          description: The weights of all of the matched WeightedPodAffinityTerm
+                            fields are added per-node to find the most preferred node(s)
+                          properties:
+                            podAffinityTerm:
+                              description: Required. A pod affinity term, associated
+                                with the corresponding weight.
+                              properties:
+                                labelSelector:
+                                  description: |-
+                                    A label query over a set of resources, in this case pods.
+                                    If it's null, this PodAffinityTerm matches with no Pods.
+                                  properties:
+                                    matchExpressions:
+                                      description: matchExpressions is a list of label
+                                        selector requirements. The requirements are
+                                        ANDed.
+                                      items:
+                                        description: |-
+                                          A label selector requirement is a selector that contains values, a key, and an operator that
+                                          relates the key and values.
+                                        properties:
+                                          key:
+                                            description: key is the label key that
+                                              the selector applies to.
+                                            type: string
+                                          operator:
+                                            description: |-
+                                              operator represents a key's relationship to a set of values.
+                                              Valid operators are In, NotIn, Exists and DoesNotExist.
+                                            type: string
+                                          values:
+                                            description: |-
+                                              values is an array of string values. If the operator is In or NotIn,
+                                              the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                              the values array must be empty. This array is replaced during a strategic
+                                              merge patch.
+                                            items:
+                                              type: string
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                        required:
+                                        - key
+                                        - operator
+                                        type: object
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    matchLabels:
+                                      additionalProperties:
+                                        type: string
+                                      description: |-
+                                        matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                        map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                        operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                      type: object
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                matchLabelKeys:
+                                  description: |-
+                                    MatchLabelKeys is a set of pod label keys to select which pods will
+                                    be taken into consideration. The keys are used to lookup values from the
+                                    incoming pod labels, those key-value labels are merged with `labelSelector` as `key in (value)`
+                                    to select the group of existing pods which pods will be taken into consideration
+                                    for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+                                    pod labels will be ignored. The default value is empty.
+                                    The same key is forbidden to exist in both matchLabelKeys and labelSelector.
+                                    Also, matchLabelKeys cannot be set when labelSelector isn't set.
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                mismatchLabelKeys:
+                                  description: |-
+                                    MismatchLabelKeys is a set of pod label keys to select which pods will
+                                    be taken into consideration. The keys are used to lookup values from the
+                                    incoming pod labels, those key-value labels are merged with `labelSelector` as `key notin (value)`
+                                    to select the group of existing pods which pods will be taken into consideration
+                                    for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+                                    pod labels will be ignored. The default value is empty.
+                                    The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
+                                    Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                namespaceSelector:
+                                  description: |-
+                                    A label query over the set of namespaces that the term applies to.
+                                    The term is applied to the union of the namespaces selected by this field
+                                    and the ones listed in the namespaces field.
+                                    null selector and null or empty namespaces list means "this pod's namespace".
+                                    An empty selector ({}) matches all namespaces.
+                                  properties:
+                                    matchExpressions:
+                                      description: matchExpressions is a list of label
+                                        selector requirements. The requirements are
+                                        ANDed.
+                                      items:
+                                        description: |-
+                                          A label selector requirement is a selector that contains values, a key, and an operator that
+                                          relates the key and values.
+                                        properties:
+                                          key:
+                                            description: key is the label key that
+                                              the selector applies to.
+                                            type: string
+                                          operator:
+                                            description: |-
+                                              operator represents a key's relationship to a set of values.
+                                              Valid operators are In, NotIn, Exists and DoesNotExist.
+                                            type: string
+                                          values:
+                                            description: |-
+                                              values is an array of string values. If the operator is In or NotIn,
+                                              the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                              the values array must be empty. This array is replaced during a strategic
+                                              merge patch.
+                                            items:
+                                              type: string
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                        required:
+                                        - key
+                                        - operator
+                                        type: object
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    matchLabels:
+                                      additionalProperties:
+                                        type: string
+                                      description: |-
+                                        matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                        map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                        operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                      type: object
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                namespaces:
+                                  description: |-
+                                    namespaces specifies a static list of namespace names that the term applies to.
+                                    The term is applied to the union of the namespaces listed in this field
+                                    and the ones selected by namespaceSelector.
+                                    null or empty namespaces list and null namespaceSelector means "this pod's namespace".
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                topologyKey:
+                                  description: |-
+                                    This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching
+                                    the labelSelector in the specified namespaces, where co-located is defined as running on a node
+                                    whose value of the label with key topologyKey matches that of any node on which any of the
+                                    selected pods is running.
+                                    Empty topologyKey is not allowed.
+                                  type: string
+                              required:
+                              - topologyKey
+                              type: object
+                            weight:
+                              description: |-
+                                weight associated with matching the corresponding podAffinityTerm,
+                                in the range 1-100.
+                              format: int32
+                              type: integer
+                          required:
+                          - podAffinityTerm
+                          - weight
+                          type: object
+                        type: array
+                        x-kubernetes-list-type: atomic
+                      requiredDuringSchedulingIgnoredDuringExecution:
+                        description: |-
+                          If the affinity requirements specified by this field are not met at
+                          scheduling time, the pod will not be scheduled onto the node.
+                          If the affinity requirements specified by this field cease to be met
+                          at some point during pod execution (e.g. due to a pod label update), the
+                          system may or may not try to eventually evict the pod from its node.
+                          When there are multiple elements, the lists of nodes corresponding to each
+                          podAffinityTerm are intersected, i.e. all terms must be satisfied.
+                        items:
+                          description: |-
+                            Defines a set of pods (namely those matching the labelSelector
+                            relative to the given namespace(s)) that this pod should be
+                            co-located (affinity) or not co-located (anti-affinity) with,
+                            where co-located is defined as running on a node whose value of
+                            the label with key <topologyKey> matches that of any node on which
+                            a pod of the set of pods is running
+                          properties:
+                            labelSelector:
+                              description: |-
+                                A label query over a set of resources, in this case pods.
+                                If it's null, this PodAffinityTerm matches with no Pods.
+                              properties:
+                                matchExpressions:
+                                  description: matchExpressions is a list of label
+                                    selector requirements. The requirements are ANDed.
+                                  items:
+                                    description: |-
+                                      A label selector requirement is a selector that contains values, a key, and an operator that
+                                      relates the key and values.
+                                    properties:
+                                      key:
+                                        description: key is the label key that the
+                                          selector applies to.
+                                        type: string
+                                      operator:
+                                        description: |-
+                                          operator represents a key's relationship to a set of values.
+                                          Valid operators are In, NotIn, Exists and DoesNotExist.
+                                        type: string
+                                      values:
+                                        description: |-
+                                          values is an array of string values. If the operator is In or NotIn,
+                                          the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                          the values array must be empty. This array is replaced during a strategic
+                                          merge patch.
+                                        items:
+                                          type: string
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                    required:
+                                    - key
+                                    - operator
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                matchLabels:
+                                  additionalProperties:
+                                    type: string
+                                  description: |-
+                                    matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                    map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                    operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                  type: object
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            matchLabelKeys:
+                              description: |-
+                                MatchLabelKeys is a set of pod label keys to select which pods will
+                                be taken into consideration. The keys are used to lookup values from the
+                                incoming pod labels, those key-value labels are merged with `labelSelector` as `key in (value)`
+                                to select the group of existing pods which pods will be taken into consideration
+                                for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+                                pod labels will be ignored. The default value is empty.
+                                The same key is forbidden to exist in both matchLabelKeys and labelSelector.
+                                Also, matchLabelKeys cannot be set when labelSelector isn't set.
+                              items:
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            mismatchLabelKeys:
+                              description: |-
+                                MismatchLabelKeys is a set of pod label keys to select which pods will
+                                be taken into consideration. The keys are used to lookup values from the
+                                incoming pod labels, those key-value labels are merged with `labelSelector` as `key notin (value)`
+                                to select the group of existing pods which pods will be taken into consideration
+                                for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+                                pod labels will be ignored. The default value is empty.
+                                The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
+                                Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
+                              items:
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            namespaceSelector:
+                              description: |-
+                                A label query over the set of namespaces that the term applies to.
+                                The term is applied to the union of the namespaces selected by this field
+                                and the ones listed in the namespaces field.
+                                null selector and null or empty namespaces list means "this pod's namespace".
+                                An empty selector ({}) matches all namespaces.
+                              properties:
+                                matchExpressions:
+                                  description: matchExpressions is a list of label
+                                    selector requirements. The requirements are ANDed.
+                                  items:
+                                    description: |-
+                                      A label selector requirement is a selector that contains values, a key, and an operator that
+                                      relates the key and values.
+                                    properties:
+                                      key:
+                                        description: key is the label key that the
+                                          selector applies to.
+                                        type: string
+                                      operator:
+                                        description: |-
+                                          operator represents a key's relationship to a set of values.
+                                          Valid operators are In, NotIn, Exists and DoesNotExist.
+                                        type: string
+                                      values:
+                                        description: |-
+                                          values is an array of string values. If the operator is In or NotIn,
+                                          the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                          the values array must be empty. This array is replaced during a strategic
+                                          merge patch.
+                                        items:
+                                          type: string
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                    required:
+                                    - key
+                                    - operator
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                matchLabels:
+                                  additionalProperties:
+                                    type: string
+                                  description: |-
+                                    matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                    map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                    operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                  type: object
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            namespaces:
+                              description: |-
+                                namespaces specifies a static list of namespace names that the term applies to.
+                                The term is applied to the union of the namespaces listed in this field
+                                and the ones selected by namespaceSelector.
+                                null or empty namespaces list and null namespaceSelector means "this pod's namespace".
+                              items:
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            topologyKey:
+                              description: |-
+                                This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching
+                                the labelSelector in the specified namespaces, where co-located is defined as running on a node
+                                whose value of the label with key topologyKey matches that of any node on which any of the
+                                selected pods is running.
+                                Empty topologyKey is not allowed.
+                              type: string
+                          required:
+                          - topologyKey
+                          type: object
+                        type: array
+                        x-kubernetes-list-type: atomic
+                    type: object
+                  podAntiAffinity:
+                    description: Describes pod anti-affinity scheduling rules (e.g.
+                      avoid putting this pod in the same node, zone, etc. as some
+                      other pod(s)).
+                    properties:
+                      preferredDuringSchedulingIgnoredDuringExecution:
+                        description: |-
+                          The scheduler will prefer to schedule pods to nodes that satisfy
+                          the anti-affinity expressions specified by this field, but it may choose
+                          a node that violates one or more of the expressions. The node that is
+                          most preferred is the one with the greatest sum of weights, i.e.
+                          for each node that meets all of the scheduling requirements (resource
+                          request, requiredDuringScheduling anti-affinity expressions, etc.),
+                          compute a sum by iterating through the elements of this field and adding
+                          "weight" to the sum if the node has pods which matches the corresponding podAffinityTerm; the
+                          node(s) with the highest sum are the most preferred.
+                        items:
+                          description: The weights of all of the matched WeightedPodAffinityTerm
+                            fields are added per-node to find the most preferred node(s)
+                          properties:
+                            podAffinityTerm:
+                              description: Required. A pod affinity term, associated
+                                with the corresponding weight.
+                              properties:
+                                labelSelector:
+                                  description: |-
+                                    A label query over a set of resources, in this case pods.
+                                    If it's null, this PodAffinityTerm matches with no Pods.
+                                  properties:
+                                    matchExpressions:
+                                      description: matchExpressions is a list of label
+                                        selector requirements. The requirements are
+                                        ANDed.
+                                      items:
+                                        description: |-
+                                          A label selector requirement is a selector that contains values, a key, and an operator that
+                                          relates the key and values.
+                                        properties:
+                                          key:
+                                            description: key is the label key that
+                                              the selector applies to.
+                                            type: string
+                                          operator:
+                                            description: |-
+                                              operator represents a key's relationship to a set of values.
+                                              Valid operators are In, NotIn, Exists and DoesNotExist.
+                                            type: string
+                                          values:
+                                            description: |-
+                                              values is an array of string values. If the operator is In or NotIn,
+                                              the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                              the values array must be empty. This array is replaced during a strategic
+                                              merge patch.
+                                            items:
+                                              type: string
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                        required:
+                                        - key
+                                        - operator
+                                        type: object
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    matchLabels:
+                                      additionalProperties:
+                                        type: string
+                                      description: |-
+                                        matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                        map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                        operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                      type: object
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                matchLabelKeys:
+                                  description: |-
+                                    MatchLabelKeys is a set of pod label keys to select which pods will
+                                    be taken into consideration. The keys are used to lookup values from the
+                                    incoming pod labels, those key-value labels are merged with `labelSelector` as `key in (value)`
+                                    to select the group of existing pods which pods will be taken into consideration
+                                    for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+                                    pod labels will be ignored. The default value is empty.
+                                    The same key is forbidden to exist in both matchLabelKeys and labelSelector.
+                                    Also, matchLabelKeys cannot be set when labelSelector isn't set.
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                mismatchLabelKeys:
+                                  description: |-
+                                    MismatchLabelKeys is a set of pod label keys to select which pods will
+                                    be taken into consideration. The keys are used to lookup values from the
+                                    incoming pod labels, those key-value labels are merged with `labelSelector` as `key notin (value)`
+                                    to select the group of existing pods which pods will be taken into consideration
+                                    for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+                                    pod labels will be ignored. The default value is empty.
+                                    The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
+                                    Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                namespaceSelector:
+                                  description: |-
+                                    A label query over the set of namespaces that the term applies to.
+                                    The term is applied to the union of the namespaces selected by this field
+                                    and the ones listed in the namespaces field.
+                                    null selector and null or empty namespaces list means "this pod's namespace".
+                                    An empty selector ({}) matches all namespaces.
+                                  properties:
+                                    matchExpressions:
+                                      description: matchExpressions is a list of label
+                                        selector requirements. The requirements are
+                                        ANDed.
+                                      items:
+                                        description: |-
+                                          A label selector requirement is a selector that contains values, a key, and an operator that
+                                          relates the key and values.
+                                        properties:
+                                          key:
+                                            description: key is the label key that
+                                              the selector applies to.
+                                            type: string
+                                          operator:
+                                            description: |-
+                                              operator represents a key's relationship to a set of values.
+                                              Valid operators are In, NotIn, Exists and DoesNotExist.
+                                            type: string
+                                          values:
+                                            description: |-
+                                              values is an array of string values. If the operator is In or NotIn,
+                                              the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                              the values array must be empty. This array is replaced during a strategic
+                                              merge patch.
+                                            items:
+                                              type: string
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                        required:
+                                        - key
+                                        - operator
+                                        type: object
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    matchLabels:
+                                      additionalProperties:
+                                        type: string
+                                      description: |-
+                                        matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                        map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                        operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                      type: object
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                namespaces:
+                                  description: |-
+                                    namespaces specifies a static list of namespace names that the term applies to.
+                                    The term is applied to the union of the namespaces listed in this field
+                                    and the ones selected by namespaceSelector.
+                                    null or empty namespaces list and null namespaceSelector means "this pod's namespace".
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                topologyKey:
+                                  description: |-
+                                    This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching
+                                    the labelSelector in the specified namespaces, where co-located is defined as running on a node
+                                    whose value of the label with key topologyKey matches that of any node on which any of the
+                                    selected pods is running.
+                                    Empty topologyKey is not allowed.
+                                  type: string
+                              required:
+                              - topologyKey
+                              type: object
+                            weight:
+                              description: |-
+                                weight associated with matching the corresponding podAffinityTerm,
+                                in the range 1-100.
+                              format: int32
+                              type: integer
+                          required:
+                          - podAffinityTerm
+                          - weight
+                          type: object
+                        type: array
+                        x-kubernetes-list-type: atomic
+                      requiredDuringSchedulingIgnoredDuringExecution:
+                        description: |-
+                          If the anti-affinity requirements specified by this field are not met at
+                          scheduling time, the pod will not be scheduled onto the node.
+                          If the anti-affinity requirements specified by this field cease to be met
+                          at some point during pod execution (e.g. due to a pod label update), the
+                          system may or may not try to eventually evict the pod from its node.
+                          When there are multiple elements, the lists of nodes corresponding to each
+                          podAffinityTerm are intersected, i.e. all terms must be satisfied.
+                        items:
+                          description: |-
+                            Defines a set of pods (namely those matching the labelSelector
+                            relative to the given namespace(s)) that this pod should be
+                            co-located (affinity) or not co-located (anti-affinity) with,
+                            where co-located is defined as running on a node whose value of
+                            the label with key <topologyKey> matches that of any node on which
+                            a pod of the set of pods is running
+                          properties:
+                            labelSelector:
+                              description: |-
+                                A label query over a set of resources, in this case pods.
+                                If it's null, this PodAffinityTerm matches with no Pods.
+                              properties:
+                                matchExpressions:
+                                  description: matchExpressions is a list of label
+                                    selector requirements. The requirements are ANDed.
+                                  items:
+                                    description: |-
+                                      A label selector requirement is a selector that contains values, a key, and an operator that
+                                      relates the key and values.
+                                    properties:
+                                      key:
+                                        description: key is the label key that the
+                                          selector applies to.
+                                        type: string
+                                      operator:
+                                        description: |-
+                                          operator represents a key's relationship to a set of values.
+                                          Valid operators are In, NotIn, Exists and DoesNotExist.
+                                        type: string
+                                      values:
+                                        description: |-
+                                          values is an array of string values. If the operator is In or NotIn,
+                                          the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                          the values array must be empty. This array is replaced during a strategic
+                                          merge patch.
+                                        items:
+                                          type: string
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                    required:
+                                    - key
+                                    - operator
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                matchLabels:
+                                  additionalProperties:
+                                    type: string
+                                  description: |-
+                                    matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                    map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                    operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                  type: object
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            matchLabelKeys:
+                              description: |-
+                                MatchLabelKeys is a set of pod label keys to select which pods will
+                                be taken into consideration. The keys are used to lookup values from the
+                                incoming pod labels, those key-value labels are merged with `labelSelector` as `key in (value)`
+                                to select the group of existing pods which pods will be taken into consideration
+                                for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+                                pod labels will be ignored. The default value is empty.
+                                The same key is forbidden to exist in both matchLabelKeys and labelSelector.
+                                Also, matchLabelKeys cannot be set when labelSelector isn't set.
+                              items:
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            mismatchLabelKeys:
+                              description: |-
+                                MismatchLabelKeys is a set of pod label keys to select which pods will
+                                be taken into consideration. The keys are used to lookup values from the
+                                incoming pod labels, those key-value labels are merged with `labelSelector` as `key notin (value)`
+                                to select the group of existing pods which pods will be taken into consideration
+                                for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+                                pod labels will be ignored. The default value is empty.
+                                The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
+                                Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
+                              items:
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            namespaceSelector:
+                              description: |-
+                                A label query over the set of namespaces that the term applies to.
+                                The term is applied to the union of the namespaces selected by this field
+                                and the ones listed in the namespaces field.
+                                null selector and null or empty namespaces list means "this pod's namespace".
+                                An empty selector ({}) matches all namespaces.
+                              properties:
+                                matchExpressions:
+                                  description: matchExpressions is a list of label
+                                    selector requirements. The requirements are ANDed.
+                                  items:
+                                    description: |-
+                                      A label selector requirement is a selector that contains values, a key, and an operator that
+                                      relates the key and values.
+                                    properties:
+                                      key:
+                                        description: key is the label key that the
+                                          selector applies to.
+                                        type: string
+                                      operator:
+                                        description: |-
+                                          operator represents a key's relationship to a set of values.
+                                          Valid operators are In, NotIn, Exists and DoesNotExist.
+                                        type: string
+                                      values:
+                                        description: |-
+                                          values is an array of string values. If the operator is In or NotIn,
+                                          the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                          the values array must be empty. This array is replaced during a strategic
+                                          merge patch.
+                                        items:
+                                          type: string
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                    required:
+                                    - key
+                                    - operator
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                matchLabels:
+                                  additionalProperties:
+                                    type: string
+                                  description: |-
+                                    matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                    map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                    operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                  type: object
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            namespaces:
+                              description: |-
+                                namespaces specifies a static list of namespace names that the term applies to.
+                                The term is applied to the union of the namespaces listed in this field
+                                and the ones selected by namespaceSelector.
+                                null or empty namespaces list and null namespaceSelector means "this pod's namespace".
+                              items:
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            topologyKey:
+                              description: |-
+                                This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching
+                                the labelSelector in the specified namespaces, where co-located is defined as running on a node
+                                whose value of the label with key topologyKey matches that of any node on which any of the
+                                selected pods is running.
+                                Empty topologyKey is not allowed.
+                              type: string
+                          required:
+                          - topologyKey
+                          type: object
+                        type: array
+                        x-kubernetes-list-type: atomic
+                    type: object
+                type: object
+              bootstrap:
+                description: |-
+                  Bootstrap indicates this member is part of the initial cluster formation.
+                  When true the member starts with --initial-cluster-state=new.
+                type: boolean
+              clusterName:
+                description: ClusterName is the name of the owning EtcdCluster.
+                minLength: 1
+                type: string
+              clusterToken:
+                description: |-
+                  ClusterToken is the value passed to etcd's --initial-cluster-token.
+                  Copied from EtcdCluster.status.clusterToken so all members of a cluster
+                  agree, and so changes to the cluster's token derivation rule don't
+                  affect already-running members.
+                type: string
+              dormant:
+                description: |-
+                  Dormant marks the member as paused. While dormant, the member
+                  controller deletes the member's Pod but leaves the PVC in place
+                  (the PVC stays owned by this EtcdMember). The cluster controller
+                  flips Dormant=true on the surviving member when the user sets
+                  EtcdCluster.spec.replicas=0 on a 1-member cluster, and flips it
+                  back to false when the user scales up. Re-creating the Pod against
+                  the existing PVC lets etcd resume from the existing data dir with
+                  the same ClusterID and member ID. While dormant, the member does
+                  not count toward the EtcdCluster's `current` replica accounting.
+                type: boolean
+              imagePullSecrets:
+                description: |-
+                  ImagePullSecrets mirrors EtcdCluster.spec.imagePullSecrets at the time
+                  this member was created. Passed straight to the Pod's
+                  spec.imagePullSecrets at build time.
+                items:
+                  description: |-
+                    LocalObjectReference contains enough information to let you locate the
+                    referenced object inside the same namespace.
+                  properties:
+                    name:
+                      default: ""
+                      description: |-
+                        Name of the referent.
+                        This field is effectively required, but due to backwards compatibility is
+                        allowed to be empty. Instances of this type with an empty value here are
+                        almost certainly wrong.
+                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                      type: string
+                  type: object
+                  x-kubernetes-map-type: atomic
+                type: array
+              initialCluster:
+                description: |-
+                  InitialCluster is the value passed to etcd's --initial-cluster flag.
+                  Set by the cluster controller at creation time.
+                type: string
+              options:
+                description: |-
+                  Options mirrors EtcdCluster.spec.options at the time this member
+                  was created. The member controller renders the set fields as etcd
+                  command-line flags at Pod-build time; existing members are not
+                  re-templated when the cluster spec changes.
+                properties:
+                  autoCompactionMode:
+                    description: |-
+                      AutoCompactionMode sets --auto-compaction-mode: how
+                      AutoCompactionRetention is interpreted, "periodic" (time-based)
+                      or "revision" (revision-count-based). Absent means etcd's default
+                      ("periodic" — though compaction only activates when a retention
+                      is set).
+                    enum:
+                    - periodic
+                    - revision
+                    type: string
+                  autoCompactionRetention:
+                    description: |-
+                      AutoCompactionRetention sets --auto-compaction-retention. In
+                      periodic mode a duration ("5m", "1h"; a bare integer means hours);
+                      in revision mode a revision count. Absent or "0" disables
+                      auto-compaction. The pattern admits what etcd itself parses: a
+                      bare non-negative integer or a Go duration.
+                    pattern: ^([0-9]+(\.[0-9]+)?(ms|s|m|h))+$|^[0-9]+$
+                    type: string
+                  quotaBackendBytes:
+                    description: |-
+                      QuotaBackendBytes sets --quota-backend-bytes: the backend database
+                      size limit in bytes before the member raises the cluster-wide
+                      NOSPACE alarm. 0 or absent means etcd's built-in default (2GiB).
+                      etcd's documented practical maximum is 8GiB.
+                    format: int64
+                    minimum: 0
+                    type: integer
+                  snapshotCount:
+                    description: |-
+                      SnapshotCount sets --snapshot-count: the number of committed
+                      raft entries to retain in memory before triggering an internal
+                      raft snapshot (this is unrelated to EtcdSnapshot backups). Absent
+                      means etcd's built-in default. Lower values trade replay speed on
+                      restart for a smaller memory footprint.
+                    format: int64
+                    minimum: 1
+                    type: integer
+                type: object
+              replicas:
+                default: 1
+                description: |-
+                  Replicas backs the /scale subresource. The operator's own PDB
+                  (integer minAvailable) never resolves scale; kept because
+                  maxUnavailable or percentage budgets over member Pods fail
+                  without it. Locked to 1: an EtcdMember is exactly one Pod.
+                format: int32
+                maximum: 1
+                minimum: 1
+                type: integer
+              resources:
+                description: |-
+                  Resources mirrors EtcdCluster.spec.resources at the time this
+                  member was created. The cluster controller copies it onto each
+                  member at creation. The member controller passes the value
+                  straight to the etcd container's resources field at Pod-build
+                  time; existing members are not re-templated when the cluster
+                  spec changes.
+                properties:
+                  claims:
+                    description: |-
+                      Claims lists the names of resources, defined in spec.resourceClaims,
+                      that are used by this container.
+
+                      This is an alpha field and requires enabling the
+                      DynamicResourceAllocation feature gate.
+
+                      This field is immutable. It can only be set for containers.
+                    items:
+                      description: ResourceClaim references one entry in PodSpec.ResourceClaims.
+                      properties:
+                        name:
+                          description: |-
+                            Name must match the name of one entry in pod.spec.resourceClaims of
+                            the Pod where this field is used. It makes that resource available
+                            inside a container.
+                          type: string
+                        request:
+                          description: |-
+                            Request is the name chosen for a request in the referenced claim.
+                            If empty, everything from the claim is made available, otherwise
+                            only the result of this request.
+                          type: string
+                      required:
+                      - name
+                      type: object
+                    type: array
+                    x-kubernetes-list-map-keys:
+                    - name
+                    x-kubernetes-list-type: map
+                  limits:
+                    additionalProperties:
+                      anyOf:
+                      - type: integer
+                      - type: string
+                      pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                      x-kubernetes-int-or-string: true
+                    description: |-
+                      Limits describes the maximum amount of compute resources allowed.
+                      More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+                    type: object
+                  requests:
+                    additionalProperties:
+                      anyOf:
+                      - type: integer
+                      - type: string
+                      pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                      x-kubernetes-int-or-string: true
+                    description: |-
+                      Requests describes the minimum amount of compute resources required.
+                      If Requests is omitted for a container, it defaults to Limits if that is explicitly specified,
+                      otherwise to an implementation-defined value. Requests cannot exceed Limits.
+                      More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+                    type: object
+                type: object
+              restore:
+                description: |-
+                  Restore is set only on the bootstrap seed when the parent cluster's
+                  spec.bootstrap.restore is configured. It causes the member controller
+                  to run restore initContainers that populate the data dir from the
+                  snapshot before etcd starts. Inert once the data dir is initialized.
+                properties:
+                  source:
+                    description: |-
+                      Source is where the snapshot is read from (S3 or PVC). Same shape as
+                      an EtcdSnapshot destination.
+                    properties:
+                      pvc:
+                        description: PVC stores the snapshot on a PersistentVolumeClaim.
+                        properties:
+                          claimName:
+                            description: ClaimName is the name of a PVC in the cluster's
+                              namespace.
+                            minLength: 1
+                            type: string
+                          subPath:
+                            description: SubPath is an optional subdirectory within
+                              the volume.
+                            type: string
+                        required:
+                        - claimName
+                        type: object
+                      s3:
+                        description: S3 stores the snapshot in an S3-compatible object
+                          store.
+                        properties:
+                          bucket:
+                            description: Bucket is the destination bucket.
+                            minLength: 1
+                            type: string
+                          credentialsSecretRef:
+                            description: |-
+                              CredentialsSecretRef references a Secret in the cluster's namespace
+                              holding AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY keys.
+                            properties:
+                              name:
+                                default: ""
+                                description: |-
+                                  Name of the referent.
+                                  This field is effectively required, but due to backwards compatibility is
+                                  allowed to be empty. Instances of this type with an empty value here are
+                                  almost certainly wrong.
+                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                type: string
+                            type: object
+                            x-kubernetes-map-type: atomic
+                          endpoint:
+                            description: |-
+                              Endpoint is the S3 endpoint URL (e.g. "https://s3.amazonaws.com" or a
+                              MinIO/Ceph endpoint).
+                            minLength: 1
+                            type: string
+                          forcePathStyle:
+                            description: |-
+                              ForcePathStyle selects path-style addressing (bucket in the path
+                              rather than the host). MinIO/Ceph typically require true.
+                            type: boolean
+                          key:
+                            description: |-
+                              Key is an optional object-key prefix within the bucket. The operator
+                              appends "<snapshot-name>.db".
+                            type: string
+                          region:
+                            description: Region is the S3 region. Optional for endpoints
+                              that ignore it.
+                            type: string
+                        required:
+                        - bucket
+                        - credentialsSecretRef
+                        - endpoint
+                        type: object
+                    type: object
+                    x-kubernetes-validations:
+                    - message: exactly one of destination.s3 or destination.pvc must
+                        be set
+                      rule: has(self.s3) != has(self.pvc)
+                required:
+                - source
+                type: object
+                x-kubernetes-validations:
+                - message: bootstrap.restore.source.s3.key must be the exact (non-empty)
+                    object key for a restore source
+                  rule: '!has(self.source.s3) || (has(self.source.s3.key) && size(self.source.s3.key)
+                    > 0)'
+                - message: bootstrap.restore.source.pvc.subPath must be the exact
+                    (non-empty) snapshot file path for a restore source
+                  rule: '!has(self.source.pvc) || (has(self.source.pvc.subPath) &&
+                    size(self.source.pvc.subPath) > 0)'
+              storage:
+                description: |-
+                  Storage mirrors EtcdCluster.spec.storage at the time this member
+                  was created. The cluster controller copies size and medium onto
+                  each member at creation; the member controller treats it as
+                  immutable per-member spec.
+                properties:
+                  medium:
+                    default: ""
+                    description: |-
+                      Medium selects the volume backend: "" (PVC) or "Memory" (tmpfs
+                      emptyDir). See the StorageMedium type doc for operational trade-offs.
+
+                      Immutable: changing the medium on an existing cluster would orphan
+                      the previous PVC (or tmpfs) and the rolling-migrate path is not
+                      implemented. The default ("") is set explicitly so the apiserver
+                      always stores the field on Create — without it, a first-time set
+                      from absent → Memory would slip past the transition rule.
+                    enum:
+                    - ""
+                    - Memory
+                    type: string
+                    x-kubernetes-validations:
+                    - message: spec.storage.medium is immutable; delete and recreate
+                        the cluster to change the storage backend
+                      rule: self == oldSelf
+                  size:
+                    anyOf:
+                    - type: integer
+                    - type: string
+                    default: 1Gi
+                    description: |-
+                      Size is the requested capacity per member. For Medium="" (PVC) this
+                      is the PVC's requested storage. For Medium="Memory" this is the
+                      tmpfs emptyDir's SizeLimit.
+
+                      Shrinking is rejected on UPDATE: PVCs cannot shrink and tmpfs
+                      SizeLimit reduction does not free already-allocated memory.
+                    pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                    x-kubernetes-int-or-string: true
+                    x-kubernetes-validations:
+                    - message: spec.storage.size cannot be shrunk
+                      rule: quantity(string(self)).compareTo(quantity(string(oldSelf)))
+                        >= 0
+                  storageClassName:
+                    description: |-
+                      StorageClassName selects the StorageClass for the per-member PVC.
+                      Mirrors corev1.PersistentVolumeClaimSpec.StorageClassName semantics:
+                      nil (the default) uses the namespace's default StorageClass; the
+                      empty string explicitly disables dynamic provisioning (a
+                      pre-provisioned PV must already match the PVC selector); any other
+                      value names a specific StorageClass.
+
+                      Ignored when Medium=Memory (no PVC is created).
+
+                      Immutable post-create — PersistentVolumeClaim.spec.storageClassName
+                      is itself immutable after PVC creation, so honouring a mid-life
+                      change would require a rolling PVC-recreation flow that this
+                      operator does not perform. The immutability rules live at the
+                      EtcdClusterSpec level (alongside the other pointer-field rules)
+                      because *string transition CEL on the inner field cannot fire when
+                      the field is being added from nil.
+                    type: string
+                type: object
+              tls:
+                description: |-
+                  TLS mirrors the parent cluster's TLS configuration at the time
+                  this member was created. Carries only what the etcd Pod needs to
+                  see (secret references and the mTLS flag); operator-side material
+                  stays on the parent cluster spec.
+                properties:
+                  clientMTLS:
+                    description: |-
+                      ClientMTLS mirrors "EtcdClusterTLS.Client.OperatorClientSecretRef
+                      is set" — i.e. whether the etcd server should be started with
+                      --client-cert-auth=true and --trusted-ca-file. Decoupled from the
+                      secret ref because the secret itself is operator-side only.
+                    type: boolean
+                  clientServerSecretRef:
+                    description: |-
+                      ClientServerSecretRef mirrors EtcdClusterTLS.Client.ServerSecretRef.
+                      When nil, the member runs the client API in plaintext.
+                    properties:
+                      name:
+                        default: ""
+                        description: |-
+                          Name of the referent.
+                          This field is effectively required, but due to backwards compatibility is
+                          allowed to be empty. Instances of this type with an empty value here are
+                          almost certainly wrong.
+                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                        type: string
+                    type: object
+                    x-kubernetes-map-type: atomic
+                  peerAutoTLS:
+                    description: |-
+                      PeerAutoTLS is operator-managed plumbing: it carries the cluster's
+                      reserved "etcd-operator.cozystack.io/peer-auto-tls" annotation down to
+                      the member so buildPod renders etcd's --peer-auto-tls (self-signed, no
+                      shared CA) instead of mounting a peer secret. INSECURE — peer is
+                      encrypted but NOT authenticated. Set only on clusters adopted from a
+                      legacy --peer-auto-tls cluster, and never together with PeerSecretRef
+                      (an explicit peer secret supersedes the annotation). Users do not set
+                      this directly; the cluster controller derives it.
+                    type: boolean
+                  peerSecretRef:
+                    description: |-
+                      PeerSecretRef mirrors EtcdClusterTLS.Peer.SecretRef. When nil, the
+                      member runs the peer API in plaintext. When set, peer is always
+                      mTLS (--peer-client-cert-auth=true).
+                    properties:
+                      name:
+                        default: ""
+                        description: |-
+                          Name of the referent.
+                          This field is effectively required, but due to backwards compatibility is
+                          allowed to be empty. Instances of this type with an empty value here are
+                          almost certainly wrong.
+                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                        type: string
+                    type: object
+                    x-kubernetes-map-type: atomic
+                type: object
+              topologySpreadConstraints:
+                description: |-
+                  TopologySpreadConstraints mirrors EtcdCluster.spec.topologySpreadConstraints
+                  at the time this member was created. Passed straight to the Pod's
+                  spec.topologySpreadConstraints at build time.
+                items:
+                  description: TopologySpreadConstraint specifies how to spread matching
+                    pods among the given topology.
+                  properties:
+                    labelSelector:
+                      description: |-
+                        LabelSelector is used to find matching pods.
+                        Pods that match this label selector are counted to determine the number of pods
+                        in their corresponding topology domain.
+                      properties:
+                        matchExpressions:
+                          description: matchExpressions is a list of label selector
+                            requirements. The requirements are ANDed.
+                          items:
+                            description: |-
+                              A label selector requirement is a selector that contains values, a key, and an operator that
+                              relates the key and values.
+                            properties:
+                              key:
+                                description: key is the label key that the selector
+                                  applies to.
+                                type: string
+                              operator:
+                                description: |-
+                                  operator represents a key's relationship to a set of values.
+                                  Valid operators are In, NotIn, Exists and DoesNotExist.
+                                type: string
+                              values:
+                                description: |-
+                                  values is an array of string values. If the operator is In or NotIn,
+                                  the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                  the values array must be empty. This array is replaced during a strategic
+                                  merge patch.
+                                items:
+                                  type: string
+                                type: array
+                                x-kubernetes-list-type: atomic
+                            required:
+                            - key
+                            - operator
+                            type: object
+                          type: array
+                          x-kubernetes-list-type: atomic
+                        matchLabels:
+                          additionalProperties:
+                            type: string
+                          description: |-
+                            matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                            map is equivalent to an element of matchExpressions, whose key field is "key", the
+                            operator is "In", and the values array contains only "value". The requirements are ANDed.
+                          type: object
+                      type: object
+                      x-kubernetes-map-type: atomic
+                    matchLabelKeys:
+                      description: |-
+                        MatchLabelKeys is a set of pod label keys to select the pods over which
+                        spreading will be calculated. The keys are used to lookup values from the
+                        incoming pod labels, those key-value labels are ANDed with labelSelector
+                        to select the group of existing pods over which spreading will be calculated
+                        for the incoming pod. The same key is forbidden to exist in both MatchLabelKeys and LabelSelector.
+                        MatchLabelKeys cannot be set when LabelSelector isn't set.
+                        Keys that don't exist in the incoming pod labels will
+                        be ignored. A null or empty list means only match against labelSelector.
+
+                        This is a beta field and requires the MatchLabelKeysInPodTopologySpread feature gate to be enabled (enabled by default).
+                      items:
+                        type: string
+                      type: array
+                      x-kubernetes-list-type: atomic
+                    maxSkew:
+                      description: |-
+                        MaxSkew describes the degree to which pods may be unevenly distributed.
+                        When `whenUnsatisfiable=DoNotSchedule`, it is the maximum permitted difference
+                        between the number of matching pods in the target topology and the global minimum.
+                        The global minimum is the minimum number of matching pods in an eligible domain
+                        or zero if the number of eligible domains is less than MinDomains.
+                        For example, in a 3-zone cluster, MaxSkew is set to 1, and pods with the same
+                        labelSelector spread as 2/2/1:
+                        In this case, the global minimum is 1.
+                        | zone1 | zone2 | zone3 |
+                        |  P P  |  P P  |   P   |
+                        - if MaxSkew is 1, incoming pod can only be scheduled to zone3 to become 2/2/2;
+                        scheduling it onto zone1(zone2) would make the ActualSkew(3-1) on zone1(zone2)
+                        violate MaxSkew(1).
+                        - if MaxSkew is 2, incoming pod can be scheduled onto any zone.
+                        When `whenUnsatisfiable=ScheduleAnyway`, it is used to give higher precedence
+                        to topologies that satisfy it.
+                        It's a required field. Default value is 1 and 0 is not allowed.
+                      format: int32
+                      type: integer
+                    minDomains:
+                      description: |-
+                        MinDomains indicates a minimum number of eligible domains.
+                        When the number of eligible domains with matching topology keys is less than minDomains,
+                        Pod Topology Spread treats "global minimum" as 0, and then the calculation of Skew is performed.
+                        And when the number of eligible domains with matching topology keys equals or greater than minDomains,
+                        this value has no effect on scheduling.
+                        As a result, when the number of eligible domains is less than minDomains,
+                        scheduler won't schedule more than maxSkew Pods to those domains.
+                        If value is nil, the constraint behaves as if MinDomains is equal to 1.
+                        Valid values are integers greater than 0.
+                        When value is not nil, WhenUnsatisfiable must be DoNotSchedule.
+
+                        For example, in a 3-zone cluster, MaxSkew is set to 2, MinDomains is set to 5 and pods with the same
+                        labelSelector spread as 2/2/2:
+                        | zone1 | zone2 | zone3 |
+                        |  P P  |  P P  |  P P  |
+                        The number of domains is less than 5(MinDomains), so "global minimum" is treated as 0.
+                        In this situation, new pod with the same labelSelector cannot be scheduled,
+                        because computed skew will be 3(3 - 0) if new Pod is scheduled to any of the three zones,
+                        it will violate MaxSkew.
+                      format: int32
+                      type: integer
+                    nodeAffinityPolicy:
+                      description: |-
+                        NodeAffinityPolicy indicates how we will treat Pod's nodeAffinity/nodeSelector
+                        when calculating pod topology spread skew. Options are:
+                        - Honor: only nodes matching nodeAffinity/nodeSelector are included in the calculations.
+                        - Ignore: nodeAffinity/nodeSelector are ignored. All nodes are included in the calculations.
+
+                        If this value is nil, the behavior is equivalent to the Honor policy.
+                      type: string
+                    nodeTaintsPolicy:
+                      description: |-
+                        NodeTaintsPolicy indicates how we will treat node taints when calculating
+                        pod topology spread skew. Options are:
+                        - Honor: nodes without taints, along with tainted nodes for which the incoming pod
+                        has a toleration, are included.
+                        - Ignore: node taints are ignored. All nodes are included.
+
+                        If this value is nil, the behavior is equivalent to the Ignore policy.
+                      type: string
+                    topologyKey:
+                      description: |-
+                        TopologyKey is the key of node labels. Nodes that have a label with this key
+                        and identical values are considered to be in the same topology.
+                        We consider each <key, value> as a "bucket", and try to put balanced number
+                        of pods into each bucket.
+                        We define a domain as a particular instance of a topology.
+                        Also, we define an eligible domain as a domain whose nodes meet the requirements of
+                        nodeAffinityPolicy and nodeTaintsPolicy.
+                        e.g. If TopologyKey is "kubernetes.io/hostname", each Node is a domain of that topology.
+                        And, if TopologyKey is "topology.kubernetes.io/zone", each zone is a domain of that topology.
+                        It's a required field.
+                      type: string
+                    whenUnsatisfiable:
+                      description: |-
+                        WhenUnsatisfiable indicates how to deal with a pod if it doesn't satisfy
+                        the spread constraint.
+                        - DoNotSchedule (default) tells the scheduler not to schedule it.
+                        - ScheduleAnyway tells the scheduler to schedule the pod in any location,
+                          but giving higher precedence to topologies that would help reduce the
+                          skew.
+                        A constraint is considered "Unsatisfiable" for an incoming pod
+                        if and only if every possible node assignment for that pod would violate
+                        "MaxSkew" on some topology.
+                        For example, in a 3-zone cluster, MaxSkew is set to 1, and pods with the same
+                        labelSelector spread as 3/1/1:
+                        | zone1 | zone2 | zone3 |
+                        | P P P |   P   |   P   |
+                        If WhenUnsatisfiable is set to DoNotSchedule, incoming pod can only be scheduled
+                        to zone2(zone3) to become 3/2/1(3/1/2) as ActualSkew(2-1) on zone2(zone3) satisfies
+                        MaxSkew(1). In other words, the cluster can still be imbalanced, but scheduler
+                        won't make it *more* imbalanced.
+                        It's a required field.
+                      type: string
+                  required:
+                  - maxSkew
+                  - topologyKey
+                  - whenUnsatisfiable
+                  type: object
+                type: array
+              version:
+                description: Version is the etcd version for this member.
+                pattern: ^\d+\.\d+\.\d+$
+                type: string
+            required:
+            - clusterName
+            - clusterToken
+            - initialCluster
+            - storage
+            - version
+            type: object
+          status:
+            description: EtcdMemberStatus defines the observed state of a single etcd
+              member.
+            properties:
+              conditions:
+                description: Conditions represent the latest available observations
+                  of the member's state.
+                items:
+                  description: Condition contains details for one aspect of the current
+                    state of this API Resource.
+                  properties:
+                    lastTransitionTime:
+                      description: |-
+                        lastTransitionTime is the last time the condition transitioned from one status to another.
+                        This should be when the underlying condition changed.  If that is not known, then using the time when the API field changed is acceptable.
+                      format: date-time
+                      type: string
+                    message:
+                      description: |-
+                        message is a human readable message indicating details about the transition.
+                        This may be an empty string.
+                      maxLength: 32768
+                      type: string
+                    observedGeneration:
+                      description: |-
+                        observedGeneration represents the .metadata.generation that the condition was set based upon.
+                        For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date
+                        with respect to the current state of the instance.
+                      format: int64
+                      minimum: 0
+                      type: integer
+                    reason:
+                      description: |-
+                        reason contains a programmatic identifier indicating the reason for the condition's last transition.
+                        Producers of specific condition types may define expected values and meanings for this field,
+                        and whether the values are considered a guaranteed API.
+                        The value should be a CamelCase string.
+                        This field may not be empty.
+                      maxLength: 1024
+                      minLength: 1
+                      pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
+                      type: string
+                    status:
+                      description: status of the condition, one of True, False, Unknown.
+                      enum:
+                      - "True"
+                      - "False"
+                      - Unknown
+                      type: string
+                    type:
+                      description: type of condition in CamelCase or in foo.example.com/CamelCase.
+                      maxLength: 316
+                      pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
+                      type: string
+                  required:
+                  - lastTransitionTime
+                  - message
+                  - reason
+                  - status
+                  - type
+                  type: object
+                type: array
+              isVoter:
+                description: |-
+                  IsVoter is true when etcd's MemberList reports this member with
+                  IsLearner=false — i.e. it counts toward quorum. Written by the
+                  cluster controller during its MemberList processing and pre-stamped
+                  true at seed creation (the seed is never a learner). Read by the
+                  member controller to apply the role=voter Pod label that the
+                  per-cluster PodDisruptionBudget selects on. Default value false is
+                  the safe-but-temporary state for a freshly-added learner before
+                  MemberPromote runs.
+                type: boolean
+              memberID:
+                description: |-
+                  MemberID is the etcd-assigned member ID in hex (e.g. "ae36f238164a08ad"),
+                  set once the member joins the cluster. Stored as a string because uint64
+                  values can exceed JSON's safe integer range.
+                type: string
+              podName:
+                description: PodName is the name of the Pod running this member.
+                type: string
+              podUID:
+                description: |-
+                  PodUID is the UID of the Pod most recently observed for this member.
+                  Set when the Pod is created or found; cleared when the Pod is gone
+                  and the member controller intentionally removed it (e.g. dormant).
+                  For memory-backed members the operator compares the live Pod's UID
+                  against this value to detect Pod loss: a stored UID with no live
+                  matching Pod means the tmpfs is gone and the member must be replaced.
+                type: string
+              pvcName:
+                description: PVCName is the name of the PersistentVolumeClaim for
+                  this member's data.
+                type: string
+              replicas:
+                description: |-
+                  Replicas exposes via /scale "this EtcdMember owns 1 Pod if it has
+                  a PodName, 0 otherwise". Unused by the operator's own PDB;
+                  scale-resolving budgets go SyncFailed without it.
+                format: int32
+                type: integer
+              selector:
+                description: |-
+                  Selector exposes the label-selector matching this member's Pod via
+                  /scale (for scale-resolving disruption budgets; not user-facing).
+                type: string
+              version:
+                description: |-
+                  Version is the etcd server version this member is actually running,
+                  observed at runtime from the member's own etcd endpoint via the
+                  Maintenance Status API (StatusResponse.Version) — i.e. what etcd
+                  reports, as opposed to spec.version, which is the intended/target
+                  version the operator asks for (and pins the image tag to). Empty until
+                  the member's Pod is Ready and the operator has successfully queried it.
+                  This observed value is the source of truth for detecting version drift
+                  between intent and reality (see the VersionDrifted condition); the
+                  observation is best-effort and never gates readiness.
+                type: string
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources:
+      scale:
+        labelSelectorPath: .status.selector
+        specReplicasPath: .spec.replicas
+        statusReplicasPath: .status.replicas
+      status: {}
diff --git a/packages/system/etcd-operator-crds/templates/etcdsnapshots.yaml b/packages/system/etcd-operator-crds/templates/etcdsnapshots.yaml
new file mode 100644
index 0000000000..c9de614656
--- /dev/null
+++ b/packages/system/etcd-operator-crds/templates/etcdsnapshots.yaml
@@ -0,0 +1,236 @@
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.18.0
+    helm.sh/resource-policy: keep
+  name: etcdsnapshots.etcd-operator.cozystack.io
+spec:
+  group: etcd-operator.cozystack.io
+  names:
+    kind: EtcdSnapshot
+    listKind: EtcdSnapshotList
+    plural: etcdsnapshots
+    singular: etcdsnapshot
+  scope: Namespaced
+  versions:
+  - additionalPrinterColumns:
+    - jsonPath: .spec.clusterRef.name
+      name: Cluster
+      type: string
+    - jsonPath: .status.phase
+      name: Phase
+      type: string
+    - jsonPath: .metadata.creationTimestamp
+      name: Age
+      type: date
+    name: v1alpha2
+    schema:
+      openAPIV3Schema:
+        description: |-
+          EtcdSnapshot is the Schema for the etcdsnapshots API. It captures a one-shot
+          snapshot of an EtcdCluster to a destination (S3 or PVC).
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: |-
+              EtcdSnapshotSpec defines a one-shot etcd snapshot of a cluster to a
+              destination. Snapshots are immutable: change the destination by creating a
+              new EtcdSnapshot.
+            properties:
+              clusterRef:
+                description: ClusterRef names the EtcdCluster (same namespace) to
+                  snapshot.
+                properties:
+                  name:
+                    default: ""
+                    description: |-
+                      Name of the referent.
+                      This field is effectively required, but due to backwards compatibility is
+                      allowed to be empty. Instances of this type with an empty value here are
+                      almost certainly wrong.
+                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                    type: string
+                type: object
+                x-kubernetes-map-type: atomic
+              destination:
+                description: Destination selects where the snapshot is stored (S3
+                  or PVC).
+                properties:
+                  pvc:
+                    description: PVC stores the snapshot on a PersistentVolumeClaim.
+                    properties:
+                      claimName:
+                        description: ClaimName is the name of a PVC in the cluster's
+                          namespace.
+                        minLength: 1
+                        type: string
+                      subPath:
+                        description: SubPath is an optional subdirectory within the
+                          volume.
+                        type: string
+                    required:
+                    - claimName
+                    type: object
+                  s3:
+                    description: S3 stores the snapshot in an S3-compatible object
+                      store.
+                    properties:
+                      bucket:
+                        description: Bucket is the destination bucket.
+                        minLength: 1
+                        type: string
+                      credentialsSecretRef:
+                        description: |-
+                          CredentialsSecretRef references a Secret in the cluster's namespace
+                          holding AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY keys.
+                        properties:
+                          name:
+                            default: ""
+                            description: |-
+                              Name of the referent.
+                              This field is effectively required, but due to backwards compatibility is
+                              allowed to be empty. Instances of this type with an empty value here are
+                              almost certainly wrong.
+                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                            type: string
+                        type: object
+                        x-kubernetes-map-type: atomic
+                      endpoint:
+                        description: |-
+                          Endpoint is the S3 endpoint URL (e.g. "https://s3.amazonaws.com" or a
+                          MinIO/Ceph endpoint).
+                        minLength: 1
+                        type: string
+                      forcePathStyle:
+                        description: |-
+                          ForcePathStyle selects path-style addressing (bucket in the path
+                          rather than the host). MinIO/Ceph typically require true.
+                        type: boolean
+                      key:
+                        description: |-
+                          Key is an optional object-key prefix within the bucket. The operator
+                          appends "<snapshot-name>.db".
+                        type: string
+                      region:
+                        description: Region is the S3 region. Optional for endpoints
+                          that ignore it.
+                        type: string
+                    required:
+                    - bucket
+                    - credentialsSecretRef
+                    - endpoint
+                    type: object
+                type: object
+                x-kubernetes-validations:
+                - message: exactly one of destination.s3 or destination.pvc must be
+                    set
+                  rule: has(self.s3) != has(self.pvc)
+            required:
+            - clusterRef
+            - destination
+            type: object
+          status:
+            description: EtcdSnapshotStatus is the observed state of an EtcdSnapshot.
+            properties:
+              artifact:
+                description: Artifact is populated once the snapshot completes.
+                properties:
+                  checksum:
+                    description: Checksum is "<algo>:<hex>", e.g. "sha256:abc123...".
+                    type: string
+                  sizeBytes:
+                    description: SizeBytes is the snapshot size in bytes.
+                    format: int64
+                    type: integer
+                  uri:
+                    description: |-
+                      URI is the full snapshot location, e.g. "s3://bucket/key.db" or
+                      "file:///snapshot/data/name.db".
+                    type: string
+                required:
+                - uri
+                type: object
+              conditions:
+                description: Conditions represent the latest available observations.
+                items:
+                  description: Condition contains details for one aspect of the current
+                    state of this API Resource.
+                  properties:
+                    lastTransitionTime:
+                      description: |-
+                        lastTransitionTime is the last time the condition transitioned from one status to another.
+                        This should be when the underlying condition changed.  If that is not known, then using the time when the API field changed is acceptable.
+                      format: date-time
+                      type: string
+                    message:
+                      description: |-
+                        message is a human readable message indicating details about the transition.
+                        This may be an empty string.
+                      maxLength: 32768
+                      type: string
+                    observedGeneration:
+                      description: |-
+                        observedGeneration represents the .metadata.generation that the condition was set based upon.
+                        For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date
+                        with respect to the current state of the instance.
+                      format: int64
+                      minimum: 0
+                      type: integer
+                    reason:
+                      description: |-
+                        reason contains a programmatic identifier indicating the reason for the condition's last transition.
+                        Producers of specific condition types may define expected values and meanings for this field,
+                        and whether the values are considered a guaranteed API.
+                        The value should be a CamelCase string.
+                        This field may not be empty.
+                      maxLength: 1024
+                      minLength: 1
+                      pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
+                      type: string
+                    status:
+                      description: status of the condition, one of True, False, Unknown.
+                      enum:
+                      - "True"
+                      - "False"
+                      - Unknown
+                      type: string
+                    type:
+                      description: type of condition in CamelCase or in foo.example.com/CamelCase.
+                      maxLength: 316
+                      pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
+                      type: string
+                  required:
+                  - lastTransitionTime
+                  - message
+                  - reason
+                  - status
+                  - type
+                  type: object
+                type: array
+              phase:
+                description: Phase is the high-level lifecycle phase.
+                type: string
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}
diff --git a/packages/system/etcd-operator-crds/tests/resource_policy_test.yaml b/packages/system/etcd-operator-crds/tests/resource_policy_test.yaml
new file mode 100644
index 0000000000..277e423133
--- /dev/null
+++ b/packages/system/etcd-operator-crds/tests/resource_policy_test.yaml
@@ -0,0 +1,23 @@
+# These CRDs carry helm.sh/resource-policy: keep, which is what stops a release
+# uninstall from deleting them and taking every EtcdCluster, EtcdMember and
+# EtcdSnapshot in the cluster with them. This suite pins it.
+#
+# The annotation is stamped by the awk step in `make update`, anchored on the
+# controller-gen.kubebuilder.io/version: line the upstream CRDs carry. If that
+# line stops being emitted, the step matches nothing and exits zero.
+#
+# The wildcard scope covers a CRD added to the vendoring list without editing
+# this file. The kind assertion catches a non-CRD document that carries the
+# annotation, which the annotation assertion on its own accepts.
+suite: etcd-operator CRDs survive a release uninstall
+templates:
+  - templates/*.yaml
+tests:
+  - it: annotates every CustomResourceDefinition the chart renders
+    asserts:
+      - equal:
+          path: kind
+          value: CustomResourceDefinition
+      - equal:
+          path: metadata.annotations["helm.sh/resource-policy"]
+          value: keep
diff --git a/packages/system/etcd-operator/Chart.yaml b/packages/system/etcd-operator/Chart.yaml
index e0ce7207a6..a2321eb303 100644
--- a/packages/system/etcd-operator/Chart.yaml
+++ b/packages/system/etcd-operator/Chart.yaml
@@ -1,2 +1,6 @@
+apiVersion: v2
 name: cozy-etcd-operator
+description: Cozystack etcd-operator (etcd-operator.cozystack.io/v1alpha2) controller-manager
+type: application
 version: 0.0.0 # Placeholder, the actual version will be automatically set during the build process
+appVersion: v0.5.6
diff --git a/packages/system/etcd-operator/Makefile b/packages/system/etcd-operator/Makefile
index 54a1edad70..184ef2e1fe 100644
--- a/packages/system/etcd-operator/Makefile
+++ b/packages/system/etcd-operator/Makefile
@@ -3,6 +3,17 @@ export NAMESPACE=cozy-${NAME}
 
 include ../../../hack/package.mk
 
+# Pinned ref of github.com/cozystack/etcd-operator to vendor the manager
+# ClusterRole from. The Deployment is cozystack-authored (image, cluster
+# domain, VPA), so only the RBAC role is re-vendored; refresh templates/rbac.yaml
+# by hand from charts/etcd-operator/files/manager-role-rules.yaml at this ref.
+# CRDs live in the sibling etcd-operator-crds package.
+ETCD_OPERATOR_REF ?= v0.5.6
+
 update:
-	rm -rf charts
-	helm pull oci://ghcr.io/aenix-io/charts/etcd-operator --untar --untardir charts
+	@echo "etcd-operator is a cozystack-authored chart; refresh templates/rbac.yaml"
+	@echo "from github.com/cozystack/etcd-operator charts/etcd-operator/files/manager-role-rules.yaml @ $(ETCD_OPERATOR_REF)"
+	@echo "and re-vendor CRDs via 'make -C ../etcd-operator-crds update'."
+
+test:
+	helm unittest .
diff --git a/packages/system/etcd-operator/charts/etcd-operator/Chart.yaml b/packages/system/etcd-operator/charts/etcd-operator/Chart.yaml
deleted file mode 100644
index 5d21e1cbcb..0000000000
--- a/packages/system/etcd-operator/charts/etcd-operator/Chart.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-apiVersion: v2
-appVersion: v0.4.5
-name: etcd-operator
-type: application
-version: 0.4.5
diff --git a/packages/system/etcd-operator/charts/etcd-operator/README.md b/packages/system/etcd-operator/charts/etcd-operator/README.md
deleted file mode 100644
index ff2e019abb..0000000000
--- a/packages/system/etcd-operator/charts/etcd-operator/README.md
+++ /dev/null
@@ -1,65 +0,0 @@
-# etcd-operator
-
-![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
-
-## Values
-
-| Key | Type | Default | Description |
-|-----|------|---------|-------------|
-| affinity | object | `{}` | ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity |
-| etcdOperator.args[0] | string | `"--health-probe-bind-address=:8081"` |  |
-| etcdOperator.args[1] | string | `"--metrics-bind-address=127.0.0.1:8080"` |  |
-| etcdOperator.args[2] | string | `"--leader-elect"` |  |
-| etcdOperator.envVars | object | `{}` | Empty environment variables section |
-| etcdOperator.image.pullPolicy | string | `"IfNotPresent"` | Image pull policy |
-| etcdOperator.image.repository | string | `"ghcr.io/aenix-io/etcd-operator"` | Image repository |
-| etcdOperator.image.tag | string | `""` | Overrides the image tag whose default is the chart appVersion. |
-| etcdOperator.livenessProbe.httpGet.path | string | `"/healthz"` | Healthcheck liveness probe path |
-| etcdOperator.livenessProbe.httpGet.port | int | `8081` | Healthcheck port |
-| etcdOperator.livenessProbe.initialDelaySeconds | int | `15` | ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/#configure-probes |
-| etcdOperator.livenessProbe.periodSeconds | int | `20` | ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/#configure-probes |
-| etcdOperator.readinessProbe.httpGet.path | string | `"/readyz"` | Healthcheck readiness probe path |
-| etcdOperator.readinessProbe.httpGet.port | int | `8081` | Healthcheck port |
-| etcdOperator.readinessProbe.initialDelaySeconds | int | `5` | ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/#configure-probes |
-| etcdOperator.readinessProbe.periodSeconds | int | `10` | ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/#configure-probes |
-| etcdOperator.resources | object | `{"limits":{"cpu":"500m","memory":"128Mi"},"requests":{"cpu":"100m","memory":"64Mi"}}` | ref: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ |
-| etcdOperator.securityContext | object | `{"allowPrivilegeEscalation":false,"capabilities":{"drop":["ALL"]}}` | ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/ |
-| etcdOperator.service.port | int | `9443` | Service port |
-| etcdOperator.service.type | string | `"ClusterIP"` | Service type |
-| etcdOperator.vpa.enabled | bool | `true` |  |
-| etcdOperator.vpa.maxAllowed.cpu | string | `"1000m"` |  |
-| etcdOperator.vpa.maxAllowed.memory | string | `"1Gi"` |  |
-| etcdOperator.vpa.minAllowed.cpu | string | `"100m"` |  |
-| etcdOperator.vpa.minAllowed.memory | string | `"128Mi"` |  |
-| fullnameOverride | string | `""` | Override a full name of helm release |
-| imagePullSecrets | list | `[]` |  |
-| kubeRbacProxy.args[0] | string | `"--secure-listen-address=0.0.0.0:8443"` |  |
-| kubeRbacProxy.args[1] | string | `"--upstream=http://127.0.0.1:8080/"` |  |
-| kubeRbacProxy.args[2] | string | `"--logtostderr=true"` |  |
-| kubeRbacProxy.args[3] | string | `"--v=0"` |  |
-| kubeRbacProxy.image.pullPolicy | string | `"IfNotPresent"` | Image pull policy |
-| kubeRbacProxy.image.repository | string | `"quay.io/brancz/kube-rbac-proxy"` | Image repository |
-| kubeRbacProxy.image.tag | string | `"v0.18.1"` | Version of image |
-| kubeRbacProxy.livenessProbe | object | `{}` | https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/ |
-| kubeRbacProxy.readinessProbe | object | `{}` | https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/ |
-| kubeRbacProxy.resources | object | `{"limits":{"cpu":"250m","memory":"128Mi"},"requests":{"cpu":"100m","memory":"64Mi"}}` | ref: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ |
-| kubeRbacProxy.securityContext | object | `{"allowPrivilegeEscalation":false,"capabilities":{"drop":["ALL"]}}` | ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/ |
-| kubeRbacProxy.service.port | int | `8443` | Service port |
-| kubeRbacProxy.service.type | string | `"ClusterIP"` | Service type |
-| kubeRbacProxy.vpa.enabled | bool | `true` |  |
-| kubeRbacProxy.vpa.maxAllowed.cpu | string | `"500m"` |  |
-| kubeRbacProxy.vpa.maxAllowed.memory | string | `"256Mi"` |  |
-| kubeRbacProxy.vpa.minAllowed.cpu | string | `"50m"` |  |
-| kubeRbacProxy.vpa.minAllowed.memory | string | `"64Mi"` |  |
-| kubernetesClusterDomain | string | `"cluster.local"` | Kubernetes cluster domain prefix |
-| nameOverride | string | `""` | Override a name of helm release |
-| nodeSelector | object | `{}` | ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/ |
-| podAnnotations | object | `{}` | ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/ |
-| podLabels | object | `{}` | ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/ |
-| podSecurityContext | object | `{}` | ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/ |
-| replicaCount | int | `1` | Count of pod replicas |
-| serviceAccount.annotations | object | `{}` | Annotations to add to the service account |
-| serviceAccount.create | bool | `true` | Specifies whether a service account should be created |
-| tolerations | list | `[]` | ref: https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/ |
-| vpa.updatePolicy | string | `"Auto"` |  |
-
diff --git a/packages/system/etcd-operator/charts/etcd-operator/README.md.gotmpl b/packages/system/etcd-operator/charts/etcd-operator/README.md.gotmpl
deleted file mode 100644
index e1c2505826..0000000000
--- a/packages/system/etcd-operator/charts/etcd-operator/README.md.gotmpl
+++ /dev/null
@@ -1,19 +0,0 @@
-{{ template "chart.header" . }}
-
-{{ template "chart.deprecationWarning" . }}
-
-{{ template "chart.typeBadge" . }}
-
-{{ template "chart.description" . }}
-
-{{ template "chart.homepageLine" . }}
-
-{{ template "chart.maintainersSection" . }}
-
-{{ template "chart.sourcesSection" . }}
-
-{{ template "chart.requirementsSection" . }}
-
-{{ template "chart.valuesSection" . }}
-
-{{ template "helm-docs.versionFooter" . }}
diff --git a/packages/system/etcd-operator/charts/etcd-operator/crds/etcd-backup-schedule.yaml b/packages/system/etcd-operator/charts/etcd-operator/crds/etcd-backup-schedule.yaml
deleted file mode 100644
index 718d98e6bc..0000000000
--- a/packages/system/etcd-operator/charts/etcd-operator/crds/etcd-backup-schedule.yaml
+++ /dev/null
@@ -1,218 +0,0 @@
-apiVersion: apiextensions.k8s.io/v1
-kind: CustomResourceDefinition
-metadata:
-  annotations:
-    cert-manager.io/inject-ca-from: etcd-operator-system/etcd-operator-serving-cert
-    controller-gen.kubebuilder.io/version: v0.16.5
-  name: etcdbackupschedules.etcd.aenix.io
-spec:
-  conversion:
-    strategy: None
-  group: etcd.aenix.io
-  names:
-    kind: EtcdBackupSchedule
-    listKind: EtcdBackupScheduleList
-    plural: etcdbackupschedules
-    singular: etcdbackupschedule
-  scope: Namespaced
-  versions:
-    - additionalPrinterColumns:
-        - jsonPath: .spec.clusterRef.name
-          name: Cluster
-          type: string
-        - jsonPath: .spec.schedule
-          name: Schedule
-          type: string
-        - jsonPath: .status.lastSuccessfulBackupTime
-          name: Last Backup
-          type: date
-        - jsonPath: .metadata.creationTimestamp
-          name: Age
-          type: date
-      name: v1alpha1
-      schema:
-        openAPIV3Schema:
-          description: EtcdBackupSchedule is the Schema for the etcdbackupschedules API
-          properties:
-            apiVersion:
-              description: |-
-                APIVersion defines the versioned schema of this representation of an object.
-                Servers should convert recognized schemas to the latest internal value, and
-                may reject unrecognized values.
-                More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
-              type: string
-            kind:
-              description: |-
-                Kind is a string value representing the REST resource this object represents.
-                Servers may infer this from the endpoint the client submits requests to.
-                Cannot be updated.
-                In CamelCase.
-                More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
-              type: string
-            metadata:
-              type: object
-            spec:
-              description: EtcdBackupScheduleSpec defines the desired state of EtcdBackupSchedule
-              properties:
-                clusterRef:
-                  description: ClusterRef references the EtcdCluster to back up.
-                  properties:
-                    name:
-                      default: ""
-                      description: |-
-                        Name of the referent.
-                        This field is effectively required, but due to backwards compatibility is
-                        allowed to be empty. Instances of this type with an empty value here are
-                        almost certainly wrong.
-                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                      type: string
-                  type: object
-                  x-kubernetes-map-type: atomic
-                destination:
-                  description: Destination defines where the backup will be stored.
-                  properties:
-                    pvc:
-                      description: PVC defines a PersistentVolumeClaim as the backup destination.
-                      properties:
-                        claimName:
-                          description: ClaimName is the name of the PersistentVolumeClaim to use.
-                          type: string
-                        subPath:
-                          description: |-
-                            SubPath is an optional sub-directory within the PVC volume.
-                            The operator appends the backup filename automatically.
-                          type: string
-                      required:
-                        - claimName
-                      type: object
-                    s3:
-                      description: S3 defines S3-compatible storage as the backup destination.
-                      properties:
-                        bucket:
-                          description: Bucket is the name of the S3 bucket.
-                          type: string
-                        credentialsSecretRef:
-                          description: CredentialsSecretRef references a Secret containing AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY keys.
-                          properties:
-                            name:
-                              default: ""
-                              description: |-
-                                Name of the referent.
-                                This field is effectively required, but due to backwards compatibility is
-                                allowed to be empty. Instances of this type with an empty value here are
-                                almost certainly wrong.
-                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                              type: string
-                          type: object
-                          x-kubernetes-map-type: atomic
-                        endpoint:
-                          description: Endpoint is the S3-compatible endpoint URL (e.g., "https://s3.amazonaws.com").
-                          type: string
-                        forcePathStyle:
-                          description: |-
-                            ForcePathStyle forces path-style S3 URLs (e.g., endpoint/bucket/key)
-                            instead of virtual-hosted-style (e.g., bucket.endpoint/key).
-                            Most S3-compatible providers (MinIO, Ceph) require path style.
-                          type: boolean
-                        key:
-                          description: |-
-                            Key is the key prefix (directory path) within the bucket.
-                            The operator appends the backup filename automatically.
-                          type: string
-                        region:
-                          description: Region is the AWS region for the S3 bucket.
-                          type: string
-                      required:
-                        - bucket
-                        - credentialsSecretRef
-                        - endpoint
-                      type: object
-                  type: object
-                failedJobsHistoryLimit:
-                  description: FailedJobsHistoryLimit is the number of failed finished CronJob children to retain.
-                  format: int32
-                  minimum: 0
-                  type: integer
-                schedule:
-                  description: Schedule is a cron expression defining when backups should be taken.
-                  type: string
-                successfulJobsHistoryLimit:
-                  description: SuccessfulJobsHistoryLimit is the number of successful finished CronJob children to retain.
-                  format: int32
-                  minimum: 0
-                  type: integer
-              required:
-                - clusterRef
-                - destination
-                - schedule
-              type: object
-            status:
-              description: EtcdBackupScheduleStatus defines the observed state of EtcdBackupSchedule
-              properties:
-                conditions:
-                  items:
-                    description: Condition contains details for one aspect of the current state of this API Resource.
-                    properties:
-                      lastTransitionTime:
-                        description: |-
-                          lastTransitionTime is the last time the condition transitioned from one status to another.
-                          This should be when the underlying condition changed.  If that is not known, then using the time when the API field changed is acceptable.
-                        format: date-time
-                        type: string
-                      message:
-                        description: |-
-                          message is a human readable message indicating details about the transition.
-                          This may be an empty string.
-                        maxLength: 32768
-                        type: string
-                      observedGeneration:
-                        description: |-
-                          observedGeneration represents the .metadata.generation that the condition was set based upon.
-                          For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date
-                          with respect to the current state of the instance.
-                        format: int64
-                        minimum: 0
-                        type: integer
-                      reason:
-                        description: |-
-                          reason contains a programmatic identifier indicating the reason for the condition's last transition.
-                          Producers of specific condition types may define expected values and meanings for this field,
-                          and whether the values are considered a guaranteed API.
-                          The value should be a CamelCase string.
-                          This field may not be empty.
-                        maxLength: 1024
-                        minLength: 1
-                        pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
-                        type: string
-                      status:
-                        description: status of the condition, one of True, False, Unknown.
-                        enum:
-                          - "True"
-                          - "False"
-                          - Unknown
-                        type: string
-                      type:
-                        description: type of condition in CamelCase or in foo.example.com/CamelCase.
-                        maxLength: 316
-                        pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
-                        type: string
-                    required:
-                      - lastTransitionTime
-                      - message
-                      - reason
-                      - status
-                      - type
-                    type: object
-                  type: array
-                lastScheduleTime:
-                  format: date-time
-                  type: string
-                lastSuccessfulBackupTime:
-                  format: date-time
-                  type: string
-              type: object
-          type: object
-      served: true
-      storage: true
-      subresources:
-        status: {}
diff --git a/packages/system/etcd-operator/charts/etcd-operator/crds/etcd-backup.yaml b/packages/system/etcd-operator/charts/etcd-operator/crds/etcd-backup.yaml
deleted file mode 100644
index 532c37173b..0000000000
--- a/packages/system/etcd-operator/charts/etcd-operator/crds/etcd-backup.yaml
+++ /dev/null
@@ -1,278 +0,0 @@
-apiVersion: apiextensions.k8s.io/v1
-kind: CustomResourceDefinition
-metadata:
-  annotations:
-    cert-manager.io/inject-ca-from: etcd-operator-system/etcd-operator-serving-cert
-    controller-gen.kubebuilder.io/version: v0.16.5
-  name: etcdbackups.etcd.aenix.io
-spec:
-  conversion:
-    strategy: None
-  group: etcd.aenix.io
-  names:
-    kind: EtcdBackup
-    listKind: EtcdBackupList
-    plural: etcdbackups
-    singular: etcdbackup
-  scope: Namespaced
-  versions:
-    - additionalPrinterColumns:
-        - jsonPath: .spec.clusterRef.name
-          name: Cluster
-          type: string
-        - jsonPath: .status.phase
-          name: Phase
-          type: string
-        - jsonPath: .metadata.creationTimestamp
-          name: Age
-          type: date
-      name: v1alpha1
-      schema:
-        openAPIV3Schema:
-          description: EtcdBackup is the Schema for the etcdbackups API
-          properties:
-            apiVersion:
-              description: |-
-                APIVersion defines the versioned schema of this representation of an object.
-                Servers should convert recognized schemas to the latest internal value, and
-                may reject unrecognized values.
-                More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
-              type: string
-            kind:
-              description: |-
-                Kind is a string value representing the REST resource this object represents.
-                Servers may infer this from the endpoint the client submits requests to.
-                Cannot be updated.
-                In CamelCase.
-                More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
-              type: string
-            metadata:
-              type: object
-            spec:
-              description: EtcdBackupSpec defines the desired state of EtcdBackup
-              properties:
-                clusterRef:
-                  description: ClusterRef references the EtcdCluster to back up.
-                  properties:
-                    name:
-                      default: ""
-                      description: |-
-                        Name of the referent.
-                        This field is effectively required, but due to backwards compatibility is
-                        allowed to be empty. Instances of this type with an empty value here are
-                        almost certainly wrong.
-                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                      type: string
-                  type: object
-                  x-kubernetes-map-type: atomic
-                destination:
-                  description: Destination defines where the backup will be stored.
-                  properties:
-                    pvc:
-                      description: PVC defines a PersistentVolumeClaim as the backup destination.
-                      properties:
-                        claimName:
-                          description: ClaimName is the name of the PersistentVolumeClaim to use.
-                          type: string
-                        subPath:
-                          description: |-
-                            SubPath is an optional sub-directory within the PVC volume.
-                            The operator appends the backup filename automatically.
-                          type: string
-                      required:
-                        - claimName
-                      type: object
-                    s3:
-                      description: S3 defines S3-compatible storage as the backup destination.
-                      properties:
-                        bucket:
-                          description: Bucket is the name of the S3 bucket.
-                          type: string
-                        credentialsSecretRef:
-                          description: CredentialsSecretRef references a Secret containing AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY keys.
-                          properties:
-                            name:
-                              default: ""
-                              description: |-
-                                Name of the referent.
-                                This field is effectively required, but due to backwards compatibility is
-                                allowed to be empty. Instances of this type with an empty value here are
-                                almost certainly wrong.
-                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                              type: string
-                          type: object
-                          x-kubernetes-map-type: atomic
-                        endpoint:
-                          description: Endpoint is the S3-compatible endpoint URL (e.g., "https://s3.amazonaws.com").
-                          type: string
-                        forcePathStyle:
-                          description: |-
-                            ForcePathStyle forces path-style S3 URLs (e.g., endpoint/bucket/key)
-                            instead of virtual-hosted-style (e.g., bucket.endpoint/key).
-                            Most S3-compatible providers (MinIO, Ceph) require path style.
-                          type: boolean
-                        key:
-                          description: |-
-                            Key is the key prefix (directory path) within the bucket.
-                            The operator appends the backup filename automatically.
-                          type: string
-                        region:
-                          description: Region is the AWS region for the S3 bucket.
-                          type: string
-                      required:
-                        - bucket
-                        - credentialsSecretRef
-                        - endpoint
-                      type: object
-                  type: object
-              required:
-                - clusterRef
-                - destination
-              type: object
-            status:
-              description: EtcdBackupStatus defines the observed state of EtcdBackup
-              properties:
-                conditions:
-                  items:
-                    description: Condition contains details for one aspect of the current state of this API Resource.
-                    properties:
-                      lastTransitionTime:
-                        description: |-
-                          lastTransitionTime is the last time the condition transitioned from one status to another.
-                          This should be when the underlying condition changed.  If that is not known, then using the time when the API field changed is acceptable.
-                        format: date-time
-                        type: string
-                      message:
-                        description: |-
-                          message is a human readable message indicating details about the transition.
-                          This may be an empty string.
-                        maxLength: 32768
-                        type: string
-                      observedGeneration:
-                        description: |-
-                          observedGeneration represents the .metadata.generation that the condition was set based upon.
-                          For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date
-                          with respect to the current state of the instance.
-                        format: int64
-                        minimum: 0
-                        type: integer
-                      reason:
-                        description: |-
-                          reason contains a programmatic identifier indicating the reason for the condition's last transition.
-                          Producers of specific condition types may define expected values and meanings for this field,
-                          and whether the values are considered a guaranteed API.
-                          The value should be a CamelCase string.
-                          This field may not be empty.
-                        maxLength: 1024
-                        minLength: 1
-                        pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
-                        type: string
-                      status:
-                        description: status of the condition, one of True, False, Unknown.
-                        enum:
-                          - "True"
-                          - "False"
-                          - Unknown
-                        type: string
-                      type:
-                        description: type of condition in CamelCase or in foo.example.com/CamelCase.
-                        maxLength: 316
-                        pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
-                        type: string
-                    required:
-                      - lastTransitionTime
-                      - message
-                      - reason
-                      - status
-                      - type
-                    type: object
-                  type: array
-                phase:
-                  type: string
-                snapshot:
-                  description: |-
-                    Snapshot describes the artefact the backup-agent wrote.
-                    Populated by the controller after the backup Job reaches
-                    phase=Succeeded, parsed from the agent's terminal
-                    "snapshot uploaded: ..." / "snapshot written: ..." pod-log
-                    marker. Empty while the backup is in progress, on failure
-                    before the write step, or when the Job pod's log has been GC'd
-                    before the controller observed it.
-                  properties:
-                    checksum:
-                      description: |-
-                        Checksum is "<algo>:<hex>" of the snapshot bytes, computed by
-                        the agent while streaming. Currently always "sha256:<hex>"
-                        (64 hex chars) when the controller populates BackupSnapshot at
-                        all; consumers MUST tolerate other algorithms via the prefix.
-                        The controller's marker regex requires sha256=<64 hex> to be
-                        present, so this field is non-empty whenever the enclosing
-                        BackupSnapshot is set.
-
-                        The pattern admits hyphenated algorithm names (e.g.
-                        "sha3-256:...", "blake2b-256:...", "blake3-256:...") so a
-                        future agent build can adopt a stronger hash without an API
-                        break, and bounds the hex run to 32–128 chars (128-bit to
-                        512-bit digests) so a truncated emit cannot satisfy the
-                        pattern with a meaningless short hash.
-                      pattern: ^[a-z0-9][a-z0-9-]*:[a-f0-9]{32,128}$
-                      type: string
-                    sizeBytes:
-                      description: |-
-                        SizeBytes is the snapshot size in bytes, as observed by the
-                        backup-agent at write time. Populated whenever the enclosing
-                        BackupSnapshot is set: a successful marker parse always
-                        produces a value here. The only way SizeBytes==0 lands with
-                        BackupSnapshot set is the strconv.ParseInt overflow fallback
-                        in the marker scanner — i.e. an agent-emitted size larger
-                        than int64, which is unreachable in practice. In that one
-                        case the scanner deliberately STILL lands a populated
-                        BackupSnapshot (with SizeBytes=0, URI and Checksum
-                        preserved) rather than discarding it: the URI + checksum are
-                        the load-bearing fields for a future restore, and a
-                        reviewer reading status sees the snapshot exists. When the
-                        agent log was GC'd or never contained a marker, the entire
-                        BackupSnapshot stays nil rather than being set with a zero
-                        SizeBytes.
-                      format: int64
-                      type: integer
-                    uri:
-                      description: |-
-                        URI is an OBSERVATIONAL identifier of the snapshot the agent
-                        wrote — intended for humans, dashboards, and out-of-band
-                        tooling. For S3 destinations: "s3://<bucket>/<key>" where
-                        <key> is the FULL object name (with any BACKUP_INCLUDE_REVISION
-                        / BACKUP_TIMESTAMP suffix the agent injected at write time).
-                        For PVC destinations: "file:///<abs-path>" — note the triple
-                        slash, which is the literal output of joining the "file://"
-                        scheme with an absolute in-container path. The path is
-                        in-container (rooted at the operator-injected /backup/data
-                        mount of spec.destination.pvc.claimName) and is not directly
-                        readable from outside the pod.
-
-                        This field is NOT a stable contract for programmatic restore
-                        callers. The S3 form omits endpoint / region / path-style flags
-                        that are required to address non-AWS endpoints (MinIO, Ceph
-                        RGW, Wasabi, ...) and the PVC form omits the PVC claimName and
-                        namespace. A future RestoreSpec consumer must read those values
-                        from the originating EtcdBackup.spec.destination — not from
-                        this string. The URI format may evolve in subsequent versions
-                        to expose richer addressing; consumers should treat unfamiliar
-                        schemes as opaque rather than parsing.
-
-                        KEEP IN SYNC with the SnapshotURIPrefixPattern constant in this
-                        package — the controller compiles its defense-in-depth regex
-                        from that constant; if this marker drifts, the controller will
-                        admit URIs that the apiserver refuses to write and reconciles
-                        will spin on Status().Update validation errors.
-                      pattern: ^(s3|file)://.+
-                      type: string
-                  required:
-                    - uri
-                  type: object
-              type: object
-          type: object
-      served: true
-      storage: true
-      subresources:
-        status: {}
diff --git a/packages/system/etcd-operator/charts/etcd-operator/crds/etcd-cluster.yaml b/packages/system/etcd-operator/charts/etcd-operator/crds/etcd-cluster.yaml
deleted file mode 100644
index 4da97a8f6c..0000000000
--- a/packages/system/etcd-operator/charts/etcd-operator/crds/etcd-cluster.yaml
+++ /dev/null
@@ -1,1139 +0,0 @@
-apiVersion: apiextensions.k8s.io/v1
-kind: CustomResourceDefinition
-metadata:
-  annotations:
-    cert-manager.io/inject-ca-from: etcd-operator-system/etcd-operator-serving-cert
-    controller-gen.kubebuilder.io/version: v0.16.5
-  name: etcdclusters.etcd.aenix.io
-spec:
-  conversion:
-    strategy: Webhook
-    webhook:
-      clientConfig:
-        service:
-          name: etcd-operator-webhook-service
-          namespace: etcd-operator-system
-          path: /convert
-      conversionReviewVersions:
-        - v1
-  group: etcd.aenix.io
-  names:
-    kind: EtcdCluster
-    listKind: EtcdClusterList
-    plural: etcdclusters
-    singular: etcdcluster
-  scope: Namespaced
-  versions:
-    - name: v1alpha1
-      schema:
-        openAPIV3Schema:
-          description: EtcdCluster is the Schema for the etcdclusters API
-          properties:
-            apiVersion:
-              description: |-
-                APIVersion defines the versioned schema of this representation of an object.
-                Servers should convert recognized schemas to the latest internal value, and
-                may reject unrecognized values.
-                More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
-              type: string
-            kind:
-              description: |-
-                Kind is a string value representing the REST resource this object represents.
-                Servers may infer this from the endpoint the client submits requests to.
-                Cannot be updated.
-                In CamelCase.
-                More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
-              type: string
-            metadata:
-              type: object
-            spec:
-              description: EtcdClusterSpec defines the desired state of EtcdCluster
-              properties:
-                bootstrap:
-                  description: |-
-                    Bootstrap defines initialization from an existing data source (e.g., snapshot restore).
-                    This is only used during initial cluster creation and is ignored afterward.
-                  properties:
-                    restore:
-                      description: Restore configures cluster initialization from an etcd snapshot.
-                      properties:
-                        source:
-                          description: Source defines where to get the snapshot for restoration.
-                          properties:
-                            pvc:
-                              description: PVC defines a PersistentVolumeClaim as the backup destination.
-                              properties:
-                                claimName:
-                                  description: ClaimName is the name of the PersistentVolumeClaim to use.
-                                  type: string
-                                subPath:
-                                  description: |-
-                                    SubPath is an optional sub-directory within the PVC volume.
-                                    The operator appends the backup filename automatically.
-                                  type: string
-                              required:
-                                - claimName
-                              type: object
-                            s3:
-                              description: S3 defines S3-compatible storage as the backup destination.
-                              properties:
-                                bucket:
-                                  description: Bucket is the name of the S3 bucket.
-                                  type: string
-                                credentialsSecretRef:
-                                  description: CredentialsSecretRef references a Secret containing AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY keys.
-                                  properties:
-                                    name:
-                                      default: ""
-                                      description: |-
-                                        Name of the referent.
-                                        This field is effectively required, but due to backwards compatibility is
-                                        allowed to be empty. Instances of this type with an empty value here are
-                                        almost certainly wrong.
-                                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                                      type: string
-                                  type: object
-                                  x-kubernetes-map-type: atomic
-                                endpoint:
-                                  description: Endpoint is the S3-compatible endpoint URL (e.g., "https://s3.amazonaws.com").
-                                  type: string
-                                forcePathStyle:
-                                  description: |-
-                                    ForcePathStyle forces path-style S3 URLs (e.g., endpoint/bucket/key)
-                                    instead of virtual-hosted-style (e.g., bucket.endpoint/key).
-                                    Most S3-compatible providers (MinIO, Ceph) require path style.
-                                  type: boolean
-                                key:
-                                  description: |-
-                                    Key is the key prefix (directory path) within the bucket.
-                                    The operator appends the backup filename automatically.
-                                  type: string
-                                region:
-                                  description: Region is the AWS region for the S3 bucket.
-                                  type: string
-                              required:
-                                - bucket
-                                - credentialsSecretRef
-                                - endpoint
-                              type: object
-                          type: object
-                      required:
-                        - source
-                      type: object
-                  type: object
-                headlessServiceTemplate:
-                  description: HeadlessService defines the desired state of HeadlessService for etcd members. If not specified, default values will be used.
-                  properties:
-                    metadata:
-                      description: EmbeddedMetadata contains metadata relevant to an EmbeddedResource.
-                      properties:
-                        annotations:
-                          additionalProperties:
-                            type: string
-                          description: |-
-                            Annotations is an unstructured key value map stored with a resource that may be
-                            set by external tools to store and retrieve arbitrary metadata. They are not
-                            queryable and should be preserved when modifying objects.
-                            More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations
-                          type: object
-                        labels:
-                          additionalProperties:
-                            type: string
-                          description: |-
-                            Labels Map of string keys and values that can be used to organize and categorize
-                            (scope and select) objects. May match selectors of replication controllers
-                            and services.
-                            More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels
-                          type: object
-                        name:
-                          description: |-
-                            Name must be unique within a namespace. Is required when creating resources, although
-                            some resources may allow a client to request the generation of an appropriate name
-                            automatically. Name is primarily intended for creation idempotence and configuration
-                            definition.
-                            Cannot be updated.
-                            More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names#names
-                          type: string
-                      type: object
-                  type: object
-                options:
-                  additionalProperties:
-                    type: string
-                  description: Options are the extra arguments to pass to the etcd container.
-                  example:
-                    debug: "true"
-                    enable-v2: "false"
-                  type: object
-                podDisruptionBudgetTemplate:
-                  description: PodDisruptionBudgetTemplate describes PDB resource to create for etcd cluster members. Nil to disable.
-                  properties:
-                    metadata:
-                      description: EmbeddedMetadata contains metadata relevant to an EmbeddedResource.
-                      properties:
-                        annotations:
-                          additionalProperties:
-                            type: string
-                          description: |-
-                            Annotations is an unstructured key value map stored with a resource that may be
-                            set by external tools to store and retrieve arbitrary metadata. They are not
-                            queryable and should be preserved when modifying objects.
-                            More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations
-                          type: object
-                        labels:
-                          additionalProperties:
-                            type: string
-                          description: |-
-                            Labels Map of string keys and values that can be used to organize and categorize
-                            (scope and select) objects. May match selectors of replication controllers
-                            and services.
-                            More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels
-                          type: object
-                        name:
-                          description: |-
-                            Name must be unique within a namespace. Is required when creating resources, although
-                            some resources may allow a client to request the generation of an appropriate name
-                            automatically. Name is primarily intended for creation idempotence and configuration
-                            definition.
-                            Cannot be updated.
-                            More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names#names
-                          type: string
-                      type: object
-                    spec:
-                      description: |-
-                        Spec defines the desired characteristics of a PDB.
-                        More info: https://kubernetes.io/docs/concepts/workloads/pods/disruptions/#pod-disruption-budgets
-                      properties:
-                        maxUnavailable:
-                          anyOf:
-                            - type: integer
-                            - type: string
-                          description: |-
-                            MinAvailable describes maximum not ready replicas. If both are empty, controller will implicitly
-                            calculate MaxUnavailable based on number of replicas
-                            Mutually exclusive with MinAvailable
-                          x-kubernetes-int-or-string: true
-                        minAvailable:
-                          anyOf:
-                            - type: integer
-                            - type: string
-                          description: |-
-                            MinAvailable describes minimum ready replicas. If both are empty, controller will implicitly
-                            calculate MaxUnavailable based on number of replicas
-                            Mutually exclusive with MaxUnavailable.
-                          x-kubernetes-int-or-string: true
-                      type: object
-                  type: object
-                podTemplate:
-                  description: PodTemplate defines the desired state of PodSpec for etcd members. If not specified, default values will be used.
-                  properties:
-                    metadata:
-                      description: EmbeddedObjectMetadata contains metadata relevant to an EmbeddedResource
-                      properties:
-                        annotations:
-                          additionalProperties:
-                            type: string
-                          description: |-
-                            Annotations is an unstructured key value map stored with a resource that may be
-                            set by external tools to store and retrieve arbitrary metadata. They are not
-                            queryable and should be preserved when modifying objects.
-                            More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations
-                          type: object
-                        labels:
-                          additionalProperties:
-                            type: string
-                          description: |-
-                            Labels Map of string keys and values that can be used to organize and categorize
-                            (scope and select) objects. May match selectors of replication controllers
-                            and services.
-                            More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels
-                          type: object
-                        name:
-                          description: |-
-                            Name must be unique within a namespace. Is required when creating resources, although
-                            some resources may allow a client to request the generation of an appropriate name
-                            automatically. Name is primarily intended for creation idempotence and configuration
-                            definition.
-                            Cannot be updated.
-                            More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names#names
-                          type: string
-                      type: object
-                    spec:
-                      description: Spec follows the structure of a regular Pod spec. Overrides defined here will be strategically merged with the default pod spec, generated by the operator.
-                      properties: {}
-                      required:
-                        - containers
-                      type: object
-                      x-kubernetes-preserve-unknown-fields: true
-                  type: object
-                replicas:
-                  default: 3
-                  description: Replicas is the count of etcd instances in cluster.
-                  format: int32
-                  minimum: 0
-                  type: integer
-                security:
-                  description: Security describes security settings of etcd (authentication, certificates, rbac)
-                  properties:
-                    enableAuth:
-                      description: Section to enable etcd auth
-                      type: boolean
-                    tls:
-                      description: Section for user-managed tls certificates
-                      properties:
-                        clientSecret:
-                          description: |-
-                            Client certificate for etcd-operator to do maintenance. It is expected to have tls.crt and tls.key fields in the secret.
-                            This secret must be created in the namespace with etcdCluster CR.
-                          type: string
-                        clientTrustedCASecret:
-                          description: |-
-                            Trusted CA for client certificates that are provided by client to etcd. It is expected to have ca.crt field in the secret.
-                            This secret must be created in the namespace with etcdCluster CR.
-                          type: string
-                        peerSecret:
-                          description: |-
-                            Certificate secret to secure peer-to-peer communication between etcd nodes. It is expected to have tls.crt and tls.key fields in the secret.
-                            This secret must be created in the namespace with etcdCluster CR.
-                          type: string
-                        peerTrustedCASecret:
-                          description: |-
-                            Trusted CA certificate secret to secure peer-to-peer communication between etcd nodes. It is expected to have ca.crt field in the secret.
-                            This secret must be created in the namespace with etcdCluster CR.
-                          type: string
-                        serverSecret:
-                          description: |-
-                            Server certificate secret to secure client-server communication. Is provided to the client who connects to etcd by client port (2379 by default).
-                            It is expected to have tls.crt and tls.key fields in the secret.
-                            This secret must be created in the namespace with etcdCluster CR.
-                          type: string
-                        serverTrustedCASecret:
-                          description: |-
-                            Trusted CA for etcd server certificates for client-server communication. Is necessary to set trust between operator and etcd.
-                            It is expected to have ca.crt field in the secret. If it is not specified, then insecure communication will be used.
-                            This secret must be created in the namespace with etcdCluster CR.
-                          type: string
-                      type: object
-                  type: object
-                serviceTemplate:
-                  description: Service defines the desired state of Service for etcd members. If not specified, default values will be used.
-                  properties:
-                    metadata:
-                      description: EmbeddedMetadata contains metadata relevant to an EmbeddedResource.
-                      properties:
-                        annotations:
-                          additionalProperties:
-                            type: string
-                          description: |-
-                            Annotations is an unstructured key value map stored with a resource that may be
-                            set by external tools to store and retrieve arbitrary metadata. They are not
-                            queryable and should be preserved when modifying objects.
-                            More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations
-                          type: object
-                        labels:
-                          additionalProperties:
-                            type: string
-                          description: |-
-                            Labels Map of string keys and values that can be used to organize and categorize
-                            (scope and select) objects. May match selectors of replication controllers
-                            and services.
-                            More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels
-                          type: object
-                        name:
-                          description: |-
-                            Name must be unique within a namespace. Is required when creating resources, although
-                            some resources may allow a client to request the generation of an appropriate name
-                            automatically. Name is primarily intended for creation idempotence and configuration
-                            definition.
-                            Cannot be updated.
-                            More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names#names
-                          type: string
-                      type: object
-                    spec:
-                      description: Spec defines the behavior of the service.
-                      properties:
-                        allocateLoadBalancerNodePorts:
-                          description: |-
-                            allocateLoadBalancerNodePorts defines if NodePorts will be automatically
-                            allocated for services with type LoadBalancer.  Default is "true". It
-                            may be set to "false" if the cluster load-balancer does not rely on
-                            NodePorts.  If the caller requests specific NodePorts (by specifying a
-                            value), those requests will be respected, regardless of this field.
-                            This field may only be set for services with type LoadBalancer and will
-                            be cleared if the type is changed to any other type.
-                          type: boolean
-                        clusterIP:
-                          description: |-
-                            clusterIP is the IP address of the service and is usually assigned
-                            randomly. If an address is specified manually, is in-range (as per
-                            system configuration), and is not in use, it will be allocated to the
-                            service; otherwise creation of the service will fail. This field may not
-                            be changed through updates unless the type field is also being changed
-                            to ExternalName (which requires this field to be blank) or the type
-                            field is being changed from ExternalName (in which case this field may
-                            optionally be specified, as describe above).  Valid values are "None",
-                            empty string (""), or a valid IP address. Setting this to "None" makes a
-                            "headless service" (no virtual IP), which is useful when direct endpoint
-                            connections are preferred and proxying is not required.  Only applies to
-                            types ClusterIP, NodePort, and LoadBalancer. If this field is specified
-                            when creating a Service of type ExternalName, creation will fail. This
-                            field will be wiped when updating a Service to type ExternalName.
-                            More info: https://kubernetes.io/docs/concepts/services-networking/service/#virtual-ips-and-service-proxies
-                          type: string
-                        clusterIPs:
-                          description: |-
-                            ClusterIPs is a list of IP addresses assigned to this service, and are
-                            usually assigned randomly.  If an address is specified manually, is
-                            in-range (as per system configuration), and is not in use, it will be
-                            allocated to the service; otherwise creation of the service will fail.
-                            This field may not be changed through updates unless the type field is
-                            also being changed to ExternalName (which requires this field to be
-                            empty) or the type field is being changed from ExternalName (in which
-                            case this field may optionally be specified, as describe above).  Valid
-                            values are "None", empty string (""), or a valid IP address.  Setting
-                            this to "None" makes a "headless service" (no virtual IP), which is
-                            useful when direct endpoint connections are preferred and proxying is
-                            not required.  Only applies to types ClusterIP, NodePort, and
-                            LoadBalancer. If this field is specified when creating a Service of type
-                            ExternalName, creation will fail. This field will be wiped when updating
-                            a Service to type ExternalName.  If this field is not specified, it will
-                            be initialized from the clusterIP field.  If this field is specified,
-                            clients must ensure that clusterIPs[0] and clusterIP have the same
-                            value.
-
-                            This field may hold a maximum of two entries (dual-stack IPs, in either order).
-                            These IPs must correspond to the values of the ipFamilies field. Both
-                            clusterIPs and ipFamilies are governed by the ipFamilyPolicy field.
-                            More info: https://kubernetes.io/docs/concepts/services-networking/service/#virtual-ips-and-service-proxies
-                          items:
-                            type: string
-                          type: array
-                          x-kubernetes-list-type: atomic
-                        externalIPs:
-                          description: |-
-                            externalIPs is a list of IP addresses for which nodes in the cluster
-                            will also accept traffic for this service.  These IPs are not managed by
-                            Kubernetes.  The user is responsible for ensuring that traffic arrives
-                            at a node with this IP.  A common example is external load-balancers
-                            that are not part of the Kubernetes system.
-                          items:
-                            type: string
-                          type: array
-                          x-kubernetes-list-type: atomic
-                        externalName:
-                          description: |-
-                            externalName is the external reference that discovery mechanisms will
-                            return as an alias for this service (e.g. a DNS CNAME record). No
-                            proxying will be involved.  Must be a lowercase RFC-1123 hostname
-                            (https://tools.ietf.org/html/rfc1123) and requires `type` to be "ExternalName".
-                          type: string
-                        externalTrafficPolicy:
-                          description: |-
-                            externalTrafficPolicy describes how nodes distribute service traffic they
-                            receive on one of the Service's "externally-facing" addresses (NodePorts,
-                            ExternalIPs, and LoadBalancer IPs). If set to "Local", the proxy will configure
-                            the service in a way that assumes that external load balancers will take care
-                            of balancing the service traffic between nodes, and so each node will deliver
-                            traffic only to the node-local endpoints of the service, without masquerading
-                            the client source IP. (Traffic mistakenly sent to a node with no endpoints will
-                            be dropped.) The default value, "Cluster", uses the standard behavior of
-                            routing to all endpoints evenly (possibly modified by topology and other
-                            features). Note that traffic sent to an External IP or LoadBalancer IP from
-                            within the cluster will always get "Cluster" semantics, but clients sending to
-                            a NodePort from within the cluster may need to take traffic policy into account
-                            when picking a node.
-                          type: string
-                        healthCheckNodePort:
-                          description: |-
-                            healthCheckNodePort specifies the healthcheck nodePort for the service.
-                            This only applies when type is set to LoadBalancer and
-                            externalTrafficPolicy is set to Local. If a value is specified, is
-                            in-range, and is not in use, it will be used.  If not specified, a value
-                            will be automatically allocated.  External systems (e.g. load-balancers)
-                            can use this port to determine if a given node holds endpoints for this
-                            service or not.  If this field is specified when creating a Service
-                            which does not need it, creation will fail. This field will be wiped
-                            when updating a Service to no longer need it (e.g. changing type).
-                            This field cannot be updated once set.
-                          format: int32
-                          type: integer
-                        internalTrafficPolicy:
-                          description: |-
-                            InternalTrafficPolicy describes how nodes distribute service traffic they
-                            receive on the ClusterIP. If set to "Local", the proxy will assume that pods
-                            only want to talk to endpoints of the service on the same node as the pod,
-                            dropping the traffic if there are no local endpoints. The default value,
-                            "Cluster", uses the standard behavior of routing to all endpoints evenly
-                            (possibly modified by topology and other features).
-                          type: string
-                        ipFamilies:
-                          description: |-
-                            IPFamilies is a list of IP families (e.g. IPv4, IPv6) assigned to this
-                            service. This field is usually assigned automatically based on cluster
-                            configuration and the ipFamilyPolicy field. If this field is specified
-                            manually, the requested family is available in the cluster,
-                            and ipFamilyPolicy allows it, it will be used; otherwise creation of
-                            the service will fail. This field is conditionally mutable: it allows
-                            for adding or removing a secondary IP family, but it does not allow
-                            changing the primary IP family of the Service. Valid values are "IPv4"
-                            and "IPv6".  This field only applies to Services of types ClusterIP,
-                            NodePort, and LoadBalancer, and does apply to "headless" services.
-                            This field will be wiped when updating a Service to type ExternalName.
-
-                            This field may hold a maximum of two entries (dual-stack families, in
-                            either order).  These families must correspond to the values of the
-                            clusterIPs field, if specified. Both clusterIPs and ipFamilies are
-                            governed by the ipFamilyPolicy field.
-                          items:
-                            description: |-
-                              IPFamily represents the IP Family (IPv4 or IPv6). This type is used
-                              to express the family of an IP expressed by a type (e.g. service.spec.ipFamilies).
-                            type: string
-                          type: array
-                          x-kubernetes-list-type: atomic
-                        ipFamilyPolicy:
-                          description: |-
-                            IPFamilyPolicy represents the dual-stack-ness requested or required by
-                            this Service. If there is no value provided, then this field will be set
-                            to SingleStack. Services can be "SingleStack" (a single IP family),
-                            "PreferDualStack" (two IP families on dual-stack configured clusters or
-                            a single IP family on single-stack clusters), or "RequireDualStack"
-                            (two IP families on dual-stack configured clusters, otherwise fail). The
-                            ipFamilies and clusterIPs fields depend on the value of this field. This
-                            field will be wiped when updating a service to type ExternalName.
-                          type: string
-                        loadBalancerClass:
-                          description: |-
-                            loadBalancerClass is the class of the load balancer implementation this Service belongs to.
-                            If specified, the value of this field must be a label-style identifier, with an optional prefix,
-                            e.g. "internal-vip" or "example.com/internal-vip". Unprefixed names are reserved for end-users.
-                            This field can only be set when the Service type is 'LoadBalancer'. If not set, the default load
-                            balancer implementation is used, today this is typically done through the cloud provider integration,
-                            but should apply for any default implementation. If set, it is assumed that a load balancer
-                            implementation is watching for Services with a matching class. Any default load balancer
-                            implementation (e.g. cloud providers) should ignore Services that set this field.
-                            This field can only be set when creating or updating a Service to type 'LoadBalancer'.
-                            Once set, it can not be changed. This field will be wiped when a service is updated to a non 'LoadBalancer' type.
-                          type: string
-                        loadBalancerIP:
-                          description: |-
-                            Only applies to Service Type: LoadBalancer.
-                            This feature depends on whether the underlying cloud-provider supports specifying
-                            the loadBalancerIP when a load balancer is created.
-                            This field will be ignored if the cloud-provider does not support the feature.
-                            Deprecated: This field was under-specified and its meaning varies across implementations.
-                            Using it is non-portable and it may not support dual-stack.
-                            Users are encouraged to use implementation-specific annotations when available.
-                          type: string
-                        loadBalancerSourceRanges:
-                          description: |-
-                            If specified and supported by the platform, this will restrict traffic through the cloud-provider
-                            load-balancer will be restricted to the specified client IPs. This field will be ignored if the
-                            cloud-provider does not support the feature."
-                            More info: https://kubernetes.io/docs/tasks/access-application-cluster/create-external-load-balancer/
-                          items:
-                            type: string
-                          type: array
-                          x-kubernetes-list-type: atomic
-                        ports:
-                          description: |-
-                            The list of ports that are exposed by this service.
-                            More info: https://kubernetes.io/docs/concepts/services-networking/service/#virtual-ips-and-service-proxies
-                          items:
-                            description: ServicePort contains information on service's port.
-                            properties:
-                              appProtocol:
-                                description: |-
-                                  The application protocol for this port.
-                                  This is used as a hint for implementations to offer richer behavior for protocols that they understand.
-                                  This field follows standard Kubernetes label syntax.
-                                  Valid values are either:
-
-                                  * Un-prefixed protocol names - reserved for IANA standard service names (as per
-                                  RFC-6335 and https://www.iana.org/assignments/service-names).
-
-                                  * Kubernetes-defined prefixed names:
-                                    * 'kubernetes.io/h2c' - HTTP/2 prior knowledge over cleartext as described in https://www.rfc-editor.org/rfc/rfc9113.html#name-starting-http-2-with-prior-
-                                    * 'kubernetes.io/ws'  - WebSocket over cleartext as described in https://www.rfc-editor.org/rfc/rfc6455
-                                    * 'kubernetes.io/wss' - WebSocket over TLS as described in https://www.rfc-editor.org/rfc/rfc6455
-
-                                  * Other protocols should use implementation-defined prefixed names such as
-                                  mycompany.com/my-custom-protocol.
-                                type: string
-                              name:
-                                description: |-
-                                  The name of this port within the service. This must be a DNS_LABEL.
-                                  All ports within a ServiceSpec must have unique names. When considering
-                                  the endpoints for a Service, this must match the 'name' field in the
-                                  EndpointPort.
-                                  Optional if only one ServicePort is defined on this service.
-                                type: string
-                              nodePort:
-                                description: |-
-                                  The port on each node on which this service is exposed when type is
-                                  NodePort or LoadBalancer.  Usually assigned by the system. If a value is
-                                  specified, in-range, and not in use it will be used, otherwise the
-                                  operation will fail.  If not specified, a port will be allocated if this
-                                  Service requires one.  If this field is specified when creating a
-                                  Service which does not need it, creation will fail. This field will be
-                                  wiped when updating a Service to no longer need it (e.g. changing type
-                                  from NodePort to ClusterIP).
-                                  More info: https://kubernetes.io/docs/concepts/services-networking/service/#type-nodeport
-                                format: int32
-                                type: integer
-                              port:
-                                description: The port that will be exposed by this service.
-                                format: int32
-                                type: integer
-                              protocol:
-                                default: TCP
-                                description: |-
-                                  The IP protocol for this port. Supports "TCP", "UDP", and "SCTP".
-                                  Default is TCP.
-                                type: string
-                              targetPort:
-                                anyOf:
-                                  - type: integer
-                                  - type: string
-                                description: |-
-                                  Number or name of the port to access on the pods targeted by the service.
-                                  Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME.
-                                  If this is a string, it will be looked up as a named port in the
-                                  target Pod's container ports. If this is not specified, the value
-                                  of the 'port' field is used (an identity map).
-                                  This field is ignored for services with clusterIP=None, and should be
-                                  omitted or set equal to the 'port' field.
-                                  More info: https://kubernetes.io/docs/concepts/services-networking/service/#defining-a-service
-                                x-kubernetes-int-or-string: true
-                            required:
-                              - port
-                            type: object
-                          type: array
-                          x-kubernetes-list-map-keys:
-                            - port
-                            - protocol
-                          x-kubernetes-list-type: map
-                        publishNotReadyAddresses:
-                          description: |-
-                            publishNotReadyAddresses indicates that any agent which deals with endpoints for this
-                            Service should disregard any indications of ready/not-ready.
-                            The primary use case for setting this field is for a StatefulSet's Headless Service to
-                            propagate SRV DNS records for its Pods for the purpose of peer discovery.
-                            The Kubernetes controllers that generate Endpoints and EndpointSlice resources for
-                            Services interpret this to mean that all endpoints are considered "ready" even if the
-                            Pods themselves are not. Agents which consume only Kubernetes generated endpoints
-                            through the Endpoints or EndpointSlice resources can safely assume this behavior.
-                          type: boolean
-                        selector:
-                          additionalProperties:
-                            type: string
-                          description: |-
-                            Route service traffic to pods with label keys and values matching this
-                            selector. If empty or not present, the service is assumed to have an
-                            external process managing its endpoints, which Kubernetes will not
-                            modify. Only applies to types ClusterIP, NodePort, and LoadBalancer.
-                            Ignored if type is ExternalName.
-                            More info: https://kubernetes.io/docs/concepts/services-networking/service/
-                          type: object
-                          x-kubernetes-map-type: atomic
-                        sessionAffinity:
-                          description: |-
-                            Supports "ClientIP" and "None". Used to maintain session affinity.
-                            Enable client IP based session affinity.
-                            Must be ClientIP or None.
-                            Defaults to None.
-                            More info: https://kubernetes.io/docs/concepts/services-networking/service/#virtual-ips-and-service-proxies
-                          type: string
-                        sessionAffinityConfig:
-                          description: sessionAffinityConfig contains the configurations of session affinity.
-                          properties:
-                            clientIP:
-                              description: clientIP contains the configurations of Client IP based session affinity.
-                              properties:
-                                timeoutSeconds:
-                                  description: |-
-                                    timeoutSeconds specifies the seconds of ClientIP type session sticky time.
-                                    The value must be >0 && <=86400(for 1 day) if ServiceAffinity == "ClientIP".
-                                    Default value is 10800(for 3 hours).
-                                  format: int32
-                                  type: integer
-                              type: object
-                          type: object
-                        trafficDistribution:
-                          description: |-
-                            TrafficDistribution offers a way to express preferences for how traffic is
-                            distributed to Service endpoints. Implementations can use this field as a
-                            hint, but are not required to guarantee strict adherence. If the field is
-                            not set, the implementation will apply its default routing strategy. If set
-                            to "PreferClose", implementations should prioritize endpoints that are
-                            topologically close (e.g., same zone).
-                            This is an alpha field and requires enabling ServiceTrafficDistribution feature.
-                          type: string
-                        type:
-                          description: |-
-                            type determines how the Service is exposed. Defaults to ClusterIP. Valid
-                            options are ExternalName, ClusterIP, NodePort, and LoadBalancer.
-                            "ClusterIP" allocates a cluster-internal IP address for load-balancing
-                            to endpoints. Endpoints are determined by the selector or if that is not
-                            specified, by manual construction of an Endpoints object or
-                            EndpointSlice objects. If clusterIP is "None", no virtual IP is
-                            allocated and the endpoints are published as a set of endpoints rather
-                            than a virtual IP.
-                            "NodePort" builds on ClusterIP and allocates a port on every node which
-                            routes to the same endpoints as the clusterIP.
-                            "LoadBalancer" builds on NodePort and creates an external load-balancer
-                            (if supported in the current cloud) which routes to the same endpoints
-                            as the clusterIP.
-                            "ExternalName" aliases this service to the specified externalName.
-                            Several other fields do not apply to ExternalName services.
-                            More info: https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types
-                          type: string
-                      type: object
-                  type: object
-                storage:
-                  description: |-
-                    StorageSpec defines the configured storage for a etcd members.
-                    If neither `emptyDir` nor `volumeClaimTemplate` is specified, then by default an [EmptyDir](https://kubernetes.io/docs/concepts/storage/volumes/#emptydir) will be used.
-                  properties:
-                    emptyDir:
-                      description: |-
-                        EmptyDirVolumeSource to be used by the StatefulSets. If specified, used in place of any volumeClaimTemplate. More
-                        info: https://kubernetes.io/docs/concepts/storage/volumes/#emptydir
-                      properties:
-                        medium:
-                          description: |-
-                            medium represents what type of storage medium should back this directory.
-                            The default is "" which means to use the node's default medium.
-                            Must be an empty string (default) or Memory.
-                            More info: https://kubernetes.io/docs/concepts/storage/volumes#emptydir
-                          type: string
-                        sizeLimit:
-                          anyOf:
-                            - type: integer
-                            - type: string
-                          description: |-
-                            sizeLimit is the total amount of local storage required for this EmptyDir volume.
-                            The size limit is also applicable for memory medium.
-                            The maximum usage on memory medium EmptyDir would be the minimum value between
-                            the SizeLimit specified here and the sum of memory limits of all containers in a pod.
-                            The default is nil which means that the limit is undefined.
-                            More info: https://kubernetes.io/docs/concepts/storage/volumes#emptydir
-                          pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
-                          x-kubernetes-int-or-string: true
-                      type: object
-                    volumeClaimTemplate:
-                      description: A PVC spec to be used by the StatefulSets.
-                      properties:
-                        apiVersion:
-                          description: |-
-                            APIVersion defines the versioned schema of this representation of an object.
-                            Servers should convert recognized schemas to the latest internal value, and
-                            may reject unrecognized values.
-                            More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
-                          type: string
-                        kind:
-                          description: |-
-                            Kind is a string value representing the REST resource this object represents.
-                            Servers may infer this from the endpoint the client submits requests to.
-                            Cannot be updated.
-                            In CamelCase.
-                            More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
-                          type: string
-                        metadata:
-                          description: EmbeddedMetadata contains metadata relevant to an EmbeddedResource.
-                          properties:
-                            annotations:
-                              additionalProperties:
-                                type: string
-                              description: |-
-                                Annotations is an unstructured key value map stored with a resource that may be
-                                set by external tools to store and retrieve arbitrary metadata. They are not
-                                queryable and should be preserved when modifying objects.
-                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations
-                              type: object
-                            labels:
-                              additionalProperties:
-                                type: string
-                              description: |-
-                                Labels Map of string keys and values that can be used to organize and categorize
-                                (scope and select) objects. May match selectors of replication controllers
-                                and services.
-                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels
-                              type: object
-                            name:
-                              description: |-
-                                Name must be unique within a namespace. Is required when creating resources, although
-                                some resources may allow a client to request the generation of an appropriate name
-                                automatically. Name is primarily intended for creation idempotence and configuration
-                                definition.
-                                Cannot be updated.
-                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names#names
-                              type: string
-                          type: object
-                        spec:
-                          description: |-
-                            Spec defines the desired characteristics of a volume requested by a pod author.
-                            More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#persistentvolumeclaims
-                          properties:
-                            accessModes:
-                              description: |-
-                                accessModes contains the desired access modes the volume should have.
-                                More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#access-modes-1
-                              items:
-                                type: string
-                              type: array
-                              x-kubernetes-list-type: atomic
-                            dataSource:
-                              description: |-
-                                dataSource field can be used to specify either:
-                                * An existing VolumeSnapshot object (snapshot.storage.k8s.io/VolumeSnapshot)
-                                * An existing PVC (PersistentVolumeClaim)
-                                If the provisioner or an external controller can support the specified data source,
-                                it will create a new volume based on the contents of the specified data source.
-                                When the AnyVolumeDataSource feature gate is enabled, dataSource contents will be copied to dataSourceRef,
-                                and dataSourceRef contents will be copied to dataSource when dataSourceRef.namespace is not specified.
-                                If the namespace is specified, then dataSourceRef will not be copied to dataSource.
-                              properties:
-                                apiGroup:
-                                  description: |-
-                                    APIGroup is the group for the resource being referenced.
-                                    If APIGroup is not specified, the specified Kind must be in the core API group.
-                                    For any other third-party types, APIGroup is required.
-                                  type: string
-                                kind:
-                                  description: Kind is the type of resource being referenced
-                                  type: string
-                                name:
-                                  description: Name is the name of resource being referenced
-                                  type: string
-                              required:
-                                - kind
-                                - name
-                              type: object
-                              x-kubernetes-map-type: atomic
-                            dataSourceRef:
-                              description: |-
-                                dataSourceRef specifies the object from which to populate the volume with data, if a non-empty
-                                volume is desired. This may be any object from a non-empty API group (non
-                                core object) or a PersistentVolumeClaim object.
-                                When this field is specified, volume binding will only succeed if the type of
-                                the specified object matches some installed volume populator or dynamic
-                                provisioner.
-                                This field will replace the functionality of the dataSource field and as such
-                                if both fields are non-empty, they must have the same value. For backwards
-                                compatibility, when namespace isn't specified in dataSourceRef,
-                                both fields (dataSource and dataSourceRef) will be set to the same
-                                value automatically if one of them is empty and the other is non-empty.
-                                When namespace is specified in dataSourceRef,
-                                dataSource isn't set to the same value and must be empty.
-                                There are three important differences between dataSource and dataSourceRef:
-                                * While dataSource only allows two specific types of objects, dataSourceRef
-                                  allows any non-core object, as well as PersistentVolumeClaim objects.
-                                * While dataSource ignores disallowed values (dropping them), dataSourceRef
-                                  preserves all values, and generates an error if a disallowed value is
-                                  specified.
-                                * While dataSource only allows local objects, dataSourceRef allows objects
-                                  in any namespaces.
-                                (Beta) Using this field requires the AnyVolumeDataSource feature gate to be enabled.
-                                (Alpha) Using the namespace field of dataSourceRef requires the CrossNamespaceVolumeDataSource feature gate to be enabled.
-                              properties:
-                                apiGroup:
-                                  description: |-
-                                    APIGroup is the group for the resource being referenced.
-                                    If APIGroup is not specified, the specified Kind must be in the core API group.
-                                    For any other third-party types, APIGroup is required.
-                                  type: string
-                                kind:
-                                  description: Kind is the type of resource being referenced
-                                  type: string
-                                name:
-                                  description: Name is the name of resource being referenced
-                                  type: string
-                                namespace:
-                                  description: |-
-                                    Namespace is the namespace of resource being referenced
-                                    Note that when a namespace is specified, a gateway.networking.k8s.io/ReferenceGrant object is required in the referent namespace to allow that namespace's owner to accept the reference. See the ReferenceGrant documentation for details.
-                                    (Alpha) This field requires the CrossNamespaceVolumeDataSource feature gate to be enabled.
-                                  type: string
-                              required:
-                                - kind
-                                - name
-                              type: object
-                            resources:
-                              description: |-
-                                resources represents the minimum resources the volume should have.
-                                If RecoverVolumeExpansionFailure feature is enabled users are allowed to specify resource requirements
-                                that are lower than previous value but must still be higher than capacity recorded in the
-                                status field of the claim.
-                                More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources
-                              properties:
-                                limits:
-                                  additionalProperties:
-                                    anyOf:
-                                      - type: integer
-                                      - type: string
-                                    pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
-                                    x-kubernetes-int-or-string: true
-                                  description: |-
-                                    Limits describes the maximum amount of compute resources allowed.
-                                    More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
-                                  type: object
-                                requests:
-                                  additionalProperties:
-                                    anyOf:
-                                      - type: integer
-                                      - type: string
-                                    pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
-                                    x-kubernetes-int-or-string: true
-                                  description: |-
-                                    Requests describes the minimum amount of compute resources required.
-                                    If Requests is omitted for a container, it defaults to Limits if that is explicitly specified,
-                                    otherwise to an implementation-defined value. Requests cannot exceed Limits.
-                                    More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
-                                  type: object
-                              type: object
-                            selector:
-                              description: selector is a label query over volumes to consider for binding.
-                              properties:
-                                matchExpressions:
-                                  description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
-                                  items:
-                                    description: |-
-                                      A label selector requirement is a selector that contains values, a key, and an operator that
-                                      relates the key and values.
-                                    properties:
-                                      key:
-                                        description: key is the label key that the selector applies to.
-                                        type: string
-                                      operator:
-                                        description: |-
-                                          operator represents a key's relationship to a set of values.
-                                          Valid operators are In, NotIn, Exists and DoesNotExist.
-                                        type: string
-                                      values:
-                                        description: |-
-                                          values is an array of string values. If the operator is In or NotIn,
-                                          the values array must be non-empty. If the operator is Exists or DoesNotExist,
-                                          the values array must be empty. This array is replaced during a strategic
-                                          merge patch.
-                                        items:
-                                          type: string
-                                        type: array
-                                        x-kubernetes-list-type: atomic
-                                    required:
-                                      - key
-                                      - operator
-                                    type: object
-                                  type: array
-                                  x-kubernetes-list-type: atomic
-                                matchLabels:
-                                  additionalProperties:
-                                    type: string
-                                  description: |-
-                                    matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
-                                    map is equivalent to an element of matchExpressions, whose key field is "key", the
-                                    operator is "In", and the values array contains only "value". The requirements are ANDed.
-                                  type: object
-                              type: object
-                              x-kubernetes-map-type: atomic
-                            storageClassName:
-                              description: |-
-                                storageClassName is the name of the StorageClass required by the claim.
-                                More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#class-1
-                              type: string
-                            volumeAttributesClassName:
-                              description: |-
-                                volumeAttributesClassName may be used to set the VolumeAttributesClass used by this claim.
-                                If specified, the CSI driver will create or update the volume with the attributes defined
-                                in the corresponding VolumeAttributesClass. This has a different purpose than storageClassName,
-                                it can be changed after the claim is created. An empty string value means that no VolumeAttributesClass
-                                will be applied to the claim but it's not allowed to reset this field to empty string once it is set.
-                                If unspecified and the PersistentVolumeClaim is unbound, the default VolumeAttributesClass
-                                will be set by the persistentvolume controller if it exists.
-                                If the resource referred to by volumeAttributesClass does not exist, this PersistentVolumeClaim will be
-                                set to a Pending state, as reflected by the modifyVolumeStatus field, until such as a resource
-                                exists.
-                                More info: https://kubernetes.io/docs/concepts/storage/volume-attributes-classes/
-                                (Alpha) Using this field requires the VolumeAttributesClass feature gate to be enabled.
-                              type: string
-                            volumeMode:
-                              description: |-
-                                volumeMode defines what type of volume is required by the claim.
-                                Value of Filesystem is implied when not included in claim spec.
-                              type: string
-                            volumeName:
-                              description: volumeName is the binding reference to the PersistentVolume backing this claim.
-                              type: string
-                          type: object
-                        status:
-                          description: |-
-                            Status represents the current information/status of a persistent volume claim.
-                            Read-only.
-                            More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#persistentvolumeclaims
-                          properties:
-                            accessModes:
-                              description: |-
-                                accessModes contains the actual access modes the volume backing the PVC has.
-                                More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#access-modes-1
-                              items:
-                                type: string
-                              type: array
-                              x-kubernetes-list-type: atomic
-                            allocatedResourceStatuses:
-                              additionalProperties:
-                                description: |-
-                                  When a controller receives persistentvolume claim update with ClaimResourceStatus for a resource
-                                  that it does not recognizes, then it should ignore that update and let other controllers
-                                  handle it.
-                                type: string
-                              description: "allocatedResourceStatuses stores status of resource being resized for the given PVC.\nKey names follow standard Kubernetes label syntax. Valid values are either:\n\t* Un-prefixed keys:\n\t\t- storage - the capacity of the volume.\n\t* Custom resources must use implementation-defined prefixed names such as \"example.com/my-custom-resource\"\nApart from above values - keys that are unprefixed or have kubernetes.io prefix are considered\nreserved and hence may not be used.\n\nClaimResourceStatus can be in any of following states:\n\t- ControllerResizeInProgress:\n\t\tState set when resize controller starts resizing the volume in control-plane.\n\t- ControllerResizeFailed:\n\t\tState set when resize has failed in resize controller with a terminal error.\n\t- NodeResizePending:\n\t\tState set when resize controller has finished resizing the volume but further resizing of\n\t\tvolume is needed on the node.\n\t- NodeResizeInProgress:\n\t\tState set when kubelet starts resizing the volume.\n\t- NodeResizeFailed:\n\t\tState set when resizing has failed in kubelet with a terminal error. Transient errors don't set\n\t\tNodeResizeFailed.\nFor example: if expanding a PVC for more capacity - this field can be one of the following states:\n\t- pvc.status.allocatedResourceStatus['storage'] = \"ControllerResizeInProgress\"\n     - pvc.status.allocatedResourceStatus['storage'] = \"ControllerResizeFailed\"\n     - pvc.status.allocatedResourceStatus['storage'] = \"NodeResizePending\"\n     - pvc.status.allocatedResourceStatus['storage'] = \"NodeResizeInProgress\"\n     - pvc.status.allocatedResourceStatus['storage'] = \"NodeResizeFailed\"\nWhen this field is not set, it means that no resize operation is in progress for the given PVC.\n\nA controller that receives PVC update with previously unknown resourceName or ClaimResourceStatus\nshould ignore the update for the purpose it was designed. For example - a controller that\nonly is responsible for resizing capacity of the volume, should ignore PVC updates that change other valid\nresources associated with PVC.\n\nThis is an alpha field and requires enabling RecoverVolumeExpansionFailure feature."
-                              type: object
-                              x-kubernetes-map-type: granular
-                            allocatedResources:
-                              additionalProperties:
-                                anyOf:
-                                  - type: integer
-                                  - type: string
-                                pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
-                                x-kubernetes-int-or-string: true
-                              description: "allocatedResources tracks the resources allocated to a PVC including its capacity.\nKey names follow standard Kubernetes label syntax. Valid values are either:\n\t* Un-prefixed keys:\n\t\t- storage - the capacity of the volume.\n\t* Custom resources must use implementation-defined prefixed names such as \"example.com/my-custom-resource\"\nApart from above values - keys that are unprefixed or have kubernetes.io prefix are considered\nreserved and hence may not be used.\n\nCapacity reported here may be larger than the actual capacity when a volume expansion operation\nis requested.\nFor storage quota, the larger value from allocatedResources and PVC.spec.resources is used.\nIf allocatedResources is not set, PVC.spec.resources alone is used for quota calculation.\nIf a volume expansion capacity request is lowered, allocatedResources is only\nlowered if there are no expansion operations in progress and if the actual volume capacity\nis equal or lower than the requested capacity.\n\nA controller that receives PVC update with previously unknown resourceName\nshould ignore the update for the purpose it was designed. For example - a controller that\nonly is responsible for resizing capacity of the volume, should ignore PVC updates that change other valid\nresources associated with PVC.\n\nThis is an alpha field and requires enabling RecoverVolumeExpansionFailure feature."
-                              type: object
-                            capacity:
-                              additionalProperties:
-                                anyOf:
-                                  - type: integer
-                                  - type: string
-                                pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
-                                x-kubernetes-int-or-string: true
-                              description: capacity represents the actual resources of the underlying volume.
-                              type: object
-                            conditions:
-                              description: |-
-                                conditions is the current Condition of persistent volume claim. If underlying persistent volume is being
-                                resized then the Condition will be set to 'Resizing'.
-                              items:
-                                description: PersistentVolumeClaimCondition contains details about state of pvc
-                                properties:
-                                  lastProbeTime:
-                                    description: lastProbeTime is the time we probed the condition.
-                                    format: date-time
-                                    type: string
-                                  lastTransitionTime:
-                                    description: lastTransitionTime is the time the condition transitioned from one status to another.
-                                    format: date-time
-                                    type: string
-                                  message:
-                                    description: message is the human-readable message indicating details about last transition.
-                                    type: string
-                                  reason:
-                                    description: |-
-                                      reason is a unique, this should be a short, machine understandable string that gives the reason
-                                      for condition's last transition. If it reports "Resizing" that means the underlying
-                                      persistent volume is being resized.
-                                    type: string
-                                  status:
-                                    type: string
-                                  type:
-                                    description: PersistentVolumeClaimConditionType is a valid value of PersistentVolumeClaimCondition.Type
-                                    type: string
-                                required:
-                                  - status
-                                  - type
-                                type: object
-                              type: array
-                              x-kubernetes-list-map-keys:
-                                - type
-                              x-kubernetes-list-type: map
-                            currentVolumeAttributesClassName:
-                              description: |-
-                                currentVolumeAttributesClassName is the current name of the VolumeAttributesClass the PVC is using.
-                                When unset, there is no VolumeAttributeClass applied to this PersistentVolumeClaim
-                                This is an alpha field and requires enabling VolumeAttributesClass feature.
-                              type: string
-                            modifyVolumeStatus:
-                              description: |-
-                                ModifyVolumeStatus represents the status object of ControllerModifyVolume operation.
-                                When this is unset, there is no ModifyVolume operation being attempted.
-                                This is an alpha field and requires enabling VolumeAttributesClass feature.
-                              properties:
-                                status:
-                                  description: "status is the status of the ControllerModifyVolume operation. It can be in any of following states:\n - Pending\n   Pending indicates that the PersistentVolumeClaim cannot be modified due to unmet requirements, such as\n   the specified VolumeAttributesClass not existing.\n - InProgress\n   InProgress indicates that the volume is being modified.\n - Infeasible\n  Infeasible indicates that the request has been rejected as invalid by the CSI driver. To\n\t  resolve the error, a valid VolumeAttributesClass needs to be specified.\nNote: New statuses can be added in the future. Consumers should check for unknown statuses and fail appropriately."
-                                  type: string
-                                targetVolumeAttributesClassName:
-                                  description: targetVolumeAttributesClassName is the name of the VolumeAttributesClass the PVC currently being reconciled
-                                  type: string
-                              required:
-                                - status
-                              type: object
-                            phase:
-                              description: phase represents the current phase of PersistentVolumeClaim.
-                              type: string
-                          type: object
-                      type: object
-                  type: object
-              required:
-                - storage
-              type: object
-            status:
-              description: EtcdClusterStatus defines the observed state of EtcdCluster
-              properties:
-                conditions:
-                  items:
-                    description: Condition contains details for one aspect of the current state of this API Resource.
-                    properties:
-                      lastTransitionTime:
-                        description: |-
-                          lastTransitionTime is the last time the condition transitioned from one status to another.
-                          This should be when the underlying condition changed.  If that is not known, then using the time when the API field changed is acceptable.
-                        format: date-time
-                        type: string
-                      message:
-                        description: |-
-                          message is a human readable message indicating details about the transition.
-                          This may be an empty string.
-                        maxLength: 32768
-                        type: string
-                      observedGeneration:
-                        description: |-
-                          observedGeneration represents the .metadata.generation that the condition was set based upon.
-                          For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date
-                          with respect to the current state of the instance.
-                        format: int64
-                        minimum: 0
-                        type: integer
-                      reason:
-                        description: |-
-                          reason contains a programmatic identifier indicating the reason for the condition's last transition.
-                          Producers of specific condition types may define expected values and meanings for this field,
-                          and whether the values are considered a guaranteed API.
-                          The value should be a CamelCase string.
-                          This field may not be empty.
-                        maxLength: 1024
-                        minLength: 1
-                        pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
-                        type: string
-                      status:
-                        description: status of the condition, one of True, False, Unknown.
-                        enum:
-                          - "True"
-                          - "False"
-                          - Unknown
-                        type: string
-                      type:
-                        description: type of condition in CamelCase or in foo.example.com/CamelCase.
-                        maxLength: 316
-                        pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
-                        type: string
-                    required:
-                      - lastTransitionTime
-                      - message
-                      - reason
-                      - status
-                      - type
-                    type: object
-                  type: array
-              type: object
-          type: object
-      served: true
-      storage: true
-      subresources:
-        status: {}
diff --git a/packages/system/etcd-operator/charts/etcd-operator/templates/_helpers.tpl b/packages/system/etcd-operator/charts/etcd-operator/templates/_helpers.tpl
deleted file mode 100644
index 1ada979fef..0000000000
--- a/packages/system/etcd-operator/charts/etcd-operator/templates/_helpers.tpl
+++ /dev/null
@@ -1,51 +0,0 @@
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "etcd-operator.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
-{{- end }}
-
-{{/*
-Create a default fully qualified app name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-If release name contains chart name it will be used as a full name.
-*/}}
-{{- define "etcd-operator.fullname" -}}
-{{- if .Values.fullnameOverride }}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
-{{- else }}
-{{- $name := default .Chart.Name .Values.nameOverride }}
-{{- if contains $name .Release.Name }}
-{{- .Release.Name | trunc 63 | trimSuffix "-" }}
-{{- else }}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
-{{- end }}
-{{- end }}
-{{- end }}
-
-{{/*
-Create chart name and version as used by the chart label.
-*/}}
-{{- define "etcd-operator.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
-{{- end }}
-
-{{/*
-Common labels
-*/}}
-{{- define "etcd-operator.labels" -}}
-helm.sh/chart: {{ include "etcd-operator.chart" . }}
-{{ include "etcd-operator.selectorLabels" . }}
-{{- if .Chart.AppVersion }}
-app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
-{{- end }}
-app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- end }}
-
-{{/*
-Selector labels
-*/}}
-{{- define "etcd-operator.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "etcd-operator.name" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
-{{- end }}
diff --git a/packages/system/etcd-operator/charts/etcd-operator/templates/cert-manager/certificate.yml b/packages/system/etcd-operator/charts/etcd-operator/templates/cert-manager/certificate.yml
deleted file mode 100644
index 5a11896613..0000000000
--- a/packages/system/etcd-operator/charts/etcd-operator/templates/cert-manager/certificate.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-apiVersion: cert-manager.io/v1
-kind: Certificate
-metadata:
-  labels:
-    {{- include "etcd-operator.labels" . | nindent 4 }}
-  name: {{ include "etcd-operator.fullname" . }}-serving-cert
-spec:
-  dnsNames:
-    - {{ include "etcd-operator.fullname" . }}-webhook-service.{{ .Release.Namespace }}.svc
-    - {{ include "etcd-operator.fullname" . }}-webhook-service.{{ .Release.Namespace }}.svc.{{ .Values.kubernetesClusterDomain }}
-  issuerRef:
-    kind: Issuer
-    name: {{ include "etcd-operator.fullname" . }}-selfsigned-issuer
-  secretName: webhook-server-cert
diff --git a/packages/system/etcd-operator/charts/etcd-operator/templates/cert-manager/issuer.yml b/packages/system/etcd-operator/charts/etcd-operator/templates/cert-manager/issuer.yml
deleted file mode 100644
index 35ae83584f..0000000000
--- a/packages/system/etcd-operator/charts/etcd-operator/templates/cert-manager/issuer.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-apiVersion: cert-manager.io/v1
-kind: Issuer
-metadata:
-  labels:
-    {{- include "etcd-operator.labels" . | nindent 4 }}
-  name: {{ include "etcd-operator.fullname" . }}-selfsigned-issuer
-spec:
-  selfSigned: {}
diff --git a/packages/system/etcd-operator/charts/etcd-operator/templates/cert-manager/mutatingwebhookconfiguration.yml b/packages/system/etcd-operator/charts/etcd-operator/templates/cert-manager/mutatingwebhookconfiguration.yml
deleted file mode 100644
index 350c3c3ba0..0000000000
--- a/packages/system/etcd-operator/charts/etcd-operator/templates/cert-manager/mutatingwebhookconfiguration.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-apiVersion: admissionregistration.k8s.io/v1
-kind: MutatingWebhookConfiguration
-metadata:
-  annotations:
-    cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ include "etcd-operator.fullname" . }}-serving-cert
-  labels:
-    {{- include "etcd-operator.labels" . | nindent 4 }}
-  name: {{ include "etcd-operator.fullname" . }}-mutating-webhook-configuration
-webhooks:
-  - admissionReviewVersions:
-      - v1
-    clientConfig:
-      service:
-        name: {{ include "etcd-operator.fullname" . }}-webhook-service
-        namespace: {{ .Release.Namespace }}
-        path: /mutate-etcd-aenix-io-v1alpha1-etcdcluster
-    failurePolicy: Fail
-    name: metcdcluster.kb.io
-    rules:
-      - apiGroups:
-          - etcd.aenix.io
-        apiVersions:
-          - v1alpha1
-        operations:
-          - CREATE
-          - UPDATE
-        resources:
-          - etcdclusters
-    sideEffects: None
diff --git a/packages/system/etcd-operator/charts/etcd-operator/templates/cert-manager/validatingwebhookconfiguration.yml b/packages/system/etcd-operator/charts/etcd-operator/templates/cert-manager/validatingwebhookconfiguration.yml
deleted file mode 100644
index 4ba1bb6791..0000000000
--- a/packages/system/etcd-operator/charts/etcd-operator/templates/cert-manager/validatingwebhookconfiguration.yml
+++ /dev/null
@@ -1,69 +0,0 @@
-apiVersion: admissionregistration.k8s.io/v1
-kind: ValidatingWebhookConfiguration
-metadata:
-  annotations:
-    cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ include "etcd-operator.fullname" . }}-serving-cert
-  labels:
-    {{- include "etcd-operator.labels" . | nindent 4 }}
-  name: {{ include "etcd-operator.fullname" . }}-validating-webhook-configuration
-webhooks:
-  - admissionReviewVersions:
-      - v1
-    clientConfig:
-      service:
-        name: {{ include "etcd-operator.fullname" . }}-webhook-service
-        namespace: {{ .Release.Namespace }}
-        path: /validate-etcd-aenix-io-v1alpha1-etcdbackup
-    failurePolicy: Fail
-    name: vetcdbackup.kb.io
-    rules:
-      - apiGroups:
-          - etcd.aenix.io
-        apiVersions:
-          - v1alpha1
-        operations:
-          - CREATE
-          - UPDATE
-        resources:
-          - etcdbackups
-    sideEffects: None
-  - admissionReviewVersions:
-      - v1
-    clientConfig:
-      service:
-        name: {{ include "etcd-operator.fullname" . }}-webhook-service
-        namespace: {{ .Release.Namespace }}
-        path: /validate-etcd-aenix-io-v1alpha1-etcdbackupschedule
-    failurePolicy: Fail
-    name: vetcdbackupschedule.kb.io
-    rules:
-      - apiGroups:
-          - etcd.aenix.io
-        apiVersions:
-          - v1alpha1
-        operations:
-          - CREATE
-          - UPDATE
-        resources:
-          - etcdbackupschedules
-    sideEffects: None
-  - admissionReviewVersions:
-      - v1
-    clientConfig:
-      service:
-        name: {{ include "etcd-operator.fullname" . }}-webhook-service
-        namespace: {{ .Release.Namespace }}
-        path: /validate-etcd-aenix-io-v1alpha1-etcdcluster
-    failurePolicy: Fail
-    name: vetcdcluster.kb.io
-    rules:
-      - apiGroups:
-          - etcd.aenix.io
-        apiVersions:
-          - v1alpha1
-        operations:
-          - CREATE
-          - UPDATE
-        resources:
-          - etcdclusters
-    sideEffects: None
diff --git a/packages/system/etcd-operator/charts/etcd-operator/templates/rbac/clusterrole-manager-role.yml b/packages/system/etcd-operator/charts/etcd-operator/templates/rbac/clusterrole-manager-role.yml
deleted file mode 100644
index 3f1b62067b..0000000000
--- a/packages/system/etcd-operator/charts/etcd-operator/templates/rbac/clusterrole-manager-role.yml
+++ /dev/null
@@ -1,197 +0,0 @@
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  labels:
-    {{- include "etcd-operator.labels" . | nindent 4 }}
-  name: {{ include "etcd-operator.fullname" . }}-manager-role
-rules:
-  - apiGroups:
-      - ""
-    resources:
-      - configmaps
-    verbs:
-      - create
-      - delete
-      - get
-      - list
-      - patch
-      - update
-      - watch
-  - apiGroups:
-      - ""
-    resources:
-      - endpoints
-    verbs:
-      - get
-      - list
-      - watch
-  - apiGroups:
-      - ""
-    resources:
-      - secrets
-    verbs:
-      - list
-      - get
-      - watch
-  - apiGroups:
-      - ""
-    resources:
-      - services
-    verbs:
-      - create
-      - delete
-      - get
-      - list
-      - patch
-      - update
-      - watch
-  - apiGroups:
-      - apps
-    resources:
-      - statefulsets
-    verbs:
-      - create
-      - delete
-      - get
-      - list
-      - patch
-      - update
-      - watch
-  - apiGroups:
-    - ""
-    resources:
-    - persistentvolumeclaims
-    verbs:
-    - get
-    - list
-    - patch
-    - watch
-  - apiGroups:
-    - ""
-    resources:
-    - pods
-    verbs:
-    - get
-    - list
-  - apiGroups:
-    - ""
-    resources:
-    - pods/log
-    verbs:
-    - get
-  - apiGroups:
-    - "storage.k8s.io"
-    resources:
-    - storageclasses
-    verbs:
-    - get
-    - list
-    - watch
-  - apiGroups:
-      - batch
-    resources:
-      - cronjobs
-    verbs:
-      - create
-      - delete
-      - get
-      - list
-      - patch
-      - update
-      - watch
-  - apiGroups:
-      - batch
-    resources:
-      - jobs
-    verbs:
-      - create
-      - delete
-      - get
-      - list
-      - watch
-  - apiGroups:
-      - etcd.aenix.io
-    resources:
-      - etcdbackups
-    verbs:
-      - get
-      - list
-      - patch
-      - update
-      - watch
-  - apiGroups:
-      - etcd.aenix.io
-    resources:
-      - etcdbackups/finalizers
-    verbs:
-      - update
-  - apiGroups:
-      - etcd.aenix.io
-    resources:
-      - etcdbackups/status
-    verbs:
-      - get
-      - patch
-      - update
-  - apiGroups:
-      - etcd.aenix.io
-    resources:
-      - etcdbackupschedules
-    verbs:
-      - get
-      - list
-      - patch
-      - update
-      - watch
-  - apiGroups:
-      - etcd.aenix.io
-    resources:
-      - etcdbackupschedules/finalizers
-    verbs:
-      - update
-  - apiGroups:
-      - etcd.aenix.io
-    resources:
-      - etcdbackupschedules/status
-    verbs:
-      - get
-      - patch
-      - update
-  - apiGroups:
-      - etcd.aenix.io
-    resources:
-      - etcdclusters
-    verbs:
-      - create
-      - delete
-      - get
-      - list
-      - patch
-      - update
-      - watch
-  - apiGroups:
-      - etcd.aenix.io
-    resources:
-      - etcdclusters/finalizers
-    verbs:
-      - update
-  - apiGroups:
-      - etcd.aenix.io
-    resources:
-      - etcdclusters/status
-    verbs:
-      - get
-      - patch
-      - update
-  - apiGroups:
-    - policy
-    resources:
-    - poddisruptionbudgets
-    verbs:
-    - create
-    - delete
-    - get
-    - list
-    - patch
-    - update
-    - watch
diff --git a/packages/system/etcd-operator/charts/etcd-operator/templates/rbac/clusterrole-metrics-reader.yml b/packages/system/etcd-operator/charts/etcd-operator/templates/rbac/clusterrole-metrics-reader.yml
deleted file mode 100644
index 1a2d4009f2..0000000000
--- a/packages/system/etcd-operator/charts/etcd-operator/templates/rbac/clusterrole-metrics-reader.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  labels:
-    {{- include "etcd-operator.labels" . | nindent 4 }}
-  name: {{ include "etcd-operator.fullname" . }}-metrics-reader
-rules:
-  - nonResourceURLs:
-      - /metrics
-    verbs:
-      - get
diff --git a/packages/system/etcd-operator/charts/etcd-operator/templates/rbac/clusterrole-proxy-role.yml b/packages/system/etcd-operator/charts/etcd-operator/templates/rbac/clusterrole-proxy-role.yml
deleted file mode 100644
index 2fad184ad8..0000000000
--- a/packages/system/etcd-operator/charts/etcd-operator/templates/rbac/clusterrole-proxy-role.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  labels:
-    {{- include "etcd-operator.labels" . | nindent 4 }}
-  name: {{ include "etcd-operator.fullname" . }}-proxy-role
-rules:
-  - apiGroups:
-      - authentication.k8s.io
-    resources:
-      - tokenreviews
-    verbs:
-      - create
-  - apiGroups:
-      - authorization.k8s.io
-    resources:
-      - subjectaccessreviews
-    verbs:
-      - create
diff --git a/packages/system/etcd-operator/charts/etcd-operator/templates/rbac/clusterrolebinding-manager-rolebinding.yml b/packages/system/etcd-operator/charts/etcd-operator/templates/rbac/clusterrolebinding-manager-rolebinding.yml
deleted file mode 100644
index 486d35be7c..0000000000
--- a/packages/system/etcd-operator/charts/etcd-operator/templates/rbac/clusterrolebinding-manager-rolebinding.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  labels:
-    {{- include "etcd-operator.labels" . | nindent 4 }}
-  name: {{ include "etcd-operator.fullname" . }}-manager-rolebinding
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: {{ include "etcd-operator.fullname" . }}-manager-role
-subjects:
-  - kind: ServiceAccount
-    name: {{ include "etcd-operator.fullname" . }}-controller-manager
-    namespace: {{ .Release.Namespace }}
diff --git a/packages/system/etcd-operator/charts/etcd-operator/templates/rbac/clusterrolebinding-proxy-rolebinding.yml b/packages/system/etcd-operator/charts/etcd-operator/templates/rbac/clusterrolebinding-proxy-rolebinding.yml
deleted file mode 100644
index 57f8c0137f..0000000000
--- a/packages/system/etcd-operator/charts/etcd-operator/templates/rbac/clusterrolebinding-proxy-rolebinding.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  labels:
-    {{- include "etcd-operator.labels" . | nindent 4 }}
-  name: {{ include "etcd-operator.fullname" . }}-proxy-rolebinding
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: {{ include "etcd-operator.fullname" . }}-proxy-role
-subjects:
-  - kind: ServiceAccount
-    name: {{ include "etcd-operator.fullname" . }}-controller-manager
-    namespace: {{ .Release.Namespace }}
diff --git a/packages/system/etcd-operator/charts/etcd-operator/templates/rbac/role-leader-election-role.yml b/packages/system/etcd-operator/charts/etcd-operator/templates/rbac/role-leader-election-role.yml
deleted file mode 100644
index 96b9323af6..0000000000
--- a/packages/system/etcd-operator/charts/etcd-operator/templates/rbac/role-leader-election-role.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-apiVersion: rbac.authorization.k8s.io/v1
-kind: Role
-metadata:
-  labels:
-    {{- include "etcd-operator.labels" . | nindent 4 }}
-  name: {{ include "etcd-operator.fullname" . }}-leader-election-role
-rules:
-  - apiGroups:
-      - ""
-    resources:
-      - configmaps
-    verbs:
-      - get
-      - list
-      - watch
-      - create
-      - update
-      - patch
-      - delete
-  - apiGroups:
-      - coordination.k8s.io
-    resources:
-      - leases
-    verbs:
-      - get
-      - list
-      - watch
-      - create
-      - update
-      - patch
-      - delete
-  - apiGroups:
-      - ""
-    resources:
-      - events
-    verbs:
-      - create
-      - patch
diff --git a/packages/system/etcd-operator/charts/etcd-operator/templates/rbac/rolebinding-leader-election-rolebinding.yml b/packages/system/etcd-operator/charts/etcd-operator/templates/rbac/rolebinding-leader-election-rolebinding.yml
deleted file mode 100644
index 1c58a95d6e..0000000000
--- a/packages/system/etcd-operator/charts/etcd-operator/templates/rbac/rolebinding-leader-election-rolebinding.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
-  labels:
-    {{- include "etcd-operator.labels" . | nindent 4 }}
-  name: {{ include "etcd-operator.fullname" . }}-leader-election-rolebinding
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: Role
-  name: {{ include "etcd-operator.fullname" . }}-leader-election-role
-subjects:
-  - kind: ServiceAccount
-    name: {{ include "etcd-operator.fullname" . }}-controller-manager
-    namespace: {{ .Release.Namespace }}
diff --git a/packages/system/etcd-operator/charts/etcd-operator/templates/workload/configmap-env.yaml b/packages/system/etcd-operator/charts/etcd-operator/templates/workload/configmap-env.yaml
deleted file mode 100644
index 78401c4c35..0000000000
--- a/packages/system/etcd-operator/charts/etcd-operator/templates/workload/configmap-env.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-{{- if .Values.etcdOperator.envVars }}
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "etcd-operator.labels" . }}-env
-  labels:
-    {{- include "etcd-operator.labels" . | nindent 4 }}
-data:
-  {{- range $k, $v := .Values.etcdOperator.envVars }}
-    {{- if typeOf $v | eq "string" }}
-      {{- print (tpl $k $) ": " (tpl $v $ | quote) | nindent 2 }}
-    {{- else }}
-      {{- print (tpl $k $) ": " ($v | quote) | nindent 2 }}
-    {{- end }}
-  {{- end }}
-{{- end }}
diff --git a/packages/system/etcd-operator/charts/etcd-operator/templates/workload/deployment.yml b/packages/system/etcd-operator/charts/etcd-operator/templates/workload/deployment.yml
deleted file mode 100644
index dbaa029f3c..0000000000
--- a/packages/system/etcd-operator/charts/etcd-operator/templates/workload/deployment.yml
+++ /dev/null
@@ -1,126 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ include "etcd-operator.fullname" . }}-controller-manager
-  labels:
-    {{- include "etcd-operator.labels" . | nindent 4 }}
-spec:
-  replicas: {{ .Values.replicaCount }}
-  selector:
-    matchLabels:
-      {{- include "etcd-operator.selectorLabels" . | nindent 6 }}
-  template:
-    metadata:
-      {{- with .Values.podAnnotations }}
-      annotations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      labels:
-        {{- include "etcd-operator.labels" . | nindent 8 }}
-        {{- with .Values.podLabels }}
-        {{- toYaml . | nindent 8 }}
-        {{- end }}
-    spec:
-      {{- with .Values.imagePullSecrets }}
-      imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      containers:
-        - name: etcd-operator
-          image: {{ .Values.etcdOperator.image.repository }}:{{ .Values.etcdOperator.image.tag | default .Chart.AppVersion }}
-          imagePullPolicy: {{ .Values.etcdOperator.image.pullPolicy }}
-          {{- with .Values.etcdOperator.args }}
-          args:
-            {{- toYaml . | nindent 12 }}
-          {{- end }}
-          ports:
-            - containerPort: {{ .Values.etcdOperator.service.port }}
-              name: webhook-server
-              protocol: TCP
-          {{- with .Values.etcdOperator.livenessProbe }}
-          livenessProbe:
-            {{- toYaml . | nindent 12 }}
-          {{- end }}
-          {{- with .Values.etcdOperator.readinessProbe }}
-          readinessProbe:
-            {{- toYaml . | nindent 12 }}
-          {{- end }}
-          {{- if not .Values.etcdOperator.vpa.enabled }}
-          {{- with .Values.etcdOperator.resources }}
-          resources:
-            {{- toYaml . | nindent 12 }}
-          {{- end }}
-          {{- end }}
-          {{- with .Values.etcdOperator.securityContext }}
-          securityContext:
-            {{- toYaml . | nindent 12 }}
-          {{- end }}
-          {{- if .Values.etcdOperator.envVars }}
-          envFrom:
-            - configMapRef:
-                name: {{ include "etcd-operator.fullname" . }}-env
-          {{- end }}
-          env:
-          - name: POD_NAMESPACE
-            valueFrom:
-              fieldRef:
-                apiVersion: v1
-                fieldPath: metadata.namespace
-          - name: OPERATOR_IMAGE
-            value: {{ .Values.etcdOperator.image.repository }}:{{ .Values.etcdOperator.image.tag | default .Chart.AppVersion }}
-          volumeMounts:
-            - mountPath: /tmp/k8s-webhook-server/serving-certs
-              name: cert
-              readOnly: true
-        - name: kube-rbac-proxy
-          image: {{ .Values.kubeRbacProxy.image.repository }}:{{ .Values.kubeRbacProxy.image.tag }}
-          imagePullPolicy: {{ .Values.kubeRbacProxy.image.pullPolicy }}
-          {{- with .Values.kubeRbacProxy.args }}
-          args:
-            {{- toYaml . | nindent 12 }}
-          {{- end }}
-          ports:
-            - containerPort: {{ .Values.kubeRbacProxy.service.port }}
-              name: https
-              protocol: TCP
-          {{- with .Values.kubeRbacProxy.livenessProbe }}
-          livenessProbe:
-            {{- toYaml . | nindent 12 }}
-          {{- end }}
-          {{- with .Values.kubeRbacProxy.readinessProbe }}
-          readinessProbe:
-            {{- toYaml . | nindent 12 }}
-          {{- end }}
-          {{- if not .Values.kubeRbacProxy.vpa.enabled }}
-          {{- with .Values.kubeRbacProxy.resources }}
-          resources:
-            {{- toYaml . | nindent 12 }}
-          {{- end }}
-          {{- end }}
-          {{- with .Values.kubeRbacProxy.securityContext }}
-          securityContext:
-            {{- toYaml . | nindent 12 }}
-          {{- end }}
-      {{- with .Values.podSecurityContext }}
-      securityContext:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      serviceAccountName: {{ include "etcd-operator.fullname" . }}-controller-manager
-      terminationGracePeriodSeconds: 10
-      volumes:
-        - name: cert
-          secret:
-            defaultMode: 420
-            secretName: webhook-server-cert
-      {{- with .Values.nodeSelector }}
-      nodeSelector:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.affinity }}
-      affinity:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.tolerations }}
-      tolerations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
diff --git a/packages/system/etcd-operator/charts/etcd-operator/templates/workload/service-controller-manager-metrics-service.yml b/packages/system/etcd-operator/charts/etcd-operator/templates/workload/service-controller-manager-metrics-service.yml
deleted file mode 100644
index 16bdaa317e..0000000000
--- a/packages/system/etcd-operator/charts/etcd-operator/templates/workload/service-controller-manager-metrics-service.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ include "etcd-operator.fullname" . }}-controller-manager-metrics-service
-  labels:
-    {{- include "etcd-operator.labels" . | nindent 4 }}
-spec:
-  type: {{ .Values.kubeRbacProxy.service.type }}
-  ports:
-    - name: https
-      port: {{ .Values.kubeRbacProxy.service.port }}
-      protocol: TCP
-      targetPort: https
-  selector:
-    {{- include "etcd-operator.selectorLabels" . | nindent 4 }}
diff --git a/packages/system/etcd-operator/charts/etcd-operator/templates/workload/service-webhook-service.yml b/packages/system/etcd-operator/charts/etcd-operator/templates/workload/service-webhook-service.yml
deleted file mode 100644
index 95fa30c824..0000000000
--- a/packages/system/etcd-operator/charts/etcd-operator/templates/workload/service-webhook-service.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  labels:
-    {{- include "etcd-operator.labels" . | nindent 4 }}
-  name: {{ include "etcd-operator.fullname" . }}-webhook-service
-spec:
-  type: {{ .Values.etcdOperator.service.type }}
-  ports:
-    - port: 443
-      protocol: TCP
-      targetPort: {{ .Values.etcdOperator.service.port }}
-  selector:
-    {{- include "etcd-operator.selectorLabels" . | nindent 4 }}
diff --git a/packages/system/etcd-operator/charts/etcd-operator/templates/workload/serviceaccount.yml b/packages/system/etcd-operator/charts/etcd-operator/templates/workload/serviceaccount.yml
deleted file mode 100644
index 25a0f6ed30..0000000000
--- a/packages/system/etcd-operator/charts/etcd-operator/templates/workload/serviceaccount.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-{{- if .Values.serviceAccount.create -}}
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: {{ include "etcd-operator.fullname" . }}-controller-manager
-  labels:
-    {{- include "etcd-operator.labels" . | nindent 4 }}
-  {{- with .Values.serviceAccount.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-{{- end }}
diff --git a/packages/system/etcd-operator/charts/etcd-operator/templates/workload/vpa.yml b/packages/system/etcd-operator/charts/etcd-operator/templates/workload/vpa.yml
deleted file mode 100644
index a82b41b8ee..0000000000
--- a/packages/system/etcd-operator/charts/etcd-operator/templates/workload/vpa.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-{{- if or .Values.etcdOperator.vpa.enabled .Values.kubeRbacProxy.vpa.enabled }}
-apiVersion: autoscaling.k8s.io/v1
-kind: VerticalPodAutoscaler
-metadata:
-  name: {{ include "etcd-operator.fullname" . }}-controller-manager
-  labels:
-    {{- include "etcd-operator.labels" . | nindent 4 }}
-spec:
-  targetRef:
-    apiVersion: "apps/v1"
-    kind: Deployment
-    name: {{ include "etcd-operator.fullname" . }}-controller-manager
-  updatePolicy:
-    updateMode: {{ .Values.vpa.updatePolicy | default "Auto" | quote }}
-  resourcePolicy:
-    containerPolicies:
-    {{- if .Values.etcdOperator.vpa.enabled }}
-      - containerName: etcd-operator
-        {{- with .Values.etcdOperator.vpa.minAllowed }}
-        minAllowed:
-          {{- toYaml . | nindent 10 }}
-        {{- end }}
-        {{- with .Values.etcdOperator.vpa.maxAllowed }}
-        maxAllowed:
-          {{- toYaml . | nindent 10 }}
-        {{- end }}
-        controlledResources: ["cpu", "memory"]
-    {{- end }}
-    {{- if .Values.kubeRbacProxy.vpa.enabled }}
-      - containerName: kube-rbac-proxy
-        {{- with .Values.kubeRbacProxy.vpa.minAllowed }}
-        minAllowed:
-          {{- toYaml . | nindent 10 }}
-        {{- end }}
-        {{- with .Values.kubeRbacProxy.vpa.maxAllowed }}
-        maxAllowed:
-          {{- toYaml . | nindent 10 }}
-        {{- end }}
-        controlledResources: ["cpu", "memory"]
-    {{- end }}
-{{- end }}
diff --git a/packages/system/etcd-operator/charts/etcd-operator/values.schema.json b/packages/system/etcd-operator/charts/etcd-operator/values.schema.json
deleted file mode 100644
index f6ae1572e5..0000000000
--- a/packages/system/etcd-operator/charts/etcd-operator/values.schema.json
+++ /dev/null
@@ -1,344 +0,0 @@
-{
-    "$schema": "https://json-schema.org/draft/2020-12/schema",
-    "properties": {
-        "affinity": {
-            "properties": {},
-            "type": "object"
-        },
-        "etcdOperator": {
-            "properties": {
-                "args": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "envVars": {
-                    "properties": {},
-                    "type": "object"
-                },
-                "image": {
-                    "properties": {
-                        "pullPolicy": {
-                            "type": "string"
-                        },
-                        "repository": {
-                            "type": "string"
-                        },
-                        "tag": {
-                            "type": "string"
-                        }
-                    },
-                    "type": "object"
-                },
-                "livenessProbe": {
-                    "properties": {
-                        "httpGet": {
-                            "properties": {
-                                "path": {
-                                    "type": "string"
-                                },
-                                "port": {
-                                    "type": "integer"
-                                }
-                            },
-                            "type": "object"
-                        },
-                        "initialDelaySeconds": {
-                            "type": "integer"
-                        },
-                        "periodSeconds": {
-                            "type": "integer"
-                        }
-                    },
-                    "type": "object"
-                },
-                "readinessProbe": {
-                    "properties": {
-                        "httpGet": {
-                            "properties": {
-                                "path": {
-                                    "type": "string"
-                                },
-                                "port": {
-                                    "type": "integer"
-                                }
-                            },
-                            "type": "object"
-                        },
-                        "initialDelaySeconds": {
-                            "type": "integer"
-                        },
-                        "periodSeconds": {
-                            "type": "integer"
-                        }
-                    },
-                    "type": "object"
-                },
-                "resources": {
-                    "properties": {
-                        "limits": {
-                            "properties": {
-                                "cpu": {
-                                    "type": "string"
-                                },
-                                "memory": {
-                                    "type": "string"
-                                }
-                            },
-                            "type": "object"
-                        },
-                        "requests": {
-                            "properties": {
-                                "cpu": {
-                                    "type": "string"
-                                },
-                                "memory": {
-                                    "type": "string"
-                                }
-                            },
-                            "type": "object"
-                        }
-                    },
-                    "type": "object"
-                },
-                "securityContext": {
-                    "properties": {
-                        "allowPrivilegeEscalation": {
-                            "type": "boolean"
-                        },
-                        "capabilities": {
-                            "properties": {
-                                "drop": {
-                                    "items": {
-                                        "type": "string"
-                                    },
-                                    "type": "array"
-                                }
-                            },
-                            "type": "object"
-                        }
-                    },
-                    "type": "object"
-                },
-                "service": {
-                    "properties": {
-                        "port": {
-                            "type": "integer"
-                        },
-                        "type": {
-                            "type": "string"
-                        }
-                    },
-                    "type": "object"
-                },
-                "vpa": {
-                    "properties": {
-                        "enabled": {
-                            "type": "boolean"
-                        },
-                        "maxAllowed": {
-                            "properties": {
-                                "cpu": {
-                                    "type": "string"
-                                },
-                                "memory": {
-                                    "type": "string"
-                                }
-                            },
-                            "type": "object"
-                        },
-                        "minAllowed": {
-                            "properties": {
-                                "cpu": {
-                                    "type": "string"
-                                },
-                                "memory": {
-                                    "type": "string"
-                                }
-                            },
-                            "type": "object"
-                        }
-                    },
-                    "type": "object"
-                }
-            },
-            "type": "object"
-        },
-        "fullnameOverride": {
-            "type": "string"
-        },
-        "imagePullSecrets": {
-            "type": "array"
-        },
-        "kubeRbacProxy": {
-            "properties": {
-                "args": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "image": {
-                    "properties": {
-                        "pullPolicy": {
-                            "type": "string"
-                        },
-                        "repository": {
-                            "type": "string"
-                        },
-                        "tag": {
-                            "type": "string"
-                        }
-                    },
-                    "type": "object"
-                },
-                "livenessProbe": {
-                    "properties": {},
-                    "type": "object"
-                },
-                "readinessProbe": {
-                    "properties": {},
-                    "type": "object"
-                },
-                "resources": {
-                    "properties": {
-                        "limits": {
-                            "properties": {
-                                "cpu": {
-                                    "type": "string"
-                                },
-                                "memory": {
-                                    "type": "string"
-                                }
-                            },
-                            "type": "object"
-                        },
-                        "requests": {
-                            "properties": {
-                                "cpu": {
-                                    "type": "string"
-                                },
-                                "memory": {
-                                    "type": "string"
-                                }
-                            },
-                            "type": "object"
-                        }
-                    },
-                    "type": "object"
-                },
-                "securityContext": {
-                    "properties": {
-                        "allowPrivilegeEscalation": {
-                            "type": "boolean"
-                        },
-                        "capabilities": {
-                            "properties": {
-                                "drop": {
-                                    "items": {
-                                        "type": "string"
-                                    },
-                                    "type": "array"
-                                }
-                            },
-                            "type": "object"
-                        }
-                    },
-                    "type": "object"
-                },
-                "service": {
-                    "properties": {
-                        "port": {
-                            "type": "integer"
-                        },
-                        "type": {
-                            "type": "string"
-                        }
-                    },
-                    "type": "object"
-                },
-                "vpa": {
-                    "properties": {
-                        "enabled": {
-                            "type": "boolean"
-                        },
-                        "maxAllowed": {
-                            "properties": {
-                                "cpu": {
-                                    "type": "string"
-                                },
-                                "memory": {
-                                    "type": "string"
-                                }
-                            },
-                            "type": "object"
-                        },
-                        "minAllowed": {
-                            "properties": {
-                                "cpu": {
-                                    "type": "string"
-                                },
-                                "memory": {
-                                    "type": "string"
-                                }
-                            },
-                            "type": "object"
-                        }
-                    },
-                    "type": "object"
-                }
-            },
-            "type": "object"
-        },
-        "kubernetesClusterDomain": {
-            "type": "string"
-        },
-        "nameOverride": {
-            "type": "string"
-        },
-        "nodeSelector": {
-            "properties": {},
-            "type": "object"
-        },
-        "podAnnotations": {
-            "properties": {},
-            "type": "object"
-        },
-        "podLabels": {
-            "properties": {},
-            "type": "object"
-        },
-        "podSecurityContext": {
-            "properties": {},
-            "type": "object"
-        },
-        "replicaCount": {
-            "type": "integer"
-        },
-        "serviceAccount": {
-            "properties": {
-                "annotations": {
-                    "properties": {},
-                    "type": "object"
-                },
-                "create": {
-                    "type": "boolean"
-                }
-            },
-            "type": "object"
-        },
-        "tolerations": {
-            "type": "array"
-        },
-        "vpa": {
-            "properties": {
-                "updatePolicy": {
-                    "type": "string"
-                }
-            },
-            "type": "object"
-        }
-    },
-    "type": "object"
-}
diff --git a/packages/system/etcd-operator/charts/etcd-operator/values.yaml b/packages/system/etcd-operator/charts/etcd-operator/values.yaml
deleted file mode 100644
index b2b5cd4e6d..0000000000
--- a/packages/system/etcd-operator/charts/etcd-operator/values.yaml
+++ /dev/null
@@ -1,205 +0,0 @@
-etcdOperator:
-
-  image:
-
-    # -- Image repository
-    repository: ghcr.io/aenix-io/etcd-operator
-
-    # -- Image pull policy
-    pullPolicy: IfNotPresent
-
-    # -- Overrides the image tag whose default is the chart appVersion.
-    tag: ""
-
-  args:
-    - --health-probe-bind-address=:8081
-    - --metrics-bind-address=127.0.0.1:8080
-    - --leader-elect
-
-  service:
-
-    # -- Service type
-    type: ClusterIP
-
-    # -- Service port
-    port: 9443
-
-  # -- Empty environment variables section
-  envVars: {}
-
-  livenessProbe:
-
-    httpGet:
-
-      # -- Healthcheck liveness probe path
-      path: /healthz
-
-      # -- Healthcheck port
-      port: 8081
-
-    # -- ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/#configure-probes
-    initialDelaySeconds: 15
-
-    # -- ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/#configure-probes
-    periodSeconds: 20
-
-  readinessProbe:
-
-    httpGet:
-
-      # -- Healthcheck readiness probe path
-      path: /readyz
-
-      # -- Healthcheck port
-      port: 8081
-
-    # -- ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/#configure-probes
-    initialDelaySeconds: 5
-
-    # -- ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/#configure-probes
-    periodSeconds: 10
-
-  # -- ref: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
-  resources:
-
-    limits:
-
-      cpu: 500m
-
-      memory: 128Mi
-
-    requests:
-
-      cpu: 100m
-
-      memory: 64Mi
-
-  # -- ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/
-  securityContext:
-
-    allowPrivilegeEscalation: false
-
-    capabilities:
-
-      drop:
-        - ALL
-
-  vpa:
-    enabled: true
-    minAllowed:
-      cpu: 100m
-      memory: 128Mi
-    maxAllowed:
-      cpu: 1000m
-      memory: 1Gi
-
-kubeRbacProxy:
-
-  image:
-
-    # -- Image repository
-    repository: quay.io/brancz/kube-rbac-proxy
-
-    # -- Image pull policy
-    pullPolicy: IfNotPresent
-
-    # -- Version of image
-    tag: v0.18.1
-
-  args:
-    - --secure-listen-address=0.0.0.0:8443
-    - --upstream=http://127.0.0.1:8080/
-    - --logtostderr=true
-    - --v=0
-
-  service:
-
-    # -- Service type
-    type: ClusterIP
-
-    # -- Service port
-    port: 8443
-
-  # -- https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/
-  livenessProbe: {}
-
-  # -- https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/
-  readinessProbe: {}
-
-  # -- ref: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
-  resources:
-
-    limits:
-
-      cpu: 250m
-
-      memory: 128Mi
-
-    requests:
-
-      cpu: 100m
-
-      memory: 64Mi
-
-  # -- ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/
-  securityContext:
-
-    allowPrivilegeEscalation: false
-
-    capabilities:
-
-      drop:
-          - ALL
-
-  vpa:
-    enabled: true
-    minAllowed:
-      cpu: 50m
-      memory: 64Mi
-    maxAllowed:
-      cpu: 500m
-      memory: 256Mi
-
-# -- Kubernetes cluster domain prefix
-kubernetesClusterDomain: cluster.local
-
-# -- Count of pod replicas
-replicaCount: 1
-
-imagePullSecrets: []
-
-# -- Override a name of helm release
-nameOverride: ""
-
-# -- Override a full name of helm release
-fullnameOverride: ""
-
-serviceAccount:
-
-  # -- Specifies whether a service account should be created
-  create: true
-
-  # -- Annotations to add to the service account
-  annotations: {}
-
-# -- ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
-podAnnotations: {}
-
-# -- ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
-podLabels: {}
-
-# -- ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/
-podSecurityContext: {}
-  # fsGroup: 2000
-
-# -- ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/
-nodeSelector: {}
-
-# -- ref: https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/
-tolerations: []
-
-# -- ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity
-affinity: {}
-
-vpa:
-  updatePolicy: "Auto"
diff --git a/packages/system/etcd-operator/templates/deployment.yaml b/packages/system/etcd-operator/templates/deployment.yaml
new file mode 100644
index 0000000000..4b5ab12c02
--- /dev/null
+++ b/packages/system/etcd-operator/templates/deployment.yaml
@@ -0,0 +1,71 @@
+{{- $image := printf "%s:%s" .Values.image.repository (.Values.image.tag | default .Chart.AppVersion) }}
+{{- $clusterDomain := .Values.clusterDomain | default (index (.Values._cluster | default dict) "cluster-domain") | default "cozy.local" }}
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: etcd-operator-controller-manager
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: etcd-operator
+    control-plane: controller-manager
+spec:
+  replicas: {{ .Values.replicaCount }}
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: etcd-operator
+      control-plane: controller-manager
+  template:
+    metadata:
+      annotations:
+        kubectl.kubernetes.io/default-container: manager
+      labels:
+        app.kubernetes.io/name: etcd-operator
+        control-plane: controller-manager
+    spec:
+      serviceAccountName: etcd-operator-controller-manager
+      terminationGracePeriodSeconds: 10
+      securityContext:
+        runAsNonRoot: true
+        seccompProfile:
+          type: RuntimeDefault
+      containers:
+      - name: manager
+        image: {{ $image | quote }}
+        imagePullPolicy: {{ .Values.image.pullPolicy }}
+        command:
+        - /manager
+        args:
+        - --leader-elect
+        - --health-probe-bind-address=:8081
+        - --metrics-bind-address=:8080
+        - --cluster-domain={{ $clusterDomain }}
+        env:
+        # Must equal this container's own image: the snapshot Job and the
+        # restore init container run the operator image as the agent.
+        - name: OPERATOR_IMAGE
+          value: {{ $image | quote }}
+        ports:
+        - name: metrics
+          containerPort: 8080
+          protocol: TCP
+        - name: health
+          containerPort: 8081
+          protocol: TCP
+        livenessProbe:
+          httpGet:
+            path: /healthz
+            port: 8081
+          initialDelaySeconds: 15
+          periodSeconds: 20
+        readinessProbe:
+          httpGet:
+            path: /readyz
+            port: 8081
+          initialDelaySeconds: 5
+          periodSeconds: 10
+        securityContext:
+          allowPrivilegeEscalation: false
+          capabilities:
+            drop:
+            - ALL
+        resources: {{- toYaml .Values.resources | nindent 10 }}
diff --git a/packages/system/etcd-operator/templates/metrics.yaml b/packages/system/etcd-operator/templates/metrics.yaml
new file mode 100644
index 0000000000..1c57f5a7aa
--- /dev/null
+++ b/packages/system/etcd-operator/templates/metrics.yaml
@@ -0,0 +1,31 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: etcd-operator-metrics
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: etcd-operator
+spec:
+  selector:
+    app.kubernetes.io/name: etcd-operator
+    control-plane: controller-manager
+  ports:
+  - name: metrics
+    port: 8080
+    targetPort: metrics
+    protocol: TCP
+---
+{{- if .Capabilities.APIVersions.Has "operator.victoriametrics.com/v1beta1" }}
+apiVersion: operator.victoriametrics.com/v1beta1
+kind: VMServiceScrape
+metadata:
+  name: etcd-operator
+  namespace: {{ .Release.Namespace }}
+spec:
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: etcd-operator
+  endpoints:
+  - port: metrics
+    scheme: http
+{{- end }}
diff --git a/packages/system/etcd-operator/templates/pre-upgrade-selector-fix.yaml b/packages/system/etcd-operator/templates/pre-upgrade-selector-fix.yaml
new file mode 100644
index 0000000000..10dc6f70bc
--- /dev/null
+++ b/packages/system/etcd-operator/templates/pre-upgrade-selector-fix.yaml
@@ -0,0 +1,162 @@
+{{- /*
+Pre-upgrade selector migration for the controller-manager Deployment.
+
+1.6 replaced the upstream etcd-operator chart with the cozystack-authored one
+(#2859), changing the Deployment's spec.selector.matchLabels:
+
+  1.5: {app.kubernetes.io/instance: etcd-operator, app.kubernetes.io/name: etcd-operator}
+  1.6: {app.kubernetes.io/name: etcd-operator, control-plane: controller-manager}
+
+spec.selector is immutable, so `helm upgrade` cannot patch the existing
+Deployment and the whole HelmRelease upgrade fails ("field is immutable") — the
+operator (and the v1alpha2 CRDs it serves) never come up, which blocks the etcd
+v1alpha2 adoption. Fresh installs use the new selector directly and are
+unaffected, so fresh-install CI does not catch it. See cozystack/cozystack#3242.
+
+This pre-upgrade hook deletes the Deployment ONLY when its live selector is the
+pre-1.6 one (i.e. lacks control-plane=controller-manager), so Helm recreates it
+cleanly with the new selector. It is a no-op when the selector already matches
+(rc.1 -> later upgrades) and never runs on a fresh install (pre-upgrade only).
+Keeping the selector stable in the chart is NOT an option: rc.1 already shipped
+the new selector, so aligning it back would merely move the immutable break to
+rc.1 -> next.
+*/}}
+{{- $name := "etcd-operator-selector-fix" }}
+{{- $img := printf "%s:%s" .Values.kubectlImage.repository .Values.kubectlImage.tag }}
+{{- with .Values.kubectlImage.digest }}{{- $img = printf "%s@%s" $img . }}{{- end }}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ $name }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: etcd-operator
+    app.kubernetes.io/component: selector-fix-hook
+  annotations:
+    helm.sh/hook: pre-upgrade
+    helm.sh/hook-weight: "-5"
+    helm.sh/hook-delete-policy: hook-succeeded,hook-failed,before-hook-creation
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: {{ $name }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: etcd-operator
+    app.kubernetes.io/component: selector-fix-hook
+  annotations:
+    helm.sh/hook: pre-upgrade
+    helm.sh/hook-weight: "-5"
+    helm.sh/hook-delete-policy: hook-succeeded,hook-failed,before-hook-creation
+rules:
+  - apiGroups: ["apps"]
+    resources: ["deployments"]
+    verbs: ["get", "list", "delete"]
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: {{ $name }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: etcd-operator
+    app.kubernetes.io/component: selector-fix-hook
+  annotations:
+    helm.sh/hook: pre-upgrade
+    helm.sh/hook-weight: "-5"
+    helm.sh/hook-delete-policy: hook-succeeded,hook-failed,before-hook-creation
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: {{ $name }}
+subjects:
+  - kind: ServiceAccount
+    name: {{ $name }}
+    namespace: {{ .Release.Namespace }}
+---
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: {{ $name }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: etcd-operator
+    app.kubernetes.io/component: selector-fix-hook
+  annotations:
+    helm.sh/hook: pre-upgrade
+    helm.sh/hook-weight: "0"
+    # Keep a failed Job's Pod around for `kubectl logs`; reap the whole hook
+    # bundle on success. before-hook-creation clears a prior run first.
+    helm.sh/hook-delete-policy: hook-succeeded,before-hook-creation
+spec:
+  activeDeadlineSeconds: 120
+  backoffLimit: 1
+  ttlSecondsAfterFinished: 600
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/name: etcd-operator
+        app.kubernetes.io/component: selector-fix-hook
+    spec:
+      serviceAccountName: {{ $name }}
+      restartPolicy: Never
+      securityContext:
+        runAsNonRoot: true
+        # clastix/kubectl's image user is the non-numeric name `nonroot`, which
+        # the kubelet cannot verify against runAsNonRoot; pin a numeric UID so
+        # the Pod passes admission (matches postgres-operator's webhook-ready
+        # hook running the same image).
+        runAsUser: 65532
+        seccompProfile:
+          type: RuntimeDefault
+      # writable HOME so kubectl can create its discovery cache under
+      # readOnlyRootFilesystem=true (kubectl 1.30+ aborts otherwise).
+      volumes:
+        - name: home
+          emptyDir: {}
+      containers:
+        - name: selector-fix
+          image: {{ $img | quote }}
+          imagePullPolicy: {{ .Values.kubectlImage.pullPolicy }}
+          # Small fixed budget for a one-shot kubectl get/delete; values mirror
+          # the postgres-operator webhook-ready hook that runs the same image,
+          # so the hook Pod schedules predictably without over-reserving.
+          resources:
+            requests:
+              cpu: 10m
+              memory: 32Mi
+            limits:
+              cpu: 100m
+              memory: 64Mi
+          securityContext:
+            allowPrivilegeEscalation: false
+            readOnlyRootFilesystem: true
+            capabilities:
+              drop: ["ALL"]
+          env:
+            - name: HOME
+              value: /tmp
+          volumeMounts:
+            - name: home
+              mountPath: /tmp
+          command:
+            - /bin/sh
+            - -c
+            - |
+              set -eu
+              ns="{{ .Release.Namespace }}"
+              name=etcd-operator-controller-manager
+              if ! kubectl -n "$ns" get deployment "$name" >/dev/null 2>&1; then
+                echo "[selector-fix] Deployment $name absent; nothing to do."
+                exit 0
+              fi
+              cp="$(kubectl -n "$ns" get deployment "$name" \
+                    -o jsonpath='{.spec.selector.matchLabels.control-plane}' 2>/dev/null || true)"
+              if [ "$cp" = "controller-manager" ]; then
+                echo "[selector-fix] Deployment $name already has the v1.6 selector; nothing to do."
+                exit 0
+              fi
+              echo "[selector-fix] Deployment $name has a pre-1.6 spec.selector (immutable); deleting so the chart recreates it with the current selector."
+              kubectl -n "$ns" delete deployment "$name" --wait=true --timeout=90s
+              echo "[selector-fix] Deleted; the chart will recreate $name."
diff --git a/packages/system/etcd-operator/templates/rbac.yaml b/packages/system/etcd-operator/templates/rbac.yaml
new file mode 100644
index 0000000000..578e00b4c7
--- /dev/null
+++ b/packages/system/etcd-operator/templates/rbac.yaml
@@ -0,0 +1,100 @@
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: etcd-operator-controller-manager
+  namespace: {{ .Release.Namespace }}
+---
+# Manager ClusterRole — vendored from github.com/cozystack/etcd-operator
+# charts/etcd-operator/files/manager-role-rules.yaml. Cluster-scoped because
+# etcd clusters live in tenant namespaces. Refresh via `make update` when the
+# operator's role rules change.
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: etcd-operator-manager-role
+rules:
+- apiGroups: [""]
+  resources: [events]
+  verbs: [create, patch]
+- apiGroups: [""]
+  resources: [persistentvolumeclaims]
+  verbs: [create, delete, get, list, patch, update, watch]
+- apiGroups: [""]
+  resources: [pods]
+  verbs: [create, delete, get, list, patch, watch]
+- apiGroups: [""]
+  resources: [pods/log]
+  verbs: [get]
+- apiGroups: [""]
+  resources: [secrets]
+  verbs: [get, list, watch]
+- apiGroups: [""]
+  resources: [services]
+  verbs: [create, get, list, patch, update, watch]
+- apiGroups: [batch]
+  resources: [jobs]
+  verbs: [create, delete, get, list, watch]
+- apiGroups: [cert-manager.io]
+  resources: [certificates]
+  verbs: [create, get, list, patch, update, watch]
+- apiGroups: [etcd-operator.cozystack.io]
+  resources: [etcdclusters]
+  verbs: [get, list, watch]
+- apiGroups: [etcd-operator.cozystack.io]
+  resources: [etcdclusters/finalizers, etcdmembers/finalizers, etcdsnapshots/finalizers]
+  verbs: [update]
+- apiGroups: [etcd-operator.cozystack.io]
+  resources: [etcdclusters/status, etcddefragpolicies/status, etcddefrags/status, etcdmembers/status, etcdsnapshots/status]
+  verbs: [get, patch, update]
+- apiGroups: [etcd-operator.cozystack.io]
+  resources: [etcddefragpolicies]
+  verbs: [get, list, patch, update, watch]
+- apiGroups: [etcd-operator.cozystack.io]
+  resources: [etcddefrags, etcdmembers, etcdsnapshots]
+  verbs: [create, delete, get, list, patch, update, watch]
+- apiGroups: [policy]
+  resources: [poddisruptionbudgets]
+  verbs: [create, delete, get, list, patch, update, watch]
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: etcd-operator-manager-rolebinding
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: etcd-operator-manager-role
+subjects:
+- kind: ServiceAccount
+  name: etcd-operator-controller-manager
+  namespace: {{ .Release.Namespace }}
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: etcd-operator-leader-election-role
+  namespace: {{ .Release.Namespace }}
+rules:
+- apiGroups: [""]
+  resources: [configmaps]
+  verbs: [get, list, watch, create, update, patch, delete]
+- apiGroups: [coordination.k8s.io]
+  resources: [leases]
+  verbs: [get, list, watch, create, update, patch, delete]
+- apiGroups: [""]
+  resources: [events]
+  verbs: [create, patch]
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: etcd-operator-leader-election-rolebinding
+  namespace: {{ .Release.Namespace }}
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: etcd-operator-leader-election-role
+subjects:
+- kind: ServiceAccount
+  name: etcd-operator-controller-manager
+  namespace: {{ .Release.Namespace }}
diff --git a/packages/system/etcd-operator/templates/vpa.yaml b/packages/system/etcd-operator/templates/vpa.yaml
new file mode 100644
index 0000000000..479bc27a6a
--- /dev/null
+++ b/packages/system/etcd-operator/templates/vpa.yaml
@@ -0,0 +1,26 @@
+{{- if .Values.vpa.enabled }}
+apiVersion: autoscaling.k8s.io/v1
+kind: VerticalPodAutoscaler
+metadata:
+  name: etcd-operator-controller-manager
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: etcd-operator
+spec:
+  targetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: etcd-operator-controller-manager
+  updatePolicy:
+    updateMode: {{ .Values.vpa.updateMode | default "Auto" | quote }}
+  resourcePolicy:
+    containerPolicies:
+    - containerName: manager
+      {{- with .Values.vpa.minAllowed }}
+      minAllowed: {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.vpa.maxAllowed }}
+      maxAllowed: {{- toYaml . | nindent 8 }}
+      {{- end }}
+      controlledResources: ["cpu", "memory"]
+{{- end }}
diff --git a/packages/system/etcd-operator/tests/deployment_test.yaml b/packages/system/etcd-operator/tests/deployment_test.yaml
new file mode 100644
index 0000000000..2b0d1bd578
--- /dev/null
+++ b/packages/system/etcd-operator/tests/deployment_test.yaml
@@ -0,0 +1,101 @@
+suite: controller-manager Deployment — image, args, and security context
+
+# The etcd-operator chart is cozystack-authored (only the manager ClusterRole is
+# vendored), so these pin the contracts that are easy to break on an operator
+# bump or a values rename: the image ref the agent Job also runs, the manager
+# CLI args (leader-election, probe/metrics binds, cluster domain), and the
+# locked-down pod/container security context.
+
+templates:
+  - templates/deployment.yaml
+
+release:
+  name: etcd-operator
+  namespace: cozy-etcd-operator
+
+tests:
+  - it: "image defaults to repository:appVersion and the agent OPERATOR_IMAGE env matches it"
+    # OPERATOR_IMAGE MUST equal the manager image: the snapshot Job and restore
+    # init container run this same image as the agent.
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].image
+          value: ghcr.io/cozystack/etcd-operator:v0.5.6
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: OPERATOR_IMAGE
+            value: ghcr.io/cozystack/etcd-operator:v0.5.6
+          any: true
+
+  - it: "image.tag overrides the appVersion default for both the container and the agent env"
+    set:
+      image.tag: v9.9.9
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].image
+          value: ghcr.io/cozystack/etcd-operator:v9.9.9
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: OPERATOR_IMAGE
+            value: ghcr.io/cozystack/etcd-operator:v9.9.9
+          any: true
+
+  - it: "manager args carry leader-election, the probe/metrics binds, and the default cluster domain"
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: --leader-elect
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: --health-probe-bind-address=:8081
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: --metrics-bind-address=:8080
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: --cluster-domain=cozy.local
+
+  - it: "clusterDomain value threads into --cluster-domain"
+    set:
+      clusterDomain: example.internal
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: --cluster-domain=example.internal
+
+  - it: "pod and container security contexts are locked down (runAsNonRoot, RuntimeDefault seccomp, no privilege escalation, drop ALL)"
+    asserts:
+      - equal:
+          path: spec.template.spec.securityContext.runAsNonRoot
+          value: true
+      - equal:
+          path: spec.template.spec.securityContext.seccompProfile.type
+          value: RuntimeDefault
+      - equal:
+          path: spec.template.spec.containers[0].securityContext.allowPrivilegeEscalation
+          value: false
+      - contains:
+          path: spec.template.spec.containers[0].securityContext.capabilities.drop
+          content: ALL
+
+  - it: "the named metrics port is exposed for the VMServiceScrape to target"
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].ports
+          content:
+            name: metrics
+            containerPort: 8080
+            protocol: TCP
+          any: true
+
+  - it: "cold-start memory limit floor is at/above the manager working set so the Pod is not OOMKilled before VPA mutates it"
+    # A freshly-created Pod runs under resources.limits until the VPA admission
+    # webhook rewrites it; a 128Mi floor OOMKills the ~250Mi manager on any start
+    # the webhook does not mutate in time (Deployment recreated out of band, or
+    # webhook briefly down during an upgrade). Keep the floor at/above 256Mi.
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].resources.limits.memory
+          value: 256Mi
diff --git a/packages/system/etcd-operator/tests/metrics_test.yaml b/packages/system/etcd-operator/tests/metrics_test.yaml
new file mode 100644
index 0000000000..b9996f8734
--- /dev/null
+++ b/packages/system/etcd-operator/tests/metrics_test.yaml
@@ -0,0 +1,40 @@
+suite: metrics — Service is unconditional, VMServiceScrape is gated on the vmoperator CRD
+
+templates:
+  - templates/metrics.yaml
+
+release:
+  name: etcd-operator
+  namespace: cozy-etcd-operator
+
+capabilities:
+  apiVersions: []
+
+tests:
+  - it: the metrics Service renders even when the VictoriaMetrics operator CRDs are absent
+    asserts:
+      - hasDocuments:
+          count: 1
+      - containsDocument:
+          apiVersion: v1
+          kind: Service
+          name: etcd-operator-metrics
+          any: true
+
+  - it: the VMServiceScrape renders alongside the Service when the VictoriaMetrics operator CRD is present
+    capabilities:
+      apiVersions:
+        - operator.victoriametrics.com/v1beta1
+    asserts:
+      - hasDocuments:
+          count: 2
+      - containsDocument:
+          apiVersion: v1
+          kind: Service
+          name: etcd-operator-metrics
+          any: true
+      - containsDocument:
+          apiVersion: operator.victoriametrics.com/v1beta1
+          kind: VMServiceScrape
+          name: etcd-operator
+          any: true
diff --git a/packages/system/etcd-operator/tests/rbac_test.yaml b/packages/system/etcd-operator/tests/rbac_test.yaml
new file mode 100644
index 0000000000..bb0b8120fe
--- /dev/null
+++ b/packages/system/etcd-operator/tests/rbac_test.yaml
@@ -0,0 +1,89 @@
+suite: controller-manager RBAC — ServiceAccount, manager ClusterRole, and bindings
+
+# The manager ClusterRole is vendored by hand from the operator's
+# charts/etcd-operator/files/manager-role-rules.yaml (see Makefile `update`), so
+# a stale re-vendor could drop a rule the operator needs and only surface as a
+# runtime RBAC-forbidden error.
+# Pin the ServiceAccount, a couple of load-bearing ClusterRole rules, and that
+# the binding actually wires the role to the controller ServiceAccount.
+
+templates:
+  - templates/rbac.yaml
+
+release:
+  name: etcd-operator
+  namespace: cozy-etcd-operator
+
+tests:
+  - it: "renders the controller ServiceAccount in the release namespace"
+    documentIndex: 0
+    asserts:
+      - isKind:
+          of: ServiceAccount
+      - equal:
+          path: metadata.name
+          value: etcd-operator-controller-manager
+      - equal:
+          path: metadata.namespace
+          value: cozy-etcd-operator
+
+  - it: "manager ClusterRole grants the etcdmember/snapshot and certificate verbs the operator needs"
+    documentIndex: 1
+    asserts:
+      - isKind:
+          of: ClusterRole
+      - equal:
+          path: metadata.name
+          value: etcd-operator-manager-role
+      - contains:
+          path: rules
+          content:
+            apiGroups: [etcd-operator.cozystack.io]
+            resources: [etcddefrags, etcdmembers, etcdsnapshots]
+            verbs: [create, delete, get, list, patch, update, watch]
+      - contains:
+          path: rules
+          content:
+            apiGroups: [etcd-operator.cozystack.io]
+            resources: [etcddefragpolicies]
+            verbs: [get, list, patch, update, watch]
+      - contains:
+          path: rules
+          content:
+            apiGroups: [cert-manager.io]
+            resources: [certificates]
+            verbs: [create, get, list, patch, update, watch]
+      - contains:
+          path: rules
+          content:
+            apiGroups: [""]
+            resources: [pods]
+            verbs: [create, delete, get, list, patch, watch]
+
+  - it: "manager ClusterRoleBinding wires the manager role to the controller ServiceAccount"
+    documentIndex: 2
+    asserts:
+      - isKind:
+          of: ClusterRoleBinding
+      - equal:
+          path: roleRef.name
+          value: etcd-operator-manager-role
+      - contains:
+          path: subjects
+          content:
+            kind: ServiceAccount
+            name: etcd-operator-controller-manager
+            namespace: cozy-etcd-operator
+          any: true
+
+  - it: "leader-election Role and its binding are namespaced to the release namespace"
+    documentIndex: 3
+    asserts:
+      - isKind:
+          of: Role
+      - equal:
+          path: metadata.name
+          value: etcd-operator-leader-election-role
+      - equal:
+          path: metadata.namespace
+          value: cozy-etcd-operator
diff --git a/packages/system/etcd-operator/tests/selector-fix-hook_test.yaml b/packages/system/etcd-operator/tests/selector-fix-hook_test.yaml
new file mode 100644
index 0000000000..afe90da642
--- /dev/null
+++ b/packages/system/etcd-operator/tests/selector-fix-hook_test.yaml
@@ -0,0 +1,136 @@
+suite: pre-upgrade selector-fix hook — hook wiring, RBAC scope, security context, image
+
+# 1.6 changed the controller Deployment's immutable spec.selector (#3242); this
+# pre-upgrade hook deletes a pre-1.6 Deployment so Helm recreates it with the new
+# selector. Pin the parts that are easy to break and fail closed on a real
+# cluster:
+#   - it is a pre-upgrade hook, RBAC (weight -5) before the Job (weight 0);
+#   - the Role is namespaced and grants only get/list/delete on deployments;
+#   - the Job runs the digest-pinned kubectl image as a NUMERIC non-root user.
+# The last one is load-bearing: clastix/kubectl's image user is the non-numeric
+# name `nonroot`, which the kubelet cannot verify against runAsNonRoot, so
+# runAsNonRoot WITHOUT a numeric runAsUser fails admission and the hook never
+# runs — silently blocking the very upgrade it exists to unblock.
+
+templates:
+  - templates/pre-upgrade-selector-fix.yaml
+
+release:
+  name: etcd-operator
+  namespace: cozy-etcd-operator
+
+tests:
+  - it: renders four hook objects (SA + Role + RoleBinding + Job)
+    asserts:
+      - hasDocuments:
+          count: 4
+
+  - it: every rendered object is a pre-upgrade hook
+    asserts:
+      - documentIndex: 0
+        equal:
+          path: metadata.annotations["helm.sh/hook"]
+          value: pre-upgrade
+      - documentIndex: 1
+        equal:
+          path: metadata.annotations["helm.sh/hook"]
+          value: pre-upgrade
+      - documentIndex: 2
+        equal:
+          path: metadata.annotations["helm.sh/hook"]
+          value: pre-upgrade
+      - documentIndex: 3
+        equal:
+          path: metadata.annotations["helm.sh/hook"]
+          value: pre-upgrade
+
+  - it: RBAC (weight -5) is created before the Job (weight 0)
+    asserts:
+      - documentIndex: 0
+        equal:
+          path: kind
+          value: ServiceAccount
+      - documentIndex: 1
+        equal:
+          path: kind
+          value: Role
+      - documentIndex: 2
+        equal:
+          path: kind
+          value: RoleBinding
+      - documentIndex: 3
+        equal:
+          path: kind
+          value: Job
+      - documentIndex: 0
+        equal:
+          path: metadata.annotations["helm.sh/hook-weight"]
+          value: "-5"
+      - documentIndex: 3
+        equal:
+          path: metadata.annotations["helm.sh/hook-weight"]
+          value: "0"
+
+  - it: the Role is least-privilege — namespaced get/list/delete on deployments only, never a wildcard verb
+    documentIndex: 1
+    asserts:
+      - equal:
+          path: rules[0].apiGroups[0]
+          value: apps
+      - equal:
+          path: rules[0].resources[0]
+          value: deployments
+      - contains:
+          path: rules[0].verbs
+          content: get
+      - contains:
+          path: rules[0].verbs
+          content: list
+      - contains:
+          path: rules[0].verbs
+          content: delete
+      - notContains:
+          path: rules[0].verbs
+          content: "*"
+
+  - it: the Job runs as a NUMERIC non-root user so the nonroot-image passes the kubelet runAsNonRoot check
+    documentIndex: 3
+    asserts:
+      - equal:
+          path: spec.template.spec.securityContext.runAsNonRoot
+          value: true
+      - equal:
+          path: spec.template.spec.securityContext.runAsUser
+          value: 65532
+      - equal:
+          path: spec.template.spec.containers[0].securityContext.readOnlyRootFilesystem
+          value: true
+      - equal:
+          path: spec.template.spec.containers[0].securityContext.allowPrivilegeEscalation
+          value: false
+      - contains:
+          path: spec.template.spec.containers[0].securityContext.capabilities.drop
+          content: ALL
+
+  - it: the container declares resource requests and limits so the hook Pod schedules predictably
+    documentIndex: 3
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].resources.requests.cpu
+          value: 10m
+      - equal:
+          path: spec.template.spec.containers[0].resources.requests.memory
+          value: 32Mi
+      - equal:
+          path: spec.template.spec.containers[0].resources.limits.cpu
+          value: 100m
+      - equal:
+          path: spec.template.spec.containers[0].resources.limits.memory
+          value: 64Mi
+
+  - it: the kubectl image is digest-pinned (reproducible across the fleet)
+    documentIndex: 3
+    asserts:
+      - matchRegex:
+          path: spec.template.spec.containers[0].image
+          pattern: ^docker\.io/clastix/kubectl:v1\.32@sha256:[0-9a-f]{64}$
diff --git a/packages/system/etcd-operator/values.yaml b/packages/system/etcd-operator/values.yaml
new file mode 100644
index 0000000000..25de78a479
--- /dev/null
+++ b/packages/system/etcd-operator/values.yaml
@@ -0,0 +1,61 @@
+## etcd-operator controller-manager image. Published from
+## github.com/cozystack/etcd-operator. The same image doubles as the
+## snapshot/restore agent (wired through the OPERATOR_IMAGE env), so the tag
+## here must be a real, pullable ref.
+image:
+  repository: ghcr.io/cozystack/etcd-operator
+  tag: ""           # defaults to .Chart.AppVersion when empty
+  pullPolicy: IfNotPresent
+
+## DNS suffix of the Kubernetes cluster, threaded into --cluster-domain so the
+## operator builds the correct cert SAN FQDNs. Defaults to the cozystack
+## cluster domain provided via _cluster, falling back to cozy.local.
+clusterDomain: ""
+
+replicaCount: 1
+
+resources:
+  requests:
+    cpu: 100m
+    memory: 64Mi
+  limits:
+    cpu: 500m
+    # Cold-start floor. This is the limit a freshly-created Pod runs under until
+    # the VPA admission webhook has had a chance to rewrite it (see vpa below).
+    # The manager's steady-state working set is ~250Mi (the VPA's own
+    # recommendation), so a 128Mi floor OOMKills the operator on any start where
+    # the webhook does not mutate the Pod in time — e.g. a Deployment recreated
+    # out of band, or the webhook briefly unavailable during an upgrade. Keep
+    # this at or above the observed working set so the operator never depends on
+    # VPA timing merely to avoid a crash loop; the VPA still scales it further
+    # under real load up to maxAllowed.
+    memory: 256Mi
+
+vpa:
+  enabled: true
+  updateMode: Auto
+  minAllowed:
+    cpu: 100m
+    # Matches the cold-start limit floor above so the VPA never recommends BELOW
+    # the manager's ~250Mi working set.
+    memory: 256Mi
+  # maxAllowed is the VPA's scaling CEILING, deliberately well above the static
+  # resources.limits above (256Mi): with updateMode: Auto the VPA rewrites the
+  # Pod's request/limit up to this bound under real load. Do NOT "align" it down
+  # to the 256Mi limit — that would cap the autoscaler's headroom.
+  maxAllowed:
+    cpu: 1000m
+    memory: 1Gi
+
+# Image for the pre-upgrade selector-migration hook Job (see
+# templates/pre-upgrade-selector-fix.yaml). Only needs a kubectl binary. The tag
+# is digest-pinned so an upstream retag does not change what runs across the
+# fleet; refresh by resolving the current manifest-list digest
+# (`docker manifest inspect docker.io/clastix/kubectl:v1.32`) and updating
+# `digest` below. Same image the postgres-operator webhook-ready hook pins.
+# renovate: datasource=docker depName=docker.io/clastix/kubectl
+kubectlImage:
+  repository: docker.io/clastix/kubectl
+  tag: v1.32
+  digest: sha256:b9ef7d8dbe65bcc81a46c09b8dc7543103055021c4f43287bf59e92a8f4fe05c
+  pullPolicy: IfNotPresent
diff --git a/packages/system/etcd-rd/cozyrds/etcd.yaml b/packages/system/etcd-rd/cozyrds/etcd.yaml
index db809e3076..90ed8a80ac 100644
--- a/packages/system/etcd-rd/cozyrds/etcd.yaml
+++ b/packages/system/etcd-rd/cozyrds/etcd.yaml
@@ -8,7 +8,7 @@ spec:
     plural: etcds
     singular: etcd
     openAPISchema: |-
-      {"title":"Chart Values","type":"object","properties":{"size":{"description":"Persistent Volume size.","default":"4Gi","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"storageClass":{"description":"StorageClass used to store the data.","type":"string","default":""},"replicas":{"description":"Number of etcd replicas.","type":"integer","default":3},"resources":{"description":"Resource configuration for etcd.","type":"object","default":{},"properties":{"cpu":{"description":"Number of CPU cores allocated.","default":"1000m","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Amount of memory allocated.","default":"512Mi","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}},"backup":{"description":"DEPRECATED: Backup configuration. The chart still renders the legacy EtcdBackupSchedule when backup.enabled=true, but new tenants should drive backups through a BackupClass bound to the Etcd strategy (strategy.backups.cozystack.io/v1alpha1).","type":"object","default":{},"properties":{"destinationPath":{"description":"DEPRECATED: Destination path for backups (e.g. s3://bucket/path/).","type":"string","default":""},"enabled":{"description":"DEPRECATED: Enable scheduled S3 backups. Use a BackupJob against an Etcd strategy instead.","type":"boolean","default":false},"endpointURL":{"description":"DEPRECATED: S3 endpoint URL for uploads.","type":"string","default":""},"failedJobsHistoryLimit":{"description":"DEPRECATED: Number of failed backup jobs to retain.","type":"integer","default":1},"forcePathStyle":{"description":"DEPRECATED: Use path-style S3 URLs (required for MinIO and most S3-compatible providers).","type":"boolean","default":true},"region":{"description":"DEPRECATED: S3 region.","type":"string","default":""},"s3AccessKey":{"description":"DEPRECATED: Access key for S3 authentication.","type":"string","default":""},"s3SecretKey":{"description":"DEPRECATED: Secret key for S3 authentication.","type":"string","default":""},"schedule":{"description":"DEPRECATED: Cron schedule for automated backups. Use a backups.cozystack.io/Plan instead.","type":"string","default":"0 2 * * *"},"successfulJobsHistoryLimit":{"description":"DEPRECATED: Number of successful backup jobs to retain.","type":"integer","default":3}}}}}
+      {"title":"Chart Values","type":"object","properties":{"version":{"description":"etcd version (X.Y.Z) to run, set on the EtcdCluster's spec.version; the operator pulls etcd from its own configured image.","type":"string","default":"3.6.11"},"size":{"description":"Persistent Volume size.","default":"4Gi","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"storageClass":{"description":"StorageClass used to store the data.","type":"string","default":""},"replicas":{"description":"Number of etcd replicas.","type":"integer","default":3},"resources":{"description":"Resource configuration for etcd.","type":"object","default":{},"properties":{"cpu":{"description":"Number of CPU cores allocated.","default":"1000m","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Amount of memory allocated.","default":"512Mi","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}},"affinity":{"description":"Affinity rules set verbatim on the EtcdCluster's spec.affinity, replacing the chart default. When left empty the chart applies a soft (preferred) podAntiAffinity that spreads members across nodes by kubernetes.io/hostname on a best-effort basis, so a single node failure is less likely to take out more than one member. The default is intentionally soft: a hard rule would leave a member Pending when there are fewer schedulable nodes than replicas, or when node-local storage pins a member to a node. Set a hard requiredDuringSchedulingIgnoredDuringExecution rule here to forbid co-location outright (only on clusters with enough nodes and non-node-pinned storage). Note that the operator applies affinity only when it creates or replaces a member Pod and does not reschedule running members, so on a cluster that already has co-located members the rule takes effect only as each member is replaced, not retroactively.","type":"object","default":{},"x-kubernetes-preserve-unknown-fields":true}}}
   release:
     prefix: ""
     labels:
@@ -26,7 +26,7 @@ spec:
     description: Storage for Kubernetes clusters
     module: true
     icon: PHN2ZyB3aWR0aD0iMTQ0IiBoZWlnaHQ9IjE0NCIgdmlld0JveD0iMCAwIDE0NCAxNDQiIGZpbGw9Im5vbmUiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+CjxyZWN0IHg9Ii0wLjAwMTk1MzEyIiB3aWR0aD0iMTQ0IiBoZWlnaHQ9IjE0NCIgcng9IjI0IiBmaWxsPSJ1cmwoI3BhaW50MF9saW5lYXJfNjgzXzI5NjMpIi8+CjxwYXRoIGQ9Ik0xMjIuNDQyIDczLjQ3MjlDMTIxLjk1OSA3My41MTM0IDEyMS40NzQgNzMuNTMyMiAxMjAuOTU4IDczLjUzMjJDMTE3Ljk2NSA3My41MzIyIDExNS4wNjEgNzIuODMwNCAxMTIuNDQyIDcxLjU0NTFDMTEzLjMxNCA2Ni41NDIxIDExMy42ODUgNjEuNTAxOSAxMTMuNTg4IDU2LjQ4MDJDMTEwLjc0OCA1Mi4zNzIzIDEwNy41MDIgNDguNDk2NSAxMDMuODM4IDQ0LjkyNTdDMTA1LjQyOCA0MS45NDU0IDEwNy43NzggMzkuMzgxMSAxMTAuNzExIDM3LjU2MjhMMTExLjk3MSAzNi43ODQyTDExMC45ODkgMzUuNjc3NEMxMDUuOTMyIDI5Ljk4MzIgOTkuODk3MSAyNS41ODA5IDkzLjA1NDcgMjIuNTkzN0w5MS42OTAyIDIyTDkxLjM0MzcgMjMuNDQyM0M5MC41Mjc3IDI2LjgwMzYgODguODIyMiAyOS44MzYgODYuNDgwNyAzMi4yNjk1QzgxLjk4MDMgMjkuODc3NCA3Ny4yNzg4IDI3Ljk0NCA3Mi40MzA1IDI2LjQ3OTdDNjcuNTkzNyAyNy45NDA4IDYyLjkwMDUgMjkuODY4NiA1OC40MDIgMzIuMjU3MUM1Ni4wNzAxIDI5LjgyNjggNTQuMzY4OCAyNi44MDE4IDUzLjU1NiAyMy40NTAxTDUzLjIwNzIgMjIuMDA4M0w1MS44NDc3IDIyLjU5OTJDNDUuMDkxNCAyNS41NDMxIDM4Ljg5MDEgMzAuMDY0NyAzMy45MTYyIDM1LjY3NDJMMzIuOTMxOCAzNi43ODMzTDM0LjE5IDM3LjU2MTlDMzcuMTE0MiAzOS4zNzMzIDM5LjQ1NzYgNDEuOTIyNCA0MS4wNDQ0IDQ0Ljg4NjZDMzcuMzkxNyA0OC40NDM1IDM0LjE0OTUgNTIuMzA3IDMxLjMxMTkgNTYuMzk1OUMzMS4yMDE0IDYxLjQxNTQgMzEuNTUzNSA2Ni40OTI0IDMyLjQyOTcgNzEuNTY0NEMyOS44MjMxIDcyLjgzNzggMjYuOTM1OCA3My41MzE4IDIzLjk2MjggNzMuNTMxOEMyMy40NDA5IDczLjUzMTggMjIuOTUyNyA3My41MTI5IDIyLjQ3ODIgNzMuNDczM0wyMSA3My4zNjA2TDIxLjEzODUgNzQuODM2NUMyMS44NjI5IDgyLjMwMzMgMjQuMTgxNCA4OS40MDUzIDI4LjAzMzQgOTUuOTQ3MUwyOC43ODUzIDk3LjIyMzdMMjkuOTE0MiA5Ni4yNjU2QzMyLjUzMDUgOTQuMDQ2NSAzNS42OTE3IDkyLjU3NyAzOS4wNTMgOTEuOTg0N0M0MS4yNjg5IDk2LjUxNTUgNDMuODk1MyAxMDAuNzcyIDQ2Ljg3NDcgMTA0LjcyNUM1MS42Mjg3IDEwNi4zODcgNTYuNTgxOSAxMDcuNjI5IDYxLjY5NzEgMTA4LjM2N0M2Mi4xODc3IDExMS43NSA2MS43OTcgMTE1LjI0OSA2MC40NjI0IDExOC40ODRMNTkuODk5NSAxMTkuODU1TDYxLjM0NjkgMTIwLjE3NEM2NS4wNTI5IDEyMC45ODkgNjguNzkxNyAxMjEuNDA0IDcyLjQ1MjYgMTIxLjQwNEw4My41NTUxIDEyMC4xNzRMODUuMDAzOSAxMTkuODU1TDg0LjQzOTcgMTE4LjQ4MkM4My4xMDg3IDExNS4yNDYgODIuNzE4IDExMS43NDMgODMuMjA4NiAxMDguMzZDODguMzAzNiAxMDcuNjIxIDkzLjIzODQgMTA2LjM4MiA5Ny45NzQ4IDEwNC43MjVDMTAwLjk1NyAxMDAuNzY5IDEwMy41ODYgOTYuNTA5NSAxMDUuODA1IDkxLjk3MjhDMTA5LjE3NyA5Mi41NjE0IDExMi4zNTYgOTQuMDMxNyAxMTQuOTg5IDk2LjI1NzNMMTE2LjExOCA5Ny4yMTQxTDExNi44NjYgOTUuOTQwN0MxMjAuNzI1IDg5LjM5MDUgMTIzLjA0MyA4Mi4yODkxIDEyMy43NTYgNzQuODM0MkwxMjMuODk1IDczLjM2MUwxMjIuNDQyIDczLjQ3MjlaTTg4LjMxOTcgOTEuNTE4MUM4My4wNjczIDkyLjk0NjYgNzcuNzMzIDkzLjY2NzcgNzIuNDMwNSA5My42Njc3QzY3LjExMzcgOTMuNjY3NyA2MS43ODU5IDkyLjk0NyA1Ni41MjkgOTEuNTE4MUM1My42NDQ4IDg3LjAzNjYgNTEuMzY0NSA4Mi4yMzU3IDQ5LjcyMzQgNzcuMTgxMkM0OC4wODkyIDcyLjE1MDIgNDcuMTMyOSA2Ni44Nzk1IDQ2Ljg1NTQgNjEuNDUyMkM1MC4yNTA0IDU3LjI1NDcgNTQuMTExIDUzLjU3NzYgNTguMzc2NyA1MC40ODIzQzYyLjcxMTQgNDcuMzI5NCA2Ny40MjcxIDQ0Ljc2NzkgNzIuNDMwNSA0Mi44NDFDNzcuNDI1NiA0NC43NjgzIDgyLjEzMjYgNDcuMzI2MiA4Ni40NTcyIDUwLjQ2NTdDOTAuNzM5NCA1My41Nzc2IDk0LjYxNzEgNTcuMjgzMiA5OC4wMjg3IDYxLjUwN0M5Ny43Mzc4IDY2LjkwMzQgOTYuNzcgNzIuMTQzOCA5NS4xMzMgNzcuMTY2NUM5My40OTYxIDgyLjIyIDkxLjIwODQgODcuMDM2MSA4OC4zMTk3IDkxLjUxODFaTTc2Ljc2ODQgNjYuMTk3NEM3Ni43Njg0IDY5LjkwODEgNzkuNzc1NCA3Mi45MDk2IDgzLjQ4MSA3Mi45MDk2Qzg3LjE4NTcgNzIuOTA5NiA5MC4xODk1IDY5LjkwODYgOTAuMTg5NSA2Ni4xOTc0QzkwLjE4OTUgNjIuNTAxIDg3LjE4NTcgNTkuNDg4MSA4My40ODEgNTkuNDg4MUM3OS43NzU0IDU5LjQ4ODEgNzYuNzY4NCA2Mi41MDEgNzYuNzY4NCA2Ni4xOTc0Wk02OC4wOTU0IDY2LjE5NzRDNjguMDk1NCA2OS45MDgxIDY1LjA4ODggNzIuOTA5NiA2MS4zODMyIDcyLjkwOTZDNTcuNjc0OSA3Mi45MDk2IDU0LjY3NjYgNjkuOTA4NiA1NC42NzY2IDY2LjE5NzRDNTQuNjc2NiA2Mi41MDI0IDU3LjY3NTMgNTkuNDg5NCA2MS4zODMyIDU5LjQ4OTRDNjUuMDg4OCA1OS40ODk0IDY4LjA5NTQgNjIuNTAyNCA2OC4wOTU0IDY2LjE5NzRaIiBmaWxsPSJ3aGl0ZSIvPgo8ZGVmcz4KPGxpbmVhckdyYWRpZW50IGlkPSJwYWludDBfbGluZWFyXzY4M18yOTYzIiB4MT0iNS41IiB5MT0iMTEiIHgyPSIxNDEiIHkyPSIxMjQuNSIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiPgo8c3RvcCBzdG9wLWNvbG9yPSIjNTNCMkYwIi8+CjxzdG9wIG9mZnNldD0iMSIgc3RvcC1jb2xvcj0iIzQxOUVEQSIvPgo8L2xpbmVhckdyYWRpZW50Pgo8L2RlZnM+Cjwvc3ZnPgo=
-    keysOrder: [["apiVersion"], ["appVersion"], ["kind"], ["metadata"], ["metadata", "name"], ["spec", "size"], ["spec", "storageClass"], ["spec", "replicas"], ["spec", "resources"], ["spec", "resources", "cpu"], ["spec", "resources", "memory"], ["spec", "backup"], ["spec", "backup", "enabled"], ["spec", "backup", "schedule"], ["spec", "backup", "destinationPath"], ["spec", "backup", "endpointURL"], ["spec", "backup", "region"], ["spec", "backup", "forcePathStyle"], ["spec", "backup", "s3AccessKey"], ["spec", "backup", "s3SecretKey"], ["spec", "backup", "successfulJobsHistoryLimit"], ["spec", "backup", "failedJobsHistoryLimit"]]
+    keysOrder: [["apiVersion"], ["appVersion"], ["kind"], ["metadata"], ["metadata", "name"], ["spec", "version"], ["spec", "size"], ["spec", "storageClass"], ["spec", "replicas"], ["spec", "resources"], ["spec", "resources", "cpu"], ["spec", "resources", "memory"], ["spec", "affinity"]]
   secrets:
     exclude: []
     include: []
diff --git a/packages/system/external-dns/values.yaml b/packages/system/external-dns/values.yaml
index 33627179da..e2681315fc 100644
--- a/packages/system/external-dns/values.yaml
+++ b/packages/system/external-dns/values.yaml
@@ -21,3 +21,11 @@ external-dns:
   # -- Specify the DNS provider (e.g., "aws", "google", "azure", etc.)
   provider:
     name: ""
+
+  resources:
+    limits:
+      cpu: 100m
+      memory: 128Mi
+    requests:
+      cpu: 10m
+      memory: 64Mi
diff --git a/packages/system/external-secrets-operator/Makefile b/packages/system/external-secrets-operator/Makefile
index 0e1cd83abd..8bbde6be86 100644
--- a/packages/system/external-secrets-operator/Makefile
+++ b/packages/system/external-secrets-operator/Makefile
@@ -3,9 +3,21 @@ export NAMESPACE=cozy-$(NAME)
 
 include ../../../hack/package.mk
 
+test:
+	helm unittest .
+
 update:
 	rm -rf charts
 	helm repo add external-secrets https://charts.external-secrets.io
 	helm repo update external-secrets
 	helm pull external-secrets/external-secrets --untar --untardir charts
-	rm -rf charts/external-secrets/charts
\ No newline at end of file
+	rm -rf charts/external-secrets/charts
+	# Upstream already ships the named targetPort as of chart 0.19.1
+	# (external-secrets/external-secrets#5108); the vendored chart predates
+	# it, so the patch carries the same one-line change until the chart is
+	# bumped past that release. --forward matters here: against a chart that
+	# already has the named form, patch(1) would silently reverse the hunk
+	# and exit 0, quietly restoring the numeric form. With it, an
+	# already-applied patch fails loudly instead — the signal to drop both
+	# the patch and this block.
+	patch --no-backup-if-mismatch --forward -p4 < patches/webhook-service-named-target-port.patch
\ No newline at end of file
diff --git a/packages/system/external-secrets-operator/charts/external-secrets/templates/webhook-service.yaml b/packages/system/external-secrets-operator/charts/external-secrets/templates/webhook-service.yaml
index 59dbddc953..4c98cbcf01 100644
--- a/packages/system/external-secrets-operator/charts/external-secrets/templates/webhook-service.yaml
+++ b/packages/system/external-secrets-operator/charts/external-secrets/templates/webhook-service.yaml
@@ -23,7 +23,7 @@ spec:
   {{- end }}
   ports:
   - port: 443
-    targetPort: {{ .Values.webhook.port }}
+    targetPort: webhook
     protocol: TCP
     name: webhook
   {{- if .Values.webhook.metrics.service.enabled }}
diff --git a/packages/system/external-secrets-operator/patches/webhook-service-named-target-port.patch b/packages/system/external-secrets-operator/patches/webhook-service-named-target-port.patch
new file mode 100644
index 0000000000..a0ef615faa
--- /dev/null
+++ b/packages/system/external-secrets-operator/patches/webhook-service-named-target-port.patch
@@ -0,0 +1,28 @@
+# Upstream renders the webhook Service's targetPort from webhook.port as a
+# number. A numeric targetPort is copied into every endpoint regardless of
+# what each Pod actually listens on, so changing webhook.port aims the
+# Service at a port the outgoing Pod does not serve until its replacement
+# passes readiness — rejecting admission for externalsecrets, secretstores
+# and clustersecretstores, and breaking CRD conversion, which routes through
+# the same Service. A named targetPort is resolved per-Pod by the
+# EndpointSlice controller, so old and new Pods are each reached on the port
+# they serve and the rollout has no gap.
+#
+# The containerPort is already named "webhook" upstream, and the metrics port
+# in this same Service already uses its name, so this only makes the webhook
+# port consistent with its neighbour. It belongs upstream; until it lands
+# there, values.yaml depends on this patch to change webhook.port safely.
+#
+diff --git a/packages/system/external-secrets-operator/charts/external-secrets/templates/webhook-service.yaml b/packages/system/external-secrets-operator/charts/external-secrets/templates/webhook-service.yaml
+index 59dbddc95..4c98cbcf0 100644
+--- a/packages/system/external-secrets-operator/charts/external-secrets/templates/webhook-service.yaml
++++ b/packages/system/external-secrets-operator/charts/external-secrets/templates/webhook-service.yaml
+@@ -23,7 +23,7 @@ spec:
+   {{- end }}
+   ports:
+   - port: 443
+-    targetPort: {{ .Values.webhook.port }}
++    targetPort: webhook
+     protocol: TCP
+     name: webhook
+   {{- if .Values.webhook.metrics.service.enabled }}
diff --git a/packages/system/external-secrets-operator/tests/webhook_port_test.yaml b/packages/system/external-secrets-operator/tests/webhook_port_test.yaml
new file mode 100644
index 0000000000..452de5a30e
--- /dev/null
+++ b/packages/system/external-secrets-operator/tests/webhook_port_test.yaml
@@ -0,0 +1,115 @@
+suite: external-secrets webhook port
+
+# Keeps the webhook off the kubelet's port. The values.yaml override and
+# patches/webhook-service-named-target-port.patch carry the reasoning; it is
+# not repeated here.
+#
+# Two of these are regression guards. The first pins the listener flag and
+# the advertised containerPort; the second pins the Service to the container
+# port *name*, which is what lets the port move without dropping traffic —
+# carried as a vendored patch here, and upstream's own shape since chart
+# 0.19.1 (external-secrets/external-secrets#5108), so it survives a future
+# chart bump unchanged. This chart's values.schema.json sets no
+# additionalProperties: false, so an upstream rename of webhook.port is
+# accepted and silently ignored rather than failing helm — these tests are
+# the only thing between a re-vendored chart and a silent revert to 10250.
+#
+# The rest pin preconditions that already hold and that the reasoning in
+# values.yaml depends on: that the port lives in the Pod's network namespace
+# rather than the node's, that admission fails closed, and that CRD
+# conversion routes through the same Service the port change moves.
+
+templates:
+  - charts/external-secrets/templates/webhook-deployment.yaml
+  - charts/external-secrets/templates/webhook-service.yaml
+  - charts/external-secrets/templates/validatingwebhook.yaml
+  - charts/external-secrets/templates/crds/externalsecret.yaml
+
+release:
+  name: external-secrets-operator
+  namespace: cozy-external-secrets-operator
+
+tests:
+  - it: serves the webhook on 10260, not the kubelet's 10250
+    template: charts/external-secrets/templates/webhook-deployment.yaml
+    asserts:
+      - isKind:
+          of: Deployment
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: --port=10260
+      - contains:
+          path: spec.template.spec.containers[0].ports
+          content:
+            containerPort: 10260
+            protocol: TCP
+            name: webhook
+
+  - it: reaches the webhook by container-port name, so the port can move without a traffic gap
+    template: charts/external-secrets/templates/webhook-service.yaml
+    asserts:
+      - isKind:
+          of: Service
+      - equal:
+          path: spec.ports[0].port
+          value: 443
+      # A name, not a number. The vendored chart renders targetPort from
+      # webhook.port, which every endpoint then shares regardless of what its
+      # Pod actually listens on; the named form makes the EndpointSlice
+      # controller resolve it per-Pod instead. Applied by the vendored patch
+      # here and shipped by upstream since chart 0.19.1. If this ever reverts
+      # to an integer, a future port change silently reintroduces the gap.
+      - equal:
+          path: spec.ports[0].targetPort
+          value: webhook
+      - equal:
+          path: spec.ports[0].name
+          value: webhook
+
+  - it: keeps the webhook off the host network, so the port lives in the Pod netns
+    template: charts/external-secrets/templates/webhook-deployment.yaml
+    asserts:
+      - equal:
+          path: spec.template.spec.hostNetwork
+          value: false
+
+  - it: fails admission closed, which is what makes a misroute cluster-wide
+    template: charts/external-secrets/templates/validatingwebhook.yaml
+    documentIndex: 1
+    asserts:
+      - isKind:
+          of: ValidatingWebhookConfiguration
+      - equal:
+          path: metadata.name
+          value: externalsecret-validate
+      - equal:
+          path: webhooks[0].failurePolicy
+          value: Fail
+
+  - it: leaves the secretstore webhooks on the apiserver's default failurePolicy of Fail
+    template: charts/external-secrets/templates/validatingwebhook.yaml
+    documentIndex: 0
+    asserts:
+      - equal:
+          path: metadata.name
+          value: secretstore-validate
+      # These two carry no explicit failurePolicy and inherit Fail from the
+      # apiserver. Asserting absence pins that: an upstream addition of
+      # "Ignore" here would quietly widen the blast radius reasoning in
+      # values.yaml without any other test noticing.
+      - notExists:
+          path: webhooks[0].failurePolicy
+      - notExists:
+          path: webhooks[1].failurePolicy
+
+  - it: routes CRD conversion through the same Service, so the port change reaches it too
+    template: charts/external-secrets/templates/crds/externalsecret.yaml
+    asserts:
+      - isKind:
+          of: CustomResourceDefinition
+      - equal:
+          path: spec.conversion.strategy
+          value: Webhook
+      - equal:
+          path: spec.conversion.webhook.clientConfig.service.name
+          value: external-secrets-operator-webhook
diff --git a/packages/system/external-secrets-operator/values.yaml b/packages/system/external-secrets-operator/values.yaml
index 0deabf466e..ce3b59ea43 100644
--- a/packages/system/external-secrets-operator/values.yaml
+++ b/packages/system/external-secrets-operator/values.yaml
@@ -2,3 +2,61 @@ external-secrets:
   bitwarden-sdk-server:
     enabled: false  
   installCRDs: true
+  webhook:
+    # Upstream defaults this to 10250, the port the kubelet serves on. When a
+    # connection to the webhook Service resolves to a node IP rather than a
+    # Pod IP, it reaches the kubelet, which completes the TLS handshake with
+    # its node serving certificate, and the apiserver rejects the call with
+    # "x509: certificate is valid for <node>, not
+    # external-secrets-operator-webhook.cozy-external-secrets-operator.svc".
+    # The certificate is valid — it is simply the wrong server's — so the
+    # error reads as a PKI fault and hides the misroute that caused it. This
+    # does not prevent the misroute; it moves the listener to a port nothing
+    # else answers on, so the same misroute surfaces as a connection refusal
+    # that names the real problem.
+    #
+    # 10250 is not an accident upstream, and the reason is worth stating
+    # before overriding it. cert-manager's chart spells out why charts pick
+    # it: in GKE private clusters the apiserver may reach nodes only on 443
+    # and 10250, so 10250 works there without extra firewall rules. That is a
+    # property of a managed platform's node firewall, not of Kubernetes. This
+    # package is installed into the management cluster only, so the caller is
+    # always that cluster's apiserver, and on cozystack's own substrates —
+    # Talos, generic k3s, kubeadm — nothing filters it from a Pod port. The
+    # exception to check is the hosted variant (cozystackOperator.variant:
+    # hosted, bundle isp-hosted), which exists to run on managed control
+    # planes, EKS and GKE among them. Its stock preset does not render this
+    # package and the package is opt-in besides, so reaching the bad
+    # combination takes enabling both deliberately — but on a platform that
+    # restricts apiserver egress this override is wrong and should be
+    # dropped.
+    #
+    # The replacement port only helps if nothing answers on it in the node's
+    # network namespace, since that is where the misroute lands. That rules
+    # out 9443, the controller-runtime default and the number most webhooks
+    # here use: the etcd kube-rbac-proxy binds it on host-network, as
+    # packages/system/cilium-networkpolicy records, so 9443 would swap the
+    # kubelet's certificate for that proxy's and reproduce the same misleading
+    # error. Nothing in this repo binds 10260. It is
+    # CloudControllerManagerWebhookPort in k8s.io/cloud-provider, worth
+    # remembering if a host-network workload here ever links that framework.
+    # Neither cloud-controller-manager present does today: local-ccm does run
+    # host-network, but it is a bespoke binary whose flags carry no webhook or
+    # secure-port listener, and the kubevirt one is a pod-networked
+    # Deployment, so whatever it binds stays in a Pod namespace.
+    #
+    # Under webhook.hostNetwork the webhook would itself join the node
+    # namespace, where the clusterwide policy in cilium-networkpolicy denies
+    # 10250 from the world but has no entry for 10260 — enabling hostNetwork
+    # means revisiting that policy.
+    #
+    # Moving this port is only safe because patches/ points the Service at the
+    # "webhook" container-port name. Upstream renders targetPort from this
+    # value as a number, which every endpoint shares regardless of what its
+    # Pod listens on, so a port change would leave the Service aimed at a port
+    # the outgoing Pod does not serve until the replacement passes readiness —
+    # rejecting admission for externalsecrets, secretstores and
+    # clustersecretstores, and breaking CRD conversion, which routes through
+    # the same Service. A named targetPort resolves per-Pod and closes that
+    # window. See patches/webhook-service-named-target-port.patch.
+    port: 10260
diff --git a/packages/system/flux-plunger/Makefile b/packages/system/flux-plunger/Makefile
index 8177fedd9f..1ed805bc76 100644
--- a/packages/system/flux-plunger/Makefile
+++ b/packages/system/flux-plunger/Makefile
@@ -4,16 +4,16 @@ export NAMESPACE=cozy-fluxcd
 include ../../../hack/common-envs.mk
 include ../../../hack/package.mk
 
+.PHONY: test
+test:
+	helm unittest .
+
 image:
 	docker buildx build -f images/flux-plunger/Dockerfile ../../../ \
-		--provenance false \
 		$(call image-tags,flux-plunger,v$(COZYSTACK_VERSION)) \
-		--cache-from type=registry,ref=$(REGISTRY)/flux-plunger:latest \
-		--cache-to type=inline \
+		$(call cache-args,flux-plunger) \
 		--metadata-file images/flux-plunger.json \
-		--push=$(PUSH) \
-		--label "org.opencontainers.image.source=https://github.com/cozystack/cozystack" \
-		--load=$(LOAD)
+		$(BUILDX_ARGS)
 	IMAGE="$(REGISTRY)/flux-plunger:$(IMAGE_TAG)@$$(yq e '."containerimage.digest"' images/flux-plunger.json -o json -r)" \
 		yq -i '.image = strenv(IMAGE)' values.yaml
 	rm -f images/flux-plunger.json
diff --git a/packages/system/flux-plunger/README.md b/packages/system/flux-plunger/README.md
new file mode 100644
index 0000000000..93361f5685
--- /dev/null
+++ b/packages/system/flux-plunger/README.md
@@ -0,0 +1,31 @@
+# flux-plunger
+
+Recovers a HelmRelease stuck with `has no deployed releases`: it suspends the release, deletes the stale Helm storage Secret, records the processed revision in the `flux-plunger.cozystack.io/last-processed-version` annotation, and unsuspends.
+
+## The uninstall fence
+
+While a release is suspended for recovery it also carries the finalizer `flux-plunger.cozystack.io/uninstall-fence`. helm-controller skips the Helm uninstall of a suspended HelmRelease that is deleted, so without the fence a delete arriving during recovery would leave the release's resources behind. With it, flux-plunger lifts its suspension, helm-controller runs the uninstall, and flux-plunger then removes the fence. A delete held this way for more than ten minutes raises an `UninstallFenceHeld` Warning on the HelmRelease.
+
+When flux-plunger stops it gives up the fences it holds itself, within its termination grace period (`shutdownGracePeriodSeconds`, 90 by default, accepted between 40 and 140): its manager is given 10 seconds to stop, and the drain 25 seconds less than the grace period. The next flux-plunger starts while the old one is still terminating, on a rollout as on an eviction or a node drain, so a single writer is kept by leader election: the old pod holds its Lease through the drain without giving it up, and the Lease outlasts the drain, so a new pod waits for it to run out, a little under two minutes at the default, before it acts. A recovery in progress is aborted: the suspension and the fence go together, and the next flux-plunger starts the recovery again. A release being deleted has flux-plunger's suspension lifted and keeps the fence until helm-controller has run its uninstall, which the drain waits for; one helm-controller has not handled when the grace period runs out keeps its fence. Uninstalling this chart then releases whatever is left: a pre-delete hook stops flux-plunger, waits out its grace period, and lifts any remaining suspension and fence without waiting again. It lifts a suspension only where flux-plunger is the sole manager holding it, which is the outcome flux-plunger's own relinquish has, so a suspension another manager also holds stays; it does so with a patch of `spec.suspend` alone rather than a `kubectl apply`, which on a release last written by a client-side apply would take over and strip the fields that apply set. A release it unfences that was being deleted, that helm-controller's own finalizer no longer held and whose latest generation helm-controller had not observed, is deleted without an uninstall and is named as such. The Job's 240-second deadline sits under the 300 seconds helm-controller allows a pre-delete hook by default. A Deployment that cannot be read or scaled down (flux-plunger would keep running and could fence behind the sweep) ends the hook before any fence is touched, a listing that never succeeds ends it before any fence is touched too, and a fence the hook cannot remove ends it after the sweep; either way the hook exits non-zero, which fails the uninstall and makes helm-controller retry it, hook included. A flux-plunger Deployment that is already gone has nothing to stop, and a flux-plunger pod that is still there after its grace period, typically one stuck `Terminating` on a `NotReady` node, is named and the sweep goes on, since failing on it would fail every retry until the node returns or the pod is force-deleted; because such a pod may still be fencing, the fences are listed again after the sweep, and any found fails the hook. Its report, `released N of M fenced HelmReleases, K without an uninstall` and a line per release, stays readable for ten minutes after the Job finishes, success included: `kubectl logs --namespace cozy-fluxcd job/flux-plunger-uninstall-fence-cleanup`.
+
+If flux-plunger is merely stopped (scaled to zero) rather than uninstalled, or killed without a graceful stop, a fenced release that is deleted and that helm-controller has not uninstalled stays `Terminating` until flux-plunger runs again. To release one by hand, after confirming its uninstall has run or is not wanted, remove the finalizer at the position `INDEX` it has in `metadata.finalizers`; the `test` operation makes the patch fail rather than remove another finalizer if the list has changed:
+
+```bash
+kubectl patch helmrelease NAME --namespace NAMESPACE --type json --patch '[{"op":"test","path":"/metadata/finalizers/INDEX","value":"flux-plunger.cozystack.io/uninstall-fence"},{"op":"remove","path":"/metadata/finalizers/INDEX"}]'
+```
+
+Fenced releases can be listed with:
+
+```bash
+kubectl get helmreleases.helm.toolkit.fluxcd.io --all-namespaces --output go-template='{{range .items}}{{$ns := .metadata.namespace}}{{$name := .metadata.name}}{{range .metadata.finalizers}}{{if eq . "flux-plunger.cozystack.io/uninstall-fence"}}{{$ns}}/{{$name}}{{"\n"}}{{end}}{{end}}{{end}}'
+```
+
+## Suspensions left by an earlier flux-plunger
+
+Earlier flux-plunger releases set `spec.suspend` through the shared `flux-client-side-apply` manager, so a suspension one of them left behind cannot be told apart from a migration's or an operator's and is treated as external: it is not cleared automatically. Such a leftover exists only if the old pod stopped in the middle of a recovery, and flux-plunger raises a `SuspensionNotOwned` Warning on it. To list candidates, suspended releases carrying the flux-plunger annotation whose `spec.suspend` is not owned by flux-plunger's apply:
+
+```bash
+kubectl get helmreleases.helm.toolkit.fluxcd.io --all-namespaces --output json | jq --raw-output '.items[] | select(.spec.suspend == true) | select(.metadata.annotations["flux-plunger.cozystack.io/last-processed-version"] != null) | select([.metadata.managedFields[]? | select(.manager == "flux-plunger" and .operation == "Apply" and .fieldsV1["f:spec"]["f:suspend"] != null)] | length == 0) | "\(.metadata.namespace)/\(.metadata.name)"'
+```
+
+Clearing one is an operator action: confirm nothing else (a migration, a restore) is holding it, then resume it with `flux resume helmrelease NAME --namespace NAMESPACE`.
diff --git a/packages/system/flux-plunger/images/flux-plunger/Dockerfile b/packages/system/flux-plunger/images/flux-plunger/Dockerfile
index 2984840ff6..4b37358a20 100644
--- a/packages/system/flux-plunger/images/flux-plunger/Dockerfile
+++ b/packages/system/flux-plunger/images/flux-plunger/Dockerfile
@@ -1,4 +1,5 @@
-FROM golang:1.26-alpine AS builder
+FROM --platform=$BUILDPLATFORM golang:1.27-alpine@sha256:8a5910f31396cd4d89662f56c68b3ae31d374308270a1c3bd96672ee5ed43414 AS builder
+ARG GOPROXY
 
 ARG TARGETOS
 ARG TARGETARCH
@@ -6,7 +7,7 @@ ARG TARGETARCH
 WORKDIR /workspace
 
 COPY go.mod go.sum ./
-RUN GOOS=$TARGETOS GOARCH=$TARGETARCH go mod download
+RUN for attempt in 1 2 3; do GOOS=$TARGETOS GOARCH=$TARGETARCH go mod download && break; [ "$attempt" = 3 ] && exit 1; sleep $((attempt * 10)); done
 
 COPY pkg pkg/
 COPY cmd cmd/
diff --git a/packages/system/flux-plunger/templates/deployment.yaml b/packages/system/flux-plunger/templates/deployment.yaml
index 7ce6bb13c2..fd856d2515 100644
--- a/packages/system/flux-plunger/templates/deployment.yaml
+++ b/packages/system/flux-plunger/templates/deployment.yaml
@@ -6,7 +6,34 @@ metadata:
     app.kubernetes.io/name: flux-plunger
     app.kubernetes.io/instance: {{ .Release.Name }}
 spec:
+  {{- /*
+  flux-plunger treats a suspension its own field manager owns, seen in a fresh
+  reconcile, as its own interrupted run, so exactly one process may act on a
+  HelmRelease at a time. No rollout strategy gives that: the next pod starts as
+  soon as the old one is terminating, and an eviction or a node drain replaces a
+  pod the same way, while the old one stops its manager and drains its fences
+  (cmd/flux-plunger/main.go). What keeps a single writer is the leader Lease
+  (--leader-elect), which the old pod holds through the drain and which outlasts
+  it, so the next pod waits for it before it acts. maxSurge 0 only keeps a rollout
+  from starting the next pod before the old one is told to stop. This stays
+  RollingUpdate rather than Recreate because existing installs carry the
+  apiserver-defaulted rollingUpdate block (the chart shipped without a strategy),
+  and helm-controller applies server-side, where type Recreate over that block is
+  rejected on upgrade.
+  */}}
+  {{- $grace := int .Values.shutdownGracePeriodSeconds }}
+  {{- if ne (toString .Values.shutdownGracePeriodSeconds) (toString $grace) }}
+  {{- fail "shutdownGracePeriodSeconds must be a whole number of seconds: terminationGracePeriodSeconds takes an integer" }}
+  {{- end }}
+  {{- if or (lt $grace 40) (gt $grace 140) }}
+  {{- fail "shutdownGracePeriodSeconds must be between 40 and 140: below, the drain gets no time after the manager's 10s stop; above, the pre-delete hook cannot wait the pod out inside its deadline" }}
+  {{- end }}
   replicas: 1
+  strategy:
+    type: RollingUpdate
+    rollingUpdate:
+      maxSurge: 0
+      maxUnavailable: 1
   selector:
     matchLabels:
       app.kubernetes.io/name: flux-plunger
@@ -18,6 +45,7 @@ spec:
         app.kubernetes.io/instance: {{ .Release.Name }}
     spec:
       serviceAccountName: flux-plunger
+      terminationGracePeriodSeconds: {{ .Values.shutdownGracePeriodSeconds }}
       containers:
       - name: flux-plunger
         image: "{{ .Values.image }}"
@@ -29,6 +57,9 @@ spec:
         {{- end }}
         - --metrics-bind-address=:8080
         - --metrics-secure=false
+        - --leader-elect
+        # The manager's stop takes up to 10s; the rest leaves 15s before SIGKILL.
+        - --shutdown-drain-timeout={{ sub .Values.shutdownGracePeriodSeconds 25 }}s
         ports:
         - name: metrics
           containerPort: 8080
diff --git a/packages/system/flux-plunger/templates/rbac.yaml b/packages/system/flux-plunger/templates/rbac.yaml
index 97d4eac7e3..9f47ac21c2 100644
--- a/packages/system/flux-plunger/templates/rbac.yaml
+++ b/packages/system/flux-plunger/templates/rbac.yaml
@@ -22,6 +22,13 @@ rules:
   - get
   - list
   - delete
+- apiGroups:
+  - ""
+  resources:
+  - events
+  verbs:
+  - create
+  - patch
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
@@ -35,3 +42,28 @@ subjects:
 - kind: ServiceAccount
   name: flux-plunger
   namespace: {{ .Release.Namespace }}
+---
+# The leader Lease (--leader-elect) lives in the release namespace.
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: flux-plunger-leader-election
+  namespace: {{ .Release.Namespace }}
+rules:
+- apiGroups: ["coordination.k8s.io"]
+  resources: ["leases"]
+  verbs: ["get", "list", "watch", "create", "update", "patch"]
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: flux-plunger-leader-election
+  namespace: {{ .Release.Namespace }}
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: flux-plunger-leader-election
+subjects:
+- kind: ServiceAccount
+  name: flux-plunger
+  namespace: {{ .Release.Namespace }}
diff --git a/packages/system/flux-plunger/templates/uninstall-fence-cleanup.yaml b/packages/system/flux-plunger/templates/uninstall-fence-cleanup.yaml
new file mode 100644
index 0000000000..669d0f8048
--- /dev/null
+++ b/packages/system/flux-plunger/templates/uninstall-fence-cleanup.yaml
@@ -0,0 +1,391 @@
+{{- /*
+  flux-plunger sets a finalizer, flux-plunger.cozystack.io/uninstall-fence, on a
+  HelmRelease it is recovering, and only flux-plunger removes it. When it stops it
+  gives them all up itself (DrainFences): it lifts its suspensions and, within its
+  termination grace period, waits for helm-controller to uninstall each release
+  being deleted before lifting that fence. This hook is the backstop for what the
+  drain could not finish, so that removing the chart never leaves a release that
+  tenant teardown waits on forever: it stops flux-plunger, waits out the drain,
+  then lifts any suspension and fence that remain, without waiting again.
+
+  Two bounds apply. helm-controller runs a pre-delete hook under the release's
+  uninstall timeout, 300s by default (the operator sets none), counted from when
+  helm creates the hook; the Job's activeDeadlineSeconds is counted from the Job's
+  start, so it has to end first, with room for the pod to be scheduled and pulled.
+  The pod wait covers flux-plunger's grace period, and the sweep has the rest.
+
+  A scale-down or a listing that never succeeds ends the hook before any fence is
+  touched, and a fence that cannot be removed ends it once the sweep is done.
+  Either way it exits non-zero: the failed hook fails the uninstall before helm
+  records anything, and helm-controller retries it, running this hook again from a
+  state it can still converge from; exiting 0 would let the chart go and leave the
+  fence with nothing to remove it. A pod still there after its grace period is
+  named and the sweep goes on; since that pod may still be fencing, the fences are
+  listed again after the sweep, and any found fails the hook the same way.
+*/ -}}
+{{- $img := printf "%s:%s" .Values.kubectlImage.repository .Values.kubectlImage.tag }}
+{{- with .Values.kubectlImage.digest }}{{- $img = printf "%s@%s" $img . }}{{- end }}
+{{- $deadline := 240 }}
+{{- $podWait := add .Values.shutdownGracePeriodSeconds 10 }}
+{{- $retryWindow := sub $deadline 60 }}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: flux-plunger-uninstall-fence-cleanup
+  namespace: {{ .Release.Namespace }}
+  annotations:
+    helm.sh/hook: pre-delete
+    helm.sh/hook-weight: "-10"
+    helm.sh/hook-delete-policy: hook-succeeded,hook-failed,before-hook-creation
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: flux-plunger-uninstall-fence-cleanup
+  annotations:
+    helm.sh/hook: pre-delete
+    helm.sh/hook-weight: "-10"
+    helm.sh/hook-delete-policy: hook-succeeded,hook-failed,before-hook-creation
+rules:
+  - apiGroups: ["helm.toolkit.fluxcd.io"]
+    resources: ["helmreleases"]
+    verbs: ["get", "list", "patch"]
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: flux-plunger-uninstall-fence-cleanup
+  annotations:
+    helm.sh/hook: pre-delete
+    helm.sh/hook-weight: "-10"
+    helm.sh/hook-delete-policy: hook-succeeded,hook-failed,before-hook-creation
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: flux-plunger-uninstall-fence-cleanup
+subjects:
+  - kind: ServiceAccount
+    name: flux-plunger-uninstall-fence-cleanup
+    namespace: {{ .Release.Namespace }}
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: flux-plunger-uninstall-fence-cleanup
+  namespace: {{ .Release.Namespace }}
+  annotations:
+    helm.sh/hook: pre-delete
+    helm.sh/hook-weight: "-10"
+    helm.sh/hook-delete-policy: hook-succeeded,hook-failed,before-hook-creation
+rules:
+  # kubectl scale reads the Deployment, then patches its scale subresource.
+  - apiGroups: ["apps"]
+    resources: ["deployments"]
+    resourceNames: ["flux-plunger"]
+    verbs: ["get"]
+  - apiGroups: ["apps"]
+    resources: ["deployments/scale"]
+    resourceNames: ["flux-plunger"]
+    verbs: ["patch"]
+  - apiGroups: [""]
+    resources: ["pods"]
+    verbs: ["get", "list", "watch"]
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: flux-plunger-uninstall-fence-cleanup
+  namespace: {{ .Release.Namespace }}
+  annotations:
+    helm.sh/hook: pre-delete
+    helm.sh/hook-weight: "-10"
+    helm.sh/hook-delete-policy: hook-succeeded,hook-failed,before-hook-creation
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: flux-plunger-uninstall-fence-cleanup
+subjects:
+  - kind: ServiceAccount
+    name: flux-plunger-uninstall-fence-cleanup
+    namespace: {{ .Release.Namespace }}
+---
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: flux-plunger-uninstall-fence-cleanup
+  namespace: {{ .Release.Namespace }}
+  annotations:
+    helm.sh/hook: pre-delete
+    helm.sh/hook-weight: "0"
+    # No hook-succeeded: a succeeded Job would go with its pod and the report
+    # in its log. helm.sh/hook-output-log-policy cannot stand in for that, since
+    # helm-controller calls a nil output writer for it
+    # (https://github.com/fluxcd/helm-controller/issues/1562).
+    helm.sh/hook-delete-policy: before-hook-creation
+spec:
+  # Under helm's own bound for the hook; see the header.
+  activeDeadlineSeconds: {{ $deadline }}
+  # One run fills the deadline; helm-controller retries the whole uninstall,
+  # with a fresh budget, instead of a second pod racing it out.
+  backoffLimit: 0
+  # The finished Job, and the report in its pod's log, outlive the chart this long.
+  ttlSecondsAfterFinished: 600
+  template:
+    spec:
+      serviceAccountName: flux-plunger-uninstall-fence-cleanup
+      restartPolicy: Never
+      securityContext:
+        runAsNonRoot: true
+        runAsUser: 65532
+        seccompProfile:
+          type: RuntimeDefault
+      # kubectl keeps its discovery cache under $HOME; under a read-only root
+      # filesystem the emptyDir is the one place it can write it.
+      volumes:
+        - name: kube-cache
+          emptyDir: {}
+      containers:
+        - name: cleanup
+          image: {{ $img }}
+          imagePullPolicy: {{ .Values.kubectlImage.pullPolicy }}
+          # Same small fixed footprint as the other hooks that run this image,
+          # so the pod is scheduled promptly inside the deadline.
+          resources:
+            requests:
+              cpu: 10m
+              memory: 32Mi
+            limits:
+              cpu: 100m
+              memory: 64Mi
+          securityContext:
+            allowPrivilegeEscalation: false
+            readOnlyRootFilesystem: true
+            capabilities:
+              drop: ["ALL"]
+          env:
+            - name: NAMESPACE
+              value: {{ .Release.Namespace }}
+            - name: HOME
+              value: /tmp
+          volumeMounts:
+            - name: kube-cache
+              mountPath: /tmp
+          command:
+            - sh
+            - -c
+            - |
+              set -u
+              fence=flux-plunger.cozystack.io/uninstall-fence
+              deploy=flux-plunger
+              hr=helmreleases.helm.toolkit.fluxcd.io
+              # HR_SCOPE narrows the sweep so the script can be exercised against
+              # one namespace; the hook itself always covers the cluster.
+              scope="${HR_SCOPE:---all-namespaces}"
+              # The pod is given its grace period, and a little more, to drain.
+              pod_wait={{ $podWait }}
+              # Retries stop here, a minute short of activeDeadlineSeconds, which
+              # counts from the Job's start, so the report is still written when
+              # scheduling and the image pull took part of it. The pod wait is cut
+              # to what is left of this window too.
+              retry_until=$(( $(date +%s) + {{ $retryWindow }} ))
+              # Each fenced release once, however many copies of the fence it
+              # carries: the apiserver accepts a finalizer listed twice.
+              listing='{{`{{range .items}}{{$fenced := false}}{{range .metadata.finalizers}}{{if eq . "flux-plunger.cozystack.io/uninstall-fence"}}{{$fenced = true}}{{end}}{{end}}{{if $fenced}}{{.metadata.namespace}}/{{.metadata.name}}{{"\n"}}{{end}}{{end}}`}}'
+
+              # No per-call --request-timeout: any client override makes kubectl
+              # skip the in-cluster config and dial localhost:8080. A wedged call
+              # is bounded by activeDeadlineSeconds instead, and a Job killed by
+              # it fails the uninstall, which helm-controller then retries.
+
+              # retry <cmd>...: run until it succeeds or the retry window closes,
+              # at least once. Only the successful attempt's output is printed:
+              # kubectl prints what it has before it fails, and that must not be
+              # read as part of the answer. Each failure's stderr stays in the log.
+              retry() {
+                while :; do
+                  if out=$("$@"); then
+                    printf '%s\n' "$out"
+                    return 0
+                  fi
+                  [ "$(date +%s)" -lt "$retry_until" ] || return 1
+                  sleep 2
+                done
+              }
+
+              # lift_suspension <ns> <name>: lift the spec.suspend flux-plunger's
+              # apply owns, with the same outcome as the controller's relinquish: a
+              # suspension another manager also holds is left standing. Not with
+              # kubectl apply --server-side: on a release created by a client-side
+              # kubectl apply it hands every field that apply set to flux-plunger
+              # and then strips them. The patch is preconditioned on the
+              # resourceVersion and uid of the read that decided on it, and a write
+              # landing in between makes it read again. Returns 2 when the release
+              # cannot be read, 1 when the suspension cannot be lifted.
+              lift_suspension() {
+                ls_ns=$1
+                ls_name=$2
+                while :; do
+                  if ! read_out=$(retry kubectl --namespace "$ls_ns" get "$hr" "$ls_name" --ignore-not-found --output go-template='{{`{{.metadata.resourceVersion}} {{.metadata.uid}} {{if .spec.suspend}}{{range .metadata.managedFields}}{{$owns := false}}{{range $k, $v := .fieldsV1}}{{if eq $k "f:spec"}}{{range $k2, $v2 := $v}}{{if eq $k2 "f:suspend"}}{{$owns = true}}{{end}}{{end}}{{end}}{{end}}{{if $owns}}{{if and (eq .manager "flux-plunger") (eq .operation "Apply")}} yes{{end}}{{if ne .manager "flux-plunger"}} other{{end}}{{end}}{{end}}{{end}}`}}'); then
+                    return 2
+                  fi
+                  # shellcheck disable=SC2086 # split into resourceVersion, uid, marks
+                  set -- $read_out
+                  [ "$#" -ge 2 ] || return 0
+                  ls_rv=$1
+                  ls_uid=$2
+                  shift 2
+                  case "$*" in
+                    *other*) return 0 ;;
+                    *yes*) ;;
+                    *) return 0 ;;
+                  esac
+                  if kubectl --namespace "$ls_ns" patch "$hr" "$ls_name" --type json --field-manager flux-plunger \
+                    --patch "[{\"op\":\"test\",\"path\":\"/metadata/resourceVersion\",\"value\":\"$ls_rv\"},{\"op\":\"test\",\"path\":\"/metadata/uid\",\"value\":\"$ls_uid\"},{\"op\":\"replace\",\"path\":\"/spec/suspend\",\"value\":false}]"; then
+                    return 0
+                  fi
+                  [ "$(date +%s)" -lt "$retry_until" ] || return 1
+                  sleep 2
+                done
+              }
+
+              # release_fence <ns> <name>: remove the fence at the index it holds
+              # now, and again if the apiserver, which accepts a finalizer listed
+              # twice, has it twice. A failed patch is retried with a fresh read,
+              # because helm-controller keeps adding and dropping its own finalizer
+              # ahead of the fence while this runs. A release or fence already
+              # gone counts as released; one whose fence keeps coming back, as
+              # under a flux-plunger still running, gives up after a few copies.
+              release_fence() {
+                removed=0
+                while :; do
+                  if idx=$(kubectl --namespace "$1" get "$hr" "$2" --ignore-not-found --output go-template='{{`{{range $i, $f := .metadata.finalizers}}{{if eq $f "flux-plunger.cozystack.io/uninstall-fence"}}{{$i}} {{end}}{{end}}`}}'); then
+                    idx=${idx%% *}
+                    [ -n "$idx" ] || return 0
+                    [ "$removed" -lt 8 ] || return 1
+                    case "$idx" in
+                      *[!0-9]*) echo "unexpected finalizer index '$idx' on $1/$2" >&2 ;;
+                      *)
+                        if kubectl --namespace "$1" patch "$hr" "$2" --type json \
+                          --patch "[{\"op\":\"test\",\"path\":\"/metadata/finalizers/$idx\",\"value\":\"$fence\"},{\"op\":\"remove\",\"path\":\"/metadata/finalizers/$idx\"}]"; then
+                          removed=$((removed + 1))
+                          continue
+                        fi ;;
+                    esac
+                  fi
+                  [ "$(date +%s)" -lt "$retry_until" ] || return 1
+                  sleep 2
+                done
+              }
+
+              # flux-plunger gives up its fences itself when it stops: it lifts its
+              # suspensions and waits, within its grace period, for helm-controller
+              # to uninstall each release being deleted. So stop it and wait for
+              # the pod to go before sweeping. A scale-down that fails exits before
+              # any fence is touched, since a flux-plunger still running could set a
+              # fence behind the sweep and the retried uninstall should start from
+              # the same state; a Deployment already gone has nothing to stop.
+              if ! present=$(retry kubectl --namespace "$NAMESPACE" get deployment "$deploy" --ignore-not-found --output name); then
+                echo "could not read the $deploy Deployment; no fence was touched" >&2
+                exit 1
+              fi
+              if [ -z "$present" ]; then
+                echo "no $deploy Deployment in $NAMESPACE; nothing to stop"
+              elif ! retry kubectl --namespace "$NAMESPACE" scale deployment "$deploy" --replicas=0; then
+                echo "could not scale $deploy down; no fence was touched" >&2
+                exit 1
+              fi
+              # A pod still there after its grace period is named, not failed on:
+              # the usual one is stuck Terminating on a NotReady node until the node
+              # returns or the pod is force-deleted, and failing would fail every
+              # retried uninstall. A wait that failed for another reason is told
+              # apart by listing the pods.
+              wait_for=$(( retry_until - $(date +%s) ))
+              [ "$wait_for" -le "$pod_wait" ] || wait_for=$pod_wait
+              [ "$wait_for" -ge 1 ] || wait_for=1
+              pods_gone=yes
+              if ! kubectl --namespace "$NAMESPACE" wait --for=delete pod \
+                --selector app.kubernetes.io/name=flux-plunger,app.kubernetes.io/instance={{ .Release.Name }} \
+                --timeout="${wait_for}s"; then
+                if ! left_pods=$(retry kubectl --namespace "$NAMESPACE" get pod \
+                  --selector app.kubernetes.io/name=flux-plunger,app.kubernetes.io/instance={{ .Release.Name }} \
+                  --output name); then
+                  echo "could not tell whether $deploy pods are still running; sweeping anyway" >&2
+                  pods_gone=no
+                elif [ -n "$left_pods" ]; then
+                  # shellcheck disable=SC2086 # one line for the names
+                  echo "$deploy pods are still running, sweeping anyway:" $left_pods >&2
+                  pods_gone=no
+                else
+                  echo "the wait for $deploy pods to go failed, but none is left" >&2
+                fi
+              fi
+
+              # An unanswered listing is not an empty one.
+              # shellcheck disable=SC2086 # scope is one or two words on purpose
+              if ! fenced=$(retry kubectl get "$hr" $scope --output "go-template=$listing"); then
+                echo "could not list fenced HelmReleases; no fence was released" >&2
+                exit 1
+              fi
+
+              # What is left is what the drain could not finish: flux-plunger did
+              # not stop gracefully, or helm-controller did not uninstall a release
+              # being deleted within the grace period. Each loses flux-plunger's
+              # suspension and the fence without waiting any longer. One being
+              # deleted that helm-controller's own finalizer no longer holds, and
+              # whose latest generation it has not observed, is then deleted
+              # without an uninstall, and is named as such.
+              total=0
+              released=0
+              unhandled=0
+              for ref in $fenced; do
+                total=$((total + 1))
+                hns=${ref%%/*}
+                name=${ref#*/}
+                lift_suspension "$hns" "$name"
+                case $? in
+                  2)
+                    echo "NOT released $ref: it could not be read" >&2
+                    continue ;;
+                  1)
+                    # Without the fence a deleted release that is still
+                    # suspended is removed without an uninstall.
+                    echo "NOT released $ref: flux-plunger's suspension could not be lifted" >&2
+                    continue ;;
+                esac
+                state=$(kubectl --namespace "$hns" get "$hr" "$name" --ignore-not-found --output go-template='{{`{{if .metadata.deletionTimestamp}}{{$held := false}}{{range .metadata.finalizers}}{{if eq . "finalizers.fluxcd.io"}}{{$held = true}}{{end}}{{end}}{{if and (not $held) (ne (printf "%v" .status.observedGeneration) (printf "%v" .metadata.generation))}}unhandled{{end}}{{end}}`}}') || state=unknown
+                if ! release_fence "$hns" "$name"; then
+                  echo "NOT released $ref: the fence could not be removed" >&2
+                  continue
+                fi
+                released=$((released + 1))
+                case "$state" in
+                  unhandled)
+                    unhandled=$((unhandled + 1))
+                    echo "released $fence from $ref without an uninstall: helm-controller had not handled it" ;;
+                  unknown)
+                    echo "released $fence from $ref; whether helm-controller had handled it could not be read" ;;
+                  *)
+                    echo "released $fence from $ref" ;;
+                esac
+              done
+
+              echo "released $released of $total fenced HelmReleases, $unhandled without an uninstall"
+              # A flux-plunger still running could have fenced a release after the
+              # listing, and with the chart gone nothing would remove that fence.
+              if [ "$pods_gone" = no ]; then
+                # shellcheck disable=SC2086 # scope is one or two words on purpose
+                if ! again=$(retry kubectl get "$hr" $scope --output "go-template=$listing"); then
+                  echo "could not list fenced HelmReleases again after the sweep" >&2
+                  exit 1
+                fi
+                if [ -n "$again" ]; then
+                  for ref in $again; do
+                    echo "NOT released $ref: fenced after the sweep; a flux-plunger is still running" >&2
+                  done
+                  exit 1
+                fi
+              fi
+              if [ "$released" -eq "$total" ]; then
+                exit 0
+              fi
+              exit 1
diff --git a/packages/system/flux-plunger/tests/deployment_test.yaml b/packages/system/flux-plunger/tests/deployment_test.yaml
new file mode 100644
index 0000000000..a351bef200
--- /dev/null
+++ b/packages/system/flux-plunger/tests/deployment_test.yaml
@@ -0,0 +1,58 @@
+suite: flux-plunger Deployment
+# On SIGTERM flux-plunger stops its manager (up to 10s) and then gives up the
+# uninstall fences it holds (DrainFences). The kubelet kills it once
+# terminationGracePeriodSeconds is spent, so stop and drain together have to end
+# inside that grace period. The next flux-plunger starts while this one is still
+# terminating, so it is leader election that keeps a single writer meanwhile.
+release:
+  name: flux-plunger
+  namespace: cozy-fluxcd
+templates:
+  - templates/deployment.yaml
+tests:
+  - it: gives the shutdown drain a deadline inside the termination grace period
+    asserts:
+      - equal:
+          path: spec.template.spec.terminationGracePeriodSeconds
+          value: 90
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: --shutdown-drain-timeout=65s
+
+  - it: derives both from one value
+    set:
+      shutdownGracePeriodSeconds: 120
+    asserts:
+      - equal:
+          path: spec.template.spec.terminationGracePeriodSeconds
+          value: 120
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: --shutdown-drain-timeout=95s
+
+  - it: runs under leader election, the one thing that keeps the next pod from writing during the drain
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: --leader-elect
+
+  - it: refuses a grace period that leaves the drain no time
+    set:
+      shutdownGracePeriodSeconds: 39
+    asserts:
+      - failedTemplate:
+          errorPattern: shutdownGracePeriodSeconds must be between 40 and 140
+
+  - it: refuses a grace period that is not a whole number of seconds
+    set:
+      shutdownGracePeriodSeconds: 90.7
+    asserts:
+      - failedTemplate:
+          errorPattern: shutdownGracePeriodSeconds must be a whole number of seconds
+
+  - it: refuses a grace period the pre-delete hook cannot wait out inside its deadline
+    set:
+      shutdownGracePeriodSeconds: 141
+    asserts:
+      - failedTemplate:
+          errorPattern: shutdownGracePeriodSeconds must be between 40 and 140
diff --git a/packages/system/flux-plunger/tests/rbac_test.yaml b/packages/system/flux-plunger/tests/rbac_test.yaml
new file mode 100644
index 0000000000..aa00815c2f
--- /dev/null
+++ b/packages/system/flux-plunger/tests/rbac_test.yaml
@@ -0,0 +1,21 @@
+suite: flux-plunger RBAC
+release:
+  name: flux-plunger
+  namespace: cozy-fluxcd
+templates:
+  - templates/rbac.yaml
+tests:
+  - it: may hold the leader Lease the Deployment's leader election uses, in its own namespace only
+    documentSelector:
+      path: kind
+      value: Role
+    asserts:
+      - equal:
+          path: metadata.namespace
+          value: cozy-fluxcd
+      - equal:
+          path: rules
+          value:
+            - apiGroups: ["coordination.k8s.io"]
+              resources: ["leases"]
+              verbs: ["get", "list", "watch", "create", "update", "patch"]
diff --git a/packages/system/flux-plunger/tests/uninstall-fence-cleanup_test.yaml b/packages/system/flux-plunger/tests/uninstall-fence-cleanup_test.yaml
new file mode 100644
index 0000000000..1502174f28
--- /dev/null
+++ b/packages/system/flux-plunger/tests/uninstall-fence-cleanup_test.yaml
@@ -0,0 +1,132 @@
+suite: flux-plunger pre-delete uninstall-fence cleanup
+# flux-plunger holds a finalizer (flux-plunger.cozystack.io/uninstall-fence) on a
+# HelmRelease it is recovering. Nothing else in the tree knows that finalizer, so
+# uninstalling this chart must release it, or a release deleted meanwhile stays
+# Terminating forever.
+release:
+  name: flux-plunger
+  namespace: cozy-fluxcd
+templates:
+  - templates/uninstall-fence-cleanup.yaml
+tests:
+  - it: runs before the release is deleted, bounded, and cleans itself up afterwards
+    documentSelector:
+      path: kind
+      value: Job
+    asserts:
+      - equal:
+          path: metadata.annotations["helm.sh/hook"]
+          value: pre-delete
+      # Kept after it finishes, success included, so its report can be read
+      # until ttlSecondsAfterFinished; the next run replaces it.
+      - equal:
+          path: metadata.annotations["helm.sh/hook-delete-policy"]
+          value: before-hook-creation
+      - equal:
+          path: spec.ttlSecondsAfterFinished
+          value: 600
+      # helm-controller never sets Helm's hook output writer, and a hook with
+      # this annotation makes it call the nil func
+      # (https://github.com/fluxcd/helm-controller/issues/1562).
+      - notExists:
+          path: metadata.annotations["helm.sh/hook-output-log-policy"]
+      # Under helm-controller's default 300s uninstall timeout, which bounds the
+      # hook; hack/flux-plunger-fence-hook_test.bats holds the relation.
+      - equal:
+          path: spec.activeDeadlineSeconds
+          value: 240
+      # One run fills the deadline, so a second pod would end the Job
+      # DeadlineExceeded and lose the first one's report; helm-controller
+      # retries the whole uninstall, with a fresh budget, instead.
+      - equal:
+          path: spec.backoffLimit
+          value: 0
+      # Same pull policy and fixed footprint as the other hooks that run this
+      # image, so the pod is scheduled and started promptly inside the deadline.
+      - equal:
+          path: spec.template.spec.containers[0].imagePullPolicy
+          value: IfNotPresent
+      - equal:
+          path: spec.template.spec.containers[0].resources
+          value:
+            requests:
+              cpu: 10m
+              memory: 32Mi
+            limits:
+              cpu: 100m
+              memory: 64Mi
+      - equal:
+          path: spec.template.spec.serviceAccountName
+          value: flux-plunger-uninstall-fence-cleanup
+      # Digest-pinned so an upstream retag does not change what runs.
+      - equal:
+          path: spec.template.spec.containers[0].image
+          value: docker.io/clastix/kubectl:v1.32@sha256:b9ef7d8dbe65bcc81a46c09b8dc7543103055021c4f43287bf59e92a8f4fe05c
+
+  - it: strips the fence by name and stops flux-plunger first
+    documentSelector:
+      path: kind
+      value: Job
+    asserts:
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: 'fence=flux-plunger\.cozystack\.io/uninstall-fence'
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: 'scale deployment "\$deploy" --replicas=0'
+      - equal:
+          path: spec.template.spec.containers[0].env[0].name
+          value: NAMESPACE
+      - equal:
+          path: spec.template.spec.containers[0].env[0].value
+          value: cozy-fluxcd
+
+  - it: may read and patch HelmReleases cluster-wide, and nothing more there
+    documentSelector:
+      path: kind
+      value: ClusterRole
+    asserts:
+      - equal:
+          path: rules
+          value:
+            - apiGroups: ["helm.toolkit.fluxcd.io"]
+              resources: ["helmreleases"]
+              verbs: ["get", "list", "patch"]
+
+  - it: may scale down only its own Deployment and watch its pods go
+    documentSelector:
+      path: kind
+      value: Role
+    asserts:
+      - equal:
+          path: metadata.namespace
+          value: cozy-fluxcd
+      - equal:
+          path: rules
+          value:
+            - apiGroups: ["apps"]
+              resources: ["deployments"]
+              resourceNames: ["flux-plunger"]
+              verbs: ["get"]
+            - apiGroups: ["apps"]
+              resources: ["deployments/scale"]
+              resourceNames: ["flux-plunger"]
+              verbs: ["patch"]
+            - apiGroups: [""]
+              resources: ["pods"]
+              verbs: ["get", "list", "watch"]
+
+  - it: runs under the restricted pod security standard
+    documentSelector:
+      path: kind
+      value: Job
+    asserts:
+      - equal:
+          path: spec.template.spec.securityContext.runAsNonRoot
+          value: true
+      - equal:
+          path: spec.template.spec.containers[0].securityContext.allowPrivilegeEscalation
+          value: false
+      - equal:
+          path: spec.template.spec.containers[0].securityContext.readOnlyRootFilesystem
+          value: true
diff --git a/packages/system/flux-plunger/values.yaml b/packages/system/flux-plunger/values.yaml
index 1da1261045..69e9f1465c 100644
--- a/packages/system/flux-plunger/values.yaml
+++ b/packages/system/flux-plunger/values.yaml
@@ -1 +1,23 @@
 image: "ghcr.io/cozystack/cozystack/flux-plunger:latest@sha256:6a6ec938973e6583c5e1573f7d25beddc1852a6699a089116b2407e29a564a72"
+
+# How long flux-plunger is given to stop, between 40 and 140. On SIGTERM it stops
+# its manager (up to 10 seconds), then gives up the uninstall fences it holds,
+# waiting for helm-controller to uninstall a release being deleted, under a
+# deadline 25 seconds shorter than this. Its leader Lease outlasts both, so the
+# next flux-plunger waits a little under two minutes at the default before it
+# acts. The pre-delete hook waits for the pod a little longer than this before it
+# releases what is left.
+shutdownGracePeriodSeconds: 90
+
+# Image for the pre-delete uninstall-fence cleanup hook Job (see
+# templates/uninstall-fence-cleanup.yaml). Only needs a kubectl binary. The tag
+# is digest-pinned so an upstream retag does not change what runs across the
+# fleet; refresh by resolving the current manifest-list digest
+# (`docker manifest inspect docker.io/clastix/kubectl:v1.32`) and updating
+# `digest` below. Same image the etcd-operator and postgres-operator hooks pin.
+# renovate: datasource=docker depName=docker.io/clastix/kubectl
+kubectlImage:
+  repository: docker.io/clastix/kubectl
+  tag: v1.32
+  digest: sha256:b9ef7d8dbe65bcc81a46c09b8dc7543103055021c4f43287bf59e92a8f4fe05c
+  pullPolicy: IfNotPresent
diff --git a/packages/system/flux-shard-operator/Chart.yaml b/packages/system/flux-shard-operator/Chart.yaml
new file mode 100644
index 0000000000..272b48853f
--- /dev/null
+++ b/packages/system/flux-shard-operator/Chart.yaml
@@ -0,0 +1,3 @@
+apiVersion: v2
+name: cozy-flux-shard-operator
+version: 0.0.0 # Placeholder, the actual version will be automatically set during the build process
diff --git a/packages/system/flux-shard-operator/Makefile b/packages/system/flux-shard-operator/Makefile
new file mode 100644
index 0000000000..f5bbe7a197
--- /dev/null
+++ b/packages/system/flux-shard-operator/Makefile
@@ -0,0 +1,22 @@
+NAME=flux-shard-operator
+NAMESPACE=cozy-fluxcd
+
+include ../../../hack/common-envs.mk
+include ../../../hack/package.mk
+
+.PHONY: test
+
+image: image-flux-shard-operator
+
+test:
+	helm unittest .
+
+image-flux-shard-operator:
+	docker buildx build -f images/flux-shard-operator/Dockerfile ../../.. \
+		$(call image-tags,flux-shard-operator,v$(COZYSTACK_VERSION)) \
+		$(call cache-args,flux-shard-operator) \
+		--metadata-file images/flux-shard-operator.json \
+		$(BUILDX_ARGS)
+	IMAGE="$(REGISTRY)/flux-shard-operator:$(IMAGE_TAG)@$$(yq e '."containerimage.digest"' images/flux-shard-operator.json -o json -r)" \
+		yq -i '.fluxShardOperator.image = strenv(IMAGE)' values.yaml
+	rm -f images/flux-shard-operator.json
diff --git a/packages/system/flux-shard-operator/README.md b/packages/system/flux-shard-operator/README.md
new file mode 100644
index 0000000000..9f06cb9b6a
--- /dev/null
+++ b/packages/system/flux-shard-operator/README.md
@@ -0,0 +1,42 @@
+# flux-shard-operator
+
+Spreads tenant HelmReleases across multiple helm-controller shards so a noisy tenant (e.g. a HelmRelease stuck in remediation) cannot degrade the others. The damage of a saturated helm-controller is per-pod / per-informer, so horizontal sharding with per-shard label-scoped informers is what isolates both worker starvation and cache-lag blast radius.
+
+## What it does
+
+The operator has three parts, all served by one Deployment (leader-elected controllers, webhook on every replica):
+
+1. **Shard runtime.** Reconciles `shardCount` helm-controller Deployments (`helm-controller-shard<i>`, `--watch-label-selector=sharding.fluxcd.io/key=shard<i>`) in the flux namespace, cloned from the flux-aio `flux` Deployment's helm-controller container and sanitised (no host networking, no localhost cross-container wiring, no inherited corporate-proxy env, and a startupProbe guarding a slow start). The helm-controller image and feature-gates are inherited from flux-aio automatically. Deployments beyond `shardCount` are pruned once they drain, and the legacy hand-rolled `flux-tenants` Deployment is retired once no HelmRelease carries `sharding.fluxcd.io/key=tenants`.
+
+2. **Placement controller.** Owns the tenant→shard assignment. The unit of placement is the tenant: all HelmReleases of one tenant (parent `tenant-<id>` plus everything in namespace `tenant-<id>`) carry the same shard label, so a noisy tenant's blast radius is bounded to its shard's co-residents. Tenants are distributed greedy least-loaded, weighted by HelmRelease count (N tenants over N shards land exactly 1 per shard). The assignment is recorded as the `internal.cozystack.io/flux-shard` label on the tenant namespace; HelmRelease labels remain the source of truth on restarts. Moves are paced and deleting tenants are never moved. Watches are metadata-only, so the controller does not decode the helm-controller status-patch firehose.
+
+3. **Mutating webhook (CREATE-only, `failurePolicy: Ignore`).** Stamps the tenant's shard onto every HelmRelease at admission, so each one is born on the correct shard regardless of creation path. On webhook outage or before the first assignment, HelmReleases keep their legacy `tenants` key until the placement controller relabels them — graceful degradation, never blocked creation.
+
+System (non-tenant) HelmReleases are untouched: flux-aio keeps reconciling everything without a shard key (`!sharding.fluxcd.io/key`).
+
+## Parameters
+
+### Common parameters
+
+| Name                                   | Description                                                                                   | Value                                                          |
+| -------------------------------------- | --------------------------------------------------------------------------------------------- | -------------------------------------------------------------- |
+| `fluxShardOperator.image`              | Container image                                                                               | `ghcr.io/cozystack/cozystack/flux-shard-operator:*`            |
+| `fluxShardOperator.debug`              | Enable debug logging                                                                          | `false`                                                        |
+| `fluxShardOperator.replicas`           | Operator replica count                                                                        | `2`                                                            |
+| `fluxShardOperator.shardCount`         | Number of helm-controller shards: `auto` sizes from the HelmRelease count, an integer pins it | `auto`                                                         |
+| `fluxShardOperator.rebalanceThreshold` | Load spread ratio above which tenants are rebalanced                                          | `0.25`                                                         |
+| `fluxShardOperator.pinnedTenants`      | Map of tenant namespace to shard, pins heavy tenants to dedicated shards                      | `{}`                                                           |
+| `fluxShardOperator.shard.concurrent`   | `--concurrent` of each shard helm-controller                                                  | `5`                                                            |
+| `fluxShardOperator.shard.resources`    | Resources of each shard helm-controller (empty values inherit flux-aio)                       | `{requests: {cpu: 100m, memory: 64Mi}, limits: {memory: 1Gi}}` |
+
+## Autosizing
+
+With `shardCount: auto` (the default) the operator drives the shard count from the tenant HelmRelease count: `K = clamp(ceil(H/100), 1, min(16, T))`, applied with hysteresis anchored on the currently provisioned shards (scale up eagerly once a shard runs >120 HR, scale down lazily only under 60 HR/shard) so K does not flap around sizing boundaries. The ~100 HR/shard target leaves headroom for existing tenants growing their HelmRelease count without an immediate reshard. Set an integer to pin the count explicitly.
+
+## Bootstrap on fresh installs
+
+On a fresh cluster the first tenant helm-controller appears through a runtime chain: cert-manager issues the webhook/serving certificate, the operator starts, clones `helm-controller-shard0` from flux-aio, and the placement controller assigns tenants once shard0 reports Ready (assignments only ever target ready shards). Until then tenant HelmReleases stay on their born `sharding.fluxcd.io/key=tenants` label and are simply not reconciled yet — the same install-order dependency as other cert-manager-gated components (capi-operator, capi-providers), surfaced as the platform HelmReleases not turning Ready. To debug a stalled bootstrap, walk the chain in order: cert-manager webhook up → `flux-shard-operator` Deployment Ready (image pull, cert mount) → `helm-controller-shard0` Ready → HelmReleases relabeled off `tenants`.
+
+## Telemetry
+
+The operator exports `cozy_flux_shard_load`, `cozy_flux_shard_tenants`, `cozy_flux_shard_helmreleases`, `cozy_flux_shard_pending_moves`, `cozy_flux_shard_moves_total` and `cozy_flux_shard_recommended_count` (the raw autosizing recommendation before hysteresis). Metrics are served plain-HTTP on `:8080` and the operator pod carries `prometheus.io/scrape` annotations; gauges are populated by the leader replica.
diff --git a/packages/system/flux-shard-operator/images/flux-shard-operator/Dockerfile b/packages/system/flux-shard-operator/images/flux-shard-operator/Dockerfile
new file mode 100644
index 0000000000..27e8445c45
--- /dev/null
+++ b/packages/system/flux-shard-operator/images/flux-shard-operator/Dockerfile
@@ -0,0 +1,24 @@
+FROM --platform=$BUILDPLATFORM golang:1.27-alpine@sha256:8a5910f31396cd4d89662f56c68b3ae31d374308270a1c3bd96672ee5ed43414 AS builder
+ARG GOPROXY
+
+ARG TARGETOS
+ARG TARGETARCH
+
+WORKDIR /workspace
+
+COPY go.mod go.sum ./
+RUN for attempt in 1 2 3; do GOOS=$TARGETOS GOARCH=$TARGETARCH go mod download && break; [ "$attempt" = 3 ] && exit 1; sleep $((attempt * 10)); done
+
+COPY api api/
+COPY pkg pkg/
+COPY cmd cmd/
+COPY internal internal/
+
+RUN GOOS=$TARGETOS GOARCH=$TARGETARCH CGO_ENABLED=0 go build -ldflags="-extldflags=-static" -o /flux-shard-operator cmd/flux-shard-operator/main.go
+
+FROM scratch
+
+COPY --from=builder /flux-shard-operator /flux-shard-operator
+COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
+
+ENTRYPOINT ["/flux-shard-operator"]
diff --git a/packages/system/flux-shard-operator/templates/certmanager.yaml b/packages/system/flux-shard-operator/templates/certmanager.yaml
new file mode 100644
index 0000000000..76e19e04c9
--- /dev/null
+++ b/packages/system/flux-shard-operator/templates/certmanager.yaml
@@ -0,0 +1,47 @@
+apiVersion: cert-manager.io/v1
+kind: Issuer
+metadata:
+  name: flux-shard-operator-selfsigned
+  namespace: {{ .Release.Namespace }}
+spec:
+  selfSigned: {}
+---
+apiVersion: cert-manager.io/v1
+kind: Certificate
+metadata:
+  name: flux-shard-operator-ca
+  namespace: {{ .Release.Namespace }}
+spec:
+  secretName: flux-shard-operator-ca
+  duration: 43800h  # 5 years
+  commonName: flux-shard-operator-ca
+  issuerRef:
+    name: flux-shard-operator-selfsigned
+  isCA: true
+  privateKey:
+    rotationPolicy: Never
+---
+apiVersion: cert-manager.io/v1
+kind: Issuer
+metadata:
+  name: flux-shard-operator-ca
+  namespace: {{ .Release.Namespace }}
+spec:
+  ca:
+    secretName: flux-shard-operator-ca
+---
+apiVersion: cert-manager.io/v1
+kind: Certificate
+metadata:
+  name: flux-shard-operator
+  namespace: {{ .Release.Namespace }}
+spec:
+  secretName: flux-shard-operator-cert
+  duration: 8760h
+  renewBefore: 720h
+  issuerRef:
+    name: flux-shard-operator-ca
+  commonName: flux-shard-operator
+  dnsNames:
+    - flux-shard-operator
+    - flux-shard-operator.{{ .Release.Namespace }}.svc
diff --git a/packages/system/flux-shard-operator/templates/mutatingwebhookconfiguration.yaml b/packages/system/flux-shard-operator/templates/mutatingwebhookconfiguration.yaml
new file mode 100644
index 0000000000..d413c5c4bb
--- /dev/null
+++ b/packages/system/flux-shard-operator/templates/mutatingwebhookconfiguration.yaml
@@ -0,0 +1,35 @@
+apiVersion: admissionregistration.k8s.io/v1
+kind: MutatingWebhookConfiguration
+metadata:
+  name: flux-shard-operator
+  annotations:
+    cert-manager.io/inject-ca-from: "{{ .Release.Namespace }}/flux-shard-operator"
+webhooks:
+  - name: flux-shard.cozystack.io
+    admissionReviewVersions: ["v1"]
+    sideEffects: None
+    # The webhook only removes the handoff gap for newborn HelmReleases; its
+    # outage must degrade gracefully to the catch-all path (the placement
+    # controller relabels stragglers), never block creation.
+    failurePolicy: Ignore
+    timeoutSeconds: 5
+    clientConfig:
+      service:
+        name: flux-shard-operator
+        namespace: {{ .Release.Namespace }}
+        path: /mutate-helmrelease-shard
+    rules:
+      # CREATE only: helm-controller status patches are a firehose, UPDATE is
+      # never intercepted.
+      - operations: ["CREATE"]
+        apiGroups: ["helm.toolkit.fluxcd.io"]
+        apiVersions: ["v2"]
+        resources: ["helmreleases"]
+    objectSelector:
+      matchExpressions:
+        # Every tenant HelmRelease is born with the legacy single-bucket value
+        # (stamped by ApplicationDefinition release.labels and chart
+        # templates); the webhook rewrites it to the tenant's shard.
+        - key: sharding.fluxcd.io/key
+          operator: In
+          values: ["tenants"]
diff --git a/packages/system/flux-shard-operator/templates/pdb.yaml b/packages/system/flux-shard-operator/templates/pdb.yaml
new file mode 100644
index 0000000000..99c59f8ebd
--- /dev/null
+++ b/packages/system/flux-shard-operator/templates/pdb.yaml
@@ -0,0 +1,9 @@
+apiVersion: policy/v1
+kind: PodDisruptionBudget
+metadata:
+  name: flux-shard-operator
+spec:
+  maxUnavailable: 1
+  selector:
+    matchLabels:
+      app: flux-shard-operator
diff --git a/packages/system/flux-shard-operator/templates/rbac-bind.yaml b/packages/system/flux-shard-operator/templates/rbac-bind.yaml
new file mode 100644
index 0000000000..181f209128
--- /dev/null
+++ b/packages/system/flux-shard-operator/templates/rbac-bind.yaml
@@ -0,0 +1,12 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: flux-shard-operator
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: flux-shard-operator
+subjects:
+- kind: ServiceAccount
+  name: flux-shard-operator
+  namespace: {{ .Release.Namespace }}
diff --git a/packages/system/flux-shard-operator/templates/rbac.yaml b/packages/system/flux-shard-operator/templates/rbac.yaml
new file mode 100644
index 0000000000..cb7969bbd3
--- /dev/null
+++ b/packages/system/flux-shard-operator/templates/rbac.yaml
@@ -0,0 +1,25 @@
+kind: ClusterRole
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: flux-shard-operator
+rules:
+# Placement: watch tenant HelmReleases (metadata only) and relabel them.
+- apiGroups: ["helm.toolkit.fluxcd.io"]
+  resources: ["helmreleases"]
+  verbs: ["get", "list", "watch", "patch"]
+# Placement: record the tenant->shard assignment on tenant namespaces.
+- apiGroups: [""]
+  resources: ["namespaces"]
+  verbs: ["get", "list", "watch", "patch"]
+# Provisioner: manage helm-controller-shard<i> Deployments (cloned from the
+# flux-aio Deployment) and retire the legacy flux-tenants Deployment.
+- apiGroups: ["apps"]
+  resources: ["deployments"]
+  verbs: ["get", "list", "watch", "create", "update", "patch", "delete"]
+# Leader election.
+- apiGroups: ["coordination.k8s.io"]
+  resources: ["leases"]
+  verbs: ["get", "list", "watch", "create", "update", "patch", "delete"]
+- apiGroups: [""]
+  resources: ["events"]
+  verbs: ["create", "patch"]
diff --git a/packages/system/flux-shard-operator/templates/sa.yaml b/packages/system/flux-shard-operator/templates/sa.yaml
new file mode 100644
index 0000000000..6891c27340
--- /dev/null
+++ b/packages/system/flux-shard-operator/templates/sa.yaml
@@ -0,0 +1,4 @@
+kind: ServiceAccount
+apiVersion: v1
+metadata:
+  name: flux-shard-operator
diff --git a/packages/system/flux-shard-operator/templates/service.yaml b/packages/system/flux-shard-operator/templates/service.yaml
new file mode 100644
index 0000000000..be4e78f168
--- /dev/null
+++ b/packages/system/flux-shard-operator/templates/service.yaml
@@ -0,0 +1,16 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: flux-shard-operator
+  labels:
+    app: flux-shard-operator
+spec:
+  trafficDistribution: PreferClose
+  type: ClusterIP
+  ports:
+    - port: 443
+      targetPort: 9443
+      protocol: TCP
+      name: webhook
+  selector:
+    app: flux-shard-operator
diff --git a/packages/system/flux-shard-operator/templates/workload.yaml b/packages/system/flux-shard-operator/templates/workload.yaml
new file mode 100644
index 0000000000..689a546c74
--- /dev/null
+++ b/packages/system/flux-shard-operator/templates/workload.yaml
@@ -0,0 +1,121 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: flux-shard-operator
+  labels:
+    app: flux-shard-operator
+spec:
+  replicas: {{ .Values.fluxShardOperator.replicas }}
+  selector:
+    matchLabels:
+      app: flux-shard-operator
+  template:
+    metadata:
+      labels:
+        app: flux-shard-operator
+      annotations:
+        prometheus.io/scrape: "true"
+        prometheus.io/port: "8080"
+    spec:
+      serviceAccountName: flux-shard-operator
+      securityContext:
+        runAsNonRoot: true
+        runAsUser: 65534
+        # The webhook serving cert is mounted 0400; fsGroup makes it readable
+        # for the non-root UID.
+        fsGroup: 65534
+        seccompProfile:
+          type: RuntimeDefault
+      tolerations:
+      - operator: Exists
+      affinity:
+        nodeAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+          - weight: 100
+            preference:
+              matchExpressions:
+              - key: node-role.kubernetes.io/control-plane
+                operator: Exists
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+          - weight: 100
+            podAffinityTerm:
+              topologyKey: kubernetes.io/hostname
+              labelSelector:
+                matchLabels:
+                  app: flux-shard-operator
+      containers:
+      - name: flux-shard-operator
+        image: "{{ .Values.fluxShardOperator.image }}"
+        securityContext:
+          allowPrivilegeEscalation: false
+          readOnlyRootFilesystem: true
+          capabilities:
+            drop:
+            - ALL
+        args:
+        - --leader-elect
+        - --metrics-bind-address=:8080
+        - --metrics-secure=false
+        - --flux-namespace={{ .Release.Namespace }}
+        - --shard-count={{ .Values.fluxShardOperator.shardCount }}
+        - --shard-concurrent={{ .Values.fluxShardOperator.shard.concurrent }}
+        - --rebalance-threshold={{ .Values.fluxShardOperator.rebalanceThreshold }}
+        {{- $pins := list }}
+        {{- range $tenant, $shard := .Values.fluxShardOperator.pinnedTenants }}
+        {{- $pins = append $pins (printf "%s=%s" $tenant $shard) }}
+        {{- end }}
+        {{- with $pins }}
+        - --pinned-tenants={{ join "," . }}
+        {{- end }}
+        {{- with .Values.fluxShardOperator.shard.resources }}
+        {{- with .requests }}
+        {{- with .cpu }}
+        - --shard-cpu-request={{ . }}
+        {{- end }}
+        {{- with .memory }}
+        - --shard-memory-request={{ . }}
+        {{- end }}
+        {{- end }}
+        {{- with .limits }}
+        {{- with .cpu }}
+        - --shard-cpu-limit={{ . }}
+        {{- end }}
+        {{- with .memory }}
+        - --shard-memory-limit={{ . }}
+        {{- end }}
+        {{- end }}
+        {{- end }}
+        {{- if .Values.fluxShardOperator.debug }}
+        - --zap-log-level=debug
+        {{- else }}
+        - --zap-log-level=info
+        {{- end }}
+        ports:
+        - name: webhook
+          containerPort: 9443
+        - name: metrics
+          containerPort: 8080
+        resources:
+          requests:
+            cpu: 50m
+            memory: 64Mi
+          limits:
+            memory: 256Mi
+        readinessProbe:
+          httpGet:
+            path: /readyz
+            port: 8081
+        livenessProbe:
+          httpGet:
+            path: /healthz
+            port: 8081
+        volumeMounts:
+          - name: webhook-certs
+            mountPath: /tmp/k8s-webhook-server/serving-certs
+            readOnly: true
+      volumes:
+        - name: webhook-certs
+          secret:
+            secretName: flux-shard-operator-cert
+            defaultMode: 0400
diff --git a/packages/system/flux-shard-operator/tests/webhook_test.yaml b/packages/system/flux-shard-operator/tests/webhook_test.yaml
new file mode 100644
index 0000000000..5cdb03bc9a
--- /dev/null
+++ b/packages/system/flux-shard-operator/tests/webhook_test.yaml
@@ -0,0 +1,68 @@
+suite: flux-shard-operator webhook configuration + service
+templates:
+  - templates/mutatingwebhookconfiguration.yaml
+  - templates/service.yaml
+
+release:
+  name: flux-shard-operator
+  namespace: cozy-fluxcd
+
+tests:
+  - it: intercepts HelmRelease CREATE only, never UPDATE
+    template: templates/mutatingwebhookconfiguration.yaml
+    asserts:
+      - equal:
+          path: webhooks[0].rules[0].operations
+          value: ["CREATE"]
+      - equal:
+          path: webhooks[0].rules[0].apiGroups
+          value: ["helm.toolkit.fluxcd.io"]
+      - equal:
+          path: webhooks[0].rules[0].resources
+          value: ["helmreleases"]
+
+  - it: degrades gracefully on outage
+    template: templates/mutatingwebhookconfiguration.yaml
+    asserts:
+      - equal:
+          path: webhooks[0].failurePolicy
+          value: Ignore
+
+  - it: scopes to HelmReleases born on the legacy tenants bucket
+    template: templates/mutatingwebhookconfiguration.yaml
+    asserts:
+      - equal:
+          path: webhooks[0].objectSelector.matchExpressions[0].key
+          value: sharding.fluxcd.io/key
+      - equal:
+          path: webhooks[0].objectSelector.matchExpressions[0].operator
+          value: In
+      - equal:
+          path: webhooks[0].objectSelector.matchExpressions[0].values
+          value: ["tenants"]
+
+  - it: points at the operator service with injected CA
+    template: templates/mutatingwebhookconfiguration.yaml
+    asserts:
+      - equal:
+          path: webhooks[0].clientConfig.service.name
+          value: flux-shard-operator
+      - equal:
+          path: webhooks[0].clientConfig.service.namespace
+          value: cozy-fluxcd
+      - equal:
+          path: webhooks[0].clientConfig.service.path
+          value: /mutate-helmrelease-shard
+      - equal:
+          path: metadata.annotations["cert-manager.io/inject-ca-from"]
+          value: cozy-fluxcd/flux-shard-operator
+
+  - it: serves the webhook on 443 -> 9443
+    template: templates/service.yaml
+    asserts:
+      - equal:
+          path: spec.ports[0].port
+          value: 443
+      - equal:
+          path: spec.ports[0].targetPort
+          value: 9443
diff --git a/packages/system/flux-shard-operator/tests/workload_test.yaml b/packages/system/flux-shard-operator/tests/workload_test.yaml
new file mode 100644
index 0000000000..6d2ddd26c0
--- /dev/null
+++ b/packages/system/flux-shard-operator/tests/workload_test.yaml
@@ -0,0 +1,100 @@
+suite: flux-shard-operator workload + PDB
+templates:
+  - templates/workload.yaml
+  - templates/pdb.yaml
+
+release:
+  name: flux-shard-operator
+  namespace: cozy-fluxcd
+
+tests:
+  - it: renders the default Deployment shape
+    template: templates/workload.yaml
+    asserts:
+      - equal:
+          path: spec.replicas
+          value: 2
+      - equal:
+          path: spec.template.spec.serviceAccountName
+          value: flux-shard-operator
+      # The whole list, so the pin fails on an argument added, removed or
+      # swapped rather than only on the ones someone thought to enumerate.
+      # This template is first-party, so a failure here is a deliberate change
+      # asking to be read, not upstream churn arriving on its own schedule.
+      #
+      # --metrics-bind-address and --metrics-secure are load-bearing among
+      # these: the README-advertised cozy_flux_shard_* gauges, autosizing
+      # recommendation included, are the operator's observability surface.
+      - equal:
+          path: spec.template.spec.containers[0].args
+          value:
+            - --leader-elect
+            - --metrics-bind-address=:8080
+            - --metrics-secure=false
+            - --flux-namespace=cozy-fluxcd
+            - --shard-count=auto
+            - --shard-concurrent=5
+            - --rebalance-threshold=0.25
+            - --shard-cpu-request=100m
+            - --shard-memory-request=64Mi
+            - --shard-memory-limit=1Gi
+            - --zap-log-level=info
+      - equal:
+          path: spec.template.spec.volumes[0].secret.secretName
+          value: flux-shard-operator-cert
+      - equal:
+          path: spec.template.metadata.annotations["prometheus.io/scrape"]
+          value: "true"
+      - equal:
+          path: spec.template.spec.securityContext.runAsNonRoot
+          value: true
+      - equal:
+          path: spec.template.spec.containers[0].securityContext.readOnlyRootFilesystem
+          value: true
+
+  - it: does not render --pinned-tenants by default
+    template: templates/workload.yaml
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].name
+          value: flux-shard-operator
+      # Match the flag name per element, not one whole element against one
+      # value: contains and notContains compare elements for equality, so
+      # `--pinned-tenants=` never equals a rendered
+      # `--pinned-tenants=tenant-a=shard0` and the negative could not fail.
+      - notMatchRegex:
+          path: spec.template.spec.containers[0].args[*]
+          pattern: "^--pinned-tenants"
+
+  - it: renders shardCount and pinned tenants from values
+    template: templates/workload.yaml
+    set:
+      fluxShardOperator:
+        shardCount: 4
+        pinnedTenants:
+          tenant-bigone: shard3
+          tenant-other: shard0
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: --shard-count=4
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: --pinned-tenants=tenant-bigone=shard3,tenant-other=shard0
+
+  - it: renders debug log level when enabled
+    template: templates/workload.yaml
+    set:
+      fluxShardOperator:
+        debug: true
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: --zap-log-level=debug
+
+  - it: renders the PDB
+    template: templates/pdb.yaml
+    asserts:
+      - equal:
+          path: spec.maxUnavailable
+          value: 1
diff --git a/packages/system/flux-shard-operator/values.yaml b/packages/system/flux-shard-operator/values.yaml
new file mode 100644
index 0000000000..eb5bc5f122
--- /dev/null
+++ b/packages/system/flux-shard-operator/values.yaml
@@ -0,0 +1,27 @@
+fluxShardOperator:
+  image: ghcr.io/cozystack/cozystack/flux-shard-operator:v1.6.0@sha256:daf002af34671371646185d4135c5096f8aba9518f132089bd5d6fbe7d9d06e7
+  debug: false
+  replicas: 2
+  ## Number of helm-controller shards to provision and distribute tenants
+  ## over. "auto" (default) sizes from the tenant HelmRelease count
+  ## (~100 HR per shard, capped by tenant count, with hysteresis); set a
+  ## positive integer to pin it explicitly, e.g. shardCount: 7.
+  shardCount: auto
+  ## Load spread ratio (maxLoad-minLoad)/avgLoad above which tenants are
+  ## rebalanced between shards.
+  rebalanceThreshold: 0.25
+  ## Pin heavy tenants to dedicated shards, e.g.:
+  ##   pinnedTenants:
+  ##     tenant-bigone: shard3
+  pinnedTenants: {}
+  shard:
+    ## --concurrent for each shard helm-controller.
+    concurrent: 5
+    ## Resources of each shard helm-controller; empty values inherit the
+    ## flux-aio helm-controller resources.
+    resources:
+      requests:
+        cpu: 100m
+        memory: 64Mi
+      limits:
+        memory: 1Gi
diff --git a/packages/system/fluxcd-operator/.helmignore b/packages/system/fluxcd-operator/.helmignore
deleted file mode 100644
index d5c178e814..0000000000
--- a/packages/system/fluxcd-operator/.helmignore
+++ /dev/null
@@ -1,3 +0,0 @@
-images
-hack
-.gitkeep
diff --git a/packages/system/fluxcd-operator/Chart.yaml b/packages/system/fluxcd-operator/Chart.yaml
deleted file mode 100644
index 42ed3feb44..0000000000
--- a/packages/system/fluxcd-operator/Chart.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-apiVersion: v2
-name: cozy-fluxcd-operator
-version: 0.0.0 # Placeholder, the actual version will be automatically set during the build process
diff --git a/packages/system/fluxcd-operator/Makefile b/packages/system/fluxcd-operator/Makefile
deleted file mode 100644
index d9778f5348..0000000000
--- a/packages/system/fluxcd-operator/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-NAME=fluxcd-operator
-NAMESPACE=cozy-fluxcd
-
-include ../../../hack/package.mk
-
-apply-locally:
-	cozyhr apply --plain -n $(NAMESPACE) $(NAME)
-
-update:
-	rm -rf charts
-	helm pull oci://ghcr.io/controlplaneio-fluxcd/charts/flux-operator --untar --untardir charts
-	patch --no-backup-if-mismatch -p1 < patches/kubernetesEnvs.diff
-	patch --no-backup-if-mismatch -p1 < patches/networkPolicy.diff
diff --git a/packages/system/fluxcd-operator/charts/flux-operator/.helmignore b/packages/system/fluxcd-operator/charts/flux-operator/.helmignore
deleted file mode 100644
index f24ae1c93a..0000000000
--- a/packages/system/fluxcd-operator/charts/flux-operator/.helmignore
+++ /dev/null
@@ -1,24 +0,0 @@
-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*.orig
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
-.vscode/
-helmdocs.gotmpl
diff --git a/packages/system/fluxcd-operator/charts/flux-operator/Chart.yaml b/packages/system/fluxcd-operator/charts/flux-operator/Chart.yaml
deleted file mode 100644
index cfe7904208..0000000000
--- a/packages/system/fluxcd-operator/charts/flux-operator/Chart.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-annotations:
-  artifacthub.io/license: AGPL-3.0
-  artifacthub.io/links: |
-    - name: Documentation
-      url: https://fluxoperator.dev/docs
-    - name: Chart Source
-      url: https://github.com/controlplaneio-fluxcd/charts
-    - name: Upstream Project
-      url: https://github.com/controlplaneio-fluxcd/flux-operator
-apiVersion: v2
-appVersion: v0.50.0
-description: 'A Helm chart for deploying the Flux Operator. '
-home: https://fluxoperator.dev
-icon: https://raw.githubusercontent.com/cncf/artwork/main/projects/flux/icon/color/flux-icon-color.png
-keywords:
-- flux
-- fluxcd
-- gitops
-kubeVersion: '>=1.22.0-0'
-maintainers:
-- email: flux-enterprise@control-plane.io
-  name: ControlPlane Flux Team
-name: flux-operator
-sources:
-- https://github.com/controlplaneio-fluxcd/flux-operator
-- https://github.com/controlplaneio-fluxcd/charts
-type: application
-version: 0.50.0
diff --git a/packages/system/fluxcd-operator/charts/flux-operator/README.md b/packages/system/fluxcd-operator/charts/flux-operator/README.md
deleted file mode 100644
index 8fa34b5531..0000000000
--- a/packages/system/fluxcd-operator/charts/flux-operator/README.md
+++ /dev/null
@@ -1,95 +0,0 @@
-# flux-operator
-
-![Version: 0.50.0](https://img.shields.io/badge/Version-0.50.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.50.0](https://img.shields.io/badge/AppVersion-v0.50.0-informational?style=flat-square)
-
-The [Flux Operator](https://github.com/controlplaneio-fluxcd/flux-operator) provides a
-declarative API for the installation and upgrade of CNCF [Flux](https://fluxcd.io) and the
-ControlPlane [enterprise distribution](https://control-plane.io/enterprise-for-flux-cd/).
-
-The operator automates the patching for hotfixes and CVEs affecting the Flux controllers container images
-and enables the configuration of multi-tenancy lockdown on Kubernetes and OpenShift clusters.
-
-The operator comes with the Flux Status Page web UI exposed on port `9080` that allows users to visualize the
-status of the Flux installation and monitor the GitOps delivery pipeline in real-time.
-
-## Prerequisites
-
-- Kubernetes 1.30+
-- Helm 3.8+
-
-## Installing Flux Operator
-
-To install the operator in the `flux-system` namespace:
-
-```console
-helm install flux-operator oci://ghcr.io/controlplaneio-fluxcd/charts/flux-operator \
-  --namespace flux-system \
-  --create-namespace \
-  --wait
-```
-
-## Installing the Flux Web UI as a Standalone Deployment
-
-You can install the Flux Status Web UI as a dedicated deployment in your Kubernetes cluster,
-separate from the Flux Operator with:
-
-```console
-helm install flux-web oci://ghcr.io/controlplaneio-fluxcd/charts/flux-operator \
-  --namespace flux-system \
-  --set fullnameOverride=flux-web \
-  --set web.serverOnly=true \
-  --set installCRDs=false \
-  --wait
-```
-
-To deploy the Flux controllers and to configure automated updates,
-see the Flux Operator [documentation](https://fluxoperator.dev/docs/).
-
-## Values
-
-| Key | Type | Default | Description |
-|-----|------|---------|-------------|
-| affinity | object | `{"nodeAffinity":{"requiredDuringSchedulingIgnoredDuringExecution":{"nodeSelectorTerms":[{"matchExpressions":[{"key":"kubernetes.io/os","operator":"In","values":["linux"]}]}]}}}` | Pod affinity and anti-affinity settings. |
-| apiPriority | object | `{"enabled":false,"extraServiceAccounts":[],"level":"workload-high"}` | Kubernetes [API priority and fairness](https://kubernetes.io/docs/concepts/cluster-administration/flow-control/) settings. |
-| commonAnnotations | object | `{}` | Common annotations to add to all deployed objects including pods. |
-| commonLabels | object | `{}` | Common labels to add to all deployed objects including pods. |
-| extraArgs | list | `[]` | Container extra arguments. |
-| extraEnvs | list | `[]` | Container extra environment variables. |
-| extraVolumeMounts | list | `[]` | Container extra volume mounts. |
-| extraVolumes | list | `[]` | Pod extra volumes. |
-| fullnameOverride | string | `""` |  |
-| hostNetwork | bool | `false` | If `true`, the container ports (`8080` and `8081`) are exposed on the host network. |
-| image | object | `{"imagePullPolicy":"IfNotPresent","pullSecrets":[],"repository":"ghcr.io/controlplaneio-fluxcd/flux-operator","tag":""}` | Container image settings. The image tag defaults to the chart appVersion. |
-| installCRDs | bool | `true` | Install and upgrade the custom resource definitions. |
-| livenessProbe | object | `{"httpGet":{"path":"/healthz","port":8081},"initialDelaySeconds":15,"periodSeconds":20}` | Container liveness probe settings. |
-| logLevel | string | `"info"` | Container logging level flag. |
-| marketplace | object | `{"account":"","license":"","type":""}` | Marketplace settings. |
-| multitenancy | object | `{"defaultServiceAccount":"flux-operator","defaultWorkloadIdentityServiceAccount":"flux-operator","enabled":false,"enabledForWorkloadIdentity":false}` | Enable [multitenancy lockdown](https://fluxoperator.dev/docs/crd/resourceset/#role-based-access-control) for the ResourceSet APIs. |
-| nameOverride | string | `""` |  |
-| nodeSelector | object | `{}` | Pod Node Selector settings. |
-| podSecurityContext | object | `{}` | Pod security context settings. |
-| priorityClassName | string | `""` | Pod priority class name. Recommended value is system-cluster-critical. |
-| rbac.create | bool | `true` | Grant the cluster-admin role to the flux-operator service account (required for the Flux Instance deployment). |
-| rbac.createAggregation | bool | `true` | Grant the Kubernetes view, edit and admin roles access to ResourceSet APIs. |
-| readinessProbe | object | `{"httpGet":{"path":"/readyz","port":8081},"initialDelaySeconds":5,"periodSeconds":10}` | Container readiness probe settings. |
-| reporting | object | `{"interval":"5m"}` | Flux [reporting](https://fluxoperator.dev/docs/crd/fluxreport/) settings. |
-| resources | object | `{"limits":{"cpu":"2000m","memory":"1Gi"},"requests":{"cpu":"100m","memory":"64Mi"}}` | Container resources requests and limits settings. |
-| securityContext | object | `{"allowPrivilegeEscalation":false,"capabilities":{"drop":["ALL"]},"readOnlyRootFilesystem":true,"runAsNonRoot":true,"seccompProfile":{"type":"RuntimeDefault"}}` | Container security context settings. The default is compliant with the pod security restricted profile. |
-| service.ipFamilyPolicy | string | `""` | Sets the IP family policy on all Service resources. Uses Kubernetes defaults if unset |
-| serviceAccount | object | `{"automount":true,"create":true,"name":""}` | Pod service account settings. The name of the service account defaults to the release name. |
-| serviceMonitor | object | `{"create":false,"interval":"60s","labels":{},"scrapeTimeout":"30s"}` | Prometheus Operator scraping settings. |
-| tolerations | list | `[]` | Pod tolerations settings. |
-| web.config | object | `{}` | The spec of the [Web Config API](https://fluxoperator.dev/docs/web-ui/web-config-api/) |
-| web.configSecretName | string | `""` | Reference to an existing Secret in the same namespace as the deployment containing the Web Config API. Should have the key `config.yaml`. |
-| web.enabled | bool | `true` | Enable the [Flux Status web server](https://fluxoperator.dev/web-ui/) on port 9080. |
-| web.httpRoute | object | `{"annotations":{},"enabled":false,"hostnames":[],"parentRefs":[]}` | Gateway API HTTPRoute settings for the Flux Status web interface. |
-| web.ingress | object | `{"annotations":{},"className":"","enabled":false,"hosts":[],"tls":[]}` | Ingress settings for the Flux Status web interface. |
-| web.networkPolicy | object | `{"create":true}` | Create a NetworkPolicy to allow access to the Flux Status web interface. |
-| web.rbac | object | `{"createAggregation":false,"createRoles":true}` | Create standard roles for [user access management](https://fluxoperator.dev/docs/web-ui/user-management/). |
-| web.serverOnly | bool | `false` | Run the Flux Status web server as a standalone deployment (requires a dedicated Helm release). |
-| web.serverReplicas | int | `1` | Number of replicas for the Flux Status web server standalone deployment (only applicable if `web.serverOnly` is `true`). |
-
-## Source Code
-
-* <https://github.com/controlplaneio-fluxcd/flux-operator>
-* <https://github.com/controlplaneio-fluxcd/charts>
diff --git a/packages/system/fluxcd-operator/charts/flux-operator/templates/NOTES.txt b/packages/system/fluxcd-operator/charts/flux-operator/templates/NOTES.txt
deleted file mode 100644
index 9af8d113e9..0000000000
--- a/packages/system/fluxcd-operator/charts/flux-operator/templates/NOTES.txt
+++ /dev/null
@@ -1 +0,0 @@
-Documentation at https://fluxoperator.dev/docs/
diff --git a/packages/system/fluxcd-operator/charts/flux-operator/templates/_helpers.tpl b/packages/system/fluxcd-operator/charts/flux-operator/templates/_helpers.tpl
deleted file mode 100644
index ec6e44089a..0000000000
--- a/packages/system/fluxcd-operator/charts/flux-operator/templates/_helpers.tpl
+++ /dev/null
@@ -1,118 +0,0 @@
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "flux-operator.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
-{{- end }}
-
-{{/*
-Create a default fully qualified app name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-If release name contains chart name it will be used as a full name.
-*/}}
-{{- define "flux-operator.fullname" -}}
-{{- if .Values.fullnameOverride }}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
-{{- else }}
-{{- $name := default .Chart.Name .Values.nameOverride }}
-{{- if contains $name .Release.Name }}
-{{- .Release.Name | trunc 63 | trimSuffix "-" }}
-{{- else }}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
-{{- end }}
-{{- end }}
-{{- end }}
-
-{{/*
-Create chart name and version as used by the chart label.
-*/}}
-{{- define "flux-operator.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
-{{- end }}
-
-{{/*
-Common labels
-*/}}
-{{- define "flux-operator.labels" -}}
-helm.sh/chart: {{ include "flux-operator.chart" . }}
-{{ include "flux-operator.selectorLabels" . }}
-{{- if .Chart.AppVersion }}
-app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
-{{- end }}
-app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- end }}
-
-{{/*
-Selector labels
-*/}}
-{{- define "flux-operator.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "flux-operator.name" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
-{{- end }}
-
-{{/*
-Create the name of the service account to use
-*/}}
-{{- define "flux-operator.serviceAccountName" -}}
-{{- default (include "flux-operator.fullname" .) .Values.serviceAccount.name }}
-{{- end }}
-
-{{/*
-Check if web config secret should be created.
-Returns "true" when web is enabled, config is provided inline, and no external secret is referenced.
-*/}}
-{{- define "flux-operator.createWebConfigSecret" -}}
-{{- if and .Values.web.enabled .Values.web.config (not .Values.web.configSecretName) -}}
-true
-{{- end -}}
-{{- end }}
-
-{{/*
-Check if an external web config secret is referenced.
-Returns "true" when web is enabled, an external secret name is provided, and no inline config is set.
-*/}}
-{{- define "flux-operator.useWebConfigSecret" -}}
-{{- if and .Values.web.enabled .Values.web.configSecretName (not .Values.web.config) -}}
-true
-{{- end -}}
-{{- end }}
-
-{{/*
-Check if running in web server only mode.
-Returns "true" when web is enabled and serverOnly mode is set.
-*/}}
-{{- define "flux-operator.webServerOnly" -}}
-{{- if and .Values.web.enabled .Values.web.serverOnly -}}
-true
-{{- end -}}
-{{- end }}
-
-{{/*
-Check if web server replicas should be set.
-Returns "true" when web is enabled, serverOnly mode is set, and serverReplicas is greater than 1.
-*/}}
-{{- define "flux-operator.setWebServerReplicas" -}}
-{{- if and .Values.web.enabled .Values.web.serverOnly (gt (int .Values.web.serverReplicas) 1) -}}
-true
-{{- end -}}
-{{- end }}
-
-{{/*
-Check if web roles should be created.
-Returns "true" when web is enabled and createRoles is enabled.
-*/}}
-{{- define "flux-operator.createWebRoles" -}}
-{{- if and .Values.web.enabled .Values.web.rbac.createRoles -}}
-true
-{{- end -}}
-{{- end }}
-
-{{/*
-Check if web roles aggregation should be created.
-Returns "true" when web is enabled and createAggregation is enabled.
-*/}}
-{{- define "flux-operator.createWebRolesAggregation" -}}
-{{- if and .Values.web.enabled .Values.web.rbac.createAggregation -}}
-true
-{{- end -}}
-{{- end }}
diff --git a/packages/system/fluxcd-operator/charts/flux-operator/templates/admin-clusterrole.yaml b/packages/system/fluxcd-operator/charts/flux-operator/templates/admin-clusterrole.yaml
deleted file mode 100644
index 2e5f17bfc5..0000000000
--- a/packages/system/fluxcd-operator/charts/flux-operator/templates/admin-clusterrole.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-{{- if and .Values.rbac.create (not (include "flux-operator.webServerOnly" .)) }}
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  name: {{ include "flux-operator.fullname" . }}
-  labels:
-    {{- include "flux-operator.labels" . | nindent 4 }}
-    {{- with .Values.commonLabels }}
-    {{- toYaml . | nindent 4 }}
-    {{- end }}
-  {{- with .Values.commonAnnotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: cluster-admin
-subjects:
-  - kind: ServiceAccount
-    name: {{ include "flux-operator.serviceAccountName" . }}
-    namespace: {{ .Release.Namespace }}
-{{- end }}
diff --git a/packages/system/fluxcd-operator/charts/flux-operator/templates/aggregate-clusterrole.yaml b/packages/system/fluxcd-operator/charts/flux-operator/templates/aggregate-clusterrole.yaml
deleted file mode 100644
index 42c2cfee14..0000000000
--- a/packages/system/fluxcd-operator/charts/flux-operator/templates/aggregate-clusterrole.yaml
+++ /dev/null
@@ -1,56 +0,0 @@
-{{- if and .Values.rbac.createAggregation (not (include "flux-operator.webServerOnly" .)) }}
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  name: {{ include "flux-operator.fullname" . }}-edit
-  labels:
-    rbac.authorization.k8s.io/aggregate-to-edit: "true"
-    rbac.authorization.k8s.io/aggregate-to-admin: "true"
-    {{- include "flux-operator.labels" . | nindent 4 }}
-    {{- with .Values.commonLabels }}
-    {{- toYaml . | nindent 4 }}
-    {{- end }}
-  {{- with .Values.commonAnnotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-rules:
-  - apiGroups:
-      - fluxcd.controlplane.io
-    resources:
-      - resourcesets
-      - resourcesetinputproviders
-    verbs:
-      - create
-      - delete
-      - deletecollection
-      - patch
-      - update
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  name: {{ include "flux-operator.fullname" . }}-view
-  labels:
-    rbac.authorization.k8s.io/aggregate-to-admin: "true"
-    rbac.authorization.k8s.io/aggregate-to-edit: "true"
-    rbac.authorization.k8s.io/aggregate-to-view: "true"
-    {{- include "flux-operator.labels" . | nindent 4 }}
-    {{- with .Values.commonLabels }}
-    {{- toYaml . | nindent 4 }}
-    {{- end }}
-  {{- with .Values.commonAnnotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-rules:
-  - apiGroups:
-      - fluxcd.controlplane.io
-    resources:
-      - resourcesets
-      - resourcesetinputproviders
-    verbs:
-      - get
-      - list
-      - watch
-{{- end }}
diff --git a/packages/system/fluxcd-operator/charts/flux-operator/templates/crds.yaml b/packages/system/fluxcd-operator/charts/flux-operator/templates/crds.yaml
deleted file mode 100644
index b9439f2d3d..0000000000
--- a/packages/system/fluxcd-operator/charts/flux-operator/templates/crds.yaml
+++ /dev/null
@@ -1,1780 +0,0 @@
-{{- if and .Values.installCRDs }}
-apiVersion: apiextensions.k8s.io/v1
-kind: CustomResourceDefinition
-metadata:
-  annotations:
-    controller-gen.kubebuilder.io/version: v0.21.0
-    helm.sh/resource-policy: keep
-  labels:
-    app.kubernetes.io/instance: '{{ .Release.Name }}'
-    app.kubernetes.io/managed-by: '{{ .Release.Service }}'
-    app.kubernetes.io/name: '{{ .Chart.Name }}'
-    app.kubernetes.io/version: '{{ .Chart.AppVersion }}'
-    helm.sh/chart: '{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}'
-  name: fluxinstances.fluxcd.controlplane.io
-spec:
-  group: fluxcd.controlplane.io
-  names:
-    kind: FluxInstance
-    listKind: FluxInstanceList
-    plural: fluxinstances
-    singular: fluxinstance
-  scope: Namespaced
-  versions:
-  - additionalPrinterColumns:
-    - jsonPath: .metadata.creationTimestamp
-      name: Age
-      type: date
-    - jsonPath: .status.conditions[?(@.type=="Ready")].status
-      name: Ready
-      type: string
-    - jsonPath: .status.conditions[?(@.type=="Ready")].message
-      name: Status
-      type: string
-    - jsonPath: .status.lastAttemptedRevision
-      name: Revision
-      type: string
-    name: v1
-    schema:
-      openAPIV3Schema:
-        description: FluxInstance is the Schema for the fluxinstances API
-        properties:
-          apiVersion:
-            description: |-
-              APIVersion defines the versioned schema of this representation of an object.
-              Servers should convert recognized schemas to the latest internal value, and
-              may reject unrecognized values.
-              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
-            type: string
-          kind:
-            description: |-
-              Kind is a string value representing the REST resource this object represents.
-              Servers may infer this from the endpoint the client submits requests to.
-              Cannot be updated.
-              In CamelCase.
-              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
-            type: string
-          metadata:
-            type: object
-          spec:
-            description: FluxInstanceSpec defines the desired state of FluxInstance
-            properties:
-              cluster:
-                description: Cluster holds the specification of the Kubernetes cluster.
-                properties:
-                  domain:
-                    default: cluster.local
-                    description: |-
-                      Domain is the cluster domain used for generating the FQDN of services.
-                      Defaults to 'cluster.local'.
-                    type: string
-                  multitenant:
-                    default: false
-                    description: Multitenant enables the multitenancy lockdown. Defaults
-                      to false.
-                    type: boolean
-                  multitenantWorkloadIdentity:
-                    default: false
-                    description: |-
-                      MultitenantWorkloadIdentity enables the multitenancy lockdown for
-                      workload identity. Defaults to false.
-                    type: boolean
-                  networkPolicy:
-                    default: true
-                    description: |-
-                      NetworkPolicy restricts network access to the current namespace.
-                      Defaults to true.
-                    type: boolean
-                  objectLevelWorkloadIdentity:
-                    description: |-
-                      ObjectLevelWorkloadIdentity enables the feature gate
-                      required for object-level workload identity.
-                      This feature is only available in Flux v2.6.0 and later.
-                    type: boolean
-                  size:
-                    description: |-
-                      Size defines the vertical scaling profile of the Flux controllers.
-                      The size is used to determine the concurrency and CPU/Memory limits for the Flux controllers.
-                      Accepted values are: 'small', 'medium' and 'large'.
-                    enum:
-                    - small
-                    - medium
-                    - large
-                    type: string
-                  tenantDefaultDecryptionServiceAccount:
-                    description: |-
-                      TenantDefaultDecryptionServiceAccount is the name of the service account
-                      to use as default for kustomize-controller SOPS decryption when the
-                      multitenant lockdown for workload identity is enabled. Defaults to the
-                      'default' service account from the tenant namespace.
-                    type: string
-                  tenantDefaultKubeConfigServiceAccount:
-                    description: |-
-                      TenantDefaultKubeConfigServiceAccount is the name of the service account
-                      to use as default for kustomize-controller and helm-controller remote
-                      cluster access via spec.kubeConfig.configMapRef when the multitenant
-                      lockdown for workload identity is enabled. Defaults to the 'default'
-                      service account from the tenant namespace.
-                    type: string
-                  tenantDefaultServiceAccount:
-                    description: |-
-                      TenantDefaultServiceAccount is the name of the service account
-                      to use as default when the multitenant lockdown is enabled, for
-                      kustomize-controller and helm-controller.
-                      This field will also be used for multitenant workload identity
-                      lockdown for source-controller, notification-controller,
-                      image-reflector-controller and image-automation-controller.
-                      Defaults to the 'default' service account from the tenant namespace.
-                    type: string
-                  type:
-                    default: kubernetes
-                    description: |-
-                      Type specifies the distro of the Kubernetes cluster.
-                      Defaults to 'kubernetes'.
-                    enum:
-                    - kubernetes
-                    - openshift
-                    - aws
-                    - azure
-                    - gcp
-                    type: string
-                type: object
-                x-kubernetes-validations:
-                - message: .objectLevelWorkloadIdentity must be set to true when .multitenantWorkloadIdentity
-                    is set to true
-                  rule: (has(self.objectLevelWorkloadIdentity) && self.objectLevelWorkloadIdentity)
-                    || !has(self.multitenantWorkloadIdentity) || !self.multitenantWorkloadIdentity
-              commonMetadata:
-                description: |-
-                  CommonMetadata specifies the common labels and annotations that are
-                  applied to all resources. Any existing label or annotation will be
-                  overridden if its key matches a common one.
-                properties:
-                  annotations:
-                    additionalProperties:
-                      type: string
-                    description: Annotations to be added to the object's metadata.
-                    type: object
-                  labels:
-                    additionalProperties:
-                      type: string
-                    description: Labels to be added to the object's metadata.
-                    type: object
-                type: object
-              components:
-                description: |-
-                  Components is the list of controllers to install.
-                  Defaults to the core Flux controllers:
-                    - source-controller
-                    - kustomize-controller
-                    - helm-controller
-                    - notification-controller
-                items:
-                  description: Component is the name of a controller to install.
-                  enum:
-                  - source-controller
-                  - kustomize-controller
-                  - helm-controller
-                  - notification-controller
-                  - image-reflector-controller
-                  - image-automation-controller
-                  - source-watcher
-                  type: string
-                type: array
-              distribution:
-                description: Distribution specifies the version and container registry
-                  to pull images from.
-                properties:
-                  artifact:
-                    description: |-
-                      Artifact is the URL to the OCI artifact containing
-                      the latest Kubernetes manifests for the distribution,
-                      e.g. 'oci://ghcr.io/controlplaneio-fluxcd/flux-operator-manifests:latest'.
-                    pattern: ^oci://.*$
-                    type: string
-                  artifactPullSecret:
-                    description: |-
-                      ArtifactPullSecret is the name of the Kubernetes secret
-                      to use for pulling the Kubernetes manifests for the distribution specified in the Artifact field.
-                    type: string
-                  imagePullSecret:
-                    description: |-
-                      ImagePullSecret is the name of the Kubernetes secret
-                      to use for pulling images.
-                    type: string
-                  registry:
-                    description: |-
-                      Registry address to pull the distribution images from
-                      e.g. 'ghcr.io/fluxcd'.
-                    type: string
-                  variant:
-                    description: |-
-                      Variant specifies the Flux distribution flavor stored
-                      in the registry.
-                    enum:
-                    - upstream-alpine
-                    - enterprise-alpine
-                    - enterprise-distroless
-                    - enterprise-distroless-fips
-                    type: string
-                  version:
-                    description: Version semver expression e.g. '2.x', '2.3.x'.
-                    type: string
-                required:
-                - registry
-                - version
-                type: object
-              kustomize:
-                description: |-
-                  Kustomize holds a set of patches that can be applied to the
-                  Flux installation, to customize the way Flux operates.
-                properties:
-                  patches:
-                    description: |-
-                      Strategic merge and JSON patches, defined as inline YAML objects,
-                      capable of targeting objects based on kind, label and annotation selectors.
-                    items:
-                      description: |-
-                        Patch contains an inline StrategicMerge or JSON6902 patch, and the target the patch should
-                        be applied to.
-                      properties:
-                        patch:
-                          description: |-
-                            Patch contains an inline StrategicMerge patch or an inline JSON6902 patch with
-                            an array of operation objects.
-                          type: string
-                        target:
-                          description: Target points to the resources that the patch
-                            document should be applied to.
-                          properties:
-                            annotationSelector:
-                              description: |-
-                                AnnotationSelector is a string that follows the label selection expression
-                                https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/#api
-                                It matches with the resource annotations.
-                              type: string
-                            group:
-                              description: |-
-                                Group is the API group to select resources from.
-                                Together with Version and Kind it is capable of unambiguously identifying and/or selecting resources.
-                                https://github.com/kubernetes/community/blob/master/contributors/design-proposals/api-machinery/api-group.md
-                              type: string
-                            kind:
-                              description: |-
-                                Kind of the API Group to select resources from.
-                                Together with Group and Version it is capable of unambiguously
-                                identifying and/or selecting resources.
-                                https://github.com/kubernetes/community/blob/master/contributors/design-proposals/api-machinery/api-group.md
-                              type: string
-                            labelSelector:
-                              description: |-
-                                LabelSelector is a string that follows the label selection expression
-                                https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/#api
-                                It matches with the resource labels.
-                              type: string
-                            name:
-                              description: Name to match resources with.
-                              type: string
-                            namespace:
-                              description: Namespace to select resources from.
-                              type: string
-                            version:
-                              description: |-
-                                Version of the API Group to select resources from.
-                                Together with Group and Kind it is capable of unambiguously identifying and/or selecting resources.
-                                https://github.com/kubernetes/community/blob/master/contributors/design-proposals/api-machinery/api-group.md
-                              type: string
-                          type: object
-                      required:
-                      - patch
-                      type: object
-                    type: array
-                type: object
-              migrateResources:
-                default: true
-                description: |-
-                  MigrateResources instructs the controller to migrate the Flux custom resources
-                  from the previous version to the latest API version specified in the CRD.
-                  Defaults to true.
-                type: boolean
-              sharding:
-                description: Sharding holds the specification of the sharding configuration.
-                properties:
-                  key:
-                    default: sharding.fluxcd.io/key
-                    description: Key is the label key used to shard the resources.
-                    type: string
-                  shards:
-                    description: Shards is the list of shard names.
-                    items:
-                      type: string
-                    minItems: 1
-                    type: array
-                  storage:
-                    description: |-
-                      Storage defines if the source-controller shards
-                      should use an emptyDir or a persistent volume claim for storage.
-                      Accepted values are 'ephemeral' or 'persistent', defaults to 'ephemeral'.
-                      For 'persistent' to take effect, the '.spec.storage' field must be set.
-                    enum:
-                    - ephemeral
-                    - persistent
-                    type: string
-                required:
-                - shards
-                type: object
-              storage:
-                description: |-
-                  Storage holds the specification of the source-controller
-                  persistent volume claim.
-                properties:
-                  class:
-                    description: Class is the storage class to use for the PVC.
-                    type: string
-                  size:
-                    description: Size is the size of the PVC.
-                    type: string
-                required:
-                - class
-                - size
-                type: object
-              sync:
-                description: |-
-                  Sync specifies the source for the cluster sync operation.
-                  When set, a Flux source (GitRepository, OCIRepository or Bucket)
-                  and Flux Kustomization are created to sync the cluster state
-                  with the source repository.
-                properties:
-                  interval:
-                    default: 1m
-                    description: Interval is the time between syncs.
-                    pattern: ^([0-9]+(\.[0-9]+)?(ms|s|m|h))+$
-                    type: string
-                  kind:
-                    description: Kind is the kind of the source.
-                    enum:
-                    - OCIRepository
-                    - GitRepository
-                    - Bucket
-                    type: string
-                  name:
-                    description: |-
-                      Name is the name of the Flux source and kustomization resources.
-                      When not specified, the name is set to the namespace name of the FluxInstance.
-                    maxLength: 63
-                    type: string
-                    x-kubernetes-validations:
-                    - message: Sync name is immutable
-                      rule: self == oldSelf
-                  path:
-                    description: |-
-                      Path is the path to the source directory containing
-                      the kustomize overlay or plain Kubernetes manifests.
-                    type: string
-                  provider:
-                    description: |-
-                      Provider specifies OIDC provider for source authentication.
-                      For OCIRepository and Bucket the provider can be set to 'aws', 'azure' or 'gcp'.
-                      For GitRepository the provider can be set to 'aws' (requires Flux 2.9 or later),
-                      'azure' or 'github'.
-                      To disable OIDC authentication the provider can be set to 'generic' or left empty.
-                    enum:
-                    - generic
-                    - aws
-                    - azure
-                    - gcp
-                    - github
-                    type: string
-                  pullSecret:
-                    description: |-
-                      PullSecret specifies the Kubernetes Secret containing the
-                      authentication credentials for the source.
-                      For Git over HTTP/S sources, the secret must contain username and password fields.
-                      For Git over SSH sources, the secret must contain known_hosts and identity fields.
-                      For OCI sources, the secret must be of type kubernetes.io/dockerconfigjson.
-                      For Bucket sources, the secret must contain accesskey and secretkey fields.
-                    type: string
-                  ref:
-                    description: |-
-                      Ref is the source reference, can be a Git ref name e.g. 'refs/heads/main',
-                      an OCI tag e.g. 'latest' or a bucket name e.g. 'flux'.
-                    type: string
-                  url:
-                    description: |-
-                      URL is the source URL, can be a Git repository HTTP/S or SSH address,
-                      an OCI repository address or a Bucket endpoint.
-                    type: string
-                required:
-                - kind
-                - path
-                - ref
-                - url
-                type: object
-                x-kubernetes-validations:
-                - message: sync.provider 'gcp' is only supported for OCIRepository
-                    and Bucket
-                  rule: '!has(self.provider) || self.provider != ''gcp'' || self.kind
-                    == ''OCIRepository'' || self.kind == ''Bucket'''
-                - message: sync.provider 'github' is only supported for GitRepository
-                  rule: '!has(self.provider) || self.provider != ''github'' || self.kind
-                    == ''GitRepository'''
-              wait:
-                default: true
-                description: |-
-                  Wait instructs the controller to check the health of all the reconciled
-                  resources. Defaults to true.
-                type: boolean
-            required:
-            - distribution
-            type: object
-          status:
-            description: FluxInstanceStatus defines the observed state of FluxInstance
-            properties:
-              components:
-                description: Components contains the container images used by the
-                  components.
-                items:
-                  description: ComponentImage represents a container image used by
-                    a component.
-                  properties:
-                    digest:
-                      description: Digest of the container image.
-                      type: string
-                    name:
-                      description: Name of the component.
-                      type: string
-                    repository:
-                      description: Repository address of the container image.
-                      type: string
-                    tag:
-                      description: Tag of the container image.
-                      type: string
-                  required:
-                  - name
-                  - repository
-                  - tag
-                  type: object
-                type: array
-              conditions:
-                description: Conditions contains the readiness conditions of the object.
-                items:
-                  description: Condition contains details for one aspect of the current
-                    state of this API Resource.
-                  properties:
-                    lastTransitionTime:
-                      description: |-
-                        lastTransitionTime is the last time the condition transitioned from one status to another.
-                        This should be when the underlying condition changed.  If that is not known, then using the time when the API field changed is acceptable.
-                      format: date-time
-                      type: string
-                    message:
-                      description: |-
-                        message is a human readable message indicating details about the transition.
-                        This may be an empty string.
-                      maxLength: 32768
-                      type: string
-                    observedGeneration:
-                      description: |-
-                        observedGeneration represents the .metadata.generation that the condition was set based upon.
-                        For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date
-                        with respect to the current state of the instance.
-                      format: int64
-                      minimum: 0
-                      type: integer
-                    reason:
-                      description: |-
-                        reason contains a programmatic identifier indicating the reason for the condition's last transition.
-                        Producers of specific condition types may define expected values and meanings for this field,
-                        and whether the values are considered a guaranteed API.
-                        The value should be a CamelCase string.
-                        This field may not be empty.
-                      maxLength: 1024
-                      minLength: 1
-                      pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
-                      type: string
-                    status:
-                      description: status of the condition, one of True, False, Unknown.
-                      enum:
-                      - "True"
-                      - "False"
-                      - Unknown
-                      type: string
-                    type:
-                      description: type of condition in CamelCase or in foo.example.com/CamelCase.
-                      maxLength: 316
-                      pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
-                      type: string
-                  required:
-                  - lastTransitionTime
-                  - message
-                  - reason
-                  - status
-                  - type
-                  type: object
-                type: array
-              history:
-                description: |-
-                  History contains the reconciliation history of the FluxInstance
-                  as a list of snapshots ordered by the last reconciled time.
-                items:
-                  description: |-
-                    Snapshot represents a point-in-time record of a group of resources reconciliation,
-                    including timing information, status, and a unique digest identifier.
-                  properties:
-                    digest:
-                      description: Digest is the checksum in the format `<algo>:<hex>`
-                        of the resources in this snapshot.
-                      type: string
-                    firstReconciled:
-                      description: FirstReconciled is the time when this revision
-                        was first reconciled to the cluster.
-                      format: date-time
-                      type: string
-                    lastReconciled:
-                      description: LastReconciled is the time when this revision was
-                        last reconciled to the cluster.
-                      format: date-time
-                      type: string
-                    lastReconciledDuration:
-                      description: LastReconciledDuration is time it took to reconcile
-                        the resources in this revision.
-                      type: string
-                    lastReconciledStatus:
-                      description: LastReconciledStatus is the status of the last
-                        reconciliation.
-                      type: string
-                    metadata:
-                      additionalProperties:
-                        type: string
-                      description: Metadata contains additional information about
-                        the snapshot.
-                      type: object
-                    totalReconciliations:
-                      description: TotalReconciliations is the total number of reconciliations
-                        that have occurred for this snapshot.
-                      format: int64
-                      type: integer
-                  required:
-                  - digest
-                  - firstReconciled
-                  - lastReconciled
-                  - lastReconciledDuration
-                  - lastReconciledStatus
-                  - totalReconciliations
-                  type: object
-                type: array
-              inventory:
-                description: |-
-                  Inventory contains a list of Kubernetes resource object references
-                  last applied on the cluster.
-                properties:
-                  entries:
-                    description: Entries of Kubernetes resource object references.
-                    items:
-                      description: ResourceRef contains the information necessary
-                        to locate a resource within a cluster.
-                      properties:
-                        id:
-                          description: |-
-                            ID is the string representation of the Kubernetes resource object's metadata,
-                            in the format '<namespace>_<name>_<group>_<kind>'.
-                          type: string
-                        v:
-                          description: Version is the API version of the Kubernetes
-                            resource object's kind.
-                          type: string
-                      required:
-                      - id
-                      - v
-                      type: object
-                    type: array
-                required:
-                - entries
-                type: object
-              lastAppliedRevision:
-                description: |-
-                  LastAppliedRevision is the version and digest of the
-                  distribution config that was last reconcile.
-                type: string
-              lastArtifactRevision:
-                description: |-
-                  LastArtifactRevision is the digest of the last pulled
-                  distribution artifact.
-                type: string
-              lastAttemptedRevision:
-                description: |-
-                  LastAttemptedRevision is the version and digest of the
-                  distribution config that was last attempted to reconcile.
-                type: string
-              lastHandledForceAt:
-                description: |-
-                  LastHandledForceAt holds the value of the most recent
-                  force request value, so a change of the annotation value
-                  can be detected.
-                type: string
-              lastHandledReconcileAt:
-                description: |-
-                  LastHandledReconcileAt holds the value of the most recent
-                  reconcile request value, so a change of the annotation value
-                  can be detected.
-                type: string
-            type: object
-        type: object
-        x-kubernetes-validations:
-        - message: the only accepted name for a FluxInstance is 'flux'
-          rule: self.metadata.name == 'flux'
-    served: true
-    storage: true
-    subresources:
-      status: {}
----
-apiVersion: apiextensions.k8s.io/v1
-kind: CustomResourceDefinition
-metadata:
-  annotations:
-    controller-gen.kubebuilder.io/version: v0.21.0
-    helm.sh/resource-policy: keep
-  labels:
-    app.kubernetes.io/instance: '{{ .Release.Name }}'
-    app.kubernetes.io/managed-by: '{{ .Release.Service }}'
-    app.kubernetes.io/name: '{{ .Chart.Name }}'
-    app.kubernetes.io/version: '{{ .Chart.AppVersion }}'
-    helm.sh/chart: '{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}'
-  name: fluxreports.fluxcd.controlplane.io
-spec:
-  group: fluxcd.controlplane.io
-  names:
-    kind: FluxReport
-    listKind: FluxReportList
-    plural: fluxreports
-    singular: fluxreport
-  scope: Namespaced
-  versions:
-  - additionalPrinterColumns:
-    - jsonPath: .spec.distribution.entitlement
-      name: Entitlement
-      priority: 10
-      type: string
-    - jsonPath: .metadata.creationTimestamp
-      name: Age
-      type: date
-    - jsonPath: .status.conditions[?(@.type=="Ready")].status
-      name: Ready
-      type: string
-    - jsonPath: .status.conditions[?(@.type=="Ready")].message
-      name: Status
-      type: string
-    - jsonPath: .status.conditions[?(@.type=="Ready")].lastTransitionTime
-      name: LastUpdated
-      type: string
-    name: v1
-    schema:
-      openAPIV3Schema:
-        description: FluxReport is the Schema for the fluxreports API.
-        properties:
-          apiVersion:
-            description: |-
-              APIVersion defines the versioned schema of this representation of an object.
-              Servers should convert recognized schemas to the latest internal value, and
-              may reject unrecognized values.
-              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
-            type: string
-          kind:
-            description: |-
-              Kind is a string value representing the REST resource this object represents.
-              Servers may infer this from the endpoint the client submits requests to.
-              Cannot be updated.
-              In CamelCase.
-              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
-            type: string
-          metadata:
-            type: object
-          spec:
-            description: FluxReportSpec defines the observed state of a Flux installation.
-            properties:
-              cluster:
-                description: Cluster is the version information of the Kubernetes
-                  cluster.
-                properties:
-                  nodes:
-                    description: Nodes is the number of nodes in the Kubernetes cluster.
-                    type: integer
-                  platform:
-                    description: Platform is the os/arch of the Kubernetes control
-                      plane.
-                    type: string
-                  serverVersion:
-                    description: ServerVersion is the version of the Kubernetes API
-                      server.
-                    type: string
-                required:
-                - platform
-                - serverVersion
-                type: object
-              components:
-                description: ComponentsStatus is the status of the Flux controller
-                  deployments.
-                items:
-                  description: FluxComponentStatus defines the observed state of a
-                    Flux component.
-                  properties:
-                    image:
-                      description: Image is the container image of the Flux component.
-                      type: string
-                    name:
-                      description: Name is the name of the Flux component.
-                      type: string
-                    ready:
-                      description: Ready is the readiness status of the Flux component.
-                      type: boolean
-                    status:
-                      description: |-
-                        Status is a human-readable message indicating details
-                        about the Flux component observed state.
-                      type: string
-                  required:
-                  - image
-                  - name
-                  - ready
-                  - status
-                  type: object
-                type: array
-              distribution:
-                description: Distribution is the version information of the Flux installation.
-                properties:
-                  entitlement:
-                    description: Entitlement is the entitlement verification status.
-                    type: string
-                  managedBy:
-                    description: ManagedBy is the name of the operator managing the
-                      Flux instance.
-                    type: string
-                  status:
-                    description: |-
-                      Status is a human-readable message indicating details
-                      about the distribution observed state.
-                    type: string
-                  version:
-                    description: Version is the version of the Flux instance.
-                    type: string
-                required:
-                - entitlement
-                - status
-                type: object
-              operator:
-                description: Operator is the version information of the Flux Operator.
-                properties:
-                  apiVersion:
-                    description: APIVersion is the API version of the Flux Operator.
-                    type: string
-                  platform:
-                    description: Platform is the os/arch of Flux Operator.
-                    type: string
-                  version:
-                    description: Version is the version number of Flux Operator.
-                    type: string
-                required:
-                - apiVersion
-                - platform
-                - version
-                type: object
-              reconcilers:
-                description: |-
-                  ReconcilersStatus is the list of Flux reconcilers and
-                  their statistics grouped by API kind.
-                items:
-                  description: FluxReconcilerStatus defines the observed state of
-                    a Flux reconciler.
-                  properties:
-                    apiVersion:
-                      description: APIVersion is the API version of the Flux resource.
-                      type: string
-                    kind:
-                      description: Kind is the kind of the Flux resource.
-                      type: string
-                    stats:
-                      description: Stats is the reconcile statics of the Flux resource
-                        kind.
-                      properties:
-                        failing:
-                          description: |-
-                            Failing is the number of reconciled
-                            resources in the Failing state and not Suspended.
-                          type: integer
-                        running:
-                          description: |-
-                            Running is the number of reconciled
-                            resources in the Running state.
-                          type: integer
-                        suspended:
-                          description: |-
-                            Suspended is the number of reconciled
-                            resources in the Suspended state.
-                          type: integer
-                        totalSize:
-                          description: TotalSize is the total size of the artifacts
-                            in storage.
-                          type: string
-                      required:
-                      - failing
-                      - running
-                      - suspended
-                      type: object
-                  required:
-                  - apiVersion
-                  - kind
-                  type: object
-                type: array
-              sync:
-                description: |-
-                  SyncStatus is the status of the cluster sync
-                  Source and Kustomization resources.
-                properties:
-                  id:
-                    description: ID is the identifier of the sync.
-                    type: string
-                  path:
-                    description: Path is the kustomize path of the sync.
-                    type: string
-                  ready:
-                    description: Ready is the readiness status of the sync.
-                    type: boolean
-                  source:
-                    description: Source is the URL of the source repository.
-                    type: string
-                  status:
-                    description: |-
-                      Status is a human-readable message indicating details
-                      about the sync observed state.
-                    type: string
-                required:
-                - id
-                - ready
-                - status
-                type: object
-            required:
-            - distribution
-            type: object
-          status:
-            description: FluxReportStatus defines the readiness of a FluxReport.
-            properties:
-              conditions:
-                description: Conditions contains the readiness conditions of the object.
-                items:
-                  description: Condition contains details for one aspect of the current
-                    state of this API Resource.
-                  properties:
-                    lastTransitionTime:
-                      description: |-
-                        lastTransitionTime is the last time the condition transitioned from one status to another.
-                        This should be when the underlying condition changed.  If that is not known, then using the time when the API field changed is acceptable.
-                      format: date-time
-                      type: string
-                    message:
-                      description: |-
-                        message is a human readable message indicating details about the transition.
-                        This may be an empty string.
-                      maxLength: 32768
-                      type: string
-                    observedGeneration:
-                      description: |-
-                        observedGeneration represents the .metadata.generation that the condition was set based upon.
-                        For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date
-                        with respect to the current state of the instance.
-                      format: int64
-                      minimum: 0
-                      type: integer
-                    reason:
-                      description: |-
-                        reason contains a programmatic identifier indicating the reason for the condition's last transition.
-                        Producers of specific condition types may define expected values and meanings for this field,
-                        and whether the values are considered a guaranteed API.
-                        The value should be a CamelCase string.
-                        This field may not be empty.
-                      maxLength: 1024
-                      minLength: 1
-                      pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
-                      type: string
-                    status:
-                      description: status of the condition, one of True, False, Unknown.
-                      enum:
-                      - "True"
-                      - "False"
-                      - Unknown
-                      type: string
-                    type:
-                      description: type of condition in CamelCase or in foo.example.com/CamelCase.
-                      maxLength: 316
-                      pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
-                      type: string
-                  required:
-                  - lastTransitionTime
-                  - message
-                  - reason
-                  - status
-                  - type
-                  type: object
-                type: array
-              lastHandledReconcileAt:
-                description: |-
-                  LastHandledReconcileAt holds the value of the most recent
-                  reconcile request value, so a change of the annotation value
-                  can be detected.
-                type: string
-            type: object
-        type: object
-        x-kubernetes-validations:
-        - message: the only accepted name for a FluxReport is 'flux'
-          rule: self.metadata.name == 'flux'
-    served: true
-    storage: true
-    subresources:
-      status: {}
----
-apiVersion: apiextensions.k8s.io/v1
-kind: CustomResourceDefinition
-metadata:
-  annotations:
-    controller-gen.kubebuilder.io/version: v0.21.0
-    helm.sh/resource-policy: keep
-  labels:
-    app.kubernetes.io/instance: '{{ .Release.Name }}'
-    app.kubernetes.io/managed-by: '{{ .Release.Service }}'
-    app.kubernetes.io/name: '{{ .Chart.Name }}'
-    app.kubernetes.io/version: '{{ .Chart.AppVersion }}'
-    helm.sh/chart: '{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}'
-  name: resourcesetinputproviders.fluxcd.controlplane.io
-spec:
-  group: fluxcd.controlplane.io
-  names:
-    kind: ResourceSetInputProvider
-    listKind: ResourceSetInputProviderList
-    plural: resourcesetinputproviders
-    shortNames:
-    - rsip
-    singular: resourcesetinputprovider
-  scope: Namespaced
-  versions:
-  - additionalPrinterColumns:
-    - jsonPath: .metadata.creationTimestamp
-      name: Age
-      type: date
-    - jsonPath: .status.conditions[?(@.type=="Ready")].status
-      name: Ready
-      type: string
-    - jsonPath: .status.conditions[?(@.type=="Ready")].message
-      name: Status
-      type: string
-    name: v1
-    schema:
-      openAPIV3Schema:
-        description: ResourceSetInputProvider is the Schema for the ResourceSetInputProviders
-          API.
-        properties:
-          apiVersion:
-            description: |-
-              APIVersion defines the versioned schema of this representation of an object.
-              Servers should convert recognized schemas to the latest internal value, and
-              may reject unrecognized values.
-              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
-            type: string
-          kind:
-            description: |-
-              Kind is a string value representing the REST resource this object represents.
-              Servers may infer this from the endpoint the client submits requests to.
-              Cannot be updated.
-              In CamelCase.
-              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
-            type: string
-          metadata:
-            type: object
-          spec:
-            description: ResourceSetInputProviderSpec defines the desired state of
-              ResourceSetInputProvider
-            properties:
-              certSecretRef:
-                description: |-
-                  CertSecretRef specifies the Kubernetes Secret containing either or both of
-
-                  - a PEM-encoded CA certificate (`ca.crt`)
-                  - a PEM-encoded client certificate (`tls.crt`) and private key (`tls.key`)
-
-                  When connecting to a Git, OCI, or ExternalService provider that uses self-signed certificates,
-                  the CA certificate must be set in the Secret under the 'ca.crt' key to establish the trust relationship.
-                  When connecting to a provider that supports client certificates (mTLS), the client certificate
-                  and private key must be set in the Secret under the 'tls.crt' and 'tls.key' keys, respectively.
-                properties:
-                  name:
-                    description: Name of the referent.
-                    type: string
-                required:
-                - name
-                type: object
-              defaultValues:
-                additionalProperties:
-                  x-kubernetes-preserve-unknown-fields: true
-                description: |-
-                  DefaultValues contains the default values for the inputs.
-                  These values are used to populate the inputs when the provider
-                  response does not contain them.
-                type: object
-              filter:
-                description: Filter defines the filter to apply to the input provider
-                  response.
-                properties:
-                  excludeBranch:
-                    description: |-
-                      ExcludeBranch specifies the regular expression to filter the branches
-                      that the input provider should exclude.
-                    type: string
-                  excludeEnvironment:
-                    description: |-
-                      ExcludeEnvironment specifies the regular expression to filter the environments
-                      that the input provider should exclude.
-                    type: string
-                  excludeTag:
-                    description: |-
-                      ExcludeTag specifies the regular expression to filter the tags
-                      that the input provider should exclude.
-                    type: string
-                  includeBranch:
-                    description: |-
-                      IncludeBranch specifies the regular expression to filter the branches
-                      that the input provider should include.
-                    type: string
-                  includeEnvironment:
-                    description: |-
-                      IncludeEnvironment specifies the regular expression to filter the environments
-                      that the input provider should include.
-                    type: string
-                  includeTag:
-                    description: |-
-                      IncludeTag specifies the regular expression to filter the tags
-                      that the input provider should include.
-                    type: string
-                  labels:
-                    description: Labels specifies the list of labels to filter the
-                      input provider response.
-                    items:
-                      type: string
-                    type: array
-                  limit:
-                    default: 100
-                    description: |-
-                      Limit specifies the maximum number of input sets to return.
-                      When not set, the default limit is 100.
-                    type: integer
-                  semver:
-                    description: |-
-                      Semver specifies a semantic version range to filter and sort the tags.
-                      If this field is not specified, the tags will be sorted in reverse
-                      alphabetical order.
-                      Supported only for tags at the moment.
-                    type: string
-                type: object
-              insecure:
-                description: |-
-                  Insecure allows connecting to an ExternalService or OCIArtifactTag provider
-                  over plain HTTP without TLS. When not set, the URL must use HTTPS.
-                type: boolean
-              schedule:
-                description: Schedule defines the schedules for the input provider
-                  to run.
-                items:
-                  description: Schedule defines a schedule for something to run.
-                  properties:
-                    cron:
-                      description: Cron specifies the cron expression for the schedule.
-                      type: string
-                    timeZone:
-                      default: UTC
-                      description: TimeZone specifies the time zone for the cron schedule.
-                        Defaults to UTC.
-                      type: string
-                    window:
-                      default: 0s
-                      description: |-
-                        Window defines the time window during which the execution is allowed.
-                        Defaults to 0s, meaning no window is applied.
-                      pattern: ^([0-9]+(\.[0-9]+)?(ms|s|m|h))+$
-                      type: string
-                  required:
-                  - cron
-                  type: object
-                type: array
-              secretRef:
-                description: |-
-                  SecretRef specifies the Kubernetes Secret containing the credentials
-                  to access the input provider.
-                  When connecting to a Git provider, the secret must contain the keys
-                  'username' and 'password', and the password should be a personal access token
-                  that grants read-only access to the repository.
-                  When connecting to an OCI provider, the secret must contain a Kubernetes
-                  Image Pull Secret, as if created by `kubectl create secret docker-registry`.
-                  When connecting to an ExternalService provider, the secret must contain either
-                  a 'token' key for bearer token authentication, or 'username' and 'password'
-                  keys for basic authentication.
-                properties:
-                  name:
-                    description: Name of the referent.
-                    type: string
-                required:
-                - name
-                type: object
-              serviceAccountName:
-                description: |-
-                  ServiceAccountName specifies the name of the Kubernetes ServiceAccount
-                  used for authentication with AWS, Azure or GCP services through
-                  workload identity federation features. If not specified, the
-                  authentication for these cloud providers will use the ServiceAccount
-                  of the operator (or any other environment authentication configuration).
-                type: string
-              skip:
-                description: Skip defines whether we need to skip input provider response
-                  updates.
-                properties:
-                  labels:
-                    description: |-
-                      Labels specifies list of labels to skip input provider response when any of the label conditions matched.
-                      When prefixed with !, input provider response will be skipped if it does not have this label.
-                    items:
-                      type: string
-                    type: array
-                type: object
-              type:
-                description: Type specifies the type of the input provider.
-                enum:
-                - Static
-                - GitHubBranch
-                - GitHubTag
-                - GitHubPullRequest
-                - GitLabBranch
-                - GitLabTag
-                - GitLabMergeRequest
-                - GitLabEnvironment
-                - AzureDevOpsBranch
-                - AzureDevOpsTag
-                - AzureDevOpsPullRequest
-                - AWSCodeCommitBranch
-                - AWSCodeCommitTag
-                - AWSCodeCommitPullRequest
-                - GiteaBranch
-                - GiteaTag
-                - GiteaPullRequest
-                - OCIArtifactTag
-                - ACRArtifactTag
-                - ECRArtifactTag
-                - GARArtifactTag
-                - ExternalService
-                type: string
-              url:
-                description: |-
-                  URL specifies the HTTP/S or OCI address of the input provider API.
-                  When connecting to a Git provider, the URL should point to the repository address.
-                  When connecting to an OCI provider, the URL should point to the OCI repository address.
-                pattern: ^((http|https|oci)://.*){0,1}$
-                type: string
-            required:
-            - type
-            type: object
-            x-kubernetes-validations:
-            - message: spec.url must be empty when spec.type is 'Static'
-              rule: self.type != 'Static' || !has(self.url)
-            - message: spec.url must not be empty when spec.type is not 'Static'
-              rule: self.type == 'Static' || has(self.url)
-            - message: spec.url must start with 'http://' or 'https://' when spec.type
-                is a Git provider
-              rule: '!self.type.startsWith(''Git'') || self.url.startsWith(''http'')'
-            - message: spec.url must start with 'http://' or 'https://' when spec.type
-                is an AzureDevOps provider
-              rule: '!self.type.startsWith(''AzureDevOps'') || self.url.startsWith(''http://'')
-                || self.url.startsWith(''https://'')'
-            - message: spec.url must start with 'https://' when spec.type is a AWSCodeCommit
-                provider
-              rule: '!self.type.startsWith(''AWSCodeCommit'') || self.url.startsWith(''https://'')'
-            - message: spec.url must start with 'oci://' when spec.type is an OCI
-                provider
-              rule: '!self.type.endsWith(''ArtifactTag'') || self.url.startsWith(''oci'')'
-            - message: spec.url must start with 'http://' or 'https://' when spec.type
-                is 'ExternalService'
-              rule: self.type != 'ExternalService' || self.url.startsWith('http')
-            - message: spec.insecure can only be set when spec.type is 'ExternalService'
-                or 'OCIArtifactTag'
-              rule: '!has(self.insecure) || !self.insecure || self.type == ''ExternalService''
-                || self.type == ''OCIArtifactTag'''
-            - message: spec.url must use 'https://' unless spec.insecure is true
-              rule: self.type != 'ExternalService' || !self.url.startsWith('http://')
-                || (has(self.insecure) && self.insecure)
-            - message: cannot specify spec.serviceAccountName when spec.type is not
-                one of AzureDevOps*, AWSCodeCommit* or *ArtifactTag
-              rule: '!has(self.serviceAccountName) || self.type.startsWith(''AzureDevOps'')
-                || self.type.startsWith(''AWSCodeCommit'') || self.type.endsWith(''ArtifactTag'')'
-            - message: cannot specify spec.certSecretRef when spec.type is one of
-                Static, AzureDevOps*, AWSCodeCommit*, ACRArtifactTag, ECRArtifactTag
-                or GARArtifactTag
-              rule: '!has(self.certSecretRef) || !(self.url == ''Static'' || self.type.startsWith(''AzureDevOps'')
-                || self.type.startsWith(''AWSCodeCommit'') || (self.type.endsWith(''ArtifactTag'')
-                && self.type != ''OCIArtifactTag''))'
-            - message: cannot specify spec.secretRef when spec.type is one of Static,
-                AWSCodeCommit*, ACRArtifactTag, ECRArtifactTag or GARArtifactTag
-              rule: '!has(self.secretRef) || !(self.url == ''Static'' || self.type.startsWith(''AWSCodeCommit'')
-                || (self.type.endsWith(''ArtifactTag'') && self.type != ''OCIArtifactTag''))'
-          status:
-            description: ResourceSetInputProviderStatus defines the observed state
-              of ResourceSetInputProvider.
-            properties:
-              conditions:
-                description: Conditions contains the readiness conditions of the object.
-                items:
-                  description: Condition contains details for one aspect of the current
-                    state of this API Resource.
-                  properties:
-                    lastTransitionTime:
-                      description: |-
-                        lastTransitionTime is the last time the condition transitioned from one status to another.
-                        This should be when the underlying condition changed.  If that is not known, then using the time when the API field changed is acceptable.
-                      format: date-time
-                      type: string
-                    message:
-                      description: |-
-                        message is a human readable message indicating details about the transition.
-                        This may be an empty string.
-                      maxLength: 32768
-                      type: string
-                    observedGeneration:
-                      description: |-
-                        observedGeneration represents the .metadata.generation that the condition was set based upon.
-                        For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date
-                        with respect to the current state of the instance.
-                      format: int64
-                      minimum: 0
-                      type: integer
-                    reason:
-                      description: |-
-                        reason contains a programmatic identifier indicating the reason for the condition's last transition.
-                        Producers of specific condition types may define expected values and meanings for this field,
-                        and whether the values are considered a guaranteed API.
-                        The value should be a CamelCase string.
-                        This field may not be empty.
-                      maxLength: 1024
-                      minLength: 1
-                      pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
-                      type: string
-                    status:
-                      description: status of the condition, one of True, False, Unknown.
-                      enum:
-                      - "True"
-                      - "False"
-                      - Unknown
-                      type: string
-                    type:
-                      description: type of condition in CamelCase or in foo.example.com/CamelCase.
-                      maxLength: 316
-                      pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
-                      type: string
-                  required:
-                  - lastTransitionTime
-                  - message
-                  - reason
-                  - status
-                  - type
-                  type: object
-                type: array
-              exportedInputs:
-                description: ExportedInputs contains the list of inputs exported by
-                  the provider.
-                items:
-                  additionalProperties:
-                    x-kubernetes-preserve-unknown-fields: true
-                  description: ResourceSetInput defines the key-value pairs of the
-                    ResourceSet input.
-                  type: object
-                type: array
-              lastExportedRevision:
-                description: |-
-                  LastExportedRevision is the digest of the
-                  inputs that were last reconcile.
-                type: string
-              lastHandledForceAt:
-                description: |-
-                  LastHandledForceAt holds the value of the most recent
-                  force request value, so a change of the annotation value
-                  can be detected.
-                type: string
-              lastHandledReconcileAt:
-                description: |-
-                  LastHandledReconcileAt holds the value of the most recent
-                  reconcile request value, so a change of the annotation value
-                  can be detected.
-                type: string
-              nextSchedule:
-                description: NextSchedule is the next schedule when the input provider
-                  will run.
-                properties:
-                  cron:
-                    description: Cron specifies the cron expression for the schedule.
-                    type: string
-                  timeZone:
-                    default: UTC
-                    description: TimeZone specifies the time zone for the cron schedule.
-                      Defaults to UTC.
-                    type: string
-                  when:
-                    description: When is the next time the schedule will run.
-                    format: date-time
-                    type: string
-                  window:
-                    default: 0s
-                    description: |-
-                      Window defines the time window during which the execution is allowed.
-                      Defaults to 0s, meaning no window is applied.
-                    pattern: ^([0-9]+(\.[0-9]+)?(ms|s|m|h))+$
-                    type: string
-                required:
-                - cron
-                - when
-                type: object
-            type: object
-        type: object
-    served: true
-    storage: true
-    subresources:
-      status: {}
----
-apiVersion: apiextensions.k8s.io/v1
-kind: CustomResourceDefinition
-metadata:
-  annotations:
-    controller-gen.kubebuilder.io/version: v0.21.0
-    helm.sh/resource-policy: keep
-  labels:
-    app.kubernetes.io/instance: '{{ .Release.Name }}'
-    app.kubernetes.io/managed-by: '{{ .Release.Service }}'
-    app.kubernetes.io/name: '{{ .Chart.Name }}'
-    app.kubernetes.io/version: '{{ .Chart.AppVersion }}'
-    helm.sh/chart: '{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}'
-  name: resourcesets.fluxcd.controlplane.io
-spec:
-  group: fluxcd.controlplane.io
-  names:
-    kind: ResourceSet
-    listKind: ResourceSetList
-    plural: resourcesets
-    shortNames:
-    - rset
-    singular: resourceset
-  scope: Namespaced
-  versions:
-  - additionalPrinterColumns:
-    - jsonPath: .metadata.creationTimestamp
-      name: Age
-      type: date
-    - jsonPath: .status.conditions[?(@.type=="Ready")].status
-      name: Ready
-      type: string
-    - jsonPath: .status.conditions[?(@.type=="Ready")].message
-      name: Status
-      type: string
-    name: v1
-    schema:
-      openAPIV3Schema:
-        description: ResourceSet is the Schema for the ResourceSets API.
-        properties:
-          apiVersion:
-            description: |-
-              APIVersion defines the versioned schema of this representation of an object.
-              Servers should convert recognized schemas to the latest internal value, and
-              may reject unrecognized values.
-              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
-            type: string
-          kind:
-            description: |-
-              Kind is a string value representing the REST resource this object represents.
-              Servers may infer this from the endpoint the client submits requests to.
-              Cannot be updated.
-              In CamelCase.
-              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
-            type: string
-          metadata:
-            type: object
-          spec:
-            description: ResourceSetSpec defines the desired state of ResourceSet
-            properties:
-              commonMetadata:
-                description: |-
-                  CommonMetadata specifies the common labels and annotations that are
-                  applied to all resources. Any existing label or annotation will be
-                  overridden if its key matches a common one.
-                properties:
-                  annotations:
-                    additionalProperties:
-                      type: string
-                    description: Annotations to be added to the object's metadata.
-                    type: object
-                  labels:
-                    additionalProperties:
-                      type: string
-                    description: Labels to be added to the object's metadata.
-                    type: object
-                type: object
-              dependsOn:
-                description: |-
-                  DependsOn specifies the list of Kubernetes resources that must
-                  exist on the cluster before the reconciliation process starts.
-                items:
-                  description: Dependency defines a ResourceSet dependency on a Kubernetes
-                    resource.
-                  properties:
-                    apiVersion:
-                      description: APIVersion of the resource to depend on.
-                      type: string
-                    kind:
-                      description: Kind of the resource to depend on.
-                      type: string
-                    name:
-                      description: Name of the resource to depend on.
-                      type: string
-                    namespace:
-                      description: Namespace of the resource to depend on.
-                      type: string
-                    ready:
-                      description: Ready checks if the resource Ready status condition
-                        is true.
-                      type: boolean
-                    readyExpr:
-                      description: |-
-                        ReadyExpr checks if the resource satisfies the given CEL expression.
-                        The expression replaces the default readiness check and
-                        is only evaluated if Ready is set to 'true'.
-                      type: string
-                  required:
-                  - apiVersion
-                  - kind
-                  - name
-                  type: object
-                type: array
-              inputStrategy:
-                description: |-
-                  InputStrategy defines how the inputs are combined when multiple
-                  input provider objects are used. Defaults to flattening all inputs
-                  from all providers into a single list of input sets.
-                properties:
-                  includeEmptyProviders:
-                    description: |-
-                      IncludeEmptyProviders controls how input providers that export no
-                      inputs are treated. Only applies when Name is Permute. When true, if
-                      any provider has zero inputs the resulting permutation set is empty
-                      (mathematically correct Cartesian product behavior). When false or
-                      unset (default), providers with zero inputs are silently skipped and
-                      the remaining providers still permute among themselves.
-                    type: boolean
-                  name:
-                    description: |-
-                      Name defines how the inputs are combined when multiple
-                      input provider objects are used. Supported values are:
-                      - Flatten: all inputs sets from all input provider objects are
-                        flattened into a single list of input sets.
-                      - Permute: all inputs sets from all input provider objects are
-                        combined using a Cartesian product, resulting in a list of input sets
-                        that contains every possible combination of input values.
-                        For example, if provider A has inputs [{x: 1}, {x: 2}] and provider B has
-                        inputs [{y: "a"}, {y: "b"}], the resulting input sets will be:
-                        [{x: 1, y: "a"}, {x: 1, y: "b"}, {x: 2, y: "a"}, {x: 2, y: "b"}].
-                        This strategy can lead to a large number of input sets and should be
-                        used with caution. Users should use filtering features from
-                        ResourceSetInputProvider to limit the amount of exported inputs.
-                    enum:
-                    - Flatten
-                    - Permute
-                    type: string
-                required:
-                - name
-                type: object
-                x-kubernetes-validations:
-                - message: includeEmptyProviders only applies when name is Permute
-                  rule: '!has(self.includeEmptyProviders) || self.name == ''Permute'''
-              inputs:
-                description: Inputs contains the list of ResourceSet inputs.
-                items:
-                  additionalProperties:
-                    x-kubernetes-preserve-unknown-fields: true
-                  description: ResourceSetInput defines the key-value pairs of the
-                    ResourceSet input.
-                  type: object
-                type: array
-              inputsFrom:
-                description: |-
-                  InputsFrom contains the list of references to input providers.
-                  When set, the inputs are fetched from the providers and concatenated
-                  with the in-line inputs defined in the ResourceSet.
-                items:
-                  description: |-
-                    InputProviderReference defines a reference to an input provider resource
-                    in the same namespace as the ResourceSet.
-                  properties:
-                    apiVersion:
-                      description: |-
-                        APIVersion of the input provider resource.
-                        When not set, the APIVersion of the ResourceSet is used.
-                      enum:
-                      - fluxcd.controlplane.io/v1
-                      type: string
-                    kind:
-                      description: Kind of the input provider resource.
-                      enum:
-                      - ResourceSetInputProvider
-                      type: string
-                    name:
-                      description: |-
-                        Name of the input provider resource. Cannot be set
-                        when the Selector field is set.
-                      type: string
-                    selector:
-                      description: |-
-                        Selector is a label selector to filter the input provider resources
-                        as an alternative to the Name field.
-                      properties:
-                        matchExpressions:
-                          description: matchExpressions is a list of label selector
-                            requirements. The requirements are ANDed.
-                          items:
-                            description: |-
-                              A label selector requirement is a selector that contains values, a key, and an operator that
-                              relates the key and values.
-                            properties:
-                              key:
-                                description: key is the label key that the selector
-                                  applies to.
-                                type: string
-                              operator:
-                                description: |-
-                                  operator represents a key's relationship to a set of values.
-                                  Valid operators are In, NotIn, Exists and DoesNotExist.
-                                type: string
-                              values:
-                                description: |-
-                                  values is an array of string values. If the operator is In or NotIn,
-                                  the values array must be non-empty. If the operator is Exists or DoesNotExist,
-                                  the values array must be empty. This array is replaced during a strategic
-                                  merge patch.
-                                items:
-                                  type: string
-                                type: array
-                                x-kubernetes-list-type: atomic
-                            required:
-                            - key
-                            - operator
-                            type: object
-                          type: array
-                          x-kubernetes-list-type: atomic
-                        matchLabels:
-                          additionalProperties:
-                            type: string
-                          description: |-
-                            matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
-                            map is equivalent to an element of matchExpressions, whose key field is "key", the
-                            operator is "In", and the values array contains only "value". The requirements are ANDed.
-                          type: object
-                      type: object
-                      x-kubernetes-map-type: atomic
-                  type: object
-                  x-kubernetes-validations:
-                  - message: at least one of name or selector must be set for input
-                      provider references
-                    rule: has(self.name) || has(self.selector)
-                  - message: cannot set both name and selector for input provider
-                      references
-                    rule: '!has(self.name) || !has(self.selector)'
-                type: array
-              resources:
-                description: Resources contains the list of Kubernetes resources to
-                  reconcile.
-                items:
-                  x-kubernetes-preserve-unknown-fields: true
-                type: array
-              resourcesTemplate:
-                description: |-
-                  ResourcesTemplate is a Go template that generates the list of
-                  Kubernetes resources to reconcile. The template is rendered
-                  as multi-document YAML, the resources should be separated by '---'.
-                  When both Resources and ResourcesTemplate are set, the resulting
-                  objects are merged and deduplicated, with the ones from Resources taking precedence.
-                type: string
-              serviceAccountName:
-                description: |-
-                  The name of the Kubernetes service account to impersonate
-                  when reconciling the generated resources.
-                type: string
-              wait:
-                description: |-
-                  Wait instructs the controller to check the health
-                  of all the reconciled resources.
-                type: boolean
-            type: object
-          status:
-            description: ResourceSetStatus defines the observed state of ResourceSet.
-            properties:
-              conditions:
-                description: Conditions contains the readiness conditions of the object.
-                items:
-                  description: Condition contains details for one aspect of the current
-                    state of this API Resource.
-                  properties:
-                    lastTransitionTime:
-                      description: |-
-                        lastTransitionTime is the last time the condition transitioned from one status to another.
-                        This should be when the underlying condition changed.  If that is not known, then using the time when the API field changed is acceptable.
-                      format: date-time
-                      type: string
-                    message:
-                      description: |-
-                        message is a human readable message indicating details about the transition.
-                        This may be an empty string.
-                      maxLength: 32768
-                      type: string
-                    observedGeneration:
-                      description: |-
-                        observedGeneration represents the .metadata.generation that the condition was set based upon.
-                        For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date
-                        with respect to the current state of the instance.
-                      format: int64
-                      minimum: 0
-                      type: integer
-                    reason:
-                      description: |-
-                        reason contains a programmatic identifier indicating the reason for the condition's last transition.
-                        Producers of specific condition types may define expected values and meanings for this field,
-                        and whether the values are considered a guaranteed API.
-                        The value should be a CamelCase string.
-                        This field may not be empty.
-                      maxLength: 1024
-                      minLength: 1
-                      pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
-                      type: string
-                    status:
-                      description: status of the condition, one of True, False, Unknown.
-                      enum:
-                      - "True"
-                      - "False"
-                      - Unknown
-                      type: string
-                    type:
-                      description: type of condition in CamelCase or in foo.example.com/CamelCase.
-                      maxLength: 316
-                      pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
-                      type: string
-                  required:
-                  - lastTransitionTime
-                  - message
-                  - reason
-                  - status
-                  - type
-                  type: object
-                type: array
-              externalChecksumRefs:
-                description: |-
-                  ExternalChecksumRefs lists the ConfigMap and Secret references
-                  discovered in checksumFrom annotations on the last reconciliation
-                  that point to objects not rendered by this ResourceSet. Each entry
-                  has the form "Kind/namespace/name". It is used to trigger a
-                  reconciliation when one of the referenced objects changes.
-                items:
-                  type: string
-                type: array
-              history:
-                description: |-
-                  History contains the reconciliation history of the ResourceSet
-                  as a list of snapshots ordered by the last reconciled time.
-                items:
-                  description: |-
-                    Snapshot represents a point-in-time record of a group of resources reconciliation,
-                    including timing information, status, and a unique digest identifier.
-                  properties:
-                    digest:
-                      description: Digest is the checksum in the format `<algo>:<hex>`
-                        of the resources in this snapshot.
-                      type: string
-                    firstReconciled:
-                      description: FirstReconciled is the time when this revision
-                        was first reconciled to the cluster.
-                      format: date-time
-                      type: string
-                    lastReconciled:
-                      description: LastReconciled is the time when this revision was
-                        last reconciled to the cluster.
-                      format: date-time
-                      type: string
-                    lastReconciledDuration:
-                      description: LastReconciledDuration is time it took to reconcile
-                        the resources in this revision.
-                      type: string
-                    lastReconciledStatus:
-                      description: LastReconciledStatus is the status of the last
-                        reconciliation.
-                      type: string
-                    metadata:
-                      additionalProperties:
-                        type: string
-                      description: Metadata contains additional information about
-                        the snapshot.
-                      type: object
-                    totalReconciliations:
-                      description: TotalReconciliations is the total number of reconciliations
-                        that have occurred for this snapshot.
-                      format: int64
-                      type: integer
-                  required:
-                  - digest
-                  - firstReconciled
-                  - lastReconciled
-                  - lastReconciledDuration
-                  - lastReconciledStatus
-                  - totalReconciliations
-                  type: object
-                type: array
-              inventory:
-                description: |-
-                  Inventory contains a list of Kubernetes resource object references
-                  last applied on the cluster.
-                properties:
-                  entries:
-                    description: Entries of Kubernetes resource object references.
-                    items:
-                      description: ResourceRef contains the information necessary
-                        to locate a resource within a cluster.
-                      properties:
-                        id:
-                          description: |-
-                            ID is the string representation of the Kubernetes resource object's metadata,
-                            in the format '<namespace>_<name>_<group>_<kind>'.
-                          type: string
-                        v:
-                          description: Version is the API version of the Kubernetes
-                            resource object's kind.
-                          type: string
-                      required:
-                      - id
-                      - v
-                      type: object
-                    type: array
-                required:
-                - entries
-                type: object
-              lastAppliedRevision:
-                description: |-
-                  LastAppliedRevision is the digest of the
-                  generated resources that were last reconcile.
-                type: string
-              lastHandledReconcileAt:
-                description: |-
-                  LastHandledReconcileAt holds the value of the most recent
-                  reconcile request value, so a change of the annotation value
-                  can be detected.
-                type: string
-            type: object
-        type: object
-    served: true
-    storage: true
-    subresources:
-      status: {}
-{{- end }}
diff --git a/packages/system/fluxcd-operator/charts/flux-operator/templates/deployment.yaml b/packages/system/fluxcd-operator/charts/flux-operator/templates/deployment.yaml
deleted file mode 100644
index e303ecf534..0000000000
--- a/packages/system/fluxcd-operator/charts/flux-operator/templates/deployment.yaml
+++ /dev/null
@@ -1,158 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ include "flux-operator.fullname" . }}
-  namespace: {{ .Release.Namespace }}
-  labels:
-    {{- include "flux-operator.labels" . | nindent 4 }}
-    {{- with .Values.commonLabels }}
-    {{- toYaml . | nindent 4 }}
-    {{- end }}
-  {{- with .Values.commonAnnotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-spec:
-  {{- if include "flux-operator.setWebServerReplicas" . }}
-  replicas: {{ .Values.web.serverReplicas }}
-  {{- end }}
-  selector:
-    matchLabels:
-      {{- include "flux-operator.selectorLabels" . | nindent 6 }}
-  template:
-    metadata:
-      annotations:
-        prometheus.io/scrape: "true"
-        prometheus.io/port: "8080"
-        prometheus.io/path: "/metrics"
-        {{- if include "flux-operator.createWebConfigSecret" . }}
-        checksum/web-config: {{ (include (print $.Template.BasePath "/web-secret.yaml") . | fromYaml).stringData | toYaml | sha256sum }}
-        {{- end }}
-        {{- with .Values.commonAnnotations }}
-        {{- toYaml . | nindent 8 }}
-        {{- end }}
-      labels:
-        {{- include "flux-operator.labels" . | nindent 8 }}
-        {{- with .Values.commonLabels }}
-        {{- toYaml . | nindent 8 }}
-        {{- end }}
-    spec:
-      {{- with .Values.priorityClassName }}
-      priorityClassName: {{ . }}
-      {{- end }}
-      {{- with .Values.image.pullSecrets }}
-      imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      serviceAccountName: {{ include "flux-operator.serviceAccountName" . }}
-      {{- with .Values.podSecurityContext }}
-      securityContext:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- if .Values.hostNetwork }}
-      hostNetwork: true
-      {{- end }}
-      containers:
-        - name: manager
-          args:
-            - --log-level={{ .Values.logLevel }}
-            {{- if .Values.multitenancy.enabled }}
-            - --default-service-account={{ .Values.multitenancy.defaultServiceAccount }}
-            {{- end }}
-            {{- if .Values.multitenancy.enabledForWorkloadIdentity }}
-            - --default-workload-identity-service-account={{ .Values.multitenancy.defaultWorkloadIdentityServiceAccount }}
-            {{- end }}
-            {{- if include "flux-operator.webServerOnly" . }}
-            - --web-server-only=true
-            {{- end }}
-            {{- if include "flux-operator.createWebConfigSecret" . }}
-            - --web-config=/etc/flux-operator/web/config.yaml
-            {{- end }}
-            {{- if include "flux-operator.useWebConfigSecret" . }}
-            - --web-config-secret-name={{ .Values.web.configSecretName }}
-            {{- end }}
-            {{- range .Values.extraArgs }}
-            - {{ . }}
-            {{- end }}
-          env:
-            - name: RUNTIME_NAMESPACE
-              valueFrom:
-                fieldRef:
-                  fieldPath: metadata.namespace
-            - name: REPORTING_INTERVAL
-              value: {{ .Values.reporting.interval }}
-            - name: WEB_SERVER_PORT
-              value: "{{ ternary "9080" "0" .Values.web.enabled }}"
-            {{- with .Values.marketplace.type }}
-            - name: MARKETPLACE_TYPE
-              value: {{ . }}
-            {{- end }}
-            {{- with .Values.marketplace.account }}
-            - name: MARKETPLACE_ACCOUNT
-              value: {{ . }}
-            {{- end }}
-            {{- with .Values.marketplace.license }}
-            - name: MARKETPLACE_LICENSE
-              value: {{ . }}
-            {{- end }}
-            {{- if .Values.extraEnvs }}
-              {{- toYaml .Values.extraEnvs | nindent 12 }}
-            {{- end }}
-            {{- include "cozy.kubernetes_envs" . | nindent 12 }}
-          securityContext:
-            {{- toYaml .Values.securityContext | nindent 12 }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
-          imagePullPolicy: "{{ .Values.image.imagePullPolicy }}"
-          ports:
-            - name: http-metrics
-              containerPort: 8080
-              protocol: TCP
-            - name: http
-              containerPort: 8081
-              protocol: TCP
-            {{- if .Values.web.enabled }}
-            - name: http-web
-              containerPort: 9080
-              protocol: TCP
-            {{- end }}
-          livenessProbe:
-            {{- toYaml .Values.livenessProbe | nindent 12 }}
-          readinessProbe:
-            {{- toYaml .Values.readinessProbe | nindent 12 }}
-          resources:
-            {{- toYaml .Values.resources | nindent 12 }}
-          volumeMounts:
-            - name: temp
-              mountPath: /tmp
-          {{- if include "flux-operator.createWebConfigSecret" . }}
-            - name: web-config
-              mountPath: /etc/flux-operator/web
-              readOnly: true
-          {{- end }}
-            {{- if .Values.extraVolumeMounts }}
-              {{- toYaml .Values.extraVolumeMounts | nindent 12 }}
-            {{- end }}
-      volumes:
-        - name: temp
-          emptyDir: {}
-      {{- if include "flux-operator.createWebConfigSecret" . }}
-        - name: web-config
-          secret:
-            secretName: {{ include "flux-operator.fullname" . }}-web-config
-      {{- end }}
-        {{- if .Values.extraVolumes }}
-          {{- toYaml .Values.extraVolumes | nindent 8 }}
-        {{- end }}
-      {{- with .Values.affinity }}
-      affinity:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.tolerations }}
-      tolerations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.nodeSelector }}
-      nodeSelector:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-
diff --git a/packages/system/fluxcd-operator/charts/flux-operator/templates/flowschema.yaml b/packages/system/fluxcd-operator/charts/flux-operator/templates/flowschema.yaml
deleted file mode 100644
index b01fab11b3..0000000000
--- a/packages/system/fluxcd-operator/charts/flux-operator/templates/flowschema.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
-{{- if .Values.apiPriority.enabled }}
-apiVersion: flowcontrol.apiserver.k8s.io/v1
-kind: FlowSchema
-metadata:
-  name: {{ include "flux-operator.fullname" . }}
-  annotations:
-    apf.kubernetes.io/autoupdate-spec: "false"
-spec:
-  distinguisherMethod:
-    type: ByUser
-  matchingPrecedence: 950
-  priorityLevelConfiguration:
-    name: {{ .Values.apiPriority.level }}
-  rules:
-    - nonResourceRules:
-        - nonResourceURLs:
-            - '*'
-          verbs:
-            - '*'
-      resourceRules:
-        - apiGroups:
-            - '*'
-          clusterScope: true
-          namespaces:
-            - '*'
-          resources:
-            - '*'
-          verbs:
-            - '*'
-      subjects:
-        - kind: ServiceAccount
-          serviceAccount:
-            name: {{ include "flux-operator.serviceAccountName" . }}
-            namespace: {{ .Release.Namespace }}
-        {{- range .Values.apiPriority.extraServiceAccounts }}
-        - kind: ServiceAccount
-          serviceAccount:
-            name: {{ .name }}
-            namespace: {{ .namespace }}
-        {{- end }}
-{{- end }}
diff --git a/packages/system/fluxcd-operator/charts/flux-operator/templates/httproute.yaml b/packages/system/fluxcd-operator/charts/flux-operator/templates/httproute.yaml
deleted file mode 100644
index 1af8cadb5f..0000000000
--- a/packages/system/fluxcd-operator/charts/flux-operator/templates/httproute.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-{{- if .Values.web.httpRoute.enabled -}}
-apiVersion: gateway.networking.k8s.io/v1
-kind: HTTPRoute
-metadata:
-  name: {{ include "flux-operator.fullname" . }}
-  namespace: {{ .Release.Namespace }}
-  labels:
-    {{- include "flux-operator.labels" . | nindent 4 }}
-  {{- with .Values.web.httpRoute.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-spec:
-  {{- with .Values.web.httpRoute.parentRefs }}
-  parentRefs:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-  {{- with .Values.web.httpRoute.hostnames }}
-  hostnames:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-  rules:
-    - backendRefs:
-        - name: {{ include "flux-operator.fullname" . }}
-          port: 9080
-{{- end }}
diff --git a/packages/system/fluxcd-operator/charts/flux-operator/templates/ingress.yaml b/packages/system/fluxcd-operator/charts/flux-operator/templates/ingress.yaml
deleted file mode 100644
index 4f614ff922..0000000000
--- a/packages/system/fluxcd-operator/charts/flux-operator/templates/ingress.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
-{{- if .Values.web.ingress.enabled -}}
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: {{ include "flux-operator.fullname" . }}
-  namespace: {{ .Release.Namespace }}
-  labels:
-    {{- include "flux-operator.labels" . | nindent 4 }}
-  {{- with .Values.web.ingress.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-spec:
-  {{- with .Values.web.ingress.className }}
-  ingressClassName: {{ . }}
-  {{- end }}
-  {{- if .Values.web.ingress.tls }}
-  tls:
-    {{- range .Values.web.ingress.tls }}
-    - hosts:
-        {{- range .hosts }}
-        - {{ . | quote }}
-        {{- end }}
-      secretName: {{ .secretName }}
-    {{- end }}
-  {{- end }}
-  rules:
-    {{- range .Values.web.ingress.hosts }}
-    - host: {{ .host | quote }}
-      http:
-        paths:
-          {{- range .paths }}
-          - path: {{ .path }}
-            {{- with .pathType }}
-            pathType: {{ . }}
-            {{- end }}
-            backend:
-              service:
-                name: {{ include "flux-operator.fullname" $ }}
-                port:
-                  name: http-web
-          {{- end }}
-    {{- end }}
-{{- end }}
diff --git a/packages/system/fluxcd-operator/charts/flux-operator/templates/network-policy.yaml b/packages/system/fluxcd-operator/charts/flux-operator/templates/network-policy.yaml
deleted file mode 100644
index 2e7e6be791..0000000000
--- a/packages/system/fluxcd-operator/charts/flux-operator/templates/network-policy.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-{{- if .Capabilities.APIVersions.Has "cilium.io/v2/CiliumClusterwideNetworkPolicy" }}
-apiVersion: cilium.io/v2
-kind: CiliumClusterwideNetworkPolicy
-metadata:
-  name: {{ include "flux-operator.fullname" . }}-restrict
-spec:
-  nodeSelector: {}
-  ingressDeny:
-    - fromEntities:
-        - world
-      toPorts:
-        - ports:
-            - port: "8080"
-              protocol: TCP
-            - port: "8081"
-              protocol: TCP
-            - port: "9080"
-              protocol: TCP
-  ingress:
-    - fromEntities:
-        - cluster
-{{- end }}
diff --git a/packages/system/fluxcd-operator/charts/flux-operator/templates/networkpolicy.yaml b/packages/system/fluxcd-operator/charts/flux-operator/templates/networkpolicy.yaml
deleted file mode 100644
index 4c81bd10d3..0000000000
--- a/packages/system/fluxcd-operator/charts/flux-operator/templates/networkpolicy.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-{{- if and .Values.web.enabled .Values.web.networkPolicy.create }}
-apiVersion: networking.k8s.io/v1
-kind: NetworkPolicy
-metadata:
-  name: {{ include "flux-operator.fullname" . }}-web
-  namespace: {{ .Release.Namespace }}
-  labels:
-    {{- include "flux-operator.labels" . | nindent 4 }}
-    {{- with .Values.commonLabels }}
-    {{- toYaml . | nindent 4 }}
-    {{- end }}
-  {{- with .Values.commonAnnotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-spec:
-  policyTypes:
-    - Ingress
-  podSelector:
-    matchLabels:
-      {{- include "flux-operator.selectorLabels" . | nindent 6 }}
-  ingress:
-    - from:
-        - namespaceSelector: {}
-      ports:
-        - protocol: TCP
-          port: 9080
-        {{- if .Values.serviceMonitor.create }}
-        - protocol: TCP
-          port: 8080
-        {{- end }}
-{{- end }}
diff --git a/packages/system/fluxcd-operator/charts/flux-operator/templates/service.yaml b/packages/system/fluxcd-operator/charts/flux-operator/templates/service.yaml
deleted file mode 100644
index 3a8e1932c7..0000000000
--- a/packages/system/fluxcd-operator/charts/flux-operator/templates/service.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ include "flux-operator.fullname" . }}
-  namespace: {{ .Release.Namespace }}
-  labels:
-    {{- include "flux-operator.labels" . | nindent 4 }}
-    {{- with .Values.commonLabels }}
-    {{- toYaml . | nindent 4 }}
-    {{- end }}
-  {{- with .Values.commonAnnotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-spec:
-  {{- with .Values.service.ipFamilyPolicy }}
-  ipFamilyPolicy: {{ . }}
-  {{- end }}
-  ports:
-    - port: 8080
-      targetPort: http-metrics
-      protocol: TCP
-      name: http
-    {{- if .Values.web.enabled }}
-    - port: 9080
-      targetPort: http-web
-      protocol: TCP
-      name: http-web
-    {{- end }}
-  selector:
-    {{- include "flux-operator.selectorLabels" . | nindent 4 }}
diff --git a/packages/system/fluxcd-operator/charts/flux-operator/templates/serviceaccount.yaml b/packages/system/fluxcd-operator/charts/flux-operator/templates/serviceaccount.yaml
deleted file mode 100644
index 2a481a59cc..0000000000
--- a/packages/system/fluxcd-operator/charts/flux-operator/templates/serviceaccount.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-{{- if .Values.serviceAccount.create }}
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: {{ include "flux-operator.serviceAccountName" . }}
-  namespace: {{ .Release.Namespace }}
-  labels:
-    {{- include "flux-operator.labels" . | nindent 4 }}
-    {{- with .Values.commonLabels }}
-    {{- toYaml . | nindent 4 }}
-    {{- end }}
-  {{- with .Values.commonAnnotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-automountServiceAccountToken: {{ .Values.serviceAccount.automount }}
-{{- end }}
diff --git a/packages/system/fluxcd-operator/charts/flux-operator/templates/servicemonitor.yaml b/packages/system/fluxcd-operator/charts/flux-operator/templates/servicemonitor.yaml
deleted file mode 100644
index 5bdb488938..0000000000
--- a/packages/system/fluxcd-operator/charts/flux-operator/templates/servicemonitor.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
-{{- if .Values.serviceMonitor.create }}
-apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
-metadata:
-  name: {{ include "flux-operator.fullname" . }}
-  namespace: {{ .Release.Namespace }}
-  labels:
-    {{- include "flux-operator.labels" . | nindent 4 }}
-    {{- with .Values.commonLabels }}
-    {{- toYaml . | nindent 4 }}
-    {{- end }}
-    {{- with .Values.serviceMonitor.labels }}
-    {{- toYaml . | nindent 4 }}
-    {{- end }}
-  {{- with .Values.commonAnnotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-spec:
-  namespaceSelector:
-    matchNames:
-      - {{ .Release.Namespace | quote }}
-  selector:
-    matchLabels:
-      {{- include "flux-operator.selectorLabels" . | nindent 6 }}
-  endpoints:
-    - targetPort: 8080
-      path: /metrics
-      interval: {{ .Values.serviceMonitor.interval }}
-      scrapeTimeout: {{ .Values.serviceMonitor.scrapeTimeout }}
-{{- end }}
diff --git a/packages/system/fluxcd-operator/charts/flux-operator/templates/web-clusterrole.yaml b/packages/system/fluxcd-operator/charts/flux-operator/templates/web-clusterrole.yaml
deleted file mode 100644
index 1cc3125661..0000000000
--- a/packages/system/fluxcd-operator/charts/flux-operator/templates/web-clusterrole.yaml
+++ /dev/null
@@ -1,47 +0,0 @@
-{{- if include "flux-operator.webServerOnly" . }}
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  name: {{ include "flux-operator.fullname" . }}-view
-  labels:
-    {{- include "flux-operator.labels" . | nindent 4 }}
-    {{- with .Values.commonLabels }}
-    {{- toYaml . | nindent 4 }}
-    {{- end }}
-  {{- with .Values.commonAnnotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-rules:
-  - apiGroups: ["*"]
-    resources: ["*"]
-    verbs: ["get", "list", "watch"]
-  - apiGroups: [""]
-    resources: ["events"]
-    verbs: ["create"]
-  - apiGroups: [""]
-    resources: ["users", "groups"]
-    verbs: ["impersonate"]
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  name: {{ include "flux-operator.fullname" . }}
-  labels:
-    {{- include "flux-operator.labels" . | nindent 4 }}
-    {{- with .Values.commonLabels }}
-    {{- toYaml . | nindent 4 }}
-    {{- end }}
-  {{- with .Values.commonAnnotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: {{ include "flux-operator.fullname" . }}-view
-subjects:
-  - kind: ServiceAccount
-    name: {{ include "flux-operator.serviceAccountName" . }}
-    namespace: {{ .Release.Namespace }}
-{{- end }}
diff --git a/packages/system/fluxcd-operator/charts/flux-operator/templates/web-secret.yaml b/packages/system/fluxcd-operator/charts/flux-operator/templates/web-secret.yaml
deleted file mode 100644
index c019f77c9b..0000000000
--- a/packages/system/fluxcd-operator/charts/flux-operator/templates/web-secret.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-{{- if and .Values.web.config .Values.web.configSecretName -}}
-{{- fail "Invalid values: 'web.config' and 'web.configSecretName' cannot both be set. Set at most one." -}}
-{{- end -}}
-{{- if include "flux-operator.createWebConfigSecret" . -}}
-apiVersion: v1
-kind: Secret
-metadata:
-  name: {{ include "flux-operator.fullname" . }}-web-config
-  namespace: {{ .Release.Namespace }}
-  labels:
-    {{- include "flux-operator.labels" . | nindent 4 }}
-    {{- with .Values.commonLabels }}
-    {{- toYaml . | nindent 4 }}
-    {{- end }}
-  {{- with .Values.commonAnnotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-type: Opaque
-stringData:
-  config.yaml: |
-    apiVersion: web.fluxcd.controlplane.io/v1
-    kind: Config
-    spec:
-      {{- toYaml .Values.web.config | nindent 6 }}
-{{- end }}
diff --git a/packages/system/fluxcd-operator/charts/flux-operator/templates/web-standard-roles.yaml b/packages/system/fluxcd-operator/charts/flux-operator/templates/web-standard-roles.yaml
deleted file mode 100644
index 085d1d6ac7..0000000000
--- a/packages/system/fluxcd-operator/charts/flux-operator/templates/web-standard-roles.yaml
+++ /dev/null
@@ -1,131 +0,0 @@
-{{- if include "flux-operator.createWebRoles" . }}
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  name: flux-web-user
-  labels:
-    {{- include "flux-operator.labels" . | nindent 4 }}
-    {{- with .Values.commonLabels }}
-    {{- toYaml . | nindent 4 }}
-    {{- end }}
-  {{- with .Values.commonAnnotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-rules:
-  - apiGroups: ["*"]
-    resources: ["*"]
-    verbs: ["get", "list", "watch"]
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  name: flux-web-admin
-  labels:
-    {{- include "flux-operator.labels" . | nindent 4 }}
-    {{- with .Values.commonLabels }}
-    {{- toYaml . | nindent 4 }}
-    {{- end }}
-  {{- with .Values.commonAnnotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-rules:
-  - apiGroups: ["*"]
-    resources: ["*"]
-    verbs: ["get", "list", "watch"]
-  - apiGroups:
-      - fluxcd.controlplane.io
-      - source.toolkit.fluxcd.io
-      - source.extensions.fluxcd.io
-      - kustomize.toolkit.fluxcd.io
-      - helm.toolkit.fluxcd.io
-      - image.toolkit.fluxcd.io
-      - notification.toolkit.fluxcd.io
-    resources: ["*"]
-    verbs:
-      - patch
-      - reconcile
-      - suspend
-      - resume
-      - download
-  - apiGroups:
-      - apps
-    resources:
-      - deployments
-      - statefulsets
-      - daemonsets
-    verbs:
-      - patch
-      - restart
-  - apiGroups:
-      - batch
-    resources:
-      - cronjobs
-      - jobs
-    verbs:
-      - create
-      - restart
-  - apiGroups:
-      - ""
-    resources:
-      - pods
-    verbs:
-      - delete
-{{- end }}
-{{- if include "flux-operator.createWebRolesAggregation" . }}
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  name: flux-web-edit
-  labels:
-    {{- include "flux-operator.labels" . | nindent 4 }}
-    {{- with .Values.commonLabels }}
-    {{- toYaml . | nindent 4 }}
-    {{- end }}
-    rbac.authorization.k8s.io/aggregate-to-edit: "true"
-  {{- with .Values.commonAnnotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-rules:
-  - apiGroups:
-      - fluxcd.controlplane.io
-      - source.toolkit.fluxcd.io
-      - source.extensions.fluxcd.io
-      - kustomize.toolkit.fluxcd.io
-      - helm.toolkit.fluxcd.io
-      - image.toolkit.fluxcd.io
-      - notification.toolkit.fluxcd.io
-    resources:
-      - '*'
-    verbs:
-      - reconcile
-      - suspend
-      - resume
-      - download
-  - apiGroups:
-      - apps
-    resources:
-      - deployments
-      - statefulsets
-      - daemonsets
-    verbs:
-      - patch
-      - restart
-  - apiGroups:
-      - batch
-    resources:
-      - cronjobs
-      - jobs
-    verbs:
-      - create
-      - restart
-  - apiGroups:
-      - ""
-    resources:
-      - pods
-    verbs:
-      - delete
-{{- end }}
diff --git a/packages/system/fluxcd-operator/charts/flux-operator/values.schema.json b/packages/system/fluxcd-operator/charts/flux-operator/values.schema.json
deleted file mode 100644
index aa11fc0526..0000000000
--- a/packages/system/fluxcd-operator/charts/flux-operator/values.schema.json
+++ /dev/null
@@ -1,553 +0,0 @@
-{
-    "$schema": "https://json-schema.org/draft/2019-09/schema",
-    "type": "object",
-    "required": [
-        "resources",
-        "securityContext"
-    ],
-    "properties": {
-        "affinity": {
-            "default": {
-                "nodeAffinity": {
-                    "requiredDuringSchedulingIgnoredDuringExecution": {
-                        "nodeSelectorTerms": [
-                            {
-                                "matchExpressions": [
-                                    {
-                                        "key": "kubernetes.io/os",
-                                        "operator": "In",
-                                        "values": [
-                                            "linux"
-                                        ]
-                                    }
-                                ]
-                            }
-                        ]
-                    }
-                }
-            },
-            "type": "object",
-            "properties": {
-                "nodeAffinity": {
-                    "type": "object",
-                    "properties": {
-                        "requiredDuringSchedulingIgnoredDuringExecution": {
-                            "type": "object",
-                            "properties": {
-                                "nodeSelectorTerms": {
-                                    "type": "array",
-                                    "items": {
-                                        "type": "object",
-                                        "properties": {
-                                            "matchExpressions": {
-                                                "type": "array",
-                                                "items": {
-                                                    "type": "object",
-                                                    "properties": {
-                                                        "key": {
-                                                            "type": "string"
-                                                        },
-                                                        "operator": {
-                                                            "type": "string"
-                                                        },
-                                                        "values": {
-                                                            "type": "array",
-                                                            "items": {
-                                                                "type": "string"
-                                                            }
-                                                        }
-                                                    }
-                                                }
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        },
-        "apiPriority": {
-            "default": {
-                "enabled": false,
-                "extraServiceAccounts": [],
-                "level": "workload-high"
-            },
-            "type": "object",
-            "properties": {
-                "enabled": {
-                    "type": "boolean"
-                },
-                "extraServiceAccounts": {
-                    "type": "array"
-                },
-                "level": {
-                    "type": "string"
-                }
-            }
-        },
-        "commonAnnotations": {
-            "type": "object"
-        },
-        "commonLabels": {
-            "type": "object"
-        },
-        "extraArgs": {
-            "type": "array",
-            "uniqueItems": true,
-            "items": {
-                "type": "string"
-            }
-        },
-        "extraEnvs": {
-            "type": "array",
-            "uniqueItems": true,
-            "items": {
-                "type": "object"
-            }
-        },
-        "extraVolumeMounts": {
-            "type": "array",
-            "uniqueItems": true,
-            "items": {
-                "type": "object"
-            }
-        },
-        "extraVolumes": {
-            "type": "array",
-            "uniqueItems": true,
-            "items": {
-                "type": "object"
-            }
-        },
-        "fullnameOverride": {
-            "type": "string"
-        },
-        "hostNetwork": {
-            "default": false,
-            "type": "boolean"
-        },
-        "image": {
-            "type": "object",
-            "required": [
-                "repository"
-            ],
-            "properties": {
-                "imagePullPolicy": {
-                    "type": "string",
-                    "enum": [
-                        "IfNotPresent",
-                        "Always",
-                        "Never"
-                    ]
-                },
-                "pullSecrets": {
-                    "type": "array",
-                    "uniqueItems": true,
-                    "items": {
-                        "type": "object"
-                    }
-                },
-                "repository": {
-                    "type": "string"
-                },
-                "tag": {
-                    "type": "string"
-                }
-            }
-        },
-        "installCRDs": {
-            "default": true,
-            "type": "boolean"
-        },
-        "livenessProbe": {
-            "default": {
-                "httpGet": {
-                    "path": "/healthz",
-                    "port": 8081
-                },
-                "initialDelaySeconds": 15,
-                "periodSeconds": 20
-            },
-            "type": "object",
-            "properties": {
-                "httpGet": {
-                    "type": "object",
-                    "properties": {
-                        "path": {
-                            "type": "string"
-                        },
-                        "port": {
-                            "type": "integer"
-                        }
-                    }
-                },
-                "initialDelaySeconds": {
-                    "type": "integer"
-                },
-                "periodSeconds": {
-                    "type": "integer"
-                }
-            }
-        },
-        "logLevel": {
-            "type": "string",
-            "enum": [
-                "debug",
-                "info",
-                "error"
-            ]
-        },
-        "marketplace": {
-            "type": "object",
-            "properties": {
-                "account": {
-                    "type": "string"
-                },
-                "license": {
-                    "type": "string"
-                },
-                "type": {
-                    "type": "string"
-                }
-            }
-        },
-        "multitenancy": {
-            "type": "object",
-            "required": [
-                "defaultServiceAccount",
-                "defaultWorkloadIdentityServiceAccount"
-            ],
-            "properties": {
-                "defaultServiceAccount": {
-                    "type": "string"
-                },
-                "defaultWorkloadIdentityServiceAccount": {
-                    "type": "string"
-                },
-                "enabled": {
-                    "type": "boolean"
-                },
-                "enabledForWorkloadIdentity": {
-                    "type": "boolean"
-                }
-            }
-        },
-        "nameOverride": {
-            "type": "string"
-        },
-        "nodeSelector": {
-            "type": "object"
-        },
-        "podSecurityContext": {
-            "default": {
-                "fsGroup": 1337
-            },
-            "type": "object"
-        },
-        "priorityClassName": {
-            "default": "system-cluster-critical",
-            "type": "string"
-        },
-        "rbac": {
-            "type": "object",
-            "properties": {
-                "create": {
-                    "type": "boolean"
-                },
-                "createAggregation": {
-                    "type": "boolean"
-                }
-            }
-        },
-        "readinessProbe": {
-            "default": {
-                "httpGet": {
-                    "path": "/readyz",
-                    "port": 8081
-                },
-                "initialDelaySeconds": 5,
-                "periodSeconds": 10
-            },
-            "type": "object",
-            "properties": {
-                "httpGet": {
-                    "type": "object",
-                    "properties": {
-                        "path": {
-                            "type": "string"
-                        },
-                        "port": {
-                            "type": "integer"
-                        }
-                    }
-                },
-                "initialDelaySeconds": {
-                    "type": "integer"
-                },
-                "periodSeconds": {
-                    "type": "integer"
-                }
-            }
-        },
-        "reporting": {
-            "type": "object",
-            "required": [
-                "interval"
-            ],
-            "properties": {
-                "interval": {
-                    "type": "string"
-                }
-            }
-        },
-        "resources": {
-            "type": "object",
-            "properties": {
-                "limits": {
-                    "type": "object",
-                    "properties": {
-                        "cpu": {
-                            "type": "string"
-                        },
-                        "memory": {
-                            "type": "string"
-                        }
-                    }
-                },
-                "requests": {
-                    "default": {
-                        "cpu": "100m",
-                        "memory": "64Mi"
-                    },
-                    "type": "object",
-                    "properties": {
-                        "cpu": {
-                            "type": "string"
-                        },
-                        "memory": {
-                            "type": "string"
-                        }
-                    }
-                }
-            }
-        },
-        "securityContext": {
-            "type": "object",
-            "properties": {
-                "allowPrivilegeEscalation": {
-                    "default": false,
-                    "type": "boolean"
-                },
-                "capabilities": {
-                    "default": {
-                        "drop": [
-                            "ALL"
-                        ]
-                    },
-                    "type": "object",
-                    "properties": {
-                        "drop": {
-                            "type": "array",
-                            "uniqueItems": true,
-                            "items": {
-                                "type": "string"
-                            }
-                        }
-                    }
-                },
-                "readOnlyRootFilesystem": {
-                    "default": true,
-                    "type": "boolean"
-                },
-                "runAsNonRoot": {
-                    "default": true,
-                    "type": "boolean"
-                },
-                "seccompProfile": {
-                    "default": {
-                        "type": "RuntimeDefault"
-                    },
-                    "type": "object",
-                    "properties": {
-                        "type": {
-                            "type": "string"
-                        }
-                    }
-                }
-            }
-        },
-        "service": {
-            "type": "object",
-            "properties": {
-                "ipFamilyPolicy": {
-                    "type": "string",
-                    "enum": [
-                        "",
-                        "SingleStack",
-                        "PreferDualStack",
-                        "RequireDualStack"
-                    ]
-                }
-            }
-        },
-        "serviceAccount": {
-            "default": {
-                "automount": true,
-                "create": true,
-                "name": ""
-            },
-            "type": "object",
-            "properties": {
-                "automount": {
-                    "type": "boolean"
-                },
-                "create": {
-                    "type": "boolean"
-                },
-                "name": {
-                    "type": "string"
-                }
-            }
-        },
-        "serviceMonitor": {
-            "default": {
-                "create": false,
-                "interval": "60s",
-                "scrapeTimeout": "30s"
-            },
-            "type": "object",
-            "properties": {
-                "create": {
-                    "type": "boolean"
-                },
-                "interval": {
-                    "type": "string"
-                },
-                "labels": {
-                    "type": "object"
-                },
-                "scrapeTimeout": {
-                    "type": "string"
-                }
-            }
-        },
-        "tolerations": {
-            "type": "array",
-            "uniqueItems": true,
-            "items": {
-                "type": "object"
-            }
-        },
-        "web": {
-            "type": "object",
-            "properties": {
-                "config": {
-                    "type": "object"
-                },
-                "configSecretName": {
-                    "default": "",
-                    "type": "string"
-                },
-                "enabled": {
-                    "type": "boolean"
-                },
-                "httpRoute": {
-                    "default": {
-                        "annotations": {},
-                        "enabled": false,
-                        "hostnames": [],
-                        "parentRefs": []
-                    },
-                    "type": "object",
-                    "properties": {
-                        "annotations": {
-                            "type": "object"
-                        },
-                        "enabled": {
-                            "default": false,
-                            "type": "boolean"
-                        },
-                        "hostnames": {
-                            "type": "array",
-                            "uniqueItems": true,
-                            "items": {
-                                "type": "string"
-                            }
-                        },
-                        "parentRefs": {
-                            "type": "array",
-                            "uniqueItems": true,
-                            "items": {
-                                "type": "object"
-                            }
-                        }
-                    }
-                },
-                "ingress": {
-                    "default": {
-                        "annotations": {},
-                        "className": "",
-                        "enabled": false
-                    },
-                    "type": "object",
-                    "properties": {
-                        "annotations": {
-                            "type": "object"
-                        },
-                        "className": {
-                            "type": "string"
-                        },
-                        "enabled": {
-                            "default": false,
-                            "type": "boolean"
-                        },
-                        "hosts": {
-                            "type": "array",
-                            "uniqueItems": true,
-                            "items": {
-                                "type": "object"
-                            }
-                        },
-                        "tls": {
-                            "type": "array",
-                            "uniqueItems": true,
-                            "items": {
-                                "type": "object"
-                            }
-                        }
-                    }
-                },
-                "networkPolicy": {
-                    "type": "object",
-                    "properties": {
-                        "create": {
-                            "type": "boolean"
-                        }
-                    }
-                },
-                "rbac": {
-                    "type": "object",
-                    "properties": {
-                        "createAggregation": {
-                            "default": false,
-                            "type": "boolean"
-                        },
-                        "createRoles": {
-                            "default": true,
-                            "type": "boolean"
-                        }
-                    }
-                },
-                "serverOnly": {
-                    "type": "boolean"
-                },
-                "serverReplicas": {
-                    "default": 1,
-                    "type": "integer"
-                }
-            }
-        }
-    }
-}
diff --git a/packages/system/fluxcd-operator/charts/flux-operator/values.yaml b/packages/system/fluxcd-operator/charts/flux-operator/values.yaml
deleted file mode 100644
index 32ba30162e..0000000000
--- a/packages/system/fluxcd-operator/charts/flux-operator/values.yaml
+++ /dev/null
@@ -1,194 +0,0 @@
-# Default values for flux-operator.
-
-nameOverride: ""
-fullnameOverride: ""
-
-# -- Enable [multitenancy lockdown](https://fluxoperator.dev/docs/crd/resourceset/#role-based-access-control) for the ResourceSet APIs.
-multitenancy:
-  enabled: false
-  enabledForWorkloadIdentity: false
-  defaultServiceAccount: "flux-operator" # @schema required: true
-  defaultWorkloadIdentityServiceAccount: "flux-operator" # @schema required: true
-
-# -- Flux [reporting](https://fluxoperator.dev/docs/crd/fluxreport/) settings.
-reporting:
-  interval: 5m # @schema required: true
-
-web:
-  # -- Enable the [Flux Status web server](https://fluxoperator.dev/web-ui/) on port 9080.
-  enabled: true
-  # -- The spec of the [Web Config API](https://fluxoperator.dev/docs/web-ui/web-config-api/)
-  config: { } # @schema type: object
-  # -- Reference to an existing Secret in the same namespace as the deployment containing the Web Config API. Should have the key `config.yaml`.
-  configSecretName: "" # @schema default: ""
-  # -- Create a NetworkPolicy to allow access to the Flux Status web interface.
-  networkPolicy:
-    create: true
-  # -- Create standard roles for [user access management](https://fluxoperator.dev/docs/web-ui/user-management/).
-  rbac:
-    createRoles: true # @schema default: true
-    createAggregation: false # @schema default: false
-  # -- Run the Flux Status web server as a standalone deployment (requires a dedicated Helm release).
-  serverOnly: false
-  # -- Number of replicas for the Flux Status web server standalone deployment (only applicable if `web.serverOnly` is `true`).
-  serverReplicas: 1 # @schema default: 1
-  # -- Ingress settings for the Flux Status web interface.
-  ingress: # @schema default: {"enabled":false,"className":"","annotations":{}}
-    enabled: false # @schema default: false
-    className: ""
-    annotations: { } # @schema type: object
-    hosts: [ ] # @schema item: object ; uniqueItems: true
-    # - host: flux-operator.example.com
-    #   paths:
-    #     - path: /
-    #       pathType: ImplementationSpecific
-    tls: [ ] # @schema item: object ; uniqueItems: true
-    #  - secretName: flux-operator-tls
-    #    hosts:
-    #      - flux-operator.example.com
-  # -- Gateway API HTTPRoute settings for the Flux Status web interface.
-  httpRoute: # @schema default: {"enabled":false,"annotations":{},"parentRefs":[],"hostnames":[]}
-    enabled: false # @schema default: false
-    annotations: { } # @schema type: object
-    parentRefs: [ ] # @schema item: object ; uniqueItems: true
-    # - name: my-gateway
-    #   namespace: gateway-system
-    #   sectionName: https
-    hostnames: [ ] # @schema item: string ; uniqueItems: true
-    # - flux.example.com
-
-# -- Install and upgrade the custom resource definitions.
-installCRDs: true # @schema default: true
-
-# -- Common annotations to add to all deployed objects including pods.
-commonAnnotations: { }
-
-# -- Common labels to add to all deployed objects including pods.
-commonLabels: { }
-
-# -- Container image settings.
-# The image tag defaults to the chart appVersion.
-image:
-  repository: ghcr.io/controlplaneio-fluxcd/flux-operator # @schema required: true
-  tag: ""
-  pullSecrets: [ ] # @schema item: object ; uniqueItems: true
-  imagePullPolicy: IfNotPresent # @schema enum:[IfNotPresent, Always, Never]
-
-# -- Pod priority class name.
-# Recommended value is system-cluster-critical.
-priorityClassName: "" # @schema default: "system-cluster-critical"
-
-# -- Kubernetes [API priority and fairness](https://kubernetes.io/docs/concepts/cluster-administration/flow-control/) settings.
-apiPriority: # @schema default: {"enabled":false,"level":"workload-high","extraServiceAccounts":[]}
-  enabled: false
-  level: workload-high
-  extraServiceAccounts: []
-#    - name: kustomize-controller
-#      namespace: flux-system
-#    - name: helm-controller
-#      namespace: flux-system
-
-# -- Container resources requests and limits settings.
-resources: # @schema required: true
-  limits:
-    cpu: 2000m
-    memory: 1Gi
-  requests: # @schema default: {"cpu":"100m","memory":"64Mi"}
-    cpu: 100m
-    memory: 64Mi
-
-# -- Container liveness probe settings.
-livenessProbe: # @schema default: {"httpGet":{"path":"/healthz","port":8081},"initialDelaySeconds":15,"periodSeconds":20}
-  httpGet:
-    path: /healthz
-    port: 8081
-  initialDelaySeconds: 15
-  periodSeconds: 20
-
-# -- Container readiness probe settings.
-readinessProbe: # @schema default: {"httpGet":{"path":"/readyz","port":8081},"initialDelaySeconds":5,"periodSeconds":10}
-  httpGet:
-    path: /readyz
-    port: 8081
-  initialDelaySeconds: 5
-  periodSeconds: 10
-
-# -- Pod service account settings.
-# The name of the service account defaults to the release name.
-serviceAccount: # @schema default: {"create":true,"automount":true,"name":""}
-  create: true
-  automount: true
-  name: ""
-
-rbac:
-   # -- Grant the cluster-admin role to the flux-operator service account (required for the Flux Instance deployment).
-  create: true
-  # -- Grant the Kubernetes view, edit and admin roles access to ResourceSet APIs.
-  createAggregation: true
-
-# -- Pod security context settings.
-podSecurityContext: { } # @schema default: {"fsGroup":1337}
-
-# -- Container security context settings.
-# The default is compliant with the pod security restricted profile.
-securityContext: # @schema required: true
-  runAsNonRoot: true # @schema default: true
-  readOnlyRootFilesystem: true # @schema default: true
-  allowPrivilegeEscalation: false # @schema default: false
-  capabilities: # @schema default: {"drop":["ALL"]}
-    drop: # @schema item: string ; uniqueItems: true
-      - "ALL"
-  seccompProfile: # @schema default: {"type":"RuntimeDefault"}
-    type: "RuntimeDefault"
-
-# -- Pod affinity and anti-affinity settings.
-affinity: # @schema default: {"nodeAffinity":{"requiredDuringSchedulingIgnoredDuringExecution":{"nodeSelectorTerms":[{"matchExpressions":[{"key":"kubernetes.io/os","operator":"In","values":["linux"]}]}]}}}
-  nodeAffinity:
-    requiredDuringSchedulingIgnoredDuringExecution:
-      nodeSelectorTerms:
-        - matchExpressions:
-            - key: kubernetes.io/os
-              operator: In
-              values:
-                - linux
-
-# -- Pod tolerations settings.
-tolerations: [ ] # @schema item: object ; uniqueItems: true
-
-# -- Pod Node Selector settings.
-nodeSelector: { } # @schema type: object
-
-# -- If `true`, the container ports (`8080` and `8081`) are exposed on the host network.
-hostNetwork: false # @schema default: false
-
-# -- Pod extra volumes.
-extraVolumes: [ ] # @schema item: object ; uniqueItems: true
-
-# -- Container extra environment variables.
-extraEnvs: [ ] # @schema item: object ; uniqueItems: true
-
-# -- Container extra arguments.
-extraArgs: [ ] # @schema item: string ; uniqueItems: true
-
-# -- Container extra volume mounts.
-extraVolumeMounts: [ ] # @schema item: object ; uniqueItems: true
-
-# -- Container logging level flag.
-logLevel: "info" # @schema enum:[debug,info,error]
-
-# -- Prometheus Operator scraping settings.
-serviceMonitor: # @schema default: {"create":false,"interval":"60s","scrapeTimeout":"30s"}
-  create: false
-  interval: 60s
-  scrapeTimeout: 30s
-  labels: { }
-
-service:
-  # -- Sets the IP family policy on all Service resources. Uses Kubernetes defaults if unset
-  ipFamilyPolicy: '' # @schema type: string; enum:['', SingleStack, PreferDualStack, RequireDualStack]
-
-# -- Marketplace settings.
-marketplace:
-  type: ""
-  license: ""
-  account: ""
diff --git a/packages/system/fluxcd-operator/patches/kubernetesEnvs.diff b/packages/system/fluxcd-operator/patches/kubernetesEnvs.diff
deleted file mode 100644
index 1c9c1c390c..0000000000
--- a/packages/system/fluxcd-operator/patches/kubernetesEnvs.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/packages/core/fluxcd/charts/flux-operator/templates/deployment.yaml b/packages/core/fluxcd/charts/flux-operator/templates/deployment.yaml
-index 8ffd8d8..5ad96a8 100644
---- a/charts/flux-operator/templates/deployment.yaml
-+++ b/charts/flux-operator/templates/deployment.yaml
-@@ -58,6 +58,7 @@ spec:
-             {{- if .Values.extraEnvs }}
-               {{- toYaml .Values.extraEnvs | nindent 12 }}
-             {{- end }}
-+            {{- include "cozy.kubernetes_envs" . | nindent 12 }}
-           securityContext:
-             {{- toYaml .Values.securityContext | nindent 12 }}
-           image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
diff --git a/packages/system/fluxcd-operator/patches/networkPolicy.diff b/packages/system/fluxcd-operator/patches/networkPolicy.diff
deleted file mode 100644
index 1c478de7f5..0000000000
--- a/packages/system/fluxcd-operator/patches/networkPolicy.diff
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/charts/flux-operator/templates/network-policy.yaml b/packages/system/fluxcd-operator/charts/flux-operator/templates/network-policy.yaml
-new file mode 100644
---- /dev/null	(revision 52a23eacfc32430d8b008b765c64a81526521bae)
-+++ b/charts/flux-operator/templates/network-policy.yaml	(revision 52a23eacfc32430d8b008b765c64a81526521bae)
-@@ -0,0 +1,22 @@
-+{{- if .Capabilities.APIVersions.Has "cilium.io/v2/CiliumClusterwideNetworkPolicy" }}
-+apiVersion: cilium.io/v2
-+kind: CiliumClusterwideNetworkPolicy
-+metadata:
-+  name: {{ include "flux-operator.fullname" . }}-restrict
-+spec:
-+  nodeSelector: {}
-+  ingressDeny:
-+    - fromEntities:
-+        - world
-+      toPorts:
-+        - ports:
-+            - port: "8080"
-+              protocol: TCP
-+            - port: "8081"
-+              protocol: TCP
-+            - port: "9080"
-+              protocol: TCP
-+  ingress:
-+    - fromEntities:
-+        - cluster
-+{{- end }}
diff --git a/packages/system/fluxcd-operator/templates/_helpers.tpl b/packages/system/fluxcd-operator/templates/_helpers.tpl
deleted file mode 100644
index e22979ba0c..0000000000
--- a/packages/system/fluxcd-operator/templates/_helpers.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-{{- define "cozy.kubernetes_envs" }}
-{{- $cozyDeployment := lookup "apps/v1" "Deployment" "cozy-system" "cozystack" }}
-{{- $cozyContainers := dig "spec" "template" "spec" "containers" dict $cozyDeployment }}
-{{- range $cozyContainers }}
-{{- if eq .name "cozystack" }}
-{{- range .env }}
-{{- if has .name (list "KUBERNETES_SERVICE_HOST" "KUBERNETES_SERVICE_PORT") }}
-- {{ toJson . }}
-{{- end }}
-{{- end }}
-{{- end }}
-{{- end }}
-{{- end }}
diff --git a/packages/system/fluxcd-operator/values.yaml b/packages/system/fluxcd-operator/values.yaml
deleted file mode 100644
index 28a5f6132b..0000000000
--- a/packages/system/fluxcd-operator/values.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-flux-operator:
-  fullnameOverride: flux-operator
-  tolerations:
-    - key: node.kubernetes.io/not-ready
-      operator: Exists
-      effect: NoSchedule
-  hostNetwork: true
-  resources:
-    limits:
-      cpu: 100m
-      memory: 350Mi
-    requests:
-      cpu: 100m
-      memory: 350Mi
-  # Flux Status Web UI is opt-in. Override `web.enabled: true` (and configure
-  # `web.config` / `web.configSecretName` / `web.ingress` as needed) to enable.
-  # The upstream chart's NetworkPolicy is suppressed because Cozystack ships a
-  # CiliumClusterwideNetworkPolicy that already restricts ports 8080/8081/9080.
-  web:
-    enabled: false
-    networkPolicy:
-      create: false
diff --git a/packages/system/fluxcd/Chart.yaml b/packages/system/fluxcd/Chart.yaml
deleted file mode 100644
index 2e625a1655..0000000000
--- a/packages/system/fluxcd/Chart.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-apiVersion: v2
-name: cozy-fluxcd
-version: 0.0.0 # Placeholder, the actual version will be automatically set during the build process
diff --git a/packages/system/fluxcd/Makefile b/packages/system/fluxcd/Makefile
deleted file mode 100644
index 9aa32fe9b1..0000000000
--- a/packages/system/fluxcd/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-NAME=fluxcd
-NAMESPACE=cozy-$(NAME)
-
-include ../../../hack/package.mk
-
-apply-locally:
-	cozyhr apply --plain -n $(NAMESPACE) $(NAME)
-
-update:
-	rm -rf charts
-	helm pull oci://ghcr.io/controlplaneio-fluxcd/charts/flux-instance --untar --untardir charts
diff --git a/packages/system/fluxcd/charts/flux-instance/.helmignore b/packages/system/fluxcd/charts/flux-instance/.helmignore
deleted file mode 100644
index f24ae1c93a..0000000000
--- a/packages/system/fluxcd/charts/flux-instance/.helmignore
+++ /dev/null
@@ -1,24 +0,0 @@
-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*.orig
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
-.vscode/
-helmdocs.gotmpl
diff --git a/packages/system/fluxcd/charts/flux-instance/Chart.yaml b/packages/system/fluxcd/charts/flux-instance/Chart.yaml
deleted file mode 100644
index 185a6fd4b8..0000000000
--- a/packages/system/fluxcd/charts/flux-instance/Chart.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-annotations:
-  artifacthub.io/license: AGPL-3.0
-  artifacthub.io/links: |
-    - name: Documentation
-      url: https://fluxoperator.dev/docs
-    - name: Chart Source
-      url: https://github.com/controlplaneio-fluxcd/charts
-    - name: Upstream Project
-      url: https://github.com/controlplaneio-fluxcd/flux-operator
-apiVersion: v2
-appVersion: v0.50.0
-description: 'A Helm chart for deploying a Flux instance managed by Flux Operator. '
-home: https://fluxoperator.dev
-icon: https://raw.githubusercontent.com/cncf/artwork/main/projects/flux/icon/color/flux-icon-color.png
-keywords:
-- flux
-- fluxcd
-- gitops
-kubeVersion: '>=1.22.0-0'
-maintainers:
-- email: flux-enterprise@control-plane.io
-  name: ControlPlane Flux Team
-name: flux-instance
-sources:
-- https://github.com/controlplaneio-fluxcd/flux-operator
-- https://github.com/controlplaneio-fluxcd/charts
-type: application
-version: 0.50.0
diff --git a/packages/system/fluxcd/charts/flux-instance/README.md b/packages/system/fluxcd/charts/flux-instance/README.md
deleted file mode 100644
index f747e1a1d6..0000000000
--- a/packages/system/fluxcd/charts/flux-instance/README.md
+++ /dev/null
@@ -1,55 +0,0 @@
-# flux-instance
-
-![Version: 0.50.0](https://img.shields.io/badge/Version-0.50.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.50.0](https://img.shields.io/badge/AppVersion-v0.50.0-informational?style=flat-square)
-
-This chart is a thin wrapper around the `FluxInstance` custom resource, which is
-used by the [Flux Operator](https://github.com/controlplaneio-fluxcd/flux-operator)
-to install, configure and automatically upgrade Flux.
-
-## Prerequisites
-
-- Kubernetes 1.30+
-- Helm 3.8+
-
-## Installing the Chart
-
-To deploy Flux in the `flux-system` namespace:
-
-```console
-helm -n flux-system install flux oci://ghcr.io/controlplaneio-fluxcd/charts/flux-instance
-```
-
-For more information on the available configuration options,
-see the [Flux Instance documentation](https://fluxoperator.dev/docs/crd/fluxinstance/).
-
-## Uninstalling the Chart
-
-To uninstall Flux without affecting the resources it manages:
-
-```console
-helm -n flux-system uninstall flux
-```
-
-## Values
-
-| Key | Type | Default | Description |
-|-----|------|---------|-------------|
-| commonAnnotations | object | `{}` | Common annotations to add to all deployed objects including pods. |
-| commonLabels | object | `{}` | Common labels to add to all deployed objects including pods. |
-| fullnameOverride | string | `"flux"` |  |
-| healthcheck.enabled | bool | `false` | Enable post-install and post-upgrade health checks. |
-| healthcheck.timeout | string | `"5m"` | Health check timeout in Go duration format. |
-| instance.cluster | object | `{"domain":"cluster.local","multitenant":false,"networkPolicy":true,"size":"","tenantDefaultServiceAccount":"default","type":"kubernetes"}` | Cluster https://fluxoperator.dev/docs/crd/fluxinstance/#cluster-configuration |
-| instance.commonMetadata | object | `{"annotations":{},"labels":{}}` | Common metadata https://fluxoperator.dev/docs/crd/fluxinstance/#common-metadata |
-| instance.components | list | `["source-controller","kustomize-controller","helm-controller","notification-controller"]` | Components https://fluxoperator.dev/docs/crd/fluxinstance/#components-configuration |
-| instance.distribution | object | `{"artifact":"oci://ghcr.io/controlplaneio-fluxcd/flux-operator-manifests:latest","artifactPullSecret":"","imagePullSecret":"","registry":"ghcr.io/fluxcd","variant":"","version":"2.x"}` | Distribution https://fluxoperator.dev/docs/crd/fluxinstance/#distribution-configuration |
-| instance.kustomize.patches | list | `[]` | Kustomize patches https://fluxoperator.dev/docs/crd/fluxinstance/#kustomize-patches |
-| instance.sharding | object | `{"key":"sharding.fluxcd.io/key","shards":[]}` | Sharding https://fluxoperator.dev/docs/crd/fluxinstance/#sharding-configuration |
-| instance.storage | object | `{"class":"","size":""}` | Storage https://fluxoperator.dev/docs/crd/fluxinstance/#storage-configuration |
-| instance.sync | object | `{"interval":"1m","kind":"GitRepository","name":"","path":"","provider":"","pullSecret":"","ref":"","url":""}` | Sync https://fluxoperator.dev/docs/crd/fluxinstance/#sync-configuration |
-| nameOverride | string | `""` |  |
-
-## Source Code
-
-* <https://github.com/controlplaneio-fluxcd/flux-operator>
-* <https://github.com/controlplaneio-fluxcd/charts>
diff --git a/packages/system/fluxcd/charts/flux-instance/templates/NOTES.txt b/packages/system/fluxcd/charts/flux-instance/templates/NOTES.txt
deleted file mode 100644
index 9af8d113e9..0000000000
--- a/packages/system/fluxcd/charts/flux-instance/templates/NOTES.txt
+++ /dev/null
@@ -1 +0,0 @@
-Documentation at https://fluxoperator.dev/docs/
diff --git a/packages/system/fluxcd/charts/flux-instance/templates/_helpers.tpl b/packages/system/fluxcd/charts/flux-instance/templates/_helpers.tpl
deleted file mode 100644
index f04148b5e4..0000000000
--- a/packages/system/fluxcd/charts/flux-instance/templates/_helpers.tpl
+++ /dev/null
@@ -1,51 +0,0 @@
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "flux-instance.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
-{{- end }}
-
-{{/*
-Create a default fully qualified app name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-If release name contains chart name it will be used as a full name.
-*/}}
-{{- define "flux-instance.fullname" -}}
-{{- if .Values.fullnameOverride }}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
-{{- else }}
-{{- $name := default .Chart.Name .Values.nameOverride }}
-{{- if contains $name .Release.Name }}
-{{- .Release.Name | trunc 63 | trimSuffix "-" }}
-{{- else }}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
-{{- end }}
-{{- end }}
-{{- end }}
-
-{{/*
-Create chart name and version as used by the chart label.
-*/}}
-{{- define "flux-instance.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
-{{- end }}
-
-{{/*
-Common labels
-*/}}
-{{- define "flux-instance.labels" -}}
-helm.sh/chart: {{ include "flux-instance.chart" . }}
-{{ include "flux-instance.selectorLabels" . }}
-{{- if .Chart.AppVersion }}
-app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
-{{- end }}
-app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- end }}
-
-{{/*
-Selector labels
-*/}}
-{{- define "flux-instance.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "flux-instance.name" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
-{{- end }}
diff --git a/packages/system/fluxcd/charts/flux-instance/templates/healthcheck.yaml b/packages/system/fluxcd/charts/flux-instance/templates/healthcheck.yaml
deleted file mode 100644
index 254e8ae1d7..0000000000
--- a/packages/system/fluxcd/charts/flux-instance/templates/healthcheck.yaml
+++ /dev/null
@@ -1,79 +0,0 @@
-{{- if .Values.healthcheck.enabled }}
-apiVersion: batch/v1
-kind: Job
-metadata:
-  name: "{{ .Release.Name }}-healthcheck"
-  namespace: {{ .Release.Namespace }}
-  labels:
-    app.kubernetes.io/managed-by: {{ .Release.Service | quote }}
-    app.kubernetes.io/instance: {{ .Release.Name | quote }}
-    app.kubernetes.io/version: {{ .Chart.AppVersion }}
-    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-  annotations:
-    helm.sh/hook: post-install,post-upgrade
-    helm.sh/hook-weight: "-5"
-    helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
-spec:
-  template:
-    metadata:
-      name: "{{ .Release.Name }}"
-      labels:
-        app.kubernetes.io/managed-by: {{ .Release.Service | quote }}
-        app.kubernetes.io/instance: {{ .Release.Name | quote }}
-        helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    spec:
-      restartPolicy: Never
-      {{- with .Values.healthcheck.image.pullSecrets }}
-      imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      serviceAccountName: {{ .Values.healthcheck.serviceAccount.name }}
-      {{- with .Values.healthcheck.podSecurityContext }}
-      securityContext:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- if .Values.healthcheck.hostNetwork }}
-      hostNetwork: true
-      {{- end }}
-      containers:
-        - name: healthcheck
-          image: "{{ .Values.healthcheck.image.repository }}:{{ .Values.healthcheck.image.tag | default .Chart.AppVersion }}"
-          imagePullPolicy: "{{ .Values.healthcheck.image.imagePullPolicy }}"
-          args:
-            - wait
-            - instance
-            - {{ include "flux-instance.fullname" . }}
-            - --namespace={{ .Release.Namespace }}
-            - --timeout={{ .Values.healthcheck.timeout }}
-            {{- range .Values.healthcheck.extraArgs }}
-            - {{ . }}
-            {{- end }}
-          {{- with .Values.healthcheck.envs }}
-          env:
-            {{- toYaml . | nindent 12 }}
-          {{- end }}
-          securityContext:
-            {{- toYaml .Values.healthcheck.securityContext | nindent 12 }}
-          resources:
-            {{- toYaml .Values.healthcheck.resources | nindent 12 }}
-          {{- with .Values.healthcheck.volumeMounts }}
-          volumeMounts:
-            {{- toYaml . | nindent 12 }}
-          {{- end }}
-      {{- with .Values.healthcheck.affinity }}
-      affinity:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.healthcheck.tolerations }}
-      tolerations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.healthcheck.nodeSelector }}
-      nodeSelector:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.healthcheck.volumes }}
-      volumes:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-{{- end }}
diff --git a/packages/system/fluxcd/charts/flux-instance/templates/instance.yaml b/packages/system/fluxcd/charts/flux-instance/templates/instance.yaml
deleted file mode 100644
index f1f58309e3..0000000000
--- a/packages/system/fluxcd/charts/flux-instance/templates/instance.yaml
+++ /dev/null
@@ -1,72 +0,0 @@
-apiVersion: fluxcd.controlplane.io/v1
-kind: FluxInstance
-metadata:
-  name: {{ include "flux-instance.fullname" . }}
-  namespace: {{ .Release.Namespace }}
-  labels:
-    {{- include "flux-instance.labels" . | nindent 4 }}
-    {{- with .Values.commonLabels }}
-    {{- toYaml . | nindent 4 }}
-    {{- end }}
-  {{- with .Values.commonAnnotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-spec:
-  distribution:
-    version: {{ .Values.instance.distribution.version | quote }}
-    registry: {{ .Values.instance.distribution.registry }}
-    artifact: {{ .Values.instance.distribution.artifact }}
-    {{- if .Values.instance.distribution.artifactPullSecret }}
-    artifactPullSecret: {{ .Values.instance.distribution.artifactPullSecret }}
-    {{- end }}
-    {{- if .Values.instance.distribution.imagePullSecret }}
-    imagePullSecret: {{ .Values.instance.distribution.imagePullSecret }}
-    {{- end }}
-    {{- if .Values.instance.distribution.variant }}
-    variant: {{ .Values.instance.distribution.variant }}
-    {{- end }}
-  components: {{ .Values.instance.components | toYaml | nindent 4 }}
-  cluster:
-    {{- range $key, $value := .Values.instance.cluster }}
-    {{- if not (and (kindIs "string" $value) (eq $value "")) }}
-    {{ $key }}: {{ $value }}
-    {{- end }}
-    {{- end }}
-  {{- if or .Values.instance.commonMetadata.annotations  .Values.instance.commonMetadata.labels }}
-  commonMetadata:
-    {{- with .Values.instance.commonMetadata.annotations }}
-    annotations:
-      {{- toYaml . | nindent 6 }}
-    {{- end }}
-    {{- with .Values.instance.commonMetadata.labels }}
-    labels:
-      {{- toYaml . | nindent 6 }}
-    {{- end }}
-  {{- end }}
-  kustomize: {{ .Values.instance.kustomize | toYaml | nindent 4 }}
-  {{- if .Values.instance.sync.url }}
-  sync:
-    kind: {{ .Values.instance.sync.kind }}
-    interval: {{ .Values.instance.sync.interval }}
-    url: {{ .Values.instance.sync.url }}
-    ref: {{ .Values.instance.sync.ref }}
-    path: {{ .Values.instance.sync.path }}
-    {{- if .Values.instance.sync.name }}
-    name: {{ .Values.instance.sync.name }}
-    {{- end }}
-    {{- if .Values.instance.sync.provider }}
-    provider: {{ .Values.instance.sync.provider }}
-    {{- end }}
-    {{- if .Values.instance.sync.pullSecret }}
-    pullSecret: {{ .Values.instance.sync.pullSecret }}
-    {{- end }}
-  {{- end }}
-  {{- if .Values.instance.storage.size }}
-  storage: {{ .Values.instance.storage | toYaml | nindent 4 }}
-  {{- end }}
-  {{- if .Values.instance.sharding.shards }}
-  sharding:
-    key: {{ .Values.instance.sharding.key }}
-    shards: {{ .Values.instance.sharding.shards | toYaml | nindent 4 }}
-  {{- end }}
diff --git a/packages/system/fluxcd/charts/flux-instance/templates/serviceaccount.yaml b/packages/system/fluxcd/charts/flux-instance/templates/serviceaccount.yaml
deleted file mode 100644
index 38448f3d68..0000000000
--- a/packages/system/fluxcd/charts/flux-instance/templates/serviceaccount.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-{{- if .Values.healthcheck.serviceAccount.create }}
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: {{ .Values.healthcheck.serviceAccount.name }}
-  namespace: {{ .Release.Namespace }}
-  labels:
-    {{- include "flux-instance.labels" . | nindent 4 }}
-    {{- with .Values.commonLabels }}
-    {{- toYaml . | nindent 4 }}
-    {{- end }}
-  {{- with .Values.commonAnnotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-automountServiceAccountToken: {{ .Values.healthcheck.serviceAccount.automount }}
-{{- end }}
diff --git a/packages/system/fluxcd/charts/flux-instance/values.schema.json b/packages/system/fluxcd/charts/flux-instance/values.schema.json
deleted file mode 100644
index d6f6c3182a..0000000000
--- a/packages/system/fluxcd/charts/flux-instance/values.schema.json
+++ /dev/null
@@ -1,444 +0,0 @@
-{
-    "$schema": "https://json-schema.org/draft/2019-09/schema",
-    "type": "object",
-    "properties": {
-        "commonAnnotations": {
-            "type": "object"
-        },
-        "commonLabels": {
-            "type": "object"
-        },
-        "fullnameOverride": {
-            "type": "string"
-        },
-        "healthcheck": {
-            "type": "object",
-            "required": [
-                "resources",
-                "securityContext"
-            ],
-            "properties": {
-                "affinity": {
-                    "default": {
-                        "nodeAffinity": {
-                            "requiredDuringSchedulingIgnoredDuringExecution": {
-                                "nodeSelectorTerms": [
-                                    {
-                                        "matchExpressions": [
-                                            {
-                                                "key": "kubernetes.io/os",
-                                                "operator": "In",
-                                                "values": [
-                                                    "linux"
-                                                ]
-                                            }
-                                        ]
-                                    }
-                                ]
-                            }
-                        }
-                    },
-                    "type": "object",
-                    "properties": {
-                        "nodeAffinity": {
-                            "type": "object",
-                            "properties": {
-                                "requiredDuringSchedulingIgnoredDuringExecution": {
-                                    "type": "object",
-                                    "properties": {
-                                        "nodeSelectorTerms": {
-                                            "type": "array",
-                                            "items": {
-                                                "type": "object",
-                                                "properties": {
-                                                    "matchExpressions": {
-                                                        "type": "array",
-                                                        "items": {
-                                                            "type": "object",
-                                                            "properties": {
-                                                                "key": {
-                                                                    "type": "string"
-                                                                },
-                                                                "operator": {
-                                                                    "type": "string"
-                                                                },
-                                                                "values": {
-                                                                    "type": "array",
-                                                                    "items": {
-                                                                        "type": "string"
-                                                                    }
-                                                                }
-                                                            }
-                                                        }
-                                                    }
-                                                }
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                },
-                "enabled": {
-                    "type": "boolean"
-                },
-                "envs": {
-                    "type": "array",
-                    "uniqueItems": true,
-                    "items": {
-                        "type": "object"
-                    }
-                },
-                "extraArgs": {
-                    "type": "array",
-                    "uniqueItems": true,
-                    "items": {
-                        "type": "string"
-                    }
-                },
-                "hostNetwork": {
-                    "default": false,
-                    "type": "boolean"
-                },
-                "image": {
-                    "type": "object",
-                    "required": [
-                        "repository"
-                    ],
-                    "properties": {
-                        "imagePullPolicy": {
-                            "type": "string",
-                            "enum": [
-                                "IfNotPresent",
-                                "Always",
-                                "Never"
-                            ]
-                        },
-                        "pullSecrets": {
-                            "type": "array",
-                            "uniqueItems": true,
-                            "items": {
-                                "type": "object"
-                            }
-                        },
-                        "repository": {
-                            "type": "string"
-                        },
-                        "tag": {
-                            "type": "string"
-                        }
-                    }
-                },
-                "nodeSelector": {
-                    "type": "object"
-                },
-                "podSecurityContext": {
-                    "default": {
-                        "fsGroup": 1337
-                    },
-                    "type": "object"
-                },
-                "resources": {
-                    "type": "object",
-                    "properties": {
-                        "limits": {
-                            "type": "object",
-                            "properties": {
-                                "cpu": {
-                                    "type": "string"
-                                },
-                                "memory": {
-                                    "type": "string"
-                                }
-                            }
-                        },
-                        "requests": {
-                            "default": {
-                                "cpu": "100m",
-                                "memory": "64Mi"
-                            },
-                            "type": "object",
-                            "properties": {
-                                "cpu": {
-                                    "type": "string"
-                                },
-                                "memory": {
-                                    "type": "string"
-                                }
-                            }
-                        }
-                    }
-                },
-                "securityContext": {
-                    "type": "object",
-                    "properties": {
-                        "allowPrivilegeEscalation": {
-                            "default": false,
-                            "type": "boolean"
-                        },
-                        "capabilities": {
-                            "default": {
-                                "drop": [
-                                    "ALL"
-                                ]
-                            },
-                            "type": "object",
-                            "properties": {
-                                "drop": {
-                                    "type": "array",
-                                    "uniqueItems": true,
-                                    "items": {
-                                        "type": "string"
-                                    }
-                                }
-                            }
-                        },
-                        "readOnlyRootFilesystem": {
-                            "default": true,
-                            "type": "boolean"
-                        },
-                        "runAsNonRoot": {
-                            "default": true,
-                            "type": "boolean"
-                        },
-                        "seccompProfile": {
-                            "default": {
-                                "type": "RuntimeDefault"
-                            },
-                            "type": "object",
-                            "properties": {
-                                "type": {
-                                    "type": "string"
-                                }
-                            }
-                        }
-                    }
-                },
-                "serviceAccount": {
-                    "default": {
-                        "automount": true,
-                        "create": false,
-                        "name": "flux-operator"
-                    },
-                    "type": "object",
-                    "properties": {
-                        "automount": {
-                            "type": "boolean"
-                        },
-                        "create": {
-                            "type": "boolean"
-                        },
-                        "name": {
-                            "type": "string"
-                        }
-                    }
-                },
-                "timeout": {
-                    "default": "5m",
-                    "type": "string"
-                },
-                "tolerations": {
-                    "type": "array",
-                    "uniqueItems": true,
-                    "items": {
-                        "type": "object"
-                    }
-                },
-                "volumeMounts": {
-                    "type": "array",
-                    "uniqueItems": true,
-                    "items": {
-                        "type": "object"
-                    }
-                },
-                "volumes": {
-                    "type": "array",
-                    "uniqueItems": true,
-                    "items": {
-                        "type": "object"
-                    }
-                }
-            }
-        },
-        "instance": {
-            "type": "object",
-            "required": [
-                "distribution",
-                "cluster"
-            ],
-            "properties": {
-                "cluster": {
-                    "type": "object",
-                    "properties": {
-                        "domain": {
-                            "type": "string"
-                        },
-                        "multitenant": {
-                            "type": "boolean"
-                        },
-                        "networkPolicy": {
-                            "type": "boolean"
-                        },
-                        "size": {
-                            "type": "string",
-                            "enum": [
-                                "",
-                                "small",
-                                "medium",
-                                "large"
-                            ]
-                        },
-                        "tenantDefaultServiceAccount": {
-                            "type": "string"
-                        },
-                        "type": {
-                            "type": "string",
-                            "enum": [
-                                "kubernetes",
-                                "openshift",
-                                "aws",
-                                "azure",
-                                "gcp"
-                            ]
-                        }
-                    }
-                },
-                "commonMetadata": {
-                    "type": "object",
-                    "properties": {
-                        "annotations": {
-                            "type": "object"
-                        },
-                        "labels": {
-                            "type": "object"
-                        }
-                    }
-                },
-                "components": {
-                    "type": "array",
-                    "uniqueItems": true,
-                    "items": {
-                        "type": "string",
-                        "enum": [
-                            "source-controller",
-                            "kustomize-controller",
-                            "helm-controller",
-                            "notification-controller",
-                            "image-reflector-controller",
-                            "image-automation-controller",
-                            "source-watcher"
-                        ]
-                    }
-                },
-                "distribution": {
-                    "type": "object",
-                    "required": [
-                        "version",
-                        "registry"
-                    ],
-                    "properties": {
-                        "artifact": {
-                            "type": "string"
-                        },
-                        "artifactPullSecret": {
-                            "type": "string"
-                        },
-                        "imagePullSecret": {
-                            "type": "string"
-                        },
-                        "registry": {
-                            "type": "string"
-                        },
-                        "variant": {
-                            "type": "string",
-                            "enum": [
-                                "",
-                                "upstream-alpine",
-                                "enterprise-alpine",
-                                "enterprise-distroless",
-                                "enterprise-distroless-fips"
-                            ]
-                        },
-                        "version": {
-                            "type": "string"
-                        }
-                    }
-                },
-                "kustomize": {
-                    "type": "object",
-                    "properties": {
-                        "patches": {
-                            "type": "array",
-                            "items": {
-                                "type": "object"
-                            }
-                        }
-                    }
-                },
-                "sharding": {
-                    "type": "object",
-                    "properties": {
-                        "key": {
-                            "type": "string"
-                        },
-                        "shards": {
-                            "type": "array",
-                            "items": {
-                                "type": "string"
-                            }
-                        }
-                    }
-                },
-                "storage": {
-                    "type": "object",
-                    "properties": {
-                        "class": {
-                            "type": "string"
-                        },
-                        "size": {
-                            "type": "string"
-                        }
-                    }
-                },
-                "sync": {
-                    "type": "object",
-                    "properties": {
-                        "interval": {
-                            "type": "string"
-                        },
-                        "kind": {
-                            "type": "string",
-                            "enum": [
-                                "GitRepository",
-                                "OCIRepository",
-                                "Bucket"
-                            ]
-                        },
-                        "name": {
-                            "type": "string"
-                        },
-                        "path": {
-                            "type": "string"
-                        },
-                        "provider": {
-                            "type": "string"
-                        },
-                        "pullSecret": {
-                            "type": "string"
-                        },
-                        "ref": {
-                            "type": "string"
-                        },
-                        "url": {
-                            "type": "string"
-                        }
-                    }
-                }
-            }
-        },
-        "nameOverride": {
-            "type": "string"
-        }
-    }
-}
diff --git a/packages/system/fluxcd/charts/flux-instance/values.yaml b/packages/system/fluxcd/charts/flux-instance/values.yaml
deleted file mode 100644
index 84e16cb03d..0000000000
--- a/packages/system/fluxcd/charts/flux-instance/values.yaml
+++ /dev/null
@@ -1,150 +0,0 @@
-# Default values for flux-instance.
-
-nameOverride: ""
-fullnameOverride: "flux"
-
-instance:
-  # -- Distribution https://fluxoperator.dev/docs/crd/fluxinstance/#distribution-configuration
-  distribution: # @schema required: true
-    version: "2.x" # @schema required: true
-    registry: "ghcr.io/fluxcd" # @schema required: true
-    artifact: "oci://ghcr.io/controlplaneio-fluxcd/flux-operator-manifests:latest"
-    artifactPullSecret: ""
-    imagePullSecret: ""
-    variant: "" # @schema enum:['',upstream-alpine,enterprise-alpine,enterprise-distroless,enterprise-distroless-fips]
-  # -- Components https://fluxoperator.dev/docs/crd/fluxinstance/#components-configuration
-  components: # @schema item: string; uniqueItems: true; itemEnum: [source-controller,kustomize-controller,helm-controller,notification-controller,image-reflector-controller,image-automation-controller,source-watcher]
-    - source-controller
-    - kustomize-controller
-    - helm-controller
-    - notification-controller
-  # -- Cluster https://fluxoperator.dev/docs/crd/fluxinstance/#cluster-configuration
-  cluster: # @schema required: true
-    type: kubernetes # @schema enum:[kubernetes,openshift,aws,azure,gcp]
-    size: "" # @schema enum:['',small,medium,large]
-    domain: "cluster.local"
-    networkPolicy: true
-    multitenant: false
-    tenantDefaultServiceAccount: "default"
-  # -- Common metadata https://fluxoperator.dev/docs/crd/fluxinstance/#common-metadata
-  commonMetadata: # @schema required: false
-    labels: { }
-    annotations: { }
-  # -- Storage https://fluxoperator.dev/docs/crd/fluxinstance/#storage-configuration
-  storage: # @schema required: false
-    class: ""
-    size: ""
-  # -- Sharding https://fluxoperator.dev/docs/crd/fluxinstance/#sharding-configuration
-  sharding: # @schema required: false
-    key: "sharding.fluxcd.io/key"
-    shards: [ ] # @schema item: string
-  # -- Sync https://fluxoperator.dev/docs/crd/fluxinstance/#sync-configuration
-  sync: # @schema required: false
-    interval: 1m
-    kind: "GitRepository" # @schema enum:[GitRepository,OCIRepository,Bucket]
-    url: ""
-    ref: ""
-    path: ""
-    pullSecret: ""
-    name: ""
-    provider: ""
-  kustomize: # @schema required: false
-    # -- Kustomize patches https://fluxoperator.dev/docs/crd/fluxinstance/#kustomize-patches
-    patches: [ ] # @schema item: object
-
-# -- Common annotations to add to all deployed objects including pods.
-commonAnnotations: { }
-
-# -- Common labels to add to all deployed objects including pods.
-commonLabels: { }
-
-# Healthcheck job settings.
-healthcheck:
-  # -- Enable post-install and post-upgrade health checks.
-  enabled: false
-  # -- Health check timeout in Go duration format.
-  timeout: 5m # @schema default: "5m"
-
-  # Container image settings.
-  # The image tag defaults to the chart appVersion.
-  # @ignore
-  image:
-    repository: ghcr.io/controlplaneio-fluxcd/flux-operator-cli # @schema required: true
-    tag: ""
-    pullSecrets: [ ] # @schema item: object ; uniqueItems: true
-    imagePullPolicy: IfNotPresent # @schema enum:[IfNotPresent, Always, Never]
-
-  # Container resources requests and limits settings.
-  # @ignore
-  resources: # @schema required: true
-    limits:
-      cpu: 1000m
-      memory: 1Gi
-    requests: # @schema default: {"cpu":"100m","memory":"64Mi"}
-      cpu: 100m
-      memory: 64Mi
-
-  # Pod service account settings.
-  # The name of the service account defaults to the release name.
-  # @ignore
-  serviceAccount: # @schema default: {"create":false,"automount":true,"name":"flux-operator"}
-    create: false
-    automount: true
-    name: "flux-operator"
-
-  # Pod security context settings.
-  # @ignore
-  podSecurityContext: { } # @schema default: {"fsGroup":1337}
-
-  # Container security context settings.
-  # The default is compliant with the pod security restricted profile.
-  # @ignore
-  securityContext: # @schema required: true
-    runAsNonRoot: true # @schema default: true
-    readOnlyRootFilesystem: true # @schema default: true
-    allowPrivilegeEscalation: false # @schema default: false
-    capabilities: # @schema default: {"drop":["ALL"]}
-      drop: # @schema item: string ; uniqueItems: true
-        - "ALL"
-    seccompProfile: # @schema default: {"type":"RuntimeDefault"}
-      type: "RuntimeDefault"
-
-  # Pod affinity and anti-affinity settings.
-  # @ignore
-  affinity: # @schema default: {"nodeAffinity":{"requiredDuringSchedulingIgnoredDuringExecution":{"nodeSelectorTerms":[{"matchExpressions":[{"key":"kubernetes.io/os","operator":"In","values":["linux"]}]}]}}}
-    nodeAffinity:
-      requiredDuringSchedulingIgnoredDuringExecution:
-        nodeSelectorTerms:
-          - matchExpressions:
-              - key: kubernetes.io/os
-                operator: In
-                values:
-                  - linux
-
-  # Pod tolerations settings.
-  # @ignore
-  tolerations: [ ] # @schema item: object ; uniqueItems: true
-
-  # Pod Node Selector settings.
-  # @ignore
-  nodeSelector: { } # @schema type: object
-
-  # If `true`, the container ports (`8080` and `8081`) are exposed on the host network.
-  # @ignore
-  hostNetwork: false # @schema default: false
-
-  # Pod extra volumes.
-  # @ignore
-  volumes: [ ] # @schema item: object ; uniqueItems: true
-
-  # Container extra volume mounts.
-  # @ignore
-  volumeMounts: [ ] # @schema item: object ; uniqueItems: true
-
-  # Container extra environment variables.
-  # @ignore
-  envs: [ ] # @schema item: object ; uniqueItems: true
-
-  # Container extra arguments.
-  # @ignore
-  extraArgs: [ ] # @schema item: string ; uniqueItems: true
diff --git a/packages/system/fluxcd/values.yaml b/packages/system/fluxcd/values.yaml
deleted file mode 100644
index 7c019aea0d..0000000000
--- a/packages/system/fluxcd/values.yaml
+++ /dev/null
@@ -1,55 +0,0 @@
-flux-instance:
-  instance:
-    cluster:
-      networkPolicy: true
-      domain: cozy.local # -- default value is overriden in patches
-    distribution:
-      artifact: ""
-      version: 2.8.x
-      registry: ghcr.io/fluxcd
-    components:
-      - source-controller
-      - source-watcher
-      - kustomize-controller
-      - helm-controller
-      - notification-controller
-      - image-reflector-controller
-      - image-automation-controller
-    kustomize:
-      patches:
-        - target:
-            kind: Deployment
-            name: "(kustomize-controller|helm-controller|source-controller)"
-          patch: |
-            - op: add
-              path: /spec/template/spec/containers/0/args/-
-              value: --concurrent=20
-            - op: add
-              path: /spec/template/spec/containers/0/args/-
-              value: --requeue-dependency=5s
-            - op: replace
-              path: /spec/template/spec/containers/0/resources/limits
-              value:
-                cpu: 2000m
-                memory: 2048Mi
-        - target:
-            kind: Deployment
-            name: source-controller
-          patch: |
-            - op: add
-              path: /spec/template/spec/containers/0/args/-
-              value: --storage-adv-addr=source-controller.cozy-fluxcd.svc
-        - target:
-            kind: Deployment
-            name: source-watcher
-          patch: |
-            - op: add
-              path: /spec/template/spec/containers/0/args/-
-              value: --storage-adv-addr=source-watcher.cozy-fluxcd.svc
-        - target:
-            kind: Deployment
-            name: (kustomize-controller|helm-controller|image-reflector-controller|image-automation-controller|source-controller|source-watcher)
-          patch: |
-            - op: add
-              path: /spec/template/spec/containers/0/args/-
-              value: --events-addr=http://notification-controller.cozy-fluxcd.svc/
diff --git a/packages/system/forklift-operator/Chart.yaml b/packages/system/forklift-operator/Chart.yaml
new file mode 100644
index 0000000000..475a56efdf
--- /dev/null
+++ b/packages/system/forklift-operator/Chart.yaml
@@ -0,0 +1,3 @@
+apiVersion: v2
+name: cozy-forklift-operator
+version: 0.0.0 # Placeholder, the actual version will be automatically set during the build process
diff --git a/packages/system/forklift-operator/Makefile b/packages/system/forklift-operator/Makefile
new file mode 100644
index 0000000000..f63f24d856
--- /dev/null
+++ b/packages/system/forklift-operator/Makefile
@@ -0,0 +1,73 @@
+export NAME=forklift-operator
+export NAMESPACE=cozy-forklift
+
+include ../../../hack/package.mk
+
+test:
+	helm unittest .
+
+# Forklift release. Upstream tags container images as `release-2.11`,
+# not `v2.11.x`, so we use that channel here. Bump VERSION to ride
+# patch releases; bumping FORKLIFT_CHANNEL (e.g. release-2.12) is a
+# breaking change that requires re-checking CRDs against vm-import.
+#
+# The image refs substituted below are pinned to immutable @sha256 digests
+# so pulls are reproducible and mirrored / air-gapped installs can resolve
+# them (mirror the digests, not the floating tag). Renovate keeps the
+# digests fresh via a custom manager over this Makefile and the rendered
+# templates/forklift-operator.yaml (see .github/renovate.json). must-gather
+# and console-plugin are versioned independently of the operator channel
+# upstream (no release-2.11 tag exists for them), so they carry their own
+# tags (v2.7.1 / release-v2.6.7); re-resolve when bumping FORKLIFT_CHANNEL.
+FORKLIFT_VERSION=v2.11.5
+FORKLIFT_CHANNEL=release-2.11
+
+update:
+	rm -rf templates
+	mkdir templates
+	git clone --depth 1 --branch $(FORKLIFT_VERSION) https://github.com/kubev2v/forklift.git /tmp/forklift-$(FORKLIFT_VERSION)
+	kubectl kustomize /tmp/forklift-$(FORKLIFT_VERSION)/operator/config/default/ > templates/forklift-operator.yaml
+	rm -rf /tmp/forklift-$(FORKLIFT_VERSION)
+	# Forklift kustomize emits ${VAR} placeholders for images and tunables;
+	# the upstream OLM bundle substitutes them at install time. We don't use
+	# OLM, so we substitute them statically against the kubev2v registry.
+	sed -i 's|namespace: forklift-operator-system|namespace: $(NAMESPACE)|g' templates/forklift-operator.yaml
+	sed -i 's|namespace: konveyor-forklift|namespace: $(NAMESPACE)|g' templates/forklift-operator.yaml
+	# Cozystack doesn't use OLM, so WATCH_NAMESPACE (sourced from the
+	# olm.targetNamespaces annotation) resolves empty and the Ansible role
+	# defaults app_namespace to `konveyor-forklift`, deploying the controller
+	# outside our RBAC scope. Pin it to our namespace.
+	python3 -c "import re; p='templates/forklift-operator.yaml'; c=open(p).read(); c=re.sub(r'- name: WATCH_NAMESPACE\n\s*valueFrom:\n\s*fieldRef:\n\s*fieldPath: metadata.annotations\[.olm.targetNamespaces.\]', '- name: WATCH_NAMESPACE\n          value: $(NAMESPACE)', c); open(p,'w').write(c)"
+	sed -i 's|$${OPERATOR_IMAGE}|quay.io/kubev2v/forklift-operator:release-2.11@sha256:1ffde2c6b88419a2aee17b871eaf36c078af1f1b21369bf131b84f7b93cb012f|g' templates/forklift-operator.yaml
+	sed -i 's|$${CONTROLLER_IMAGE}|quay.io/kubev2v/forklift-controller:release-2.11@sha256:2600e68a235e4c3351a38ce2dd97562206795a733abd8b0cfd8444a541b0db51|g' templates/forklift-operator.yaml
+	sed -i 's|$${API_IMAGE}|quay.io/kubev2v/forklift-api:release-2.11@sha256:f8ad08949f5d0f051a81b2e198df7273f55d16cfd41878f41133e3a0ed1ad5ec|g' templates/forklift-operator.yaml
+	sed -i 's|$${MUST_GATHER_IMAGE}|quay.io/kubev2v/forklift-must-gather:v2.7.1@sha256:62eecec1408be00e907fbde6b13be9223fdbca116933ecba85cd87d68d6acfbb|g' templates/forklift-operator.yaml
+	sed -i 's|$${UI_PLUGIN_IMAGE}|quay.io/kubev2v/forklift-console-plugin:release-v2.6.7@sha256:99c34ac714604853f4abf589e1ccddb13cd9eaf1bd1eae2c928c622deb22304d|g' templates/forklift-operator.yaml
+	sed -i 's|$${CLI_DOWNLOAD_IMAGE}|quay.io/kubev2v/forklift-cli-download:release-2.11@sha256:8d59927b902bbdea6ecb76c0bae358c9d9d2ed40aaa56155d82d8c15ac56634a|g' templates/forklift-operator.yaml
+	sed -i 's|$${VALIDATION_IMAGE}|quay.io/kubev2v/forklift-validation:release-2.11@sha256:fc06f88fe54130ca24d39f4c9261e2359c122cb7b5146fa93403e8b0f0c0716f|g' templates/forklift-operator.yaml
+	sed -i 's|$${VIRT_V2V_IMAGE}|quay.io/kubev2v/forklift-virt-v2v:release-2.11@sha256:fe373a538db180c5bed2c99df667a450c432671ad02057d4c692776f7d7cc203|g' templates/forklift-operator.yaml
+	sed -i 's|$${VIRT_V2V_IMAGE_RHEL9}|quay.io/kubev2v/forklift-virt-v2v-xfs:release-2.11@sha256:5402dbc95daacb7d5caab2c855c1cb6889575e2d9d4d282ce9dae201d6cf0331|g' templates/forklift-operator.yaml
+	sed -i 's|$${POPULATOR_CONTROLLER_IMAGE}|quay.io/kubev2v/populator-controller:release-2.11@sha256:70d8dc184b41168496d280622e41e8d7fc15c82640be6f025c22d101c1f336bb|g' templates/forklift-operator.yaml
+	sed -i 's|$${OVIRT_POPULATOR_IMAGE}|quay.io/kubev2v/ovirt-populator:release-2.11@sha256:223857c91dd2a1050d6d087c6b58845bada676a54d450a7ef7bc7c7bfec28784|g' templates/forklift-operator.yaml
+	sed -i 's|$${OPENSTACK_POPULATOR_IMAGE}|quay.io/kubev2v/openstack-populator:release-2.11@sha256:f50cfb4f4bc86666ba5cd304f1baa95bbefc843ee677ad338e927cbef88604b0|g' templates/forklift-operator.yaml
+	sed -i 's|$${OVA_PROVIDER_SERVER_IMAGE}|quay.io/kubev2v/forklift-ova-provider-server:release-2.11@sha256:5901f34027354554f91f2be6669eb458bcb0a568d572c93188a3313904e0020a|g' templates/forklift-operator.yaml
+	sed -i 's|$${OVA_PROXY_IMAGE}|quay.io/kubev2v/forklift-ova-proxy:release-2.11@sha256:bd4e662e8c3055c7b4aa2ce1db80ec06b27016c9c39e0358d036031669fc88ca|g' templates/forklift-operator.yaml
+	sed -i 's|$${VSPHERE_XCOPY_VOLUME_POPULATOR_IMAGE}|quay.io/kubev2v/vsphere-xcopy-volume-populator:release-2.11@sha256:e63773d07e8612e9d153d9e2b93df757d0887980f2455ea278f02c32821fd954|g' templates/forklift-operator.yaml
+	sed -i 's|$${HYPERV_PROVIDER_SERVER_IMAGE}|quay.io/kubev2v/forklift-hyperv-provider-server:release-2.11@sha256:7bba40b2fca79a96c3388cb1c4f4a71694f5059324ba52e5821342b3a3058e23|g' templates/forklift-operator.yaml
+	# Tunable env vars (defaults from upstream Ansible role).
+	sed -i 's|$${VIRT_V2V_DONT_REQUEST_KVM}|"false"|g' templates/forklift-operator.yaml
+	sed -i 's|$${SNAPSHOT_REMOVAL_TIMEOUT}|"120"|g' templates/forklift-operator.yaml
+	sed -i 's|$${SNAPSHOT_STATUS_CHECK_RATE}|"10"|g' templates/forklift-operator.yaml
+	sed -i 's|$${CLEANUP_RETRIES}|"10"|g' templates/forklift-operator.yaml
+	sed -i 's|$${CDI_EXPORT_TOKEN_TTL}|""|g' templates/forklift-operator.yaml
+	sed -i 's|$${FILESYSTEM_OVERHEAD}|"0.055"|g' templates/forklift-operator.yaml
+	sed -i 's|$${BLOCK_OVERHEAD}|"0"|g' templates/forklift-operator.yaml
+	sed -i 's|$${OVIRT_OS_MAP}|""|g' templates/forklift-operator.yaml
+	sed -i 's|$${VSPHERE_OS_MAP}|""|g' templates/forklift-operator.yaml
+	sed -i 's|$${VIRT_CUSTOMIZE_MAP}|""|g' templates/forklift-operator.yaml
+	# Drop residual Namespace resources — those are provisioned by Cozystack.
+	python3 -c "content=open('templates/forklift-operator.yaml').read(); docs=content.split('---'); result=[d for d in docs if d.strip() and not any(l.strip()=='kind: Namespace' for l in d.strip().split(chr(10)))]; open('templates/forklift-operator.yaml','w').write('---'.join(result))"
+	# Forklift CRDs ship Go-template literals (e.g. `{{.PlanName}}`) in
+	# field descriptions/examples; Helm would try to evaluate them. Escape
+	# every `{{`/`}}` as `{{\`{{\`}}`/`{{\`}}\`}}` so they survive rendering.
+	python3 -c "import sys; p='templates/forklift-operator.yaml'; c=open(p).read(); c=c.replace('{{','XXLEFTXX').replace('}}','{{\`}}\`}}').replace('XXLEFTXX','{{\`{{\`}}'); open(p,'w').write(c)"
diff --git a/packages/system/forklift-operator/templates/forklift-operator.yaml b/packages/system/forklift-operator/templates/forklift-operator.yaml
new file mode 100644
index 0000000000..f90ede548b
--- /dev/null
+++ b/packages/system/forklift-operator/templates/forklift-operator.yaml
@@ -0,0 +1,7552 @@
+
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  name: forkliftcontrollers.forklift.konveyor.io
+spec:
+  group: forklift.konveyor.io
+  names:
+    kind: ForkliftController
+    listKind: ForkliftControllerList
+    plural: forkliftcontrollers
+    singular: forkliftcontroller
+  scope: Namespaced
+  versions:
+  - name: v1beta1
+    schema:
+      openAPIV3Schema:
+        description: ForkliftController is the Schema for the forkliftcontrollers
+          API
+        properties:
+          apiVersion:
+            description: 'APIVersion defines the versioned schema of this representation
+              of an object. Servers should convert recognized schemas to the latest
+              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            type: string
+          kind:
+            description: 'Kind is a string value representing the REST resource this
+              object represents. Servers may infer this from the endpoint the client
+              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            type: string
+          metadata:
+            type: object
+          spec:
+            additionalProperties: true
+            description: Spec defines the desired state of ForkliftController
+            properties:
+              api_container_limits_cpu:
+                description: 'API service CPU limit (default: 1000m)'
+                example: 2000m
+                type: string
+              api_container_limits_memory:
+                description: 'API service memory limit (default: 1Gi)'
+                example: 2Gi
+                type: string
+              api_container_requests_cpu:
+                description: 'API service CPU request (default: 100m)'
+                example: 200m
+                type: string
+              api_container_requests_memory:
+                description: 'API service memory request (default: 150Mi)'
+                example: 300Mi
+                type: string
+              api_image_fqin:
+                description: API service image
+                example: quay.io/kubev2v/forklift-api:latest
+                type: string
+              cli_download_container_limits_cpu:
+                description: 'CLI download service CPU limit (default: 100m)'
+                example: 200m
+                type: string
+              cli_download_container_limits_memory:
+                description: 'CLI download service memory limit (default: 128Mi)'
+                example: 256Mi
+                type: string
+              cli_download_container_requests_cpu:
+                description: 'CLI download service CPU request (default: 50m)'
+                example: 100m
+                type: string
+              cli_download_container_requests_memory:
+                description: 'CLI download service memory request (default: 64Mi)'
+                example: 128Mi
+                type: string
+              cli_download_image_fqin:
+                description: CLI download service image
+                example: quay.io/kubev2v/forklift-cli-download:latest
+                type: string
+              controller_block_overhead:
+                description: 'Block overhead in bytes (default: 0)'
+                x-kubernetes-int-or-string: true
+              controller_cleanup_retries:
+                description: 'Cleanup retry count (default: 10)'
+                x-kubernetes-int-or-string: true
+              controller_container_limits_cpu:
+                description: 'Controller CPU limit (default: 500m)'
+                example: 1000m
+                type: string
+              controller_container_limits_memory:
+                description: 'Controller memory limit (default: 800Mi)'
+                example: 1Gi
+                type: string
+              controller_container_requests_cpu:
+                description: 'Controller CPU request (default: 100m)'
+                example: 200m
+                type: string
+              controller_container_requests_memory:
+                description: 'Controller memory request (default: 350Mi)'
+                example: 500Mi
+                type: string
+              controller_filesystem_overhead:
+                description: 'Filesystem overhead percentage (default: 10)'
+                x-kubernetes-int-or-string: true
+              controller_host_lease_duration_seconds:
+                description: 'Host lease duration in seconds (default: 10)'
+                x-kubernetes-int-or-string: true
+              controller_host_lease_namespace:
+                description: 'Namespace for host lease objects (default: openshift-mtv)'
+                example: openshift-mtv
+                type: string
+              controller_image_fqin:
+                description: Controller pod image
+                example: quay.io/kubev2v/forklift-controller:latest
+                type: string
+              controller_log_level:
+                description: 'Log verbosity level (default: 3)'
+                x-kubernetes-int-or-string: true
+              controller_max_concurrent_reconciles:
+                description: 'Max concurrent reconciles (default: 10)'
+                x-kubernetes-int-or-string: true
+              controller_max_parent_backing_retries:
+                description: 'Max retries when getting parent disks (default: 10)'
+                x-kubernetes-int-or-string: true
+              controller_max_vm_inflight:
+                description: 'Max concurrent VM migrations (default: 20)'
+                x-kubernetes-int-or-string: true
+              controller_migration_service_account:
+                description: Global default ServiceAccount for migration pods in the
+                  target namespace. Overridden by Plan-level serviceAccount.
+                example: custom-migration-sa
+                type: string
+              controller_ovirt_warm_migration:
+                description: 'Enable oVirt warm migration (default: true)'
+                enum:
+                - "true"
+                - "false"
+                type: string
+              controller_precopy_interval:
+                description: 'Precopy interval in minutes (default: 60)'
+                x-kubernetes-int-or-string: true
+              controller_retain_precopy_importer_pods:
+                description: 'Retain precopy pods (default: false)'
+                enum:
+                - "true"
+                - "false"
+                type: string
+              controller_snapshot_removal_check_retries:
+                description: 'Snapshot removal retries (default: 20)'
+                x-kubernetes-int-or-string: true
+              controller_snapshot_removal_timeout_minuts:
+                description: 'Snapshot removal timeout in minutes (default: 120)'
+                x-kubernetes-int-or-string: true
+              controller_snapshot_status_check_rate_seconds:
+                description: 'Snapshot status check rate in seconds (default: 10)'
+                x-kubernetes-int-or-string: true
+              controller_static_udn_ip_addresses:
+                description: 'Enable static udn IP addresses feature (default: false)'
+                enum:
+                - "true"
+                - "false"
+                type: string
+              controller_tls_connection_timeout_sec:
+                description: 'TLS connection timeout seconds (default: 5)'
+                x-kubernetes-int-or-string: true
+              controller_transfer_network:
+                description: 'Optional NAD name for controller pod transfer network
+                  (format: ''namespace/network-name'')'
+                example: openshift-mtv/transfer-network
+                type: string
+              controller_vddk_job_active_deadline_sec:
+                description: 'VDDK job timeout in seconds (default: 300)'
+                x-kubernetes-int-or-string: true
+              controller_vsphere_incremental_backup:
+                description: 'Use vSphere incremental backup (default: true)'
+                enum:
+                - "true"
+                - "false"
+                type: string
+              feature_auth_required:
+                description: 'Require authentication (default: true)'
+                enum:
+                - "true"
+                - "false"
+                type: string
+              feature_cli_download:
+                description: 'Enable CLI download service (default: true)'
+                enum:
+                - "true"
+                - "false"
+                type: string
+              feature_copy_offload:
+                description: 'Enable copy offload plugins (default: true)'
+                enum:
+                - "true"
+                - "false"
+                type: string
+              feature_ocp_live_migration:
+                description: 'Enable OCP live migration (default: false)'
+                enum:
+                - "true"
+                - "false"
+                type: string
+              feature_ova_appliance_management:
+                description: 'Enable OVF-based appliance management endpoints (OVA,
+                  HyperV)  (default: false)'
+                enum:
+                - "true"
+                - "false"
+                type: string
+              feature_ui_plugin:
+                description: 'Enable UI plugin (default: true)'
+                enum:
+                - "true"
+                - "false"
+                type: string
+              feature_validation:
+                description: 'Enable validation service (default: true)'
+                enum:
+                - "true"
+                - "false"
+                type: string
+              feature_vmware_system_serial_number:
+                description: 'Use VMware system serial numbers (default: true)'
+                enum:
+                - "true"
+                - "false"
+                type: string
+              feature_volume_populator:
+                description: 'Enable volume populators (default: true)'
+                enum:
+                - "true"
+                - "false"
+                type: string
+              feature_vsphere_vmware_driver_removal:
+                description: 'Run VMware driver removal scripts during Windows vSphere
+                  conversion (default: false)'
+                enum:
+                - "true"
+                - "false"
+                type: string
+              feature_windows_registry_network_config:
+                description: 'Use registry-based network configuration scripts for
+                  Windows static IP setup (default: false)'
+                enum:
+                - "true"
+                - "false"
+                type: string
+              hooks_container_limits_cpu:
+                description: 'Hooks CPU limit (default: 1000m)'
+                example: 2000m
+                type: string
+              hooks_container_limits_memory:
+                description: 'Hooks memory limit (default: 1Gi)'
+                example: 2Gi
+                type: string
+              hooks_container_requests_cpu:
+                description: 'Hooks CPU request (default: 100m)'
+                example: 200m
+                type: string
+              hooks_container_requests_memory:
+                description: 'Hooks memory request (default: 150Mi)'
+                example: 300Mi
+                type: string
+              hyperv_container_limits_cpu:
+                description: 'HyperV CPU limit (default: 1000m)'
+                example: 2000m
+                type: string
+              hyperv_container_limits_memory:
+                description: 'HyperV memory limit (default: 1Gi)'
+                example: 2Gi
+                type: string
+              hyperv_container_requests_cpu:
+                description: 'HyperV CPU request (default: 100m)'
+                example: 200m
+                type: string
+              hyperv_container_requests_memory:
+                description: 'HyperV memory request (default: 512Mi)'
+                example: 300Mi
+                type: string
+              hyperv_provider_server_fqin:
+                description: HyperV provider server image
+                example: quay.io/kubev2v/forklift-hyperv-provider-server:latest
+                type: string
+              image_pull_policy:
+                description: 'Image pull policy (default: Always)'
+                enum:
+                - Always
+                - IfNotPresent
+                - Never
+                type: string
+              inventory_container_limits_cpu:
+                description: 'Inventory CPU limit (default: 1000m)'
+                example: 2000m
+                type: string
+              inventory_container_limits_memory:
+                description: 'Inventory memory limit (default: 1Gi)'
+                example: 2Gi
+                type: string
+              inventory_container_requests_cpu:
+                description: 'Inventory CPU request (default: 500m)'
+                example: 1000m
+                type: string
+              inventory_container_requests_memory:
+                description: 'Inventory memory request (default: 500Mi)'
+                example: 1Gi
+                type: string
+              inventory_route_timeout:
+                description: 'Inventory route timeout (default: 360s)'
+                example: 600s
+                type: string
+              k8s_cluster:
+                description: 'Whether running on Kubernetes (vs OpenShift) (default:
+                  false)'
+                enum:
+                - "true"
+                - "false"
+                type: string
+              metric_interval:
+                description: 'Metrics scrape interval (default: 30s)'
+                example: 60s
+                type: string
+              must_gather_image_fqin:
+                description: Must-gather debugging image
+                example: quay.io/kubev2v/forklift-must-gather:latest
+                type: string
+              ova_container_limits_cpu:
+                description: 'OVA CPU limit (default: 1000m)'
+                example: 2000m
+                type: string
+              ova_container_limits_memory:
+                description: 'OVA memory limit (default: 1Gi)'
+                example: 2Gi
+                type: string
+              ova_container_requests_cpu:
+                description: 'OVA CPU request (default: 100m)'
+                example: 200m
+                type: string
+              ova_container_requests_memory:
+                description: 'OVA memory request (default: 150Mi)'
+                example: 300Mi
+                type: string
+              ova_provider_server_fqin:
+                description: OVA provider server image
+                example: quay.io/kubev2v/ova-provider-server:latest
+                type: string
+              ova_proxy_container_limits_cpu:
+                description: 'OVA Proxy CPU limit (default: 1000m)'
+                example: 2000m
+                type: string
+              ova_proxy_container_limits_memory:
+                description: 'OVA Proxy memory limit (default: 1Gi)'
+                example: 2Gi
+                type: string
+              ova_proxy_container_requests_cpu:
+                description: 'OVA Proxy CPU request (default: 250m)'
+                example: 200m
+                type: string
+              ova_proxy_container_requests_memory:
+                description: 'OVA Proxy memory request (default: 512Mi)'
+                example: 300Mi
+                type: string
+              ova_proxy_fqin:
+                description: OVA inventory proxy image
+                example: quay.io/kubev2v/forklift-ova-proxy:latest
+                type: string
+              ova_proxy_route_timeout:
+                description: 'OVA Proxy route timeout (default: 360s)'
+                example: 600s
+                type: string
+              ovirt_osmap_configmap_name:
+                description: 'ConfigMap name for oVirt OS mappings (default: forklift-ovirt-osmap)'
+                example: custom-ovirt-osmap
+                type: string
+              populator_container_limits_cpu:
+                description: 'Volume Populator CPU limit (default: 1000m)'
+                example: 2000m
+                type: string
+              populator_container_limits_memory:
+                description: 'Volume Populator memory limit (default: 1Gi)'
+                example: 2Gi
+                type: string
+              populator_container_requests_cpu:
+                description: 'Volume Populator CPU request (default: 100m)'
+                example: 200m
+                type: string
+              populator_container_requests_memory:
+                description: 'Volume Populator memory request (default: 512Mi)'
+                example: 300Mi
+                type: string
+              populator_controller_image_fqin:
+                description: Volume populator controller image
+                example: quay.io/kubev2v/populator-controller:latest
+                type: string
+              populator_openstack_image_fqin:
+                description: OpenStack populator image
+                example: quay.io/kubev2v/openstack-populator:latest
+                type: string
+              populator_ovirt_image_fqin:
+                description: oVirt populator image
+                example: quay.io/kubev2v/ovirt-populator:latest
+                type: string
+              populator_vsphere_xcopy_volume_image_fqin:
+                description: vSphere xcopy populator image
+                example: quay.io/kubev2v/vsphere-populator:latest
+                type: string
+              ui_plugin_container_limits_cpu:
+                description: 'UI plugin CPU limit (default: 100m)'
+                example: 200m
+                type: string
+              ui_plugin_container_limits_memory:
+                description: 'UI plugin memory limit (default: 800Mi)'
+                example: 1Gi
+                type: string
+              ui_plugin_container_requests_cpu:
+                description: 'UI plugin CPU request (default: 100m)'
+                example: 200m
+                type: string
+              ui_plugin_container_requests_memory:
+                description: 'UI plugin memory request (default: 150Mi)'
+                example: 300Mi
+                type: string
+              ui_plugin_image_fqin:
+                description: UI plugin image
+                example: quay.io/kubev2v/forklift-ui-plugin:latest
+                type: string
+              validation_container_limits_cpu:
+                description: 'Validation CPU limit (default: 1000m)'
+                example: 2000m
+                type: string
+              validation_container_limits_memory:
+                description: 'Validation memory limit (default: 300Mi)'
+                example: 500Mi
+                type: string
+              validation_container_requests_cpu:
+                description: 'Validation CPU request (default: 400m)'
+                example: 500m
+                type: string
+              validation_container_requests_memory:
+                description: 'Validation memory request (default: 50Mi)'
+                example: 100Mi
+                type: string
+              validation_extra_volume_mountpath:
+                description: 'Mount path for extra validation rules (default: /usr/share/opa/policies/extra)'
+                example: /custom/validation/path
+                type: string
+              validation_extra_volume_name:
+                description: 'Volume name for extra validation rules (default: validation-extra-rules)'
+                example: custom-validation-rules
+                type: string
+              validation_image_fqin:
+                description: Validation service image
+                example: quay.io/kubev2v/forklift-validation:latest
+                type: string
+              validation_policy_agent_search_interval:
+                description: 'Policy agent search interval in seconds (default: 120)'
+                x-kubernetes-int-or-string: true
+              vddk_image:
+                description: VDDK image for VMware disk access
+                example: quay.io/kubev2v/vddk:7.0.3
+                type: string
+              virt_customize_configmap_name:
+                description: 'ConfigMap name for virt-customize configuration (default:
+                  forklift-virt-customize)'
+                example: custom-virt-customize
+                type: string
+              virt_v2v_container_limits_cpu:
+                description: 'virt-v2v CPU limit (default: 4000m)'
+                example: 8000m
+                type: string
+              virt_v2v_container_limits_memory:
+                description: 'virt-v2v memory limit (default: 8Gi)'
+                example: 16Gi
+                type: string
+              virt_v2v_container_requests_cpu:
+                description: 'virt-v2v CPU request (default: 1000m)'
+                example: 2000m
+                type: string
+              virt_v2v_container_requests_memory:
+                description: 'virt-v2v memory request (default: 1Gi)'
+                example: 2Gi
+                type: string
+              virt_v2v_dont_request_kvm:
+                description: Don't request KVM for virt-v2v
+                enum:
+                - "true"
+                - "false"
+                type: string
+              virt_v2v_extra_args:
+                description: Additional arguments for virt-v2v
+                example: --debug-overlays
+                type: string
+              virt_v2v_extra_conf_config_map:
+                description: ConfigMap name containing extra virt-v2v configuration
+                type: string
+              virt_v2v_image_fqin:
+                description: Virt-v2v conversion image used by migration pods
+                example: quay.io/kubev2v/forklift-virt-v2v:latest
+                type: string
+              virt_v2v_image_xfs_fqin:
+                description: Virt-v2v XFS conversion image used by migration pods
+                example: quay.io/kubev2v/forklift-virt-v2v-xfs:latest
+                type: string
+              vsphere_osmap_configmap_name:
+                description: 'ConfigMap name for vSphere OS mappings (default: forklift-vsphere-osmap)'
+                example: custom-vsphere-osmap
+                type: string
+            type: object
+          status:
+            description: Status defines the observed state of ForkliftController
+            type: object
+            x-kubernetes-preserve-unknown-fields: true
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.17.3
+  name: hooks.forklift.konveyor.io
+spec:
+  group: forklift.konveyor.io
+  names:
+    kind: Hook
+    listKind: HookList
+    plural: hooks
+    singular: hook
+  scope: Namespaced
+  versions:
+  - additionalPrinterColumns:
+    - jsonPath: .status.conditions[?(@.type=='Ready')].status
+      name: Ready
+      type: string
+    - jsonPath: .spec.image
+      name: Image
+      type: string
+    - jsonPath: .metadata.creationTimestamp
+      name: Age
+      type: date
+    name: v1beta1
+    schema:
+      openAPIV3Schema:
+        description: Hook is the Schema for the hooks API
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: Hook specification.
+            properties:
+              deadline:
+                description: Hook deadline in seconds.
+                format: int64
+                type: integer
+              image:
+                description: Image to run.
+                type: string
+              playbook:
+                description: A base64 encoded Ansible playbook.
+                type: string
+              serviceAccount:
+                description: Service account.
+                type: string
+            required:
+            - image
+            type: object
+          status:
+            description: Hook status.
+            properties:
+              conditions:
+                description: List of conditions.
+                items:
+                  description: Condition
+                  properties:
+                    category:
+                      description: The condition category.
+                      type: string
+                    durable:
+                      description: The condition is durable - never un-staged.
+                      type: boolean
+                    items:
+                      description: A list of items referenced in the `Message`.
+                      items:
+                        type: string
+                      type: array
+                    lastTransitionTime:
+                      description: When the last status transition occurred.
+                      format: date-time
+                      type: string
+                    message:
+                      description: The human readable description of the condition.
+                      type: string
+                    reason:
+                      description: The reason for the condition or transition.
+                      type: string
+                    status:
+                      description: The condition status [true,false].
+                      type: string
+                    suggestion:
+                      description: A suggested action or resolution for the condition.
+                      type: string
+                    type:
+                      description: The condition type.
+                      type: string
+                  required:
+                  - category
+                  - lastTransitionTime
+                  - status
+                  - type
+                  type: object
+                type: array
+              observedGeneration:
+                description: The most recent generation observed by the controller.
+                format: int64
+                type: integer
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.17.3
+  name: hosts.forklift.konveyor.io
+spec:
+  group: forklift.konveyor.io
+  names:
+    kind: Host
+    listKind: HostList
+    plural: hosts
+    singular: host
+  scope: Namespaced
+  versions:
+  - additionalPrinterColumns:
+    - jsonPath: .status.conditions[?(@.type=='Ready')].status
+      name: READY
+      type: string
+    - jsonPath: .status.conditions[?(@.type=='ConnectionTestSucceeded')].status
+      name: CONNECTED
+      type: string
+    - jsonPath: .metadata.creationTimestamp
+      name: AGE
+      type: date
+    name: v1beta1
+    schema:
+      openAPIV3Schema:
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: HostSpec defines the desired state of Host
+            properties:
+              id:
+                description: |-
+                  The object ID.
+                  vsphere:
+                    The managed object ID.
+                type: string
+              ipAddress:
+                description: IP address used for disk transfer.
+                type: string
+              name:
+                description: |-
+                  An object Name.
+                  vsphere:
+                    A qualified name.
+                type: string
+              namespace:
+                description: |-
+                  The VM Namespace
+                  Only relevant for an openshift source.
+                type: string
+              provider:
+                description: Provider
+                properties:
+                  apiVersion:
+                    description: API version of the referent.
+                    type: string
+                  fieldPath:
+                    description: |-
+                      If referring to a piece of an object instead of an entire object, this string
+                      should contain a valid JSON/Go field access statement, such as desiredState.manifest.containers[2].
+                      For example, if the object reference is to a container within a pod, this would take on a value like:
+                      "spec.containers{name}" (where "name" refers to the name of the container that triggered
+                      the event) or if no container name is specified "spec.containers[2]" (container with
+                      index 2 in this pod). This syntax is chosen only to have some well-defined way of
+                      referencing a part of an object.
+                    type: string
+                  kind:
+                    description: |-
+                      Kind of the referent.
+                      More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+                    type: string
+                  name:
+                    description: |-
+                      Name of the referent.
+                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                    type: string
+                  namespace:
+                    description: |-
+                      Namespace of the referent.
+                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/
+                    type: string
+                  resourceVersion:
+                    description: |-
+                      Specific resourceVersion to which this reference is made, if any.
+                      More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency
+                    type: string
+                  uid:
+                    description: |-
+                      UID of the referent.
+                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids
+                    type: string
+                type: object
+                x-kubernetes-map-type: atomic
+              secret:
+                description: Credentials.
+                properties:
+                  apiVersion:
+                    description: API version of the referent.
+                    type: string
+                  fieldPath:
+                    description: |-
+                      If referring to a piece of an object instead of an entire object, this string
+                      should contain a valid JSON/Go field access statement, such as desiredState.manifest.containers[2].
+                      For example, if the object reference is to a container within a pod, this would take on a value like:
+                      "spec.containers{name}" (where "name" refers to the name of the container that triggered
+                      the event) or if no container name is specified "spec.containers[2]" (container with
+                      index 2 in this pod). This syntax is chosen only to have some well-defined way of
+                      referencing a part of an object.
+                    type: string
+                  kind:
+                    description: |-
+                      Kind of the referent.
+                      More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+                    type: string
+                  name:
+                    description: |-
+                      Name of the referent.
+                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                    type: string
+                  namespace:
+                    description: |-
+                      Namespace of the referent.
+                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/
+                    type: string
+                  resourceVersion:
+                    description: |-
+                      Specific resourceVersion to which this reference is made, if any.
+                      More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency
+                    type: string
+                  uid:
+                    description: |-
+                      UID of the referent.
+                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids
+                    type: string
+                type: object
+                x-kubernetes-map-type: atomic
+              type:
+                description: Type used to qualify the name.
+                type: string
+            required:
+            - ipAddress
+            - provider
+            - secret
+            type: object
+          status:
+            description: HostStatus defines the observed state of Host
+            properties:
+              conditions:
+                description: List of conditions.
+                items:
+                  description: Condition
+                  properties:
+                    category:
+                      description: The condition category.
+                      type: string
+                    durable:
+                      description: The condition is durable - never un-staged.
+                      type: boolean
+                    items:
+                      description: A list of items referenced in the `Message`.
+                      items:
+                        type: string
+                      type: array
+                    lastTransitionTime:
+                      description: When the last status transition occurred.
+                      format: date-time
+                      type: string
+                    message:
+                      description: The human readable description of the condition.
+                      type: string
+                    reason:
+                      description: The reason for the condition or transition.
+                      type: string
+                    status:
+                      description: The condition status [true,false].
+                      type: string
+                    suggestion:
+                      description: A suggested action or resolution for the condition.
+                      type: string
+                    type:
+                      description: The condition type.
+                      type: string
+                  required:
+                  - category
+                  - lastTransitionTime
+                  - status
+                  - type
+                  type: object
+                type: array
+              observedGeneration:
+                description: The most recent generation observed by the controller.
+                format: int64
+                type: integer
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.17.3
+  name: hypervproviderservers.forklift.konveyor.io
+spec:
+  group: forklift.konveyor.io
+  names:
+    kind: HyperVProviderServer
+    listKind: HyperVProviderServerList
+    plural: hypervproviderservers
+    singular: hypervproviderserver
+  scope: Namespaced
+  versions:
+  - additionalPrinterColumns:
+    - jsonPath: .status.phase
+      name: PHASE
+      type: string
+    - jsonPath: .status.service.name
+      name: SERVICE
+      type: string
+    name: v1beta1
+    schema:
+      openAPIV3Schema:
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: HyperVProviderServerSpec defines the desired state of HyperVProviderServer.
+            properties:
+              provider:
+                description: Provider reference.
+                properties:
+                  apiVersion:
+                    description: API version of the referent.
+                    type: string
+                  fieldPath:
+                    description: |-
+                      If referring to a piece of an object instead of an entire object, this string
+                      should contain a valid JSON/Go field access statement, such as desiredState.manifest.containers[2].
+                      For example, if the object reference is to a container within a pod, this would take on a value like:
+                      "spec.containers{name}" (where "name" refers to the name of the container that triggered
+                      the event) or if no container name is specified "spec.containers[2]" (container with
+                      index 2 in this pod). This syntax is chosen only to have some well-defined way of
+                      referencing a part of an object.
+                    type: string
+                  kind:
+                    description: |-
+                      Kind of the referent.
+                      More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+                    type: string
+                  name:
+                    description: |-
+                      Name of the referent.
+                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                    type: string
+                  namespace:
+                    description: |-
+                      Namespace of the referent.
+                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/
+                    type: string
+                  resourceVersion:
+                    description: |-
+                      Specific resourceVersion to which this reference is made, if any.
+                      More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency
+                    type: string
+                  uid:
+                    description: |-
+                      UID of the referent.
+                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids
+                    type: string
+                type: object
+                x-kubernetes-map-type: atomic
+            required:
+            - provider
+            type: object
+          status:
+            description: HyperVProviderServerStatus defines the observed state of
+              HyperVProviderServer.
+            properties:
+              conditions:
+                description: List of conditions.
+                items:
+                  description: Condition
+                  properties:
+                    category:
+                      description: The condition category.
+                      type: string
+                    durable:
+                      description: The condition is durable - never un-staged.
+                      type: boolean
+                    items:
+                      description: A list of items referenced in the `Message`.
+                      items:
+                        type: string
+                      type: array
+                    lastTransitionTime:
+                      description: When the last status transition occurred.
+                      format: date-time
+                      type: string
+                    message:
+                      description: The human readable description of the condition.
+                      type: string
+                    reason:
+                      description: The reason for the condition or transition.
+                      type: string
+                    status:
+                      description: The condition status [true,false].
+                      type: string
+                    suggestion:
+                      description: A suggested action or resolution for the condition.
+                      type: string
+                    type:
+                      description: The condition type.
+                      type: string
+                  required:
+                  - category
+                  - lastTransitionTime
+                  - status
+                  - type
+                  type: object
+                type: array
+              phase:
+                description: Phase of the HyperV provider server.
+                type: string
+              service:
+                description: Service reference.
+                properties:
+                  apiVersion:
+                    description: API version of the referent.
+                    type: string
+                  fieldPath:
+                    description: |-
+                      If referring to a piece of an object instead of an entire object, this string
+                      should contain a valid JSON/Go field access statement, such as desiredState.manifest.containers[2].
+                      For example, if the object reference is to a container within a pod, this would take on a value like:
+                      "spec.containers{name}" (where "name" refers to the name of the container that triggered
+                      the event) or if no container name is specified "spec.containers[2]" (container with
+                      index 2 in this pod). This syntax is chosen only to have some well-defined way of
+                      referencing a part of an object.
+                    type: string
+                  kind:
+                    description: |-
+                      Kind of the referent.
+                      More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+                    type: string
+                  name:
+                    description: |-
+                      Name of the referent.
+                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                    type: string
+                  namespace:
+                    description: |-
+                      Namespace of the referent.
+                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/
+                    type: string
+                  resourceVersion:
+                    description: |-
+                      Specific resourceVersion to which this reference is made, if any.
+                      More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency
+                    type: string
+                  uid:
+                    description: |-
+                      UID of the referent.
+                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids
+                    type: string
+                type: object
+                x-kubernetes-map-type: atomic
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.17.3
+  name: migrations.forklift.konveyor.io
+spec:
+  group: forklift.konveyor.io
+  names:
+    kind: Migration
+    listKind: MigrationList
+    plural: migrations
+    singular: migration
+  scope: Namespaced
+  versions:
+  - additionalPrinterColumns:
+    - jsonPath: .status.conditions[?(@.type=='Ready')].status
+      name: READY
+      type: string
+    - jsonPath: .status.conditions[?(@.type=='Running')].status
+      name: RUNNING
+      type: string
+    - jsonPath: .status.conditions[?(@.type=='Succeeded')].status
+      name: SUCCEEDED
+      type: string
+    - jsonPath: .status.conditions[?(@.type=='Failed')].status
+      name: FAILED
+      type: string
+    - jsonPath: .metadata.creationTimestamp
+      name: AGE
+      type: date
+    name: v1beta1
+    schema:
+      openAPIV3Schema:
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: MigrationSpec defines the desired state of Migration
+            properties:
+              cancel:
+                description: List of VMs which will have their imports canceled.
+                items:
+                  description: |-
+                    Source reference.
+                    Either the ID or Name must be specified.
+                  properties:
+                    id:
+                      description: |-
+                        The object ID.
+                        vsphere:
+                          The managed object ID.
+                      type: string
+                    name:
+                      description: |-
+                        An object Name.
+                        vsphere:
+                          A qualified name.
+                      type: string
+                    namespace:
+                      description: |-
+                        The VM Namespace
+                        Only relevant for an openshift source.
+                      type: string
+                    type:
+                      description: Type used to qualify the name.
+                      type: string
+                  type: object
+                type: array
+              cutover:
+                description: |-
+                  Date and time to finalize a warm migration.
+                  If present, this will override the value set on the Plan.
+                format: date-time
+                type: string
+              plan:
+                description: Reference to the associated Plan.
+                properties:
+                  apiVersion:
+                    description: API version of the referent.
+                    type: string
+                  fieldPath:
+                    description: |-
+                      If referring to a piece of an object instead of an entire object, this string
+                      should contain a valid JSON/Go field access statement, such as desiredState.manifest.containers[2].
+                      For example, if the object reference is to a container within a pod, this would take on a value like:
+                      "spec.containers{name}" (where "name" refers to the name of the container that triggered
+                      the event) or if no container name is specified "spec.containers[2]" (container with
+                      index 2 in this pod). This syntax is chosen only to have some well-defined way of
+                      referencing a part of an object.
+                    type: string
+                  kind:
+                    description: |-
+                      Kind of the referent.
+                      More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+                    type: string
+                  name:
+                    description: |-
+                      Name of the referent.
+                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                    type: string
+                  namespace:
+                    description: |-
+                      Namespace of the referent.
+                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/
+                    type: string
+                  resourceVersion:
+                    description: |-
+                      Specific resourceVersion to which this reference is made, if any.
+                      More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency
+                    type: string
+                  uid:
+                    description: |-
+                      UID of the referent.
+                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids
+                    type: string
+                type: object
+                x-kubernetes-map-type: atomic
+            required:
+            - plan
+            type: object
+          status:
+            description: MigrationStatus defines the observed state of Migration
+            properties:
+              completed:
+                description: Completed timestamp.
+                format: date-time
+                type: string
+              conditions:
+                description: List of conditions.
+                items:
+                  description: Condition
+                  properties:
+                    category:
+                      description: The condition category.
+                      type: string
+                    durable:
+                      description: The condition is durable - never un-staged.
+                      type: boolean
+                    items:
+                      description: A list of items referenced in the `Message`.
+                      items:
+                        type: string
+                      type: array
+                    lastTransitionTime:
+                      description: When the last status transition occurred.
+                      format: date-time
+                      type: string
+                    message:
+                      description: The human readable description of the condition.
+                      type: string
+                    reason:
+                      description: The reason for the condition or transition.
+                      type: string
+                    status:
+                      description: The condition status [true,false].
+                      type: string
+                    suggestion:
+                      description: A suggested action or resolution for the condition.
+                      type: string
+                    type:
+                      description: The condition type.
+                      type: string
+                  required:
+                  - category
+                  - lastTransitionTime
+                  - status
+                  - type
+                  type: object
+                type: array
+              observedGeneration:
+                description: The most recent generation observed by the controller.
+                format: int64
+                type: integer
+              started:
+                description: Started timestamp.
+                format: date-time
+                type: string
+              vms:
+                description: VM status
+                items:
+                  description: VM Status
+                  properties:
+                    completed:
+                      description: Completed timestamp.
+                      format: date-time
+                      type: string
+                    conditions:
+                      description: List of conditions.
+                      items:
+                        description: Condition
+                        properties:
+                          category:
+                            description: The condition category.
+                            type: string
+                          durable:
+                            description: The condition is durable - never un-staged.
+                            type: boolean
+                          items:
+                            description: A list of items referenced in the `Message`.
+                            items:
+                              type: string
+                            type: array
+                          lastTransitionTime:
+                            description: When the last status transition occurred.
+                            format: date-time
+                            type: string
+                          message:
+                            description: The human readable description of the condition.
+                            type: string
+                          reason:
+                            description: The reason for the condition or transition.
+                            type: string
+                          status:
+                            description: The condition status [true,false].
+                            type: string
+                          suggestion:
+                            description: A suggested action or resolution for the
+                              condition.
+                            type: string
+                          type:
+                            description: The condition type.
+                            type: string
+                        required:
+                        - category
+                        - lastTransitionTime
+                        - status
+                        - type
+                        type: object
+                      type: array
+                    deleteVmOnFailMigration:
+                      description: |-
+                        DeleteVmOnFailMigration controls whether the target VM created by this Plan is deleted when a migration fails.
+                        When true and the migration fails after the target VM has been created, the controller
+                        will delete the target VM (and related target-side resources) during failed-migration cleanup
+                        and when the Plan is deleted. When false (default), the target VM is preserved to aid
+                        troubleshooting. The source VM is never modified.
+
+                        Note: If the Plan-level option is set to true, the VM-level option will be ignored.
+                      type: boolean
+                    enableNestedVirtualization:
+                      description: |-
+                        EnableNestedVirtualization controls whether nested virtualization (vmx/svm CPU features)
+                        is enabled on the target VM.
+                        - nil (default): Auto-detect from source VM settings
+                        - true: Force enable nested virtualization on the target VM regardless of source settings
+                        - false: Force disable nested virtualization on the target VM regardless of source settings
+                      type: boolean
+                    error:
+                      description: Errors
+                      properties:
+                        phase:
+                          type: string
+                        reasons:
+                          items:
+                            type: string
+                          type: array
+                      required:
+                      - phase
+                      - reasons
+                      type: object
+                    firmware:
+                      description: The firmware type detected from the OVF file produced
+                        by virt-v2v.
+                      type: string
+                    hooks:
+                      description: Enable hooks.
+                      items:
+                        description: Plan hook.
+                        properties:
+                          hook:
+                            description: Hook reference.
+                            properties:
+                              apiVersion:
+                                description: API version of the referent.
+                                type: string
+                              fieldPath:
+                                description: |-
+                                  If referring to a piece of an object instead of an entire object, this string
+                                  should contain a valid JSON/Go field access statement, such as desiredState.manifest.containers[2].
+                                  For example, if the object reference is to a container within a pod, this would take on a value like:
+                                  "spec.containers{name}" (where "name" refers to the name of the container that triggered
+                                  the event) or if no container name is specified "spec.containers[2]" (container with
+                                  index 2 in this pod). This syntax is chosen only to have some well-defined way of
+                                  referencing a part of an object.
+                                type: string
+                              kind:
+                                description: |-
+                                  Kind of the referent.
+                                  More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+                                type: string
+                              name:
+                                description: |-
+                                  Name of the referent.
+                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                type: string
+                              namespace:
+                                description: |-
+                                  Namespace of the referent.
+                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/
+                                type: string
+                              resourceVersion:
+                                description: |-
+                                  Specific resourceVersion to which this reference is made, if any.
+                                  More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency
+                                type: string
+                              uid:
+                                description: |-
+                                  UID of the referent.
+                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids
+                                type: string
+                            type: object
+                            x-kubernetes-map-type: atomic
+                          step:
+                            description: Pipeline step.
+                            type: string
+                        required:
+                        - hook
+                        - step
+                        type: object
+                      type: array
+                    id:
+                      description: |-
+                        The object ID.
+                        vsphere:
+                          The managed object ID.
+                      type: string
+                    instanceType:
+                      description: Selected InstanceType that will override the VM
+                        properties.
+                      type: string
+                    luks:
+                      description: Disk decryption LUKS keys
+                      properties:
+                        apiVersion:
+                          description: API version of the referent.
+                          type: string
+                        fieldPath:
+                          description: |-
+                            If referring to a piece of an object instead of an entire object, this string
+                            should contain a valid JSON/Go field access statement, such as desiredState.manifest.containers[2].
+                            For example, if the object reference is to a container within a pod, this would take on a value like:
+                            "spec.containers{name}" (where "name" refers to the name of the container that triggered
+                            the event) or if no container name is specified "spec.containers[2]" (container with
+                            index 2 in this pod). This syntax is chosen only to have some well-defined way of
+                            referencing a part of an object.
+                          type: string
+                        kind:
+                          description: |-
+                            Kind of the referent.
+                            More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+                          type: string
+                        name:
+                          description: |-
+                            Name of the referent.
+                            More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                          type: string
+                        namespace:
+                          description: |-
+                            Namespace of the referent.
+                            More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/
+                          type: string
+                        resourceVersion:
+                          description: |-
+                            Specific resourceVersion to which this reference is made, if any.
+                            More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency
+                          type: string
+                        uid:
+                          description: |-
+                            UID of the referent.
+                            More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids
+                          type: string
+                      type: object
+                      x-kubernetes-map-type: atomic
+                    migrateSharedDisks:
+                      description: |-
+                        MigrateSharedDisks controls whether shared disks are included in the migration for this VM.
+                        When nil (default), the plan-level migrateSharedDisks value is used.
+                        When explicitly set to true, shared disks are migrated for this VM.
+                        When explicitly set to false, shared disks are skipped for this VM.
+                      type: boolean
+                    name:
+                      description: |-
+                        An object Name.
+                        vsphere:
+                          A qualified name.
+                      type: string
+                    namespace:
+                      description: |-
+                        The VM Namespace
+                        Only relevant for an openshift source.
+                      type: string
+                    nbdeClevis:
+                      description: |-
+                        Attempt passphrase-less unlocking for all devices with Clevis, over the network.
+                        Conversion pod running on target cluster will attempt to connect to a TANG server, make sure TANG
+                        server is available on target network.
+                        https://docs.redhat.com/en/documentation/red_hat_enterprise_linux/8/html/security_hardening/configuring-automated-unlocking-of-encrypted-volumes-using-policy-based-decryption_security-hardening
+                        If both nbdeClevis and LUKS are configured, nbdeClevis takes precedence.
+                      type: boolean
+                    networkNameTemplate:
+                      description: |-
+                        NetworkNameTemplate is a template for generating network interface names in the target virtual machine.
+                        It follows Go template syntax and has access to the following variables:
+                          - .NetworkName: If target network is multus, name of the Multus network attachment definition, empty otherwise.
+                          - .NetworkNamespace: If target network is multus, namespace where the network attachment definition is located.
+                          - .NetworkType: type of the network ("Multus" or "Pod")
+                          - .NetworkIndex: sequential index of the network interface (0-based)
+                        The template can be used to customize network interface names based on target network configuration.
+
+                        Provider support:
+                          - VMware (vSphere): Supported. Network interface names can be customized.
+                          - OpenShift: Not supported. Network interface names are preserved from the source VM.
+
+                        Note:
+                          - This template will override at the plan level template
+                          - If not specified on VM level and on Plan level, default naming conventions will be used
+                        Examples:
+                          "net-{{`{{`}}.NetworkIndex{{`}}`}}"
+                          "{{`{{`}}if eq .NetworkType "Pod"{{`}}`}}pod{{`{{`}}else{{`}}`}}multus-{{`{{`}}.NetworkIndex{{`}}`}}{{`{{`}}end{{`}}`}}"
+                      type: string
+                    newName:
+                      description: The new name of the VM after matching DNS1123 requirements.
+                      type: string
+                    operatingSystem:
+                      description: The Operating System detected by virt-v2v.
+                      type: string
+                    phase:
+                      description: Phase
+                      type: string
+                    pipeline:
+                      description: Migration pipeline.
+                      items:
+                        description: Pipeline step.
+                        properties:
+                          annotations:
+                            additionalProperties:
+                              type: string
+                            description: Annotations.
+                            type: object
+                          completed:
+                            description: Completed timestamp.
+                            format: date-time
+                            type: string
+                          description:
+                            description: Name
+                            type: string
+                          error:
+                            description: Error.
+                            properties:
+                              phase:
+                                type: string
+                              reasons:
+                                items:
+                                  type: string
+                                type: array
+                            required:
+                            - phase
+                            - reasons
+                            type: object
+                          name:
+                            description: Name.
+                            type: string
+                          phase:
+                            description: Phase
+                            type: string
+                          progress:
+                            description: Progress.
+                            properties:
+                              completed:
+                                description: Completed units.
+                                format: int64
+                                type: integer
+                              total:
+                                description: Total units.
+                                format: int64
+                                type: integer
+                            required:
+                            - completed
+                            - total
+                            type: object
+                          reason:
+                            description: Reason
+                            type: string
+                          started:
+                            description: Started timestamp.
+                            format: date-time
+                            type: string
+                          tasks:
+                            description: Nested tasks.
+                            items:
+                              description: Migration task.
+                              properties:
+                                annotations:
+                                  additionalProperties:
+                                    type: string
+                                  description: Annotations.
+                                  type: object
+                                completed:
+                                  description: Completed timestamp.
+                                  format: date-time
+                                  type: string
+                                description:
+                                  description: Name
+                                  type: string
+                                error:
+                                  description: Error.
+                                  properties:
+                                    phase:
+                                      type: string
+                                    reasons:
+                                      items:
+                                        type: string
+                                      type: array
+                                  required:
+                                  - phase
+                                  - reasons
+                                  type: object
+                                name:
+                                  description: Name.
+                                  type: string
+                                phase:
+                                  description: Phase
+                                  type: string
+                                progress:
+                                  description: Progress.
+                                  properties:
+                                    completed:
+                                      description: Completed units.
+                                      format: int64
+                                      type: integer
+                                    total:
+                                      description: Total units.
+                                      format: int64
+                                      type: integer
+                                  required:
+                                  - completed
+                                  - total
+                                  type: object
+                                reason:
+                                  description: Reason
+                                  type: string
+                                started:
+                                  description: Started timestamp.
+                                  format: date-time
+                                  type: string
+                              required:
+                              - name
+                              - progress
+                              type: object
+                            type: array
+                        required:
+                        - name
+                        - progress
+                        type: object
+                      type: array
+                    pvcNameTemplate:
+                      description: "PVCNameTemplate is a template for generating PVC
+                        names for VM disks.\nGenerated names must be valid DNS-1123
+                        labels (lowercase alphanumerics, '-' allowed, max 63 chars).\nIt
+                        follows Go template syntax and has access to provider-specific
+                        variables.\n\nCommon variables (all providers):\n  - .VmName:
+                        name of the VM in the source cluster (original source name)\n
+                        \ - .TargetVmName: final VM name in the target cluster (may
+                        equal .VmName if no rename/normalization)\n  - .PlanName:
+                        name of the migration plan\n  - .DiskIndex: initial volume
+                        index of the disk\n\nVMware (vSphere) specific variables:\n
+                        \ - .WinDriveLetter: Windows drive letter (lowercase, if applicable,
+                        e.g. \"c\", requires guest agent)\n  - .RootDiskIndex: index
+                        of the root disk\n  - .Shared: true if the volume is shared
+                        by multiple VMs, false otherwise\n  - .FileName: name of the
+                        file in the source provider (filename includes the .vmdk suffix)\n\nOpenShift
+                        specific variables:\n  - .SourcePVCName: name of the PVC in
+                        the source cluster\n  - .SourcePVCNamespace: namespace of
+                        the PVC in the source cluster\n\nNote:\n  This template overrides
+                        the plan level template.\nExamples:\n  \"{{`{{`}}.TargetVmName{{`}}`}}-disk-{{`{{`}}.DiskIndex{{`}}`}}\"\n
+                        \ \"{{`{{`}}if eq .DiskIndex .RootDiskIndex{{`}}`}}root{{`{{`}}else{{`}}`}}data{{`{{`}}end{{`}}`}}-{{`{{`}}.DiskIndex{{`}}`}}\"
+                        (VMware)\n  \"{{`{{`}}.TargetVmName{{`}}`}}-{{`{{`}}.SourcePVCName{{`}}`}}\" (OpenShift)\nSee:\n\t
+                        https://github.com/kubev2v/forklift/tree/main/pkg/templateutil
+                        for template functions."
+                      type: string
+                    rdmAsLun:
+                      description: |-
+                        RDMAsLun controls whether RDM (Raw Device Mapping) disks from VMware should be
+                        mapped as LUN devices in the target KubeVirt VM instead of regular disk devices.
+                        When nil (default), the plan-level rdmAsLun value is used.
+                        When explicitly set to true, RDM disks are attached using lun: {} for this VM.
+                        When explicitly set to false, RDM disks are attached as regular disks for this VM.
+                      type: boolean
+                    restorePowerState:
+                      description: Source VM power state before migration.
+                      type: string
+                    rootDisk:
+                      description: Choose the primary disk the VM boots from
+                      type: string
+                    started:
+                      description: Started timestamp.
+                      format: date-time
+                      type: string
+                    targetName:
+                      description: |-
+                        TargetName specifies a custom name for the VM in the target cluster.
+                        If not provided, the original VM name will be used and automatically adjusted to meet k8s DNS1123 requirements.
+                        If provided, this exact name will be used instead. The migration will fail if the name is not unique or already in use.
+                      type: string
+                    targetPowerState:
+                      description: |-
+                        TargetPowerState specifies the desired power state of the target VM after migration.
+                        - "on": Target VM will be powered on after migration
+                        - "off": Target VM will be powered off after migration
+                        - "auto" or nil (default): Target VM will match the source VM's power state
+                      enum:
+                      - "on"
+                      - "off"
+                      - auto
+                      type: string
+                    type:
+                      description: Type used to qualify the name.
+                      type: string
+                    volumeNameTemplate:
+                      description: |-
+                        VolumeNameTemplate is a template for generating volume interface names in the target virtual machine.
+                        It follows Go template syntax and has access to the following variables:
+                          - .PVCName: name of the PVC mounted to the VM using this volume
+                          - .VolumeIndex: sequential index of the volume interface (0-based)
+
+                        Provider support:
+                          - VMware (vSphere): Supported. Default naming is "vol-{index}".
+                          - OpenShift: Not supported. Volume names are preserved from the source VM.
+
+                        Note:
+                          - This template will override at the plan level template
+                          - If not specified on VM level and on Plan level, default naming conventions will be used
+                        Examples:
+                          "disk-{{`{{`}}.VolumeIndex{{`}}`}}"
+                          "pvc-{{`{{`}}.PVCName{{`}}`}}"
+                      type: string
+                    warm:
+                      description: Warm migration status
+                      properties:
+                        consecutiveFailures:
+                          type: integer
+                        failures:
+                          type: integer
+                        nextPrecopyAt:
+                          format: date-time
+                          type: string
+                        precopies:
+                          items:
+                            description: Precopy durations
+                            properties:
+                              createTaskId:
+                                type: string
+                              deltas:
+                                items:
+                                  properties:
+                                    deltaId:
+                                      type: string
+                                    disk:
+                                      type: string
+                                  required:
+                                  - deltaId
+                                  - disk
+                                  type: object
+                                type: array
+                              end:
+                                format: date-time
+                                type: string
+                              removeTaskId:
+                                type: string
+                              snapshot:
+                                type: string
+                              start:
+                                format: date-time
+                                type: string
+                            type: object
+                          type: array
+                        successes:
+                          type: integer
+                      required:
+                      - consecutiveFailures
+                      - failures
+                      - successes
+                      type: object
+                  required:
+                  - phase
+                  - pipeline
+                  type: object
+                type: array
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.17.3
+  name: networkmaps.forklift.konveyor.io
+spec:
+  group: forklift.konveyor.io
+  names:
+    kind: NetworkMap
+    listKind: NetworkMapList
+    plural: networkmaps
+    singular: networkmap
+  scope: Namespaced
+  versions:
+  - additionalPrinterColumns:
+    - jsonPath: .status.conditions[?(@.type=='Ready')].status
+      name: READY
+      type: string
+    - jsonPath: .metadata.creationTimestamp
+      name: AGE
+      type: date
+    name: v1beta1
+    schema:
+      openAPIV3Schema:
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: Network map spec.
+            properties:
+              map:
+                description: Map.
+                items:
+                  description: Mapped network.
+                  properties:
+                    destination:
+                      description: Destination network.
+                      properties:
+                        name:
+                          description: The name.
+                          type: string
+                        namespace:
+                          description: The namespace (multus only).
+                          type: string
+                        type:
+                          description: |-
+                            Type of network to use for the destination.
+                            Valid values:
+                            - pod: Use the Kubernetes pod network
+                            - multus: Use a Multus additional network
+                            - ignored: Network is excluded from mapping
+                          enum:
+                          - pod
+                          - multus
+                          - ignored
+                          type: string
+                      required:
+                      - type
+                      type: object
+                    source:
+                      description: Source network.
+                      properties:
+                        id:
+                          description: |-
+                            The object ID.
+                            vsphere:
+                              The managed object ID.
+                          type: string
+                        name:
+                          description: |-
+                            An object Name.
+                            vsphere:
+                              A qualified name.
+                          type: string
+                        namespace:
+                          description: |-
+                            The VM Namespace
+                            Only relevant for an openshift source.
+                          type: string
+                        type:
+                          description: Type used to qualify the name.
+                          type: string
+                      type: object
+                  required:
+                  - destination
+                  - source
+                  type: object
+                type: array
+              provider:
+                description: Provider
+                properties:
+                  destination:
+                    description: Destination.
+                    properties:
+                      apiVersion:
+                        description: API version of the referent.
+                        type: string
+                      fieldPath:
+                        description: |-
+                          If referring to a piece of an object instead of an entire object, this string
+                          should contain a valid JSON/Go field access statement, such as desiredState.manifest.containers[2].
+                          For example, if the object reference is to a container within a pod, this would take on a value like:
+                          "spec.containers{name}" (where "name" refers to the name of the container that triggered
+                          the event) or if no container name is specified "spec.containers[2]" (container with
+                          index 2 in this pod). This syntax is chosen only to have some well-defined way of
+                          referencing a part of an object.
+                        type: string
+                      kind:
+                        description: |-
+                          Kind of the referent.
+                          More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+                        type: string
+                      name:
+                        description: |-
+                          Name of the referent.
+                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                        type: string
+                      namespace:
+                        description: |-
+                          Namespace of the referent.
+                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/
+                        type: string
+                      resourceVersion:
+                        description: |-
+                          Specific resourceVersion to which this reference is made, if any.
+                          More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency
+                        type: string
+                      uid:
+                        description: |-
+                          UID of the referent.
+                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids
+                        type: string
+                    type: object
+                    x-kubernetes-map-type: atomic
+                  source:
+                    description: Source.
+                    properties:
+                      apiVersion:
+                        description: API version of the referent.
+                        type: string
+                      fieldPath:
+                        description: |-
+                          If referring to a piece of an object instead of an entire object, this string
+                          should contain a valid JSON/Go field access statement, such as desiredState.manifest.containers[2].
+                          For example, if the object reference is to a container within a pod, this would take on a value like:
+                          "spec.containers{name}" (where "name" refers to the name of the container that triggered
+                          the event) or if no container name is specified "spec.containers[2]" (container with
+                          index 2 in this pod). This syntax is chosen only to have some well-defined way of
+                          referencing a part of an object.
+                        type: string
+                      kind:
+                        description: |-
+                          Kind of the referent.
+                          More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+                        type: string
+                      name:
+                        description: |-
+                          Name of the referent.
+                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                        type: string
+                      namespace:
+                        description: |-
+                          Namespace of the referent.
+                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/
+                        type: string
+                      resourceVersion:
+                        description: |-
+                          Specific resourceVersion to which this reference is made, if any.
+                          More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency
+                        type: string
+                      uid:
+                        description: |-
+                          UID of the referent.
+                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids
+                        type: string
+                    type: object
+                    x-kubernetes-map-type: atomic
+                required:
+                - destination
+                - source
+                type: object
+            required:
+            - map
+            - provider
+            type: object
+          status:
+            description: MapStatus defines the observed state of Maps.
+            properties:
+              conditions:
+                description: List of conditions.
+                items:
+                  description: Condition
+                  properties:
+                    category:
+                      description: The condition category.
+                      type: string
+                    durable:
+                      description: The condition is durable - never un-staged.
+                      type: boolean
+                    items:
+                      description: A list of items referenced in the `Message`.
+                      items:
+                        type: string
+                      type: array
+                    lastTransitionTime:
+                      description: When the last status transition occurred.
+                      format: date-time
+                      type: string
+                    message:
+                      description: The human readable description of the condition.
+                      type: string
+                    reason:
+                      description: The reason for the condition or transition.
+                      type: string
+                    status:
+                      description: The condition status [true,false].
+                      type: string
+                    suggestion:
+                      description: A suggested action or resolution for the condition.
+                      type: string
+                    type:
+                      description: The condition type.
+                      type: string
+                  required:
+                  - category
+                  - lastTransitionTime
+                  - status
+                  - type
+                  type: object
+                type: array
+              observedGeneration:
+                description: The most recent generation observed by the controller.
+                format: int64
+                type: integer
+              references:
+                items:
+                  description: |-
+                    Source reference.
+                    Either the ID or Name must be specified.
+                  properties:
+                    id:
+                      description: |-
+                        The object ID.
+                        vsphere:
+                          The managed object ID.
+                      type: string
+                    name:
+                      description: |-
+                        An object Name.
+                        vsphere:
+                          A qualified name.
+                      type: string
+                    namespace:
+                      description: |-
+                        The VM Namespace
+                        Only relevant for an openshift source.
+                      type: string
+                    type:
+                      description: Type used to qualify the name.
+                      type: string
+                  type: object
+                type: array
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.17.3
+  name: openstackvolumepopulators.forklift.konveyor.io
+spec:
+  group: forklift.konveyor.io
+  names:
+    kind: OpenstackVolumePopulator
+    listKind: OpenstackVolumePopulatorList
+    plural: openstackvolumepopulators
+    shortNames:
+    - osvp
+    - osvps
+    singular: openstackvolumepopulator
+  scope: Namespaced
+  versions:
+  - name: v1beta1
+    schema:
+      openAPIV3Schema:
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          metadata:
+            type: object
+          spec:
+            properties:
+              identityUrl:
+                type: string
+              imageId:
+                type: string
+              secretName:
+                type: string
+              transferNetwork:
+                description: The network attachment definition that should be used
+                  for disk transfer.
+                properties:
+                  apiVersion:
+                    description: API version of the referent.
+                    type: string
+                  fieldPath:
+                    description: |-
+                      If referring to a piece of an object instead of an entire object, this string
+                      should contain a valid JSON/Go field access statement, such as desiredState.manifest.containers[2].
+                      For example, if the object reference is to a container within a pod, this would take on a value like:
+                      "spec.containers{name}" (where "name" refers to the name of the container that triggered
+                      the event) or if no container name is specified "spec.containers[2]" (container with
+                      index 2 in this pod). This syntax is chosen only to have some well-defined way of
+                      referencing a part of an object.
+                    type: string
+                  kind:
+                    description: |-
+                      Kind of the referent.
+                      More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+                    type: string
+                  name:
+                    description: |-
+                      Name of the referent.
+                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                    type: string
+                  namespace:
+                    description: |-
+                      Namespace of the referent.
+                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/
+                    type: string
+                  resourceVersion:
+                    description: |-
+                      Specific resourceVersion to which this reference is made, if any.
+                      More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency
+                    type: string
+                  uid:
+                    description: |-
+                      UID of the referent.
+                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids
+                    type: string
+                type: object
+                x-kubernetes-map-type: atomic
+            required:
+            - identityUrl
+            - imageId
+            - secretName
+            type: object
+          status:
+            properties:
+              progress:
+                type: string
+            type: object
+        required:
+        - spec
+        type: object
+    served: true
+    storage: true
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.17.3
+  name: ovaproviderservers.forklift.konveyor.io
+spec:
+  group: forklift.konveyor.io
+  names:
+    kind: OVAProviderServer
+    listKind: OVAProviderServerList
+    plural: ovaproviderservers
+    singular: ovaproviderserver
+  scope: Namespaced
+  versions:
+  - name: v1beta1
+    schema:
+      openAPIV3Schema:
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          metadata:
+            type: object
+          spec:
+            properties:
+              provider:
+                description: Reference to a Provider resource.
+                properties:
+                  apiVersion:
+                    description: API version of the referent.
+                    type: string
+                  fieldPath:
+                    description: |-
+                      If referring to a piece of an object instead of an entire object, this string
+                      should contain a valid JSON/Go field access statement, such as desiredState.manifest.containers[2].
+                      For example, if the object reference is to a container within a pod, this would take on a value like:
+                      "spec.containers{name}" (where "name" refers to the name of the container that triggered
+                      the event) or if no container name is specified "spec.containers[2]" (container with
+                      index 2 in this pod). This syntax is chosen only to have some well-defined way of
+                      referencing a part of an object.
+                    type: string
+                  kind:
+                    description: |-
+                      Kind of the referent.
+                      More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+                    type: string
+                  name:
+                    description: |-
+                      Name of the referent.
+                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                    type: string
+                  namespace:
+                    description: |-
+                      Namespace of the referent.
+                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/
+                    type: string
+                  resourceVersion:
+                    description: |-
+                      Specific resourceVersion to which this reference is made, if any.
+                      More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency
+                    type: string
+                  uid:
+                    description: |-
+                      UID of the referent.
+                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids
+                    type: string
+                type: object
+                x-kubernetes-map-type: atomic
+                x-kubernetes-validations:
+                - message: spec.provider is immutable
+                  rule: oldSelf == null || oldSelf.name == '' || self == oldSelf
+            required:
+            - provider
+            type: object
+          status:
+            properties:
+              conditions:
+                description: List of conditions.
+                items:
+                  description: Condition
+                  properties:
+                    category:
+                      description: The condition category.
+                      type: string
+                    durable:
+                      description: The condition is durable - never un-staged.
+                      type: boolean
+                    items:
+                      description: A list of items referenced in the `Message`.
+                      items:
+                        type: string
+                      type: array
+                    lastTransitionTime:
+                      description: When the last status transition occurred.
+                      format: date-time
+                      type: string
+                    message:
+                      description: The human readable description of the condition.
+                      type: string
+                    reason:
+                      description: The reason for the condition or transition.
+                      type: string
+                    status:
+                      description: The condition status [true,false].
+                      type: string
+                    suggestion:
+                      description: A suggested action or resolution for the condition.
+                      type: string
+                    type:
+                      description: The condition type.
+                      type: string
+                  required:
+                  - category
+                  - lastTransitionTime
+                  - status
+                  - type
+                  type: object
+                type: array
+              phase:
+                description: Current life cycle phase of the OVA server.
+                type: string
+              service:
+                description: Reference to Service resource
+                properties:
+                  apiVersion:
+                    description: API version of the referent.
+                    type: string
+                  fieldPath:
+                    description: |-
+                      If referring to a piece of an object instead of an entire object, this string
+                      should contain a valid JSON/Go field access statement, such as desiredState.manifest.containers[2].
+                      For example, if the object reference is to a container within a pod, this would take on a value like:
+                      "spec.containers{name}" (where "name" refers to the name of the container that triggered
+                      the event) or if no container name is specified "spec.containers[2]" (container with
+                      index 2 in this pod). This syntax is chosen only to have some well-defined way of
+                      referencing a part of an object.
+                    type: string
+                  kind:
+                    description: |-
+                      Kind of the referent.
+                      More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+                    type: string
+                  name:
+                    description: |-
+                      Name of the referent.
+                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                    type: string
+                  namespace:
+                    description: |-
+                      Namespace of the referent.
+                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/
+                    type: string
+                  resourceVersion:
+                    description: |-
+                      Specific resourceVersion to which this reference is made, if any.
+                      More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency
+                    type: string
+                  uid:
+                    description: |-
+                      UID of the referent.
+                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids
+                    type: string
+                type: object
+                x-kubernetes-map-type: atomic
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.17.3
+  name: ovirtvolumepopulators.forklift.konveyor.io
+spec:
+  group: forklift.konveyor.io
+  names:
+    kind: OvirtVolumePopulator
+    listKind: OvirtVolumePopulatorList
+    plural: ovirtvolumepopulators
+    shortNames:
+    - ovvp
+    - ovvps
+    singular: ovirtvolumepopulator
+  scope: Namespaced
+  versions:
+  - name: v1beta1
+    schema:
+      openAPIV3Schema:
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          metadata:
+            type: object
+          spec:
+            properties:
+              diskId:
+                type: string
+              engineSecretName:
+                type: string
+              engineUrl:
+                type: string
+              transferNetwork:
+                description: The network attachment definition that should be used
+                  for disk transfer.
+                properties:
+                  apiVersion:
+                    description: API version of the referent.
+                    type: string
+                  fieldPath:
+                    description: |-
+                      If referring to a piece of an object instead of an entire object, this string
+                      should contain a valid JSON/Go field access statement, such as desiredState.manifest.containers[2].
+                      For example, if the object reference is to a container within a pod, this would take on a value like:
+                      "spec.containers{name}" (where "name" refers to the name of the container that triggered
+                      the event) or if no container name is specified "spec.containers[2]" (container with
+                      index 2 in this pod). This syntax is chosen only to have some well-defined way of
+                      referencing a part of an object.
+                    type: string
+                  kind:
+                    description: |-
+                      Kind of the referent.
+                      More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+                    type: string
+                  name:
+                    description: |-
+                      Name of the referent.
+                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                    type: string
+                  namespace:
+                    description: |-
+                      Namespace of the referent.
+                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/
+                    type: string
+                  resourceVersion:
+                    description: |-
+                      Specific resourceVersion to which this reference is made, if any.
+                      More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency
+                    type: string
+                  uid:
+                    description: |-
+                      UID of the referent.
+                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids
+                    type: string
+                type: object
+                x-kubernetes-map-type: atomic
+            required:
+            - diskId
+            - engineSecretName
+            - engineUrl
+            type: object
+          status:
+            properties:
+              progress:
+                type: string
+            type: object
+        required:
+        - spec
+        type: object
+    served: true
+    storage: true
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.17.3
+  name: plans.forklift.konveyor.io
+spec:
+  group: forklift.konveyor.io
+  names:
+    kind: Plan
+    listKind: PlanList
+    plural: plans
+    singular: plan
+  scope: Namespaced
+  versions:
+  - additionalPrinterColumns:
+    - jsonPath: .status.conditions[?(@.type=='Ready')].status
+      name: READY
+      type: string
+    - jsonPath: .status.conditions[?(@.type=='Executing')].status
+      name: EXECUTING
+      type: string
+    - jsonPath: .status.conditions[?(@.type=='Succeeded')].status
+      name: SUCCEEDED
+      type: string
+    - jsonPath: .status.conditions[?(@.type=='Failed')].status
+      name: FAILED
+      type: string
+    - jsonPath: .metadata.creationTimestamp
+      name: AGE
+      type: date
+    name: v1beta1
+    schema:
+      openAPIV3Schema:
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: PlanSpec defines the desired state of Plan.
+            properties:
+              archived:
+                description: Whether this plan should be archived.
+                type: boolean
+              conversionTempStorageClass:
+                description: |-
+                  ConversionTempStorageClass specifies the storage class to use for temporary conversion storage.
+                  When specified, virt-v2v conversion pods will use a temporary PVC from this storage class
+                  instead of using the node's ephemeral storage for the conversion scratch space.
+                  This is useful for:
+                    - Large VM migrations (10+ TB disks) where fstrim operations create large overlays
+                    - OVA imports that require full uncompressed disk copies in temporary storage
+                    - Nodes with limited ephemeral storage that may cause pod eviction due to storage pressure
+                  The temporary PVC is automatically created and deleted with the conversion pod.
+                type: string
+              conversionTempStorageSize:
+                description: |-
+                  ConversionTempStorageSize specifies the size of the temporary conversion storage PVC.
+                  Only used when ConversionTempStorageClass is specified.
+                  User specification allows for buffer space beyond the largest disk size to accommodate:
+                    - Temporary files during conversion
+                    - Multiple concurrent conversions
+                    - OVA imports requiring full uncompressed copies
+                  Recommended minimum: size of the largest VM disk being migrated.
+                  Format: standard Kubernetes resource quantity (e.g., "30Gi", "1Ti")
+                type: string
+              convertorAffinity:
+                description: |-
+                  ConvertorAffinity allows specifying hard- and soft-affinity for virt-v2v convertor pods.
+                  This can be used to optimize placement for disk conversion performance, such as co-locating
+                  with storage or ensuring network proximity to VMware infrastructure for cold migration data transfers.
+                  See Pod Affinity documentation for more details,
+                  https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity
+                properties:
+                  nodeAffinity:
+                    description: Describes node affinity scheduling rules for the
+                      pod.
+                    properties:
+                      preferredDuringSchedulingIgnoredDuringExecution:
+                        description: |-
+                          The scheduler will prefer to schedule pods to nodes that satisfy
+                          the affinity expressions specified by this field, but it may choose
+                          a node that violates one or more of the expressions. The node that is
+                          most preferred is the one with the greatest sum of weights, i.e.
+                          for each node that meets all of the scheduling requirements (resource
+                          request, requiredDuringScheduling affinity expressions, etc.),
+                          compute a sum by iterating through the elements of this field and adding
+                          "weight" to the sum if the node matches the corresponding matchExpressions; the
+                          node(s) with the highest sum are the most preferred.
+                        items:
+                          description: |-
+                            An empty preferred scheduling term matches all objects with implicit weight 0
+                            (i.e. it's a no-op). A null preferred scheduling term matches no objects (i.e. is also a no-op).
+                          properties:
+                            preference:
+                              description: A node selector term, associated with the
+                                corresponding weight.
+                              properties:
+                                matchExpressions:
+                                  description: A list of node selector requirements
+                                    by node's labels.
+                                  items:
+                                    description: |-
+                                      A node selector requirement is a selector that contains values, a key, and an operator
+                                      that relates the key and values.
+                                    properties:
+                                      key:
+                                        description: The label key that the selector
+                                          applies to.
+                                        type: string
+                                      operator:
+                                        description: |-
+                                          Represents a key's relationship to a set of values.
+                                          Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt.
+                                        type: string
+                                      values:
+                                        description: |-
+                                          An array of string values. If the operator is In or NotIn,
+                                          the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                          the values array must be empty. If the operator is Gt or Lt, the values
+                                          array must have a single element, which will be interpreted as an integer.
+                                          This array is replaced during a strategic merge patch.
+                                        items:
+                                          type: string
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                    required:
+                                    - key
+                                    - operator
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                matchFields:
+                                  description: A list of node selector requirements
+                                    by node's fields.
+                                  items:
+                                    description: |-
+                                      A node selector requirement is a selector that contains values, a key, and an operator
+                                      that relates the key and values.
+                                    properties:
+                                      key:
+                                        description: The label key that the selector
+                                          applies to.
+                                        type: string
+                                      operator:
+                                        description: |-
+                                          Represents a key's relationship to a set of values.
+                                          Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt.
+                                        type: string
+                                      values:
+                                        description: |-
+                                          An array of string values. If the operator is In or NotIn,
+                                          the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                          the values array must be empty. If the operator is Gt or Lt, the values
+                                          array must have a single element, which will be interpreted as an integer.
+                                          This array is replaced during a strategic merge patch.
+                                        items:
+                                          type: string
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                    required:
+                                    - key
+                                    - operator
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            weight:
+                              description: Weight associated with matching the corresponding
+                                nodeSelectorTerm, in the range 1-100.
+                              format: int32
+                              type: integer
+                          required:
+                          - preference
+                          - weight
+                          type: object
+                        type: array
+                        x-kubernetes-list-type: atomic
+                      requiredDuringSchedulingIgnoredDuringExecution:
+                        description: |-
+                          If the affinity requirements specified by this field are not met at
+                          scheduling time, the pod will not be scheduled onto the node.
+                          If the affinity requirements specified by this field cease to be met
+                          at some point during pod execution (e.g. due to an update), the system
+                          may or may not try to eventually evict the pod from its node.
+                        properties:
+                          nodeSelectorTerms:
+                            description: Required. A list of node selector terms.
+                              The terms are ORed.
+                            items:
+                              description: |-
+                                A null or empty node selector term matches no objects. The requirements of
+                                them are ANDed.
+                                The TopologySelectorTerm type implements a subset of the NodeSelectorTerm.
+                              properties:
+                                matchExpressions:
+                                  description: A list of node selector requirements
+                                    by node's labels.
+                                  items:
+                                    description: |-
+                                      A node selector requirement is a selector that contains values, a key, and an operator
+                                      that relates the key and values.
+                                    properties:
+                                      key:
+                                        description: The label key that the selector
+                                          applies to.
+                                        type: string
+                                      operator:
+                                        description: |-
+                                          Represents a key's relationship to a set of values.
+                                          Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt.
+                                        type: string
+                                      values:
+                                        description: |-
+                                          An array of string values. If the operator is In or NotIn,
+                                          the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                          the values array must be empty. If the operator is Gt or Lt, the values
+                                          array must have a single element, which will be interpreted as an integer.
+                                          This array is replaced during a strategic merge patch.
+                                        items:
+                                          type: string
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                    required:
+                                    - key
+                                    - operator
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                matchFields:
+                                  description: A list of node selector requirements
+                                    by node's fields.
+                                  items:
+                                    description: |-
+                                      A node selector requirement is a selector that contains values, a key, and an operator
+                                      that relates the key and values.
+                                    properties:
+                                      key:
+                                        description: The label key that the selector
+                                          applies to.
+                                        type: string
+                                      operator:
+                                        description: |-
+                                          Represents a key's relationship to a set of values.
+                                          Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt.
+                                        type: string
+                                      values:
+                                        description: |-
+                                          An array of string values. If the operator is In or NotIn,
+                                          the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                          the values array must be empty. If the operator is Gt or Lt, the values
+                                          array must have a single element, which will be interpreted as an integer.
+                                          This array is replaced during a strategic merge patch.
+                                        items:
+                                          type: string
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                    required:
+                                    - key
+                                    - operator
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            type: array
+                            x-kubernetes-list-type: atomic
+                        required:
+                        - nodeSelectorTerms
+                        type: object
+                        x-kubernetes-map-type: atomic
+                    type: object
+                  podAffinity:
+                    description: Describes pod affinity scheduling rules (e.g. co-locate
+                      this pod in the same node, zone, etc. as some other pod(s)).
+                    properties:
+                      preferredDuringSchedulingIgnoredDuringExecution:
+                        description: |-
+                          The scheduler will prefer to schedule pods to nodes that satisfy
+                          the affinity expressions specified by this field, but it may choose
+                          a node that violates one or more of the expressions. The node that is
+                          most preferred is the one with the greatest sum of weights, i.e.
+                          for each node that meets all of the scheduling requirements (resource
+                          request, requiredDuringScheduling affinity expressions, etc.),
+                          compute a sum by iterating through the elements of this field and adding
+                          "weight" to the sum if the node has pods which matches the corresponding podAffinityTerm; the
+                          node(s) with the highest sum are the most preferred.
+                        items:
+                          description: The weights of all of the matched WeightedPodAffinityTerm
+                            fields are added per-node to find the most preferred node(s)
+                          properties:
+                            podAffinityTerm:
+                              description: Required. A pod affinity term, associated
+                                with the corresponding weight.
+                              properties:
+                                labelSelector:
+                                  description: |-
+                                    A label query over a set of resources, in this case pods.
+                                    If it's null, this PodAffinityTerm matches with no Pods.
+                                  properties:
+                                    matchExpressions:
+                                      description: matchExpressions is a list of label
+                                        selector requirements. The requirements are
+                                        ANDed.
+                                      items:
+                                        description: |-
+                                          A label selector requirement is a selector that contains values, a key, and an operator that
+                                          relates the key and values.
+                                        properties:
+                                          key:
+                                            description: key is the label key that
+                                              the selector applies to.
+                                            type: string
+                                          operator:
+                                            description: |-
+                                              operator represents a key's relationship to a set of values.
+                                              Valid operators are In, NotIn, Exists and DoesNotExist.
+                                            type: string
+                                          values:
+                                            description: |-
+                                              values is an array of string values. If the operator is In or NotIn,
+                                              the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                              the values array must be empty. This array is replaced during a strategic
+                                              merge patch.
+                                            items:
+                                              type: string
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                        required:
+                                        - key
+                                        - operator
+                                        type: object
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    matchLabels:
+                                      additionalProperties:
+                                        type: string
+                                      description: |-
+                                        matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                        map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                        operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                      type: object
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                matchLabelKeys:
+                                  description: |-
+                                    MatchLabelKeys is a set of pod label keys to select which pods will
+                                    be taken into consideration. The keys are used to lookup values from the
+                                    incoming pod labels, those key-value labels are merged with `labelSelector` as `key in (value)`
+                                    to select the group of existing pods which pods will be taken into consideration
+                                    for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+                                    pod labels will be ignored. The default value is empty.
+                                    The same key is forbidden to exist in both matchLabelKeys and labelSelector.
+                                    Also, matchLabelKeys cannot be set when labelSelector isn't set.
+                                    This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                mismatchLabelKeys:
+                                  description: |-
+                                    MismatchLabelKeys is a set of pod label keys to select which pods will
+                                    be taken into consideration. The keys are used to lookup values from the
+                                    incoming pod labels, those key-value labels are merged with `labelSelector` as `key notin (value)`
+                                    to select the group of existing pods which pods will be taken into consideration
+                                    for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+                                    pod labels will be ignored. The default value is empty.
+                                    The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
+                                    Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
+                                    This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                namespaceSelector:
+                                  description: |-
+                                    A label query over the set of namespaces that the term applies to.
+                                    The term is applied to the union of the namespaces selected by this field
+                                    and the ones listed in the namespaces field.
+                                    null selector and null or empty namespaces list means "this pod's namespace".
+                                    An empty selector ({}) matches all namespaces.
+                                  properties:
+                                    matchExpressions:
+                                      description: matchExpressions is a list of label
+                                        selector requirements. The requirements are
+                                        ANDed.
+                                      items:
+                                        description: |-
+                                          A label selector requirement is a selector that contains values, a key, and an operator that
+                                          relates the key and values.
+                                        properties:
+                                          key:
+                                            description: key is the label key that
+                                              the selector applies to.
+                                            type: string
+                                          operator:
+                                            description: |-
+                                              operator represents a key's relationship to a set of values.
+                                              Valid operators are In, NotIn, Exists and DoesNotExist.
+                                            type: string
+                                          values:
+                                            description: |-
+                                              values is an array of string values. If the operator is In or NotIn,
+                                              the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                              the values array must be empty. This array is replaced during a strategic
+                                              merge patch.
+                                            items:
+                                              type: string
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                        required:
+                                        - key
+                                        - operator
+                                        type: object
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    matchLabels:
+                                      additionalProperties:
+                                        type: string
+                                      description: |-
+                                        matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                        map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                        operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                      type: object
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                namespaces:
+                                  description: |-
+                                    namespaces specifies a static list of namespace names that the term applies to.
+                                    The term is applied to the union of the namespaces listed in this field
+                                    and the ones selected by namespaceSelector.
+                                    null or empty namespaces list and null namespaceSelector means "this pod's namespace".
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                topologyKey:
+                                  description: |-
+                                    This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching
+                                    the labelSelector in the specified namespaces, where co-located is defined as running on a node
+                                    whose value of the label with key topologyKey matches that of any node on which any of the
+                                    selected pods is running.
+                                    Empty topologyKey is not allowed.
+                                  type: string
+                              required:
+                              - topologyKey
+                              type: object
+                            weight:
+                              description: |-
+                                weight associated with matching the corresponding podAffinityTerm,
+                                in the range 1-100.
+                              format: int32
+                              type: integer
+                          required:
+                          - podAffinityTerm
+                          - weight
+                          type: object
+                        type: array
+                        x-kubernetes-list-type: atomic
+                      requiredDuringSchedulingIgnoredDuringExecution:
+                        description: |-
+                          If the affinity requirements specified by this field are not met at
+                          scheduling time, the pod will not be scheduled onto the node.
+                          If the affinity requirements specified by this field cease to be met
+                          at some point during pod execution (e.g. due to a pod label update), the
+                          system may or may not try to eventually evict the pod from its node.
+                          When there are multiple elements, the lists of nodes corresponding to each
+                          podAffinityTerm are intersected, i.e. all terms must be satisfied.
+                        items:
+                          description: |-
+                            Defines a set of pods (namely those matching the labelSelector
+                            relative to the given namespace(s)) that this pod should be
+                            co-located (affinity) or not co-located (anti-affinity) with,
+                            where co-located is defined as running on a node whose value of
+                            the label with key <topologyKey> matches that of any node on which
+                            a pod of the set of pods is running
+                          properties:
+                            labelSelector:
+                              description: |-
+                                A label query over a set of resources, in this case pods.
+                                If it's null, this PodAffinityTerm matches with no Pods.
+                              properties:
+                                matchExpressions:
+                                  description: matchExpressions is a list of label
+                                    selector requirements. The requirements are ANDed.
+                                  items:
+                                    description: |-
+                                      A label selector requirement is a selector that contains values, a key, and an operator that
+                                      relates the key and values.
+                                    properties:
+                                      key:
+                                        description: key is the label key that the
+                                          selector applies to.
+                                        type: string
+                                      operator:
+                                        description: |-
+                                          operator represents a key's relationship to a set of values.
+                                          Valid operators are In, NotIn, Exists and DoesNotExist.
+                                        type: string
+                                      values:
+                                        description: |-
+                                          values is an array of string values. If the operator is In or NotIn,
+                                          the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                          the values array must be empty. This array is replaced during a strategic
+                                          merge patch.
+                                        items:
+                                          type: string
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                    required:
+                                    - key
+                                    - operator
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                matchLabels:
+                                  additionalProperties:
+                                    type: string
+                                  description: |-
+                                    matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                    map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                    operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                  type: object
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            matchLabelKeys:
+                              description: |-
+                                MatchLabelKeys is a set of pod label keys to select which pods will
+                                be taken into consideration. The keys are used to lookup values from the
+                                incoming pod labels, those key-value labels are merged with `labelSelector` as `key in (value)`
+                                to select the group of existing pods which pods will be taken into consideration
+                                for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+                                pod labels will be ignored. The default value is empty.
+                                The same key is forbidden to exist in both matchLabelKeys and labelSelector.
+                                Also, matchLabelKeys cannot be set when labelSelector isn't set.
+                                This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
+                              items:
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            mismatchLabelKeys:
+                              description: |-
+                                MismatchLabelKeys is a set of pod label keys to select which pods will
+                                be taken into consideration. The keys are used to lookup values from the
+                                incoming pod labels, those key-value labels are merged with `labelSelector` as `key notin (value)`
+                                to select the group of existing pods which pods will be taken into consideration
+                                for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+                                pod labels will be ignored. The default value is empty.
+                                The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
+                                Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
+                                This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
+                              items:
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            namespaceSelector:
+                              description: |-
+                                A label query over the set of namespaces that the term applies to.
+                                The term is applied to the union of the namespaces selected by this field
+                                and the ones listed in the namespaces field.
+                                null selector and null or empty namespaces list means "this pod's namespace".
+                                An empty selector ({}) matches all namespaces.
+                              properties:
+                                matchExpressions:
+                                  description: matchExpressions is a list of label
+                                    selector requirements. The requirements are ANDed.
+                                  items:
+                                    description: |-
+                                      A label selector requirement is a selector that contains values, a key, and an operator that
+                                      relates the key and values.
+                                    properties:
+                                      key:
+                                        description: key is the label key that the
+                                          selector applies to.
+                                        type: string
+                                      operator:
+                                        description: |-
+                                          operator represents a key's relationship to a set of values.
+                                          Valid operators are In, NotIn, Exists and DoesNotExist.
+                                        type: string
+                                      values:
+                                        description: |-
+                                          values is an array of string values. If the operator is In or NotIn,
+                                          the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                          the values array must be empty. This array is replaced during a strategic
+                                          merge patch.
+                                        items:
+                                          type: string
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                    required:
+                                    - key
+                                    - operator
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                matchLabels:
+                                  additionalProperties:
+                                    type: string
+                                  description: |-
+                                    matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                    map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                    operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                  type: object
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            namespaces:
+                              description: |-
+                                namespaces specifies a static list of namespace names that the term applies to.
+                                The term is applied to the union of the namespaces listed in this field
+                                and the ones selected by namespaceSelector.
+                                null or empty namespaces list and null namespaceSelector means "this pod's namespace".
+                              items:
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            topologyKey:
+                              description: |-
+                                This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching
+                                the labelSelector in the specified namespaces, where co-located is defined as running on a node
+                                whose value of the label with key topologyKey matches that of any node on which any of the
+                                selected pods is running.
+                                Empty topologyKey is not allowed.
+                              type: string
+                          required:
+                          - topologyKey
+                          type: object
+                        type: array
+                        x-kubernetes-list-type: atomic
+                    type: object
+                  podAntiAffinity:
+                    description: Describes pod anti-affinity scheduling rules (e.g.
+                      avoid putting this pod in the same node, zone, etc. as some
+                      other pod(s)).
+                    properties:
+                      preferredDuringSchedulingIgnoredDuringExecution:
+                        description: |-
+                          The scheduler will prefer to schedule pods to nodes that satisfy
+                          the anti-affinity expressions specified by this field, but it may choose
+                          a node that violates one or more of the expressions. The node that is
+                          most preferred is the one with the greatest sum of weights, i.e.
+                          for each node that meets all of the scheduling requirements (resource
+                          request, requiredDuringScheduling anti-affinity expressions, etc.),
+                          compute a sum by iterating through the elements of this field and adding
+                          "weight" to the sum if the node has pods which matches the corresponding podAffinityTerm; the
+                          node(s) with the highest sum are the most preferred.
+                        items:
+                          description: The weights of all of the matched WeightedPodAffinityTerm
+                            fields are added per-node to find the most preferred node(s)
+                          properties:
+                            podAffinityTerm:
+                              description: Required. A pod affinity term, associated
+                                with the corresponding weight.
+                              properties:
+                                labelSelector:
+                                  description: |-
+                                    A label query over a set of resources, in this case pods.
+                                    If it's null, this PodAffinityTerm matches with no Pods.
+                                  properties:
+                                    matchExpressions:
+                                      description: matchExpressions is a list of label
+                                        selector requirements. The requirements are
+                                        ANDed.
+                                      items:
+                                        description: |-
+                                          A label selector requirement is a selector that contains values, a key, and an operator that
+                                          relates the key and values.
+                                        properties:
+                                          key:
+                                            description: key is the label key that
+                                              the selector applies to.
+                                            type: string
+                                          operator:
+                                            description: |-
+                                              operator represents a key's relationship to a set of values.
+                                              Valid operators are In, NotIn, Exists and DoesNotExist.
+                                            type: string
+                                          values:
+                                            description: |-
+                                              values is an array of string values. If the operator is In or NotIn,
+                                              the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                              the values array must be empty. This array is replaced during a strategic
+                                              merge patch.
+                                            items:
+                                              type: string
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                        required:
+                                        - key
+                                        - operator
+                                        type: object
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    matchLabels:
+                                      additionalProperties:
+                                        type: string
+                                      description: |-
+                                        matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                        map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                        operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                      type: object
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                matchLabelKeys:
+                                  description: |-
+                                    MatchLabelKeys is a set of pod label keys to select which pods will
+                                    be taken into consideration. The keys are used to lookup values from the
+                                    incoming pod labels, those key-value labels are merged with `labelSelector` as `key in (value)`
+                                    to select the group of existing pods which pods will be taken into consideration
+                                    for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+                                    pod labels will be ignored. The default value is empty.
+                                    The same key is forbidden to exist in both matchLabelKeys and labelSelector.
+                                    Also, matchLabelKeys cannot be set when labelSelector isn't set.
+                                    This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                mismatchLabelKeys:
+                                  description: |-
+                                    MismatchLabelKeys is a set of pod label keys to select which pods will
+                                    be taken into consideration. The keys are used to lookup values from the
+                                    incoming pod labels, those key-value labels are merged with `labelSelector` as `key notin (value)`
+                                    to select the group of existing pods which pods will be taken into consideration
+                                    for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+                                    pod labels will be ignored. The default value is empty.
+                                    The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
+                                    Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
+                                    This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                namespaceSelector:
+                                  description: |-
+                                    A label query over the set of namespaces that the term applies to.
+                                    The term is applied to the union of the namespaces selected by this field
+                                    and the ones listed in the namespaces field.
+                                    null selector and null or empty namespaces list means "this pod's namespace".
+                                    An empty selector ({}) matches all namespaces.
+                                  properties:
+                                    matchExpressions:
+                                      description: matchExpressions is a list of label
+                                        selector requirements. The requirements are
+                                        ANDed.
+                                      items:
+                                        description: |-
+                                          A label selector requirement is a selector that contains values, a key, and an operator that
+                                          relates the key and values.
+                                        properties:
+                                          key:
+                                            description: key is the label key that
+                                              the selector applies to.
+                                            type: string
+                                          operator:
+                                            description: |-
+                                              operator represents a key's relationship to a set of values.
+                                              Valid operators are In, NotIn, Exists and DoesNotExist.
+                                            type: string
+                                          values:
+                                            description: |-
+                                              values is an array of string values. If the operator is In or NotIn,
+                                              the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                              the values array must be empty. This array is replaced during a strategic
+                                              merge patch.
+                                            items:
+                                              type: string
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                        required:
+                                        - key
+                                        - operator
+                                        type: object
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    matchLabels:
+                                      additionalProperties:
+                                        type: string
+                                      description: |-
+                                        matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                        map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                        operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                      type: object
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                namespaces:
+                                  description: |-
+                                    namespaces specifies a static list of namespace names that the term applies to.
+                                    The term is applied to the union of the namespaces listed in this field
+                                    and the ones selected by namespaceSelector.
+                                    null or empty namespaces list and null namespaceSelector means "this pod's namespace".
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                topologyKey:
+                                  description: |-
+                                    This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching
+                                    the labelSelector in the specified namespaces, where co-located is defined as running on a node
+                                    whose value of the label with key topologyKey matches that of any node on which any of the
+                                    selected pods is running.
+                                    Empty topologyKey is not allowed.
+                                  type: string
+                              required:
+                              - topologyKey
+                              type: object
+                            weight:
+                              description: |-
+                                weight associated with matching the corresponding podAffinityTerm,
+                                in the range 1-100.
+                              format: int32
+                              type: integer
+                          required:
+                          - podAffinityTerm
+                          - weight
+                          type: object
+                        type: array
+                        x-kubernetes-list-type: atomic
+                      requiredDuringSchedulingIgnoredDuringExecution:
+                        description: |-
+                          If the anti-affinity requirements specified by this field are not met at
+                          scheduling time, the pod will not be scheduled onto the node.
+                          If the anti-affinity requirements specified by this field cease to be met
+                          at some point during pod execution (e.g. due to a pod label update), the
+                          system may or may not try to eventually evict the pod from its node.
+                          When there are multiple elements, the lists of nodes corresponding to each
+                          podAffinityTerm are intersected, i.e. all terms must be satisfied.
+                        items:
+                          description: |-
+                            Defines a set of pods (namely those matching the labelSelector
+                            relative to the given namespace(s)) that this pod should be
+                            co-located (affinity) or not co-located (anti-affinity) with,
+                            where co-located is defined as running on a node whose value of
+                            the label with key <topologyKey> matches that of any node on which
+                            a pod of the set of pods is running
+                          properties:
+                            labelSelector:
+                              description: |-
+                                A label query over a set of resources, in this case pods.
+                                If it's null, this PodAffinityTerm matches with no Pods.
+                              properties:
+                                matchExpressions:
+                                  description: matchExpressions is a list of label
+                                    selector requirements. The requirements are ANDed.
+                                  items:
+                                    description: |-
+                                      A label selector requirement is a selector that contains values, a key, and an operator that
+                                      relates the key and values.
+                                    properties:
+                                      key:
+                                        description: key is the label key that the
+                                          selector applies to.
+                                        type: string
+                                      operator:
+                                        description: |-
+                                          operator represents a key's relationship to a set of values.
+                                          Valid operators are In, NotIn, Exists and DoesNotExist.
+                                        type: string
+                                      values:
+                                        description: |-
+                                          values is an array of string values. If the operator is In or NotIn,
+                                          the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                          the values array must be empty. This array is replaced during a strategic
+                                          merge patch.
+                                        items:
+                                          type: string
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                    required:
+                                    - key
+                                    - operator
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                matchLabels:
+                                  additionalProperties:
+                                    type: string
+                                  description: |-
+                                    matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                    map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                    operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                  type: object
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            matchLabelKeys:
+                              description: |-
+                                MatchLabelKeys is a set of pod label keys to select which pods will
+                                be taken into consideration. The keys are used to lookup values from the
+                                incoming pod labels, those key-value labels are merged with `labelSelector` as `key in (value)`
+                                to select the group of existing pods which pods will be taken into consideration
+                                for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+                                pod labels will be ignored. The default value is empty.
+                                The same key is forbidden to exist in both matchLabelKeys and labelSelector.
+                                Also, matchLabelKeys cannot be set when labelSelector isn't set.
+                                This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
+                              items:
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            mismatchLabelKeys:
+                              description: |-
+                                MismatchLabelKeys is a set of pod label keys to select which pods will
+                                be taken into consideration. The keys are used to lookup values from the
+                                incoming pod labels, those key-value labels are merged with `labelSelector` as `key notin (value)`
+                                to select the group of existing pods which pods will be taken into consideration
+                                for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+                                pod labels will be ignored. The default value is empty.
+                                The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
+                                Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
+                                This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
+                              items:
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            namespaceSelector:
+                              description: |-
+                                A label query over the set of namespaces that the term applies to.
+                                The term is applied to the union of the namespaces selected by this field
+                                and the ones listed in the namespaces field.
+                                null selector and null or empty namespaces list means "this pod's namespace".
+                                An empty selector ({}) matches all namespaces.
+                              properties:
+                                matchExpressions:
+                                  description: matchExpressions is a list of label
+                                    selector requirements. The requirements are ANDed.
+                                  items:
+                                    description: |-
+                                      A label selector requirement is a selector that contains values, a key, and an operator that
+                                      relates the key and values.
+                                    properties:
+                                      key:
+                                        description: key is the label key that the
+                                          selector applies to.
+                                        type: string
+                                      operator:
+                                        description: |-
+                                          operator represents a key's relationship to a set of values.
+                                          Valid operators are In, NotIn, Exists and DoesNotExist.
+                                        type: string
+                                      values:
+                                        description: |-
+                                          values is an array of string values. If the operator is In or NotIn,
+                                          the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                          the values array must be empty. This array is replaced during a strategic
+                                          merge patch.
+                                        items:
+                                          type: string
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                    required:
+                                    - key
+                                    - operator
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                matchLabels:
+                                  additionalProperties:
+                                    type: string
+                                  description: |-
+                                    matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                    map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                    operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                  type: object
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            namespaces:
+                              description: |-
+                                namespaces specifies a static list of namespace names that the term applies to.
+                                The term is applied to the union of the namespaces listed in this field
+                                and the ones selected by namespaceSelector.
+                                null or empty namespaces list and null namespaceSelector means "this pod's namespace".
+                              items:
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            topologyKey:
+                              description: |-
+                                This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching
+                                the labelSelector in the specified namespaces, where co-located is defined as running on a node
+                                whose value of the label with key topologyKey matches that of any node on which any of the
+                                selected pods is running.
+                                Empty topologyKey is not allowed.
+                              type: string
+                          required:
+                          - topologyKey
+                          type: object
+                        type: array
+                        x-kubernetes-list-type: atomic
+                    type: object
+                type: object
+                x-kubernetes-map-type: atomic
+              convertorLabels:
+                additionalProperties:
+                  type: string
+                description: |-
+                  ConvertorLabels are labels that should be applied to the virt-v2v convertor pods.
+                  The convertor pods run virt-v2v to convert VMware disks, install KVM guest agents and drivers,
+                  and handle disk data migration for cold migrations from VMware to KubeVirt.
+                  Note: System-managed labels (migration, plan, vmID, forklift.app) will override any user-defined
+                  labels with the same keys to ensure proper system functionality.
+                  See Pod Labels documentation for more details,
+                  https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/#labels
+                type: object
+              convertorNodeSelector:
+                additionalProperties:
+                  type: string
+                description: |-
+                  ConvertorNodeSelector constrains the scheduler to only schedule virt-v2v convertor pods on nodes
+                  which contain the specified labels. This is useful for dedicating specific nodes for disk conversion
+                  workloads that require high I/O performance or network access to source VMware infrastructure.
+                  See Pod NodeSelector documentation for more details,
+                  https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector
+                type: object
+              customizationScripts:
+                description: |-
+                  CustomizationScripts references a ConfigMap containing customization scripts
+                  to run during guest conversion. The ConfigMap must exist in the specified
+                  namespace and contain script files with keys following these patterns:
+                    - Windows: [0-9]+_win_firstboot_[description_text].ps1
+                    - Linux: [0-9]+_linux_(run|firstboot)_[description_text].sh
+                  Scripts are mounted at /mnt/dynamic_scripts in the conversion pod and
+                  executed by virt-customize. The number at the start of the key determines the
+                  execution order. If not specified, no custom scripts are injected.
+                properties:
+                  apiVersion:
+                    description: API version of the referent.
+                    type: string
+                  fieldPath:
+                    description: |-
+                      If referring to a piece of an object instead of an entire object, this string
+                      should contain a valid JSON/Go field access statement, such as desiredState.manifest.containers[2].
+                      For example, if the object reference is to a container within a pod, this would take on a value like:
+                      "spec.containers{name}" (where "name" refers to the name of the container that triggered
+                      the event) or if no container name is specified "spec.containers[2]" (container with
+                      index 2 in this pod). This syntax is chosen only to have some well-defined way of
+                      referencing a part of an object.
+                    type: string
+                  kind:
+                    description: |-
+                      Kind of the referent.
+                      More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+                    type: string
+                  name:
+                    description: |-
+                      Name of the referent.
+                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                    type: string
+                  namespace:
+                    description: |-
+                      Namespace of the referent.
+                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/
+                    type: string
+                  resourceVersion:
+                    description: |-
+                      Specific resourceVersion to which this reference is made, if any.
+                      More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency
+                    type: string
+                  uid:
+                    description: |-
+                      UID of the referent.
+                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids
+                    type: string
+                type: object
+                x-kubernetes-map-type: atomic
+              deleteGuestConversionPod:
+                description: |-
+                  DeleteGuestConversionPod determines if the guest conversion pod should be deleted after successful migration.
+                  Note:
+                    - If this option is enabled and migration succeeds then the pod will get deleted. However the VM could still not boot and the virt-v2v logs, with additional information, will be deleted alongside guest conversion pod.
+                    - If migration fails the conversion pod will remain present even if this option is enabled.
+                type: boolean
+              deleteVmOnFailMigration:
+                default: true
+                description: |-
+                  DeleteVmOnFailMigration controls whether the target VM created by this Plan is deleted when a migration fails.
+                  When true and the migration fails after the target VM has been created, the controller
+                  will delete the target VM (and related target-side resources) during failed-migration cleanup
+                  and when the Plan is deleted. When false (default), the target VM is preserved to aid
+                  troubleshooting. The source VM is never modified.
+
+                  Note: If the Plan-level option is set to true, the VM-level option will be ignored.
+                type: boolean
+              description:
+                description: Description
+                type: string
+              diskBus:
+                description: 'Deprecated: this field will be deprecated in 2.8.'
+                type: string
+              enableNestedVirtualization:
+                description: |-
+                  EnableNestedVirtualization controls whether nested virtualization (vmx/svm CPU features)
+                  is enabled on the target VM.
+                  - nil (default): Auto-detect from source VM settings
+                  - true: Force enable nested virtualization on the target VM regardless of source settings
+                  - false: Force disable nested virtualization on the target VM regardless of source settings
+                type: boolean
+              installLegacyDrivers:
+                description: |-
+                  InstallLegacyDrivers determines whether to install legacy windows drivers in the VM.
+                  The following Vm's are lack of SHA-2 support and need legacy drivers:
+                  Windows XP (all)
+                  Windows Server 2003
+                  Windows Vista (all)
+                  Windows Server 2008
+                  Windows 7 (pre-SP1)
+                  Windows Server 2008 R2
+                  Behavior:
+                  - If set to nil (unset), the system will automatically detect whether the VM requires legacy drivers
+                    based on its guest OS type (using IsLegacyWindows).
+                  - If set to true, legacy drivers will be installed unconditionally by setting the VIRTIO_WIN environment variable.
+                  - If set to false, legacy drivers will be skipped, and the system will fall back to using the standard (SHA-2 signed) drivers.
+
+                  When enabled, legacy drivers are exposed to the virt-v2v conversion process via the VIRTIO_WIN environment variable,
+                  which points to the legacy ISO at /usr/local/virtio-win-legacy.iso.
+                type: boolean
+              map:
+                description: Resource mapping.
+                properties:
+                  network:
+                    description: Network.
+                    properties:
+                      apiVersion:
+                        description: API version of the referent.
+                        type: string
+                      fieldPath:
+                        description: |-
+                          If referring to a piece of an object instead of an entire object, this string
+                          should contain a valid JSON/Go field access statement, such as desiredState.manifest.containers[2].
+                          For example, if the object reference is to a container within a pod, this would take on a value like:
+                          "spec.containers{name}" (where "name" refers to the name of the container that triggered
+                          the event) or if no container name is specified "spec.containers[2]" (container with
+                          index 2 in this pod). This syntax is chosen only to have some well-defined way of
+                          referencing a part of an object.
+                        type: string
+                      kind:
+                        description: |-
+                          Kind of the referent.
+                          More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+                        type: string
+                      name:
+                        description: |-
+                          Name of the referent.
+                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                        type: string
+                      namespace:
+                        description: |-
+                          Namespace of the referent.
+                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/
+                        type: string
+                      resourceVersion:
+                        description: |-
+                          Specific resourceVersion to which this reference is made, if any.
+                          More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency
+                        type: string
+                      uid:
+                        description: |-
+                          UID of the referent.
+                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids
+                        type: string
+                    type: object
+                    x-kubernetes-map-type: atomic
+                  storage:
+                    description: Storage.
+                    properties:
+                      apiVersion:
+                        description: API version of the referent.
+                        type: string
+                      fieldPath:
+                        description: |-
+                          If referring to a piece of an object instead of an entire object, this string
+                          should contain a valid JSON/Go field access statement, such as desiredState.manifest.containers[2].
+                          For example, if the object reference is to a container within a pod, this would take on a value like:
+                          "spec.containers{name}" (where "name" refers to the name of the container that triggered
+                          the event) or if no container name is specified "spec.containers[2]" (container with
+                          index 2 in this pod). This syntax is chosen only to have some well-defined way of
+                          referencing a part of an object.
+                        type: string
+                      kind:
+                        description: |-
+                          Kind of the referent.
+                          More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+                        type: string
+                      name:
+                        description: |-
+                          Name of the referent.
+                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                        type: string
+                      namespace:
+                        description: |-
+                          Namespace of the referent.
+                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/
+                        type: string
+                      resourceVersion:
+                        description: |-
+                          Specific resourceVersion to which this reference is made, if any.
+                          More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency
+                        type: string
+                      uid:
+                        description: |-
+                          UID of the referent.
+                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids
+                        type: string
+                    type: object
+                    x-kubernetes-map-type: atomic
+                required:
+                - network
+                - storage
+                type: object
+              migrateSharedDisks:
+                default: true
+                description: Determines if the plan should migrate shared disks.
+                type: boolean
+              networkNameTemplate:
+                description: |-
+                  NetworkNameTemplate is a template for generating network interface names in the target virtual machine.
+                  It follows Go template syntax and has access to the following variables:
+                    - .NetworkName: If target network is multus, name of the Multus network attachment definition, empty otherwise.
+                    - .NetworkNamespace: If target network is multus, namespace where the network attachment definition is located.
+                    - .NetworkType: type of the network ("Multus" or "Pod")
+                    - .NetworkIndex: sequential index of the network interface (0-based)
+                  The template can be used to customize network interface names based on target network configuration.
+
+                  Provider support:
+                    - VMware (vSphere): Supported. Network interface names can be customized.
+                    - OpenShift: Not supported. Network interface names are preserved from the source VM.
+
+                  Note:
+                    - This template can be overridden at the individual VM level
+                    - If not specified on VM level and on Plan level, default naming conventions will be used
+                  Examples:
+                    "net-{{`{{`}}.NetworkIndex{{`}}`}}"
+                    "{{`{{`}}if eq .NetworkType "Pod"{{`}}`}}pod{{`{{`}}else{{`}}`}}multus-{{`{{`}}.NetworkIndex{{`}}`}}{{`{{`}}end{{`}}`}}"
+                type: string
+              preserveClusterCpuModel:
+                description: Preserve the CPU model and flags the VM runs with in
+                  its oVirt cluster.
+                type: boolean
+              preserveStaticIPs:
+                default: true
+                description: Preserve static IPs of VMs in vSphere
+                type: boolean
+              provider:
+                description: Providers.
+                properties:
+                  destination:
+                    description: Destination.
+                    properties:
+                      apiVersion:
+                        description: API version of the referent.
+                        type: string
+                      fieldPath:
+                        description: |-
+                          If referring to a piece of an object instead of an entire object, this string
+                          should contain a valid JSON/Go field access statement, such as desiredState.manifest.containers[2].
+                          For example, if the object reference is to a container within a pod, this would take on a value like:
+                          "spec.containers{name}" (where "name" refers to the name of the container that triggered
+                          the event) or if no container name is specified "spec.containers[2]" (container with
+                          index 2 in this pod). This syntax is chosen only to have some well-defined way of
+                          referencing a part of an object.
+                        type: string
+                      kind:
+                        description: |-
+                          Kind of the referent.
+                          More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+                        type: string
+                      name:
+                        description: |-
+                          Name of the referent.
+                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                        type: string
+                      namespace:
+                        description: |-
+                          Namespace of the referent.
+                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/
+                        type: string
+                      resourceVersion:
+                        description: |-
+                          Specific resourceVersion to which this reference is made, if any.
+                          More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency
+                        type: string
+                      uid:
+                        description: |-
+                          UID of the referent.
+                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids
+                        type: string
+                    type: object
+                    x-kubernetes-map-type: atomic
+                  source:
+                    description: Source.
+                    properties:
+                      apiVersion:
+                        description: API version of the referent.
+                        type: string
+                      fieldPath:
+                        description: |-
+                          If referring to a piece of an object instead of an entire object, this string
+                          should contain a valid JSON/Go field access statement, such as desiredState.manifest.containers[2].
+                          For example, if the object reference is to a container within a pod, this would take on a value like:
+                          "spec.containers{name}" (where "name" refers to the name of the container that triggered
+                          the event) or if no container name is specified "spec.containers[2]" (container with
+                          index 2 in this pod). This syntax is chosen only to have some well-defined way of
+                          referencing a part of an object.
+                        type: string
+                      kind:
+                        description: |-
+                          Kind of the referent.
+                          More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+                        type: string
+                      name:
+                        description: |-
+                          Name of the referent.
+                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                        type: string
+                      namespace:
+                        description: |-
+                          Namespace of the referent.
+                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/
+                        type: string
+                      resourceVersion:
+                        description: |-
+                          Specific resourceVersion to which this reference is made, if any.
+                          More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency
+                        type: string
+                      uid:
+                        description: |-
+                          UID of the referent.
+                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids
+                        type: string
+                    type: object
+                    x-kubernetes-map-type: atomic
+                required:
+                - destination
+                - source
+                type: object
+              pvcNameTemplate:
+                description: "PVCNameTemplate is a template for generating PVC names
+                  for VM disks.\nGenerated names must be valid DNS-1123 labels (lowercase
+                  alphanumerics, '-' allowed, max 63 chars).\nIt follows Go template
+                  syntax and has access to provider-specific variables.\n\nCommon
+                  variables (all providers):\n  - .VmName: name of the VM in the source
+                  cluster (original source name)\n  - .TargetVmName: final VM name
+                  in the target cluster (may equal .VmName if no rename/normalization)\n
+                  \ - .PlanName: name of the migration plan\n  - .DiskIndex: initial
+                  volume index of the disk\n\nVMware (vSphere) specific variables:\n
+                  \ - .WinDriveLetter: Windows drive letter (lowercase, if applicable,
+                  e.g. \"c\", requires guest agent)\n  - .RootDiskIndex: index of
+                  the root disk\n  - .Shared: true if the volume is shared by multiple
+                  VMs, false otherwise\n  - .FileName: name of the file in the source
+                  provider (filename includes the .vmdk suffix)\n\nOpenShift specific
+                  variables:\n  - .SourcePVCName: name of the PVC in the source cluster\n
+                  \ - .SourcePVCNamespace: namespace of the PVC in the source cluster\n\nDefault
+                  behavior when not set:\n  - VMware: generates names like \"{{`{{`}}trunc
+                  4 .PlanName{{`}}`}}-{{`{{`}}trunc 4 .VmName{{`}}`}}-disk-{{`{{`}}.DiskIndex{{`}}`}}\"\n  - OpenShift:
+                  uses the original source PVC name (\"{{`{{`}}.SourcePVCName{{`}}`}}\")\n\nNote:\n
+                  \ This template can be overridden at the individual VM level.\nExamples:\n
+                  \ \"{{`{{`}}.TargetVmName{{`}}`}}-disk-{{`{{`}}.DiskIndex{{`}}`}}\"\n  \"{{`{{`}}if eq .DiskIndex
+                  .RootDiskIndex{{`}}`}}root{{`{{`}}else{{`}}`}}data{{`{{`}}end{{`}}`}}-{{`{{`}}.DiskIndex{{`}}`}}\" (VMware)\n
+                  \ \"{{`{{`}}.TargetVmName{{`}}`}}-{{`{{`}}.SourcePVCName{{`}}`}}\" (OpenShift)\nSee:\n\t
+                  https://github.com/kubev2v/forklift/tree/main/pkg/templateutil for
+                  template functions."
+                type: string
+              pvcNameTemplateUseGenerateName:
+                default: true
+                description: |-
+                  PVCNameTemplateUseGenerateName indicates if the PVC name template should use generateName instead of name.
+                  This field controls whether the template output is used as an exact name or as a prefix for generated names.
+
+                  Provider-specific behavior:
+
+                  VMware (vSphere):
+                    - true (default): Template output is used as generateName prefix, Kubernetes adds a random suffix
+                      (e.g., "my-vm-disk-0-" becomes "my-vm-disk-0-abc12")
+                    - false: Template output is used as the exact PVC name
+                      **DANGER**: May cause conflicts if the generated name is not unique
+
+                  OpenShift:
+                    - This field is ignored. The template output is always used as the exact PVC name.
+                    - Default template "{{`{{`}}.SourcePVCName{{`}}`}}" preserves source PVC names which are typically unique.
+                type: boolean
+              rdmAsLun:
+                description: |-
+                  RDMAsLun controls whether RDM (Raw Device Mapping) disks from VMware should be
+                  mapped as LUN devices in the target KubeVirt VM instead of regular disk devices.
+                  When true, RDM disks are attached using lun: {} which allows the guest to execute
+                  arbitrary SCSI command passthrough (SGIO).
+                  This is useful when the source VM uses RDM disks for applications that require
+                  direct SCSI access, such as shared storage clusters or database applications.
+                type: boolean
+              runPreflightInspection:
+                default: true
+                description: |-
+                  RunPreflightInspection controls whether an inspection step on VM base disks is performed before starting the first disk transfer. Applies only to warm migrations from VMWare.
+                  - true (default): Inspection step runs before transferring any disks and may fail if it detects the migration would fail.
+                  - false: No inspection is performed before disk transfer.
+                type: boolean
+              serviceAccount:
+                description: |-
+                  ServiceAccount is the name of the ServiceAccount to use for migration
+                  pods in the target namespace. Overrides the global setting.
+                  If empty, falls back to ForkliftController's controller_migration_service_account,
+                  then to the namespace default.
+                maxLength: 253
+                pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                type: string
+              skipGuestConversion:
+                default: false
+                description: Determines if the plan should skip the guest conversion.
+                type: boolean
+              skipZoneNodeSelector:
+                description: |-
+                  SkipZoneNodeSelector controls whether to skip adding a zone-based node selector to
+                  migrated VMs. By default, the migration automatically reads the availability zone from
+                  the source provider's spec.settings.target-az configuration and adds a node selector
+                  (topology.kubernetes.io/zone=<target-az>) to the target VM. This ensures VMs are
+                  scheduled on nodes in the same zone as their EBS volumes, which is required for
+                  volume attachment by the CSI driver.
+                  Currently supported for EC2 provider only.
+                  - false (default): Add zone-based node selector using value from provider's spec.settings.target-az
+                  - true: Skip adding zone-based node selector
+                type: boolean
+              targetAffinity:
+                description: |-
+                  TargetAffinity allows specifying hard- and soft-affinity for VMs.
+                  it is possible to write matching rules against workloads (VMs and Pods) and Nodes.
+                  Since VMs are a workload type based on Pods, Pod-affinity affects VMs as well.
+                  See virtual machine instance Affinity documentation for more details,
+                  https://kubevirt.io/user-guide/compute/node_assignment/#affinity-and-anti-affinity
+                properties:
+                  nodeAffinity:
+                    description: Describes node affinity scheduling rules for the
+                      pod.
+                    properties:
+                      preferredDuringSchedulingIgnoredDuringExecution:
+                        description: |-
+                          The scheduler will prefer to schedule pods to nodes that satisfy
+                          the affinity expressions specified by this field, but it may choose
+                          a node that violates one or more of the expressions. The node that is
+                          most preferred is the one with the greatest sum of weights, i.e.
+                          for each node that meets all of the scheduling requirements (resource
+                          request, requiredDuringScheduling affinity expressions, etc.),
+                          compute a sum by iterating through the elements of this field and adding
+                          "weight" to the sum if the node matches the corresponding matchExpressions; the
+                          node(s) with the highest sum are the most preferred.
+                        items:
+                          description: |-
+                            An empty preferred scheduling term matches all objects with implicit weight 0
+                            (i.e. it's a no-op). A null preferred scheduling term matches no objects (i.e. is also a no-op).
+                          properties:
+                            preference:
+                              description: A node selector term, associated with the
+                                corresponding weight.
+                              properties:
+                                matchExpressions:
+                                  description: A list of node selector requirements
+                                    by node's labels.
+                                  items:
+                                    description: |-
+                                      A node selector requirement is a selector that contains values, a key, and an operator
+                                      that relates the key and values.
+                                    properties:
+                                      key:
+                                        description: The label key that the selector
+                                          applies to.
+                                        type: string
+                                      operator:
+                                        description: |-
+                                          Represents a key's relationship to a set of values.
+                                          Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt.
+                                        type: string
+                                      values:
+                                        description: |-
+                                          An array of string values. If the operator is In or NotIn,
+                                          the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                          the values array must be empty. If the operator is Gt or Lt, the values
+                                          array must have a single element, which will be interpreted as an integer.
+                                          This array is replaced during a strategic merge patch.
+                                        items:
+                                          type: string
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                    required:
+                                    - key
+                                    - operator
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                matchFields:
+                                  description: A list of node selector requirements
+                                    by node's fields.
+                                  items:
+                                    description: |-
+                                      A node selector requirement is a selector that contains values, a key, and an operator
+                                      that relates the key and values.
+                                    properties:
+                                      key:
+                                        description: The label key that the selector
+                                          applies to.
+                                        type: string
+                                      operator:
+                                        description: |-
+                                          Represents a key's relationship to a set of values.
+                                          Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt.
+                                        type: string
+                                      values:
+                                        description: |-
+                                          An array of string values. If the operator is In or NotIn,
+                                          the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                          the values array must be empty. If the operator is Gt or Lt, the values
+                                          array must have a single element, which will be interpreted as an integer.
+                                          This array is replaced during a strategic merge patch.
+                                        items:
+                                          type: string
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                    required:
+                                    - key
+                                    - operator
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            weight:
+                              description: Weight associated with matching the corresponding
+                                nodeSelectorTerm, in the range 1-100.
+                              format: int32
+                              type: integer
+                          required:
+                          - preference
+                          - weight
+                          type: object
+                        type: array
+                        x-kubernetes-list-type: atomic
+                      requiredDuringSchedulingIgnoredDuringExecution:
+                        description: |-
+                          If the affinity requirements specified by this field are not met at
+                          scheduling time, the pod will not be scheduled onto the node.
+                          If the affinity requirements specified by this field cease to be met
+                          at some point during pod execution (e.g. due to an update), the system
+                          may or may not try to eventually evict the pod from its node.
+                        properties:
+                          nodeSelectorTerms:
+                            description: Required. A list of node selector terms.
+                              The terms are ORed.
+                            items:
+                              description: |-
+                                A null or empty node selector term matches no objects. The requirements of
+                                them are ANDed.
+                                The TopologySelectorTerm type implements a subset of the NodeSelectorTerm.
+                              properties:
+                                matchExpressions:
+                                  description: A list of node selector requirements
+                                    by node's labels.
+                                  items:
+                                    description: |-
+                                      A node selector requirement is a selector that contains values, a key, and an operator
+                                      that relates the key and values.
+                                    properties:
+                                      key:
+                                        description: The label key that the selector
+                                          applies to.
+                                        type: string
+                                      operator:
+                                        description: |-
+                                          Represents a key's relationship to a set of values.
+                                          Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt.
+                                        type: string
+                                      values:
+                                        description: |-
+                                          An array of string values. If the operator is In or NotIn,
+                                          the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                          the values array must be empty. If the operator is Gt or Lt, the values
+                                          array must have a single element, which will be interpreted as an integer.
+                                          This array is replaced during a strategic merge patch.
+                                        items:
+                                          type: string
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                    required:
+                                    - key
+                                    - operator
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                matchFields:
+                                  description: A list of node selector requirements
+                                    by node's fields.
+                                  items:
+                                    description: |-
+                                      A node selector requirement is a selector that contains values, a key, and an operator
+                                      that relates the key and values.
+                                    properties:
+                                      key:
+                                        description: The label key that the selector
+                                          applies to.
+                                        type: string
+                                      operator:
+                                        description: |-
+                                          Represents a key's relationship to a set of values.
+                                          Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt.
+                                        type: string
+                                      values:
+                                        description: |-
+                                          An array of string values. If the operator is In or NotIn,
+                                          the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                          the values array must be empty. If the operator is Gt or Lt, the values
+                                          array must have a single element, which will be interpreted as an integer.
+                                          This array is replaced during a strategic merge patch.
+                                        items:
+                                          type: string
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                    required:
+                                    - key
+                                    - operator
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            type: array
+                            x-kubernetes-list-type: atomic
+                        required:
+                        - nodeSelectorTerms
+                        type: object
+                        x-kubernetes-map-type: atomic
+                    type: object
+                  podAffinity:
+                    description: Describes pod affinity scheduling rules (e.g. co-locate
+                      this pod in the same node, zone, etc. as some other pod(s)).
+                    properties:
+                      preferredDuringSchedulingIgnoredDuringExecution:
+                        description: |-
+                          The scheduler will prefer to schedule pods to nodes that satisfy
+                          the affinity expressions specified by this field, but it may choose
+                          a node that violates one or more of the expressions. The node that is
+                          most preferred is the one with the greatest sum of weights, i.e.
+                          for each node that meets all of the scheduling requirements (resource
+                          request, requiredDuringScheduling affinity expressions, etc.),
+                          compute a sum by iterating through the elements of this field and adding
+                          "weight" to the sum if the node has pods which matches the corresponding podAffinityTerm; the
+                          node(s) with the highest sum are the most preferred.
+                        items:
+                          description: The weights of all of the matched WeightedPodAffinityTerm
+                            fields are added per-node to find the most preferred node(s)
+                          properties:
+                            podAffinityTerm:
+                              description: Required. A pod affinity term, associated
+                                with the corresponding weight.
+                              properties:
+                                labelSelector:
+                                  description: |-
+                                    A label query over a set of resources, in this case pods.
+                                    If it's null, this PodAffinityTerm matches with no Pods.
+                                  properties:
+                                    matchExpressions:
+                                      description: matchExpressions is a list of label
+                                        selector requirements. The requirements are
+                                        ANDed.
+                                      items:
+                                        description: |-
+                                          A label selector requirement is a selector that contains values, a key, and an operator that
+                                          relates the key and values.
+                                        properties:
+                                          key:
+                                            description: key is the label key that
+                                              the selector applies to.
+                                            type: string
+                                          operator:
+                                            description: |-
+                                              operator represents a key's relationship to a set of values.
+                                              Valid operators are In, NotIn, Exists and DoesNotExist.
+                                            type: string
+                                          values:
+                                            description: |-
+                                              values is an array of string values. If the operator is In or NotIn,
+                                              the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                              the values array must be empty. This array is replaced during a strategic
+                                              merge patch.
+                                            items:
+                                              type: string
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                        required:
+                                        - key
+                                        - operator
+                                        type: object
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    matchLabels:
+                                      additionalProperties:
+                                        type: string
+                                      description: |-
+                                        matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                        map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                        operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                      type: object
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                matchLabelKeys:
+                                  description: |-
+                                    MatchLabelKeys is a set of pod label keys to select which pods will
+                                    be taken into consideration. The keys are used to lookup values from the
+                                    incoming pod labels, those key-value labels are merged with `labelSelector` as `key in (value)`
+                                    to select the group of existing pods which pods will be taken into consideration
+                                    for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+                                    pod labels will be ignored. The default value is empty.
+                                    The same key is forbidden to exist in both matchLabelKeys and labelSelector.
+                                    Also, matchLabelKeys cannot be set when labelSelector isn't set.
+                                    This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                mismatchLabelKeys:
+                                  description: |-
+                                    MismatchLabelKeys is a set of pod label keys to select which pods will
+                                    be taken into consideration. The keys are used to lookup values from the
+                                    incoming pod labels, those key-value labels are merged with `labelSelector` as `key notin (value)`
+                                    to select the group of existing pods which pods will be taken into consideration
+                                    for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+                                    pod labels will be ignored. The default value is empty.
+                                    The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
+                                    Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
+                                    This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                namespaceSelector:
+                                  description: |-
+                                    A label query over the set of namespaces that the term applies to.
+                                    The term is applied to the union of the namespaces selected by this field
+                                    and the ones listed in the namespaces field.
+                                    null selector and null or empty namespaces list means "this pod's namespace".
+                                    An empty selector ({}) matches all namespaces.
+                                  properties:
+                                    matchExpressions:
+                                      description: matchExpressions is a list of label
+                                        selector requirements. The requirements are
+                                        ANDed.
+                                      items:
+                                        description: |-
+                                          A label selector requirement is a selector that contains values, a key, and an operator that
+                                          relates the key and values.
+                                        properties:
+                                          key:
+                                            description: key is the label key that
+                                              the selector applies to.
+                                            type: string
+                                          operator:
+                                            description: |-
+                                              operator represents a key's relationship to a set of values.
+                                              Valid operators are In, NotIn, Exists and DoesNotExist.
+                                            type: string
+                                          values:
+                                            description: |-
+                                              values is an array of string values. If the operator is In or NotIn,
+                                              the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                              the values array must be empty. This array is replaced during a strategic
+                                              merge patch.
+                                            items:
+                                              type: string
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                        required:
+                                        - key
+                                        - operator
+                                        type: object
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    matchLabels:
+                                      additionalProperties:
+                                        type: string
+                                      description: |-
+                                        matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                        map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                        operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                      type: object
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                namespaces:
+                                  description: |-
+                                    namespaces specifies a static list of namespace names that the term applies to.
+                                    The term is applied to the union of the namespaces listed in this field
+                                    and the ones selected by namespaceSelector.
+                                    null or empty namespaces list and null namespaceSelector means "this pod's namespace".
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                topologyKey:
+                                  description: |-
+                                    This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching
+                                    the labelSelector in the specified namespaces, where co-located is defined as running on a node
+                                    whose value of the label with key topologyKey matches that of any node on which any of the
+                                    selected pods is running.
+                                    Empty topologyKey is not allowed.
+                                  type: string
+                              required:
+                              - topologyKey
+                              type: object
+                            weight:
+                              description: |-
+                                weight associated with matching the corresponding podAffinityTerm,
+                                in the range 1-100.
+                              format: int32
+                              type: integer
+                          required:
+                          - podAffinityTerm
+                          - weight
+                          type: object
+                        type: array
+                        x-kubernetes-list-type: atomic
+                      requiredDuringSchedulingIgnoredDuringExecution:
+                        description: |-
+                          If the affinity requirements specified by this field are not met at
+                          scheduling time, the pod will not be scheduled onto the node.
+                          If the affinity requirements specified by this field cease to be met
+                          at some point during pod execution (e.g. due to a pod label update), the
+                          system may or may not try to eventually evict the pod from its node.
+                          When there are multiple elements, the lists of nodes corresponding to each
+                          podAffinityTerm are intersected, i.e. all terms must be satisfied.
+                        items:
+                          description: |-
+                            Defines a set of pods (namely those matching the labelSelector
+                            relative to the given namespace(s)) that this pod should be
+                            co-located (affinity) or not co-located (anti-affinity) with,
+                            where co-located is defined as running on a node whose value of
+                            the label with key <topologyKey> matches that of any node on which
+                            a pod of the set of pods is running
+                          properties:
+                            labelSelector:
+                              description: |-
+                                A label query over a set of resources, in this case pods.
+                                If it's null, this PodAffinityTerm matches with no Pods.
+                              properties:
+                                matchExpressions:
+                                  description: matchExpressions is a list of label
+                                    selector requirements. The requirements are ANDed.
+                                  items:
+                                    description: |-
+                                      A label selector requirement is a selector that contains values, a key, and an operator that
+                                      relates the key and values.
+                                    properties:
+                                      key:
+                                        description: key is the label key that the
+                                          selector applies to.
+                                        type: string
+                                      operator:
+                                        description: |-
+                                          operator represents a key's relationship to a set of values.
+                                          Valid operators are In, NotIn, Exists and DoesNotExist.
+                                        type: string
+                                      values:
+                                        description: |-
+                                          values is an array of string values. If the operator is In or NotIn,
+                                          the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                          the values array must be empty. This array is replaced during a strategic
+                                          merge patch.
+                                        items:
+                                          type: string
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                    required:
+                                    - key
+                                    - operator
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                matchLabels:
+                                  additionalProperties:
+                                    type: string
+                                  description: |-
+                                    matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                    map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                    operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                  type: object
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            matchLabelKeys:
+                              description: |-
+                                MatchLabelKeys is a set of pod label keys to select which pods will
+                                be taken into consideration. The keys are used to lookup values from the
+                                incoming pod labels, those key-value labels are merged with `labelSelector` as `key in (value)`
+                                to select the group of existing pods which pods will be taken into consideration
+                                for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+                                pod labels will be ignored. The default value is empty.
+                                The same key is forbidden to exist in both matchLabelKeys and labelSelector.
+                                Also, matchLabelKeys cannot be set when labelSelector isn't set.
+                                This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
+                              items:
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            mismatchLabelKeys:
+                              description: |-
+                                MismatchLabelKeys is a set of pod label keys to select which pods will
+                                be taken into consideration. The keys are used to lookup values from the
+                                incoming pod labels, those key-value labels are merged with `labelSelector` as `key notin (value)`
+                                to select the group of existing pods which pods will be taken into consideration
+                                for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+                                pod labels will be ignored. The default value is empty.
+                                The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
+                                Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
+                                This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
+                              items:
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            namespaceSelector:
+                              description: |-
+                                A label query over the set of namespaces that the term applies to.
+                                The term is applied to the union of the namespaces selected by this field
+                                and the ones listed in the namespaces field.
+                                null selector and null or empty namespaces list means "this pod's namespace".
+                                An empty selector ({}) matches all namespaces.
+                              properties:
+                                matchExpressions:
+                                  description: matchExpressions is a list of label
+                                    selector requirements. The requirements are ANDed.
+                                  items:
+                                    description: |-
+                                      A label selector requirement is a selector that contains values, a key, and an operator that
+                                      relates the key and values.
+                                    properties:
+                                      key:
+                                        description: key is the label key that the
+                                          selector applies to.
+                                        type: string
+                                      operator:
+                                        description: |-
+                                          operator represents a key's relationship to a set of values.
+                                          Valid operators are In, NotIn, Exists and DoesNotExist.
+                                        type: string
+                                      values:
+                                        description: |-
+                                          values is an array of string values. If the operator is In or NotIn,
+                                          the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                          the values array must be empty. This array is replaced during a strategic
+                                          merge patch.
+                                        items:
+                                          type: string
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                    required:
+                                    - key
+                                    - operator
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                matchLabels:
+                                  additionalProperties:
+                                    type: string
+                                  description: |-
+                                    matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                    map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                    operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                  type: object
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            namespaces:
+                              description: |-
+                                namespaces specifies a static list of namespace names that the term applies to.
+                                The term is applied to the union of the namespaces listed in this field
+                                and the ones selected by namespaceSelector.
+                                null or empty namespaces list and null namespaceSelector means "this pod's namespace".
+                              items:
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            topologyKey:
+                              description: |-
+                                This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching
+                                the labelSelector in the specified namespaces, where co-located is defined as running on a node
+                                whose value of the label with key topologyKey matches that of any node on which any of the
+                                selected pods is running.
+                                Empty topologyKey is not allowed.
+                              type: string
+                          required:
+                          - topologyKey
+                          type: object
+                        type: array
+                        x-kubernetes-list-type: atomic
+                    type: object
+                  podAntiAffinity:
+                    description: Describes pod anti-affinity scheduling rules (e.g.
+                      avoid putting this pod in the same node, zone, etc. as some
+                      other pod(s)).
+                    properties:
+                      preferredDuringSchedulingIgnoredDuringExecution:
+                        description: |-
+                          The scheduler will prefer to schedule pods to nodes that satisfy
+                          the anti-affinity expressions specified by this field, but it may choose
+                          a node that violates one or more of the expressions. The node that is
+                          most preferred is the one with the greatest sum of weights, i.e.
+                          for each node that meets all of the scheduling requirements (resource
+                          request, requiredDuringScheduling anti-affinity expressions, etc.),
+                          compute a sum by iterating through the elements of this field and adding
+                          "weight" to the sum if the node has pods which matches the corresponding podAffinityTerm; the
+                          node(s) with the highest sum are the most preferred.
+                        items:
+                          description: The weights of all of the matched WeightedPodAffinityTerm
+                            fields are added per-node to find the most preferred node(s)
+                          properties:
+                            podAffinityTerm:
+                              description: Required. A pod affinity term, associated
+                                with the corresponding weight.
+                              properties:
+                                labelSelector:
+                                  description: |-
+                                    A label query over a set of resources, in this case pods.
+                                    If it's null, this PodAffinityTerm matches with no Pods.
+                                  properties:
+                                    matchExpressions:
+                                      description: matchExpressions is a list of label
+                                        selector requirements. The requirements are
+                                        ANDed.
+                                      items:
+                                        description: |-
+                                          A label selector requirement is a selector that contains values, a key, and an operator that
+                                          relates the key and values.
+                                        properties:
+                                          key:
+                                            description: key is the label key that
+                                              the selector applies to.
+                                            type: string
+                                          operator:
+                                            description: |-
+                                              operator represents a key's relationship to a set of values.
+                                              Valid operators are In, NotIn, Exists and DoesNotExist.
+                                            type: string
+                                          values:
+                                            description: |-
+                                              values is an array of string values. If the operator is In or NotIn,
+                                              the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                              the values array must be empty. This array is replaced during a strategic
+                                              merge patch.
+                                            items:
+                                              type: string
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                        required:
+                                        - key
+                                        - operator
+                                        type: object
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    matchLabels:
+                                      additionalProperties:
+                                        type: string
+                                      description: |-
+                                        matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                        map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                        operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                      type: object
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                matchLabelKeys:
+                                  description: |-
+                                    MatchLabelKeys is a set of pod label keys to select which pods will
+                                    be taken into consideration. The keys are used to lookup values from the
+                                    incoming pod labels, those key-value labels are merged with `labelSelector` as `key in (value)`
+                                    to select the group of existing pods which pods will be taken into consideration
+                                    for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+                                    pod labels will be ignored. The default value is empty.
+                                    The same key is forbidden to exist in both matchLabelKeys and labelSelector.
+                                    Also, matchLabelKeys cannot be set when labelSelector isn't set.
+                                    This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                mismatchLabelKeys:
+                                  description: |-
+                                    MismatchLabelKeys is a set of pod label keys to select which pods will
+                                    be taken into consideration. The keys are used to lookup values from the
+                                    incoming pod labels, those key-value labels are merged with `labelSelector` as `key notin (value)`
+                                    to select the group of existing pods which pods will be taken into consideration
+                                    for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+                                    pod labels will be ignored. The default value is empty.
+                                    The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
+                                    Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
+                                    This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                namespaceSelector:
+                                  description: |-
+                                    A label query over the set of namespaces that the term applies to.
+                                    The term is applied to the union of the namespaces selected by this field
+                                    and the ones listed in the namespaces field.
+                                    null selector and null or empty namespaces list means "this pod's namespace".
+                                    An empty selector ({}) matches all namespaces.
+                                  properties:
+                                    matchExpressions:
+                                      description: matchExpressions is a list of label
+                                        selector requirements. The requirements are
+                                        ANDed.
+                                      items:
+                                        description: |-
+                                          A label selector requirement is a selector that contains values, a key, and an operator that
+                                          relates the key and values.
+                                        properties:
+                                          key:
+                                            description: key is the label key that
+                                              the selector applies to.
+                                            type: string
+                                          operator:
+                                            description: |-
+                                              operator represents a key's relationship to a set of values.
+                                              Valid operators are In, NotIn, Exists and DoesNotExist.
+                                            type: string
+                                          values:
+                                            description: |-
+                                              values is an array of string values. If the operator is In or NotIn,
+                                              the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                              the values array must be empty. This array is replaced during a strategic
+                                              merge patch.
+                                            items:
+                                              type: string
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                        required:
+                                        - key
+                                        - operator
+                                        type: object
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    matchLabels:
+                                      additionalProperties:
+                                        type: string
+                                      description: |-
+                                        matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                        map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                        operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                      type: object
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                namespaces:
+                                  description: |-
+                                    namespaces specifies a static list of namespace names that the term applies to.
+                                    The term is applied to the union of the namespaces listed in this field
+                                    and the ones selected by namespaceSelector.
+                                    null or empty namespaces list and null namespaceSelector means "this pod's namespace".
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                topologyKey:
+                                  description: |-
+                                    This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching
+                                    the labelSelector in the specified namespaces, where co-located is defined as running on a node
+                                    whose value of the label with key topologyKey matches that of any node on which any of the
+                                    selected pods is running.
+                                    Empty topologyKey is not allowed.
+                                  type: string
+                              required:
+                              - topologyKey
+                              type: object
+                            weight:
+                              description: |-
+                                weight associated with matching the corresponding podAffinityTerm,
+                                in the range 1-100.
+                              format: int32
+                              type: integer
+                          required:
+                          - podAffinityTerm
+                          - weight
+                          type: object
+                        type: array
+                        x-kubernetes-list-type: atomic
+                      requiredDuringSchedulingIgnoredDuringExecution:
+                        description: |-
+                          If the anti-affinity requirements specified by this field are not met at
+                          scheduling time, the pod will not be scheduled onto the node.
+                          If the anti-affinity requirements specified by this field cease to be met
+                          at some point during pod execution (e.g. due to a pod label update), the
+                          system may or may not try to eventually evict the pod from its node.
+                          When there are multiple elements, the lists of nodes corresponding to each
+                          podAffinityTerm are intersected, i.e. all terms must be satisfied.
+                        items:
+                          description: |-
+                            Defines a set of pods (namely those matching the labelSelector
+                            relative to the given namespace(s)) that this pod should be
+                            co-located (affinity) or not co-located (anti-affinity) with,
+                            where co-located is defined as running on a node whose value of
+                            the label with key <topologyKey> matches that of any node on which
+                            a pod of the set of pods is running
+                          properties:
+                            labelSelector:
+                              description: |-
+                                A label query over a set of resources, in this case pods.
+                                If it's null, this PodAffinityTerm matches with no Pods.
+                              properties:
+                                matchExpressions:
+                                  description: matchExpressions is a list of label
+                                    selector requirements. The requirements are ANDed.
+                                  items:
+                                    description: |-
+                                      A label selector requirement is a selector that contains values, a key, and an operator that
+                                      relates the key and values.
+                                    properties:
+                                      key:
+                                        description: key is the label key that the
+                                          selector applies to.
+                                        type: string
+                                      operator:
+                                        description: |-
+                                          operator represents a key's relationship to a set of values.
+                                          Valid operators are In, NotIn, Exists and DoesNotExist.
+                                        type: string
+                                      values:
+                                        description: |-
+                                          values is an array of string values. If the operator is In or NotIn,
+                                          the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                          the values array must be empty. This array is replaced during a strategic
+                                          merge patch.
+                                        items:
+                                          type: string
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                    required:
+                                    - key
+                                    - operator
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                matchLabels:
+                                  additionalProperties:
+                                    type: string
+                                  description: |-
+                                    matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                    map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                    operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                  type: object
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            matchLabelKeys:
+                              description: |-
+                                MatchLabelKeys is a set of pod label keys to select which pods will
+                                be taken into consideration. The keys are used to lookup values from the
+                                incoming pod labels, those key-value labels are merged with `labelSelector` as `key in (value)`
+                                to select the group of existing pods which pods will be taken into consideration
+                                for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+                                pod labels will be ignored. The default value is empty.
+                                The same key is forbidden to exist in both matchLabelKeys and labelSelector.
+                                Also, matchLabelKeys cannot be set when labelSelector isn't set.
+                                This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
+                              items:
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            mismatchLabelKeys:
+                              description: |-
+                                MismatchLabelKeys is a set of pod label keys to select which pods will
+                                be taken into consideration. The keys are used to lookup values from the
+                                incoming pod labels, those key-value labels are merged with `labelSelector` as `key notin (value)`
+                                to select the group of existing pods which pods will be taken into consideration
+                                for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+                                pod labels will be ignored. The default value is empty.
+                                The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
+                                Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
+                                This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
+                              items:
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            namespaceSelector:
+                              description: |-
+                                A label query over the set of namespaces that the term applies to.
+                                The term is applied to the union of the namespaces selected by this field
+                                and the ones listed in the namespaces field.
+                                null selector and null or empty namespaces list means "this pod's namespace".
+                                An empty selector ({}) matches all namespaces.
+                              properties:
+                                matchExpressions:
+                                  description: matchExpressions is a list of label
+                                    selector requirements. The requirements are ANDed.
+                                  items:
+                                    description: |-
+                                      A label selector requirement is a selector that contains values, a key, and an operator that
+                                      relates the key and values.
+                                    properties:
+                                      key:
+                                        description: key is the label key that the
+                                          selector applies to.
+                                        type: string
+                                      operator:
+                                        description: |-
+                                          operator represents a key's relationship to a set of values.
+                                          Valid operators are In, NotIn, Exists and DoesNotExist.
+                                        type: string
+                                      values:
+                                        description: |-
+                                          values is an array of string values. If the operator is In or NotIn,
+                                          the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                          the values array must be empty. This array is replaced during a strategic
+                                          merge patch.
+                                        items:
+                                          type: string
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                    required:
+                                    - key
+                                    - operator
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                matchLabels:
+                                  additionalProperties:
+                                    type: string
+                                  description: |-
+                                    matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                    map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                    operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                  type: object
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            namespaces:
+                              description: |-
+                                namespaces specifies a static list of namespace names that the term applies to.
+                                The term is applied to the union of the namespaces listed in this field
+                                and the ones selected by namespaceSelector.
+                                null or empty namespaces list and null namespaceSelector means "this pod's namespace".
+                              items:
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            topologyKey:
+                              description: |-
+                                This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching
+                                the labelSelector in the specified namespaces, where co-located is defined as running on a node
+                                whose value of the label with key topologyKey matches that of any node on which any of the
+                                selected pods is running.
+                                Empty topologyKey is not allowed.
+                              type: string
+                          required:
+                          - topologyKey
+                          type: object
+                        type: array
+                        x-kubernetes-list-type: atomic
+                    type: object
+                type: object
+                x-kubernetes-map-type: atomic
+              targetLabels:
+                additionalProperties:
+                  type: string
+                description: |-
+                  TargetLabels are labels that should be applied to the target virtual machines.
+                  Note: System-managed labels (migration, plan, vmID, app) will override any user-defined
+                  labels with the same keys to ensure proper system functionality.
+                  See Pod Labels documentation for more details,
+                  https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/#labels
+                type: object
+              targetNamespace:
+                description: Target namespace.
+                type: string
+              targetNodeSelector:
+                additionalProperties:
+                  type: string
+                description: |-
+                  TargetNodeSelector, constrains the scheduler to only schedule VMs on nodes,
+                  which contain the specified labels.
+                  See virtual machine instance NodeSelector documentation for more details,
+                  https://kubevirt.io/user-guide/compute/node_assignment/#nodeselector
+                type: object
+              targetPowerState:
+                description: |-
+                  TargetPowerState specifies the desired power state of the target VM after migration.
+                  - "on": Target VM will be powered on after migration
+                  - "off": Target VM will be powered off after migration
+                  - "auto" or nil (default): Target VM will match the source VM's power state
+                enum:
+                - "on"
+                - "off"
+                - auto
+                type: string
+              transferNetwork:
+                description: The network attachment definition that should be used
+                  for disk transfer.
+                properties:
+                  apiVersion:
+                    description: API version of the referent.
+                    type: string
+                  fieldPath:
+                    description: |-
+                      If referring to a piece of an object instead of an entire object, this string
+                      should contain a valid JSON/Go field access statement, such as desiredState.manifest.containers[2].
+                      For example, if the object reference is to a container within a pod, this would take on a value like:
+                      "spec.containers{name}" (where "name" refers to the name of the container that triggered
+                      the event) or if no container name is specified "spec.containers[2]" (container with
+                      index 2 in this pod). This syntax is chosen only to have some well-defined way of
+                      referencing a part of an object.
+                    type: string
+                  kind:
+                    description: |-
+                      Kind of the referent.
+                      More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+                    type: string
+                  name:
+                    description: |-
+                      Name of the referent.
+                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                    type: string
+                  namespace:
+                    description: |-
+                      Namespace of the referent.
+                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/
+                    type: string
+                  resourceVersion:
+                    description: |-
+                      Specific resourceVersion to which this reference is made, if any.
+                      More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency
+                    type: string
+                  uid:
+                    description: |-
+                      UID of the referent.
+                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids
+                    type: string
+                type: object
+                x-kubernetes-map-type: atomic
+              type:
+                description: Migration type. e.g. "cold", "warm", "live", "conversion".
+                  Supersedes the `warm` boolean if set.
+                enum:
+                - cold
+                - warm
+                - live
+                - conversion
+                type: string
+              useCompatibilityMode:
+                default: true
+                description: |-
+                  useCompatibilityMode controls whether to use VirtIO devices when skipGuestConversion is true (Raw Copy mode).
+                  This setting has no effect when skipGuestConversion is false (V2V Conversion always uses VirtIO).
+                  - true (default): Use compatibility devices (SATA bus, E1000E NIC) to ensure bootability
+                  - false: Use high-performance VirtIO devices (requires VirtIO drivers already installed in source VM)
+                type: boolean
+              virtV2vImage:
+                description: |-
+                  VirtV2vImage overrides the global virt-v2v container image for this plan.
+                  When set, virt-v2v pods created by this plan will use this image instead
+                  of the cluster-wide VIRT_V2V_IMAGE setting.
+                  Use this to run different virt-v2v builds for specific migration scenarios
+                type: string
+              vms:
+                description: List of VMs.
+                items:
+                  description: A VM listed on the plan.
+                  properties:
+                    deleteVmOnFailMigration:
+                      description: |-
+                        DeleteVmOnFailMigration controls whether the target VM created by this Plan is deleted when a migration fails.
+                        When true and the migration fails after the target VM has been created, the controller
+                        will delete the target VM (and related target-side resources) during failed-migration cleanup
+                        and when the Plan is deleted. When false (default), the target VM is preserved to aid
+                        troubleshooting. The source VM is never modified.
+
+                        Note: If the Plan-level option is set to true, the VM-level option will be ignored.
+                      type: boolean
+                    enableNestedVirtualization:
+                      description: |-
+                        EnableNestedVirtualization controls whether nested virtualization (vmx/svm CPU features)
+                        is enabled on the target VM.
+                        - nil (default): Auto-detect from source VM settings
+                        - true: Force enable nested virtualization on the target VM regardless of source settings
+                        - false: Force disable nested virtualization on the target VM regardless of source settings
+                      type: boolean
+                    hooks:
+                      description: Enable hooks.
+                      items:
+                        description: Plan hook.
+                        properties:
+                          hook:
+                            description: Hook reference.
+                            properties:
+                              apiVersion:
+                                description: API version of the referent.
+                                type: string
+                              fieldPath:
+                                description: |-
+                                  If referring to a piece of an object instead of an entire object, this string
+                                  should contain a valid JSON/Go field access statement, such as desiredState.manifest.containers[2].
+                                  For example, if the object reference is to a container within a pod, this would take on a value like:
+                                  "spec.containers{name}" (where "name" refers to the name of the container that triggered
+                                  the event) or if no container name is specified "spec.containers[2]" (container with
+                                  index 2 in this pod). This syntax is chosen only to have some well-defined way of
+                                  referencing a part of an object.
+                                type: string
+                              kind:
+                                description: |-
+                                  Kind of the referent.
+                                  More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+                                type: string
+                              name:
+                                description: |-
+                                  Name of the referent.
+                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                type: string
+                              namespace:
+                                description: |-
+                                  Namespace of the referent.
+                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/
+                                type: string
+                              resourceVersion:
+                                description: |-
+                                  Specific resourceVersion to which this reference is made, if any.
+                                  More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency
+                                type: string
+                              uid:
+                                description: |-
+                                  UID of the referent.
+                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids
+                                type: string
+                            type: object
+                            x-kubernetes-map-type: atomic
+                          step:
+                            description: Pipeline step.
+                            type: string
+                        required:
+                        - hook
+                        - step
+                        type: object
+                      type: array
+                    id:
+                      description: |-
+                        The object ID.
+                        vsphere:
+                          The managed object ID.
+                      type: string
+                    instanceType:
+                      description: Selected InstanceType that will override the VM
+                        properties.
+                      type: string
+                    luks:
+                      description: Disk decryption LUKS keys
+                      properties:
+                        apiVersion:
+                          description: API version of the referent.
+                          type: string
+                        fieldPath:
+                          description: |-
+                            If referring to a piece of an object instead of an entire object, this string
+                            should contain a valid JSON/Go field access statement, such as desiredState.manifest.containers[2].
+                            For example, if the object reference is to a container within a pod, this would take on a value like:
+                            "spec.containers{name}" (where "name" refers to the name of the container that triggered
+                            the event) or if no container name is specified "spec.containers[2]" (container with
+                            index 2 in this pod). This syntax is chosen only to have some well-defined way of
+                            referencing a part of an object.
+                          type: string
+                        kind:
+                          description: |-
+                            Kind of the referent.
+                            More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+                          type: string
+                        name:
+                          description: |-
+                            Name of the referent.
+                            More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                          type: string
+                        namespace:
+                          description: |-
+                            Namespace of the referent.
+                            More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/
+                          type: string
+                        resourceVersion:
+                          description: |-
+                            Specific resourceVersion to which this reference is made, if any.
+                            More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency
+                          type: string
+                        uid:
+                          description: |-
+                            UID of the referent.
+                            More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids
+                          type: string
+                      type: object
+                      x-kubernetes-map-type: atomic
+                    migrateSharedDisks:
+                      description: |-
+                        MigrateSharedDisks controls whether shared disks are included in the migration for this VM.
+                        When nil (default), the plan-level migrateSharedDisks value is used.
+                        When explicitly set to true, shared disks are migrated for this VM.
+                        When explicitly set to false, shared disks are skipped for this VM.
+                      type: boolean
+                    name:
+                      description: |-
+                        An object Name.
+                        vsphere:
+                          A qualified name.
+                      type: string
+                    namespace:
+                      description: |-
+                        The VM Namespace
+                        Only relevant for an openshift source.
+                      type: string
+                    nbdeClevis:
+                      description: |-
+                        Attempt passphrase-less unlocking for all devices with Clevis, over the network.
+                        Conversion pod running on target cluster will attempt to connect to a TANG server, make sure TANG
+                        server is available on target network.
+                        https://docs.redhat.com/en/documentation/red_hat_enterprise_linux/8/html/security_hardening/configuring-automated-unlocking-of-encrypted-volumes-using-policy-based-decryption_security-hardening
+                        If both nbdeClevis and LUKS are configured, nbdeClevis takes precedence.
+                      type: boolean
+                    networkNameTemplate:
+                      description: |-
+                        NetworkNameTemplate is a template for generating network interface names in the target virtual machine.
+                        It follows Go template syntax and has access to the following variables:
+                          - .NetworkName: If target network is multus, name of the Multus network attachment definition, empty otherwise.
+                          - .NetworkNamespace: If target network is multus, namespace where the network attachment definition is located.
+                          - .NetworkType: type of the network ("Multus" or "Pod")
+                          - .NetworkIndex: sequential index of the network interface (0-based)
+                        The template can be used to customize network interface names based on target network configuration.
+
+                        Provider support:
+                          - VMware (vSphere): Supported. Network interface names can be customized.
+                          - OpenShift: Not supported. Network interface names are preserved from the source VM.
+
+                        Note:
+                          - This template will override at the plan level template
+                          - If not specified on VM level and on Plan level, default naming conventions will be used
+                        Examples:
+                          "net-{{`{{`}}.NetworkIndex{{`}}`}}"
+                          "{{`{{`}}if eq .NetworkType "Pod"{{`}}`}}pod{{`{{`}}else{{`}}`}}multus-{{`{{`}}.NetworkIndex{{`}}`}}{{`{{`}}end{{`}}`}}"
+                      type: string
+                    pvcNameTemplate:
+                      description: "PVCNameTemplate is a template for generating PVC
+                        names for VM disks.\nGenerated names must be valid DNS-1123
+                        labels (lowercase alphanumerics, '-' allowed, max 63 chars).\nIt
+                        follows Go template syntax and has access to provider-specific
+                        variables.\n\nCommon variables (all providers):\n  - .VmName:
+                        name of the VM in the source cluster (original source name)\n
+                        \ - .TargetVmName: final VM name in the target cluster (may
+                        equal .VmName if no rename/normalization)\n  - .PlanName:
+                        name of the migration plan\n  - .DiskIndex: initial volume
+                        index of the disk\n\nVMware (vSphere) specific variables:\n
+                        \ - .WinDriveLetter: Windows drive letter (lowercase, if applicable,
+                        e.g. \"c\", requires guest agent)\n  - .RootDiskIndex: index
+                        of the root disk\n  - .Shared: true if the volume is shared
+                        by multiple VMs, false otherwise\n  - .FileName: name of the
+                        file in the source provider (filename includes the .vmdk suffix)\n\nOpenShift
+                        specific variables:\n  - .SourcePVCName: name of the PVC in
+                        the source cluster\n  - .SourcePVCNamespace: namespace of
+                        the PVC in the source cluster\n\nNote:\n  This template overrides
+                        the plan level template.\nExamples:\n  \"{{`{{`}}.TargetVmName{{`}}`}}-disk-{{`{{`}}.DiskIndex{{`}}`}}\"\n
+                        \ \"{{`{{`}}if eq .DiskIndex .RootDiskIndex{{`}}`}}root{{`{{`}}else{{`}}`}}data{{`{{`}}end{{`}}`}}-{{`{{`}}.DiskIndex{{`}}`}}\"
+                        (VMware)\n  \"{{`{{`}}.TargetVmName{{`}}`}}-{{`{{`}}.SourcePVCName{{`}}`}}\" (OpenShift)\nSee:\n\t
+                        https://github.com/kubev2v/forklift/tree/main/pkg/templateutil
+                        for template functions."
+                      type: string
+                    rdmAsLun:
+                      description: |-
+                        RDMAsLun controls whether RDM (Raw Device Mapping) disks from VMware should be
+                        mapped as LUN devices in the target KubeVirt VM instead of regular disk devices.
+                        When nil (default), the plan-level rdmAsLun value is used.
+                        When explicitly set to true, RDM disks are attached using lun: {} for this VM.
+                        When explicitly set to false, RDM disks are attached as regular disks for this VM.
+                      type: boolean
+                    rootDisk:
+                      description: Choose the primary disk the VM boots from
+                      type: string
+                    targetName:
+                      description: |-
+                        TargetName specifies a custom name for the VM in the target cluster.
+                        If not provided, the original VM name will be used and automatically adjusted to meet k8s DNS1123 requirements.
+                        If provided, this exact name will be used instead. The migration will fail if the name is not unique or already in use.
+                      type: string
+                    targetPowerState:
+                      description: |-
+                        TargetPowerState specifies the desired power state of the target VM after migration.
+                        - "on": Target VM will be powered on after migration
+                        - "off": Target VM will be powered off after migration
+                        - "auto" or nil (default): Target VM will match the source VM's power state
+                      enum:
+                      - "on"
+                      - "off"
+                      - auto
+                      type: string
+                    type:
+                      description: Type used to qualify the name.
+                      type: string
+                    volumeNameTemplate:
+                      description: |-
+                        VolumeNameTemplate is a template for generating volume interface names in the target virtual machine.
+                        It follows Go template syntax and has access to the following variables:
+                          - .PVCName: name of the PVC mounted to the VM using this volume
+                          - .VolumeIndex: sequential index of the volume interface (0-based)
+
+                        Provider support:
+                          - VMware (vSphere): Supported. Default naming is "vol-{index}".
+                          - OpenShift: Not supported. Volume names are preserved from the source VM.
+
+                        Note:
+                          - This template will override at the plan level template
+                          - If not specified on VM level and on Plan level, default naming conventions will be used
+                        Examples:
+                          "disk-{{`{{`}}.VolumeIndex{{`}}`}}"
+                          "pvc-{{`{{`}}.PVCName{{`}}`}}"
+                      type: string
+                  type: object
+                type: array
+              volumeNameTemplate:
+                description: |-
+                  VolumeNameTemplate is a template for generating volume interface names in the target virtual machine.
+                  It follows Go template syntax and has access to the following variables:
+                    - .PVCName: name of the PVC mounted to the VM using this volume
+                    - .VolumeIndex: sequential index of the volume interface (0-based)
+
+                  Provider support:
+                    - VMware (vSphere): Supported. Default naming is "vol-{index}".
+                    - OpenShift: Not supported. Volume names are preserved from the source VM.
+
+                  Note:
+                    - This template can be overridden at the individual VM level
+                    - If not specified on VM level and on Plan level, default naming conventions will be used
+                  Examples:
+                    "disk-{{`{{`}}.VolumeIndex{{`}}`}}"
+                    "pvc-{{`{{`}}.PVCName{{`}}`}}"
+                type: string
+              warm:
+                description: |-
+                  Whether this is a warm migration.
+                  Deprecated: this field will be deprecated in 2.10. Use Type instead.
+                type: boolean
+              xfsCompatibility:
+                default: false
+                description: |-
+                  XfsCompatibility overrides the global virt-v2v container image for this plan.
+                  When set, virt-v2v pods created by this plan will use the XFS compatible image
+                  VIRT_V2V_IMAGE_XFS instead of the cluster-wide VIRT_V2V_IMAGE setting.
+                  Use this to enable XFSv4 compatibility mode for specific plan.
+                  Warning: Enabling XFSv4 support will drop support for BTRFS for the specific plan. Ensure that the plan only selects VMs with supported filesystem.
+                type: boolean
+            required:
+            - map
+            - provider
+            - targetNamespace
+            - vms
+            type: object
+          status:
+            description: PlanStatus defines the observed state of Plan.
+            properties:
+              conditions:
+                description: List of conditions.
+                items:
+                  description: Condition
+                  properties:
+                    category:
+                      description: The condition category.
+                      type: string
+                    durable:
+                      description: The condition is durable - never un-staged.
+                      type: boolean
+                    items:
+                      description: A list of items referenced in the `Message`.
+                      items:
+                        type: string
+                      type: array
+                    lastTransitionTime:
+                      description: When the last status transition occurred.
+                      format: date-time
+                      type: string
+                    message:
+                      description: The human readable description of the condition.
+                      type: string
+                    reason:
+                      description: The reason for the condition or transition.
+                      type: string
+                    status:
+                      description: The condition status [true,false].
+                      type: string
+                    suggestion:
+                      description: A suggested action or resolution for the condition.
+                      type: string
+                    type:
+                      description: The condition type.
+                      type: string
+                  required:
+                  - category
+                  - lastTransitionTime
+                  - status
+                  - type
+                  type: object
+                type: array
+              migration:
+                description: Migration
+                properties:
+                  completed:
+                    description: Completed timestamp.
+                    format: date-time
+                    type: string
+                  history:
+                    description: History
+                    items:
+                      description: Snapshot
+                      properties:
+                        conditions:
+                          description: List of conditions.
+                          items:
+                            description: Condition
+                            properties:
+                              category:
+                                description: The condition category.
+                                type: string
+                              durable:
+                                description: The condition is durable - never un-staged.
+                                type: boolean
+                              items:
+                                description: A list of items referenced in the `Message`.
+                                items:
+                                  type: string
+                                type: array
+                              lastTransitionTime:
+                                description: When the last status transition occurred.
+                                format: date-time
+                                type: string
+                              message:
+                                description: The human readable description of the
+                                  condition.
+                                type: string
+                              reason:
+                                description: The reason for the condition or transition.
+                                type: string
+                              status:
+                                description: The condition status [true,false].
+                                type: string
+                              suggestion:
+                                description: A suggested action or resolution for
+                                  the condition.
+                                type: string
+                              type:
+                                description: The condition type.
+                                type: string
+                            required:
+                            - category
+                            - lastTransitionTime
+                            - status
+                            - type
+                            type: object
+                          type: array
+                        map:
+                          description: Map.
+                          properties:
+                            network:
+                              description: Snapshot object reference.
+                              properties:
+                                generation:
+                                  format: int64
+                                  type: integer
+                                name:
+                                  type: string
+                                namespace:
+                                  type: string
+                                uid:
+                                  description: |-
+                                    UID is a type that holds unique ID values, including UUIDs.  Because we
+                                    don't ONLY use UUIDs, this is an alias to string.  Being a type captures
+                                    intent and helps make sure that UIDs and names do not get conflated.
+                                  type: string
+                              required:
+                              - generation
+                              - name
+                              - namespace
+                              - uid
+                              type: object
+                            storage:
+                              description: Snapshot object reference.
+                              properties:
+                                generation:
+                                  format: int64
+                                  type: integer
+                                name:
+                                  type: string
+                                namespace:
+                                  type: string
+                                uid:
+                                  description: |-
+                                    UID is a type that holds unique ID values, including UUIDs.  Because we
+                                    don't ONLY use UUIDs, this is an alias to string.  Being a type captures
+                                    intent and helps make sure that UIDs and names do not get conflated.
+                                  type: string
+                              required:
+                              - generation
+                              - name
+                              - namespace
+                              - uid
+                              type: object
+                          required:
+                          - network
+                          - storage
+                          type: object
+                        migration:
+                          description: Migration
+                          properties:
+                            generation:
+                              format: int64
+                              type: integer
+                            name:
+                              type: string
+                            namespace:
+                              type: string
+                            uid:
+                              description: |-
+                                UID is a type that holds unique ID values, including UUIDs.  Because we
+                                don't ONLY use UUIDs, this is an alias to string.  Being a type captures
+                                intent and helps make sure that UIDs and names do not get conflated.
+                              type: string
+                          required:
+                          - generation
+                          - name
+                          - namespace
+                          - uid
+                          type: object
+                        plan:
+                          description: Plan
+                          properties:
+                            generation:
+                              format: int64
+                              type: integer
+                            name:
+                              type: string
+                            namespace:
+                              type: string
+                            uid:
+                              description: |-
+                                UID is a type that holds unique ID values, including UUIDs.  Because we
+                                don't ONLY use UUIDs, this is an alias to string.  Being a type captures
+                                intent and helps make sure that UIDs and names do not get conflated.
+                              type: string
+                          required:
+                          - generation
+                          - name
+                          - namespace
+                          - uid
+                          type: object
+                        provider:
+                          description: Provider
+                          properties:
+                            destination:
+                              description: Snapshot object reference.
+                              properties:
+                                generation:
+                                  format: int64
+                                  type: integer
+                                name:
+                                  type: string
+                                namespace:
+                                  type: string
+                                uid:
+                                  description: |-
+                                    UID is a type that holds unique ID values, including UUIDs.  Because we
+                                    don't ONLY use UUIDs, this is an alias to string.  Being a type captures
+                                    intent and helps make sure that UIDs and names do not get conflated.
+                                  type: string
+                              required:
+                              - generation
+                              - name
+                              - namespace
+                              - uid
+                              type: object
+                            source:
+                              description: Snapshot object reference.
+                              properties:
+                                generation:
+                                  format: int64
+                                  type: integer
+                                name:
+                                  type: string
+                                namespace:
+                                  type: string
+                                uid:
+                                  description: |-
+                                    UID is a type that holds unique ID values, including UUIDs.  Because we
+                                    don't ONLY use UUIDs, this is an alias to string.  Being a type captures
+                                    intent and helps make sure that UIDs and names do not get conflated.
+                                  type: string
+                              required:
+                              - generation
+                              - name
+                              - namespace
+                              - uid
+                              type: object
+                          required:
+                          - destination
+                          - source
+                          type: object
+                      required:
+                      - map
+                      - migration
+                      - plan
+                      - provider
+                      type: object
+                    type: array
+                  started:
+                    description: Started timestamp.
+                    format: date-time
+                    type: string
+                  vms:
+                    description: VM status
+                    items:
+                      description: VM Status
+                      properties:
+                        completed:
+                          description: Completed timestamp.
+                          format: date-time
+                          type: string
+                        conditions:
+                          description: List of conditions.
+                          items:
+                            description: Condition
+                            properties:
+                              category:
+                                description: The condition category.
+                                type: string
+                              durable:
+                                description: The condition is durable - never un-staged.
+                                type: boolean
+                              items:
+                                description: A list of items referenced in the `Message`.
+                                items:
+                                  type: string
+                                type: array
+                              lastTransitionTime:
+                                description: When the last status transition occurred.
+                                format: date-time
+                                type: string
+                              message:
+                                description: The human readable description of the
+                                  condition.
+                                type: string
+                              reason:
+                                description: The reason for the condition or transition.
+                                type: string
+                              status:
+                                description: The condition status [true,false].
+                                type: string
+                              suggestion:
+                                description: A suggested action or resolution for
+                                  the condition.
+                                type: string
+                              type:
+                                description: The condition type.
+                                type: string
+                            required:
+                            - category
+                            - lastTransitionTime
+                            - status
+                            - type
+                            type: object
+                          type: array
+                        deleteVmOnFailMigration:
+                          description: |-
+                            DeleteVmOnFailMigration controls whether the target VM created by this Plan is deleted when a migration fails.
+                            When true and the migration fails after the target VM has been created, the controller
+                            will delete the target VM (and related target-side resources) during failed-migration cleanup
+                            and when the Plan is deleted. When false (default), the target VM is preserved to aid
+                            troubleshooting. The source VM is never modified.
+
+                            Note: If the Plan-level option is set to true, the VM-level option will be ignored.
+                          type: boolean
+                        enableNestedVirtualization:
+                          description: |-
+                            EnableNestedVirtualization controls whether nested virtualization (vmx/svm CPU features)
+                            is enabled on the target VM.
+                            - nil (default): Auto-detect from source VM settings
+                            - true: Force enable nested virtualization on the target VM regardless of source settings
+                            - false: Force disable nested virtualization on the target VM regardless of source settings
+                          type: boolean
+                        error:
+                          description: Errors
+                          properties:
+                            phase:
+                              type: string
+                            reasons:
+                              items:
+                                type: string
+                              type: array
+                          required:
+                          - phase
+                          - reasons
+                          type: object
+                        firmware:
+                          description: The firmware type detected from the OVF file
+                            produced by virt-v2v.
+                          type: string
+                        hooks:
+                          description: Enable hooks.
+                          items:
+                            description: Plan hook.
+                            properties:
+                              hook:
+                                description: Hook reference.
+                                properties:
+                                  apiVersion:
+                                    description: API version of the referent.
+                                    type: string
+                                  fieldPath:
+                                    description: |-
+                                      If referring to a piece of an object instead of an entire object, this string
+                                      should contain a valid JSON/Go field access statement, such as desiredState.manifest.containers[2].
+                                      For example, if the object reference is to a container within a pod, this would take on a value like:
+                                      "spec.containers{name}" (where "name" refers to the name of the container that triggered
+                                      the event) or if no container name is specified "spec.containers[2]" (container with
+                                      index 2 in this pod). This syntax is chosen only to have some well-defined way of
+                                      referencing a part of an object.
+                                    type: string
+                                  kind:
+                                    description: |-
+                                      Kind of the referent.
+                                      More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+                                    type: string
+                                  name:
+                                    description: |-
+                                      Name of the referent.
+                                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                    type: string
+                                  namespace:
+                                    description: |-
+                                      Namespace of the referent.
+                                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/
+                                    type: string
+                                  resourceVersion:
+                                    description: |-
+                                      Specific resourceVersion to which this reference is made, if any.
+                                      More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency
+                                    type: string
+                                  uid:
+                                    description: |-
+                                      UID of the referent.
+                                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids
+                                    type: string
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              step:
+                                description: Pipeline step.
+                                type: string
+                            required:
+                            - hook
+                            - step
+                            type: object
+                          type: array
+                        id:
+                          description: |-
+                            The object ID.
+                            vsphere:
+                              The managed object ID.
+                          type: string
+                        instanceType:
+                          description: Selected InstanceType that will override the
+                            VM properties.
+                          type: string
+                        luks:
+                          description: Disk decryption LUKS keys
+                          properties:
+                            apiVersion:
+                              description: API version of the referent.
+                              type: string
+                            fieldPath:
+                              description: |-
+                                If referring to a piece of an object instead of an entire object, this string
+                                should contain a valid JSON/Go field access statement, such as desiredState.manifest.containers[2].
+                                For example, if the object reference is to a container within a pod, this would take on a value like:
+                                "spec.containers{name}" (where "name" refers to the name of the container that triggered
+                                the event) or if no container name is specified "spec.containers[2]" (container with
+                                index 2 in this pod). This syntax is chosen only to have some well-defined way of
+                                referencing a part of an object.
+                              type: string
+                            kind:
+                              description: |-
+                                Kind of the referent.
+                                More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+                              type: string
+                            name:
+                              description: |-
+                                Name of the referent.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            namespace:
+                              description: |-
+                                Namespace of the referent.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/
+                              type: string
+                            resourceVersion:
+                              description: |-
+                                Specific resourceVersion to which this reference is made, if any.
+                                More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency
+                              type: string
+                            uid:
+                              description: |-
+                                UID of the referent.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids
+                              type: string
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        migrateSharedDisks:
+                          description: |-
+                            MigrateSharedDisks controls whether shared disks are included in the migration for this VM.
+                            When nil (default), the plan-level migrateSharedDisks value is used.
+                            When explicitly set to true, shared disks are migrated for this VM.
+                            When explicitly set to false, shared disks are skipped for this VM.
+                          type: boolean
+                        name:
+                          description: |-
+                            An object Name.
+                            vsphere:
+                              A qualified name.
+                          type: string
+                        namespace:
+                          description: |-
+                            The VM Namespace
+                            Only relevant for an openshift source.
+                          type: string
+                        nbdeClevis:
+                          description: |-
+                            Attempt passphrase-less unlocking for all devices with Clevis, over the network.
+                            Conversion pod running on target cluster will attempt to connect to a TANG server, make sure TANG
+                            server is available on target network.
+                            https://docs.redhat.com/en/documentation/red_hat_enterprise_linux/8/html/security_hardening/configuring-automated-unlocking-of-encrypted-volumes-using-policy-based-decryption_security-hardening
+                            If both nbdeClevis and LUKS are configured, nbdeClevis takes precedence.
+                          type: boolean
+                        networkNameTemplate:
+                          description: |-
+                            NetworkNameTemplate is a template for generating network interface names in the target virtual machine.
+                            It follows Go template syntax and has access to the following variables:
+                              - .NetworkName: If target network is multus, name of the Multus network attachment definition, empty otherwise.
+                              - .NetworkNamespace: If target network is multus, namespace where the network attachment definition is located.
+                              - .NetworkType: type of the network ("Multus" or "Pod")
+                              - .NetworkIndex: sequential index of the network interface (0-based)
+                            The template can be used to customize network interface names based on target network configuration.
+
+                            Provider support:
+                              - VMware (vSphere): Supported. Network interface names can be customized.
+                              - OpenShift: Not supported. Network interface names are preserved from the source VM.
+
+                            Note:
+                              - This template will override at the plan level template
+                              - If not specified on VM level and on Plan level, default naming conventions will be used
+                            Examples:
+                              "net-{{`{{`}}.NetworkIndex{{`}}`}}"
+                              "{{`{{`}}if eq .NetworkType "Pod"{{`}}`}}pod{{`{{`}}else{{`}}`}}multus-{{`{{`}}.NetworkIndex{{`}}`}}{{`{{`}}end{{`}}`}}"
+                          type: string
+                        newName:
+                          description: The new name of the VM after matching DNS1123
+                            requirements.
+                          type: string
+                        operatingSystem:
+                          description: The Operating System detected by virt-v2v.
+                          type: string
+                        phase:
+                          description: Phase
+                          type: string
+                        pipeline:
+                          description: Migration pipeline.
+                          items:
+                            description: Pipeline step.
+                            properties:
+                              annotations:
+                                additionalProperties:
+                                  type: string
+                                description: Annotations.
+                                type: object
+                              completed:
+                                description: Completed timestamp.
+                                format: date-time
+                                type: string
+                              description:
+                                description: Name
+                                type: string
+                              error:
+                                description: Error.
+                                properties:
+                                  phase:
+                                    type: string
+                                  reasons:
+                                    items:
+                                      type: string
+                                    type: array
+                                required:
+                                - phase
+                                - reasons
+                                type: object
+                              name:
+                                description: Name.
+                                type: string
+                              phase:
+                                description: Phase
+                                type: string
+                              progress:
+                                description: Progress.
+                                properties:
+                                  completed:
+                                    description: Completed units.
+                                    format: int64
+                                    type: integer
+                                  total:
+                                    description: Total units.
+                                    format: int64
+                                    type: integer
+                                required:
+                                - completed
+                                - total
+                                type: object
+                              reason:
+                                description: Reason
+                                type: string
+                              started:
+                                description: Started timestamp.
+                                format: date-time
+                                type: string
+                              tasks:
+                                description: Nested tasks.
+                                items:
+                                  description: Migration task.
+                                  properties:
+                                    annotations:
+                                      additionalProperties:
+                                        type: string
+                                      description: Annotations.
+                                      type: object
+                                    completed:
+                                      description: Completed timestamp.
+                                      format: date-time
+                                      type: string
+                                    description:
+                                      description: Name
+                                      type: string
+                                    error:
+                                      description: Error.
+                                      properties:
+                                        phase:
+                                          type: string
+                                        reasons:
+                                          items:
+                                            type: string
+                                          type: array
+                                      required:
+                                      - phase
+                                      - reasons
+                                      type: object
+                                    name:
+                                      description: Name.
+                                      type: string
+                                    phase:
+                                      description: Phase
+                                      type: string
+                                    progress:
+                                      description: Progress.
+                                      properties:
+                                        completed:
+                                          description: Completed units.
+                                          format: int64
+                                          type: integer
+                                        total:
+                                          description: Total units.
+                                          format: int64
+                                          type: integer
+                                      required:
+                                      - completed
+                                      - total
+                                      type: object
+                                    reason:
+                                      description: Reason
+                                      type: string
+                                    started:
+                                      description: Started timestamp.
+                                      format: date-time
+                                      type: string
+                                  required:
+                                  - name
+                                  - progress
+                                  type: object
+                                type: array
+                            required:
+                            - name
+                            - progress
+                            type: object
+                          type: array
+                        pvcNameTemplate:
+                          description: "PVCNameTemplate is a template for generating
+                            PVC names for VM disks.\nGenerated names must be valid
+                            DNS-1123 labels (lowercase alphanumerics, '-' allowed,
+                            max 63 chars).\nIt follows Go template syntax and has
+                            access to provider-specific variables.\n\nCommon variables
+                            (all providers):\n  - .VmName: name of the VM in the source
+                            cluster (original source name)\n  - .TargetVmName: final
+                            VM name in the target cluster (may equal .VmName if no
+                            rename/normalization)\n  - .PlanName: name of the migration
+                            plan\n  - .DiskIndex: initial volume index of the disk\n\nVMware
+                            (vSphere) specific variables:\n  - .WinDriveLetter: Windows
+                            drive letter (lowercase, if applicable, e.g. \"c\", requires
+                            guest agent)\n  - .RootDiskIndex: index of the root disk\n
+                            \ - .Shared: true if the volume is shared by multiple
+                            VMs, false otherwise\n  - .FileName: name of the file
+                            in the source provider (filename includes the .vmdk suffix)\n\nOpenShift
+                            specific variables:\n  - .SourcePVCName: name of the PVC
+                            in the source cluster\n  - .SourcePVCNamespace: namespace
+                            of the PVC in the source cluster\n\nNote:\n  This template
+                            overrides the plan level template.\nExamples:\n  \"{{`{{`}}.TargetVmName{{`}}`}}-disk-{{`{{`}}.DiskIndex{{`}}`}}\"\n
+                            \ \"{{`{{`}}if eq .DiskIndex .RootDiskIndex{{`}}`}}root{{`{{`}}else{{`}}`}}data{{`{{`}}end{{`}}`}}-{{`{{`}}.DiskIndex{{`}}`}}\"
+                            (VMware)\n  \"{{`{{`}}.TargetVmName{{`}}`}}-{{`{{`}}.SourcePVCName{{`}}`}}\" (OpenShift)\nSee:\n\t
+                            https://github.com/kubev2v/forklift/tree/main/pkg/templateutil
+                            for template functions."
+                          type: string
+                        rdmAsLun:
+                          description: |-
+                            RDMAsLun controls whether RDM (Raw Device Mapping) disks from VMware should be
+                            mapped as LUN devices in the target KubeVirt VM instead of regular disk devices.
+                            When nil (default), the plan-level rdmAsLun value is used.
+                            When explicitly set to true, RDM disks are attached using lun: {} for this VM.
+                            When explicitly set to false, RDM disks are attached as regular disks for this VM.
+                          type: boolean
+                        restorePowerState:
+                          description: Source VM power state before migration.
+                          type: string
+                        rootDisk:
+                          description: Choose the primary disk the VM boots from
+                          type: string
+                        started:
+                          description: Started timestamp.
+                          format: date-time
+                          type: string
+                        targetName:
+                          description: |-
+                            TargetName specifies a custom name for the VM in the target cluster.
+                            If not provided, the original VM name will be used and automatically adjusted to meet k8s DNS1123 requirements.
+                            If provided, this exact name will be used instead. The migration will fail if the name is not unique or already in use.
+                          type: string
+                        targetPowerState:
+                          description: |-
+                            TargetPowerState specifies the desired power state of the target VM after migration.
+                            - "on": Target VM will be powered on after migration
+                            - "off": Target VM will be powered off after migration
+                            - "auto" or nil (default): Target VM will match the source VM's power state
+                          enum:
+                          - "on"
+                          - "off"
+                          - auto
+                          type: string
+                        type:
+                          description: Type used to qualify the name.
+                          type: string
+                        volumeNameTemplate:
+                          description: |-
+                            VolumeNameTemplate is a template for generating volume interface names in the target virtual machine.
+                            It follows Go template syntax and has access to the following variables:
+                              - .PVCName: name of the PVC mounted to the VM using this volume
+                              - .VolumeIndex: sequential index of the volume interface (0-based)
+
+                            Provider support:
+                              - VMware (vSphere): Supported. Default naming is "vol-{index}".
+                              - OpenShift: Not supported. Volume names are preserved from the source VM.
+
+                            Note:
+                              - This template will override at the plan level template
+                              - If not specified on VM level and on Plan level, default naming conventions will be used
+                            Examples:
+                              "disk-{{`{{`}}.VolumeIndex{{`}}`}}"
+                              "pvc-{{`{{`}}.PVCName{{`}}`}}"
+                          type: string
+                        warm:
+                          description: Warm migration status
+                          properties:
+                            consecutiveFailures:
+                              type: integer
+                            failures:
+                              type: integer
+                            nextPrecopyAt:
+                              format: date-time
+                              type: string
+                            precopies:
+                              items:
+                                description: Precopy durations
+                                properties:
+                                  createTaskId:
+                                    type: string
+                                  deltas:
+                                    items:
+                                      properties:
+                                        deltaId:
+                                          type: string
+                                        disk:
+                                          type: string
+                                      required:
+                                      - deltaId
+                                      - disk
+                                      type: object
+                                    type: array
+                                  end:
+                                    format: date-time
+                                    type: string
+                                  removeTaskId:
+                                    type: string
+                                  snapshot:
+                                    type: string
+                                  start:
+                                    format: date-time
+                                    type: string
+                                type: object
+                              type: array
+                            successes:
+                              type: integer
+                          required:
+                          - consecutiveFailures
+                          - failures
+                          - successes
+                          type: object
+                      required:
+                      - phase
+                      - pipeline
+                      type: object
+                    type: array
+                type: object
+              observedGeneration:
+                description: The most recent generation observed by the controller.
+                format: int64
+                type: integer
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.17.3
+  name: providers.forklift.konveyor.io
+spec:
+  group: forklift.konveyor.io
+  names:
+    kind: Provider
+    listKind: ProviderList
+    plural: providers
+    singular: provider
+  scope: Namespaced
+  versions:
+  - additionalPrinterColumns:
+    - jsonPath: .spec.type
+      name: TYPE
+      type: string
+    - jsonPath: .status.phase
+      name: STATUS
+      type: string
+    - jsonPath: .status.conditions[?(@.type=='Ready')].status
+      name: READY
+      type: string
+    - jsonPath: .status.conditions[?(@.type=='ConnectionTestSucceeded')].status
+      name: CONNECTED
+      type: string
+    - jsonPath: .status.conditions[?(@.type=='InventoryCreated')].status
+      name: INVENTORY
+      type: string
+    - jsonPath: .spec.url
+      name: URL
+      type: string
+    - jsonPath: .metadata.creationTimestamp
+      name: AGE
+      type: date
+    name: v1beta1
+    schema:
+      openAPIV3Schema:
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: Defines the desired state of Provider.
+            properties:
+              secret:
+                description: |-
+                  References a secret containing credentials and
+                  other confidential information.
+                properties:
+                  apiVersion:
+                    description: API version of the referent.
+                    type: string
+                  fieldPath:
+                    description: |-
+                      If referring to a piece of an object instead of an entire object, this string
+                      should contain a valid JSON/Go field access statement, such as desiredState.manifest.containers[2].
+                      For example, if the object reference is to a container within a pod, this would take on a value like:
+                      "spec.containers{name}" (where "name" refers to the name of the container that triggered
+                      the event) or if no container name is specified "spec.containers[2]" (container with
+                      index 2 in this pod). This syntax is chosen only to have some well-defined way of
+                      referencing a part of an object.
+                    type: string
+                  kind:
+                    description: |-
+                      Kind of the referent.
+                      More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+                    type: string
+                  name:
+                    description: |-
+                      Name of the referent.
+                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                    type: string
+                  namespace:
+                    description: |-
+                      Namespace of the referent.
+                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/
+                    type: string
+                  resourceVersion:
+                    description: |-
+                      Specific resourceVersion to which this reference is made, if any.
+                      More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency
+                    type: string
+                  uid:
+                    description: |-
+                      UID of the referent.
+                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids
+                    type: string
+                type: object
+                x-kubernetes-map-type: atomic
+              settings:
+                additionalProperties:
+                  type: string
+                description: Provider settings.
+                type: object
+              type:
+                description: Provider type.
+                type: string
+              url:
+                description: |-
+                  The provider URL.
+                  Empty may be used for the `host` provider.
+                type: string
+            required:
+            - secret
+            - type
+            type: object
+          status:
+            description: ProviderStatus defines the observed state of Provider
+            properties:
+              conditions:
+                description: List of conditions.
+                items:
+                  description: Condition
+                  properties:
+                    category:
+                      description: The condition category.
+                      type: string
+                    durable:
+                      description: The condition is durable - never un-staged.
+                      type: boolean
+                    items:
+                      description: A list of items referenced in the `Message`.
+                      items:
+                        type: string
+                      type: array
+                    lastTransitionTime:
+                      description: When the last status transition occurred.
+                      format: date-time
+                      type: string
+                    message:
+                      description: The human readable description of the condition.
+                      type: string
+                    reason:
+                      description: The reason for the condition or transition.
+                      type: string
+                    status:
+                      description: The condition status [true,false].
+                      type: string
+                    suggestion:
+                      description: A suggested action or resolution for the condition.
+                      type: string
+                    type:
+                      description: The condition type.
+                      type: string
+                  required:
+                  - category
+                  - lastTransitionTime
+                  - status
+                  - type
+                  type: object
+                type: array
+              fingerprint:
+                description: Fingerprint.
+                type: string
+              observedGeneration:
+                description: The most recent generation observed by the controller.
+                format: int64
+                type: integer
+              phase:
+                description: Current life cycle phase of the provider.
+                type: string
+              secretResourceVersion:
+                description: |-
+                  The ResourceVersion of the secret referenced by this provider.
+                  Used to detect when credentials have been rotated.
+                type: string
+              service:
+                description: Provider service reference
+                properties:
+                  apiVersion:
+                    description: API version of the referent.
+                    type: string
+                  fieldPath:
+                    description: |-
+                      If referring to a piece of an object instead of an entire object, this string
+                      should contain a valid JSON/Go field access statement, such as desiredState.manifest.containers[2].
+                      For example, if the object reference is to a container within a pod, this would take on a value like:
+                      "spec.containers{name}" (where "name" refers to the name of the container that triggered
+                      the event) or if no container name is specified "spec.containers[2]" (container with
+                      index 2 in this pod). This syntax is chosen only to have some well-defined way of
+                      referencing a part of an object.
+                    type: string
+                  kind:
+                    description: |-
+                      Kind of the referent.
+                      More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+                    type: string
+                  name:
+                    description: |-
+                      Name of the referent.
+                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                    type: string
+                  namespace:
+                    description: |-
+                      Namespace of the referent.
+                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/
+                    type: string
+                  resourceVersion:
+                    description: |-
+                      Specific resourceVersion to which this reference is made, if any.
+                      More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency
+                    type: string
+                  uid:
+                    description: |-
+                      UID of the referent.
+                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids
+                    type: string
+                type: object
+                x-kubernetes-map-type: atomic
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.17.3
+  name: storagemaps.forklift.konveyor.io
+spec:
+  group: forklift.konveyor.io
+  names:
+    kind: StorageMap
+    listKind: StorageMapList
+    plural: storagemaps
+    singular: storagemap
+  scope: Namespaced
+  versions:
+  - additionalPrinterColumns:
+    - jsonPath: .status.conditions[?(@.type=='Ready')].status
+      name: READY
+      type: string
+    - jsonPath: .metadata.creationTimestamp
+      name: AGE
+      type: date
+    name: v1beta1
+    schema:
+      openAPIV3Schema:
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: Storage map spec.
+            properties:
+              map:
+                description: Map.
+                items:
+                  description: Mapped storage.
+                  properties:
+                    destination:
+                      description: Destination storage.
+                      properties:
+                        accessMode:
+                          description: Access mode.
+                          enum:
+                          - ReadWriteOnce
+                          - ReadWriteMany
+                          - ReadOnlyMany
+                          type: string
+                        storageClass:
+                          description: A storage class.
+                          type: string
+                        volumeMode:
+                          description: Volume mode.
+                          enum:
+                          - Filesystem
+                          - Block
+                          type: string
+                      required:
+                      - storageClass
+                      type: object
+                    offloadPlugin:
+                      description: Offload Plugin
+                      properties:
+                        vsphereXcopyConfig:
+                          description: |-
+                            VSphereXcopyPluginConfig works with the Vsphere Xcopy Volume Populator
+                            to offload the copy to Vsphere and the storage array.
+                          properties:
+                            secretRef:
+                              description: |-
+                                SecretRef is the name of the secret with the storage credentials for the plugin.
+                                The secret should reside in the same namespace where the source provider is.
+                              type: string
+                            storageVendorProduct:
+                              description: StorageVendorProduct the string identifier
+                                of the storage vendor product
+                              enum:
+                              - flashsystem
+                              - vantara
+                              - ontap
+                              - primera3par
+                              - pureFlashArray
+                              - powerflex
+                              - powermax
+                              - powerstore
+                              - infinibox
+                              type: string
+                          required:
+                          - secretRef
+                          - storageVendorProduct
+                          type: object
+                      required:
+                      - vsphereXcopyConfig
+                      type: object
+                    source:
+                      description: Source storage.
+                      properties:
+                        id:
+                          description: |-
+                            The object ID.
+                            vsphere:
+                              The managed object ID.
+                          type: string
+                        name:
+                          description: |-
+                            An object Name.
+                            vsphere:
+                              A qualified name.
+                          type: string
+                        namespace:
+                          description: |-
+                            The VM Namespace
+                            Only relevant for an openshift source.
+                          type: string
+                        type:
+                          description: Type used to qualify the name.
+                          type: string
+                      type: object
+                  required:
+                  - destination
+                  - source
+                  type: object
+                type: array
+              provider:
+                description: Provider
+                properties:
+                  destination:
+                    description: Destination.
+                    properties:
+                      apiVersion:
+                        description: API version of the referent.
+                        type: string
+                      fieldPath:
+                        description: |-
+                          If referring to a piece of an object instead of an entire object, this string
+                          should contain a valid JSON/Go field access statement, such as desiredState.manifest.containers[2].
+                          For example, if the object reference is to a container within a pod, this would take on a value like:
+                          "spec.containers{name}" (where "name" refers to the name of the container that triggered
+                          the event) or if no container name is specified "spec.containers[2]" (container with
+                          index 2 in this pod). This syntax is chosen only to have some well-defined way of
+                          referencing a part of an object.
+                        type: string
+                      kind:
+                        description: |-
+                          Kind of the referent.
+                          More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+                        type: string
+                      name:
+                        description: |-
+                          Name of the referent.
+                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                        type: string
+                      namespace:
+                        description: |-
+                          Namespace of the referent.
+                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/
+                        type: string
+                      resourceVersion:
+                        description: |-
+                          Specific resourceVersion to which this reference is made, if any.
+                          More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency
+                        type: string
+                      uid:
+                        description: |-
+                          UID of the referent.
+                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids
+                        type: string
+                    type: object
+                    x-kubernetes-map-type: atomic
+                  source:
+                    description: Source.
+                    properties:
+                      apiVersion:
+                        description: API version of the referent.
+                        type: string
+                      fieldPath:
+                        description: |-
+                          If referring to a piece of an object instead of an entire object, this string
+                          should contain a valid JSON/Go field access statement, such as desiredState.manifest.containers[2].
+                          For example, if the object reference is to a container within a pod, this would take on a value like:
+                          "spec.containers{name}" (where "name" refers to the name of the container that triggered
+                          the event) or if no container name is specified "spec.containers[2]" (container with
+                          index 2 in this pod). This syntax is chosen only to have some well-defined way of
+                          referencing a part of an object.
+                        type: string
+                      kind:
+                        description: |-
+                          Kind of the referent.
+                          More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+                        type: string
+                      name:
+                        description: |-
+                          Name of the referent.
+                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                        type: string
+                      namespace:
+                        description: |-
+                          Namespace of the referent.
+                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/
+                        type: string
+                      resourceVersion:
+                        description: |-
+                          Specific resourceVersion to which this reference is made, if any.
+                          More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency
+                        type: string
+                      uid:
+                        description: |-
+                          UID of the referent.
+                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids
+                        type: string
+                    type: object
+                    x-kubernetes-map-type: atomic
+                required:
+                - destination
+                - source
+                type: object
+            required:
+            - map
+            - provider
+            type: object
+          status:
+            description: MapStatus defines the observed state of Maps.
+            properties:
+              conditions:
+                description: List of conditions.
+                items:
+                  description: Condition
+                  properties:
+                    category:
+                      description: The condition category.
+                      type: string
+                    durable:
+                      description: The condition is durable - never un-staged.
+                      type: boolean
+                    items:
+                      description: A list of items referenced in the `Message`.
+                      items:
+                        type: string
+                      type: array
+                    lastTransitionTime:
+                      description: When the last status transition occurred.
+                      format: date-time
+                      type: string
+                    message:
+                      description: The human readable description of the condition.
+                      type: string
+                    reason:
+                      description: The reason for the condition or transition.
+                      type: string
+                    status:
+                      description: The condition status [true,false].
+                      type: string
+                    suggestion:
+                      description: A suggested action or resolution for the condition.
+                      type: string
+                    type:
+                      description: The condition type.
+                      type: string
+                  required:
+                  - category
+                  - lastTransitionTime
+                  - status
+                  - type
+                  type: object
+                type: array
+              observedGeneration:
+                description: The most recent generation observed by the controller.
+                format: int64
+                type: integer
+              references:
+                items:
+                  description: |-
+                    Source reference.
+                    Either the ID or Name must be specified.
+                  properties:
+                    id:
+                      description: |-
+                        The object ID.
+                        vsphere:
+                          The managed object ID.
+                      type: string
+                    name:
+                      description: |-
+                        An object Name.
+                        vsphere:
+                          A qualified name.
+                      type: string
+                    namespace:
+                      description: |-
+                        The VM Namespace
+                        Only relevant for an openshift source.
+                      type: string
+                    type:
+                      description: Type used to qualify the name.
+                      type: string
+                  type: object
+                type: array
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.17.3
+  name: vspherexcopyvolumepopulators.forklift.konveyor.io
+spec:
+  group: forklift.konveyor.io
+  names:
+    kind: VSphereXcopyVolumePopulator
+    listKind: VSphereXcopyVolumePopulatorList
+    plural: vspherexcopyvolumepopulators
+    shortNames:
+    - vxvp
+    - vxvps
+    singular: vspherexcopyvolumepopulator
+  scope: Namespaced
+  versions:
+  - name: v1beta1
+    schema:
+      openAPIV3Schema:
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          metadata:
+            type: object
+          spec:
+            properties:
+              secretName:
+                description: The secret name with vsphere and storage credentials
+                type: string
+              storageVendorProduct:
+                description: |-
+                  StorageVendorProduct is the storage vendor the target disk and PVC are connected to
+                  Supported values [vantara, ontap, primera3par]
+                type: string
+              vmId:
+                description: VmId is the VM object id in vSphere
+                type: string
+              vmdkPath:
+                description: |-
+                  VmdkPath is the full path the vmdk disk. A valid path format is
+                  '[$DATASTORE_NAME] $VM_HOME/$DISK_NAME.vmdk'
+                type: string
+            required:
+            - secretName
+            - storageVendorProduct
+            - vmId
+            - vmdkPath
+            type: object
+          status:
+            properties:
+              progress:
+                type: string
+            type: object
+        required:
+        - spec
+        type: object
+    served: true
+    storage: true
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: forklift-api
+  namespace: cozy-forklift
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: forklift-controller
+  namespace: cozy-forklift
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: forklift-operator
+  namespace: cozy-forklift
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: forklift-populator-controller
+  namespace: cozy-forklift
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: leader-election-role
+  namespace: cozy-forklift
+rules:
+- apiGroups:
+  - ""
+  resources:
+  - pods
+  - services
+  - services/finalizers
+  - endpoints
+  - persistentvolumeclaims
+  - events
+  - configmaps
+  - secrets
+  - namespaces
+  verbs:
+  - '*'
+- apiGroups:
+  - route.openshift.io
+  resources:
+  - routes
+  verbs:
+  - '*'
+- apiGroups:
+  - apps
+  resources:
+  - deployments
+  - daemonsets
+  - replicasets
+  - statefulsets
+  verbs:
+  - '*'
+- apiGroups:
+  - monitoring.coreos.com
+  resources:
+  - servicemonitors
+  - prometheusrules
+  verbs:
+  - get
+  - create
+  - update
+  - patch
+  - list
+  - watch
+- apiGroups:
+  - apps.openshift.io
+  resources:
+  - deploymentconfigs
+  verbs:
+  - get
+  - list
+  - watch
+  - create
+  - update
+  - patch
+  - delete
+- apiGroups:
+  - apps
+  resourceNames:
+  - forklift-operator
+  resources:
+  - deployments/finalizers
+  verbs:
+  - update
+- apiGroups:
+  - forklift.konveyor.io
+  resources:
+  - '*'
+  verbs:
+  - '*'
+- apiGroups:
+  - coordination.k8s.io
+  resources:
+  - leases
+  verbs:
+  - get
+  - list
+  - watch
+  - create
+  - update
+  - patch
+- apiGroups:
+  - build.openshift.io
+  resources:
+  - builds
+  - buildconfigs
+  - buildconfigs/instantiate
+  verbs:
+  - create
+  - get
+  - list
+  - watch
+  - update
+  - patch
+- apiGroups:
+  - image.openshift.io
+  resources:
+  - imagestreamtags
+  - imagestreams
+  verbs:
+  - create
+  - get
+  - list
+  - watch
+  - update
+  - patch
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: forklift-api-role
+rules:
+- apiGroups:
+  - forklift.konveyor.io
+  resources:
+  - plans
+  - providers
+  - storagemaps
+  - hosts
+  verbs:
+  - get
+  - list
+- apiGroups:
+  - storage.k8s.io
+  resources:
+  - storageclasses
+  verbs:
+  - get
+  - list
+- apiGroups:
+  - k8s.cni.cncf.io
+  resources:
+  - network-attachment-definitions
+  verbs:
+  - get
+  - list
+- apiGroups:
+  - authorization.k8s.io
+  resources:
+  - subjectaccessreviews
+  verbs:
+  - create
+- apiGroups:
+  - ""
+  resources:
+  - secrets
+  verbs:
+  - get
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: forklift-controller-role
+rules:
+- apiGroups:
+  - forklift.konveyor.io
+  resources:
+  - '*'
+  verbs:
+  - '*'
+- apiGroups:
+  - coordination.k8s.io
+  resources:
+  - leases
+  verbs:
+  - get
+  - list
+  - watch
+  - create
+  - update
+  - patch
+  - delete
+- apiGroups:
+  - ""
+  resources:
+  - pods
+  - secrets
+  - namespaces
+  - events
+  - configmaps
+  - persistentvolumes
+  - persistentvolumeclaims
+  - services
+  verbs:
+  - get
+  - list
+  - watch
+  - create
+  - update
+  - patch
+  - delete
+- apiGroups:
+  - batch
+  resources:
+  - jobs
+  verbs:
+  - get
+  - list
+  - watch
+  - create
+  - update
+  - patch
+  - delete
+- apiGroups:
+  - authentication.k8s.io
+  resources:
+  - tokenreviews
+  verbs:
+  - create
+- apiGroups:
+  - authorization.k8s.io
+  resources:
+  - subjectaccessreviews
+  verbs:
+  - create
+- apiGroups:
+  - k8s.cni.cncf.io
+  resources:
+  - network-attachment-definitions
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - storage.k8s.io
+  resources:
+  - storageclasses
+  - csidrivers
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - kubevirt.io
+  resources:
+  - virtualmachines
+  - virtualmachines/finalizers
+  - virtualmachineinstancemigrations
+  verbs:
+  - get
+  - list
+  - watch
+  - create
+  - update
+  - patch
+  - delete
+- apiGroups:
+  - kubevirt.io
+  resources:
+  - kubevirts
+  - virtualmachineinstances
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - cdi.kubevirt.io
+  resources:
+  - datavolumes
+  - datavolumes/finalizers
+  verbs:
+  - get
+  - list
+  - watch
+  - create
+  - update
+  - patch
+  - delete
+- apiGroups:
+  - security.openshift.io
+  resourceNames:
+  - anyuid
+  resources:
+  - securitycontextconstraints
+  verbs:
+  - use
+- apiGroups:
+  - template.openshift.io
+  resources:
+  - templates
+  verbs:
+  - get
+  - list
+- apiGroups:
+  - export.kubevirt.io
+  resources:
+  - virtualmachineexports
+  verbs:
+  - get
+  - list
+  - watch
+  - create
+  - update
+  - patch
+  - delete
+- apiGroups:
+  - apps
+  resources:
+  - deployments
+  verbs:
+  - get
+  - list
+  - watch
+  - create
+  - update
+  - patch
+  - delete
+- apiGroups:
+  - instancetype.kubevirt.io
+  resources:
+  - virtualmachineclusterpreferences
+  - virtualmachineclusterinstancetypes
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - instancetype.kubevirt.io
+  resources:
+  - virtualmachinepreferences
+  - virtualmachineinstancetypes
+  verbs:
+  - get
+  - list
+  - watch
+  - create
+  - update
+  - patch
+  - delete
+- apiGroups:
+  - ""
+  resources:
+  - serviceaccounts
+  verbs:
+  - get
+  - list
+  - watch
+  - create
+- apiGroups:
+  - rbac.authorization.k8s.io
+  resources:
+  - roles
+  - rolebindings
+  - clusterroles
+  - clusterrolebindings
+  verbs:
+  - get
+  - patch
+  - create
+- apiGroups:
+  - build.openshift.io
+  resources:
+  - builds
+  - buildconfigs
+  - buildconfigs/instantiate
+  verbs:
+  - create
+  - get
+  - list
+  - watch
+  - update
+- apiGroups:
+  - image.openshift.io
+  resources:
+  - imagestreamtags
+  - imagestreams
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - route.openshift.io
+  resources:
+  - routes
+  verbs:
+  - create
+  - get
+  - list
+  - watch
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: forklift-migrator-role
+rules:
+- apiGroups:
+  - ""
+  resources:
+  - events
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - batch
+  resources:
+  - jobs
+  verbs:
+  - get
+  - list
+  - watch
+  - create
+  - update
+  - patch
+  - delete
+- apiGroups:
+  - ""
+  resources:
+  - pods
+  - secrets
+  - configmaps
+  - services
+  - namespaces
+  - persistentvolumes
+  - persistentvolumeclaims
+  verbs:
+  - get
+  - list
+  - watch
+  - create
+  - update
+  - patch
+  - delete
+- apiGroups:
+  - k8s.cni.cncf.io
+  resources:
+  - network-attachment-definitions
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - storage.k8s.io
+  resources:
+  - storageclasses
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - kubevirt.io
+  resources:
+  - virtualmachines
+  - virtualmachines/finalizers
+  - virtualmachineinstancemigrations
+  verbs:
+  - get
+  - list
+  - watch
+  - create
+  - update
+  - patch
+  - delete
+- apiGroups:
+  - kubevirt.io
+  resources:
+  - kubevirts
+  - virtualmachineinstances
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - cdi.kubevirt.io
+  resources:
+  - datavolumes
+  - datavolumes/finalizers
+  verbs:
+  - get
+  - list
+  - watch
+  - create
+  - update
+  - patch
+  - delete
+- apiGroups:
+  - export.kubevirt.io
+  resources:
+  - virtualmachineexports
+  verbs:
+  - get
+  - list
+  - watch
+  - create
+  - update
+  - patch
+  - delete
+- apiGroups:
+  - instancetype.kubevirt.io
+  resources:
+  - virtualmachineclusterpreferences
+  - virtualmachineclusterinstancetypes
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - instancetype.kubevirt.io
+  resources:
+  - virtualmachinepreferences
+  - virtualmachineinstancetypes
+  verbs:
+  - get
+  - list
+  - watch
+  - create
+  - update
+  - patch
+  - delete
+- apiGroups:
+  - multicluster.x-k8s.io
+  resources:
+  - serviceexports
+  verbs:
+  - get
+  - list
+  - watch
+  - create
+  - update
+  - patch
+  - delete
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: forklift-populator-controller-role
+rules:
+- apiGroups:
+  - forklift.konveyor.io
+  resources:
+  - '*'
+  verbs:
+  - '*'
+- apiGroups:
+  - ""
+  resources:
+  - pods
+  - secrets
+  - namespaces
+  - events
+  - configmaps
+  - persistentvolumes
+  - persistentvolumeclaims
+  - services
+  verbs:
+  - get
+  - list
+  - watch
+  - create
+  - update
+  - patch
+  - delete
+- apiGroups:
+  - batch
+  resources:
+  - jobs
+  verbs:
+  - get
+  - list
+  - watch
+  - create
+  - update
+  - patch
+  - delete
+- apiGroups:
+  - authentication.k8s.io
+  resources:
+  - tokenreviews
+  verbs:
+  - create
+- apiGroups:
+  - authorization.k8s.io
+  resources:
+  - subjectaccessreviews
+  verbs:
+  - create
+- apiGroups:
+  - k8s.cni.cncf.io
+  resources:
+  - network-attachment-definitions
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - storage.k8s.io
+  resources:
+  - storageclasses
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - kubevirt.io
+  resources:
+  - virtualmachines
+  - virtualmachines/finalizers
+  verbs:
+  - get
+  - list
+  - watch
+  - create
+  - update
+  - patch
+  - delete
+- apiGroups:
+  - cdi.kubevirt.io
+  resources:
+  - datavolumes
+  - datavolumes/finalizers
+  verbs:
+  - get
+  - list
+  - watch
+  - create
+  - update
+  - patch
+  - delete
+- apiGroups:
+  - security.openshift.io
+  resourceNames:
+  - anyuid
+  resources:
+  - securitycontextconstraints
+  verbs:
+  - use
+- apiGroups:
+  - template.openshift.io
+  resources:
+  - templates
+  verbs:
+  - get
+  - list
+- apiGroups:
+  - export.kubevirt.io
+  resources:
+  - virtualmachineexports
+  verbs:
+  - get
+  - list
+  - watch
+  - create
+  - update
+  - patch
+  - delete
+- apiGroups:
+  - apps
+  resources:
+  - deployments
+  verbs:
+  - get
+  - list
+  - watch
+  - create
+  - update
+  - patch
+  - delete
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: manager-role
+rules:
+- apiGroups:
+  - ""
+  resources:
+  - namespaces
+  verbs:
+  - list
+  - watch
+- apiGroups:
+  - config.openshift.io
+  resources:
+  - clusterversions
+  - proxies
+  verbs:
+  - get
+- apiGroups:
+  - oauth.openshift.io
+  resources:
+  - oauthclients
+  verbs:
+  - '*'
+- apiGroups:
+  - forklift.konveyor.io
+  resources:
+  - forkliftcontrollers
+  - forkliftcontrollers/status
+  - forkliftcontrollers/finalizers
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - console.openshift.io
+  resources:
+  - consoleplugins
+  - consoleclidownloads
+  verbs:
+  - '*'
+- apiGroups:
+  - route.openshift.io
+  resources:
+  - routes
+  verbs:
+  - '*'
+- apiGroups:
+  - operator.openshift.io
+  resources:
+  - consoles
+  verbs:
+  - get
+  - list
+  - watch
+  - update
+  - patch
+- apiGroups:
+  - admissionregistration.k8s.io
+  resources:
+  - mutatingwebhookconfigurations
+  - validatingwebhookconfigurations
+  verbs:
+  - '*'
+- apiGroups:
+  - cert-manager.io
+  resources:
+  - issuers
+  - certificates
+  verbs:
+  - '*'
+- apiGroups:
+  - security.openshift.io
+  resources:
+  - securitycontextconstraints
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - watch
+  - update
+  - patch
+- apiGroups:
+  - k8s.cni.cncf.io
+  resources:
+  - network-attachment-definitions
+  verbs:
+  - get
+  - list
+  - watch
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: leader-election-rolebinding
+  namespace: cozy-forklift
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: leader-election-role
+subjects:
+- kind: ServiceAccount
+  name: forklift-operator
+  namespace: cozy-forklift
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: forklift-api-rolebinding
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: forklift-api-role
+subjects:
+- kind: ServiceAccount
+  name: forklift-api
+  namespace: cozy-forklift
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: forklift-controller-rolebinding
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: forklift-controller-role
+subjects:
+- kind: ServiceAccount
+  name: forklift-controller
+  namespace: cozy-forklift
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: forklift-populator-controller-rolebinding
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: forklift-populator-controller-role
+subjects:
+- kind: ServiceAccount
+  name: forklift-populator-controller
+  namespace: cozy-forklift
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: manager-rolebinding
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: manager-role
+subjects:
+- kind: ServiceAccount
+  name: forklift-operator
+  namespace: cozy-forklift
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  labels:
+    control-plane: controller-manager
+  name: forklift-operator
+  namespace: cozy-forklift
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: forklift
+      name: controller-manager
+  template:
+    metadata:
+      labels:
+        app: forklift
+        name: controller-manager
+    spec:
+      containers:
+      - args:
+        - --health-probe-bind-address=:6789
+        - --metrics-bind-address=127.0.0.1:8080
+        - --leader-elect
+        - --leader-election-id=forklift-operator
+        env:
+        - name: WATCH_NAMESPACE
+          value: cozy-forklift
+        - name: ANSIBLE_GATHERING
+          value: explicit
+        - name: CONTROLLER_IMAGE
+          value: quay.io/kubev2v/forklift-controller:release-2.11@sha256:2600e68a235e4c3351a38ce2dd97562206795a733abd8b0cfd8444a541b0db51
+        - name: API_IMAGE
+          value: quay.io/kubev2v/forklift-api:release-2.11@sha256:f8ad08949f5d0f051a81b2e198df7273f55d16cfd41878f41133e3a0ed1ad5ec
+        - name: MUST_GATHER_IMAGE
+          value: quay.io/kubev2v/forklift-must-gather:v2.7.1@sha256:62eecec1408be00e907fbde6b13be9223fdbca116933ecba85cd87d68d6acfbb
+        - name: UI_PLUGIN_IMAGE
+          value: quay.io/kubev2v/forklift-console-plugin:release-v2.6.7@sha256:99c34ac714604853f4abf589e1ccddb13cd9eaf1bd1eae2c928c622deb22304d
+        - name: CLI_DOWNLOAD_IMAGE
+          value: quay.io/kubev2v/forklift-cli-download:release-2.11@sha256:8d59927b902bbdea6ecb76c0bae358c9d9d2ed40aaa56155d82d8c15ac56634a
+        - name: VALIDATION_IMAGE
+          value: quay.io/kubev2v/forklift-validation:release-2.11@sha256:fc06f88fe54130ca24d39f4c9261e2359c122cb7b5146fa93403e8b0f0c0716f
+        - name: VIRT_V2V_IMAGE
+          value: quay.io/kubev2v/forklift-virt-v2v:release-2.11@sha256:fe373a538db180c5bed2c99df667a450c432671ad02057d4c692776f7d7cc203
+        - name: VIRT_V2V_IMAGE_XFS
+          value: quay.io/kubev2v/forklift-virt-v2v-xfs:release-2.11@sha256:5402dbc95daacb7d5caab2c855c1cb6889575e2d9d4d282ce9dae201d6cf0331
+        - name: VIRT_V2V_DONT_REQUEST_KVM
+          value: "false"
+        - name: SNAPSHOT_REMOVAL_TIMEOUT
+          value: "120"
+        - name: SNAPSHOT_STATUS_CHECK_RATE
+          value: "10"
+        - name: CLEANUP_RETRIES
+          value: "10"
+        - name: CDI_EXPORT_TOKEN_TTL
+          value: ""
+        - name: FILESYSTEM_OVERHEAD
+          value: "0.055"
+        - name: BLOCK_OVERHEAD
+          value: "0"
+        - name: POPULATOR_CONTROLLER_IMAGE
+          value: quay.io/kubev2v/populator-controller:release-2.11@sha256:70d8dc184b41168496d280622e41e8d7fc15c82640be6f025c22d101c1f336bb
+        - name: OVIRT_POPULATOR_IMAGE
+          value: quay.io/kubev2v/ovirt-populator:release-2.11@sha256:223857c91dd2a1050d6d087c6b58845bada676a54d450a7ef7bc7c7bfec28784
+        - name: OPENSTACK_POPULATOR_IMAGE
+          value: quay.io/kubev2v/openstack-populator:release-2.11@sha256:f50cfb4f4bc86666ba5cd304f1baa95bbefc843ee677ad338e927cbef88604b0
+        - name: OVA_PROVIDER_SERVER_IMAGE
+          value: quay.io/kubev2v/forklift-ova-provider-server:release-2.11@sha256:5901f34027354554f91f2be6669eb458bcb0a568d572c93188a3313904e0020a
+        - name: HYPERV_PROVIDER_SERVER_IMAGE
+          value: quay.io/kubev2v/forklift-hyperv-provider-server:release-2.11@sha256:7bba40b2fca79a96c3388cb1c4f4a71694f5059324ba52e5821342b3a3058e23
+        - name: OVA_PROXY_IMAGE
+          value: quay.io/kubev2v/forklift-ova-proxy:release-2.11@sha256:bd4e662e8c3055c7b4aa2ce1db80ec06b27016c9c39e0358d036031669fc88ca
+        - name: OVIRT_OS_MAP
+          value: ""
+        - name: VSPHERE_OS_MAP
+          value: ""
+        - name: VIRT_CUSTOMIZE_MAP
+          value: ""
+        - name: VSPHERE_XCOPY_VOLUME_POPULATOR_IMAGE
+          value: quay.io/kubev2v/vsphere-xcopy-volume-populator:release-2.11@sha256:e63773d07e8612e9d153d9e2b93df757d0887980f2455ea278f02c32821fd954
+        image: quay.io/kubev2v/forklift-operator:release-2.11@sha256:1ffde2c6b88419a2aee17b871eaf36c078af1f1b21369bf131b84f7b93cb012f
+        imagePullPolicy: Always
+        livenessProbe:
+          httpGet:
+            path: /healthz
+            port: 6789
+          initialDelaySeconds: 15
+          periodSeconds: 20
+        name: forklift-operator
+        readinessProbe:
+          httpGet:
+            path: /readyz
+            port: 6789
+          initialDelaySeconds: 5
+          periodSeconds: 10
+        resources:
+          requests:
+            cpu: 10m
+            memory: 64Mi
+      serviceAccountName: forklift-operator
diff --git a/packages/system/forklift-operator/tests/images_test.yaml b/packages/system/forklift-operator/tests/images_test.yaml
new file mode 100644
index 0000000000..470f90248d
--- /dev/null
+++ b/packages/system/forklift-operator/tests/images_test.yaml
@@ -0,0 +1,33 @@
+suite: forklift-operator image pinning
+release:
+  name: forklift-operator
+  namespace: cozy-forklift
+templates:
+  - templates/forklift-operator.yaml
+tests:
+  - it: pins must-gather and console-plugin to immutable digests, not :latest
+    documentSelector:
+      path: kind
+      value: Deployment
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: MUST_GATHER_IMAGE
+            value: quay.io/kubev2v/forklift-must-gather:v2.7.1@sha256:62eecec1408be00e907fbde6b13be9223fdbca116933ecba85cd87d68d6acfbb
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: UI_PLUGIN_IMAGE
+            value: quay.io/kubev2v/forklift-console-plugin:release-v2.6.7@sha256:99c34ac714604853f4abf589e1ccddb13cd9eaf1bd1eae2c928c622deb22304d
+
+  - it: pins the operator and controller images to immutable digests
+    documentSelector:
+      path: kind
+      value: Deployment
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: CONTROLLER_IMAGE
+            value: quay.io/kubev2v/forklift-controller:release-2.11@sha256:2600e68a235e4c3351a38ce2dd97562206795a733abd8b0cfd8444a541b0db51
diff --git a/packages/system/forklift/Chart.yaml b/packages/system/forklift/Chart.yaml
new file mode 100644
index 0000000000..1de8b9a41b
--- /dev/null
+++ b/packages/system/forklift/Chart.yaml
@@ -0,0 +1,3 @@
+apiVersion: v2
+name: cozy-forklift
+version: 0.0.0 # Placeholder, the actual version will be automatically set during the build process
diff --git a/packages/system/forklift/Makefile b/packages/system/forklift/Makefile
new file mode 100644
index 0000000000..5a11257484
--- /dev/null
+++ b/packages/system/forklift/Makefile
@@ -0,0 +1,7 @@
+export NAME=forklift
+export NAMESPACE=cozy-$(NAME)
+
+include ../../../hack/package.mk
+
+test:
+	helm unittest .
diff --git a/packages/system/forklift/templates/forklift-cr-cleanup-hook.yaml b/packages/system/forklift/templates/forklift-cr-cleanup-hook.yaml
new file mode 100644
index 0000000000..3938f7671c
--- /dev/null
+++ b/packages/system/forklift/templates/forklift-cr-cleanup-hook.yaml
@@ -0,0 +1,136 @@
+{{- /*
+  Uninstalling this chart deletes the ForkliftController CR, and the operator's
+  finalizer on it holds the delete open until the operator has torn its operand
+  down. If the operator is already gone — which is the normal order when the
+  whole bundle is being removed, since nothing sequences the operator package
+  against this one — nothing will ever clear that finalizer and the release
+  never finishes uninstalling. Observed live.
+
+  So: delete the CR first, give the operator a bounded chance to do it properly,
+  and only then clear the finalizer by hand. Doing it in that order means a
+  live operator still performs its own cleanup; the finalizer strip is the
+  fallback for when it cannot.
+
+  The hook always exits 0. A cleanup that cannot complete must not be the reason
+  an operator cannot uninstall the chart.
+*/ -}}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: forklift-cr-cleanup
+  namespace: {{ .Release.Namespace }}
+  annotations:
+    helm.sh/hook: pre-delete
+    helm.sh/hook-weight: "-10"
+    helm.sh/hook-delete-policy: hook-succeeded,hook-failed,before-hook-creation
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: forklift-cr-cleanup
+  namespace: cozy-forklift
+  annotations:
+    helm.sh/hook: pre-delete
+    helm.sh/hook-weight: "-10"
+    helm.sh/hook-delete-policy: hook-succeeded,hook-failed,before-hook-creation
+rules:
+  - apiGroups: ["forklift.konveyor.io"]
+    resources: ["forkliftcontrollers"]
+    resourceNames: ["forklift-controller"]
+    # get to poll for the delete completing, delete to start it, patch to clear
+    # the finalizer when the operator is no longer there to clear it itself.
+    verbs: ["get", "delete", "patch"]
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: forklift-cr-cleanup
+  namespace: cozy-forklift
+  annotations:
+    helm.sh/hook: pre-delete
+    helm.sh/hook-weight: "-10"
+    helm.sh/hook-delete-policy: hook-succeeded,hook-failed,before-hook-creation
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: forklift-cr-cleanup
+subjects:
+  - kind: ServiceAccount
+    name: forklift-cr-cleanup
+    namespace: {{ .Release.Namespace }}
+---
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: forklift-cr-cleanup
+  namespace: {{ .Release.Namespace }}
+  annotations:
+    helm.sh/hook: pre-delete
+    helm.sh/hook-weight: "0"
+    helm.sh/hook-delete-policy: hook-succeeded,before-hook-creation
+spec:
+  # Bounded so a wedged API call cannot hold helm uninstall open indefinitely.
+  activeDeadlineSeconds: 120
+  backoffLimit: 1
+  # Failed pods outlive the hook bundle so their logs can still be read.
+  ttlSecondsAfterFinished: 600
+  template:
+    spec:
+      serviceAccountName: forklift-cr-cleanup
+      restartPolicy: Never
+      securityContext:
+        runAsNonRoot: true
+        runAsUser: 65532
+        seccompProfile:
+          type: RuntimeDefault
+      # kubectl writes its discovery cache under $HOME; with a read-only root
+      # filesystem it aborts before running any subcommand unless HOME points
+      # at something writable.
+      volumes:
+        - name: kube-cache
+          emptyDir: {}
+      containers:
+        - name: cleanup
+          image: docker.io/clastix/kubectl:v1.32
+          securityContext:
+            allowPrivilegeEscalation: false
+            readOnlyRootFilesystem: true
+            capabilities:
+              drop: ["ALL"]
+          env:
+            - name: HOME
+              value: /tmp
+          volumeMounts:
+            - name: kube-cache
+              mountPath: /tmp
+          command:
+            - sh
+            - -c
+            - |
+              set -x
+              ns=cozy-forklift
+              cr=forklift-controller
+
+              kubectl -n "$ns" get forkliftcontroller "$cr" >/dev/null 2>&1 || {
+                echo "ForkliftController $cr already gone"
+                exit 0
+              }
+
+              kubectl -n "$ns" delete forkliftcontroller "$cr" --wait=false || true
+
+              # Give a live operator its chance to finish. 60s against the
+              # 120s activeDeadlineSeconds leaves room for the strip below.
+              i=0
+              while [ "$i" -lt 30 ]; do
+                kubectl -n "$ns" get forkliftcontroller "$cr" >/dev/null 2>&1 || {
+                  echo "operator completed its own teardown"
+                  exit 0
+                }
+                i=$((i + 1))
+                sleep 2
+              done
+
+              echo "finalizer still held after 60s; clearing it"
+              kubectl -n "$ns" patch forkliftcontroller "$cr" \
+                --type=merge -p '{"metadata":{"finalizers":null}}' || true
+              exit 0
diff --git a/packages/system/forklift/templates/forklift-cr.yaml b/packages/system/forklift/templates/forklift-cr.yaml
new file mode 100644
index 0000000000..9128949fcb
--- /dev/null
+++ b/packages/system/forklift/templates/forklift-cr.yaml
@@ -0,0 +1,11 @@
+apiVersion: forklift.konveyor.io/v1beta1
+kind: ForkliftController
+metadata:
+  name: forklift-controller
+  namespace: cozy-forklift
+spec:
+  feature_ui_plugin: "false"
+  feature_validation: "true"
+  feature_volume_populator: "true"
+  feature_auth_required: "true"
+  feature_cli_download: "false"
diff --git a/packages/system/forklift/tests/forklift-cr-cleanup-hook_test.yaml b/packages/system/forklift/tests/forklift-cr-cleanup-hook_test.yaml
new file mode 100644
index 0000000000..5926c2cf6a
--- /dev/null
+++ b/packages/system/forklift/tests/forklift-cr-cleanup-hook_test.yaml
@@ -0,0 +1,66 @@
+suite: forklift CR pre-delete cleanup
+# The operator holds a finalizer on the ForkliftController. When the whole
+# bundle is removed, nothing sequences the operator package against this one,
+# so the operator is usually gone before the CR is deleted — and then nothing
+# ever clears that finalizer and the release never finishes uninstalling.
+release:
+  name: forklift
+  namespace: cozy-forklift
+templates:
+  - templates/forklift-cr-cleanup-hook.yaml
+tests:
+  - it: runs before the release is deleted, and cleans itself up afterwards
+    documentSelector:
+      path: kind
+      value: Job
+    asserts:
+      - equal:
+          path: metadata.annotations["helm.sh/hook"]
+          value: pre-delete
+      - equal:
+          path: metadata.annotations["helm.sh/hook-delete-policy"]
+          value: hook-succeeded,before-hook-creation
+      # Bounded, or a wedged API call holds helm uninstall open indefinitely.
+      - equal:
+          path: spec.activeDeadlineSeconds
+          value: 120
+
+  - it: can delete the CR and clear its finalizer, and nothing else
+    documentSelector:
+      path: kind
+      value: Role
+    asserts:
+      - equal:
+          path: rules[0].apiGroups[0]
+          value: forklift.konveyor.io
+      - equal:
+          path: rules[0].resources[0]
+          value: forkliftcontrollers
+      # Named explicitly: the hook has no business touching any other CR.
+      - equal:
+          path: rules[0].resourceNames[0]
+          value: forklift-controller
+      - contains:
+          path: rules[0].verbs
+          content: delete
+      - contains:
+          path: rules[0].verbs
+          content: patch
+
+  - it: runs under the restricted pod security standard
+    documentSelector:
+      path: kind
+      value: Job
+    asserts:
+      - equal:
+          path: spec.template.spec.securityContext.runAsNonRoot
+          value: true
+      - equal:
+          path: spec.template.spec.containers[0].securityContext.allowPrivilegeEscalation
+          value: false
+      - equal:
+          path: spec.template.spec.containers[0].securityContext.readOnlyRootFilesystem
+          value: true
+      - contains:
+          path: spec.template.spec.containers[0].securityContext.capabilities.drop
+          content: ALL
diff --git a/packages/system/forklift/tests/forklift-cr_test.yaml b/packages/system/forklift/tests/forklift-cr_test.yaml
new file mode 100644
index 0000000000..ef8d23f547
--- /dev/null
+++ b/packages/system/forklift/tests/forklift-cr_test.yaml
@@ -0,0 +1,20 @@
+suite: forklift controller CR
+release:
+  name: forklift
+  namespace: cozy-forklift
+templates:
+  - templates/forklift-cr.yaml
+tests:
+  - it: renders the ForkliftController with the expected feature flags
+    asserts:
+      - isKind:
+          of: ForkliftController
+      - equal:
+          path: spec.feature_validation
+          value: "true"
+      - equal:
+          path: spec.feature_auth_required
+          value: "true"
+      - equal:
+          path: spec.feature_volume_populator
+          value: "true"
diff --git a/packages/system/forklift/values.yaml b/packages/system/forklift/values.yaml
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/system/foundationdb-operator/Makefile b/packages/system/foundationdb-operator/Makefile
index 16ca953f3f..c49a3b2f17 100644
--- a/packages/system/foundationdb-operator/Makefile
+++ b/packages/system/foundationdb-operator/Makefile
@@ -3,9 +3,12 @@ export NAMESPACE=cozy-$(NAME)
 
 include ../../../hack/package.mk
 
+test:
+	helm unittest .
+
 update:
-	rm -rf charts
-	git clone --depth 1 --branch v2.13.0 https://github.com/FoundationDB/fdb-kubernetes-operator.git tmp-repo
+	rm -rf charts tmp-repo
+	git clone --depth 1 --branch v2.30.0 https://github.com/FoundationDB/fdb-kubernetes-operator.git tmp-repo
 	mkdir -p charts
 	cp -r tmp-repo/charts/fdb-operator charts/
 	# Remove symlinked CRDs and replace with actual files
@@ -16,4 +19,10 @@ update:
 	cp tmp-repo/config/crd/bases/apps.foundationdb.org_foundationdbclusters.yaml charts/fdb-operator/crds/
 	cp tmp-repo/config/crd/bases/apps.foundationdb.org_foundationdbrestores.yaml charts/fdb-operator/crds/
 	rm -rf tmp-repo
-	rm -rf charts/fdb-operator/charts
\ No newline at end of file
+	rm -rf charts/fdb-operator/charts
+	# Every fdb-kubernetes-monitor 7.1.x image is amd64-only, so the 7.1 init
+	# container keeps the operator from starting on arm64; upstream itself
+	# swaps its 7.1 client for 7.3 there. A null in the package values would
+	# not do: Helm 4.2 and later ignore it when no user-supplied values reach
+	# the subchart (helm/helm#32132), and the platform supplies none.
+	yq -i 'del(.initContainers."7.1")' charts/fdb-operator/values.yaml
\ No newline at end of file
diff --git a/packages/system/foundationdb-operator/charts/fdb-operator/Chart.yaml b/packages/system/foundationdb-operator/charts/fdb-operator/Chart.yaml
index e9824f59f9..3d17846caf 100644
--- a/packages/system/foundationdb-operator/charts/fdb-operator/Chart.yaml
+++ b/packages/system/foundationdb-operator/charts/fdb-operator/Chart.yaml
@@ -15,9 +15,9 @@ sources:
 type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
-version: 0.2.0
+version: 0.3.0
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.
-appVersion: v2.13.0
+appVersion: v2.30.0
 maintainers:
   - name: "foundationdb-ci"
diff --git a/packages/system/foundationdb-operator/charts/fdb-operator/crds/apps.foundationdb.org_foundationdbbackups.yaml b/packages/system/foundationdb-operator/charts/fdb-operator/crds/apps.foundationdb.org_foundationdbbackups.yaml
index ee1f50d692..4e515b368e 100644
--- a/packages/system/foundationdb-operator/charts/fdb-operator/crds/apps.foundationdb.org_foundationdbbackups.yaml
+++ b/packages/system/foundationdb-operator/charts/fdb-operator/crds/apps.foundationdb.org_foundationdbbackups.yaml
@@ -3,8 +3,8 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
-    foundationdb.org/release: v2.13.0
+    controller-gen.kubebuilder.io/version: v0.20.1
+    foundationdb.org/release: v2.30.0
   name: foundationdbbackups.apps.foundationdb.org
 spec:
   group: apps.foundationdb.org
@@ -26,6 +26,10 @@ spec:
       jsonPath: .status.generations.reconciled
       name: Reconciled
       type: integer
+    - description: If the backup is restorable
+      jsonPath: .status.backupDetails.restorable
+      name: Restorable
+      type: boolean
     - jsonPath: .metadata.creationTimestamp
       name: Age
       type: date
@@ -65,6 +69,13 @@ spec:
                   namespace:
                     type: string
                 type: object
+              backupMode:
+                default: continuous
+                enum:
+                - continuous
+                - oneTime
+                maxLength: 64
+                type: string
               backupState:
                 enum:
                 - Running
@@ -76,6 +87,7 @@ spec:
                 enum:
                 - backup_agent
                 - partitioned_log
+                - unmanaged
                 maxLength: 64
                 type: string
               blobStoreConfiguration:
@@ -107,6 +119,16 @@ spec:
                   type: string
                 maxItems: 100
                 type: array
+              dataCenter:
+                type: string
+              deletionPolicy:
+                default: noop
+                enum:
+                - noop
+                - stop
+                - cleanup
+                maxLength: 64
+                type: string
               encryptionKeyPath:
                 maxLength: 4096
                 type: string
@@ -659,6 +681,23 @@ spec:
                                         - fieldPath
                                         type: object
                                         x-kubernetes-map-type: atomic
+                                      fileKeyRef:
+                                        properties:
+                                          key:
+                                            type: string
+                                          optional:
+                                            default: false
+                                            type: boolean
+                                          path:
+                                            type: string
+                                          volumeName:
+                                            type: string
+                                        required:
+                                        - key
+                                        - path
+                                        - volumeName
+                                        type: object
+                                        x-kubernetes-map-type: atomic
                                       resourceFieldRef:
                                         properties:
                                           containerName:
@@ -1087,6 +1126,29 @@ spec:
                               type: object
                             restartPolicy:
                               type: string
+                            restartPolicyRules:
+                              items:
+                                properties:
+                                  action:
+                                    type: string
+                                  exitCodes:
+                                    properties:
+                                      operator:
+                                        type: string
+                                      values:
+                                        items:
+                                          format: int32
+                                          type: integer
+                                        type: array
+                                        x-kubernetes-list-type: set
+                                    required:
+                                    - operator
+                                    type: object
+                                required:
+                                - action
+                                type: object
+                              type: array
+                              x-kubernetes-list-type: atomic
                             securityContext:
                               properties:
                                 allowPrivilegeEscalation:
@@ -1371,6 +1433,23 @@ spec:
                                         - fieldPath
                                         type: object
                                         x-kubernetes-map-type: atomic
+                                      fileKeyRef:
+                                        properties:
+                                          key:
+                                            type: string
+                                          optional:
+                                            default: false
+                                            type: boolean
+                                          path:
+                                            type: string
+                                          volumeName:
+                                            type: string
+                                        required:
+                                        - key
+                                        - path
+                                        - volumeName
+                                        type: object
+                                        x-kubernetes-map-type: atomic
                                       resourceFieldRef:
                                         properties:
                                           containerName:
@@ -1799,6 +1878,29 @@ spec:
                               type: object
                             restartPolicy:
                               type: string
+                            restartPolicyRules:
+                              items:
+                                properties:
+                                  action:
+                                    type: string
+                                  exitCodes:
+                                    properties:
+                                      operator:
+                                        type: string
+                                      values:
+                                        items:
+                                          format: int32
+                                          type: integer
+                                        type: array
+                                        x-kubernetes-list-type: set
+                                    required:
+                                    - operator
+                                    type: object
+                                required:
+                                - action
+                                type: object
+                              type: array
+                              x-kubernetes-list-type: atomic
                             securityContext:
                               properties:
                                 allowPrivilegeEscalation:
@@ -2040,6 +2142,8 @@ spec:
                         type: boolean
                       hostname:
                         type: string
+                      hostnameOverride:
+                        type: string
                       imagePullSecrets:
                         items:
                           properties:
@@ -2097,6 +2201,23 @@ spec:
                                         - fieldPath
                                         type: object
                                         x-kubernetes-map-type: atomic
+                                      fileKeyRef:
+                                        properties:
+                                          key:
+                                            type: string
+                                          optional:
+                                            default: false
+                                            type: boolean
+                                          path:
+                                            type: string
+                                          volumeName:
+                                            type: string
+                                        required:
+                                        - key
+                                        - path
+                                        - volumeName
+                                        type: object
+                                        x-kubernetes-map-type: atomic
                                       resourceFieldRef:
                                         properties:
                                           containerName:
@@ -2525,6 +2646,29 @@ spec:
                               type: object
                             restartPolicy:
                               type: string
+                            restartPolicyRules:
+                              items:
+                                properties:
+                                  action:
+                                    type: string
+                                  exitCodes:
+                                    properties:
+                                      operator:
+                                        type: string
+                                      values:
+                                        items:
+                                          format: int32
+                                          type: integer
+                                        type: array
+                                        x-kubernetes-list-type: set
+                                    required:
+                                    - operator
+                                    type: object
+                                required:
+                                - action
+                                type: object
+                              type: array
+                              x-kubernetes-list-type: atomic
                             securityContext:
                               properties:
                                 allowPrivilegeEscalation:
@@ -3621,6 +3765,29 @@ spec:
                                             type: array
                                             x-kubernetes-list-type: atomic
                                         type: object
+                                      podCertificate:
+                                        properties:
+                                          certificateChainPath:
+                                            type: string
+                                          credentialBundlePath:
+                                            type: string
+                                          keyPath:
+                                            type: string
+                                          keyType:
+                                            type: string
+                                          maxExpirationSeconds:
+                                            format: int32
+                                            type: integer
+                                          signerName:
+                                            type: string
+                                          userAnnotations:
+                                            additionalProperties:
+                                              type: string
+                                            type: object
+                                        required:
+                                        - keyType
+                                        - signerName
+                                        type: object
                                       secret:
                                         properties:
                                           items:
@@ -3811,6 +3978,18 @@ spec:
                         x-kubernetes-list-map-keys:
                         - name
                         x-kubernetes-list-type: map
+                      workloadRef:
+                        properties:
+                          name:
+                            type: string
+                          podGroup:
+                            type: string
+                          podGroupReplicaKey:
+                            type: string
+                        required:
+                        - name
+                        - podGroup
+                        type: object
                     required:
                     - containers
                     type: object
@@ -3861,6 +4040,8 @@ spec:
                 properties:
                   paused:
                     type: boolean
+                  restorable:
+                    type: boolean
                   running:
                     type: boolean
                   snapshotTime:
diff --git a/packages/system/foundationdb-operator/charts/fdb-operator/crds/apps.foundationdb.org_foundationdbclusters.yaml b/packages/system/foundationdb-operator/charts/fdb-operator/crds/apps.foundationdb.org_foundationdbclusters.yaml
index d65a97b1d7..fb0d667550 100644
--- a/packages/system/foundationdb-operator/charts/fdb-operator/crds/apps.foundationdb.org_foundationdbclusters.yaml
+++ b/packages/system/foundationdb-operator/charts/fdb-operator/crds/apps.foundationdb.org_foundationdbclusters.yaml
@@ -3,8 +3,8 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
-    foundationdb.org/release: v2.13.0
+    controller-gen.kubebuilder.io/version: v0.20.1
+    foundationdb.org/release: v2.30.0
   name: foundationdbclusters.apps.foundationdb.org
 spec:
   group: apps.foundationdb.org
@@ -324,6 +324,7 @@ spec:
                     maxLength: 100
                     type: string
                   perpetual_storage_wiggle_locality:
+                    pattern: ^([\w.-]+:[\w.-]+|0)$
                     type: string
                   proxies:
                     type: integer
@@ -1091,6 +1092,23 @@ spec:
                                               - fieldPath
                                               type: object
                                               x-kubernetes-map-type: atomic
+                                            fileKeyRef:
+                                              properties:
+                                                key:
+                                                  type: string
+                                                optional:
+                                                  default: false
+                                                  type: boolean
+                                                path:
+                                                  type: string
+                                                volumeName:
+                                                  type: string
+                                              required:
+                                              - key
+                                              - path
+                                              - volumeName
+                                              type: object
+                                              x-kubernetes-map-type: atomic
                                             resourceFieldRef:
                                               properties:
                                                 containerName:
@@ -1519,6 +1537,29 @@ spec:
                                     type: object
                                   restartPolicy:
                                     type: string
+                                  restartPolicyRules:
+                                    items:
+                                      properties:
+                                        action:
+                                          type: string
+                                        exitCodes:
+                                          properties:
+                                            operator:
+                                              type: string
+                                            values:
+                                              items:
+                                                format: int32
+                                                type: integer
+                                              type: array
+                                              x-kubernetes-list-type: set
+                                          required:
+                                          - operator
+                                          type: object
+                                      required:
+                                      - action
+                                      type: object
+                                    type: array
+                                    x-kubernetes-list-type: atomic
                                   securityContext:
                                     properties:
                                       allowPrivilegeEscalation:
@@ -1803,6 +1844,23 @@ spec:
                                               - fieldPath
                                               type: object
                                               x-kubernetes-map-type: atomic
+                                            fileKeyRef:
+                                              properties:
+                                                key:
+                                                  type: string
+                                                optional:
+                                                  default: false
+                                                  type: boolean
+                                                path:
+                                                  type: string
+                                                volumeName:
+                                                  type: string
+                                              required:
+                                              - key
+                                              - path
+                                              - volumeName
+                                              type: object
+                                              x-kubernetes-map-type: atomic
                                             resourceFieldRef:
                                               properties:
                                                 containerName:
@@ -2231,6 +2289,29 @@ spec:
                                     type: object
                                   restartPolicy:
                                     type: string
+                                  restartPolicyRules:
+                                    items:
+                                      properties:
+                                        action:
+                                          type: string
+                                        exitCodes:
+                                          properties:
+                                            operator:
+                                              type: string
+                                            values:
+                                              items:
+                                                format: int32
+                                                type: integer
+                                              type: array
+                                              x-kubernetes-list-type: set
+                                          required:
+                                          - operator
+                                          type: object
+                                      required:
+                                      - action
+                                      type: object
+                                    type: array
+                                    x-kubernetes-list-type: atomic
                                   securityContext:
                                     properties:
                                       allowPrivilegeEscalation:
@@ -2472,6 +2553,8 @@ spec:
                               type: boolean
                             hostname:
                               type: string
+                            hostnameOverride:
+                              type: string
                             imagePullSecrets:
                               items:
                                 properties:
@@ -2529,6 +2612,23 @@ spec:
                                               - fieldPath
                                               type: object
                                               x-kubernetes-map-type: atomic
+                                            fileKeyRef:
+                                              properties:
+                                                key:
+                                                  type: string
+                                                optional:
+                                                  default: false
+                                                  type: boolean
+                                                path:
+                                                  type: string
+                                                volumeName:
+                                                  type: string
+                                              required:
+                                              - key
+                                              - path
+                                              - volumeName
+                                              type: object
+                                              x-kubernetes-map-type: atomic
                                             resourceFieldRef:
                                               properties:
                                                 containerName:
@@ -2957,6 +3057,29 @@ spec:
                                     type: object
                                   restartPolicy:
                                     type: string
+                                  restartPolicyRules:
+                                    items:
+                                      properties:
+                                        action:
+                                          type: string
+                                        exitCodes:
+                                          properties:
+                                            operator:
+                                              type: string
+                                            values:
+                                              items:
+                                                format: int32
+                                                type: integer
+                                              type: array
+                                              x-kubernetes-list-type: set
+                                          required:
+                                          - operator
+                                          type: object
+                                      required:
+                                      - action
+                                      type: object
+                                    type: array
+                                    x-kubernetes-list-type: atomic
                                   securityContext:
                                     properties:
                                       allowPrivilegeEscalation:
@@ -4053,6 +4176,29 @@ spec:
                                                   type: array
                                                   x-kubernetes-list-type: atomic
                                               type: object
+                                            podCertificate:
+                                              properties:
+                                                certificateChainPath:
+                                                  type: string
+                                                credentialBundlePath:
+                                                  type: string
+                                                keyPath:
+                                                  type: string
+                                                keyType:
+                                                  type: string
+                                                maxExpirationSeconds:
+                                                  format: int32
+                                                  type: integer
+                                                signerName:
+                                                  type: string
+                                                userAnnotations:
+                                                  additionalProperties:
+                                                    type: string
+                                                  type: object
+                                              required:
+                                              - keyType
+                                              - signerName
+                                              type: object
                                             secret:
                                               properties:
                                                 items:
@@ -4243,6 +4389,18 @@ spec:
                               x-kubernetes-list-map-keys:
                               - name
                               x-kubernetes-list-type: map
+                            workloadRef:
+                              properties:
+                                name:
+                                  type: string
+                                podGroup:
+                                  type: string
+                                podGroupReplicaKey:
+                                  type: string
+                              required:
+                              - name
+                              - podGroup
+                              type: object
                           required:
                           - containers
                           type: object
@@ -4557,6 +4715,7 @@ spec:
                     maxLength: 100
                     type: string
                   perpetual_storage_wiggle_locality:
+                    pattern: ^([\w.-]+:[\w.-]+|0)$
                     type: string
                   proxies:
                     type: integer
diff --git a/packages/system/foundationdb-operator/charts/fdb-operator/crds/apps.foundationdb.org_foundationdbrestores.yaml b/packages/system/foundationdb-operator/charts/fdb-operator/crds/apps.foundationdb.org_foundationdbrestores.yaml
index 2f02fb0fcc..a59ee98056 100644
--- a/packages/system/foundationdb-operator/charts/fdb-operator/crds/apps.foundationdb.org_foundationdbrestores.yaml
+++ b/packages/system/foundationdb-operator/charts/fdb-operator/crds/apps.foundationdb.org_foundationdbrestores.yaml
@@ -3,8 +3,8 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
-    foundationdb.org/release: v2.13.0
+    controller-gen.kubebuilder.io/version: v0.20.1
+    foundationdb.org/release: v2.30.0
   name: foundationdbrestores.apps.foundationdb.org
 spec:
   group: apps.foundationdb.org
@@ -36,6 +36,10 @@ spec:
             type: object
           spec:
             properties:
+              backupVersion:
+                format: int64
+                nullable: true
+                type: integer
               blobStoreConfiguration:
                 properties:
                   accountName:
diff --git a/packages/system/foundationdb-operator/charts/fdb-operator/templates/manager/deployment.yaml b/packages/system/foundationdb-operator/charts/fdb-operator/templates/manager/deployment.yaml
index e4ef56998c..eced983f4c 100644
--- a/packages/system/foundationdb-operator/charts/fdb-operator/templates/manager/deployment.yaml
+++ b/packages/system/foundationdb-operator/charts/fdb-operator/templates/manager/deployment.yaml
@@ -71,13 +71,16 @@ spec:
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         command:
         - /manager
-        {{- if not .Values.globalMode.enabled }}
         env:
+        {{- if not .Values.globalMode.enabled }}
         - name: WATCH_NAMESPACE
           valueFrom:
             fieldRef:
               fieldPath: metadata.namespace
         {{- end }}
+        {{- with .Values.extraEnv }}
+        {{- toYaml . | nindent 8 }}
+        {{- end}}
         ports:
         - containerPort: 8080
           name: metrics
@@ -88,6 +91,9 @@ spec:
           mountPath: /var/log/fdb
         - name: fdb-binaries
           mountPath: /usr/bin/fdb
+        {{- with .Values.volumeMounts }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
         securityContext:
           {{- toYaml .Values.containerSecurityContext | nindent 10 }}
         livenessProbe:
@@ -115,3 +121,6 @@ spec:
         emptyDir: {}
       - name: fdb-binaries
         emptyDir: {}
+      {{- with .Values.volumes }}
+      {{- toYaml . | nindent 6 }}
+      {{- end }}
diff --git a/packages/system/foundationdb-operator/charts/fdb-operator/templates/rbac/rbac_role_binding.yaml b/packages/system/foundationdb-operator/charts/fdb-operator/templates/rbac/rbac_role_binding.yaml
index 2335c3c1c4..faaa763f92 100644
--- a/packages/system/foundationdb-operator/charts/fdb-operator/templates/rbac/rbac_role_binding.yaml
+++ b/packages/system/foundationdb-operator/charts/fdb-operator/templates/rbac/rbac_role_binding.yaml
@@ -38,7 +38,5 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: {{ include "fdb-operator.serviceAccountName" . }}
-  {{- if .Values.globalMode.enabled }}
   namespace: {{ .Release.Namespace }}
-  {{- end }}
 {{- end }}
diff --git a/packages/system/foundationdb-operator/charts/fdb-operator/values.yaml b/packages/system/foundationdb-operator/charts/fdb-operator/values.yaml
index 139af0228d..1973c5dda9 100644
--- a/packages/system/foundationdb-operator/charts/fdb-operator/values.yaml
+++ b/packages/system/foundationdb-operator/charts/fdb-operator/values.yaml
@@ -1,14 +1,9 @@
 ---
 image:
   repository: foundationdb/fdb-kubernetes-operator
-  tag: v2.13.0
+  tag: v2.30.0
   pullPolicy: IfNotPresent
 initContainers:
-  7.1:
-    image:
-      repository: foundationdb/fdb-kubernetes-monitor
-      tag: 7.1.67
-      pullPolicy: IfNotPresent
   7.3:
     image:
       repository: foundationdb/fdb-kubernetes-monitor
@@ -46,6 +41,9 @@ containerSecurityContext:
 nodeSelector: {}
 affinity: {}
 tolerations: {}
+extraEnv: []
+volumes: []
+volumeMounts: []
 resources:
   limits:
     cpu: 500m
diff --git a/packages/system/foundationdb-operator/tests/fdb-operator_test.yaml b/packages/system/foundationdb-operator/tests/fdb-operator_test.yaml
new file mode 100644
index 0000000000..05036c6c7d
--- /dev/null
+++ b/packages/system/foundationdb-operator/tests/fdb-operator_test.yaml
@@ -0,0 +1,45 @@
+suite: cozy-foundationdb-operator image pin
+release:
+  name: fdb-operator
+  namespace: cozy-foundationdb-operator
+tests:
+  - it: renders the operator on the pinned upstream image
+    template: charts/fdb-operator/templates/manager/deployment.yaml
+    documentSelector:
+      path: kind
+      value: Deployment
+    asserts:
+      # Pin the full image. A partial regex would also pass a wrong
+      # registry; assert the verbatim upstream reference instead.
+      - equal:
+          path: spec.template.spec.containers[0].image
+          value: foundationdb/fdb-kubernetes-operator:v2.30.0
+      # The CVE remediation also rides the init-monitor base images, so
+      # pin those too — a silent upstream retag would otherwise slip past.
+      # No 7.1 init container: every fdb-kubernetes-monitor 7.1.x tag is
+      # a single amd64 manifest, so it keeps the operator off arm64.
+      - lengthEqual:
+          path: spec.template.spec.initContainers
+          count: 2
+      - equal:
+          path: spec.template.spec.initContainers[0].image
+          value: foundationdb/fdb-kubernetes-monitor:7.3.63
+      - equal:
+          path: spec.template.spec.initContainers[1].image
+          value: foundationdb/fdb-kubernetes-monitor:7.4.1
+
+  - it: renders the operator image in the cozystack globalMode (the shipping config)
+    template: charts/fdb-operator/templates/manager/deployment.yaml
+    documentSelector:
+      path: kind
+      value: Deployment
+    set:
+      # cozystack ships globalMode.enabled=true (package-level values.yaml).
+      # The chart default is false, so without this the suite never renders
+      # the mode that actually deploys.
+      globalMode:
+        enabled: true
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].image
+          value: foundationdb/fdb-kubernetes-operator:v2.30.0
diff --git a/packages/system/foundationdb-rd/cozyrds/foundationdb.yaml b/packages/system/foundationdb-rd/cozyrds/foundationdb.yaml
index de10426455..a1c2e859a1 100644
--- a/packages/system/foundationdb-rd/cozyrds/foundationdb.yaml
+++ b/packages/system/foundationdb-rd/cozyrds/foundationdb.yaml
@@ -8,7 +8,7 @@ spec:
     singular: foundationdb
     plural: foundationdbs
     openAPISchema: |-
-      {"title":"Chart Values","type":"object","properties":{"cluster":{"description":"Cluster configuration.","type":"object","default":{},"required":["faultDomain","processCounts","redundancyMode","storageEngine","version"],"properties":{"faultDomain":{"description":"Fault domain configuration.","type":"object","default":{},"required":["key","valueFrom"],"properties":{"key":{"description":"Fault domain key.","type":"string","default":"kubernetes.io/hostname"},"valueFrom":{"description":"Fault domain value source.","type":"string","default":"spec.nodeName"}}},"processCounts":{"description":"Process counts for different roles.","type":"object","default":{},"required":["cluster_controller","stateless","storage"],"properties":{"cluster_controller":{"description":"Number of cluster controller processes.","type":"integer","default":1},"stateless":{"description":"Number of stateless processes (-1 for automatic).","type":"integer","default":-1},"storage":{"description":"Number of storage processes (determines cluster size).","type":"integer","default":3}}},"redundancyMode":{"description":"Database redundancy mode (single, double, triple, three_datacenter, three_datacenter_fallback).","type":"string","default":"double"},"storageEngine":{"description":"Storage engine (ssd-2, ssd-redwood-v1, ssd-rocksdb-v1, memory).","type":"string","default":"ssd-2"},"version":{"description":"Version of FoundationDB to use.","type":"string","default":"7.3.63"}}},"storage":{"description":"Storage configuration.","type":"object","default":{},"required":["size","storageClass"],"properties":{"size":{"description":"Size of persistent volumes for each instance.","default":"16Gi","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"storageClass":{"description":"Storage class (if not set, uses cluster default).","type":"string","default":"","x-kubernetes-validations":[{"rule":"self == oldSelf","message":"storageClass is immutable"}]}}},"resources":{"description":"Explicit CPU and memory configuration for each FoundationDB instance. When omitted, the preset defined in `resourcesPreset` is applied.","type":"object","default":{},"properties":{"cpu":{"description":"CPU available to each instance.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Memory (RAM) available to each instance.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}},"resourcesPreset":{"description":"Default sizing preset used when `resources` is omitted.","type":"string","default":"c1.small","enum":["t1.nano","t1.micro","t1.small","t1.medium","t1.large","t1.xlarge","t1.2xlarge","t1.4xlarge","c1.nano","c1.micro","c1.small","c1.medium","c1.large","c1.xlarge","c1.2xlarge","c1.4xlarge","s1.nano","s1.micro","s1.small","s1.medium","s1.large","s1.xlarge","s1.2xlarge","s1.4xlarge","u1.nano","u1.micro","u1.small","u1.medium","u1.large","u1.xlarge","u1.2xlarge","u1.4xlarge","m1.nano","m1.micro","m1.small","m1.medium","m1.large","m1.xlarge","m1.2xlarge","m1.4xlarge","nano","micro","small","medium","large","xlarge","2xlarge"]},"backup":{"description":"DEPRECATED Backup configuration (use the Cozystack backups framework: BackupClass + FoundationDB strategy).","type":"object","default":{},"required":["enabled","retentionPolicy","s3"],"properties":{"enabled":{"description":"DEPRECATED Enable in-chart backups (superseded by BackupClass + FoundationDB strategy).","type":"boolean","default":false},"retentionPolicy":{"description":"DEPRECATED Retention policy for backups.","type":"string","default":"7d"},"s3":{"description":"DEPRECATED S3 configuration for backups.","type":"object","default":{},"required":["bucket","credentials","endpoint","region"],"properties":{"bucket":{"description":"DEPRECATED S3 bucket name.","type":"string","default":""},"credentials":{"description":"DEPRECATED S3 credentials.","type":"object","default":{},"required":["accessKeyId","secretAccessKey"],"properties":{"accessKeyId":{"description":"DEPRECATED S3 access key ID.","type":"string","default":""},"secretAccessKey":{"description":"DEPRECATED S3 secret access key.","type":"string","default":""}}},"endpoint":{"description":"DEPRECATED S3 endpoint URL.","type":"string","default":""},"region":{"description":"DEPRECATED S3 region.","type":"string","default":"us-east-1"}}}}},"monitoring":{"description":"Monitoring configuration.","type":"object","default":{},"required":["enabled"],"properties":{"enabled":{"description":"Enable WorkloadMonitor integration.","type":"boolean","default":true}}},"customParameters":{"description":"Custom parameters to pass to FoundationDB.","type":"array","default":[],"items":{"type":"string"}},"imageType":{"description":"Container image deployment type.","type":"string","default":"split","enum":["unified","split"]},"securityContext":{"description":"Security context for containers.","type":"object","default":{},"required":["runAsGroup","runAsUser"],"properties":{"runAsGroup":{"description":"Group ID to run the container.","type":"integer","default":4059},"runAsUser":{"description":"User ID to run the container.","type":"integer","default":4059}}},"automaticReplacements":{"description":"Enable automatic pod replacements.","type":"boolean","default":true}}}
+      {"title":"Chart Values","type":"object","properties":{"cluster":{"description":"Cluster configuration.","type":"object","default":{},"required":["faultDomain","processCounts","redundancyMode","storageEngine","version"],"properties":{"faultDomain":{"description":"Fault domain configuration.","type":"object","default":{},"required":["key","valueFrom"],"properties":{"key":{"description":"Fault domain key.","type":"string","default":"kubernetes.io/hostname"},"valueFrom":{"description":"Fault domain value source.","type":"string","default":"spec.nodeName"}}},"processCounts":{"description":"Process counts for different roles.","type":"object","default":{},"required":["cluster_controller","stateless","storage"],"properties":{"cluster_controller":{"description":"Number of cluster controller processes.","type":"integer","default":1},"stateless":{"description":"Number of stateless processes (-1 for automatic).","type":"integer","default":-1},"storage":{"description":"Number of storage processes (determines cluster size).","type":"integer","default":3}}},"redundancyMode":{"description":"Database redundancy mode (single, double, triple, three_datacenter, three_datacenter_fallback).","type":"string","default":"double"},"storageEngine":{"description":"Storage engine (ssd-2, ssd-redwood-v1, ssd-rocksdb-v1, memory).","type":"string","default":"ssd-2"},"version":{"description":"Version of FoundationDB to use.","type":"string","default":"7.3.63"}}},"storage":{"description":"Storage configuration.","type":"object","default":{},"required":["size","storageClass"],"properties":{"size":{"description":"Size of persistent volumes for each instance.","default":"16Gi","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"storageClass":{"description":"Storage class (if not set, uses cluster default).","type":"string","default":"","x-kubernetes-validations":[{"rule":"self == oldSelf","message":"storageClass is immutable"}],"x-cozystack-options":{"source":"storageclass"}}}},"resources":{"description":"Explicit CPU and memory configuration for each FoundationDB instance. When omitted, the preset defined in `resourcesPreset` is applied.","type":"object","default":{},"properties":{"cpu":{"description":"CPU available to each instance.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Memory (RAM) available to each instance.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}},"resourcesPreset":{"description":"Default sizing preset used when `resources` is omitted.","type":"string","default":"c1.small","enum":["t1.nano","t1.micro","t1.small","t1.medium","t1.large","t1.xlarge","t1.2xlarge","t1.4xlarge","c1.nano","c1.micro","c1.small","c1.medium","c1.large","c1.xlarge","c1.2xlarge","c1.4xlarge","s1.nano","s1.micro","s1.small","s1.medium","s1.large","s1.xlarge","s1.2xlarge","s1.4xlarge","u1.nano","u1.micro","u1.small","u1.medium","u1.large","u1.xlarge","u1.2xlarge","u1.4xlarge","m1.nano","m1.micro","m1.small","m1.medium","m1.large","m1.xlarge","m1.2xlarge","m1.4xlarge","nano","micro","small","medium","large","xlarge","2xlarge"]},"backup":{"description":"DEPRECATED Backup configuration (use the Cozystack backups framework: BackupClass + FoundationDB strategy).","type":"object","default":{},"required":["enabled","retentionPolicy","s3"],"properties":{"enabled":{"description":"DEPRECATED Enable in-chart backups (superseded by BackupClass + FoundationDB strategy).","type":"boolean","default":false},"retentionPolicy":{"description":"DEPRECATED Retention policy for backups.","type":"string","default":"7d"},"s3":{"description":"DEPRECATED S3 configuration for backups.","type":"object","default":{},"required":["bucket","credentials","endpoint","region"],"properties":{"bucket":{"description":"DEPRECATED S3 bucket name.","type":"string","default":""},"credentials":{"description":"DEPRECATED S3 credentials.","type":"object","default":{},"required":["accessKeyId","secretAccessKey"],"properties":{"accessKeyId":{"description":"DEPRECATED S3 access key ID.","type":"string","default":""},"secretAccessKey":{"description":"DEPRECATED S3 secret access key.","type":"string","default":""}}},"endpoint":{"description":"DEPRECATED S3 endpoint URL.","type":"string","default":""},"region":{"description":"DEPRECATED S3 region.","type":"string","default":"us-east-1"}}}}},"monitoring":{"description":"Monitoring configuration.","type":"object","default":{},"required":["enabled"],"properties":{"enabled":{"description":"Enable WorkloadMonitor integration.","type":"boolean","default":true}}},"customParameters":{"description":"Custom parameters to pass to FoundationDB.","type":"array","default":[],"items":{"type":"string"}},"imageType":{"description":"Container image deployment type.","type":"string","default":"split","enum":["unified","split"]},"securityContext":{"description":"Security context for containers.","type":"object","default":{},"required":["runAsGroup","runAsUser"],"properties":{"runAsGroup":{"description":"Group ID to run the container.","type":"integer","default":4059},"runAsUser":{"description":"User ID to run the container.","type":"integer","default":4059}}},"automaticReplacements":{"description":"Enable automatic pod replacements.","type":"boolean","default":true}}}
   release:
     prefix: foundationdb-
     labels:
diff --git a/packages/system/gateway-api-crds/Makefile b/packages/system/gateway-api-crds/Makefile
index 0d005d8ba6..9cea83a2c6 100644
--- a/packages/system/gateway-api-crds/Makefile
+++ b/packages/system/gateway-api-crds/Makefile
@@ -3,7 +3,21 @@ export NAMESPACE=cozy-$(NAME)
 
 include ../../../hack/package.mk
 
+test:
+	helm unittest .
+
+# Stamp helm.sh/resource-policy: keep on every CustomResourceDefinition so a
+# chart uninstall never garbage-collects the CRDs and, with them, every Gateway,
+# HTTPRoute, GRPCRoute and ReferenceGrant in the cluster. The experimental
+# kustomization also emits a ValidatingAdmissionPolicy and its binding, which
+# hold no user data and are left unannotated.
+# The stamp goes into the CRD's existing metadata.annotations block; a CRD that
+# arrives without one is skipped, and the chart's helm-unittest suite is what
+# catches that.
 update:
 	rm -rf templates
 	mkdir templates
-	kubectl kustomize "github.com/kubernetes-sigs/gateway-api/config/crd/experimental?ref=v1.5.1" > templates/crds-experimental.yaml
+	kubectl kustomize "github.com/kubernetes-sigs/gateway-api/config/crd/experimental?ref=v1.6.1" > templates/crds-experimental.yaml
+	@set -e; f=templates/crds-experimental.yaml; tmp=$$(mktemp); \
+	  awk '/^    helm.sh\/resource-policy: keep$$/{next} /^kind: /{kind=$$2} /^  annotations:$$/ && kind=="CustomResourceDefinition"{print; print "    helm.sh/resource-policy: keep"; next} {print}' "$$f" > "$$tmp"; \
+	  cat "$$tmp" > "$$f"; rm -f "$$tmp"
diff --git a/packages/system/gateway-api-crds/templates/crds-experimental.yaml b/packages/system/gateway-api-crds/templates/crds-experimental.yaml
index cf0011eb99..9674c77215 100644
--- a/packages/system/gateway-api-crds/templates/crds-experimental.yaml
+++ b/packages/system/gateway-api-crds/templates/crds-experimental.yaml
@@ -2,8 +2,9 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
+    helm.sh/resource-policy: keep
     api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/4530
-    gateway.networking.k8s.io/bundle-version: v1.5.1
+    gateway.networking.k8s.io/bundle-version: v1.6.1
     gateway.networking.k8s.io/channel: experimental
   labels:
     gateway.networking.k8s.io/policy: Direct
@@ -114,12 +115,12 @@ spec:
 
                   Support Levels:
 
-                  * Extended: Kubernetes Service referenced by HTTPRoute backendRefs.
+                  * Extended: Kubernetes Service referenced by backendRefs used on a Route.
+                    - HTTPRoute, GRPCRoute, TLSRoute with termination
+                    - Filters that needs a backend of type Service, like Mirror and External Authorization
 
-                  * Implementation-Specific: Services not connected via HTTPRoute, and any
-                    other kind of backend. Implementations MAY use BackendTLSPolicy for:
+                  * Implementation-Specific: Implementations MAY use BackendTLSPolicy for:
                     - Services not referenced by any Route (e.g., infrastructure services)
-                    - Gateway feature backends (e.g., ExternalAuth, rate-limiting services)
                     - Service mesh workload-to-service communication
                     - Other resource types beyond Service
 
@@ -808,12 +809,12 @@ spec:
 
                   Support Levels:
 
-                  * Extended: Kubernetes Service referenced by HTTPRoute backendRefs.
+                  * Extended: Kubernetes Service referenced by backendRefs used on a Route.
+                    - HTTPRoute, GRPCRoute, TLSRoute with termination
+                    - Filters that needs a backend of type Service, like Mirror and External Authorization
 
-                  * Implementation-Specific: Services not connected via HTTPRoute, and any
-                    other kind of backend. Implementations MAY use BackendTLSPolicy for:
+                  * Implementation-Specific: Implementations MAY use BackendTLSPolicy for:
                     - Services not referenced by any Route (e.g., infrastructure services)
-                    - Gateway feature backends (e.g., ExternalAuth, rate-limiting services)
                     - Service mesh workload-to-service communication
                     - Other resource types beyond Service
 
@@ -1410,19 +1411,14 @@ spec:
     storage: false
     subresources:
       status: {}
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: null
-  storedVersions: null
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
+    helm.sh/resource-policy: keep
     api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/4530
-    gateway.networking.k8s.io/bundle-version: v1.5.1
+    gateway.networking.k8s.io/bundle-version: v1.6.1
     gateway.networking.k8s.io/channel: experimental
   name: gatewayclasses.gateway.networking.k8s.io
 spec:
@@ -1473,6 +1469,9 @@ spec:
           Gateway is not deleted while in use.
 
           GatewayClass is a Cluster level resource.
+
+          A GatewayClass name SHOULD be compliant with RFC 1035, consisting of a maximum of 63 lower case alphanumeric
+          characters or hyphens ('-'), and MUST start and end with an alphanumeric character.
         properties:
           apiVersion:
             description: |-
@@ -1926,19 +1925,14 @@ spec:
     storage: false
     subresources:
       status: {}
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: null
-  storedVersions: null
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
+    helm.sh/resource-policy: keep
     api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/4530
-    gateway.networking.k8s.io/bundle-version: v1.5.1
+    gateway.networking.k8s.io/bundle-version: v1.6.1
     gateway.networking.k8s.io/channel: experimental
   name: gateways.gateway.networking.k8s.io
 spec:
@@ -1973,6 +1967,8 @@ spec:
         description: |-
           Gateway represents an instance of a service-traffic handling infrastructure
           by binding Listeners to a set of IP addresses.
+          A Gateway name SHOULD be compliant with RFC 1035, consisting of a maximum of 63 lower case alphanumeric
+          characters or hyphens ('-'), and MUST start and end with an alphanumeric character.
         properties:
           apiVersion:
             description: |-
@@ -2206,7 +2202,7 @@ spec:
                       An implementation may chose to add additional implementation-specific annotations as they see fit.
 
                       Support: Extended
-                    maxProperties: 8
+                    maxProperties: 16
                     type: object
                     x-kubernetes-validations:
                     - message: Annotation keys must be in the form of an optional
@@ -2428,6 +2424,12 @@ spec:
                   request to "foo.example.com" SHOULD only be routed using routes attached
                   to the "foo.example.com" Listener (and not the "*.example.com" Listener).
 
+                  If traffic to a Gateway does not match any Listener's hostname (or if
+                  the Listener does not specify a hostname and the request does not match
+                  any attached Route), the request MUST be rejected. The specific mechanism
+                  for rejection depends on the protocol: HTTP returns a 404 status code,
+                  while gRPC returns an Unimplemented status code.
+
                   This concept is known as "Listener Isolation", and it is an Extended feature
                   of Gateway API. Implementations that do not support Listener Isolation MUST
                   clearly document this, and MUST NOT claim support for the
@@ -3068,7 +3070,7 @@ spec:
                                   - kind
                                   - name
                                   type: object
-                                maxItems: 8
+                                maxItems: 16
                                 minItems: 1
                                 type: array
                                 x-kubernetes-list-type: atomic
@@ -3233,7 +3235,7 @@ spec:
                                         - kind
                                         - name
                                         type: object
-                                      maxItems: 8
+                                      maxItems: 16
                                       minItems: 1
                                       type: array
                                       x-kubernetes-list-type: atomic
@@ -3857,7 +3859,7 @@ spec:
                       An implementation may chose to add additional implementation-specific annotations as they see fit.
 
                       Support: Extended
-                    maxProperties: 8
+                    maxProperties: 16
                     type: object
                     x-kubernetes-validations:
                     - message: Annotation keys must be in the form of an optional
@@ -4079,6 +4081,12 @@ spec:
                   request to "foo.example.com" SHOULD only be routed using routes attached
                   to the "foo.example.com" Listener (and not the "*.example.com" Listener).
 
+                  If traffic to a Gateway does not match any Listener's hostname (or if
+                  the Listener does not specify a hostname and the request does not match
+                  any attached Route), the request MUST be rejected. The specific mechanism
+                  for rejection depends on the protocol: HTTP returns a 404 status code,
+                  while gRPC returns an Unimplemented status code.
+
                   This concept is known as "Listener Isolation", and it is an Extended feature
                   of Gateway API. Implementations that do not support Listener Isolation MUST
                   clearly document this, and MUST NOT claim support for the
@@ -4719,7 +4727,7 @@ spec:
                                   - kind
                                   - name
                                   type: object
-                                maxItems: 8
+                                maxItems: 16
                                 minItems: 1
                                 type: array
                                 x-kubernetes-list-type: atomic
@@ -4884,7 +4892,7 @@ spec:
                                         - kind
                                         - name
                                         type: object
-                                      maxItems: 8
+                                      maxItems: 16
                                       minItems: 1
                                       type: array
                                       x-kubernetes-list-type: atomic
@@ -5256,19 +5264,14 @@ spec:
     storage: false
     subresources:
       status: {}
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: null
-  storedVersions: null
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
+    helm.sh/resource-policy: keep
     api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/4530
-    gateway.networking.k8s.io/bundle-version: v1.5.1
+    gateway.networking.k8s.io/bundle-version: v1.6.1
     gateway.networking.k8s.io/channel: experimental
   name: grpcroutes.gateway.networking.k8s.io
 spec:
@@ -5945,6 +5948,10 @@ spec:
                                         Support: Extended for Kubernetes Service
 
                                         Support: Implementation-specific for any other resource
+
+                                        If the backend service requires TLS, use BackendTLSPolicy to tell the
+                                        implementation to supply the TLS details to be used to connect to that
+                                        backend.
                                       properties:
                                         group:
                                           default: ""
@@ -6612,6 +6619,10 @@ spec:
                                   Support: Extended for Kubernetes Service
 
                                   Support: Implementation-specific for any other resource
+
+                                  If the backend service requires TLS, use BackendTLSPolicy to tell the
+                                  implementation to supply the TLS details to be used to connect to that
+                                  backend.
                                 properties:
                                   group:
                                     default: ""
@@ -7168,15 +7179,6 @@ spec:
                               - Session
                               type: string
                           type: object
-                        idleTimeout:
-                          description: |-
-                            IdleTimeout defines the idle timeout of the persistent session.
-                            Once the session has been idle for more than the specified
-                            IdleTimeout duration, the session becomes invalid.
-
-                            Support: Extended
-                          pattern: ^([0-9]{1,5}(h|m|s|ms)){1,4}$
-                          type: string
                         sessionName:
                           description: |-
                             SessionName defines the name of the persistent session token
@@ -7536,19 +7538,14 @@ spec:
     storage: true
     subresources:
       status: {}
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: null
-  storedVersions: null
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
+    helm.sh/resource-policy: keep
     api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/4530
-    gateway.networking.k8s.io/bundle-version: v1.5.1
+    gateway.networking.k8s.io/bundle-version: v1.6.1
     gateway.networking.k8s.io/channel: experimental
   name: httproutes.gateway.networking.k8s.io
 spec:
@@ -8033,9 +8030,9 @@ spec:
                                         Multiple header names in the value of the `Access-Control-Allow-Headers`
                                         response header are separated by a comma (",").
 
-                                        When the `AllowHeaders` field is configured with one or more headers, the
+                                        When the `allowHeaders` field is configured with one or more headers, the
                                         gateway must return the `Access-Control-Allow-Headers` response header
-                                        which value is present in the `AllowHeaders` field.
+                                        which value is present in the `allowHeaders` field.
 
                                         If any header name in the `Access-Control-Request-Headers` request header
                                         is not included in the list of header names specified by the response
@@ -8047,21 +8044,20 @@ spec:
                                         client side.
 
                                         A wildcard indicates that the requests with all HTTP headers are allowed.
-                                        If config contains the wildcard "*" in allowHeaders and the request is
-                                        not credentialed, the `Access-Control-Allow-Headers` response header
-                                        can either use the `*` wildcard or the value of
-                                        Access-Control-Request-Headers from the request.
-
-                                        When the request is credentialed, the gateway must not specify the `*`
-                                        wildcard in the `Access-Control-Allow-Headers` response header. When
-                                        also the `AllowCredentials` field is true and `AllowHeaders` field
-                                        is specified with the `*` wildcard, the gateway must specify one or more
-                                        HTTP headers in the value of the `Access-Control-Allow-Headers` response
-                                        header. The value of the header `Access-Control-Allow-Headers` is same as
-                                        the `Access-Control-Request-Headers` header provided by the client. If
-                                        the header `Access-Control-Request-Headers` is not included in the
-                                        request, the gateway will omit the `Access-Control-Allow-Headers`
-                                        response header, instead of specifying the `*` wildcard.
+
+                                        If the configuration contains the wildcard `*` in `allowHeaders` and
+                                        `allowCredentials` is set to `false`, the `Access-Control-Allow-Headers`
+                                        response header may either contain the wildcard `*` or echo the value
+                                        of the `Access-Control-Request-Headers` request header.
+
+                                        If the configuration contains the wildcard `*` in `allowHeaders` and
+                                        `allowCredentials` is set to `true`, the gateway must not return `*`
+                                        in the `Access-Control-Allow-Headers` response header. Instead, it must
+                                        return one or more header names matching the value of the
+                                        `Access-Control-Request-Headers` request header.
+                                        If the `Access-Control-Request-Headers` header is not present in the
+                                        request, the gateway must omit the `Access-Control-Allow-Headers`
+                                        response header.
 
                                         Support: Extended
                                       items:
@@ -8106,32 +8102,29 @@ spec:
                                         A CORS-safelisted method is a method that is `GET`, `HEAD`, or `POST`.
                                         (See https://fetch.spec.whatwg.org/#cors-safelisted-method) The
                                         CORS-safelisted methods are always allowed, regardless of whether they
-                                        are specified in the `AllowMethods` field.
+                                        are specified in the `allowMethods` field.
 
-                                        When the `AllowMethods` field is configured with one or more methods, the
+                                        When the `allowMethods` field is configured with one or more methods, the
                                         gateway must return the `Access-Control-Allow-Methods` response header
-                                        which value is present in the `AllowMethods` field.
+                                        which value is present in the `allowMethods` field.
 
                                         If the HTTP method of the `Access-Control-Request-Method` request header
                                         is not included in the list of methods specified by the response header
                                         `Access-Control-Allow-Methods`, it will present an error on the client
                                         side.
 
-                                        If config contains the wildcard "*" in allowMethods and the request is
-                                        not credentialed, the `Access-Control-Allow-Methods` response header
-                                        can either use the `*` wildcard or the value of
-                                        Access-Control-Request-Method from the request.
-
-                                        When the request is credentialed, the gateway must not specify the `*`
-                                        wildcard in the `Access-Control-Allow-Methods` response header. When
-                                        also the `AllowCredentials` field is true and `AllowMethods` field
-                                        specified with the `*` wildcard, the gateway must specify one HTTP method
-                                        in the value of the Access-Control-Allow-Methods response header. The
-                                        value of the header `Access-Control-Allow-Methods` is same as the
-                                        `Access-Control-Request-Method` header provided by the client. If the
-                                        header `Access-Control-Request-Method` is not included in the request,
-                                        the gateway will omit the `Access-Control-Allow-Methods` response header,
-                                        instead of specifying the `*` wildcard.
+                                        If the configuration contains the wildcard `*` in `allowMethods` and
+                                        `allowCredentials` is set to `false`, the `Access-Control-Allow-Methods`
+                                        response header may either contain the wildcard `*` or echo the value
+                                        of the `Access-Control-Request-Method` request header.
+
+                                        If the configuration contains the wildcard `*` in `allowMethods` and
+                                        `allowCredentials` is set to `true`, the gateway must not return `*`
+                                        in the `Access-Control-Allow-Methods` response header. Instead, it must
+                                        return a single HTTP method matching the value of the
+                                        `Access-Control-Request-Method` request header.
+                                        If the `Access-Control-Request-Method` header is not present in the request,
+                                        the gateway must omit the `Access-Control-Allow-Methods` response header.
 
                                         Support: Extended
                                       items:
@@ -8181,7 +8174,7 @@ spec:
                                         An origin value that includes _only_ the `*` character indicates requests
                                         from all `Origin`s are allowed.
 
-                                        When the `AllowOrigins` field is configured with multiple origins, it
+                                        When the `allowOrigins` field is configured with multiple origins, it
                                         means the server supports clients from multiple origins. If the request
                                         `Origin` matches the configured allowed origins, the gateway must return
                                         the given `Origin` and sets value of the header
@@ -8203,19 +8196,15 @@ spec:
                                         `Access-Control-Allow-Origin` to the same value as the `Origin`
                                         header provided by the client.
 
-                                        When config has the wildcard ("*") in allowOrigins, and the request
-                                        is not credentialed (e.g., it is a preflight request), the
-                                        `Access-Control-Allow-Origin` response header either contains the
-                                        wildcard as well or the Origin from the request.
-
-                                        When the request is credentialed, the gateway must not specify the `*`
-                                        wildcard in the `Access-Control-Allow-Origin` response header. When
-                                        also the `AllowCredentials` field is true and `AllowOrigins` field
-                                        specified with the `*` wildcard, the gateway must return a single origin
-                                        in the value of the `Access-Control-Allow-Origin` response header,
-                                        instead of specifying the `*` wildcard. The value of the header
-                                        `Access-Control-Allow-Origin` is same as the `Origin` header provided by
-                                        the client.
+                                        If the configuration contains the wildcard `*` in `allowOrigins` and
+                                        `allowCredentials` is set to `false`, the `Access-Control-Allow-Origin`
+                                        response header may either contain the wildcard `*` or echo the value
+                                        of the `Origin` request header.
+
+                                        If the configuration contains the wildcard `*` in `allowOrigins` and
+                                        `allowCredentials` is set to `true`, the gateway must not return `*`
+                                        in the `Access-Control-Allow-Origin` response header. Instead, it must
+                                        return a single origin matching the value of the `Origin` request header.
 
                                         Support: Extended
                                       items:
@@ -8254,7 +8243,7 @@ spec:
                                         (See https://fetch.spec.whatwg.org/#cors-safelisted-response-header-name)
                                         The CORS-safelisted response headers are exposed to client by default.
 
-                                        When an HTTP header name is specified using the `ExposeHeaders` field,
+                                        When an HTTP header name is specified using the `exposeHeaders` field,
                                         this additional header will be exposed as part of the response to the
                                         client.
 
@@ -8264,12 +8253,15 @@ spec:
                                         response header are separated by a comma (",").
 
                                         A wildcard indicates that the responses with all HTTP headers are exposed
-                                        to clients. The `Access-Control-Expose-Headers` response header can only
-                                        use `*` wildcard as value when the request is not credentialed.
+                                        to clients.
+
+                                        If the configuration contains the wildcard `*` in `exposeHeaders` and
+                                        `allowCredentials` is set to `false`, the `Access-Control-Expose-Headers`
+                                        response header can contain the wildcard `*`.
 
-                                        When the `exposeHeaders` config field contains the "*" wildcard and
-                                        the request is credentialed, the gateway cannot use the `*` wildcard in
-                                        the `Access-Control-Expose-Headers` response header.
+                                        If the configuration contains the wildcard `*` in `exposeHeaders` and
+                                        `allowCredentials` is set to `true`, the gateway cannot use the `*`
+                                        in the `Access-Control-Expose-Headers` response header.
 
                                         Support: Extended
                                       items:
@@ -8777,6 +8769,10 @@ spec:
                                         Support: Extended for Kubernetes Service
 
                                         Support: Implementation-specific for any other resource
+
+                                        If the backend service requires TLS, use BackendTLSPolicy to tell the
+                                        implementation to supply the TLS details to be used to connect to that
+                                        backend.
                                       properties:
                                         group:
                                           default: ""
@@ -9563,9 +9559,9 @@ spec:
                                   Multiple header names in the value of the `Access-Control-Allow-Headers`
                                   response header are separated by a comma (",").
 
-                                  When the `AllowHeaders` field is configured with one or more headers, the
+                                  When the `allowHeaders` field is configured with one or more headers, the
                                   gateway must return the `Access-Control-Allow-Headers` response header
-                                  which value is present in the `AllowHeaders` field.
+                                  which value is present in the `allowHeaders` field.
 
                                   If any header name in the `Access-Control-Request-Headers` request header
                                   is not included in the list of header names specified by the response
@@ -9577,21 +9573,20 @@ spec:
                                   client side.
 
                                   A wildcard indicates that the requests with all HTTP headers are allowed.
-                                  If config contains the wildcard "*" in allowHeaders and the request is
-                                  not credentialed, the `Access-Control-Allow-Headers` response header
-                                  can either use the `*` wildcard or the value of
-                                  Access-Control-Request-Headers from the request.
-
-                                  When the request is credentialed, the gateway must not specify the `*`
-                                  wildcard in the `Access-Control-Allow-Headers` response header. When
-                                  also the `AllowCredentials` field is true and `AllowHeaders` field
-                                  is specified with the `*` wildcard, the gateway must specify one or more
-                                  HTTP headers in the value of the `Access-Control-Allow-Headers` response
-                                  header. The value of the header `Access-Control-Allow-Headers` is same as
-                                  the `Access-Control-Request-Headers` header provided by the client. If
-                                  the header `Access-Control-Request-Headers` is not included in the
-                                  request, the gateway will omit the `Access-Control-Allow-Headers`
-                                  response header, instead of specifying the `*` wildcard.
+
+                                  If the configuration contains the wildcard `*` in `allowHeaders` and
+                                  `allowCredentials` is set to `false`, the `Access-Control-Allow-Headers`
+                                  response header may either contain the wildcard `*` or echo the value
+                                  of the `Access-Control-Request-Headers` request header.
+
+                                  If the configuration contains the wildcard `*` in `allowHeaders` and
+                                  `allowCredentials` is set to `true`, the gateway must not return `*`
+                                  in the `Access-Control-Allow-Headers` response header. Instead, it must
+                                  return one or more header names matching the value of the
+                                  `Access-Control-Request-Headers` request header.
+                                  If the `Access-Control-Request-Headers` header is not present in the
+                                  request, the gateway must omit the `Access-Control-Allow-Headers`
+                                  response header.
 
                                   Support: Extended
                                 items:
@@ -9636,32 +9631,29 @@ spec:
                                   A CORS-safelisted method is a method that is `GET`, `HEAD`, or `POST`.
                                   (See https://fetch.spec.whatwg.org/#cors-safelisted-method) The
                                   CORS-safelisted methods are always allowed, regardless of whether they
-                                  are specified in the `AllowMethods` field.
+                                  are specified in the `allowMethods` field.
 
-                                  When the `AllowMethods` field is configured with one or more methods, the
+                                  When the `allowMethods` field is configured with one or more methods, the
                                   gateway must return the `Access-Control-Allow-Methods` response header
-                                  which value is present in the `AllowMethods` field.
+                                  which value is present in the `allowMethods` field.
 
                                   If the HTTP method of the `Access-Control-Request-Method` request header
                                   is not included in the list of methods specified by the response header
                                   `Access-Control-Allow-Methods`, it will present an error on the client
                                   side.
 
-                                  If config contains the wildcard "*" in allowMethods and the request is
-                                  not credentialed, the `Access-Control-Allow-Methods` response header
-                                  can either use the `*` wildcard or the value of
-                                  Access-Control-Request-Method from the request.
-
-                                  When the request is credentialed, the gateway must not specify the `*`
-                                  wildcard in the `Access-Control-Allow-Methods` response header. When
-                                  also the `AllowCredentials` field is true and `AllowMethods` field
-                                  specified with the `*` wildcard, the gateway must specify one HTTP method
-                                  in the value of the Access-Control-Allow-Methods response header. The
-                                  value of the header `Access-Control-Allow-Methods` is same as the
-                                  `Access-Control-Request-Method` header provided by the client. If the
-                                  header `Access-Control-Request-Method` is not included in the request,
-                                  the gateway will omit the `Access-Control-Allow-Methods` response header,
-                                  instead of specifying the `*` wildcard.
+                                  If the configuration contains the wildcard `*` in `allowMethods` and
+                                  `allowCredentials` is set to `false`, the `Access-Control-Allow-Methods`
+                                  response header may either contain the wildcard `*` or echo the value
+                                  of the `Access-Control-Request-Method` request header.
+
+                                  If the configuration contains the wildcard `*` in `allowMethods` and
+                                  `allowCredentials` is set to `true`, the gateway must not return `*`
+                                  in the `Access-Control-Allow-Methods` response header. Instead, it must
+                                  return a single HTTP method matching the value of the
+                                  `Access-Control-Request-Method` request header.
+                                  If the `Access-Control-Request-Method` header is not present in the request,
+                                  the gateway must omit the `Access-Control-Allow-Methods` response header.
 
                                   Support: Extended
                                 items:
@@ -9711,7 +9703,7 @@ spec:
                                   An origin value that includes _only_ the `*` character indicates requests
                                   from all `Origin`s are allowed.
 
-                                  When the `AllowOrigins` field is configured with multiple origins, it
+                                  When the `allowOrigins` field is configured with multiple origins, it
                                   means the server supports clients from multiple origins. If the request
                                   `Origin` matches the configured allowed origins, the gateway must return
                                   the given `Origin` and sets value of the header
@@ -9733,19 +9725,15 @@ spec:
                                   `Access-Control-Allow-Origin` to the same value as the `Origin`
                                   header provided by the client.
 
-                                  When config has the wildcard ("*") in allowOrigins, and the request
-                                  is not credentialed (e.g., it is a preflight request), the
-                                  `Access-Control-Allow-Origin` response header either contains the
-                                  wildcard as well or the Origin from the request.
-
-                                  When the request is credentialed, the gateway must not specify the `*`
-                                  wildcard in the `Access-Control-Allow-Origin` response header. When
-                                  also the `AllowCredentials` field is true and `AllowOrigins` field
-                                  specified with the `*` wildcard, the gateway must return a single origin
-                                  in the value of the `Access-Control-Allow-Origin` response header,
-                                  instead of specifying the `*` wildcard. The value of the header
-                                  `Access-Control-Allow-Origin` is same as the `Origin` header provided by
-                                  the client.
+                                  If the configuration contains the wildcard `*` in `allowOrigins` and
+                                  `allowCredentials` is set to `false`, the `Access-Control-Allow-Origin`
+                                  response header may either contain the wildcard `*` or echo the value
+                                  of the `Origin` request header.
+
+                                  If the configuration contains the wildcard `*` in `allowOrigins` and
+                                  `allowCredentials` is set to `true`, the gateway must not return `*`
+                                  in the `Access-Control-Allow-Origin` response header. Instead, it must
+                                  return a single origin matching the value of the `Origin` request header.
 
                                   Support: Extended
                                 items:
@@ -9784,7 +9772,7 @@ spec:
                                   (See https://fetch.spec.whatwg.org/#cors-safelisted-response-header-name)
                                   The CORS-safelisted response headers are exposed to client by default.
 
-                                  When an HTTP header name is specified using the `ExposeHeaders` field,
+                                  When an HTTP header name is specified using the `exposeHeaders` field,
                                   this additional header will be exposed as part of the response to the
                                   client.
 
@@ -9794,12 +9782,15 @@ spec:
                                   response header are separated by a comma (",").
 
                                   A wildcard indicates that the responses with all HTTP headers are exposed
-                                  to clients. The `Access-Control-Expose-Headers` response header can only
-                                  use `*` wildcard as value when the request is not credentialed.
+                                  to clients.
+
+                                  If the configuration contains the wildcard `*` in `exposeHeaders` and
+                                  `allowCredentials` is set to `false`, the `Access-Control-Expose-Headers`
+                                  response header can contain the wildcard `*`.
 
-                                  When the `exposeHeaders` config field contains the "*" wildcard and
-                                  the request is credentialed, the gateway cannot use the `*` wildcard in
-                                  the `Access-Control-Expose-Headers` response header.
+                                  If the configuration contains the wildcard `*` in `exposeHeaders` and
+                                  `allowCredentials` is set to `true`, the gateway cannot use the `*`
+                                  in the `Access-Control-Expose-Headers` response header.
 
                                   Support: Extended
                                 items:
@@ -10303,6 +10294,10 @@ spec:
                                   Support: Extended for Kubernetes Service
 
                                   Support: Implementation-specific for any other resource
+
+                                  If the backend service requires TLS, use BackendTLSPolicy to tell the
+                                  implementation to supply the TLS details to be used to connect to that
+                                  backend.
                                 properties:
                                   group:
                                     default: ""
@@ -11242,6 +11237,7 @@ spec:
                             a backend request is implementation-specific.
 
                             Support: Extended
+                          minimum: 1
                           type: integer
                         backoff:
                           description: |-
@@ -11310,7 +11306,7 @@ spec:
                             minimum: 400
                             type: integer
                           type: array
-                          x-kubernetes-list-type: atomic
+                          x-kubernetes-list-type: set
                       type: object
                     sessionPersistence:
                       description: |-
@@ -11362,15 +11358,6 @@ spec:
                               - Session
                               type: string
                           type: object
-                        idleTimeout:
-                          description: |-
-                            IdleTimeout defines the idle timeout of the persistent session.
-                            Once the session has been idle for more than the specified
-                            IdleTimeout duration, the session becomes invalid.
-
-                            Support: Extended
-                          pattern: ^([0-9]{1,5}(h|m|s|ms)){1,4}$
-                          type: string
                         sessionName:
                           description: |-
                             SessionName defines the name of the persistent session token
@@ -12298,9 +12285,9 @@ spec:
                                         Multiple header names in the value of the `Access-Control-Allow-Headers`
                                         response header are separated by a comma (",").
 
-                                        When the `AllowHeaders` field is configured with one or more headers, the
+                                        When the `allowHeaders` field is configured with one or more headers, the
                                         gateway must return the `Access-Control-Allow-Headers` response header
-                                        which value is present in the `AllowHeaders` field.
+                                        which value is present in the `allowHeaders` field.
 
                                         If any header name in the `Access-Control-Request-Headers` request header
                                         is not included in the list of header names specified by the response
@@ -12312,21 +12299,20 @@ spec:
                                         client side.
 
                                         A wildcard indicates that the requests with all HTTP headers are allowed.
-                                        If config contains the wildcard "*" in allowHeaders and the request is
-                                        not credentialed, the `Access-Control-Allow-Headers` response header
-                                        can either use the `*` wildcard or the value of
-                                        Access-Control-Request-Headers from the request.
-
-                                        When the request is credentialed, the gateway must not specify the `*`
-                                        wildcard in the `Access-Control-Allow-Headers` response header. When
-                                        also the `AllowCredentials` field is true and `AllowHeaders` field
-                                        is specified with the `*` wildcard, the gateway must specify one or more
-                                        HTTP headers in the value of the `Access-Control-Allow-Headers` response
-                                        header. The value of the header `Access-Control-Allow-Headers` is same as
-                                        the `Access-Control-Request-Headers` header provided by the client. If
-                                        the header `Access-Control-Request-Headers` is not included in the
-                                        request, the gateway will omit the `Access-Control-Allow-Headers`
-                                        response header, instead of specifying the `*` wildcard.
+
+                                        If the configuration contains the wildcard `*` in `allowHeaders` and
+                                        `allowCredentials` is set to `false`, the `Access-Control-Allow-Headers`
+                                        response header may either contain the wildcard `*` or echo the value
+                                        of the `Access-Control-Request-Headers` request header.
+
+                                        If the configuration contains the wildcard `*` in `allowHeaders` and
+                                        `allowCredentials` is set to `true`, the gateway must not return `*`
+                                        in the `Access-Control-Allow-Headers` response header. Instead, it must
+                                        return one or more header names matching the value of the
+                                        `Access-Control-Request-Headers` request header.
+                                        If the `Access-Control-Request-Headers` header is not present in the
+                                        request, the gateway must omit the `Access-Control-Allow-Headers`
+                                        response header.
 
                                         Support: Extended
                                       items:
@@ -12371,32 +12357,29 @@ spec:
                                         A CORS-safelisted method is a method that is `GET`, `HEAD`, or `POST`.
                                         (See https://fetch.spec.whatwg.org/#cors-safelisted-method) The
                                         CORS-safelisted methods are always allowed, regardless of whether they
-                                        are specified in the `AllowMethods` field.
+                                        are specified in the `allowMethods` field.
 
-                                        When the `AllowMethods` field is configured with one or more methods, the
+                                        When the `allowMethods` field is configured with one or more methods, the
                                         gateway must return the `Access-Control-Allow-Methods` response header
-                                        which value is present in the `AllowMethods` field.
+                                        which value is present in the `allowMethods` field.
 
                                         If the HTTP method of the `Access-Control-Request-Method` request header
                                         is not included in the list of methods specified by the response header
                                         `Access-Control-Allow-Methods`, it will present an error on the client
                                         side.
 
-                                        If config contains the wildcard "*" in allowMethods and the request is
-                                        not credentialed, the `Access-Control-Allow-Methods` response header
-                                        can either use the `*` wildcard or the value of
-                                        Access-Control-Request-Method from the request.
-
-                                        When the request is credentialed, the gateway must not specify the `*`
-                                        wildcard in the `Access-Control-Allow-Methods` response header. When
-                                        also the `AllowCredentials` field is true and `AllowMethods` field
-                                        specified with the `*` wildcard, the gateway must specify one HTTP method
-                                        in the value of the Access-Control-Allow-Methods response header. The
-                                        value of the header `Access-Control-Allow-Methods` is same as the
-                                        `Access-Control-Request-Method` header provided by the client. If the
-                                        header `Access-Control-Request-Method` is not included in the request,
-                                        the gateway will omit the `Access-Control-Allow-Methods` response header,
-                                        instead of specifying the `*` wildcard.
+                                        If the configuration contains the wildcard `*` in `allowMethods` and
+                                        `allowCredentials` is set to `false`, the `Access-Control-Allow-Methods`
+                                        response header may either contain the wildcard `*` or echo the value
+                                        of the `Access-Control-Request-Method` request header.
+
+                                        If the configuration contains the wildcard `*` in `allowMethods` and
+                                        `allowCredentials` is set to `true`, the gateway must not return `*`
+                                        in the `Access-Control-Allow-Methods` response header. Instead, it must
+                                        return a single HTTP method matching the value of the
+                                        `Access-Control-Request-Method` request header.
+                                        If the `Access-Control-Request-Method` header is not present in the request,
+                                        the gateway must omit the `Access-Control-Allow-Methods` response header.
 
                                         Support: Extended
                                       items:
@@ -12446,7 +12429,7 @@ spec:
                                         An origin value that includes _only_ the `*` character indicates requests
                                         from all `Origin`s are allowed.
 
-                                        When the `AllowOrigins` field is configured with multiple origins, it
+                                        When the `allowOrigins` field is configured with multiple origins, it
                                         means the server supports clients from multiple origins. If the request
                                         `Origin` matches the configured allowed origins, the gateway must return
                                         the given `Origin` and sets value of the header
@@ -12468,19 +12451,15 @@ spec:
                                         `Access-Control-Allow-Origin` to the same value as the `Origin`
                                         header provided by the client.
 
-                                        When config has the wildcard ("*") in allowOrigins, and the request
-                                        is not credentialed (e.g., it is a preflight request), the
-                                        `Access-Control-Allow-Origin` response header either contains the
-                                        wildcard as well or the Origin from the request.
-
-                                        When the request is credentialed, the gateway must not specify the `*`
-                                        wildcard in the `Access-Control-Allow-Origin` response header. When
-                                        also the `AllowCredentials` field is true and `AllowOrigins` field
-                                        specified with the `*` wildcard, the gateway must return a single origin
-                                        in the value of the `Access-Control-Allow-Origin` response header,
-                                        instead of specifying the `*` wildcard. The value of the header
-                                        `Access-Control-Allow-Origin` is same as the `Origin` header provided by
-                                        the client.
+                                        If the configuration contains the wildcard `*` in `allowOrigins` and
+                                        `allowCredentials` is set to `false`, the `Access-Control-Allow-Origin`
+                                        response header may either contain the wildcard `*` or echo the value
+                                        of the `Origin` request header.
+
+                                        If the configuration contains the wildcard `*` in `allowOrigins` and
+                                        `allowCredentials` is set to `true`, the gateway must not return `*`
+                                        in the `Access-Control-Allow-Origin` response header. Instead, it must
+                                        return a single origin matching the value of the `Origin` request header.
 
                                         Support: Extended
                                       items:
@@ -12519,7 +12498,7 @@ spec:
                                         (See https://fetch.spec.whatwg.org/#cors-safelisted-response-header-name)
                                         The CORS-safelisted response headers are exposed to client by default.
 
-                                        When an HTTP header name is specified using the `ExposeHeaders` field,
+                                        When an HTTP header name is specified using the `exposeHeaders` field,
                                         this additional header will be exposed as part of the response to the
                                         client.
 
@@ -12529,12 +12508,15 @@ spec:
                                         response header are separated by a comma (",").
 
                                         A wildcard indicates that the responses with all HTTP headers are exposed
-                                        to clients. The `Access-Control-Expose-Headers` response header can only
-                                        use `*` wildcard as value when the request is not credentialed.
+                                        to clients.
 
-                                        When the `exposeHeaders` config field contains the "*" wildcard and
-                                        the request is credentialed, the gateway cannot use the `*` wildcard in
-                                        the `Access-Control-Expose-Headers` response header.
+                                        If the configuration contains the wildcard `*` in `exposeHeaders` and
+                                        `allowCredentials` is set to `false`, the `Access-Control-Expose-Headers`
+                                        response header can contain the wildcard `*`.
+
+                                        If the configuration contains the wildcard `*` in `exposeHeaders` and
+                                        `allowCredentials` is set to `true`, the gateway cannot use the `*`
+                                        in the `Access-Control-Expose-Headers` response header.
 
                                         Support: Extended
                                       items:
@@ -13042,6 +13024,10 @@ spec:
                                         Support: Extended for Kubernetes Service
 
                                         Support: Implementation-specific for any other resource
+
+                                        If the backend service requires TLS, use BackendTLSPolicy to tell the
+                                        implementation to supply the TLS details to be used to connect to that
+                                        backend.
                                       properties:
                                         group:
                                           default: ""
@@ -13828,9 +13814,9 @@ spec:
                                   Multiple header names in the value of the `Access-Control-Allow-Headers`
                                   response header are separated by a comma (",").
 
-                                  When the `AllowHeaders` field is configured with one or more headers, the
+                                  When the `allowHeaders` field is configured with one or more headers, the
                                   gateway must return the `Access-Control-Allow-Headers` response header
-                                  which value is present in the `AllowHeaders` field.
+                                  which value is present in the `allowHeaders` field.
 
                                   If any header name in the `Access-Control-Request-Headers` request header
                                   is not included in the list of header names specified by the response
@@ -13842,21 +13828,20 @@ spec:
                                   client side.
 
                                   A wildcard indicates that the requests with all HTTP headers are allowed.
-                                  If config contains the wildcard "*" in allowHeaders and the request is
-                                  not credentialed, the `Access-Control-Allow-Headers` response header
-                                  can either use the `*` wildcard or the value of
-                                  Access-Control-Request-Headers from the request.
-
-                                  When the request is credentialed, the gateway must not specify the `*`
-                                  wildcard in the `Access-Control-Allow-Headers` response header. When
-                                  also the `AllowCredentials` field is true and `AllowHeaders` field
-                                  is specified with the `*` wildcard, the gateway must specify one or more
-                                  HTTP headers in the value of the `Access-Control-Allow-Headers` response
-                                  header. The value of the header `Access-Control-Allow-Headers` is same as
-                                  the `Access-Control-Request-Headers` header provided by the client. If
-                                  the header `Access-Control-Request-Headers` is not included in the
-                                  request, the gateway will omit the `Access-Control-Allow-Headers`
-                                  response header, instead of specifying the `*` wildcard.
+
+                                  If the configuration contains the wildcard `*` in `allowHeaders` and
+                                  `allowCredentials` is set to `false`, the `Access-Control-Allow-Headers`
+                                  response header may either contain the wildcard `*` or echo the value
+                                  of the `Access-Control-Request-Headers` request header.
+
+                                  If the configuration contains the wildcard `*` in `allowHeaders` and
+                                  `allowCredentials` is set to `true`, the gateway must not return `*`
+                                  in the `Access-Control-Allow-Headers` response header. Instead, it must
+                                  return one or more header names matching the value of the
+                                  `Access-Control-Request-Headers` request header.
+                                  If the `Access-Control-Request-Headers` header is not present in the
+                                  request, the gateway must omit the `Access-Control-Allow-Headers`
+                                  response header.
 
                                   Support: Extended
                                 items:
@@ -13901,32 +13886,29 @@ spec:
                                   A CORS-safelisted method is a method that is `GET`, `HEAD`, or `POST`.
                                   (See https://fetch.spec.whatwg.org/#cors-safelisted-method) The
                                   CORS-safelisted methods are always allowed, regardless of whether they
-                                  are specified in the `AllowMethods` field.
+                                  are specified in the `allowMethods` field.
 
-                                  When the `AllowMethods` field is configured with one or more methods, the
+                                  When the `allowMethods` field is configured with one or more methods, the
                                   gateway must return the `Access-Control-Allow-Methods` response header
-                                  which value is present in the `AllowMethods` field.
+                                  which value is present in the `allowMethods` field.
 
                                   If the HTTP method of the `Access-Control-Request-Method` request header
                                   is not included in the list of methods specified by the response header
                                   `Access-Control-Allow-Methods`, it will present an error on the client
                                   side.
 
-                                  If config contains the wildcard "*" in allowMethods and the request is
-                                  not credentialed, the `Access-Control-Allow-Methods` response header
-                                  can either use the `*` wildcard or the value of
-                                  Access-Control-Request-Method from the request.
-
-                                  When the request is credentialed, the gateway must not specify the `*`
-                                  wildcard in the `Access-Control-Allow-Methods` response header. When
-                                  also the `AllowCredentials` field is true and `AllowMethods` field
-                                  specified with the `*` wildcard, the gateway must specify one HTTP method
-                                  in the value of the Access-Control-Allow-Methods response header. The
-                                  value of the header `Access-Control-Allow-Methods` is same as the
-                                  `Access-Control-Request-Method` header provided by the client. If the
-                                  header `Access-Control-Request-Method` is not included in the request,
-                                  the gateway will omit the `Access-Control-Allow-Methods` response header,
-                                  instead of specifying the `*` wildcard.
+                                  If the configuration contains the wildcard `*` in `allowMethods` and
+                                  `allowCredentials` is set to `false`, the `Access-Control-Allow-Methods`
+                                  response header may either contain the wildcard `*` or echo the value
+                                  of the `Access-Control-Request-Method` request header.
+
+                                  If the configuration contains the wildcard `*` in `allowMethods` and
+                                  `allowCredentials` is set to `true`, the gateway must not return `*`
+                                  in the `Access-Control-Allow-Methods` response header. Instead, it must
+                                  return a single HTTP method matching the value of the
+                                  `Access-Control-Request-Method` request header.
+                                  If the `Access-Control-Request-Method` header is not present in the request,
+                                  the gateway must omit the `Access-Control-Allow-Methods` response header.
 
                                   Support: Extended
                                 items:
@@ -13976,7 +13958,7 @@ spec:
                                   An origin value that includes _only_ the `*` character indicates requests
                                   from all `Origin`s are allowed.
 
-                                  When the `AllowOrigins` field is configured with multiple origins, it
+                                  When the `allowOrigins` field is configured with multiple origins, it
                                   means the server supports clients from multiple origins. If the request
                                   `Origin` matches the configured allowed origins, the gateway must return
                                   the given `Origin` and sets value of the header
@@ -13998,19 +13980,15 @@ spec:
                                   `Access-Control-Allow-Origin` to the same value as the `Origin`
                                   header provided by the client.
 
-                                  When config has the wildcard ("*") in allowOrigins, and the request
-                                  is not credentialed (e.g., it is a preflight request), the
-                                  `Access-Control-Allow-Origin` response header either contains the
-                                  wildcard as well or the Origin from the request.
-
-                                  When the request is credentialed, the gateway must not specify the `*`
-                                  wildcard in the `Access-Control-Allow-Origin` response header. When
-                                  also the `AllowCredentials` field is true and `AllowOrigins` field
-                                  specified with the `*` wildcard, the gateway must return a single origin
-                                  in the value of the `Access-Control-Allow-Origin` response header,
-                                  instead of specifying the `*` wildcard. The value of the header
-                                  `Access-Control-Allow-Origin` is same as the `Origin` header provided by
-                                  the client.
+                                  If the configuration contains the wildcard `*` in `allowOrigins` and
+                                  `allowCredentials` is set to `false`, the `Access-Control-Allow-Origin`
+                                  response header may either contain the wildcard `*` or echo the value
+                                  of the `Origin` request header.
+
+                                  If the configuration contains the wildcard `*` in `allowOrigins` and
+                                  `allowCredentials` is set to `true`, the gateway must not return `*`
+                                  in the `Access-Control-Allow-Origin` response header. Instead, it must
+                                  return a single origin matching the value of the `Origin` request header.
 
                                   Support: Extended
                                 items:
@@ -14049,7 +14027,7 @@ spec:
                                   (See https://fetch.spec.whatwg.org/#cors-safelisted-response-header-name)
                                   The CORS-safelisted response headers are exposed to client by default.
 
-                                  When an HTTP header name is specified using the `ExposeHeaders` field,
+                                  When an HTTP header name is specified using the `exposeHeaders` field,
                                   this additional header will be exposed as part of the response to the
                                   client.
 
@@ -14059,12 +14037,15 @@ spec:
                                   response header are separated by a comma (",").
 
                                   A wildcard indicates that the responses with all HTTP headers are exposed
-                                  to clients. The `Access-Control-Expose-Headers` response header can only
-                                  use `*` wildcard as value when the request is not credentialed.
+                                  to clients.
 
-                                  When the `exposeHeaders` config field contains the "*" wildcard and
-                                  the request is credentialed, the gateway cannot use the `*` wildcard in
-                                  the `Access-Control-Expose-Headers` response header.
+                                  If the configuration contains the wildcard `*` in `exposeHeaders` and
+                                  `allowCredentials` is set to `false`, the `Access-Control-Expose-Headers`
+                                  response header can contain the wildcard `*`.
+
+                                  If the configuration contains the wildcard `*` in `exposeHeaders` and
+                                  `allowCredentials` is set to `true`, the gateway cannot use the `*`
+                                  in the `Access-Control-Expose-Headers` response header.
 
                                   Support: Extended
                                 items:
@@ -14568,6 +14549,10 @@ spec:
                                   Support: Extended for Kubernetes Service
 
                                   Support: Implementation-specific for any other resource
+
+                                  If the backend service requires TLS, use BackendTLSPolicy to tell the
+                                  implementation to supply the TLS details to be used to connect to that
+                                  backend.
                                 properties:
                                   group:
                                     default: ""
@@ -15507,6 +15492,7 @@ spec:
                             a backend request is implementation-specific.
 
                             Support: Extended
+                          minimum: 1
                           type: integer
                         backoff:
                           description: |-
@@ -15575,7 +15561,7 @@ spec:
                             minimum: 400
                             type: integer
                           type: array
-                          x-kubernetes-list-type: atomic
+                          x-kubernetes-list-type: set
                       type: object
                     sessionPersistence:
                       description: |-
@@ -15627,15 +15613,6 @@ spec:
                               - Session
                               type: string
                           type: object
-                        idleTimeout:
-                          description: |-
-                            IdleTimeout defines the idle timeout of the persistent session.
-                            Once the session has been idle for more than the specified
-                            IdleTimeout duration, the session becomes invalid.
-
-                            Support: Extended
-                          pattern: ^([0-9]{1,5}(h|m|s|ms)){1,4}$
-                          type: string
                         sessionName:
                           description: |-
                             SessionName defines the name of the persistent session token
@@ -16092,19 +16069,14 @@ spec:
     storage: false
     subresources:
       status: {}
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: null
-  storedVersions: null
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
+    helm.sh/resource-policy: keep
     api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/4530
-    gateway.networking.k8s.io/bundle-version: v1.5.1
+    gateway.networking.k8s.io/bundle-version: v1.6.1
     gateway.networking.k8s.io/channel: experimental
   name: listenersets.gateway.networking.k8s.io
 spec:
@@ -16873,19 +16845,14 @@ spec:
     storage: true
     subresources:
       status: {}
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: null
-  storedVersions: null
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
+    helm.sh/resource-policy: keep
     api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/4530
-    gateway.networking.k8s.io/bundle-version: v1.5.1
+    gateway.networking.k8s.io/bundle-version: v1.6.1
     gateway.networking.k8s.io/channel: experimental
   name: referencegrants.gateway.networking.k8s.io
 spec:
@@ -17060,6 +17027,8 @@ spec:
             - from
             - to
             type: object
+        required:
+        - spec
         type: object
     served: true
     storage: false
@@ -17223,23 +17192,20 @@ spec:
             - from
             - to
             type: object
+        required:
+        - spec
         type: object
     served: true
     storage: true
     subresources: {}
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: null
-  storedVersions: null
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
+    helm.sh/resource-policy: keep
     api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/4530
-    gateway.networking.k8s.io/bundle-version: v1.5.1
+    gateway.networking.k8s.io/bundle-version: v1.6.1
     gateway.networking.k8s.io/channel: experimental
   name: tcproutes.gateway.networking.k8s.io
 spec:
@@ -17257,7 +17223,7 @@ spec:
     - jsonPath: .metadata.creationTimestamp
       name: Age
       type: date
-    name: v1alpha2
+    name: v1
     schema:
       openAPIV3Schema:
         description: |-
@@ -17536,12 +17502,6 @@ spec:
                         connections, then 80% of connections must be rejected instead.
 
                         Support: Core for Kubernetes Service
-
-                        Support: Extended for Kubernetes ServiceImport
-
-                        Support: Implementation-specific for any other resource
-
-                        Support for weight: Extended
                       items:
                         description: |-
                           BackendRef defines how a Route should forward a request to a Kubernetes
@@ -17664,10 +17624,8 @@ spec:
                       type: array
                       x-kubernetes-list-type: atomic
                     name:
-                      description: |-
-                        Name is the name of the route rule. This name MUST be unique within a Route if it is set.
-
-                        Support: Extended
+                      description: Name is the name of the route rule. This name MUST
+                        be unique within a Route if it is set.
                       maxLength: 253
                       minLength: 1
                       pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
@@ -17675,14 +17633,10 @@ spec:
                   required:
                   - backendRefs
                   type: object
-                maxItems: 16
+                maxItems: 1
                 minItems: 1
                 type: array
                 x-kubernetes-list-type: atomic
-                x-kubernetes-validations:
-                - message: Rule name must be unique within the route
-                  rule: self.all(l1, !has(l1.name) || self.exists_one(l2, has(l2.name)
-                    && l1.name == l2.name))
               useDefaultGateways:
                 description: |-
                   UseDefaultGateways indicates the default Gateway scope to use for this
@@ -17984,46 +17938,20 @@ spec:
     storage: true
     subresources:
       status: {}
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: null
-  storedVersions: null
----
-apiVersion: apiextensions.k8s.io/v1
-kind: CustomResourceDefinition
-metadata:
-  annotations:
-    api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/4530
-    gateway.networking.k8s.io/bundle-version: v1.5.1
-    gateway.networking.k8s.io/channel: experimental
-  name: tlsroutes.gateway.networking.k8s.io
-spec:
-  group: gateway.networking.k8s.io
-  names:
-    categories:
-    - gateway-api
-    kind: TLSRoute
-    listKind: TLSRouteList
-    plural: tlsroutes
-    singular: tlsroute
-  scope: Namespaced
-  versions:
   - additionalPrinterColumns:
     - jsonPath: .metadata.creationTimestamp
       name: Age
       type: date
-    name: v1
+    deprecated: true
+    deprecationWarning: The v1alpha2 version of TCPRoute has been deprecated and will
+      be removed in a future release of the API. Please upgrade to v1.
+    name: v1alpha2
     schema:
       openAPIV3Schema:
         description: |-
-          The TLSRoute resource is similar to TCPRoute, but can be configured
-          to match against TLS-specific metadata. This allows more flexibility
-          in matching streams for a given TLS listener.
-
-          If you need to forward traffic to a single target for a TLS listener, you
-          could choose to use a TCPRoute with a TLS listener.
+          TCPRoute provides a way to route TCP requests. When combined with a Gateway
+          listener, it can be used to forward connections on the port specified by the
+          listener to a set of backends specified by the TCPRoute.
         properties:
           apiVersion:
             description: |-
@@ -18043,52 +17971,8 @@ spec:
           metadata:
             type: object
           spec:
-            description: Spec defines the desired state of TLSRoute.
+            description: Spec defines the desired state of TCPRoute.
             properties:
-              hostnames:
-                description: |-
-                  Hostnames defines a set of SNI hostnames that should match against the
-                  SNI attribute of TLS ClientHello message in TLS handshake. This matches
-                  the RFC 1123 definition of a hostname with 2 notable exceptions:
-
-                  1. IPs are not allowed in SNI hostnames per RFC 6066.
-                  2. A hostname may be prefixed with a wildcard label (`*.`). The wildcard
-                     label must appear by itself as the first label.
-                items:
-                  description: |-
-                    Hostname is the fully qualified domain name of a network host. This matches
-                    the RFC 1123 definition of a hostname with 2 notable exceptions:
-
-                     1. IPs are not allowed.
-                     2. A hostname may be prefixed with a wildcard label (`*.`). The wildcard
-                        label must appear by itself as the first label.
-
-                    Hostname can be "precise" which is a domain name without the terminating
-                    dot of a network host (e.g. "foo.example.com") or "wildcard", which is a
-                    domain name prefixed with a single wildcard label (e.g. `*.example.com`).
-
-                    Note that as per RFC1035 and RFC1123, a *label* must consist of lower case
-                    alphanumeric characters or '-', and must start and end with an alphanumeric
-                    character. No other punctuation is allowed.
-                  maxLength: 253
-                  minLength: 1
-                  pattern: ^(\*\.)?[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
-                  type: string
-                maxItems: 16
-                minItems: 1
-                type: array
-                x-kubernetes-list-type: atomic
-                x-kubernetes-validations:
-                - message: Hostnames cannot contain an IP
-                  rule: self.all(h, !isIP(h))
-                - message: Hostnames must be valid based on RFC-1123
-                  rule: 'self.all(h, !h.contains(''*'') ? h.matches(''^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*)$'')
-                    : true)'
-                - message: Wildcards on hostnames must be the first label, and the
-                    rest of hostname must be valid based on RFC-1123
-                  rule: 'self.all(h, h.contains(''*'') ? (h.startsWith(''*.'') &&
-                    h.substring(2).matches(''^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*)$''))
-                    : true)'
               parentRefs:
                 description: |-
                   ParentRefs references the resources (usually Gateways) that a Route wants
@@ -18326,28 +18210,20 @@ spec:
                     || p2.port == 0)) || (has(p1.port) && has(p2.port) && p1.port
                     == p2.port))))
               rules:
-                description: Rules are a list of actions.
+                description: Rules are a list of TCP matchers and actions.
                 items:
-                  description: TLSRouteRule is the configuration for a given rule.
+                  description: TCPRouteRule is the configuration for a given rule.
                   properties:
                     backendRefs:
                       description: |-
                         BackendRefs defines the backend(s) where matching requests should be
-                        sent. If unspecified or invalid (refers to a nonexistent resource or
-                        a Service with no endpoints), the rule performs no forwarding; if no
-                        filters are specified that would result in a response being sent, the
-                        underlying implementation must actively reject request attempts to this
-                        backend, by rejecting the connection. Request rejections must respect
-                        weight; if an invalid backend is requested to have 80% of requests, then
-                        80% of requests must be rejected instead.
+                        sent. If unspecified or invalid (refers to a nonexistent resource or a
+                        Service with no endpoints), the underlying implementation MUST actively
+                        reject connection attempts to this backend. Connection rejections must
+                        respect weight; if an invalid backend is requested to have 80% of
+                        connections, then 80% of connections must be rejected instead.
 
                         Support: Core for Kubernetes Service
-
-                        Support: Extended for Kubernetes ServiceImport
-
-                        Support: Implementation-specific for any other resource
-
-                        Support for weight: Extended
                       items:
                         description: |-
                           BackendRef defines how a Route should forward a request to a Kubernetes
@@ -18479,10 +18355,14 @@ spec:
                   required:
                   - backendRefs
                   type: object
-                maxItems: 1
+                maxItems: 16
                 minItems: 1
                 type: array
                 x-kubernetes-list-type: atomic
+                x-kubernetes-validations:
+                - message: Rule name must be unique within the route
+                  rule: self.all(l1, !has(l1.name) || self.exists_one(l2, has(l2.name)
+                    && l1.name == l2.name))
               useDefaultGateways:
                 description: |-
                   UseDefaultGateways indicates the default Gateway scope to use for this
@@ -18502,11 +18382,10 @@ spec:
                 - None
                 type: string
             required:
-            - hostnames
             - rules
             type: object
           status:
-            description: Status defines the current state of TLSRoute.
+            description: Status defines the current state of TCPRoute.
             properties:
               parents:
                 description: |-
@@ -18782,23 +18661,44 @@ spec:
         - spec
         type: object
     served: true
-    storage: true
+    storage: false
     subresources:
       status: {}
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    helm.sh/resource-policy: keep
+    api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/4530
+    gateway.networking.k8s.io/bundle-version: v1.6.1
+    gateway.networking.k8s.io/channel: experimental
+  name: tlsroutes.gateway.networking.k8s.io
+spec:
+  group: gateway.networking.k8s.io
+  names:
+    categories:
+    - gateway-api
+    kind: TLSRoute
+    listKind: TLSRouteList
+    plural: tlsroutes
+    singular: tlsroute
+  scope: Namespaced
+  versions:
   - additionalPrinterColumns:
     - jsonPath: .metadata.creationTimestamp
       name: Age
       type: date
-    deprecated: true
-    deprecationWarning: The v1alpha2 version of TLSRoute has been deprecated and will
-      be removed in a future release of the API. Please upgrade to v1.
-    name: v1alpha2
+    name: v1
     schema:
       openAPIV3Schema:
         description: |-
           The TLSRoute resource is similar to TCPRoute, but can be configured
           to match against TLS-specific metadata. This allows more flexibility
           in matching streams for a given TLS listener.
+
+          If you need to forward traffic to a single target for a TLS listener, you
+          could choose to use a TCPRoute with a TLS listener.
         properties:
           apiVersion:
             description: |-
@@ -18822,39 +18722,1593 @@ spec:
             properties:
               hostnames:
                 description: |-
-                  Hostnames defines a set of SNI names that should match against the
+                  Hostnames defines a set of SNI hostnames that should match against the
                   SNI attribute of TLS ClientHello message in TLS handshake. This matches
                   the RFC 1123 definition of a hostname with 2 notable exceptions:
 
-                  1. IPs are not allowed in SNI names per RFC 6066.
+                  1. IPs are not allowed in SNI hostnames per RFC 6066.
                   2. A hostname may be prefixed with a wildcard label (`*.`). The wildcard
                      label must appear by itself as the first label.
+                items:
+                  description: |-
+                    Hostname is the fully qualified domain name of a network host. This matches
+                    the RFC 1123 definition of a hostname with 2 notable exceptions:
 
-                  If a hostname is specified by both the Listener and TLSRoute, there
-                  must be at least one intersecting hostname for the TLSRoute to be
-                  attached to the Listener. For example:
+                     1. IPs are not allowed.
+                     2. A hostname may be prefixed with a wildcard label (`*.`). The wildcard
+                        label must appear by itself as the first label.
 
-                  * A Listener with `test.example.com` as the hostname matches TLSRoutes
-                    that have either not specified any hostnames, or have specified at
-                    least one of `test.example.com` or `*.example.com`.
-                  * A Listener with `*.example.com` as the hostname matches TLSRoutes
+                    Hostname can be "precise" which is a domain name without the terminating
+                    dot of a network host (e.g. "foo.example.com") or "wildcard", which is a
+                    domain name prefixed with a single wildcard label (e.g. `*.example.com`).
+
+                    Note that as per RFC1035 and RFC1123, a *label* must consist of lower case
+                    alphanumeric characters or '-', and must start and end with an alphanumeric
+                    character. No other punctuation is allowed.
+                  maxLength: 253
+                  minLength: 1
+                  pattern: ^(\*\.)?[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                  type: string
+                maxItems: 1024
+                minItems: 1
+                type: array
+                x-kubernetes-list-type: atomic
+                x-kubernetes-validations:
+                - message: Hostnames cannot contain an IP
+                  rule: self.all(h, !isIP(h))
+                - message: Hostnames must be valid based on RFC-1123
+                  rule: 'self.all(h, !h.contains(''*'') ? h.matches(''^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*)$'')
+                    : true)'
+                - message: Wildcards on hostnames must be the first label, and the
+                    rest of hostname must be valid based on RFC-1123
+                  rule: 'self.all(h, h.contains(''*'') ? (h.startsWith(''*.'') &&
+                    h.substring(2).matches(''^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*)$''))
+                    : true)'
+              parentRefs:
+                description: |-
+                  ParentRefs references the resources (usually Gateways) that a Route wants
+                  to be attached to. Note that the referenced parent resource needs to
+                  allow this for the attachment to be complete. For Gateways, that means
+                  the Gateway needs to allow attachment from Routes of this kind and
+                  namespace. For Services, that means the Service must either be in the same
+                  namespace for a "producer" route, or the mesh implementation must support
+                  and allow "consumer" routes for the referenced Service. ReferenceGrant is
+                  not applicable for governing ParentRefs to Services - it is not possible to
+                  create a "producer" route for a Service in a different namespace from the
+                  Route.
+
+                  There are two kinds of parent resources with "Core" support:
+
+                  * Gateway (Gateway conformance profile)
+                  * Service (Mesh conformance profile, ClusterIP Services only)
+
+                  This API may be extended in the future to support additional kinds of parent
+                  resources.
+
+                  ParentRefs must be _distinct_. This means either that:
+
+                  * They select different objects.  If this is the case, then parentRef
+                    entries are distinct. In terms of fields, this means that the
+                    multi-part key defined by `group`, `kind`, `namespace`, and `name` must
+                    be unique across all parentRef entries in the Route.
+                  * They do not select different objects, but for each optional field used,
+                    each ParentRef that selects the same object must set the same set of
+                    optional fields to different values. If one ParentRef sets a
+                    combination of optional fields, all must set the same combination.
+
+                  Some examples:
+
+                  * If one ParentRef sets `sectionName`, all ParentRefs referencing the
+                    same object must also set `sectionName`.
+                  * If one ParentRef sets `port`, all ParentRefs referencing the same
+                    object must also set `port`.
+                  * If one ParentRef sets `sectionName` and `port`, all ParentRefs
+                    referencing the same object must also set `sectionName` and `port`.
+
+                  It is possible to separately reference multiple distinct objects that may
+                  be collapsed by an implementation. For example, some implementations may
+                  choose to merge compatible Gateway Listeners together. If that is the
+                  case, the list of routes attached to those resources should also be
+                  merged.
+
+                  Note that for ParentRefs that cross namespace boundaries, there are specific
+                  rules. Cross-namespace references are only valid if they are explicitly
+                  allowed by something in the namespace they are referring to. For example,
+                  Gateway has the AllowedRoutes field, and ReferenceGrant provides a
+                  generic way to enable other kinds of cross-namespace reference.
+
+
+                  ParentRefs from a Route to a Service in the same namespace are "producer"
+                  routes, which apply default routing rules to inbound connections from
+                  any namespace to the Service.
+
+                  ParentRefs from a Route to a Service in a different namespace are
+                  "consumer" routes, and these routing rules are only applied to outbound
+                  connections originating from the same namespace as the Route, for which
+                  the intended destination of the connections are a Service targeted as a
+                  ParentRef of the Route.
+                items:
+                  description: |-
+                    ParentReference identifies an API object (usually a Gateway) that can be considered
+                    a parent of this resource (usually a route). There are two kinds of parent resources
+                    with "Core" support:
+
+                    * Gateway (Gateway conformance profile)
+                    * Service (Mesh conformance profile, ClusterIP Services only)
+
+                    This API may be extended in the future to support additional kinds of parent
+                    resources.
+
+                    The API object must be valid in the cluster; the Group and Kind must
+                    be registered in the cluster for this reference to be valid.
+                  properties:
+                    group:
+                      default: gateway.networking.k8s.io
+                      description: |-
+                        Group is the group of the referent.
+                        When unspecified, "gateway.networking.k8s.io" is inferred.
+                        To set the core API group (such as for a "Service" kind referent),
+                        Group must be explicitly set to "" (empty string).
+
+                        Support: Core
+                      maxLength: 253
+                      pattern: ^$|^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                      type: string
+                    kind:
+                      default: Gateway
+                      description: |-
+                        Kind is kind of the referent.
+
+                        There are two kinds of parent resources with "Core" support:
+
+                        * Gateway (Gateway conformance profile)
+                        * Service (Mesh conformance profile, ClusterIP Services only)
+
+                        Support for other resources is Implementation-Specific.
+                      maxLength: 63
+                      minLength: 1
+                      pattern: ^[a-zA-Z]([-a-zA-Z0-9]*[a-zA-Z0-9])?$
+                      type: string
+                    name:
+                      description: |-
+                        Name is the name of the referent.
+
+                        Support: Core
+                      maxLength: 253
+                      minLength: 1
+                      type: string
+                    namespace:
+                      description: |-
+                        Namespace is the namespace of the referent. When unspecified, this refers
+                        to the local namespace of the Route.
+
+                        Note that there are specific rules for ParentRefs which cross namespace
+                        boundaries. Cross-namespace references are only valid if they are explicitly
+                        allowed by something in the namespace they are referring to. For example:
+                        Gateway has the AllowedRoutes field, and ReferenceGrant provides a
+                        generic way to enable any other kind of cross-namespace reference.
+
+
+                        ParentRefs from a Route to a Service in the same namespace are "producer"
+                        routes, which apply default routing rules to inbound connections from
+                        any namespace to the Service.
+
+                        ParentRefs from a Route to a Service in a different namespace are
+                        "consumer" routes, and these routing rules are only applied to outbound
+                        connections originating from the same namespace as the Route, for which
+                        the intended destination of the connections are a Service targeted as a
+                        ParentRef of the Route.
+
+
+                        Support: Core
+                      maxLength: 63
+                      minLength: 1
+                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                      type: string
+                    port:
+                      description: |-
+                        Port is the network port this Route targets. It can be interpreted
+                        differently based on the type of parent resource.
+
+                        When the parent resource is a Gateway, this targets all listeners
+                        listening on the specified port that also support this kind of Route(and
+                        select this Route). It's not recommended to set `Port` unless the
+                        networking behaviors specified in a Route must apply to a specific port
+                        as opposed to a listener(s) whose port(s) may be changed. When both Port
+                        and SectionName are specified, the name and port of the selected listener
+                        must match both specified values.
+
+
+                        When the parent resource is a Service, this targets a specific port in the
+                        Service spec. When both Port (experimental) and SectionName are specified,
+                        the name and port of the selected port must match both specified values.
+
+
+                        Implementations MAY choose to support other parent resources.
+                        Implementations supporting other types of parent resources MUST clearly
+                        document how/if Port is interpreted.
+
+                        For the purpose of status, an attachment is considered successful as
+                        long as the parent resource accepts it partially. For example, Gateway
+                        listeners can restrict which Routes can attach to them by Route kind,
+                        namespace, or hostname. If 1 of 2 Gateway listeners accept attachment
+                        from the referencing Route, the Route MUST be considered successfully
+                        attached. If no Gateway listeners accept attachment from this Route,
+                        the Route MUST be considered detached from the Gateway.
+
+                        Support: Extended
+                      format: int32
+                      maximum: 65535
+                      minimum: 1
+                      type: integer
+                    sectionName:
+                      description: |-
+                        SectionName is the name of a section within the target resource. In the
+                        following resources, SectionName is interpreted as the following:
+
+                        * Gateway: Listener name. When both Port (experimental) and SectionName
+                        are specified, the name and port of the selected listener must match
+                        both specified values.
+                        * Service: Port name. When both Port (experimental) and SectionName
+                        are specified, the name and port of the selected listener must match
+                        both specified values.
+
+                        Implementations MAY choose to support attaching Routes to other resources.
+                        If that is the case, they MUST clearly document how SectionName is
+                        interpreted.
+
+                        When unspecified (empty string), this will reference the entire resource.
+                        For the purpose of status, an attachment is considered successful if at
+                        least one section in the parent resource accepts it. For example, Gateway
+                        listeners can restrict which Routes can attach to them by Route kind,
+                        namespace, or hostname. If 1 of 2 Gateway listeners accept attachment from
+                        the referencing Route, the Route MUST be considered successfully
+                        attached. If no Gateway listeners accept attachment from this Route, the
+                        Route MUST be considered detached from the Gateway.
+
+                        Support: Core
+                      maxLength: 253
+                      minLength: 1
+                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                      type: string
+                  required:
+                  - name
+                  type: object
+                maxItems: 32
+                type: array
+                x-kubernetes-list-type: atomic
+                x-kubernetes-validations:
+                - message: sectionName or port must be specified when parentRefs includes
+                    2 or more references to the same parent
+                  rule: 'self.all(p1, self.all(p2, p1.group == p2.group && p1.kind
+                    == p2.kind && p1.name == p2.name && (((!has(p1.__namespace__)
+                    || p1.__namespace__ == '''') && (!has(p2.__namespace__) || p2.__namespace__
+                    == '''')) || (has(p1.__namespace__) && has(p2.__namespace__) &&
+                    p1.__namespace__ == p2.__namespace__)) ? ((!has(p1.sectionName)
+                    || p1.sectionName == '''') == (!has(p2.sectionName) || p2.sectionName
+                    == '''') && (!has(p1.port) || p1.port == 0) == (!has(p2.port)
+                    || p2.port == 0)): true))'
+                - message: sectionName or port must be unique when parentRefs includes
+                    2 or more references to the same parent
+                  rule: self.all(p1, self.exists_one(p2, p1.group == p2.group && p1.kind
+                    == p2.kind && p1.name == p2.name && (((!has(p1.__namespace__)
+                    || p1.__namespace__ == '') && (!has(p2.__namespace__) || p2.__namespace__
+                    == '')) || (has(p1.__namespace__) && has(p2.__namespace__) &&
+                    p1.__namespace__ == p2.__namespace__ )) && (((!has(p1.sectionName)
+                    || p1.sectionName == '') && (!has(p2.sectionName) || p2.sectionName
+                    == '')) || ( has(p1.sectionName) && has(p2.sectionName) && p1.sectionName
+                    == p2.sectionName)) && (((!has(p1.port) || p1.port == 0) && (!has(p2.port)
+                    || p2.port == 0)) || (has(p1.port) && has(p2.port) && p1.port
+                    == p2.port))))
+              rules:
+                description: Rules are a list of actions.
+                items:
+                  description: TLSRouteRule is the configuration for a given rule.
+                  properties:
+                    backendRefs:
+                      description: |-
+                        BackendRefs defines the backend(s) where matching requests should be
+                        sent. If unspecified or invalid (refers to a nonexistent resource or
+                        a Service with no endpoints), the rule performs no forwarding; if no
+                        filters are specified that would result in a response being sent, the
+                        underlying implementation must actively reject request attempts to this
+                        backend, by rejecting the connection. Request rejections must respect
+                        weight; if an invalid backend is requested to have 80% of requests, then
+                        80% of requests must be rejected instead.
+
+                        When a TLSRoute is attached to a listener in Terminate mode, a BackendTLSPolicy
+                        can be used to enable re-encryption of the traffic to the backends.
+
+                        Support: Core for Kubernetes Service
+
+                        Support: Extended for Kubernetes ServiceImport
+
+                        Support: Implementation-specific for any other resource
+
+                        Support for weight: Extended
+
+                        Support for BackendTLSPolicy: Extended
+                      items:
+                        description: |-
+                          BackendRef defines how a Route should forward a request to a Kubernetes
+                          resource.
+
+                          Note that when a namespace different than the local namespace is specified, a
+                          ReferenceGrant object is required in the referent namespace to allow that
+                          namespace's owner to accept the reference. See the ReferenceGrant
+                          documentation for details.
+
+
+                          When the BackendRef points to a Kubernetes Service, implementations SHOULD
+                          honor the appProtocol field if it is set for the target Service Port.
+
+                          Implementations supporting appProtocol SHOULD recognize the Kubernetes
+                          Standard Application Protocols defined in KEP-3726.
+
+                          If a Service appProtocol isn't specified, an implementation MAY infer the
+                          backend protocol through its own means. Implementations MAY infer the
+                          protocol from the Route type referring to the backend Service.
+
+                          If a Route is not able to send traffic to the backend using the specified
+                          protocol then the backend is considered invalid. Implementations MUST set the
+                          "ResolvedRefs" condition to "False" with the "UnsupportedProtocol" reason.
+
+
+                          Note that when the BackendTLSPolicy object is enabled by the implementation,
+                          there are some extra rules about validity to consider here. See the fields
+                          where this struct is used for more information about the exact behavior.
+                        properties:
+                          group:
+                            default: ""
+                            description: |-
+                              Group is the group of the referent. For example, "gateway.networking.k8s.io".
+                              When unspecified or empty string, core API group is inferred.
+                            maxLength: 253
+                            pattern: ^$|^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                            type: string
+                          kind:
+                            default: Service
+                            description: |-
+                              Kind is the Kubernetes resource kind of the referent. For example
+                              "Service".
+
+                              Defaults to "Service" when not specified.
+
+                              ExternalName services can refer to CNAME DNS records that may live
+                              outside of the cluster and as such are difficult to reason about in
+                              terms of conformance. They also may not be safe to forward to (see
+                              CVE-2021-25740 for more information). Implementations SHOULD NOT
+                              support ExternalName Services.
+
+                              Support: Core (Services with a type other than ExternalName)
+
+                              Support: Implementation-specific (Services with type ExternalName)
+                            maxLength: 63
+                            minLength: 1
+                            pattern: ^[a-zA-Z]([-a-zA-Z0-9]*[a-zA-Z0-9])?$
+                            type: string
+                          name:
+                            description: Name is the name of the referent.
+                            maxLength: 253
+                            minLength: 1
+                            type: string
+                          namespace:
+                            description: |-
+                              Namespace is the namespace of the backend. When unspecified, the local
+                              namespace is inferred.
+
+                              Note that when a namespace different than the local namespace is specified,
+                              a ReferenceGrant object is required in the referent namespace to allow that
+                              namespace's owner to accept the reference. See the ReferenceGrant
+                              documentation for details.
+
+                              Support: Core
+                            maxLength: 63
+                            minLength: 1
+                            pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                            type: string
+                          port:
+                            description: |-
+                              Port specifies the destination port number to use for this resource.
+                              Port is required when the referent is a Kubernetes Service. In this
+                              case, the port number is the service port number, not the target port.
+                              For other resources, destination port might be derived from the referent
+                              resource or this field.
+                            format: int32
+                            maximum: 65535
+                            minimum: 1
+                            type: integer
+                          weight:
+                            default: 1
+                            description: |-
+                              Weight specifies the proportion of requests forwarded to the referenced
+                              backend. This is computed as weight/(sum of all weights in this
+                              BackendRefs list). For non-zero values, there may be some epsilon from
+                              the exact proportion defined here depending on the precision an
+                              implementation supports. Weight is not a percentage and the sum of
+                              weights does not need to equal 100.
+
+                              If only one backend is specified and it has a weight greater than 0, 100%
+                              of the traffic is forwarded to that backend. If weight is set to 0, no
+                              traffic should be forwarded for this entry. If unspecified, weight
+                              defaults to 1.
+
+                              Support for this field varies based on the context where used.
+                            format: int32
+                            maximum: 1000000
+                            minimum: 0
+                            type: integer
+                        required:
+                        - name
+                        type: object
+                        x-kubernetes-validations:
+                        - message: Must have port for Service reference
+                          rule: '(size(self.group) == 0 && self.kind == ''Service'')
+                            ? has(self.port) : true'
+                      maxItems: 16
+                      minItems: 1
+                      type: array
+                      x-kubernetes-list-type: atomic
+                    name:
+                      description: Name is the name of the route rule. This name MUST
+                        be unique within a Route if it is set.
+                      maxLength: 253
+                      minLength: 1
+                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                      type: string
+                  required:
+                  - backendRefs
+                  type: object
+                maxItems: 1
+                minItems: 1
+                type: array
+                x-kubernetes-list-type: atomic
+              useDefaultGateways:
+                description: |-
+                  UseDefaultGateways indicates the default Gateway scope to use for this
+                  Route. If unset (the default) or set to None, the Route will not be
+                  attached to any default Gateway; if set, it will be attached to any
+                  default Gateway supporting the named scope, subject to the usual rules
+                  about which Routes a Gateway is allowed to claim.
+
+                  Think carefully before using this functionality! The set of default
+                  Gateways supporting the requested scope can change over time without
+                  any notice to the Route author, and in many situations it will not be
+                  appropriate to request a default Gateway for a given Route -- for
+                  example, a Route with specific security requirements should almost
+                  certainly not use a default Gateway.
+                enum:
+                - All
+                - None
+                type: string
+            required:
+            - hostnames
+            - rules
+            type: object
+          status:
+            description: Status defines the current state of TLSRoute.
+            properties:
+              parents:
+                description: |-
+                  Parents is a list of parent resources (usually Gateways) that are
+                  associated with the route, and the status of the route with respect to
+                  each parent. When this route attaches to a parent, the controller that
+                  manages the parent must add an entry to this list when the controller
+                  first sees the route and should update the entry as appropriate when the
+                  route or gateway is modified.
+
+                  Note that parent references that cannot be resolved by an implementation
+                  of this API will not be added to this list. Implementations of this API
+                  can only populate Route status for the Gateways/parent resources they are
+                  responsible for.
+
+                  A maximum of 32 Gateways will be represented in this list. An empty list
+                  means the route has not been attached to any Gateway.
+                items:
+                  description: |-
+                    RouteParentStatus describes the status of a route with respect to an
+                    associated Parent.
+                  properties:
+                    conditions:
+                      description: |-
+                        Conditions describes the status of the route with respect to the Gateway.
+                        Note that the route's availability is also subject to the Gateway's own
+                        status conditions and listener status.
+
+                        If the Route's ParentRef specifies an existing Gateway that supports
+                        Routes of this kind AND that Gateway's controller has sufficient access,
+                        then that Gateway's controller MUST set the "Accepted" condition on the
+                        Route, to indicate whether the route has been accepted or rejected by the
+                        Gateway, and why.
+
+                        A Route MUST be considered "Accepted" if at least one of the Route's
+                        rules is implemented by the Gateway.
+
+                        There are a number of cases where the "Accepted" condition may not be set
+                        due to lack of controller visibility, that includes when:
+
+                        * The Route refers to a nonexistent parent.
+                        * The Route is of a type that the controller does not support.
+                        * The Route is in a namespace to which the controller does not have access.
+                      items:
+                        description: Condition contains details for one aspect of
+                          the current state of this API Resource.
+                        properties:
+                          lastTransitionTime:
+                            description: |-
+                              lastTransitionTime is the last time the condition transitioned from one status to another.
+                              This should be when the underlying condition changed.  If that is not known, then using the time when the API field changed is acceptable.
+                            format: date-time
+                            type: string
+                          message:
+                            description: |-
+                              message is a human readable message indicating details about the transition.
+                              This may be an empty string.
+                            maxLength: 32768
+                            type: string
+                          observedGeneration:
+                            description: |-
+                              observedGeneration represents the .metadata.generation that the condition was set based upon.
+                              For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date
+                              with respect to the current state of the instance.
+                            format: int64
+                            minimum: 0
+                            type: integer
+                          reason:
+                            description: |-
+                              reason contains a programmatic identifier indicating the reason for the condition's last transition.
+                              Producers of specific condition types may define expected values and meanings for this field,
+                              and whether the values are considered a guaranteed API.
+                              The value should be a CamelCase string.
+                              This field may not be empty.
+                            maxLength: 1024
+                            minLength: 1
+                            pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
+                            type: string
+                          status:
+                            description: status of the condition, one of True, False,
+                              Unknown.
+                            enum:
+                            - "True"
+                            - "False"
+                            - Unknown
+                            type: string
+                          type:
+                            description: type of condition in CamelCase or in foo.example.com/CamelCase.
+                            maxLength: 316
+                            pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
+                            type: string
+                        required:
+                        - lastTransitionTime
+                        - message
+                        - reason
+                        - status
+                        - type
+                        type: object
+                      maxItems: 8
+                      minItems: 1
+                      type: array
+                      x-kubernetes-list-map-keys:
+                      - type
+                      x-kubernetes-list-type: map
+                    controllerName:
+                      description: |-
+                        ControllerName is a domain/path string that indicates the name of the
+                        controller that wrote this status. This corresponds with the
+                        controllerName field on GatewayClass.
+
+                        Example: "example.net/gateway-controller".
+
+                        The format of this field is DOMAIN "/" PATH, where DOMAIN and PATH are
+                        valid Kubernetes names
+                        (https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names).
+
+                        Controllers MUST populate this field when writing status. Controllers should ensure that
+                        entries to status populated with their ControllerName are cleaned up when they are no
+                        longer necessary.
+                      maxLength: 253
+                      minLength: 1
+                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*\/[A-Za-z0-9\/\-._~%!$&'()*+,;=:]+$
+                      type: string
+                    parentRef:
+                      description: |-
+                        ParentRef corresponds with a ParentRef in the spec that this
+                        RouteParentStatus struct describes the status of.
+                      properties:
+                        group:
+                          default: gateway.networking.k8s.io
+                          description: |-
+                            Group is the group of the referent.
+                            When unspecified, "gateway.networking.k8s.io" is inferred.
+                            To set the core API group (such as for a "Service" kind referent),
+                            Group must be explicitly set to "" (empty string).
+
+                            Support: Core
+                          maxLength: 253
+                          pattern: ^$|^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                          type: string
+                        kind:
+                          default: Gateway
+                          description: |-
+                            Kind is kind of the referent.
+
+                            There are two kinds of parent resources with "Core" support:
+
+                            * Gateway (Gateway conformance profile)
+                            * Service (Mesh conformance profile, ClusterIP Services only)
+
+                            Support for other resources is Implementation-Specific.
+                          maxLength: 63
+                          minLength: 1
+                          pattern: ^[a-zA-Z]([-a-zA-Z0-9]*[a-zA-Z0-9])?$
+                          type: string
+                        name:
+                          description: |-
+                            Name is the name of the referent.
+
+                            Support: Core
+                          maxLength: 253
+                          minLength: 1
+                          type: string
+                        namespace:
+                          description: |-
+                            Namespace is the namespace of the referent. When unspecified, this refers
+                            to the local namespace of the Route.
+
+                            Note that there are specific rules for ParentRefs which cross namespace
+                            boundaries. Cross-namespace references are only valid if they are explicitly
+                            allowed by something in the namespace they are referring to. For example:
+                            Gateway has the AllowedRoutes field, and ReferenceGrant provides a
+                            generic way to enable any other kind of cross-namespace reference.
+
+
+                            ParentRefs from a Route to a Service in the same namespace are "producer"
+                            routes, which apply default routing rules to inbound connections from
+                            any namespace to the Service.
+
+                            ParentRefs from a Route to a Service in a different namespace are
+                            "consumer" routes, and these routing rules are only applied to outbound
+                            connections originating from the same namespace as the Route, for which
+                            the intended destination of the connections are a Service targeted as a
+                            ParentRef of the Route.
+
+
+                            Support: Core
+                          maxLength: 63
+                          minLength: 1
+                          pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                          type: string
+                        port:
+                          description: |-
+                            Port is the network port this Route targets. It can be interpreted
+                            differently based on the type of parent resource.
+
+                            When the parent resource is a Gateway, this targets all listeners
+                            listening on the specified port that also support this kind of Route(and
+                            select this Route). It's not recommended to set `Port` unless the
+                            networking behaviors specified in a Route must apply to a specific port
+                            as opposed to a listener(s) whose port(s) may be changed. When both Port
+                            and SectionName are specified, the name and port of the selected listener
+                            must match both specified values.
+
+
+                            When the parent resource is a Service, this targets a specific port in the
+                            Service spec. When both Port (experimental) and SectionName are specified,
+                            the name and port of the selected port must match both specified values.
+
+
+                            Implementations MAY choose to support other parent resources.
+                            Implementations supporting other types of parent resources MUST clearly
+                            document how/if Port is interpreted.
+
+                            For the purpose of status, an attachment is considered successful as
+                            long as the parent resource accepts it partially. For example, Gateway
+                            listeners can restrict which Routes can attach to them by Route kind,
+                            namespace, or hostname. If 1 of 2 Gateway listeners accept attachment
+                            from the referencing Route, the Route MUST be considered successfully
+                            attached. If no Gateway listeners accept attachment from this Route,
+                            the Route MUST be considered detached from the Gateway.
+
+                            Support: Extended
+                          format: int32
+                          maximum: 65535
+                          minimum: 1
+                          type: integer
+                        sectionName:
+                          description: |-
+                            SectionName is the name of a section within the target resource. In the
+                            following resources, SectionName is interpreted as the following:
+
+                            * Gateway: Listener name. When both Port (experimental) and SectionName
+                            are specified, the name and port of the selected listener must match
+                            both specified values.
+                            * Service: Port name. When both Port (experimental) and SectionName
+                            are specified, the name and port of the selected listener must match
+                            both specified values.
+
+                            Implementations MAY choose to support attaching Routes to other resources.
+                            If that is the case, they MUST clearly document how SectionName is
+                            interpreted.
+
+                            When unspecified (empty string), this will reference the entire resource.
+                            For the purpose of status, an attachment is considered successful if at
+                            least one section in the parent resource accepts it. For example, Gateway
+                            listeners can restrict which Routes can attach to them by Route kind,
+                            namespace, or hostname. If 1 of 2 Gateway listeners accept attachment from
+                            the referencing Route, the Route MUST be considered successfully
+                            attached. If no Gateway listeners accept attachment from this Route, the
+                            Route MUST be considered detached from the Gateway.
+
+                            Support: Core
+                          maxLength: 253
+                          minLength: 1
+                          pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                          type: string
+                      required:
+                      - name
+                      type: object
+                  required:
+                  - conditions
+                  - controllerName
+                  - parentRef
+                  type: object
+                maxItems: 32
+                type: array
+                x-kubernetes-list-type: atomic
+            required:
+            - parents
+            type: object
+        required:
+        - spec
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}
+  - additionalPrinterColumns:
+    - jsonPath: .metadata.creationTimestamp
+      name: Age
+      type: date
+    deprecated: true
+    deprecationWarning: The v1alpha2 version of TLSRoute has been deprecated and will
+      be removed in a future release of the API. Please upgrade to v1.
+    name: v1alpha2
+    schema:
+      openAPIV3Schema:
+        description: |-
+          The TLSRoute resource is similar to TCPRoute, but can be configured
+          to match against TLS-specific metadata. This allows more flexibility
+          in matching streams for a given TLS listener.
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: Spec defines the desired state of TLSRoute.
+            properties:
+              hostnames:
+                description: |-
+                  Hostnames defines a set of SNI names that should match against the
+                  SNI attribute of TLS ClientHello message in TLS handshake. This matches
+                  the RFC 1123 definition of a hostname with 2 notable exceptions:
+
+                  1. IPs are not allowed in SNI names per RFC 6066.
+                  2. A hostname may be prefixed with a wildcard label (`*.`). The wildcard
+                     label must appear by itself as the first label.
+
+                  If a hostname is specified by both the Listener and TLSRoute, there
+                  must be at least one intersecting hostname for the TLSRoute to be
+                  attached to the Listener. For example:
+
+                  * A Listener with `test.example.com` as the hostname matches TLSRoutes
+                    that have either not specified any hostnames, or have specified at
+                    least one of `test.example.com` or `*.example.com`.
+                  * A Listener with `*.example.com` as the hostname matches TLSRoutes
                     that have either not specified any hostnames or have specified at least
                     one hostname that matches the Listener hostname. For example,
                     `test.example.com` and `*.example.com` would both match. On the other
                     hand, `example.com` and `test.example.net` would not match.
 
-                  If both the Listener and TLSRoute have specified hostnames, any
-                  TLSRoute hostnames that do not match the Listener hostname MUST be
-                  ignored. For example, if a Listener specified `*.example.com`, and the
-                  TLSRoute specified `test.example.com` and `test.example.net`,
-                  `test.example.net` must not be considered for a match.
+                  If both the Listener and TLSRoute have specified hostnames, any
+                  TLSRoute hostnames that do not match the Listener hostname MUST be
+                  ignored. For example, if a Listener specified `*.example.com`, and the
+                  TLSRoute specified `test.example.com` and `test.example.net`,
+                  `test.example.net` must not be considered for a match.
+
+                  If both the Listener and TLSRoute have specified hostnames, and none
+                  match with the criteria above, then the TLSRoute is not accepted. The
+                  implementation must raise an 'Accepted' Condition with a status of
+                  `False` in the corresponding RouteParentStatus.
+
+                  Support: Core
+                items:
+                  description: |-
+                    Hostname is the fully qualified domain name of a network host. This matches
+                    the RFC 1123 definition of a hostname with 2 notable exceptions:
+
+                     1. IPs are not allowed.
+                     2. A hostname may be prefixed with a wildcard label (`*.`). The wildcard
+                        label must appear by itself as the first label.
+
+                    Hostname can be "precise" which is a domain name without the terminating
+                    dot of a network host (e.g. "foo.example.com") or "wildcard", which is a
+                    domain name prefixed with a single wildcard label (e.g. `*.example.com`).
+
+                    Note that as per RFC1035 and RFC1123, a *label* must consist of lower case
+                    alphanumeric characters or '-', and must start and end with an alphanumeric
+                    character. No other punctuation is allowed.
+                  maxLength: 253
+                  minLength: 1
+                  pattern: ^(\*\.)?[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                  type: string
+                maxItems: 1024
+                type: array
+                x-kubernetes-list-type: atomic
+              parentRefs:
+                description: |-
+                  ParentRefs references the resources (usually Gateways) that a Route wants
+                  to be attached to. Note that the referenced parent resource needs to
+                  allow this for the attachment to be complete. For Gateways, that means
+                  the Gateway needs to allow attachment from Routes of this kind and
+                  namespace. For Services, that means the Service must either be in the same
+                  namespace for a "producer" route, or the mesh implementation must support
+                  and allow "consumer" routes for the referenced Service. ReferenceGrant is
+                  not applicable for governing ParentRefs to Services - it is not possible to
+                  create a "producer" route for a Service in a different namespace from the
+                  Route.
+
+                  There are two kinds of parent resources with "Core" support:
+
+                  * Gateway (Gateway conformance profile)
+                  * Service (Mesh conformance profile, ClusterIP Services only)
+
+                  This API may be extended in the future to support additional kinds of parent
+                  resources.
+
+                  ParentRefs must be _distinct_. This means either that:
+
+                  * They select different objects.  If this is the case, then parentRef
+                    entries are distinct. In terms of fields, this means that the
+                    multi-part key defined by `group`, `kind`, `namespace`, and `name` must
+                    be unique across all parentRef entries in the Route.
+                  * They do not select different objects, but for each optional field used,
+                    each ParentRef that selects the same object must set the same set of
+                    optional fields to different values. If one ParentRef sets a
+                    combination of optional fields, all must set the same combination.
+
+                  Some examples:
+
+                  * If one ParentRef sets `sectionName`, all ParentRefs referencing the
+                    same object must also set `sectionName`.
+                  * If one ParentRef sets `port`, all ParentRefs referencing the same
+                    object must also set `port`.
+                  * If one ParentRef sets `sectionName` and `port`, all ParentRefs
+                    referencing the same object must also set `sectionName` and `port`.
+
+                  It is possible to separately reference multiple distinct objects that may
+                  be collapsed by an implementation. For example, some implementations may
+                  choose to merge compatible Gateway Listeners together. If that is the
+                  case, the list of routes attached to those resources should also be
+                  merged.
+
+                  Note that for ParentRefs that cross namespace boundaries, there are specific
+                  rules. Cross-namespace references are only valid if they are explicitly
+                  allowed by something in the namespace they are referring to. For example,
+                  Gateway has the AllowedRoutes field, and ReferenceGrant provides a
+                  generic way to enable other kinds of cross-namespace reference.
+
+
+                  ParentRefs from a Route to a Service in the same namespace are "producer"
+                  routes, which apply default routing rules to inbound connections from
+                  any namespace to the Service.
+
+                  ParentRefs from a Route to a Service in a different namespace are
+                  "consumer" routes, and these routing rules are only applied to outbound
+                  connections originating from the same namespace as the Route, for which
+                  the intended destination of the connections are a Service targeted as a
+                  ParentRef of the Route.
+                items:
+                  description: |-
+                    ParentReference identifies an API object (usually a Gateway) that can be considered
+                    a parent of this resource (usually a route). There are two kinds of parent resources
+                    with "Core" support:
+
+                    * Gateway (Gateway conformance profile)
+                    * Service (Mesh conformance profile, ClusterIP Services only)
+
+                    This API may be extended in the future to support additional kinds of parent
+                    resources.
+
+                    The API object must be valid in the cluster; the Group and Kind must
+                    be registered in the cluster for this reference to be valid.
+                  properties:
+                    group:
+                      default: gateway.networking.k8s.io
+                      description: |-
+                        Group is the group of the referent.
+                        When unspecified, "gateway.networking.k8s.io" is inferred.
+                        To set the core API group (such as for a "Service" kind referent),
+                        Group must be explicitly set to "" (empty string).
+
+                        Support: Core
+                      maxLength: 253
+                      pattern: ^$|^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                      type: string
+                    kind:
+                      default: Gateway
+                      description: |-
+                        Kind is kind of the referent.
+
+                        There are two kinds of parent resources with "Core" support:
+
+                        * Gateway (Gateway conformance profile)
+                        * Service (Mesh conformance profile, ClusterIP Services only)
+
+                        Support for other resources is Implementation-Specific.
+                      maxLength: 63
+                      minLength: 1
+                      pattern: ^[a-zA-Z]([-a-zA-Z0-9]*[a-zA-Z0-9])?$
+                      type: string
+                    name:
+                      description: |-
+                        Name is the name of the referent.
+
+                        Support: Core
+                      maxLength: 253
+                      minLength: 1
+                      type: string
+                    namespace:
+                      description: |-
+                        Namespace is the namespace of the referent. When unspecified, this refers
+                        to the local namespace of the Route.
+
+                        Note that there are specific rules for ParentRefs which cross namespace
+                        boundaries. Cross-namespace references are only valid if they are explicitly
+                        allowed by something in the namespace they are referring to. For example:
+                        Gateway has the AllowedRoutes field, and ReferenceGrant provides a
+                        generic way to enable any other kind of cross-namespace reference.
+
+
+                        ParentRefs from a Route to a Service in the same namespace are "producer"
+                        routes, which apply default routing rules to inbound connections from
+                        any namespace to the Service.
+
+                        ParentRefs from a Route to a Service in a different namespace are
+                        "consumer" routes, and these routing rules are only applied to outbound
+                        connections originating from the same namespace as the Route, for which
+                        the intended destination of the connections are a Service targeted as a
+                        ParentRef of the Route.
+
+
+                        Support: Core
+                      maxLength: 63
+                      minLength: 1
+                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                      type: string
+                    port:
+                      description: |-
+                        Port is the network port this Route targets. It can be interpreted
+                        differently based on the type of parent resource.
+
+                        When the parent resource is a Gateway, this targets all listeners
+                        listening on the specified port that also support this kind of Route(and
+                        select this Route). It's not recommended to set `Port` unless the
+                        networking behaviors specified in a Route must apply to a specific port
+                        as opposed to a listener(s) whose port(s) may be changed. When both Port
+                        and SectionName are specified, the name and port of the selected listener
+                        must match both specified values.
+
+
+                        When the parent resource is a Service, this targets a specific port in the
+                        Service spec. When both Port (experimental) and SectionName are specified,
+                        the name and port of the selected port must match both specified values.
+
+
+                        Implementations MAY choose to support other parent resources.
+                        Implementations supporting other types of parent resources MUST clearly
+                        document how/if Port is interpreted.
+
+                        For the purpose of status, an attachment is considered successful as
+                        long as the parent resource accepts it partially. For example, Gateway
+                        listeners can restrict which Routes can attach to them by Route kind,
+                        namespace, or hostname. If 1 of 2 Gateway listeners accept attachment
+                        from the referencing Route, the Route MUST be considered successfully
+                        attached. If no Gateway listeners accept attachment from this Route,
+                        the Route MUST be considered detached from the Gateway.
+
+                        Support: Extended
+                      format: int32
+                      maximum: 65535
+                      minimum: 1
+                      type: integer
+                    sectionName:
+                      description: |-
+                        SectionName is the name of a section within the target resource. In the
+                        following resources, SectionName is interpreted as the following:
+
+                        * Gateway: Listener name. When both Port (experimental) and SectionName
+                        are specified, the name and port of the selected listener must match
+                        both specified values.
+                        * Service: Port name. When both Port (experimental) and SectionName
+                        are specified, the name and port of the selected listener must match
+                        both specified values.
+
+                        Implementations MAY choose to support attaching Routes to other resources.
+                        If that is the case, they MUST clearly document how SectionName is
+                        interpreted.
+
+                        When unspecified (empty string), this will reference the entire resource.
+                        For the purpose of status, an attachment is considered successful if at
+                        least one section in the parent resource accepts it. For example, Gateway
+                        listeners can restrict which Routes can attach to them by Route kind,
+                        namespace, or hostname. If 1 of 2 Gateway listeners accept attachment from
+                        the referencing Route, the Route MUST be considered successfully
+                        attached. If no Gateway listeners accept attachment from this Route, the
+                        Route MUST be considered detached from the Gateway.
+
+                        Support: Core
+                      maxLength: 253
+                      minLength: 1
+                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                      type: string
+                  required:
+                  - name
+                  type: object
+                maxItems: 32
+                type: array
+                x-kubernetes-list-type: atomic
+                x-kubernetes-validations:
+                - message: sectionName or port must be specified when parentRefs includes
+                    2 or more references to the same parent
+                  rule: 'self.all(p1, self.all(p2, p1.group == p2.group && p1.kind
+                    == p2.kind && p1.name == p2.name && (((!has(p1.__namespace__)
+                    || p1.__namespace__ == '''') && (!has(p2.__namespace__) || p2.__namespace__
+                    == '''')) || (has(p1.__namespace__) && has(p2.__namespace__) &&
+                    p1.__namespace__ == p2.__namespace__)) ? ((!has(p1.sectionName)
+                    || p1.sectionName == '''') == (!has(p2.sectionName) || p2.sectionName
+                    == '''') && (!has(p1.port) || p1.port == 0) == (!has(p2.port)
+                    || p2.port == 0)): true))'
+                - message: sectionName or port must be unique when parentRefs includes
+                    2 or more references to the same parent
+                  rule: self.all(p1, self.exists_one(p2, p1.group == p2.group && p1.kind
+                    == p2.kind && p1.name == p2.name && (((!has(p1.__namespace__)
+                    || p1.__namespace__ == '') && (!has(p2.__namespace__) || p2.__namespace__
+                    == '')) || (has(p1.__namespace__) && has(p2.__namespace__) &&
+                    p1.__namespace__ == p2.__namespace__ )) && (((!has(p1.sectionName)
+                    || p1.sectionName == '') && (!has(p2.sectionName) || p2.sectionName
+                    == '')) || ( has(p1.sectionName) && has(p2.sectionName) && p1.sectionName
+                    == p2.sectionName)) && (((!has(p1.port) || p1.port == 0) && (!has(p2.port)
+                    || p2.port == 0)) || (has(p1.port) && has(p2.port) && p1.port
+                    == p2.port))))
+              rules:
+                description: Rules are a list of TLS matchers and actions.
+                items:
+                  description: TLSRouteRule is the configuration for a given rule.
+                  properties:
+                    backendRefs:
+                      description: |-
+                        BackendRefs defines the backend(s) where matching requests should be
+                        sent. If unspecified or invalid (refers to a nonexistent resource or
+                        a Service with no endpoints), the rule performs no forwarding; if no
+                        filters are specified that would result in a response being sent, the
+                        underlying implementation must actively reject request attempts to this
+                        backend, by rejecting the connection. Request rejections must respect
+                        weight; if an invalid backend is requested to have 80% of requests, then
+                        80% of requests must be rejected instead.
+
+                        When a TLSRoute is attached to a listener in Terminate mode, a BackendTLSPolicy
+                        can be used to enable re-encryption of the traffic to the backends.
+
+                        Support: Core for Kubernetes Service
+
+                        Support: Extended for Kubernetes ServiceImport
+
+                        Support: Implementation-specific for any other resource
+
+                        Support for weight: Extended
+
+                        Support for BackendTLSPolicy: Extended
+                      items:
+                        description: |-
+                          BackendRef defines how a Route should forward a request to a Kubernetes
+                          resource.
+
+                          Note that when a namespace different than the local namespace is specified, a
+                          ReferenceGrant object is required in the referent namespace to allow that
+                          namespace's owner to accept the reference. See the ReferenceGrant
+                          documentation for details.
+
+
+                          When the BackendRef points to a Kubernetes Service, implementations SHOULD
+                          honor the appProtocol field if it is set for the target Service Port.
+
+                          Implementations supporting appProtocol SHOULD recognize the Kubernetes
+                          Standard Application Protocols defined in KEP-3726.
+
+                          If a Service appProtocol isn't specified, an implementation MAY infer the
+                          backend protocol through its own means. Implementations MAY infer the
+                          protocol from the Route type referring to the backend Service.
+
+                          If a Route is not able to send traffic to the backend using the specified
+                          protocol then the backend is considered invalid. Implementations MUST set the
+                          "ResolvedRefs" condition to "False" with the "UnsupportedProtocol" reason.
+
+
+                          Note that when the BackendTLSPolicy object is enabled by the implementation,
+                          there are some extra rules about validity to consider here. See the fields
+                          where this struct is used for more information about the exact behavior.
+                        properties:
+                          group:
+                            default: ""
+                            description: |-
+                              Group is the group of the referent. For example, "gateway.networking.k8s.io".
+                              When unspecified or empty string, core API group is inferred.
+                            maxLength: 253
+                            pattern: ^$|^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                            type: string
+                          kind:
+                            default: Service
+                            description: |-
+                              Kind is the Kubernetes resource kind of the referent. For example
+                              "Service".
+
+                              Defaults to "Service" when not specified.
+
+                              ExternalName services can refer to CNAME DNS records that may live
+                              outside of the cluster and as such are difficult to reason about in
+                              terms of conformance. They also may not be safe to forward to (see
+                              CVE-2021-25740 for more information). Implementations SHOULD NOT
+                              support ExternalName Services.
+
+                              Support: Core (Services with a type other than ExternalName)
+
+                              Support: Implementation-specific (Services with type ExternalName)
+                            maxLength: 63
+                            minLength: 1
+                            pattern: ^[a-zA-Z]([-a-zA-Z0-9]*[a-zA-Z0-9])?$
+                            type: string
+                          name:
+                            description: Name is the name of the referent.
+                            maxLength: 253
+                            minLength: 1
+                            type: string
+                          namespace:
+                            description: |-
+                              Namespace is the namespace of the backend. When unspecified, the local
+                              namespace is inferred.
+
+                              Note that when a namespace different than the local namespace is specified,
+                              a ReferenceGrant object is required in the referent namespace to allow that
+                              namespace's owner to accept the reference. See the ReferenceGrant
+                              documentation for details.
+
+                              Support: Core
+                            maxLength: 63
+                            minLength: 1
+                            pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                            type: string
+                          port:
+                            description: |-
+                              Port specifies the destination port number to use for this resource.
+                              Port is required when the referent is a Kubernetes Service. In this
+                              case, the port number is the service port number, not the target port.
+                              For other resources, destination port might be derived from the referent
+                              resource or this field.
+                            format: int32
+                            maximum: 65535
+                            minimum: 1
+                            type: integer
+                          weight:
+                            default: 1
+                            description: |-
+                              Weight specifies the proportion of requests forwarded to the referenced
+                              backend. This is computed as weight/(sum of all weights in this
+                              BackendRefs list). For non-zero values, there may be some epsilon from
+                              the exact proportion defined here depending on the precision an
+                              implementation supports. Weight is not a percentage and the sum of
+                              weights does not need to equal 100.
+
+                              If only one backend is specified and it has a weight greater than 0, 100%
+                              of the traffic is forwarded to that backend. If weight is set to 0, no
+                              traffic should be forwarded for this entry. If unspecified, weight
+                              defaults to 1.
+
+                              Support for this field varies based on the context where used.
+                            format: int32
+                            maximum: 1000000
+                            minimum: 0
+                            type: integer
+                        required:
+                        - name
+                        type: object
+                        x-kubernetes-validations:
+                        - message: Must have port for Service reference
+                          rule: '(size(self.group) == 0 && self.kind == ''Service'')
+                            ? has(self.port) : true'
+                      maxItems: 16
+                      minItems: 1
+                      type: array
+                      x-kubernetes-list-type: atomic
+                    name:
+                      description: Name is the name of the route rule. This name MUST
+                        be unique within a Route if it is set.
+                      maxLength: 253
+                      minLength: 1
+                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                      type: string
+                  required:
+                  - backendRefs
+                  type: object
+                maxItems: 16
+                minItems: 1
+                type: array
+                x-kubernetes-list-type: atomic
+                x-kubernetes-validations:
+                - message: Rule name must be unique within the route
+                  rule: self.all(l1, !has(l1.name) || self.exists_one(l2, has(l2.name)
+                    && l1.name == l2.name))
+              useDefaultGateways:
+                description: |-
+                  UseDefaultGateways indicates the default Gateway scope to use for this
+                  Route. If unset (the default) or set to None, the Route will not be
+                  attached to any default Gateway; if set, it will be attached to any
+                  default Gateway supporting the named scope, subject to the usual rules
+                  about which Routes a Gateway is allowed to claim.
+
+                  Think carefully before using this functionality! The set of default
+                  Gateways supporting the requested scope can change over time without
+                  any notice to the Route author, and in many situations it will not be
+                  appropriate to request a default Gateway for a given Route -- for
+                  example, a Route with specific security requirements should almost
+                  certainly not use a default Gateway.
+                enum:
+                - All
+                - None
+                type: string
+            required:
+            - rules
+            type: object
+          status:
+            description: Status defines the current state of TLSRoute.
+            properties:
+              parents:
+                description: |-
+                  Parents is a list of parent resources (usually Gateways) that are
+                  associated with the route, and the status of the route with respect to
+                  each parent. When this route attaches to a parent, the controller that
+                  manages the parent must add an entry to this list when the controller
+                  first sees the route and should update the entry as appropriate when the
+                  route or gateway is modified.
+
+                  Note that parent references that cannot be resolved by an implementation
+                  of this API will not be added to this list. Implementations of this API
+                  can only populate Route status for the Gateways/parent resources they are
+                  responsible for.
+
+                  A maximum of 32 Gateways will be represented in this list. An empty list
+                  means the route has not been attached to any Gateway.
+                items:
+                  description: |-
+                    RouteParentStatus describes the status of a route with respect to an
+                    associated Parent.
+                  properties:
+                    conditions:
+                      description: |-
+                        Conditions describes the status of the route with respect to the Gateway.
+                        Note that the route's availability is also subject to the Gateway's own
+                        status conditions and listener status.
+
+                        If the Route's ParentRef specifies an existing Gateway that supports
+                        Routes of this kind AND that Gateway's controller has sufficient access,
+                        then that Gateway's controller MUST set the "Accepted" condition on the
+                        Route, to indicate whether the route has been accepted or rejected by the
+                        Gateway, and why.
+
+                        A Route MUST be considered "Accepted" if at least one of the Route's
+                        rules is implemented by the Gateway.
+
+                        There are a number of cases where the "Accepted" condition may not be set
+                        due to lack of controller visibility, that includes when:
+
+                        * The Route refers to a nonexistent parent.
+                        * The Route is of a type that the controller does not support.
+                        * The Route is in a namespace to which the controller does not have access.
+                      items:
+                        description: Condition contains details for one aspect of
+                          the current state of this API Resource.
+                        properties:
+                          lastTransitionTime:
+                            description: |-
+                              lastTransitionTime is the last time the condition transitioned from one status to another.
+                              This should be when the underlying condition changed.  If that is not known, then using the time when the API field changed is acceptable.
+                            format: date-time
+                            type: string
+                          message:
+                            description: |-
+                              message is a human readable message indicating details about the transition.
+                              This may be an empty string.
+                            maxLength: 32768
+                            type: string
+                          observedGeneration:
+                            description: |-
+                              observedGeneration represents the .metadata.generation that the condition was set based upon.
+                              For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date
+                              with respect to the current state of the instance.
+                            format: int64
+                            minimum: 0
+                            type: integer
+                          reason:
+                            description: |-
+                              reason contains a programmatic identifier indicating the reason for the condition's last transition.
+                              Producers of specific condition types may define expected values and meanings for this field,
+                              and whether the values are considered a guaranteed API.
+                              The value should be a CamelCase string.
+                              This field may not be empty.
+                            maxLength: 1024
+                            minLength: 1
+                            pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
+                            type: string
+                          status:
+                            description: status of the condition, one of True, False,
+                              Unknown.
+                            enum:
+                            - "True"
+                            - "False"
+                            - Unknown
+                            type: string
+                          type:
+                            description: type of condition in CamelCase or in foo.example.com/CamelCase.
+                            maxLength: 316
+                            pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
+                            type: string
+                        required:
+                        - lastTransitionTime
+                        - message
+                        - reason
+                        - status
+                        - type
+                        type: object
+                      maxItems: 8
+                      minItems: 1
+                      type: array
+                      x-kubernetes-list-map-keys:
+                      - type
+                      x-kubernetes-list-type: map
+                    controllerName:
+                      description: |-
+                        ControllerName is a domain/path string that indicates the name of the
+                        controller that wrote this status. This corresponds with the
+                        controllerName field on GatewayClass.
+
+                        Example: "example.net/gateway-controller".
+
+                        The format of this field is DOMAIN "/" PATH, where DOMAIN and PATH are
+                        valid Kubernetes names
+                        (https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names).
+
+                        Controllers MUST populate this field when writing status. Controllers should ensure that
+                        entries to status populated with their ControllerName are cleaned up when they are no
+                        longer necessary.
+                      maxLength: 253
+                      minLength: 1
+                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*\/[A-Za-z0-9\/\-._~%!$&'()*+,;=:]+$
+                      type: string
+                    parentRef:
+                      description: |-
+                        ParentRef corresponds with a ParentRef in the spec that this
+                        RouteParentStatus struct describes the status of.
+                      properties:
+                        group:
+                          default: gateway.networking.k8s.io
+                          description: |-
+                            Group is the group of the referent.
+                            When unspecified, "gateway.networking.k8s.io" is inferred.
+                            To set the core API group (such as for a "Service" kind referent),
+                            Group must be explicitly set to "" (empty string).
+
+                            Support: Core
+                          maxLength: 253
+                          pattern: ^$|^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                          type: string
+                        kind:
+                          default: Gateway
+                          description: |-
+                            Kind is kind of the referent.
+
+                            There are two kinds of parent resources with "Core" support:
+
+                            * Gateway (Gateway conformance profile)
+                            * Service (Mesh conformance profile, ClusterIP Services only)
+
+                            Support for other resources is Implementation-Specific.
+                          maxLength: 63
+                          minLength: 1
+                          pattern: ^[a-zA-Z]([-a-zA-Z0-9]*[a-zA-Z0-9])?$
+                          type: string
+                        name:
+                          description: |-
+                            Name is the name of the referent.
+
+                            Support: Core
+                          maxLength: 253
+                          minLength: 1
+                          type: string
+                        namespace:
+                          description: |-
+                            Namespace is the namespace of the referent. When unspecified, this refers
+                            to the local namespace of the Route.
+
+                            Note that there are specific rules for ParentRefs which cross namespace
+                            boundaries. Cross-namespace references are only valid if they are explicitly
+                            allowed by something in the namespace they are referring to. For example:
+                            Gateway has the AllowedRoutes field, and ReferenceGrant provides a
+                            generic way to enable any other kind of cross-namespace reference.
+
+
+                            ParentRefs from a Route to a Service in the same namespace are "producer"
+                            routes, which apply default routing rules to inbound connections from
+                            any namespace to the Service.
+
+                            ParentRefs from a Route to a Service in a different namespace are
+                            "consumer" routes, and these routing rules are only applied to outbound
+                            connections originating from the same namespace as the Route, for which
+                            the intended destination of the connections are a Service targeted as a
+                            ParentRef of the Route.
+
+
+                            Support: Core
+                          maxLength: 63
+                          minLength: 1
+                          pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                          type: string
+                        port:
+                          description: |-
+                            Port is the network port this Route targets. It can be interpreted
+                            differently based on the type of parent resource.
+
+                            When the parent resource is a Gateway, this targets all listeners
+                            listening on the specified port that also support this kind of Route(and
+                            select this Route). It's not recommended to set `Port` unless the
+                            networking behaviors specified in a Route must apply to a specific port
+                            as opposed to a listener(s) whose port(s) may be changed. When both Port
+                            and SectionName are specified, the name and port of the selected listener
+                            must match both specified values.
+
+
+                            When the parent resource is a Service, this targets a specific port in the
+                            Service spec. When both Port (experimental) and SectionName are specified,
+                            the name and port of the selected port must match both specified values.
+
+
+                            Implementations MAY choose to support other parent resources.
+                            Implementations supporting other types of parent resources MUST clearly
+                            document how/if Port is interpreted.
+
+                            For the purpose of status, an attachment is considered successful as
+                            long as the parent resource accepts it partially. For example, Gateway
+                            listeners can restrict which Routes can attach to them by Route kind,
+                            namespace, or hostname. If 1 of 2 Gateway listeners accept attachment
+                            from the referencing Route, the Route MUST be considered successfully
+                            attached. If no Gateway listeners accept attachment from this Route,
+                            the Route MUST be considered detached from the Gateway.
+
+                            Support: Extended
+                          format: int32
+                          maximum: 65535
+                          minimum: 1
+                          type: integer
+                        sectionName:
+                          description: |-
+                            SectionName is the name of a section within the target resource. In the
+                            following resources, SectionName is interpreted as the following:
+
+                            * Gateway: Listener name. When both Port (experimental) and SectionName
+                            are specified, the name and port of the selected listener must match
+                            both specified values.
+                            * Service: Port name. When both Port (experimental) and SectionName
+                            are specified, the name and port of the selected listener must match
+                            both specified values.
+
+                            Implementations MAY choose to support attaching Routes to other resources.
+                            If that is the case, they MUST clearly document how SectionName is
+                            interpreted.
+
+                            When unspecified (empty string), this will reference the entire resource.
+                            For the purpose of status, an attachment is considered successful if at
+                            least one section in the parent resource accepts it. For example, Gateway
+                            listeners can restrict which Routes can attach to them by Route kind,
+                            namespace, or hostname. If 1 of 2 Gateway listeners accept attachment from
+                            the referencing Route, the Route MUST be considered successfully
+                            attached. If no Gateway listeners accept attachment from this Route, the
+                            Route MUST be considered detached from the Gateway.
+
+                            Support: Core
+                          maxLength: 253
+                          minLength: 1
+                          pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
+                          type: string
+                      required:
+                      - name
+                      type: object
+                  required:
+                  - conditions
+                  - controllerName
+                  - parentRef
+                  type: object
+                maxItems: 32
+                type: array
+                x-kubernetes-list-type: atomic
+            required:
+            - parents
+            type: object
+        required:
+        - spec
+        type: object
+    served: true
+    storage: false
+    subresources:
+      status: {}
+  - additionalPrinterColumns:
+    - jsonPath: .metadata.creationTimestamp
+      name: Age
+      type: date
+    deprecated: true
+    deprecationWarning: The v1alpha3 version of TLSRoute has been deprecated and will
+      be removed in a future release of the API. Please upgrade to v1.
+    name: v1alpha3
+    schema:
+      openAPIV3Schema:
+        description: |-
+          The TLSRoute resource is similar to TCPRoute, but can be configured
+          to match against TLS-specific metadata. This allows more flexibility
+          in matching streams for a given TLS listener.
 
-                  If both the Listener and TLSRoute have specified hostnames, and none
-                  match with the criteria above, then the TLSRoute is not accepted. The
-                  implementation must raise an 'Accepted' Condition with a status of
-                  `False` in the corresponding RouteParentStatus.
+          If you need to forward traffic to a single target for a TLS listener, you
+          could choose to use a TCPRoute with a TLS listener.
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: Spec defines the desired state of TLSRoute.
+            properties:
+              hostnames:
+                description: |-
+                  Hostnames defines a set of SNI hostnames that should match against the
+                  SNI attribute of TLS ClientHello message in TLS handshake. This matches
+                  the RFC 1123 definition of a hostname with 2 notable exceptions:
 
-                  Support: Core
+                  1. IPs are not allowed in SNI hostnames per RFC 6066.
+                  2. A hostname may be prefixed with a wildcard label (`*.`). The wildcard
+                     label must appear by itself as the first label.
                 items:
                   description: |-
                     Hostname is the fully qualified domain name of a network host. This matches
@@ -18875,9 +20329,21 @@ spec:
                   minLength: 1
                   pattern: ^(\*\.)?[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
                   type: string
-                maxItems: 16
+                maxItems: 1024
+                minItems: 1
                 type: array
                 x-kubernetes-list-type: atomic
+                x-kubernetes-validations:
+                - message: Hostnames cannot contain an IP
+                  rule: self.all(h, !isIP(h))
+                - message: Hostnames must be valid based on RFC-1123
+                  rule: 'self.all(h, !h.contains(''*'') ? h.matches(''^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*)$'')
+                    : true)'
+                - message: Wildcards on hostnames must be the first label, and the
+                    rest of hostname must be valid based on RFC-1123
+                  rule: 'self.all(h, h.contains(''*'') ? (h.startsWith(''*.'') &&
+                    h.substring(2).matches(''^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*)$''))
+                    : true)'
               parentRefs:
                 description: |-
                   ParentRefs references the resources (usually Gateways) that a Route wants
@@ -19115,7 +20581,7 @@ spec:
                     || p2.port == 0)) || (has(p1.port) && has(p2.port) && p1.port
                     == p2.port))))
               rules:
-                description: Rules are a list of TLS matchers and actions.
+                description: Rules are a list of actions.
                 items:
                   description: TLSRouteRule is the configuration for a given rule.
                   properties:
@@ -19130,6 +20596,9 @@ spec:
                         weight; if an invalid backend is requested to have 80% of requests, then
                         80% of requests must be rejected instead.
 
+                        When a TLSRoute is attached to a listener in Terminate mode, a BackendTLSPolicy
+                        can be used to enable re-encryption of the traffic to the backends.
+
                         Support: Core for Kubernetes Service
 
                         Support: Extended for Kubernetes ServiceImport
@@ -19137,6 +20606,8 @@ spec:
                         Support: Implementation-specific for any other resource
 
                         Support for weight: Extended
+
+                        Support for BackendTLSPolicy: Extended
                       items:
                         description: |-
                           BackendRef defines how a Route should forward a request to a Kubernetes
@@ -19268,14 +20739,10 @@ spec:
                   required:
                   - backendRefs
                   type: object
-                maxItems: 16
+                maxItems: 1
                 minItems: 1
                 type: array
                 x-kubernetes-list-type: atomic
-                x-kubernetes-validations:
-                - message: Rule name must be unique within the route
-                  rule: self.all(l1, !has(l1.name) || self.exists_one(l2, has(l2.name)
-                    && l1.name == l2.name))
               useDefaultGateways:
                 description: |-
                   UseDefaultGateways indicates the default Gateway scope to use for this
@@ -19295,6 +20762,7 @@ spec:
                 - None
                 type: string
             required:
+            - hostnames
             - rules
             type: object
           status:
@@ -19577,23 +21045,38 @@ spec:
     storage: false
     subresources:
       status: {}
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    helm.sh/resource-policy: keep
+    api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/4530
+    gateway.networking.k8s.io/bundle-version: v1.6.1
+    gateway.networking.k8s.io/channel: experimental
+  name: udproutes.gateway.networking.k8s.io
+spec:
+  group: gateway.networking.k8s.io
+  names:
+    categories:
+    - gateway-api
+    kind: UDPRoute
+    listKind: UDPRouteList
+    plural: udproutes
+    singular: udproute
+  scope: Namespaced
+  versions:
   - additionalPrinterColumns:
     - jsonPath: .metadata.creationTimestamp
       name: Age
       type: date
-    deprecated: true
-    deprecationWarning: The v1alpha3 version of TLSRoute has been deprecated and will
-      be removed in a future release of the API. Please upgrade to v1.
-    name: v1alpha3
+    name: v1
     schema:
       openAPIV3Schema:
         description: |-
-          The TLSRoute resource is similar to TCPRoute, but can be configured
-          to match against TLS-specific metadata. This allows more flexibility
-          in matching streams for a given TLS listener.
-
-          If you need to forward traffic to a single target for a TLS listener, you
-          could choose to use a TCPRoute with a TLS listener.
+          UDPRoute provides a way to route UDP traffic. When combined with a Gateway
+          listener, it can be used to forward traffic on the port specified by the
+          listener to a set of backends specified by the UDPRoute.
         properties:
           apiVersion:
             description: |-
@@ -19613,52 +21096,8 @@ spec:
           metadata:
             type: object
           spec:
-            description: Spec defines the desired state of TLSRoute.
+            description: Spec defines the desired state of UDPRoute.
             properties:
-              hostnames:
-                description: |-
-                  Hostnames defines a set of SNI hostnames that should match against the
-                  SNI attribute of TLS ClientHello message in TLS handshake. This matches
-                  the RFC 1123 definition of a hostname with 2 notable exceptions:
-
-                  1. IPs are not allowed in SNI hostnames per RFC 6066.
-                  2. A hostname may be prefixed with a wildcard label (`*.`). The wildcard
-                     label must appear by itself as the first label.
-                items:
-                  description: |-
-                    Hostname is the fully qualified domain name of a network host. This matches
-                    the RFC 1123 definition of a hostname with 2 notable exceptions:
-
-                     1. IPs are not allowed.
-                     2. A hostname may be prefixed with a wildcard label (`*.`). The wildcard
-                        label must appear by itself as the first label.
-
-                    Hostname can be "precise" which is a domain name without the terminating
-                    dot of a network host (e.g. "foo.example.com") or "wildcard", which is a
-                    domain name prefixed with a single wildcard label (e.g. `*.example.com`).
-
-                    Note that as per RFC1035 and RFC1123, a *label* must consist of lower case
-                    alphanumeric characters or '-', and must start and end with an alphanumeric
-                    character. No other punctuation is allowed.
-                  maxLength: 253
-                  minLength: 1
-                  pattern: ^(\*\.)?[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
-                  type: string
-                maxItems: 16
-                minItems: 1
-                type: array
-                x-kubernetes-list-type: atomic
-                x-kubernetes-validations:
-                - message: Hostnames cannot contain an IP
-                  rule: self.all(h, !isIP(h))
-                - message: Hostnames must be valid based on RFC-1123
-                  rule: 'self.all(h, !h.contains(''*'') ? h.matches(''^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*)$'')
-                    : true)'
-                - message: Wildcards on hostnames must be the first label, and the
-                    rest of hostname must be valid based on RFC-1123
-                  rule: 'self.all(h, h.contains(''*'') ? (h.startsWith(''*.'') &&
-                    h.substring(2).matches(''^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*)$''))
-                    : true)'
               parentRefs:
                 description: |-
                   ParentRefs references the resources (usually Gateways) that a Route wants
@@ -19896,28 +21335,20 @@ spec:
                     || p2.port == 0)) || (has(p1.port) && has(p2.port) && p1.port
                     == p2.port))))
               rules:
-                description: Rules are a list of actions.
+                description: Rules are a list of UDP matchers and actions.
                 items:
-                  description: TLSRouteRule is the configuration for a given rule.
+                  description: UDPRouteRule is the configuration for a given rule.
                   properties:
                     backendRefs:
                       description: |-
                         BackendRefs defines the backend(s) where matching requests should be
-                        sent. If unspecified or invalid (refers to a nonexistent resource or
-                        a Service with no endpoints), the rule performs no forwarding; if no
-                        filters are specified that would result in a response being sent, the
-                        underlying implementation must actively reject request attempts to this
-                        backend, by rejecting the connection. Request rejections must respect
-                        weight; if an invalid backend is requested to have 80% of requests, then
-                        80% of requests must be rejected instead.
-
-                        Support: Core for Kubernetes Service
-
-                        Support: Extended for Kubernetes ServiceImport
-
-                        Support: Implementation-specific for any other resource
+                        sent. If unspecified or invalid (refers to a nonexistent resource or a
+                        Service with no endpoints), the underlying implementation MUST actively
+                        reject connection attempts to this backend. Packet drops must
+                        respect weight; if an invalid backend is requested to have 80% of
+                        the packets, then 80% of packets must be dropped instead.
 
-                        Support for weight: Extended
+                        Support: Extended for Kubernetes Service
                       items:
                         description: |-
                           BackendRef defines how a Route should forward a request to a Kubernetes
@@ -20072,11 +21503,10 @@ spec:
                 - None
                 type: string
             required:
-            - hostnames
             - rules
             type: object
           status:
-            description: Status defines the current state of TLSRoute.
+            description: Status defines the current state of UDPRoute.
             properties:
               parents:
                 description: |-
@@ -20352,39 +21782,16 @@ spec:
         - spec
         type: object
     served: true
-    storage: false
+    storage: true
     subresources:
       status: {}
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: null
-  storedVersions: null
----
-apiVersion: apiextensions.k8s.io/v1
-kind: CustomResourceDefinition
-metadata:
-  annotations:
-    api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/4530
-    gateway.networking.k8s.io/bundle-version: v1.5.1
-    gateway.networking.k8s.io/channel: experimental
-  name: udproutes.gateway.networking.k8s.io
-spec:
-  group: gateway.networking.k8s.io
-  names:
-    categories:
-    - gateway-api
-    kind: UDPRoute
-    listKind: UDPRouteList
-    plural: udproutes
-    singular: udproute
-  scope: Namespaced
-  versions:
   - additionalPrinterColumns:
     - jsonPath: .metadata.creationTimestamp
       name: Age
       type: date
+    deprecated: true
+    deprecationWarning: The v1alpha2 version of UDPRoute has been deprecated and will
+      be removed in a future release of the API. Please upgrade to v1.
     name: v1alpha2
     schema:
       openAPIV3Schema:
@@ -20663,13 +22070,7 @@ spec:
                         respect weight; if an invalid backend is requested to have 80% of
                         the packets, then 80% of packets must be dropped instead.
 
-                        Support: Core for Kubernetes Service
-
-                        Support: Extended for Kubernetes ServiceImport
-
-                        Support: Implementation-specific for any other resource
-
-                        Support for weight: Extended
+                        Support: Extended for Kubernetes Service
                       items:
                         description: |-
                           BackendRef defines how a Route should forward a request to a Kubernetes
@@ -20792,10 +22193,8 @@ spec:
                       type: array
                       x-kubernetes-list-type: atomic
                     name:
-                      description: |-
-                        Name is the name of the route rule. This name MUST be unique within a Route if it is set.
-
-                        Support: Extended
+                      description: Name is the name of the route rule. This name MUST
+                        be unique within a Route if it is set.
                       maxLength: 253
                       minLength: 1
                       pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
@@ -21109,22 +22508,17 @@ spec:
         - spec
         type: object
     served: true
-    storage: true
+    storage: false
     subresources:
       status: {}
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: null
-  storedVersions: null
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
+    helm.sh/resource-policy: keep
     api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/4530
-    gateway.networking.k8s.io/bundle-version: v1.5.1
+    gateway.networking.k8s.io/bundle-version: v1.6.1
     gateway.networking.k8s.io/channel: experimental
   labels:
     gateway.networking.k8s.io/policy: Direct
@@ -21326,15 +22720,6 @@ spec:
                         - Session
                         type: string
                     type: object
-                  idleTimeout:
-                    description: |-
-                      IdleTimeout defines the idle timeout of the persistent session.
-                      Once the session has been idle for more than the specified
-                      IdleTimeout duration, the session becomes invalid.
-
-                      Support: Extended
-                    pattern: ^([0-9]{1,5}(h|m|s|ms)){1,4}$
-                    type: string
                   sessionName:
                     description: |-
                       SessionName defines the name of the persistent session token
@@ -21721,19 +23106,14 @@ spec:
     storage: true
     subresources:
       status: {}
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: null
-  storedVersions: null
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
+    helm.sh/resource-policy: keep
     api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/4530
-    gateway.networking.k8s.io/bundle-version: v1.5.1
+    gateway.networking.k8s.io/bundle-version: v1.6.1
     gateway.networking.k8s.io/channel: experimental
   name: xmeshes.gateway.networking.x-k8s.io
 spec:
@@ -21970,18 +23350,12 @@ spec:
     storage: true
     subresources:
       status: {}
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: null
-  storedVersions: null
 ---
 apiVersion: admissionregistration.k8s.io/v1
 kind: ValidatingAdmissionPolicy
 metadata:
   annotations:
-    gateway.networking.k8s.io/bundle-version: v1.5.0-dev
+    gateway.networking.k8s.io/bundle-version: v1.6.1
     gateway.networking.k8s.io/channel: standard
   name: safe-upgrades.gateway.networking.k8s.io
 spec:
@@ -22009,21 +23383,22 @@ spec:
       by default. Uninstall ValidatingAdmissionPolicy safe-upgrades.gateway.networking.k8s.io
       to install experimental CRDs on top of standard channel CRDs.
     reason: Invalid
-  - expression: object.spec.group != 'gateway.networking.k8s.io' || (has(object.metadata.annotations)
-      && object.metadata.annotations.exists(k, k == 'gateway.networking.k8s.io/bundle-version')
-      && !matches(object.metadata.annotations['gateway.networking.k8s.io/bundle-version'],
-      'v1.[0-4].\\d+') && !matches(object.metadata.annotations['gateway.networking.k8s.io/bundle-version'],
-      'v0'))
-    message: Installing CRDs with version before v1.5.0 is prohibited by default.
-      Uninstall ValidatingAdmissionPolicy safe-upgrades.gateway.networking.k8s.io
-      to install older versions.
+  - expression: |
+      object.spec.group != 'gateway.networking.k8s.io' ||
+      (has(object.metadata.annotations) && object.metadata.annotations.exists(k, k == 'gateway.networking.k8s.io/bundle-version') &&
+      (object.metadata.annotations['gateway.networking.k8s.io/bundle-version'] == 'v0.0.0-dev' ||
+      (object.metadata.annotations['gateway.networking.k8s.io/bundle-version'].startsWith('v1.') &&
+       !matches(object.metadata.annotations['gateway.networking.k8s.io/bundle-version'], '^v1\\.[0-4](\\.|$)'))))
+    message: Installing CRDs with version other than v0.0.0-dev or v1.5+ is prohibited
+      by default. Uninstall ValidatingAdmissionPolicy safe-upgrades.gateway.networking.k8s.io
+      to install other versions.
     reason: Invalid
 ---
 apiVersion: admissionregistration.k8s.io/v1
 kind: ValidatingAdmissionPolicyBinding
 metadata:
   annotations:
-    gateway.networking.k8s.io/bundle-version: v1.5.0-dev
+    gateway.networking.k8s.io/bundle-version: v1.6.1
     gateway.networking.k8s.io/channel: standard
   name: safe-upgrades.gateway.networking.k8s.io
 spec:
diff --git a/packages/system/gateway-api-crds/tests/resource_policy_test.yaml b/packages/system/gateway-api-crds/tests/resource_policy_test.yaml
new file mode 100644
index 0000000000..ebb868eb28
--- /dev/null
+++ b/packages/system/gateway-api-crds/tests/resource_policy_test.yaml
@@ -0,0 +1,154 @@
+# The tenant addon HelmRelease that ships this chart remediates a failed
+# install by uninstalling the release, and an uninstall deletes whatever the
+# chart rendered. Deleting a CRD makes the API server garbage-collect every
+# custom resource of that kind, so an unannotated CRD here costs the cluster
+# every Gateway, HTTPRoute and ReferenceGrant it holds.
+#
+# The first case selects every CustomResourceDefinition at once, so a CRD that
+# `make update` starts rendering is covered without being listed here. The
+# ValidatingAdmissionPolicy pair the experimental kustomization also emits
+# holds no user data and is deliberately left out of that selection. The named
+# cases below pin each CRD individually, so a failure says which one lost the
+# annotation. A selector that matches nothing fails with "document not found"
+# rather than passing on an empty document set.
+suite: Gateway API CRDs survive a release uninstall
+templates:
+  - templates/crds-experimental.yaml
+tests:
+  - it: annotates every CustomResourceDefinition the chart renders
+    documentSelector:
+      path: kind
+      value: CustomResourceDefinition
+      matchMany: true
+    asserts:
+      - equal:
+          path: metadata.annotations["helm.sh/resource-policy"]
+          value: keep
+
+  # Pins the rendered document count, so a change in what the kustomization
+  # emits is visible here rather than only in whichever case happens to break.
+  - it: renders twelve CRDs and the admission policy pair
+    asserts:
+      - hasDocuments:
+          count: 14
+
+  # Pins the vendored bundle version. Nothing else in the tree names it
+  # outside the Makefile ref, so `make update` against a different ref
+  # would otherwise land with every other case still green.
+  - it: stamps every CRD with the vendored bundle version
+    documentSelector:
+      path: kind
+      value: CustomResourceDefinition
+      matchMany: true
+    asserts:
+      - equal:
+          path: metadata.annotations["gateway.networking.k8s.io/bundle-version"]
+          value: v1.6.1
+
+  - it: keeps the backendtlspolicies CRD
+    documentSelector:
+      path: metadata.name
+      value: backendtlspolicies.gateway.networking.k8s.io
+    asserts:
+      - equal:
+          path: metadata.annotations["helm.sh/resource-policy"]
+          value: keep
+
+  - it: keeps the gatewayclasses CRD
+    documentSelector:
+      path: metadata.name
+      value: gatewayclasses.gateway.networking.k8s.io
+    asserts:
+      - equal:
+          path: metadata.annotations["helm.sh/resource-policy"]
+          value: keep
+
+  - it: keeps the gateways CRD
+    documentSelector:
+      path: metadata.name
+      value: gateways.gateway.networking.k8s.io
+    asserts:
+      - equal:
+          path: metadata.annotations["helm.sh/resource-policy"]
+          value: keep
+
+  - it: keeps the grpcroutes CRD
+    documentSelector:
+      path: metadata.name
+      value: grpcroutes.gateway.networking.k8s.io
+    asserts:
+      - equal:
+          path: metadata.annotations["helm.sh/resource-policy"]
+          value: keep
+
+  - it: keeps the httproutes CRD
+    documentSelector:
+      path: metadata.name
+      value: httproutes.gateway.networking.k8s.io
+    asserts:
+      - equal:
+          path: metadata.annotations["helm.sh/resource-policy"]
+          value: keep
+
+  - it: keeps the listenersets CRD
+    documentSelector:
+      path: metadata.name
+      value: listenersets.gateway.networking.k8s.io
+    asserts:
+      - equal:
+          path: metadata.annotations["helm.sh/resource-policy"]
+          value: keep
+
+  - it: keeps the referencegrants CRD
+    documentSelector:
+      path: metadata.name
+      value: referencegrants.gateway.networking.k8s.io
+    asserts:
+      - equal:
+          path: metadata.annotations["helm.sh/resource-policy"]
+          value: keep
+
+  - it: keeps the tcproutes CRD
+    documentSelector:
+      path: metadata.name
+      value: tcproutes.gateway.networking.k8s.io
+    asserts:
+      - equal:
+          path: metadata.annotations["helm.sh/resource-policy"]
+          value: keep
+
+  - it: keeps the tlsroutes CRD
+    documentSelector:
+      path: metadata.name
+      value: tlsroutes.gateway.networking.k8s.io
+    asserts:
+      - equal:
+          path: metadata.annotations["helm.sh/resource-policy"]
+          value: keep
+
+  - it: keeps the udproutes CRD
+    documentSelector:
+      path: metadata.name
+      value: udproutes.gateway.networking.k8s.io
+    asserts:
+      - equal:
+          path: metadata.annotations["helm.sh/resource-policy"]
+          value: keep
+
+  - it: keeps the xbackendtrafficpolicies CRD
+    documentSelector:
+      path: metadata.name
+      value: xbackendtrafficpolicies.gateway.networking.x-k8s.io
+    asserts:
+      - equal:
+          path: metadata.annotations["helm.sh/resource-policy"]
+          value: keep
+
+  - it: keeps the xmeshes CRD
+    documentSelector:
+      path: metadata.name
+      value: xmeshes.gateway.networking.x-k8s.io
+    asserts:
+      - equal:
+          path: metadata.annotations["helm.sh/resource-policy"]
+          value: keep
diff --git a/packages/system/goldpinger/values.yaml b/packages/system/goldpinger/values.yaml
index fb535206cb..0da18ea58e 100644
--- a/packages/system/goldpinger/values.yaml
+++ b/packages/system/goldpinger/values.yaml
@@ -3,3 +3,10 @@ goldpinger:
     enabled: true
   prometheusRule:
     enabled: true
+  resources:
+    limits:
+      cpu: 200m
+      memory: 256Mi
+    requests:
+      cpu: 50m
+      memory: 64Mi
diff --git a/packages/system/gpu-operator/Makefile b/packages/system/gpu-operator/Makefile
index a8b3b43f1f..f5fe061cbd 100644
--- a/packages/system/gpu-operator/Makefile
+++ b/packages/system/gpu-operator/Makefile
@@ -4,6 +4,15 @@ export NAMESPACE=cozy-$(NAME)
 include ../../../hack/common-envs.mk
 include ../../../hack/package.mk
 
+# hack/helm-unit-tests.sh discovers work by probing for this target, so a
+# package without one is skipped in silence however many suites sit under
+# tests/. Phony because hack/package.mk's .PHONY line lists only the targets
+# that file defines, so a path named `test` here would make the target up to
+# date and skip the recipe.
+.PHONY: test
+test:
+	helm unittest .
+
 update:
 	rm -rf charts
 	helm repo add nvidia https://helm.ngc.nvidia.com/nvidia
diff --git a/packages/system/gpu-operator/examples/README.md b/packages/system/gpu-operator/examples/README.md
index c70028cd9e..27a98ebad8 100644
--- a/packages/system/gpu-operator/examples/README.md
+++ b/packages/system/gpu-operator/examples/README.md
@@ -1,16 +1,10 @@
 # GPU operator — native pod workload on Talos (reference)
 
-The files in this directory are **not** templates. They are reference
-artifacts that document one working configuration for running GPU
-workloads directly in pods on a Talos-based Cozystack cluster, together
-with the DCGM metrics needed by the `gpu/gpu-performance` Grafana
-dashboard.
-
-The out-of-the-box `values-passthrough.yaml` for this package targets the
-sandbox (VFIO passthrough to KubeVirt VMs) scenario. The files here
-illustrate an alternative — running CUDA workloads in regular pods with
-the NVIDIA device plugin — and the workarounds it currently requires on
-Talos.
+The files in this directory are **not** templates. They are reference artifacts that document one working configuration for running GPU workloads directly in pods on a Talos-based Cozystack cluster, together with the DCGM metrics needed by the `gpu/gpu-performance` Grafana dashboard.
+
+For non-Talos Linux hosts that already provide the NVIDIA driver and `nvidia-container-toolkit` via the distro package manager (the typical apt-installed Ubuntu/Debian shape), pick the first-class `container` variant instead — set `bundles.iaas.gpuOperatorVariant: container` in platform values and put `cozystack.gpu-operator` in `bundles.enabledPackages`, or hand-craft a Package CR with `variant: container` if you need overrides the bundle does not expose. Two host prerequisites still apply: containerd must have the `nvidia` runtime registered (`nvidia-ctk runtime configure --runtime=containerd` + restart; `apt install` lays down binaries only, it does not wire containerd), and because the variant runs with `driver.enabled=false` the operator uses the pre-installed host driver at its standard location — so a stock apt install needs no `hostPaths.driverInstallDir` override. The files here remain the right starting point on Talos, where the driver lands under a non-standard prefix and the operator does not find it at the default location without the override below.
+
+The out-of-the-box `values-passthrough.yaml` for this package targets the sandbox (VFIO passthrough to KubeVirt VMs) scenario. The files here illustrate an alternative — running CUDA workloads in regular pods with the NVIDIA device plugin — and the workarounds it currently requires on Talos.
 
 ## Files
 
diff --git a/packages/system/gpu-operator/values-container.yaml b/packages/system/gpu-operator/values-container.yaml
new file mode 100644
index 0000000000..c68cb49b95
--- /dev/null
+++ b/packages/system/gpu-operator/values-container.yaml
@@ -0,0 +1,53 @@
+# Container variant: GPU workloads run in regular pods on hosts that
+# already have the NVIDIA driver and nvidia-container-toolkit installed
+# (typical Ubuntu/Debian shape: apt-installed driver + apt-installed
+# nvidia-container-toolkit). The third architectural mode that upstream
+# NVIDIA gpu-operator supports — sandboxWorkloads disabled,
+# devicePlugin enabled — surfaced here as a Cozystack variant.
+gpu-operator:
+  sandboxWorkloads:
+    # Default upstream workload on a node without the per-node
+    # 'nvidia.com/gpu.workload.config' label is 'container' when
+    # sandboxWorkloads is off — which is exactly what this variant
+    # wants. No defaultWorkload override needed; the counterpart
+    # overrides in values-passthrough.yaml / values-vgpu.yaml exist
+    # only because those variants flip sandboxWorkloads to true.
+    enabled: false
+  driver:
+    # Host already runs the NVIDIA driver (apt-installed). The
+    # operator's driver DaemonSet would attempt to load its own
+    # kernel module and clash with the host one.
+    enabled: false
+  devicePlugin:
+    # Publish nvidia.com/gpu to the kubelet so pods can request GPUs.
+    enabled: true
+  vfioManager:
+    # vfioManager unbinds the host driver to bind vfio-pci, which must
+    # not happen when the host driver is in use and devicePlugin is on.
+    # Upstream renders vfioManager.enabled=true into the ClusterPolicy
+    # unconditionally; it only stays at zero pods because the DaemonSet
+    # schedules solely onto nodes labeled
+    # nvidia.com/gpu.workload.config=vm-passthrough, and no node carries
+    # a sandbox assignment when sandboxWorkloads is off. Pin it off so
+    # the rendered policy matches intent regardless of upstream
+    # scheduling changes.
+    enabled: false
+  toolkit:
+    # Host already has nvidia-container-toolkit installed (the typical
+    # apt-installed shape). Running the operator's toolkit DaemonSet
+    # would overwrite /etc/containerd/config.toml that the host package
+    # configured (via `nvidia-ctk runtime configure`), breaking the
+    # host runtime wiring. NVIDIA's documentation recommends disabling
+    # this when the toolkit is preinstalled on the node.
+    enabled: false
+  cdi:
+    # Upstream defaults cdi.enabled=true, but CDI spec generation and
+    # runtime wiring are serviced by the operator-managed toolkit, which
+    # this variant disables. An apt-installed nvidia-container-toolkit
+    # does not generate CDI specs on its own (`nvidia-ctk cdi generate`
+    # is a manual step) and uses the classic nvidia-container-runtime
+    # hook path. Leaving CDI on would point the device plugin at a
+    # CDI-injection mode with no specs on the host and silently break
+    # GPU allocation. Pin off so device allocation matches the host
+    # runtime wiring.
+    enabled: false
diff --git a/packages/system/gpu-operator/values.yaml b/packages/system/gpu-operator/values.yaml
index 57d2f8abad..b83fd4e77c 100644
--- a/packages/system/gpu-operator/values.yaml
+++ b/packages/system/gpu-operator/values.yaml
@@ -1,6 +1,6 @@
 # Defaults applied to every variant of the gpu-operator package.
-# The variant-specific files (values-passthrough.yaml, values-vgpu.yaml)
-# layer on top.
+# The variant-specific files (values-passthrough.yaml, values-vgpu.yaml,
+# values-container.yaml) layer on top.
 gpu-operator:
   # Upstream chart v26.x flips ccManager.enabled to true and
   # ccManager.defaultMode to "on". On Hopper-class hardware
@@ -32,10 +32,13 @@ gpu-operator:
 # true this wrapper chart renders the ConfigMap into the release
 # namespace so the params actually land. The driver entrypoint reads
 # ${base}/nvidia.conf and appends each line to the nvidia modprobe
-# options. Used by tenant Kubernetes clusters to set
-# NVreg_NvLinkDisable=1 (see packages/apps/kubernetes gpu-operator
-# HelmRelease defaults); off by default for host-level passthrough/vgpu
-# variants where the in-host driver is disabled.
+# options, so it only does anything when driver.enabled is true.
+#
+# Tenant Kubernetes clusters run this chart with the driver container off
+# and take module parameters from the worker pool's kernelModules in the
+# KubernetesNodes app (packages/apps/kubernetes-nodes). An operator who
+# re-enables the driver container through valuesOverride also has to set
+# create: true here.
 kernelModuleConfig:
   create: false
   name: nvidia-kernel-module-params
diff --git a/packages/system/grafana-operator/Makefile b/packages/system/grafana-operator/Makefile
index 3568c12c32..15e9c2114e 100644
--- a/packages/system/grafana-operator/Makefile
+++ b/packages/system/grafana-operator/Makefile
@@ -14,8 +14,7 @@ update:
 image:
 	docker buildx build --file images/grafana-dashboards/Dockerfile ../../.. \
 		$(call image-tags,grafana-dashboards,v$(COZYSTACK_VERSION)) \
-		--cache-from type=registry,ref=$(REGISTRY)/grafana-dashboards:latest \
-		--cache-to type=inline \
+		$(call cache-args,grafana-dashboards) \
 		--metadata-file images/grafana-dashboards.json \
 		$(BUILDX_ARGS)
 	echo "$(REGISTRY)/grafana-dashboards:$(IMAGE_TAG)@$$(yq --exit-status '.["containerimage.digest"]' images/grafana-dashboards.json --output-format json -r)" \
diff --git a/packages/system/grafana-operator/images/grafana-dashboards.tag b/packages/system/grafana-operator/images/grafana-dashboards.tag
index 28c6c8d94b..412303f2be 100644
--- a/packages/system/grafana-operator/images/grafana-dashboards.tag
+++ b/packages/system/grafana-operator/images/grafana-dashboards.tag
@@ -1 +1 @@
-ghcr.io/cozystack/cozystack/grafana-dashboards:v1.4.0-rc.2@sha256:8b1acfdc2f343103efe7baf9f1fe98e3703182db726dfc11aa0286b2d896c254
+ghcr.io/cozystack/cozystack/grafana-dashboards:v1.6.0@sha256:cb22416b34d4385e4df58314de390920af805c03358fe00734c8fa44ba505fe9
diff --git a/packages/system/grafana-operator/images/grafana-dashboards/Dockerfile b/packages/system/grafana-operator/images/grafana-dashboards/Dockerfile
index 8ea43e7637..0bfd23d5f4 100644
--- a/packages/system/grafana-operator/images/grafana-dashboards/Dockerfile
+++ b/packages/system/grafana-operator/images/grafana-dashboards/Dockerfile
@@ -1,8 +1,32 @@
-FROM alpine:3.22
+FROM alpine:3.24@sha256:294b683cb724975bec92580e1e685676bd4b50bda910ddb8c51d4cabeaec77e6 AS plugins
+
+RUN apk add --no-cache curl
+
+# Grafana plugins mirrored from the official catalog
+# (https://grafana.com/grafana/plugins) at build time and served next to the
+# dashboards, so Grafana pods install them from this in-cluster server instead
+# of downloading from the internet at startup — required for air-gapped and
+# egress-restricted installs. Keep ids and versions in sync with
+# GF_INSTALL_PLUGINS in packages/system/monitoring/templates/grafana/grafana.yaml.
+RUN mkdir -p /plugins \
+ && for p in \
+      victoriametrics-logs-datasource:0.29.0 \
+      natel-discrete-panel:0.1.1 \
+      grafana-worldmap-panel:1.0.6 \
+      marcusolsson-dynamictext-panel:6.2.0 \
+    ; do \
+      id="${p%%:*}"; ver="${p##*:}"; \
+      curl -fsSL -o "/plugins/${id}-${ver}.zip" \
+        "https://grafana.com/api/plugins/${id}/versions/${ver}/download" \
+        || exit 1; \
+    done
+
+FROM alpine:3.24@sha256:294b683cb724975bec92580e1e685676bd4b50bda910ddb8c51d4cabeaec77e6
 
 RUN apk add --no-cache darkhttpd
 
 COPY dashboards /var/www/dashboards
+COPY --from=plugins /plugins /var/www/dashboards/plugins
 
 WORKDIR /var/www
 
diff --git a/packages/system/hami/Makefile b/packages/system/hami/Makefile
index 83663a66e4..41b4bf3ec4 100644
--- a/packages/system/hami/Makefile
+++ b/packages/system/hami/Makefile
@@ -13,31 +13,37 @@ include ../../../hack/package.mk
 #      and has no upstream fix tracked. See commit 3c5521e.
 #   2. Empties Chart.yaml dependencies and drops Chart.lock so Helm does
 #      not try to re-pull hami-dra at build time. See commit 2734dc0.
-#   3. Strips dra/hami-dra/podSecurityPolicy blocks from the upstream
-#      values.yaml since the corresponding code paths are gone. PSP is
-#      removed from Kubernetes 1.25+ and is unused by cozystack.
+#   3. Strips the hami-dra values block (its subchart is removed and no
+#      template references it). The top-level `dra:` and `podSecurityPolicy:`
+#      blocks are KEPT (both default to `enabled: false`): since 2.9.0 the
+#      scheduler/device-plugin templates gate on `.Values.dra.enabled` and
+#      `.Values.podSecurityPolicy.enabled` directly, so keeping them disabled
+#      cleanly turns off the DRA and PSP paths without nil-pointer renders or
+#      having to strip the conditionals from ~27 templates.
 #
 # Template-level patches are NOT reproduced automatically:
 #
-#   * Scheduler templates have `{{- if .Values.dra.enabled }}` blocks
-#     that need to be removed because the dra value is gone (commit
-#     2734dc0 stripped them).
-#   * device-plugin/monitorservice.yaml uses `indent` with leading
-#     whitespace; it must be rewritten to `nindent` for the labels block
-#     to render correctly when devicePlugin.service.labels is set
-#     (commit 3685254).
+#   * device-plugin/monitorservice.yaml and scheduler/service.yaml use
+#     `indent` with leading whitespace on the custom Service labels block;
+#     it must be rewritten to `{{- ... | nindent 4 }}` so the labels render
+#     as valid map entries when devicePlugin.service.labels /
+#     scheduler.service.labels are set (commit 3685254; both Services share
+#     the same upstream defect).
 #
 # After `make update`, run `git diff -- charts/hami/templates/` and
 # replay these template patches against the new upstream version, then
 # verify with `helm unittest`. If upstream restructured the affected
 # files, the patches may need to be redesigned rather than reapplied.
 
+test:
+	helm unittest .
+
 update:
 	rm -rf charts
 	helm repo add hami-charts https://project-hami.github.io/HAMi/
 	helm repo update hami-charts
-	helm pull hami-charts/hami --untar --untardir charts
+	helm pull hami-charts/hami --untar --untardir charts --version 2.9.0
 	rm -rf charts/hami/charts/hami-dra
 	yq --inplace '.dependencies = []' charts/hami/Chart.yaml
 	rm -f charts/hami/Chart.lock
-	yq --inplace 'del(.dra) | del(.["hami-dra"]) | del(.podSecurityPolicy)' charts/hami/values.yaml
+	yq --inplace 'del(.["hami-dra"])' charts/hami/values.yaml
diff --git a/packages/system/hami/charts/hami/Chart.yaml b/packages/system/hami/charts/hami/Chart.yaml
index 55f32ab61a..588a16475d 100644
--- a/packages/system/hami/charts/hami/Chart.yaml
+++ b/packages/system/hami/charts/hami/Chart.yaml
@@ -1,18 +1,18 @@
 apiVersion: v2
-appVersion: 2.8.1
+appVersion: 2.9.0
 dependencies: []
 description: Heterogeneous AI Computing Virtualization Middleware
 keywords:
-- vgpu
-- gpu
+  - vgpu
+  - gpu
 kubeVersion: '>= 1.18.0-0'
 maintainers:
-- email: archlitchi@gmail.com
-  name: limengxuan
-- email: xiaozhang0210@hotmail.com
-  name: zhangxiao
+  - email: archlitchi@gmail.com
+    name: limengxuan
+  - email: xiaozhang0210@hotmail.com
+    name: zhangxiao
 name: hami
 sources:
-- https://github.com/Project-HAMi/HAMi
+  - https://github.com/Project-HAMi/HAMi
 type: application
-version: 2.8.1
+version: 2.9.0
diff --git a/packages/system/hami/charts/hami/README.md b/packages/system/hami/charts/hami/README.md
index e8217290b4..6b92442b10 100644
--- a/packages/system/hami/charts/hami/README.md
+++ b/packages/system/hami/charts/hami/README.md
@@ -8,7 +8,7 @@ This document provides detailed descriptions of all configurable values paramete
 |-----------|-------------|---------------|
 | `global.imageRegistry` | Global Docker image registry | `""` |
 | `global.imagePullSecrets` | Global Docker image pull secrets | `[]` |
-| `global.imageTag` | Image tag | `"v2.8.1"` |
+| `global.imageTag` | Image tag | `"v2.8.0"` |
 | `global.gpuHookPath` | GPU Hook path | `/usr/local` |
 | `global.labels` | Global labels | `{}` |
 | `global.annotations` | Global annotations | `{}` |
diff --git a/packages/system/hami/charts/hami/templates/_commons.tpl b/packages/system/hami/charts/hami/templates/_commons.tpl
index b68018e4c0..78a262c90a 100644
--- a/packages/system/hami/charts/hami/templates/_commons.tpl
+++ b/packages/system/hami/charts/hami/templates/_commons.tpl
@@ -46,4 +46,4 @@ imagePullSecrets:
   - name: {{ . }}
     {{- end }}
   {{- end }}
-{{- end -}}
+{{- end -}}
\ No newline at end of file
diff --git a/packages/system/hami/charts/hami/templates/_helpers.tpl b/packages/system/hami/charts/hami/templates/_helpers.tpl
index ffcc61dab3..1d59d8d7fb 100644
--- a/packages/system/hami/charts/hami/templates/_helpers.tpl
+++ b/packages/system/hami/charts/hami/templates/_helpers.tpl
@@ -118,16 +118,28 @@ app.kubernetes.io/instance: {{ .Release.Name }}
 {{ regexReplaceAll "^(v[0-9]+\\.[0-9]+\\.[0-9]+)(.*)$" .Capabilities.KubeVersion.Version "$1" }}
 {{- end -}}
 
+{{/*
+  Per-component image tag takes precedence over global.imageTag (trimmed non-empty imageRoot.tag wins).
+*/}}
+{{- define "hami.imageTagOrGlobal" -}}
+{{- .imageRoot.tag | default (and .global .global.imageTag) | default "" | toString | trim -}}
+{{- end -}}
+
+{{- define "hami.image" -}}
+{{- $tag := include "hami.imageTagOrGlobal" . -}}
+{{- include "common.images.image" (dict "imageRoot" .imageRoot "global" .global "tag" $tag) -}}
+{{- end -}}
+
 {{- define "hami.scheduler.kubeScheduler.image" -}}
 {{ include "common.images.image" (dict "imageRoot" .Values.scheduler.kubeScheduler.image "global" .Values.global "tag" (include "resolvedKubeSchedulerTag" .)) }}
 {{- end -}}
 
 {{- define "hami.scheduler.extender.image" -}}
-{{ include "common.images.image" (dict "imageRoot" .Values.scheduler.extender.image "global" .Values.global "tag" .Values.global.imageTag) }}
+{{ include "hami.image" (dict "imageRoot" .Values.scheduler.extender.image "global" .Values.global) }}
 {{- end -}}
 
 {{- define "hami.devicePlugin.image" -}}
-{{ include "common.images.image" (dict "imageRoot" .Values.devicePlugin.image "global" .Values.global "tag" .Values.global.imageTag) }}
+{{ include "hami.image" (dict "imageRoot" .Values.devicePlugin.image "global" .Values.global) }}
 {{- end -}}
 
 {{- define "hami.mockDevicePlugin.image" -}}
@@ -135,7 +147,7 @@ app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end -}}
 
 {{- define "hami.devicePlugin.monitor.image" -}}
-{{ include "common.images.image" (dict "imageRoot" .Values.devicePlugin.monitor.image "global" .Values.global "tag" .Values.global.imageTag) }}
+{{ include "hami.image" (dict "imageRoot" .Values.devicePlugin.monitor.image "global" .Values.global) }}
 {{- end -}}
 
 {{- define "hami.scheduler.patch.image" -}}
@@ -161,3 +173,87 @@ app.kubernetes.io/instance: {{ .Release.Name }}
 {{- define "hami.scheduler.patch.new.imagePullSecrets" -}}
 {{ include "common.images.pullSecrets" (dict "images" (list .Values.scheduler.patch.imageNew) "global" .Values.global) }}
 {{- end -}}
+
+{{/*
+Get Kubernetes minor version as integer
+*/}}
+{{- define "hami-vgpu.k8sMinorVersion" -}}
+{{- regexReplaceAll "[^0-9]" .Capabilities.KubeVersion.Minor "" | int -}}
+{{- end -}}
+
+{{/*
+Check if K8s version >= 1.22 (uses KubeSchedulerConfiguration)
+*/}}
+{{- define "hami-vgpu.useNewSchedulerConfig" -}}
+{{- ge (include "hami-vgpu.k8sMinorVersion" . | int) 22 -}}
+{{- end -}}
+
+{{/*
+Managed resources list for scheduler extender
+Returns a YAML list that can be used directly or converted to JSON via fromYaml | toJson
+*/}}
+{{- define "hami-vgpu.scheduler.managedResources" -}}
+{{- $resources := list -}}
+{{/* Core NVIDIA resources */}}
+{{- $resources = append $resources (dict "name" .Values.resourceName "ignoredByScheduler" true) -}}
+{{- $resources = append $resources (dict "name" .Values.resourceMem "ignoredByScheduler" true) -}}
+{{- $resources = append $resources (dict "name" .Values.resourceCores "ignoredByScheduler" true) -}}
+{{- $resources = append $resources (dict "name" .Values.resourceMemPercentage "ignoredByScheduler" true) -}}
+{{- $resources = append $resources (dict "name" .Values.resourcePriority "ignoredByScheduler" true) -}}
+{{/* MLU resources */}}
+{{- $resources = append $resources (dict "name" .Values.mluResourceName "ignoredByScheduler" true) -}}
+{{/* DCU resources */}}
+{{- $resources = append $resources (dict "name" .Values.dcuResourceName "ignoredByScheduler" true) -}}
+{{- $resources = append $resources (dict "name" .Values.dcuResourceMem "ignoredByScheduler" true) -}}
+{{- $resources = append $resources (dict "name" .Values.dcuResourceCores "ignoredByScheduler" true) -}}
+{{/* Metax resources */}}
+{{- $resources = append $resources (dict "name" "metax-tech.com/gpu" "ignoredByScheduler" true) -}}
+{{- $resources = append $resources (dict "name" .Values.metaxResourceName "ignoredByScheduler" true) -}}
+{{- $resources = append $resources (dict "name" .Values.metaxResourceCore "ignoredByScheduler" true) -}}
+{{- $resources = append $resources (dict "name" .Values.metaxResourceMem "ignoredByScheduler" true) -}}
+{{/* Ascend resources */}}
+{{- if .Values.devices.ascend.enabled -}}
+{{- range .Values.devices.ascend.customresources -}}
+{{- $resources = append $resources (dict "name" . "ignoredByScheduler" true) -}}
+{{- end -}}
+{{- end -}}
+{{/* Mthreads resources */}}
+{{- if .Values.devices.mthreads.enabled -}}
+{{- range .Values.devices.mthreads.customresources -}}
+{{- $resources = append $resources (dict "name" . "ignoredByScheduler" true) -}}
+{{- end -}}
+{{- end -}}
+{{/* Enflame resources */}}
+{{- if .Values.devices.enflame.enabled -}}
+{{- range .Values.devices.enflame.customresources -}}
+{{- $resources = append $resources (dict "name" . "ignoredByScheduler" true) -}}
+{{- end -}}
+{{- end -}}
+{{/* Kunlun resources */}}
+{{- if .Values.devices.kunlun.enabled -}}
+{{- range .Values.devices.kunlun.customresources -}}
+{{- $resources = append $resources (dict "name" . "ignoredByScheduler" true) -}}
+{{- end -}}
+{{- end -}}
+{{/* AWS Neuron resources */}}
+{{- range .Values.devices.awsneuron.customresources -}}
+{{- $resources = append $resources (dict "name" . "ignoredByScheduler" true) -}}
+{{- end -}}
+{{/* Iluvatar resources */}}
+{{- if .Values.devices.iluvatar.enabled -}}
+{{- range .Values.devices.iluvatar.customresources -}}
+{{- $resources = append $resources (dict "name" . "ignoredByScheduler" true) -}}
+{{- end -}}
+{{- end -}}
+{{/* Vastai resources */}}
+{{- if .Values.devices.vastai.enabled -}}
+{{- range .Values.devices.vastai.customresources -}}
+{{- $resources = append $resources (dict "name" . "ignoredByScheduler" true) -}}
+{{- end -}}
+{{- end -}}
+{{/* AMD resources */}}
+{{- range .Values.devices.amd.customresources -}}
+{{- $resources = append $resources (dict "name" . "ignoredByScheduler" true) -}}
+{{- end -}}
+{{- toYaml $resources -}}
+{{- end -}}
diff --git a/packages/system/hami/charts/hami/templates/device-plugin/configmap.yaml b/packages/system/hami/charts/hami/templates/device-plugin/configmap.yaml
index 74631e241d..cd4f730932 100644
--- a/packages/system/hami/charts/hami/templates/device-plugin/configmap.yaml
+++ b/packages/system/hami/charts/hami/templates/device-plugin/configmap.yaml
@@ -1,4 +1,4 @@
-{{- if and .Values.devicePlugin.enabled (not .Values.devicePlugin.nodeConfiguration.externalConfigName) -}}
+{{- if and .Values.devicePlugin.enabled (not .Values.devicePlugin.nodeConfiguration.externalConfigName) (not .Values.dra.enabled) -}}
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -10,4 +10,6 @@ metadata:
 data:
   config.json: |
 {{- .Values.devicePlugin.nodeConfiguration.config | nindent 4 }}
-{{- end }}
+  ld.so.preload: |
+    {{ .Values.devicePlugin.libPath }}/libvgpu.so
+{{- end }}
\ No newline at end of file
diff --git a/packages/system/hami/charts/hami/templates/device-plugin/daemonsetnvidia.yaml b/packages/system/hami/charts/hami/templates/device-plugin/daemonsetnvidia.yaml
index 1f4c24f382..edf28ed3cd 100644
--- a/packages/system/hami/charts/hami/templates/device-plugin/daemonsetnvidia.yaml
+++ b/packages/system/hami/charts/hami/templates/device-plugin/daemonsetnvidia.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.devicePlugin.enabled }}
+{{- if and .Values.devicePlugin.enabled (not .Values.dra.enabled) }}
 apiVersion: apps/v1
 kind: DaemonSet
 metadata:
@@ -29,11 +29,7 @@ spec:
         hami.io/webhook: ignore
         {{- include "hami-vgpu.selectorLabels" . | nindent 8 }}
       annotations:
-        {{- if ge (regexReplaceAll "[^0-9]" .Capabilities.KubeVersion.Minor "" | int) 22 }}
-        checksum/hami-scheduler-newversion-config: {{ include (print $.Template.BasePath "/scheduler/configmapnew.yaml") . | sha256sum }}
-        {{- else }}
         checksum/hami-scheduler-config: {{ include (print $.Template.BasePath "/scheduler/configmap.yaml") . | sha256sum }}
-        {{- end }}
         checksum/hami-scheduler-device-config: {{ include (print $.Template.BasePath "/scheduler/device-configmap.yaml") . | sha256sum }}
       {{- if .Values.devicePlugin.podAnnotations }}
         {{- toYaml .Values.devicePlugin.podAnnotations | nindent 8 }}
@@ -45,7 +41,7 @@ spec:
       serviceAccountName: {{ include "hami-vgpu.device-plugin" . }}
       priorityClassName: system-node-critical
       hostPID: true
-      hostNetwork: true
+      hostNetwork: false
       {{- include "hami.devicePlugin.imagePullSecrets" . | nindent 6 }}
       {{- if .Values.devicePlugin.gpuOperatorToolkitReady.enabled }}
       initContainers:
@@ -152,6 +148,10 @@ spec:
               subPath: device-config.yaml
             - name: cdi-root
               mountPath: /var/run/cdi
+            - name: deviceconfig
+              mountPath: /k8s-vgpu/lib/nvidia/ld.so.preload
+              subPath: ld.so.preload
+              readOnly: true
             {{- if typeIs "string" .Values.devicePlugin.nvidiaDriverRoot }}
             # We always mount the driver root at /driver-root in the container.
             # This is required for CDI detection to work correctly.
@@ -164,6 +164,9 @@ spec:
           imagePullPolicy: {{ .Values.devicePlugin.monitor.image.pullPolicy }}
           command:
             - "vGPUmonitor"
+            {{- if .Values.legacyMetrics }}
+            - "--legacy-metrics=true"
+            {{- end }}
             {{- range .Values.devicePlugin.monitor.extraArgs }}
             - {{ . }}
             {{- end }}
diff --git a/packages/system/hami/charts/hami/templates/device-plugin/monitorrole.yaml b/packages/system/hami/charts/hami/templates/device-plugin/monitorrole.yaml
index 6ac757f242..c51ff6c678 100644
--- a/packages/system/hami/charts/hami/templates/device-plugin/monitorrole.yaml
+++ b/packages/system/hami/charts/hami/templates/device-plugin/monitorrole.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.devicePlugin.enabled -}}
+{{- if and .Values.devicePlugin.enabled (not .Values.dra.enabled) -}}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
@@ -25,4 +25,5 @@ rules:
       - list
       - patch
 {{- end -}}
-
+    
+    
diff --git a/packages/system/hami/charts/hami/templates/device-plugin/monitorrolebinding.yaml b/packages/system/hami/charts/hami/templates/device-plugin/monitorrolebinding.yaml
index 2f0a14ba9b..93a118dd7f 100644
--- a/packages/system/hami/charts/hami/templates/device-plugin/monitorrolebinding.yaml
+++ b/packages/system/hami/charts/hami/templates/device-plugin/monitorrolebinding.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.devicePlugin.enabled -}}
+{{- if and .Values.devicePlugin.enabled (not .Values.dra.enabled) -}}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
diff --git a/packages/system/hami/charts/hami/templates/device-plugin/monitorservice.yaml b/packages/system/hami/charts/hami/templates/device-plugin/monitorservice.yaml
index 88f1b2140d..5058754744 100644
--- a/packages/system/hami/charts/hami/templates/device-plugin/monitorservice.yaml
+++ b/packages/system/hami/charts/hami/templates/device-plugin/monitorservice.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.devicePlugin.enabled -}}
+{{- if and .Values.devicePlugin.enabled (not .Values.dra.enabled) -}}
 apiVersion: v1
 kind: Service
 metadata:
@@ -7,8 +7,8 @@ metadata:
   labels:
     app.kubernetes.io/component: hami-device-plugin
     {{- include "hami-vgpu.labels" . | nindent 4 }}
-    {{- with .Values.devicePlugin.service.labels }}
-    {{- toYaml . | nindent 4 }}
+    {{- if .Values.devicePlugin.service.labels }}  # Use devicePlugin instead of scheduler
+    {{- toYaml .Values.devicePlugin.service.labels | nindent 4 }}
     {{- end }}
   {{- if .Values.devicePlugin.service.annotations }}  # Use devicePlugin instead of scheduler
   annotations: {{ toYaml .Values.devicePlugin.service.annotations | nindent 4 }}
@@ -26,4 +26,4 @@ spec:
   selector:
     app.kubernetes.io/component: hami-device-plugin
     {{- include "hami-vgpu.selectorLabels" . | nindent 4 }}
-{{- end -}}
+{{- end -}}
\ No newline at end of file
diff --git a/packages/system/hami/charts/hami/templates/device-plugin/monitorserviceaccount.yaml b/packages/system/hami/charts/hami/templates/device-plugin/monitorserviceaccount.yaml
index 6e3c2a44ff..b10d2cb99c 100644
--- a/packages/system/hami/charts/hami/templates/device-plugin/monitorserviceaccount.yaml
+++ b/packages/system/hami/charts/hami/templates/device-plugin/monitorserviceaccount.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.devicePlugin.enabled -}}
+{{- if and .Values.devicePlugin.enabled (not .Values.dra.enabled) -}}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
diff --git a/packages/system/hami/charts/hami/templates/device-plugin/runtime-class.yaml b/packages/system/hami/charts/hami/templates/device-plugin/runtime-class.yaml
index ebcc2c9c03..cd3d14ccbc 100644
--- a/packages/system/hami/charts/hami/templates/device-plugin/runtime-class.yaml
+++ b/packages/system/hami/charts/hami/templates/device-plugin/runtime-class.yaml
@@ -1,4 +1,5 @@
-{{- if and .Values.devicePlugin.enabled .Values.devicePlugin.createRuntimeClass .Values.devicePlugin.runtimeClassName -}}
+{{- if and .Values.devicePlugin.enabled (not .Values.dra.enabled) -}}
+{{- if and .Values.devicePlugin.createRuntimeClass .Values.devicePlugin.runtimeClassName }}
 apiVersion: node.k8s.io/v1
 kind: RuntimeClass
 metadata:
@@ -6,4 +7,5 @@ metadata:
   annotations:
     helm.sh/hook: pre-install,pre-upgrade
 handler: nvidia
+{{- end }}
 {{- end -}}
diff --git a/packages/system/hami/charts/hami/templates/device-plugin/servicemonitor.yaml b/packages/system/hami/charts/hami/templates/device-plugin/servicemonitor.yaml
new file mode 100644
index 0000000000..216773d966
--- /dev/null
+++ b/packages/system/hami/charts/hami/templates/device-plugin/servicemonitor.yaml
@@ -0,0 +1,22 @@
+{{- if and .Values.devicePlugin.enabled (not .Values.dra.enabled) (.Capabilities.APIVersions.Has "monitoring.coreos.com/v1/ServiceMonitor") .Values.prometheus.enabled }}
+# Prometheus Service Monitor
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: {{ include "hami-vgpu.device-plugin" . }}-metrics-monitor
+  namespace: {{ include "hami-vgpu.namespace" . }}
+  labels:
+    app.kubernetes.io/component: hami-device-plugin
+    {{- include "hami-vgpu.labels" . | nindent 4 }}
+    {{- with .Values.global.labels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+spec:
+  selector:
+    matchLabels:
+      app.kubernetes.io/component: hami-device-plugin
+      {{- include "hami-vgpu.selectorLabels" . | nindent 6 }}
+  endpoints:
+  - port: monitorport
+    path: "/metrics"
+{{- end }}
diff --git a/packages/system/hami/charts/hami/templates/scheduler/certmanager.yaml b/packages/system/hami/charts/hami/templates/scheduler/certmanager.yaml
index e6d287215e..b6edb605fe 100644
--- a/packages/system/hami/charts/hami/templates/scheduler/certmanager.yaml
+++ b/packages/system/hami/charts/hami/templates/scheduler/certmanager.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.scheduler.admissionWebhook.enabled -}}
+{{- if and .Values.scheduler.admissionWebhook.enabled (not .Values.dra.enabled) -}}
 {{- if .Values.scheduler.certManager.enabled }}
 apiVersion: cert-manager.io/v1
 kind: Certificate
diff --git a/packages/system/hami/charts/hami/templates/scheduler/clusterrole.yaml b/packages/system/hami/charts/hami/templates/scheduler/clusterrole.yaml
index 81c4fddf36..9c510c008f 100644
--- a/packages/system/hami/charts/hami/templates/scheduler/clusterrole.yaml
+++ b/packages/system/hami/charts/hami/templates/scheduler/clusterrole.yaml
@@ -1,3 +1,4 @@
+{{- if not .Values.dra.enabled -}}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
@@ -32,3 +33,4 @@ rules:
     resources: ["nodes"]
     verbs: ["get", "update", "list", "patch"]
 {{- end -}}
+{{- end }}
diff --git a/packages/system/hami/charts/hami/templates/scheduler/clusterrolebinding.yaml b/packages/system/hami/charts/hami/templates/scheduler/clusterrolebinding.yaml
index a81d425c9b..69d759868a 100644
--- a/packages/system/hami/charts/hami/templates/scheduler/clusterrolebinding.yaml
+++ b/packages/system/hami/charts/hami/templates/scheduler/clusterrolebinding.yaml
@@ -1,3 +1,4 @@
+{{- if not .Values.dra.enabled -}}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
@@ -45,3 +46,4 @@ subjects:
   - kind: ServiceAccount
     name: {{ include "hami-vgpu.scheduler" . }}
     namespace: {{ include "hami-vgpu.namespace" . }}
+{{- end }}
\ No newline at end of file
diff --git a/packages/system/hami/charts/hami/templates/scheduler/configmap.yaml b/packages/system/hami/charts/hami/templates/scheduler/configmap.yaml
index 109ecbce36..934f852fde 100644
--- a/packages/system/hami/charts/hami/templates/scheduler/configmap.yaml
+++ b/packages/system/hami/charts/hami/templates/scheduler/configmap.yaml
@@ -1,4 +1,5 @@
-{{- if .Values.scheduler.kubeScheduler.enabled -}}
+{{- if and .Values.scheduler.kubeScheduler.enabled (not .Values.dra.enabled) -}}
+{{- $k8sMinor := regexReplaceAll "[^0-9]" .Capabilities.KubeVersion.Minor "" | int -}}
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -8,6 +9,40 @@ metadata:
     app.kubernetes.io/component: hami-scheduler
     {{- include "hami-vgpu.labels" . | nindent 4 }}
 data:
+{{- if ge $k8sMinor 22 }}
+  {{/* K8s >= 1.22: Use KubeSchedulerConfiguration API */}}
+  config.yaml: |
+    {{- if gt $k8sMinor 25 }}
+    apiVersion: kubescheduler.config.k8s.io/v1
+    {{- else }}
+    apiVersion: kubescheduler.config.k8s.io/v1beta2
+    {{- end }}
+    kind: KubeSchedulerConfiguration
+    leaderElection:
+      leaderElect: {{ .Values.scheduler.leaderElect }}
+      resourceName: {{ .Values.schedulerName | quote }}
+      resourceNamespace: {{ include "hami-vgpu.namespace" . | quote }}
+    profiles:
+    - schedulerName: {{ .Values.schedulerName }}
+    extenders:
+    {{- if .Values.scheduler.admissionWebhook.enabled }}
+    - urlPrefix: "https://127.0.0.1:443"
+      enableHTTPS: true
+      tlsConfig:
+        insecure: true
+    {{- else }}
+    - urlPrefix: "http://127.0.0.1:80"
+      enableHTTPS: false
+    {{- end }}
+      filterVerb: filter
+      bindVerb: bind
+      nodeCacheCapable: true
+      weight: 1
+      httpTimeout: 30s
+      managedResources:
+      {{- include "hami-vgpu.scheduler.managedResources" . | nindent 6 }}
+{{- else }}
+  {{/* K8s < 1.22: Use legacy Policy API */}}
   config.json: |
     {
         "kind": "Policy",
@@ -29,114 +64,10 @@ data:
                 "weight": 1,
                 "nodeCacheCapable": true,
                 "httpTimeout": 30000000000,
-                "managedResources": [
-                    {{- range .Values.devices.amd.customresources }}
-                    {
-                      "name": "{{ . }}",
-                      "ignoredByScheduler": true
-                    },
-                    {{- end }}
-                    {{- if .Values.devices.ascend.enabled }}
-                    {{- range .Values.devices.ascend.customresources }}
-                    {
-                      "name": "{{ . }}",
-                      "ignoredByScheduler": true
-                    },
-                    {{- end }}
-                    {{- end }}
-                    {{- if .Values.devices.mthreads.enabled }}
-                    {{- range .Values.devices.mthreads.customresources }}
-                    {
-                      "name": "{{ . }}",
-                      "ignoredByScheduler": true
-                    },
-                    {{- end }}
-                    {{- end }}
-                    {{- if .Values.devices.enflame.enabled }}
-                    {{- range .Values.devices.enflame.customresources }}
-                    {
-                      "name": "{{ . }}",
-                      "ignoredByScheduler": true
-                    },
-                    {{- end }}
-                    {{- end }}
-                    {{- if .Values.devices.kunlun.enabled }}
-                    {{- range .Values.devices.kunlun.customresources }}
-                    {
-                      "name": "{{ . }}",
-                      "ignoredByScheduler": true
-                    },
-                    {{- end }}
-                    {{- end }}
-                    {{- range .Values.devices.awsneuron.customresources }}
-                    {
-                      "name": "{{ . }}",
-                      "ignoredByScheduler": true
-                    },
-                    {{- end }}
-                    {{- if .Values.devices.iluvatar.enabled }}
-                    {{- range .Values.devices.iluvatar.customresources }}
-                    {
-                      "name": "{{ . }}",
-                      "ignoredByScheduler": true
-                    },
-                    {{- end }}
-                    {{- end }}
-                    {
-                        "name": "{{ .Values.resourceName }}",
-                        "ignoredByScheduler": true
-                    },
-                    {
-                        "name": "{{ .Values.resourceMem }}",
-                        "ignoredByScheduler": true
-                    },
-                    {
-                        "name": "{{ .Values.resourceCores }}",
-                        "ignoredByScheduler": true
-                    },
-                    {
-                        "name": "{{ .Values.resourceMemPercentage }}",
-                        "ignoredByScheduler": true
-                    },
-                    {
-                        "name": "{{ .Values.resourcePriority }}",
-                        "ignoredByScheduler": true
-                    },
-                    {
-                        "name": "{{ .Values.mluResourceName }}",
-                        "ignoredByScheduler": true
-                    },
-                    {
-                        "name": "{{ .Values.dcuResourceName }}",
-                        "ignoredByScheduler": true
-                    },
-                    {
-                        "name": "{{ .Values.dcuResourceMem }}",
-                        "ignoredByScheduler": true 
-                    },
-                    {
-                        "name": "{{ .Values.dcuResourceCores }}",
-                        "ignoredByScheduler": true
-                    },
-                    {
-                        "name": "metax-tech.com/gpu",
-                        "ignoredByScheduler": true
-                    },
-                    {
-                        "name": "{{ .Values.metaxResourceName }}",
-                        "ignoredByScheduler": true
-                    },
-                    {
-                        "name": "{{ .Values.metaxResourceCore }}",
-                        "ignoredByScheduler": true
-                    },
-                    {
-                        "name": "{{ .Values.metaxResourceMem }}",
-                        "ignoredByScheduler": true
-                    }
-                ],
+                "managedResources": {{ include "hami-vgpu.scheduler.managedResources" . | fromYamlArray | toJson }},
                 "ignoreable": false
             }
         ]
     }
 {{- end }}
+{{- end }}
diff --git a/packages/system/hami/charts/hami/templates/scheduler/configmapnew.yaml b/packages/system/hami/charts/hami/templates/scheduler/configmapnew.yaml
deleted file mode 100644
index 6f6db09753..0000000000
--- a/packages/system/hami/charts/hami/templates/scheduler/configmapnew.yaml
+++ /dev/null
@@ -1,102 +0,0 @@
-{{- if .Values.scheduler.kubeScheduler.enabled -}}
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "hami-vgpu.scheduler" . }}-newversion
-  namespace: {{ include "hami-vgpu.namespace" . }}
-  labels:
-    app.kubernetes.io/component: hami-scheduler
-    {{- include "hami-vgpu.labels" . | nindent 4 }}
-data:
-  config.yaml: |
-    {{- if gt (regexReplaceAll "[^0-9]" .Capabilities.KubeVersion.Minor "" | int) 25}}
-    apiVersion: kubescheduler.config.k8s.io/v1
-    {{- else }}
-    apiVersion: kubescheduler.config.k8s.io/v1beta2
-    {{- end }}
-    kind: KubeSchedulerConfiguration
-    leaderElection:
-      leaderElect: false
-    profiles:
-    - schedulerName: {{ .Values.schedulerName }}
-    extenders:
-    {{- if .Values.scheduler.admissionWebhook.enabled }}
-    - urlPrefix: "https://127.0.0.1:443"
-      enableHTTPS: true
-      tlsConfig:
-        insecure: true
-    {{- else }}
-    - urlPrefix: "http://127.0.0.1:80"
-      enableHTTPS: false
-    {{- end }}
-      filterVerb: filter
-      bindVerb: bind
-      nodeCacheCapable: true
-      weight: 1
-      httpTimeout: 30s
-      managedResources:
-      - name: {{ .Values.resourceName }}
-        ignoredByScheduler: true
-      - name: {{ .Values.resourceMem }}
-        ignoredByScheduler: true
-      - name: {{ .Values.resourceCores }}
-        ignoredByScheduler: true
-      - name: {{ .Values.resourceMemPercentage }}
-        ignoredByScheduler: true
-      - name: {{ .Values.resourcePriority }}
-        ignoredByScheduler: true
-      - name: {{ .Values.mluResourceName }}
-        ignoredByScheduler: true
-      - name: {{ .Values.dcuResourceName }}
-        ignoredByScheduler: true
-      - name: {{ .Values.dcuResourceMem }}
-        ignoredByScheduler: true
-      - name: {{ .Values.dcuResourceCores }}
-        ignoredByScheduler: true
-      - name: "metax-tech.com/gpu"
-        ignoredByScheduler: true
-      - name: {{ .Values.metaxResourceName }}
-        ignoredByScheduler: true
-      - name: {{ .Values.metaxResourceCore }}
-        ignoredByScheduler: true
-      - name: {{ .Values.metaxResourceMem }}
-        ignoredByScheduler: true
-      {{- if .Values.devices.ascend.enabled }}
-      {{- range .Values.devices.ascend.customresources }}
-      - name: {{ . }}
-        ignoredByScheduler: true
-      {{- end }}
-      {{- end }}
-      {{- if .Values.devices.mthreads.enabled }}
-      {{- range .Values.devices.mthreads.customresources }}
-      - name: {{ . }}
-        ignoredByScheduler: true
-      {{- end }}
-      {{- end }}
-      {{- if .Values.devices.enflame.enabled }}
-      {{- range .Values.devices.enflame.customresources }}
-      - name: {{ . }}
-        ignoredByScheduler: true
-      {{- end }}
-      {{- end }}
-      {{- if .Values.devices.kunlun.enabled }}
-      {{- range .Values.devices.kunlun.customresources }}
-      - name: {{ . }}
-        ignoredByScheduler: true
-      {{- end }}
-      {{- end }}
-      {{- range .Values.devices.awsneuron.customresources }}
-      - name: {{ . }}
-        ignoredByScheduler: true
-      {{- end }}
-      {{- if .Values.devices.iluvatar.enabled }}
-      {{- range .Values.devices.iluvatar.customresources }}
-      - name: {{ . }}
-        ignoredByScheduler: true
-      {{- end }}
-      {{- end }}
-      {{- range .Values.devices.amd.customresources }}
-      - name: {{ . }}
-        ignoredByScheduler: true
-      {{- end }}
-{{- end }}
diff --git a/packages/system/hami/charts/hami/templates/scheduler/deployment.yaml b/packages/system/hami/charts/hami/templates/scheduler/deployment.yaml
index 1d89e18910..af3b8b57aa 100644
--- a/packages/system/hami/charts/hami/templates/scheduler/deployment.yaml
+++ b/packages/system/hami/charts/hami/templates/scheduler/deployment.yaml
@@ -1,3 +1,4 @@
+{{- if not .Values.dra.enabled -}}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -29,11 +30,7 @@ spec:
         {{- include "hami-vgpu.selectorLabels" . | nindent 8 }}
         hami.io/webhook: ignore
       annotations:
-        {{- if ge (regexReplaceAll "[^0-9]" .Capabilities.KubeVersion.Minor "" | int) 22 }}
-        checksum/hami-scheduler-newversion-config: {{ include (print $.Template.BasePath "/scheduler/configmapnew.yaml") . | sha256sum }}
-        {{- else }}
         checksum/hami-scheduler-config: {{ include (print $.Template.BasePath "/scheduler/configmap.yaml") . | sha256sum }}
-        {{- end }}
         checksum/hami-scheduler-device-config: {{ include (print $.Template.BasePath "/scheduler/device-configmap.yaml") . | sha256sum }}
       {{- if .Values.scheduler.podAnnotations }}
         {{- toYaml .Values.scheduler.podAnnotations | nindent 8 }}
@@ -58,10 +55,10 @@ spec:
             {{- range .Values.scheduler.kubeScheduler.extraArgs }}
             - {{ . }}
             {{- end }}
-            {{- end }}
             - --leader-elect={{ .Values.scheduler.leaderElect }}
             - --leader-elect-resource-name={{ .Values.schedulerName }}
             - --leader-elect-resource-namespace={{ include "hami-vgpu.namespace" . }}
+            {{- end }}
           resources:
           {{- toYaml .Values.scheduler.kubeScheduler.resources | nindent 12 }}
           volumeMounts:
@@ -84,13 +81,21 @@ spec:
           image: {{ include "hami.scheduler.extender.image" . }}
           imagePullPolicy: {{ .Values.scheduler.extender.image.pullPolicy }}
           env:
+            - name: POD_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.name
+            - name: POD_NAMESPACE
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.namespace
           {{- if .Values.scheduler.nodeLockExpire }}
             - name: HAMI_NODELOCK_EXPIRE
               value: "{{ .Values.scheduler.nodeLockExpire }}"
           {{- end }}
           {{- if .Values.global.managedNodeSelectorEnable }}
           {{- range $key, $value := .Values.global.managedNodeSelector }}
-            - name: NODE_SELECTOR_{{ $key | upper | replace "-" "_" }}
+            - name: NODE_SELECTOR_{{ $key | upper | replace "-" "_" | replace "/" "_" | replace "." "_" }}
               value: "{{ $value }}"
           {{- end }}
           {{- end }}
@@ -126,6 +131,9 @@ spec:
               {{- $first = false -}}
               {{- end -}}
             {{- end }}
+            {{- if .Values.legacyMetrics }}
+            - --legacy-metrics=true
+            {{- end }}
             {{- range .Values.scheduler.extender.extraArgs }}
             - {{ . }}
             {{- end }}
@@ -205,11 +213,7 @@ spec:
         {{- if .Values.scheduler.kubeScheduler.enabled }}
         - name: scheduler-config
           configMap:
-            {{- if ge (regexReplaceAll "[^0-9]" .Capabilities.KubeVersion.Minor "" | int) 22 }}
-            name: {{ template "hami-vgpu.scheduler" . }}-newversion
-            {{- else }}
             name: {{ template "hami-vgpu.scheduler" . }}
-            {{- end }}
         {{- end }}
         - name: device-config
           configMap:
@@ -223,3 +227,4 @@ spec:
       {{- if .Values.scheduler.nodeName }}
       nodeName: {{ .Values.scheduler.nodeName }}
       {{- end }}
+{{- end }}
diff --git a/packages/system/hami/charts/hami/templates/scheduler/device-configmap.yaml b/packages/system/hami/charts/hami/templates/scheduler/device-configmap.yaml
index 873b813b07..05e64046a3 100644
--- a/packages/system/hami/charts/hami/templates/scheduler/device-configmap.yaml
+++ b/packages/system/hami/charts/hami/templates/scheduler/device-configmap.yaml
@@ -1,3 +1,4 @@
+{{- if not .Values.dra.enabled -}}
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -17,10 +18,11 @@ data:
       resourceMemoryPercentageName: {{ .Values.resourceMemPercentage }}
       resourceCoreName: {{ .Values.resourceCores }}
       resourcePriorityName: {{ .Values.resourcePriority }}
-      overwriteEnv: false
+      overwriteEnv: {{ .Values.scheduler.overwriteEnv | default "false" }}
       defaultMemory: 0
       defaultCores: 0
       defaultGPUNum: 1
+      preConfiguredDeviceMemory: {{ .Values.devicePlugin.preConfiguredDeviceMemory | default 0 }}
       memoryFactor: 1
       deviceSplitCount: {{ .Values.devicePlugin.deviceSplitCount }}
       deviceMemoryScaling: {{ .Values.devicePlugin.deviceMemoryScaling }}
@@ -77,25 +79,25 @@ data:
           - 
             - name: 1g.10gb
               core: 14
-              memory: 10240
+              memory: 9728
               count: 7
           - 
             - name: 1g.10gb
               core: 14
-              memory: 10240
+              memory: 9728
               count: 1
             - name: 2g.20gb
               core: 28
-              memory: 20480
+              memory: 19968
               count: 3
           - 
             - name: 3g.40gb
               core: 42
-              memory: 40960
+              memory: 40192
               count: 2
           - 
-            - name: 7g.79gb
-              core: 100
+            - name: 7g.80gb
+              core: 98
               memory: 80896
               count: 1
       - models: [ "H100-PCIE-80GB", "H100-SXM5-80GB"]
@@ -281,128 +283,162 @@ data:
       resourceCoreName: "aws.amazon.com/neuroncore"
     amd:
       resourceCountName: "amd.com/gpu"
+    vastai:
+      resourceCountName: {{ .Values.vastaiResourceName }}
     vnpus:
-    - chipName: 910A
-      commonWord: Ascend910A
-      resourceName: huawei.com/Ascend910A
-      resourceMemoryName: huawei.com/Ascend910A-memory
-      memoryAllocatable: 32768
-      memoryCapacity: 32768
-      memoryFactor: 1
-      aiCore: 30
-      templates:
-        - name: vir02
-          memory: 2184
-          aiCore: 2
-        - name: vir04
-          memory: 4369
-          aiCore: 4
-        - name: vir08
-          memory: 8738
-          aiCore: 8
-        - name: vir16
-          memory: 17476
-          aiCore: 16
-    - chipName: 910B2
-      commonWord: Ascend910B2
-      resourceName: huawei.com/Ascend910B2
-      resourceMemoryName: huawei.com/Ascend910B2-memory
-      memoryAllocatable: 65536
-      memoryCapacity: 65536
-      memoryFactor: 1
-      aiCore: 24
-      aiCPU: 6
-      templates:
-        - name: vir03_1c_8g
-          memory: 8192
-          aiCore: 3
-          aiCPU: 1
-        - name: vir06_1c_16g
-          memory: 16384
-          aiCore: 6
-          aiCPU: 1
-        - name: vir12_3c_32g
-          memory: 32768
-          aiCore: 12
-          aiCPU: 3
-    - chipName: 910B3
-      commonWord: Ascend910B3
-      resourceName: huawei.com/Ascend910B3
-      resourceMemoryName: huawei.com/Ascend910B3-memory
-      memoryAllocatable: 65536
-      memoryCapacity: 65536
-      memoryFactor: 1
-      aiCore: 20
-      aiCPU: 7
-      templates:
-        - name: vir05_1c_16g
-          memory: 16384
-          aiCore: 5
-          aiCPU: 1
-        - name: vir10_3c_32g
-          memory: 32768
-          aiCore: 10
-          aiCPU: 3
-    - chipName: 910B4-1
-      commonWord: Ascend910B4-1
-      resourceName: huawei.com/Ascend910B4-1
-      resourceMemoryName: huawei.com/Ascend910B4-1-memory
-      memoryAllocatable: 65536
-      memoryCapacity: 65536
-      memoryFactor: 1
-      aiCore: 20
-      aiCPU: 7
-      templates:
-        # NOTE: Names of vnpu template for 910B4-1 are fixed by Ascend runtime and must not be changed.
-        # The memory is used for scheduling so the correct values must be set.
-        # Template vir05_1c_8g actually provides 16GB memory,
-        - name: vir05_1c_8g
-          memory: 16384
-          aiCore: 5
-          aiCPU: 1
-        # Template vir10_3c_16g actually provides 32GB memory
-        - name: vir10_3c_16g
-          memory: 32768
-          aiCore: 10
-          aiCPU: 3
-    - chipName: 910B4
-      commonWord: Ascend910B4
-      resourceName: huawei.com/Ascend910B4
-      resourceMemoryName: huawei.com/Ascend910B4-memory
-      memoryAllocatable: 32768
-      memoryCapacity: 32768
-      memoryFactor: 1
-      aiCore: 20
-      aiCPU: 7
-      templates:
-        - name: vir05_1c_8g
-          memory: 8192
-          aiCore: 5
-          aiCPU: 1
-        - name: vir10_3c_16g
-          memory: 16384
-          aiCore: 10
-          aiCPU: 3
-    - chipName: 310P3
-      commonWord: Ascend310P
-      resourceName: huawei.com/Ascend310P
-      resourceMemoryName: huawei.com/Ascend310P-memory
-      memoryAllocatable: 21527
-      memoryCapacity: 24576
-      memoryFactor: 1
-      aiCore: 8
-      aiCPU: 7
-      templates:
-        - name: vir01
-          memory: 3072
-          aiCore: 1
-          aiCPU: 1
-        - name: vir02
-          memory: 6144
-          aiCore: 2
-          aiCPU: 2
-        - name: vir04
-          memory: 12288
-          aiCore: 4
-          aiCPU: 4
+      hamiVnpuCore: {{ .Values.devices.ascend.hamiVnpuCore | default false }}
+      configs:
+      - chipName: 910A
+        commonWord: Ascend910A
+        resourceName: huawei.com/Ascend910A
+        resourceMemoryName: huawei.com/Ascend910A-memory
+        resourceCoreName: huawei.com/Ascend910A-core
+        memoryAllocatable: 32768
+        memoryCapacity: 32768
+        memoryFactor: 1
+        aiCore: 30
+        runtimeClassName: "{{ .Values.devices.ascend.runtimeClassName }}"
+        overwriteEnv: {{ .Values.scheduler.overwriteEnv | default "false" }}
+        templates:
+          - name: vir02
+            memory: 2184
+            aiCore: 2
+          - name: vir04
+            memory: 4369
+            aiCore: 4
+          - name: vir08
+            memory: 8738
+            aiCore: 8
+          - name: vir16
+            memory: 17476
+            aiCore: 16
+      - chipName: 910B2
+        commonWord: Ascend910B2
+        resourceName: huawei.com/Ascend910B2
+        resourceMemoryName: huawei.com/Ascend910B2-memory
+        resourceCoreName: huawei.com/Ascend910B2-core
+        memoryAllocatable: 65536
+        memoryCapacity: 65536
+        memoryFactor: 1
+        aiCore: 24
+        aiCPU: 6
+        runtimeClassName: "{{ .Values.devices.ascend.runtimeClassName }}"
+        overwriteEnv: {{ .Values.scheduler.overwriteEnv | default "false" }}
+        templates:
+          - name: vir03_1c_8g
+            memory: 8192
+            aiCore: 3
+            aiCPU: 1
+          - name: vir06_1c_16g
+            memory: 16384
+            aiCore: 6
+            aiCPU: 1
+          - name: vir12_3c_32g
+            memory: 32768
+            aiCore: 12
+            aiCPU: 3
+      - chipName: 910B3
+        commonWord: Ascend910B3
+        resourceName: huawei.com/Ascend910B3
+        resourceMemoryName: huawei.com/Ascend910B3-memory
+        resourceCoreName: huawei.com/Ascend910B3-core
+        memoryAllocatable: 65536
+        memoryCapacity: 65536
+        memoryFactor: 1
+        aiCore: 20
+        aiCPU: 7
+        runtimeClassName: "{{ .Values.devices.ascend.runtimeClassName }}"
+        overwriteEnv: {{ .Values.scheduler.overwriteEnv | default "false" }}
+        templates:
+          - name: vir05_1c_16g
+            memory: 16384
+            aiCore: 5
+            aiCPU: 1
+          - name: vir10_3c_32g
+            memory: 32768
+            aiCore: 10
+            aiCPU: 3
+      - chipName: 910B4-1
+        commonWord: Ascend910B4-1
+        resourceName: huawei.com/Ascend910B4-1
+        resourceMemoryName: huawei.com/Ascend910B4-1-memory
+        resourceCoreName: huawei.com/Ascend910B4-1-core
+        memoryAllocatable: 65536
+        memoryCapacity: 65536
+        memoryFactor: 1
+        aiCore: 20
+        aiCPU: 7
+        runtimeClassName: "{{ .Values.devices.ascend.runtimeClassName }}"
+        overwriteEnv: {{ .Values.scheduler.overwriteEnv | default "false" }}
+        templates:
+          # NOTE: Names of vnpu template for 910B4-1 are fixed by Ascend runtime and must not be changed.
+          # The memory is used for scheduling so the correct values must be set.
+          # Template vir05_1c_8g actually provides 16GB memory,
+          - name: vir05_1c_8g
+            memory: 16384
+            aiCore: 5
+            aiCPU: 1
+          # Template vir10_3c_16g actually provides 32GB memory
+          - name: vir10_3c_16g
+            memory: 32768
+            aiCore: 10
+            aiCPU: 3
+      - chipName: 910B4
+        commonWord: Ascend910B4
+        resourceName: huawei.com/Ascend910B4
+        resourceMemoryName: huawei.com/Ascend910B4-memory
+        resourceCoreName: huawei.com/Ascend910B4-core
+        memoryAllocatable: 32768
+        memoryCapacity: 32768
+        memoryFactor: 1
+        aiCore: 20
+        aiCPU: 7
+        runtimeClassName: "{{ .Values.devices.ascend.runtimeClassName }}"
+        overwriteEnv: {{ .Values.scheduler.overwriteEnv | default "false" }}
+        templates:
+          - name: vir05_1c_8g
+            memory: 8192
+            aiCore: 5
+            aiCPU: 1
+          - name: vir10_3c_16g
+            memory: 16384
+            aiCore: 10
+            aiCPU: 3
+      - chipName: 310P3
+        commonWord: Ascend310P
+        resourceName: huawei.com/Ascend310P
+        resourceMemoryName: huawei.com/Ascend310P-memory
+        resourceCoreName: huawei.com/Ascend310P-core
+        memoryAllocatable: 21527
+        memoryCapacity: 24576
+        memoryFactor: 1
+        aiCore: 8
+        aiCPU: 7
+        runtimeClassName: "{{ .Values.devices.ascend.runtimeClassName }}"
+        overwriteEnv: {{ .Values.scheduler.overwriteEnv | default "false" }}
+        templates:
+          - name: vir01
+            memory: 3072
+            aiCore: 1
+            aiCPU: 1
+          - name: vir02
+            memory: 6144
+            aiCore: 2
+            aiCPU: 2
+          - name: vir04
+            memory: 12288
+            aiCore: 4
+            aiCPU: 4
+      - chipName: Ascend910
+        commonWord: Ascend910C
+        resourceName: huawei.com/Ascend910C
+        resourceMemoryName: huawei.com/Ascend910C-memory
+        resourceCoreName: huawei.com/Ascend910C-core
+        memoryAllocatable: 65536
+        memoryCapacity: 65536
+        aiCore: 20
+        aiCPU: 7
+        runtimeClassName: "{{ .Values.devices.ascend.runtimeClassName }}"
+        overwriteEnv: {{ .Values.scheduler.overwriteEnv | default "false" }}
   {{ end }}
+{{- end }}
diff --git a/packages/system/hami/charts/hami/templates/scheduler/job-patch/clusterrole.yaml b/packages/system/hami/charts/hami/templates/scheduler/job-patch/clusterrole.yaml
index 77e891cc44..b089ae8298 100644
--- a/packages/system/hami/charts/hami/templates/scheduler/job-patch/clusterrole.yaml
+++ b/packages/system/hami/charts/hami/templates/scheduler/job-patch/clusterrole.yaml
@@ -1,4 +1,5 @@
-{{- if and .Values.scheduler.admissionWebhook.enabled (.Values.scheduler.patch.enabled) (not .Values.scheduler.certManager.enabled) -}}
+{{- if and .Values.scheduler.admissionWebhook.enabled (not .Values.dra.enabled) -}}
+{{- if and (.Values.scheduler.patch.enabled) (not .Values.scheduler.certManager.enabled) }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
@@ -18,4 +19,12 @@ rules:
     verbs:
       - get
       - update
+{{- if .Values.podSecurityPolicy.enabled }}
+  - apiGroups: ['extensions']
+    resources: ['podsecuritypolicies']
+    verbs:     ['use']
+    resourceNames:
+    - {{ include "hami-vgpu.fullname" . }}-admission
+{{- end }}
+{{- end }}
 {{- end }}
diff --git a/packages/system/hami/charts/hami/templates/scheduler/job-patch/clusterrolebinding.yaml b/packages/system/hami/charts/hami/templates/scheduler/job-patch/clusterrolebinding.yaml
index 2b82f926ce..64f01ecf32 100644
--- a/packages/system/hami/charts/hami/templates/scheduler/job-patch/clusterrolebinding.yaml
+++ b/packages/system/hami/charts/hami/templates/scheduler/job-patch/clusterrolebinding.yaml
@@ -1,4 +1,5 @@
-{{- if and .Values.scheduler.admissionWebhook.enabled (.Values.scheduler.patch.enabled) (not .Values.scheduler.certManager.enabled) -}}
+{{- if and .Values.scheduler.admissionWebhook.enabled (not .Values.dra.enabled) -}}
+{{- if and (.Values.scheduler.patch.enabled) (not .Values.scheduler.certManager.enabled) }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
@@ -18,3 +19,4 @@ subjects:
     name: {{ include "hami-vgpu.fullname" . }}-admission
     namespace: {{ include "hami-vgpu.namespace" . }}
 {{- end }}
+{{- end }}
diff --git a/packages/system/hami/charts/hami/templates/scheduler/job-patch/job-createSecret.yaml b/packages/system/hami/charts/hami/templates/scheduler/job-patch/job-createSecret.yaml
index 0e36d95f9d..400168a706 100644
--- a/packages/system/hami/charts/hami/templates/scheduler/job-patch/job-createSecret.yaml
+++ b/packages/system/hami/charts/hami/templates/scheduler/job-patch/job-createSecret.yaml
@@ -1,4 +1,5 @@
-{{- if and .Values.scheduler.admissionWebhook.enabled (.Values.scheduler.patch.enabled) (not .Values.scheduler.certManager.enabled) -}}
+{{- if and .Values.scheduler.admissionWebhook.enabled (not .Values.dra.enabled) -}}
+{{- if and (.Values.scheduler.patch.enabled) (not .Values.scheduler.certManager.enabled) }}
 apiVersion: batch/v1
 kind: Job
 metadata:
@@ -66,3 +67,4 @@ spec:
         runAsNonRoot: true
         runAsUser: {{ .Values.scheduler.patch.runAsUser }}
 {{- end }}
+{{- end }}
diff --git a/packages/system/hami/charts/hami/templates/scheduler/job-patch/job-patchWebhook.yaml b/packages/system/hami/charts/hami/templates/scheduler/job-patch/job-patchWebhook.yaml
index ce52042c3b..71e97f6b36 100644
--- a/packages/system/hami/charts/hami/templates/scheduler/job-patch/job-patchWebhook.yaml
+++ b/packages/system/hami/charts/hami/templates/scheduler/job-patch/job-patchWebhook.yaml
@@ -1,4 +1,5 @@
-{{- if and .Values.scheduler.admissionWebhook.enabled (.Values.scheduler.patch.enabled) (not .Values.scheduler.certManager.enabled) -}}
+{{- if and .Values.scheduler.admissionWebhook.enabled (not .Values.dra.enabled) -}}
+{{- if and (.Values.scheduler.patch.enabled) (not .Values.scheduler.certManager.enabled) }}
 apiVersion: batch/v1
 kind: Job
 metadata:
@@ -61,3 +62,4 @@ spec:
         runAsNonRoot: true
         runAsUser: {{ .Values.scheduler.patch.runAsUser }}
 {{- end }}
+{{- end }}
diff --git a/packages/system/hami/charts/hami/templates/scheduler/job-patch/psp.yaml b/packages/system/hami/charts/hami/templates/scheduler/job-patch/psp.yaml
new file mode 100644
index 0000000000..a48270e775
--- /dev/null
+++ b/packages/system/hami/charts/hami/templates/scheduler/job-patch/psp.yaml
@@ -0,0 +1,40 @@
+{{- if and .Values.scheduler.admissionWebhook.enabled (not .Values.dra.enabled) -}}
+{{- if and (.Values.scheduler.patch.enabled) (not .Values.scheduler.certManager.enabled) }}
+{{- if .Values.podSecurityPolicy.enabled }}
+apiVersion: policy/v1beta1
+kind: PodSecurityPolicy
+metadata:
+  name: {{ include "hami-vgpu.fullname" . }}-admission
+  annotations:
+    "helm.sh/hook": pre-install,pre-upgrade,post-install,post-upgrade
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+  labels:
+    {{- include "hami-vgpu.labels" . | nindent 4 }}
+    app.kubernetes.io/component: admission-webhook
+spec:
+  allowPrivilegeEscalation: false
+  fsGroup:
+    ranges:
+    - max: 65535
+      min: 1
+    rule: MustRunAs
+  requiredDropCapabilities:
+  - ALL
+  runAsUser:
+    rule: MustRunAsNonRoot
+  seLinux:
+    rule: RunAsAny
+  supplementalGroups:
+    ranges:
+    - max: 65535
+      min: 1
+    rule: MustRunAs
+  volumes:
+  - configMap
+  - emptyDir
+  - projected
+  - secret
+  - downwardAPI
+{{- end }}
+{{- end }}
+{{- end }}
diff --git a/packages/system/hami/charts/hami/templates/scheduler/job-patch/role.yaml b/packages/system/hami/charts/hami/templates/scheduler/job-patch/role.yaml
index 56682f8eb4..74e456815c 100644
--- a/packages/system/hami/charts/hami/templates/scheduler/job-patch/role.yaml
+++ b/packages/system/hami/charts/hami/templates/scheduler/job-patch/role.yaml
@@ -1,4 +1,5 @@
-{{- if and .Values.scheduler.admissionWebhook.enabled (.Values.scheduler.patch.enabled) (not .Values.scheduler.certManager.enabled) -}}
+{{- if and .Values.scheduler.admissionWebhook.enabled (not .Values.dra.enabled) -}}
+{{- if and (.Values.scheduler.patch.enabled) (not .Values.scheduler.certManager.enabled) }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
@@ -19,3 +20,4 @@ rules:
       - get
       - create
 {{- end }}
+{{- end }}
diff --git a/packages/system/hami/charts/hami/templates/scheduler/job-patch/rolebinding.yaml b/packages/system/hami/charts/hami/templates/scheduler/job-patch/rolebinding.yaml
index 7239b128eb..32da5ba481 100644
--- a/packages/system/hami/charts/hami/templates/scheduler/job-patch/rolebinding.yaml
+++ b/packages/system/hami/charts/hami/templates/scheduler/job-patch/rolebinding.yaml
@@ -1,4 +1,5 @@
-{{- if and .Values.scheduler.admissionWebhook.enabled (.Values.scheduler.patch.enabled) (not .Values.scheduler.certManager.enabled) -}}
+{{- if and .Values.scheduler.admissionWebhook.enabled (not .Values.dra.enabled) -}}
+{{- if and (.Values.scheduler.patch.enabled) (not .Values.scheduler.certManager.enabled) }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
@@ -19,3 +20,4 @@ subjects:
     name: {{ include "hami-vgpu.fullname" . }}-admission
     namespace: {{ include "hami-vgpu.namespace" . }}
 {{- end }}
+{{- end }}
diff --git a/packages/system/hami/charts/hami/templates/scheduler/job-patch/serviceaccount.yaml b/packages/system/hami/charts/hami/templates/scheduler/job-patch/serviceaccount.yaml
index 857c6a8db9..d2eb41debe 100644
--- a/packages/system/hami/charts/hami/templates/scheduler/job-patch/serviceaccount.yaml
+++ b/packages/system/hami/charts/hami/templates/scheduler/job-patch/serviceaccount.yaml
@@ -1,4 +1,5 @@
-{{- if and .Values.scheduler.admissionWebhook.enabled (.Values.scheduler.patch.enabled) (not .Values.scheduler.certManager.enabled) }}
+{{- if and .Values.scheduler.admissionWebhook.enabled (not .Values.dra.enabled) }}
+{{- if and (.Values.scheduler.patch.enabled) (not .Values.scheduler.certManager.enabled) }}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
@@ -11,3 +12,4 @@ metadata:
     {{- include "hami-vgpu.labels" . | nindent 4 }}
     app.kubernetes.io/component: admission-webhook
 {{- end }}
+{{- end }}
diff --git a/packages/system/hami/charts/hami/templates/scheduler/role.yaml b/packages/system/hami/charts/hami/templates/scheduler/role.yaml
index 5f7d7e44c5..6e68196795 100644
--- a/packages/system/hami/charts/hami/templates/scheduler/role.yaml
+++ b/packages/system/hami/charts/hami/templates/scheduler/role.yaml
@@ -1,3 +1,4 @@
+{{- if not .Values.dra.enabled -}}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
@@ -10,3 +11,4 @@ rules:
   - apiGroups: ["coordination.k8s.io"]
     resources: ["leases"]
     verbs: ["create", "list", "watch", "get", "update", "patch"]
+{{- end }}
\ No newline at end of file
diff --git a/packages/system/hami/charts/hami/templates/scheduler/rolebinding.yaml b/packages/system/hami/charts/hami/templates/scheduler/rolebinding.yaml
index 96e175a18a..934f822352 100644
--- a/packages/system/hami/charts/hami/templates/scheduler/rolebinding.yaml
+++ b/packages/system/hami/charts/hami/templates/scheduler/rolebinding.yaml
@@ -1,3 +1,4 @@
+{{- if not .Values.dra.enabled -}}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
@@ -29,3 +30,4 @@ subjects:
     name: {{ include "hami-vgpu.mock-device-plugin" . }}
     namespace: {{ include "hami-vgpu.namespace" . }}
 {{- end -}}
+{{- end }}
diff --git a/packages/system/hami/charts/hami/templates/scheduler/service.yaml b/packages/system/hami/charts/hami/templates/scheduler/service.yaml
index d7538fed79..5a879fa994 100644
--- a/packages/system/hami/charts/hami/templates/scheduler/service.yaml
+++ b/packages/system/hami/charts/hami/templates/scheduler/service.yaml
@@ -1,3 +1,4 @@
+{{- if not .Values.dra.enabled }}
 apiVersion: v1
 kind: Service
 metadata:
@@ -7,7 +8,7 @@ metadata:
     app.kubernetes.io/component: hami-scheduler
     {{- include "hami-vgpu.labels" . | nindent 4 }}
     {{- if .Values.scheduler.service.labels }}
-    {{ toYaml .Values.scheduler.service.labels | indent 4 }}
+    {{- toYaml .Values.scheduler.service.labels | nindent 4 }}
     {{- end }}
   {{- if .Values.scheduler.service.annotations }}
   annotations: {{ toYaml .Values.scheduler.service.annotations | nindent 4 }}
@@ -31,4 +32,6 @@ spec:
       protocol: TCP
   selector:
     app.kubernetes.io/component: hami-scheduler
+    hami.io/scheduler-role: leader
     {{- include "hami-vgpu.selectorLabels" . | nindent 4 }}
+{{- end }}
diff --git a/packages/system/hami/charts/hami/templates/scheduler/serviceaccount.yaml b/packages/system/hami/charts/hami/templates/scheduler/serviceaccount.yaml
index 0435c00395..929bf59ab5 100644
--- a/packages/system/hami/charts/hami/templates/scheduler/serviceaccount.yaml
+++ b/packages/system/hami/charts/hami/templates/scheduler/serviceaccount.yaml
@@ -1,3 +1,4 @@
+{{- if not .Values.dra.enabled -}}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
@@ -14,3 +15,4 @@ metadata:
   name: {{ include "hami-vgpu.mock-device-plugin" . }}
   namespace: {{ include "hami-vgpu.namespace" . }}
 {{- end -}}
+{{- end }}
diff --git a/packages/system/hami/charts/hami/templates/scheduler/servicemonitor.yaml b/packages/system/hami/charts/hami/templates/scheduler/servicemonitor.yaml
new file mode 100644
index 0000000000..d0b59b7578
--- /dev/null
+++ b/packages/system/hami/charts/hami/templates/scheduler/servicemonitor.yaml
@@ -0,0 +1,22 @@
+{{- if and (.Capabilities.APIVersions.Has "monitoring.coreos.com/v1/ServiceMonitor") .Values.prometheus.enabled }}
+# Prometheus Service Monitor
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: {{ include "hami-vgpu.scheduler" . }}-metrics-monitor
+  namespace: {{ include "hami-vgpu.namespace" . }}
+  labels:
+    app.kubernetes.io/component: hami-scheduler
+    {{- include "hami-vgpu.labels" . | nindent 4 }}
+    {{- with .Values.global.labels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+spec:
+  selector:
+    matchLabels:
+      app.kubernetes.io/component: hami-scheduler
+      {{- include "hami-vgpu.selectorLabels" . | nindent 6 }}
+  endpoints:
+  - port: monitor
+    path: "/metrics"
+{{- end }}
diff --git a/packages/system/hami/charts/hami/templates/scheduler/webhook.yaml b/packages/system/hami/charts/hami/templates/scheduler/webhook.yaml
index db9f802997..98ab05b226 100644
--- a/packages/system/hami/charts/hami/templates/scheduler/webhook.yaml
+++ b/packages/system/hami/charts/hami/templates/scheduler/webhook.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.scheduler.admissionWebhook.enabled -}}
+{{- if and .Values.scheduler.admissionWebhook.enabled (not .Values.dra.enabled) -}}
 apiVersion: admissionregistration.k8s.io/v1
 kind: MutatingWebhookConfiguration
 metadata:
@@ -24,6 +24,10 @@ webhooks:
     matchPolicy: Equivalent
     name: vgpu.hami.io
     namespaceSelector:
+      {{- if .Values.scheduler.admissionWebhook.namespaceSelector.matchLabels }}
+      matchLabels:
+        {{- toYaml .Values.scheduler.admissionWebhook.namespaceSelector.matchLabels | nindent 8 }}
+      {{- end }}
       matchExpressions:
       - key: hami.io/webhook
         operator: NotIn
@@ -35,12 +39,22 @@ webhooks:
         values:
         {{- toYaml .Values.scheduler.admissionWebhook.whitelistNamespaces | nindent 10 }}
       {{- end }}
+      {{- if .Values.scheduler.admissionWebhook.namespaceSelector.matchExpressions }}
+      {{- toYaml .Values.scheduler.admissionWebhook.namespaceSelector.matchExpressions | nindent 6 }}
+      {{- end }}
     objectSelector:
+      {{- if .Values.scheduler.admissionWebhook.objectSelector.matchLabels }}
+      matchLabels:
+        {{- toYaml .Values.scheduler.admissionWebhook.objectSelector.matchLabels | nindent 8 }}
+      {{- end }}
       matchExpressions:
       - key: hami.io/webhook
         operator: NotIn
         values:
         - ignore
+      {{- if .Values.scheduler.admissionWebhook.objectSelector.matchExpressions }}
+      {{- toYaml .Values.scheduler.admissionWebhook.objectSelector.matchExpressions | nindent 6 }}
+      {{- end }}
     reinvocationPolicy: {{ .Values.scheduler.admissionWebhook.reinvocationPolicy }}
     rules:
       - apiGroups:
@@ -54,4 +68,4 @@ webhooks:
         scope: '*'
     sideEffects: None
     timeoutSeconds: 10
-{{- end }}
+{{- end }}
\ No newline at end of file
diff --git a/packages/system/hami/charts/hami/values.yaml b/packages/system/hami/charts/hami/values.yaml
index 01caca0b2c..712d52d5f5 100644
--- a/packages/system/hami/charts/hami/values.yaml
+++ b/packages/system/hami/charts/hami/values.yaml
@@ -9,52 +9,47 @@ global:
   ##   - myRegistryKeySecretName
   ## @param global.imagePullSecrets Global Docker image pull secrets
   imagePullSecrets: []
-  imageTag: "v2.8.1"
+  imageTag: "v2.9.0"
   gpuHookPath: /usr/local
   labels: {}
   annotations: {}
   managedNodeSelectorEnable: false
   managedNodeSelector:
     usage: "gpu"
-
 nameOverride: ""
 fullnameOverride: ""
 namespaceOverride: ""
-
 #Nvidia GPU Parameters
 resourceName: "nvidia.com/gpu"
 resourceMem: "nvidia.com/gpumem"
 resourceMemPercentage: "nvidia.com/gpumem-percentage"
 resourceCores: "nvidia.com/gpucores"
 resourcePriority: "nvidia.com/priority"
-
 #MLU Parameters
 mluResourceName: "cambricon.com/vmlu"
 mluResourceMem: "cambricon.com/mlu.smlu.vmemory"
 mluResourceCores: "cambricon.com/mlu.smlu.vcore"
-
 #Hygon DCU Parameters
 dcuResourceName: "hygon.com/dcunum"
 dcuResourceMem: "hygon.com/dcumem"
 dcuResourceCores: "hygon.com/dcucores"
-
 #Metax sGPU Parameters
 metaxResourceName: "metax-tech.com/sgpu"
 metaxResourceCore: "metax-tech.com/vcore"
 metaxResourceMem: "metax-tech.com/vmemory"
 metaxsGPUTopologyAware: "false"
-
 #Enflame VGCU Parameters
 enflameResourceNameVGCU: "enflame.com/vgcu"
 enflameResourceNameVGCUPercentage: "enflame.com/vgcu-percentage"
-
 #Kunlun XPU Parameters
 kunlunResourceName: "kunlunxin.com/xpu"
 kunlunResourceVCountName: "kunlunxin.com/vxpu"
 kunlunResourceVMemoryName: "kunlunxin.com/vxpu-memory"
-
+#Vastai Parameters
+vastaiResourceName: "vastaitech.com/va"
 schedulerName: "hami-scheduler"
-
+podSecurityPolicy:
+  enabled: false
 scheduler:
   # @param nodeName defines the node name and the nvidia-vgpu-scheduler-scheduler will schedule to the node.
   # if we install the nvidia-vgpu-scheduler-scheduler as default scheduler, we need to remove the k8s default
@@ -98,14 +93,15 @@ scheduler:
       ##
       pullSecrets: []
     resources: {}
-      # If you do want to specify resources, uncomment the following lines, adjust them as necessary.
-      # and remove the curly braces after 'resources:'.
-#      limits:
-#        cpu: 1000m
-#        memory: 1000Mi
-#      requests:
-#        cpu: 100m
-#        memory: 100Mi
+    # If you do want to specify resources, uncomment the following lines, adjust them as necessary.
+    # and remove the curly braces after 'resources:'.
+
+    #      limits:
+    #        cpu: 1000m
+    #        memory: 1000Mi
+    #      requests:
+    #        cpu: 100m
+    #        memory: 100Mi
     extraNewArgs:
       - --config=/config/config.yaml
       - -v=4
@@ -135,14 +131,15 @@ scheduler:
       ##
       pullSecrets: []
     resources: {}
-      # If you do want to specify resources, uncomment the following lines, adjust them as necessary,
-      # and remove the curly braces after 'resources:'.
-#      limits:
-#        cpu: 1000m
-#        memory: 1000Mi
-#      requests:
-#        cpu: 100m
-#        memory: 100Mi
+    # If you do want to specify resources, uncomment the following lines, adjust them as necessary,
+    # and remove the curly braces after 'resources:'.
+
+    #      limits:
+    #        cpu: 1000m
+    #        memory: 1000Mi
+    #      requests:
+    #        cpu: 100m
+    #        memory: 100Mi
     extraArgs:
       - --debug
       - -v=4
@@ -163,9 +160,34 @@ scheduler:
       path: /webhook
     whitelistNamespaces:
     # Specify the namespaces that the webhook will not be applied to.
-      # - default
-      # - kube-system
-      # - istio-system
+    # - default
+    # - kube-system
+    # - istio-system
+    # namespaceSelector controls which namespaces the webhook will be applied to.
+    # The default matchExpressions exclude namespaces with label "hami.io/webhook: ignore".
+    # You can add additional matchLabels or matchExpressions to further filter namespaces.
+    namespaceSelector:
+      matchLabels:
+      # app.kubernetes.io/part-of: kubeflow-profile
+      matchExpressions: []
+      # Example: exclude namespaces with specific labels
+      # - key: environment
+      #   operator: In
+      #   values:
+      #   - development
+      #   - staging
+    # objectSelector controls which pods the webhook will be applied to.
+    # The default matchExpressions exclude pods with label "hami.io/webhook: ignore".
+    # You can add additional matchLabels or matchExpressions to further filter pods.
+    objectSelector:
+      # matchLabels:
+      #   app.kubernetes.io/managed-by: hami
+      matchExpressions: []
+      # Example: only apply to pods with specific labels
+      # - key: hami.io/enable
+      #   operator: In
+      #   values:
+      #   - "true"
     reinvocationPolicy: Never
     failurePolicy: Ignore
   ## TLS Certificate Option 1: Use cert-manager to generate self-signed certificate.
@@ -202,7 +224,7 @@ scheduler:
     ## @param image.tag scheduler extender image tag (immutable tags are recommended)
     ## @param image.pullPolicy scheduler extender image pull policy
     ## @param image.pullSecrets Specify docker-registry secret names as an array
-    imageNew: 
+    imageNew:
       registry: "docker.io"
       repository: "liangjw/kube-webhook-certgen"
       tag: "v1.1.1"
@@ -224,15 +246,14 @@ scheduler:
     tolerations: []
     runAsUser: 2000
   service:
-    type: NodePort  # Default type is NodePort, can be changed to ClusterIP
-    httpPort: 443   # HTTP port
-    schedulerPort: 31998  # NodePort for HTTP
-    monitorPort: 31993    # Monitoring port
+    type: NodePort # Default type is NodePort, can be changed to ClusterIP
+    httpPort: 443 # HTTP port
+    schedulerPort: 31998 # NodePort for HTTP
+    monitorPort: 31993 # Monitoring port
     monitorTargetPort: 9395
     httpTargetPort: 443
     labels: {}
     annotations: {}
-
 devicePlugin:
   enabled: true
   gpuOperatorToolkitReady:
@@ -287,18 +308,22 @@ devicePlugin:
       - -v=4
     extraEnvs: {}
     resources: {}
-      # If you do want to specify resources, uncomment the following lines, adjust them as necessary.
-      # and remove the curly braces after 'resources:'.
-#      limits:
-#        cpu: 1000m
-#        memory: 1000Mi
-#      requests:
-#        cpu: 100m
-#        memory: 100Mi
+    # If you do want to specify resources, uncomment the following lines, adjust them as necessary.
+    # and remove the curly braces after 'resources:'.
+  #      limits:
+  #        cpu: 1000m
+  #        memory: 1000Mi
+  #      requests:
+  #        cpu: 100m
+  #        memory: 100Mi
 
   deviceSplitCount: 10
   deviceMemoryScaling: 1
   deviceCoreScaling: 1
+  # Pre-configured device memory in MB for GPUs that don't support memory query (e.g., unified memory architecture GPUs like NVIDIA GB10/DGX Spark).
+  # Set to 0 to use auto-detection (default). For unified memory GPUs, set to the total GPU memory (e.g., 131072 for 128GB).
+  # Can be overridden per-node via nodeConfiguration.config.
+  preConfiguredDeviceMemory: 0
   # Node configuration for device plugin, Priority: externalConfigName > config > default config
   nodeConfiguration:
     # If you want to use a custom config.json, you can set the content here.
@@ -311,11 +336,13 @@ devicePlugin:
             "operatingmode": "hami-core",
             "devicememoryscaling": 1,
             "devicesplitcount": 10,
+            "preconfigureddevicememory": 0,
             "migstrategy": "none",
             "filterdevices": {
               "uuid": [],
               "index": []
-            }
+            },
+            "enablegetpreferredallocation": false
           }
         ]
       }
@@ -335,35 +362,27 @@ devicePlugin:
   gdrcopyEnabled: null
   gdsEnabled: null
   mofedEnabled: null
-
   extraArgs:
     - -v=4
   extraEnvs: {}
   service:
-    type: NodePort  # Default type is NodePort, can be changed to ClusterIP
+    type: NodePort # Default type is NodePort, can be changed to ClusterIP
     httpPort: 31992
     labels: {}
     annotations: {}
-
   pluginPath: /var/lib/kubelet/device-plugins
   libPath: /usr/local/vgpu
-
   podAnnotations: {}
   nvidiaNodeSelector:
     gpu: "on"
   tolerations: []
-  # The updateStrategy for DevicePlugin DaemonSet.
-  # If you want to update the DaemonSet by manual, set type as "OnDelete".
-  # We recommend use OnDelete update strategy because DevicePlugin pod restart will cause business pod restart, this behavior is destructive.
-  # Otherwise, you can use RollingUpdate update strategy to rolling update DevicePlugin pod.
   updateStrategy:
     type: RollingUpdate
     rollingUpdate:
       maxUnavailable: 1
-
   resources: {}
-    # If you do want to specify resources, uncomment the following lines, adjust them as necessary.
-    # and remove the curly braces after 'resources:'.
+  # If you do want to specify resources, uncomment the following lines, adjust them as necessary.
+  # and remove the curly braces after 'resources:'.
 #    limits:
 #       cpu: 1000m
 #       memory: 1000Mi
@@ -389,6 +408,9 @@ mockDevicePlugin:
     ##   - myRegistryKeySecretName
     ##
     pullSecrets: []
+# If this option is enabled, the DRA will be installed and the scheduler extender will not be installed.
+dra:
+  enabled: false
 devices:
   amd:
     customresources:
@@ -414,6 +436,10 @@ devices:
     enabled: true
     customresources:
       - mthreads.com/vgpu
+  vastai:
+    enabled: true
+    customresources:
+      - vastaitech.com/va
   nvidia:
     gpuCorePolicy: default
     libCudaLogLevel: 1
@@ -425,19 +451,30 @@ devices:
     nodeSelector:
       ascend: "on"
     tolerations: []
+    runtimeClassName: "" # Name of the runtime class to set the Pod .spec.runtimeClassName utilizing Ascend NPU
+    hamiVnpuCore: false # When true, all nodes will enable soft-partitioning based on hami-vnpu-core (node-level annotation takes higher priority)
     customresources:
       - huawei.com/Ascend910A
       - huawei.com/Ascend910A-memory
+      - huawei.com/Ascend910A-core
       - huawei.com/Ascend910B2
       - huawei.com/Ascend910B2-memory
+      - huawei.com/Ascend910B2-core
       - huawei.com/Ascend910B3
       - huawei.com/Ascend910B3-memory
+      - huawei.com/Ascend910B3-core
       - huawei.com/Ascend910B4
       - huawei.com/Ascend910B4-memory
+      - huawei.com/Ascend910B4-core
       - huawei.com/Ascend910B4-1
       - huawei.com/Ascend910B4-1-memory
+      - huawei.com/Ascend910B4-1-core
       - huawei.com/Ascend310P
       - huawei.com/Ascend310P-memory
+      - huawei.com/Ascend310P-core
+      - huawei.com/Ascend910C
+      - huawei.com/Ascend910C-memory
+      - huawei.com/Ascend910C-core
   iluvatar:
     enabled: false
     customresources:
@@ -453,3 +490,6 @@ devices:
       - iluvatar.ai/MR-V50-vgpu
       - iluvatar.ai/MR-V50.vCore
       - iluvatar.ai/MR-V50.vMem
+legacyMetrics: false
+prometheus:
+  enabled: false
diff --git a/packages/system/hami/tests/hami_test.yaml b/packages/system/hami/tests/hami_test.yaml
new file mode 100644
index 0000000000..9fea9f043c
--- /dev/null
+++ b/packages/system/hami/tests/hami_test.yaml
@@ -0,0 +1,37 @@
+suite: cozy-hami chart rendering invariants
+release:
+  name: hami
+  namespace: cozy-hami
+tests:
+  - it: pins the HAMi device-plugin image
+    template: charts/hami/templates/device-plugin/daemonsetnvidia.yaml
+    documentSelector:
+      path: kind
+      value: DaemonSet
+    asserts:
+      - matchRegex:
+          path: spec.template.spec.containers[0].image
+          pattern: 'projecthami/hami:v2\.9\.0'
+
+  # Guards the cozystack indent->nindent patch on the monitor Service labels
+  # block: with custom labels set, they must render as proper map entries.
+  - it: renders device-plugin monitor Service custom labels (nindent patch)
+    template: charts/hami/templates/device-plugin/monitorservice.yaml
+    set:
+      hami.devicePlugin.service.labels:
+        team: cozystack
+    asserts:
+      - equal:
+          path: metadata.labels.team
+          value: cozystack
+
+  # Same nindent patch on the scheduler Service (shares the upstream defect).
+  - it: renders scheduler Service custom labels (nindent patch)
+    template: charts/hami/templates/scheduler/service.yaml
+    set:
+      hami.scheduler.service.labels:
+        team: cozystack
+    asserts:
+      - equal:
+          path: metadata.labels.team
+          value: cozystack
diff --git a/packages/system/hami/values.yaml b/packages/system/hami/values.yaml
index 76e8d6317b..8a8b87e8fa 100644
--- a/packages/system/hami/values.yaml
+++ b/packages/system/hami/values.yaml
@@ -8,7 +8,7 @@ hami:
     runtimeClassName: nvidia
     updateStrategy:
       type: RollingUpdate
-    # See https://github.com/Project-HAMi/HAMi/blob/v2.8.1/deployments/charts/hami/values.yaml
+    # See https://github.com/Project-HAMi/HAMi/blob/v2.9.0/deployments/charts/hami/values.yaml
     # Each entry: {"name": "node-name", "operatingmode": "hami-core", "devicesplitcount": N, ...}
     nodeConfiguration:
       config: |
diff --git a/packages/system/harbor-rd/cozyrds/harbor.yaml b/packages/system/harbor-rd/cozyrds/harbor.yaml
index 1c5ceba1d8..32913a0441 100644
--- a/packages/system/harbor-rd/cozyrds/harbor.yaml
+++ b/packages/system/harbor-rd/cozyrds/harbor.yaml
@@ -8,7 +8,7 @@ spec:
     singular: harbor
     plural: harbors
     openAPISchema: |-
-      {"title":"Chart Values","type":"object","properties":{"host":{"description":"Hostname for external access to Harbor (defaults to 'harbor' subdomain for the tenant host).","type":"string","default":""},"storageClass":{"description":"StorageClass used to store the data.","type":"string","default":"","x-kubernetes-validations":[{"rule":"self == oldSelf","message":"storageClass is immutable"}]},"core":{"description":"Core API server configuration.","type":"object","default":{},"properties":{"resources":{"description":"Explicit CPU and memory configuration. When omitted, the preset defined in `resourcesPreset` is applied.","type":"object","default":{},"properties":{"cpu":{"description":"Number of CPU cores allocated.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Amount of memory allocated.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}},"resourcesPreset":{"description":"Default sizing preset used when `resources` is omitted.","type":"string","default":"t1.small","enum":["t1.nano","t1.micro","t1.small","t1.medium","t1.large","t1.xlarge","t1.2xlarge","t1.4xlarge","c1.nano","c1.micro","c1.small","c1.medium","c1.large","c1.xlarge","c1.2xlarge","c1.4xlarge","s1.nano","s1.micro","s1.small","s1.medium","s1.large","s1.xlarge","s1.2xlarge","s1.4xlarge","u1.nano","u1.micro","u1.small","u1.medium","u1.large","u1.xlarge","u1.2xlarge","u1.4xlarge","m1.nano","m1.micro","m1.small","m1.medium","m1.large","m1.xlarge","m1.2xlarge","m1.4xlarge","nano","micro","small","medium","large","xlarge","2xlarge"]}}},"registry":{"description":"Container image registry configuration.","type":"object","default":{},"properties":{"resources":{"description":"Explicit CPU and memory configuration. When omitted, the preset defined in `resourcesPreset` is applied.","type":"object","default":{},"properties":{"cpu":{"description":"Number of CPU cores allocated.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Amount of memory allocated.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}},"resourcesPreset":{"description":"Default sizing preset used when `resources` is omitted.","type":"string","default":"t1.small","enum":["t1.nano","t1.micro","t1.small","t1.medium","t1.large","t1.xlarge","t1.2xlarge","t1.4xlarge","c1.nano","c1.micro","c1.small","c1.medium","c1.large","c1.xlarge","c1.2xlarge","c1.4xlarge","s1.nano","s1.micro","s1.small","s1.medium","s1.large","s1.xlarge","s1.2xlarge","s1.4xlarge","u1.nano","u1.micro","u1.small","u1.medium","u1.large","u1.xlarge","u1.2xlarge","u1.4xlarge","m1.nano","m1.micro","m1.small","m1.medium","m1.large","m1.xlarge","m1.2xlarge","m1.4xlarge","nano","micro","small","medium","large","xlarge","2xlarge"]}}},"jobservice":{"description":"Background job service configuration.","type":"object","default":{},"properties":{"resources":{"description":"Explicit CPU and memory configuration. When omitted, the preset defined in `resourcesPreset` is applied.","type":"object","default":{},"properties":{"cpu":{"description":"Number of CPU cores allocated.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Amount of memory allocated.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}},"resourcesPreset":{"description":"Default sizing preset used when `resources` is omitted.","type":"string","default":"t1.nano","enum":["t1.nano","t1.micro","t1.small","t1.medium","t1.large","t1.xlarge","t1.2xlarge","t1.4xlarge","c1.nano","c1.micro","c1.small","c1.medium","c1.large","c1.xlarge","c1.2xlarge","c1.4xlarge","s1.nano","s1.micro","s1.small","s1.medium","s1.large","s1.xlarge","s1.2xlarge","s1.4xlarge","u1.nano","u1.micro","u1.small","u1.medium","u1.large","u1.xlarge","u1.2xlarge","u1.4xlarge","m1.nano","m1.micro","m1.small","m1.medium","m1.large","m1.xlarge","m1.2xlarge","m1.4xlarge","nano","micro","small","medium","large","xlarge","2xlarge"]}}},"trivy":{"description":"Trivy vulnerability scanner configuration.","type":"object","default":{},"required":["enabled","size"],"properties":{"enabled":{"description":"Enable or disable the vulnerability scanner.","type":"boolean","default":true},"resources":{"description":"Explicit CPU and memory configuration. When omitted, the preset defined in `resourcesPreset` is applied.","type":"object","default":{},"properties":{"cpu":{"description":"Number of CPU cores allocated.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Amount of memory allocated.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}},"resourcesPreset":{"description":"Default sizing preset used when `resources` is omitted.","type":"string","default":"t1.nano","enum":["t1.nano","t1.micro","t1.small","t1.medium","t1.large","t1.xlarge","t1.2xlarge","t1.4xlarge","c1.nano","c1.micro","c1.small","c1.medium","c1.large","c1.xlarge","c1.2xlarge","c1.4xlarge","s1.nano","s1.micro","s1.small","s1.medium","s1.large","s1.xlarge","s1.2xlarge","s1.4xlarge","u1.nano","u1.micro","u1.small","u1.medium","u1.large","u1.xlarge","u1.2xlarge","u1.4xlarge","m1.nano","m1.micro","m1.small","m1.medium","m1.large","m1.xlarge","m1.2xlarge","m1.4xlarge","nano","micro","small","medium","large","xlarge","2xlarge"]},"size":{"description":"Persistent Volume size for vulnerability database cache.","default":"5Gi","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}},"database":{"description":"PostgreSQL database configuration.","type":"object","default":{},"required":["replicas","size"],"properties":{"replicas":{"description":"Number of database instances.","type":"integer","default":2},"size":{"description":"Persistent Volume size for database storage.","default":"5Gi","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}},"redis":{"description":"Redis cache configuration.","type":"object","default":{},"required":["replicas","size"],"properties":{"replicas":{"description":"Number of Redis replicas.","type":"integer","default":2},"size":{"description":"Persistent Volume size for cache storage.","default":"1Gi","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}}}}
+      {"title":"Chart Values","type":"object","properties":{"host":{"description":"Hostname for external access to Harbor (defaults to 'harbor' subdomain for the tenant host).","type":"string","default":""},"managementWhitelist":{"description":"IP addresses or CIDR ranges allowed to reach the Harbor web portal and API. `/v2/` and `/service/token`, which `docker login`, image pulls and pushes use, are not restricted by this list. For the portal and API it replaces the tenant ingress `whitelist` rather than narrowing it, and it is matched against the client address the ingress controller sees, which is a proxy or a forwarded header rather than the real client when something in front of the controller rewrites it. Empty allows every address. Requires Ingress publishing; rejected when the tenant publishes through Gateway API.","type":"array","default":[],"items":{"type":"string"}},"storageClass":{"description":"StorageClass used to store the data.","type":"string","default":"","x-kubernetes-validations":[{"rule":"self == oldSelf","message":"storageClass is immutable"}],"x-cozystack-options":{"source":"storageclass"}},"core":{"description":"Core API server configuration.","type":"object","default":{},"properties":{"resources":{"description":"Explicit CPU and memory configuration. When omitted, the preset defined in `resourcesPreset` is applied.","type":"object","default":{},"properties":{"cpu":{"description":"Number of CPU cores allocated.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Amount of memory allocated.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}},"resourcesPreset":{"description":"Default sizing preset used when `resources` is omitted.","type":"string","default":"t1.small","enum":["t1.nano","t1.micro","t1.small","t1.medium","t1.large","t1.xlarge","t1.2xlarge","t1.4xlarge","c1.nano","c1.micro","c1.small","c1.medium","c1.large","c1.xlarge","c1.2xlarge","c1.4xlarge","s1.nano","s1.micro","s1.small","s1.medium","s1.large","s1.xlarge","s1.2xlarge","s1.4xlarge","u1.nano","u1.micro","u1.small","u1.medium","u1.large","u1.xlarge","u1.2xlarge","u1.4xlarge","m1.nano","m1.micro","m1.small","m1.medium","m1.large","m1.xlarge","m1.2xlarge","m1.4xlarge","nano","micro","small","medium","large","xlarge","2xlarge"]}}},"registry":{"description":"Container image registry configuration.","type":"object","default":{},"properties":{"resources":{"description":"Explicit CPU and memory configuration. When omitted, the preset defined in `resourcesPreset` is applied.","type":"object","default":{},"properties":{"cpu":{"description":"Number of CPU cores allocated.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Amount of memory allocated.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}},"resourcesPreset":{"description":"Default sizing preset used when `resources` is omitted.","type":"string","default":"t1.small","enum":["t1.nano","t1.micro","t1.small","t1.medium","t1.large","t1.xlarge","t1.2xlarge","t1.4xlarge","c1.nano","c1.micro","c1.small","c1.medium","c1.large","c1.xlarge","c1.2xlarge","c1.4xlarge","s1.nano","s1.micro","s1.small","s1.medium","s1.large","s1.xlarge","s1.2xlarge","s1.4xlarge","u1.nano","u1.micro","u1.small","u1.medium","u1.large","u1.xlarge","u1.2xlarge","u1.4xlarge","m1.nano","m1.micro","m1.small","m1.medium","m1.large","m1.xlarge","m1.2xlarge","m1.4xlarge","nano","micro","small","medium","large","xlarge","2xlarge"]}}},"jobservice":{"description":"Background job service configuration.","type":"object","default":{},"properties":{"resources":{"description":"Explicit CPU and memory configuration. When omitted, the preset defined in `resourcesPreset` is applied.","type":"object","default":{},"properties":{"cpu":{"description":"Number of CPU cores allocated.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Amount of memory allocated.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}},"resourcesPreset":{"description":"Default sizing preset used when `resources` is omitted.","type":"string","default":"t1.nano","enum":["t1.nano","t1.micro","t1.small","t1.medium","t1.large","t1.xlarge","t1.2xlarge","t1.4xlarge","c1.nano","c1.micro","c1.small","c1.medium","c1.large","c1.xlarge","c1.2xlarge","c1.4xlarge","s1.nano","s1.micro","s1.small","s1.medium","s1.large","s1.xlarge","s1.2xlarge","s1.4xlarge","u1.nano","u1.micro","u1.small","u1.medium","u1.large","u1.xlarge","u1.2xlarge","u1.4xlarge","m1.nano","m1.micro","m1.small","m1.medium","m1.large","m1.xlarge","m1.2xlarge","m1.4xlarge","nano","micro","small","medium","large","xlarge","2xlarge"]}}},"trivy":{"description":"Trivy vulnerability scanner configuration.","type":"object","default":{},"required":["enabled","size"],"properties":{"enabled":{"description":"Enable or disable the vulnerability scanner.","type":"boolean","default":true},"resources":{"description":"Explicit CPU and memory configuration. When omitted, the preset defined in `resourcesPreset` is applied.","type":"object","default":{},"properties":{"cpu":{"description":"Number of CPU cores allocated.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Amount of memory allocated.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}},"resourcesPreset":{"description":"Default sizing preset used when `resources` is omitted.","type":"string","default":"t1.nano","enum":["t1.nano","t1.micro","t1.small","t1.medium","t1.large","t1.xlarge","t1.2xlarge","t1.4xlarge","c1.nano","c1.micro","c1.small","c1.medium","c1.large","c1.xlarge","c1.2xlarge","c1.4xlarge","s1.nano","s1.micro","s1.small","s1.medium","s1.large","s1.xlarge","s1.2xlarge","s1.4xlarge","u1.nano","u1.micro","u1.small","u1.medium","u1.large","u1.xlarge","u1.2xlarge","u1.4xlarge","m1.nano","m1.micro","m1.small","m1.medium","m1.large","m1.xlarge","m1.2xlarge","m1.4xlarge","nano","micro","small","medium","large","xlarge","2xlarge"]},"size":{"description":"Persistent Volume size for vulnerability database cache.","default":"5Gi","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}},"database":{"description":"PostgreSQL database configuration.","type":"object","default":{},"required":["replicas","size"],"properties":{"replicas":{"description":"Number of database instances.","type":"integer","default":2},"size":{"description":"Persistent Volume size for database storage.","default":"5Gi","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}},"redis":{"description":"Redis cache configuration.","type":"object","default":{},"required":["replicas","size"],"properties":{"replicas":{"description":"Number of Redis replicas.","type":"integer","default":2},"size":{"description":"Persistent Volume size for cache storage.","default":"1Gi","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}}}}
   release:
     prefix: "harbor-"
     labels:
@@ -27,21 +27,22 @@ spec:
       - registry
       - container
     icon: "<svg xmlns="http://www.w3.org/2000/svg" role="img" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="1.05 -1.95 359.41 361.66"><defs><linearGradient id="linear-gradient" x1="264.79" x2="267.27" y1="952.39" y2="952.39" gradientTransform="matrix(30.43 0 0 -30.43 -7955.22 29285.75)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#60b932"/><stop offset=".28" stop-color="#60b932"/><stop offset="1" stop-color="#367c34"/></linearGradient><linearGradient id="linear-gradient-2" x1="263.77" x2="266.26" y1="955.65" y2="955.65" gradientTransform="matrix(27.21 0 0 -27.21 -7073.85 26169.41)" xlink:href="#linear-gradient"/><linearGradient id="linear-gradient-3" x1="263.28" x2="265.76" y1="953.74" y2="953.74" gradientTransform="matrix(25.75 0 0 -25.75 -6671.13 24812.23)" xlink:href="#linear-gradient"/><linearGradient id="linear-gradient-4" x1="263.77" x2="266.25" y1="953.2" y2="953.2" gradientTransform="matrix(27.1 0 0 -27.1 -7040.9 26102.49)" xlink:href="#linear-gradient"/><linearGradient id="linear-gradient-5" x1="262.73" x2="265.21" y1="954.34" y2="954.34" gradientTransform="matrix(24.4 0 0 -24.4 -6301.36 23521.97)" xlink:href="#linear-gradient"/><linearGradient id="linear-gradient-6" x1="272.14" x2="274.62" y1="955.15" y2="955.15" gradientTransform="scale(66.09 -66.09) rotate(36.52 1588.153 68.148)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#4596d8"/><stop offset=".2" stop-color="#4596d8"/><stop offset="1" stop-color="#fff"/></linearGradient><linearGradient id="linear-gradient-7" x1="270.65" x2="273.13" y1="952.38" y2="952.38" gradientTransform="scale(77.8 -77.8) rotate(-11.54 -4587.209 1803.323)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#4194d7"/><stop offset=".2" stop-color="#4194d7"/><stop offset="1" stop-color="#fff"/></linearGradient><linearGradient id="linear-gradient-8" x1="270.97" x2="273.45" y1="953.75" y2="953.75" gradientTransform="scale(71.35 -71.35) rotate(10.23 5477.37 -1024.602)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#4194d7"/><stop offset=".33" stop-color="#4496d8"/><stop offset="1" stop-color="#fff"/></linearGradient><clipPath id="clip-path"><path d="M174.4 302.52l-68.65-30.26-3.83 43.21 75.5 23.98-3.02-36.93z" class="cls-1"/></clipPath><clipPath id="clip-path-2"><path d="M119.19 135.38h38.55v32.89h-9.15v-14a10.13 10.13 0 1 0-20.26 0v14h-9.15zm-7.7 72l57.2 25.21-3.94-48.24h7.49v-16.08h-5.55v-32.89h5.55v-9.45l-30.86-30.19v-2.12a2.91 2.91 0 0 0-5.82 0v2.12l-30.86 30.19v9.45h5.56v32.89h-5.56v16.12h8.82z" class="cls-1"/></clipPath><clipPath id="clip-path-3"><path d="M108.14 245.28l63.88 28.16-.96-11.73-61.96-27.3-.96 10.87z" class="cls-1"/></clipPath><clipPath id="clip-path-4"><path d="M106.46 264.21l67.23 29.63-.96-11.72-65.31-28.78-.96 10.87z" class="cls-1"/></clipPath><clipPath id="clip-path-5"><path d="M110.77 215.48l-.96 10.87 60.54 26.68-.95-11.72-58.63-25.83z" class="cls-1"/></clipPath><clipPath id="clip-path-6"><path d="M313.13 67.59a175.31 175.31 0 0 0-29.75-28.13c-1.57-1.17-3.18-2.3-4.79-3.42L256 59.5l-82.34 85.63 113.41-58.68 29.07-15c-1.01-1.31-1.98-2.62-3.01-3.86z" class="cls-1"/></clipPath><clipPath id="clip-path-7"><path d="M353.59 177.61c0-2-.14-4-.22-5.93l-32.21-2.31-147.47-10.58L318.36 209l30.41 10.55c.09-.36.19-.71.28-1.08a173.65 173.65 0 0 0 4.57-39.47v-1.37z" class="cls-1"/></clipPath><clipPath id="clip-path-8"><path d="M348.84 138.61a172.55 172.55 0 0 0-13.84-37.7l-30.94 9.94L175.92 152l142-4.83 32.5-1.11c-.5-2.48-.99-4.98-1.58-7.45z" class="cls-1"/></clipPath><style>.cls-1{fill:none}.cls-13{fill:#696566}</style></defs><g id="g12"><path id="path14" fill="#fff" d="M30.89 179a148.87 148.87 0 1 1 148.87 148.85A148.87 148.87 0 0 1 30.89 179"/><g id="g30" clip-path="url(#clip-path)"><g id="g32"><path id="path46" fill="url(#linear-gradient)" d="M174.4 302.52l-68.65-30.25-3.82 43.2 75.5 24-3-36.93"/></g></g><g id="g48" clip-path="url(#clip-path-2)"><g id="g50"><path id="path64" fill="url(#linear-gradient-2)" d="M119.19 135.38h38.55v32.89h-9.15v-14a10.13 10.13 0 1 0-20.26 0v14h-9.15zm-7.7 72l57.2 25.21-3.94-48.24h7.49v-16.08h-5.55v-32.89h5.55v-9.45l-30.86-30.19v-2.12a2.91 2.91 0 0 0-5.82 0v2.12l-30.86 30.19v9.45h5.56v32.89h-5.56v16.12h8.82l-2 23"/></g></g><g id="g66" clip-path="url(#clip-path-3)"><g id="g68"><path id="path82" fill="url(#linear-gradient-3)" d="M108.13 245.28L172 273.44l-1-11.72-62-27.31-1 10.87"/></g></g><g id="g84" clip-path="url(#clip-path-4)"><g id="g86"><path id="path100" fill="url(#linear-gradient-4)" d="M106.46 264.21l67.23 29.63-1-11.72-65.31-28.78-1 10.87"/></g></g><g id="g102" clip-path="url(#clip-path-5)"><g id="g104"><path id="path118" fill="url(#linear-gradient-5)" d="M110.77 215.48l-1 10.88L170.35 253l-1-11.72-58.62-25.83"/></g></g><path id="path120" d="M304.07 110.85l30.93-9.94c-.11-.22-.21-.45-.32-.66a174.41 174.41 0 0 0-18.55-28.83l-29.07 15a142.71 142.71 0 0 1 16.73 23.87c.1.17.18.35.27.53" class="cls-13"/><path id="path122" d="M321.15 169.37l32.21 2.31a172.86 172.86 0 0 0-3-25.59l-32.5 1.11a141 141 0 0 1 3.25 22.17" class="cls-13"/><path id="path124" d="M182 320.81c-78.2 0-141.83-63.62-141.83-141.82S103.82 37.16 182 37.16a140.93 140.93 0 0 1 76.3 22.34L280.85 36A172.86 172.86 0 0 0 182 5.11C86.15 5.11 8.15 83.11 8.15 179s78 173.85 173.85 173.85c81.9 0 150.69-57 169-133.32L320.62 209c-13.8 63.84-70.69 111.83-138.6 111.83" class="cls-13"/><g id="g126" clip-path="url(#clip-path-6)"><g id="g128"><path id="path142" fill="url(#linear-gradient-6)" d="M313.13 67.59a175.31 175.31 0 0 0-29.75-28.13c-1.57-1.17-3.18-2.3-4.79-3.42L256 59.5l-82.34 85.63 113.41-58.68 29.07-15c-1-1.27-2-2.58-3-3.82"/></g></g><g id="g144" clip-path="url(#clip-path-7)"><g id="g146"><path id="path160" fill="url(#linear-gradient-7)" d="M353.59 177.61c0-2-.14-4-.22-5.93l-32.21-2.31-147.47-10.58L318.36 209l30.41 10.55c.09-.36.19-.71.28-1.08a173.65 173.65 0 0 0 4.57-39.47v-1.37"/></g></g><g id="g162" clip-path="url(#clip-path-8)"><g id="g164"><path id="path178" fill="url(#linear-gradient-8)" d="M348.84 138.61a172.55 172.55 0 0 0-13.84-37.7l-30.94 9.94L175.92 152l142-4.83 32.5-1.11c-.48-2.51-1-5-1.56-7.48"/></g></g></g></svg>"
-    keysOrder: [["apiVersion"], ["appVersion"], ["kind"], ["metadata"], ["metadata", "name"], ["spec", "host"], ["spec", "storageClass"], ["spec", "core"], ["spec", "core", "resources"], ["spec", "core", "resourcesPreset"], ["spec", "registry"], ["spec", "registry", "resources"], ["spec", "registry", "resourcesPreset"], ["spec", "jobservice"], ["spec", "jobservice", "resources"], ["spec", "jobservice", "resourcesPreset"], ["spec", "trivy"], ["spec", "trivy", "enabled"], ["spec", "trivy", "size"], ["spec", "trivy", "resources"], ["spec", "trivy", "resourcesPreset"], ["spec", "database"], ["spec", "database", "size"], ["spec", "database", "replicas"], ["spec", "redis"], ["spec", "redis", "size"], ["spec", "redis", "replicas"]]
+    keysOrder: [["apiVersion"], ["appVersion"], ["kind"], ["metadata"], ["metadata", "name"], ["spec", "host"], ["spec", "managementWhitelist"], ["spec", "storageClass"], ["spec", "core"], ["spec", "core", "resources"], ["spec", "core", "resourcesPreset"], ["spec", "registry"], ["spec", "registry", "resources"], ["spec", "registry", "resourcesPreset"], ["spec", "jobservice"], ["spec", "jobservice", "resources"], ["spec", "jobservice", "resourcesPreset"], ["spec", "trivy"], ["spec", "trivy", "enabled"], ["spec", "trivy", "size"], ["spec", "trivy", "resources"], ["spec", "trivy", "resourcesPreset"], ["spec", "database"], ["spec", "database", "size"], ["spec", "database", "replicas"], ["spec", "redis"], ["spec", "redis", "size"], ["spec", "redis", "replicas"]]
   secrets:
     exclude: []
     include:
       - resourceNames:
-          - "{{ .name }}-credentials"
+          - "harbor-{{ .name }}-credentials"
       - matchLabels:
           apps.cozystack.io/user-secret: "true"
   services:
     exclude: []
     include:
       - resourceNames:
-          - "{{ .name }}"
+          - "harbor-{{ .name }}"
   ingresses:
     exclude: []
     include:
       - resourceNames:
-          - "{{ .name }}-ingress"
+          - "harbor-{{ .name }}-ingress"
+          - "harbor-{{ .name }}-registry-ingress"
diff --git a/packages/system/harbor/Makefile b/packages/system/harbor/Makefile
index be643f650e..ce8d9a03ec 100644
--- a/packages/system/harbor/Makefile
+++ b/packages/system/harbor/Makefile
@@ -1,8 +1,26 @@
+HARBOR_VERSION = $(shell awk -F= '$$1 == "ARG VERSION" {print $$2; exit}' images/harbor/Dockerfile)
+HARBOR_COMMIT = $(shell awk -F= '$$1 == "ARG COMMIT" {print $$2; exit}' images/harbor/Dockerfile)
+# The chart release that ships HARBOR_VERSION; bump both together.
+HARBOR_CHART_VERSION = 1.19.1
+
 export NAME=harbor-system
 export NAMESPACE=cozy-system
 
+include ../../../hack/common-envs.mk
 include ../../../hack/package.mk
 
+HARBOR_IMAGES = harbor-core harbor-jobservice harbor-portal harbor-registryctl harbor-exporter registry-photon nginx-photon trivy-adapter-photon
+harbor-core_KEY = .harbor.core.image
+harbor-jobservice_KEY = .harbor.jobservice.image
+harbor-portal_KEY = .harbor.portal.image
+harbor-registryctl_KEY = .harbor.registry.controller.image
+harbor-exporter_KEY = .harbor.exporter.image
+registry-photon_KEY = .harbor.registry.registry.image
+nginx-photon_KEY = .harbor.nginx.image
+trivy-adapter-photon_KEY = .harbor.trivy.image
+
+.PHONY: test update image
+
 test:
 	helm unittest .
 
@@ -10,4 +28,24 @@ update:
 	rm -rf charts
 	helm repo add harbor https://helm.goharbor.io
 	helm repo update harbor
-	helm pull harbor/harbor --untar --untardir charts
+	helm pull harbor/harbor --version $(HARBOR_CHART_VERSION) --untar --untardir charts
+	# values.yaml pins images built from HARBOR_VERSION, so a chart for another
+	# Harbor release would silently run on mismatched images.
+	test "v$$(yq e '.appVersion' charts/harbor/Chart.yaml)" = "$(HARBOR_VERSION)"
+
+# Sequential on purpose: every image stamps the same values.yaml with yq -i.
+image:
+	$(foreach name,$(HARBOR_IMAGES),$(call build-harbor-image,$(name)))
+
+define build-harbor-image
+	docker buildx build $(if $(filter harbor-portal,$(1)),images/harbor-portal,images/harbor --target $(1)) \
+		--build-arg VERSION=$(HARBOR_VERSION) --build-arg COMMIT=$(HARBOR_COMMIT) \
+		$(call image-tags,$(1),$(HARBOR_VERSION)) \
+		$(call cache-args,$(1)) \
+		--metadata-file images/$(1).json \
+		$(BUILDX_ARGS)
+	REPOSITORY="$(REGISTRY)/$(1)" TAG="$(IMAGE_TAG)@$$(yq e '."containerimage.digest"' images/$(1).json -o json -r)" \
+		yq -i '$($(1)_KEY).repository = strenv(REPOSITORY) | $($(1)_KEY).tag = strenv(TAG)' values.yaml
+	rm -f images/$(1).json
+
+endef
diff --git a/packages/system/harbor/charts/harbor/Chart.yaml b/packages/system/harbor/charts/harbor/Chart.yaml
index e30a1b58c2..3396403567 100644
--- a/packages/system/harbor/charts/harbor/Chart.yaml
+++ b/packages/system/harbor/charts/harbor/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
-appVersion: 2.14.2
+appVersion: 2.15.1
 description: An open source trusted cloud native registry that stores, signs, and
   scans content
 home: https://goharbor.io
@@ -19,4 +19,4 @@ name: harbor
 sources:
 - https://github.com/goharbor/harbor
 - https://github.com/goharbor/harbor-helm
-version: 1.18.2
+version: 1.19.1
diff --git a/packages/system/harbor/charts/harbor/README.md b/packages/system/harbor/charts/harbor/README.md
index 658150d6c2..3e35b1dbbf 100644
--- a/packages/system/harbor/charts/harbor/README.md
+++ b/packages/system/harbor/charts/harbor/README.md
@@ -78,355 +78,8 @@ helm uninstall my-release
 
 The following table lists the configurable parameters of the Harbor chart and the default values.
 
-
-| Parameter                                                            | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        | Default                              |
-|----------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------|
-| **Expose**                                                           |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |                                      |
-| `expose.type`                                                        | How to expose the service: `ingress`, `clusterIP`, `nodePort`, `loadBalancer` or `route`  other values will be ignored and the creation of service will be skipped.                                                                                                                                                                                                                                                                                                                                                                                                | `ingress`                            |
-| `expose.tls.enabled`                                                 | Enable TLS or not. Delete the `ssl-redirect` annotations in `expose.ingress.annotations` when TLS is disabled and `expose.type` is `ingress`. Note: if the `expose.type` is `ingress` and TLS is disabled, the port must be included in the command when pulling/pushing images. Refer to https://github.com/goharbor/harbor/issues/5291 for details.                                                                                                                                                                                                              | `true`                               |
-| `expose.tls.certSource`                                              | The source of the TLS certificate. Set as `auto`, `secret` or `none` and fill the information in the corresponding section: 1) auto: generate the TLS certificate automatically 2) secret: read the TLS certificate from the specified secret. The TLS certificate can be generated manually or by cert manager 3) none: configure no TLS certificate for the ingress. If the default TLS certificate is configured in the ingress controller, choose this option                                                                                                  | `auto`                               |
-| `expose.tls.auto.commonName`                                         | The common name used to generate the certificate, it's necessary when the type isn't `ingress`                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |                                      |
-| `expose.tls.secret.secretName`                                       | The name of secret which contains keys named: `tls.crt` - the certificate; `tls.key` - the private key                                                                                                                                                                                                                                                                                                                                                                                                                                                             |                                      |
-| `expose.ingress.hosts.core`                                          | The host of Harbor core service in ingress rule                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    | `core.harbor.domain`                 |
-| `expose.ingress.controller`                                          | The ingress controller type. Currently supports `default`, `gce`, `alb`, `f5-bigip` and `ncp`                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | `default`                            |
-| `expose.ingress.kubeVersionOverride`                                 | Allows the ability to override the kubernetes version used while templating the ingress                                                                                                                                                                                                                                                                                                                                                                                                                                                                            |                                      |
-| `expose.ingress.className`                                           | Specify the `ingressClassName` used to implement the Ingress (Kubernetes 1.18+)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |                                      |
-| `expose.ingress.annotations`                                         | The annotations used commonly for ingresses                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        |                                      |
-| `expose.ingress.labels`                                              | The labels specific to ingress                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | {}                                   |
-| `expose.clusterIP.name`                                              | The name of ClusterIP service                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | `harbor`                             |
-| `expose.clusterIP.annotations`                                       | The annotations attached to the ClusterIP service                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | {}                                   |
-| `expose.clusterIP.ports.httpPort`                                    | The service port Harbor listens on when serving HTTP                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | `80`                                 |
-| `expose.clusterIP.ports.httpsPort`                                   | The service port Harbor listens on when serving HTTPS                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              | `443`                                |
-| `expose.clusterIP.annotations`                                       | The annotations used commonly for clusterIP                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        |                                      |
-| `expose.clusterIP.labels`                                            | The labels specific to clusterIP                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   | {}                                   |
-| `expose.nodePort.name`                                               | The name of NodePort service                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       | `harbor`                             |
-| `expose.nodePort.ports.http.port`                                    | The service port Harbor listens on when serving HTTP                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | `80`                                 |
-| `expose.nodePort.ports.http.nodePort`                                | The node port Harbor listens on when serving HTTP                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | `30002`                              |
-| `expose.nodePort.ports.https.port`                                   | The service port Harbor listens on when serving HTTPS                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              | `443`                                |
-| `expose.nodePort.ports.https.nodePort`                               | The node port Harbor listens on when serving HTTPS                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | `30003`                              |
-| `expose.nodePort.annotations`                                        | The annotations used commonly for nodePort                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         |                                      |
-| `expose.nodePort.labels`                                             | The labels specific to nodePort                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    | {}                                   |
-| `expose.loadBalancer.name`                                           | The name of service                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | `harbor`                             |
-| `expose.loadBalancer.IP`                                             | The IP of the loadBalancer. It only works when loadBalancer supports assigning IP                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | `""`                                 |
-| `expose.loadBalancer.ports.httpPort`                                 | The service port Harbor listens on when serving HTTP                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | `80`                                 |
-| `expose.loadBalancer.ports.httpsPort`                                | The service port Harbor listens on when serving HTTPS                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              | `30002`                              |
-| `expose.loadBalancer.annotations`                                    | The annotations attached to the loadBalancer service                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | {}                                   |
-| `expose.loadBalancer.labels`                                         | The labels specific to loadBalancer                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | {}                                   |
-| `expose.loadBalancer.sourceRanges`                                   | List of IP address ranges to assign to loadBalancerSourceRanges                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    | []                                   |
-| `expose.route.labels`                                                | The labels to attach to the HTTPRoute                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              | `{}`                                 |
-| `expose.route.annotations`                                           | The annotations to attach to the HTTPRoute                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | `{}`                                 |
-| `expose.route.hosts`                                                 | The hosts that the HTTPRoute will request to the Gateway                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | `[]`                                 |
-| `expose.route.parentRefs`                                            | The Gateways to attach to the HTTPRoute                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | `{}`                                 |
-| **Internal TLS**                                                     |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |                                      |
-| `internalTLS.enabled`                                                | Enable TLS for the components (core, jobservice, portal, registry, trivy)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | `false`                              |
-| `internalTLS.strong_ssl_ciphers`                                     | Enable strong ssl ciphers for nginx and portal                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | `false`                              |
-| `internalTLS.certSource`                                             | Method to provide TLS for the components, options are `auto`, `manual`, `secret`.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | `auto`                               |
-| `internalTLS.trustCa`                                                | The content of trust CA, only available when `certSource` is `manual`. **Note**: all the internal certificates of the components must be issued by this CA                                                                                                                                                                                                                                                                                                                                                                                                         |                                      |
-| `internalTLS.core.secretName`                                        | The secret name for core component, only available when `certSource` is `secret`. The secret must contain keys named: `ca.crt` - the CA certificate which is used to issue internal key and crt pair for components and all Harbor components must be issued by the same CA, `tls.crt` - the content of the TLS cert file, `tls.key` - the content of the TLS key file.                                                                                                                                                                                            |                                      |
-| `internalTLS.core.crt`                                               | Content of core's TLS cert file, only available when `certSource` is `manual`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |                                      |
-| `internalTLS.core.key`                                               | Content of core's TLS key file, only available when `certSource` is `manual`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       |                                      |
-| `internalTLS.jobservice.secretName`                                  | The secret name for jobservice component, only available when `certSource` is `secret`. The secret must contain keys named: `ca.crt` - the CA certificate which is used to issue internal key and crt pair for components and all Harbor components must be issued by the same CA, `tls.crt` - the content of the TLS cert file, `tls.key` - the content of the TLS key file.                                                                                                                                                                                      |                                      |
-| `internalTLS.jobservice.crt`                                         | Content of jobservice's TLS cert file, only available when `certSource` is `manual`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |                                      |
-| `internalTLS.jobservice.key`                                         | Content of jobservice's TLS key file, only available when `certSource` is `manual`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 |                                      |
-| `internalTLS.registry.secretName`                                    | The secret name for registry component, only available when `certSource` is `secret`. The secret must contain keys named: `ca.crt` - the CA certificate which is used to issue internal key and crt pair for components and all Harbor components must be issued by the same CA, `tls.crt` - the content of the TLS cert file, `tls.key` - the content of the TLS key file.                                                                                                                                                                                        |                                      |
-| `internalTLS.registry.crt`                                           | Content of registry's TLS cert file, only available when `certSource` is `manual`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  |                                      |
-| `internalTLS.registry.key`                                           | Content of registry's TLS key file, only available when `certSource` is `manual`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   |                                      |
-| `internalTLS.portal.secretName`                                      | The secret name for portal component, only available when `certSource` is `secret`. The secret must contain keys named: `ca.crt` - the CA certificate which is used to issue internal key and crt pair for components and all Harbor components must be issued by the same CA, `tls.crt` - the content of the TLS cert file, `tls.key` - the content of the TLS key file.                                                                                                                                                                                          |                                      |
-| `internalTLS.portal.crt`                                             | Content of portal's TLS cert file, only available when `certSource` is `manual`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |                                      |
-| `internalTLS.portal.key`                                             | Content of portal's TLS key file, only available when `certSource` is `manual`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |                                      |
-| `internalTLS.trivy.secretName`                                       | The secret name for trivy component, only available when `certSource` is `secret`. The secret must contain keys named: `ca.crt` - the CA certificate which is used to issue internal key and crt pair for components and all Harbor components must be issued by the same CA, `tls.crt` - the content of the TLS cert file, `tls.key` - the content of the TLS key file.                                                                                                                                                                                           |                                      |
-| `internalTLS.trivy.crt`                                              | Content of trivy's TLS cert file, only available when `certSource` is `manual`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |                                      |
-| `internalTLS.trivy.key`                                              | Content of trivy's TLS key file, only available when `certSource` is `manual`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |                                      |
-| **IPFamily**                                                         |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |                                      |
-| `ipFamily.ipv4.enabled`                                              | if cluster is ipv4 enabled, all ipv4 related configs will set correspondingly, but currently it only affects the nginx related components                                                                                                                                                                                                                                                                                                                                                                                                                          | `true`                               |
-| `ipFamily.ipv6.enabled`                                              | if cluster is ipv6 enabled, all ipv6 related configs will set correspondingly, but currently it only affects the nginx related components                                                                                                                                                                                                                                                                                                                                                                                                                          | `true`                               |
-| `ipFamily.policy`                                                    | Sets the IP family policy for services to be able to configure dual-stack; see [Configure dual-stack](https://kubernetes.io/docs/concepts/services-networking/dual-stack/#services).                                                                                                                                                                                                                                                                                                                                                                               | `""`                                 |
-| `ipFamily.families`                                                  | A list of IP families for services that should be supported, in the order in which they should be applied. Can be "IPv4" and/or "IPv6".                                                                                                                                                                                                                                                                                                                                                                                                                            | []                                   |
-| **Persistence**                                                      |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |                                      |
-| `persistence.enabled`                                                | Enable the data persistence or not                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | `true`                               |
-| `persistence.resourcePolicy`                                         | Setting it to `keep` to avoid removing PVCs during a helm delete operation. Leaving it empty will delete PVCs after the chart deleted. Does not affect PVCs created for internal database and redis components.                                                                                                                                                                                                                                                                                                                                                    | `keep`                               |
-| `persistence.persistentVolumeClaim.registry.existingClaim`           | Use the existing PVC which must be created manually before bound, and specify the `subPath` if the PVC is shared with other components                                                                                                                                                                                                                                                                                                                                                                                                                             |                                      |
-| `persistence.persistentVolumeClaim.registry.storageClass`            | Specify the `storageClass` used to provision the volume. Or the default StorageClass will be used (the default). Set it to `-` to disable dynamic provisioning                                                                                                                                                                                                                                                                                                                                                                                                     |                                      |
-| `persistence.persistentVolumeClaim.registry.subPath`                 | The sub path used in the volume                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |                                      |
-| `persistence.persistentVolumeClaim.registry.accessMode`              | The access mode of the volume                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | `ReadWriteOnce`                      |
-| `persistence.persistentVolumeClaim.registry.size`                    | The size of the volume                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | `5Gi`                                |
-| `persistence.persistentVolumeClaim.registry.annotations`             | The annotations of the volume                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |                                      |
-| `persistence.persistentVolumeClaim.jobservice.jobLog.existingClaim`  | Use the existing PVC which must be created manually before bound, and specify the `subPath` if the PVC is shared with other components.                                                                                                                                                                                                                                                                                                                                                                                                                            |                                      |
-| `persistence.persistentVolumeClaim.jobservice.jobLog.storageClass`   | Specify the `storageClass` used to provision the volume. Or the default StorageClass will be used (the default). Set it to `-` to disable dynamic provisioning                                                                                                                                                                                                                                                                                                                                                                                                     |                                      |
-| `persistence.persistentVolumeClaim.jobservice.jobLog.subPath`        | The sub path used in the volume                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |                                      |
-| `persistence.persistentVolumeClaim.jobservice.jobLog.accessMode`     | The access mode of the volume                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | `ReadWriteOnce`                      |
-| `persistence.persistentVolumeClaim.jobservice.jobLog.size`           | The size of the volume                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | `1Gi`                                |
-| `persistence.persistentVolumeClaim.jobservice.jobLog.annotations`    | The annotations of the volume                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |                                      |
-| `persistence.persistentVolumeClaim.database.existingClaim`           | Use the existing PVC which must be created manually before bound, and specify the `subPath` if the PVC is shared with other components. If external database is used, the setting will be ignored                                                                                                                                                                                                                                                                                                                                                                  |                                      |
-| `persistence.persistentVolumeClaim.database.storageClass`            | Specify the `storageClass` used to provision the volume. Or the default StorageClass will be used (the default). Set it to `-` to disable dynamic provisioning. If external database is used, the setting will be ignored                                                                                                                                                                                                                                                                                                                                          |                                      |
-| `persistence.persistentVolumeClaim.database.subPath`                 | The sub path used in the volume. If external database is used, the setting will be ignored                                                                                                                                                                                                                                                                                                                                                                                                                                                                         |                                      |
-| `persistence.persistentVolumeClaim.database.accessMode`              | The access mode of the volume. If external database is used, the setting will be ignored                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | `ReadWriteOnce`                      |
-| `persistence.persistentVolumeClaim.database.size`                    | The size of the volume. If external database is used, the setting will be ignored                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | `1Gi`                                |
-| `persistence.persistentVolumeClaim.database.annotations`             | The annotations of the volume                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |                                      |
-| `persistence.persistentVolumeClaim.redis.existingClaim`              | Use the existing PVC which must be created manually before bound, and specify the `subPath` if the PVC is shared with other components. If external Redis is used, the setting will be ignored                                                                                                                                                                                                                                                                                                                                                                     |                                      |
-| `persistence.persistentVolumeClaim.redis.storageClass`               | Specify the `storageClass` used to provision the volume. Or the default StorageClass will be used (the default). Set it to `-` to disable dynamic provisioning. If external Redis is used, the setting will be ignored                                                                                                                                                                                                                                                                                                                                             |                                      |
-| `persistence.persistentVolumeClaim.redis.subPath`                    | The sub path used in the volume. If external Redis is used, the setting will be ignored                                                                                                                                                                                                                                                                                                                                                                                                                                                                            |                                      |
-| `persistence.persistentVolumeClaim.redis.accessMode`                 | The access mode of the volume. If external Redis is used, the setting will be ignored                                                                                                                                                                                                                                                                                                                                                                                                                                                                              | `ReadWriteOnce`                      |
-| `persistence.persistentVolumeClaim.redis.size`                       | The size of the volume. If external Redis is used, the setting will be ignored                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | `1Gi`                                |
-| `persistence.persistentVolumeClaim.redis.annotations`                | The annotations of the volume                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |                                      |
-| `persistence.persistentVolumeClaim.trivy.existingClaim`              | Use the existing PVC which must be created manually before bound, and specify the `subPath` if the PVC is shared with other components                                                                                                                                                                                                                                                                                                                                                                                                                             |                                      |
-| `persistence.persistentVolumeClaim.trivy.storageClass`               | Specify the `storageClass` used to provision the volume. Or the default StorageClass will be used (the default). Set it to `-` to disable dynamic provisioning                                                                                                                                                                                                                                                                                                                                                                                                     |                                      |
-| `persistence.persistentVolumeClaim.trivy.subPath`                    | The sub path used in the volume                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |                                      |
-| `persistence.persistentVolumeClaim.trivy.accessMode`                 | The access mode of the volume                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | `ReadWriteOnce`                      |
-| `persistence.persistentVolumeClaim.trivy.size`                       | The size of the volume                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | `1Gi`                                |
-| `persistence.persistentVolumeClaim.trivy.annotations`                | The annotations of the volume                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |                                      |
-| `persistence.imageChartStorage.disableredirect`                      | The configuration for managing redirects from content backends. For backends which not supported it (such as using minio for `s3` storage type), please set it to `true` to disable redirects. Refer to the [guide](https://github.com/docker/distribution/blob/master/docs/configuration.md#redirect) for more details                                                                                                                                                                                                                                            | `false`                              |
-| `persistence.imageChartStorage.caBundleSecretName`                   | Specify the `caBundleSecretName` if the storage service uses a self-signed certificate. The secret must contain keys named `ca.crt` which will be injected into the trust store of registry's and containers.                                                                                                                                                                                                                                                                                                                                                      |                                      |
-| `persistence.imageChartStorage.type`                                 | The type of storage for images and charts: `filesystem`, `azure`, `gcs`, `s3`, `swift` or `oss`. The type must be `filesystem` if you want to use persistent volumes for registry. Refer to the [guide](https://github.com/docker/distribution/blob/master/docs/configuration.md#storage) for more details                                                                                                                                                                                                                                                         | `filesystem`                         |
-| `persistence.imageChartStorage.gcs.existingSecret`                   | An existing secret containing the gcs service account json key. The key must be gcs-key.json.                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | `""`                                 |
-| `persistence.imageChartStorage.gcs.useWorkloadIdentity`              | A boolean to allow the use of workloadidentity in a GKE cluster. To use it, create a kubernetes service account and set the name in the key `serviceAccountName` of each component, then allow automounting the service account.                                                                                                                                                                                                                                                                                                                                   | `false`                              |
-| **General**                                                          |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |                                      |
-| `externalURL`                                                        | The external URL for Harbor core service                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | `https://core.harbor.domain`         |
-| `caBundleSecretName`                                                 | The custom CA bundle secret name, the secret must contain key named "ca.crt" which will be injected into the trust store for core, jobservice, registry, trivy components.                                                                                                                                                                                                                                                                                                                                                                                         |                                      |
-| `uaaSecretName`                                                      | If using external UAA auth which has a self signed cert, you can provide a pre-created secret containing it under the key `ca.crt`.                                                                                                                                                                                                                                                                                                                                                                                                                                |                                      |
-| `imagePullPolicy`                                                    | The image pull policy                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              |                                      |
-| `imagePullSecrets`                                                   | The imagePullSecrets names for all deployments                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |                                      |
-| `updateStrategy.type`                                                | The update strategy for deployments with persistent volumes(jobservice, registry): `RollingUpdate` or `Recreate`. Set it as `Recreate` when `RWM` for volumes isn't supported                                                                                                                                                                                                                                                                                                                                                                                      | `RollingUpdate`                      |
-| `logLevel`                                                           | The log level: `debug`, `info`, `warning`, `error` or `fatal`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | `info`                               |
-| `harborAdminPassword`                                                | The initial password of Harbor admin. Change it from portal after launching Harbor                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | `Harbor12345`                        |
-| `existingSecretAdminPassword`                                        | The name of secret where admin password can be found.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              |                                      |
-| `existingSecretAdminPasswordKey`                                     | The name of the key in the secret where to find harbor admin password Harbor                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       | `HARBOR_ADMIN_PASSWORD`              |
-| `caSecretName`                                                       | The name of the secret which contains key named `ca.crt`. Setting this enables the download link on portal to download the CA certificate when the certificate isn't generated automatically                                                                                                                                                                                                                                                                                                                                                                       |                                      |
-| `secretKey`                                                          | The key used for encryption. Must be a string of 16 chars                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | `not-a-secure-key`                   |
-| `existingSecretSecretKey`                                            | An existing secret containing the encoding secretKey                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | `""`                                 |
-| `proxy.httpProxy`                                                    | The URL of the HTTP proxy server                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   |                                      |
-| `proxy.httpsProxy`                                                   | The URL of the HTTPS proxy server                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  |                                      |
-| `proxy.noProxy`                                                      | The URLs that the proxy settings not apply to                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | 127.0.0.1,localhost,.local,.internal |
-| `proxy.components`                                                   | The component list that the proxy settings apply to                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | core, jobservice, trivy              |
-| `enableMigrateHelmHook`                                              | Run the migration job via helm hook, if it is true, the database migration will be separated from harbor-core, run with a preupgrade job migration-job                                                                                                                                                                                                                                                                                                                                                                                                             | `false`                              |
-| **Nginx** (if service exposed via `ingress`, Nginx will not be used) |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |                                      |
-| `nginx.image.repository`                                             | Image repository                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   | `goharbor/nginx-photon`              |
-| `nginx.image.tag`                                                    | Image tag                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | `dev`                                |
-| `nginx.replicas`                                                     | The replica count                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | `1`                                  |
-| `nginx.revisionHistoryLimit`                                         | The revision history limit                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | `10`                                 |
-| `nginx.resources`                                                    | The [resources] to allocate for container                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | undefined                            |
-| `nginx.automountServiceAccountToken`                                 | Mount serviceAccountToken?                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | `false`                              |
-| `nginx.nodeSelector`                                                 | Node labels for pod assignment                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | `{}`                                 |
-| `nginx.tolerations`                                                  | Tolerations for pod assignment                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | `[]`                                 |
-| `nginx.affinity`                                                     | Node/Pod affinities                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | `{}`                                 |
-| `nginx.topologySpreadConstraints`                                    | Constraints that define how Pods are spread across failure-domains like regions or availability zones                                                                                                                                                                                                                                                                                                                                                                                                                                                              | `[]`                                 |
-| `nginx.podAnnotations`                                               | Annotations to add to the nginx pod                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | `{}`                                 |
-| `nginx.priorityClassName`                                            | The priority class to run the pod as                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               |                                      |
-| **Portal**                                                           |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |                                      |
-| `portal.image.repository`                                            | Repository for portal image                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        | `goharbor/harbor-portal`             |
-| `portal.image.tag`                                                   | Tag for portal image                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | `dev`                                |
-| `portal.replicas`                                                    | The replica count                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | `1`                                  |
-| `portal.revisionHistoryLimit`                                        | The revision history limit                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | `10`                                 |
-| `portal.resources`                                                   | The [resources] to allocate for container                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | undefined                            |
-| `portal.automountServiceAccountToken`                                | Mount serviceAccountToken?                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | `false`                              |
-| `portal.nodeSelector`                                                | Node labels for pod assignment                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | `{}`                                 |
-| `portal.tolerations`                                                 | Tolerations for pod assignment                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | `[]`                                 |
-| `portal.affinity`                                                    | Node/Pod affinities                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | `{}`                                 |
-| `portal.topologySpreadConstraints`                                   | Constraints that define how Pods are spread across failure-domains like regions or availability zones                                                                                                                                                                                                                                                                                                                                                                                                                                                              | `[]`                                 |
-| `portal.podAnnotations`                                              | Annotations to add to the portal pod                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | `{}`                                 |
-| `portal.serviceAnnotations`                                          | Annotations to add to the portal service                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | `{}`                                 |
-| `portal.priorityClassName`                                           | The priority class to run the pod as                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               |                                      |
-| `portal.initContainers`                                              | Init containers to be run before the controller's container starts.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | `[]`                                 |
-| **Core**                                                             |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |                                      |
-| `core.image.repository`                                              | Repository for Harbor core image                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   | `goharbor/harbor-core`               |
-| `core.image.tag`                                                     | Tag for Harbor core image                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | `dev`                                |
-| `core.replicas`                                                      | The replica count                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | `1`                                  |
-| `core.revisionHistoryLimit`                                          | The revision history limit                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | `10`                                 |
-| `core.startupProbe.initialDelaySeconds`                              | The initial delay in seconds for the startup probe                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | `10`                                 |
-| `core.resources`                                                     | The [resources] to allocate for container                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | undefined                            |
-| `core.automountServiceAccountToken`                                  | Mount serviceAccountToken?                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | `false`                              |
-| `core.nodeSelector`                                                  | Node labels for pod assignment                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | `{}`                                 |
-| `core.tolerations`                                                   | Tolerations for pod assignment                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | `[]`                                 |
-| `core.affinity`                                                      | Node/Pod affinities                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | `{}`                                 |
-| `core.topologySpreadConstraints`                                     | Constraints that define how Pods are spread across failure-domains like regions or availability zones                                                                                                                                                                                                                                                                                                                                                                                                                                                              | `[]`                                 |
-| `core.podAnnotations`                                                | Annotations to add to the core pod                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | `{}`                                 |
-| `core.serviceAnnotations`                                            | Annotations to add to the core service                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | `{}`                                 |
-| `core.configureUserSettings`                                         | A JSON string to set in the environment variable `CONFIG_OVERWRITE_JSON` to configure user settings. See the [official docs](https://goharbor.io/docs/latest/install-config/configure-user-settings-cli/#configure-users-settings-using-an-environment-variable).                                                                                                                                                                                                                                                                                                  |                                      |
-| `core.quotaUpdateProvider`                                           | The provider for updating project quota(usage), there are 2 options, redis or db. By default it is implemented by db but you can configure it to redis which can improve the performance of high concurrent pushing to the same project, and reduce the database connections spike and occupies. Using redis will bring up some delay for quota usage updation for display, so only suggest switch provider to redis if you were ran into the db connections spike around the scenario of high concurrent pushing to same project, no improvment for other scenes. | `db`                                 |
-| `core.secret`                                                        | Secret is used when core server communicates with other components. If a secret key is not specified, Helm will generate one. Must be a string of 16 chars.                                                                                                                                                                                                                                                                                                                                                                                                        |                                      |
-| `core.secretName`                                                    | Fill the name of a kubernetes secret if you want to use your own TLS certificate and private key for token encryption/decryption. The secret must contain keys named: `tls.crt` - the certificate and `tls.key` - the private key. The default key pair will be used if it isn't set                                                                                                                                                                                                                                                                               |                                      |
-| `core.tokenKey`                                                      | PEM-formatted RSA private key used to sign service tokens.  Only used if `core.secretName` is unset. If set, `core.tokenCert` MUST also be set.                                                                                                                                                                                                                                                                                                                                                                                                                    |                                      |
-| `core.tokenCert`                                                     | PEM-formatted certificate signed by `core.tokenKey` used to validate service tokens.  Only used if `core.secretName` is unset. If set, `core.tokenKey` MUST also be set.                                                                                                                                                                                                                                                                                                                                                                                           |                                      |
-| `core.xsrfKey`                                                       | The XSRF key. Will be generated automatically if it isn't specified                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |                                      |
-| `core.priorityClassName`                                             | The priority class to run the pod as                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               |                                      |
-| `core.artifactPullAsyncFlushDuration`                                | The time duration for async update artifact pull_time and repository pull_count                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |                                      |
-| `core.gdpr.deleteUser`                                               | Enable GDPR compliant user delete                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | `false`                              |
-| `core.gdpr.auditLogsCompliant`                                       | Enable GDPR compliant for audit logs by changing username to its CRC32 value if that user was deleted from the system                                                                                                                                                                                                                                                                                                                                                                                                                                              | `false`                              |
-| `core.initContainers`                                                | Init containers to be run before the controller's container starts.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | `[]`                                 |
-| **Jobservice**                                                       |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |                                      |
-| `jobservice.image.repository`                                        | Repository for jobservice image                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    | `goharbor/harbor-jobservice`         |
-| `jobservice.image.tag`                                               | Tag for jobservice image                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | `dev`                                |
-| `jobservice.replicas`                                                | The replica count                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | `1`                                  |
-| `jobservice.revisionHistoryLimit`                                    | The revision history limit                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | `10`                                 |
-| `jobservice.maxJobWorkers`                                           | The max job workers                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | `10`                                 |
-| `jobservice.jobLoggers`                                              | The loggers for jobs: `file`, `database` or `stdout`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | `[file]`                             |
-| `jobservice.loggerSweeperDuration`                                   | The jobLogger sweeper duration in days (ignored if `jobLoggers` is set to `stdout`)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | `14`                                 |
-| `jobservice.notification.webhook_job_max_retry`                      | The maximum retry of webhook sending notifications                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | `3`                                  |
-| `jobservice.notification.webhook_job_http_client_timeout`            | The http client timeout value of webhook sending notifications                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | `3`                                  |
-| `jobservice.reaper.max_update_hours`                                 | the max time to wait for a task to finish, if unfinished after max_update_hours, the task will be mark as error, but the task will continue to run, default value is 24                                                                                                                                                                                                                                                                                                                                                                                            | `24`                                 |
-| `jobservice.reaper.max_dangling_hours`                               | the max time for execution in running state without new task created                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | `168`                                |
-| `jobservice.resources`                                               | The [resources] to allocate for container                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | undefined                            |
-| `jobservice.automountServiceAccountToken`                            | Mount serviceAccountToken?                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | `false`                              |
-| `jobservice.nodeSelector`                                            | Node labels for pod assignment                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | `{}`                                 |
-| `jobservice.tolerations`                                             | Tolerations for pod assignment                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | `[]`                                 |
-| `jobservice.affinity`                                                | Node/Pod affinities                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | `{}`                                 |
-| `jobservice.topologySpreadConstraints`                               | Constraints that define how Pods are spread across failure-domains like regions or availability zones                                                                                                                                                                                                                                                                                                                                                                                                                                                              | `[]`                                 |
-| `jobservice.podAnnotations`                                          | Annotations to add to the jobservice pod                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | `{}`                                 |
-| `jobservice.priorityClassName`                                       | The priority class to run the pod as                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               |                                      |
-| `jobservice.secret`                                                  | Secret is used when job service communicates with other components. If a secret key is not specified, Helm will generate one. Must be a string of 16 chars.                                                                                                                                                                                                                                                                                                                                                                                                        |                                      |
-| `jobservice.initContainers`                                          | Init containers to be run before the controller's container starts.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | `[]`                                 |
-| **Registry**                                                         |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |                                      |
-| `registry.registry.image.repository`                                 | Repository for registry image                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | `goharbor/registry-photon`           |
-| `registry.registry.image.tag`                                        | Tag for registry image                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | `dev`                                |
-| `registry.registry.resources`                                        | The [resources] to allocate for container                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | undefined                            |
-| `registry.controller.image.repository`                               | Repository for registry controller image                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | `goharbor/harbor-registryctl`        |
-| `registry.controller.image.tag`                                      | Tag for registry controller image                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | `dev`                                |
-| `registry.controller.resources`                                      | The [resources] to allocate for container                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | undefined                            |
-| `registry.replicas`                                                  | The replica count                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | `1`                                  |
-| `registry.revisionHistoryLimit`                                      | The revision history limit                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | `10`                                 |
-| `registry.nodeSelector`                                              | Node labels for pod assignment                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | `{}`                                 |
-| `registry.automountServiceAccountToken`                              | Mount serviceAccountToken?                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | `false`                              |
-| `registry.tolerations`                                               | Tolerations for pod assignment                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | `[]`                                 |
-| `registry.affinity`                                                  | Node/Pod affinities                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | `{}`                                 |
-| `registry.topologySpreadConstraints`                                 | Constraints that define how Pods are spread across failure-domains like regions or availability zones                                                                                                                                                                                                                                                                                                                                                                                                                                                              | `[]`                                 |
-| `registry.middleware`                                                | Middleware is used to add support for a CDN between backend storage and `docker pull` recipient. See [official docs](https://github.com/docker/distribution/blob/master/docs/configuration.md#middleware).                                                                                                                                                                                                                                                                                                                                                         |                                      |
-| `registry.podAnnotations`                                            | Annotations to add to the registry pod                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | `{}`                                 |
-| `registry.priorityClassName`                                         | The priority class to run the pod as                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               |                                      |
-| `registry.secret`                                                    | Secret is used to secure the upload state from client and registry storage backend. See [official docs](https://github.com/docker/distribution/blob/master/docs/configuration.md#http). If a secret key is not specified, Helm will generate one. Must be a string of 16 chars.                                                                                                                                                                                                                                                                                    |                                      |
-| `registry.credentials.username`                                      | The username that harbor core uses internally to access the registry instance.  Together with the `registry.credentials.password`, a htpasswd  is created. This is an alternative to providing `registry.credentials.htpasswdString`. For more details see [official docs](https://github.com/docker/distribution/blob/master/docs/configuration.md#htpasswd).                                                                                                                                                                                                     | `harbor_registry_user`               |
-| `registry.credentials.password`                                      | The password that harbor core uses internally to access the registry instance. Together with the `registry.credentials.username`, a htpasswd  is created. This is an alternative to providing `registry.credentials.htpasswdString`. For more details see [official docs](https://github.com/docker/distribution/blob/master/docs/configuration.md#htpasswd). It is suggested you update this value before installation.                                                                                                                                           | `harbor_registry_password`           |
-| `registry.credentials.existingSecret`                                | An existing secret containing the password for accessing the registry instance, which is hosted by htpasswd auth mode. More details see [official docs](https://github.com/docker/distribution/blob/master/docs/configuration.md#htpasswd). The key must be `REGISTRY_PASSWD`                                                                                                                                                                                                                                                                                      | `""`                                 |
-| `registry.credentials.htpasswdString`                                | Login and password in htpasswd string format. Excludes `registry.credentials.username`  and `registry.credentials.password`. May come in handy when integrating with tools like argocd or flux. This allows the same line to be generated each time the template is rendered, instead of the `htpasswd` function from helm, which generates different lines each time because of the salt.                                                                                                                                                                         | undefined                            |
-| `registry.relativeurls`                                              | If true, the registry returns relative URLs in Location headers. The client is responsible for resolving the correct URL. Needed if harbor is behind a reverse proxy                                                                                                                                                                                                                                                                                                                                                                                               | `false`                              |
-| `registry.upload_purging.enabled`                                    | If true, enable purge _upload directories                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | `true`                               |
-| `registry.upload_purging.age`                                        | Remove files in _upload directories which exist for a period of time, default is one week.                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | `168h`                               |
-| `registry.upload_purging.interval`                                   | The interval of the purge operations                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | `24h`                                |
-| `registry.upload_purging.dryrun`                                     | If true, enable dryrun for purging _upload, default false                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | `false`                              |
-| `registry.initContainers`                                            | Init containers to be run before the controller's container starts.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | `[]`                                 |
-| **[Trivy][trivy]**                                                   |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |                                      |
-| `trivy.enabled`                                                      | The flag to enable Trivy scanner                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   | `true`                               |
-| `trivy.image.repository`                                             | Repository for Trivy adapter image                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | `goharbor/trivy-adapter-photon`      |
-| `trivy.image.tag`                                                    | Tag for Trivy adapter image                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        | `dev`                                |
-| `trivy.resources`                                                    | The [resources] to allocate for Trivy adapter container                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            |                                      |
-| `trivy.automountServiceAccountToken`                                 | Mount serviceAccountToken?                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | `false`                              |
-| `trivy.replicas`                                                     | The number of Pod replicas                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | `1`                                  |
-| `trivy.debugMode`                                                    | The flag to enable Trivy debug mode                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | `false`                              |
-| `trivy.vulnType`                                                     | Comma-separated list of vulnerability types. Possible values `os` and `library`.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   | `os,library`                         |
-| `trivy.severity`                                                     | Comma-separated list of severities to be checked                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   | `UNKNOWN,LOW,MEDIUM,HIGH,CRITICAL`   |
-| `trivy.ignoreUnfixed`                                                | The flag to display only fixed vulnerabilities                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | `false`                              |
-| `trivy.insecure`                                                     | The flag to skip verifying registry certificate                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    | `false`                              |
-| `trivy.skipUpdate`                                                   | The flag to disable [Trivy DB][trivy-db] downloads from GitHub                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | `false`                              |
-| `trivy.skipJavaDBUpdate`                                             | If the flag is enabled you have to manually download the `trivy-java.db` file [Trivy Java DB][trivy-java-db] and mount it in the `/home/scanner/.cache/trivy/java-db/trivy-java.db` path                                                                                                                                                                                                                                                                                                                                                                           | `false`                              |
-| `trivy.offlineScan`                                                  | The flag prevents Trivy from sending API requests to identify dependencies.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        | `false`                              |
-| `trivy.securityCheck`                                                | Comma-separated list of what security issues to detect.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | `vuln`                               |
-| `trivy.timeout`                                                      | The duration to wait for scan completion                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | `5m0s`                               |
-| `trivy.gitHubToken`                                                  | The GitHub access token to download [Trivy DB][trivy-db] (see [GitHub rate limiting][trivy-rate-limiting])                                                                                                                                                                                                                                                                                                                                                                                                                                                         |                                      |
-| `trivy.priorityClassName`                                            | The priority class to run the pod as                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               |                                      |
-| `trivy.topologySpreadConstraints`                                    | The priority class to run the pod as                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               |                                      |
-| `trivy.initContainers`                                               | Init containers to be run before the controller's container starts.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | `[]`                                 |
-| **Database**                                                         |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |                                      |
-| `database.type`                                                      | If external database is used, set it to `external`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | `internal`                           |
-| `database.internal.image.repository`                                 | Repository for database image                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | `goharbor/harbor-db`                 |
-| `database.internal.image.tag`                                        | Tag for database image                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | `dev`                                |
-| `database.internal.password`                                         | The password for database                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | `changeit`                           |
-| `database.internal.shmSizeLimit`                                     | The limit for the size of shared memory for internal PostgreSQL, conventionally it's around 50% of the memory limit of the container                                                                                                                                                                                                                                                                                                                                                                                                                               | `512Mi`                              |
-| `database.internal.resources`                                        | The [resources] to allocate for container                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | undefined                            |
-| `database.internal.automountServiceAccountToken`                     | Mount serviceAccountToken?                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | `false`                              |
-| `database.internal.initContainer.migrator.resources`                 | The [resources] to allocate for the database migrator initContainer                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | undefined                            |
-| `database.internal.initContainer.permissions.resources`              | The [resources] to allocate for the database permissions initContainer                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | undefined                            |
-| `database.internal.nodeSelector`                                     | Node labels for pod assignment                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | `{}`                                 |
-| `database.internal.tolerations`                                      | Tolerations for pod assignment                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | `[]`                                 |
-| `database.internal.affinity`                                         | Node/Pod affinities                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | `{}`                                 |
-| `database.internal.priorityClassName`                                | The priority class to run the pod as                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               |                                      |
-| `database.internal.livenessProbe.timeoutSeconds`                     | The timeout used in liveness probe; 1 to 5 seconds                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | 1                                    |
-| `database.internal.readinessProbe.timeoutSeconds`                    | The timeout used in readiness probe; 1 to 5 seconds                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | 1                                    |
-| `database.internal.extrInitContainers`                               | Extra init containers to be run before the database's container starts.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | `[]`                                 |
-| `database.external.host`                                             | The hostname of external database                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | `192.168.0.1`                        |
-| `database.external.port`                                             | The port of external database                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | `5432`                               |
-| `database.external.username`                                         | The username of external database                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | `user`                               |
-| `database.external.password`                                         | The password of external database                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | `password`                           |
-| `database.external.coreDatabase`                                     | The database used by core service                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | `registry`                           |
-| `database.external.existingSecret`                                   | An existing password containing the database password. the key must be `password`.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | `""`                                 |
-| `database.external.sslmode`                                          | Connection method of external database (require, verify-full, verify-ca, disable)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | `disable`                            |
-| `database.maxIdleConns`                                              | The maximum number of connections in the idle connection pool. If it <=0, no idle connections are retained.                                                                                                                                                                                                                                                                                                                                                                                                                                                        | `50`                                 |
-| `database.maxOpenConns`                                              | The maximum number of open connections to the database. If it <= 0, then there is no limit on the number of open connections.                                                                                                                                                                                                                                                                                                                                                                                                                                      | `100`                                |
-| `database.podAnnotations`                                            | Annotations to add to the database pod                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | `{}`                                 |
-| **Redis**                                                            |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |                                      |
-| `redis.type`                                                         | If external redis is used, set it to `external`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    | `internal`                           |
-| `redis.internal.image.repository`                                    | Repository for redis image                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | `goharbor/redis-photon`              |
-| `redis.internal.image.tag`                                           | Tag for redis image                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | `dev`                                |
-| `redis.internal.resources`                                           | The [resources] to allocate for container                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | undefined                            |
-| `redis.internal.automountServiceAccountToken`                        | Mount serviceAccountToken?                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | `false`                              |
-| `redis.internal.nodeSelector`                                        | Node labels for pod assignment                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | `{}`                                 |
-| `redis.internal.tolerations`                                         | Tolerations for pod assignment                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | `[]`                                 |
-| `redis.internal.affinity`                                            | Node/Pod affinities                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | `{}`                                 |
-| `redis.internal.priorityClassName`                                   | The priority class to run the pod as                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               |                                      |
-| `redis.internal.jobserviceDatabaseIndex`                             | The database index for jobservice                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | `1`                                  |
-| `redis.internal.registryDatabaseIndex`                               | The database index for registry                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    | `2`                                  |
-| `redis.internal.trivyAdapterIndex`                                   | The database index for trivy adapter                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | `5`                                  |
-| `redis.internal.harborDatabaseIndex`                                 | The database index for harbor miscellaneous business logic                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | `0`                                  |
-| `redis.internal.cacheLayerDatabaseIndex`                             | The database index for harbor cache layer                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | `0`                                  |
-| `redis.internal.initContainers`                                      | Init containers to be run before the redis's container starts.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | `[]`                                 |
-| `redis.external.addr`                                                | The addr of external Redis: <host_redis>:<port_redis>. When using sentinel, it should be <host_sentinel1>:<port_sentinel1>,<host_sentinel2>:<port_sentinel2>,<host_sentinel3>:<port_sentinel3>                                                                                                                                                                                                                                                                                                                                                                     | `192.168.0.2:6379`                   |
-| `redis.external.sentinelMasterSet`                                   | The name of the set of Redis instances to monitor                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  |                                      |
-| `redis.external.coreDatabaseIndex`                                   | The database index for core                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        | `0`                                  |
-| `redis.external.jobserviceDatabaseIndex`                             | The database index for jobservice                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | `1`                                  |
-| `redis.external.registryDatabaseIndex`                               | The database index for registry                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    | `2`                                  |
-| `redis.external.trivyAdapterIndex`                                   | The database index for trivy adapter                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | `5`                                  |
-| `redis.external.harborDatabaseIndex`                                 | The database index for harbor miscellaneous business logic                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | `0`                                  |
-| `redis.external.cacheLayerDatabaseIndex`                             | The database index for harbor cache layer                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | `0`                                  |
-| `redis.external.username`                                            | The username of external Redis                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |                                      |
-| `redis.external.password`                                            | The password of external Redis                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |                                      |
-| `redis.external.existingSecret`                                      | Use an existing secret to connect to redis. The key must be `REDIS_PASSWORD`.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | `""`                                 |
-| `redis.podAnnotations`                                               | Annotations to add to the redis pod                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | `{}`                                 |
-| **Exporter**                                                         |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |                                      |
-| `exporter.replicas`                                                  | The replica count                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | `1`                                  |
-| `exporter.revisionHistoryLimit`                                      | The revision history limit                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | `10`                                 |
-| `exporter.podAnnotations`                                            | Annotations to add to the exporter pod                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | `{}`                                 |
-| `exporter.image.repository`                                          | Repository for redis image                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | `goharbor/harbor-exporter`           |
-| `exporter.image.tag`                                                 | Tag for exporter image                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | `dev`                                |
-| `exporter.nodeSelector`                                              | Node labels for pod assignment                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | `{}`                                 |
-| `exporter.tolerations`                                               | Tolerations for pod assignment                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | `[]`                                 |
-| `exporter.affinity`                                                  | Node/Pod affinities                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | `{}`                                 |
-| `exporter.topologySpreadConstraints`                                 | Constraints that define how Pods are spread across failure-domains like regions or availability zones                                                                                                                                                                                                                                                                                                                                                                                                                                                              | `[]`                                 |
-| `exporter.automountServiceAccountToken`                              | Mount serviceAccountToken?                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | `false`                              |
-| `exporter.cacheDuration`                                             | the cache duration for information that exporter collected from Harbor                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | `30`                                 |
-| `exporter.cacheCleanInterval`                                        | cache clean interval for information that exporter collected from Harbor                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | `14400`                              |
-| `exporter.priorityClassName`                                         | The priority class to run the pod as                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               |                                      |
-| **Metrics**                                                          |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |                                      |
-| `metrics.enabled`                                                    | if enable harbor metrics                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | `false`                              |
-| `metrics.core.path`                                                  | the url path for core metrics                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | `/metrics`                           |
-| `metrics.core.port`                                                  | the port for core metrics                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | `8001`                               |
-| `metrics.registry.path`                                              | the url path for registry metrics                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | `/metrics`                           |
-| `metrics.registry.port`                                              | the port for registry metrics                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | `8001`                               |
-| `metrics.exporter.path`                                              | the url path for exporter metrics                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | `/metrics`                           |
-| `metrics.exporter.port`                                              | the port for exporter metrics                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | `8001`                               |
-| `metrics.serviceMonitor.enabled`                                     | create prometheus serviceMonitor. Requires prometheus CRD's                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        | `false`                              |
-| `metrics.serviceMonitor.additionalLabels`                            | additional labels to upsert to the manifest                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        | `""`                                 |
-| `metrics.serviceMonitor.interval`                                    | scrape period for harbor metrics                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   | `""`                                 |
-| `metrics.serviceMonitor.metricRelabelings`                           | metrics relabel to add/mod/del before ingestion                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    | `[]`                                 |
-| `metrics.serviceMonitor.relabelings`                                 | relabels to add/mod/del to sample before scrape                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    | `[]`                                 |
-| **Trace**                                                            |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |                                      |
-| `trace.enabled`                                                      | Enable tracing or not                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              | `false`                              |
-| `trace.provider`                                                     | The tracing provider: `jaeger` or `otel`. `jaeger` should be 1.26+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | `jaeger`                             |
-| `trace.sample_rate`                                                  | Set `sample_rate` to 1 if you want sampling 100% of trace data; set 0.5 if you want sampling 50% of trace data, and so forth                                                                                                                                                                                                                                                                                                                                                                                                                                       | `1`                                  |
-| `trace.namespace`                                                    | Namespace used to differentiate different harbor services                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          |                                      |
-| `trace.attributes`                                                   | `attributes` is a key value dict contains user defined attributes used to initialize trace provider                                                                                                                                                                                                                                                                                                                                                                                                                                                                |                                      |
-| `trace.jaeger.endpoint`                                              | The endpoint of jaeger                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | `http://hostname:14268/api/traces`   |
-| `trace.jaeger.username`                                              | The username of jaeger                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             |                                      |
-| `trace.jaeger.password`                                              | The password of jaeger                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             |                                      |
-| `trace.jaeger.agent_host`                                            | The agent host of jaeger                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           |                                      |
-| `trace.jaeger.agent_port`                                            | The agent port of jaeger                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | `6831`                               |
-| `trace.otel.endpoint`                                                | The endpoint of otel                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | `hostname:4318`                      |
-| `trace.otel.url_path`                                                | The URL path of otel                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | `/v1/traces`                         |
-| `trace.otel.compression`                                             | Whether enable compression or not for otel                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | `false`                              |
-| `trace.otel.insecure`                                                | Whether establish insecure connection or not for otel                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              | `true`                               |
-| `trace.otel.timeout`                                                 | The timeout in seconds of otel                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | `10`                                 |
-| **Cache**                                                            |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |                                      |
-| `cache.enabled`                                                      | Enable cache layer or not                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | `false`                              |
-| `cache.expireHours`                                                  | The expire hours of cache layer                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    | `24`                                 |
 | Parameter                                                            | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | Default                                                                  |
-|----------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------|
+| -------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------ |
 | **Expose**                                                           |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |                                                                          |
 | `expose.type`                                                        | How to expose the service: `ingress`, `clusterIP`, `nodePort` or `loadBalancer`, other values will be ignored and the creation of service will be skipped.                                                                                                                                                                                                                                                                                                                                                                          | `ingress`                                                                |
 | `expose.tls.enabled`                                                 | Enable TLS or not. Delete the `ssl-redirect` annotations in `expose.ingress.annotations` when TLS is disabled and `expose.type` is `ingress`. Note: if the `expose.type` is `ingress` and TLS is disabled, the port must be included in the command when pulling/pushing images. Refer to https://github.com/goharbor/harbor/issues/5291 for details.                                                                                                                                                                               | `true`                                                                   |
@@ -515,9 +168,9 @@ The following table lists the configurable parameters of the Harbor chart and th
 | `persistence.persistentVolumeClaim.trivy.accessMode`                 | The access mode of the volume                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       | `ReadWriteOnce`                                                          |
 | `persistence.persistentVolumeClaim.trivy.size`                       | The size of the volume                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              | `1Gi`                                                                    |
 | `persistence.persistentVolumeClaim.trivy.annotations`                | The annotations of the volume                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       |                                                                          |
-| `persistence.imageChartStorage.disableredirect`                      | The configuration for managing redirects from content backends. For backends which not supported it (such as using minio for `s3` storage type), please set it to `true` to disable redirects. Refer to the [guide](https://github.com/docker/distribution/blob/master/docs/configuration.md#redirect) for more details                                                                                                                                                                                                             | `false`                                                                  |
+| `persistence.imageChartStorage.disableredirect`                      | The configuration for managing redirects from content backends. For backends which not supported it (such as using minio for `s3` storage type), please set it to `true` to disable redirects. Refer to the [guide](https://github.com/distribution/distribution/blob/main/docs/content/about/configuration.md#redirect) for more details                                                                                                                                                                                           | `false`                                                                  |
 | `persistence.imageChartStorage.caBundleSecretName`                   | Specify the `caBundleSecretName` if the storage service uses a self-signed certificate. The secret must contain keys named `ca.crt` which will be injected into the trust store of registry's and containers.                                                                                                                                                                                                                                                                                                                       |                                                                          |
-| `persistence.imageChartStorage.type`                                 | The type of storage for images and charts: `filesystem`, `azure`, `gcs`, `s3`, `swift` or `oss`. The type must be `filesystem` if you want to use persistent volumes for registry. Refer to the [guide](https://github.com/docker/distribution/blob/master/docs/configuration.md#storage) for more details                                                                                                                                                                                                                          | `filesystem`                                                             |
+| `persistence.imageChartStorage.type`                                 | The type of storage for images and charts: `filesystem`, `azure`, `gcs`, `s3`, `swift` or `oss`. The type must be `filesystem` if you want to use persistent volumes for registry. Refer to the [guide](https://github.com/distribution/distribution/blob/main/docs/content/about/configuration.md#storage) for more details                                                                                                                                                                                                        | `filesystem`                                                             |
 | `persistence.imageChartStorage.gcs.existingSecret`                   | An existing secret containing the gcs service account json key. The key must be gcs-key.json.                                                                                                                                                                                                                                                                                                                                                                                                                                       | `""`                                                                     |
 | `persistence.imageChartStorage.gcs.useWorkloadIdentity`              | A boolean to allow the use of workloadidentity in a GKE cluster. To use it, create a kubernetes service account and set the name in the key `serviceAccountName` of each component, then allow automounting the service account.                                                                                                                                                                                                                                                                                                    | `false`                                                                  |
 | **General**                                                          |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |                                                                          |
@@ -581,7 +234,7 @@ The following table lists the configurable parameters of the Harbor chart and th
 | `core.topologySpreadConstraints`                                     | Constraints that define how Pods are spread across failure-domains like regions or availability zones                                                                                                                                                                                                                                                                                                                                                                                                                               | `[]`                                                                     |
 | `core.podAnnotations`                                                | Annotations to add to the core pod                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | `{}`                                                                     |
 | `core.serviceAnnotations`                                            | Annotations to add to the core service                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              | `{}`                                                                     |
-| `core.configureUserSettings`                                         | A JSON string to set in the environment variable `CONFIG_OVERWRITE_JSON` to configure user settings. See the [official docs](https://goharbor.io/docs/latest/install-config/configure-user-settings-cli/#configure-users-settings-using-an-environment-variable).                                                                                                                                                                                                                                                                   |                                                                          |
+| `core.configureUserSettings`                                         | A JSON string to set in the environment variable `CONFIG_OVERWRITE_JSON` to configure user settings. See the [official docs](https://goharbor.io/docs/latest/install-config/configure-system-settings-cli/#set-configuration-items-using-an-environment-variable.                                                                                                                                                                                                                                                                   |                                                                          |
 | `core.quotaUpdateProvider`                                           | The provider for updating project quota(usage), there are 2 options, `redis` or `db`. You can set it to be implemented by `redis` which can improve the performance of high concurrent pushing to the same project, and reduce database connection spikes and occupies. Using redis will bring up some delay for quota usage update for display, so only suggest switch provider to redis if you ran into the db connections spike around the scenario of high concurrent pushing to same project, no improvement for other scenes. | `db`                                                                     |
 | `core.secret`                                                        | Secret is used when core server communicates with other components. If a secret key is not specified, Helm will generate one. Must be a string of 16 chars.                                                                                                                                                                                                                                                                                                                                                                         |                                                                          |
 | `core.secretName`                                                    | Fill the name of a kubernetes secret if you want to use your own TLS certificate and private key for token encryption/decryption. The secret must contain keys named: `tls.crt` - the certificate and `tls.key` - the private key. The default key pair will be used if it isn't set                                                                                                                                                                                                                                                |                                                                          |
@@ -603,6 +256,7 @@ The following table lists the configurable parameters of the Harbor chart and th
 | `jobservice.loggerSweeperDuration`                                   | The jobLogger sweeper duration in days (ignored if `jobLoggers` is set to `stdout`)                                                                                                                                                                                                                                                                                                                                                                                                                                                 | `14`                                                                     |
 | `jobservice.notification.webhook_job_max_retry`                      | The maximum retry of webhook sending notifications                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | `3`                                                                      |
 | `jobservice.notification.webhook_job_http_client_timeout`            | The http client timeout value of webhook sending notifications                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | `3`                                                                      |
+| `jobservice.registryHttpClientTimeout`                               | The HTTP client timeout (in minutes) for jobservice when communicating with the registry. Only needs to be set if a longer request timeout is required.                                                                                                                                                                                                                                                                                                                                                                             | `30`                                                                     |
 | `jobservice.reaper.max_update_hours`                                 | the max time to wait for a task to finish, if unfinished after max_update_hours, the task will be mark as error, but the task will continue to run                                                                                                                                                                                                                                                                                                                                                                                  | `24`                                                                     |
 | `jobservice.reaper.max_dangling_hours`                               | the max time for execution in running state without new task created                                                                                                                                                                                                                                                                                                                                                                                                                                                                | `168`                                                                    |
 | `jobservice.resources`                                               | The [resources] to allocate for container                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | undefined                                                                |
@@ -629,19 +283,19 @@ The following table lists the configurable parameters of the Harbor chart and th
 | `registry.tolerations`                                               | Tolerations for pod assignment                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | `[]`                                                                     |
 | `registry.affinity`                                                  | Node/Pod affinities                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | `{}`                                                                     |
 | `registry.topologySpreadConstraints`                                 | Constraints that define how Pods are spread across failure-domains like regions or availability zones                                                                                                                                                                                                                                                                                                                                                                                                                               | `[]`                                                                     |
-| `registry.middleware`                                                | Middleware is used to add support for a CDN between backend storage and `docker pull` recipient. See [official docs](https://github.com/docker/distribution/blob/master/docs/configuration.md#middleware).                                                                                                                                                                                                                                                                                                                          |                                                                          |
+| `registry.middleware`                                                | Middleware is used to add support for a CDN between backend storage and `docker pull` recipient. See [official docs](https://github.com/distribution/distribution/blob/main/docs/content/about/configuration.md#middleware).                                                                                                                                                                                                                                                                                                        |                                                                          |
 | `registry.podAnnotations`                                            | Annotations to add to the registry pod                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              | `{}`                                                                     |
 | `registry.priorityClassName`                                         | The priority class to run the pod as                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |                                                                          |
-| `registry.secret`                                                    | Secret is used to secure the upload state from client and registry storage backend. See [official docs](https://github.com/docker/distribution/blob/master/docs/configuration.md#http). If a secret key is not specified, Helm will generate one. Must be a string of 16 chars.                                                                                                                                                                                                                                                     |                                                                          |
-| `registry.credentials.username`                                      | The username that harbor core uses internally to access the registry instance. Together with the `registry.credentials.password`, a htpasswd  is created. This is an alternative to providing `registry.credentials.htpasswdString`. For more details see [official docs](https://github.com/docker/distribution/blob/master/docs/configuration.md#htpasswd).                                                                                                                                                                       | `harbor_registry_user`                                                   |
-| `registry.credentials.password`                                      | The password that harbor core uses internally to access the registry instance. Together with the `registry.credentials.username`, a htpasswd  is created. This is an alternative to providing `registry.credentials.htpasswdString`. For more details see [official docs](https://github.com/docker/distribution/blob/master/docs/configuration.md#htpasswd). It is suggested you update this value before installation.                                                                                                            | `harbor_registry_password`                                               |
-| `registry.credentials.existingSecret`                                | An existing secret containing the password for accessing the registry instance, which is hosted by htpasswd auth mode. More details see [official docs](https://github.com/docker/distribution/blob/master/docs/configuration.md#htpasswd). The key must be `REGISTRY_PASSWD`                                                                                                                                                                                                                                                       | `""`                                                                     |
+| `registry.secret`                                                    | Secret is used to secure the upload state from client and registry storage backend. See [official docs](https://github.com/distribution/distribution/blob/main/docs/content/about/configuration.md#http). If a secret key is not specified, Helm will generate one. Must be a string of 16 chars.                                                                                                                                                                                                                                   |                                                                          |
+| `registry.credentials.username`                                      | The username that harbor core uses internally to access the registry instance. Together with the `registry.credentials.password`, a htpasswd is created. This is an alternative to providing `registry.credentials.htpasswdString`. For more details see [official docs](https://github.com/distribution/distribution/blob/main/docs/content/about/configuration.md#htpasswd).                                                                                                                                                      | `harbor_registry_user`                                                   |
+| `registry.credentials.password`                                      | The password that harbor core uses internally to access the registry instance. Together with the `registry.credentials.username`, a htpasswd is created. This is an alternative to providing `registry.credentials.htpasswdString`. For more details see [official docs](https://github.com/distribution/distribution/blob/main/docs/content/about/configuration.md#htpasswd). It is suggested you update this value before installation.                                                                                           | `harbor_registry_password`                                               |
+| `registry.credentials.existingSecret`                                | An existing secret containing the password for accessing the registry instance, which is hosted by htpasswd auth mode. More details see [official docs](https://github.com/distribution/distribution/blob/main/docs/content/about/configuration.md#htpasswd). The key must be `REGISTRY_PASSWD`                                                                                                                                                                                                                                     | `""`                                                                     |
 | `registry.credentials.htpasswdString`                                | Login and password in htpasswd string format. Excludes `registry.credentials.username` and `registry.credentials.password`. May come in handy when integrating with tools like argocd or flux. This allows the same line to be generated each time the template is rendered, instead of the `htpasswd` function from helm, which generates different lines each time because of the salt.                                                                                                                                           | undefined                                                                |
 | `registry.relativeurls`                                              | If true, the registry returns relative URLs in Location headers. The client is responsible for resolving the correct URL. Needed if harbor is behind a reverse proxy                                                                                                                                                                                                                                                                                                                                                                | `false`                                                                  |
-| `registry.upload_purging.enabled`                                    | If true, enable purge _upload directories                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | `true`                                                                   |
-| `registry.upload_purging.age`                                        | Remove files in _upload directories which exist for a period of time, default is one week.                                                                                                                                                                                                                                                                                                                                                                                                                                          | `168h`                                                                   |
+| `registry.upload_purging.enabled`                                    | If true, enable purge \_upload directories                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | `true`                                                                   |
+| `registry.upload_purging.age`                                        | Remove files in \_upload directories which exist for a period of time, default is one week.                                                                                                                                                                                                                                                                                                                                                                                                                                         | `168h`                                                                   |
 | `registry.upload_purging.interval`                                   | The interval of the purge operations                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | `24h`                                                                    |
-| `registry.upload_purging.dryrun`                                     | If true, enable dryrun for purging _upload                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | `false`                                                                  |
+| `registry.upload_purging.dryrun`                                     | If true, enable dryrun for purging \_upload                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | `false`                                                                  |
 | `registry.initContainers`                                            | Init containers to be run before the controller's container starts.                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | `[]`                                                                     |
 | **[Trivy][trivy]**                                                   |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |                                                                          |
 | `trivy.enabled`                                                      | The flag to enable Trivy scanner                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    | `true`                                                                   |
@@ -768,6 +422,16 @@ The following table lists the configurable parameters of the Harbor chart and th
 | `cache.enabled`                                                      | Enable cache layer or not                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | `false`                                                                  |
 | `cache.expireHours`                                                  | The expire hours of cache layer                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | `24`                                                                     |
 
+### Harbor Kubernetes Version Compatibility Matrix
+
+The following is a list of the Test Kubernetes versions for each Harbor version. Generally, Harbor supporting Kubernetes version above v1.20+ . However we only test against 3 Kubernetes minor versions for each Harbor minor release.
+
+| Harbor-Helm Version | Harbor App Version | Tested on Kubernetes version |
+| ------------------- | ------------------ | ---------------------------- |
+| 1.18                | v2.14              | 1.34.0, 1.33.4, 1.32.8       |
+| 1.17                | v2.13              | 1.31.1, 1.30.4, 1.29.8       |
+| 1.16                | v2.12              | 1.31.1, 1.30.4, 1.29.8       |
+
 [resources]: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/
 [trivy]: https://github.com/aquasecurity/trivy
 [trivy-db]: https://github.com/aquasecurity/trivy-db
diff --git a/packages/system/harbor/charts/harbor/templates/_helpers.tpl b/packages/system/harbor/charts/harbor/templates/_helpers.tpl
index 95643c4931..607b1b1973 100644
--- a/packages/system/harbor/charts/harbor/templates/_helpers.tpl
+++ b/packages/system/harbor/charts/harbor/templates/_helpers.tpl
@@ -193,14 +193,41 @@ app: "{{ template "harbor.name" . }}"
   {{- end -}}
 {{- end -}}
 
+{{- define "harbor.redis.usernameForRegistry" -}}
+  {{- with .Values.redis }}
+    {{- if eq .type "internal" }}
+      {{- "" -}}
+    {{- else if .external.existingSecret }}
+      {{- include "harbor.redis.usernamefromsecret" $ | trim -}}
+    {{- else }}
+      {{- .external.username | default "" -}}
+    {{- end }}
+  {{- end }}
+{{- end -}}
+
 {{- define "harbor.redis.pwdfromsecret" -}}
-  {{- (lookup "v1" "Secret"  .Release.Namespace (.Values.redis.external.existingSecret)).data.REDIS_PASSWORD  | b64dec }}
+  {{- $existingSecret := (lookup "v1" "Secret" .Release.Namespace (.Values.redis.external.existingSecret)) -}}
+  {{- if and (not (empty $existingSecret)) (hasKey $existingSecret.data "REDIS_PASSWORD") -}}
+    {{- printf "%s" ($existingSecret.data.REDIS_PASSWORD | b64dec | trim) -}}
+  {{- end -}}
+{{- end -}}
+
+{{- define "harbor.redis.passwordForRegistry" -}}
+  {{- with .Values.redis }}
+    {{- if eq .type "internal" }}
+      {{- "" -}}
+    {{- else if .external.existingSecret }}
+      {{- include "harbor.redis.pwdfromsecret" $ -}}
+    {{- else }}
+      {{- .external.password | default "" -}}
+    {{- end }}
+  {{- end }}
 {{- end -}}
 
 {{- define "harbor.redis.cred" -}}
   {{- with .Values.redis }}
     {{- if (and (eq .type "external" ) (.external.existingSecret)) }}
-      {{- printf "%s:%s@" (include "harbor.redis.usernamefromsecret" $) (include "harbor.redis.pwdfromsecret" $) -}}
+      {{- printf "%s:%s@" ((include "harbor.redis.usernamefromsecret" $) | urlquery) ((include "harbor.redis.pwdfromsecret" $) | urlquery) -}}
     {{- else }}
       {{- ternary (printf "%s:%s@" (.external.username | urlquery) (.external.password | urlquery)) "" (and (eq .type "external" ) (not (not .external.password))) }}
     {{- end }}
diff --git a/packages/system/harbor/charts/harbor/templates/core/core-dpl.yaml b/packages/system/harbor/charts/harbor/templates/core/core-dpl.yaml
index 4705c5f6e4..8cf17d54d7 100644
--- a/packages/system/harbor/charts/harbor/templates/core/core-dpl.yaml
+++ b/packages/system/harbor/charts/harbor/templates/core/core-dpl.yaml
@@ -72,24 +72,32 @@ spec:
             path: /api/v2.0/ping
             scheme: {{ include "harbor.component.scheme" . | upper }}
             port: {{ template "harbor.core.containerPort" . }}
-          failureThreshold: 360
           initialDelaySeconds: {{ .Values.core.startupProbe.initialDelaySeconds }}
-          periodSeconds: 10
+          periodSeconds: {{ .Values.core.startupProbe.periodSeconds }}
+          timeoutSeconds: {{ .Values.core.startupProbe.timeoutSeconds }}
+          failureThreshold: {{ .Values.core.startupProbe.failureThreshold }}
+          successThreshold: {{ .Values.core.startupProbe.successThreshold }}
         {{- end }}
         livenessProbe:
           httpGet:
             path: /api/v2.0/ping
             scheme: {{ include "harbor.component.scheme" . | upper }}
             port: {{ template "harbor.core.containerPort" . }}
-          failureThreshold: 2
-          periodSeconds: 10
+          initialDelaySeconds: {{ .Values.core.livenessProbe.initialDelaySeconds }}
+          periodSeconds: {{ .Values.core.livenessProbe.periodSeconds }}
+          timeoutSeconds: {{ .Values.core.livenessProbe.timeoutSeconds }}
+          failureThreshold: {{ .Values.core.livenessProbe.failureThreshold }}
+          successThreshold: {{ .Values.core.livenessProbe.successThreshold }}
         readinessProbe:
           httpGet:
             path: /api/v2.0/ping
             scheme: {{ include "harbor.component.scheme" . | upper }}
             port: {{ template "harbor.core.containerPort" . }}
-          failureThreshold: 2
-          periodSeconds: 10
+          initialDelaySeconds: {{ .Values.core.readinessProbe.initialDelaySeconds }}
+          periodSeconds: {{ .Values.core.readinessProbe.periodSeconds }}
+          timeoutSeconds: {{ .Values.core.readinessProbe.timeoutSeconds }}
+          failureThreshold: {{ .Values.core.readinessProbe.failureThreshold }}
+          successThreshold: {{ .Values.core.readinessProbe.successThreshold }}
         envFrom:
         - configMapRef:
             name: "{{ template "harbor.core" . }}"
diff --git a/packages/system/harbor/charts/harbor/templates/core/core-pdb.yaml b/packages/system/harbor/charts/harbor/templates/core/core-pdb.yaml
new file mode 100644
index 0000000000..2cd2dadff3
--- /dev/null
+++ b/packages/system/harbor/charts/harbor/templates/core/core-pdb.yaml
@@ -0,0 +1,19 @@
+{{- if and .Values.core.podDisruptionBudget.enabled (gt (int .Values.core.replicas) 1) }}
+apiVersion: policy/v1
+kind: PodDisruptionBudget
+metadata:
+  name: {{ template "harbor.core" . }}
+  labels:
+{{ include "harbor.labels" . | indent 4 }}
+spec:
+  {{- if .Values.core.podDisruptionBudget.minAvailable }}
+  minAvailable: {{ .Values.core.podDisruptionBudget.minAvailable }}
+  {{- end }}
+  {{- if .Values.core.podDisruptionBudget.maxUnavailable }}
+  maxUnavailable: {{ .Values.core.podDisruptionBudget.maxUnavailable }}
+  {{- end }}
+  selector:
+    matchLabels:
+{{ include "harbor.matchLabels" . | indent 6 }}
+      component: core
+{{- end }}
\ No newline at end of file
diff --git a/packages/system/harbor/charts/harbor/templates/database/database-ss.yaml b/packages/system/harbor/charts/harbor/templates/database/database-ss.yaml
index 8bddd2919d..e43db12de4 100644
--- a/packages/system/harbor/charts/harbor/templates/database/database-ss.yaml
+++ b/packages/system/harbor/charts/harbor/templates/database/database-ss.yaml
@@ -78,16 +78,20 @@ spec:
           exec:
             command:
             - /docker-healthcheck.sh
-          initialDelaySeconds: 300
-          periodSeconds: 10
+          initialDelaySeconds: {{ .Values.database.internal.livenessProbe.initialDelaySeconds }}
+          periodSeconds: {{ .Values.database.internal.livenessProbe.periodSeconds }}
           timeoutSeconds: {{ .Values.database.internal.livenessProbe.timeoutSeconds }}
+          failureThreshold: {{ .Values.database.internal.livenessProbe.failureThreshold }}
+          successThreshold: {{ .Values.database.internal.livenessProbe.successThreshold }}
         readinessProbe:
           exec:
             command:
             - /docker-healthcheck.sh
-          initialDelaySeconds: 1
-          periodSeconds: 10
+          initialDelaySeconds: {{ .Values.database.internal.readinessProbe.initialDelaySeconds }}
+          periodSeconds: {{ .Values.database.internal.readinessProbe.periodSeconds }}
           timeoutSeconds: {{ .Values.database.internal.readinessProbe.timeoutSeconds }}
+          failureThreshold: {{ .Values.database.internal.readinessProbe.failureThreshold }}
+          successThreshold: {{ .Values.database.internal.readinessProbe.successThreshold }}
 {{- if .Values.database.internal.resources }}
         resources:
 {{ toYaml .Values.database.internal.resources | indent 10 }}
@@ -139,7 +143,7 @@ spec:
     {{- end }}
   {{- if and .Values.persistence.enabled (not $database.existingClaim) }}
   volumeClaimTemplates:
-  - apiVersion: v1	
+  - apiVersion: v1
     kind: PersistentVolumeClaim
     metadata:
       name: "database-data"
diff --git a/packages/system/harbor/charts/harbor/templates/exporter/exporter-dpl.yaml b/packages/system/harbor/charts/harbor/templates/exporter/exporter-dpl.yaml
index 30894a6df9..4996967ff5 100644
--- a/packages/system/harbor/charts/harbor/templates/exporter/exporter-dpl.yaml
+++ b/packages/system/harbor/charts/harbor/templates/exporter/exporter-dpl.yaml
@@ -65,14 +65,20 @@ spec:
           httpGet:
             path: /
             port: {{ .Values.metrics.exporter.port }}
-          initialDelaySeconds: 300
-          periodSeconds: 10
+          initialDelaySeconds: {{ .Values.exporter.livenessProbe.initialDelaySeconds }}
+          periodSeconds: {{ .Values.exporter.livenessProbe.periodSeconds }}
+          timeoutSeconds: {{ .Values.exporter.livenessProbe.timeoutSeconds }}
+          failureThreshold: {{ .Values.exporter.livenessProbe.failureThreshold }}
+          successThreshold: {{ .Values.exporter.livenessProbe.successThreshold }}
         readinessProbe:
           httpGet:
             path: /
             port: {{ .Values.metrics.exporter.port }}
-          initialDelaySeconds: 30
-          periodSeconds: 10
+          initialDelaySeconds: {{ .Values.exporter.readinessProbe.initialDelaySeconds }}
+          periodSeconds: {{ .Values.exporter.readinessProbe.periodSeconds }}
+          timeoutSeconds: {{ .Values.exporter.readinessProbe.timeoutSeconds }}
+          failureThreshold: {{ .Values.exporter.readinessProbe.failureThreshold }}
+          successThreshold: {{ .Values.exporter.readinessProbe.successThreshold }}
         args: ["-log-level", "{{ .Values.logLevel }}"]
         envFrom:
         - configMapRef:
diff --git a/packages/system/harbor/charts/harbor/templates/exporter/exporter-pdb.yaml b/packages/system/harbor/charts/harbor/templates/exporter/exporter-pdb.yaml
new file mode 100644
index 0000000000..12e1268a03
--- /dev/null
+++ b/packages/system/harbor/charts/harbor/templates/exporter/exporter-pdb.yaml
@@ -0,0 +1,19 @@
+{{- if and .Values.exporter.podDisruptionBudget.enabled (gt (int .Values.exporter.replicas) 1) }}
+apiVersion: policy/v1
+kind: PodDisruptionBudget
+metadata:
+  name: {{ template "harbor.exporter" . }}
+  labels:
+{{ include "harbor.labels" . | indent 4 }}
+spec:
+  {{- if .Values.exporter.podDisruptionBudget.minAvailable }}
+  minAvailable: {{ .Values.exporter.podDisruptionBudget.minAvailable }}
+  {{- end }}
+  {{- if .Values.exporter.podDisruptionBudget.maxUnavailable }}
+  maxUnavailable: {{ .Values.exporter.podDisruptionBudget.maxUnavailable }}
+  {{- end }}
+  selector:
+    matchLabels:
+{{ include "harbor.matchLabels" . | indent 6 }}
+      component: exporter
+{{- end }}
\ No newline at end of file
diff --git a/packages/system/harbor/charts/harbor/templates/gateway-apis/route.yaml b/packages/system/harbor/charts/harbor/templates/gateway-apis/route.yaml
index 0999a5ff95..89fc77f8e9 100644
--- a/packages/system/harbor/charts/harbor/templates/gateway-apis/route.yaml
+++ b/packages/system/harbor/charts/harbor/templates/gateway-apis/route.yaml
@@ -24,7 +24,7 @@ metadata:
 spec:
   parentRefs:
   {{- toYaml $route.parentRefs | nindent 2 }}
-  hostnames: 
+  hostnames:
   {{- toYaml $route.hosts | nindent 2 }}
   rules:
   - matches:
@@ -43,6 +43,9 @@ spec:
     backendRefs:
     - name: {{ template "harbor.core" . }}
       namespace: {{ .Release.Namespace | quote }}
+      group: ""
+      kind: Service
+      weight: 1
       port: {{ template "harbor.core.servicePort" . }}
   - matches:
     - path:
@@ -51,5 +54,8 @@ spec:
     backendRefs:
     - name: {{ template "harbor.portal" . }}
       namespace: {{ .Release.Namespace | quote }}
+      group: ""
+      kind: Service
+      weight: 1
       port: {{ template "harbor.portal.servicePort" . }}
 {{- end }}
diff --git a/packages/system/harbor/charts/harbor/templates/jobservice/jobservice-cm-env.yaml b/packages/system/harbor/charts/harbor/templates/jobservice/jobservice-cm-env.yaml
index f1359131a4..04d33a9fa3 100644
--- a/packages/system/harbor/charts/harbor/templates/jobservice/jobservice-cm-env.yaml
+++ b/packages/system/harbor/charts/harbor/templates/jobservice/jobservice-cm-env.yaml
@@ -11,6 +11,7 @@ data:
   REGISTRY_URL: "{{ template "harbor.registryURL" . }}"
   REGISTRY_CONTROLLER_URL: "{{ template "harbor.registryControllerURL" . }}"
   REGISTRY_CREDENTIAL_USERNAME: "{{ .Values.registry.credentials.username }}"
+  REGISTRY_HTTP_CLIENT_TIMEOUT: "{{ .Values.jobservice.registryHttpClientTimeout }}"
 
   JOBSERVICE_WEBHOOK_JOB_MAX_RETRY: "{{ .Values.jobservice.notification.webhook_job_max_retry }}"
   JOBSERVICE_WEBHOOK_JOB_HTTP_CLIENT_TIMEOUT: "{{ .Values.jobservice.notification.webhook_job_http_client_timeout }}"
diff --git a/packages/system/harbor/charts/harbor/templates/jobservice/jobservice-dpl.yaml b/packages/system/harbor/charts/harbor/templates/jobservice/jobservice-dpl.yaml
index 3e426694b5..aa44b37296 100644
--- a/packages/system/harbor/charts/harbor/templates/jobservice/jobservice-dpl.yaml
+++ b/packages/system/harbor/charts/harbor/templates/jobservice/jobservice-dpl.yaml
@@ -77,15 +77,21 @@ spec:
             path: /api/v1/stats
             scheme: {{ include "harbor.component.scheme" . | upper }}
             port: {{ template "harbor.jobservice.containerPort" . }}
-          initialDelaySeconds: 300
-          periodSeconds: 10
+          initialDelaySeconds: {{ .Values.jobservice.livenessProbe.initialDelaySeconds }}
+          periodSeconds: {{ .Values.jobservice.livenessProbe.periodSeconds }}
+          timeoutSeconds: {{ .Values.jobservice.livenessProbe.timeoutSeconds }}
+          failureThreshold: {{ .Values.jobservice.livenessProbe.failureThreshold }}
+          successThreshold: {{ .Values.jobservice.livenessProbe.successThreshold }}
         readinessProbe:
           httpGet:
             path: /api/v1/stats
             scheme: {{ include "harbor.component.scheme" . | upper }}
             port: {{ template "harbor.jobservice.containerPort" . }}
-          initialDelaySeconds: 20
-          periodSeconds: 10
+          initialDelaySeconds: {{ .Values.jobservice.readinessProbe.initialDelaySeconds }}
+          periodSeconds: {{ .Values.jobservice.readinessProbe.periodSeconds }}
+          timeoutSeconds: {{ .Values.jobservice.readinessProbe.timeoutSeconds }}
+          failureThreshold: {{ .Values.jobservice.readinessProbe.failureThreshold }}
+          successThreshold: {{ .Values.jobservice.readinessProbe.successThreshold }}
 {{- if .Values.jobservice.resources }}
         resources:
 {{ toYaml .Values.jobservice.resources | indent 10 }}
diff --git a/packages/system/harbor/charts/harbor/templates/jobservice/jobservice-pdb.yaml b/packages/system/harbor/charts/harbor/templates/jobservice/jobservice-pdb.yaml
new file mode 100644
index 0000000000..8278c1ffb4
--- /dev/null
+++ b/packages/system/harbor/charts/harbor/templates/jobservice/jobservice-pdb.yaml
@@ -0,0 +1,19 @@
+{{- if and .Values.jobservice.podDisruptionBudget.enabled (gt (int .Values.jobservice.replicas) 1) }}
+apiVersion: policy/v1
+kind: PodDisruptionBudget
+metadata:
+  name: {{ template "harbor.jobservice" . }}
+  labels:
+{{ include "harbor.labels" . | indent 4 }}
+spec:
+  {{- if .Values.jobservice.podDisruptionBudget.minAvailable }}
+  minAvailable: {{ .Values.jobservice.podDisruptionBudget.minAvailable }}
+  {{- end }}
+  {{- if .Values.jobservice.podDisruptionBudget.maxUnavailable }}
+  maxUnavailable: {{ .Values.jobservice.podDisruptionBudget.maxUnavailable }}
+  {{- end }}
+  selector:
+    matchLabels:
+{{ include "harbor.matchLabels" . | indent 6 }}
+      component: jobservice
+{{- end }}
\ No newline at end of file
diff --git a/packages/system/harbor/charts/harbor/templates/nginx/deployment.yaml b/packages/system/harbor/charts/harbor/templates/nginx/deployment.yaml
index 0c8bc40fd5..ffb970b740 100644
--- a/packages/system/harbor/charts/harbor/templates/nginx/deployment.yaml
+++ b/packages/system/harbor/charts/harbor/templates/nginx/deployment.yaml
@@ -73,15 +73,21 @@ spec:
             scheme: {{ .scheme }}
             path: /
             port: {{ .port }}
-          initialDelaySeconds: 300
-          periodSeconds: 10
+          initialDelaySeconds: {{ .Values.nginx.livenessProbe.initialDelaySeconds }}
+          periodSeconds: {{ .Values.nginx.livenessProbe.periodSeconds }}
+          timeoutSeconds: {{ .Values.nginx.livenessProbe.timeoutSeconds }}
+          failureThreshold: {{ .Values.nginx.livenessProbe.failureThreshold }}
+          successThreshold: {{ .Values.nginx.livenessProbe.successThreshold }}
         readinessProbe:
           httpGet:
             scheme: {{ .scheme }}
             path: /
             port: {{ .port }}
-          initialDelaySeconds: 1
-          periodSeconds: 10
+          initialDelaySeconds: {{ .Values.nginx.readinessProbe.initialDelaySeconds }}
+          periodSeconds: {{ .Values.nginx.readinessProbe.periodSeconds }}
+          timeoutSeconds: {{ .Values.nginx.readinessProbe.timeoutSeconds }}
+          failureThreshold: {{ .Values.nginx.readinessProbe.failureThreshold }}
+          successThreshold: {{ .Values.nginx.readinessProbe.successThreshold }}
 {{- if .Values.nginx.resources }}
         resources:
 {{ toYaml .Values.nginx.resources | indent 10 }}
diff --git a/packages/system/harbor/charts/harbor/templates/nginx/nginx-pdb.yaml b/packages/system/harbor/charts/harbor/templates/nginx/nginx-pdb.yaml
new file mode 100644
index 0000000000..2f8a10ac40
--- /dev/null
+++ b/packages/system/harbor/charts/harbor/templates/nginx/nginx-pdb.yaml
@@ -0,0 +1,19 @@
+{{- if and .Values.nginx.podDisruptionBudget.enabled (gt (int .Values.nginx.replicas) 1) }}
+apiVersion: policy/v1
+kind: PodDisruptionBudget
+metadata:
+  name: {{ template "harbor.nginx" . }}
+  labels:
+{{ include "harbor.labels" . | indent 4 }}
+spec:
+  {{- if .Values.nginx.podDisruptionBudget.minAvailable }}
+  minAvailable: {{ .Values.nginx.podDisruptionBudget.minAvailable }}
+  {{- end }}
+  {{- if .Values.nginx.podDisruptionBudget.maxUnavailable }}
+  maxUnavailable: {{ .Values.nginx.podDisruptionBudget.maxUnavailable }}
+  {{- end }}
+  selector:
+    matchLabels:
+{{ include "harbor.matchLabels" . | indent 6 }}
+      component: nginx
+{{- end }}
\ No newline at end of file
diff --git a/packages/system/harbor/charts/harbor/templates/nginx/service.yaml b/packages/system/harbor/charts/harbor/templates/nginx/service.yaml
index 9554cd436e..e6ca9f2bb3 100644
--- a/packages/system/harbor/charts/harbor/templates/nginx/service.yaml
+++ b/packages/system/harbor/charts/harbor/templates/nginx/service.yaml
@@ -38,6 +38,7 @@ spec:
 {{- else if eq .Values.expose.type "nodePort" }}
 {{- $nodePort := .Values.expose.nodePort }}
   name: {{ $nodePort.name }}
+  namespace: {{ .Release.Namespace | quote }}
   labels:
 {{ include "harbor.labels" . | indent 4 }}
 {{- if .Values.expose.nodePort.labels }}
@@ -67,6 +68,7 @@ spec:
 {{- else if eq .Values.expose.type "loadBalancer" }}
 {{- $loadBalancer := .Values.expose.loadBalancer }}
   name: {{ $loadBalancer.name }}
+  namespace: {{ .Release.Namespace | quote }}
   labels:
 {{ include "harbor.labels" . | indent 4 }}
 {{- if .Values.expose.loadBalancer.labels }}
diff --git a/packages/system/harbor/charts/harbor/templates/portal/deployment.yaml b/packages/system/harbor/charts/harbor/templates/portal/deployment.yaml
index 88bcd4979b..c5769b493c 100644
--- a/packages/system/harbor/charts/harbor/templates/portal/deployment.yaml
+++ b/packages/system/harbor/charts/harbor/templates/portal/deployment.yaml
@@ -79,15 +79,21 @@ spec:
             path: /
             scheme: {{ include "harbor.component.scheme" . | upper }}
             port: {{ template "harbor.portal.containerPort" . }}
-          initialDelaySeconds: 300
-          periodSeconds: 10
+          initialDelaySeconds: {{ .Values.portal.livenessProbe.initialDelaySeconds }}
+          periodSeconds: {{ .Values.portal.livenessProbe.periodSeconds }}
+          timeoutSeconds: {{ .Values.portal.livenessProbe.timeoutSeconds }}
+          failureThreshold: {{ .Values.portal.livenessProbe.failureThreshold }}
+          successThreshold: {{ .Values.portal.livenessProbe.successThreshold }}
         readinessProbe:
           httpGet:
             path: /
             scheme: {{ include "harbor.component.scheme" . | upper }}
             port: {{ template "harbor.portal.containerPort" . }}
-          initialDelaySeconds: 1
-          periodSeconds: 10
+          initialDelaySeconds: {{ .Values.portal.readinessProbe.initialDelaySeconds }}
+          periodSeconds: {{ .Values.portal.readinessProbe.periodSeconds }}
+          timeoutSeconds: {{ .Values.portal.readinessProbe.timeoutSeconds }}
+          failureThreshold: {{ .Values.portal.readinessProbe.failureThreshold }}
+          successThreshold: {{ .Values.portal.readinessProbe.successThreshold }}
         ports:
         - containerPort: {{ template "harbor.portal.containerPort" . }}
         volumeMounts:
diff --git a/packages/system/harbor/charts/harbor/templates/portal/portal-pdb.yaml b/packages/system/harbor/charts/harbor/templates/portal/portal-pdb.yaml
new file mode 100644
index 0000000000..60fbdc520e
--- /dev/null
+++ b/packages/system/harbor/charts/harbor/templates/portal/portal-pdb.yaml
@@ -0,0 +1,19 @@
+{{- if and .Values.portal.podDisruptionBudget.enabled (gt (int .Values.portal.replicas) 1) }}
+apiVersion: policy/v1
+kind: PodDisruptionBudget
+metadata:
+  name: {{ template "harbor.portal" . }}
+  labels:
+{{ include "harbor.labels" . | indent 4 }}
+spec:
+  {{- if .Values.portal.podDisruptionBudget.minAvailable }}
+  minAvailable: {{ .Values.portal.podDisruptionBudget.minAvailable }}
+  {{- end }}
+  {{- if .Values.portal.podDisruptionBudget.maxUnavailable }}
+  maxUnavailable: {{ .Values.portal.podDisruptionBudget.maxUnavailable }}
+  {{- end }}
+  selector:
+    matchLabels:
+{{ include "harbor.matchLabels" . | indent 6 }}
+      component: portal
+{{- end }}
\ No newline at end of file
diff --git a/packages/system/harbor/charts/harbor/templates/redis/statefulset.yaml b/packages/system/harbor/charts/harbor/templates/redis/statefulset.yaml
index 2316f69b3f..1e8a2724b0 100644
--- a/packages/system/harbor/charts/harbor/templates/redis/statefulset.yaml
+++ b/packages/system/harbor/charts/harbor/templates/redis/statefulset.yaml
@@ -56,13 +56,19 @@ spec:
         livenessProbe:
           tcpSocket:
             port: 6379
-          initialDelaySeconds: 300
-          periodSeconds: 10
+          initialDelaySeconds: {{ .Values.redis.internal.livenessProbe.initialDelaySeconds }}
+          periodSeconds: {{ .Values.redis.internal.livenessProbe.periodSeconds }}
+          timeoutSeconds: {{ .Values.redis.internal.livenessProbe.timeoutSeconds }}
+          failureThreshold: {{ .Values.redis.internal.livenessProbe.failureThreshold }}
+          successThreshold: {{ .Values.redis.internal.livenessProbe.successThreshold }}
         readinessProbe:
           tcpSocket:
             port: 6379
-          initialDelaySeconds: 1
-          periodSeconds: 10
+          initialDelaySeconds: {{ .Values.redis.internal.readinessProbe.initialDelaySeconds }}
+          periodSeconds: {{ .Values.redis.internal.readinessProbe.periodSeconds }}
+          timeoutSeconds: {{ .Values.redis.internal.readinessProbe.timeoutSeconds }}
+          failureThreshold: {{ .Values.redis.internal.readinessProbe.failureThreshold }}
+          successThreshold: {{ .Values.redis.internal.readinessProbe.successThreshold }}
 {{- if .Values.redis.internal.resources }}
         resources:
 {{ toYaml .Values.redis.internal.resources | indent 10 }}
@@ -102,7 +108,7 @@ spec:
     {{- end }}
   {{- if and .Values.persistence.enabled (not $redis.existingClaim) }}
   volumeClaimTemplates:
-  - apiVersion: v1	
+  - apiVersion: v1
     kind: PersistentVolumeClaim
     metadata:
       name: data
diff --git a/packages/system/harbor/charts/harbor/templates/registry/registry-cm.yaml b/packages/system/harbor/charts/harbor/templates/registry/registry-cm.yaml
index 2ef398ed65..f48ed35636 100644
--- a/packages/system/harbor/charts/harbor/templates/registry/registry-cm.yaml
+++ b/packages/system/harbor/charts/harbor/templates/registry/registry-cm.yaml
@@ -176,9 +176,8 @@ data:
       sentinelMasterSet: {{ template "harbor.redis.masterSet" . }}
       {{- end }}
       db: {{ template "harbor.redis.dbForRegistry" . }}
-      {{- if not (eq (include "harbor.redis.password" .) "") }}
-      password: {{ template "harbor.redis.password" . }}
-      {{- end }}
+      username: {{ (include "harbor.redis.usernameForRegistry" .) | default "" | quote }}
+      password: {{ (include "harbor.redis.passwordForRegistry" .) | default "" | quote }}
       readtimeout: 10s
       writetimeout: 10s
       dialtimeout: 10s
diff --git a/packages/system/harbor/charts/harbor/templates/registry/registry-dpl.yaml b/packages/system/harbor/charts/harbor/templates/registry/registry-dpl.yaml
index a86e2eee0d..c66708bb05 100644
--- a/packages/system/harbor/charts/harbor/templates/registry/registry-dpl.yaml
+++ b/packages/system/harbor/charts/harbor/templates/registry/registry-dpl.yaml
@@ -80,15 +80,21 @@ spec:
             path: /
             scheme: {{ include "harbor.component.scheme" . | upper }}
             port: {{ template "harbor.registry.containerPort" . }}
-          initialDelaySeconds: 300
-          periodSeconds: 10
+          initialDelaySeconds: {{ .Values.registry.registry.livenessProbe.initialDelaySeconds }}
+          periodSeconds: {{ .Values.registry.registry.livenessProbe.periodSeconds }}
+          timeoutSeconds: {{ .Values.registry.registry.livenessProbe.timeoutSeconds }}
+          failureThreshold: {{ .Values.registry.registry.livenessProbe.failureThreshold }}
+          successThreshold: {{ .Values.registry.registry.livenessProbe.successThreshold }}
         readinessProbe:
           httpGet:
             path: /
             scheme: {{ include "harbor.component.scheme" . | upper }}
             port: {{ template "harbor.registry.containerPort" . }}
-          initialDelaySeconds: 1
-          periodSeconds: 10
+          initialDelaySeconds: {{ .Values.registry.registry.readinessProbe.initialDelaySeconds }}
+          periodSeconds: {{ .Values.registry.registry.readinessProbe.periodSeconds }}
+          timeoutSeconds: {{ .Values.registry.registry.readinessProbe.timeoutSeconds }}
+          failureThreshold: {{ .Values.registry.registry.readinessProbe.failureThreshold }}
+          successThreshold: {{ .Values.registry.registry.readinessProbe.successThreshold }}
 {{- if .Values.registry.registry.resources }}
         resources:
 {{ toYaml .Values.registry.registry.resources | indent 10 }}
@@ -129,13 +135,6 @@ spec:
         - name: INTERNAL_TLS_TRUST_CA_PATH
           value: /etc/harbor/ssl/registry/ca.crt
         {{- end }}
-        {{- if .Values.redis.external.existingSecret }}
-        - name: REGISTRY_REDIS_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: {{ .Values.redis.external.existingSecret }}
-              key: REDIS_PASSWORD
-        {{- end }}
         {{- if .Values.persistence.imageChartStorage.azure.existingSecret }}
         - name: REGISTRY_STORAGE_AZURE_ACCOUNTKEY
           valueFrom:
@@ -218,15 +217,21 @@ spec:
             path: /api/health
             scheme: {{ include "harbor.component.scheme" . | upper }}
             port: {{ template "harbor.registryctl.containerPort" . }}
-          initialDelaySeconds: 300
-          periodSeconds: 10
+          initialDelaySeconds: {{ .Values.registry.controller.livenessProbe.initialDelaySeconds }}
+          periodSeconds: {{ .Values.registry.controller.livenessProbe.periodSeconds }}
+          timeoutSeconds: {{ .Values.registry.controller.livenessProbe.timeoutSeconds }}
+          failureThreshold: {{ .Values.registry.controller.livenessProbe.failureThreshold }}
+          successThreshold: {{ .Values.registry.controller.livenessProbe.successThreshold }}
         readinessProbe:
           httpGet:
             path: /api/health
             scheme: {{ include "harbor.component.scheme" . | upper }}
             port: {{ template "harbor.registryctl.containerPort" . }}
-          initialDelaySeconds: 1
-          periodSeconds: 10
+          initialDelaySeconds: {{ .Values.registry.controller.readinessProbe.initialDelaySeconds }}
+          periodSeconds: {{ .Values.registry.controller.readinessProbe.periodSeconds }}
+          timeoutSeconds: {{ .Values.registry.controller.readinessProbe.timeoutSeconds }}
+          failureThreshold: {{ .Values.registry.controller.readinessProbe.failureThreshold }}
+          successThreshold: {{ .Values.registry.controller.readinessProbe.successThreshold }}
 {{- if .Values.registry.controller.resources }}
         resources:
 {{ toYaml .Values.registry.controller.resources | indent 10 }}
@@ -285,13 +290,6 @@ spec:
         - name: INTERNAL_TLS_TRUST_CA_PATH
           value: /etc/harbor/ssl/registry/ca.crt
         {{- end }}
-        {{- if .Values.redis.external.existingSecret }}
-        - name: REGISTRY_REDIS_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: {{ .Values.redis.external.existingSecret }}
-              key: REDIS_PASSWORD
-        {{- end }}
         {{- if .Values.persistence.imageChartStorage.azure.existingSecret }}
         - name: REGISTRY_STORAGE_AZURE_ACCOUNTKEY
           valueFrom:
diff --git a/packages/system/harbor/charts/harbor/templates/registry/registry-pdb.yaml b/packages/system/harbor/charts/harbor/templates/registry/registry-pdb.yaml
new file mode 100644
index 0000000000..fe96f37fdf
--- /dev/null
+++ b/packages/system/harbor/charts/harbor/templates/registry/registry-pdb.yaml
@@ -0,0 +1,19 @@
+{{- if and .Values.registry.podDisruptionBudget.enabled (gt (int .Values.registry.replicas) 1) }}
+apiVersion: policy/v1
+kind: PodDisruptionBudget
+metadata:
+  name: {{ template "harbor.registry" . }}
+  labels:
+{{ include "harbor.labels" . | indent 4 }}
+spec:
+  {{- if .Values.registry.podDisruptionBudget.minAvailable }}
+  minAvailable: {{ .Values.registry.podDisruptionBudget.minAvailable }}
+  {{- end }}
+  {{- if .Values.registry.podDisruptionBudget.maxUnavailable }}
+  maxUnavailable: {{ .Values.registry.podDisruptionBudget.maxUnavailable }}
+  {{- end }}
+  selector:
+    matchLabels:
+{{ include "harbor.matchLabels" . | indent 6 }}
+      component: registry
+{{- end }}
\ No newline at end of file
diff --git a/packages/system/harbor/charts/harbor/templates/trivy/trivy-pdb.yaml b/packages/system/harbor/charts/harbor/templates/trivy/trivy-pdb.yaml
new file mode 100644
index 0000000000..25fde40ee9
--- /dev/null
+++ b/packages/system/harbor/charts/harbor/templates/trivy/trivy-pdb.yaml
@@ -0,0 +1,19 @@
+{{- if and .Values.trivy.podDisruptionBudget.enabled (gt (int .Values.trivy.replicas) 1) }}
+apiVersion: policy/v1
+kind: PodDisruptionBudget
+metadata:
+  name: {{ template "harbor.trivy" . }}
+  labels:
+{{ include "harbor.labels" . | indent 4 }}
+spec:
+  {{- if .Values.trivy.podDisruptionBudget.minAvailable }}
+  minAvailable: {{ .Values.trivy.podDisruptionBudget.minAvailable }}
+  {{- end }}
+  {{- if .Values.trivy.podDisruptionBudget.maxUnavailable }}
+  maxUnavailable: {{ .Values.trivy.podDisruptionBudget.maxUnavailable }}
+  {{- end }}
+  selector:
+    matchLabels:
+{{ include "harbor.matchLabels" . | indent 6 }}
+      component: trivy
+{{- end }}
\ No newline at end of file
diff --git a/packages/system/harbor/charts/harbor/templates/trivy/trivy-sts.yaml b/packages/system/harbor/charts/harbor/templates/trivy/trivy-sts.yaml
index 19b01a2e6d..2491fdcf58 100644
--- a/packages/system/harbor/charts/harbor/templates/trivy/trivy-sts.yaml
+++ b/packages/system/harbor/charts/harbor/templates/trivy/trivy-sts.yaml
@@ -160,19 +160,21 @@ spec:
               scheme: {{ include "harbor.component.scheme" . | upper }}
               path: /probe/healthy
               port: api-server
-            initialDelaySeconds: 5
-            periodSeconds: 10
-            successThreshold: 1
-            failureThreshold: 10
+            initialDelaySeconds: {{ .Values.trivy.livenessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.trivy.livenessProbe.periodSeconds }}
+            timeoutSeconds: {{ .Values.trivy.livenessProbe.timeoutSeconds }}
+            failureThreshold: {{ .Values.trivy.livenessProbe.failureThreshold }}
+            successThreshold: {{ .Values.trivy.livenessProbe.successThreshold }}
           readinessProbe:
             httpGet:
               scheme: {{ include "harbor.component.scheme" . | upper }}
               path: /probe/ready
               port: api-server
-            initialDelaySeconds: 5
-            periodSeconds: 10
-            successThreshold: 1
-            failureThreshold: 3
+            initialDelaySeconds: {{ .Values.trivy.readinessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.trivy.readinessProbe.periodSeconds }}
+            timeoutSeconds: {{ .Values.trivy.readinessProbe.timeoutSeconds }}
+            failureThreshold: {{ .Values.trivy.readinessProbe.failureThreshold }}
+            successThreshold: {{ .Values.trivy.readinessProbe.successThreshold }}
           resources:
 {{ toYaml .Values.trivy.resources | indent 12 }}
       {{- if or (or .Values.internalTLS.enabled .Values.caBundleSecretName) (or (not .Values.persistence.enabled) $trivy.existingClaim) }}
@@ -211,7 +213,7 @@ spec:
     {{- end }}
 {{- if and .Values.persistence.enabled (not $trivy.existingClaim) }}
   volumeClaimTemplates:
-  - apiVersion: v1	
+  - apiVersion: v1
     kind: PersistentVolumeClaim
     metadata:
       name: data
diff --git a/packages/system/harbor/charts/harbor/values.yaml b/packages/system/harbor/charts/harbor/values.yaml
index e00fafc3fd..a4ff88a17e 100644
--- a/packages/system/harbor/charts/harbor/values.yaml
+++ b/packages/system/harbor/charts/harbor/values.yaml
@@ -1,5 +1,5 @@
 expose:
-  # Set how to expose the service. Set the type as "ingress", "clusterIP", "nodePort" or "loadBalancer"
+  # Set how to expose the service. Set the type as "ingress", "clusterIP", "nodePort", "loadBalancer" or "route"
   # and fill the information in the corresponding section
   type: ingress
   tls:
@@ -51,14 +51,16 @@ expose:
   route:
     labels: {}
     annotations: {}
+    # References to the parent gateways
+    parentRefs: []
       # - name: envoy-internal
       #   namespace: networking
       #   sectionName: https
       #   group: gateway.networking.k8s.io
       #   kind: Gateway
-    parentRefs: {}
-      # - "harbor.example.com"
+    # The hostnames for the HTTPRoute
     hosts: []
+      # - "harbor.example.com"
   clusterIP:
     # The name of ClusterIP service
     name: harbor
@@ -498,13 +500,17 @@ containerSecurityContext:
 # If service exposed via "ingress", the Nginx will not be used
 nginx:
   image:
-    repository: goharbor/nginx-photon
-    tag: v2.14.2
+    repository: docker.io/goharbor/nginx-photon
+    tag: v2.15.1
   # set the service account to be used, default if left empty
   serviceAccountName: ""
   # mount the service account token
   automountServiceAccountToken: false
   replicas: 1
+  podDisruptionBudget:
+    enabled: false
+    minAvailable: 1
+    # maxUnavailable: 1
   revisionHistoryLimit: 10
   # resources:
   #  requests:
@@ -526,16 +532,34 @@ nginx:
   podLabels: {}
   ## The priority class to run the pod as
   priorityClassName:
+  ## Liveness probe values
+  livenessProbe:
+    initialDelaySeconds: 300
+    periodSeconds: 10
+    timeoutSeconds: 1
+    failureThreshold: 3
+    successThreshold: 1
+  ## Readiness probe values
+  readinessProbe:
+    initialDelaySeconds: 1
+    periodSeconds: 10
+    timeoutSeconds: 1
+    failureThreshold: 3
+    successThreshold: 1
 
 portal:
   image:
-    repository: goharbor/harbor-portal
-    tag: v2.14.2
+    repository: docker.io/goharbor/harbor-portal
+    tag: v2.15.1
   # set the service account to be used, default if left empty
   serviceAccountName: ""
   # mount the service account token
   automountServiceAccountToken: false
   replicas: 1
+  podDisruptionBudget:
+    enabled: false
+    minAvailable: 1
+    # maxUnavailable: 1
   revisionHistoryLimit: 10
   # resources:
   #  requests:
@@ -559,6 +583,20 @@ portal:
   serviceAnnotations: {}
   ## The priority class to run the pod as
   priorityClassName:
+  ## Liveness probe values
+  livenessProbe:
+    initialDelaySeconds: 300
+    periodSeconds: 10
+    timeoutSeconds: 1
+    failureThreshold: 3
+    successThreshold: 1
+  ## Readiness probe values
+  readinessProbe:
+    initialDelaySeconds: 1
+    periodSeconds: 10
+    timeoutSeconds: 1
+    failureThreshold: 3
+    successThreshold: 1
   # containers to be run before the controller's container starts.
   initContainers: []
   # Example:
@@ -569,18 +607,40 @@ portal:
 
 core:
   image:
-    repository: goharbor/harbor-core
-    tag: v2.14.2
+    repository: docker.io/goharbor/harbor-core
+    tag: v2.15.1
   # set the service account to be used, default if left empty
   serviceAccountName: ""
   # mount the service account token
   automountServiceAccountToken: false
   replicas: 1
+  podDisruptionBudget:
+    enabled: false
+    minAvailable: 1
+    # maxUnavailable: 1
   revisionHistoryLimit: 10
   ## Startup probe values
   startupProbe:
     enabled: true
     initialDelaySeconds: 10
+    periodSeconds: 10
+    timeoutSeconds: 1
+    failureThreshold: 360
+    successThreshold: 1
+  ## Liveness probe values
+  livenessProbe:
+    initialDelaySeconds: 0
+    periodSeconds: 10
+    timeoutSeconds: 1
+    failureThreshold: 2
+    successThreshold: 1
+  ## Readiness probe values
+  readinessProbe:
+    initialDelaySeconds: 0
+    periodSeconds: 10
+    timeoutSeconds: 1
+    failureThreshold: 2
+    successThreshold: 1
   # resources:
   #  requests:
   #    memory: 256Mi
@@ -658,18 +718,37 @@ core:
 
 jobservice:
   image:
-    repository: goharbor/harbor-jobservice
-    tag: v2.14.2
+    repository: docker.io/goharbor/harbor-jobservice
+    tag: v2.15.1
+  replicas: 1
+  podDisruptionBudget:
+    enabled: false
+    minAvailable: 1
+    # maxUnavailable: 1
+  revisionHistoryLimit: 10
+
   # set the service account to be used, default if left empty
   serviceAccountName: ""
   # mount the service account token
   automountServiceAccountToken: false
-  replicas: 1
-  revisionHistoryLimit: 10
   # resources:
   #   requests:
   #     memory: 256Mi
   #     cpu: 100m
+  ## Liveness probe values
+  livenessProbe:
+    initialDelaySeconds: 300
+    periodSeconds: 10
+    timeoutSeconds: 1
+    failureThreshold: 3
+    successThreshold: 1
+  ## Readiness probe values
+  readinessProbe:
+    initialDelaySeconds: 20
+    periodSeconds: 10
+    timeoutSeconds: 1
+    failureThreshold: 3
+    successThreshold: 1
   extraEnvVars: []
   nodeSelector: {}
   tolerations: []
@@ -717,31 +796,66 @@ jobservice:
   existingSecret: ""
   # Key within the existing secret for the job service secret
   existingSecretKey: JOBSERVICE_SECRET
+  # By default, the timeout is set to 30 minutes. This field only needs be re-configured if a longer request timeout is required. 
+  # the value assigned to timeout should be a number without min, e.g. registryHttpClientTimeout: 60 configures the timeout to 60 minutes
+  registryHttpClientTimeout: 30
 
 registry:
   registry:
     image:
-      repository: goharbor/registry-photon
-      tag: v2.14.2
+      repository: docker.io/goharbor/registry-photon
+      tag: v2.15.1
     # resources:
     #  requests:
     #    memory: 256Mi
     #    cpu: 100m
     extraEnvVars: []
+    ## Liveness probe values
+    livenessProbe:
+      initialDelaySeconds: 300
+      periodSeconds: 10
+      timeoutSeconds: 1
+      failureThreshold: 3
+      successThreshold: 1
+    ## Readiness probe values
+    readinessProbe:
+      initialDelaySeconds: 1
+      periodSeconds: 10
+      timeoutSeconds: 1
+      failureThreshold: 3
+      successThreshold: 1
   controller:
     image:
-      repository: goharbor/harbor-registryctl
-      tag: v2.14.2
+      repository: docker.io/goharbor/harbor-registryctl
+      tag: v2.15.1
     # resources:
     #  requests:
     #    memory: 256Mi
     #    cpu: 100m
     extraEnvVars: []
+    ## Liveness probe values
+    livenessProbe:
+      initialDelaySeconds: 300
+      periodSeconds: 10
+      timeoutSeconds: 1
+      failureThreshold: 3
+      successThreshold: 1
+    ## Readiness probe values
+    readinessProbe:
+      initialDelaySeconds: 1
+      periodSeconds: 10
+      timeoutSeconds: 1
+      failureThreshold: 3
+      successThreshold: 1
   # set the service account to be used, default if left empty
   serviceAccountName: ""
   # mount the service account token
   automountServiceAccountToken: false
   replicas: 1
+  podDisruptionBudget:
+    enabled: false
+    minAvailable: 1
+    # maxUnavailable: 1
   revisionHistoryLimit: 10
   nodeSelector: {}
   tolerations: []
@@ -783,7 +897,7 @@ registry:
     # If using existingSecret, the key must be REGISTRY_PASSWD and REGISTRY_HTPASSWD
     existingSecret: ""
     # Login and password in htpasswd string format. Excludes `registry.credentials.username`  and `registry.credentials.password`. May come in handy when integrating with tools like argocd or flux. This allows the same line to be generated each time the template is rendered, instead of the `htpasswd` function from helm, which generates different lines each time because of the salt.
-    # htpasswdString: $apr1$XLefHzeG$Xl4.s00sMSCCcMyJljSZb0 # example string
+    # htpasswdString: "harbor_registry_user:$2a$05$IPnI.TSgP8ek1/ESjkULVemA.A3nSXPdN80ljsmcun7FtE3ViSYUq" # example string, bcrypt is the only accepted hashing algorithm in htpasswd here.
     htpasswdString: ""
   middleware:
     enabled: false
@@ -810,15 +924,20 @@ trivy:
   enabled: true
   image:
     # repository the repository for Trivy adapter image
-    repository: goharbor/trivy-adapter-photon
+    repository: docker.io/goharbor/trivy-adapter-photon
     # tag the tag for Trivy adapter image
-    tag: v2.14.2
+    tag: v2.15.1
   # set the service account to be used, default if left empty
   serviceAccountName: ""
   # mount the service account token
   automountServiceAccountToken: false
   # replicas the number of Pod replicas
   replicas: 1
+  podDisruptionBudget:
+    enabled: false
+    minAvailable: 1
+    # maxUnavailable: 1
+
   resources:
     requests:
       cpu: 200m
@@ -826,6 +945,20 @@ trivy:
     limits:
       cpu: 1
       memory: 1Gi
+  ## Liveness probe values
+  livenessProbe:
+    initialDelaySeconds: 5
+    periodSeconds: 10
+    timeoutSeconds: 1
+    failureThreshold: 10
+    successThreshold: 1
+  ## Readiness probe values
+  readinessProbe:
+    initialDelaySeconds: 5
+    periodSeconds: 10
+    timeoutSeconds: 1
+    failureThreshold: 3
+    successThreshold: 1
   extraEnvVars: []
   nodeSelector: {}
   tolerations: []
@@ -915,8 +1048,8 @@ database:
   type: internal
   internal:
     image:
-      repository: goharbor/harbor-db
-      tag: v2.14.2
+      repository: docker.io/goharbor/harbor-db
+      tag: v2.15.1
     # set the service account to be used, default if left empty
     serviceAccountName: ""
     # mount the service account token
@@ -925,12 +1058,20 @@ database:
     #  requests:
     #    memory: 256Mi
     #    cpu: 100m
-    # The timeout used in livenessProbe; 1 to 5 seconds
+    ## Liveness probe values
     livenessProbe:
+      initialDelaySeconds: 300
+      periodSeconds: 10
       timeoutSeconds: 1
-    # The timeout used in readinessProbe; 1 to 5 seconds
+      failureThreshold: 3
+      successThreshold: 1
+    ## Readiness probe values
     readinessProbe:
+      initialDelaySeconds: 1
+      periodSeconds: 10
       timeoutSeconds: 1
+      failureThreshold: 3
+      successThreshold: 1
     extraEnvVars: []
     nodeSelector: {}
     tolerations: []
@@ -995,8 +1136,8 @@ redis:
   type: internal
   internal:
     image:
-      repository: goharbor/redis-photon
-      tag: v2.14.2
+      repository: docker.io/goharbor/redis-photon
+      tag: v2.15.1
     # set the service account to be used, default if left empty
     serviceAccountName: ""
     # mount the service account token
@@ -1005,6 +1146,20 @@ redis:
     #  requests:
     #    memory: 256Mi
     #    cpu: 100m
+    ## Liveness probe values
+    livenessProbe:
+      initialDelaySeconds: 300
+      periodSeconds: 10
+      timeoutSeconds: 1
+      failureThreshold: 3
+      successThreshold: 1
+    ## Readiness probe values
+    readinessProbe:
+      initialDelaySeconds: 1
+      periodSeconds: 10
+      timeoutSeconds: 1
+      failureThreshold: 3
+      successThreshold: 1
     extraEnvVars: []
     nodeSelector: {}
     tolerations: []
@@ -1065,17 +1220,35 @@ redis:
 
 exporter:
   image:
-    repository: goharbor/harbor-exporter
-    tag: v2.14.2
+    repository: docker.io/goharbor/harbor-exporter
+    tag: v2.15.1
   serviceAccountName: ""
   # mount the service account token
   automountServiceAccountToken: false
   replicas: 1
+  podDisruptionBudget:
+    enabled: false
+    minAvailable: 1
+    # maxUnavailable: 1
   revisionHistoryLimit: 10
   # resources:
   #  requests:
   #    memory: 256Mi
   #    cpu: 100m
+  ## Liveness probe values
+  livenessProbe:
+    initialDelaySeconds: 300
+    periodSeconds: 10
+    timeoutSeconds: 1
+    failureThreshold: 3
+    successThreshold: 1
+  ## Readiness probe values
+  readinessProbe:
+    initialDelaySeconds: 30
+    periodSeconds: 10
+    timeoutSeconds: 1
+    failureThreshold: 3
+    successThreshold: 1
   extraEnvVars: []
   podAnnotations: {}
   ## Additional deployment labels
diff --git a/packages/system/harbor/images/harbor-portal/Dockerfile b/packages/system/harbor/images/harbor-portal/Dockerfile
new file mode 100644
index 0000000000..d9d1914ea1
--- /dev/null
+++ b/packages/system/harbor/images/harbor-portal/Dockerfile
@@ -0,0 +1,42 @@
+# The portal half of the Harbor rebuild in images/harbor, kept in its own file
+# because its build output is static JS with no architecture. The Makefile
+# passes VERSION and COMMIT from images/harbor/Dockerfile so both files build
+# one pinned release. Follows upstream's make/photon/portal/Dockerfile{,.base}.
+#
+# Temporary, like images/harbor: deleted together with it once the vendored
+# chart moves to an upstream release that publishes arm64 (expected 2.16).
+ARG VERSION
+ARG COMMIT
+
+FROM --platform=$BUILDPLATFORM node:16.18.0@sha256:3547c98a330a08fb9dbb8b04ac4430f6d21133cb79f21f6cf8283184f523ff83 AS build
+ARG VERSION
+ARG COMMIT
+RUN git clone --branch ${VERSION} --depth 1 https://github.com/goharbor/harbor /harbor \
+    && test "$(git -C /harbor rev-parse HEAD)" = "${COMMIT}"
+# A VERSION bump must not build the portal with the old node.
+RUN grep -qxF "NODEBUILDIMAGE=node:$(node --version | sed 's/^v//')" /harbor/Makefile
+WORKDIR /harbor/src/portal
+# The postinstall hook generates the API client from ./swagger.yaml.
+RUN cp /harbor/api/v2.0/swagger.yaml swagger.yaml \
+    && npm install --unsafe-perm \
+    && npm run generate-build-timestamp \
+    && node --max_old_space_size=2048 node_modules/@angular/cli/bin/ng build --configuration production
+RUN npm install js-yaml@4.1.0 \
+    && node -e "const yaml = require('js-yaml'); const fs = require('fs'); fs.writeFileSync('swagger.json', JSON.stringify(yaml.load(fs.readFileSync('swagger.yaml', 'utf8'))));" \
+    && cp /harbor/LICENSE dist/
+RUN cd app-swagger-ui && npm install --unsafe-perm && npm run build
+
+FROM goharbor/photon:5.0@sha256:0e06d58615400bf2a3fe7da1175b889e2827969e3ac42e1c4010010770e6a712
+RUN tdnf install -y nginx shadow >> /dev/null \
+    && tdnf clean all \
+    && ln -sf /dev/stdout /var/log/nginx/access.log \
+    && ln -sf /dev/stderr /var/log/nginx/error.log \
+    && groupmod -g 10000 nginx && usermod -g 10000 -u 10000 -d /home/nginx -s /bin/bash nginx \
+    && chown -R nginx:nginx /etc/nginx
+COPY --from=build /harbor/src/portal/dist /usr/share/nginx/html
+COPY --from=build /harbor/src/portal/swagger.json /usr/share/nginx/html
+COPY --from=build /harbor/src/portal/app-swagger-ui/dist /usr/share/nginx/html
+VOLUME /var/cache/nginx /var/log/nginx /run
+STOPSIGNAL SIGQUIT
+USER nginx
+CMD ["nginx", "-g", "daemon off;"]
diff --git a/packages/system/harbor/images/harbor/Dockerfile b/packages/system/harbor/images/harbor/Dockerfile
new file mode 100644
index 0000000000..b269d8e2eb
--- /dev/null
+++ b/packages/system/harbor/images/harbor/Dockerfile
@@ -0,0 +1,210 @@
+# Upstream publishes the Harbor v2.15 component images for amd64 only; its
+# multi-arch build is on main but in no release yet. This rebuilds the pinned
+# release for every platform, one --target per image, following upstream's
+# make/photon/<component>/Dockerfile{,.base} and the compile targets of its
+# top-level Makefile. The portal is built by images/harbor-portal.
+#
+# Temporary: once the vendored chart moves to an upstream release that
+# publishes arm64 (expected 2.16), delete both Dockerfiles, the image target,
+# the image overrides in values.yaml, the build: line in the root Makefile,
+# the portal's ARCH_NEUTRAL entry in hack/image-builders-cross-compile.bats
+# and the harbor rule in .github/renovate.json, and drop the appVersion check
+# from the package's update target, which reads VERSION from this file.
+ARG VERSION=v2.15.1
+ARG COMMIT=335c05f2b9507b4c7116fe69b84e31ef9f4b91dd
+# REGISTRY_SRC_TAG, REGISTRYVERSION, TRIVYADAPTERVERSION, TRIVYVERSION and
+# SWAGGER_VERSION in upstream's Makefile at VERSION; the source stage fails
+# when they drift.
+ARG DISTRIBUTION_VERSION=v2.8.3-harbor.1-rc.1
+ARG DISTRIBUTION_COMMIT=086d3c33b3981cf598d0d82336a907fcf5c4c848
+ARG REGISTRY_VERSION=v2.8.3-patch-redis
+ARG TRIVY_ADAPTER_VERSION=v0.36.0
+ARG TRIVY_ADAPTER_COMMIT=f76a65660d4f4897a6c9b445ec91cbd76d685b5e
+ARG TRIVY_VERSION=v0.70.0
+ARG SWAGGER_VERSION=v0.33.1
+
+# Every Go stage uses this golang image; the source stage checks it against
+# upstream's GOBUILDIMAGE.
+FROM --platform=$BUILDPLATFORM golang:1.25.9@sha256:8a7adc288b77e9b787cd2695029eb54d10ae80571b21d44fed68d067ad0a9c96 AS source
+ARG GOPROXY
+ARG VERSION
+ARG COMMIT
+ARG DISTRIBUTION_VERSION
+ARG REGISTRY_VERSION
+ARG TRIVY_ADAPTER_VERSION
+ARG TRIVY_VERSION
+ARG SWAGGER_VERSION
+RUN git clone --branch ${VERSION} --depth 1 https://github.com/goharbor/harbor /harbor \
+    && test "$(git -C /harbor rev-parse HEAD)" = "${COMMIT}"
+WORKDIR /harbor
+# A VERSION bump must not pair the new core with the old registry, scanner or
+# toolchain.
+RUN grep -qxF "REGISTRY_SRC_TAG=${DISTRIBUTION_VERSION}" Makefile \
+    && grep -qxF "REGISTRYVERSION=${REGISTRY_VERSION}" Makefile \
+    && grep -qxF "TRIVYADAPTERVERSION=${TRIVY_ADAPTER_VERSION}" Makefile \
+    && grep -qxF "TRIVYVERSION=${TRIVY_VERSION}" Makefile \
+    && grep -qxF "SWAGGER_VERSION=${SWAGGER_VERSION}" Makefile \
+    && grep -qxF "GOBUILDIMAGE=golang:$(go env GOVERSION | sed 's/^go//')" Makefile
+# Upstream's gen_apis: the API server package is generated, not committed.
+RUN go run github.com/go-swagger/go-swagger/cmd/swagger@${SWAGGER_VERSION} generate server \
+      --template-dir=tools/swagger/templates --exclude-main \
+      --additional-initialism=CVE --additional-initialism=GC --additional-initialism=OIDC \
+      -f api/v2.0/swagger.yaml -A harbor --target src/server/v2.0
+# Upstream's versions_prepare; core serves it as the component versions.
+RUN printf 'VERSION_TAG: %s\nREGISTRY_VERSION: %s\nTRIVY_VERSION: %s\nTRIVY_ADAPTER_VERSION: %s\n' \
+      "${VERSION}" "${REGISTRY_VERSION}" "${TRIVY_VERSION}" "${TRIVY_ADAPTER_VERSION}" > make/photon/prepare/versions
+
+FROM --platform=$BUILDPLATFORM golang:1.25.9@sha256:8a7adc288b77e9b787cd2695029eb54d10ae80571b21d44fed68d067ad0a9c96 AS core-bin
+ARG GOPROXY
+ARG VERSION
+ARG COMMIT
+ARG TARGETOS
+ARG TARGETARCH
+COPY --from=source /harbor/src /harbor/src
+WORKDIR /harbor/src/core
+RUN --mount=type=cache,target=/go/pkg/mod --mount=type=cache,target=/root/.cache/go-build \
+    CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -buildvcs=false \
+      -ldflags "-w -s -X github.com/goharbor/harbor/src/pkg/version.GitCommit=$(echo ${COMMIT} | cut -c1-8) -X github.com/goharbor/harbor/src/pkg/version.ReleaseVersion=${VERSION}" \
+      -o /out/harbor_core
+
+FROM --platform=$BUILDPLATFORM golang:1.25.9@sha256:8a7adc288b77e9b787cd2695029eb54d10ae80571b21d44fed68d067ad0a9c96 AS jobservice-bin
+ARG GOPROXY
+ARG TARGETOS
+ARG TARGETARCH
+COPY --from=source /harbor/src /harbor/src
+WORKDIR /harbor/src/jobservice
+RUN --mount=type=cache,target=/go/pkg/mod --mount=type=cache,target=/root/.cache/go-build \
+    CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -buildvcs=false -o /out/harbor_jobservice
+
+FROM --platform=$BUILDPLATFORM golang:1.25.9@sha256:8a7adc288b77e9b787cd2695029eb54d10ae80571b21d44fed68d067ad0a9c96 AS registryctl-bin
+ARG GOPROXY
+ARG TARGETOS
+ARG TARGETARCH
+COPY --from=source /harbor/src /harbor/src
+WORKDIR /harbor/src/registryctl
+RUN --mount=type=cache,target=/go/pkg/mod --mount=type=cache,target=/root/.cache/go-build \
+    CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -buildvcs=false -o /out/harbor_registryctl
+
+FROM --platform=$BUILDPLATFORM golang:1.25.9@sha256:8a7adc288b77e9b787cd2695029eb54d10ae80571b21d44fed68d067ad0a9c96 AS exporter-bin
+ARG GOPROXY
+ARG VERSION
+ARG COMMIT
+ARG TARGETOS
+ARG TARGETARCH
+COPY --from=source /harbor/src /harbor/src
+WORKDIR /harbor/src/cmd/exporter
+RUN --mount=type=cache,target=/go/pkg/mod --mount=type=cache,target=/root/.cache/go-build \
+    CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -buildvcs=false \
+      -ldflags "-w -s -X github.com/goharbor/harbor/src/pkg/version.ReleaseVersion=${VERSION} -X github.com/goharbor/harbor/src/pkg/version.GitCommit=$(echo ${COMMIT} | cut -c1-8)" \
+      -o /out/harbor_exporter
+
+# Harbor's fork of distribution predates Go modules: it builds in GOPATH mode
+# against its vendor/ tree, as upstream's make/photon/registry/Dockerfile.binary.
+FROM --platform=$BUILDPLATFORM golang:1.25.9@sha256:8a7adc288b77e9b787cd2695029eb54d10ae80571b21d44fed68d067ad0a9c96 AS registry-bin
+ARG GOPROXY
+ARG DISTRIBUTION_VERSION
+ARG DISTRIBUTION_COMMIT
+ARG TARGETOS
+ARG TARGETARCH
+ENV SRC=/go/src/github.com/docker/distribution
+RUN git clone --branch ${DISTRIBUTION_VERSION} --depth 1 https://github.com/goharbor/distribution ${SRC} \
+    && test "$(git -C ${SRC} rev-parse HEAD)" = "${DISTRIBUTION_COMMIT}"
+WORKDIR ${SRC}
+RUN --mount=type=cache,target=/root/.cache/go-build \
+    CGO_ENABLED=0 GO111MODULE=off GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -tags "include_oss include_gcs" \
+      -ldflags "-s -w -X github.com/docker/distribution/version.Version=${DISTRIBUTION_VERSION} -X github.com/docker/distribution/version.Revision=${DISTRIBUTION_COMMIT} -X github.com/docker/distribution/version.Package=github.com/docker/distribution" \
+      -o /out/registry ./cmd/registry
+
+FROM --platform=$BUILDPLATFORM golang:1.25.9@sha256:8a7adc288b77e9b787cd2695029eb54d10ae80571b21d44fed68d067ad0a9c96 AS trivy-bin
+ARG GOPROXY
+ARG TRIVY_ADAPTER_VERSION
+ARG TRIVY_ADAPTER_COMMIT
+ARG TRIVY_VERSION
+ARG TARGETOS
+ARG TARGETARCH
+RUN git clone --branch ${TRIVY_ADAPTER_VERSION} --depth 1 https://github.com/goharbor/harbor-scanner-trivy /src \
+    && test "$(git -C /src rev-parse HEAD)" = "${TRIVY_ADAPTER_COMMIT}"
+WORKDIR /src
+RUN --mount=type=cache,target=/go/pkg/mod --mount=type=cache,target=/root/.cache/go-build \
+    CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -o /out/scanner-trivy ./cmd/scanner-trivy
+# Checksums from the release's trivy_<version>_checksums.txt.
+RUN case "${TARGETARCH}" in \
+      amd64) arch=64bit sum=8b4376d5d6befe5c24d503f10ff136d9e0c49f9127a4279fd110b727929a5aa9 ;; \
+      arm64) arch=ARM64 sum=2f6bb988b553a1bbac6bdd1ce890f5e412439564e17522b88a4541b4f364fc8d ;; \
+      *) echo "unsupported TARGETARCH ${TARGETARCH}" >&2; exit 1 ;; \
+    esac \
+    && curl -sSfL -o /tmp/trivy.tgz https://github.com/aquasecurity/trivy/releases/download/${TRIVY_VERSION}/trivy_${TRIVY_VERSION#v}_Linux-${arch}.tar.gz \
+    && echo "${sum}  /tmp/trivy.tgz" | sha256sum -c - \
+    && tar -xzf /tmp/trivy.tgz -C /out trivy
+
+FROM goharbor/photon:5.0@sha256:0e06d58615400bf2a3fe7da1175b889e2827969e3ac42e1c4010010770e6a712 AS harbor-base
+RUN tdnf install -y tzdata shadow >> /dev/null \
+    && tdnf clean all \
+    && groupadd -r -g 10000 harbor && useradd --no-log-init -r -m -g 10000 -u 10000 harbor \
+    && mkdir -p /harbor /etc/registry \
+    && chown -R harbor:harbor /harbor /etc/pki/tls/certs
+
+FROM harbor-base AS harbor-core
+COPY --from=source --chown=harbor:harbor --chmod=755 /harbor/make/photon/common/install_cert.sh /harbor/make/photon/core/entrypoint.sh /harbor/
+COPY --from=core-bin --chown=harbor:harbor /out/harbor_core /harbor/
+COPY --from=source --chown=harbor:harbor /harbor/src/core/views /harbor/views
+COPY --from=source --chown=harbor:harbor /harbor/make/migrations /harbor/migrations
+COPY --from=source --chown=harbor:harbor /harbor/icons /harbor/icons
+COPY --from=source --chown=harbor:harbor /harbor/make/photon/prepare/versions /harbor/
+WORKDIR /harbor/
+USER harbor
+ENTRYPOINT ["/harbor/entrypoint.sh"]
+
+FROM harbor-base AS harbor-jobservice
+COPY --from=source --chown=harbor:harbor --chmod=755 /harbor/make/photon/common/install_cert.sh /harbor/make/photon/jobservice/entrypoint.sh /harbor/
+COPY --from=jobservice-bin --chown=harbor:harbor /out/harbor_jobservice /harbor/
+WORKDIR /harbor/
+USER harbor
+VOLUME ["/var/log/jobs/"]
+ENTRYPOINT ["/harbor/entrypoint.sh"]
+
+FROM harbor-base AS harbor-exporter
+COPY --from=source --chown=harbor:harbor --chmod=755 /harbor/make/photon/common/install_cert.sh /harbor/make/photon/exporter/entrypoint.sh /harbor/
+COPY --from=exporter-bin --chown=harbor:harbor /out/harbor_exporter /harbor/
+WORKDIR /harbor
+USER harbor
+ENTRYPOINT ["/harbor/entrypoint.sh"]
+
+FROM harbor-base AS registry-photon
+COPY --from=source --chown=harbor:harbor --chmod=755 /harbor/make/photon/common/install_cert.sh /harbor/make/photon/registry/entrypoint.sh /home/harbor/
+COPY --from=registry-bin --chown=harbor:harbor /out/registry /usr/bin/registry_DO_NOT_USE_GC
+USER harbor
+VOLUME ["/storage"]
+ENTRYPOINT ["/home/harbor/entrypoint.sh"]
+
+FROM harbor-base AS harbor-registryctl
+COPY --from=source --chown=harbor:harbor --chmod=755 /harbor/make/photon/common/install_cert.sh /harbor/make/photon/registryctl/start.sh /home/harbor/
+COPY --from=registryctl-bin --chown=harbor:harbor /out/harbor_registryctl /home/harbor/
+COPY --from=registry-bin --chown=harbor:harbor /out/registry /usr/bin/registry_DO_NOT_USE_GC
+USER harbor
+VOLUME ["/var/lib/registry"]
+ENTRYPOINT ["/home/harbor/start.sh"]
+
+FROM goharbor/photon:5.0@sha256:0e06d58615400bf2a3fe7da1175b889e2827969e3ac42e1c4010010770e6a712 AS trivy-adapter-photon
+ARG TRIVY_VERSION
+RUN tdnf install -y rpm shadow >> /dev/null \
+    && tdnf clean all \
+    && groupadd -r -g 10000 scanner && useradd --no-log-init -m -r -g 10000 -u 10000 scanner \
+    && chown -R scanner:scanner /etc/pki/tls/certs
+COPY --from=source --chown=scanner:scanner --chmod=755 /harbor/make/photon/common/install_cert.sh /harbor/make/photon/trivy-adapter/entrypoint.sh /home/scanner/
+COPY --from=trivy-bin --chown=scanner:scanner /out/trivy /usr/local/bin/trivy
+COPY --from=trivy-bin --chown=scanner:scanner /out/scanner-trivy /home/scanner/bin/scanner-trivy
+ENV TRIVY_VERSION=${TRIVY_VERSION}
+USER scanner
+ENTRYPOINT ["/home/scanner/entrypoint.sh"]
+
+FROM goharbor/photon:5.0@sha256:0e06d58615400bf2a3fe7da1175b889e2827969e3ac42e1c4010010770e6a712 AS nginx-photon
+RUN tdnf install -y nginx shadow >> /dev/null \
+    && tdnf clean all \
+    && groupmod -g 10000 nginx && usermod -g 10000 -u 10000 -d /home/nginx -s /bin/bash nginx \
+    && ln -sf /dev/stdout /var/log/nginx/access.log \
+    && ln -sf /dev/stderr /var/log/nginx/error.log
+VOLUME /var/cache/nginx /var/log/nginx /run
+STOPSIGNAL SIGQUIT
+USER nginx
+CMD ["nginx", "-g", "daemon off;"]
diff --git a/packages/system/harbor/templates/redis.yaml b/packages/system/harbor/templates/redis.yaml
index b39c2b04af..b781e42f29 100644
--- a/packages/system/harbor/templates/redis.yaml
+++ b/packages/system/harbor/templates/redis.yaml
@@ -13,17 +13,31 @@ metadata:
   labels:
     app.kubernetes.io/instance: {{ .Values.harbor.fullnameOverride }}-redis
     app.kubernetes.io/managed-by: {{ .Release.Service }}
+    # The freshworks-oss operator reconciles only RedisFailovers whose
+    # operator-group label matches its OPERATOR_GROUP_ID (see
+    # packages/system/redis-operator/values.yaml); without it Harbor's Redis is
+    # never provisioned and harbor-core CrashLoops. Keep both sides in sync.
+    redis-failover.freshworks.com/operator-group: cozystack
 spec:
   sentinel:
+    # Pin the engine. The freshworks-oss operator's compiled-in default moved
+    # 6.2.6→7.2.4 between forks, and an unpinned image would silently jump on
+    # upgrade — with no rollback path, since 7.x rewrites the on-disk format
+    # 6.2.6 refuses to load. Keep Harbor's Redis on the version it runs today;
+    # bump it as a deliberate, separate change.
+    image: redis:6.2.6-alpine
     replicas: 3
     resources:
       limits:
-        cpu: 100m
+        cpu: 250m
         memory: 128Mi
       requests:
-        cpu: 50m
-        memory: 64Mi
+        cpu: 250m
+        memory: 128Mi
   redis:
+    # Pin the engine (see the sentinel note above): an upgrade must not rewrite
+    # Harbor's dump.rdb into a 7.x format a platform rollback can no longer load.
+    image: redis:6.2.6-alpine
     replicas: {{ .Values.redis.replicas }}
     resources:
       limits:
@@ -47,7 +61,7 @@ spec:
           {{- end }}
     exporter:
       enabled: true
-      image: oliver006/redis_exporter:v1.55.0-alpine
+      image: oliver006/redis_exporter:v1.55.0@sha256:d82625bda93823fb40de881ffbb45b65aca772a39c30141387f92314c258da5d
       args:
         - --web.telemetry-path
         - /metrics
diff --git a/packages/system/harbor/tests/redis_test.yaml b/packages/system/harbor/tests/redis_test.yaml
new file mode 100644
index 0000000000..b2fca6108b
--- /dev/null
+++ b/packages/system/harbor/tests/redis_test.yaml
@@ -0,0 +1,54 @@
+suite: redis sentinel sizing
+
+release:
+  name: harbor
+  namespace: tenant-root
+
+# templates/redis.yaml renders two documents: doc 0 is the redis-auth Secret,
+# doc 1 is the RedisFailover. The sentinels must run at Guaranteed QoS
+# (requests == limits): guaranteed CPU shares under node contention and top
+# eviction priority. A starved sentinel delays master election and stalls
+# harbor convergence.
+tests:
+  - it: sentinel is sized for contended-node convergence (Guaranteed QoS)
+    template: templates/redis.yaml
+    documentIndex: 1
+    set:
+      harbor:
+        fullnameOverride: harbor-test
+    asserts:
+      - equal:
+          path: spec.sentinel.resources.requests.cpu
+          value: 250m
+      - equal:
+          path: spec.sentinel.resources.limits.cpu
+          value: 250m
+      - equal:
+          path: spec.sentinel.resources.requests.memory
+          value: 128Mi
+      - equal:
+          path: spec.sentinel.resources.limits.memory
+          value: 128Mi
+
+  - it: RedisFailover is adopted by the operator group and pins its engine
+    template: templates/redis.yaml
+    documentIndex: 1
+    set:
+      harbor:
+        fullnameOverride: harbor-test
+    asserts:
+      # The label is the ONLY point of contact between the CR and the
+      # freshworks operator's group selector. A typo in the key or value
+      # produces no admission error and no operator log — just a Redis that
+      # never provisions and a harbor-core CrashLoop behind it.
+      - equal:
+          path: metadata.labels["redis-failover.freshworks.com/operator-group"]
+          value: cozystack
+      # Pin the engine so an operator-default bump (6.2.6->7.2.4) cannot silently
+      # move Harbor's Redis onto an on-disk format a platform rollback cannot load.
+      - equal:
+          path: spec.redis.image
+          value: redis:6.2.6-alpine
+      - equal:
+          path: spec.sentinel.image
+          value: redis:6.2.6-alpine
diff --git a/packages/system/harbor/values.yaml b/packages/system/harbor/values.yaml
index 9038bd3831..1ba59a9da0 100644
--- a/packages/system/harbor/values.yaml
+++ b/packages/system/harbor/values.yaml
@@ -1,4 +1,39 @@
-harbor: {}
+harbor:
+  # The upstream v2.15 images are amd64-only; `make image` replaces each ref
+  # with a multi-arch rebuild from images/.
+  core:
+    image:
+      repository: docker.io/goharbor/harbor-core
+      tag: v2.15.1@sha256:887a85b8ea98b76bfc9f715f1a0785bb99f9a1034241513902dd6e95be922a83
+  jobservice:
+    image:
+      repository: docker.io/goharbor/harbor-jobservice
+      tag: v2.15.1@sha256:0de4fd2ce3a02d3e6591b439e4674ea085885ddf43652b44004cc67eb19dba12
+  portal:
+    image:
+      repository: docker.io/goharbor/harbor-portal
+      tag: v2.15.1@sha256:ac55161c57a8351807adf8f8def264bdd52667c371d0436beefebdac4341c9e2
+  registry:
+    registry:
+      image:
+        repository: docker.io/goharbor/registry-photon
+        tag: v2.15.1@sha256:ebf0325c2661729dbb317cbf839608eb8b15cfa158911a94976f2c21563c466e
+    controller:
+      image:
+        repository: docker.io/goharbor/harbor-registryctl
+        tag: v2.15.1@sha256:554147a956989175f63f8d41573d716c6ddf6052acd1749c88c0f99ce6ee2bff
+  exporter:
+    image:
+      repository: docker.io/goharbor/harbor-exporter
+      tag: v2.15.1@sha256:372275b6b6abeb571fa7bd5de458e3d75f1a1636503b3c0abe02938f2b285d75
+  nginx:
+    image:
+      repository: docker.io/goharbor/nginx-photon
+      tag: v2.15.1@sha256:1f9d06d040f2478f6cf7f6da0091877bf987a641810f4bfaadb2a87d73dbf4fb
+  trivy:
+    image:
+      repository: docker.io/goharbor/trivy-adapter-photon
+      tag: v2.15.1@sha256:f0c52bed36c083ec4fded26cefab01e4cd58c9354c261cb3156c69f57bb50131
 db:
   replicas: 2
   size: 5Gi
diff --git a/packages/system/hetzner-robotlb/Makefile b/packages/system/hetzner-robotlb/Makefile
index c5ea0e4d48..e85ef6f776 100644
--- a/packages/system/hetzner-robotlb/Makefile
+++ b/packages/system/hetzner-robotlb/Makefile
@@ -6,4 +6,4 @@ include ../../../hack/package.mk
 update:
 	rm -rf charts
 	mkdir -p charts
-	helm pull oci://ghcr.io/intreecom/charts/robotlb --untar --untardir charts
+	helm pull oci://ghcr.io/treetscom/charts/robotlb --untar --untardir charts
diff --git a/packages/system/hetzner-robotlb/charts/robotlb/Chart.yaml b/packages/system/hetzner-robotlb/charts/robotlb/Chart.yaml
index 192470dd36..8a995f4696 100644
--- a/packages/system/hetzner-robotlb/charts/robotlb/Chart.yaml
+++ b/packages/system/hetzner-robotlb/charts/robotlb/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 0.0.6
+appVersion: 0.1.0
 description: A Helm chart for robotlb (loadbalancer on hetzner cloud).
 name: robotlb
 type: application
diff --git a/packages/system/hetzner-robotlb/charts/robotlb/templates/NOTES.txt b/packages/system/hetzner-robotlb/charts/robotlb/templates/NOTES.txt
index edef6874b4..86fb977197 100644
--- a/packages/system/hetzner-robotlb/charts/robotlb/templates/NOTES.txt
+++ b/packages/system/hetzner-robotlb/charts/robotlb/templates/NOTES.txt
@@ -1,4 +1,4 @@
 The RobotLB Operator was successfully installed.
 Please follow the readme to create loadbalanced services.
 
-README: https://github.com/intreecom/robotlb
+README: https://github.com/treetscom/robotlb
diff --git a/packages/system/hetzner-robotlb/charts/robotlb/values.yaml b/packages/system/hetzner-robotlb/charts/robotlb/values.yaml
index 4365f677b4..2524ad9e22 100644
--- a/packages/system/hetzner-robotlb/charts/robotlb/values.yaml
+++ b/packages/system/hetzner-robotlb/charts/robotlb/values.yaml
@@ -3,7 +3,7 @@
 # Declare variables to be passed into your templates.
 
 image:
-  repository: ghcr.io/intreecom/robotlb
+  repository: ghcr.io/treetscom/robotlb
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
   tag: ""
diff --git a/packages/system/http-cache-rd/Chart.yaml b/packages/system/http-cache-rd/Chart.yaml
deleted file mode 100644
index c82ad1aa69..0000000000
--- a/packages/system/http-cache-rd/Chart.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-apiVersion: v2
-name: http-cache-rd
-version: 0.0.0 # Placeholder, the actual version will be automatically set during the build process
diff --git a/packages/system/http-cache-rd/Makefile b/packages/system/http-cache-rd/Makefile
deleted file mode 100644
index 1d4b5be4a8..0000000000
--- a/packages/system/http-cache-rd/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-export NAME=http-cache-rd
-export NAMESPACE=cozy-system
-
-include ../../../hack/package.mk
diff --git a/packages/system/http-cache-rd/cozyrds/http-cache.yaml b/packages/system/http-cache-rd/cozyrds/http-cache.yaml
deleted file mode 100644
index 91fa44e200..0000000000
--- a/packages/system/http-cache-rd/cozyrds/http-cache.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-apiVersion: cozystack.io/v1alpha1
-kind: ApplicationDefinition
-metadata:
-  name: http-cache
-spec:
-  application:
-    kind: HTTPCache
-    plural: httpcaches
-    singular: httpcache
-    openAPISchema: |-
-      {"title":"Chart Values","type":"object","properties":{"size":{"description":"Persistent Volume Claim size available for application data.","default":"10Gi","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"storageClass":{"description":"StorageClass used to store the data.","type":"string","default":"","x-kubernetes-validations":[{"rule":"self == oldSelf","message":"storageClass is immutable"}]},"external":{"description":"Enable external access from outside the cluster.","type":"boolean","default":false},"endpoints":{"description":"Endpoints configuration, as a list of <ip:port>.","type":"array","default":[],"items":{"type":"string"}},"haproxy":{"description":"HAProxy configuration.","type":"object","default":{},"required":["replicas","resourcesPreset"],"properties":{"replicas":{"description":"Number of HAProxy replicas.","type":"integer","default":2},"resources":{"description":"Explicit CPU and memory configuration. When omitted, the preset defined in `resourcesPreset` is applied.","type":"object","default":{},"properties":{"cpu":{"description":"CPU available to each replica.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Memory (RAM) available to each replica.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}},"resourcesPreset":{"description":"Default sizing preset used when `resources` is omitted.","type":"string","default":"t1.nano","enum":["t1.nano","t1.micro","t1.small","t1.medium","t1.large","t1.xlarge","t1.2xlarge","t1.4xlarge","c1.nano","c1.micro","c1.small","c1.medium","c1.large","c1.xlarge","c1.2xlarge","c1.4xlarge","s1.nano","s1.micro","s1.small","s1.medium","s1.large","s1.xlarge","s1.2xlarge","s1.4xlarge","u1.nano","u1.micro","u1.small","u1.medium","u1.large","u1.xlarge","u1.2xlarge","u1.4xlarge","m1.nano","m1.micro","m1.small","m1.medium","m1.large","m1.xlarge","m1.2xlarge","m1.4xlarge","nano","micro","small","medium","large","xlarge","2xlarge"]}}},"nginx":{"description":"Nginx configuration.","type":"object","default":{},"required":["replicas","resourcesPreset"],"properties":{"replicas":{"description":"Number of Nginx replicas.","type":"integer","default":2},"resources":{"description":"Explicit CPU and memory configuration. When omitted, the preset defined in `resourcesPreset` is applied.","type":"object","default":{},"properties":{"cpu":{"description":"CPU available to each replica.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Memory (RAM) available to each replica.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}},"resourcesPreset":{"description":"Default sizing preset used when `resources` is omitted.","type":"string","default":"t1.nano","enum":["t1.nano","t1.micro","t1.small","t1.medium","t1.large","t1.xlarge","t1.2xlarge","t1.4xlarge","c1.nano","c1.micro","c1.small","c1.medium","c1.large","c1.xlarge","c1.2xlarge","c1.4xlarge","s1.nano","s1.micro","s1.small","s1.medium","s1.large","s1.xlarge","s1.2xlarge","s1.4xlarge","u1.nano","u1.micro","u1.small","u1.medium","u1.large","u1.xlarge","u1.2xlarge","u1.4xlarge","m1.nano","m1.micro","m1.small","m1.medium","m1.large","m1.xlarge","m1.2xlarge","m1.4xlarge","nano","micro","small","medium","large","xlarge","2xlarge"]}}}}}
-  release:
-    prefix: http-cache-
-    labels:
-      sharding.fluxcd.io/key: tenants
-    chartRef:
-      kind: ExternalArtifact
-      name: cozystack-http-cache-application-default-http-cache
-      namespace: cozy-system
-  dashboard:
-    category: NaaS
-    singular: HTTP Cache
-    plural: HTTP Cache
-    description: Layer7 load balancer and caching service
-    tags:
-      - cache
-      - network
-    icon: PHN2ZyB3aWR0aD0iMTQ0IiBoZWlnaHQ9IjE0NCIgdmlld0JveD0iMCAwIDE0NCAxNDQiIGZpbGw9Im5vbmUiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+CjxyZWN0IHdpZHRoPSIxNDQiIGhlaWdodD0iMTQ0IiByeD0iMjQiIGZpbGw9InVybCgjcGFpbnQwX2xpbmVhcl82ODFfMjgyNSkiLz4KPHBhdGggZD0iTTI2LjAwMjYgMzcuODU4OEMyNi4wMDI2IDYwLjkxOSAyNi4wMDI2IDgzLjk4MTQgMjYuMDAyNiAxMDcuMDQ2QzI1Ljk3MyAxMDguMzIzIDI2LjE5OTYgMTA5LjU5MyAyNi42NjkyIDExMC43ODNDMjcuMTM4NyAxMTEuOTcyIDI3Ljg0MTggMTEzLjA1NiAyOC43Mzc0IDExMy45NzJDMzAuNDUzOSAxMTUuNjU5IDMyLjcgMTE2LjcwOSAzNS4xMDA5IDExNi45NDhDMzcuNTAxOSAxMTcuMTg3IDM5LjkxMjYgMTE2LjYgNDEuOTMxIDExNS4yODRDNDMuMjgyIDExNC4zNzEgNDQuMzg4MSAxMTMuMTQzIDQ1LjE1MjcgMTExLjcwN0M0NS45MTc0IDExMC4yNzEgNDYuMzE3NSAxMDguNjcxIDQ2LjMxODEgMTA3LjA0NkM0Ni4zMTgxIDkwLjM1MjggNDYuMjg2MSA3My42NTk3IDQ2LjMxODEgNTYuOTY2NkM2MS42MTY4IDc1LjE4ODkgNzYuOTQ3NCA5My4zODU2IDkyLjMxIDExMS41NTdDOTQuNDQ0NCAxMTMuNzA4IDk3LjA4NzUgMTE1LjI5MSA5OS45OTcgMTE2LjE2MkMxMDIuOTA2IDExNy4wMzIgMTA1Ljk4OSAxMTcuMTYyIDEwOC45NjIgMTE2LjUzOUMxMTEuMDYxIDExNi4xMjggMTEyLjk3MyAxMTUuMDU3IDExNC40MTUgMTEzLjQ4NUMxMTUuODU3IDExMS45MTMgMTE2Ljc1NCAxMDkuOTIxIDExNi45NzQgMTA3LjgwNEMxMTcuMDA5IDg0LjI2ODEgMTE3LjAwOSA2MC43MzQzIDExNi45NzQgMzcuMjAyNUMxMTYuNzU0IDM0LjY5MDcgMTE1LjU5NSAzMi4zNTIyIDExMy43MjYgMzAuNjQ4NkMxMTEuODU4IDI4Ljk0NSAxMDkuNDE1IDI4IDEwNi44ODEgMjhDMTA0LjM0NiAyOCAxMDEuOTAzIDI4Ljk0NSAxMDAuMDM1IDMwLjY0ODZDOTguMTY2MyAzMi4zNTIyIDk3LjAwNzQgMzQuNjkwNyA5Ni43ODY5IDM3LjIwMjVDOTYuNzg2OSA1NC4xNjMyIDk2LjY4NDQgNzEuMTA0OCA5Ni43ODY5IDg4LjA1OTFDODEuNzYxNiA3MC40MzU4IDY2LjkyMTkgNTIuNjU5NiA1MS45NTQzIDM0Ljk3MjVDNDkuOTgxIDMyLjQ1NTQgNDcuMzY4NSAzMC41MDczIDQ0LjM4NjMgMjkuMzI5MUM0MS40MDQxIDI4LjE1MDkgMzguMTU5OSAyNy43ODUyIDM0Ljk4ODMgMjguMjY5OEMzMi41ODU3IDI4LjUzNTkgMzAuMzU4MyAyOS42NDkzIDI4LjcwOTkgMzEuNDA4NEMyNy4wNjE1IDMzLjE2NzUgMjYuMTAxIDM1LjQ1NTkgMjYuMDAyNiAzNy44NTg4WiIgZmlsbD0id2hpdGUiLz4KPGRlZnM+CjxsaW5lYXJHcmFkaWVudCBpZD0icGFpbnQwX2xpbmVhcl82ODFfMjgyNSIgeDE9IjEwIiB5MT0iMTUuNSIgeDI9IjE0NCIgeTI9IjEzMS41IiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+CjxzdG9wIHN0b3AtY29sb3I9IiMwMEM1NEEiLz4KPHN0b3Agb2Zmc2V0PSIxIiBzdG9wLWNvbG9yPSIjMDE5NjM5Ii8+CjwvbGluZWFyR3JhZGllbnQ+CjwvZGVmcz4KPC9zdmc+Cg==
-    keysOrder: [["apiVersion"], ["appVersion"], ["kind"], ["metadata"], ["metadata", "name"], ["spec", "size"], ["spec", "storageClass"], ["spec", "external"], ["spec", "endpoints"], ["spec", "haproxy"], ["spec", "haproxy", "replicas"], ["spec", "haproxy", "resources"], ["spec", "haproxy", "resourcesPreset"], ["spec", "nginx"], ["spec", "nginx", "replicas"], ["spec", "nginx", "resources"], ["spec", "nginx", "resourcesPreset"]]
-  secrets:
-    exclude: []
-    include: []
diff --git a/packages/system/ingress-nginx/Makefile b/packages/system/ingress-nginx/Makefile
index 81d78744d1..f17d054887 100644
--- a/packages/system/ingress-nginx/Makefile
+++ b/packages/system/ingress-nginx/Makefile
@@ -1,13 +1,24 @@
 NAME=ingress-nginx-system
 
+# Pinned: the controller image is a cozystack rebuild (protobuf exporter) and
+# only exists for selected upstream versions, so the chart must not drift ahead
+# of the tags published under ghcr.io/cozystack/ingress-nginx-with-protobuf-exporter.
+CHART_VERSION=4.11.6
+
 include ../../../hack/package.mk
 
 update:
 	rm -rf charts
 	helm repo add ingress-nginx https://kubernetes.github.io/ingress-nginx
 	helm repo update ingress-nginx
-	helm pull ingress-nginx/ingress-nginx --untar --untardir charts
+	helm pull ingress-nginx/ingress-nginx --version $(CHART_VERSION) --untar --untardir charts
 	patch --no-backup-if-mismatch -p 3 < patches/add-metrics2.patch
 	patch --no-backup-if-mismatch -p4 < patches/disable-ca-key-rotation.patch
 	rm -f charts/ingress-nginx/templates/controller-deployment.yaml.orig
 	rm -rf charts/ingress-nginx/changelog/
+
+# --with-subchart=false: the vendored chart carries upstream's own suites, which
+# assert against upstream default values and fail under the overrides in our
+# values.yaml. They are upstream's contract, not ours; run only our own.
+test:
+	helm unittest --with-subchart=false .
diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/Chart.yaml b/packages/system/ingress-nginx/charts/ingress-nginx/Chart.yaml
index fd7b81030d..7572f90f26 100644
--- a/packages/system/ingress-nginx/charts/ingress-nginx/Chart.yaml
+++ b/packages/system/ingress-nginx/charts/ingress-nginx/Chart.yaml
@@ -1,9 +1,9 @@
 annotations:
   artifacthub.io/changes: |
-    - Update Ingress-Nginx version controller-v1.11.2
+    - Update Ingress-Nginx version controller-v1.11.6
   artifacthub.io/prerelease: "false"
 apiVersion: v2
-appVersion: 1.11.2
+appVersion: 1.11.6
 description: Ingress controller for Kubernetes using NGINX as a reverse proxy and
   load balancer
 home: https://github.com/kubernetes/ingress-nginx
@@ -15,11 +15,9 @@ kubeVersion: '>=1.21.0-0'
 maintainers:
 - name: cpanato
 - name: Gacko
-- name: puerco
-- name: rikatz
 - name: strongjz
 - name: tao12345666333
 name: ingress-nginx
 sources:
 - https://github.com/kubernetes/ingress-nginx
-version: 4.11.2
+version: 4.11.6
diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/OWNERS b/packages/system/ingress-nginx/charts/ingress-nginx/OWNERS
index d588ede681..428474f631 100644
--- a/packages/system/ingress-nginx/charts/ingress-nginx/OWNERS
+++ b/packages/system/ingress-nginx/charts/ingress-nginx/OWNERS
@@ -1,10 +1,4 @@
 # See the OWNERS docs: https://www.kubernetes.dev/docs/guide/owners
 
-approvers:
-- ingress-nginx-helm-maintainers
-
-reviewers:
-- ingress-nginx-helm-reviewers
-
 labels:
 - area/helm
diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/README.md b/packages/system/ingress-nginx/charts/ingress-nginx/README.md
index 26eab28555..9f504a6dc2 100644
--- a/packages/system/ingress-nginx/charts/ingress-nginx/README.md
+++ b/packages/system/ingress-nginx/charts/ingress-nginx/README.md
@@ -2,7 +2,7 @@
 
 [ingress-nginx](https://github.com/kubernetes/ingress-nginx) Ingress controller for Kubernetes using NGINX as a reverse proxy and load balancer
 
-![Version: 4.11.2](https://img.shields.io/badge/Version-4.11.2-informational?style=flat-square) ![AppVersion: 1.11.2](https://img.shields.io/badge/AppVersion-1.11.2-informational?style=flat-square)
+![Version: 4.11.6](https://img.shields.io/badge/Version-4.11.6-informational?style=flat-square) ![AppVersion: 1.11.6](https://img.shields.io/badge/AppVersion-1.11.6-informational?style=flat-square)
 
 To use, add `ingressClassName: nginx` spec field or the `kubernetes.io/ingress.class: nginx` annotation to your Ingress resources.
 
@@ -229,6 +229,24 @@ Detail of how and why are in [this issue](https://github.com/helm/charts/pull/13
 
 As of version `1.26.0` of this chart, by simply not providing any clusterIP value, `invalid: spec.clusterIP: Invalid value: "": field is immutable` will no longer occur since `clusterIP: ""` will not be rendered.
 
+### Pod Security Admission
+
+You can use Pod Security Admission by applying labels to the `ingress-nginx` namespace as instructed by the [documentation](https://kubernetes.io/docs/tasks/configure-pod-container/enforce-standards-namespace-labels).
+
+Example:
+
+```yaml
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: ingress-nginx
+  labels:
+    kubernetes.io/metadata.name: ingress-nginx
+    name: ingress-nginx
+    pod-security.kubernetes.io/enforce: restricted
+    pod-security.kubernetes.io/enforce-version: v1.31
+```
+
 ## Values
 
 | Key | Type | Default | Description |
@@ -253,11 +271,11 @@ As of version `1.26.0` of this chart, by simply not providing any clusterIP valu
 | controller.admissionWebhooks.namespaceSelector | object | `{}` |  |
 | controller.admissionWebhooks.objectSelector | object | `{}` |  |
 | controller.admissionWebhooks.patch.enabled | bool | `true` |  |
-| controller.admissionWebhooks.patch.image.digest | string | `"sha256:a320a50cc91bd15fd2d6fa6de58bd98c1bd64b9a6f926ce23a600d87043455a3"` |  |
+| controller.admissionWebhooks.patch.image.digest | string | `"sha256:2cf4ebfa82a37c357455458f6dfc334aea1392d508270b2517795a9933a02524"` |  |
 | controller.admissionWebhooks.patch.image.image | string | `"ingress-nginx/kube-webhook-certgen"` |  |
 | controller.admissionWebhooks.patch.image.pullPolicy | string | `"IfNotPresent"` |  |
 | controller.admissionWebhooks.patch.image.registry | string | `"registry.k8s.io"` |  |
-| controller.admissionWebhooks.patch.image.tag | string | `"v1.4.3"` |  |
+| controller.admissionWebhooks.patch.image.tag | string | `"v1.5.3"` |  |
 | controller.admissionWebhooks.patch.labels | object | `{}` | Labels to be added to patch job resources |
 | controller.admissionWebhooks.patch.networkPolicy.enabled | bool | `false` | Enable 'networkPolicy' or not |
 | controller.admissionWebhooks.patch.nodeSelector."kubernetes.io/os" | string | `"linux"` |  |
@@ -325,8 +343,8 @@ As of version `1.26.0` of this chart, by simply not providing any clusterIP valu
 | controller.hostname | object | `{}` | Optionally customize the pod hostname. |
 | controller.image.allowPrivilegeEscalation | bool | `false` |  |
 | controller.image.chroot | bool | `false` |  |
-| controller.image.digest | string | `"sha256:d5f8217feeac4887cb1ed21f27c2674e58be06bd8f5184cacea2a69abaf78dce"` |  |
-| controller.image.digestChroot | string | `"sha256:21b55a2f0213a18b91612a8c0850167e00a8e34391fd595139a708f9c047e7a8"` |  |
+| controller.image.digest | string | `"sha256:4f04fad99f00e604ab488cf0945b4eaa2a93f603f97d2a45fc610ff0f3cad0f9"` |  |
+| controller.image.digestChroot | string | `"sha256:596f8b9ae4773d3b00dfd65855561419c7e70ecb23569a7a2998b47e160b4f85"` |  |
 | controller.image.image | string | `"ingress-nginx/controller"` |  |
 | controller.image.pullPolicy | string | `"IfNotPresent"` |  |
 | controller.image.readOnlyRootFilesystem | bool | `false` |  |
@@ -334,7 +352,7 @@ As of version `1.26.0` of this chart, by simply not providing any clusterIP valu
 | controller.image.runAsNonRoot | bool | `true` |  |
 | controller.image.runAsUser | int | `101` |  |
 | controller.image.seccompProfile.type | string | `"RuntimeDefault"` |  |
-| controller.image.tag | string | `"v1.11.2"` |  |
+| controller.image.tag | string | `"v1.11.6"` |  |
 | controller.ingressClass | string | `"nginx"` | For backwards compatibility with ingress.class annotation, use ingressClass. Algorithm is as follows, first ingressClassName is considered, if not present, controller looks for ingress.class annotation |
 | controller.ingressClassByName | bool | `false` | Process IngressClass per name (additionally as per spec.controller). |
 | controller.ingressClassResource | object | `{"aliases":[],"annotations":{},"controllerValue":"k8s.io/ingress-nginx","default":false,"enabled":true,"name":"nginx","parameters":{}}` | This section refers to the creation of the IngressClass resource. IngressClasses are immutable and cannot be changed after creation. We do not support namespaced IngressClasses, yet, so a ClusterRole and a ClusterRoleBinding is required. |
@@ -366,7 +384,7 @@ As of version `1.26.0` of this chart, by simply not providing any clusterIP valu
 | controller.livenessProbe.periodSeconds | int | `10` |  |
 | controller.livenessProbe.successThreshold | int | `1` |  |
 | controller.livenessProbe.timeoutSeconds | int | `1` |  |
-| controller.maxmindLicenseKey | string | `""` | Maxmind license key to download GeoLite2 Databases. # https://blog.maxmind.com/2019/12/18/significant-changes-to-accessing-and-using-geolite2-databases |
+| controller.maxmindLicenseKey | string | `""` | Maxmind license key to download GeoLite2 Databases. # https://blog.maxmind.com/2019/12/significant-changes-to-accessing-and-using-geolite2-databases/ |
 | controller.metrics.enabled | bool | `false` |  |
 | controller.metrics.port | int | `10254` |  |
 | controller.metrics.portName | string | `"metrics"` |  |
@@ -380,7 +398,7 @@ As of version `1.26.0` of this chart, by simply not providing any clusterIP valu
 | controller.metrics.service.servicePort | int | `10254` |  |
 | controller.metrics.service.type | string | `"ClusterIP"` |  |
 | controller.metrics.serviceMonitor.additionalLabels | object | `{}` |  |
-| controller.metrics.serviceMonitor.annotations | object | `{}` |  |
+| controller.metrics.serviceMonitor.annotations | object | `{}` | Annotations to be added to the ServiceMonitor. |
 | controller.metrics.serviceMonitor.enabled | bool | `false` |  |
 | controller.metrics.serviceMonitor.metricRelabelings | list | `[]` |  |
 | controller.metrics.serviceMonitor.namespace | string | `""` |  |
@@ -515,7 +533,7 @@ As of version `1.26.0` of this chart, by simply not providing any clusterIP valu
 | defaultBackend.livenessProbe.periodSeconds | int | `10` |  |
 | defaultBackend.livenessProbe.successThreshold | int | `1` |  |
 | defaultBackend.livenessProbe.timeoutSeconds | int | `5` |  |
-| defaultBackend.minAvailable | int | `1` |  |
+| defaultBackend.minAvailable | int | `1` | Minimum available pods set in PodDisruptionBudget. |
 | defaultBackend.minReadySeconds | int | `0` | `minReadySeconds` to avoid killing pods before we are ready # |
 | defaultBackend.name | string | `"defaultbackend"` |  |
 | defaultBackend.networkPolicy.enabled | bool | `false` | Enable 'networkPolicy' or not |
diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/README.md.gotmpl b/packages/system/ingress-nginx/charts/ingress-nginx/README.md.gotmpl
index 17b029bbfa..3cb9d5651b 100644
--- a/packages/system/ingress-nginx/charts/ingress-nginx/README.md.gotmpl
+++ b/packages/system/ingress-nginx/charts/ingress-nginx/README.md.gotmpl
@@ -226,4 +226,22 @@ Detail of how and why are in [this issue](https://github.com/helm/charts/pull/13
 
 As of version `1.26.0` of this chart, by simply not providing any clusterIP value, `invalid: spec.clusterIP: Invalid value: "": field is immutable` will no longer occur since `clusterIP: ""` will not be rendered.
 
+### Pod Security Admission
+
+You can use Pod Security Admission by applying labels to the `ingress-nginx` namespace as instructed by the [documentation](https://kubernetes.io/docs/tasks/configure-pod-container/enforce-standards-namespace-labels).
+
+Example:
+
+```yaml
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: ingress-nginx
+  labels:
+    kubernetes.io/metadata.name: ingress-nginx
+    name: ingress-nginx
+    pod-security.kubernetes.io/enforce: restricted
+    pod-security.kubernetes.io/enforce-version: v1.31
+```
+
 {{ template "chart.valuesSection" . }}
diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/ci/admission-webhooks-cert-manager-values.yaml b/packages/system/ingress-nginx/charts/ingress-nginx/ci/admission-webhooks-cert-manager-values.yaml
new file mode 100644
index 0000000000..7eafd0c5be
--- /dev/null
+++ b/packages/system/ingress-nginx/charts/ingress-nginx/ci/admission-webhooks-cert-manager-values.yaml
@@ -0,0 +1,12 @@
+controller:
+  image:
+    repository: ingress-controller/controller
+    tag: 1.0.0-dev
+    digest: null
+
+  service:
+    type: ClusterIP
+
+  admissionWebhooks:
+    certManager:
+      enabled: true
diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/ci/controller-admission-tls-cert-manager-values.yaml b/packages/system/ingress-nginx/charts/ingress-nginx/ci/controller-admission-tls-cert-manager-values.yaml
deleted file mode 100644
index a13241cd4c..0000000000
--- a/packages/system/ingress-nginx/charts/ingress-nginx/ci/controller-admission-tls-cert-manager-values.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-controller:
-  admissionWebhooks:
-    certManager:
-      enabled: true
-  service:
-    type: ClusterIP
diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/ci/controller-configmap-addheaders-values.yaml b/packages/system/ingress-nginx/charts/ingress-nginx/ci/controller-configmap-addheaders-values.yaml
new file mode 100644
index 0000000000..460a610bac
--- /dev/null
+++ b/packages/system/ingress-nginx/charts/ingress-nginx/ci/controller-configmap-addheaders-values.yaml
@@ -0,0 +1,11 @@
+controller:
+  image:
+    repository: ingress-controller/controller
+    tag: 1.0.0-dev
+    digest: null
+
+  service:
+    type: ClusterIP
+
+  addHeaders:
+    X-Frame-Options: deny
diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/ci/controller-configmap-proxyheaders-values.yaml b/packages/system/ingress-nginx/charts/ingress-nginx/ci/controller-configmap-proxyheaders-values.yaml
new file mode 100644
index 0000000000..e23a13c0c6
--- /dev/null
+++ b/packages/system/ingress-nginx/charts/ingress-nginx/ci/controller-configmap-proxyheaders-values.yaml
@@ -0,0 +1,11 @@
+controller:
+  image:
+    repository: ingress-controller/controller
+    tag: 1.0.0-dev
+    digest: null
+
+  service:
+    type: ClusterIP
+
+  proxySetHeaders:
+    X-Forwarded-Proto: https
diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/ci/controller-configmap-values.yaml b/packages/system/ingress-nginx/charts/ingress-nginx/ci/controller-configmap-values.yaml
new file mode 100644
index 0000000000..a7029895ca
--- /dev/null
+++ b/packages/system/ingress-nginx/charts/ingress-nginx/ci/controller-configmap-values.yaml
@@ -0,0 +1,11 @@
+controller:
+  image:
+    repository: ingress-controller/controller
+    tag: 1.0.0-dev
+    digest: null
+
+  service:
+    type: ClusterIP
+
+  config:
+    use-proxy-protocol: "true"
diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/ci/controller-custom-ingressclass-flags.yaml b/packages/system/ingress-nginx/charts/ingress-nginx/ci/controller-custom-ingressclass-flags.yaml
deleted file mode 100644
index b28a2326ee..0000000000
--- a/packages/system/ingress-nginx/charts/ingress-nginx/ci/controller-custom-ingressclass-flags.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-controller:
-  watchIngressWithoutClass: true
-  ingressClassResource:
-    name: custom-nginx
-    enabled: true
-    default: true
-    controllerValue: "k8s.io/custom-nginx"
diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/ci/controller-daemonset-extra-modules-values.yaml b/packages/system/ingress-nginx/charts/ingress-nginx/ci/controller-daemonset-extra-modules-values.yaml
new file mode 100644
index 0000000000..edf12e77ed
--- /dev/null
+++ b/packages/system/ingress-nginx/charts/ingress-nginx/ci/controller-daemonset-extra-modules-values.yaml
@@ -0,0 +1,30 @@
+controller:
+  image:
+    repository: ingress-controller/controller
+    tag: 1.0.0-dev
+    digest: null
+
+  service:
+    type: ClusterIP
+
+  kind: DaemonSet
+
+  extraModules:
+  - name: opentelemetry
+    image:
+      registry: registry.k8s.io
+      image: ingress-nginx/opentelemetry-1.25.3
+      tag: v20240813-b933310d
+      digest: sha256:f7604ac0547ed64d79b98d92133234e66c2c8aade3c1f4809fed5eec1fb7f922
+      distroless: true
+    containerSecurityContext:
+      runAsNonRoot: true
+      runAsUser: 65532
+      runAsGroup: 65532
+      allowPrivilegeEscalation: false
+      seccompProfile:
+        type: RuntimeDefault
+      capabilities:
+        drop:
+        - ALL
+      readOnlyRootFilesystem: true
diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/ci/controller-daemonset-metrics-values.yaml b/packages/system/ingress-nginx/charts/ingress-nginx/ci/controller-daemonset-metrics-values.yaml
new file mode 100644
index 0000000000..7a98580cd7
--- /dev/null
+++ b/packages/system/ingress-nginx/charts/ingress-nginx/ci/controller-daemonset-metrics-values.yaml
@@ -0,0 +1,13 @@
+controller:
+  image:
+    repository: ingress-controller/controller
+    tag: 1.0.0-dev
+    digest: null
+
+  service:
+    type: ClusterIP
+
+  kind: DaemonSet
+
+  metrics:
+    enabled: true
diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/ci/controller-daemonset-opentelemetry-values.yaml b/packages/system/ingress-nginx/charts/ingress-nginx/ci/controller-daemonset-opentelemetry-values.yaml
new file mode 100644
index 0000000000..179ab2a85a
--- /dev/null
+++ b/packages/system/ingress-nginx/charts/ingress-nginx/ci/controller-daemonset-opentelemetry-values.yaml
@@ -0,0 +1,13 @@
+controller:
+  image:
+    repository: ingress-controller/controller
+    tag: 1.0.0-dev
+    digest: null
+
+  service:
+    type: ClusterIP
+
+  kind: DaemonSet
+
+  opentelemetry:
+    enabled: true
diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/ci/controller-daemonset-podannotations-values.yaml b/packages/system/ingress-nginx/charts/ingress-nginx/ci/controller-daemonset-podannotations-values.yaml
new file mode 100644
index 0000000000..405992ef30
--- /dev/null
+++ b/packages/system/ingress-nginx/charts/ingress-nginx/ci/controller-daemonset-podannotations-values.yaml
@@ -0,0 +1,16 @@
+controller:
+  image:
+    repository: ingress-controller/controller
+    tag: 1.0.0-dev
+    digest: null
+
+  service:
+    type: ClusterIP
+
+  kind: DaemonSet
+
+  podAnnotations:
+    prometheus.io/scrape: "true"
+    prometheus.io/port: "10254"
+    prometheus.io/scheme: http
+    prometheus.io/path: /metrics
diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/ci/controller-daemonset-values.yaml b/packages/system/ingress-nginx/charts/ingress-nginx/ci/controller-daemonset-values.yaml
new file mode 100644
index 0000000000..d34025c80f
--- /dev/null
+++ b/packages/system/ingress-nginx/charts/ingress-nginx/ci/controller-daemonset-values.yaml
@@ -0,0 +1,10 @@
+controller:
+  image:
+    repository: ingress-controller/controller
+    tag: 1.0.0-dev
+    digest: null
+
+  service:
+    type: ClusterIP
+
+  kind: DaemonSet
diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/ci/controller-deployment-extra-modules-values.yaml b/packages/system/ingress-nginx/charts/ingress-nginx/ci/controller-deployment-extra-modules-values.yaml
new file mode 100644
index 0000000000..d4083cc375
--- /dev/null
+++ b/packages/system/ingress-nginx/charts/ingress-nginx/ci/controller-deployment-extra-modules-values.yaml
@@ -0,0 +1,30 @@
+controller:
+  image:
+    repository: ingress-controller/controller
+    tag: 1.0.0-dev
+    digest: null
+
+  service:
+    type: ClusterIP
+
+  kind: Deployment
+
+  extraModules:
+  - name: opentelemetry
+    image:
+      registry: registry.k8s.io
+      image: ingress-nginx/opentelemetry-1.25.3
+      tag: v20240813-b933310d
+      digest: sha256:f7604ac0547ed64d79b98d92133234e66c2c8aade3c1f4809fed5eec1fb7f922
+      distroless: true
+    containerSecurityContext:
+      runAsNonRoot: true
+      runAsUser: 65532
+      runAsGroup: 65532
+      allowPrivilegeEscalation: false
+      seccompProfile:
+        type: RuntimeDefault
+      capabilities:
+        drop:
+        - ALL
+      readOnlyRootFilesystem: true
diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/ci/controller-deployment-metrics-values.yaml b/packages/system/ingress-nginx/charts/ingress-nginx/ci/controller-deployment-metrics-values.yaml
new file mode 100644
index 0000000000..9c95d347c4
--- /dev/null
+++ b/packages/system/ingress-nginx/charts/ingress-nginx/ci/controller-deployment-metrics-values.yaml
@@ -0,0 +1,13 @@
+controller:
+  image:
+    repository: ingress-controller/controller
+    tag: 1.0.0-dev
+    digest: null
+
+  service:
+    type: ClusterIP
+
+  kind: Deployment
+
+  metrics:
+    enabled: true
diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/ci/controller-deployment-opentelemetry-values.yaml b/packages/system/ingress-nginx/charts/ingress-nginx/ci/controller-deployment-opentelemetry-values.yaml
new file mode 100644
index 0000000000..9443ddefcc
--- /dev/null
+++ b/packages/system/ingress-nginx/charts/ingress-nginx/ci/controller-deployment-opentelemetry-values.yaml
@@ -0,0 +1,13 @@
+controller:
+  image:
+    repository: ingress-controller/controller
+    tag: 1.0.0-dev
+    digest: null
+
+  service:
+    type: ClusterIP
+
+  kind: Deployment
+
+  opentelemetry:
+    enabled: true
diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/ci/controller-deployment-podannotations-values.yaml b/packages/system/ingress-nginx/charts/ingress-nginx/ci/controller-deployment-podannotations-values.yaml
new file mode 100644
index 0000000000..cf1f2611e6
--- /dev/null
+++ b/packages/system/ingress-nginx/charts/ingress-nginx/ci/controller-deployment-podannotations-values.yaml
@@ -0,0 +1,16 @@
+controller:
+  image:
+    repository: ingress-controller/controller
+    tag: 1.0.0-dev
+    digest: null
+
+  service:
+    type: ClusterIP
+
+  kind: Deployment
+
+  podAnnotations:
+    prometheus.io/scrape: "true"
+    prometheus.io/port: "10254"
+    prometheus.io/scheme: http
+    prometheus.io/path: /metrics
diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/ci/controller-deployment-values.yaml b/packages/system/ingress-nginx/charts/ingress-nginx/ci/controller-deployment-values.yaml
new file mode 100644
index 0000000000..1b092dc0c1
--- /dev/null
+++ b/packages/system/ingress-nginx/charts/ingress-nginx/ci/controller-deployment-values.yaml
@@ -0,0 +1,10 @@
+controller:
+  image:
+    repository: ingress-controller/controller
+    tag: 1.0.0-dev
+    digest: null
+
+  service:
+    type: ClusterIP
+
+  kind: Deployment
diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/ci/controller-hpa-values.yaml b/packages/system/ingress-nginx/charts/ingress-nginx/ci/controller-hpa-values.yaml
new file mode 100644
index 0000000000..54a0d2f75a
--- /dev/null
+++ b/packages/system/ingress-nginx/charts/ingress-nginx/ci/controller-hpa-values.yaml
@@ -0,0 +1,18 @@
+controller:
+  image:
+    repository: ingress-controller/controller
+    tag: 1.0.0-dev
+    digest: null
+
+  service:
+    type: ClusterIP
+
+  autoscaling:
+    enabled: true
+    behavior:
+      scaleDown:
+        stabilizationWindowSeconds: 300
+        policies:
+        - type: Pods
+          value: 1
+          periodSeconds: 180
diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/ci/controller-ingressclass-values.yaml b/packages/system/ingress-nginx/charts/ingress-nginx/ci/controller-ingressclass-values.yaml
new file mode 100644
index 0000000000..c06429f975
--- /dev/null
+++ b/packages/system/ingress-nginx/charts/ingress-nginx/ci/controller-ingressclass-values.yaml
@@ -0,0 +1,15 @@
+controller:
+  image:
+    repository: ingress-controller/controller
+    tag: 1.0.0-dev
+    digest: null
+
+  service:
+    type: ClusterIP
+
+  ingressClassResource:
+    name: custom-nginx
+    default: true
+    controllerValue: k8s.io/custom-nginx
+
+  watchIngressWithoutClass: true
diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/ci/controller-service-internal-values.yaml b/packages/system/ingress-nginx/charts/ingress-nginx/ci/controller-service-internal-values.yaml
new file mode 100644
index 0000000000..11108fbce9
--- /dev/null
+++ b/packages/system/ingress-nginx/charts/ingress-nginx/ci/controller-service-internal-values.yaml
@@ -0,0 +1,13 @@
+controller:
+  image:
+    repository: ingress-controller/controller
+    tag: 1.0.0-dev
+    digest: null
+
+  service:
+    type: ClusterIP
+
+    internal:
+      enabled: true
+      annotations:
+        service.beta.kubernetes.io/aws-load-balancer-internal: "true"
diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/ci/controller-service-values.yaml b/packages/system/ingress-nginx/charts/ingress-nginx/ci/controller-service-values.yaml
new file mode 100644
index 0000000000..9039368c28
--- /dev/null
+++ b/packages/system/ingress-nginx/charts/ingress-nginx/ci/controller-service-values.yaml
@@ -0,0 +1,22 @@
+controller:
+  image:
+    repository: ingress-controller/controller
+    tag: 1.0.0-dev
+    digest: null
+
+  service:
+    type: NodePort
+
+    nodePorts:
+      tcp:
+        9000: 30090
+      udp:
+        9001: 30091
+
+portNamePrefix: port
+
+tcp:
+  9000: default/test:8080
+
+udp:
+  9001: default/test:8080
diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/ci/daemonset-customconfig-values.yaml b/packages/system/ingress-nginx/charts/ingress-nginx/ci/daemonset-customconfig-values.yaml
deleted file mode 100644
index 4393a5bc06..0000000000
--- a/packages/system/ingress-nginx/charts/ingress-nginx/ci/daemonset-customconfig-values.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-controller:
-  image:
-    repository: ingress-controller/controller
-    tag: 1.0.0-dev
-    digest: null
-  kind: DaemonSet
-  allowSnippetAnnotations: false
-  admissionWebhooks:
-    enabled: false
-  service:
-    type: ClusterIP
-
-  config:
-    use-proxy-protocol: "true"
diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/ci/daemonset-customnodeport-values.yaml b/packages/system/ingress-nginx/charts/ingress-nginx/ci/daemonset-customnodeport-values.yaml
deleted file mode 100644
index 1d94be219b..0000000000
--- a/packages/system/ingress-nginx/charts/ingress-nginx/ci/daemonset-customnodeport-values.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-controller:
-  kind: DaemonSet
-  image:
-    repository: ingress-controller/controller
-    tag: 1.0.0-dev
-    digest: null
-  admissionWebhooks:
-    enabled: false
-
-  service:
-    type: NodePort
-    nodePorts:
-      tcp:
-        9000: 30090
-      udp:
-        9001: 30091
-
-tcp:
-  9000: "default/test:8080"
-
-udp:
-  9001: "default/test:8080"
diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/ci/daemonset-extra-modules.yaml b/packages/system/ingress-nginx/charts/ingress-nginx/ci/daemonset-extra-modules.yaml
deleted file mode 100644
index 52a32fcbd4..0000000000
--- a/packages/system/ingress-nginx/charts/ingress-nginx/ci/daemonset-extra-modules.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-controller:
-  kind: DaemonSet
-  image:
-    repository: ingress-controller/controller
-    tag: 1.0.0-dev
-  service:
-    type: ClusterIP
-  extraModules:
-    - name: opentelemetry
-      image:
-        registry: registry.k8s.io
-        image: busybox
-        tag: latest
diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/ci/daemonset-headers-values.yaml b/packages/system/ingress-nginx/charts/ingress-nginx/ci/daemonset-headers-values.yaml
deleted file mode 100644
index ab7d47bd4d..0000000000
--- a/packages/system/ingress-nginx/charts/ingress-nginx/ci/daemonset-headers-values.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-controller:
-  kind: DaemonSet
-  image:
-    repository: ingress-controller/controller
-    tag: 1.0.0-dev
-    digest: null
-  admissionWebhooks:
-    enabled: false
-  addHeaders:
-    X-Frame-Options: deny
-  proxySetHeaders:
-    X-Forwarded-Proto: https
-  service:
-    type: ClusterIP
diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/ci/daemonset-internal-lb-values.yaml b/packages/system/ingress-nginx/charts/ingress-nginx/ci/daemonset-internal-lb-values.yaml
deleted file mode 100644
index 0a200a7460..0000000000
--- a/packages/system/ingress-nginx/charts/ingress-nginx/ci/daemonset-internal-lb-values.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-controller:
-  kind: DaemonSet
-  image:
-    repository: ingress-controller/controller
-    tag: 1.0.0-dev
-    digest: null
-  admissionWebhooks:
-    enabled: false
-  service:
-    type: ClusterIP
-    internal:
-      enabled: true
-      annotations:
-        service.beta.kubernetes.io/aws-load-balancer-internal: "true"
diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/ci/daemonset-nodeport-values.yaml b/packages/system/ingress-nginx/charts/ingress-nginx/ci/daemonset-nodeport-values.yaml
deleted file mode 100644
index 3b7aa2fcd2..0000000000
--- a/packages/system/ingress-nginx/charts/ingress-nginx/ci/daemonset-nodeport-values.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-controller:
-  kind: DaemonSet
-  image:
-    repository: ingress-controller/controller
-    tag: 1.0.0-dev
-    digest: null
-  admissionWebhooks:
-    enabled: false
-  service:
-    type: NodePort
diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/ci/daemonset-podannotations-values.yaml b/packages/system/ingress-nginx/charts/ingress-nginx/ci/daemonset-podannotations-values.yaml
deleted file mode 100644
index 0b55306a10..0000000000
--- a/packages/system/ingress-nginx/charts/ingress-nginx/ci/daemonset-podannotations-values.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-controller:
-  kind: DaemonSet
-  image:
-    repository: ingress-controller/controller
-    tag: 1.0.0-dev
-    digest: null
-  admissionWebhooks:
-    enabled: false
-  metrics:
-    enabled: true
-  service:
-    type: ClusterIP
-  podAnnotations:
-    prometheus.io/path: /metrics
-    prometheus.io/port: "10254"
-    prometheus.io/scheme: http
-    prometheus.io/scrape: "true"
diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/ci/daemonset-tcp-udp-configMapNamespace-values.yaml b/packages/system/ingress-nginx/charts/ingress-nginx/ci/daemonset-tcp-udp-configMapNamespace-values.yaml
deleted file mode 100644
index acd86a77ab..0000000000
--- a/packages/system/ingress-nginx/charts/ingress-nginx/ci/daemonset-tcp-udp-configMapNamespace-values.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-controller:
-  kind: DaemonSet
-  image:
-    repository: ingress-controller/controller
-    tag: 1.0.0-dev
-    digest: null
-  admissionWebhooks:
-    enabled: false
-  service:
-    type: ClusterIP
-  tcp:
-    configMapNamespace: default
-  udp:
-    configMapNamespace: default
-
-tcp:
-  9000: "default/test:8080"
-
-udp:
-  9001: "default/test:8080"
diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/ci/daemonset-tcp-udp-portNamePrefix-values.yaml b/packages/system/ingress-nginx/charts/ingress-nginx/ci/daemonset-tcp-udp-portNamePrefix-values.yaml
deleted file mode 100644
index 90b0f57a58..0000000000
--- a/packages/system/ingress-nginx/charts/ingress-nginx/ci/daemonset-tcp-udp-portNamePrefix-values.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-controller:
-  kind: DaemonSet
-  image:
-    repository: ingress-controller/controller
-    tag: 1.0.0-dev
-    digest: null
-  admissionWebhooks:
-    enabled: false
-  service:
-    type: ClusterIP
-
-tcp:
-  9000: "default/test:8080"
-
-udp:
-  9001: "default/test:8080"
-
-portNamePrefix: "port"
diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/ci/daemonset-tcp-udp-values.yaml b/packages/system/ingress-nginx/charts/ingress-nginx/ci/daemonset-tcp-udp-values.yaml
deleted file mode 100644
index 25ee64d856..0000000000
--- a/packages/system/ingress-nginx/charts/ingress-nginx/ci/daemonset-tcp-udp-values.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-controller:
-  kind: DaemonSet
-  image:
-    repository: ingress-controller/controller
-    tag: 1.0.0-dev
-    digest: null
-  admissionWebhooks:
-    enabled: false
-  service:
-    type: ClusterIP
-
-tcp:
-  9000: "default/test:8080"
-
-udp:
-  9001: "default/test:8080"
diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/ci/daemonset-tcp-values.yaml b/packages/system/ingress-nginx/charts/ingress-nginx/ci/daemonset-tcp-values.yaml
deleted file mode 100644
index 380c8b4b13..0000000000
--- a/packages/system/ingress-nginx/charts/ingress-nginx/ci/daemonset-tcp-values.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-controller:
-  kind: DaemonSet
-  image:
-    repository: ingress-controller/controller
-    tag: 1.0.0-dev
-    digest: null
-  admissionWebhooks:
-    enabled: false
-  service:
-    type: ClusterIP
-
-tcp:
-  9000: "default/test:8080"
-  9001: "default/test:8080"
diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/ci/deamonset-default-values.yaml b/packages/system/ingress-nginx/charts/ingress-nginx/ci/deamonset-default-values.yaml
deleted file mode 100644
index 82fa23e854..0000000000
--- a/packages/system/ingress-nginx/charts/ingress-nginx/ci/deamonset-default-values.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-controller:
-  kind: DaemonSet
-  image:
-    repository: ingress-controller/controller
-    tag: 1.0.0-dev
-    digest: null
-  admissionWebhooks:
-    enabled: false
-  service:
-    type: ClusterIP
diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/ci/deamonset-metrics-values.yaml b/packages/system/ingress-nginx/charts/ingress-nginx/ci/deamonset-metrics-values.yaml
deleted file mode 100644
index cb3cb54be2..0000000000
--- a/packages/system/ingress-nginx/charts/ingress-nginx/ci/deamonset-metrics-values.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-controller:
-  kind: DaemonSet
-  image:
-    repository: ingress-controller/controller
-    tag: 1.0.0-dev
-    digest: null
-  admissionWebhooks:
-    enabled: false
-  metrics:
-    enabled: true
-  service:
-    type: ClusterIP
diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/ci/deamonset-webhook-values.yaml b/packages/system/ingress-nginx/charts/ingress-nginx/ci/deamonset-webhook-values.yaml
deleted file mode 100644
index 54d364df11..0000000000
--- a/packages/system/ingress-nginx/charts/ingress-nginx/ci/deamonset-webhook-values.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-controller:
-  kind: DaemonSet
-  image:
-    repository: ingress-controller/controller
-    tag: 1.0.0-dev
-    digest: null
-  admissionWebhooks:
-    enabled: true
-  service:
-    type: ClusterIP
diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-autoscaling-behavior-values.yaml b/packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-autoscaling-behavior-values.yaml
deleted file mode 100644
index dca3f35f83..0000000000
--- a/packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-autoscaling-behavior-values.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-controller:
-  autoscaling:
-    enabled: true
-    behavior:
-      scaleDown:
-        stabilizationWindowSeconds: 300
-        policies:
-        - type: Pods
-          value: 1
-          periodSeconds: 180
-  admissionWebhooks:
-    enabled: false
-  service:
-    type: ClusterIP
diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-autoscaling-values.yaml b/packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-autoscaling-values.yaml
deleted file mode 100644
index b8b3ac6862..0000000000
--- a/packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-autoscaling-values.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-controller:
-  image:
-    repository: ingress-controller/controller
-    tag: 1.0.0-dev
-    digest: null
-  autoscaling:
-    enabled: true
-  admissionWebhooks:
-    enabled: false
-  service:
-    type: ClusterIP
diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-customconfig-values.yaml b/packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-customconfig-values.yaml
deleted file mode 100644
index 174941848e..0000000000
--- a/packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-customconfig-values.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-controller:
-  image:
-    repository: ingress-controller/controller
-    tag: 1.0.0-dev
-    digest: null
-  config:
-    use-proxy-protocol: "true"
-  allowSnippetAnnotations: false
-  admissionWebhooks:
-    enabled: false
-  service:
-    type: ClusterIP
diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-customnodeport-values.yaml b/packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-customnodeport-values.yaml
deleted file mode 100644
index a564eaf931..0000000000
--- a/packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-customnodeport-values.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-controller:
-  image:
-    repository: ingress-controller/controller
-    tag: 1.0.0-dev
-    digest: null
-  admissionWebhooks:
-    enabled: false
-  service:
-    type: NodePort
-    nodePorts:
-      tcp:
-        9000: 30090
-      udp:
-        9001: 30091
-
-tcp:
-  9000: "default/test:8080"
-
-udp:
-  9001: "default/test:8080"
diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-default-values.yaml b/packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-default-values.yaml
deleted file mode 100644
index 9f46b4e7e9..0000000000
--- a/packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-default-values.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-# Left blank to test default values
-controller:
-  image:
-    repository: ingress-controller/controller
-    tag: 1.0.0-dev
-    digest: null
-  service:
-    type: ClusterIP
diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-extra-modules-default-container-sec-context.yaml b/packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-extra-modules-default-container-sec-context.yaml
deleted file mode 100644
index 91b1b98a80..0000000000
--- a/packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-extra-modules-default-container-sec-context.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-controller:
-  image:
-    repository: ingress-controller/controller
-    tag: 1.0.0-dev
-    digest: null
-  service:
-    type: ClusterIP
-  containerSecurityContext:
-    allowPrivilegeEscalation: false
-  extraModules:
-    - name: opentelemetry
-      image:
-        registry: registry.k8s.io
-        image: busybox
-        tag: latest
diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-extra-modules-specific-container-sec-context.yaml b/packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-extra-modules-specific-container-sec-context.yaml
deleted file mode 100644
index b6013c7d0a..0000000000
--- a/packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-extra-modules-specific-container-sec-context.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-controller:
-  image:
-    repository: ingress-controller/controller
-    tag: 1.0.0-dev
-    digest: null
-  service:
-    type: ClusterIP
-  extraModules:
-    - name: opentelemetry
-      image:
-        registry: registry.k8s.io
-        image: busybox
-        tag: latest
-      containerSecurityContext:
-        allowPrivilegeEscalation: false
diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-extra-modules.yaml b/packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-extra-modules.yaml
deleted file mode 100644
index 2fbe1cc013..0000000000
--- a/packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-extra-modules.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-controller:
-  image:
-    repository: ingress-controller/controller
-    tag: 1.0.0-dev
-    digest: null
-  service:
-    type: ClusterIP
-  extraModules:
-    - name: opentelemetry
-      image:
-        registry: registry.k8s.io
-        image: busybox
-        tag: latest
diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-headers-values.yaml b/packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-headers-values.yaml
deleted file mode 100644
index 17a11ac370..0000000000
--- a/packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-headers-values.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-controller:
-  image:
-    repository: ingress-controller/controller
-    tag: 1.0.0-dev
-    digest: null
-  admissionWebhooks:
-    enabled: false
-  addHeaders:
-    X-Frame-Options: deny
-  proxySetHeaders:
-    X-Forwarded-Proto: https
-  service:
-    type: ClusterIP
diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-internal-lb-values.yaml b/packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-internal-lb-values.yaml
deleted file mode 100644
index 663ccb9d1c..0000000000
--- a/packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-internal-lb-values.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-controller:
-  image:
-    repository: ingress-controller/controller
-    tag: 1.0.0-dev
-    digest: null
-  admissionWebhooks:
-    enabled: false
-  service:
-    type: ClusterIP
-    internal:
-      enabled: true
-      annotations:
-        service.beta.kubernetes.io/aws-load-balancer-internal: "true"
-      ports:
-        http: 443
-        https: 80
-      targetPorts:
-        http: 443
-        https: 80
diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-metrics-values.yaml b/packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-metrics-values.yaml
deleted file mode 100644
index 9209ad5a6f..0000000000
--- a/packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-metrics-values.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-controller:
-  image:
-    repository: ingress-controller/controller
-    tag: 1.0.0-dev
-    digest: null
-  admissionWebhooks:
-    enabled: false
-  metrics:
-    enabled: true
-  service:
-    type: ClusterIP
diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-nodeport-values.yaml b/packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-nodeport-values.yaml
deleted file mode 100644
index cd9b323528..0000000000
--- a/packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-nodeport-values.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-controller:
-  image:
-    repository: ingress-controller/controller
-    tag: 1.0.0-dev
-    digest: null
-  admissionWebhooks:
-    enabled: false
-  service:
-    type: NodePort
diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-opentelemetry-customregistry-values.yaml b/packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-opentelemetry-customregistry-values.yaml
deleted file mode 100644
index fb3ef44465..0000000000
--- a/packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-opentelemetry-customregistry-values.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-controller:
-  image:
-    repository: ingress-controller/controller
-    tag: 1.0.0-dev
-    digest: null
-  service:
-    type: ClusterIP
-  opentelemetry:
-    enabled: true
diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-podannotations-values.yaml b/packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-podannotations-values.yaml
deleted file mode 100644
index b48d93c46a..0000000000
--- a/packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-podannotations-values.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-controller:
-  image:
-    repository: ingress-controller/controller
-    tag: 1.0.0-dev
-    digest: null
-  admissionWebhooks:
-    enabled: false
-  metrics:
-    enabled: true
-  service:
-    type: ClusterIP
-  podAnnotations:
-    prometheus.io/path: /metrics
-    prometheus.io/port: "10254"
-    prometheus.io/scheme: http
-    prometheus.io/scrape: "true"
diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-tcp-udp-configMapNamespace-values.yaml b/packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-tcp-udp-configMapNamespace-values.yaml
deleted file mode 100644
index c51a4e91fa..0000000000
--- a/packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-tcp-udp-configMapNamespace-values.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-controller:
-  image:
-    repository: ingress-controller/controller
-    tag: 1.0.0-dev
-    digest: null
-  admissionWebhooks:
-    enabled: false
-  service:
-    type: ClusterIP
-  tcp:
-    configMapNamespace: default
-  udp:
-    configMapNamespace: default
-
-tcp:
-  9000: "default/test:8080"
-
-udp:
-  9001: "default/test:8080"
diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-tcp-udp-portNamePrefix-values.yaml b/packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-tcp-udp-portNamePrefix-values.yaml
deleted file mode 100644
index 56323c5eeb..0000000000
--- a/packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-tcp-udp-portNamePrefix-values.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-controller:
-  image:
-    repository: ingress-controller/controller
-    tag: 1.0.0-dev
-    digest: null
-  admissionWebhooks:
-    enabled: false
-  service:
-    type: ClusterIP
-
-tcp:
-  9000: "default/test:8080"
-
-udp:
-  9001: "default/test:8080"
-
-portNamePrefix: "port"
diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-tcp-udp-values.yaml b/packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-tcp-udp-values.yaml
deleted file mode 100644
index 5b45b69dcc..0000000000
--- a/packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-tcp-udp-values.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-controller:
-  image:
-    repository: ingress-controller/controller
-    tag: 1.0.0-dev
-    digest: null
-  admissionWebhooks:
-    enabled: false
-  service:
-    type: ClusterIP
-
-tcp:
-  9000: "default/test:8080"
-
-udp:
-  9001: "default/test:8080"
diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-tcp-values.yaml b/packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-tcp-values.yaml
deleted file mode 100644
index ac0b6e60eb..0000000000
--- a/packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-tcp-values.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-controller:
-  image:
-    repository: ingress-controller/controller
-    tag: 1.0.0-dev
-    digest: null
-  service:
-    type: ClusterIP
-
-tcp:
-  9000: "default/test:8080"
-  9001: "default/test:8080"
diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-webhook-extraEnvs-values.yaml b/packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-webhook-extraEnvs-values.yaml
deleted file mode 100644
index 95487b071f..0000000000
--- a/packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-webhook-extraEnvs-values.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-controller:
-  service:
-    type: ClusterIP
-  admissionWebhooks:
-    enabled: true
-    extraEnvs:
-      - name: FOO
-        value: foo
-      - name: TEST
-        value: test
-    patch:
-      enabled: true
diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-webhook-resources-values.yaml b/packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-webhook-resources-values.yaml
deleted file mode 100644
index 49ebbb02c8..0000000000
--- a/packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-webhook-resources-values.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-controller:
-  service:
-    type: ClusterIP
-  admissionWebhooks:
-    enabled: true
-    createSecretJob:
-      resources:
-        limits:
-          cpu: 10m
-          memory: 20Mi
-        requests:
-          cpu: 10m
-          memory: 20Mi
-    patchWebhookJob:
-      resources:
-        limits:
-          cpu: 10m
-          memory: 20Mi
-        requests:
-          cpu: 10m
-          memory: 20Mi
-    patch:
-      enabled: true
diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-webhook-values.yaml b/packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-webhook-values.yaml
deleted file mode 100644
index 76669a5300..0000000000
--- a/packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-webhook-values.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-controller:
-  image:
-    repository: ingress-controller/controller
-    tag: 1.0.0-dev
-    digest: null
-  admissionWebhooks:
-    enabled: true
-  service:
-    type: ClusterIP
diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/templates/_helpers.tpl b/packages/system/ingress-nginx/charts/ingress-nginx/templates/_helpers.tpl
index 99246888e8..24cfd14ad9 100644
--- a/packages/system/ingress-nginx/charts/ingress-nginx/templates/_helpers.tpl
+++ b/packages/system/ingress-nginx/charts/ingress-nginx/templates/_helpers.tpl
@@ -203,7 +203,7 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 {{- end -}}
 
 {{/*
-Create the name of the backend service account to use - only used when podsecuritypolicy is also enabled
+Create the name of the default backend service account to use
 */}}
 {{- define "ingress-nginx.defaultBackend.serviceAccountName" -}}
 {{- if .Values.defaultBackend.serviceAccount.create -}}
diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/templates/admission-webhooks/validating-webhook.yaml b/packages/system/ingress-nginx/charts/ingress-nginx/templates/admission-webhooks/validating-webhook.yaml
index 4cd36a62e9..0949cea75a 100644
--- a/packages/system/ingress-nginx/charts/ingress-nginx/templates/admission-webhooks/validating-webhook.yaml
+++ b/packages/system/ingress-nginx/charts/ingress-nginx/templates/admission-webhooks/validating-webhook.yaml
@@ -40,6 +40,7 @@ webhooks:
       service:
         name: {{ include "ingress-nginx.controller.fullname" . }}-admission
         namespace: {{ include "ingress-nginx.namespace" . }}
+        port: {{ .Values.controller.admissionWebhooks.service.servicePort }}
         path: /networking/v1/ingresses
     {{- if .Values.controller.admissionWebhooks.timeoutSeconds }}
     timeoutSeconds: {{ .Values.controller.admissionWebhooks.timeoutSeconds }}
diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/templates/controller-prometheusrules.yaml b/packages/system/ingress-nginx/charts/ingress-nginx/templates/controller-prometheusrule.yaml
similarity index 100%
rename from packages/system/ingress-nginx/charts/ingress-nginx/templates/controller-prometheusrules.yaml
rename to packages/system/ingress-nginx/charts/ingress-nginx/templates/controller-prometheusrule.yaml
diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/templates/controller-service-webhook.yaml b/packages/system/ingress-nginx/charts/ingress-nginx/templates/controller-service-webhook.yaml
index 6dcf1a10a6..67aac0d9a2 100644
--- a/packages/system/ingress-nginx/charts/ingress-nginx/templates/controller-service-webhook.yaml
+++ b/packages/system/ingress-nginx/charts/ingress-nginx/templates/controller-service-webhook.yaml
@@ -29,7 +29,7 @@ spec:
 {{- end }}
   ports:
     - name: https-webhook
-      port: 443
+      port: {{ .Values.controller.admissionWebhooks.service.servicePort }}
       targetPort: webhook
     {{- if semverCompare ">=1.20.0-0" .Capabilities.KubeVersion.Version }}
       appProtocol: https
diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/templates/controller-servicemonitor.yaml b/packages/system/ingress-nginx/charts/ingress-nginx/templates/controller-servicemonitor.yaml
index 62301da454..93ab4d242d 100644
--- a/packages/system/ingress-nginx/charts/ingress-nginx/templates/controller-servicemonitor.yaml
+++ b/packages/system/ingress-nginx/charts/ingress-nginx/templates/controller-servicemonitor.yaml
@@ -3,51 +3,48 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   name: {{ include "ingress-nginx.controller.fullname" . }}
-{{- if .Values.controller.metrics.serviceMonitor.namespace }}
+  {{- if .Values.controller.metrics.serviceMonitor.namespace }}
   namespace: {{ .Values.controller.metrics.serviceMonitor.namespace }}
-{{- else }}
+  {{- else }}
   namespace: {{ include "ingress-nginx.namespace" . }}
-{{- end }}
+  {{- end }}
   labels:
     {{- include "ingress-nginx.labels" . | nindent 4 }}
     app.kubernetes.io/component: controller
-  {{- if .Values.controller.metrics.serviceMonitor.additionalLabels }}
+    {{- if .Values.controller.metrics.serviceMonitor.additionalLabels }}
     {{- toYaml .Values.controller.metrics.serviceMonitor.additionalLabels | nindent 4 }}
-  {{- end }}
+    {{- end }}
   {{- if .Values.controller.metrics.serviceMonitor.annotations }}
   annotations: {{ toYaml .Values.controller.metrics.serviceMonitor.annotations | nindent 4 }}
   {{- end }}
 spec:
+  {{- if .Values.controller.metrics.serviceMonitor.namespaceSelector }}
+  namespaceSelector: {{ toYaml .Values.controller.metrics.serviceMonitor.namespaceSelector | nindent 4 }}
+  {{- else }}
+  namespaceSelector:
+    matchNames:
+    - {{ include "ingress-nginx.namespace" . }}
+  {{- end }}
+  selector:
+    matchLabels:
+      {{- include "ingress-nginx.selectorLabels" . | nindent 6 }}
+      app.kubernetes.io/component: controller
   endpoints:
-    - port: {{ .Values.controller.metrics.portName }}
-      interval: {{ .Values.controller.metrics.serviceMonitor.scrapeInterval }}
+  - port: {{ .Values.controller.metrics.portName }}
+    interval: {{ .Values.controller.metrics.serviceMonitor.scrapeInterval }}
     {{- if .Values.controller.metrics.serviceMonitor.honorLabels }}
-      honorLabels: true
+    honorLabels: true
     {{- end }}
     {{- if .Values.controller.metrics.serviceMonitor.relabelings }}
-      relabelings: {{ toYaml .Values.controller.metrics.serviceMonitor.relabelings | nindent 8 }}
+    relabelings: {{ toYaml .Values.controller.metrics.serviceMonitor.relabelings | nindent 4 }}
     {{- end }}
     {{- if .Values.controller.metrics.serviceMonitor.metricRelabelings }}
-      metricRelabelings: {{ toYaml .Values.controller.metrics.serviceMonitor.metricRelabelings | nindent 8 }}
+    metricRelabelings: {{ toYaml .Values.controller.metrics.serviceMonitor.metricRelabelings | nindent 4 }}
     {{- end }}
-{{- if .Values.controller.metrics.serviceMonitor.jobLabel }}
+  {{- if .Values.controller.metrics.serviceMonitor.jobLabel }}
   jobLabel: {{ .Values.controller.metrics.serviceMonitor.jobLabel | quote }}
-{{- end }}
-{{- if .Values.controller.metrics.serviceMonitor.namespaceSelector }}
-  namespaceSelector: {{ toYaml .Values.controller.metrics.serviceMonitor.namespaceSelector | nindent 4 }}
-{{- else }}
-  namespaceSelector:
-    matchNames:
-      - {{ include "ingress-nginx.namespace" . }}
-{{- end }}
-{{- if .Values.controller.metrics.serviceMonitor.targetLabels }}
-  targetLabels:
-  {{- range .Values.controller.metrics.serviceMonitor.targetLabels }}
-    - {{ . }}
   {{- end }}
-{{- end }}
-  selector:
-    matchLabels:
-      {{- include "ingress-nginx.selectorLabels" . | nindent 6 }}
-      app.kubernetes.io/component: controller
+  {{- if .Values.controller.metrics.serviceMonitor.targetLabels }}
+  targetLabels: {{ toYaml .Values.controller.metrics.serviceMonitor.targetLabels | nindent 2 }}
+  {{- end }}
 {{- end }}
diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/templates/default-backend-deployment.yaml b/packages/system/ingress-nginx/charts/ingress-nginx/templates/default-backend-deployment.yaml
index c6ccdd5c92..6755e23783 100644
--- a/packages/system/ingress-nginx/charts/ingress-nginx/templates/default-backend-deployment.yaml
+++ b/packages/system/ingress-nginx/charts/ingress-nginx/templates/default-backend-deployment.yaml
@@ -102,7 +102,7 @@ spec:
     {{- if .Values.defaultBackend.nodeSelector }}
       nodeSelector: {{ toYaml .Values.defaultBackend.nodeSelector | nindent 8 }}
     {{- end }}
-      serviceAccountName: {{ template "ingress-nginx.defaultBackend.serviceAccountName" . }}
+      serviceAccountName: {{ include "ingress-nginx.defaultBackend.serviceAccountName" . }}
     {{- if .Values.defaultBackend.tolerations }}
       tolerations: {{ toYaml .Values.defaultBackend.tolerations | nindent 8 }}
     {{- end }}
diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/templates/default-backend-poddisruptionbudget.yaml b/packages/system/ingress-nginx/charts/ingress-nginx/templates/default-backend-poddisruptionbudget.yaml
index f869e4530d..c8363fd4b4 100644
--- a/packages/system/ingress-nginx/charts/ingress-nginx/templates/default-backend-poddisruptionbudget.yaml
+++ b/packages/system/ingress-nginx/charts/ingress-nginx/templates/default-backend-poddisruptionbudget.yaml
@@ -1,5 +1,9 @@
 {{- if .Values.defaultBackend.enabled -}}
-{{- if or (gt (.Values.defaultBackend.replicaCount | int) 1) (gt (.Values.defaultBackend.autoscaling.minReplicas | int) 1) }}
+{{- $replicas := .Values.defaultBackend.replicaCount }}
+{{- if .Values.defaultBackend.autoscaling.enabled }}
+{{- $replicas = .Values.defaultBackend.autoscaling.minReplicas }}
+{{- end }}
+{{- if gt ($replicas | int) 1 }}
 apiVersion: {{ ternary "policy/v1" "policy/v1beta1" (semverCompare ">=1.21.0-0" .Capabilities.KubeVersion.Version) }}
 kind: PodDisruptionBudget
 metadata:
diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/templates/default-backend-serviceaccount.yaml b/packages/system/ingress-nginx/charts/ingress-nginx/templates/default-backend-serviceaccount.yaml
index 2afaf0c042..6fd2d62343 100644
--- a/packages/system/ingress-nginx/charts/ingress-nginx/templates/default-backend-serviceaccount.yaml
+++ b/packages/system/ingress-nginx/charts/ingress-nginx/templates/default-backend-serviceaccount.yaml
@@ -1,4 +1,4 @@
-{{- if and .Values.defaultBackend.enabled  .Values.defaultBackend.serviceAccount.create -}}
+{{- if and .Values.defaultBackend.enabled .Values.defaultBackend.serviceAccount.create -}}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
@@ -8,7 +8,7 @@ metadata:
     {{- with .Values.defaultBackend.labels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
-  name: {{ template "ingress-nginx.defaultBackend.serviceAccountName" . }}
+  name: {{ include "ingress-nginx.defaultBackend.serviceAccountName" . }}
   namespace: {{ include "ingress-nginx.namespace" . }}
 automountServiceAccountToken: {{ .Values.defaultBackend.serviceAccount.automountServiceAccountToken }}
 {{- end }}
diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/tests/admission-webhooks/job-patch/serviceaccount_test.yaml b/packages/system/ingress-nginx/charts/ingress-nginx/tests/admission-webhooks/job-patch/serviceaccount_test.yaml
index 7c30d1e660..f72bc4383f 100644
--- a/packages/system/ingress-nginx/charts/ingress-nginx/tests/admission-webhooks/job-patch/serviceaccount_test.yaml
+++ b/packages/system/ingress-nginx/charts/ingress-nginx/tests/admission-webhooks/job-patch/serviceaccount_test.yaml
@@ -20,7 +20,7 @@ tests:
           of: ServiceAccount
       - equal:
           path: metadata.name
-          value: ingress-nginx-admission
+          value: RELEASE-NAME-ingress-nginx-admission
 
   - it: should create a ServiceAccount with specified name if `controller.admissionWebhooks.patch.serviceAccount.name` is set
     set:
diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/tests/admission-webhooks/validating-webhook_test.yaml b/packages/system/ingress-nginx/charts/ingress-nginx/tests/admission-webhooks/validating-webhook_test.yaml
new file mode 100644
index 0000000000..47b6b68730
--- /dev/null
+++ b/packages/system/ingress-nginx/charts/ingress-nginx/tests/admission-webhooks/validating-webhook_test.yaml
@@ -0,0 +1,32 @@
+suite: Admission Webhooks > ValidatingWebhookConfiguration
+templates:
+  - admission-webhooks/validating-webhook.yaml
+
+tests:
+  - it: should not create a ValidatingWebhookConfiguration if `controller.admissionWebhooks.enabled` is false
+    set:
+      controller.admissionWebhooks.enabled: false
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  - it: should create a ValidatingWebhookConfiguration if `controller.admissionWebhooks.enabled` is true
+    set:
+      controller.admissionWebhooks.enabled: true
+    asserts:
+      - hasDocuments:
+          count: 1
+      - isKind:
+          of: ValidatingWebhookConfiguration
+      - equal:
+          path: metadata.name
+          value: RELEASE-NAME-ingress-nginx-admission
+
+  - it: should create a ValidatingWebhookConfiguration with a custom port if `controller.admissionWebhooks.service.servicePort` is set
+    set:
+      controller.admissionWebhooks.enabled: true
+      controller.admissionWebhooks.service.servicePort: 9443
+    asserts:
+      - equal:
+          path: webhooks[0].clientConfig.service.port
+          value: 9443
diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/tests/controller-configmap_test.yaml b/packages/system/ingress-nginx/charts/ingress-nginx/tests/controller-configmap_test.yaml
index 9cfea9800b..168b657d6b 100644
--- a/packages/system/ingress-nginx/charts/ingress-nginx/tests/controller-configmap_test.yaml
+++ b/packages/system/ingress-nginx/charts/ingress-nginx/tests/controller-configmap_test.yaml
@@ -16,16 +16,16 @@ tests:
   - it: should create a ConfigMap with templated values if `controller.config` contains templates
     set:
       controller.config:
-        global-rate-limit-memcached-host: "memcached.{{ .Release.Namespace }}.svc.kubernetes.local"
-        global-rate-limit-memcached-port: 11211
-        use-gzip: true
+        template: "test.{{ .Release.Namespace }}.svc.kubernetes.local"
+        integer: 12345
+        boolean: true
     asserts:
       - equal:
-          path: data.global-rate-limit-memcached-host
-          value: memcached.NAMESPACE.svc.kubernetes.local
+          path: data.template
+          value: test.NAMESPACE.svc.kubernetes.local
       - equal:
-          path: data.global-rate-limit-memcached-port
-          value: "11211"
+          path: data.integer
+          value: "12345"
       - equal:
-          path: data.use-gzip
+          path: data.boolean
           value: "true"
diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/tests/controller-daemonset_test.yaml b/packages/system/ingress-nginx/charts/ingress-nginx/tests/controller-daemonset_test.yaml
index bc810a1cde..81d067bb5f 100644
--- a/packages/system/ingress-nginx/charts/ingress-nginx/tests/controller-daemonset_test.yaml
+++ b/packages/system/ingress-nginx/charts/ingress-nginx/tests/controller-daemonset_test.yaml
@@ -139,12 +139,34 @@ tests:
                           - controller
                   topologyKey: kubernetes.io/hostname
 
+  - it: should create a DaemonSet with a custom registry if `controller.image.registry` is set
+    set:
+      controller.kind: DaemonSet
+      controller.image.registry: custom.registry.io
+      controller.image.tag: v1.0.0-dev
+      controller.image.digest: sha256:faa2d18687f734994b6bd9e309e7a73852a81c30e1b8f63165fcd4f0a087e3cd
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].image
+          value: custom.registry.io/ingress-nginx/controller:v1.0.0-dev@sha256:faa2d18687f734994b6bd9e309e7a73852a81c30e1b8f63165fcd4f0a087e3cd
+
+  - it: should create a DaemonSet with a custom image if `controller.image.image` is set
+    set:
+      controller.kind: DaemonSet
+      controller.image.image: custom-repo/custom-image
+      controller.image.tag: v1.0.0-dev
+      controller.image.digest: sha256:faa2d18687f734994b6bd9e309e7a73852a81c30e1b8f63165fcd4f0a087e3cd
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].image
+          value: registry.k8s.io/custom-repo/custom-image:v1.0.0-dev@sha256:faa2d18687f734994b6bd9e309e7a73852a81c30e1b8f63165fcd4f0a087e3cd
+
   - it: should create a DaemonSet with a custom tag if `controller.image.tag` is set
     set:
       controller.kind: DaemonSet
-      controller.image.tag: my-little-custom-tag
+      controller.image.tag: custom-tag
       controller.image.digest: sha256:faa2d18687f734994b6bd9e309e7a73852a81c30e1b8f63165fcd4f0a087e3cd
     asserts:
       - equal:
           path: spec.template.spec.containers[0].image
-          value: registry.k8s.io/ingress-nginx/controller:my-little-custom-tag@sha256:faa2d18687f734994b6bd9e309e7a73852a81c30e1b8f63165fcd4f0a087e3cd
+          value: registry.k8s.io/ingress-nginx/controller:custom-tag@sha256:faa2d18687f734994b6bd9e309e7a73852a81c30e1b8f63165fcd4f0a087e3cd
diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/tests/controller-deployment_test.yaml b/packages/system/ingress-nginx/charts/ingress-nginx/tests/controller-deployment_test.yaml
index da400487ec..382aecd710 100644
--- a/packages/system/ingress-nginx/charts/ingress-nginx/tests/controller-deployment_test.yaml
+++ b/packages/system/ingress-nginx/charts/ingress-nginx/tests/controller-deployment_test.yaml
@@ -161,11 +161,31 @@ tests:
                           - controller
                   topologyKey: kubernetes.io/hostname
 
+  - it: should create a Deployment with a custom registry if `controller.image.registry` is set
+    set:
+      controller.image.registry: custom.registry.io
+      controller.image.tag: v1.0.0-dev
+      controller.image.digest: sha256:faa2d18687f734994b6bd9e309e7a73852a81c30e1b8f63165fcd4f0a087e3cd
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].image
+          value: custom.registry.io/ingress-nginx/controller:v1.0.0-dev@sha256:faa2d18687f734994b6bd9e309e7a73852a81c30e1b8f63165fcd4f0a087e3cd
+
+  - it: should create a Deployment with a custom image if `controller.image.image` is set
+    set:
+      controller.image.image: custom-repo/custom-image
+      controller.image.tag: v1.0.0-dev
+      controller.image.digest: sha256:faa2d18687f734994b6bd9e309e7a73852a81c30e1b8f63165fcd4f0a087e3cd
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].image
+          value: registry.k8s.io/custom-repo/custom-image:v1.0.0-dev@sha256:faa2d18687f734994b6bd9e309e7a73852a81c30e1b8f63165fcd4f0a087e3cd
+
   - it: should create a Deployment with a custom tag if `controller.image.tag` is set
     set:
-      controller.image.tag: my-little-custom-tag
+      controller.image.tag: custom-tag
       controller.image.digest: sha256:faa2d18687f734994b6bd9e309e7a73852a81c30e1b8f63165fcd4f0a087e3cd
     asserts:
       - equal:
           path: spec.template.spec.containers[0].image
-          value: registry.k8s.io/ingress-nginx/controller:my-little-custom-tag@sha256:faa2d18687f734994b6bd9e309e7a73852a81c30e1b8f63165fcd4f0a087e3cd
+          value: registry.k8s.io/ingress-nginx/controller:custom-tag@sha256:faa2d18687f734994b6bd9e309e7a73852a81c30e1b8f63165fcd4f0a087e3cd
diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/tests/controller-poddisruptionbudget_test.yaml b/packages/system/ingress-nginx/charts/ingress-nginx/tests/controller-poddisruptionbudget_test.yaml
index 48b4fafcc5..f215f35207 100644
--- a/packages/system/ingress-nginx/charts/ingress-nginx/tests/controller-poddisruptionbudget_test.yaml
+++ b/packages/system/ingress-nginx/charts/ingress-nginx/tests/controller-poddisruptionbudget_test.yaml
@@ -71,3 +71,19 @@ tests:
     asserts:
       - hasDocuments:
           count: 0
+
+  - it: should create a PodDisruptionBudget without `minAvailable` and with `maxUnavailable` if `controller.minAvailable` and `controller.maxUnavailable` are set
+    set:
+      controller.replicaCount: 2
+      controller.minAvailable: 1
+      controller.maxUnavailable: 1
+    asserts:
+      - hasDocuments:
+          count: 1
+      - isKind:
+          of: PodDisruptionBudget
+      - notExists:
+          path: spec.minAvailable
+      - equal:
+          path: spec.maxUnavailable
+          value: 1
diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/tests/controller-prometheusrule_test.yaml b/packages/system/ingress-nginx/charts/ingress-nginx/tests/controller-prometheusrule_test.yaml
new file mode 100644
index 0000000000..d60a98315f
--- /dev/null
+++ b/packages/system/ingress-nginx/charts/ingress-nginx/tests/controller-prometheusrule_test.yaml
@@ -0,0 +1,17 @@
+suite: Controller > PrometheusRule
+templates:
+  - controller-prometheusrule.yaml
+
+tests:
+  - it: should create a PrometheusRule if `controller.metrics.prometheusRule.enabled` is true
+    set:
+      controller.metrics.enabled: true
+      controller.metrics.prometheusRule.enabled: true
+    asserts:
+      - hasDocuments:
+          count: 1
+      - isKind:
+          of: PrometheusRule
+      - equal:
+          path: metadata.name
+          value: RELEASE-NAME-ingress-nginx-controller
diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/tests/controller-service-webhook_test.yaml b/packages/system/ingress-nginx/charts/ingress-nginx/tests/controller-service-webhook_test.yaml
new file mode 100644
index 0000000000..1c759edbe6
--- /dev/null
+++ b/packages/system/ingress-nginx/charts/ingress-nginx/tests/controller-service-webhook_test.yaml
@@ -0,0 +1,32 @@
+suite: Controller > Service > Webhook
+templates:
+  - controller-service-webhook.yaml
+
+tests:
+  - it: should not create a webhook Service if `controller.admissionWebhooks.enabled` is false
+    set:
+      controller.admissionWebhooks.enabled: false
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  - it: should create a webhook Service if `controller.admissionWebhooks.enabled` is true
+    set:
+      controller.admissionWebhooks.enabled: true
+    asserts:
+      - hasDocuments:
+          count: 1
+      - isKind:
+          of: Service
+      - equal:
+          path: metadata.name
+          value: RELEASE-NAME-ingress-nginx-controller-admission
+
+  - it: should create a webhook Service with a custom port if `controller.admissionWebhooks.service.servicePort` is set
+    set:
+      controller.admissionWebhooks.enabled: true
+      controller.admissionWebhooks.service.servicePort: 9443
+    asserts:
+      - equal:
+          path: spec.ports[0].port
+          value: 9443
diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/tests/controller-serviceaccount_test.yaml b/packages/system/ingress-nginx/charts/ingress-nginx/tests/controller-serviceaccount_test.yaml
new file mode 100644
index 0000000000..928e537720
--- /dev/null
+++ b/packages/system/ingress-nginx/charts/ingress-nginx/tests/controller-serviceaccount_test.yaml
@@ -0,0 +1,47 @@
+suite: Controller > ServiceAccount
+templates:
+  - controller-serviceaccount.yaml
+
+tests:
+  - it: should not create a ServiceAccount if `serviceAccount.create` is false
+    set:
+      serviceAccount.create: false
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  - it: should create a ServiceAccount if `serviceAccount.create` is true
+    set:
+      serviceAccount.create: true
+    asserts:
+      - hasDocuments:
+          count: 1
+      - isKind:
+          of: ServiceAccount
+      - equal:
+          path: metadata.name
+          value: RELEASE-NAME-ingress-nginx
+
+  - it: should create a ServiceAccount with specified name if `serviceAccount.name` is set
+    set:
+      serviceAccount.name: ingress-nginx-admission-test-sa
+    asserts:
+      - hasDocuments:
+          count: 1
+      - isKind:
+          of: ServiceAccount
+      - equal:
+          path: metadata.name
+          value: ingress-nginx-admission-test-sa
+
+  - it: should create a ServiceAccount with token auto-mounting disabled if `serviceAccount.automountServiceAccountToken` is false
+    set:
+      serviceAccount.automountServiceAccountToken: false
+    asserts:
+      - hasDocuments:
+          count: 1
+      - isKind:
+          of: ServiceAccount
+      - equal:
+          path: automountServiceAccountToken
+          value: false
diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/tests/controller-servicemonitor_test.yaml b/packages/system/ingress-nginx/charts/ingress-nginx/tests/controller-servicemonitor_test.yaml
new file mode 100644
index 0000000000..310097c1a2
--- /dev/null
+++ b/packages/system/ingress-nginx/charts/ingress-nginx/tests/controller-servicemonitor_test.yaml
@@ -0,0 +1,29 @@
+suite: Controller > ServiceMonitor
+templates:
+  - controller-servicemonitor.yaml
+
+tests:
+  - it: should create a ServiceMonitor if `controller.metrics.serviceMonitor.enabled` is true
+    set:
+      controller.metrics.enabled: true
+      controller.metrics.serviceMonitor.enabled: true
+    asserts:
+      - hasDocuments:
+          count: 1
+      - isKind:
+          of: ServiceMonitor
+      - equal:
+          path: metadata.name
+          value: RELEASE-NAME-ingress-nginx-controller
+
+  - it: should create a ServiceMonitor with annotations if `controller.metrics.serviceMonitor.annotations` is set
+    set:
+      controller.metrics.enabled: true
+      controller.metrics.serviceMonitor.enabled: true
+      controller.metrics.serviceMonitor.annotations:
+        my-little-annotation: test-value
+    asserts:
+      - equal:
+          path: metadata.annotations
+          value:
+            my-little-annotation: test-value
diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/tests/default-backend-deployment_test.yaml b/packages/system/ingress-nginx/charts/ingress-nginx/tests/default-backend-deployment_test.yaml
index e237fe7e35..4ba4b03d3e 100644
--- a/packages/system/ingress-nginx/charts/ingress-nginx/tests/default-backend-deployment_test.yaml
+++ b/packages/system/ingress-nginx/charts/ingress-nginx/tests/default-backend-deployment_test.yaml
@@ -135,3 +135,35 @@ tests:
                         values:
                           - default-backend
                   topologyKey: kubernetes.io/hostname
+
+  - it: should create a Deployment with a custom registry if `defaultBackend.image.registry` is set
+    set:
+      defaultBackend.enabled: true
+      defaultBackend.image.registry: custom.registry.io
+      defaultBackend.image.tag: v1.0.0-dev
+      defaultBackend.image.digest: sha256:faa2d18687f734994b6bd9e309e7a73852a81c30e1b8f63165fcd4f0a087e3cd
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].image
+          value: custom.registry.io/defaultbackend-amd64:v1.0.0-dev@sha256:faa2d18687f734994b6bd9e309e7a73852a81c30e1b8f63165fcd4f0a087e3cd
+
+  - it: should create a Deployment with a custom image if `defaultBackend.image.image` is set
+    set:
+      defaultBackend.enabled: true
+      defaultBackend.image.image: custom-repo/custom-image
+      defaultBackend.image.tag: v1.0.0-dev
+      defaultBackend.image.digest: sha256:faa2d18687f734994b6bd9e309e7a73852a81c30e1b8f63165fcd4f0a087e3cd
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].image
+          value: registry.k8s.io/custom-repo/custom-image:v1.0.0-dev@sha256:faa2d18687f734994b6bd9e309e7a73852a81c30e1b8f63165fcd4f0a087e3cd
+
+  - it: should create a Deployment with a custom tag if `defaultBackend.image.tag` is set
+    set:
+      defaultBackend.enabled: true
+      defaultBackend.image.tag: custom-tag
+      defaultBackend.image.digest: sha256:faa2d18687f734994b6bd9e309e7a73852a81c30e1b8f63165fcd4f0a087e3cd
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].image
+          value: registry.k8s.io/defaultbackend-amd64:custom-tag@sha256:faa2d18687f734994b6bd9e309e7a73852a81c30e1b8f63165fcd4f0a087e3cd
diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/tests/default-backend-poddisruptionbudget_test.yaml b/packages/system/ingress-nginx/charts/ingress-nginx/tests/default-backend-poddisruptionbudget_test.yaml
new file mode 100644
index 0000000000..0958018620
--- /dev/null
+++ b/packages/system/ingress-nginx/charts/ingress-nginx/tests/default-backend-poddisruptionbudget_test.yaml
@@ -0,0 +1,48 @@
+suite: Default Backend > PodDisruptionBudget
+templates:
+  - default-backend-poddisruptionbudget.yaml
+
+tests:
+  - it: should create a PodDisruptionBudget if `defaultBackend.replicaCount` is greater than 1
+    set:
+      defaultBackend.enabled: true
+      defaultBackend.replicaCount: 2
+    asserts:
+      - hasDocuments:
+          count: 1
+      - isKind:
+          of: PodDisruptionBudget
+      - equal:
+          path: metadata.name
+          value: RELEASE-NAME-ingress-nginx-defaultbackend
+
+  - it: should not create a PodDisruptionBudget if `defaultBackend.replicaCount` is less than or equal 1
+    set:
+      defaultBackend.enabled: true
+      defaultBackend.replicaCount: 1
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  - it: should create a PodDisruptionBudget if `defaultBackend.autoscaling.enabled` is true and `defaultBackend.autoscaling.minReplicas` is greater than 1
+    set:
+      defaultBackend.enabled: true
+      defaultBackend.autoscaling.enabled: true
+      defaultBackend.autoscaling.minReplicas: 2
+    asserts:
+      - hasDocuments:
+          count: 1
+      - isKind:
+          of: PodDisruptionBudget
+      - equal:
+          path: metadata.name
+          value: RELEASE-NAME-ingress-nginx-defaultbackend
+
+  - it: should not create a PodDisruptionBudget if `defaultBackend.autoscaling.enabled` is true and `defaultBackend.autoscaling.minReplicas` is less than or equal 1
+    set:
+      defaultBackend.enabled: true
+      defaultBackend.autoscaling.enabled: true
+      defaultBackend.autoscaling.minReplicas: 1
+    asserts:
+      - hasDocuments:
+          count: 0
diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/tests/default-backend-serviceaccount_test.yaml b/packages/system/ingress-nginx/charts/ingress-nginx/tests/default-backend-serviceaccount_test.yaml
new file mode 100644
index 0000000000..05a815d0aa
--- /dev/null
+++ b/packages/system/ingress-nginx/charts/ingress-nginx/tests/default-backend-serviceaccount_test.yaml
@@ -0,0 +1,51 @@
+suite: Default Backend > ServiceAccount
+templates:
+  - default-backend-serviceaccount.yaml
+
+tests:
+  - it: should not create a ServiceAccount if `defaultBackend.serviceAccount.create` is false
+    set:
+      defaultBackend.enabled: true
+      defaultBackend.serviceAccount.create: false
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  - it: should create a ServiceAccount if `defaultBackend.serviceAccount.create` is true
+    set:
+      defaultBackend.enabled: true
+      defaultBackend.serviceAccount.create: true
+    asserts:
+      - hasDocuments:
+          count: 1
+      - isKind:
+          of: ServiceAccount
+      - equal:
+          path: metadata.name
+          value: RELEASE-NAME-ingress-nginx-backend
+
+  - it: should create a ServiceAccount with specified name if `defaultBackend.serviceAccount.name` is set
+    set:
+      defaultBackend.enabled: true
+      defaultBackend.serviceAccount.name: ingress-nginx-admission-test-sa
+    asserts:
+      - hasDocuments:
+          count: 1
+      - isKind:
+          of: ServiceAccount
+      - equal:
+          path: metadata.name
+          value: ingress-nginx-admission-test-sa
+
+  - it: should create a ServiceAccount with token auto-mounting disabled if `defaultBackend.serviceAccount.automountServiceAccountToken` is false
+    set:
+      defaultBackend.enabled: true
+      defaultBackend.serviceAccount.automountServiceAccountToken: false
+    asserts:
+      - hasDocuments:
+          count: 1
+      - isKind:
+          of: ServiceAccount
+      - equal:
+          path: automountServiceAccountToken
+          value: false
diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/values.yaml b/packages/system/ingress-nginx/charts/ingress-nginx/values.yaml
index fbd0b31cf7..750b245695 100644
--- a/packages/system/ingress-nginx/charts/ingress-nginx/values.yaml
+++ b/packages/system/ingress-nginx/charts/ingress-nginx/values.yaml
@@ -26,9 +26,9 @@ controller:
     ## for backwards compatibility consider setting the full image url via the repository value below
     ## use *either* current default registry/image or repository format or installing chart by providing the values.yaml will fail
     ## repository:
-    tag: "v1.11.2"
-    digest: sha256:d5f8217feeac4887cb1ed21f27c2674e58be06bd8f5184cacea2a69abaf78dce
-    digestChroot: sha256:21b55a2f0213a18b91612a8c0850167e00a8e34391fd595139a708f9c047e7a8
+    tag: "v1.11.6"
+    digest: sha256:4f04fad99f00e604ab488cf0945b4eaa2a93f603f97d2a45fc610ff0f3cad0f9
+    digestChroot: sha256:596f8b9ae4773d3b00dfd65855561419c7e70ecb23569a7a2998b47e160b4f85
     pullPolicy: IfNotPresent
     runAsNonRoot: true
     # www-data -> uid 101
@@ -194,7 +194,7 @@ controller:
     # -- Annotations to be added to the udp config configmap
     annotations: {}
   # -- Maxmind license key to download GeoLite2 Databases.
-  ## https://blog.maxmind.com/2019/12/18/significant-changes-to-accessing-and-using-geolite2-databases
+  ## https://blog.maxmind.com/2019/12/significant-changes-to-accessing-and-using-geolite2-databases/
   maxmindLicenseKey: ""
   # -- Additional command line arguments to pass to Ingress-Nginx Controller
   # E.g. to specify the default SSL certificate you can use
@@ -299,6 +299,8 @@ controller:
   #       app.kubernetes.io/name: '{{ include "ingress-nginx.name" . }}'
   #       app.kubernetes.io/instance: '{{ .Release.Name }}'
   #       app.kubernetes.io/component: controller
+  #   matchLabelKeys:
+  #   - pod-template-hash
   #   topologyKey: topology.kubernetes.io/zone
   #   maxSkew: 1
   #   whenUnsatisfiable: ScheduleAnyway
@@ -307,6 +309,8 @@ controller:
   #       app.kubernetes.io/name: '{{ include "ingress-nginx.name" . }}'
   #       app.kubernetes.io/instance: '{{ .Release.Name }}'
   #       app.kubernetes.io/component: controller
+  #   matchLabelKeys:
+  #   - pod-template-hash
   #   topologyKey: kubernetes.io/hostname
   #   maxSkew: 1
   #   whenUnsatisfiable: ScheduleAnyway
@@ -804,8 +808,8 @@ controller:
         ## for backwards compatibility consider setting the full image url via the repository value below
         ## use *either* current default registry/image or repository format or installing chart by providing the values.yaml will fail
         ## repository:
-        tag: v1.4.3
-        digest: sha256:a320a50cc91bd15fd2d6fa6de58bd98c1bd64b9a6f926ce23a600d87043455a3
+        tag: v1.5.3
+        digest: sha256:2cf4ebfa82a37c357455458f6dfc334aea1392d508270b2517795a9933a02524
         pullPolicy: IfNotPresent
       # -- Provide a priority class name to the webhook patching job
       ##
@@ -873,6 +877,7 @@ controller:
     serviceMonitor:
       enabled: false
       additionalLabels: {}
+      # -- Annotations to be added to the ServiceMonitor.
       annotations: {}
       ## The label to use to retrieve the job name from.
       ## jobLabel: "app.kubernetes.io/name"
@@ -1062,6 +1067,8 @@ defaultBackend:
   #       app.kubernetes.io/name: '{{ include "ingress-nginx.name" . }}'
   #       app.kubernetes.io/instance: '{{ .Release.Name }}'
   #       app.kubernetes.io/component: default-backend
+  #   matchLabelKeys:
+  #   - pod-template-hash
   #   topologyKey: topology.kubernetes.io/zone
   #   maxSkew: 1
   #   whenUnsatisfiable: ScheduleAnyway
@@ -1070,6 +1077,8 @@ defaultBackend:
   #       app.kubernetes.io/name: '{{ include "ingress-nginx.name" . }}'
   #       app.kubernetes.io/instance: '{{ .Release.Name }}'
   #       app.kubernetes.io/component: default-backend
+  #   matchLabelKeys:
+  #   - pod-template-hash
   #   topologyKey: kubernetes.io/hostname
   #   maxSkew: 1
   #   whenUnsatisfiable: ScheduleAnyway
@@ -1090,6 +1099,7 @@ defaultBackend:
   ##
   podAnnotations: {}
   replicaCount: 1
+  # -- Minimum available pods set in PodDisruptionBudget.
   minAvailable: 1
   resources: {}
   # limits:
diff --git a/packages/system/ingress-nginx/templates/admission-webhook-egress-policy.yaml b/packages/system/ingress-nginx/templates/admission-webhook-egress-policy.yaml
new file mode 100644
index 0000000000..c54c946658
--- /dev/null
+++ b/packages/system/ingress-nginx/templates/admission-webhook-egress-policy.yaml
@@ -0,0 +1,226 @@
+{{- $policy := .Values.admissionWebhookPolicy | default dict -}}
+{{- $ingress := index .Subcharts "ingress-nginx" -}}
+{{- $admissionWebhooks := $ingress.Values.controller.admissionWebhooks | default dict -}}
+{{- if and (dig "enabled" true $policy) (dig "enabled" true $admissionWebhooks) (.Capabilities.APIVersions.Has "cilium.io/v2/CiliumClusterwideNetworkPolicy") }}
+{{- $controllerName := include "ingress-nginx.name" $ingress -}}
+{{- $controllerNamespace := include "ingress-nginx.namespace" $ingress -}}
+{{- $webhookPort := required "ingress-nginx.controller.admissionWebhooks.port must be set while admissionWebhookPolicy is enabled" $admissionWebhooks.port -}}
+{{- $policyHash := printf "%s/%s" $controllerNamespace .Release.Name | sha256sum | trunc 12 -}}
+---
+{{/*
+The ingress-nginx admission webhook only needs to be reachable by the API
+server. Leaving it reachable from every pod is avoidable attack surface: any
+flaw in the webhook then becomes exploitable by any workload in any
+namespace, which is what made CVE-2025-1974 (IngressNightmare) critical
+rather than merely serious.
+
+The deny is expressed from BOTH ends, and the reason is that each end fails in
+a direction the other does not.
+
+The source-side specs (the first two) are an egressDeny evaluated on the
+caller's own endpoint, so they hold while the webhook endpoint's policy is
+being recomputed or has overflowed its own policy map. What they cannot cover is
+a Service translated by another component after Cilium's egress hook, because
+they name the webhook's backend port and rely on the DNAT happening first.
+
+The target-side spec (the third) is an ingressDeny on the webhook endpoint,
+evaluated after whatever DNAT already happened, so it is independent of the
+service-LB implementation. What it cannot do is stay off the fail-closed
+endpoint's own policy: denying pods needs a cluster-spanning peer, and that is
+enumerated per identity on this endpoint.
+
+So be exact about what shipping both means, because the source-side rules were
+added to get a cluster-spanning selector OFF the webhook endpoint and the
+target-side rule puts one back. This change does not eliminate the
+namespace-churn map writes on that endpoint. It makes them non-load-bearing:
+whichever end is degraded, the other still denies, and the writes are writes
+rather than an outage (see the cost paragraph on the third spec). Removing the
+coupling outright would mean dropping the target-side rule and accepting a
+silent fail-open if another component performs DNAT only after Cilium's egress
+hook, which is the worse trade.
+
+Stated precisely, because #3983 was reported as a hard outage rather than a
+flap: the coupling above is real, but it was not reproduced in isolation as the
+trigger, and the symptom the issue reports -- connect: no route to host, i.e.
+EHOSTUNREACH -- cannot come from a policy denial at all, since a deny drops
+after connect() has returned and the caller sees a timeout. See the PR
+description for where that errno does come from. The world deny below, the
+other candidate the issue named, is retained on the evidence quoted at the end
+of this comment. hack/e2e-chainsaw/gateway/chainsaw-test.yaml covers both the
+availability and the deny these rules are supposed to provide.
+
+Only the BACKEND port is denied, and that is sufficient rather than an
+oversight. Cilium translates a service to its backends BEFORE egress policy
+is enforced, so a pod dialling the admission Service's ClusterIP:443 is
+matched against the backend identity on port 8443 -- the rule below. Do not
+reach for `toServices` to cover the ClusterIP explicitly: Cilium resolves
+`toServices` only inside ALLOW rules (pkg/policy/k8s/service.go walks
+spec.Egress and never spec.EgressDeny), and an egressDeny whose only
+destination is an unresolved `toServices` reaches the datapath with a
+non-nil-but-empty L3 selector, which Cilium reads as a WILDCARD when the rule
+carries toPorts (pkg/policy/types/policyentry.go). Such a rule denies every
+destination on that port for every selected endpoint -- a cluster-wide
+egress outage, not a tighter deny.
+
+That ordering is Cilium's own, and it is conditional: it holds while Cilium owns
+service load-balancing. Cozystack supports this chart only with
+kubeProxyReplacement: true and does not provide a supported fallback service
+load balancer for a false value. On the kube-ovn management topology this is
+explicit: packages/system/kubeovn/values.yaml also sets ENABLE_LB: false. A
+false value therefore leaves ClusterIP routing without a supported owner and
+can break Service connectivity; it does not by itself make this webhook
+reachable.
+
+If a second unsupported configuration change supplied another service DNAT,
+the source-side rules would no longer cover packets before that translation:
+they would reach Cilium's egress hook with dst = ClusterIP and match no endpoint
+identity. The third spec below remains target-side and is evaluated after any
+translation, so pod traffic still does not fail open. The source-side rules are
+still worth pinning because they carry the deny while the webhook endpoint's
+own policy is degraded.
+
+packages/system/cilium/tests/kube_proxy_replacement_test.yaml pins the supported
+value across the chart defaults and all five variant valuesFiles combinations,
+and packages/system/cilium/templates/kube-proxy-replacement-beacon.yaml reports
+an unsupported live override that repository tests cannot observe. The
+deny-still-enforced case in hack/e2e-chainsaw/gateway/chainsaw-test.yaml verifies
+both Service and direct-backend paths on a live supported cluster.
+
+The first rule covers every workload outside kube-system. The second covers
+kube-system except the konnectivity-agent ServiceAccount: a Kamaji-hosted
+tenant cluster reaches in-cluster webhooks through that pod, and Kamaji sets
+the ServiceAccount name from the same constant as the pod's k8s-app label
+(internal/resources/konnectivity/agent.go). Keying the exemption on the
+ServiceAccount matters: `k8s-app` is an ordinary pod label any workload can
+set on itself, and because these rules disable default-deny, falling out of
+the deny IS the whole access decision. Cilium derives
+io.cilium.k8s.policy.serviceaccount from the pod's actual ServiceAccount, so
+it cannot be forged with a label.
+
+The third spec is target-side, on the webhook endpoint itself, and carries two
+denies kept for different reasons.
+
+Its pod deny is deliberate belt and braces, not a leftover from the shape this
+change replaced. Being on the destination's ingress path it is evaluated after
+whatever DNAT has already happened, so it still holds if another component
+translates the Service after source-side egress policy -- exactly the exposure
+the paragraphs above describe. It cannot catch the API server: for a
+clusterwide policy Cilium rewrites every
+fromEndpoints selector to also require k8s:io.kubernetes.pod.namespace to
+Exist, plus the cluster label (Cilium v1.20.2,
+pkg/k8s/apis/cilium.io/utils/utils.go:120-157 getEndpointSelector, whose own
+comment at :141 says that even a wildcard must not become a truly empty
+allow-all selector), and reserved identities carry neither label. What WOULD
+catch the API server is `fromEntities: [all]` or an omitted peer, so the shape
+is pinned in tests/admission_webhook_egress_policy_test.yaml rather than left
+to review.
+
+Its cost, stated rather than denied: a cluster-spanning fromEndpoints peer is
+enumerated per identity, so this rule adds policy-map entries on the webhook
+endpoints in proportion to the number of pod identities in the cluster, and a
+map write on every namespace add or delete. It does not cost a drop window --
+applyPolicyMapChangesLocked in pkg/endpoint/bpf.go adds entries before deleting
+them expressly to avoid transient drops, and inverts that order only when the
+addition would overflow the map, warning when it does. The residual risk is
+therefore cardinality rather than churn: a webhook endpoint whose policy map
+approaches MaxEntries gets the inverted order and a possible transient drop,
+and cozystack leaves endpointLockdownOnMapOverflow at false
+(charts/cilium/values.yaml), so an overflow degrades rather than locking
+the endpoint down. That is the trade: enforcement independent of the service-LB
+implementation, paid for in map entries on two endpoints.
+
+Its world deny is retained rather than relied upon for the API server: on a
+kube-ovn chained datapath the API server's connection arrives with identity
+`host` (same node) or `kube-apiserver` (another node), never `world` --
+observed with `cilium monitor` on a live kube-ovn cluster while the equivalent
+kubeovn-webhook policy was in place.
+*/}}
+apiVersion: cilium.io/v2
+kind: CiliumClusterwideNetworkPolicy
+metadata:
+  name: ingress-nginx-admission-webhook-{{ $policyHash }}
+specs:
+- endpointSelector:
+    matchExpressions:
+    - key: k8s:io.kubernetes.pod.namespace
+      operator: NotIn
+      values:
+      - kube-system
+  enableDefaultDeny:
+    ingress: false
+    egress: false
+  egressDeny:
+  - toEndpoints:
+    - matchLabels:
+        "k8s:io.kubernetes.pod.namespace": {{ $controllerNamespace | quote }}
+        "k8s:app.kubernetes.io/name": {{ $controllerName | quote }}
+        "k8s:app.kubernetes.io/instance": {{ .Release.Name | quote }}
+        "k8s:app.kubernetes.io/component": controller
+    toPorts:
+    - ports:
+      - port: {{ $webhookPort | quote }}
+        protocol: TCP
+- endpointSelector:
+    matchExpressions:
+    - key: k8s:io.kubernetes.pod.namespace
+      operator: In
+      values:
+      - kube-system
+    - key: io.cilium.k8s.policy.serviceaccount
+      operator: NotIn
+      values:
+      - konnectivity-agent
+  enableDefaultDeny:
+    ingress: false
+    egress: false
+  egressDeny:
+  - toEndpoints:
+    - matchLabels:
+        "k8s:io.kubernetes.pod.namespace": {{ $controllerNamespace | quote }}
+        "k8s:app.kubernetes.io/name": {{ $controllerName | quote }}
+        "k8s:app.kubernetes.io/instance": {{ .Release.Name | quote }}
+        "k8s:app.kubernetes.io/component": controller
+    toPorts:
+    - ports:
+      - port: {{ $webhookPort | quote }}
+        protocol: TCP
+- endpointSelector:
+    matchLabels:
+      "k8s:io.kubernetes.pod.namespace": {{ $controllerNamespace | quote }}
+      "k8s:app.kubernetes.io/name": {{ $controllerName | quote }}
+      "k8s:app.kubernetes.io/instance": {{ .Release.Name | quote }}
+      "k8s:app.kubernetes.io/component": controller
+  enableDefaultDeny:
+    ingress: false
+    egress: false
+  ingressDeny:
+  - fromEndpoints:
+    # Same two source groups as the source-side specs above, for the same
+    # reason: the konnectivity-agent ServiceAccount is the one legitimate pod
+    # caller, and keying the exemption on the ServiceAccount rather than on a
+    # pod label keeps it unforgeable.
+    - matchExpressions:
+      - key: k8s:io.kubernetes.pod.namespace
+        operator: NotIn
+        values:
+        - kube-system
+    - matchExpressions:
+      - key: k8s:io.kubernetes.pod.namespace
+        operator: In
+        values:
+        - kube-system
+      - key: io.cilium.k8s.policy.serviceaccount
+        operator: NotIn
+        values:
+        - konnectivity-agent
+    toPorts:
+    - ports:
+      - port: {{ $webhookPort | quote }}
+        protocol: TCP
+  - fromEntities:
+    - world
+    toPorts:
+    - ports:
+      - port: {{ $webhookPort | quote }}
+        protocol: TCP
+{{- end }}
diff --git a/packages/system/ingress-nginx/templates/admission-webhook-networkpolicy.yaml b/packages/system/ingress-nginx/templates/admission-webhook-networkpolicy.yaml
new file mode 100644
index 0000000000..b2ec50d933
--- /dev/null
+++ b/packages/system/ingress-nginx/templates/admission-webhook-networkpolicy.yaml
@@ -0,0 +1,97 @@
+{{- if .Values.admissionWebhookPolicy.enabled }}
+{{- $inc := index .Values "ingress-nginx" | default dict }}
+{{- $webhookPort := dig "controller" "admissionWebhooks" "port" 8443 $inc }}
+---
+# The ingress-nginx admission webhook only ever needs to be reachable by the
+# API server. Leaving it reachable from every pod in the cluster is avoidable
+# attack surface: any flaw in the webhook then becomes exploitable by any
+# workload in any namespace, which is precisely what made CVE-2025-1974
+# (IngressNightmare) critical rather than merely serious.
+#
+# This policy is deny-only and explicitly disables default-deny. A Cilium rule
+# that carries an ingress section normally puts the selected endpoints behind a
+# default-deny, which here would mean enumerating every port the controller
+# serves (80, 443, metrics, the protobuf exporter, any tcp/udp services) and
+# silently breaking traffic on the first one forgotten. With
+# enableDefaultDeny.ingress=false the rule only subtracts access to the webhook
+# port and leaves everything else exactly as it was.
+#
+# Two legitimate callers are carved out of the deny:
+#
+#   * host-network sources, which are not Cilium endpoints and so are never
+#     matched by fromEndpoints. This covers a management cluster, where the
+#     kube-apiserver runs on the host network.
+#
+#   * the konnectivity agent **in kube-system**. For a Kamaji-hosted tenant
+#     cluster the API server lives outside the cluster and reaches in-cluster
+#     webhooks through the konnectivity tunnel: Kamaji defines only the
+#     "cluster" egress selection
+#     (internal/resources/konnectivity/egress_selector_configuration_resource.go),
+#     and webhook calls fall under it. The connection therefore leaves the
+#     tunnel from the agent pod in kube-system, not from the API server address,
+#     so a fromEntities[kube-apiserver] allow would not match it and every
+#     Ingress create/update in the tenant cluster would start failing. Kamaji
+#     puts nothing but `k8s-app: konnectivity-agent` on that pod template
+#     (internal/resources/konnectivity/agent.go), so the label is the only
+#     available discriminator — hence the namespace confinement below rather
+#     than a more specific label match.
+apiVersion: cilium.io/v2
+kind: CiliumNetworkPolicy
+metadata:
+  name: ingress-nginx-admission-webhook
+  namespace: {{ .Release.Namespace }}
+spec:
+  endpointSelector:
+    matchLabels:
+      app.kubernetes.io/name: ingress-nginx
+      app.kubernetes.io/component: controller
+  enableDefaultDeny:
+    ingress: false
+    egress: false
+  ingressDeny:
+  # Every pod in the cluster, with the konnectivity-agent exemption confined to
+  # kube-system. The two selectors OR together, and each one names the namespace
+  # key explicitly so the rule spans all namespaces: a plain fromEndpoints in a
+  # namespaced CiliumNetworkPolicy would only ever select pods sharing this
+  # policy's namespace.
+  #
+  # The split is load-bearing rather than cosmetic. `k8s-app` is an ordinary pod
+  # label that any workload sets on itself, and because this rule disables
+  # default-deny, falling out of the deny *is* the entire access decision — so a
+  # single selector carrying the label exemption would let any pod in any
+  # namespace reach the webhook simply by labelling itself
+  # `k8s-app: konnectivity-agent`, which is exactly the access this policy
+  # exists to remove. Nothing in the platform constrains pod labels by
+  # admission, and Cilium keeps `k8s-app` as an identity-relevant label (its
+  # label filter ships no default whitelist), so the forged label really would
+  # change the endpoint's identity. The namespace key is derived by Cilium from
+  # the pod's actual namespace and cannot be set by the workload, which is what
+  # makes it safe to key the exemption on.
+  - fromEndpoints:
+    # Outside kube-system: no exemption exists, so no label can buy one.
+    - matchExpressions:
+      - key: k8s:io.kubernetes.pod.namespace
+        operator: NotIn
+        values:
+        - kube-system
+    # Inside kube-system: everything except the konnectivity agent itself.
+    - matchExpressions:
+      - key: k8s:io.kubernetes.pod.namespace
+        operator: In
+        values:
+        - kube-system
+      - key: k8s-app
+        operator: NotIn
+        values:
+        - konnectivity-agent
+    toPorts:
+    - ports:
+      - port: {{ $webhookPort | quote }}
+        protocol: TCP
+  - fromEntities:
+    - world
+    toPorts:
+    - ports:
+      - port: {{ $webhookPort | quote }}
+        protocol: TCP
+{{- end }}
diff --git a/packages/system/ingress-nginx/tests/admission_webhook_egress_policy_capability_test.yaml b/packages/system/ingress-nginx/tests/admission_webhook_egress_policy_capability_test.yaml
new file mode 100644
index 0000000000..6afe8f00c7
--- /dev/null
+++ b/packages/system/ingress-nginx/tests/admission_webhook_egress_policy_capability_test.yaml
@@ -0,0 +1,13 @@
+suite: ingress-nginx admission webhook policy capability gate
+release:
+  name: ingress-nginx
+  namespace: cozy-ingress-nginx
+templates:
+  - templates/admission-webhook-egress-policy.yaml
+capabilities:
+  apiVersions: []
+tests:
+  - it: renders nothing when Cilium clusterwide policies are unavailable
+    asserts:
+      - hasDocuments:
+          count: 0
diff --git a/packages/system/ingress-nginx/tests/admission_webhook_egress_policy_test.yaml b/packages/system/ingress-nginx/tests/admission_webhook_egress_policy_test.yaml
new file mode 100644
index 0000000000..717c5e7437
--- /dev/null
+++ b/packages/system/ingress-nginx/tests/admission_webhook_egress_policy_test.yaml
@@ -0,0 +1,257 @@
+suite: ingress-nginx admission webhook exposure
+release:
+  name: ingress-nginx
+  namespace: cozy-ingress-nginx
+templates:
+  - templates/admission-webhook-egress-policy.yaml
+capabilities:
+  apiVersions:
+    - cilium.io/v2/CiliumClusterwideNetworkPolicy
+tests:
+  - it: denies direct pod egress to the exact webhook backend and port
+    asserts:
+      - isKind:
+          of: CiliumClusterwideNetworkPolicy
+      - equal:
+          path: specs[0].egressDeny[0].toEndpoints[0].matchLabels["k8s:io.kubernetes.pod.namespace"]
+          value: cozy-ingress-nginx
+      - equal:
+          path: specs[0].egressDeny[0].toEndpoints[0].matchLabels["k8s:app.kubernetes.io/name"]
+          value: ingress-nginx
+      - equal:
+          path: specs[0].egressDeny[0].toEndpoints[0].matchLabels["k8s:app.kubernetes.io/instance"]
+          value: ingress-nginx
+      - equal:
+          path: specs[0].egressDeny[0].toEndpoints[0].matchLabels["k8s:app.kubernetes.io/component"]
+          value: controller
+      - equal:
+          path: specs[0].egressDeny[0].toPorts[0].ports[0].port
+          value: "8443"
+      - equal:
+          path: specs[0].egressDeny[0].toPorts[0].ports[0].protocol
+          value: TCP
+
+  # Regression guard for the fail-open-turned-outage this policy shipped with
+  # once. Cilium resolves `toServices` only inside ALLOW rules
+  # (pkg/policy/k8s/service.go walks spec.Egress and never spec.EgressDeny). An
+  # egressDeny whose only destination is an unresolved `toServices` therefore
+  # reaches the datapath with a non-nil-but-empty L3 selector, and Cilium reads
+  # that as a WILDCARD whenever the rule carries toPorts
+  # (pkg/policy/types/policyentry.go) -- turning "deny this Service on 443" into
+  # "deny EVERY destination on 443" for every pod the spec selects. Nothing in
+  # the rendered YAML looks wrong, which is why the shape is asserted here
+  # rather than left to review: every deny rule must name a destination Cilium
+  # can actually resolve, and there must be exactly one per source group.
+  - it: gives every deny rule a destination selector Cilium can resolve
+    asserts:
+      - lengthEqual:
+          path: specs
+          count: 3
+      - lengthEqual:
+          path: specs[0].egressDeny
+          count: 1
+      - lengthEqual:
+          path: specs[1].egressDeny
+          count: 1
+      - exists:
+          path: specs[0].egressDeny[0].toEndpoints
+      - exists:
+          path: specs[1].egressDeny[0].toEndpoints
+      - notExists:
+          path: specs[0].egressDeny[0].toServices
+      - notExists:
+          path: specs[1].egressDeny[0].toServices
+      - exists:
+          path: specs[2].ingressDeny[1].fromEntities
+
+
+  - it: applies the same destination deny to both source groups
+    asserts:
+      - equal:
+          path: specs[1].egressDeny
+          value:
+            - toEndpoints:
+                - matchLabels:
+                    k8s:io.kubernetes.pod.namespace: cozy-ingress-nginx
+                    k8s:app.kubernetes.io/name: ingress-nginx
+                    k8s:app.kubernetes.io/instance: ingress-nginx
+                    k8s:app.kubernetes.io/component: controller
+              toPorts:
+                - ports:
+                    - port: "8443"
+                      protocol: TCP
+
+  - it: covers all non-system pods without a forgeable label exemption
+    asserts:
+      - equal:
+          path: specs[0].endpointSelector.matchExpressions
+          value:
+            - key: k8s:io.kubernetes.pod.namespace
+              operator: NotIn
+              values:
+                - kube-system
+
+  - it: exempts only the konnectivity-agent ServiceAccount in kube-system
+    asserts:
+      - contains:
+          path: specs[1].endpointSelector.matchExpressions
+          content:
+            key: k8s:io.kubernetes.pod.namespace
+            operator: In
+            values:
+              - kube-system
+      - contains:
+          path: specs[1].endpointSelector.matchExpressions
+          content:
+            key: io.cilium.k8s.policy.serviceaccount
+            operator: NotIn
+            values:
+              - konnectivity-agent
+      - lengthEqual:
+          path: specs[1].endpointSelector.matchExpressions
+          count: 2
+
+  - it: denies world ingress without a namespace-dependent caller selector
+    asserts:
+      - equal:
+          path: specs[2].endpointSelector.matchLabels
+          value:
+            k8s:io.kubernetes.pod.namespace: cozy-ingress-nginx
+            k8s:app.kubernetes.io/name: ingress-nginx
+            k8s:app.kubernetes.io/instance: ingress-nginx
+            k8s:app.kubernetes.io/component: controller
+      - contains:
+          path: specs[2].ingressDeny[1].fromEntities
+          content: world
+      - equal:
+          path: specs[2].ingressDeny[1].toPorts[0].ports[0].port
+          value: "8443"
+      - notExists:
+          path: specs[2].endpointSelector.matchExpressions
+
+  # The target-side pod deny is what keeps this policy enforcing where Cilium is
+  # not the service load balancer, so its PEER is the load-bearing part and the
+  # two ways of losing it are silent. `fromEntities: [all]` and an omitted peer
+  # both widen the rule to every source identity, reserved ones included, which
+  # would deny the API server on a fail-closed webhook -- and both still render
+  # as a plausible-looking ingressDeny. A CRD-sourced fromEndpoints cannot do
+  # that: Cilium rewrites it to also require the pod-namespace label to exist
+  # (pkg/k8s/apis/cilium.io/utils/utils.go:120-157, v1.20.2), which no reserved
+  # identity carries. Both substitutions are asserted against here, and both
+  # were made and watched go red.
+  #
+  # The konnectivity-agent exemption is carried on this rule too, and for the
+  # same reason as on the source side: without it a Kamaji-hosted tenant
+  # cluster's Ingress admission breaks, because the API server reaches this
+  # webhook through that pod rather than from its own address.
+  - it: keeps a target-side pod deny whose peer cannot reach reserved identities
+    asserts:
+      - lengthEqual:
+          path: specs[2].ingressDeny
+          count: 2
+      - equal:
+          path: specs[2].ingressDeny[0].fromEndpoints
+          value:
+            - matchExpressions:
+                - key: k8s:io.kubernetes.pod.namespace
+                  operator: NotIn
+                  values:
+                    - kube-system
+            - matchExpressions:
+                - key: k8s:io.kubernetes.pod.namespace
+                  operator: In
+                  values:
+                    - kube-system
+                - key: io.cilium.k8s.policy.serviceaccount
+                  operator: NotIn
+                  values:
+                    - konnectivity-agent
+      - notExists:
+          path: specs[2].ingressDeny[0].fromEntities
+      - equal:
+          path: specs[2].ingressDeny[0].toPorts[0].ports[0].port
+          value: "8443"
+      - notExists:
+          path: specs[2].ingressDeny[1].fromEndpoints
+
+  - it: does not enable default deny on source or target endpoints
+    asserts:
+      - equal:
+          path: specs[0].enableDefaultDeny
+          value:
+            ingress: false
+            egress: false
+      - equal:
+          path: specs[1].enableDefaultDeny
+          value:
+            ingress: false
+            egress: false
+      - equal:
+          path: specs[2].enableDefaultDeny
+          value:
+            ingress: false
+            egress: false
+      - notExists:
+          path: specs[0].ingress
+      - notExists:
+          path: specs[0].ingressDeny
+      - notExists:
+          path: specs[0].egress
+
+  - it: gives each release a cluster-scoped collision-safe name
+    asserts:
+      - matchRegex:
+          path: metadata.name
+          pattern: ^ingress-nginx-admission-webhook-[a-f0-9]{12}$
+      - notExists:
+          path: metadata.namespace
+
+  - it: follows upstream name namespace and webhook port overrides
+    set:
+      ingress-nginx.nameOverride: edge-ingress
+      ingress-nginx.namespaceOverride: custom-ingress
+      ingress-nginx.controller.admissionWebhooks.port: 9443
+    asserts:
+      - equal:
+          path: specs[0].egressDeny[0].toEndpoints[0].matchLabels["k8s:io.kubernetes.pod.namespace"]
+          value: custom-ingress
+      - equal:
+          path: specs[0].egressDeny[0].toEndpoints[0].matchLabels["k8s:app.kubernetes.io/name"]
+          value: edge-ingress
+      - equal:
+          path: specs[0].egressDeny[0].toPorts[0].ports[0].port
+          value: "9443"
+      - equal:
+          path: specs[2].ingressDeny[0].toPorts[0].ports[0].port
+          value: "9443"
+      - equal:
+          path: specs[2].ingressDeny[1].toPorts[0].ports[0].port
+          value: "9443"
+
+  - it: does not render when the upstream admission webhook is disabled
+    set:
+      ingress-nginx.controller.admissionWebhooks.enabled: false
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  - it: fails closed when the effective subchart values have no webhook port
+    set:
+      ingress-nginx.controller.admissionWebhooks.port: null
+    asserts:
+      - failedTemplate:
+          errorMessage: ingress-nginx.controller.admissionWebhooks.port must be set while admissionWebhookPolicy is enabled
+
+  - it: defaults to enabled when a backport has no policy values
+    set:
+      admissionWebhookPolicy: null
+    asserts:
+      - hasDocuments:
+          count: 1
+
+  - it: can be explicitly disabled
+    set:
+      admissionWebhookPolicy.enabled: false
+    asserts:
+      - hasDocuments:
+          count: 0
diff --git a/packages/system/ingress-nginx/tests/admission_webhook_networkpolicy_test.yaml b/packages/system/ingress-nginx/tests/admission_webhook_networkpolicy_test.yaml
new file mode 100644
index 0000000000..8441868da0
--- /dev/null
+++ b/packages/system/ingress-nginx/tests/admission_webhook_networkpolicy_test.yaml
@@ -0,0 +1,117 @@
+suite: ingress-nginx admission webhook exposure
+release:
+  name: ingress-nginx
+  namespace: cozy-ingress-nginx
+templates:
+  - templates/admission-webhook-networkpolicy.yaml
+tests:
+  - it: denies pod traffic to the admission webhook port
+    # :8443 is the admission webhook. Reachability from arbitrary pods is what
+    # turned CVE-2025-1974 from a webhook bug into unauthenticated in-cluster
+    # RCE, so the deny on this port is the whole point of the policy.
+    asserts:
+      - equal:
+          path: spec.ingressDeny[0].toPorts[0].ports[0].port
+          value: "8443"
+      - equal:
+          path: spec.ingressDeny[0].toPorts[0].ports[0].protocol
+          value: TCP
+
+  - it: spans every namespace rather than only the release namespace
+    # A bare fromEndpoints in a namespaced CiliumNetworkPolicy selects only
+    # pods in the policy's own namespace, which would leave the webhook open
+    # to every other namespace — the exact gap being closed here. Both
+    # selectors therefore have to name the namespace key.
+    asserts:
+      - contains:
+          path: spec.ingressDeny[0].fromEndpoints[0].matchExpressions
+          content:
+            key: k8s:io.kubernetes.pod.namespace
+            operator: NotIn
+            values:
+              - kube-system
+      - contains:
+          path: spec.ingressDeny[0].fromEndpoints[1].matchExpressions
+          content:
+            key: k8s:io.kubernetes.pod.namespace
+            operator: In
+            values:
+              - kube-system
+
+  - it: does not let a pod outside kube-system buy an exemption with a label
+    # The whole reason the deny is split in two. `k8s-app` is an ordinary pod
+    # label any workload can set on itself, and with default-deny disabled
+    # escaping the deny IS being allowed — so a selector that pairs
+    # "every namespace" with the label exemption would hand webhook access to
+    # any pod anywhere that labels itself konnectivity-agent. The selector
+    # covering everything outside kube-system must therefore carry no label
+    # condition whatsoever.
+    asserts:
+      - lengthEqual:
+          path: spec.ingressDeny[0].fromEndpoints[0].matchExpressions
+          count: 1
+      - notContains:
+          path: spec.ingressDeny[0].fromEndpoints[0].matchExpressions
+          content:
+            key: k8s-app
+            operator: NotIn
+            values:
+              - konnectivity-agent
+
+  - it: exempts the konnectivity agent only inside kube-system
+    # On a Kamaji-hosted tenant cluster the API server is outside the cluster
+    # and reaches webhooks through the konnectivity tunnel, so the connection
+    # originates from the agent pod in kube-system. Denying it would make every
+    # Ingress create/update in the tenant cluster fail on the webhook call —
+    # but the exemption has to be confined to that namespace, and a pod in
+    # kube-system without the label stays denied.
+    asserts:
+      - contains:
+          path: spec.ingressDeny[0].fromEndpoints[1].matchExpressions
+          content:
+            key: k8s-app
+            operator: NotIn
+            values:
+              - konnectivity-agent
+      - lengthEqual:
+          path: spec.ingressDeny[0].fromEndpoints[1].matchExpressions
+          count: 2
+
+  - it: denies world traffic to the admission webhook port
+    asserts:
+      - contains:
+          path: spec.ingressDeny[1].fromEntities
+          content: world
+      - equal:
+          path: spec.ingressDeny[1].toPorts[0].ports[0].port
+          value: "8443"
+
+  - it: does not put the controller behind a default deny
+    # The controller also serves 80/443, metrics and the protobuf exporter.
+    # Enabling default-deny here would require enumerating all of them and
+    # would break traffic on the first one omitted.
+    asserts:
+      - equal:
+          path: spec.enableDefaultDeny.ingress
+          value: false
+      - equal:
+          path: spec.enableDefaultDeny.egress
+          value: false
+      - isNull:
+          path: spec.ingress
+
+  - it: selects only the controller pods
+    asserts:
+      - equal:
+          path: spec.endpointSelector.matchLabels["app.kubernetes.io/component"]
+          value: controller
+      - equal:
+          path: spec.endpointSelector.matchLabels["app.kubernetes.io/name"]
+          value: ingress-nginx
+
+  - it: can be disabled
+    set:
+      admissionWebhookPolicy.enabled: false
+    asserts:
+      - hasDocuments:
+          count: 0
diff --git a/packages/system/ingress-nginx/tests/default_backend_image_test.yaml b/packages/system/ingress-nginx/tests/default_backend_image_test.yaml
new file mode 100644
index 0000000000..1c8021942e
--- /dev/null
+++ b/packages/system/ingress-nginx/tests/default_backend_image_test.yaml
@@ -0,0 +1,15 @@
+suite: ingress-nginx default backend image
+release:
+  name: ingress-nginx
+  namespace: cozy-ingress-nginx
+templates:
+  - charts/ingress-nginx/templates/default-backend-deployment.yaml
+tests:
+  - it: runs the multi-arch custom-error-pages image pinned by digest
+    # The chart default, registry.k8s.io/defaultbackend-amd64, has no arm64
+    # build and crash-loops there with "exec format error". The digest is the
+    # multi-arch index, so every node pulls its own architecture.
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].image
+          value: registry.k8s.io/ingress-nginx/custom-error-pages:v1.2.9@sha256:203d3020005dbdd735c1ad51f238d8663b9851399b52cc0c9c9e3f7273b6b299
diff --git a/packages/system/ingress-nginx/values.yaml b/packages/system/ingress-nginx/values.yaml
index 68436f51fe..fca145843d 100644
--- a/packages/system/ingress-nginx/values.yaml
+++ b/packages/system/ingress-nginx/values.yaml
@@ -5,8 +5,8 @@ ingress-nginx:
     image:
       registry: ghcr.io
       image: cozystack/ingress-nginx-with-protobuf-exporter/controller
-      tag: v1.11.2
-      digest: sha256:beba8869ee370599e1f26557a9669ebdc9481c07b34059f348eb3e17b647e7e0
+      tag: v1.11.6
+      digest: sha256:a8ddcee59b63f6cbf93f4d3c9ffa1d1dda3c1d39497748d4484655356c68b3f6
     allowSnippetAnnotations: true
     replicaCount: 2
     admissionWebhooks:
@@ -16,7 +16,7 @@ ingress-nginx:
       enabled: true
     extraContainers:
     - name: protobuf-exporter
-      image: ghcr.io/kvaps/ingress-nginx-with-protobuf-exporter/protobuf-exporter:v1.11.2@sha256:6d9235a9ee6f2be1921db4687afbdcd85d145b087dd916b5a96455bdb5cff560
+      image: ghcr.io/cozystack/ingress-nginx-with-protobuf-exporter/protobuf-exporter:v1.11.6@sha256:9b4789965f0efa11eb6345745708480be47ce3a4c751223d07a9d5a19e91174f
       args:
       - --server.telemetry-address=0.0.0.0:9090
       - --server.exporter-address=0.0.0.0:9091
@@ -94,6 +94,13 @@ ingress-nginx:
 
   defaultBackend:
     enabled: true
+    # The chart default, defaultbackend-amd64, has no arm64 build. This image
+    # is the upstream multi-arch replacement: 404 on :8080, /healthz for probes.
+    image:
+      registry: registry.k8s.io
+      image: ingress-nginx/custom-error-pages
+      tag: v1.2.9
+      digest: sha256:203d3020005dbdd735c1ad51f238d8663b9851399b52cc0c9c9e3f7273b6b299
     resources:
       limits:
         cpu: 10m
@@ -102,3 +109,34 @@ ingress-nginx:
         cpu: 10m
         memory: 20Mi
 
+# Deny Cilium-managed pod traffic to the admission webhook. The API server
+# remains reachable directly on a management cluster or through the
+# konnectivity-agent ServiceAccount on a Kamaji-hosted tenant cluster;
+# host-network workloads remain outside this pod policy.
+#
+# Rendered as a CiliumClusterwideNetworkPolicy, and the template renders only
+# while that Cilium API is discoverable. So `true` is not a promise that a
+# policy exists: on a cluster serving no such API the chart emits nothing,
+# without an Event or a render-time message to look at. Set enabled: false to
+# opt out deliberately, which is what separates "this cluster has no Cilium"
+# from "this deny was not wanted here".
+#
+# The policy denies the webhook's backend port only, which covers a pod dialling
+# the Service ClusterIP because Cilium translates a service to its backends
+# before it enforces egress policy. Cozystack supports this only with
+# packages/system/cilium/values.yaml kubeProxyReplacement set to true and does
+# not provide a supported fallback service load balancer for false. Such an
+# override can break ClusterIP routing; it does not by itself make the webhook
+# reachable. If another unsupported change supplied a different translator, the
+# source-side rule would lose the pre-DNAT path but the target-side rule would
+# still deny pods after translation.
+#
+# Residual risk worth stating: no test in this repo can observe a live cluster's
+# Cilium values, so an operator setting kubeProxyReplacement: false in the field
+# is caught only by the status ConfigMap that
+# packages/system/cilium/templates/kube-proxy-replacement-beacon.yaml renders,
+# and inside a tenant Kubernetes cluster only by the equivalent beacon in
+# packages/apps/kubernetes. Those beacons identify an unsupported networking
+# configuration; disabling this policy does not make it supported.
+admissionWebhookPolicy:
+  enabled: true
diff --git a/packages/system/ingress-rd/cozyrds/ingress.yaml b/packages/system/ingress-rd/cozyrds/ingress.yaml
index b853302c8a..91f4f1466e 100644
--- a/packages/system/ingress-rd/cozyrds/ingress.yaml
+++ b/packages/system/ingress-rd/cozyrds/ingress.yaml
@@ -8,7 +8,7 @@ spec:
     plural: ingresses
     singular: ingress
     openAPISchema: |-
-      {"title":"Chart Values","type":"object","properties":{"replicas":{"description":"Number of ingress-nginx replicas.","type":"integer","default":2},"whitelist":{"description":"List of client networks.","type":"array","default":[],"items":{"type":"string"}},"cloudflareProxy":{"description":"Restoring original visitor IPs when Cloudflare proxied is enabled.","type":"boolean","default":false},"resources":{"description":"Explicit CPU and memory configuration for each ingress-nginx replica. When omitted, the preset defined in `resourcesPreset` is applied.","type":"object","default":{},"properties":{"cpu":{"description":"CPU available to each replica.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Memory (RAM) available to each replica.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}},"resourcesPreset":{"description":"Default sizing preset used when `resources` is omitted.","type":"string","default":"t1.micro","enum":["t1.nano","t1.micro","t1.small","t1.medium","t1.large","t1.xlarge","t1.2xlarge","t1.4xlarge","c1.nano","c1.micro","c1.small","c1.medium","c1.large","c1.xlarge","c1.2xlarge","c1.4xlarge","s1.nano","s1.micro","s1.small","s1.medium","s1.large","s1.xlarge","s1.2xlarge","s1.4xlarge","u1.nano","u1.micro","u1.small","u1.medium","u1.large","u1.xlarge","u1.2xlarge","u1.4xlarge","m1.nano","m1.micro","m1.small","m1.medium","m1.large","m1.xlarge","m1.2xlarge","m1.4xlarge","nano","micro","small","medium","large","xlarge","2xlarge"]}}}
+      {"title":"Chart Values","type":"object","properties":{"replicas":{"description":"Number of ingress-nginx replicas.","type":"integer","default":2},"whitelist":{"description":"List of client networks.","type":"array","default":[],"items":{"type":"string"}},"cloudflareProxy":{"description":"Restoring original visitor IPs when Cloudflare proxied is enabled.","type":"boolean","default":false},"proxyProtocol":{"description":"Enable PROXY-protocol (use-proxy-protocol) on a tenant Ingress application. The upstream L4 load balancer in front of ingress-nginx MUST already inject PROXY-protocol v1 headers, otherwise all traffic to this ingress breaks — including in-cluster and direct-Service (hairpin) access to its public hostnames. Mutually exclusive with cloudflareProxy. For the host (external-facing) ingress use the platform-level publishing.proxyProtocol switch instead; the per-app value is rejected there because it would bypass the ouroboros hairpin handling and the disable-hazard guard.","type":"boolean","default":false},"resources":{"description":"Explicit CPU and memory configuration for each ingress-nginx replica. When omitted, the preset defined in `resourcesPreset` is applied.","type":"object","default":{},"properties":{"cpu":{"description":"CPU available to each replica.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Memory (RAM) available to each replica.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}},"resourcesPreset":{"description":"Default sizing preset used when `resources` is omitted.","type":"string","default":"t1.micro","enum":["t1.nano","t1.micro","t1.small","t1.medium","t1.large","t1.xlarge","t1.2xlarge","t1.4xlarge","c1.nano","c1.micro","c1.small","c1.medium","c1.large","c1.xlarge","c1.2xlarge","c1.4xlarge","s1.nano","s1.micro","s1.small","s1.medium","s1.large","s1.xlarge","s1.2xlarge","s1.4xlarge","u1.nano","u1.micro","u1.small","u1.medium","u1.large","u1.xlarge","u1.2xlarge","u1.4xlarge","m1.nano","m1.micro","m1.small","m1.medium","m1.large","m1.xlarge","m1.2xlarge","m1.4xlarge","nano","micro","small","medium","large","xlarge","2xlarge"]}}}
   release:
     prefix: ""
     labels:
@@ -26,7 +26,7 @@ spec:
     description: NGINX Ingress Controller
     module: true
     icon: PHN2ZyB3aWR0aD0iMTQ0IiBoZWlnaHQ9IjE0NCIgdmlld0JveD0iMCAwIDE0NCAxNDQiIGZpbGw9Im5vbmUiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+CjxyZWN0IHdpZHRoPSIxNDQiIGhlaWdodD0iMTQ0IiByeD0iMjQiIGZpbGw9InVybCgjcGFpbnQwX2xpbmVhcl82ODRfMzIyOSkiLz4KPHBhdGggZD0iTTg2LjkyNzQgMzcuMTA3NEgxN1YxMDcuMDM1SDg2LjkyNzRWMzcuMTA3NFoiIHN0cm9rZT0id2hpdGUiIHN0cm9rZS13aWR0aD0iNiIgc3Ryb2tlLW1pdGVybGltaXQ9IjEwIiBzdHJva2UtbGluZWNhcD0icm91bmQiIHN0cm9rZS1saW5lam9pbj0icm91bmQiLz4KPHBhdGggZD0iTTEyNy42NDMgMjlIMTA3LjQ1NVY0OS4xODgzSDEyNy42NDNWMjlaIiBzdHJva2U9IndoaXRlIiBzdHJva2Utd2lkdGg9IjQiIHN0cm9rZS1taXRlcmxpbWl0PSIxMCIgc3Ryb2tlLWxpbmVjYXA9InJvdW5kIiBzdHJva2UtbGluZWpvaW49InJvdW5kIi8+CjxwYXRoIGQ9Ik0xMjcuNjQzIDYxLjcyNjZIMTA3LjQ1NVY4MS45MTQ5SDEyNy42NDNWNjEuNzI2NloiIHN0cm9rZT0id2hpdGUiIHN0cm9rZS13aWR0aD0iNCIgc3Ryb2tlLW1pdGVybGltaXQ9IjEwIiBzdHJva2UtbGluZWNhcD0icm91bmQiIHN0cm9rZS1saW5lam9pbj0icm91bmQiLz4KPHBhdGggZD0iTTEyNy42NDMgOTQuNDUyMUgxMDcuNDU1VjExNC42NEgxMjcuNjQzVjk0LjQ1MjFaIiBzdHJva2U9IndoaXRlIiBzdHJva2Utd2lkdGg9IjQiIHN0cm9rZS1taXRlcmxpbWl0PSIxMCIgc3Ryb2tlLWxpbmVjYXA9InJvdW5kIiBzdHJva2UtbGluZWpvaW49InJvdW5kIi8+CjxwYXRoIGQ9Ik04OC41MTM3IDcyLjA3MTNIMTA2LjI3IiBzdHJva2U9IndoaXRlIiBzdHJva2Utd2lkdGg9IjMiIHN0cm9rZS1taXRlcmxpbWl0PSIxMCIgc3Ryb2tlLWxpbmVjYXA9InJvdW5kIiBzdHJva2UtbGluZWpvaW49InJvdW5kIi8+CjxwYXRoIGQ9Ik04Ny41Njc0IDgwLjQyNDhMMTA3LjczIDk1Ljc4MDUiIHN0cm9rZT0id2hpdGUiIHN0cm9rZS13aWR0aD0iMyIgc3Ryb2tlLW1pdGVybGltaXQ9IjEwIiBzdHJva2UtbGluZWNhcD0icm91bmQiIHN0cm9rZS1saW5lam9pbj0icm91bmQiLz4KPHBhdGggZD0iTTg3LjU2NzQgNjMuNzE4MUwxMDcuNzMgNDguMzYyMyIgc3Ryb2tlPSJ3aGl0ZSIgc3Ryb2tlLXdpZHRoPSIzIiBzdHJva2UtbWl0ZXJsaW1pdD0iMTAiIHN0cm9rZS1saW5lY2FwPSJyb3VuZCIgc3Ryb2tlLWxpbmVqb2luPSJyb3VuZCIvPgo8ZGVmcz4KPGxpbmVhckdyYWRpZW50IGlkPSJwYWludDBfbGluZWFyXzY4NF8zMjI5IiB4MT0iMTAiIHkxPSIxNS41IiB4Mj0iMTQ0IiB5Mj0iMTMxLjUiIGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIj4KPHN0b3Agc3RvcC1jb2xvcj0iIzAwREE1MyIvPgo8c3RvcCBvZmZzZXQ9IjEiIHN0b3AtY29sb3I9IiMwMDk2MzkiLz4KPC9saW5lYXJHcmFkaWVudD4KPC9kZWZzPgo8L3N2Zz4K
-    keysOrder: [["apiVersion"], ["appVersion"], ["kind"], ["metadata"], ["metadata", "name"], ["spec", "replicas"], ["spec", "whitelist"], ["spec", "cloudflareProxy"], ["spec", "resources"], ["spec", "resourcesPreset"]]
+    keysOrder: [["apiVersion"], ["appVersion"], ["kind"], ["metadata"], ["metadata", "name"], ["spec", "replicas"], ["spec", "whitelist"], ["spec", "cloudflareProxy"], ["spec", "proxyProtocol"], ["spec", "resources"], ["spec", "resourcesPreset"]]
   secrets:
     exclude: []
     include: []
diff --git a/packages/system/kafka-operator/Makefile b/packages/system/kafka-operator/Makefile
index 0e4811e522..30c35e9123 100644
--- a/packages/system/kafka-operator/Makefile
+++ b/packages/system/kafka-operator/Makefile
@@ -3,6 +3,9 @@ export NAMESPACE=cozy-$(NAME)
 
 include ../../../hack/package.mk
 
+test:
+	helm unittest .
+
 update:
 	rm -rf charts
 	helm pull oci://quay.io/strimzi-helm/strimzi-kafka-operator --untar --untardir charts --version 0.45.1-rc1
diff --git a/packages/system/kafka-operator/tests/jvm_sizing_test.yaml b/packages/system/kafka-operator/tests/jvm_sizing_test.yaml
new file mode 100644
index 0000000000..e72a9a657e
--- /dev/null
+++ b/packages/system/kafka-operator/tests/jvm_sizing_test.yaml
@@ -0,0 +1,31 @@
+suite: cluster operator JVM is sized from the container limits
+release:
+  name: kafka-operator
+  namespace: cozy-kafka-operator
+templates:
+  - charts/strimzi-kafka-operator/templates/060-Deployment-strimzi-cluster-operator.yaml
+tests:
+  - it: passes the container limits to the JVM, which cannot read them on kernels without cgroup v1 controllers
+    asserts:
+      # $(VAR) expands only from entries earlier in the list.
+      - equal:
+          path: spec.template.spec.containers[0].env[19]
+          value:
+            name: CONTAINER_MEMORY_LIMIT
+            valueFrom:
+              resourceFieldRef:
+                resource: limits.memory
+      - equal:
+          path: spec.template.spec.containers[0].env[20]
+          value:
+            name: CONTAINER_CPU_LIMIT
+            valueFrom:
+              resourceFieldRef:
+                resource: limits.cpu
+      - equal:
+          path: spec.template.spec.containers[0].env[21]
+          value:
+            name: JAVA_OPTS
+            value: -XX:MaxRAM=$(CONTAINER_MEMORY_LIMIT) -XX:ActiveProcessorCount=$(CONTAINER_CPU_LIMIT)
+      - exists:
+          path: spec.template.spec.containers[0].resources.limits.cpu
diff --git a/packages/system/kafka-operator/values.yaml b/packages/system/kafka-operator/values.yaml
index ddfa2c9b88..8fb5509ade 100644
--- a/packages/system/kafka-operator/values.yaml
+++ b/packages/system/kafka-operator/values.yaml
@@ -5,3 +5,19 @@ strimzi-kafka-operator:
   resources:
     limits:
       memory: 512Mi
+  # The JDK 17 in the operator image decides whether to read the container
+  # limits by looking at /proc/cgroups, which loses its memory line on kernels
+  # built without CONFIG_MEMCG_V1 (6.12+). The JVM then sizes its heap from
+  # host RAM and the container is OOMKilled. Drop this once the image ships a
+  # JDK with JDK-8347811 (17.0.20, 21.0.10).
+  extraEnvs:
+    - name: CONTAINER_MEMORY_LIMIT
+      valueFrom:
+        resourceFieldRef:
+          resource: limits.memory
+    - name: CONTAINER_CPU_LIMIT
+      valueFrom:
+        resourceFieldRef:
+          resource: limits.cpu
+    - name: JAVA_OPTS
+      value: -XX:MaxRAM=$(CONTAINER_MEMORY_LIMIT) -XX:ActiveProcessorCount=$(CONTAINER_CPU_LIMIT)
diff --git a/packages/system/kafka-rd/cozyrds/kafka.yaml b/packages/system/kafka-rd/cozyrds/kafka.yaml
index f100ce03db..97d8bf95bd 100644
--- a/packages/system/kafka-rd/cozyrds/kafka.yaml
+++ b/packages/system/kafka-rd/cozyrds/kafka.yaml
@@ -2,13 +2,24 @@ apiVersion: cozystack.io/v1alpha1
 kind: ApplicationDefinition
 metadata:
   name: kafka
+  annotations:
+    # The ZK->KRaft pre-upgrade migration Job (packages/apps/kafka/templates/migration-hook.yaml)
+    # can run for hours: the migration itself is tens of minutes (broker rolling
+    # restarts through the Strimzi state machine), and when several Kafkas share a
+    # namespace the Job also drains the whole dataset off the shared "kafka" pool
+    # via a Cruise Control rebalance to free the name for the next cluster.
+    # helm-controller waits on the pre-upgrade hook within the release timeout
+    # (default 10m — far below this). Raise it above the Job's
+    # activeDeadlineSeconds (21600s = 6h) so a real drain is not aborted and
+    # thrashed. Keep this above that Job deadline if either changes.
+    release.cozystack.io/helm-install-timeout: "7h"
 spec:
   application:
     kind: Kafka
     plural: kafkas
     singular: kafka
     openAPISchema: |-
-      {"title":"Chart Values","type":"object","properties":{"external":{"description":"Enable external access from outside the cluster.","type":"boolean","default":false},"tls":{"description":"TLS configuration. Strimzi manages the cluster PKI automatically (no cert-manager is involved for this chart): the operator auto-creates `<release>-cluster-ca-cert` and `<release>-clients-ca-cert` secrets, both exposed for client trust setup. The internal TLS listener on 9093 is always on; this toggle only controls the external listener on 9094.","type":"object","default":{},"properties":{"enabled":{"description":"Enable TLS on the external listener. When unset, inherits the value of `external` (TLS is on when external access is enabled). Warning: setting this to false while external is true exposes Kafka over plaintext on a public IP via LoadBalancer. Strimzi does not provide authentication on this listener unless SCRAM, mTLS, or OAuth is separately configured. Use only in controlled networks.","type":"boolean"}}},"topics":{"description":"Topics configuration.","type":"array","default":[],"items":{"type":"object","required":["config","name","partitions","replicas"],"properties":{"config":{"description":"Topic configuration.","type":"object","x-kubernetes-preserve-unknown-fields":true},"name":{"description":"Topic name.","type":"string"},"partitions":{"description":"Number of partitions.","type":"integer"},"replicas":{"description":"Number of replicas.","type":"integer"}}}},"kafka":{"description":"Kafka configuration.","type":"object","default":{},"required":["replicas","resourcesPreset","size","storageClass"],"properties":{"replicas":{"description":"Number of Kafka replicas.","type":"integer","default":3},"resources":{"description":"Explicit CPU and memory configuration. When omitted, the preset defined in `resourcesPreset` is applied.","type":"object","default":{},"properties":{"cpu":{"description":"CPU available to each replica.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Memory (RAM) available to each replica.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}},"resourcesPreset":{"description":"Default sizing preset used when `resources` is omitted.","type":"string","default":"c1.small","enum":["t1.nano","t1.micro","t1.small","t1.medium","t1.large","t1.xlarge","t1.2xlarge","t1.4xlarge","c1.nano","c1.micro","c1.small","c1.medium","c1.large","c1.xlarge","c1.2xlarge","c1.4xlarge","s1.nano","s1.micro","s1.small","s1.medium","s1.large","s1.xlarge","s1.2xlarge","s1.4xlarge","u1.nano","u1.micro","u1.small","u1.medium","u1.large","u1.xlarge","u1.2xlarge","u1.4xlarge","m1.nano","m1.micro","m1.small","m1.medium","m1.large","m1.xlarge","m1.2xlarge","m1.4xlarge","nano","micro","small","medium","large","xlarge","2xlarge"]},"size":{"description":"Persistent Volume size for Kafka.","default":"10Gi","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"storageClass":{"description":"StorageClass used to store the Kafka data.","type":"string","default":"","x-kubernetes-validations":[{"rule":"self == oldSelf","message":"storageClass is immutable"}]}}},"zookeeper":{"description":"ZooKeeper configuration.","type":"object","default":{},"required":["replicas","resourcesPreset","size","storageClass"],"properties":{"replicas":{"description":"Number of ZooKeeper replicas.","type":"integer","default":3},"resources":{"description":"Explicit CPU and memory configuration. When omitted, the preset defined in `resourcesPreset` is applied.","type":"object","default":{},"properties":{"cpu":{"description":"CPU available to each replica.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Memory (RAM) available to each replica.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}},"resourcesPreset":{"description":"Default sizing preset used when `resources` is omitted.","type":"string","default":"c1.small","enum":["t1.nano","t1.micro","t1.small","t1.medium","t1.large","t1.xlarge","t1.2xlarge","t1.4xlarge","c1.nano","c1.micro","c1.small","c1.medium","c1.large","c1.xlarge","c1.2xlarge","c1.4xlarge","s1.nano","s1.micro","s1.small","s1.medium","s1.large","s1.xlarge","s1.2xlarge","s1.4xlarge","u1.nano","u1.micro","u1.small","u1.medium","u1.large","u1.xlarge","u1.2xlarge","u1.4xlarge","m1.nano","m1.micro","m1.small","m1.medium","m1.large","m1.xlarge","m1.2xlarge","m1.4xlarge","nano","micro","small","medium","large","xlarge","2xlarge"]},"size":{"description":"Persistent Volume size for ZooKeeper.","default":"5Gi","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"storageClass":{"description":"StorageClass used to store the ZooKeeper data.","type":"string","default":"","x-kubernetes-validations":[{"rule":"self == oldSelf","message":"storageClass is immutable"}]}}}}}
+      {"title":"Chart Values","type":"object","x-cozystack-name":{"type":"string","description":"Kafka cluster name. The KRaft controller pods are named `kafka-<name>-c-<hash>-<id>` with an 8-character hash, and that pod hostname must fit the 63-character DNS-1123 label limit even for the smallest cluster.","maxLength":44},"properties":{"external":{"description":"Enable external access from outside the cluster.","type":"boolean","default":false},"tls":{"description":"TLS configuration. Strimzi manages the cluster PKI automatically (no cert-manager is involved for this chart): the operator auto-creates `<release>-cluster-ca-cert` and `<release>-clients-ca-cert` secrets, both exposed for client trust setup. The internal TLS listener on 9093 is always on; this toggle only controls the external listener on 9094.","type":"object","default":{},"properties":{"enabled":{"description":"Enable TLS on the external listener. When unset, inherits the value of `external` (TLS is on when external access is enabled). Warning: setting this to false while external is true exposes Kafka over plaintext on a public IP via LoadBalancer. Strimzi does not provide authentication on this listener unless SCRAM, mTLS, or OAuth is separately configured. Use only in controlled networks.","type":"boolean"}}},"version":{"description":"Kafka version to deploy. Upgrade-only: once a cluster's KRaft metadata is at a given version, Strimzi refuses an in-place downgrade, so lowering this on a running cluster (e.g. v3.9 back to v3.8) leaves the Kafka CR stuck in a reconcile error. Pick the target version at creation and only ever raise it.","type":"string","default":"v3.9","enum":["v3.9","v3.8"]},"topics":{"description":"Topics configuration.","type":"array","default":[],"items":{"type":"object","required":["name","partitions","replicas"],"properties":{"config":{"description":"Topic configuration.","type":"object","x-kubernetes-preserve-unknown-fields":true},"name":{"description":"Topic name.","type":"string"},"partitions":{"description":"Number of partitions.","type":"integer"},"replicas":{"description":"Number of replicas.","type":"integer"}}}},"kafka":{"description":"Kafka configuration.","type":"object","default":{},"required":["replicas","resourcesPreset","size","storageClass"],"properties":{"controllerStorageSize":{"description":"Persistent Volume size for KRaft controller metadata (used during ZK-to-KRaft migration).","default":"5Gi","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"replicas":{"description":"Number of Kafka replicas.","type":"integer","default":3},"resources":{"description":"Explicit CPU and memory configuration. When omitted, the preset defined in `resourcesPreset` is applied.","type":"object","default":{},"properties":{"cpu":{"description":"CPU available to each replica.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Memory (RAM) available to each replica.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}},"resourcesPreset":{"description":"Default sizing preset used when `resources` is omitted.","type":"string","default":"c1.small","enum":["t1.nano","t1.micro","t1.small","t1.medium","t1.large","t1.xlarge","t1.2xlarge","t1.4xlarge","c1.nano","c1.micro","c1.small","c1.medium","c1.large","c1.xlarge","c1.2xlarge","c1.4xlarge","s1.nano","s1.micro","s1.small","s1.medium","s1.large","s1.xlarge","s1.2xlarge","s1.4xlarge","u1.nano","u1.micro","u1.small","u1.medium","u1.large","u1.xlarge","u1.2xlarge","u1.4xlarge","m1.nano","m1.micro","m1.small","m1.medium","m1.large","m1.xlarge","m1.2xlarge","m1.4xlarge","nano","micro","small","medium","large","xlarge","2xlarge"]},"size":{"description":"Persistent Volume size for Kafka.","default":"10Gi","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"storageClass":{"description":"StorageClass used to store the Kafka data.","type":"string","default":"","x-kubernetes-validations":[{"rule":"self == oldSelf","message":"storageClass is immutable"}],"x-cozystack-options":{"source":"storageclass"}}}}}}
   release:
     prefix: kafka-
     labels:
@@ -25,7 +36,7 @@ spec:
     tags:
       - messaging
     icon: PHN2ZyB3aWR0aD0iMTQ0IiBoZWlnaHQ9IjE0NCIgdmlld0JveD0iMCAwIDE0NCAxNDQiIGZpbGw9Im5vbmUiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+CjxyZWN0IHdpZHRoPSIxNDQiIGhlaWdodD0iMTQ0IiByeD0iMjQiIGZpbGw9InVybCgjcGFpbnQwX2xpbmVhcl82ODFfMjgyMCkiLz4KPHBhdGggZD0iTTkxLjAzMDcgNzcuODE4NUM4Ni44NTc3IDc3LjgxODUgODMuMTE2NiA3OS42ODE4IDgwLjU1NDcgODIuNjE1NEw3My45OTAxIDc3LjkzMTVDNzQuNjg2OSA3NS45OTc4IDc1LjA4NyA3My45MjE1IDc1LjA4NyA3MS43NDgyQzc1LjA4NyA2OS42MTI2IDc0LjcwMDggNjcuNTcxMSA3NC4wMjY5IDY1LjY2Nkw4MC41NzY5IDYxLjAzMThDODMuMTM4NSA2My45NTA1IDg2Ljg2OTkgNjUuODAzNyA5MS4wMzA3IDY1LjgwMzdDOTguNzMyOCA2NS44MDM3IDEwNSA1OS40ODg0IDEwNSA1MS43MjQ3QzEwNSA0My45NjEgOTguNzMyOCAzNy42NDU3IDkxLjAzMDcgMzcuNjQ1N0M4My4zMjg1IDM3LjY0NTcgNzcuMDYxNCA0My45NjEgNzcuMDYxNCA1MS43MjQ3Qzc3LjA2MTQgNTMuMTE0MyA3Ny4yNjk3IDU0LjQ1NDMgNzcuNjQzNSA1NS43MjMzTDcxLjA4OTEgNjAuMzU5OEM2OC4zNTEyIDU2LjkzNjUgNjQuNDA5IDU0LjU0NjMgNTkuOTE3NCA1My44MTY2VjQ1Ljg1NTNDNjYuMjQ1MSA0NC41MTU4IDcxLjAxMjggMzguODQ5NSA3MS4wMTI4IDMyLjA3OUM3MS4wMTI4IDI0LjMxNTMgNjQuNzQ1NyAxOCA1Ny4wNDM1IDE4QzQ5LjM0MTQgMTggNDMuMDc0MiAyNC4zMTUzIDQzLjA3NDIgMzIuMDc5QzQzLjA3NDIgMzguNzU4OSA0Ny43MTg0IDQ0LjM1NTIgNTMuOTE5NiA0NS43OTAzVjUzLjg1NTFDNDUuNDU2NyA1NS4zNTIzIDM5IDYyLjc5NjEgMzkgNzEuNzQ4MkMzOSA4MC43NDQgNDUuNTIwNiA4OC4yMTUxIDU0LjA0NDYgODkuNjYxM1Y5OC4xNzcyQzQ3Ljc4MDEgOTkuNTY1IDQzLjA3NDIgMTA1LjE5NiA0My4wNzQyIDExMS45MjFDNDMuMDc0MiAxMTkuNjg1IDQ5LjM0MTQgMTI2IDU3LjA0MzUgMTI2QzY0Ljc0NTcgMTI2IDcxLjAxMjggMTE5LjY4NSA3MS4wMTI4IDExMS45MjFDNzEuMDEyOCAxMDUuMTk2IDY2LjMwNyA5OS41NjUgNjAuMDQyNCA5OC4xNzcyVjg5LjY2MTFDNjQuMzU2OSA4OC45Mjg2IDY4LjI2MDEgODYuNjQwNyA3MS4wMjUyIDgzLjIyMzRMNzcuNjMzNyA4Ny45Mzc2Qzc3LjI2NjkgODkuMTk1MiA3Ny4wNjE0IDkwLjUyMTkgNzcuMDYxNCA5MS44OTc1Qzc3LjA2MTQgOTkuNjYxMiA4My4zMjg1IDEwNS45NzYgOTEuMDMwNyAxMDUuOTc2Qzk4LjczMjggMTA1Ljk3NiAxMDUgOTkuNjYxMiAxMDUgOTEuODk3NUMxMDUgODQuMTMzOCA5OC43MzI4IDc3LjgxODUgOTEuMDMwNyA3Ny44MTg1Wk05MS4wMzA3IDQ0Ljg5ODVDOTQuNzY1NiA0NC44OTg1IDk3LjgwMzQgNDcuOTYxNSA5Ny44MDM0IDUxLjcyNDdDOTcuODAzNCA1NS40ODc5IDk0Ljc2NTYgNTguNTUwNiA5MS4wMzA3IDU4LjU1MDZDODcuMjk1OCA1OC41NTA2IDg0LjI1OCA1NS40ODc5IDg0LjI1OCA1MS43MjQ3Qzg0LjI1OCA0Ny45NjE1IDg3LjI5NTggNDQuODk4NSA5MS4wMzA3IDQ0Ljg5ODVaTTUwLjI3MDUgMzIuMDc5QzUwLjI3MDUgMjguMzE1OCA1My4zMDg2IDI1LjI1MzEgNTcuMDQzNSAyNS4yNTMxQzYwLjc3ODUgMjUuMjUzMSA2My44MTYzIDI4LjMxNTggNjMuODE2MyAzMi4wNzlDNjMuODE2MyAzNS44NDIyIDYwLjc3ODUgMzguOTA0OSA1Ny4wNDM1IDM4LjkwNDlDNTMuMzA4NiAzOC45MDQ5IDUwLjI3MDUgMzUuODQyMiA1MC4yNzA1IDMyLjA3OVpNNjMuODE2MyAxMTEuOTIxQzYzLjgxNjMgMTE1LjY4NCA2MC43Nzg1IDExOC43NDcgNTcuMDQzNSAxMTguNzQ3QzUzLjMwODYgMTE4Ljc0NyA1MC4yNzA1IDExNS42ODQgNTAuMjcwNSAxMTEuOTIxQzUwLjI3MDUgMTA4LjE1OCA1My4zMDg2IDEwNS4wOTUgNTcuMDQzNSAxMDUuMDk1QzYwLjc3ODUgMTA1LjA5NSA2My44MTYzIDEwOC4xNTggNjMuODE2MyAxMTEuOTIxWk01Ny4wNDMgODEuMjY4MUM1MS44MzM5IDgxLjI2ODEgNDcuNTk2MiA3Ni45OTggNDcuNTk2MiA3MS43NDgyQzQ3LjU5NjIgNjYuNDk4MiA1MS44MzM5IDYyLjIyNzMgNTcuMDQzIDYyLjIyNzNDNjIuMjUxOSA2Mi4yMjczIDY2LjQ4OTUgNjYuNDk4MiA2Ni40ODk1IDcxLjc0ODJDNjYuNDg5NSA3Ni45OTggNjIuMjUxOSA4MS4yNjgxIDU3LjA0MyA4MS4yNjgxWk05MS4wMzA3IDk4LjcyMzdDODcuMjk1OCA5OC43MjM3IDg0LjI1OCA5NS42NjA3IDg0LjI1OCA5MS44OTc1Qzg0LjI1OCA4OC4xMzQzIDg3LjI5NTggODUuMDcxNiA5MS4wMzA3IDg1LjA3MTZDOTQuNzY1NiA4NS4wNzE2IDk3LjgwMzQgODguMTM0MyA5Ny44MDM0IDkxLjg5NzVDOTcuODAzNCA5NS42NjA3IDk0Ljc2NTYgOTguNzIzNyA5MS4wMzA3IDk4LjcyMzdaIiBmaWxsPSJ3aGl0ZSIvPgo8ZGVmcz4KPGxpbmVhckdyYWRpZW50IGlkPSJwYWludDBfbGluZWFyXzY4MV8yODIwIiB4MT0iMTQwIiB5MT0iMTMwLjUiIHgyPSI0IiB5Mj0iOS40OTk5OSIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiPgo8c3RvcC8+CjxzdG9wIG9mZnNldD0iMSIgc3RvcC1jb2xvcj0iIzQzNDE0MSIvPgo8L2xpbmVhckdyYWRpZW50Pgo8L2RlZnM+Cjwvc3ZnPgo=
-    keysOrder: [["apiVersion"], ["appVersion"], ["kind"], ["metadata"], ["metadata", "name"], ["spec", "external"], ["spec", "tls"], ["spec", "topics"], ["spec", "kafka"], ["spec", "kafka", "replicas"], ["spec", "kafka", "resources"], ["spec", "kafka", "resourcesPreset"], ["spec", "kafka", "size"], ["spec", "kafka", "storageClass"], ["spec", "zookeeper"], ["spec", "zookeeper", "replicas"], ["spec", "zookeeper", "resources"], ["spec", "zookeeper", "resourcesPreset"], ["spec", "zookeeper", "size"], ["spec", "zookeeper", "storageClass"]]
+    keysOrder: [["apiVersion"], ["appVersion"], ["kind"], ["metadata"], ["metadata", "name"], ["spec", "external"], ["spec", "tls"], ["spec", "version"], ["spec", "topics"], ["spec", "kafka"], ["spec", "kafka", "replicas"], ["spec", "kafka", "resources"], ["spec", "kafka", "resourcesPreset"], ["spec", "kafka", "size"], ["spec", "kafka", "storageClass"], ["spec", "kafka", "controllerStorageSize"]]
   secrets:
     exclude: []
     include:
diff --git a/packages/system/kamaji/.helmignore b/packages/system/kamaji/.helmignore
index 216b462f1f..f143b5d6c6 100644
--- a/packages/system/kamaji/.helmignore
+++ b/packages/system/kamaji/.helmignore
@@ -1,2 +1,3 @@
-images
-hack
+/images
+/hack
+/tests
diff --git a/packages/system/kamaji/Makefile b/packages/system/kamaji/Makefile
index d85c88c601..f286fb13f2 100644
--- a/packages/system/kamaji/Makefile
+++ b/packages/system/kamaji/Makefile
@@ -4,18 +4,26 @@ export NAMESPACE=cozy-$(NAME)
 include ../../../hack/common-envs.mk
 include ../../../hack/package.mk
 
+test:
+	helm unittest .
+
 update:
 	rm -rf charts
 	tag=$$(git ls-remote --tags --sort="v:refname" https://github.com/clastix/kamaji | grep -E 'refs/tags/[0-9]+\.[0-9]+\.[0-9]+-edge$$' | awk -F/ 'END{print $$NF}') && \
 	curl -sSL https://github.com/clastix/kamaji/archive/refs/tags/$${tag}.tar.gz | \
 	tar -xzvf - --strip 1 kamaji-$${tag}/charts && \
 	sed -i "/ARG VERSION/ s|=.*|=$${tag}|g" images/kamaji/Dockerfile
+	# Re-apply Cozystack-side patches over the freshly extracted chart so
+	# `make update` stays reproducible. Mirrors the pattern used by
+	# packages/system/ingress-nginx.
+	patch --no-backup-if-mismatch -p1 < patches/1.diff
+	# cozy-kamaji declares no dependencies, so Helm's processDependencyEnabled never evaluates kamaji-etcd.deploy and any subchart here always renders.
+	rm -rf charts/kamaji/charts
 
 image:
 	docker buildx build images/kamaji \
 		$(call image-tags,kamaji,v$(COZYSTACK_VERSION)) \
-		--cache-from type=registry,ref=$(REGISTRY)/kamaji:latest \
-		--cache-to type=inline \
+		$(call cache-args,kamaji) \
 		--metadata-file images/kamaji.json \
 		$(BUILDX_ARGS)
 	REPOSITORY="$(REGISTRY)/kamaji" \
diff --git a/packages/system/kamaji/charts/kamaji-crds/hack/kamaji.clastix.io_datastores_spec.yaml b/packages/system/kamaji/charts/kamaji-crds/hack/kamaji.clastix.io_datastores_spec.yaml
index c02419af87..252b019c48 100644
--- a/packages/system/kamaji/charts/kamaji-crds/hack/kamaji.clastix.io_datastores_spec.yaml
+++ b/packages/system/kamaji/charts/kamaji-crds/hack/kamaji.clastix.io_datastores_spec.yaml
@@ -123,9 +123,14 @@ versions:
                   List of the endpoints to connect to the shared datastore.
                   No need for protocol, just bare IP/FQDN and port.
                 items:
+                  maxLength: 256
                   type: string
+                maxItems: 64
                 minItems: 1
                 type: array
+                x-kubernetes-validations:
+                  - message: an IPv6 endpoint address must be bracketed, e.g. [2001:db8::1]:2379
+                    rule: self.all(e, e.startsWith('[') || e.split(':').size() <= 2)
               tlsConfig:
                 description: |-
                   Defines the TLS/SSL configuration required to connect to the data store in a secure way.
diff --git a/packages/system/kamaji/charts/kamaji-crds/hack/kamaji.clastix.io_tenantcontrolplanes_spec.yaml b/packages/system/kamaji/charts/kamaji-crds/hack/kamaji.clastix.io_tenantcontrolplanes_spec.yaml
index 9625abb4a3..ad22d241f0 100644
--- a/packages/system/kamaji/charts/kamaji-crds/hack/kamaji.clastix.io_tenantcontrolplanes_spec.yaml
+++ b/packages/system/kamaji/charts/kamaji-crds/hack/kamaji.clastix.io_tenantcontrolplanes_spec.yaml
@@ -124,6 +124,74 @@ versions:
                               Must be 0 if Mode is DaemonSet.
                             format: int32
                             type: integer
+                          resources:
+                            description: |-
+                              Resources define the amount of CPU and memory to allocate to the Konnectivity agent.
+
+                              When unset the agent container declares no requests or limits, which places
+                              its Pod in the BestEffort QoS class. Since the agent tolerates all taints and
+                              commonly runs alongside the cluster's heaviest workloads, BestEffort makes it
+                              the first candidate for CPU starvation and eviction on a busy node, degrading
+                              the very tunnel that `kubectl exec`, `kubectl logs` and `kubectl port-forward`
+                              depend on. Setting requests here promotes the agent to Burstable so it is
+                              scheduled with a guaranteed share of CPU.
+                            properties:
+                              claims:
+                                description: |-
+                                  Claims lists the names of resources, defined in spec.resourceClaims,
+                                  that are used by this container.
+
+                                  This field depends on the
+                                  DynamicResourceAllocation feature gate.
+
+                                  This field is immutable. It can only be set for containers.
+                                items:
+                                  description: ResourceClaim references one entry in PodSpec.ResourceClaims.
+                                  properties:
+                                    name:
+                                      description: |-
+                                        Name must match the name of one entry in pod.spec.resourceClaims of
+                                        the Pod where this field is used. It makes that resource available
+                                        inside a container.
+                                      type: string
+                                    request:
+                                      description: |-
+                                        Request is the name chosen for a request in the referenced claim.
+                                        If empty, everything from the claim is made available, otherwise
+                                        only the result of this request.
+                                      type: string
+                                  required:
+                                    - name
+                                  type: object
+                                type: array
+                                x-kubernetes-list-map-keys:
+                                  - name
+                                x-kubernetes-list-type: map
+                              limits:
+                                additionalProperties:
+                                  anyOf:
+                                    - type: integer
+                                    - type: string
+                                  pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                  x-kubernetes-int-or-string: true
+                                description: |-
+                                  Limits describes the maximum amount of compute resources allowed.
+                                  More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+                                type: object
+                              requests:
+                                additionalProperties:
+                                  anyOf:
+                                    - type: integer
+                                    - type: string
+                                  pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                  x-kubernetes-int-or-string: true
+                                description: |-
+                                  Requests describes the minimum amount of compute resources required.
+                                  If Requests is omitted for a container, it defaults to Limits if that is explicitly specified,
+                                  otherwise to an implementation-defined value. Requests cannot exceed Limits.
+                                  More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+                                type: object
+                            type: object
                           tolerations:
                             default:
                               - key: CriticalAddonsOnly
@@ -261,6 +329,190 @@ versions:
                                   More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
                                 type: object
                             type: object
+                          securityContext:
+                            description: SecurityContext defines the SecurityContext for the Konnectivity server container.
+                            properties:
+                              allowPrivilegeEscalation:
+                                description: |-
+                                  AllowPrivilegeEscalation controls whether a process can gain more
+                                  privileges than its parent process. This bool directly controls if
+                                  the no_new_privs flag will be set on the container process.
+                                  AllowPrivilegeEscalation is true always when the container is:
+                                  1) run as Privileged
+                                  2) has CAP_SYS_ADMIN
+                                  Note that this field cannot be set when spec.os.name is windows.
+                                type: boolean
+                              appArmorProfile:
+                                description: |-
+                                  appArmorProfile is the AppArmor options to use by this container. If set, this profile
+                                  overrides the pod's appArmorProfile.
+                                  Note that this field cannot be set when spec.os.name is windows.
+                                properties:
+                                  localhostProfile:
+                                    description: |-
+                                      localhostProfile indicates a profile loaded on the node that should be used.
+                                      The profile must be preconfigured on the node to work.
+                                      Must match the loaded name of the profile.
+                                      Must be set if and only if type is "Localhost".
+                                    type: string
+                                  type:
+                                    description: |-
+                                      type indicates which kind of AppArmor profile will be applied.
+                                      Valid options are:
+                                        Localhost - a profile pre-loaded on the node.
+                                        RuntimeDefault - the container runtime's default profile.
+                                        Unconfined - no AppArmor enforcement.
+                                    type: string
+                                required:
+                                  - type
+                                type: object
+                              capabilities:
+                                description: |-
+                                  The capabilities to add/drop when running containers.
+                                  Defaults to the default set of capabilities granted by the container runtime.
+                                  Note that this field cannot be set when spec.os.name is windows.
+                                properties:
+                                  add:
+                                    description: Added capabilities
+                                    items:
+                                      description: Capability represent POSIX capabilities type
+                                      type: string
+                                    type: array
+                                    x-kubernetes-list-type: atomic
+                                  drop:
+                                    description: Removed capabilities
+                                    items:
+                                      description: Capability represent POSIX capabilities type
+                                      type: string
+                                    type: array
+                                    x-kubernetes-list-type: atomic
+                                type: object
+                              privileged:
+                                description: |-
+                                  Run container in privileged mode.
+                                  Processes in privileged containers are essentially equivalent to root on the host.
+                                  Defaults to false.
+                                  Note that this field cannot be set when spec.os.name is windows.
+                                type: boolean
+                              procMount:
+                                description: |-
+                                  procMount denotes the type of proc mount to use for the containers.
+                                  The default value is Default which uses the container runtime defaults for
+                                  readonly paths and masked paths.
+                                  Note that this field cannot be set when spec.os.name is windows.
+                                type: string
+                              readOnlyRootFilesystem:
+                                description: |-
+                                  Whether this container has a read-only root filesystem.
+                                  Default is false.
+                                  Note that this field cannot be set when spec.os.name is windows.
+                                type: boolean
+                              runAsGroup:
+                                description: |-
+                                  The GID to run the entrypoint of the container process.
+                                  Uses runtime default if unset.
+                                  May also be set in PodSecurityContext.  If set in both SecurityContext and
+                                  PodSecurityContext, the value specified in SecurityContext takes precedence.
+                                  Note that this field cannot be set when spec.os.name is windows.
+                                format: int64
+                                type: integer
+                              runAsNonRoot:
+                                description: |-
+                                  Indicates that the container must run as a non-root user.
+                                  If true, the Kubelet will validate the image at runtime to ensure that it
+                                  does not run as UID 0 (root) and fail to start the container if it does.
+                                  If unset or false, no such validation will be performed.
+                                  May also be set in PodSecurityContext.  If set in both SecurityContext and
+                                  PodSecurityContext, the value specified in SecurityContext takes precedence.
+                                type: boolean
+                              runAsUser:
+                                description: |-
+                                  The UID to run the entrypoint of the container process.
+                                  Defaults to user specified in image metadata if unspecified.
+                                  May also be set in PodSecurityContext.  If set in both SecurityContext and
+                                  PodSecurityContext, the value specified in SecurityContext takes precedence.
+                                  Note that this field cannot be set when spec.os.name is windows.
+                                format: int64
+                                type: integer
+                              seLinuxOptions:
+                                description: |-
+                                  The SELinux context to be applied to the container.
+                                  If unspecified, the container runtime will allocate a random SELinux context for each
+                                  container.  May also be set in PodSecurityContext.  If set in both SecurityContext and
+                                  PodSecurityContext, the value specified in SecurityContext takes precedence.
+                                  Note that this field cannot be set when spec.os.name is windows.
+                                properties:
+                                  level:
+                                    description: Level is SELinux level label that applies to the container.
+                                    type: string
+                                  role:
+                                    description: Role is a SELinux role label that applies to the container.
+                                    type: string
+                                  type:
+                                    description: Type is a SELinux type label that applies to the container.
+                                    type: string
+                                  user:
+                                    description: User is a SELinux user label that applies to the container.
+                                    type: string
+                                type: object
+                              seccompProfile:
+                                description: |-
+                                  The seccomp options to use by this container. If seccomp options are
+                                  provided at both the pod & container level, the container options
+                                  override the pod options.
+                                  Note that this field cannot be set when spec.os.name is windows.
+                                properties:
+                                  localhostProfile:
+                                    description: |-
+                                      localhostProfile indicates a profile defined in a file on the node should be used.
+                                      The profile must be preconfigured on the node to work.
+                                      Must be a descending path, relative to the kubelet's configured seccomp profile location.
+                                      Must be set if type is "Localhost". Must NOT be set for any other type.
+                                    type: string
+                                  type:
+                                    description: |-
+                                      type indicates which kind of seccomp profile will be applied.
+                                      Valid options are:
+
+                                      Localhost - a profile defined in a file on the node should be used.
+                                      RuntimeDefault - the container runtime default profile should be used.
+                                      Unconfined - no profile should be applied.
+                                    type: string
+                                required:
+                                  - type
+                                type: object
+                              windowsOptions:
+                                description: |-
+                                  The Windows specific settings applied to all containers.
+                                  If unspecified, the options from the PodSecurityContext will be used.
+                                  If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence.
+                                  Note that this field cannot be set when spec.os.name is linux.
+                                properties:
+                                  gmsaCredentialSpec:
+                                    description: |-
+                                      GMSACredentialSpec is where the GMSA admission webhook
+                                      (https://github.com/kubernetes-sigs/windows-gmsa) inlines the contents of the
+                                      GMSA credential spec named by the GMSACredentialSpecName field.
+                                    type: string
+                                  gmsaCredentialSpecName:
+                                    description: GMSACredentialSpecName is the name of the GMSA credential spec to use.
+                                    type: string
+                                  hostProcess:
+                                    description: |-
+                                      HostProcess determines if a container should be run as a 'Host Process' container.
+                                      All of a Pod's containers must have the same effective HostProcess value
+                                      (it is not allowed to have a mix of HostProcess containers and non-HostProcess containers).
+                                      In addition, if HostProcess is true then HostNetwork must also be set to true.
+                                    type: boolean
+                                  runAsUserName:
+                                    description: |-
+                                      The UserName in Windows to run the entrypoint of the container process.
+                                      Defaults to the user specified in image metadata if unspecified.
+                                      May also be set in PodSecurityContext. If set in both SecurityContext and
+                                      PodSecurityContext, the value specified in SecurityContext takes precedence.
+                                    type: string
+                                type: object
+                            type: object
                           version:
                             description: |-
                               Container image version of the Konnectivity server.
@@ -361,7 +613,9 @@ versions:
                                         description: Selects a key of a ConfigMap.
                                         properties:
                                           key:
-                                            description: The key to select.
+                                            description: |-
+                                              The key to select from the ConfigMap's Data field.
+                                              Keys in the BinaryData field are not currently propagated to container env vars.
                                             type: string
                                           name:
                                             default: ""
@@ -616,6 +870,11 @@ versions:
                                             Number must be in the range 1 to 65535.
                                             Name must be an IANA_SVC_NAME.
                                           x-kubernetes-int-or-string: true
+                                        protocol:
+                                          description: |-
+                                            Protocol selects the wire protocol for the probe connection.
+                                            Nil defaults to HTTP/1.1.
+                                          type: string
                                         scheme:
                                           description: |-
                                             Scheme to use for connecting to the host.
@@ -722,6 +981,11 @@ versions:
                                             Number must be in the range 1 to 65535.
                                             Name must be an IANA_SVC_NAME.
                                           x-kubernetes-int-or-string: true
+                                        protocol:
+                                          description: |-
+                                            Protocol selects the wire protocol for the probe connection.
+                                            Nil defaults to HTTP/1.1.
+                                          type: string
                                         scheme:
                                           description: |-
                                             Scheme to use for connecting to the host.
@@ -800,6 +1064,13 @@ versions:
                                 grpc:
                                   description: GRPC specifies a GRPC HealthCheckRequest.
                                   properties:
+                                    mode:
+                                      description: |-
+                                        mode specifies the connection mode for the gRPC health probe.
+                                        Set to "TLS" to use TLS without certificate verification.
+                                        Set to "Plaintext" to use a plaintext (insecure) connection explicitly.
+                                        If not specified, the probe uses a plaintext (insecure) connection.
+                                      type: string
                                     port:
                                       description: Port number of the gRPC service. Number must be in the range 1 to 65535.
                                       format: int32
@@ -854,6 +1125,11 @@ versions:
                                         Number must be in the range 1 to 65535.
                                         Name must be an IANA_SVC_NAME.
                                       x-kubernetes-int-or-string: true
+                                    protocol:
+                                      description: |-
+                                        Protocol selects the wire protocol for the probe connection.
+                                        Nil defaults to HTTP/1.1.
+                                      type: string
                                     scheme:
                                       description: |-
                                         Scheme to use for connecting to the host.
@@ -1006,6 +1282,13 @@ versions:
                                 grpc:
                                   description: GRPC specifies a GRPC HealthCheckRequest.
                                   properties:
+                                    mode:
+                                      description: |-
+                                        mode specifies the connection mode for the gRPC health probe.
+                                        Set to "TLS" to use TLS without certificate verification.
+                                        Set to "Plaintext" to use a plaintext (insecure) connection explicitly.
+                                        If not specified, the probe uses a plaintext (insecure) connection.
+                                      type: string
                                     port:
                                       description: Port number of the gRPC service. Number must be in the range 1 to 65535.
                                       format: int32
@@ -1060,6 +1343,11 @@ versions:
                                         Number must be in the range 1 to 65535.
                                         Name must be an IANA_SVC_NAME.
                                       x-kubernetes-int-or-string: true
+                                    protocol:
+                                      description: |-
+                                        Protocol selects the wire protocol for the probe connection.
+                                        Nil defaults to HTTP/1.1.
+                                      type: string
                                     scheme:
                                       description: |-
                                         Scheme to use for connecting to the host.
@@ -1353,7 +1641,6 @@ versions:
                                     procMount denotes the type of proc mount to use for the containers.
                                     The default value is Default which uses the container runtime defaults for
                                     readonly paths and masked paths.
-                                    This requires the ProcMountType feature flag to be enabled.
                                     Note that this field cannot be set when spec.os.name is windows.
                                   type: string
                                 readOnlyRootFilesystem:
@@ -1502,6 +1789,13 @@ versions:
                                 grpc:
                                   description: GRPC specifies a GRPC HealthCheckRequest.
                                   properties:
+                                    mode:
+                                      description: |-
+                                        mode specifies the connection mode for the gRPC health probe.
+                                        Set to "TLS" to use TLS without certificate verification.
+                                        Set to "Plaintext" to use a plaintext (insecure) connection explicitly.
+                                        If not specified, the probe uses a plaintext (insecure) connection.
+                                      type: string
                                     port:
                                       description: Port number of the gRPC service. Number must be in the range 1 to 65535.
                                       format: int32
@@ -1556,6 +1850,11 @@ versions:
                                         Number must be in the range 1 to 65535.
                                         Name must be an IANA_SVC_NAME.
                                       x-kubernetes-int-or-string: true
+                                    protocol:
+                                      description: |-
+                                        Protocol selects the wire protocol for the probe connection.
+                                        Nil defaults to HTTP/1.1.
+                                      type: string
                                     scheme:
                                       description: |-
                                         Scheme to use for connecting to the host.
@@ -1689,10 +1988,20 @@ versions:
                               items:
                                 description: VolumeMount describes a mounting of a Volume within a container.
                                 properties:
-                                  mountPath:
+                                  bindMountOptions:
                                     description: |-
-                                      Path within the container at which the volume should be mounted.  Must
-                                      not contain ':'.
+                                      bindMountOptions is the list of additional bind mount options to apply when
+                                      mounting this volume into the container. Allowed values are noexec,
+                                      nodev, and nosuid. These are Linux mount options and have no effect on
+                                      Windows nodes.
+                                      This field is not supported with image volumes.
+                                      This is an alpha field and requires enabling the VolumeBindMountOptions feature gate.
+                                    items:
+                                      type: string
+                                    type: array
+                                    x-kubernetes-list-type: set
+                                  mountPath:
+                                    description: Path within the container at which the volume should be mounted.
                                     type: string
                                   mountPropagation:
                                     description: |-
@@ -1825,7 +2134,9 @@ versions:
                                         description: Selects a key of a ConfigMap.
                                         properties:
                                           key:
-                                            description: The key to select.
+                                            description: |-
+                                              The key to select from the ConfigMap's Data field.
+                                              Keys in the BinaryData field are not currently propagated to container env vars.
                                             type: string
                                           name:
                                             default: ""
@@ -2080,6 +2391,11 @@ versions:
                                             Number must be in the range 1 to 65535.
                                             Name must be an IANA_SVC_NAME.
                                           x-kubernetes-int-or-string: true
+                                        protocol:
+                                          description: |-
+                                            Protocol selects the wire protocol for the probe connection.
+                                            Nil defaults to HTTP/1.1.
+                                          type: string
                                         scheme:
                                           description: |-
                                             Scheme to use for connecting to the host.
@@ -2186,6 +2502,11 @@ versions:
                                             Number must be in the range 1 to 65535.
                                             Name must be an IANA_SVC_NAME.
                                           x-kubernetes-int-or-string: true
+                                        protocol:
+                                          description: |-
+                                            Protocol selects the wire protocol for the probe connection.
+                                            Nil defaults to HTTP/1.1.
+                                          type: string
                                         scheme:
                                           description: |-
                                             Scheme to use for connecting to the host.
@@ -2264,6 +2585,13 @@ versions:
                                 grpc:
                                   description: GRPC specifies a GRPC HealthCheckRequest.
                                   properties:
+                                    mode:
+                                      description: |-
+                                        mode specifies the connection mode for the gRPC health probe.
+                                        Set to "TLS" to use TLS without certificate verification.
+                                        Set to "Plaintext" to use a plaintext (insecure) connection explicitly.
+                                        If not specified, the probe uses a plaintext (insecure) connection.
+                                      type: string
                                     port:
                                       description: Port number of the gRPC service. Number must be in the range 1 to 65535.
                                       format: int32
@@ -2318,6 +2646,11 @@ versions:
                                         Number must be in the range 1 to 65535.
                                         Name must be an IANA_SVC_NAME.
                                       x-kubernetes-int-or-string: true
+                                    protocol:
+                                      description: |-
+                                        Protocol selects the wire protocol for the probe connection.
+                                        Nil defaults to HTTP/1.1.
+                                      type: string
                                     scheme:
                                       description: |-
                                         Scheme to use for connecting to the host.
@@ -2470,6 +2803,13 @@ versions:
                                 grpc:
                                   description: GRPC specifies a GRPC HealthCheckRequest.
                                   properties:
+                                    mode:
+                                      description: |-
+                                        mode specifies the connection mode for the gRPC health probe.
+                                        Set to "TLS" to use TLS without certificate verification.
+                                        Set to "Plaintext" to use a plaintext (insecure) connection explicitly.
+                                        If not specified, the probe uses a plaintext (insecure) connection.
+                                      type: string
                                     port:
                                       description: Port number of the gRPC service. Number must be in the range 1 to 65535.
                                       format: int32
@@ -2524,6 +2864,11 @@ versions:
                                         Number must be in the range 1 to 65535.
                                         Name must be an IANA_SVC_NAME.
                                       x-kubernetes-int-or-string: true
+                                    protocol:
+                                      description: |-
+                                        Protocol selects the wire protocol for the probe connection.
+                                        Nil defaults to HTTP/1.1.
+                                      type: string
                                     scheme:
                                       description: |-
                                         Scheme to use for connecting to the host.
@@ -2817,7 +3162,6 @@ versions:
                                     procMount denotes the type of proc mount to use for the containers.
                                     The default value is Default which uses the container runtime defaults for
                                     readonly paths and masked paths.
-                                    This requires the ProcMountType feature flag to be enabled.
                                     Note that this field cannot be set when spec.os.name is windows.
                                   type: string
                                 readOnlyRootFilesystem:
@@ -2966,6 +3310,13 @@ versions:
                                 grpc:
                                   description: GRPC specifies a GRPC HealthCheckRequest.
                                   properties:
+                                    mode:
+                                      description: |-
+                                        mode specifies the connection mode for the gRPC health probe.
+                                        Set to "TLS" to use TLS without certificate verification.
+                                        Set to "Plaintext" to use a plaintext (insecure) connection explicitly.
+                                        If not specified, the probe uses a plaintext (insecure) connection.
+                                      type: string
                                     port:
                                       description: Port number of the gRPC service. Number must be in the range 1 to 65535.
                                       format: int32
@@ -3020,6 +3371,11 @@ versions:
                                         Number must be in the range 1 to 65535.
                                         Name must be an IANA_SVC_NAME.
                                       x-kubernetes-int-or-string: true
+                                    protocol:
+                                      description: |-
+                                        Protocol selects the wire protocol for the probe connection.
+                                        Nil defaults to HTTP/1.1.
+                                      type: string
                                     scheme:
                                       description: |-
                                         Scheme to use for connecting to the host.
@@ -3153,10 +3509,20 @@ versions:
                               items:
                                 description: VolumeMount describes a mounting of a Volume within a container.
                                 properties:
-                                  mountPath:
+                                  bindMountOptions:
                                     description: |-
-                                      Path within the container at which the volume should be mounted.  Must
-                                      not contain ':'.
+                                      bindMountOptions is the list of additional bind mount options to apply when
+                                      mounting this volume into the container. Allowed values are noexec,
+                                      nodev, and nosuid. These are Linux mount options and have no effect on
+                                      Windows nodes.
+                                      This field is not supported with image volumes.
+                                      This is an alpha field and requires enabling the VolumeBindMountOptions feature gate.
+                                    items:
+                                      type: string
+                                    type: array
+                                    x-kubernetes-list-type: set
+                                  mountPath:
+                                    description: Path within the container at which the volume should be mounted.
                                     type: string
                                   mountPropagation:
                                     description: |-
@@ -3246,10 +3612,20 @@ versions:
                             items:
                               description: VolumeMount describes a mounting of a Volume within a container.
                               properties:
+                                bindMountOptions:
+                                  description: |-
+                                    bindMountOptions is the list of additional bind mount options to apply when
+                                    mounting this volume into the container. Allowed values are noexec,
+                                    nodev, and nosuid. These are Linux mount options and have no effect on
+                                    Windows nodes.
+                                    This field is not supported with image volumes.
+                                    This is an alpha field and requires enabling the VolumeBindMountOptions feature gate.
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: set
                                 mountPath:
-                                  description: |-
-                                    Path within the container at which the volume should be mounted.  Must
-                                    not contain ':'.
+                                  description: Path within the container at which the volume should be mounted.
                                   type: string
                                 mountPropagation:
                                   description: |-
@@ -3308,10 +3684,20 @@ versions:
                             items:
                               description: VolumeMount describes a mounting of a Volume within a container.
                               properties:
+                                bindMountOptions:
+                                  description: |-
+                                    bindMountOptions is the list of additional bind mount options to apply when
+                                    mounting this volume into the container. Allowed values are noexec,
+                                    nodev, and nosuid. These are Linux mount options and have no effect on
+                                    Windows nodes.
+                                    This field is not supported with image volumes.
+                                    This is an alpha field and requires enabling the VolumeBindMountOptions feature gate.
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: set
                                 mountPath:
-                                  description: |-
-                                    Path within the container at which the volume should be mounted.  Must
-                                    not contain ':'.
+                                  description: Path within the container at which the volume should be mounted.
                                   type: string
                                 mountPropagation:
                                   description: |-
@@ -3370,10 +3756,20 @@ versions:
                             items:
                               description: VolumeMount describes a mounting of a Volume within a container.
                               properties:
+                                bindMountOptions:
+                                  description: |-
+                                    bindMountOptions is the list of additional bind mount options to apply when
+                                    mounting this volume into the container. Allowed values are noexec,
+                                    nodev, and nosuid. These are Linux mount options and have no effect on
+                                    Windows nodes.
+                                    This field is not supported with image volumes.
+                                    This is an alpha field and requires enabling the VolumeBindMountOptions feature gate.
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: set
                                 mountPath:
-                                  description: |-
-                                    Path within the container at which the volume should be mounted.  Must
-                                    not contain ':'.
+                                  description: Path within the container at which the volume should be mounted.
                                   type: string
                                 mountPropagation:
                                   description: |-
@@ -3635,6 +4031,13 @@ versions:
                                     mode, like fsGroup, and the result can be other mode bits set.
                                   format: int32
                                   type: integer
+                                defaultUser:
+                                  description: |-
+                                    defaultUser is Optional: The owner UID of the created files by default.
+                                    The defaultUser field is only used as a fallback when the item-level user field is unset.
+                                    (Alpha) This field requires the AtomicWriteVolumeUserFields feature gate to be enabled.
+                                  format: int64
+                                  type: integer
                                 items:
                                   description: |-
                                     items if unspecified, each key-value pair in the Data field of the referenced
@@ -3667,6 +4070,13 @@ versions:
                                           May not contain the path element '..'.
                                           May not start with the string '..'.
                                         type: string
+                                      user:
+                                        description: |-
+                                          user is Optional: The owner UID of the created file.
+                                          If specified, the item-level user field takes precedence over defaultUser.
+                                          (Alpha) This field requires the AtomicWriteVolumeUserFields feature gate to be enabled.
+                                        format: int64
+                                        type: integer
                                     required:
                                       - key
                                       - path
@@ -3750,6 +4160,13 @@ versions:
                                     mode, like fsGroup, and the result can be other mode bits set.
                                   format: int32
                                   type: integer
+                                defaultUser:
+                                  description: |-
+                                    defaultUser is Optional: The owner UID of the created files by default.
+                                    The defaultUser field is only used as a fallback when the item-level user field is unset.
+                                    (Alpha) This field requires the AtomicWriteVolumeUserFields feature gate to be enabled.
+                                  format: int64
+                                  type: integer
                                 items:
                                   description: Items is a list of downward API volume file
                                   items:
@@ -3803,6 +4220,13 @@ versions:
                                           - resource
                                         type: object
                                         x-kubernetes-map-type: atomic
+                                      user:
+                                        description: |-
+                                          user is Optional: The owner UID of the created file.
+                                          If specified, the item-level user field takes precedence over defaultUser.
+                                          (Alpha) This field requires the AtomicWriteVolumeUserFields feature gate to be enabled.
+                                        format: int64
+                                        type: integer
                                     required:
                                       - path
                                     type: object
@@ -3821,6 +4245,18 @@ versions:
                                     Must be an empty string (default) or Memory.
                                     More info: https://kubernetes.io/docs/concepts/storage/volumes#emptydir
                                   type: string
+                                mode:
+                                  description: |-
+                                    mode specifies the permission bits for the emptyDir directory, in numeric
+                                    notation (e.g., 0755, 01777). Must be a value between 0000 and 01777.
+                                    If not specified, defaults to 0777.
+                                    This might be in conflict with other options that affect the file
+                                    mode, like fsGroup. If fsGroup is specified, the fsGroup permissions
+                                    will override the mode specified here.
+                                    This field has no effect on Windows.
+                                    This field is alpha and requires EmptyDirVolumeMode featuregate to be enabled.
+                                  format: int32
+                                  type: integer
                                 sizeLimit:
                                   anyOf:
                                     - type: integer
@@ -3914,8 +4350,8 @@ versions:
                                             * An existing PVC (PersistentVolumeClaim)
                                             If the provisioner or an external controller can support the specified data source,
                                             it will create a new volume based on the contents of the specified data source.
-                                            When the AnyVolumeDataSource feature gate is enabled, dataSource contents will be copied to dataSourceRef,
-                                            and dataSourceRef contents will be copied to dataSource when dataSourceRef.namespace is not specified.
+                                            dataSource contents will be copied to dataSourceRef, and dataSourceRef contents will be
+                                            copied to dataSource when dataSourceRef.namespace is not specified.
                                             If the namespace is specified, then dataSourceRef will not be copied to dataSource.
                                           properties:
                                             apiGroup:
@@ -3958,7 +4394,6 @@ versions:
                                               specified.
                                             * While dataSource only allows local objects, dataSourceRef allows objects
                                               in any namespaces.
-                                            (Beta) Using this field requires the AnyVolumeDataSource feature gate to be enabled.
                                             (Alpha) Using the namespace field of dataSourceRef requires the CrossNamespaceVolumeDataSource feature gate to be enabled.
                                           properties:
                                             apiGroup:
@@ -4305,7 +4740,7 @@ versions:
                                 A failure to resolve or pull the image during pod startup will block containers from starting and may add significant latency. Failures will be retried using normal volume backoff and will be reported on the pod reason and message.
                                 The types of objects that may be mounted by this volume are defined by the container runtime implementation on a host machine and at minimum must include all valid types supported by the container image field.
                                 The OCI object gets mounted in a single directory (spec.containers[*].volumeMounts.mountPath) by merging the manifest layers in the same way as for container images.
-                                The volume will be mounted read-only (ro) and non-executable files (noexec).
+                                The volume will be mounted read-only (ro).
                                 Sub path mounts for containers are not supported (spec.containers[*].volumeMounts.subpath) before 1.33.
                                 The field spec.securityContext.fsGroupChangePolicy has no effect on this volume type.
                               properties:
@@ -4473,8 +4908,7 @@ versions:
                               description: |-
                                 portworxVolume represents a portworx volume attached and mounted on kubelets host machine.
                                 Deprecated: PortworxVolume is deprecated. All operations for the in-tree portworxVolume type
-                                are redirected to the pxd.portworx.com CSI driver when the CSIMigrationPortworx feature-gate
-                                is on.
+                                are redirected to the pxd.portworx.com CSI driver.
                               properties:
                                 fsType:
                                   description: |-
@@ -4506,6 +4940,13 @@ versions:
                                     mode, like fsGroup, and the result can be other mode bits set.
                                   format: int32
                                   type: integer
+                                defaultUser:
+                                  description: |-
+                                    defaultUser is Optional: The owner UID of the created files by default.
+                                    The defaultUser field is only used as a fallback when the item-level user field is unset.
+                                    (Alpha) This field requires the AtomicWriteVolumeUserFields feature gate to be enabled.
+                                  format: int64
+                                  type: integer
                                 sources:
                                   description: |-
                                     sources is the list of volume projections. Each entry in this list
@@ -4601,6 +5042,13 @@ versions:
                                               Mutually-exclusive with name.  The contents of all selected
                                               ClusterTrustBundles will be unified and deduplicated.
                                             type: string
+                                          user:
+                                            description: |-
+                                              user is Optional: The owner UID of the created file.
+                                              If specified, the item-level user field takes precedence over defaultUser.
+                                              (Alpha) This field requires the AtomicWriteVolumeUserFields feature gate to be enabled.
+                                            format: int64
+                                            type: integer
                                         required:
                                           - path
                                         type: object
@@ -4639,6 +5087,13 @@ versions:
                                                     May not contain the path element '..'.
                                                     May not start with the string '..'.
                                                   type: string
+                                                user:
+                                                  description: |-
+                                                    user is Optional: The owner UID of the created file.
+                                                    If specified, the item-level user field takes precedence over defaultUser.
+                                                    (Alpha) This field requires the AtomicWriteVolumeUserFields feature gate to be enabled.
+                                                  format: int64
+                                                  type: integer
                                               required:
                                                 - key
                                                 - path
@@ -4715,6 +5170,13 @@ versions:
                                                     - resource
                                                   type: object
                                                   x-kubernetes-map-type: atomic
+                                                user:
+                                                  description: |-
+                                                    user is Optional: The owner UID of the created file.
+                                                    If specified, the item-level user field takes precedence over defaultUser.
+                                                    (Alpha) This field requires the AtomicWriteVolumeUserFields feature gate to be enabled.
+                                                  format: int64
+                                                  type: integer
                                               required:
                                                 - path
                                               type: object
@@ -4821,6 +5283,13 @@ versions:
                                           signerName:
                                             description: Kubelet's generated CSRs will be addressed to this signer.
                                             type: string
+                                          user:
+                                            description: |-
+                                              user is Optional: The owner UID of the created file.
+                                              If specified, the item-level user field takes precedence over defaultUser.
+                                              (Alpha) This field requires the AtomicWriteVolumeUserFields feature gate to be enabled.
+                                            format: int64
+                                            type: integer
                                           userAnnotations:
                                             additionalProperties:
                                               type: string
@@ -4878,6 +5347,13 @@ versions:
                                                     May not contain the path element '..'.
                                                     May not start with the string '..'.
                                                   type: string
+                                                user:
+                                                  description: |-
+                                                    user is Optional: The owner UID of the created file.
+                                                    If specified, the item-level user field takes precedence over defaultUser.
+                                                    (Alpha) This field requires the AtomicWriteVolumeUserFields feature gate to be enabled.
+                                                  format: int64
+                                                  type: integer
                                               required:
                                                 - key
                                                 - path
@@ -4923,6 +5399,13 @@ versions:
                                               path is the path relative to the mount point of the file to project the
                                               token into.
                                             type: string
+                                          user:
+                                            description: |-
+                                              user is Optional: The owner UID of the created file.
+                                              If specified, the item-level user field takes precedence over defaultUser.
+                                              (Alpha) This field requires the AtomicWriteVolumeUserFields feature gate to be enabled.
+                                            format: int64
+                                            type: integer
                                         required:
                                           - path
                                         type: object
@@ -5123,6 +5606,13 @@ versions:
                                     mode, like fsGroup, and the result can be other mode bits set.
                                   format: int32
                                   type: integer
+                                defaultUser:
+                                  description: |-
+                                    defaultUser is Optional: The owner UID of the created files by default.
+                                    The defaultUser field is only used as a fallback when the item-level user field is unset.
+                                    (Alpha) This field requires the AtomicWriteVolumeUserFields feature gate to be enabled.
+                                  format: int64
+                                  type: integer
                                 items:
                                   description: |-
                                     items If unspecified, each key-value pair in the Data field of the referenced
@@ -5155,6 +5645,13 @@ versions:
                                           May not contain the path element '..'.
                                           May not start with the string '..'.
                                         type: string
+                                      user:
+                                        description: |-
+                                          user is Optional: The owner UID of the created file.
+                                          If specified, the item-level user field takes precedence over defaultUser.
+                                          (Alpha) This field requires the AtomicWriteVolumeUserFields feature gate to be enabled.
+                                        format: int64
+                                        type: integer
                                     required:
                                       - key
                                       - path
@@ -6120,51 +6617,842 @@ versions:
                                 x-kubernetes-list-type: atomic
                             type: object
                         type: object
-                      extraArgs:
-                        description: |-
-                          ExtraArgs allows adding additional arguments to the Control Plane components,
-                          such as kube-apiserver, controller-manager, and scheduler. WARNING - This option
-                          can override existing parameters and cause components to misbehave in unxpected ways.
-                          Only modify if you know what you are doing.
+                      automountServiceAccountToken:
+                        description: AutomountServiceAccountToken allows to enable the automatic mounting of the service account token to the pods of the Control plane deployment
+                        type: boolean
+                      containerSecurityContexts:
+                        description: ContainerSecurityContexts allows to specify the security context for the individual control plane components.
                         properties:
                           apiServer:
-                            items:
-                              type: string
-                            type: array
-                          controllerManager:
-                            items:
-                              type: string
-                            type: array
-                          kine:
-                            description: Available only if Kamaji is running using Kine as backing storage.
-                            items:
-                              type: string
-                            type: array
-                          scheduler:
-                            items:
-                              type: string
-                            type: array
-                        type: object
-                      nodeSelector:
-                        additionalProperties:
-                          type: string
-                        description: |-
-                          NodeSelector is a selector which must be true for the pod to fit on a node.
-                          Selector which must match a node's labels for the pod to be scheduled on that node.
-                          More info: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/
-                        type: object
-                      podAdditionalMetadata:
-                        description: AdditionalMetadata defines which additional metadata, such as labels and annotations, must be attached to the created resource.
-                        properties:
-                          annotations:
-                            additionalProperties:
-                              type: string
-                            type: object
+                            description: APIServer defines the security context for the kube-apiserver container.
+                            properties:
+                              allowPrivilegeEscalation:
+                                description: |-
+                                  AllowPrivilegeEscalation controls whether a process can gain more
+                                  privileges than its parent process. This bool directly controls if
+                                  the no_new_privs flag will be set on the container process.
+                                  AllowPrivilegeEscalation is true always when the container is:
+                                  1) run as Privileged
+                                  2) has CAP_SYS_ADMIN
+                                  Note that this field cannot be set when spec.os.name is windows.
+                                type: boolean
+                              appArmorProfile:
+                                description: |-
+                                  appArmorProfile is the AppArmor options to use by this container. If set, this profile
+                                  overrides the pod's appArmorProfile.
+                                  Note that this field cannot be set when spec.os.name is windows.
+                                properties:
+                                  localhostProfile:
+                                    description: |-
+                                      localhostProfile indicates a profile loaded on the node that should be used.
+                                      The profile must be preconfigured on the node to work.
+                                      Must match the loaded name of the profile.
+                                      Must be set if and only if type is "Localhost".
+                                    type: string
+                                  type:
+                                    description: |-
+                                      type indicates which kind of AppArmor profile will be applied.
+                                      Valid options are:
+                                        Localhost - a profile pre-loaded on the node.
+                                        RuntimeDefault - the container runtime's default profile.
+                                        Unconfined - no AppArmor enforcement.
+                                    type: string
+                                required:
+                                  - type
+                                type: object
+                              capabilities:
+                                description: |-
+                                  The capabilities to add/drop when running containers.
+                                  Defaults to the default set of capabilities granted by the container runtime.
+                                  Note that this field cannot be set when spec.os.name is windows.
+                                properties:
+                                  add:
+                                    description: Added capabilities
+                                    items:
+                                      description: Capability represent POSIX capabilities type
+                                      type: string
+                                    type: array
+                                    x-kubernetes-list-type: atomic
+                                  drop:
+                                    description: Removed capabilities
+                                    items:
+                                      description: Capability represent POSIX capabilities type
+                                      type: string
+                                    type: array
+                                    x-kubernetes-list-type: atomic
+                                type: object
+                              privileged:
+                                description: |-
+                                  Run container in privileged mode.
+                                  Processes in privileged containers are essentially equivalent to root on the host.
+                                  Defaults to false.
+                                  Note that this field cannot be set when spec.os.name is windows.
+                                type: boolean
+                              procMount:
+                                description: |-
+                                  procMount denotes the type of proc mount to use for the containers.
+                                  The default value is Default which uses the container runtime defaults for
+                                  readonly paths and masked paths.
+                                  Note that this field cannot be set when spec.os.name is windows.
+                                type: string
+                              readOnlyRootFilesystem:
+                                description: |-
+                                  Whether this container has a read-only root filesystem.
+                                  Default is false.
+                                  Note that this field cannot be set when spec.os.name is windows.
+                                type: boolean
+                              runAsGroup:
+                                description: |-
+                                  The GID to run the entrypoint of the container process.
+                                  Uses runtime default if unset.
+                                  May also be set in PodSecurityContext.  If set in both SecurityContext and
+                                  PodSecurityContext, the value specified in SecurityContext takes precedence.
+                                  Note that this field cannot be set when spec.os.name is windows.
+                                format: int64
+                                type: integer
+                              runAsNonRoot:
+                                description: |-
+                                  Indicates that the container must run as a non-root user.
+                                  If true, the Kubelet will validate the image at runtime to ensure that it
+                                  does not run as UID 0 (root) and fail to start the container if it does.
+                                  If unset or false, no such validation will be performed.
+                                  May also be set in PodSecurityContext.  If set in both SecurityContext and
+                                  PodSecurityContext, the value specified in SecurityContext takes precedence.
+                                type: boolean
+                              runAsUser:
+                                description: |-
+                                  The UID to run the entrypoint of the container process.
+                                  Defaults to user specified in image metadata if unspecified.
+                                  May also be set in PodSecurityContext.  If set in both SecurityContext and
+                                  PodSecurityContext, the value specified in SecurityContext takes precedence.
+                                  Note that this field cannot be set when spec.os.name is windows.
+                                format: int64
+                                type: integer
+                              seLinuxOptions:
+                                description: |-
+                                  The SELinux context to be applied to the container.
+                                  If unspecified, the container runtime will allocate a random SELinux context for each
+                                  container.  May also be set in PodSecurityContext.  If set in both SecurityContext and
+                                  PodSecurityContext, the value specified in SecurityContext takes precedence.
+                                  Note that this field cannot be set when spec.os.name is windows.
+                                properties:
+                                  level:
+                                    description: Level is SELinux level label that applies to the container.
+                                    type: string
+                                  role:
+                                    description: Role is a SELinux role label that applies to the container.
+                                    type: string
+                                  type:
+                                    description: Type is a SELinux type label that applies to the container.
+                                    type: string
+                                  user:
+                                    description: User is a SELinux user label that applies to the container.
+                                    type: string
+                                type: object
+                              seccompProfile:
+                                description: |-
+                                  The seccomp options to use by this container. If seccomp options are
+                                  provided at both the pod & container level, the container options
+                                  override the pod options.
+                                  Note that this field cannot be set when spec.os.name is windows.
+                                properties:
+                                  localhostProfile:
+                                    description: |-
+                                      localhostProfile indicates a profile defined in a file on the node should be used.
+                                      The profile must be preconfigured on the node to work.
+                                      Must be a descending path, relative to the kubelet's configured seccomp profile location.
+                                      Must be set if type is "Localhost". Must NOT be set for any other type.
+                                    type: string
+                                  type:
+                                    description: |-
+                                      type indicates which kind of seccomp profile will be applied.
+                                      Valid options are:
+
+                                      Localhost - a profile defined in a file on the node should be used.
+                                      RuntimeDefault - the container runtime default profile should be used.
+                                      Unconfined - no profile should be applied.
+                                    type: string
+                                required:
+                                  - type
+                                type: object
+                              windowsOptions:
+                                description: |-
+                                  The Windows specific settings applied to all containers.
+                                  If unspecified, the options from the PodSecurityContext will be used.
+                                  If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence.
+                                  Note that this field cannot be set when spec.os.name is linux.
+                                properties:
+                                  gmsaCredentialSpec:
+                                    description: |-
+                                      GMSACredentialSpec is where the GMSA admission webhook
+                                      (https://github.com/kubernetes-sigs/windows-gmsa) inlines the contents of the
+                                      GMSA credential spec named by the GMSACredentialSpecName field.
+                                    type: string
+                                  gmsaCredentialSpecName:
+                                    description: GMSACredentialSpecName is the name of the GMSA credential spec to use.
+                                    type: string
+                                  hostProcess:
+                                    description: |-
+                                      HostProcess determines if a container should be run as a 'Host Process' container.
+                                      All of a Pod's containers must have the same effective HostProcess value
+                                      (it is not allowed to have a mix of HostProcess containers and non-HostProcess containers).
+                                      In addition, if HostProcess is true then HostNetwork must also be set to true.
+                                    type: boolean
+                                  runAsUserName:
+                                    description: |-
+                                      The UserName in Windows to run the entrypoint of the container process.
+                                      Defaults to the user specified in image metadata if unspecified.
+                                      May also be set in PodSecurityContext. If set in both SecurityContext and
+                                      PodSecurityContext, the value specified in SecurityContext takes precedence.
+                                    type: string
+                                type: object
+                            type: object
+                          controllerManager:
+                            description: ControllerManager defines the security context for the kube-controller-manager container.
+                            properties:
+                              allowPrivilegeEscalation:
+                                description: |-
+                                  AllowPrivilegeEscalation controls whether a process can gain more
+                                  privileges than its parent process. This bool directly controls if
+                                  the no_new_privs flag will be set on the container process.
+                                  AllowPrivilegeEscalation is true always when the container is:
+                                  1) run as Privileged
+                                  2) has CAP_SYS_ADMIN
+                                  Note that this field cannot be set when spec.os.name is windows.
+                                type: boolean
+                              appArmorProfile:
+                                description: |-
+                                  appArmorProfile is the AppArmor options to use by this container. If set, this profile
+                                  overrides the pod's appArmorProfile.
+                                  Note that this field cannot be set when spec.os.name is windows.
+                                properties:
+                                  localhostProfile:
+                                    description: |-
+                                      localhostProfile indicates a profile loaded on the node that should be used.
+                                      The profile must be preconfigured on the node to work.
+                                      Must match the loaded name of the profile.
+                                      Must be set if and only if type is "Localhost".
+                                    type: string
+                                  type:
+                                    description: |-
+                                      type indicates which kind of AppArmor profile will be applied.
+                                      Valid options are:
+                                        Localhost - a profile pre-loaded on the node.
+                                        RuntimeDefault - the container runtime's default profile.
+                                        Unconfined - no AppArmor enforcement.
+                                    type: string
+                                required:
+                                  - type
+                                type: object
+                              capabilities:
+                                description: |-
+                                  The capabilities to add/drop when running containers.
+                                  Defaults to the default set of capabilities granted by the container runtime.
+                                  Note that this field cannot be set when spec.os.name is windows.
+                                properties:
+                                  add:
+                                    description: Added capabilities
+                                    items:
+                                      description: Capability represent POSIX capabilities type
+                                      type: string
+                                    type: array
+                                    x-kubernetes-list-type: atomic
+                                  drop:
+                                    description: Removed capabilities
+                                    items:
+                                      description: Capability represent POSIX capabilities type
+                                      type: string
+                                    type: array
+                                    x-kubernetes-list-type: atomic
+                                type: object
+                              privileged:
+                                description: |-
+                                  Run container in privileged mode.
+                                  Processes in privileged containers are essentially equivalent to root on the host.
+                                  Defaults to false.
+                                  Note that this field cannot be set when spec.os.name is windows.
+                                type: boolean
+                              procMount:
+                                description: |-
+                                  procMount denotes the type of proc mount to use for the containers.
+                                  The default value is Default which uses the container runtime defaults for
+                                  readonly paths and masked paths.
+                                  Note that this field cannot be set when spec.os.name is windows.
+                                type: string
+                              readOnlyRootFilesystem:
+                                description: |-
+                                  Whether this container has a read-only root filesystem.
+                                  Default is false.
+                                  Note that this field cannot be set when spec.os.name is windows.
+                                type: boolean
+                              runAsGroup:
+                                description: |-
+                                  The GID to run the entrypoint of the container process.
+                                  Uses runtime default if unset.
+                                  May also be set in PodSecurityContext.  If set in both SecurityContext and
+                                  PodSecurityContext, the value specified in SecurityContext takes precedence.
+                                  Note that this field cannot be set when spec.os.name is windows.
+                                format: int64
+                                type: integer
+                              runAsNonRoot:
+                                description: |-
+                                  Indicates that the container must run as a non-root user.
+                                  If true, the Kubelet will validate the image at runtime to ensure that it
+                                  does not run as UID 0 (root) and fail to start the container if it does.
+                                  If unset or false, no such validation will be performed.
+                                  May also be set in PodSecurityContext.  If set in both SecurityContext and
+                                  PodSecurityContext, the value specified in SecurityContext takes precedence.
+                                type: boolean
+                              runAsUser:
+                                description: |-
+                                  The UID to run the entrypoint of the container process.
+                                  Defaults to user specified in image metadata if unspecified.
+                                  May also be set in PodSecurityContext.  If set in both SecurityContext and
+                                  PodSecurityContext, the value specified in SecurityContext takes precedence.
+                                  Note that this field cannot be set when spec.os.name is windows.
+                                format: int64
+                                type: integer
+                              seLinuxOptions:
+                                description: |-
+                                  The SELinux context to be applied to the container.
+                                  If unspecified, the container runtime will allocate a random SELinux context for each
+                                  container.  May also be set in PodSecurityContext.  If set in both SecurityContext and
+                                  PodSecurityContext, the value specified in SecurityContext takes precedence.
+                                  Note that this field cannot be set when spec.os.name is windows.
+                                properties:
+                                  level:
+                                    description: Level is SELinux level label that applies to the container.
+                                    type: string
+                                  role:
+                                    description: Role is a SELinux role label that applies to the container.
+                                    type: string
+                                  type:
+                                    description: Type is a SELinux type label that applies to the container.
+                                    type: string
+                                  user:
+                                    description: User is a SELinux user label that applies to the container.
+                                    type: string
+                                type: object
+                              seccompProfile:
+                                description: |-
+                                  The seccomp options to use by this container. If seccomp options are
+                                  provided at both the pod & container level, the container options
+                                  override the pod options.
+                                  Note that this field cannot be set when spec.os.name is windows.
+                                properties:
+                                  localhostProfile:
+                                    description: |-
+                                      localhostProfile indicates a profile defined in a file on the node should be used.
+                                      The profile must be preconfigured on the node to work.
+                                      Must be a descending path, relative to the kubelet's configured seccomp profile location.
+                                      Must be set if type is "Localhost". Must NOT be set for any other type.
+                                    type: string
+                                  type:
+                                    description: |-
+                                      type indicates which kind of seccomp profile will be applied.
+                                      Valid options are:
+
+                                      Localhost - a profile defined in a file on the node should be used.
+                                      RuntimeDefault - the container runtime default profile should be used.
+                                      Unconfined - no profile should be applied.
+                                    type: string
+                                required:
+                                  - type
+                                type: object
+                              windowsOptions:
+                                description: |-
+                                  The Windows specific settings applied to all containers.
+                                  If unspecified, the options from the PodSecurityContext will be used.
+                                  If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence.
+                                  Note that this field cannot be set when spec.os.name is linux.
+                                properties:
+                                  gmsaCredentialSpec:
+                                    description: |-
+                                      GMSACredentialSpec is where the GMSA admission webhook
+                                      (https://github.com/kubernetes-sigs/windows-gmsa) inlines the contents of the
+                                      GMSA credential spec named by the GMSACredentialSpecName field.
+                                    type: string
+                                  gmsaCredentialSpecName:
+                                    description: GMSACredentialSpecName is the name of the GMSA credential spec to use.
+                                    type: string
+                                  hostProcess:
+                                    description: |-
+                                      HostProcess determines if a container should be run as a 'Host Process' container.
+                                      All of a Pod's containers must have the same effective HostProcess value
+                                      (it is not allowed to have a mix of HostProcess containers and non-HostProcess containers).
+                                      In addition, if HostProcess is true then HostNetwork must also be set to true.
+                                    type: boolean
+                                  runAsUserName:
+                                    description: |-
+                                      The UserName in Windows to run the entrypoint of the container process.
+                                      Defaults to the user specified in image metadata if unspecified.
+                                      May also be set in PodSecurityContext. If set in both SecurityContext and
+                                      PodSecurityContext, the value specified in SecurityContext takes precedence.
+                                    type: string
+                                type: object
+                            type: object
+                          scheduler:
+                            description: Scheduler defines the security context for the kube-scheduler container.
+                            properties:
+                              allowPrivilegeEscalation:
+                                description: |-
+                                  AllowPrivilegeEscalation controls whether a process can gain more
+                                  privileges than its parent process. This bool directly controls if
+                                  the no_new_privs flag will be set on the container process.
+                                  AllowPrivilegeEscalation is true always when the container is:
+                                  1) run as Privileged
+                                  2) has CAP_SYS_ADMIN
+                                  Note that this field cannot be set when spec.os.name is windows.
+                                type: boolean
+                              appArmorProfile:
+                                description: |-
+                                  appArmorProfile is the AppArmor options to use by this container. If set, this profile
+                                  overrides the pod's appArmorProfile.
+                                  Note that this field cannot be set when spec.os.name is windows.
+                                properties:
+                                  localhostProfile:
+                                    description: |-
+                                      localhostProfile indicates a profile loaded on the node that should be used.
+                                      The profile must be preconfigured on the node to work.
+                                      Must match the loaded name of the profile.
+                                      Must be set if and only if type is "Localhost".
+                                    type: string
+                                  type:
+                                    description: |-
+                                      type indicates which kind of AppArmor profile will be applied.
+                                      Valid options are:
+                                        Localhost - a profile pre-loaded on the node.
+                                        RuntimeDefault - the container runtime's default profile.
+                                        Unconfined - no AppArmor enforcement.
+                                    type: string
+                                required:
+                                  - type
+                                type: object
+                              capabilities:
+                                description: |-
+                                  The capabilities to add/drop when running containers.
+                                  Defaults to the default set of capabilities granted by the container runtime.
+                                  Note that this field cannot be set when spec.os.name is windows.
+                                properties:
+                                  add:
+                                    description: Added capabilities
+                                    items:
+                                      description: Capability represent POSIX capabilities type
+                                      type: string
+                                    type: array
+                                    x-kubernetes-list-type: atomic
+                                  drop:
+                                    description: Removed capabilities
+                                    items:
+                                      description: Capability represent POSIX capabilities type
+                                      type: string
+                                    type: array
+                                    x-kubernetes-list-type: atomic
+                                type: object
+                              privileged:
+                                description: |-
+                                  Run container in privileged mode.
+                                  Processes in privileged containers are essentially equivalent to root on the host.
+                                  Defaults to false.
+                                  Note that this field cannot be set when spec.os.name is windows.
+                                type: boolean
+                              procMount:
+                                description: |-
+                                  procMount denotes the type of proc mount to use for the containers.
+                                  The default value is Default which uses the container runtime defaults for
+                                  readonly paths and masked paths.
+                                  Note that this field cannot be set when spec.os.name is windows.
+                                type: string
+                              readOnlyRootFilesystem:
+                                description: |-
+                                  Whether this container has a read-only root filesystem.
+                                  Default is false.
+                                  Note that this field cannot be set when spec.os.name is windows.
+                                type: boolean
+                              runAsGroup:
+                                description: |-
+                                  The GID to run the entrypoint of the container process.
+                                  Uses runtime default if unset.
+                                  May also be set in PodSecurityContext.  If set in both SecurityContext and
+                                  PodSecurityContext, the value specified in SecurityContext takes precedence.
+                                  Note that this field cannot be set when spec.os.name is windows.
+                                format: int64
+                                type: integer
+                              runAsNonRoot:
+                                description: |-
+                                  Indicates that the container must run as a non-root user.
+                                  If true, the Kubelet will validate the image at runtime to ensure that it
+                                  does not run as UID 0 (root) and fail to start the container if it does.
+                                  If unset or false, no such validation will be performed.
+                                  May also be set in PodSecurityContext.  If set in both SecurityContext and
+                                  PodSecurityContext, the value specified in SecurityContext takes precedence.
+                                type: boolean
+                              runAsUser:
+                                description: |-
+                                  The UID to run the entrypoint of the container process.
+                                  Defaults to user specified in image metadata if unspecified.
+                                  May also be set in PodSecurityContext.  If set in both SecurityContext and
+                                  PodSecurityContext, the value specified in SecurityContext takes precedence.
+                                  Note that this field cannot be set when spec.os.name is windows.
+                                format: int64
+                                type: integer
+                              seLinuxOptions:
+                                description: |-
+                                  The SELinux context to be applied to the container.
+                                  If unspecified, the container runtime will allocate a random SELinux context for each
+                                  container.  May also be set in PodSecurityContext.  If set in both SecurityContext and
+                                  PodSecurityContext, the value specified in SecurityContext takes precedence.
+                                  Note that this field cannot be set when spec.os.name is windows.
+                                properties:
+                                  level:
+                                    description: Level is SELinux level label that applies to the container.
+                                    type: string
+                                  role:
+                                    description: Role is a SELinux role label that applies to the container.
+                                    type: string
+                                  type:
+                                    description: Type is a SELinux type label that applies to the container.
+                                    type: string
+                                  user:
+                                    description: User is a SELinux user label that applies to the container.
+                                    type: string
+                                type: object
+                              seccompProfile:
+                                description: |-
+                                  The seccomp options to use by this container. If seccomp options are
+                                  provided at both the pod & container level, the container options
+                                  override the pod options.
+                                  Note that this field cannot be set when spec.os.name is windows.
+                                properties:
+                                  localhostProfile:
+                                    description: |-
+                                      localhostProfile indicates a profile defined in a file on the node should be used.
+                                      The profile must be preconfigured on the node to work.
+                                      Must be a descending path, relative to the kubelet's configured seccomp profile location.
+                                      Must be set if type is "Localhost". Must NOT be set for any other type.
+                                    type: string
+                                  type:
+                                    description: |-
+                                      type indicates which kind of seccomp profile will be applied.
+                                      Valid options are:
+
+                                      Localhost - a profile defined in a file on the node should be used.
+                                      RuntimeDefault - the container runtime default profile should be used.
+                                      Unconfined - no profile should be applied.
+                                    type: string
+                                required:
+                                  - type
+                                type: object
+                              windowsOptions:
+                                description: |-
+                                  The Windows specific settings applied to all containers.
+                                  If unspecified, the options from the PodSecurityContext will be used.
+                                  If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence.
+                                  Note that this field cannot be set when spec.os.name is linux.
+                                properties:
+                                  gmsaCredentialSpec:
+                                    description: |-
+                                      GMSACredentialSpec is where the GMSA admission webhook
+                                      (https://github.com/kubernetes-sigs/windows-gmsa) inlines the contents of the
+                                      GMSA credential spec named by the GMSACredentialSpecName field.
+                                    type: string
+                                  gmsaCredentialSpecName:
+                                    description: GMSACredentialSpecName is the name of the GMSA credential spec to use.
+                                    type: string
+                                  hostProcess:
+                                    description: |-
+                                      HostProcess determines if a container should be run as a 'Host Process' container.
+                                      All of a Pod's containers must have the same effective HostProcess value
+                                      (it is not allowed to have a mix of HostProcess containers and non-HostProcess containers).
+                                      In addition, if HostProcess is true then HostNetwork must also be set to true.
+                                    type: boolean
+                                  runAsUserName:
+                                    description: |-
+                                      The UserName in Windows to run the entrypoint of the container process.
+                                      Defaults to the user specified in image metadata if unspecified.
+                                      May also be set in PodSecurityContext. If set in both SecurityContext and
+                                      PodSecurityContext, the value specified in SecurityContext takes precedence.
+                                    type: string
+                                type: object
+                            type: object
+                        type: object
+                      extraArgs:
+                        description: |-
+                          ExtraArgs allows adding additional arguments to the Control Plane components,
+                          such as kube-apiserver, controller-manager, and scheduler. WARNING - This option
+                          can override existing parameters and cause components to misbehave in unxpected ways.
+                          Only modify if you know what you are doing.
+                        properties:
+                          apiServer:
+                            items:
+                              type: string
+                            type: array
+                          controllerManager:
+                            description: |-
+                              ControllerManager extra args. Kamaji sets --bind-address to the IPv6 wildcard "::"
+                              (which also serves IPv4 on a dual-stack pod); on hosts with IPv6 disabled in the
+                              kernel, override it to "0.0.0.0" here.
+                            items:
+                              type: string
+                            type: array
+                          kine:
+                            description: Available only if Kamaji is running using Kine as backing storage.
+                            items:
+                              type: string
+                            type: array
+                          scheduler:
+                            description: |-
+                              Scheduler extra args. Kamaji sets --bind-address to the IPv6 wildcard "::"
+                              (which also serves IPv4 on a dual-stack pod); on hosts with IPv6 disabled in the
+                              kernel, override it to "0.0.0.0" here.
+                            items:
+                              type: string
+                            type: array
+                        type: object
+                      nodeSelector:
+                        additionalProperties:
+                          type: string
+                        description: |-
+                          NodeSelector is a selector which must be true for the pod to fit on a node.
+                          Selector which must match a node's labels for the pod to be scheduled on that node.
+                          More info: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/
+                        type: object
+                      podAdditionalMetadata:
+                        description: AdditionalMetadata defines which additional metadata, such as labels and annotations, must be attached to the created resource.
+                        properties:
+                          annotations:
+                            additionalProperties:
+                              type: string
+                            type: object
                           labels:
                             additionalProperties:
                               type: string
                             type: object
                         type: object
+                      podSecurityContext:
+                        description: PodSecurityContext allows to specify the security context for the control plane pod.
+                        properties:
+                          appArmorProfile:
+                            description: |-
+                              appArmorProfile is the AppArmor options to use by the containers in this pod.
+                              Note that this field cannot be set when spec.os.name is windows.
+                            properties:
+                              localhostProfile:
+                                description: |-
+                                  localhostProfile indicates a profile loaded on the node that should be used.
+                                  The profile must be preconfigured on the node to work.
+                                  Must match the loaded name of the profile.
+                                  Must be set if and only if type is "Localhost".
+                                type: string
+                              type:
+                                description: |-
+                                  type indicates which kind of AppArmor profile will be applied.
+                                  Valid options are:
+                                    Localhost - a profile pre-loaded on the node.
+                                    RuntimeDefault - the container runtime's default profile.
+                                    Unconfined - no AppArmor enforcement.
+                                type: string
+                            required:
+                              - type
+                            type: object
+                          fsGroup:
+                            description: |-
+                              A special supplemental group that applies to all containers in a pod.
+                              Some volume types allow the Kubelet to change the ownership of that volume
+                              to be owned by the pod:
+
+                              1. The owning GID will be the FSGroup
+                              2. The setgid bit is set (new files created in the volume will be owned by FSGroup)
+                              3. The permission bits are OR'd with rw-rw----
+
+                              If unset, the Kubelet will not modify the ownership and permissions of any volume.
+                              Note that this field cannot be set when spec.os.name is windows.
+                            format: int64
+                            type: integer
+                          fsGroupChangePolicy:
+                            description: |-
+                              fsGroupChangePolicy defines behavior of changing ownership and permission of the volume
+                              before being exposed inside Pod. This field will only apply to
+                              volume types which support fsGroup based ownership(and permissions).
+                              It will have no effect on ephemeral volume types such as: secret, configmaps
+                              and emptydir.
+                              Valid values are "OnRootMismatch" and "Always". If not specified, "Always" is used.
+                              Note that this field cannot be set when spec.os.name is windows.
+                            type: string
+                          runAsGroup:
+                            description: |-
+                              The GID to run the entrypoint of the container process.
+                              Uses runtime default if unset.
+                              May also be set in SecurityContext.  If set in both SecurityContext and
+                              PodSecurityContext, the value specified in SecurityContext takes precedence
+                              for that container.
+                              Note that this field cannot be set when spec.os.name is windows.
+                            format: int64
+                            type: integer
+                          runAsNonRoot:
+                            description: |-
+                              Indicates that the container must run as a non-root user.
+                              If true, the Kubelet will validate the image at runtime to ensure that it
+                              does not run as UID 0 (root) and fail to start the container if it does.
+                              If unset or false, no such validation will be performed.
+                              May also be set in SecurityContext.  If set in both SecurityContext and
+                              PodSecurityContext, the value specified in SecurityContext takes precedence.
+                            type: boolean
+                          runAsUser:
+                            description: |-
+                              The UID to run the entrypoint of the container process.
+                              Defaults to user specified in image metadata if unspecified.
+                              May also be set in SecurityContext.  If set in both SecurityContext and
+                              PodSecurityContext, the value specified in SecurityContext takes precedence
+                              for that container.
+                              Note that this field cannot be set when spec.os.name is windows.
+                            format: int64
+                            type: integer
+                          seLinuxChangePolicy:
+                            description: |-
+                              seLinuxChangePolicy defines how the container's SELinux label is applied to all volumes used by the Pod.
+                              It has no effect on nodes that do not support SELinux or to volumes does not support SELinux.
+                              Valid values are "MountOption" and "Recursive".
+
+                              "Recursive" means relabeling of all files on all Pod volumes by the container runtime.
+                              This may be slow for large volumes, but allows mixing privileged and unprivileged Pods sharing the same volume on the same node.
+
+                              "MountOption" mounts all eligible Pod volumes with `-o context` mount option.
+                              This requires all Pods that share the same volume to use the same SELinux label.
+                              It is not possible to share the same volume among privileged and unprivileged Pods.
+                              Eligible volumes are in-tree FibreChannel and iSCSI volumes, and all CSI volumes
+                              whose CSI driver announces SELinux support by setting spec.seLinuxMount: true in their
+                              CSIDriver instance. Other volumes are always re-labelled recursively.
+
+                              If not specified, "MountOption" is used.
+
+                              This field affects only Pods that have SELinux label set, either in PodSecurityContext or in SecurityContext of all containers.
+
+                              All Pods that use the same volume should use the same seLinuxChangePolicy, otherwise some pods can get stuck in ContainerCreating state.
+                              Note that this field cannot be set when spec.os.name is windows.
+                            type: string
+                          seLinuxOptions:
+                            description: |-
+                              The SELinux context to be applied to all containers.
+                              If unspecified, the container runtime will allocate a random SELinux context for each
+                              container.  May also be set in SecurityContext.  If set in
+                              both SecurityContext and PodSecurityContext, the value specified in SecurityContext
+                              takes precedence for that container.
+                              Note that this field cannot be set when spec.os.name is windows.
+                            properties:
+                              level:
+                                description: Level is SELinux level label that applies to the container.
+                                type: string
+                              role:
+                                description: Role is a SELinux role label that applies to the container.
+                                type: string
+                              type:
+                                description: Type is a SELinux type label that applies to the container.
+                                type: string
+                              user:
+                                description: User is a SELinux user label that applies to the container.
+                                type: string
+                            type: object
+                          seccompProfile:
+                            description: |-
+                              The seccomp options to use by the containers in this pod.
+                              Note that this field cannot be set when spec.os.name is windows.
+                            properties:
+                              localhostProfile:
+                                description: |-
+                                  localhostProfile indicates a profile defined in a file on the node should be used.
+                                  The profile must be preconfigured on the node to work.
+                                  Must be a descending path, relative to the kubelet's configured seccomp profile location.
+                                  Must be set if type is "Localhost". Must NOT be set for any other type.
+                                type: string
+                              type:
+                                description: |-
+                                  type indicates which kind of seccomp profile will be applied.
+                                  Valid options are:
+
+                                  Localhost - a profile defined in a file on the node should be used.
+                                  RuntimeDefault - the container runtime default profile should be used.
+                                  Unconfined - no profile should be applied.
+                                type: string
+                            required:
+                              - type
+                            type: object
+                          supplementalGroups:
+                            description: |-
+                              A list of groups applied to the first process run in each container, in
+                              addition to the container's primary GID and fsGroup (if specified).  If
+                              the SupplementalGroupsPolicy feature is enabled, the
+                              supplementalGroupsPolicy field determines whether these are in addition
+                              to or instead of any group memberships defined in the container image.
+                              If unspecified, no additional groups are added, though group memberships
+                              defined in the container image may still be used, depending on the
+                              supplementalGroupsPolicy field.
+                              Note that this field cannot be set when spec.os.name is windows.
+                            items:
+                              format: int64
+                              type: integer
+                            type: array
+                            x-kubernetes-list-type: atomic
+                          supplementalGroupsPolicy:
+                            description: |-
+                              Defines how supplemental groups of the first container processes are calculated.
+                              Valid values are "Merge" and "Strict". If not specified, "Merge" is used.
+                              (Alpha) Using the field requires the SupplementalGroupsPolicy feature gate to be enabled
+                              and the container runtime must implement support for this feature.
+                              Note that this field cannot be set when spec.os.name is windows.
+                            type: string
+                          sysctls:
+                            description: |-
+                              Sysctls hold a list of namespaced sysctls used for the pod. Pods with unsupported
+                              sysctls (by the container runtime) might fail to launch.
+                              Note that this field cannot be set when spec.os.name is windows.
+                            items:
+                              description: Sysctl defines a kernel parameter to be set
+                              properties:
+                                name:
+                                  description: Name of a property to set
+                                  type: string
+                                value:
+                                  description: Value of a property to set
+                                  type: string
+                              required:
+                                - name
+                                - value
+                              type: object
+                            type: array
+                            x-kubernetes-list-type: atomic
+                          windowsOptions:
+                            description: |-
+                              The Windows specific settings applied to all containers.
+                              If unspecified, the options within a container's SecurityContext will be used.
+                              If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence.
+                              Note that this field cannot be set when spec.os.name is linux.
+                            properties:
+                              gmsaCredentialSpec:
+                                description: |-
+                                  GMSACredentialSpec is where the GMSA admission webhook
+                                  (https://github.com/kubernetes-sigs/windows-gmsa) inlines the contents of the
+                                  GMSA credential spec named by the GMSACredentialSpecName field.
+                                type: string
+                              gmsaCredentialSpecName:
+                                description: GMSACredentialSpecName is the name of the GMSA credential spec to use.
+                                type: string
+                              hostProcess:
+                                description: |-
+                                  HostProcess determines if a container should be run as a 'Host Process' container.
+                                  All of a Pod's containers must have the same effective HostProcess value
+                                  (it is not allowed to have a mix of HostProcess containers and non-HostProcess containers).
+                                  In addition, if HostProcess is true then HostNetwork must also be set to true.
+                                type: boolean
+                              runAsUserName:
+                                description: |-
+                                  The UserName in Windows to run the entrypoint of the container process.
+                                  Defaults to the user specified in image metadata if unspecified.
+                                  May also be set in PodSecurityContext. If set in both SecurityContext and
+                                  PodSecurityContext, the value specified in SecurityContext takes precedence.
+                                type: string
+                            type: object
+                        type: object
                       probes:
                         description: |-
                           Probes defines the probe configuration for the Control Plane components
@@ -6397,7 +7685,7 @@ versions:
                                 type: integer
                             type: object
                           readiness:
-                            description: Readiness defines default parameters for the readiness probe of kube-apiserver.
+                            description: Readiness defines default parameters for readiness probes of all Control Plane components.
                             properties:
                               failureThreshold:
                                 description: FailureThreshold is the consecutive failure count required to consider the probe failed.
@@ -7375,6 +8663,46 @@ versions:
                             - targetPort
                           type: object
                         type: array
+                      allocateLoadBalancerNodePorts:
+                        description: |-
+                          AllocateLoadBalancerNodePorts defines whether NodePorts are automatically allocated
+                          for the Service when serviceType is LoadBalancer. It maps directly to the Service's
+                          spec.allocateLoadBalancerNodePorts. When nil, the Kubernetes default (true) applies,
+                          preserving existing behaviour. Set to false to expose the Tenant Control Plane only
+                          via the LoadBalancer IP and ClusterIP, without a per-node NodePort. This field is only
+                          valid when serviceType is LoadBalancer; setting it with any other serviceType is
+                          rejected by validation.
+                        type: boolean
+                      ipFamilies:
+                        description: |-
+                          IPFamilies maps directly to the generated Service's spec.ipFamilies. Order is
+                          significant: the first entry is the primary family. When empty, the management
+                          cluster default applies. A Service's IP families cannot be reduced or swapped
+                          after creation (only a single-stack Service may be upgraded to dual-stack);
+                          forbidden transitions are rejected by the API server and surface as a reconcile error.
+                        items:
+                          description: |-
+                            IPFamily represents the IP Family (IPv4 or IPv6). This type is used
+                            to express the family of an IP expressed by a type (e.g. service.spec.ipFamilies).
+                          enum:
+                            - IPv4
+                            - IPv6
+                          type: string
+                        maxItems: 2
+                        type: array
+                      ipFamilyPolicy:
+                        description: |-
+                          IPFamilyPolicy maps directly to the generated Service's spec.ipFamilyPolicy.
+                          When nil, the management cluster default applies, preserving existing behaviour.
+                          PreferDualStack and RequireDualStack describe a dual-stack Service and expect
+                          two entries in ipFamilies; a RequireDualStack policy that cannot be satisfied
+                          (for example with a single family) is rejected by the API server and surfaces
+                          as a reconcile error.
+                        enum:
+                          - SingleStack
+                          - PreferDualStack
+                          - RequireDualStack
+                        type: string
                       serviceType:
                         description: ServiceType allows specifying how to expose the Tenant Control Plane.
                         enum:
@@ -7560,9 +8888,13 @@ versions:
                             - InternalDNS
                             - ExternalDNS
                           type: string
+                        maxItems: 5
                         minItems: 1
                         type: array
-                        x-kubernetes-list-type: set
+                        x-kubernetes-list-type: atomic
+                        x-kubernetes-validations:
+                          - message: preferredAddressTypes entries must be unique
+                            rule: self.all(x, self.exists_one(y, y == x))
                     type: object
                   version:
                     description: Kubernetes Version for the tenant control plane
@@ -7579,6 +8911,22 @@ versions:
                       Address where API server will be exposed.
                       In the case of LoadBalancer Service, this can be empty in order to use the exposed IP provided by the cloud controller manager.
                     type: string
+                  advertiseAddress:
+                    description: |-
+                      AdvertiseAddress is the IP address advertised to tenant-side consumers (workers, konnectivity).
+                      It is passed to the API server's --advertise-address flag and used for the kubeadm
+                      ControlPlaneEndpoint, cluster-info, and admin.conf; when set, the management address is used
+                      for CAPI and status reporting. Both addresses are included in the API server certificate SANs.
+
+                      This must be an IP address, not a DNS name: --advertise-address and the in-tenant "kubernetes"
+                      Service endpoints only accept IPs. To expose the control plane under a hostname, point a DNS
+                      record at a stable VIP and add the hostname to networkProfile.certSANs; for L7/hostname exposure
+                      see spec.controlPlane.ingress / spec.controlPlane.gateway (mind the TLS-passthrough caveats for
+                      client-certificate authentication).
+                    type: string
+                    x-kubernetes-validations:
+                      - message: advertiseAddress must be a valid IP address
+                        rule: self == '' || isIP(self)
                   allowAddressAsExternalIP:
                     description: |-
                       AllowAddressAsExternalIP will include tenantControlPlane.Spec.NetworkProfile.Address in the section of
@@ -7636,11 +8984,28 @@ versions:
                         rule: self.all(r, isCIDR(r))
                   podCidr:
                     default: 10.244.0.0/16
-                    description: 'CIDR for Kubernetes Pods: if empty, defaulted to 10.244.0.0/16.'
+                    description: |-
+                      CIDR for Kubernetes Pods: if empty, defaulted to 10.244.0.0/16.
+                      Deprecated: use PodCIDRs instead.
                     type: string
                     x-kubernetes-validations:
                       - message: podCidr must be empty or a valid CIDR
                         rule: self == '' || isCIDR(self)
+                  podCidrs:
+                    description: |-
+                      PodCIDRs defines one or more CIDRs for Kubernetes Pods.
+                      Supports single-stack and dual-stack configurations.
+                      When specified, this field takes precedence over PodCIDR.
+                    items:
+                      type: string
+                    maxItems: 2
+                    minItems: 1
+                    type: array
+                    x-kubernetes-validations:
+                      - message: all podCidrs entries must be valid CIDRs
+                        rule: self.all(x, isCIDR(x))
+                      - message: podCidrs must not contain two CIDRs of the same IP family
+                        rule: size(self) < 2 || cidr(self[0]).ip().family() != cidr(self[1]).ip().family()
                   port:
                     default: 6443
                     description: Port where API server will be exposed
@@ -7648,15 +9013,29 @@ versions:
                     type: integer
                   serviceCidr:
                     default: 10.96.0.0/16
-                    description: 'CIDR for Kubernetes Services: if empty, defaulted to 10.96.0.0/16.'
+                    description: |-
+                      CIDR for Kubernetes Services: if empty, defaulted to 10.96.0.0/16.
+                      Deprecated: use ServiceCIDRs instead.
                     type: string
                     x-kubernetes-validations:
                       - message: serviceCidr must be empty or a valid CIDR
                         rule: self == '' || isCIDR(self)
+                  serviceCidrs:
+                    description: |-
+                      Service CIDRs for Kubernetes Services.
+                      Supports single-stack and dual-stack configurations.
+                      When specified, this field takes precedence over ServiceCIDR.
+                    items:
+                      type: string
+                    maxItems: 2
+                    minItems: 1
+                    type: array
+                    x-kubernetes-validations:
+                      - message: all serviceCidrs entries must be valid CIDRs
+                        rule: self.all(x, isCIDR(x))
+                      - message: serviceCidrs must not contain two CIDRs of the same IP family
+                        rule: size(self) < 2 || cidr(self[0]).ip().family() != cidr(self[1]).ip().family()
                 type: object
-                x-kubernetes-validations:
-                  - message: all DNS service IPs must be part of the Service CIDR
-                    rule: '!has(self.dnsServiceIPs) || self.dnsServiceIPs.all(r, cidr(self.serviceCidr).containsIP(r))'
               writePermissions:
                 description: |-
                   WritePermissions allows to select which operations (create, delete, update) must be blocked:
@@ -7688,8 +9067,14 @@ versions:
                 rule: '!has(self.networkProfile.loadBalancerSourceRanges) || (size(self.networkProfile.loadBalancerSourceRanges) == 0 || self.controlPlane.service.serviceType == ''LoadBalancer'')'
               - message: LoadBalancerClass is supported only with LoadBalancer service type
                 rule: '!has(self.networkProfile.loadBalancerClass) || self.controlPlane.service.serviceType == ''LoadBalancer'''
+              - message: allocateLoadBalancerNodePorts is supported only with LoadBalancer service type
+                rule: '!has(self.controlPlane.service.allocateLoadBalancerNodePorts) || self.controlPlane.service.serviceType == ''LoadBalancer'''
               - message: LoadBalancerClass cannot be set or unset at runtime
                 rule: self.controlPlane.service.serviceType != 'LoadBalancer' || (oldSelf.controlPlane.service.serviceType != 'LoadBalancer' && self.controlPlane.service.serviceType == 'LoadBalancer') || has(self.networkProfile.loadBalancerClass) == has(oldSelf.networkProfile.loadBalancerClass)
+              - message: ipFamilies must contain at most one entry when ipFamilyPolicy is SingleStack
+                rule: '!has(self.controlPlane.service.ipFamilyPolicy) || self.controlPlane.service.ipFamilyPolicy != ''SingleStack'' || !has(self.controlPlane.service.ipFamilies) || size(self.controlPlane.service.ipFamilies) <= 1'
+              - message: ipFamilies entries must be unique
+                rule: '!has(self.controlPlane.service.ipFamilies) || size(self.controlPlane.service.ipFamilies) < 2 || self.controlPlane.service.ipFamilies[0] != self.controlPlane.service.ipFamilies[1]'
           status:
             description: TenantControlPlaneStatus defines the observed state of TenantControlPlane.
             properties:
@@ -7860,7 +9245,7 @@ versions:
 
                                     * The Route refers to a nonexistent parent.
                                     * The Route is of a type that the controller does not support.
-                                    * The Route is in a namespace the controller does not have access to.
+                                    * The Route is in a namespace to which the controller does not have access.
 
                                     <gateway:util:excludeFromCRD>
 
@@ -8523,10 +9908,9 @@ versions:
                             type:
                               description: Type of deployment condition.
                               type: string
+                          type: object
                           required:
-                            - status
                             - type
-                          type: object
                         type: array
                         x-kubernetes-list-map-keys:
                           - type
@@ -8686,7 +10070,7 @@ versions:
 
                                 * The Route refers to a nonexistent parent.
                                 * The Route is of a type that the controller does not support.
-                                * The Route is in a namespace the controller does not have access to.
+                                * The Route is in a namespace to which the controller does not have access.
 
                                 <gateway:util:excludeFromCRD>
 
diff --git a/packages/system/kamaji/charts/kamaji/Chart.lock b/packages/system/kamaji/charts/kamaji/Chart.lock
index f22bdc0595..1b0e1c97eb 100644
--- a/packages/system/kamaji/charts/kamaji/Chart.lock
+++ b/packages/system/kamaji/charts/kamaji/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: kamaji-etcd
   repository: https://clastix.github.io/charts
-  version: 0.11.0
-digest: sha256:96b4115b8c02f771f809ec1bed3be3a3903e7e8315d6966aa54b0f73230ea421
-generated: "2025-07-03T09:19:19.835421461+02:00"
+  version: 0.15.0
+digest: sha256:dffc71b76c5711884d1bb4b66dee859e4dc70b149b02b4d36d0c60d299d7c55a
+generated: "2026-05-25T10:39:07.251403781+02:00"
diff --git a/packages/system/kamaji/charts/kamaji/Chart.yaml b/packages/system/kamaji/charts/kamaji/Chart.yaml
index a7ec5faf2c..5a0226621c 100644
--- a/packages/system/kamaji/charts/kamaji/Chart.yaml
+++ b/packages/system/kamaji/charts/kamaji/Chart.yaml
@@ -21,7 +21,7 @@ version: 0.0.0+latest
 dependencies:
 - name: kamaji-etcd
   repository: https://clastix.github.io/charts
-  version: ">=0.11.0"
+  version: ">=0.15.0"
   condition: kamaji-etcd.deploy
 annotations:
   catalog.cattle.io/certified: partner
diff --git a/packages/system/kamaji/charts/kamaji/README.md b/packages/system/kamaji/charts/kamaji/README.md
index 69a9cefd45..79c8388cd5 100644
--- a/packages/system/kamaji/charts/kamaji/README.md
+++ b/packages/system/kamaji/charts/kamaji/README.md
@@ -22,7 +22,7 @@ Kubernetes: `>=1.21.0-0`
 
 | Repository | Name | Version |
 |------------|------|---------|
-| https://clastix.github.io/charts | kamaji-etcd | >=0.11.0 |
+| https://clastix.github.io/charts | kamaji-etcd | >=0.15.0 |
 
 [Kamaji](https://github.com/clastix/kamaji) requires a [multi-tenant `etcd`](https://github.com/clastix/kamaji-internal/blob/master/deploy/getting-started-with-kamaji.md#setup-internal-multi-tenant-etcd) cluster.
 This Helm Chart starting from v0.1.1 provides the installation of an internal `etcd` in order to streamline the local test. If you'd like to use an externally managed etcd instance, you can specify the overrides and by setting the value `etcd.deploy=false`.
@@ -74,6 +74,7 @@ Here the values you can override:
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
 | affinity | object | `{}` | Kubernetes affinity rules to apply to Kamaji controller pods |
+| certManager.issuerRef | object | `{}` | Reference to an existing cert-manager issuer that signs the webhook serving certificate. When `name` is empty the chart creates a self-signed `Issuer` named `kamaji-selfsigned-issuer` and uses that. Set this to chain the webhook certificate to a certificate authority you own. `kind` defaults to `Issuer` and `group` to `cert-manager.io`. Note that the `kamaji-etcd` subchart has its own `kamaji-etcd.certManager.issuerRef`, which defaults to `kamaji-selfsigned-issuer` and has to be updated as well when the etcd certificates are issued by cert-manager. |
 | defaultDatastoreName | string | `"default"` | If specified, all the Kamaji instances with an unassigned DataStore will inherit this default value. |
 | extraArgs | list | `[]` | A list of extra arguments to add to the kamaji controller default ones |
 | fullnameOverride | string | `""` |  |
@@ -82,7 +83,7 @@ Here the values you can override:
 | image.repository | string | `"clastix/kamaji"` | The container image of the Kamaji controller. |
 | image.tag | string | `nil` | Overrides the image tag whose default is the chart appVersion. |
 | imagePullSecrets | list | `[]` |  |
-| kamaji-etcd | object | `{"clusterDomain":"cluster.local","datastore":{"enabled":true,"name":"default"},"deploy":true,"fullnameOverride":"kamaji-etcd"}` | Subchart: See https://github.com/clastix/kamaji-etcd/blob/master/charts/kamaji-etcd/values.yaml |
+| kamaji-etcd | object | `{"certManager":{"enabled":true,"issuerRef":{"group":"cert-manager.io","kind":"Issuer","name":"kamaji-selfsigned-issuer"}},"clusterDomain":"cluster.local","datastore":{"enabled":true,"name":"default"},"deploy":true,"fullnameOverride":"kamaji-etcd","selfSignedCertificates":{"enabled":false}}` | Subchart: See https://github.com/clastix/kamaji-etcd/blob/master/charts/kamaji-etcd/values.yaml |
 | kubeconfigGenerator.affinity | object | `{}` | Kubernetes affinity rules to apply to Kubeconfig Generator controller pods |
 | kubeconfigGenerator.enableLeaderElect | bool | `true` | Enables the leader election. |
 | kubeconfigGenerator.enabled | bool | `false` | Toggle to deploy the Kubeconfig Generator Deployment. |
diff --git a/packages/system/kamaji/charts/kamaji/controller-gen/validating-webhook.yaml b/packages/system/kamaji/charts/kamaji/controller-gen/validating-webhook.yaml
index b7eb1690d7..d03e5e280a 100644
--- a/packages/system/kamaji/charts/kamaji/controller-gen/validating-webhook.yaml
+++ b/packages/system/kamaji/charts/kamaji/controller-gen/validating-webhook.yaml
@@ -1,3 +1,4 @@
+{{- if not .Values.telemetry.disabled }}
 - admissionReviewVersions:
     - v1
   clientConfig:
@@ -19,6 +20,7 @@
       resources:
         - tenantcontrolplanes
   sideEffects: None
+{{- end }}
 - admissionReviewVersions:
     - v1
   clientConfig:
diff --git a/packages/system/kamaji/charts/kamaji/crds/kamaji.clastix.io_datastores.yaml b/packages/system/kamaji/charts/kamaji/crds/kamaji.clastix.io_datastores.yaml
index 903f7c69b9..d0c1ec2a53 100644
--- a/packages/system/kamaji/charts/kamaji/crds/kamaji.clastix.io_datastores.yaml
+++ b/packages/system/kamaji/charts/kamaji/crds/kamaji.clastix.io_datastores.yaml
@@ -132,9 +132,14 @@ spec:
                     List of the endpoints to connect to the shared datastore.
                     No need for protocol, just bare IP/FQDN and port.
                   items:
+                    maxLength: 256
                     type: string
+                  maxItems: 64
                   minItems: 1
                   type: array
+                  x-kubernetes-validations:
+                    - message: an IPv6 endpoint address must be bracketed, e.g. [2001:db8::1]:2379
+                      rule: self.all(e, e.startsWith('[') || e.split(':').size() <= 2)
                 tlsConfig:
                   description: |-
                     Defines the TLS/SSL configuration required to connect to the data store in a secure way.
diff --git a/packages/system/kamaji/charts/kamaji/crds/kamaji.clastix.io_tenantcontrolplanes.yaml b/packages/system/kamaji/charts/kamaji/crds/kamaji.clastix.io_tenantcontrolplanes.yaml
index f3c72dcd99..cc28fd3890 100644
--- a/packages/system/kamaji/charts/kamaji/crds/kamaji.clastix.io_tenantcontrolplanes.yaml
+++ b/packages/system/kamaji/charts/kamaji/crds/kamaji.clastix.io_tenantcontrolplanes.yaml
@@ -132,6 +132,74 @@ spec:
                                 Must be 0 if Mode is DaemonSet.
                               format: int32
                               type: integer
+                            resources:
+                              description: |-
+                                Resources define the amount of CPU and memory to allocate to the Konnectivity agent.
+
+                                When unset the agent container declares no requests or limits, which places
+                                its Pod in the BestEffort QoS class. Since the agent tolerates all taints and
+                                commonly runs alongside the cluster's heaviest workloads, BestEffort makes it
+                                the first candidate for CPU starvation and eviction on a busy node, degrading
+                                the very tunnel that `kubectl exec`, `kubectl logs` and `kubectl port-forward`
+                                depend on. Setting requests here promotes the agent to Burstable so it is
+                                scheduled with a guaranteed share of CPU.
+                              properties:
+                                claims:
+                                  description: |-
+                                    Claims lists the names of resources, defined in spec.resourceClaims,
+                                    that are used by this container.
+
+                                    This field depends on the
+                                    DynamicResourceAllocation feature gate.
+
+                                    This field is immutable. It can only be set for containers.
+                                  items:
+                                    description: ResourceClaim references one entry in PodSpec.ResourceClaims.
+                                    properties:
+                                      name:
+                                        description: |-
+                                          Name must match the name of one entry in pod.spec.resourceClaims of
+                                          the Pod where this field is used. It makes that resource available
+                                          inside a container.
+                                        type: string
+                                      request:
+                                        description: |-
+                                          Request is the name chosen for a request in the referenced claim.
+                                          If empty, everything from the claim is made available, otherwise
+                                          only the result of this request.
+                                        type: string
+                                    required:
+                                      - name
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-map-keys:
+                                    - name
+                                  x-kubernetes-list-type: map
+                                limits:
+                                  additionalProperties:
+                                    anyOf:
+                                      - type: integer
+                                      - type: string
+                                    pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                    x-kubernetes-int-or-string: true
+                                  description: |-
+                                    Limits describes the maximum amount of compute resources allowed.
+                                    More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+                                  type: object
+                                requests:
+                                  additionalProperties:
+                                    anyOf:
+                                      - type: integer
+                                      - type: string
+                                    pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                    x-kubernetes-int-or-string: true
+                                  description: |-
+                                    Requests describes the minimum amount of compute resources required.
+                                    If Requests is omitted for a container, it defaults to Limits if that is explicitly specified,
+                                    otherwise to an implementation-defined value. Requests cannot exceed Limits.
+                                    More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+                                  type: object
+                              type: object
                             tolerations:
                               default:
                                 - key: CriticalAddonsOnly
@@ -269,6 +337,190 @@ spec:
                                     More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
                                   type: object
                               type: object
+                            securityContext:
+                              description: SecurityContext defines the SecurityContext for the Konnectivity server container.
+                              properties:
+                                allowPrivilegeEscalation:
+                                  description: |-
+                                    AllowPrivilegeEscalation controls whether a process can gain more
+                                    privileges than its parent process. This bool directly controls if
+                                    the no_new_privs flag will be set on the container process.
+                                    AllowPrivilegeEscalation is true always when the container is:
+                                    1) run as Privileged
+                                    2) has CAP_SYS_ADMIN
+                                    Note that this field cannot be set when spec.os.name is windows.
+                                  type: boolean
+                                appArmorProfile:
+                                  description: |-
+                                    appArmorProfile is the AppArmor options to use by this container. If set, this profile
+                                    overrides the pod's appArmorProfile.
+                                    Note that this field cannot be set when spec.os.name is windows.
+                                  properties:
+                                    localhostProfile:
+                                      description: |-
+                                        localhostProfile indicates a profile loaded on the node that should be used.
+                                        The profile must be preconfigured on the node to work.
+                                        Must match the loaded name of the profile.
+                                        Must be set if and only if type is "Localhost".
+                                      type: string
+                                    type:
+                                      description: |-
+                                        type indicates which kind of AppArmor profile will be applied.
+                                        Valid options are:
+                                          Localhost - a profile pre-loaded on the node.
+                                          RuntimeDefault - the container runtime's default profile.
+                                          Unconfined - no AppArmor enforcement.
+                                      type: string
+                                  required:
+                                    - type
+                                  type: object
+                                capabilities:
+                                  description: |-
+                                    The capabilities to add/drop when running containers.
+                                    Defaults to the default set of capabilities granted by the container runtime.
+                                    Note that this field cannot be set when spec.os.name is windows.
+                                  properties:
+                                    add:
+                                      description: Added capabilities
+                                      items:
+                                        description: Capability represent POSIX capabilities type
+                                        type: string
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    drop:
+                                      description: Removed capabilities
+                                      items:
+                                        description: Capability represent POSIX capabilities type
+                                        type: string
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                  type: object
+                                privileged:
+                                  description: |-
+                                    Run container in privileged mode.
+                                    Processes in privileged containers are essentially equivalent to root on the host.
+                                    Defaults to false.
+                                    Note that this field cannot be set when spec.os.name is windows.
+                                  type: boolean
+                                procMount:
+                                  description: |-
+                                    procMount denotes the type of proc mount to use for the containers.
+                                    The default value is Default which uses the container runtime defaults for
+                                    readonly paths and masked paths.
+                                    Note that this field cannot be set when spec.os.name is windows.
+                                  type: string
+                                readOnlyRootFilesystem:
+                                  description: |-
+                                    Whether this container has a read-only root filesystem.
+                                    Default is false.
+                                    Note that this field cannot be set when spec.os.name is windows.
+                                  type: boolean
+                                runAsGroup:
+                                  description: |-
+                                    The GID to run the entrypoint of the container process.
+                                    Uses runtime default if unset.
+                                    May also be set in PodSecurityContext.  If set in both SecurityContext and
+                                    PodSecurityContext, the value specified in SecurityContext takes precedence.
+                                    Note that this field cannot be set when spec.os.name is windows.
+                                  format: int64
+                                  type: integer
+                                runAsNonRoot:
+                                  description: |-
+                                    Indicates that the container must run as a non-root user.
+                                    If true, the Kubelet will validate the image at runtime to ensure that it
+                                    does not run as UID 0 (root) and fail to start the container if it does.
+                                    If unset or false, no such validation will be performed.
+                                    May also be set in PodSecurityContext.  If set in both SecurityContext and
+                                    PodSecurityContext, the value specified in SecurityContext takes precedence.
+                                  type: boolean
+                                runAsUser:
+                                  description: |-
+                                    The UID to run the entrypoint of the container process.
+                                    Defaults to user specified in image metadata if unspecified.
+                                    May also be set in PodSecurityContext.  If set in both SecurityContext and
+                                    PodSecurityContext, the value specified in SecurityContext takes precedence.
+                                    Note that this field cannot be set when spec.os.name is windows.
+                                  format: int64
+                                  type: integer
+                                seLinuxOptions:
+                                  description: |-
+                                    The SELinux context to be applied to the container.
+                                    If unspecified, the container runtime will allocate a random SELinux context for each
+                                    container.  May also be set in PodSecurityContext.  If set in both SecurityContext and
+                                    PodSecurityContext, the value specified in SecurityContext takes precedence.
+                                    Note that this field cannot be set when spec.os.name is windows.
+                                  properties:
+                                    level:
+                                      description: Level is SELinux level label that applies to the container.
+                                      type: string
+                                    role:
+                                      description: Role is a SELinux role label that applies to the container.
+                                      type: string
+                                    type:
+                                      description: Type is a SELinux type label that applies to the container.
+                                      type: string
+                                    user:
+                                      description: User is a SELinux user label that applies to the container.
+                                      type: string
+                                  type: object
+                                seccompProfile:
+                                  description: |-
+                                    The seccomp options to use by this container. If seccomp options are
+                                    provided at both the pod & container level, the container options
+                                    override the pod options.
+                                    Note that this field cannot be set when spec.os.name is windows.
+                                  properties:
+                                    localhostProfile:
+                                      description: |-
+                                        localhostProfile indicates a profile defined in a file on the node should be used.
+                                        The profile must be preconfigured on the node to work.
+                                        Must be a descending path, relative to the kubelet's configured seccomp profile location.
+                                        Must be set if type is "Localhost". Must NOT be set for any other type.
+                                      type: string
+                                    type:
+                                      description: |-
+                                        type indicates which kind of seccomp profile will be applied.
+                                        Valid options are:
+
+                                        Localhost - a profile defined in a file on the node should be used.
+                                        RuntimeDefault - the container runtime default profile should be used.
+                                        Unconfined - no profile should be applied.
+                                      type: string
+                                  required:
+                                    - type
+                                  type: object
+                                windowsOptions:
+                                  description: |-
+                                    The Windows specific settings applied to all containers.
+                                    If unspecified, the options from the PodSecurityContext will be used.
+                                    If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence.
+                                    Note that this field cannot be set when spec.os.name is linux.
+                                  properties:
+                                    gmsaCredentialSpec:
+                                      description: |-
+                                        GMSACredentialSpec is where the GMSA admission webhook
+                                        (https://github.com/kubernetes-sigs/windows-gmsa) inlines the contents of the
+                                        GMSA credential spec named by the GMSACredentialSpecName field.
+                                      type: string
+                                    gmsaCredentialSpecName:
+                                      description: GMSACredentialSpecName is the name of the GMSA credential spec to use.
+                                      type: string
+                                    hostProcess:
+                                      description: |-
+                                        HostProcess determines if a container should be run as a 'Host Process' container.
+                                        All of a Pod's containers must have the same effective HostProcess value
+                                        (it is not allowed to have a mix of HostProcess containers and non-HostProcess containers).
+                                        In addition, if HostProcess is true then HostNetwork must also be set to true.
+                                      type: boolean
+                                    runAsUserName:
+                                      description: |-
+                                        The UserName in Windows to run the entrypoint of the container process.
+                                        Defaults to the user specified in image metadata if unspecified.
+                                        May also be set in PodSecurityContext. If set in both SecurityContext and
+                                        PodSecurityContext, the value specified in SecurityContext takes precedence.
+                                      type: string
+                                  type: object
+                              type: object
                             version:
                               description: |-
                                 Container image version of the Konnectivity server.
@@ -369,7 +621,9 @@ spec:
                                           description: Selects a key of a ConfigMap.
                                           properties:
                                             key:
-                                              description: The key to select.
+                                              description: |-
+                                                The key to select from the ConfigMap's Data field.
+                                                Keys in the BinaryData field are not currently propagated to container env vars.
                                               type: string
                                             name:
                                               default: ""
@@ -624,6 +878,11 @@ spec:
                                               Number must be in the range 1 to 65535.
                                               Name must be an IANA_SVC_NAME.
                                             x-kubernetes-int-or-string: true
+                                          protocol:
+                                            description: |-
+                                              Protocol selects the wire protocol for the probe connection.
+                                              Nil defaults to HTTP/1.1.
+                                            type: string
                                           scheme:
                                             description: |-
                                               Scheme to use for connecting to the host.
@@ -730,6 +989,11 @@ spec:
                                               Number must be in the range 1 to 65535.
                                               Name must be an IANA_SVC_NAME.
                                             x-kubernetes-int-or-string: true
+                                          protocol:
+                                            description: |-
+                                              Protocol selects the wire protocol for the probe connection.
+                                              Nil defaults to HTTP/1.1.
+                                            type: string
                                           scheme:
                                             description: |-
                                               Scheme to use for connecting to the host.
@@ -808,6 +1072,13 @@ spec:
                                   grpc:
                                     description: GRPC specifies a GRPC HealthCheckRequest.
                                     properties:
+                                      mode:
+                                        description: |-
+                                          mode specifies the connection mode for the gRPC health probe.
+                                          Set to "TLS" to use TLS without certificate verification.
+                                          Set to "Plaintext" to use a plaintext (insecure) connection explicitly.
+                                          If not specified, the probe uses a plaintext (insecure) connection.
+                                        type: string
                                       port:
                                         description: Port number of the gRPC service. Number must be in the range 1 to 65535.
                                         format: int32
@@ -862,6 +1133,11 @@ spec:
                                           Number must be in the range 1 to 65535.
                                           Name must be an IANA_SVC_NAME.
                                         x-kubernetes-int-or-string: true
+                                      protocol:
+                                        description: |-
+                                          Protocol selects the wire protocol for the probe connection.
+                                          Nil defaults to HTTP/1.1.
+                                        type: string
                                       scheme:
                                         description: |-
                                           Scheme to use for connecting to the host.
@@ -1014,6 +1290,13 @@ spec:
                                   grpc:
                                     description: GRPC specifies a GRPC HealthCheckRequest.
                                     properties:
+                                      mode:
+                                        description: |-
+                                          mode specifies the connection mode for the gRPC health probe.
+                                          Set to "TLS" to use TLS without certificate verification.
+                                          Set to "Plaintext" to use a plaintext (insecure) connection explicitly.
+                                          If not specified, the probe uses a plaintext (insecure) connection.
+                                        type: string
                                       port:
                                         description: Port number of the gRPC service. Number must be in the range 1 to 65535.
                                         format: int32
@@ -1068,6 +1351,11 @@ spec:
                                           Number must be in the range 1 to 65535.
                                           Name must be an IANA_SVC_NAME.
                                         x-kubernetes-int-or-string: true
+                                      protocol:
+                                        description: |-
+                                          Protocol selects the wire protocol for the probe connection.
+                                          Nil defaults to HTTP/1.1.
+                                        type: string
                                       scheme:
                                         description: |-
                                           Scheme to use for connecting to the host.
@@ -1361,7 +1649,6 @@ spec:
                                       procMount denotes the type of proc mount to use for the containers.
                                       The default value is Default which uses the container runtime defaults for
                                       readonly paths and masked paths.
-                                      This requires the ProcMountType feature flag to be enabled.
                                       Note that this field cannot be set when spec.os.name is windows.
                                     type: string
                                   readOnlyRootFilesystem:
@@ -1510,6 +1797,13 @@ spec:
                                   grpc:
                                     description: GRPC specifies a GRPC HealthCheckRequest.
                                     properties:
+                                      mode:
+                                        description: |-
+                                          mode specifies the connection mode for the gRPC health probe.
+                                          Set to "TLS" to use TLS without certificate verification.
+                                          Set to "Plaintext" to use a plaintext (insecure) connection explicitly.
+                                          If not specified, the probe uses a plaintext (insecure) connection.
+                                        type: string
                                       port:
                                         description: Port number of the gRPC service. Number must be in the range 1 to 65535.
                                         format: int32
@@ -1564,6 +1858,11 @@ spec:
                                           Number must be in the range 1 to 65535.
                                           Name must be an IANA_SVC_NAME.
                                         x-kubernetes-int-or-string: true
+                                      protocol:
+                                        description: |-
+                                          Protocol selects the wire protocol for the probe connection.
+                                          Nil defaults to HTTP/1.1.
+                                        type: string
                                       scheme:
                                         description: |-
                                           Scheme to use for connecting to the host.
@@ -1697,10 +1996,20 @@ spec:
                                 items:
                                   description: VolumeMount describes a mounting of a Volume within a container.
                                   properties:
-                                    mountPath:
+                                    bindMountOptions:
                                       description: |-
-                                        Path within the container at which the volume should be mounted.  Must
-                                        not contain ':'.
+                                        bindMountOptions is the list of additional bind mount options to apply when
+                                        mounting this volume into the container. Allowed values are noexec,
+                                        nodev, and nosuid. These are Linux mount options and have no effect on
+                                        Windows nodes.
+                                        This field is not supported with image volumes.
+                                        This is an alpha field and requires enabling the VolumeBindMountOptions feature gate.
+                                      items:
+                                        type: string
+                                      type: array
+                                      x-kubernetes-list-type: set
+                                    mountPath:
+                                      description: Path within the container at which the volume should be mounted.
                                       type: string
                                     mountPropagation:
                                       description: |-
@@ -1833,7 +2142,9 @@ spec:
                                           description: Selects a key of a ConfigMap.
                                           properties:
                                             key:
-                                              description: The key to select.
+                                              description: |-
+                                                The key to select from the ConfigMap's Data field.
+                                                Keys in the BinaryData field are not currently propagated to container env vars.
                                               type: string
                                             name:
                                               default: ""
@@ -2088,6 +2399,11 @@ spec:
                                               Number must be in the range 1 to 65535.
                                               Name must be an IANA_SVC_NAME.
                                             x-kubernetes-int-or-string: true
+                                          protocol:
+                                            description: |-
+                                              Protocol selects the wire protocol for the probe connection.
+                                              Nil defaults to HTTP/1.1.
+                                            type: string
                                           scheme:
                                             description: |-
                                               Scheme to use for connecting to the host.
@@ -2194,6 +2510,11 @@ spec:
                                               Number must be in the range 1 to 65535.
                                               Name must be an IANA_SVC_NAME.
                                             x-kubernetes-int-or-string: true
+                                          protocol:
+                                            description: |-
+                                              Protocol selects the wire protocol for the probe connection.
+                                              Nil defaults to HTTP/1.1.
+                                            type: string
                                           scheme:
                                             description: |-
                                               Scheme to use for connecting to the host.
@@ -2272,6 +2593,13 @@ spec:
                                   grpc:
                                     description: GRPC specifies a GRPC HealthCheckRequest.
                                     properties:
+                                      mode:
+                                        description: |-
+                                          mode specifies the connection mode for the gRPC health probe.
+                                          Set to "TLS" to use TLS without certificate verification.
+                                          Set to "Plaintext" to use a plaintext (insecure) connection explicitly.
+                                          If not specified, the probe uses a plaintext (insecure) connection.
+                                        type: string
                                       port:
                                         description: Port number of the gRPC service. Number must be in the range 1 to 65535.
                                         format: int32
@@ -2326,6 +2654,11 @@ spec:
                                           Number must be in the range 1 to 65535.
                                           Name must be an IANA_SVC_NAME.
                                         x-kubernetes-int-or-string: true
+                                      protocol:
+                                        description: |-
+                                          Protocol selects the wire protocol for the probe connection.
+                                          Nil defaults to HTTP/1.1.
+                                        type: string
                                       scheme:
                                         description: |-
                                           Scheme to use for connecting to the host.
@@ -2478,6 +2811,13 @@ spec:
                                   grpc:
                                     description: GRPC specifies a GRPC HealthCheckRequest.
                                     properties:
+                                      mode:
+                                        description: |-
+                                          mode specifies the connection mode for the gRPC health probe.
+                                          Set to "TLS" to use TLS without certificate verification.
+                                          Set to "Plaintext" to use a plaintext (insecure) connection explicitly.
+                                          If not specified, the probe uses a plaintext (insecure) connection.
+                                        type: string
                                       port:
                                         description: Port number of the gRPC service. Number must be in the range 1 to 65535.
                                         format: int32
@@ -2532,6 +2872,11 @@ spec:
                                           Number must be in the range 1 to 65535.
                                           Name must be an IANA_SVC_NAME.
                                         x-kubernetes-int-or-string: true
+                                      protocol:
+                                        description: |-
+                                          Protocol selects the wire protocol for the probe connection.
+                                          Nil defaults to HTTP/1.1.
+                                        type: string
                                       scheme:
                                         description: |-
                                           Scheme to use for connecting to the host.
@@ -2825,7 +3170,6 @@ spec:
                                       procMount denotes the type of proc mount to use for the containers.
                                       The default value is Default which uses the container runtime defaults for
                                       readonly paths and masked paths.
-                                      This requires the ProcMountType feature flag to be enabled.
                                       Note that this field cannot be set when spec.os.name is windows.
                                     type: string
                                   readOnlyRootFilesystem:
@@ -2974,6 +3318,13 @@ spec:
                                   grpc:
                                     description: GRPC specifies a GRPC HealthCheckRequest.
                                     properties:
+                                      mode:
+                                        description: |-
+                                          mode specifies the connection mode for the gRPC health probe.
+                                          Set to "TLS" to use TLS without certificate verification.
+                                          Set to "Plaintext" to use a plaintext (insecure) connection explicitly.
+                                          If not specified, the probe uses a plaintext (insecure) connection.
+                                        type: string
                                       port:
                                         description: Port number of the gRPC service. Number must be in the range 1 to 65535.
                                         format: int32
@@ -3028,6 +3379,11 @@ spec:
                                           Number must be in the range 1 to 65535.
                                           Name must be an IANA_SVC_NAME.
                                         x-kubernetes-int-or-string: true
+                                      protocol:
+                                        description: |-
+                                          Protocol selects the wire protocol for the probe connection.
+                                          Nil defaults to HTTP/1.1.
+                                        type: string
                                       scheme:
                                         description: |-
                                           Scheme to use for connecting to the host.
@@ -3161,10 +3517,20 @@ spec:
                                 items:
                                   description: VolumeMount describes a mounting of a Volume within a container.
                                   properties:
-                                    mountPath:
+                                    bindMountOptions:
                                       description: |-
-                                        Path within the container at which the volume should be mounted.  Must
-                                        not contain ':'.
+                                        bindMountOptions is the list of additional bind mount options to apply when
+                                        mounting this volume into the container. Allowed values are noexec,
+                                        nodev, and nosuid. These are Linux mount options and have no effect on
+                                        Windows nodes.
+                                        This field is not supported with image volumes.
+                                        This is an alpha field and requires enabling the VolumeBindMountOptions feature gate.
+                                      items:
+                                        type: string
+                                      type: array
+                                      x-kubernetes-list-type: set
+                                    mountPath:
+                                      description: Path within the container at which the volume should be mounted.
                                       type: string
                                     mountPropagation:
                                       description: |-
@@ -3254,10 +3620,20 @@ spec:
                               items:
                                 description: VolumeMount describes a mounting of a Volume within a container.
                                 properties:
+                                  bindMountOptions:
+                                    description: |-
+                                      bindMountOptions is the list of additional bind mount options to apply when
+                                      mounting this volume into the container. Allowed values are noexec,
+                                      nodev, and nosuid. These are Linux mount options and have no effect on
+                                      Windows nodes.
+                                      This field is not supported with image volumes.
+                                      This is an alpha field and requires enabling the VolumeBindMountOptions feature gate.
+                                    items:
+                                      type: string
+                                    type: array
+                                    x-kubernetes-list-type: set
                                   mountPath:
-                                    description: |-
-                                      Path within the container at which the volume should be mounted.  Must
-                                      not contain ':'.
+                                    description: Path within the container at which the volume should be mounted.
                                     type: string
                                   mountPropagation:
                                     description: |-
@@ -3316,10 +3692,20 @@ spec:
                               items:
                                 description: VolumeMount describes a mounting of a Volume within a container.
                                 properties:
+                                  bindMountOptions:
+                                    description: |-
+                                      bindMountOptions is the list of additional bind mount options to apply when
+                                      mounting this volume into the container. Allowed values are noexec,
+                                      nodev, and nosuid. These are Linux mount options and have no effect on
+                                      Windows nodes.
+                                      This field is not supported with image volumes.
+                                      This is an alpha field and requires enabling the VolumeBindMountOptions feature gate.
+                                    items:
+                                      type: string
+                                    type: array
+                                    x-kubernetes-list-type: set
                                   mountPath:
-                                    description: |-
-                                      Path within the container at which the volume should be mounted.  Must
-                                      not contain ':'.
+                                    description: Path within the container at which the volume should be mounted.
                                     type: string
                                   mountPropagation:
                                     description: |-
@@ -3378,10 +3764,20 @@ spec:
                               items:
                                 description: VolumeMount describes a mounting of a Volume within a container.
                                 properties:
+                                  bindMountOptions:
+                                    description: |-
+                                      bindMountOptions is the list of additional bind mount options to apply when
+                                      mounting this volume into the container. Allowed values are noexec,
+                                      nodev, and nosuid. These are Linux mount options and have no effect on
+                                      Windows nodes.
+                                      This field is not supported with image volumes.
+                                      This is an alpha field and requires enabling the VolumeBindMountOptions feature gate.
+                                    items:
+                                      type: string
+                                    type: array
+                                    x-kubernetes-list-type: set
                                   mountPath:
-                                    description: |-
-                                      Path within the container at which the volume should be mounted.  Must
-                                      not contain ':'.
+                                    description: Path within the container at which the volume should be mounted.
                                     type: string
                                   mountPropagation:
                                     description: |-
@@ -3643,6 +4039,13 @@ spec:
                                       mode, like fsGroup, and the result can be other mode bits set.
                                     format: int32
                                     type: integer
+                                  defaultUser:
+                                    description: |-
+                                      defaultUser is Optional: The owner UID of the created files by default.
+                                      The defaultUser field is only used as a fallback when the item-level user field is unset.
+                                      (Alpha) This field requires the AtomicWriteVolumeUserFields feature gate to be enabled.
+                                    format: int64
+                                    type: integer
                                   items:
                                     description: |-
                                       items if unspecified, each key-value pair in the Data field of the referenced
@@ -3675,6 +4078,13 @@ spec:
                                             May not contain the path element '..'.
                                             May not start with the string '..'.
                                           type: string
+                                        user:
+                                          description: |-
+                                            user is Optional: The owner UID of the created file.
+                                            If specified, the item-level user field takes precedence over defaultUser.
+                                            (Alpha) This field requires the AtomicWriteVolumeUserFields feature gate to be enabled.
+                                          format: int64
+                                          type: integer
                                       required:
                                         - key
                                         - path
@@ -3758,6 +4168,13 @@ spec:
                                       mode, like fsGroup, and the result can be other mode bits set.
                                     format: int32
                                     type: integer
+                                  defaultUser:
+                                    description: |-
+                                      defaultUser is Optional: The owner UID of the created files by default.
+                                      The defaultUser field is only used as a fallback when the item-level user field is unset.
+                                      (Alpha) This field requires the AtomicWriteVolumeUserFields feature gate to be enabled.
+                                    format: int64
+                                    type: integer
                                   items:
                                     description: Items is a list of downward API volume file
                                     items:
@@ -3811,6 +4228,13 @@ spec:
                                             - resource
                                           type: object
                                           x-kubernetes-map-type: atomic
+                                        user:
+                                          description: |-
+                                            user is Optional: The owner UID of the created file.
+                                            If specified, the item-level user field takes precedence over defaultUser.
+                                            (Alpha) This field requires the AtomicWriteVolumeUserFields feature gate to be enabled.
+                                          format: int64
+                                          type: integer
                                       required:
                                         - path
                                       type: object
@@ -3829,6 +4253,18 @@ spec:
                                       Must be an empty string (default) or Memory.
                                       More info: https://kubernetes.io/docs/concepts/storage/volumes#emptydir
                                     type: string
+                                  mode:
+                                    description: |-
+                                      mode specifies the permission bits for the emptyDir directory, in numeric
+                                      notation (e.g., 0755, 01777). Must be a value between 0000 and 01777.
+                                      If not specified, defaults to 0777.
+                                      This might be in conflict with other options that affect the file
+                                      mode, like fsGroup. If fsGroup is specified, the fsGroup permissions
+                                      will override the mode specified here.
+                                      This field has no effect on Windows.
+                                      This field is alpha and requires EmptyDirVolumeMode featuregate to be enabled.
+                                    format: int32
+                                    type: integer
                                   sizeLimit:
                                     anyOf:
                                       - type: integer
@@ -3922,8 +4358,8 @@ spec:
                                               * An existing PVC (PersistentVolumeClaim)
                                               If the provisioner or an external controller can support the specified data source,
                                               it will create a new volume based on the contents of the specified data source.
-                                              When the AnyVolumeDataSource feature gate is enabled, dataSource contents will be copied to dataSourceRef,
-                                              and dataSourceRef contents will be copied to dataSource when dataSourceRef.namespace is not specified.
+                                              dataSource contents will be copied to dataSourceRef, and dataSourceRef contents will be
+                                              copied to dataSource when dataSourceRef.namespace is not specified.
                                               If the namespace is specified, then dataSourceRef will not be copied to dataSource.
                                             properties:
                                               apiGroup:
@@ -3966,7 +4402,6 @@ spec:
                                                 specified.
                                               * While dataSource only allows local objects, dataSourceRef allows objects
                                                 in any namespaces.
-                                              (Beta) Using this field requires the AnyVolumeDataSource feature gate to be enabled.
                                               (Alpha) Using the namespace field of dataSourceRef requires the CrossNamespaceVolumeDataSource feature gate to be enabled.
                                             properties:
                                               apiGroup:
@@ -4313,7 +4748,7 @@ spec:
                                   A failure to resolve or pull the image during pod startup will block containers from starting and may add significant latency. Failures will be retried using normal volume backoff and will be reported on the pod reason and message.
                                   The types of objects that may be mounted by this volume are defined by the container runtime implementation on a host machine and at minimum must include all valid types supported by the container image field.
                                   The OCI object gets mounted in a single directory (spec.containers[*].volumeMounts.mountPath) by merging the manifest layers in the same way as for container images.
-                                  The volume will be mounted read-only (ro) and non-executable files (noexec).
+                                  The volume will be mounted read-only (ro).
                                   Sub path mounts for containers are not supported (spec.containers[*].volumeMounts.subpath) before 1.33.
                                   The field spec.securityContext.fsGroupChangePolicy has no effect on this volume type.
                                 properties:
@@ -4481,8 +4916,7 @@ spec:
                                 description: |-
                                   portworxVolume represents a portworx volume attached and mounted on kubelets host machine.
                                   Deprecated: PortworxVolume is deprecated. All operations for the in-tree portworxVolume type
-                                  are redirected to the pxd.portworx.com CSI driver when the CSIMigrationPortworx feature-gate
-                                  is on.
+                                  are redirected to the pxd.portworx.com CSI driver.
                                 properties:
                                   fsType:
                                     description: |-
@@ -4514,6 +4948,13 @@ spec:
                                       mode, like fsGroup, and the result can be other mode bits set.
                                     format: int32
                                     type: integer
+                                  defaultUser:
+                                    description: |-
+                                      defaultUser is Optional: The owner UID of the created files by default.
+                                      The defaultUser field is only used as a fallback when the item-level user field is unset.
+                                      (Alpha) This field requires the AtomicWriteVolumeUserFields feature gate to be enabled.
+                                    format: int64
+                                    type: integer
                                   sources:
                                     description: |-
                                       sources is the list of volume projections. Each entry in this list
@@ -4609,6 +5050,13 @@ spec:
                                                 Mutually-exclusive with name.  The contents of all selected
                                                 ClusterTrustBundles will be unified and deduplicated.
                                               type: string
+                                            user:
+                                              description: |-
+                                                user is Optional: The owner UID of the created file.
+                                                If specified, the item-level user field takes precedence over defaultUser.
+                                                (Alpha) This field requires the AtomicWriteVolumeUserFields feature gate to be enabled.
+                                              format: int64
+                                              type: integer
                                           required:
                                             - path
                                           type: object
@@ -4647,6 +5095,13 @@ spec:
                                                       May not contain the path element '..'.
                                                       May not start with the string '..'.
                                                     type: string
+                                                  user:
+                                                    description: |-
+                                                      user is Optional: The owner UID of the created file.
+                                                      If specified, the item-level user field takes precedence over defaultUser.
+                                                      (Alpha) This field requires the AtomicWriteVolumeUserFields feature gate to be enabled.
+                                                    format: int64
+                                                    type: integer
                                                 required:
                                                   - key
                                                   - path
@@ -4723,6 +5178,13 @@ spec:
                                                       - resource
                                                     type: object
                                                     x-kubernetes-map-type: atomic
+                                                  user:
+                                                    description: |-
+                                                      user is Optional: The owner UID of the created file.
+                                                      If specified, the item-level user field takes precedence over defaultUser.
+                                                      (Alpha) This field requires the AtomicWriteVolumeUserFields feature gate to be enabled.
+                                                    format: int64
+                                                    type: integer
                                                 required:
                                                   - path
                                                 type: object
@@ -4829,6 +5291,13 @@ spec:
                                             signerName:
                                               description: Kubelet's generated CSRs will be addressed to this signer.
                                               type: string
+                                            user:
+                                              description: |-
+                                                user is Optional: The owner UID of the created file.
+                                                If specified, the item-level user field takes precedence over defaultUser.
+                                                (Alpha) This field requires the AtomicWriteVolumeUserFields feature gate to be enabled.
+                                              format: int64
+                                              type: integer
                                             userAnnotations:
                                               additionalProperties:
                                                 type: string
@@ -4886,6 +5355,13 @@ spec:
                                                       May not contain the path element '..'.
                                                       May not start with the string '..'.
                                                     type: string
+                                                  user:
+                                                    description: |-
+                                                      user is Optional: The owner UID of the created file.
+                                                      If specified, the item-level user field takes precedence over defaultUser.
+                                                      (Alpha) This field requires the AtomicWriteVolumeUserFields feature gate to be enabled.
+                                                    format: int64
+                                                    type: integer
                                                 required:
                                                   - key
                                                   - path
@@ -4931,6 +5407,13 @@ spec:
                                                 path is the path relative to the mount point of the file to project the
                                                 token into.
                                               type: string
+                                            user:
+                                              description: |-
+                                                user is Optional: The owner UID of the created file.
+                                                If specified, the item-level user field takes precedence over defaultUser.
+                                                (Alpha) This field requires the AtomicWriteVolumeUserFields feature gate to be enabled.
+                                              format: int64
+                                              type: integer
                                           required:
                                             - path
                                           type: object
@@ -5131,6 +5614,13 @@ spec:
                                       mode, like fsGroup, and the result can be other mode bits set.
                                     format: int32
                                     type: integer
+                                  defaultUser:
+                                    description: |-
+                                      defaultUser is Optional: The owner UID of the created files by default.
+                                      The defaultUser field is only used as a fallback when the item-level user field is unset.
+                                      (Alpha) This field requires the AtomicWriteVolumeUserFields feature gate to be enabled.
+                                    format: int64
+                                    type: integer
                                   items:
                                     description: |-
                                       items If unspecified, each key-value pair in the Data field of the referenced
@@ -5163,6 +5653,13 @@ spec:
                                             May not contain the path element '..'.
                                             May not start with the string '..'.
                                           type: string
+                                        user:
+                                          description: |-
+                                            user is Optional: The owner UID of the created file.
+                                            If specified, the item-level user field takes precedence over defaultUser.
+                                            (Alpha) This field requires the AtomicWriteVolumeUserFields feature gate to be enabled.
+                                          format: int64
+                                          type: integer
                                       required:
                                         - key
                                         - path
@@ -6128,51 +6625,842 @@ spec:
                                   x-kubernetes-list-type: atomic
                               type: object
                           type: object
-                        extraArgs:
-                          description: |-
-                            ExtraArgs allows adding additional arguments to the Control Plane components,
-                            such as kube-apiserver, controller-manager, and scheduler. WARNING - This option
-                            can override existing parameters and cause components to misbehave in unxpected ways.
-                            Only modify if you know what you are doing.
+                        automountServiceAccountToken:
+                          description: AutomountServiceAccountToken allows to enable the automatic mounting of the service account token to the pods of the Control plane deployment
+                          type: boolean
+                        containerSecurityContexts:
+                          description: ContainerSecurityContexts allows to specify the security context for the individual control plane components.
                           properties:
                             apiServer:
-                              items:
-                                type: string
-                              type: array
-                            controllerManager:
-                              items:
-                                type: string
-                              type: array
-                            kine:
-                              description: Available only if Kamaji is running using Kine as backing storage.
-                              items:
-                                type: string
-                              type: array
-                            scheduler:
-                              items:
-                                type: string
-                              type: array
-                          type: object
-                        nodeSelector:
-                          additionalProperties:
-                            type: string
-                          description: |-
-                            NodeSelector is a selector which must be true for the pod to fit on a node.
-                            Selector which must match a node's labels for the pod to be scheduled on that node.
-                            More info: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/
-                          type: object
-                        podAdditionalMetadata:
-                          description: AdditionalMetadata defines which additional metadata, such as labels and annotations, must be attached to the created resource.
-                          properties:
-                            annotations:
-                              additionalProperties:
-                                type: string
-                              type: object
+                              description: APIServer defines the security context for the kube-apiserver container.
+                              properties:
+                                allowPrivilegeEscalation:
+                                  description: |-
+                                    AllowPrivilegeEscalation controls whether a process can gain more
+                                    privileges than its parent process. This bool directly controls if
+                                    the no_new_privs flag will be set on the container process.
+                                    AllowPrivilegeEscalation is true always when the container is:
+                                    1) run as Privileged
+                                    2) has CAP_SYS_ADMIN
+                                    Note that this field cannot be set when spec.os.name is windows.
+                                  type: boolean
+                                appArmorProfile:
+                                  description: |-
+                                    appArmorProfile is the AppArmor options to use by this container. If set, this profile
+                                    overrides the pod's appArmorProfile.
+                                    Note that this field cannot be set when spec.os.name is windows.
+                                  properties:
+                                    localhostProfile:
+                                      description: |-
+                                        localhostProfile indicates a profile loaded on the node that should be used.
+                                        The profile must be preconfigured on the node to work.
+                                        Must match the loaded name of the profile.
+                                        Must be set if and only if type is "Localhost".
+                                      type: string
+                                    type:
+                                      description: |-
+                                        type indicates which kind of AppArmor profile will be applied.
+                                        Valid options are:
+                                          Localhost - a profile pre-loaded on the node.
+                                          RuntimeDefault - the container runtime's default profile.
+                                          Unconfined - no AppArmor enforcement.
+                                      type: string
+                                  required:
+                                    - type
+                                  type: object
+                                capabilities:
+                                  description: |-
+                                    The capabilities to add/drop when running containers.
+                                    Defaults to the default set of capabilities granted by the container runtime.
+                                    Note that this field cannot be set when spec.os.name is windows.
+                                  properties:
+                                    add:
+                                      description: Added capabilities
+                                      items:
+                                        description: Capability represent POSIX capabilities type
+                                        type: string
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    drop:
+                                      description: Removed capabilities
+                                      items:
+                                        description: Capability represent POSIX capabilities type
+                                        type: string
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                  type: object
+                                privileged:
+                                  description: |-
+                                    Run container in privileged mode.
+                                    Processes in privileged containers are essentially equivalent to root on the host.
+                                    Defaults to false.
+                                    Note that this field cannot be set when spec.os.name is windows.
+                                  type: boolean
+                                procMount:
+                                  description: |-
+                                    procMount denotes the type of proc mount to use for the containers.
+                                    The default value is Default which uses the container runtime defaults for
+                                    readonly paths and masked paths.
+                                    Note that this field cannot be set when spec.os.name is windows.
+                                  type: string
+                                readOnlyRootFilesystem:
+                                  description: |-
+                                    Whether this container has a read-only root filesystem.
+                                    Default is false.
+                                    Note that this field cannot be set when spec.os.name is windows.
+                                  type: boolean
+                                runAsGroup:
+                                  description: |-
+                                    The GID to run the entrypoint of the container process.
+                                    Uses runtime default if unset.
+                                    May also be set in PodSecurityContext.  If set in both SecurityContext and
+                                    PodSecurityContext, the value specified in SecurityContext takes precedence.
+                                    Note that this field cannot be set when spec.os.name is windows.
+                                  format: int64
+                                  type: integer
+                                runAsNonRoot:
+                                  description: |-
+                                    Indicates that the container must run as a non-root user.
+                                    If true, the Kubelet will validate the image at runtime to ensure that it
+                                    does not run as UID 0 (root) and fail to start the container if it does.
+                                    If unset or false, no such validation will be performed.
+                                    May also be set in PodSecurityContext.  If set in both SecurityContext and
+                                    PodSecurityContext, the value specified in SecurityContext takes precedence.
+                                  type: boolean
+                                runAsUser:
+                                  description: |-
+                                    The UID to run the entrypoint of the container process.
+                                    Defaults to user specified in image metadata if unspecified.
+                                    May also be set in PodSecurityContext.  If set in both SecurityContext and
+                                    PodSecurityContext, the value specified in SecurityContext takes precedence.
+                                    Note that this field cannot be set when spec.os.name is windows.
+                                  format: int64
+                                  type: integer
+                                seLinuxOptions:
+                                  description: |-
+                                    The SELinux context to be applied to the container.
+                                    If unspecified, the container runtime will allocate a random SELinux context for each
+                                    container.  May also be set in PodSecurityContext.  If set in both SecurityContext and
+                                    PodSecurityContext, the value specified in SecurityContext takes precedence.
+                                    Note that this field cannot be set when spec.os.name is windows.
+                                  properties:
+                                    level:
+                                      description: Level is SELinux level label that applies to the container.
+                                      type: string
+                                    role:
+                                      description: Role is a SELinux role label that applies to the container.
+                                      type: string
+                                    type:
+                                      description: Type is a SELinux type label that applies to the container.
+                                      type: string
+                                    user:
+                                      description: User is a SELinux user label that applies to the container.
+                                      type: string
+                                  type: object
+                                seccompProfile:
+                                  description: |-
+                                    The seccomp options to use by this container. If seccomp options are
+                                    provided at both the pod & container level, the container options
+                                    override the pod options.
+                                    Note that this field cannot be set when spec.os.name is windows.
+                                  properties:
+                                    localhostProfile:
+                                      description: |-
+                                        localhostProfile indicates a profile defined in a file on the node should be used.
+                                        The profile must be preconfigured on the node to work.
+                                        Must be a descending path, relative to the kubelet's configured seccomp profile location.
+                                        Must be set if type is "Localhost". Must NOT be set for any other type.
+                                      type: string
+                                    type:
+                                      description: |-
+                                        type indicates which kind of seccomp profile will be applied.
+                                        Valid options are:
+
+                                        Localhost - a profile defined in a file on the node should be used.
+                                        RuntimeDefault - the container runtime default profile should be used.
+                                        Unconfined - no profile should be applied.
+                                      type: string
+                                  required:
+                                    - type
+                                  type: object
+                                windowsOptions:
+                                  description: |-
+                                    The Windows specific settings applied to all containers.
+                                    If unspecified, the options from the PodSecurityContext will be used.
+                                    If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence.
+                                    Note that this field cannot be set when spec.os.name is linux.
+                                  properties:
+                                    gmsaCredentialSpec:
+                                      description: |-
+                                        GMSACredentialSpec is where the GMSA admission webhook
+                                        (https://github.com/kubernetes-sigs/windows-gmsa) inlines the contents of the
+                                        GMSA credential spec named by the GMSACredentialSpecName field.
+                                      type: string
+                                    gmsaCredentialSpecName:
+                                      description: GMSACredentialSpecName is the name of the GMSA credential spec to use.
+                                      type: string
+                                    hostProcess:
+                                      description: |-
+                                        HostProcess determines if a container should be run as a 'Host Process' container.
+                                        All of a Pod's containers must have the same effective HostProcess value
+                                        (it is not allowed to have a mix of HostProcess containers and non-HostProcess containers).
+                                        In addition, if HostProcess is true then HostNetwork must also be set to true.
+                                      type: boolean
+                                    runAsUserName:
+                                      description: |-
+                                        The UserName in Windows to run the entrypoint of the container process.
+                                        Defaults to the user specified in image metadata if unspecified.
+                                        May also be set in PodSecurityContext. If set in both SecurityContext and
+                                        PodSecurityContext, the value specified in SecurityContext takes precedence.
+                                      type: string
+                                  type: object
+                              type: object
+                            controllerManager:
+                              description: ControllerManager defines the security context for the kube-controller-manager container.
+                              properties:
+                                allowPrivilegeEscalation:
+                                  description: |-
+                                    AllowPrivilegeEscalation controls whether a process can gain more
+                                    privileges than its parent process. This bool directly controls if
+                                    the no_new_privs flag will be set on the container process.
+                                    AllowPrivilegeEscalation is true always when the container is:
+                                    1) run as Privileged
+                                    2) has CAP_SYS_ADMIN
+                                    Note that this field cannot be set when spec.os.name is windows.
+                                  type: boolean
+                                appArmorProfile:
+                                  description: |-
+                                    appArmorProfile is the AppArmor options to use by this container. If set, this profile
+                                    overrides the pod's appArmorProfile.
+                                    Note that this field cannot be set when spec.os.name is windows.
+                                  properties:
+                                    localhostProfile:
+                                      description: |-
+                                        localhostProfile indicates a profile loaded on the node that should be used.
+                                        The profile must be preconfigured on the node to work.
+                                        Must match the loaded name of the profile.
+                                        Must be set if and only if type is "Localhost".
+                                      type: string
+                                    type:
+                                      description: |-
+                                        type indicates which kind of AppArmor profile will be applied.
+                                        Valid options are:
+                                          Localhost - a profile pre-loaded on the node.
+                                          RuntimeDefault - the container runtime's default profile.
+                                          Unconfined - no AppArmor enforcement.
+                                      type: string
+                                  required:
+                                    - type
+                                  type: object
+                                capabilities:
+                                  description: |-
+                                    The capabilities to add/drop when running containers.
+                                    Defaults to the default set of capabilities granted by the container runtime.
+                                    Note that this field cannot be set when spec.os.name is windows.
+                                  properties:
+                                    add:
+                                      description: Added capabilities
+                                      items:
+                                        description: Capability represent POSIX capabilities type
+                                        type: string
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    drop:
+                                      description: Removed capabilities
+                                      items:
+                                        description: Capability represent POSIX capabilities type
+                                        type: string
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                  type: object
+                                privileged:
+                                  description: |-
+                                    Run container in privileged mode.
+                                    Processes in privileged containers are essentially equivalent to root on the host.
+                                    Defaults to false.
+                                    Note that this field cannot be set when spec.os.name is windows.
+                                  type: boolean
+                                procMount:
+                                  description: |-
+                                    procMount denotes the type of proc mount to use for the containers.
+                                    The default value is Default which uses the container runtime defaults for
+                                    readonly paths and masked paths.
+                                    Note that this field cannot be set when spec.os.name is windows.
+                                  type: string
+                                readOnlyRootFilesystem:
+                                  description: |-
+                                    Whether this container has a read-only root filesystem.
+                                    Default is false.
+                                    Note that this field cannot be set when spec.os.name is windows.
+                                  type: boolean
+                                runAsGroup:
+                                  description: |-
+                                    The GID to run the entrypoint of the container process.
+                                    Uses runtime default if unset.
+                                    May also be set in PodSecurityContext.  If set in both SecurityContext and
+                                    PodSecurityContext, the value specified in SecurityContext takes precedence.
+                                    Note that this field cannot be set when spec.os.name is windows.
+                                  format: int64
+                                  type: integer
+                                runAsNonRoot:
+                                  description: |-
+                                    Indicates that the container must run as a non-root user.
+                                    If true, the Kubelet will validate the image at runtime to ensure that it
+                                    does not run as UID 0 (root) and fail to start the container if it does.
+                                    If unset or false, no such validation will be performed.
+                                    May also be set in PodSecurityContext.  If set in both SecurityContext and
+                                    PodSecurityContext, the value specified in SecurityContext takes precedence.
+                                  type: boolean
+                                runAsUser:
+                                  description: |-
+                                    The UID to run the entrypoint of the container process.
+                                    Defaults to user specified in image metadata if unspecified.
+                                    May also be set in PodSecurityContext.  If set in both SecurityContext and
+                                    PodSecurityContext, the value specified in SecurityContext takes precedence.
+                                    Note that this field cannot be set when spec.os.name is windows.
+                                  format: int64
+                                  type: integer
+                                seLinuxOptions:
+                                  description: |-
+                                    The SELinux context to be applied to the container.
+                                    If unspecified, the container runtime will allocate a random SELinux context for each
+                                    container.  May also be set in PodSecurityContext.  If set in both SecurityContext and
+                                    PodSecurityContext, the value specified in SecurityContext takes precedence.
+                                    Note that this field cannot be set when spec.os.name is windows.
+                                  properties:
+                                    level:
+                                      description: Level is SELinux level label that applies to the container.
+                                      type: string
+                                    role:
+                                      description: Role is a SELinux role label that applies to the container.
+                                      type: string
+                                    type:
+                                      description: Type is a SELinux type label that applies to the container.
+                                      type: string
+                                    user:
+                                      description: User is a SELinux user label that applies to the container.
+                                      type: string
+                                  type: object
+                                seccompProfile:
+                                  description: |-
+                                    The seccomp options to use by this container. If seccomp options are
+                                    provided at both the pod & container level, the container options
+                                    override the pod options.
+                                    Note that this field cannot be set when spec.os.name is windows.
+                                  properties:
+                                    localhostProfile:
+                                      description: |-
+                                        localhostProfile indicates a profile defined in a file on the node should be used.
+                                        The profile must be preconfigured on the node to work.
+                                        Must be a descending path, relative to the kubelet's configured seccomp profile location.
+                                        Must be set if type is "Localhost". Must NOT be set for any other type.
+                                      type: string
+                                    type:
+                                      description: |-
+                                        type indicates which kind of seccomp profile will be applied.
+                                        Valid options are:
+
+                                        Localhost - a profile defined in a file on the node should be used.
+                                        RuntimeDefault - the container runtime default profile should be used.
+                                        Unconfined - no profile should be applied.
+                                      type: string
+                                  required:
+                                    - type
+                                  type: object
+                                windowsOptions:
+                                  description: |-
+                                    The Windows specific settings applied to all containers.
+                                    If unspecified, the options from the PodSecurityContext will be used.
+                                    If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence.
+                                    Note that this field cannot be set when spec.os.name is linux.
+                                  properties:
+                                    gmsaCredentialSpec:
+                                      description: |-
+                                        GMSACredentialSpec is where the GMSA admission webhook
+                                        (https://github.com/kubernetes-sigs/windows-gmsa) inlines the contents of the
+                                        GMSA credential spec named by the GMSACredentialSpecName field.
+                                      type: string
+                                    gmsaCredentialSpecName:
+                                      description: GMSACredentialSpecName is the name of the GMSA credential spec to use.
+                                      type: string
+                                    hostProcess:
+                                      description: |-
+                                        HostProcess determines if a container should be run as a 'Host Process' container.
+                                        All of a Pod's containers must have the same effective HostProcess value
+                                        (it is not allowed to have a mix of HostProcess containers and non-HostProcess containers).
+                                        In addition, if HostProcess is true then HostNetwork must also be set to true.
+                                      type: boolean
+                                    runAsUserName:
+                                      description: |-
+                                        The UserName in Windows to run the entrypoint of the container process.
+                                        Defaults to the user specified in image metadata if unspecified.
+                                        May also be set in PodSecurityContext. If set in both SecurityContext and
+                                        PodSecurityContext, the value specified in SecurityContext takes precedence.
+                                      type: string
+                                  type: object
+                              type: object
+                            scheduler:
+                              description: Scheduler defines the security context for the kube-scheduler container.
+                              properties:
+                                allowPrivilegeEscalation:
+                                  description: |-
+                                    AllowPrivilegeEscalation controls whether a process can gain more
+                                    privileges than its parent process. This bool directly controls if
+                                    the no_new_privs flag will be set on the container process.
+                                    AllowPrivilegeEscalation is true always when the container is:
+                                    1) run as Privileged
+                                    2) has CAP_SYS_ADMIN
+                                    Note that this field cannot be set when spec.os.name is windows.
+                                  type: boolean
+                                appArmorProfile:
+                                  description: |-
+                                    appArmorProfile is the AppArmor options to use by this container. If set, this profile
+                                    overrides the pod's appArmorProfile.
+                                    Note that this field cannot be set when spec.os.name is windows.
+                                  properties:
+                                    localhostProfile:
+                                      description: |-
+                                        localhostProfile indicates a profile loaded on the node that should be used.
+                                        The profile must be preconfigured on the node to work.
+                                        Must match the loaded name of the profile.
+                                        Must be set if and only if type is "Localhost".
+                                      type: string
+                                    type:
+                                      description: |-
+                                        type indicates which kind of AppArmor profile will be applied.
+                                        Valid options are:
+                                          Localhost - a profile pre-loaded on the node.
+                                          RuntimeDefault - the container runtime's default profile.
+                                          Unconfined - no AppArmor enforcement.
+                                      type: string
+                                  required:
+                                    - type
+                                  type: object
+                                capabilities:
+                                  description: |-
+                                    The capabilities to add/drop when running containers.
+                                    Defaults to the default set of capabilities granted by the container runtime.
+                                    Note that this field cannot be set when spec.os.name is windows.
+                                  properties:
+                                    add:
+                                      description: Added capabilities
+                                      items:
+                                        description: Capability represent POSIX capabilities type
+                                        type: string
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    drop:
+                                      description: Removed capabilities
+                                      items:
+                                        description: Capability represent POSIX capabilities type
+                                        type: string
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                  type: object
+                                privileged:
+                                  description: |-
+                                    Run container in privileged mode.
+                                    Processes in privileged containers are essentially equivalent to root on the host.
+                                    Defaults to false.
+                                    Note that this field cannot be set when spec.os.name is windows.
+                                  type: boolean
+                                procMount:
+                                  description: |-
+                                    procMount denotes the type of proc mount to use for the containers.
+                                    The default value is Default which uses the container runtime defaults for
+                                    readonly paths and masked paths.
+                                    Note that this field cannot be set when spec.os.name is windows.
+                                  type: string
+                                readOnlyRootFilesystem:
+                                  description: |-
+                                    Whether this container has a read-only root filesystem.
+                                    Default is false.
+                                    Note that this field cannot be set when spec.os.name is windows.
+                                  type: boolean
+                                runAsGroup:
+                                  description: |-
+                                    The GID to run the entrypoint of the container process.
+                                    Uses runtime default if unset.
+                                    May also be set in PodSecurityContext.  If set in both SecurityContext and
+                                    PodSecurityContext, the value specified in SecurityContext takes precedence.
+                                    Note that this field cannot be set when spec.os.name is windows.
+                                  format: int64
+                                  type: integer
+                                runAsNonRoot:
+                                  description: |-
+                                    Indicates that the container must run as a non-root user.
+                                    If true, the Kubelet will validate the image at runtime to ensure that it
+                                    does not run as UID 0 (root) and fail to start the container if it does.
+                                    If unset or false, no such validation will be performed.
+                                    May also be set in PodSecurityContext.  If set in both SecurityContext and
+                                    PodSecurityContext, the value specified in SecurityContext takes precedence.
+                                  type: boolean
+                                runAsUser:
+                                  description: |-
+                                    The UID to run the entrypoint of the container process.
+                                    Defaults to user specified in image metadata if unspecified.
+                                    May also be set in PodSecurityContext.  If set in both SecurityContext and
+                                    PodSecurityContext, the value specified in SecurityContext takes precedence.
+                                    Note that this field cannot be set when spec.os.name is windows.
+                                  format: int64
+                                  type: integer
+                                seLinuxOptions:
+                                  description: |-
+                                    The SELinux context to be applied to the container.
+                                    If unspecified, the container runtime will allocate a random SELinux context for each
+                                    container.  May also be set in PodSecurityContext.  If set in both SecurityContext and
+                                    PodSecurityContext, the value specified in SecurityContext takes precedence.
+                                    Note that this field cannot be set when spec.os.name is windows.
+                                  properties:
+                                    level:
+                                      description: Level is SELinux level label that applies to the container.
+                                      type: string
+                                    role:
+                                      description: Role is a SELinux role label that applies to the container.
+                                      type: string
+                                    type:
+                                      description: Type is a SELinux type label that applies to the container.
+                                      type: string
+                                    user:
+                                      description: User is a SELinux user label that applies to the container.
+                                      type: string
+                                  type: object
+                                seccompProfile:
+                                  description: |-
+                                    The seccomp options to use by this container. If seccomp options are
+                                    provided at both the pod & container level, the container options
+                                    override the pod options.
+                                    Note that this field cannot be set when spec.os.name is windows.
+                                  properties:
+                                    localhostProfile:
+                                      description: |-
+                                        localhostProfile indicates a profile defined in a file on the node should be used.
+                                        The profile must be preconfigured on the node to work.
+                                        Must be a descending path, relative to the kubelet's configured seccomp profile location.
+                                        Must be set if type is "Localhost". Must NOT be set for any other type.
+                                      type: string
+                                    type:
+                                      description: |-
+                                        type indicates which kind of seccomp profile will be applied.
+                                        Valid options are:
+
+                                        Localhost - a profile defined in a file on the node should be used.
+                                        RuntimeDefault - the container runtime default profile should be used.
+                                        Unconfined - no profile should be applied.
+                                      type: string
+                                  required:
+                                    - type
+                                  type: object
+                                windowsOptions:
+                                  description: |-
+                                    The Windows specific settings applied to all containers.
+                                    If unspecified, the options from the PodSecurityContext will be used.
+                                    If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence.
+                                    Note that this field cannot be set when spec.os.name is linux.
+                                  properties:
+                                    gmsaCredentialSpec:
+                                      description: |-
+                                        GMSACredentialSpec is where the GMSA admission webhook
+                                        (https://github.com/kubernetes-sigs/windows-gmsa) inlines the contents of the
+                                        GMSA credential spec named by the GMSACredentialSpecName field.
+                                      type: string
+                                    gmsaCredentialSpecName:
+                                      description: GMSACredentialSpecName is the name of the GMSA credential spec to use.
+                                      type: string
+                                    hostProcess:
+                                      description: |-
+                                        HostProcess determines if a container should be run as a 'Host Process' container.
+                                        All of a Pod's containers must have the same effective HostProcess value
+                                        (it is not allowed to have a mix of HostProcess containers and non-HostProcess containers).
+                                        In addition, if HostProcess is true then HostNetwork must also be set to true.
+                                      type: boolean
+                                    runAsUserName:
+                                      description: |-
+                                        The UserName in Windows to run the entrypoint of the container process.
+                                        Defaults to the user specified in image metadata if unspecified.
+                                        May also be set in PodSecurityContext. If set in both SecurityContext and
+                                        PodSecurityContext, the value specified in SecurityContext takes precedence.
+                                      type: string
+                                  type: object
+                              type: object
+                          type: object
+                        extraArgs:
+                          description: |-
+                            ExtraArgs allows adding additional arguments to the Control Plane components,
+                            such as kube-apiserver, controller-manager, and scheduler. WARNING - This option
+                            can override existing parameters and cause components to misbehave in unxpected ways.
+                            Only modify if you know what you are doing.
+                          properties:
+                            apiServer:
+                              items:
+                                type: string
+                              type: array
+                            controllerManager:
+                              description: |-
+                                ControllerManager extra args. Kamaji sets --bind-address to the IPv6 wildcard "::"
+                                (which also serves IPv4 on a dual-stack pod); on hosts with IPv6 disabled in the
+                                kernel, override it to "0.0.0.0" here.
+                              items:
+                                type: string
+                              type: array
+                            kine:
+                              description: Available only if Kamaji is running using Kine as backing storage.
+                              items:
+                                type: string
+                              type: array
+                            scheduler:
+                              description: |-
+                                Scheduler extra args. Kamaji sets --bind-address to the IPv6 wildcard "::"
+                                (which also serves IPv4 on a dual-stack pod); on hosts with IPv6 disabled in the
+                                kernel, override it to "0.0.0.0" here.
+                              items:
+                                type: string
+                              type: array
+                          type: object
+                        nodeSelector:
+                          additionalProperties:
+                            type: string
+                          description: |-
+                            NodeSelector is a selector which must be true for the pod to fit on a node.
+                            Selector which must match a node's labels for the pod to be scheduled on that node.
+                            More info: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/
+                          type: object
+                        podAdditionalMetadata:
+                          description: AdditionalMetadata defines which additional metadata, such as labels and annotations, must be attached to the created resource.
+                          properties:
+                            annotations:
+                              additionalProperties:
+                                type: string
+                              type: object
                             labels:
                               additionalProperties:
                                 type: string
                               type: object
                           type: object
+                        podSecurityContext:
+                          description: PodSecurityContext allows to specify the security context for the control plane pod.
+                          properties:
+                            appArmorProfile:
+                              description: |-
+                                appArmorProfile is the AppArmor options to use by the containers in this pod.
+                                Note that this field cannot be set when spec.os.name is windows.
+                              properties:
+                                localhostProfile:
+                                  description: |-
+                                    localhostProfile indicates a profile loaded on the node that should be used.
+                                    The profile must be preconfigured on the node to work.
+                                    Must match the loaded name of the profile.
+                                    Must be set if and only if type is "Localhost".
+                                  type: string
+                                type:
+                                  description: |-
+                                    type indicates which kind of AppArmor profile will be applied.
+                                    Valid options are:
+                                      Localhost - a profile pre-loaded on the node.
+                                      RuntimeDefault - the container runtime's default profile.
+                                      Unconfined - no AppArmor enforcement.
+                                  type: string
+                              required:
+                                - type
+                              type: object
+                            fsGroup:
+                              description: |-
+                                A special supplemental group that applies to all containers in a pod.
+                                Some volume types allow the Kubelet to change the ownership of that volume
+                                to be owned by the pod:
+
+                                1. The owning GID will be the FSGroup
+                                2. The setgid bit is set (new files created in the volume will be owned by FSGroup)
+                                3. The permission bits are OR'd with rw-rw----
+
+                                If unset, the Kubelet will not modify the ownership and permissions of any volume.
+                                Note that this field cannot be set when spec.os.name is windows.
+                              format: int64
+                              type: integer
+                            fsGroupChangePolicy:
+                              description: |-
+                                fsGroupChangePolicy defines behavior of changing ownership and permission of the volume
+                                before being exposed inside Pod. This field will only apply to
+                                volume types which support fsGroup based ownership(and permissions).
+                                It will have no effect on ephemeral volume types such as: secret, configmaps
+                                and emptydir.
+                                Valid values are "OnRootMismatch" and "Always". If not specified, "Always" is used.
+                                Note that this field cannot be set when spec.os.name is windows.
+                              type: string
+                            runAsGroup:
+                              description: |-
+                                The GID to run the entrypoint of the container process.
+                                Uses runtime default if unset.
+                                May also be set in SecurityContext.  If set in both SecurityContext and
+                                PodSecurityContext, the value specified in SecurityContext takes precedence
+                                for that container.
+                                Note that this field cannot be set when spec.os.name is windows.
+                              format: int64
+                              type: integer
+                            runAsNonRoot:
+                              description: |-
+                                Indicates that the container must run as a non-root user.
+                                If true, the Kubelet will validate the image at runtime to ensure that it
+                                does not run as UID 0 (root) and fail to start the container if it does.
+                                If unset or false, no such validation will be performed.
+                                May also be set in SecurityContext.  If set in both SecurityContext and
+                                PodSecurityContext, the value specified in SecurityContext takes precedence.
+                              type: boolean
+                            runAsUser:
+                              description: |-
+                                The UID to run the entrypoint of the container process.
+                                Defaults to user specified in image metadata if unspecified.
+                                May also be set in SecurityContext.  If set in both SecurityContext and
+                                PodSecurityContext, the value specified in SecurityContext takes precedence
+                                for that container.
+                                Note that this field cannot be set when spec.os.name is windows.
+                              format: int64
+                              type: integer
+                            seLinuxChangePolicy:
+                              description: |-
+                                seLinuxChangePolicy defines how the container's SELinux label is applied to all volumes used by the Pod.
+                                It has no effect on nodes that do not support SELinux or to volumes does not support SELinux.
+                                Valid values are "MountOption" and "Recursive".
+
+                                "Recursive" means relabeling of all files on all Pod volumes by the container runtime.
+                                This may be slow for large volumes, but allows mixing privileged and unprivileged Pods sharing the same volume on the same node.
+
+                                "MountOption" mounts all eligible Pod volumes with `-o context` mount option.
+                                This requires all Pods that share the same volume to use the same SELinux label.
+                                It is not possible to share the same volume among privileged and unprivileged Pods.
+                                Eligible volumes are in-tree FibreChannel and iSCSI volumes, and all CSI volumes
+                                whose CSI driver announces SELinux support by setting spec.seLinuxMount: true in their
+                                CSIDriver instance. Other volumes are always re-labelled recursively.
+
+                                If not specified, "MountOption" is used.
+
+                                This field affects only Pods that have SELinux label set, either in PodSecurityContext or in SecurityContext of all containers.
+
+                                All Pods that use the same volume should use the same seLinuxChangePolicy, otherwise some pods can get stuck in ContainerCreating state.
+                                Note that this field cannot be set when spec.os.name is windows.
+                              type: string
+                            seLinuxOptions:
+                              description: |-
+                                The SELinux context to be applied to all containers.
+                                If unspecified, the container runtime will allocate a random SELinux context for each
+                                container.  May also be set in SecurityContext.  If set in
+                                both SecurityContext and PodSecurityContext, the value specified in SecurityContext
+                                takes precedence for that container.
+                                Note that this field cannot be set when spec.os.name is windows.
+                              properties:
+                                level:
+                                  description: Level is SELinux level label that applies to the container.
+                                  type: string
+                                role:
+                                  description: Role is a SELinux role label that applies to the container.
+                                  type: string
+                                type:
+                                  description: Type is a SELinux type label that applies to the container.
+                                  type: string
+                                user:
+                                  description: User is a SELinux user label that applies to the container.
+                                  type: string
+                              type: object
+                            seccompProfile:
+                              description: |-
+                                The seccomp options to use by the containers in this pod.
+                                Note that this field cannot be set when spec.os.name is windows.
+                              properties:
+                                localhostProfile:
+                                  description: |-
+                                    localhostProfile indicates a profile defined in a file on the node should be used.
+                                    The profile must be preconfigured on the node to work.
+                                    Must be a descending path, relative to the kubelet's configured seccomp profile location.
+                                    Must be set if type is "Localhost". Must NOT be set for any other type.
+                                  type: string
+                                type:
+                                  description: |-
+                                    type indicates which kind of seccomp profile will be applied.
+                                    Valid options are:
+
+                                    Localhost - a profile defined in a file on the node should be used.
+                                    RuntimeDefault - the container runtime default profile should be used.
+                                    Unconfined - no profile should be applied.
+                                  type: string
+                              required:
+                                - type
+                              type: object
+                            supplementalGroups:
+                              description: |-
+                                A list of groups applied to the first process run in each container, in
+                                addition to the container's primary GID and fsGroup (if specified).  If
+                                the SupplementalGroupsPolicy feature is enabled, the
+                                supplementalGroupsPolicy field determines whether these are in addition
+                                to or instead of any group memberships defined in the container image.
+                                If unspecified, no additional groups are added, though group memberships
+                                defined in the container image may still be used, depending on the
+                                supplementalGroupsPolicy field.
+                                Note that this field cannot be set when spec.os.name is windows.
+                              items:
+                                format: int64
+                                type: integer
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            supplementalGroupsPolicy:
+                              description: |-
+                                Defines how supplemental groups of the first container processes are calculated.
+                                Valid values are "Merge" and "Strict". If not specified, "Merge" is used.
+                                (Alpha) Using the field requires the SupplementalGroupsPolicy feature gate to be enabled
+                                and the container runtime must implement support for this feature.
+                                Note that this field cannot be set when spec.os.name is windows.
+                              type: string
+                            sysctls:
+                              description: |-
+                                Sysctls hold a list of namespaced sysctls used for the pod. Pods with unsupported
+                                sysctls (by the container runtime) might fail to launch.
+                                Note that this field cannot be set when spec.os.name is windows.
+                              items:
+                                description: Sysctl defines a kernel parameter to be set
+                                properties:
+                                  name:
+                                    description: Name of a property to set
+                                    type: string
+                                  value:
+                                    description: Value of a property to set
+                                    type: string
+                                required:
+                                  - name
+                                  - value
+                                type: object
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            windowsOptions:
+                              description: |-
+                                The Windows specific settings applied to all containers.
+                                If unspecified, the options within a container's SecurityContext will be used.
+                                If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence.
+                                Note that this field cannot be set when spec.os.name is linux.
+                              properties:
+                                gmsaCredentialSpec:
+                                  description: |-
+                                    GMSACredentialSpec is where the GMSA admission webhook
+                                    (https://github.com/kubernetes-sigs/windows-gmsa) inlines the contents of the
+                                    GMSA credential spec named by the GMSACredentialSpecName field.
+                                  type: string
+                                gmsaCredentialSpecName:
+                                  description: GMSACredentialSpecName is the name of the GMSA credential spec to use.
+                                  type: string
+                                hostProcess:
+                                  description: |-
+                                    HostProcess determines if a container should be run as a 'Host Process' container.
+                                    All of a Pod's containers must have the same effective HostProcess value
+                                    (it is not allowed to have a mix of HostProcess containers and non-HostProcess containers).
+                                    In addition, if HostProcess is true then HostNetwork must also be set to true.
+                                  type: boolean
+                                runAsUserName:
+                                  description: |-
+                                    The UserName in Windows to run the entrypoint of the container process.
+                                    Defaults to the user specified in image metadata if unspecified.
+                                    May also be set in PodSecurityContext. If set in both SecurityContext and
+                                    PodSecurityContext, the value specified in SecurityContext takes precedence.
+                                  type: string
+                              type: object
+                          type: object
                         probes:
                           description: |-
                             Probes defines the probe configuration for the Control Plane components
@@ -6405,7 +7693,7 @@ spec:
                                   type: integer
                               type: object
                             readiness:
-                              description: Readiness defines default parameters for the readiness probe of kube-apiserver.
+                              description: Readiness defines default parameters for readiness probes of all Control Plane components.
                               properties:
                                 failureThreshold:
                                   description: FailureThreshold is the consecutive failure count required to consider the probe failed.
@@ -7383,6 +8671,46 @@ spec:
                               - targetPort
                             type: object
                           type: array
+                        allocateLoadBalancerNodePorts:
+                          description: |-
+                            AllocateLoadBalancerNodePorts defines whether NodePorts are automatically allocated
+                            for the Service when serviceType is LoadBalancer. It maps directly to the Service's
+                            spec.allocateLoadBalancerNodePorts. When nil, the Kubernetes default (true) applies,
+                            preserving existing behaviour. Set to false to expose the Tenant Control Plane only
+                            via the LoadBalancer IP and ClusterIP, without a per-node NodePort. This field is only
+                            valid when serviceType is LoadBalancer; setting it with any other serviceType is
+                            rejected by validation.
+                          type: boolean
+                        ipFamilies:
+                          description: |-
+                            IPFamilies maps directly to the generated Service's spec.ipFamilies. Order is
+                            significant: the first entry is the primary family. When empty, the management
+                            cluster default applies. A Service's IP families cannot be reduced or swapped
+                            after creation (only a single-stack Service may be upgraded to dual-stack);
+                            forbidden transitions are rejected by the API server and surface as a reconcile error.
+                          items:
+                            description: |-
+                              IPFamily represents the IP Family (IPv4 or IPv6). This type is used
+                              to express the family of an IP expressed by a type (e.g. service.spec.ipFamilies).
+                            enum:
+                              - IPv4
+                              - IPv6
+                            type: string
+                          maxItems: 2
+                          type: array
+                        ipFamilyPolicy:
+                          description: |-
+                            IPFamilyPolicy maps directly to the generated Service's spec.ipFamilyPolicy.
+                            When nil, the management cluster default applies, preserving existing behaviour.
+                            PreferDualStack and RequireDualStack describe a dual-stack Service and expect
+                            two entries in ipFamilies; a RequireDualStack policy that cannot be satisfied
+                            (for example with a single family) is rejected by the API server and surfaces
+                            as a reconcile error.
+                          enum:
+                            - SingleStack
+                            - PreferDualStack
+                            - RequireDualStack
+                          type: string
                         serviceType:
                           description: ServiceType allows specifying how to expose the Tenant Control Plane.
                           enum:
@@ -7568,9 +8896,13 @@ spec:
                               - InternalDNS
                               - ExternalDNS
                             type: string
+                          maxItems: 5
                           minItems: 1
                           type: array
-                          x-kubernetes-list-type: set
+                          x-kubernetes-list-type: atomic
+                          x-kubernetes-validations:
+                            - message: preferredAddressTypes entries must be unique
+                              rule: self.all(x, self.exists_one(y, y == x))
                       type: object
                     version:
                       description: Kubernetes Version for the tenant control plane
@@ -7587,6 +8919,22 @@ spec:
                         Address where API server will be exposed.
                         In the case of LoadBalancer Service, this can be empty in order to use the exposed IP provided by the cloud controller manager.
                       type: string
+                    advertiseAddress:
+                      description: |-
+                        AdvertiseAddress is the IP address advertised to tenant-side consumers (workers, konnectivity).
+                        It is passed to the API server's --advertise-address flag and used for the kubeadm
+                        ControlPlaneEndpoint, cluster-info, and admin.conf; when set, the management address is used
+                        for CAPI and status reporting. Both addresses are included in the API server certificate SANs.
+
+                        This must be an IP address, not a DNS name: --advertise-address and the in-tenant "kubernetes"
+                        Service endpoints only accept IPs. To expose the control plane under a hostname, point a DNS
+                        record at a stable VIP and add the hostname to networkProfile.certSANs; for L7/hostname exposure
+                        see spec.controlPlane.ingress / spec.controlPlane.gateway (mind the TLS-passthrough caveats for
+                        client-certificate authentication).
+                      type: string
+                      x-kubernetes-validations:
+                        - message: advertiseAddress must be a valid IP address
+                          rule: self == '' || isIP(self)
                     allowAddressAsExternalIP:
                       description: |-
                         AllowAddressAsExternalIP will include tenantControlPlane.Spec.NetworkProfile.Address in the section of
@@ -7644,11 +8992,28 @@ spec:
                           rule: self.all(r, isCIDR(r))
                     podCidr:
                       default: 10.244.0.0/16
-                      description: 'CIDR for Kubernetes Pods: if empty, defaulted to 10.244.0.0/16.'
+                      description: |-
+                        CIDR for Kubernetes Pods: if empty, defaulted to 10.244.0.0/16.
+                        Deprecated: use PodCIDRs instead.
                       type: string
                       x-kubernetes-validations:
                         - message: podCidr must be empty or a valid CIDR
                           rule: self == '' || isCIDR(self)
+                    podCidrs:
+                      description: |-
+                        PodCIDRs defines one or more CIDRs for Kubernetes Pods.
+                        Supports single-stack and dual-stack configurations.
+                        When specified, this field takes precedence over PodCIDR.
+                      items:
+                        type: string
+                      maxItems: 2
+                      minItems: 1
+                      type: array
+                      x-kubernetes-validations:
+                        - message: all podCidrs entries must be valid CIDRs
+                          rule: self.all(x, isCIDR(x))
+                        - message: podCidrs must not contain two CIDRs of the same IP family
+                          rule: size(self) < 2 || cidr(self[0]).ip().family() != cidr(self[1]).ip().family()
                     port:
                       default: 6443
                       description: Port where API server will be exposed
@@ -7656,15 +9021,29 @@ spec:
                       type: integer
                     serviceCidr:
                       default: 10.96.0.0/16
-                      description: 'CIDR for Kubernetes Services: if empty, defaulted to 10.96.0.0/16.'
+                      description: |-
+                        CIDR for Kubernetes Services: if empty, defaulted to 10.96.0.0/16.
+                        Deprecated: use ServiceCIDRs instead.
                       type: string
                       x-kubernetes-validations:
                         - message: serviceCidr must be empty or a valid CIDR
                           rule: self == '' || isCIDR(self)
+                    serviceCidrs:
+                      description: |-
+                        Service CIDRs for Kubernetes Services.
+                        Supports single-stack and dual-stack configurations.
+                        When specified, this field takes precedence over ServiceCIDR.
+                      items:
+                        type: string
+                      maxItems: 2
+                      minItems: 1
+                      type: array
+                      x-kubernetes-validations:
+                        - message: all serviceCidrs entries must be valid CIDRs
+                          rule: self.all(x, isCIDR(x))
+                        - message: serviceCidrs must not contain two CIDRs of the same IP family
+                          rule: size(self) < 2 || cidr(self[0]).ip().family() != cidr(self[1]).ip().family()
                   type: object
-                  x-kubernetes-validations:
-                    - message: all DNS service IPs must be part of the Service CIDR
-                      rule: '!has(self.dnsServiceIPs) || self.dnsServiceIPs.all(r, cidr(self.serviceCidr).containsIP(r))'
                 writePermissions:
                   description: |-
                     WritePermissions allows to select which operations (create, delete, update) must be blocked:
@@ -7696,8 +9075,14 @@ spec:
                   rule: '!has(self.networkProfile.loadBalancerSourceRanges) || (size(self.networkProfile.loadBalancerSourceRanges) == 0 || self.controlPlane.service.serviceType == ''LoadBalancer'')'
                 - message: LoadBalancerClass is supported only with LoadBalancer service type
                   rule: '!has(self.networkProfile.loadBalancerClass) || self.controlPlane.service.serviceType == ''LoadBalancer'''
+                - message: allocateLoadBalancerNodePorts is supported only with LoadBalancer service type
+                  rule: '!has(self.controlPlane.service.allocateLoadBalancerNodePorts) || self.controlPlane.service.serviceType == ''LoadBalancer'''
                 - message: LoadBalancerClass cannot be set or unset at runtime
                   rule: self.controlPlane.service.serviceType != 'LoadBalancer' || (oldSelf.controlPlane.service.serviceType != 'LoadBalancer' && self.controlPlane.service.serviceType == 'LoadBalancer') || has(self.networkProfile.loadBalancerClass) == has(oldSelf.networkProfile.loadBalancerClass)
+                - message: ipFamilies must contain at most one entry when ipFamilyPolicy is SingleStack
+                  rule: '!has(self.controlPlane.service.ipFamilyPolicy) || self.controlPlane.service.ipFamilyPolicy != ''SingleStack'' || !has(self.controlPlane.service.ipFamilies) || size(self.controlPlane.service.ipFamilies) <= 1'
+                - message: ipFamilies entries must be unique
+                  rule: '!has(self.controlPlane.service.ipFamilies) || size(self.controlPlane.service.ipFamilies) < 2 || self.controlPlane.service.ipFamilies[0] != self.controlPlane.service.ipFamilies[1]'
             status:
               description: TenantControlPlaneStatus defines the observed state of TenantControlPlane.
               properties:
@@ -7868,7 +9253,7 @@ spec:
 
                                       * The Route refers to a nonexistent parent.
                                       * The Route is of a type that the controller does not support.
-                                      * The Route is in a namespace the controller does not have access to.
+                                      * The Route is in a namespace to which the controller does not have access.
 
                                       <gateway:util:excludeFromCRD>
 
@@ -8531,10 +9916,9 @@ spec:
                               type:
                                 description: Type of deployment condition.
                                 type: string
+                            type: object
                             required:
-                              - status
                               - type
-                            type: object
                           type: array
                           x-kubernetes-list-map-keys:
                             - type
@@ -8694,7 +10078,7 @@ spec:
 
                                   * The Route refers to a nonexistent parent.
                                   * The Route is of a type that the controller does not support.
-                                  * The Route is in a namespace the controller does not have access to.
+                                  * The Route is in a namespace to which the controller does not have access.
 
                                   <gateway:util:excludeFromCRD>
 
diff --git a/packages/system/kamaji/charts/kamaji/templates/certmanager_certificate.yaml b/packages/system/kamaji/charts/kamaji/templates/certmanager_certificate.yaml
index 2f310b16f9..84fb7cb5dc 100644
--- a/packages/system/kamaji/charts/kamaji/templates/certmanager_certificate.yaml
+++ b/packages/system/kamaji/charts/kamaji/templates/certmanager_certificate.yaml
@@ -1,3 +1,12 @@
+{{- $issuerRef := (.Values.certManager | default dict).issuerRef | default dict }}
+{{- $issuerName := "kamaji-selfsigned-issuer" }}
+{{- $issuerKind := "Issuer" }}
+{{- $issuerGroup := "cert-manager.io" }}
+{{- if $issuerRef.name }}
+{{- $issuerName = $issuerRef.name }}
+{{- $issuerKind = $issuerRef.kind | default $issuerKind }}
+{{- $issuerGroup = $issuerRef.group | default $issuerGroup }}
+{{- end }}
 apiVersion: cert-manager.io/v1
 kind: Certificate
 metadata:
@@ -11,6 +20,7 @@ spec:
     - {{ include "kamaji.webhookServiceName" . }}.{{ .Release.Namespace }}.svc
     - {{ include "kamaji.webhookServiceName" . }}.{{ .Release.Namespace }}.svc.cluster.local
   issuerRef:
-    kind: Issuer
-    name: kamaji-selfsigned-issuer
-  secretName: {{ include "kamaji.webhookSecretName" . }}
\ No newline at end of file
+    kind: {{ $issuerKind | quote }}
+    name: {{ $issuerName | quote }}
+    group: {{ $issuerGroup | quote }}
+  secretName: {{ include "kamaji.webhookSecretName" . }}
diff --git a/packages/system/kamaji/charts/kamaji/templates/certmanager_issuer.yaml b/packages/system/kamaji/charts/kamaji/templates/certmanager_issuer.yaml
index 1bc3cbb6d2..6472f989fd 100644
--- a/packages/system/kamaji/charts/kamaji/templates/certmanager_issuer.yaml
+++ b/packages/system/kamaji/charts/kamaji/templates/certmanager_issuer.yaml
@@ -1,3 +1,15 @@
+{{- $issuerRef := (.Values.certManager | default dict).issuerRef | default dict }}
+{{- $etcd := (index .Values "kamaji-etcd") | default dict }}
+{{- $etcdCertManager := $etcd.certManager | default dict }}
+{{- $etcdIssuerRef := $etcdCertManager.issuerRef | default dict }}
+{{/*
+kamaji-etcd carries its own issuerRef and cannot be pointed at another issuer from here, because a
+parent chart cannot set the values of a subchart conditionally. Keep the self-signed issuer as long
+as either the webhook certificate or kamaji-etcd refers to it, so that configuring certManager.issuerRef
+never leaves kamaji-etcd without an issuer.
+*/}}
+{{- $etcdNeedsSelfSigned := and $etcd.deploy $etcdCertManager.enabled (eq ($etcdIssuerRef.name | default "") "kamaji-selfsigned-issuer") }}
+{{- if or (not $issuerRef.name) $etcdNeedsSelfSigned }}
 apiVersion: cert-manager.io/v1
 kind: Issuer
 metadata:
@@ -7,4 +19,5 @@ metadata:
   name: kamaji-selfsigned-issuer
   namespace: {{ .Release.Namespace }}
 spec:
-  selfSigned: {}
\ No newline at end of file
+  selfSigned: {}
+{{- end }}
diff --git a/packages/system/kamaji/charts/kamaji/values.yaml b/packages/system/kamaji/charts/kamaji/values.yaml
index 0e99af10c5..22b1e28891 100644
--- a/packages/system/kamaji/charts/kamaji/values.yaml
+++ b/packages/system/kamaji/charts/kamaji/values.yaml
@@ -98,12 +98,32 @@ loggingDevel:
 # -- If specified, all the Kamaji instances with an unassigned DataStore will inherit this default value.
 defaultDatastoreName: default
 
+certManager:
+  # -- Reference to an existing cert-manager issuer that signs the webhook serving certificate. When
+  # `name` is empty the chart creates a self-signed `Issuer` named `kamaji-selfsigned-issuer` and uses
+  # that. Set this to chain the webhook certificate to a certificate authority you own. `kind` defaults
+  # to `Issuer` and `group` to `cert-manager.io`. Note that the `kamaji-etcd` subchart has its own
+  # `kamaji-etcd.certManager.issuerRef`, which defaults to `kamaji-selfsigned-issuer` and has to be
+  # updated as well when the etcd certificates are issued by cert-manager.
+  issuerRef: {}
+    # name: my-issuer
+    # kind: ClusterIssuer
+    # group: cert-manager.io
+
 # -- Subchart: See https://github.com/clastix/kamaji-etcd/blob/master/charts/kamaji-etcd/values.yaml
 kamaji-etcd:
   deploy: true
   fullnameOverride: kamaji-etcd
   ## -- Important, this must match your management cluster's clusterDomain, otherwise the init jobs will fail
   clusterDomain: "cluster.local"
+  selfSignedCertificates:
+    enabled: false
+  certManager:
+    enabled: true
+    issuerRef:
+      name: kamaji-selfsigned-issuer
+      kind: Issuer
+      group: cert-manager.io
   datastore:
     enabled: true
     name: default
diff --git a/packages/system/kamaji/images/kamaji/Dockerfile b/packages/system/kamaji/images/kamaji/Dockerfile
index 4dd0bb3ffa..29adc7cb89 100644
--- a/packages/system/kamaji/images/kamaji/Dockerfile
+++ b/packages/system/kamaji/images/kamaji/Dockerfile
@@ -1,7 +1,8 @@
 # Build the manager binary
-FROM golang:1.26 AS builder
+FROM --platform=$BUILDPLATFORM golang:1.27@sha256:3680233e3204827fbdc66088528ae6d4b3d034f51d03a99d454f6de034888244 AS builder
+ARG GOPROXY
 
-ARG VERSION=26.3.5-edge
+ARG VERSION=26.9.4-edge
 ARG TARGETOS
 ARG TARGETARCH
 
@@ -12,13 +13,24 @@ RUN curl -sSL https://github.com/clastix/kamaji/archive/refs/tags/${VERSION}.tar
 COPY patches /patches
 RUN git apply /patches/*.diff
 
+# go build never compiles a _test.go, so nothing else runs the tests of the
+# packages the patches touch. Each package is tested from its own directory:
+# that finds the module it belongs to, and an empty list runs nothing.
+# The list is read into a variable first: a for loop drops the exit status
+# of a command substitution, so a patch git cannot read would leave the list
+# empty and the step green.
+RUN files=$(git apply --numstat /patches/*.diff) || exit 1; \
+    for dir in $(printf '%s\n' "$files" | cut -f3 | grep '\.go$' | xargs -r -n1 dirname | sort -u); do \
+      (cd "$dir" && go test .) || exit 1; \
+    done
+
 RUN GOOS=$TARGETOS GOARCH=$TARGETARCH CGO_ENABLED=0 go build \
     -ldflags "-X github.com/clastix/kamaji/internal.GitRepo=$GIT_REPO -X github.com/clastix/kamaji/internal.GitTag=$GIT_LAST_TAG -X github.com/clastix/kamaji/internal.GitCommit=$GIT_HEAD_COMMIT -X github.com/clastix/kamaji/internal.GitDirty=$GIT_MODIFIED -X github.com/clastix/kamaji/internal.BuildTime=$BUILD_DATE" \
     -a -o kamaji main.go
 
 # Use distroless as minimal base image to package the manager binary
 # Refer to https://github.com/GoogleContainerTools/distroless for more details
-FROM gcr.io/distroless/static:nonroot
+FROM gcr.io/distroless/static:nonroot@sha256:e2e927ec666bae08560abb3c55d0659eceabb657f56b6782ab500a9fc7f555e3
 WORKDIR /
 COPY --from=builder /workspace/kamaji .
 USER 65532:65532
diff --git a/packages/system/kamaji/images/kamaji/patches/fix-gateway-discovery-once.diff b/packages/system/kamaji/images/kamaji/patches/fix-gateway-discovery-once.diff
new file mode 100644
index 0000000000..ffa45633a4
--- /dev/null
+++ b/packages/system/kamaji/images/kamaji/patches/fix-gateway-discovery-once.diff
@@ -0,0 +1,375 @@
+diff --git a/cmd/manager/cmd.go b/cmd/manager/cmd.go
+index b4e8f20..ec346cd 100644
+--- a/cmd/manager/cmd.go
++++ b/cmd/manager/cmd.go
+@@ -155,6 +155,16 @@ func NewCmd(scheme *runtime.Scheme) *cobra.Command {
+ 				return err
+ 			}
+ 
++			// Resolved once for the process lifetime, so a discovery error must not be read as "not installed".
++			gatewayAPIAvailable, err := utilities.GatewayAPIResourcesAvailable(ctx, discoveryClient)
++			if err != nil {
++				setupLog.Error(err, "unable to discover Gateway API availability")
++
++				return err
++			}
++
++			setupLog.Info("Gateway API availability resolved", "available", gatewayAPIAvailable)
++
+ 			reconciler := &controllers.TenantControlPlaneReconciler{
+ 				Client:    mgr.GetClient(),
+ 				APIReader: mgr.GetAPIReader(),
+@@ -174,7 +184,7 @@ func NewCmd(scheme *runtime.Scheme) *cobra.Command {
+ 				KamajiMigrateImage:      migrateJobImage,
+ 				KamajiMigrateCABundle:   webhookCABundle,
+ 				MaxConcurrentReconciles: maxConcurrentReconciles,
+-				DiscoveryClient:         discoveryClient,
++				GatewayAPIAvailable:     gatewayAPIAvailable,
+ 			}
+ 
+ 			if err = reconciler.SetupWithManager(ctx, mgr); err != nil {
+@@ -228,7 +238,7 @@ func NewCmd(scheme *runtime.Scheme) *cobra.Command {
+ 			}
+ 
+ 			// Only requires to look for the core api group.
+-			if utilities.AreGatewayResourcesAvailable(ctx, mgr.GetClient(), discoveryClient) {
++			if gatewayAPIAvailable {
+ 				if err = (&kamajiv1alpha1.GatewayListener{}).SetupWithManager(ctx, mgr); err != nil {
+ 					setupLog.Error(err, "unable to create indexer", "indexer", "GatewayListener")
+ 
+@@ -265,8 +275,9 @@ func NewCmd(scheme *runtime.Scheme) *cobra.Command {
+ 						},
+ 					},
+ 					handlers.TenantControlPlaneGatewayValidation{
+-						Client:          mgr.GetClient(),
+-						DiscoveryClient: discoveryClient,
++						Client:              mgr.GetClient(),
++						DiscoveryClient:     discoveryClient,
++						GatewayAPIAvailable: gatewayAPIAvailable,
+ 					},
+ 				},
+ 				routes.TenantControlPlaneTelemetry{}: {
+diff --git a/controllers/resources.go b/controllers/resources.go
+index fa375df..b12f085 100644
+--- a/controllers/resources.go
++++ b/controllers/resources.go
+@@ -11,7 +11,6 @@ import (
+ 	"github.com/go-logr/logr"
+ 	"github.com/google/uuid"
+ 	k8stypes "k8s.io/apimachinery/pkg/types"
+-	"k8s.io/client-go/discovery"
+ 	"sigs.k8s.io/controller-runtime/pkg/client"
+ 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
+ 
+@@ -22,7 +21,6 @@ import (
+ 	"github.com/clastix/kamaji/internal/resources"
+ 	ds "github.com/clastix/kamaji/internal/resources/datastore"
+ 	"github.com/clastix/kamaji/internal/resources/konnectivity"
+-	"github.com/clastix/kamaji/internal/utilities"
+ )
+ 
+ type GroupResourceBuilderConfiguration struct {
+@@ -40,7 +38,7 @@ type GroupResourceBuilderConfiguration struct {
+ 	KamajiService                 string
+ 	KamajiMigrateImage            string
+ 	KamajiMigrateCABundle         []byte
+-	DiscoveryClient               discovery.DiscoveryInterface
++	GatewayAPIAvailable           bool
+ }
+ 
+ type GroupDeletableResourceBuilderConfiguration struct {
+@@ -72,8 +70,7 @@ func GetResources(ctx context.Context, config GroupResourceBuilderConfiguration)
+ 	resources = append(resources, getDataStoreMigratingCleanup(config.client, config.KamajiNamespace)...)
+ 	resources = append(resources, getKubernetesIngressResources(config.client)...)
+ 
+-	// Conditionally add Gateway resources
+-	if utilities.AreGatewayResourcesAvailable(ctx, config.client, config.DiscoveryClient) {
++	if config.GatewayAPIAvailable {
+ 		resources = append(resources, getKubernetesGatewayResources(config.client)...)
+ 		resources = append(resources, getKonnectivityGatewayResources(config.client)...)
+ 	}
+diff --git a/controllers/resources_test.go b/controllers/resources_test.go
+new file mode 100644
+index 0000000..623bfdd
+--- /dev/null
++++ b/controllers/resources_test.go
+@@ -0,0 +1,124 @@
++// Copyright 2022 Clastix Labs
++// SPDX-License-Identifier: Apache-2.0
++
++package controllers
++
++import (
++	"context"
++	"testing"
++
++	"k8s.io/apimachinery/pkg/api/meta"
++	"k8s.io/apimachinery/pkg/runtime/schema"
++	"sigs.k8s.io/controller-runtime/pkg/client/fake"
++
++	"github.com/clastix/kamaji/internal/datastore"
++	"github.com/clastix/kamaji/internal/resources"
++	"github.com/clastix/kamaji/internal/resources/konnectivity"
++)
++
++// countingRESTMapper counts RESTMapper lookups, the route by which a controller-runtime client reaches discovery.
++type countingRESTMapper struct {
++	meta.RESTMapper
++
++	calls int
++}
++
++func (m *countingRESTMapper) KindFor(r schema.GroupVersionResource) (schema.GroupVersionKind, error) {
++	m.calls++
++
++	return m.RESTMapper.KindFor(r)
++}
++
++func (m *countingRESTMapper) KindsFor(r schema.GroupVersionResource) ([]schema.GroupVersionKind, error) {
++	m.calls++
++
++	return m.RESTMapper.KindsFor(r)
++}
++
++func (m *countingRESTMapper) ResourceFor(r schema.GroupVersionResource) (schema.GroupVersionResource, error) {
++	m.calls++
++
++	return m.RESTMapper.ResourceFor(r)
++}
++
++func (m *countingRESTMapper) ResourcesFor(r schema.GroupVersionResource) ([]schema.GroupVersionResource, error) {
++	m.calls++
++
++	return m.RESTMapper.ResourcesFor(r)
++}
++
++func (m *countingRESTMapper) RESTMapping(gk schema.GroupKind, versions ...string) (*meta.RESTMapping, error) {
++	m.calls++
++
++	return m.RESTMapper.RESTMapping(gk, versions...)
++}
++
++func (m *countingRESTMapper) RESTMappings(gk schema.GroupKind, versions ...string) ([]*meta.RESTMapping, error) {
++	m.calls++
++
++	return m.RESTMapper.RESTMappings(gk, versions...)
++}
++
++type stubConnection struct {
++	datastore.Connection
++}
++
++func (stubConnection) GetConnectionString() string { return "" }
++
++func TestGetResources_ConsultsNoRESTMapper(t *testing.T) {
++	t.Parallel()
++
++	for _, available := range []bool{true, false} {
++		mapper := &countingRESTMapper{RESTMapper: meta.NewDefaultRESTMapper(nil)}
++		config := GroupResourceBuilderConfiguration{
++			client:              fake.NewClientBuilder().WithRESTMapper(mapper).Build(),
++			Connection:          stubConnection{},
++			GatewayAPIAvailable: available,
++		}
++
++		GetResources(context.Background(), config)
++
++		if mapper.calls != 0 {
++			t.Fatalf("GatewayAPIAvailable=%t: GetResources runs inside the reconcile timeout and must not consult the RESTMapper, got %d lookups", available, mapper.calls)
++		}
++	}
++}
++
++func TestGetResources_GatewayResourcesFollowAvailability(t *testing.T) {
++	t.Parallel()
++
++	tests := []struct {
++		name      string
++		available bool
++	}{
++		{name: "gateway api available", available: true},
++		{name: "gateway api not available", available: false},
++	}
++
++	for _, tt := range tests {
++		t.Run(tt.name, func(t *testing.T) {
++			t.Parallel()
++
++			config := GroupResourceBuilderConfiguration{
++				client:              fake.NewClientBuilder().Build(),
++				Connection:          stubConnection{},
++				GatewayAPIAvailable: tt.available,
++			}
++
++			var kubernetesGateway, konnectivityGateway bool
++
++			for _, resource := range GetResources(context.Background(), config) {
++				switch resource.(type) {
++				case *resources.KubernetesGatewayResource:
++					kubernetesGateway = true
++				case *konnectivity.KubernetesKonnectivityGatewayResource:
++					konnectivityGateway = true
++				}
++			}
++
++			if kubernetesGateway != tt.available || konnectivityGateway != tt.available {
++				t.Fatalf("want gateway resources present=%t, got KubernetesGatewayResource=%t KubernetesKonnectivityGatewayResource=%t", tt.available, kubernetesGateway, konnectivityGateway)
++			}
++		})
++	}
++}
+diff --git a/controllers/tenantcontrolplane_controller.go b/controllers/tenantcontrolplane_controller.go
+index 7eb378e..5aebcf7 100644
+--- a/controllers/tenantcontrolplane_controller.go
++++ b/controllers/tenantcontrolplane_controller.go
+@@ -19,7 +19,6 @@ import (
+ 	networkingv1 "k8s.io/api/networking/v1"
+ 	k8serrors "k8s.io/apimachinery/pkg/api/errors"
+ 	k8stypes "k8s.io/apimachinery/pkg/types"
+-	"k8s.io/client-go/discovery"
+ 	"k8s.io/client-go/util/retry"
+ 	"k8s.io/client-go/util/workqueue"
+ 	"k8s.io/utils/clock"
+@@ -45,7 +44,6 @@ import (
+ 	kamajierrors "github.com/clastix/kamaji/internal/errors"
+ 	"github.com/clastix/kamaji/internal/metrics"
+ 	"github.com/clastix/kamaji/internal/resources"
+-	"github.com/clastix/kamaji/internal/utilities"
+ )
+ 
+ // TenantControlPlaneReconciler reconciles a TenantControlPlane object.
+@@ -62,7 +60,9 @@ type TenantControlPlaneReconciler struct {
+ 	KamajiMigrateCABundle   []byte
+ 	MaxConcurrentReconciles int
+ 	ReconcileTimeout        time.Duration
+-	DiscoveryClient         discovery.DiscoveryInterface
++	// GatewayAPIAvailable is resolved once at startup: it selects both the Gateway API watches and the
++	// Gateway resources reconciled, so the two cannot disagree.
++	GatewayAPIAvailable bool
+ 	// CertificateChan is the channel used by the CertificateLifecycleController that is checking for
+ 	// certificates and kubeconfig user certs validity: a generic event for the given TCP will be triggered
+ 	// once the validity threshold for the given certificate is reached.
+@@ -240,7 +240,7 @@ func (r *TenantControlPlaneReconciler) Reconcile(ctx context.Context, req ctrl.R
+ 		KamajiService:                 r.KamajiService,
+ 		KamajiMigrateImage:            r.KamajiMigrateImage,
+ 		KamajiMigrateCABundle:         r.KamajiMigrateCABundle,
+-		DiscoveryClient:               r.DiscoveryClient,
++		GatewayAPIAvailable:           r.GatewayAPIAvailable,
+ 	}
+ 	registeredResources := GetResources(ctx, groupResourceBuilderConfiguration)
+ 
+@@ -384,8 +384,7 @@ func (r *TenantControlPlaneReconciler) SetupWithManager(ctx context.Context, mgr
+ 			return ok && v == "migrate"
+ 		})))
+ 
+-	// Conditionally add Gateway API ownership if available
+-	if utilities.AreGatewayResourcesAvailable(ctx, r.Client, r.DiscoveryClient) {
++	if r.GatewayAPIAvailable {
+ 		controllerBuilder = controllerBuilder.
+ 			Owns(&gatewayv1.HTTPRoute{}).
+ 			Owns(&gatewayv1.GRPCRoute{}).
+diff --git a/internal/webhook/handlers/tcp_gateway_validate.go b/internal/webhook/handlers/tcp_gateway_validate.go
+index 4efcbcd..7c3bf1b 100644
+--- a/internal/webhook/handlers/tcp_gateway_validate.go
++++ b/internal/webhook/handlers/tcp_gateway_validate.go
+@@ -21,6 +21,9 @@ import (
+ type TenantControlPlaneGatewayValidation struct {
+ 	Client          client.Client
+ 	DiscoveryClient discovery.DiscoveryInterface
++	// GatewayAPIAvailable is the value the controller resolved at startup: admitting a Gateway spec
++	// it will not reconcile would fail silently.
++	GatewayAPIAvailable bool
+ }
+ 
+ func (t TenantControlPlaneGatewayValidation) OnCreate(object runtime.Object) AdmissionResponse {
+@@ -64,8 +67,8 @@ func (t TenantControlPlaneGatewayValidation) OnDelete(object runtime.Object) Adm
+ }
+ 
+ func (t TenantControlPlaneGatewayValidation) validateGatewayAPIAvailability(ctx context.Context) error {
+-	if !utilities.AreGatewayResourcesAvailable(ctx, t.Client, t.DiscoveryClient) {
+-		return fmt.Errorf("the Gateway API is not available in this cluster, cannot use gatewayRoute configuration")
++	if !t.GatewayAPIAvailable {
++		return fmt.Errorf("the Gateway API was not available when Kamaji started, cannot use gatewayRoute configuration: install the Gateway API CRDs and restart Kamaji")
+ 	}
+ 
+ 	// Additional check for TLSRoute specifically
+diff --git a/internal/webhook/handlers/tcp_gateway_validate_test.go b/internal/webhook/handlers/tcp_gateway_validate_test.go
+index 2614fbb..c709f51 100644
+--- a/internal/webhook/handlers/tcp_gateway_validate_test.go
++++ b/internal/webhook/handlers/tcp_gateway_validate_test.go
+@@ -104,6 +104,7 @@ var _ = Describe("TCP Gateway Validation Webhook", func() {
+ 
+ 		Context("and Gateway APIs are available", func() {
+ 			BeforeEach(func() {
++				handler.GatewayAPIAvailable = true
+ 				mockDiscovery.serverGroups = &metav1.APIGroupList{
+ 					Groups: []metav1.APIGroup{
+ 						{Name: "gateway.networking.k8s.io"},
+@@ -138,19 +139,20 @@ var _ = Describe("TCP Gateway Validation Webhook", func() {
+ 			It("should deny creation with clear error message", func() {
+ 				_, err := handler.OnCreate(tcp)(ctx, admission.Request{})
+ 				Expect(err).To(HaveOccurred())
+-				Expect(err.Error()).To(ContainSubstring("Gateway API is not available in this cluster"))
++				Expect(err.Error()).To(ContainSubstring("Gateway API was not available when Kamaji started"))
+ 			})
+ 
+ 			It("should deny updates with clear error message", func() {
+ 				oldTCP := tcp.DeepCopy()
+ 				_, err := handler.OnUpdate(tcp, oldTCP)(ctx, admission.Request{})
+ 				Expect(err).To(HaveOccurred())
+-				Expect(err.Error()).To(ContainSubstring("Gateway API is not available in this cluster"))
++				Expect(err.Error()).To(ContainSubstring("Gateway API was not available when Kamaji started"))
+ 			})
+ 		})
+ 
+ 		Context("and Gateway API group exists but TLSRoute is not available", func() {
+ 			BeforeEach(func() {
++				handler.GatewayAPIAvailable = true
+ 				mockDiscovery.serverGroups = &metav1.APIGroupList{
+ 					Groups: []metav1.APIGroup{
+ 						{Name: "gateway.networking.k8s.io"},
+@@ -170,6 +172,35 @@ var _ = Describe("TCP Gateway Validation Webhook", func() {
+ 				Expect(err.Error()).To(ContainSubstring("TLSRoute resource is not available"))
+ 			})
+ 		})
++
++		Context("and Gateway APIs were installed after Kamaji started", func() {
++			BeforeEach(func() {
++				handler.GatewayAPIAvailable = false
++				mockDiscovery.serverGroups = &metav1.APIGroupList{
++					Groups: []metav1.APIGroup{
++						{Name: "gateway.networking.k8s.io"},
++					},
++				}
++				mockDiscovery.serverResources["gateway.networking.k8s.io/v1"] = &metav1.APIResourceList{
++					APIResources: []metav1.APIResource{
++						{Kind: "TLSRoute"},
++					},
++				}
++			})
++
++			It("should deny creation because the controller does not reconcile Gateway resources until restarted", func() {
++				_, err := handler.OnCreate(tcp)(ctx, admission.Request{})
++				Expect(err).To(HaveOccurred())
++				Expect(err.Error()).To(ContainSubstring("restart Kamaji"))
++			})
++
++			It("should deny updates because the controller does not reconcile Gateway resources until restarted", func() {
++				oldTCP := tcp.DeepCopy()
++				_, err := handler.OnUpdate(tcp, oldTCP)(ctx, admission.Request{})
++				Expect(err).To(HaveOccurred())
++				Expect(err.Error()).To(ContainSubstring("restart Kamaji"))
++			})
++		})
+ 	})
+ 
+ 	Context("when Gateway configuration is added in update", func() {
+@@ -186,7 +217,7 @@ var _ = Describe("TCP Gateway Validation Webhook", func() {
+ 
+ 			_, err := handler.OnUpdate(tcp, oldTCP)(ctx, admission.Request{})
+ 			Expect(err).To(HaveOccurred())
+-			Expect(err.Error()).To(ContainSubstring("Gateway API is not available"))
++			Expect(err.Error()).To(ContainSubstring("Gateway API was not available when Kamaji started"))
+ 		})
+ 
+ 		It("should allow removing Gateway configuration", func() {
diff --git a/packages/system/kamaji/patches/1.diff b/packages/system/kamaji/patches/1.diff
new file mode 100644
index 0000000000..3c0e680920
--- /dev/null
+++ b/packages/system/kamaji/patches/1.diff
@@ -0,0 +1,17 @@
+diff --git a/packages/system/kamaji/charts/kamaji/controller-gen/validating-webhook.yaml b/packages/system/kamaji/charts/kamaji/controller-gen/validating-webhook.yaml
+index 0000000..0000001 100644
+--- a/charts/kamaji/controller-gen/validating-webhook.yaml
++++ b/charts/kamaji/controller-gen/validating-webhook.yaml
+@@ -1,3 +1,4 @@
++{{- if not .Values.telemetry.disabled }}
+ - admissionReviewVersions:
+     - v1
+   clientConfig:
+@@ -19,6 +20,7 @@
+       resources:
+         - tenantcontrolplanes
+   sideEffects: None
++{{- end }}
+ - admissionReviewVersions:
+     - v1
+   clientConfig:
diff --git a/packages/system/kamaji/tests/nested_subchart_test.yaml b/packages/system/kamaji/tests/nested_subchart_test.yaml
new file mode 100644
index 0000000000..29598e805a
--- /dev/null
+++ b/packages/system/kamaji/tests/nested_subchart_test.yaml
@@ -0,0 +1,12 @@
+suite: no subchart is vendored under charts/kamaji
+
+# The kamaji-etcd dependency's condition is never evaluated through this
+# umbrella chart, so any chart placed under charts/kamaji/charts deploys.
+templates:
+  - "charts/kamaji/charts/*/templates/*"
+
+tests:
+  - it: renders nothing from a nested subchart
+    asserts:
+      - hasDocuments:
+          count: 0
diff --git a/packages/system/kamaji/values.yaml b/packages/system/kamaji/values.yaml
index 398549449b..6a6ccaa029 100644
--- a/packages/system/kamaji/values.yaml
+++ b/packages/system/kamaji/values.yaml
@@ -1,9 +1,34 @@
 kamaji:
-  etcd:
-    deploy: false
+  # HA-safe default: two replicas serve admission webhooks behind the
+  # kamaji-webhook-service Service. --leader-elect is already enabled
+  # upstream, so only one replica reconciles tenant control planes — the
+  # follower's CPU is fully available for webhook handlers, eliminating the
+  # CPU contention that pushes p99 admission latency from ~10ms (kamaji
+  # handler) up to ~90ms (apiserver-observed) on single-replica deployments.
+  replicaCount: 2
+  # Drop the telemetry handler and its admission webhook. With
+  # telemetry.disabled=true, the controller is started with
+  # --disable-telemetry AND the corresponding webhook entry is omitted
+  # from the ValidatingWebhookConfiguration (see patches/1.diff), so the
+  # apiserver no longer pays a round-trip to a no-op handler on every
+  # TenantControlPlane CREATE/UPDATE/DELETE.
+  telemetry:
+    disabled: true
+  # Soft anti-affinity: spread the kamaji controller replicas across nodes
+  # when possible. preferredDuringScheduling means single-node clusters
+  # still schedule both pods (just colocated, which is acceptable).
+  affinity:
+    podAntiAffinity:
+      preferredDuringSchedulingIgnoredDuringExecution:
+        - weight: 100
+          podAffinityTerm:
+            labelSelector:
+              matchLabels:
+                app.kubernetes.io/name: kamaji
+            topologyKey: kubernetes.io/hostname
   image:
     pullPolicy: IfNotPresent
-    tag: v1.4.0-rc.2@sha256:e78ec08dd84eb2ee13b84b304da09ca866b6714af6dcf8b80635cae8c15f1628
+    tag: v1.6.0@sha256:7f7751b3d01b256621a131c217fc90464cd51d3d07a6d870c3d8f28784745293
     repository: ghcr.io/cozystack/cozystack/kamaji
   resources:
     limits:
@@ -36,4 +61,4 @@ kamaji:
     periodSeconds: 10
     timeoutSeconds: 1
   extraArgs:
-    - --migrate-image=ghcr.io/cozystack/cozystack/kamaji:v1.4.0-rc.2@sha256:e78ec08dd84eb2ee13b84b304da09ca866b6714af6dcf8b80635cae8c15f1628
+    - --migrate-image=ghcr.io/cozystack/cozystack/kamaji:v1.6.0@sha256:7f7751b3d01b256621a131c217fc90464cd51d3d07a6d870c3d8f28784745293
diff --git a/packages/system/keda/Chart.yaml b/packages/system/keda/Chart.yaml
new file mode 100644
index 0000000000..b90f0ee482
--- /dev/null
+++ b/packages/system/keda/Chart.yaml
@@ -0,0 +1,3 @@
+apiVersion: v2
+name: cozy-keda
+version: 0.0.0 # Placeholder, the actual version will be automatically set during the build process
diff --git a/packages/system/keda/Makefile b/packages/system/keda/Makefile
new file mode 100644
index 0000000000..00e207d35c
--- /dev/null
+++ b/packages/system/keda/Makefile
@@ -0,0 +1,28 @@
+export NAME=keda
+export NAMESPACE=cozy-$(NAME)
+
+include ../../../hack/package.mk
+
+# Pin the upstream KEDA chart by version. Bump deliberately; the assert below
+# aborts if the pulled Chart.yaml version drifts from the pin.
+KEDA_CHART_VERSION ?= 2.20.2
+
+test:
+	helm unittest .
+
+update:
+	rm -rf charts
+	helm repo add kedacore https://kedacore.github.io/charts
+	helm repo update kedacore
+	helm pull kedacore/keda --untar --untardir charts --version "$(KEDA_CHART_VERSION)"
+	@actual_version=$$(awk '/^version:/ {print $$2}' charts/keda/Chart.yaml | tr -d '"'); \
+	if [ "$$actual_version" != "$(KEDA_CHART_VERSION)" ]; then \
+	  echo "ERROR: pulled chart Chart.yaml version=$$actual_version but Makefile KEDA_CHART_VERSION=$(KEDA_CHART_VERSION). Bump them in lockstep."; \
+	  exit 1; \
+	fi
+	# Cozystack ships its own unittest coverage at tests/; drop the vendored
+	# upstream fixtures so they are not mistaken for reviewed code here.
+	rm -rf charts/keda/tests
+	# Gate the CiliumNetworkPolicy objects on the cilium.io/v2 API being served, so the
+	# package installs on variants that ship no Cilium (see the patch header).
+	patch --no-backup-if-mismatch -p1 < patches/ciliumnetworkpolicy-capability-gate.patch
diff --git a/packages/system/keda/charts/keda/.helmignore b/packages/system/keda/charts/keda/.helmignore
new file mode 100644
index 0000000000..a9f39f791b
--- /dev/null
+++ b/packages/system/keda/charts/keda/.helmignore
@@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/
+*.gotmpl
diff --git a/packages/system/keda/charts/keda/Chart.yaml b/packages/system/keda/charts/keda/Chart.yaml
new file mode 100644
index 0000000000..42e64e708f
--- /dev/null
+++ b/packages/system/keda/charts/keda/Chart.yaml
@@ -0,0 +1,17 @@
+apiVersion: v2
+appVersion: 2.20.2
+description: Event-based autoscaler for workloads on Kubernetes
+home: https://github.com/kedacore/keda
+icon: https://raw.githubusercontent.com/kedacore/keda/main/images/keda-logo-500x500-white.png
+kubeVersion: '>=v1.23.0-0'
+maintainers:
+- email: jorge_turrado@hotmail.es
+  name: Jorge Turrado
+- email: zbynek@kedify.io
+  name: Zbynek Roubalik
+- email: jan@kedify.io
+  name: Jan Wozniak
+name: keda
+sources:
+- https://github.com/kedacore/keda
+version: 2.20.2
diff --git a/packages/system/keda/charts/keda/README.md b/packages/system/keda/charts/keda/README.md
new file mode 100644
index 0000000000..7fb020309d
--- /dev/null
+++ b/packages/system/keda/charts/keda/README.md
@@ -0,0 +1,424 @@
+<p align="center"><img src="https://raw.githubusercontent.com/kedacore/keda/main/images/keda-logo-transparent.png" width="300"/></p>
+<p style="font-size: 25px" align="center"><b>Kubernetes-based Event Driven Autoscaling</b></p>
+
+KEDA allows for fine grained autoscaling (including to/from zero) for event driven Kubernetes workloads.  KEDA serves as a Kubernetes Metrics Server and allows users to define autoscaling rules using a dedicated Kubernetes custom resource definition.
+
+KEDA can run on both the cloud and the edge, integrates natively with Kubernetes components such as the Horizontal Pod Autoscaler, and has no external dependencies.
+
+---
+<p align="center">
+We are a Cloud Native Computing Foundation (CNCF) graduated project.
+
+<img src="https://raw.githubusercontent.com/kedacore/keda/main/images/logo-cncf.svg" height="75px">
+</p>
+
+---
+
+## TL;DR
+
+```console
+helm repo add kedacore https://kedacore.github.io/charts
+helm repo update
+
+kubectl create namespace keda
+helm install keda kedacore/keda --namespace keda --version 2.20.2
+```
+
+## Introduction
+
+This chart bootstraps KEDA infrastructure on a Kubernetes cluster using the Helm package manager.
+
+As part of that, it will install all the required Custom Resource Definitions (CRD).
+
+## Installing the Chart
+
+To install the chart with the release name `keda`:
+
+```console
+$ kubectl create namespace keda
+$ helm install keda kedacore/keda --namespace keda --version 2.20.2
+```
+
+## Uninstalling the Chart
+
+To uninstall/delete the `keda` Helm chart:
+
+```console
+helm uninstall keda
+```
+
+The command removes all the Kubernetes components associated with the chart and deletes the release.
+
+## Configuration
+
+The following table lists the configurable parameters of the KEDA chart and
+their default values.
+
+### General parameters
+
+| Parameter | Type | Default | Description |
+|-----------|------|---------|-------------|
+| `additionalAnnotations` | object | `{}` | Custom annotations to add into metadata |
+| `additionalLabels` | object | `{}` | Custom labels to add into metadata |
+| `affinity` | object | `{}` | [Affinity] for pod scheduling for KEDA operator, Metrics API Server and KEDA admission webhooks. |
+| `asciiArt` | bool | `true` | Capability to turn on/off ASCII art in Helm installation notes |
+| `certificates.autoGenerated` | bool | `true` | Enables the self generation for KEDA TLS certificates inside KEDA operator |
+| `certificates.certManager.caSecretName` | string | `"kedaorg-ca"` | Secret name where the CA is stored (generatedby cert-manager or user given) |
+| `certificates.certManager.duration` | string | `"8760h0m0s"` | Certificate duration |
+| `certificates.certManager.enabled` | bool | `false` | Enables Cert-manager for certificate management |
+| `certificates.certManager.generateCA` | bool | `true` | Generates a self-signed CA with Cert-manager. If generateCA is false, the secret with the CA has to be annotated with `cert-manager.io/allow-direct-injection: "true"` |
+| `certificates.certManager.issuer` | object | `{"generate":true,"group":"cert-manager.io","kind":"ClusterIssuer","name":"foo-org-ca"}` | Reference to custom Issuer. If issuer.generate is false, then issuer.group, issuer.kind and issuer.name are required |
+| `certificates.certManager.issuer.generate` | bool | `true` | Generates an Issuer resource with Cert-manager |
+| `certificates.certManager.issuer.group` | string | `"cert-manager.io"` | Custom Issuer group. Required when generate: false |
+| `certificates.certManager.issuer.kind` | string | `"ClusterIssuer"` | Custom Issuer kind. Required when generate: false |
+| `certificates.certManager.issuer.name` | string | `"foo-org-ca"` | Custom Issuer name. Required when generate: false |
+| `certificates.certManager.renewBefore` | string | `"5840h0m0s"` | Certificate renewal time before expiration |
+| `certificates.certManager.secretTemplate` | object | `{}` | Add labels/annotations to secrets created by Certificate resources [docs](https://cert-manager.io/docs/usage/certificate/#creating-certificate-resources) |
+| `certificates.mountPath` | string | `"/certs"` | Path where KEDA TLS certificates are mounted |
+| `certificates.secretName` | string | `"kedaorg-certs"` | Secret name to be mounted with KEDA TLS certificates |
+| `certificates.operator.apiServicePatching.enabled` | bool | `nil` | When explicitly set, controls whether the operator injects the self-generated TLS CA into the APIService for the KEDA Metrics API Server via the `--enable-apiservice-patching` flag. When unset (default), the flag is not passed and the operator uses its built-in default. Only effective when `certificates.autoGenerated=true` and `certificates.certManager.enabled=false`. If set to `false` while `metricsServer.enabled=true`, you must provide an alternative CA injection mechanism or the metrics API will fail TLS verification. |
+| `clusterDomain` | string | `"cluster.local"` | Kubernetes cluster domain |
+| `clusterName` | string | `"kubernetes-default"` | Kubernetes cluster name. Used in features such as emitting CloudEvents |
+| `crds.additionalAnnotations` | object | `{}` | Custom annotations specifically for CRDs |
+| `crds.install` | bool | `true` | Defines whether the KEDA CRDs have to be installed or not. |
+| `customManagedBy` | string | `""` | When specified, each rendered resource will have `app.kubernetes.io/managed-by: ${this}` label on it. Useful, when using only helm template with some other solution. |
+| `enableServiceLinks` | bool | `true` | Enable service links in pods. Although enabled, mirroring k8s default, it is highly recommended to disable, due to its legacy status [Legacy container links](https://docs.docker.com/engine/network/links/) |
+| `env` | list | `[]` | Additional environment variables that will be passed onto all KEDA components |
+| `extraObjects` | list | `[]` | Array of extra K8s manifests to deploy |
+| `global.dnsConfig` | object | `{}` | DNS config for KEDA components |
+| `global.image.registry` | string | `nil` | Global image registry of KEDA components |
+| `grpcTLSCertsSecret` | string | `""` | Set this if you are using an external scaler and want to communicate over TLS (recommended). This variable holds the name of the secret that will be mounted to the /grpccerts path on the Pod |
+| `hashiCorpVaultTLS` | string | `""` | Set this if you are using HashiCorp Vault and want to communicate over TLS (recommended). This variable holds the name of the secret that will be mounted to the /vault path on the Pod |
+| `hostAliases` | list | `[]` | HostAliases for pod networking ([docs](https://kubernetes.io/docs/concepts/services-networking/add-entries-to-pod-etc-hosts-with-host-aliases/)) |
+| `http.idleConnTimeout` | string | `"90s"` | Maximum time an idle HTTP connection remains in the pool. Must be greater than zero. |
+| `http.keepAlive.enabled` | bool | `true` | Enable HTTP connection keep alive |
+| `http.maxIdleConns` | int | `0` | Maximum number of idle HTTP connections across all hosts. Zero means no limit. |
+| `http.maxIdleConnsPerHost` | int | `1000` | Maximum number of idle HTTP connections to keep per host |
+| `http.minTlsVersion` | string | `"TLS12"` | The minimum TLS version to use for all scalers that use raw HTTP clients (some scalers use SDKs to access target services. These have built-in HTTP clients, and this value does not necessarily apply to them) |
+| `http.tlsCipherList` | string | `""` | The list of cipher suites to use when making HTTP over TLS connections. When left empty or unset, the TLS implementation will provide a default list of cipher suites which are believed to be secure. |
+| `http.timeout` | int | `3000` | The default HTTP timeout to use for all scalers that use raw HTTP clients (some scalers use SDKs to access target services. These have built-in HTTP clients, and the timeout does not necessarily apply to them) |
+| `image.pullPolicy` | string | `"Always"` | Image pullPolicy for all KEDA components |
+| `imagePullSecrets` | list | `[]` | Name of secret to use to pull images to use to pull Docker images |
+| `networkPolicy.cilium` | object | `{"operator":{"extraEgressRules":[]}}` | Allow use of extra egress rules for cilium network policies |
+| `networkPolicy.enabled` | bool | `false` | Enable network policies |
+| `networkPolicy.flavor` | string | `"cilium"` | Flavor of the network policies (cilium, kubernetes) |
+| `networkPolicy.kubernetes` | object | `{"metricsServer":{"extraEgressRules":[]},"operator":{"extraEgressRules":[]},"webhooks":{"extraEgressRules":[]}}` | Allow use of extra egress rules for kubernetes network policies |
+| `nodeSelector` | object | `{}` | Node selector for pod scheduling ([docs](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/)) |
+| `podIdentity.aws.irsa.audience` | string | `"sts.amazonaws.com"` | Sets the token audience for IRSA. This will be set as an annotation on the KEDA service account. |
+| `podIdentity.aws.irsa.enabled` | bool | `false` | Specifies whether [AWS IAM Roles for Service Accounts (IRSA)](https://docs.aws.amazon.com/eks/latest/userguide/iam-roles-for-service-accounts.html) is to be enabled or not. |
+| `podIdentity.aws.irsa.roleArn` | string | `""` | Set to the value of the ARN of an IAM role with a web identity provider. This will be set as an annotation on the KEDA service account. |
+| `podIdentity.aws.irsa.stsRegionalEndpoints` | string | `"true"` | Sets the use of an STS regional endpoint instead of global. Recommended to use regional endpoint in almost all cases. This will be set as an annotation on the KEDA service account. |
+| `podIdentity.aws.irsa.tokenExpiration` | int | `86400` | Set to the value of the service account token expiration duration. This will be set as an annotation on the KEDA service account. |
+| `podIdentity.azureWorkload.clientId` | string | `""` | Id of Azure Active Directory Client to use for authentication with Azure Workload Identity. ([docs](https://keda.sh/docs/concepts/authentication/#azure-workload-identity)) |
+| `podIdentity.azureWorkload.enabled` | bool | `false` | Set to true to enable Azure Workload Identity usage. See https://keda.sh/docs/concepts/authentication/#azure-workload-identity This will be set as a label on the KEDA service account. |
+| `podIdentity.azureWorkload.tenantId` | string | `""` | Id Azure Active Directory Tenant to use for authentication with for Azure Workload Identity. ([docs](https://keda.sh/docs/concepts/authentication/#azure-workload-identity)) |
+| `podIdentity.azureWorkload.tokenExpiration` | int | `3600` | Duration in seconds to automatically expire tokens for the service account. ([docs](https://keda.sh/docs/concepts/authentication/#azure-workload-identity)) |
+| `podIdentity.gcp.enabled` | bool | `false` | Set to true to enable GCP Workload Identity. See https://keda.sh/docs/2.10/authentication-providers/gcp-workload-identity/ This will be set as a annotation on the KEDA service account. |
+| `podIdentity.gcp.gcpIAMServiceAccount` | string | `""` | GCP IAM Service Account Email which you would like to use for workload identity. |
+| `podSecurityContext` | object | [See below](#KEDA-is-secure-by-default) | [Pod security context] for all pods |
+| `priorityClassName` | string | `""` | priorityClassName for all KEDA components |
+| `rbac.aggregateToDefaultRoles` | bool | `false` | Specifies whether RBAC for CRDs should be [aggregated](https://kubernetes.io/docs/reference/access-authn-authz/rbac/#aggregated-clusterroles) to default roles (view, edit, admin) |
+| `rbac.controlPlaneServiceAccountsNamespace` | string | `"kube-system"` | Customize the namespace of k8s metrics-server deployment This could also be achieved by the Kubernetes control plane manager flag --use-service-account-credentials: [docs](https://kubernetes.io/docs/reference/command-line-tools-reference/kube-controller-manager/) |
+| `rbac.create` | bool | `true` | Specifies whether RBAC should be used |
+| `rbac.enabledCustomScaledRefKinds` | bool | `true` | Whether RBAC for configured CRDs that can have a `scale` subresource should be created |
+| `rbac.scaledRefKinds` | list | `[{"apiGroup":"*","kind":"*"}]` | List of custom resources that support the `scale` subresource and can be referenced by `scaledobject.spec.scaleTargetRef`. The feature needs to be also enabled by `enabledCustomScaledRefKinds`. If left empty, RBAC for `apiGroups: *` and `resources: *, */scale` will be created note: Deployments and StatefulSets are supported out of the box |
+| `securityContext` | object | [See below](#KEDA-is-secure-by-default) | [Security context] for all containers |
+| `service.minTlsVersion` | string | `"TLS13"` | The minimum TLS version to use when KEDA components listen via TLS-enabled services (gRPC & Webhook). |
+| `service.tlsCipherList` | string | `""` | The list of cipher suites to use when KEDA components listen via TLS-enabled services. When left empty or unset, the TLS implementation will provide a default list of cipher suites which are believed to be secure. |
+| `tolerations` | list | `[]` | Tolerations for pod scheduling ([docs](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/)) |
+| `watchNamespace` | string | `""` | Defines Kubernetes namespaces to watch to scale their workloads. Default watches all namespaces |
+
+### Operator
+
+| Parameter | Type | Default | Description |
+|-----------|------|---------|-------------|
+| `certificates.operator` | string | `nil` |  |
+| `extraArgs.keda` | object | `{}` | Additional KEDA Operator container arguments |
+| `image.keda.registry` | string | `"ghcr.io"` | Image registry of KEDA operator |
+| `image.keda.repository` | string | `"kedacore/keda"` | Image name of KEDA operator |
+| `image.keda.tag` | string | `""` | Image tag of KEDA operator. Optional, given app version of Helm chart is used by default |
+| `logging.operator.format` | string | `"console"` | Logging format for KEDA Operator. allowed values: `json` or `console` |
+| `logging.operator.level` | string | `"info"` | Logging level for KEDA Operator. allowed values: `debug`, `info`, `error`, or an integer value greater than 0, specified as string |
+| `logging.operator.stackTracesEnabled` | bool | `false` | If enabled, the stack traces will be also printed |
+| `logging.operator.timeEncoding` | string | `"rfc3339"` | Logging time encoding for KEDA Operator. allowed values are `epoch`, `millis`, `nano`, `iso8601`, `rfc3339` or `rfc3339nano` |
+| `operator.affinity` | object | `{}` | [Affinity] for pod scheduling for KEDA operator. Takes precedence over the `affinity` field |
+| `operator.disableCompression` | bool | `true` | Disable response compression for k8s restAPI in client-go. Disabling compression simply means that turns off the process of making data smaller for K8s restAPI in client-go for faster transmission. |
+| `operator.dnsConfig` | object | `{}` | DNS config for KEDA operator pod |
+| `operator.dnsPolicy` | string | `"ClusterFirst"` | Defined the DNS policy for the operator |
+| `operator.extraContainers` | list | `[]` | Additional containers to run as part of the operator deployment |
+| `operator.extraInitContainers` | list | `[]` | Additional init containers to run as part of the operator deployment |
+| `operator.leaderElectionID` | string | `nil` | When set, overrides the leader election Lease resource name via the `--leader-election-id` flag. When unset (default), the flag is not passed and the operator uses its built-in default (`operator.keda.sh`). Override to allow multiple independent KEDA operator deployments in the same namespace. |
+| `operator.livenessProbe` | object | `{"failureThreshold":3,"initialDelaySeconds":25,"periodSeconds":10,"successThreshold":1,"timeoutSeconds":1}` | Liveness probes for operator ([docs](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/)) |
+| `operator.name` | string | `"keda-operator"` | Name of the KEDA operator |
+| `operator.nodeSelector` | object | `{}` | Node selector for pod scheduling ([docs](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/)) |
+| `operator.readinessProbe` | object | `{"failureThreshold":3,"initialDelaySeconds":20,"periodSeconds":3,"successThreshold":1,"timeoutSeconds":1}` | Readiness probes for operator ([docs](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/#define-readiness-probes)) |
+| `operator.replicaCount` | int | `1` | Capability to configure the number of replicas for KEDA operator. While you can run more replicas of our operator, only one operator instance will be the leader and serving traffic. You can run multiple replicas, but they will not improve the performance of KEDA, it could only reduce downtime during a failover. Learn more in [our documentation](https://keda.sh/docs/latest/operate/cluster/#high-availability). |
+| `operator.revisionHistoryLimit` | int | `10` | ReplicaSets for this Deployment you want to retain (Default: 10) |
+| `operator.useHostNetwork` | bool | `false` | Enable operator to use host network |
+| `permissions.operator.restrict.allowAllServiceAccountTokenCreation` | bool | `false` | Allow Keda to access all Service Token for KEDA operator |
+| `operator.tolerations` | list | `[]` | Tolerations for pod scheduling ([docs](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/)) |
+| `permissions.operator.restrict.namesAllowList` | list | `[]` | Array of strings denoting what secrets the KEDA operator will be able to read, this takes into account also the configured `watchNamespace`. the default is an empty array -> no restriction on the secret name |
+| `permissions.operator.restrict.secret` | bool | `false` | Restrict Secret Access for KEDA operator if true, KEDA operator will be able to read only secrets in {{ .Release.Namespace }} namespace |
+| `permissions.operator.restrict.serviceAccountTokenCreationRoles` | list | `[]` | Creates roles and rolebindings from namespaced service accounts in the array which allow the KEDA operator to request service account tokens for use with the boundServiceAccountToken trigger source. If the namespace does not exist, this will cause the helm chart installation to fail. |
+| `podAnnotations.keda` | object | `{}` | Pod annotations for KEDA operator |
+| `podDisruptionBudget.operator` | object | `{}` | Capability to configure [Pod Disruption Budget] |
+| `podLabels.keda` | object | `{}` | Pod labels for KEDA operator |
+| `podSecurityContext.operator` | object | [See below](#KEDA-is-secure-by-default) | [Pod security context] of the KEDA operator pod |
+| `resources.operator` | object | `{"limits":{"cpu":1,"memory":"1000Mi"},"requests":{"cpu":"100m","memory":"100Mi"}}` | Manage [resource request & limits] of KEDA operator pod |
+| `securityContext.operator` | object | [See below](#KEDA-is-secure-by-default) | [Security context] of the operator container |
+| `serviceAccount.operator.annotations` | object | `{}` | Annotations to add to the service account |
+| `serviceAccount.operator.automountServiceAccountToken` | bool | `true` | Specifies whether a service account should automount API-Credentials |
+| `serviceAccount.operator.create` | bool | `true` | Specifies whether a service account should be created |
+| `serviceAccount.operator.name` | string | `"keda-operator"` | The name of the service account to use. |
+| `topologySpreadConstraints.operator` | list | `[]` | [Pod Topology Constraints] of KEDA operator pod |
+| `upgradeStrategy.operator` | object | `{}` | Capability to configure [Deployment upgrade strategy] for operator |
+| `volumes.keda.extraVolumeMounts` | list | `[]` | Extra volume mounts for KEDA deployment |
+| `volumes.keda.extraVolumes` | list | `[]` | Extra volumes for KEDA deployment |
+
+### Metrics server
+
+| Parameter | Type | Default | Description |
+|-----------|------|---------|-------------|
+| `extraArgs.metricsAdapter` | object | `{}` | Additional Metrics Adapter container arguments |
+| `image.metricsApiServer.registry` | string | `"ghcr.io"` | Image registry of KEDA Metrics API Server |
+| `image.metricsApiServer.repository` | string | `"kedacore/keda-metrics-apiserver"` | Image name of KEDA Metrics API Server |
+| `image.metricsApiServer.tag` | string | `""` | Image tag of KEDA Metrics API Server. Optional, given app version of Helm chart is used by default |
+| `logging.metricServer.level` | int | `0` | Logging level for Metrics Server (Deprecated). allowed values: `0` for info, `4` for debug, or an integer value greater than 0, specified as string |
+| `logging.metricServer.stderrthreshold` | string | `"ERROR"` | Logging stderrthreshold for Metrics Server (Deprecated) allowed values: 'DEBUG','INFO','WARN','ERROR','ALERT','EMERG' |
+| `logging.metricServer.zapEncoder` | string | `"console"` | Zap Logging encoder for Metrics Server. allowed values: `json` or `console` |
+| `logging.metricServer.zapLevel` | string | `"info"` | Zap Logging level for Metrics Server. allowed values: `debug`, `info`, `error`, or an integer value greater than 0, specified as string |
+| `logging.metricServer.zapTimeEncoding` | string | `"rfc3339"` | Zap logging time encoding for Metrics Server. allowed values are `epoch`, `millis`, `nano`, `iso8601`, `rfc3339` or `rfc3339nano` |
+| `metricsServer.affinity` | object | `{}` | [Affinity] for pod scheduling for Metrics API Server. Takes precedence over the `affinity` field |
+| `metricsServer.disableCompression` | bool | `true` | Disable response compression for k8s restAPI in client-go. Disabling compression simply means that turns off the process of making data smaller for K8s restAPI in client-go for faster transmission. |
+| `metricsServer.dnsConfig` | object | `{}` | DNS config for KEDA metrics server pod |
+| `metricsServer.dnsPolicy` | string | `"ClusterFirst"` | Defined the DNS policy for the metric server |
+| `metricsServer.enabled` | bool | `true` | Enable KEDA metrics server and external metrics API resources. |
+| `metricsServer.livenessProbe` | object | `{"failureThreshold":3,"initialDelaySeconds":5,"periodSeconds":10,"successThreshold":1,"timeoutSeconds":1}` | Liveness probes for Metrics API Server ([docs](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/)) |
+| `metricsServer.nodeSelector` | object | `{}` | Node selector for pod scheduling ([docs](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/)) |
+| `metricsServer.readinessProbe` | object | `{"failureThreshold":3,"initialDelaySeconds":5,"periodSeconds":3,"successThreshold":1,"timeoutSeconds":1}` | Readiness probes for Metrics API Server ([docs](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/#define-readiness-probes)) |
+| `metricsServer.replicaCount` | int | `1` | Capability to configure the number of replicas for KEDA metric server. While you can run more replicas of our metric server, only one instance will used and serve traffic. You can run multiple replicas, but they will not improve the performance of KEDA, it could only reduce downtime during a failover. Learn more in [our documentation](https://keda.sh/docs/latest/operate/cluster/#high-availability). |
+| `metricsServer.revisionHistoryLimit` | int | `10` | ReplicaSets for this Deployment you want to retain (Default: 10) |
+| `metricsServer.tolerations` | list | `[]` | Tolerations for pod scheduling ([docs](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/)) |
+| `metricsServer.useHostNetwork` | bool | `false` | Enable metric server to use host network |
+| `permissions.metricServer.restrict.secret` | bool | `false` | Restrict Secret Access for Metrics Server |
+| `podAnnotations.metricsAdapter` | object | `{}` | Pod annotations for KEDA Metrics Adapter |
+| `podDisruptionBudget.metricServer` | object | `{}` | Capability to configure [Pod Disruption Budget] |
+| `podLabels.metricsAdapter` | object | `{}` | Pod labels for KEDA Metrics Adapter |
+| `podSecurityContext.metricServer` | object | [See below](#KEDA-is-secure-by-default) | [Pod security context] of the KEDA metrics apiserver pod |
+| `resources.metricServer` | object | `{"limits":{"cpu":1,"memory":"1000Mi"},"requests":{"cpu":"100m","memory":"100Mi"}}` | Manage [resource request & limits] of KEDA metrics apiserver pod |
+| `securityContext.metricServer` | object | [See below](#KEDA-is-secure-by-default) | [Security context] of the metricServer container |
+| `service.annotations` | object | `{}` | Annotations to add the KEDA Metric Server service |
+| `service.portHttps` | int | `443` | HTTPS port for KEDA Metric Server service |
+| `service.portHttpsTarget` | int | `6443` | HTTPS port for KEDA Metric Server container |
+| `service.type` | string | `"ClusterIP"` | KEDA Metric Server service type |
+| `serviceAccount.metricServer.annotations` | object | `{}` | Annotations to add to the service account |
+| `serviceAccount.metricServer.automountServiceAccountToken` | bool | `true` | Specifies whether a service account should automount API-Credentials |
+| `serviceAccount.metricServer.create` | bool | `true` | Specifies whether a service account should be created |
+| `serviceAccount.metricServer.name` | string | `"keda-metrics-server"` | The name of the service account to use. |
+| `topologySpreadConstraints.metricsServer` | list | `[]` | [Pod Topology Constraints] of KEDA metrics apiserver pod |
+| `upgradeStrategy.metricsApiServer` | object | `{}` | Capability to configure [Deployment upgrade strategy] for Metrics Api Server |
+| `volumes.metricsApiServer.extraVolumeMounts` | list | `[]` | Extra volume mounts for metric server deployment |
+| `volumes.metricsApiServer.extraVolumes` | list | `[]` | Extra volumes for metric server deployment |
+
+### Operations
+
+| Parameter | Type | Default | Description |
+|-----------|------|---------|-------------|
+| `opentelemetry.collector.uri` | string | `""` | Uri of OpenTelemetry Collector to push telemetry to |
+| `opentelemetry.operator.enabled` | bool | `false` | Enable pushing metrics to an OpenTelemetry Collector for operator |
+| `prometheus.metricServer.enabled` | bool | `false` | Enable metric server Prometheus metrics expose |
+| `prometheus.metricServer.podMonitor.additionalLabels` | object | `{}` | Additional labels to add for metric server using podMonitor crd (prometheus operator) |
+| `prometheus.metricServer.podMonitor.enabled` | bool | `false` | Enables PodMonitor creation for the Prometheus Operator |
+| `prometheus.metricServer.podMonitor.interval` | string | `""` | Scraping interval for metric server using podMonitor crd (prometheus operator) |
+| `prometheus.metricServer.podMonitor.metricRelabelings` | list | `[]` | List of expressions that define custom  metric relabeling rules for metric server PodMonitor crd after scrape has happened (prometheus operator). [RelabelConfig Spec] |
+| `prometheus.metricServer.podMonitor.namespace` | string | `""` | Scraping namespace for metric server using podMonitor crd (prometheus operator) |
+| `prometheus.metricServer.podMonitor.relabelings` | list | `[]` | List of expressions that define custom relabeling rules for metric server podMonitor crd (prometheus operator) |
+| `prometheus.metricServer.podMonitor.scrapeTimeout` | string | `""` | Scraping timeout for metric server using podMonitor crd (prometheus operator) |
+| `prometheus.metricServer.port` | int | `8080` | HTTP port used for exposing metrics server prometheus metrics |
+| `prometheus.metricServer.portName` | string | `"metrics"` | HTTP port name for exposing metrics server prometheus metrics |
+| `prometheus.metricServer.serviceMonitor` | object | `{"additionalLabels":{},"enabled":false,"interval":"","jobLabel":"","metricRelabelings":[],"podTargetLabels":[],"port":"metrics","relabelings":[],"relabellings":[],"scheme":"http","scrapeTimeout":"","targetLabels":[],"targetPort":"","tlsConfig":{}}` | App Protocol for service when scraping metrics endpoint appProtocol: http |
+| `prometheus.metricServer.serviceMonitor.additionalLabels` | object | `{}` | Additional labels to add for metric server using ServiceMonitor crd (prometheus operator) |
+| `prometheus.metricServer.serviceMonitor.enabled` | bool | `false` | Enables ServiceMonitor creation for the Prometheus Operator |
+| `prometheus.metricServer.serviceMonitor.interval` | string | `""` | Interval at which metrics should be scraped If not specified Prometheus’ global scrape interval is used. |
+| `prometheus.metricServer.serviceMonitor.jobLabel` | string | `""` | JobLabel selects the label from the associated Kubernetes service which will be used as the job label for all metrics. [ServiceMonitor Spec] |
+| `prometheus.metricServer.serviceMonitor.metricRelabelings` | list | `[]` | List of expressions that define custom  metric relabeling rules for metric server ServiceMonitor crd after scrape has happened (prometheus operator). [RelabelConfig Spec] |
+| `prometheus.metricServer.serviceMonitor.podTargetLabels` | list | `[]` | PodTargetLabels transfers labels on the Kubernetes `Pod` onto the created metrics |
+| `prometheus.metricServer.serviceMonitor.port` | string | `"metrics"` | Name of the service port this endpoint refers to. Mutually exclusive with targetPort |
+| `prometheus.metricServer.serviceMonitor.relabelings` | list | `[]` | List of expressions that define custom relabeling rules for metric server ServiceMonitor crd (prometheus operator). [RelabelConfig Spec] |
+| `prometheus.metricServer.serviceMonitor.relabellings` | list | `[]` | DEPRECATED. List of expressions that define custom relabeling rules for metric server ServiceMonitor crd (prometheus operator). [RelabelConfig Spec] |
+| `prometheus.metricServer.serviceMonitor.scheme` | string | `"http"` | HTTP scheme used for scraping. Defaults to `http` |
+| `prometheus.metricServer.serviceMonitor.scrapeTimeout` | string | `""` | Timeout after which the scrape is ended If not specified, the Prometheus global scrape timeout is used unless it is less than Interval in which the latter is used |
+| `prometheus.metricServer.serviceMonitor.targetLabels` | list | `[]` | TargetLabels transfers labels from the Kubernetes `Service` onto the created metrics |
+| `prometheus.metricServer.serviceMonitor.targetPort` | string | `""` | Name or number of the target port of the Pod behind the Service, the port must be specified with container port property. Mutually exclusive with port |
+| `prometheus.metricServer.serviceMonitor.tlsConfig` | object | `{}` | TLS configuration for scraping metrics |
+| `prometheus.operator.enabled` | bool | `false` | Enable KEDA Operator prometheus metrics expose |
+| `prometheus.operator.podMonitor.additionalLabels` | object | `{}` | Additional labels to add for KEDA Operator using podMonitor crd (prometheus operator) |
+| `prometheus.operator.podMonitor.enabled` | bool | `false` | Enables PodMonitor creation for the Prometheus Operator |
+| `prometheus.operator.podMonitor.interval` | string | `""` | Scraping interval for KEDA Operator using podMonitor crd (prometheus operator) |
+| `prometheus.operator.podMonitor.metricRelabelings` | list | `[]` | List of expressions that define custom  metric relabeling rules for metric server PodMonitor crd after scrape has happened (prometheus operator). [RelabelConfig Spec] |
+| `prometheus.operator.podMonitor.namespace` | string | `""` | Scraping namespace for KEDA Operator using podMonitor crd (prometheus operator) |
+| `prometheus.operator.podMonitor.relabelings` | list | `[]` | List of expressions that define custom relabeling rules for KEDA Operator podMonitor crd (prometheus operator) |
+| `prometheus.operator.podMonitor.scrapeTimeout` | string | `""` | Scraping timeout for KEDA Operator using podMonitor crd (prometheus operator) |
+| `prometheus.operator.port` | int | `8080` | Port used for exposing KEDA Operator prometheus metrics |
+| `prometheus.operator.prometheusRules.additionalLabels` | object | `{}` | Additional labels to add for KEDA Operator using prometheusRules crd (prometheus operator) |
+| `prometheus.operator.prometheusRules.alerts` | list | `[]` | Additional alerts to add for KEDA Operator using prometheusRules crd (prometheus operator) |
+| `prometheus.operator.prometheusRules.enabled` | bool | `false` | Enables PrometheusRules creation for the Prometheus Operator |
+| `prometheus.operator.prometheusRules.namespace` | string | `""` | Scraping namespace for KEDA Operator using prometheusRules crd (prometheus operator) |
+| `prometheus.operator.serviceMonitor` | object | `{"additionalLabels":{},"enabled":false,"interval":"","jobLabel":"","metricRelabelings":[],"podTargetLabels":[],"port":"metrics","relabelings":[],"relabellings":[],"scheme":"http","scrapeTimeout":"","targetLabels":[],"targetPort":"","tlsConfig":{}}` | App Protocol for service when scraping metrics endpoint appProtocol: http |
+| `prometheus.operator.serviceMonitor.additionalLabels` | object | `{}` | Additional labels to add for metric server using ServiceMonitor crd (prometheus operator) |
+| `prometheus.operator.serviceMonitor.enabled` | bool | `false` | Enables ServiceMonitor creation for the Prometheus Operator |
+| `prometheus.operator.serviceMonitor.interval` | string | `""` | Interval at which metrics should be scraped If not specified Prometheus’ global scrape interval is used. |
+| `prometheus.operator.serviceMonitor.jobLabel` | string | `""` | JobLabel selects the label from the associated Kubernetes service which will be used as the job label for all metrics. [ServiceMonitor Spec] |
+| `prometheus.operator.serviceMonitor.metricRelabelings` | list | `[]` | List of expressions that define custom  metric relabeling rules for metric server ServiceMonitor crd after scrape has happened (prometheus operator). [RelabelConfig Spec] |
+| `prometheus.operator.serviceMonitor.podTargetLabels` | list | `[]` | PodTargetLabels transfers labels on the Kubernetes `Pod` onto the created metrics |
+| `prometheus.operator.serviceMonitor.port` | string | `"metrics"` | Name of the service port this endpoint refers to. Mutually exclusive with targetPort |
+| `prometheus.operator.serviceMonitor.relabelings` | list | `[]` | List of expressions that define custom relabeling rules for metric server ServiceMonitor crd (prometheus operator). [RelabelConfig Spec] |
+| `prometheus.operator.serviceMonitor.relabellings` | list | `[]` | DEPRECATED. List of expressions that define custom relabeling rules for metric server ServiceMonitor crd (prometheus operator). [RelabelConfig Spec] |
+| `prometheus.operator.serviceMonitor.scheme` | string | `"http"` | HTTP scheme used for scraping. Defaults to `http` |
+| `prometheus.operator.serviceMonitor.scrapeTimeout` | string | `""` | Timeout after which the scrape is ended If not specified, the Prometheus global scrape timeout is used unless it is less than Interval in which the latter is used |
+| `prometheus.operator.serviceMonitor.targetLabels` | list | `[]` | TargetLabels transfers labels from the Kubernetes `Service` onto the created metrics |
+| `prometheus.operator.serviceMonitor.targetPort` | string | `""` | Name or number of the target port of the Pod behind the Service, the port must be specified with container port property. Mutually exclusive with port |
+| `prometheus.operator.serviceMonitor.tlsConfig` | object | `{}` | TLS configuration for scraping metrics |
+| `prometheus.webhooks.enabled` | bool | `false` | Enable KEDA admission webhooks prometheus metrics expose |
+| `prometheus.webhooks.port` | int | `8080` | Port used for exposing KEDA admission webhooks prometheus metrics |
+| `prometheus.webhooks.prometheusRules.additionalLabels` | object | `{}` | Additional labels to add for KEDA admission webhooks using prometheusRules crd (prometheus operator) |
+| `prometheus.webhooks.prometheusRules.alerts` | list | `[]` | Additional alerts to add for KEDA admission webhooks using prometheusRules crd (prometheus operator) |
+| `prometheus.webhooks.prometheusRules.enabled` | bool | `false` | Enables PrometheusRules creation for the Prometheus Operator |
+| `prometheus.webhooks.prometheusRules.namespace` | string | `""` | Scraping namespace for KEDA admission webhooks using prometheusRules crd (prometheus operator) |
+| `prometheus.webhooks.serviceMonitor` | object | `{"additionalLabels":{},"enabled":false,"interval":"","jobLabel":"","metricRelabelings":[],"podTargetLabels":[],"port":"metrics","relabelings":[],"relabellings":[],"scheme":"http","scrapeTimeout":"","targetLabels":[],"targetPort":"","tlsConfig":{}}` | App Protocol for service when scraping metrics endpoint appProtocol: http |
+| `prometheus.webhooks.serviceMonitor.additionalLabels` | object | `{}` | Additional labels to add for metric server using ServiceMonitor crd (prometheus operator) |
+| `prometheus.webhooks.serviceMonitor.enabled` | bool | `false` | Enables ServiceMonitor creation for the Prometheus webhooks |
+| `prometheus.webhooks.serviceMonitor.interval` | string | `""` | Interval at which metrics should be scraped If not specified Prometheus’ global scrape interval is used. |
+| `prometheus.webhooks.serviceMonitor.jobLabel` | string | `""` | jobLabel selects the label from the associated Kubernetes service which will be used as the job label for all metrics. [ServiceMonitor Spec] |
+| `prometheus.webhooks.serviceMonitor.metricRelabelings` | list | `[]` | List of expressions that define custom  metric relabeling rules for metric server ServiceMonitor crd after scrape has happened (prometheus operator). [RelabelConfig Spec] |
+| `prometheus.webhooks.serviceMonitor.podTargetLabels` | list | `[]` | PodTargetLabels transfers labels on the Kubernetes `Pod` onto the created metrics |
+| `prometheus.webhooks.serviceMonitor.port` | string | `"metrics"` | Name of the service port this endpoint refers to. Mutually exclusive with targetPort |
+| `prometheus.webhooks.serviceMonitor.relabelings` | list | `[]` | List of expressions that define custom relabeling rules for metric server ServiceMonitor crd (prometheus operator). [RelabelConfig Spec] |
+| `prometheus.webhooks.serviceMonitor.relabellings` | list | `[]` | DEPRECATED. List of expressions that define custom relabeling rules for metric server ServiceMonitor crd (prometheus operator). [RelabelConfig Spec] |
+| `prometheus.webhooks.serviceMonitor.scheme` | string | `"http"` | HTTP scheme used for scraping. Defaults to `http` |
+| `prometheus.webhooks.serviceMonitor.scrapeTimeout` | string | `""` | Timeout after which the scrape is ended If not specified, the Prometheus global scrape timeout is used unless it is less than Interval in which the latter is used |
+| `prometheus.webhooks.serviceMonitor.targetLabels` | list | `[]` | TargetLabels transfers labels from the Kubernetes `Service` onto the created metrics |
+| `prometheus.webhooks.serviceMonitor.targetPort` | string | `""` | Name or number of the target port of the Pod behind the Service, the port must be specified with container port property. Mutually exclusive with port |
+| `prometheus.webhooks.serviceMonitor.tlsConfig` | object | `{}` | TLS configuration for scraping metrics |
+
+### Troubleshooting
+
+| Parameter | Type | Default | Description |
+|-----------|------|---------|-------------|
+| `profiling.metricsServer.enabled` | bool | `false` | Enable profiling for KEDA metrics server |
+| `profiling.metricsServer.port` | int | `8083` | Expose profiling on a specific port |
+| `profiling.operator.enabled` | bool | `false` | Enable profiling for KEDA operator |
+| `profiling.operator.port` | int | `8082` | Expose profiling on a specific port |
+| `profiling.webhooks.enabled` | bool | `false` | Enable profiling for KEDA admission webhook |
+| `profiling.webhooks.port` | int | `8084` | Expose profiling on a specific port |
+
+### Admission Webhooks
+
+| Parameter | Type | Default | Description |
+|-----------|------|---------|-------------|
+| `image.webhooks.registry` | string | `"ghcr.io"` | Image registry of KEDA admission-webhooks |
+| `image.webhooks.repository` | string | `"kedacore/keda-admission-webhooks"` | Image name of KEDA admission-webhooks |
+| `image.webhooks.tag` | string | `""` | Image tag of KEDA admission-webhooks . Optional, given app version of Helm chart is used by default |
+| `logging.webhooks.format` | string | `"console"` | Logging format for KEDA Admission webhooks. allowed values: `json` or `console` |
+| `logging.webhooks.level` | string | `"info"` | Logging level for KEDA Operator. allowed values: `debug`, `info`, `error`, or an integer value greater than 0, specified as string |
+| `logging.webhooks.timeEncoding` | string | `"rfc3339"` | Logging time encoding for KEDA Operator. allowed values are `epoch`, `millis`, `nano`, `iso8601`, `rfc3339` or `rfc3339nano` |
+| `podAnnotations.webhooks` | object | `{}` | Pod annotations for KEDA Admission webhooks |
+| `podDisruptionBudget.webhooks` | object | `{}` | Capability to configure [Pod Disruption Budget] |
+| `podLabels.webhooks` | object | `{}` | Pod labels for KEDA Admission webhooks |
+| `podSecurityContext.webhooks` | object | [See below](#KEDA-is-secure-by-default) | [Pod security context] of the KEDA admission webhooks |
+| `resources.webhooks` | object | `{"limits":{"cpu":1,"memory":"1000Mi"},"requests":{"cpu":"100m","memory":"100Mi"}}` | Manage [resource request & limits] of KEDA admission webhooks pod |
+| `securityContext.webhooks` | object | [See below](#KEDA-is-secure-by-default) | [Security context] of the admission webhooks container |
+| `serviceAccount.webhooks.annotations` | object | `{}` | Annotations to add to the service account |
+| `serviceAccount.webhooks.automountServiceAccountToken` | bool | `true` | Specifies whether a service account should automount API-Credentials |
+| `serviceAccount.webhooks.create` | bool | `true` | Specifies whether a service account should be created |
+| `serviceAccount.webhooks.name` | string | `"keda-webhook"` | The name of the service account to use. |
+| `topologySpreadConstraints.webhooks` | list | `[]` | [Pod Topology Constraints] of KEDA admission webhooks pod |
+| `upgradeStrategy.webhooks` | object | `{}` | Capability to configure [Deployment upgrade strategy] for Admission webhooks |
+| `volumes.webhooks.extraVolumeMounts` | list | `[]` | Extra volume mounts for admission webhooks deployment |
+| `volumes.webhooks.extraVolumes` | list | `[]` | Extra volumes for admission webhooks deployment |
+| `webhooks.affinity` | object | `{}` | [Affinity] for pod scheduling for KEDA admission webhooks. Takes precedence over the `affinity` field |
+| `webhooks.dnsConfig` | object | `{}` | DNS config for KEDA admission webhooks pod |
+| `webhooks.enabled` | bool | `true` |  |
+| `webhooks.failurePolicy` | string | `"Ignore"` | [Failure policy](https://kubernetes.io/docs/reference/access-authn-authz/extensible-admission-controllers/#failure-policy) to use with KEDA admission webhooks |
+| `webhooks.healthProbePort` | int | `8081` | Port number to use for KEDA admission webhooks health probe |
+| `webhooks.livenessProbe` | object | `{"failureThreshold":3,"initialDelaySeconds":25,"periodSeconds":10,"successThreshold":1,"timeoutSeconds":1}` | Liveness probes for admission webhooks ([docs](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/)) |
+| `webhooks.name` | string | `"keda-admission-webhooks"` | Name of the KEDA admission webhooks |
+| `webhooks.nodeSelector` | object | `{}` | Node selector for pod scheduling ([docs](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/)) |
+| `webhooks.port` | string | `""` | Port number to use for KEDA admission webhooks. Default is 9443. |
+| `webhooks.readinessProbe` | object | `{"failureThreshold":3,"initialDelaySeconds":20,"periodSeconds":3,"successThreshold":1,"timeoutSeconds":1}` | Readiness probes for admission webhooks ([docs](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/#define-readiness-probes)) |
+| `webhooks.replicaCount` | int | `1` | Capability to configure the number of replicas for KEDA admission webhooks |
+| `webhooks.revisionHistoryLimit` | int | `10` | ReplicaSets for this Deployment you want to retain (Default: 10) |
+| `webhooks.timeoutSeconds` | int | `10` | Timeout in seconds for KEDA admission webhooks |
+| `webhooks.tolerations` | list | `[]` | Tolerations for pod scheduling ([docs](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/)) |
+| `webhooks.useHostNetwork` | bool | `false` | Enable webhook to use host network, this is required on EKS with custom CNI |
+
+Specify each parameter using the `--set key=value[,key=value]` argument to
+`helm install`. For example:
+
+```console
+$ helm install keda kedacore/keda --namespace keda \
+               --set image.keda.tag=<different tag from app version> \
+               --set image.metricsApiServer.tag=<different tag from app version> \
+               --set image.webhooks.tag=<different tag from app version>
+```
+
+Alternatively, a YAML file that specifies the values for the above parameters can
+be provided while installing the chart. For example,
+
+```console
+helm install keda kedacore/keda --namespace keda -f values.yaml
+```
+
+## KEDA is secure by default
+
+Our default configuration strives to be as secure as possible. Because of that, KEDA will run as non-root and be secure-by-default:
+```yaml
+securityContext:
+  operator:
+    capabilities:
+      drop:
+      - ALL
+    allowPrivilegeEscalation: false
+    readOnlyRootFilesystem: true
+    seccompProfile:
+      type: RuntimeDefault
+  metricServer:
+    capabilities:
+      drop:
+      - ALL
+    allowPrivilegeEscalation: false
+    ## Metrics server needs to write the self-signed cert. See FAQ for discussion of options.
+    # readOnlyRootFilesystem: true
+    seccompProfile:
+      type: RuntimeDefault
+  webhooks:
+    capabilities:
+      drop:
+      - ALL
+    allowPrivilegeEscalation: false
+    readOnlyRootFilesystem: true
+    seccompProfile:
+      type: RuntimeDefault
+
+podSecurityContext:
+  operator:
+    runAsNonRoot: true
+  metricServer:
+    runAsNonRoot: true
+  webhooks:
+    runAsNonRoot: true
+```
+
+----------------------------------------------
+Autogenerated from chart metadata using [helm-docs](https://github.com/norwoodj/helm-docs)
+
+[Affinity]: https://kubernetes.io/docs/tasks/configure-pod-container/assign-pods-nodes-using-node-affinity/
+[Deployment upgrade strategy]: https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#strategy
+[GCP Workload Identity]: https://keda.sh/docs/2.10/authentication-providers/gcp-workload-identity/
+[Pod Disruption Budget]: https://kubernetes.io/docs/tasks/run-application/configure-pdb/
+[Pod security context]: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/
+[Security context]: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container
+[Pod Topology Constraints]: https://kubernetes.io/docs/concepts/workloads/pods/pod-topology-spread-constraints/
+[RelabelConfig Spec]: https://github.com/prometheus-operator/prometheus-operator/blob/main/Documentation/api.md#monitoring.coreos.com/v1.RelabelConfig
+[resource request & limits]: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+[ServiceMonitor Spec]: https://github.com/prometheus-operator/prometheus-operator/blob/main/Documentation/api.md#monitoring.coreos.com/v1.ServiceMonitor
diff --git a/packages/system/keda/charts/keda/templates/NOTES.txt b/packages/system/keda/charts/keda/templates/NOTES.txt
new file mode 100644
index 0000000000..c0b4cbb2fa
--- /dev/null
+++ b/packages/system/keda/charts/keda/templates/NOTES.txt
@@ -0,0 +1,72 @@
+{{- if .Values.asciiArt }}
+:::^.     .::::^:     :::::::::::::::    .:::::::::.                   .^.                  
+7???~   .^7????~.     7??????????????.   :?????????77!^.              .7?7.                 
+7???~  ^7???7~.       ~!!!!!!!!!!!!!!.   :????!!!!7????7~.           .7???7.                
+7???~^7????~.                            :????:    :~7???7.         :7?????7.               
+7???7????!.           ::::::::::::.      :????:      .7???!        :7??77???7.              
+7????????7:           7???????????~      :????:       :????:      :???7?5????7.             
+7????!~????^          !77777777777^      :????:       :????:     ^???7?#P7????7.            
+7???~  ^????~                            :????:      :7???!     ^???7J#@J7?????7.           
+7???~   :7???!.                          :????:   .:~7???!.    ~???7Y&@#7777????7.          
+7???~    .7???7:      !!!!!!!!!!!!!!!    :????7!!77????7^     ~??775@@@GJJYJ?????7.         
+7???~     .!????^     7?????????????7.   :?????????7!~:      !????G@@@@@@@@5??????7:        
+::::.       :::::     :::::::::::::::    .::::::::..        .::::JGGGB@@@&7:::::::::        
+                                                                      ?@@#~                  
+                                                                      P@B^                   
+                                                                    :&G:                    
+                                                                    !5.                     
+                                                                    .        
+{{- end -}}    
+
+Kubernetes Event-driven Autoscaling (KEDA) - Application autoscaling made simple.
+
+Get started by deploying Scaled Objects to your cluster:
+    - Information about Scaled Objects : https://keda.sh/docs/latest/concepts/
+    - Samples: https://github.com/kedacore/samples
+
+Get information about the deployed ScaledObjects:
+  kubectl get scaledobject [--namespace <namespace>]
+
+Get details about a deployed ScaledObject:
+  kubectl describe scaledobject <scaled-object-name> [--namespace <namespace>]
+
+Get information about the deployed TriggerAuthentications:
+  kubectl get triggerauthentication [--namespace <namespace>]
+
+Get details about a deployed TriggerAuthentication:
+  kubectl describe triggerauthentication <trigger-authentication-name> [--namespace <namespace>]
+
+Get an overview of the Horizontal Pod Autoscalers (HPA) that KEDA is using behind the scenes:
+  kubectl get hpa [--all-namespaces] [--namespace <namespace>]
+
+{{- if .Values.prometheus.operator.serviceMonitor.relabellings}}
+-------------------------------------------------------------------------------------
+WARNING - prometheus.operator.serviceMonitor.relabellings is deprecated, please migrate to prometheus.operator.serviceMonitor.relabelings instead.
+-------------------------------------------------------------------------------------
+{{- end }}
+{{- if .Values.prometheus.metricServer.serviceMonitor.relabellings}}
+WARNING - prometheus.metricServer.serviceMonitor.relabellings is deprecated, please migrate to prometheus.metricServer.serviceMonitor.relabelings instead.
+{{- end }}
+{{- if .Values.prometheus.webhooks.serviceMonitor.relabellings}}
+-------------------------------------------------------------------------------------
+WARNING - prometheus.webhooks.serviceMonitor.relabellings is deprecated, please migrate to prometheus.webhooks.serviceMonitor.relabelings instead.
+-------------------------------------------------------------------------------------
+{{- end }}
+
+{{- if lt .Capabilities.KubeVersion.Minor "33" }}
+-------------------------------------------------------------------------------------
+WARNING - Running on unsupported Kubernetes version "1.{{.Capabilities.KubeVersion.Minor}}". KEDA 2.20 is supported and tested on Kubernetes "1.33" or higher. See https://keda.sh/docs/latest/operate/cluster/ for details.
+-------------------------------------------------------------------------------------
+{{- end }}
+
+{{- if .Values.serviceAccount.name }}
+-------------------------------------------------------------------------------------
+WARNING - .serviceAccount.name has been deprecated, please migrate to newest version of the Helm Chart values that allows overriding the service account name for each KEDA component.
+          New version: serviceAccount.{operator,metricServer,webhooks}.{create,name,automountServiceAccountToken,annotations}
+-------------------------------------------------------------------------------------
+{{- end }}
+
+Learn more about KEDA:
+- Documentation: https://keda.sh/
+- Support: https://keda.sh/support/
+- File an issue: https://github.com/kedacore/keda/issues/new/choose
diff --git a/packages/system/keda/charts/keda/templates/_helpers.tpl b/packages/system/keda/charts/keda/templates/_helpers.tpl
new file mode 100644
index 0000000000..e64afaa2d1
--- /dev/null
+++ b/packages/system/keda/charts/keda/templates/_helpers.tpl
@@ -0,0 +1,32 @@
+{{/* vim: set filetype=mustache: */}}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "keda.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Generate basic labels for CRD
+*/}}
+{{- define "keda.crd-labels" }}
+helm.sh/chart: {{ include "keda.chart" . }}
+app.kubernetes.io/component: operator
+app.kubernetes.io/managed-by: {{ .Values.customManagedBy | default .Release.Service }}
+app.kubernetes.io/part-of: {{ .Values.operator.name }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion }}
+{{- end }}
+{{- end }}
+
+{{/*
+Generate basic labels
+*/}}
+{{- define "keda.labels" -}}
+{{- include "keda.crd-labels" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- if .Values.additionalLabels }}
+{{ toYaml .Values.additionalLabels }}
+{{- end }}
+{{- end }}
diff --git a/packages/system/keda/charts/keda/templates/cert-manager/keda-issuer.yaml b/packages/system/keda/charts/keda/templates/cert-manager/keda-issuer.yaml
new file mode 100644
index 0000000000..01d92e0826
--- /dev/null
+++ b/packages/system/keda/charts/keda/templates/cert-manager/keda-issuer.yaml
@@ -0,0 +1,16 @@
+{{- if and .Values.certificates.certManager.enabled .Values.certificates.certManager.issuer.generate }}
+apiVersion: cert-manager.io/v1
+kind: Issuer
+metadata:
+  {{- with .Values.additionalAnnotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  name: {{ .Values.operator.name }}-issuer
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "keda.labels" . | indent 4 }}
+spec:
+  ca:
+    secretName: {{ .Values.certificates.certManager.caSecretName }}
+{{- end }}
diff --git a/packages/system/keda/charts/keda/templates/cert-manager/keda-tls-certificate.yaml b/packages/system/keda/charts/keda/templates/cert-manager/keda-tls-certificate.yaml
new file mode 100644
index 0000000000..cf6b6b983a
--- /dev/null
+++ b/packages/system/keda/charts/keda/templates/cert-manager/keda-tls-certificate.yaml
@@ -0,0 +1,48 @@
+{{- if .Values.certificates.certManager.enabled }}
+apiVersion: cert-manager.io/v1
+kind: Certificate
+metadata:
+  name: {{ .Values.operator.name }}-tls-certificates
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "keda.labels" . | indent 4 }}
+spec:
+  commonName: {{ .Values.operator.name }}
+  dnsNames:
+  - {{ .Values.operator.name }}.{{ .Release.Namespace }}
+  - {{ .Values.operator.name }}.{{ .Release.Namespace }}.svc
+  - {{ .Values.operator.name }}.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}
+  - {{ .Values.operator.name }}-metrics-apiserver.{{ .Release.Namespace }}
+  - {{ .Values.operator.name }}-metrics-apiserver.{{ .Release.Namespace }}.svc
+  - {{ .Values.operator.name }}-metrics-apiserver.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}
+  - {{ .Values.webhooks.name }}.{{ .Release.Namespace }}
+  - {{ .Values.webhooks.name }}.{{ .Release.Namespace }}.svc
+  - {{ .Values.webhooks.name }}.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}
+  secretName: {{ .Values.certificates.secretName }}
+  secretTemplate:
+    {{- toYaml .Values.certificates.certManager.secretTemplate | nindent 4 }}
+  usages:
+    - server auth
+    - client auth
+  privateKey:
+    algorithm: RSA
+    size: 2048
+  duration: {{ .Values.certificates.certManager.duration }}
+  renewBefore: {{ .Values.certificates.certManager.renewBefore }}
+  issuerRef:
+    {{- if .Values.certificates.certManager.issuer.generate }}
+    name: {{ .Values.operator.name }}-issuer
+    kind: Issuer
+    group: cert-manager.io
+    {{- else }}
+    {{- if .Values.certificates.certManager.issuer.name }}
+    name: {{ .Values.certificates.certManager.issuer.name }}
+    {{- end }}
+    {{- if .Values.certificates.certManager.issuer.kind }}
+    kind: {{ .Values.certificates.certManager.issuer.kind }}
+    {{- end }}
+    {{- if .Values.certificates.certManager.issuer.group }}
+    group: {{ .Values.certificates.certManager.issuer.group }}
+    {{- end }}
+    {{- end }}
+{{- end }}
diff --git a/packages/system/keda/charts/keda/templates/cert-manager/self-ca.yaml b/packages/system/keda/charts/keda/templates/cert-manager/self-ca.yaml
new file mode 100644
index 0000000000..70c4288173
--- /dev/null
+++ b/packages/system/keda/charts/keda/templates/cert-manager/self-ca.yaml
@@ -0,0 +1,24 @@
+{{- if and .Values.certificates.certManager.enabled .Values.certificates.certManager.generateCA .Values.certificates.certManager.issuer.generate }}
+apiVersion: cert-manager.io/v1
+kind: Certificate
+metadata:
+  name: {{ .Values.operator.name }}-ca
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "keda.labels" . | indent 4 }}
+spec:
+  isCA: true
+  commonName: {{ .Values.operator.name }}
+  secretName: {{ .Values.certificates.certManager.caSecretName }}
+  secretTemplate:
+    {{- toYaml .Values.certificates.certManager.secretTemplate | nindent 4 }}
+  privateKey:
+    algorithm: RSA
+    size: 2048
+  duration: 43800h0m0s     # 5 years
+  renewBefore: 14600h0m0s  # 1.6 year, 1/3rd of the duration
+  issuerRef:
+    name: {{ .Values.operator.name }}-selfsigned-issuer
+    kind: Issuer
+    group: cert-manager.io
+{{- end }}
diff --git a/packages/system/keda/charts/keda/templates/cert-manager/self-issuer.yaml b/packages/system/keda/charts/keda/templates/cert-manager/self-issuer.yaml
new file mode 100644
index 0000000000..c7330da4a5
--- /dev/null
+++ b/packages/system/keda/charts/keda/templates/cert-manager/self-issuer.yaml
@@ -0,0 +1,15 @@
+{{- if and .Values.certificates.certManager.enabled .Values.certificates.certManager.generateCA .Values.certificates.certManager.issuer.generate }}
+apiVersion: cert-manager.io/v1
+kind: Issuer
+metadata:
+  {{- with .Values.additionalAnnotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  name: {{ .Values.operator.name }}-selfsigned-issuer
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "keda.labels" . | indent 4 }}
+spec:
+  selfSigned: {}
+{{- end }}
diff --git a/packages/system/keda/charts/keda/templates/crds/crd-cloudeventsources.yaml b/packages/system/keda/charts/keda/templates/crds/crd-cloudeventsources.yaml
new file mode 100644
index 0000000000..f4c6eab848
--- /dev/null
+++ b/packages/system/keda/charts/keda/templates/crds/crd-cloudeventsources.yaml
@@ -0,0 +1,180 @@
+{{- if .Values.crds.install }}
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.21.0
+    {{- if (or .Values.crds.additionalAnnotations .Values.additionalAnnotations) }}
+    {{- toYaml (merge .Values.crds.additionalAnnotations .Values.additionalAnnotations) | nindent 4 }}
+    {{- end }}
+  labels:
+    app.kubernetes.io/name: {{ .Values.operator.name }}
+    {{- include "keda.crd-labels" . | indent 4 }}
+  name: cloudeventsources.eventing.keda.sh
+spec:
+  group: eventing.keda.sh
+  names:
+    kind: CloudEventSource
+    listKind: CloudEventSourceList
+    plural: cloudeventsources
+    singular: cloudeventsource
+  scope: Namespaced
+  versions:
+  - additionalPrinterColumns:
+    - jsonPath: .status.conditions[?(@.type=="Active")].status
+      name: Active
+      type: string
+    name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        description: CloudEventSource defines how a KEDA event will be sent to event
+          sink
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: CloudEventSourceSpec defines the spec of CloudEventSource
+            properties:
+              authenticationRef:
+                description: |-
+                  AuthenticationRef points to the TriggerAuthentication or ClusterTriggerAuthentication object that
+                  is used to authenticate the scaler with the environment
+                properties:
+                  kind:
+                    description: Kind of the resource being referred to. Defaults
+                      to TriggerAuthentication.
+                    enum:
+                    - TriggerAuthentication
+                    - ClusterTriggerAuthentication
+                    type: string
+                  name:
+                    type: string
+                required:
+                - name
+                type: object
+              clusterName:
+                type: string
+              destination:
+                description: Destination defines the various ways to emit events
+                properties:
+                  azureEventGridTopic:
+                    properties:
+                      endpoint:
+                        type: string
+                    required:
+                    - endpoint
+                    type: object
+                  http:
+                    properties:
+                      uri:
+                        type: string
+                    required:
+                    - uri
+                    type: object
+                type: object
+              eventSubscription:
+                description: EventSubscription defines filters for events
+                properties:
+                  excludedEventTypes:
+                    items:
+                      enum:
+                      - keda.scaledobject.ready.v1
+                      - keda.scaledobject.failed.v1
+                      - keda.scaledobject.removed.v1
+                      - keda.scaledobject.paused.v1
+                      - keda.scaledobject.unpaused.v1
+                      - keda.scaledjob.ready.v1
+                      - keda.scaledjob.failed.v1
+                      - keda.scaledjob.removed.v1
+                      - keda.scaledjob.paused.v1
+                      - keda.scaledjob.unpaused.v1
+                      - keda.scaledjob.rolloutcleanup.started.v1
+                      - keda.scaledjob.rolloutcleanup.completed.v1
+                      - keda.scaledjob.rolloutcleanup.failed.v1
+                      - keda.authentication.triggerauthentication.created.v1
+                      - keda.authentication.triggerauthentication.updated.v1
+                      - keda.authentication.triggerauthentication.removed.v1
+                      - keda.authentication.clustertriggerauthentication.created.v1
+                      - keda.authentication.clustertriggerauthentication.updated.v1
+                      - keda.authentication.clustertriggerauthentication.removed.v1
+                      type: string
+                    type: array
+                  includedEventTypes:
+                    items:
+                      enum:
+                      - keda.scaledobject.ready.v1
+                      - keda.scaledobject.failed.v1
+                      - keda.scaledobject.removed.v1
+                      - keda.scaledobject.paused.v1
+                      - keda.scaledobject.unpaused.v1
+                      - keda.scaledjob.ready.v1
+                      - keda.scaledjob.failed.v1
+                      - keda.scaledjob.removed.v1
+                      - keda.scaledjob.paused.v1
+                      - keda.scaledjob.unpaused.v1
+                      - keda.scaledjob.rolloutcleanup.started.v1
+                      - keda.scaledjob.rolloutcleanup.completed.v1
+                      - keda.scaledjob.rolloutcleanup.failed.v1
+                      - keda.authentication.triggerauthentication.created.v1
+                      - keda.authentication.triggerauthentication.updated.v1
+                      - keda.authentication.triggerauthentication.removed.v1
+                      - keda.authentication.clustertriggerauthentication.created.v1
+                      - keda.authentication.clustertriggerauthentication.updated.v1
+                      - keda.authentication.clustertriggerauthentication.removed.v1
+                      type: string
+                    type: array
+                type: object
+            required:
+            - destination
+            type: object
+          status:
+            description: CloudEventSourceStatus defines the observed state of CloudEventSource
+            properties:
+              conditions:
+                description: Conditions an array representation to store multiple
+                  Conditions
+                items:
+                  description: Condition to store the condition state
+                  properties:
+                    message:
+                      description: A human readable message indicating details about
+                        the transition.
+                      type: string
+                    reason:
+                      description: The reason for the condition's last transition.
+                      type: string
+                    status:
+                      description: Status of the condition, one of True, False, Unknown.
+                      type: string
+                    type:
+                      description: Type of condition
+                      type: string
+                  required:
+                  - status
+                  - type
+                  type: object
+                type: array
+            type: object
+        required:
+        - spec
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}
+{{- end -}}
diff --git a/packages/system/keda/charts/keda/templates/crds/crd-clustercloudeventsources.yaml b/packages/system/keda/charts/keda/templates/crds/crd-clustercloudeventsources.yaml
new file mode 100644
index 0000000000..15683af2c9
--- /dev/null
+++ b/packages/system/keda/charts/keda/templates/crds/crd-clustercloudeventsources.yaml
@@ -0,0 +1,178 @@
+{{- if .Values.crds.install }}
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.21.0
+    {{- if (or .Values.crds.additionalAnnotations .Values.additionalAnnotations) }}
+    {{- toYaml (merge .Values.crds.additionalAnnotations .Values.additionalAnnotations) | nindent 4 }}
+    {{- end }}
+  labels:
+    app.kubernetes.io/name: {{ .Values.operator.name }}
+    {{- include "keda.crd-labels" . | indent 4 }}
+  name: clustercloudeventsources.eventing.keda.sh
+spec:
+  group: eventing.keda.sh
+  names:
+    kind: ClusterCloudEventSource
+    listKind: ClusterCloudEventSourceList
+    plural: clustercloudeventsources
+    singular: clustercloudeventsource
+  scope: Cluster
+  versions:
+  - additionalPrinterColumns:
+    - jsonPath: .status.conditions[?(@.type=="Active")].status
+      name: Active
+      type: string
+    name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: CloudEventSourceSpec defines the spec of CloudEventSource
+            properties:
+              authenticationRef:
+                description: |-
+                  AuthenticationRef points to the TriggerAuthentication or ClusterTriggerAuthentication object that
+                  is used to authenticate the scaler with the environment
+                properties:
+                  kind:
+                    description: Kind of the resource being referred to. Defaults
+                      to TriggerAuthentication.
+                    enum:
+                    - TriggerAuthentication
+                    - ClusterTriggerAuthentication
+                    type: string
+                  name:
+                    type: string
+                required:
+                - name
+                type: object
+              clusterName:
+                type: string
+              destination:
+                description: Destination defines the various ways to emit events
+                properties:
+                  azureEventGridTopic:
+                    properties:
+                      endpoint:
+                        type: string
+                    required:
+                    - endpoint
+                    type: object
+                  http:
+                    properties:
+                      uri:
+                        type: string
+                    required:
+                    - uri
+                    type: object
+                type: object
+              eventSubscription:
+                description: EventSubscription defines filters for events
+                properties:
+                  excludedEventTypes:
+                    items:
+                      enum:
+                      - keda.scaledobject.ready.v1
+                      - keda.scaledobject.failed.v1
+                      - keda.scaledobject.removed.v1
+                      - keda.scaledobject.paused.v1
+                      - keda.scaledobject.unpaused.v1
+                      - keda.scaledjob.ready.v1
+                      - keda.scaledjob.failed.v1
+                      - keda.scaledjob.removed.v1
+                      - keda.scaledjob.paused.v1
+                      - keda.scaledjob.unpaused.v1
+                      - keda.scaledjob.rolloutcleanup.started.v1
+                      - keda.scaledjob.rolloutcleanup.completed.v1
+                      - keda.scaledjob.rolloutcleanup.failed.v1
+                      - keda.authentication.triggerauthentication.created.v1
+                      - keda.authentication.triggerauthentication.updated.v1
+                      - keda.authentication.triggerauthentication.removed.v1
+                      - keda.authentication.clustertriggerauthentication.created.v1
+                      - keda.authentication.clustertriggerauthentication.updated.v1
+                      - keda.authentication.clustertriggerauthentication.removed.v1
+                      type: string
+                    type: array
+                  includedEventTypes:
+                    items:
+                      enum:
+                      - keda.scaledobject.ready.v1
+                      - keda.scaledobject.failed.v1
+                      - keda.scaledobject.removed.v1
+                      - keda.scaledobject.paused.v1
+                      - keda.scaledobject.unpaused.v1
+                      - keda.scaledjob.ready.v1
+                      - keda.scaledjob.failed.v1
+                      - keda.scaledjob.removed.v1
+                      - keda.scaledjob.paused.v1
+                      - keda.scaledjob.unpaused.v1
+                      - keda.scaledjob.rolloutcleanup.started.v1
+                      - keda.scaledjob.rolloutcleanup.completed.v1
+                      - keda.scaledjob.rolloutcleanup.failed.v1
+                      - keda.authentication.triggerauthentication.created.v1
+                      - keda.authentication.triggerauthentication.updated.v1
+                      - keda.authentication.triggerauthentication.removed.v1
+                      - keda.authentication.clustertriggerauthentication.created.v1
+                      - keda.authentication.clustertriggerauthentication.updated.v1
+                      - keda.authentication.clustertriggerauthentication.removed.v1
+                      type: string
+                    type: array
+                type: object
+            required:
+            - destination
+            type: object
+          status:
+            description: CloudEventSourceStatus defines the observed state of CloudEventSource
+            properties:
+              conditions:
+                description: Conditions an array representation to store multiple
+                  Conditions
+                items:
+                  description: Condition to store the condition state
+                  properties:
+                    message:
+                      description: A human readable message indicating details about
+                        the transition.
+                      type: string
+                    reason:
+                      description: The reason for the condition's last transition.
+                      type: string
+                    status:
+                      description: Status of the condition, one of True, False, Unknown.
+                      type: string
+                    type:
+                      description: Type of condition
+                      type: string
+                  required:
+                  - status
+                  - type
+                  type: object
+                type: array
+            type: object
+        required:
+        - spec
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}
+{{- end -}}
diff --git a/packages/system/keda/charts/keda/templates/crds/crd-clustertriggerauthentications.yaml b/packages/system/keda/charts/keda/templates/crds/crd-clustertriggerauthentications.yaml
new file mode 100644
index 0000000000..368b5cf7ec
--- /dev/null
+++ b/packages/system/keda/charts/keda/templates/crds/crd-clustertriggerauthentications.yaml
@@ -0,0 +1,672 @@
+{{- if .Values.crds.install }}
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.21.0
+    {{- if (or .Values.crds.additionalAnnotations .Values.additionalAnnotations) }}
+    {{- toYaml (merge .Values.crds.additionalAnnotations .Values.additionalAnnotations) | nindent 4 }}
+    {{- end }}
+  labels:
+    app.kubernetes.io/name: {{ .Values.operator.name }}
+    {{- include "keda.crd-labels" . | indent 4 }}
+  name: clustertriggerauthentications.keda.sh
+spec:
+  group: keda.sh
+  names:
+    kind: ClusterTriggerAuthentication
+    listKind: ClusterTriggerAuthenticationList
+    plural: clustertriggerauthentications
+    shortNames:
+    - cta
+    - clustertriggerauth
+    singular: clustertriggerauthentication
+  scope: Cluster
+  versions:
+  - additionalPrinterColumns:
+    - jsonPath: .spec.podIdentity.provider
+      name: PodIdentity
+      type: string
+    - jsonPath: .spec.secretTargetRef[*].name
+      name: Secret
+      type: string
+    - jsonPath: .spec.env[*].name
+      name: Env
+      type: string
+    - jsonPath: .spec.filePath
+      name: FilePath
+      type: string
+    - jsonPath: .spec.hashiCorpVault.address
+      name: VaultAddress
+      type: string
+    - jsonPath: .status.scaledobjects
+      name: ScaledObjects
+      priority: 1
+      type: string
+    - jsonPath: .status.scaledjobs
+      name: ScaledJobs
+      priority: 1
+      type: string
+    name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        description: ClusterTriggerAuthentication defines how a trigger can authenticate
+          globally
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: TriggerAuthenticationSpec defines the various ways to authenticate
+            properties:
+              awsSecretManager:
+                description: AwsSecretManager is used to authenticate using AwsSecretManager
+                properties:
+                  credentials:
+                    properties:
+                      accessKey:
+                        properties:
+                          valueFrom:
+                            properties:
+                              secretKeyRef:
+                                properties:
+                                  key:
+                                    type: string
+                                  name:
+                                    type: string
+                                required:
+                                - key
+                                - name
+                                type: object
+                            required:
+                            - secretKeyRef
+                            type: object
+                        required:
+                        - valueFrom
+                        type: object
+                      accessSecretKey:
+                        properties:
+                          valueFrom:
+                            properties:
+                              secretKeyRef:
+                                properties:
+                                  key:
+                                    type: string
+                                  name:
+                                    type: string
+                                required:
+                                - key
+                                - name
+                                type: object
+                            required:
+                            - secretKeyRef
+                            type: object
+                        required:
+                        - valueFrom
+                        type: object
+                      accessToken:
+                        properties:
+                          valueFrom:
+                            properties:
+                              secretKeyRef:
+                                properties:
+                                  key:
+                                    type: string
+                                  name:
+                                    type: string
+                                required:
+                                - key
+                                - name
+                                type: object
+                            required:
+                            - secretKeyRef
+                            type: object
+                        required:
+                        - valueFrom
+                        type: object
+                    required:
+                    - accessKey
+                    - accessSecretKey
+                    type: object
+                  podIdentity:
+                    description: |-
+                      AuthPodIdentity allows users to select the platform native identity
+                      mechanism
+                    properties:
+                      externalID:
+                        description: ExternalID sets the External ID to be used when
+                          assuming an identity. This is only applicable when using
+                          AWS pod identity with a RoleArn.
+                        type: string
+                      identityAuthorityHost:
+                        description: Set identityAuthorityHost to override the default
+                          Azure authority host. If this is set, then the IdentityTenantID
+                          must also be set
+                        type: string
+                      identityId:
+                        type: string
+                      identityOwner:
+                        description: IdentityOwner configures which identity has to
+                          be used during auto discovery, keda or the scaled workload.
+                          Mutually exclusive with roleArn
+                        enum:
+                        - keda
+                        - workload
+                        type: string
+                      identityTenantId:
+                        description: Set identityTenantId to override the default
+                          Azure tenant id. If this is set, then the IdentityID must
+                          also be set
+                        type: string
+                      provider:
+                        description: PodIdentityProvider contains the list of providers
+                        enum:
+                        - azure-workload
+                        - gcp
+                        - aws
+                        - aws-eks
+                        - none
+                        type: string
+                      roleArn:
+                        description: RoleArn sets the AWS RoleArn to be used. Mutually
+                          exclusive with IdentityOwner
+                        type: string
+                    required:
+                    - provider
+                    type: object
+                  region:
+                    type: string
+                  secrets:
+                    items:
+                      properties:
+                        name:
+                          type: string
+                        parameter:
+                          type: string
+                        secretKey:
+                          type: string
+                        versionId:
+                          type: string
+                        versionStage:
+                          type: string
+                      required:
+                      - name
+                      - parameter
+                      type: object
+                    minItems: 1
+                    type: array
+                required:
+                - secrets
+                type: object
+              azureKeyVault:
+                description: AzureKeyVault is used to authenticate using Azure Key
+                  Vault
+                properties:
+                  cloud:
+                    properties:
+                      activeDirectoryEndpoint:
+                        type: string
+                      keyVaultResourceURL:
+                        type: string
+                      type:
+                        type: string
+                    required:
+                    - type
+                    type: object
+                  credentials:
+                    properties:
+                      clientId:
+                        type: string
+                      clientSecret:
+                        properties:
+                          valueFrom:
+                            properties:
+                              secretKeyRef:
+                                properties:
+                                  key:
+                                    type: string
+                                  name:
+                                    type: string
+                                required:
+                                - key
+                                - name
+                                type: object
+                            required:
+                            - secretKeyRef
+                            type: object
+                        required:
+                        - valueFrom
+                        type: object
+                      tenantId:
+                        type: string
+                    required:
+                    - clientId
+                    - clientSecret
+                    - tenantId
+                    type: object
+                  podIdentity:
+                    description: |-
+                      AuthPodIdentity allows users to select the platform native identity
+                      mechanism
+                    properties:
+                      externalID:
+                        description: ExternalID sets the External ID to be used when
+                          assuming an identity. This is only applicable when using
+                          AWS pod identity with a RoleArn.
+                        type: string
+                      identityAuthorityHost:
+                        description: Set identityAuthorityHost to override the default
+                          Azure authority host. If this is set, then the IdentityTenantID
+                          must also be set
+                        type: string
+                      identityId:
+                        type: string
+                      identityOwner:
+                        description: IdentityOwner configures which identity has to
+                          be used during auto discovery, keda or the scaled workload.
+                          Mutually exclusive with roleArn
+                        enum:
+                        - keda
+                        - workload
+                        type: string
+                      identityTenantId:
+                        description: Set identityTenantId to override the default
+                          Azure tenant id. If this is set, then the IdentityID must
+                          also be set
+                        type: string
+                      provider:
+                        description: PodIdentityProvider contains the list of providers
+                        enum:
+                        - azure-workload
+                        - gcp
+                        - aws
+                        - aws-eks
+                        - none
+                        type: string
+                      roleArn:
+                        description: RoleArn sets the AWS RoleArn to be used. Mutually
+                          exclusive with IdentityOwner
+                        type: string
+                    required:
+                    - provider
+                    type: object
+                  secrets:
+                    items:
+                      properties:
+                        name:
+                          type: string
+                        parameter:
+                          type: string
+                        version:
+                          type: string
+                      required:
+                      - name
+                      - parameter
+                      type: object
+                    minItems: 1
+                    type: array
+                  vaultUri:
+                    type: string
+                required:
+                - secrets
+                - vaultUri
+                type: object
+              boundServiceAccountToken:
+                items:
+                  properties:
+                    parameter:
+                      type: string
+                    serviceAccountName:
+                      type: string
+                  required:
+                  - parameter
+                  - serviceAccountName
+                  type: object
+                type: array
+              configMapTargetRef:
+                items:
+                  description: AuthConfigMapTargetRef is used to authenticate using
+                    a reference to a config map
+                  properties:
+                    key:
+                      type: string
+                    name:
+                      type: string
+                    parameter:
+                      type: string
+                  required:
+                  - key
+                  - name
+                  - parameter
+                  type: object
+                type: array
+              env:
+                items:
+                  description: |-
+                    AuthEnvironment is used to authenticate using environment variables
+                    in the destination ScaleTarget spec
+                  properties:
+                    containerName:
+                      type: string
+                    name:
+                      type: string
+                    parameter:
+                      type: string
+                  required:
+                  - name
+                  - parameter
+                  type: object
+                type: array
+              filePath:
+                description: |-
+                  FilePath specifies a file containing auth parameters as JSON map[string]string.
+                  When set, auth params are read directly from this file instead.
+                type: string
+              gcpSecretManager:
+                properties:
+                  credentials:
+                    properties:
+                      clientSecret:
+                        properties:
+                          valueFrom:
+                            properties:
+                              secretKeyRef:
+                                properties:
+                                  key:
+                                    type: string
+                                  name:
+                                    type: string
+                                required:
+                                - key
+                                - name
+                                type: object
+                            required:
+                            - secretKeyRef
+                            type: object
+                        required:
+                        - valueFrom
+                        type: object
+                    required:
+                    - clientSecret
+                    type: object
+                  podIdentity:
+                    description: |-
+                      AuthPodIdentity allows users to select the platform native identity
+                      mechanism
+                    properties:
+                      externalID:
+                        description: ExternalID sets the External ID to be used when
+                          assuming an identity. This is only applicable when using
+                          AWS pod identity with a RoleArn.
+                        type: string
+                      identityAuthorityHost:
+                        description: Set identityAuthorityHost to override the default
+                          Azure authority host. If this is set, then the IdentityTenantID
+                          must also be set
+                        type: string
+                      identityId:
+                        type: string
+                      identityOwner:
+                        description: IdentityOwner configures which identity has to
+                          be used during auto discovery, keda or the scaled workload.
+                          Mutually exclusive with roleArn
+                        enum:
+                        - keda
+                        - workload
+                        type: string
+                      identityTenantId:
+                        description: Set identityTenantId to override the default
+                          Azure tenant id. If this is set, then the IdentityID must
+                          also be set
+                        type: string
+                      provider:
+                        description: PodIdentityProvider contains the list of providers
+                        enum:
+                        - azure-workload
+                        - gcp
+                        - aws
+                        - aws-eks
+                        - none
+                        type: string
+                      roleArn:
+                        description: RoleArn sets the AWS RoleArn to be used. Mutually
+                          exclusive with IdentityOwner
+                        type: string
+                    required:
+                    - provider
+                    type: object
+                  secrets:
+                    items:
+                      properties:
+                        id:
+                          type: string
+                        parameter:
+                          type: string
+                        version:
+                          type: string
+                      required:
+                      - id
+                      - parameter
+                      type: object
+                    minItems: 1
+                    type: array
+                required:
+                - secrets
+                type: object
+              hashiCorpVault:
+                description: HashiCorpVault is used to authenticate using Hashicorp
+                  Vault
+                properties:
+                  address:
+                    type: string
+                  authentication:
+                    description: VaultAuthentication contains the list of Hashicorp
+                      Vault authentication methods
+                    enum:
+                    - token
+                    - kubernetes
+                    type: string
+                  credential:
+                    description: Credential defines the Hashicorp Vault credentials
+                      depending on the authentication method
+                    properties:
+                      serviceAccount:
+                        type: string
+                      serviceAccountName:
+                        type: string
+                      token:
+                        type: string
+                    type: object
+                  mount:
+                    type: string
+                  namespace:
+                    type: string
+                  role:
+                    type: string
+                  secrets:
+                    items:
+                      description: VaultSecret defines the mapping between the path
+                        of the secret in Vault to the parameter
+                      properties:
+                        key:
+                          type: string
+                        parameter:
+                          type: string
+                        path:
+                          type: string
+                        pkiData:
+                          properties:
+                            altNames:
+                              type: string
+                            commonName:
+                              type: string
+                            format:
+                              type: string
+                            ipSans:
+                              type: string
+                            otherSans:
+                              type: string
+                            ttl:
+                              type: string
+                            uriSans:
+                              type: string
+                          type: object
+                        type:
+                          description: VaultSecretType defines the type of vault secret
+                          enum:
+                          - ""
+                          - secretV2
+                          - secret
+                          - pki
+                          type: string
+                      required:
+                      - key
+                      - parameter
+                      - path
+                      type: object
+                    minItems: 1
+                    type: array
+                required:
+                - address
+                - authentication
+                - secrets
+                type: object
+              oauth2:
+                properties:
+                  clientId:
+                    type: string
+                  clientSecret:
+                    properties:
+                      valueFrom:
+                        properties:
+                          secretKeyRef:
+                            properties:
+                              key:
+                                type: string
+                              name:
+                                type: string
+                            required:
+                            - key
+                            - name
+                            type: object
+                        required:
+                        - secretKeyRef
+                        type: object
+                    required:
+                    - valueFrom
+                    type: object
+                  scopes:
+                    items:
+                      type: string
+                    type: array
+                  tokenUrl:
+                    type: string
+                  tokenUrlParams:
+                    additionalProperties:
+                      type: string
+                    type: object
+                  type:
+                    default: clientCredentials
+                    enum:
+                    - clientCredentials
+                    type: string
+                required:
+                - clientId
+                - tokenUrl
+                - type
+                type: object
+              podIdentity:
+                description: |-
+                  AuthPodIdentity allows users to select the platform native identity
+                  mechanism
+                properties:
+                  externalID:
+                    description: ExternalID sets the External ID to be used when assuming
+                      an identity. This is only applicable when using AWS pod identity
+                      with a RoleArn.
+                    type: string
+                  identityAuthorityHost:
+                    description: Set identityAuthorityHost to override the default
+                      Azure authority host. If this is set, then the IdentityTenantID
+                      must also be set
+                    type: string
+                  identityId:
+                    type: string
+                  identityOwner:
+                    description: IdentityOwner configures which identity has to be
+                      used during auto discovery, keda or the scaled workload. Mutually
+                      exclusive with roleArn
+                    enum:
+                    - keda
+                    - workload
+                    type: string
+                  identityTenantId:
+                    description: Set identityTenantId to override the default Azure
+                      tenant id. If this is set, then the IdentityID must also be
+                      set
+                    type: string
+                  provider:
+                    description: PodIdentityProvider contains the list of providers
+                    enum:
+                    - azure-workload
+                    - gcp
+                    - aws
+                    - aws-eks
+                    - none
+                    type: string
+                  roleArn:
+                    description: RoleArn sets the AWS RoleArn to be used. Mutually
+                      exclusive with IdentityOwner
+                    type: string
+                required:
+                - provider
+                type: object
+              secretTargetRef:
+                items:
+                  description: AuthSecretTargetRef is used to authenticate using a
+                    reference to a secret
+                  properties:
+                    key:
+                      type: string
+                    name:
+                      type: string
+                    parameter:
+                      type: string
+                  required:
+                  - key
+                  - name
+                  - parameter
+                  type: object
+                type: array
+            type: object
+          status:
+            description: TriggerAuthenticationStatus defines the observed state of
+              TriggerAuthentication
+            properties:
+              scaledjobs:
+                type: string
+              scaledobjects:
+                type: string
+            type: object
+        required:
+        - spec
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}
+{{- end -}}
diff --git a/packages/system/keda/charts/keda/templates/crds/crd-scaledjobs.yaml b/packages/system/keda/charts/keda/templates/crds/crd-scaledjobs.yaml
new file mode 100644
index 0000000000..4c9c8c9ef0
--- /dev/null
+++ b/packages/system/keda/charts/keda/templates/crds/crd-scaledjobs.yaml
@@ -0,0 +1,9179 @@
+{{- if .Values.crds.install }}
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.21.0
+    {{- if (or .Values.crds.additionalAnnotations .Values.additionalAnnotations) }}
+    {{- toYaml (merge .Values.crds.additionalAnnotations .Values.additionalAnnotations) | nindent 4 }}
+    {{- end }}
+  labels:
+    app.kubernetes.io/name: {{ .Values.operator.name }}
+    {{- include "keda.crd-labels" . | indent 4 }}
+  name: scaledjobs.keda.sh
+spec:
+  group: keda.sh
+  names:
+    kind: ScaledJob
+    listKind: ScaledJobList
+    plural: scaledjobs
+    shortNames:
+    - sj
+    singular: scaledjob
+  scope: Namespaced
+  versions:
+  - additionalPrinterColumns:
+    - jsonPath: .spec.minReplicaCount
+      name: Min
+      type: integer
+    - jsonPath: .spec.maxReplicaCount
+      name: Max
+      type: integer
+    - jsonPath: .status.conditions[?(@.type=="Ready")].status
+      name: Ready
+      type: string
+    - jsonPath: .status.conditions[?(@.type=="Active")].status
+      name: Active
+      type: string
+    - jsonPath: .status.conditions[?(@.type=="Paused")].status
+      name: Paused
+      type: string
+    - jsonPath: .status.triggersTypes
+      name: Triggers
+      type: string
+    - jsonPath: .status.authenticationsTypes
+      name: Authentications
+      type: string
+    - jsonPath: .metadata.creationTimestamp
+      name: Age
+      type: date
+    name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        description: ScaledJob is the Schema for the scaledjobs API
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: ScaledJobSpec defines the desired state of ScaledJob
+            properties:
+              envSourceContainerName:
+                type: string
+              failedJobsHistoryLimit:
+                format: int32
+                minimum: 0
+                type: integer
+              jobTargetRef:
+                description: JobSpec describes how the job execution will look like.
+                properties:
+                  activeDeadlineSeconds:
+                    description: |-
+                      Specifies the duration in seconds relative to the startTime that the job
+                      may be continuously active before the system tries to terminate it; value
+                      must be positive integer. If a Job is suspended (at creation or through an
+                      update), this timer will effectively be stopped and reset when the Job is
+                      resumed again.
+                    format: int64
+                    type: integer
+                  backoffLimit:
+                    description: |-
+                      Specifies the number of retries before marking this job failed.
+                      Defaults to 6, unless backoffLimitPerIndex (only Indexed Job) is specified.
+                      When backoffLimitPerIndex is specified, backoffLimit defaults to 2147483647.
+                    format: int32
+                    type: integer
+                  backoffLimitPerIndex:
+                    description: |-
+                      Specifies the limit for the number of retries within an
+                      index before marking this index as failed. When enabled the number of
+                      failures per index is kept in the pod's
+                      batch.kubernetes.io/job-index-failure-count annotation. It can only
+                      be set when Job's completionMode=Indexed, and the Pod's restart
+                      policy is Never. The field is immutable.
+                    format: int32
+                    type: integer
+                  completionMode:
+                    description: |-
+                      completionMode specifies how Pod completions are tracked. It can be
+                      `NonIndexed` (default) or `Indexed`.
+
+                      `NonIndexed` means that the Job is considered complete when there have
+                      been .spec.completions successfully completed Pods. Each Pod completion is
+                      homologous to each other.
+
+                      `Indexed` means that the Pods of a
+                      Job get an associated completion index from 0 to (.spec.completions - 1),
+                      available in the annotation batch.kubernetes.io/job-completion-index.
+                      The Job is considered complete when there is one successfully completed Pod
+                      for each index.
+                      When value is `Indexed`, .spec.completions must be specified and
+                      `.spec.parallelism` must be less than or equal to 10^5.
+                      In addition, The Pod name takes the form
+                      `$(job-name)-$(index)-$(random-string)`,
+                      the Pod hostname takes the form `$(job-name)-$(index)`.
+
+                      More completion modes can be added in the future.
+                      If the Job controller observes a mode that it doesn't recognize, which
+                      is possible during upgrades due to version skew, the controller
+                      skips updates for the Job.
+                    type: string
+                  completions:
+                    description: |-
+                      Specifies the desired number of successfully finished pods the
+                      job should be run with.  Setting to null means that the success of any
+                      pod signals the success of all pods, and allows parallelism to have any positive
+                      value.  Setting to 1 means that parallelism is limited to 1 and the success of that
+                      pod signals the success of the job.
+                      More info: https://kubernetes.io/docs/concepts/workloads/controllers/jobs-run-to-completion/
+                    format: int32
+                    type: integer
+                  managedBy:
+                    description: |-
+                      ManagedBy field indicates the controller that manages a Job. The k8s Job
+                      controller reconciles jobs which don't have this field at all or the field
+                      value is the reserved string `kubernetes.io/job-controller`, but skips
+                      reconciling Jobs with a custom value for this field.
+                      The value must be a valid domain-prefixed path (e.g. acme.io/foo) -
+                      all characters before the first "/" must be a valid subdomain as defined
+                      by RFC 1123. All characters trailing the first "/" must be valid HTTP Path
+                      characters as defined by RFC 3986. The value cannot exceed 63 characters.
+                      This field is immutable.
+                    type: string
+                  manualSelector:
+                    description: |-
+                      manualSelector controls generation of pod labels and pod selectors.
+                      Leave `manualSelector` unset unless you are certain what you are doing.
+                      When false or unset, the system pick labels unique to this job
+                      and appends those labels to the pod template.  When true,
+                      the user is responsible for picking unique labels and specifying
+                      the selector.  Failure to pick a unique label may cause this
+                      and other jobs to not function correctly.  However, You may see
+                      `manualSelector=true` in jobs that were created with the old `extensions/v1beta1`
+                      API.
+                      More info: https://kubernetes.io/docs/concepts/workloads/controllers/jobs-run-to-completion/#specifying-your-own-pod-selector
+                    type: boolean
+                  maxFailedIndexes:
+                    description: |-
+                      Specifies the maximal number of failed indexes before marking the Job as
+                      failed, when backoffLimitPerIndex is set. Once the number of failed
+                      indexes exceeds this number the entire Job is marked as Failed and its
+                      execution is terminated. When left as null the job continues execution of
+                      all of its indexes and is marked with the `Complete` Job condition.
+                      It can only be specified when backoffLimitPerIndex is set.
+                      It can be null or up to completions. It is required and must be
+                      less than or equal to 10^4 when is completions greater than 10^5.
+                    format: int32
+                    type: integer
+                  parallelism:
+                    description: |-
+                      Specifies the maximum desired number of pods the job should
+                      run at any given time. The actual number of pods running in steady state will
+                      be less than this number when ((.spec.completions - .status.successful) < .spec.parallelism),
+                      i.e. when the work left to do is less than max parallelism.
+                      More info: https://kubernetes.io/docs/concepts/workloads/controllers/jobs-run-to-completion/
+                    format: int32
+                    type: integer
+                  podFailurePolicy:
+                    description: |-
+                      Specifies the policy of handling failed pods. In particular, it allows to
+                      specify the set of actions and conditions which need to be
+                      satisfied to take the associated action.
+                      If empty, the default behaviour applies - the counter of failed pods,
+                      represented by the jobs's .status.failed field, is incremented and it is
+                      checked against the backoffLimit. This field cannot be used in combination
+                      with restartPolicy=OnFailure.
+                    properties:
+                      rules:
+                        description: |-
+                          A list of pod failure policy rules. The rules are evaluated in order.
+                          Once a rule matches a Pod failure, the remaining of the rules are ignored.
+                          When no rule matches the Pod failure, the default handling applies - the
+                          counter of pod failures is incremented and it is checked against
+                          the backoffLimit. At most 20 elements are allowed.
+                        items:
+                          description: |-
+                            PodFailurePolicyRule describes how a pod failure is handled when the requirements are met.
+                            One of onExitCodes and onPodConditions, but not both, can be used in each rule.
+                          properties:
+                            action:
+                              description: |-
+                                Specifies the action taken on a pod failure when the requirements are satisfied.
+                                Possible values are:
+
+                                - FailJob: indicates that the pod's job is marked as Failed and all
+                                  running pods are terminated.
+                                - FailIndex: indicates that the pod's index is marked as Failed and will
+                                  not be restarted.
+                                - Ignore: indicates that the counter towards the .backoffLimit is not
+                                  incremented and a replacement pod is created.
+                                - Count: indicates that the pod is handled in the default way - the
+                                  counter towards the .backoffLimit is incremented.
+                                Additional values are considered to be added in the future. Clients should
+                                react to an unknown action by skipping the rule.
+                              type: string
+                            onExitCodes:
+                              description: Represents the requirement on the container
+                                exit codes.
+                              properties:
+                                containerName:
+                                  description: |-
+                                    Restricts the check for exit codes to the container with the
+                                    specified name. When null, the rule applies to all containers.
+                                    When specified, it should match one the container or initContainer
+                                    names in the pod template.
+                                  type: string
+                                operator:
+                                  description: |-
+                                    Represents the relationship between the container exit code(s) and the
+                                    specified values. Containers completed with success (exit code 0) are
+                                    excluded from the requirement check. Possible values are:
+
+                                    - In: the requirement is satisfied if at least one container exit code
+                                      (might be multiple if there are multiple containers not restricted
+                                      by the 'containerName' field) is in the set of specified values.
+                                    - NotIn: the requirement is satisfied if at least one container exit code
+                                      (might be multiple if there are multiple containers not restricted
+                                      by the 'containerName' field) is not in the set of specified values.
+                                    Additional values are considered to be added in the future. Clients should
+                                    react to an unknown operator by assuming the requirement is not satisfied.
+                                  type: string
+                                values:
+                                  description: |-
+                                    Specifies the set of values. Each returned container exit code (might be
+                                    multiple in case of multiple containers) is checked against this set of
+                                    values with respect to the operator. The list of values must be ordered
+                                    and must not contain duplicates. Value '0' cannot be used for the In operator.
+                                    At least one element is required. At most 255 elements are allowed.
+                                  items:
+                                    format: int32
+                                    type: integer
+                                  type: array
+                                  x-kubernetes-list-type: set
+                              required:
+                              - operator
+                              - values
+                              type: object
+                            onPodConditions:
+                              description: |-
+                                Represents the requirement on the pod conditions. The requirement is represented
+                                as a list of pod condition patterns. The requirement is satisfied if at
+                                least one pattern matches an actual pod condition. At most 20 elements are allowed.
+                              items:
+                                description: |-
+                                  PodFailurePolicyOnPodConditionsPattern describes a pattern for matching
+                                  an actual pod condition type.
+                                properties:
+                                  status:
+                                    description: |-
+                                      Specifies the required Pod condition status. To match a pod condition
+                                      it is required that the specified status equals the pod condition status.
+                                      Defaults to True.
+                                    type: string
+                                  type:
+                                    description: |-
+                                      Specifies the required Pod condition type. To match a pod condition
+                                      it is required that specified type equals the pod condition type.
+                                    type: string
+                                required:
+                                - type
+                                type: object
+                              type: array
+                              x-kubernetes-list-type: atomic
+                          required:
+                          - action
+                          type: object
+                        type: array
+                        x-kubernetes-list-type: atomic
+                    required:
+                    - rules
+                    type: object
+                  podReplacementPolicy:
+                    description: |-
+                      podReplacementPolicy specifies when to create replacement Pods.
+                      Possible values are:
+                      - TerminatingOrFailed means that we recreate pods
+                        when they are terminating (has a metadata.deletionTimestamp) or failed.
+                      - Failed means to wait until a previously created Pod is fully terminated (has phase
+                        Failed or Succeeded) before creating a replacement Pod.
+
+                      When using podFailurePolicy, Failed is the the only allowed value.
+                      TerminatingOrFailed and Failed are allowed values when podFailurePolicy is not in use.
+                    type: string
+                  selector:
+                    description: |-
+                      A label query over pods that should match the pod count.
+                      Normally, the system sets this field for you.
+                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/#label-selectors
+                    properties:
+                      matchExpressions:
+                        description: matchExpressions is a list of label selector
+                          requirements. The requirements are ANDed.
+                        items:
+                          description: |-
+                            A label selector requirement is a selector that contains values, a key, and an operator that
+                            relates the key and values.
+                          properties:
+                            key:
+                              description: key is the label key that the selector
+                                applies to.
+                              type: string
+                            operator:
+                              description: |-
+                                operator represents a key's relationship to a set of values.
+                                Valid operators are In, NotIn, Exists and DoesNotExist.
+                              type: string
+                            values:
+                              description: |-
+                                values is an array of string values. If the operator is In or NotIn,
+                                the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                the values array must be empty. This array is replaced during a strategic
+                                merge patch.
+                              items:
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                          required:
+                          - key
+                          - operator
+                          type: object
+                        type: array
+                        x-kubernetes-list-type: atomic
+                      matchLabels:
+                        additionalProperties:
+                          type: string
+                        description: |-
+                          matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                          map is equivalent to an element of matchExpressions, whose key field is "key", the
+                          operator is "In", and the values array contains only "value". The requirements are ANDed.
+                        type: object
+                    type: object
+                    x-kubernetes-map-type: atomic
+                  successPolicy:
+                    description: |-
+                      successPolicy specifies the policy when the Job can be declared as succeeded.
+                      If empty, the default behavior applies - the Job is declared as succeeded
+                      only when the number of succeeded pods equals to the completions.
+                      When the field is specified, it must be immutable and works only for the Indexed Jobs.
+                      Once the Job meets the SuccessPolicy, the lingering pods are terminated.
+                    properties:
+                      rules:
+                        description: |-
+                          rules represents the list of alternative rules for the declaring the Jobs
+                          as successful before `.status.succeeded >= .spec.completions`. Once any of the rules are met,
+                          the "SuccessCriteriaMet" condition is added, and the lingering pods are removed.
+                          The terminal state for such a Job has the "Complete" condition.
+                          Additionally, these rules are evaluated in order; Once the Job meets one of the rules,
+                          other rules are ignored. At most 20 elements are allowed.
+                        items:
+                          description: |-
+                            SuccessPolicyRule describes rule for declaring a Job as succeeded.
+                            Each rule must have at least one of the "succeededIndexes" or "succeededCount" specified.
+                          properties:
+                            succeededCount:
+                              description: |-
+                                succeededCount specifies the minimal required size of the actual set of the succeeded indexes
+                                for the Job. When succeededCount is used along with succeededIndexes, the check is
+                                constrained only to the set of indexes specified by succeededIndexes.
+                                For example, given that succeededIndexes is "1-4", succeededCount is "3",
+                                and completed indexes are "1", "3", and "5", the Job isn't declared as succeeded
+                                because only "1" and "3" indexes are considered in that rules.
+                                When this field is null, this doesn't default to any value and
+                                is never evaluated at any time.
+                                When specified it needs to be a positive integer.
+                              format: int32
+                              type: integer
+                            succeededIndexes:
+                              description: |-
+                                succeededIndexes specifies the set of indexes
+                                which need to be contained in the actual set of the succeeded indexes for the Job.
+                                The list of indexes must be within 0 to ".spec.completions-1" and
+                                must not contain duplicates. At least one element is required.
+                                The indexes are represented as intervals separated by commas.
+                                The intervals can be a decimal integer or a pair of decimal integers separated by a hyphen.
+                                The number are listed in represented by the first and last element of the series,
+                                separated by a hyphen.
+                                For example, if the completed indexes are 1, 3, 4, 5 and 7, they are
+                                represented as "1,3-5,7".
+                                When this field is null, this field doesn't default to any value
+                                and is never evaluated at any time.
+                              type: string
+                          type: object
+                        type: array
+                        x-kubernetes-list-type: atomic
+                    required:
+                    - rules
+                    type: object
+                  suspend:
+                    description: |-
+                      suspend specifies whether the Job controller should create Pods or not. If
+                      a Job is created with suspend set to true, no Pods are created by the Job
+                      controller. If a Job is suspended after creation (i.e. the flag goes from
+                      false to true), the Job controller will delete all active Pods associated
+                      with this Job. Users must design their workload to gracefully handle this.
+                      Suspending a Job will reset the StartTime field of the Job, effectively
+                      resetting the ActiveDeadlineSeconds timer too. Defaults to false.
+                    type: boolean
+                  template:
+                    description: |-
+                      Describes the pod that will be created when executing a job.
+                      The only allowed template.spec.restartPolicy values are "Never" or "OnFailure".
+                      More info: https://kubernetes.io/docs/concepts/workloads/controllers/jobs-run-to-completion/
+                    properties:
+                      metadata:
+                        description: |-
+                          Standard object's metadata.
+                          More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata
+                        properties:
+                          annotations:
+                            additionalProperties:
+                              type: string
+                            type: object
+                          finalizers:
+                            items:
+                              type: string
+                            type: array
+                          labels:
+                            additionalProperties:
+                              type: string
+                            type: object
+                          name:
+                            type: string
+                          namespace:
+                            type: string
+                        type: object
+                        x-kubernetes-preserve-unknown-fields: true
+                      spec:
+                        description: |-
+                          Specification of the desired behavior of the pod.
+                          More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#spec-and-status
+                        properties:
+                          activeDeadlineSeconds:
+                            description: |-
+                              Optional duration in seconds the pod may be active on the node relative to
+                              StartTime before the system will actively try to mark it failed and kill associated containers.
+                              Value must be a positive integer.
+                            format: int64
+                            type: integer
+                          affinity:
+                            description: If specified, the pod's scheduling constraints
+                            properties:
+                              nodeAffinity:
+                                description: Describes node affinity scheduling rules
+                                  for the pod.
+                                properties:
+                                  preferredDuringSchedulingIgnoredDuringExecution:
+                                    description: |-
+                                      The scheduler will prefer to schedule pods to nodes that satisfy
+                                      the affinity expressions specified by this field, but it may choose
+                                      a node that violates one or more of the expressions. The node that is
+                                      most preferred is the one with the greatest sum of weights, i.e.
+                                      for each node that meets all of the scheduling requirements (resource
+                                      request, requiredDuringScheduling affinity expressions, etc.),
+                                      compute a sum by iterating through the elements of this field and adding
+                                      "weight" to the sum if the node matches the corresponding matchExpressions; the
+                                      node(s) with the highest sum are the most preferred.
+                                    items:
+                                      description: |-
+                                        An empty preferred scheduling term matches all objects with implicit weight 0
+                                        (i.e. it's a no-op). A null preferred scheduling term matches no objects (i.e. is also a no-op).
+                                      properties:
+                                        preference:
+                                          description: A node selector term, associated
+                                            with the corresponding weight.
+                                          properties:
+                                            matchExpressions:
+                                              description: A list of node selector
+                                                requirements by node's labels.
+                                              items:
+                                                description: |-
+                                                  A node selector requirement is a selector that contains values, a key, and an operator
+                                                  that relates the key and values.
+                                                properties:
+                                                  key:
+                                                    description: The label key that
+                                                      the selector applies to.
+                                                    type: string
+                                                  operator:
+                                                    description: |-
+                                                      Represents a key's relationship to a set of values.
+                                                      Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt.
+                                                    type: string
+                                                  values:
+                                                    description: |-
+                                                      An array of string values. If the operator is In or NotIn,
+                                                      the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                                      the values array must be empty. If the operator is Gt or Lt, the values
+                                                      array must have a single element, which will be interpreted as an integer.
+                                                      This array is replaced during a strategic merge patch.
+                                                    items:
+                                                      type: string
+                                                    type: array
+                                                    x-kubernetes-list-type: atomic
+                                                required:
+                                                - key
+                                                - operator
+                                                type: object
+                                              type: array
+                                              x-kubernetes-list-type: atomic
+                                            matchFields:
+                                              description: A list of node selector
+                                                requirements by node's fields.
+                                              items:
+                                                description: |-
+                                                  A node selector requirement is a selector that contains values, a key, and an operator
+                                                  that relates the key and values.
+                                                properties:
+                                                  key:
+                                                    description: The label key that
+                                                      the selector applies to.
+                                                    type: string
+                                                  operator:
+                                                    description: |-
+                                                      Represents a key's relationship to a set of values.
+                                                      Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt.
+                                                    type: string
+                                                  values:
+                                                    description: |-
+                                                      An array of string values. If the operator is In or NotIn,
+                                                      the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                                      the values array must be empty. If the operator is Gt or Lt, the values
+                                                      array must have a single element, which will be interpreted as an integer.
+                                                      This array is replaced during a strategic merge patch.
+                                                    items:
+                                                      type: string
+                                                    type: array
+                                                    x-kubernetes-list-type: atomic
+                                                required:
+                                                - key
+                                                - operator
+                                                type: object
+                                              type: array
+                                              x-kubernetes-list-type: atomic
+                                          type: object
+                                          x-kubernetes-map-type: atomic
+                                        weight:
+                                          description: Weight associated with matching
+                                            the corresponding nodeSelectorTerm, in
+                                            the range 1-100.
+                                          format: int32
+                                          type: integer
+                                      required:
+                                      - preference
+                                      - weight
+                                      type: object
+                                    type: array
+                                    x-kubernetes-list-type: atomic
+                                  requiredDuringSchedulingIgnoredDuringExecution:
+                                    description: |-
+                                      If the affinity requirements specified by this field are not met at
+                                      scheduling time, the pod will not be scheduled onto the node.
+                                      If the affinity requirements specified by this field cease to be met
+                                      at some point during pod execution (e.g. due to an update), the system
+                                      may or may not try to eventually evict the pod from its node.
+                                    properties:
+                                      nodeSelectorTerms:
+                                        description: Required. A list of node selector
+                                          terms. The terms are ORed.
+                                        items:
+                                          description: |-
+                                            A null or empty node selector term matches no objects. The requirements of
+                                            them are ANDed.
+                                            The TopologySelectorTerm type implements a subset of the NodeSelectorTerm.
+                                          properties:
+                                            matchExpressions:
+                                              description: A list of node selector
+                                                requirements by node's labels.
+                                              items:
+                                                description: |-
+                                                  A node selector requirement is a selector that contains values, a key, and an operator
+                                                  that relates the key and values.
+                                                properties:
+                                                  key:
+                                                    description: The label key that
+                                                      the selector applies to.
+                                                    type: string
+                                                  operator:
+                                                    description: |-
+                                                      Represents a key's relationship to a set of values.
+                                                      Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt.
+                                                    type: string
+                                                  values:
+                                                    description: |-
+                                                      An array of string values. If the operator is In or NotIn,
+                                                      the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                                      the values array must be empty. If the operator is Gt or Lt, the values
+                                                      array must have a single element, which will be interpreted as an integer.
+                                                      This array is replaced during a strategic merge patch.
+                                                    items:
+                                                      type: string
+                                                    type: array
+                                                    x-kubernetes-list-type: atomic
+                                                required:
+                                                - key
+                                                - operator
+                                                type: object
+                                              type: array
+                                              x-kubernetes-list-type: atomic
+                                            matchFields:
+                                              description: A list of node selector
+                                                requirements by node's fields.
+                                              items:
+                                                description: |-
+                                                  A node selector requirement is a selector that contains values, a key, and an operator
+                                                  that relates the key and values.
+                                                properties:
+                                                  key:
+                                                    description: The label key that
+                                                      the selector applies to.
+                                                    type: string
+                                                  operator:
+                                                    description: |-
+                                                      Represents a key's relationship to a set of values.
+                                                      Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt.
+                                                    type: string
+                                                  values:
+                                                    description: |-
+                                                      An array of string values. If the operator is In or NotIn,
+                                                      the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                                      the values array must be empty. If the operator is Gt or Lt, the values
+                                                      array must have a single element, which will be interpreted as an integer.
+                                                      This array is replaced during a strategic merge patch.
+                                                    items:
+                                                      type: string
+                                                    type: array
+                                                    x-kubernetes-list-type: atomic
+                                                required:
+                                                - key
+                                                - operator
+                                                type: object
+                                              type: array
+                                              x-kubernetes-list-type: atomic
+                                          type: object
+                                          x-kubernetes-map-type: atomic
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                    required:
+                                    - nodeSelectorTerms
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                type: object
+                              podAffinity:
+                                description: Describes pod affinity scheduling rules
+                                  (e.g. co-locate this pod in the same node, zone,
+                                  etc. as some other pod(s)).
+                                properties:
+                                  preferredDuringSchedulingIgnoredDuringExecution:
+                                    description: |-
+                                      The scheduler will prefer to schedule pods to nodes that satisfy
+                                      the affinity expressions specified by this field, but it may choose
+                                      a node that violates one or more of the expressions. The node that is
+                                      most preferred is the one with the greatest sum of weights, i.e.
+                                      for each node that meets all of the scheduling requirements (resource
+                                      request, requiredDuringScheduling affinity expressions, etc.),
+                                      compute a sum by iterating through the elements of this field and adding
+                                      "weight" to the sum if the node has pods which matches the corresponding podAffinityTerm; the
+                                      node(s) with the highest sum are the most preferred.
+                                    items:
+                                      description: The weights of all of the matched
+                                        WeightedPodAffinityTerm fields are added per-node
+                                        to find the most preferred node(s)
+                                      properties:
+                                        podAffinityTerm:
+                                          description: Required. A pod affinity term,
+                                            associated with the corresponding weight.
+                                          properties:
+                                            labelSelector:
+                                              description: |-
+                                                A label query over a set of resources, in this case pods.
+                                                If it's null, this PodAffinityTerm matches with no Pods.
+                                              properties:
+                                                matchExpressions:
+                                                  description: matchExpressions is
+                                                    a list of label selector requirements.
+                                                    The requirements are ANDed.
+                                                  items:
+                                                    description: |-
+                                                      A label selector requirement is a selector that contains values, a key, and an operator that
+                                                      relates the key and values.
+                                                    properties:
+                                                      key:
+                                                        description: key is the label
+                                                          key that the selector applies
+                                                          to.
+                                                        type: string
+                                                      operator:
+                                                        description: |-
+                                                          operator represents a key's relationship to a set of values.
+                                                          Valid operators are In, NotIn, Exists and DoesNotExist.
+                                                        type: string
+                                                      values:
+                                                        description: |-
+                                                          values is an array of string values. If the operator is In or NotIn,
+                                                          the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                                          the values array must be empty. This array is replaced during a strategic
+                                                          merge patch.
+                                                        items:
+                                                          type: string
+                                                        type: array
+                                                        x-kubernetes-list-type: atomic
+                                                    required:
+                                                    - key
+                                                    - operator
+                                                    type: object
+                                                  type: array
+                                                  x-kubernetes-list-type: atomic
+                                                matchLabels:
+                                                  additionalProperties:
+                                                    type: string
+                                                  description: |-
+                                                    matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                                    map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                                    operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                                  type: object
+                                              type: object
+                                              x-kubernetes-map-type: atomic
+                                            matchLabelKeys:
+                                              description: |-
+                                                MatchLabelKeys is a set of pod label keys to select which pods will
+                                                be taken into consideration. The keys are used to lookup values from the
+                                                incoming pod labels, those key-value labels are merged with `labelSelector` as `key in (value)`
+                                                to select the group of existing pods which pods will be taken into consideration
+                                                for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+                                                pod labels will be ignored. The default value is empty.
+                                                The same key is forbidden to exist in both matchLabelKeys and labelSelector.
+                                                Also, matchLabelKeys cannot be set when labelSelector isn't set.
+                                              items:
+                                                type: string
+                                              type: array
+                                              x-kubernetes-list-type: atomic
+                                            mismatchLabelKeys:
+                                              description: |-
+                                                MismatchLabelKeys is a set of pod label keys to select which pods will
+                                                be taken into consideration. The keys are used to lookup values from the
+                                                incoming pod labels, those key-value labels are merged with `labelSelector` as `key notin (value)`
+                                                to select the group of existing pods which pods will be taken into consideration
+                                                for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+                                                pod labels will be ignored. The default value is empty.
+                                                The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
+                                                Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
+                                              items:
+                                                type: string
+                                              type: array
+                                              x-kubernetes-list-type: atomic
+                                            namespaceSelector:
+                                              description: |-
+                                                A label query over the set of namespaces that the term applies to.
+                                                The term is applied to the union of the namespaces selected by this field
+                                                and the ones listed in the namespaces field.
+                                                null selector and null or empty namespaces list means "this pod's namespace".
+                                                An empty selector ({}) matches all namespaces.
+                                              properties:
+                                                matchExpressions:
+                                                  description: matchExpressions is
+                                                    a list of label selector requirements.
+                                                    The requirements are ANDed.
+                                                  items:
+                                                    description: |-
+                                                      A label selector requirement is a selector that contains values, a key, and an operator that
+                                                      relates the key and values.
+                                                    properties:
+                                                      key:
+                                                        description: key is the label
+                                                          key that the selector applies
+                                                          to.
+                                                        type: string
+                                                      operator:
+                                                        description: |-
+                                                          operator represents a key's relationship to a set of values.
+                                                          Valid operators are In, NotIn, Exists and DoesNotExist.
+                                                        type: string
+                                                      values:
+                                                        description: |-
+                                                          values is an array of string values. If the operator is In or NotIn,
+                                                          the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                                          the values array must be empty. This array is replaced during a strategic
+                                                          merge patch.
+                                                        items:
+                                                          type: string
+                                                        type: array
+                                                        x-kubernetes-list-type: atomic
+                                                    required:
+                                                    - key
+                                                    - operator
+                                                    type: object
+                                                  type: array
+                                                  x-kubernetes-list-type: atomic
+                                                matchLabels:
+                                                  additionalProperties:
+                                                    type: string
+                                                  description: |-
+                                                    matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                                    map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                                    operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                                  type: object
+                                              type: object
+                                              x-kubernetes-map-type: atomic
+                                            namespaces:
+                                              description: |-
+                                                namespaces specifies a static list of namespace names that the term applies to.
+                                                The term is applied to the union of the namespaces listed in this field
+                                                and the ones selected by namespaceSelector.
+                                                null or empty namespaces list and null namespaceSelector means "this pod's namespace".
+                                              items:
+                                                type: string
+                                              type: array
+                                              x-kubernetes-list-type: atomic
+                                            topologyKey:
+                                              description: |-
+                                                This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching
+                                                the labelSelector in the specified namespaces, where co-located is defined as running on a node
+                                                whose value of the label with key topologyKey matches that of any node on which any of the
+                                                selected pods is running.
+                                                Empty topologyKey is not allowed.
+                                              type: string
+                                          required:
+                                          - topologyKey
+                                          type: object
+                                        weight:
+                                          description: |-
+                                            weight associated with matching the corresponding podAffinityTerm,
+                                            in the range 1-100.
+                                          format: int32
+                                          type: integer
+                                      required:
+                                      - podAffinityTerm
+                                      - weight
+                                      type: object
+                                    type: array
+                                    x-kubernetes-list-type: atomic
+                                  requiredDuringSchedulingIgnoredDuringExecution:
+                                    description: |-
+                                      If the affinity requirements specified by this field are not met at
+                                      scheduling time, the pod will not be scheduled onto the node.
+                                      If the affinity requirements specified by this field cease to be met
+                                      at some point during pod execution (e.g. due to a pod label update), the
+                                      system may or may not try to eventually evict the pod from its node.
+                                      When there are multiple elements, the lists of nodes corresponding to each
+                                      podAffinityTerm are intersected, i.e. all terms must be satisfied.
+                                    items:
+                                      description: |-
+                                        Defines a set of pods (namely those matching the labelSelector
+                                        relative to the given namespace(s)) that this pod should be
+                                        co-located (affinity) or not co-located (anti-affinity) with,
+                                        where co-located is defined as running on a node whose value of
+                                        the label with key <topologyKey> matches that of any node on which
+                                        a pod of the set of pods is running
+                                      properties:
+                                        labelSelector:
+                                          description: |-
+                                            A label query over a set of resources, in this case pods.
+                                            If it's null, this PodAffinityTerm matches with no Pods.
+                                          properties:
+                                            matchExpressions:
+                                              description: matchExpressions is a list
+                                                of label selector requirements. The
+                                                requirements are ANDed.
+                                              items:
+                                                description: |-
+                                                  A label selector requirement is a selector that contains values, a key, and an operator that
+                                                  relates the key and values.
+                                                properties:
+                                                  key:
+                                                    description: key is the label
+                                                      key that the selector applies
+                                                      to.
+                                                    type: string
+                                                  operator:
+                                                    description: |-
+                                                      operator represents a key's relationship to a set of values.
+                                                      Valid operators are In, NotIn, Exists and DoesNotExist.
+                                                    type: string
+                                                  values:
+                                                    description: |-
+                                                      values is an array of string values. If the operator is In or NotIn,
+                                                      the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                                      the values array must be empty. This array is replaced during a strategic
+                                                      merge patch.
+                                                    items:
+                                                      type: string
+                                                    type: array
+                                                    x-kubernetes-list-type: atomic
+                                                required:
+                                                - key
+                                                - operator
+                                                type: object
+                                              type: array
+                                              x-kubernetes-list-type: atomic
+                                            matchLabels:
+                                              additionalProperties:
+                                                type: string
+                                              description: |-
+                                                matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                                map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                                operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                              type: object
+                                          type: object
+                                          x-kubernetes-map-type: atomic
+                                        matchLabelKeys:
+                                          description: |-
+                                            MatchLabelKeys is a set of pod label keys to select which pods will
+                                            be taken into consideration. The keys are used to lookup values from the
+                                            incoming pod labels, those key-value labels are merged with `labelSelector` as `key in (value)`
+                                            to select the group of existing pods which pods will be taken into consideration
+                                            for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+                                            pod labels will be ignored. The default value is empty.
+                                            The same key is forbidden to exist in both matchLabelKeys and labelSelector.
+                                            Also, matchLabelKeys cannot be set when labelSelector isn't set.
+                                          items:
+                                            type: string
+                                          type: array
+                                          x-kubernetes-list-type: atomic
+                                        mismatchLabelKeys:
+                                          description: |-
+                                            MismatchLabelKeys is a set of pod label keys to select which pods will
+                                            be taken into consideration. The keys are used to lookup values from the
+                                            incoming pod labels, those key-value labels are merged with `labelSelector` as `key notin (value)`
+                                            to select the group of existing pods which pods will be taken into consideration
+                                            for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+                                            pod labels will be ignored. The default value is empty.
+                                            The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
+                                            Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
+                                          items:
+                                            type: string
+                                          type: array
+                                          x-kubernetes-list-type: atomic
+                                        namespaceSelector:
+                                          description: |-
+                                            A label query over the set of namespaces that the term applies to.
+                                            The term is applied to the union of the namespaces selected by this field
+                                            and the ones listed in the namespaces field.
+                                            null selector and null or empty namespaces list means "this pod's namespace".
+                                            An empty selector ({}) matches all namespaces.
+                                          properties:
+                                            matchExpressions:
+                                              description: matchExpressions is a list
+                                                of label selector requirements. The
+                                                requirements are ANDed.
+                                              items:
+                                                description: |-
+                                                  A label selector requirement is a selector that contains values, a key, and an operator that
+                                                  relates the key and values.
+                                                properties:
+                                                  key:
+                                                    description: key is the label
+                                                      key that the selector applies
+                                                      to.
+                                                    type: string
+                                                  operator:
+                                                    description: |-
+                                                      operator represents a key's relationship to a set of values.
+                                                      Valid operators are In, NotIn, Exists and DoesNotExist.
+                                                    type: string
+                                                  values:
+                                                    description: |-
+                                                      values is an array of string values. If the operator is In or NotIn,
+                                                      the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                                      the values array must be empty. This array is replaced during a strategic
+                                                      merge patch.
+                                                    items:
+                                                      type: string
+                                                    type: array
+                                                    x-kubernetes-list-type: atomic
+                                                required:
+                                                - key
+                                                - operator
+                                                type: object
+                                              type: array
+                                              x-kubernetes-list-type: atomic
+                                            matchLabels:
+                                              additionalProperties:
+                                                type: string
+                                              description: |-
+                                                matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                                map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                                operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                              type: object
+                                          type: object
+                                          x-kubernetes-map-type: atomic
+                                        namespaces:
+                                          description: |-
+                                            namespaces specifies a static list of namespace names that the term applies to.
+                                            The term is applied to the union of the namespaces listed in this field
+                                            and the ones selected by namespaceSelector.
+                                            null or empty namespaces list and null namespaceSelector means "this pod's namespace".
+                                          items:
+                                            type: string
+                                          type: array
+                                          x-kubernetes-list-type: atomic
+                                        topologyKey:
+                                          description: |-
+                                            This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching
+                                            the labelSelector in the specified namespaces, where co-located is defined as running on a node
+                                            whose value of the label with key topologyKey matches that of any node on which any of the
+                                            selected pods is running.
+                                            Empty topologyKey is not allowed.
+                                          type: string
+                                      required:
+                                      - topologyKey
+                                      type: object
+                                    type: array
+                                    x-kubernetes-list-type: atomic
+                                type: object
+                              podAntiAffinity:
+                                description: Describes pod anti-affinity scheduling
+                                  rules (e.g. avoid putting this pod in the same node,
+                                  zone, etc. as some other pod(s)).
+                                properties:
+                                  preferredDuringSchedulingIgnoredDuringExecution:
+                                    description: |-
+                                      The scheduler will prefer to schedule pods to nodes that satisfy
+                                      the anti-affinity expressions specified by this field, but it may choose
+                                      a node that violates one or more of the expressions. The node that is
+                                      most preferred is the one with the greatest sum of weights, i.e.
+                                      for each node that meets all of the scheduling requirements (resource
+                                      request, requiredDuringScheduling anti-affinity expressions, etc.),
+                                      compute a sum by iterating through the elements of this field and subtracting
+                                      "weight" from the sum if the node has pods which matches the corresponding podAffinityTerm; the
+                                      node(s) with the highest sum are the most preferred.
+                                    items:
+                                      description: The weights of all of the matched
+                                        WeightedPodAffinityTerm fields are added per-node
+                                        to find the most preferred node(s)
+                                      properties:
+                                        podAffinityTerm:
+                                          description: Required. A pod affinity term,
+                                            associated with the corresponding weight.
+                                          properties:
+                                            labelSelector:
+                                              description: |-
+                                                A label query over a set of resources, in this case pods.
+                                                If it's null, this PodAffinityTerm matches with no Pods.
+                                              properties:
+                                                matchExpressions:
+                                                  description: matchExpressions is
+                                                    a list of label selector requirements.
+                                                    The requirements are ANDed.
+                                                  items:
+                                                    description: |-
+                                                      A label selector requirement is a selector that contains values, a key, and an operator that
+                                                      relates the key and values.
+                                                    properties:
+                                                      key:
+                                                        description: key is the label
+                                                          key that the selector applies
+                                                          to.
+                                                        type: string
+                                                      operator:
+                                                        description: |-
+                                                          operator represents a key's relationship to a set of values.
+                                                          Valid operators are In, NotIn, Exists and DoesNotExist.
+                                                        type: string
+                                                      values:
+                                                        description: |-
+                                                          values is an array of string values. If the operator is In or NotIn,
+                                                          the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                                          the values array must be empty. This array is replaced during a strategic
+                                                          merge patch.
+                                                        items:
+                                                          type: string
+                                                        type: array
+                                                        x-kubernetes-list-type: atomic
+                                                    required:
+                                                    - key
+                                                    - operator
+                                                    type: object
+                                                  type: array
+                                                  x-kubernetes-list-type: atomic
+                                                matchLabels:
+                                                  additionalProperties:
+                                                    type: string
+                                                  description: |-
+                                                    matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                                    map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                                    operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                                  type: object
+                                              type: object
+                                              x-kubernetes-map-type: atomic
+                                            matchLabelKeys:
+                                              description: |-
+                                                MatchLabelKeys is a set of pod label keys to select which pods will
+                                                be taken into consideration. The keys are used to lookup values from the
+                                                incoming pod labels, those key-value labels are merged with `labelSelector` as `key in (value)`
+                                                to select the group of existing pods which pods will be taken into consideration
+                                                for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+                                                pod labels will be ignored. The default value is empty.
+                                                The same key is forbidden to exist in both matchLabelKeys and labelSelector.
+                                                Also, matchLabelKeys cannot be set when labelSelector isn't set.
+                                              items:
+                                                type: string
+                                              type: array
+                                              x-kubernetes-list-type: atomic
+                                            mismatchLabelKeys:
+                                              description: |-
+                                                MismatchLabelKeys is a set of pod label keys to select which pods will
+                                                be taken into consideration. The keys are used to lookup values from the
+                                                incoming pod labels, those key-value labels are merged with `labelSelector` as `key notin (value)`
+                                                to select the group of existing pods which pods will be taken into consideration
+                                                for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+                                                pod labels will be ignored. The default value is empty.
+                                                The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
+                                                Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
+                                              items:
+                                                type: string
+                                              type: array
+                                              x-kubernetes-list-type: atomic
+                                            namespaceSelector:
+                                              description: |-
+                                                A label query over the set of namespaces that the term applies to.
+                                                The term is applied to the union of the namespaces selected by this field
+                                                and the ones listed in the namespaces field.
+                                                null selector and null or empty namespaces list means "this pod's namespace".
+                                                An empty selector ({}) matches all namespaces.
+                                              properties:
+                                                matchExpressions:
+                                                  description: matchExpressions is
+                                                    a list of label selector requirements.
+                                                    The requirements are ANDed.
+                                                  items:
+                                                    description: |-
+                                                      A label selector requirement is a selector that contains values, a key, and an operator that
+                                                      relates the key and values.
+                                                    properties:
+                                                      key:
+                                                        description: key is the label
+                                                          key that the selector applies
+                                                          to.
+                                                        type: string
+                                                      operator:
+                                                        description: |-
+                                                          operator represents a key's relationship to a set of values.
+                                                          Valid operators are In, NotIn, Exists and DoesNotExist.
+                                                        type: string
+                                                      values:
+                                                        description: |-
+                                                          values is an array of string values. If the operator is In or NotIn,
+                                                          the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                                          the values array must be empty. This array is replaced during a strategic
+                                                          merge patch.
+                                                        items:
+                                                          type: string
+                                                        type: array
+                                                        x-kubernetes-list-type: atomic
+                                                    required:
+                                                    - key
+                                                    - operator
+                                                    type: object
+                                                  type: array
+                                                  x-kubernetes-list-type: atomic
+                                                matchLabels:
+                                                  additionalProperties:
+                                                    type: string
+                                                  description: |-
+                                                    matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                                    map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                                    operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                                  type: object
+                                              type: object
+                                              x-kubernetes-map-type: atomic
+                                            namespaces:
+                                              description: |-
+                                                namespaces specifies a static list of namespace names that the term applies to.
+                                                The term is applied to the union of the namespaces listed in this field
+                                                and the ones selected by namespaceSelector.
+                                                null or empty namespaces list and null namespaceSelector means "this pod's namespace".
+                                              items:
+                                                type: string
+                                              type: array
+                                              x-kubernetes-list-type: atomic
+                                            topologyKey:
+                                              description: |-
+                                                This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching
+                                                the labelSelector in the specified namespaces, where co-located is defined as running on a node
+                                                whose value of the label with key topologyKey matches that of any node on which any of the
+                                                selected pods is running.
+                                                Empty topologyKey is not allowed.
+                                              type: string
+                                          required:
+                                          - topologyKey
+                                          type: object
+                                        weight:
+                                          description: |-
+                                            weight associated with matching the corresponding podAffinityTerm,
+                                            in the range 1-100.
+                                          format: int32
+                                          type: integer
+                                      required:
+                                      - podAffinityTerm
+                                      - weight
+                                      type: object
+                                    type: array
+                                    x-kubernetes-list-type: atomic
+                                  requiredDuringSchedulingIgnoredDuringExecution:
+                                    description: |-
+                                      If the anti-affinity requirements specified by this field are not met at
+                                      scheduling time, the pod will not be scheduled onto the node.
+                                      If the anti-affinity requirements specified by this field cease to be met
+                                      at some point during pod execution (e.g. due to a pod label update), the
+                                      system may or may not try to eventually evict the pod from its node.
+                                      When there are multiple elements, the lists of nodes corresponding to each
+                                      podAffinityTerm are intersected, i.e. all terms must be satisfied.
+                                    items:
+                                      description: |-
+                                        Defines a set of pods (namely those matching the labelSelector
+                                        relative to the given namespace(s)) that this pod should be
+                                        co-located (affinity) or not co-located (anti-affinity) with,
+                                        where co-located is defined as running on a node whose value of
+                                        the label with key <topologyKey> matches that of any node on which
+                                        a pod of the set of pods is running
+                                      properties:
+                                        labelSelector:
+                                          description: |-
+                                            A label query over a set of resources, in this case pods.
+                                            If it's null, this PodAffinityTerm matches with no Pods.
+                                          properties:
+                                            matchExpressions:
+                                              description: matchExpressions is a list
+                                                of label selector requirements. The
+                                                requirements are ANDed.
+                                              items:
+                                                description: |-
+                                                  A label selector requirement is a selector that contains values, a key, and an operator that
+                                                  relates the key and values.
+                                                properties:
+                                                  key:
+                                                    description: key is the label
+                                                      key that the selector applies
+                                                      to.
+                                                    type: string
+                                                  operator:
+                                                    description: |-
+                                                      operator represents a key's relationship to a set of values.
+                                                      Valid operators are In, NotIn, Exists and DoesNotExist.
+                                                    type: string
+                                                  values:
+                                                    description: |-
+                                                      values is an array of string values. If the operator is In or NotIn,
+                                                      the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                                      the values array must be empty. This array is replaced during a strategic
+                                                      merge patch.
+                                                    items:
+                                                      type: string
+                                                    type: array
+                                                    x-kubernetes-list-type: atomic
+                                                required:
+                                                - key
+                                                - operator
+                                                type: object
+                                              type: array
+                                              x-kubernetes-list-type: atomic
+                                            matchLabels:
+                                              additionalProperties:
+                                                type: string
+                                              description: |-
+                                                matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                                map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                                operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                              type: object
+                                          type: object
+                                          x-kubernetes-map-type: atomic
+                                        matchLabelKeys:
+                                          description: |-
+                                            MatchLabelKeys is a set of pod label keys to select which pods will
+                                            be taken into consideration. The keys are used to lookup values from the
+                                            incoming pod labels, those key-value labels are merged with `labelSelector` as `key in (value)`
+                                            to select the group of existing pods which pods will be taken into consideration
+                                            for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+                                            pod labels will be ignored. The default value is empty.
+                                            The same key is forbidden to exist in both matchLabelKeys and labelSelector.
+                                            Also, matchLabelKeys cannot be set when labelSelector isn't set.
+                                          items:
+                                            type: string
+                                          type: array
+                                          x-kubernetes-list-type: atomic
+                                        mismatchLabelKeys:
+                                          description: |-
+                                            MismatchLabelKeys is a set of pod label keys to select which pods will
+                                            be taken into consideration. The keys are used to lookup values from the
+                                            incoming pod labels, those key-value labels are merged with `labelSelector` as `key notin (value)`
+                                            to select the group of existing pods which pods will be taken into consideration
+                                            for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+                                            pod labels will be ignored. The default value is empty.
+                                            The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
+                                            Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
+                                          items:
+                                            type: string
+                                          type: array
+                                          x-kubernetes-list-type: atomic
+                                        namespaceSelector:
+                                          description: |-
+                                            A label query over the set of namespaces that the term applies to.
+                                            The term is applied to the union of the namespaces selected by this field
+                                            and the ones listed in the namespaces field.
+                                            null selector and null or empty namespaces list means "this pod's namespace".
+                                            An empty selector ({}) matches all namespaces.
+                                          properties:
+                                            matchExpressions:
+                                              description: matchExpressions is a list
+                                                of label selector requirements. The
+                                                requirements are ANDed.
+                                              items:
+                                                description: |-
+                                                  A label selector requirement is a selector that contains values, a key, and an operator that
+                                                  relates the key and values.
+                                                properties:
+                                                  key:
+                                                    description: key is the label
+                                                      key that the selector applies
+                                                      to.
+                                                    type: string
+                                                  operator:
+                                                    description: |-
+                                                      operator represents a key's relationship to a set of values.
+                                                      Valid operators are In, NotIn, Exists and DoesNotExist.
+                                                    type: string
+                                                  values:
+                                                    description: |-
+                                                      values is an array of string values. If the operator is In or NotIn,
+                                                      the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                                      the values array must be empty. This array is replaced during a strategic
+                                                      merge patch.
+                                                    items:
+                                                      type: string
+                                                    type: array
+                                                    x-kubernetes-list-type: atomic
+                                                required:
+                                                - key
+                                                - operator
+                                                type: object
+                                              type: array
+                                              x-kubernetes-list-type: atomic
+                                            matchLabels:
+                                              additionalProperties:
+                                                type: string
+                                              description: |-
+                                                matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                                map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                                operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                              type: object
+                                          type: object
+                                          x-kubernetes-map-type: atomic
+                                        namespaces:
+                                          description: |-
+                                            namespaces specifies a static list of namespace names that the term applies to.
+                                            The term is applied to the union of the namespaces listed in this field
+                                            and the ones selected by namespaceSelector.
+                                            null or empty namespaces list and null namespaceSelector means "this pod's namespace".
+                                          items:
+                                            type: string
+                                          type: array
+                                          x-kubernetes-list-type: atomic
+                                        topologyKey:
+                                          description: |-
+                                            This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching
+                                            the labelSelector in the specified namespaces, where co-located is defined as running on a node
+                                            whose value of the label with key topologyKey matches that of any node on which any of the
+                                            selected pods is running.
+                                            Empty topologyKey is not allowed.
+                                          type: string
+                                      required:
+                                      - topologyKey
+                                      type: object
+                                    type: array
+                                    x-kubernetes-list-type: atomic
+                                type: object
+                            type: object
+                          automountServiceAccountToken:
+                            description: AutomountServiceAccountToken indicates whether
+                              a service account token should be automatically mounted.
+                            type: boolean
+                          containers:
+                            description: |-
+                              List of containers belonging to the pod.
+                              Containers cannot currently be added or removed.
+                              There must be at least one container in a Pod.
+                              Cannot be updated.
+                            items:
+                              description: A single application container that you
+                                want to run within a pod.
+                              properties:
+                                args:
+                                  description: |-
+                                    Arguments to the entrypoint.
+                                    The container image's CMD is used if this is not provided.
+                                    Variable references $(VAR_NAME) are expanded using the container's environment. If a variable
+                                    cannot be resolved, the reference in the input string will be unchanged. Double $$ are reduced
+                                    to a single $, which allows for escaping the $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)" will
+                                    produce the string literal "$(VAR_NAME)". Escaped references will never be expanded, regardless
+                                    of whether the variable exists or not. Cannot be updated.
+                                    More info: https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                command:
+                                  description: |-
+                                    Entrypoint array. Not executed within a shell.
+                                    The container image's ENTRYPOINT is used if this is not provided.
+                                    Variable references $(VAR_NAME) are expanded using the container's environment. If a variable
+                                    cannot be resolved, the reference in the input string will be unchanged. Double $$ are reduced
+                                    to a single $, which allows for escaping the $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)" will
+                                    produce the string literal "$(VAR_NAME)". Escaped references will never be expanded, regardless
+                                    of whether the variable exists or not. Cannot be updated.
+                                    More info: https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                env:
+                                  description: |-
+                                    List of environment variables to set in the container.
+                                    Cannot be updated.
+                                  items:
+                                    description: EnvVar represents an environment
+                                      variable present in a Container.
+                                    properties:
+                                      name:
+                                        description: |-
+                                          Name of the environment variable.
+                                          May consist of any printable ASCII characters except '='.
+                                        type: string
+                                      value:
+                                        description: |-
+                                          Variable references $(VAR_NAME) are expanded
+                                          using the previously defined environment variables in the container and
+                                          any service environment variables. If a variable cannot be resolved,
+                                          the reference in the input string will be unchanged. Double $$ are reduced
+                                          to a single $, which allows for escaping the $(VAR_NAME) syntax: i.e.
+                                          "$$(VAR_NAME)" will produce the string literal "$(VAR_NAME)".
+                                          Escaped references will never be expanded, regardless of whether the variable
+                                          exists or not.
+                                          Defaults to "".
+                                        type: string
+                                      valueFrom:
+                                        description: Source for the environment variable's
+                                          value. Cannot be used if value is not empty.
+                                        properties:
+                                          configMapKeyRef:
+                                            description: Selects a key of a ConfigMap.
+                                            properties:
+                                              key:
+                                                description: The key to select.
+                                                type: string
+                                              name:
+                                                default: ""
+                                                description: |-
+                                                  Name of the referent.
+                                                  This field is effectively required, but due to backwards compatibility is
+                                                  allowed to be empty. Instances of this type with an empty value here are
+                                                  almost certainly wrong.
+                                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                                type: string
+                                              optional:
+                                                description: Specify whether the ConfigMap
+                                                  or its key must be defined
+                                                type: boolean
+                                            required:
+                                            - key
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                          fieldRef:
+                                            description: |-
+                                              Selects a field of the pod: supports metadata.name, metadata.namespace, `metadata.labels['<KEY>']`, `metadata.annotations['<KEY>']`,
+                                              spec.nodeName, spec.serviceAccountName, status.hostIP, status.podIP, status.podIPs.
+                                            properties:
+                                              apiVersion:
+                                                description: Version of the schema
+                                                  the FieldPath is written in terms
+                                                  of, defaults to "v1".
+                                                type: string
+                                              fieldPath:
+                                                description: Path of the field to
+                                                  select in the specified API version.
+                                                type: string
+                                            required:
+                                            - fieldPath
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                          fileKeyRef:
+                                            description: |-
+                                              FileKeyRef selects a key of the env file.
+                                              Requires the EnvFiles feature gate to be enabled.
+                                            properties:
+                                              key:
+                                                description: |-
+                                                  The key within the env file. An invalid key will prevent the pod from starting.
+                                                  The keys defined within a source may consist of any printable ASCII characters except '='.
+                                                  During Alpha stage of the EnvFiles feature gate, the key size is limited to 128 characters.
+                                                type: string
+                                              optional:
+                                                default: false
+                                                description: |-
+                                                  Specify whether the file or its key must be defined. If the file or key
+                                                  does not exist, then the env var is not published.
+                                                  If optional is set to true and the specified key does not exist,
+                                                  the environment variable will not be set in the Pod's containers.
+
+                                                  If optional is set to false and the specified key does not exist,
+                                                  an error will be returned during Pod creation.
+                                                type: boolean
+                                              path:
+                                                description: |-
+                                                  The path within the volume from which to select the file.
+                                                  Must be relative and may not contain the '..' path or start with '..'.
+                                                type: string
+                                              volumeName:
+                                                description: The name of the volume
+                                                  mount containing the env file.
+                                                type: string
+                                            required:
+                                            - key
+                                            - path
+                                            - volumeName
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                          resourceFieldRef:
+                                            description: |-
+                                              Selects a resource of the container: only resources limits and requests
+                                              (limits.cpu, limits.memory, limits.ephemeral-storage, requests.cpu, requests.memory and requests.ephemeral-storage) are currently supported.
+                                            properties:
+                                              containerName:
+                                                description: 'Container name: required
+                                                  for volumes, optional for env vars'
+                                                type: string
+                                              divisor:
+                                                anyOf:
+                                                - type: integer
+                                                - type: string
+                                                description: Specifies the output
+                                                  format of the exposed resources,
+                                                  defaults to "1"
+                                                pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                                x-kubernetes-int-or-string: true
+                                              resource:
+                                                description: 'Required: resource to
+                                                  select'
+                                                type: string
+                                            required:
+                                            - resource
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                          secretKeyRef:
+                                            description: Selects a key of a secret
+                                              in the pod's namespace
+                                            properties:
+                                              key:
+                                                description: The key of the secret
+                                                  to select from.  Must be a valid
+                                                  secret key.
+                                                type: string
+                                              name:
+                                                default: ""
+                                                description: |-
+                                                  Name of the referent.
+                                                  This field is effectively required, but due to backwards compatibility is
+                                                  allowed to be empty. Instances of this type with an empty value here are
+                                                  almost certainly wrong.
+                                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                                type: string
+                                              optional:
+                                                description: Specify whether the Secret
+                                                  or its key must be defined
+                                                type: boolean
+                                            required:
+                                            - key
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                        type: object
+                                    required:
+                                    - name
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-map-keys:
+                                  - name
+                                  x-kubernetes-list-type: map
+                                envFrom:
+                                  description: |-
+                                    List of sources to populate environment variables in the container.
+                                    The keys defined within a source may consist of any printable ASCII characters except '='.
+                                    When a key exists in multiple
+                                    sources, the value associated with the last source will take precedence.
+                                    Values defined by an Env with a duplicate key will take precedence.
+                                    Cannot be updated.
+                                  items:
+                                    description: EnvFromSource represents the source
+                                      of a set of ConfigMaps or Secrets
+                                    properties:
+                                      configMapRef:
+                                        description: The ConfigMap to select from
+                                        properties:
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the ConfigMap
+                                              must be defined
+                                            type: boolean
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      prefix:
+                                        description: |-
+                                          Optional text to prepend to the name of each environment variable.
+                                          May consist of any printable ASCII characters except '='.
+                                        type: string
+                                      secretRef:
+                                        description: The Secret to select from
+                                        properties:
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the Secret
+                                              must be defined
+                                            type: boolean
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                image:
+                                  description: |-
+                                    Container image name.
+                                    More info: https://kubernetes.io/docs/concepts/containers/images
+                                    This field is optional to allow higher level config management to default or override
+                                    container images in workload controllers like Deployments and StatefulSets.
+                                  type: string
+                                imagePullPolicy:
+                                  description: |-
+                                    Image pull policy.
+                                    One of Always, Never, IfNotPresent.
+                                    Defaults to Always if :latest tag is specified, or IfNotPresent otherwise.
+                                    Cannot be updated.
+                                    More info: https://kubernetes.io/docs/concepts/containers/images#updating-images
+                                  type: string
+                                lifecycle:
+                                  description: |-
+                                    Actions that the management system should take in response to container lifecycle events.
+                                    Cannot be updated.
+                                  properties:
+                                    postStart:
+                                      description: |-
+                                        PostStart is called immediately after a container is created. If the handler fails,
+                                        the container is terminated and restarted according to its restart policy.
+                                        Other management of the container blocks until the hook completes.
+                                        More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
+                                      properties:
+                                        exec:
+                                          description: Exec specifies a command to
+                                            execute in the container.
+                                          properties:
+                                            command:
+                                              description: |-
+                                                Command is the command line to execute inside the container, the working directory for the
+                                                command  is root ('/') in the container's filesystem. The command is simply exec'd, it is
+                                                not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use
+                                                a shell, you need to explicitly call out to that shell.
+                                                Exit status of 0 is treated as live/healthy and non-zero is unhealthy.
+                                              items:
+                                                type: string
+                                              type: array
+                                              x-kubernetes-list-type: atomic
+                                          type: object
+                                        httpGet:
+                                          description: HTTPGet specifies an HTTP GET
+                                            request to perform.
+                                          properties:
+                                            host:
+                                              description: |-
+                                                Host name to connect to, defaults to the pod IP. You probably want to set
+                                                "Host" in httpHeaders instead.
+                                              type: string
+                                            httpHeaders:
+                                              description: Custom headers to set in
+                                                the request. HTTP allows repeated
+                                                headers.
+                                              items:
+                                                description: HTTPHeader describes
+                                                  a custom header to be used in HTTP
+                                                  probes
+                                                properties:
+                                                  name:
+                                                    description: |-
+                                                      The header field name.
+                                                      This will be canonicalized upon output, so case-variant names will be understood as the same header.
+                                                    type: string
+                                                  value:
+                                                    description: The header field
+                                                      value
+                                                    type: string
+                                                required:
+                                                - name
+                                                - value
+                                                type: object
+                                              type: array
+                                              x-kubernetes-list-type: atomic
+                                            path:
+                                              description: Path to access on the HTTP
+                                                server.
+                                              type: string
+                                            port:
+                                              anyOf:
+                                              - type: integer
+                                              - type: string
+                                              description: |-
+                                                Name or number of the port to access on the container.
+                                                Number must be in the range 1 to 65535.
+                                                Name must be an IANA_SVC_NAME.
+                                              x-kubernetes-int-or-string: true
+                                            scheme:
+                                              description: |-
+                                                Scheme to use for connecting to the host.
+                                                Defaults to HTTP.
+                                              type: string
+                                          required:
+                                          - port
+                                          type: object
+                                        sleep:
+                                          description: Sleep represents a duration
+                                            that the container should sleep.
+                                          properties:
+                                            seconds:
+                                              description: Seconds is the number of
+                                                seconds to sleep.
+                                              format: int64
+                                              type: integer
+                                          required:
+                                          - seconds
+                                          type: object
+                                        tcpSocket:
+                                          description: |-
+                                            Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
+                                            for backward compatibility. There is no validation of this field and
+                                            lifecycle hooks will fail at runtime when it is specified.
+                                          properties:
+                                            host:
+                                              description: 'Optional: Host name to
+                                                connect to, defaults to the pod IP.'
+                                              type: string
+                                            port:
+                                              anyOf:
+                                              - type: integer
+                                              - type: string
+                                              description: |-
+                                                Number or name of the port to access on the container.
+                                                Number must be in the range 1 to 65535.
+                                                Name must be an IANA_SVC_NAME.
+                                              x-kubernetes-int-or-string: true
+                                          required:
+                                          - port
+                                          type: object
+                                      type: object
+                                    preStop:
+                                      description: |-
+                                        PreStop is called immediately before a container is terminated due to an
+                                        API request or management event such as liveness/startup probe failure,
+                                        preemption, resource contention, etc. The handler is not called if the
+                                        container crashes or exits. The Pod's termination grace period countdown begins before the
+                                        PreStop hook is executed. Regardless of the outcome of the handler, the
+                                        container will eventually terminate within the Pod's termination grace
+                                        period (unless delayed by finalizers). Other management of the container blocks until the hook completes
+                                        or until the termination grace period is reached.
+                                        More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
+                                      properties:
+                                        exec:
+                                          description: Exec specifies a command to
+                                            execute in the container.
+                                          properties:
+                                            command:
+                                              description: |-
+                                                Command is the command line to execute inside the container, the working directory for the
+                                                command  is root ('/') in the container's filesystem. The command is simply exec'd, it is
+                                                not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use
+                                                a shell, you need to explicitly call out to that shell.
+                                                Exit status of 0 is treated as live/healthy and non-zero is unhealthy.
+                                              items:
+                                                type: string
+                                              type: array
+                                              x-kubernetes-list-type: atomic
+                                          type: object
+                                        httpGet:
+                                          description: HTTPGet specifies an HTTP GET
+                                            request to perform.
+                                          properties:
+                                            host:
+                                              description: |-
+                                                Host name to connect to, defaults to the pod IP. You probably want to set
+                                                "Host" in httpHeaders instead.
+                                              type: string
+                                            httpHeaders:
+                                              description: Custom headers to set in
+                                                the request. HTTP allows repeated
+                                                headers.
+                                              items:
+                                                description: HTTPHeader describes
+                                                  a custom header to be used in HTTP
+                                                  probes
+                                                properties:
+                                                  name:
+                                                    description: |-
+                                                      The header field name.
+                                                      This will be canonicalized upon output, so case-variant names will be understood as the same header.
+                                                    type: string
+                                                  value:
+                                                    description: The header field
+                                                      value
+                                                    type: string
+                                                required:
+                                                - name
+                                                - value
+                                                type: object
+                                              type: array
+                                              x-kubernetes-list-type: atomic
+                                            path:
+                                              description: Path to access on the HTTP
+                                                server.
+                                              type: string
+                                            port:
+                                              anyOf:
+                                              - type: integer
+                                              - type: string
+                                              description: |-
+                                                Name or number of the port to access on the container.
+                                                Number must be in the range 1 to 65535.
+                                                Name must be an IANA_SVC_NAME.
+                                              x-kubernetes-int-or-string: true
+                                            scheme:
+                                              description: |-
+                                                Scheme to use for connecting to the host.
+                                                Defaults to HTTP.
+                                              type: string
+                                          required:
+                                          - port
+                                          type: object
+                                        sleep:
+                                          description: Sleep represents a duration
+                                            that the container should sleep.
+                                          properties:
+                                            seconds:
+                                              description: Seconds is the number of
+                                                seconds to sleep.
+                                              format: int64
+                                              type: integer
+                                          required:
+                                          - seconds
+                                          type: object
+                                        tcpSocket:
+                                          description: |-
+                                            Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
+                                            for backward compatibility. There is no validation of this field and
+                                            lifecycle hooks will fail at runtime when it is specified.
+                                          properties:
+                                            host:
+                                              description: 'Optional: Host name to
+                                                connect to, defaults to the pod IP.'
+                                              type: string
+                                            port:
+                                              anyOf:
+                                              - type: integer
+                                              - type: string
+                                              description: |-
+                                                Number or name of the port to access on the container.
+                                                Number must be in the range 1 to 65535.
+                                                Name must be an IANA_SVC_NAME.
+                                              x-kubernetes-int-or-string: true
+                                          required:
+                                          - port
+                                          type: object
+                                      type: object
+                                    stopSignal:
+                                      description: |-
+                                        StopSignal defines which signal will be sent to a container when it is being stopped.
+                                        If not specified, the default is defined by the container runtime in use.
+                                        StopSignal can only be set for Pods with a non-empty .spec.os.name
+                                      type: string
+                                  type: object
+                                livenessProbe:
+                                  description: |-
+                                    Periodic probe of container liveness.
+                                    Container will be restarted if the probe fails.
+                                    Cannot be updated.
+                                    More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                                  properties:
+                                    exec:
+                                      description: Exec specifies a command to execute
+                                        in the container.
+                                      properties:
+                                        command:
+                                          description: |-
+                                            Command is the command line to execute inside the container, the working directory for the
+                                            command  is root ('/') in the container's filesystem. The command is simply exec'd, it is
+                                            not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use
+                                            a shell, you need to explicitly call out to that shell.
+                                            Exit status of 0 is treated as live/healthy and non-zero is unhealthy.
+                                          items:
+                                            type: string
+                                          type: array
+                                          x-kubernetes-list-type: atomic
+                                      type: object
+                                    failureThreshold:
+                                      description: |-
+                                        Minimum consecutive failures for the probe to be considered failed after having succeeded.
+                                        Defaults to 3. Minimum value is 1.
+                                      format: int32
+                                      type: integer
+                                    grpc:
+                                      description: GRPC specifies a GRPC HealthCheckRequest.
+                                      properties:
+                                        port:
+                                          description: Port number of the gRPC service.
+                                            Number must be in the range 1 to 65535.
+                                          format: int32
+                                          type: integer
+                                        service:
+                                          default: ""
+                                          description: |-
+                                            Service is the name of the service to place in the gRPC HealthCheckRequest
+                                            (see https://github.com/grpc/grpc/blob/master/doc/health-checking.md).
+
+                                            If this is not specified, the default behavior is defined by gRPC.
+                                          type: string
+                                      required:
+                                      - port
+                                      type: object
+                                    httpGet:
+                                      description: HTTPGet specifies an HTTP GET request
+                                        to perform.
+                                      properties:
+                                        host:
+                                          description: |-
+                                            Host name to connect to, defaults to the pod IP. You probably want to set
+                                            "Host" in httpHeaders instead.
+                                          type: string
+                                        httpHeaders:
+                                          description: Custom headers to set in the
+                                            request. HTTP allows repeated headers.
+                                          items:
+                                            description: HTTPHeader describes a custom
+                                              header to be used in HTTP probes
+                                            properties:
+                                              name:
+                                                description: |-
+                                                  The header field name.
+                                                  This will be canonicalized upon output, so case-variant names will be understood as the same header.
+                                                type: string
+                                              value:
+                                                description: The header field value
+                                                type: string
+                                            required:
+                                            - name
+                                            - value
+                                            type: object
+                                          type: array
+                                          x-kubernetes-list-type: atomic
+                                        path:
+                                          description: Path to access on the HTTP
+                                            server.
+                                          type: string
+                                        port:
+                                          anyOf:
+                                          - type: integer
+                                          - type: string
+                                          description: |-
+                                            Name or number of the port to access on the container.
+                                            Number must be in the range 1 to 65535.
+                                            Name must be an IANA_SVC_NAME.
+                                          x-kubernetes-int-or-string: true
+                                        scheme:
+                                          description: |-
+                                            Scheme to use for connecting to the host.
+                                            Defaults to HTTP.
+                                          type: string
+                                      required:
+                                      - port
+                                      type: object
+                                    initialDelaySeconds:
+                                      description: |-
+                                        Number of seconds after the container has started before liveness probes are initiated.
+                                        More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                                      format: int32
+                                      type: integer
+                                    periodSeconds:
+                                      description: |-
+                                        How often (in seconds) to perform the probe.
+                                        Default to 10 seconds. Minimum value is 1.
+                                      format: int32
+                                      type: integer
+                                    successThreshold:
+                                      description: |-
+                                        Minimum consecutive successes for the probe to be considered successful after having failed.
+                                        Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
+                                      format: int32
+                                      type: integer
+                                    tcpSocket:
+                                      description: TCPSocket specifies a connection
+                                        to a TCP port.
+                                      properties:
+                                        host:
+                                          description: 'Optional: Host name to connect
+                                            to, defaults to the pod IP.'
+                                          type: string
+                                        port:
+                                          anyOf:
+                                          - type: integer
+                                          - type: string
+                                          description: |-
+                                            Number or name of the port to access on the container.
+                                            Number must be in the range 1 to 65535.
+                                            Name must be an IANA_SVC_NAME.
+                                          x-kubernetes-int-or-string: true
+                                      required:
+                                      - port
+                                      type: object
+                                    terminationGracePeriodSeconds:
+                                      description: |-
+                                        Optional duration in seconds the pod needs to terminate gracefully upon probe failure.
+                                        The grace period is the duration in seconds after the processes running in the pod are sent
+                                        a termination signal and the time when the processes are forcibly halted with a kill signal.
+                                        Set this value longer than the expected cleanup time for your process.
+                                        If this value is nil, the pod's terminationGracePeriodSeconds will be used. Otherwise, this
+                                        value overrides the value provided by the pod spec.
+                                        Value must be non-negative integer. The value zero indicates stop immediately via
+                                        the kill signal (no opportunity to shut down).
+                                        This is a beta field and requires enabling ProbeTerminationGracePeriod feature gate.
+                                        Minimum value is 1. spec.terminationGracePeriodSeconds is used if unset.
+                                      format: int64
+                                      type: integer
+                                    timeoutSeconds:
+                                      description: |-
+                                        Number of seconds after which the probe times out.
+                                        Defaults to 1 second. Minimum value is 1.
+                                        More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                                      format: int32
+                                      type: integer
+                                  type: object
+                                name:
+                                  description: |-
+                                    Name of the container specified as a DNS_LABEL.
+                                    Each container in a pod must have a unique name (DNS_LABEL).
+                                    Cannot be updated.
+                                  type: string
+                                ports:
+                                  description: |-
+                                    List of ports to expose from the container. Not specifying a port here
+                                    DOES NOT prevent that port from being exposed. Any port which is
+                                    listening on the default "0.0.0.0" address inside a container will be
+                                    accessible from the network.
+                                    Modifying this array with strategic merge patch may corrupt the data.
+                                    For more information See https://github.com/kubernetes/kubernetes/issues/108255.
+                                    Cannot be updated.
+                                  items:
+                                    description: ContainerPort represents a network
+                                      port in a single container.
+                                    properties:
+                                      containerPort:
+                                        description: |-
+                                          Number of port to expose on the pod's IP address.
+                                          This must be a valid port number, 0 < x < 65536.
+                                        format: int32
+                                        type: integer
+                                      hostIP:
+                                        description: What host IP to bind the external
+                                          port to.
+                                        type: string
+                                      hostPort:
+                                        description: |-
+                                          Number of port to expose on the host.
+                                          If specified, this must be a valid port number, 0 < x < 65536.
+                                          If HostNetwork is specified, this must match ContainerPort.
+                                          Most containers do not need this.
+                                        format: int32
+                                        type: integer
+                                      name:
+                                        description: |-
+                                          If specified, this must be an IANA_SVC_NAME and unique within the pod. Each
+                                          named port in a pod must have a unique name. Name for the port that can be
+                                          referred to by services.
+                                        type: string
+                                      protocol:
+                                        default: TCP
+                                        description: |-
+                                          Protocol for port. Must be UDP, TCP, or SCTP.
+                                          Defaults to "TCP".
+                                        type: string
+                                    required:
+                                    - containerPort
+                                    - protocol
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-map-keys:
+                                  - containerPort
+                                  - protocol
+                                  x-kubernetes-list-type: map
+                                readinessProbe:
+                                  description: |-
+                                    Periodic probe of container service readiness.
+                                    Container will be removed from service endpoints if the probe fails.
+                                    Cannot be updated.
+                                    More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                                  properties:
+                                    exec:
+                                      description: Exec specifies a command to execute
+                                        in the container.
+                                      properties:
+                                        command:
+                                          description: |-
+                                            Command is the command line to execute inside the container, the working directory for the
+                                            command  is root ('/') in the container's filesystem. The command is simply exec'd, it is
+                                            not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use
+                                            a shell, you need to explicitly call out to that shell.
+                                            Exit status of 0 is treated as live/healthy and non-zero is unhealthy.
+                                          items:
+                                            type: string
+                                          type: array
+                                          x-kubernetes-list-type: atomic
+                                      type: object
+                                    failureThreshold:
+                                      description: |-
+                                        Minimum consecutive failures for the probe to be considered failed after having succeeded.
+                                        Defaults to 3. Minimum value is 1.
+                                      format: int32
+                                      type: integer
+                                    grpc:
+                                      description: GRPC specifies a GRPC HealthCheckRequest.
+                                      properties:
+                                        port:
+                                          description: Port number of the gRPC service.
+                                            Number must be in the range 1 to 65535.
+                                          format: int32
+                                          type: integer
+                                        service:
+                                          default: ""
+                                          description: |-
+                                            Service is the name of the service to place in the gRPC HealthCheckRequest
+                                            (see https://github.com/grpc/grpc/blob/master/doc/health-checking.md).
+
+                                            If this is not specified, the default behavior is defined by gRPC.
+                                          type: string
+                                      required:
+                                      - port
+                                      type: object
+                                    httpGet:
+                                      description: HTTPGet specifies an HTTP GET request
+                                        to perform.
+                                      properties:
+                                        host:
+                                          description: |-
+                                            Host name to connect to, defaults to the pod IP. You probably want to set
+                                            "Host" in httpHeaders instead.
+                                          type: string
+                                        httpHeaders:
+                                          description: Custom headers to set in the
+                                            request. HTTP allows repeated headers.
+                                          items:
+                                            description: HTTPHeader describes a custom
+                                              header to be used in HTTP probes
+                                            properties:
+                                              name:
+                                                description: |-
+                                                  The header field name.
+                                                  This will be canonicalized upon output, so case-variant names will be understood as the same header.
+                                                type: string
+                                              value:
+                                                description: The header field value
+                                                type: string
+                                            required:
+                                            - name
+                                            - value
+                                            type: object
+                                          type: array
+                                          x-kubernetes-list-type: atomic
+                                        path:
+                                          description: Path to access on the HTTP
+                                            server.
+                                          type: string
+                                        port:
+                                          anyOf:
+                                          - type: integer
+                                          - type: string
+                                          description: |-
+                                            Name or number of the port to access on the container.
+                                            Number must be in the range 1 to 65535.
+                                            Name must be an IANA_SVC_NAME.
+                                          x-kubernetes-int-or-string: true
+                                        scheme:
+                                          description: |-
+                                            Scheme to use for connecting to the host.
+                                            Defaults to HTTP.
+                                          type: string
+                                      required:
+                                      - port
+                                      type: object
+                                    initialDelaySeconds:
+                                      description: |-
+                                        Number of seconds after the container has started before liveness probes are initiated.
+                                        More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                                      format: int32
+                                      type: integer
+                                    periodSeconds:
+                                      description: |-
+                                        How often (in seconds) to perform the probe.
+                                        Default to 10 seconds. Minimum value is 1.
+                                      format: int32
+                                      type: integer
+                                    successThreshold:
+                                      description: |-
+                                        Minimum consecutive successes for the probe to be considered successful after having failed.
+                                        Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
+                                      format: int32
+                                      type: integer
+                                    tcpSocket:
+                                      description: TCPSocket specifies a connection
+                                        to a TCP port.
+                                      properties:
+                                        host:
+                                          description: 'Optional: Host name to connect
+                                            to, defaults to the pod IP.'
+                                          type: string
+                                        port:
+                                          anyOf:
+                                          - type: integer
+                                          - type: string
+                                          description: |-
+                                            Number or name of the port to access on the container.
+                                            Number must be in the range 1 to 65535.
+                                            Name must be an IANA_SVC_NAME.
+                                          x-kubernetes-int-or-string: true
+                                      required:
+                                      - port
+                                      type: object
+                                    terminationGracePeriodSeconds:
+                                      description: |-
+                                        Optional duration in seconds the pod needs to terminate gracefully upon probe failure.
+                                        The grace period is the duration in seconds after the processes running in the pod are sent
+                                        a termination signal and the time when the processes are forcibly halted with a kill signal.
+                                        Set this value longer than the expected cleanup time for your process.
+                                        If this value is nil, the pod's terminationGracePeriodSeconds will be used. Otherwise, this
+                                        value overrides the value provided by the pod spec.
+                                        Value must be non-negative integer. The value zero indicates stop immediately via
+                                        the kill signal (no opportunity to shut down).
+                                        This is a beta field and requires enabling ProbeTerminationGracePeriod feature gate.
+                                        Minimum value is 1. spec.terminationGracePeriodSeconds is used if unset.
+                                      format: int64
+                                      type: integer
+                                    timeoutSeconds:
+                                      description: |-
+                                        Number of seconds after which the probe times out.
+                                        Defaults to 1 second. Minimum value is 1.
+                                        More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                                      format: int32
+                                      type: integer
+                                  type: object
+                                resizePolicy:
+                                  description: |-
+                                    Resources resize policy for the container.
+                                    This field cannot be set on ephemeral containers.
+                                  items:
+                                    description: ContainerResizePolicy represents
+                                      resource resize policy for the container.
+                                    properties:
+                                      resourceName:
+                                        description: |-
+                                          Name of the resource to which this resource resize policy applies.
+                                          Supported values: cpu, memory.
+                                        type: string
+                                      restartPolicy:
+                                        description: |-
+                                          Restart policy to apply when specified resource is resized.
+                                          If not specified, it defaults to NotRequired.
+                                        type: string
+                                    required:
+                                    - resourceName
+                                    - restartPolicy
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                resources:
+                                  description: |-
+                                    Compute Resources required by this container.
+                                    Cannot be updated.
+                                    More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+                                  properties:
+                                    claims:
+                                      description: |-
+                                        Claims lists the names of resources, defined in spec.resourceClaims,
+                                        that are used by this container.
+
+                                        This field depends on the
+                                        DynamicResourceAllocation feature gate.
+
+                                        This field is immutable. It can only be set for containers.
+                                      items:
+                                        description: ResourceClaim references one
+                                          entry in PodSpec.ResourceClaims.
+                                        properties:
+                                          name:
+                                            description: |-
+                                              Name must match the name of one entry in pod.spec.resourceClaims of
+                                              the Pod where this field is used. It makes that resource available
+                                              inside a container.
+                                            type: string
+                                          request:
+                                            description: |-
+                                              Request is the name chosen for a request in the referenced claim.
+                                              If empty, everything from the claim is made available, otherwise
+                                              only the result of this request.
+                                            type: string
+                                        required:
+                                        - name
+                                        type: object
+                                      type: array
+                                      x-kubernetes-list-map-keys:
+                                      - name
+                                      x-kubernetes-list-type: map
+                                    limits:
+                                      additionalProperties:
+                                        anyOf:
+                                        - type: integer
+                                        - type: string
+                                        pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                        x-kubernetes-int-or-string: true
+                                      description: |-
+                                        Limits describes the maximum amount of compute resources allowed.
+                                        More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+                                      type: object
+                                    requests:
+                                      additionalProperties:
+                                        anyOf:
+                                        - type: integer
+                                        - type: string
+                                        pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                        x-kubernetes-int-or-string: true
+                                      description: |-
+                                        Requests describes the minimum amount of compute resources required.
+                                        If Requests is omitted for a container, it defaults to Limits if that is explicitly specified,
+                                        otherwise to an implementation-defined value. Requests cannot exceed Limits.
+                                        More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+                                      type: object
+                                  type: object
+                                restartPolicy:
+                                  description: |-
+                                    RestartPolicy defines the restart behavior of individual containers in a pod.
+                                    This overrides the pod-level restart policy. When this field is not specified,
+                                    the restart behavior is defined by the Pod's restart policy and the container type.
+                                    Additionally, setting the RestartPolicy as "Always" for the init container will
+                                    have the following effect:
+                                    this init container will be continually restarted on
+                                    exit until all regular containers have terminated. Once all regular
+                                    containers have completed, all init containers with restartPolicy "Always"
+                                    will be shut down. This lifecycle differs from normal init containers and
+                                    is often referred to as a "sidecar" container. Although this init
+                                    container still starts in the init container sequence, it does not wait
+                                    for the container to complete before proceeding to the next init
+                                    container. Instead, the next init container starts immediately after this
+                                    init container is started, or after any startupProbe has successfully
+                                    completed.
+                                  type: string
+                                restartPolicyRules:
+                                  description: |-
+                                    Represents a list of rules to be checked to determine if the
+                                    container should be restarted on exit. The rules are evaluated in
+                                    order. Once a rule matches a container exit condition, the remaining
+                                    rules are ignored. If no rule matches the container exit condition,
+                                    the Container-level restart policy determines the whether the container
+                                    is restarted or not. Constraints on the rules:
+                                    - At most 20 rules are allowed.
+                                    - Rules can have the same action.
+                                    - Identical rules are not forbidden in validations.
+                                    When rules are specified, container MUST set RestartPolicy explicitly
+                                    even it if matches the Pod's RestartPolicy.
+                                  items:
+                                    description: ContainerRestartRule describes how
+                                      a container exit is handled.
+                                    properties:
+                                      action:
+                                        description: |-
+                                          Specifies the action taken on a container exit if the requirements
+                                          are satisfied. The only possible value is "Restart" to restart the
+                                          container.
+                                        type: string
+                                      exitCodes:
+                                        description: Represents the exit codes to
+                                          check on container exits.
+                                        properties:
+                                          operator:
+                                            description: |-
+                                              Represents the relationship between the container exit code(s) and the
+                                              specified values. Possible values are:
+                                              - In: the requirement is satisfied if the container exit code is in the
+                                                set of specified values.
+                                              - NotIn: the requirement is satisfied if the container exit code is
+                                                not in the set of specified values.
+                                            type: string
+                                          values:
+                                            description: |-
+                                              Specifies the set of values to check for container exit codes.
+                                              At most 255 elements are allowed.
+                                            items:
+                                              format: int32
+                                              type: integer
+                                            type: array
+                                            x-kubernetes-list-type: set
+                                        required:
+                                        - operator
+                                        type: object
+                                    required:
+                                    - action
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                securityContext:
+                                  description: |-
+                                    SecurityContext defines the security options the container should be run with.
+                                    If set, the fields of SecurityContext override the equivalent fields of PodSecurityContext.
+                                    More info: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/
+                                  properties:
+                                    allowPrivilegeEscalation:
+                                      description: |-
+                                        AllowPrivilegeEscalation controls whether a process can gain more
+                                        privileges than its parent process. This bool directly controls if
+                                        the no_new_privs flag will be set on the container process.
+                                        AllowPrivilegeEscalation is true always when the container is:
+                                        1) run as Privileged
+                                        2) has CAP_SYS_ADMIN
+                                        Note that this field cannot be set when spec.os.name is windows.
+                                      type: boolean
+                                    appArmorProfile:
+                                      description: |-
+                                        appArmorProfile is the AppArmor options to use by this container. If set, this profile
+                                        overrides the pod's appArmorProfile.
+                                        Note that this field cannot be set when spec.os.name is windows.
+                                      properties:
+                                        localhostProfile:
+                                          description: |-
+                                            localhostProfile indicates a profile loaded on the node that should be used.
+                                            The profile must be preconfigured on the node to work.
+                                            Must match the loaded name of the profile.
+                                            Must be set if and only if type is "Localhost".
+                                          type: string
+                                        type:
+                                          description: |-
+                                            type indicates which kind of AppArmor profile will be applied.
+                                            Valid options are:
+                                              Localhost - a profile pre-loaded on the node.
+                                              RuntimeDefault - the container runtime's default profile.
+                                              Unconfined - no AppArmor enforcement.
+                                          type: string
+                                      required:
+                                      - type
+                                      type: object
+                                    capabilities:
+                                      description: |-
+                                        The capabilities to add/drop when running containers.
+                                        Defaults to the default set of capabilities granted by the container runtime.
+                                        Note that this field cannot be set when spec.os.name is windows.
+                                      properties:
+                                        add:
+                                          description: Added capabilities
+                                          items:
+                                            description: Capability represent POSIX
+                                              capabilities type
+                                            type: string
+                                          type: array
+                                          x-kubernetes-list-type: atomic
+                                        drop:
+                                          description: Removed capabilities
+                                          items:
+                                            description: Capability represent POSIX
+                                              capabilities type
+                                            type: string
+                                          type: array
+                                          x-kubernetes-list-type: atomic
+                                      type: object
+                                    privileged:
+                                      description: |-
+                                        Run container in privileged mode.
+                                        Processes in privileged containers are essentially equivalent to root on the host.
+                                        Defaults to false.
+                                        Note that this field cannot be set when spec.os.name is windows.
+                                      type: boolean
+                                    procMount:
+                                      description: |-
+                                        procMount denotes the type of proc mount to use for the containers.
+                                        The default value is Default which uses the container runtime defaults for
+                                        readonly paths and masked paths.
+                                        This requires the ProcMountType feature flag to be enabled.
+                                        Note that this field cannot be set when spec.os.name is windows.
+                                      type: string
+                                    readOnlyRootFilesystem:
+                                      description: |-
+                                        Whether this container has a read-only root filesystem.
+                                        Default is false.
+                                        Note that this field cannot be set when spec.os.name is windows.
+                                      type: boolean
+                                    runAsGroup:
+                                      description: |-
+                                        The GID to run the entrypoint of the container process.
+                                        Uses runtime default if unset.
+                                        May also be set in PodSecurityContext.  If set in both SecurityContext and
+                                        PodSecurityContext, the value specified in SecurityContext takes precedence.
+                                        Note that this field cannot be set when spec.os.name is windows.
+                                      format: int64
+                                      type: integer
+                                    runAsNonRoot:
+                                      description: |-
+                                        Indicates that the container must run as a non-root user.
+                                        If true, the Kubelet will validate the image at runtime to ensure that it
+                                        does not run as UID 0 (root) and fail to start the container if it does.
+                                        If unset or false, no such validation will be performed.
+                                        May also be set in PodSecurityContext.  If set in both SecurityContext and
+                                        PodSecurityContext, the value specified in SecurityContext takes precedence.
+                                      type: boolean
+                                    runAsUser:
+                                      description: |-
+                                        The UID to run the entrypoint of the container process.
+                                        Defaults to user specified in image metadata if unspecified.
+                                        May also be set in PodSecurityContext.  If set in both SecurityContext and
+                                        PodSecurityContext, the value specified in SecurityContext takes precedence.
+                                        Note that this field cannot be set when spec.os.name is windows.
+                                      format: int64
+                                      type: integer
+                                    seLinuxOptions:
+                                      description: |-
+                                        The SELinux context to be applied to the container.
+                                        If unspecified, the container runtime will allocate a random SELinux context for each
+                                        container.  May also be set in PodSecurityContext.  If set in both SecurityContext and
+                                        PodSecurityContext, the value specified in SecurityContext takes precedence.
+                                        Note that this field cannot be set when spec.os.name is windows.
+                                      properties:
+                                        level:
+                                          description: Level is SELinux level label
+                                            that applies to the container.
+                                          type: string
+                                        role:
+                                          description: Role is a SELinux role label
+                                            that applies to the container.
+                                          type: string
+                                        type:
+                                          description: Type is a SELinux type label
+                                            that applies to the container.
+                                          type: string
+                                        user:
+                                          description: User is a SELinux user label
+                                            that applies to the container.
+                                          type: string
+                                      type: object
+                                    seccompProfile:
+                                      description: |-
+                                        The seccomp options to use by this container. If seccomp options are
+                                        provided at both the pod & container level, the container options
+                                        override the pod options.
+                                        Note that this field cannot be set when spec.os.name is windows.
+                                      properties:
+                                        localhostProfile:
+                                          description: |-
+                                            localhostProfile indicates a profile defined in a file on the node should be used.
+                                            The profile must be preconfigured on the node to work.
+                                            Must be a descending path, relative to the kubelet's configured seccomp profile location.
+                                            Must be set if type is "Localhost". Must NOT be set for any other type.
+                                          type: string
+                                        type:
+                                          description: |-
+                                            type indicates which kind of seccomp profile will be applied.
+                                            Valid options are:
+
+                                            Localhost - a profile defined in a file on the node should be used.
+                                            RuntimeDefault - the container runtime default profile should be used.
+                                            Unconfined - no profile should be applied.
+                                          type: string
+                                      required:
+                                      - type
+                                      type: object
+                                    windowsOptions:
+                                      description: |-
+                                        The Windows specific settings applied to all containers.
+                                        If unspecified, the options from the PodSecurityContext will be used.
+                                        If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence.
+                                        Note that this field cannot be set when spec.os.name is linux.
+                                      properties:
+                                        gmsaCredentialSpec:
+                                          description: |-
+                                            GMSACredentialSpec is where the GMSA admission webhook
+                                            (https://github.com/kubernetes-sigs/windows-gmsa) inlines the contents of the
+                                            GMSA credential spec named by the GMSACredentialSpecName field.
+                                          type: string
+                                        gmsaCredentialSpecName:
+                                          description: GMSACredentialSpecName is the
+                                            name of the GMSA credential spec to use.
+                                          type: string
+                                        hostProcess:
+                                          description: |-
+                                            HostProcess determines if a container should be run as a 'Host Process' container.
+                                            All of a Pod's containers must have the same effective HostProcess value
+                                            (it is not allowed to have a mix of HostProcess containers and non-HostProcess containers).
+                                            In addition, if HostProcess is true then HostNetwork must also be set to true.
+                                          type: boolean
+                                        runAsUserName:
+                                          description: |-
+                                            The UserName in Windows to run the entrypoint of the container process.
+                                            Defaults to the user specified in image metadata if unspecified.
+                                            May also be set in PodSecurityContext. If set in both SecurityContext and
+                                            PodSecurityContext, the value specified in SecurityContext takes precedence.
+                                          type: string
+                                      type: object
+                                  type: object
+                                startupProbe:
+                                  description: |-
+                                    StartupProbe indicates that the Pod has successfully initialized.
+                                    If specified, no other probes are executed until this completes successfully.
+                                    If this probe fails, the Pod will be restarted, just as if the livenessProbe failed.
+                                    This can be used to provide different probe parameters at the beginning of a Pod's lifecycle,
+                                    when it might take a long time to load data or warm a cache, than during steady-state operation.
+                                    This cannot be updated.
+                                    More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                                  properties:
+                                    exec:
+                                      description: Exec specifies a command to execute
+                                        in the container.
+                                      properties:
+                                        command:
+                                          description: |-
+                                            Command is the command line to execute inside the container, the working directory for the
+                                            command  is root ('/') in the container's filesystem. The command is simply exec'd, it is
+                                            not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use
+                                            a shell, you need to explicitly call out to that shell.
+                                            Exit status of 0 is treated as live/healthy and non-zero is unhealthy.
+                                          items:
+                                            type: string
+                                          type: array
+                                          x-kubernetes-list-type: atomic
+                                      type: object
+                                    failureThreshold:
+                                      description: |-
+                                        Minimum consecutive failures for the probe to be considered failed after having succeeded.
+                                        Defaults to 3. Minimum value is 1.
+                                      format: int32
+                                      type: integer
+                                    grpc:
+                                      description: GRPC specifies a GRPC HealthCheckRequest.
+                                      properties:
+                                        port:
+                                          description: Port number of the gRPC service.
+                                            Number must be in the range 1 to 65535.
+                                          format: int32
+                                          type: integer
+                                        service:
+                                          default: ""
+                                          description: |-
+                                            Service is the name of the service to place in the gRPC HealthCheckRequest
+                                            (see https://github.com/grpc/grpc/blob/master/doc/health-checking.md).
+
+                                            If this is not specified, the default behavior is defined by gRPC.
+                                          type: string
+                                      required:
+                                      - port
+                                      type: object
+                                    httpGet:
+                                      description: HTTPGet specifies an HTTP GET request
+                                        to perform.
+                                      properties:
+                                        host:
+                                          description: |-
+                                            Host name to connect to, defaults to the pod IP. You probably want to set
+                                            "Host" in httpHeaders instead.
+                                          type: string
+                                        httpHeaders:
+                                          description: Custom headers to set in the
+                                            request. HTTP allows repeated headers.
+                                          items:
+                                            description: HTTPHeader describes a custom
+                                              header to be used in HTTP probes
+                                            properties:
+                                              name:
+                                                description: |-
+                                                  The header field name.
+                                                  This will be canonicalized upon output, so case-variant names will be understood as the same header.
+                                                type: string
+                                              value:
+                                                description: The header field value
+                                                type: string
+                                            required:
+                                            - name
+                                            - value
+                                            type: object
+                                          type: array
+                                          x-kubernetes-list-type: atomic
+                                        path:
+                                          description: Path to access on the HTTP
+                                            server.
+                                          type: string
+                                        port:
+                                          anyOf:
+                                          - type: integer
+                                          - type: string
+                                          description: |-
+                                            Name or number of the port to access on the container.
+                                            Number must be in the range 1 to 65535.
+                                            Name must be an IANA_SVC_NAME.
+                                          x-kubernetes-int-or-string: true
+                                        scheme:
+                                          description: |-
+                                            Scheme to use for connecting to the host.
+                                            Defaults to HTTP.
+                                          type: string
+                                      required:
+                                      - port
+                                      type: object
+                                    initialDelaySeconds:
+                                      description: |-
+                                        Number of seconds after the container has started before liveness probes are initiated.
+                                        More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                                      format: int32
+                                      type: integer
+                                    periodSeconds:
+                                      description: |-
+                                        How often (in seconds) to perform the probe.
+                                        Default to 10 seconds. Minimum value is 1.
+                                      format: int32
+                                      type: integer
+                                    successThreshold:
+                                      description: |-
+                                        Minimum consecutive successes for the probe to be considered successful after having failed.
+                                        Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
+                                      format: int32
+                                      type: integer
+                                    tcpSocket:
+                                      description: TCPSocket specifies a connection
+                                        to a TCP port.
+                                      properties:
+                                        host:
+                                          description: 'Optional: Host name to connect
+                                            to, defaults to the pod IP.'
+                                          type: string
+                                        port:
+                                          anyOf:
+                                          - type: integer
+                                          - type: string
+                                          description: |-
+                                            Number or name of the port to access on the container.
+                                            Number must be in the range 1 to 65535.
+                                            Name must be an IANA_SVC_NAME.
+                                          x-kubernetes-int-or-string: true
+                                      required:
+                                      - port
+                                      type: object
+                                    terminationGracePeriodSeconds:
+                                      description: |-
+                                        Optional duration in seconds the pod needs to terminate gracefully upon probe failure.
+                                        The grace period is the duration in seconds after the processes running in the pod are sent
+                                        a termination signal and the time when the processes are forcibly halted with a kill signal.
+                                        Set this value longer than the expected cleanup time for your process.
+                                        If this value is nil, the pod's terminationGracePeriodSeconds will be used. Otherwise, this
+                                        value overrides the value provided by the pod spec.
+                                        Value must be non-negative integer. The value zero indicates stop immediately via
+                                        the kill signal (no opportunity to shut down).
+                                        This is a beta field and requires enabling ProbeTerminationGracePeriod feature gate.
+                                        Minimum value is 1. spec.terminationGracePeriodSeconds is used if unset.
+                                      format: int64
+                                      type: integer
+                                    timeoutSeconds:
+                                      description: |-
+                                        Number of seconds after which the probe times out.
+                                        Defaults to 1 second. Minimum value is 1.
+                                        More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                                      format: int32
+                                      type: integer
+                                  type: object
+                                stdin:
+                                  description: |-
+                                    Whether this container should allocate a buffer for stdin in the container runtime. If this
+                                    is not set, reads from stdin in the container will always result in EOF.
+                                    Default is false.
+                                  type: boolean
+                                stdinOnce:
+                                  description: |-
+                                    Whether the container runtime should close the stdin channel after it has been opened by
+                                    a single attach. When stdin is true the stdin stream will remain open across multiple attach
+                                    sessions. If stdinOnce is set to true, stdin is opened on container start, is empty until the
+                                    first client attaches to stdin, and then remains open and accepts data until the client disconnects,
+                                    at which time stdin is closed and remains closed until the container is restarted. If this
+                                    flag is false, a container processes that reads from stdin will never receive an EOF.
+                                    Default is false
+                                  type: boolean
+                                terminationMessagePath:
+                                  description: |-
+                                    Optional: Path at which the file to which the container's termination message
+                                    will be written is mounted into the container's filesystem.
+                                    Message written is intended to be brief final status, such as an assertion failure message.
+                                    Will be truncated by the node if greater than 4096 bytes. The total message length across
+                                    all containers will be limited to 12kb.
+                                    Defaults to /dev/termination-log.
+                                    Cannot be updated.
+                                  type: string
+                                terminationMessagePolicy:
+                                  description: |-
+                                    Indicate how the termination message should be populated. File will use the contents of
+                                    terminationMessagePath to populate the container status message on both success and failure.
+                                    FallbackToLogsOnError will use the last chunk of container log output if the termination
+                                    message file is empty and the container exited with an error.
+                                    The log output is limited to 2048 bytes or 80 lines, whichever is smaller.
+                                    Defaults to File.
+                                    Cannot be updated.
+                                  type: string
+                                tty:
+                                  description: |-
+                                    Whether this container should allocate a TTY for itself, also requires 'stdin' to be true.
+                                    Default is false.
+                                  type: boolean
+                                volumeDevices:
+                                  description: volumeDevices is the list of block
+                                    devices to be used by the container.
+                                  items:
+                                    description: volumeDevice describes a mapping
+                                      of a raw block device within a container.
+                                    properties:
+                                      devicePath:
+                                        description: devicePath is the path inside
+                                          of the container that the device will be
+                                          mapped to.
+                                        type: string
+                                      name:
+                                        description: name must match the name of a
+                                          persistentVolumeClaim in the pod
+                                        type: string
+                                    required:
+                                    - devicePath
+                                    - name
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-map-keys:
+                                  - devicePath
+                                  x-kubernetes-list-type: map
+                                volumeMounts:
+                                  description: |-
+                                    Pod volumes to mount into the container's filesystem.
+                                    Cannot be updated.
+                                  items:
+                                    description: VolumeMount describes a mounting
+                                      of a Volume within a container.
+                                    properties:
+                                      mountPath:
+                                        description: |-
+                                          Path within the container at which the volume should be mounted.  Must
+                                          not contain ':'.
+                                        type: string
+                                      mountPropagation:
+                                        description: |-
+                                          mountPropagation determines how mounts are propagated from the host
+                                          to container and the other way around.
+                                          When not set, MountPropagationNone is used.
+                                          This field is beta in 1.10.
+                                          When RecursiveReadOnly is set to IfPossible or to Enabled, MountPropagation must be None or unspecified
+                                          (which defaults to None).
+                                        type: string
+                                      name:
+                                        description: This must match the Name of a
+                                          Volume.
+                                        type: string
+                                      readOnly:
+                                        description: |-
+                                          Mounted read-only if true, read-write otherwise (false or unspecified).
+                                          Defaults to false.
+                                        type: boolean
+                                      recursiveReadOnly:
+                                        description: |-
+                                          RecursiveReadOnly specifies whether read-only mounts should be handled
+                                          recursively.
+
+                                          If ReadOnly is false, this field has no meaning and must be unspecified.
+
+                                          If ReadOnly is true, and this field is set to Disabled, the mount is not made
+                                          recursively read-only.  If this field is set to IfPossible, the mount is made
+                                          recursively read-only, if it is supported by the container runtime.  If this
+                                          field is set to Enabled, the mount is made recursively read-only if it is
+                                          supported by the container runtime, otherwise the pod will not be started and
+                                          an error will be generated to indicate the reason.
+
+                                          If this field is set to IfPossible or Enabled, MountPropagation must be set to
+                                          None (or be unspecified, which defaults to None).
+
+                                          If this field is not specified, it is treated as an equivalent of Disabled.
+                                        type: string
+                                      subPath:
+                                        description: |-
+                                          Path within the volume from which the container's volume should be mounted.
+                                          Defaults to "" (volume's root).
+                                        type: string
+                                      subPathExpr:
+                                        description: |-
+                                          Expanded path within the volume from which the container's volume should be mounted.
+                                          Behaves similarly to SubPath but environment variable references $(VAR_NAME) are expanded using the container's environment.
+                                          Defaults to "" (volume's root).
+                                          SubPathExpr and SubPath are mutually exclusive.
+                                        type: string
+                                    required:
+                                    - mountPath
+                                    - name
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-map-keys:
+                                  - mountPath
+                                  x-kubernetes-list-type: map
+                                workingDir:
+                                  description: |-
+                                    Container's working directory.
+                                    If not specified, the container runtime's default will be used, which
+                                    might be configured in the container image.
+                                    Cannot be updated.
+                                  type: string
+                              required:
+                              - name
+                              type: object
+                            type: array
+                            x-kubernetes-list-map-keys:
+                            - name
+                            x-kubernetes-list-type: map
+                          dnsConfig:
+                            description: |-
+                              Specifies the DNS parameters of a pod.
+                              Parameters specified here will be merged to the generated DNS
+                              configuration based on DNSPolicy.
+                            properties:
+                              nameservers:
+                                description: |-
+                                  A list of DNS name server IP addresses.
+                                  This will be appended to the base nameservers generated from DNSPolicy.
+                                  Duplicated nameservers will be removed.
+                                items:
+                                  type: string
+                                type: array
+                                x-kubernetes-list-type: atomic
+                              options:
+                                description: |-
+                                  A list of DNS resolver options.
+                                  This will be merged with the base options generated from DNSPolicy.
+                                  Duplicated entries will be removed. Resolution options given in Options
+                                  will override those that appear in the base DNSPolicy.
+                                items:
+                                  description: PodDNSConfigOption defines DNS resolver
+                                    options of a pod.
+                                  properties:
+                                    name:
+                                      description: |-
+                                        Name is this DNS resolver option's name.
+                                        Required.
+                                      type: string
+                                    value:
+                                      description: Value is this DNS resolver option's
+                                        value.
+                                      type: string
+                                  type: object
+                                type: array
+                                x-kubernetes-list-type: atomic
+                              searches:
+                                description: |-
+                                  A list of DNS search domains for host-name lookup.
+                                  This will be appended to the base search paths generated from DNSPolicy.
+                                  Duplicated search paths will be removed.
+                                items:
+                                  type: string
+                                type: array
+                                x-kubernetes-list-type: atomic
+                            type: object
+                          dnsPolicy:
+                            description: |-
+                              Set DNS policy for the pod.
+                              Defaults to "ClusterFirst".
+                              Valid values are 'ClusterFirstWithHostNet', 'ClusterFirst', 'Default' or 'None'.
+                              DNS parameters given in DNSConfig will be merged with the policy selected with DNSPolicy.
+                              To have DNS options set along with hostNetwork, you have to specify DNS policy
+                              explicitly to 'ClusterFirstWithHostNet'.
+                            type: string
+                          enableServiceLinks:
+                            description: |-
+                              EnableServiceLinks indicates whether information about services should be injected into pod's
+                              environment variables, matching the syntax of Docker links.
+                              Optional: Defaults to true.
+                            type: boolean
+                          ephemeralContainers:
+                            description: |-
+                              List of ephemeral containers run in this pod. Ephemeral containers may be run in an existing
+                              pod to perform user-initiated actions such as debugging. This list cannot be specified when
+                              creating a pod, and it cannot be modified by updating the pod spec. In order to add an
+                              ephemeral container to an existing pod, use the pod's ephemeralcontainers subresource.
+                            items:
+                              description: |-
+                                An EphemeralContainer is a temporary container that you may add to an existing Pod for
+                                user-initiated activities such as debugging. Ephemeral containers have no resource or
+                                scheduling guarantees, and they will not be restarted when they exit or when a Pod is
+                                removed or restarted. The kubelet may evict a Pod if an ephemeral container causes the
+                                Pod to exceed its resource allocation.
+
+                                To add an ephemeral container, use the ephemeralcontainers subresource of an existing
+                                Pod. Ephemeral containers may not be removed or restarted.
+                              properties:
+                                args:
+                                  description: |-
+                                    Arguments to the entrypoint.
+                                    The image's CMD is used if this is not provided.
+                                    Variable references $(VAR_NAME) are expanded using the container's environment. If a variable
+                                    cannot be resolved, the reference in the input string will be unchanged. Double $$ are reduced
+                                    to a single $, which allows for escaping the $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)" will
+                                    produce the string literal "$(VAR_NAME)". Escaped references will never be expanded, regardless
+                                    of whether the variable exists or not. Cannot be updated.
+                                    More info: https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                command:
+                                  description: |-
+                                    Entrypoint array. Not executed within a shell.
+                                    The image's ENTRYPOINT is used if this is not provided.
+                                    Variable references $(VAR_NAME) are expanded using the container's environment. If a variable
+                                    cannot be resolved, the reference in the input string will be unchanged. Double $$ are reduced
+                                    to a single $, which allows for escaping the $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)" will
+                                    produce the string literal "$(VAR_NAME)". Escaped references will never be expanded, regardless
+                                    of whether the variable exists or not. Cannot be updated.
+                                    More info: https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                env:
+                                  description: |-
+                                    List of environment variables to set in the container.
+                                    Cannot be updated.
+                                  items:
+                                    description: EnvVar represents an environment
+                                      variable present in a Container.
+                                    properties:
+                                      name:
+                                        description: |-
+                                          Name of the environment variable.
+                                          May consist of any printable ASCII characters except '='.
+                                        type: string
+                                      value:
+                                        description: |-
+                                          Variable references $(VAR_NAME) are expanded
+                                          using the previously defined environment variables in the container and
+                                          any service environment variables. If a variable cannot be resolved,
+                                          the reference in the input string will be unchanged. Double $$ are reduced
+                                          to a single $, which allows for escaping the $(VAR_NAME) syntax: i.e.
+                                          "$$(VAR_NAME)" will produce the string literal "$(VAR_NAME)".
+                                          Escaped references will never be expanded, regardless of whether the variable
+                                          exists or not.
+                                          Defaults to "".
+                                        type: string
+                                      valueFrom:
+                                        description: Source for the environment variable's
+                                          value. Cannot be used if value is not empty.
+                                        properties:
+                                          configMapKeyRef:
+                                            description: Selects a key of a ConfigMap.
+                                            properties:
+                                              key:
+                                                description: The key to select.
+                                                type: string
+                                              name:
+                                                default: ""
+                                                description: |-
+                                                  Name of the referent.
+                                                  This field is effectively required, but due to backwards compatibility is
+                                                  allowed to be empty. Instances of this type with an empty value here are
+                                                  almost certainly wrong.
+                                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                                type: string
+                                              optional:
+                                                description: Specify whether the ConfigMap
+                                                  or its key must be defined
+                                                type: boolean
+                                            required:
+                                            - key
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                          fieldRef:
+                                            description: |-
+                                              Selects a field of the pod: supports metadata.name, metadata.namespace, `metadata.labels['<KEY>']`, `metadata.annotations['<KEY>']`,
+                                              spec.nodeName, spec.serviceAccountName, status.hostIP, status.podIP, status.podIPs.
+                                            properties:
+                                              apiVersion:
+                                                description: Version of the schema
+                                                  the FieldPath is written in terms
+                                                  of, defaults to "v1".
+                                                type: string
+                                              fieldPath:
+                                                description: Path of the field to
+                                                  select in the specified API version.
+                                                type: string
+                                            required:
+                                            - fieldPath
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                          fileKeyRef:
+                                            description: |-
+                                              FileKeyRef selects a key of the env file.
+                                              Requires the EnvFiles feature gate to be enabled.
+                                            properties:
+                                              key:
+                                                description: |-
+                                                  The key within the env file. An invalid key will prevent the pod from starting.
+                                                  The keys defined within a source may consist of any printable ASCII characters except '='.
+                                                  During Alpha stage of the EnvFiles feature gate, the key size is limited to 128 characters.
+                                                type: string
+                                              optional:
+                                                default: false
+                                                description: |-
+                                                  Specify whether the file or its key must be defined. If the file or key
+                                                  does not exist, then the env var is not published.
+                                                  If optional is set to true and the specified key does not exist,
+                                                  the environment variable will not be set in the Pod's containers.
+
+                                                  If optional is set to false and the specified key does not exist,
+                                                  an error will be returned during Pod creation.
+                                                type: boolean
+                                              path:
+                                                description: |-
+                                                  The path within the volume from which to select the file.
+                                                  Must be relative and may not contain the '..' path or start with '..'.
+                                                type: string
+                                              volumeName:
+                                                description: The name of the volume
+                                                  mount containing the env file.
+                                                type: string
+                                            required:
+                                            - key
+                                            - path
+                                            - volumeName
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                          resourceFieldRef:
+                                            description: |-
+                                              Selects a resource of the container: only resources limits and requests
+                                              (limits.cpu, limits.memory, limits.ephemeral-storage, requests.cpu, requests.memory and requests.ephemeral-storage) are currently supported.
+                                            properties:
+                                              containerName:
+                                                description: 'Container name: required
+                                                  for volumes, optional for env vars'
+                                                type: string
+                                              divisor:
+                                                anyOf:
+                                                - type: integer
+                                                - type: string
+                                                description: Specifies the output
+                                                  format of the exposed resources,
+                                                  defaults to "1"
+                                                pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                                x-kubernetes-int-or-string: true
+                                              resource:
+                                                description: 'Required: resource to
+                                                  select'
+                                                type: string
+                                            required:
+                                            - resource
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                          secretKeyRef:
+                                            description: Selects a key of a secret
+                                              in the pod's namespace
+                                            properties:
+                                              key:
+                                                description: The key of the secret
+                                                  to select from.  Must be a valid
+                                                  secret key.
+                                                type: string
+                                              name:
+                                                default: ""
+                                                description: |-
+                                                  Name of the referent.
+                                                  This field is effectively required, but due to backwards compatibility is
+                                                  allowed to be empty. Instances of this type with an empty value here are
+                                                  almost certainly wrong.
+                                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                                type: string
+                                              optional:
+                                                description: Specify whether the Secret
+                                                  or its key must be defined
+                                                type: boolean
+                                            required:
+                                            - key
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                        type: object
+                                    required:
+                                    - name
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-map-keys:
+                                  - name
+                                  x-kubernetes-list-type: map
+                                envFrom:
+                                  description: |-
+                                    List of sources to populate environment variables in the container.
+                                    The keys defined within a source may consist of any printable ASCII characters except '='.
+                                    When a key exists in multiple
+                                    sources, the value associated with the last source will take precedence.
+                                    Values defined by an Env with a duplicate key will take precedence.
+                                    Cannot be updated.
+                                  items:
+                                    description: EnvFromSource represents the source
+                                      of a set of ConfigMaps or Secrets
+                                    properties:
+                                      configMapRef:
+                                        description: The ConfigMap to select from
+                                        properties:
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the ConfigMap
+                                              must be defined
+                                            type: boolean
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      prefix:
+                                        description: |-
+                                          Optional text to prepend to the name of each environment variable.
+                                          May consist of any printable ASCII characters except '='.
+                                        type: string
+                                      secretRef:
+                                        description: The Secret to select from
+                                        properties:
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the Secret
+                                              must be defined
+                                            type: boolean
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                image:
+                                  description: |-
+                                    Container image name.
+                                    More info: https://kubernetes.io/docs/concepts/containers/images
+                                  type: string
+                                imagePullPolicy:
+                                  description: |-
+                                    Image pull policy.
+                                    One of Always, Never, IfNotPresent.
+                                    Defaults to Always if :latest tag is specified, or IfNotPresent otherwise.
+                                    Cannot be updated.
+                                    More info: https://kubernetes.io/docs/concepts/containers/images#updating-images
+                                  type: string
+                                lifecycle:
+                                  description: Lifecycle is not allowed for ephemeral
+                                    containers.
+                                  properties:
+                                    postStart:
+                                      description: |-
+                                        PostStart is called immediately after a container is created. If the handler fails,
+                                        the container is terminated and restarted according to its restart policy.
+                                        Other management of the container blocks until the hook completes.
+                                        More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
+                                      properties:
+                                        exec:
+                                          description: Exec specifies a command to
+                                            execute in the container.
+                                          properties:
+                                            command:
+                                              description: |-
+                                                Command is the command line to execute inside the container, the working directory for the
+                                                command  is root ('/') in the container's filesystem. The command is simply exec'd, it is
+                                                not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use
+                                                a shell, you need to explicitly call out to that shell.
+                                                Exit status of 0 is treated as live/healthy and non-zero is unhealthy.
+                                              items:
+                                                type: string
+                                              type: array
+                                              x-kubernetes-list-type: atomic
+                                          type: object
+                                        httpGet:
+                                          description: HTTPGet specifies an HTTP GET
+                                            request to perform.
+                                          properties:
+                                            host:
+                                              description: |-
+                                                Host name to connect to, defaults to the pod IP. You probably want to set
+                                                "Host" in httpHeaders instead.
+                                              type: string
+                                            httpHeaders:
+                                              description: Custom headers to set in
+                                                the request. HTTP allows repeated
+                                                headers.
+                                              items:
+                                                description: HTTPHeader describes
+                                                  a custom header to be used in HTTP
+                                                  probes
+                                                properties:
+                                                  name:
+                                                    description: |-
+                                                      The header field name.
+                                                      This will be canonicalized upon output, so case-variant names will be understood as the same header.
+                                                    type: string
+                                                  value:
+                                                    description: The header field
+                                                      value
+                                                    type: string
+                                                required:
+                                                - name
+                                                - value
+                                                type: object
+                                              type: array
+                                              x-kubernetes-list-type: atomic
+                                            path:
+                                              description: Path to access on the HTTP
+                                                server.
+                                              type: string
+                                            port:
+                                              anyOf:
+                                              - type: integer
+                                              - type: string
+                                              description: |-
+                                                Name or number of the port to access on the container.
+                                                Number must be in the range 1 to 65535.
+                                                Name must be an IANA_SVC_NAME.
+                                              x-kubernetes-int-or-string: true
+                                            scheme:
+                                              description: |-
+                                                Scheme to use for connecting to the host.
+                                                Defaults to HTTP.
+                                              type: string
+                                          required:
+                                          - port
+                                          type: object
+                                        sleep:
+                                          description: Sleep represents a duration
+                                            that the container should sleep.
+                                          properties:
+                                            seconds:
+                                              description: Seconds is the number of
+                                                seconds to sleep.
+                                              format: int64
+                                              type: integer
+                                          required:
+                                          - seconds
+                                          type: object
+                                        tcpSocket:
+                                          description: |-
+                                            Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
+                                            for backward compatibility. There is no validation of this field and
+                                            lifecycle hooks will fail at runtime when it is specified.
+                                          properties:
+                                            host:
+                                              description: 'Optional: Host name to
+                                                connect to, defaults to the pod IP.'
+                                              type: string
+                                            port:
+                                              anyOf:
+                                              - type: integer
+                                              - type: string
+                                              description: |-
+                                                Number or name of the port to access on the container.
+                                                Number must be in the range 1 to 65535.
+                                                Name must be an IANA_SVC_NAME.
+                                              x-kubernetes-int-or-string: true
+                                          required:
+                                          - port
+                                          type: object
+                                      type: object
+                                    preStop:
+                                      description: |-
+                                        PreStop is called immediately before a container is terminated due to an
+                                        API request or management event such as liveness/startup probe failure,
+                                        preemption, resource contention, etc. The handler is not called if the
+                                        container crashes or exits. The Pod's termination grace period countdown begins before the
+                                        PreStop hook is executed. Regardless of the outcome of the handler, the
+                                        container will eventually terminate within the Pod's termination grace
+                                        period (unless delayed by finalizers). Other management of the container blocks until the hook completes
+                                        or until the termination grace period is reached.
+                                        More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
+                                      properties:
+                                        exec:
+                                          description: Exec specifies a command to
+                                            execute in the container.
+                                          properties:
+                                            command:
+                                              description: |-
+                                                Command is the command line to execute inside the container, the working directory for the
+                                                command  is root ('/') in the container's filesystem. The command is simply exec'd, it is
+                                                not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use
+                                                a shell, you need to explicitly call out to that shell.
+                                                Exit status of 0 is treated as live/healthy and non-zero is unhealthy.
+                                              items:
+                                                type: string
+                                              type: array
+                                              x-kubernetes-list-type: atomic
+                                          type: object
+                                        httpGet:
+                                          description: HTTPGet specifies an HTTP GET
+                                            request to perform.
+                                          properties:
+                                            host:
+                                              description: |-
+                                                Host name to connect to, defaults to the pod IP. You probably want to set
+                                                "Host" in httpHeaders instead.
+                                              type: string
+                                            httpHeaders:
+                                              description: Custom headers to set in
+                                                the request. HTTP allows repeated
+                                                headers.
+                                              items:
+                                                description: HTTPHeader describes
+                                                  a custom header to be used in HTTP
+                                                  probes
+                                                properties:
+                                                  name:
+                                                    description: |-
+                                                      The header field name.
+                                                      This will be canonicalized upon output, so case-variant names will be understood as the same header.
+                                                    type: string
+                                                  value:
+                                                    description: The header field
+                                                      value
+                                                    type: string
+                                                required:
+                                                - name
+                                                - value
+                                                type: object
+                                              type: array
+                                              x-kubernetes-list-type: atomic
+                                            path:
+                                              description: Path to access on the HTTP
+                                                server.
+                                              type: string
+                                            port:
+                                              anyOf:
+                                              - type: integer
+                                              - type: string
+                                              description: |-
+                                                Name or number of the port to access on the container.
+                                                Number must be in the range 1 to 65535.
+                                                Name must be an IANA_SVC_NAME.
+                                              x-kubernetes-int-or-string: true
+                                            scheme:
+                                              description: |-
+                                                Scheme to use for connecting to the host.
+                                                Defaults to HTTP.
+                                              type: string
+                                          required:
+                                          - port
+                                          type: object
+                                        sleep:
+                                          description: Sleep represents a duration
+                                            that the container should sleep.
+                                          properties:
+                                            seconds:
+                                              description: Seconds is the number of
+                                                seconds to sleep.
+                                              format: int64
+                                              type: integer
+                                          required:
+                                          - seconds
+                                          type: object
+                                        tcpSocket:
+                                          description: |-
+                                            Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
+                                            for backward compatibility. There is no validation of this field and
+                                            lifecycle hooks will fail at runtime when it is specified.
+                                          properties:
+                                            host:
+                                              description: 'Optional: Host name to
+                                                connect to, defaults to the pod IP.'
+                                              type: string
+                                            port:
+                                              anyOf:
+                                              - type: integer
+                                              - type: string
+                                              description: |-
+                                                Number or name of the port to access on the container.
+                                                Number must be in the range 1 to 65535.
+                                                Name must be an IANA_SVC_NAME.
+                                              x-kubernetes-int-or-string: true
+                                          required:
+                                          - port
+                                          type: object
+                                      type: object
+                                    stopSignal:
+                                      description: |-
+                                        StopSignal defines which signal will be sent to a container when it is being stopped.
+                                        If not specified, the default is defined by the container runtime in use.
+                                        StopSignal can only be set for Pods with a non-empty .spec.os.name
+                                      type: string
+                                  type: object
+                                livenessProbe:
+                                  description: Probes are not allowed for ephemeral
+                                    containers.
+                                  properties:
+                                    exec:
+                                      description: Exec specifies a command to execute
+                                        in the container.
+                                      properties:
+                                        command:
+                                          description: |-
+                                            Command is the command line to execute inside the container, the working directory for the
+                                            command  is root ('/') in the container's filesystem. The command is simply exec'd, it is
+                                            not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use
+                                            a shell, you need to explicitly call out to that shell.
+                                            Exit status of 0 is treated as live/healthy and non-zero is unhealthy.
+                                          items:
+                                            type: string
+                                          type: array
+                                          x-kubernetes-list-type: atomic
+                                      type: object
+                                    failureThreshold:
+                                      description: |-
+                                        Minimum consecutive failures for the probe to be considered failed after having succeeded.
+                                        Defaults to 3. Minimum value is 1.
+                                      format: int32
+                                      type: integer
+                                    grpc:
+                                      description: GRPC specifies a GRPC HealthCheckRequest.
+                                      properties:
+                                        port:
+                                          description: Port number of the gRPC service.
+                                            Number must be in the range 1 to 65535.
+                                          format: int32
+                                          type: integer
+                                        service:
+                                          default: ""
+                                          description: |-
+                                            Service is the name of the service to place in the gRPC HealthCheckRequest
+                                            (see https://github.com/grpc/grpc/blob/master/doc/health-checking.md).
+
+                                            If this is not specified, the default behavior is defined by gRPC.
+                                          type: string
+                                      required:
+                                      - port
+                                      type: object
+                                    httpGet:
+                                      description: HTTPGet specifies an HTTP GET request
+                                        to perform.
+                                      properties:
+                                        host:
+                                          description: |-
+                                            Host name to connect to, defaults to the pod IP. You probably want to set
+                                            "Host" in httpHeaders instead.
+                                          type: string
+                                        httpHeaders:
+                                          description: Custom headers to set in the
+                                            request. HTTP allows repeated headers.
+                                          items:
+                                            description: HTTPHeader describes a custom
+                                              header to be used in HTTP probes
+                                            properties:
+                                              name:
+                                                description: |-
+                                                  The header field name.
+                                                  This will be canonicalized upon output, so case-variant names will be understood as the same header.
+                                                type: string
+                                              value:
+                                                description: The header field value
+                                                type: string
+                                            required:
+                                            - name
+                                            - value
+                                            type: object
+                                          type: array
+                                          x-kubernetes-list-type: atomic
+                                        path:
+                                          description: Path to access on the HTTP
+                                            server.
+                                          type: string
+                                        port:
+                                          anyOf:
+                                          - type: integer
+                                          - type: string
+                                          description: |-
+                                            Name or number of the port to access on the container.
+                                            Number must be in the range 1 to 65535.
+                                            Name must be an IANA_SVC_NAME.
+                                          x-kubernetes-int-or-string: true
+                                        scheme:
+                                          description: |-
+                                            Scheme to use for connecting to the host.
+                                            Defaults to HTTP.
+                                          type: string
+                                      required:
+                                      - port
+                                      type: object
+                                    initialDelaySeconds:
+                                      description: |-
+                                        Number of seconds after the container has started before liveness probes are initiated.
+                                        More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                                      format: int32
+                                      type: integer
+                                    periodSeconds:
+                                      description: |-
+                                        How often (in seconds) to perform the probe.
+                                        Default to 10 seconds. Minimum value is 1.
+                                      format: int32
+                                      type: integer
+                                    successThreshold:
+                                      description: |-
+                                        Minimum consecutive successes for the probe to be considered successful after having failed.
+                                        Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
+                                      format: int32
+                                      type: integer
+                                    tcpSocket:
+                                      description: TCPSocket specifies a connection
+                                        to a TCP port.
+                                      properties:
+                                        host:
+                                          description: 'Optional: Host name to connect
+                                            to, defaults to the pod IP.'
+                                          type: string
+                                        port:
+                                          anyOf:
+                                          - type: integer
+                                          - type: string
+                                          description: |-
+                                            Number or name of the port to access on the container.
+                                            Number must be in the range 1 to 65535.
+                                            Name must be an IANA_SVC_NAME.
+                                          x-kubernetes-int-or-string: true
+                                      required:
+                                      - port
+                                      type: object
+                                    terminationGracePeriodSeconds:
+                                      description: |-
+                                        Optional duration in seconds the pod needs to terminate gracefully upon probe failure.
+                                        The grace period is the duration in seconds after the processes running in the pod are sent
+                                        a termination signal and the time when the processes are forcibly halted with a kill signal.
+                                        Set this value longer than the expected cleanup time for your process.
+                                        If this value is nil, the pod's terminationGracePeriodSeconds will be used. Otherwise, this
+                                        value overrides the value provided by the pod spec.
+                                        Value must be non-negative integer. The value zero indicates stop immediately via
+                                        the kill signal (no opportunity to shut down).
+                                        This is a beta field and requires enabling ProbeTerminationGracePeriod feature gate.
+                                        Minimum value is 1. spec.terminationGracePeriodSeconds is used if unset.
+                                      format: int64
+                                      type: integer
+                                    timeoutSeconds:
+                                      description: |-
+                                        Number of seconds after which the probe times out.
+                                        Defaults to 1 second. Minimum value is 1.
+                                        More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                                      format: int32
+                                      type: integer
+                                  type: object
+                                name:
+                                  description: |-
+                                    Name of the ephemeral container specified as a DNS_LABEL.
+                                    This name must be unique among all containers, init containers and ephemeral containers.
+                                  type: string
+                                ports:
+                                  description: Ports are not allowed for ephemeral
+                                    containers.
+                                  items:
+                                    description: ContainerPort represents a network
+                                      port in a single container.
+                                    properties:
+                                      containerPort:
+                                        description: |-
+                                          Number of port to expose on the pod's IP address.
+                                          This must be a valid port number, 0 < x < 65536.
+                                        format: int32
+                                        type: integer
+                                      hostIP:
+                                        description: What host IP to bind the external
+                                          port to.
+                                        type: string
+                                      hostPort:
+                                        description: |-
+                                          Number of port to expose on the host.
+                                          If specified, this must be a valid port number, 0 < x < 65536.
+                                          If HostNetwork is specified, this must match ContainerPort.
+                                          Most containers do not need this.
+                                        format: int32
+                                        type: integer
+                                      name:
+                                        description: |-
+                                          If specified, this must be an IANA_SVC_NAME and unique within the pod. Each
+                                          named port in a pod must have a unique name. Name for the port that can be
+                                          referred to by services.
+                                        type: string
+                                      protocol:
+                                        default: TCP
+                                        description: |-
+                                          Protocol for port. Must be UDP, TCP, or SCTP.
+                                          Defaults to "TCP".
+                                        type: string
+                                    required:
+                                    - containerPort
+                                    - protocol
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-map-keys:
+                                  - containerPort
+                                  - protocol
+                                  x-kubernetes-list-type: map
+                                readinessProbe:
+                                  description: Probes are not allowed for ephemeral
+                                    containers.
+                                  properties:
+                                    exec:
+                                      description: Exec specifies a command to execute
+                                        in the container.
+                                      properties:
+                                        command:
+                                          description: |-
+                                            Command is the command line to execute inside the container, the working directory for the
+                                            command  is root ('/') in the container's filesystem. The command is simply exec'd, it is
+                                            not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use
+                                            a shell, you need to explicitly call out to that shell.
+                                            Exit status of 0 is treated as live/healthy and non-zero is unhealthy.
+                                          items:
+                                            type: string
+                                          type: array
+                                          x-kubernetes-list-type: atomic
+                                      type: object
+                                    failureThreshold:
+                                      description: |-
+                                        Minimum consecutive failures for the probe to be considered failed after having succeeded.
+                                        Defaults to 3. Minimum value is 1.
+                                      format: int32
+                                      type: integer
+                                    grpc:
+                                      description: GRPC specifies a GRPC HealthCheckRequest.
+                                      properties:
+                                        port:
+                                          description: Port number of the gRPC service.
+                                            Number must be in the range 1 to 65535.
+                                          format: int32
+                                          type: integer
+                                        service:
+                                          default: ""
+                                          description: |-
+                                            Service is the name of the service to place in the gRPC HealthCheckRequest
+                                            (see https://github.com/grpc/grpc/blob/master/doc/health-checking.md).
+
+                                            If this is not specified, the default behavior is defined by gRPC.
+                                          type: string
+                                      required:
+                                      - port
+                                      type: object
+                                    httpGet:
+                                      description: HTTPGet specifies an HTTP GET request
+                                        to perform.
+                                      properties:
+                                        host:
+                                          description: |-
+                                            Host name to connect to, defaults to the pod IP. You probably want to set
+                                            "Host" in httpHeaders instead.
+                                          type: string
+                                        httpHeaders:
+                                          description: Custom headers to set in the
+                                            request. HTTP allows repeated headers.
+                                          items:
+                                            description: HTTPHeader describes a custom
+                                              header to be used in HTTP probes
+                                            properties:
+                                              name:
+                                                description: |-
+                                                  The header field name.
+                                                  This will be canonicalized upon output, so case-variant names will be understood as the same header.
+                                                type: string
+                                              value:
+                                                description: The header field value
+                                                type: string
+                                            required:
+                                            - name
+                                            - value
+                                            type: object
+                                          type: array
+                                          x-kubernetes-list-type: atomic
+                                        path:
+                                          description: Path to access on the HTTP
+                                            server.
+                                          type: string
+                                        port:
+                                          anyOf:
+                                          - type: integer
+                                          - type: string
+                                          description: |-
+                                            Name or number of the port to access on the container.
+                                            Number must be in the range 1 to 65535.
+                                            Name must be an IANA_SVC_NAME.
+                                          x-kubernetes-int-or-string: true
+                                        scheme:
+                                          description: |-
+                                            Scheme to use for connecting to the host.
+                                            Defaults to HTTP.
+                                          type: string
+                                      required:
+                                      - port
+                                      type: object
+                                    initialDelaySeconds:
+                                      description: |-
+                                        Number of seconds after the container has started before liveness probes are initiated.
+                                        More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                                      format: int32
+                                      type: integer
+                                    periodSeconds:
+                                      description: |-
+                                        How often (in seconds) to perform the probe.
+                                        Default to 10 seconds. Minimum value is 1.
+                                      format: int32
+                                      type: integer
+                                    successThreshold:
+                                      description: |-
+                                        Minimum consecutive successes for the probe to be considered successful after having failed.
+                                        Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
+                                      format: int32
+                                      type: integer
+                                    tcpSocket:
+                                      description: TCPSocket specifies a connection
+                                        to a TCP port.
+                                      properties:
+                                        host:
+                                          description: 'Optional: Host name to connect
+                                            to, defaults to the pod IP.'
+                                          type: string
+                                        port:
+                                          anyOf:
+                                          - type: integer
+                                          - type: string
+                                          description: |-
+                                            Number or name of the port to access on the container.
+                                            Number must be in the range 1 to 65535.
+                                            Name must be an IANA_SVC_NAME.
+                                          x-kubernetes-int-or-string: true
+                                      required:
+                                      - port
+                                      type: object
+                                    terminationGracePeriodSeconds:
+                                      description: |-
+                                        Optional duration in seconds the pod needs to terminate gracefully upon probe failure.
+                                        The grace period is the duration in seconds after the processes running in the pod are sent
+                                        a termination signal and the time when the processes are forcibly halted with a kill signal.
+                                        Set this value longer than the expected cleanup time for your process.
+                                        If this value is nil, the pod's terminationGracePeriodSeconds will be used. Otherwise, this
+                                        value overrides the value provided by the pod spec.
+                                        Value must be non-negative integer. The value zero indicates stop immediately via
+                                        the kill signal (no opportunity to shut down).
+                                        This is a beta field and requires enabling ProbeTerminationGracePeriod feature gate.
+                                        Minimum value is 1. spec.terminationGracePeriodSeconds is used if unset.
+                                      format: int64
+                                      type: integer
+                                    timeoutSeconds:
+                                      description: |-
+                                        Number of seconds after which the probe times out.
+                                        Defaults to 1 second. Minimum value is 1.
+                                        More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                                      format: int32
+                                      type: integer
+                                  type: object
+                                resizePolicy:
+                                  description: Resources resize policy for the container.
+                                  items:
+                                    description: ContainerResizePolicy represents
+                                      resource resize policy for the container.
+                                    properties:
+                                      resourceName:
+                                        description: |-
+                                          Name of the resource to which this resource resize policy applies.
+                                          Supported values: cpu, memory.
+                                        type: string
+                                      restartPolicy:
+                                        description: |-
+                                          Restart policy to apply when specified resource is resized.
+                                          If not specified, it defaults to NotRequired.
+                                        type: string
+                                    required:
+                                    - resourceName
+                                    - restartPolicy
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                resources:
+                                  description: |-
+                                    Resources are not allowed for ephemeral containers. Ephemeral containers use spare resources
+                                    already allocated to the pod.
+                                  properties:
+                                    claims:
+                                      description: |-
+                                        Claims lists the names of resources, defined in spec.resourceClaims,
+                                        that are used by this container.
+
+                                        This field depends on the
+                                        DynamicResourceAllocation feature gate.
+
+                                        This field is immutable. It can only be set for containers.
+                                      items:
+                                        description: ResourceClaim references one
+                                          entry in PodSpec.ResourceClaims.
+                                        properties:
+                                          name:
+                                            description: |-
+                                              Name must match the name of one entry in pod.spec.resourceClaims of
+                                              the Pod where this field is used. It makes that resource available
+                                              inside a container.
+                                            type: string
+                                          request:
+                                            description: |-
+                                              Request is the name chosen for a request in the referenced claim.
+                                              If empty, everything from the claim is made available, otherwise
+                                              only the result of this request.
+                                            type: string
+                                        required:
+                                        - name
+                                        type: object
+                                      type: array
+                                      x-kubernetes-list-map-keys:
+                                      - name
+                                      x-kubernetes-list-type: map
+                                    limits:
+                                      additionalProperties:
+                                        anyOf:
+                                        - type: integer
+                                        - type: string
+                                        pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                        x-kubernetes-int-or-string: true
+                                      description: |-
+                                        Limits describes the maximum amount of compute resources allowed.
+                                        More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+                                      type: object
+                                    requests:
+                                      additionalProperties:
+                                        anyOf:
+                                        - type: integer
+                                        - type: string
+                                        pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                        x-kubernetes-int-or-string: true
+                                      description: |-
+                                        Requests describes the minimum amount of compute resources required.
+                                        If Requests is omitted for a container, it defaults to Limits if that is explicitly specified,
+                                        otherwise to an implementation-defined value. Requests cannot exceed Limits.
+                                        More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+                                      type: object
+                                  type: object
+                                restartPolicy:
+                                  description: |-
+                                    Restart policy for the container to manage the restart behavior of each
+                                    container within a pod.
+                                    You cannot set this field on ephemeral containers.
+                                  type: string
+                                restartPolicyRules:
+                                  description: |-
+                                    Represents a list of rules to be checked to determine if the
+                                    container should be restarted on exit. You cannot set this field on
+                                    ephemeral containers.
+                                  items:
+                                    description: ContainerRestartRule describes how
+                                      a container exit is handled.
+                                    properties:
+                                      action:
+                                        description: |-
+                                          Specifies the action taken on a container exit if the requirements
+                                          are satisfied. The only possible value is "Restart" to restart the
+                                          container.
+                                        type: string
+                                      exitCodes:
+                                        description: Represents the exit codes to
+                                          check on container exits.
+                                        properties:
+                                          operator:
+                                            description: |-
+                                              Represents the relationship between the container exit code(s) and the
+                                              specified values. Possible values are:
+                                              - In: the requirement is satisfied if the container exit code is in the
+                                                set of specified values.
+                                              - NotIn: the requirement is satisfied if the container exit code is
+                                                not in the set of specified values.
+                                            type: string
+                                          values:
+                                            description: |-
+                                              Specifies the set of values to check for container exit codes.
+                                              At most 255 elements are allowed.
+                                            items:
+                                              format: int32
+                                              type: integer
+                                            type: array
+                                            x-kubernetes-list-type: set
+                                        required:
+                                        - operator
+                                        type: object
+                                    required:
+                                    - action
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                securityContext:
+                                  description: |-
+                                    Optional: SecurityContext defines the security options the ephemeral container should be run with.
+                                    If set, the fields of SecurityContext override the equivalent fields of PodSecurityContext.
+                                  properties:
+                                    allowPrivilegeEscalation:
+                                      description: |-
+                                        AllowPrivilegeEscalation controls whether a process can gain more
+                                        privileges than its parent process. This bool directly controls if
+                                        the no_new_privs flag will be set on the container process.
+                                        AllowPrivilegeEscalation is true always when the container is:
+                                        1) run as Privileged
+                                        2) has CAP_SYS_ADMIN
+                                        Note that this field cannot be set when spec.os.name is windows.
+                                      type: boolean
+                                    appArmorProfile:
+                                      description: |-
+                                        appArmorProfile is the AppArmor options to use by this container. If set, this profile
+                                        overrides the pod's appArmorProfile.
+                                        Note that this field cannot be set when spec.os.name is windows.
+                                      properties:
+                                        localhostProfile:
+                                          description: |-
+                                            localhostProfile indicates a profile loaded on the node that should be used.
+                                            The profile must be preconfigured on the node to work.
+                                            Must match the loaded name of the profile.
+                                            Must be set if and only if type is "Localhost".
+                                          type: string
+                                        type:
+                                          description: |-
+                                            type indicates which kind of AppArmor profile will be applied.
+                                            Valid options are:
+                                              Localhost - a profile pre-loaded on the node.
+                                              RuntimeDefault - the container runtime's default profile.
+                                              Unconfined - no AppArmor enforcement.
+                                          type: string
+                                      required:
+                                      - type
+                                      type: object
+                                    capabilities:
+                                      description: |-
+                                        The capabilities to add/drop when running containers.
+                                        Defaults to the default set of capabilities granted by the container runtime.
+                                        Note that this field cannot be set when spec.os.name is windows.
+                                      properties:
+                                        add:
+                                          description: Added capabilities
+                                          items:
+                                            description: Capability represent POSIX
+                                              capabilities type
+                                            type: string
+                                          type: array
+                                          x-kubernetes-list-type: atomic
+                                        drop:
+                                          description: Removed capabilities
+                                          items:
+                                            description: Capability represent POSIX
+                                              capabilities type
+                                            type: string
+                                          type: array
+                                          x-kubernetes-list-type: atomic
+                                      type: object
+                                    privileged:
+                                      description: |-
+                                        Run container in privileged mode.
+                                        Processes in privileged containers are essentially equivalent to root on the host.
+                                        Defaults to false.
+                                        Note that this field cannot be set when spec.os.name is windows.
+                                      type: boolean
+                                    procMount:
+                                      description: |-
+                                        procMount denotes the type of proc mount to use for the containers.
+                                        The default value is Default which uses the container runtime defaults for
+                                        readonly paths and masked paths.
+                                        This requires the ProcMountType feature flag to be enabled.
+                                        Note that this field cannot be set when spec.os.name is windows.
+                                      type: string
+                                    readOnlyRootFilesystem:
+                                      description: |-
+                                        Whether this container has a read-only root filesystem.
+                                        Default is false.
+                                        Note that this field cannot be set when spec.os.name is windows.
+                                      type: boolean
+                                    runAsGroup:
+                                      description: |-
+                                        The GID to run the entrypoint of the container process.
+                                        Uses runtime default if unset.
+                                        May also be set in PodSecurityContext.  If set in both SecurityContext and
+                                        PodSecurityContext, the value specified in SecurityContext takes precedence.
+                                        Note that this field cannot be set when spec.os.name is windows.
+                                      format: int64
+                                      type: integer
+                                    runAsNonRoot:
+                                      description: |-
+                                        Indicates that the container must run as a non-root user.
+                                        If true, the Kubelet will validate the image at runtime to ensure that it
+                                        does not run as UID 0 (root) and fail to start the container if it does.
+                                        If unset or false, no such validation will be performed.
+                                        May also be set in PodSecurityContext.  If set in both SecurityContext and
+                                        PodSecurityContext, the value specified in SecurityContext takes precedence.
+                                      type: boolean
+                                    runAsUser:
+                                      description: |-
+                                        The UID to run the entrypoint of the container process.
+                                        Defaults to user specified in image metadata if unspecified.
+                                        May also be set in PodSecurityContext.  If set in both SecurityContext and
+                                        PodSecurityContext, the value specified in SecurityContext takes precedence.
+                                        Note that this field cannot be set when spec.os.name is windows.
+                                      format: int64
+                                      type: integer
+                                    seLinuxOptions:
+                                      description: |-
+                                        The SELinux context to be applied to the container.
+                                        If unspecified, the container runtime will allocate a random SELinux context for each
+                                        container.  May also be set in PodSecurityContext.  If set in both SecurityContext and
+                                        PodSecurityContext, the value specified in SecurityContext takes precedence.
+                                        Note that this field cannot be set when spec.os.name is windows.
+                                      properties:
+                                        level:
+                                          description: Level is SELinux level label
+                                            that applies to the container.
+                                          type: string
+                                        role:
+                                          description: Role is a SELinux role label
+                                            that applies to the container.
+                                          type: string
+                                        type:
+                                          description: Type is a SELinux type label
+                                            that applies to the container.
+                                          type: string
+                                        user:
+                                          description: User is a SELinux user label
+                                            that applies to the container.
+                                          type: string
+                                      type: object
+                                    seccompProfile:
+                                      description: |-
+                                        The seccomp options to use by this container. If seccomp options are
+                                        provided at both the pod & container level, the container options
+                                        override the pod options.
+                                        Note that this field cannot be set when spec.os.name is windows.
+                                      properties:
+                                        localhostProfile:
+                                          description: |-
+                                            localhostProfile indicates a profile defined in a file on the node should be used.
+                                            The profile must be preconfigured on the node to work.
+                                            Must be a descending path, relative to the kubelet's configured seccomp profile location.
+                                            Must be set if type is "Localhost". Must NOT be set for any other type.
+                                          type: string
+                                        type:
+                                          description: |-
+                                            type indicates which kind of seccomp profile will be applied.
+                                            Valid options are:
+
+                                            Localhost - a profile defined in a file on the node should be used.
+                                            RuntimeDefault - the container runtime default profile should be used.
+                                            Unconfined - no profile should be applied.
+                                          type: string
+                                      required:
+                                      - type
+                                      type: object
+                                    windowsOptions:
+                                      description: |-
+                                        The Windows specific settings applied to all containers.
+                                        If unspecified, the options from the PodSecurityContext will be used.
+                                        If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence.
+                                        Note that this field cannot be set when spec.os.name is linux.
+                                      properties:
+                                        gmsaCredentialSpec:
+                                          description: |-
+                                            GMSACredentialSpec is where the GMSA admission webhook
+                                            (https://github.com/kubernetes-sigs/windows-gmsa) inlines the contents of the
+                                            GMSA credential spec named by the GMSACredentialSpecName field.
+                                          type: string
+                                        gmsaCredentialSpecName:
+                                          description: GMSACredentialSpecName is the
+                                            name of the GMSA credential spec to use.
+                                          type: string
+                                        hostProcess:
+                                          description: |-
+                                            HostProcess determines if a container should be run as a 'Host Process' container.
+                                            All of a Pod's containers must have the same effective HostProcess value
+                                            (it is not allowed to have a mix of HostProcess containers and non-HostProcess containers).
+                                            In addition, if HostProcess is true then HostNetwork must also be set to true.
+                                          type: boolean
+                                        runAsUserName:
+                                          description: |-
+                                            The UserName in Windows to run the entrypoint of the container process.
+                                            Defaults to the user specified in image metadata if unspecified.
+                                            May also be set in PodSecurityContext. If set in both SecurityContext and
+                                            PodSecurityContext, the value specified in SecurityContext takes precedence.
+                                          type: string
+                                      type: object
+                                  type: object
+                                startupProbe:
+                                  description: Probes are not allowed for ephemeral
+                                    containers.
+                                  properties:
+                                    exec:
+                                      description: Exec specifies a command to execute
+                                        in the container.
+                                      properties:
+                                        command:
+                                          description: |-
+                                            Command is the command line to execute inside the container, the working directory for the
+                                            command  is root ('/') in the container's filesystem. The command is simply exec'd, it is
+                                            not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use
+                                            a shell, you need to explicitly call out to that shell.
+                                            Exit status of 0 is treated as live/healthy and non-zero is unhealthy.
+                                          items:
+                                            type: string
+                                          type: array
+                                          x-kubernetes-list-type: atomic
+                                      type: object
+                                    failureThreshold:
+                                      description: |-
+                                        Minimum consecutive failures for the probe to be considered failed after having succeeded.
+                                        Defaults to 3. Minimum value is 1.
+                                      format: int32
+                                      type: integer
+                                    grpc:
+                                      description: GRPC specifies a GRPC HealthCheckRequest.
+                                      properties:
+                                        port:
+                                          description: Port number of the gRPC service.
+                                            Number must be in the range 1 to 65535.
+                                          format: int32
+                                          type: integer
+                                        service:
+                                          default: ""
+                                          description: |-
+                                            Service is the name of the service to place in the gRPC HealthCheckRequest
+                                            (see https://github.com/grpc/grpc/blob/master/doc/health-checking.md).
+
+                                            If this is not specified, the default behavior is defined by gRPC.
+                                          type: string
+                                      required:
+                                      - port
+                                      type: object
+                                    httpGet:
+                                      description: HTTPGet specifies an HTTP GET request
+                                        to perform.
+                                      properties:
+                                        host:
+                                          description: |-
+                                            Host name to connect to, defaults to the pod IP. You probably want to set
+                                            "Host" in httpHeaders instead.
+                                          type: string
+                                        httpHeaders:
+                                          description: Custom headers to set in the
+                                            request. HTTP allows repeated headers.
+                                          items:
+                                            description: HTTPHeader describes a custom
+                                              header to be used in HTTP probes
+                                            properties:
+                                              name:
+                                                description: |-
+                                                  The header field name.
+                                                  This will be canonicalized upon output, so case-variant names will be understood as the same header.
+                                                type: string
+                                              value:
+                                                description: The header field value
+                                                type: string
+                                            required:
+                                            - name
+                                            - value
+                                            type: object
+                                          type: array
+                                          x-kubernetes-list-type: atomic
+                                        path:
+                                          description: Path to access on the HTTP
+                                            server.
+                                          type: string
+                                        port:
+                                          anyOf:
+                                          - type: integer
+                                          - type: string
+                                          description: |-
+                                            Name or number of the port to access on the container.
+                                            Number must be in the range 1 to 65535.
+                                            Name must be an IANA_SVC_NAME.
+                                          x-kubernetes-int-or-string: true
+                                        scheme:
+                                          description: |-
+                                            Scheme to use for connecting to the host.
+                                            Defaults to HTTP.
+                                          type: string
+                                      required:
+                                      - port
+                                      type: object
+                                    initialDelaySeconds:
+                                      description: |-
+                                        Number of seconds after the container has started before liveness probes are initiated.
+                                        More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                                      format: int32
+                                      type: integer
+                                    periodSeconds:
+                                      description: |-
+                                        How often (in seconds) to perform the probe.
+                                        Default to 10 seconds. Minimum value is 1.
+                                      format: int32
+                                      type: integer
+                                    successThreshold:
+                                      description: |-
+                                        Minimum consecutive successes for the probe to be considered successful after having failed.
+                                        Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
+                                      format: int32
+                                      type: integer
+                                    tcpSocket:
+                                      description: TCPSocket specifies a connection
+                                        to a TCP port.
+                                      properties:
+                                        host:
+                                          description: 'Optional: Host name to connect
+                                            to, defaults to the pod IP.'
+                                          type: string
+                                        port:
+                                          anyOf:
+                                          - type: integer
+                                          - type: string
+                                          description: |-
+                                            Number or name of the port to access on the container.
+                                            Number must be in the range 1 to 65535.
+                                            Name must be an IANA_SVC_NAME.
+                                          x-kubernetes-int-or-string: true
+                                      required:
+                                      - port
+                                      type: object
+                                    terminationGracePeriodSeconds:
+                                      description: |-
+                                        Optional duration in seconds the pod needs to terminate gracefully upon probe failure.
+                                        The grace period is the duration in seconds after the processes running in the pod are sent
+                                        a termination signal and the time when the processes are forcibly halted with a kill signal.
+                                        Set this value longer than the expected cleanup time for your process.
+                                        If this value is nil, the pod's terminationGracePeriodSeconds will be used. Otherwise, this
+                                        value overrides the value provided by the pod spec.
+                                        Value must be non-negative integer. The value zero indicates stop immediately via
+                                        the kill signal (no opportunity to shut down).
+                                        This is a beta field and requires enabling ProbeTerminationGracePeriod feature gate.
+                                        Minimum value is 1. spec.terminationGracePeriodSeconds is used if unset.
+                                      format: int64
+                                      type: integer
+                                    timeoutSeconds:
+                                      description: |-
+                                        Number of seconds after which the probe times out.
+                                        Defaults to 1 second. Minimum value is 1.
+                                        More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                                      format: int32
+                                      type: integer
+                                  type: object
+                                stdin:
+                                  description: |-
+                                    Whether this container should allocate a buffer for stdin in the container runtime. If this
+                                    is not set, reads from stdin in the container will always result in EOF.
+                                    Default is false.
+                                  type: boolean
+                                stdinOnce:
+                                  description: |-
+                                    Whether the container runtime should close the stdin channel after it has been opened by
+                                    a single attach. When stdin is true the stdin stream will remain open across multiple attach
+                                    sessions. If stdinOnce is set to true, stdin is opened on container start, is empty until the
+                                    first client attaches to stdin, and then remains open and accepts data until the client disconnects,
+                                    at which time stdin is closed and remains closed until the container is restarted. If this
+                                    flag is false, a container processes that reads from stdin will never receive an EOF.
+                                    Default is false
+                                  type: boolean
+                                targetContainerName:
+                                  description: |-
+                                    If set, the name of the container from PodSpec that this ephemeral container targets.
+                                    The ephemeral container will be run in the namespaces (IPC, PID, etc) of this container.
+                                    If not set then the ephemeral container uses the namespaces configured in the Pod spec.
+
+                                    The container runtime must implement support for this feature. If the runtime does not
+                                    support namespace targeting then the result of setting this field is undefined.
+                                  type: string
+                                terminationMessagePath:
+                                  description: |-
+                                    Optional: Path at which the file to which the container's termination message
+                                    will be written is mounted into the container's filesystem.
+                                    Message written is intended to be brief final status, such as an assertion failure message.
+                                    Will be truncated by the node if greater than 4096 bytes. The total message length across
+                                    all containers will be limited to 12kb.
+                                    Defaults to /dev/termination-log.
+                                    Cannot be updated.
+                                  type: string
+                                terminationMessagePolicy:
+                                  description: |-
+                                    Indicate how the termination message should be populated. File will use the contents of
+                                    terminationMessagePath to populate the container status message on both success and failure.
+                                    FallbackToLogsOnError will use the last chunk of container log output if the termination
+                                    message file is empty and the container exited with an error.
+                                    The log output is limited to 2048 bytes or 80 lines, whichever is smaller.
+                                    Defaults to File.
+                                    Cannot be updated.
+                                  type: string
+                                tty:
+                                  description: |-
+                                    Whether this container should allocate a TTY for itself, also requires 'stdin' to be true.
+                                    Default is false.
+                                  type: boolean
+                                volumeDevices:
+                                  description: volumeDevices is the list of block
+                                    devices to be used by the container.
+                                  items:
+                                    description: volumeDevice describes a mapping
+                                      of a raw block device within a container.
+                                    properties:
+                                      devicePath:
+                                        description: devicePath is the path inside
+                                          of the container that the device will be
+                                          mapped to.
+                                        type: string
+                                      name:
+                                        description: name must match the name of a
+                                          persistentVolumeClaim in the pod
+                                        type: string
+                                    required:
+                                    - devicePath
+                                    - name
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-map-keys:
+                                  - devicePath
+                                  x-kubernetes-list-type: map
+                                volumeMounts:
+                                  description: |-
+                                    Pod volumes to mount into the container's filesystem. Subpath mounts are not allowed for ephemeral containers.
+                                    Cannot be updated.
+                                  items:
+                                    description: VolumeMount describes a mounting
+                                      of a Volume within a container.
+                                    properties:
+                                      mountPath:
+                                        description: |-
+                                          Path within the container at which the volume should be mounted.  Must
+                                          not contain ':'.
+                                        type: string
+                                      mountPropagation:
+                                        description: |-
+                                          mountPropagation determines how mounts are propagated from the host
+                                          to container and the other way around.
+                                          When not set, MountPropagationNone is used.
+                                          This field is beta in 1.10.
+                                          When RecursiveReadOnly is set to IfPossible or to Enabled, MountPropagation must be None or unspecified
+                                          (which defaults to None).
+                                        type: string
+                                      name:
+                                        description: This must match the Name of a
+                                          Volume.
+                                        type: string
+                                      readOnly:
+                                        description: |-
+                                          Mounted read-only if true, read-write otherwise (false or unspecified).
+                                          Defaults to false.
+                                        type: boolean
+                                      recursiveReadOnly:
+                                        description: |-
+                                          RecursiveReadOnly specifies whether read-only mounts should be handled
+                                          recursively.
+
+                                          If ReadOnly is false, this field has no meaning and must be unspecified.
+
+                                          If ReadOnly is true, and this field is set to Disabled, the mount is not made
+                                          recursively read-only.  If this field is set to IfPossible, the mount is made
+                                          recursively read-only, if it is supported by the container runtime.  If this
+                                          field is set to Enabled, the mount is made recursively read-only if it is
+                                          supported by the container runtime, otherwise the pod will not be started and
+                                          an error will be generated to indicate the reason.
+
+                                          If this field is set to IfPossible or Enabled, MountPropagation must be set to
+                                          None (or be unspecified, which defaults to None).
+
+                                          If this field is not specified, it is treated as an equivalent of Disabled.
+                                        type: string
+                                      subPath:
+                                        description: |-
+                                          Path within the volume from which the container's volume should be mounted.
+                                          Defaults to "" (volume's root).
+                                        type: string
+                                      subPathExpr:
+                                        description: |-
+                                          Expanded path within the volume from which the container's volume should be mounted.
+                                          Behaves similarly to SubPath but environment variable references $(VAR_NAME) are expanded using the container's environment.
+                                          Defaults to "" (volume's root).
+                                          SubPathExpr and SubPath are mutually exclusive.
+                                        type: string
+                                    required:
+                                    - mountPath
+                                    - name
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-map-keys:
+                                  - mountPath
+                                  x-kubernetes-list-type: map
+                                workingDir:
+                                  description: |-
+                                    Container's working directory.
+                                    If not specified, the container runtime's default will be used, which
+                                    might be configured in the container image.
+                                    Cannot be updated.
+                                  type: string
+                              required:
+                              - name
+                              type: object
+                            type: array
+                            x-kubernetes-list-map-keys:
+                            - name
+                            x-kubernetes-list-type: map
+                          hostAliases:
+                            description: |-
+                              HostAliases is an optional list of hosts and IPs that will be injected into the pod's hosts
+                              file if specified.
+                            items:
+                              description: |-
+                                HostAlias holds the mapping between IP and hostnames that will be injected as an entry in the
+                                pod's hosts file.
+                              properties:
+                                hostnames:
+                                  description: Hostnames for the above IP address.
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                ip:
+                                  description: IP address of the host file entry.
+                                  type: string
+                              required:
+                              - ip
+                              type: object
+                            type: array
+                            x-kubernetes-list-map-keys:
+                            - ip
+                            x-kubernetes-list-type: map
+                          hostIPC:
+                            description: |-
+                              Use the host's ipc namespace.
+                              Optional: Default to false.
+                            type: boolean
+                          hostNetwork:
+                            description: |-
+                              Host networking requested for this pod. Use the host's network namespace.
+                              When using HostNetwork you should specify ports so the scheduler is aware.
+                              When `hostNetwork` is true, specified `hostPort` fields in port definitions must match `containerPort`,
+                              and unspecified `hostPort` fields in port definitions are defaulted to match `containerPort`.
+                              Default to false.
+                            type: boolean
+                          hostPID:
+                            description: |-
+                              Use the host's pid namespace.
+                              Optional: Default to false.
+                            type: boolean
+                          hostUsers:
+                            description: |-
+                              Use the host's user namespace.
+                              Optional: Default to true.
+                              If set to true or not present, the pod will be run in the host user namespace, useful
+                              for when the pod needs a feature only available to the host user namespace, such as
+                              loading a kernel module with CAP_SYS_MODULE.
+                              When set to false, a new userns is created for the pod. Setting false is useful for
+                              mitigating container breakout vulnerabilities even allowing users to run their
+                              containers as root without actually having root privileges on the host.
+                              This field is alpha-level and is only honored by servers that enable the UserNamespacesSupport feature.
+                            type: boolean
+                          hostname:
+                            description: |-
+                              Specifies the hostname of the Pod
+                              If not specified, the pod's hostname will be set to a system-defined value.
+                            type: string
+                          hostnameOverride:
+                            description: |-
+                              HostnameOverride specifies an explicit override for the pod's hostname as perceived by the pod.
+                              This field only specifies the pod's hostname and does not affect its DNS records.
+                              When this field is set to a non-empty string:
+                              - It takes precedence over the values set in `hostname` and `subdomain`.
+                              - The Pod's hostname will be set to this value.
+                              - `setHostnameAsFQDN` must be nil or set to false.
+                              - `hostNetwork` must be set to false.
+
+                              This field must be a valid DNS subdomain as defined in RFC 1123 and contain at most 64 characters.
+                              Requires the HostnameOverride feature gate to be enabled.
+                            type: string
+                          imagePullSecrets:
+                            description: |-
+                              ImagePullSecrets is an optional list of references to secrets in the same namespace to use for pulling any of the images used by this PodSpec.
+                              If specified, these secrets will be passed to individual puller implementations for them to use.
+                              More info: https://kubernetes.io/docs/concepts/containers/images#specifying-imagepullsecrets-on-a-pod
+                            items:
+                              description: |-
+                                LocalObjectReference contains enough information to let you locate the
+                                referenced object inside the same namespace.
+                              properties:
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            type: array
+                            x-kubernetes-list-map-keys:
+                            - name
+                            x-kubernetes-list-type: map
+                          initContainers:
+                            description: |-
+                              List of initialization containers belonging to the pod.
+                              Init containers are executed in order prior to containers being started. If any
+                              init container fails, the pod is considered to have failed and is handled according
+                              to its restartPolicy. The name for an init container or normal container must be
+                              unique among all containers.
+                              Init containers may not have Lifecycle actions, Readiness probes, Liveness probes, or Startup probes.
+                              The resourceRequirements of an init container are taken into account during scheduling
+                              by finding the highest request/limit for each resource type, and then using the max of
+                              that value or the sum of the normal containers. Limits are applied to init containers
+                              in a similar fashion.
+                              Init containers cannot currently be added or removed.
+                              Cannot be updated.
+                              More info: https://kubernetes.io/docs/concepts/workloads/pods/init-containers/
+                            items:
+                              description: A single application container that you
+                                want to run within a pod.
+                              properties:
+                                args:
+                                  description: |-
+                                    Arguments to the entrypoint.
+                                    The container image's CMD is used if this is not provided.
+                                    Variable references $(VAR_NAME) are expanded using the container's environment. If a variable
+                                    cannot be resolved, the reference in the input string will be unchanged. Double $$ are reduced
+                                    to a single $, which allows for escaping the $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)" will
+                                    produce the string literal "$(VAR_NAME)". Escaped references will never be expanded, regardless
+                                    of whether the variable exists or not. Cannot be updated.
+                                    More info: https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                command:
+                                  description: |-
+                                    Entrypoint array. Not executed within a shell.
+                                    The container image's ENTRYPOINT is used if this is not provided.
+                                    Variable references $(VAR_NAME) are expanded using the container's environment. If a variable
+                                    cannot be resolved, the reference in the input string will be unchanged. Double $$ are reduced
+                                    to a single $, which allows for escaping the $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)" will
+                                    produce the string literal "$(VAR_NAME)". Escaped references will never be expanded, regardless
+                                    of whether the variable exists or not. Cannot be updated.
+                                    More info: https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                env:
+                                  description: |-
+                                    List of environment variables to set in the container.
+                                    Cannot be updated.
+                                  items:
+                                    description: EnvVar represents an environment
+                                      variable present in a Container.
+                                    properties:
+                                      name:
+                                        description: |-
+                                          Name of the environment variable.
+                                          May consist of any printable ASCII characters except '='.
+                                        type: string
+                                      value:
+                                        description: |-
+                                          Variable references $(VAR_NAME) are expanded
+                                          using the previously defined environment variables in the container and
+                                          any service environment variables. If a variable cannot be resolved,
+                                          the reference in the input string will be unchanged. Double $$ are reduced
+                                          to a single $, which allows for escaping the $(VAR_NAME) syntax: i.e.
+                                          "$$(VAR_NAME)" will produce the string literal "$(VAR_NAME)".
+                                          Escaped references will never be expanded, regardless of whether the variable
+                                          exists or not.
+                                          Defaults to "".
+                                        type: string
+                                      valueFrom:
+                                        description: Source for the environment variable's
+                                          value. Cannot be used if value is not empty.
+                                        properties:
+                                          configMapKeyRef:
+                                            description: Selects a key of a ConfigMap.
+                                            properties:
+                                              key:
+                                                description: The key to select.
+                                                type: string
+                                              name:
+                                                default: ""
+                                                description: |-
+                                                  Name of the referent.
+                                                  This field is effectively required, but due to backwards compatibility is
+                                                  allowed to be empty. Instances of this type with an empty value here are
+                                                  almost certainly wrong.
+                                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                                type: string
+                                              optional:
+                                                description: Specify whether the ConfigMap
+                                                  or its key must be defined
+                                                type: boolean
+                                            required:
+                                            - key
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                          fieldRef:
+                                            description: |-
+                                              Selects a field of the pod: supports metadata.name, metadata.namespace, `metadata.labels['<KEY>']`, `metadata.annotations['<KEY>']`,
+                                              spec.nodeName, spec.serviceAccountName, status.hostIP, status.podIP, status.podIPs.
+                                            properties:
+                                              apiVersion:
+                                                description: Version of the schema
+                                                  the FieldPath is written in terms
+                                                  of, defaults to "v1".
+                                                type: string
+                                              fieldPath:
+                                                description: Path of the field to
+                                                  select in the specified API version.
+                                                type: string
+                                            required:
+                                            - fieldPath
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                          fileKeyRef:
+                                            description: |-
+                                              FileKeyRef selects a key of the env file.
+                                              Requires the EnvFiles feature gate to be enabled.
+                                            properties:
+                                              key:
+                                                description: |-
+                                                  The key within the env file. An invalid key will prevent the pod from starting.
+                                                  The keys defined within a source may consist of any printable ASCII characters except '='.
+                                                  During Alpha stage of the EnvFiles feature gate, the key size is limited to 128 characters.
+                                                type: string
+                                              optional:
+                                                default: false
+                                                description: |-
+                                                  Specify whether the file or its key must be defined. If the file or key
+                                                  does not exist, then the env var is not published.
+                                                  If optional is set to true and the specified key does not exist,
+                                                  the environment variable will not be set in the Pod's containers.
+
+                                                  If optional is set to false and the specified key does not exist,
+                                                  an error will be returned during Pod creation.
+                                                type: boolean
+                                              path:
+                                                description: |-
+                                                  The path within the volume from which to select the file.
+                                                  Must be relative and may not contain the '..' path or start with '..'.
+                                                type: string
+                                              volumeName:
+                                                description: The name of the volume
+                                                  mount containing the env file.
+                                                type: string
+                                            required:
+                                            - key
+                                            - path
+                                            - volumeName
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                          resourceFieldRef:
+                                            description: |-
+                                              Selects a resource of the container: only resources limits and requests
+                                              (limits.cpu, limits.memory, limits.ephemeral-storage, requests.cpu, requests.memory and requests.ephemeral-storage) are currently supported.
+                                            properties:
+                                              containerName:
+                                                description: 'Container name: required
+                                                  for volumes, optional for env vars'
+                                                type: string
+                                              divisor:
+                                                anyOf:
+                                                - type: integer
+                                                - type: string
+                                                description: Specifies the output
+                                                  format of the exposed resources,
+                                                  defaults to "1"
+                                                pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                                x-kubernetes-int-or-string: true
+                                              resource:
+                                                description: 'Required: resource to
+                                                  select'
+                                                type: string
+                                            required:
+                                            - resource
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                          secretKeyRef:
+                                            description: Selects a key of a secret
+                                              in the pod's namespace
+                                            properties:
+                                              key:
+                                                description: The key of the secret
+                                                  to select from.  Must be a valid
+                                                  secret key.
+                                                type: string
+                                              name:
+                                                default: ""
+                                                description: |-
+                                                  Name of the referent.
+                                                  This field is effectively required, but due to backwards compatibility is
+                                                  allowed to be empty. Instances of this type with an empty value here are
+                                                  almost certainly wrong.
+                                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                                type: string
+                                              optional:
+                                                description: Specify whether the Secret
+                                                  or its key must be defined
+                                                type: boolean
+                                            required:
+                                            - key
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                        type: object
+                                    required:
+                                    - name
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-map-keys:
+                                  - name
+                                  x-kubernetes-list-type: map
+                                envFrom:
+                                  description: |-
+                                    List of sources to populate environment variables in the container.
+                                    The keys defined within a source may consist of any printable ASCII characters except '='.
+                                    When a key exists in multiple
+                                    sources, the value associated with the last source will take precedence.
+                                    Values defined by an Env with a duplicate key will take precedence.
+                                    Cannot be updated.
+                                  items:
+                                    description: EnvFromSource represents the source
+                                      of a set of ConfigMaps or Secrets
+                                    properties:
+                                      configMapRef:
+                                        description: The ConfigMap to select from
+                                        properties:
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the ConfigMap
+                                              must be defined
+                                            type: boolean
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      prefix:
+                                        description: |-
+                                          Optional text to prepend to the name of each environment variable.
+                                          May consist of any printable ASCII characters except '='.
+                                        type: string
+                                      secretRef:
+                                        description: The Secret to select from
+                                        properties:
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the Secret
+                                              must be defined
+                                            type: boolean
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                image:
+                                  description: |-
+                                    Container image name.
+                                    More info: https://kubernetes.io/docs/concepts/containers/images
+                                    This field is optional to allow higher level config management to default or override
+                                    container images in workload controllers like Deployments and StatefulSets.
+                                  type: string
+                                imagePullPolicy:
+                                  description: |-
+                                    Image pull policy.
+                                    One of Always, Never, IfNotPresent.
+                                    Defaults to Always if :latest tag is specified, or IfNotPresent otherwise.
+                                    Cannot be updated.
+                                    More info: https://kubernetes.io/docs/concepts/containers/images#updating-images
+                                  type: string
+                                lifecycle:
+                                  description: |-
+                                    Actions that the management system should take in response to container lifecycle events.
+                                    Cannot be updated.
+                                  properties:
+                                    postStart:
+                                      description: |-
+                                        PostStart is called immediately after a container is created. If the handler fails,
+                                        the container is terminated and restarted according to its restart policy.
+                                        Other management of the container blocks until the hook completes.
+                                        More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
+                                      properties:
+                                        exec:
+                                          description: Exec specifies a command to
+                                            execute in the container.
+                                          properties:
+                                            command:
+                                              description: |-
+                                                Command is the command line to execute inside the container, the working directory for the
+                                                command  is root ('/') in the container's filesystem. The command is simply exec'd, it is
+                                                not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use
+                                                a shell, you need to explicitly call out to that shell.
+                                                Exit status of 0 is treated as live/healthy and non-zero is unhealthy.
+                                              items:
+                                                type: string
+                                              type: array
+                                              x-kubernetes-list-type: atomic
+                                          type: object
+                                        httpGet:
+                                          description: HTTPGet specifies an HTTP GET
+                                            request to perform.
+                                          properties:
+                                            host:
+                                              description: |-
+                                                Host name to connect to, defaults to the pod IP. You probably want to set
+                                                "Host" in httpHeaders instead.
+                                              type: string
+                                            httpHeaders:
+                                              description: Custom headers to set in
+                                                the request. HTTP allows repeated
+                                                headers.
+                                              items:
+                                                description: HTTPHeader describes
+                                                  a custom header to be used in HTTP
+                                                  probes
+                                                properties:
+                                                  name:
+                                                    description: |-
+                                                      The header field name.
+                                                      This will be canonicalized upon output, so case-variant names will be understood as the same header.
+                                                    type: string
+                                                  value:
+                                                    description: The header field
+                                                      value
+                                                    type: string
+                                                required:
+                                                - name
+                                                - value
+                                                type: object
+                                              type: array
+                                              x-kubernetes-list-type: atomic
+                                            path:
+                                              description: Path to access on the HTTP
+                                                server.
+                                              type: string
+                                            port:
+                                              anyOf:
+                                              - type: integer
+                                              - type: string
+                                              description: |-
+                                                Name or number of the port to access on the container.
+                                                Number must be in the range 1 to 65535.
+                                                Name must be an IANA_SVC_NAME.
+                                              x-kubernetes-int-or-string: true
+                                            scheme:
+                                              description: |-
+                                                Scheme to use for connecting to the host.
+                                                Defaults to HTTP.
+                                              type: string
+                                          required:
+                                          - port
+                                          type: object
+                                        sleep:
+                                          description: Sleep represents a duration
+                                            that the container should sleep.
+                                          properties:
+                                            seconds:
+                                              description: Seconds is the number of
+                                                seconds to sleep.
+                                              format: int64
+                                              type: integer
+                                          required:
+                                          - seconds
+                                          type: object
+                                        tcpSocket:
+                                          description: |-
+                                            Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
+                                            for backward compatibility. There is no validation of this field and
+                                            lifecycle hooks will fail at runtime when it is specified.
+                                          properties:
+                                            host:
+                                              description: 'Optional: Host name to
+                                                connect to, defaults to the pod IP.'
+                                              type: string
+                                            port:
+                                              anyOf:
+                                              - type: integer
+                                              - type: string
+                                              description: |-
+                                                Number or name of the port to access on the container.
+                                                Number must be in the range 1 to 65535.
+                                                Name must be an IANA_SVC_NAME.
+                                              x-kubernetes-int-or-string: true
+                                          required:
+                                          - port
+                                          type: object
+                                      type: object
+                                    preStop:
+                                      description: |-
+                                        PreStop is called immediately before a container is terminated due to an
+                                        API request or management event such as liveness/startup probe failure,
+                                        preemption, resource contention, etc. The handler is not called if the
+                                        container crashes or exits. The Pod's termination grace period countdown begins before the
+                                        PreStop hook is executed. Regardless of the outcome of the handler, the
+                                        container will eventually terminate within the Pod's termination grace
+                                        period (unless delayed by finalizers). Other management of the container blocks until the hook completes
+                                        or until the termination grace period is reached.
+                                        More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
+                                      properties:
+                                        exec:
+                                          description: Exec specifies a command to
+                                            execute in the container.
+                                          properties:
+                                            command:
+                                              description: |-
+                                                Command is the command line to execute inside the container, the working directory for the
+                                                command  is root ('/') in the container's filesystem. The command is simply exec'd, it is
+                                                not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use
+                                                a shell, you need to explicitly call out to that shell.
+                                                Exit status of 0 is treated as live/healthy and non-zero is unhealthy.
+                                              items:
+                                                type: string
+                                              type: array
+                                              x-kubernetes-list-type: atomic
+                                          type: object
+                                        httpGet:
+                                          description: HTTPGet specifies an HTTP GET
+                                            request to perform.
+                                          properties:
+                                            host:
+                                              description: |-
+                                                Host name to connect to, defaults to the pod IP. You probably want to set
+                                                "Host" in httpHeaders instead.
+                                              type: string
+                                            httpHeaders:
+                                              description: Custom headers to set in
+                                                the request. HTTP allows repeated
+                                                headers.
+                                              items:
+                                                description: HTTPHeader describes
+                                                  a custom header to be used in HTTP
+                                                  probes
+                                                properties:
+                                                  name:
+                                                    description: |-
+                                                      The header field name.
+                                                      This will be canonicalized upon output, so case-variant names will be understood as the same header.
+                                                    type: string
+                                                  value:
+                                                    description: The header field
+                                                      value
+                                                    type: string
+                                                required:
+                                                - name
+                                                - value
+                                                type: object
+                                              type: array
+                                              x-kubernetes-list-type: atomic
+                                            path:
+                                              description: Path to access on the HTTP
+                                                server.
+                                              type: string
+                                            port:
+                                              anyOf:
+                                              - type: integer
+                                              - type: string
+                                              description: |-
+                                                Name or number of the port to access on the container.
+                                                Number must be in the range 1 to 65535.
+                                                Name must be an IANA_SVC_NAME.
+                                              x-kubernetes-int-or-string: true
+                                            scheme:
+                                              description: |-
+                                                Scheme to use for connecting to the host.
+                                                Defaults to HTTP.
+                                              type: string
+                                          required:
+                                          - port
+                                          type: object
+                                        sleep:
+                                          description: Sleep represents a duration
+                                            that the container should sleep.
+                                          properties:
+                                            seconds:
+                                              description: Seconds is the number of
+                                                seconds to sleep.
+                                              format: int64
+                                              type: integer
+                                          required:
+                                          - seconds
+                                          type: object
+                                        tcpSocket:
+                                          description: |-
+                                            Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
+                                            for backward compatibility. There is no validation of this field and
+                                            lifecycle hooks will fail at runtime when it is specified.
+                                          properties:
+                                            host:
+                                              description: 'Optional: Host name to
+                                                connect to, defaults to the pod IP.'
+                                              type: string
+                                            port:
+                                              anyOf:
+                                              - type: integer
+                                              - type: string
+                                              description: |-
+                                                Number or name of the port to access on the container.
+                                                Number must be in the range 1 to 65535.
+                                                Name must be an IANA_SVC_NAME.
+                                              x-kubernetes-int-or-string: true
+                                          required:
+                                          - port
+                                          type: object
+                                      type: object
+                                    stopSignal:
+                                      description: |-
+                                        StopSignal defines which signal will be sent to a container when it is being stopped.
+                                        If not specified, the default is defined by the container runtime in use.
+                                        StopSignal can only be set for Pods with a non-empty .spec.os.name
+                                      type: string
+                                  type: object
+                                livenessProbe:
+                                  description: |-
+                                    Periodic probe of container liveness.
+                                    Container will be restarted if the probe fails.
+                                    Cannot be updated.
+                                    More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                                  properties:
+                                    exec:
+                                      description: Exec specifies a command to execute
+                                        in the container.
+                                      properties:
+                                        command:
+                                          description: |-
+                                            Command is the command line to execute inside the container, the working directory for the
+                                            command  is root ('/') in the container's filesystem. The command is simply exec'd, it is
+                                            not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use
+                                            a shell, you need to explicitly call out to that shell.
+                                            Exit status of 0 is treated as live/healthy and non-zero is unhealthy.
+                                          items:
+                                            type: string
+                                          type: array
+                                          x-kubernetes-list-type: atomic
+                                      type: object
+                                    failureThreshold:
+                                      description: |-
+                                        Minimum consecutive failures for the probe to be considered failed after having succeeded.
+                                        Defaults to 3. Minimum value is 1.
+                                      format: int32
+                                      type: integer
+                                    grpc:
+                                      description: GRPC specifies a GRPC HealthCheckRequest.
+                                      properties:
+                                        port:
+                                          description: Port number of the gRPC service.
+                                            Number must be in the range 1 to 65535.
+                                          format: int32
+                                          type: integer
+                                        service:
+                                          default: ""
+                                          description: |-
+                                            Service is the name of the service to place in the gRPC HealthCheckRequest
+                                            (see https://github.com/grpc/grpc/blob/master/doc/health-checking.md).
+
+                                            If this is not specified, the default behavior is defined by gRPC.
+                                          type: string
+                                      required:
+                                      - port
+                                      type: object
+                                    httpGet:
+                                      description: HTTPGet specifies an HTTP GET request
+                                        to perform.
+                                      properties:
+                                        host:
+                                          description: |-
+                                            Host name to connect to, defaults to the pod IP. You probably want to set
+                                            "Host" in httpHeaders instead.
+                                          type: string
+                                        httpHeaders:
+                                          description: Custom headers to set in the
+                                            request. HTTP allows repeated headers.
+                                          items:
+                                            description: HTTPHeader describes a custom
+                                              header to be used in HTTP probes
+                                            properties:
+                                              name:
+                                                description: |-
+                                                  The header field name.
+                                                  This will be canonicalized upon output, so case-variant names will be understood as the same header.
+                                                type: string
+                                              value:
+                                                description: The header field value
+                                                type: string
+                                            required:
+                                            - name
+                                            - value
+                                            type: object
+                                          type: array
+                                          x-kubernetes-list-type: atomic
+                                        path:
+                                          description: Path to access on the HTTP
+                                            server.
+                                          type: string
+                                        port:
+                                          anyOf:
+                                          - type: integer
+                                          - type: string
+                                          description: |-
+                                            Name or number of the port to access on the container.
+                                            Number must be in the range 1 to 65535.
+                                            Name must be an IANA_SVC_NAME.
+                                          x-kubernetes-int-or-string: true
+                                        scheme:
+                                          description: |-
+                                            Scheme to use for connecting to the host.
+                                            Defaults to HTTP.
+                                          type: string
+                                      required:
+                                      - port
+                                      type: object
+                                    initialDelaySeconds:
+                                      description: |-
+                                        Number of seconds after the container has started before liveness probes are initiated.
+                                        More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                                      format: int32
+                                      type: integer
+                                    periodSeconds:
+                                      description: |-
+                                        How often (in seconds) to perform the probe.
+                                        Default to 10 seconds. Minimum value is 1.
+                                      format: int32
+                                      type: integer
+                                    successThreshold:
+                                      description: |-
+                                        Minimum consecutive successes for the probe to be considered successful after having failed.
+                                        Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
+                                      format: int32
+                                      type: integer
+                                    tcpSocket:
+                                      description: TCPSocket specifies a connection
+                                        to a TCP port.
+                                      properties:
+                                        host:
+                                          description: 'Optional: Host name to connect
+                                            to, defaults to the pod IP.'
+                                          type: string
+                                        port:
+                                          anyOf:
+                                          - type: integer
+                                          - type: string
+                                          description: |-
+                                            Number or name of the port to access on the container.
+                                            Number must be in the range 1 to 65535.
+                                            Name must be an IANA_SVC_NAME.
+                                          x-kubernetes-int-or-string: true
+                                      required:
+                                      - port
+                                      type: object
+                                    terminationGracePeriodSeconds:
+                                      description: |-
+                                        Optional duration in seconds the pod needs to terminate gracefully upon probe failure.
+                                        The grace period is the duration in seconds after the processes running in the pod are sent
+                                        a termination signal and the time when the processes are forcibly halted with a kill signal.
+                                        Set this value longer than the expected cleanup time for your process.
+                                        If this value is nil, the pod's terminationGracePeriodSeconds will be used. Otherwise, this
+                                        value overrides the value provided by the pod spec.
+                                        Value must be non-negative integer. The value zero indicates stop immediately via
+                                        the kill signal (no opportunity to shut down).
+                                        This is a beta field and requires enabling ProbeTerminationGracePeriod feature gate.
+                                        Minimum value is 1. spec.terminationGracePeriodSeconds is used if unset.
+                                      format: int64
+                                      type: integer
+                                    timeoutSeconds:
+                                      description: |-
+                                        Number of seconds after which the probe times out.
+                                        Defaults to 1 second. Minimum value is 1.
+                                        More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                                      format: int32
+                                      type: integer
+                                  type: object
+                                name:
+                                  description: |-
+                                    Name of the container specified as a DNS_LABEL.
+                                    Each container in a pod must have a unique name (DNS_LABEL).
+                                    Cannot be updated.
+                                  type: string
+                                ports:
+                                  description: |-
+                                    List of ports to expose from the container. Not specifying a port here
+                                    DOES NOT prevent that port from being exposed. Any port which is
+                                    listening on the default "0.0.0.0" address inside a container will be
+                                    accessible from the network.
+                                    Modifying this array with strategic merge patch may corrupt the data.
+                                    For more information See https://github.com/kubernetes/kubernetes/issues/108255.
+                                    Cannot be updated.
+                                  items:
+                                    description: ContainerPort represents a network
+                                      port in a single container.
+                                    properties:
+                                      containerPort:
+                                        description: |-
+                                          Number of port to expose on the pod's IP address.
+                                          This must be a valid port number, 0 < x < 65536.
+                                        format: int32
+                                        type: integer
+                                      hostIP:
+                                        description: What host IP to bind the external
+                                          port to.
+                                        type: string
+                                      hostPort:
+                                        description: |-
+                                          Number of port to expose on the host.
+                                          If specified, this must be a valid port number, 0 < x < 65536.
+                                          If HostNetwork is specified, this must match ContainerPort.
+                                          Most containers do not need this.
+                                        format: int32
+                                        type: integer
+                                      name:
+                                        description: |-
+                                          If specified, this must be an IANA_SVC_NAME and unique within the pod. Each
+                                          named port in a pod must have a unique name. Name for the port that can be
+                                          referred to by services.
+                                        type: string
+                                      protocol:
+                                        default: TCP
+                                        description: |-
+                                          Protocol for port. Must be UDP, TCP, or SCTP.
+                                          Defaults to "TCP".
+                                        type: string
+                                    required:
+                                    - containerPort
+                                    - protocol
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-map-keys:
+                                  - containerPort
+                                  - protocol
+                                  x-kubernetes-list-type: map
+                                readinessProbe:
+                                  description: |-
+                                    Periodic probe of container service readiness.
+                                    Container will be removed from service endpoints if the probe fails.
+                                    Cannot be updated.
+                                    More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                                  properties:
+                                    exec:
+                                      description: Exec specifies a command to execute
+                                        in the container.
+                                      properties:
+                                        command:
+                                          description: |-
+                                            Command is the command line to execute inside the container, the working directory for the
+                                            command  is root ('/') in the container's filesystem. The command is simply exec'd, it is
+                                            not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use
+                                            a shell, you need to explicitly call out to that shell.
+                                            Exit status of 0 is treated as live/healthy and non-zero is unhealthy.
+                                          items:
+                                            type: string
+                                          type: array
+                                          x-kubernetes-list-type: atomic
+                                      type: object
+                                    failureThreshold:
+                                      description: |-
+                                        Minimum consecutive failures for the probe to be considered failed after having succeeded.
+                                        Defaults to 3. Minimum value is 1.
+                                      format: int32
+                                      type: integer
+                                    grpc:
+                                      description: GRPC specifies a GRPC HealthCheckRequest.
+                                      properties:
+                                        port:
+                                          description: Port number of the gRPC service.
+                                            Number must be in the range 1 to 65535.
+                                          format: int32
+                                          type: integer
+                                        service:
+                                          default: ""
+                                          description: |-
+                                            Service is the name of the service to place in the gRPC HealthCheckRequest
+                                            (see https://github.com/grpc/grpc/blob/master/doc/health-checking.md).
+
+                                            If this is not specified, the default behavior is defined by gRPC.
+                                          type: string
+                                      required:
+                                      - port
+                                      type: object
+                                    httpGet:
+                                      description: HTTPGet specifies an HTTP GET request
+                                        to perform.
+                                      properties:
+                                        host:
+                                          description: |-
+                                            Host name to connect to, defaults to the pod IP. You probably want to set
+                                            "Host" in httpHeaders instead.
+                                          type: string
+                                        httpHeaders:
+                                          description: Custom headers to set in the
+                                            request. HTTP allows repeated headers.
+                                          items:
+                                            description: HTTPHeader describes a custom
+                                              header to be used in HTTP probes
+                                            properties:
+                                              name:
+                                                description: |-
+                                                  The header field name.
+                                                  This will be canonicalized upon output, so case-variant names will be understood as the same header.
+                                                type: string
+                                              value:
+                                                description: The header field value
+                                                type: string
+                                            required:
+                                            - name
+                                            - value
+                                            type: object
+                                          type: array
+                                          x-kubernetes-list-type: atomic
+                                        path:
+                                          description: Path to access on the HTTP
+                                            server.
+                                          type: string
+                                        port:
+                                          anyOf:
+                                          - type: integer
+                                          - type: string
+                                          description: |-
+                                            Name or number of the port to access on the container.
+                                            Number must be in the range 1 to 65535.
+                                            Name must be an IANA_SVC_NAME.
+                                          x-kubernetes-int-or-string: true
+                                        scheme:
+                                          description: |-
+                                            Scheme to use for connecting to the host.
+                                            Defaults to HTTP.
+                                          type: string
+                                      required:
+                                      - port
+                                      type: object
+                                    initialDelaySeconds:
+                                      description: |-
+                                        Number of seconds after the container has started before liveness probes are initiated.
+                                        More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                                      format: int32
+                                      type: integer
+                                    periodSeconds:
+                                      description: |-
+                                        How often (in seconds) to perform the probe.
+                                        Default to 10 seconds. Minimum value is 1.
+                                      format: int32
+                                      type: integer
+                                    successThreshold:
+                                      description: |-
+                                        Minimum consecutive successes for the probe to be considered successful after having failed.
+                                        Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
+                                      format: int32
+                                      type: integer
+                                    tcpSocket:
+                                      description: TCPSocket specifies a connection
+                                        to a TCP port.
+                                      properties:
+                                        host:
+                                          description: 'Optional: Host name to connect
+                                            to, defaults to the pod IP.'
+                                          type: string
+                                        port:
+                                          anyOf:
+                                          - type: integer
+                                          - type: string
+                                          description: |-
+                                            Number or name of the port to access on the container.
+                                            Number must be in the range 1 to 65535.
+                                            Name must be an IANA_SVC_NAME.
+                                          x-kubernetes-int-or-string: true
+                                      required:
+                                      - port
+                                      type: object
+                                    terminationGracePeriodSeconds:
+                                      description: |-
+                                        Optional duration in seconds the pod needs to terminate gracefully upon probe failure.
+                                        The grace period is the duration in seconds after the processes running in the pod are sent
+                                        a termination signal and the time when the processes are forcibly halted with a kill signal.
+                                        Set this value longer than the expected cleanup time for your process.
+                                        If this value is nil, the pod's terminationGracePeriodSeconds will be used. Otherwise, this
+                                        value overrides the value provided by the pod spec.
+                                        Value must be non-negative integer. The value zero indicates stop immediately via
+                                        the kill signal (no opportunity to shut down).
+                                        This is a beta field and requires enabling ProbeTerminationGracePeriod feature gate.
+                                        Minimum value is 1. spec.terminationGracePeriodSeconds is used if unset.
+                                      format: int64
+                                      type: integer
+                                    timeoutSeconds:
+                                      description: |-
+                                        Number of seconds after which the probe times out.
+                                        Defaults to 1 second. Minimum value is 1.
+                                        More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                                      format: int32
+                                      type: integer
+                                  type: object
+                                resizePolicy:
+                                  description: |-
+                                    Resources resize policy for the container.
+                                    This field cannot be set on ephemeral containers.
+                                  items:
+                                    description: ContainerResizePolicy represents
+                                      resource resize policy for the container.
+                                    properties:
+                                      resourceName:
+                                        description: |-
+                                          Name of the resource to which this resource resize policy applies.
+                                          Supported values: cpu, memory.
+                                        type: string
+                                      restartPolicy:
+                                        description: |-
+                                          Restart policy to apply when specified resource is resized.
+                                          If not specified, it defaults to NotRequired.
+                                        type: string
+                                    required:
+                                    - resourceName
+                                    - restartPolicy
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                resources:
+                                  description: |-
+                                    Compute Resources required by this container.
+                                    Cannot be updated.
+                                    More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+                                  properties:
+                                    claims:
+                                      description: |-
+                                        Claims lists the names of resources, defined in spec.resourceClaims,
+                                        that are used by this container.
+
+                                        This field depends on the
+                                        DynamicResourceAllocation feature gate.
+
+                                        This field is immutable. It can only be set for containers.
+                                      items:
+                                        description: ResourceClaim references one
+                                          entry in PodSpec.ResourceClaims.
+                                        properties:
+                                          name:
+                                            description: |-
+                                              Name must match the name of one entry in pod.spec.resourceClaims of
+                                              the Pod where this field is used. It makes that resource available
+                                              inside a container.
+                                            type: string
+                                          request:
+                                            description: |-
+                                              Request is the name chosen for a request in the referenced claim.
+                                              If empty, everything from the claim is made available, otherwise
+                                              only the result of this request.
+                                            type: string
+                                        required:
+                                        - name
+                                        type: object
+                                      type: array
+                                      x-kubernetes-list-map-keys:
+                                      - name
+                                      x-kubernetes-list-type: map
+                                    limits:
+                                      additionalProperties:
+                                        anyOf:
+                                        - type: integer
+                                        - type: string
+                                        pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                        x-kubernetes-int-or-string: true
+                                      description: |-
+                                        Limits describes the maximum amount of compute resources allowed.
+                                        More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+                                      type: object
+                                    requests:
+                                      additionalProperties:
+                                        anyOf:
+                                        - type: integer
+                                        - type: string
+                                        pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                        x-kubernetes-int-or-string: true
+                                      description: |-
+                                        Requests describes the minimum amount of compute resources required.
+                                        If Requests is omitted for a container, it defaults to Limits if that is explicitly specified,
+                                        otherwise to an implementation-defined value. Requests cannot exceed Limits.
+                                        More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+                                      type: object
+                                  type: object
+                                restartPolicy:
+                                  description: |-
+                                    RestartPolicy defines the restart behavior of individual containers in a pod.
+                                    This overrides the pod-level restart policy. When this field is not specified,
+                                    the restart behavior is defined by the Pod's restart policy and the container type.
+                                    Additionally, setting the RestartPolicy as "Always" for the init container will
+                                    have the following effect:
+                                    this init container will be continually restarted on
+                                    exit until all regular containers have terminated. Once all regular
+                                    containers have completed, all init containers with restartPolicy "Always"
+                                    will be shut down. This lifecycle differs from normal init containers and
+                                    is often referred to as a "sidecar" container. Although this init
+                                    container still starts in the init container sequence, it does not wait
+                                    for the container to complete before proceeding to the next init
+                                    container. Instead, the next init container starts immediately after this
+                                    init container is started, or after any startupProbe has successfully
+                                    completed.
+                                  type: string
+                                restartPolicyRules:
+                                  description: |-
+                                    Represents a list of rules to be checked to determine if the
+                                    container should be restarted on exit. The rules are evaluated in
+                                    order. Once a rule matches a container exit condition, the remaining
+                                    rules are ignored. If no rule matches the container exit condition,
+                                    the Container-level restart policy determines the whether the container
+                                    is restarted or not. Constraints on the rules:
+                                    - At most 20 rules are allowed.
+                                    - Rules can have the same action.
+                                    - Identical rules are not forbidden in validations.
+                                    When rules are specified, container MUST set RestartPolicy explicitly
+                                    even it if matches the Pod's RestartPolicy.
+                                  items:
+                                    description: ContainerRestartRule describes how
+                                      a container exit is handled.
+                                    properties:
+                                      action:
+                                        description: |-
+                                          Specifies the action taken on a container exit if the requirements
+                                          are satisfied. The only possible value is "Restart" to restart the
+                                          container.
+                                        type: string
+                                      exitCodes:
+                                        description: Represents the exit codes to
+                                          check on container exits.
+                                        properties:
+                                          operator:
+                                            description: |-
+                                              Represents the relationship between the container exit code(s) and the
+                                              specified values. Possible values are:
+                                              - In: the requirement is satisfied if the container exit code is in the
+                                                set of specified values.
+                                              - NotIn: the requirement is satisfied if the container exit code is
+                                                not in the set of specified values.
+                                            type: string
+                                          values:
+                                            description: |-
+                                              Specifies the set of values to check for container exit codes.
+                                              At most 255 elements are allowed.
+                                            items:
+                                              format: int32
+                                              type: integer
+                                            type: array
+                                            x-kubernetes-list-type: set
+                                        required:
+                                        - operator
+                                        type: object
+                                    required:
+                                    - action
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                securityContext:
+                                  description: |-
+                                    SecurityContext defines the security options the container should be run with.
+                                    If set, the fields of SecurityContext override the equivalent fields of PodSecurityContext.
+                                    More info: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/
+                                  properties:
+                                    allowPrivilegeEscalation:
+                                      description: |-
+                                        AllowPrivilegeEscalation controls whether a process can gain more
+                                        privileges than its parent process. This bool directly controls if
+                                        the no_new_privs flag will be set on the container process.
+                                        AllowPrivilegeEscalation is true always when the container is:
+                                        1) run as Privileged
+                                        2) has CAP_SYS_ADMIN
+                                        Note that this field cannot be set when spec.os.name is windows.
+                                      type: boolean
+                                    appArmorProfile:
+                                      description: |-
+                                        appArmorProfile is the AppArmor options to use by this container. If set, this profile
+                                        overrides the pod's appArmorProfile.
+                                        Note that this field cannot be set when spec.os.name is windows.
+                                      properties:
+                                        localhostProfile:
+                                          description: |-
+                                            localhostProfile indicates a profile loaded on the node that should be used.
+                                            The profile must be preconfigured on the node to work.
+                                            Must match the loaded name of the profile.
+                                            Must be set if and only if type is "Localhost".
+                                          type: string
+                                        type:
+                                          description: |-
+                                            type indicates which kind of AppArmor profile will be applied.
+                                            Valid options are:
+                                              Localhost - a profile pre-loaded on the node.
+                                              RuntimeDefault - the container runtime's default profile.
+                                              Unconfined - no AppArmor enforcement.
+                                          type: string
+                                      required:
+                                      - type
+                                      type: object
+                                    capabilities:
+                                      description: |-
+                                        The capabilities to add/drop when running containers.
+                                        Defaults to the default set of capabilities granted by the container runtime.
+                                        Note that this field cannot be set when spec.os.name is windows.
+                                      properties:
+                                        add:
+                                          description: Added capabilities
+                                          items:
+                                            description: Capability represent POSIX
+                                              capabilities type
+                                            type: string
+                                          type: array
+                                          x-kubernetes-list-type: atomic
+                                        drop:
+                                          description: Removed capabilities
+                                          items:
+                                            description: Capability represent POSIX
+                                              capabilities type
+                                            type: string
+                                          type: array
+                                          x-kubernetes-list-type: atomic
+                                      type: object
+                                    privileged:
+                                      description: |-
+                                        Run container in privileged mode.
+                                        Processes in privileged containers are essentially equivalent to root on the host.
+                                        Defaults to false.
+                                        Note that this field cannot be set when spec.os.name is windows.
+                                      type: boolean
+                                    procMount:
+                                      description: |-
+                                        procMount denotes the type of proc mount to use for the containers.
+                                        The default value is Default which uses the container runtime defaults for
+                                        readonly paths and masked paths.
+                                        This requires the ProcMountType feature flag to be enabled.
+                                        Note that this field cannot be set when spec.os.name is windows.
+                                      type: string
+                                    readOnlyRootFilesystem:
+                                      description: |-
+                                        Whether this container has a read-only root filesystem.
+                                        Default is false.
+                                        Note that this field cannot be set when spec.os.name is windows.
+                                      type: boolean
+                                    runAsGroup:
+                                      description: |-
+                                        The GID to run the entrypoint of the container process.
+                                        Uses runtime default if unset.
+                                        May also be set in PodSecurityContext.  If set in both SecurityContext and
+                                        PodSecurityContext, the value specified in SecurityContext takes precedence.
+                                        Note that this field cannot be set when spec.os.name is windows.
+                                      format: int64
+                                      type: integer
+                                    runAsNonRoot:
+                                      description: |-
+                                        Indicates that the container must run as a non-root user.
+                                        If true, the Kubelet will validate the image at runtime to ensure that it
+                                        does not run as UID 0 (root) and fail to start the container if it does.
+                                        If unset or false, no such validation will be performed.
+                                        May also be set in PodSecurityContext.  If set in both SecurityContext and
+                                        PodSecurityContext, the value specified in SecurityContext takes precedence.
+                                      type: boolean
+                                    runAsUser:
+                                      description: |-
+                                        The UID to run the entrypoint of the container process.
+                                        Defaults to user specified in image metadata if unspecified.
+                                        May also be set in PodSecurityContext.  If set in both SecurityContext and
+                                        PodSecurityContext, the value specified in SecurityContext takes precedence.
+                                        Note that this field cannot be set when spec.os.name is windows.
+                                      format: int64
+                                      type: integer
+                                    seLinuxOptions:
+                                      description: |-
+                                        The SELinux context to be applied to the container.
+                                        If unspecified, the container runtime will allocate a random SELinux context for each
+                                        container.  May also be set in PodSecurityContext.  If set in both SecurityContext and
+                                        PodSecurityContext, the value specified in SecurityContext takes precedence.
+                                        Note that this field cannot be set when spec.os.name is windows.
+                                      properties:
+                                        level:
+                                          description: Level is SELinux level label
+                                            that applies to the container.
+                                          type: string
+                                        role:
+                                          description: Role is a SELinux role label
+                                            that applies to the container.
+                                          type: string
+                                        type:
+                                          description: Type is a SELinux type label
+                                            that applies to the container.
+                                          type: string
+                                        user:
+                                          description: User is a SELinux user label
+                                            that applies to the container.
+                                          type: string
+                                      type: object
+                                    seccompProfile:
+                                      description: |-
+                                        The seccomp options to use by this container. If seccomp options are
+                                        provided at both the pod & container level, the container options
+                                        override the pod options.
+                                        Note that this field cannot be set when spec.os.name is windows.
+                                      properties:
+                                        localhostProfile:
+                                          description: |-
+                                            localhostProfile indicates a profile defined in a file on the node should be used.
+                                            The profile must be preconfigured on the node to work.
+                                            Must be a descending path, relative to the kubelet's configured seccomp profile location.
+                                            Must be set if type is "Localhost". Must NOT be set for any other type.
+                                          type: string
+                                        type:
+                                          description: |-
+                                            type indicates which kind of seccomp profile will be applied.
+                                            Valid options are:
+
+                                            Localhost - a profile defined in a file on the node should be used.
+                                            RuntimeDefault - the container runtime default profile should be used.
+                                            Unconfined - no profile should be applied.
+                                          type: string
+                                      required:
+                                      - type
+                                      type: object
+                                    windowsOptions:
+                                      description: |-
+                                        The Windows specific settings applied to all containers.
+                                        If unspecified, the options from the PodSecurityContext will be used.
+                                        If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence.
+                                        Note that this field cannot be set when spec.os.name is linux.
+                                      properties:
+                                        gmsaCredentialSpec:
+                                          description: |-
+                                            GMSACredentialSpec is where the GMSA admission webhook
+                                            (https://github.com/kubernetes-sigs/windows-gmsa) inlines the contents of the
+                                            GMSA credential spec named by the GMSACredentialSpecName field.
+                                          type: string
+                                        gmsaCredentialSpecName:
+                                          description: GMSACredentialSpecName is the
+                                            name of the GMSA credential spec to use.
+                                          type: string
+                                        hostProcess:
+                                          description: |-
+                                            HostProcess determines if a container should be run as a 'Host Process' container.
+                                            All of a Pod's containers must have the same effective HostProcess value
+                                            (it is not allowed to have a mix of HostProcess containers and non-HostProcess containers).
+                                            In addition, if HostProcess is true then HostNetwork must also be set to true.
+                                          type: boolean
+                                        runAsUserName:
+                                          description: |-
+                                            The UserName in Windows to run the entrypoint of the container process.
+                                            Defaults to the user specified in image metadata if unspecified.
+                                            May also be set in PodSecurityContext. If set in both SecurityContext and
+                                            PodSecurityContext, the value specified in SecurityContext takes precedence.
+                                          type: string
+                                      type: object
+                                  type: object
+                                startupProbe:
+                                  description: |-
+                                    StartupProbe indicates that the Pod has successfully initialized.
+                                    If specified, no other probes are executed until this completes successfully.
+                                    If this probe fails, the Pod will be restarted, just as if the livenessProbe failed.
+                                    This can be used to provide different probe parameters at the beginning of a Pod's lifecycle,
+                                    when it might take a long time to load data or warm a cache, than during steady-state operation.
+                                    This cannot be updated.
+                                    More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                                  properties:
+                                    exec:
+                                      description: Exec specifies a command to execute
+                                        in the container.
+                                      properties:
+                                        command:
+                                          description: |-
+                                            Command is the command line to execute inside the container, the working directory for the
+                                            command  is root ('/') in the container's filesystem. The command is simply exec'd, it is
+                                            not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use
+                                            a shell, you need to explicitly call out to that shell.
+                                            Exit status of 0 is treated as live/healthy and non-zero is unhealthy.
+                                          items:
+                                            type: string
+                                          type: array
+                                          x-kubernetes-list-type: atomic
+                                      type: object
+                                    failureThreshold:
+                                      description: |-
+                                        Minimum consecutive failures for the probe to be considered failed after having succeeded.
+                                        Defaults to 3. Minimum value is 1.
+                                      format: int32
+                                      type: integer
+                                    grpc:
+                                      description: GRPC specifies a GRPC HealthCheckRequest.
+                                      properties:
+                                        port:
+                                          description: Port number of the gRPC service.
+                                            Number must be in the range 1 to 65535.
+                                          format: int32
+                                          type: integer
+                                        service:
+                                          default: ""
+                                          description: |-
+                                            Service is the name of the service to place in the gRPC HealthCheckRequest
+                                            (see https://github.com/grpc/grpc/blob/master/doc/health-checking.md).
+
+                                            If this is not specified, the default behavior is defined by gRPC.
+                                          type: string
+                                      required:
+                                      - port
+                                      type: object
+                                    httpGet:
+                                      description: HTTPGet specifies an HTTP GET request
+                                        to perform.
+                                      properties:
+                                        host:
+                                          description: |-
+                                            Host name to connect to, defaults to the pod IP. You probably want to set
+                                            "Host" in httpHeaders instead.
+                                          type: string
+                                        httpHeaders:
+                                          description: Custom headers to set in the
+                                            request. HTTP allows repeated headers.
+                                          items:
+                                            description: HTTPHeader describes a custom
+                                              header to be used in HTTP probes
+                                            properties:
+                                              name:
+                                                description: |-
+                                                  The header field name.
+                                                  This will be canonicalized upon output, so case-variant names will be understood as the same header.
+                                                type: string
+                                              value:
+                                                description: The header field value
+                                                type: string
+                                            required:
+                                            - name
+                                            - value
+                                            type: object
+                                          type: array
+                                          x-kubernetes-list-type: atomic
+                                        path:
+                                          description: Path to access on the HTTP
+                                            server.
+                                          type: string
+                                        port:
+                                          anyOf:
+                                          - type: integer
+                                          - type: string
+                                          description: |-
+                                            Name or number of the port to access on the container.
+                                            Number must be in the range 1 to 65535.
+                                            Name must be an IANA_SVC_NAME.
+                                          x-kubernetes-int-or-string: true
+                                        scheme:
+                                          description: |-
+                                            Scheme to use for connecting to the host.
+                                            Defaults to HTTP.
+                                          type: string
+                                      required:
+                                      - port
+                                      type: object
+                                    initialDelaySeconds:
+                                      description: |-
+                                        Number of seconds after the container has started before liveness probes are initiated.
+                                        More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                                      format: int32
+                                      type: integer
+                                    periodSeconds:
+                                      description: |-
+                                        How often (in seconds) to perform the probe.
+                                        Default to 10 seconds. Minimum value is 1.
+                                      format: int32
+                                      type: integer
+                                    successThreshold:
+                                      description: |-
+                                        Minimum consecutive successes for the probe to be considered successful after having failed.
+                                        Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
+                                      format: int32
+                                      type: integer
+                                    tcpSocket:
+                                      description: TCPSocket specifies a connection
+                                        to a TCP port.
+                                      properties:
+                                        host:
+                                          description: 'Optional: Host name to connect
+                                            to, defaults to the pod IP.'
+                                          type: string
+                                        port:
+                                          anyOf:
+                                          - type: integer
+                                          - type: string
+                                          description: |-
+                                            Number or name of the port to access on the container.
+                                            Number must be in the range 1 to 65535.
+                                            Name must be an IANA_SVC_NAME.
+                                          x-kubernetes-int-or-string: true
+                                      required:
+                                      - port
+                                      type: object
+                                    terminationGracePeriodSeconds:
+                                      description: |-
+                                        Optional duration in seconds the pod needs to terminate gracefully upon probe failure.
+                                        The grace period is the duration in seconds after the processes running in the pod are sent
+                                        a termination signal and the time when the processes are forcibly halted with a kill signal.
+                                        Set this value longer than the expected cleanup time for your process.
+                                        If this value is nil, the pod's terminationGracePeriodSeconds will be used. Otherwise, this
+                                        value overrides the value provided by the pod spec.
+                                        Value must be non-negative integer. The value zero indicates stop immediately via
+                                        the kill signal (no opportunity to shut down).
+                                        This is a beta field and requires enabling ProbeTerminationGracePeriod feature gate.
+                                        Minimum value is 1. spec.terminationGracePeriodSeconds is used if unset.
+                                      format: int64
+                                      type: integer
+                                    timeoutSeconds:
+                                      description: |-
+                                        Number of seconds after which the probe times out.
+                                        Defaults to 1 second. Minimum value is 1.
+                                        More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                                      format: int32
+                                      type: integer
+                                  type: object
+                                stdin:
+                                  description: |-
+                                    Whether this container should allocate a buffer for stdin in the container runtime. If this
+                                    is not set, reads from stdin in the container will always result in EOF.
+                                    Default is false.
+                                  type: boolean
+                                stdinOnce:
+                                  description: |-
+                                    Whether the container runtime should close the stdin channel after it has been opened by
+                                    a single attach. When stdin is true the stdin stream will remain open across multiple attach
+                                    sessions. If stdinOnce is set to true, stdin is opened on container start, is empty until the
+                                    first client attaches to stdin, and then remains open and accepts data until the client disconnects,
+                                    at which time stdin is closed and remains closed until the container is restarted. If this
+                                    flag is false, a container processes that reads from stdin will never receive an EOF.
+                                    Default is false
+                                  type: boolean
+                                terminationMessagePath:
+                                  description: |-
+                                    Optional: Path at which the file to which the container's termination message
+                                    will be written is mounted into the container's filesystem.
+                                    Message written is intended to be brief final status, such as an assertion failure message.
+                                    Will be truncated by the node if greater than 4096 bytes. The total message length across
+                                    all containers will be limited to 12kb.
+                                    Defaults to /dev/termination-log.
+                                    Cannot be updated.
+                                  type: string
+                                terminationMessagePolicy:
+                                  description: |-
+                                    Indicate how the termination message should be populated. File will use the contents of
+                                    terminationMessagePath to populate the container status message on both success and failure.
+                                    FallbackToLogsOnError will use the last chunk of container log output if the termination
+                                    message file is empty and the container exited with an error.
+                                    The log output is limited to 2048 bytes or 80 lines, whichever is smaller.
+                                    Defaults to File.
+                                    Cannot be updated.
+                                  type: string
+                                tty:
+                                  description: |-
+                                    Whether this container should allocate a TTY for itself, also requires 'stdin' to be true.
+                                    Default is false.
+                                  type: boolean
+                                volumeDevices:
+                                  description: volumeDevices is the list of block
+                                    devices to be used by the container.
+                                  items:
+                                    description: volumeDevice describes a mapping
+                                      of a raw block device within a container.
+                                    properties:
+                                      devicePath:
+                                        description: devicePath is the path inside
+                                          of the container that the device will be
+                                          mapped to.
+                                        type: string
+                                      name:
+                                        description: name must match the name of a
+                                          persistentVolumeClaim in the pod
+                                        type: string
+                                    required:
+                                    - devicePath
+                                    - name
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-map-keys:
+                                  - devicePath
+                                  x-kubernetes-list-type: map
+                                volumeMounts:
+                                  description: |-
+                                    Pod volumes to mount into the container's filesystem.
+                                    Cannot be updated.
+                                  items:
+                                    description: VolumeMount describes a mounting
+                                      of a Volume within a container.
+                                    properties:
+                                      mountPath:
+                                        description: |-
+                                          Path within the container at which the volume should be mounted.  Must
+                                          not contain ':'.
+                                        type: string
+                                      mountPropagation:
+                                        description: |-
+                                          mountPropagation determines how mounts are propagated from the host
+                                          to container and the other way around.
+                                          When not set, MountPropagationNone is used.
+                                          This field is beta in 1.10.
+                                          When RecursiveReadOnly is set to IfPossible or to Enabled, MountPropagation must be None or unspecified
+                                          (which defaults to None).
+                                        type: string
+                                      name:
+                                        description: This must match the Name of a
+                                          Volume.
+                                        type: string
+                                      readOnly:
+                                        description: |-
+                                          Mounted read-only if true, read-write otherwise (false or unspecified).
+                                          Defaults to false.
+                                        type: boolean
+                                      recursiveReadOnly:
+                                        description: |-
+                                          RecursiveReadOnly specifies whether read-only mounts should be handled
+                                          recursively.
+
+                                          If ReadOnly is false, this field has no meaning and must be unspecified.
+
+                                          If ReadOnly is true, and this field is set to Disabled, the mount is not made
+                                          recursively read-only.  If this field is set to IfPossible, the mount is made
+                                          recursively read-only, if it is supported by the container runtime.  If this
+                                          field is set to Enabled, the mount is made recursively read-only if it is
+                                          supported by the container runtime, otherwise the pod will not be started and
+                                          an error will be generated to indicate the reason.
+
+                                          If this field is set to IfPossible or Enabled, MountPropagation must be set to
+                                          None (or be unspecified, which defaults to None).
+
+                                          If this field is not specified, it is treated as an equivalent of Disabled.
+                                        type: string
+                                      subPath:
+                                        description: |-
+                                          Path within the volume from which the container's volume should be mounted.
+                                          Defaults to "" (volume's root).
+                                        type: string
+                                      subPathExpr:
+                                        description: |-
+                                          Expanded path within the volume from which the container's volume should be mounted.
+                                          Behaves similarly to SubPath but environment variable references $(VAR_NAME) are expanded using the container's environment.
+                                          Defaults to "" (volume's root).
+                                          SubPathExpr and SubPath are mutually exclusive.
+                                        type: string
+                                    required:
+                                    - mountPath
+                                    - name
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-map-keys:
+                                  - mountPath
+                                  x-kubernetes-list-type: map
+                                workingDir:
+                                  description: |-
+                                    Container's working directory.
+                                    If not specified, the container runtime's default will be used, which
+                                    might be configured in the container image.
+                                    Cannot be updated.
+                                  type: string
+                              required:
+                              - name
+                              type: object
+                            type: array
+                            x-kubernetes-list-map-keys:
+                            - name
+                            x-kubernetes-list-type: map
+                          nodeName:
+                            description: |-
+                              NodeName indicates in which node this pod is scheduled.
+                              If empty, this pod is a candidate for scheduling by the scheduler defined in schedulerName.
+                              Once this field is set, the kubelet for this node becomes responsible for the lifecycle of this pod.
+                              This field should not be used to express a desire for the pod to be scheduled on a specific node.
+                              https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodename
+                            type: string
+                          nodeSelector:
+                            additionalProperties:
+                              type: string
+                            description: |-
+                              NodeSelector is a selector which must be true for the pod to fit on a node.
+                              Selector which must match a node's labels for the pod to be scheduled on that node.
+                              More info: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/
+                            type: object
+                            x-kubernetes-map-type: atomic
+                          os:
+                            description: |-
+                              Specifies the OS of the containers in the pod.
+                              Some pod and container fields are restricted if this is set.
+
+                              If the OS field is set to linux, the following fields must be unset:
+                              -securityContext.windowsOptions
+
+                              If the OS field is set to windows, following fields must be unset:
+                              - spec.hostPID
+                              - spec.hostIPC
+                              - spec.hostUsers
+                              - spec.resources
+                              - spec.securityContext.appArmorProfile
+                              - spec.securityContext.seLinuxOptions
+                              - spec.securityContext.seccompProfile
+                              - spec.securityContext.fsGroup
+                              - spec.securityContext.fsGroupChangePolicy
+                              - spec.securityContext.sysctls
+                              - spec.shareProcessNamespace
+                              - spec.securityContext.runAsUser
+                              - spec.securityContext.runAsGroup
+                              - spec.securityContext.supplementalGroups
+                              - spec.securityContext.supplementalGroupsPolicy
+                              - spec.containers[*].securityContext.appArmorProfile
+                              - spec.containers[*].securityContext.seLinuxOptions
+                              - spec.containers[*].securityContext.seccompProfile
+                              - spec.containers[*].securityContext.capabilities
+                              - spec.containers[*].securityContext.readOnlyRootFilesystem
+                              - spec.containers[*].securityContext.privileged
+                              - spec.containers[*].securityContext.allowPrivilegeEscalation
+                              - spec.containers[*].securityContext.procMount
+                              - spec.containers[*].securityContext.runAsUser
+                              - spec.containers[*].securityContext.runAsGroup
+                            properties:
+                              name:
+                                description: |-
+                                  Name is the name of the operating system. The currently supported values are linux and windows.
+                                  Additional value may be defined in future and can be one of:
+                                  https://github.com/opencontainers/runtime-spec/blob/master/config.md#platform-specific-configuration
+                                  Clients should expect to handle additional values and treat unrecognized values in this field as os: null
+                                type: string
+                            required:
+                            - name
+                            type: object
+                          overhead:
+                            additionalProperties:
+                              anyOf:
+                              - type: integer
+                              - type: string
+                              pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                              x-kubernetes-int-or-string: true
+                            description: |-
+                              Overhead represents the resource overhead associated with running a pod for a given RuntimeClass.
+                              This field will be autopopulated at admission time by the RuntimeClass admission controller. If
+                              the RuntimeClass admission controller is enabled, overhead must not be set in Pod create requests.
+                              The RuntimeClass admission controller will reject Pod create requests which have the overhead already
+                              set. If RuntimeClass is configured and selected in the PodSpec, Overhead will be set to the value
+                              defined in the corresponding RuntimeClass, otherwise it will remain unset and treated as zero.
+                              More info: https://git.k8s.io/enhancements/keps/sig-node/688-pod-overhead/README.md
+                            type: object
+                          preemptionPolicy:
+                            description: |-
+                              PreemptionPolicy is the Policy for preempting pods with lower priority.
+                              One of Never, PreemptLowerPriority.
+                              Defaults to PreemptLowerPriority if unset.
+                            type: string
+                          priority:
+                            description: |-
+                              The priority value. Various system components use this field to find the
+                              priority of the pod. When Priority Admission Controller is enabled, it
+                              prevents users from setting this field. The admission controller populates
+                              this field from PriorityClassName.
+                              The higher the value, the higher the priority.
+                            format: int32
+                            type: integer
+                          priorityClassName:
+                            description: |-
+                              If specified, indicates the pod's priority. "system-node-critical" and
+                              "system-cluster-critical" are two special keywords which indicate the
+                              highest priorities with the former being the highest priority. Any other
+                              name must be defined by creating a PriorityClass object with that name.
+                              If not specified, the pod priority will be default or zero if there is no
+                              default.
+                            type: string
+                          readinessGates:
+                            description: |-
+                              If specified, all readiness gates will be evaluated for pod readiness.
+                              A pod is ready when all its containers are ready AND
+                              all conditions specified in the readiness gates have status equal to "True"
+                              More info: https://git.k8s.io/enhancements/keps/sig-network/580-pod-readiness-gates
+                            items:
+                              description: PodReadinessGate contains the reference
+                                to a pod condition
+                              properties:
+                                conditionType:
+                                  description: ConditionType refers to a condition
+                                    in the pod's condition list with matching type.
+                                  type: string
+                              required:
+                              - conditionType
+                              type: object
+                            type: array
+                            x-kubernetes-list-type: atomic
+                          resourceClaims:
+                            description: |-
+                              ResourceClaims defines which ResourceClaims must be allocated
+                              and reserved before the Pod is allowed to start. The resources
+                              will be made available to those containers which consume them
+                              by name.
+
+                              This is a stable field but requires that the
+                              DynamicResourceAllocation feature gate is enabled.
+
+                              This field is immutable.
+                            items:
+                              description: |-
+                                PodResourceClaim references exactly one ResourceClaim, either directly
+                                or by naming a ResourceClaimTemplate which is then turned into a ResourceClaim
+                                for the pod.
+
+                                It adds a name to it that uniquely identifies the ResourceClaim inside the Pod.
+                                Containers that need access to the ResourceClaim reference it with this name.
+                              properties:
+                                name:
+                                  description: |-
+                                    Name uniquely identifies this resource claim inside the pod.
+                                    This must be a DNS_LABEL.
+                                  type: string
+                                resourceClaimName:
+                                  description: |-
+                                    ResourceClaimName is the name of a ResourceClaim object in the same
+                                    namespace as this pod.
+
+                                    Exactly one of ResourceClaimName and ResourceClaimTemplateName must
+                                    be set.
+                                  type: string
+                                resourceClaimTemplateName:
+                                  description: |-
+                                    ResourceClaimTemplateName is the name of a ResourceClaimTemplate
+                                    object in the same namespace as this pod.
+
+                                    The template will be used to create a new ResourceClaim, which will
+                                    be bound to this pod. When this pod is deleted, the ResourceClaim
+                                    will also be deleted. The pod name and resource name, along with a
+                                    generated component, will be used to form a unique name for the
+                                    ResourceClaim, which will be recorded in pod.status.resourceClaimStatuses.
+
+                                    This field is immutable and no changes will be made to the
+                                    corresponding ResourceClaim by the control plane after creating the
+                                    ResourceClaim.
+
+                                    Exactly one of ResourceClaimName and ResourceClaimTemplateName must
+                                    be set.
+                                  type: string
+                              required:
+                              - name
+                              type: object
+                            type: array
+                            x-kubernetes-list-map-keys:
+                            - name
+                            x-kubernetes-list-type: map
+                          resources:
+                            description: |-
+                              Resources is the total amount of CPU and Memory resources required by all
+                              containers in the pod. It supports specifying Requests and Limits for
+                              "cpu", "memory" and "hugepages-" resource names only. ResourceClaims are not supported.
+
+                              This field enables fine-grained control over resource allocation for the
+                              entire pod, allowing resource sharing among containers in a pod.
+
+                              This is an alpha field and requires enabling the PodLevelResources feature
+                              gate.
+                            properties:
+                              claims:
+                                description: |-
+                                  Claims lists the names of resources, defined in spec.resourceClaims,
+                                  that are used by this container.
+
+                                  This field depends on the
+                                  DynamicResourceAllocation feature gate.
+
+                                  This field is immutable. It can only be set for containers.
+                                items:
+                                  description: ResourceClaim references one entry
+                                    in PodSpec.ResourceClaims.
+                                  properties:
+                                    name:
+                                      description: |-
+                                        Name must match the name of one entry in pod.spec.resourceClaims of
+                                        the Pod where this field is used. It makes that resource available
+                                        inside a container.
+                                      type: string
+                                    request:
+                                      description: |-
+                                        Request is the name chosen for a request in the referenced claim.
+                                        If empty, everything from the claim is made available, otherwise
+                                        only the result of this request.
+                                      type: string
+                                  required:
+                                  - name
+                                  type: object
+                                type: array
+                                x-kubernetes-list-map-keys:
+                                - name
+                                x-kubernetes-list-type: map
+                              limits:
+                                additionalProperties:
+                                  anyOf:
+                                  - type: integer
+                                  - type: string
+                                  pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                  x-kubernetes-int-or-string: true
+                                description: |-
+                                  Limits describes the maximum amount of compute resources allowed.
+                                  More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+                                type: object
+                              requests:
+                                additionalProperties:
+                                  anyOf:
+                                  - type: integer
+                                  - type: string
+                                  pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                  x-kubernetes-int-or-string: true
+                                description: |-
+                                  Requests describes the minimum amount of compute resources required.
+                                  If Requests is omitted for a container, it defaults to Limits if that is explicitly specified,
+                                  otherwise to an implementation-defined value. Requests cannot exceed Limits.
+                                  More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+                                type: object
+                            type: object
+                          restartPolicy:
+                            description: |-
+                              Restart policy for all containers within the pod.
+                              One of Always, OnFailure, Never. In some contexts, only a subset of those values may be permitted.
+                              Default to Always.
+                              More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#restart-policy
+                            type: string
+                          runtimeClassName:
+                            description: |-
+                              RuntimeClassName refers to a RuntimeClass object in the node.k8s.io group, which should be used
+                              to run this pod.  If no RuntimeClass resource matches the named class, the pod will not be run.
+                              If unset or empty, the "legacy" RuntimeClass will be used, which is an implicit class with an
+                              empty definition that uses the default runtime handler.
+                              More info: https://git.k8s.io/enhancements/keps/sig-node/585-runtime-class
+                            type: string
+                          schedulerName:
+                            description: |-
+                              If specified, the pod will be dispatched by specified scheduler.
+                              If not specified, the pod will be dispatched by default scheduler.
+                            type: string
+                          schedulingGates:
+                            description: |-
+                              SchedulingGates is an opaque list of values that if specified will block scheduling the pod.
+                              If schedulingGates is not empty, the pod will stay in the SchedulingGated state and the
+                              scheduler will not attempt to schedule the pod.
+
+                              SchedulingGates can only be set at pod creation time, and be removed only afterwards.
+                            items:
+                              description: PodSchedulingGate is associated to a Pod
+                                to guard its scheduling.
+                              properties:
+                                name:
+                                  description: |-
+                                    Name of the scheduling gate.
+                                    Each scheduling gate must have a unique name field.
+                                  type: string
+                              required:
+                              - name
+                              type: object
+                            type: array
+                            x-kubernetes-list-map-keys:
+                            - name
+                            x-kubernetes-list-type: map
+                          securityContext:
+                            description: |-
+                              SecurityContext holds pod-level security attributes and common container settings.
+                              Optional: Defaults to empty.  See type description for default values of each field.
+                            properties:
+                              appArmorProfile:
+                                description: |-
+                                  appArmorProfile is the AppArmor options to use by the containers in this pod.
+                                  Note that this field cannot be set when spec.os.name is windows.
+                                properties:
+                                  localhostProfile:
+                                    description: |-
+                                      localhostProfile indicates a profile loaded on the node that should be used.
+                                      The profile must be preconfigured on the node to work.
+                                      Must match the loaded name of the profile.
+                                      Must be set if and only if type is "Localhost".
+                                    type: string
+                                  type:
+                                    description: |-
+                                      type indicates which kind of AppArmor profile will be applied.
+                                      Valid options are:
+                                        Localhost - a profile pre-loaded on the node.
+                                        RuntimeDefault - the container runtime's default profile.
+                                        Unconfined - no AppArmor enforcement.
+                                    type: string
+                                required:
+                                - type
+                                type: object
+                              fsGroup:
+                                description: |-
+                                  A special supplemental group that applies to all containers in a pod.
+                                  Some volume types allow the Kubelet to change the ownership of that volume
+                                  to be owned by the pod:
+
+                                  1. The owning GID will be the FSGroup
+                                  2. The setgid bit is set (new files created in the volume will be owned by FSGroup)
+                                  3. The permission bits are OR'd with rw-rw----
+
+                                  If unset, the Kubelet will not modify the ownership and permissions of any volume.
+                                  Note that this field cannot be set when spec.os.name is windows.
+                                format: int64
+                                type: integer
+                              fsGroupChangePolicy:
+                                description: |-
+                                  fsGroupChangePolicy defines behavior of changing ownership and permission of the volume
+                                  before being exposed inside Pod. This field will only apply to
+                                  volume types which support fsGroup based ownership(and permissions).
+                                  It will have no effect on ephemeral volume types such as: secret, configmaps
+                                  and emptydir.
+                                  Valid values are "OnRootMismatch" and "Always". If not specified, "Always" is used.
+                                  Note that this field cannot be set when spec.os.name is windows.
+                                type: string
+                              runAsGroup:
+                                description: |-
+                                  The GID to run the entrypoint of the container process.
+                                  Uses runtime default if unset.
+                                  May also be set in SecurityContext.  If set in both SecurityContext and
+                                  PodSecurityContext, the value specified in SecurityContext takes precedence
+                                  for that container.
+                                  Note that this field cannot be set when spec.os.name is windows.
+                                format: int64
+                                type: integer
+                              runAsNonRoot:
+                                description: |-
+                                  Indicates that the container must run as a non-root user.
+                                  If true, the Kubelet will validate the image at runtime to ensure that it
+                                  does not run as UID 0 (root) and fail to start the container if it does.
+                                  If unset or false, no such validation will be performed.
+                                  May also be set in SecurityContext.  If set in both SecurityContext and
+                                  PodSecurityContext, the value specified in SecurityContext takes precedence.
+                                type: boolean
+                              runAsUser:
+                                description: |-
+                                  The UID to run the entrypoint of the container process.
+                                  Defaults to user specified in image metadata if unspecified.
+                                  May also be set in SecurityContext.  If set in both SecurityContext and
+                                  PodSecurityContext, the value specified in SecurityContext takes precedence
+                                  for that container.
+                                  Note that this field cannot be set when spec.os.name is windows.
+                                format: int64
+                                type: integer
+                              seLinuxChangePolicy:
+                                description: |-
+                                  seLinuxChangePolicy defines how the container's SELinux label is applied to all volumes used by the Pod.
+                                  It has no effect on nodes that do not support SELinux or to volumes does not support SELinux.
+                                  Valid values are "MountOption" and "Recursive".
+
+                                  "Recursive" means relabeling of all files on all Pod volumes by the container runtime.
+                                  This may be slow for large volumes, but allows mixing privileged and unprivileged Pods sharing the same volume on the same node.
+
+                                  "MountOption" mounts all eligible Pod volumes with `-o context` mount option.
+                                  This requires all Pods that share the same volume to use the same SELinux label.
+                                  It is not possible to share the same volume among privileged and unprivileged Pods.
+                                  Eligible volumes are in-tree FibreChannel and iSCSI volumes, and all CSI volumes
+                                  whose CSI driver announces SELinux support by setting spec.seLinuxMount: true in their
+                                  CSIDriver instance. Other volumes are always re-labelled recursively.
+                                  "MountOption" value is allowed only when SELinuxMount feature gate is enabled.
+
+                                  If not specified and SELinuxMount feature gate is enabled, "MountOption" is used.
+                                  If not specified and SELinuxMount feature gate is disabled, "MountOption" is used for ReadWriteOncePod volumes
+                                  and "Recursive" for all other volumes.
+
+                                  This field affects only Pods that have SELinux label set, either in PodSecurityContext or in SecurityContext of all containers.
+
+                                  All Pods that use the same volume should use the same seLinuxChangePolicy, otherwise some pods can get stuck in ContainerCreating state.
+                                  Note that this field cannot be set when spec.os.name is windows.
+                                type: string
+                              seLinuxOptions:
+                                description: |-
+                                  The SELinux context to be applied to all containers.
+                                  If unspecified, the container runtime will allocate a random SELinux context for each
+                                  container.  May also be set in SecurityContext.  If set in
+                                  both SecurityContext and PodSecurityContext, the value specified in SecurityContext
+                                  takes precedence for that container.
+                                  Note that this field cannot be set when spec.os.name is windows.
+                                properties:
+                                  level:
+                                    description: Level is SELinux level label that
+                                      applies to the container.
+                                    type: string
+                                  role:
+                                    description: Role is a SELinux role label that
+                                      applies to the container.
+                                    type: string
+                                  type:
+                                    description: Type is a SELinux type label that
+                                      applies to the container.
+                                    type: string
+                                  user:
+                                    description: User is a SELinux user label that
+                                      applies to the container.
+                                    type: string
+                                type: object
+                              seccompProfile:
+                                description: |-
+                                  The seccomp options to use by the containers in this pod.
+                                  Note that this field cannot be set when spec.os.name is windows.
+                                properties:
+                                  localhostProfile:
+                                    description: |-
+                                      localhostProfile indicates a profile defined in a file on the node should be used.
+                                      The profile must be preconfigured on the node to work.
+                                      Must be a descending path, relative to the kubelet's configured seccomp profile location.
+                                      Must be set if type is "Localhost". Must NOT be set for any other type.
+                                    type: string
+                                  type:
+                                    description: |-
+                                      type indicates which kind of seccomp profile will be applied.
+                                      Valid options are:
+
+                                      Localhost - a profile defined in a file on the node should be used.
+                                      RuntimeDefault - the container runtime default profile should be used.
+                                      Unconfined - no profile should be applied.
+                                    type: string
+                                required:
+                                - type
+                                type: object
+                              supplementalGroups:
+                                description: |-
+                                  A list of groups applied to the first process run in each container, in
+                                  addition to the container's primary GID and fsGroup (if specified).  If
+                                  the SupplementalGroupsPolicy feature is enabled, the
+                                  supplementalGroupsPolicy field determines whether these are in addition
+                                  to or instead of any group memberships defined in the container image.
+                                  If unspecified, no additional groups are added, though group memberships
+                                  defined in the container image may still be used, depending on the
+                                  supplementalGroupsPolicy field.
+                                  Note that this field cannot be set when spec.os.name is windows.
+                                items:
+                                  format: int64
+                                  type: integer
+                                type: array
+                                x-kubernetes-list-type: atomic
+                              supplementalGroupsPolicy:
+                                description: |-
+                                  Defines how supplemental groups of the first container processes are calculated.
+                                  Valid values are "Merge" and "Strict". If not specified, "Merge" is used.
+                                  (Alpha) Using the field requires the SupplementalGroupsPolicy feature gate to be enabled
+                                  and the container runtime must implement support for this feature.
+                                  Note that this field cannot be set when spec.os.name is windows.
+                                type: string
+                              sysctls:
+                                description: |-
+                                  Sysctls hold a list of namespaced sysctls used for the pod. Pods with unsupported
+                                  sysctls (by the container runtime) might fail to launch.
+                                  Note that this field cannot be set when spec.os.name is windows.
+                                items:
+                                  description: Sysctl defines a kernel parameter to
+                                    be set
+                                  properties:
+                                    name:
+                                      description: Name of a property to set
+                                      type: string
+                                    value:
+                                      description: Value of a property to set
+                                      type: string
+                                  required:
+                                  - name
+                                  - value
+                                  type: object
+                                type: array
+                                x-kubernetes-list-type: atomic
+                              windowsOptions:
+                                description: |-
+                                  The Windows specific settings applied to all containers.
+                                  If unspecified, the options within a container's SecurityContext will be used.
+                                  If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence.
+                                  Note that this field cannot be set when spec.os.name is linux.
+                                properties:
+                                  gmsaCredentialSpec:
+                                    description: |-
+                                      GMSACredentialSpec is where the GMSA admission webhook
+                                      (https://github.com/kubernetes-sigs/windows-gmsa) inlines the contents of the
+                                      GMSA credential spec named by the GMSACredentialSpecName field.
+                                    type: string
+                                  gmsaCredentialSpecName:
+                                    description: GMSACredentialSpecName is the name
+                                      of the GMSA credential spec to use.
+                                    type: string
+                                  hostProcess:
+                                    description: |-
+                                      HostProcess determines if a container should be run as a 'Host Process' container.
+                                      All of a Pod's containers must have the same effective HostProcess value
+                                      (it is not allowed to have a mix of HostProcess containers and non-HostProcess containers).
+                                      In addition, if HostProcess is true then HostNetwork must also be set to true.
+                                    type: boolean
+                                  runAsUserName:
+                                    description: |-
+                                      The UserName in Windows to run the entrypoint of the container process.
+                                      Defaults to the user specified in image metadata if unspecified.
+                                      May also be set in PodSecurityContext. If set in both SecurityContext and
+                                      PodSecurityContext, the value specified in SecurityContext takes precedence.
+                                    type: string
+                                type: object
+                            type: object
+                          serviceAccount:
+                            description: |-
+                              DeprecatedServiceAccount is a deprecated alias for ServiceAccountName.
+                              Deprecated: Use serviceAccountName instead.
+                            type: string
+                          serviceAccountName:
+                            description: |-
+                              ServiceAccountName is the name of the ServiceAccount to use to run this pod.
+                              More info: https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/
+                            type: string
+                          setHostnameAsFQDN:
+                            description: |-
+                              If true the pod's hostname will be configured as the pod's FQDN, rather than the leaf name (the default).
+                              In Linux containers, this means setting the FQDN in the hostname field of the kernel (the nodename field of struct utsname).
+                              In Windows containers, this means setting the registry value of hostname for the registry key HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters to FQDN.
+                              If a pod does not have FQDN, this has no effect.
+                              Default to false.
+                            type: boolean
+                          shareProcessNamespace:
+                            description: |-
+                              Share a single process namespace between all of the containers in a pod.
+                              When this is set containers will be able to view and signal processes from other containers
+                              in the same pod, and the first process in each container will not be assigned PID 1.
+                              HostPID and ShareProcessNamespace cannot both be set.
+                              Optional: Default to false.
+                            type: boolean
+                          subdomain:
+                            description: |-
+                              If specified, the fully qualified Pod hostname will be "<hostname>.<subdomain>.<pod namespace>.svc.<cluster domain>".
+                              If not specified, the pod will not have a domainname at all.
+                            type: string
+                          terminationGracePeriodSeconds:
+                            description: |-
+                              Optional duration in seconds the pod needs to terminate gracefully. May be decreased in delete request.
+                              Value must be non-negative integer. The value zero indicates stop immediately via
+                              the kill signal (no opportunity to shut down).
+                              If this value is nil, the default grace period will be used instead.
+                              The grace period is the duration in seconds after the processes running in the pod are sent
+                              a termination signal and the time when the processes are forcibly halted with a kill signal.
+                              Set this value longer than the expected cleanup time for your process.
+                              Defaults to 30 seconds.
+                            format: int64
+                            type: integer
+                          tolerations:
+                            description: If specified, the pod's tolerations.
+                            items:
+                              description: |-
+                                The pod this Toleration is attached to tolerates any taint that matches
+                                the triple <key,value,effect> using the matching operator <operator>.
+                              properties:
+                                effect:
+                                  description: |-
+                                    Effect indicates the taint effect to match. Empty means match all taint effects.
+                                    When specified, allowed values are NoSchedule, PreferNoSchedule and NoExecute.
+                                  type: string
+                                key:
+                                  description: |-
+                                    Key is the taint key that the toleration applies to. Empty means match all taint keys.
+                                    If the key is empty, operator must be Exists; this combination means to match all values and all keys.
+                                  type: string
+                                operator:
+                                  description: |-
+                                    Operator represents a key's relationship to the value.
+                                    Valid operators are Exists, Equal, Lt, and Gt. Defaults to Equal.
+                                    Exists is equivalent to wildcard for value, so that a pod can
+                                    tolerate all taints of a particular category.
+                                    Lt and Gt perform numeric comparisons (requires feature gate TaintTolerationComparisonOperators).
+                                  type: string
+                                tolerationSeconds:
+                                  description: |-
+                                    TolerationSeconds represents the period of time the toleration (which must be
+                                    of effect NoExecute, otherwise this field is ignored) tolerates the taint. By default,
+                                    it is not set, which means tolerate the taint forever (do not evict). Zero and
+                                    negative values will be treated as 0 (evict immediately) by the system.
+                                  format: int64
+                                  type: integer
+                                value:
+                                  description: |-
+                                    Value is the taint value the toleration matches to.
+                                    If the operator is Exists, the value should be empty, otherwise just a regular string.
+                                  type: string
+                              type: object
+                            type: array
+                            x-kubernetes-list-type: atomic
+                          topologySpreadConstraints:
+                            description: |-
+                              TopologySpreadConstraints describes how a group of pods ought to spread across topology
+                              domains. Scheduler will schedule pods in a way which abides by the constraints.
+                              All topologySpreadConstraints are ANDed.
+                            items:
+                              description: TopologySpreadConstraint specifies how
+                                to spread matching pods among the given topology.
+                              properties:
+                                labelSelector:
+                                  description: |-
+                                    LabelSelector is used to find matching pods.
+                                    Pods that match this label selector are counted to determine the number of pods
+                                    in their corresponding topology domain.
+                                  properties:
+                                    matchExpressions:
+                                      description: matchExpressions is a list of label
+                                        selector requirements. The requirements are
+                                        ANDed.
+                                      items:
+                                        description: |-
+                                          A label selector requirement is a selector that contains values, a key, and an operator that
+                                          relates the key and values.
+                                        properties:
+                                          key:
+                                            description: key is the label key that
+                                              the selector applies to.
+                                            type: string
+                                          operator:
+                                            description: |-
+                                              operator represents a key's relationship to a set of values.
+                                              Valid operators are In, NotIn, Exists and DoesNotExist.
+                                            type: string
+                                          values:
+                                            description: |-
+                                              values is an array of string values. If the operator is In or NotIn,
+                                              the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                              the values array must be empty. This array is replaced during a strategic
+                                              merge patch.
+                                            items:
+                                              type: string
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                        required:
+                                        - key
+                                        - operator
+                                        type: object
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    matchLabels:
+                                      additionalProperties:
+                                        type: string
+                                      description: |-
+                                        matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                        map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                        operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                      type: object
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                matchLabelKeys:
+                                  description: |-
+                                    MatchLabelKeys is a set of pod label keys to select the pods over which
+                                    spreading will be calculated. The keys are used to lookup values from the
+                                    incoming pod labels, those key-value labels are ANDed with labelSelector
+                                    to select the group of existing pods over which spreading will be calculated
+                                    for the incoming pod. The same key is forbidden to exist in both MatchLabelKeys and LabelSelector.
+                                    MatchLabelKeys cannot be set when LabelSelector isn't set.
+                                    Keys that don't exist in the incoming pod labels will
+                                    be ignored. A null or empty list means only match against labelSelector.
+
+                                    This is a beta field and requires the MatchLabelKeysInPodTopologySpread feature gate to be enabled (enabled by default).
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                maxSkew:
+                                  description: |-
+                                    MaxSkew describes the degree to which pods may be unevenly distributed.
+                                    When `whenUnsatisfiable=DoNotSchedule`, it is the maximum permitted difference
+                                    between the number of matching pods in the target topology and the global minimum.
+                                    The global minimum is the minimum number of matching pods in an eligible domain
+                                    or zero if the number of eligible domains is less than MinDomains.
+                                    For example, in a 3-zone cluster, MaxSkew is set to 1, and pods with the same
+                                    labelSelector spread as 2/2/1:
+                                    In this case, the global minimum is 1.
+                                    | zone1 | zone2 | zone3 |
+                                    |  P P  |  P P  |   P   |
+                                    - if MaxSkew is 1, incoming pod can only be scheduled to zone3 to become 2/2/2;
+                                    scheduling it onto zone1(zone2) would make the ActualSkew(3-1) on zone1(zone2)
+                                    violate MaxSkew(1).
+                                    - if MaxSkew is 2, incoming pod can be scheduled onto any zone.
+                                    When `whenUnsatisfiable=ScheduleAnyway`, it is used to give higher precedence
+                                    to topologies that satisfy it.
+                                    It's a required field. Default value is 1 and 0 is not allowed.
+                                  format: int32
+                                  type: integer
+                                minDomains:
+                                  description: |-
+                                    MinDomains indicates a minimum number of eligible domains.
+                                    When the number of eligible domains with matching topology keys is less than minDomains,
+                                    Pod Topology Spread treats "global minimum" as 0, and then the calculation of Skew is performed.
+                                    And when the number of eligible domains with matching topology keys equals or greater than minDomains,
+                                    this value has no effect on scheduling.
+                                    As a result, when the number of eligible domains is less than minDomains,
+                                    scheduler won't schedule more than maxSkew Pods to those domains.
+                                    If value is nil, the constraint behaves as if MinDomains is equal to 1.
+                                    Valid values are integers greater than 0.
+                                    When value is not nil, WhenUnsatisfiable must be DoNotSchedule.
+
+                                    For example, in a 3-zone cluster, MaxSkew is set to 2, MinDomains is set to 5 and pods with the same
+                                    labelSelector spread as 2/2/2:
+                                    | zone1 | zone2 | zone3 |
+                                    |  P P  |  P P  |  P P  |
+                                    The number of domains is less than 5(MinDomains), so "global minimum" is treated as 0.
+                                    In this situation, new pod with the same labelSelector cannot be scheduled,
+                                    because computed skew will be 3(3 - 0) if new Pod is scheduled to any of the three zones,
+                                    it will violate MaxSkew.
+                                  format: int32
+                                  type: integer
+                                nodeAffinityPolicy:
+                                  description: |-
+                                    NodeAffinityPolicy indicates how we will treat Pod's nodeAffinity/nodeSelector
+                                    when calculating pod topology spread skew. Options are:
+                                    - Honor: only nodes matching nodeAffinity/nodeSelector are included in the calculations.
+                                    - Ignore: nodeAffinity/nodeSelector are ignored. All nodes are included in the calculations.
+
+                                    If this value is nil, the behavior is equivalent to the Honor policy.
+                                  type: string
+                                nodeTaintsPolicy:
+                                  description: |-
+                                    NodeTaintsPolicy indicates how we will treat node taints when calculating
+                                    pod topology spread skew. Options are:
+                                    - Honor: nodes without taints, along with tainted nodes for which the incoming pod
+                                    has a toleration, are included.
+                                    - Ignore: node taints are ignored. All nodes are included.
+
+                                    If this value is nil, the behavior is equivalent to the Ignore policy.
+                                  type: string
+                                topologyKey:
+                                  description: |-
+                                    TopologyKey is the key of node labels. Nodes that have a label with this key
+                                    and identical values are considered to be in the same topology.
+                                    We consider each <key, value> as a "bucket", and try to put balanced number
+                                    of pods into each bucket.
+                                    We define a domain as a particular instance of a topology.
+                                    Also, we define an eligible domain as a domain whose nodes meet the requirements of
+                                    nodeAffinityPolicy and nodeTaintsPolicy.
+                                    e.g. If TopologyKey is "kubernetes.io/hostname", each Node is a domain of that topology.
+                                    And, if TopologyKey is "topology.kubernetes.io/zone", each zone is a domain of that topology.
+                                    It's a required field.
+                                  type: string
+                                whenUnsatisfiable:
+                                  description: |-
+                                    WhenUnsatisfiable indicates how to deal with a pod if it doesn't satisfy
+                                    the spread constraint.
+                                    - DoNotSchedule (default) tells the scheduler not to schedule it.
+                                    - ScheduleAnyway tells the scheduler to schedule the pod in any location,
+                                      but giving higher precedence to topologies that would help reduce the
+                                      skew.
+                                    A constraint is considered "Unsatisfiable" for an incoming pod
+                                    if and only if every possible node assignment for that pod would violate
+                                    "MaxSkew" on some topology.
+                                    For example, in a 3-zone cluster, MaxSkew is set to 1, and pods with the same
+                                    labelSelector spread as 3/1/1:
+                                    | zone1 | zone2 | zone3 |
+                                    | P P P |   P   |   P   |
+                                    If WhenUnsatisfiable is set to DoNotSchedule, incoming pod can only be scheduled
+                                    to zone2(zone3) to become 3/2/1(3/1/2) as ActualSkew(2-1) on zone2(zone3) satisfies
+                                    MaxSkew(1). In other words, the cluster can still be imbalanced, but scheduler
+                                    won't make it *more* imbalanced.
+                                    It's a required field.
+                                  type: string
+                              required:
+                              - maxSkew
+                              - topologyKey
+                              - whenUnsatisfiable
+                              type: object
+                            type: array
+                            x-kubernetes-list-map-keys:
+                            - topologyKey
+                            - whenUnsatisfiable
+                            x-kubernetes-list-type: map
+                          volumes:
+                            description: |-
+                              List of volumes that can be mounted by containers belonging to the pod.
+                              More info: https://kubernetes.io/docs/concepts/storage/volumes
+                            items:
+                              description: Volume represents a named volume in a pod
+                                that may be accessed by any container in the pod.
+                              properties:
+                                awsElasticBlockStore:
+                                  description: |-
+                                    awsElasticBlockStore represents an AWS Disk resource that is attached to a
+                                    kubelet's host machine and then exposed to the pod.
+                                    Deprecated: AWSElasticBlockStore is deprecated. All operations for the in-tree
+                                    awsElasticBlockStore type are redirected to the ebs.csi.aws.com CSI driver.
+                                    More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
+                                  properties:
+                                    fsType:
+                                      description: |-
+                                        fsType is the filesystem type of the volume that you want to mount.
+                                        Tip: Ensure that the filesystem type is supported by the host operating system.
+                                        Examples: "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
+                                        More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
+                                      type: string
+                                    partition:
+                                      description: |-
+                                        partition is the partition in the volume that you want to mount.
+                                        If omitted, the default is to mount by volume name.
+                                        Examples: For volume /dev/sda1, you specify the partition as "1".
+                                        Similarly, the volume partition for /dev/sda is "0" (or you can leave the property empty).
+                                      format: int32
+                                      type: integer
+                                    readOnly:
+                                      description: |-
+                                        readOnly value true will force the readOnly setting in VolumeMounts.
+                                        More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
+                                      type: boolean
+                                    volumeID:
+                                      description: |-
+                                        volumeID is unique ID of the persistent disk resource in AWS (Amazon EBS volume).
+                                        More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
+                                      type: string
+                                  required:
+                                  - volumeID
+                                  type: object
+                                azureDisk:
+                                  description: |-
+                                    azureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.
+                                    Deprecated: AzureDisk is deprecated. All operations for the in-tree azureDisk type
+                                    are redirected to the disk.csi.azure.com CSI driver.
+                                  properties:
+                                    cachingMode:
+                                      description: 'cachingMode is the Host Caching
+                                        mode: None, Read Only, Read Write.'
+                                      type: string
+                                    diskName:
+                                      description: diskName is the Name of the data
+                                        disk in the blob storage
+                                      type: string
+                                    diskURI:
+                                      description: diskURI is the URI of data disk
+                                        in the blob storage
+                                      type: string
+                                    fsType:
+                                      default: ext4
+                                      description: |-
+                                        fsType is Filesystem type to mount.
+                                        Must be a filesystem type supported by the host operating system.
+                                        Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
+                                      type: string
+                                    kind:
+                                      description: 'kind expected values are Shared:
+                                        multiple blob disks per storage account  Dedicated:
+                                        single blob disk per storage account  Managed:
+                                        azure managed data disk (only in managed availability
+                                        set). defaults to shared'
+                                      type: string
+                                    readOnly:
+                                      default: false
+                                      description: |-
+                                        readOnly Defaults to false (read/write). ReadOnly here will force
+                                        the ReadOnly setting in VolumeMounts.
+                                      type: boolean
+                                  required:
+                                  - diskName
+                                  - diskURI
+                                  type: object
+                                azureFile:
+                                  description: |-
+                                    azureFile represents an Azure File Service mount on the host and bind mount to the pod.
+                                    Deprecated: AzureFile is deprecated. All operations for the in-tree azureFile type
+                                    are redirected to the file.csi.azure.com CSI driver.
+                                  properties:
+                                    readOnly:
+                                      description: |-
+                                        readOnly defaults to false (read/write). ReadOnly here will force
+                                        the ReadOnly setting in VolumeMounts.
+                                      type: boolean
+                                    secretName:
+                                      description: secretName is the  name of secret
+                                        that contains Azure Storage Account Name and
+                                        Key
+                                      type: string
+                                    shareName:
+                                      description: shareName is the azure share Name
+                                      type: string
+                                  required:
+                                  - secretName
+                                  - shareName
+                                  type: object
+                                cephfs:
+                                  description: |-
+                                    cephFS represents a Ceph FS mount on the host that shares a pod's lifetime.
+                                    Deprecated: CephFS is deprecated and the in-tree cephfs type is no longer supported.
+                                  properties:
+                                    monitors:
+                                      description: |-
+                                        monitors is Required: Monitors is a collection of Ceph monitors
+                                        More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it
+                                      items:
+                                        type: string
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    path:
+                                      description: 'path is Optional: Used as the
+                                        mounted root, rather than the full Ceph tree,
+                                        default is /'
+                                      type: string
+                                    readOnly:
+                                      description: |-
+                                        readOnly is Optional: Defaults to false (read/write). ReadOnly here will force
+                                        the ReadOnly setting in VolumeMounts.
+                                        More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it
+                                      type: boolean
+                                    secretFile:
+                                      description: |-
+                                        secretFile is Optional: SecretFile is the path to key ring for User, default is /etc/ceph/user.secret
+                                        More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it
+                                      type: string
+                                    secretRef:
+                                      description: |-
+                                        secretRef is Optional: SecretRef is reference to the authentication secret for User, default is empty.
+                                        More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it
+                                      properties:
+                                        name:
+                                          default: ""
+                                          description: |-
+                                            Name of the referent.
+                                            This field is effectively required, but due to backwards compatibility is
+                                            allowed to be empty. Instances of this type with an empty value here are
+                                            almost certainly wrong.
+                                            More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                          type: string
+                                      type: object
+                                      x-kubernetes-map-type: atomic
+                                    user:
+                                      description: |-
+                                        user is optional: User is the rados user name, default is admin
+                                        More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it
+                                      type: string
+                                  required:
+                                  - monitors
+                                  type: object
+                                cinder:
+                                  description: |-
+                                    cinder represents a cinder volume attached and mounted on kubelets host machine.
+                                    Deprecated: Cinder is deprecated. All operations for the in-tree cinder type
+                                    are redirected to the cinder.csi.openstack.org CSI driver.
+                                    More info: https://examples.k8s.io/mysql-cinder-pd/README.md
+                                  properties:
+                                    fsType:
+                                      description: |-
+                                        fsType is the filesystem type to mount.
+                                        Must be a filesystem type supported by the host operating system.
+                                        Examples: "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
+                                        More info: https://examples.k8s.io/mysql-cinder-pd/README.md
+                                      type: string
+                                    readOnly:
+                                      description: |-
+                                        readOnly defaults to false (read/write). ReadOnly here will force
+                                        the ReadOnly setting in VolumeMounts.
+                                        More info: https://examples.k8s.io/mysql-cinder-pd/README.md
+                                      type: boolean
+                                    secretRef:
+                                      description: |-
+                                        secretRef is optional: points to a secret object containing parameters used to connect
+                                        to OpenStack.
+                                      properties:
+                                        name:
+                                          default: ""
+                                          description: |-
+                                            Name of the referent.
+                                            This field is effectively required, but due to backwards compatibility is
+                                            allowed to be empty. Instances of this type with an empty value here are
+                                            almost certainly wrong.
+                                            More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                          type: string
+                                      type: object
+                                      x-kubernetes-map-type: atomic
+                                    volumeID:
+                                      description: |-
+                                        volumeID used to identify the volume in cinder.
+                                        More info: https://examples.k8s.io/mysql-cinder-pd/README.md
+                                      type: string
+                                  required:
+                                  - volumeID
+                                  type: object
+                                configMap:
+                                  description: configMap represents a configMap that
+                                    should populate this volume
+                                  properties:
+                                    defaultMode:
+                                      description: |-
+                                        defaultMode is optional: mode bits used to set permissions on created files by default.
+                                        Must be an octal value between 0000 and 0777 or a decimal value between 0 and 511.
+                                        YAML accepts both octal and decimal values, JSON requires decimal values for mode bits.
+                                        Defaults to 0644.
+                                        Directories within the path are not affected by this setting.
+                                        This might be in conflict with other options that affect the file
+                                        mode, like fsGroup, and the result can be other mode bits set.
+                                      format: int32
+                                      type: integer
+                                    items:
+                                      description: |-
+                                        items if unspecified, each key-value pair in the Data field of the referenced
+                                        ConfigMap will be projected into the volume as a file whose name is the
+                                        key and content is the value. If specified, the listed keys will be
+                                        projected into the specified paths, and unlisted keys will not be
+                                        present. If a key is specified which is not present in the ConfigMap,
+                                        the volume setup will error unless it is marked optional. Paths must be
+                                        relative and may not contain the '..' path or start with '..'.
+                                      items:
+                                        description: Maps a string key to a path within
+                                          a volume.
+                                        properties:
+                                          key:
+                                            description: key is the key to project.
+                                            type: string
+                                          mode:
+                                            description: |-
+                                              mode is Optional: mode bits used to set permissions on this file.
+                                              Must be an octal value between 0000 and 0777 or a decimal value between 0 and 511.
+                                              YAML accepts both octal and decimal values, JSON requires decimal values for mode bits.
+                                              If not specified, the volume defaultMode will be used.
+                                              This might be in conflict with other options that affect the file
+                                              mode, like fsGroup, and the result can be other mode bits set.
+                                            format: int32
+                                            type: integer
+                                          path:
+                                            description: |-
+                                              path is the relative path of the file to map the key to.
+                                              May not be an absolute path.
+                                              May not contain the path element '..'.
+                                              May not start with the string '..'.
+                                            type: string
+                                        required:
+                                        - key
+                                        - path
+                                        type: object
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    name:
+                                      default: ""
+                                      description: |-
+                                        Name of the referent.
+                                        This field is effectively required, but due to backwards compatibility is
+                                        allowed to be empty. Instances of this type with an empty value here are
+                                        almost certainly wrong.
+                                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                      type: string
+                                    optional:
+                                      description: optional specify whether the ConfigMap
+                                        or its keys must be defined
+                                      type: boolean
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                csi:
+                                  description: csi (Container Storage Interface) represents
+                                    ephemeral storage that is handled by certain external
+                                    CSI drivers.
+                                  properties:
+                                    driver:
+                                      description: |-
+                                        driver is the name of the CSI driver that handles this volume.
+                                        Consult with your admin for the correct name as registered in the cluster.
+                                      type: string
+                                    fsType:
+                                      description: |-
+                                        fsType to mount. Ex. "ext4", "xfs", "ntfs".
+                                        If not provided, the empty value is passed to the associated CSI driver
+                                        which will determine the default filesystem to apply.
+                                      type: string
+                                    nodePublishSecretRef:
+                                      description: |-
+                                        nodePublishSecretRef is a reference to the secret object containing
+                                        sensitive information to pass to the CSI driver to complete the CSI
+                                        NodePublishVolume and NodeUnpublishVolume calls.
+                                        This field is optional, and  may be empty if no secret is required. If the
+                                        secret object contains more than one secret, all secret references are passed.
+                                      properties:
+                                        name:
+                                          default: ""
+                                          description: |-
+                                            Name of the referent.
+                                            This field is effectively required, but due to backwards compatibility is
+                                            allowed to be empty. Instances of this type with an empty value here are
+                                            almost certainly wrong.
+                                            More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                          type: string
+                                      type: object
+                                      x-kubernetes-map-type: atomic
+                                    readOnly:
+                                      description: |-
+                                        readOnly specifies a read-only configuration for the volume.
+                                        Defaults to false (read/write).
+                                      type: boolean
+                                    volumeAttributes:
+                                      additionalProperties:
+                                        type: string
+                                      description: |-
+                                        volumeAttributes stores driver-specific properties that are passed to the CSI
+                                        driver. Consult your driver's documentation for supported values.
+                                      type: object
+                                  required:
+                                  - driver
+                                  type: object
+                                downwardAPI:
+                                  description: downwardAPI represents downward API
+                                    about the pod that should populate this volume
+                                  properties:
+                                    defaultMode:
+                                      description: |-
+                                        Optional: mode bits to use on created files by default. Must be a
+                                        Optional: mode bits used to set permissions on created files by default.
+                                        Must be an octal value between 0000 and 0777 or a decimal value between 0 and 511.
+                                        YAML accepts both octal and decimal values, JSON requires decimal values for mode bits.
+                                        Defaults to 0644.
+                                        Directories within the path are not affected by this setting.
+                                        This might be in conflict with other options that affect the file
+                                        mode, like fsGroup, and the result can be other mode bits set.
+                                      format: int32
+                                      type: integer
+                                    items:
+                                      description: Items is a list of downward API
+                                        volume file
+                                      items:
+                                        description: DownwardAPIVolumeFile represents
+                                          information to create the file containing
+                                          the pod field
+                                        properties:
+                                          fieldRef:
+                                            description: 'Required: Selects a field
+                                              of the pod: only annotations, labels,
+                                              name, namespace and uid are supported.'
+                                            properties:
+                                              apiVersion:
+                                                description: Version of the schema
+                                                  the FieldPath is written in terms
+                                                  of, defaults to "v1".
+                                                type: string
+                                              fieldPath:
+                                                description: Path of the field to
+                                                  select in the specified API version.
+                                                type: string
+                                            required:
+                                            - fieldPath
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                          mode:
+                                            description: |-
+                                              Optional: mode bits used to set permissions on this file, must be an octal value
+                                              between 0000 and 0777 or a decimal value between 0 and 511.
+                                              YAML accepts both octal and decimal values, JSON requires decimal values for mode bits.
+                                              If not specified, the volume defaultMode will be used.
+                                              This might be in conflict with other options that affect the file
+                                              mode, like fsGroup, and the result can be other mode bits set.
+                                            format: int32
+                                            type: integer
+                                          path:
+                                            description: 'Required: Path is  the relative
+                                              path name of the file to be created.
+                                              Must not be absolute or contain the
+                                              ''..'' path. Must be utf-8 encoded.
+                                              The first item of the relative path
+                                              must not start with ''..'''
+                                            type: string
+                                          resourceFieldRef:
+                                            description: |-
+                                              Selects a resource of the container: only resources limits and requests
+                                              (limits.cpu, limits.memory, requests.cpu and requests.memory) are currently supported.
+                                            properties:
+                                              containerName:
+                                                description: 'Container name: required
+                                                  for volumes, optional for env vars'
+                                                type: string
+                                              divisor:
+                                                anyOf:
+                                                - type: integer
+                                                - type: string
+                                                description: Specifies the output
+                                                  format of the exposed resources,
+                                                  defaults to "1"
+                                                pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                                x-kubernetes-int-or-string: true
+                                              resource:
+                                                description: 'Required: resource to
+                                                  select'
+                                                type: string
+                                            required:
+                                            - resource
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                        required:
+                                        - path
+                                        type: object
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                  type: object
+                                emptyDir:
+                                  description: |-
+                                    emptyDir represents a temporary directory that shares a pod's lifetime.
+                                    More info: https://kubernetes.io/docs/concepts/storage/volumes#emptydir
+                                  properties:
+                                    medium:
+                                      description: |-
+                                        medium represents what type of storage medium should back this directory.
+                                        The default is "" which means to use the node's default medium.
+                                        Must be an empty string (default) or Memory.
+                                        More info: https://kubernetes.io/docs/concepts/storage/volumes#emptydir
+                                      type: string
+                                    sizeLimit:
+                                      anyOf:
+                                      - type: integer
+                                      - type: string
+                                      description: |-
+                                        sizeLimit is the total amount of local storage required for this EmptyDir volume.
+                                        The size limit is also applicable for memory medium.
+                                        The maximum usage on memory medium EmptyDir would be the minimum value between
+                                        the SizeLimit specified here and the sum of memory limits of all containers in a pod.
+                                        The default is nil which means that the limit is undefined.
+                                        More info: https://kubernetes.io/docs/concepts/storage/volumes#emptydir
+                                      pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                      x-kubernetes-int-or-string: true
+                                  type: object
+                                ephemeral:
+                                  description: |-
+                                    ephemeral represents a volume that is handled by a cluster storage driver.
+                                    The volume's lifecycle is tied to the pod that defines it - it will be created before the pod starts,
+                                    and deleted when the pod is removed.
+
+                                    Use this if:
+                                    a) the volume is only needed while the pod runs,
+                                    b) features of normal volumes like restoring from snapshot or capacity
+                                       tracking are needed,
+                                    c) the storage driver is specified through a storage class, and
+                                    d) the storage driver supports dynamic volume provisioning through
+                                       a PersistentVolumeClaim (see EphemeralVolumeSource for more
+                                       information on the connection between this volume type
+                                       and PersistentVolumeClaim).
+
+                                    Use PersistentVolumeClaim or one of the vendor-specific
+                                    APIs for volumes that persist for longer than the lifecycle
+                                    of an individual pod.
+
+                                    Use CSI for light-weight local ephemeral volumes if the CSI driver is meant to
+                                    be used that way - see the documentation of the driver for
+                                    more information.
+
+                                    A pod can use both types of ephemeral volumes and
+                                    persistent volumes at the same time.
+                                  properties:
+                                    volumeClaimTemplate:
+                                      description: |-
+                                        Will be used to create a stand-alone PVC to provision the volume.
+                                        The pod in which this EphemeralVolumeSource is embedded will be the
+                                        owner of the PVC, i.e. the PVC will be deleted together with the
+                                        pod.  The name of the PVC will be `<pod name>-<volume name>` where
+                                        `<volume name>` is the name from the `PodSpec.Volumes` array
+                                        entry. Pod validation will reject the pod if the concatenated name
+                                        is not valid for a PVC (for example, too long).
+
+                                        An existing PVC with that name that is not owned by the pod
+                                        will *not* be used for the pod to avoid using an unrelated
+                                        volume by mistake. Starting the pod is then blocked until
+                                        the unrelated PVC is removed. If such a pre-created PVC is
+                                        meant to be used by the pod, the PVC has to updated with an
+                                        owner reference to the pod once the pod exists. Normally
+                                        this should not be necessary, but it may be useful when
+                                        manually reconstructing a broken cluster.
+
+                                        This field is read-only and no changes will be made by Kubernetes
+                                        to the PVC after it has been created.
+
+                                        Required, must not be nil.
+                                      properties:
+                                        metadata:
+                                          description: |-
+                                            May contain labels and annotations that will be copied into the PVC
+                                            when creating it. No other fields are allowed and will be rejected during
+                                            validation.
+                                          properties:
+                                            annotations:
+                                              additionalProperties:
+                                                type: string
+                                              type: object
+                                            finalizers:
+                                              items:
+                                                type: string
+                                              type: array
+                                            labels:
+                                              additionalProperties:
+                                                type: string
+                                              type: object
+                                            name:
+                                              type: string
+                                            namespace:
+                                              type: string
+                                          type: object
+                                        spec:
+                                          description: |-
+                                            The specification for the PersistentVolumeClaim. The entire content is
+                                            copied unchanged into the PVC that gets created from this
+                                            template. The same fields as in a PersistentVolumeClaim
+                                            are also valid here.
+                                          properties:
+                                            accessModes:
+                                              description: |-
+                                                accessModes contains the desired access modes the volume should have.
+                                                More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#access-modes-1
+                                              items:
+                                                type: string
+                                              type: array
+                                              x-kubernetes-list-type: atomic
+                                            dataSource:
+                                              description: |-
+                                                dataSource field can be used to specify either:
+                                                * An existing VolumeSnapshot object (snapshot.storage.k8s.io/VolumeSnapshot)
+                                                * An existing PVC (PersistentVolumeClaim)
+                                                If the provisioner or an external controller can support the specified data source,
+                                                it will create a new volume based on the contents of the specified data source.
+                                                When the AnyVolumeDataSource feature gate is enabled, dataSource contents will be copied to dataSourceRef,
+                                                and dataSourceRef contents will be copied to dataSource when dataSourceRef.namespace is not specified.
+                                                If the namespace is specified, then dataSourceRef will not be copied to dataSource.
+                                              properties:
+                                                apiGroup:
+                                                  description: |-
+                                                    APIGroup is the group for the resource being referenced.
+                                                    If APIGroup is not specified, the specified Kind must be in the core API group.
+                                                    For any other third-party types, APIGroup is required.
+                                                  type: string
+                                                kind:
+                                                  description: Kind is the type of
+                                                    resource being referenced
+                                                  type: string
+                                                name:
+                                                  description: Name is the name of
+                                                    resource being referenced
+                                                  type: string
+                                              required:
+                                              - kind
+                                              - name
+                                              type: object
+                                              x-kubernetes-map-type: atomic
+                                            dataSourceRef:
+                                              description: |-
+                                                dataSourceRef specifies the object from which to populate the volume with data, if a non-empty
+                                                volume is desired. This may be any object from a non-empty API group (non
+                                                core object) or a PersistentVolumeClaim object.
+                                                When this field is specified, volume binding will only succeed if the type of
+                                                the specified object matches some installed volume populator or dynamic
+                                                provisioner.
+                                                This field will replace the functionality of the dataSource field and as such
+                                                if both fields are non-empty, they must have the same value. For backwards
+                                                compatibility, when namespace isn't specified in dataSourceRef,
+                                                both fields (dataSource and dataSourceRef) will be set to the same
+                                                value automatically if one of them is empty and the other is non-empty.
+                                                When namespace is specified in dataSourceRef,
+                                                dataSource isn't set to the same value and must be empty.
+                                                There are three important differences between dataSource and dataSourceRef:
+                                                * While dataSource only allows two specific types of objects, dataSourceRef
+                                                  allows any non-core object, as well as PersistentVolumeClaim objects.
+                                                * While dataSource ignores disallowed values (dropping them), dataSourceRef
+                                                  preserves all values, and generates an error if a disallowed value is
+                                                  specified.
+                                                * While dataSource only allows local objects, dataSourceRef allows objects
+                                                  in any namespaces.
+                                                (Beta) Using this field requires the AnyVolumeDataSource feature gate to be enabled.
+                                                (Alpha) Using the namespace field of dataSourceRef requires the CrossNamespaceVolumeDataSource feature gate to be enabled.
+                                              properties:
+                                                apiGroup:
+                                                  description: |-
+                                                    APIGroup is the group for the resource being referenced.
+                                                    If APIGroup is not specified, the specified Kind must be in the core API group.
+                                                    For any other third-party types, APIGroup is required.
+                                                  type: string
+                                                kind:
+                                                  description: Kind is the type of
+                                                    resource being referenced
+                                                  type: string
+                                                name:
+                                                  description: Name is the name of
+                                                    resource being referenced
+                                                  type: string
+                                                namespace:
+                                                  description: |-
+                                                    Namespace is the namespace of resource being referenced
+                                                    Note that when a namespace is specified, a gateway.networking.k8s.io/ReferenceGrant object is required in the referent namespace to allow that namespace's owner to accept the reference. See the ReferenceGrant documentation for details.
+                                                    (Alpha) This field requires the CrossNamespaceVolumeDataSource feature gate to be enabled.
+                                                  type: string
+                                              required:
+                                              - kind
+                                              - name
+                                              type: object
+                                            resources:
+                                              description: |-
+                                                resources represents the minimum resources the volume should have.
+                                                Users are allowed to specify resource requirements
+                                                that are lower than previous value but must still be higher than capacity recorded in the
+                                                status field of the claim.
+                                                More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources
+                                              properties:
+                                                limits:
+                                                  additionalProperties:
+                                                    anyOf:
+                                                    - type: integer
+                                                    - type: string
+                                                    pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                                    x-kubernetes-int-or-string: true
+                                                  description: |-
+                                                    Limits describes the maximum amount of compute resources allowed.
+                                                    More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+                                                  type: object
+                                                requests:
+                                                  additionalProperties:
+                                                    anyOf:
+                                                    - type: integer
+                                                    - type: string
+                                                    pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                                    x-kubernetes-int-or-string: true
+                                                  description: |-
+                                                    Requests describes the minimum amount of compute resources required.
+                                                    If Requests is omitted for a container, it defaults to Limits if that is explicitly specified,
+                                                    otherwise to an implementation-defined value. Requests cannot exceed Limits.
+                                                    More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+                                                  type: object
+                                              type: object
+                                            selector:
+                                              description: selector is a label query
+                                                over volumes to consider for binding.
+                                              properties:
+                                                matchExpressions:
+                                                  description: matchExpressions is
+                                                    a list of label selector requirements.
+                                                    The requirements are ANDed.
+                                                  items:
+                                                    description: |-
+                                                      A label selector requirement is a selector that contains values, a key, and an operator that
+                                                      relates the key and values.
+                                                    properties:
+                                                      key:
+                                                        description: key is the label
+                                                          key that the selector applies
+                                                          to.
+                                                        type: string
+                                                      operator:
+                                                        description: |-
+                                                          operator represents a key's relationship to a set of values.
+                                                          Valid operators are In, NotIn, Exists and DoesNotExist.
+                                                        type: string
+                                                      values:
+                                                        description: |-
+                                                          values is an array of string values. If the operator is In or NotIn,
+                                                          the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                                          the values array must be empty. This array is replaced during a strategic
+                                                          merge patch.
+                                                        items:
+                                                          type: string
+                                                        type: array
+                                                        x-kubernetes-list-type: atomic
+                                                    required:
+                                                    - key
+                                                    - operator
+                                                    type: object
+                                                  type: array
+                                                  x-kubernetes-list-type: atomic
+                                                matchLabels:
+                                                  additionalProperties:
+                                                    type: string
+                                                  description: |-
+                                                    matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                                    map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                                    operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                                  type: object
+                                              type: object
+                                              x-kubernetes-map-type: atomic
+                                            storageClassName:
+                                              description: |-
+                                                storageClassName is the name of the StorageClass required by the claim.
+                                                More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#class-1
+                                              type: string
+                                            volumeAttributesClassName:
+                                              description: |-
+                                                volumeAttributesClassName may be used to set the VolumeAttributesClass used by this claim.
+                                                If specified, the CSI driver will create or update the volume with the attributes defined
+                                                in the corresponding VolumeAttributesClass. This has a different purpose than storageClassName,
+                                                it can be changed after the claim is created. An empty string or nil value indicates that no
+                                                VolumeAttributesClass will be applied to the claim. If the claim enters an Infeasible error state,
+                                                this field can be reset to its previous value (including nil) to cancel the modification.
+                                                If the resource referred to by volumeAttributesClass does not exist, this PersistentVolumeClaim will be
+                                                set to a Pending state, as reflected by the modifyVolumeStatus field, until such as a resource
+                                                exists.
+                                                More info: https://kubernetes.io/docs/concepts/storage/volume-attributes-classes/
+                                              type: string
+                                            volumeMode:
+                                              description: |-
+                                                volumeMode defines what type of volume is required by the claim.
+                                                Value of Filesystem is implied when not included in claim spec.
+                                              type: string
+                                            volumeName:
+                                              description: volumeName is the binding
+                                                reference to the PersistentVolume
+                                                backing this claim.
+                                              type: string
+                                          type: object
+                                      required:
+                                      - spec
+                                      type: object
+                                  type: object
+                                fc:
+                                  description: fc represents a Fibre Channel resource
+                                    that is attached to a kubelet's host machine and
+                                    then exposed to the pod.
+                                  properties:
+                                    fsType:
+                                      description: |-
+                                        fsType is the filesystem type to mount.
+                                        Must be a filesystem type supported by the host operating system.
+                                        Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
+                                      type: string
+                                    lun:
+                                      description: 'lun is Optional: FC target lun
+                                        number'
+                                      format: int32
+                                      type: integer
+                                    readOnly:
+                                      description: |-
+                                        readOnly is Optional: Defaults to false (read/write). ReadOnly here will force
+                                        the ReadOnly setting in VolumeMounts.
+                                      type: boolean
+                                    targetWWNs:
+                                      description: 'targetWWNs is Optional: FC target
+                                        worldwide names (WWNs)'
+                                      items:
+                                        type: string
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    wwids:
+                                      description: |-
+                                        wwids Optional: FC volume world wide identifiers (wwids)
+                                        Either wwids or combination of targetWWNs and lun must be set, but not both simultaneously.
+                                      items:
+                                        type: string
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                  type: object
+                                flexVolume:
+                                  description: |-
+                                    flexVolume represents a generic volume resource that is
+                                    provisioned/attached using an exec based plugin.
+                                    Deprecated: FlexVolume is deprecated. Consider using a CSIDriver instead.
+                                  properties:
+                                    driver:
+                                      description: driver is the name of the driver
+                                        to use for this volume.
+                                      type: string
+                                    fsType:
+                                      description: |-
+                                        fsType is the filesystem type to mount.
+                                        Must be a filesystem type supported by the host operating system.
+                                        Ex. "ext4", "xfs", "ntfs". The default filesystem depends on FlexVolume script.
+                                      type: string
+                                    options:
+                                      additionalProperties:
+                                        type: string
+                                      description: 'options is Optional: this field
+                                        holds extra command options if any.'
+                                      type: object
+                                    readOnly:
+                                      description: |-
+                                        readOnly is Optional: defaults to false (read/write). ReadOnly here will force
+                                        the ReadOnly setting in VolumeMounts.
+                                      type: boolean
+                                    secretRef:
+                                      description: |-
+                                        secretRef is Optional: secretRef is reference to the secret object containing
+                                        sensitive information to pass to the plugin scripts. This may be
+                                        empty if no secret object is specified. If the secret object
+                                        contains more than one secret, all secrets are passed to the plugin
+                                        scripts.
+                                      properties:
+                                        name:
+                                          default: ""
+                                          description: |-
+                                            Name of the referent.
+                                            This field is effectively required, but due to backwards compatibility is
+                                            allowed to be empty. Instances of this type with an empty value here are
+                                            almost certainly wrong.
+                                            More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                          type: string
+                                      type: object
+                                      x-kubernetes-map-type: atomic
+                                  required:
+                                  - driver
+                                  type: object
+                                flocker:
+                                  description: |-
+                                    flocker represents a Flocker volume attached to a kubelet's host machine. This depends on the Flocker control service being running.
+                                    Deprecated: Flocker is deprecated and the in-tree flocker type is no longer supported.
+                                  properties:
+                                    datasetName:
+                                      description: |-
+                                        datasetName is Name of the dataset stored as metadata -> name on the dataset for Flocker
+                                        should be considered as deprecated
+                                      type: string
+                                    datasetUUID:
+                                      description: datasetUUID is the UUID of the
+                                        dataset. This is unique identifier of a Flocker
+                                        dataset
+                                      type: string
+                                  type: object
+                                gcePersistentDisk:
+                                  description: |-
+                                    gcePersistentDisk represents a GCE Disk resource that is attached to a
+                                    kubelet's host machine and then exposed to the pod.
+                                    Deprecated: GCEPersistentDisk is deprecated. All operations for the in-tree
+                                    gcePersistentDisk type are redirected to the pd.csi.storage.gke.io CSI driver.
+                                    More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
+                                  properties:
+                                    fsType:
+                                      description: |-
+                                        fsType is filesystem type of the volume that you want to mount.
+                                        Tip: Ensure that the filesystem type is supported by the host operating system.
+                                        Examples: "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
+                                        More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
+                                      type: string
+                                    partition:
+                                      description: |-
+                                        partition is the partition in the volume that you want to mount.
+                                        If omitted, the default is to mount by volume name.
+                                        Examples: For volume /dev/sda1, you specify the partition as "1".
+                                        Similarly, the volume partition for /dev/sda is "0" (or you can leave the property empty).
+                                        More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
+                                      format: int32
+                                      type: integer
+                                    pdName:
+                                      description: |-
+                                        pdName is unique name of the PD resource in GCE. Used to identify the disk in GCE.
+                                        More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
+                                      type: string
+                                    readOnly:
+                                      description: |-
+                                        readOnly here will force the ReadOnly setting in VolumeMounts.
+                                        Defaults to false.
+                                        More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
+                                      type: boolean
+                                  required:
+                                  - pdName
+                                  type: object
+                                gitRepo:
+                                  description: |-
+                                    gitRepo represents a git repository at a particular revision.
+                                    Deprecated: GitRepo is deprecated. To provision a container with a git repo, mount an
+                                    EmptyDir into an InitContainer that clones the repo using git, then mount the EmptyDir
+                                    into the Pod's container.
+                                  properties:
+                                    directory:
+                                      description: |-
+                                        directory is the target directory name.
+                                        Must not contain or start with '..'.  If '.' is supplied, the volume directory will be the
+                                        git repository.  Otherwise, if specified, the volume will contain the git repository in
+                                        the subdirectory with the given name.
+                                      type: string
+                                    repository:
+                                      description: repository is the URL
+                                      type: string
+                                    revision:
+                                      description: revision is the commit hash for
+                                        the specified revision.
+                                      type: string
+                                  required:
+                                  - repository
+                                  type: object
+                                glusterfs:
+                                  description: |-
+                                    glusterfs represents a Glusterfs mount on the host that shares a pod's lifetime.
+                                    Deprecated: Glusterfs is deprecated and the in-tree glusterfs type is no longer supported.
+                                  properties:
+                                    endpoints:
+                                      description: endpoints is the endpoint name
+                                        that details Glusterfs topology.
+                                      type: string
+                                    path:
+                                      description: |-
+                                        path is the Glusterfs volume path.
+                                        More info: https://examples.k8s.io/volumes/glusterfs/README.md#create-a-pod
+                                      type: string
+                                    readOnly:
+                                      description: |-
+                                        readOnly here will force the Glusterfs volume to be mounted with read-only permissions.
+                                        Defaults to false.
+                                        More info: https://examples.k8s.io/volumes/glusterfs/README.md#create-a-pod
+                                      type: boolean
+                                  required:
+                                  - endpoints
+                                  - path
+                                  type: object
+                                hostPath:
+                                  description: |-
+                                    hostPath represents a pre-existing file or directory on the host
+                                    machine that is directly exposed to the container. This is generally
+                                    used for system agents or other privileged things that are allowed
+                                    to see the host machine. Most containers will NOT need this.
+                                    More info: https://kubernetes.io/docs/concepts/storage/volumes#hostpath
+                                  properties:
+                                    path:
+                                      description: |-
+                                        path of the directory on the host.
+                                        If the path is a symlink, it will follow the link to the real path.
+                                        More info: https://kubernetes.io/docs/concepts/storage/volumes#hostpath
+                                      type: string
+                                    type:
+                                      description: |-
+                                        type for HostPath Volume
+                                        Defaults to ""
+                                        More info: https://kubernetes.io/docs/concepts/storage/volumes#hostpath
+                                      type: string
+                                  required:
+                                  - path
+                                  type: object
+                                image:
+                                  description: |-
+                                    image represents an OCI object (a container image or artifact) pulled and mounted on the kubelet's host machine.
+                                    The volume is resolved at pod startup depending on which PullPolicy value is provided:
+
+                                    - Always: the kubelet always attempts to pull the reference. Container creation will fail If the pull fails.
+                                    - Never: the kubelet never pulls the reference and only uses a local image or artifact. Container creation will fail if the reference isn't present.
+                                    - IfNotPresent: the kubelet pulls if the reference isn't already present on disk. Container creation will fail if the reference isn't present and the pull fails.
+
+                                    The volume gets re-resolved if the pod gets deleted and recreated, which means that new remote content will become available on pod recreation.
+                                    A failure to resolve or pull the image during pod startup will block containers from starting and may add significant latency. Failures will be retried using normal volume backoff and will be reported on the pod reason and message.
+                                    The types of objects that may be mounted by this volume are defined by the container runtime implementation on a host machine and at minimum must include all valid types supported by the container image field.
+                                    The OCI object gets mounted in a single directory (spec.containers[*].volumeMounts.mountPath) by merging the manifest layers in the same way as for container images.
+                                    The volume will be mounted read-only (ro) and non-executable files (noexec).
+                                    Sub path mounts for containers are not supported (spec.containers[*].volumeMounts.subpath) before 1.33.
+                                    The field spec.securityContext.fsGroupChangePolicy has no effect on this volume type.
+                                  properties:
+                                    pullPolicy:
+                                      description: |-
+                                        Policy for pulling OCI objects. Possible values are:
+                                        Always: the kubelet always attempts to pull the reference. Container creation will fail If the pull fails.
+                                        Never: the kubelet never pulls the reference and only uses a local image or artifact. Container creation will fail if the reference isn't present.
+                                        IfNotPresent: the kubelet pulls if the reference isn't already present on disk. Container creation will fail if the reference isn't present and the pull fails.
+                                        Defaults to Always if :latest tag is specified, or IfNotPresent otherwise.
+                                      type: string
+                                    reference:
+                                      description: |-
+                                        Required: Image or artifact reference to be used.
+                                        Behaves in the same way as pod.spec.containers[*].image.
+                                        Pull secrets will be assembled in the same way as for the container image by looking up node credentials, SA image pull secrets, and pod spec image pull secrets.
+                                        More info: https://kubernetes.io/docs/concepts/containers/images
+                                        This field is optional to allow higher level config management to default or override
+                                        container images in workload controllers like Deployments and StatefulSets.
+                                      type: string
+                                  type: object
+                                iscsi:
+                                  description: |-
+                                    iscsi represents an ISCSI Disk resource that is attached to a
+                                    kubelet's host machine and then exposed to the pod.
+                                    More info: https://kubernetes.io/docs/concepts/storage/volumes/#iscsi
+                                  properties:
+                                    chapAuthDiscovery:
+                                      description: chapAuthDiscovery defines whether
+                                        support iSCSI Discovery CHAP authentication
+                                      type: boolean
+                                    chapAuthSession:
+                                      description: chapAuthSession defines whether
+                                        support iSCSI Session CHAP authentication
+                                      type: boolean
+                                    fsType:
+                                      description: |-
+                                        fsType is the filesystem type of the volume that you want to mount.
+                                        Tip: Ensure that the filesystem type is supported by the host operating system.
+                                        Examples: "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
+                                        More info: https://kubernetes.io/docs/concepts/storage/volumes#iscsi
+                                      type: string
+                                    initiatorName:
+                                      description: |-
+                                        initiatorName is the custom iSCSI Initiator Name.
+                                        If initiatorName is specified with iscsiInterface simultaneously, new iSCSI interface
+                                        <target portal>:<volume name> will be created for the connection.
+                                      type: string
+                                    iqn:
+                                      description: iqn is the target iSCSI Qualified
+                                        Name.
+                                      type: string
+                                    iscsiInterface:
+                                      default: default
+                                      description: |-
+                                        iscsiInterface is the interface Name that uses an iSCSI transport.
+                                        Defaults to 'default' (tcp).
+                                      type: string
+                                    lun:
+                                      description: lun represents iSCSI Target Lun
+                                        number.
+                                      format: int32
+                                      type: integer
+                                    portals:
+                                      description: |-
+                                        portals is the iSCSI Target Portal List. The portal is either an IP or ip_addr:port if the port
+                                        is other than default (typically TCP ports 860 and 3260).
+                                      items:
+                                        type: string
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    readOnly:
+                                      description: |-
+                                        readOnly here will force the ReadOnly setting in VolumeMounts.
+                                        Defaults to false.
+                                      type: boolean
+                                    secretRef:
+                                      description: secretRef is the CHAP Secret for
+                                        iSCSI target and initiator authentication
+                                      properties:
+                                        name:
+                                          default: ""
+                                          description: |-
+                                            Name of the referent.
+                                            This field is effectively required, but due to backwards compatibility is
+                                            allowed to be empty. Instances of this type with an empty value here are
+                                            almost certainly wrong.
+                                            More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                          type: string
+                                      type: object
+                                      x-kubernetes-map-type: atomic
+                                    targetPortal:
+                                      description: |-
+                                        targetPortal is iSCSI Target Portal. The Portal is either an IP or ip_addr:port if the port
+                                        is other than default (typically TCP ports 860 and 3260).
+                                      type: string
+                                  required:
+                                  - iqn
+                                  - lun
+                                  - targetPortal
+                                  type: object
+                                name:
+                                  description: |-
+                                    name of the volume.
+                                    Must be a DNS_LABEL and unique within the pod.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                nfs:
+                                  description: |-
+                                    nfs represents an NFS mount on the host that shares a pod's lifetime
+                                    More info: https://kubernetes.io/docs/concepts/storage/volumes#nfs
+                                  properties:
+                                    path:
+                                      description: |-
+                                        path that is exported by the NFS server.
+                                        More info: https://kubernetes.io/docs/concepts/storage/volumes#nfs
+                                      type: string
+                                    readOnly:
+                                      description: |-
+                                        readOnly here will force the NFS export to be mounted with read-only permissions.
+                                        Defaults to false.
+                                        More info: https://kubernetes.io/docs/concepts/storage/volumes#nfs
+                                      type: boolean
+                                    server:
+                                      description: |-
+                                        server is the hostname or IP address of the NFS server.
+                                        More info: https://kubernetes.io/docs/concepts/storage/volumes#nfs
+                                      type: string
+                                  required:
+                                  - path
+                                  - server
+                                  type: object
+                                persistentVolumeClaim:
+                                  description: |-
+                                    persistentVolumeClaimVolumeSource represents a reference to a
+                                    PersistentVolumeClaim in the same namespace.
+                                    More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#persistentvolumeclaims
+                                  properties:
+                                    claimName:
+                                      description: |-
+                                        claimName is the name of a PersistentVolumeClaim in the same namespace as the pod using this volume.
+                                        More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#persistentvolumeclaims
+                                      type: string
+                                    readOnly:
+                                      description: |-
+                                        readOnly Will force the ReadOnly setting in VolumeMounts.
+                                        Default false.
+                                      type: boolean
+                                  required:
+                                  - claimName
+                                  type: object
+                                photonPersistentDisk:
+                                  description: |-
+                                    photonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets host machine.
+                                    Deprecated: PhotonPersistentDisk is deprecated and the in-tree photonPersistentDisk type is no longer supported.
+                                  properties:
+                                    fsType:
+                                      description: |-
+                                        fsType is the filesystem type to mount.
+                                        Must be a filesystem type supported by the host operating system.
+                                        Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
+                                      type: string
+                                    pdID:
+                                      description: pdID is the ID that identifies
+                                        Photon Controller persistent disk
+                                      type: string
+                                  required:
+                                  - pdID
+                                  type: object
+                                portworxVolume:
+                                  description: |-
+                                    portworxVolume represents a portworx volume attached and mounted on kubelets host machine.
+                                    Deprecated: PortworxVolume is deprecated. All operations for the in-tree portworxVolume type
+                                    are redirected to the pxd.portworx.com CSI driver when the CSIMigrationPortworx feature-gate
+                                    is on.
+                                  properties:
+                                    fsType:
+                                      description: |-
+                                        fSType represents the filesystem type to mount
+                                        Must be a filesystem type supported by the host operating system.
+                                        Ex. "ext4", "xfs". Implicitly inferred to be "ext4" if unspecified.
+                                      type: string
+                                    readOnly:
+                                      description: |-
+                                        readOnly defaults to false (read/write). ReadOnly here will force
+                                        the ReadOnly setting in VolumeMounts.
+                                      type: boolean
+                                    volumeID:
+                                      description: volumeID uniquely identifies a
+                                        Portworx volume
+                                      type: string
+                                  required:
+                                  - volumeID
+                                  type: object
+                                projected:
+                                  description: projected items for all in one resources
+                                    secrets, configmaps, and downward API
+                                  properties:
+                                    defaultMode:
+                                      description: |-
+                                        defaultMode are the mode bits used to set permissions on created files by default.
+                                        Must be an octal value between 0000 and 0777 or a decimal value between 0 and 511.
+                                        YAML accepts both octal and decimal values, JSON requires decimal values for mode bits.
+                                        Directories within the path are not affected by this setting.
+                                        This might be in conflict with other options that affect the file
+                                        mode, like fsGroup, and the result can be other mode bits set.
+                                      format: int32
+                                      type: integer
+                                    sources:
+                                      description: |-
+                                        sources is the list of volume projections. Each entry in this list
+                                        handles one source.
+                                      items:
+                                        description: |-
+                                          Projection that may be projected along with other supported volume types.
+                                          Exactly one of these fields must be set.
+                                        properties:
+                                          clusterTrustBundle:
+                                            description: |-
+                                              ClusterTrustBundle allows a pod to access the `.spec.trustBundle` field
+                                              of ClusterTrustBundle objects in an auto-updating file.
+
+                                              Alpha, gated by the ClusterTrustBundleProjection feature gate.
+
+                                              ClusterTrustBundle objects can either be selected by name, or by the
+                                              combination of signer name and a label selector.
+
+                                              Kubelet performs aggressive normalization of the PEM contents written
+                                              into the pod filesystem.  Esoteric PEM features such as inter-block
+                                              comments and block headers are stripped.  Certificates are deduplicated.
+                                              The ordering of certificates within the file is arbitrary, and Kubelet
+                                              may change the order over time.
+                                            properties:
+                                              labelSelector:
+                                                description: |-
+                                                  Select all ClusterTrustBundles that match this label selector.  Only has
+                                                  effect if signerName is set.  Mutually-exclusive with name.  If unset,
+                                                  interpreted as "match nothing".  If set but empty, interpreted as "match
+                                                  everything".
+                                                properties:
+                                                  matchExpressions:
+                                                    description: matchExpressions
+                                                      is a list of label selector
+                                                      requirements. The requirements
+                                                      are ANDed.
+                                                    items:
+                                                      description: |-
+                                                        A label selector requirement is a selector that contains values, a key, and an operator that
+                                                        relates the key and values.
+                                                      properties:
+                                                        key:
+                                                          description: key is the
+                                                            label key that the selector
+                                                            applies to.
+                                                          type: string
+                                                        operator:
+                                                          description: |-
+                                                            operator represents a key's relationship to a set of values.
+                                                            Valid operators are In, NotIn, Exists and DoesNotExist.
+                                                          type: string
+                                                        values:
+                                                          description: |-
+                                                            values is an array of string values. If the operator is In or NotIn,
+                                                            the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                                            the values array must be empty. This array is replaced during a strategic
+                                                            merge patch.
+                                                          items:
+                                                            type: string
+                                                          type: array
+                                                          x-kubernetes-list-type: atomic
+                                                      required:
+                                                      - key
+                                                      - operator
+                                                      type: object
+                                                    type: array
+                                                    x-kubernetes-list-type: atomic
+                                                  matchLabels:
+                                                    additionalProperties:
+                                                      type: string
+                                                    description: |-
+                                                      matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                                      map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                                      operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                                    type: object
+                                                type: object
+                                                x-kubernetes-map-type: atomic
+                                              name:
+                                                description: |-
+                                                  Select a single ClusterTrustBundle by object name.  Mutually-exclusive
+                                                  with signerName and labelSelector.
+                                                type: string
+                                              optional:
+                                                description: |-
+                                                  If true, don't block pod startup if the referenced ClusterTrustBundle(s)
+                                                  aren't available.  If using name, then the named ClusterTrustBundle is
+                                                  allowed not to exist.  If using signerName, then the combination of
+                                                  signerName and labelSelector is allowed to match zero
+                                                  ClusterTrustBundles.
+                                                type: boolean
+                                              path:
+                                                description: Relative path from the
+                                                  volume root to write the bundle.
+                                                type: string
+                                              signerName:
+                                                description: |-
+                                                  Select all ClusterTrustBundles that match this signer name.
+                                                  Mutually-exclusive with name.  The contents of all selected
+                                                  ClusterTrustBundles will be unified and deduplicated.
+                                                type: string
+                                            required:
+                                            - path
+                                            type: object
+                                          configMap:
+                                            description: configMap information about
+                                              the configMap data to project
+                                            properties:
+                                              items:
+                                                description: |-
+                                                  items if unspecified, each key-value pair in the Data field of the referenced
+                                                  ConfigMap will be projected into the volume as a file whose name is the
+                                                  key and content is the value. If specified, the listed keys will be
+                                                  projected into the specified paths, and unlisted keys will not be
+                                                  present. If a key is specified which is not present in the ConfigMap,
+                                                  the volume setup will error unless it is marked optional. Paths must be
+                                                  relative and may not contain the '..' path or start with '..'.
+                                                items:
+                                                  description: Maps a string key to
+                                                    a path within a volume.
+                                                  properties:
+                                                    key:
+                                                      description: key is the key
+                                                        to project.
+                                                      type: string
+                                                    mode:
+                                                      description: |-
+                                                        mode is Optional: mode bits used to set permissions on this file.
+                                                        Must be an octal value between 0000 and 0777 or a decimal value between 0 and 511.
+                                                        YAML accepts both octal and decimal values, JSON requires decimal values for mode bits.
+                                                        If not specified, the volume defaultMode will be used.
+                                                        This might be in conflict with other options that affect the file
+                                                        mode, like fsGroup, and the result can be other mode bits set.
+                                                      format: int32
+                                                      type: integer
+                                                    path:
+                                                      description: |-
+                                                        path is the relative path of the file to map the key to.
+                                                        May not be an absolute path.
+                                                        May not contain the path element '..'.
+                                                        May not start with the string '..'.
+                                                      type: string
+                                                  required:
+                                                  - key
+                                                  - path
+                                                  type: object
+                                                type: array
+                                                x-kubernetes-list-type: atomic
+                                              name:
+                                                default: ""
+                                                description: |-
+                                                  Name of the referent.
+                                                  This field is effectively required, but due to backwards compatibility is
+                                                  allowed to be empty. Instances of this type with an empty value here are
+                                                  almost certainly wrong.
+                                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                                type: string
+                                              optional:
+                                                description: optional specify whether
+                                                  the ConfigMap or its keys must be
+                                                  defined
+                                                type: boolean
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                          downwardAPI:
+                                            description: downwardAPI information about
+                                              the downwardAPI data to project
+                                            properties:
+                                              items:
+                                                description: Items is a list of DownwardAPIVolume
+                                                  file
+                                                items:
+                                                  description: DownwardAPIVolumeFile
+                                                    represents information to create
+                                                    the file containing the pod field
+                                                  properties:
+                                                    fieldRef:
+                                                      description: 'Required: Selects
+                                                        a field of the pod: only annotations,
+                                                        labels, name, namespace and
+                                                        uid are supported.'
+                                                      properties:
+                                                        apiVersion:
+                                                          description: Version of
+                                                            the schema the FieldPath
+                                                            is written in terms of,
+                                                            defaults to "v1".
+                                                          type: string
+                                                        fieldPath:
+                                                          description: Path of the
+                                                            field to select in the
+                                                            specified API version.
+                                                          type: string
+                                                      required:
+                                                      - fieldPath
+                                                      type: object
+                                                      x-kubernetes-map-type: atomic
+                                                    mode:
+                                                      description: |-
+                                                        Optional: mode bits used to set permissions on this file, must be an octal value
+                                                        between 0000 and 0777 or a decimal value between 0 and 511.
+                                                        YAML accepts both octal and decimal values, JSON requires decimal values for mode bits.
+                                                        If not specified, the volume defaultMode will be used.
+                                                        This might be in conflict with other options that affect the file
+                                                        mode, like fsGroup, and the result can be other mode bits set.
+                                                      format: int32
+                                                      type: integer
+                                                    path:
+                                                      description: 'Required: Path
+                                                        is  the relative path name
+                                                        of the file to be created.
+                                                        Must not be absolute or contain
+                                                        the ''..'' path. Must be utf-8
+                                                        encoded. The first item of
+                                                        the relative path must not
+                                                        start with ''..'''
+                                                      type: string
+                                                    resourceFieldRef:
+                                                      description: |-
+                                                        Selects a resource of the container: only resources limits and requests
+                                                        (limits.cpu, limits.memory, requests.cpu and requests.memory) are currently supported.
+                                                      properties:
+                                                        containerName:
+                                                          description: 'Container
+                                                            name: required for volumes,
+                                                            optional for env vars'
+                                                          type: string
+                                                        divisor:
+                                                          anyOf:
+                                                          - type: integer
+                                                          - type: string
+                                                          description: Specifies the
+                                                            output format of the exposed
+                                                            resources, defaults to
+                                                            "1"
+                                                          pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                                          x-kubernetes-int-or-string: true
+                                                        resource:
+                                                          description: 'Required:
+                                                            resource to select'
+                                                          type: string
+                                                      required:
+                                                      - resource
+                                                      type: object
+                                                      x-kubernetes-map-type: atomic
+                                                  required:
+                                                  - path
+                                                  type: object
+                                                type: array
+                                                x-kubernetes-list-type: atomic
+                                            type: object
+                                          podCertificate:
+                                            description: |-
+                                              Projects an auto-rotating credential bundle (private key and certificate
+                                              chain) that the pod can use either as a TLS client or server.
+
+                                              Kubelet generates a private key and uses it to send a
+                                              PodCertificateRequest to the named signer.  Once the signer approves the
+                                              request and issues a certificate chain, Kubelet writes the key and
+                                              certificate chain to the pod filesystem.  The pod does not start until
+                                              certificates have been issued for each podCertificate projected volume
+                                              source in its spec.
+
+                                              Kubelet will begin trying to rotate the certificate at the time indicated
+                                              by the signer using the PodCertificateRequest.Status.BeginRefreshAt
+                                              timestamp.
+
+                                              Kubelet can write a single file, indicated by the credentialBundlePath
+                                              field, or separate files, indicated by the keyPath and
+                                              certificateChainPath fields.
+
+                                              The credential bundle is a single file in PEM format.  The first PEM
+                                              entry is the private key (in PKCS#8 format), and the remaining PEM
+                                              entries are the certificate chain issued by the signer (typically,
+                                              signers will return their certificate chain in leaf-to-root order).
+
+                                              Prefer using the credential bundle format, since your application code
+                                              can read it atomically.  If you use keyPath and certificateChainPath,
+                                              your application must make two separate file reads. If these coincide
+                                              with a certificate rotation, it is possible that the private key and leaf
+                                              certificate you read may not correspond to each other.  Your application
+                                              will need to check for this condition, and re-read until they are
+                                              consistent.
+
+                                              The named signer controls chooses the format of the certificate it
+                                              issues; consult the signer implementation's documentation to learn how to
+                                              use the certificates it issues.
+                                            properties:
+                                              certificateChainPath:
+                                                description: |-
+                                                  Write the certificate chain at this path in the projected volume.
+
+                                                  Most applications should use credentialBundlePath.  When using keyPath
+                                                  and certificateChainPath, your application needs to check that the key
+                                                  and leaf certificate are consistent, because it is possible to read the
+                                                  files mid-rotation.
+                                                type: string
+                                              credentialBundlePath:
+                                                description: |-
+                                                  Write the credential bundle at this path in the projected volume.
+
+                                                  The credential bundle is a single file that contains multiple PEM blocks.
+                                                  The first PEM block is a PRIVATE KEY block, containing a PKCS#8 private
+                                                  key.
+
+                                                  The remaining blocks are CERTIFICATE blocks, containing the issued
+                                                  certificate chain from the signer (leaf and any intermediates).
+
+                                                  Using credentialBundlePath lets your Pod's application code make a single
+                                                  atomic read that retrieves a consistent key and certificate chain.  If you
+                                                  project them to separate files, your application code will need to
+                                                  additionally check that the leaf certificate was issued to the key.
+                                                type: string
+                                              keyPath:
+                                                description: |-
+                                                  Write the key at this path in the projected volume.
+
+                                                  Most applications should use credentialBundlePath.  When using keyPath
+                                                  and certificateChainPath, your application needs to check that the key
+                                                  and leaf certificate are consistent, because it is possible to read the
+                                                  files mid-rotation.
+                                                type: string
+                                              keyType:
+                                                description: |-
+                                                  The type of keypair Kubelet will generate for the pod.
+
+                                                  Valid values are "RSA3072", "RSA4096", "ECDSAP256", "ECDSAP384",
+                                                  "ECDSAP521", and "ED25519".
+                                                type: string
+                                              maxExpirationSeconds:
+                                                description: |-
+                                                  maxExpirationSeconds is the maximum lifetime permitted for the
+                                                  certificate.
+
+                                                  Kubelet copies this value verbatim into the PodCertificateRequests it
+                                                  generates for this projection.
+
+                                                  If omitted, kube-apiserver will set it to 86400(24 hours). kube-apiserver
+                                                  will reject values shorter than 3600 (1 hour).  The maximum allowable
+                                                  value is 7862400 (91 days).
+
+                                                  The signer implementation is then free to issue a certificate with any
+                                                  lifetime *shorter* than MaxExpirationSeconds, but no shorter than 3600
+                                                  seconds (1 hour).  This constraint is enforced by kube-apiserver.
+                                                  `kubernetes.io` signers will never issue certificates with a lifetime
+                                                  longer than 24 hours.
+                                                format: int32
+                                                type: integer
+                                              signerName:
+                                                description: Kubelet's generated CSRs
+                                                  will be addressed to this signer.
+                                                type: string
+                                              userAnnotations:
+                                                additionalProperties:
+                                                  type: string
+                                                description: |-
+                                                  userAnnotations allow pod authors to pass additional information to
+                                                  the signer implementation.  Kubernetes does not restrict or validate this
+                                                  metadata in any way.
+
+                                                  These values are copied verbatim into the `spec.unverifiedUserAnnotations` field of
+                                                  the PodCertificateRequest objects that Kubelet creates.
+
+                                                  Entries are subject to the same validation as object metadata annotations,
+                                                  with the addition that all keys must be domain-prefixed. No restrictions
+                                                  are placed on values, except an overall size limitation on the entire field.
+
+                                                  Signers should document the keys and values they support. Signers should
+                                                  deny requests that contain keys they do not recognize.
+                                                type: object
+                                            required:
+                                            - keyType
+                                            - signerName
+                                            type: object
+                                          secret:
+                                            description: secret information about
+                                              the secret data to project
+                                            properties:
+                                              items:
+                                                description: |-
+                                                  items if unspecified, each key-value pair in the Data field of the referenced
+                                                  Secret will be projected into the volume as a file whose name is the
+                                                  key and content is the value. If specified, the listed keys will be
+                                                  projected into the specified paths, and unlisted keys will not be
+                                                  present. If a key is specified which is not present in the Secret,
+                                                  the volume setup will error unless it is marked optional. Paths must be
+                                                  relative and may not contain the '..' path or start with '..'.
+                                                items:
+                                                  description: Maps a string key to
+                                                    a path within a volume.
+                                                  properties:
+                                                    key:
+                                                      description: key is the key
+                                                        to project.
+                                                      type: string
+                                                    mode:
+                                                      description: |-
+                                                        mode is Optional: mode bits used to set permissions on this file.
+                                                        Must be an octal value between 0000 and 0777 or a decimal value between 0 and 511.
+                                                        YAML accepts both octal and decimal values, JSON requires decimal values for mode bits.
+                                                        If not specified, the volume defaultMode will be used.
+                                                        This might be in conflict with other options that affect the file
+                                                        mode, like fsGroup, and the result can be other mode bits set.
+                                                      format: int32
+                                                      type: integer
+                                                    path:
+                                                      description: |-
+                                                        path is the relative path of the file to map the key to.
+                                                        May not be an absolute path.
+                                                        May not contain the path element '..'.
+                                                        May not start with the string '..'.
+                                                      type: string
+                                                  required:
+                                                  - key
+                                                  - path
+                                                  type: object
+                                                type: array
+                                                x-kubernetes-list-type: atomic
+                                              name:
+                                                default: ""
+                                                description: |-
+                                                  Name of the referent.
+                                                  This field is effectively required, but due to backwards compatibility is
+                                                  allowed to be empty. Instances of this type with an empty value here are
+                                                  almost certainly wrong.
+                                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                                type: string
+                                              optional:
+                                                description: optional field specify
+                                                  whether the Secret or its key must
+                                                  be defined
+                                                type: boolean
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                          serviceAccountToken:
+                                            description: serviceAccountToken is information
+                                              about the serviceAccountToken data to
+                                              project
+                                            properties:
+                                              audience:
+                                                description: |-
+                                                  audience is the intended audience of the token. A recipient of a token
+                                                  must identify itself with an identifier specified in the audience of the
+                                                  token, and otherwise should reject the token. The audience defaults to the
+                                                  identifier of the apiserver.
+                                                type: string
+                                              expirationSeconds:
+                                                description: |-
+                                                  expirationSeconds is the requested duration of validity of the service
+                                                  account token. As the token approaches expiration, the kubelet volume
+                                                  plugin will proactively rotate the service account token. The kubelet will
+                                                  start trying to rotate the token if the token is older than 80 percent of
+                                                  its time to live or if the token is older than 24 hours.Defaults to 1 hour
+                                                  and must be at least 10 minutes.
+                                                format: int64
+                                                type: integer
+                                              path:
+                                                description: |-
+                                                  path is the path relative to the mount point of the file to project the
+                                                  token into.
+                                                type: string
+                                            required:
+                                            - path
+                                            type: object
+                                        type: object
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                  type: object
+                                quobyte:
+                                  description: |-
+                                    quobyte represents a Quobyte mount on the host that shares a pod's lifetime.
+                                    Deprecated: Quobyte is deprecated and the in-tree quobyte type is no longer supported.
+                                  properties:
+                                    group:
+                                      description: |-
+                                        group to map volume access to
+                                        Default is no group
+                                      type: string
+                                    readOnly:
+                                      description: |-
+                                        readOnly here will force the Quobyte volume to be mounted with read-only permissions.
+                                        Defaults to false.
+                                      type: boolean
+                                    registry:
+                                      description: |-
+                                        registry represents a single or multiple Quobyte Registry services
+                                        specified as a string as host:port pair (multiple entries are separated with commas)
+                                        which acts as the central registry for volumes
+                                      type: string
+                                    tenant:
+                                      description: |-
+                                        tenant owning the given Quobyte volume in the Backend
+                                        Used with dynamically provisioned Quobyte volumes, value is set by the plugin
+                                      type: string
+                                    user:
+                                      description: |-
+                                        user to map volume access to
+                                        Defaults to serivceaccount user
+                                      type: string
+                                    volume:
+                                      description: volume is a string that references
+                                        an already created Quobyte volume by name.
+                                      type: string
+                                  required:
+                                  - registry
+                                  - volume
+                                  type: object
+                                rbd:
+                                  description: |-
+                                    rbd represents a Rados Block Device mount on the host that shares a pod's lifetime.
+                                    Deprecated: RBD is deprecated and the in-tree rbd type is no longer supported.
+                                  properties:
+                                    fsType:
+                                      description: |-
+                                        fsType is the filesystem type of the volume that you want to mount.
+                                        Tip: Ensure that the filesystem type is supported by the host operating system.
+                                        Examples: "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
+                                        More info: https://kubernetes.io/docs/concepts/storage/volumes#rbd
+                                      type: string
+                                    image:
+                                      description: |-
+                                        image is the rados image name.
+                                        More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it
+                                      type: string
+                                    keyring:
+                                      default: /etc/ceph/keyring
+                                      description: |-
+                                        keyring is the path to key ring for RBDUser.
+                                        Default is /etc/ceph/keyring.
+                                        More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it
+                                      type: string
+                                    monitors:
+                                      description: |-
+                                        monitors is a collection of Ceph monitors.
+                                        More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it
+                                      items:
+                                        type: string
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    pool:
+                                      default: rbd
+                                      description: |-
+                                        pool is the rados pool name.
+                                        Default is rbd.
+                                        More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it
+                                      type: string
+                                    readOnly:
+                                      description: |-
+                                        readOnly here will force the ReadOnly setting in VolumeMounts.
+                                        Defaults to false.
+                                        More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it
+                                      type: boolean
+                                    secretRef:
+                                      description: |-
+                                        secretRef is name of the authentication secret for RBDUser. If provided
+                                        overrides keyring.
+                                        Default is nil.
+                                        More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it
+                                      properties:
+                                        name:
+                                          default: ""
+                                          description: |-
+                                            Name of the referent.
+                                            This field is effectively required, but due to backwards compatibility is
+                                            allowed to be empty. Instances of this type with an empty value here are
+                                            almost certainly wrong.
+                                            More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                          type: string
+                                      type: object
+                                      x-kubernetes-map-type: atomic
+                                    user:
+                                      default: admin
+                                      description: |-
+                                        user is the rados user name.
+                                        Default is admin.
+                                        More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it
+                                      type: string
+                                  required:
+                                  - image
+                                  - monitors
+                                  type: object
+                                scaleIO:
+                                  description: |-
+                                    scaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.
+                                    Deprecated: ScaleIO is deprecated and the in-tree scaleIO type is no longer supported.
+                                  properties:
+                                    fsType:
+                                      default: xfs
+                                      description: |-
+                                        fsType is the filesystem type to mount.
+                                        Must be a filesystem type supported by the host operating system.
+                                        Ex. "ext4", "xfs", "ntfs".
+                                        Default is "xfs".
+                                      type: string
+                                    gateway:
+                                      description: gateway is the host address of
+                                        the ScaleIO API Gateway.
+                                      type: string
+                                    protectionDomain:
+                                      description: protectionDomain is the name of
+                                        the ScaleIO Protection Domain for the configured
+                                        storage.
+                                      type: string
+                                    readOnly:
+                                      description: |-
+                                        readOnly Defaults to false (read/write). ReadOnly here will force
+                                        the ReadOnly setting in VolumeMounts.
+                                      type: boolean
+                                    secretRef:
+                                      description: |-
+                                        secretRef references to the secret for ScaleIO user and other
+                                        sensitive information. If this is not provided, Login operation will fail.
+                                      properties:
+                                        name:
+                                          default: ""
+                                          description: |-
+                                            Name of the referent.
+                                            This field is effectively required, but due to backwards compatibility is
+                                            allowed to be empty. Instances of this type with an empty value here are
+                                            almost certainly wrong.
+                                            More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                          type: string
+                                      type: object
+                                      x-kubernetes-map-type: atomic
+                                    sslEnabled:
+                                      description: sslEnabled Flag enable/disable
+                                        SSL communication with Gateway, default false
+                                      type: boolean
+                                    storageMode:
+                                      default: ThinProvisioned
+                                      description: |-
+                                        storageMode indicates whether the storage for a volume should be ThickProvisioned or ThinProvisioned.
+                                        Default is ThinProvisioned.
+                                      type: string
+                                    storagePool:
+                                      description: storagePool is the ScaleIO Storage
+                                        Pool associated with the protection domain.
+                                      type: string
+                                    system:
+                                      description: system is the name of the storage
+                                        system as configured in ScaleIO.
+                                      type: string
+                                    volumeName:
+                                      description: |-
+                                        volumeName is the name of a volume already created in the ScaleIO system
+                                        that is associated with this volume source.
+                                      type: string
+                                  required:
+                                  - gateway
+                                  - secretRef
+                                  - system
+                                  type: object
+                                secret:
+                                  description: |-
+                                    secret represents a secret that should populate this volume.
+                                    More info: https://kubernetes.io/docs/concepts/storage/volumes#secret
+                                  properties:
+                                    defaultMode:
+                                      description: |-
+                                        defaultMode is Optional: mode bits used to set permissions on created files by default.
+                                        Must be an octal value between 0000 and 0777 or a decimal value between 0 and 511.
+                                        YAML accepts both octal and decimal values, JSON requires decimal values
+                                        for mode bits. Defaults to 0644.
+                                        Directories within the path are not affected by this setting.
+                                        This might be in conflict with other options that affect the file
+                                        mode, like fsGroup, and the result can be other mode bits set.
+                                      format: int32
+                                      type: integer
+                                    items:
+                                      description: |-
+                                        items If unspecified, each key-value pair in the Data field of the referenced
+                                        Secret will be projected into the volume as a file whose name is the
+                                        key and content is the value. If specified, the listed keys will be
+                                        projected into the specified paths, and unlisted keys will not be
+                                        present. If a key is specified which is not present in the Secret,
+                                        the volume setup will error unless it is marked optional. Paths must be
+                                        relative and may not contain the '..' path or start with '..'.
+                                      items:
+                                        description: Maps a string key to a path within
+                                          a volume.
+                                        properties:
+                                          key:
+                                            description: key is the key to project.
+                                            type: string
+                                          mode:
+                                            description: |-
+                                              mode is Optional: mode bits used to set permissions on this file.
+                                              Must be an octal value between 0000 and 0777 or a decimal value between 0 and 511.
+                                              YAML accepts both octal and decimal values, JSON requires decimal values for mode bits.
+                                              If not specified, the volume defaultMode will be used.
+                                              This might be in conflict with other options that affect the file
+                                              mode, like fsGroup, and the result can be other mode bits set.
+                                            format: int32
+                                            type: integer
+                                          path:
+                                            description: |-
+                                              path is the relative path of the file to map the key to.
+                                              May not be an absolute path.
+                                              May not contain the path element '..'.
+                                              May not start with the string '..'.
+                                            type: string
+                                        required:
+                                        - key
+                                        - path
+                                        type: object
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    optional:
+                                      description: optional field specify whether
+                                        the Secret or its keys must be defined
+                                      type: boolean
+                                    secretName:
+                                      description: |-
+                                        secretName is the name of the secret in the pod's namespace to use.
+                                        More info: https://kubernetes.io/docs/concepts/storage/volumes#secret
+                                      type: string
+                                  type: object
+                                storageos:
+                                  description: |-
+                                    storageOS represents a StorageOS volume attached and mounted on Kubernetes nodes.
+                                    Deprecated: StorageOS is deprecated and the in-tree storageos type is no longer supported.
+                                  properties:
+                                    fsType:
+                                      description: |-
+                                        fsType is the filesystem type to mount.
+                                        Must be a filesystem type supported by the host operating system.
+                                        Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
+                                      type: string
+                                    readOnly:
+                                      description: |-
+                                        readOnly defaults to false (read/write). ReadOnly here will force
+                                        the ReadOnly setting in VolumeMounts.
+                                      type: boolean
+                                    secretRef:
+                                      description: |-
+                                        secretRef specifies the secret to use for obtaining the StorageOS API
+                                        credentials.  If not specified, default values will be attempted.
+                                      properties:
+                                        name:
+                                          default: ""
+                                          description: |-
+                                            Name of the referent.
+                                            This field is effectively required, but due to backwards compatibility is
+                                            allowed to be empty. Instances of this type with an empty value here are
+                                            almost certainly wrong.
+                                            More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                          type: string
+                                      type: object
+                                      x-kubernetes-map-type: atomic
+                                    volumeName:
+                                      description: |-
+                                        volumeName is the human-readable name of the StorageOS volume.  Volume
+                                        names are only unique within a namespace.
+                                      type: string
+                                    volumeNamespace:
+                                      description: |-
+                                        volumeNamespace specifies the scope of the volume within StorageOS.  If no
+                                        namespace is specified then the Pod's namespace will be used.  This allows the
+                                        Kubernetes name scoping to be mirrored within StorageOS for tighter integration.
+                                        Set VolumeName to any name to override the default behaviour.
+                                        Set to "default" if you are not using namespaces within StorageOS.
+                                        Namespaces that do not pre-exist within StorageOS will be created.
+                                      type: string
+                                  type: object
+                                vsphereVolume:
+                                  description: |-
+                                    vsphereVolume represents a vSphere volume attached and mounted on kubelets host machine.
+                                    Deprecated: VsphereVolume is deprecated. All operations for the in-tree vsphereVolume type
+                                    are redirected to the csi.vsphere.vmware.com CSI driver.
+                                  properties:
+                                    fsType:
+                                      description: |-
+                                        fsType is filesystem type to mount.
+                                        Must be a filesystem type supported by the host operating system.
+                                        Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
+                                      type: string
+                                    storagePolicyID:
+                                      description: storagePolicyID is the storage
+                                        Policy Based Management (SPBM) profile ID
+                                        associated with the StoragePolicyName.
+                                      type: string
+                                    storagePolicyName:
+                                      description: storagePolicyName is the storage
+                                        Policy Based Management (SPBM) profile name.
+                                      type: string
+                                    volumePath:
+                                      description: volumePath is the path that identifies
+                                        vSphere volume vmdk
+                                      type: string
+                                  required:
+                                  - volumePath
+                                  type: object
+                              required:
+                              - name
+                              type: object
+                            type: array
+                            x-kubernetes-list-map-keys:
+                            - name
+                            x-kubernetes-list-type: map
+                          workloadRef:
+                            description: |-
+                              WorkloadRef provides a reference to the Workload object that this Pod belongs to.
+                              This field is used by the scheduler to identify the PodGroup and apply the
+                              correct group scheduling policies. The Workload object referenced
+                              by this field may not exist at the time the Pod is created.
+                              This field is immutable, but a Workload object with the same name
+                              may be recreated with different policies. Doing this during pod scheduling
+                              may result in the placement not conforming to the expected policies.
+                            properties:
+                              name:
+                                description: |-
+                                  Name defines the name of the Workload object this Pod belongs to.
+                                  Workload must be in the same namespace as the Pod.
+                                  If it doesn't match any existing Workload, the Pod will remain unschedulable
+                                  until a Workload object is created and observed by the kube-scheduler.
+                                  It must be a DNS subdomain.
+                                type: string
+                              podGroup:
+                                description: |-
+                                  PodGroup is the name of the PodGroup within the Workload that this Pod
+                                  belongs to. If it doesn't match any existing PodGroup within the Workload,
+                                  the Pod will remain unschedulable until the Workload object is recreated
+                                  and observed by the kube-scheduler. It must be a DNS label.
+                                type: string
+                              podGroupReplicaKey:
+                                description: |-
+                                  PodGroupReplicaKey specifies the replica key of the PodGroup to which this
+                                  Pod belongs. It is used to distinguish pods belonging to different replicas
+                                  of the same pod group. The pod group policy is applied separately to each replica.
+                                  When set, it must be a DNS label.
+                                type: string
+                            required:
+                            - name
+                            - podGroup
+                            type: object
+                        required:
+                        - containers
+                        type: object
+                    type: object
+                  ttlSecondsAfterFinished:
+                    description: |-
+                      ttlSecondsAfterFinished limits the lifetime of a Job that has finished
+                      execution (either Complete or Failed). If this field is set,
+                      ttlSecondsAfterFinished after the Job finishes, it is eligible to be
+                      automatically deleted. When the Job is being deleted, its lifecycle
+                      guarantees (e.g. finalizers) will be honored. If this field is unset,
+                      the Job won't be automatically deleted. If this field is set to zero,
+                      the Job becomes eligible to be deleted immediately after it finishes.
+                    format: int32
+                    type: integer
+                required:
+                - template
+                type: object
+              maxReplicaCount:
+                format: int32
+                minimum: 1
+                type: integer
+              minReplicaCount:
+                format: int32
+                minimum: 0
+                type: integer
+              pollingInterval:
+                format: int32
+                minimum: 1
+                type: integer
+              rollout:
+                description: Rollout defines the strategy for job rollouts
+                properties:
+                  propagationPolicy:
+                    enum:
+                    - foreground
+                    - background
+                    type: string
+                  strategy:
+                    enum:
+                    - gradual
+                    - immediate
+                    type: string
+                type: object
+              rolloutStrategy:
+                description: 'Deprecated: Use Rollout.Strategy instead (see https://github.com/kedacore/keda/issues/3596).'
+                enum:
+                - gradual
+                - immediate
+                type: string
+              scalingStrategy:
+                description: ScalingStrategy defines the strategy of Scaling
+                properties:
+                  customScalingQueueLengthDeduction:
+                    format: int32
+                    type: integer
+                  customScalingRunningJobPercentage:
+                    type: string
+                  multipleScalersCalculation:
+                    enum:
+                    - min
+                    - avg
+                    - sum
+                    - max
+                    type: string
+                  pendingPodConditions:
+                    items:
+                      type: string
+                    type: array
+                  strategy:
+                    enum:
+                    - default
+                    - custom
+                    - accurate
+                    - eager
+                    type: string
+                type: object
+              successfulJobsHistoryLimit:
+                format: int32
+                minimum: 0
+                type: integer
+              triggers:
+                items:
+                  description: ScaleTriggers reference the scaler that will be used
+                  properties:
+                    authenticationRef:
+                      description: |-
+                        AuthenticationRef points to the TriggerAuthentication or ClusterTriggerAuthentication object that
+                        is used to authenticate the scaler with the environment
+                      properties:
+                        kind:
+                          description: Kind of the resource being referred to. Defaults
+                            to TriggerAuthentication.
+                          enum:
+                          - TriggerAuthentication
+                          - ClusterTriggerAuthentication
+                          type: string
+                        name:
+                          type: string
+                      required:
+                      - name
+                      type: object
+                    metadata:
+                      additionalProperties:
+                        type: string
+                      type: object
+                    name:
+                      type: string
+                    type:
+                      minLength: 1
+                      type: string
+                    useCachedMetrics:
+                      type: boolean
+                  required:
+                  - metadata
+                  - type
+                  type: object
+                minItems: 1
+                type: array
+            required:
+            - jobTargetRef
+            - triggers
+            type: object
+          status:
+            description: ScaledJobStatus defines the observed state of ScaledJob
+            properties:
+              Paused:
+                type: string
+              authenticationsTypes:
+                type: string
+              conditions:
+                description: Conditions an array representation to store multiple
+                  Conditions
+                items:
+                  description: Condition to store the condition state
+                  properties:
+                    message:
+                      description: A human readable message indicating details about
+                        the transition.
+                      type: string
+                    reason:
+                      description: The reason for the condition's last transition.
+                      type: string
+                    status:
+                      description: Status of the condition, one of True, False, Unknown.
+                      type: string
+                    type:
+                      description: Type of condition
+                      type: string
+                  required:
+                  - status
+                  - type
+                  type: object
+                type: array
+              externalMetricNames:
+                items:
+                  type: string
+                type: array
+              lastActiveTime:
+                format: date-time
+                type: string
+              triggersActivity:
+                additionalProperties:
+                  description: TriggerActivityStatus represents the activity status
+                    of an external trigger
+                  properties:
+                    isActive:
+                      type: boolean
+                  type: object
+                type: object
+              triggersTypes:
+                type: string
+            type: object
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}
+{{- end -}}
diff --git a/packages/system/keda/charts/keda/templates/crds/crd-scaledobjects.yaml b/packages/system/keda/charts/keda/templates/crds/crd-scaledobjects.yaml
new file mode 100644
index 0000000000..dff82822e9
--- /dev/null
+++ b/packages/system/keda/charts/keda/templates/crds/crd-scaledobjects.yaml
@@ -0,0 +1,491 @@
+{{- if .Values.crds.install }}
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.21.0
+    {{- if (or .Values.crds.additionalAnnotations .Values.additionalAnnotations) }}
+    {{- toYaml (merge .Values.crds.additionalAnnotations .Values.additionalAnnotations) | nindent 4 }}
+    {{- end }}
+  labels:
+    app.kubernetes.io/name: {{ .Values.operator.name }}
+    {{- include "keda.crd-labels" . | indent 4 }}
+  name: scaledobjects.keda.sh
+spec:
+  group: keda.sh
+  names:
+    kind: ScaledObject
+    listKind: ScaledObjectList
+    plural: scaledobjects
+    shortNames:
+    - so
+    singular: scaledobject
+  scope: Namespaced
+  versions:
+  - additionalPrinterColumns:
+    - jsonPath: .status.scaleTargetKind
+      name: ScaleTargetKind
+      type: string
+    - jsonPath: .spec.scaleTargetRef.name
+      name: ScaleTargetName
+      type: string
+    - jsonPath: .spec.minReplicaCount
+      name: Min
+      type: integer
+    - jsonPath: .spec.maxReplicaCount
+      name: Max
+      type: integer
+    - jsonPath: .status.conditions[?(@.type=="Ready")].status
+      name: Ready
+      type: string
+    - jsonPath: .status.conditions[?(@.type=="Active")].status
+      name: Active
+      type: string
+    - jsonPath: .status.conditions[?(@.type=="Fallback")].status
+      name: Fallback
+      type: string
+    - jsonPath: .status.conditions[?(@.type=="Paused")].status
+      name: Paused
+      type: string
+    - jsonPath: .status.triggersTypes
+      name: Triggers
+      type: string
+    - jsonPath: .status.authenticationsTypes
+      name: Authentications
+      type: string
+    - jsonPath: .metadata.creationTimestamp
+      name: Age
+      type: date
+    name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        description: ScaledObject is a specification for a ScaledObject resource
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: ScaledObjectSpec is the spec for a ScaledObject resource
+            properties:
+              advanced:
+                description: AdvancedConfig specifies advance scaling options
+                properties:
+                  horizontalPodAutoscalerConfig:
+                    description: HorizontalPodAutoscalerConfig specifies horizontal
+                      scale config
+                    properties:
+                      behavior:
+                        description: |-
+                          HorizontalPodAutoscalerBehavior configures the scaling behavior of the target
+                          in both Up and Down directions (scaleUp and scaleDown fields respectively).
+                        properties:
+                          scaleDown:
+                            description: |-
+                              scaleDown is scaling policy for scaling Down.
+                              If not set, the default value is to allow to scale down to minReplicas pods, with a
+                              300 second stabilization window (i.e., the highest recommendation for
+                              the last 300sec is used).
+                            properties:
+                              policies:
+                                description: |-
+                                  policies is a list of potential scaling polices which can be used during scaling.
+                                  If not set, use the default values:
+                                  - For scale up: allow doubling the number of pods, or an absolute change of 4 pods in a 15s window.
+                                  - For scale down: allow all pods to be removed in a 15s window.
+                                items:
+                                  description: HPAScalingPolicy is a single policy
+                                    which must hold true for a specified past interval.
+                                  properties:
+                                    periodSeconds:
+                                      description: |-
+                                        periodSeconds specifies the window of time for which the policy should hold true.
+                                        PeriodSeconds must be greater than zero and less than or equal to 1800 (30 min).
+                                      format: int32
+                                      type: integer
+                                    type:
+                                      description: type is used to specify the scaling
+                                        policy.
+                                      type: string
+                                    value:
+                                      description: |-
+                                        value contains the amount of change which is permitted by the policy.
+                                        It must be greater than zero
+                                      format: int32
+                                      type: integer
+                                  required:
+                                  - periodSeconds
+                                  - type
+                                  - value
+                                  type: object
+                                type: array
+                                x-kubernetes-list-type: atomic
+                              selectPolicy:
+                                description: |-
+                                  selectPolicy is used to specify which policy should be used.
+                                  If not set, the default value Max is used.
+                                type: string
+                              stabilizationWindowSeconds:
+                                description: |-
+                                  stabilizationWindowSeconds is the number of seconds for which past recommendations should be
+                                  considered while scaling up or scaling down.
+                                  StabilizationWindowSeconds must be greater than or equal to zero and less than or equal to 3600 (one hour).
+                                  If not set, use the default values:
+                                  - For scale up: 0 (i.e. no stabilization is done).
+                                  - For scale down: 300 (i.e. the stabilization window is 300 seconds long).
+                                format: int32
+                                maximum: 3600
+                                minimum: 0
+                                type: integer
+                              tolerance:
+                                anyOf:
+                                - type: integer
+                                - type: string
+                                description: |-
+                                  tolerance is the tolerance on the ratio between the current and desired
+                                  metric value under which no updates are made to the desired number of
+                                  replicas (e.g. 0.01 for 1%). Must be greater than or equal to zero. If not
+                                  set, the default cluster-wide tolerance is applied (by default 10%).
+
+                                  For example, if autoscaling is configured with a memory consumption target of 100Mi,
+                                  and scale-down and scale-up tolerances of 5% and 1% respectively, scaling will be
+                                  triggered when the actual consumption falls below 95Mi or exceeds 101Mi.
+
+                                  This is an beta field and requires the HPAConfigurableTolerance feature
+                                  gate to be enabled.
+                                pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                x-kubernetes-int-or-string: true
+                            type: object
+                          scaleUp:
+                            description: |-
+                              scaleUp is scaling policy for scaling Up.
+                              If not set, the default value is the higher of:
+                                * increase no more than 4 pods per 60 seconds
+                                * double the number of pods per 60 seconds
+                              No stabilization is used.
+                            properties:
+                              policies:
+                                description: |-
+                                  policies is a list of potential scaling polices which can be used during scaling.
+                                  If not set, use the default values:
+                                  - For scale up: allow doubling the number of pods, or an absolute change of 4 pods in a 15s window.
+                                  - For scale down: allow all pods to be removed in a 15s window.
+                                items:
+                                  description: HPAScalingPolicy is a single policy
+                                    which must hold true for a specified past interval.
+                                  properties:
+                                    periodSeconds:
+                                      description: |-
+                                        periodSeconds specifies the window of time for which the policy should hold true.
+                                        PeriodSeconds must be greater than zero and less than or equal to 1800 (30 min).
+                                      format: int32
+                                      type: integer
+                                    type:
+                                      description: type is used to specify the scaling
+                                        policy.
+                                      type: string
+                                    value:
+                                      description: |-
+                                        value contains the amount of change which is permitted by the policy.
+                                        It must be greater than zero
+                                      format: int32
+                                      type: integer
+                                  required:
+                                  - periodSeconds
+                                  - type
+                                  - value
+                                  type: object
+                                type: array
+                                x-kubernetes-list-type: atomic
+                              selectPolicy:
+                                description: |-
+                                  selectPolicy is used to specify which policy should be used.
+                                  If not set, the default value Max is used.
+                                type: string
+                              stabilizationWindowSeconds:
+                                description: |-
+                                  stabilizationWindowSeconds is the number of seconds for which past recommendations should be
+                                  considered while scaling up or scaling down.
+                                  StabilizationWindowSeconds must be greater than or equal to zero and less than or equal to 3600 (one hour).
+                                  If not set, use the default values:
+                                  - For scale up: 0 (i.e. no stabilization is done).
+                                  - For scale down: 300 (i.e. the stabilization window is 300 seconds long).
+                                format: int32
+                                maximum: 3600
+                                minimum: 0
+                                type: integer
+                              tolerance:
+                                anyOf:
+                                - type: integer
+                                - type: string
+                                description: |-
+                                  tolerance is the tolerance on the ratio between the current and desired
+                                  metric value under which no updates are made to the desired number of
+                                  replicas (e.g. 0.01 for 1%). Must be greater than or equal to zero. If not
+                                  set, the default cluster-wide tolerance is applied (by default 10%).
+
+                                  For example, if autoscaling is configured with a memory consumption target of 100Mi,
+                                  and scale-down and scale-up tolerances of 5% and 1% respectively, scaling will be
+                                  triggered when the actual consumption falls below 95Mi or exceeds 101Mi.
+
+                                  This is an beta field and requires the HPAConfigurableTolerance feature
+                                  gate to be enabled.
+                                pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                x-kubernetes-int-or-string: true
+                            type: object
+                        type: object
+                      name:
+                        type: string
+                    type: object
+                  restoreToOriginalReplicaCount:
+                    type: boolean
+                  scalingModifiers:
+                    description: ScalingModifiers describes advanced scaling logic
+                      options like formula
+                    properties:
+                      activationTarget:
+                        type: string
+                      formula:
+                        type: string
+                      metricType:
+                        description: |-
+                          MetricTargetType specifies the type of metric being targeted, and should be either
+                          "Value", "AverageValue", or "Utilization"
+                        enum:
+                        - AverageValue
+                        - Value
+                        type: string
+                      target:
+                        type: string
+                    type: object
+                type: object
+              cooldownPeriod:
+                format: int32
+                minimum: 0
+                type: integer
+              fallback:
+                description: Fallback is the spec for fallback options
+                properties:
+                  behavior:
+                    default: static
+                    enum:
+                    - static
+                    - currentReplicas
+                    - currentReplicasIfHigher
+                    - currentReplicasIfLower
+                    - scalingModifiers
+                    type: string
+                  failureThreshold:
+                    format: int32
+                    minimum: 0
+                    type: integer
+                  replicas:
+                    format: int32
+                    minimum: 0
+                    type: integer
+                required:
+                - failureThreshold
+                - replicas
+                type: object
+              idleReplicaCount:
+                format: int32
+                minimum: 0
+                type: integer
+              initialCooldownPeriod:
+                format: int32
+                minimum: 0
+                type: integer
+              maxReplicaCount:
+                format: int32
+                minimum: 1
+                type: integer
+              minReplicaCount:
+                format: int32
+                minimum: 0
+                type: integer
+              pollingInterval:
+                format: int32
+                minimum: 1
+                type: integer
+              scaleTargetRef:
+                description: ScaleTarget holds the reference to the scale target Object
+                properties:
+                  apiVersion:
+                    type: string
+                  envSourceContainerName:
+                    type: string
+                  kind:
+                    type: string
+                  name:
+                    minLength: 1
+                    type: string
+                required:
+                - name
+                type: object
+              triggers:
+                items:
+                  description: ScaleTriggers reference the scaler that will be used
+                  properties:
+                    authenticationRef:
+                      description: |-
+                        AuthenticationRef points to the TriggerAuthentication or ClusterTriggerAuthentication object that
+                        is used to authenticate the scaler with the environment
+                      properties:
+                        kind:
+                          description: Kind of the resource being referred to. Defaults
+                            to TriggerAuthentication.
+                          enum:
+                          - TriggerAuthentication
+                          - ClusterTriggerAuthentication
+                          type: string
+                        name:
+                          type: string
+                      required:
+                      - name
+                      type: object
+                    metadata:
+                      additionalProperties:
+                        type: string
+                      type: object
+                    metricType:
+                      description: |-
+                        MetricTargetType specifies the type of metric being targeted, and should be either
+                        "Value", "AverageValue", or "Utilization"
+                      type: string
+                    name:
+                      type: string
+                    type:
+                      minLength: 1
+                      type: string
+                    useCachedMetrics:
+                      type: boolean
+                  required:
+                  - metadata
+                  - type
+                  type: object
+                minItems: 1
+                type: array
+            required:
+            - scaleTargetRef
+            - triggers
+            type: object
+            x-kubernetes-validations:
+            - message: minReplicaCount must be less than or equal to maxReplicaCount
+              rule: '!has(self.minReplicaCount) || self.minReplicaCount <= (has(self.maxReplicaCount)
+                ? self.maxReplicaCount : 100)'
+          status:
+            description: ScaledObjectStatus is the status for a ScaledObject resource
+            properties:
+              authenticationsTypes:
+                type: string
+              compositeScalerName:
+                type: string
+              conditions:
+                description: Conditions an array representation to store multiple
+                  Conditions
+                items:
+                  description: Condition to store the condition state
+                  properties:
+                    message:
+                      description: A human readable message indicating details about
+                        the transition.
+                      type: string
+                    reason:
+                      description: The reason for the condition's last transition.
+                      type: string
+                    status:
+                      description: Status of the condition, one of True, False, Unknown.
+                      type: string
+                    type:
+                      description: Type of condition
+                      type: string
+                  required:
+                  - status
+                  - type
+                  type: object
+                type: array
+              externalMetricNames:
+                items:
+                  type: string
+                type: array
+              health:
+                additionalProperties:
+                  description: HealthStatus is the status for a ScaledObject's health
+                  properties:
+                    numberOfFailures:
+                      format: int32
+                      type: integer
+                    status:
+                      description: HealthStatusType is an indication of whether the
+                        health status is happy or failing
+                      type: string
+                  type: object
+                type: object
+              hpaName:
+                type: string
+              lastActiveTime:
+                format: date-time
+                type: string
+              originalReplicaCount:
+                format: int32
+                type: integer
+              pausedReplicaCount:
+                format: int32
+                type: integer
+              resourceMetricNames:
+                items:
+                  type: string
+                type: array
+              scaleTargetGVKR:
+                description: GroupVersionKindResource provides unified structure for
+                  schema.GroupVersionKind and Resource
+                properties:
+                  group:
+                    type: string
+                  kind:
+                    type: string
+                  resource:
+                    type: string
+                  version:
+                    type: string
+                required:
+                - group
+                - kind
+                - resource
+                - version
+                type: object
+              scaleTargetKind:
+                type: string
+              triggersActivity:
+                additionalProperties:
+                  description: TriggerActivityStatus represents the activity status
+                    of an external trigger
+                  properties:
+                    isActive:
+                      type: boolean
+                  type: object
+                type: object
+              triggersTypes:
+                type: string
+            type: object
+        required:
+        - spec
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}
+{{- end -}}
diff --git a/packages/system/keda/charts/keda/templates/crds/crd-triggerauthentications.yaml b/packages/system/keda/charts/keda/templates/crds/crd-triggerauthentications.yaml
new file mode 100644
index 0000000000..0a36c736fb
--- /dev/null
+++ b/packages/system/keda/charts/keda/templates/crds/crd-triggerauthentications.yaml
@@ -0,0 +1,668 @@
+{{- if .Values.crds.install }}
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.21.0
+    {{- if (or .Values.crds.additionalAnnotations .Values.additionalAnnotations) }}
+    {{- toYaml (merge .Values.crds.additionalAnnotations .Values.additionalAnnotations) | nindent 4 }}
+    {{- end }}
+  labels:
+    app.kubernetes.io/name: {{ .Values.operator.name }}
+    {{- include "keda.crd-labels" . | indent 4 }}
+  name: triggerauthentications.keda.sh
+spec:
+  group: keda.sh
+  names:
+    kind: TriggerAuthentication
+    listKind: TriggerAuthenticationList
+    plural: triggerauthentications
+    shortNames:
+    - ta
+    - triggerauth
+    singular: triggerauthentication
+  scope: Namespaced
+  versions:
+  - additionalPrinterColumns:
+    - jsonPath: .spec.podIdentity.provider
+      name: PodIdentity
+      type: string
+    - jsonPath: .spec.secretTargetRef[*].name
+      name: Secret
+      type: string
+    - jsonPath: .spec.env[*].name
+      name: Env
+      type: string
+    - jsonPath: .spec.hashiCorpVault.address
+      name: VaultAddress
+      type: string
+    - jsonPath: .status.scaledobjects
+      name: ScaledObjects
+      priority: 1
+      type: string
+    - jsonPath: .status.scaledjobs
+      name: ScaledJobs
+      priority: 1
+      type: string
+    name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        description: TriggerAuthentication defines how a trigger can authenticate
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: TriggerAuthenticationSpec defines the various ways to authenticate
+            properties:
+              awsSecretManager:
+                description: AwsSecretManager is used to authenticate using AwsSecretManager
+                properties:
+                  credentials:
+                    properties:
+                      accessKey:
+                        properties:
+                          valueFrom:
+                            properties:
+                              secretKeyRef:
+                                properties:
+                                  key:
+                                    type: string
+                                  name:
+                                    type: string
+                                required:
+                                - key
+                                - name
+                                type: object
+                            required:
+                            - secretKeyRef
+                            type: object
+                        required:
+                        - valueFrom
+                        type: object
+                      accessSecretKey:
+                        properties:
+                          valueFrom:
+                            properties:
+                              secretKeyRef:
+                                properties:
+                                  key:
+                                    type: string
+                                  name:
+                                    type: string
+                                required:
+                                - key
+                                - name
+                                type: object
+                            required:
+                            - secretKeyRef
+                            type: object
+                        required:
+                        - valueFrom
+                        type: object
+                      accessToken:
+                        properties:
+                          valueFrom:
+                            properties:
+                              secretKeyRef:
+                                properties:
+                                  key:
+                                    type: string
+                                  name:
+                                    type: string
+                                required:
+                                - key
+                                - name
+                                type: object
+                            required:
+                            - secretKeyRef
+                            type: object
+                        required:
+                        - valueFrom
+                        type: object
+                    required:
+                    - accessKey
+                    - accessSecretKey
+                    type: object
+                  podIdentity:
+                    description: |-
+                      AuthPodIdentity allows users to select the platform native identity
+                      mechanism
+                    properties:
+                      externalID:
+                        description: ExternalID sets the External ID to be used when
+                          assuming an identity. This is only applicable when using
+                          AWS pod identity with a RoleArn.
+                        type: string
+                      identityAuthorityHost:
+                        description: Set identityAuthorityHost to override the default
+                          Azure authority host. If this is set, then the IdentityTenantID
+                          must also be set
+                        type: string
+                      identityId:
+                        type: string
+                      identityOwner:
+                        description: IdentityOwner configures which identity has to
+                          be used during auto discovery, keda or the scaled workload.
+                          Mutually exclusive with roleArn
+                        enum:
+                        - keda
+                        - workload
+                        type: string
+                      identityTenantId:
+                        description: Set identityTenantId to override the default
+                          Azure tenant id. If this is set, then the IdentityID must
+                          also be set
+                        type: string
+                      provider:
+                        description: PodIdentityProvider contains the list of providers
+                        enum:
+                        - azure-workload
+                        - gcp
+                        - aws
+                        - aws-eks
+                        - none
+                        type: string
+                      roleArn:
+                        description: RoleArn sets the AWS RoleArn to be used. Mutually
+                          exclusive with IdentityOwner
+                        type: string
+                    required:
+                    - provider
+                    type: object
+                  region:
+                    type: string
+                  secrets:
+                    items:
+                      properties:
+                        name:
+                          type: string
+                        parameter:
+                          type: string
+                        secretKey:
+                          type: string
+                        versionId:
+                          type: string
+                        versionStage:
+                          type: string
+                      required:
+                      - name
+                      - parameter
+                      type: object
+                    minItems: 1
+                    type: array
+                required:
+                - secrets
+                type: object
+              azureKeyVault:
+                description: AzureKeyVault is used to authenticate using Azure Key
+                  Vault
+                properties:
+                  cloud:
+                    properties:
+                      activeDirectoryEndpoint:
+                        type: string
+                      keyVaultResourceURL:
+                        type: string
+                      type:
+                        type: string
+                    required:
+                    - type
+                    type: object
+                  credentials:
+                    properties:
+                      clientId:
+                        type: string
+                      clientSecret:
+                        properties:
+                          valueFrom:
+                            properties:
+                              secretKeyRef:
+                                properties:
+                                  key:
+                                    type: string
+                                  name:
+                                    type: string
+                                required:
+                                - key
+                                - name
+                                type: object
+                            required:
+                            - secretKeyRef
+                            type: object
+                        required:
+                        - valueFrom
+                        type: object
+                      tenantId:
+                        type: string
+                    required:
+                    - clientId
+                    - clientSecret
+                    - tenantId
+                    type: object
+                  podIdentity:
+                    description: |-
+                      AuthPodIdentity allows users to select the platform native identity
+                      mechanism
+                    properties:
+                      externalID:
+                        description: ExternalID sets the External ID to be used when
+                          assuming an identity. This is only applicable when using
+                          AWS pod identity with a RoleArn.
+                        type: string
+                      identityAuthorityHost:
+                        description: Set identityAuthorityHost to override the default
+                          Azure authority host. If this is set, then the IdentityTenantID
+                          must also be set
+                        type: string
+                      identityId:
+                        type: string
+                      identityOwner:
+                        description: IdentityOwner configures which identity has to
+                          be used during auto discovery, keda or the scaled workload.
+                          Mutually exclusive with roleArn
+                        enum:
+                        - keda
+                        - workload
+                        type: string
+                      identityTenantId:
+                        description: Set identityTenantId to override the default
+                          Azure tenant id. If this is set, then the IdentityID must
+                          also be set
+                        type: string
+                      provider:
+                        description: PodIdentityProvider contains the list of providers
+                        enum:
+                        - azure-workload
+                        - gcp
+                        - aws
+                        - aws-eks
+                        - none
+                        type: string
+                      roleArn:
+                        description: RoleArn sets the AWS RoleArn to be used. Mutually
+                          exclusive with IdentityOwner
+                        type: string
+                    required:
+                    - provider
+                    type: object
+                  secrets:
+                    items:
+                      properties:
+                        name:
+                          type: string
+                        parameter:
+                          type: string
+                        version:
+                          type: string
+                      required:
+                      - name
+                      - parameter
+                      type: object
+                    minItems: 1
+                    type: array
+                  vaultUri:
+                    type: string
+                required:
+                - secrets
+                - vaultUri
+                type: object
+              boundServiceAccountToken:
+                items:
+                  properties:
+                    parameter:
+                      type: string
+                    serviceAccountName:
+                      type: string
+                  required:
+                  - parameter
+                  - serviceAccountName
+                  type: object
+                type: array
+              configMapTargetRef:
+                items:
+                  description: AuthConfigMapTargetRef is used to authenticate using
+                    a reference to a config map
+                  properties:
+                    key:
+                      type: string
+                    name:
+                      type: string
+                    parameter:
+                      type: string
+                  required:
+                  - key
+                  - name
+                  - parameter
+                  type: object
+                type: array
+              env:
+                items:
+                  description: |-
+                    AuthEnvironment is used to authenticate using environment variables
+                    in the destination ScaleTarget spec
+                  properties:
+                    containerName:
+                      type: string
+                    name:
+                      type: string
+                    parameter:
+                      type: string
+                  required:
+                  - name
+                  - parameter
+                  type: object
+                type: array
+              filePath:
+                description: |-
+                  FilePath specifies a file containing auth parameters as JSON map[string]string.
+                  When set, auth params are read directly from this file instead.
+                type: string
+              gcpSecretManager:
+                properties:
+                  credentials:
+                    properties:
+                      clientSecret:
+                        properties:
+                          valueFrom:
+                            properties:
+                              secretKeyRef:
+                                properties:
+                                  key:
+                                    type: string
+                                  name:
+                                    type: string
+                                required:
+                                - key
+                                - name
+                                type: object
+                            required:
+                            - secretKeyRef
+                            type: object
+                        required:
+                        - valueFrom
+                        type: object
+                    required:
+                    - clientSecret
+                    type: object
+                  podIdentity:
+                    description: |-
+                      AuthPodIdentity allows users to select the platform native identity
+                      mechanism
+                    properties:
+                      externalID:
+                        description: ExternalID sets the External ID to be used when
+                          assuming an identity. This is only applicable when using
+                          AWS pod identity with a RoleArn.
+                        type: string
+                      identityAuthorityHost:
+                        description: Set identityAuthorityHost to override the default
+                          Azure authority host. If this is set, then the IdentityTenantID
+                          must also be set
+                        type: string
+                      identityId:
+                        type: string
+                      identityOwner:
+                        description: IdentityOwner configures which identity has to
+                          be used during auto discovery, keda or the scaled workload.
+                          Mutually exclusive with roleArn
+                        enum:
+                        - keda
+                        - workload
+                        type: string
+                      identityTenantId:
+                        description: Set identityTenantId to override the default
+                          Azure tenant id. If this is set, then the IdentityID must
+                          also be set
+                        type: string
+                      provider:
+                        description: PodIdentityProvider contains the list of providers
+                        enum:
+                        - azure-workload
+                        - gcp
+                        - aws
+                        - aws-eks
+                        - none
+                        type: string
+                      roleArn:
+                        description: RoleArn sets the AWS RoleArn to be used. Mutually
+                          exclusive with IdentityOwner
+                        type: string
+                    required:
+                    - provider
+                    type: object
+                  secrets:
+                    items:
+                      properties:
+                        id:
+                          type: string
+                        parameter:
+                          type: string
+                        version:
+                          type: string
+                      required:
+                      - id
+                      - parameter
+                      type: object
+                    minItems: 1
+                    type: array
+                required:
+                - secrets
+                type: object
+              hashiCorpVault:
+                description: HashiCorpVault is used to authenticate using Hashicorp
+                  Vault
+                properties:
+                  address:
+                    type: string
+                  authentication:
+                    description: VaultAuthentication contains the list of Hashicorp
+                      Vault authentication methods
+                    enum:
+                    - token
+                    - kubernetes
+                    type: string
+                  credential:
+                    description: Credential defines the Hashicorp Vault credentials
+                      depending on the authentication method
+                    properties:
+                      serviceAccount:
+                        type: string
+                      serviceAccountName:
+                        type: string
+                      token:
+                        type: string
+                    type: object
+                  mount:
+                    type: string
+                  namespace:
+                    type: string
+                  role:
+                    type: string
+                  secrets:
+                    items:
+                      description: VaultSecret defines the mapping between the path
+                        of the secret in Vault to the parameter
+                      properties:
+                        key:
+                          type: string
+                        parameter:
+                          type: string
+                        path:
+                          type: string
+                        pkiData:
+                          properties:
+                            altNames:
+                              type: string
+                            commonName:
+                              type: string
+                            format:
+                              type: string
+                            ipSans:
+                              type: string
+                            otherSans:
+                              type: string
+                            ttl:
+                              type: string
+                            uriSans:
+                              type: string
+                          type: object
+                        type:
+                          description: VaultSecretType defines the type of vault secret
+                          enum:
+                          - ""
+                          - secretV2
+                          - secret
+                          - pki
+                          type: string
+                      required:
+                      - key
+                      - parameter
+                      - path
+                      type: object
+                    minItems: 1
+                    type: array
+                required:
+                - address
+                - authentication
+                - secrets
+                type: object
+              oauth2:
+                properties:
+                  clientId:
+                    type: string
+                  clientSecret:
+                    properties:
+                      valueFrom:
+                        properties:
+                          secretKeyRef:
+                            properties:
+                              key:
+                                type: string
+                              name:
+                                type: string
+                            required:
+                            - key
+                            - name
+                            type: object
+                        required:
+                        - secretKeyRef
+                        type: object
+                    required:
+                    - valueFrom
+                    type: object
+                  scopes:
+                    items:
+                      type: string
+                    type: array
+                  tokenUrl:
+                    type: string
+                  tokenUrlParams:
+                    additionalProperties:
+                      type: string
+                    type: object
+                  type:
+                    default: clientCredentials
+                    enum:
+                    - clientCredentials
+                    type: string
+                required:
+                - clientId
+                - tokenUrl
+                - type
+                type: object
+              podIdentity:
+                description: |-
+                  AuthPodIdentity allows users to select the platform native identity
+                  mechanism
+                properties:
+                  externalID:
+                    description: ExternalID sets the External ID to be used when assuming
+                      an identity. This is only applicable when using AWS pod identity
+                      with a RoleArn.
+                    type: string
+                  identityAuthorityHost:
+                    description: Set identityAuthorityHost to override the default
+                      Azure authority host. If this is set, then the IdentityTenantID
+                      must also be set
+                    type: string
+                  identityId:
+                    type: string
+                  identityOwner:
+                    description: IdentityOwner configures which identity has to be
+                      used during auto discovery, keda or the scaled workload. Mutually
+                      exclusive with roleArn
+                    enum:
+                    - keda
+                    - workload
+                    type: string
+                  identityTenantId:
+                    description: Set identityTenantId to override the default Azure
+                      tenant id. If this is set, then the IdentityID must also be
+                      set
+                    type: string
+                  provider:
+                    description: PodIdentityProvider contains the list of providers
+                    enum:
+                    - azure-workload
+                    - gcp
+                    - aws
+                    - aws-eks
+                    - none
+                    type: string
+                  roleArn:
+                    description: RoleArn sets the AWS RoleArn to be used. Mutually
+                      exclusive with IdentityOwner
+                    type: string
+                required:
+                - provider
+                type: object
+              secretTargetRef:
+                items:
+                  description: AuthSecretTargetRef is used to authenticate using a
+                    reference to a secret
+                  properties:
+                    key:
+                      type: string
+                    name:
+                      type: string
+                    parameter:
+                      type: string
+                  required:
+                  - key
+                  - name
+                  - parameter
+                  type: object
+                type: array
+            type: object
+          status:
+            description: TriggerAuthenticationStatus defines the observed state of
+              TriggerAuthentication
+            properties:
+              scaledjobs:
+                type: string
+              scaledobjects:
+                type: string
+            type: object
+        required:
+        - spec
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}
+{{- end -}}
diff --git a/packages/system/keda/charts/keda/templates/extensibility/extra-manifests.yaml b/packages/system/keda/charts/keda/templates/extensibility/extra-manifests.yaml
new file mode 100644
index 0000000000..2855904ec7
--- /dev/null
+++ b/packages/system/keda/charts/keda/templates/extensibility/extra-manifests.yaml
@@ -0,0 +1,4 @@
+{{ range .Values.extraObjects }}
+---
+{{ tpl (toYaml .) $ }}
+{{ end }}
\ No newline at end of file
diff --git a/packages/system/keda/charts/keda/templates/manager/ciliumnetworkpolicy.yaml b/packages/system/keda/charts/keda/templates/manager/ciliumnetworkpolicy.yaml
new file mode 100644
index 0000000000..0b6c530195
--- /dev/null
+++ b/packages/system/keda/charts/keda/templates/manager/ciliumnetworkpolicy.yaml
@@ -0,0 +1,30 @@
+{{- if and .Values.networkPolicy.enabled (eq .Values.networkPolicy.flavor "cilium") (.Capabilities.APIVersions.Has "cilium.io/v2") }}
+apiVersion: "cilium.io/v2"
+kind: CiliumNetworkPolicy
+metadata:
+  name: {{ .Values.operator.name }}
+  namespace: {{ .Release.Namespace }}
+  {{- with .Values.additionalAnnotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  labels:
+    app: {{ .Values.operator.name }}
+    name: {{ .Values.operator.name }}
+    app.kubernetes.io/name: {{ .Values.operator.name }}
+    {{- include "keda.labels" . | indent 4 }}
+spec:
+  endpointSelector:
+    matchLabels:
+      app: {{ .Values.operator.name }}
+  egress:
+    - toEntities:
+        - kube-apiserver
+        - cluster
+    {{- if and .Values.networkPolicy.cilium.operator.extraEgressRules }}
+    {{ toYaml .Values.networkPolicy.cilium.operator.extraEgressRules | nindent 4 }}
+    {{- end }}
+  ingress:
+    - fromEntities:
+        - cluster
+{{ end }}
diff --git a/packages/system/keda/charts/keda/templates/manager/clusterrole.yaml b/packages/system/keda/charts/keda/templates/manager/clusterrole.yaml
new file mode 100644
index 0000000000..a98f441c7b
--- /dev/null
+++ b/packages/system/keda/charts/keda/templates/manager/clusterrole.yaml
@@ -0,0 +1,278 @@
+{{- if .Values.rbac.create }}
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  {{- with .Values.additionalAnnotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  labels:
+    app.kubernetes.io/name: {{ .Values.operator.name }}
+    {{- include "keda.labels" . | indent 4 }}
+  name: {{ .Values.operator.name }}
+rules:
+- apiGroups:
+  - ""
+  resources:
+  - configmaps
+  - configmaps/status
+  - limitranges
+  - pods
+  - services
+  - serviceaccounts
+  verbs:
+  - get
+  - list
+  - watch
+{{- if eq .Values.permissions.operator.restrict.allowAllServiceAccountTokenCreation true }}
+- apiGroups:
+  - ""
+  resources:
+  - serviceaccounts/token
+  verbs:
+  - create
+{{- end }}
+- apiGroups:
+  - events.k8s.io
+  - ""
+  resources:
+  - events
+  verbs:
+  - create
+  - patch
+- apiGroups:
+    - discovery.k8s.io
+  resources:
+    - endpointslices
+  verbs:
+    - get
+    - list
+    - watch
+{{- if not .Values.permissions.operator.restrict.secret }}
+- apiGroups:
+  - ""
+  resources:
+  - secrets
+  verbs:
+  - list
+  - watch
+  {{- with .Values.permissions.operator.restrict.namesAllowList }}
+- apiGroups:
+  - ""
+  resources:
+  - secrets
+  verbs:
+  - get
+  resourceNames: {{ toYaml . | nindent 4 }}
+  {{- end }}
+{{- end }}
+{{- if .Values.rbac.enabledCustomScaledRefKinds }}
+  {{- range .Values.rbac.scaledRefKinds }}
+- apiGroups:
+  - {{ .apiGroup | quote }}
+  resources:
+  - {{ printf "%s/scale" .kind | quote }}
+  verbs:
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - {{ .apiGroup | quote }}
+  resources:
+  - {{ .kind | quote }}
+  verbs:
+  - get
+  {{- end }}
+{{- end }}
+- apiGroups:
+  - apps
+  resources:
+  - deployments/scale
+  - statefulsets/scale
+  verbs:
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - apps
+  resources:
+  - deployments
+  - replicasets
+  - statefulsets
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - autoscaling
+  resources:
+  - horizontalpodautoscalers
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - batch
+  resources:
+  - jobs
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - eventing.keda.sh
+  resources:
+  - cloudeventsources
+  - cloudeventsources/status
+  - clustercloudeventsources
+  - clustercloudeventsources/status
+  verbs:
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - keda.sh
+  resources:
+  - scaledjobs
+  - scaledjobs/finalizers
+  - scaledjobs/status
+  - scaledobjects
+  - scaledobjects/finalizers
+  - scaledobjects/status
+  - triggerauthentications
+  - triggerauthentications/status
+  verbs:
+  - get
+  - list
+  - patch
+  - update
+  - watch
+{{- if .Values.rbac.aggregateToDefaultRoles }}
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: keda:edit
+  labels:
+    rbac.authorization.k8s.io/aggregate-to-admin: "true"
+    rbac.authorization.k8s.io/aggregate-to-edit: "true"
+    app.kubernetes.io/name: {{ .Values.operator.name }}
+    {{- include "keda.labels" . | indent 4 }}
+rules:
+- apiGroups:
+  - keda.sh
+  resources:
+  - clustertriggerauthentications
+  - scaledjobs
+  - scaledobjects
+  - triggerauthentications
+  verbs:
+  - create
+  - delete
+  - patch
+  - update
+- apiGroups:
+  - eventing.keda.sh
+  resources:
+  - cloudeventsources
+  - clustercloudeventsources
+  verbs:
+  - create
+  - delete
+  - patch
+  - update
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: keda:view
+  labels:
+    rbac.authorization.k8s.io/aggregate-to-admin: "true"
+    rbac.authorization.k8s.io/aggregate-to-edit: "true"
+    rbac.authorization.k8s.io/aggregate-to-view: "true"
+    app.kubernetes.io/name: {{ .Values.operator.name }}
+    {{- include "keda.labels" . | indent 4 }}
+rules:
+- apiGroups:
+  - keda.sh
+  resources:
+  - clustertriggerauthentications
+  - scaledjobs
+  - scaledobjects
+  - triggerauthentications
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - eventing.keda.sh
+  resources:
+  - cloudeventsources
+  - clustercloudeventsources
+  verbs:
+  - get
+  - list
+  - watch
+{{- end -}}
+{{- if .Values.permissions.operator.restrict.serviceAccountTokenCreationRoles }}
+{{- range $r := .Values.permissions.operator.restrict.serviceAccountTokenCreationRoles }}
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  {{- with $.Values.additionalAnnotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  labels:
+    app.kubernetes.io/name: {{ $.Values.operator.name }}
+    {{- include "keda.labels" $ | indent 4 }}
+  name: {{ $.Values.operator.name }}-token-creator-{{ $r.name }}
+  namespace: {{ $r.namespace }}
+rules:
+- apiGroups:
+  - ""
+  resources:
+  - serviceaccounts/token
+  verbs:
+  - create
+  resourceNames:
+  - {{ $r.name }}
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  {{- with $.Values.additionalAnnotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  labels:
+    app.kubernetes.io/name: {{ $.Values.operator.name }}
+    {{- include "keda.labels" $ | indent 4 }}
+  name: {{ $.Values.operator.name }}-token-creator-{{ $r.name }}
+  namespace: {{ $r.namespace }}
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: {{ $.Values.operator.name }}-token-creator-{{ $r.name }}
+subjects:
+- kind: ServiceAccount
+  name: {{ $.Values.operator.name }}
+  namespace: {{ $.Release.Namespace }}
+{{- end }}
+{{- end }}
+{{- end -}}
diff --git a/packages/system/keda/charts/keda/templates/manager/clusterrolebindings.yaml b/packages/system/keda/charts/keda/templates/manager/clusterrolebindings.yaml
new file mode 100644
index 0000000000..bd78e58a6c
--- /dev/null
+++ b/packages/system/keda/charts/keda/templates/manager/clusterrolebindings.yaml
@@ -0,0 +1,50 @@
+{{- if .Values.rbac.create }}
+{{- if not .Values.watchNamespace }}
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  {{- with .Values.additionalAnnotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  labels:
+    app.kubernetes.io/name: {{ .Values.operator.name }}
+    {{- include "keda.labels" . | indent 4 }}
+  name: {{ .Values.operator.name }}
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: {{ .Values.operator.name }}
+subjects:
+- kind: ServiceAccount
+  name: {{ (.Values.serviceAccount.operator).name | default .Values.serviceAccount.name }}
+  namespace: {{ .Release.Namespace }}
+{{- else }}
+  {{- $namespaces := uniq (append (splitList "," .Values.watchNamespace) .Release.Namespace) -}}
+  {{- range $namespaces }}
+---
+# Role binding for namespace '{{ . }}'
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  {{- with $.Values.additionalAnnotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  labels:
+    app.kubernetes.io/name: {{ $.Values.operator.name }}
+    {{- include "keda.labels" $ | indent 4 }}
+  name: {{ $.Values.operator.name }}
+  namespace: {{ . | trim }}
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: {{ $.Values.operator.name }}
+subjects:
+- kind: ServiceAccount
+  name: {{ ($.Values.serviceAccount.operator).name | default $.Values.serviceAccount.name }}
+  namespace: {{ $.Release.Namespace }}
+---
+  {{- end }}
+{{- end }}
+{{- end }}
diff --git a/packages/system/keda/charts/keda/templates/manager/deployment.yaml b/packages/system/keda/charts/keda/templates/manager/deployment.yaml
new file mode 100644
index 0000000000..ff95230a3c
--- /dev/null
+++ b/packages/system/keda/charts/keda/templates/manager/deployment.yaml
@@ -0,0 +1,268 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ .Values.operator.name }}
+  namespace: {{ .Release.Namespace }}
+  {{- with .Values.additionalAnnotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  labels:
+    app: {{ .Values.operator.name }}
+    name: {{ .Values.operator.name }}
+    app.kubernetes.io/name: {{ .Values.operator.name }}
+    {{- include "keda.labels" . | indent 4 }}
+spec:
+  revisionHistoryLimit: {{ .Values.operator.revisionHistoryLimit}}
+  replicas: {{ .Values.operator.replicaCount}}
+  {{- with .Values.upgradeStrategy.operator }}
+  strategy:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  selector:
+    matchLabels:
+      app: {{ .Values.operator.name }}
+  template:
+    metadata:
+      labels:
+        app: {{ .Values.operator.name }}
+        name: {{ .Values.operator.name }}
+        app.kubernetes.io/name: {{ .Values.operator.name }}
+        {{- include "keda.labels" . | indent 8 }}
+        {{- if .Values.podLabels.keda }}
+        {{- toYaml .Values.podLabels.keda | nindent 8 }}
+        {{- end }}
+        {{- if .Values.podIdentity.azureWorkload.enabled }}
+        azure.workload.identity/use: "true"
+        {{- end }}
+      {{- if or .Values.podAnnotations.keda .Values.additionalAnnotations }}
+      annotations:
+        {{- if .Values.podAnnotations.keda }}
+        {{- toYaml .Values.podAnnotations.keda | nindent 8 }}
+        {{- end }}
+        {{- if .Values.additionalAnnotations }}
+        {{- toYaml .Values.additionalAnnotations | nindent 8 }}
+        {{- end }}
+      {{- end }}
+    spec:
+      enableServiceLinks: {{ .Values.enableServiceLinks }}
+      {{- if .Values.priorityClassName }}
+      priorityClassName: {{ .Values.priorityClassName | quote }}
+      {{- end }}
+      {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      serviceAccountName: {{ (.Values.serviceAccount.operator).name | default .Values.serviceAccount.name }}
+      automountServiceAccountToken: {{ kindIs "invalid" (.Values.serviceAccount.operator).automountServiceAccountToken | ternary .Values.serviceAccount.automountServiceAccountToken (.Values.serviceAccount.operator).automountServiceAccountToken }}
+      securityContext:
+        {{- if .Values.podSecurityContext.operator }}
+        {{- toYaml .Values.podSecurityContext.operator | nindent 8 }}
+        {{- else }}
+        {{- toYaml .Values.podSecurityContext | nindent 8 }}
+        {{- end }}
+      containers:
+        - name: {{ .Values.operator.name }}
+          securityContext:
+            {{- if .Values.securityContext.operator }}
+            {{- toYaml .Values.securityContext.operator | nindent 12 }}
+            {{- else }}
+            {{- toYaml .Values.securityContext | nindent 12 }}
+            {{- end }}
+          {{- $registry := .Values.global.image.registry | default .Values.image.keda.registry | default "" }}
+          {{- if $registry }}
+          image: "{{ $registry }}/{{ .Values.image.keda.repository }}:{{ .Values.image.keda.tag | default .Chart.AppVersion }}"
+          {{- else }}
+          image: "{{ .Values.image.keda.repository }}:{{ .Values.image.keda.tag | default .Chart.AppVersion }}"
+          {{- end }}
+          command:
+          - "/keda"
+          args:
+          - "--leader-elect"
+          {{- if .Values.operator.leaderElectionID }}
+          - "--leader-election-id={{ .Values.operator.leaderElectionID }}"
+          {{- end }}
+          - "--disable-compression={{ .Values.operator.disableCompression}}"
+          - "--zap-log-level={{ .Values.logging.operator.level }}"
+          - "--zap-encoder={{ .Values.logging.operator.format }}"
+          - "--zap-time-encoding={{ .Values.logging.operator.timeEncoding }}"
+          - "--enable-webhook-patching={{ .Values.webhooks.enabled }}"
+          {{- if and .Values.certificates.autoGenerated ( not .Values.certificates.certManager.enabled ) .Values.certificates.operator .Values.certificates.operator.apiServicePatching }}
+          - "--enable-apiservice-patching={{ .Values.certificates.operator.apiServicePatching.enabled }}"
+          {{- end }}
+          {{- if .Values.logging.operator.stackTracesEnabled }}
+          - "--zap-stacktrace-level=error"
+          {{- end }}
+          - "--cert-dir={{ .Values.certificates.mountPath }}"
+          - "--enable-cert-rotation={{ and .Values.certificates.autoGenerated ( not .Values.certificates.certManager.enabled ) }}"
+          - "--cert-secret-name={{ .Values.certificates.secretName }}"
+          - "--operator-service-name={{ .Values.operator.name }}"
+          - "--metrics-server-service-name={{ .Values.operator.name }}-metrics-apiserver"
+          - "--webhooks-service-name={{ .Values.webhooks.name }}"
+          - "--k8s-cluster-name={{ tpl .Values.clusterName . }}"
+          - "--k8s-cluster-domain={{ .Values.clusterDomain }}"
+          - "--enable-prometheus-metrics={{ .Values.prometheus.operator.enabled }}"
+          {{- if .Values.prometheus.operator.enabled }}
+          - "--metrics-bind-address=:{{ .Values.prometheus.operator.port }}"
+          {{- end }}
+          {{- if .Values.opentelemetry.operator.enabled }}
+          - "--enable-opentelemetry-metrics={{ .Values.opentelemetry.operator.enabled}}"
+          {{- end }}
+          {{- if .Values.profiling.operator.enabled }}
+          - "--profiling-bind-address=:{{ .Values.profiling.operator.port }}"
+          {{- end }}
+          {{- with (.Values.certificates.operator).caDirs }}
+          {{- range . }}
+          - "--ca-dir={{ . }}"
+          {{- end }}
+          {{- end }}
+          - "--http-max-idle-conns={{ .Values.http.maxIdleConns }}"
+          - "--http-max-idle-conns-per-host={{ .Values.http.maxIdleConnsPerHost }}"
+          - "--http-idle-conn-timeout={{ .Values.http.idleConnTimeout }}"
+          {{- range $key, $value := .Values.extraArgs.keda }}
+          - "--{{ $key }}={{ $value }}"
+          {{- end }}
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          livenessProbe:
+            httpGet:
+              path: /healthz
+              port: 8081
+            initialDelaySeconds: {{ .Values.operator.livenessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.operator.livenessProbe.periodSeconds }}
+            timeoutSeconds: {{ .Values.operator.livenessProbe.timeoutSeconds }}
+            failureThreshold: {{ .Values.operator.livenessProbe.failureThreshold }}
+            successThreshold: {{ .Values.operator.livenessProbe.successThreshold }}
+          readinessProbe:
+            httpGet:
+              path: /readyz
+              port: 8081
+            initialDelaySeconds: {{ .Values.operator.readinessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.operator.readinessProbe.periodSeconds }}
+            timeoutSeconds: {{ .Values.operator.readinessProbe.timeoutSeconds }}
+            failureThreshold: {{ .Values.operator.readinessProbe.failureThreshold }}
+            successThreshold: {{ .Values.operator.readinessProbe.successThreshold }}
+          ports:
+          {{- if .Values.prometheus.operator.enabled }}
+          - containerPort: {{ .Values.prometheus.operator.port }}
+            name: metrics
+            protocol: TCP
+          {{- end }}
+          - containerPort: 9666
+            name: metricsservice
+            protocol: TCP
+          env:
+            - name: WATCH_NAMESPACE
+              value: {{ .Values.watchNamespace | quote }}
+            - name: POD_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.name
+            - name: POD_NAMESPACE
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.namespace
+            - name: OPERATOR_NAME
+              value: {{ .Values.operator.name }}
+            - name: KEDA_HTTP_DEFAULT_TIMEOUT
+              value: {{ .Values.http.timeout | quote }}
+            - name: KEDA_HTTP_MIN_TLS_VERSION
+              value: {{ .Values.http.minTlsVersion }}
+            - name: KEDA_HTTP_TLS_CIPHER_LIST
+              value: {{ .Values.http.tlsCipherList | quote }}
+            - name: KEDA_SERVICE_MIN_TLS_VERSION
+              value: {{ .Values.service.minTlsVersion }}
+            - name: KEDA_SERVICE_TLS_CIPHER_LIST
+              value: {{ .Values.service.tlsCipherList | quote }}
+            {{- if ( not .Values.http.keepAlive.enabled ) }}
+            - name: KEDA_HTTP_DISABLE_KEEP_ALIVE
+              value: "true"
+            {{- end }}
+            {{- if .Values.permissions.operator.restrict.secret }}
+            - name: KEDA_RESTRICT_SECRET_ACCESS
+              value: {{ .Values.permissions.operator.restrict.secret | quote }}
+            {{- end }}
+            {{- if .Values.opentelemetry.collector.uri }}
+            - name: OTEL_EXPORTER_OTLP_ENDPOINT
+              value: {{ .Values.opentelemetry.collector.uri | quote }}
+            {{- end }}
+            {{- if .Values.env }}
+            {{- toYaml .Values.env | nindent 12 -}}
+            {{- end }}
+          volumeMounts:
+          - mountPath: {{ .Values.certificates.mountPath }}
+            name: certificates
+            readOnly: true
+          {{- if .Values.grpcTLSCertsSecret }}
+          - name: grpc-certs
+            mountPath: /grpccerts
+          {{- end }}
+          {{- if .Values.hashiCorpVaultTLS }}
+          - name: hashicorp-vault-certs
+            mountPath: /hashicorp-vaultcerts
+          {{- end }}
+          {{- if .Values.volumes.keda.extraVolumeMounts }}
+          {{- toYaml .Values.volumes.keda.extraVolumeMounts | nindent 10 }}
+          {{- end }}
+          resources:
+            {{- if .Values.resources.operator }}
+            {{- toYaml .Values.resources.operator | nindent 12 }}
+            {{- else }}
+            {{- toYaml .Values.resources | nindent 12 }}
+            {{- end }}
+        {{- if .Values.operator.extraContainers }}
+        {{- toYaml .Values.operator.extraContainers | nindent 8 }}
+        {{- end }}
+      {{- if .Values.operator.extraInitContainers }}
+      initContainers:
+      {{- toYaml .Values.operator.extraInitContainers | nindent 8 }}
+      {{- end }}
+      volumes:
+      - name: certificates
+        secret:
+          defaultMode: 420
+          secretName: {{ .Values.certificates.secretName }}
+          optional: {{ and .Values.certificates.autoGenerated ( not .Values.certificates.certManager.enabled ) }}
+      {{- if .Values.grpcTLSCertsSecret }}
+      - name: grpc-certs
+        secret:
+          secretName: {{ .Values.grpcTLSCertsSecret }}
+      {{- end }}
+      {{- if .Values.hashiCorpVaultTLS }}
+      - name: hashicorp-vault-certs
+        secret:
+          secretName: {{ .Values.hashiCorpVaultTLS }}
+      {{- end }}
+      {{- if .Values.volumes.keda.extraVolumes }}
+      {{- toYaml .Values.volumes.keda.extraVolumes | nindent 6 }}
+      {{- end }}
+      nodeSelector:
+        kubernetes.io/os: linux
+      {{- with .Values.operator.nodeSelector | default .Values.nodeSelector }}
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- if .Values.podIdentity.gcp.enabled }}
+        iam.gke.io/gke-metadata-server-enabled: "true"
+      {{- end }}
+      {{- with .Values.operator.affinity | default .Values.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.topologySpreadConstraints.operator }}
+      topologySpreadConstraints:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.operator.tolerations | default .Values.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- $dnsConfig := .Values.operator.dnsConfig | default .Values.global.dnsConfig }}
+      {{- if $dnsConfig }}
+      dnsConfig:
+      {{- toYaml $dnsConfig | nindent 8 }}
+      {{- end }}
+      dnsPolicy: {{ .Values.operator.dnsPolicy }}
+      hostNetwork: {{ .Values.operator.useHostNetwork }}
+      {{- with .Values.hostAliases }}
+      hostAliases:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
diff --git a/packages/system/keda/charts/keda/templates/manager/minimal-rbac.yaml b/packages/system/keda/charts/keda/templates/manager/minimal-rbac.yaml
new file mode 100644
index 0000000000..3f0e1e2c7f
--- /dev/null
+++ b/packages/system/keda/charts/keda/templates/manager/minimal-rbac.yaml
@@ -0,0 +1,167 @@
+{{- if .Values.rbac.create }}
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  {{- with .Values.additionalAnnotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  labels:
+    app.kubernetes.io/name: {{ .Values.operator.name }}-certs
+    {{- include "keda.labels" . | indent 4 }}
+  name: {{ .Values.operator.name }}-certs
+  namespace: {{ .Release.Namespace }}
+rules:
+- apiGroups:
+  - coordination.k8s.io
+  resources:
+  - leases
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+{{- if .Values.certificates.certManager.enabled }}
+- apiGroups:
+  - ""
+  resources:
+  - secrets
+  verbs:
+  - get
+  resourceNames:
+  - {{ .Values.certificates.secretName | quote }}
+{{- if .Values.permissions.operator.restrict.secret }}
+- apiGroups:
+  - ""
+  resources:
+  - secrets
+  verbs:
+  - list
+  - watch
+{{- end }}
+{{- else if .Values.certificates.autoGenerated }}
+- apiGroups:
+  - ""
+  resources:
+  - secrets
+  verbs:
+  - get
+  resourceNames:
+  - {{ .Values.certificates.secretName | quote }}
+- apiGroups:
+  - ""
+  resources:
+  - secrets
+  verbs:
+  - create
+  - update
+{{- if .Values.permissions.operator.restrict.secret }}
+  - get
+  - list
+  - watch
+{{- end }}
+{{- end }}
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  {{- with .Values.additionalAnnotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  labels:
+    app.kubernetes.io/name: {{ .Values.operator.name }}-certs
+    {{- include "keda.labels" . | indent 4 }}
+  name: {{ .Values.operator.name }}-certs
+  namespace: {{ .Release.Namespace }}
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: {{ .Values.operator.name }}-certs
+subjects:
+- kind: ServiceAccount
+  name: {{ (.Values.serviceAccount.operator).name | default .Values.serviceAccount.name }}
+  namespace: {{ .Release.Namespace }}
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  {{- with .Values.additionalAnnotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  labels:
+    app.kubernetes.io/name: {{ .Values.operator.name }}-minimal-cluster-role
+    {{- include "keda.labels" . | indent 4 }}
+  name: {{ .Values.operator.name }}-minimal-cluster-role
+rules:
+- apiGroups:
+  - keda.sh
+  resources:
+  - clustertriggerauthentications
+  - clustertriggerauthentications/status
+  verbs:
+  - get
+  - list
+  - patch
+  - update
+  - watch
+{{- if and .Values.certificates.autoGenerated ( not .Values.certificates.certManager.enabled ) }}
+- apiGroups:
+  - admissionregistration.k8s.io
+  resources:
+  - validatingwebhookconfigurations
+  verbs:
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - apiregistration.k8s.io
+  resources:
+  - apiservices
+  verbs:
+  - get
+  - list
+  - patch
+  - update
+  - watch
+{{- end }}
+- apiGroups:
+  - eventing.keda.sh
+  resources:
+  - cloudeventsources
+  - cloudeventsources/status
+  - clustercloudeventsources
+  - clustercloudeventsources/status
+  verbs:
+  - get
+  - list
+  - patch
+  - update
+  - watch
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  {{- with .Values.additionalAnnotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  labels:
+    app.kubernetes.io/name: {{ .Values.operator.name }}-minimal
+    {{- include "keda.labels" . | indent 4 }}
+  name: {{ .Values.operator.name }}-minimal
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: {{ .Values.operator.name }}-minimal-cluster-role
+subjects:
+- kind: ServiceAccount
+  name: {{ (.Values.serviceAccount.operator).name | default .Values.serviceAccount.name }}
+  namespace: {{ .Release.Namespace }}
+{{- end }}
diff --git a/packages/system/keda/charts/keda/templates/manager/networkpolicy.yaml b/packages/system/keda/charts/keda/templates/manager/networkpolicy.yaml
new file mode 100644
index 0000000000..070026bbb0
--- /dev/null
+++ b/packages/system/keda/charts/keda/templates/manager/networkpolicy.yaml
@@ -0,0 +1,72 @@
+{{- if and .Values.networkPolicy.enabled (eq .Values.networkPolicy.flavor "kubernetes") }}
+apiVersion: networking.k8s.io/v1
+kind: NetworkPolicy
+metadata:
+  name: {{ .Values.operator.name }}
+  namespace: {{ .Release.Namespace }}
+  {{- with .Values.additionalAnnotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  labels:
+    app: {{ .Values.operator.name }}
+    name: {{ .Values.operator.name }}
+    app.kubernetes.io/name: {{ .Values.operator.name }}
+    {{- include "keda.labels" . | indent 4 }}
+spec:
+  podSelector:
+    matchLabels:
+      app: {{ .Values.operator.name }}
+  policyTypes:
+    - Ingress
+    - Egress
+  ingress:
+    # Allow ingress from any pod in the cluster on the metrics service port (gRPC)
+    - from:
+        - namespaceSelector: {}
+      ports:
+        - protocol: TCP
+          port: 9666
+    {{- if .Values.prometheus.operator.enabled }}
+    # Allow ingress from any pod in the cluster on the prometheus metrics port
+    - from:
+        - namespaceSelector: {}
+      ports:
+        - protocol: TCP
+          port: {{ .Values.prometheus.operator.port }}
+    {{- end }}
+    {{- if .Values.profiling.operator.enabled }}
+    # Allow ingress from any pod in the cluster on the profiling port
+    - from:
+        - namespaceSelector: {}
+      ports:
+        - protocol: TCP
+          port: {{ .Values.profiling.operator.port }}
+    {{- end }}
+  egress:
+    # Allow DNS resolution
+    - to:
+        - namespaceSelector: {}
+          podSelector:
+            matchLabels:
+              k8s-app: kube-dns
+      ports:
+        - protocol: UDP
+          port: 53
+        - protocol: TCP
+          port: 53
+    # Allow access to Kubernetes API server
+    - to:
+        - namespaceSelector: {}
+      ports:
+        - protocol: TCP
+          port: 443
+        - protocol: TCP
+          port: 6443
+    # Allow egress to any pod in the cluster for scalers and custom resources
+    - to:
+        - namespaceSelector: {}
+    {{- if .Values.networkPolicy.kubernetes.operator.extraEgressRules }}
+    {{ toYaml .Values.networkPolicy.kubernetes.operator.extraEgressRules | nindent 4 }}
+    {{- end }}
+{{- end }}
diff --git a/packages/system/keda/charts/keda/templates/manager/poddisruptionbudget.yaml b/packages/system/keda/charts/keda/templates/manager/poddisruptionbudget.yaml
new file mode 100644
index 0000000000..dc423b8ba0
--- /dev/null
+++ b/packages/system/keda/charts/keda/templates/manager/poddisruptionbudget.yaml
@@ -0,0 +1,32 @@
+{{- if or (or .Values.podDisruptionBudget.minAvailable .Values.podDisruptionBudget.maxUnavailable)  .Values.podDisruptionBudget.operator }}
+apiVersion: policy/v1
+kind: PodDisruptionBudget
+metadata:
+  namespace: {{ .Release.Namespace }}
+  name: {{ .Values.operator.name }}
+  {{- with .Values.additionalAnnotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  labels:
+    app.kubernetes.io/name: {{ .Values.operator.name }}
+    {{- include "keda.labels" . | indent 4 }}
+spec:
+  {{- if .Values.podDisruptionBudget.minAvailable }}
+  minAvailable: {{ .Values.podDisruptionBudget.minAvailable }}
+  {{- end }}
+  {{-  if .Values.podDisruptionBudget.maxUnavailable }}
+  maxUnavailable: {{ .Values.podDisruptionBudget.maxUnavailable }}
+  {{- end }}
+  {{- if .Values.podDisruptionBudget.operator }}
+  {{- if .Values.podDisruptionBudget.operator.minAvailable }}
+  minAvailable: {{ .Values.podDisruptionBudget.operator.minAvailable }}
+  {{- end }}
+  {{- if  .Values.podDisruptionBudget.operator.maxUnavailable }}
+  maxUnavailable: {{ .Values.podDisruptionBudget.operator.maxUnavailable }}
+  {{- end }}
+  {{- end }}
+  selector:
+    matchLabels:
+      app: {{ .Values.operator.name }}
+{{- end }}
diff --git a/packages/system/keda/charts/keda/templates/manager/podmonitor.yaml b/packages/system/keda/charts/keda/templates/manager/podmonitor.yaml
new file mode 100644
index 0000000000..39f37864ab
--- /dev/null
+++ b/packages/system/keda/charts/keda/templates/manager/podmonitor.yaml
@@ -0,0 +1,43 @@
+{{- if and .Values.prometheus.operator.enabled .Values.prometheus.operator.podMonitor.enabled }}
+apiVersion: monitoring.coreos.com/v1
+kind: PodMonitor
+metadata:
+  name: {{ .Values.operator.name }}
+  {{- with .Values.additionalAnnotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  labels:
+    app.kubernetes.io/name: {{ .Values.operator.name }}
+    {{- include "keda.labels" . | indent 4 }}
+    {{- range $key, $value := .Values.prometheus.operator.podMonitor.additionalLabels }}
+    {{ $key }}: {{ $value | quote }}
+    {{- end }}
+  {{- with .Values.prometheus.operator.podMonitor.namespace }}
+  namespace: {{ . }}
+  {{- end }}
+spec:
+  podMetricsEndpoints:
+  - port: metrics
+    path: /metrics
+    {{- with .Values.prometheus.operator.podMonitor.interval }}
+    interval: {{ . }}
+    {{- end }}
+    {{- with .Values.prometheus.operator.podMonitor.scrapeTimeout }}
+    scrapeTimeout: {{ . }}
+    {{- end }}
+    {{- with .Values.prometheus.operator.podMonitor.relabelings }}
+    relabelings:
+{{ toYaml . | indent 4 }}
+    {{- end }}
+    {{- with .Values.prometheus.operator.podMonitor.metricRelabelings }}
+    metricRelabelings:
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+  namespaceSelector:
+    matchNames:
+    - {{ .Release.Namespace }}
+  selector:
+    matchLabels:
+      app: {{ .Values.operator.name }}
+{{- end }}
diff --git a/packages/system/keda/charts/keda/templates/manager/prometheusrules.yaml b/packages/system/keda/charts/keda/templates/manager/prometheusrules.yaml
new file mode 100644
index 0000000000..d117ca1396
--- /dev/null
+++ b/packages/system/keda/charts/keda/templates/manager/prometheusrules.yaml
@@ -0,0 +1,24 @@
+{{- if and .Values.prometheus.operator.enabled .Values.prometheus.operator.prometheusRules.enabled }}
+apiVersion: monitoring.coreos.com/v1
+kind: PrometheusRule
+metadata:
+  name: {{ .Values.operator.name }}
+  {{- with .Values.additionalAnnotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  labels:
+    app.kubernetes.io/name: {{ .Values.operator.name }}
+    {{- include "keda.labels" . | indent 4 }}
+    {{- range $key, $value := .Values.prometheus.operator.prometheusRules.additionalLabels }}
+    {{ $key }}: {{ $value | quote }}
+    {{- end }}
+  {{- with .Values.prometheus.operator.prometheusRules.namespace }}
+  namespace: {{ . }}
+  {{- end }}
+spec:
+  groups:
+  - name: {{ .Values.operator.name }}
+    rules:
+{{ toYaml .Values.prometheus.operator.prometheusRules.alerts | indent 6 }}
+{{- end }}
diff --git a/packages/system/keda/charts/keda/templates/manager/service.yaml b/packages/system/keda/charts/keda/templates/manager/service.yaml
new file mode 100644
index 0000000000..3d111af003
--- /dev/null
+++ b/packages/system/keda/charts/keda/templates/manager/service.yaml
@@ -0,0 +1,46 @@
+apiVersion: v1
+kind: Service
+metadata:
+  {{- if or .Values.additionalAnnotations .Values.service.annotations (and .Values.prometheus.operator.enabled ( not (or .Values.prometheus.operator.podMonitor.enabled .Values.prometheus.operator.serviceMonitor.enabled ))) }}
+  annotations:
+    {{- if and .Values.prometheus.operator.enabled ( not (or .Values.prometheus.operator.podMonitor.enabled .Values.prometheus.operator.serviceMonitor.enabled )) }}
+    prometheus.io/scrape: "true"
+    prometheus.io/port: {{ .Values.prometheus.operator.port | quote }}
+    prometheus.io/path: "/metrics"
+    {{- end }}
+    {{- with .Values.additionalAnnotations }}
+      {{- range $key, $value := . }}
+    {{ $key }}: {{ $value | quote }}
+      {{- end }}
+    {{- end }}
+    {{- with .Values.service.annotations }}
+      {{- range $key, $value := . }}
+    {{ $key }}: {{ $value | quote }}
+      {{- end }}
+    {{- end }}
+  {{- end }}
+  labels:
+    app.kubernetes.io/name: {{ .Values.operator.name }}
+    {{- include "keda.labels" . | indent 4 }}
+  name: {{ .Values.operator.name }}
+  namespace: {{ .Release.Namespace }}
+spec:
+  ports:
+  - name: metricsservice
+    port: 9666
+    targetPort: 9666
+  {{- if .Values.prometheus.operator.enabled }}
+  - name: metrics
+    port: {{ .Values.prometheus.operator.port }}
+    targetPort: {{ .Values.prometheus.operator.port }}
+    {{- with .Values.prometheus.operator.appProtocol }}
+    appProtocol: {{ . }}
+    {{- end }}
+  {{- end }}
+  {{- if .Values.profiling.operator.enabled }}
+  - name: profiling
+    port: {{ .Values.profiling.operator.port }}
+    targetPort: {{ .Values.profiling.operator.port }}
+  {{- end }}
+  selector:
+    app: {{ .Values.operator.name }}
diff --git a/packages/system/keda/charts/keda/templates/manager/serviceaccount.yaml b/packages/system/keda/charts/keda/templates/manager/serviceaccount.yaml
new file mode 100644
index 0000000000..6449adaf29
--- /dev/null
+++ b/packages/system/keda/charts/keda/templates/manager/serviceaccount.yaml
@@ -0,0 +1,49 @@
+{{- if (.Values.serviceAccount.operator).create | default .Values.serviceAccount.create -}}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  labels:
+    app.kubernetes.io/name: {{ (.Values.serviceAccount.operator).name | default .Values.serviceAccount.name }}
+    {{- if .Values.podIdentity.azureWorkload.enabled }}
+    azure.workload.identity/use: "true"
+    {{- end }}
+    {{- include "keda.labels" . | nindent 4 }}
+  {{- if or .Values.podIdentity.azureWorkload.enabled .Values.podIdentity.aws.irsa.enabled ((.Values.serviceAccount.operator).annotations | default .Values.serviceAccount.annotations) .Values.podIdentity.gcp.enabled }}
+  annotations:
+    {{- if .Values.additionalAnnotations }}
+    {{- toYaml .Values.additionalAnnotations | nindent 4 }}
+    {{- end }}
+    {{- if .Values.podIdentity.azureWorkload.enabled }}
+    {{- if .Values.podIdentity.azureWorkload.clientId }}
+    azure.workload.identity/client-id: {{ .Values.podIdentity.azureWorkload.clientId | quote }}
+    {{- end }}
+    {{- if .Values.podIdentity.azureWorkload.tenantId }}
+    azure.workload.identity/tenant-id: {{ .Values.podIdentity.azureWorkload.tenantId | quote }}
+    {{- end }}
+    azure.workload.identity/service-account-token-expiration: {{ .Values.podIdentity.azureWorkload.tokenExpiration | quote }}
+    {{- end }}
+    {{- if .Values.podIdentity.aws.irsa.enabled }}
+    {{- if .Values.podIdentity.aws.irsa.audience }}
+    eks.amazonaws.com/audience: {{ .Values.podIdentity.aws.irsa.audience | quote }}
+    {{- end }}
+    {{- if .Values.podIdentity.aws.irsa.roleArn }}
+    eks.amazonaws.com/role-arn: {{ .Values.podIdentity.aws.irsa.roleArn | quote }}
+    {{- end }}
+    {{- if .Values.podIdentity.aws.irsa.stsRegionalEndpoints }}
+    eks.amazonaws.com/sts-regional-endpoints: {{ .Values.podIdentity.aws.irsa.stsRegionalEndpoints | quote }}
+    {{- end }}
+    eks.amazonaws.com/token-expiration: {{ .Values.podIdentity.aws.irsa.tokenExpiration | quote }}
+    {{- end }}
+    {{- if .Values.podIdentity.gcp.enabled }}
+    {{- if .Values.podIdentity.gcp.gcpIAMServiceAccount }}
+    iam.gke.io/gcp-service-account: {{ .Values.podIdentity.gcp.gcpIAMServiceAccount }}
+    {{- end }}
+    {{- end }}
+    {{- if (.Values.serviceAccount.operator).annotations | default .Values.serviceAccount.annotations }}
+    {{- toYaml ((.Values.serviceAccount.operator).annotations | default .Values.serviceAccount.annotations) | nindent 4}}
+    {{- end }}
+  {{- end }}
+  name: {{ (.Values.serviceAccount.operator).name | default .Values.serviceAccount.name }}
+  namespace: {{ .Release.Namespace }}
+automountServiceAccountToken: {{ kindIs "invalid" (.Values.serviceAccount.operator).automountServiceAccountToken | ternary .Values.serviceAccount.automountServiceAccountToken (.Values.serviceAccount.operator).automountServiceAccountToken }}
+{{- end -}}
diff --git a/packages/system/keda/charts/keda/templates/manager/servicemonitor.yaml b/packages/system/keda/charts/keda/templates/manager/servicemonitor.yaml
new file mode 100644
index 0000000000..730a7c8b68
--- /dev/null
+++ b/packages/system/keda/charts/keda/templates/manager/servicemonitor.yaml
@@ -0,0 +1,69 @@
+{{- if and .Values.prometheus.operator.enabled .Values.prometheus.operator.serviceMonitor.enabled }}
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: {{ .Values.operator.name }}
+  {{- with .Values.additionalAnnotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  labels:
+    app.kubernetes.io/name: {{ .Values.operator.name }}
+    {{- include "keda.labels" . | indent 4 }}
+    {{- range $key, $value := .Values.prometheus.operator.serviceMonitor.additionalLabels }}
+    {{ $key }}: {{ $value | quote }}
+    {{- end }}
+  {{- with .Values.prometheus.operator.serviceMonitor.namespace }}
+  namespace: {{ . }}
+  {{- end }}
+spec:
+  {{- with .Values.prometheus.operator.serviceMonitor.jobLabel }}
+  jobLabel: {{ . }}
+  {{- end }}
+  {{- with .Values.prometheus.operator.serviceMonitor.targetLabels }}
+  targetLabels:
+  {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- with .Values.prometheus.operator.serviceMonitor.podTargetLabels }}
+  podTargetLabels:
+  {{- toYaml . | nindent 4 }}
+  {{- end }}
+  endpoints:
+  - port: {{ .Values.prometheus.operator.serviceMonitor.port }}
+    {{- with .Values.prometheus.operator.serviceMonitor.targetPort }}
+    targetPort: {{ . }}
+    {{- end }}
+    path: /metrics
+    {{- with .Values.prometheus.operator.serviceMonitor.interval }}
+    interval: {{ . }}
+    {{- end }}
+    {{- with .Values.prometheus.operator.serviceMonitor.scrapeTimeout }}
+    scrapeTimeout: {{ . }}
+    {{- end }}
+  {{- if .Values.prometheus.operator.serviceMonitor.relabelings}}
+    {{- with .Values.prometheus.operator.serviceMonitor.relabelings }}
+    relabelings:
+    {{- toYaml . | nindent 6 }}
+    {{- end }}
+  {{- else }}
+    {{- with .Values.prometheus.operator.serviceMonitor.relabellings }}
+    relabelings:
+    {{- toYaml . | nindent 6 }}
+    {{- end }}
+  {{- end}}
+    {{- with .Values.prometheus.operator.serviceMonitor.metricRelabelings }}
+    metricRelabelings:
+    {{- toYaml . | nindent 6 }}
+    {{- end }}
+    scheme: {{ .Values.prometheus.operator.serviceMonitor.scheme }}
+    {{- with .Values.prometheus.operator.serviceMonitor.tlsConfig }}
+    tlsConfig:
+    {{ toYaml . | nindent 6}}
+    {{- end }}
+  namespaceSelector:
+    matchNames:
+    - {{ .Release.Namespace }}
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: {{ .Values.operator.name }}
+{{- end }}
diff --git a/packages/system/keda/charts/keda/templates/metrics-server/apiservice.yaml b/packages/system/keda/charts/keda/templates/metrics-server/apiservice.yaml
new file mode 100644
index 0000000000..b74f2e57a2
--- /dev/null
+++ b/packages/system/keda/charts/keda/templates/metrics-server/apiservice.yaml
@@ -0,0 +1,31 @@
+{{- if .Values.metricsServer.enabled }}
+apiVersion: apiregistration.k8s.io/v1
+kind: APIService
+metadata:
+  {{- if or .Values.certificates.certManager.enabled .Values.additionalAnnotations }}
+  annotations:
+    {{- if .Values.certificates.certManager.enabled }}
+    {{- if and (not .Values.certificates.certManager.generateCA) .Values.certificates.certManager.issuer.generate }}
+    cert-manager.io/inject-ca-from-secret: {{ .Release.Namespace }}/{{ .Values.certificates.certManager.caSecretName }}
+    {{- else }}
+    cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ .Values.operator.name }}-tls-certificates
+    {{- end }}
+    {{- end }}
+    {{- if .Values.additionalAnnotations }}
+    {{- toYaml .Values.additionalAnnotations | nindent 4 }}
+    {{- end }}
+  {{- end }}
+  labels:
+    app.kubernetes.io/name: v1beta1.external.metrics.k8s.io
+    {{- include "keda.labels" . | indent 4 }}
+  name: v1beta1.external.metrics.k8s.io
+spec:
+  service:
+    name: {{ .Values.operator.name }}-metrics-apiserver
+    namespace: {{ .Release.Namespace }}
+    port: {{ .Values.service.portHttps }}
+  group: external.metrics.k8s.io
+  version: v1beta1
+  groupPriorityMinimum: 100
+  versionPriority: 100
+{{- end }}
diff --git a/packages/system/keda/charts/keda/templates/metrics-server/ciliumnetworkpolicy.yaml b/packages/system/keda/charts/keda/templates/metrics-server/ciliumnetworkpolicy.yaml
new file mode 100644
index 0000000000..e16dd727a6
--- /dev/null
+++ b/packages/system/keda/charts/keda/templates/metrics-server/ciliumnetworkpolicy.yaml
@@ -0,0 +1,26 @@
+{{- if and .Values.metricsServer.enabled .Values.networkPolicy.enabled (eq .Values.networkPolicy.flavor "cilium") (.Capabilities.APIVersions.Has "cilium.io/v2") }}
+apiVersion: "cilium.io/v2"
+kind: CiliumNetworkPolicy
+metadata:
+  name: {{ .Values.operator.name }}-metrics-apiserver
+  namespace: {{ .Release.Namespace }}
+  {{- with .Values.additionalAnnotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  labels:
+    app: {{ .Values.operator.name }}-metrics-apiserver
+    app.kubernetes.io/name: {{ .Values.operator.name }}-metrics-apiserver
+    {{- include "keda.labels" . | indent 4 }}
+spec:
+  endpointSelector:
+    matchLabels:
+      app: {{ .Values.operator.name }}-metrics-apiserver
+  egress:
+    - toEntities:
+        - kube-apiserver
+        - cluster
+  ingress:
+    - fromEntities:
+        - cluster
+{{ end }}
diff --git a/packages/system/keda/charts/keda/templates/metrics-server/clusterrole.yaml b/packages/system/keda/charts/keda/templates/metrics-server/clusterrole.yaml
new file mode 100644
index 0000000000..fe482eef16
--- /dev/null
+++ b/packages/system/keda/charts/keda/templates/metrics-server/clusterrole.yaml
@@ -0,0 +1,20 @@
+{{- if and .Values.metricsServer.enabled .Values.rbac.create }}
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  {{- with .Values.additionalAnnotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  labels:
+    app.kubernetes.io/name: {{ .Values.operator.name }}-external-metrics-reader
+    {{- include "keda.labels" . | indent 4 }}
+  name: {{ .Values.operator.name }}-external-metrics-reader
+rules:
+- apiGroups:
+  - external.metrics.k8s.io
+  resources:
+  - 'externalmetrics'
+  verbs:
+  - 'get'
+{{- end -}}
diff --git a/packages/system/keda/charts/keda/templates/metrics-server/clusterrolebinding.yaml b/packages/system/keda/charts/keda/templates/metrics-server/clusterrolebinding.yaml
new file mode 100644
index 0000000000..cf489df823
--- /dev/null
+++ b/packages/system/keda/charts/keda/templates/metrics-server/clusterrolebinding.yaml
@@ -0,0 +1,63 @@
+{{- if and .Values.metricsServer.enabled .Values.rbac.create }}
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  {{- with .Values.additionalAnnotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  labels:
+    app.kubernetes.io/name: {{ .Values.operator.name }}-system-auth-delegator
+    {{- include "keda.labels" . | indent 4 }}
+  name: {{ .Values.operator.name }}-system-auth-delegator
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: system:auth-delegator
+subjects:
+- kind: ServiceAccount
+  name: {{ (.Values.serviceAccount.metricServer).name | default .Values.serviceAccount.name }}
+  namespace: {{ .Release.Namespace }}
+---
+# https://kubernetes.io/docs/tasks/extend-kubernetes/configure-aggregation-layer/#extension-apiserver-authenticates-the-request
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  {{- with .Values.additionalAnnotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  labels:
+    app.kubernetes.io/name: {{ .Values.operator.name }}-auth-reader
+    {{- include "keda.labels" . | indent 4 }}
+  name: {{ .Values.operator.name }}-auth-reader
+  namespace: {{ .Values.rbac.controlPlaneServiceAccountsNamespace }}
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: extension-apiserver-authentication-reader
+subjects:
+- kind: ServiceAccount
+  name: {{ (.Values.serviceAccount.metricServer).name | default .Values.serviceAccount.name }}
+  namespace: {{ .Release.Namespace }}
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  {{- with .Values.additionalAnnotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  labels:
+    app.kubernetes.io/name: {{ .Values.operator.name }}-hpa-controller-external-metrics
+    {{- include "keda.labels" . | indent 4 }}
+  name: {{ .Values.operator.name }}-hpa-controller-external-metrics
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: {{ .Values.operator.name }}-external-metrics-reader
+subjects:
+- kind: ServiceAccount
+  name: horizontal-pod-autoscaler
+  namespace: kube-system
+{{- end -}}
diff --git a/packages/system/keda/charts/keda/templates/metrics-server/deployment.yaml b/packages/system/keda/charts/keda/templates/metrics-server/deployment.yaml
new file mode 100644
index 0000000000..3d19aa2e96
--- /dev/null
+++ b/packages/system/keda/charts/keda/templates/metrics-server/deployment.yaml
@@ -0,0 +1,220 @@
+{{- if .Values.metricsServer.enabled }}
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ .Values.operator.name }}-metrics-apiserver
+  namespace: {{ .Release.Namespace }}
+  {{- with .Values.additionalAnnotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  labels:
+    app: {{ .Values.operator.name }}-metrics-apiserver
+    app.kubernetes.io/name: {{ .Values.operator.name }}-metrics-apiserver
+    {{- include "keda.labels" . | indent 4 }}
+spec:
+  revisionHistoryLimit: {{ .Values.metricsServer.revisionHistoryLimit}}
+  replicas: {{ .Values.metricsServer.replicaCount }}
+  {{- with .Values.upgradeStrategy.metricsApiServer }}
+  strategy:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  selector:
+    matchLabels:
+      app: {{ .Values.operator.name }}-metrics-apiserver
+  template:
+    metadata:
+      labels:
+        app: {{ .Values.operator.name }}-metrics-apiserver
+        app.kubernetes.io/name: {{ .Values.operator.name }}-metrics-apiserver
+        {{- include "keda.labels" . | indent 8 }}
+        {{- if .Values.podLabels.metricsAdapter }}
+        {{- toYaml .Values.podLabels.metricsAdapter | nindent 8}}
+        {{- end }}
+      {{- if or .Values.additionalAnnotations .Values.podAnnotations.metricsAdapter (and .Values.prometheus.metricServer.enabled ( not (or .Values.prometheus.metricServer.podMonitor.enabled .Values.prometheus.metricServer.serviceMonitor.enabled )) )}}
+      annotations:
+        {{- if .Values.additionalAnnotations }}
+        {{- toYaml .Values.additionalAnnotations | nindent 8 }}
+        {{- end }}
+        {{- if and .Values.prometheus.metricServer.enabled ( not (or .Values.prometheus.metricServer.podMonitor.enabled .Values.prometheus.metricServer.serviceMonitor.enabled )) }}
+        prometheus.io/scrape: "true"
+        prometheus.io/port: {{ .Values.prometheus.metricServer.port | quote }}
+        {{- end }}
+        {{- if .Values.podAnnotations.metricsAdapter }}
+        {{- toYaml .Values.podAnnotations.metricsAdapter | nindent 8}}
+        {{- end }}
+      {{- end }}
+    spec:
+      enableServiceLinks: {{ .Values.enableServiceLinks }}
+      {{- if .Values.priorityClassName }}
+      priorityClassName: {{ .Values.priorityClassName | quote }}
+      {{- end }}
+      {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      serviceAccountName: {{ (.Values.serviceAccount.metricServer).name | default .Values.serviceAccount.name }}
+      automountServiceAccountToken: {{ kindIs "invalid" (.Values.serviceAccount.metricServer).automountServiceAccountToken | ternary .Values.serviceAccount.automountServiceAccountToken (.Values.serviceAccount.metricServer).automountServiceAccountToken }}
+      securityContext:
+        {{- if .Values.podSecurityContext.metricServer }}
+        {{- toYaml .Values.podSecurityContext.metricServer | nindent 8 }}
+        {{- else }}
+        {{- toYaml .Values.podSecurityContext | nindent 8 }}
+        {{- end }}
+      containers:
+        - name: {{ .Values.operator.name }}-metrics-apiserver
+          securityContext:
+            {{- if .Values.securityContext.metricServer }}
+            {{- toYaml .Values.securityContext.metricServer | nindent 12 }}
+            {{- else }}
+            {{- toYaml .Values.securityContext | nindent 12 }}
+            {{- end }}
+          {{- $registry := .Values.global.image.registry | default .Values.image.metricsApiServer.registry | default "" }}
+          {{- if $registry }}
+          image: "{{ $registry }}/{{ .Values.image.metricsApiServer.repository }}:{{ .Values.image.metricsApiServer.tag | default .Chart.AppVersion }}"
+          {{- else }}
+          image: "{{ .Values.image.metricsApiServer.repository }}:{{ .Values.image.metricsApiServer.tag | default .Chart.AppVersion }}"
+          {{- end }}
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          livenessProbe:
+            httpGet:
+              path: /healthz
+              port: {{ .Values.service.portHttpsTarget }}
+              scheme: HTTPS
+            initialDelaySeconds: {{ .Values.metricsServer.livenessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.metricsServer.livenessProbe.periodSeconds }}
+            timeoutSeconds: {{ .Values.metricsServer.livenessProbe.timeoutSeconds }}
+            failureThreshold: {{ .Values.metricsServer.livenessProbe.failureThreshold }}
+            successThreshold: {{ .Values.metricsServer.livenessProbe.successThreshold }}
+          readinessProbe:
+            httpGet:
+              path: /readyz
+              port: {{ .Values.service.portHttpsTarget }}
+              scheme: HTTPS
+            initialDelaySeconds: {{ .Values.metricsServer.readinessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.metricsServer.readinessProbe.periodSeconds }}
+            timeoutSeconds: {{ .Values.metricsServer.readinessProbe.timeoutSeconds }}
+            failureThreshold: {{ .Values.metricsServer.readinessProbe.failureThreshold }}
+            successThreshold: {{ .Values.metricsServer.readinessProbe.successThreshold }}
+          env:
+            - name: WATCH_NAMESPACE
+              value: {{ .Values.watchNamespace | quote }}
+            - name: POD_NAMESPACE
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.namespace
+            - name: KEDA_HTTP_DEFAULT_TIMEOUT
+              value: {{ .Values.http.timeout | quote }}
+            - name: KEDA_HTTP_MIN_TLS_VERSION
+              value: {{ .Values.http.minTlsVersion }}
+            - name: KEDA_HTTP_TLS_CIPHER_LIST
+              value: {{ .Values.http.tlsCipherList | quote }}
+            - name: KEDA_SERVICE_MIN_TLS_VERSION
+              value: {{ .Values.service.minTlsVersion }}
+            - name: KEDA_SERVICE_TLS_CIPHER_LIST
+              value: {{ .Values.service.tlsCipherList | quote }}
+            {{- if ( not .Values.http.keepAlive.enabled ) }}
+            - name: KEDA_HTTP_DISABLE_KEEP_ALIVE
+              value: "true"
+            {{- end }}
+            {{- if .Values.permissions.metricServer.restrict.secret }}
+            - name: KEDA_RESTRICT_SECRET_ACCESS
+              value: {{ .Values.permissions.metricServer.restrict.secret | quote }}
+            {{- end }}
+            {{- if .Values.env }}
+            {{- toYaml .Values.env | nindent 12 -}}
+            {{- end }}
+          command:
+           - /keda-adapter
+          args:
+          - --port={{ .Values.prometheus.metricServer.port }}
+          - --secure-port={{ .Values.service.portHttpsTarget }}
+          - --logtostderr=true
+          - --stderrthreshold={{ .Values.logging.metricServer.stderrthreshold }}
+          - --disable-compression={{ .Values.metricsServer.disableCompression}}
+          - --metrics-service-address={{ .Values.operator.name }}.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}:9666
+          - --client-ca-file={{ .Values.certificates.mountPath }}/ca.crt
+          - --tls-cert-file={{ .Values.certificates.mountPath }}/tls.crt
+          - --tls-private-key-file={{ .Values.certificates.mountPath }}/tls.key
+          - --cert-dir={{ .Values.certificates.mountPath }}
+          - --v={{ .Values.logging.metricServer.level }}
+          - --zap-log-level={{ .Values.logging.metricServer.zapLevel }}
+          - --zap-encoder={{ .Values.logging.metricServer.zapEncoder }}
+          - --zap-time-encoding={{ .Values.logging.metricServer.zapTimeEncoding }}
+          {{- if .Values.profiling.metricsServer.enabled }}
+          - "--profiling-bind-address=:{{ .Values.profiling.metricsServer.port }}"
+          {{- end }}
+          {{- range $key, $value := .Values.extraArgs.metricsAdapter }}
+          - --{{ $key }}={{ $value }}
+          {{- end }}
+          ports:
+            - containerPort: {{ .Values.service.portHttpsTarget }}
+              name: https
+              protocol: TCP
+            - containerPort: {{ .Values.prometheus.metricServer.port }}
+              name: {{ .Values.prometheus.metricServer.portName }}
+              protocol: TCP
+          volumeMounts:
+          - mountPath: {{ .Values.certificates.mountPath }}
+            name: certificates
+            readOnly: true
+          {{- if .Values.grpcTLSCertsSecret }}
+          - name: grpc-certs
+            mountPath: /grpccerts
+          {{- end }}
+          {{- if .Values.hashiCorpVaultTLS }}
+          - name: hashicorp-vault-certs
+            mountPath: /hashicorp-vaultcerts
+          {{- end }}
+          {{- if .Values.volumes.metricsApiServer.extraVolumeMounts }}
+          {{- toYaml .Values.volumes.metricsApiServer.extraVolumeMounts | nindent 10 }}
+          {{- end }}
+          resources:
+            {{- if .Values.resources.metricServer }}
+            {{- toYaml .Values.resources.metricServer | nindent 12 }}
+            {{- else }}
+            {{- toYaml .Values.resources | nindent 12 }}
+            {{- end }}
+      volumes:
+      - name: certificates
+        secret:
+          defaultMode: 420
+          secretName: {{ .Values.certificates.secretName }}
+      {{- if .Values.grpcTLSCertsSecret }}
+      - name: grpc-certs
+        secret:
+          secretName: {{ .Values.grpcTLSCertsSecret }}
+      {{- end }}
+      {{- if .Values.hashiCorpVaultTLS }}
+      - name: hashicorp-vault-certs
+        secret:
+          secretName: {{ .Values.hashiCorpVaultTLS }}
+      {{- end }}
+      {{- if .Values.volumes.metricsApiServer.extraVolumes }}
+      {{- toYaml .Values.volumes.metricsApiServer.extraVolumes | nindent 6 }}
+      {{- end }}
+      {{- $dnsConfig := .Values.metricsServer.dnsConfig | default .Values.global.dnsConfig }}
+      {{- if $dnsConfig }}
+      dnsConfig:
+      {{- toYaml $dnsConfig | nindent 8 }}
+      {{- end }}
+      dnsPolicy: {{ .Values.metricsServer.dnsPolicy }}
+      hostNetwork: {{ .Values.metricsServer.useHostNetwork }}
+      nodeSelector:
+        kubernetes.io/os: linux
+      {{- with .Values.metricsServer.nodeSelector | default .Values.nodeSelector }}
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.metricsServer.affinity | default .Values.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.topologySpreadConstraints.metricsServer}}
+      topologySpreadConstraints:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.metricsServer.tolerations | default .Values.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+{{- end }}
diff --git a/packages/system/keda/charts/keda/templates/metrics-server/networkpolicy.yaml b/packages/system/keda/charts/keda/templates/metrics-server/networkpolicy.yaml
new file mode 100644
index 0000000000..f21730383f
--- /dev/null
+++ b/packages/system/keda/charts/keda/templates/metrics-server/networkpolicy.yaml
@@ -0,0 +1,79 @@
+{{- if and .Values.metricsServer.enabled .Values.networkPolicy.enabled (eq .Values.networkPolicy.flavor "kubernetes") }}
+apiVersion: networking.k8s.io/v1
+kind: NetworkPolicy
+metadata:
+  name: {{ .Values.operator.name }}-metrics-apiserver
+  namespace: {{ .Release.Namespace }}
+  {{- with .Values.additionalAnnotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  labels:
+    app: {{ .Values.operator.name }}-metrics-apiserver
+    app.kubernetes.io/name: {{ .Values.operator.name }}-metrics-apiserver
+    {{- include "keda.labels" . | indent 4 }}
+spec:
+  podSelector:
+    matchLabels:
+      app: {{ .Values.operator.name }}-metrics-apiserver
+  policyTypes:
+    - Ingress
+    - Egress
+  ingress:
+    # Allow ingress from any pod in the cluster on the HTTPS metrics API port
+    - from:
+        - namespaceSelector: {}
+      ports:
+        - protocol: TCP
+          port: {{ .Values.service.portHttpsTarget }}
+    {{- if .Values.prometheus.metricServer.enabled }}
+    # Allow ingress from any pod in the cluster on the prometheus metrics port
+    - from:
+        - namespaceSelector: {}
+      ports:
+        - protocol: TCP
+          port: {{ .Values.prometheus.metricServer.port }}
+    {{- end }}
+    {{- if .Values.profiling.metricsServer.enabled }}
+    # Allow ingress from any pod in the cluster on the profiling port
+    - from:
+        - namespaceSelector: {}
+      ports:
+        - protocol: TCP
+          port: {{ .Values.profiling.metricsServer.port }}
+    {{- end }}
+  egress:
+    # Allow DNS resolution
+    - to:
+        - namespaceSelector: {}
+          podSelector:
+            matchLabels:
+              k8s-app: kube-dns
+      ports:
+        - protocol: UDP
+          port: 53
+        - protocol: TCP
+          port: 53
+    # Allow access to Kubernetes API server
+    - to:
+        - namespaceSelector: {}
+      ports:
+        - protocol: TCP
+          port: 443
+        - protocol: TCP
+          port: 6443
+    # Allow egress to KEDA operator for gRPC metrics service
+    - to:
+        - podSelector:
+            matchLabels:
+              app: {{ .Values.operator.name }}
+      ports:
+        - protocol: TCP
+          port: 9666
+    # Allow egress to any pod in the cluster for metric collection
+    - to:
+        - namespaceSelector: {}
+    {{- if .Values.networkPolicy.kubernetes.metricsServer.extraEgressRules }}
+    {{ toYaml .Values.networkPolicy.kubernetes.metricsServer.extraEgressRules | nindent 4 }}
+    {{- end }}
+{{- end }}
diff --git a/packages/system/keda/charts/keda/templates/metrics-server/poddisruptionbudget.yaml b/packages/system/keda/charts/keda/templates/metrics-server/poddisruptionbudget.yaml
new file mode 100644
index 0000000000..17720e6fb2
--- /dev/null
+++ b/packages/system/keda/charts/keda/templates/metrics-server/poddisruptionbudget.yaml
@@ -0,0 +1,33 @@
+{{- if and .Values.metricsServer.enabled (or (or .Values.podDisruptionBudget.minAvailable .Values.podDisruptionBudget.maxUnavailable) .Values.podDisruptionBudget.metricServer) }}
+apiVersion: policy/v1
+kind: PodDisruptionBudget
+metadata:
+  namespace: {{ .Release.Namespace }}
+  name: {{ .Values.operator.name }}-metrics-apiserver
+  {{- with .Values.additionalAnnotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  labels:
+    app.kubernetes.io/name: {{ .Values.operator.name }}-metrics-apiserver
+    {{- include "keda.labels" . | indent 4 }}
+spec:
+  {{- if .Values.podDisruptionBudget.minAvailable }}
+  minAvailable: {{ .Values.podDisruptionBudget.minAvailable }}
+  {{- end }}
+  {{-  if .Values.podDisruptionBudget.maxUnavailable }}
+  maxUnavailable: {{ .Values.podDisruptionBudget.maxUnavailable }}
+  {{- end }}
+  {{- if .Values.podDisruptionBudget.metricServer }}
+  {{- if .Values.podDisruptionBudget.metricServer.minAvailable }}
+  minAvailable: {{ .Values.podDisruptionBudget.metricServer.minAvailable }}
+  {{- end }}
+  {{- if  .Values.podDisruptionBudget.metricServer.maxUnavailable }}
+  maxUnavailable: {{ .Values.podDisruptionBudget.metricServer.maxUnavailable }}
+  {{- end }}
+  {{- end }}
+  selector:
+    matchLabels:
+      app: {{ .Values.operator.name }}-metrics-apiserver
+{{- end }}
+
diff --git a/packages/system/keda/charts/keda/templates/metrics-server/podmonitor.yaml b/packages/system/keda/charts/keda/templates/metrics-server/podmonitor.yaml
new file mode 100644
index 0000000000..b683a35974
--- /dev/null
+++ b/packages/system/keda/charts/keda/templates/metrics-server/podmonitor.yaml
@@ -0,0 +1,43 @@
+{{- if and .Values.metricsServer.enabled .Values.prometheus.metricServer.enabled .Values.prometheus.metricServer.podMonitor.enabled }}
+apiVersion: monitoring.coreos.com/v1
+kind: PodMonitor
+metadata:
+  name: {{ .Values.operator.name }}-metrics-apiserver
+  {{- with .Values.additionalAnnotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  labels:
+    app.kubernetes.io/name: {{ .Values.operator.name }}
+    {{- include "keda.labels" . | indent 4 }}
+    {{- range $key, $value := .Values.prometheus.metricServer.podMonitor.additionalLabels }}
+    {{ $key }}: {{ $value | quote }}
+    {{- end }}
+  {{- with .Values.prometheus.metricServer.podMonitor.namespace }}
+  namespace: {{ . }}
+  {{- end }}
+spec:
+  podMetricsEndpoints:
+  - port: {{ .Values.prometheus.metricServer.portName }}
+    path: /metrics
+    {{- with .Values.prometheus.metricServer.podMonitor.interval }}
+    interval: {{ . }}
+    {{- end }}
+    {{- with .Values.prometheus.metricServer.podMonitor.scrapeTimeout }}
+    scrapeTimeout: {{ . }}
+    {{- end }}
+    {{- with .Values.prometheus.metricServer.podMonitor.relabelings }}
+    relabelings:
+{{ toYaml . | indent 4 }}
+    {{- end }}
+    {{- with .Values.prometheus.metricServer.podMonitor.metricRelabelings }}
+    metricRelabelings:
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+  namespaceSelector:
+    matchNames:
+    - {{ .Release.Namespace }}
+  selector:
+    matchLabels:
+      app: {{ .Values.operator.name }}-metrics-apiserver
+{{- end }}
diff --git a/packages/system/keda/charts/keda/templates/metrics-server/service.yaml b/packages/system/keda/charts/keda/templates/metrics-server/service.yaml
new file mode 100644
index 0000000000..71ff255a25
--- /dev/null
+++ b/packages/system/keda/charts/keda/templates/metrics-server/service.yaml
@@ -0,0 +1,52 @@
+{{- if .Values.metricsServer.enabled }}
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    app.kubernetes.io/name: {{ .Values.operator.name }}-metrics-apiserver
+    app: {{ .Values.operator.name }}-metrics-apiserver
+    {{- include "keda.labels" . | indent 4 }}
+  name: {{ .Values.operator.name }}-metrics-apiserver
+  namespace: {{ .Release.Namespace }}
+  {{- if or .Values.additionalAnnotations .Values.service.annotations (and .Values.prometheus.metricServer.enabled ( not (or .Values.prometheus.metricServer.podMonitor.enabled .Values.prometheus.metricServer.serviceMonitor.enabled )))}}
+  annotations:
+    {{- if and .Values.prometheus.metricServer.enabled ( not (or .Values.prometheus.metricServer.podMonitor.enabled .Values.prometheus.metricServer.serviceMonitor.enabled )) }}
+    prometheus.io/scrape: "true"
+    prometheus.io/port: {{ .Values.prometheus.metricServer.port | quote }}
+    prometheus.io/path: "/metrics"
+    {{- end }}
+    {{- with .Values.additionalAnnotations }}
+      {{- range $key, $value := . }}
+    {{ $key }}: {{ $value | quote }}
+      {{- end }}
+    {{- end }}
+    {{- with .Values.service.annotations }}
+      {{- range $key, $value := . }}
+    {{ $key }}: {{ $value | quote }}
+      {{- end }}
+    {{- end }}
+  {{- end }}
+spec:
+  type: {{ .Values.service.type }}
+  ports:
+  - name: https
+    port: {{ .Values.service.portHttps }}
+    targetPort: {{ .Values.service.portHttpsTarget }}
+    protocol: TCP
+    appProtocol: https
+  - name: {{ .Values.prometheus.metricServer.portName }}
+    port: {{ .Values.prometheus.metricServer.port }}
+    targetPort: {{ .Values.prometheus.metricServer.port }}
+    protocol: TCP
+    {{- with .Values.prometheus.metricServer.appProtocol }}
+    appProtocol: {{ . }}
+    {{- end }}
+  {{- if .Values.profiling.metricsServer.enabled }}
+  - name: profiling
+    port: {{ .Values.profiling.metricsServer.port }}
+    targetPort: {{ .Values.profiling.metricsServer.port }}
+    protocol: TCP
+  {{- end }}
+  selector:
+    app: {{ .Values.operator.name }}-metrics-apiserver
+{{- end }}
diff --git a/packages/system/keda/charts/keda/templates/metrics-server/serviceaccount.yaml b/packages/system/keda/charts/keda/templates/metrics-server/serviceaccount.yaml
new file mode 100644
index 0000000000..ba7f9360cc
--- /dev/null
+++ b/packages/system/keda/charts/keda/templates/metrics-server/serviceaccount.yaml
@@ -0,0 +1,20 @@
+{{- if and .Values.metricsServer.enabled ((.Values.serviceAccount.metricServer).create | default .Values.serviceAccount.create) -}}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  labels:
+    app.kubernetes.io/name: {{ (.Values.serviceAccount.metricServer).name | default .Values.serviceAccount.name }}
+    {{- include "keda.labels" . | nindent 4 }}
+  {{- if or .Values.additionalAnnotations ((.Values.serviceAccount.metricServer).annotations | default .Values.serviceAccount.annotations) }}
+  annotations:
+    {{- if .Values.additionalAnnotations }}
+    {{- toYaml .Values.additionalAnnotations | nindent 4 }}
+    {{- end }}
+    {{- if (.Values.serviceAccount.metricServer).annotations | default .Values.serviceAccount.annotations }}
+    {{- toYaml ((.Values.serviceAccount.metricServer).annotations | default .Values.serviceAccount.annotations) | nindent 4}}
+    {{- end }}
+  {{- end }}
+  name: {{ (.Values.serviceAccount.metricServer).name | default .Values.serviceAccount.name }}
+  namespace: {{ .Release.Namespace }}
+automountServiceAccountToken: {{ kindIs "invalid" (.Values.serviceAccount.metricServer).automountServiceAccountToken | ternary .Values.serviceAccount.automountServiceAccountToken (.Values.serviceAccount.metricServer).automountServiceAccountToken }}
+{{- end -}}
diff --git a/packages/system/keda/charts/keda/templates/metrics-server/servicemonitor.yaml b/packages/system/keda/charts/keda/templates/metrics-server/servicemonitor.yaml
new file mode 100644
index 0000000000..a06e1fc23b
--- /dev/null
+++ b/packages/system/keda/charts/keda/templates/metrics-server/servicemonitor.yaml
@@ -0,0 +1,69 @@
+{{- if and .Values.metricsServer.enabled .Values.prometheus.metricServer.enabled .Values.prometheus.metricServer.serviceMonitor.enabled }}
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: {{ .Values.operator.name }}-metrics-apiserver
+  {{- with .Values.additionalAnnotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  labels:
+    app.kubernetes.io/name: {{ .Values.operator.name }}
+    {{- include "keda.labels" . | indent 4 }}
+    {{- range $key, $value := .Values.prometheus.metricServer.serviceMonitor.additionalLabels }}
+    {{ $key }}: {{ $value | quote }}
+    {{- end }}
+  {{- with .Values.prometheus.metricServer.serviceMonitor.namespace }}
+  namespace: {{ . }}
+  {{- end }}
+spec:
+  {{- with .Values.prometheus.metricServer.serviceMonitor.jobLabel }}
+  jobLabel: {{ . }}
+  {{- end }}
+  {{- with .Values.prometheus.metricServer.serviceMonitor.targetLabels }}
+  targetLabels:
+  {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- with .Values.prometheus.metricServer.serviceMonitor.podTargetLabels }}
+  podTargetLabels:
+  {{- toYaml . | nindent 4 }}
+  {{- end }}
+  endpoints:
+  - port: {{ .Values.prometheus.metricServer.portName }}
+    {{- with .Values.prometheus.metricServer.serviceMonitor.targetPort }}
+    targetPort: {{ . }}
+    {{- end }}
+    path: /metrics
+    {{- with .Values.prometheus.metricServer.serviceMonitor.interval }}
+    interval: {{ . }}
+    {{- end }}
+    {{- with .Values.prometheus.metricServer.serviceMonitor.scrapeTimeout }}
+    scrapeTimeout: {{ . }}
+    {{- end }}
+  {{- if .Values.prometheus.metricServer.serviceMonitor.relabelings}}
+    {{- with .Values.prometheus.metricServer.serviceMonitor.relabelings }}
+    relabelings:
+    {{- toYaml . | nindent 6 }}
+    {{- end }}
+  {{- else }}
+    {{- with .Values.prometheus.metricServer.serviceMonitor.relabellings }}
+    relabelings:
+    {{- toYaml . | nindent 6 }}
+    {{- end }}
+  {{- end}}
+    {{- with .Values.prometheus.metricServer.serviceMonitor.metricRelabelings }}
+    metricRelabelings:
+    {{- toYaml . | nindent 6 }}
+    {{- end }}
+    scheme: {{ .Values.prometheus.metricServer.serviceMonitor.scheme }}
+    {{- with .Values.prometheus.metricServer.serviceMonitor.tlsConfig }}
+    tlsConfig:
+    {{ toYaml . | nindent 6}}
+    {{- end }}
+  namespaceSelector:
+    matchNames:
+    - {{ .Release.Namespace }}
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: {{ .Values.operator.name }}-metrics-apiserver
+{{- end }}
diff --git a/packages/system/keda/charts/keda/templates/webhooks/ciliumnetworkpolicy.yaml b/packages/system/keda/charts/keda/templates/webhooks/ciliumnetworkpolicy.yaml
new file mode 100644
index 0000000000..4e59d41f41
--- /dev/null
+++ b/packages/system/keda/charts/keda/templates/webhooks/ciliumnetworkpolicy.yaml
@@ -0,0 +1,27 @@
+{{- if and .Values.webhooks.enabled .Values.networkPolicy.enabled (eq .Values.networkPolicy.flavor "cilium") (.Capabilities.APIVersions.Has "cilium.io/v2") }}
+apiVersion: "cilium.io/v2"
+kind: CiliumNetworkPolicy
+metadata:
+  name: {{ .Values.webhooks.name }}
+  namespace: {{ .Release.Namespace }}
+  {{- with .Values.additionalAnnotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  labels:
+    app: {{ .Values.webhooks.name }}
+    name: {{ .Values.webhooks.name }}
+    app.kubernetes.io/name: {{ .Values.webhooks.name }}
+    {{- include "keda.labels" . | indent 4 }}
+spec:
+  endpointSelector:
+    matchLabels:
+      app: {{ .Values.webhooks.name }}
+  egress:
+    - toEntities:
+        - kube-apiserver
+        - cluster
+  ingress:
+    - fromEntities:
+        - cluster
+{{ end }}
diff --git a/packages/system/keda/charts/keda/templates/webhooks/clusterrole.yaml b/packages/system/keda/charts/keda/templates/webhooks/clusterrole.yaml
new file mode 100644
index 0000000000..18607e842d
--- /dev/null
+++ b/packages/system/keda/charts/keda/templates/webhooks/clusterrole.yaml
@@ -0,0 +1,50 @@
+{{- if .Values.rbac.create }}
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  {{- with .Values.additionalAnnotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  labels:
+    app.kubernetes.io/name: {{ .Values.operator.name }}-webhook
+    {{- include "keda.labels" . | indent 4 }}
+  name: {{ .Values.operator.name }}-webhook
+rules:
+- apiGroups:
+  - autoscaling
+  resources:
+  - horizontalpodautoscalers
+  verbs:
+  - list
+  - watch
+- apiGroups:
+  - keda.sh
+  resources:
+  - scaledobjects
+  verbs:
+  - list
+  - watch
+- apiGroups:
+  - apps
+  resources:
+  - deployments
+  - statefulsets
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - ""
+  resources:
+  - limitranges
+  verbs:
+  - list
+- apiGroups:
+  - events.k8s.io
+  resources:
+  - events
+  verbs:
+  - create
+  - patch
+{{- end -}}
diff --git a/packages/system/keda/charts/keda/templates/webhooks/clusterrolebindings.yaml b/packages/system/keda/charts/keda/templates/webhooks/clusterrolebindings.yaml
new file mode 100644
index 0000000000..4c30a94ad3
--- /dev/null
+++ b/packages/system/keda/charts/keda/templates/webhooks/clusterrolebindings.yaml
@@ -0,0 +1,21 @@
+{{- if .Values.rbac.create }}
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  {{- with .Values.additionalAnnotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  labels:
+    app.kubernetes.io/name: {{ .Values.operator.name }}-webhook
+    {{- include "keda.labels" . | indent 4 }}
+  name: {{ .Values.operator.name }}-webhook
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: {{ .Values.operator.name }}-webhook
+subjects:
+- kind: ServiceAccount
+  name: {{ (.Values.serviceAccount.webhooks).name | default .Values.serviceAccount.name }}
+  namespace: {{ .Release.Namespace }}
+{{- end }}
diff --git a/packages/system/keda/charts/keda/templates/webhooks/deployment.yaml b/packages/system/keda/charts/keda/templates/webhooks/deployment.yaml
new file mode 100644
index 0000000000..5aaed6882b
--- /dev/null
+++ b/packages/system/keda/charts/keda/templates/webhooks/deployment.yaml
@@ -0,0 +1,180 @@
+{{- if and .Values.webhooks.enabled }}
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ .Values.webhooks.name }}
+  namespace: {{ .Release.Namespace }}
+  {{- with .Values.additionalAnnotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  labels:
+    app: {{ .Values.webhooks.name }}
+    name: {{ .Values.webhooks.name }}
+    app.kubernetes.io/name: {{ .Values.webhooks.name }}
+    {{- include "keda.labels" . | indent 4 }}
+spec:
+  revisionHistoryLimit: {{ .Values.webhooks.revisionHistoryLimit}}
+  replicas: {{ .Values.webhooks.replicaCount}}
+  {{- with .Values.upgradeStrategy.webhooks }}
+  strategy:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  selector:
+    matchLabels:
+      app: {{ .Values.webhooks.name }}
+  template:
+    metadata:
+      labels:
+        app: {{ .Values.webhooks.name }}
+        name: {{ .Values.webhooks.name }}
+        app.kubernetes.io/name: {{ .Values.webhooks.name }}
+        {{- include "keda.labels" . | indent 8 }}
+        {{- if .Values.podLabels.webhooks }}
+        {{- toYaml .Values.podLabels.webhooks | nindent 8 }}
+        {{- end }}
+      {{- if or .Values.podAnnotations.webhooks .Values.additionalAnnotations }}
+      annotations:
+        {{- if .Values.podAnnotations.webhooks }}
+        {{- toYaml .Values.podAnnotations.webhooks | nindent 8 }}
+        {{- end }}
+        {{- if .Values.additionalAnnotations }}
+        {{- toYaml .Values.additionalAnnotations | nindent 8 }}
+        {{- end }}
+      {{- end }}
+    spec:
+      enableServiceLinks: {{ .Values.enableServiceLinks }}
+      {{- if .Values.priorityClassName }}
+      priorityClassName: {{ .Values.priorityClassName | quote }}
+      {{- end }}
+      {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      serviceAccountName: {{ (.Values.serviceAccount.webhooks).name | default .Values.serviceAccount.name }}
+      automountServiceAccountToken: {{ kindIs "invalid" (.Values.serviceAccount.webhooks).automountServiceAccountToken | ternary .Values.serviceAccount.automountServiceAccountToken (.Values.serviceAccount.webhooks).automountServiceAccountToken }}
+      securityContext:
+        {{- if .Values.podSecurityContext.webhooks }}
+        {{- toYaml .Values.podSecurityContext.webhooks | nindent 8 }}
+        {{- else }}
+        {{- toYaml .Values.podSecurityContext | nindent 8 }}
+        {{- end }}
+      containers:
+        - name: {{ .Values.webhooks.name }}
+          securityContext:
+            {{- if .Values.securityContext.webhooks }}
+            {{- toYaml .Values.securityContext.webhooks | nindent 12 }}
+            {{- else }}
+            {{- toYaml .Values.securityContext | nindent 12 }}
+            {{- end }}
+          {{- $registry := .Values.global.image.registry | default .Values.image.webhooks.registry | default "" }}
+          {{- if $registry }}
+          image: "{{ $registry }}/{{ .Values.image.webhooks.repository }}:{{ .Values.image.webhooks.tag | default .Chart.AppVersion }}"
+          {{- else }}
+          image: "{{ .Values.image.webhooks.repository }}:{{ .Values.image.webhooks.tag | default .Chart.AppVersion }}"
+          {{- end }}
+          command:
+          - /keda-admission-webhooks
+          args:
+          - "--zap-log-level={{ .Values.logging.webhooks.level }}"
+          - "--zap-encoder={{ .Values.logging.webhooks.format }}"
+          - "--zap-time-encoding={{ .Values.logging.webhooks.timeEncoding }}"
+          - "--cert-dir={{ .Values.certificates.mountPath }}"
+          - "--health-probe-bind-address=:{{ .Values.webhooks.healthProbePort }}"
+          {{- if .Values.webhooks.port }}
+          - "--port={{ .Values.webhooks.port }}"
+          {{- end }}
+          - --metrics-bind-address=:{{ .Values.prometheus.webhooks.port }}
+          {{- if .Values.profiling.webhooks.enabled }}
+          - "--profiling-bind-address=:{{ .Values.profiling.webhooks.port }}"
+          {{- end }}
+          {{- range $key, $value := .Values.extraArgs.webhooks }}
+          - --{{ $key }}={{ $value }}
+          {{- end }}
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          livenessProbe:
+            httpGet:
+              path: /healthz
+              port: {{ .Values.webhooks.healthProbePort }}
+            initialDelaySeconds: {{ .Values.webhooks.livenessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.webhooks.livenessProbe.periodSeconds }}
+            timeoutSeconds: {{ .Values.webhooks.livenessProbe.timeoutSeconds }}
+            failureThreshold: {{ .Values.webhooks.livenessProbe.failureThreshold }}
+            successThreshold: {{ .Values.webhooks.livenessProbe.successThreshold }}
+          readinessProbe:
+            httpGet:
+              path: /readyz
+              port: {{ .Values.webhooks.healthProbePort }}
+            initialDelaySeconds: {{ .Values.webhooks.readinessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.webhooks.readinessProbe.periodSeconds }}
+            timeoutSeconds: {{ .Values.webhooks.readinessProbe.timeoutSeconds }}
+            failureThreshold: {{ .Values.webhooks.readinessProbe.failureThreshold }}
+            successThreshold: {{ .Values.webhooks.readinessProbe.successThreshold }}
+          ports:
+          - containerPort: {{ .Values.webhooks.port | default 9443 }}
+            name: http
+            protocol: TCP
+          {{- if .Values.prometheus.webhooks.enabled }}
+          - containerPort: {{ .Values.prometheus.webhooks.port }}
+            name: metrics
+            protocol: TCP
+          {{- end }}
+          env:
+            - name: WATCH_NAMESPACE
+              value: {{ .Values.watchNamespace | quote }}
+            - name: POD_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.name
+            - name: POD_NAMESPACE
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.namespace
+            {{- if .Values.env }}
+            {{- toYaml .Values.env | nindent 12 -}}
+            {{- end }}
+          volumeMounts:
+          - mountPath: {{ .Values.certificates.mountPath }}
+            name: certificates
+            readOnly: true
+          {{- if .Values.volumes.webhooks.extraVolumeMounts }}
+          {{- toYaml .Values.volumes.webhooks.extraVolumeMounts | nindent 10 }}
+          {{- end }}
+          resources:
+            {{- if .Values.resources.webhooks }}
+            {{- toYaml .Values.resources.webhooks | nindent 12 }}
+            {{- else }}
+            {{- toYaml .Values.resources | nindent 12 }}
+            {{- end }}
+      volumes:
+      - name: certificates
+        secret:
+          defaultMode: 420
+          secretName: {{ .Values.certificates.secretName }}
+      {{- if .Values.volumes.webhooks.extraVolumes }}
+      {{- toYaml .Values.volumes.webhooks.extraVolumes | nindent 6 }}
+      {{- end }}
+      hostNetwork: {{ .Values.webhooks.useHostNetwork }}
+      nodeSelector:
+        kubernetes.io/os: linux
+      {{- with .Values.webhooks.nodeSelector | default .Values.nodeSelector }}
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.webhooks.affinity | default .Values.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.topologySpreadConstraints.webhooks }}
+      topologySpreadConstraints:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.webhooks.tolerations | default .Values.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- $dnsConfig := .Values.webhooks.dnsConfig | default .Values.global.dnsConfig }}
+      {{- if $dnsConfig }}
+      dnsConfig:
+      {{- toYaml $dnsConfig | nindent 8 }}
+      {{- end }}
+{{- end }}
diff --git a/packages/system/keda/charts/keda/templates/webhooks/networkpolicy.yaml b/packages/system/keda/charts/keda/templates/webhooks/networkpolicy.yaml
new file mode 100644
index 0000000000..ebe98d5a69
--- /dev/null
+++ b/packages/system/keda/charts/keda/templates/webhooks/networkpolicy.yaml
@@ -0,0 +1,72 @@
+{{- if and .Values.webhooks.enabled .Values.networkPolicy.enabled (eq .Values.networkPolicy.flavor "kubernetes") }}
+apiVersion: networking.k8s.io/v1
+kind: NetworkPolicy
+metadata:
+  name: {{ .Values.webhooks.name }}
+  namespace: {{ .Release.Namespace }}
+  {{- with .Values.additionalAnnotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  labels:
+    app: {{ .Values.webhooks.name }}
+    name: {{ .Values.webhooks.name }}
+    app.kubernetes.io/name: {{ .Values.webhooks.name }}
+    {{- include "keda.labels" . | indent 4 }}
+spec:
+  podSelector:
+    matchLabels:
+      app: {{ .Values.webhooks.name }}
+  policyTypes:
+    - Ingress
+    - Egress
+  ingress:
+    # Allow ingress from Kubernetes API server for admission webhooks
+    - from:
+        - namespaceSelector: {}
+      ports:
+        - protocol: TCP
+          port: {{ .Values.webhooks.port | default 9443 }}
+    {{- if .Values.prometheus.webhooks.enabled }}
+    # Allow ingress from any pod in the cluster on the prometheus metrics port
+    - from:
+        - namespaceSelector: {}
+      ports:
+        - protocol: TCP
+          port: {{ .Values.prometheus.webhooks.port }}
+    {{- end }}
+    {{- if .Values.profiling.webhooks.enabled }}
+    # Allow ingress from any pod in the cluster on the profiling port
+    - from:
+        - namespaceSelector: {}
+      ports:
+        - protocol: TCP
+          port: {{ .Values.profiling.webhooks.port }}
+    {{- end }}
+  egress:
+    # Allow DNS resolution
+    - to:
+        - namespaceSelector: {}
+          podSelector:
+            matchLabels:
+              k8s-app: kube-dns
+      ports:
+        - protocol: UDP
+          port: 53
+        - protocol: TCP
+          port: 53
+    # Allow access to Kubernetes API server
+    - to:
+        - namespaceSelector: {}
+      ports:
+        - protocol: TCP
+          port: 443
+        - protocol: TCP
+          port: 6443
+    # Allow egress to any pod in the cluster for validation
+    - to:
+        - namespaceSelector: {}
+    {{- if .Values.networkPolicy.kubernetes.webhooks.extraEgressRules }}
+    {{ toYaml .Values.networkPolicy.kubernetes.webhooks.extraEgressRules | nindent 4 }}
+    {{- end }}
+{{- end }}
diff --git a/packages/system/keda/charts/keda/templates/webhooks/poddisruptionbudget.yaml b/packages/system/keda/charts/keda/templates/webhooks/poddisruptionbudget.yaml
new file mode 100644
index 0000000000..6fb22538c5
--- /dev/null
+++ b/packages/system/keda/charts/keda/templates/webhooks/poddisruptionbudget.yaml
@@ -0,0 +1,34 @@
+{{- if and .Values.webhooks.enabled }}
+{{- if or (or .Values.podDisruptionBudget.minAvailable .Values.podDisruptionBudget.maxUnavailable)  .Values.podDisruptionBudget.webhooks }}
+apiVersion: policy/v1
+kind: PodDisruptionBudget
+metadata:
+  namespace: {{ .Release.Namespace }}
+  name: {{ .Values.webhooks.name }}
+  {{- with .Values.additionalAnnotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  labels:
+    app.kubernetes.io/name: {{ .Values.webhooks.name }}
+    {{- include "keda.labels" . | indent 4 }}
+spec:
+  {{- if .Values.podDisruptionBudget.minAvailable }}
+  minAvailable: {{ .Values.podDisruptionBudget.minAvailable }}
+  {{- end }}
+  {{-  if .Values.podDisruptionBudget.maxUnavailable }}
+  maxUnavailable: {{ .Values.podDisruptionBudget.maxUnavailable }}
+  {{- end }}
+  {{- if .Values.podDisruptionBudget.webhooks }}
+  {{- if .Values.podDisruptionBudget.webhooks.minAvailable }}
+  minAvailable: {{ .Values.podDisruptionBudget.webhooks.minAvailable }}
+  {{- end }}
+  {{- if  .Values.podDisruptionBudget.webhooks.maxUnavailable }}
+  maxUnavailable: {{ .Values.podDisruptionBudget.webhooks.maxUnavailable }}
+  {{- end }}
+  {{- end }}
+  selector:
+    matchLabels:
+      app: {{ .Values.webhooks.name }}
+{{- end }}
+{{- end }}
\ No newline at end of file
diff --git a/packages/system/keda/charts/keda/templates/webhooks/prometheusrules.yaml b/packages/system/keda/charts/keda/templates/webhooks/prometheusrules.yaml
new file mode 100644
index 0000000000..d434348f88
--- /dev/null
+++ b/packages/system/keda/charts/keda/templates/webhooks/prometheusrules.yaml
@@ -0,0 +1,26 @@
+{{- if and .Values.webhooks.enabled }}
+{{- if and .Values.prometheus.webhooks.enabled .Values.prometheus.webhooks.prometheusRules.enabled }}
+apiVersion: monitoring.coreos.com/v1
+kind: PrometheusRule
+metadata:
+  name: {{ .Values.webhooks.name }}
+  {{- with .Values.additionalAnnotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  labels:
+    app.kubernetes.io/name: {{ .Values.webhooks.name }}
+    {{- include "keda.labels" . | indent 4 }}
+    {{- range $key, $value := .Values.prometheus.webhooks.prometheusRules.additionalLabels }}
+    {{ $key }}: {{ $value | quote }}
+    {{- end }}
+  {{- with .Values.prometheus.webhooks.prometheusRules.namespace }}
+  namespace: {{ . }}
+  {{- end }}
+spec:
+  groups:
+  - name: {{ .Values.webhooks.name }}
+    rules:
+{{ toYaml .Values.prometheus.webhooks.prometheusRules.alerts | indent 6 }}
+{{- end }}
+{{- end }}
\ No newline at end of file
diff --git a/packages/system/keda/charts/keda/templates/webhooks/service.yaml b/packages/system/keda/charts/keda/templates/webhooks/service.yaml
new file mode 100644
index 0000000000..62c21c32e9
--- /dev/null
+++ b/packages/system/keda/charts/keda/templates/webhooks/service.yaml
@@ -0,0 +1,50 @@
+{{- if and .Values.webhooks.enabled }}
+apiVersion: v1
+kind: Service
+metadata:
+  {{- if or (and .Values.prometheus.webhooks.enabled (not .Values.prometheus.webhooks.serviceMonitor.enabled)) .Values.additionalAnnotations .Values.service.annotations }}
+  annotations:
+    {{- if and .Values.prometheus.webhooks.enabled ( not .Values.prometheus.webhooks.serviceMonitor.enabled ) }}
+    prometheus.io/scrape: "true"
+    prometheus.io/port: {{ .Values.prometheus.webhooks.port | quote }}
+    prometheus.io/path: "/metrics"
+    {{- end }}
+    {{- with .Values.additionalAnnotations }}
+      {{- range $key, $value := . }}
+    {{ $key }}: {{ $value | quote }}
+      {{- end }}
+    {{- end }}
+    {{- with .Values.service.annotations }}
+      {{- range $key, $value := . }}
+    {{ $key }}: {{ $value | quote }}
+      {{- end }}
+    {{- end }}
+  {{- end }}
+  labels:
+    app.kubernetes.io/name: {{ .Values.webhooks.name }}
+    {{- include "keda.labels" . | indent 4 }}
+  name: {{ .Values.webhooks.name }}
+  namespace: {{ .Release.Namespace }}
+spec:
+  ports:
+  - name: https
+    port: 443
+    protocol: TCP
+    targetPort: {{ .Values.webhooks.port | default 9443 }}
+    appProtocol: https
+  {{- if .Values.prometheus.webhooks.enabled }}
+  - name: {{ .Values.prometheus.webhooks.serviceMonitor.port }}
+    port: {{ .Values.prometheus.webhooks.port }}
+    targetPort: {{ .Values.prometheus.webhooks.port }}
+        {{- with .Values.prometheus.webhooks.appProtocol }}
+    appProtocol: {{ . }}
+    {{- end }}
+  {{- end }}
+  {{- if .Values.profiling.webhooks.enabled }}
+  - name: profiling
+    port: {{ .Values.profiling.webhooks.port }}
+    targetPort: {{ .Values.profiling.webhooks.port }}
+  {{- end }}
+  selector:
+    app: {{ .Values.webhooks.name }}
+{{- end }}
diff --git a/packages/system/keda/charts/keda/templates/webhooks/serviceaccount.yaml b/packages/system/keda/charts/keda/templates/webhooks/serviceaccount.yaml
new file mode 100644
index 0000000000..3229280300
--- /dev/null
+++ b/packages/system/keda/charts/keda/templates/webhooks/serviceaccount.yaml
@@ -0,0 +1,20 @@
+{{- if (.Values.serviceAccount.webhooks).create | default .Values.serviceAccount.create -}}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  labels:
+    app.kubernetes.io/name: {{ (.Values.serviceAccount.webhooks).name | default .Values.serviceAccount.name }}
+    {{- include "keda.labels" . | nindent 4 }}
+  {{- if or .Values.additionalAnnotations ((.Values.serviceAccount.webhooks).annotations | default .Values.serviceAccount.annotations) }}
+  annotations:
+    {{- if .Values.additionalAnnotations }}
+    {{- toYaml .Values.additionalAnnotations | nindent 4 }}
+    {{- end }}
+    {{- if (.Values.serviceAccount.webhooks).annotations | default .Values.serviceAccount.annotations }}
+    {{- toYaml ((.Values.serviceAccount.webhooks).annotations | default .Values.serviceAccount.annotations) | nindent 4}}
+    {{- end }}
+  {{- end }}
+  name: {{ (.Values.serviceAccount.webhooks).name | default .Values.serviceAccount.name }}
+  namespace: {{ .Release.Namespace }}
+automountServiceAccountToken: {{ kindIs "invalid" (.Values.serviceAccount.webhooks).automountServiceAccountToken | ternary .Values.serviceAccount.automountServiceAccountToken (.Values.serviceAccount.webhooks).automountServiceAccountToken }}
+{{- end -}}
diff --git a/packages/system/keda/charts/keda/templates/webhooks/servicemonitor.yaml b/packages/system/keda/charts/keda/templates/webhooks/servicemonitor.yaml
new file mode 100644
index 0000000000..2286f5a481
--- /dev/null
+++ b/packages/system/keda/charts/keda/templates/webhooks/servicemonitor.yaml
@@ -0,0 +1,71 @@
+{{- if and .Values.webhooks.enabled }}
+{{- if and .Values.prometheus.webhooks.enabled .Values.prometheus.webhooks.serviceMonitor.enabled }}
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: {{ .Values.webhooks.name }}
+  {{- with .Values.additionalAnnotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  labels:
+    app.kubernetes.io/name: {{ .Values.webhooks.name }}
+    {{- include "keda.labels" . | indent 4 }}
+    {{- range $key, $value := .Values.prometheus.webhooks.serviceMonitor.additionalLabels }}
+    {{ $key }}: {{ $value | quote }}
+    {{- end }}
+  {{- with .Values.prometheus.webhooks.serviceMonitor.namespace }}
+  namespace: {{ . }}
+  {{- end }}
+spec:
+  {{- with .Values.prometheus.webhooks.serviceMonitor.jobLabel }}
+  jobLabel: {{ . }}
+  {{- end }}
+  {{- with .Values.prometheus.webhooks.serviceMonitor.targetLabels }}
+  targetLabels:
+  {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- with .Values.prometheus.webhooks.serviceMonitor.podTargetLabels }}
+  podTargetLabels:
+  {{- toYaml . | nindent 4 }}
+  {{- end }}
+  endpoints:
+  - port: {{ .Values.prometheus.webhooks.serviceMonitor.port }}
+    {{- with .Values.prometheus.webhooks.serviceMonitor.targetPort }}
+    targetPort: {{ . }}
+    {{- end }}
+    path: /metrics
+    {{- with .Values.prometheus.webhooks.serviceMonitor.interval }}
+    interval: {{ . }}
+    {{- end }}
+    {{- with .Values.prometheus.webhooks.serviceMonitor.scrapeTimeout }}
+    scrapeTimeout: {{ . }}
+    {{- end }}
+  {{- if .Values.prometheus.webhooks.serviceMonitor.relabelings}}
+    {{- with .Values.prometheus.webhooks.serviceMonitor.relabelings }}
+    relabelings:
+    {{- toYaml . | nindent 6 }}
+    {{- end }}
+  {{- else }}
+    {{- with .Values.prometheus.webhooks.serviceMonitor.relabellings }}
+    relabelings:
+    {{- toYaml . | nindent 6 }}
+    {{- end }}
+  {{- end}}
+    {{- with .Values.prometheus.webhooks.serviceMonitor.metricRelabelings }}
+    metricRelabelings:
+    {{- toYaml . | nindent 6 }}
+    {{- end }}
+    scheme: {{ .Values.prometheus.webhooks.serviceMonitor.scheme }}
+    {{- with .Values.prometheus.webhooks.serviceMonitor.tlsConfig }}
+    tlsConfig:
+    {{ toYaml . | nindent 6}}
+    {{- end }}
+  namespaceSelector:
+    matchNames:
+    - {{ .Release.Namespace }}
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: {{ .Values.webhooks.name }}
+{{- end }}
+{{- end }}
diff --git a/packages/system/keda/charts/keda/templates/webhooks/validatingconfiguration.yaml b/packages/system/keda/charts/keda/templates/webhooks/validatingconfiguration.yaml
new file mode 100644
index 0000000000..02357ba95d
--- /dev/null
+++ b/packages/system/keda/charts/keda/templates/webhooks/validatingconfiguration.yaml
@@ -0,0 +1,167 @@
+{{- if and .Values.webhooks.enabled }}
+apiVersion: admissionregistration.k8s.io/v1
+kind: ValidatingWebhookConfiguration
+metadata:
+  {{- if or .Values.certificates.certManager.enabled .Values.additionalAnnotations }}
+  annotations:
+    {{- if .Values.certificates.certManager.enabled }}
+    {{- if and (not .Values.certificates.certManager.generateCA) .Values.certificates.certManager.issuer.generate }}
+    cert-manager.io/inject-ca-from-secret: {{ .Release.Namespace }}/{{ .Values.certificates.certManager.caSecretName }}
+    {{- else }}
+    cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ .Values.operator.name }}-tls-certificates
+    {{- end }}
+    {{- end }}
+    {{- if .Values.additionalAnnotations }}
+    {{- toYaml .Values.additionalAnnotations | nindent 4 }}
+    {{- end }}
+  {{- end }}
+  labels:
+    app.kubernetes.io/name: {{ .Values.webhooks.name }}
+    {{- include "keda.labels" . | indent 4 }}
+  name: keda-admission
+webhooks:
+- admissionReviewVersions:
+  - v1
+  clientConfig:
+    service:
+      name: {{ .Values.webhooks.name }}
+      namespace: {{ .Release.Namespace }}
+      path: /validate-keda-sh-v1alpha1-scaledobject
+  failurePolicy: {{ .Values.webhooks.failurePolicy }}
+  matchPolicy: Equivalent
+  name: vscaledobject.kb.io
+  namespaceSelector: {}
+  objectSelector: {}
+  rules:
+  - apiGroups:
+    - keda.sh
+    apiVersions:
+    - v1alpha1
+    operations:
+    - CREATE
+    - UPDATE
+    resources:
+    - scaledobjects
+  sideEffects: None
+  timeoutSeconds: {{ .Values.webhooks.timeoutSeconds | default 10 }}
+- admissionReviewVersions:
+  - v1
+  clientConfig:
+    service:
+      name: {{ .Values.webhooks.name }}
+      namespace: {{ .Release.Namespace }}
+      path: /validate-keda-sh-v1alpha1-scaledjob
+  failurePolicy: {{ .Values.webhooks.failurePolicy }}
+  matchPolicy: Equivalent
+  name: vscaledjob.kb.io
+  namespaceSelector: {}
+  objectSelector: {}
+  rules:
+  - apiGroups:
+    - keda.sh
+    apiVersions:
+    - v1alpha1
+    operations:
+    - CREATE
+    - UPDATE
+    resources:
+    - scaledjobs
+  sideEffects: None
+  timeoutSeconds: {{ .Values.webhooks.timeoutSeconds | default 10 }}
+- admissionReviewVersions:
+  - v1
+  clientConfig:
+    service:
+      name: {{ .Values.webhooks.name }}
+      namespace: {{ .Release.Namespace }}
+      path: /validate-keda-sh-v1alpha1-triggerauthentication
+  failurePolicy: {{ .Values.webhooks.failurePolicy }}
+  matchPolicy: Equivalent
+  name: vstriggerauthentication.kb.io
+  namespaceSelector: {}
+  objectSelector: {}
+  rules:
+  - apiGroups:
+    - keda.sh
+    apiVersions:
+    - v1alpha1
+    operations:
+    - CREATE
+    - UPDATE
+    resources:
+    - triggerauthentications
+  sideEffects: None
+  timeoutSeconds: {{ .Values.webhooks.timeoutSeconds | default 10 }}
+- admissionReviewVersions:
+  - v1
+  clientConfig:
+    service:
+      name: {{ .Values.webhooks.name }}
+      namespace: {{ .Release.Namespace }}
+      path: /validate-keda-sh-v1alpha1-clustertriggerauthentication
+  failurePolicy: {{ .Values.webhooks.failurePolicy }}
+  matchPolicy: Equivalent
+  name: vsclustertriggerauthentication.kb.io
+  namespaceSelector: {}
+  objectSelector: {}
+  rules:
+  - apiGroups:
+    - keda.sh
+    apiVersions:
+    - v1alpha1
+    operations:
+    - CREATE
+    - UPDATE
+    resources:
+    - clustertriggerauthentications
+  sideEffects: None
+  timeoutSeconds: {{ .Values.webhooks.timeoutSeconds | default 10 }}
+- admissionReviewVersions:
+  - v1
+  clientConfig:
+    service:
+      name: {{ .Values.webhooks.name }}
+      namespace: {{ .Release.Namespace }}
+      path: /validate-eventing-keda-sh-v1alpha1-cloudeventsource
+  failurePolicy: {{ .Values.webhooks.failurePolicy }}
+  matchPolicy: Equivalent
+  name: vcloudeventsource.kb.io
+  namespaceSelector: {}
+  objectSelector: {}
+  rules:
+  - apiGroups:
+    - eventing.keda.sh
+    apiVersions:
+    - v1alpha1
+    operations:
+    - CREATE
+    - UPDATE
+    resources:
+    - cloudeventsources
+  sideEffects: None
+  timeoutSeconds: {{ .Values.webhooks.timeoutSeconds | default 10 }}
+- admissionReviewVersions:
+  - v1
+  clientConfig:
+    service:
+      name: {{ .Values.webhooks.name }}
+      namespace: {{ .Release.Namespace }}
+      path: /validate-eventing-keda-sh-v1alpha1-clustercloudeventsource
+  failurePolicy: {{ .Values.webhooks.failurePolicy }}
+  matchPolicy: Equivalent
+  name: vclustercloudeventsource.kb.io
+  namespaceSelector: {}
+  objectSelector: {}
+  rules:
+  - apiGroups:
+    - eventing.keda.sh
+    apiVersions:
+    - v1alpha1
+    operations:
+    - CREATE
+    - UPDATE
+    resources:
+    - clustercloudeventsources
+  sideEffects: None
+  timeoutSeconds: {{ .Values.webhooks.timeoutSeconds | default 10 }}
+{{- end }}
diff --git a/packages/system/keda/charts/keda/values.yaml b/packages/system/keda/charts/keda/values.yaml
new file mode 100644
index 0000000000..543a64e53c
--- /dev/null
+++ b/packages/system/keda/charts/keda/values.yaml
@@ -0,0 +1,955 @@
+# Default values for keda.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+global:
+  image:
+    # -- Global image registry of KEDA components
+    registry: null
+  # -- DNS config for KEDA components
+  dnsConfig: {}
+  # nameservers:
+  #   - 1.2.3.4
+  # searches:
+  #   - ns1.svc.cluster-domain.example
+  #   - my.dns.search.suffix
+  # options:
+  #   - name: ndots
+  #     value: "1"
+  #   - name: attempts
+  #     value: "3"
+
+image:
+  keda:
+    # -- Image registry of KEDA operator
+    registry: ghcr.io
+    # -- Image name of KEDA operator
+    repository: kedacore/keda
+    # -- Image tag of KEDA operator. Optional, given app version of Helm chart is used by default
+    tag: ""
+  metricsApiServer:
+    # -- Image registry of KEDA Metrics API Server
+    registry: ghcr.io
+    # -- Image name of KEDA Metrics API Server
+    repository: kedacore/keda-metrics-apiserver
+    # -- Image tag of KEDA Metrics API Server. Optional, given app version of Helm chart is used by default
+    tag: ""
+  webhooks:
+    # -- Image registry of KEDA admission-webhooks
+    registry: ghcr.io
+    # -- Image name of KEDA admission-webhooks
+    repository: kedacore/keda-admission-webhooks
+    # -- Image tag of KEDA admission-webhooks . Optional, given app version of Helm chart is used by default
+    tag: ""
+  # -- Image pullPolicy for all KEDA components
+  pullPolicy: Always
+
+# -- Kubernetes cluster name. Used in features such as emitting CloudEvents
+clusterName: kubernetes-default
+
+# -- Kubernetes cluster domain
+clusterDomain: cluster.local
+
+crds:
+  # -- Defines whether the KEDA CRDs have to be installed or not.
+  install: true
+
+  # -- Custom annotations specifically for CRDs
+  additionalAnnotations:
+    {}
+    # foo: bar
+
+# -- Defines Kubernetes namespaces to watch to scale their workloads. Default watches all namespaces
+watchNamespace: ""
+
+# -- Name of secret to use to pull images to use to pull Docker images
+imagePullSecrets: []
+
+networkPolicy:
+  # -- Enable network policies
+  enabled: false
+  # -- Flavor of the network policies (cilium, kubernetes)
+  flavor: "cilium"
+  # -- Allow use of extra egress rules for cilium network policies
+  cilium:
+    operator:
+      extraEgressRules: []
+  # -- Allow use of extra egress rules for kubernetes network policies
+  kubernetes:
+    operator:
+      extraEgressRules: []
+    metricsServer:
+      extraEgressRules: []
+    webhooks:
+      extraEgressRules: []
+
+operator:
+  # -- Name of the KEDA operator
+  name: keda-operator
+  # -- ReplicaSets for this Deployment you want to retain (Default: 10)
+  revisionHistoryLimit: 10
+  # -- Capability to configure the number of replicas for KEDA operator.
+  # While you can run more replicas of our operator, only one operator instance will be the leader and serving traffic.
+  # You can run multiple replicas, but they will not improve the performance of KEDA, it could only reduce downtime during a failover.
+  # Learn more in [our documentation](https://keda.sh/docs/latest/operate/cluster/#high-availability).
+  replicaCount: 1
+  # --Disable response compression for k8s restAPI in client-go.
+  # Disabling compression simply means that turns off the process of making data smaller for K8s restAPI in client-go for faster transmission.
+  disableCompression: true
+  # -- Leader election ID (Lease resource name) for the controller manager. Defaults to operator.keda.sh.
+  # Override to allow multiple independent KEDA operator deployments in the same namespace.
+  # leaderElectionID: "operator.keda.sh"
+  # -- DNS config for KEDA operator pod
+  dnsConfig: {}
+  # use ClusterFirstWithHostNet if `useHostNetwork: true` https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/#pod-s-dns-policy
+  # -- Defined the DNS policy for the operator
+  dnsPolicy: ClusterFirst
+  # -- Enable operator to use host network
+  useHostNetwork: false
+  # -- [Affinity] for pod scheduling for KEDA operator. Takes precedence over the `affinity` field
+  affinity: {}
+    # podAntiAffinity:
+    #   requiredDuringSchedulingIgnoredDuringExecution:
+    #   - labelSelector:
+    #       matchExpressions:
+    #       - key: app
+    #         operator: In
+    #         values:
+    #         - keda-operator
+    #     topologyKey: "kubernetes.io/hostname"
+  # -- Additional containers to run as part of the operator deployment
+  extraContainers: []
+    # - name: hello-many
+    # args:
+    #   - -c
+    #   - "while true; do echo hi; sleep 300; done"
+    # command:
+    #   - /bin/sh
+    # image: 'busybox:glibc'
+  # -- Additional init containers to run as part of the operator deployment
+  extraInitContainers: []
+    # - name: hello-once
+    # args:
+    #   - -c
+    #   - "echo 'Hello World!'"
+    # command:
+    #   - /bin/sh
+    # image: 'busybox:glibc'
+  # -- Liveness probes for operator ([docs](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/))
+  livenessProbe:
+    initialDelaySeconds: 25
+    periodSeconds: 10
+    timeoutSeconds: 1
+    failureThreshold: 3
+    successThreshold: 1
+  # -- Readiness probes for operator ([docs](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/#define-readiness-probes))
+  readinessProbe:
+    initialDelaySeconds: 20
+    periodSeconds: 3
+    timeoutSeconds: 1
+    failureThreshold: 3
+    successThreshold: 1
+  # -- Node selector for pod scheduling ([docs](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/))
+  nodeSelector: {}
+  # -- Tolerations for pod scheduling ([docs](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/))
+  tolerations: []
+
+metricsServer:
+  # -- Enable KEDA metrics server and external metrics API resources.
+  enabled: true
+  # -- ReplicaSets for this Deployment you want to retain (Default: 10)
+  revisionHistoryLimit: 10
+  # -- Capability to configure the number of replicas for KEDA metric server.
+  # While you can run more replicas of our metric server, only one instance will used and serve traffic.
+  # You can run multiple replicas, but they will not improve the performance of KEDA, it could only reduce downtime during a failover.
+  # Learn more in [our documentation](https://keda.sh/docs/latest/operate/cluster/#high-availability).
+  replicaCount: 1
+  # --Disable response compression for k8s restAPI in client-go.
+  # Disabling compression simply means that turns off the process of making data smaller for K8s restAPI in client-go for faster transmission.
+  disableCompression: true
+  # use ClusterFirstWithHostNet if `useHostNetwork: true` https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/#pod-s-dns-policy
+  # -- Defined the DNS policy for the metric server
+  dnsPolicy: ClusterFirst
+  # -- DNS config for KEDA metrics server pod
+  dnsConfig: {}
+  # -- Enable metric server to use host network
+  useHostNetwork: false
+  # -- [Affinity] for pod scheduling for Metrics API Server. Takes precedence over the `affinity` field
+  affinity: {}
+    # podAntiAffinity:
+    #   requiredDuringSchedulingIgnoredDuringExecution:
+    #   - labelSelector:
+    #       matchExpressions:
+    #       - key: app
+    #         operator: In
+    #         values:
+    #         - keda-operator-metrics-apiserver
+    #     topologyKey: "kubernetes.io/hostname"
+  # -- Liveness probes for Metrics API Server ([docs](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/))
+  livenessProbe:
+    initialDelaySeconds: 5
+    periodSeconds: 10
+    timeoutSeconds: 1
+    failureThreshold: 3
+    successThreshold: 1
+  # -- Readiness probes for Metrics API Server ([docs](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/#define-readiness-probes))
+  readinessProbe:
+    initialDelaySeconds: 5
+    periodSeconds: 3
+    timeoutSeconds: 1
+    failureThreshold: 3
+    successThreshold: 1
+  # -- Node selector for pod scheduling ([docs](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/))
+  nodeSelector: {}
+  # -- Tolerations for pod scheduling ([docs](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/))
+  tolerations: []
+
+webhooks:
+  # It also used to enable or disable webhook patching in the operator
+  enabled: true
+  # -- Port number to use for KEDA admission webhooks. Default is 9443.
+  port: ""
+  # -- Port number to use for KEDA admission webhooks health probe
+  healthProbePort: 8081
+  # -- DNS config for KEDA admission webhooks pod
+  dnsConfig: {}
+  # -- Liveness probes for admission webhooks ([docs](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/))
+  livenessProbe:
+    initialDelaySeconds: 25
+    periodSeconds: 10
+    timeoutSeconds: 1
+    failureThreshold: 3
+    successThreshold: 1
+  # -- Readiness probes for admission webhooks ([docs](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/#define-readiness-probes))
+  readinessProbe:
+    initialDelaySeconds: 20
+    periodSeconds: 3
+    timeoutSeconds: 1
+    failureThreshold: 3
+    successThreshold: 1
+  # -- Timeout in seconds for KEDA admission webhooks
+  timeoutSeconds: 10
+  # -- Enable webhook to use host network, this is required on EKS with custom CNI
+  useHostNetwork: false
+  # -- Name of the KEDA admission webhooks
+  name: keda-admission-webhooks
+  # -- ReplicaSets for this Deployment you want to retain (Default: 10)
+  revisionHistoryLimit: 10
+  # -- Capability to configure the number of replicas for KEDA admission webhooks
+  replicaCount: 1
+  # -- [Affinity] for pod scheduling for KEDA admission webhooks. Takes precedence over the `affinity` field
+  affinity: {}
+    # podAntiAffinity:
+    #   requiredDuringSchedulingIgnoredDuringExecution:
+    #   - labelSelector:
+    #       matchExpressions:
+    #       - key: app
+    #         operator: In
+    #         values:
+    #         - keda-admission-webhooks
+    #     topologyKey: "kubernetes.io/hostname"
+
+  # -- [Failure policy](https://kubernetes.io/docs/reference/access-authn-authz/extensible-admission-controllers/#failure-policy) to use with KEDA admission webhooks
+  failurePolicy: Ignore
+
+  # -- Node selector for pod scheduling ([docs](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/))
+  nodeSelector: {}
+  # -- Tolerations for pod scheduling ([docs](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/))
+  tolerations: []
+
+upgradeStrategy:
+  # -- Capability to configure [Deployment upgrade strategy] for operator
+  operator: {}
+    # type: RollingUpdate
+    # rollingUpdate:
+    #   maxUnavailable: 1
+    #   maxSurge: 1
+
+  # -- Capability to configure [Deployment upgrade strategy] for Metrics Api Server
+  metricsApiServer: {}
+    # type: RollingUpdate
+    # rollingUpdate:
+    #   maxUnavailable: 1
+    #   maxSurge: 1
+
+  # -- Capability to configure [Deployment upgrade strategy] for Admission webhooks
+  webhooks: {}
+    # type: RollingUpdate
+    # rollingUpdate:
+    #   maxUnavailable: 1
+    #   maxSurge: 1
+
+podDisruptionBudget:
+  # -- Capability to configure [Pod Disruption Budget]
+  operator: {}
+    #  minAvailable: 1
+    #  maxUnavailable: 1
+
+  # -- Capability to configure [Pod Disruption Budget]
+  metricServer: {}
+    #  minAvailable: 1
+    #  maxUnavailable: 1
+
+  # -- Capability to configure [Pod Disruption Budget]
+  webhooks: {}
+    #  minAvailable: 1
+    #  maxUnavailable: 1
+
+# -- Custom labels to add into metadata
+additionalLabels:
+  {}
+  # foo: bar
+
+# -- Custom annotations to add into metadata
+additionalAnnotations:
+  {}
+  # foo: bar
+
+podAnnotations:
+  # -- Pod annotations for KEDA operator
+  keda: {}
+  # -- Pod annotations for KEDA Metrics Adapter
+  metricsAdapter: {}
+  # -- Pod annotations for KEDA Admission webhooks
+  webhooks: {}
+podLabels:
+  # -- Pod labels for KEDA operator
+  keda: {}
+  # -- Pod labels for KEDA Metrics Adapter
+  metricsAdapter: {}
+  # -- Pod labels for KEDA Admission webhooks
+  webhooks: {}
+
+rbac:
+  # -- Specifies whether RBAC should be used
+  create: true
+  # -- Specifies whether RBAC for CRDs should be [aggregated](https://kubernetes.io/docs/reference/access-authn-authz/rbac/#aggregated-clusterroles) to default roles (view, edit, admin)
+  aggregateToDefaultRoles: false
+
+  # -- Whether RBAC for configured CRDs that can have a `scale` subresource should be created
+  enabledCustomScaledRefKinds: true
+  # -- Customize the namespace of k8s metrics-server deployment
+  # This could also be achieved by the Kubernetes control plane manager flag --use-service-account-credentials:
+  # [docs](https://kubernetes.io/docs/reference/command-line-tools-reference/kube-controller-manager/)
+  controlPlaneServiceAccountsNamespace: kube-system
+  # -- List of custom resources that support the `scale` subresource and can be referenced by `scaledobject.spec.scaleTargetRef`.
+  # The feature needs to be also enabled by `enabledCustomScaledRefKinds`.
+  # If left empty, RBAC for `apiGroups: *` and `resources: *, */scale` will be created
+  # note: Deployments and StatefulSets are supported out of the box
+  scaledRefKinds:
+  - apiGroup: "*"
+    kind: "*"
+  # - apiGroup: argoproj.io
+  #   kind: Rollout
+
+serviceAccount:
+  operator:
+    # -- Specifies whether a service account should be created
+    create: true
+    # -- The name of the service account to use.
+    name: keda-operator
+    # -- Specifies whether a service account should automount API-Credentials
+    automountServiceAccountToken: true
+    # -- Annotations to add to the service account
+    annotations: {}
+  metricServer:
+    # -- Specifies whether a service account should be created
+    create: true
+    # -- The name of the service account to use.
+    name: keda-metrics-server
+    # -- Specifies whether a service account should automount API-Credentials
+    automountServiceAccountToken: true
+    # -- Annotations to add to the service account
+    annotations: {}
+  webhooks:
+    # -- Specifies whether a service account should be created
+    create: true
+    # -- The name of the service account to use.
+    name: keda-webhook
+    # -- Specifies whether a service account should automount API-Credentials
+    automountServiceAccountToken: true
+    # -- Annotations to add to the service account
+    annotations: {}
+
+podIdentity:
+  azureWorkload:
+    # -- Set to true to enable Azure Workload Identity usage.
+    # See https://keda.sh/docs/concepts/authentication/#azure-workload-identity
+    # This will be set as a label on the KEDA service account.
+    enabled: false
+    # Set to the value of the Azure Active Directory Client and Tenant Ids
+    # respectively. These will be set as annotations on the KEDA service account.
+    # -- Id of Azure Active Directory Client to use for authentication with Azure Workload Identity. ([docs](https://keda.sh/docs/concepts/authentication/#azure-workload-identity))
+    clientId: ""
+    # -- Id Azure Active Directory Tenant to use for authentication with for Azure Workload Identity. ([docs](https://keda.sh/docs/concepts/authentication/#azure-workload-identity))
+    tenantId: ""
+    # Set to the value of the service account token expiration duration.
+    # This will be set as an annotation on the KEDA service account.
+    # -- Duration in seconds to automatically expire tokens for the service account. ([docs](https://keda.sh/docs/concepts/authentication/#azure-workload-identity))
+    tokenExpiration: 3600
+  aws:
+    irsa:
+      # -- Specifies whether [AWS IAM Roles for Service Accounts (IRSA)](https://docs.aws.amazon.com/eks/latest/userguide/iam-roles-for-service-accounts.html) is to be enabled or not.
+      enabled: false
+      # -- Sets the token audience for IRSA.
+      # This will be set as an annotation on the KEDA service account.
+      audience: "sts.amazonaws.com"
+      # -- Set to the value of the ARN of an IAM role with a web identity provider.
+      # This will be set as an annotation on the KEDA service account.
+      roleArn: ""
+      # -- Sets the use of an STS regional endpoint instead of global.
+      # Recommended to use regional endpoint in almost all cases.
+      # This will be set as an annotation on the KEDA service account.
+      stsRegionalEndpoints: "true"
+      # -- Set to the value of the service account token expiration duration.
+      # This will be set as an annotation on the KEDA service account.
+      tokenExpiration: 86400
+  gcp:
+    # -- Set to true to enable GCP Workload Identity.
+    # See https://keda.sh/docs/2.10/authentication-providers/gcp-workload-identity/
+    # This will be set as a annotation on the KEDA service account.
+    enabled: false
+    # -- GCP IAM Service Account Email which you would like to use for workload identity.
+    gcpIAMServiceAccount: ""
+
+# -- Set this if you are using an external scaler and want to communicate
+# over TLS (recommended). This variable holds the name of the secret that
+# will be mounted to the /grpccerts path on the Pod
+grpcTLSCertsSecret: ""
+
+# -- Set this if you are using HashiCorp Vault and want to communicate
+# over TLS (recommended). This variable holds the name of the secret that
+# will be mounted to the /vault path on the Pod
+hashiCorpVaultTLS: ""
+
+logging:
+  operator:
+    # -- Logging level for KEDA Operator.
+    # allowed values: `debug`, `info`, `error`, or an integer value greater than 0, specified as string
+    level: info
+    # -- Logging format for KEDA Operator.
+    # allowed values: `json` or `console`
+    format: console
+    # -- Logging time encoding for KEDA Operator.
+    # allowed values are `epoch`, `millis`, `nano`, `iso8601`, `rfc3339` or `rfc3339nano`
+    timeEncoding: rfc3339
+    # -- If enabled, the stack traces will be also printed
+    stackTracesEnabled: false
+  metricServer:
+    # -- Logging level for Metrics Server (Deprecated).
+    # allowed values: `0` for info, `4` for debug, or an integer value greater than 0, specified as string
+    level: 0
+    # -- Logging stderrthreshold for Metrics Server (Deprecated)
+    # allowed values: 'DEBUG','INFO','WARN','ERROR','ALERT','EMERG'
+    stderrthreshold: ERROR
+    # -- Zap Logging level for Metrics Server.
+    # allowed values: `debug`, `info`, `error`, or an integer value greater than 0, specified as string
+    zapLevel: info
+    # -- Zap Logging encoder for Metrics Server.
+    # allowed values: `json` or `console`
+    zapEncoder: console
+    # -- Zap logging time encoding for Metrics Server.
+    # allowed values are `epoch`, `millis`, `nano`, `iso8601`, `rfc3339` or `rfc3339nano`
+    zapTimeEncoding: rfc3339
+  webhooks:
+    # -- Logging level for KEDA Operator.
+    # allowed values: `debug`, `info`, `error`, or an integer value greater than 0, specified as string
+    level: info
+    # -- Logging format for KEDA Admission webhooks.
+    # allowed values: `json` or `console`
+    format: console
+    # -- Logging time encoding for KEDA Operator.
+    # allowed values are `epoch`, `millis`, `nano`, `iso8601`, `rfc3339` or `rfc3339nano`
+    timeEncoding: rfc3339
+
+# -- [Security context] for all containers
+# @default -- [See below](#KEDA-is-secure-by-default)
+securityContext:
+  # -- [Security context] of the operator container
+  # @default -- [See below](#KEDA-is-secure-by-default)
+  operator:
+    capabilities:
+      drop:
+      - ALL
+    allowPrivilegeEscalation: false
+    readOnlyRootFilesystem: true
+    seccompProfile:
+      type: RuntimeDefault
+  # -- [Security context] of the metricServer container
+  # @default -- [See below](#KEDA-is-secure-by-default)
+  metricServer:
+    capabilities:
+      drop:
+      - ALL
+    allowPrivilegeEscalation: false
+    readOnlyRootFilesystem: true
+    seccompProfile:
+      type: RuntimeDefault
+  # -- [Security context] of the admission webhooks container
+  # @default -- [See below](#KEDA-is-secure-by-default)
+  webhooks:
+    capabilities:
+      drop:
+      - ALL
+    allowPrivilegeEscalation: false
+    readOnlyRootFilesystem: true
+    seccompProfile:
+      type: RuntimeDefault
+
+# --  [Pod security context] for all pods
+# @default -- [See below](#KEDA-is-secure-by-default)
+podSecurityContext:
+  # -- [Pod security context] of the KEDA operator pod
+  # @default -- [See below](#KEDA-is-secure-by-default)
+  operator:
+    runAsNonRoot: true
+    # runAsUser: 1000
+    # runAsGroup: 1000
+    # fsGroup: 1000
+
+  # -- [Pod security context] of the KEDA metrics apiserver pod
+  # @default -- [See below](#KEDA-is-secure-by-default)
+  metricServer:
+    runAsNonRoot: true
+    # runAsUser: 1000
+    # runAsGroup: 1000
+    # fsGroup: 1000
+
+  # -- [Pod security context] of the KEDA admission webhooks
+  # @default -- [See below](#KEDA-is-secure-by-default)
+  webhooks:
+    runAsNonRoot: true
+    # runAsUser: 1000
+    # runAsGroup: 1000
+    # fsGroup: 1000
+
+service:
+  # -- KEDA Metric Server service type
+  type: ClusterIP
+  # -- HTTPS port for KEDA Metric Server service
+  portHttps: 443
+  # -- HTTPS port for KEDA Metric Server container
+  portHttpsTarget: 6443
+  # -- Annotations to add the KEDA Metric Server service
+  annotations: {}
+  # -- The minimum TLS version to use when KEDA components provide a TLS-enabled service.
+  minTlsVersion: "TLS13"
+  # -- The list of cipher suites to use when KEDA components provide a TLS-enabled service. When left empty or unset, the TLS implementation will provide a default list of cipher suites which are believed to be secure.
+  tlsCipherList: ""
+
+
+# We provides the default values that we describe in our docs:
+# https://keda.sh/docs/latest/operate/cluster/
+# If you want to specify the resources (or totally remove the defaults), change or comment the following
+# lines, adjust them as necessary, or simply add the curly braces after 'operator' and/or 'metricServer'
+# and remove/comment the default values
+resources:
+  # -- Manage [resource request & limits] of KEDA operator pod
+  operator:
+    limits:
+      cpu: 1
+      memory: 1000Mi
+    requests:
+      cpu: 100m
+      memory: 100Mi
+  # -- Manage [resource request & limits] of KEDA metrics apiserver pod
+  metricServer:
+    limits:
+      cpu: 1
+      memory: 1000Mi
+    requests:
+      cpu: 100m
+      memory: 100Mi
+  # -- Manage [resource request & limits] of KEDA admission webhooks pod
+  webhooks:
+    limits:
+      cpu: 1
+      memory: 1000Mi
+    requests:
+      cpu: 100m
+      memory: 100Mi
+# -- Node selector for pod scheduling ([docs](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/))
+nodeSelector: {}
+# -- Tolerations for pod scheduling ([docs](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/))
+tolerations: []
+
+# -- HostAliases for pod networking ([docs](https://kubernetes.io/docs/concepts/services-networking/add-entries-to-pod-etc-hosts-with-host-aliases/))
+hostAliases: []
+
+topologySpreadConstraints:
+  # -- [Pod Topology Constraints] of KEDA operator pod
+  operator: []
+  # -- [Pod Topology Constraints] of KEDA metrics apiserver pod
+  metricsServer: []
+  # -- [Pod Topology Constraints] of KEDA admission webhooks pod
+  webhooks: []
+
+# -- [Affinity] for pod scheduling for KEDA operator, Metrics API Server and KEDA admission webhooks.
+affinity: {}
+  # podAntiAffinity:
+  #   requiredDuringSchedulingIgnoredDuringExecution:
+  #   - labelSelector:
+  #       matchExpressions:
+  #       - key: app
+  #         operator: In
+  #         values:
+  #         - keda-operator
+  #         - keda-operator-metrics-apiserver
+  #         - keda-admission-webhooks
+  #     topologyKey: "kubernetes.io/hostname"
+
+# -- priorityClassName for all KEDA components
+priorityClassName: ""
+
+## The default HTTP timeout in milliseconds that KEDA should use
+## when making requests to external services. Removing this defaults to a
+## reasonable default
+http:
+  # -- The default HTTP timeout to use for all scalers that use raw HTTP clients (some scalers use SDKs to access target services. These have built-in HTTP clients, and the timeout does not necessarily apply to them)
+  timeout: 3000
+  # -- Maximum number of idle HTTP connections across all hosts. Zero means no limit.
+  maxIdleConns: 0
+  # -- Maximum number of idle HTTP connections to keep per host
+  maxIdleConnsPerHost: 1000
+  # -- Maximum time an idle HTTP connection remains in the pool. Must be greater than zero.
+  idleConnTimeout: 90s
+  keepAlive:
+    # -- Enable HTTP connection keep alive
+    enabled: true
+  # -- The minimum TLS version to use for all scalers that use raw HTTP clients (some scalers use SDKs to access target services. These have built-in HTTP clients, and this value does not necessarily apply to them)
+  minTlsVersion: TLS12
+  # -- The list of cipher suites to use when making HTTP over TLS connections. When left empty or unset, the TLS implementation will provide a default list of cipher suites which are believed to be secure.
+  tlsCipherList: ""
+
+## This setting lets you enable profiling for all of the components of KEDA and in the specific port you choose
+## This can be useful when trying to investigate errors like memory leaks or CPU or even look at goroutines to understand better
+## This setting is disabled by default
+profiling:
+  operator:
+    # -- Enable profiling for KEDA operator
+    enabled: false
+    # -- Expose profiling on a specific port
+    port: 8082
+  metricsServer:
+    # -- Enable profiling for KEDA metrics server
+    enabled: false
+    # -- Expose profiling on a specific port
+    port: 8083
+  webhooks:
+    # -- Enable profiling for KEDA admission webhook
+    enabled: false
+    # -- Expose profiling on a specific port
+    port: 8084
+
+## Extra KEDA Operator and Metrics Adapter container arguments
+extraArgs:
+  # -- Additional KEDA Operator container arguments
+  keda: {}
+  # -- Additional Metrics Adapter container arguments
+  metricsAdapter: {}
+
+# -- Additional environment variables that will be passed onto all KEDA components
+env: []
+# - name: ENV_NAME
+#   value: 'ENV-VALUE'
+
+# Extra volumes and volume mounts for the deployment. Optional.
+volumes:
+  keda:
+    # -- Extra volumes for KEDA deployment
+    extraVolumes: []
+    # -- Extra volume mounts for KEDA deployment
+    extraVolumeMounts: []
+
+  metricsApiServer:
+    # -- Extra volumes for metric server deployment
+    extraVolumes: []
+    # -- Extra volume mounts for metric server deployment
+    extraVolumeMounts: []
+
+  webhooks:
+    # -- Extra volumes for admission webhooks deployment
+    extraVolumes: []
+    # -- Extra volume mounts for admission webhooks deployment
+    extraVolumeMounts: []
+
+prometheus:
+  metricServer:
+    # -- Enable metric server Prometheus metrics expose
+    enabled: false
+    # -- HTTP port used for exposing metrics server prometheus metrics
+    port: 8080
+    # -- HTTP port name for exposing metrics server prometheus metrics
+    portName: metrics
+    # -- App Protocol for service when scraping metrics endpoint
+    # appProtocol: http
+    serviceMonitor:
+      # -- Enables ServiceMonitor creation for the Prometheus Operator
+      enabled: false
+      # -- JobLabel selects the label from the associated Kubernetes service which will be used as the job label for all metrics. [ServiceMonitor Spec]
+      jobLabel: ""
+      # -- TargetLabels transfers labels from the Kubernetes `Service` onto the created metrics
+      targetLabels: []
+      # -- PodTargetLabels transfers labels on the Kubernetes `Pod` onto the created metrics
+      podTargetLabels: []
+      # -- Name of the service port this endpoint refers to. Mutually exclusive with targetPort
+      port: metrics
+      # -- Name or number of the target port of the Pod behind the Service, the port must be specified with container port property. Mutually exclusive with port
+      targetPort: ""
+      # -- Interval at which metrics should be scraped If not specified Prometheus’ global scrape interval is used.
+      interval: ""
+      # -- Timeout after which the scrape is ended If not specified, the Prometheus global scrape timeout is used unless it is less than Interval in which the latter is used
+      scrapeTimeout: ""
+      # -- DEPRECATED. List of expressions that define custom relabeling rules for metric server ServiceMonitor crd (prometheus operator). [RelabelConfig Spec]
+      relabellings: []
+      # -- List of expressions that define custom relabeling rules for metric server ServiceMonitor crd (prometheus operator). [RelabelConfig Spec]
+      relabelings: []
+      # -- List of expressions that define custom  metric relabeling rules for metric server ServiceMonitor crd after scrape has happened (prometheus operator). [RelabelConfig Spec]
+      metricRelabelings: []
+      # --  Additional labels to add for metric server using ServiceMonitor crd (prometheus operator)
+      additionalLabels: {}
+      # -- HTTP scheme used for scraping. Defaults to `http`
+      scheme: http
+      # -- TLS configuration for scraping metrics
+      tlsConfig: {}
+        # caFile: /etc/prom-certs/root-cert.pem
+        # certFile: /etc/prom-certs/cert-chain.pem
+        # insecureSkipVerify: true
+        # keyFile: /etc/prom-certs/key.pem
+    podMonitor:
+      # -- Enables PodMonitor creation for the Prometheus Operator
+      enabled: false
+      # -- Scraping interval for metric server using podMonitor crd (prometheus operator)
+      interval: ""
+      # -- Scraping timeout for metric server using podMonitor crd (prometheus operator)
+      scrapeTimeout: ""
+      # -- Scraping namespace for metric server using podMonitor crd (prometheus operator)
+      namespace: ""
+      # -- Additional labels to add for metric server using podMonitor crd (prometheus operator)
+      additionalLabels: {}
+      # -- List of expressions that define custom relabeling rules for metric server podMonitor crd (prometheus operator)
+      relabelings: []
+      # -- List of expressions that define custom  metric relabeling rules for metric server PodMonitor crd after scrape has happened (prometheus operator). [RelabelConfig Spec]
+      metricRelabelings: []
+  operator:
+    # -- Enable KEDA Operator prometheus metrics expose
+    enabled: false
+    # -- Port used for exposing KEDA Operator prometheus metrics
+    port: 8080
+    # -- App Protocol for service when scraping metrics endpoint
+    # appProtocol: http
+    serviceMonitor:
+      # -- Enables ServiceMonitor creation for the Prometheus Operator
+      enabled: false
+      # -- JobLabel selects the label from the associated Kubernetes service which will be used as the job label for all metrics. [ServiceMonitor Spec]
+      jobLabel: ""
+      # -- TargetLabels transfers labels from the Kubernetes `Service` onto the created metrics
+      targetLabels: []
+      # -- PodTargetLabels transfers labels on the Kubernetes `Pod` onto the created metrics
+      podTargetLabels: []
+      # -- Name of the service port this endpoint refers to. Mutually exclusive with targetPort
+      port: metrics
+      # -- Name or number of the target port of the Pod behind the Service,
+      # the port must be specified with container port property. Mutually exclusive with port
+      targetPort: ""
+      # -- Interval at which metrics should be scraped If not specified Prometheus’ global scrape interval is used.
+      interval: ""
+      # -- Timeout after which the scrape is ended If not specified, the Prometheus global scrape timeout is used unless it is less than Interval in which the latter is used
+      scrapeTimeout: ""
+      # -- DEPRECATED. List of expressions that define custom relabeling rules for metric server ServiceMonitor crd (prometheus operator). [RelabelConfig Spec]
+      relabellings: []
+      # -- List of expressions that define custom relabeling rules for metric server ServiceMonitor crd (prometheus operator). [RelabelConfig Spec]
+      relabelings: []
+      # -- List of expressions that define custom  metric relabeling rules for metric server ServiceMonitor crd after scrape has happened (prometheus operator). [RelabelConfig Spec]
+      metricRelabelings: []
+      # -- Additional labels to add for metric server using ServiceMonitor crd (prometheus operator)
+      additionalLabels: {}
+      # -- HTTP scheme used for scraping. Defaults to `http`
+      scheme: http
+      # -- TLS configuration for scraping metrics
+      tlsConfig: {}
+        # caFile: /etc/prom-certs/root-cert.pem
+        # certFile: /etc/prom-certs/cert-chain.pem
+        # insecureSkipVerify: true
+        # keyFile: /etc/prom-certs/key.pem
+    podMonitor:
+      # -- Enables PodMonitor creation for the Prometheus Operator
+      enabled: false
+      # -- Scraping interval for KEDA Operator using podMonitor crd (prometheus operator)
+      interval: ""
+      # -- Scraping timeout for KEDA Operator using podMonitor crd (prometheus operator)
+      scrapeTimeout: ""
+      # -- Scraping namespace for KEDA Operator using podMonitor crd (prometheus operator)
+      namespace: ""
+      # -- Additional labels to add for KEDA Operator using podMonitor crd (prometheus operator)
+      additionalLabels: {}
+      # --  List of expressions that define custom relabeling rules for KEDA Operator podMonitor crd (prometheus operator)
+      relabelings: []
+      # -- List of expressions that define custom  metric relabeling rules for metric server PodMonitor crd after scrape has happened (prometheus operator). [RelabelConfig Spec]
+      metricRelabelings: []
+    prometheusRules:
+      # -- Enables PrometheusRules creation for the Prometheus Operator
+      enabled: false
+      # -- Scraping namespace for KEDA Operator using prometheusRules crd (prometheus operator)
+      namespace: ""
+      # -- Additional labels to add for KEDA Operator using prometheusRules crd (prometheus operator)
+      additionalLabels: {}
+      # -- Additional alerts to add for KEDA Operator using prometheusRules crd (prometheus operator)
+      alerts:
+        []
+        # - alert: KedaScalerErrors
+        #   annotations:
+        #     description: Keda scaledObject {{ $labels.scaledObject }} is experiencing errors with {{ $labels.scaler }} scaler
+        #     summary: Keda Scaler {{ $labels.scaler }} Errors
+        #   expr: sum by ( scaledObject , scaler) (rate(keda_metrics_adapter_scaler_errors[2m]))  > 0
+        #   for: 2m
+        #   labels:
+  webhooks:
+    # -- Enable KEDA admission webhooks prometheus metrics expose
+    enabled: false
+    # -- Port used for exposing KEDA admission webhooks prometheus metrics
+    port: 8080
+    # -- App Protocol for service when scraping metrics endpoint
+    # appProtocol: http
+    serviceMonitor:
+      # -- Enables ServiceMonitor creation for the Prometheus webhooks
+      enabled: false
+      # -- jobLabel selects the label from the associated Kubernetes service which will be used as the job label for all metrics. [ServiceMonitor Spec]
+      jobLabel: ""
+      # -- TargetLabels transfers labels from the Kubernetes `Service` onto the created metrics
+      targetLabels: []
+      # -- PodTargetLabels transfers labels on the Kubernetes `Pod` onto the created metrics
+      podTargetLabels: []
+      # -- Name of the service port this endpoint refers to. Mutually exclusive with targetPort
+      port: metrics
+      # -- Name or number of the target port of the Pod behind the Service, the port must be specified with container port property. Mutually exclusive with port
+      targetPort: ""
+      # -- Interval at which metrics should be scraped If not specified Prometheus’ global scrape interval is used.
+      interval: ""
+      # -- Timeout after which the scrape is ended If not specified, the Prometheus global scrape timeout is used unless it is less than Interval in which the latter is used
+      scrapeTimeout: ""
+      # -- DEPRECATED. List of expressions that define custom relabeling rules for metric server ServiceMonitor crd (prometheus operator). [RelabelConfig Spec]
+      relabellings: []
+      # -- List of expressions that define custom relabeling rules for metric server ServiceMonitor crd (prometheus operator). [RelabelConfig Spec]
+      relabelings: []
+      # -- List of expressions that define custom  metric relabeling rules for metric server ServiceMonitor crd after scrape has happened (prometheus operator). [RelabelConfig Spec]
+      metricRelabelings: []
+      # -- Additional labels to add for metric server using ServiceMonitor crd (prometheus operator)
+      additionalLabels: {}
+      # -- HTTP scheme used for scraping. Defaults to `http`
+      scheme: http
+      # -- TLS configuration for scraping metrics
+      tlsConfig: {}
+        # caFile: /etc/prom-certs/root-cert.pem
+        # certFile: /etc/prom-certs/cert-chain.pem
+        # insecureSkipVerify: true
+        # keyFile: /etc/prom-certs/key.pem
+    prometheusRules:
+      # -- Enables PrometheusRules creation for the Prometheus Operator
+      enabled: false
+      # -- Scraping namespace for KEDA admission webhooks using prometheusRules crd (prometheus operator)
+      namespace: ""
+      # -- Additional labels to add for KEDA admission webhooks using prometheusRules crd (prometheus operator)
+      additionalLabels: {}
+      # -- Additional alerts to add for KEDA admission webhooks using prometheusRules crd (prometheus operator)
+      alerts: []
+
+opentelemetry:
+  collector:
+    # -- Uri of OpenTelemetry Collector to push telemetry to
+    uri: ""
+  operator:
+    # -- Enable pushing metrics to an OpenTelemetry Collector for operator
+    enabled: false
+
+certificates:
+  # -- Enables the self generation for KEDA TLS certificates inside KEDA operator
+  autoGenerated: true
+  # -- Secret name to be mounted with KEDA TLS certificates
+  secretName: kedaorg-certs
+  # -- Path where KEDA TLS certificates are mounted
+  mountPath: /certs
+  certManager:
+    # -- Enables Cert-manager for certificate management
+    enabled: false
+    # -- Certificate duration
+    duration: 8760h0m0s # 1 year
+    # -- Certificate renewal time before expiration
+    renewBefore: 5840h0m0s # 8 months
+    # -- Generates a self-signed CA with Cert-manager.
+    # If generateCA is false, the secret with the CA
+    # has to be annotated with `cert-manager.io/allow-direct-injection: "true"`
+    generateCA: true
+    # -- Secret name where the CA is stored (generatedby cert-manager or user given)
+    caSecretName: "kedaorg-ca"
+    # -- Add labels/annotations to secrets created by Certificate resources
+    # [docs](https://cert-manager.io/docs/usage/certificate/#creating-certificate-resources)
+    secretTemplate: {}
+      # annotations:
+      #   my-secret-annotation-1: "foo"
+      #   my-secret-annotation-2: "bar"
+      # labels:
+      #   my-secret-label: foo
+    # -- Reference to custom Issuer. If issuer.generate is false, then issuer.group, issuer.kind and issuer.name are required
+    issuer:
+      # -- Generates an Issuer resource with Cert-manager
+      generate: true
+      # -- Custom Issuer name. Required when generate: false
+      name: foo-org-ca
+      # -- Custom Issuer kind. Required when generate: false
+      kind: ClusterIssuer
+      # -- Custom Issuer group. Required when generate: false
+      group: cert-manager.io
+  operator:
+    # -- Enable APIService patching by KEDA operator. Controls whether KEDA operator will inject the self-generated TLS certificate into the APIService used by KEDA Metrics API Server.
+    # Only takes effect when certificates.autoGenerated is true and certificates.certManager.enabled is false.
+    # WARNING: If metricsServer.enabled is true and you disable this, you must ensure the APIService CA bundle is injected by an alternative mechanism (e.g. external controller, manual patching), otherwise the metrics API will fail TLS verification.
+    # apiServicePatching:
+    #   enabled: false
+    # -- Location(s) of CA files for authentication of external TLS connections such as TLS-enabled metrics sources
+    # caDirs:
+    # - /custom/ca
+
+permissions:
+  metricServer:
+    restrict:
+      # -- Restrict Secret Access for Metrics Server
+      secret: false
+  operator:
+    restrict:
+      # -- Restrict Secret Access for KEDA operator
+      # if true, KEDA operator will be able to read only secrets in {{ .Release.Namespace }} namespace
+      secret: false
+      # -- Array of strings denoting what secrets the KEDA operator will be able to read, this takes into account
+      # also the configured `watchNamespace`.
+      # the default is an empty array -> no restriction on the secret name
+      namesAllowList: []
+      # -- Creates roles and rolebindings from namespaced service accounts in the array which allow the KEDA operator
+      # to request service account tokens for use with the boundServiceAccountToken trigger source.
+      # If the namespace does not exist, this will cause the helm chart installation to fail.
+      serviceAccountTokenCreationRoles: []
+      # - name: myServiceAccount
+      #   namespace: myServiceAccountNamespace
+      # -- Allow Keda to access all Service Token for KEDA operator
+      allowAllServiceAccountTokenCreation: false
+
+# -- Array of extra K8s manifests to deploy
+extraObjects: []
+  # - apiVersion: keda.sh/v1alpha1
+  #   kind: ClusterTriggerAuthentication
+  #   metadata:
+  #     name: aws-credentials
+  #     namespace: keda
+  #   spec:
+  #     podIdentity:
+  #       provider: aws-eks
+
+# -- Capability to turn on/off ASCII art in Helm installation notes
+asciiArt: true
+
+# -- When specified, each rendered resource will have `app.kubernetes.io/managed-by: ${this}` label on it. Useful, when using only helm template with some other solution.
+customManagedBy: ""
+
+# -- Enable service links in pods. Although enabled, mirroring k8s default, it is highly recommended to disable,
+# due to its legacy status [Legacy container links](https://docs.docker.com/engine/network/links/)
+enableServiceLinks: true
diff --git a/packages/system/keda/patches/ciliumnetworkpolicy-capability-gate.patch b/packages/system/keda/patches/ciliumnetworkpolicy-capability-gate.patch
new file mode 100644
index 0000000000..3fd79f0ccf
--- /dev/null
+++ b/packages/system/keda/patches/ciliumnetworkpolicy-capability-gate.patch
@@ -0,0 +1,40 @@
+# Cozystack downstream customization: gate the KEDA CiliumNetworkPolicy objects on the
+# cilium.io/v2 API being served by the cluster.
+#
+# The cozystack shim hardcodes networkPolicy.flavor: cilium, and the upstream templates
+# gate only on networkPolicy.enabled + flavor==cilium — never on the cilium.io/v2 CRD being
+# present. On a variant that ships no Cilium (an ISP-hosted cluster whose CNI is something
+# else) the CiliumNetworkPolicy is unmappable and the whole keda HelmRelease fails to
+# install. keda is offered on every variant from the shared system bundle, so this makes it
+# uninstallable there. Adding the capability check makes the package install on any CNI; the
+# egress hardening is simply absent where Cilium is not (documented in values.yaml).
+diff --git a/charts/keda/templates/manager/ciliumnetworkpolicy.yaml b/charts/keda/templates/manager/ciliumnetworkpolicy.yaml
+index 05483873f..0b6c53019 100644
+--- a/charts/keda/templates/manager/ciliumnetworkpolicy.yaml
++++ b/charts/keda/templates/manager/ciliumnetworkpolicy.yaml
+@@ -1,4 +1,4 @@
+-{{- if and .Values.networkPolicy.enabled (eq .Values.networkPolicy.flavor "cilium") }}
++{{- if and .Values.networkPolicy.enabled (eq .Values.networkPolicy.flavor "cilium") (.Capabilities.APIVersions.Has "cilium.io/v2") }}
+ apiVersion: "cilium.io/v2"
+ kind: CiliumNetworkPolicy
+ metadata:
+diff --git a/charts/keda/templates/metrics-server/ciliumnetworkpolicy.yaml b/charts/keda/templates/metrics-server/ciliumnetworkpolicy.yaml
+index f34982db7..e16dd727a 100644
+--- a/charts/keda/templates/metrics-server/ciliumnetworkpolicy.yaml
++++ b/charts/keda/templates/metrics-server/ciliumnetworkpolicy.yaml
+@@ -1,4 +1,4 @@
+-{{- if and .Values.metricsServer.enabled .Values.networkPolicy.enabled (eq .Values.networkPolicy.flavor "cilium") }}
++{{- if and .Values.metricsServer.enabled .Values.networkPolicy.enabled (eq .Values.networkPolicy.flavor "cilium") (.Capabilities.APIVersions.Has "cilium.io/v2") }}
+ apiVersion: "cilium.io/v2"
+ kind: CiliumNetworkPolicy
+ metadata:
+diff --git a/charts/keda/templates/webhooks/ciliumnetworkpolicy.yaml b/charts/keda/templates/webhooks/ciliumnetworkpolicy.yaml
+index 1eea65d14..4e59d41f4 100644
+--- a/charts/keda/templates/webhooks/ciliumnetworkpolicy.yaml
++++ b/charts/keda/templates/webhooks/ciliumnetworkpolicy.yaml
+@@ -1,4 +1,4 @@
+-{{- if and .Values.webhooks.enabled .Values.networkPolicy.enabled (eq .Values.networkPolicy.flavor "cilium") }}
++{{- if and .Values.webhooks.enabled .Values.networkPolicy.enabled (eq .Values.networkPolicy.flavor "cilium") (.Capabilities.APIVersions.Has "cilium.io/v2") }}
+ apiVersion: "cilium.io/v2"
+ kind: CiliumNetworkPolicy
+ metadata:
diff --git a/packages/system/keda/templates/alerts.yaml b/packages/system/keda/templates/alerts.yaml
new file mode 100644
index 0000000000..acb1ce4657
--- /dev/null
+++ b/packages/system/keda/templates/alerts.yaml
@@ -0,0 +1,194 @@
+{{- if .Values.databaseAutoscaling.alerts.enabled }}
+{{- /*
+Alerts for cozystack managed-database read-replica autoscaling. KEDA names the
+HPA it generates "keda-hpa-<scaledobject>", so every rule scopes to
+horizontalpodautoscaler=~"keda-hpa-.*". Metric names/labels are calibrated on a
+live cluster per the design proposal's PoC; the rule shapes are what this ships.
+
+Scope caveat: these rules match EVERY KEDA-managed HPA / ScaledObject error, not
+only database ones, because the underlying kube_horizontalpodautoscaler_* and
+keda_scaled_object_errors_total series carry no label identifying the cozystack
+app that owns the ScaledObject. This is correct today because database
+autoscaling is KEDA's sole consumer in cozystack; if a non-database ScaledObject
+is ever added, scope these rules (e.g. by a namespace/label the DB objects carry)
+so they stop mis-attributing unrelated autoscaling to "database".
+*/}}
+apiVersion: monitoring.coreos.com/v1
+kind: PrometheusRule
+metadata:
+  name: database-autoscaling
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: database-autoscaling
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+spec:
+  groups:
+  - name: database-autoscaling.rules
+    rules:
+    {{- /*
+    Scale-up stuck with a pod that exists but cannot run: unbindable PVC or an
+    unschedulable pod — both leave an actually-Pending CNPG pod. desired > current
+    alone would also fire on every healthy load-driven scale-up, because a new CNPG
+    standby joins via a full basebackup that routinely exceeds 15m while the pod is
+    Running (not Ready) — so intersect with an actually-Pending CNPG cluster pod,
+    which a healthy clone is not.
+    Per-cluster scoping: the HPA series carry horizontalpodautoscaler="keda-hpa-<cluster>"
+    (KEDA names the HPA after the ScaledObject, which the chart names after the CNPG
+    cluster) while the pod series carry label_cnpg_io_cluster=<cluster>; label_replace
+    derives a common `cluster` label from each so the Pending intersection is joined
+    on(namespace,cluster). Without it a Pending pod of one CNPG cluster would falsely
+    trip the HPA of a healthy sibling cluster in the same namespace (a tenant may run
+    several Postgres apps in one namespace — nothing enforces one-per-namespace).
+    NOTE: the quota-rejected case is NOT caught here. A ResourceQuota refuses the
+    standby pod at admission, so no pod object is ever created and there is no
+    Pending pod to intersect with — it is caught by DatabaseAutoscalerScaleBlocked
+    below, keyed on desired > (count of CNPG instance pods) instead of a Pending phase.
+    There is no automatic rollback (see the design proposal); this is the operator's
+    signal to resolve it.
+
+    NOTE (deliberately no "load metric absent" rule): the ScaledObject pins
+    ignoreNullValues=false, so a broken pod-label pipeline (no CNPG kube_pod_labels at all)
+    empties the query and surfaces as a KEDA scaler error (caught by
+    DatabaseAutoscalerScalerErrors below) with the HPA holding — not a silent drift to the
+    floor. The residual gap (kube_pod_labels healthy but the load series itself gone) has
+    no clean alert: absent(cnpg_backends_total{state="active"})
+    cannot tell a genuinely idle cluster from a broken exporter, and CPU-mode clusters
+    do not use that series at all. Operators should instead alert on the CNPG
+    podMonitor / cadvisor scrape target being down for autoscaled namespaces.
+    NOTE: the joins below are calibrated against live kube-state-metrics label shapes;
+    re-verify on cozystack-pr-test before relying on them (see design proposal §Testing).
+    */}}
+    - alert: DatabaseAutoscalerScaleStuck
+      expr: |-
+        (
+          label_replace(
+            kube_horizontalpodautoscaler_status_desired_replicas{job="kube-state-metrics",horizontalpodautoscaler=~"keda-hpa-.*"}
+            > on(namespace,horizontalpodautoscaler)
+            kube_horizontalpodautoscaler_status_current_replicas{job="kube-state-metrics",horizontalpodautoscaler=~"keda-hpa-.*"},
+            "cluster", "$1", "horizontalpodautoscaler", "keda-hpa-(.+)"
+          )
+        )
+        and on(namespace,cluster) (
+          max by (namespace,cluster) (
+            kube_pod_status_phase{job="kube-state-metrics",phase="Pending"}
+            * on(namespace,pod) group_left(cluster)
+            label_replace(kube_pod_labels{job="kube-state-metrics",label_cnpg_io_cluster!=""}, "cluster", "$1", "label_cnpg_io_cluster", "(.+)")
+          ) > 0
+        )
+      for: 15m
+      labels:
+        severity: warning
+      annotations:
+        summary: Database autoscaler cannot reach its desired replica count.
+        description: HPA {{ "{{ $labels.horizontalpodautoscaler }}" }} in namespace {{ "{{ $labels.namespace }}" }} has wanted more replicas than are available for 15m while a pod of the same CNPG cluster is Pending (stuck scale-up — an unbindable PVC or an unschedulable pod, not a healthy basebackup).
+    {{- /*
+    Scale-up blocked at admission (the Pending-independent case the design proposal
+    §Failure requires): a ResourceQuota (or any admission webhook) refuses the new
+    standby, so no pod object is created and DatabaseAutoscalerScaleStuck's Pending
+    intersection misses it. Key instead on the HPA wanting more instances than there are
+    CNPG INSTANCE pods for that cluster: desired_replicas > count(instance pods).
+    Two corrections over a naive desired > count(pods):
+      - count only INSTANCE pods (label_cnpg_io_instance_role=~".+"); a transient
+        basebackup/join Job pod carries label_cnpg_io_cluster but no instance_role, so
+        counting it would inflate the count and mask a real block (false negative).
+      - a healthy MULTI-step scale-up must not trip this. CNPG materialises replicas one
+        at a time (serial basebackups, each often >15m), so on a desired jump of +2 or
+        more the instance count legitimately lags desired for the whole ramp with no
+        Pending pod — indistinguishable from a real block by count alone, which made the
+        old rule cry wolf and hand out the actively-harmful "lower maxReplicas" advice.
+        Suppress via `unless` while a join Job pod exists for the cluster (a cluster pod
+        that is not an instance pod = provisioning in progress, not blocked). A genuine
+        admission block creates neither an instance pod nor a Job pod, so it still fires.
+    Per-cluster scoping via the same label_replace(cluster) as ScaleStuck. If
+    kube_pod_labels is absent entirely (broken KSM) the join drops the series rather than
+    firing — that pipeline break surfaces as a KEDA scaler error instead.
+    */}}
+    - alert: DatabaseAutoscalerScaleBlocked
+      expr: |-
+        (
+          label_replace(
+            kube_horizontalpodautoscaler_status_desired_replicas{job="kube-state-metrics",horizontalpodautoscaler=~"keda-hpa-.*"},
+            "cluster", "$1", "horizontalpodautoscaler", "keda-hpa-(.+)"
+          )
+          > on(namespace,cluster) group_left()
+          count by (namespace,cluster) (
+            label_replace(kube_pod_labels{job="kube-state-metrics",label_cnpg_io_cluster!="",label_cnpg_io_instance_role=~".+"}, "cluster", "$1", "label_cnpg_io_cluster", "(.+)")
+          )
+        )
+        unless on(namespace,cluster) (
+          count by (namespace,cluster) (
+            label_replace(kube_pod_labels{job="kube-state-metrics",label_cnpg_io_cluster!=""}, "cluster", "$1", "label_cnpg_io_cluster", "(.+)")
+          )
+          > count by (namespace,cluster) (
+            label_replace(kube_pod_labels{job="kube-state-metrics",label_cnpg_io_cluster!="",label_cnpg_io_instance_role=~".+"}, "cluster", "$1", "label_cnpg_io_cluster", "(.+)")
+          )
+        )
+      for: 15m
+      labels:
+        severity: warning
+      annotations:
+        summary: Database autoscaler is blocked from creating a replica at admission.
+        description: HPA {{ "{{ $labels.horizontalpodautoscaler }}" }} in namespace {{ "{{ $labels.namespace }}" }} has wanted more instances than there are CNPG instance pods for 15m, with no basebackup Job in progress for the cluster — the replica is being refused at admission (most likely a ResourceQuota). Raise the tenant quota. (A healthy in-progress clone runs a join Job and is excluded, so this does not fire on a legitimate multi-step scale-up.)
+    {{- /*
+    Pinned at the configured maximum under sustained load. NOT keyed on the HPA's
+    ScalingLimited condition: that is true in BOTH clamp directions (TooManyReplicas at
+    max AND TooFewReplicas at min), and this autoscaler's idle desired = 1 + ceil(0/target)
+    = 1 clamps UP to the floor, so an idle cluster would report ScalingLimited=true forever
+    and this alert would fire on every quiet DB with the wrong "raise maxReplicas" advice.
+    Instead compare desired to the HPA's own max: it fires only when the cluster is
+    actually at the ceiling. (The render guard rejects a quorum floor above maxReplicas,
+    so maxReplicas is the true ceiling.)
+    */}}
+    - alert: DatabaseAutoscalerAtMax
+      expr: |-
+        kube_horizontalpodautoscaler_status_desired_replicas{job="kube-state-metrics",horizontalpodautoscaler=~"keda-hpa-.*"}
+        >= on(namespace,horizontalpodautoscaler)
+        kube_horizontalpodautoscaler_spec_max_replicas{job="kube-state-metrics",horizontalpodautoscaler=~"keda-hpa-.*"}
+      for: 30m
+      labels:
+        severity: informational
+      annotations:
+        summary: Database autoscaler has been at maxReplicas for 30m.
+        description: HPA {{ "{{ $labels.horizontalpodautoscaler }}" }} in namespace {{ "{{ $labels.namespace }}" }} has wanted its maximum replica count (autoscaling.maxReplicas) for 30m under sustained load — raise maxReplicas if more read capacity is needed.
+    {{- /*
+    KEDA cannot evaluate the trigger (vmselect unreachable, query invalid, or — with
+    ignoreNullValues=false — an empty result from a broken metrics pipeline): scaling
+    stops and this fires. Never scale blind.
+    */}}
+    - alert: DatabaseAutoscalerScalerErrors
+      expr: |-
+        increase(keda_scaled_object_errors_total[15m]) > 0
+      for: 15m
+      labels:
+        severity: warning
+      annotations:
+        summary: KEDA scaler is erroring for a managed database.
+        description: KEDA reported scaler errors over the last 15m for a database ScaledObject (metric source unreachable or query invalid); the desired count is not being updated.
+    {{- /*
+    KEDA operator down / not reporting: it reconciles ScaledObjects into HPAs, so while
+    it is unhealthy (e.g. the leader-election crash-loop the package guards against) the
+    desired count stops being actuated. keda_build_info is emitted by the operator; its
+    absence means the operator is down or unscraped.
+    Cross-tenant scoping: this PrometheusRule becomes a VMRule that EVERY tenant's VMAlert
+    evaluates (selectAllByDefault), each against its OWN vmselect. keda_build_info is
+    scraped only into the root monitoring stack, so a bare absent(keda_build_info) would
+    fire forever in every tenant that runs its own Monitoring app, about a healthy
+    platform component the tenant does not operate. Gate it on the presence of keda-hpa-*
+    HPA series (kube-state-metrics, root-only, same series the other rules key on): the
+    rule then evaluates to nothing in a datasource that has no KEDA HPAs at all, and only
+    fires where database autoscaling is actually in use but the operator's series vanished.
+    Tradeoff: like ScaleStuck/ScalerErrors it cannot catch "KEDA down with zero HPAs yet"
+    — an inherent limit of keying on keda-hpa-* series, accepted over a permanent
+    cross-tenant false-fire.
+    */}}
+    - alert: DatabaseAutoscalerKedaOperatorDown
+      expr: |-
+        absent(keda_build_info)
+        and on() (count(kube_horizontalpodautoscaler_status_current_replicas{job="kube-state-metrics",horizontalpodautoscaler=~"keda-hpa-.*"}) > 0)
+      for: 10m
+      labels:
+        severity: warning
+      annotations:
+        summary: KEDA operator is not reporting; database autoscaling is not being actuated.
+        description: The KEDA operator has emitted no keda_build_info for 10m (down, crash-looping, or unscraped). ScaledObjects are not being reconciled into HPAs, so autoscaled databases stay pinned at their admitted count and requested floors do not materialize.
+{{- end }}
diff --git a/packages/system/keda/tests/db_autoscaling_alerts_test.yaml b/packages/system/keda/tests/db_autoscaling_alerts_test.yaml
new file mode 100644
index 0000000000..3cff732b4d
--- /dev/null
+++ b/packages/system/keda/tests/db_autoscaling_alerts_test.yaml
@@ -0,0 +1,129 @@
+suite: database-autoscaling alert rules
+templates:
+  - templates/alerts.yaml
+release:
+  name: keda
+  namespace: cozy-keda
+tests:
+  - it: renders a PrometheusRule with the database-autoscaling alerts by default
+    asserts:
+      - hasDocuments:
+          count: 1
+      - isKind:
+          of: PrometheusRule
+      - equal:
+          path: spec.groups[0].name
+          value: database-autoscaling.rules
+      # stuck scale-up with a pod that exists but cannot run (unschedulable / unbindable
+      # PVC — both leave a Pending pod): desired > current AND a Pending CNPG pod
+      - contains:
+          path: spec.groups[0].rules
+          content:
+            alert: DatabaseAutoscalerScaleStuck
+          any: true
+      # quota-rejected scale-up — the Pending-INDEPENDENT companion (design proposal
+      # §Failure): a ResourceQuota refuses the pod at admission, so no pod is created and
+      # ScaleStuck's Pending intersection misses it. Keyed on desired > count(CNPG pods).
+      - contains:
+          path: spec.groups[0].rules
+          content:
+            alert: DatabaseAutoscalerScaleBlocked
+          any: true
+      # ScaleBlocked (rules[1]) compares desired to the CNPG instance-pod count and must NOT
+      # depend on a Pending phase (that is ScaleStuck's job) — otherwise it would miss the
+      # very case it exists for.
+      - notMatchRegex:
+          path: spec.groups[0].rules[1].expr
+          pattern: phase="Pending"
+      # count is per-cluster (namespace,cluster), not namespace-wide, so a sibling CNPG
+      # cluster's pods in the same namespace cannot mask one cluster's block
+      - matchRegex:
+          path: spec.groups[0].rules[1].expr
+          pattern: count by \(namespace,cluster\)
+      # ...and counts only INSTANCE pods (instance_role) so a transient basebackup/join Job
+      # pod does not inflate the count and hide a real block
+      - matchRegex:
+          path: spec.groups[0].rules[1].expr
+          pattern: label_cnpg_io_instance_role=~
+      # ...and is suppressed while a join Job is provisioning a replica (unless clause), so a
+      # healthy multi-step scale-up (serial basebackups, count lagging desired) does not fire
+      - matchRegex:
+          path: spec.groups[0].rules[1].expr
+          pattern: unless on\(namespace,cluster\)
+      # ScaleBlocked must not advise lowering maxReplicas (would abort a legitimate scale-up)
+      - notMatchRegex:
+          path: spec.groups[0].rules[1].annotations.description
+          pattern: lower autoscaling\.maxReplicas
+      # both scale-progress rules derive a common `cluster` label from the keda-hpa-<cluster>
+      # HPA name so the pod-side joins are per-cluster, not namespace-wide
+      - matchRegex:
+          path: spec.groups[0].rules[0].expr
+          pattern: (?s)label_replace\(.*horizontalpodautoscaler=~"keda-hpa-
+      - matchRegex:
+          path: spec.groups[0].rules[1].expr
+          pattern: keda-hpa-\(\.\+\)
+      # at the ceiling: desired >= maxReplicas (NOT the ScalingLimited condition, which is
+      # also true at the floor for an idle cluster and would make this fire on quiet DBs)
+      - contains:
+          path: spec.groups[0].rules
+          content:
+            alert: DatabaseAutoscalerAtMax
+          any: true
+      - matchRegex:
+          path: spec.groups[0].rules[2].expr
+          pattern: kube_horizontalpodautoscaler_spec_max_replicas
+      # must NOT key on ScalingLimited (that regressed to firing at the floor)
+      - notMatchRegex:
+          path: spec.groups[0].rules[2].expr
+          pattern: ScalingLimited
+      # KEDA cannot read the metric (vmselect down / bad query): scaler errors
+      - contains:
+          path: spec.groups[0].rules
+          content:
+            alert: DatabaseAutoscalerScalerErrors
+          any: true
+      # Guard the metric name: KEDA 2.20 renamed keda_scaler_errors_total away;
+      # the per-ScaledObject error counter is keda_scaled_object_errors_total
+      # (verified on a live 2.20.2 operator). A regression here makes the alert
+      # silently never fire.
+      - matchRegex:
+          path: spec.groups[0].rules[3].expr
+          pattern: keda_scaled_object_errors_total
+      # operator-down alert covers the "ScaledObject never became an HPA" gap
+      - contains:
+          path: spec.groups[0].rules
+          content:
+            alert: DatabaseAutoscalerKedaOperatorDown
+          any: true
+      - matchRegex:
+          path: spec.groups[0].rules[4].expr
+          pattern: absent\(keda_build_info\)
+      # ...gated on keda-hpa-* existence so it cannot false-fire in a tenant vmselect that
+      # never scrapes keda_build_info (own-monitoring tenants); fires only where KEDA HPAs
+      # exist. A bare absent() would alert forever in every such tenant.
+      - matchRegex:
+          path: spec.groups[0].rules[4].expr
+          pattern: count\(kube_horizontalpodautoscaler_status_current_replicas\{.*keda-hpa
+      # ScaleStuck must intersect with a Pending pod so a healthy long basebackup
+      # (Running pod, desired > current for >15m) does not false-fire. Both selectors
+      # in the Pending term MUST pin job="kube-state-metrics" like every other selector
+      # in the file: a tenant vmselect carrying a second KSM series (federated/remote
+      # write, or a tenant-run KSM) makes the on(namespace,pod) match ambiguous and the
+      # whole rule errors out silently. Dropping the job pin re-opens that, so this goes red.
+      - matchRegex:
+          path: spec.groups[0].rules[0].expr
+          pattern: kube_pod_status_phase\{job="kube-state-metrics",phase="Pending"\}
+      # ...and that Pending term is scoped to CNPG pods (label_cnpg_io_cluster) so an
+      # unrelated Pending pod in the tenant namespace cannot trip the alert
+      - matchRegex:
+          path: spec.groups[0].rules[0].expr
+          pattern: kube_pod_labels\{job="kube-state-metrics",label_cnpg_io_cluster!=
+
+  - it: can be disabled
+    set:
+      databaseAutoscaling:
+        alerts:
+          enabled: false
+    asserts:
+      - hasDocuments:
+          count: 0
diff --git a/packages/system/keda/tests/keda_test.yaml b/packages/system/keda/tests/keda_test.yaml
new file mode 100644
index 0000000000..4b7694f97c
--- /dev/null
+++ b/packages/system/keda/tests/keda_test.yaml
@@ -0,0 +1,157 @@
+suite: keda package renders the external-metrics APIService and cozystack ServiceMonitors
+release:
+  name: keda
+  namespace: cozy-keda
+tests:
+  # The whole database-autoscaling design rests on KEDA claiming the cluster-wide
+  # external.metrics.k8s.io APIService. Guard that the vendored chart still emits it.
+  - it: registers the v1beta1.external.metrics.k8s.io APIService
+    templates:
+      - charts/keda/templates/metrics-server/apiservice.yaml
+    asserts:
+      - hasDocuments:
+          count: 1
+      - isKind:
+          of: APIService
+      - equal:
+          path: metadata.name
+          value: v1beta1.external.metrics.k8s.io
+      - equal:
+          path: spec.group
+          value: external.metrics.k8s.io
+
+  # Supply-chain: the shim digest-pins all three KEDA images by @sha256 (matching
+  # every other cozystack system image) via `tag: "<appVersion>@sha256:..."`, which
+  # the vendored `repository:tag` helper renders verbatim. Guard the operator image
+  # keeps a digest so a re-vendor that drops the shim override goes red rather than
+  # silently shipping a floating tag.
+  - it: digest-pins the operator image
+    templates:
+      - charts/keda/templates/manager/deployment.yaml
+    asserts:
+      - matchRegex:
+          path: spec.template.spec.containers[0].image
+          pattern: "^ghcr.io/kedacore/keda:2.20.2@sha256:[0-9a-f]{64}$"
+
+  # The shim turns ServiceMonitors on; guard the override survives a re-vendor.
+  - it: emits the metrics-server ServiceMonitor enabled by the cozystack shim
+    templates:
+      - charts/keda/templates/metrics-server/servicemonitor.yaml
+    asserts:
+      - hasDocuments:
+          count: 1
+      - isKind:
+          of: ServiceMonitor
+
+  # cozystack runs on the cozy.local cluster domain, not the upstream default
+  # cluster.local. The metrics-apiserver dials the operator's metrics gRPC
+  # service at keda-operator.<ns>.svc.<clusterDomain>:9666, so an unset override
+  # resolves to NXDOMAIN and every HPA hangs on FailedGetExternalMetric. Guard the
+  # shim's clusterDomain so a re-vendor cannot silently drop it.
+  - it: dials the operator metrics gRPC service on the cozy.local cluster domain
+    templates:
+      - charts/keda/templates/metrics-server/deployment.yaml
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: --metrics-service-address=keda-operator.cozy-keda.svc.cozy.local:9666
+
+  # A single-replica operator at the upstream 20 QPS / 30 burst loses its leader
+  # lease under scale-subresource polling (client rate limiter starves the renewal)
+  # and crash-loops. Guard the raised throttle the shim sets via extraArgs.
+  - it: raises the operator client-go throttle above the upstream default
+    templates:
+      - charts/keda/templates/manager/deployment.yaml
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: --kube-api-qps=50
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: --kube-api-burst=100
+
+  # An admin removing the keda package must not cascade-delete every tenant's
+  # ScaledObject: the CRDs render as ordinary templates (not under the protected
+  # crds/ dir), so the shim stamps resource-policy: keep to orphan them on uninstall.
+  - it: keeps the KEDA CRDs on package uninstall
+    templates:
+      - charts/keda/templates/crds/crd-scaledobjects.yaml
+    asserts:
+      - equal:
+          path: metadata.annotations["helm.sh/resource-policy"]
+          value: keep
+
+  # Least-privilege: the shim narrows scaledRefKinds to CNPG clusters and restricts
+  # secret access, so the operator ClusterRole must NOT carry the upstream wildcard
+  # */scale nor cluster-wide secrets:[list,watch] (which would expose every tenant's
+  # DB credentials/TLS keys).
+  - it: narrows the operator ClusterRole to clusters/scale and drops cluster-wide secret access
+    templates:
+      - charts/keda/templates/manager/clusterrole.yaml
+    documentSelector:
+      path: metadata.name
+      value: keda-operator
+    asserts:
+      - contains:
+          path: rules
+          content:
+            resources: ["clusters/scale"]
+          any: true
+      - notContains:
+          path: rules
+          content:
+            resources: ["*/scale"]
+          any: true
+      - notContains:
+          path: rules
+          content:
+            resources: ["secrets"]
+          any: true
+
+  # SSRF hardening (design proposal §Security): the cluster-privileged operator's egress
+  # is restricted to the apiserver + in-cluster endpoints, with `world` (off-cluster)
+  # denied, so it cannot be turned into an SSRF relay to a metadata/external address.
+  - it: restricts the operator egress to apiserver + in-cluster (no world) via CiliumNetworkPolicy
+    capabilities:
+      apiVersions:
+        - cilium.io/v2
+    templates:
+      - charts/keda/templates/manager/ciliumnetworkpolicy.yaml
+    asserts:
+      - hasDocuments:
+          count: 1
+      - isKind:
+          of: CiliumNetworkPolicy
+      - contains:
+          path: spec.egress[0].toEntities
+          content: kube-apiserver
+      - contains:
+          path: spec.egress[0].toEntities
+          content: cluster
+      - notContains:
+          path: spec.egress[0].toEntities
+          content: world
+
+  # The egress hardening ships as CiliumNetworkPolicy (cilium.io/v2). The cozystack shim
+  # hardcodes flavor: cilium, so on a variant that serves no cilium.io/v2 CRD (an ISP-hosted
+  # cluster whose CNI is not Cilium) the object is unmappable and the whole keda HelmRelease
+  # fails to install. Gate the emission on the API being served so the package installs on
+  # any CNI; the egress hardening is simply absent where Cilium is not.
+  - it: does not emit the manager CiliumNetworkPolicy where cilium.io/v2 is not served
+    templates:
+      - charts/keda/templates/manager/ciliumnetworkpolicy.yaml
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  - it: emits the manager CiliumNetworkPolicy where cilium.io/v2 is served
+    capabilities:
+      apiVersions:
+        - cilium.io/v2
+    templates:
+      - charts/keda/templates/manager/ciliumnetworkpolicy.yaml
+    asserts:
+      - hasDocuments:
+          count: 1
+      - isKind:
+          of: CiliumNetworkPolicy
diff --git a/packages/system/keda/values.yaml b/packages/system/keda/values.yaml
new file mode 100644
index 0000000000..aba5ae998d
--- /dev/null
+++ b/packages/system/keda/values.yaml
@@ -0,0 +1,129 @@
+# cozystack-owned autoscaling observability, rendered by this umbrella chart's
+# own templates (templates/alerts.yaml) — NOT passed to the vendored KEDA subchart.
+# The Grafana dashboard is NOT shipped from here: cozystack provisions dashboards
+# via grafana-operator from the grafana-dashboards image, so it lives at
+# dashboards/db/database-autoscaling.json and is registered in
+# packages/system/monitoring/dashboards.list like every other db/* dashboard.
+databaseAutoscaling:
+  alerts:
+    enabled: true
+
+keda:
+  # Keep the KEDA CRDs on package uninstall. They render as ordinary templates (not
+  # under Helm's protected crds/ dir), so without this an admin who removes the keda
+  # package would delete the ScaledObject CRD and cascade-delete EVERY tenant's
+  # ScaledObject, wedging every autoscaled database at its next reconcile. resource-policy
+  # keep orphans the CRDs instead; a deliberate CRD cleanup is then a manual step.
+  # TEARDOWN ORDER: `keep` covers the CRDs, not the finalizer. KEDA stamps
+  # finalizer.keda.sh on every ScaledObject and only the running operator removes it, so if
+  # the package is removed while ScaledObjects still exist, a tenant deleting their Postgres
+  # app gets a ScaledObject stuck Terminating and a HelmRelease uninstall that hangs on it,
+  # recoverable only by an admin finalizer patch. Before removing the keda package, set
+  # autoscaling.enabled: false on every tenant Postgres (which deletes the ScaledObjects
+  # while the operator is still up to clear their finalizers).
+  crds:
+    additionalAnnotations:
+      helm.sh/resource-policy: keep
+  # Least-privilege the cluster-wide operator RBAC. Upstream defaults grant the
+  # operator get/list/patch/update/watch on `*/scale` across ALL apiGroups (from the
+  # default scaledRefKinds [{apiGroup: "*", kind: "*"}]) plus cluster-wide
+  # secrets:[list,watch]. cozystack's only ScaledObject target is the CNPG Cluster and
+  # no cozystack ScaledObject uses a TriggerAuthentication, so narrow both:
+  #   - scaledRefKinds -> only clusters.postgresql.cnpg.io/scale (enabledCustomScaledRefKinds
+  #     is already true upstream). Add engines here as MariaDB/Redis/Mongo autoscaling lands.
+  #   - restrict.secret -> operator can read Secrets only in its own namespace, dropping the
+  #     cluster-wide secrets:[list,watch] that could stream every tenant's DB creds/TLS keys.
+  rbac:
+    scaledRefKinds:
+      - apiGroup: postgresql.cnpg.io
+        kind: clusters
+  permissions:
+    operator:
+      restrict:
+        secret: true
+  # Restrict the cluster-privileged operator's egress (design proposal §Security — SSRF
+  # hardening for autoscaling.serverAddress). The operator fetches each ScaledObject's
+  # serverAddress every polling interval; the postgres chart already refuses a non-in-cluster
+  # serverAddress at render, and this is the defense-in-depth second half. flavor "cilium"
+  # (cozystack's CNI) renders a CiliumNetworkPolicy whose egress is toEntities
+  # [kube-apiserver, cluster] only: the apiserver and in-cluster endpoints (CoreDNS, vmselect,
+  # CNPG pods) stay reachable, while `world` (off-cluster hosts) is denied — so the operator
+  # cannot be turned into an SSRF relay to a metadata endpoint or an external address. The
+  # kube-apiserver entity covers the control plane however it is addressed, so unlike a raw
+  # CIDR egress policy this does not risk starving the operator's apiserver access.
+  # SCOPE, two caveats (why the render-time namespace-pin in scaledobject.yaml is the primary
+  # control, not this policy):
+  #   1. `cluster` permits ALL in-cluster egress, any namespace — it does NOT stop the
+  #      operator being pointed at another tenant's or a system namespace's `.svc`. Blocking
+  #      that is the postgres chart's serverAddress namespace-pin, not this netpol.
+  #   2. off-cluster denial assumes the CNI actually enforces CiliumNetworkPolicy (flavor is
+  #      hardcoded cilium) AND that Cilium classifies the target as `world`. Link-local
+  #      (169.254.0.0/16, e.g. the 169.254.169.254 cloud-metadata IMDS) classification is
+  #      config-dependent and not guaranteed to be `world`. The CiliumNetworkPolicy objects
+  #      are gated on the cilium.io/v2 API being served (patches/ciliumnetworkpolicy-
+  #      capability-gate.patch) so the package still INSTALLS on a variant that ships no
+  #      Cilium — but there the egress backstop is simply ABSENT, so the chart's serverAddress
+  #      namespace-pin is the only control. Re-verify off-cluster + IMDS denial live on
+  #      cozystack-pr-test (design proposal §Testing) before treating this as a hard control.
+  networkPolicy:
+    enabled: true
+    flavor: cilium
+  # Digest-pin the three KEDA images (supply-chain: match every other cozystack
+  # system image, which pins by @sha256). The vendored chart renders each image as
+  # `{{ registry }}/{{ repository }}:{{ tag | default appVersion }}`, and
+  # `2.20.2@sha256:<digest>` is a valid OCI reference where the digest wins at
+  # resolution — so the pin goes in the tag field of these shim values with no
+  # subchart patch. Digests are the multi-arch image-index digests for the 2.20.2
+  # tag on ghcr.io (amd64/arm64/s390x); bump them in lockstep with
+  # KEDA_CHART_VERSION in the Makefile whenever the chart is re-vendored.
+  # registry and repository repeat the chart defaults so the digest-pinned ref
+  # is complete in this file, where the release tooling reads it.
+  image:
+    keda:
+      registry: ghcr.io
+      repository: kedacore/keda
+      tag: "2.20.2@sha256:fe74c7b8849586a67ad2201bcb89e7f5ac221ff90399ecaa8fd28427f1ef11e6"
+    metricsApiServer:
+      registry: ghcr.io
+      repository: kedacore/keda-metrics-apiserver
+      tag: "2.20.2@sha256:27286536a8a775aeeee37a7e343f8ecebb27ebf680ee1181a4f99e82eefb253b"
+    webhooks:
+      registry: ghcr.io
+      repository: kedacore/keda-admission-webhooks
+      tag: "2.20.2@sha256:41f74102aba7959c6e8d08b433ab8a5fd6cae7c5646c78f7fe3de40a52df3439"
+  # Cozystack's cluster domain, not the upstream chart default "cluster.local".
+  # KEDA's metrics-apiserver dials the operator's metrics gRPC service at
+  # keda-operator.<ns>.svc.<clusterDomain>:9666 and the operator mints that
+  # service's serving-cert SANs from the same domain; a wrong domain makes the
+  # external-metrics path NXDOMAIN and every HPA reports FailedGetExternalMetric.
+  # This literal is only the fallback default: on a real platform install
+  # core/platform injects the authoritative networking.clusterDomain into this key
+  # via the shared cozystack-values Secret (see apps.yaml), so a cluster with a
+  # non-default domain works without editing this file. cozy.local matches the
+  # platform default, so a standalone `helm template`/unittest still renders correctly.
+  clusterDomain: cozy.local
+  # Raise the operator's client-go throttle above the upstream 20 QPS / 30 burst.
+  # The operator polls every ScaledObject's /scale subresource on the scale loop;
+  # at the default QPS those polls queue in the client rate limiter ahead of the
+  # leader-election lease renewal, which then misses its deadline and the manager
+  # exits with "leader election lost" (observed crash-looping the single-replica
+  # operator on a test cluster). A higher ceiling keeps the renewal call from starving.
+  extraArgs:
+    keda:
+      kube-api-qps: 50
+      kube-api-burst: 100
+  # Cozystack ships a Prometheus (VictoriaMetrics) stack by default, so surface
+  # KEDA's operator, metrics-server and webhook metrics through ServiceMonitors.
+  prometheus:
+    operator:
+      enabled: true
+      serviceMonitor:
+        enabled: true
+    metricServer:
+      enabled: true
+      serviceMonitor:
+        enabled: true
+    webhooks:
+      enabled: true
+      serviceMonitor:
+        enabled: true
diff --git a/packages/system/keycloak-configure/Makefile b/packages/system/keycloak-configure/Makefile
index 4cd5bd2ed1..b0a357e692 100644
--- a/packages/system/keycloak-configure/Makefile
+++ b/packages/system/keycloak-configure/Makefile
@@ -3,3 +3,6 @@ export NAMESPACE=cozy-keycloak
 
 include ../../../hack/common-envs.mk
 include ../../../hack/package.mk
+
+test:
+	helm unittest .
diff --git a/packages/system/keycloak-configure/templates/configure-kk.yaml b/packages/system/keycloak-configure/templates/configure-kk.yaml
index 67af67fc21..e0d59edbc0 100644
--- a/packages/system/keycloak-configure/templates/configure-kk.yaml
+++ b/packages/system/keycloak-configure/templates/configure-kk.yaml
@@ -1,4 +1,5 @@
 {{- $host := index .Values._cluster "root-host" }}
+{{- $realmName := index .Values._cluster "oidc-realm-name" | default "cozy" }}
 {{- $extraRedirectUris := splitList "," ((index .Values._cluster "extra-keycloak-redirect-uri-for-dashboard") | default "") }}
 {{- $k8sCa := index .Values._cluster "kube-root-ca" }}
 
@@ -25,8 +26,9 @@ metadata:
   name: keycloakrealm-cozy
   namespace: {{ .Release.Namespace }}
 spec:
-  realmName: cozy
+  realmName: {{ $realmName | quote }}
   clusterKeycloakRef: keycloak-cozy
+  organizationsEnabled: {{ .Values.organizationsEnabled | default false }}
   {{- if $brandingConfig }}
   {{- if hasKey $brandingConfig "brandName" }}
   displayName: {{ $brandingConfig.brandName }}
@@ -36,6 +38,10 @@ spec:
   {{- else if hasKey $brandingConfig "branding" }}
   displayHtmlName: {{ $brandingConfig.branding }}
   {{- end }}
+  {{- if hasKey $brandingConfig "loginTheme" }}
+  themes:
+    loginTheme: {{ $brandingConfig.loginTheme | quote }}
+  {{- end }}
   {{- end }}
   {{- with .Values.login }}
   login:
diff --git a/packages/system/keycloak-configure/templates/delete.yaml b/packages/system/keycloak-configure/templates/delete.yaml
index 99abd6e67e..f499c77f6d 100644
--- a/packages/system/keycloak-configure/templates/delete.yaml
+++ b/packages/system/keycloak-configure/templates/delete.yaml
@@ -39,7 +39,7 @@ spec:
                   done
                 done
 
-                kubectl patch hr keycloak-configure -n cozy-system --type=merge -p '{"metadata":{"finalizers":[]}}'
+                kubectl patch hr {{ .Release.Name }} -n {{ .Release.Namespace }} --type=merge -p '{"metadata":{"finalizers":[]}}'
 
 
 ---
diff --git a/packages/system/keycloak-configure/templates/enable-update-email.yaml b/packages/system/keycloak-configure/templates/enable-update-email.yaml
new file mode 100644
index 0000000000..c1bbdae392
--- /dev/null
+++ b/packages/system/keycloak-configure/templates/enable-update-email.yaml
@@ -0,0 +1,111 @@
+{{- $realmName := index .Values._cluster "oidc-realm-name" | default "cozy" | toString }}
+{{/*
+  Enable the UPDATE_EMAIL required action in the platform realm (cozy by
+  default, authentication.oidc.realmName).
+
+  The portal user-settings page lets a user change their email via a
+  Keycloak `kc_action=UPDATE_EMAIL` redirect. That flow only works when
+  the UPDATE_EMAIL required action is enabled at the realm level
+  (per-realm opt-in — see keycloak/keycloak#41045).
+
+  `update-email` is a supported, default-on feature since Keycloak 26.4
+  (keycloak/keycloak#39722), so the provider is already loaded on the
+  26.x server this chart ships — no KC_FEATURES change (and no Keycloak
+  restart) is needed here. The edp-keycloak-operator has no CRD field for
+  required actions, so this one-shot Job flips it via the admin API using
+  the bundled kcadm.sh. It is idempotent and re-runs on every upgrade.
+*/}}
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: {{ .Release.Name }}-enable-update-email
+  namespace: {{ .Release.Namespace }}
+  annotations:
+    "helm.sh/hook": post-install,post-upgrade
+    "helm.sh/hook-weight": "5"
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+spec:
+  backoffLimit: 4
+  template:
+    spec:
+      restartPolicy: Never
+      tolerations:
+        - key: CriticalAddonsOnly
+          operator: Exists
+        - key: node-role.kubernetes.io/control-plane
+          operator: Exists
+          effect: "NoSchedule"
+      securityContext:
+        runAsNonRoot: true
+        seccompProfile:
+          type: RuntimeDefault
+      containers:
+        - name: kcadm
+          image: {{ .Values.image | default "quay.io/keycloak/keycloak:26.5.2" | quote }}
+          securityContext:
+            allowPrivilegeEscalation: false
+            readOnlyRootFilesystem: true
+            capabilities:
+              drop:
+                - ALL
+          env:
+            # kcadm.sh / the JVM write to $HOME and java.io.tmpdir; point
+            # both at the writable emptyDir so readOnlyRootFilesystem holds.
+            - name: HOME
+              value: /tmp
+            - name: KC_URL
+              value: "http://keycloak-http.cozy-keycloak.svc:8080"
+            - name: KC_USER
+              valueFrom:
+                secretKeyRef:
+                  name: keycloak-credentials
+                  key: username
+            - name: KC_PASS
+              valueFrom:
+                secretKeyRef:
+                  name: keycloak-credentials
+                  key: password
+          volumeMounts:
+            - name: tmp
+              mountPath: /tmp
+          command:
+            - /bin/bash
+            - -c
+            - |
+              set -eu
+              KCADM=/opt/keycloak/bin/kcadm.sh
+              CFG=/tmp/kcadm.config
+              REALM={{ $realmName | squote }}
+
+              # The realm is reconciled asynchronously by the
+              # keycloak-operator, so wait for it before configuring it.
+              i=0
+              until "$KCADM" config credentials --config "$CFG" --server "$KC_URL" \
+                      --realm master --user "$KC_USER" --password "$KC_PASS" >/dev/null 2>&1 \
+                    && "$KCADM" get authentication/required-actions --config "$CFG" -r "$REALM" >/dev/null 2>&1; do
+                i=$((i + 1))
+                if [ "$i" -ge 30 ]; then
+                  echo "timed out waiting for keycloak realm '$REALM'" >&2
+                  exit 1
+                fi
+                echo "waiting for keycloak realm '$REALM' ... ($i)"
+                sleep 10
+              done
+
+              # Register the provider if it is somehow missing (defensive —
+              # on a supported, default-on feature it is normally already
+              # registered, so tolerate an "already exists" response).
+              if ! "$KCADM" get authentication/required-actions/UPDATE_EMAIL --config "$CFG" -r "$REALM" >/dev/null 2>&1; then
+                "$KCADM" create authentication/register-required-action --config "$CFG" -r "$REALM" \
+                  -b '{"providerId":"UPDATE_EMAIL","name":"Update Email"}' || true
+              fi
+
+              # Enable it (idempotent). kcadm merges onto the current
+              # representation, so other fields are preserved.
+              "$KCADM" update authentication/required-actions/UPDATE_EMAIL --config "$CFG" -r "$REALM" \
+                -s enabled=true
+
+              echo "UPDATE_EMAIL required action enabled in realm '$REALM'"
+      volumes:
+        - name: tmp
+          emptyDir: {}
diff --git a/packages/system/keycloak-configure/tests/delete_test.yaml b/packages/system/keycloak-configure/tests/delete_test.yaml
new file mode 100644
index 0000000000..9e740d5b83
--- /dev/null
+++ b/packages/system/keycloak-configure/tests/delete_test.yaml
@@ -0,0 +1,58 @@
+suite: flux teardown job patches the HelmRelease in the release namespace
+
+# The pre-delete teardown Job clears the HelmRelease finalizers as its last
+# step. Its RBAC (Role + RoleBinding, resourceNames: [.Release.Name]) is created
+# in .Release.Namespace, so the kubectl patch MUST target that same namespace and
+# release name. A hardcoded namespace that differs from the install namespace
+# makes the ServiceAccount Forbidden to patch the HelmRelease, the Job retries
+# forever, and the Helm release wedges in "uninstalling".
+release:
+  name: keycloak-configure
+  namespace: cozy-keycloak
+tests:
+  - it: teardown patches the HelmRelease using the release name and namespace
+    template: templates/delete.yaml
+    documentSelector:
+      path: kind
+      value: Job
+    set:
+      _cluster:
+        root-host: example.com
+        kube-root-ca: ""
+    asserts:
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: kubectl patch hr keycloak-configure -n cozy-keycloak
+
+  - it: teardown never targets a namespace other than the release namespace
+    template: templates/delete.yaml
+    documentSelector:
+      path: kind
+      value: Job
+    set:
+      _cluster:
+        root-host: example.com
+        kube-root-ca: ""
+    asserts:
+      - notMatchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: patch hr \S+ -n cozy-system
+
+  # Prove the patch is parameterized on .Release.Name / .Release.Namespace
+  # rather than matching the default install namespace by coincidence.
+  - it: teardown tracks a non-default release name and namespace
+    template: templates/delete.yaml
+    documentSelector:
+      path: kind
+      value: Job
+    release:
+      name: custom-release
+      namespace: custom-ns
+    set:
+      _cluster:
+        root-host: example.com
+        kube-root-ca: ""
+    asserts:
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: kubectl patch hr custom-release -n custom-ns
diff --git a/packages/system/keycloak-configure/tests/hook_realm_name_test.yaml b/packages/system/keycloak-configure/tests/hook_realm_name_test.yaml
new file mode 100644
index 0000000000..a9f2cf7b0e
--- /dev/null
+++ b/packages/system/keycloak-configure/tests/hook_realm_name_test.yaml
@@ -0,0 +1,35 @@
+suite: enable-update-email hook Job targets the configured realm
+templates:
+  - templates/enable-update-email.yaml
+
+release:
+  name: keycloak-configure
+  namespace: cozy-keycloak
+
+# The enable-update-email hook Job is a consumer of the realm in the same chart
+# that creates it: it waits on and configures the realm by name via kcadm. On a
+# custom realm it must target the realm keycloak-configure actually provisions,
+# not the literal "cozy" — otherwise the Job waits for a realm that never
+# appears and the cold install times out, so a non-default realmName is the one
+# value nobody could set without breaking the install.
+
+tests:
+  # The realm is single-quoted in the shell assignment so a name carrying a
+  # space or a shell metacharacter cannot break or inject into the Job script.
+  - it: defaults the hook Job realm to cozy
+    asserts:
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: "REALM='cozy'(\\s|$)"
+
+  - it: threads a single-quoted custom realm name into the hook Job
+    set:
+      _cluster:
+        oidc-realm-name: acme
+    asserts:
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: "REALM='acme'(\\s|$)"
+      - notMatchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: "REALM='cozy'"
diff --git a/packages/system/keycloak-configure/tests/login_theme_test.yaml b/packages/system/keycloak-configure/tests/login_theme_test.yaml
new file mode 100644
index 0000000000..337102f378
--- /dev/null
+++ b/packages/system/keycloak-configure/tests/login_theme_test.yaml
@@ -0,0 +1,44 @@
+suite: keycloak realm login theme via platform branding
+
+# branding.loginTheme (delivered through _cluster.branding) must select the
+# realm login theme by rendering ClusterKeycloakRealm.spec.themes.loginTheme,
+# alongside the existing branding.brandName -> displayName path. Without this
+# the realm keeps the stock Keycloak login theme regardless of branding.
+release:
+  name: keycloak-configure
+  namespace: cozy-keycloak
+tests:
+  - it: branding loginTheme sets ClusterKeycloakRealm.spec.themes.loginTheme
+    template: templates/configure-kk.yaml
+    documentSelector:
+      path: kind
+      value: ClusterKeycloakRealm
+    set:
+      _cluster:
+        root-host: example.com
+        kube-root-ca: ""
+        branding:
+          brandName: Acme Platform
+          loginTheme: aenix
+    asserts:
+      - equal:
+          path: spec.themes.loginTheme
+          value: aenix
+      - equal:
+          path: spec.displayName
+          value: Acme Platform
+
+  - it: no loginTheme leaves the realm without a themes block
+    template: templates/configure-kk.yaml
+    documentSelector:
+      path: kind
+      value: ClusterKeycloakRealm
+    set:
+      _cluster:
+        root-host: example.com
+        kube-root-ca: ""
+        branding:
+          brandName: Acme Platform
+    asserts:
+      - notExists:
+          path: spec.themes
diff --git a/packages/system/keycloak-configure/tests/organizations_enabled_test.yaml b/packages/system/keycloak-configure/tests/organizations_enabled_test.yaml
new file mode 100644
index 0000000000..c67bdf97cf
--- /dev/null
+++ b/packages/system/keycloak-configure/tests/organizations_enabled_test.yaml
@@ -0,0 +1,38 @@
+suite: keycloak realm organizations toggle
+
+# organizationsEnabled must reach ClusterKeycloakRealm.spec.organizationsEnabled:
+# the keycloak-operator PUTs the rendered spec back on every reconcile, so a
+# toggle flipped in the admin console is reverted unless it is a chart value.
+# The default must render false — no behaviour change on stock installs.
+release:
+  name: keycloak-configure
+  namespace: cozy-keycloak
+tests:
+  - it: default renders organizationsEnabled false
+    template: templates/configure-kk.yaml
+    documentSelector:
+      path: kind
+      value: ClusterKeycloakRealm
+    set:
+      _cluster:
+        root-host: example.com
+        kube-root-ca: ""
+    asserts:
+      - equal:
+          path: spec.organizationsEnabled
+          value: false
+
+  - it: organizationsEnabled true renders through to the realm spec
+    template: templates/configure-kk.yaml
+    documentSelector:
+      path: kind
+      value: ClusterKeycloakRealm
+    set:
+      _cluster:
+        root-host: example.com
+        kube-root-ca: ""
+      organizationsEnabled: true
+    asserts:
+      - equal:
+          path: spec.organizationsEnabled
+          value: true
diff --git a/packages/system/keycloak-configure/tests/realm_name_test.yaml b/packages/system/keycloak-configure/tests/realm_name_test.yaml
new file mode 100644
index 0000000000..8bc06c5bfa
--- /dev/null
+++ b/packages/system/keycloak-configure/tests/realm_name_test.yaml
@@ -0,0 +1,49 @@
+suite: configure-kk realm name is driven by _cluster.oidc-realm-name
+templates:
+  - templates/configure-kk.yaml
+
+release:
+  name: keycloak-configure
+  namespace: cozy-keycloak
+
+# configure-kk.yaml is the source of truth for the realm: it creates the
+# ClusterKeycloakRealm, its clients and the cozystack-cluster-admin roles. The
+# realm's technical name must follow authentication.oidc.realmName (arriving as
+# _cluster.oidc-realm-name from the platform) so operators can rename it in one
+# place. The KeycloakRealm CR object name (keycloakrealm-cozy) and the realmRef
+# that clients point at are internal Kubernetes names and stay fixed.
+
+tests:
+  - it: defaults the realm name to cozy when _cluster is absent
+    asserts:
+      - matchRegex:
+          path: spec.realmName
+          pattern: '^cozy$'
+        documentIndex: 1
+
+  - it: uses a custom realm name from the _cluster channel
+    set:
+      _cluster:
+        oidc-realm-name: acme
+    asserts:
+      - equal:
+          path: spec.realmName
+          value: acme
+        documentIndex: 1
+
+  # A realm name that is a bare integer or a YAML-reserved word (123, on, no)
+  # is legal in Keycloak but, rendered unquoted, YAML-coerces to int/bool and
+  # fails the CRD's string schema on apply — far from values.yaml and hard to
+  # diagnose. Keep spec.realmName a string regardless of the value's shape.
+  - it: keeps a numeric realm name a string
+    set:
+      _cluster:
+        oidc-realm-name: 123
+    asserts:
+      - equal:
+          path: spec.realmName
+          value: "123"
+        documentIndex: 1
+      - isKind:
+          of: ClusterKeycloakRealm
+        documentIndex: 1
diff --git a/packages/system/keycloak-configure/tests/standalone_render_test.yaml b/packages/system/keycloak-configure/tests/standalone_render_test.yaml
new file mode 100644
index 0000000000..48a22fd55e
--- /dev/null
+++ b/packages/system/keycloak-configure/tests/standalone_render_test.yaml
@@ -0,0 +1,20 @@
+suite: keycloak-configure renders with no platform values injected
+release:
+  name: keycloak-configure
+  namespace: cozy-keycloak
+
+# The platform injects _cluster through the cozystack-values Secret, so every
+# case that sets it itself renders fine whether or not values.yaml declares
+# the key. This case supplies nothing. Drop the declaration from values.yaml
+# and the render dies on "index of untyped nil" before a single assert runs;
+# the declaration is the only thing keeping the chart renderable outside a
+# cluster. No suite-level `templates:` list here on purpose: it would narrow
+# the render to the listed files and let a later template reintroduce the
+# same breakage unseen.
+
+tests:
+  - it: still renders the realm objects when _cluster is absent
+    asserts:
+      - template: templates/configure-kk.yaml
+        hasDocuments:
+          count: 6
diff --git a/packages/system/keycloak-configure/values.yaml b/packages/system/keycloak-configure/values.yaml
index 840e31885c..b19efbff11 100644
--- a/packages/system/keycloak-configure/values.yaml
+++ b/packages/system/keycloak-configure/values.yaml
@@ -1,3 +1,18 @@
+# Injected by the platform from the cozystack-values Secret. The empty
+# default keeps the chart renderable on its own, outside a cluster.
+_cluster: {}
+
+# Keycloak image used by the one-shot admin-API job that enables the
+# UPDATE_EMAIL required action. Only kcadm.sh is used, so it just needs
+# to track the Keycloak server major version (packages/system/keycloak).
+image: quay.io/keycloak/keycloak:26.5.2
+
+# Enable the Keycloak Organizations feature for the platform realm.
+# Mapped to ClusterKeycloakRealm.spec.organizationsEnabled. Defaults to
+# false to preserve the current behaviour; set to true to manage
+# organizations (and KeycloakOrganization resources) in the realm.
+organizationsEnabled: false
+
 # login:
 #   userRegistration: false
 #   verifyEmail: false
diff --git a/packages/system/keycloak-operator/Makefile b/packages/system/keycloak-operator/Makefile
index f4a6709c87..e2f7f45d56 100644
--- a/packages/system/keycloak-operator/Makefile
+++ b/packages/system/keycloak-operator/Makefile
@@ -7,10 +7,11 @@ include ../../../hack/package.mk
 image:
 	docker buildx build images/keycloak-operator \
 		$(call image-tags,keycloak-operator,v$(COZYSTACK_VERSION)) \
-		--cache-from type=registry,ref=$(REGISTRY)/keycloak-operator:latest \
-		--cache-to   type=inline \
+		$(call cache-args,keycloak-operator) \
 		--metadata-file images/keycloak-operator.json \
 		$(BUILDX_ARGS)
+	REPOSITORY="$(REGISTRY)/keycloak-operator" \
+		yq -i '.keycloak-operator.image.repository = strenv(REPOSITORY)' values.yaml
 	TAG="$(IMAGE_TAG)@$$(yq e '."containerimage.digest"' images/keycloak-operator.json -r)" \
 		yq -i '.keycloak-operator.image.tag = strenv(TAG)' values.yaml
 	rm -f images/keycloak-operator.json
diff --git a/packages/system/keycloak-operator/images/keycloak-operator/Dockerfile b/packages/system/keycloak-operator/images/keycloak-operator/Dockerfile
index 8167042f14..d19a082926 100644
--- a/packages/system/keycloak-operator/images/keycloak-operator/Dockerfile
+++ b/packages/system/keycloak-operator/images/keycloak-operator/Dockerfile
@@ -1,6 +1,6 @@
-# syntax=docker/dockerfile:1.2
+# syntax=docker/dockerfile:1.2@sha256:e2a8561e419ab1ba6b2fe6cbdf49fd92b95912df1cf7d313c3e2230a333fdbcc
 
-FROM alpine AS source
+FROM alpine@sha256:294b683cb724975bec92580e1e685676bd4b50bda910ddb8c51d4cabeaec77e6 AS source
 ARG COMMIT_REF=facbc36
 RUN apk add --no-cache curl tar git
 WORKDIR /src
@@ -11,19 +11,34 @@ RUN curl -sSL https://github.com/epam/edp-keycloak-operator/archive/${COMMIT_REF
 COPY patches /patches
 RUN git apply /patches/*.diff
 
-FROM --platform=$BUILDPLATFORM docker.io/golang:1.24 AS builder
+FROM --platform=$BUILDPLATFORM docker.io/golang:1.27@sha256:3680233e3204827fbdc66088528ae6d4b3d034f51d03a99d454f6de034888244 AS builder
+ARG GOPROXY
 ARG TARGETOS
 ARG TARGETARCH
 
 WORKDIR /go/src/keycloak-operator
 
 COPY --from=source /src/go.mod /src/go.sum ./
-RUN go mod download
+RUN for attempt in 1 2 3; do go mod download && break; [ "$attempt" = 3 ] && exit 1; sleep $((attempt * 10)); done
 
 COPY --from=source /src .
+
+COPY --from=source /patches /patches
+
+# go build never compiles a _test.go, so nothing else runs the tests of the
+# packages the patches touch. Each package is tested from its own directory:
+# that finds the module it belongs to, and an empty list runs nothing.
+# The list is read into a variable first: a for loop drops the exit status
+# of a command substitution, so a patch git cannot read would leave the list
+# empty and the step green.
+RUN files=$(git apply --numstat /patches/*.diff) || exit 1; \
+    for dir in $(printf '%s\n' "$files" | cut -f3 | grep '\.go$' | xargs -r -n1 dirname | sort -u); do \
+      (cd "$dir" && go test .) || exit 1; \
+    done
+
 RUN CGO_ENABLED=0 GOOS=$TARGETOS GOARCH=$TARGETARCH go build -o /build/manager ./cmd
 
-FROM gcr.io/distroless/static:nonroot
+FROM gcr.io/distroless/static:nonroot@sha256:e2e927ec666bae08560abb3c55d0659eceabb657f56b6782ab500a9fc7f555e3
 COPY --from=builder /build/manager /manager
 USER 65532:65532
 ENTRYPOINT ["/manager"]
diff --git a/packages/system/keycloak-operator/images/keycloak-operator/patches/keycloakrealmuser-unset-roles.diff b/packages/system/keycloak-operator/images/keycloak-operator/patches/keycloakrealmuser-unset-roles.diff
new file mode 100644
index 0000000000..14edac3314
--- /dev/null
+++ b/packages/system/keycloak-operator/images/keycloak-operator/patches/keycloakrealmuser-unset-roles.diff
@@ -0,0 +1,343 @@
+Backport of epam/edp-keycloak-operator#372 (https://github.com/epam/edp-keycloak-operator/pull/372), which fixes epam/edp-keycloak-operator#371 (https://github.com/epam/edp-keycloak-operator/issues/371): a KeycloakRealmUser that leaves spec.roles out gets every realm role stripped from the Keycloak user, including the default-roles-<realm> that Keycloak grants on creation. After the fix an omitted list means "not managed", and an explicit empty list still removes everything.
+
+Dropping omitempty from the json tags is the other half of the fix. Without it an explicit "roles: []" disappears the first time the operator writes the object back (adding its own finalizer is enough) and comes back indistinguishable from an omitted field, so the nil-vs-empty distinction does not survive a round trip.
+
+Applies to: epam/edp-keycloak-operator @ facbc36, pinned as COMMIT_REF in the Dockerfile one level up.
+
+Six of the eight files are taken from the upstream PR unchanged. internal/controller/keycloakrealmuser/chain/sync_user_roles.go and its test carry the same change rewritten against facbc36, where the generated client package is still called keycloakv2. Upstream renamed it to keycloakapi in b611ea75, after this pin.
+
+Drop this file when COMMIT_REF moves past the upstream merge commit.
+
+diff --git a/api/v1/keycloakclient_types.go b/api/v1/keycloakclient_types.go
+index 28df6eb..74100c6 100644
+--- a/api/v1/keycloakclient_types.go
++++ b/api/v1/keycloakclient_types.go
+@@ -237,7 +237,7 @@ type UserClientRole struct {
+ 	// Roles is a list of client roles names assigned to user.
+ 	// +nullable
+ 	// +optional
+-	Roles []string `json:"roles,omitempty"`
++	Roles []string `json:"roles"` // no omitempty: an empty list has to stay distinguishable from an omitted one
+ }
+ 
+ type ClientRole struct {
+diff --git a/api/v1/keycloakrealmuser_types.go b/api/v1/keycloakrealmuser_types.go
+index 5773150..541b8b8 100644
+--- a/api/v1/keycloakrealmuser_types.go
++++ b/api/v1/keycloakrealmuser_types.go
+@@ -40,12 +40,16 @@ type KeycloakRealmUserSpec struct {
+ 	// +optional
+ 	RequiredUserActions []string `json:"requiredUserActions,omitempty"`
+ 
+-	// Roles is a list of roles assigned to user.
++	// Roles is a list of realm roles assigned to user.
++	// Omitting the field, or setting it to null, leaves the realm roles the user already has untouched,
++	// including the defaults Keycloak grants on creation.
++	// An explicit empty list removes every realm role from the user.
+ 	// +nullable
+ 	// +optional
+-	Roles []string `json:"roles,omitempty"`
++	Roles []string `json:"roles"` // no omitempty: an empty list has to stay distinguishable from an omitted one
+ 
+ 	// ClientRoles is a list of client roles assigned to user.
++	// The same rule as for Roles applies per client: omitting an entry's roles list leaves that client's roles untouched, an empty list removes all of them.
+ 	// +nullable
+ 	// +optional
+ 	ClientRoles []UserClientRole `json:"clientRoles,omitempty"`
+diff --git a/api/v1/keycloakrealmuser_types_test.go b/api/v1/keycloakrealmuser_types_test.go
+new file mode 100644
+index 0000000..18eae79
+--- /dev/null
++++ b/api/v1/keycloakrealmuser_types_test.go
+@@ -0,0 +1,55 @@
++package v1
++
++import (
++	"encoding/json"
++	"testing"
++
++	"github.com/stretchr/testify/assert"
++	"github.com/stretchr/testify/require"
++)
++
++// The user controller reads an omitted role list as "not managed" and an empty one as "remove
++// every role". The controller also rewrites the whole resource when it adds its finalizer or
++// migrates attributes, so an empty list has to survive a marshal/unmarshal cycle: with omitempty
++// on the json tag it would come back as omitted and silently downgrade to "not managed".
++func TestKeycloakRealmUserSpec_EmptyRoleListsSurviveSerialization(t *testing.T) {
++	spec := KeycloakRealmUserSpec{
++		Username: "testuser",
++		Roles:    []string{},
++		ClientRoles: []UserClientRole{
++			{ClientID: "client1", Roles: []string{}},
++		},
++	}
++
++	raw, err := json.Marshal(spec)
++	require.NoError(t, err)
++
++	var decoded KeycloakRealmUserSpec
++
++	require.NoError(t, json.Unmarshal(raw, &decoded))
++
++	assert.NotNil(t, decoded.Roles, "empty spec.roles must not decode back as omitted")
++	assert.Empty(t, decoded.Roles)
++
++	require.Len(t, decoded.ClientRoles, 1)
++	assert.NotNil(t, decoded.ClientRoles[0].Roles, "empty spec.clientRoles[].roles must not decode back as omitted")
++	assert.Empty(t, decoded.ClientRoles[0].Roles)
++}
++
++// An omitted role list must stay omitted, so that "not managed" is not confused with "remove
++// every role" in the other direction either.
++func TestKeycloakRealmUserSpec_OmittedRoleListsStayOmitted(t *testing.T) {
++	raw, err := json.Marshal(KeycloakRealmUserSpec{
++		Username:    "testuser",
++		ClientRoles: []UserClientRole{{ClientID: "client1"}},
++	})
++	require.NoError(t, err)
++
++	var decoded KeycloakRealmUserSpec
++
++	require.NoError(t, json.Unmarshal(raw, &decoded))
++
++	assert.Nil(t, decoded.Roles)
++	require.Len(t, decoded.ClientRoles, 1)
++	assert.Nil(t, decoded.ClientRoles[0].Roles)
++}
+diff --git a/config/crd/bases/v1.edp.epam.com_keycloakrealmusers.yaml b/config/crd/bases/v1.edp.epam.com_keycloakrealmusers.yaml
+index 80611b9..de2ab0d 100644
+--- a/config/crd/bases/v1.edp.epam.com_keycloakrealmusers.yaml
++++ b/config/crd/bases/v1.edp.epam.com_keycloakrealmusers.yaml
+@@ -63,7 +63,9 @@ spec:
+                 nullable: true
+                 type: object
+               clientRoles:
+-                description: ClientRoles is a list of client roles assigned to user.
++                description: |-
++                  ClientRoles is a list of client roles assigned to user.
++                  The same rule as for Roles applies per client: omitting an entry's roles list leaves that client's roles untouched, an empty list removes all of them.
+                 items:
+                   properties:
+                     clientId:
+@@ -177,7 +179,11 @@ spec:
+                 nullable: true
+                 type: array
+               roles:
+-                description: Roles is a list of roles assigned to user.
++                description: |-
++                  Roles is a list of realm roles assigned to user.
++                  Omitting the field, or setting it to null, leaves the realm roles the user already has untouched,
++                  including the defaults Keycloak grants on creation.
++                  An explicit empty list removes every realm role from the user.
+                 items:
+                   type: string
+                 nullable: true
+diff --git a/deploy-templates/crds/v1.edp.epam.com_keycloakrealmusers.yaml b/deploy-templates/crds/v1.edp.epam.com_keycloakrealmusers.yaml
+index 80611b9..de2ab0d 100644
+--- a/deploy-templates/crds/v1.edp.epam.com_keycloakrealmusers.yaml
++++ b/deploy-templates/crds/v1.edp.epam.com_keycloakrealmusers.yaml
+@@ -63,7 +63,9 @@ spec:
+                 nullable: true
+                 type: object
+               clientRoles:
+-                description: ClientRoles is a list of client roles assigned to user.
++                description: |-
++                  ClientRoles is a list of client roles assigned to user.
++                  The same rule as for Roles applies per client: omitting an entry's roles list leaves that client's roles untouched, an empty list removes all of them.
+                 items:
+                   properties:
+                     clientId:
+@@ -177,7 +179,11 @@ spec:
+                 nullable: true
+                 type: array
+               roles:
+-                description: Roles is a list of roles assigned to user.
++                description: |-
++                  Roles is a list of realm roles assigned to user.
++                  Omitting the field, or setting it to null, leaves the realm roles the user already has untouched,
++                  including the defaults Keycloak grants on creation.
++                  An explicit empty list removes every realm role from the user.
+                 items:
+                   type: string
+                 nullable: true
+diff --git a/docs/api.md b/docs/api.md
+index 9013abd..10adc8a 100644
+--- a/docs/api.md
++++ b/docs/api.md
+@@ -7264,7 +7264,8 @@ Each attribute can have multiple values.<br/>
+         <td><b><a href="#keycloakrealmuserspecclientrolesindex">clientRoles</a></b></td>
+         <td>[]object</td>
+         <td>
+-          ClientRoles is a list of client roles assigned to user.<br/>
++          ClientRoles is a list of client roles assigned to user.
++The same rule as for Roles applies per client: omitting an entry's roles list leaves that client's roles untouched, an empty list removes all of them.<br/>
+         </td>
+         <td>false</td>
+       </tr><tr>
+@@ -7365,7 +7366,10 @@ If set to full, user will be created if it does not exist, or updated if it exis
+         <td><b>roles</b></td>
+         <td>[]string</td>
+         <td>
+-          Roles is a list of roles assigned to user.<br/>
++          Roles is a list of realm roles assigned to user.
++Omitting the field, or setting it to null, leaves the realm roles the user already has untouched,
++including the defaults Keycloak grants on creation.
++An explicit empty list removes every realm role from the user.<br/>
+         </td>
+         <td>false</td>
+       </tr></tbody>
+diff --git a/internal/controller/keycloakrealmuser/chain/sync_user_roles.go b/internal/controller/keycloakrealmuser/chain/sync_user_roles.go
+index 8a96543..3ef686d 100644
+--- a/internal/controller/keycloakrealmuser/chain/sync_user_roles.go
++++ b/internal/controller/keycloakrealmuser/chain/sync_user_roles.go
+@@ -49,6 +49,14 @@ func (h *SyncUserRoles) syncRealmRoles(
+ 	desiredRoleNames []string,
+ 	addOnly bool,
+ ) error {
++	// A nil desired list means the field was omitted, so the resource does not manage realm roles
++	// at all and Keycloak is left alone. An empty but non-nil list still means "no roles" and
++	// clears every mapping. Normalising the field anywhere upstream would silently turn
++	// "not managed" into "delete everything".
++	if desiredRoleNames == nil {
++		return nil
++	}
++
+ 	currentRoles, _, err := h.kClientV2.Users.GetUserRealmRoleMappings(ctx, realmName, userID)
+ 	if err != nil {
+ 		return fmt.Errorf("unable to get user realm role mappings: %w", err)
+@@ -113,6 +121,12 @@ func (h *SyncUserRoles) syncClientRoles(
+ 	addOnly bool,
+ ) error {
+ 	for _, cr := range clientRoles {
++		// As in syncRealmRoles, an omitted role list means this client's roles are not managed,
++		// which leaves nothing to do for the entry at all.
++		if cr.Roles == nil {
++			continue
++		}
++
+ 		clients, _, err := h.kClientV2.Clients.GetClients(ctx, realmName, &keycloakv2.GetClientsParams{ClientId: &cr.ClientID})
+ 		if err != nil {
+ 			return fmt.Errorf("unable to get client %q: %w", cr.ClientID, err)
+diff --git a/internal/controller/keycloakrealmuser/chain/sync_user_roles_test.go b/internal/controller/keycloakrealmuser/chain/sync_user_roles_test.go
+index d7a3cb5..cd1286c 100644
+--- a/internal/controller/keycloakrealmuser/chain/sync_user_roles_test.go
++++ b/internal/controller/keycloakrealmuser/chain/sync_user_roles_test.go
+@@ -97,6 +97,87 @@ func TestSyncUserRoles_Serve(t *testing.T) {
+ 			},
+ 			wantErr: require.NoError,
+ 		},
++		{
++			name: "success - unset roles keep existing realm roles (full strategy)",
++			user: &keycloakApi.KeycloakRealmUser{
++				ObjectMeta: metav1.ObjectMeta{Name: "u", Namespace: "default"},
++				Spec:       keycloakApi.KeycloakRealmUserSpec{},
++			},
++			userCtx: &UserContext{UserID: "user-unset"},
++			mockSetup: func(_ *v2mocks.MockUsersClient, _ *v2mocks.MockRolesClient, _ *v2mocks.MockClientsClient) {
++				// Keycloak must not be touched at all: spec.roles is unset, so realm roles
++				// (including the default-roles-<realm> Keycloak grants on creation) are unmanaged.
++			},
++			wantErr: require.NoError,
++		},
++		{
++			name: "success - empty roles remove every realm role (full strategy)",
++			user: &keycloakApi.KeycloakRealmUser{
++				ObjectMeta: metav1.ObjectMeta{Name: "u", Namespace: "default"},
++				Spec: keycloakApi.KeycloakRealmUserSpec{
++					Roles: []string{},
++				},
++			},
++			userCtx: &UserContext{UserID: "user-empty"},
++			mockSetup: func(u *v2mocks.MockUsersClient, r *v2mocks.MockRolesClient, c *v2mocks.MockClientsClient) {
++				u.EXPECT().GetUserRealmRoleMappings(context.Background(), "test-realm", "user-empty").
++					Return([]keycloakv2.RoleRepresentation{
++						{Id: ptr.To("id1"), Name: ptr.To("role1")},
++					}, nil, nil)
++				u.EXPECT().DeleteUserRealmRoles(context.Background(), "test-realm", "user-empty", []keycloakv2.RoleRepresentation{
++					{Id: ptr.To("id1"), Name: ptr.To("role1")},
++				}).Return(nil, nil)
++			},
++			wantErr: require.NoError,
++		},
++		{
++			name: "success - unset client roles keep existing client roles (full strategy)",
++			user: &keycloakApi.KeycloakRealmUser{
++				ObjectMeta: metav1.ObjectMeta{Name: "u", Namespace: "default"},
++				Spec: keycloakApi.KeycloakRealmUserSpec{
++					ClientRoles: []keycloakApi.UserClientRole{
++						{ClientID: "client-unset"},
++						{ClientID: "client-managed", Roles: []string{"crole1"}},
++					},
++				},
++			},
++			userCtx: &UserContext{UserID: "user-unset-client"},
++			mockSetup: func(u *v2mocks.MockUsersClient, _ *v2mocks.MockRolesClient, c *v2mocks.MockClientsClient) {
++				// client-unset is skipped whole: not even looked up, so a stale or misspelled
++				// clientId in an unmanaged entry cannot fail the reconciliation.
++				c.EXPECT().GetClients(context.Background(), "test-realm", &keycloakv2.GetClientsParams{ClientId: ptr.To("client-managed")}).
++					Return([]keycloakv2.ClientRepresentation{{Id: ptr.To("client-uuid-2")}}, nil, nil)
++				u.EXPECT().GetUserClientRoleMappings(context.Background(), "test-realm", "user-unset-client", "client-uuid-2").
++					Return([]keycloakv2.RoleRepresentation{
++						{Id: ptr.To("crid1"), Name: ptr.To("crole1")},
++					}, nil, nil)
++			},
++			wantErr: require.NoError,
++		},
++		{
++			name: "success - empty client roles remove every client role (full strategy)",
++			user: &keycloakApi.KeycloakRealmUser{
++				ObjectMeta: metav1.ObjectMeta{Name: "u", Namespace: "default"},
++				Spec: keycloakApi.KeycloakRealmUserSpec{
++					ClientRoles: []keycloakApi.UserClientRole{
++						{ClientID: "client-empty", Roles: []string{}},
++					},
++				},
++			},
++			userCtx: &UserContext{UserID: "user-empty-client"},
++			mockSetup: func(u *v2mocks.MockUsersClient, _ *v2mocks.MockRolesClient, c *v2mocks.MockClientsClient) {
++				c.EXPECT().GetClients(context.Background(), "test-realm", &keycloakv2.GetClientsParams{ClientId: ptr.To("client-empty")}).
++					Return([]keycloakv2.ClientRepresentation{{Id: ptr.To("client-uuid-1")}}, nil, nil)
++				u.EXPECT().GetUserClientRoleMappings(context.Background(), "test-realm", "user-empty-client", "client-uuid-1").
++					Return([]keycloakv2.RoleRepresentation{
++						{Id: ptr.To("crid1"), Name: ptr.To("crole1")},
++					}, nil, nil)
++				u.EXPECT().DeleteUserClientRoles(context.Background(), "test-realm", "user-empty-client", "client-uuid-1", []keycloakv2.RoleRepresentation{
++					{Id: ptr.To("crid1"), Name: ptr.To("crole1")},
++				}).Return(nil, nil)
++			},
++			wantErr: require.NoError,
++		},
+ 		{
+ 			name: "success - sync client roles",
+ 			user: &keycloakApi.KeycloakRealmUser{
+@@ -109,9 +190,6 @@ func TestSyncUserRoles_Serve(t *testing.T) {
+ 			},
+ 			userCtx: &UserContext{UserID: "user-4"},
+ 			mockSetup: func(u *v2mocks.MockUsersClient, r *v2mocks.MockRolesClient, c *v2mocks.MockClientsClient) {
+-				// no realm roles
+-				u.EXPECT().GetUserRealmRoleMappings(context.Background(), "test-realm", "user-4").
+-					Return(nil, nil, nil)
+ 				// client lookup
+ 				c.EXPECT().GetClients(context.Background(), "test-realm", &keycloakv2.GetClientsParams{ClientId: ptr.To("client1")}).
+ 					Return([]keycloakv2.ClientRepresentation{{Id: ptr.To("client-uuid-1")}}, nil, nil)
+@@ -141,8 +219,6 @@ func TestSyncUserRoles_Serve(t *testing.T) {
+ 			},
+ 			userCtx: &UserContext{UserID: "user-5"},
+ 			mockSetup: func(u *v2mocks.MockUsersClient, r *v2mocks.MockRolesClient, c *v2mocks.MockClientsClient) {
+-				u.EXPECT().GetUserRealmRoleMappings(context.Background(), "test-realm", "user-5").
+-					Return(nil, nil, nil)
+ 				c.EXPECT().GetClients(context.Background(), "test-realm", &keycloakv2.GetClientsParams{ClientId: ptr.To("client1")}).
+ 					Return([]keycloakv2.ClientRepresentation{{Id: ptr.To("client-uuid-1")}}, nil, nil)
+ 				u.EXPECT().GetUserClientRoleMappings(context.Background(), "test-realm", "user-5", "client-uuid-1").
+@@ -206,9 +282,7 @@ func TestSyncUserRoles_Serve(t *testing.T) {
+ 				},
+ 			},
+ 			userCtx: &UserContext{UserID: "user-err3"},
+-			mockSetup: func(u *v2mocks.MockUsersClient, r *v2mocks.MockRolesClient, c *v2mocks.MockClientsClient) {
+-				u.EXPECT().GetUserRealmRoleMappings(context.Background(), "test-realm", "user-err3").
+-					Return(nil, nil, nil)
++			mockSetup: func(_ *v2mocks.MockUsersClient, _ *v2mocks.MockRolesClient, c *v2mocks.MockClientsClient) {
+ 				c.EXPECT().GetClients(context.Background(), "test-realm", &keycloakv2.GetClientsParams{ClientId: ptr.To("no-such-client")}).
+ 					Return(nil, nil, nil)
+ 			},
diff --git a/packages/system/keycloak-operator/values.yaml b/packages/system/keycloak-operator/values.yaml
index 3bdacddc2e..35b6475709 100644
--- a/packages/system/keycloak-operator/values.yaml
+++ b/packages/system/keycloak-operator/values.yaml
@@ -1,7 +1,9 @@
 keycloak-operator:
   image:
-    registry: ghcr.io
-    repository: cozystack/cozystack/keycloak-operator
+    # The host stays inside `repository`: the nightly mirror's host rewrite
+    # cannot reach a build registry whose `registry` key holds only part of it.
+    registry: ""
+    repository: ghcr.io/cozystack/cozystack/keycloak-operator
     tag: "latest@sha256:27279247dfbd2d1e86fc4e827d34c891880ca65eefd75da1701bc0a1adf865a9"
   clusterReconciliationEnabled: true
   resources:
diff --git a/packages/system/keycloak/Makefile b/packages/system/keycloak/Makefile
index 09afc8648c..2613bad356 100644
--- a/packages/system/keycloak/Makefile
+++ b/packages/system/keycloak/Makefile
@@ -3,3 +3,6 @@ export NAMESPACE=cozy-keycloak
 
 include ../../../hack/common-envs.mk
 include ../../../hack/package.mk
+
+test:
+	helm unittest .
diff --git a/packages/system/keycloak/templates/_helpers.tpl b/packages/system/keycloak/templates/_helpers.tpl
new file mode 100644
index 0000000000..311a26f2e3
--- /dev/null
+++ b/packages/system/keycloak/templates/_helpers.tpl
@@ -0,0 +1,67 @@
+{{- /* Realms published on the login host in the narrowed (ingress.adminHost)
+       mode, as a YAML list — callers parse it with fromYamlArray.
+
+       Enumerating them keeps the login host off realm master, which a bare
+       /realms prefix publishes along with every other realm the deployment
+       happens to have. It is one hostname, not the whole admin plane: the
+       admin route still carries master, and expose-ingress-admin defaults to
+       the public Gateway/ingressClass, so where that route attaches and which
+       hostnames the edge accepts decide the rest.
+
+       The charset guard mirrors authentication.oidc.realmName in
+       packages/core/platform: the name is used verbatim as a URL path
+       segment. */}}
+{{- define "keycloak.publishedRealms" -}}
+{{- $realmPattern := "^[a-zA-Z0-9][a-zA-Z0-9._-]*$" }}
+{{- $platformRealm := dig "oidc-realm-name" "cozy" (.Values._cluster | default dict) | toString }}
+{{- $extraRealms := .Values.ingress.exposedRealms }}
+{{- /* kindIs "invalid" is the unset key; anything else that is not a list is
+       an operator mistake, including the falsy scalars false and 0. */}}
+{{- if and (not (kindIs "invalid" $extraRealms)) (not (kindIs "slice" $extraRealms)) }}
+{{-   fail (printf "ingress.exposedRealms must be a list of realm names (got %s), e.g. exposedRealms: [cozy-admin]" (kindOf $extraRealms)) }}
+{{- end }}
+{{- range $realm := $extraRealms }}
+{{-   if not (kindIs "string" $realm) }}
+{{-     fail (printf "ingress.exposedRealms entries must be strings (got %s); quote the realm name" (kindOf $realm)) }}
+{{-   end }}
+{{-   if not (regexMatch $realmPattern $realm) }}
+{{-     fail (printf "ingress.exposedRealms: realm %q is invalid: use only letters, digits, '.', '_' and '-'" $realm) }}
+{{-   end }}
+{{-   if eq $realm "master" }}
+{{-     fail "ingress.exposedRealms must not list master: it holds the Keycloak super-admin, whose login page and token endpoint would then accept those credentials on the public login hostname" }}
+{{-   end }}
+{{- end }}
+{{- if not (regexMatch $realmPattern $platformRealm) }}
+{{-   fail (printf "the platform realm name (authentication.oidc.realmName) %q is invalid: use only letters, digits, '.', '_' and '-'" $platformRealm) }}
+{{- end }}
+{{- if eq $platformRealm "master" }}
+{{-   fail "the platform realm (authentication.oidc.realmName) must not be master: it holds the Keycloak super-admin, whose login page and token endpoint would then accept those credentials on the public login hostname" }}
+{{- end }}
+{{- /* The platform realm is what every component's issuer URL points at, so it
+       is published whether or not exposedRealms names it. */}}
+{{- concat (list $platformRealm) ($extraRealms | default list) | uniq | toYaml }}
+{{- end }}
+
+{{- /* Paths the login host serves in the narrowed mode, as a YAML list of
+       {value, exact}.
+
+       Each realm gets an exact path plus a prefix with the trailing slash,
+       because ingress-nginx renders `pathType: Prefix` as a plain nginx
+       prefix location (buildLocation() in
+       internal/ingress/controller/template/template.go) rather than the
+       element-wise match the Ingress API specifies — a lone /realms/cozy
+       would also serve /realms/cozy-admin there. The pair is equivalent to
+       the element-wise semantics on a conformant controller and on Gateway
+       API, so it is emitted for both. */}}
+{{- define "keycloak.loginPaths" -}}
+{{- range $realm := include "keycloak.publishedRealms" . | fromYamlArray }}
+- value: {{ printf "/realms/%s" $realm | quote }}
+  exact: true
+- value: {{ printf "/realms/%s/" $realm | quote }}
+  exact: false
+{{- end }}
+- value: "/resources"
+  exact: false
+- value: "/.well-known"
+  exact: false
+{{- end }}
diff --git a/packages/system/keycloak/templates/backup-secret.yaml b/packages/system/keycloak/templates/backup-secret.yaml
new file mode 100644
index 0000000000..cc258a6257
--- /dev/null
+++ b/packages/system/keycloak/templates/backup-secret.yaml
@@ -0,0 +1,18 @@
+{{/*
+  S3 credentials for the Keycloak CNPG backup. Rendered only when backups
+  are enabled with inline keys; skipped when backup.existingSecretName
+  points at a pre-provisioned Secret carrying AWS_ACCESS_KEY_ID /
+  AWS_SECRET_ACCESS_KEY.
+*/}}
+{{- if and .Values.backup.enabled .Values.backup.destinationPath (not .Values.backup.existingSecretName) }}
+{{- $accessKey := required "backup.s3AccessKey is required when backup.enabled=true and existingSecretName is unset" .Values.backup.s3AccessKey -}}
+{{- $secretKey := required "backup.s3SecretKey is required when backup.enabled=true and existingSecretName is unset" .Values.backup.s3SecretKey -}}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: keycloak-db-backup-s3-creds
+type: Opaque
+stringData:
+  AWS_ACCESS_KEY_ID: {{ $accessKey | quote }}
+  AWS_SECRET_ACCESS_KEY: {{ $secretKey | quote }}
+{{- end }}
diff --git a/packages/system/keycloak/templates/backup.yaml b/packages/system/keycloak/templates/backup.yaml
new file mode 100644
index 0000000000..ccf83c270f
--- /dev/null
+++ b/packages/system/keycloak/templates/backup.yaml
@@ -0,0 +1,26 @@
+{{/*
+  Scheduled S3 backup of the Keycloak CNPG database.
+
+  Rendered only when backup.enabled, backup.destinationPath and
+  backup.schedule are all set. The destinationPath gate must match db.yaml /
+  backup-secret.yaml: without it the Cluster gets no spec.plugins / ObjectStore,
+  so a ScheduledBackup would target a Cluster with no backup wiring and CNPG
+  would perpetually fail it. CNPG also rejects an empty schedule.
+
+  NOTE: schedule is a 6-field cron (leading seconds field), not the 5-field
+  Kubernetes CronJob format.
+*/}}
+{{- if and .Values.backup.enabled .Values.backup.destinationPath .Values.backup.schedule }}
+apiVersion: postgresql.cnpg.io/v1
+kind: ScheduledBackup
+metadata:
+  name: keycloak-db
+spec:
+  schedule: {{ .Values.backup.schedule | quote }}
+  backupOwnerReference: self
+  method: plugin
+  pluginConfiguration:
+    name: barman-cloud.cloudnative-pg.io
+  cluster:
+    name: keycloak-db
+{{- end }}
diff --git a/packages/system/keycloak/templates/db.yaml b/packages/system/keycloak/templates/db.yaml
index 6a57e93a9d..a8f680a6f6 100644
--- a/packages/system/keycloak/templates/db.yaml
+++ b/packages/system/keycloak/templates/db.yaml
@@ -9,7 +9,16 @@ spec:
   imageName: {{ if regexMatch ":17\\." $image }}ghcr.io/cloudnative-pg/postgresql:17.7-standard-trixie{{ else if regexMatch ":[0-9]+\\.[0-9]+$" $image }}{{ printf "%s-standard-trixie" $image }}{{ else }}{{ $image }}{{ end }}
   storage:
     size: 20Gi
-  {{- if .Values._cluster.scheduling }}
+  {{- with .Values.database.affinity }}
+  affinity:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- if .Values.database.topologySpreadConstraints }}
+  topologySpreadConstraints:
+    {{- range .Values.database.topologySpreadConstraints }}
+    - {{- toYaml (ternary . (merge (deepCopy .) (dict "labelSelector" (dict "matchLabels" (dict "cnpg.io/cluster" "keycloak-db")))) (hasKey . "labelSelector")) | nindent 6 }}
+    {{- end }}
+  {{- else if .Values._cluster.scheduling }}
   {{- $rawConstraints := get .Values._cluster.scheduling "globalAppTopologySpreadConstraints" }}
   {{- if $rawConstraints }}
   {{- $rawConstraints | fromYaml | toYaml | nindent 2 }}
@@ -18,9 +27,58 @@ spec:
         cnpg.io/cluster: keycloak-db
   {{- end }}
   {{- end }}
+  {{- $credSecret := .Values.backup.existingSecretName | default "keycloak-db-backup-s3-creds" }}
+  {{- if and .Values.backup.enabled .Values.backup.destinationPath }}
+  # Barman Cloud plugin. The S3/barman settings live in the ObjectStore CR
+  # rendered at the bottom of this file; the Cluster only references it by name.
+  # Native spec.backup.barmanObjectStore is deprecated in CNPG 1.27 and removed
+  # in 1.29, and the standard image variant keycloak-db pins no longer ships the
+  # barman-cloud-* binaries. The plugin runs them in a sidecar, so keycloak-db
+  # stays on the standard variant (no need for the deprecated system variant).
+  plugins:
+    - name: barman-cloud.cloudnative-pg.io
+      isWALArchiver: true
+      parameters:
+        barmanObjectName: keycloak-db
+        # Pin the WAL-archive S3 prefix explicitly (the plugin would default it
+        # to the Cluster name anyway); it must never change on a live cluster.
+        serverName: keycloak-db
+  {{- end }}
   monitoring:
     enablePodMonitor: true
 
   inheritedMetadata:
     labels:
       policy.cozystack.io/allow-to-apiserver: "true"
+{{- if and .Values.backup.enabled .Values.backup.destinationPath }}
+---
+apiVersion: barmancloud.cnpg.io/v1
+kind: ObjectStore
+metadata:
+  name: keycloak-db
+spec:
+  {{- if .Values.backup.retentionPolicy }}
+  retentionPolicy: {{ .Values.backup.retentionPolicy | quote }}
+  {{- end }}
+  # Give the barman-cloud sidecar explicit resources: cozy-keycloak has no
+  # LimitRange, so the plugin's default was no requests and no limit at all.
+  # The sizing and the S3 request checksum pin are explained in
+  # cozy-lib.barman.sidecarConfiguration.
+  {{- include "cozy-lib.barman.sidecarConfiguration" . | nindent 2 }}
+  configuration:
+    destinationPath: {{ .Values.backup.destinationPath | quote }}
+    {{- with .Values.backup.endpointURL }}
+    endpointURL: {{ . | quote }}
+    {{- end }}
+    s3Credentials:
+      accessKeyId:
+        name: {{ $credSecret }}
+        key: AWS_ACCESS_KEY_ID
+      secretAccessKey:
+        name: {{ $credSecret }}
+        key: AWS_SECRET_ACCESS_KEY
+    data:
+      compression: gzip
+    wal:
+      compression: gzip
+{{- end }}
diff --git a/packages/system/keycloak/templates/httproute.yaml b/packages/system/keycloak/templates/httproute.yaml
index d6d9bb5814..3e3910dd34 100644
--- a/packages/system/keycloak/templates/httproute.yaml
+++ b/packages/system/keycloak/templates/httproute.yaml
@@ -1,7 +1,14 @@
 {{- $host := index .Values._cluster "root-host" }}
 {{- $ingressHost := .Values.ingress.host | default (printf "keycloak.%s" $host) }}
 {{- $exposeIngress := (index .Values._cluster "expose-ingress") | default "tenant-root" }}
+{{- $adminExposeIngress := (index .Values._cluster "expose-ingress-admin") | default $exposeIngress }}
 {{- $gatewayEnabled := (index .Values._cluster "gateway-enabled") | default "false" }}
+{{- $adminHost := .Values.ingress.adminHost }}
+{{- /* Rendered here, outside the branches that use it, so a malformed
+       ingress.exposedRealms is refused when it is set rather than on the day
+       adminHost or the Gateway mode is turned on. */}}
+{{- $realms := include "keycloak.publishedRealms" . | fromYamlArray }}
+{{- $loginPaths := include "keycloak.loginPaths" . | fromYamlArray }}
 {{- if eq $gatewayEnabled "true" }}
 apiVersion: gateway.networking.k8s.io/v1
 kind: HTTPRoute
@@ -16,7 +23,53 @@ spec:
   hostnames:
   - {{ $ingressHost | quote }}
   rules:
+  {{- if $adminHost }}
+  # adminHost is set: the public (login) hostname exposes only the login paths
+  # of the published realms. The admin console and Administration REST API are
+  # served exclusively on the dedicated admin route below, so /admin is not
+  # reachable here. See the Keycloak reverse proxy guide, "Exposed path
+  # recommendations".
+  {{- /* A route rule takes at most 64 path matches (Gateway API CRD), and each
+         realm takes two of them. Beyond that the apiserver rejects the whole
+         HTTPRoute, so say which parameter to shorten and how far. */}}
+  {{- if gt (len $loginPaths) 64 }}
+  {{-   $realmBudget := div (sub 64 (sub (len $loginPaths) (mul 2 (len $realms)))) 2 }}
+  {{-   fail (printf "the login route needs %d path matches but a Gateway API route rule takes at most 64: publish at most %d realms (ingress.exposedRealms plus the platform realm), got %d" (len $loginPaths) $realmBudget (len $realms)) }}
+  {{- end }}
+  - matches:
+    {{- range $p := $loginPaths }}
+    - path:
+        type: {{ if $p.exact }}Exact{{ else }}PathPrefix{{ end }}
+        value: {{ $p.value | quote }}
+    {{- end }}
+    backendRefs:
+    - name: keycloak-http
+      port: 8080
+  {{- else }}
+  - backendRefs:
+    - name: keycloak-http
+      port: 8080
+  {{- end }}
+{{- if $adminHost }}
+---
+apiVersion: gateway.networking.k8s.io/v1
+kind: HTTPRoute
+metadata:
+  name: keycloak-admin
+spec:
+  # Attaches to the Gateway named cozystack in the admin namespace. When
+  # expose-ingress-admin points at a separate (e.g. private-IP) Gateway,
+  # admin traffic leaves the public Gateway entirely.
+  parentRefs:
+  - group: gateway.networking.k8s.io
+    kind: Gateway
+    name: cozystack
+    namespace: {{ $adminExposeIngress }}
+  hostnames:
+  - {{ $adminHost | quote }}
+  rules:
   - backendRefs:
     - name: keycloak-http
-      port: 80
+      port: 8080
+{{- end }}
 {{- end }}
diff --git a/packages/system/keycloak/templates/ingress.yaml b/packages/system/keycloak/templates/ingress.yaml
index 07000f51cc..aa7b7f9666 100644
--- a/packages/system/keycloak/templates/ingress.yaml
+++ b/packages/system/keycloak/templates/ingress.yaml
@@ -3,7 +3,17 @@
 {{- $solver := (index .Values._cluster "solver") | default "http01" }}
 {{- $clusterIssuer := (index .Values._cluster "issuer-name") | default "letsencrypt-prod" }}
 {{- $exposeIngress := (index .Values._cluster "expose-ingress") | default "tenant-root" }}
+{{- $adminExposeIngress := (index .Values._cluster "expose-ingress-admin") | default $exposeIngress }}
 {{- $gatewayEnabled := (index .Values._cluster "gateway-enabled") | default "false" }}
+{{- $wildcardSecret := (index .Values._cluster "wildcard-secret-name") | default "" }}
+{{- $adminHost := .Values.ingress.adminHost }}
+{{- $loginPaths := include "keycloak.loginPaths" . | fromYamlArray }}
+{{- /* Wildcard mode applies to the admin Ingress only when it shares the
+       public ingressClass: the operator's default SSL cert covers it too, so
+       skip per-host ACME like the login Ingress. When admin is moved onto a
+       separate (e.g. private) ingress, that controller has no wildcard default
+       cert, so keep its own per-host certificate regardless of wildcard mode. */}}
+{{- $adminWildcard := and $wildcardSecret (eq $adminExposeIngress $exposeIngress) }}
 {{- if ne $gatewayEnabled "true" }}
 
 apiVersion: networking.k8s.io/v1
@@ -12,10 +22,13 @@ metadata:
   name: keycloak-ingress
   {{- with .Values.ingress.annotations }}
   annotations:
+    {{- /* Operator wildcard mode: nginx serves the default SSL cert, so skip per-host ACME. */}}
+    {{- if not $wildcardSecret }}
     {{- if eq $solver "http01" }}
     acme.cert-manager.io/http01-ingress-ingressclassname: {{ $exposeIngress }}
     {{- end }}
     cert-manager.io/cluster-issuer: {{ $clusterIssuer }}
+    {{- end }}
     {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
@@ -23,11 +36,31 @@ spec:
   tls:
   - hosts:
       - {{ $ingressHost }}
+    {{- /* Operator wildcard mode: no per-host secret — ingress-nginx falls
+           back to the default SSL certificate while the tls section keeps
+           the HTTP-to-HTTPS redirect enforced. */}}
+    {{- if not $wildcardSecret }}
     secretName: web-tls
+    {{- end }}
   rules:
   - host: {{ $ingressHost }}
     http:
       paths:
+      {{- if $adminHost }}
+      # adminHost is set: expose only the login paths of the published realms
+      # here. The admin console and Administration REST API live on the admin
+      # Ingress below, so /admin is not reachable on the login hostname. See
+      # the Keycloak reverse proxy guide, "Exposed path recommendations".
+      {{- range $p := $loginPaths }}
+      - path: {{ $p.value | quote }}
+        pathType: {{ if $p.exact }}Exact{{ else }}Prefix{{ end }}
+        backend:
+          service:
+            name: keycloak-http
+            port:
+              name: http
+      {{- end }}
+      {{- else }}
       - path: /
         pathType: Prefix
         backend:
@@ -35,4 +68,48 @@ spec:
             name: keycloak-http
             port:
               name: http
+      {{- end }}
+{{- if $adminHost }}
+---
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: keycloak-admin-ingress
+  {{- with .Values.ingress.annotations }}
+  annotations:
+    {{- /* Operator wildcard mode (shared public ingress): nginx serves the
+           default SSL cert, so skip per-host ACME. */}}
+    {{- if not $adminWildcard }}
+    {{- if eq $solver "http01" }}
+    acme.cert-manager.io/http01-ingress-ingressclassname: {{ $adminExposeIngress }}
+    {{- end }}
+    cert-manager.io/cluster-issuer: {{ $clusterIssuer }}
+    {{- end }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+spec:
+  # Uses the admin ingressClass. When expose-ingress-admin points at a
+  # separate (e.g. private) ingress controller, admin traffic leaves the
+  # public ingress entirely.
+  ingressClassName: {{ $adminExposeIngress }}
+  tls:
+  - hosts:
+      - {{ $adminHost }}
+    {{- /* Wildcard mode on the shared public ingress: rely on the default SSL
+           cert, no per-host secret. A separate admin ingress keeps its own. */}}
+    {{- if not $adminWildcard }}
+    secretName: keycloak-admin-tls
+    {{- end }}
+  rules:
+  - host: {{ $adminHost }}
+    http:
+      paths:
+      - path: /
+        pathType: Prefix
+        backend:
+          service:
+            name: keycloak-http
+            port:
+              name: http
+{{- end }}
 {{- end }}
diff --git a/packages/system/keycloak/templates/proxy.yaml b/packages/system/keycloak/templates/proxy.yaml
new file mode 100644
index 0000000000..1a30a9f486
--- /dev/null
+++ b/packages/system/keycloak/templates/proxy.yaml
@@ -0,0 +1,345 @@
+{{- if .Values.encryption.enabled }}
+{{- $clusterDomain := (index .Values._cluster "cluster-domain") | default "cozy.local" }}
+{{- $kms := .Values.encryption.kms }}
+{{- /*
+  Fail fast on an unsupported backend. Both the KEK Secret below and the env
+  wiring further down key off $backend, so an invalid value (e.g. a "vault"
+  typo) can never render a Deployment that mounts KKP_KEK from a Secret that
+  was never created — which would silently break the whole IdP.
+*/}}
+{{- $backend := ($kms.backend | default "static") }}
+{{- if and (ne $backend "static") (ne $backend "vault-transit") }}
+{{- fail (printf "encryption.kms.backend must be 'static' or 'vault-transit', got %q" $backend) }}
+{{- end }}
+{{- $vault := ($kms.vault | default dict) }}
+{{- /* The proxy needs its ServiceAccount token only for Vault Kubernetes auth. */}}
+{{- $vaultAuth := ($vault.auth | default "token") }}
+{{- $k8sAuth := and (eq $backend "vault-transit") (eq $vaultAuth "kubernetes") }}
+{{- /*
+  CA the proxy trusts for the Vault connection: either seeded by the operator
+  (caSecretName) or rendered here from an inline PEM (caBundle). It reaches the
+  proxy as SSL_CERT_FILE plus SSL_CERT_DIR — see the env block for why both are
+  needed. Neither affects the database leg, which never consults the system
+  trust store: that connection is plaintext today, and once KKP_BACKEND_CA_FILE
+  is wired it will verify against an explicit RootCAs pool.
+
+  Like every other vault.* key, both are inert unless the backend is
+  vault-transit: the volume and mount below sit at pod level, so keying them off
+  an ungated caSecretName would make a static-backend Deployment mount a Secret
+  the chart never creates and wedge the proxy in ContainerCreating.
+*/}}
+{{- $vaultCASecret := "" }}
+{{- $vaultCASecretKey := "" }}
+{{- if eq $backend "vault-transit" }}
+{{- if and $vault.caBundle $vault.caSecretName }}
+{{- fail "encryption.kms.vault.caBundle and caSecretName are mutually exclusive — set one" }}
+{{- end }}
+{{- if $vault.caBundle }}
+{{- /*
+  A bundle that is not PEM would be written to the Secret, mounted, and then
+  silently dropped by AppendCertsFromPEM, leaving the proxy on whatever roots
+  the image ships — a failure that only shows up as an unrelated TLS error, or
+  not at all against a publicly trusted Vault. Reject it at render time.
+*/}}
+{{- if not (regexMatch "-----BEGIN CERTIFICATE-----" $vault.caBundle) }}
+{{- fail "encryption.kms.vault.caBundle must be a PEM bundle containing at least one -----BEGIN CERTIFICATE----- block" }}
+{{- end }}
+{{- $vaultCASecret = "keycloak-kms-proxy-vault-ca" }}
+{{- $vaultCASecretKey = "ca.crt" }}
+{{- else if $vault.caSecretName }}
+{{- $vaultCASecret = $vault.caSecretName }}
+{{- $vaultCASecretKey = ($vault.caSecretKey | default "ca.crt") }}
+{{- end }}
+{{- end }}
+{{- $replicas := .Values.encryption.replicas | default 1 | int }}
+{{- if and (gt $replicas 1) (not .Values.encryption.deksetSecretName) }}
+{{- fail "encryption.replicas > 1 requires encryption.deksetSecretName (a shared wrapped DEK set); otherwise replicas would encrypt deterministic columns under different keys" }}
+{{- end }}
+{{- if eq $backend "static" }}
+{{- /*
+  Static KMS: a self-generated 32-byte KEK kept in a Secret. Generated once
+  and preserved across upgrades via lookup (same pattern as the admin
+  credentials in sts.yaml). For production prefer kms.backend=vault-transit.
+*/}}
+{{- $existing := lookup "v1" "Secret" .Release.Namespace "keycloak-kms-proxy-kek" }}
+{{- $kek := randAlphaNum 32 | b64enc }}
+{{- if and $existing $existing.data }}
+{{- $kek = index $existing.data "kek" | default $kek }}
+{{- end }}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: keycloak-kms-proxy-kek
+  labels:
+    app: keycloak-kms-proxy
+data:
+  kek: {{ $kek | quote }}
+---
+{{- end }}
+{{- if and (eq $backend "vault-transit") $vault.caBundle }}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: keycloak-kms-proxy-vault-ca
+  labels:
+    app: keycloak-kms-proxy
+stringData:
+  ca.crt: {{ $vault.caBundle | quote }}
+---
+{{- end }}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: keycloak-kms-proxy
+  labels:
+    app: keycloak-kms-proxy
+# Dedicated identity for the proxy (never the namespace default SA). Its token
+# is only mounted for Vault Kubernetes auth; other modes don't need it.
+automountServiceAccountToken: {{ $k8sAuth }}
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: keycloak-kms-proxy
+  labels:
+    app: keycloak-kms-proxy
+spec:
+  # Defaults to a single replica. HA (replicas > 1) requires a shared wrapped
+  # DEK set (encryption.deksetSecretName → KKP_DEKSET_FILE) so every replica
+  # encrypts deterministic columns under the same key; the guard above enforces
+  # that.
+  replicas: {{ $replicas }}
+  selector:
+    matchLabels:
+      app: keycloak-kms-proxy
+  template:
+    metadata:
+      {{- if and (eq $backend "vault-transit") $vault.caBundle }}
+      annotations:
+        # The chart owns this Secret, so it owns the rollout. crypto/x509
+        # memoizes the system pool per process (sync.Once), so a rotated bundle
+        # reaches the proxy only in a fresh pod — without this the upgrade
+        # succeeds and the old CA stays in use until some unrelated restart.
+        checksum/vault-ca: {{ $vault.caBundle | sha256sum }}
+      {{- end }}
+      labels:
+        app: keycloak-kms-proxy
+    spec:
+      serviceAccountName: keycloak-kms-proxy
+      {{- with .Values.encryption.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.encryption.topologySpreadConstraints }}
+      topologySpreadConstraints:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      automountServiceAccountToken: {{ $k8sAuth }}
+      securityContext:
+        runAsNonRoot: true
+        runAsUser: 65532
+        fsGroup: 65532
+        seccompProfile:
+          type: RuntimeDefault
+      containers:
+        - name: proxy
+          image: {{ .Values.encryption.image }}
+          imagePullPolicy: IfNotPresent
+          securityContext:
+            allowPrivilegeEscalation: false
+            readOnlyRootFilesystem: true
+            capabilities:
+              drop:
+                - ALL
+          ports:
+            - name: postgres
+              containerPort: 5432
+            - name: metrics
+              containerPort: 9090
+          env:
+            - name: KKP_LISTEN_ADDR
+              value: ":5432"
+            - name: KKP_METRICS_ADDR
+              value: ":9090"
+            # NOTE: the proxy re-originates the connection to keycloak-db-rw and
+            # negotiates TLS in-band, but does not yet pin the CNPG CA. Backend
+            # CA validation (sslrootcert) is a tracked follow-up before this is
+            # production-ready; see the keycloak-kms-proxy project.
+            - name: KKP_BACKEND_ADDR
+              value: "keycloak-db-rw.{{ .Release.Namespace }}.svc.{{ $clusterDomain }}:5432"
+            # The proxy terminates SCRAM on both legs. Keycloak still presents
+            # the CNPG-managed credential (KC_DB_USERNAME/KC_DB_PASSWORD come
+            # from keycloak-db-app), so the upstream and backend credentials
+            # are the same CNPG role.
+            - name: KKP_UPSTREAM_USER
+              valueFrom:
+                secretKeyRef:
+                  name: keycloak-db-app
+                  key: username
+            - name: KKP_UPSTREAM_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: keycloak-db-app
+                  key: password
+            - name: KKP_BACKEND_USER
+              valueFrom:
+                secretKeyRef:
+                  name: keycloak-db-app
+                  key: username
+            - name: KKP_BACKEND_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: keycloak-db-app
+                  key: password
+            - name: KKP_FIELDS
+              value: {{ .Values.encryption.fields | quote }}
+            - name: KKP_LENIENT
+              value: {{ .Values.encryption.lenient | quote }}
+            {{- if eq $backend "vault-transit" }}
+            {{- if and (ne $vaultAuth "token") (ne $vaultAuth "approle") (ne $vaultAuth "kubernetes") }}
+            {{- fail (printf "encryption.kms.vault.auth must be 'token', 'approle', or 'kubernetes', got %q" $vaultAuth) }}
+            {{- end }}
+            - name: KKP_VAULT_ADDR
+              value: {{ required "encryption.kms.vault.address is required when kms.backend=vault-transit" $vault.address | quote }}
+            - name: KKP_VAULT_KEY_NAME
+              value: {{ required "encryption.kms.vault.keyName is required when kms.backend=vault-transit" $vault.keyName | quote }}
+            - name: KKP_VAULT_MOUNT
+              value: {{ $vault.mount | default "transit" | quote }}
+            {{- with $vaultCASecret }}
+            # SSL_CERT_FILE alone would ADD this CA to the roots the image ships
+            # (crypto/x509 replaces only its file list, then scans SSL_CERT_DIR
+            # unconditionally, and this image carries /etc/ssl/certs). Setting
+            # both collapses the pool to the mount, so the leg that guards the
+            # KEK trusts this CA and nothing else. The database leg is untouched:
+            # it never reads the system pool.
+            - name: SSL_CERT_FILE
+              value: /etc/kkp/vault-ca/ca.crt
+            - name: SSL_CERT_DIR
+              value: /etc/kkp/vault-ca
+            {{- end }}
+            {{- if eq $vaultAuth "approle" }}
+            {{- $appRole := $vault.appRole | default dict }}
+            {{- $secretName := required "encryption.kms.vault.appRole.secretName is required when vault.auth=approle" $appRole.secretName }}
+            - name: KKP_VAULT_APPROLE_MOUNT
+              value: {{ $appRole.mount | default "approle" | quote }}
+            - name: KKP_VAULT_ROLE_ID
+              valueFrom:
+                secretKeyRef:
+                  name: {{ $secretName }}
+                  key: {{ $appRole.roleIdKey | default "role-id" }}
+            - name: KKP_VAULT_SECRET_ID
+              valueFrom:
+                secretKeyRef:
+                  name: {{ $secretName }}
+                  key: {{ $appRole.secretIdKey | default "secret-id" }}
+            {{- else if eq $vaultAuth "kubernetes" }}
+            {{- $k8s := $vault.kubernetes | default dict }}
+            # The proxy logs in with its own ServiceAccount token; bind the
+            # Vault role to system:serviceaccount:<namespace>:keycloak-kms-proxy.
+            # No credential is stored in a Secret.
+            - name: KKP_VAULT_KUBERNETES_ROLE
+              value: {{ required "encryption.kms.vault.kubernetes.role is required when vault.auth=kubernetes" $k8s.role | quote }}
+            - name: KKP_VAULT_KUBERNETES_MOUNT
+              value: {{ $k8s.mount | default "kubernetes" | quote }}
+            {{- else }}
+            - name: KKP_VAULT_TOKEN
+              valueFrom:
+                secretKeyRef:
+                  name: {{ required "encryption.kms.vault.tokenSecretName is required when vault.auth=token" $vault.tokenSecretName }}
+                  key: token
+            {{- end }}
+            {{- else }}
+            - name: KKP_KEK
+              valueFrom:
+                secretKeyRef:
+                  name: keycloak-kms-proxy-kek
+                  key: kek
+            {{- end }}
+            {{- if .Values.encryption.deksetSecretName }}
+            # Wrapped DEK set minted by the backfill tool. Required to run more
+            # than one replica AND to migrate an existing populated database
+            # (the proxy must reuse the DEK that encrypt-rows wrapped with);
+            # without it the proxy mints an ephemeral DEK usable only on a fresh
+            # database.
+            - name: KKP_DEKSET_FILE
+              value: /etc/kkp/dekset/{{ .Values.encryption.deksetSecretKey | default "dekset.json" }}
+            {{- end }}
+          {{- with .Values.encryption.resources }}
+          resources:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+          readinessProbe:
+            tcpSocket:
+              port: postgres
+            periodSeconds: 10
+          livenessProbe:
+            tcpSocket:
+              port: postgres
+            periodSeconds: 15
+          {{- if or .Values.encryption.deksetSecretName $vaultCASecret }}
+          volumeMounts:
+            {{- if .Values.encryption.deksetSecretName }}
+            - name: dekset
+              mountPath: /etc/kkp/dekset
+              readOnly: true
+            {{- end }}
+            {{- with $vaultCASecret }}
+            - name: vault-ca
+              mountPath: /etc/kkp/vault-ca
+              readOnly: true
+            {{- end }}
+          {{- end }}
+      {{- if or .Values.encryption.deksetSecretName $vaultCASecret }}
+      volumes:
+        {{- if .Values.encryption.deksetSecretName }}
+        - name: dekset
+          secret:
+            secretName: {{ .Values.encryption.deksetSecretName }}
+        {{- end }}
+        {{- with $vaultCASecret }}
+        - name: vault-ca
+          secret:
+            secretName: {{ . }}
+            # One key, projected under a fixed name so SSL_CERT_FILE is constant.
+            # A pre-seeded Secret is often a cert-manager TLS Secret, whose
+            # tls.key has no business inside the proxy. The trade-off is
+            # deliberate: a key that does not exist wedges the pod at mount time
+            # (vault.caSecretKey is there to point at the right one) rather than
+            # letting an empty trust store surface later as an opaque TLS error.
+            items:
+              - key: {{ $vaultCASecretKey }}
+                path: ca.crt
+        {{- end }}
+      {{- end }}
+{{- if gt $replicas 1 }}
+---
+apiVersion: policy/v1
+kind: PodDisruptionBudget
+metadata:
+  name: keycloak-kms-proxy
+  labels:
+    app: keycloak-kms-proxy
+spec:
+  maxUnavailable: 1
+  selector:
+    matchLabels:
+      app: keycloak-kms-proxy
+{{- end }}
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: keycloak-kms-proxy
+  labels:
+    app: keycloak-kms-proxy
+spec:
+  selector:
+    app: keycloak-kms-proxy
+  ports:
+    - name: postgres
+      port: 5432
+      targetPort: postgres
+    - name: metrics
+      port: 9090
+      targetPort: metrics
+{{- end }}
diff --git a/packages/system/keycloak/templates/sts.yaml b/packages/system/keycloak/templates/sts.yaml
index e07fe3e62e..48249c2bac 100644
--- a/packages/system/keycloak/templates/sts.yaml
+++ b/packages/system/keycloak/templates/sts.yaml
@@ -6,6 +6,21 @@
 {{- $ingressHost := .Values.ingress.host | default (printf "keycloak.%s" $host) }}
 {{- $clusterDomain := (index .Values._cluster "cluster-domain") | default "cozy.local" }}
 
+{{- /*
+Effective theme list. Starts from the explicit .Values.themes and, when the
+platform branding config names a login theme (branding.loginTheme) together
+with the OCI image that carries it (branding.loginThemeImage), appends an
+auto-derived entry. This lets an operator ship a Keycloak login theme purely
+through platform branding values, without editing this chart or patching the
+StatefulSet. branding flows in via _cluster.branding (the cozystack-values
+Secret), the same path that feeds the realm displayName.
+*/}}
+{{- $branding := (.Values._cluster | default dict).branding | default dict }}
+{{- $themes := .Values.themes | default list }}
+{{- if and (hasKey $branding "loginTheme") (hasKey $branding "loginThemeImage") }}
+{{- $themes = concat $themes (list (dict "name" $branding.loginTheme "image" $branding.loginThemeImage)) }}
+{{- end }}
+
 {{- $existingPassword := lookup "v1" "Secret" "cozy-keycloak" (printf "%s-credentials" .Release.Name) }}
 {{- $password := randAlphaNum 16 -}}
 {{- if $existingPassword }}
@@ -47,11 +62,19 @@ spec:
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- with .Values.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.topologySpreadConstraints }}
+      topologySpreadConstraints:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       securityContext:
         fsGroup: 1000
-      {{- if .Values.themes }}
+      {{- if $themes }}
       {{- $themeNames := list }}
-      {{- range .Values.themes }}
+      {{- range $themes }}
       {{- if not .name }}{{ fail "theme entry missing required field: name" }}{{- end }}
       {{- if not .image }}{{ fail "theme entry missing required field: image" }}{{- end }}
       {{- $sanitized := include "keycloak.theme.sanitizedName" .name }}
@@ -61,7 +84,7 @@ spec:
       {{- $themeNames = append $themeNames $sanitized }}
       {{- end }}
       initContainers:
-        {{- range .Values.themes }}
+        {{- range $themes }}
         - name: theme-{{ include "keycloak.theme.sanitizedName" .name }}
           image: "{{ .image }}"
           imagePullPolicy: IfNotPresent
@@ -141,6 +164,16 @@ spec:
                   key: password
             - name: KC_DB
               value: "postgres"
+            {{- if .Values.encryption.enabled }}
+            # Encryption on: route through the keycloak-kms-proxy, which dials
+            # the real CNPG cluster. Auth (username/password/dbname) still comes
+            # from the CNPG-managed keycloak-db-app secret below and passes
+            # through the proxy unchanged.
+            - name: KC_DB_URL_HOST
+              value: keycloak-kms-proxy.{{ .Release.Namespace }}.svc.{{ $clusterDomain }}
+            - name: KC_DB_URL_PORT
+              value: "5432"
+            {{- else }}
             - name: KC_DB_URL_HOST
               valueFrom:
                 secretKeyRef:
@@ -151,6 +184,7 @@ spec:
                 secretKeyRef:
                   name: keycloak-db-app
                   key: "port"
+            {{- end }}
             - name: KC_DB_USERNAME
               valueFrom:
                 secretKeyRef:
@@ -170,12 +204,16 @@ spec:
               value: "docker"
             - name: KC_HOSTNAME
               value: https://{{ $ingressHost }}
+            {{- with .Values.ingress.adminHost }}
+            - name: KC_HOSTNAME_ADMIN
+              value: https://{{ . }}
+            {{- end }}
             - name: JAVA_OPTS_APPEND
               value: "-Djgroups.dns.query=keycloak-headless.cozy-keycloak.svc.{{ $clusterDomain }}"
             {{- with .Values.extraEnv }}
             {{- toYaml . | nindent 12 }}
             {{- end }}
-          {{- if .Values.themes }}
+          {{- if $themes }}
           volumeMounts:
             - name: themes
               mountPath: /opt/keycloak/themes
@@ -207,7 +245,7 @@ spec:
             periodSeconds: 10
             timeoutSeconds: 5
             failureThreshold: 3
-      {{- if .Values.themes }}
+      {{- if $themes }}
       volumes:
         - name: themes
           emptyDir:
diff --git a/packages/system/keycloak/tests/admin_hostname_test.yaml b/packages/system/keycloak/tests/admin_hostname_test.yaml
new file mode 100644
index 0000000000..9e9c521a2b
--- /dev/null
+++ b/packages/system/keycloak/tests/admin_hostname_test.yaml
@@ -0,0 +1,276 @@
+suite: admin hostname split (ingress.adminHost)
+
+release:
+  name: keycloak
+  namespace: cozy-keycloak
+
+# ingress.adminHost is an opt-in option. When set, Keycloak's admin console
+# and Administration REST API are moved onto a dedicated hostname/route, and
+# the public (login) route is narrowed to the OIDC paths only so /admin is no
+# longer served there. The admin route attaches to the Gateway/ingressClass
+# selected by _cluster.expose-ingress-admin (defaults to expose-ingress),
+# allowing it to be pointed at a separate, e.g. private, Gateway.
+tests:
+  # --- StatefulSet env: KC_HOSTNAME_ADMIN ---
+  - it: does not set KC_HOSTNAME_ADMIN when adminHost is empty (default)
+    template: templates/sts.yaml
+    documentIndex: 1
+    set:
+      _cluster:
+        root-host: example.com
+    asserts:
+      - isKind:
+          of: StatefulSet
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: KC_HOSTNAME
+            value: https://keycloak.example.com
+      - notContains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: KC_HOSTNAME_ADMIN
+            value: https://keycloak-admin.example.com
+
+  - it: sets KC_HOSTNAME_ADMIN when adminHost is set
+    template: templates/sts.yaml
+    documentIndex: 1
+    set:
+      _cluster:
+        root-host: example.com
+      ingress:
+        adminHost: keycloak-admin.example.com
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: KC_HOSTNAME_ADMIN
+            value: https://keycloak-admin.example.com
+
+  # --- Ingress (gateway disabled) ---
+  - it: renders one Ingress serving all paths when adminHost is empty
+    template: templates/ingress.yaml
+    set:
+      _cluster:
+        root-host: example.com
+    asserts:
+      - hasDocuments:
+          count: 1
+      - isKind:
+          of: Ingress
+      - equal:
+          path: spec.rules[0].host
+          value: keycloak.example.com
+      - lengthEqual:
+          path: spec.rules[0].http.paths
+          count: 1
+      - equal:
+          path: spec.rules[0].http.paths[0].path
+          value: /
+      - lengthEqual:
+          path: spec.tls
+          count: 1
+
+  - it: narrows the login Ingress to OIDC paths and adds an admin Ingress
+    template: templates/ingress.yaml
+    set:
+      _cluster:
+        root-host: example.com
+      ingress:
+        adminHost: keycloak-admin.example.com
+    asserts:
+      - hasDocuments:
+          count: 2
+      # doc 0: public login Ingress — only OIDC paths, never /admin or /
+      - documentIndex: 0
+        equal:
+          path: metadata.name
+          value: keycloak-ingress
+      - documentIndex: 0
+        equal:
+          path: spec.rules[0].host
+          value: keycloak.example.com
+      - documentIndex: 0
+        lengthEqual:
+          path: spec.rules[0].http.paths
+          count: 4
+      - documentIndex: 0
+        equal:
+          path: spec.rules[0].http.paths[0].path
+          value: /realms/cozy
+      - documentIndex: 0
+        equal:
+          path: spec.rules[0].http.paths[1].path
+          value: /realms/cozy/
+      - documentIndex: 0
+        equal:
+          path: spec.rules[0].http.paths[2].path
+          value: /resources
+      - documentIndex: 0
+        equal:
+          path: spec.rules[0].http.paths[3].path
+          value: /.well-known
+      # doc 1: admin Ingress — full path, dedicated host/secret/class
+      - documentIndex: 1
+        equal:
+          path: metadata.name
+          value: keycloak-admin-ingress
+      - documentIndex: 1
+        equal:
+          path: spec.rules[0].host
+          value: keycloak-admin.example.com
+      - documentIndex: 1
+        equal:
+          path: spec.rules[0].http.paths[0].path
+          value: /
+      - documentIndex: 1
+        equal:
+          path: spec.tls[0].secretName
+          value: keycloak-admin-tls
+      - documentIndex: 1
+        equal:
+          path: spec.ingressClassName
+          value: tenant-root
+
+  - it: admin Ingress uses expose-ingress-admin ingressClass when set
+    template: templates/ingress.yaml
+    documentIndex: 1
+    set:
+      _cluster:
+        root-host: example.com
+        expose-ingress-admin: cozy-private
+      ingress:
+        adminHost: keycloak-admin.example.com
+    asserts:
+      - equal:
+          path: metadata.name
+          value: keycloak-admin-ingress
+      - equal:
+          path: spec.ingressClassName
+          value: cozy-private
+
+  - it: admin Ingress drops per-host TLS in wildcard mode on the shared ingress
+    template: templates/ingress.yaml
+    documentIndex: 1
+    set:
+      _cluster:
+        root-host: example.com
+        wildcard-secret-name: cozystack-wildcard
+      ingress:
+        adminHost: keycloak-admin.example.com
+    asserts:
+      - equal:
+          path: metadata.name
+          value: keycloak-admin-ingress
+      # no per-host secret — relies on the operator default SSL cert
+      - notExists:
+          path: spec.tls[0].secretName
+      # no ACME / cluster-issuer annotations in wildcard mode
+      - notExists:
+          path: metadata.annotations["cert-manager.io/cluster-issuer"]
+      - notExists:
+          path: metadata.annotations["acme.cert-manager.io/http01-ingress-ingressclassname"]
+
+  - it: admin Ingress keeps its own cert on a separate ingress even in wildcard mode
+    template: templates/ingress.yaml
+    documentIndex: 1
+    set:
+      _cluster:
+        root-host: example.com
+        wildcard-secret-name: cozystack-wildcard
+        expose-ingress-admin: cozy-private
+      ingress:
+        adminHost: keycloak-admin.example.com
+    asserts:
+      - equal:
+          path: metadata.name
+          value: keycloak-admin-ingress
+      # separate ingress has no wildcard default cert -> per-host secret stays
+      - equal:
+          path: spec.tls[0].secretName
+          value: keycloak-admin-tls
+      - equal:
+          path: metadata.annotations["cert-manager.io/cluster-issuer"]
+          value: letsencrypt-prod
+
+  # --- HTTPRoute (gateway enabled) ---
+  - it: renders one HTTPRoute serving all paths when adminHost is empty
+    template: templates/httproute.yaml
+    set:
+      _cluster:
+        root-host: example.com
+        gateway-enabled: "true"
+    asserts:
+      - hasDocuments:
+          count: 1
+      - isKind:
+          of: HTTPRoute
+      - lengthEqual:
+          path: spec.hostnames
+          count: 1
+      - equal:
+          path: spec.hostnames[0]
+          value: keycloak.example.com
+      # no path matches -> all paths routed
+      - isNull:
+          path: spec.rules[0].matches
+
+  - it: narrows the login HTTPRoute to OIDC paths and adds an admin HTTPRoute
+    template: templates/httproute.yaml
+    set:
+      _cluster:
+        root-host: example.com
+        gateway-enabled: "true"
+      ingress:
+        adminHost: keycloak-admin.example.com
+    asserts:
+      - hasDocuments:
+          count: 2
+      # doc 0: public login route — only OIDC path prefixes
+      - documentIndex: 0
+        equal:
+          path: metadata.name
+          value: keycloak
+      - documentIndex: 0
+        equal:
+          path: spec.hostnames[0]
+          value: keycloak.example.com
+      - documentIndex: 0
+        lengthEqual:
+          path: spec.rules[0].matches
+          count: 4
+      - documentIndex: 0
+        equal:
+          path: spec.rules[0].matches[0].path.value
+          value: /realms/cozy
+      # doc 1: admin route — dedicated hostname, default admin namespace
+      - documentIndex: 1
+        equal:
+          path: metadata.name
+          value: keycloak-admin
+      - documentIndex: 1
+        equal:
+          path: spec.hostnames[0]
+          value: keycloak-admin.example.com
+      - documentIndex: 1
+        equal:
+          path: spec.parentRefs[0].namespace
+          value: tenant-root
+
+  - it: admin HTTPRoute attaches to expose-ingress-admin namespace when set
+    template: templates/httproute.yaml
+    documentIndex: 1
+    set:
+      _cluster:
+        root-host: example.com
+        gateway-enabled: "true"
+        expose-ingress-admin: cozy-private
+      ingress:
+        adminHost: keycloak-admin.example.com
+    asserts:
+      - equal:
+          path: metadata.name
+          value: keycloak-admin
+      - equal:
+          path: spec.parentRefs[0].namespace
+          value: cozy-private
diff --git a/packages/system/keycloak/tests/db_backup_test.yaml b/packages/system/keycloak/tests/db_backup_test.yaml
new file mode 100644
index 0000000000..77f13f713e
--- /dev/null
+++ b/packages/system/keycloak/tests/db_backup_test.yaml
@@ -0,0 +1,52 @@
+suite: keycloak DB backup ObjectStore (barman-cloud plugin)
+templates:
+  - templates/db.yaml
+release:
+  name: keycloak
+  namespace: cozy-keycloak
+tests:
+  - it: "backup enabled: renders a barman-cloud ObjectStore that pins the sidecar S3 request checksum to when_required"
+    set:
+      _cluster:
+        root-host: example.org
+        cluster-domain: cozy.local
+      backup:
+        enabled: true
+        destinationPath: s3://aenix/keycloak-db/
+        endpointURL: https://s3.frcloud.kz
+        existingSecretName: keycloak-db-backup-s3-creds
+    asserts:
+      # A barman-cloud ObjectStore is rendered for the Keycloak DB.
+      - equal:
+          path: metadata.name
+          value: keycloak-db
+        documentSelector:
+          path: kind
+          value: ObjectStore
+      # Non-AWS S3 gateways (Ceph RGW, the platform's SeaweedFS system bucket)
+      # reject botocore's default flexible checksum; the sidecar must request
+      # one only when required.
+      - equal:
+          path: spec.instanceSidecarConfiguration.env[0].name
+          value: AWS_REQUEST_CHECKSUM_CALCULATION
+        documentSelector:
+          path: kind
+          value: ObjectStore
+      - equal:
+          path: spec.instanceSidecarConfiguration.env[0].value
+          value: when_required
+        documentSelector:
+          path: kind
+          value: ObjectStore
+      - equal:
+          path: spec.instanceSidecarConfiguration.resources.limits.memory
+          value: 1Gi
+        documentSelector:
+          path: kind
+          value: ObjectStore
+      - equal:
+          path: spec.instanceSidecarConfiguration.resources.requests.memory
+          value: 256Mi
+        documentSelector:
+          path: kind
+          value: ObjectStore
diff --git a/packages/system/keycloak/tests/db_placement_test.yaml b/packages/system/keycloak/tests/db_placement_test.yaml
new file mode 100644
index 0000000000..7499ba89f6
--- /dev/null
+++ b/packages/system/keycloak/tests/db_placement_test.yaml
@@ -0,0 +1,122 @@
+suite: keycloak-db placement across failure domains
+templates:
+  - templates/db.yaml
+
+release:
+  name: keycloak
+  namespace: cozy-keycloak
+
+set:
+  _cluster:
+    root-host: example.org
+    cluster-domain: cozy.local
+
+tests:
+  - it: leaves the database placement to the scheduler by default
+    documentSelector:
+      path: kind
+      value: Cluster
+    asserts:
+      - notExists:
+          path: spec.affinity
+      - notExists:
+          path: spec.topologySpreadConstraints
+
+  - it: renders affinity and spread constraints and adds the cluster label selector
+    documentSelector:
+      path: kind
+      value: Cluster
+    set:
+      database:
+        affinity:
+          nodeAffinity:
+            requiredDuringSchedulingIgnoredDuringExecution:
+              nodeSelectorTerms:
+                - matchExpressions:
+                    - key: topology.kubernetes.io/zone
+                      operator: In
+                      values: [zone-a, zone-b]
+        topologySpreadConstraints:
+          - maxSkew: 1
+            topologyKey: topology.kubernetes.io/zone
+            whenUnsatisfiable: DoNotSchedule
+            nodeTaintsPolicy: Honor
+    asserts:
+      - equal:
+          path: spec.affinity.nodeAffinity.requiredDuringSchedulingIgnoredDuringExecution.nodeSelectorTerms[0].matchExpressions[0].values
+          value: [zone-a, zone-b]
+      - equal:
+          path: spec.topologySpreadConstraints[0].topologyKey
+          value: topology.kubernetes.io/zone
+      - equal:
+          path: spec.topologySpreadConstraints[0].nodeTaintsPolicy
+          value: Honor
+      - equal:
+          path: spec.topologySpreadConstraints[0].labelSelector.matchLabels
+          value:
+            cnpg.io/cluster: keycloak-db
+
+  - it: keeps a label selector the operator wrote
+    documentSelector:
+      path: kind
+      value: Cluster
+    set:
+      database:
+        topologySpreadConstraints:
+          - maxSkew: 1
+            topologyKey: topology.kubernetes.io/zone
+            whenUnsatisfiable: DoNotSchedule
+            labelSelector:
+              matchLabels:
+                custom: label
+    asserts:
+      - equal:
+          path: spec.topologySpreadConstraints[0].labelSelector.matchLabels
+          value:
+            custom: label
+
+  - it: falls back to the cluster-wide scheduling constraints when the database sets none
+    documentSelector:
+      path: kind
+      value: Cluster
+    set:
+      _cluster:
+        root-host: example.org
+        cluster-domain: cozy.local
+        scheduling:
+          globalAppTopologySpreadConstraints: |
+            topologySpreadConstraints:
+              - maxSkew: 2
+                topologyKey: kubernetes.io/hostname
+                whenUnsatisfiable: ScheduleAnyway
+    asserts:
+      - equal:
+          path: spec.topologySpreadConstraints[0].topologyKey
+          value: kubernetes.io/hostname
+
+  - it: prefers the database constraints over the cluster-wide ones
+    documentSelector:
+      path: kind
+      value: Cluster
+    set:
+      _cluster:
+        root-host: example.org
+        cluster-domain: cozy.local
+        scheduling:
+          globalAppTopologySpreadConstraints: |
+            topologySpreadConstraints:
+              - maxSkew: 2
+                topologyKey: kubernetes.io/hostname
+                whenUnsatisfiable: ScheduleAnyway
+      database:
+        topologySpreadConstraints:
+          - maxSkew: 1
+            topologyKey: topology.kubernetes.io/zone
+            whenUnsatisfiable: DoNotSchedule
+    asserts:
+      - lengthEqual:
+          path: spec.topologySpreadConstraints
+          count: 1
+      - equal:
+          path: spec.topologySpreadConstraints[0].topologyKey
+          value: topology.kubernetes.io/zone
diff --git a/packages/system/keycloak/tests/encryption_test.yaml b/packages/system/keycloak/tests/encryption_test.yaml
new file mode 100644
index 0000000000..7a7c9a001c
--- /dev/null
+++ b/packages/system/keycloak/tests/encryption_test.yaml
@@ -0,0 +1,914 @@
+suite: keycloak optional KMS-encrypting DB proxy
+templates:
+  - templates/proxy.yaml
+  - templates/sts.yaml
+
+release:
+  name: keycloak
+  namespace: cozy-keycloak
+
+tests:
+  - it: does not render the proxy when encryption is disabled (default)
+    template: templates/proxy.yaml
+    set:
+      _cluster:
+        root-host: example.org
+        cluster-domain: cozy.local
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  - it: keeps Keycloak pointed at the CNPG secret when encryption is disabled
+    template: templates/sts.yaml
+    documentSelector:
+      path: kind
+      value: StatefulSet
+    set:
+      _cluster:
+        root-host: example.org
+        cluster-domain: cozy.local
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: KC_DB_URL_HOST
+            valueFrom:
+              secretKeyRef:
+                name: keycloak-db-app
+                key: "host"
+
+  - it: renders four documents (KEK Secret + ServiceAccount + Deployment + Service) when enabled
+    template: templates/proxy.yaml
+    set:
+      encryption.enabled: true
+      _cluster:
+        root-host: example.org
+        cluster-domain: cozy.local
+    asserts:
+      - hasDocuments:
+          count: 4
+
+  - it: deploys the proxy wired to the static KEK and the CNPG backend
+    template: templates/proxy.yaml
+    documentSelector:
+      path: kind
+      value: Deployment
+    set:
+      encryption.enabled: true
+      _cluster:
+        root-host: example.org
+        cluster-domain: cozy.local
+    asserts:
+      - equal:
+          path: metadata.name
+          value: keycloak-kms-proxy
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: KKP_KEK
+            valueFrom:
+              secretKeyRef:
+                name: keycloak-kms-proxy-kek
+                key: kek
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: KKP_BACKEND_ADDR
+            value: keycloak-db-rw.cozy-keycloak.svc.cozy.local:5432
+
+  - it: generates the static KEK Secret
+    template: templates/proxy.yaml
+    documentSelector:
+      path: kind
+      value: Secret
+    set:
+      encryption.enabled: true
+      _cluster:
+        root-host: example.org
+        cluster-domain: cozy.local
+    asserts:
+      - equal:
+          path: metadata.name
+          value: keycloak-kms-proxy-kek
+
+  - it: exposes the proxy on a postgres Service
+    template: templates/proxy.yaml
+    documentSelector:
+      path: kind
+      value: Service
+    set:
+      encryption.enabled: true
+      _cluster:
+        root-host: example.org
+        cluster-domain: cozy.local
+    asserts:
+      - equal:
+          path: metadata.name
+          value: keycloak-kms-proxy
+      - equal:
+          path: spec.ports[0].port
+          value: 5432
+
+  - it: repoints Keycloak at the proxy Service when encryption is enabled
+    template: templates/sts.yaml
+    documentSelector:
+      path: kind
+      value: StatefulSet
+    set:
+      encryption.enabled: true
+      _cluster:
+        root-host: example.org
+        cluster-domain: cozy.local
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: KC_DB_URL_HOST
+            value: keycloak-kms-proxy.cozy-keycloak.svc.cozy.local
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: KC_DB_URL_PORT
+            value: "5432"
+
+  - it: uses the Vault Transit backend when selected
+    template: templates/proxy.yaml
+    documentSelector:
+      path: kind
+      value: Deployment
+    set:
+      encryption.enabled: true
+      encryption.kms.backend: vault-transit
+      encryption.kms.vault.address: https://vault.vault.svc:8200
+      encryption.kms.vault.keyName: keycloak
+      encryption.kms.vault.tokenSecretName: keycloak-vault-token
+      _cluster:
+        root-host: example.org
+        cluster-domain: cozy.local
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: KKP_VAULT_ADDR
+            value: https://vault.vault.svc:8200
+      # Token auth must not leak AppRole env vars. any:true matches on the
+      # element name alone (helm-unittest otherwise deep-equals whole elements).
+      - notContains:
+          path: spec.template.spec.containers[0].env
+          any: true
+          content:
+            name: KKP_VAULT_ROLE_ID
+
+  - it: does not generate a static KEK Secret for the Vault backend
+    template: templates/proxy.yaml
+    set:
+      encryption.enabled: true
+      encryption.kms.backend: vault-transit
+      encryption.kms.vault.address: https://vault.vault.svc:8200
+      encryption.kms.vault.keyName: keycloak
+      encryption.kms.vault.tokenSecretName: keycloak-vault-token
+      _cluster:
+        root-host: example.org
+        cluster-domain: cozy.local
+    asserts:
+      # ServiceAccount + Deployment + Service (no KEK Secret for Vault).
+      - hasDocuments:
+          count: 3
+
+  - it: rejects an unsupported kms backend at render time
+    template: templates/proxy.yaml
+    set:
+      encryption.enabled: true
+      encryption.kms.backend: vault
+      _cluster:
+        root-host: example.org
+        cluster-domain: cozy.local
+    asserts:
+      - failedTemplate:
+          errorPattern: "encryption.kms.backend must be 'static' or 'vault-transit'"
+
+  - it: requires vault.address for the vault-transit backend
+    template: templates/proxy.yaml
+    set:
+      encryption.enabled: true
+      encryption.kms.backend: vault-transit
+      encryption.kms.vault.keyName: keycloak
+      encryption.kms.vault.tokenSecretName: keycloak-vault-token
+      _cluster:
+        root-host: example.org
+        cluster-domain: cozy.local
+    asserts:
+      - failedTemplate:
+          errorPattern: "encryption.kms.vault.address is required"
+
+  - it: requires vault.keyName for the vault-transit backend
+    template: templates/proxy.yaml
+    set:
+      encryption.enabled: true
+      encryption.kms.backend: vault-transit
+      encryption.kms.vault.address: https://vault.vault.svc:8200
+      encryption.kms.vault.tokenSecretName: keycloak-vault-token
+      _cluster:
+        root-host: example.org
+        cluster-domain: cozy.local
+    asserts:
+      - failedTemplate:
+          errorPattern: "encryption.kms.vault.keyName is required"
+
+  - it: requires vault.tokenSecretName for the vault-transit backend
+    template: templates/proxy.yaml
+    set:
+      encryption.enabled: true
+      encryption.kms.backend: vault-transit
+      encryption.kms.vault.address: https://vault.vault.svc:8200
+      encryption.kms.vault.keyName: keycloak
+      _cluster:
+        root-host: example.org
+        cluster-domain: cozy.local
+    asserts:
+      - failedTemplate:
+          errorPattern: "encryption.kms.vault.tokenSecretName is required"
+
+  - it: authenticates via AppRole when vault.auth=approle
+    template: templates/proxy.yaml
+    documentSelector:
+      path: kind
+      value: Deployment
+    set:
+      encryption.enabled: true
+      encryption.kms.backend: vault-transit
+      encryption.kms.vault.address: https://vault.vault.svc:8200
+      encryption.kms.vault.keyName: keycloak
+      encryption.kms.vault.auth: approle
+      encryption.kms.vault.appRole.secretName: keycloak-vault-approle
+      _cluster:
+        root-host: example.org
+        cluster-domain: cozy.local
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: KKP_VAULT_APPROLE_MOUNT
+            value: approle
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: KKP_VAULT_ROLE_ID
+            valueFrom:
+              secretKeyRef:
+                name: keycloak-vault-approle
+                key: role-id
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: KKP_VAULT_SECRET_ID
+            valueFrom:
+              secretKeyRef:
+                name: keycloak-vault-approle
+                key: secret-id
+      # AppRole must not store a long-lived token. any:true matches on the
+      # element name alone (helm-unittest otherwise deep-equals whole elements,
+      # so a name-only content would never match the valueFrom entry).
+      - notContains:
+          path: spec.template.spec.containers[0].env
+          any: true
+          content:
+            name: KKP_VAULT_TOKEN
+
+  - it: requires appRole.secretName when vault.auth=approle
+    template: templates/proxy.yaml
+    set:
+      encryption.enabled: true
+      encryption.kms.backend: vault-transit
+      encryption.kms.vault.address: https://vault.vault.svc:8200
+      encryption.kms.vault.keyName: keycloak
+      encryption.kms.vault.auth: approle
+      _cluster:
+        root-host: example.org
+        cluster-domain: cozy.local
+    asserts:
+      - failedTemplate:
+          errorPattern: "encryption.kms.vault.appRole.secretName is required"
+
+  - it: authenticates via Kubernetes when vault.auth=kubernetes
+    template: templates/proxy.yaml
+    documentSelector:
+      path: kind
+      value: Deployment
+    set:
+      encryption.enabled: true
+      encryption.kms.backend: vault-transit
+      encryption.kms.vault.address: https://vault.vault.svc:8200
+      encryption.kms.vault.keyName: keycloak
+      encryption.kms.vault.auth: kubernetes
+      encryption.kms.vault.kubernetes.role: keycloak-proxy
+      _cluster:
+        root-host: example.org
+        cluster-domain: cozy.local
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: KKP_VAULT_KUBERNETES_ROLE
+            value: keycloak-proxy
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: KKP_VAULT_KUBERNETES_MOUNT
+            value: kubernetes
+      # No credential env vars for the other modes must leak in.
+      - notContains:
+          path: spec.template.spec.containers[0].env
+          any: true
+          content:
+            name: KKP_VAULT_TOKEN
+      - notContains:
+          path: spec.template.spec.containers[0].env
+          any: true
+          content:
+            name: KKP_VAULT_ROLE_ID
+
+  - it: requires kubernetes.role when vault.auth=kubernetes
+    template: templates/proxy.yaml
+    set:
+      encryption.enabled: true
+      encryption.kms.backend: vault-transit
+      encryption.kms.vault.address: https://vault.vault.svc:8200
+      encryption.kms.vault.keyName: keycloak
+      encryption.kms.vault.auth: kubernetes
+      _cluster:
+        root-host: example.org
+        cluster-domain: cozy.local
+    asserts:
+      - failedTemplate:
+          errorPattern: "encryption.kms.vault.kubernetes.role is required"
+
+  - it: rejects an unsupported vault auth method
+    template: templates/proxy.yaml
+    set:
+      encryption.enabled: true
+      encryption.kms.backend: vault-transit
+      encryption.kms.vault.address: https://vault.vault.svc:8200
+      encryption.kms.vault.keyName: keycloak
+      encryption.kms.vault.auth: bogus
+      _cluster:
+        root-host: example.org
+        cluster-domain: cozy.local
+    asserts:
+      - failedTemplate:
+          errorPattern: "encryption.kms.vault.auth must be 'token', 'approle', or 'kubernetes'"
+
+  - it: creates a dedicated proxy ServiceAccount with the token off by default
+    template: templates/proxy.yaml
+    documentSelector:
+      path: kind
+      value: ServiceAccount
+    set:
+      encryption.enabled: true
+      _cluster:
+        root-host: example.org
+        cluster-domain: cozy.local
+    asserts:
+      - equal:
+          path: metadata.name
+          value: keycloak-kms-proxy
+      - equal:
+          path: automountServiceAccountToken
+          value: false
+
+  - it: enables the ServiceAccount token on the SA object for Kubernetes auth
+    template: templates/proxy.yaml
+    documentSelector:
+      path: kind
+      value: ServiceAccount
+    set:
+      encryption.enabled: true
+      encryption.kms.backend: vault-transit
+      encryption.kms.vault.address: https://vault.vault.svc:8200
+      encryption.kms.vault.keyName: keycloak
+      encryption.kms.vault.auth: kubernetes
+      encryption.kms.vault.kubernetes.role: keycloak-proxy
+      _cluster:
+        root-host: example.org
+        cluster-domain: cozy.local
+    asserts:
+      - equal:
+          path: automountServiceAccountToken
+          value: true
+
+  - it: runs the proxy under its ServiceAccount with the token off by default
+    template: templates/proxy.yaml
+    documentSelector:
+      path: kind
+      value: Deployment
+    set:
+      encryption.enabled: true
+      _cluster:
+        root-host: example.org
+        cluster-domain: cozy.local
+    asserts:
+      - equal:
+          path: spec.template.spec.serviceAccountName
+          value: keycloak-kms-proxy
+      - equal:
+          path: spec.template.spec.automountServiceAccountToken
+          value: false
+
+  - it: mounts the ServiceAccount token only for Kubernetes auth
+    template: templates/proxy.yaml
+    documentSelector:
+      path: kind
+      value: Deployment
+    set:
+      encryption.enabled: true
+      encryption.kms.backend: vault-transit
+      encryption.kms.vault.address: https://vault.vault.svc:8200
+      encryption.kms.vault.keyName: keycloak
+      encryption.kms.vault.auth: kubernetes
+      encryption.kms.vault.kubernetes.role: keycloak-proxy
+      _cluster:
+        root-host: example.org
+        cluster-domain: cozy.local
+    asserts:
+      - equal:
+          path: spec.template.spec.automountServiceAccountToken
+          value: true
+
+  - it: mints an ephemeral DEK (no dekset) by default
+    template: templates/proxy.yaml
+    documentSelector:
+      path: kind
+      value: Deployment
+    set:
+      encryption.enabled: true
+      _cluster:
+        root-host: example.org
+        cluster-domain: cozy.local
+    asserts:
+      # Anchor the index before asserting on it. notContains passes whenever its
+      # path resolves to something that lacks the content, and a different
+      # container at [0] qualifies, so without this the guard goes green if a
+      # sidecar is ever placed ahead of the proxy.
+      - equal:
+          path: spec.template.spec.containers[0].name
+          value: proxy
+      - notContains:
+          path: spec.template.spec.containers[0].env
+          any: true
+          content:
+            name: KKP_DEKSET_FILE
+      - notExists:
+          path: spec.template.spec.volumes
+
+  - it: mounts the wrapped DEK set when deksetSecretName is set
+    template: templates/proxy.yaml
+    documentSelector:
+      path: kind
+      value: Deployment
+    set:
+      encryption.enabled: true
+      encryption.deksetSecretName: keycloak-kms-proxy-dekset
+      _cluster:
+        root-host: example.org
+        cluster-domain: cozy.local
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: KKP_DEKSET_FILE
+            value: /etc/kkp/dekset/dekset.json
+      - contains:
+          path: spec.template.spec.containers[0].volumeMounts
+          content:
+            name: dekset
+            mountPath: /etc/kkp/dekset
+            readOnly: true
+      - contains:
+          path: spec.template.spec.volumes
+          content:
+            name: dekset
+            secret:
+              secretName: keycloak-kms-proxy-dekset
+      # Exactly one of each: the dekset and Vault CA blocks share these keys, so
+      # a CA volume rendered without its conditional shows up as a second entry.
+      - lengthEqual:
+          path: spec.template.spec.volumes
+          count: 1
+      - lengthEqual:
+          path: spec.template.spec.containers[0].volumeMounts
+          count: 1
+
+  - it: rejects HA (replicas > 1) without a dekset
+    template: templates/proxy.yaml
+    set:
+      encryption.enabled: true
+      encryption.replicas: 2
+      _cluster:
+        root-host: example.org
+        cluster-domain: cozy.local
+    asserts:
+      - failedTemplate:
+          errorPattern: "encryption.replicas > 1 requires encryption.deksetSecretName"
+
+  - it: allows HA when a shared dekset is provided
+    template: templates/proxy.yaml
+    documentSelector:
+      path: kind
+      value: Deployment
+    set:
+      encryption.enabled: true
+      encryption.replicas: 2
+      encryption.deksetSecretName: keycloak-kms-proxy-dekset
+      _cluster:
+        root-host: example.org
+        cluster-domain: cozy.local
+    asserts:
+      - equal:
+          path: spec.replicas
+          value: 2
+
+  - it: honors a custom deksetSecretKey
+    template: templates/proxy.yaml
+    documentSelector:
+      path: kind
+      value: Deployment
+    set:
+      encryption.enabled: true
+      encryption.deksetSecretName: keycloak-kms-proxy-dekset
+      encryption.deksetSecretKey: custom.json
+      _cluster:
+        root-host: example.org
+        cluster-domain: cozy.local
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: KKP_DEKSET_FILE
+            value: /etc/kkp/dekset/custom.json
+
+  - it: trusts a private Vault CA supplied inline as caBundle
+    set:
+      encryption.enabled: true
+      encryption.kms.backend: vault-transit
+      encryption.kms.vault.address: https://vault.example
+      encryption.kms.vault.keyName: keycloak
+      encryption.kms.vault.auth: approle
+      encryption.kms.vault.appRole.secretName: keycloak-vault-approle
+      encryption.kms.vault.caBundle: |
+        -----BEGIN CERTIFICATE-----
+        dGVzdA==
+        -----END CERTIFICATE-----
+      _cluster:
+        root-host: example.org
+        cluster-domain: cozy.local
+    template: templates/proxy.yaml
+    asserts:
+      - equal:
+          path: stringData["ca.crt"]
+          value: |
+            -----BEGIN CERTIFICATE-----
+            dGVzdA==
+            -----END CERTIFICATE-----
+        documentSelector:
+          path: metadata.name
+          value: keycloak-kms-proxy-vault-ca
+      # SSL_CERT_FILE alone leaves the image's public roots in the pool; both
+      # variables together pin the Vault leg to this CA.
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: SSL_CERT_FILE
+            value: /etc/kkp/vault-ca/ca.crt
+        documentSelector:
+          path: kind
+          value: Deployment
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: SSL_CERT_DIR
+            value: /etc/kkp/vault-ca
+        documentSelector:
+          path: kind
+          value: Deployment
+      # Derived from the bundle, so rotating it rolls the pods — the process
+      # memoizes its root pool and would otherwise keep the old CA.
+      - equal:
+          path: spec.template.metadata.annotations["checksum/vault-ca"]
+          value: de63913efff35e2e9be70b97bd7a0e12a2205f3a0ca00a114606d778abf65fe0
+        documentSelector:
+          path: kind
+          value: Deployment
+      - contains:
+          path: spec.template.spec.containers[0].volumeMounts
+          content:
+            name: vault-ca
+            mountPath: /etc/kkp/vault-ca
+            readOnly: true
+        documentSelector:
+          path: kind
+          value: Deployment
+      - contains:
+          path: spec.template.spec.volumes
+          content:
+            name: vault-ca
+            secret:
+              secretName: keycloak-kms-proxy-vault-ca
+              items:
+                - key: ca.crt
+                  path: ca.crt
+        documentSelector:
+          path: kind
+          value: Deployment
+
+  - it: mounts a pre-seeded CA Secret when caSecretName is set
+    set:
+      encryption.enabled: true
+      encryption.kms.backend: vault-transit
+      encryption.kms.vault.address: https://vault.example
+      encryption.kms.vault.keyName: keycloak
+      encryption.kms.vault.auth: approle
+      encryption.kms.vault.appRole.secretName: keycloak-vault-approle
+      encryption.kms.vault.caSecretName: vault-ca
+      _cluster:
+        root-host: example.org
+        cluster-domain: cozy.local
+    template: templates/proxy.yaml
+    documentSelector:
+      path: kind
+      value: Deployment
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: SSL_CERT_FILE
+            value: /etc/kkp/vault-ca/ca.crt
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: SSL_CERT_DIR
+            value: /etc/kkp/vault-ca
+      - contains:
+          path: spec.template.spec.containers[0].volumeMounts
+          content:
+            name: vault-ca
+            mountPath: /etc/kkp/vault-ca
+            readOnly: true
+      # No checksum annotation on this path: the chart does not own the Secret
+      # and cannot see its contents, so rotation needs a manual rollout restart.
+      - notExists:
+          path: spec.template.metadata.annotations
+      # Only one key is projected: a cert-manager TLS Secret would otherwise hand
+      # tls.key to the proxy, and a bundle under another key would fail the mount
+      # instead of looking like an unconfigured CA at runtime.
+      - contains:
+          path: spec.template.spec.volumes
+          content:
+            name: vault-ca
+            secret:
+              secretName: vault-ca
+              items:
+                - key: ca.crt
+                  path: ca.crt
+      # No dekset here, so a dekset volume rendered without its conditional
+      # (with an empty secretName) shows up as a second entry.
+      - lengthEqual:
+          path: spec.template.spec.volumes
+          count: 1
+      - lengthEqual:
+          path: spec.template.spec.containers[0].volumeMounts
+          count: 1
+
+  - it: fails when both caBundle and caSecretName are set
+    set:
+      encryption.enabled: true
+      encryption.kms.backend: vault-transit
+      encryption.kms.vault.address: https://vault.example
+      encryption.kms.vault.keyName: keycloak
+      encryption.kms.vault.auth: approle
+      encryption.kms.vault.appRole.secretName: keycloak-vault-approle
+      encryption.kms.vault.caSecretName: vault-ca
+      encryption.kms.vault.caBundle: PEM
+      _cluster:
+        root-host: example.org
+        cluster-domain: cozy.local
+    template: templates/proxy.yaml
+    asserts:
+      - failedTemplate:
+          errorPattern: mutually exclusive
+
+  - it: leaves the proxy on the system trust store when no CA is configured
+    set:
+      encryption.enabled: true
+      encryption.kms.backend: vault-transit
+      encryption.kms.vault.address: https://vault.example
+      encryption.kms.vault.keyName: keycloak
+      encryption.kms.vault.auth: approle
+      encryption.kms.vault.appRole.secretName: keycloak-vault-approle
+      _cluster:
+        root-host: example.org
+        cluster-domain: cozy.local
+    template: templates/proxy.yaml
+    documentSelector:
+      path: kind
+      value: Deployment
+    asserts:
+      - notContains:
+          path: spec.template.spec.containers[0].env
+          any: true
+          content:
+            name: SSL_CERT_FILE
+      - notExists:
+          path: spec.template.spec.volumes
+      - notExists:
+          path: spec.template.spec.containers[0].volumeMounts
+
+  # The volume and mount are pod-level, outside the vault-transit env block, so
+  # an ungated caSecretName would have the static backend mount a Secret the
+  # chart never renders — the pod then never leaves ContainerCreating and takes
+  # all Keycloak DB traffic with it.
+  - it: ignores a pre-seeded Vault CA Secret under the static backend
+    set:
+      encryption.enabled: true
+      encryption.kms.vault.caSecretName: vault-ca
+      _cluster:
+        root-host: example.org
+        cluster-domain: cozy.local
+    template: templates/proxy.yaml
+    documentSelector:
+      path: kind
+      value: Deployment
+    asserts:
+      - notExists:
+          path: spec.template.spec.volumes
+      - notExists:
+          path: spec.template.spec.containers[0].volumeMounts
+      - notContains:
+          path: spec.template.spec.containers[0].env
+          any: true
+          content:
+            name: SSL_CERT_FILE
+
+  - it: ignores an inline Vault CA bundle under the static backend
+    set:
+      encryption.enabled: true
+      encryption.kms.vault.caBundle: PEM
+      _cluster:
+        root-host: example.org
+        cluster-domain: cozy.local
+    template: templates/proxy.yaml
+    asserts:
+      # KEK Secret, ServiceAccount, Deployment, Service — no CA Secret.
+      - hasDocuments:
+          count: 4
+      - notExists:
+          path: spec.template.spec.volumes
+        documentSelector:
+          path: kind
+          value: Deployment
+
+  # Every vault.* key is inert under the static backend, the mutual-exclusion
+  # check included: rejecting a combination that cannot reach Vault anyway would
+  # break a render that is otherwise valid.
+  - it: does not enforce Vault CA mutual exclusion under the static backend
+    set:
+      encryption.enabled: true
+      encryption.kms.vault.caSecretName: vault-ca
+      encryption.kms.vault.caBundle: PEM
+      _cluster:
+        root-host: example.org
+        cluster-domain: cozy.local
+    template: templates/proxy.yaml
+    asserts:
+      - notFailedTemplate: {}
+      - hasDocuments:
+          count: 4
+
+  - it: rolls the pods when a chart-owned caBundle is rotated
+    set:
+      encryption.enabled: true
+      encryption.kms.backend: vault-transit
+      encryption.kms.vault.address: https://vault.example
+      encryption.kms.vault.keyName: keycloak
+      encryption.kms.vault.auth: approle
+      encryption.kms.vault.appRole.secretName: keycloak-vault-approle
+      encryption.kms.vault.caBundle: |
+        -----BEGIN CERTIFICATE-----
+        cm90YXRlZA==
+        -----END CERTIFICATE-----
+      _cluster:
+        root-host: example.org
+        cluster-domain: cozy.local
+    template: templates/proxy.yaml
+    documentSelector:
+      path: kind
+      value: Deployment
+    asserts:
+      # Differs from the checksum asserted for the bundle above.
+      - equal:
+          path: spec.template.metadata.annotations["checksum/vault-ca"]
+          value: 76da7d3279a7bc1e42a021a7c3fdc0e79b506bc152171128003ae15f56512741
+
+  - it: rejects a caBundle that is not a PEM certificate bundle
+    set:
+      encryption.enabled: true
+      encryption.kms.backend: vault-transit
+      encryption.kms.vault.address: https://vault.example
+      encryption.kms.vault.keyName: keycloak
+      encryption.kms.vault.auth: approle
+      encryption.kms.vault.appRole.secretName: keycloak-vault-approle
+      encryption.kms.vault.caBundle: not-a-certificate
+      _cluster:
+        root-host: example.org
+        cluster-domain: cozy.local
+    template: templates/proxy.yaml
+    asserts:
+      - failedTemplate:
+          errorPattern: "caBundle must be a PEM bundle"
+
+  - it: reads a pre-seeded bundle from a custom caSecretKey
+    set:
+      encryption.enabled: true
+      encryption.kms.backend: vault-transit
+      encryption.kms.vault.address: https://vault.example
+      encryption.kms.vault.keyName: keycloak
+      encryption.kms.vault.auth: approle
+      encryption.kms.vault.appRole.secretName: keycloak-vault-approle
+      encryption.kms.vault.caSecretName: vault-serving-cert
+      encryption.kms.vault.caSecretKey: ca-bundle.crt
+      _cluster:
+        root-host: example.org
+        cluster-domain: cozy.local
+    template: templates/proxy.yaml
+    documentSelector:
+      path: kind
+      value: Deployment
+    asserts:
+      # The key varies, the projected path does not, so SSL_CERT_FILE is fixed.
+      - contains:
+          path: spec.template.spec.volumes
+          content:
+            name: vault-ca
+            secret:
+              secretName: vault-serving-cert
+              items:
+                - key: ca-bundle.crt
+                  path: ca.crt
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: SSL_CERT_FILE
+            value: /etc/kkp/vault-ca/ca.crt
+
+  # Both optional mounts at once: the dekset and CA blocks share the volumes and
+  # volumeMounts keys, so dropping either inner conditional must fail here.
+  - it: mounts the dekset and the Vault CA side by side
+    set:
+      encryption.enabled: true
+      encryption.kms.backend: vault-transit
+      encryption.kms.vault.address: https://vault.example
+      encryption.kms.vault.keyName: keycloak
+      encryption.kms.vault.auth: approle
+      encryption.kms.vault.appRole.secretName: keycloak-vault-approle
+      encryption.kms.vault.caSecretName: vault-ca
+      encryption.deksetSecretName: keycloak-kms-proxy-dekset
+      _cluster:
+        root-host: example.org
+        cluster-domain: cozy.local
+    template: templates/proxy.yaml
+    documentSelector:
+      path: kind
+      value: Deployment
+    asserts:
+      - lengthEqual:
+          path: spec.template.spec.volumes
+          count: 2
+      - lengthEqual:
+          path: spec.template.spec.containers[0].volumeMounts
+          count: 2
+      - contains:
+          path: spec.template.spec.volumes
+          content:
+            name: dekset
+            secret:
+              secretName: keycloak-kms-proxy-dekset
+      - contains:
+          path: spec.template.spec.volumes
+          content:
+            name: vault-ca
+            secret:
+              secretName: vault-ca
+              items:
+                - key: ca.crt
+                  path: ca.crt
+      - contains:
+          path: spec.template.spec.containers[0].volumeMounts
+          content:
+            name: dekset
+            mountPath: /etc/kkp/dekset
+            readOnly: true
+      - contains:
+          path: spec.template.spec.containers[0].volumeMounts
+          content:
+            name: vault-ca
+            mountPath: /etc/kkp/vault-ca
+            readOnly: true
diff --git a/packages/system/keycloak/tests/exposed_realms_test.yaml b/packages/system/keycloak/tests/exposed_realms_test.yaml
new file mode 100644
index 0000000000..7ae13f7b14
--- /dev/null
+++ b/packages/system/keycloak/tests/exposed_realms_test.yaml
@@ -0,0 +1,471 @@
+suite: published realms on the login host (ingress.exposedRealms)
+
+release:
+  name: keycloak
+  namespace: cozy-keycloak
+
+# In the narrowed mode (ingress.adminHost set) the login host publishes realm
+# paths. A bare /realms prefix publishes every realm the deployment happens to
+# have, including master, whose token endpoint then accepts super-admin
+# credentials from the internet. The login route therefore enumerates the
+# realms that are meant to be public: the platform realm, which every
+# component's issuer URL points at, plus whatever ingress.exposedRealms adds.
+#
+# Each realm is published as an exact path plus a trailing-slash prefix, so a
+# controller that treats `pathType: Prefix` as a byte prefix cannot serve a
+# realm whose name merely extends a published one.
+tests:
+  # --- HTTPRoute (gateway enabled) ---
+  - it: publishes only the platform realm by default
+    template: templates/httproute.yaml
+    documentIndex: 0
+    set:
+      _cluster:
+        root-host: example.com
+        gateway-enabled: "true"
+      ingress:
+        adminHost: keycloak-admin.example.com
+    asserts:
+      - lengthEqual:
+          path: spec.rules[0].matches
+          count: 4
+      - equal:
+          path: spec.rules[0].matches[0].path
+          value:
+            type: Exact
+            value: /realms/cozy
+      - equal:
+          path: spec.rules[0].matches[1].path
+          value:
+            type: PathPrefix
+            value: /realms/cozy/
+      - equal:
+          path: spec.rules[0].matches[2].path.value
+          value: /resources
+      - equal:
+          path: spec.rules[0].matches[3].path.value
+          value: /.well-known
+      # the bare prefix is gone: /realms/master is no longer routed
+      - notContains:
+          path: spec.rules[0].matches
+          content:
+            path:
+              type: PathPrefix
+              value: /realms
+          any: true
+
+  - it: follows the platform realm name
+    template: templates/httproute.yaml
+    documentIndex: 0
+    set:
+      _cluster:
+        root-host: example.com
+        gateway-enabled: "true"
+        oidc-realm-name: acme
+      ingress:
+        adminHost: keycloak-admin.example.com
+    asserts:
+      - equal:
+          path: spec.rules[0].matches[0].path.value
+          value: /realms/acme
+      - equal:
+          path: spec.rules[0].matches[1].path.value
+          value: /realms/acme/
+
+  # A platform realm name YAML parsed as a number still names a realm: the
+  # platform validates that key, and a bare number there must not be reported
+  # as an exposedRealms the operator never set.
+  - it: accepts a platform realm name that is not a string
+    template: templates/httproute.yaml
+    documentIndex: 0
+    set:
+      _cluster:
+        root-host: example.com
+        gateway-enabled: "true"
+        oidc-realm-name: 123
+      ingress:
+        adminHost: keycloak-admin.example.com
+    asserts:
+      - equal:
+          path: spec.rules[0].matches[0].path.value
+          value: /realms/123
+
+  - it: publishes every realm listed in exposedRealms
+    template: templates/httproute.yaml
+    documentIndex: 0
+    set:
+      _cluster:
+        root-host: example.com
+        gateway-enabled: "true"
+      ingress:
+        adminHost: keycloak-admin.example.com
+        exposedRealms:
+        - cozy
+        - cozy-admin
+    asserts:
+      - lengthEqual:
+          path: spec.rules[0].matches
+          count: 6
+      - equal:
+          path: spec.rules[0].matches[0].path.value
+          value: /realms/cozy
+      - equal:
+          path: spec.rules[0].matches[2].path.value
+          value: /realms/cozy-admin
+
+  - it: keeps publishing the platform realm when exposedRealms omits it
+    template: templates/httproute.yaml
+    documentIndex: 0
+    set:
+      _cluster:
+        root-host: example.com
+        gateway-enabled: "true"
+      ingress:
+        adminHost: keycloak-admin.example.com
+        exposedRealms:
+        - cozy-admin
+    asserts:
+      - lengthEqual:
+          path: spec.rules[0].matches
+          count: 6
+      - equal:
+          path: spec.rules[0].matches[0].path.value
+          value: /realms/cozy
+      - equal:
+          path: spec.rules[0].matches[2].path.value
+          value: /realms/cozy-admin
+
+  - it: publishes a realm named twice once
+    template: templates/httproute.yaml
+    documentIndex: 0
+    set:
+      _cluster:
+        root-host: example.com
+        gateway-enabled: "true"
+      ingress:
+        adminHost: keycloak-admin.example.com
+        exposedRealms:
+        - cozy
+        - cozy
+    asserts:
+      - lengthEqual:
+          path: spec.rules[0].matches
+          count: 4
+
+  - it: leaves the login HTTPRoute serving everything without adminHost
+    template: templates/httproute.yaml
+    set:
+      _cluster:
+        root-host: example.com
+        gateway-enabled: "true"
+      ingress:
+        exposedRealms:
+        - cozy
+    asserts:
+      - hasDocuments:
+          count: 1
+      - isNull:
+          path: spec.rules[0].matches
+
+  # The list takes effect only in the narrowed mode, but it is validated
+  # wherever it is set: a value that would be refused once adminHost is on
+  # must not sit in the values until then.
+  - it: does not route the realm list without adminHost
+    template: templates/httproute.yaml
+    set:
+      _cluster:
+        root-host: example.com
+        gateway-enabled: "true"
+      ingress:
+        exposedRealms:
+        - cozy-admin
+    asserts:
+      - hasDocuments:
+          count: 1
+      - isNull:
+          path: spec.rules[0].matches
+
+  - it: refuses master without adminHost too
+    set:
+      _cluster:
+        root-host: example.com
+        gateway-enabled: "true"
+      ingress:
+        exposedRealms:
+        - master
+    asserts:
+      - failedTemplate:
+          errorPattern: "ingress.exposedRealms must not list master"
+
+  - it: refuses a malformed realm list without adminHost too
+    set:
+      _cluster:
+        root-host: example.com
+      ingress:
+        exposedRealms: false
+    asserts:
+      - failedTemplate:
+          errorPattern: "ingress.exposedRealms must be a list"
+
+  - it: publishes 31 realms on the login HTTPRoute
+    template: templates/httproute.yaml
+    documentIndex: 0
+    set:
+      _cluster:
+        root-host: example.com
+        gateway-enabled: "true"
+      ingress:
+        adminHost: keycloak-admin.example.com
+        exposedRealms:
+        - realm-0
+        - realm-1
+        - realm-2
+        - realm-3
+        - realm-4
+        - realm-5
+        - realm-6
+        - realm-7
+        - realm-8
+        - realm-9
+        - realm-10
+        - realm-11
+        - realm-12
+        - realm-13
+        - realm-14
+        - realm-15
+        - realm-16
+        - realm-17
+        - realm-18
+        - realm-19
+        - realm-20
+        - realm-21
+        - realm-22
+        - realm-23
+        - realm-24
+        - realm-25
+        - realm-26
+        - realm-27
+        - realm-28
+        - realm-29
+    asserts:
+      - lengthEqual:
+          path: spec.rules[0].matches
+          count: 64
+
+  - it: refuses more realms than a route rule can match
+    set:
+      _cluster:
+        root-host: example.com
+        gateway-enabled: "true"
+      ingress:
+        adminHost: keycloak-admin.example.com
+        exposedRealms:
+        - realm-0
+        - realm-1
+        - realm-2
+        - realm-3
+        - realm-4
+        - realm-5
+        - realm-6
+        - realm-7
+        - realm-8
+        - realm-9
+        - realm-10
+        - realm-11
+        - realm-12
+        - realm-13
+        - realm-14
+        - realm-15
+        - realm-16
+        - realm-17
+        - realm-18
+        - realm-19
+        - realm-20
+        - realm-21
+        - realm-22
+        - realm-23
+        - realm-24
+        - realm-25
+        - realm-26
+        - realm-27
+        - realm-28
+        - realm-29
+        - realm-30
+    asserts:
+      - failedTemplate:
+          errorPattern: "publish at most 31 realms \\(ingress.exposedRealms plus the platform realm\\), got 32"
+
+  - it: keeps the admin HTTPRoute serving the whole admin plane
+    template: templates/httproute.yaml
+    documentIndex: 1
+    set:
+      _cluster:
+        root-host: example.com
+        gateway-enabled: "true"
+      ingress:
+        adminHost: keycloak-admin.example.com
+        exposedRealms:
+        - cozy
+    asserts:
+      - equal:
+          path: metadata.name
+          value: keycloak-admin
+      - isNull:
+          path: spec.rules[0].matches
+
+  # --- Ingress (gateway disabled) ---
+  - it: publishes only the platform realm on the login Ingress by default
+    template: templates/ingress.yaml
+    documentIndex: 0
+    set:
+      _cluster:
+        root-host: example.com
+      ingress:
+        adminHost: keycloak-admin.example.com
+    asserts:
+      - lengthEqual:
+          path: spec.rules[0].http.paths
+          count: 4
+      - equal:
+          path: spec.rules[0].http.paths[0].path
+          value: /realms/cozy
+      - equal:
+          path: spec.rules[0].http.paths[0].pathType
+          value: Exact
+      - equal:
+          path: spec.rules[0].http.paths[1].path
+          value: /realms/cozy/
+      - equal:
+          path: spec.rules[0].http.paths[1].pathType
+          value: Prefix
+      - notContains:
+          path: spec.rules[0].http.paths
+          content:
+            path: /realms
+            pathType: Prefix
+          any: true
+
+  - it: publishes every realm listed in exposedRealms on the login Ingress
+    template: templates/ingress.yaml
+    documentIndex: 0
+    set:
+      _cluster:
+        root-host: example.com
+      ingress:
+        adminHost: keycloak-admin.example.com
+        exposedRealms:
+        - cozy
+        - cozy-admin
+    asserts:
+      - lengthEqual:
+          path: spec.rules[0].http.paths
+          count: 6
+      - equal:
+          path: spec.rules[0].http.paths[2].path
+          value: /realms/cozy-admin
+      - equal:
+          path: spec.rules[0].http.paths[2].pathType
+          value: Exact
+      - equal:
+          path: spec.rules[0].http.paths[3].path
+          value: /realms/cozy-admin/
+      - equal:
+          path: spec.rules[0].http.paths[3].pathType
+          value: Prefix
+
+  # --- validation ---
+  - it: rejects a realm name that would split the URL path
+    set:
+      _cluster:
+        root-host: example.com
+        gateway-enabled: "true"
+      ingress:
+        adminHost: keycloak-admin.example.com
+        exposedRealms:
+        - cozy/../admin
+    asserts:
+      - failedTemplate:
+          errorPattern: "ingress.exposedRealms"
+
+  - it: rejects an empty realm name
+    set:
+      _cluster:
+        root-host: example.com
+        gateway-enabled: "true"
+      ingress:
+        adminHost: keycloak-admin.example.com
+        exposedRealms:
+        - ""
+    asserts:
+      - failedTemplate:
+          errorPattern: "ingress.exposedRealms"
+
+  - it: rejects a realm name that is not a string
+    set:
+      _cluster:
+        root-host: example.com
+      ingress:
+        adminHost: keycloak-admin.example.com
+        exposedRealms:
+        - 42
+    asserts:
+      - failedTemplate:
+          errorPattern: "ingress.exposedRealms entries must be strings"
+
+  - it: rejects a falsy scalar in place of the realm list
+    set:
+      _cluster:
+        root-host: example.com
+      ingress:
+        adminHost: keycloak-admin.example.com
+        exposedRealms: false
+    asserts:
+      - failedTemplate:
+          errorPattern: "ingress.exposedRealms must be a list"
+
+  - it: rejects a scalar in place of the realm list
+    set:
+      _cluster:
+        root-host: example.com
+      ingress:
+        adminHost: keycloak-admin.example.com
+        exposedRealms: cozy
+    asserts:
+      - failedTemplate:
+          errorPattern: "ingress.exposedRealms must be a list"
+
+  - it: refuses to publish realm master
+    set:
+      _cluster:
+        root-host: example.com
+        gateway-enabled: "true"
+      ingress:
+        adminHost: keycloak-admin.example.com
+        exposedRealms:
+        - master
+    asserts:
+      - failedTemplate:
+          errorPattern: "ingress.exposedRealms must not list master"
+
+  - it: refuses master as the platform realm
+    set:
+      _cluster:
+        root-host: example.com
+        gateway-enabled: "true"
+        oidc-realm-name: master
+      ingress:
+        adminHost: keycloak-admin.example.com
+    asserts:
+      - failedTemplate:
+          errorPattern: "must not be master"
+
+  - it: names the platform realm, not exposedRealms, when the realm name is invalid
+    set:
+      _cluster:
+        root-host: example.com
+        oidc-realm-name: "bad/name"
+      ingress:
+        adminHost: keycloak-admin.example.com
+    asserts:
+      - failedTemplate:
+          errorPattern: "platform realm name"
diff --git a/packages/system/keycloak/tests/ingress_wildcard_test.yaml b/packages/system/keycloak/tests/ingress_wildcard_test.yaml
new file mode 100644
index 0000000000..67566252f8
--- /dev/null
+++ b/packages/system/keycloak/tests/ingress_wildcard_test.yaml
@@ -0,0 +1,104 @@
+suite: keycloak ingress wildcard mode drops per-host ACME
+templates:
+  - templates/ingress.yaml
+
+release:
+  name: keycloak
+  namespace: cozy-keycloak
+
+# keycloak wraps its cert-manager annotations inside
+# `with .Values.ingress.annotations`; the chart ships default
+# session-cookie annotations, so the block always renders. In wildcard
+# mode the cert-manager + http01 annotations and the per-host tls
+# secretName are dropped (the tls section stays so the HTTPS redirect
+# keeps working against the default SSL certificate); the user
+# annotations are preserved.
+
+tests:
+  - it: drops cert-manager annotation and tls secretName when wildcard secret is set
+    set:
+      _cluster:
+        root-host: example.org
+        issuer-name: letsencrypt-prod
+        solver: http01
+        expose-ingress: tenant-root
+        gateway-enabled: "false"
+        wildcard-secret-name: wildcard-tls
+    asserts:
+      - equal:
+          path: kind
+          value: Ingress
+      - notExists:
+          path: metadata.annotations["cert-manager.io/cluster-issuer"]
+      - exists:
+          path: spec.tls
+      - notExists:
+          path: spec.tls[0].secretName
+
+  - it: keeps cert-manager annotation and tls secretName without wildcard secret
+    set:
+      _cluster:
+        root-host: example.org
+        issuer-name: letsencrypt-prod
+        solver: http01
+        expose-ingress: tenant-root
+        gateway-enabled: "false"
+    asserts:
+      - equal:
+          path: metadata.annotations["cert-manager.io/cluster-issuer"]
+          value: letsencrypt-prod
+      - equal:
+          path: spec.tls[0].secretName
+          value: web-tls
+
+  # WS2 / #2400 blocker guard: a custom keycloak host (auth.example.com)
+  # is outside the platform wildcard *.<root-host>. Because shared
+  # wildcard issuance is opt-in (publishing.certificates.wildcard,
+  # default false), a dns01 cluster carries no _cluster.wildcard-secret-name
+  # and keycloak keeps its own per-host certificate — the controller never
+  # falls back to a default cert that does not cover this host.
+  - it: keeps per-host ACME for a custom host on dns01 when wildcard issuance is off
+    set:
+      ingress.host: auth.example.com
+      _cluster:
+        root-host: example.org
+        issuer-name: letsencrypt-prod
+        solver: dns01
+        expose-ingress: tenant-root
+        gateway-enabled: "false"
+    asserts:
+      - equal:
+          path: spec.rules[0].host
+          value: auth.example.com
+      - equal:
+          path: metadata.annotations["cert-manager.io/cluster-issuer"]
+          value: letsencrypt-prod
+      - equal:
+          path: spec.tls[0].secretName
+          value: web-tls
+
+  # WS2 / #2400 coverage tradeoff, pinned as a contract: once shared
+  # wildcard mode is active (_cluster.wildcard-secret-name set), a custom
+  # host outside *.<root-host> ALSO drops its per-host cert and falls back
+  # to the default SSL certificate, which does not cover it. This is the
+  # hazard the publishing.certificates.wildcard values.yaml caveat warns
+  # about and the reason issuance is opt-in / off by default. Pinning it
+  # keeps the tradeoff a conscious contract rather than an accident.
+  - it: custom host drops per-host ACME when wildcard mode is active
+    set:
+      ingress.host: auth.example.com
+      _cluster:
+        root-host: example.org
+        issuer-name: letsencrypt-prod
+        solver: dns01
+        expose-ingress: tenant-root
+        gateway-enabled: "false"
+        wildcard-secret-name: cozystack-wildcard-tls
+    asserts:
+      - equal:
+          path: spec.rules[0].host
+          value: auth.example.com
+      - notExists:
+          path: metadata.annotations["cert-manager.io/cluster-issuer"]
+      - notExists:
+          path: spec.tls[0].secretName
diff --git a/packages/system/keycloak/tests/login_theme_test.yaml b/packages/system/keycloak/tests/login_theme_test.yaml
new file mode 100644
index 0000000000..82b8a3edb7
--- /dev/null
+++ b/packages/system/keycloak/tests/login_theme_test.yaml
@@ -0,0 +1,93 @@
+suite: keycloak login theme via platform branding
+
+# branding.loginTheme + branding.loginThemeImage (delivered through
+# _cluster.branding in the cozystack-values Secret) must append a theme entry
+# to the effective theme list so the login theme image is mounted via an init
+# container without anyone editing this chart's values or the StatefulSet.
+release:
+  name: keycloak
+  namespace: cozy-keycloak
+tests:
+  - it: branding loginTheme + image adds a theme init container, volume and mount
+    template: templates/sts.yaml
+    documentSelector:
+      path: kind
+      value: StatefulSet
+    set:
+      _cluster:
+        root-host: example.com
+        cluster-domain: cozy.local
+        branding:
+          loginTheme: aenix
+          loginThemeImage: registry.example.com/aenix-keycloak-theme:v1
+    asserts:
+      - equal:
+          path: spec.template.spec.initContainers[0].name
+          value: theme-aenix
+      - equal:
+          path: spec.template.spec.initContainers[0].image
+          value: registry.example.com/aenix-keycloak-theme:v1
+      - contains:
+          path: spec.template.spec.volumes
+          content:
+            name: themes
+            emptyDir:
+              sizeLimit: 256Mi
+      - contains:
+          path: spec.template.spec.containers[0].volumeMounts
+          content:
+            name: themes
+            mountPath: /opt/keycloak/themes
+
+  - it: branding loginTheme without an image does not add an init container
+    template: templates/sts.yaml
+    documentSelector:
+      path: kind
+      value: StatefulSet
+    set:
+      _cluster:
+        root-host: example.com
+        cluster-domain: cozy.local
+        branding:
+          loginTheme: aenix
+    asserts:
+      - notExists:
+          path: spec.template.spec.initContainers
+
+  - it: no themes and no branding theme leaves the pod without theme machinery
+    template: templates/sts.yaml
+    documentSelector:
+      path: kind
+      value: StatefulSet
+    set:
+      _cluster:
+        root-host: example.com
+        cluster-domain: cozy.local
+    asserts:
+      - notExists:
+          path: spec.template.spec.initContainers
+      - notExists:
+          path: spec.template.spec.volumes
+
+  - it: explicit themes value still renders, with the branding theme appended after it
+    template: templates/sts.yaml
+    documentSelector:
+      path: kind
+      value: StatefulSet
+    set:
+      _cluster:
+        root-host: example.com
+        cluster-domain: cozy.local
+        branding:
+          loginTheme: aenix
+          loginThemeImage: registry.example.com/aenix-keycloak-theme:v1
+      themes:
+        - name: foo
+          image: registry.example.com/foo:1
+    asserts:
+      - equal:
+          path: spec.template.spec.initContainers[0].name
+          value: theme-foo
+      - equal:
+          path: spec.template.spec.initContainers[1].name
+          value: theme-aenix
diff --git a/packages/system/keycloak/tests/placement_test.yaml b/packages/system/keycloak/tests/placement_test.yaml
new file mode 100644
index 0000000000..d3ddad482e
--- /dev/null
+++ b/packages/system/keycloak/tests/placement_test.yaml
@@ -0,0 +1,127 @@
+suite: keycloak and proxy placement across failure domains
+templates:
+  - templates/sts.yaml
+  - templates/proxy.yaml
+
+release:
+  name: keycloak
+  namespace: cozy-keycloak
+
+set:
+  _cluster:
+    root-host: example.org
+    cluster-domain: cozy.local
+
+tests:
+  - it: leaves Keycloak placement to the scheduler by default
+    template: templates/sts.yaml
+    documentSelector:
+      path: kind
+      value: StatefulSet
+    asserts:
+      - notExists:
+          path: spec.template.spec.affinity
+      - notExists:
+          path: spec.template.spec.topologySpreadConstraints
+
+  - it: renders Keycloak affinity and spread constraints when set
+    template: templates/sts.yaml
+    documentSelector:
+      path: kind
+      value: StatefulSet
+    set:
+      affinity:
+        nodeAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            nodeSelectorTerms:
+              - matchExpressions:
+                  - key: topology.kubernetes.io/zone
+                    operator: In
+                    values: [zone-a, zone-b]
+      topologySpreadConstraints:
+        - maxSkew: 1
+          topologyKey: topology.kubernetes.io/zone
+          whenUnsatisfiable: DoNotSchedule
+          nodeTaintsPolicy: Honor
+          labelSelector:
+            matchLabels:
+              app: keycloak-ha
+    asserts:
+      - equal:
+          path: spec.template.spec.affinity.nodeAffinity.requiredDuringSchedulingIgnoredDuringExecution.nodeSelectorTerms[0].matchExpressions[0].values
+          value: [zone-a, zone-b]
+      - equal:
+          path: spec.template.spec.topologySpreadConstraints[0].nodeTaintsPolicy
+          value: Honor
+
+  - it: leaves proxy placement to the scheduler by default
+    template: templates/proxy.yaml
+    documentSelector:
+      path: kind
+      value: Deployment
+    set:
+      encryption.enabled: true
+    asserts:
+      - notExists:
+          path: spec.template.spec.affinity
+      - notExists:
+          path: spec.template.spec.topologySpreadConstraints
+
+  - it: renders proxy affinity and spread constraints when set
+    template: templates/proxy.yaml
+    documentSelector:
+      path: kind
+      value: Deployment
+    set:
+      encryption.enabled: true
+      encryption.affinity:
+        nodeAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            nodeSelectorTerms:
+              - matchExpressions:
+                  - key: topology.kubernetes.io/zone
+                    operator: In
+                    values: [zone-a, zone-b]
+      encryption.topologySpreadConstraints:
+        - maxSkew: 1
+          topologyKey: topology.kubernetes.io/zone
+          whenUnsatisfiable: DoNotSchedule
+          nodeTaintsPolicy: Honor
+          labelSelector:
+            matchLabels:
+              app: keycloak-kms-proxy
+    asserts:
+      - equal:
+          path: spec.template.spec.affinity.nodeAffinity.requiredDuringSchedulingIgnoredDuringExecution.nodeSelectorTerms[0].matchExpressions[0].values
+          value: [zone-a, zone-b]
+      - equal:
+          path: spec.template.spec.topologySpreadConstraints[0].whenUnsatisfiable
+          value: DoNotSchedule
+
+  # A single replica has nothing to keep available during a drain, and a
+  # PodDisruptionBudget on it would only block the drain.
+  - it: renders no disruption budget for a single proxy replica
+    template: templates/proxy.yaml
+    set:
+      encryption.enabled: true
+    asserts:
+      - hasDocuments:
+          count: 4
+
+  - it: keeps one proxy replica through voluntary disruptions when replicated
+    template: templates/proxy.yaml
+    documentSelector:
+      path: kind
+      value: PodDisruptionBudget
+    set:
+      encryption.enabled: true
+      encryption.replicas: 2
+      encryption.deksetSecretName: keycloak-kms-proxy-dekset
+    asserts:
+      - equal:
+          path: spec.maxUnavailable
+          value: 1
+      - equal:
+          path: spec.selector.matchLabels
+          value:
+            app: keycloak-kms-proxy
diff --git a/packages/system/keycloak/tests/standalone_render_test.yaml b/packages/system/keycloak/tests/standalone_render_test.yaml
new file mode 100644
index 0000000000..4dead168ca
--- /dev/null
+++ b/packages/system/keycloak/tests/standalone_render_test.yaml
@@ -0,0 +1,20 @@
+suite: keycloak renders with no platform values injected
+release:
+  name: keycloak
+  namespace: cozy-keycloak
+
+# The platform injects _cluster through the cozystack-values Secret, so every
+# case that sets it itself renders fine whether or not values.yaml declares
+# the key. This case supplies nothing. Drop the declaration from values.yaml
+# and the render dies on "index of untyped nil" before a single assert runs;
+# the declaration is the only thing keeping the chart renderable outside a
+# cluster. No suite-level `templates:` list here on purpose: it would narrow
+# the render to the listed files and let a later template reintroduce the
+# same breakage unseen.
+
+tests:
+  - it: still renders the statefulset and its secret when _cluster is absent
+    asserts:
+      - template: templates/sts.yaml
+        hasDocuments:
+          count: 2
diff --git a/packages/system/keycloak/values.yaml b/packages/system/keycloak/values.yaml
index 3534dd6ec5..282707dfa3 100644
--- a/packages/system/keycloak/values.yaml
+++ b/packages/system/keycloak/values.yaml
@@ -1,10 +1,47 @@
-image: quay.io/keycloak/keycloak:26.5.2
+# Injected by the platform from the cozystack-values Secret. The empty
+# default keeps the chart renderable on its own, outside a cluster.
+_cluster: {}
+
+image: quay.io/keycloak/keycloak:26.6.3
 
 ingress:
   # Custom hostname for the Keycloak Ingress.
   # If set, this value will be used as the Ingress hostname (e.g., "auth.example.com").
   # If left empty, defaults to "keycloak.<root-host>" based on the cluster root-host setting.
   host: ""
+  # Optional separate hostname for the Keycloak admin console (opt-in).
+  # When set (e.g., "keycloak-admin.example.com"):
+  #   - KC_HOSTNAME_ADMIN is configured so the admin console generates its
+  #     URLs on this hostname;
+  #   - the main `host` (login) route is narrowed to the public OIDC paths
+  #     (the published realms, /resources, /.well-known) only, so the admin
+  #     console and Administration REST API (/admin) are NOT served on the
+  #     login hostname;
+  #   - a dedicated Ingress/HTTPRoute for this hostname routes /  to Keycloak.
+  # The admin route attaches to the Gateway/ingressClass selected by the
+  # cluster-level expose-ingress-admin (defaults to expose-ingress). Point
+  # that at a separate, e.g. private-IP, Gateway to keep the admin console off
+  # the public internet. Note: KC_HOSTNAME_ADMIN alone is NOT a security
+  # boundary (admin REST stays reachable on any hostname routed to Keycloak);
+  # the network/path separation here is what restricts access.
+  # If left empty, the admin console stays on the main hostname (default).
+  adminHost: ""
+  # Realms published on the login hostname, in addition to the platform realm
+  # (authentication.oidc.realmName, default "cozy"), which is always published
+  # because every component's issuer URL points at it.
+  #
+  # A realm not named here is not routed in from outside the cluster once
+  # adminHost is set — that is the point, and master is refused outright, since
+  # its token endpoint accepts super-admin credentials. Without adminHost the
+  # login route still serves "/", master and /admin included; this list is
+  # validated but does not narrow anything until then.
+  #
+  # List a realm a deployment serves to its users beyond the platform one, e.g.
+  # a back-office realm whose issuer URL lives on this hostname:
+  #   exposedRealms: [cozy-admin]
+  # On the Gateway API route each realm takes two of the 64 path matches a rule
+  # holds, so at most 30 entries fit here beside the platform realm.
+  exposedRealms: []
   annotations:
     nginx.ingress.kubernetes.io/affinity: "cookie"
     nginx.ingress.kubernetes.io/session-cookie-expires: "86400"
@@ -21,8 +58,33 @@ themes: []
 # Theme images must contain theme files under /themes/ directory.
 # Each theme is copied into Keycloak's /opt/keycloak/themes/ via init container.
 # If multiple themes contain files with the same path, later entries take precedence.
+#
+# In addition to this explicit list, a single login theme can be shipped through
+# platform branding values: setting branding.loginTheme (the theme name) together
+# with branding.loginThemeImage (the OCI image carrying it under /themes/) appends
+# an entry here automatically and selects it as the realm login theme. branding
+# arrives via _cluster.branding, so no per-package values plumbing is required.
 
 imagePullSecrets: []
+
+# Placement of the Keycloak pods. Empty leaves it to the scheduler, which is
+# free to put both replicas in one failure domain; a StatefulSet does not
+# replace a pod stuck on an unreachable node, so that domain's loss then takes
+# every replica with it. Example spreading one replica per zone:
+#
+#   topologySpreadConstraints:
+#     - maxSkew: 1
+#       topologyKey: topology.kubernetes.io/zone
+#       whenUnsatisfiable: DoNotSchedule
+#       # Leave out nodes the pod cannot run on (an unreachable zone carries
+#       # the unreachable NoSchedule taint), so the constraint does not count
+#       # a lost zone as a domain the replacement pod must balance against.
+#       nodeTaintsPolicy: Honor
+#       labelSelector:
+#         matchLabels:
+#           app: keycloak-ha
+affinity: {}
+topologySpreadConstraints: []
 # - name: my-registry-secret
 
 # Extra environment variables to inject into the Keycloak container.
@@ -39,3 +101,163 @@ extraEnv: []
 #     secretKeyRef:
 #       name: my-secret
 #       key: my-key
+
+# Transparent column-level PII encryption for the Keycloak database.
+# When enabled, a keycloak-kms-proxy Deployment is placed on the wire
+# between Keycloak and its CloudNativePG database: Keycloak's DB endpoint
+# is repointed at the proxy, which encrypts designated PII columns on
+# writes and decrypts them on reads. The data-encryption key is wrapped by
+# a KMS, so it never lives inside PostgreSQL.
+# Project: https://github.com/cozystack/keycloak-kms-proxy
+#
+# OPERATIONAL CAVEATS — read before enabling:
+#   * Availability downgrade. The proxy runs as a single replica (HA needs a
+#     shared wrapped DEK set, tracked as a follow-up). Keycloak itself runs HA
+#     (2 replicas); with encryption on, both replicas funnel their DB traffic
+#     through this one pod, so any proxy restart — node drain, rollout, image
+#     pull, OOM — briefly drops the database connection for the entire IdP.
+#   * Existing data is NOT migrated automatically. Flipping enabled:true on a
+#     populated database leaves the pre-existing PII as plaintext; logins that
+#     match on the deterministic columns (username/email) then fail until the
+#     offline backfill has run. Disabling later is just as unsafe — Keycloak
+#     would point back at CNPG and read ciphertext directly. Off-by-default only
+#     protects FRESH installs. To enable on an existing install, run the backfill
+#     procedure first:
+#     https://github.com/cozystack/keycloak-kms-proxy/blob/main/docs/migration-existing-keycloak.md
+#   * Static KEK = single point of permanent data loss. With kms.backend=static
+#     the KEK is generated once and kept in the keycloak-kms-proxy-kek Secret
+#     (in etcd, next to the DB credentials — "static" trades some at-rest
+#     protection for zero external dependencies). If that Secret is ever lost,
+#     every previously-encrypted value becomes permanently undecryptable, so it
+#     MUST be part of the backup set. For production prefer kms.backend=vault-transit.
+encryption:
+  enabled: false
+  image: ghcr.io/cozystack/keycloak-kms-proxy:0.2.3@sha256:6ad52ca209b31afe0fb118ca5c2ada418ec22c16a20c5153003c954d9bb54e8e
+  # Encrypted field set: "" = full default set (username, email, names,
+  # PII attributes, credentials), "email-only", or "disabled" (passthrough).
+  fields: ""
+  # Bootstrap window only: downgrades fail-loud rules to passthrough so the
+  # Keycloak Liquibase migrations can complete. MUST be false in steady state.
+  lenient: false
+  # Number of proxy replicas. >1 requires deksetSecretName (a shared wrapped
+  # DEK set) so every replica encrypts deterministic columns under one key.
+  replicas: 1
+  # Placement of the proxy pods, same shape as the top-level affinity and
+  # topologySpreadConstraints (the label is app: keycloak-kms-proxy). With more
+  # than one replica a PodDisruptionBudget keeps one of them up through drains.
+  affinity: {}
+  topologySpreadConstraints: []
+  # Existing Secret holding the wrapped DEK set (dekset.json) minted by the
+  # proxy's backfill tool (`cmd/backfill generate-dekset`). REQUIRED to migrate
+  # an existing populated database — the proxy must reuse the DEK the backfill
+  # encrypted rows with — and to run more than one replica. When empty the proxy
+  # mints an ephemeral DEK at startup, which is only safe on a fresh, empty DB.
+  deksetSecretName: ""
+  deksetSecretKey: dekset.json
+  kms:
+    # "static" — a self-generated 32-byte KEK kept in a Secret (works on any
+    # cluster, suitable for evaluation). "vault-transit" — the KEK lives in
+    # HashiCorp Vault (recommended for production; supports KEK rotation).
+    backend: static
+    vault:
+      address: ""       # e.g. https://vault.vault.svc:8200
+      keyName: ""       # Transit key name
+      mount: transit    # Transit mount path
+      # Vault authentication mode:
+      #   "kubernetes" — the proxy logs in with its own ServiceAccount token
+      #     (RECOMMENDED: no credential is stored; the kubelet rotates the token).
+      #   "approle" — the proxy logs in via AppRole and re-authenticates on demand.
+      #   "token" — a long-lived Vault token in a Secret.
+      auth: token
+      # token auth: existing Secret holding the Vault token under key "token".
+      tokenSecretName: ""
+      # kubernetes auth: bind the Vault role to the proxy's dedicated
+      # ServiceAccount — system:serviceaccount:<namespace>:keycloak-kms-proxy
+      # (created by this chart). No Secret is needed; the SA token is mounted
+      # into the proxy pod only in this mode.
+      kubernetes:
+        role: ""                # Vault Kubernetes auth role
+        mount: kubernetes       # Kubernetes auth mount path
+      # approle auth: existing Secret holding the AppRole role id and secret id.
+      appRole:
+        mount: approle          # AppRole auth mount path
+        secretName: ""          # Secret with the role id / secret id
+        roleIdKey: role-id      # key in secretName holding the role id
+        secretIdKey: secret-id  # key in secretName holding the secret id
+      # CA to trust when Vault is served over HTTPS by a private CA — as an
+      # inline PEM (the chart renders the Secret and rolls the pods when it
+      # changes) or as a Secret seeded beforehand. Exactly one key of that
+      # Secret is mounted; caSecretKey names it. Rotating a pre-seeded Secret
+      # needs a manual `kubectl rollout restart deploy/keycloak-kms-proxy`,
+      # because the chart cannot see its contents.
+      #
+      # The Vault leg then trusts this CA and nothing else — the public roots in
+      # the proxy image are excluded. The database leg is unaffected either way:
+      # it never consults the system trust store.
+      #
+      # caBundle and caSecretName are mutually exclusive, and both are ignored
+      # unless kms.backend=vault-transit.
+      caBundle: ""
+      caSecretName: ""
+      caSecretKey: ca.crt      # key of caSecretName holding the PEM bundle
+  resources:
+    requests:
+      memory: 128Mi
+      cpu: 50m
+    limits:
+      memory: 256Mi
+
+# Placement of the keycloak-db instances (the CloudNativePG Cluster). Empty leaves
+# it to the scheduler, which is free to put both instances in one failure domain:
+# losing that domain then loses the database and every login with it. `affinity`
+# takes the CloudNativePG affinity shape (nodeAffinity, podAntiAffinityType, ...),
+# `topologySpreadConstraints` the Kubernetes one; the labelSelector for
+# cnpg.io/cluster: keycloak-db is added to each constraint that has none. When
+# topologySpreadConstraints is set it replaces the cluster-wide
+# _cluster.scheduling.globalAppTopologySpreadConstraints for this database.
+# Example, one instance per zone on nodes of two zones only:
+#
+#   database:
+#     affinity:
+#       nodeAffinity:
+#         requiredDuringSchedulingIgnoredDuringExecution:
+#           nodeSelectorTerms:
+#             - matchExpressions:
+#                 - key: topology.kubernetes.io/zone
+#                   operator: In
+#                   values: [zone-a, zone-b]
+#     topologySpreadConstraints:
+#       - maxSkew: 1
+#         topologyKey: topology.kubernetes.io/zone
+#         whenUnsatisfiable: DoNotSchedule
+#         nodeTaintsPolicy: Honor
+#
+# Placement applies to instances created from now on; CloudNativePG does not
+# move a running instance, so an existing cluster has to be rebuilt one instance
+# at a time (scale out, then remove the misplaced one).
+database:
+  affinity: {}
+  topologySpreadConstraints: []
+
+# Scheduled S3 backup of the Keycloak CNPG database (keycloak-db).
+# Disabled by default; enabling it configures WAL archiving + base backups
+# to an S3-compatible object store via CNPG Barman.
+backup:
+  # Enable S3 backups for keycloak-db.
+  enabled: false
+  # Cron schedule for recurring base backups. NOTE: CNPG ScheduledBackup uses a
+  # 6-field cron (leading seconds field), not the 5-field Kubernetes format.
+  schedule: "0 0 2 * * *"
+  # Barman retention policy for stored backups.
+  retentionPolicy: "30d"
+  # Destination prefix, e.g. s3://bucket/keycloak-db/.
+  destinationPath: ""
+  # S3-compatible endpoint URL, e.g. https://s3.example.com.
+  endpointURL: ""
+  # Inline S3 credentials (rendered into keycloak-db-backup-s3-creds), or
+  # leave empty and set existingSecretName instead.
+  s3AccessKey: ""
+  s3SecretKey: ""
+  # Reference an existing Secret carrying AWS_ACCESS_KEY_ID /
+  # AWS_SECRET_ACCESS_KEY instead of inline keys.
+  existingSecretName: ""
diff --git a/packages/system/kilo/Makefile b/packages/system/kilo/Makefile
index d9016c1c22..47eabe1431 100644
--- a/packages/system/kilo/Makefile
+++ b/packages/system/kilo/Makefile
@@ -4,6 +4,9 @@ export NAMESPACE=cozy-$(NAME)
 include ../../../hack/common-envs.mk
 include ../../../hack/package.mk
 
+test:
+	helm unittest .
+
 update:
 	sha=$$(git ls-remote https://github.com/squat/kilo refs/heads/main | awk '{print $$1}') && \
 	sed -i "/ARG VERSION/ s|=.*|=$${sha}|g" images/kilo/Dockerfile
@@ -11,8 +14,7 @@ update:
 image:
 	docker buildx build images/kilo \
 		$(call image-tags,kilo,v$(COZYSTACK_VERSION)) \
-		--cache-from type=registry,ref=$(REGISTRY)/kilo:latest \
-		--cache-to type=inline \
+		$(call cache-args,kilo) \
 		--metadata-file images/kilo.json \
 		$(BUILDX_ARGS)
 	REPOSITORY="$(REGISTRY)/kilo" \
diff --git a/packages/system/kilo/images/kilo/Dockerfile b/packages/system/kilo/images/kilo/Dockerfile
index 101863f7c4..d2fe0af7d8 100644
--- a/packages/system/kilo/images/kilo/Dockerfile
+++ b/packages/system/kilo/images/kilo/Dockerfile
@@ -1,7 +1,8 @@
 # Build the kg binary
-FROM --platform=$BUILDPLATFORM golang:1.25 AS builder
+FROM --platform=$BUILDPLATFORM golang:1.27@sha256:3680233e3204827fbdc66088528ae6d4b3d034f51d03a99d454f6de034888244 AS builder
+ARG GOPROXY
 
-ARG VERSION=fbce60d8033da073748f5b0d6ce0f1e216f03e7f
+ARG VERSION=944dff5745d747c06555a964c2137b9a986ff6ec
 ARG TARGETOS
 ARG TARGETARCH
 
@@ -12,6 +13,17 @@ RUN curl -sSL https://github.com/squat/kilo/archive/${VERSION}.tar.gz | tar -xzv
 COPY patches /patches
 RUN git apply /patches/*.diff
 
+# go build never compiles a _test.go, so nothing else runs the tests of the
+# packages the patches touch. Each package is tested from its own directory:
+# that finds the module it belongs to, and an empty list runs nothing.
+# The list is read into a variable first: a for loop drops the exit status
+# of a command substitution, so a patch git cannot read would leave the list
+# empty and the step green.
+RUN files=$(git apply --numstat /patches/*.diff) || exit 1; \
+    for dir in $(printf '%s\n' "$files" | cut -f3 | grep '\.go$' | xargs -r -n1 dirname | sort -u); do \
+      (cd "$dir" && go test .) || exit 1; \
+    done
+
 RUN GOOS=$TARGETOS GOARCH=$TARGETARCH CGO_ENABLED=0 go build \
     -trimpath \
     -ldflags "-X github.com/squat/kilo/pkg/version.Version=${VERSION}" \
@@ -23,14 +35,14 @@ RUN GOOS=$TARGETOS GOARCH=$TARGETARCH CGO_ENABLED=0 go build \
     -a -o kgctl ./cmd/kgctl
 
 # Download CNI plugins
-FROM alpine:3.23 AS cni
+FROM alpine:3.24@sha256:294b683cb724975bec92580e1e685676bd4b50bda910ddb8c51d4cabeaec77e6 AS cni
 ARG TARGETARCH
-ARG CNI_PLUGINS_VERSION=v1.9.0
+ARG CNI_PLUGINS_VERSION=v1.9.1
 RUN apk add --no-cache curl && \
     curl -Lo cni.tar.gz https://github.com/containernetworking/plugins/releases/download/$CNI_PLUGINS_VERSION/cni-plugins-linux-$TARGETARCH-$CNI_PLUGINS_VERSION.tgz && \
     tar -xf cni.tar.gz
 
-FROM alpine:3.23
+FROM alpine:3.24@sha256:294b683cb724975bec92580e1e685676bd4b50bda910ddb8c51d4cabeaec77e6
 RUN apk add --no-cache ipset iptables ip6tables graphviz font-noto
 COPY --from=cni bridge host-local loopback portmap /opt/cni/bin/
 ADD https://raw.githubusercontent.com/kubernetes-sigs/iptables-wrappers/e139a115350974aac8a82ec4b815d2845f86997e/iptables-wrapper-installer.sh /
diff --git a/packages/system/kilo/tests/kilo_test.yaml b/packages/system/kilo/tests/kilo_test.yaml
new file mode 100644
index 0000000000..d9d311b49b
--- /dev/null
+++ b/packages/system/kilo/tests/kilo_test.yaml
@@ -0,0 +1,79 @@
+suite: kilo DaemonSet image pin and mesh-arg wiring
+
+# Pins the surface this package owns on top of the vendored squat/kilo binary:
+#   - the kilo DaemonSet pulls the first-party image from the cozystack
+#     registry (repository is the load-bearing ref re-pinned by `make image`);
+#   - the default mesh args (location granularity, transit subnet, auto MTU,
+#     cni disabled, crosssubnet encapsulation) render as the kg binary expects;
+#   - meshGranularity plumbs through verbatim, including the `cross` value that
+#     the in-repo feat-add-cross-mesh-granularity.diff teaches the image to
+#     accept (the chart passes it straight to --mesh-granularity);
+#   - the cilium compatibility overlay adds --compatibility=cilium, and the
+#     default render carries no --compatibility arg.
+
+templates:
+  - templates/kilo.yaml
+
+tests:
+  - it: "DaemonSet pulls the first-party kilo image from the cozystack registry"
+    asserts:
+      - isKind:
+          of: DaemonSet
+      - matchRegex:
+          path: spec.template.spec.containers[0].image
+          pattern: "^ghcr\\.io/cozystack/cozystack/kilo:"
+
+  - it: "default mesh args render as the kg binary expects"
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: "--cni=false"
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: "--encapsulate=crosssubnet"
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: "--mesh-granularity=location"
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: "--subnet=100.66.0.0/16"
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: "--mtu=auto"
+
+  - it: "meshGranularity=cross plumbs through to the patched binary"
+    set:
+      kilo:
+        meshGranularity: cross
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: "--mesh-granularity=cross"
+
+  - it: "cilium compatibility overlay adds --compatibility=cilium"
+    set:
+      kilo:
+        compatibility: cilium
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: "--compatibility=cilium"
+
+  - it: "no --compatibility arg in the default render"
+    asserts:
+      # Anchor the index before asserting on it. A negative assert passes
+      # whenever its path resolves to something that does not match, and a
+      # different container at [0] qualifies — as does an index resolving to
+      # nothing at all — so without this the guard goes green if a sidecar is
+      # ever placed ahead of kilo.
+      - equal:
+          path: spec.template.spec.containers[0].name
+          value: kilo
+      # Match the flag name per element, not one whole element against one
+      # value: contains and notContains compare elements for equality, and the
+      # chart renders --compatibility=<value> off a single values key, so an
+      # equality check against the cilium value leaves every other value
+      # unforbidden.
+      - notMatchRegex:
+          path: spec.template.spec.containers[0].args[*]
+          pattern: "^--compatibility"
diff --git a/packages/system/kilo/values.yaml b/packages/system/kilo/values.yaml
index 9645fba940..56dae259f4 100644
--- a/packages/system/kilo/values.yaml
+++ b/packages/system/kilo/values.yaml
@@ -1,7 +1,7 @@
 kilo:
   image:
     pullPolicy: IfNotPresent
-    tag: latest@sha256:016d054fcbb31d77ecfc8a0e7ead9f8cc01fb2f5a12b619d4fb0b7d745414df0
+    tag: v1.5.0@sha256:fe837f428504f6c6e9e4582326a3bf9cd507a9cca58c975952f5cc0b34728f63
     repository: ghcr.io/cozystack/cozystack/kilo
   transitCIDR: 100.66.0.0/16
   meshGranularity: location
diff --git a/packages/system/kubeovn-plunger/Makefile b/packages/system/kubeovn-plunger/Makefile
index d72e1ae11d..a53311b423 100644
--- a/packages/system/kubeovn-plunger/Makefile
+++ b/packages/system/kubeovn-plunger/Makefile
@@ -6,14 +6,10 @@ include ../../../hack/package.mk
 
 image:
 	docker buildx build -f images/kubeovn-plunger/Dockerfile ../../../ \
-		--provenance false \
 		$(call image-tags,kubeovn-plunger,v$(COZYSTACK_VERSION)) \
-		--cache-from type=registry,ref=$(REGISTRY)/kubeovn-plunger:latest \
-		--cache-to type=inline \
+		$(call cache-args,kubeovn-plunger) \
 		--metadata-file images/kubeovn-plunger.json \
-		--push=$(PUSH) \
-		--label "org.opencontainers.image.source=https://github.com/cozystack/cozystack" \
-		--load=$(LOAD)
+		$(BUILDX_ARGS)
 	IMAGE="$(REGISTRY)/kubeovn-plunger:$(IMAGE_TAG)@$$(yq e '."containerimage.digest"' images/kubeovn-plunger.json -o json -r)" \
 		yq -i '.image = strenv(IMAGE)' values.yaml
 	rm -f images/kubeovn-plunger.json
diff --git a/packages/system/kubeovn-plunger/images/kubeovn-plunger/Dockerfile b/packages/system/kubeovn-plunger/images/kubeovn-plunger/Dockerfile
index 7882503f58..84e67a2c61 100644
--- a/packages/system/kubeovn-plunger/images/kubeovn-plunger/Dockerfile
+++ b/packages/system/kubeovn-plunger/images/kubeovn-plunger/Dockerfile
@@ -1,4 +1,5 @@
-FROM golang:1.26-alpine AS builder
+FROM --platform=$BUILDPLATFORM golang:1.27-alpine@sha256:8a5910f31396cd4d89662f56c68b3ae31d374308270a1c3bd96672ee5ed43414 AS builder
+ARG GOPROXY
 
 ARG TARGETOS
 ARG TARGETARCH
@@ -6,7 +7,7 @@ ARG TARGETARCH
 WORKDIR /workspace
 
 COPY go.mod go.sum ./
-RUN GOOS=$TARGETOS GOARCH=$TARGETARCH go mod download
+RUN for attempt in 1 2 3; do GOOS=$TARGETOS GOARCH=$TARGETARCH go mod download && break; [ "$attempt" = 3 ] && exit 1; sleep $((attempt * 10)); done
 
 COPY pkg pkg/
 COPY cmd cmd/
diff --git a/packages/system/kubeovn-plunger/values.yaml b/packages/system/kubeovn-plunger/values.yaml
index e23d6e3482..9610d7cfd9 100644
--- a/packages/system/kubeovn-plunger/values.yaml
+++ b/packages/system/kubeovn-plunger/values.yaml
@@ -1,4 +1,4 @@
 portSecurity: true
 routes: ""
-image: ghcr.io/cozystack/cozystack/kubeovn-plunger:v1.4.0-rc.2@sha256:88ef096b87f723122bbb4c362c8ad4022af30eb2c063dfa8ff9ea0166599bdf6
+image: ghcr.io/cozystack/cozystack/kubeovn-plunger:v1.6.0@sha256:0d2a42d5aa05f73e9a5bab2ffbcf20c64e2925b7b5f50d7b39b7d366a1d8f3d6
 ovnCentralName: ovn-central
diff --git a/packages/system/kubeovn-webhook/.gitignore b/packages/system/kubeovn-webhook/.gitignore
new file mode 100644
index 0000000000..31816768e0
--- /dev/null
+++ b/packages/system/kubeovn-webhook/.gitignore
@@ -0,0 +1,2 @@
+images/kubeovn-webhook/kube-ovn-webhook
+images/kubeovn-webhook/webhook
diff --git a/packages/system/kubeovn-webhook/Makefile b/packages/system/kubeovn-webhook/Makefile
index 43138637c4..a02c2d6994 100644
--- a/packages/system/kubeovn-webhook/Makefile
+++ b/packages/system/kubeovn-webhook/Makefile
@@ -7,10 +7,22 @@ include ../../../hack/package.mk
 image:
 	docker buildx build images/kubeovn-webhook \
 		$(call image-tags,kubeovn-webhook,v$(COZYSTACK_VERSION)) \
-		--cache-from type=registry,ref=$(REGISTRY)/kubeovn-webhook:latest \
-		--cache-to type=inline \
+		$(call cache-args,kubeovn-webhook) \
 		--metadata-file images/kubeovn-webhook.json \
 		$(BUILDX_ARGS)
 	IMAGE="$(REGISTRY)/kubeovn-webhook:$(IMAGE_TAG)@$$(yq e '."containerimage.digest"' images/kubeovn-webhook.json -o json -r)" \
 		yq -i '.image = strenv(IMAGE)' values.yaml
 	rm -f images/kubeovn-webhook.json
+
+# hack/helm-unit-tests.sh discovers suites by probing `make -n test` per package
+# and SKIPS any package that has no such target. This package carried three
+# suites under tests/ that consequently never ran in CI -- including the port
+# agreement guard, whose whole purpose is to catch a drift that fails open.
+# Declared phony because hack/package.mk's .PHONY line does not carry `test`:
+# without this a path named `test` next to the Makefile would make the target
+# up to date and skip the recipe, which is the same fail-open shape the port
+# guard below exists for. hack/helm-unit-tests.sh detects that case after the
+# fact; this prevents it here.
+.PHONY: test
+test:
+	helm unittest .
diff --git a/packages/system/kubeovn-webhook/images/kubeovn-webhook/Dockerfile b/packages/system/kubeovn-webhook/images/kubeovn-webhook/Dockerfile
index 8897f2b9cd..928d6ad4a8 100644
--- a/packages/system/kubeovn-webhook/images/kubeovn-webhook/Dockerfile
+++ b/packages/system/kubeovn-webhook/images/kubeovn-webhook/Dockerfile
@@ -1,16 +1,17 @@
-FROM golang:1.26 AS builder
+FROM --platform=$BUILDPLATFORM golang:1.27@sha256:3680233e3204827fbdc66088528ae6d4b3d034f51d03a99d454f6de034888244 AS builder
+ARG GOPROXY
 
 ARG TARGETOS
 ARG TARGETARCH
 
 WORKDIR /app
 COPY go.mod go.sum ./
-RUN GOOS=$TARGETOS GOARCH=$TARGETARCH go mod download
+RUN for attempt in 1 2 3; do GOOS=$TARGETOS GOARCH=$TARGETARCH go mod download && break; [ "$attempt" = 3 ] && exit 1; sleep $((attempt * 10)); done
 
 COPY . .
 RUN GOOS=$TARGETOS GOARCH=$TARGETARCH CGO_ENABLED=0 go build -o webhook .
 
-FROM alpine:3.21.3
+FROM alpine:3.24@sha256:294b683cb724975bec92580e1e685676bd4b50bda910ddb8c51d4cabeaec77e6
 WORKDIR /app
 
 COPY --from=builder /app/webhook /app/webhook
diff --git a/packages/system/kubeovn-webhook/images/kubeovn-webhook/admission.go b/packages/system/kubeovn-webhook/images/kubeovn-webhook/admission.go
index 6f037b06ac..ad97a69c3e 100644
--- a/packages/system/kubeovn-webhook/images/kubeovn-webhook/admission.go
+++ b/packages/system/kubeovn-webhook/images/kubeovn-webhook/admission.go
@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"io"
 	"log"
+	"maps"
 	"net/http"
 
 	admissionv1 "k8s.io/api/admission/v1"
@@ -70,9 +71,7 @@ func HandleMutatePods(w http.ResponseWriter, r *http.Request) {
 
 	mergedAnnotations := map[string]string{}
 	if pod.Annotations != nil {
-		for k, v := range pod.Annotations {
-			mergedAnnotations[k] = v
-		}
+		maps.Copy(mergedAnnotations, pod.Annotations)
 	}
 
 	nsRoutes, nsHasRoutes := nsAnnotations[AnnotationRoutes]
diff --git a/packages/system/kubeovn-webhook/images/kubeovn-webhook/cert.go b/packages/system/kubeovn-webhook/images/kubeovn-webhook/cert.go
new file mode 100644
index 0000000000..c088189fff
--- /dev/null
+++ b/packages/system/kubeovn-webhook/images/kubeovn-webhook/cert.go
@@ -0,0 +1,53 @@
+package main
+
+import "crypto/tls"
+
+// newReloadingTLSConfig returns a tls.Config that reloads the certificate and
+// key from disk on every TLS handshake, so a cert-manager renewal of the mounted
+// Secret is picked up by the running process without a restart.
+//
+// Without this, the key pair is read exactly once at startup and cached for the
+// lifetime of the process: after the certificate expires (roughly one year after
+// install) the pod keeps presenting the expired certificate, the kube-apiserver's
+// TLS call to the webhook fails, and because the MutatingWebhookConfiguration uses
+// failurePolicy: Fail, every pod creation in tenant namespaces is rejected.
+//
+// tls.Config.GetCertificate is invoked on every handshake whenever Certificates is
+// left unset, so re-reading the files there is enough; no watcher, mtime tracking
+// or cache is needed:
+//   - The cert/key files are mounted from a plain Secret volume with no subPath.
+//     Kubernetes' atomic writer swaps the whole ..data directory via a single
+//     symlink flip, so a reader always sees a complete old or complete new
+//     generation of both files, never a torn mid-write mixture. A per-handshake
+//     LoadX509KeyPair therefore cannot observe a partial renewal.
+//   - The per-handshake cost (a few KB of file I/O plus a PEM/key parse) is
+//     negligible next to the asymmetric crypto the handshake already performs.
+//   - GetCertificate refreshes the serving key pair only. It does not refresh
+//     tls.Config.ClientCAs, which the handshake reads directly. When
+//     --client-ca-file is set, main reads that bundle once at startup and the
+//     pool stays fixed for the process lifetime: rotating the API server's
+//     client CA then requires restarting these pods, or the webhook keeps
+//     validating against the retired CA and rejects the API server. With
+//     failurePolicy: Fail that stops pod creation cluster-wide, so reloading
+//     the pool has to land together with the mount that makes enforcement
+//     reachable at all -- neither is usable without the other, and today
+//     --client-ca-file has no supported in-pod path to point at.
+//
+// If the mounted files genuinely become unreadable (Secret deleted, permissions
+// broken: an operator error, not a normal renewal) the handshake fails loudly
+// rather than silently serving a stale certificate.
+func newReloadingTLSConfig(certFile, keyFile string) (*tls.Config, error) {
+	// Fail fast at startup if the initial key pair is missing or malformed.
+	if _, err := tls.LoadX509KeyPair(certFile, keyFile); err != nil {
+		return nil, err
+	}
+	return &tls.Config{
+		GetCertificate: func(*tls.ClientHelloInfo) (*tls.Certificate, error) {
+			cert, err := tls.LoadX509KeyPair(certFile, keyFile)
+			if err != nil {
+				return nil, err
+			}
+			return &cert, nil
+		},
+	}, nil
+}
diff --git a/packages/system/kubeovn-webhook/images/kubeovn-webhook/cert_test.go b/packages/system/kubeovn-webhook/images/kubeovn-webhook/cert_test.go
new file mode 100644
index 0000000000..2d39fe5999
--- /dev/null
+++ b/packages/system/kubeovn-webhook/images/kubeovn-webhook/cert_test.go
@@ -0,0 +1,139 @@
+package main
+
+import (
+	"crypto/ecdsa"
+	"crypto/elliptic"
+	"crypto/rand"
+	"crypto/tls"
+	"crypto/x509"
+	"crypto/x509/pkix"
+	"encoding/pem"
+	"math/big"
+	"os"
+	"path/filepath"
+	"testing"
+	"time"
+)
+
+// genSelfSigned returns a PEM-encoded self-signed cert/key pair carrying the given
+// serial number, so tests can tell two generations of the certificate apart.
+func genSelfSigned(t *testing.T, serial int64) (certPEM, keyPEM []byte) {
+	t.Helper()
+
+	key, err := ecdsa.GenerateKey(elliptic.P256(), rand.Reader)
+	if err != nil {
+		t.Fatalf("generate key: %v", err)
+	}
+
+	tmpl := &x509.Certificate{
+		SerialNumber:          big.NewInt(serial),
+		Subject:               pkix.Name{CommonName: "kube-ovn-webhook-test"},
+		NotBefore:             time.Now().Add(-time.Hour),
+		NotAfter:              time.Now().Add(time.Hour),
+		KeyUsage:              x509.KeyUsageDigitalSignature,
+		ExtKeyUsage:           []x509.ExtKeyUsage{x509.ExtKeyUsageServerAuth},
+		DNSNames:              []string{"localhost"},
+		BasicConstraintsValid: true,
+	}
+
+	der, err := x509.CreateCertificate(rand.Reader, tmpl, tmpl, &key.PublicKey, key)
+	if err != nil {
+		t.Fatalf("create certificate: %v", err)
+	}
+	keyDER, err := x509.MarshalPKCS8PrivateKey(key)
+	if err != nil {
+		t.Fatalf("marshal key: %v", err)
+	}
+
+	certPEM = pem.EncodeToMemory(&pem.Block{Type: "CERTIFICATE", Bytes: der})
+	keyPEM = pem.EncodeToMemory(&pem.Block{Type: "PRIVATE KEY", Bytes: keyDER})
+	return certPEM, keyPEM
+}
+
+// writeKeyPair writes the cert/key files and sets their mtime, mirroring how
+// cert-manager replaces the mounted Secret on renewal.
+func writeKeyPair(t *testing.T, certFile, keyFile string, certPEM, keyPEM []byte, mtime time.Time) {
+	t.Helper()
+	if err := os.WriteFile(certFile, certPEM, 0o600); err != nil {
+		t.Fatalf("write cert: %v", err)
+	}
+	if err := os.WriteFile(keyFile, keyPEM, 0o600); err != nil {
+		t.Fatalf("write key: %v", err)
+	}
+	setModTime(t, certFile, mtime)
+	setModTime(t, keyFile, mtime)
+}
+
+func setModTime(t *testing.T, name string, mtime time.Time) {
+	t.Helper()
+	if err := os.Chtimes(name, mtime, mtime); err != nil {
+		t.Fatalf("chtimes %s: %v", name, err)
+	}
+}
+
+// servedSerial completes a TLS handshake against addr and returns the serial number
+// of the leaf certificate the server actually presented.
+func servedSerial(t *testing.T, addr string) int64 {
+	t.Helper()
+	conn, err := tls.Dial("tcp", addr, &tls.Config{InsecureSkipVerify: true}) //nolint:gosec // test-only, inspecting the served cert
+	if err != nil {
+		t.Fatalf("dial: %v", err)
+	}
+	defer conn.Close()
+	certs := conn.ConnectionState().PeerCertificates
+	if len(certs) == 0 {
+		t.Fatalf("server presented no certificate")
+	}
+	return certs[0].SerialNumber.Int64()
+}
+
+// TestReloadingTLSConfigServesRenewedCertificate is the core regression test: it fails
+// against the old code that loads the key pair once into tls.Config.Certificates, and
+// passes once the certificate is served via a reloading GetCertificate callback.
+func TestReloadingTLSConfigServesRenewedCertificate(t *testing.T) {
+	dir := t.TempDir()
+	certFile := filepath.Join(dir, "tls.crt")
+	keyFile := filepath.Join(dir, "tls.key")
+
+	certA, keyA := genSelfSigned(t, 1)
+	writeKeyPair(t, certFile, keyFile, certA, keyA, time.Now().Add(-2*time.Second))
+
+	tlsConfig, err := newReloadingTLSConfig(certFile, keyFile)
+	if err != nil {
+		t.Fatalf("newReloadingTLSConfig: %v", err)
+	}
+
+	ln, err := tls.Listen("tcp", "127.0.0.1:0", tlsConfig)
+	if err != nil {
+		t.Fatalf("listen: %v", err)
+	}
+	defer ln.Close()
+	go func() {
+		for {
+			conn, err := ln.Accept()
+			if err != nil {
+				return
+			}
+			go func() {
+				if tc, ok := conn.(*tls.Conn); ok {
+					_ = tc.Handshake()
+				}
+				conn.Close()
+			}()
+		}
+	}()
+
+	addr := ln.Addr().String()
+
+	if got := servedSerial(t, addr); got != 1 {
+		t.Fatalf("before renewal: expected serial 1, got %d", got)
+	}
+
+	// cert-manager renews the Secret: the mounted files are replaced in place.
+	certB, keyB := genSelfSigned(t, 2)
+	writeKeyPair(t, certFile, keyFile, certB, keyB, time.Now().Add(2*time.Second))
+
+	if got := servedSerial(t, addr); got != 2 {
+		t.Fatalf("after renewal: expected renewed serial 2, got %d (certificate was not reloaded)", got)
+	}
+}
diff --git a/packages/system/kubeovn-webhook/images/kubeovn-webhook/go.mod b/packages/system/kubeovn-webhook/images/kubeovn-webhook/go.mod
index d8b4a75477..76b523fc68 100644
--- a/packages/system/kubeovn-webhook/images/kubeovn-webhook/go.mod
+++ b/packages/system/kubeovn-webhook/images/kubeovn-webhook/go.mod
@@ -1,46 +1,60 @@
 module kube-ovn-webhook
 
-go 1.26.2
+go 1.27.1
 
 require (
 	github.com/mattbaird/jsonpatch v0.0.0-20240118010651-0ba75a80ca38
-	k8s.io/api v0.26.0
-	k8s.io/apimachinery v0.26.0
-	k8s.io/client-go v0.26.0
+	k8s.io/api v0.36.2
+	k8s.io/apimachinery v0.36.2
+	k8s.io/client-go v0.36.2
 )
 
 require (
-	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/emicklei/go-restful/v3 v3.9.0 // indirect
-	github.com/go-logr/logr v1.2.3 // indirect
-	github.com/go-openapi/jsonpointer v0.19.5 // indirect
-	github.com/go-openapi/jsonreference v0.20.0 // indirect
-	github.com/go-openapi/swag v0.19.14 // indirect
-	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/golang/protobuf v1.5.2 // indirect
-	github.com/google/gnostic v0.5.7-v3refs // indirect
-	github.com/google/go-cmp v0.7.0 // indirect
-	github.com/google/gofuzz v1.1.0 // indirect
-	github.com/josharian/intern v1.0.0 // indirect
+	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
+	github.com/emicklei/go-restful/v3 v3.13.0 // indirect
+	github.com/evanphx/json-patch v0.5.2 // indirect
+	github.com/fxamacker/cbor/v2 v2.9.4 // indirect
+	github.com/go-logr/logr v1.4.4 // indirect
+	github.com/go-openapi/jsonpointer v1.0.1 // indirect
+	github.com/go-openapi/jsonreference v1.0.2 // indirect
+	github.com/go-openapi/swag v0.29.2 // indirect
+	github.com/go-openapi/swag/cmdutils v0.29.2 // indirect
+	github.com/go-openapi/swag/conv v0.29.2 // indirect
+	github.com/go-openapi/swag/fileutils v0.29.2 // indirect
+	github.com/go-openapi/swag/jsonutils v0.29.2 // indirect
+	github.com/go-openapi/swag/loading v0.29.2 // indirect
+	github.com/go-openapi/swag/mangling v0.29.2 // indirect
+	github.com/go-openapi/swag/netutils v0.29.2 // indirect
+	github.com/go-openapi/swag/pools v0.29.2 // indirect
+	github.com/go-openapi/swag/stringutils v0.29.2 // indirect
+	github.com/go-openapi/swag/typeutils v0.29.2 // indirect
+	github.com/go-openapi/swag/yamlutils v0.29.2 // indirect
+	github.com/go-openapi/testify/enable/yaml/v2 v2.8.0 // indirect
+	github.com/go-openapi/testify/v2 v2.8.0 // indirect
+	github.com/google/gnostic-models v0.7.1 // indirect
+	github.com/google/uuid v1.6.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/mailru/easyjson v0.7.6 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
-	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
-	golang.org/x/net v0.53.0 // indirect
-	golang.org/x/oauth2 v0.36.0 // indirect
-	golang.org/x/sys v0.43.0 // indirect
-	golang.org/x/term v0.42.0 // indirect
-	golang.org/x/text v0.36.0 // indirect
-	golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
-	google.golang.org/protobuf v1.36.11 // indirect
+	github.com/stretchr/testify v1.12.1 // indirect
+	github.com/x448/float16 v0.8.4 // indirect
+	go.yaml.in/yaml/v2 v2.4.4 // indirect
+	go.yaml.in/yaml/v3 v3.0.5 // indirect
+	golang.org/x/net v0.59.0 // indirect
+	golang.org/x/oauth2 v0.37.0 // indirect
+	golang.org/x/sys v0.48.0 // indirect
+	golang.org/x/term v0.46.0 // indirect
+	golang.org/x/text v0.42.0 // indirect
+	golang.org/x/time v0.16.0 // indirect
+	google.golang.org/protobuf v1.36.12 // indirect
+	gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
-	gopkg.in/yaml.v2 v2.4.0 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/klog/v2 v2.80.1 // indirect
-	k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
-	k8s.io/utils v0.0.0-20221107191617-1a15be271d1d // indirect
-	sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
-	sigs.k8s.io/yaml v1.3.0 // indirect
+	k8s.io/klog/v2 v2.140.0 // indirect
+	k8s.io/kube-openapi v0.0.0-20260603220949-865597e52e25 // indirect
+	k8s.io/utils v0.0.0-20260507154919-ff6756f316d2 // indirect
+	sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
+	sigs.k8s.io/randfill v1.0.0 // indirect
+	sigs.k8s.io/structured-merge-diff/v6 v6.4.0 // indirect
+	sigs.k8s.io/yaml v1.6.0 // indirect
 )
diff --git a/packages/system/kubeovn-webhook/images/kubeovn-webhook/go.sum b/packages/system/kubeovn-webhook/images/kubeovn-webhook/go.sum
index 62f9d1759b..53ac548ff8 100644
--- a/packages/system/kubeovn-webhook/images/kubeovn-webhook/go.sum
+++ b/packages/system/kubeovn-webhook/images/kubeovn-webhook/go.sum
@@ -1,209 +1,123 @@
-cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
-github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
-github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE=
-github.com/emicklei/go-restful/v3 v3.9.0 h1:XwGDlfxEnQZzuopoqxwSEllNcCOM9DhhFyhFIIGKwxE=
-github.com/emicklei/go-restful/v3 v3.9.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
-github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
-github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
-github.com/evanphx/json-patch v4.12.0+incompatible h1:4onqiflcdA9EOZ4RxV643DvftH5pOlLGNtQ5lPWQu84=
-github.com/evanphx/json-patch v4.12.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
-github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
-github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0=
-github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
-github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
-github.com/go-openapi/jsonpointer v0.19.5 h1:gZr+CIYByUqjcgeLXnQu2gHYQC9o73G2XUeOFYEICuY=
-github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
-github.com/go-openapi/jsonreference v0.20.0 h1:MYlu0sBgChmCfJxxUKZ8g1cPWFOB37YSZqewK7OKeyA=
-github.com/go-openapi/jsonreference v0.20.0/go.mod h1:Ag74Ico3lPc+zR+qjn4XBUmXymS4zJbYVCZmcgkasdo=
-github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
-github.com/go-openapi/swag v0.19.14 h1:gm3vOOXfiuw5i9p5N9xJvfjvuofpyvLA9Wr6QfK5Fng=
-github.com/go-openapi/swag v0.19.14/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ=
-github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
-github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
-github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
-github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
-github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
-github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
-github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
-github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
-github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
-github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
-github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
-github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
-github.com/google/gnostic v0.5.7-v3refs h1:FhTMOKj2VhjpouxvWJAV1TL304uMlb9zcDqkl6cEI54=
-github.com/google/gnostic v0.5.7-v3refs/go.mod h1:73MKFl6jIHelAJNaBGFzt3SPtZULs9dYrGFt8OiIsHQ=
-github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
-github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
+github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/emicklei/go-restful/v3 v3.13.0 h1:C4Bl2xDndpU6nJ4bc1jXd+uTmYPVUwkD6bFY/oTyCes=
+github.com/emicklei/go-restful/v3 v3.13.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
+github.com/evanphx/json-patch v0.5.2 h1:xVCHIVMUu1wtM/VkR9jVZ45N3FhZfYMMYGorLCR8P3k=
+github.com/evanphx/json-patch v0.5.2/go.mod h1:ZWS5hhDbVDyob71nXKNL0+PWn6ToqBHMikGIFbs31qQ=
+github.com/fxamacker/cbor/v2 v2.9.4 h1:xwjVlxEMR3S605oUlgBjKLTTeGFciYPGYCtF/35LKGo=
+github.com/fxamacker/cbor/v2 v2.9.4/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ=
+github.com/go-logr/logr v1.4.4 h1:tG4xh9yMsRCAiodLVTxyrkzSZ9+o0L1Kg/+cPVcbP/8=
+github.com/go-logr/logr v1.4.4/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
+github.com/go-openapi/jsonpointer v1.0.1 h1:2KxywRmNwJkT/FMBa3iRNHEaAxSJvjqoufQZy3au1Mg=
+github.com/go-openapi/jsonpointer v1.0.1/go.mod h1:wI7ZYsFmbIi9nBXOZqgDaS/bqOchRGZjqxFli7FBYxY=
+github.com/go-openapi/jsonreference v1.0.2 h1:oS4et8FOf3p3UQxEo4Xt0esijmBUM+F259Xl72OSZsc=
+github.com/go-openapi/jsonreference v1.0.2/go.mod h1:TbUNSOo+fcorZjFaNoiSDSoaNnnZtqJtLGR1PuvE/Cs=
+github.com/go-openapi/swag v0.29.2 h1:9n8frkcsuQRA0INU31VbxNxt1zBaHxrHYGEf5BUjFi4=
+github.com/go-openapi/swag v0.29.2/go.mod h1:RkCiX1gCVXWgLOavDXE3ALJrQ/VO2ziiIzOUs3z10xo=
+github.com/go-openapi/swag/cmdutils v0.29.2 h1:cXEzX/nWCODon251f+1HgL75/R4XXML5IZxgLCWMoro=
+github.com/go-openapi/swag/cmdutils v0.29.2/go.mod h1:XziaSVzYqkDvpWXzASfWajw2YvJrLscq610O2XiyqJw=
+github.com/go-openapi/swag/conv v0.29.2 h1:8c9shoB8l0QRSR6ymq1llHdBWDqpIgJfjTGHx3Vuhm0=
+github.com/go-openapi/swag/conv v0.29.2/go.mod h1:AZS0YigTNf8qNtD6WqJz/N4RUNmpr76SyjFGkq4+p6Q=
+github.com/go-openapi/swag/fileutils v0.29.2 h1:mdUL+Vw5ah1fO1AvFCoHeIyv7YZsCz2MN3KNqd/lLVI=
+github.com/go-openapi/swag/fileutils v0.29.2/go.mod h1:7QKmmodjAebaq61lGVJa8ldLdGeMF4DSgYv8tXOGGo0=
+github.com/go-openapi/swag/jsonutils v0.29.2 h1:uZNSD2/rJDYAfvsLYkykTzXuyxM3QpDKV9jhRHrMu6k=
+github.com/go-openapi/swag/jsonutils v0.29.2/go.mod h1:ONTdNvj3Y+IXRzfa17E+Rgt2ns/qiSOYjIo2K7v2yDs=
+github.com/go-openapi/swag/jsonutils/fixtures_test v0.29.2 h1:w+Fd6EBOMGlC74GYGHqCLGyb3Bpams8TtNrgM/SG4jo=
+github.com/go-openapi/swag/jsonutils/fixtures_test v0.29.2/go.mod h1:HC2egPORFzbj/gf05Zrfgz8Mgplx3oW7hgGi7pjZVhM=
+github.com/go-openapi/swag/loading v0.29.2 h1:QU1ry24e6r6Shoxe380Nx0X5iKkpRO+hJffsyJ2dVlY=
+github.com/go-openapi/swag/loading v0.29.2/go.mod h1:DqilDjuiJKETecsS4TRopWG1acUDsfqN39ZmQhPu6uI=
+github.com/go-openapi/swag/mangling v0.29.2 h1:ltdo3K0tTP4P6zWhVVWDU9D37/YYBuMJRdZxiS2Dtog=
+github.com/go-openapi/swag/mangling v0.29.2/go.mod h1:RjDi4TnItAenS3cgCXSpIl1kKbjG7il6pnmQVl/8bp8=
+github.com/go-openapi/swag/netutils v0.29.2 h1:dBli6jyUa93sDS/XYWShJzf4+nnVfFKfvY9SLUaUzB8=
+github.com/go-openapi/swag/netutils v0.29.2/go.mod h1:1pM6Xg/Um8E1eps3umWl8Hme3ByWXOtHsvFC0CULHUE=
+github.com/go-openapi/swag/pools v0.29.2 h1:PlGoDRF8WtSyXkedZZkpW3f9wDhFf3u8KtaBcmgmh8c=
+github.com/go-openapi/swag/pools v0.29.2/go.mod h1:V3lhxVT4qDYRqc2MRSSbLsTYIYV/2HlHafhyEkmzLIc=
+github.com/go-openapi/swag/stringutils v0.29.2 h1:lcnBxwAaysT3bMUVBfn9V/PkfVqkurpqufKU6rTUMGk=
+github.com/go-openapi/swag/stringutils v0.29.2/go.mod h1:i9cdh7sGaa0nm3CqIvH5IM5h2QClk1wns2ktKeILvRI=
+github.com/go-openapi/swag/typeutils v0.29.2 h1:O7aVvkTs3pXwikgtrPLenigEMdQFgONKRooQA9pgf2I=
+github.com/go-openapi/swag/typeutils v0.29.2/go.mod h1:7+GDG+uz9Ke+eVt4rClZg7wklSDp8hT/mKNh/pC26TE=
+github.com/go-openapi/swag/yamlutils v0.29.2 h1:IFKFFeDnuIwzfsuWRQU+rI8iL3g4XyAYjV/RlnlxPLM=
+github.com/go-openapi/swag/yamlutils v0.29.2/go.mod h1:7MGqtcrK73sxQ4ceiyIf8qiXS/s09JLMdR5esK5euYQ=
+github.com/go-openapi/testify/enable/yaml/v2 v2.8.0 h1:dvOQNZ2ovOdogn902NYq7i6jUI9Dma4qyjTXABY5YTY=
+github.com/go-openapi/testify/enable/yaml/v2 v2.8.0/go.mod h1:3VwZZUT6nWcAjhIr2RypXxlsxd3mPPtXh3T8z65aRlQ=
+github.com/go-openapi/testify/v2 v2.8.0 h1:19QDx5b57p8KjO2E4sgs/woL4Akp+FGLRlVm2xn0Rho=
+github.com/go-openapi/testify/v2 v2.8.0/go.mod h1:4gUN8jC+RqOE2qjW/vDmfyTvl5BCht4qL7oca0odrak=
+github.com/google/gnostic-models v0.7.1 h1:SisTfuFKJSKM5CPZkffwi6coztzzeYUhc3v4yxLWH8c=
+github.com/google/gnostic-models v0.7.1/go.mod h1:whL5G0m6dmc5cPxKc5bdKdEN3UjI7OUGxBlw57miDrQ=
 github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
 github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/google/gofuzz v1.1.0 h1:Hsa8mG0dQ46ij8Sl2AYJDUv1oA9/d6Vk+3LG99Oe02g=
-github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
-github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
+github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
+github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
-github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
-github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
-github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
-github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
-github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
-github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
-github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
-github.com/mailru/easyjson v0.7.6 h1:8yTIVnZgCoiM1TgqoeTl+LfU5Jg6/xL3QhGQnimLYnA=
-github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
 github.com/mattbaird/jsonpatch v0.0.0-20240118010651-0ba75a80ca38 h1:hQWBtNqRYrI7CWIaUSXXtNKR90KzcUA5uiuxFVWw7sU=
 github.com/mattbaird/jsonpatch v0.0.0-20240118010651-0ba75a80ca38/go.mod h1:M1qoD/MqPgTZIk0EWKB38wE28ACRfVcn+cU08jyArI0=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
+github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee h1:W5t00kpgFdJifH4BDsTlE89Zl93FEloxaWZfGcifgq8=
+github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
-github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
-github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
-github.com/onsi/ginkgo/v2 v2.4.0 h1:+Ig9nvqgS5OBSACXNk15PLdp0U9XPYROt9CFzVdFGIs=
-github.com/onsi/ginkgo/v2 v2.4.0/go.mod h1:iHkDK1fKGcBoEHT5W7YBq4RFWaQulw+caOMkAt4OrFo=
-github.com/onsi/gomega v1.23.0 h1:/oxKu9c2HVap+F3PfKort2Hw5DEU+HGlW8n+tguWsys=
-github.com/onsi/gomega v1.23.0/go.mod h1:Z/NWtiqwBrwUt4/2loMmHL63EDLnYHmVbuBpDr2vQAg=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
-github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
-github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8=
+github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
+github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/spf13/pflag v1.0.10 h1:4EBh2KAYBwaONj6b2Ye1GiHfwjqyROoF4RwYO+vPwFk=
+github.com/spf13/pflag v1.0.10/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.5.3 h1:jmXUvGomnU1o3W/V5h2VEradbpJDwGrzugQQvL0POH4=
+github.com/stretchr/objx v0.5.3/go.mod h1:rDQraq+vQZU7Fde9LOZLr8Tax6zZvy4kuNKF+QYS+U0=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
-github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
-github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
-golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
-golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.53.0 h1:d+qAbo5L0orcWAr0a9JweQpjXF19LMXJE8Ey7hwOdUA=
-golang.org/x/net v0.53.0/go.mod h1:JvMuJH7rrdiCfbeHoo3fCQU24Lf5JJwT9W3sJFulfgs=
-golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.36.0 h1:peZ/1z27fi9hUOFCAZaHyrpWG5lwe0RJEEEeH0ThlIs=
-golang.org/x/oauth2 v0.36.0/go.mod h1:YDBUJMTkDnJS+A4BP4eZBjCqtokkg1hODuPjwiGPO7Q=
-golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.43.0 h1:Rlag2XtaFTxp19wS8MXlJwTvoh8ArU6ezoyFsMyCTNI=
-golang.org/x/sys v0.43.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
-golang.org/x/term v0.42.0 h1:UiKe+zDFmJobeJ5ggPwOshJIVt6/Ft0rcfrXZDLWAWY=
-golang.org/x/term v0.42.0/go.mod h1:Dq/D+snpsbazcBG5+F9Q1n2rXV8Ma+71xEjTRufARgY=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.36.0 h1:JfKh3XmcRPqZPKevfXVpI1wXPTqbkE5f7JA92a55Yxg=
-golang.org/x/text v0.36.0/go.mod h1:NIdBknypM8iqVmPiuco0Dh6P5Jcdk8lJL0CUebqK164=
-golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 h1:vVKdlvoWBphwdxWKrFZEuM0kGgGLxUOYcY4U/2Vjg44=
-golang.org/x/time v0.0.0-20220210224613-90d013bbcef8/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
-golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
-google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
-google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
-google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
-google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20201019141844-1ed22bb0c154/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
-google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
-google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
-google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
-google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
-google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
-google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
-google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
-google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4=
-google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
-google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE=
-google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
-gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+github.com/stretchr/testify v1.12.1 h1:EuwCh5fleGS7H32xRwO3wRGT7DxrDhLAT6FF8MpWDWE=
+github.com/stretchr/testify v1.12.1/go.mod h1:MDEgiDPPsNp5cuIrHPPCyornHKgEVbtFUmoNlxoYthg=
+github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
+github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
+go.yaml.in/yaml/v2 v2.4.4 h1:tuyd0P+2Ont/d6e2rl3be67goVK4R6deVxCUX5vyPaQ=
+go.yaml.in/yaml/v2 v2.4.4/go.mod h1:gMZqIpDtDqOfM0uNfy0SkpRhvUryYH0Z6wdMYcacYXQ=
+go.yaml.in/yaml/v3 v3.0.5 h1:N6y/pJk8buWs9NY5ERU2HSMfm+IuD/OtfdAnq6kESPw=
+go.yaml.in/yaml/v3 v3.0.5/go.mod h1:HVTZu1O7/Vkt2N+BFy8Zza+lnLsABggaTM2ZpNIGuKg=
+golang.org/x/net v0.59.0 h1:5zfYln+w5XCxwrnMMJPufRgNoXEaGxl0wo5GqPXyues=
+golang.org/x/net v0.59.0/go.mod h1:2DA/G1UfVbCpQPeWTmMPGY7Cs2PkBkwu743bVX5PIVg=
+golang.org/x/oauth2 v0.37.0 h1:JUlcxA8oAtauLfiH8FX2/FkAWHAdi0QtGCGc+hofE98=
+golang.org/x/oauth2 v0.37.0/go.mod h1:IxwZNxUULJmpBFf9K/9NTMSIfZZuvuTy1gGxhigP/58=
+golang.org/x/sys v0.48.0 h1:bbX/i/6MgT9BVLM9RT1thmxL04yeTAhbEz4SyadbXoo=
+golang.org/x/sys v0.48.0/go.mod h1:hNLxWAXmnKAxqDtdwIYC4bM9oQPEecfsnNMuSxOs3og=
+golang.org/x/term v0.46.0 h1:3+OXuTbaKDgwk8jTi3aSLHRlmWqHEUDUtxnbFigO4YE=
+golang.org/x/term v0.46.0/go.mod h1:+K02xbkittuwc0Am4abfA3Fc+XRGXkvBXNO88NCXPoc=
+golang.org/x/text v0.42.0 h1:JbOZXgfeCPU9gacVtYliJqOhD+zhrEqK4LfdpmlUZqI=
+golang.org/x/text v0.42.0/go.mod h1:ojzP1Z+2QtioaF8DTtO8K5q7JWVVYwZKenzujK0Zd0E=
+golang.org/x/time v0.16.0 h1:vMb6ptszcQMkcwiRTAuNNU50gom6++Q/6gY2hDM6VDE=
+golang.org/x/time v0.16.0/go.mod h1:rVKOqvZeKvrDKTQiAHJ7wmwP0RzleSphoEA9RcdLA0s=
+google.golang.org/protobuf v1.36.12 h1:pJOKDDOyeXErUroCihFAd5LQuwXBSpVnKGrj5o/fwxc=
+google.golang.org/protobuf v1.36.12/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
+gopkg.in/evanphx/json-patch.v4 v4.13.0 h1:czT3CmqEaQ1aanPc5SdlgQrrEIb8w/wwCvWWnfEbYzo=
+gopkg.in/evanphx/json-patch.v4 v4.13.0/go.mod h1:p8EYWUEYMpynmqDbY58zCKCFZw8pRWMG4EsWvDvM72M=
 gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
 gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
-gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
-gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
-gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-k8s.io/api v0.26.0 h1:IpPlZnxBpV1xl7TGk/X6lFtpgjgntCg8PJ+qrPHAC7I=
-k8s.io/api v0.26.0/go.mod h1:k6HDTaIFC8yn1i6pSClSqIwLABIcLV9l5Q4EcngKnQg=
-k8s.io/apimachinery v0.26.0 h1:1feANjElT7MvPqp0JT6F3Ss6TWDwmcjLypwoPpEf7zg=
-k8s.io/apimachinery v0.26.0/go.mod h1:tnPmbONNJ7ByJNz9+n9kMjNP8ON+1qoAIIC70lztu74=
-k8s.io/client-go v0.26.0 h1:lT1D3OfO+wIi9UFolCrifbjUUgu7CpLca0AD8ghRLI8=
-k8s.io/client-go v0.26.0/go.mod h1:I2Sh57A79EQsDmn7F7ASpmru1cceh3ocVT9KlX2jEZg=
-k8s.io/klog/v2 v2.80.1 h1:atnLQ121W371wYYFawwYx1aEY2eUfs4l3J72wtgAwV4=
-k8s.io/klog/v2 v2.80.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
-k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 h1:+70TFaan3hfJzs+7VK2o+OGxg8HsuBr/5f6tVAjDu6E=
-k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280/go.mod h1:+Axhij7bCpeqhklhUTe3xmOn6bWxolyZEeyaFpjGtl4=
-k8s.io/utils v0.0.0-20221107191617-1a15be271d1d h1:0Smp/HP1OH4Rvhe+4B8nWGERtlqAGSftbSbbmm45oFs=
-k8s.io/utils v0.0.0-20221107191617-1a15be271d1d/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
-sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k=
-sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
-sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
-sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
-sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
-sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=
+k8s.io/api v0.36.2 h1:TF6YDLIzKfccK7cq9YpTcGX8TJmEkHVRv78DM51fRYY=
+k8s.io/api v0.36.2/go.mod h1:F4LbMO4brjZYh7yFkXWhynSvtB7YauxV4c+HHkNRGNg=
+k8s.io/apimachinery v0.36.2 h1:0PE/W/WNy1UX61NLbXY5TMbJ6UwLL6E6lAPkYrKFxbQ=
+k8s.io/apimachinery v0.36.2/go.mod h1:fvf/HOLXq9RId0rnDIbN1OEBvHXdQbLMM8nu0LcBUf4=
+k8s.io/client-go v0.36.2 h1:bfgxmFKc9CgqsgX4xKLAAdmTQlWee7Ob/HlDOrJ5TBI=
+k8s.io/client-go v0.36.2/go.mod h1:1vgO4OAlfPnoLcb+Rze2GF5rAr14w8qjrYMoyXJzQj0=
+k8s.io/klog/v2 v2.140.0 h1:Tf+J3AH7xnUzZyVVXhTgGhEKnFqye14aadWv7bzXdzc=
+k8s.io/klog/v2 v2.140.0/go.mod h1:o+/RWfJ6PwpnFn7OyAG3QnO47BFsymfEfrz6XyYSSp0=
+k8s.io/kube-openapi v0.0.0-20260603220949-865597e52e25 h1:mPMaPMpBij2V1Wv/fR+HW124vVGXXvOSS9ver/9yjWs=
+k8s.io/kube-openapi v0.0.0-20260603220949-865597e52e25/go.mod h1:V/QaCUYDa+0QpcHhVVc5l99Uz56wEMEXBSj9oCDkNDY=
+k8s.io/utils v0.0.0-20260507154919-ff6756f316d2 h1:wU4tMEhLGgIbLvXQb1cfN+EcM0wf7zC6CPF+C79jroc=
+k8s.io/utils v0.0.0-20260507154919-ff6756f316d2/go.mod h1:xDxuJ0whA3d0I4mf/C4ppKHxXynQ+fxnkmQH0vTHnuk=
+sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 h1:IpInykpT6ceI+QxKBbEflcR5EXP7sU1kvOlxwZh5txg=
+sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg=
+sigs.k8s.io/randfill v1.0.0 h1:JfjMILfT8A6RbawdsK2JXGBR5AQVfd+9TbzrlneTyrU=
+sigs.k8s.io/randfill v1.0.0/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=
+sigs.k8s.io/structured-merge-diff/v6 v6.4.0 h1:qmp2e3ZfFi1/jJbDGpD4mt3wyp6PE1NfKHCYLqgNQJo=
+sigs.k8s.io/structured-merge-diff/v6 v6.4.0/go.mod h1:M3W8sfWvn2HhQDIbGWj3S099YozAsymCo/wrT5ohRUE=
+sigs.k8s.io/yaml v1.6.0 h1:G8fkbMSAFqgEFgh4b1wmtzDnioxFCUgTZhlbj5P9QYs=
+sigs.k8s.io/yaml v1.6.0/go.mod h1:796bPqUfzR/0jLAl6XjHl3Ck7MiyVv8dbTdyT3/pMf4=
diff --git a/packages/system/kubeovn-webhook/images/kubeovn-webhook/main.go b/packages/system/kubeovn-webhook/images/kubeovn-webhook/main.go
index 70185961d7..31ba48fe0c 100644
--- a/packages/system/kubeovn-webhook/images/kubeovn-webhook/main.go
+++ b/packages/system/kubeovn-webhook/images/kubeovn-webhook/main.go
@@ -2,9 +2,13 @@ package main
 
 import (
 	"crypto/tls"
+	"crypto/x509"
 	"flag"
 	"log"
 	"net/http"
+	"os"
+	"sync"
+	"time"
 )
 
 var (
@@ -12,14 +16,95 @@ var (
 	RoutesGlobal       string
 )
 
+// Observation state for logClientCert.
+//
+// Deliberately NOT a set keyed on the issuer. With tls.RequestClientCert the
+// issuer string is supplied by the caller, so anything keyed on it is both
+// unbounded and forgeable: remembering every value grows without limit, and
+// remembering only the first N lets anyone who can reach the port fill those N
+// with fabricated issuers before the API server's first call and permanently
+// suppress the signal this exists to produce. Rate limiting cannot be starved
+// that way -- a burst costs the attacker at most the current interval, and the
+// next real handshake is logged in the one after it.
+//
+// The two outcomes are limited separately so a flood of one cannot hide the
+// other: "no certificate" and "certificate presented" answer different
+// questions, and it is the pair that decides whether enforcement is safe.
+const observationInterval = 30 * time.Second
+
+type observationLimiter struct {
+	mu   sync.Mutex
+	last time.Time
+	seen bool
+}
+
+// allow reports whether this observation should be logged: always the first
+// one, then at most one per observationInterval.
+func (l *observationLimiter) allow(now time.Time) bool {
+	l.mu.Lock()
+	defer l.mu.Unlock()
+	if l.seen && now.Sub(l.last) < observationInterval {
+		return false
+	}
+	l.seen = true
+	l.last = now
+	return true
+}
+
+var (
+	noCertObservations   observationLimiter
+	withCertObservations observationLimiter
+)
+
+// logClientCert reports, once per distinct issuer, whether the caller presented
+// a client certificate and who signed it.
+//
+// What it reports is untrusted. With tls.RequestClientCert the certificate is
+// accepted without being verified against anything, so the issuer is a claim
+// and not an identity: it says what reaches this port, and feeds a decision a
+// human makes out of band. Nothing here turns it into a trust decision the
+// process makes for itself — enforcement depends solely on --client-ca-file.
+//
+// This is the evidence needed to decide whether that enforcement can be turned
+// on. The handler serves namespace-derived values to whoever asks
+// (see GHSA-g883-q79m-8225), and the fix is to accept only the API server — but
+// the API server presents a certificate only when the cluster is configured for
+// it (an AdmissionConfiguration with a kubeConfigFile), which is not universal
+// across the variants this ships on. Switching straight to
+// RequireAndVerifyClientCert on a cluster that sends nothing would fail every
+// admission call, and this webhook is registered failurePolicy: Fail — so pod
+// creation would stop cluster-wide. Observe first, enforce second.
+func logClientCert(enforcing bool, next http.Handler) http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		issuer := ""
+		if r.TLS != nil && len(r.TLS.PeerCertificates) > 0 {
+			issuer = r.TLS.PeerCertificates[0].Issuer.String()
+		}
+		now := time.Now()
+		switch {
+		case issuer == "" && noCertObservations.allow(now):
+			log.Printf("client certificate: none presented by %s -- client-ca-file enforcement is NOT yet safe on this cluster", r.RemoteAddr)
+		case issuer != "" && withCertObservations.allow(now):
+			if enforcing {
+				log.Printf("client certificate: presented by %s, issuer %q -- verified against --client-ca-file during the handshake", r.RemoteAddr, issuer)
+			} else {
+				log.Printf("client certificate: presented by %s, issuer %q (UNVERIFIED -- nothing has checked this certificate, and any caller can claim any issuer). Confirm out of band that this is your API server's CA before pinning it with --client-ca-file", r.RemoteAddr, issuer)
+			}
+		}
+		next.ServeHTTP(w, r)
+	})
+}
+
 func main() {
 	var (
-		tlsCertFile string
-		tlsKeyFile  string
+		tlsCertFile  string
+		tlsKeyFile   string
+		clientCAFile string
 	)
 
 	flag.StringVar(&tlsCertFile, "tls-cert-file", "/etc/webhook/certs/tls.crt", "TLS certificate file.")
 	flag.StringVar(&tlsKeyFile, "tls-key-file", "/etc/webhook/certs/tls.key", "TLS key file.")
+	flag.StringVar(&clientCAFile, "client-ca-file", "", "CA bundle for verifying client certificates. When set, callers MUST present a certificate signed by it; when empty, certificates are requested and logged but not required.")
 	flag.BoolVar(&PortSecurityGlobal, "port-security", true, "If false, skip adding port_security unless specified by the Namespace.")
 	flag.StringVar(&RoutesGlobal, "routes", "", "Default ovn.kubernetes.io/routes if not in Namespace.")
 
@@ -28,17 +113,42 @@ func main() {
 	mux := http.NewServeMux()
 	mux.HandleFunc("/mutate-pods", HandleMutatePods)
 
-	tlsCert, err := tls.LoadX509KeyPair(tlsCertFile, tlsKeyFile)
+	tlsConfig, err := newReloadingTLSConfig(tlsCertFile, tlsKeyFile)
 	if err != nil {
 		log.Fatalf("Failed to load key pair: %v", err)
 	}
 
+	tlsConfig.MinVersion = tls.VersionTLS12
+
+	// Default: ask for a client certificate, accept the connection either way.
+	// This never rejects a caller, so it cannot break admission; it only makes
+	// the certificate visible to logClientCert.
+	tlsConfig.ClientAuth = tls.RequestClientCert
+
+	if clientCAFile != "" {
+		clientCAPool := x509.NewCertPool()
+		clientCAData, err := os.ReadFile(clientCAFile)
+		if err != nil {
+			log.Fatalf("Failed to read client CA file: %v", err)
+		}
+		if !clientCAPool.AppendCertsFromPEM(clientCAData) {
+			log.Fatalf("Failed to parse client CA certificate")
+		}
+		tlsConfig.ClientAuth = tls.RequireAndVerifyClientCert
+		tlsConfig.ClientCAs = clientCAPool
+		log.Printf("mTLS enabled: requiring client certificates signed by %s", clientCAFile)
+	} else {
+		log.Printf("mTLS not enforced (--client-ca-file empty): client certificates are requested and logged only")
+	}
+
 	server := &http.Server{
-		Addr: ":8443",
-		TLSConfig: &tls.Config{
-			Certificates: []tls.Certificate{tlsCert},
-		},
-		Handler: mux,
+		Addr:              ":8443",
+		TLSConfig:         tlsConfig,
+		Handler:           logClientCert(clientCAFile != "", mux),
+		ReadHeaderTimeout: 10 * time.Second,
+		ReadTimeout:       30 * time.Second,
+		WriteTimeout:      30 * time.Second,
+		IdleTimeout:       60 * time.Second,
 	}
 
 	log.Printf("Starting webhook server on %s", server.Addr)
diff --git a/packages/system/kubeovn-webhook/images/kubeovn-webhook/observation_test.go b/packages/system/kubeovn-webhook/images/kubeovn-webhook/observation_test.go
new file mode 100644
index 0000000000..e90ad613f5
--- /dev/null
+++ b/packages/system/kubeovn-webhook/images/kubeovn-webhook/observation_test.go
@@ -0,0 +1,194 @@
+package main
+
+import (
+	"crypto/tls"
+	"crypto/x509"
+	"crypto/x509/pkix"
+	"log"
+	"net/http"
+	"net/http/httptest"
+	"strings"
+	"sync"
+	"testing"
+	"time"
+)
+
+// captureLog redirects the standard logger for the duration of fn and returns
+// what was written.
+func captureLog(t *testing.T, fn func()) string {
+	t.Helper()
+	var buf strings.Builder
+	flags := log.Flags()
+	out := log.Writer()
+	log.SetOutput(&buf)
+	log.SetFlags(0)
+	defer func() {
+		log.SetOutput(out)
+		log.SetFlags(flags)
+	}()
+	fn()
+	return buf.String()
+}
+
+// resetObservations clears the package-level limiters between cases.
+func resetObservations() {
+	noCertObservations = observationLimiter{}
+	withCertObservations = observationLimiter{}
+}
+
+func TestObservationLimiterAllowsFirstThenRateLimits(t *testing.T) {
+	var l observationLimiter
+	base := time.Now()
+
+	if !l.allow(base) {
+		t.Fatal("first observation must always be logged")
+	}
+	if l.allow(base.Add(observationInterval - time.Nanosecond)) {
+		t.Error("a second observation inside the interval must be suppressed")
+	}
+	if !l.allow(base.Add(observationInterval)) {
+		t.Error("an observation at the interval boundary must be logged again")
+	}
+}
+
+// A burst of fabricated issuers is the attack the rate limiter exists to
+// survive: it may cost the current interval, but it must not suppress
+// observation permanently the way a first-come set of issuers would.
+func TestObservationSurvivesBurstOfFabricatedIssuers(t *testing.T) {
+	var l observationLimiter
+	base := time.Now()
+
+	for range 1000 {
+		l.allow(base)
+	}
+	if !l.allow(base.Add(observationInterval)) {
+		t.Error("observation must resume after the interval, whatever the burst")
+	}
+}
+
+func TestObservationLimiterIsConcurrencySafe(t *testing.T) {
+	var l observationLimiter
+	now := time.Now()
+
+	var wg sync.WaitGroup
+	var mu sync.Mutex
+	allowed := 0
+	for range 50 {
+		wg.Go(func() {
+			if l.allow(now) {
+				mu.Lock()
+				allowed++
+				mu.Unlock()
+			}
+		})
+	}
+	wg.Wait()
+
+	if allowed != 1 {
+		t.Errorf("exactly one concurrent observation may pass at a fixed instant, got %d", allowed)
+	}
+}
+
+// request builds a request carrying either no peer certificate or one issued by
+// the named issuer.
+func request(issuer string) *http.Request {
+	r := httptest.NewRequest(http.MethodPost, "/mutate-pods", nil)
+	r.RemoteAddr = "10.0.0.7:34512"
+	if issuer != "" {
+		r.TLS = &tls.ConnectionState{PeerCertificates: []*x509.Certificate{
+			{Issuer: pkix.Name{CommonName: issuer}},
+		}}
+	}
+	return r
+}
+
+func TestLogClientCertNoCertificate(t *testing.T) {
+	resetObservations()
+	next := http.HandlerFunc(func(http.ResponseWriter, *http.Request) {})
+
+	out := captureLog(t, func() {
+		logClientCert(false, next).ServeHTTP(httptest.NewRecorder(), request(""))
+	})
+
+	if !strings.Contains(out, "none presented") {
+		t.Errorf("a certless caller must be reported, got %q", out)
+	}
+	if !strings.Contains(out, "10.0.0.7:34512") {
+		t.Errorf("the peer address must be logged so the caller can be attributed, got %q", out)
+	}
+}
+
+func TestLogClientCertUnverifiedWhenNotEnforcing(t *testing.T) {
+	resetObservations()
+	next := http.HandlerFunc(func(http.ResponseWriter, *http.Request) {})
+
+	out := captureLog(t, func() {
+		logClientCert(false, next).ServeHTTP(httptest.NewRecorder(), request("some-ca"))
+	})
+
+	if !strings.Contains(out, "UNVERIFIED") {
+		t.Errorf("without enforcement the issuer is a claim and must be marked unverified, got %q", out)
+	}
+	if !strings.Contains(out, "some-ca") {
+		t.Errorf("the issuer must appear in the log, got %q", out)
+	}
+}
+
+func TestLogClientCertVerifiedWhenEnforcing(t *testing.T) {
+	resetObservations()
+	next := http.HandlerFunc(func(http.ResponseWriter, *http.Request) {})
+
+	out := captureLog(t, func() {
+		logClientCert(true, next).ServeHTTP(httptest.NewRecorder(), request("some-ca"))
+	})
+
+	if strings.Contains(out, "UNVERIFIED") {
+		t.Errorf("with enforcement on the handshake has verified the chain; the warning is wrong, got %q", out)
+	}
+	if !strings.Contains(out, "verified against --client-ca-file") {
+		t.Errorf("the log should say the certificate was verified, got %q", out)
+	}
+}
+
+// The two outcomes are limited separately, so a caller flooding one branch
+// cannot hide the other. That pairing is what decides whether enforcement is
+// safe, so losing either half would defeat the observation.
+func TestLogClientCertBranchesAreLimitedIndependently(t *testing.T) {
+	resetObservations()
+	next := http.HandlerFunc(func(http.ResponseWriter, *http.Request) {})
+	h := logClientCert(false, next)
+
+	out := captureLog(t, func() {
+		for range 20 {
+			h.ServeHTTP(httptest.NewRecorder(), request("flooding-ca"))
+		}
+		h.ServeHTTP(httptest.NewRecorder(), request(""))
+	})
+
+	// "none presented by ..." also contains "presented by", so key on the
+	// issuer field, which only the certificate branch emits.
+	if strings.Count(out, ", issuer ") != 1 {
+		t.Errorf("the flooded branch must be rate limited to one line, got %q", out)
+	}
+	if !strings.Contains(out, "none presented") {
+		t.Errorf("the other branch must still be reported despite the flood, got %q", out)
+	}
+}
+
+// The handler is observation only: it must never interfere with admission.
+func TestLogClientCertAlwaysCallsNext(t *testing.T) {
+	resetObservations()
+	called := 0
+	next := http.HandlerFunc(func(http.ResponseWriter, *http.Request) { called++ })
+	h := logClientCert(false, next)
+
+	captureLog(t, func() {
+		h.ServeHTTP(httptest.NewRecorder(), request(""))
+		h.ServeHTTP(httptest.NewRecorder(), request("some-ca"))
+		h.ServeHTTP(httptest.NewRecorder(), request("some-ca"))
+	})
+
+	if called != 3 {
+		t.Errorf("every request must reach the handler regardless of logging, got %d of 3", called)
+	}
+}
diff --git a/packages/system/kubeovn-webhook/templates/_helpers.tpl b/packages/system/kubeovn-webhook/templates/_helpers.tpl
index e0a407aec4..a3c785262f 100644
--- a/packages/system/kubeovn-webhook/templates/_helpers.tpl
+++ b/packages/system/kubeovn-webhook/templates/_helpers.tpl
@@ -5,3 +5,21 @@ kube-ovn-webhook
 {{- define "namespace-annotation-webhook.fullname" -}}
 kube-ovn-webhook
 {{- end }}
+
+{{/*
+The port the webhook serves on. Defined once and consumed by the container,
+the Service targetPort and the Cilium clusterwide policy, because those three
+must agree: the policy has default-deny disabled, so a policy pointed at a port
+nothing serves denies nothing while the real port stays open -- a drift that
+removes the control silently rather than breaking anything visibly.
+
+The Service frontend port is deliberately NOT defined here. The policy denies
+the backend port only, which already covers ClusterIP-addressed traffic because
+Cilium translates a service to its backends before enforcing egress policy, so
+there is no second value that has to stay in agreement. Cozystack supports that
+path only with kubeProxyReplacement enabled; the platform invariant is pinned
+in packages/system/cilium/tests/kube_proxy_replacement_test.yaml.
+*/}}
+{{- define "namespace-annotation-webhook.port" -}}
+8443
+{{- end }}
diff --git a/packages/system/kubeovn-webhook/templates/certmanager.yaml b/packages/system/kubeovn-webhook/templates/certmanager.yaml
index f8eee740e4..cb2770360a 100644
--- a/packages/system/kubeovn-webhook/templates/certmanager.yaml
+++ b/packages/system/kubeovn-webhook/templates/certmanager.yaml
@@ -38,7 +38,7 @@ metadata:
 spec:
   secretName: {{ include "namespace-annotation-webhook.fullname" . }}-tls
   duration: 8760h
-  renewBefore: 24h
+  renewBefore: 720h
   issuerRef:
     name: {{ include "namespace-annotation-webhook.fullname" . }}-ca-issuer
   commonName: {{ include "namespace-annotation-webhook.fullname" . }}-tls
diff --git a/packages/system/kubeovn-webhook/templates/deployment.yaml b/packages/system/kubeovn-webhook/templates/deployment.yaml
index 19467341ab..776dce6fe4 100644
--- a/packages/system/kubeovn-webhook/templates/deployment.yaml
+++ b/packages/system/kubeovn-webhook/templates/deployment.yaml
@@ -39,7 +39,7 @@ spec:
               cpu: 100m
               memory: 128Mi
           ports:
-            - containerPort: 8443
+            - containerPort: {{ include "namespace-annotation-webhook.port" . }}
               name: https
           volumeMounts:
             - name: webhook-certs
@@ -50,6 +50,9 @@ spec:
             - "--tls-key-file=/etc/webhook/certs/tls.key"
             - "--port-security={{ .Values.portSecurity }}"
             - "--routes={{ .Values.routes }}"
+            {{- with .Values.clientCAFile }}
+            - "--client-ca-file={{ . }}"
+            {{- end }}
       tolerations:
       - effect: NoSchedule
         operator: Exists
diff --git a/packages/system/kubeovn-webhook/templates/networkpolicy.yaml b/packages/system/kubeovn-webhook/templates/networkpolicy.yaml
new file mode 100644
index 0000000000..f9a9e929b5
--- /dev/null
+++ b/packages/system/kubeovn-webhook/templates/networkpolicy.yaml
@@ -0,0 +1,161 @@
+{{- $policy := .Values.webhookPolicy | default dict -}}
+{{- if and (dig "enabled" true $policy) (.Capabilities.APIVersions.Has "cilium.io/v2/CiliumClusterwideNetworkPolicy") }}
+{{- $policyHash := printf "%s/%s" .Release.Namespace .Release.Name | sha256sum | trunc 12 -}}
+---
+{{/*
+The /mutate-pods handler returns namespace-derived annotations to any caller,
+and only the API server has any business calling it (GHSA-g883-q79m-8225).
+Client-certificate verification cannot enforce that on the stock control plane
+because the API server presents no client certificate to this webhook.
+
+This is a CiliumClusterwideNetworkPolicy, not a core NetworkPolicy, and the
+distinction is why it works: packages/system/kubeovn/values.yaml sets
+ENABLE_NP: false, so kube-ovn programs no ACLs and a core NetworkPolicy would
+be created and never enforced. Cilium enforces its own policies regardless.
+
+Deny-only, and expressed from both ends because each end fails in a direction
+the other does not. The source-side spec is an egressDeny on the caller's own
+endpoint, so it holds while this webhook's endpoint policy is being recomputed
+or has overflowed its map, but it relies on Cilium performing the service DNAT
+before egress policy runs. The target-side spec is an ingressDeny on this
+webhook's endpoint, evaluated after whatever DNAT already happened, so it is
+independent of the service-LB implementation, but denying pods there needs a
+cluster-spanning peer enumerated per identity on a fail-closed endpoint.
+
+Be exact about what that means: the source-side spec was added to get a
+cluster-spanning selector OFF this endpoint, and the target-side spec puts one
+back. Shipping both does not eliminate the namespace-churn map writes here; it
+makes them non-load-bearing, because whichever end is degraded the other still
+denies, and the writes are writes rather than an outage (see the cost paragraph
+on the second spec). The alternative -- dropping the target-side rule -- buys
+the coupling back at the price of a silent fail-open if another component
+performs DNAT only after Cilium's egress hook.
+
+That coupling was not reproduced in isolation as the trigger of #3983, and the
+errno the issue reports cannot come from a policy denial; see the PR
+description. The world deny below, the other candidate that issue named, is
+retained on the evidence quoted further down. enableDefaultDeny stays false, so
+the policy subtracts one destination and port and leaves everything else
+exactly as it was.
+
+Only the BACKEND port is denied, and that is sufficient. Cilium translates a
+service to its backends BEFORE egress policy is enforced, so a pod dialling
+this webhook's ClusterIP:443 is matched against the backend identity on the
+port below. Do not add a `toServices` rule to cover the ClusterIP explicitly:
+Cilium resolves `toServices` only inside ALLOW rules
+(pkg/policy/k8s/service.go walks spec.Egress, never spec.EgressDeny), and an
+egressDeny whose only destination is an unresolved `toServices` reaches the
+datapath with a non-nil-but-empty L3 selector, which Cilium reads as a
+WILDCARD when the rule carries toPorts (pkg/policy/types/policyentry.go). That
+denies EVERY destination on that port for every selected endpoint -- a
+cluster-wide egress outage rather than a tighter deny.
+
+That ordering is Cilium's own and it is conditional: it holds while Cilium owns
+service load-balancing. This kube-ovn topology sets ENABLE_LB: false in
+packages/system/kubeovn/values.yaml, does not run kube-proxy, and supports
+ClusterIP routing only with packages/system/cilium/values.yaml
+kubeProxyReplacement set to true. Turning it false leaves no supported service
+translator, so Service traffic fails as a routing error rather than bypassing
+this policy.
+
+If a second unsupported change enabled another translator, the source-side
+rule would see dst = ClusterIP before DNAT and no longer match an endpoint
+identity. The second spec below is evaluated on the destination after whatever
+translation occurred and still denies pod traffic. The Cilium package pins the
+supported value in tests/kube_proxy_replacement_test.yaml and renders
+templates/kube-proxy-replacement-beacon.yaml for a live override that repository
+tests cannot observe.
+
+The API server and host-network workloads are not selected: a rule carrying an
+endpointSelector can never match the host endpoint, because Cilium routes host
+policy through nodeSelector instead (pkg/policy/rule.go, matchesSubject). This
+component exists only on the management cluster, so unlike ingress-nginx there
+is no konnectivity-tunnelled caller to exempt.
+
+The second spec is target-side, on the webhook endpoint, and carries two denies
+kept for different reasons.
+
+Its pod deny is deliberate belt and braces. Being on the destination's ingress
+path it is evaluated after whatever DNAT has already happened, so it still
+holds if another component translates the Service after source-side egress
+policy -- exactly the exposure the paragraph above describes. It cannot catch
+the API server: for a clusterwide policy Cilium rewrites every fromEndpoints
+selector to also require
+k8s:io.kubernetes.pod.namespace to Exist, plus the cluster label (Cilium
+v1.20.2, pkg/k8s/apis/cilium.io/utils/utils.go:120-157 getEndpointSelector,
+whose own comment at :141 says that even a wildcard must not become a truly
+empty allow-all selector), and reserved identities carry neither label. What
+WOULD catch it is `fromEntities: [all]` or an omitted peer, so the shape is
+pinned in tests/networkpolicy_test.yaml rather than left to review.
+
+Its cost, stated rather than denied: a cluster-spanning fromEndpoints peer is
+enumerated per identity, so this rule adds policy-map entries on the webhook
+endpoint in proportion to the number of pod identities in the cluster, and a
+map write on every namespace add or delete. It does not cost a drop window --
+applyPolicyMapChangesLocked in pkg/endpoint/bpf.go adds entries before deleting
+them expressly to avoid transient drops, and inverts that order only when the
+addition would overflow the map, warning when it does. The residual risk is
+therefore cardinality rather than churn: an endpoint whose policy map
+approaches MaxEntries gets the inverted order and a possible transient drop,
+and cozystack leaves endpointLockdownOnMapOverflow at false
+(charts/cilium/values.yaml), so an overflow degrades rather than locking
+the endpoint down.
+
+Its world deny is retained rather than relied upon for the API server:
+`cilium monitor` on this webhook's endpoint on a live kube-ovn cluster showed
+the API server arriving from the node InternalIP with identity `host` when it
+originates on the same node and `kube-apiserver` when it originates on
+another, never from the kube-ovn join subnet and never as `world`.
+
+Note the scope this actually has: it removes in-cluster pods and external
+traffic, not every possible caller. Any host-network workload on the
+management cluster carries the same host / remote-node identity that exempts
+the API server and keeps its reach.
+*/}}
+apiVersion: cilium.io/v2
+kind: CiliumClusterwideNetworkPolicy
+metadata:
+  name: kube-ovn-webhook-{{ $policyHash }}
+specs:
+- endpointSelector: {}
+  enableDefaultDeny:
+    ingress: false
+    egress: false
+  egressDeny:
+  - toEndpoints:
+    - matchLabels:
+        "k8s:io.kubernetes.pod.namespace": {{ .Release.Namespace | quote }}
+        "k8s:app.kubernetes.io/name": {{ include "namespace-annotation-webhook.name" . | quote }}
+        "k8s:app.kubernetes.io/instance": {{ .Release.Name | quote }}
+    toPorts:
+    - ports:
+      - port: {{ include "namespace-annotation-webhook.port" . | quote }}
+        protocol: TCP
+- endpointSelector:
+    matchLabels:
+      "k8s:io.kubernetes.pod.namespace": {{ .Release.Namespace | quote }}
+      "k8s:app.kubernetes.io/name": {{ include "namespace-annotation-webhook.name" . | quote }}
+      "k8s:app.kubernetes.io/instance": {{ .Release.Name | quote }}
+  enableDefaultDeny:
+    ingress: false
+    egress: false
+  ingressDeny:
+  - fromEndpoints:
+    # Every pod in the cluster. The namespace key is matched with Exists so the
+    # rule spans all namespaces rather than only this policy's own, and so the
+    # selector is explicit about the requirement Cilium would otherwise add for
+    # it (see the comment above).
+    - matchExpressions:
+      - key: k8s:io.kubernetes.pod.namespace
+        operator: Exists
+    toPorts:
+    - ports:
+      - port: {{ include "namespace-annotation-webhook.port" . | quote }}
+        protocol: TCP
+  - fromEntities:
+    - world
+    toPorts:
+    - ports:
+      - port: {{ include "namespace-annotation-webhook.port" . | quote }}
+        protocol: TCP
+{{- end }}
diff --git a/packages/system/kubeovn-webhook/templates/service.yaml b/packages/system/kubeovn-webhook/templates/service.yaml
index e3375e447d..06d9d6455e 100644
--- a/packages/system/kubeovn-webhook/templates/service.yaml
+++ b/packages/system/kubeovn-webhook/templates/service.yaml
@@ -9,7 +9,7 @@ spec:
   type: ClusterIP
   ports:
     - port: 443
-      targetPort: 8443
+      targetPort: {{ include "namespace-annotation-webhook.port" . }}
       protocol: TCP
       name: https
   selector:
diff --git a/packages/system/kubeovn-webhook/tests/networkpolicy_capability_test.yaml b/packages/system/kubeovn-webhook/tests/networkpolicy_capability_test.yaml
new file mode 100644
index 0000000000..f722ab4473
--- /dev/null
+++ b/packages/system/kubeovn-webhook/tests/networkpolicy_capability_test.yaml
@@ -0,0 +1,13 @@
+suite: kubeovn-webhook policy capability gate
+release:
+  name: kubeovn-webhook
+  namespace: cozy-kubeovn
+templates:
+  - templates/networkpolicy.yaml
+capabilities:
+  apiVersions: []
+tests:
+  - it: renders nothing when Cilium clusterwide policies are unavailable
+    asserts:
+      - hasDocuments:
+          count: 0
diff --git a/packages/system/kubeovn-webhook/tests/networkpolicy_test.yaml b/packages/system/kubeovn-webhook/tests/networkpolicy_test.yaml
new file mode 100644
index 0000000000..d73f614d4d
--- /dev/null
+++ b/packages/system/kubeovn-webhook/tests/networkpolicy_test.yaml
@@ -0,0 +1,141 @@
+suite: kubeovn-webhook exposure
+release:
+  name: kubeovn-webhook
+  namespace: cozy-kubeovn
+templates:
+  - templates/networkpolicy.yaml
+capabilities:
+  apiVersions:
+    - cilium.io/v2/CiliumClusterwideNetworkPolicy
+tests:
+  - it: selects every pod endpoint as a caller
+    asserts:
+      - isKind:
+          of: CiliumClusterwideNetworkPolicy
+      - equal:
+          path: specs[0].endpointSelector
+          value: {}
+
+  - it: denies direct pod egress to the exact webhook backend and port
+    asserts:
+      - equal:
+          path: specs[0].egressDeny[0].toEndpoints[0].matchLabels["k8s:io.kubernetes.pod.namespace"]
+          value: cozy-kubeovn
+      - equal:
+          path: specs[0].egressDeny[0].toEndpoints[0].matchLabels["k8s:app.kubernetes.io/name"]
+          value: kube-ovn-webhook
+      - equal:
+          path: specs[0].egressDeny[0].toEndpoints[0].matchLabels["k8s:app.kubernetes.io/instance"]
+          value: kubeovn-webhook
+      - equal:
+          path: specs[0].egressDeny[0].toPorts[0].ports[0].port
+          value: "8443"
+      - equal:
+          path: specs[0].egressDeny[0].toPorts[0].ports[0].protocol
+          value: TCP
+
+  # Regression guard for the fail-open-turned-outage this policy shipped with
+  # once. Cilium resolves `toServices` only inside ALLOW rules
+  # (pkg/policy/k8s/service.go walks spec.Egress and never spec.EgressDeny), so
+  # an egressDeny whose only destination is an unresolved `toServices` reaches
+  # the datapath with a non-nil-but-empty L3 selector -- which Cilium reads as a
+  # WILDCARD whenever the rule carries toPorts
+  # (pkg/policy/types/policyentry.go). With endpointSelector {} that turns "deny
+  # this Service on 443" into "deny EVERY destination on 443 for every pod in
+  # the cluster". The rendered YAML looks correct either way, so the shape is
+  # pinned here: one deny rule per spec, and its destination must be a selector
+  # Cilium can actually resolve.
+  - it: gives every deny rule a destination selector Cilium can resolve
+    asserts:
+      - lengthEqual:
+          path: specs
+          count: 2
+      - lengthEqual:
+          path: specs[0].egressDeny
+          count: 1
+      - exists:
+          path: specs[0].egressDeny[0].toEndpoints
+      - notExists:
+          path: specs[0].egressDeny[0].toServices
+      - exists:
+          path: specs[1].ingressDeny[1].fromEntities
+
+  - it: denies world ingress without a namespace-dependent caller selector
+    asserts:
+      - equal:
+          path: specs[1].endpointSelector.matchLabels
+          value:
+            k8s:io.kubernetes.pod.namespace: cozy-kubeovn
+            k8s:app.kubernetes.io/name: kube-ovn-webhook
+            k8s:app.kubernetes.io/instance: kubeovn-webhook
+      - contains:
+          path: specs[1].ingressDeny[1].fromEntities
+          content: world
+      - equal:
+          path: specs[1].ingressDeny[1].toPorts[0].ports[0].port
+          value: "8443"
+      - notExists:
+          path: specs[1].endpointSelector.matchExpressions
+
+  # The target-side pod deny is what keeps this policy enforcing where Cilium is
+  # not the service load balancer, so its PEER is the load-bearing part and the
+  # two ways of losing it are silent. `fromEntities: [all]` and an omitted peer
+  # both widen the rule to every source identity, reserved ones included, which
+  # would deny the API server on a fail-closed webhook -- and both still render
+  # as a plausible-looking ingressDeny. A CRD-sourced fromEndpoints cannot do
+  # that: Cilium rewrites it to also require the pod-namespace label to exist
+  # (pkg/k8s/apis/cilium.io/utils/utils.go:120-157, v1.20.2), which no reserved
+  # identity carries. Both substitutions are asserted against here, and both
+  # were made and watched go red.
+  - it: keeps a target-side pod deny whose peer cannot reach reserved identities
+    asserts:
+      - lengthEqual:
+          path: specs[1].ingressDeny
+          count: 2
+      - equal:
+          path: specs[1].ingressDeny[0].fromEndpoints
+          value:
+            - matchExpressions:
+                - key: k8s:io.kubernetes.pod.namespace
+                  operator: Exists
+      - notExists:
+          path: specs[1].ingressDeny[0].fromEntities
+      - equal:
+          path: specs[1].ingressDeny[0].toPorts[0].ports[0].port
+          value: "8443"
+      - notExists:
+          path: specs[1].ingressDeny[1].fromEndpoints
+
+  - it: does not enable default deny on source or target endpoints
+    asserts:
+      - equal:
+          path: specs[0].enableDefaultDeny
+          value:
+            ingress: false
+            egress: false
+      - equal:
+          path: specs[1].enableDefaultDeny
+          value:
+            ingress: false
+            egress: false
+      - notExists:
+          path: specs[0].ingress
+      - notExists:
+          path: specs[0].ingressDeny
+      - notExists:
+          path: specs[0].egress
+
+  - it: gives each release a cluster-scoped collision-safe name
+    asserts:
+      - matchRegex:
+          path: metadata.name
+          pattern: ^kube-ovn-webhook-[a-f0-9]{12}$
+      - notExists:
+          path: metadata.namespace
+
+  - it: can be disabled where no Cilium is present to enforce it
+    set:
+      webhookPolicy.enabled: false
+    asserts:
+      - hasDocuments:
+          count: 0
diff --git a/packages/system/kubeovn-webhook/tests/port_agreement_test.yaml b/packages/system/kubeovn-webhook/tests/port_agreement_test.yaml
new file mode 100644
index 0000000000..a4fd3cdc10
--- /dev/null
+++ b/packages/system/kubeovn-webhook/tests/port_agreement_test.yaml
@@ -0,0 +1,49 @@
+suite: kubeovn-webhook port agreement
+release:
+  name: kubeovn-webhook
+  namespace: cozy-kubeovn
+templates:
+  - templates/networkpolicy.yaml
+  - templates/deployment.yaml
+  - templates/service.yaml
+capabilities:
+  apiVersions:
+    - cilium.io/v2/CiliumClusterwideNetworkPolicy
+tests:
+  - it: protects exactly the port the webhook serves and the Service routes to
+    # The regression guard for the one drift that fails open. The policy runs
+    # with default-deny disabled, so a policy port that disagrees with the
+    # container port denies a port nothing serves and leaves the real one
+    # reachable -- the control disappears without anything breaking visibly.
+    # All three render from namespace-annotation-webhook.port for that reason.
+    asserts:
+      - equal:
+          path: specs[0].egressDeny[0].toPorts[0].ports[0].port
+          value: "8443"
+        template: templates/networkpolicy.yaml
+      - equal:
+          path: specs[1].ingressDeny[0].toPorts[0].ports[0].port
+          value: "8443"
+        template: templates/networkpolicy.yaml
+      - equal:
+          path: spec.template.spec.containers[0].ports[0].containerPort
+          value: 8443
+        template: templates/deployment.yaml
+      - equal:
+          path: spec.ports[0].targetPort
+          value: 8443
+        template: templates/service.yaml
+
+  - it: exposes the webhook on the Service port the caller dials
+    # The policy no longer mirrors this value -- only the backend port is
+    # denied, and Cilium translates a service to its backends before enforcing
+    # egress policy, so there is no frontend value that has to stay in
+    # agreement. The Service still has to expose 443, because that is the port
+    # the caller dials: this package registers a MutatingWebhookConfiguration
+    # whose clientConfig.service omits `port`, and the API server defaults that
+    # to 443.
+    asserts:
+      - equal:
+          path: spec.ports[0].port
+          value: 443
+        template: templates/service.yaml
diff --git a/packages/system/kubeovn-webhook/values.yaml b/packages/system/kubeovn-webhook/values.yaml
index afbfeb7e4b..eef64b0730 100644
--- a/packages/system/kubeovn-webhook/values.yaml
+++ b/packages/system/kubeovn-webhook/values.yaml
@@ -1,3 +1,69 @@
 portSecurity: true
 routes: ""
-image: ghcr.io/cozystack/cozystack/kubeovn-webhook:v1.4.0-rc.2@sha256:b665c5962d524bf9a69b43762d29db87d37a4ab62985d8596fb6b248f4283d38
+# Client-certificate verification for callers of the /mutate-pods endpoint.
+#
+# The handler returns namespace-derived annotations to whoever asks it, so the
+# only thing that keeps it from answering an arbitrary in-cluster pod is
+# authenticating the caller (GHSA-g883-q79m-8225), or constraining who can
+# reach it at all -- see webhookPolicy below, which does the latter. A *core*
+# NetworkPolicy is not an option here: packages/system/kubeovn/values.yaml sets
+# ENABLE_NP: false, so kube-ovn-controller programs no ACLs and the object would
+# be created and never enforced. A CiliumClusterwideNetworkPolicy is enforced
+# by Cilium regardless, which is the path webhookPolicy takes.
+#
+# Empty (the default) = certificates are requested and logged, never required.
+# Nothing is rejected, so this cannot break admission. Read the webhook log:
+#   "client certificate: presented, issuer ..."  → enforcement is possible
+#   "client certificate: none presented"         → it is not, yet
+#
+# Leave it empty. There is nothing to point it at yet: the pod mounts only its
+# own serving secret at /etc/webhook/certs, and the ca.crt in there is this
+# webhook's serving CA, not the API server's client CA. A path that does not
+# exist aborts startup; that ca.crt starts cleanly and then rejects every
+# API-server handshake. Either way this webhook is registered with
+# failurePolicy: Fail, so pod creation stops cluster-wide.
+#
+# Enabling enforcement is the second step, and it lands as one change: a volume
+# carrying the API server's client CA, a pool that reloads when that CA rotates,
+# and this key pointed at the mounted path. Until then the flag exists so the
+# observation above can run, not so it can be switched on.
+clientCAFile: ""
+image: ghcr.io/cozystack/cozystack/kubeovn-webhook:v1.6.0@sha256:593c324a38db59495497c5b68b90cad25dfe6753c73b7a287b3280e26f70a15f
+
+# Restrict who may reach the webhook's serving port.
+#
+# The handler returns namespace-derived annotations to any caller, and only the
+# API server should be calling it. clientCAFile above cannot enforce that on a
+# stock control plane -- the API server presents no client certificate unless
+# its AdmissionConfiguration names a kubeConfigFile for the webhook plugins,
+# and a stock Cozystack control plane ships only a PodSecurity block. Until
+# that changes, this policy is the enforcement.
+#
+# Rendered as a CiliumClusterwideNetworkPolicy on purpose: kube-ovn runs with
+# ENABLE_NP: false, so a core NetworkPolicy object would be created and never
+# enforced. The template renders only when that Cilium API is discoverable; set
+# enabled: false to opt out explicitly.
+# The port is deliberately not configurable here. It has to agree with the
+# container port and the Service targetPort, and because the policy runs with
+# default-deny disabled, a disagreement fails open: the policy would deny a port
+# nothing serves while the real one stayed reachable, removing this control
+# without breaking anything visible. The source-side endpoint deny and the
+# target-side world deny both read that one definition -- see
+# namespace-annotation-webhook.port in templates/_helpers.tpl. Only the backend
+# port is denied; Cilium translates a service to its backends before enforcing
+# egress policy, so ClusterIP-addressed traffic is matched there too. Cozystack
+# supports this topology only with packages/system/cilium/values.yaml
+# kubeProxyReplacement set to true: kube-ovn has ENABLE_LB: false and kube-proxy
+# is absent. Turning it false leaves no supported Service translator and breaks
+# ClusterIP routing rather than reopening /mutate-pods. If another unsupported
+# change supplied a translator, the target-side rule would still deny pod
+# traffic after DNAT even though the source-side rule lost that path.
+#
+# Residual risk worth stating: no test in this repo can observe a live cluster's
+# Cilium values, so an operator setting kubeProxyReplacement: false in the field
+# is caught only by the status ConfigMap that
+# packages/system/cilium/templates/kube-proxy-replacement-beacon.yaml renders.
+# The beacon identifies an unsupported networking configuration; disabling this
+# policy does not make it supported.
+webhookPolicy:
+  enabled: true
diff --git a/packages/system/kubeovn/Chart.yaml b/packages/system/kubeovn/Chart.yaml
index b1a4e05b37..d153279488 100644
--- a/packages/system/kubeovn/Chart.yaml
+++ b/packages/system/kubeovn/Chart.yaml
@@ -1,3 +1,3 @@
 apiVersion: v2
 name: cozy-kubeovn
-version: 0.38.0
+version: 0.39.0
diff --git a/packages/system/kubeovn/Makefile b/packages/system/kubeovn/Makefile
index 456290423e..c37c026c3b 100644
--- a/packages/system/kubeovn/Makefile
+++ b/packages/system/kubeovn/Makefile
@@ -1,11 +1,47 @@
+KUBEOVN_TAG=$(shell awk '$$1 == "appVersion:" {print $$2}' charts/kube-ovn/Chart.yaml)
+
 export NAME=kubeovn
 export NAMESPACE=cozy-$(NAME)
 
 include ../../../hack/common-envs.mk
 include ../../../hack/package.mk
 
+test:
+	helm unittest .
+
 update:
-	rm -rf charts values.yaml Chart.yaml
-	tag=$$(git ls-remote --tags --sort="v:refname" https://github.com/cozystack/kubeovn-chart | awk -F'[/^]' 'END{print $$3}') && \
-	curl -sSL https://github.com/cozystack/kubeovn-chart/archive/refs/tags/$${tag}.tar.gz | \
-	tar xzvf - --strip 2 kubeovn-chart-$${tag#*v}/chart
+	rm -rf charts
+	tag=$$(git ls-remote --tags --sort="v:refname" https://github.com/kubeovn/kube-ovn | awk -F'[/^]' '{print $$3}' | grep '^v1\.15\.' | tail -n1) && \
+	curl -sSL https://github.com/kubeovn/kube-ovn/archive/refs/tags/$${tag}.tar.gz | \
+	tar -xzf - --strip 1 kube-ovn-$${tag#*v}/charts/kube-ovn
+	# Teach the CNI DaemonSet to honour an explicit MTU: upstream derives it from
+	# the node interface, which is wrong when the underlay is encapsulated.
+	patch --no-backup-if-mismatch -p4 < patches/mtu.diff
+	version=$$(awk '$$1 == "appVersion:" {print $$2}' charts/kube-ovn/Chart.yaml) && \
+	$(SED_INPLACE) -e "s/ARG VERSION=.*/ARG VERSION=$${version}/" images/kubeovn/Dockerfile && \
+	$(SED_INPLACE) -e "s/ARG TAG=.*/ARG TAG=v$${version}/" images/kubeovn/Dockerfile
+	# images/kubeovn/Dockerfile is a copy of upstream's dist/images/Dockerfile
+	# and only its ARG lines are rewritten above, so a binary upstream starts
+	# shipping does not reach our image on its own. v1.15.26 added
+	# kube-ovn-bfdd-supervisor that way and nothing noticed until the container
+	# it backs could not exec. hack/check-kubeovn-image-copies.bats makes the
+	# same comparison on every CI run against a fixture of upstream's file; the
+	# test named "the fixture tracks the vendored chart version" is the one that
+	# asks for that fixture to be refreshed, and it fires after a bump lands.
+	version=$$(awk '$$1 == "appVersion:" {gsub(/"/, "", $$2); print $$2}' charts/kube-ovn/Chart.yaml) && \
+	curl -sSfL https://raw.githubusercontent.com/kubeovn/kube-ovn/v$${version}/dist/images/Dockerfile | \
+	../../../hack/check-kubeovn-image-copies.sh images/kubeovn/Dockerfile -
+
+image:
+	docker buildx build images/kubeovn \
+		$(call image-tags,kubeovn,v$(KUBEOVN_TAG)) \
+		$(call cache-args,kubeovn) \
+		--metadata-file images/kubeovn.json \
+		$(BUILDX_ARGS)
+	ADDRESS="$(REGISTRY)" \
+		yq -i '.global.registry.address = strenv(ADDRESS)' values.yaml
+	REPOSITORY="kubeovn" \
+		yq -i '.global.images.kubeovn.repository = strenv(REPOSITORY)' values.yaml
+	TAG="$(IMAGE_TAG)@$$(yq e '."containerimage.digest"' images/kubeovn.json -o json -r)" \
+		yq -i '.global.images.kubeovn.tag = strenv(TAG)' values.yaml
+	rm -f images/kubeovn.json
diff --git a/packages/system/kubeovn/charts/kube-ovn/Chart.yaml b/packages/system/kubeovn/charts/kube-ovn/Chart.yaml
index 9c01c123ac..d025e7de3b 100644
--- a/packages/system/kubeovn/charts/kube-ovn/Chart.yaml
+++ b/packages/system/kubeovn/charts/kube-ovn/Chart.yaml
@@ -15,12 +15,12 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: v1.15.10
+version: v1.15.26
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "1.15.10"
+appVersion: "1.15.26"
 
 kubeVersion: ">= 1.29.0-0"
diff --git a/packages/system/kubeovn/charts/kube-ovn/README.md b/packages/system/kubeovn/charts/kube-ovn/README.md
index 74e5c3f13c..eed32a2833 100644
--- a/packages/system/kubeovn/charts/kube-ovn/README.md
+++ b/packages/system/kubeovn/charts/kube-ovn/README.md
@@ -50,5 +50,9 @@ and use the following options to install this Helm-chart:
 --set cni_conf.MOUNT_LOCAL_BIN_DIR=false
 --set OPENVSWITCH_DIR=/var/lib/openvswitch
 --set OVN_DIR=/var/lib/ovn
+--set OVN_IPSEC_KEY_DIR=/var/lib/ovs_ipsec_keys
 --set DISABLE_MODULES_MANAGEMENT=true
 ```
+
+`OVN_IPSEC_KEY_DIR` only becomes a host mount when `func.ENABLE_OVN_IPSEC` is enabled, but setting it up
+front keeps IPSEC from failing later with `mkdir /etc/origin: read-only file system`.
diff --git a/packages/system/kubeovn/charts/kube-ovn/templates/_helpers.tpl b/packages/system/kubeovn/charts/kube-ovn/templates/_helpers.tpl
index ce144769e6..19141bb854 100644
--- a/packages/system/kubeovn/charts/kube-ovn/templates/_helpers.tpl
+++ b/packages/system/kubeovn/charts/kube-ovn/templates/_helpers.tpl
@@ -10,10 +10,10 @@ a dry-run/template call and return nothing.
   {{- $label := splitList "=" $.Values.MASTER_NODES_LABEL }}
   {{- $key := index $label 0 }}
   {{- $val := "" }}
-  {{- if eq (len $label) 2 }}
-  {{- $val = index $label 1 }}
+  {{- if gt (len $label) 1 }}
+  {{- $val = join "=" (rest $label) }}
   {{- end }}
-  {{- if eq (index $node.metadata.labels $key) $val -}}
+  {{- if and (hasKey $node.metadata.labels $key) (or (eq $val "") (eq (index $node.metadata.labels $key) $val)) -}}
     {{- range $address := $node.status.addresses -}}
       {{- if eq $address.type "InternalIP" -}}
         {{- $ips = append $ips $address.address -}}
@@ -29,6 +29,33 @@ a dry-run/template call and return nothing.
 {{- end -}}
 {{- end -}}
 
+{{/*
+Render nodeAffinity for master node scheduling.
+Uses Exists operator when MASTER_NODES_LABEL has no value or empty value
+(matches any value), and In operator when a specific value is given.
+Handles "key", "key=value", "key=" and "key=val=ue" formats correctly.
+*/}}
+{{- define "kubeovn.masterNodeAffinity" -}}
+{{- $parts := splitList "=" .Values.MASTER_NODES_LABEL -}}
+{{- $key := index $parts 0 -}}
+{{- $val := "" -}}
+{{- if gt (len $parts) 1 -}}
+  {{- $val = join "=" (rest $parts) -}}
+{{- end -}}
+nodeAffinity:
+  requiredDuringSchedulingIgnoredDuringExecution:
+    nodeSelectorTerms:
+      - matchExpressions:
+          - key: {{ $key }}
+          {{- if ne $val "" }}
+            operator: In
+            values:
+              - {{ $val | quote }}
+          {{- else }}
+            operator: Exists
+          {{- end }}
+{{- end -}}
+
 {{/*
 Number of master nodes
 */}}
@@ -36,50 +63,284 @@ Number of master nodes
   {{- len (split "," (.Values.MASTER_NODES | default (include "kubeovn.nodeIPs" .))) }}
 {{- end -}}
 
+{{/*
+Number of Kubernetes nodes, falling back to MASTER_NODES for offline rendering.
+*/}}
+{{- define "kubeovn.k8sNodeCount" -}}
+{{- $nodes := lookup "v1" "Node" "" "" -}}
+{{- if and $nodes $nodes.items -}}
+{{- len $nodes.items -}}
+{{- else -}}
+{{- include "kubeovn.nodeCount" . -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Replica count for the ovn-central Deployment. Single mode always uses 1;
+cluster mode uses one replica per master node.
+*/}}
+{{- define "kubeovn.ovnCentralReplicas" -}}
+{{- if index .Values "ovn-central" "hcp" "enabled" -}}
+{{- index .Values "ovn-central" "hcp" "replicas" -}}
+{{- else if eq .Values.OVN_CENTRAL_MODE "single" -}}
+1
+{{- else -}}
+{{- include "kubeovn.nodeCount" . -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "kubeovn.centralNamespace" -}}
+{{- if index .Values "ovn-central" "hcp" "enabled" -}}
+{{- default .Values.namespace (index .Values "ovn-central" "hcp" "namespace") -}}
+{{- else -}}
+{{- .Values.namespace -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "kubeovn.centralRaftAddresses" -}}
+{{- $namespace := include "kubeovn.centralNamespace" . -}}
+{{- $addresses := list -}}
+{{- range $i := until (int (index .Values "ovn-central" "hcp" "replicas")) -}}
+{{- $addresses = append $addresses (printf "ovn-central-%d.ovn-central.%s.svc" $i $namespace) -}}
+{{- end -}}
+{{- join "," $addresses -}}
+{{- end -}}
+
+{{/*
+Environment variables used by the OVN NB/SB database server TLS setup.
+*/}}
+{{- define "kubeovn.ovnCentralTLSEnv" -}}
+- name: ENABLE_SSL
+  value: {{ .Values.networking.ENABLE_SSL | quote }}
+- name: TLS_MIN_VERSION
+  value: {{ .Values.networking.TLS_MIN_VERSION | quote }}
+- name: TLS_MAX_VERSION
+  value: {{ .Values.networking.TLS_MAX_VERSION | quote }}
+- name: TLS_CIPHER_SUITES
+  value: {{ join "," .Values.networking.TLS_CIPHER_SUITES | quote }}
+{{- end -}}
+
+{{/*
+TLS arguments for kube-ovn components that expose HTTPS endpoints.
+*/}}
+{{- define "kubeovn.componentTLSArgs" -}}
+{{- if .Values.networking.TLS_MIN_VERSION }}
+- --tls-min-version={{ .Values.networking.TLS_MIN_VERSION }}
+{{- end }}
+{{- if .Values.networking.TLS_MAX_VERSION }}
+- --tls-max-version={{ .Values.networking.TLS_MAX_VERSION }}
+{{- end }}
+{{- if .Values.networking.TLS_CIPHER_SUITES }}
+{{- range .Values.networking.TLS_CIPHER_SUITES }}
+- --tls-cipher-suites={{ . }}
+{{- end }}
+{{- end }}
+{{- end -}}
+
+{{/*
+Replica count for the kube-ovn-controller Deployment.
+dataPlaneOnly runs against a hosted ovn-central, so cap controller
+replicas at two while allowing single-node clusters to run one.
+*/}}
+{{- define "kubeovn.controllerReplicas" -}}
+{{- $override := dig "replicas" nil (index .Values "kube-ovn-controller") -}}
+{{- if eq .Values.installMode "dataPlaneOnly" -}}
+{{- min 2 (include "kubeovn.k8sNodeCount" . | int) -}}
+{{- else if $override -}}
+{{ $override }}
+{{- else -}}
+{{- include "kubeovn.nodeCount" . -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Value of the NODE_IPS / OVN_DB_IPS env variable.
+  - dataPlaneOnly: invalid; workload components use OVN_NB_ADDR/OVN_SB_ADDR.
+  - single (control-plane / full): emit empty so start-db.sh takes the
+    standalone path and clients fall back to Service ClusterIP via the
+    auto-injected OVN_*_SERVICE_HOST env vars.
+  - cluster (default raft): emit comma-separated master node IPs.
+*/}}
+{{- define "kubeovn.ovnCentralNodeIPs" -}}
+{{- if index .Values "ovn-central" "hcp" "enabled" -}}
+{{- include "kubeovn.centralRaftAddresses" . -}}
+{{- else if eq .Values.installMode "dataPlaneOnly" -}}
+{{- fail "installMode=dataPlaneOnly uses OVN_NB_ADDR/OVN_SB_ADDR; do not render OVN_DB_IPS" -}}
+{{- else if eq .Values.OVN_CENTRAL_MODE "single" -}}
+{{- else -}}
+{{ .Values.MASTER_NODES | default (include "kubeovn.nodeIPs" .) }}
+{{- end -}}
+{{- end -}}
+
+{{- define "kubeovn.externalOvnNbAddress" -}}
+{{- $endpoint := required "installMode=dataPlaneOnly requires externalOvnCentral.nbEndpoint" .Values.externalOvnCentral.nbEndpoint -}}
+tcp:{{ include "kubeovn.externalOvnHost" $endpoint }}:{{ .Values.externalOvnCentral.nbPort | default 6641 }}
+{{- end -}}
+
+{{- define "kubeovn.externalOvnSbAddress" -}}
+{{- $endpoint := required "installMode=dataPlaneOnly requires externalOvnCentral.sbEndpoint" .Values.externalOvnCentral.sbEndpoint -}}
+tcp:{{ include "kubeovn.externalOvnHost" $endpoint }}:{{ .Values.externalOvnCentral.sbPort | default 6642 }}
+{{- end -}}
+
+{{- define "kubeovn.externalOvnHost" -}}
+{{- if and (contains ":" .) (not (hasPrefix "[" .)) -}}
+[{{ . }}]
+{{- else -}}
+{{ . }}
+{{- end -}}
+{{- end -}}
+
+{{- define "kubeovn.ovnNbAddress" -}}
+{{- if not (index .Values "ovn-central" "hcp" "nbAddress") -}}
+{{- fail "ovn-central.hcp.nbAddress must be set when ovn-central.hcp.enabled is true" -}}
+{{- end -}}
+{{- index .Values "ovn-central" "hcp" "nbAddress" -}}
+{{- end -}}
+
+{{- define "kubeovn.ovnSbAddress" -}}
+{{- if not (index .Values "ovn-central" "hcp" "sbAddress") -}}
+{{- fail "ovn-central.hcp.sbAddress must be set when ovn-central.hcp.enabled is true" -}}
+{{- end -}}
+{{- index .Values "ovn-central" "hcp" "sbAddress" -}}
+{{- end -}}
+
+{{/*
+Validate the ovn-central.service block. Currently the only invariant we
+enforce is that LoadBalancer service type must come with an explicit
+loadBalancerIP, because ovn-nb / ovn-sb / ovn-northd should land on the same
+stable VIP when exposed through that Service type. Without it cloud LBs may
+allocate three different IPs unexpectedly. Use {{- include "kubeovn.validateService" . }}
+anywhere a Service is rendered so the validation runs on every template.
+*/}}
+{{- define "kubeovn.validateService" -}}
+{{- $svc := index .Values "ovn-central" "service" -}}
+{{- if eq $svc.type "LoadBalancer" -}}
+{{- if not $svc.loadBalancerIP -}}
+{{- fail "ovn-central.service.type=LoadBalancer requires ovn-central.service.loadBalancerIP to be set so ovn-nb / ovn-sb / ovn-northd share a stable VIP. Pick a VIP, configure your LB controller to assign it (MetalLB allow-shared-ip annotation is emitted automatically), then re-run helm." -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Port the agents/controller should use to connect to ovn-nb. In dataPlaneOnly
+mode this picks up externalOvnCentral.nbPort so NodePort or non-default
+LoadBalancer port mappings work. Other modes use the in-cluster Service port
+6641.
+*/}}
+{{- define "kubeovn.ovnNbPort" -}}
+{{- if eq .Values.installMode "dataPlaneOnly" -}}
+{{ .Values.externalOvnCentral.nbPort | default 6641 }}
+{{- else -}}
+6641
+{{- end -}}
+{{- end -}}
+
+{{/*
+Port the agents/controller should use to connect to ovn-sb. Mirror of
+kubeovn.ovnNbPort for the southbound DB.
+*/}}
+{{- define "kubeovn.ovnSbPort" -}}
+{{- if eq .Values.installMode "dataPlaneOnly" -}}
+{{ .Values.externalOvnCentral.sbPort | default 6642 }}
+{{- else -}}
+6642
+{{- end -}}
+{{- end -}}
+
+{{/*
+Render gate for control-plane resources (ovn-central + Services + its RBAC).
+Emits "true" when this Helm release should render control-plane resources;
+empty otherwise. Use with {{- if include "kubeovn.renderControlPlane" . }}.
+*/}}
+{{- define "kubeovn.renderControlPlane" -}}
+{{- if or (eq .Values.installMode "full") (eq .Values.installMode "controlPlaneOnly") -}}
+true
+{{- end -}}
+{{- end -}}
+
+{{/*
+Render gate for data-plane resources (CRDs + kube-ovn-controller + ovs-ovn +
+kube-ovn-cni + kube-ovn-pinger + kube-ovn-monitor + their RBAC).
+*/}}
+{{- define "kubeovn.renderDataPlane" -}}
+{{- if or (eq .Values.installMode "full") (eq .Values.installMode "dataPlaneOnly") -}}
+true
+{{- end -}}
+{{- end -}}
+
+{{/*
+Render gate for components that only make sense in a single-cluster install:
+- ovn-dpdk DaemonSet (start-ovs-dpdk-v2.sh still talks to OVN_SB_SERVICE_HOST,
+  no externalOvnCentral support yet)
+- pre-upgrade-ovs-ovn / upgrade-ovs-ovn hooks (upgrade-ovs.sh checks a local
+  deploy/ovn-central, so it fails on tenant-only installs)
+Use `kubeovn.renderFullOnly` when the resource is not yet ready for the
+split-cluster hosted ovn-central deployment.
+*/}}
+{{- define "kubeovn.renderFullOnly" -}}
+{{- if eq .Values.installMode "full" -}}
+true
+{{- end -}}
+{{- end -}}
+
+{{/*
+Kube-OVN TLS is owned by the management cluster in dataPlaneOnly installs.
+Disable local rotation there so a tenant cluster cannot replace the shared CA.
+*/}}
+{{- define "kubeovn.kubeOVNTLSRotationInterval" -}}
+{{- if eq .Values.installMode "dataPlaneOnly" -}}
+0
+{{- else -}}
+{{ .Values.networking.KUBE_OVN_TLS_ROTATION_INTERVAL }}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Determine the updateStrategy type for the ovs-ovn DaemonSet.
+If ovs-ovn.updateStrategy.type is set, use it directly.
+Otherwise, auto-detect based on the currently deployed DaemonSet.
+*/}}
 {{- define "kubeovn.ovs-ovn.updateStrategy" -}}
-  {{- $ds := lookup "apps/v1" "DaemonSet" $.Values.namespace "ovs-ovn" -}}
-  {{- if $ds -}}
-    {{- if eq $ds.spec.updateStrategy.type "RollingUpdate" -}}
-      RollingUpdate
-    {{- else -}}
-      {{- $chartVersion := index $ds.metadata.annotations "chart-version" }}
-      {{- $newChartVersion := printf "%s-%s" .Chart.Name .Chart.Version }}
-      {{- $imageVersion := (index $ds.spec.template.spec.containers 0).image | splitList ":" | last | trimPrefix "v" -}}
-      {{- $versionRegex := `^(?P<major>0|[1-9]\d*)\.(?P<minor>0|[1-9]\d*)\.(?P<patch>0|[1-9]\d*)` -}}
-      {{- if and (ne $newChartVersion $chartVersion) (regexMatch $versionRegex $imageVersion) -}}
-        {{- if regexFind $versionRegex $imageVersion | semverCompare ">= 1.12.0" -}}
-          RollingUpdate
+  {{- $updateStrategy := index $.Values "ovs-ovn" "updateStrategy" -}}
+  {{- $desiredStrategy := "" -}}
+  {{- if $updateStrategy -}}
+    {{- $desiredStrategy = index $updateStrategy "type" -}}
+  {{- end -}}
+  {{- if $desiredStrategy -}}
+    {{- $desiredStrategy -}}
+  {{- else -}}
+    {{- $ds := lookup "apps/v1" "DaemonSet" $.Values.namespace "ovs-ovn" -}}
+    {{- if $ds -}}
+      {{- if eq $ds.spec.updateStrategy.type "RollingUpdate" -}}
+        RollingUpdate
+      {{- else -}}
+        {{- $chartVersion := index $ds.metadata.annotations "chart-version" }}
+        {{- $newChartVersion := printf "%s-%s" .Chart.Name .Chart.Version }}
+        {{- $imageVersion := (index $ds.spec.template.spec.containers 0).image | splitList ":" | last | trimPrefix "v" -}}
+        {{- $versionRegex := `^(?P<major>0|[1-9]\d*)\.(?P<minor>0|[1-9]\d*)\.(?P<patch>0|[1-9]\d*)` -}}
+        {{- if and (ne $newChartVersion $chartVersion) (regexMatch $versionRegex $imageVersion) -}}
+          {{- if regexFind $versionRegex $imageVersion | semverCompare ">= 1.12.0" -}}
+            RollingUpdate
+          {{- else -}}
+            OnDelete
+          {{- end -}}
         {{- else -}}
           OnDelete
         {{- end -}}
-      {{- else -}}
-        OnDelete
       {{- end -}}
+    {{- else -}}
+      RollingUpdate
     {{- end -}}
-  {{- else -}}
-    RollingUpdate
   {{- end -}}
 {{- end -}}
 
-{{- define "kubeovn.ovn.versionCompatibility" -}}
+{{- define "kubeovn.ovn.upgradeNeeded" -}}
   {{- $ds := lookup "apps/v1" "DaemonSet" $.Values.namespace "ovs-ovn" -}}
   {{- if $ds -}}
     {{- $chartVersion := index $ds.metadata.annotations "chart-version" }}
     {{- $newChartVersion := printf "%s-%s" .Chart.Name .Chart.Version }}
-    {{- $imageVersion := (index $ds.spec.template.spec.containers 0).image | splitList ":" | last | trimPrefix "v" -}}
-    {{- $versionRegex := `^(?P<major>0|[1-9]\d*)\.(?P<minor>0|[1-9]\d*)\.(?P<patch>0|[1-9]\d*)` -}}
-    {{- if and (ne $newChartVersion $chartVersion) (regexMatch $versionRegex $imageVersion) -}}
-      {{- if regexFind $versionRegex $imageVersion | semverCompare ">= 1.15.0" -}}
-        25.03
-      {{- else if regexFind $versionRegex $imageVersion | semverCompare ">= 1.13.0" -}}
-        24.03
-      {{- else if regexFind $versionRegex $imageVersion | semverCompare ">= 1.12.0" -}}
-        22.12
-      {{- else if regexFind $versionRegex $imageVersion | semverCompare ">= 1.11.0" -}}
-        22.03
-      {{- else -}}
-        21.06
-      {{- end -}}
+    {{- if ne $newChartVersion $chartVersion -}}
+      true
     {{- end -}}
   {{- end -}}
 {{- end -}}
diff --git a/packages/system/kubeovn/charts/kube-ovn/templates/central-deploy.yaml b/packages/system/kubeovn/charts/kube-ovn/templates/central-deploy.yaml
index 1bb0ece453..db3fc161f2 100644
--- a/packages/system/kubeovn/charts/kube-ovn/templates/central-deploy.yaml
+++ b/packages/system/kubeovn/charts/kube-ovn/templates/central-deploy.yaml
@@ -1,18 +1,55 @@
-kind: Deployment
+{{- if include "kubeovn.renderControlPlane" . }}
+{{- /*
+Guard against in-place mode switches that would silently drop the live OVN
+DB. Switching from raft cluster (hostPath /etc/ovn) to single (PVC) leaves
+the new pod starting against an empty PVC; reverse direction loses the
+PVC-backed DB. Detect the existing Deployment's volume type via `lookup` and
+fail with explicit migration instructions if it disagrees with the rendered
+OVN_CENTRAL_MODE. `lookup` returns empty during dry-run / template, so this
+only fires on a real install/upgrade against a cluster.
+*/}}
+{{- $existing := lookup "apps/v1" "Deployment" .Values.namespace "ovn-central" }}
+{{- if not (index .Values "ovn-central" "hcp" "enabled") }}
+{{- if $existing }}
+  {{- range $existing.spec.template.spec.volumes }}
+    {{- if eq .name "host-config-ovn" }}
+      {{- if and (eq $.Values.OVN_CENTRAL_MODE "single") .hostPath }}
+        {{- fail "Refusing to switch OVN_CENTRAL_MODE in place from raft (hostPath) to single (PVC). The new render would start ovn-central against an empty PVC and lose live OVN state. Migrate explicitly: (1) snapshot the current DB with `bash dist/images/restore-ovn-nb-db.sh` style backup; (2) `helm uninstall` the current release; (3) `helm install` with OVN_CENTRAL_MODE=single onto a fresh namespace or after clearing the existing ovn-central Deployment; (4) restore the snapshot via `bash dist/images/restore-ovn-nb-db.sh single <backup.db>`." }}
+      {{- end }}
+      {{- if and (ne $.Values.OVN_CENTRAL_MODE "single") .persistentVolumeClaim }}
+        {{- fail "Refusing to switch OVN_CENTRAL_MODE in place from single (PVC) to raft (hostPath). The new render would lose the PVC-backed DB. Migrate explicitly: snapshot the DB, helm uninstall, then helm install in the target mode and restore the snapshot." }}
+      {{- end }}
+    {{- end }}
+  {{- end }}
+{{- end }}
+{{- end }}
+kind: {{ ternary "StatefulSet" "Deployment" (index .Values "ovn-central" "hcp" "enabled") }}
 apiVersion: apps/v1
 metadata:
   name: ovn-central
-  namespace: {{ .Values.namespace }}
+  namespace: {{ include "kubeovn.centralNamespace" . }}
   annotations:
     kubernetes.io/description: |
       OVN components: northd, nb and sb.
 spec:
-  replicas: {{ include "kubeovn.nodeCount" . }}
+  replicas: {{ include "kubeovn.ovnCentralReplicas" . }}
+  {{- if index .Values "ovn-central" "hcp" "enabled" }}
+  serviceName: ovn-central
+  podManagementPolicy: Parallel
+  persistentVolumeClaimRetentionPolicy:
+    whenDeleted: Delete
+    whenScaled: Delete
+  {{- else }}
   strategy:
+    {{- if eq .Values.OVN_CENTRAL_MODE "single" }}
+    type: Recreate
+    {{- else }}
     rollingUpdate:
       maxSurge: 0
       maxUnavailable: 1
     type: RollingUpdate
+    {{- end }}
+  {{- end }}
   selector:
     matchLabels:
       app: ovn-central
@@ -24,48 +61,68 @@ spec:
         type: infra
     spec:
       tolerations:
-        - effect: NoSchedule
-          operator: Exists
-        - effect: NoExecute
-          operator: Exists
+        {{- with (index .Values "ovn-central" "tolerations") }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
         - key: CriticalAddonsOnly
           operator: Exists
       affinity:
+        {{- if or (index .Values "ovn-central" "hcp" "enabled") (ne .Values.OVN_CENTRAL_MODE "single") }}
         podAntiAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
             - labelSelector:
                 matchLabels:
                   app: ovn-central
               topologyKey: kubernetes.io/hostname
+        {{- end }}
+        {{- if not (index .Values "ovn-central" "hcp" "enabled") }}
+        {{- include "kubeovn.masterNodeAffinity" . | nindent 8 }}
+        {{- end }}
       priorityClassName: system-cluster-critical
-      serviceAccountName: ovn-ovs
+      serviceAccountName: {{ ternary "ovn-central" "ovn-ovs" (index .Values "ovn-central" "hcp" "enabled") }}
       automountServiceAccountToken: true
-      hostNetwork: true
+      hostNetwork: {{ ternary "false" "true" (index .Values "ovn-central" "hcp" "enabled") }}
       securityContext:
         seccompProfile:
           type: RuntimeDefault
       initContainers:
-        - name: hostpath-init
+        - name: {{ ternary "volume-init" "hostpath-init" (index .Values "ovn-central" "hcp" "enabled") }}
           image: {{ .Values.global.registry.address }}/{{ .Values.global.images.kubeovn.repository }}:{{ .Values.global.images.kubeovn.tag }}
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           command:
             - sh
             - -c
+            {{- if index .Values "ovn-central" "hcp" "enabled" }}
             - "chown -R nobody: /var/run/ovn /etc/ovn /var/log/ovn"
+            {{- else }}
+            {{- if eq .Values.OVN_CENTRAL_MODE "single" }}
+            # /etc/ovn comes from a PVC in single-replica mode. Backends like
+            # root-squashed NFS reject chown by root, so make the OVN DB
+            # directory chown best-effort; the OVN containers run as `nobody`
+            # and will create new files with the correct owner regardless.
+            - "chown -R nobody: /var/run/ovn /var/log/ovn && (chown -R nobody: /etc/ovn 2>/dev/null || echo 'chown /etc/ovn skipped (likely root-squashed NFS); ovn will write as nobody anyway')"
+            {{- else }}
+            - "chown -R nobody: /var/run/ovn /etc/ovn /var/log/ovn"
+            {{- end }}
+            {{- end }}
           securityContext:
-            allowPrivilegeEscalation: true
+            allowPrivilegeEscalation: {{ ternary "false" "true" (index .Values "ovn-central" "hcp" "enabled") }}
             capabilities:
+              {{- if index .Values "ovn-central" "hcp" "enabled" }}
+              add:
+                - CHOWN
+              {{- end }}
               drop:
                 - ALL
-            privileged: true
+            privileged: {{ ternary "false" "true" (index .Values "ovn-central" "hcp" "enabled") }}
             runAsUser: 0
           volumeMounts:
             - mountPath: /var/run/ovn
-              name: host-run-ovn
+              name: {{ ternary "run-ovn" "host-run-ovn" (index .Values "ovn-central" "hcp" "enabled") }}
             - mountPath: /etc/ovn
-              name: host-config-ovn
+              name: {{ ternary "ovn-data" "host-config-ovn" (index .Values "ovn-central" "hcp" "enabled") }}
             - mountPath: /var/log/ovn
-              name: host-log-ovn
+              name: {{ ternary "log-ovn" "host-log-ovn" (index .Values "ovn-central" "hcp" "enabled") }}
       containers:
         - name: ovn-central
           image: {{ .Values.global.registry.address }}/{{ .Values.global.images.kubeovn.repository }}:{{ .Values.global.images.kubeovn.tag }}
@@ -81,14 +138,32 @@ spec:
                 - NET_BIND_SERVICE
                 - SYS_NICE
           env:
-            - name: ENABLE_SSL
-              value: "{{ .Values.networking.ENABLE_SSL }}"
+{{- include "kubeovn.ovnCentralTLSEnv" . | nindent 12 }}
+            {{- if index .Values "ovn-central" "hcp" "enabled" }}
+            - name: POD_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.name
+            - name: POD_NAMESPACE
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.namespace
+            {{- end }}
             - name: NODE_IPS
-              value: "{{ .Values.MASTER_NODES | default (include "kubeovn.nodeIPs" .) }}"
+              value: "{{ include "kubeovn.ovnCentralNodeIPs" . }}"
+            {{- if index .Values "ovn-central" "hcp" "enabled" }}
+            - name: DB_CLUSTER_ADDR
+              value: "$(POD_NAME).ovn-central.$(POD_NAMESPACE).svc"
+            {{- end }}
             - name: POD_IP
+              {{- if index .Values "ovn-central" "hcp" "enabled" }}
+              value: "$(DB_CLUSTER_ADDR)"
+              {{- else }}
               valueFrom:
                 fieldRef:
                   fieldPath: status.podIP
+              {{- end }}
+            {{- if not (index .Values "ovn-central" "hcp" "enabled") }}
             - name: POD_NAME
               valueFrom:
                 fieldRef:
@@ -97,12 +172,13 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
+            {{- end }}
             - name: POD_IPS
               valueFrom:
                 fieldRef:
                   fieldPath: status.podIPs
             - name: ENABLE_BIND_LOCAL_IP
-              value: "{{- .Values.func.ENABLE_BIND_LOCAL_IP }}"
+              value: "{{ ternary false .Values.func.ENABLE_BIND_LOCAL_IP (index .Values "ovn-central" "hcp" "enabled") }}"
             - name: PROBE_INTERVAL
               value: "{{ .Values.networking.PROBE_INTERVAL }}"
             - name: OVN_NORTHD_PROBE_INTERVAL
@@ -113,8 +189,6 @@ spec:
               value: "{{ .Values.networking.OVN_NORTHD_N_THREADS }}"
             - name: ENABLE_COMPACT
               value: "{{ .Values.networking.ENABLE_COMPACT }}"
-            - name: OVN_VERSION_COMPATIBILITY
-              value: '{{ include "kubeovn.ovn.versionCompatibility" . }}'
           resources:
             requests:
               cpu: {{ index .Values "ovn-central" "requests" "cpu" }}
@@ -125,14 +199,16 @@ spec:
               ephemeral-storage: {{ index .Values "ovn-central" "limits" "ephemeral-storage" }}
           volumeMounts:
             - mountPath: /var/run/ovn
-              name: host-run-ovn
+              name: {{ ternary "run-ovn" "host-run-ovn" (index .Values "ovn-central" "hcp" "enabled") }}
             - mountPath: /etc/ovn
-              name: host-config-ovn
+              name: {{ ternary "ovn-data" "host-config-ovn" (index .Values "ovn-central" "hcp" "enabled") }}
             - mountPath: /var/log/ovn
-              name: host-log-ovn
+              name: {{ ternary "log-ovn" "host-log-ovn" (index .Values "ovn-central" "hcp" "enabled") }}
+            {{- if not (index .Values "ovn-central" "hcp" "enabled") }}
             - mountPath: /etc/localtime
               name: localtime
               readOnly: true
+            {{- end }}
             - mountPath: /var/run/tls
               name: kube-ovn-tls
           readinessProbe:
@@ -151,26 +227,56 @@ spec:
             periodSeconds: 15
             failureThreshold: 5
             timeoutSeconds: 45
+      {{- $nodeSelector := index .Values "ovn-central" "nodeSelector" }}
+      {{- if $nodeSelector }}
       nodeSelector:
-        kubernetes.io/os: "linux"
-        {{- with splitList "=" .Values.MASTER_NODES_LABEL }}
-        {{ index . 0 }}: "{{ if eq (len .) 2 }}{{ index . 1 }}{{ end }}"
-        {{- end }}
+        {{- toYaml $nodeSelector | nindent 8 }}
+      {{- end }}
       volumes:
+        {{- if index .Values "ovn-central" "hcp" "enabled" }}
+        - name: run-ovn
+          emptyDir: {}
+        - name: log-ovn
+          emptyDir: {}
+        {{- else }}
         - name: host-run-ovn
           hostPath:
             path: /run/ovn
         - name: host-config-ovn
+          {{- if eq .Values.OVN_CENTRAL_MODE "single" }}
+          persistentVolumeClaim:
+            claimName: {{ (index .Values "ovn-central" "storage").existingClaim | default "ovn-central-data" }}
+          {{- else }}
           hostPath:
             path: {{ .Values.OVN_DIR }}
+          {{- end }}
         - name: host-log-ovn
           hostPath:
             path: {{ .Values.log_conf.LOG_DIR }}/ovn
         - name: localtime
           hostPath:
             path: /etc/localtime
+        {{- end }}
         - name: kube-ovn-tls
           secret:
             optional: true
             secretName: kube-ovn-tls
+  {{- if index .Values "ovn-central" "hcp" "enabled" }}
+  volumeClaimTemplates:
+    - metadata:
+        name: ovn-data
+        labels:
+          app: ovn-central
+      spec:
+        accessModes:
+          - ReadWriteOnce
+        resources:
+          requests:
+            storage: {{ index .Values "ovn-central" "hcp" "storage" "size" }}
+        {{- if index .Values "ovn-central" "hcp" "storage" "storageClassName" }}
+        storageClassName: {{ index .Values "ovn-central" "hcp" "storage" "storageClassName" | quote }}
+        {{- end }}
+  {{- end }}
+
 
+{{- end }}
diff --git a/packages/system/kubeovn/charts/kube-ovn/templates/central-hcp-rbac.yaml b/packages/system/kubeovn/charts/kube-ovn/templates/central-hcp-rbac.yaml
new file mode 100644
index 0000000000..58dad2baa0
--- /dev/null
+++ b/packages/system/kubeovn/charts/kube-ovn/templates/central-hcp-rbac.yaml
@@ -0,0 +1,62 @@
+{{- if include "kubeovn.renderControlPlane" . }}
+{{- if index .Values "ovn-central" "hcp" "enabled" }}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: ovn-central
+  namespace: {{ include "kubeovn.centralNamespace" . }}
+automountServiceAccountToken: false
+{{-  if .Values.global.registry.imagePullSecrets }}
+imagePullSecrets:
+{{- range $index, $secret := .Values.global.registry.imagePullSecrets }}
+{{- if $secret }}
+  - name: {{ $secret | quote}}
+{{- end }}
+{{- end }}
+{{- end }}
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: ovn-central
+  namespace: {{ include "kubeovn.centralNamespace" . }}
+rules:
+  - apiGroups:
+      - ""
+    resources:
+      - pods
+    verbs:
+      - get
+      - list
+      - watch
+      - patch
+  - apiGroups:
+      - ""
+    resources:
+      - services
+    verbs:
+      - get
+  - apiGroups:
+      - discovery.k8s.io
+    resources:
+      - endpointslices
+    verbs:
+      - get
+      - list
+      - watch
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: ovn-central
+  namespace: {{ include "kubeovn.centralNamespace" . }}
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: ovn-central
+subjects:
+  - kind: ServiceAccount
+    name: ovn-central
+    namespace: {{ include "kubeovn.centralNamespace" . }}
+{{- end }}
+{{- end }}
diff --git a/packages/system/kubeovn/charts/kube-ovn/templates/central-pvc.yaml b/packages/system/kubeovn/charts/kube-ovn/templates/central-pvc.yaml
new file mode 100644
index 0000000000..4958b82335
--- /dev/null
+++ b/packages/system/kubeovn/charts/kube-ovn/templates/central-pvc.yaml
@@ -0,0 +1,36 @@
+{{- if include "kubeovn.renderControlPlane" . }}
+{{- if eq .Values.OVN_CENTRAL_MODE "single" }}
+{{- $storage := index .Values "ovn-central" "storage" }}
+{{- /*
+PVC for the standalone OVN DB. Always created in single-replica mode because
+the Deployment unconditionally mounts a PVC claim. Set
+ovn-central.storage.existingClaim=<name> to point the Deployment at an
+externally-managed claim and skip in-chart PVC creation.
+*/ -}}
+{{- if not $storage.existingClaim }}
+kind: PersistentVolumeClaim
+apiVersion: v1
+metadata:
+  name: ovn-central-data
+  namespace: {{ .Values.namespace }}
+  annotations:
+    # Pin the PVC so an installMode switch (e.g. full -> dataPlaneOnly) that
+    # stops rendering this template does NOT delete the volume holding the
+    # standalone OVN DB. Operators can `kubectl delete pvc ovn-central-data`
+    # explicitly when they really mean to discard the DB.
+    helm.sh/resource-policy: keep
+    kubernetes.io/description: |
+      Persistent storage for the ovn-central standalone OVN DB files.
+spec:
+  accessModes:
+{{ toYaml $storage.accessModes | indent 4 }}
+  resources:
+    requests:
+      storage: {{ $storage.size }}
+  {{- with $storage.storageClassName }}
+  storageClassName: {{ . | quote }}
+  {{- end }}
+{{- end }}
+{{- end }}
+
+{{- end }}
diff --git a/packages/system/kubeovn/charts/kube-ovn/templates/central-svc.yaml b/packages/system/kubeovn/charts/kube-ovn/templates/central-svc.yaml
new file mode 100644
index 0000000000..88d8b0c689
--- /dev/null
+++ b/packages/system/kubeovn/charts/kube-ovn/templates/central-svc.yaml
@@ -0,0 +1,23 @@
+{{- if include "kubeovn.renderControlPlane" . }}
+{{- if index .Values "ovn-central" "hcp" "enabled" }}
+kind: Service
+apiVersion: v1
+metadata:
+  name: ovn-central
+  namespace: {{ include "kubeovn.centralNamespace" . }}
+spec:
+  clusterIP: None
+  publishNotReadyAddresses: true
+  ports:
+    - name: nb-raft
+      protocol: TCP
+      port: 6643
+      targetPort: 6643
+    - name: sb-raft
+      protocol: TCP
+      port: 6644
+      targetPort: 6644
+  selector:
+    app: ovn-central
+{{- end }}
+{{- end }}
diff --git a/packages/system/kubeovn/charts/kube-ovn/templates/controller-deploy.yaml b/packages/system/kubeovn/charts/kube-ovn/templates/controller-deploy.yaml
index 69e27b23a9..86f98f8a78 100644
--- a/packages/system/kubeovn/charts/kube-ovn/templates/controller-deploy.yaml
+++ b/packages/system/kubeovn/charts/kube-ovn/templates/controller-deploy.yaml
@@ -1,3 +1,4 @@
+{{- if include "kubeovn.renderDataPlane" . }}
 kind: Deployment
 apiVersion: apps/v1
 metadata:
@@ -7,7 +8,7 @@ metadata:
     kubernetes.io/description: |
       kube-ovn controller
 spec:
-  replicas: {{ include "kubeovn.nodeCount" . }}
+  replicas: {{ include "kubeovn.controllerReplicas" . }}
   selector:
     matchLabels:
       app: kube-ovn-controller
@@ -75,6 +76,15 @@ spec:
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           args:
           - /kube-ovn/start-controller.sh
+          {{- if (index .Values "kube-ovn-controller" "leaderElection" "leaseDuration") }}
+          - --leader-elect-lease-duration={{ index .Values "kube-ovn-controller" "leaderElection" "leaseDuration" }}
+          {{- end }}
+          {{- if (index .Values "kube-ovn-controller" "leaderElection" "renewDeadline") }}
+          - --leader-elect-renew-deadline={{ index .Values "kube-ovn-controller" "leaderElection" "renewDeadline" }}
+          {{- end }}
+          {{- if (index .Values "kube-ovn-controller" "leaderElection" "retryPeriod") }}
+          - --leader-elect-retry-period={{ index .Values "kube-ovn-controller" "leaderElection" "retryPeriod" }}
+          {{- end }}
           - --default-ls={{ .Values.networking.DEFAULT_SUBNET }}
           - --default-cidr=
           {{- if eq .Values.networking.NET_STACK "dual_stack" -}}
@@ -127,6 +137,12 @@ spec:
           - --enable-np={{- .Values.func.ENABLE_NP }}
           - --np-enforcement={{- .Values.func.NP_ENFORCEMENT }}
           - --enable-eip-snat={{- .Values.networking.ENABLE_EIP_SNAT }}
+          {{- if .Values.networking.EXTERNAL_GATEWAY_CONFIG_NS }}
+          - --external-gateway-config-ns={{- .Values.networking.EXTERNAL_GATEWAY_CONFIG_NS }}
+          {{- end }}
+          {{- if .Values.networking.EXTERNAL_GATEWAY_SWITCH }}
+          - --external-gateway-switch={{- .Values.networking.EXTERNAL_GATEWAY_SWITCH }}
+          {{- end }}
           - --enable-external-vpc={{- .Values.func.ENABLE_EXTERNAL_VPC }}
           - --enable-ecmp={{- .Values.networking.ENABLE_ECMP }}
           - --logtostderr=false
@@ -140,6 +156,9 @@ spec:
           - --enable-metrics={{- .Values.networking.ENABLE_METRICS }}
           - --node-local-dns-ip={{- .Values.networking.NODE_LOCAL_DNS_IP }}
           - --secure-serving={{- .Values.func.SECURE_SERVING }}
+          {{- if or .Values.networking.TLS_MIN_VERSION .Values.networking.TLS_MAX_VERSION .Values.networking.TLS_CIPHER_SUITES }}
+          {{- include "kubeovn.componentTLSArgs" . | nindent 10 }}
+          {{- end }}
           - --enable-ovn-ipsec={{- .Values.func.ENABLE_OVN_IPSEC }}
           - --enable-anp={{- .Values.func.ENABLE_ANP }}
           - --enable-dns-name-resolver={{- .Values.func.ENABLE_DNS_NAME_RESOLVER }}
@@ -160,6 +179,8 @@ spec:
           env:
             - name: ENABLE_SSL
               value: "{{ .Values.networking.ENABLE_SSL }}"
+            - name: KUBE_OVN_TLS_ROTATION_INTERVAL
+              value: "{{ include "kubeovn.kubeOVNTLSRotationInterval" . }}"
             - name: POD_NAME
               valueFrom:
                 fieldRef:
@@ -172,8 +193,24 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: spec.nodeName
+            {{- if index .Values "ovn-central" "hcp" "enabled" }}
+            - name: OVN_NB_ADDR
+              value: "{{ include "kubeovn.ovnNbAddress" . }}"
+            - name: OVN_SB_ADDR
+              value: "{{ include "kubeovn.ovnSbAddress" . }}"
+            {{- else if eq .Values.installMode "dataPlaneOnly" }}
+            - name: OVN_NB_ADDR
+              value: "{{ include "kubeovn.externalOvnNbAddress" . }}"
+            - name: OVN_SB_ADDR
+              value: "{{ include "kubeovn.externalOvnSbAddress" . }}"
+            {{- else }}
             - name: OVN_DB_IPS
-              value: "{{ .Values.MASTER_NODES | default (include "kubeovn.nodeIPs" .) }}"
+              value: "{{ include "kubeovn.ovnCentralNodeIPs" . }}"
+            - name: KUBE_OVN_NB_PORT
+              value: "{{ include "kubeovn.ovnNbPort" . }}"
+            - name: KUBE_OVN_SB_PORT
+              value: "{{ include "kubeovn.ovnSbPort" . }}"
+            {{- end }}
             - name: POD_IP
               valueFrom:
                 fieldRef:
@@ -235,3 +272,5 @@ spec:
           secret:
             optional: true
             secretName: kube-ovn-tls
+
+{{- end }}
diff --git a/packages/system/kubeovn/charts/kube-ovn/templates/controller-svc.yaml b/packages/system/kubeovn/charts/kube-ovn/templates/controller-svc.yaml
index b4d39619d9..2cf0ae3e16 100644
--- a/packages/system/kubeovn/charts/kube-ovn/templates/controller-svc.yaml
+++ b/packages/system/kubeovn/charts/kube-ovn/templates/controller-svc.yaml
@@ -1,3 +1,4 @@
+{{- if include "kubeovn.renderDataPlane" . }}
 kind: Service
 apiVersion: v1
 metadata:
@@ -14,3 +15,5 @@ spec:
   {{- if eq .Values.networking.NET_STACK "dual_stack" }}
   ipFamilyPolicy: PreferDualStack
   {{- end }}
+
+{{- end }}
diff --git a/packages/system/kubeovn/charts/kube-ovn/templates/ic-controller-deploy.yaml b/packages/system/kubeovn/charts/kube-ovn/templates/ic-controller-deploy.yaml
index dc932a6339..106624bad7 100644
--- a/packages/system/kubeovn/charts/kube-ovn/templates/ic-controller-deploy.yaml
+++ b/packages/system/kubeovn/charts/kube-ovn/templates/ic-controller-deploy.yaml
@@ -1,3 +1,4 @@
+{{- if include "kubeovn.renderDataPlane" . }}
 {{- if .Values.func.ENABLE_IC }}
 kind: Deployment
 apiVersion: apps/v1
@@ -91,8 +92,24 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
+            {{- if index .Values "ovn-central" "hcp" "enabled" }}
+            - name: OVN_NB_ADDR
+              value: "{{ include "kubeovn.ovnNbAddress" . }}"
+            - name: OVN_SB_ADDR
+              value: "{{ include "kubeovn.ovnSbAddress" . }}"
+            {{- else if eq .Values.installMode "dataPlaneOnly" }}
+            - name: OVN_NB_ADDR
+              value: "{{ include "kubeovn.externalOvnNbAddress" . }}"
+            - name: OVN_SB_ADDR
+              value: "{{ include "kubeovn.externalOvnSbAddress" . }}"
+            {{- else }}
             - name: OVN_DB_IPS
-              value: "{{ .Values.MASTER_NODES | default (include "kubeovn.nodeIPs" .) }}"
+              value: "{{ include "kubeovn.ovnCentralNodeIPs" . }}"
+            - name: KUBE_OVN_NB_PORT
+              value: "{{ include "kubeovn.ovnNbPort" . }}"
+            - name: KUBE_OVN_SB_PORT
+              value: "{{ include "kubeovn.ovnSbPort" . }}"
+            {{- end }}
           resources:
             requests:
               cpu: 300m
@@ -135,3 +152,5 @@ spec:
             optional: true
             secretName: kube-ovn-tls
 {{- end }}
+
+{{- end }}
diff --git a/packages/system/kubeovn/charts/kube-ovn/templates/kube-ovn-crd.yaml b/packages/system/kubeovn/charts/kube-ovn/templates/kube-ovn-crd.yaml
index 62ae328e41..a7f8f8781a 100644
--- a/packages/system/kubeovn/charts/kube-ovn/templates/kube-ovn-crd.yaml
+++ b/packages/system/kubeovn/charts/kube-ovn/templates/kube-ovn-crd.yaml
@@ -1,3 +1,4 @@
+{{- if include "kubeovn.renderDataPlane" . }}
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
@@ -1414,16 +1415,24 @@ spec:
                   type: object
                 bandwidth:
                   type: object
-                  description: Optional bandwidth limit for each egress gateway instance in both ingress and egress directions.
+                  description: |-
+                    Optional bandwidth limit for each egress gateway instance in both ingress and egress directions.
+                    If not specified, there will be no bandwidth limit.
                   properties:
                     ingress:
-                      type: integer
-                      format: int64
-                      description: ingress bandwidth limit in Mbps
+                      description: ingress bandwidth limit, specified as an integer in Mbps or a Kubernetes quantity such as 100M or 1Gi in bits per second
+                      pattern: ^([0-9]+|([0-9]+(\.[0-9]+)?|\.[0-9]+)(M|Mi|G|Gi))$
+                      x-kubernetes-int-or-string: true
+                      x-kubernetes-validations:
+                        - message: integer bandwidth must be between 0 and 9223372036854 Mbps
+                          rule: 'type(self) == int ? self >= 0 && self <= 9223372036854 : true'
                     egress:
-                      type: integer
-                      format: int64
-                      description: egress bandwidth limit in Mbps
+                      description: egress bandwidth limit, specified as an integer in Mbps or a Kubernetes quantity such as 100M or 1Gi in bits per second
+                      pattern: ^([0-9]+|([0-9]+(\.[0-9]+)?|\.[0-9]+)(M|Mi|G|Gi))$
+                      x-kubernetes-int-or-string: true
+                      x-kubernetes-validations:
+                        - message: integer bandwidth must be between 0 and 9223372036854 Mbps
+                          rule: 'type(self) == int ? self >= 0 && self <= 9223372036854 : true'
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -3095,6 +3104,13 @@ spec:
                             type: string
                           dstIPs:
                             type: string
+                u2oFeatures:
+                  description: Feature configurations for underlay to overlay interconnection.
+                  properties:
+                    overlayOnlyRouting:
+                      description: OverlayOnlyRouting controls whether only overlay CIDRs use U2O routing.
+                      type: boolean
+                  type: object
                 u2oInterconnection:
                   description: Enable underlay to overlay interconnection.
                   type: boolean
@@ -3773,3 +3789,4 @@ spec:
                   x-kubernetes-list-map-keys:
                     - name
                   x-kubernetes-list-type: map
+{{- end }}
diff --git a/packages/system/kubeovn/charts/kube-ovn/templates/monitor-deploy.yaml b/packages/system/kubeovn/charts/kube-ovn/templates/monitor-deploy.yaml
index 2d4980981d..35d327b108 100644
--- a/packages/system/kubeovn/charts/kube-ovn/templates/monitor-deploy.yaml
+++ b/packages/system/kubeovn/charts/kube-ovn/templates/monitor-deploy.yaml
@@ -1,3 +1,4 @@
+{{- if include "kubeovn.renderFullOnly" . }}
 kind: Deployment
 apiVersion: apps/v1
 metadata:
@@ -67,6 +68,9 @@ spec:
           command: ["/kube-ovn/start-ovn-monitor.sh"]
           args:
           - --secure-serving={{- .Values.func.SECURE_SERVING }}
+          {{- if or .Values.networking.TLS_MIN_VERSION .Values.networking.TLS_MAX_VERSION .Values.networking.TLS_CIPHER_SUITES }}
+          {{- include "kubeovn.componentTLSArgs" . | nindent 10 }}
+          {{- end }}
           - --log_file=/var/log/kube-ovn/kube-ovn-monitor.log
           - --logtostderr=false
           - --alsologtostderr=true
@@ -171,3 +175,5 @@ spec:
         - name: kube-ovn-log
           hostPath:
             path: {{ .Values.log_conf.LOG_DIR }}/kube-ovn
+
+{{- end }}
diff --git a/packages/system/kubeovn/charts/kube-ovn/templates/monitor-svc.yaml b/packages/system/kubeovn/charts/kube-ovn/templates/monitor-svc.yaml
index 1ad1800d84..b9fd6f6f4d 100644
--- a/packages/system/kubeovn/charts/kube-ovn/templates/monitor-svc.yaml
+++ b/packages/system/kubeovn/charts/kube-ovn/templates/monitor-svc.yaml
@@ -1,3 +1,4 @@
+{{- if include "kubeovn.renderFullOnly" . }}
 kind: Service
 apiVersion: v1
 metadata:
@@ -16,3 +17,5 @@ spec:
   {{- if eq .Values.networking.NET_STACK "dual_stack" }}
   ipFamilyPolicy: PreferDualStack
   {{- end }}
+
+{{- end }}
diff --git a/packages/system/kubeovn/charts/kube-ovn/templates/nb-svc.yaml b/packages/system/kubeovn/charts/kube-ovn/templates/nb-svc.yaml
index 43992e91c6..08290ebafb 100644
--- a/packages/system/kubeovn/charts/kube-ovn/templates/nb-svc.yaml
+++ b/packages/system/kubeovn/charts/kube-ovn/templates/nb-svc.yaml
@@ -1,19 +1,48 @@
+{{- if include "kubeovn.renderControlPlane" . }}
+{{- $svc := index .Values "ovn-central" "service" }}
+{{- $hcp := index .Values "ovn-central" "hcp" }}
+{{- $hcpSvc := index .Values "ovn-central" "hcp" "service" }}
+{{- if not $hcp.enabled }}
+{{- include "kubeovn.validateService" . }}
+{{- end }}
 kind: Service
 apiVersion: v1
 metadata:
   name: ovn-nb
-  namespace: {{ .Values.namespace }}
+  namespace: {{ include "kubeovn.centralNamespace" . }}
+  {{- if and (not $hcp.enabled) (eq $svc.type "LoadBalancer") $svc.loadBalancerIP }}
+  annotations:
+    # MetalLB allows multiple Services to share a single VIP only when they
+    # carry the same allow-shared-ip annotation. The three ovn-* Services all
+    # opt into the same group so a Kamaji-style data plane can dial nb / sb /
+    # northd on one VIP, distinguished only by port. Harmless on non-MetalLB
+    # load balancers; remove the annotation if your provider rejects it.
+    metallb.universe.tf/allow-shared-ip: kube-ovn-central
+  {{- end }}
 spec:
   ports:
     - name: ovn-nb
       protocol: TCP
       port: 6641
       targetPort: 6641
-  type: ClusterIP
+      {{- if and $hcp.enabled (or (eq $hcpSvc.type "NodePort") (eq $hcpSvc.type "LoadBalancer")) }}
+      nodePort: {{ $hcpSvc.nbNodePort }}
+      {{- end }}
+  type: {{ ternary ($hcpSvc.type | default "ClusterIP") ($svc.type | default "ClusterIP") $hcp.enabled }}
+  {{- if and (not $hcp.enabled) (eq $svc.type "LoadBalancer") $svc.loadBalancerIP }}
+  loadBalancerIP: {{ $svc.loadBalancerIP | quote }}
+  {{- end }}
+  {{- if and (not $hcp.enabled) (or (eq $svc.type "LoadBalancer") (eq $svc.type "NodePort")) $svc.externalTrafficPolicy }}
+  externalTrafficPolicy: {{ $svc.externalTrafficPolicy }}
+  {{- end }}
   {{- if eq .Values.networking.NET_STACK "dual_stack" }}
   ipFamilyPolicy: PreferDualStack
   {{- end }}
   selector:
     app: ovn-central
+    {{- if or $hcp.enabled (ne .Values.OVN_CENTRAL_MODE "single") }}
     ovn-nb-leader: "true"
+    {{- end }}
   sessionAffinity: None
+
+{{- end }}
diff --git a/packages/system/kubeovn/charts/kube-ovn/templates/northd-svc.yaml b/packages/system/kubeovn/charts/kube-ovn/templates/northd-svc.yaml
index cec072330b..2568cdfabd 100644
--- a/packages/system/kubeovn/charts/kube-ovn/templates/northd-svc.yaml
+++ b/packages/system/kubeovn/charts/kube-ovn/templates/northd-svc.yaml
@@ -1,19 +1,39 @@
+{{- if include "kubeovn.renderControlPlane" . }}
+{{- $svc := index .Values "ovn-central" "service" }}
+{{- $hcp := index .Values "ovn-central" "hcp" }}
+{{- if not $hcp.enabled }}
+{{- include "kubeovn.validateService" . }}
+{{- end }}
 kind: Service
 apiVersion: v1
 metadata:
   name: ovn-northd
-  namespace: {{ .Values.namespace }}
+  namespace: {{ include "kubeovn.centralNamespace" . }}
+  {{- if and (not $hcp.enabled) (eq $svc.type "LoadBalancer") $svc.loadBalancerIP }}
+  annotations:
+    metallb.universe.tf/allow-shared-ip: kube-ovn-central
+  {{- end }}
 spec:
   ports:
     - name: ovn-northd
       protocol: TCP
       port: 6643
       targetPort: 6643
-  type: ClusterIP
+  type: {{ ternary "ClusterIP" ($svc.type | default "ClusterIP") $hcp.enabled }}
+  {{- if and (not $hcp.enabled) (eq $svc.type "LoadBalancer") $svc.loadBalancerIP }}
+  loadBalancerIP: {{ $svc.loadBalancerIP | quote }}
+  {{- end }}
+  {{- if and (not $hcp.enabled) (or (eq $svc.type "LoadBalancer") (eq $svc.type "NodePort")) $svc.externalTrafficPolicy }}
+  externalTrafficPolicy: {{ $svc.externalTrafficPolicy }}
+  {{- end }}
   {{- if eq .Values.networking.NET_STACK "dual_stack" }}
   ipFamilyPolicy: PreferDualStack
   {{- end }}
   selector:
     app: ovn-central
+    {{- if or $hcp.enabled (ne .Values.OVN_CENTRAL_MODE "single") }}
     ovn-northd-leader: "true"
+    {{- end }}
   sessionAffinity: None
+
+{{- end }}
diff --git a/packages/system/kubeovn/charts/kube-ovn/templates/ovn-CR.yaml b/packages/system/kubeovn/charts/kube-ovn/templates/ovn-CR.yaml
index 1caaecdf68..237718c061 100644
--- a/packages/system/kubeovn/charts/kube-ovn/templates/ovn-CR.yaml
+++ b/packages/system/kubeovn/charts/kube-ovn/templates/ovn-CR.yaml
@@ -1,3 +1,11 @@
+{{- /*
+ClusterRoles / Role partitioned by installMode:
+- system:ovn          : data plane (kube-ovn-controller, ic-controller)
+- system:ovn-ovs      : both planes (ovn-central in mgmt, ovs-ovn in tenant)
+- system:kube-ovn-cni : data plane
+- secret-reader-ovn-ipsec / system:kube-ovn-app : data plane
+*/}}
+{{- if include "kubeovn.renderDataPlane" . }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
@@ -153,6 +161,14 @@ rules:
       - get
       - list
       - watch
+  - apiGroups:
+      - metallb.io
+    resources:
+      - servicel2statuses
+    verbs:
+      - get
+      - list
+      - watch
   - apiGroups:
       - apps
     resources:
@@ -234,6 +250,14 @@ rules:
     verbs:
     - get
     - create
+  - apiGroups:
+    - ""
+    resources:
+    - secrets
+    resourceNames:
+    - kube-ovn-tls
+    verbs:
+    - update
   - apiGroups:
     - certificates.k8s.io
     resourceNames:
@@ -257,6 +281,7 @@ rules:
       - customresourcedefinitions
     verbs:
       - get
+{{- end }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
@@ -291,6 +316,7 @@ rules:
     verbs:
       - get
       - list
+{{- if include "kubeovn.renderDataPlane" . }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
@@ -420,3 +446,4 @@ rules:
       - subjectaccessreviews
     verbs:
       - create
+{{- end }}
diff --git a/packages/system/kubeovn/charts/kube-ovn/templates/ovn-CRB.yaml b/packages/system/kubeovn/charts/kube-ovn/templates/ovn-CRB.yaml
index 638093bac9..b3e0866ef3 100644
--- a/packages/system/kubeovn/charts/kube-ovn/templates/ovn-CRB.yaml
+++ b/packages/system/kubeovn/charts/kube-ovn/templates/ovn-CRB.yaml
@@ -1,3 +1,11 @@
+{{- /*
+ClusterRoleBindings / RoleBindings partitioned by installMode:
+- ovn          : data plane (kube-ovn-controller, ic-controller)
+- ovn-ovs      : both planes (ovn-central in mgmt, ovs-ovn in tenant)
+- kube-ovn-cni : data plane
+- kube-ovn-app : data plane
+*/}}
+{{- if include "kubeovn.renderDataPlane" . }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
@@ -25,6 +33,7 @@ subjects:
     name: ovn
     namespace: {{ .Values.namespace }}
 ---
+{{- end }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
@@ -38,6 +47,7 @@ subjects:
     name: ovn-ovs
     namespace: {{ .Values.namespace }}
 
+{{- if include "kubeovn.renderDataPlane" . }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
@@ -106,3 +116,4 @@ subjects:
   - kind: ServiceAccount
     name: kube-ovn-app
     namespace: {{ .Values.namespace }}
+{{- end }}
diff --git a/packages/system/kubeovn/charts/kube-ovn/templates/ovn-dpdk-ds.yaml b/packages/system/kubeovn/charts/kube-ovn/templates/ovn-dpdk-ds.yaml
index 5e18230e13..9cba0c51f2 100644
--- a/packages/system/kubeovn/charts/kube-ovn/templates/ovn-dpdk-ds.yaml
+++ b/packages/system/kubeovn/charts/kube-ovn/templates/ovn-dpdk-ds.yaml
@@ -1,3 +1,4 @@
+{{- if include "kubeovn.renderFullOnly" . }}
 {{- if .Values.HYBRID_DPDK }}
 kind: DaemonSet
 apiVersion: apps/v1
@@ -58,8 +59,16 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: spec.nodeName
+            {{- if index .Values "ovn-central" "hcp" "enabled" }}
+            - name: OVN_SB_ADDR
+              value: "{{ include "kubeovn.ovnSbAddress" . }}"
+            {{- else if eq .Values.installMode "dataPlaneOnly" }}
+            - name: OVN_SB_ADDR
+              value: "{{ include "kubeovn.externalOvnSbAddress" . }}"
+            {{- else }}
             - name: OVN_DB_IPS
               value: "{{ .Values.MASTER_NODES | default (include "kubeovn.nodeIPs" .) }}"
+            {{- end }}
             - name: OVN_REMOTE_PROBE_INTERVAL
               value: "{{ .Values.networking.OVN_REMOTE_PROBE_INTERVAL }}"
             - name: OVN_REMOTE_OPENFLOW_INTERVAL
@@ -165,3 +174,5 @@ spec:
             optional: true
             secretName: kube-ovn-tls
 {{- end }}
+
+{{- end }}
diff --git a/packages/system/kubeovn/charts/kube-ovn/templates/ovn-sa.yaml b/packages/system/kubeovn/charts/kube-ovn/templates/ovn-sa.yaml
index 744b3b90bd..08505c909f 100644
--- a/packages/system/kubeovn/charts/kube-ovn/templates/ovn-sa.yaml
+++ b/packages/system/kubeovn/charts/kube-ovn/templates/ovn-sa.yaml
@@ -1,3 +1,11 @@
+{{- /*
+ServiceAccounts. Partitioned by installMode:
+- ovn          : used by kube-ovn-controller / ic-controller   → data plane
+- ovn-ovs      : used by ovn-central AND ovs-ovn               → both planes
+- kube-ovn-cni : used by kube-ovn-cni DaemonSet                → data plane
+- kube-ovn-app : used by kube-ovn-monitor / kube-ovn-pinger    → data plane
+*/}}
+{{- if include "kubeovn.renderDataPlane" . }}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
@@ -14,6 +22,7 @@ imagePullSecrets:
 {{- end }}
 
 ---
+{{- end }}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
@@ -29,6 +38,7 @@ imagePullSecrets:
 {{- end }}
 {{- end }}
 
+{{- if include "kubeovn.renderDataPlane" . }}
 ---
 apiVersion: v1
 kind: ServiceAccount
@@ -60,3 +70,4 @@ imagePullSecrets:
 {{- end }}
 {{- end }}
 {{- end }}
+{{- end }}
diff --git a/packages/system/kubeovn/charts/kube-ovn/templates/ovn-tls-secret.yaml b/packages/system/kubeovn/charts/kube-ovn/templates/ovn-tls-secret.yaml
index dde402039d..06ff0f59d2 100644
--- a/packages/system/kubeovn/charts/kube-ovn/templates/ovn-tls-secret.yaml
+++ b/packages/system/kubeovn/charts/kube-ovn/templates/ovn-tls-secret.yaml
@@ -1,4 +1,16 @@
 {{- if .Values.networking.ENABLE_SSL }}
+{{- $existingSecret := lookup "v1" "Secret" .Values.namespace "kube-ovn-tls" }}
+{{- if eq .Values.installMode "dataPlaneOnly" }}
+  {{- if not $existingSecret }}
+    {{- fail (printf "installMode=dataPlaneOnly with networking.ENABLE_SSL=true requires the kube-ovn-tls Secret in namespace %q to be pre-seeded with the SAME CA/cert/key as the management cluster's ovn-central. Self-signing locally would produce certs the management cluster does not trust, breaking every NB/SB connection. Sync the Secret from the mgmt cluster (kubectl get secret kube-ovn-tls -o yaml | kubectl --context=tenant apply -f -) and re-run helm." .Values.namespace) }}
+  {{- end }}
+  {{- /*
+  Intentionally do NOT render the Secret manifest in dataPlaneOnly: the
+  operator owns its lifecycle (out-of-band sync from the management
+  cluster). Rendering it here would make Helm try to create or adopt the
+  pre-seeded Secret and fail with "resource already exists".
+  */ -}}
+{{- else }}
 {{- $cn := "ovn" -}}
 {{- $ca := genCA "ovn-ca" 3650 -}}
 ---
@@ -8,7 +20,6 @@ metadata:
   name: kube-ovn-tls
   namespace: {{ .Values.namespace }}
 data:
-{{- $existingSecret := lookup "v1" "Secret" .Values.namespace "kube-ovn-tls" }}
   {{- if $existingSecret }}
   cacert: {{ index $existingSecret.data "cacert" }}
   cert: {{ index $existingSecret.data "cert" }}
@@ -21,3 +32,4 @@ data:
   {{- end }}
   {{- end }}
 {{- end }}
+{{- end }}
diff --git a/packages/system/kubeovn/charts/kube-ovn/templates/ovncni-ds.yaml b/packages/system/kubeovn/charts/kube-ovn/templates/ovncni-ds.yaml
index 06971d014b..66d96097df 100644
--- a/packages/system/kubeovn/charts/kube-ovn/templates/ovncni-ds.yaml
+++ b/packages/system/kubeovn/charts/kube-ovn/templates/ovncni-ds.yaml
@@ -1,3 +1,4 @@
+{{- if include "kubeovn.renderDataPlane" . }}
 kind: DaemonSet
 apiVersion: apps/v1
 metadata:
@@ -123,6 +124,9 @@ spec:
           - --enable-tproxy={{ .Values.func.ENABLE_TPROXY }}
           - --ovs-vsctl-concurrency={{ .Values.performance.OVS_VSCTL_CONCURRENCY }}
           - --secure-serving={{- .Values.func.SECURE_SERVING }}
+          {{- if or .Values.networking.TLS_MIN_VERSION .Values.networking.TLS_MAX_VERSION .Values.networking.TLS_CIPHER_SUITES }}
+          {{- include "kubeovn.componentTLSArgs" . | nindent 10 }}
+          {{- end }}
           - --enable-ovn-ipsec={{- .Values.func.ENABLE_OVN_IPSEC }}
           - --set-vxlan-tx-off={{- .Values.func.SET_VXLAN_TX_OFF }}
           - --non-primary-cni-mode={{- .Values.cni_conf.NON_PRIMARY_CNI }}
@@ -290,3 +294,5 @@ spec:
           hostPath:
             path: {{ .Values.OVN_IPSEC_KEY_DIR }}
         {{- end }}
+
+{{- end }}
diff --git a/packages/system/kubeovn/charts/kube-ovn/templates/ovncni-svc.yaml b/packages/system/kubeovn/charts/kube-ovn/templates/ovncni-svc.yaml
index e1c47c806f..122589fcb1 100644
--- a/packages/system/kubeovn/charts/kube-ovn/templates/ovncni-svc.yaml
+++ b/packages/system/kubeovn/charts/kube-ovn/templates/ovncni-svc.yaml
@@ -1,3 +1,4 @@
+{{- if include "kubeovn.renderDataPlane" . }}
 kind: Service
 apiVersion: v1
 metadata:
@@ -14,3 +15,5 @@ spec:
   {{- if eq .Values.networking.NET_STACK "dual_stack" }}
   ipFamilyPolicy: PreferDualStack
   {{- end }}
+
+{{- end }}
diff --git a/packages/system/kubeovn/charts/kube-ovn/templates/ovsovn-ds.yaml b/packages/system/kubeovn/charts/kube-ovn/templates/ovsovn-ds.yaml
index b15fd24e2d..2d59d955f6 100644
--- a/packages/system/kubeovn/charts/kube-ovn/templates/ovsovn-ds.yaml
+++ b/packages/system/kubeovn/charts/kube-ovn/templates/ovsovn-ds.yaml
@@ -1,3 +1,4 @@
+{{- if include "kubeovn.renderDataPlane" . }}
 kind: DaemonSet
 apiVersion: apps/v1
 metadata:
@@ -11,11 +12,14 @@ spec:
   selector:
     matchLabels:
       app: ovs
+  {{- $updateStrategyType := include "kubeovn.ovs-ovn.updateStrategy" . | trim }}
   updateStrategy:
-    type: {{ include "kubeovn.ovs-ovn.updateStrategy" . }}
+    type: {{ $updateStrategyType }}
+    {{- if eq $updateStrategyType "RollingUpdate" }}
     rollingUpdate:
       maxSurge: 1
       maxUnavailable: 0
+    {{- end }}
   template:
     metadata:
       labels:
@@ -119,8 +123,18 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: spec.nodeName
+            {{- if index .Values "ovn-central" "hcp" "enabled" }}
+            - name: OVN_SB_ADDR
+              value: "{{ include "kubeovn.ovnSbAddress" . }}"
+            {{- else if eq .Values.installMode "dataPlaneOnly" }}
+            - name: OVN_SB_ADDR
+              value: "{{ include "kubeovn.externalOvnSbAddress" . }}"
+            {{- else }}
             - name: OVN_DB_IPS
-              value: "{{ .Values.MASTER_NODES | default (include "kubeovn.nodeIPs" .) }}"
+              value: "{{ include "kubeovn.ovnCentralNodeIPs" . }}"
+            - name: KUBE_OVN_SB_PORT
+              value: "{{ include "kubeovn.ovnSbPort" . }}"
+            {{- end }}
             - name: OVN_REMOTE_PROBE_INTERVAL
               value: "{{ .Values.networking.OVN_REMOTE_PROBE_INTERVAL }}"
             - name: OVN_REMOTE_OPENFLOW_INTERVAL
@@ -207,3 +221,5 @@ spec:
         - hostPath:
             path: /var/run/containerd
           name: cruntime
+
+{{- end }}
diff --git a/packages/system/kubeovn/charts/kube-ovn/templates/pinger-ds.yaml b/packages/system/kubeovn/charts/kube-ovn/templates/pinger-ds.yaml
index e52cf45dfb..55d5b13c46 100644
--- a/packages/system/kubeovn/charts/kube-ovn/templates/pinger-ds.yaml
+++ b/packages/system/kubeovn/charts/kube-ovn/templates/pinger-ds.yaml
@@ -1,3 +1,4 @@
+{{- if include "kubeovn.renderDataPlane" . }}
 kind: DaemonSet
 apiVersion: apps/v1
 metadata:
@@ -177,3 +178,5 @@ spec:
           secret:
             optional: true
             secretName: kube-ovn-tls
+
+{{- end }}
diff --git a/packages/system/kubeovn/charts/kube-ovn/templates/pinger-svc.yaml b/packages/system/kubeovn/charts/kube-ovn/templates/pinger-svc.yaml
index ef169e8e91..4b43788222 100644
--- a/packages/system/kubeovn/charts/kube-ovn/templates/pinger-svc.yaml
+++ b/packages/system/kubeovn/charts/kube-ovn/templates/pinger-svc.yaml
@@ -1,3 +1,4 @@
+{{- if include "kubeovn.renderDataPlane" . }}
 kind: Service
 apiVersion: v1
 metadata:
@@ -14,3 +15,5 @@ spec:
   {{- if eq .Values.networking.NET_STACK "dual_stack" }}
   ipFamilyPolicy: PreferDualStack
   {{- end }}
+
+{{- end }}
diff --git a/packages/system/kubeovn/charts/kube-ovn/templates/post-delete-hook.yaml b/packages/system/kubeovn/charts/kube-ovn/templates/post-delete-hook.yaml
index 1272257fdd..35acf981b5 100644
--- a/packages/system/kubeovn/charts/kube-ovn/templates/post-delete-hook.yaml
+++ b/packages/system/kubeovn/charts/kube-ovn/templates/post-delete-hook.yaml
@@ -1,3 +1,4 @@
+{{- if include "kubeovn.renderDataPlane" . }}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
@@ -119,7 +120,10 @@ spec:
           command:
             - sh
             - -c
-            - /kube-ovn/remove-finalizer.sh 2>&1 | tee -a /var/log/kube-ovn/remove-finalizer.log
+            - |
+              touch /var/log/kube-ovn/remove-finalizer.log
+              chmod 640 /var/log/kube-ovn/remove-finalizer.log
+              /kube-ovn/remove-finalizer.sh 2>&1 | tee -a /var/log/kube-ovn/remove-finalizer.log
           resources:
             requests:
               cpu: 100m
@@ -135,3 +139,5 @@ spec:
         - name: kube-ovn-log
           hostPath:
             path: {{ .Values.log_conf.LOG_DIR }}/kube-ovn
+
+{{- end }}
diff --git a/packages/system/kubeovn/charts/kube-ovn/templates/pre-upgrade-ovs-ovn.yaml b/packages/system/kubeovn/charts/kube-ovn/templates/pre-upgrade-ovs-ovn.yaml
index a18a411152..f28e4da4dd 100644
--- a/packages/system/kubeovn/charts/kube-ovn/templates/pre-upgrade-ovs-ovn.yaml
+++ b/packages/system/kubeovn/charts/kube-ovn/templates/pre-upgrade-ovs-ovn.yaml
@@ -1,4 +1,5 @@
-{{- if include "kubeovn.ovn.versionCompatibility" . -}}
+{{- if include "kubeovn.renderFullOnly" . }}
+{{- if include "kubeovn.ovn.upgradeNeeded" . -}}
 ---
 apiVersion: v1
 kind: ServiceAccount
@@ -118,7 +119,10 @@ spec:
             - -eo
             - pipefail
             - -c
-            - bash /kube-ovn/pre-upgrade-ovs.sh 2>&1 | tee -a /var/log/kube-ovn/pre-upgrade-ovs.log
+            - |
+              touch /var/log/kube-ovn/pre-upgrade-ovs.log
+              chmod 640 /var/log/kube-ovn/pre-upgrade-ovs.log
+              bash /kube-ovn/pre-upgrade-ovs.sh 2>&1 | tee -a /var/log/kube-ovn/pre-upgrade-ovs.log
           volumeMounts:
             - mountPath: /var/log/kube-ovn
               name: kube-ovn-log
@@ -127,3 +131,5 @@ spec:
           hostPath:
             path: {{ .Values.log_conf.LOG_DIR }}/kube-ovn
 {{- end -}}
+
+{{- end }}
diff --git a/packages/system/kubeovn/charts/kube-ovn/templates/sb-svc.yaml b/packages/system/kubeovn/charts/kube-ovn/templates/sb-svc.yaml
index 36a4a27ab0..3033fe4414 100644
--- a/packages/system/kubeovn/charts/kube-ovn/templates/sb-svc.yaml
+++ b/packages/system/kubeovn/charts/kube-ovn/templates/sb-svc.yaml
@@ -1,19 +1,43 @@
+{{- if include "kubeovn.renderControlPlane" . }}
+{{- $svc := index .Values "ovn-central" "service" }}
+{{- $hcp := index .Values "ovn-central" "hcp" }}
+{{- $hcpSvc := index .Values "ovn-central" "hcp" "service" }}
+{{- if not $hcp.enabled }}
+{{- include "kubeovn.validateService" . }}
+{{- end }}
 kind: Service
 apiVersion: v1
 metadata:
   name: ovn-sb
-  namespace: {{ .Values.namespace }}
+  namespace: {{ include "kubeovn.centralNamespace" . }}
+  {{- if and (not $hcp.enabled) (eq $svc.type "LoadBalancer") $svc.loadBalancerIP }}
+  annotations:
+    metallb.universe.tf/allow-shared-ip: kube-ovn-central
+  {{- end }}
 spec:
   ports:
     - name: ovn-sb
       protocol: TCP
       port: 6642
       targetPort: 6642
-  type: ClusterIP
+      {{- if and $hcp.enabled (or (eq $hcpSvc.type "NodePort") (eq $hcpSvc.type "LoadBalancer")) }}
+      nodePort: {{ $hcpSvc.sbNodePort }}
+      {{- end }}
+  type: {{ ternary ($hcpSvc.type | default "ClusterIP") ($svc.type | default "ClusterIP") $hcp.enabled }}
+  {{- if and (not $hcp.enabled) (eq $svc.type "LoadBalancer") $svc.loadBalancerIP }}
+  loadBalancerIP: {{ $svc.loadBalancerIP | quote }}
+  {{- end }}
+  {{- if and (not $hcp.enabled) (or (eq $svc.type "LoadBalancer") (eq $svc.type "NodePort")) $svc.externalTrafficPolicy }}
+  externalTrafficPolicy: {{ $svc.externalTrafficPolicy }}
+  {{- end }}
   {{- if eq .Values.networking.NET_STACK "dual_stack" }}
   ipFamilyPolicy: PreferDualStack
   {{- end }}
   selector:
     app: ovn-central
+    {{- if or $hcp.enabled (ne .Values.OVN_CENTRAL_MODE "single") }}
     ovn-sb-leader: "true"
+    {{- end }}
   sessionAffinity: None
+
+{{- end }}
diff --git a/packages/system/kubeovn/charts/kube-ovn/templates/upgrade-ovs-ovn.yaml b/packages/system/kubeovn/charts/kube-ovn/templates/upgrade-ovs-ovn.yaml
index b85ce8faaa..b93168a00f 100644
--- a/packages/system/kubeovn/charts/kube-ovn/templates/upgrade-ovs-ovn.yaml
+++ b/packages/system/kubeovn/charts/kube-ovn/templates/upgrade-ovs-ovn.yaml
@@ -1,4 +1,5 @@
-{{- if include "kubeovn.ovn.versionCompatibility" . -}}
+{{- if include "kubeovn.renderFullOnly" . }}
+{{- if include "kubeovn.ovn.upgradeNeeded" . -}}
 ---
 apiVersion: v1
 kind: ServiceAccount
@@ -149,18 +150,15 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
-            - name: ENABLE_SSL
-              value: "{{ .Values.networking.ENABLE_SSL }}"
-            - name: OVN_DB_IPS
-              value: "{{ .Values.MASTER_NODES | default (include "kubeovn.nodeIPs" .) }}"
-            - name: OVN_VERSION_COMPATIBILITY
-              value: '{{ include "kubeovn.ovn.versionCompatibility" . }}'
           command:
             - bash
             - -eo
             - pipefail
             - -c
-            - /kube-ovn/upgrade-ovs.sh 2>&1 | tee -a /var/log/kube-ovn/upgrade-ovs.log
+            - |
+              touch /var/log/kube-ovn/upgrade-ovs.log
+              chmod 640 /var/log/kube-ovn/upgrade-ovs.log
+              /kube-ovn/upgrade-ovs.sh 2>&1 | tee -a /var/log/kube-ovn/upgrade-ovs.log
           volumeMounts:
             - mountPath: /var/log/kube-ovn
               name: kube-ovn-log
@@ -175,3 +173,5 @@ spec:
             optional: true
             secretName: kube-ovn-tls
 {{- end -}}
+
+{{- end }}
diff --git a/packages/system/kubeovn/charts/kube-ovn/templates/vpc-nat-config.yaml b/packages/system/kubeovn/charts/kube-ovn/templates/vpc-nat-config.yaml
old mode 100755
new mode 100644
index 92e2fd9480..b0b7dc511b
--- a/packages/system/kubeovn/charts/kube-ovn/templates/vpc-nat-config.yaml
+++ b/packages/system/kubeovn/charts/kube-ovn/templates/vpc-nat-config.yaml
@@ -1,3 +1,4 @@
+{{- if include "kubeovn.renderDataPlane" . }}
 kind: ConfigMap
 apiVersion: v1
 metadata:
@@ -17,3 +18,5 @@ metadata:
   namespace: {{ .Values.namespace }}
 data:
   enable-vpc-nat-gw: "{{ .Values.func.ENABLE_NAT_GW }}"
+
+{{- end }}
diff --git a/packages/system/kubeovn/charts/kube-ovn/tests/central_hcp_test.yaml b/packages/system/kubeovn/charts/kube-ovn/tests/central_hcp_test.yaml
new file mode 100644
index 0000000000..1aad41ad20
--- /dev/null
+++ b/packages/system/kubeovn/charts/kube-ovn/tests/central_hcp_test.yaml
@@ -0,0 +1,270 @@
+suite: OVN central HCP deployment
+templates:
+  - central-deploy.yaml
+  - central-hcp-rbac.yaml
+  - central-svc.yaml
+  - nb-svc.yaml
+  - sb-svc.yaml
+  - controller-deploy.yaml
+  - ic-controller-deploy.yaml
+  - ovsovn-ds.yaml
+  - ovn-dpdk-ds.yaml
+tests:
+  - it: renders ovn-central as a PVC-backed StatefulSet in the HCP namespace
+    template: central-deploy.yaml
+    set:
+      ovn-central.hcp.enabled: true
+      ovn-central.hcp.namespace: hcp
+      ovn-central.hcp.nbAddress: tcp:ovn-nb.example.com:6641
+      ovn-central.hcp.sbAddress: tcp:ovn-sb.example.com:6642
+      ovn-central.hcp.replicas: 3
+      ovn-central.hcp.storage.size: 5Gi
+      ovn-central.hcp.storage.storageClassName: topolvm
+      ovn-central.nodeSelector.dedicated: hcp-ovn
+      ovn-central.tolerations:
+        - key: dedicated
+          operator: Equal
+          value: hcp-ovn
+          effect: NoSchedule
+    asserts:
+      - isKind:
+          of: StatefulSet
+      - equal:
+          path: metadata.namespace
+          value: hcp
+      - equal:
+          path: spec.replicas
+          value: 3
+      - equal:
+          path: spec.serviceName
+          value: ovn-central
+      - equal:
+          path: spec.persistentVolumeClaimRetentionPolicy.whenDeleted
+          value: Delete
+      - equal:
+          path: spec.persistentVolumeClaimRetentionPolicy.whenScaled
+          value: Delete
+      - equal:
+          path: spec.template.spec.hostNetwork
+          value: false
+      - equal:
+          path: spec.template.spec.serviceAccountName
+          value: ovn-central
+      - equal:
+          path: spec.template.spec.automountServiceAccountToken
+          value: true
+      - isNotNull:
+          path: spec.template.spec.affinity.podAntiAffinity
+      - notExists:
+          path: spec.template.spec.affinity.nodeAffinity
+      - equal:
+          path: spec.template.spec.nodeSelector.dedicated
+          value: hcp-ovn
+      - contains:
+          path: spec.template.spec.tolerations
+          content:
+            key: dedicated
+            operator: Equal
+            value: hcp-ovn
+            effect: NoSchedule
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: POD_NAME
+            valueFrom:
+              fieldRef:
+                fieldPath: metadata.name
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: POD_NAMESPACE
+            valueFrom:
+              fieldRef:
+                fieldPath: metadata.namespace
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: NODE_IPS
+            value: ovn-central-0.ovn-central.hcp.svc,ovn-central-1.ovn-central.hcp.svc,ovn-central-2.ovn-central.hcp.svc
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: DB_CLUSTER_ADDR
+            value: $(POD_NAME).ovn-central.$(POD_NAMESPACE).svc
+      - equal:
+          path: spec.volumeClaimTemplates[0].spec.resources.requests.storage
+          value: 5Gi
+      - equal:
+          path: spec.volumeClaimTemplates[0].spec.storageClassName
+          value: topolvm
+
+  - it: creates dedicated namespaced RBAC for HCP ovn-central
+    template: central-hcp-rbac.yaml
+    documentIndex: 0
+    set:
+      ovn-central.hcp.enabled: true
+      ovn-central.hcp.namespace: hcp
+      ovn-central.hcp.nbAddress: tcp:ovn-nb.example.com:6641
+      ovn-central.hcp.sbAddress: tcp:ovn-sb.example.com:6642
+    asserts:
+      - isKind:
+          of: ServiceAccount
+      - equal:
+          path: metadata.name
+          value: ovn-central
+      - equal:
+          path: metadata.namespace
+          value: hcp
+      - equal:
+          path: automountServiceAccountToken
+          value: false
+
+  - it: creates a headless service for StatefulSet raft DNS
+    template: central-svc.yaml
+    set:
+      ovn-central.hcp.enabled: true
+      ovn-central.hcp.namespace: hcp
+      ovn-central.hcp.nbAddress: tcp:ovn-nb.example.com:6641
+      ovn-central.hcp.sbAddress: tcp:ovn-sb.example.com:6642
+    asserts:
+      - equal:
+          path: metadata.name
+          value: ovn-central
+      - equal:
+          path: metadata.namespace
+          value: hcp
+      - equal:
+          path: spec.clusterIP
+          value: None
+      - equal:
+          path: spec.publishNotReadyAddresses
+          value: true
+
+  - it: exposes nb and sb through HCP node ports
+    template: nb-svc.yaml
+    set:
+      ovn-central.hcp.enabled: true
+      ovn-central.hcp.namespace: hcp
+      ovn-central.hcp.service.type: NodePort
+      ovn-central.hcp.service.nbNodePort: 30641
+      ovn-central.hcp.nbAddress: tcp:ovn-nb.example.com:6641
+      ovn-central.hcp.sbAddress: tcp:ovn-sb.example.com:6642
+    asserts:
+      - equal:
+          path: metadata.namespace
+          value: hcp
+      - equal:
+          path: spec.type
+          value: NodePort
+      - equal:
+          path: spec.ports[0].nodePort
+          value: 30641
+
+  - it: omits node ports when HCP services are rendered as ClusterIP
+    template: nb-svc.yaml
+    set:
+      ovn-central.hcp.enabled: true
+      ovn-central.hcp.namespace: hcp
+      ovn-central.hcp.service.type: ClusterIP
+      ovn-central.hcp.nbAddress: tcp:ovn-nb.example.com:6641
+      ovn-central.hcp.sbAddress: tcp:ovn-sb.example.com:6642
+    asserts:
+      - equal:
+          path: spec.type
+          value: ClusterIP
+      - notExists:
+          path: spec.ports[0].nodePort
+
+  - it: defaults empty HCP NB service type to ClusterIP
+    template: nb-svc.yaml
+    set:
+      ovn-central.hcp.enabled: true
+      ovn-central.hcp.namespace: hcp
+      ovn-central.hcp.service.type: ""
+      ovn-central.hcp.nbAddress: tcp:ovn-nb.example.com:6641
+      ovn-central.hcp.sbAddress: tcp:ovn-sb.example.com:6642
+    asserts:
+      - equal:
+          path: spec.type
+          value: ClusterIP
+      - notExists:
+          path: spec.ports[0].nodePort
+
+  - it: defaults empty HCP SB service type to ClusterIP
+    template: sb-svc.yaml
+    set:
+      ovn-central.hcp.enabled: true
+      ovn-central.hcp.namespace: hcp
+      ovn-central.hcp.service.type: ""
+      ovn-central.hcp.nbAddress: tcp:ovn-nb.example.com:6641
+      ovn-central.hcp.sbAddress: tcp:ovn-sb.example.com:6642
+    asserts:
+      - equal:
+          path: spec.type
+          value: ClusterIP
+      - notExists:
+          path: spec.ports[0].nodePort
+
+  - it: points workload components at independent HCP OVN DB addresses
+    template: controller-deploy.yaml
+    set:
+      ovn-central.hcp.enabled: true
+      ovn-central.hcp.nbAddress: tcp:ovn-nb.example.com:6641
+      ovn-central.hcp.sbAddress: tcp:ovn-sb.example.com:6642
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: OVN_NB_ADDR
+            value: tcp:ovn-nb.example.com:6641
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: OVN_SB_ADDR
+            value: tcp:ovn-sb.example.com:6642
+
+  - it: points ic-controller at independent HCP OVN DB addresses
+    template: ic-controller-deploy.yaml
+    set:
+      func.ENABLE_IC: true
+      ovn-central.hcp.enabled: true
+      ovn-central.hcp.nbAddress: tcp:ovn-nb.example.com:6641
+      ovn-central.hcp.sbAddress: tcp:ovn-sb.example.com:6642
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: OVN_NB_ADDR
+            value: tcp:ovn-nb.example.com:6641
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: OVN_SB_ADDR
+            value: tcp:ovn-sb.example.com:6642
+
+  - it: points ovs-ovn at the HCP OVN SB address
+    template: ovsovn-ds.yaml
+    set:
+      ovn-central.hcp.enabled: true
+      ovn-central.hcp.nbAddress: tcp:ovn-nb.example.com:6641
+      ovn-central.hcp.sbAddress: tcp:ovn-sb.example.com:6642
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: OVN_SB_ADDR
+            value: tcp:ovn-sb.example.com:6642
+
+  - it: points ovs-ovn-dpdk at the HCP OVN SB address
+    template: ovn-dpdk-ds.yaml
+    set:
+      HYBRID_DPDK: true
+      ovn-central.hcp.enabled: true
+      ovn-central.hcp.nbAddress: tcp:ovn-nb.example.com:6641
+      ovn-central.hcp.sbAddress: tcp:ovn-sb.example.com:6642
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: OVN_SB_ADDR
+            value: tcp:ovn-sb.example.com:6642
diff --git a/packages/system/kubeovn/charts/kube-ovn/tests/controller_data_plane_test.yaml b/packages/system/kubeovn/charts/kube-ovn/tests/controller_data_plane_test.yaml
new file mode 100644
index 0000000000..c7a749b9cc
--- /dev/null
+++ b/packages/system/kubeovn/charts/kube-ovn/tests/controller_data_plane_test.yaml
@@ -0,0 +1,133 @@
+suite: Kube-OVN controller data plane deployment
+templates:
+  - controller-deploy.yaml
+tests:
+  - it: preserves controller replica override outside dataPlaneOnly
+    set:
+      installMode: full
+      MASTER_NODES: "10.0.0.1,10.0.0.2,10.0.0.3"
+      kube-ovn-controller.replicas: 4
+    asserts:
+      - equal:
+          path: spec.replicas
+          value: 4
+
+  - it: renders TLS cipher suites as readable repeated args
+    set:
+      installMode: full
+      MASTER_NODES: "10.0.0.1"
+      networking.TLS_CIPHER_SUITES:
+        - TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384
+        - TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: --tls-cipher-suites=TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: --tls-cipher-suites=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
+      - notContains:
+          path: spec.template.spec.containers[0].args
+          content: --tls-cipher-suites=TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
+
+  - it: uses one dataPlaneOnly controller replica for one node
+    set:
+      installMode: dataPlaneOnly
+      MASTER_NODES: "10.0.0.1"
+      externalOvnCentral.nbEndpoint: 10.0.0.10
+      externalOvnCentral.sbEndpoint: 10.0.0.10
+      kube-ovn-controller.replicas: 2
+    asserts:
+      - equal:
+          path: spec.replicas
+          value: 1
+
+  - it: caps dataPlaneOnly controller replicas at two
+    set:
+      installMode: dataPlaneOnly
+      MASTER_NODES: "10.0.0.1,10.0.0.2,10.0.0.3"
+      externalOvnCentral.nbEndpoint: 10.0.0.10
+      externalOvnCentral.sbEndpoint: 10.0.0.10
+      kube-ovn-controller.replicas: 1
+    asserts:
+      - equal:
+          path: spec.replicas
+          value: 2
+
+  - it: uses Kubernetes node count instead of master node count for dataPlaneOnly replicas
+    kubernetesProvider:
+      scheme:
+        "v1/Node":
+          gvr:
+            version: v1
+            resource: nodes
+          namespaced: false
+      objects:
+        - kind: Node
+          apiVersion: v1
+          metadata:
+            name: node-1
+            labels: {}
+        - kind: Node
+          apiVersion: v1
+          metadata:
+            name: node-2
+            labels: {}
+        - kind: Node
+          apiVersion: v1
+          metadata:
+            name: node-3
+            labels: {}
+    set:
+      installMode: dataPlaneOnly
+      MASTER_NODES: "10.0.0.1"
+      externalOvnCentral.nbEndpoint: 10.0.0.10
+      externalOvnCentral.sbEndpoint: 10.0.0.10
+    asserts:
+      - equal:
+          path: spec.replicas
+          value: 2
+
+  - it: renders independent external OVN DB addresses for dataPlaneOnly
+    set:
+      installMode: dataPlaneOnly
+      MASTER_NODES: "10.0.0.1"
+      externalOvnCentral.nbEndpoint: 10.0.0.11
+      externalOvnCentral.nbPort: 30641
+      externalOvnCentral.sbEndpoint: 10.0.0.12
+      externalOvnCentral.sbPort: 30642
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: OVN_NB_ADDR
+            value: tcp:10.0.0.11:30641
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: OVN_SB_ADDR
+            value: tcp:10.0.0.12:30642
+      - notContains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: OVN_DB_IPS
+
+  - it: renders IPv6 external OVN DB addresses for dataPlaneOnly
+    set:
+      installMode: dataPlaneOnly
+      MASTER_NODES: "10.0.0.1"
+      externalOvnCentral.nbEndpoint: "fd00::11"
+      externalOvnCentral.nbPort: 30641
+      externalOvnCentral.sbEndpoint: "[fd00::12]"
+      externalOvnCentral.sbPort: 30642
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: OVN_NB_ADDR
+            value: tcp:[fd00::11]:30641
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: OVN_SB_ADDR
+            value: tcp:[fd00::12]:30642
diff --git a/packages/system/kubeovn/charts/kube-ovn/tests/controller_leader_election_test.yaml b/packages/system/kubeovn/charts/kube-ovn/tests/controller_leader_election_test.yaml
new file mode 100644
index 0000000000..2a913b2a68
--- /dev/null
+++ b/packages/system/kubeovn/charts/kube-ovn/tests/controller_leader_election_test.yaml
@@ -0,0 +1,43 @@
+suite: Kube-OVN controller leader election
+templates:
+  - controller-deploy.yaml
+tests:
+  - it: relies on controller defaults when leader election timings are empty
+    set:
+      MASTER_NODES: "10.0.0.1"
+    asserts:
+      - notContains:
+          path: spec.template.spec.containers[0].args
+          content: --leader-elect-lease-duration=30s
+      - notContains:
+          path: spec.template.spec.containers[0].args
+          content: --leader-elect-lease-duration=
+      - notContains:
+          path: spec.template.spec.containers[0].args
+          content: --leader-elect-renew-deadline=20s
+      - notContains:
+          path: spec.template.spec.containers[0].args
+          content: --leader-elect-renew-deadline=
+      - notContains:
+          path: spec.template.spec.containers[0].args
+          content: --leader-elect-retry-period=6s
+      - notContains:
+          path: spec.template.spec.containers[0].args
+          content: --leader-elect-retry-period=
+
+  - it: renders custom leader election timings
+    set:
+      MASTER_NODES: "10.0.0.1"
+      kube-ovn-controller.leaderElection.leaseDuration: 1m
+      kube-ovn-controller.leaderElection.renewDeadline: 40s
+      kube-ovn-controller.leaderElection.retryPeriod: 10s
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: --leader-elect-lease-duration=1m
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: --leader-elect-renew-deadline=40s
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: --leader-elect-retry-period=10s
diff --git a/packages/system/kubeovn/charts/kube-ovn/values.yaml b/packages/system/kubeovn/charts/kube-ovn/values.yaml
index fd3472f69f..1449617f43 100644
--- a/packages/system/kubeovn/charts/kube-ovn/values.yaml
+++ b/packages/system/kubeovn/charts/kube-ovn/values.yaml
@@ -8,11 +8,11 @@ global:
   images:
     kubeovn:
       repository: kube-ovn
-      tag: v1.15.10
+      tag: v1.15.26
     natgateway:
       repository: vpc-nat-gateway
       # Falls back to the same tag as kubeovn if empty
-      tag: v1.15.10
+      tag: v1.15.26
 
 image:
   pullPolicy: IfNotPresent
@@ -21,10 +21,45 @@ namespace: kube-system
 MASTER_NODES: ""
 MASTER_NODES_LABEL: "kube-ovn/role=master"
 
+# OVN_CENTRAL_MODE controls how ovn-central is deployed.
+#   cluster: multi-replica raft cluster, one pod per master node (default).
+#   single:  single-replica Deployment backed by a PVC, can drift to another
+#            node when the host fails. Uses ovsdb standalone mode (no raft).
+OVN_CENTRAL_MODE: "cluster"
+
+# installMode controls which slice of the chart this Helm release renders.
+#   full:             all components in one cluster (default, classic install).
+#   controlPlaneOnly: only ovn-central + ovn-nb/ovn-sb/ovn-northd Services and
+#                     their RBAC. Use on the management cluster of a
+#                     split-cluster deployment that hosts ovn-central.
+#   dataPlaneOnly:    CRDs + kube-ovn-controller + kube-ovn-cni + ovs-ovn +
+#                     pinger and their RBAC. Use on tenant data-plane
+#                     clusters that connect back to an external ovn-central via
+#                     externalOvnCentral below. kube-ovn-monitor is intentionally
+#                     skipped: it reads local OVN Unix sockets / DB files and
+#                     does not yet know how to talk to a remote ovn-central.
+installMode: full
+
+# When installMode=dataPlaneOnly, the agents and controller cannot rely on a
+# local ovn-central Service. Set nbEndpoint/sbEndpoint to the addresses that
+# expose the management cluster's ovn-nb / ovn-sb Services.
+externalOvnCentral:
+  nbEndpoint: ""
+  sbEndpoint: ""
+  nbPort: 6641
+  sbPort: 6642
+
 networking:
   # NET_STACK could be dual_stack, ipv4, ipv6
   NET_STACK: ipv4
   ENABLE_SSL: false
+  # Minimum TLS version for OVN NB/SB database server and kube-ovn secure-serving endpoints.
+  TLS_MIN_VERSION: ""
+  # Maximum TLS version for OVN NB/SB database server and kube-ovn secure-serving endpoints.
+  TLS_MAX_VERSION: ""
+  # Go TLS cipher suite names. OVN DB server only supports suites mapped by dist/images/ovn-db-ssl-options.sh.
+  TLS_CIPHER_SUITES: []
+  KUBE_OVN_TLS_ROTATION_INTERVAL: "8760h"
   # network type could be geneve or vlan
   NETWORK_TYPE: geneve
   # tunnel type could be geneve, vxlan or stt
@@ -145,11 +180,33 @@ fullnameOverride: ""
 HYBRID_DPDK: false
 HUGEPAGE_SIZE_TYPE: hugepages-2Mi # Default
 HUGEPAGES: 1Gi
-DPDK_IMAGE_TAG: "v1.15.0-dpdk"
+DPDK_IMAGE_TAG: "v1.15.26-dpdk"
 DPDK_CPU: "1000m" # Default CPU configuration
 DPDK_MEMORY: "2Gi" # Default Memory configuration
 
 ovn-central:
+  tolerations:
+    - effect: NoSchedule
+      operator: Exists
+    - effect: NoExecute
+      operator: Exists
+  nodeSelector:
+    kubernetes.io/os: "linux"
+  hcp:
+    enabled: false
+    namespace: hcp
+    replicas: 3
+    # OVN NB address used by workload clusters, for example tcp:ovn-nb.example.com:6641.
+    nbAddress: ""
+    # OVN SB address used by workload clusters, for example tcp:ovn-sb.example.com:6642.
+    sbAddress: ""
+    service:
+      type: NodePort
+      nbNodePort: 30641
+      sbNodePort: 30642
+    storage:
+      size: 5Gi
+      storageClassName: ""
   requests:
     cpu: "300m"
     memory: "200Mi"
@@ -157,6 +214,34 @@ ovn-central:
     cpu: "3"
     memory: "4Gi"
     ephemeral-storage: 1Gi
+  # Persistent storage for the OVN DB files. Only used when OVN_CENTRAL_MODE=single.
+  # The StorageClass should support cross-node attach (e.g. NFS, Ceph RBD, cloud
+  # block storage with attach/detach) if you want ovn-central to drift between
+  # nodes on host failure.
+  storage:
+    storageClassName: ""
+    size: 10Gi
+    accessModes:
+      - ReadWriteOnce
+    # Set existingClaim to skip in-chart PVC creation and point the
+    # Deployment at a PVC the operator manages out-of-band (e.g. via a
+    # storage operator). The value is the name of the existing PVC; the
+    # Deployment's host-config-ovn volume mounts whatever you set here.
+    # Leaving this empty makes the chart create a PVC named
+    # "ovn-central-data" itself.
+    existingClaim: ""
+  # Service exposure for ovn-nb / ovn-sb / ovn-northd. Default ClusterIP is
+  # only reachable from inside the cluster. Switch to LoadBalancer (or
+  # NodePort) to expose the OVN DB to data-plane components running outside
+  # the management cluster — for example a split-cluster topology where
+  # ovn-controller / kube-ovn-cni / kube-ovn-controller run in a separate
+  # tenant cluster and connect back over a stable VIP.
+  service:
+    type: ClusterIP
+    # Optional, only honoured when type=LoadBalancer; provider-dependent.
+    loadBalancerIP: ""
+    # Optional, only honoured when type=LoadBalancer / NodePort.
+    externalTrafficPolicy: ""
 ovs-ovn:
   requests:
     cpu: "200m"
@@ -166,6 +251,13 @@ ovs-ovn:
     memory: "1000Mi"
     ephemeral-storage: 1Gi
 kube-ovn-controller:
+  leaderElection:
+    # Duration non-leader candidates wait after observing a renewal before attempting to acquire leadership. Empty uses the controller default of 30s.
+    leaseDuration: ""
+    # Duration the acting leader retries refreshing leadership before giving up. Empty uses the controller default of 20s.
+    renewDeadline: ""
+    # Duration leader election clients wait between attempts. Empty uses the controller default of 6s.
+    retryPeriod: ""
   requests:
     cpu: "200m"
     memory: "200Mi"
diff --git a/packages/system/kubeovn/images/kubeovn/Dockerfile b/packages/system/kubeovn/images/kubeovn/Dockerfile
new file mode 100644
index 0000000000..a24488b297
--- /dev/null
+++ b/packages/system/kubeovn/images/kubeovn/Dockerfile
@@ -0,0 +1,71 @@
+# syntax = docker/dockerfile:experimental@sha256:600e5c62eedff338b3f7a0850beb7c05866e0ef27b2d2e8c02aa468e78496ff5
+ARG VERSION="1.15.26"
+ARG BASE_TAG=v$VERSION
+
+FROM --platform=$BUILDPLATFORM golang:1.27-bookworm@sha256:69a7b9788769bec032d238959b61854e9ae87f57be9029ec04e9885fabf99195 as builder
+ARG GOPROXY
+
+ARG TAG="v1.15.26"
+ARG TARGETARCH
+RUN git clone --branch ${TAG} --depth 1 https://github.com/kubeovn/kube-ovn /source
+
+WORKDIR /source
+
+COPY patches /patches
+RUN git apply /patches/*.diff
+# The loop below runs this test: a patch touches pkg/controller.
+COPY tests/kubevirt_migration_test.go.txt /source/pkg/controller/kubevirt_migration_test.go
+
+# go build never compiles a _test.go, so nothing else runs the tests of the
+# packages the patches touch. Each package is tested from its own directory:
+# that finds the module it belongs to, and an empty list runs nothing.
+# The list is read into a variable first: a for loop drops the exit status
+# of a command substitution, so a patch git cannot read would leave the list
+# empty and the step green.
+RUN files=$(git apply --numstat /patches/*.diff) || exit 1; \
+    for dir in $(printf '%s\n' "$files" | cut -f3 | grep '\.go$' | xargs -r -n1 dirname | sort -u); do \
+      (cd "$dir" && go test .) || exit 1; \
+    done
+
+# Upstream hardcodes GOARCH in each target: build-go is amd64 only, and
+# build-go-arm is its arm64 twin minus the `go mod tidy` and the test-server
+# binary, which this image never copies.
+RUN case "$TARGETARCH" in \
+      amd64) make build-go ;; \
+      arm64) go mod tidy && make build-go-arm ;; \
+      *) echo "unsupported TARGETARCH=${TARGETARCH:-<empty>}" >&2; exit 1 ;; \
+    esac
+
+WORKDIR /source/dist/images
+
+# imported from https://github.com/kubeovn/kube-ovn/blob/master/dist/images/Dockerfile
+FROM kubeovn/kube-ovn-base:$BASE_TAG AS setcap
+
+COPY --from=builder /source/dist/images/*.sh /kube-ovn/
+COPY --from=builder /source/dist/images/kubectl-ko /kube-ovn/kubectl-ko
+COPY --from=builder /source/dist/images/01-kube-ovn.conflist /kube-ovn/01-kube-ovn.conflist
+
+COPY --from=builder /source/dist/images/kube-ovn /kube-ovn/kube-ovn
+COPY --from=builder /source/dist/images/kube-ovn-cmd /kube-ovn/kube-ovn-cmd
+COPY --from=builder /source/dist/images/kube-ovn-bfdd-supervisor /kube-ovn/kube-ovn-bfdd-supervisor
+COPY --from=builder /source/dist/images/kube-ovn-daemon /kube-ovn/kube-ovn-daemon
+COPY --from=builder /source/dist/images/kube-ovn-controller /kube-ovn/kube-ovn-controller
+RUN ln -s /kube-ovn/kube-ovn-cmd /kube-ovn/kube-ovn-monitor && \
+    ln -s /kube-ovn/kube-ovn-cmd /kube-ovn/kube-ovn-speaker && \
+    ln -s /kube-ovn/kube-ovn-cmd /kube-ovn/kube-ovn-webhook && \
+    ln -s /kube-ovn/kube-ovn-cmd /kube-ovn/kube-ovn-leader-checker && \
+    ln -s /kube-ovn/kube-ovn-cmd /kube-ovn/kube-ovn-ic-controller && \
+    ln -s /kube-ovn/kube-ovn-controller /kube-ovn/kube-ovn-pinger && \
+    setcap CAP_NET_BIND_SERVICE+eip /kube-ovn/kube-ovn-cmd && \
+    setcap CAP_NET_RAW,CAP_NET_BIND_SERVICE+eip /kube-ovn/kube-ovn-controller && \
+    setcap CAP_NET_ADMIN,CAP_NET_RAW,CAP_NET_BIND_SERVICE,CAP_SYS_ADMIN+eip /kube-ovn/kube-ovn-daemon
+
+FROM kubeovn/kube-ovn-base:$BASE_TAG
+
+COPY --chmod=0644 --from=builder /source/dist/images/logrotate/* /etc/logrotate.d/
+COPY --from=builder /source/dist/images/grace_stop_ovn_controller /usr/share/ovn/scripts/grace_stop_ovn_controller
+
+COPY --from=setcap /kube-ovn /kube-ovn
+RUN /kube-ovn/iptables-wrapper-installer.sh --no-sanity-check
+
+WORKDIR /kube-ovn
diff --git a/packages/system/kubeovn/images/kubeovn/patches/fix-vmim-target-pod-retry.diff b/packages/system/kubeovn/images/kubeovn/patches/fix-vmim-target-pod-retry.diff
new file mode 100644
index 0000000000..470057cd9f
--- /dev/null
+++ b/packages/system/kubeovn/images/kubeovn/patches/fix-vmim-target-pod-retry.diff
@@ -0,0 +1,19 @@
+Additional retry for the target Pod creation race, separate from Kube-OVN #6834.
+Keep until an equivalent guard is verified in the selected upstream version.
+
+diff --git a/pkg/controller/kubevirt.go b/pkg/controller/kubevirt.go
+--- a/pkg/controller/kubevirt.go
++++ b/pkg/controller/kubevirt.go
+@@ -210,9 +210,10 @@
+ 				klog.Infof("successfully set migrate options for lsp %s from %s to %s", portName, sourceNode, targetPod.Spec.NodeName)
+ 			}
+ 		} else {
+-			klog.Warningf("target pod not yet created for migration job UID %s in phase %s, waiting for pod creation",
++			// Pod creation does not change the migration phase, so retry even when
++			// the target pod has not reached the informer cache yet.
++			return fmt.Errorf("target pod not yet created for migration job UID %s in phase %s, waiting for pod creation",
+ 				vmiMigration.UID, vmiMigration.Status.Phase)
+-			return nil
+ 		}
+ 	case kubevirtv1.MigrationSucceeded:
+ 		for _, portName := range portNames {
diff --git a/packages/system/kubeovn/images/kubeovn/tests/kubevirt_migration_test.go.txt b/packages/system/kubeovn/images/kubeovn/tests/kubevirt_migration_test.go.txt
new file mode 100644
index 0000000000..f4400441ff
--- /dev/null
+++ b/packages/system/kubeovn/images/kubeovn/tests/kubevirt_migration_test.go.txt
@@ -0,0 +1,100 @@
+package controller
+
+import (
+	"testing"
+	"time"
+
+	"github.com/stretchr/testify/require"
+	"go.uber.org/mock/gomock"
+	corev1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	corelisters "k8s.io/client-go/listers/core/v1"
+	"k8s.io/client-go/tools/cache"
+	"k8s.io/client-go/util/workqueue"
+	kubevirtv1 "kubevirt.io/api/core/v1"
+	"kubevirt.io/client-go/kubecli"
+
+	mockovs "github.com/kubeovn/kube-ovn/mocks/pkg/ovs"
+	"github.com/kubeovn/kube-ovn/pkg/ovsdb/ovnnb"
+)
+
+func TestVMIMigrationSchedulingRetry(t *testing.T) {
+	for _, tc := range []struct {
+		name             string
+		sourceNode       string
+		targetNode       string
+		wantRetry        bool
+		wantSetup        bool
+		missingTargetPod bool
+	}{
+		{"target pod not created", "source", "target", true, true, true},
+		{"target not scheduled", "source", "", true, true, false},
+		{"source not known", "", "target", true, true, false},
+		{"both nodes unknown", "", "", true, true, false},
+		{"already scheduled", "source", "target", false, true, false},
+		{"same node", "source", "source", false, false, false},
+	} {
+		t.Run(tc.name, func(t *testing.T) {
+			mockCtrl := gomock.NewController(t)
+			virtClient := kubecli.NewMockKubevirtClient(mockCtrl)
+			migrationClient := kubecli.NewMockVirtualMachineInstanceMigrationInterface(mockCtrl)
+			vmiClient := kubecli.NewMockVirtualMachineInstanceInterface(mockCtrl)
+			nbClient := mockovs.NewMockNbClient(mockCtrl)
+			migration := &kubevirtv1.VirtualMachineInstanceMigration{
+				ObjectMeta: metav1.ObjectMeta{Name: "migration", Namespace: "default", UID: "migration-uid"},
+				Spec:       kubevirtv1.VirtualMachineInstanceMigrationSpec{VMIName: "vm"},
+				Status: kubevirtv1.VirtualMachineInstanceMigrationStatus{
+					Phase:          kubevirtv1.MigrationScheduling,
+					MigrationState: &kubevirtv1.VirtualMachineInstanceMigrationState{},
+				},
+			}
+			vmi := &kubevirtv1.VirtualMachineInstance{
+				ObjectMeta: metav1.ObjectMeta{Name: "vm", Namespace: "default"},
+				Status:     kubevirtv1.VirtualMachineInstanceStatus{NodeName: tc.sourceNode},
+			}
+			pod := &corev1.Pod{
+				ObjectMeta: metav1.ObjectMeta{Name: "target", Namespace: "default", Labels: map[string]string{
+					kubevirtv1.MigrationJobLabel: string(migration.UID),
+				}},
+				Spec: corev1.PodSpec{NodeName: tc.targetNode},
+			}
+			indexer := cache.NewIndexer(cache.MetaNamespaceKeyFunc, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc})
+			if !tc.missingTargetPod {
+				require.NoError(t, indexer.Add(pod))
+			}
+			virtClient.EXPECT().VirtualMachineInstanceMigration("default").Return(migrationClient).AnyTimes()
+			virtClient.EXPECT().VirtualMachineInstance("default").Return(vmiClient).AnyTimes()
+			migrationClient.EXPECT().Get(gomock.Any(), "migration", metav1.GetOptions{}).Return(migration, nil).AnyTimes()
+			vmiClient.EXPECT().Get(gomock.Any(), "vm", metav1.GetOptions{}).Return(vmi, nil).AnyTimes()
+			nbClient.EXPECT().ListNormalLogicalSwitchPorts(false, map[string]string{"pod": "default/vm"}).Return([]ovnnb.LogicalSwitchPort{{Name: "vm-port"}}, nil).AnyTimes()
+			if tc.wantSetup {
+				nbClient.EXPECT().SetLogicalSwitchPortMigrateOptions("vm-port", "source", "target").Return(nil).Times(1)
+			}
+			queue := workqueue.NewTypedRateLimitingQueue(workqueue.DefaultTypedControllerRateLimiter[string]())
+			t.Cleanup(queue.ShutDown)
+			controller := &Controller{
+				config: &Configuration{KubevirtClient: virtClient}, podsLister: corelisters.NewPodLister(indexer),
+				OVNNbClient: nbClient, addOrUpdateVMIMigrationQueue: queue,
+			}
+			const key = "default/migration"
+			queue.Add(key)
+			require.True(t, processNextWorkItem("migration", queue, controller.handleAddOrUpdateVMIMigration, getWorkItemKey))
+			if tc.wantRetry {
+				require.Equal(t, 1, queue.NumRequeues(key), "a missing or unscheduled target must not drop the migration event")
+				vmi.Status.NodeName = "source"
+				scheduledPod := pod.DeepCopy()
+				scheduledPod.Spec.NodeName = "target"
+				if tc.missingTargetPod {
+					require.NoError(t, indexer.Add(scheduledPod))
+				} else {
+					require.NoError(t, indexer.Update(scheduledPod))
+				}
+				// The VMIM stays in Scheduling: only the rate-limited retry can finish setup.
+				require.Eventually(t, func() bool { return queue.Len() == 1 }, time.Second, time.Millisecond)
+				require.True(t, processNextWorkItem("migration", queue, controller.handleAddOrUpdateVMIMigration, getWorkItemKey))
+			}
+			require.Zero(t, queue.NumRequeues(key))
+			require.Zero(t, queue.Len())
+		})
+	}
+}
diff --git a/packages/system/kubeovn/patches/mtu.diff b/packages/system/kubeovn/patches/mtu.diff
new file mode 100644
index 0000000000..7f07c58f57
--- /dev/null
+++ b/packages/system/kubeovn/patches/mtu.diff
@@ -0,0 +1,12 @@
+diff --git a/packages/system/kubeovn/charts/kube-ovn/templates/ovncni-ds.yaml b/packages/system/kubeovn/charts/kube-ovn/templates/ovncni-ds.yaml
+--- a/packages/system/kubeovn/charts/kube-ovn/templates/ovncni-ds.yaml
++++ b/packages/system/kubeovn/charts/kube-ovn/templates/ovncni-ds.yaml
+@@ -122,6 +122,9 @@
+           - --set-vxlan-tx-off={{- .Values.func.SET_VXLAN_TX_OFF }}
+           - --non-primary-cni-mode={{- .Values.cni_conf.NON_PRIMARY_CNI }}
++          {{- with .Values.mtu }}
++          - --mtu={{ . }}
++          {{- end }}
+         securityContext:
+           runAsUser: 0
+           privileged: false
diff --git a/packages/system/kubeovn/tests/ovs-ovn-resources_test.yaml b/packages/system/kubeovn/tests/ovs-ovn-resources_test.yaml
new file mode 100644
index 0000000000..151cacaa4f
--- /dev/null
+++ b/packages/system/kubeovn/tests/ovs-ovn-resources_test.yaml
@@ -0,0 +1,37 @@
+suite: ovs-ovn container CPU resources
+
+# Pins the CPU headroom this package gives the ovs-ovn DaemonSet container.
+# ovn-controller runs inside that one container (alongside ovsdb-server and
+# ovs-vswitchd) and is CPU-bound while programming OpenFlow for newly created
+# logical ports; under a burst install it CFS-throttles against the container
+# CPU limit, lengthening flow-programming lag. The limit must stay at 4 cores
+# (not the upstream/legacy 2) and the request must keep a guaranteed share so
+# the controller keeps up under contention.
+
+templates:
+  - charts/kube-ovn/templates/ovsovn-ds.yaml
+
+release:
+  name: kubeovn
+  namespace: cozy-kubeovn
+
+tests:
+  - it: ovs-ovn container carries the raised CPU limit and a guaranteed request
+    asserts:
+      - isKind:
+          of: DaemonSet
+      - equal:
+          path: spec.template.spec.containers[0].name
+          value: openvswitch
+      - equal:
+          path: spec.template.spec.containers[0].resources.limits.cpu
+          value: 4
+      - equal:
+          path: spec.template.spec.containers[0].resources.requests.cpu
+          value: 100m
+
+  - it: ovs-ovn CPU limit is not the throttle-prone 2 cores
+    asserts:
+      - notEqual:
+          path: spec.template.spec.containers[0].resources.limits.cpu
+          value: 2
diff --git a/packages/system/kubeovn/values.yaml b/packages/system/kubeovn/values.yaml
index e9d2d10f2a..4e142225a1 100644
--- a/packages/system/kubeovn/values.yaml
+++ b/packages/system/kubeovn/values.yaml
@@ -14,7 +14,14 @@ kube-ovn:
   cni_conf:
     CNI_CONFIG_PRIORITY: "10"
     MOUNT_LOCAL_BIN_DIR: false
+  # These three directories are hostPaths on every node. The kube-ovn defaults
+  # place them under /etc/origin, which a Talos node cannot create: its root
+  # filesystem is read-only, so the container fails at create time with
+  # "mkdir /etc/origin: read-only file system". Keep them under the writable
+  # /var/lib. OVN_IPSEC_KEY_DIR only takes effect with func.ENABLE_OVN_IPSEC
+  # on, where its absence leaves the node without ESP security associations.
   OPENVSWITCH_DIR: "/var/lib/openvswitch"
+  OVN_IPSEC_KEY_DIR: "/var/lib/ovs_ipsec_keys"
   OVN_DIR: "/var/lib/ovn"
   DISABLE_MODULES_MANAGEMENT: true
   ovn-central:
@@ -25,11 +32,18 @@ kube-ovn:
       cpu: "3"
       memory: "4Gi"
   ovs-ovn:
+    # ovn-controller runs inside this container (alongside ovsdb-server and
+    # ovs-vswitchd) and is CPU-bound while programming OpenFlow for newly
+    # created logical ports. During a burst install (many pods created at
+    # once) it competes for CPU in this one container; too tight a limit makes
+    # it CFS-throttle, lengthening flow-programming lag that leaves fresh pods
+    # unreachable from their node until the flows land. Give it CPU headroom
+    # (limit) plus a guaranteed share (request) so it keeps up under burst.
     requests:
-      cpu: "10m"
+      cpu: "100m"
       memory: "50Mi"
     limits:
-      cpu: "2"
+      cpu: "4"
       memory: "1000Mi"
   kube-ovn-controller:
     requests:
@@ -65,4 +79,4 @@ global:
   images:
     kubeovn:
       repository: kubeovn
-      tag: v1.15.10@sha256:741299cbd0081a786a6b60c460fa3156b3a42a38141c559dd8ac031f50c5504f
+      tag: v1.15.26@sha256:741299cbd0081a786a6b60c460fa3156b3a42a38141c559dd8ac031f50c5504f
diff --git a/packages/system/kubernetes-nodes-rd/Chart.yaml b/packages/system/kubernetes-nodes-rd/Chart.yaml
new file mode 100644
index 0000000000..30cfdd748f
--- /dev/null
+++ b/packages/system/kubernetes-nodes-rd/Chart.yaml
@@ -0,0 +1,3 @@
+apiVersion: v2
+name: kubernetes-nodes-rd
+version: 0.0.0 # Placeholder, the actual version will be automatically set during the build process
diff --git a/packages/system/kubernetes-nodes-rd/Makefile b/packages/system/kubernetes-nodes-rd/Makefile
new file mode 100644
index 0000000000..e0ec30682a
--- /dev/null
+++ b/packages/system/kubernetes-nodes-rd/Makefile
@@ -0,0 +1,4 @@
+export NAME=kubernetes-nodes-rd
+export NAMESPACE=cozy-system
+
+include ../../../hack/package.mk
diff --git a/packages/system/kubernetes-nodes-rd/cozyrds/kubernetes-nodes.yaml b/packages/system/kubernetes-nodes-rd/cozyrds/kubernetes-nodes.yaml
new file mode 100644
index 0000000000..18adb20127
--- /dev/null
+++ b/packages/system/kubernetes-nodes-rd/cozyrds/kubernetes-nodes.yaml
@@ -0,0 +1,48 @@
+apiVersion: cozystack.io/v1alpha1
+kind: ApplicationDefinition
+metadata:
+  name: kubernetes-nodes
+  annotations:
+    # A worker pool's talos-reconcile Job waits (up to ~10m) for control-plane
+    # objects owned by the parent kubernetes release (apiserver Service ClusterIP,
+    # Talos CA, Kubernetes CA) before it can produce the pool's TalosConfigTemplate.
+    # With readiness waiting disabled below, nothing in this chart's install or
+    # upgrade is bounded by this timeout: the Job is a plain resource that keeps
+    # running asynchronously, and the chart has no install or upgrade hooks.
+    # The 15m only takes effect if waiting is re-enabled or such a hook is added.
+    release.cozystack.io/helm-install-timeout: "15m"
+    # The pool cannot be Ready until its workers join, which cannot happen until
+    # the parent control plane has emitted the Service/Secrets the reconcile Job
+    # waits on. Skip the readiness wait so the release settles while the Job runs.
+    release.cozystack.io/helm-install-disable-wait: "true"
+spec:
+  application:
+    kind: KubernetesNodes
+    singular: kubernetesnodes
+    plural: kubernetesnodeses
+    openAPISchema: |-
+      {"title":"Chart Values","type":"object","properties":{"cluster":{"description":"Name of the parent Kubernetes cluster (the `Kubernetes` CR) in the same namespace this node pool attaches to. Required. The pool's CAPI objects are wired to the parent cluster `kubernetes-<cluster>`; the KubernetesNodes CR must be named `<cluster>-<pool>`. The pool name (the part after `<cluster>-`) must not collide with a nodeGroup still managed by the parent kubernetes chart (e.g. the default `md0`), or the render fails on ownership conflict.","type":"string","default":"","x-kubernetes-validations":[{"rule":"self == oldSelf","message":"cluster is immutable"}]},"storageClass":{"description":"StorageClass for the worker node system disk. When empty, the cluster default applies. Worker VMs live-migrate, so their disks need ReadWriteMany — the RWX access mode is supplied by the chosen StorageClass's CDI StorageProfile — and linstor-csi rejects RWX volumes that are not on a DRBD-backed StorageClass, so prefer a replicated/DRBD class. On an `osImage.builtin` pool this field also decides whether the pool renders at all: CDI takes the storage-layer clone path only when the worker disk and the golden share a StorageClass, and falls back to a host-assisted copy over the pod network across classes, so the chart refuses a pool whose class differs from its golden's. Leaving it empty resolves to the cluster's default StorageClass, and the same comparison is made against that. On a `builtin` pool the resolved class is then written onto the worker disk rather than left for the cluster to fill in at bind time, so a pool that has already cloned keeps binding on the class its disks are on even after an admin moves the default annotation; on the HTTP path an empty class is still left to the cluster.","type":"string","default":"replicated","x-kubernetes-validations":[{"rule":"self == oldSelf","message":"storageClass is immutable"}],"x-cozystack-options":{"source":"storageclass"}},"minReplicas":{"description":"Minimum number of replicas in this pool. Used as the cluster-autoscaler floor.","type":"integer","default":0},"maxReplicas":{"description":"Maximum number of replicas in this pool. Used as the cluster-autoscaler ceiling.","type":"integer","default":10},"instanceType":{"description":"Virtual machine instance type.","type":"string","default":"u1.medium","x-cozystack-options":{"source":"instancetype"}},"diskSize":{"description":"System disk size for the worker VM. Carries the Talos OS image, kubelet state, containerd image cache, and any local-path PVCs. How the OS image reaches the disk follows this pool's `osImage`: the default and `osImage.factory` stream the Image Factory raw artifact in over HTTP, while `osImage.builtin` makes the disk a storage-layer CDI clone of a shared golden image, with no HTTP fetch. A `builtin` pool must keep diskSize at or above the golden's storage size (6Gi in the shipped worker image catalog), because a CDI clone target cannot be smaller than its source -- the chart rejects a smaller value at render time rather than letting the clone stall. Sizing a `builtin` pool also has to allow for transient headroom the finished disk does not show: CDI populates a larger target by cloning the golden at the source size and then growing it, so a worker being provisioned occupies a temporary clone PVC at the golden's size on top of this diskSize, and both are multiplied by the replica count of a replicated StorageClass. The golden itself is a separate one-time cost for the whole cluster, not a per-worker one. So the peak is the golden, plus `diskSize + golden storage` for each worker cloning at that moment. A pool whose storage backend cannot spare that peak does not fail: the clone waits for space, the VM never boots, and the reason is visible only in the storage layer's own events.","default":"20Gi","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"roles":{"description":"List of node roles. Each role `r` labels nodes with `node-role.kubernetes.io/<r>`. Use `[ingress-nginx]` for a pool that hosts the tenant ingress-nginx controller.","type":"array","default":[],"items":{"type":"string"}},"resources":{"description":"Explicit CPU and memory for each worker node, as an alternative to `instanceType` sizing. Optional: when omitted, the node is sized by `instanceType`. When both `cpu` and `memory` are set, they take precedence and `instanceType` is ignored (the instancetype is omitted from the VM, since KubeVirt cannot override an instancetype's CPU/memory). Set both `cpu` and `memory` together or neither; setting only one is rejected at render time.","type":"object","default":{},"properties":{"cpu":{"description":"Number of vCPU cores for each worker VM, as a whole number such as `2`. On the `kubevirt` substrate the value becomes the VM's integer `domain.cpu.cores`, so millicore, fractional and negative quantities, and counts above 4294967295, are rejected at render time; an unquoted `0` is treated as unset. On the `proxmox` substrate a millicore or fractional quantity is rounded up to whole cores.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Memory (RAM) available.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}},"podCpuLimit":{"description":"CPU limit for the worker VM's virt-launcher `compute` container, which is the ceiling the guest vCPU threads, the QEMU emulator thread and the IO threads share. Distinct from `resources.cpu`, which sizes the guest itself. Cannot be combined with `instanceType` sizing: KubeVirt refuses a VM that references an instancetype and also sets `domain.resources.limits.cpu`, so the chart rejects that combination at render time. Sizing the pool by `resources` (both `cpu` and `memory`) is what drops the instancetype from the VM, which is where the limit is usable. When unset, KubeVirt derives the limit from the guest vCPU count in any namespace carrying a ResourceQuota that limits CPU, so a worker sized at N vCPUs runs under a ceiling of N with the emulation overhead taken out of the same N. Setting a value declares the limit on the VM directly, which is both what lands it on the container and what stops KubeVirt deriving one. It moves the CPU request with it: KubeVirt copies a declared CPU limit into the CPU request when the VM declares no request of its own, so a pool that sets only this field asks the scheduler for its whole ceiling instead of the fraction of the vCPU count it asked for before, and a ceiling the nodes cannot spare leaves the workers Pending on `Insufficient cpu`. Pair it with `podCpuRequest` to move the ceiling without moving the request. Zero means no ceiling at all rather than the tightest one, since the kubelet turns a zero CPU limit into no CFS quota while the declared key still stops KubeVirt deriving one — but it is only accepted together with `podCpuRequest: 0`, because KubeVirt keeps deriving a request from the vCPU count when the VM declares none and a request above a declared limit of zero is rejected when the worker's Pod is created. A negative value is refused at render time. Changing it rolls the pool, because the worker VM template is named by a hash of its content. Keep in sync with the parent kubernetes chart.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"podCpuRequest":{"description":"CPU request for the worker VM's virt-launcher `compute` container, which is what the scheduler reserves for a worker on its host and what weights it against neighbours on a contended one. Distinct from `resources.cpu`, which sizes the guest itself. It exists to be paired with `podCpuLimit`: KubeVirt copies a declared CPU limit into the request when the VM declares no request, so raising the ceiling alone raises what every worker in the pool asks the scheduler for, and this field is what holds the request still while the ceiling moves. Cannot be combined with `instanceType` sizing, for the same reason as `podCpuLimit`: KubeVirt refuses a VM that references an instancetype and also sets `domain.resources.requests.cpu`, so the chart rejects that combination at render time, as it does a value above `podCpuLimit`. Usable without a limit, where it only changes the scheduler's weighting: KubeVirt still derives the ceiling from the guest vCPU count in any namespace carrying a ResourceQuota that limits CPU, so keep the request at or below that count. A request above that derived ceiling is refused only when the worker's Pod is created, and deliberately not at render time: the ceiling exists only where such a ResourceQuota does, so refusing here would take away a configuration that works in a namespace without one. Zero is accepted on its own and reserves nothing, but zero beside a `podCpuLimit` is refused, because KubeVirt cannot tell an explicit zero request from an absent one and replaces both with the limit — which is the outcome this field exists to avoid, arrived at silently. A negative value is refused as well. When unset, KubeVirt computes the request from the guest vCPU count and the cluster CPU allocation ratio. Changing it rolls the pool, because the worker VM template is named by a hash of its content. Keep in sync with the parent kubernetes chart.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"gpus":{"description":"List of GPUs to attach (NVIDIA driver requires at least 4 GiB RAM).","type":"array","default":[],"items":{"type":"object","required":["name"],"properties":{"name":{"description":"Name of GPU, such as \"nvidia.com/AD102GL_L40S\".","type":"string","x-cozystack-options":{"source":"gpu"}}}}},"kernelModules":{"description":"Kernel modules loaded on every worker in this pool, emitted as Talos `machine.kernel.modules`. A Talos system extension installs a module but does not load it, so an extension-provided driver needs its modules declared here. Leave unset to let the chart decide: a pool holding at least one `nvidia.com/*` GPU gets `nvidia` (with `NVreg_NvLinkDisable=1`, which the gpu-operator driver container applies on non-Talos workers; on Talos that container has to be turned off or it clashes with the system extension, and nothing then mounts the ConfigMap carrying the parameter), `nvidia_uvm`, `nvidia_drm`, `nvidia_modeset` (that order — Talos loads the list in sequence and the last three depend on the first), and any other pool gets nothing. Set a non-empty list to replace the chart's choice entirely, or `[]` to opt out and emit no modules even on a GPU pool. The field carries no default, and unset is not the same value as `[]`: a generated parameter table that shows `[]` in its Default column is printing what it prints for any array with no default, not the effective value — leaving the field out selects the automatic set, writing `[]` disables it. The module still has to be in the image, and which extensions the image carries is the pool's schematic: a GPU pool points `osImage.factory.schematicID` (or `osImage.builtin.schematicID`) at a schematic with the NVIDIA extensions, and on Blackwell (GB202) that must be the open-kernel-modules extension. The automatic set keys on the `nvidia.com/` resource prefix alone and nothing cross-checks it against that schematic; on Talos v1.13 a declared module the image does not ship leaves its controller retrying rather than failing the boot, so the symptom is a missing driver, not a dead node. This value is part of the worker machine config, whose content hash names the `TalosConfigTemplate`, so changing it rolls every existing worker in the pool rather than only affecting nodes created later. The automatic set is itself such a change, on the upgrade that introduces this field, for every existing pool that holds an `nvidia.com/*` GPU and leaves the field unset: that pool rolls.","type":"array","items":{"type":"object","required":["name"],"properties":{"name":{"description":"Module name as `modprobe` takes it, e.g. `nvidia_uvm`.","type":"string"},"parameters":{"description":"Module parameters, each as a bare `key=value` string.","type":"array","items":{"type":"string"}}}}},"kubelet":{"description":"Kubelet resource reservations for this pool.","type":"object","default":{},"properties":{"evictionHardMemory":{"description":"Hard eviction threshold for memory (absolute like 200Mi or percentage like 7%).","type":"string","default":"7%"},"evictionSoftMemory":{"description":"Soft eviction threshold for memory (absolute like 1Gi or percentage like 10%).","type":"string","default":"10%"},"kubeReservedCpu":{"description":"CPU reserved for kubelet and container runtime. Auto-computed from instanceType if empty.","type":"string"},"kubeReservedMemory":{"description":"Memory reserved for kubelet and container runtime. Auto-computed from instanceType if empty.","type":"string"},"systemReservedCpu":{"description":"CPU reserved for host OS. Auto-computed from instanceType if empty.","type":"string"},"systemReservedMemory":{"description":"Memory reserved for host OS. Auto-computed from instanceType if empty.","type":"string"}}},"logSerialConsole":{"description":"Stream each worker VM's guest serial console into a `guest-console-log` container beside virt-launcher, readable with `kubectl logs`. The only view of a worker that stalls during boot before Talos apid answers, when neither a Node nor a certificate request exists to diagnose from. Two costs the field name does not show. Changing the value rolls the pool, because it is part of the worker VM template whose name is a hash of its content -- including the stuck VM whose console was wanted, so it buys visibility into the next boot rather than the current one. And it overrides the platform's cluster-wide `disableSerialConsoleLog`, set because that container has been seen holding virt-launcher in `PodInitializing` (kubevirt/kubevirt#15989), which would take the pool down rather than explain it -- so check that virt-launcher Pods reach Running after enabling it.","type":"boolean","default":false},"maxUnhealthy":{"description":"Maximum number of unhealthy nodes tolerated in this pool before remediation is paused. The MachineHealthCheck admission webhook accepts either a bare integer (\"0\", \"1\", ...) or a percentage (\"0%\", \"50%\"); bare numeric strings are rejected, so the safer default is a percentage. Drop to \"0%\" once the pool is stable. Watch how a percentage behaves in a small group: the MachineHealthCheck controller scales it against the number of machines the check covers and rounds down, then remediates only while the unhealthy count is at or below that result. At \"50%\" a group of one therefore never remediates, because half of one rounds down to zero, and a group of two remediates one unhealthy machine but not two.","type":"string","default":"50%"},"nodeStartupTimeout":{"description":"Maximum time a Machine is allowed to spend reaching the Ready condition before it is remediated. Raise for slow first boots (Talos image fetch from factory.talos.dev or a busy storage class on the kubevirt-csi PVC populator). The MachineHealthCheck measures it from the later of the Machine's creation and its InfrastructureReady transition, so the clock restarts when the infrastructure reports ready: a worker gets this long for the disk image import and the VM to come up, and then this long again for the guest to boot and its kubelet to register with the tenant apiserver. Either leg stretches on a host under load, and a Machine remediated here is deleted before it ever joins, so its replacement starts the same sequence from the beginning.","type":"string","default":"20m"},"readyUnknownTimeout":{"description":"How long a worker Node may report `Ready=Unknown` before the MachineHealthCheck remediates the Machine, which for a KubeVirt worker means deleting the VM. `Ready=Unknown` is what the node lifecycle controller writes once it stops hearing from a kubelet, on a grace period of its own, so the wall clock from a guest going quiet to a deleted worker is this value plus that grace period. A guest starved of CPU stops answering long before it is dead, so a value of a few tens of seconds deletes workers that would have come back on their own. Validated at render time like maxNodeProvisionTime: the CAPI webhook does not check these timeouts, and a zero or negative value would remediate the moment the condition flips. Keep in sync with the parent kubernetes chart.","type":"string","default":"5m"},"readyFalseTimeout":{"description":"How long a worker Node may report `Ready=False` before the MachineHealthCheck remediates the Machine. A Node that has registered but has no working CNI yet reports `Ready=False`, so this value is the whole budget a first boot gets for the CNI rollout to reach that node, and a worker deleted mid-rollout takes the rollout with it while its replacement starts over. Raising it delays replacing a worker that is genuinely dead, but not rescheduling its workload: Pods leave an unreachable Node on the node lifecycle controller's taint-based eviction and the toleration that carries, not on this timer. Validated at render time like maxNodeProvisionTime: the CAPI webhook does not check these timeouts, and a zero or negative value would remediate the moment the condition flips. Keep in sync with the parent kubernetes chart.","type":"string","default":"10m"},"maxNodeProvisionTime":{"description":"How long the cluster-autoscaler waits for a newly created worker to register as a Node before it treats that machine as long-unregistered. Rendered onto this pool's MachineDeployment as the `cluster.x-k8s.io/autoscaling-options-maxnodeprovisiontime` annotation, which overrides the autoscaler's built-in default for this pool only. Two things change when the timer fires, and both make a slow join worse rather than better: the machine stops counting towards the pool's upcoming capacity, so the autoscaler asks for a replacement for capacity that is already on its way, and the machine becomes eligible for removal. Size it above the slowest join a healthy worker can take, counting the Talos image import, the guest boot and the CNI rollout. Accepted as a whole number of seconds, minutes or hours (\"30m\", \"1h30m\"), which is narrower than Go's duration syntax on purpose: the autoscaler ignores a value it cannot parse and falls back to its own default without failing, and the narrower shape cannot express a value that overflows the parser or a fraction it rounds to zero. The canonical form a duration serializes back to (\"20m0s\", \"1h0m0s\") is accepted. Keep in sync with the parent kubernetes chart.","type":"string","default":"30m"},"version":{"description":"Kubernetes major.minor version the pool joins. Must not be ahead of the parent cluster's minor (workers may not lead the apiserver); it may lag behind during a rolling upgrade -- bump the parent Kubernetes CR first, then each pool -- and must satisfy the Talos<->Kubernetes support matrix against `talos.version`.","type":"string","default":"v1.35","enum":["v1.35","v1.34","v1.33","v1.32","v1.31"]},"osImage":{"description":"Worker OS image source for this pool. Default (omitted): import over HTTP from the `talos.*` Image Factory. Set `osImage.builtin` to clone a golden from the opt-in worker image catalog instead. Editing this on an existing pool re-images that pool.","type":"object","default":{},"properties":{"builtin":{"description":"Clone a golden image from the worker image catalog. Requires a StorageClass whose volumes are reachable from any node, in practice a replicated/DRBD class: the clone is a storage-layer copy, and on a node-pinned class its two ends land on unrelated nodes -- the golden binds where CDI imported it, a worker disk where its VM is scheduled.","type":"object","properties":{"schematicID":{"description":"Talos schematic ID of the golden to clone. Defaults to `talos.schematicID`.","type":"string"},"version":{"description":"Talos version of the golden to clone. Defaults to `talos.version`.","type":"string"}}},"factory":{"description":"Import from an Image Factory / mirror (default).","type":"object","properties":{"imageFactoryURL":{"description":"Base URL of the Image Factory serving the boot raw image. Defaults to `talos.imageFactoryURL`. No trailing slash. NOTE: this redirects only the worker boot-disk import; the in-guest upgrade installer image is always sourced from `talos.installerRepository`, so an air-gapped pool must also have `talos.installerRepository` pointed at a reachable registry.","type":"string"},"schematicID":{"description":"Talos schematic ID. Defaults to `talos.schematicID`.","type":"string"},"version":{"description":"Talos version. Defaults to `talos.version`.","type":"string"}}}}},"talos":{"description":"Talos worker image configuration. Keep in sync with the parent cluster's `talos`.","type":"object","default":{},"required":["imageFactoryURL","installerRepository","registryMirrors","schematicID","version"],"properties":{"imageFactoryCA":{"description":"Complete PEM certificate block(s) CDI must trust when importing this pool's worker OS disk image over HTTPS — the no-osImage default and `osImage.factory` path. Empty by default, so the importer uses only its system trust store, which is what the public factory needs. Set this when the factory in use (`imageFactoryURL` or `osImage.factory.imageFactoryURL`) is a self-hosted factory or mirror served by an internal CA, which the importer otherwise rejects with `x509: certificate signed by unknown authority`. The chart renders it into a ConfigMap in the release namespace — CDI requires certConfigMap to sit alongside the DataVolume — and references that from the worker DataVolume's `source.http.certConfigMap`; CDI appends it to the system pool rather than replacing it, so a publicly-trusted endpoint verifies either way. A pool on `osImage.builtin` clones a golden image and builds no HTTP source, so this field has no effect there.","type":"string","default":""},"imageFactoryURL":{"description":"Default base URL of the Talos Image Factory that serves the worker OS disk image (the `openstack-amd64.raw.xz` raw artifact streamed in by CDI over HTTP). Applies only when this pool imports over HTTP — the default and `osImage.factory`, which overrides it via `osImage.factory.imageFactoryURL`. A pool on `osImage.builtin` clones a golden image from the worker image catalog and does not use this field at all. Defaults to the public factory. Point at a self-hosted Image Factory, a caching mirror, or an internal HTTP file server for air-gapped, rate-limited, or flaky-egress environments. No trailing slash. It is interpolated into the worker DataVolume source URL, so on those HTTP paths it must be a plain `http(s)` URL and the render refuses anything else; a pool on `osImage.builtin` builds no such URL and is not held to it, so blanking this field there is legal.","type":"string","default":"https://factory.talos.dev"},"installerRepository":{"description":"OCI repository prefix for the Talos installer image used by the in-guest `talos-reconcile` upgrade Job. Resolved as `<installerRepository>/<schematicID>:<version>` against whatever this pool's `osImage` pins, falling back to `talos.schematicID` and `talos.version` — so the installer matches the OS the pool actually booted. The prefix itself has no `osImage.*` override, so an air-gapped pool needs it pointed at a reachable registry as well. Defaults to the public factory's installer path. Override for air-gapped or mirrored registries. No trailing slash.","type":"string","default":"factory.talos.dev/installer"},"registryMirrors":{"description":"Talos `machine.registries.mirrors` passthrough for worker nodes: a map of upstream registry host to `{ endpoints: [ ... ] }`. Empty by default, so workers pull container images (the Talos `kubelet` image included) directly from the upstream registry. Point a host such as `ghcr.io` at an in-cluster pull-through mirror for air-gapped, rate-limited, or flaky-egress environments so a worker's boot does not depend on live public egress. Talos still falls back to the upstream registry unless a host also sets `skipFallback: true`, so a mirror alone does not enforce air-gap. This value is part of the worker machine config, whose content hash names the TalosConfigTemplate, so changing it rolls every existing worker in the pool rather than only affecting nodes created later.","type":"object","default":{},"x-kubernetes-preserve-unknown-fields":true},"schematicID":{"description":"Talos image-factory schematic ID. Defaults to the cozystack-tested vanilla schematic. Operators using custom schematics (system extensions, kernel args) override here. The pool can pin its own via `osImage.builtin.schematicID` or `osImage.factory.schematicID`; when `osImage` omits it, this value applies. Whichever of the two applies is interpolated into an image URL and a DataVolume name, so it must be a plain lowercase alphanumeric identifier -- the render refuses anything else. A custom schematic on `osImage.builtin` also needs its own catalog entry, since the golden is named from the schematic ID.","type":"string","default":"ce4c980550dd2ab1b17bbf2b08801c7eb59418eafe8f279833297925d67c7515"},"version":{"description":"Default Talos release for this pool's worker OS image and in-guest installer. The pool can pin its own release via `osImage.builtin.version` or `osImage.factory.version`; when `osImage` omits it, this value applies. Both ways in are checked against the chart's Talos<->Kubernetes support matrix, against whichever release the pool actually resolves to, so an override cannot slip past a check `talos.version` would have failed. The matrix rejects a pairing it lists as unsupported; it lists the Talos minors this chart ships and passes any other minor unchecked, so pointing either field at a Talos release the chart does not know about is the operator's call, not a checked one. Whichever release applies is interpolated into an image URL and a DataVolume name, so it must be a full `vMAJOR.MINOR.PATCH` release, optionally with a pre-release suffix -- the render refuses anything else, a minor-only `v1.13` included. The values schema types this as a bare string, so a malformed one is accepted by the CR and fails the pool's HelmRelease instead.","type":"string","default":"v1.13.6"}}},"substrate":{"description":"Which infrastructure provider backs this pool's worker VMs. `kubevirt` runs them inside this cluster on KubeVirt, sized by `instanceType` and booted from a Talos disk image CDI streams from the image factory. `proxmox` runs them on an external Proxmox VE cluster through capmox, sized by `resources`, and cloned from a Talos VM template that already exists on the hypervisor. The two substrates take different Talos platform images and different sizing inputs, so switching an existing pool is refused: the chart reads the live MachineDeployment's template kind and fails the render rather than rolling every worker to the other hypervisor and deleting the template the draining MachineSet still references. Create a new pool on the other substrate and scale this one down.","type":"string","default":"kubevirt","x-kubernetes-validations":[{"rule":"self == oldSelf","message":"substrate is immutable"}]},"proxmox":{"description":"Proxmox substrate settings.","type":"object","default":{},"required":["network"],"properties":{"dnsServers":{"description":"Nameservers written into the worker machineconfig. On kubevirt the workers use the management cluster's CoreDNS, which they reach over the pod network; an off-cluster Proxmox worker cannot, so it needs reachable resolvers of its own. Required when `substrate` is `proxmox`. Keep in sync with the parent kubernetes chart's `proxmox.dnsServers`.","type":"array","default":[],"items":{"type":"string"}},"full":{"description":"Full clone rather than linked. Default is a linked clone: it costs kilobytes at creation instead of the whole disk, because a ZFS-backed linked clone writes only its own increment (measured: 8K against 10.2G for the same worker full-cloned onto a `sparse 0` pool). The cost is that the clone holds the template's base snapshot, so the template cannot be rotated while any linked clone still references it — which is what the consolidation CronJob resolves 24h after creation. Set true for a pool that must be independent of the template from the first second.","type":"boolean","default":false},"network":{"description":"NIC configuration.","type":"object","default":{},"required":["bridge"],"properties":{"bridge":{"description":"Proxmox bridge the VM NIC attaches to (e.g. `vmbr0`). Required when `substrate` is `proxmox`.","type":"string","default":""},"mtu":{"description":"NIC MTU. Omitted when unset.","type":"integer"},"vlan":{"description":"L2 VLAN tag. Omitted when unset.","type":"integer"}}},"pool":{"description":"Proxmox resource pool the worker VMs are added to. Set the same pool on every node pool of a tenant cluster and grant the tenant's tokens their privileges on `/pool/<name>`: that is the one ACL path that follows every VM capmox creates, replacements included. The pool must exist on the hypervisor; capmox does not create it. Empty adds the workers to no pool.","type":"string","default":""},"storage":{"description":"Proxmox storage for the cloned disk; needs `full: true`. A target storage is a full-clone parameter — a linked clone always lives on the template's storage, and Proxmox refuses the pair — so the render refuses it too. Empty keeps the template's storage.","type":"string","default":""},"templateTags":{"description":"Tags identifying the Talos VM template to clone. capmox matches a template when its tag set is EQUAL to this list, not when it contains it, so every tag on the template must be listed here — a missing one yields `found 0 VM templates with tags ...` while the tags are plainly present. The template has to carry this pool's `talos.schematicID` at `talos.version` in the nocloud flavour, with the Proxmox guest agent enabled for the `qemu-guest-agent` extension of the default schematic; `hack/proxmox-talos-template.sh` builds it from these values and prints the tags to list here. Do not build it from the platform release's `nocloud-amd64.raw.xz`: that is the bare-metal node image, whose `zfs` extension keeps a VM from finishing its boot sequence and reboots it at the Talos boot timeout. Required when `substrate` is `proxmox`.","type":"array","default":[],"items":{"type":"string"}}}},"images":{"description":"Optional image overrides for air-gapped or rate-limited registries.","type":"object","default":{},"properties":{"kubectl":{"description":"Image used by the talos-reconcile and pre-delete unpin Jobs (kubectl). Empty falls back to images/kubectl.tag.","type":"string","default":""}}}}}
+  release:
+    labels:
+      sharding.fluxcd.io/key: tenants
+    prefix: kubernetes-nodes-
+    chartRef:
+      kind: ExternalArtifact
+      name: cozystack-kubernetes-nodes-application-kubevirt-kubernetes-nodes
+      namespace: cozy-system
+  dashboard:
+    category: IaaS
+    singular: Kubernetes Nodes
+    plural: Kubernetes Nodes
+    weight: 41
+    tags:
+      - compute
+    description: Worker node pool for a managed Kubernetes cluster
+    icon: <svg width="144" height="144" viewBox="0 0 144 144" fill="none" xmlns="http://www.w3.org/2000/svg">
<rect width="144" height="144" rx="24" fill="url(#paint0_linear_681_2845)"/>
<path d="M71.9968 19C70.3039 19.0002 68.9312 20.5322 68.9314 22.4221C68.9314 22.4511 68.9373 22.4788 68.9379 22.5076C68.9354 22.7644 68.9231 23.0737 68.9314 23.2973C68.9717 24.3873 69.2082 25.2216 69.3506 26.2258C69.6084 28.3752 69.8245 30.1569 69.6912 31.813C69.5615 32.4375 69.1037 33.0086 68.6956 33.4056L68.6235 34.7086C66.7839 34.8617 64.9319 35.1421 63.0821 35.5641C55.1226 37.3798 48.2695 41.4991 43.052 47.0609C42.7134 46.8288 42.1211 46.4019 41.945 46.2712C41.3977 46.3454 40.8445 46.5151 40.1241 46.0935C38.7522 45.1657 37.5028 43.8851 35.991 42.3424C35.2982 41.6044 34.7966 40.9018 33.9735 40.1904C33.7866 40.0289 33.5014 39.8104 33.2923 39.6442C32.6489 39.1288 31.89 38.86 31.157 38.8348C30.2147 38.8024 29.3075 39.1725 28.7138 39.9206C27.6584 41.2506 27.9963 43.2833 29.4671 44.4614C29.482 44.4734 29.4979 44.4827 29.5129 44.4943C29.715 44.6589 29.9625 44.8698 30.1483 45.0076C31.0217 45.6555 31.8195 45.9872 32.6897 46.5015C34.5231 47.6391 36.043 48.5823 37.2486 49.7196C37.7194 50.2237 37.8016 51.1122 37.8643 51.4964L38.8468 52.3782C33.5872 60.3308 31.153 70.1539 32.5915 80.1627L31.3077 80.5378C30.9693 80.9768 30.4912 81.6676 29.9911 81.8738C28.4138 82.3729 26.6387 82.5562 24.4956 82.7819C23.4894 82.866 22.6213 82.8158 21.5546 83.0188C21.3198 83.0635 20.9927 83.1491 20.7358 83.2097C20.7269 83.2116 20.7186 83.2142 20.7096 83.2162C20.6956 83.2195 20.6772 83.2263 20.6638 83.2294C18.857 83.668 17.6963 85.3365 18.0699 86.9805C18.4437 88.6248 20.2086 89.6248 22.0262 89.2312C22.0393 89.2282 22.0584 89.2277 22.072 89.2246C22.0926 89.2199 22.1106 89.2099 22.131 89.2049C22.3844 89.149 22.7019 89.0868 22.9236 89.0272C23.9723 88.7451 24.7318 88.3306 25.6746 87.9677C27.7029 87.2368 29.3828 86.6262 31.0195 86.3883C31.703 86.3345 32.4232 86.812 32.7814 87.0134L34.1177 86.7831C37.1926 96.3613 43.6366 104.103 51.7963 108.961L51.2396 110.303C51.4403 110.824 51.6616 111.53 51.5121 112.045C50.9171 113.595 49.898 115.231 48.7374 117.055C48.1755 117.898 47.6004 118.552 47.0934 119.516C46.972 119.747 46.8175 120.102 46.7004 120.346C45.9125 122.039 46.4904 123.99 48.0038 124.722C49.5268 125.459 51.4171 124.682 52.2352 122.985C52.2364 122.982 52.2406 122.98 52.2417 122.978C52.2426 122.976 52.2409 122.973 52.2417 122.971C52.3582 122.731 52.5233 122.415 52.6216 122.188C53.056 121.189 53.2005 120.332 53.5059 119.365C54.317 117.318 54.7626 115.17 55.8791 113.832C56.1849 113.466 56.6833 113.325 57.2001 113.186L57.8944 111.922C65.008 114.665 72.9705 115.402 80.9245 113.587C82.7391 113.173 84.4908 112.637 86.1843 111.994C86.3794 112.342 86.742 113.011 86.8393 113.179C87.3644 113.351 87.9377 113.439 88.4047 114.133C89.2401 115.567 89.8114 117.263 90.5073 119.312C90.8128 120.279 90.9638 121.136 91.3981 122.136C91.4971 122.363 91.6614 122.684 91.778 122.925C92.5944 124.628 94.4907 125.407 96.0159 124.669C97.5292 123.937 98.1077 121.986 97.3194 120.293C97.2023 120.049 97.0412 119.695 96.9198 119.464C96.4127 118.499 95.8377 117.852 95.2758 117.009C94.1152 115.185 93.1526 113.67 92.5575 112.12C92.3087 111.32 92.5995 110.823 92.7933 110.303C92.6772 110.17 92.4288 109.414 92.2824 109.059C100.762 104.029 107.017 95.9985 109.955 86.7239C110.351 86.7865 111.041 86.9091 111.265 86.9542C111.726 86.6487 112.149 86.2501 112.981 86.3159C114.617 86.5537 116.297 87.1645 118.326 87.8953C119.268 88.2581 120.028 88.6793 121.077 88.9614C121.298 89.021 121.616 89.0766 121.869 89.1325C121.889 89.1375 121.908 89.1475 121.928 89.1522C121.942 89.1553 121.961 89.1558 121.974 89.1588C123.792 89.552 125.557 88.5526 125.93 86.9081C126.303 85.2641 125.143 83.5952 123.336 83.157C123.074 83.097 122.701 82.995 122.446 82.9465C121.379 82.7435 120.511 82.7935 119.505 82.7095C117.361 82.4839 115.586 82.3004 114.009 81.8014C113.366 81.5507 112.908 80.7819 112.686 80.4655L111.448 80.1035C112.09 75.438 111.917 70.5825 110.806 65.7243C109.685 60.8208 107.704 56.3361 105.062 52.3848C105.379 52.0948 105.979 51.5612 106.149 51.4043C106.199 50.8517 106.156 50.2722 106.725 49.6603C107.931 48.523 109.451 47.5799 111.284 46.4423C112.154 45.9279 112.959 45.5964 113.832 44.9484C114.03 44.8019 114.299 44.5699 114.507 44.4022C115.977 43.2237 116.316 41.1911 115.26 39.8614C114.204 38.5317 112.159 38.4065 110.688 39.585C110.479 39.7516 110.195 39.9688 110.007 40.1312C109.184 40.8426 108.676 41.5452 107.983 42.2832C106.471 43.8259 105.222 45.113 103.85 46.0409C103.255 46.3885 102.385 46.2682 101.99 46.2449L100.824 47.0806C94.1753 40.0763 85.1235 35.5982 75.3766 34.7283C75.3494 34.3179 75.3137 33.5761 75.3046 33.3529C74.9056 32.9693 74.4235 32.6418 74.3024 31.813C74.1691 30.1569 74.3917 28.3752 74.6496 26.2258C74.7919 25.2216 75.0284 24.3873 75.0688 23.2973C75.078 23.0495 75.0632 22.69 75.0622 22.4221C75.062 20.5322 73.6898 18.9998 71.9968 19ZM68.1585 42.8886L67.248 59.0447L67.1825 59.0776C67.1214 60.5229 65.9375 61.677 64.4839 61.677C63.8884 61.677 63.3388 61.4849 62.8922 61.1571L62.866 61.1703L49.6807 51.7794C53.7331 47.7759 58.9164 44.8172 64.89 43.4546C65.9812 43.2056 67.0719 43.0209 68.1585 42.8886ZM75.8417 42.8886C82.8159 43.7504 89.2657 46.9232 94.2081 51.786L81.108 61.1176L81.0621 61.0979C79.8994 61.9512 78.2611 61.7394 77.3548 60.5978C76.9835 60.1301 76.7887 59.5801 76.7653 59.0249L76.7522 59.0184L75.8417 42.8886ZM44.8991 57.814L56.9382 68.633L56.9251 68.6988C58.0117 69.6479 58.172 71.2949 57.2657 72.4368C56.8944 72.9045 56.3975 73.2182 55.8639 73.3647L55.8508 73.4173L40.4188 77.8923C39.6334 70.6765 41.3261 63.6621 44.8991 57.814ZM99.0094 57.8206C100.798 60.7336 102.153 63.9871 102.959 67.5143C103.756 70.9991 103.956 74.4778 103.627 77.8397L88.1166 73.3515L88.1035 73.2857C86.7145 72.9043 85.8609 71.4848 86.1843 70.0611C86.3168 69.4778 86.6249 68.9844 87.0423 68.6198L87.0358 68.5869L99.0094 57.8206ZM69.5274 69.4688H74.4596L77.5251 73.3186L76.4247 78.1226L71.9968 80.2614L67.5558 78.1161L66.4554 73.312L69.5274 69.4688ZM85.3393 82.6437C85.5489 82.6331 85.7576 82.652 85.9616 82.6898L85.9878 82.6569L101.95 85.3682C99.6142 91.9624 95.144 97.675 89.1711 101.498L82.9747 86.4606L82.9944 86.4343C82.4252 85.1055 82.9948 83.5472 84.3044 82.9135C84.6397 82.7513 84.99 82.6614 85.3393 82.6437ZM58.5298 82.7095C59.748 82.7267 60.8406 83.5761 61.1237 84.822C61.2562 85.4052 61.1917 85.9831 60.973 86.4935L61.0189 86.5527L54.888 101.439C49.1559 97.7432 44.5904 92.2099 42.1481 85.4208L57.9731 82.7227L57.9993 82.7556C58.1763 82.7229 58.3558 82.7071 58.5298 82.7095ZM71.8986 89.2312C72.3229 89.2155 72.7534 89.303 73.1627 89.501C73.6992 89.7606 74.1136 90.1692 74.3745 90.6592H74.4334L82.2346 104.821C81.2221 105.162 80.1813 105.454 79.1167 105.697C73.1505 107.058 67.2032 106.645 61.818 104.802L69.5995 90.6658H69.6126C70.0795 89.7888 70.965 89.2656 71.8986 89.2312Z" fill="white" stroke="white" stroke-width="0.25"/>
<defs>
<linearGradient id="paint0_linear_681_2845" x1="10" y1="15.5" x2="144" y2="131.5" gradientUnits="userSpaceOnUse">
<stop stop-color="#4D87FF"/>
<stop offset="1" stop-color="#0547D0"/>
</linearGradient>
</defs>
</svg>

+    keysOrder: [["apiVersion"], ["appVersion"], ["kind"], ["metadata"], ["metadata", "name"], ["spec", "cluster"], ["spec", "storageClass"], ["spec", "minReplicas"], ["spec", "maxReplicas"], ["spec", "instanceType"], ["spec", "diskSize"], ["spec", "roles"], ["spec", "resources"], ["spec", "gpus"], ["spec", "kubelet"], ["spec", "logSerialConsole"], ["spec", "maxUnhealthy"], ["spec", "nodeStartupTimeout"], ["spec", "readyUnknownTimeout"], ["spec", "readyFalseTimeout"], ["spec", "maxNodeProvisionTime"], ["spec", "version"], ["spec", "osImage"], ["spec", "talos"], ["spec", "talos", "version"], ["spec", "talos", "schematicID"], ["spec", "talos", "imageFactoryURL"], ["spec", "talos", "installerRepository"], ["spec", "talos", "registryMirrors"], ["spec", "talos", "imageFactoryCA"], ["spec", "substrate"], ["spec", "proxmox"], ["spec", "proxmox", "templateTags"], ["spec", "proxmox", "full"], ["spec", "proxmox", "network"], ["spec", "proxmox", "network", "bridge"], ["spec", "proxmox", "storage"], ["spec", "proxmox", "pool"], ["spec", "proxmox", "dnsServers"], ["spec", "images"], ["spec", "images", "kubectl"]]
+  secrets:
+    exclude: []
+    include: []
+  services:
+    exclude: []
+    include: []
diff --git a/packages/system/kubernetes-nodes-rd/templates/cozyrd.yaml b/packages/system/kubernetes-nodes-rd/templates/cozyrd.yaml
new file mode 100644
index 0000000000..e079ddcf31
--- /dev/null
+++ b/packages/system/kubernetes-nodes-rd/templates/cozyrd.yaml
@@ -0,0 +1,4 @@
+{{- range $path, $_ := .Files.Glob "cozyrds/*" }}
+---
+{{ $.Files.Get $path }}
+{{- end }}
diff --git a/packages/system/kubernetes-nodes-rd/values.yaml b/packages/system/kubernetes-nodes-rd/values.yaml
new file mode 100644
index 0000000000..0967ef424b
--- /dev/null
+++ b/packages/system/kubernetes-nodes-rd/values.yaml
@@ -0,0 +1 @@
+{}
diff --git a/packages/system/kubernetes-rd/cozyrds/kubernetes.yaml b/packages/system/kubernetes-rd/cozyrds/kubernetes.yaml
index c19f49931d..47cd7345d2 100644
--- a/packages/system/kubernetes-rd/cozyrds/kubernetes.yaml
+++ b/packages/system/kubernetes-rd/cozyrds/kubernetes.yaml
@@ -15,14 +15,24 @@ metadata:
     # deadline chosen to stay strictly below this value so the pod's
     # CrashLoopBackOff surfaces before flux remediation fires. If this
     # annotation is raised, update that init deadline correspondingly.
-    release.cozystack.io/helm-install-timeout: "15m"
+    release.cozystack.io/helm-install-timeout: "20m"
+    # The kubernetes chart emits in-tenant addon HelmReleases (cilium, coredns,
+    # csi, ingress-nginx, metrics-server, ouroboros) and a main-phase
+    # talos-reconcile Job that produces the TalosConfigTemplate the worker
+    # MachineSets clone from. Without DisableWait the helm-controller waits for
+    # the addon HelmReleases to be Ready before the release settles, but those
+    # cannot be Ready until worker nodes exist, and the workers cannot be
+    # created without the TalosConfigTemplate the Job produces. Skip the
+    # readiness wait so the release settles and the chicken-and-egg resolves;
+    # the talos-reconcile Job runs to completion asynchronously.
+    release.cozystack.io/helm-install-disable-wait: "true"
 spec:
   application:
     kind: Kubernetes
     singular: kubernetes
     plural: kuberneteses
     openAPISchema: |-
-      {"title":"Chart Values","type":"object","properties":{"storageClass":{"description":"StorageClass used to store the data.","type":"string","default":"replicated","x-kubernetes-validations":[{"rule":"self == oldSelf","message":"storageClass is immutable"}]},"nodeGroups":{"description":"Worker nodes configuration map.","type":"object","default":{"md0":{"diskSize":"20Gi","gpus":[],"instanceType":"u1.medium","kubelet":{},"maxReplicas":10,"minReplicas":0,"resources":{},"roles":["ingress-nginx"],"storageClass":""}},"additionalProperties":{"type":"object","required":["diskSize","instanceType","maxReplicas","minReplicas","resources"],"properties":{"diskSize":{"description":"Persistent disk size for kubelet and containerd data.","default":"20Gi","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"gpus":{"description":"List of GPUs to attach (NVIDIA driver requires at least 4 GiB RAM).","type":"array","items":{"type":"object","required":["name"],"properties":{"name":{"description":"Name of GPU, such as \"nvidia.com/AD102GL_L40S\".","type":"string"}}}},"instanceType":{"description":"Virtual machine instance type.","type":"string","default":"u1.medium"},"kubelet":{"description":"Kubelet resource reservations for this node group.","type":"object","properties":{"evictionHardMemory":{"description":"Hard eviction threshold for memory (absolute like 200Mi or percentage like 7%).","type":"string","default":"7%"},"evictionSoftMemory":{"description":"Soft eviction threshold for memory (absolute like 1Gi or percentage like 10%).","type":"string","default":"10%"},"kubeReservedCpu":{"description":"CPU reserved for kubelet and container runtime. Auto-computed from instanceType if empty.","type":"string"},"kubeReservedMemory":{"description":"Memory reserved for kubelet and container runtime. Auto-computed from instanceType if empty.","type":"string"},"systemReservedCpu":{"description":"CPU reserved for host OS. Auto-computed from instanceType if empty.","type":"string"},"systemReservedMemory":{"description":"Memory reserved for host OS. Auto-computed from instanceType if empty.","type":"string"}}},"maxReplicas":{"description":"Maximum number of replicas.","type":"integer","default":10},"minReplicas":{"description":"Minimum number of replicas.","type":"integer","default":0},"resources":{"description":"CPU and memory resources for each worker node.","type":"object","properties":{"cpu":{"description":"CPU available.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Memory (RAM) available.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}},"roles":{"description":"List of node roles.","type":"array","items":{"type":"string"}},"storageClass":{"description":"StorageClass for worker node persistent disks. When empty, uses the management cluster default StorageClass (the one annotated storageclass.kubernetes.io/is-default-class: true). NOTE: deliberately not marked immutable — the field is optional and undefaulted, so a strict `self == oldSelf` rule would block any future attempt to set it on an existing node group.","type":"string"}}}},"version":{"description":"Kubernetes major.minor version to deploy","type":"string","default":"v1.35","enum":["v1.35","v1.34","v1.33","v1.32","v1.31","v1.30"]},"host":{"description":"External hostname for Kubernetes cluster. Defaults to `<cluster-name>.<tenant-host>` if empty.","type":"string","default":""},"addons":{"description":"Cluster addons configuration.","type":"object","default":{},"required":["certManager","cilium","coredns","fluxcd","gatewayAPI","gpuOperator","hami","ingressNginx","monitoringAgents","ouroboros","velero","verticalPodAutoscaler"],"properties":{"certManager":{"description":"Cert-manager addon.","type":"object","default":{},"required":["enabled","valuesOverride"],"properties":{"enabled":{"description":"Enable cert-manager.","type":"boolean","default":false},"valuesOverride":{"description":"Custom Helm values overrides.","type":"object","default":{},"x-kubernetes-preserve-unknown-fields":true}}},"cilium":{"description":"Cilium CNI plugin.","type":"object","default":{},"required":["valuesOverride"],"properties":{"valuesOverride":{"description":"Custom Helm values overrides.","type":"object","default":{},"x-kubernetes-preserve-unknown-fields":true}}},"coredns":{"description":"CoreDNS addon.","type":"object","default":{},"required":["valuesOverride"],"properties":{"valuesOverride":{"description":"Custom Helm values overrides.","type":"object","default":{},"x-kubernetes-preserve-unknown-fields":true}}},"fluxcd":{"description":"FluxCD GitOps operator.","type":"object","default":{},"required":["enabled","valuesOverride"],"properties":{"enabled":{"description":"Enable FluxCD.","type":"boolean","default":false},"valuesOverride":{"description":"Custom Helm values overrides.","type":"object","default":{},"x-kubernetes-preserve-unknown-fields":true}}},"gatewayAPI":{"description":"Gateway API addon.","type":"object","default":{},"required":["enabled"],"properties":{"enabled":{"description":"Enable Gateway API.","type":"boolean","default":false}}},"gpuOperator":{"description":"NVIDIA GPU Operator.","type":"object","default":{},"required":["enabled","valuesOverride"],"properties":{"enabled":{"description":"Enable GPU Operator.","type":"boolean","default":false},"valuesOverride":{"description":"Custom Helm values overrides.","type":"object","default":{},"x-kubernetes-preserve-unknown-fields":true}}},"hami":{"description":"HAMi GPU virtualization middleware.","type":"object","default":{},"required":["enabled","valuesOverride"],"properties":{"enabled":{"description":"Enable HAMi (requires GPU Operator).","type":"boolean","default":false},"valuesOverride":{"description":"Custom Helm values overrides.","type":"object","default":{},"x-kubernetes-preserve-unknown-fields":true}}},"ingressNginx":{"description":"Ingress-NGINX controller.","type":"object","default":{},"required":["enabled","exposeMethod","valuesOverride"],"properties":{"enabled":{"description":"Enable the controller (requires nodes labeled `ingress-nginx`).","type":"boolean","default":false},"exposeMethod":{"description":"Method to expose the controller. Allowed values: `Proxied`, `LoadBalancer`.","type":"string","default":"Proxied","enum":["Proxied","LoadBalancer"]},"hosts":{"description":"Domains routed to this tenant cluster when `exposeMethod` is `Proxied`.","type":"array","default":[],"items":{"type":"string"}},"valuesOverride":{"description":"Custom Helm values overrides.","type":"object","default":{},"x-kubernetes-preserve-unknown-fields":true}}},"monitoringAgents":{"description":"Monitoring agents.","type":"object","default":{},"required":["enabled","valuesOverride"],"properties":{"enabled":{"description":"Enable monitoring agents.","type":"boolean","default":false},"valuesOverride":{"description":"Custom Helm values overrides.","type":"object","default":{},"x-kubernetes-preserve-unknown-fields":true}}},"ouroboros":{"description":"Hairpin-NAT fix for ingress-nginx with PROXY-protocol.","type":"object","default":{},"required":["enabled","valuesOverride"],"properties":{"enabled":{"description":"Enable ouroboros. Requires addons.ingressNginx.enabled (chart-render fail otherwise). Only useful when PROXY-protocol is wired on the tenant ingress-nginx via valuesOverride.","type":"boolean","default":false},"valuesOverride":{"description":"Custom Helm values overrides. Operator-key wins over cozystack defaults.","type":"object","default":{},"x-kubernetes-preserve-unknown-fields":true}}},"velero":{"description":"Velero backup/restore addon.","type":"object","default":{},"required":["enabled","valuesOverride"],"properties":{"enabled":{"description":"Enable Velero.","type":"boolean","default":false},"valuesOverride":{"description":"Custom Helm values overrides.","type":"object","default":{},"x-kubernetes-preserve-unknown-fields":true}}},"verticalPodAutoscaler":{"description":"Vertical Pod Autoscaler.","type":"object","default":{},"required":["valuesOverride"],"properties":{"valuesOverride":{"description":"Custom Helm values overrides.","type":"object","default":{},"x-kubernetes-preserve-unknown-fields":true}}}}},"controlPlane":{"description":"Kubernetes control-plane configuration.","type":"object","default":{},"required":["apiServer","controllerManager","konnectivity","replicas","scheduler"],"properties":{"apiServer":{"description":"API Server configuration.","type":"object","default":{},"required":["resources","resourcesPreset"],"properties":{"resources":{"description":"CPU and memory resources for API Server.","type":"object","default":{},"properties":{"cpu":{"description":"CPU available.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Memory (RAM) available.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}},"resourcesPreset":{"description":"Preset if `resources` omitted.","type":"string","default":"c1.medium","enum":["t1.nano","t1.micro","t1.small","t1.medium","t1.large","t1.xlarge","t1.2xlarge","t1.4xlarge","c1.nano","c1.micro","c1.small","c1.medium","c1.large","c1.xlarge","c1.2xlarge","c1.4xlarge","s1.nano","s1.micro","s1.small","s1.medium","s1.large","s1.xlarge","s1.2xlarge","s1.4xlarge","u1.nano","u1.micro","u1.small","u1.medium","u1.large","u1.xlarge","u1.2xlarge","u1.4xlarge","m1.nano","m1.micro","m1.small","m1.medium","m1.large","m1.xlarge","m1.2xlarge","m1.4xlarge","nano","micro","small","medium","large","xlarge","2xlarge"]}}},"controllerManager":{"description":"Controller Manager configuration.","type":"object","default":{},"required":["resources","resourcesPreset"],"properties":{"resources":{"description":"CPU and memory resources for Controller Manager.","type":"object","default":{},"properties":{"cpu":{"description":"CPU available.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Memory (RAM) available.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}},"resourcesPreset":{"description":"Preset if `resources` omitted.","type":"string","default":"t1.micro","enum":["t1.nano","t1.micro","t1.small","t1.medium","t1.large","t1.xlarge","t1.2xlarge","t1.4xlarge","c1.nano","c1.micro","c1.small","c1.medium","c1.large","c1.xlarge","c1.2xlarge","c1.4xlarge","s1.nano","s1.micro","s1.small","s1.medium","s1.large","s1.xlarge","s1.2xlarge","s1.4xlarge","u1.nano","u1.micro","u1.small","u1.medium","u1.large","u1.xlarge","u1.2xlarge","u1.4xlarge","m1.nano","m1.micro","m1.small","m1.medium","m1.large","m1.xlarge","m1.2xlarge","m1.4xlarge","nano","micro","small","medium","large","xlarge","2xlarge"]}}},"konnectivity":{"description":"Konnectivity configuration.","type":"object","default":{},"required":["server"],"properties":{"server":{"description":"Konnectivity Server configuration.","type":"object","default":{},"required":["resources","resourcesPreset"],"properties":{"resources":{"description":"CPU and memory resources for Konnectivity.","type":"object","default":{},"properties":{"cpu":{"description":"CPU available.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Memory (RAM) available.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}},"resourcesPreset":{"description":"Preset if `resources` omitted.","type":"string","default":"t1.micro","enum":["t1.nano","t1.micro","t1.small","t1.medium","t1.large","t1.xlarge","t1.2xlarge","t1.4xlarge","c1.nano","c1.micro","c1.small","c1.medium","c1.large","c1.xlarge","c1.2xlarge","c1.4xlarge","s1.nano","s1.micro","s1.small","s1.medium","s1.large","s1.xlarge","s1.2xlarge","s1.4xlarge","u1.nano","u1.micro","u1.small","u1.medium","u1.large","u1.xlarge","u1.2xlarge","u1.4xlarge","m1.nano","m1.micro","m1.small","m1.medium","m1.large","m1.xlarge","m1.2xlarge","m1.4xlarge","nano","micro","small","medium","large","xlarge","2xlarge"]}}}}},"replicas":{"description":"Number of control-plane replicas.","type":"integer","default":2},"scheduler":{"description":"Scheduler configuration.","type":"object","default":{},"required":["resources","resourcesPreset"],"properties":{"resources":{"description":"CPU and memory resources for Scheduler.","type":"object","default":{},"properties":{"cpu":{"description":"CPU available.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Memory (RAM) available.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}},"resourcesPreset":{"description":"Preset if `resources` omitted.","type":"string","default":"t1.micro","enum":["t1.nano","t1.micro","t1.small","t1.medium","t1.large","t1.xlarge","t1.2xlarge","t1.4xlarge","c1.nano","c1.micro","c1.small","c1.medium","c1.large","c1.xlarge","c1.2xlarge","c1.4xlarge","s1.nano","s1.micro","s1.small","s1.medium","s1.large","s1.xlarge","s1.2xlarge","s1.4xlarge","u1.nano","u1.micro","u1.small","u1.medium","u1.large","u1.xlarge","u1.2xlarge","u1.4xlarge","m1.nano","m1.micro","m1.small","m1.medium","m1.large","m1.xlarge","m1.2xlarge","m1.4xlarge","nano","micro","small","medium","large","xlarge","2xlarge"]}}}}},"images":{"description":"Optional image overrides for air-gapped or rate-limited registries.","type":"object","default":{},"properties":{"waitForKubeconfig":{"description":"Image used by the wait-for-kubeconfig init container. Empty falls back to images/busybox.tag.","type":"string","default":""}}}}}
+      {"title":"Chart Values","type":"object","x-cozystack-name":{"type":"string","description":"Cluster name. Every worker pool is a separate KubernetesNodes release named `kubernetes-nodes-<name>-<pool>`, so the name must leave room for the default `md0` pool inside the 53-character Helm release name limit.","maxLength":32},"properties":{"storageClass":{"description":"Default StorageClass inside the tenant cluster. Remote-accessible LINSTOR classes are auto-propagated to the tenant under the same name.","type":"string","default":"replicated","x-kubernetes-validations":[{"rule":"self == oldSelf","message":"storageClass is immutable"}],"x-cozystack-options":{"source":"storageclass"}},"version":{"description":"Kubernetes major.minor version to deploy","type":"string","default":"v1.35","enum":["v1.35","v1.34","v1.33","v1.32","v1.31"]},"host":{"description":"External hostname for Kubernetes cluster. Defaults to `<cluster-name>.<tenant-host>` if empty.","type":"string","default":""},"substrate":{"description":"Which infrastructure provider backs this cluster's worker VMs. `kubevirt` runs them inside this cluster; `proxmox` runs them on an external Proxmox VE cluster through capmox. The control plane is Kamaji either way — this selects the infrastructure half only. Must match the `substrate` of every KubernetesNodes pool attached to this cluster: the pools reference this cluster's infrastructure object by kind, and a mismatch leaves their Machines unreconciled. Switching an existing cluster is not supported; create a new one.","type":"string","default":"kubevirt","x-kubernetes-validations":[{"rule":"self == oldSelf","message":"substrate is immutable"}]},"proxmox":{"description":"Proxmox substrate settings.","type":"object","default":{},"required":["ipv4Config"],"properties":{"allowedNodes":{"description":"Proxmox nodes capmox may place VMs on. Empty means every node in the Proxmox cluster.","type":"array","default":[],"items":{"type":"string"}},"ccm":{"description":"Proxmox cloud-controller-manager settings.","type":"object","default":{},"required":["credentialsSecretName"],"properties":{"credentialsSecretName":{"description":"Secret in THIS namespace holding the controller's Proxmox API credentials under the keys `url`, `token_id`, `token_secret` and `region`. May name the same Secret as `csi.credentialsSecretName`; it is a separate knob so the two can hold separate tokens, since this one only reads VM inventory while the driver attaches and detaches disks.","type":"string","default":""}}},"csi":{"description":"Proxmox CSI driver settings.","type":"object","default":{},"required":["credentialsSecretName","enabled"],"properties":{"credentialsSecretName":{"description":"Secret in THIS namespace holding the driver's Proxmox API credentials under the keys `url`, `token_id`, `token_secret` and `region`. The parent chart composes them into the controller's config file here, in the management cluster; nothing reaches the tenant, and no token is written into a rendered manifest. Distinct from the capmox credentials on purpose: the driver attaches and detaches disks, which is a different blast radius from creating VMs.","type":"string","default":""},"enabled":{"description":"Install the driver. Without it a Proxmox-backed tenant has no way to provision PersistentVolumes at all.","type":"boolean","default":true},"storageClasses":{"description":"StorageClasses to create in the tenant.","type":"array","default":[],"items":{"type":"object","required":["name","storage"],"properties":{"fstype":{"description":"Filesystem the driver formats volumes with: ext4 or xfs.","type":"string"},"name":{"description":"StorageClass name inside the tenant cluster.","type":"string"},"reclaimPolicy":{"description":"Delete or Retain.","type":"string"},"ssd":{"description":"Mark volumes as SSD-backed, which changes the discard/cache defaults Proxmox applies.","type":"boolean"},"storage":{"description":"Proxmox storage id the volumes are created on (as it appears in `pvesm status`).","type":"string"}}}}}},"dnsServers":{"description":"Nameservers written into each worker's network config. Required by the ProxmoxCluster schema.","type":"array","default":[],"items":{"type":"string"}},"insecure":{"description":"Skip verification of the Proxmox API server certificate in the CCM and the CSI controller, both of which run in the management cluster. Default false: the certificate is verified unless an operator turns that off. A stock Proxmox VE install serves a self-signed one, so set true for it, or install a certificate the management cluster trusts.","type":"boolean","default":false},"ipv4Config":{"description":"Address pool for workers. capmox assigns static addresses and has no DHCP mode, so this is required rather than optional.","type":"object","default":{},"required":["gateway","prefix"],"properties":{"addresses":{"description":"Ranges or CIDRs, e.g. `[\"10.0.0.120-10.0.0.170\"]`. capmox turns these into an InClusterIPPool, so they must not overlap any DHCP range on the same L2 or two workers will answer to one address.","type":"array","default":[],"items":{"type":"string"}},"gateway":{"description":"Default gateway for the workers.","type":"string","default":""},"prefix":{"description":"Netmask prefix length.","type":"integer","default":24}}}}},"addons":{"description":"Cluster addons configuration.","type":"object","default":{},"required":["certManager","cilium","coredns","gatewayAPI","gpuOperator","hami","ingressNginx","monitoringAgents","ouroboros","velero","verticalPodAutoscaler"],"properties":{"certManager":{"description":"Cert-manager addon.","type":"object","default":{},"required":["enabled","valuesOverride"],"properties":{"enabled":{"description":"Enable cert-manager.","type":"boolean","default":false},"valuesOverride":{"description":"Custom Helm values overrides.","type":"object","default":{},"x-kubernetes-preserve-unknown-fields":true}}},"cilium":{"description":"Cilium CNI plugin. Always installed as the tenant cluster's CNI; this section only overrides its Helm values.","type":"object","default":{},"required":["valuesOverride"],"properties":{"valuesOverride":{"description":"Custom Helm values overrides.","type":"object","default":{},"x-kubernetes-preserve-unknown-fields":true}},"x-cozystack-no-enable-switch":true},"coredns":{"description":"CoreDNS addon. Always installed as the tenant cluster's DNS; this section only overrides its Helm values.","type":"object","default":{},"required":["valuesOverride"],"properties":{"valuesOverride":{"description":"Custom Helm values overrides.","type":"object","default":{},"x-kubernetes-preserve-unknown-fields":true}},"x-cozystack-no-enable-switch":true},"gatewayAPI":{"description":"Gateway API addon.","type":"object","default":{},"required":["enabled"],"properties":{"enabled":{"description":"Enable Gateway API.","type":"boolean","default":false}}},"gpuOperator":{"description":"NVIDIA GPU Operator.","type":"object","default":{},"required":["enabled","valuesOverride"],"properties":{"enabled":{"description":"Enable GPU Operator.","type":"boolean","default":false},"valuesOverride":{"description":"Custom Helm values overrides.","type":"object","default":{},"x-kubernetes-preserve-unknown-fields":true}}},"hami":{"description":"HAMi GPU virtualization middleware.","type":"object","default":{},"required":["enabled","valuesOverride"],"properties":{"enabled":{"description":"Enable HAMi (requires GPU Operator).","type":"boolean","default":false},"valuesOverride":{"description":"Custom Helm values overrides.","type":"object","default":{},"x-kubernetes-preserve-unknown-fields":true}}},"ingressNginx":{"description":"Ingress-NGINX controller.","type":"object","default":{},"required":["enabled","exposeMethod","valuesOverride"],"properties":{"enabled":{"description":"Enable the controller (requires nodes labeled `ingress-nginx`).","type":"boolean","default":false},"exposeMethod":{"description":"Method to expose the controller. Allowed values: `Proxied`, `LoadBalancer`.","type":"string","default":"Proxied","enum":["Proxied","LoadBalancer"]},"hosts":{"description":"Domains routed to this tenant cluster when `exposeMethod` is `Proxied`.","type":"array","default":[],"items":{"type":"string"}},"valuesOverride":{"description":"Custom Helm values overrides.","type":"object","default":{},"x-kubernetes-preserve-unknown-fields":true}}},"monitoringAgents":{"description":"Monitoring agents.","type":"object","default":{},"required":["enabled","valuesOverride"],"properties":{"enabled":{"description":"Enable monitoring agents.","type":"boolean","default":false},"valuesOverride":{"description":"Custom Helm values overrides.","type":"object","default":{},"x-kubernetes-preserve-unknown-fields":true}}},"ouroboros":{"description":"Hairpin-NAT fix for ingress-nginx with PROXY-protocol.","type":"object","default":{},"required":["enabled","valuesOverride"],"properties":{"enabled":{"description":"Enable ouroboros. Requires addons.ingressNginx.enabled (chart-render fail otherwise). Only useful when PROXY-protocol is wired on the tenant ingress-nginx via valuesOverride.","type":"boolean","default":false},"valuesOverride":{"description":"Custom Helm values overrides. Operator-key wins over cozystack defaults.","type":"object","default":{},"x-kubernetes-preserve-unknown-fields":true}}},"velero":{"description":"Velero backup/restore addon.","type":"object","default":{},"required":["enabled","valuesOverride"],"properties":{"enabled":{"description":"Enable Velero.","type":"boolean","default":false},"valuesOverride":{"description":"Custom Helm values overrides.","type":"object","default":{},"x-kubernetes-preserve-unknown-fields":true}}},"verticalPodAutoscaler":{"description":"Vertical Pod Autoscaler. Installed and removed together with addons.monitoringAgents.enabled; this section only overrides its Helm values.","type":"object","default":{},"required":["valuesOverride"],"properties":{"valuesOverride":{"description":"Custom Helm values overrides.","type":"object","default":{},"x-kubernetes-preserve-unknown-fields":true}},"x-cozystack-no-enable-switch":true}}},"controlPlane":{"description":"Kubernetes control-plane configuration.","type":"object","default":{},"required":["apiServer","controllerManager","konnectivity","replicas","scheduler"],"properties":{"apiServer":{"description":"API Server configuration.","type":"object","default":{},"required":["resources","resourcesPreset"],"properties":{"admissionControllers":{"description":"Admission plugins the tenant kube-apiserver enables, passed through to KamajiControlPlane `spec.admissionControllers`, which the control plane renders as `--enable-admission-plugins`. A non-empty list replaces the control plane's default set instead of adding to it. The kube-apiserver enables these plugins in addition to its own default ones, so leaving a plugin out does not turn it off; to turn one off, name it in `--disable-admission-plugins` in `controlPlane.apiServer.extraArgs` and keep it out of this list, since the apiserver refuses to start with a plugin in both, and the control plane's default set names several. Empty by default, which keeps that default set, taken from the TenantControlPlane CRD: CertificateApproval, CertificateSigning, CertificateSubjectRestriction, DefaultIngressClass, DefaultStorageClass, DefaultTolerationSeconds, LimitRanger, MutatingAdmissionWebhook, NamespaceLifecycle, PersistentVolumeClaimResize, Priority, ResourceQuota, RuntimeClass, ServiceAccount, StorageObjectInUseProtection, TaintNodesByCondition, ValidatingAdmissionWebhook. `NodeRestriction` is not in it.","type":"array","default":[],"items":{"type":"string","enum":["AlwaysAdmit","AlwaysDeny","AlwaysPullImages","CertificateApproval","CertificateSigning","CertificateSubjectRestriction","DefaultIngressClass","DefaultStorageClass","DefaultTolerationSeconds","DenyEscalatingExec","DenyExecOnPrivileged","DenyServiceExternalIPs","EventRateLimit","ExtendedResourceToleration","ImagePolicyWebhook","LimitPodHardAntiAffinityTopology","LimitRanger","MutatingAdmissionWebhook","NamespaceAutoProvision","NamespaceExists","NamespaceLifecycle","NodeRestriction","OwnerReferencesPermissionEnforcement","PersistentVolumeClaimResize","PersistentVolumeLabel","PodNodeSelector","PodSecurity","PodSecurityPolicy","PodTolerationRestriction","Priority","ResourceQuota","RuntimeClass","SecurityContextDeny","ServiceAccount","StorageObjectInUseProtection","TaintNodesByCondition","ValidatingAdmissionWebhook"]}},"extraArgs":{"description":"Extra command-line flags appended to the tenant kube-apiserver, passed through to KamajiControlPlane `spec.apiServer.extraArgs`. For OIDC use `spec.oidc.mode` — this passthrough is the escape hatch for unrelated apiserver flags. The tenant control plane sets each of the following flags itself and drops an entry naming one before the apiserver sees it. The chart moves an `--enable-admission-plugins=` entry into `controlPlane.apiServer.admissionControllers` and a `--kubelet-preferred-address-types=` entry into `controlPlane.kubelet.preferredAddressTypes` while that field is empty, and refuses any other entry naming one of them: `--advertise-address`, `--client-ca-file`, `--enable-admission-plugins`, `--service-cluster-ip-range`, `--kubelet-client-certificate`, `--kubelet-client-key`, `--kubelet-preferred-address-types`, `--proxy-client-cert-file`, `--proxy-client-key-file`, `--requestheader-allowed-names`, `--requestheader-client-ca-file`, `--secure-port`, `--service-account-key-file`, `--service-account-signing-key-file`, `--tls-cert-file`, `--tls-private-key-file`, `--etcd-servers`, `--etcd-cafile`, `--etcd-certfile`, `--etcd-keyfile`, `--etcd-prefix`, `--etcd-compaction-interval`, `--egress-selector-config-file`. When `spec.oidc.mode` is not `None` the chart also renders OIDC flags here, reads what you have written on them, and refuses some combinations outright; `docs/oidc-tenant.md` carries which flags, which combinations, and why. Do NOT add legacy `--oidc-*` flags here when `spec.oidc.mode` is not `None`; the chart injects `--authentication-config` and the apiserver refuses to boot with both. Empty by default (no change to current behavior).","type":"array","default":[],"items":{"type":"string"}},"extraVolumeMounts":{"description":"Extra volume mounts added to the tenant kube-apiserver container, passed through to KamajiControlPlane `spec.apiServer.extraVolumeMounts`. Each `name` must reference a volume declared in `extraVolumes`; the chart-managed talos secret volumes cannot be mounted. Each item is a core/v1 VolumeMount. Empty by default.","type":"array","default":[],"items":{"type":"object","x-kubernetes-preserve-unknown-fields":true}},"extraVolumes":{"description":"Extra volumes added to the control-plane Deployment, passed through to KamajiControlPlane `spec.deployment.extraVolumes`. Use to mount a ConfigMap or Secret holding an AuthenticationConfiguration file referenced by `extraArgs`. Each item is a core/v1 Volume, but because the control-plane pod runs on the management cluster only `configMap` and `secret` sources are allowed (host-reaching sources like `hostPath`/`csi` and token-projection via `projected` are rejected); each volume must have a unique, non-empty name and exactly one source. The names `talos-ca` and `talos-tls-cert` are reserved by the chart. Empty by default.","type":"array","default":[],"items":{"type":"object","x-kubernetes-preserve-unknown-fields":true}},"resources":{"description":"CPU and memory resources for API Server.","type":"object","default":{},"properties":{"cpu":{"description":"CPU available.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Memory (RAM) available.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}},"resourcesPreset":{"description":"Preset if `resources` omitted.","type":"string","default":"c1.medium","enum":["t1.nano","t1.micro","t1.small","t1.medium","t1.large","t1.xlarge","t1.2xlarge","t1.4xlarge","c1.nano","c1.micro","c1.small","c1.medium","c1.large","c1.xlarge","c1.2xlarge","c1.4xlarge","s1.nano","s1.micro","s1.small","s1.medium","s1.large","s1.xlarge","s1.2xlarge","s1.4xlarge","u1.nano","u1.micro","u1.small","u1.medium","u1.large","u1.xlarge","u1.2xlarge","u1.4xlarge","m1.nano","m1.micro","m1.small","m1.medium","m1.large","m1.xlarge","m1.2xlarge","m1.4xlarge","nano","micro","small","medium","large","xlarge","2xlarge"]}}},"controllerManager":{"description":"Controller Manager configuration.","type":"object","default":{},"required":["resources","resourcesPreset"],"properties":{"resources":{"description":"CPU and memory resources for Controller Manager.","type":"object","default":{},"properties":{"cpu":{"description":"CPU available.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Memory (RAM) available.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}},"resourcesPreset":{"description":"Preset if `resources` omitted.","type":"string","default":"t1.micro","enum":["t1.nano","t1.micro","t1.small","t1.medium","t1.large","t1.xlarge","t1.2xlarge","t1.4xlarge","c1.nano","c1.micro","c1.small","c1.medium","c1.large","c1.xlarge","c1.2xlarge","c1.4xlarge","s1.nano","s1.micro","s1.small","s1.medium","s1.large","s1.xlarge","s1.2xlarge","s1.4xlarge","u1.nano","u1.micro","u1.small","u1.medium","u1.large","u1.xlarge","u1.2xlarge","u1.4xlarge","m1.nano","m1.micro","m1.small","m1.medium","m1.large","m1.xlarge","m1.2xlarge","m1.4xlarge","nano","micro","small","medium","large","xlarge","2xlarge"]}}},"konnectivity":{"description":"Konnectivity configuration.","type":"object","default":{},"required":["server"],"properties":{"server":{"description":"Konnectivity Server configuration.","type":"object","default":{},"required":["resources","resourcesPreset"],"properties":{"resources":{"description":"CPU and memory resources for Konnectivity.","type":"object","default":{},"properties":{"cpu":{"description":"CPU available.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Memory (RAM) available.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}},"resourcesPreset":{"description":"Preset if `resources` omitted.","type":"string","default":"t1.micro","enum":["t1.nano","t1.micro","t1.small","t1.medium","t1.large","t1.xlarge","t1.2xlarge","t1.4xlarge","c1.nano","c1.micro","c1.small","c1.medium","c1.large","c1.xlarge","c1.2xlarge","c1.4xlarge","s1.nano","s1.micro","s1.small","s1.medium","s1.large","s1.xlarge","s1.2xlarge","s1.4xlarge","u1.nano","u1.micro","u1.small","u1.medium","u1.large","u1.xlarge","u1.2xlarge","u1.4xlarge","m1.nano","m1.micro","m1.small","m1.medium","m1.large","m1.xlarge","m1.2xlarge","m1.4xlarge","nano","micro","small","medium","large","xlarge","2xlarge"]}}}}},"kubelet":{"description":"Kubelet connection settings.","type":"object","default":{},"properties":{"preferredAddressTypes":{"description":"Node address types the tenant kube-apiserver tries, in order, when it connects to a kubelet, passed through to KamajiControlPlane `spec.kubelet.preferredAddressTypes`, which the control plane renders as `--kubelet-preferred-address-types`. The KamajiControlPlane CRD rejects a repeated name. Empty by default, which renders `InternalIP`, `ExternalIP`, or the list of a `--kubelet-preferred-address-types=` entry in `controlPlane.apiServer.extraArgs` when there is one.","type":"array","default":[],"items":{"type":"string","enum":["Hostname","InternalIP","ExternalIP","InternalDNS","ExternalDNS"]}}}},"replicas":{"description":"Number of control-plane replicas.","type":"integer","default":2},"scheduler":{"description":"Scheduler configuration.","type":"object","default":{},"required":["resources","resourcesPreset"],"properties":{"resources":{"description":"CPU and memory resources for Scheduler.","type":"object","default":{},"properties":{"cpu":{"description":"CPU available.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Memory (RAM) available.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}},"resourcesPreset":{"description":"Preset if `resources` omitted.","type":"string","default":"t1.micro","enum":["t1.nano","t1.micro","t1.small","t1.medium","t1.large","t1.xlarge","t1.2xlarge","t1.4xlarge","c1.nano","c1.micro","c1.small","c1.medium","c1.large","c1.xlarge","c1.2xlarge","c1.4xlarge","s1.nano","s1.micro","s1.small","s1.medium","s1.large","s1.xlarge","s1.2xlarge","s1.4xlarge","u1.nano","u1.micro","u1.small","u1.medium","u1.large","u1.xlarge","u1.2xlarge","u1.4xlarge","m1.nano","m1.micro","m1.small","m1.medium","m1.large","m1.xlarge","m1.2xlarge","m1.4xlarge","nano","micro","small","medium","large","xlarge","2xlarge"]}}}}},"images":{"description":"Optional image overrides for air-gapped or rate-limited registries.","type":"object","default":{},"properties":{"kubectl":{"description":"Image used by the bootstrap-token tenant Job (kubectl). Empty falls back to images/kubectl.tag.","type":"string","default":""},"talosCsrSigner":{"description":"Image used by the talos-csr-signer sidecar in the Kamaji control plane. Empty falls back to images/talos-csr-signer.tag.","type":"string","default":""},"waitForKubeconfig":{"description":"Image used by the wait-for-kubeconfig init container. Empty falls back to images/busybox.tag.","type":"string","default":""}}},"talos":{"description":"Talos worker image configuration.","type":"object","default":{},"required":["imageFactoryURL","installerRepository","registryMirrors","schematicID","version"],"properties":{"imageFactoryURL":{"description":"Base URL of the Talos Image Factory that serves the worker OS disk image (the `openstack-amd64.raw.xz` raw artifact streamed in by CDI over HTTP). Defaults to the public factory. Point at a self-hosted Image Factory, a caching mirror, or an internal HTTP file server for air-gapped, rate-limited, or flaky-egress environments. No trailing slash.","type":"string","default":"https://factory.talos.dev"},"installerRepository":{"description":"OCI repository prefix for the Talos installer image used by the in-guest `talos-reconcile` upgrade Job. Resolved as `<installerRepository>/<schematicID>:<version>`. Defaults to the public factory's installer path. Override for air-gapped or mirrored registries. No trailing slash.","type":"string","default":"factory.talos.dev/installer"},"registryMirrors":{"description":"Talos `machine.registries.mirrors` passthrough for worker nodes: a map of upstream registry host to `{ endpoints: [ ... ] }`. Empty by default, so workers pull container images (the Talos `kubelet` image included) directly from the upstream registry. Point a host such as `ghcr.io` at an in-cluster pull-through mirror for air-gapped, rate-limited, or flaky-egress environments so a worker's boot does not depend on live public egress. Talos still falls back to the upstream registry unless a host also sets `skipFallback: true`, so a mirror alone does not enforce air-gap.","type":"object","default":{},"x-kubernetes-preserve-unknown-fields":true},"schematicID":{"description":"Talos image-factory schematic ID. Defaults to the cozystack-tested vanilla schematic. Operators using custom schematics (system extensions, kernel args) override here.","type":"string","default":"ce4c980550dd2ab1b17bbf2b08801c7eb59418eafe8f279833297925d67c7515"},"version":{"description":"Talos release used for worker OS image and installer. Must satisfy the chart's Talos<->Kubernetes support matrix against the chosen `version`.","type":"string","default":"v1.13.6"}}},"oidc":{"description":"OIDC authentication and per-user RBAC for the tenant kube-apiserver. See docs/oidc-tenant.md for the operator guide.","type":"object","default":{},"required":["mode"],"properties":{"customConfig":{"description":"Tenant-supplied AuthenticationConfiguration; consumed only when `mode: CustomConfig`.","type":"object","default":{},"properties":{"config":{"description":"Inline AuthenticationConfiguration YAML (`apiserver.config.k8s.io/v1beta1`). The chart writes the value verbatim into a Secret mounted at `/etc/kubernetes/authentication-config/config.yaml` on the kube-apiserver. Mutually exclusive with `secretRef.name`.","type":"string","default":""},"secretRef":{"description":"Reference to an existing Secret in the tenant namespace carrying the `AuthenticationConfiguration`.","type":"object","default":{},"properties":{"name":{"description":"Name of an existing Secret in the tenant (release) namespace whose `config.yaml` key holds an `apiserver.config.k8s.io/v1beta1` `AuthenticationConfiguration`. Mutually exclusive with `customConfig.config`.","type":"string","default":""}}}}},"mode":{"description":"Identity mode. `None`: no OIDC, only the static admin kubeconfig works. `System`: trust the platform Keycloak realm (`cozy` by default) via a per-cluster public client with audience binding; zero-config default. `CustomConfig`: trust a tenant-supplied issuer directly (BYO); `cozy` is not in the path.","type":"string","default":"None","enum":["None","System","CustomConfig"]},"users":{"description":"Users granted access to the tenant cluster; each entry produces one ClusterRoleBinding inside the tenant cluster. Works for both `System` and `CustomConfig` modes.","type":"array","default":[],"items":{"type":"object","required":["email","role"],"properties":{"email":{"description":"Email address matched against the `email` claim from the issuer. Used verbatim as the `User:` subject in the ClusterRoleBinding inside the tenant cluster. The `email` claim is a built-in OIDC scope requested explicitly by the chart-generated `kubectl oidc-login` kubeconfig; every conformant OIDC provider (cozy realm included) emits it.","type":"string"},"role":{"description":"Role to bind: `admin` maps to `ClusterRole/cluster-admin`, `view` maps to `ClusterRole/view`.","type":"string","enum":["admin","view"]}}}}}}}}
   release:
     prefix: kubernetes-
     labels:
@@ -40,12 +50,13 @@ spec:
     tags:
       - compute
     icon: <svg width="144" height="144" viewBox="0 0 144 144" fill="none" xmlns="http://www.w3.org/2000/svg">
<rect width="144" height="144" rx="24" fill="url(#paint0_linear_681_2845)"/>
<path d="M71.9968 19C70.3039 19.0002 68.9312 20.5322 68.9314 22.4221C68.9314 22.4511 68.9373 22.4788 68.9379 22.5076C68.9354 22.7644 68.9231 23.0737 68.9314 23.2973C68.9717 24.3873 69.2082 25.2216 69.3506 26.2258C69.6084 28.3752 69.8245 30.1569 69.6912 31.813C69.5615 32.4375 69.1037 33.0086 68.6956 33.4056L68.6235 34.7086C66.7839 34.8617 64.9319 35.1421 63.0821 35.5641C55.1226 37.3798 48.2695 41.4991 43.052 47.0609C42.7134 46.8288 42.1211 46.4019 41.945 46.2712C41.3977 46.3454 40.8445 46.5151 40.1241 46.0935C38.7522 45.1657 37.5028 43.8851 35.991 42.3424C35.2982 41.6044 34.7966 40.9018 33.9735 40.1904C33.7866 40.0289 33.5014 39.8104 33.2923 39.6442C32.6489 39.1288 31.89 38.86 31.157 38.8348C30.2147 38.8024 29.3075 39.1725 28.7138 39.9206C27.6584 41.2506 27.9963 43.2833 29.4671 44.4614C29.482 44.4734 29.4979 44.4827 29.5129 44.4943C29.715 44.6589 29.9625 44.8698 30.1483 45.0076C31.0217 45.6555 31.8195 45.9872 32.6897 46.5015C34.5231 47.6391 36.043 48.5823 37.2486 49.7196C37.7194 50.2237 37.8016 51.1122 37.8643 51.4964L38.8468 52.3782C33.5872 60.3308 31.153 70.1539 32.5915 80.1627L31.3077 80.5378C30.9693 80.9768 30.4912 81.6676 29.9911 81.8738C28.4138 82.3729 26.6387 82.5562 24.4956 82.7819C23.4894 82.866 22.6213 82.8158 21.5546 83.0188C21.3198 83.0635 20.9927 83.1491 20.7358 83.2097C20.7269 83.2116 20.7186 83.2142 20.7096 83.2162C20.6956 83.2195 20.6772 83.2263 20.6638 83.2294C18.857 83.668 17.6963 85.3365 18.0699 86.9805C18.4437 88.6248 20.2086 89.6248 22.0262 89.2312C22.0393 89.2282 22.0584 89.2277 22.072 89.2246C22.0926 89.2199 22.1106 89.2099 22.131 89.2049C22.3844 89.149 22.7019 89.0868 22.9236 89.0272C23.9723 88.7451 24.7318 88.3306 25.6746 87.9677C27.7029 87.2368 29.3828 86.6262 31.0195 86.3883C31.703 86.3345 32.4232 86.812 32.7814 87.0134L34.1177 86.7831C37.1926 96.3613 43.6366 104.103 51.7963 108.961L51.2396 110.303C51.4403 110.824 51.6616 111.53 51.5121 112.045C50.9171 113.595 49.898 115.231 48.7374 117.055C48.1755 117.898 47.6004 118.552 47.0934 119.516C46.972 119.747 46.8175 120.102 46.7004 120.346C45.9125 122.039 46.4904 123.99 48.0038 124.722C49.5268 125.459 51.4171 124.682 52.2352 122.985C52.2364 122.982 52.2406 122.98 52.2417 122.978C52.2426 122.976 52.2409 122.973 52.2417 122.971C52.3582 122.731 52.5233 122.415 52.6216 122.188C53.056 121.189 53.2005 120.332 53.5059 119.365C54.317 117.318 54.7626 115.17 55.8791 113.832C56.1849 113.466 56.6833 113.325 57.2001 113.186L57.8944 111.922C65.008 114.665 72.9705 115.402 80.9245 113.587C82.7391 113.173 84.4908 112.637 86.1843 111.994C86.3794 112.342 86.742 113.011 86.8393 113.179C87.3644 113.351 87.9377 113.439 88.4047 114.133C89.2401 115.567 89.8114 117.263 90.5073 119.312C90.8128 120.279 90.9638 121.136 91.3981 122.136C91.4971 122.363 91.6614 122.684 91.778 122.925C92.5944 124.628 94.4907 125.407 96.0159 124.669C97.5292 123.937 98.1077 121.986 97.3194 120.293C97.2023 120.049 97.0412 119.695 96.9198 119.464C96.4127 118.499 95.8377 117.852 95.2758 117.009C94.1152 115.185 93.1526 113.67 92.5575 112.12C92.3087 111.32 92.5995 110.823 92.7933 110.303C92.6772 110.17 92.4288 109.414 92.2824 109.059C100.762 104.029 107.017 95.9985 109.955 86.7239C110.351 86.7865 111.041 86.9091 111.265 86.9542C111.726 86.6487 112.149 86.2501 112.981 86.3159C114.617 86.5537 116.297 87.1645 118.326 87.8953C119.268 88.2581 120.028 88.6793 121.077 88.9614C121.298 89.021 121.616 89.0766 121.869 89.1325C121.889 89.1375 121.908 89.1475 121.928 89.1522C121.942 89.1553 121.961 89.1558 121.974 89.1588C123.792 89.552 125.557 88.5526 125.93 86.9081C126.303 85.2641 125.143 83.5952 123.336 83.157C123.074 83.097 122.701 82.995 122.446 82.9465C121.379 82.7435 120.511 82.7935 119.505 82.7095C117.361 82.4839 115.586 82.3004 114.009 81.8014C113.366 81.5507 112.908 80.7819 112.686 80.4655L111.448 80.1035C112.09 75.438 111.917 70.5825 110.806 65.7243C109.685 60.8208 107.704 56.3361 105.062 52.3848C105.379 52.0948 105.979 51.5612 106.149 51.4043C106.199 50.8517 106.156 50.2722 106.725 49.6603C107.931 48.523 109.451 47.5799 111.284 46.4423C112.154 45.9279 112.959 45.5964 113.832 44.9484C114.03 44.8019 114.299 44.5699 114.507 44.4022C115.977 43.2237 116.316 41.1911 115.26 39.8614C114.204 38.5317 112.159 38.4065 110.688 39.585C110.479 39.7516 110.195 39.9688 110.007 40.1312C109.184 40.8426 108.676 41.5452 107.983 42.2832C106.471 43.8259 105.222 45.113 103.85 46.0409C103.255 46.3885 102.385 46.2682 101.99 46.2449L100.824 47.0806C94.1753 40.0763 85.1235 35.5982 75.3766 34.7283C75.3494 34.3179 75.3137 33.5761 75.3046 33.3529C74.9056 32.9693 74.4235 32.6418 74.3024 31.813C74.1691 30.1569 74.3917 28.3752 74.6496 26.2258C74.7919 25.2216 75.0284 24.3873 75.0688 23.2973C75.078 23.0495 75.0632 22.69 75.0622 22.4221C75.062 20.5322 73.6898 18.9998 71.9968 19ZM68.1585 42.8886L67.248 59.0447L67.1825 59.0776C67.1214 60.5229 65.9375 61.677 64.4839 61.677C63.8884 61.677 63.3388 61.4849 62.8922 61.1571L62.866 61.1703L49.6807 51.7794C53.7331 47.7759 58.9164 44.8172 64.89 43.4546C65.9812 43.2056 67.0719 43.0209 68.1585 42.8886ZM75.8417 42.8886C82.8159 43.7504 89.2657 46.9232 94.2081 51.786L81.108 61.1176L81.0621 61.0979C79.8994 61.9512 78.2611 61.7394 77.3548 60.5978C76.9835 60.1301 76.7887 59.5801 76.7653 59.0249L76.7522 59.0184L75.8417 42.8886ZM44.8991 57.814L56.9382 68.633L56.9251 68.6988C58.0117 69.6479 58.172 71.2949 57.2657 72.4368C56.8944 72.9045 56.3975 73.2182 55.8639 73.3647L55.8508 73.4173L40.4188 77.8923C39.6334 70.6765 41.3261 63.6621 44.8991 57.814ZM99.0094 57.8206C100.798 60.7336 102.153 63.9871 102.959 67.5143C103.756 70.9991 103.956 74.4778 103.627 77.8397L88.1166 73.3515L88.1035 73.2857C86.7145 72.9043 85.8609 71.4848 86.1843 70.0611C86.3168 69.4778 86.6249 68.9844 87.0423 68.6198L87.0358 68.5869L99.0094 57.8206ZM69.5274 69.4688H74.4596L77.5251 73.3186L76.4247 78.1226L71.9968 80.2614L67.5558 78.1161L66.4554 73.312L69.5274 69.4688ZM85.3393 82.6437C85.5489 82.6331 85.7576 82.652 85.9616 82.6898L85.9878 82.6569L101.95 85.3682C99.6142 91.9624 95.144 97.675 89.1711 101.498L82.9747 86.4606L82.9944 86.4343C82.4252 85.1055 82.9948 83.5472 84.3044 82.9135C84.6397 82.7513 84.99 82.6614 85.3393 82.6437ZM58.5298 82.7095C59.748 82.7267 60.8406 83.5761 61.1237 84.822C61.2562 85.4052 61.1917 85.9831 60.973 86.4935L61.0189 86.5527L54.888 101.439C49.1559 97.7432 44.5904 92.2099 42.1481 85.4208L57.9731 82.7227L57.9993 82.7556C58.1763 82.7229 58.3558 82.7071 58.5298 82.7095ZM71.8986 89.2312C72.3229 89.2155 72.7534 89.303 73.1627 89.501C73.6992 89.7606 74.1136 90.1692 74.3745 90.6592H74.4334L82.2346 104.821C81.2221 105.162 80.1813 105.454 79.1167 105.697C73.1505 107.058 67.2032 106.645 61.818 104.802L69.5995 90.6658H69.6126C70.0795 89.7888 70.965 89.2656 71.8986 89.2312Z" fill="white" stroke="white" stroke-width="0.25"/>
<defs>
<linearGradient id="paint0_linear_681_2845" x1="10" y1="15.5" x2="144" y2="131.5" gradientUnits="userSpaceOnUse">
<stop stop-color="#4D87FF"/>
<stop offset="1" stop-color="#0547D0"/>
</linearGradient>
</defs>
</svg>

-    keysOrder: [["apiVersion"], ["appVersion"], ["kind"], ["metadata"], ["metadata", "name"], ["spec", "storageClass"], ["spec", "nodeGroups"], ["spec", "nodeGroups", "md0"], ["spec", "nodeGroups", "md0", "minReplicas"], ["spec", "nodeGroups", "md0", "maxReplicas"], ["spec", "nodeGroups", "md0", "instanceType"], ["spec", "nodeGroups", "md0", "diskSize"], ["spec", "nodeGroups", "md0", "storageClass"], ["spec", "nodeGroups", "md0", "roles"], ["spec", "nodeGroups", "md0", "resources"], ["spec", "nodeGroups", "md0", "gpus"], ["spec", "nodeGroups", "md0", "kubelet"], ["spec", "version"], ["spec", "host"], ["spec", "addons"], ["spec", "addons", "certManager"], ["spec", "addons", "certManager", "enabled"], ["spec", "addons", "certManager", "valuesOverride"], ["spec", "addons", "cilium"], ["spec", "addons", "cilium", "valuesOverride"], ["spec", "addons", "gatewayAPI"], ["spec", "addons", "gatewayAPI", "enabled"], ["spec", "addons", "ingressNginx"], ["spec", "addons", "ingressNginx", "enabled"], ["spec", "addons", "ingressNginx", "exposeMethod"], ["spec", "addons", "ingressNginx", "hosts"], ["spec", "addons", "ingressNginx", "valuesOverride"], ["spec", "addons", "gpuOperator"], ["spec", "addons", "gpuOperator", "enabled"], ["spec", "addons", "gpuOperator", "valuesOverride"], ["spec", "addons", "hami"], ["spec", "addons", "hami", "enabled"], ["spec", "addons", "hami", "valuesOverride"], ["spec", "addons", "fluxcd"], ["spec", "addons", "fluxcd", "enabled"], ["spec", "addons", "fluxcd", "valuesOverride"], ["spec", "addons", "monitoringAgents"], ["spec", "addons", "monitoringAgents", "enabled"], ["spec", "addons", "monitoringAgents", "valuesOverride"], ["spec", "addons", "verticalPodAutoscaler"], ["spec", "addons", "verticalPodAutoscaler", "valuesOverride"], ["spec", "addons", "velero"], ["spec", "addons", "velero", "enabled"], ["spec", "addons", "velero", "valuesOverride"], ["spec", "addons", "coredns"], ["spec", "addons", "coredns", "valuesOverride"], ["spec", "addons", "ouroboros"], ["spec", "addons", "ouroboros", "enabled"], ["spec", "addons", "ouroboros", "valuesOverride"], ["spec", "controlPlane"], ["spec", "controlPlane", "replicas"], ["spec", "controlPlane", "apiServer"], ["spec", "controlPlane", "apiServer", "resources"], ["spec", "controlPlane", "apiServer", "resourcesPreset"], ["spec", "controlPlane", "controllerManager"], ["spec", "controlPlane", "controllerManager", "resources"], ["spec", "controlPlane", "controllerManager", "resourcesPreset"], ["spec", "controlPlane", "scheduler"], ["spec", "controlPlane", "scheduler", "resources"], ["spec", "controlPlane", "scheduler", "resourcesPreset"], ["spec", "controlPlane", "konnectivity"], ["spec", "controlPlane", "konnectivity", "server"], ["spec", "controlPlane", "konnectivity", "server", "resources"], ["spec", "controlPlane", "konnectivity", "server", "resourcesPreset"], ["spec", "images"], ["spec", "images", "waitForKubeconfig"]]
+    keysOrder: [["apiVersion"], ["appVersion"], ["kind"], ["metadata"], ["metadata", "name"], ["spec", "storageClass"], ["spec", "version"], ["spec", "host"], ["spec", "substrate"], ["spec", "proxmox"], ["spec", "proxmox", "allowedNodes"], ["spec", "proxmox", "dnsServers"], ["spec", "proxmox", "insecure"], ["spec", "proxmox", "ccm"], ["spec", "proxmox", "ccm", "credentialsSecretName"], ["spec", "proxmox", "csi"], ["spec", "proxmox", "csi", "enabled"], ["spec", "proxmox", "csi", "credentialsSecretName"], ["spec", "proxmox", "csi", "storageClasses"], ["spec", "proxmox", "ipv4Config"], ["spec", "proxmox", "ipv4Config", "addresses"], ["spec", "proxmox", "ipv4Config", "gateway"], ["spec", "proxmox", "ipv4Config", "prefix"], ["spec", "addons"], ["spec", "addons", "certManager"], ["spec", "addons", "certManager", "enabled"], ["spec", "addons", "certManager", "valuesOverride"], ["spec", "addons", "cilium"], ["spec", "addons", "cilium", "valuesOverride"], ["spec", "addons", "gatewayAPI"], ["spec", "addons", "gatewayAPI", "enabled"], ["spec", "addons", "ingressNginx"], ["spec", "addons", "ingressNginx", "enabled"], ["spec", "addons", "ingressNginx", "exposeMethod"], ["spec", "addons", "ingressNginx", "hosts"], ["spec", "addons", "ingressNginx", "valuesOverride"], ["spec", "addons", "gpuOperator"], ["spec", "addons", "gpuOperator", "enabled"], ["spec", "addons", "gpuOperator", "valuesOverride"], ["spec", "addons", "hami"], ["spec", "addons", "hami", "enabled"], ["spec", "addons", "hami", "valuesOverride"], ["spec", "addons", "monitoringAgents"], ["spec", "addons", "monitoringAgents", "enabled"], ["spec", "addons", "monitoringAgents", "valuesOverride"], ["spec", "addons", "verticalPodAutoscaler"], ["spec", "addons", "verticalPodAutoscaler", "valuesOverride"], ["spec", "addons", "velero"], ["spec", "addons", "velero", "enabled"], ["spec", "addons", "velero", "valuesOverride"], ["spec", "addons", "coredns"], ["spec", "addons", "coredns", "valuesOverride"], ["spec", "addons", "ouroboros"], ["spec", "addons", "ouroboros", "enabled"], ["spec", "addons", "ouroboros", "valuesOverride"], ["spec", "controlPlane"], ["spec", "controlPlane", "replicas"], ["spec", "controlPlane", "apiServer"], ["spec", "controlPlane", "apiServer", "resources"], ["spec", "controlPlane", "apiServer", "resourcesPreset"], ["spec", "controlPlane", "apiServer", "extraArgs"], ["spec", "controlPlane", "apiServer", "admissionControllers"], ["spec", "controlPlane", "apiServer", "extraVolumes"], ["spec", "controlPlane", "apiServer", "extraVolumeMounts"], ["spec", "controlPlane", "controllerManager"], ["spec", "controlPlane", "controllerManager", "resources"], ["spec", "controlPlane", "controllerManager", "resourcesPreset"], ["spec", "controlPlane", "scheduler"], ["spec", "controlPlane", "scheduler", "resources"], ["spec", "controlPlane", "scheduler", "resourcesPreset"], ["spec", "controlPlane", "konnectivity"], ["spec", "controlPlane", "konnectivity", "server"], ["spec", "controlPlane", "konnectivity", "server", "resources"], ["spec", "controlPlane", "konnectivity", "server", "resourcesPreset"], ["spec", "controlPlane", "kubelet"], ["spec", "controlPlane", "kubelet", "preferredAddressTypes"], ["spec", "images"], ["spec", "images", "waitForKubeconfig"], ["spec", "images", "kubectl"], ["spec", "images", "talosCsrSigner"], ["spec", "talos"], ["spec", "talos", "version"], ["spec", "talos", "schematicID"], ["spec", "talos", "imageFactoryURL"], ["spec", "talos", "installerRepository"], ["spec", "talos", "registryMirrors"], ["spec", "oidc"], ["spec", "oidc", "mode"], ["spec", "oidc", "customConfig"], ["spec", "oidc", "customConfig", "config"], ["spec", "oidc", "customConfig", "secretRef"], ["spec", "oidc", "customConfig", "secretRef", "name"], ["spec", "oidc", "users"]]
   secrets:
     exclude: []
     include:
       - resourceNames:
           - kubernetes-{{ .name }}-admin-kubeconfig
+          - kubernetes-{{ .name }}-oidc-kubeconfig
   services:
     exclude: []
     include:
diff --git a/packages/system/kubernetes-worker-image/Chart.yaml b/packages/system/kubernetes-worker-image/Chart.yaml
new file mode 100644
index 0000000000..0e11835a66
--- /dev/null
+++ b/packages/system/kubernetes-worker-image/Chart.yaml
@@ -0,0 +1,5 @@
+apiVersion: v2
+name: kubernetes-worker-image
+description: Golden Talos worker OS image collection for tenant Kubernetes clusters, pre-populated as DataVolumes in cozy-public for CDI csi-clone
+type: application
+version: 0.0.0 # Placeholder, the actual version will be automatically set during the build process
diff --git a/packages/system/kubernetes-worker-image/Makefile b/packages/system/kubernetes-worker-image/Makefile
new file mode 100644
index 0000000000..e3e642c0b5
--- /dev/null
+++ b/packages/system/kubernetes-worker-image/Makefile
@@ -0,0 +1,9 @@
+export NAME=kubernetes-worker-image
+export NAMESPACE=cozy-system
+
+include ../../../hack/package.mk
+
+.PHONY: test
+
+test:
+	helm unittest .
diff --git a/packages/system/kubernetes-worker-image/templates/dv.yaml b/packages/system/kubernetes-worker-image/templates/dv.yaml
new file mode 100644
index 0000000000..2dd0db4961
--- /dev/null
+++ b/packages/system/kubernetes-worker-image/templates/dv.yaml
@@ -0,0 +1,106 @@
+{{- /* Names already rendered in this release, so a repeated (schematicID, version)
+       is refused rather than silently collapsing. Helm does not dedupe manifests
+       within a release: two entries resolving to one DataVolume name both reach
+       the API in list order, the second wins, and the golden every pinned pool
+       clones is whichever entry happens to sit later in the file. The likely
+       mistake is a copy-pasted entry meant to add a flavor on another class with
+       the version left unbumped, and it produces no warning at render or apply. */}}
+{{- $rendered := dict }}
+{{- range .Values.images }}
+{{- $schematicID := required "A valid .schematicID entry is required for each images[] entry!" .schematicID }}
+{{- $version := required "A valid .version entry is required for each images[] entry!" .version }}
+{{- $factory := .imageFactoryURL | default $.Values.imageFactoryURL | trimSuffix "/" }}
+{{- /* The same three patterns packages/apps/kubernetes-nodes/templates/nodegroup.yaml
+       applies to the values a pool resolves. Both sides build the same DataVolume
+       name from the same two fields, so a catalog that checks only presence can
+       admit an entry no pool will ever be able to reference: an uppercase schematic
+       or a version without the leading `v` either renders a name the API server
+       rejects outright, or imports a golden the pool-side regex refuses to
+       reconstruct -- and neither outcome says which of the two files is wrong. */}}
+{{- if not (regexMatch "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$" ($schematicID | toString)) }}
+{{-   fail (printf "kubernetes-worker-image: images[] entry schematicID %q is not a plain lowercase alphanumeric identifier. It is interpolated into this golden's DataVolume name and image URL, and a worker pool reconstructs that same name to clone it." ($schematicID | toString)) }}
+{{- end }}
+{{- if not (regexMatch "^v[0-9]+\\.[0-9]+\\.[0-9]+(-[0-9a-z.]+)?$" ($version | toString)) }}
+{{-   fail (printf "kubernetes-worker-image: images[] entry version %q is not a vMAJOR.MINOR.PATCH Talos release. It is interpolated into this golden's DataVolume name and image URL, and a worker pool reconstructs that same name to clone it." ($version | toString)) }}
+{{- end }}
+{{- if not (regexMatch "^https?://[A-Za-z0-9._~:/?#\\[\\]@!&'()*+,;=%-]+$" ($factory | toString)) }}
+{{-   fail (printf "kubernetes-worker-image: imageFactoryURL %q is not a plain http(s) URL. It is interpolated into this golden's DataVolume source URL." ($factory | toString)) }}
+{{- end }}
+{{- $name := printf "talos-worker-%s-%s" $schematicID $version }}
+{{- if hasKey $rendered $name }}
+{{-   fail (printf "kubernetes-worker-image: two images[] entries resolve to the same golden DataVolume %q. The name is keyed on (schematicID, version) alone, so a second entry would silently replace the first and every pool pinning it would clone whichever storage, StorageClass and source URL come last. Give the flavors distinct (schematicID, version) pairs, or drop the duplicate." $name) }}
+{{- end }}
+{{- $_ := set $rendered $name true }}
+{{- $url := printf "%s/image/%s/%s/openstack-amd64.raw.xz" $factory $schematicID $version }}
+{{- $storage := .storage | default $.Values.storage | default "6Gi" }}
+{{- $storageClass := .storageClass | default $.Values.storageClass | default "" }}
+{{- /* A DataVolume spec is not patchable in place, so editing storage, storageClass
+       or the source URL of an entry whose golden already exists produces a rejected
+       patch on the next HelmRelease upgrade -- an opaque failure whose only recovery
+       is deleting the golden, which is itself the deletion footgun values.yaml warns
+       about. Catch the edit here instead, where the message can name the entry and
+       the supported move: values.yaml documents the immutability, and this is what
+       makes that document enforceable. Inert with no cluster to read
+       (`helm template`, `helm lint`), like every other lookup in this repo. */}}
+{{- $live := lookup "cdi.kubevirt.io/v1beta1" "DataVolume" "cozy-public" $name }}
+{{- if $live }}
+{{-   $liveURL := dig "spec" "source" "http" "url" "" $live | toString }}
+{{-   $liveStorage := dig "spec" "storage" "resources" "requests" "storage" "" $live | toString }}
+{{-   $liveStorageClass := dig "spec" "storage" "storageClassName" "" $live | toString }}
+{{-   $drift := list }}
+{{- /*  The presence term on the first two comparisons keeps a golden whose spec is
+         silent about a field from reporting a drift that did not happen -- one
+         created by hand, or by a CDI that keeps its source elsewhere. The class
+         cannot be gated the same way: an entry with storageClass "" renders no
+         storageClassName at all, so a silent golden is one this chart itself
+         produces, `and` would short-circuit on exactly that object, and setting an
+         explicit class on it afterwards would reach the API server as a rejected
+         patch instead of the message below. Comparing it unconditionally costs
+         nothing when both sides are silent, since two empty strings are equal. */}}
+{{-   if and $liveURL (ne $liveURL ($url | toString)) }}{{- $drift = append $drift (printf "source URL %q -> %q" $liveURL $url) }}{{- end }}
+{{-   if and $liveStorage (ne $liveStorage ($storage | toString)) }}{{- $drift = append $drift (printf "storage %q -> %q" $liveStorage $storage) }}{{- end }}
+{{-   if ne $liveStorageClass ($storageClass | toString) }}{{- $drift = append $drift (printf "storageClass %q -> %q" $liveStorageClass $storageClass) }}{{- end }}
+{{-   if $drift }}
+{{-     fail (printf "kubernetes-worker-image: images[] entry (%s, %s) changed after its golden DataVolume %q was created: %s. A DataVolume spec cannot be patched in place, so this upgrade would be rejected by the API server. Add a NEW entry with a different (schematicID, version), move the worker pools onto it, then retire the old one -- values.yaml carries the query that says which pools still pin this golden." $schematicID $version $name (join ", " $drift)) }}
+{{-   end }}
+{{- end }}
+---
+apiVersion: cdi.kubevirt.io/v1beta1
+kind: DataVolume
+metadata:
+  annotations:
+    # Keep the golden when its images[] entry is removed. It is a clone SOURCE for
+    # tenant worker disks, and a helm fail() on a missing golden aborts the whole
+    # Kubernetes HelmRelease of every tenant pinned to it — not just the disk — so
+    # pruning one here would strand unrelated tenant operations. Dropping an entry
+    # therefore stops managing the golden rather than deleting it. Remove it by hand
+    # once no worker pool clones it -- which is checkable, not a guess: every cloned
+    # worker disk annotates its source golden. values.yaml carries the query.
+    helm.sh/resource-policy: keep
+    # bind.immediate so the image is imported now (not deferred to a first
+    # consumer): the DataVolume becoming ready is what the kubernetes app's
+    # worker clones wait on. usePopulator matches the vm-default-images golden
+    # convention.
+    cdi.kubevirt.io/storage.bind.immediate.requested: "true"
+    cdi.kubevirt.io/storage.usePopulator: "true"
+    kubernetes-worker-image.cozystack.io/schematic-id: {{ $schematicID | quote }}
+    kubernetes-worker-image.cozystack.io/talos-version: {{ $version | quote }}
+  labels:
+    app.kubernetes.io/managed-by: cozystack
+  # Deterministic name the kubernetes-nodes chart reconstructs to clone this golden
+  # — keep in sync with packages/apps/kubernetes-nodes/templates/nodegroup.yaml.
+  name: {{ $name }}
+  namespace: cozy-public
+spec:
+  contentType: kubevirt
+  source:
+    http:
+      url: {{ $url | quote }}
+  storage:
+    resources:
+      requests:
+        storage: {{ $storage | quote }}
+    {{- with $storageClass }}
+    storageClassName: {{ . | quote }}
+    {{- end }}
+{{- end }}
diff --git a/packages/system/kubernetes-worker-image/tests/dv_test.yaml b/packages/system/kubernetes-worker-image/tests/dv_test.yaml
new file mode 100644
index 0000000000..e639baab53
--- /dev/null
+++ b/packages/system/kubernetes-worker-image/tests/dv_test.yaml
@@ -0,0 +1,298 @@
+suite: golden Talos worker image DataVolume tests
+
+templates:
+  - templates/dv.yaml
+
+tests:
+  # The DataVolume name is a contract: packages/apps/kubernetes-nodes reconstructs
+  # `talos-worker-<schematicID>-<version>` to clone this golden. A rename here
+  # silently breaks the clone (workers fall back to per-worker HTTP import), so
+  # pin it.
+  - it: renders the default golden DataVolume in cozy-public with the contract name
+    asserts:
+      - isKind:
+          of: DataVolume
+        documentIndex: 0
+      - equal:
+          path: metadata.name
+          value: talos-worker-ce4c980550dd2ab1b17bbf2b08801c7eb59418eafe8f279833297925d67c7515-v1.13.6
+        documentIndex: 0
+      - equal:
+          path: metadata.namespace
+          value: cozy-public
+        documentIndex: 0
+      - equal:
+          path: spec.source.http.url
+          value: https://factory.talos.dev/image/ce4c980550dd2ab1b17bbf2b08801c7eb59418eafe8f279833297925d67c7515/v1.13.6/openstack-amd64.raw.xz
+        documentIndex: 0
+      - equal:
+          path: spec.contentType
+          value: kubevirt
+        documentIndex: 0
+      - equal:
+          path: spec.storage.resources.requests.storage
+          value: 6Gi
+        documentIndex: 0
+      - equal:
+          path: spec.storage.storageClassName
+          value: replicated
+        documentIndex: 0
+      - equal:
+          path: metadata.annotations["cdi.kubevirt.io/storage.usePopulator"]
+          value: "true"
+        documentIndex: 0
+      - equal:
+          path: metadata.annotations["cdi.kubevirt.io/storage.bind.immediate.requested"]
+          value: "true"
+        documentIndex: 0
+      # Pruning a golden that tenants still clone makes their whole Kubernetes
+      # HelmRelease fail to render, so removing an images[] entry must orphan the
+      # DataVolume rather than delete it.
+      - equal:
+          path: metadata.annotations["helm.sh/resource-policy"]
+          value: keep
+        documentIndex: 0
+
+  # Per-image overrides + name format for a non-default (schematicID, version).
+  - it: honours per-image overrides and keeps the contract name format
+    set:
+      images:
+        - schematicID: "abc123"
+          version: "v1.14.0"
+          imageFactoryURL: "http://mirror.example.com/talos/"
+          storage: "6Gi"
+          storageClass: "local"
+    asserts:
+      - equal:
+          path: metadata.name
+          value: talos-worker-abc123-v1.14.0
+        documentIndex: 0
+      - equal:
+          path: spec.source.http.url
+          value: http://mirror.example.com/talos/image/abc123/v1.14.0/openstack-amd64.raw.xz
+        documentIndex: 0
+      - equal:
+          path: spec.storage.resources.requests.storage
+          value: 6Gi
+        documentIndex: 0
+      - equal:
+          path: spec.storage.storageClassName
+          value: local
+        documentIndex: 0
+
+  # Multiple images -> one DataVolume each.
+  - it: renders one DataVolume per images[] entry
+    set:
+      images:
+        - schematicID: "aaa"
+          version: "v1.13.6"
+        - schematicID: "bbb"
+          version: "v1.14.0"
+    asserts:
+      - hasDocuments:
+          count: 2
+      - equal:
+          path: metadata.name
+          value: talos-worker-aaa-v1.13.6
+        documentIndex: 0
+      - equal:
+          path: metadata.name
+          value: talos-worker-bbb-v1.14.0
+        documentIndex: 1
+
+  # The rejection half of the contract. Both fields are `required` in dv.yaml, and
+  # what that refusal buys is the golden's name: an entry missing either one would
+  # otherwise render `talos-worker--v1.13.6` or `talos-worker-<id>-`, and two such
+  # entries collide on one DataVolume, so the second silently replaces the first
+  # and every pool pinning it clones the wrong OS.
+  - it: rejects a catalog entry with no schematicID
+    set:
+      images:
+        - version: v1.13.6
+    asserts:
+      - failedTemplate:
+          errorPattern: 'A valid \.schematicID entry is required'
+
+  - it: rejects a catalog entry with no version
+    set:
+      images:
+        - schematicID: ce4c980550dd2ab1b17bbf2b08801c7eb59418eafe8f279833297925d67c7515
+    asserts:
+      - failedTemplate:
+          errorPattern: 'A valid \.version entry is required'
+
+  # Both fields present and the pair repeated is the sub-case `required` cannot
+  # reach, and the one an operator actually produces: a copy-pasted entry meant to
+  # add a flavor on another class, with the version left unbumped. Helm renders
+  # both, the API applies both in list order, and the golden every pinned pool
+  # clones is whichever entry sits later in the file.
+  - it: rejects two catalog entries that resolve to the same golden
+    set:
+      images:
+        - schematicID: aaa
+          version: v1.13.6
+          storageClass: replicated
+        - schematicID: aaa
+          version: v1.13.6
+          storageClass: local
+    asserts:
+      - failedTemplate:
+          errorPattern: 'two images\[\] entries resolve to the same golden DataVolume "talos-worker-aaa-v1\.13\.6"'
+
+  # The pool side pattern-checks the values it resolves before they reach a
+  # DataVolume name; the catalog builds the same name from the same fields, so an
+  # entry it accepts and the pool cannot reconstruct is a golden nobody can use.
+  - it: rejects a schematicID that is not a plain lowercase alphanumeric identifier
+    set:
+      images:
+        - schematicID: CE4C9805
+          version: v1.13.6
+    asserts:
+      - failedTemplate:
+          errorPattern: 'schematicID "CE4C9805" is not a plain lowercase alphanumeric identifier'
+
+  - it: rejects a version without the leading v
+    set:
+      images:
+        - schematicID: aaa
+          version: "1.13.6"
+    asserts:
+      - failedTemplate:
+          errorPattern: 'version "1\.13\.6" is not a vMAJOR\.MINOR\.PATCH Talos release'
+
+  - it: rejects an imageFactoryURL that is not a plain http(s) URL
+    set:
+      imageFactoryURL: "factory.talos.dev; rm -rf /"
+      images:
+        - schematicID: aaa
+          version: v1.13.6
+    asserts:
+      - failedTemplate:
+          errorPattern: 'is not a plain http\(s\) URL'
+
+  # An entry is immutable once its golden exists, because a DataVolume spec is not
+  # patchable in place. Without this the edit surfaces as a rejected patch on the
+  # next HelmRelease upgrade, whose only documented recovery is deleting the golden
+  # — which is the deletion footgun the catalog warns about.
+  - it: rejects raising storage on an entry whose golden already exists
+    set:
+      images:
+        - schematicID: aaa
+          version: v1.13.6
+          storage: 10Gi
+    kubernetesProvider: &liveGolden
+      scheme:
+        "cdi.kubevirt.io/v1beta1/DataVolume":
+          gvr: {group: cdi.kubevirt.io, version: v1beta1, resource: datavolumes}
+          namespaced: true
+      objects:
+        - kind: DataVolume
+          apiVersion: cdi.kubevirt.io/v1beta1
+          metadata: {name: talos-worker-aaa-v1.13.6, namespace: cozy-public}
+          spec:
+            source:
+              http: {url: "https://factory.talos.dev/image/aaa/v1.13.6/openstack-amd64.raw.xz"}
+            storage:
+              resources: {requests: {storage: 6Gi}}
+              storageClassName: replicated
+    asserts:
+      - failedTemplate:
+          errorPattern: 'changed after its golden DataVolume "talos-worker-aaa-v1\.13\.6" was created: storage "6Gi" -> "10Gi"'
+
+  - it: rejects moving an existing golden onto another StorageClass
+    set:
+      storageClass: local
+      images:
+        - schematicID: aaa
+          version: v1.13.6
+    kubernetesProvider: *liveGolden
+    asserts:
+      - failedTemplate:
+          errorPattern: 'storageClass "replicated" -> "local"'
+
+  - it: rejects repointing an existing golden at another Image Factory
+    set:
+      imageFactoryURL: "https://factory.internal.example.com"
+      images:
+        - schematicID: aaa
+          version: v1.13.6
+    kubernetesProvider: *liveGolden
+    asserts:
+      - failedTemplate:
+          errorPattern: 'source URL "https://factory\.talos\.dev/image/aaa/v1\.13\.6/openstack-amd64\.raw\.xz" -> "https://factory\.internal\.example\.com/image/aaa/v1\.13\.6/openstack-amd64\.raw\.xz"'
+
+  # The presence term on the URL and storage comparisons is load-bearing rather
+  # than defensive: a golden whose spec carries no http source or no storage
+  # request -- one created by hand, or by a CDI that keeps its source elsewhere --
+  # would otherwise compare "" against the rendered value, report drift that did
+  # not happen, and block every upgrade of the catalog from then on. Found by
+  # mutating each conjunct out and seeing the suite stay green.
+  - it: reports no drift against a live golden that declares none of the three fields
+    set:
+      storageClass: ""
+      images:
+        - schematicID: aaa
+          version: v1.13.6
+    kubernetesProvider: &silentGolden
+      scheme:
+        "cdi.kubevirt.io/v1beta1/DataVolume":
+          gvr: {group: cdi.kubevirt.io, version: v1beta1, resource: datavolumes}
+          namespaced: true
+      objects:
+        - kind: DataVolume
+          apiVersion: cdi.kubevirt.io/v1beta1
+          metadata: {name: talos-worker-aaa-v1.13.6, namespace: cozy-public}
+          status: {phase: Succeeded}
+    asserts:
+      - equal:
+          path: metadata.name
+          value: talos-worker-aaa-v1.13.6
+      - equal:
+          path: spec.storage.resources.requests.storage
+          value: 6Gi
+      # The premise of the two cases below: an entry with an empty class renders a
+      # golden whose spec states none, so the silent object is one this chart makes.
+      - notExists:
+          path: spec.storage.storageClassName
+
+  # Which is why the class takes no presence term. A presence gate would skip
+  # exactly the golden this chart creates with storageClass "", and setting a class
+  # on it afterwards would reach the API server as a rejected patch instead of the
+  # render-time message. Both directions are a spec change the API server refuses,
+  # so both are reported.
+  - it: rejects setting a class on an existing golden that declares none
+    set:
+      images:
+        - schematicID: aaa
+          version: v1.13.6
+    kubernetesProvider: *silentGolden
+    asserts:
+      - failedTemplate:
+          errorPattern: 'storageClass "" -> "replicated"'
+
+  - it: rejects blanking the class of an existing golden that declares one
+    set:
+      storageClass: ""
+      images:
+        - schematicID: aaa
+          version: v1.13.6
+    kubernetesProvider: *liveGolden
+    asserts:
+      - failedTemplate:
+          errorPattern: 'storageClass "replicated" -> ""'
+
+  # The guard must not fire on an unchanged entry, or every routine upgrade of the
+  # catalog fails once its golden exists.
+  - it: renders an unchanged entry whose golden already exists
+    set:
+      images:
+        - schematicID: aaa
+          version: v1.13.6
+    kubernetesProvider: *liveGolden
+    asserts:
+      - equal:
+          path: metadata.name
+          value: talos-worker-aaa-v1.13.6
+      - equal:
+          path: spec.storage.resources.requests.storage
+          value: 6Gi
diff --git a/packages/system/kubernetes-worker-image/values.yaml b/packages/system/kubernetes-worker-image/values.yaml
new file mode 100644
index 0000000000..67fb268baa
--- /dev/null
+++ b/packages/system/kubernetes-worker-image/values.yaml
@@ -0,0 +1,107 @@
+##
+## @section Talos worker image catalog
+##
+## Pre-populates a catalog of Talos worker OS disk images as DataVolumes in the
+## cozy-public namespace, so a tenant Kubernetes worker node group can boot by CDI
+## csi-clone (a storage-layer copy) of a shared golden image instead of each worker
+## independently importing the raw image over HTTP from the Talos Image Factory.
+## One import per (schematicID, version) is then shared by every worker of every
+## tenant node group that clones it — removing the per-worker Factory dependency
+## (and the kubernetes-* e2e node-join flake, cozystack/cozystack#3231) on the hot
+## path. Each images[] entry is one catalog (schematicID, version) flavor.
+##
+## This package is OPT-IN: it is registered through the platform's optional package
+## helper and is disabled by default. Enable it by adding
+## `cozystack.kubernetes-worker-image` to `bundles.enabledPackages` in the Cozystack
+## config; without it no golden is created and every worker imports over HTTP.
+##
+## The package reports Ready only once every golden in images[] has imported. One
+## golden that cannot be fetched keeps the whole package not Ready, retrying with
+## no time limit, until it imports or its entry is removed. A golden that reached
+## phase Failed does not import again by itself: delete it and the next retry
+## recreates it. Pools do not wait on that status: they read each golden
+## directly, as described below.
+##
+## A tenant node group opts into a clone explicitly by setting `osImage.builtin`
+## (optionally overriding schematicID/version) on its own `KubernetesNodes` resource
+## -- one per pool since the Phase 2 split, NOT `nodeGroups` on the parent `Kubernetes`
+## CR, which is still accepted and stored there but has no effect. The pool then
+## clones the golden named deterministically
+## `talos-worker-<schematicID>-<version>` from cozy-public. The tenant render fails
+## rather than degrade silently when the referenced (schematicID, version) has no
+## matching entry in this catalog, when its golden terminally failed to import
+## (`phase: Failed`), or when the node group's storageClass differs from the
+## golden's — so keep the catalog in sync with the (schematicID, version) pairs and
+## StorageClasses that tenant node groups reference. A golden that is merely
+## mid-import is not an error: CDI holds the worker disk until the source populates.
+## Goldens carry `helm.sh/resource-policy: keep`, so removing an `images[]` entry
+## stops managing that golden rather than deleting it. Deleting one by hand while a
+## worker pool still clones it fails that pool's render on its next values or chart
+## change, and leaves an autoscaler scale-up months later with nothing to clone, so
+## check before deleting rather than after.
+##
+## Adding an entry comes before anything that makes a pool resolve it. A pool that
+## pins no version follows `talos.version` from the kubernetes-nodes chart, so
+## bumping that default -- which a Cozystack upgrade does -- repoints every such
+## pool at a golden that does not exist yet, and the pool's render fails on the
+## missing entry until this catalog carries it. That state clears itself once the
+## entry lands, since an app HelmRelease retries with no remediation cap, but the
+## pool cannot provision a worker in the meantime: add the entry in the same change
+## as the bump, not after it.
+##
+## The authority is the pool declarations, NOT the running disks. A pool sits at
+## zero workers whenever the autoscaler has nothing to place — `minReplicas: 0` is
+## the default — and it still pins its golden, so a query over live DataVolumes
+## answers "empty" for exactly the pool that breaks on its next scale-up. Read the
+## declarations first:
+##
+##   kubectl get kubernetesnodes -A -o json | jq -r '.items[]
+##     | select(.spec.osImage.builtin != null)
+##     | "\(.metadata.namespace)/\(.metadata.name)\tschematic=\(.spec.osImage.builtin.schematicID // "<talos.schematicID>")\tversion=\(.spec.osImage.builtin.version // "<talos.version>")"'
+##
+## A pool that leaves either field unset inherits it from its own `talos.*`, which
+## is why the fallbacks print as placeholders rather than as values — resolve those
+## against that pool's `talos` block before concluding it pins a different golden.
+##
+## The live disks are the second read, not the first. Every cloned worker disk
+## annotates the golden it came from, which is what tells you whether a clone is in
+## flight right now:
+##
+##   kubectl get datavolume -A -o json | jq -r '.items[]
+##     | select(.metadata.annotations["kubernetes-worker-image.cozystack.io/golden"]
+##              == "talos-worker-<schematicID>-<version>")
+##     | "\(.metadata.namespace)/\(.metadata.name)"'
+##
+## Both empty is the go-ahead. The first non-empty on its own is enough to stop.
+##
+## Worker pools that do not set `osImage.builtin` import over HTTP and never touch
+## this catalog.
+##
+## An entry is effectively immutable once its golden exists. The DataVolume is named
+## from `(schematicID, version)` alone, while `storage`, `storageClass` and the
+## source URL are rendered into a spec Kubernetes does not allow to be patched in
+## place — so editing one of those on an existing entry produces a rejected patch on
+## the next HelmRelease upgrade, and the only way out is deleting the golden, which
+## runs straight into the check above. Treat a size, class or URL change as a NEW
+## `(schematicID, version)` entry, move the pools onto it, then retire the old one.
+
+## @param {string} imageFactoryURL - Default base URL of the Talos Image Factory serving the raw worker OS image (`<url>/image/<schematicID>/<version>/openstack-amd64.raw.xz`). Overridable per image. No trailing slash.
+imageFactoryURL: "https://factory.talos.dev"
+
+## @param {string} storageClass - Default StorageClass for the golden image(s). Must match the StorageClass of the worker disks that clone it: CDI cannot CSI-clone across StorageClasses and would silently fall back to a host-assisted copy over the pod network, so the tenant render rejects a mismatch outright. Overridable per image.
+storageClass: "replicated"
+
+## @param {quantity} storage - Default storage size allocated for each golden image. Must be >= the imported raw image virtual size and <= the smallest worker diskSize that clones it. The Talos v1.13.x openstack raw is ~4.15 GiB, so 6Gi leaves headroom. This size is also the unit of the transient cost every clone pays: CDI populates a worker disk larger than the golden by cloning at the golden's size and then growing it, so one worker in flight occupies the golden plus a temporary clone PVC plus its own diskSize, times the replica count of a replicated StorageClass. Keeping this at the raw image's size rather than rounding it up is therefore worth doing -- it is paid once per golden and again per concurrent clone. Overridable per image, but only when the entry is added: a DataVolume spec cannot be patched in place, so raising this on an entry whose golden already exists is rejected on the next upgrade — a Talos version whose raw outgrows it needs a new `images[]` entry, which it gets anyway since the name is keyed on the version.
+storage: "6Gi"
+
+## @typedef {struct} WorkerImage - A golden Talos worker image entry.
+## @field {string} schematicID - Talos image-factory schematic ID.
+## @field {string} version - Talos version (e.g. "v1.13.6").
+## @field {string} [imageFactoryURL] - Override the global imageFactoryURL for this image.
+## @field {quantity} [storage] - Override the global storage size for this image.
+## @field {string} [storageClass] - Override the global StorageClass for this image.
+
+## @param {[]WorkerImage} images - Catalog of golden Talos worker images to provision in the cozy-public namespace. Each entry is one (schematicID, version) flavor a tenant node group can clone via `osImage.builtin`.
+images:
+  - schematicID: "ce4c980550dd2ab1b17bbf2b08801c7eb59418eafe8f279833297925d67c7515"
+    version: "v1.13.6"
diff --git a/packages/system/kuberture/values.yaml b/packages/system/kuberture/values.yaml
index 3d4e470777..f26a8f9cf7 100644
--- a/packages/system/kuberture/values.yaml
+++ b/packages/system/kuberture/values.yaml
@@ -6,7 +6,10 @@ kuberture:
     # at oci://ghcr.io/lexfrei/kuberture/charts/kuberture separately. Bump
     # the tag+digest here together with KUBERTURE_CHART_VERSION and
     # KUBERTURE_CHART_DIGEST in the Makefile (resolve the new image digest
-    # with `crane digest ghcr.io/lexfrei/kuberture:<new-tag>`).
+    # with `crane digest ghcr.io/lexfrei/kuberture:<new-tag>`). repository
+    # repeats the chart default so the pinned ref is complete in this file,
+    # where the release tooling reads it.
+    repository: ghcr.io/lexfrei/kuberture
     tag: 0.1.1@sha256:4f265331d65f6e5afc1bf6325e7ab62f2004fc75c0587978e41321f816105fbf
 
   # Cozystack ships a Prometheus stack by default; surface kuberture's metrics.
diff --git a/packages/system/kubevirt-cdi-operator/.gitignore b/packages/system/kubevirt-cdi-operator/.gitignore
new file mode 100644
index 0000000000..9964f52386
--- /dev/null
+++ b/packages/system/kubevirt-cdi-operator/.gitignore
@@ -0,0 +1,3 @@
+# `update` fetches, transforms and patches here before moving the result into
+# templates/. A run that dies between those steps leaves the file behind.
+cdi-operator.yaml.download
diff --git a/packages/system/kubevirt-cdi-operator/Makefile b/packages/system/kubevirt-cdi-operator/Makefile
index 8d12f4e8db..4a7c931240 100644
--- a/packages/system/kubevirt-cdi-operator/Makefile
+++ b/packages/system/kubevirt-cdi-operator/Makefile
@@ -1,13 +1,60 @@
 export NAME=kubevirt-cdi-operator
 export NAMESPACE=cozy-kubevirt-cdi
 
+# The CDI release whose operator manifest is vendored under templates/. This
+# package decides which CDI the platform runs, so moving to another release is
+# an edit to this line, MANIFEST_SHA256 and the expectations under tests/,
+# rather than a side effect of running `update`. The golden-image clone guard
+# in packages/apps/vm-disk/templates/dv.yaml mirrors this release's clone
+# planner and has to be re-checked against the new one.
+RELEASE = v1.66.1
+
+# sha256 of the cdi-operator.yaml release asset as published, measured before
+# the transforms below run over it. It detects an asset that moved under its
+# tag; it is not authenticity verification.
+MANIFEST_SHA256 = c7d92bd1b2ee1a3952a5990000437c08d58109f31c0bd48ab6188ec27a13e224
+
+# sha256sum is not everywhere: current macOS carries a native one in /sbin,
+# older releases carry only shasum(1). Both print "<digest>  <path>", so field
+# 1 is the digest whichever gets picked. The rest of `update` needs GNU sed and
+# gawk regardless, so this alone does not make the recipe portable.
+SHA256SUM := $(shell command -v sha256sum >/dev/null 2>&1 && echo sha256sum || echo 'shasum -a 256')
+
 include ../../../hack/package.mk
 
+# Phony because hack/package.mk's .PHONY line lists only the targets that file
+# defines: with neither name declared, a path named `test` or `update` next to
+# this Makefile would make that target up to date and skip the recipe.
+.PHONY: test update
+test:
+	helm unittest .
+	@# helm-unittest reads the vendored file and cannot see RELEASE, so without
+	@# this a pin moved without re-running `update` leaves every assertion
+	@# green against the old release.
+	@if ! grep -q 'image: quay.io/kubevirt/cdi-operator:$(RELEASE)$$' templates/cdi-operator.yaml; then \
+	  echo "ERROR: templates/cdi-operator.yaml carries no cdi-operator image at $(RELEASE). Re-run 'make update'." >&2; \
+	  exit 1; \
+	fi
+
 update:
-	rm -rf templates
-	mkdir templates
-	export VERSION=$$(basename $$(curl -s -w %{redirect_url} https://github.com/kubevirt/containerized-data-importer/releases/latest)) && \
-	wget https://github.com/kubevirt/containerized-data-importer/releases/download/$$VERSION/cdi-operator.yaml -O templates/cdi-operator.yaml
-	sed -i 's/namespace: cdi/namespace: cozy-kubevirt-cdi/g' templates/cdi-operator.yaml
-	awk -i inplace -v RS="---" '!/kind: Namespace/{printf "%s", $$0 RS}' templates/cdi-operator.yaml
-	patch --no-backup-if-mismatch -p1 < patches/startupProbe.diff
+	@# The download is verified, transformed and patched outside templates/ and
+	@# moved in once finished, so a refresh that fails at any step leaves the
+	@# vendored copy as it was rather than half-replaced.
+	wget https://github.com/kubevirt/containerized-data-importer/releases/download/$(RELEASE)/cdi-operator.yaml -O cdi-operator.yaml.download || { rm -f cdi-operator.yaml.download; exit 1; }
+	@actual=$$($(SHA256SUM) cdi-operator.yaml.download | awk '{print $$1}'); \
+	if [ "$$actual" != "$(MANIFEST_SHA256)" ]; then \
+	  rm -f cdi-operator.yaml.download; \
+	  echo "ERROR: cdi-operator.yaml for $(RELEASE) hashed $$actual," >&2; \
+	  echo "       expected $(MANIFEST_SHA256). Nothing was written." >&2; \
+	  echo "       Moving to a new release starts from RELEASE, MANIFEST_SHA256 and" >&2; \
+	  echo "       the version expectations under tests/. If RELEASE did not" >&2; \
+	  echo "       change, the asset moved under a tag that should be immutable:" >&2; \
+	  echo "       find out why before pasting the new digest." >&2; \
+	  exit 1; \
+	fi
+	sed -i 's/namespace: cdi/namespace: $(NAMESPACE)/g' cdi-operator.yaml.download
+	awk -i inplace -v RS="---" '!/kind: Namespace/{printf "%s", $$0 RS}' cdi-operator.yaml.download
+	patch --no-backup-if-mismatch cdi-operator.yaml.download < patches/startupProbe.diff
+	patch --no-backup-if-mismatch cdi-operator.yaml.download < patches/tolerations.diff
+	mkdir -p templates
+	mv cdi-operator.yaml.download templates/cdi-operator.yaml
diff --git a/packages/system/kubevirt-cdi-operator/patches/tolerations.diff b/packages/system/kubevirt-cdi-operator/patches/tolerations.diff
new file mode 100644
index 0000000000..098910be70
--- /dev/null
+++ b/packages/system/kubevirt-cdi-operator/patches/tolerations.diff
@@ -0,0 +1,17 @@
+--- a/packages/system/kubevirt-cdi-operator/templates/cdi-operator.yaml
++++ b/packages/system/kubevirt-cdi-operator/templates/cdi-operator.yaml
+@@ -5807,4 +5807,13 @@
+       securityContext:
+         runAsNonRoot: true
+       serviceAccountName: cdi-operator
++      tolerations:
++      - key: CriticalAddonsOnly
++        operator: Exists
++      - effect: NoSchedule
++        key: node-role.kubernetes.io/control-plane
++        operator: Exists
++      - effect: NoSchedule
++        key: node-role.kubernetes.io/master
++        operator: Exists
+ ---
+\ No newline at end of file
diff --git a/packages/system/kubevirt-cdi-operator/templates/cdi-operator.yaml b/packages/system/kubevirt-cdi-operator/templates/cdi-operator.yaml
index 03ac3b3a28..fbe04f6143 100644
--- a/packages/system/kubevirt-cdi-operator/templates/cdi-operator.yaml
+++ b/packages/system/kubevirt-cdi-operator/templates/cdi-operator.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.14.0
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: cdis.cdi.kubevirt.io
 spec:
   group: cdi.kubevirt.io
@@ -159,9 +159,7 @@ spec:
                             This field is effectively required, but due to backwards compatibility is
                             allowed to be empty. Instances of this type with an empty value here are
                             almost certainly wrong.
-                            TODO: Add other useful fields. apiVersion, kind, uid?
                             More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                            TODO: Drop `kubebuilder:default` when controller-gen doesn't need it https://github.com/kubernetes-sigs/kubebuilder/issues/3896.
                           type: string
                       type: object
                       x-kubernetes-map-type: atomic
@@ -191,7 +189,7 @@ spec:
                           is consumed by the DataImportCron controller for creating
                           cronjobs, and by the import controller referring a copy
                           of the ConfigMap in the import namespace.\nHere is an example
-                          of the ConfigMap (in yaml):\n\n\napiVersion: v1\nkind: ConfigMap\nmetadata:\n
+                          of the ConfigMap (in yaml):\n\napiVersion: v1\nkind: ConfigMap\nmetadata:\n
                           \ name: my-ca-proxy-cm\n  namespace: cozy-kubevirt-cdi\ndata:\n  ca.pem:
                           |\n    -----BEGIN CERTIFICATE-----\n\t   ... <base64 encoded
                           cert> ...\n\t   -----END CERTIFICATE-----"
@@ -216,11 +214,9 @@ spec:
                           Claims lists the names of resources, defined in spec.resourceClaims,
                           that are used by this container.
 
-
                           This is an alpha field and requires enabling the
                           DynamicResourceAllocation feature gate.
 
-
                           This field is immutable. It can only be set for containers.
                         items:
                           description: ResourceClaim references one entry in PodSpec.ResourceClaims.
@@ -231,6 +227,12 @@ spec:
                                 the Pod where this field is used. It makes that resource available
                                 inside a container.
                               type: string
+                            request:
+                              description: |-
+                                Request is the name chosen for a request in the referenced claim.
+                                If empty, everything from the claim is made available, otherwise
+                                only the result of this request.
+                              type: string
                           required:
                           - name
                           type: object
@@ -286,7 +288,6 @@ spec:
                           profile as invalid configurations can be catastrophic. An example custom profile
                           looks like this:
 
-
                             ciphers:
                               - ECDHE-ECDSA-CHACHA20-POLY1305
                               - ECDHE-RSA-CHACHA20-POLY1305
@@ -301,7 +302,6 @@ spec:
                               during the TLS handshake.  Operators may remove entries their operands
                               do not support.  For example, to use DES-CBC3-SHA  (yaml):
 
-
                                 ciphers:
                                   - DES-CBC3-SHA
                             items:
@@ -313,10 +313,8 @@ spec:
                               that is negotiated during the TLS handshake. For example, to use TLS
                               versions 1.1, 1.2 and 1.3 (yaml):
 
-
                                 minTLSVersion: VersionTLS11
 
-
                               NOTE: currently the highest minTLSVersion allowed is VersionTLS12
                             enum:
                             - VersionTLS10
@@ -332,13 +330,10 @@ spec:
                         description: |-
                           intermediate is a TLS security profile based on:
 
-
                           https://wiki.mozilla.org/Security/Server_Side_TLS#Intermediate_compatibility_.28recommended.29
 
-
                           and looks like this (yaml):
 
-
                             ciphers:
                               - TLS_AES_128_GCM_SHA256
                               - TLS_AES_256_GCM_SHA384
@@ -358,20 +353,16 @@ spec:
                         description: |-
                           modern is a TLS security profile based on:
 
-
                           https://wiki.mozilla.org/Security/Server_Side_TLS#Modern_compatibility
 
-
                           and looks like this (yaml):
 
-
                             ciphers:
                               - TLS_AES_128_GCM_SHA256
                               - TLS_AES_256_GCM_SHA384
                               - TLS_CHACHA20_POLY1305_SHA256
                             minTLSVersion: VersionTLS13
 
-
                           NOTE: Currently unsupported.
                         nullable: true
                         type: object
@@ -379,13 +370,10 @@ spec:
                         description: |-
                           old is a TLS security profile based on:
 
-
                           https://wiki.mozilla.org/Security/Server_Side_TLS#Old_backward_compatibility
 
-
                           and looks like this (yaml):
 
-
                             ciphers:
                               - TLS_AES_128_GCM_SHA256
                               - TLS_AES_256_GCM_SHA384
@@ -425,15 +413,12 @@ spec:
                           the ability to specify individual TLS security profile parameters.
                           Old, Intermediate and Modern are TLS security profiles based on:
 
-
                           https://wiki.mozilla.org/Security/Server_Side_TLS#Recommended_configurations
 
-
                           The profiles are intent based, so they may change over time as new ciphers are developed and existing ciphers
                           are found to be insecure.  Depending on precisely which ciphers are available to a process, the list may be
                           reduced.
 
-
                           Note that the Modern profile is currently not supported because it is not
                           yet well adopted by common software libraries.
                         enum:
@@ -446,6 +431,12 @@ spec:
                   uploadProxyURLOverride:
                     description: Override the URL used when uploading to a DataVolume
                     type: string
+                  webhookPvcRendering:
+                    description: |-
+                      WebhookPvcRendering controls whether the PVC mutating webhook that completes
+                      PVC specs from StorageProfiles is enabled or disabled
+                      Allowed values are "Enabled" (default) and "Disabled"
+                    type: string
                 type: object
               customizeComponents:
                 description: CustomizeComponents defines patches for components deployed
@@ -795,7 +786,7 @@ spec:
                                         pod labels will be ignored. The default value is empty.
                                         The same key is forbidden to exist in both matchLabelKeys and labelSelector.
                                         Also, matchLabelKeys cannot be set when labelSelector isn't set.
-                                        This is an alpha field and requires enabling MatchLabelKeysInPodAffinity feature gate.
+                                        This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
                                       items:
                                         type: string
                                       type: array
@@ -810,7 +801,7 @@ spec:
                                         pod labels will be ignored. The default value is empty.
                                         The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
                                         Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
-                                        This is an alpha field and requires enabling MatchLabelKeysInPodAffinity feature gate.
+                                        This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
                                       items:
                                         type: string
                                       type: array
@@ -977,7 +968,7 @@ spec:
                                     pod labels will be ignored. The default value is empty.
                                     The same key is forbidden to exist in both matchLabelKeys and labelSelector.
                                     Also, matchLabelKeys cannot be set when labelSelector isn't set.
-                                    This is an alpha field and requires enabling MatchLabelKeysInPodAffinity feature gate.
+                                    This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
                                   items:
                                     type: string
                                   type: array
@@ -992,7 +983,7 @@ spec:
                                     pod labels will be ignored. The default value is empty.
                                     The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
                                     Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
-                                    This is an alpha field and requires enabling MatchLabelKeysInPodAffinity feature gate.
+                                    This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
                                   items:
                                     type: string
                                   type: array
@@ -1157,7 +1148,7 @@ spec:
                                         pod labels will be ignored. The default value is empty.
                                         The same key is forbidden to exist in both matchLabelKeys and labelSelector.
                                         Also, matchLabelKeys cannot be set when labelSelector isn't set.
-                                        This is an alpha field and requires enabling MatchLabelKeysInPodAffinity feature gate.
+                                        This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
                                       items:
                                         type: string
                                       type: array
@@ -1172,7 +1163,7 @@ spec:
                                         pod labels will be ignored. The default value is empty.
                                         The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
                                         Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
-                                        This is an alpha field and requires enabling MatchLabelKeysInPodAffinity feature gate.
+                                        This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
                                       items:
                                         type: string
                                       type: array
@@ -1339,7 +1330,7 @@ spec:
                                     pod labels will be ignored. The default value is empty.
                                     The same key is forbidden to exist in both matchLabelKeys and labelSelector.
                                     Also, matchLabelKeys cannot be set when labelSelector isn't set.
-                                    This is an alpha field and requires enabling MatchLabelKeysInPodAffinity feature gate.
+                                    This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
                                   items:
                                     type: string
                                   type: array
@@ -1354,7 +1345,7 @@ spec:
                                     pod labels will be ignored. The default value is empty.
                                     The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
                                     Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
-                                    This is an alpha field and requires enabling MatchLabelKeysInPodAffinity feature gate.
+                                    This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
                                   items:
                                     type: string
                                   type: array
@@ -1804,7 +1795,7 @@ spec:
                                         pod labels will be ignored. The default value is empty.
                                         The same key is forbidden to exist in both matchLabelKeys and labelSelector.
                                         Also, matchLabelKeys cannot be set when labelSelector isn't set.
-                                        This is an alpha field and requires enabling MatchLabelKeysInPodAffinity feature gate.
+                                        This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
                                       items:
                                         type: string
                                       type: array
@@ -1819,7 +1810,7 @@ spec:
                                         pod labels will be ignored. The default value is empty.
                                         The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
                                         Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
-                                        This is an alpha field and requires enabling MatchLabelKeysInPodAffinity feature gate.
+                                        This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
                                       items:
                                         type: string
                                       type: array
@@ -1986,7 +1977,7 @@ spec:
                                     pod labels will be ignored. The default value is empty.
                                     The same key is forbidden to exist in both matchLabelKeys and labelSelector.
                                     Also, matchLabelKeys cannot be set when labelSelector isn't set.
-                                    This is an alpha field and requires enabling MatchLabelKeysInPodAffinity feature gate.
+                                    This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
                                   items:
                                     type: string
                                   type: array
@@ -2001,7 +1992,7 @@ spec:
                                     pod labels will be ignored. The default value is empty.
                                     The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
                                     Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
-                                    This is an alpha field and requires enabling MatchLabelKeysInPodAffinity feature gate.
+                                    This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
                                   items:
                                     type: string
                                   type: array
@@ -2166,7 +2157,7 @@ spec:
                                         pod labels will be ignored. The default value is empty.
                                         The same key is forbidden to exist in both matchLabelKeys and labelSelector.
                                         Also, matchLabelKeys cannot be set when labelSelector isn't set.
-                                        This is an alpha field and requires enabling MatchLabelKeysInPodAffinity feature gate.
+                                        This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
                                       items:
                                         type: string
                                       type: array
@@ -2181,7 +2172,7 @@ spec:
                                         pod labels will be ignored. The default value is empty.
                                         The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
                                         Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
-                                        This is an alpha field and requires enabling MatchLabelKeysInPodAffinity feature gate.
+                                        This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
                                       items:
                                         type: string
                                       type: array
@@ -2348,7 +2339,7 @@ spec:
                                     pod labels will be ignored. The default value is empty.
                                     The same key is forbidden to exist in both matchLabelKeys and labelSelector.
                                     Also, matchLabelKeys cannot be set when labelSelector isn't set.
-                                    This is an alpha field and requires enabling MatchLabelKeysInPodAffinity feature gate.
+                                    This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
                                   items:
                                     type: string
                                   type: array
@@ -2363,7 +2354,7 @@ spec:
                                     pod labels will be ignored. The default value is empty.
                                     The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
                                     Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
-                                    This is an alpha field and requires enabling MatchLabelKeysInPodAffinity feature gate.
+                                    This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
                                   items:
                                     type: string
                                   type: array
@@ -2691,9 +2682,7 @@ spec:
                             This field is effectively required, but due to backwards compatibility is
                             allowed to be empty. Instances of this type with an empty value here are
                             almost certainly wrong.
-                            TODO: Add other useful fields. apiVersion, kind, uid?
                             More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                            TODO: Drop `kubebuilder:default` when controller-gen doesn't need it https://github.com/kubernetes-sigs/kubebuilder/issues/3896.
                           type: string
                       type: object
                       x-kubernetes-map-type: atomic
@@ -2723,7 +2712,7 @@ spec:
                           is consumed by the DataImportCron controller for creating
                           cronjobs, and by the import controller referring a copy
                           of the ConfigMap in the import namespace.\nHere is an example
-                          of the ConfigMap (in yaml):\n\n\napiVersion: v1\nkind: ConfigMap\nmetadata:\n
+                          of the ConfigMap (in yaml):\n\napiVersion: v1\nkind: ConfigMap\nmetadata:\n
                           \ name: my-ca-proxy-cm\n  namespace: cozy-kubevirt-cdi\ndata:\n  ca.pem:
                           |\n    -----BEGIN CERTIFICATE-----\n\t   ... <base64 encoded
                           cert> ...\n\t   -----END CERTIFICATE-----"
@@ -2748,11 +2737,9 @@ spec:
                           Claims lists the names of resources, defined in spec.resourceClaims,
                           that are used by this container.
 
-
                           This is an alpha field and requires enabling the
                           DynamicResourceAllocation feature gate.
 
-
                           This field is immutable. It can only be set for containers.
                         items:
                           description: ResourceClaim references one entry in PodSpec.ResourceClaims.
@@ -2763,6 +2750,12 @@ spec:
                                 the Pod where this field is used. It makes that resource available
                                 inside a container.
                               type: string
+                            request:
+                              description: |-
+                                Request is the name chosen for a request in the referenced claim.
+                                If empty, everything from the claim is made available, otherwise
+                                only the result of this request.
+                              type: string
                           required:
                           - name
                           type: object
@@ -2818,7 +2811,6 @@ spec:
                           profile as invalid configurations can be catastrophic. An example custom profile
                           looks like this:
 
-
                             ciphers:
                               - ECDHE-ECDSA-CHACHA20-POLY1305
                               - ECDHE-RSA-CHACHA20-POLY1305
@@ -2833,7 +2825,6 @@ spec:
                               during the TLS handshake.  Operators may remove entries their operands
                               do not support.  For example, to use DES-CBC3-SHA  (yaml):
 
-
                                 ciphers:
                                   - DES-CBC3-SHA
                             items:
@@ -2845,10 +2836,8 @@ spec:
                               that is negotiated during the TLS handshake. For example, to use TLS
                               versions 1.1, 1.2 and 1.3 (yaml):
 
-
                                 minTLSVersion: VersionTLS11
 
-
                               NOTE: currently the highest minTLSVersion allowed is VersionTLS12
                             enum:
                             - VersionTLS10
@@ -2864,13 +2853,10 @@ spec:
                         description: |-
                           intermediate is a TLS security profile based on:
 
-
                           https://wiki.mozilla.org/Security/Server_Side_TLS#Intermediate_compatibility_.28recommended.29
 
-
                           and looks like this (yaml):
 
-
                             ciphers:
                               - TLS_AES_128_GCM_SHA256
                               - TLS_AES_256_GCM_SHA384
@@ -2890,20 +2876,16 @@ spec:
                         description: |-
                           modern is a TLS security profile based on:
 
-
                           https://wiki.mozilla.org/Security/Server_Side_TLS#Modern_compatibility
 
-
                           and looks like this (yaml):
 
-
                             ciphers:
                               - TLS_AES_128_GCM_SHA256
                               - TLS_AES_256_GCM_SHA384
                               - TLS_CHACHA20_POLY1305_SHA256
                             minTLSVersion: VersionTLS13
 
-
                           NOTE: Currently unsupported.
                         nullable: true
                         type: object
@@ -2911,13 +2893,10 @@ spec:
                         description: |-
                           old is a TLS security profile based on:
 
-
                           https://wiki.mozilla.org/Security/Server_Side_TLS#Old_backward_compatibility
 
-
                           and looks like this (yaml):
 
-
                             ciphers:
                               - TLS_AES_128_GCM_SHA256
                               - TLS_AES_256_GCM_SHA384
@@ -2957,15 +2936,12 @@ spec:
                           the ability to specify individual TLS security profile parameters.
                           Old, Intermediate and Modern are TLS security profiles based on:
 
-
                           https://wiki.mozilla.org/Security/Server_Side_TLS#Recommended_configurations
 
-
                           The profiles are intent based, so they may change over time as new ciphers are developed and existing ciphers
                           are found to be insecure.  Depending on precisely which ciphers are available to a process, the list may be
                           reduced.
 
-
                           Note that the Modern profile is currently not supported because it is not
                           yet well adopted by common software libraries.
                         enum:
@@ -2978,6 +2954,12 @@ spec:
                   uploadProxyURLOverride:
                     description: Override the URL used when uploading to a DataVolume
                     type: string
+                  webhookPvcRendering:
+                    description: |-
+                      WebhookPvcRendering controls whether the PVC mutating webhook that completes
+                      PVC specs from StorageProfiles is enabled or disabled
+                      Allowed values are "Enabled" (default) and "Disabled"
+                    type: string
                 type: object
               customizeComponents:
                 description: CustomizeComponents defines patches for components deployed
@@ -3327,7 +3309,7 @@ spec:
                                         pod labels will be ignored. The default value is empty.
                                         The same key is forbidden to exist in both matchLabelKeys and labelSelector.
                                         Also, matchLabelKeys cannot be set when labelSelector isn't set.
-                                        This is an alpha field and requires enabling MatchLabelKeysInPodAffinity feature gate.
+                                        This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
                                       items:
                                         type: string
                                       type: array
@@ -3342,7 +3324,7 @@ spec:
                                         pod labels will be ignored. The default value is empty.
                                         The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
                                         Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
-                                        This is an alpha field and requires enabling MatchLabelKeysInPodAffinity feature gate.
+                                        This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
                                       items:
                                         type: string
                                       type: array
@@ -3509,7 +3491,7 @@ spec:
                                     pod labels will be ignored. The default value is empty.
                                     The same key is forbidden to exist in both matchLabelKeys and labelSelector.
                                     Also, matchLabelKeys cannot be set when labelSelector isn't set.
-                                    This is an alpha field and requires enabling MatchLabelKeysInPodAffinity feature gate.
+                                    This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
                                   items:
                                     type: string
                                   type: array
@@ -3524,7 +3506,7 @@ spec:
                                     pod labels will be ignored. The default value is empty.
                                     The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
                                     Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
-                                    This is an alpha field and requires enabling MatchLabelKeysInPodAffinity feature gate.
+                                    This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
                                   items:
                                     type: string
                                   type: array
@@ -3689,7 +3671,7 @@ spec:
                                         pod labels will be ignored. The default value is empty.
                                         The same key is forbidden to exist in both matchLabelKeys and labelSelector.
                                         Also, matchLabelKeys cannot be set when labelSelector isn't set.
-                                        This is an alpha field and requires enabling MatchLabelKeysInPodAffinity feature gate.
+                                        This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
                                       items:
                                         type: string
                                       type: array
@@ -3704,7 +3686,7 @@ spec:
                                         pod labels will be ignored. The default value is empty.
                                         The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
                                         Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
-                                        This is an alpha field and requires enabling MatchLabelKeysInPodAffinity feature gate.
+                                        This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
                                       items:
                                         type: string
                                       type: array
@@ -3871,7 +3853,7 @@ spec:
                                     pod labels will be ignored. The default value is empty.
                                     The same key is forbidden to exist in both matchLabelKeys and labelSelector.
                                     Also, matchLabelKeys cannot be set when labelSelector isn't set.
-                                    This is an alpha field and requires enabling MatchLabelKeysInPodAffinity feature gate.
+                                    This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
                                   items:
                                     type: string
                                   type: array
@@ -3886,7 +3868,7 @@ spec:
                                     pod labels will be ignored. The default value is empty.
                                     The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
                                     Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
-                                    This is an alpha field and requires enabling MatchLabelKeysInPodAffinity feature gate.
+                                    This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
                                   items:
                                     type: string
                                   type: array
@@ -4336,7 +4318,7 @@ spec:
                                         pod labels will be ignored. The default value is empty.
                                         The same key is forbidden to exist in both matchLabelKeys and labelSelector.
                                         Also, matchLabelKeys cannot be set when labelSelector isn't set.
-                                        This is an alpha field and requires enabling MatchLabelKeysInPodAffinity feature gate.
+                                        This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
                                       items:
                                         type: string
                                       type: array
@@ -4351,7 +4333,7 @@ spec:
                                         pod labels will be ignored. The default value is empty.
                                         The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
                                         Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
-                                        This is an alpha field and requires enabling MatchLabelKeysInPodAffinity feature gate.
+                                        This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
                                       items:
                                         type: string
                                       type: array
@@ -4518,7 +4500,7 @@ spec:
                                     pod labels will be ignored. The default value is empty.
                                     The same key is forbidden to exist in both matchLabelKeys and labelSelector.
                                     Also, matchLabelKeys cannot be set when labelSelector isn't set.
-                                    This is an alpha field and requires enabling MatchLabelKeysInPodAffinity feature gate.
+                                    This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
                                   items:
                                     type: string
                                   type: array
@@ -4533,7 +4515,7 @@ spec:
                                     pod labels will be ignored. The default value is empty.
                                     The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
                                     Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
-                                    This is an alpha field and requires enabling MatchLabelKeysInPodAffinity feature gate.
+                                    This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
                                   items:
                                     type: string
                                   type: array
@@ -4698,7 +4680,7 @@ spec:
                                         pod labels will be ignored. The default value is empty.
                                         The same key is forbidden to exist in both matchLabelKeys and labelSelector.
                                         Also, matchLabelKeys cannot be set when labelSelector isn't set.
-                                        This is an alpha field and requires enabling MatchLabelKeysInPodAffinity feature gate.
+                                        This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
                                       items:
                                         type: string
                                       type: array
@@ -4713,7 +4695,7 @@ spec:
                                         pod labels will be ignored. The default value is empty.
                                         The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
                                         Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
-                                        This is an alpha field and requires enabling MatchLabelKeysInPodAffinity feature gate.
+                                        This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
                                       items:
                                         type: string
                                       type: array
@@ -4880,7 +4862,7 @@ spec:
                                     pod labels will be ignored. The default value is empty.
                                     The same key is forbidden to exist in both matchLabelKeys and labelSelector.
                                     Also, matchLabelKeys cannot be set when labelSelector isn't set.
-                                    This is an alpha field and requires enabling MatchLabelKeysInPodAffinity feature gate.
+                                    This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
                                   items:
                                     type: string
                                   type: array
@@ -4895,7 +4877,7 @@ spec:
                                     pod labels will be ignored. The default value is empty.
                                     The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
                                     Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
-                                    This is an alpha field and requires enabling MatchLabelKeysInPodAffinity feature gate.
+                                    This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
                                   items:
                                     type: string
                                   type: array
@@ -5448,6 +5430,12 @@ rules:
   - virtualmachines/finalizers
   verbs:
   - update
+- apiGroups:
+  - authentication.k8s.io
+  resources:
+  - tokenreviews
+  verbs:
+  - create
 - apiGroups:
   - authorization.k8s.io
   resources:
@@ -5468,6 +5456,16 @@ rules:
   - get
   - list
   - update
+  - patch
+- nonResourceURLs:
+  - /metrics
+  verbs:
+  - get
+- nonResourceURLs:
+  - /debug/pprof
+  - /debug/pprof/*
+  verbs:
+  - get
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
@@ -5738,27 +5736,27 @@ spec:
         - name: DEPLOY_CLUSTER_RESOURCES
           value: "true"
         - name: OPERATOR_VERSION
-          value: v1.64.0
+          value: v1.66.1
         - name: CONTROLLER_IMAGE
-          value: quay.io/kubevirt/cdi-controller:v1.64.0
+          value: quay.io/kubevirt/cdi-controller:v1.66.1
         - name: IMPORTER_IMAGE
-          value: quay.io/kubevirt/cdi-importer:v1.64.0
+          value: quay.io/kubevirt/cdi-importer:v1.66.1
         - name: CLONER_IMAGE
-          value: quay.io/kubevirt/cdi-cloner:v1.64.0
+          value: quay.io/kubevirt/cdi-cloner:v1.66.1
         - name: OVIRT_POPULATOR_IMAGE
-          value: quay.io/kubevirt/cdi-importer:v1.64.0
+          value: quay.io/kubevirt/cdi-importer:v1.66.1
         - name: APISERVER_IMAGE
-          value: quay.io/kubevirt/cdi-apiserver:v1.64.0
+          value: quay.io/kubevirt/cdi-apiserver:v1.66.1
         - name: UPLOAD_SERVER_IMAGE
-          value: quay.io/kubevirt/cdi-uploadserver:v1.64.0
+          value: quay.io/kubevirt/cdi-uploadserver:v1.66.1
         - name: UPLOAD_PROXY_IMAGE
-          value: quay.io/kubevirt/cdi-uploadproxy:v1.64.0
+          value: quay.io/kubevirt/cdi-uploadproxy:v1.66.1
         - name: VERBOSITY
           value: "1"
         - name: PULL_POLICY
           value: IfNotPresent
         - name: MONITORING_NAMESPACE
-        image: quay.io/kubevirt/cdi-operator:v1.64.0
+        image: quay.io/kubevirt/cdi-operator:v1.66.1
         imagePullPolicy: IfNotPresent
         livenessProbe:
           httpGet:
@@ -5810,12 +5808,12 @@ spec:
         runAsNonRoot: true
       serviceAccountName: cdi-operator
       tolerations:
-       - key: CriticalAddonsOnly
-         operator: Exists
-       - effect: NoSchedule
-         key: node-role.kubernetes.io/control-plane
-         operator: Exists
-       - effect: NoSchedule
-         key: node-role.kubernetes.io/master
-         operator: Exists
----
+      - key: CriticalAddonsOnly
+        operator: Exists
+      - effect: NoSchedule
+        key: node-role.kubernetes.io/control-plane
+        operator: Exists
+      - effect: NoSchedule
+        key: node-role.kubernetes.io/master
+        operator: Exists
+---
\ No newline at end of file
diff --git a/packages/system/kubevirt-cdi-operator/tests/vendored_manifest_test.yaml b/packages/system/kubevirt-cdi-operator/tests/vendored_manifest_test.yaml
new file mode 100644
index 0000000000..f81a95d9bd
--- /dev/null
+++ b/packages/system/kubevirt-cdi-operator/tests/vendored_manifest_test.yaml
@@ -0,0 +1,55 @@
+suite: cozy-kubevirt-cdi-operator vendored manifest
+release:
+  name: kubevirt-cdi-operator
+  namespace: cozy-kubevirt-cdi
+tests:
+  # Addressed by kind rather than by index: the vendored file is one long
+  # document stream and an upstream reorder would slide any index off the
+  # Deployment silently. Not by name, which the ServiceAccount and RBAC objects
+  # share. The selector errors on a second match rather than picking one.
+  - it: runs the cdi-operator image from the pinned release
+    template: cdi-operator.yaml
+    documentSelector:
+      path: kind
+      value: Deployment
+    asserts:
+      # The Makefile's grep ties this tag back to RELEASE. This one says the
+      # tag is on the operator Deployment rather than somewhere in the stream.
+      - equal:
+          path: spec.template.spec.containers[0].image
+          value: quay.io/kubevirt/cdi-operator:v1.66.1
+      # cdi-operator deploys the rest of CDI from its env, so an operator image
+      # that moved while these did not runs two releases at once.
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: OPERATOR_VERSION
+            value: v1.66.1
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: CONTROLLER_IMAGE
+            value: quay.io/kubevirt/cdi-controller:v1.66.1
+      - equal:
+          path: metadata.namespace
+          value: cozy-kubevirt-cdi
+      # Carried by patches/, which `update` re-applies to every download.
+      - exists:
+          path: spec.template.spec.containers[0].startupProbe
+      - contains:
+          path: spec.template.spec.tolerations
+          content:
+            key: CriticalAddonsOnly
+            operator: Exists
+
+  # `any: true` is load-bearing on a negated containsDocument: without it the
+  # assertion reads "not every document is a Namespace", which is true of any
+  # multi-document template and would pin nothing.
+  - it: drops the Namespace object upstream ships
+    template: cdi-operator.yaml
+    asserts:
+      - containsDocument:
+          apiVersion: v1
+          kind: Namespace
+          any: true
+        not: true
diff --git a/packages/system/kubevirt-cdi/.gitignore b/packages/system/kubevirt-cdi/.gitignore
new file mode 100644
index 0000000000..e833a9fee3
--- /dev/null
+++ b/packages/system/kubevirt-cdi/.gitignore
@@ -0,0 +1,3 @@
+# `update` fetches here to check the pin, and keeps the file on a mismatch.
+# The recipe's error text says why.
+/cdi-cr.yaml.download
diff --git a/packages/system/kubevirt-cdi/Makefile b/packages/system/kubevirt-cdi/Makefile
index 709e4880a7..c5dbcfa733 100644
--- a/packages/system/kubevirt-cdi/Makefile
+++ b/packages/system/kubevirt-cdi/Makefile
@@ -1,10 +1,86 @@
 export NAME=kubevirt-cdi
 export NAMESPACE=cozy-$(NAME)
 
+# The CDI release templates/cdi-cr.yaml is reconciled against. Moving to a
+# newer CDI is an edit to this line. What the platform actually deploys is set
+# by ../kubevirt-cdi-operator, so this line does not track that one: it has to
+# be pointed at it by hand, and `update` fails while the two disagree.
+# Deriving this from the sibling manifest instead would end the pin: the point
+# is that a human chooses which release this object is reconciled against, and
+# a computed value hides that choice from the diff. A check leaves the choice
+# here and only refuses to call a stale one current.
+RELEASE = v1.66.1
+
+# sha256 of the cdi-cr.yaml release asset as published. Upstream publishes no
+# checksum for it, so the pin is taken from a download rather than fetched
+# alongside one: it detects an asset that moved under its tag, and it is not
+# authenticity verification.
+CR_SHA256 = a497f90de608c1df26f9ee4095289373f17132d74a2042ca03e00c17c964f8a7
+
+# sha256sum is not everywhere: current macOS carries a native one in /sbin,
+# older releases carry only shasum(1). Both print "<digest>  <path>", so field
+# 1 is the digest whichever gets picked.
+SHA256SUM = $(shell command -v sha256sum >/dev/null 2>&1 && echo sha256sum || echo 'shasum -a 256')
+
 include ../../../hack/package.mk
 
+# Phony because hack/package.mk's .PHONY line lists only the targets that file
+# defines: with none of these names declared, a path named `test`, `update` or
+# `generate` next to this Makefile would make that target up to date and skip
+# the recipe.
+.PHONY: test update generate
+
+# No -r: this package ships no README for cozyvalues-gen to update.
+generate:
+	cozyvalues-gen -v values.yaml -s values.schema.json
+
+# hack/package.mk defines no `test` target and hack/helm-unit-tests.sh only
+# runs a package whose `make -n test` resolves, so a tests/ directory with no
+# `test:` target is collected by nothing and the suite is skipped in silence.
+test:
+	helm unittest .
+
+# templates/cdi-cr.yaml is ours, not upstream's: it adds to upstream's bare CDI
+# object, and what it adds is pinned under tests/ rather than restated here.
+# The delta is a fact about one release and not a standing property of CDI:
+# upstream carried WebhookPvcRendering from v1.63.0 through v1.65.0 and dropped
+# it by v1.66.0, and this object never carried it at all, so the difference ran
+# both ways for three releases and one way after. Re-derive it at each bump
+# instead of inheriting it.
+#
+# So nothing here writes under templates/: fetching the release the object is
+# derived from confirms the bytes still hash to the pin. What that catches is
+# an edit to RELEASE without a matching digest, and an asset that moved under a
+# tag that should be immutable. Moving RELEASE is therefore the step that
+# forces someone to reconcile this object by hand, which is the point. The
+# recipe then compares RELEASE with the cdi-operator image tag that
+# ../kubevirt-cdi-operator vendors, because that package can move to a new
+# release without touching this file, and a success line naming RELEASE would
+# then report a release the platform no longer runs. RELEASE is checked by
+# `update` rather than by `test`, because helm-unittest reads rendered output
+# and this object renders no version string.
 update:
-	rm -rf templates
-	mkdir templates
-	export VERSION=$$(basename $$(curl -s -w %{redirect_url} https://github.com/kubevirt/containerized-data-importer/releases/latest)) && \
-	wget https://github.com/kubevirt/containerized-data-importer/releases/download/$$VERSION/cdi-cr.yaml -O templates/cdi-cr.yaml
+	wget https://github.com/kubevirt/containerized-data-importer/releases/download/$(RELEASE)/cdi-cr.yaml -O cdi-cr.yaml.download || { rm -f cdi-cr.yaml.download; exit 1; }
+	@# Kept on a mismatch rather than deleted; the error below says why.
+	@actual=$$($(SHA256SUM) cdi-cr.yaml.download | awk '{print $$1}'); \
+	if [ "$$actual" != "$(CR_SHA256)" ]; then \
+	  echo "ERROR: cdi-cr.yaml for $(RELEASE) hashed $$actual," >&2; \
+	  echo "       expected $(CR_SHA256). The download is kept as" >&2; \
+	  echo "       cdi-cr.yaml.download." >&2; \
+	  echo "       If RELEASE just moved, diff it against templates/cdi-cr.yaml," >&2; \
+	  echo "       carry over what belongs there and update CR_SHA256. If RELEASE" >&2; \
+	  echo "       did not change, the asset moved under a tag that should be" >&2; \
+	  echo "       immutable: find out why first." >&2; \
+	  exit 1; \
+	fi; \
+	rm -f cdi-cr.yaml.download
+	@deployed=$$(grep -oE 'quay\.io/kubevirt/cdi-operator:[^"[:space:]]+' ../kubevirt-cdi-operator/templates/cdi-operator.yaml | head -n 1); \
+	deployed=$${deployed##*:}; \
+	if [ "$$deployed" != "$(RELEASE)" ]; then \
+	  echo "ERROR: RELEASE is $(RELEASE), but ../kubevirt-cdi-operator vendors" >&2; \
+	  echo "       CDI $${deployed:-<no cdi-operator image found>}, and that package decides what the" >&2; \
+	  echo "       platform deploys. Reconcile templates/cdi-cr.yaml against the" >&2; \
+	  echo "       release it vendors, then move RELEASE and CR_SHA256 to it." >&2; \
+	  exit 1; \
+	fi
+	@echo "upstream cdi-cr.yaml for $(RELEASE) matches the pin; templates/cdi-cr.yaml is maintained by hand and was left alone."
diff --git a/packages/system/kubevirt-cdi/templates/cdi-cr.yaml b/packages/system/kubevirt-cdi/templates/cdi-cr.yaml
index 7dc15ee0a8..21d67b3537 100644
--- a/packages/system/kubevirt-cdi/templates/cdi-cr.yaml
+++ b/packages/system/kubevirt-cdi/templates/cdi-cr.yaml
@@ -3,14 +3,24 @@ kind: CDI
 metadata:
   name: cdi
 spec:
-  cloneStrategyOverride: csi-clone
+  {{- with .Values.cloneStrategyOverride }}
+  cloneStrategyOverride: {{ quote . }}
+  {{- end }}
   config:
     {{- with .Values.uploadProxyURL }}
     uploadProxyURLOverride: {{ quote . }}
     {{- end }}
     featureGates:
     - HonorWaitForFirstConsumer
-    - ExpandDisks
+    # Resources for every worker pod CDI creates -- importer, uploader and
+    # host-assisted cloner alike, not only the importer the name suggests. The
+    # default below restates CDI's own built-in values, so an unset
+    # importerResources changes nothing; it exists so a lane or an operator can
+    # raise the ceiling where a specific import needs it. Note this has to be set
+    # here on the CDI CR: the operator reconciles CDIConfig.spec from this
+    # resource, so patching CDIConfig directly is silently reverted.
+    podResourceRequirements:
+      {{- toYaml .Values.importerResources | nindent 6 }}
   imagePullPolicy: IfNotPresent
   infra:
     nodeSelector:
diff --git a/packages/system/kubevirt-cdi/tests/clone_strategy_test.yaml b/packages/system/kubevirt-cdi/tests/clone_strategy_test.yaml
new file mode 100644
index 0000000000..904b01541a
--- /dev/null
+++ b/packages/system/kubevirt-cdi/tests/clone_strategy_test.yaml
@@ -0,0 +1,66 @@
+suite: cozy-kubevirt-cdi clone strategy
+release:
+  name: kubevirt-cdi
+  namespace: cozy-kubevirt-cdi
+tests:
+  # The CRD enum takes copy, snapshot and csi-clone and carries no empty
+  # member, so the only way to ask CDI for its own per-StorageProfile choice
+  # is for the field to be absent. An empty value used to render
+  # cloneStrategyOverride: "", which that enum does not accept; this pins
+  # against it coming back.
+  - it: omits the field when no strategy is configured
+    template: cdi-cr.yaml
+    documentSelector:
+      path: kind
+      value: CDI
+      matchMany: false
+    set:
+      cloneStrategyOverride: ""
+    asserts:
+      - notExists:
+          path: spec.cloneStrategyOverride
+
+  # An operator writing `cloneStrategyOverride: ~` by hand is a separate input
+  # from the empty string, and it used to render a bare key. It reaches the
+  # same falsy branch of `with`, but that is a claim about behaviour, so it is
+  # pinned rather than argued. The case cannot pass vacuously: were the null
+  # not reaching the template, the chart default would render csi-clone here
+  # and the assertion below would fail.
+  - it: omits the field when the strategy is null
+    template: cdi-cr.yaml
+    documentSelector:
+      path: kind
+      value: CDI
+      matchMany: false
+    set:
+      cloneStrategyOverride: null
+    asserts:
+      - notExists:
+          path: spec.cloneStrategyOverride
+
+  - it: keeps the chart default
+    template: cdi-cr.yaml
+    documentSelector:
+      path: kind
+      value: CDI
+      matchMany: false
+    asserts:
+      - equal:
+          path: spec.cloneStrategyOverride
+          value: csi-clone
+
+  # The other direction: a configured value still has to reach the CR verbatim.
+  # A test that only covered the empty case would pass against a template that
+  # dropped the field unconditionally.
+  - it: passes a configured strategy through unchanged
+    template: cdi-cr.yaml
+    documentSelector:
+      path: kind
+      value: CDI
+      matchMany: false
+    set:
+      cloneStrategyOverride: snapshot
+    asserts:
+      - equal:
+          path: spec.cloneStrategyOverride
+          value: snapshot
diff --git a/packages/system/kubevirt-cdi/tests/importer-resources_test.yaml b/packages/system/kubevirt-cdi/tests/importer-resources_test.yaml
new file mode 100644
index 0000000000..bf3ba72a41
--- /dev/null
+++ b/packages/system/kubevirt-cdi/tests/importer-resources_test.yaml
@@ -0,0 +1,63 @@
+suite: CDI importer worker resources
+
+# podResourceRequirements applies to every worker pod CDI creates -- importer,
+# uploader and host-assisted cloner -- so the chart default here must restate
+# CDI's own built-in values and not change them. A cluster that needs more
+# headroom raises it through its own Package values; the container E2E lane does
+# exactly that in hack/e2e-platform-packages.sh, and hack/platform-packages_test.bats
+# pins that override.
+#
+# Note this must be set on the CDI CR, not on CDIConfig: the CDI operator
+# reconciles CDIConfig.spec from this CR, so patching CDIConfig directly is
+# silently reverted.
+
+templates:
+  - templates/cdi-cr.yaml
+
+set:
+  _cluster:
+    root-host: example.org
+
+tests:
+  - it: the chart default restates CDI's own built-in requirements
+    template: templates/cdi-cr.yaml
+    # Selected by kind rather than by index: this template emits three
+    # documents and the CDI CR is not the one helm prints first, so an index
+    # here would silently point at a ClusterRole after any reordering.
+    documentSelector:
+      path: kind
+      value: CDI
+    asserts:
+      - equal:
+          path: spec.config.podResourceRequirements.limits.memory
+          value: 600M
+      - equal:
+          path: spec.config.podResourceRequirements.limits.cpu
+          value: 750m
+      - equal:
+          path: spec.config.podResourceRequirements.requests.memory
+          value: 60M
+      - equal:
+          path: spec.config.podResourceRequirements.requests.cpu
+          value: 100m
+
+  - it: importer resources are overridable
+    template: templates/cdi-cr.yaml
+    documentSelector:
+      path: kind
+      value: CDI
+    set:
+      importerResources:
+        requests:
+          cpu: 100m
+          memory: 256Mi
+        limits:
+          cpu: 750m
+          memory: 4Gi
+    asserts:
+      - equal:
+          path: spec.config.podResourceRequirements.limits.memory
+          value: 4Gi
+      - equal:
+          path: spec.config.podResourceRequirements.requests.memory
+          value: 256Mi
diff --git a/packages/system/kubevirt-cdi/tests/local_templates_test.yaml b/packages/system/kubevirt-cdi/tests/local_templates_test.yaml
new file mode 100644
index 0000000000..45373babf8
--- /dev/null
+++ b/packages/system/kubevirt-cdi/tests/local_templates_test.yaml
@@ -0,0 +1,156 @@
+suite: cozy-kubevirt-cdi local templates
+release:
+  name: kubevirt-cdi
+  namespace: cozy-kubevirt-cdi
+# Both route cases run against this block; the TLSRoute case overrides the
+# gate alone. Emission is gated on expose-services and gateway-enabled, so
+# without a matching expose-services entry neither route renders and both
+# fail on "no manifest found" rather than on the assertion they are about.
+# root-host is not part of that gate and no assertion reads it: it is set
+# because the hostname is built from it, and without it the TLSRoute renders
+# "cdi-uploadproxy.%!s(<nil>)". tests/standalone_render_test.yaml covers the
+# opposite case, that the chart renders with nothing injected at all.
+set:
+  _cluster:
+    root-host: example.com
+    expose-services: cdi-uploadproxy
+    gateway-enabled: "false"
+tests:
+  # Each list and map is pinned whole rather than by membership or by leaf:
+  # `contains` answers "is ours still here" and cannot answer "has anything
+  # been added beside it", and an assert per leaf cannot answer "has a key
+  # appeared". Both directions matter for a file whose whole maintenance model
+  # is a hand reconciliation at each bump.
+  - it: keeps the local additions to the CDI object
+    template: cdi-cr.yaml
+    documentSelector:
+      path: kind
+      value: CDI
+      matchMany: false
+    asserts:
+      - equal:
+          path: spec.infra.tolerations
+          value:
+            - key: CriticalAddonsOnly
+              operator: Exists
+      - equal:
+          path: spec.config.podResourceRequirements
+          value:
+            limits:
+              cpu: 750m
+              memory: 600M
+            requests:
+              cpu: 100m
+              memory: 60M
+
+  # The list upstream ships, and nothing added to it. CDI looks a gate up by
+  # exact name and ignores one it does not declare, so a KubeVirt gate such as
+  # ExpandDisks listed here is accepted and has no effect, and nothing on the
+  # cluster rejects it.
+  - it: enables only the feature gate upstream ships
+    template: cdi-cr.yaml
+    documentSelector:
+      path: kind
+      value: CDI
+      matchMany: false
+    asserts:
+      - equal:
+          path: spec.config.featureGates
+          value:
+            - HonorWaitForFirstConsumer
+
+  # The default is the empty string, so the block renders nothing and an
+  # assertion on the default value would pass against a template that had
+  # stopped rendering the block. Setting it is what makes this able to fail.
+  - it: renders the upload-proxy URL override when one is set
+    template: cdi-cr.yaml
+    documentSelector:
+      path: kind
+      value: CDI
+      matchMany: false
+    set:
+      uploadProxyURL: https://cdi-uploadproxy.example.com
+    asserts:
+      - equal:
+          path: spec.config.uploadProxyURLOverride
+          value: https://cdi-uploadproxy.example.com
+
+  # What lets a tenant service account clone from the golden-image namespace.
+  # `any: true` on both: a bare containsDocument holds every document in the
+  # template to the match, and this template renders three.
+  - it: keeps the golden-image clone RBAC
+    template: cdi-cr.yaml
+    asserts:
+      - containsDocument:
+          apiVersion: rbac.authorization.k8s.io/v1
+          kind: ClusterRole
+          name: cdi-copy-dv
+          any: true
+      - containsDocument:
+          apiVersion: rbac.authorization.k8s.io/v1
+          kind: RoleBinding
+          name: cdi-clone-dv
+          namespace: cozy-public
+          any: true
+
+  # containsDocument reaches this document's identity and nothing inside it,
+  # so what the role grants needs a case of its own. Widening verbs to ["*"]
+  # hands every service account in the cluster whatever the binding reaches.
+  - it: grants create on datavolumes/source and nothing else
+    template: cdi-cr.yaml
+    documentSelector:
+      path: metadata.name
+      value: cdi-copy-dv
+    asserts:
+      - equal:
+          path: rules
+          value:
+            - apiGroups:
+                - cdi.kubevirt.io
+              resources:
+                - datavolumes/source
+              verbs:
+                - create
+
+  # roleRef and subjects decide who may clone out of cozy-public, so each is
+  # pinned whole rather than field by field. An assert on subjects[0] answers
+  # "was the Group replaced by something narrower" and cannot answer "was a
+  # second subject appended", and appending is the direction that widens
+  # access: pinning the list is what makes both reachable.
+  - it: binds exactly the service-account Group to the copy role
+    template: cdi-cr.yaml
+    documentSelector:
+      path: metadata.name
+      value: cdi-clone-dv
+    asserts:
+      - equal:
+          path: roleRef
+          value:
+            kind: ClusterRole
+            name: cdi-copy-dv
+            apiGroup: rbac.authorization.k8s.io
+      - equal:
+          path: subjects
+          value:
+            - kind: Group
+              name: system:serviceaccounts
+              apiGroup: rbac.authorization.k8s.io
+
+  # Addressed as a `template:` because helm-unittest fails outright on one it
+  # cannot find, which makes a deleted file loud rather than a smaller render.
+  - it: renders the upload-proxy Ingress when the gateway is off
+    template: cdi-uploadproxy-ingress.yaml
+    asserts:
+      - equal:
+          path: metadata.annotations["nginx.ingress.kubernetes.io/ssl-passthrough"]
+          value: "true"
+
+  - it: renders the upload-proxy TLSRoute when the gateway is on
+    template: cdi-uploadproxy-tlsroute.yaml
+    set:
+      _cluster:
+        gateway-enabled: "true"
+    asserts:
+      - equal:
+          path: spec.parentRefs[0].sectionName
+          value: tls-cdi-uploadproxy
diff --git a/packages/system/kubevirt-cdi/tests/standalone_render_test.yaml b/packages/system/kubevirt-cdi/tests/standalone_render_test.yaml
new file mode 100644
index 0000000000..656c7d2fc6
--- /dev/null
+++ b/packages/system/kubevirt-cdi/tests/standalone_render_test.yaml
@@ -0,0 +1,57 @@
+suite: kubevirt-cdi renders with no platform values injected
+release:
+  name: kubevirt-cdi
+  namespace: cozy-kubevirt-cdi
+
+# The platform injects _cluster through the cozystack-values Secret, so every
+# case that sets it itself renders fine whether or not values.yaml declares
+# the key. This case supplies nothing. Drop the declaration from values.yaml
+# and the render dies on "index of untyped nil" before a single assert runs;
+# the declaration is the only thing keeping the chart renderable outside a
+# cluster. No suite-level `templates:` list here on purpose: it would narrow
+# the render to the listed files and let a later template reintroduce the
+# same breakage unseen.
+
+tests:
+  - it: exposes no cdi-uploadproxy route when _cluster is absent
+    asserts:
+      - template: templates/cdi-uploadproxy-ingress.yaml
+        hasDocuments:
+          count: 0
+      - template: templates/cdi-uploadproxy-tlsroute.yaml
+        hasDocuments:
+          count: 0
+
+  # Counterpart to the case above: with _cluster populated the way the
+  # platform populates it, both routes have to appear. Without this the
+  # suite only ever asserts absence, and a template that stopped rendering
+  # under every input would still satisfy it.
+  - it: exposes the uploadproxy ingress once _cluster selects the service
+    set:
+      _cluster:
+        root-host: example.com
+        expose-services: cdi-uploadproxy
+        gateway-enabled: "false"
+    asserts:
+      - template: templates/cdi-uploadproxy-ingress.yaml
+        equal:
+          path: spec.rules[0].host
+          value: cdi-uploadproxy.example.com
+      - template: templates/cdi-uploadproxy-tlsroute.yaml
+        hasDocuments:
+          count: 0
+
+  - it: swaps the ingress for a TLSRoute when the gateway is enabled
+    set:
+      _cluster:
+        root-host: example.com
+        expose-services: cdi-uploadproxy
+        gateway-enabled: "true"
+    asserts:
+      - template: templates/cdi-uploadproxy-tlsroute.yaml
+        equal:
+          path: spec.hostnames[0]
+          value: cdi-uploadproxy.example.com
+      - template: templates/cdi-uploadproxy-ingress.yaml
+        hasDocuments:
+          count: 0
diff --git a/packages/system/kubevirt-cdi/tests/values_schema_test.yaml b/packages/system/kubevirt-cdi/tests/values_schema_test.yaml
new file mode 100644
index 0000000000..b27a6e9478
--- /dev/null
+++ b/packages/system/kubevirt-cdi/tests/values_schema_test.yaml
@@ -0,0 +1,81 @@
+suite: cozy-kubevirt-cdi values schema
+release:
+  name: kubevirt-cdi
+  namespace: cozy-kubevirt-cdi
+templates:
+  - cdi-cr.yaml
+tests:
+  # The CDI CRD rejects anything outside its enum, but only when the object is
+  # applied, so without the schema a typo surfaces as a failed HelmRelease
+  # rather than at the value that caused it.
+  - it: refuses a clone strategy CDI does not know
+    set:
+      cloneStrategyOverride: csi_clone
+    asserts:
+      - failedTemplate:
+          errorPattern: "cloneStrategyOverride.*does not match pattern"
+
+  - it: refuses a clone strategy that is not a string
+    set:
+      cloneStrategyOverride: 1
+    asserts:
+      - failedTemplate:
+          errorPattern: "cloneStrategyOverride.*want string"
+
+  # The empty string is the chart's own "omit the field" state, which the
+  # CRD enum has no member for: copying that enum into the schema would
+  # refuse it.
+  - it: accepts the empty clone strategy
+    set:
+      cloneStrategyOverride: ""
+    asserts:
+      - notFailedTemplate: {}
+
+  - it: accepts copy
+    set:
+      cloneStrategyOverride: copy
+    asserts:
+      - notFailedTemplate: {}
+
+  - it: accepts snapshot
+    set:
+      cloneStrategyOverride: snapshot
+    asserts:
+      - notFailedTemplate: {}
+
+  - it: accepts csi-clone
+    set:
+      cloneStrategyOverride: csi-clone
+    asserts:
+      - notFailedTemplate: {}
+
+  # The key has a chart default, so Helm drops a null for it before it
+  # validates, and the template sees it unset; tests/clone_strategy_test.yaml
+  # pins what that renders. Without the default, the null would reach the
+  # schema and be refused.
+  - it: accepts a null clone strategy
+    set:
+      cloneStrategyOverride: null
+    asserts:
+      - notFailedTemplate: {}
+
+  - it: accepts any string as the upload proxy URL
+    set:
+      uploadProxyURL: cdi-uploadproxy.example.com:8443
+    asserts:
+      - notFailedTemplate: {}
+
+  - it: refuses an upload proxy URL that is not a string
+    set:
+      uploadProxyURL:
+        host: cdi-uploadproxy.example.com
+    asserts:
+      - failedTemplate:
+          errorPattern: "uploadProxyURL.*want string"
+
+  - it: refuses importer resources that are not a map
+    set:
+      importerResources: 600M
+    asserts:
+      - failedTemplate:
+          errorPattern: "importerResources.*want object"
diff --git a/packages/system/kubevirt-cdi/values.schema.json b/packages/system/kubevirt-cdi/values.schema.json
new file mode 100644
index 0000000000..a750e3a18f
--- /dev/null
+++ b/packages/system/kubevirt-cdi/values.schema.json
@@ -0,0 +1,32 @@
+{
+  "title": "Chart Values",
+  "type": "object",
+  "properties": {
+    "uploadProxyURL": {
+      "description": "Upload proxy URL, set as uploadProxyURLOverride on the CDI object. Empty leaves it unset.",
+      "type": "string",
+      "default": ""
+    },
+    "cloneStrategyOverride": {
+      "description": "Strategy CDI uses to clone DataVolumes (golden image -\u003e VM disk): csi-clone, snapshot, copy, or empty.",
+      "type": "string",
+      "default": "csi-clone",
+      "pattern": "^(|copy|snapshot|csi-clone)$"
+    },
+    "importerResources": {
+      "description": "Resources for CDI's importer/uploader/cloner worker pods.",
+      "type": "object",
+      "default": {
+        "limits": {
+          "cpu": "750m",
+          "memory": "600M"
+        },
+        "requests": {
+          "cpu": "100m",
+          "memory": "60M"
+        }
+      },
+      "x-kubernetes-preserve-unknown-fields": true
+    }
+  }
+}
diff --git a/packages/system/kubevirt-cdi/values.yaml b/packages/system/kubevirt-cdi/values.yaml
index bd9e604a0c..93c02f4a5b 100644
--- a/packages/system/kubevirt-cdi/values.yaml
+++ b/packages/system/kubevirt-cdi/values.yaml
@@ -1 +1,34 @@
+# Injected by the platform from the cozystack-values Secret. The empty
+# default keeps the chart renderable on its own, outside a cluster.
+_cluster: {}
+
+## @param {string} [uploadProxyURL] - Upload proxy URL, set as uploadProxyURLOverride on the CDI object. Empty leaves it unset.
 uploadProxyURL: ""
+
+## @param {string} [cloneStrategyOverride] - Strategy CDI uses to clone DataVolumes (golden image -> VM disk): csi-clone, snapshot, copy, or empty.
+## @pattern ^(|copy|snapshot|csi-clone)$
+## Empty omits the field, leaving CDI to pick a strategy per StorageProfile.
+## That is why this is a pattern and not an enum copied from the CDI CRD: the
+## CRD has no empty member, and cozyvalues-gen cannot emit an empty @value.
+cloneStrategyOverride: csi-clone
+
+## @param {object} [importerResources] - Resources for CDI's importer/uploader/cloner worker pods.
+## Applied as CDIConfig.podResourceRequirements. The defaults below restate CDI's own
+## built-in values rather than changing them: leaving this unset must not move
+## production behaviour. Raise the memory ceiling only where an import is shown to
+## need it -- a decompress+convert of a large compressed image can exceed 600M near
+## the end, and CDI then retries from scratch rather than failing, so the DataVolume
+## cycles at ~100% instead of erroring. Limits are ceilings and not reservations, so
+## raising one lets N concurrent imports on a node claim N times the ceiling against
+## much smaller requests; raise the request alongside it where imports run parallel.
+##
+## NOTE: patching the CDIConfig object directly does NOT work -- the CDI operator
+## reconciles CDIConfig.spec from the CDI CR, so a direct patch is silently reverted
+## and .status.defaultPodResourceRequirements stays at the old value.
+importerResources:
+  requests:
+    cpu: 100m
+    memory: 60M
+  limits:
+    cpu: 750m
+    memory: 600M
diff --git a/packages/system/kubevirt-csi-node/Makefile b/packages/system/kubevirt-csi-node/Makefile
new file mode 100644
index 0000000000..fa2bd77d31
--- /dev/null
+++ b/packages/system/kubevirt-csi-node/Makefile
@@ -0,0 +1,4 @@
+.PHONY: test
+
+test:
+	helm unittest .
diff --git a/packages/system/kubevirt-csi-node/templates/deploy.yaml b/packages/system/kubevirt-csi-node/templates/deploy.yaml
index 4e95bf77de..441a24e42e 100644
--- a/packages/system/kubevirt-csi-node/templates/deploy.yaml
+++ b/packages/system/kubevirt-csi-node/templates/deploy.yaml
@@ -196,12 +196,19 @@ spec:
             timeoutSeconds: 3
             periodSeconds: 10
             failureThreshold: 5
+          # Limits, not just requests: a memory limit is what sets memory.max on
+          # the pod cgroup, and the Talos userspace OOM handler (v1.12+) only
+          # ever kills cgroups that lack one. Requests alone left this DaemonSet
+          # an eviction candidate on every node whatever caused the pressure.
+          # Every container in the pod needs one for the pod cgroup to get it.
           resources:
             requests:
               memory: 50Mi
               cpu: 10m
+            limits:
+              memory: 512Mi
         - name: csi-node-driver-registrar
-          image: quay.io/openshift/origin-csi-node-driver-registrar:latest
+          image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.17.0
           args:
             - "--csi-address=$(ADDRESS)"
             - "--kubelet-registration-path=$(DRIVER_REG_SOCK_PATH)"
@@ -224,8 +231,10 @@ spec:
             requests:
               memory: 20Mi
               cpu: 5m
+            limits:
+              memory: 128Mi
         - name: csi-liveness-probe
-          image: quay.io/openshift/origin-csi-livenessprobe:latest
+          image: registry.k8s.io/sig-storage/livenessprobe:v2.17.0
           args:
             - "--csi-address=/csi/csi.sock"
             - "--probe-timeout=3s"
@@ -237,6 +246,8 @@ spec:
             requests:
               memory: 20Mi
               cpu: 5m
+            limits:
+              memory: 128Mi
       volumes:
         - name: kubelet-dir
           hostPath:
@@ -266,15 +277,19 @@ metadata:
 data:
   infraClusterNamespace: 
   infraClusterLabels: csi-driver/cluster=tenant
+{{- range $name, $m := .Values.storageClasses }}
 ---
 apiVersion: storage.k8s.io/v1
 kind: StorageClass
 metadata:
-  name: kubevirt
+  name: {{ $name | quote }}
+  {{- if $m.default }}
   annotations:
     storageclass.kubernetes.io/is-default-class: "true"
+  {{- end }}
 provisioner: csi.kubevirt.io
 allowVolumeExpansion: true
 parameters:
-  infraStorageClassName: {{ .Values.storageClass }}
+  infraStorageClassName: {{ $m.infraStorageClass | quote }}
   bus: scsi
+{{- end }}
diff --git a/packages/system/kubevirt-csi-node/tests/daemonset_resources_test.yaml b/packages/system/kubevirt-csi-node/tests/daemonset_resources_test.yaml
new file mode 100644
index 0000000000..6c3bf5368d
--- /dev/null
+++ b/packages/system/kubevirt-csi-node/tests/daemonset_resources_test.yaml
@@ -0,0 +1,48 @@
+suite: csi-node DaemonSet memory limits
+
+# The node DaemonSet carried requests but no limits, which leaves it Burstable
+# rather than Guaranteed-of-a-cgroup-limit: a memory limit is what sets
+# memory.max on the pod cgroup, and the Talos userspace OOM handler (v1.12+)
+# only ever selects cgroups that lack it. Requests alone did not take the pod
+# out of the victim set.
+#
+# memory.max lands on the POD cgroup only when EVERY container has a limit, so
+# all three are asserted rather than the driver alone — one limit-free sidecar
+# would put the whole pod back in the victim set while the other two assertions
+# still passed, which is precisely the failure this suite exists to catch.
+
+templates:
+  - templates/deploy.yaml
+
+tests:
+  - it: every csi-node container declares a memory limit
+    documentSelector:
+      path: kind
+      value: DaemonSet
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[?(@.name=="csi-driver")].resources.limits.memory
+          value: 512Mi
+      - equal:
+          path: spec.template.spec.containers[?(@.name=="csi-node-driver-registrar")].resources.limits.memory
+          value: 128Mi
+      - equal:
+          path: spec.template.spec.containers[?(@.name=="csi-liveness-probe")].resources.limits.memory
+          value: 128Mi
+
+  # Pinned alongside the limits because they are what the limits were sized
+  # against; a drift in either direction is worth catching.
+  - it: csi-node containers keep their memory requests
+    documentSelector:
+      path: kind
+      value: DaemonSet
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[?(@.name=="csi-driver")].resources.requests.memory
+          value: 50Mi
+      - equal:
+          path: spec.template.spec.containers[?(@.name=="csi-node-driver-registrar")].resources.requests.memory
+          value: 20Mi
+      - equal:
+          path: spec.template.spec.containers[?(@.name=="csi-liveness-probe")].resources.requests.memory
+          value: 20Mi
diff --git a/packages/system/kubevirt-csi-node/tests/sidecar_images_test.yaml b/packages/system/kubevirt-csi-node/tests/sidecar_images_test.yaml
new file mode 100644
index 0000000000..cab55bae92
--- /dev/null
+++ b/packages/system/kubevirt-csi-node/tests/sidecar_images_test.yaml
@@ -0,0 +1,17 @@
+suite: csi-node sidecar images
+
+templates:
+  - templates/deploy.yaml
+
+tests:
+  - it: pins upstream CSI sidecars to versioned release tags
+    documentSelector:
+      path: kind
+      value: DaemonSet
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[?(@.name=="csi-node-driver-registrar")].image
+          value: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.17.0
+      - equal:
+          path: spec.template.spec.containers[?(@.name=="csi-liveness-probe")].image
+          value: registry.k8s.io/sig-storage/livenessprobe:v2.17.0
diff --git a/packages/system/kubevirt-csi-node/tests/storageclasses_test.yaml b/packages/system/kubevirt-csi-node/tests/storageclasses_test.yaml
new file mode 100644
index 0000000000..9ca9a8e592
--- /dev/null
+++ b/packages/system/kubevirt-csi-node/tests/storageclasses_test.yaml
@@ -0,0 +1,81 @@
+suite: tenant StorageClass rendering
+
+templates:
+  - templates/deploy.yaml
+
+tests:
+  - it: renders default replicated (default) and kubevirt alias (non-default)
+    asserts:
+      - equal:
+          path: provisioner
+          value: csi.kubevirt.io
+        documentSelector:
+          path: metadata.name
+          value: replicated
+      - equal:
+          path: parameters.infraStorageClassName
+          value: replicated
+        documentSelector:
+          path: metadata.name
+          value: replicated
+      - equal:
+          path: parameters.bus
+          value: scsi
+        documentSelector:
+          path: metadata.name
+          value: replicated
+      - equal:
+          path: metadata.annotations["storageclass.kubernetes.io/is-default-class"]
+          value: "true"
+        documentSelector:
+          path: metadata.name
+          value: replicated
+      - notExists:
+          path: metadata.annotations
+        documentSelector:
+          path: metadata.name
+          value: kubevirt
+
+  - it: renders one StorageClass per entry with exactly one default
+    set:
+      storageClasses:
+        replicated:
+          infraStorageClass: replicated
+          default: true
+        fast:
+          infraStorageClass: nvme
+          default: false
+        kubevirt:
+          infraStorageClass: replicated
+          default: false
+    asserts:
+      - equal:
+          path: parameters.infraStorageClassName
+          value: nvme
+        documentSelector:
+          path: metadata.name
+          value: fast
+      - notExists:
+          path: metadata.annotations
+        documentSelector:
+          path: metadata.name
+          value: fast
+      - equal:
+          path: metadata.annotations["storageclass.kubernetes.io/is-default-class"]
+          value: "true"
+        documentSelector:
+          path: metadata.name
+          value: replicated
+      - notExists:
+          path: metadata.annotations
+        documentSelector:
+          path: metadata.name
+          value: kubevirt
+
+  - it: leaves the driver-config ConfigMap free of any enforcement allowList
+    asserts:
+      - notExists:
+          path: data.infraStorageClassEnforcement
+        documentSelector:
+          path: metadata.name
+          value: driver-config
diff --git a/packages/system/kubevirt-csi-node/values.yaml b/packages/system/kubevirt-csi-node/values.yaml
index 0ce28aa75d..a14e51bbdd 100644
--- a/packages/system/kubevirt-csi-node/values.yaml
+++ b/packages/system/kubevirt-csi-node/values.yaml
@@ -1,3 +1,12 @@
-storageClass: replicated
+# Map of tenant StorageClasses to create, keyed by name. Normally populated by
+# the parent kubernetes chart from remote-accessible LINSTOR infra classes; the
+# default below is the fallback used for `helm template` / unit tests.
+storageClasses:
+  replicated:
+    infraStorageClass: replicated
+    default: true
+  kubevirt:
+    infraStorageClass: replicated
+    default: false
 csiDriver:
-  image: ghcr.io/cozystack/cozystack/kubevirt-csi-driver:0.0.0@sha256:59681800662c67f989c03c6a727d437e5fc4e85769475cef0472b2a5292f2a6f
+  image: ghcr.io/cozystack/cozystack/kubevirt-csi-driver:v1.6.0@sha256:d6326e343c7932ce3d375c6742b9b9745090a4a26bf5bbc5ad19f5504ea93d65
diff --git a/packages/system/kubevirt-operator/.gitignore b/packages/system/kubevirt-operator/.gitignore
new file mode 100644
index 0000000000..257bd46c36
--- /dev/null
+++ b/packages/system/kubevirt-operator/.gitignore
@@ -0,0 +1,3 @@
+# `update` fetches and transforms here before moving the result into
+# templates/. A run that dies between those steps leaves the file behind.
+kubevirt-operator.yaml.download
diff --git a/packages/system/kubevirt-operator/Makefile b/packages/system/kubevirt-operator/Makefile
index 9aeb6de1a1..b959c8c9d2 100644
--- a/packages/system/kubevirt-operator/Makefile
+++ b/packages/system/kubevirt-operator/Makefile
@@ -1,13 +1,63 @@
 export NAME=kubevirt-operator
 export NAMESPACE=cozy-kubevirt
 
+# The KubeVirt release whose operator manifest is vendored under templates/.
+#
+# A live migration onto the new virt-launcher can fail on virtio feature bits
+# whenever its QEMU build moves at all, major or not (kubevirt/kubevirt#16386
+# broke on qemu-kvm 9.1.0-19 to 9.1.0-20): test one before moving RELEASE.
+RELEASE = v1.9.0
+
+# sha256 of the kubevirt-operator.yaml release asset as published, measured
+# before the two transforms below run over it. Upstream signs the source
+# tarball and publishes no checksum for this generated manifest, so the pin is
+# taken from a download rather than fetched alongside one. It therefore detects
+# an asset that moved under its tag; it is not authenticity verification.
+MANIFEST_SHA256 = f11307caafc3c23ffedf9887d8beb5a4419e2694da242fa68f63d1ec820de2e0
+
+# sha256sum is not everywhere: current macOS carries a native one in /sbin,
+# older releases carry only shasum(1). Both print "<digest>  <path>", so field
+# 1 is the digest whichever gets picked. The rest of `update` needs GNU sed and
+# gawk regardless, so this alone does not make the recipe portable.
+SHA256SUM := $(shell command -v sha256sum >/dev/null 2>&1 && echo sha256sum || echo 'shasum -a 256')
+
 include ../../../hack/package.mk
 
+# Phony because hack/package.mk's .PHONY line lists only the targets that file
+# defines, and hack/package-mk-phony.bats pins the omission of `test`: without
+# this, a path named `test` next to this Makefile would make the target up to
+# date and skip the recipe.
+.PHONY: test
+test:
+	helm unittest .
+	@# Nothing else ties RELEASE to the tree, because helm-unittest reads the
+	@# vendored file and cannot see this variable. Without this check a pin
+	@# bumped without re-running `update` leaves every assertion green against
+	@# the old release.
+	@if ! grep -q 'image: quay.io/kubevirt/virt-operator:$(RELEASE)$$' templates/kubevirt-operator.yaml; then \
+	  echo "ERROR: templates/kubevirt-operator.yaml carries no virt-operator image at $(RELEASE). Re-run 'make update'." >&2; \
+	  exit 1; \
+	fi
+
 update:
-	rm -rf templates
-	mkdir templates
-	# v1.7.0 blocked by https://github.com/kubevirt/kubevirt/issues/16386
-	export RELEASE=v1.8.2 && \
-	wget https://github.com/kubevirt/kubevirt/releases/download/$${RELEASE}/kubevirt-operator.yaml -O templates/kubevirt-operator.yaml && \
-	sed -i 's/namespace: kubevirt/namespace: $(NAMESPACE)/g' templates/kubevirt-operator.yaml
-	awk -i inplace -v RS="---" '!/kind: Namespace/{printf "%s", $$0 RS}' templates/kubevirt-operator.yaml
+	mkdir -p templates
+	@# Helm renders every file under templates/, and that directory also holds
+	@# prometheusrule.yaml, which is ours rather than upstream's. So the
+	@# download is verified and transformed where Helm cannot see it and moved
+	@# in once, finished: a refresh that fails at any step leaves the vendored
+	@# copy as it was rather than half-replaced.
+	wget https://github.com/kubevirt/kubevirt/releases/download/$(RELEASE)/kubevirt-operator.yaml -O kubevirt-operator.yaml.download || { rm -f kubevirt-operator.yaml.download; exit 1; }
+	@actual=$$($(SHA256SUM) kubevirt-operator.yaml.download | awk '{print $$1}'); \
+	if [ "$$actual" != "$(MANIFEST_SHA256)" ]; then \
+	  rm -f kubevirt-operator.yaml.download; \
+	  echo "ERROR: kubevirt-operator.yaml for $(RELEASE) hashed $$actual," >&2; \
+	  echo "       expected $(MANIFEST_SHA256). Nothing was written." >&2; \
+	  echo "       Moving to a new release starts from RELEASE, MANIFEST_SHA256 and" >&2; \
+	  echo "       the version expectations under tests/. If RELEASE did not" >&2; \
+	  echo "       change, the asset moved under a tag that should be immutable:" >&2; \
+	  echo "       find out why before pasting the new digest." >&2; \
+	  exit 1; \
+	fi
+	sed -i 's/namespace: kubevirt/namespace: $(NAMESPACE)/g' kubevirt-operator.yaml.download
+	awk -i inplace -v RS="---" '!/kind: Namespace/{printf "%s", $$0 RS}' kubevirt-operator.yaml.download
+	mv kubevirt-operator.yaml.download templates/kubevirt-operator.yaml
diff --git a/packages/system/kubevirt-operator/templates/kubevirt-operator.yaml b/packages/system/kubevirt-operator/templates/kubevirt-operator.yaml
index 8d73f98226..47ea1584ff 100644
--- a/packages/system/kubevirt-operator/templates/kubevirt-operator.yaml
+++ b/packages/system/kubevirt-operator/templates/kubevirt-operator.yaml
@@ -359,6 +359,33 @@ spec:
                         nullable: true
                         type: boolean
                     type: object
+                  confidentialCompute:
+                    description: QGS configuration for attestation on the Intel TDX
+                      Platform
+                    nullable: true
+                    properties:
+                      tdx:
+                        description: TDX configuration for attestation on the Intel
+                          TDX Platform
+                        nullable: true
+                        properties:
+                          attestation:
+                            description: QGSConfiguration holds QGS configuration
+                            properties:
+                              enforced:
+                                default: false
+                                description: Indicates whether TDX VM should enforce
+                                  the existence of QGS (required for attestation)
+                                  to be scheduled
+                                type: boolean
+                              qgsSocketPath:
+                                default: /var/run/tdx-qgs/qgs.socket
+                                description: Socket path pointing to the Quote Generation
+                                  Service
+                                type: string
+                            type: object
+                        type: object
+                    type: object
                   controllerConfiguration:
                     description: |-
                       ReloadableComponentConfiguration holds all generic k8s configuration options which can
@@ -573,8 +600,10 @@ spec:
                     type: array
                     x-kubernetes-list-type: atomic
                   imagePullPolicy:
-                    description: PullPolicy describes a policy for if/when to pull
-                      a container image
+                    description: |-
+                      The ImagePullPolicy to use for user workload pods and their containers
+                      (launcher pods, exporter pods, etc.).
+                      For KubeVirt infrastructure images, use spec.imagePullPolicy instead.
                     type: string
                   instancetype:
                     description: Instancetype configuration
@@ -787,6 +816,14 @@ spec:
                           That will ensure the target virt-launcher doesn't share categories with another pod on the node.
                           However, migrations will fail when using RWX volumes that don't automatically deal with SELinux levels.
                         type: boolean
+                      maxDowntimeMs:
+                        description: |-
+                          MaxDowntimeMs specifies the maximum tolerable downtime (in milliseconds) during switchover.
+                          Defaults to 900
+                        format: int64
+                        maximum: 2000000
+                        minimum: 1
+                        type: integer
                       network:
                         description: |-
                           Network is the name of the CNI network to use for live migrations. By default, migrations go
@@ -1003,14 +1040,27 @@ spec:
                         type: array
                         x-kubernetes-list-type: atomic
                     type: object
+                  persistentReservationConfiguration:
+                    description: PersistentReservationConfiguration controls the deployment
+                      of additional resources required for using SCSI persistent reservation
+                      in VMs
+                    nullable: true
+                    properties:
+                      enabled:
+                        description: |-
+                          Enabled controls the deployment of additional resources like the pr-helper container
+                          for enabling the use of the SCSI persistent reservation VMs, defaults to False.
+                        nullable: true
+                        type: boolean
+                    type: object
                   roleAggregationStrategy:
                     description: |-
                       RoleAggregationStrategy controls whether RBAC cluster roles should be aggregated
                       to the default Kubernetes roles (admin, edit, view).
                       When set to "AggregateToDefault" (default) or not specified, the aggregate-to-* labels are added to the cluster roles.
                       When set to "Manual", the labels are not added, and roles will not be aggregated to the default roles.
-                      Setting this field to "Manual" requires the OptOutRoleAggregation feature gate to be enabled.
-                      This is an Alpha feature and subject to change.
+                      Setting RoleAggregationStrategy to "Manual" requires the OptOutRoleAggregation feature gate
+                      to be enabled (Beta, enabled by default since v1.9.0).
                     enum:
                     - AggregateToDefault
                     - Manual
@@ -1248,7 +1298,11 @@ spec:
                     x-kubernetes-list-type: atomic
                 type: object
               imagePullPolicy:
-                description: The ImagePullPolicy to use.
+                description: |-
+                  The ImagePullPolicy to use for KubeVirt operator-managed infrastructure
+                  images (virt-api, virt-controller, virt-handler, virt-exportproxy, etc.).
+                  For pull policy of user workload pods, see
+                  spec.configuration.imagePullPolicy.
                 type: string
               imagePullSecrets:
                 description: |-
@@ -3805,6 +3859,33 @@ spec:
                         nullable: true
                         type: boolean
                     type: object
+                  confidentialCompute:
+                    description: QGS configuration for attestation on the Intel TDX
+                      Platform
+                    nullable: true
+                    properties:
+                      tdx:
+                        description: TDX configuration for attestation on the Intel
+                          TDX Platform
+                        nullable: true
+                        properties:
+                          attestation:
+                            description: QGSConfiguration holds QGS configuration
+                            properties:
+                              enforced:
+                                default: false
+                                description: Indicates whether TDX VM should enforce
+                                  the existence of QGS (required for attestation)
+                                  to be scheduled
+                                type: boolean
+                              qgsSocketPath:
+                                default: /var/run/tdx-qgs/qgs.socket
+                                description: Socket path pointing to the Quote Generation
+                                  Service
+                                type: string
+                            type: object
+                        type: object
+                    type: object
                   controllerConfiguration:
                     description: |-
                       ReloadableComponentConfiguration holds all generic k8s configuration options which can
@@ -4019,8 +4100,10 @@ spec:
                     type: array
                     x-kubernetes-list-type: atomic
                   imagePullPolicy:
-                    description: PullPolicy describes a policy for if/when to pull
-                      a container image
+                    description: |-
+                      The ImagePullPolicy to use for user workload pods and their containers
+                      (launcher pods, exporter pods, etc.).
+                      For KubeVirt infrastructure images, use spec.imagePullPolicy instead.
                     type: string
                   instancetype:
                     description: Instancetype configuration
@@ -4233,6 +4316,14 @@ spec:
                           That will ensure the target virt-launcher doesn't share categories with another pod on the node.
                           However, migrations will fail when using RWX volumes that don't automatically deal with SELinux levels.
                         type: boolean
+                      maxDowntimeMs:
+                        description: |-
+                          MaxDowntimeMs specifies the maximum tolerable downtime (in milliseconds) during switchover.
+                          Defaults to 900
+                        format: int64
+                        maximum: 2000000
+                        minimum: 1
+                        type: integer
                       network:
                         description: |-
                           Network is the name of the CNI network to use for live migrations. By default, migrations go
@@ -4449,14 +4540,27 @@ spec:
                         type: array
                         x-kubernetes-list-type: atomic
                     type: object
+                  persistentReservationConfiguration:
+                    description: PersistentReservationConfiguration controls the deployment
+                      of additional resources required for using SCSI persistent reservation
+                      in VMs
+                    nullable: true
+                    properties:
+                      enabled:
+                        description: |-
+                          Enabled controls the deployment of additional resources like the pr-helper container
+                          for enabling the use of the SCSI persistent reservation VMs, defaults to False.
+                        nullable: true
+                        type: boolean
+                    type: object
                   roleAggregationStrategy:
                     description: |-
                       RoleAggregationStrategy controls whether RBAC cluster roles should be aggregated
                       to the default Kubernetes roles (admin, edit, view).
                       When set to "AggregateToDefault" (default) or not specified, the aggregate-to-* labels are added to the cluster roles.
                       When set to "Manual", the labels are not added, and roles will not be aggregated to the default roles.
-                      Setting this field to "Manual" requires the OptOutRoleAggregation feature gate to be enabled.
-                      This is an Alpha feature and subject to change.
+                      Setting RoleAggregationStrategy to "Manual" requires the OptOutRoleAggregation feature gate
+                      to be enabled (Beta, enabled by default since v1.9.0).
                     enum:
                     - AggregateToDefault
                     - Manual
@@ -4694,7 +4798,11 @@ spec:
                     x-kubernetes-list-type: atomic
                 type: object
               imagePullPolicy:
-                description: The ImagePullPolicy to use.
+                description: |-
+                  The ImagePullPolicy to use for KubeVirt operator-managed infrastructure
+                  images (virt-api, virt-controller, virt-handler, virt-exportproxy, etc.).
+                  For pull policy of user workload pods, see
+                  spec.configuration.imagePullPolicy.
                 type: string
               imagePullSecrets:
                 description: |-
@@ -6965,6 +7073,7 @@ rules:
   - kubevirt-virt-handler-server-certs
   - kubevirt-virt-handler-migration-client-certs
   - kubevirt-virt-handler-vsock-client-certs
+  - kubevirt-virt-handler-monitoring-client-certs
   - kubevirt-operator-certs
   - kubevirt-virt-api-certs
   - kubevirt-controller-certs
@@ -7665,6 +7774,14 @@ rules:
   - update
   - delete
   - patch
+- apiGroups:
+  - template.kubevirt.io
+  resources:
+  - virtualmachinetemplates
+  verbs:
+  - get
+  - list
+  - watch
 - apiGroups:
   - pool.kubevirt.io
   resources:
@@ -7830,7 +7947,6 @@ rules:
   - virtualmachineinstances
   verbs:
   - update
-  - patch
   - list
   - watch
 - apiGroups:
@@ -7891,11 +8007,13 @@ rules:
   - watch
   - patch
 - apiGroups:
-  - apps
+  - plugin.kubevirt.io
   resources:
-  - controllerrevisions
+  - plugins
   verbs:
   - get
+  - list
+  - watch
 - apiGroups:
   - export.kubevirt.io
   resources:
@@ -8081,6 +8199,19 @@ rules:
   - list
   - watch
   - deletecollection
+- apiGroups:
+  - plugin.kubevirt.io
+  resources:
+  - plugins
+  verbs:
+  - get
+  - delete
+  - create
+  - update
+  - patch
+  - list
+  - watch
+  - deletecollection
 - apiGroups:
   - export.kubevirt.io
   resources:
@@ -8417,6 +8548,14 @@ rules:
   - get
   - list
   - watch
+- apiGroups:
+  - plugin.kubevirt.io
+  resources:
+  - plugins
+  verbs:
+  - get
+  - list
+  - watch
 - apiGroups:
   - instancetype.kubevirt.io
   resources:
@@ -8536,14 +8675,14 @@ spec:
         - virt-operator
         env:
         - name: VIRT_OPERATOR_IMAGE
-          value: quay.io/kubevirt/virt-operator:v1.8.2
+          value: quay.io/kubevirt/virt-operator:v1.9.0
         - name: WATCH_NAMESPACE
           valueFrom:
             fieldRef:
               fieldPath: metadata.annotations['olm.targetNamespaces']
         - name: KUBEVIRT_VERSION
-          value: v1.8.2
-        image: quay.io/kubevirt/virt-operator:v1.8.2
+          value: v1.9.0
+        image: quay.io/kubevirt/virt-operator:v1.9.0
         imagePullPolicy: IfNotPresent
         livenessProbe:
           httpGet:
diff --git a/packages/system/kubevirt-operator/tests/vendored_manifest_test.yaml b/packages/system/kubevirt-operator/tests/vendored_manifest_test.yaml
new file mode 100644
index 0000000000..3873935d74
--- /dev/null
+++ b/packages/system/kubevirt-operator/tests/vendored_manifest_test.yaml
@@ -0,0 +1,70 @@
+suite: cozy-kubevirt-operator vendored manifest
+release:
+  name: kubevirt-operator
+  namespace: cozy-kubevirt
+tests:
+  # prometheusrule.yaml is ours rather than upstream's and sits in the
+  # directory `make update` writes into, so a refresh is what is most likely to
+  # take it. Addressed as a `template:` because helm-unittest fails outright on
+  # one it cannot find, which is what makes the absence loud rather than a
+  # quietly smaller render.
+  - it: keeps the local PrometheusRule beside the vendored manifest
+    template: prometheusrule.yaml
+    asserts:
+      - containsDocument:
+          apiVersion: monitoring.coreos.com/v1
+          kind: PrometheusRule
+          name: vm-not-running-alert
+      - equal:
+          path: spec.groups[0].name
+          value: kubevirt-alerts
+
+  # Addressed by name rather than by index: the vendored file is one long
+  # document stream and an upstream reorder would slide any index off the
+  # Deployment silently.
+  - it: runs the virt-operator image from the pinned release
+    template: kubevirt-operator.yaml
+    documentSelector:
+      path: metadata.name
+      value: virt-operator
+    asserts:
+      - equal:
+          path: kind
+          value: Deployment
+      # The Makefile's grep ties this tag back to RELEASE. This one says the
+      # tag is on the operator Deployment rather than somewhere in the stream.
+      - equal:
+          path: spec.template.spec.containers[0].image
+          value: quay.io/kubevirt/virt-operator:v1.9.0
+      # KUBEVIRT_VERSION is what virt-operator reads to pick the tags for
+      # virt-controller, virt-handler and virt-launcher, so a manifest whose
+      # operator image moved while this did not deploys a split control plane.
+      # Matched against the env list by content rather than by position: the
+      # order upstream emits these in is not ours to rely on.
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: KUBEVIRT_VERSION
+            value: v1.9.0
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: VIRT_OPERATOR_IMAGE
+            value: quay.io/kubevirt/virt-operator:v1.9.0
+      # First of the two transforms `update` applies: upstream ships
+      # `namespace: kubevirt` throughout and the recipe rewrites it.
+      - equal:
+          path: metadata.namespace
+          value: cozy-kubevirt
+
+  # Second transform. `any: true` is load-bearing on a negated containsDocument:
+  # without it the assertion reads "not every document is a Namespace", which is
+  # true of any multi-document template and would pin nothing.
+  - it: drops the Namespace object upstream ships
+    template: kubevirt-operator.yaml
+    asserts:
+      - containsDocument:
+          apiVersion: v1
+          kind: Namespace
+          any: true
+        not: true
diff --git a/packages/system/kubevirt/Makefile b/packages/system/kubevirt/Makefile
index 246001d08f..3e8325fdc9 100644
--- a/packages/system/kubevirt/Makefile
+++ b/packages/system/kubevirt/Makefile
@@ -3,9 +3,101 @@ export NAMESPACE=cozy-$(NAME)
 
 include ../../../hack/package.mk
 
+test:
+	helm unittest .
+	./tests/update_idempotency_test.sh
+
+# File the parameterization patches are applied to. Overridable so the
+# idempotency test can drive `update` against a throwaway copy instead of the
+# in-tree CR.
+CR_FILE ?= templates/kubevirt-cr.yaml
+
+# Re-apply the cozystack-specific parameterization on top of the in-tree
+# templates/kubevirt-cr.yaml. This target does NOT download anything from
+# upstream — the live KubeVirt CR distributed by upstream is a near-empty
+# stub (featureGates: [], customizeComponents: {}, imagePullPolicy, empty
+# workloadUpdateStrategy) and cannot stand in for the in-tree file, which
+# carries the cozystack-specific settings: the namespace, the two feature-gate
+# lists, evictionStrategy, workloadUpdateMethods, vmRolloutStrategy,
+# monitorNamespace and the virt-handler resource patch.
+#
+# The gate lists are not defaults to carry forward unread. Check them against
+# the pinned release's pkg/virt-config/featuregate/{active,inactive}.go at every
+# bump: a gate that reached GA is enabled whether or not the CR names it, so its
+# line does nothing, and a deprecated one is on a removal clock.
+#
+# To refresh from a newer upstream KubeVirt:
+#   1. Operator inspects the new upstream release notes for spec changes
+#      that affect the cozystack-managed fields listed above.
+#   2. Operator hand-merges the new fields into templates/kubevirt-cr.yaml.
+#   3. Operator runs `make update` to re-apply the cozystack parameterization
+#      sed patches in case they were lost during the hand-merge.
+#
+# GNU sed is required — on macOS run under a Linux container or via gsed.
 update:
-	rm -rf templates
-	mkdir templates
-	export RELEASE=$$(curl https://storage.googleapis.com/kubevirt-prow/release/kubevirt/kubevirt/stable.txt) && \
-	wget https://github.com/kubevirt/kubevirt/releases/download/$${RELEASE}/kubevirt-cr.yaml -O templates/kubevirt-cr.yaml
-	sed -i 's/namespace: kubevirt/namespace: cozy-kubevirt/g' templates/kubevirt-cr.yaml
+	@test -f $(CR_FILE) || { echo "ERROR: $(CR_FILE) not found — drop a hand-merged upstream CR there first" >&2; exit 1; }
+	@# Idempotent — each sed only inserts if the matching cozystack patch
+	@# isn't already present in the file.
+	grep -q '^  namespace: cozy-kubevirt$$' $(CR_FILE) || sed -i 's/namespace: kubevirt/namespace: cozy-kubevirt/g' $(CR_FILE)
+	grep -q '{{- if .Values.cpuAllocationRatio }}' $(CR_FILE) || sed -i '/^    developerConfiguration:$$/a\      {{- if .Values.cpuAllocationRatio }}\n      cpuAllocationRatio: {{ .Values.cpuAllocationRatio }}\n      {{- end }}' $(CR_FILE)
+	grep -q '{{- range .Values.extraFeatureGates }}' $(CR_FILE) || sed -i '/^      - VMExport$$/a\      {{- range .Values.extraFeatureGates }}\n      - {{ . }}\n      {{- end }}' $(CR_FILE)
+	@# The insert carries the block's comment lines too, so a hand-merge that
+	@# drops them gets them back. Its skip reads $$staticDisabledFeatureGates from
+	@# the guard header above the document, which no sed here restores; the tail
+	@# below greps for that header line instead.
+	grep -q '{{- range .Values.disabledFeatureGates }}' $(CR_FILE) || sed -i '/^      featureGates:$$/i\      # Template is Beta and on by default since 1.9; it makes virt-operator\n      # deploy the virt-template aggregated API server, which nothing here uses.\n      # ExternalNetResourceInjection hands NAD resourceName requests to an\n      # injector the platform does not deploy; off keeps virt-controller doing it.\n      # ImageVolume needs the Kubernetes gate of the same name, which is off by\n      # default below 1.35 and strips the launcher'"'"'s image volumes in silence.\n      disabledFeatureGates:\n      - Template\n      - ExternalNetResourceInjection\n      {{- if semverCompare "<1.35-0" .Capabilities.KubeVersion.Version }}\n      - ImageVolume\n      {{- end }}\n      {{- range .Values.disabledFeatureGates }}\n      {{- if not (has . $$staticDisabledFeatureGates) }}\n      - {{ . }}\n      {{- end }}\n      {{- end }}' $(CR_FILE)
+	@# permittedHostDevices and mediatedDevicesConfiguration are guarded
+	@# independently: a hand-merge may drop one while keeping the other, and
+	@# each must self-heal on its own. A single guard over both would skip the
+	@# second insert whenever the first is still present, then trip the
+	@# sanity-check tail below.
+	grep -q '{{- with .Values.permittedHostDevices }}' $(CR_FILE) || sed -i '/^    evictionStrategy:/i\    {{- with .Values.permittedHostDevices }}\n    permittedHostDevices:\n      {{- toYaml . | nindent 6 }}\n    {{- end }}' $(CR_FILE)
+	grep -q '{{- with .Values.mediatedDevicesConfiguration }}' $(CR_FILE) || sed -i '/^    evictionStrategy:/i\    {{- with .Values.mediatedDevicesConfiguration }}\n    mediatedDevicesConfiguration:\n      {{- toYaml . | nindent 6 }}\n    {{- end }}' $(CR_FILE)
+	grep -q '{{- with .Values.migrations }}' $(CR_FILE) || sed -i '/^    evictionStrategy:/i\    {{- with .Values.migrations }}\n    migrations:\n      {{- toYaml . | nindent 6 }}\n    {{- end }}' $(CR_FILE)
+	@# Sanity-check: every cozystack patch MUST end up in the file. If the
+	@# hand-merge step moved or renamed an anchor (developerConfiguration:,
+	@# - VMExport, featureGates:, evictionStrategy:) the sed silently no-ops and the chart
+	@# ships without the parameterization. Each message names the directive
+	@# that failed to land and the anchor its insert keys off, so the operator
+	@# knows which line to restore before re-running.
+	@#
+	@# disabledFeatureGates is checked marker by marker rather than by its range
+	@# directive alone. Every insert above is guarded by one directive it also
+	@# inserts, so a hand-merge that keeps the directive and drops a sibling line
+	@# leaves the guard satisfied, the insert skipped and the render green. That
+	@# shape covers the directive and nothing else. What earns a grep per marker
+	@# here are the three static entries: they are the only lines these inserts
+	@# add that are CR content in their own right rather than a wrapper around a
+	@# value, so they render on every install the cluster version selects them
+	@# for, and their absence cannot surface as a value that stopped taking
+	@# effect — the CR simply goes back to deploying virt-template, to letting
+	@# KubeVirt skip NAD resource injection, and to image volumes an apiserver
+	@# below 1.35 discards. Every other payload line stays outside these checks:
+	@# the device tables, the cpuAllocationRatio value, and the `- {{ . }}` entry
+	@# inside each of the extraFeatureGates and disabledFeatureGates ranges, whose
+	@# deletion leaves `make update` exiting 0 with the range wrapped around
+	@# nothing. migrations is the one block validated whole, below.
+	@# `make update` cannot repair a partial block — the directive guard is what
+	@# stops the insert — so name the missing marker and let the operator restore
+	@# it.
+	@grep -q '{{- if .Values.cpuAllocationRatio }}' $(CR_FILE) || { echo "ERROR: directive '{{- if .Values.cpuAllocationRatio }}' not inserted — restore the 'developerConfiguration:' anchor in $(CR_FILE) and re-run" >&2; exit 1; }
+	@grep -q '{{- range .Values.extraFeatureGates }}' $(CR_FILE) || { echo "ERROR: directive '{{- range .Values.extraFeatureGates }}' not inserted — restore the '- VMExport' anchor in $(CR_FILE) and re-run" >&2; exit 1; }
+	@grep -q '{{- range .Values.disabledFeatureGates }}' $(CR_FILE) || { echo "ERROR: directive '{{- range .Values.disabledFeatureGates }}' not inserted — restore the 'featureGates:' anchor in $(CR_FILE) and re-run" >&2; exit 1; }
+	@grep -q '^      disabledFeatureGates:$$' $(CR_FILE) || { echo "ERROR: marker '      disabledFeatureGates:' missing while '{{- range .Values.disabledFeatureGates }}' is present — the insert was skipped over a partial block. Delete the whole disabledFeatureGates block from $(CR_FILE) and re-run to rebuild it" >&2; exit 1; }
+	@grep -q '^      - Template$$' $(CR_FILE) || { echo "ERROR: marker '      - Template' missing while '{{- range .Values.disabledFeatureGates }}' is present — the insert was skipped over a partial block and the CR would deploy virt-template. Delete the whole disabledFeatureGates block from $(CR_FILE) and re-run to rebuild it" >&2; exit 1; }
+	@grep -q '^      - ExternalNetResourceInjection$$' $(CR_FILE) || { echo "ERROR: marker '      - ExternalNetResourceInjection' missing while '{{- range .Values.disabledFeatureGates }}' is present — the insert was skipped over a partial block and virt-controller would stop injecting NAD resourceName requests. Delete the whole disabledFeatureGates block from $(CR_FILE) and re-run to rebuild it" >&2; exit 1; }
+	@grep -q '^      - ImageVolume$$' $(CR_FILE) || { echo "ERROR: marker '      - ImageVolume' missing while '{{- range .Values.disabledFeatureGates }}' is present — the insert was skipped over a partial block and a management cluster below Kubernetes 1.35 would lose the launcher's image volumes. Delete the whole disabledFeatureGates block from $(CR_FILE) and re-run to rebuild it" >&2; exit 1; }
+	@# The block's skip reads $$staticDisabledFeatureGates from the guard header,
+	@# which no insert here restores. Losing the header fails the render rather
+	@# than dropping the skip, but catching a hand-merge is this tail's job.
+	@grep -q '{{- $$staticDisabledFeatureGates := ' $(CR_FILE) || { echo "ERROR: marker '{{- \$$staticDisabledFeatureGates := ' missing from the guard header — the disabledFeatureGates block below references it and the render would fail. Restore the header block at the top of $(CR_FILE)" >&2; exit 1; }
+	@grep -q '{{- with .Values.permittedHostDevices }}' $(CR_FILE) || { echo "ERROR: directive '{{- with .Values.permittedHostDevices }}' not inserted — restore the 'evictionStrategy:' anchor in $(CR_FILE) and re-run" >&2; exit 1; }
+	@grep -q '{{- with .Values.mediatedDevicesConfiguration }}' $(CR_FILE) || { echo "ERROR: directive '{{- with .Values.mediatedDevicesConfiguration }}' not inserted — restore the 'evictionStrategy:' anchor in $(CR_FILE) and re-run" >&2; exit 1; }
+	@grep -q '{{- with .Values.migrations }}' $(CR_FILE) || { echo "ERROR: directive '{{- with .Values.migrations }}' not inserted — restore the 'evictionStrategy:' anchor in $(CR_FILE) and re-run" >&2; exit 1; }
+	@# A retained directive skips insertion even if its body or end was lost.
+	@# Check the whole block in order; only END decides the exit status.
+	@awk '\
+		$$0 == "    migrations:" { keys++ } \
+		$$0 == "    {{- with .Values.migrations }}" { blocks++; step=1; next } \
+		step { expected = step == 1 ? "    migrations:" : step == 2 ? "      {{- toYaml . | nindent 6 }}" : "    {{- end }}"; if ($$0 != expected) bad=1; step=(step+1)%4 } \
+		END { exit !(blocks == 1 && keys == 1 && step == 0 && !bad) }' $(CR_FILE) || { echo "ERROR: migrations block is partial or duplicated — restore the complete block or delete all its remaining lines from $(CR_FILE) and re-run" >&2; exit 1; }
diff --git a/packages/system/kubevirt/templates/kubevirt-cr.yaml b/packages/system/kubevirt/templates/kubevirt-cr.yaml
index e6538a688f..c38f5bcf6f 100644
--- a/packages/system/kubevirt/templates/kubevirt-cr.yaml
+++ b/packages/system/kubevirt/templates/kubevirt-cr.yaml
@@ -1,3 +1,70 @@
+{{- /*
+  A gate named in both featureGates and disabledFeatureGates is not a
+  configuration KubeVirt honours, and it fails differently depending on when it
+  lands. kubevirt-update-validator.kubevirt.io rejects it (failurePolicy Fail),
+  so on a cluster that already has the CR the write is refused and the kubevirt
+  HelmRelease stops converging, taking every other field in this CR with it. The
+  create admitter runs no such check, so on a fresh install the same CR is
+  admitted, and virt-config reads featureGates before disabledFeatureGates —
+  the gate stays on while the values file says it is off. Stop the render
+  instead.
+
+  Only the cross-list overlap is checked. Upstream's validateFeatureGates walks
+  featureGates and looks each name up in disabledFeatureGates, and both fields
+  are x-kubernetes-list-type: atomic in the CRD, so a name repeated inside one
+  list is a CR KubeVirt accepts and this guard leaves it alone.
+
+  The gates this chart pins off can arrive a second time from a supported
+  values file, because the chart writes them itself and an operator listing the
+  gates their cluster declines has no reason to know that. The range below skips
+  them, so a gate named once in the values file is named once in the CR.
+
+  Which list a colliding gate came from decides what the operator can do about
+  it, so each case says its own thing: Template is pinned off and cannot be
+  asked back, a gate in staticFeatureGates is pinned on and cannot be switched
+  off from values, and anything else got there through extraFeatureGates and can
+  leave from either side.
+
+  Upstream also carries a dedicated field for the first of them,
+  spec.configuration.virtTemplateDeployment.enabled. It is the weaker switch:
+  VirtTemplateDeploymentEnabled reads TemplateEnabled() first, so the field
+  stops the deployment while the gate and its API stay on. The gate stops both.
+
+  ImageVolume is the third opt-out and the only one that depends on the host.
+  With it on, virt-controller drops the containerDisk sidecars and mounts the
+  image as a VolumeSource.Image instead. Kubernetes carries its own ImageVolume
+  gate, off by default until 1.35, and an apiserver with it off silently strips
+  every image volume and the mounts referencing it, so the launcher pod is
+  admitted without the disk it needs. The management cluster is supported from
+  1.33, so below 1.35 the chart keeps the KubeVirt gate off and the sidecar
+  path in use; from 1.35 the gate is left alone and extraFeatureGates can
+  collide with nothing.
+
+  staticFeatureGates and staticDisabledFeatureGates must name exactly the gates
+  rendered below. Both lists stay literal in both places because `make update`
+  anchors the extraFeatureGates insert on the "- VMExport" line and its sanity
+  tail greps for the static disabled entries by line, so a copy is the price of
+  the self-heal contract; tests/kubevirt_cr_test.yaml carries one case per gate,
+  which is what makes a name dropped from a copy visible.
+*/ -}}
+{{- $staticFeatureGates := list "DeclarativeHotplugVolumes" "ExpandDisks" "LiveMigration" "AutoResourceLimitsGate" "CPUManager" "GPU" "VMExport" -}}
+{{- $staticDisabledFeatureGates := list "Template" "ExternalNetResourceInjection" -}}
+{{- if semverCompare "<1.35-0" .Capabilities.KubeVersion.Version -}}
+{{- $staticDisabledFeatureGates = append $staticDisabledFeatureGates "ImageVolume" -}}
+{{- end -}}
+{{- $enabledGates := concat $staticFeatureGates (.Values.extraFeatureGates | default list) -}}
+{{- $disabledGates := concat $staticDisabledFeatureGates (.Values.disabledFeatureGates | default list) -}}
+{{- range $gate := $disabledGates -}}
+{{- if has $gate $enabledGates -}}
+{{- if eq $gate "Template" -}}
+{{- fail "the Template feature gate is pinned off by this chart because the platform does not use virt-template, and extraFeatureGates cannot undo that: it would render Template under both featureGates and disabledFeatureGates, which KubeVirt refuses. Remove \"Template\" from extraFeatureGates." -}}
+{{- else if has $gate $staticFeatureGates -}}
+{{- fail (printf "feature gate %q is one this chart enables and cannot be switched off from values: KubeVirt refuses a CR that names the same gate in both lists. Remove it from disabledFeatureGates." $gate) -}}
+{{- else -}}
+{{- fail (printf "feature gate %q is named under both featureGates and disabledFeatureGates, which KubeVirt refuses; remove it from extraFeatureGates or from disabledFeatureGates." $gate) -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
 ---
 apiVersion: kubevirt.io/v1
 kind: KubeVirt
@@ -13,24 +80,84 @@ spec:
       {{- if .Values.cpuAllocationRatio }}
       cpuAllocationRatio: {{ .Values.cpuAllocationRatio }}
       {{- end }}
+      # Template is Beta and on by default since 1.9; it makes virt-operator
+      # deploy the virt-template aggregated API server, which nothing here uses.
+      # ExternalNetResourceInjection hands NAD resourceName requests to an
+      # injector the platform does not deploy; off keeps virt-controller doing it.
+      # ImageVolume needs the Kubernetes gate of the same name, which is off by
+      # default below 1.35 and strips the launcher's image volumes in silence.
+      disabledFeatureGates:
+      - Template
+      - ExternalNetResourceInjection
+      {{- if semverCompare "<1.35-0" .Capabilities.KubeVersion.Version }}
+      - ImageVolume
+      {{- end }}
+      {{- range .Values.disabledFeatureGates }}
+      {{- if not (has . $staticDisabledFeatureGates) }}
+      - {{ . }}
+      {{- end }}
+      {{- end }}
       featureGates:
-      - HotplugVolumes
+      # HotplugVolumes is left off: it is deprecated since 1.9, and while on it
+      # keeps DeclarativeHotplugVolumes inert. Turning it back on means setting
+      # --enable-vmi-hotplug-fallback=true in
+      # packages/apps/kubernetes/templates/csi/deploy.yaml in the same change.
+      # DeclarativeHotplugVolumes is Beta and on by default; it is listed so
+      # disabledFeatureGates cannot take away the only hotplug path left.
+      - DeclarativeHotplugVolumes
       - ExpandDisks
       - LiveMigration
       - AutoResourceLimitsGate
       - CPUManager
       - GPU
       - VMExport
-    evictionStrategy: LiveMigrate
+      {{- range .Values.extraFeatureGates }}
+      - {{ . }}
+      {{- end }}
+    {{- with .Values.permittedHostDevices }}
+    permittedHostDevices:
+      {{- toYaml . | nindent 6 }}
+    {{- end }}
+    {{- with .Values.mediatedDevicesConfiguration }}
+    mediatedDevicesConfiguration:
+      {{- toYaml . | nindent 6 }}
+    {{- end }}
+    {{- with .Values.migrations }}
+    migrations:
+      {{- toYaml . | nindent 6 }}
+    {{- end }}
+    evictionStrategy: LiveMigrateIfPossible  # a VMI that cannot live-migrate is evicted instead of blocking the drain; a VMI keeps the strategy it was created with, so a non-migratable one created before this value still blocks until its VM is restarted
     virtualMachineOptions:
       disableSerialConsoleLog: {}
     vmRolloutStrategy: LiveUpdate
   workloadUpdateStrategy:
+    # Evict shuts down VMs that cannot migrate on a KubeVirt upgrade; a VMI still
+    # carrying LiveMigrate from before evictionStrategy changed refuses the
+    # eviction and stays on the old launcher. Evict is also how a non-migratable
+    # kubernetes-nodes worker (evictionStrategy External) gets the new launcher:
+    # the eviction marks the VMI for evacuation, CAPK drains the tenant node and
+    # deletes the VMI, and it also marks the KubevirtMachine failed, so the node
+    # group's MachineHealthCheck replaces the Machine. Where maxUnhealthy holds
+    # remediation back, the VM starts a new VMI but the Machine stays failed and
+    # is replaced once remediation is allowed.
     workloadUpdateMethods:
     - LiveMigrate
     - Evict
     batchEvictionInterval: 1m
     batchEvictionSize: 10
-  customizeComponents: {}
+  # virt-handler is a node DaemonSet and ran BestEffort. The Talos userspace OOM
+  # handler (v1.12+) only ever kills cgroups with no memory.max, and picks its
+  # victim by QoS class rather than by what caused the pressure — so virt-handler
+  # was an eviction candidate on every node, and losing it stops VM lifecycle
+  # operations there. virt-operator owns the DaemonSet, so resources cannot be
+  # set from chart values; customizeComponents.patches is the supported seam.
+  # 14d peak 207Mi on a 3-node dev cluster; grows with VMs per node.
+  customizeComponents:
+    patches:
+    - resourceName: virt-handler
+      resourceType: DaemonSet
+      type: strategic
+      patch: |
+        {"spec":{"template":{"spec":{"containers":[{"name":"virt-handler","resources":{"requests":{"cpu":"100m","memory":"128Mi"},"limits":{"memory":"2Gi"}}}]}}}}
   imagePullPolicy: IfNotPresent
   monitorNamespace: tenant-root
diff --git a/packages/system/kubevirt/templates/vm-exportproxy-ingress.yaml b/packages/system/kubevirt/templates/vm-exportproxy-ingress.yaml
index fc19e16fc3..482c02a730 100644
--- a/packages/system/kubevirt/templates/vm-exportproxy-ingress.yaml
+++ b/packages/system/kubevirt/templates/vm-exportproxy-ingress.yaml
@@ -20,7 +20,7 @@ spec:
       paths:
       - backend:
           service:
-            name: vm-exportproxy
+            name: virt-exportproxy
             port:
               number: 443
         path: /
diff --git a/packages/system/kubevirt/templates/vm-exportproxy-tlsroute.yaml b/packages/system/kubevirt/templates/vm-exportproxy-tlsroute.yaml
index d2bcbfb77a..c1246f6120 100644
--- a/packages/system/kubevirt/templates/vm-exportproxy-tlsroute.yaml
+++ b/packages/system/kubevirt/templates/vm-exportproxy-tlsroute.yaml
@@ -18,6 +18,6 @@ spec:
   - {{ printf "vm-exportproxy.%s" $host | quote }}
   rules:
   - backendRefs:
-    - name: vm-exportproxy
+    - name: virt-exportproxy
       port: 443
 {{- end }}
diff --git a/packages/system/kubevirt/tests/kubevirt_cr_test.yaml b/packages/system/kubevirt/tests/kubevirt_cr_test.yaml
new file mode 100644
index 0000000000..91f1b42965
--- /dev/null
+++ b/packages/system/kubevirt/tests/kubevirt_cr_test.yaml
@@ -0,0 +1,479 @@
+suite: cozy-kubevirt CR parameterization
+templates:
+  - templates/kubevirt-cr.yaml
+release:
+  name: kubevirt
+  namespace: cozy-kubevirt
+# One entry of the static opt-out block depends on the cluster version, so the
+# suite states the version instead of inheriting whatever helm-unittest
+# defaults to. 1.36 is what the platform's own Talos build ships; the two cases
+# at the bottom pin the branches around the 1.35 boundary.
+capabilities:
+  majorVersion: 1
+  minorVersion: 36
+tests:
+  - it: keeps the upstream default feature-gate set and omits permittedHostDevices when values are empty
+    asserts:
+      - equal:
+          path: spec.configuration.developerConfiguration.featureGates
+          value:
+          - DeclarativeHotplugVolumes
+          - ExpandDisks
+          - LiveMigration
+          - AutoResourceLimitsGate
+          - CPUManager
+          - GPU
+          - VMExport
+      - equal:
+          path: spec.configuration.developerConfiguration.disabledFeatureGates
+          value:
+          - Template
+          - ExternalNetResourceInjection
+      - notExists:
+          path: spec.configuration.developerConfiguration.cpuAllocationRatio
+      - notExists:
+          path: spec.configuration.permittedHostDevices
+      - notExists:
+          path: spec.configuration.mediatedDevicesConfiguration
+      - notExists:
+          path: spec.configuration.migrations
+
+  - it: sets the cluster evictionStrategy to LiveMigrateIfPossible
+    asserts:
+      - equal:
+          path: spec.configuration.evictionStrategy
+          value: LiveMigrateIfPossible
+
+  - it: keeps Evict as the workload update fallback for VMs that cannot migrate
+    asserts:
+      - equal:
+          path: spec.workloadUpdateStrategy.workloadUpdateMethods
+          value:
+          - LiveMigrate
+          - Evict
+
+  - it: omits migrations when explicitly empty
+    set:
+      migrations: {}
+    asserts:
+      - notExists:
+          path: spec.configuration.migrations
+
+  - it: omits migrations when explicitly null
+    set:
+      migrations: null
+    asserts:
+      - notExists:
+          path: spec.configuration.migrations
+
+  - it: renders migration limits without changing their values
+    set:
+      migrations:
+        bandwidthPerMigration: 625M
+        parallelMigrationsPerCluster: 2
+        parallelOutboundMigrationsPerNode: 1
+    asserts:
+      - equal:
+          path: spec.configuration.migrations
+          value:
+            bandwidthPerMigration: 625M
+            parallelMigrationsPerCluster: 2
+            parallelOutboundMigrationsPerNode: 1
+
+  - it: preserves false and zero migration values
+    set:
+      migrations:
+        allowAutoConverge: false
+        completionTimeoutPerGiB: 0
+    asserts:
+      - equal:
+          path: spec.configuration.migrations
+          value:
+            allowAutoConverge: false
+            completionTimeoutPerGiB: 0
+
+  - it: emits cpuAllocationRatio under developerConfiguration when set
+    set:
+      cpuAllocationRatio: 10
+    asserts:
+      - equal:
+          path: spec.configuration.developerConfiguration.cpuAllocationRatio
+          value: 10
+
+  - it: appends extraFeatureGates after the static defaults
+    set:
+      extraFeatureGates:
+      - HostDevices
+      - WorkloadEncryptionSEV
+    asserts:
+      - equal:
+          path: spec.configuration.developerConfiguration.featureGates
+          value:
+          - DeclarativeHotplugVolumes
+          - ExpandDisks
+          - LiveMigration
+          - AutoResourceLimitsGate
+          - CPUManager
+          - GPU
+          - VMExport
+          - HostDevices
+          - WorkloadEncryptionSEV
+
+  # The chart does not enable HotplugVolumes, so naming it off is a plain
+  # opt-out and must not trip the both-lists guard.
+  - it: accepts HotplugVolumes in disabledFeatureGates
+    set:
+      disabledFeatureGates:
+      - HotplugVolumes
+    asserts:
+      - notContains:
+          path: spec.configuration.developerConfiguration.featureGates
+          content: HotplugVolumes
+      - equal:
+          path: spec.configuration.developerConfiguration.disabledFeatureGates
+          value:
+          - Template
+          - ExternalNetResourceInjection
+          - HotplugVolumes
+
+  - it: appends disabledFeatureGates after the static opt-outs
+    set:
+      disabledFeatureGates:
+      - ImageVolume
+    asserts:
+      - equal:
+          path: spec.configuration.developerConfiguration.disabledFeatureGates
+          value:
+          - Template
+          - ExternalNetResourceInjection
+          - ImageVolume
+
+  # KubeVirt's update validator refuses a CR that names one gate in both lists,
+  # and the create admitter does not check at all — so an overlap either wedges
+  # the HelmRelease on an existing cluster or silently leaves the gate on for a
+  # fresh one. The render has to be the place it stops.
+  #
+  # The guard walks its own copy of the featureGates list rendered below, which
+  # has to stay a literal list because `make update` anchors the extraFeatureGates
+  # insert on the "- VMExport" line. A gate dropped from that copy therefore
+  # keeps rendering under featureGates while silently leaving the guard. One
+  # case per gate closes that hole: removing any single name from the copy turns
+  # exactly one of the seven red.
+  #
+  # These seven are gates the chart enables itself, so the message says the
+  # entry cannot be disabled from values at all. The three cases further down
+  # that reach featureGates through extraFeatureGates get the message naming
+  # both sides instead, which is the distinction the copy also decides.
+  #
+  # DeclarativeHotplugVolumes is Beta and on by default, so listing it only
+  # matters for this guard: with HotplugVolumes off, disabling it would leave
+  # virt-api refusing every volume hotplug, kubevirt-csi attach included.
+  - it: refuses to render when disabledFeatureGates repeats DeclarativeHotplugVolumes
+    set:
+      disabledFeatureGates:
+      - DeclarativeHotplugVolumes
+    asserts:
+      - failedTemplate:
+          errorMessage: 'feature gate "DeclarativeHotplugVolumes" is one this chart enables and cannot be switched off from values: KubeVirt refuses a CR that names the same gate in both lists. Remove it from disabledFeatureGates.'
+
+  - it: refuses to render when disabledFeatureGates repeats ExpandDisks
+    set:
+      disabledFeatureGates:
+      - ExpandDisks
+    asserts:
+      - failedTemplate:
+          errorMessage: 'feature gate "ExpandDisks" is one this chart enables and cannot be switched off from values: KubeVirt refuses a CR that names the same gate in both lists. Remove it from disabledFeatureGates.'
+
+  - it: refuses to render when disabledFeatureGates repeats LiveMigration
+    set:
+      disabledFeatureGates:
+      - LiveMigration
+    asserts:
+      - failedTemplate:
+          errorMessage: 'feature gate "LiveMigration" is one this chart enables and cannot be switched off from values: KubeVirt refuses a CR that names the same gate in both lists. Remove it from disabledFeatureGates.'
+
+  - it: refuses to render when disabledFeatureGates repeats AutoResourceLimitsGate
+    set:
+      disabledFeatureGates:
+      - AutoResourceLimitsGate
+    asserts:
+      - failedTemplate:
+          errorMessage: 'feature gate "AutoResourceLimitsGate" is one this chart enables and cannot be switched off from values: KubeVirt refuses a CR that names the same gate in both lists. Remove it from disabledFeatureGates.'
+
+  - it: refuses to render when disabledFeatureGates repeats CPUManager
+    set:
+      disabledFeatureGates:
+      - CPUManager
+    asserts:
+      - failedTemplate:
+          errorMessage: 'feature gate "CPUManager" is one this chart enables and cannot be switched off from values: KubeVirt refuses a CR that names the same gate in both lists. Remove it from disabledFeatureGates.'
+
+  - it: refuses to render when disabledFeatureGates repeats GPU
+    set:
+      disabledFeatureGates:
+      - GPU
+    asserts:
+      - failedTemplate:
+          errorMessage: 'feature gate "GPU" is one this chart enables and cannot be switched off from values: KubeVirt refuses a CR that names the same gate in both lists. Remove it from disabledFeatureGates.'
+
+  - it: refuses to render when disabledFeatureGates repeats VMExport
+    set:
+      disabledFeatureGates:
+      - VMExport
+    asserts:
+      - failedTemplate:
+          errorMessage: 'feature gate "VMExport" is one this chart enables and cannot be switched off from values: KubeVirt refuses a CR that names the same gate in both lists. Remove it from disabledFeatureGates.'
+
+  - it: refuses to render when the same gate is listed in extraFeatureGates and disabledFeatureGates
+    set:
+      extraFeatureGates:
+      - ImageVolume
+      disabledFeatureGates:
+      - ImageVolume
+    asserts:
+      - failedTemplate:
+          errorMessage: 'feature gate "ImageVolume" is named under both featureGates and disabledFeatureGates, which KubeVirt refuses; remove it from extraFeatureGates or from disabledFeatureGates.'
+
+  # Template is the one gate the chart disables unconditionally, so
+  # extraFeatureGates is the only way to ask for it back and the error has to
+  # say that asking is not supported rather than repeat the generic overlap text.
+  - it: refuses to render when extraFeatureGates tries to re-enable the pinned Template gate
+    set:
+      extraFeatureGates:
+      - Template
+    asserts:
+      - failedTemplate:
+          errorMessage: 'the Template feature gate is pinned off by this chart because the platform does not use virt-template, and extraFeatureGates cannot undo that: it would render Template under both featureGates and disabledFeatureGates, which KubeVirt refuses. Remove "Template" from extraFeatureGates.'
+
+  - it: renders both lists when extraFeatureGates and disabledFeatureGates name different gates
+    set:
+      extraFeatureGates:
+      - HostDevices
+      disabledFeatureGates:
+      - ImageVolume
+    asserts:
+      - equal:
+          path: spec.configuration.developerConfiguration.featureGates
+          value:
+          - DeclarativeHotplugVolumes
+          - ExpandDisks
+          - LiveMigration
+          - AutoResourceLimitsGate
+          - CPUManager
+          - GPU
+          - VMExport
+          - HostDevices
+      - equal:
+          path: spec.configuration.developerConfiguration.disabledFeatureGates
+          value:
+          - Template
+          - ExternalNetResourceInjection
+          - ImageVolume
+
+  # Both static entries are written unconditionally, so an operator listing the
+  # gates their cluster declines can name either again without knowing that.
+  # Upstream compares the two lists against each other and nothing else, so the
+  # duplicate is a CR KubeVirt accepts — the render must neither reject it nor
+  # pass it on.
+  - it: renders one entry per static opt-out when disabledFeatureGates repeats them
+    set:
+      disabledFeatureGates:
+      - Template
+      - ExternalNetResourceInjection
+    asserts:
+      - equal:
+          path: spec.configuration.developerConfiguration.disabledFeatureGates
+          value:
+          - Template
+          - ExternalNetResourceInjection
+
+  # The skip is keyed on the name, not on the position, so gates around the
+  # repeats still land.
+  - it: keeps the other entries when disabledFeatureGates repeats a static opt-out
+    set:
+      disabledFeatureGates:
+      - ImageVolume
+      - Template
+      - KubevirtSeccompProfile
+    asserts:
+      - equal:
+          path: spec.configuration.developerConfiguration.disabledFeatureGates
+          value:
+          - Template
+          - ExternalNetResourceInjection
+          - ImageVolume
+          - KubevirtSeccompProfile
+
+  # The second static opt-out has no message of its own: extraFeatureGates is
+  # the only way to collide with it, and the generic text names the gate and
+  # both lists it would land in.
+  - it: refuses to render when extraFeatureGates tries to re-enable the pinned ExternalNetResourceInjection gate
+    set:
+      extraFeatureGates:
+      - ExternalNetResourceInjection
+    asserts:
+      - failedTemplate:
+          errorMessage: 'feature gate "ExternalNetResourceInjection" is named under both featureGates and disabledFeatureGates, which KubeVirt refuses; remove it from extraFeatureGates or from disabledFeatureGates.'
+
+  # ImageVolume is the one opt-out that depends on the host: KubeVirt renders
+  # containerDisk images as VolumeSource.Image volumes, and an apiserver with
+  # its own ImageVolume gate off — the default below Kubernetes 1.35 — strips
+  # those volumes and their mounts without an error. The management cluster is
+  # supported from 1.33, so both sides of the boundary are shipped states.
+  - it: disables ImageVolume below Kubernetes 1.35
+    capabilities:
+      majorVersion: 1
+      minorVersion: 34
+    asserts:
+      - equal:
+          path: spec.configuration.developerConfiguration.disabledFeatureGates
+          value:
+          - Template
+          - ExternalNetResourceInjection
+          - ImageVolume
+
+  - it: leaves ImageVolume alone from Kubernetes 1.35 on
+    capabilities:
+      majorVersion: 1
+      minorVersion: 35
+    asserts:
+      - equal:
+          path: spec.configuration.developerConfiguration.disabledFeatureGates
+          value:
+          - Template
+          - ExternalNetResourceInjection
+
+  - it: refuses to render when extraFeatureGates asks for ImageVolume below Kubernetes 1.35
+    capabilities:
+      majorVersion: 1
+      minorVersion: 34
+    set:
+      extraFeatureGates:
+      - ImageVolume
+    asserts:
+      - failedTemplate:
+          errorMessage: 'feature gate "ImageVolume" is named under both featureGates and disabledFeatureGates, which KubeVirt refuses; remove it from extraFeatureGates or from disabledFeatureGates.'
+
+  - it: accepts ImageVolume in extraFeatureGates from Kubernetes 1.35 on
+    capabilities:
+      majorVersion: 1
+      minorVersion: 35
+    set:
+      extraFeatureGates:
+      - ImageVolume
+    asserts:
+      - equal:
+          path: spec.configuration.developerConfiguration.featureGates
+          value:
+          - DeclarativeHotplugVolumes
+          - ExpandDisks
+          - LiveMigration
+          - AutoResourceLimitsGate
+          - CPUManager
+          - GPU
+          - VMExport
+          - ImageVolume
+      - equal:
+          path: spec.configuration.developerConfiguration.disabledFeatureGates
+          value:
+          - Template
+          - ExternalNetResourceInjection
+
+  # The dedupe reads the same conditional list, so a values file naming
+  # ImageVolume renders one entry below the boundary and one entry above it —
+  # the chart's own line in the first case, the operator's in the second.
+  - it: renders a single ImageVolume entry when the values repeat it below Kubernetes 1.35
+    capabilities:
+      majorVersion: 1
+      minorVersion: 34
+    set:
+      disabledFeatureGates:
+      - ImageVolume
+    asserts:
+      - equal:
+          path: spec.configuration.developerConfiguration.disabledFeatureGates
+          value:
+          - Template
+          - ExternalNetResourceInjection
+          - ImageVolume
+
+  - it: takes ImageVolume from the values as an ordinary entry from Kubernetes 1.35 on
+    capabilities:
+      majorVersion: 1
+      minorVersion: 35
+    set:
+      disabledFeatureGates:
+      - ImageVolume
+    asserts:
+      - equal:
+          path: spec.configuration.developerConfiguration.disabledFeatureGates
+          value:
+          - Template
+          - ExternalNetResourceInjection
+          - ImageVolume
+
+  - it: renders permittedHostDevices verbatim from the values block
+    set:
+      permittedHostDevices:
+        pciHostDevices:
+        - pciVendorSelector: "10DE:2335"
+          resourceName: nvidia.com/GH100_H200_SXM_141GB
+          externalResourceProvider: true
+        - pciVendorSelector: "10DE:26B9"
+          resourceName: nvidia.com/AD102GL_L40S
+          externalResourceProvider: true
+    asserts:
+      - exists:
+          path: spec.configuration.permittedHostDevices.pciHostDevices
+      - equal:
+          path: spec.configuration.permittedHostDevices.pciHostDevices[0].resourceName
+          value: nvidia.com/GH100_H200_SXM_141GB
+      - equal:
+          path: spec.configuration.permittedHostDevices.pciHostDevices[0].externalResourceProvider
+          value: true
+      - equal:
+          path: spec.configuration.permittedHostDevices.pciHostDevices[1].pciVendorSelector
+          value: "10DE:26B9"
+
+  - it: renders mediatedDevices and mediatedDevicesConfiguration for the vGPU shape
+    set:
+      permittedHostDevices:
+        mediatedDevices:
+        - mdevNameSelector: NVIDIA L40S-24Q
+          resourceName: nvidia.com/L40S-24Q
+          externalResourceProvider: true
+      mediatedDevicesConfiguration:
+        mediatedDeviceTypes:
+        - nvidia-740
+    asserts:
+      - equal:
+          path: spec.configuration.permittedHostDevices.mediatedDevices[0].mdevNameSelector
+          value: NVIDIA L40S-24Q
+      - equal:
+          path: spec.configuration.mediatedDevicesConfiguration.mediatedDeviceTypes
+          value:
+          - nvidia-740
+
+  # virt-operator owns the virt-handler DaemonSet, so resources cannot come from
+  # chart values — customizeComponents.patches is the only seam. virt-handler ran
+  # BestEffort on every node, and the Talos userspace OOM handler (v1.12+) only
+  # kills cgroups with no memory.max, so it was a standing eviction candidate.
+  # Pin the patch: a malformed or dropped entry fails silently at runtime, since
+  # virt-operator simply reconciles the DaemonSet without the resources.
+  - it: patches virt-handler with memory requests and limits
+    asserts:
+      - equal:
+          path: spec.customizeComponents.patches[0].resourceName
+          value: virt-handler
+      - equal:
+          path: spec.customizeComponents.patches[0].resourceType
+          value: DaemonSet
+      - equal:
+          path: spec.customizeComponents.patches[0].type
+          value: strategic
+      - matchRegex:
+          path: spec.customizeComponents.patches[0].patch
+          pattern: '"limits":\{"memory":"2Gi"\}'
+      - matchRegex:
+          path: spec.customizeComponents.patches[0].patch
+          pattern: '"requests":\{"cpu":"100m","memory":"128Mi"\}'
diff --git a/packages/system/kubevirt/tests/standalone_render_test.yaml b/packages/system/kubevirt/tests/standalone_render_test.yaml
new file mode 100644
index 0000000000..6eafdcbe99
--- /dev/null
+++ b/packages/system/kubevirt/tests/standalone_render_test.yaml
@@ -0,0 +1,23 @@
+suite: kubevirt renders with no platform values injected
+release:
+  name: kubevirt
+  namespace: cozy-kubevirt
+
+# The platform injects _cluster through the cozystack-values Secret, so every
+# case that sets it itself renders fine whether or not values.yaml declares
+# the key. This case supplies nothing. Drop the declaration from values.yaml
+# and the render dies on "index of untyped nil" before a single assert runs;
+# the declaration is the only thing keeping the chart renderable outside a
+# cluster. No suite-level `templates:` list here on purpose: it would narrow
+# the render to the listed files and let a later template reintroduce the
+# same breakage unseen.
+
+tests:
+  - it: exposes no vm-exportproxy route when _cluster is absent
+    asserts:
+      - template: templates/vm-exportproxy-ingress.yaml
+        hasDocuments:
+          count: 0
+      - template: templates/vm-exportproxy-tlsroute.yaml
+        hasDocuments:
+          count: 0
diff --git a/packages/system/kubevirt/tests/update_idempotency_test.sh b/packages/system/kubevirt/tests/update_idempotency_test.sh
new file mode 100755
index 0000000000..3c103fa71e
--- /dev/null
+++ b/packages/system/kubevirt/tests/update_idempotency_test.sh
@@ -0,0 +1,325 @@
+#!/usr/bin/env bash
+# Regression test for the `make update` idempotency contract.
+#
+# Each cozystack parameterization patch must be reinserted INDEPENDENTLY of the
+# others. A hand-merge from a newer upstream KubeVirt CR may drop one directive
+# while keeping the rest; `make update` must self-heal whichever directive is
+# missing rather than fail. The trap this pins: a single guard that gates the
+# insertion of two directives at once silently skips the second one when the
+# first is still present, and the sanity-check tail then aborts the target.
+set -euo pipefail
+
+# The update target relies on GNU sed (`sed -i` with `a\`/`i\` insert syntax and
+# the range-delete used below). Skip on BSD sed so the suite stays green on a
+# stock macOS without gnu-sed.
+if ! sed --version 2>/dev/null | grep -q GNU; then
+	echo "SKIP update_idempotency_test: GNU sed required" >&2
+	exit 0
+fi
+
+here="$(cd "$(dirname "$0")" && pwd)"
+pkg="$(dirname "$here")"
+src="$pkg/templates/kubevirt-cr.yaml"
+
+fail() {
+	echo "FAIL update_idempotency_test: $*" >&2
+	exit 1
+}
+
+assert_present() {
+	if ! grep -qF "$1" "$2"; then
+		fail "expected directive missing from $2: $1"
+	fi
+}
+
+assert_absent() {
+	if grep -qF "$1" "$2"; then
+		fail "unexpected directive present in $2: $1"
+	fi
+}
+
+assert_count() {
+	local want="$1" pat="$2" file="$3" got
+	got="$(grep -cF "$pat" "$file" || true)"
+	if [ "$got" -ne "$want" ]; then
+		fail "expected $want occurrence(s) of '$pat' in $file, got $got"
+	fi
+}
+
+run_update() {
+	make -C "$pkg" update CR_FILE="$1" >/dev/null 2>&1
+}
+
+# Same call, but keeps stdout+stderr so a case can assert on the diagnostic.
+run_update_logged() {
+	make -C "$pkg" update CR_FILE="$1" >"$2" 2>&1
+}
+
+tmpdir="$(mktemp -d)"
+trap 'rm -rf "$tmpdir"' EXIT
+
+PHD='{{- with .Values.permittedHostDevices }}'
+MDC='{{- with .Values.mediatedDevicesConfiguration }}'
+DFG='{{- range .Values.disabledFeatureGates }}'
+MIG='{{- with .Values.migrations }}'
+
+# The disabledFeatureGates block, comment lines included, ending on the
+# featureGates: line that follows it. Cases below either delete this range or
+# extract it.
+DFG_BLOCK_RANGE='/^      # Template is Beta/,/^      featureGates:$/'
+
+# --- case 1: a hand-merge dropped ONLY the mediatedDevicesConfiguration block.
+# `make update` must reinsert it without duplicating permittedHostDevices.
+missing_mdev="$tmpdir/missing-mdev.yaml"
+sed '/{{- with .Values.mediatedDevicesConfiguration }}/,/{{- end }}/d' "$src" >"$missing_mdev"
+assert_present "$PHD" "$missing_mdev"
+assert_absent "$MDC" "$missing_mdev"
+if ! run_update "$missing_mdev"; then
+	fail "make update exited non-zero on a template missing only mediatedDevicesConfiguration"
+fi
+assert_present "$MDC" "$missing_mdev"
+assert_count 1 "$PHD" "$missing_mdev"
+
+# --- case 2: a hand-merge dropped ONLY the permittedHostDevices block (the
+# symmetric trap). `make update` must reinsert it without touching the other.
+missing_phd="$tmpdir/missing-phd.yaml"
+sed '/{{- with .Values.permittedHostDevices }}/,/{{- end }}/d' "$src" >"$missing_phd"
+assert_absent "$PHD" "$missing_phd"
+assert_present "$MDC" "$missing_phd"
+if ! run_update "$missing_phd"; then
+	fail "make update exited non-zero on a template missing only permittedHostDevices"
+fi
+assert_present "$PHD" "$missing_phd"
+assert_count 1 "$MDC" "$missing_phd"
+
+# --- case 3: an already-parameterized template is a no-op (idempotent).
+full="$tmpdir/full.yaml"
+cp "$src" "$full"
+if ! run_update "$full"; then
+	fail "make update failed on an already-parameterized template"
+fi
+if ! diff -u "$src" "$full" >/dev/null; then
+	fail "make update mutated an already-parameterized template"
+fi
+
+# --- case 4: repeated runs never duplicate a guard directive.
+run_update "$missing_mdev"
+for guard in \
+	'{{- if .Values.cpuAllocationRatio }}' \
+	'{{- range .Values.extraFeatureGates }}' \
+	"$DFG" \
+	"$PHD" \
+	"$MDC" \
+	"$MIG"; do
+	assert_count 1 "$guard" "$missing_mdev"
+done
+
+# --- case 5: a hand-merge dropped ONLY the disabledFeatureGates block. Its
+# insert keys off the featureGates: line the other gate directive leaves
+# alone, so it must come back with both static opt-outs intact.
+#
+# The block runs from its first comment line — the insert carries those too —
+# down to the featureGates: line below it. It is delimited by that line rather
+# than by its own last one because it ends in two consecutive `{{- end }}`
+# lines, and a range terminated on the first of them would leave the second
+# behind.
+missing_dfg="$tmpdir/missing-dfg.yaml"
+sed "$DFG_BLOCK_RANGE{/^      featureGates:\$/!d}" "$src" >"$missing_dfg"
+assert_absent "$DFG" "$missing_dfg"
+assert_absent '      - Template' "$missing_dfg"
+assert_absent '      - ExternalNetResourceInjection' "$missing_dfg"
+assert_absent '      # Template is Beta' "$missing_dfg"
+assert_present '{{- range .Values.extraFeatureGates }}' "$missing_dfg"
+if ! run_update "$missing_dfg"; then
+	fail "make update exited non-zero on a template missing only disabledFeatureGates"
+fi
+assert_count 1 "$DFG" "$missing_dfg"
+assert_count 1 '      - Template' "$missing_dfg"
+assert_count 1 '      - ExternalNetResourceInjection' "$missing_dfg"
+assert_count 1 '{{- range .Values.extraFeatureGates }}' "$missing_dfg"
+
+# --- case 6: the block the sed rebuilds must equal the one committed in the
+# template, byte for byte. The insert text in the Makefile and the block in
+# templates/kubevirt-cr.yaml are two copies of the same lines, and only one of
+# them renders — the copy in the Makefile is exercised nowhere else, so an edit
+# to the block that stops at the template leaves `make update` silently able to
+# restore a stale version of it.
+extract_dfg_block() {
+	sed -n "${DFG_BLOCK_RANGE}p" "$1" | sed '$d'
+}
+
+src_block="$tmpdir/dfg-block-committed.txt"
+rebuilt_block="$tmpdir/dfg-block-rebuilt.txt"
+extract_dfg_block "$src" >"$src_block"
+extract_dfg_block "$missing_dfg" >"$rebuilt_block"
+if ! diff -u "$src_block" "$rebuilt_block" >"$tmpdir/dfg-block.diff"; then
+	fail "make update rebuilt a disabledFeatureGates block that differs from the committed template; update the sed insert text in the Makefile: $(cat "$tmpdir/dfg-block.diff")"
+fi
+
+# --- case 7: a hand-merge kept the range directive but dropped the static
+# `- Template` line under it. The insert is guarded by the directive, so
+# `make update` cannot rebuild the block; the sanity-check tail must say so
+# instead of exiting zero on a CR that would deploy virt-template.
+partial_dfg="$tmpdir/partial-dfg.yaml"
+sed '/^      - Template$/d' "$src" >"$partial_dfg"
+assert_present "$DFG" "$partial_dfg"
+assert_present '      disabledFeatureGates:' "$partial_dfg"
+assert_absent '      - Template' "$partial_dfg"
+partial_log="$tmpdir/partial-dfg.log"
+if run_update_logged "$partial_dfg" "$partial_log"; then
+	fail "make update exited zero on a disabledFeatureGates block missing its static Template entry"
+fi
+if ! grep -qF "marker '      - Template' missing" "$partial_log"; then
+	fail "make update did not name the missing Template marker: $(cat "$partial_log")"
+fi
+
+# --- case 8: the symmetric loss — the block keeps `- Template` but lost the
+# `disabledFeatureGates:` key it hangs under, leaving the entry dangling under
+# developerConfiguration instead of disabling anything.
+keyless_dfg="$tmpdir/keyless-dfg.yaml"
+sed '/^      disabledFeatureGates:$/d' "$src" >"$keyless_dfg"
+assert_present "$DFG" "$keyless_dfg"
+assert_present '      - Template' "$keyless_dfg"
+assert_absent '      disabledFeatureGates:' "$keyless_dfg"
+keyless_log="$tmpdir/keyless-dfg.log"
+if run_update_logged "$keyless_dfg" "$keyless_log"; then
+	fail "make update exited zero on a disabledFeatureGates block missing its key line"
+fi
+if ! grep -qF "marker '      disabledFeatureGates:' missing" "$keyless_log"; then
+	fail "make update did not name the missing disabledFeatureGates key: $(cat "$keyless_log")"
+fi
+
+# --- case 9: the second static entry has the same exposure as the first, and
+# losing it is quieter — the CR keeps disabling virt-template while KubeVirt
+# silently stops injecting NAD resourceName requests into launcher pods.
+partial_enri="$tmpdir/partial-enri.yaml"
+sed '/^      - ExternalNetResourceInjection$/d' "$src" >"$partial_enri"
+assert_present "$DFG" "$partial_enri"
+assert_present '      - Template' "$partial_enri"
+assert_absent '      - ExternalNetResourceInjection' "$partial_enri"
+enri_log="$tmpdir/partial-enri.log"
+if run_update_logged "$partial_enri" "$enri_log"; then
+	fail "make update exited zero on a disabledFeatureGates block missing its static ExternalNetResourceInjection entry"
+fi
+if ! grep -qF "marker '      - ExternalNetResourceInjection' missing" "$enri_log"; then
+	fail "make update did not name the missing ExternalNetResourceInjection marker: $(cat "$enri_log")"
+fi
+
+# --- case 10: the third static entry is the one wrapped in a version
+# condition, so losing it takes the condition's payload with it and a cluster
+# below Kubernetes 1.35 goes back to launcher pods whose image volumes the
+# apiserver strips.
+partial_iv="$tmpdir/partial-iv.yaml"
+sed '/^      - ImageVolume$/d' "$src" >"$partial_iv"
+assert_present "$DFG" "$partial_iv"
+assert_present '      - Template' "$partial_iv"
+assert_absent '      - ImageVolume' "$partial_iv"
+iv_log="$tmpdir/partial-iv.log"
+if run_update_logged "$partial_iv" "$iv_log"; then
+	fail "make update exited zero on a disabledFeatureGates block missing its static ImageVolume entry"
+fi
+if ! grep -qF "marker '      - ImageVolume' missing" "$iv_log"; then
+	fail "make update did not name the missing ImageVolume marker: $(cat "$iv_log")"
+fi
+
+# --- case 11: the block's skip reads $staticDisabledFeatureGates from the guard
+# header, and no insert in the target restores that header. A hand-merge that
+# drops it leaves a template that cannot render at all, so the tail has to say
+# which line is missing rather than exit zero on it.
+headerless="$tmpdir/headerless.yaml"
+sed '/{{- \$staticDisabledFeatureGates := /d' "$src" >"$headerless"
+assert_present "$DFG" "$headerless"
+assert_present '{{- if not (has . $staticDisabledFeatureGates) }}' "$headerless"
+assert_absent '{{- $staticDisabledFeatureGates := ' "$headerless"
+headerless_log="$tmpdir/headerless.log"
+if run_update_logged "$headerless" "$headerless_log"; then
+	fail "make update exited zero on a template whose guard header lost \$staticDisabledFeatureGates"
+fi
+if ! grep -qF 'staticDisabledFeatureGates := ' "$headerless_log"; then
+	fail "make update did not name the missing guard-header line: $(cat "$headerless_log")"
+fi
+
+# A hand-merge may drop migrations while preserving both device blocks.
+# Restoring it must reproduce the committed template, including the YAML key
+# and indentation, rather than merely reintroduce the directive.
+missing_migrations="$tmpdir/missing-migrations.yaml"
+sed '/{{- with .Values.migrations }}/,/{{- end }}/d' "$src" >"$missing_migrations"
+assert_absent "$MIG" "$missing_migrations"
+assert_present "$PHD" "$missing_migrations"
+assert_present "$MDC" "$missing_migrations"
+if ! run_update "$missing_migrations"; then
+	fail "make update exited non-zero on a template missing only migrations"
+fi
+assert_present "$MIG" "$missing_migrations"
+if ! diff -u "$src" "$missing_migrations" >/dev/null; then
+	fail "make update rebuilt migrations differently from the committed template"
+fi
+run_update "$missing_migrations"
+assert_count 1 "$MIG" "$missing_migrations"
+if ! diff -u "$src" "$missing_migrations" >/dev/null; then
+	fail "repeated make update changed the restored migrations template"
+fi
+
+# sed succeeds even when its insertion anchor is absent; the target's sanity
+# check must reject a hand-merged CR that cannot restore migration settings.
+anchorless_migrations="$tmpdir/anchorless-migrations.yaml"
+sed -e '/{{- with .Values.migrations }}/,/{{- end }}/d' \
+	-e '/^    evictionStrategy:/d' "$src" >"$anchorless_migrations"
+anchorless_migrations_log="$tmpdir/anchorless-migrations.log"
+if run_update_logged "$anchorless_migrations" "$anchorless_migrations_log"; then
+	fail "make update exited zero without the migrations block or its evictionStrategy anchor"
+fi
+if ! grep -qF "directive '$MIG' not inserted" "$anchorless_migrations_log"; then
+	fail "make update did not name the missing migrations directive: $(cat "$anchorless_migrations_log")"
+fi
+
+# A retained opening directive must not hide a missing body or terminator.
+# The opening-less case also leaves an orphan key: inserting a second complete
+# block must not make that damaged template pass validation.
+for missing in key payload end body opening; do
+	partial_migrations="$tmpdir/migrations-missing-$missing.yaml"
+	awk -v missing="$missing" -v opening="$MIG" '
+		index($0, opening) { inside=1; if (missing != "opening") print; next }
+		inside && /{{- end }}/ { inside=0; if (missing != "end") print; next }
+		inside && /^    migrations:$/ && (missing == "key" || missing == "body") { next }
+		inside && /{{- toYaml \. \| nindent 6 }}/ && (missing == "payload" || missing == "body") { next }
+		{ print }
+	' "$src" >"$partial_migrations"
+	partial_migrations_log="$tmpdir/migrations-missing-$missing.log"
+	if run_update_logged "$partial_migrations" "$partial_migrations_log"; then
+		fail "make update exited zero on a migrations block missing $missing"
+	fi
+	if ! grep -qF 'migrations block is partial or duplicated' "$partial_migrations_log"; then
+		fail "make update did not diagnose migrations missing $missing: $(cat "$partial_migrations_log")"
+	fi
+done
+
+# Presence checks can also accept reordered lines, a duplicate complete block,
+# or a complete body with EOF in place of its closing directive.
+for malformed in reordered duplicate eof; do
+	malformed_migrations="$tmpdir/migrations-$malformed.yaml"
+	awk -v malformed="$malformed" -v opening="$MIG" '
+		index($0, opening) { inside=1; block=$0 ORS; print; next }
+		inside {
+			block=block $0 ORS
+			if (/{{- end }}/) {
+				if (malformed == "eof") exit
+				inside=0; print
+				if (malformed == "duplicate") printf "%s", block
+				next
+			}
+			if (malformed == "reordered" && /^    migrations:$/) { print "      {{- toYaml . | nindent 6 }}"; next }
+			if (malformed == "reordered" && /{{- toYaml \. \| nindent 6 }}/) { print "    migrations:"; next }
+		}
+		{ print }
+	' "$src" >"$malformed_migrations"
+	malformed_migrations_log="$tmpdir/migrations-$malformed.log"
+	if run_update_logged "$malformed_migrations" "$malformed_migrations_log"; then
+		fail "make update exited zero on a $malformed migrations block"
+	fi
+	if ! grep -qF 'migrations block is partial or duplicated' "$malformed_migrations_log"; then
+		fail "make update did not diagnose $malformed migrations: $(cat "$malformed_migrations_log")"
+	fi
+done
+
+echo "PASS update_idempotency_test"
diff --git a/packages/system/kubevirt/tests/vm_exportproxy_backend_test.yaml b/packages/system/kubevirt/tests/vm_exportproxy_backend_test.yaml
new file mode 100644
index 0000000000..fd938e9b48
--- /dev/null
+++ b/packages/system/kubevirt/tests/vm_exportproxy_backend_test.yaml
@@ -0,0 +1,38 @@
+suite: vm-exportproxy routes reach the Service KubeVirt creates
+templates:
+  - templates/vm-exportproxy-ingress.yaml
+  - templates/vm-exportproxy-tlsroute.yaml
+
+release:
+  name: kubevirt
+  namespace: cozy-kubevirt
+
+# virt-operator names the export proxy Service virt-exportproxy
+# (VirtExportProxyName in pkg/virt-operator/resource/generate/components).
+# The public hostname is vm-exportproxy.<host>; the Service name is not
+# derived from it.
+
+tests:
+  - it: the Ingress backend is virt-exportproxy
+    set:
+      _cluster:
+        root-host: example.org
+        expose-services: "vm-exportproxy"
+        gateway-enabled: "false"
+    template: templates/vm-exportproxy-ingress.yaml
+    asserts:
+      - equal:
+          path: spec.rules[0].http.paths[0].backend.service.name
+          value: virt-exportproxy
+
+  - it: the TLSRoute backend is virt-exportproxy
+    set:
+      _cluster:
+        root-host: example.org
+        expose-services: "vm-exportproxy"
+        gateway-enabled: "true"
+    template: templates/vm-exportproxy-tlsroute.yaml
+    asserts:
+      - equal:
+          path: spec.rules[0].backendRefs[0].name
+          value: virt-exportproxy
diff --git a/packages/system/kubevirt/values.yaml b/packages/system/kubevirt/values.yaml
index 8b13789179..fff27ad8e0 100644
--- a/packages/system/kubevirt/values.yaml
+++ b/packages/system/kubevirt/values.yaml
@@ -1 +1,79 @@
+# Injected by the platform from the cozystack-values Secret. The empty
+# default keeps the chart renderable on its own, outside a cluster.
+_cluster: {}
 
+# CPU oversubscription ratio. When set, propagates to
+# spec.configuration.developerConfiguration.cpuAllocationRatio on the
+# KubeVirt CR. Driven by .Values.resources.cpuAllocationRatio at the
+# platform level.
+# cpuAllocationRatio: 10
+
+# Feature gates appended after the static defaults
+# (DeclarativeHotplugVolumes/ExpandDisks/LiveMigration/AutoResourceLimitsGate/CPUManager/GPU/VMExport).
+# Empty by default. Filled by the platform with "HostDevices" when the
+# gpu-operator package is enabled with the passthrough variant — the
+# admission webhook rejects spec.template.spec.domain.devices.hostDevices
+# without that gate even with the GPU gate on, since current KubeVirt
+# splits them.
+extraFeatureGates: []
+
+# Feature gates appended after the static opt-outs under
+# spec.configuration.developerConfiguration.disabledFeatureGates. The chart
+# always disables Template and ExternalNetResourceInjection, and adds
+# ImageVolume below Kubernetes 1.35, where the apiserver's own gate is off and
+# would strip the launcher's image volumes. KubeVirt enables every Beta gate by
+# default; list a gate here to switch off one this cluster cannot carry, e.g. on
+# a container runtime without image volume support at 1.35 or newer.
+# Naming a gate the chart already disables is a no-op: it renders once.
+#
+# Admins set this through spec.components.platform.values.kubevirt on the
+# cozystack.cozystack-platform Package; the iaas bundle forwards it into the
+# emitted cozystack.kubevirt Package as components.kubevirt.values.
+#
+# A gate this chart already enables cannot be switched off here, and a gate it
+# disables cannot be switched back on through extraFeatureGates: KubeVirt
+# refuses a CR that names the same gate in both lists, so the template stops
+# the render and names the gate. ImageVolume is therefore rejected in
+# extraFeatureGates below 1.35 and accepted from 1.35 on.
+disabledFeatureGates: []
+
+# Permitted host devices the KubeVirt admission webhook accepts under
+# spec.template.spec.domain.devices.hostDevices / gpus on a VirtualMachine.
+# Empty by default — leaves the CR's permittedHostDevices unset.
+#
+# Filled by the platform with NVIDIA PCI vendor:device → resourceName
+# pairs (vendor 10DE) when gpu-operator runs in vfio passthrough mode,
+# and with mediatedDevices entries when it runs in vGPU mode.
+# externalResourceProvider: true is required because the resource names
+# are published by gpu-operator's nvidia-sandbox-device-plugin DaemonSet,
+# not by KubeVirt itself.
+#
+# Shape (subset of kubevirt.io/v1 PermittedHostDevices):
+#   pciHostDevices:
+#   - pciVendorSelector: "10DE:2335"
+#     resourceName: nvidia.com/GH100_H200_SXM_141GB
+#     externalResourceProvider: true
+#   mediatedDevices:
+#   - mdevNameSelector: NVIDIA L40S-24Q
+#     resourceName: nvidia.com/L40S-24Q
+permittedHostDevices: {}
+
+# mediatedDevicesConfiguration for vGPU. Filled by the platform when the
+# gpu-operator package runs in vGPU mode; empty otherwise.
+#
+# Shape (subset of kubevirt.io/v1 MediatedDevicesConfiguration):
+#   mediatedDeviceTypes:
+#   - nvidia-740   # L40S-24Q
+#   nodeMediatedDeviceTypes:
+#   - nodeSelector:
+#       nvidia.com/gpu.product: NVIDIA-L40S
+#     mediatedDeviceTypes:
+#     - nvidia-740
+mediatedDevicesConfiguration: {}
+
+# Passed to spec.configuration.migrations on the KubeVirt CR.
+# Empty leaves KubeVirt's migration defaults unchanged.
+# bandwidthPerMigration is a quantity in bytes per second.
+# Set through spec.components.platform.values.kubevirt.migrations
+# on the cozystack.cozystack-platform Package.
+migrations: {}
diff --git a/packages/system/lineage-controller-webhook/Makefile b/packages/system/lineage-controller-webhook/Makefile
index c9fbaa64f6..1032352480 100644
--- a/packages/system/lineage-controller-webhook/Makefile
+++ b/packages/system/lineage-controller-webhook/Makefile
@@ -14,8 +14,7 @@ test:
 image-lineage-controller-webhook:
 	docker buildx build -f images/lineage-controller-webhook/Dockerfile ../../.. \
 		$(call image-tags,lineage-controller-webhook,v$(COZYSTACK_VERSION)) \
-		--cache-from type=registry,ref=$(REGISTRY)/lineage-controller-webhook:latest \
-		--cache-to type=inline \
+		$(call cache-args,lineage-controller-webhook) \
 		--metadata-file images/lineage-controller-webhook.json \
 		$(BUILDX_ARGS)
 	IMAGE="$(REGISTRY)/lineage-controller-webhook:$(IMAGE_TAG)@$$(yq e '."containerimage.digest"' images/lineage-controller-webhook.json -o json -r)" \
diff --git a/packages/system/lineage-controller-webhook/README.md b/packages/system/lineage-controller-webhook/README.md
index 1e43c9c8af..4871325d85 100644
--- a/packages/system/lineage-controller-webhook/README.md
+++ b/packages/system/lineage-controller-webhook/README.md
@@ -52,6 +52,7 @@ All keys live under the top-level `lineageControllerWebhook:` map.
 | `image`                       | Container image (digest-pinned)                           | `ghcr.io/cozystack/cozystack/lineage-controller-webhook:v1.3.0@sha256:e898…6fb0` |
 | `debug`                       | Enable `--zap-log-level=debug` instead of `info`          | `false`                                                                          |
 | `replicas`                    | Deployment replica count                                  | `2`                                                                              |
+| `resources`                   | Container requests/limits; `{}` renders no key            | `{}`                                                                             |
 | `localK8sAPIEndpoint.enabled` | **Deprecated.** See note below.                           | `false`                                                                          |
 
 ### `localK8sAPIEndpoint.enabled` (deprecated)
diff --git a/packages/system/lineage-controller-webhook/images/lineage-controller-webhook/Dockerfile b/packages/system/lineage-controller-webhook/images/lineage-controller-webhook/Dockerfile
index 64d46ddbe4..c0b5cf83f4 100644
--- a/packages/system/lineage-controller-webhook/images/lineage-controller-webhook/Dockerfile
+++ b/packages/system/lineage-controller-webhook/images/lineage-controller-webhook/Dockerfile
@@ -1,4 +1,5 @@
-FROM golang:1.26-alpine AS builder
+FROM --platform=$BUILDPLATFORM golang:1.27-alpine@sha256:8a5910f31396cd4d89662f56c68b3ae31d374308270a1c3bd96672ee5ed43414 AS builder
+ARG GOPROXY
 
 ARG TARGETOS
 ARG TARGETARCH
@@ -6,7 +7,7 @@ ARG TARGETARCH
 WORKDIR /workspace
 
 COPY go.mod go.sum ./
-RUN GOOS=$TARGETOS GOARCH=$TARGETARCH go mod download
+RUN for attempt in 1 2 3; do GOOS=$TARGETOS GOARCH=$TARGETARCH go mod download && break; [ "$attempt" = 3 ] && exit 1; sleep $((attempt * 10)); done
 
 COPY api api/
 COPY pkg pkg/
diff --git a/packages/system/lineage-controller-webhook/templates/validatingwebhookconfiguration.yaml b/packages/system/lineage-controller-webhook/templates/validatingwebhookconfiguration.yaml
new file mode 100644
index 0000000000..12f56ad7b6
--- /dev/null
+++ b/packages/system/lineage-controller-webhook/templates/validatingwebhookconfiguration.yaml
@@ -0,0 +1,30 @@
+apiVersion: admissionregistration.k8s.io/v1
+kind: ValidatingWebhookConfiguration
+metadata:
+  name: lineage-applicationdefinition-kind
+  annotations:
+    cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/lineage-controller-webhook
+  labels:
+    app: cozystack-controller
+webhooks:
+  # Refuses a second ApplicationDefinition for an application kind that is
+  # already declared. failurePolicy Ignore: ApplicationDefinitions ship with the
+  # platform itself, so a webhook that is not up yet must not block a bootstrap
+  # or an upgrade. Which definition manages a kind is decided in code
+  # (internal/shared/appdefowner) whatever this check lets through.
+  - name: applicationdefinition-kind.cozystack.io
+    admissionReviewVersions: ["v1"]
+    sideEffects: None
+    timeoutSeconds: 5
+    clientConfig:
+      service:
+        name: lineage-controller-webhook
+        namespace: {{ .Release.Namespace }}
+        path: /validate-applicationdefinition
+    rules:
+      - operations: ["CREATE", "UPDATE"]
+        apiGroups: ["cozystack.io"]
+        apiVersions: ["v1alpha1"]
+        resources: ["applicationdefinitions"]
+        scope: Cluster
+    failurePolicy: Ignore
diff --git a/packages/system/lineage-controller-webhook/templates/workload.yaml b/packages/system/lineage-controller-webhook/templates/workload.yaml
index 097919c67b..f22d8c65ff 100644
--- a/packages/system/lineage-controller-webhook/templates/workload.yaml
+++ b/packages/system/lineage-controller-webhook/templates/workload.yaml
@@ -59,6 +59,10 @@ spec:
           - name: webhook-certs
             mountPath: /tmp/k8s-webhook-server/serving-certs
             readOnly: true
+        {{- with .Values.lineageControllerWebhook.resources }}
+        resources:
+          {{- toYaml . | nindent 10 }}
+        {{- end }}
       volumes:
         - name: webhook-certs
           secret:
diff --git a/packages/system/lineage-controller-webhook/tests/resources_test.yaml b/packages/system/lineage-controller-webhook/tests/resources_test.yaml
new file mode 100644
index 0000000000..1b598ac313
--- /dev/null
+++ b/packages/system/lineage-controller-webhook/tests/resources_test.yaml
@@ -0,0 +1,40 @@
+suite: lineage-controller-webhook resources knob
+templates:
+  - templates/workload.yaml
+
+release:
+  name: lineage-controller-webhook
+  namespace: cozy-system
+
+# Two replicas serve this webhook with no leader election, which is fine because
+# its controller only refreshes an in-process cache and writes nothing. The
+# resources knob follows the same contract as the other two engine charts: `{}`
+# renders no key, a set value lands on the container.
+
+tests:
+  - it: the shipped default renders no resources key
+    asserts:
+      - isKind:
+          of: Deployment
+      - notExists:
+          path: spec.template.spec.containers[0].resources
+
+  - it: a set value renders on the container, not the pod
+    set:
+      lineageControllerWebhook.resources:
+        requests:
+          cpu: 1m
+          memory: 48Mi
+        limits:
+          cpu: 500m
+          memory: 256Mi
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].resources
+          value:
+            requests:
+              cpu: 1m
+              memory: 48Mi
+            limits:
+              cpu: 500m
+              memory: 256Mi
diff --git a/packages/system/lineage-controller-webhook/tests/validatingwebhookconfiguration_test.yaml b/packages/system/lineage-controller-webhook/tests/validatingwebhookconfiguration_test.yaml
new file mode 100644
index 0000000000..eba9edf75c
--- /dev/null
+++ b/packages/system/lineage-controller-webhook/tests/validatingwebhookconfiguration_test.yaml
@@ -0,0 +1,31 @@
+suite: lineage-controller-webhook ApplicationDefinition kind check
+templates:
+  - templates/validatingwebhookconfiguration.yaml
+
+release:
+  name: lineage-controller-webhook
+  namespace: cozy-system
+
+tests:
+  - it: routes ApplicationDefinition create and update to the kind check without blocking on an outage
+    asserts:
+      - isKind:
+          of: ValidatingWebhookConfiguration
+      - equal:
+          path: webhooks[0].clientConfig.service.path
+          value: /validate-applicationdefinition
+      - equal:
+          path: webhooks[0].clientConfig.service.namespace
+          value: cozy-system
+      - equal:
+          path: webhooks[0].failurePolicy
+          value: Ignore
+      - equal:
+          path: webhooks[0].rules[0].resources
+          value: ["applicationdefinitions"]
+      - equal:
+          path: webhooks[0].rules[0].operations
+          value: ["CREATE", "UPDATE"]
+      - equal:
+          path: metadata.annotations["cert-manager.io/inject-ca-from"]
+          value: cozy-system/lineage-controller-webhook
diff --git a/packages/system/lineage-controller-webhook/values.yaml b/packages/system/lineage-controller-webhook/values.yaml
index 245c39cf0d..66fddfe54d 100644
--- a/packages/system/lineage-controller-webhook/values.yaml
+++ b/packages/system/lineage-controller-webhook/values.yaml
@@ -1,5 +1,5 @@
 lineageControllerWebhook:
-  image: ghcr.io/cozystack/cozystack/lineage-controller-webhook:v1.4.0-rc.2@sha256:c792eb54c67d1b9ea0f2de2107ebea5f85640eed929cbb8a65143f463ec8f0b9
+  image: ghcr.io/cozystack/cozystack/lineage-controller-webhook:v1.6.0@sha256:3a5b4951a78d507eb847f4f3311052810dc658fd7c85c49eeb32ac5469cb39a2
   debug: false
   replicas: 2
   # DEPRECATED. Injects KUBERNETES_SERVICE_HOST=status.hostIP and
@@ -11,3 +11,6 @@ lineageControllerWebhook:
   # performance work obviates the locality motivation. Leave disabled.
   localK8sAPIEndpoint:
     enabled: false
+  # Empty by default: no resources block is rendered, so requests and limits are
+  # opt-in. Idle usage (measured) is ~35Mi — keep a limit above that.
+  resources: {}
diff --git a/packages/system/linstor-gui/Makefile b/packages/system/linstor-gui/Makefile
index 1be27f4484..ac0db36d09 100644
--- a/packages/system/linstor-gui/Makefile
+++ b/packages/system/linstor-gui/Makefile
@@ -14,8 +14,7 @@ image-linstor-gui:
 	docker buildx build images/linstor-gui \
 		--build-arg LINSTOR_GUI_VERSION=$(LINSTOR_GUI_VERSION) \
 		$(call image-tags,linstor-gui,$(LINSTOR_GUI_VERSION)) \
-		--cache-from type=registry,ref=$(REGISTRY)/linstor-gui:latest \
-		--cache-to type=inline \
+		$(call cache-args,linstor-gui) \
 		--metadata-file images/linstor-gui.json \
 		$(BUILDX_ARGS)
 	REPOSITORY="$(REGISTRY)/linstor-gui" \
diff --git a/packages/system/linstor-gui/images/linstor-gui/Dockerfile b/packages/system/linstor-gui/images/linstor-gui/Dockerfile
index 2082ef0d40..57a2a1f1e3 100644
--- a/packages/system/linstor-gui/images/linstor-gui/Dockerfile
+++ b/packages/system/linstor-gui/images/linstor-gui/Dockerfile
@@ -2,7 +2,7 @@
 # Serves the pre-built LINSTOR GUI tarball published by LINBIT from a hardened
 # nginx-unprivileged image. nginx.conf is supplied by the chart via ConfigMap,
 # so the upstream docker-entrypoint.sh / nginx.conf.template is not used.
-FROM nginxinc/nginx-unprivileged:1.29-alpine
+FROM nginxinc/nginx-unprivileged:1.29-alpine@sha256:0c79d56aee561a1d81c63f00eee5fb5fe29279560cdc55e91425133104c7fbe6
 
 ARG LINSTOR_GUI_VERSION
 USER root
diff --git a/packages/system/linstor-gui/templates/gatekeeper.yaml b/packages/system/linstor-gui/templates/gatekeeper.yaml
index 81451f418c..ef1c2521e6 100644
--- a/packages/system/linstor-gui/templates/gatekeeper.yaml
+++ b/packages/system/linstor-gui/templates/gatekeeper.yaml
@@ -1,4 +1,5 @@
 {{- $host := index .Values._cluster "root-host" }}
+{{- $realm := index .Values._cluster "oidc-realm-name" | default "cozy" }}
 {{- $oidcEnabled := index .Values._cluster "oidc-enabled" }}
 {{- $oidcInsecureSkipVerify := index .Values._cluster "oidc-insecure-skip-verify" }}
 {{- $keycloakInternalUrl := index .Values._cluster "keycloak-internal-url" | default "" }}
@@ -69,16 +70,16 @@ spec:
             - --upstream=http://linstor-gui.{{ .Release.Namespace }}.svc:80
             - --http-address=0.0.0.0:8000
             - --redirect-url=https://linstor-gui.{{ $host }}/oauth2/callback
-            - --oidc-issuer-url=https://keycloak.{{ $host }}/realms/cozy
+            - --oidc-issuer-url=https://keycloak.{{ $host }}/realms/{{ $realm }}
             {{- if $keycloakInternalUrl }}
             - --skip-oidc-discovery
-            - --login-url=https://keycloak.{{ $host }}/realms/cozy/protocol/openid-connect/auth
+            - --login-url=https://keycloak.{{ $host }}/realms/{{ $realm }}/protocol/openid-connect/auth
             - --redeem-url={{ $keycloakInternalUrl }}/protocol/openid-connect/token
             - --oidc-jwks-url={{ $keycloakInternalUrl }}/protocol/openid-connect/certs
             - --validate-url={{ $keycloakInternalUrl }}/protocol/openid-connect/userinfo
             - --backend-logout-url={{ $keycloakInternalUrl }}/protocol/openid-connect/logout?id_token_hint={id_token}
             {{- else }}
-            - --backend-logout-url=https://keycloak.{{ $host }}/realms/cozy/protocol/openid-connect/logout?id_token_hint={id_token}
+            - --backend-logout-url=https://keycloak.{{ $host }}/realms/{{ $realm }}/protocol/openid-connect/logout?id_token_hint={id_token}
             {{- end }}
             - --whitelist-domain=keycloak.{{ $host }}
             - --email-domain=*
@@ -89,7 +90,14 @@ spec:
             - --cookie-secure=true
             - --cookie-secret=$(OAUTH2_PROXY_COOKIE_SECRET)
             - --skip-provider-button
-            - --scope=openid email profile groups offline_access
+            # No offline_access: that scope makes Keycloak issue an *offline*
+            # refresh token, which is decoupled from the SSO session and is NOT
+            # revoked by logout (end_session). Since oauth2-proxy keeps the
+            # refresh token in the kc-access cookie and silently refreshes it,
+            # a copied cookie would stay valid for the whole offline-session
+            # lifetime (~30d) even after the user logs out. An online refresh
+            # token is bound to the SSO session and is revoked on logout.
+            - --scope=openid email profile groups
             - --allowed-group=cozystack-cluster-admin
             {{- if eq $oidcInsecureSkipVerify "true" }}
             - --ssl-insecure-skip-verify=true
diff --git a/packages/system/linstor-gui/templates/ingress.yaml b/packages/system/linstor-gui/templates/ingress.yaml
index c50b0f86dc..b73b813cd7 100644
--- a/packages/system/linstor-gui/templates/ingress.yaml
+++ b/packages/system/linstor-gui/templates/ingress.yaml
@@ -1,5 +1,6 @@
 {{- $solver := (index .Values._cluster "solver") | default "http01" }}
 {{- $clusterIssuer := (index .Values._cluster "issuer-name") | default "letsencrypt-prod" }}
+{{- $wildcardSecret := (index .Values._cluster "wildcard-secret-name") | default "" }}
 {{- $host := index .Values._cluster "root-host" }}
 {{- $oidcEnabled := index .Values._cluster "oidc-enabled" }}
 {{- $exposeServices := splitList "," ((index .Values._cluster "expose-services") | default "") }}
@@ -20,10 +21,13 @@ metadata:
   labels:
     {{- include "linstor-gui.labels" . | nindent 4 }}
   annotations:
+    {{- /* Operator wildcard mode: nginx serves the default SSL cert, so skip per-host ACME. */}}
+    {{- if not $wildcardSecret }}
     cert-manager.io/cluster-issuer: {{ $clusterIssuer }}
     {{- if eq $solver "http01" }}
     acme.cert-manager.io/http01-ingress-ingressclassname: {{ $exposeIngress }}
     {{- end }}
+    {{- end }}
     nginx.ingress.kubernetes.io/proxy-body-size: 100m
     # Keycloak access+refresh+id tokens make the oauth2-proxy session
     # cookie ~8–10 KB (split across multiple Set-Cookie headers), which
@@ -50,5 +54,10 @@ spec:
   tls:
     - hosts:
         - linstor-gui.{{ $host }}
+      {{- /* Operator wildcard mode: no per-host secret — ingress-nginx falls
+             back to the default SSL certificate while the tls section keeps
+             the HTTP-to-HTTPS redirect enforced. */}}
+      {{- if not $wildcardSecret }}
       secretName: linstor-gui-ingress-tls
+      {{- end }}
 {{- end }}
diff --git a/packages/system/linstor-gui/templates/keycloakclient.yaml b/packages/system/linstor-gui/templates/keycloakclient.yaml
index e5dab87b28..d32a8d133c 100644
--- a/packages/system/linstor-gui/templates/keycloakclient.yaml
+++ b/packages/system/linstor-gui/templates/keycloakclient.yaml
@@ -63,8 +63,11 @@ spec:
   webUrl: "https://linstor-gui.{{ $host }}"
   defaultClientScopes:
     - groups
-  optionalClientScopes:
-    - offline_access
+  # offline_access is intentionally not offered: an offline refresh token
+  # survives logout (see the proxy Deployment's --scope). NB the
+  # keycloak-operator only adds client scopes, so dropping this does not strip
+  # the realm-default offline_access from an already-created client; the proxy
+  # --scope change is what prevents issuance.
   attributes:
     post.logout.redirect.uris: "+"
   redirectUris:
diff --git a/packages/system/linstor-gui/tests/ingress_auth_test.yaml b/packages/system/linstor-gui/tests/ingress_auth_test.yaml
index 2f0b1d738e..e714e4917b 100644
--- a/packages/system/linstor-gui/tests/ingress_auth_test.yaml
+++ b/packages/system/linstor-gui/tests/ingress_auth_test.yaml
@@ -43,7 +43,7 @@ tests:
     template: templates/ingress.yaml
     set:
       _cluster:
-        root-host: dev10.example.org
+        root-host: example.org
         oidc-enabled: "true"
         expose-services: "dashboard,linstor-gui"
         expose-ingress: "tenant-root"
@@ -57,7 +57,7 @@ tests:
           value: tenant-root
       - equal:
           path: spec.rules[0].host
-          value: linstor-gui.dev10.example.org
+          value: linstor-gui.example.org
       - equal:
           path: spec.rules[0].http.paths[0].backend.service.name
           value: linstor-gui-gatekeeper
@@ -79,11 +79,27 @@ tests:
       - hasDocuments:
           count: 0
 
+  # authentication.oidc.enabled defaults to false while keycloakInternalUrl now
+  # defaults to the in-cluster Service, so THIS pair — OIDC off, internal URL
+  # set — is what most clusters actually render. A non-empty internal URL must
+  # not conjure a gatekeeper on a cluster that never asked for OIDC.
+  - it: a set keycloak-internal-url does not render a gatekeeper while OIDC is disabled
+    template: templates/gatekeeper.yaml
+    set:
+      _cluster:
+        root-host: example.org
+        oidc-enabled: "false"
+        keycloak-internal-url: http://keycloak-http.cozy-keycloak.svc:8080/realms/cozy
+        expose-services: "linstor-gui"
+    asserts:
+      - hasDocuments:
+          count: 0
+
   - it: renders an oauth2-proxy Deployment pointing at the cluster Keycloak realm
     template: templates/gatekeeper.yaml
     set:
       _cluster:
-        root-host: dev10.example.org
+        root-host: example.org
         oidc-enabled: "true"
         oidc-insecure-skip-verify: "false"
         keycloak-internal-url: ""
@@ -105,13 +121,13 @@ tests:
           content: --upstream=http://linstor-gui.cozy-linstor.svc:80
       - contains:
           path: spec.template.spec.containers[0].args
-          content: --redirect-url=https://linstor-gui.dev10.example.org/oauth2/callback
+          content: --redirect-url=https://linstor-gui.example.org/oauth2/callback
       - contains:
           path: spec.template.spec.containers[0].args
-          content: --oidc-issuer-url=https://keycloak.dev10.example.org/realms/cozy
+          content: --oidc-issuer-url=https://keycloak.example.org/realms/cozy
       - contains:
           path: spec.template.spec.containers[0].args
-          content: --scope=openid email profile groups offline_access
+          content: --scope=openid email profile groups
       - contains:
           path: spec.template.spec.containers[0].args
           content: --allowed-group=cozystack-cluster-admin
@@ -124,6 +140,113 @@ tests:
           path: spec.template.spec.containers[0].securityContext.readOnlyRootFilesystem
           value: true
 
+  # keycloak-internal-url arrives on the _cluster channel from
+  # authentication.oidc.keycloakInternalUrl in packages/core/platform, whose
+  # default is the in-cluster Keycloak Service. A stock cluster therefore
+  # renders --skip-oidc-discovery with the backend calls (token, jwks,
+  # userinfo, logout) aimed at the Service, so the proxy does not need the
+  # external keycloak.<host> ingress to be serving before it can start. The
+  # browser-facing URLs (redirect, login) must stay on the external host.
+  - it: default in-cluster keycloak URL skips discovery and keeps browser URLs external
+    template: templates/gatekeeper.yaml
+    set:
+      _cluster:
+        root-host: example.org
+        oidc-enabled: "true"
+        keycloak-internal-url: http://keycloak-http.cozy-keycloak.svc:8080/realms/cozy
+        expose-services: "linstor-gui"
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: --skip-oidc-discovery
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: --redeem-url=http://keycloak-http.cozy-keycloak.svc:8080/realms/cozy/protocol/openid-connect/token
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: --oidc-jwks-url=http://keycloak-http.cozy-keycloak.svc:8080/realms/cozy/protocol/openid-connect/certs
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: --validate-url=http://keycloak-http.cozy-keycloak.svc:8080/realms/cozy/protocol/openid-connect/userinfo
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: --backend-logout-url=http://keycloak-http.cozy-keycloak.svc:8080/realms/cozy/protocol/openid-connect/logout?id_token_hint={id_token}
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: --redirect-url=https://linstor-gui.example.org/oauth2/callback
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: --login-url=https://keycloak.example.org/realms/cozy/protocol/openid-connect/auth
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: --oidc-issuer-url=https://keycloak.example.org/realms/cozy
+
+  - it: an explicit keycloak-internal-url override wins over the default
+    template: templates/gatekeeper.yaml
+    set:
+      _cluster:
+        root-host: example.org
+        oidc-enabled: "true"
+        keycloak-internal-url: http://keycloak.example.test:8080/realms/other
+        expose-services: "linstor-gui"
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: --skip-oidc-discovery
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: --redeem-url=http://keycloak.example.test:8080/realms/other/protocol/openid-connect/token
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: --oidc-jwks-url=http://keycloak.example.test:8080/realms/other/protocol/openid-connect/certs
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: --validate-url=http://keycloak.example.test:8080/realms/other/protocol/openid-connect/userinfo
+      - notContains:
+          path: spec.template.spec.containers[0].args
+          content: --redeem-url=http://keycloak-http.cozy-keycloak.svc:8080/realms/cozy/protocol/openid-connect/token
+
+  # The escape hatch: setting keycloakInternalUrl back to "" must keep
+  # rendering the historical shape — full OIDC discovery against the external
+  # issuer, no backend URLs pinned.
+  #
+  # --skip-oidc-discovery carries the whole meaning here. All five in-cluster
+  # args live inside one {{- if $keycloakInternalUrl }} block in the template,
+  # so its absence structurally guarantees the absence of the other four; the
+  # notContains assertions below then pin the regression that actually threatens
+  # this branch — the in-cluster default leaking back in. Asserting an arg count
+  # instead would couple this OIDC test to every unrelated gatekeeper flag.
+  - it: empty keycloak-internal-url restores external OIDC discovery
+    template: templates/gatekeeper.yaml
+    set:
+      _cluster:
+        root-host: example.org
+        oidc-enabled: "true"
+        keycloak-internal-url: ""
+        expose-services: "linstor-gui"
+    asserts:
+      - notContains:
+          path: spec.template.spec.containers[0].args
+          content: --skip-oidc-discovery
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: --oidc-issuer-url=https://keycloak.example.org/realms/cozy
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: --backend-logout-url=https://keycloak.example.org/realms/cozy/protocol/openid-connect/logout?id_token_hint={id_token}
+      - notContains:
+          path: spec.template.spec.containers[0].args
+          content: --redeem-url=http://keycloak-http.cozy-keycloak.svc:8080/realms/cozy/protocol/openid-connect/token
+      - notContains:
+          path: spec.template.spec.containers[0].args
+          content: --oidc-jwks-url=http://keycloak-http.cozy-keycloak.svc:8080/realms/cozy/protocol/openid-connect/certs
+      - notContains:
+          path: spec.template.spec.containers[0].args
+          content: --validate-url=http://keycloak-http.cozy-keycloak.svc:8080/realms/cozy/protocol/openid-connect/userinfo
+      - notContains:
+          path: spec.template.spec.containers[0].args
+          content: --backend-logout-url=http://keycloak-http.cozy-keycloak.svc:8080/realms/cozy/protocol/openid-connect/logout?id_token_hint={id_token}
+
   - it: creates client + cookie Secrets and a KeycloakClient CRD
     template: templates/keycloakclient.yaml
     capabilities:
@@ -131,7 +254,7 @@ tests:
         - v1.edp.epam.com/v1
     set:
       _cluster:
-        root-host: dev10.example.org
+        root-host: example.org
     asserts:
       - hasDocuments:
           count: 3
@@ -159,7 +282,7 @@ tests:
       - documentIndex: 2
         contains:
           path: spec.redirectUris
-          content: "https://linstor-gui.dev10.example.org/oauth2/callback/*"
+          content: "https://linstor-gui.example.org/oauth2/callback/*"
 
   - it: skips the KeycloakClient CRD when the API is absent, still creates Secrets
     template: templates/keycloakclient.yaml
@@ -175,3 +298,50 @@ tests:
       - documentIndex: 1
         isKind:
           of: Secret
+
+  # The realm segment of the browser-facing issuer/login/logout URLs is driven
+  # by _cluster.oidc-realm-name (authentication.oidc.realmName in the platform).
+  # A renamed realm must reach every one of them so SSO keeps matching the
+  # apiserver OIDC issuer.
+  - it: threads a custom realm name through the browser-facing OIDC URLs
+    template: templates/gatekeeper.yaml
+    set:
+      _cluster:
+        root-host: example.org
+        oidc-enabled: "true"
+        oidc-realm-name: acme
+        keycloak-internal-url: http://keycloak-http.cozy-keycloak.svc:8080/realms/acme
+        expose-services: "linstor-gui"
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: --oidc-issuer-url=https://keycloak.example.org/realms/acme
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: --login-url=https://keycloak.example.org/realms/acme/protocol/openid-connect/auth
+      - notContains:
+          path: spec.template.spec.containers[0].args
+          content: --oidc-issuer-url=https://keycloak.example.org/realms/cozy
+
+  # The external-discovery branch (empty internal URL) builds its own
+  # backend-logout-url on the browser host; its realm segment must follow
+  # oidc-realm-name too.
+  - it: threads a custom realm into the external-discovery logout URL
+    template: templates/gatekeeper.yaml
+    set:
+      _cluster:
+        root-host: example.org
+        oidc-enabled: "true"
+        oidc-realm-name: acme
+        keycloak-internal-url: ""
+        expose-services: "linstor-gui"
+    asserts:
+      - notContains:
+          path: spec.template.spec.containers[0].args
+          content: --skip-oidc-discovery
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: --backend-logout-url=https://keycloak.example.org/realms/acme/protocol/openid-connect/logout?id_token_hint={id_token}
+      - notContains:
+          path: spec.template.spec.containers[0].args
+          content: --backend-logout-url=https://keycloak.example.org/realms/cozy/protocol/openid-connect/logout?id_token_hint={id_token}
diff --git a/packages/system/linstor-gui/tests/ingress_wildcard_test.yaml b/packages/system/linstor-gui/tests/ingress_wildcard_test.yaml
new file mode 100644
index 0000000000..faf8ad62f0
--- /dev/null
+++ b/packages/system/linstor-gui/tests/ingress_wildcard_test.yaml
@@ -0,0 +1,47 @@
+suite: linstor-gui ingress wildcard mode drops per-host ACME
+templates:
+  - templates/ingress.yaml
+
+release:
+  name: linstor-gui
+  namespace: cozy-linstor-gui
+
+# linstor-gui has no gateway guard (it only publishes under
+# expose-services + oidc-enabled), so it exercises the drop-cert path
+# for the no-gateway-guard convention. In wildcard mode the controller
+# serves the default SSL cert, so the per-host cert-manager annotation
+# and per-host tls secretName are dropped; the tls section stays so
+# the HTTPS redirect keeps working against the default SSL certificate.
+
+tests:
+  - it: drops cert-manager annotation and tls secretName when wildcard secret is set
+    set:
+      _cluster:
+        root-host: example.org
+        expose-services: "linstor-gui"
+        oidc-enabled: "true"
+        wildcard-secret-name: wildcard-tls
+    asserts:
+      - equal:
+          path: kind
+          value: Ingress
+      - notExists:
+          path: metadata.annotations["cert-manager.io/cluster-issuer"]
+      - exists:
+          path: spec.tls
+      - notExists:
+          path: spec.tls[0].secretName
+
+  - it: keeps cert-manager annotation and tls secretName without wildcard secret
+    set:
+      _cluster:
+        root-host: example.org
+        expose-services: "linstor-gui"
+        oidc-enabled: "true"
+    asserts:
+      - equal:
+          path: metadata.annotations["cert-manager.io/cluster-issuer"]
+          value: letsencrypt-prod
+      - equal:
+          path: spec.tls[0].secretName
+          value: linstor-gui-ingress-tls
diff --git a/packages/system/linstor-gui/tests/standalone_render_test.yaml b/packages/system/linstor-gui/tests/standalone_render_test.yaml
new file mode 100644
index 0000000000..cf32cb6749
--- /dev/null
+++ b/packages/system/linstor-gui/tests/standalone_render_test.yaml
@@ -0,0 +1,20 @@
+suite: linstor-gui renders with no platform values injected
+release:
+  name: linstor-gui
+  namespace: cozy-linstor
+
+# The platform injects _cluster through the cozystack-values Secret, so every
+# case that sets it itself renders fine whether or not values.yaml declares
+# the key. This case supplies nothing. Drop the declaration from values.yaml
+# and the render dies on "index of untyped nil" before a single assert runs;
+# the declaration is the only thing keeping the chart renderable outside a
+# cluster. No suite-level `templates:` list here on purpose: it would narrow
+# the render to the listed files and let a later template reintroduce the
+# same breakage unseen.
+
+tests:
+  - it: exposes nothing when _cluster is absent
+    asserts:
+      - template: templates/ingress.yaml
+        hasDocuments:
+          count: 0
diff --git a/packages/system/linstor-gui/values.yaml b/packages/system/linstor-gui/values.yaml
index 58fb47e65a..f35ddb8b31 100644
--- a/packages/system/linstor-gui/values.yaml
+++ b/packages/system/linstor-gui/values.yaml
@@ -1,9 +1,13 @@
+# Injected by the platform from the cozystack-values Secret. The empty
+# default keeps the chart renderable on its own, outside a cluster.
+_cluster: {}
+
 ## @section Image
 ## @param image.repository LINSTOR GUI container image repository
 ## @param image.tag LINSTOR GUI container image tag (digest recommended)
 image:
   repository: ghcr.io/cozystack/cozystack/linstor-gui
-  tag: 2.3.0@sha256:4496a459869f73e69bdf70e0a3df94ffb2632f067771566f1a38294cb61a2188
+  tag: v1.6.0@sha256:6e11829de86709f5e21636cdd1a1ada1239a7dcc1741f91e9d95d9f6ade603a2
 ## @section Deployment
 ## @param replicas Number of linstor-gui replicas
 replicas: 1
diff --git a/packages/system/linstor-scheduler/Makefile b/packages/system/linstor-scheduler/Makefile
index d83a292991..5961a1da92 100644
--- a/packages/system/linstor-scheduler/Makefile
+++ b/packages/system/linstor-scheduler/Makefile
@@ -10,6 +10,9 @@ update:
 	rm -rf charts
 	helm repo add piraeus-charts https://piraeus.io/helm-charts/
 	helm repo update piraeus-charts
-	helm pull piraeus-charts/linstor-scheduler --untar --untardir charts
-	patch --no-backup-if-mismatch -p4 < patches/disable-ca-key-rotation.patch
-	patch --no-backup-if-mismatch -p4 < patches/add-scheduler-component-label.patch
+	helm pull piraeus-charts/linstor-scheduler --untar --untardir charts --version 0.3.1
+	# Drop the vendored upstream helm-unittest suite: it asserts upstream
+	# defaults and fails under the cozystack umbrella values. The cozystack-side
+	# tests/ are the source of truth (same policy as packages/system/coredns).
+	rm -rf charts/linstor-scheduler/tests
+	patch --no-backup-if-mismatch -p4 < patches/cozystack-scheduler-deployment.patch
diff --git a/packages/system/linstor-scheduler/charts/linstor-scheduler/Chart.yaml b/packages/system/linstor-scheduler/charts/linstor-scheduler/Chart.yaml
index 4a521d1f87..b65b35a2fc 100644
--- a/packages/system/linstor-scheduler/charts/linstor-scheduler/Chart.yaml
+++ b/packages/system/linstor-scheduler/charts/linstor-scheduler/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: v0.3.2
+appVersion: v0.3.6
 deprecated: true
 description: 'Deploys a new kubernetes scheduler, configured to take advantage of
   storage system information. If a Pod is using a LINSTOR volume, the scheduler will
@@ -16,4 +16,4 @@ name: linstor-scheduler
 sources:
 - https://github.com/piraeusdatastore/linstor-scheduler-extender
 type: application
-version: 0.2.3
+version: 0.3.1
diff --git a/packages/system/linstor-scheduler/charts/linstor-scheduler/README.md b/packages/system/linstor-scheduler/charts/linstor-scheduler/README.md
index ddf9282609..c9f073be11 100644
--- a/packages/system/linstor-scheduler/charts/linstor-scheduler/README.md
+++ b/packages/system/linstor-scheduler/charts/linstor-scheduler/README.md
@@ -69,4 +69,29 @@ The following options are available:
 | `serviceAccount.create`                       | Create the service account resource                                                                    | `true`                                                                                             |
 | `serviceAccount.name`                         | Sets the name of the service account. If left empty, will use the release name as default              | `""`                                                                                               |
 | `podDisruptionBudget.enabled`                 | Enable creation of a pod disruption budget to protect the availability of the scheduler                | `true`                                                                                             |
-| `autoscaling.enabled`                         | Enable creation of a horizontal pod autoscaler to ensure availability in case of high usage`           | `"false`                                                                                           |
+| `autoscaling.enabled`                         | Enable creation of a horizontal pod autoscaler to ensure availability in case of high usage            | `false`                                                                                            |
+| `admission.enabled`                           | Deploy the admission webhook that auto-sets `schedulerName` on Pods using LINSTOR-backed PVCs.          | `false`                                                                                            |
+| `admission.replicaCount`                      | Number of webhook replicas to deploy.                                                                  | `2`                                                                                                |
+| `admission.driver`                            | CSI driver name treated as LINSTOR-backed. Pods whose PVCs resolve to it get the mutation.             | `linstor.csi.linbit.com`                                                                           |
+| `admission.failurePolicy`                     | Webhook `failurePolicy`. `Ignore` keeps Pod creation working if the webhook is unavailable.            | `Ignore`                                                                                           |
+| `admission.timeoutSeconds`                    | Webhook call timeout. Kept under the Kubernetes default of 10s to limit Pod-creation latency.          | `5`                                                                                                |
+| `admission.namespaceSelector`                 | Namespace selector for the webhook. Empty selects all namespaces (including `kube-system`).             | `{}`                                                                                               |
+| `admission.resources`                         | Resources to request and limit on the webhook container.                                               | `{}`                                                                                               |
+| `admission.podSecurityContext`                | Pod-level security context for the webhook pod.                                                        | `{runAsNonRoot: true, runAsUser: 1000, runAsGroup: 1000, fsGroup: 1000}`                           |
+| `admission.securityContext`                   | Container-level security context for the webhook container.                                            | `{allowPrivilegeEscalation: false, capabilities: {drop: [ALL]}, readOnlyRootFilesystem: true}`     |
+| `admission.createTLS`                         | How to provision the webhook TLS: `cert-manager`, `helm`, or `""` (bring your own). See note below.    | `cert-manager`                                                                                     |
+| `admission.tls.secretName`                    | Name of the TLS secret. Empty defaults to `<fullname>-admission-tls`.                                   | `""`                                                                                               |
+| `admission.tls.caBundle`                      | CA bundle (base64 PEM) injected into the webhook. Only used when `createTLS` is `""`.                   | `""`                                                                                               |
+| `admission.tls.certManager.rotationPolicy`    | `privateKey.rotationPolicy` of the cert-manager CA. `Never` keeps the CA key (and caBundle) stable.    | `Never`                                                                                            |
+| `admission.affinity`                          | Affinity for the webhook pods. Empty applies a soft anti-affinity spreading replicas across nodes.     | `{}`                                                                                               |
+| `admission.reloadOnCertChange`                | Add Stakater Reloader annotations so the pods restart when the TLS secret changes (see note below).    | `false`                                                                                            |
+
+## Admission webhook (optional)
+
+As noted above, the LINSTOR Scheduler itself is no longer maintained and `volumeBindingMode: WaitForFirstConsumer` is the preferred approach for new deployments. For clusters that still run this scheduler, the optional admission webhook (`admission.enabled`, disabled by default) removes the need to set `schedulerName` on every Pod: it watches Pod creation and, when a Pod uses a PersistentVolumeClaim backed by the LINSTOR CSI driver, sets `schedulerName` to this scheduler automatically. It changes nothing when disabled.
+
+> **Note:** `admission.createTLS: helm` regenerates the CA and certificate on every `helm upgrade`; it suits one-shot installs, not GitOps or continuously-reconciled setups (Flux/Argo) where the certificate would churn on each reconcile. Use `cert-manager` or bring your own secret (`""`) there.
+
+> **Note:** the default `failurePolicy: Ignore` fails open, so an unreachable webhook never blocks Pod creation (affected Pods just fall back to the default scheduler). Setting `failurePolicy: Fail` makes the webhook mandatory for every Pod `CREATE` in the selected namespaces; with `createTLS: cert-manager` this also requires the cert-manager CA injector to be running so the `caBundle` is populated, otherwise all matching Pod creation is blocked until injection completes. Because the empty default `namespaceSelector` also intercepts the webhook's own namespace and `kube-system`, running with `failurePolicy: Fail` can deadlock a restart of the webhook (its own new Pods cannot be admitted while all replicas are down) — exclude the release namespace and `kube-system` via `admission.namespaceSelector` if you switch to `Fail`.
+
+> **Note:** the webhook binary loads its serving certificate once at startup and does not hot-reload it. When the certificate is renewed — cert-manager rotates the leaf roughly yearly, or you rotate an external secret — the running Pods keep serving the old certificate until they restart, after which the webhook silently stops mutating. Set `admission.reloadOnCertChange: true` (requires the Stakater Reloader controller) to roll the Deployment automatically when the secret changes, or restart the webhook Pods manually after each renewal. In `createTLS: helm` mode a `helm upgrade` regenerates the certificate and already rolls the Pods.
diff --git a/packages/system/linstor-scheduler/charts/linstor-scheduler/templates/NOTES.txt b/packages/system/linstor-scheduler/charts/linstor-scheduler/templates/NOTES.txt
index 5e426f2861..037e49fb47 100644
--- a/packages/system/linstor-scheduler/charts/linstor-scheduler/templates/NOTES.txt
+++ b/packages/system/linstor-scheduler/charts/linstor-scheduler/templates/NOTES.txt
@@ -3,10 +3,28 @@ Scheduler {{ include "linstor-scheduler.fullname" . }} deployed!
 Used LINSTOR URL: {{ include "linstor-scheduler.linstorEndpoint" .}}
 
 Please run `helm test {{ .Release.Name }}` to ensure it's properly working.
+{{ if .Values.admission.enabled -}}
+The optional admission webhook is enabled: Pods using LINSTOR-backed PersistentVolumeClaims
+are automatically scheduled by {{ include "linstor-scheduler.fullname" . }}, so you
+do not need to set schedulerName by hand. To schedule a Pod that does not use a
+LINSTOR volume, set its schedulerName explicitly:
 
+---
+spec:
+  schedulerName: {{ include "linstor-scheduler.fullname" . }}
+---
+{{- if eq .Values.admission.createTLS "" }}
+{{ if not .Values.admission.tls.caBundle }}
+NOTE: admission.createTLS is "" and admission.tls.caBundle is empty. Unless an
+external controller injects the webhook's caBundle, the API server cannot reach
+the webhook and Pods will be scheduled WITHOUT the mutation (failurePolicy: {{ .Values.admission.failurePolicy }}).
+{{- end }}
+{{- end }}
+{{- else -}}
 Specify the scheduler on your pods to start smart scheduling based on your Persistent Volumes:
 
 ---
 spec:
   schedulerName: {{ include "linstor-scheduler.fullname" . }}
 ---
+{{- end }}
diff --git a/packages/system/linstor-scheduler/charts/linstor-scheduler/templates/_helpers.tpl b/packages/system/linstor-scheduler/charts/linstor-scheduler/templates/_helpers.tpl
index 04c793f975..fd04877594 100644
--- a/packages/system/linstor-scheduler/charts/linstor-scheduler/templates/_helpers.tpl
+++ b/packages/system/linstor-scheduler/charts/linstor-scheduler/templates/_helpers.tpl
@@ -61,6 +61,65 @@ Create the name of the service account to use
 {{- end }}
 {{- end }}
 
+{{/*
+Fully qualified name for the admission webhook resources. The base fullname is
+truncated before the "-admission" suffix (and further sub-suffixes such as
+"-selfsigned") are appended, so the longest derived name still fits the 63-char
+Kubernetes name limit for long release names.
+*/}}
+{{- define "linstor-scheduler.admissionFullname" -}}
+{{- printf "%s-admission" (include "linstor-scheduler.fullname" . | trunc 42 | trimSuffix "-") }}
+{{- end }}
+
+{{/*
+Selector labels for the admission webhook. The name carries an "-admission"
+suffix so the webhook pods are NOT matched by the base scheduler's selectors
+(Deployment, PodDisruptionBudget), whose selector fields are immutable and so
+cannot be narrowed after the fact. This keeps the base PDB and HPA scoped to the
+scheduler pods only. The base name is truncated BEFORE the suffix is appended so
+a long nameOverride can never eat the "-admission" suffix and collapse the name
+back onto the base selector.
+*/}}
+{{- define "linstor-scheduler.admissionSelectorLabels" -}}
+app.kubernetes.io/name: {{ printf "%s-admission" (include "linstor-scheduler.name" . | trunc 53 | trimSuffix "-") }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}
+
+{{/*
+Common labels for the admission webhook resources.
+*/}}
+{{- define "linstor-scheduler.admissionLabels" -}}
+helm.sh/chart: {{ include "linstor-scheduler.chart" . }}
+{{ include "linstor-scheduler.admissionSelectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+app.kubernetes.io/component: admission
+{{- end }}
+
+{{/*
+Name of the secret holding the admission webhook's TLS certificate.
+Defaults to "<admissionFullname>-tls" unless admission.tls.secretName is set,
+so users managing the secret externally can point the Deployment at their own.
+*/}}
+{{- define "linstor-scheduler.admissionTLSSecretName" -}}
+{{- default (printf "%s-tls" (include "linstor-scheduler.admissionFullname" .)) .Values.admission.tls.secretName }}
+{{- end }}
+
+{{/*
+Name of the service account used by the admission webhook. When the chart
+creates service accounts it gets a dedicated one, so the webhook pod does not
+inherit the scheduler's system:kube-scheduler / system:volume-scheduler bindings.
+*/}}
+{{- define "linstor-scheduler.admissionServiceAccountName" -}}
+{{- if .Values.serviceAccount.create }}
+{{- include "linstor-scheduler.admissionFullname" . }}
+{{- else }}
+{{- default "default" .Values.serviceAccount.name }}
+{{- end }}
+{{- end }}
+
 {{/*
 Get the kubernetes version we should assume for creating scheduler configs.
 Strips distribution suffixes like +k3s1, +rke2r1 from version string.
diff --git a/packages/system/linstor-scheduler/charts/linstor-scheduler/templates/admission-certmanager.yaml b/packages/system/linstor-scheduler/charts/linstor-scheduler/templates/admission-certmanager.yaml
new file mode 100644
index 0000000000..adffbb8410
--- /dev/null
+++ b/packages/system/linstor-scheduler/charts/linstor-scheduler/templates/admission-certmanager.yaml
@@ -0,0 +1,58 @@
+{{- if and .Values.admission.enabled (eq .Values.admission.createTLS "cert-manager") }}
+---
+apiVersion: cert-manager.io/v1
+kind: Issuer
+metadata:
+  name: {{ include "linstor-scheduler.admissionFullname" . }}-selfsigned
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "linstor-scheduler.admissionLabels" . | nindent 4 }}
+spec:
+  selfSigned: {}
+---
+apiVersion: cert-manager.io/v1
+kind: Certificate
+metadata:
+  name: {{ include "linstor-scheduler.admissionFullname" . }}-root-ca
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "linstor-scheduler.admissionLabels" . | nindent 4 }}
+spec:
+  secretName: {{ include "linstor-scheduler.admissionFullname" . }}-root-ca
+  duration: 43800h  # 5 years
+  commonName: {{ include "linstor-scheduler.admissionFullname" . }}-root-ca
+  privateKey:
+    rotationPolicy: {{ .Values.admission.tls.certManager.rotationPolicy }}
+  issuerRef:
+    name: {{ include "linstor-scheduler.admissionFullname" . }}-selfsigned
+  isCA: true
+---
+apiVersion: cert-manager.io/v1
+kind: Issuer
+metadata:
+  name: {{ include "linstor-scheduler.admissionFullname" . }}-ca-issuer
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "linstor-scheduler.admissionLabels" . | nindent 4 }}
+spec:
+  ca:
+    secretName: {{ include "linstor-scheduler.admissionFullname" . }}-root-ca
+---
+apiVersion: cert-manager.io/v1
+kind: Certificate
+metadata:
+  name: {{ include "linstor-scheduler.admissionFullname" . }}-cert
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "linstor-scheduler.admissionLabels" . | nindent 4 }}
+spec:
+  secretName: {{ include "linstor-scheduler.admissionTLSSecretName" . }}
+  duration: 8760h  # 1 year
+  renewBefore: 24h
+  issuerRef:
+    name: {{ include "linstor-scheduler.admissionFullname" . }}-ca-issuer
+  commonName: {{ include "linstor-scheduler.admissionFullname" . }}
+  dnsNames:
+    - {{ include "linstor-scheduler.admissionFullname" . }}
+    - {{ include "linstor-scheduler.admissionFullname" . }}.{{ .Release.Namespace }}.svc
+{{- end }}
diff --git a/packages/system/linstor-scheduler/charts/linstor-scheduler/templates/admission-deployment.yaml b/packages/system/linstor-scheduler/charts/linstor-scheduler/templates/admission-deployment.yaml
index 22f5326ac7..3460b93b35 100644
--- a/packages/system/linstor-scheduler/charts/linstor-scheduler/templates/admission-deployment.yaml
+++ b/packages/system/linstor-scheduler/charts/linstor-scheduler/templates/admission-deployment.yaml
@@ -3,36 +3,47 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ include "linstor-scheduler.fullname" . }}-admission
+  name: {{ include "linstor-scheduler.admissionFullname" . }}
+  {{- if .Values.admission.reloadOnCertChange }}
+  annotations:
+    # The webhook binary loads its serving certificate once at startup and does
+    # not hot-reload it, so the pods must restart when the TLS secret changes
+    # (e.g. cert-manager renewal). These annotations let Stakater Reloader roll
+    # the Deployment automatically when the secret is updated.
+    secret.reloader.stakater.com/reload: {{ include "linstor-scheduler.admissionTLSSecretName" . | quote }}
+  {{- end }}
   labels:
-    {{- include "linstor-scheduler.labels" . | nindent 4 }}
-    app.kubernetes.io/component: admission
+    {{- include "linstor-scheduler.admissionLabels" . | nindent 4 }}
 spec:
   replicas: {{ .Values.admission.replicaCount }}
   selector:
     matchLabels:
-      {{- include "linstor-scheduler.selectorLabels" . | nindent 6 }}
-      app.kubernetes.io/component: admission
+      {{- include "linstor-scheduler.admissionSelectorLabels" . | nindent 6 }}
   template:
     metadata:
-      {{- with .Values.podAnnotations }}
+      {{- if or .Values.podAnnotations (eq .Values.admission.createTLS "helm") }}
       annotations:
+        {{- if eq .Values.admission.createTLS "helm" }}
+        # In "helm" TLS mode the CA and certificate are regenerated on every
+        # "helm upgrade". Rolling the pods each revision makes them pick up the
+        # new certificate that matches the freshly generated webhook caBundle.
+        checksum/tls-revision: {{ .Release.Revision | quote }}
+        {{- end }}
+        {{- with .Values.podAnnotations }}
         {{- toYaml . | nindent 8 }}
+        {{- end }}
       {{- end }}
       labels:
-        {{- include "linstor-scheduler.selectorLabels" . | nindent 8 }}
+        {{- include "linstor-scheduler.admissionSelectorLabels" . | nindent 8 }}
         app.kubernetes.io/component: admission
     spec:
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      serviceAccountName: {{ include "linstor-scheduler.serviceAccountName" . }}
+      serviceAccountName: {{ include "linstor-scheduler.admissionServiceAccountName" . }}
       securityContext:
-        runAsNonRoot: true
-        runAsUser: 1000
-        runAsGroup: 1000
-        fsGroup: 1000
+        {{- toYaml .Values.admission.podSecurityContext | nindent 8 }}
       containers:
         - name: linstor-scheduler-admission
           image: {{ .Values.extender.image.repository }}:{{ .Values.extender.image.tag | default .Chart.AppVersion }}
@@ -40,38 +51,21 @@ spec:
           command: ["/linstor-scheduler-admission"]
           args:
             - -scheduler={{ include "linstor-scheduler.fullname" . }}
+            - -driver={{ .Values.admission.driver }}
             - -tls-cert-file=/etc/webhook/certs/tls.crt
             - -tls-key-file=/etc/webhook/certs/tls.key
           securityContext:
-            allowPrivilegeEscalation: false
-            capabilities:
-              drop:
-                - ALL
-            readOnlyRootFilesystem: true
+            {{- toYaml .Values.admission.securityContext | nindent 12 }}
           ports:
             - containerPort: 8080
               name: https
               protocol: TCP
-          env:
-            - name: LS_CONTROLLERS
-              value: {{ include "linstor-scheduler.linstorEndpoint" . }}
-            {{- if include "linstor-scheduler.linstorClientSecretName" . }}
-            - name: LS_USER_CERTIFICATE
-              valueFrom:
-                secretKeyRef:
-                  name: {{ include "linstor-scheduler.linstorClientSecretName" . }}
-                  key: tls.crt
-            - name: LS_USER_KEY
-              valueFrom:
-                secretKeyRef:
-                  name: {{ include "linstor-scheduler.linstorClientSecretName" . }}
-                  key: tls.key
-            - name: LS_ROOT_CA
-              valueFrom:
-                secretKeyRef:
-                  name: {{ include "linstor-scheduler.linstorClientSecretName" . }}
-                  key: ca.crt
-            {{- end }}
+          readinessProbe:
+            tcpSocket:
+              port: https
+          livenessProbe:
+            tcpSocket:
+              port: https
           volumeMounts:
             - name: webhook-certs
               mountPath: /etc/webhook/certs
@@ -81,16 +75,25 @@ spec:
       volumes:
         - name: webhook-certs
           secret:
-            secretName: {{ include "linstor-scheduler.fullname" . }}-admission-tls
-            defaultMode: 0400
+            secretName: {{ include "linstor-scheduler.admissionTLSSecretName" . }}
+            defaultMode: 0440
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- with .Values.affinity }}
       affinity:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
+        {{- if .Values.admission.affinity }}
+        {{- toYaml .Values.admission.affinity | nindent 8 }}
+        {{- else }}
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+            - weight: 100
+              podAffinityTerm:
+                labelSelector:
+                  matchLabels:
+                    {{- include "linstor-scheduler.admissionSelectorLabels" . | nindent 20 }}
+                topologyKey: kubernetes.io/hostname
+        {{- end }}
       {{- with .Values.tolerations }}
       tolerations:
         {{- toYaml . | nindent 8 }}
diff --git a/packages/system/linstor-scheduler/charts/linstor-scheduler/templates/admission-poddisruptionbudget.yaml b/packages/system/linstor-scheduler/charts/linstor-scheduler/templates/admission-poddisruptionbudget.yaml
new file mode 100644
index 0000000000..dfec1e3824
--- /dev/null
+++ b/packages/system/linstor-scheduler/charts/linstor-scheduler/templates/admission-poddisruptionbudget.yaml
@@ -0,0 +1,19 @@
+{{- if and .Values.admission.enabled .Values.podDisruptionBudget.enabled }}
+---
+apiVersion: policy/v1
+kind: PodDisruptionBudget
+metadata:
+  name: {{ include "linstor-scheduler.admissionFullname" . }}
+  labels:
+    {{- include "linstor-scheduler.admissionLabels" . | nindent 4 }}
+spec:
+  selector:
+    matchLabels:
+      {{- include "linstor-scheduler.admissionSelectorLabels" . | nindent 6 }}
+  {{- if .Values.podDisruptionBudget.minAvailable }}
+  minAvailable: {{ .Values.podDisruptionBudget.minAvailable }}
+  {{- end }}
+  {{- if .Values.podDisruptionBudget.maxUnavailable }}
+  maxUnavailable: {{ .Values.podDisruptionBudget.maxUnavailable }}
+  {{- end }}
+{{- end }}
diff --git a/packages/system/linstor-scheduler/charts/linstor-scheduler/templates/admission-service.yaml b/packages/system/linstor-scheduler/charts/linstor-scheduler/templates/admission-service.yaml
index d2abd0784c..384dc23c7a 100644
--- a/packages/system/linstor-scheduler/charts/linstor-scheduler/templates/admission-service.yaml
+++ b/packages/system/linstor-scheduler/charts/linstor-scheduler/templates/admission-service.yaml
@@ -3,10 +3,9 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "linstor-scheduler.fullname" . }}-admission
+  name: {{ include "linstor-scheduler.admissionFullname" . }}
   labels:
-    {{- include "linstor-scheduler.labels" . | nindent 4 }}
-    app.kubernetes.io/component: admission
+    {{- include "linstor-scheduler.admissionLabels" . | nindent 4 }}
 spec:
   type: ClusterIP
   ports:
@@ -15,6 +14,5 @@ spec:
       protocol: TCP
       name: https
   selector:
-    {{- include "linstor-scheduler.selectorLabels" . | nindent 4 }}
-    app.kubernetes.io/component: admission
+    {{- include "linstor-scheduler.admissionSelectorLabels" . | nindent 4 }}
 {{- end }}
diff --git a/packages/system/linstor-scheduler/charts/linstor-scheduler/templates/admission-serviceaccount.yaml b/packages/system/linstor-scheduler/charts/linstor-scheduler/templates/admission-serviceaccount.yaml
new file mode 100644
index 0000000000..00782ca94e
--- /dev/null
+++ b/packages/system/linstor-scheduler/charts/linstor-scheduler/templates/admission-serviceaccount.yaml
@@ -0,0 +1,13 @@
+{{- if and .Values.admission.enabled .Values.serviceAccount.create }}
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ include "linstor-scheduler.admissionServiceAccountName" . }}
+  labels:
+    {{- include "linstor-scheduler.admissionLabels" . | nindent 4 }}
+  {{- with .Values.serviceAccount.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+{{- end }}
diff --git a/packages/system/linstor-scheduler/charts/linstor-scheduler/templates/admission-webhook.yaml b/packages/system/linstor-scheduler/charts/linstor-scheduler/templates/admission-webhook.yaml
new file mode 100644
index 0000000000..66b53bed6d
--- /dev/null
+++ b/packages/system/linstor-scheduler/charts/linstor-scheduler/templates/admission-webhook.yaml
@@ -0,0 +1,78 @@
+{{- if .Values.admission.enabled }}
+{{/*
+Validate the TLS provisioning method and guard against a silently-broken
+bring-your-own configuration (no cert-manager, no generated cert, and no CA to
+trust) that would leave the webhook unusable.
+*/}}
+{{- if not (has .Values.admission.createTLS (list "cert-manager" "helm" "")) }}
+{{- fail (printf "admission.createTLS must be one of \"cert-manager\", \"helm\" or \"\", got %q" .Values.admission.createTLS) }}
+{{- end }}
+{{- if and (eq .Values.admission.createTLS "") (not .Values.admission.tls.secretName) (not .Values.admission.tls.caBundle) }}
+{{- fail "admission.createTLS is \"\" (bring your own TLS): set admission.tls.secretName to your certificate secret and admission.tls.caBundle to its CA (or use an external ca-injector), or switch admission.createTLS to \"cert-manager\" or \"helm\"" }}
+{{- end }}
+{{/*
+For the "helm" TLS method the CA is generated exactly once here and shared
+between the TLS Secret (ca.crt) and the webhook caBundle below, so both are
+byte-identical. genCA is non-deterministic per call, so it must not be invoked
+from a second template file.
+*/}}
+{{- $ca := dict }}
+{{- $cert := dict }}
+{{- if eq .Values.admission.createTLS "helm" }}
+{{- $commonName := include "linstor-scheduler.admissionFullname" . }}
+{{- $altNames := list $commonName (printf "%s.%s.svc" $commonName .Release.Namespace) }}
+{{- $ca = genCA (printf "%s-ca" (include "linstor-scheduler.admissionFullname" .)) 3650 }}
+{{- $cert = genSignedCert $commonName (list) $altNames 3650 $ca }}
+---
+apiVersion: v1
+kind: Secret
+type: kubernetes.io/tls
+metadata:
+  name: {{ include "linstor-scheduler.admissionTLSSecretName" . }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "linstor-scheduler.admissionLabels" . | nindent 4 }}
+stringData:
+  tls.crt: {{ $cert.Cert | quote }}
+  tls.key: {{ $cert.Key | quote }}
+  ca.crt: {{ $ca.Cert | quote }}
+{{- end }}
+---
+apiVersion: admissionregistration.k8s.io/v1
+kind: MutatingWebhookConfiguration
+metadata:
+  name: {{ include "linstor-scheduler.admissionFullname" . }}
+  {{- if eq .Values.admission.createTLS "cert-manager" }}
+  annotations:
+    cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ include "linstor-scheduler.admissionFullname" . }}-cert
+  {{- end }}
+  labels:
+    {{- include "linstor-scheduler.admissionLabels" . | nindent 4 }}
+webhooks:
+  - name: linstor-scheduler-admission.linbit.com
+    admissionReviewVersions: ["v1"]
+    sideEffects: None
+    failurePolicy: {{ .Values.admission.failurePolicy }}
+    timeoutSeconds: {{ .Values.admission.timeoutSeconds }}
+    clientConfig:
+      {{- if eq .Values.admission.createTLS "helm" }}
+      caBundle: {{ $ca.Cert | b64enc }}
+      {{- else if .Values.admission.tls.caBundle }}
+      caBundle: {{ .Values.admission.tls.caBundle }}
+      {{- end }}
+      service:
+        name: {{ include "linstor-scheduler.admissionFullname" . }}
+        namespace: {{ .Release.Namespace }}
+        path: /mutate
+        port: 443
+    rules:
+      - operations: ["CREATE"]
+        apiGroups: [""]
+        apiVersions: ["v1"]
+        resources: ["pods"]
+        scope: "*"
+    {{- with .Values.admission.namespaceSelector }}
+    namespaceSelector:
+      {{- toYaml . | nindent 6 }}
+    {{- end }}
+{{- end }}
diff --git a/packages/system/linstor-scheduler/charts/linstor-scheduler/templates/certmanager.yaml b/packages/system/linstor-scheduler/charts/linstor-scheduler/templates/certmanager.yaml
deleted file mode 100644
index 760a9d5d4f..0000000000
--- a/packages/system/linstor-scheduler/charts/linstor-scheduler/templates/certmanager.yaml
+++ /dev/null
@@ -1,58 +0,0 @@
-{{- if .Values.admission.enabled }}
----
-apiVersion: cert-manager.io/v1
-kind: Issuer
-metadata:
-  name: {{ include "linstor-scheduler.fullname" . }}-admission-selfsigned
-  namespace: {{ .Release.Namespace }}
-  labels:
-    {{- include "linstor-scheduler.labels" . | nindent 4 }}
-spec:
-  selfSigned: {}
----
-apiVersion: cert-manager.io/v1
-kind: Certificate
-metadata:
-  name: {{ include "linstor-scheduler.fullname" . }}-admission-root-ca
-  namespace: {{ .Release.Namespace }}
-  labels:
-    {{- include "linstor-scheduler.labels" . | nindent 4 }}
-spec:
-  secretName: {{ include "linstor-scheduler.fullname" . }}-admission-root-ca
-  duration: 43800h  # 5 years
-  commonName: {{ include "linstor-scheduler.fullname" . }}-admission-root-ca
-  issuerRef:
-    name: {{ include "linstor-scheduler.fullname" . }}-admission-selfsigned
-  isCA: true
-  privateKey:
-    rotationPolicy: Never
----
-apiVersion: cert-manager.io/v1
-kind: Issuer
-metadata:
-  name: {{ include "linstor-scheduler.fullname" . }}-admission-ca-issuer
-  namespace: {{ .Release.Namespace }}
-  labels:
-    {{- include "linstor-scheduler.labels" . | nindent 4 }}
-spec:
-  ca:
-    secretName: {{ include "linstor-scheduler.fullname" . }}-admission-root-ca
----
-apiVersion: cert-manager.io/v1
-kind: Certificate
-metadata:
-  name: {{ include "linstor-scheduler.fullname" . }}-admission-cert
-  namespace: {{ .Release.Namespace }}
-  labels:
-    {{- include "linstor-scheduler.labels" . | nindent 4 }}
-spec:
-  secretName: {{ include "linstor-scheduler.fullname" . }}-admission-tls
-  duration: 8760h  # 1 year
-  renewBefore: 24h
-  issuerRef:
-    name: {{ include "linstor-scheduler.fullname" . }}-admission-ca-issuer
-  commonName: {{ include "linstor-scheduler.fullname" . }}-admission
-  dnsNames:
-    - {{ include "linstor-scheduler.fullname" . }}-admission
-    - {{ include "linstor-scheduler.fullname" . }}-admission.{{ .Release.Namespace }}.svc
-{{- end }}
diff --git a/packages/system/linstor-scheduler/charts/linstor-scheduler/templates/mutatingwebhookconfiguration.yaml b/packages/system/linstor-scheduler/charts/linstor-scheduler/templates/mutatingwebhookconfiguration.yaml
deleted file mode 100644
index fe387dda6c..0000000000
--- a/packages/system/linstor-scheduler/charts/linstor-scheduler/templates/mutatingwebhookconfiguration.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-{{- if .Values.admission.enabled }}
----
-apiVersion: admissionregistration.k8s.io/v1
-kind: MutatingWebhookConfiguration
-metadata:
-  name: {{ include "linstor-scheduler.fullname" . }}-admission
-  annotations:
-    cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ include "linstor-scheduler.fullname" . }}-admission-cert
-  labels:
-    {{- include "linstor-scheduler.labels" . | nindent 4 }}
-webhooks:
-  - name: linstor-scheduler-admission.linbit.com
-    admissionReviewVersions: ["v1", "v1beta1"]
-    sideEffects: None
-    failurePolicy: {{ .Values.admission.failurePolicy }}
-    clientConfig:
-      service:
-        name: {{ include "linstor-scheduler.fullname" . }}-admission
-        namespace: {{ .Release.Namespace }}
-        path: /mutate
-        port: 443
-    rules:
-      - operations: ["CREATE"]
-        apiGroups: [""]
-        apiVersions: ["v1"]
-        resources: ["pods"]
-        scope: "*"
-    {{- with .Values.admission.namespaceSelector }}
-    namespaceSelector:
-      {{- toYaml . | nindent 6 }}
-    {{- end }}
-{{- end }}
diff --git a/packages/system/linstor-scheduler/charts/linstor-scheduler/templates/rbac.yaml b/packages/system/linstor-scheduler/charts/linstor-scheduler/templates/rbac.yaml
index 38bf387b60..bcad847c81 100644
--- a/packages/system/linstor-scheduler/charts/linstor-scheduler/templates/rbac.yaml
+++ b/packages/system/linstor-scheduler/charts/linstor-scheduler/templates/rbac.yaml
@@ -29,10 +29,10 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: {{ include "linstor-scheduler.fullname" . }}-admission
+  name: {{ include "linstor-scheduler.admissionFullname" . }}
 rules:
   - apiGroups: [""]
-    resources: ["pods", "persistentvolumeclaims", "persistentvolumes"]
+    resources: ["persistentvolumeclaims", "persistentvolumes"]
     verbs: ["get"]
   - apiGroups: ["storage.k8s.io"]
     resources: ["storageclasses"]
@@ -41,14 +41,14 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: {{ include "linstor-scheduler.fullname" . }}-admission
+  name: {{ include "linstor-scheduler.admissionFullname" . }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: {{ include "linstor-scheduler.fullname" . }}-admission
+  name: {{ include "linstor-scheduler.admissionFullname" . }}
 subjects:
   - kind: ServiceAccount
-    name: {{ include "linstor-scheduler.serviceAccountName" . }}
+    name: {{ include "linstor-scheduler.admissionServiceAccountName" . }}
     namespace: {{ .Release.Namespace }}
 {{- end }}
 ---
diff --git a/packages/system/linstor-scheduler/charts/linstor-scheduler/values.yaml b/packages/system/linstor-scheduler/charts/linstor-scheduler/values.yaml
index f0633294d1..4df91746aa 100644
--- a/packages/system/linstor-scheduler/charts/linstor-scheduler/values.yaml
+++ b/packages/system/linstor-scheduler/charts/linstor-scheduler/values.yaml
@@ -87,10 +87,21 @@ tolerations: []
 
 affinity: {}
 
+# Optional admission webhook that automatically sets the schedulerName on Pods
+# using LINSTOR-backed PersistentVolumeClaims, so they are scheduled by this
+# scheduler without having to set schedulerName by hand.
 admission:
   enabled: false
   replicaCount: 2
+  # CSI driver name the webhook treats as LINSTOR-backed. Pods whose PVCs resolve
+  # to this provisioner get the schedulerName mutation. Defaults to the LINSTOR
+  # CSI driver; override only for a non-standard driver name.
+  driver: linstor.csi.linbit.com
   failurePolicy: Ignore
+  # Webhook call timeout in seconds. Kept below the Kubernetes default of 10s so
+  # an unreachable webhook adds less latency to Pod creation before failurePolicy
+  # takes effect.
+  timeoutSeconds: 5
   namespaceSelector: {}
   #  matchExpressions:
   #    - key: kubernetes.io/metadata.name
@@ -104,3 +115,51 @@ admission:
     # requests:
     #   cpu: 10m
     #   memory: 64Mi
+  # Pod-level security context for the webhook pod.
+  podSecurityContext:
+    runAsNonRoot: true
+    runAsUser: 1000
+    runAsGroup: 1000
+    fsGroup: 1000
+  # Container-level security context for the webhook container.
+  securityContext:
+    allowPrivilegeEscalation: false
+    capabilities:
+      drop:
+        - ALL
+    readOnlyRootFilesystem: true
+  # Affinity for the webhook pods. When empty, a soft (preferred) pod
+  # anti-affinity spreads the replicas across nodes by hostname; set this to
+  # override it entirely (e.g. a required anti-affinity or a nodeAffinity).
+  affinity: {}
+  # The webhook binary loads its TLS certificate once at startup and does NOT
+  # hot-reload it. When the certificate is renewed (cert-manager rotates the
+  # leaf roughly yearly, or you rotate an external secret) the running pods keep
+  # serving the old certificate until they restart, after which the webhook
+  # silently stops mutating (failurePolicy: Ignore). Set this to true to add
+  # Stakater Reloader annotations so the pods roll automatically when the TLS
+  # secret changes (requires the Reloader controller in the cluster); otherwise
+  # restart the webhook pods manually after each renewal.
+  reloadOnCertChange: false
+  # How to provision the webhook's TLS certificate:
+  # * "cert-manager" uses a self-signed cert-manager.io Issuer (default).
+  # * "helm" makes Helm itself generate the CA and server certificate.
+  #   NOTE: the "helm" method regenerates the CA and certificate on every
+  #   "helm upgrade". It suits one-shot installs, not GitOps or any
+  #   continuously-reconciled setup (e.g. Flux/Argo), where the certificate
+  #   would churn on each reconcile. Use "cert-manager" or "" there.
+  # * "" creates nothing: bring your own secret (see tls.secretName / tls.caBundle).
+  createTLS: cert-manager
+  tls:
+    # Name of the secret holding the webhook's TLS certificate.
+    # Empty defaults to "<fullname>-admission-tls". Set it to point the
+    # Deployment at a secret you manage yourself.
+    secretName: ""
+    # CA bundle injected into the webhook (base64-encoded PEM). Only used when
+    # createTLS is "" and you inject your own CA. Leave empty if an external
+    # controller (e.g. cert-manager's ca-injector) patches the caBundle.
+    caBundle: ""
+    certManager:
+      # rotationPolicy for the CA certificate's private key. "Never" keeps the
+      # CA key stable so the webhook caBundle does not churn on renewal.
+      rotationPolicy: Never
diff --git a/packages/system/linstor-scheduler/patches/add-scheduler-component-label.patch b/packages/system/linstor-scheduler/patches/add-scheduler-component-label.patch
deleted file mode 100644
index 01eed9a805..0000000000
--- a/packages/system/linstor-scheduler/patches/add-scheduler-component-label.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff --git a/packages/system/linstor-scheduler/charts/linstor-scheduler/templates/deployment.yaml b/packages/system/linstor-scheduler/charts/linstor-scheduler/templates/deployment.yaml
---- a/packages/system/linstor-scheduler/charts/linstor-scheduler/templates/deployment.yaml
-+++ b/packages/system/linstor-scheduler/charts/linstor-scheduler/templates/deployment.yaml
-@@ -21,4 +21,5 @@
-       labels:
-         {{- include "linstor-scheduler.selectorLabels" . | nindent 8 }}
-+        app.kubernetes.io/component: scheduler
-     spec:
-       {{- with .Values.imagePullSecrets }}
diff --git a/packages/system/linstor-scheduler/patches/cozystack-scheduler-deployment.patch b/packages/system/linstor-scheduler/patches/cozystack-scheduler-deployment.patch
new file mode 100644
index 0000000000..308459175b
--- /dev/null
+++ b/packages/system/linstor-scheduler/patches/cozystack-scheduler-deployment.patch
@@ -0,0 +1,35 @@
+# Cozystack downstream customizations to the linstor-scheduler Deployment.
+# Both edits touch the same file and are deliberately kept in one patch:
+# splitting them into two patches on deployment.yaml would create fragile
+# line-offset coupling between the hunks.
+#
+#   (a) Add the pod label 'app.kubernetes.io/component: scheduler' so the
+#       wrapper chart's templates/extender-service.yaml can select the
+#       scheduler pods by that label.
+#   (b) Derive the kube-scheduler image tag from the stripped kubeVersion
+#       helper instead of raw .Capabilities.KubeVersion.Version, so a
+#       distribution suffix (e.g. v1.31.0+k3s1) does not resolve to a
+#       non-existent registry.k8s.io/kube-scheduler image tag.
+#
+# Chart source: https://piraeus.io/helm-charts (linstor-scheduler 0.3.1)
+diff --git a/packages/system/linstor-scheduler/charts/linstor-scheduler/templates/deployment.yaml b/packages/system/linstor-scheduler/charts/linstor-scheduler/templates/deployment.yaml
+index 49898b8..289021f 100644
+--- a/packages/system/linstor-scheduler/charts/linstor-scheduler/templates/deployment.yaml
++++ b/packages/system/linstor-scheduler/charts/linstor-scheduler/templates/deployment.yaml
+@@ -20,6 +20,7 @@ spec:
+       {{- end }}
+       labels:
+         {{- include "linstor-scheduler.selectorLabels" . | nindent 8 }}
++        app.kubernetes.io/component: scheduler
+     spec:
+       {{- with .Values.imagePullSecrets }}
+       imagePullSecrets:
+@@ -30,7 +31,7 @@ spec:
+         {{- toYaml .Values.podSecurityContext | nindent 8 }}
+       containers:
+         - name: kube-scheduler
+-          image: "{{ .Values.scheduler.image.repository }}:{{ .Values.scheduler.image.tag | default .Capabilities.KubeVersion.Version }}"
++          image: "{{ .Values.scheduler.image.repository }}:{{ .Values.scheduler.image.tag | default (include "linstor-scheduler.kubeVersion" .) }}"
+           securityContext:
+             {{- toYaml .Values.scheduler.securityContext | nindent 12 }}
+           command:
diff --git a/packages/system/linstor-scheduler/patches/disable-ca-key-rotation.patch b/packages/system/linstor-scheduler/patches/disable-ca-key-rotation.patch
deleted file mode 100644
index 45715d6bc1..0000000000
--- a/packages/system/linstor-scheduler/patches/disable-ca-key-rotation.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/packages/system/linstor-scheduler/charts/linstor-scheduler/templates/certmanager.yaml b/packages/system/linstor-scheduler/charts/linstor-scheduler/templates/certmanager.yaml
-index 3942555b..760a9d5d 100644
---- a/packages/system/linstor-scheduler/charts/linstor-scheduler/templates/certmanager.yaml
-+++ b/packages/system/linstor-scheduler/charts/linstor-scheduler/templates/certmanager.yaml
-@@ -24,6 +24,8 @@ spec:
-   issuerRef:
-     name: {{ include "linstor-scheduler.fullname" . }}-admission-selfsigned
-   isCA: true
-+  privateKey:
-+    rotationPolicy: Never
- ---
- apiVersion: cert-manager.io/v1
- kind: Issuer
diff --git a/packages/system/linstor-scheduler/tests/admission_test.yaml b/packages/system/linstor-scheduler/tests/admission_test.yaml
new file mode 100644
index 0000000000..1d886ed155
--- /dev/null
+++ b/packages/system/linstor-scheduler/tests/admission_test.yaml
@@ -0,0 +1,261 @@
+suite: admission webhook (cozystack)
+
+templates:
+  - charts/linstor-scheduler/templates/admission-deployment.yaml
+  - charts/linstor-scheduler/templates/admission-service.yaml
+  - charts/linstor-scheduler/templates/admission-webhook.yaml
+  - charts/linstor-scheduler/templates/admission-certmanager.yaml
+  - charts/linstor-scheduler/templates/admission-serviceaccount.yaml
+  - charts/linstor-scheduler/templates/admission-poddisruptionbudget.yaml
+  - charts/linstor-scheduler/templates/poddisruptionbudget.yaml
+  - charts/linstor-scheduler/templates/rbac.yaml
+
+release:
+  name: linstor-scheduler
+
+tests:
+  # Pin 1: with admission on (package default), the admission stack renders,
+  # including the cert-manager issuer/cert chain.
+  - it: renders the admission Deployment
+    template: charts/linstor-scheduler/templates/admission-deployment.yaml
+    asserts:
+      - isKind:
+          of: Deployment
+      - equal:
+          path: metadata.name
+          value: linstor-scheduler-admission
+
+  - it: renders the admission Service
+    template: charts/linstor-scheduler/templates/admission-service.yaml
+    asserts:
+      - isKind:
+          of: Service
+      - equal:
+          path: metadata.name
+          value: linstor-scheduler-admission
+
+  - it: renders the MutatingWebhookConfiguration
+    template: charts/linstor-scheduler/templates/admission-webhook.yaml
+    asserts:
+      - isKind:
+          of: MutatingWebhookConfiguration
+
+  - it: cert-manager mode emits the Issuer/Certificate chain with a stable CA key
+    template: charts/linstor-scheduler/templates/admission-certmanager.yaml
+    asserts:
+      - hasDocuments:
+          count: 4
+      - matchRegex:
+          path: metadata.name
+          pattern: linstor-scheduler-admission
+      - documentIndex: 1
+        isKind:
+          of: Certificate
+      - documentIndex: 1
+        equal:
+          path: spec.privateKey.rotationPolicy
+          value: Never
+
+  # Pin 4: dedicated (least-privilege) admission ServiceAccount.
+  - it: renders a separate admission ServiceAccount
+    template: charts/linstor-scheduler/templates/admission-serviceaccount.yaml
+    asserts:
+      - isKind:
+          of: ServiceAccount
+      - equal:
+          path: metadata.name
+          value: linstor-scheduler-admission
+
+  # Pin 3: admission image is pinned to the extender at the chart appVersion.
+  - it: admission container uses the linstor-scheduler-extender image at v0.3.6
+    template: charts/linstor-scheduler/templates/admission-deployment.yaml
+    asserts:
+      - matchRegex:
+          path: spec.template.spec.containers[0].image
+          pattern: /linstor-scheduler-extender:v0\.3\.6$
+
+  # Pin 2: node-drain safety. The base PDB must select ONLY the scheduler
+  # (app.kubernetes.io/name: linstor-scheduler), and admission pods must carry a
+  # DISTINCT name so the base PDB cannot cover them. If either regresses, the
+  # single scheduler pod becomes evictable while admission replicas keep quorum.
+  - it: base PDB selects the scheduler, not admission
+    template: charts/linstor-scheduler/templates/poddisruptionbudget.yaml
+    asserts:
+      - isKind:
+          of: PodDisruptionBudget
+      - equal:
+          path: spec.selector.matchLabels["app.kubernetes.io/name"]
+          value: linstor-scheduler
+
+  - it: admission pods carry a distinct name so the base PDB cannot select them
+    template: charts/linstor-scheduler/templates/admission-deployment.yaml
+    asserts:
+      - equal:
+          path: spec.selector.matchLabels["app.kubernetes.io/name"]
+          value: linstor-scheduler-admission
+      - equal:
+          path: spec.template.metadata.labels["app.kubernetes.io/name"]
+          value: linstor-scheduler-admission
+
+  - it: admission has its own PDB targeting admission pods
+    template: charts/linstor-scheduler/templates/admission-poddisruptionbudget.yaml
+    asserts:
+      - isKind:
+          of: PodDisruptionBudget
+      - equal:
+          path: spec.selector.matchLabels["app.kubernetes.io/name"]
+          value: linstor-scheduler-admission
+
+  # Pin 5: with admission disabled, nothing admission renders, base PDB stays.
+  - it: renders no admission resources when disabled
+    set:
+      linstor-scheduler.admission.enabled: false
+    asserts:
+      - hasDocuments:
+          count: 0
+        template: charts/linstor-scheduler/templates/admission-deployment.yaml
+      - hasDocuments:
+          count: 0
+        template: charts/linstor-scheduler/templates/admission-service.yaml
+      - hasDocuments:
+          count: 0
+        template: charts/linstor-scheduler/templates/admission-webhook.yaml
+      - hasDocuments:
+          count: 0
+        template: charts/linstor-scheduler/templates/admission-certmanager.yaml
+      - hasDocuments:
+          count: 0
+        template: charts/linstor-scheduler/templates/admission-serviceaccount.yaml
+      - hasDocuments:
+          count: 0
+        template: charts/linstor-scheduler/templates/admission-poddisruptionbudget.yaml
+
+  - it: base PDB still renders when admission is disabled
+    set:
+      linstor-scheduler.admission.enabled: false
+    template: charts/linstor-scheduler/templates/poddisruptionbudget.yaml
+    asserts:
+      - isKind:
+          of: PodDisruptionBudget
+
+  # The whole point of the re-vendoring: the webhook matches LINSTOR-backed PVCs
+  # by CSI provisioner, which must equal the cozystack LINSTOR driver name.
+  - it: admission container is configured for the LINSTOR CSI driver
+    template: charts/linstor-scheduler/templates/admission-deployment.yaml
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: -driver=linstor.csi.linbit.com
+
+  # The v0.3.6 extender reloads its serving certificate on rotation, so the
+  # package leaves reloadOnCertChange at the upstream default and no Reloader
+  # annotation is emitted. Pin the absence: re-enabling the knob would buy only
+  # a redundant pod restart on every cert-manager renewal.
+  - it: emits no Reloader annotation, the webhook reloads its own certificate
+    documentSelector:
+      path: kind
+      value: Deployment
+    template: charts/linstor-scheduler/templates/admission-deployment.yaml
+    asserts:
+      - notExists:
+          path: metadata.annotations["secret.reloader.stakater.com/reload"]
+
+  # createTLS is a closed enum; an unknown value must fail the render, not
+  # silently produce a half-configured webhook.
+  - it: rejects an unknown createTLS value
+    set:
+      linstor-scheduler.admission.enabled: true
+      linstor-scheduler.admission.createTLS: bogus
+    template: charts/linstor-scheduler/templates/admission-webhook.yaml
+    asserts:
+      - failedTemplate:
+          errorPattern: createTLS must be one of
+
+  # Bring-your-own TLS with nothing supplied would leave the webhook unusable;
+  # the guard must fail the render rather than ship a broken MutatingWebhook.
+  - it: rejects bring-your-own TLS with no secret or caBundle provided
+    set:
+      linstor-scheduler.admission.enabled: true
+      linstor-scheduler.admission.createTLS: ""
+    template: charts/linstor-scheduler/templates/admission-webhook.yaml
+    asserts:
+      - failedTemplate:
+          errorPattern: bring your own TLS
+
+  # helm mode self-signs: it must emit the TLS Secret and inject the matching
+  # CA inline into the webhook's clientConfig (no cert-manager involved).
+  - it: helm mode emits a TLS Secret and an inline caBundle
+    set:
+      linstor-scheduler.admission.enabled: true
+      linstor-scheduler.admission.createTLS: helm
+    template: charts/linstor-scheduler/templates/admission-webhook.yaml
+    asserts:
+      - hasDocuments:
+          count: 2
+      - documentIndex: 0
+        isKind:
+          of: Secret
+      - documentIndex: 0
+        equal:
+          path: type
+          value: kubernetes.io/tls
+      - documentIndex: 1
+        isKind:
+          of: MutatingWebhookConfiguration
+      - documentIndex: 1
+        isNotEmpty:
+          path: webhooks[0].clientConfig.caBundle
+
+  # Bring-your-own TLS: no Secret is created, the supplied caBundle is wired into
+  # the webhook, and the Deployment mounts the caller-managed secret.
+  - it: bring-your-own TLS wires the supplied secret and caBundle
+    set:
+      linstor-scheduler.admission.enabled: true
+      linstor-scheduler.admission.createTLS: ""
+      linstor-scheduler.admission.tls.secretName: my-admission-tls
+      linstor-scheduler.admission.tls.caBundle: TESTCABUNDLE
+    asserts:
+      - template: charts/linstor-scheduler/templates/admission-webhook.yaml
+        hasDocuments:
+          count: 1
+      - template: charts/linstor-scheduler/templates/admission-webhook.yaml
+        isKind:
+          of: MutatingWebhookConfiguration
+      - template: charts/linstor-scheduler/templates/admission-webhook.yaml
+        equal:
+          path: webhooks[0].clientConfig.caBundle
+          value: TESTCABUNDLE
+      - template: charts/linstor-scheduler/templates/admission-deployment.yaml
+        equal:
+          path: spec.template.spec.volumes[0].secret.secretName
+          value: my-admission-tls
+
+  # Least-privilege guard. The webhook only reads PVC/PV/StorageClass via the
+  # Kubernetes API (the Pod arrives in the AdmissionReview), so its ClusterRole
+  # must not grant pods access. Pin it so a future re-vendor cannot silently
+  # re-widen the permissions.
+  - it: admission ClusterRole stays least-privilege (no pods access)
+    template: charts/linstor-scheduler/templates/rbac.yaml
+    documentIndex: 1
+    asserts:
+      - isKind:
+          of: ClusterRole
+      - equal:
+          path: metadata.name
+          value: linstor-scheduler-admission
+      - notContains:
+          path: rules[0].resources
+          content: pods
+      - equal:
+          path: rules[0].resources
+          value:
+            - persistentvolumeclaims
+            - persistentvolumes
+      - equal:
+          path: rules[0].verbs
+          value:
+            - get
+      - equal:
+          path: rules[1].resources
+          value:
+            - storageclasses
diff --git a/packages/system/linstor-scheduler/tests/extender-service_test.yaml b/packages/system/linstor-scheduler/tests/extender-service_test.yaml
index 60e272c286..946cd88e0f 100644
--- a/packages/system/linstor-scheduler/tests/extender-service_test.yaml
+++ b/packages/system/linstor-scheduler/tests/extender-service_test.yaml
@@ -33,3 +33,30 @@ tests:
       - equal:
           path: spec.selector["app.kubernetes.io/component"]
           value: scheduler
+
+  # Cozystack downstream patch strips distribution suffixes (e.g. +k3s1) from the
+  # kube-scheduler image tag via the kubeVersion helper, so the tag resolves to a
+  # real registry.k8s.io image on k3s/rke2/Talos. Pin it so a future revendor
+  # cannot silently drop the fix.
+  - it: base kube-scheduler image tag carries no distribution suffix
+    set:
+      linstor-scheduler.scheduler.image.compatibleKubernetesRelease: v1.31.0+k3s1
+    template: charts/linstor-scheduler/templates/deployment.yaml
+    asserts:
+      - matchRegex:
+          path: spec.template.spec.containers[0].image
+          pattern: :v1\.31\.0$
+      - notMatchRegex:
+          path: spec.template.spec.containers[0].image
+          pattern: \+
+
+  # Node-drain safety: once admission pods are isolated from the base PDB, a
+  # single scheduler replica under the base minAvailable:1 PDB would make its
+  # node undrainable (disruptionsAllowed 0). Two replicas keep it drainable and
+  # give real HA via leader election.
+  - it: base scheduler runs two replicas so its node stays drainable
+    template: charts/linstor-scheduler/templates/deployment.yaml
+    asserts:
+      - equal:
+          path: spec.replicas
+          value: 2
diff --git a/packages/system/linstor-scheduler/values.yaml b/packages/system/linstor-scheduler/values.yaml
index 652cb61a5d..e181fc8f26 100644
--- a/packages/system/linstor-scheduler/values.yaml
+++ b/packages/system/linstor-scheduler/values.yaml
@@ -1,7 +1,20 @@
 linstor-scheduler:
   fullnameOverride: linstor-scheduler
+  # Run two scheduler replicas (active/standby via the chart's leader election).
+  # A single replica under the base minAvailable:1 PodDisruptionBudget yields
+  # disruptionsAllowed 0, which makes the scheduler's node undrainable (blocks
+  # kubectl drain and Talos rolling upgrades); two replicas keep the node
+  # drainable and give leader-elected failover when a replica dies. The base
+  # scheduler sets no anti-affinity, so both replicas can still land on one
+  # node: this buys drain safety, not node-failure HA.
+  replicaCount: 2
   linstor:
     endpoint: "https://linstor-controller.cozy-linstor.svc:3371"
     clientSecret: "linstor-client-tls"
   admission:
     enabled: true
+    # reloadOnCertChange stays at the upstream default (false). The vendored
+    # chart's values.yaml still documents the knob as required, but that text
+    # predates the binary the chart now ships: the v0.3.6 extender serves its
+    # certificate via tls.Config.GetCertificate and reloads it on rotation, so
+    # the Stakater Reloader annotation would only buy a redundant pod restart.
diff --git a/packages/system/linstor/Makefile b/packages/system/linstor/Makefile
index cc425f0539..74e3f5aef6 100644
--- a/packages/system/linstor/Makefile
+++ b/packages/system/linstor/Makefile
@@ -4,8 +4,15 @@ export NAMESPACE=cozy-$(NAME)
 include ../../../hack/common-envs.mk
 include ../../../hack/package.mk
 
-LINSTOR_VERSION ?= 1.33.2
-LINSTOR_CSI_VERSION ?= v1.10.6
+LINSTOR_VERSION ?= 1.33.3
+# The golden-image clone guard in packages/apps/vm-disk/templates/dv.yaml
+# reads allowRemoteVolumeAccess and layerList the way this release does and
+# has to be re-checked against the new one.
+LINSTOR_CSI_VERSION ?= v1.11.2
+
+test:
+	helm unittest .
+	python3 -m unittest discover -s tests -p 'test_*.py' -v
 
 image: image-piraeus-server image-linstor-csi
 
@@ -14,8 +21,7 @@ image-piraeus-server:
 		--build-arg LINSTOR_VERSION=$(LINSTOR_VERSION) \
 		--build-arg K8S_AWAIT_ELECTION_VERSION=v0.4.2 \
 		$(call image-tags,piraeus-server,$(LINSTOR_VERSION)) \
-		--cache-from type=registry,ref=$(REGISTRY)/piraeus-server:latest \
-		--cache-to type=inline \
+		$(call cache-args,piraeus-server) \
 		--metadata-file images/piraeus-server.json \
 		$(BUILDX_ARGS)
 	REPOSITORY="$(REGISTRY)/piraeus-server" \
@@ -28,8 +34,7 @@ image-linstor-csi:
 	docker buildx build images/linstor-csi \
 		--build-arg VERSION=$(LINSTOR_CSI_VERSION) \
 		$(call image-tags,linstor-csi,$(LINSTOR_CSI_VERSION)) \
-		--cache-from type=registry,ref=$(REGISTRY)/linstor-csi:latest \
-		--cache-to type=inline \
+		$(call cache-args,linstor-csi) \
 		--metadata-file images/linstor-csi.json \
 		$(BUILDX_ARGS)
 	REPOSITORY="$(REGISTRY)/linstor-csi" \
diff --git a/packages/system/linstor/README.md b/packages/system/linstor/README.md
new file mode 100644
index 0000000000..ab5e4f1aa6
--- /dev/null
+++ b/packages/system/linstor/README.md
@@ -0,0 +1,27 @@
+# Talos satellite graceful shutdown
+
+Cozystack's Talos configuration removes the systemd `drbd-shutdown-guard`. The optional satellite preStop hook releases unused Secondary DRBD resources so their backing devices, including ZFS zvols, can be released during normal shutdown.
+
+| Parameter | Default | Effect |
+| --- | --- | --- |
+| `talos.gracefulShutdown.enabled` | `false` | Add the satellite preStop hook when both `talos.enabled` and `drbd.enabled` are also `true`. |
+
+The default satellite lifecycle is unchanged. To enable the hook, set these values for the `linstor` component of the `cozystack.linstor` package:
+
+```yaml
+talos:
+  gracefulShutdown:
+    enabled: true
+```
+
+Keep the setting in the package's declarative configuration at `spec.components.linstor.values.talos.gracefulShutdown.enabled`. The LINSTOR Helm chart embeds `hack/satellite-pre-stop.py` in `LinstorSatelliteConfiguration/cozystack-talos`; Piraeus converts its `podTemplate` to a strategic merge patch for each selected satellite DaemonSet. Package reconciliation and upgrades therefore retain the hook while the value remains enabled. Editing a generated Pod or DaemonSet directly does not persist through reconciliation. The hook uses Python and `drbdsetup` already supplied by the Cozystack satellite image.
+
+The hook runs on every graceful satellite container stop, including ordinary pod restarts. It skips all Primary resources and any resource with an open device, rechecks each candidate, then calls `drbdsetup down` without force. Unknown or malformed status, command failure and timeout stop further actions. It does not demote resources, call the Kubernetes API, or change access permissions.
+
+Enable it only when satellite and node restarts are performed sequentially, with replication and quorum checked between nodes. Piraeus creates a separate DaemonSet for each node; this chart does not serialize their rollouts. A shared configuration or image update can therefore stop unused Secondary replicas on several nodes at once and pause I/O until they return. Changing or disabling the setting can trigger a pod rollout, and the old pod still runs its existing hook.
+
+Drain workloads before a planned node shutdown. The hook has a 60-second work budget, with each status command limited to 4 seconds and each down command to 10 seconds, and requests a 90-second pod termination grace period. The kubelet's node-shutdown budget can terminate the hook earlier; the pod grace period does not override that budget. Forced reboot, failed kubelet shutdown, still-open devices and unfinished replication are not fixed by this hook.
+
+Related upstream discussion: [Piraeus orderly shutdown on Talos](https://github.com/piraeusdatastore/piraeus-operator/issues/860).
+
+Run `make test` in this directory with Helm, helm-unittest and Python 3.11 or later. The tests cover rendering with each feature flag, resource selection and rechecks, bounded errors and timeouts, dry-run behavior, and logging in the shared pod PID namespace.
diff --git a/packages/system/linstor/hack/plunger/plunger-satellite.sh b/packages/system/linstor/hack/plunger/plunger-satellite.sh
index da4da04d5f..da7c93edfe 100755
--- a/packages/system/linstor/hack/plunger/plunger-satellite.sh
+++ b/packages/system/linstor/hack/plunger/plunger-satellite.sh
@@ -89,7 +89,7 @@ drbd_stall_act() {
   local peer="$2"
   local pct="$3"
   log "STALL detected: res=$res sync_peer=$peer percent_in_sync=$pct -> disconnect/connect"
-  drbdadm disconnect "${res}:${peer}" && drbdadm connect "$res" || log "WARN: action failed for ${res}:${peer}"
+  drbdadm disconnect "${res}:${peer}" && drbdadm connect "${res}:${peer}" || log "WARN: action failed for ${res}:${peer}"
 }
 
 # Track percent-in-sync progress across iterations.
diff --git a/packages/system/linstor/hack/satellite-pre-stop.py b/packages/system/linstor/hack/satellite-pre-stop.py
new file mode 100644
index 0000000000..f78a852ec4
--- /dev/null
+++ b/packages/system/linstor/hack/satellite-pre-stop.py
@@ -0,0 +1,145 @@
+import json
+import os
+import re
+import subprocess
+import sys
+import time
+
+
+def stderr_tail(value):
+    """Keep the last 2048 characters, including diagnostics from timeouts."""
+    if isinstance(value, bytes):
+        value = value.decode("utf-8", errors="replace")
+    return (value or "")[-2048:]
+
+
+def connect_container_stdout():
+    # Piraeus shares the pod PID namespace, so /proc/1 belongs to the sandbox.
+    with open("/proc/self/cgroup") as stream:
+        cgroup = stream.read()
+    candidates = []
+    for pid in os.listdir("/proc"):
+        if not pid.isdigit():
+            continue
+        try:
+            with open("/proc/" + pid + "/cgroup") as stream:
+                same_container = stream.read() == cgroup
+            with open("/proc/" + pid + "/comm") as stream:
+                is_java = stream.read().strip() == "java"
+            if same_container and is_java:
+                candidates.append(pid)
+        except OSError:
+            continue
+    if len(candidates) != 1:
+        raise RuntimeError("unique-satellite-java-required")
+    fd = os.open("/proc/" + candidates[0] + "/fd/1", os.O_WRONLY | os.O_APPEND)
+    try:
+        os.dup2(fd, 1)
+        os.dup2(fd, 2)
+    finally:
+        os.close(fd)
+
+
+def log(event, **fields):
+    print(json.dumps(dict(event=event, **fields), sort_keys=True), flush=True)
+
+
+def parse_status(text):
+    data = json.loads(text)
+    if type(data) is not list:
+        raise ValueError("status-list-required")
+    result = {}
+    for resource in data:
+        if type(resource) is not dict:
+            raise ValueError("resource-object-required")
+        name = resource.get("name")
+        if type(name) is not str or not re.fullmatch(r"[A-Za-z0-9][A-Za-z0-9_.-]{0,254}", name):
+            raise ValueError("invalid-resource-name")
+        if name in result or resource.get("role") not in ("Primary", "Secondary"):
+            raise ValueError("duplicate-name-or-unknown-role")
+        devices = resource.get("devices")
+        if type(devices) is not list or not devices:
+            raise ValueError("devices-required")
+        volumes = set()
+        for device in devices:
+            if type(device) is not dict or type(device.get("open")) is not bool:
+                raise ValueError("explicit-open-boolean-required")
+            volume = device.get("volume")
+            if type(volume) is not int or volume < 0 or volume in volumes:
+                raise ValueError("invalid-volume")
+            volumes.add(volume)
+        result[name] = resource
+    return result
+
+
+def eligible(resource):
+    # A pod restart must leave mounted volumes and their Primary role intact.
+    return resource["role"] == "Secondary" and all(device["open"] is False for device in resource["devices"])
+
+
+def read_status(name=None, timeout=4):
+    args = ["/usr/sbin/drbdsetup", "status"]
+    if name is not None:
+        args.append(name)
+    args.append("--json")
+    result = subprocess.run(args, capture_output=True, text=True, errors="replace", timeout=timeout)
+    if result.returncode != 0:
+        raise RuntimeError("status-command-failed (exit=%s): %s" % (result.returncode, stderr_tail(result.stderr)))
+    return parse_status(result.stdout)
+
+
+def main():
+    if sys.argv[1:] not in ([], ["--execute"]):
+        raise ValueError("unsupported-arguments")
+    execute = sys.argv[1:] == ["--execute"]
+    deadline = time.monotonic() + 60
+    initial = read_status()
+    for name, resource in initial.items():
+        if not eligible(resource):
+            log("skip-in-use", resource=name, role=resource["role"])
+            continue
+        remaining = deadline - time.monotonic()
+        if remaining < 1:
+            raise RuntimeError("hook-deadline")
+        current = read_status(name, timeout=min(4, remaining))
+        if set(current) != {name}:
+            raise ValueError("resource-read-mismatch")
+        if not eligible(current[name]):
+            log("skip-state-changed", resource=name)
+            continue
+        if not execute:
+            log("would-down", resource=name)
+            continue
+        remaining = deadline - time.monotonic()
+        if remaining < 1:
+            raise RuntimeError("hook-deadline")
+        log("down-start", resource=name)
+        result = subprocess.run(
+            ["/usr/sbin/drbdsetup", "down", name],
+            stdout=subprocess.DEVNULL,
+            stderr=subprocess.PIPE,
+            text=True,
+            errors="replace",
+            timeout=min(10, remaining),
+        )
+        if result.returncode != 0:
+            raise RuntimeError("down-command-failed (exit=%s): %s" % (result.returncode, stderr_tail(result.stderr)))
+        log("down-finished", resource=name)
+    log("finished", execute=execute, resources=len(initial))
+
+
+def run_hook():
+    try:
+        connect_container_stdout()
+        main()
+    except Exception as error:
+        details = {"error_type": type(error).__name__, "error": str(error)}
+        if isinstance(error, subprocess.TimeoutExpired):
+            details["stderr"] = stderr_tail(error.stderr)
+        log("abort-no-further-actions", **details)
+        return 1
+    return 0
+
+
+if __name__ == "__main__":
+    sys.exit(run_hook())
diff --git a/packages/system/linstor/images/linstor-csi/Dockerfile b/packages/system/linstor/images/linstor-csi/Dockerfile
index df5d179dd7..50e7550900 100644
--- a/packages/system/linstor/images/linstor-csi/Dockerfile
+++ b/packages/system/linstor/images/linstor-csi/Dockerfile
@@ -1,6 +1,7 @@
-FROM golang:1.25 AS builder
+FROM --platform=$BUILDPLATFORM golang:1.27@sha256:3680233e3204827fbdc66088528ae6d4b3d034f51d03a99d454f6de034888244 AS builder
+ARG GOPROXY
 
-ARG VERSION=v1.10.6
+ARG VERSION=v1.11.2
 ARG LINSTOR_WAIT_UNTIL_VERSION=v0.3.1
 ARG TARGETARCH
 ARG TARGETOS
@@ -12,7 +13,25 @@ RUN curl -sSL https://github.com/piraeusdatastore/linstor-csi/archive/refs/tags/
 COPY patches /patches
 RUN git apply /patches/*.diff
 
-RUN go mod download
+RUN for attempt in 1 2 3; do go mod download && break; [ "$attempt" = 3 ] && exit 1; sleep $((attempt * 10)); done
+
+# Upstream pins grpc v1.81.0, which uses http2.TrailerPrefix; on Go 1.27
+# golang.org/x/net builds http2 on top of net/http and no longer defines it.
+# v1.83.2 also carries the fix for GO-2026-6443, a server panic reachable
+# through the CSI gRPC endpoint.
+RUN go get google.golang.org/grpc@v1.83.2 && \
+    go mod tidy
+
+# go build never compiles a _test.go, so nothing else runs the tests of the
+# packages the patches touch. Each package is tested from its own directory:
+# that finds the module it belongs to, and an empty list runs nothing.
+# The list is read into a variable first: a for loop drops the exit status
+# of a command substitution, so a patch git cannot read would leave the list
+# empty and the step green.
+RUN files=$(git apply --numstat /patches/*.diff) || exit 1; \
+    for dir in $(printf '%s\n' "$files" | cut -f3 | grep '\.go$' | xargs -r -n1 dirname | sort -u); do \
+      (cd "$dir" && go test .) || exit 1; \
+    done
 
 RUN GOOS=$TARGETOS GOARCH=$TARGETARCH CGO_ENABLED=0 \
     go build \
@@ -23,7 +42,7 @@ RUN GOOS=$TARGETOS GOARCH=$TARGETARCH CGO_ENABLED=0 \
 
 RUN curl -fsSL https://github.com/LINBIT/linstor-wait-until/releases/download/$LINSTOR_WAIT_UNTIL_VERSION/linstor-wait-until-$LINSTOR_WAIT_UNTIL_VERSION-$TARGETOS-$TARGETARCH.tar.gz | tar xvzC /
 
-FROM debian:trixie-slim
+FROM debian:trixie-slim@sha256:a99cfc517144bc59b1978475ec53b46ecabec7e43635402ee5b77cc54cd1b20a
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
       xfsprogs e2fsprogs nfs-common \
diff --git a/packages/system/linstor/images/piraeus-server/Dockerfile b/packages/system/linstor/images/piraeus-server/Dockerfile
index f93e494f8d..2c8a5500ac 100644
--- a/packages/system/linstor/images/piraeus-server/Dockerfile
+++ b/packages/system/linstor/images/piraeus-server/Dockerfile
@@ -1,9 +1,9 @@
-ARG DISTRO=bookworm
+ARG DISTRO=bookworm@sha256:f37a335e82bca302e955fa39f9dfe28f1be618f016f8a2b56318e5a5111afc26
 ARG LINSTOR_VERSION
 
 # ------------------------------------------------------------------------------
 # Build linstor-server from source
-FROM debian:bookworm AS builder
+FROM --platform=$BUILDPLATFORM debian:bookworm@sha256:f37a335e82bca302e955fa39f9dfe28f1be618f016f8a2b56318e5a5111afc26 AS builder
 
 ARG LINSTOR_VERSION
 ARG VERSION=${LINSTOR_VERSION}
diff --git a/packages/system/linstor/images/piraeus-server/patches/README.md b/packages/system/linstor/images/piraeus-server/patches/README.md
index 0401ff9da6..d2ded42858 100644
--- a/packages/system/linstor/images/piraeus-server/patches/README.md
+++ b/packages/system/linstor/images/piraeus-server/patches/README.md
@@ -1,6 +1,6 @@
 # LINSTOR Server Patches
 
-Custom patches for piraeus-server (linstor-server) v1.33.2.
+Custom patches for piraeus-server (linstor-server) v1.33.3.
 
 - **allow-toggle-disk-retry.diff** — Backport maintainer implementation of toggle-disk retry/abort
   - Source PR/comment: [#475](https://github.com/LINBIT/linstor-server/pull/475), [maintainer note](https://github.com/LINBIT/linstor-server/pull/475#issuecomment-3949630419)
@@ -12,9 +12,25 @@ Custom patches for piraeus-server (linstor-server) v1.33.2.
   - Source PR/comment: [#472](https://github.com/LINBIT/linstor-server/pull/472), [maintainer note](https://github.com/LINBIT/linstor-server/pull/472#issuecomment-3949687603)
   - Backported from commits: [`ccc85fbd2`](https://github.com/LINBIT/linstor-server/commit/ccc85fbd2c65f0b97c52403fa80f1efdb886ec4e), [`71b601554`](https://github.com/LINBIT/linstor-server/commit/71b601554f41bcb50cd5bd06989c5b0d3a814acd)
   - Note: upstream commit [`3d0402a0c`](https://github.com/LINBIT/linstor-server/commit/3d0402a0c25f0a4b57b380321f10e89982f26e7a) is already included in `v1.33.1`
+- **fix-k8s-create-already-exists.diff** — Adopt the existing object when a create in the Kubernetes CRD backend returns 409 AlreadyExists. The HTTP client retries a POST after a 5xx or a dropped connection, so a create the apiserver already persisted comes back as 409; a single-object transaction has no rollback entry, the key is dropped from memory while the CR stays, and every later write of that key fails until the controller restarts. Seen as a PV stuck in `Released` because linstor-csi could not set `BalanceResourcesEnabled` on the resource definition.
+  - Source PR: [#531](https://github.com/LINBIT/linstor-server/pull/531)
+  - Backported from commit: [`8badf8f05`](https://github.com/lexfrei/linstor-server/commit/8badf8f0526ff3b1b391857e4a046ed46b95a79c)
 - **retry-adjust-after-stale-bitmap.diff** — Retry `drbdadm adjust` after detaching a stale local bitmap state
   - Source PR: [#491](https://github.com/LINBIT/linstor-server/pull/491)
   - Backported from commit: [`51ae50a84`](https://github.com/kvaps/linstor-server/commit/51ae50a84dcb98093f543b819652c750a94d96c9)
 - **retry-secondary-after-mkfs.diff** — Retry `drbdadm secondary` after mkfs when DRBD reports the device as held open by an external probe (Talos block-controller, udev, multipathd, etc.). Without this retry, a transient `Device is held open by someone` aborts resource initialization, leaves the satellite in an intermediate state, and prevents the controller from receiving the final `UpToDate` event — orphan PVs in `Released` then cannot be cleaned up.
   - Related upstream issue: [#268](https://github.com/LINBIT/linstor-server/issues/268)
   - Related upstream issue: [drbd #74](https://github.com/LINBIT/drbd/issues/74) (same EBUSY pattern with multipathd)
+
+- **fix-min-io-probe-device-wait.diff** — Wait for temporary probe devices before reading pool I/O properties; retry failures and fall back to a probe when ZFS volumes have no usable device path.
+  - Source PR: [#528](https://github.com/LINBIT/linstor-server/pull/528), fixes [#527](https://github.com/LINBIT/linstor-server/issues/527)
+  - Adapted for v1.33.3; inactive LVM volumes retain the existing no-probe behavior.
+
+- **native-protoc.diff** — Download the protoc build for the build host's architecture instead of always `linux-x86_64`. The builder stage runs on `$BUILDPLATFORM`, so on a native arm64 builder the x86_64 protoc cannot execute and `./gradlew generateJava` fails with `Syntax error: ")" unexpected`.
+  - Not proposed upstream yet.
+
+- **snapshot-restore-drbd-initialized.diff** — Mark the volume definitions of a restored snapshot as DRBD-initialized, unless the restored resource definition carries `DrbdOptions/ForceInitialSyncPermanent`, which keeps the existing path that recreates metadata, as for a backup. Without the flag the initial UpToDate race is still open on a restored volume, and `Linstor/Drbd/InitialUptoDateOn`, copied from the source volume through the snapshot, names whichever node won it for the source. When linstor-csi autoplaces a replica on that node, the empty new volume wins the race, gets mkfs and goes StandAlone against the restored replica, so a pod attached there sees an empty filesystem. With the flag set, nothing wins the race, and an autoplaced replica resyncs from the restored one like any replica added to an existing volume.
+  - Backported from upstream commit: [`9d8cdf511`](https://github.com/LINBIT/linstor-server/commit/9d8cdf5118338fc72a34bb99799e452e031ea8f6), first released in v1.34.0; the `CHANGELOG.md` hunk is left out
+  - Drop when LINSTOR is upgraded to v1.34.0 or later
+  - On ZFS and thin pools the autoplaced replicas still skip the initial sync and rely on the source volume's day0 UUID being in the restored replica's history, upstream included; if it is not, DRBD reports unrelated data and goes StandAlone rather than syncing
+  - Fixes [cozystack/cozystack#4862](https://github.com/cozystack/cozystack/issues/4862)
diff --git a/packages/system/linstor/images/piraeus-server/patches/fix-k8s-create-already-exists.diff b/packages/system/linstor/images/piraeus-server/patches/fix-k8s-create-already-exists.diff
new file mode 100644
index 0000000000..40bf4db69e
--- /dev/null
+++ b/packages/system/linstor/images/piraeus-server/patches/fix-k8s-create-already-exists.diff
@@ -0,0 +1,169 @@
+diff --git a/server/src/main/java/com/linbit/linstor/dbdrivers/k8s/K8sCachingClient.java b/server/src/main/java/com/linbit/linstor/dbdrivers/k8s/K8sCachingClient.java
+index 5ae6a95fa..533e41541 100644
+--- a/server/src/main/java/com/linbit/linstor/dbdrivers/k8s/K8sCachingClient.java
++++ b/server/src/main/java/com/linbit/linstor/dbdrivers/k8s/K8sCachingClient.java
+@@ -2,6 +2,7 @@ package com.linbit.linstor.dbdrivers.k8s;
+ 
+ import com.linbit.linstor.annotation.Nullable;
+ 
++import java.net.HttpURLConnection;
+ import java.util.ArrayList;
+ import java.util.List;
+ import java.util.concurrent.ConcurrentHashMap;
+@@ -9,6 +10,7 @@ import java.util.concurrent.ConcurrentHashMap;
+ import io.fabric8.kubernetes.api.model.HasMetadata;
+ import io.fabric8.kubernetes.api.model.KubernetesResourceList;
+ import io.fabric8.kubernetes.api.model.StatusDetails;
++import io.fabric8.kubernetes.client.KubernetesClientException;
+ import io.fabric8.kubernetes.client.dsl.MixedOperation;
+ import io.fabric8.kubernetes.client.dsl.Resource;
+ 
+@@ -47,7 +49,29 @@ public class K8sCachingClient<T extends HasMetadata, L extends KubernetesResourc
+     @Override
+     public T create(T item)
+     {
+-        T updated = client.create(item);
++        T updated;
++        try
++        {
++            updated = client.create(item);
++        }
++        catch (KubernetesClientException exc)
++        {
++            /*
++             * The HTTP client retries a POST after a 5xx or a dropped connection, so a create that the apiserver
++             * already persisted comes back as 409. Since we are the only writer, the existing object is ours.
++             */
++            if (exc.getCode() != HttpURLConnection.HTTP_CONFLICT)
++            {
++                throw exc;
++            }
++            T live = client.withName(item.getMetadata().getName()).get();
++            if (live == null)
++            {
++                throw exc;
++            }
++            item.getMetadata().setResourceVersion(live.getMetadata().getResourceVersion());
++            updated = client.replace(item);
++        }
+         cache.put(updated.getMetadata().getName(), updated);
+         return updated;
+     }
+diff --git a/src/test/java/com/linbit/linstor/dbdrivers/k8s/K8sCachingClientTest.java b/src/test/java/com/linbit/linstor/dbdrivers/k8s/K8sCachingClientTest.java
+new file mode 100644
+index 000000000..6eb20fd06
+--- /dev/null
++++ b/src/test/java/com/linbit/linstor/dbdrivers/k8s/K8sCachingClientTest.java
+@@ -0,0 +1,112 @@
++package com.linbit.linstor.dbdrivers.k8s;
++
++import java.net.HttpURLConnection;
++import java.util.Collections;
++
++import io.fabric8.kubernetes.api.model.ConfigMap;
++import io.fabric8.kubernetes.api.model.ConfigMapBuilder;
++import io.fabric8.kubernetes.api.model.ConfigMapList;
++import io.fabric8.kubernetes.client.KubernetesClientException;
++import io.fabric8.kubernetes.client.dsl.MixedOperation;
++import io.fabric8.kubernetes.client.dsl.Resource;
++import org.junit.Before;
++import org.junit.Test;
++
++import static org.junit.Assert.assertEquals;
++import static org.junit.Assert.assertSame;
++import static org.junit.Assert.fail;
++import static org.mockito.ArgumentMatchers.any;
++import static org.mockito.Mockito.mock;
++import static org.mockito.Mockito.never;
++import static org.mockito.Mockito.verify;
++import static org.mockito.Mockito.when;
++
++public class K8sCachingClientTest
++{
++    private static final String NAME = "d5719b801db29e976a14ca6a354cc17460452b0b126b0630f12ef9e1aa22552a";
++
++    private MixedOperation<ConfigMap, ConfigMapList, Resource<ConfigMap>> client;
++    private Resource<ConfigMap> resource;
++    private K8sCachingClient<ConfigMap, ConfigMapList, Resource<ConfigMap>> cachingClient;
++
++    @SuppressWarnings("unchecked")
++    @Before
++    public void setUp()
++    {
++        client = mock(MixedOperation.class);
++        resource = mock(Resource.class);
++        ConfigMapList emptyList = new ConfigMapList();
++        emptyList.setItems(Collections.emptyList());
++        when(client.list()).thenReturn(emptyList);
++        when(client.withName(NAME)).thenReturn(resource);
++        cachingClient = new K8sCachingClient<>(client);
++    }
++
++    private static ConfigMap item(String resourceVersion)
++    {
++        return new ConfigMapBuilder()
++            .withNewMetadata().withName(NAME).withResourceVersion(resourceVersion).endMetadata()
++            .addToData("value", "false")
++            .build();
++    }
++
++    private static KubernetesClientException httpError(int code)
++    {
++        return new KubernetesClientException("error " + code, code, null);
++    }
++
++    @Test
++    public void createAdoptsObjectPersistedByRetriedRequest()
++    {
++        ConfigMap wanted = item(null);
++        ConfigMap replaced = item("43");
++        when(client.create(wanted)).thenThrow(httpError(HttpURLConnection.HTTP_CONFLICT));
++        when(resource.get()).thenReturn(item("42"));
++        when(client.replace(wanted)).thenReturn(replaced);
++
++        assertSame(replaced, cachingClient.create(wanted));
++        assertEquals("42", wanted.getMetadata().getResourceVersion());
++        assertSame(replaced, cachingClient.get(NAME));
++    }
++
++    @Test
++    public void createRethrowsConflictWhenObjectIsGone()
++    {
++        ConfigMap wanted = item(null);
++        KubernetesClientException conflict = httpError(HttpURLConnection.HTTP_CONFLICT);
++        when(client.create(wanted)).thenThrow(conflict);
++        when(resource.get()).thenReturn(null);
++
++        try
++        {
++            cachingClient.create(wanted);
++            fail("expected the original conflict");
++        }
++        catch (KubernetesClientException exc)
++        {
++            assertSame(conflict, exc);
++        }
++        verify(client, never()).replace(any());
++        assertEquals(null, cachingClient.get(NAME));
++    }
++
++    @Test
++    public void createRethrowsOtherErrorsUnchanged()
++    {
++        ConfigMap wanted = item(null);
++        KubernetesClientException serverError = httpError(HttpURLConnection.HTTP_INTERNAL_ERROR);
++        when(client.create(wanted)).thenThrow(serverError);
++
++        try
++        {
++            cachingClient.create(wanted);
++            fail("expected the original error");
++        }
++        catch (KubernetesClientException exc)
++        {
++            assertSame(serverError, exc);
++        }
++        verify(client, never()).withName(any());
++        verify(client, never()).replace(any());
++    }
++}
diff --git a/packages/system/linstor/images/piraeus-server/patches/fix-min-io-probe-device-wait.diff b/packages/system/linstor/images/piraeus-server/patches/fix-min-io-probe-device-wait.diff
new file mode 100644
index 0000000000..bb6185b88b
--- /dev/null
+++ b/packages/system/linstor/images/piraeus-server/patches/fix-min-io-probe-device-wait.diff
@@ -0,0 +1,660 @@
+diff --git a/satellite/src/main/java/com/linbit/linstor/layer/storage/AbsStorageProvider.java b/satellite/src/main/java/com/linbit/linstor/layer/storage/AbsStorageProvider.java
+--- a/satellite/src/main/java/com/linbit/linstor/layer/storage/AbsStorageProvider.java
++++ b/satellite/src/main/java/com/linbit/linstor/layer/storage/AbsStorageProvider.java
+@@ -163,6 +163,8 @@
+     }
+
+     private static final long DFLT_WAIT_UNTIL_DEVICE_CREATED_TIMEOUT_IN_MS = 5000;
++    private static final int PROBE_VLM_ATTEMPTS = 3;
++    private static final long PROBE_VLM_RETRY_DELAY_IN_MS = 1000;
+     protected static final int DFLT_STRIPES = 1;
+     public static final long SIZE_OF_NOT_FOUND_STOR_POOL = ApiConsts.VAL_STOR_POOL_SPACE_NOT_FOUND;
+
+@@ -184,6 +186,7 @@
+     protected final Set<String> changedStoragePoolStrings = new HashSet<>();
+     private final String typeDescr;
+     private final FileSystemWatch fsWatch;
++    private final Object probeVlmLock = new Object();
+     protected final DeviceProviderKind kind;
+     private final DrbdInvalidateUtils drbdInvalidateUtils;
+
+@@ -2022,61 +2025,126 @@
+         final StorPoolName storPoolObjName = storPoolObj.getName();
+         errorReporter.logDebug("ENTER updateMinIoSize method: Storage pool \"%s\"", storPoolObjName.displayValue);
+         Collection<VlmProviderObject<Resource>> vlmProviderList = storPoolObj.getVolumes(storDriverAccCtx);
++        boolean haveInfo = false;
+         if (vlmProviderList != null && vlmProviderList.size() >= 1)
+         {
+             errorReporter.logDebug("updateMinIoSize: Have vlmProviderList with %d items", vlmProviderList.size());
+             Iterator<VlmProviderObject<Resource>> vlmProviderIter = vlmProviderList.iterator();
+-            boolean haveInfo = false;
+             while (vlmProviderIter.hasNext() && !haveInfo)
+             {
+                 VlmProviderObject<Resource> vlmProvider = vlmProviderIter.next();
+                 errorReporter.logDebug("updateMinIoSize: Have vlmProvider");
+                 final String storDevicePath = vlmProvider.getDevicePath();
++                if (storDevicePath != null)
++                {
++                    try
++                    {
++                        updateMinIoSizeByDevice(storPoolObj, storDevicePath, propsChange);
++                        haveInfo = true;
++                    }
++                    catch (IOException ignored)
++                    {
++                    }
++                }
++            }
++        }
++        // An inactive shared LVM volume can be owned by another node; do not probe it by creating a volume.
++        if (!haveInfo && this instanceof ProbeVlmStorageProvider &&
++            (vlmProviderList == null || vlmProviderList.isEmpty() ||
++                kind == DeviceProviderKind.ZFS || kind == DeviceProviderKind.ZFS_THIN))
++        {
++            updateMinIoSizeByProbeVlm((ProbeVlmStorageProvider) this, storPoolObj, propsChange);
++        }
++        errorReporter.logDebug("EXIT updateMinIoSize method");
++    }
++
++    private void updateMinIoSizeByProbeVlm(
++        ProbeVlmStorageProvider storPrv,
++        StorPool storPoolObj,
++        LocalPropsChangePojo propsChange
++    )
++        throws AccessDeniedException
++    {
++        // Providers use a fixed probe name. Keep creation, probing and cleanup in one critical section.
++        synchronized (probeVlmLock)
++        {
++            boolean haveInfo = false;
++            boolean interrupted = false;
++            String lastFailure = "";
++            int attempts = 0;
++            while (attempts < PROBE_VLM_ATTEMPTS && !haveInfo && !interrupted)
++            {
++                if (attempts > 0)
++                {
++                    try
++                    {
++                        Thread.sleep(PROBE_VLM_RETRY_DELAY_IN_MS);
++                    }
++                    catch (InterruptedException exc)
++                    {
++                        Thread.currentThread().interrupt();
++                        lastFailure = "interrupted before the next probe attempt";
++                        break;
++                    }
++                }
++                attempts++;
++                boolean cleaned = false;
+                 try
+                 {
+-                    updateMinIoSizeByDevice(storPoolObj, storDevicePath, propsChange);
+-                    haveInfo = true;
+-                }
+-                catch (IOException ignored)
+-                {
+-                }
+-            }
+-        }
+-        else
+-        {
+-            errorReporter.logDebug("updateMinIoSize: Don't have vlmProviderList, using temporary volumes");
+-            if (this instanceof ProbeVlmStorageProvider)
+-            {
+-                final ProbeVlmStorageProvider storPrv = (ProbeVlmStorageProvider) this;
+-                try
+-                {
+-                    final String storDevicePath = storPrv.createTmpProbeVlm(storPoolObj);
++                    @Nullable String storDevicePath = storPrv.createTmpProbeVlm(storPoolObj);
++                    if (storDevicePath == null)
++                    {
++                        lastFailure = "temporary volume has no device path";
++                    }
++                    else
++                    {
++                        waitUntilDeviceCreated(storDevicePath, getWaitTimeoutAfterCreate(storPoolObj));
++                        updateMinIoSizeByDevice(storPoolObj, storDevicePath, propsChange);
++                        haveInfo = true;
++                    }
++                }
++                catch (StorageException | IOException exc)
++                {
++                    lastFailure = exc.getMessage();
++                    interrupted = exc.getCause() instanceof InterruptedException;
++                    errorReporter.logDebug("Temporary volume probe attempt %d failed: %s", attempts, lastFailure);
++                }
++                finally
++                {
+                     try
+                     {
+-                        updateMinIoSizeByDevice(storPoolObj, storDevicePath, propsChange);
+-                    }
+-                    catch (IOException ignored)
+-                    {
+-                    }
+-                }
+-                catch (StorageException ignored)
+-                {
+-                    errorReporter.logDebug("updateMinIoSize: Temporary volume creation failed");
+-                }
+-                finally
+-                {
+-                    try
+-                    {
+                         storPrv.deleteTmpProbeVlm(storPoolObj);
+-                    }
+-                    catch (StorageException ignored)
+-                    {
+-                        errorReporter.logDebug("updateMinIoSize: Temporary volume deletion failed");
+-                    }
+-                }
+-            }
+-        }
+-        errorReporter.logDebug("EXIT updateMinIoSize method");
++                        cleaned = true;
++                    }
++                    catch (StorageException exc)
++                    {
++                        interrupted |= exc.getCause() instanceof InterruptedException;
++                        errorReporter.logWarning(
++                            "Failed to delete temporary probe volume for storage pool '%s': %s",
++                            storPoolObj.getName().displayValue,
++                            exc.getMessage()
++                        );
++                    }
++                }
++                if (interrupted)
++                {
++                    Thread.currentThread().interrupt();
++                }
++                if (!cleaned)
++                {
++                    break;
++                }
++            }
++            if (!haveInfo)
++            {
++                errorReporter.logWarning(
++                    "Could not determine block device information for storage pool '%s' after %d probe attempts: %s",
++                    storPoolObj.getName().displayValue,
++                    attempts,
++                    lastFailure
++                );
++            }
++        }
+     }
+
+     private void updateMinIoSizeByDevice(
+diff --git a/src/test/java/com/linbit/fsevent/ProbeVolumeDeviceWaitTest.java b/src/test/java/com/linbit/fsevent/ProbeVolumeDeviceWaitTest.java
+new file mode 100644
+--- /dev/null
++++ b/src/test/java/com/linbit/fsevent/ProbeVolumeDeviceWaitTest.java
+@@ -0,0 +1,467 @@
++package com.linbit.fsevent;
++
++import com.linbit.Platform;
++import com.linbit.linstor.core.identifier.StorPoolName;
++import com.linbit.linstor.core.objects.Resource;
++import com.linbit.linstor.core.objects.StorPool;
++import com.linbit.linstor.core.pojos.LocalPropsChangePojo;
++import com.linbit.linstor.layer.storage.AbsStorageProvider.AbsStorageProviderInit;
++import com.linbit.linstor.layer.storage.BlockSizeConsts;
++import com.linbit.linstor.layer.storage.lvm.LvmProvider;
++import com.linbit.linstor.layer.storage.zfs.ZfsThinProvider;
++import com.linbit.linstor.logging.ErrorReporter;
++import com.linbit.linstor.propscon.Props;
++import com.linbit.linstor.storage.StorageConstants;
++import com.linbit.linstor.storage.StorageException;
++import com.linbit.linstor.storage.interfaces.categories.resource.VlmProviderObject;
++
++import java.io.IOException;
++import java.nio.file.Files;
++import java.nio.file.Path;
++import java.util.Collections;
++import java.util.List;
++import java.util.Map;
++import java.util.concurrent.Callable;
++import java.util.concurrent.CountDownLatch;
++import java.util.concurrent.ExecutorService;
++import java.util.concurrent.Executors;
++import java.util.concurrent.Future;
++import java.util.concurrent.ScheduledExecutorService;
++import java.util.concurrent.ScheduledFuture;
++import java.util.concurrent.TimeUnit;
++import java.util.concurrent.atomic.AtomicInteger;
++
++import org.junit.After;
++import org.junit.Before;
++import org.junit.Rule;
++import org.junit.Test;
++import org.junit.rules.TemporaryFolder;
++import org.junit.rules.Timeout;
++
++import static org.junit.Assert.assertEquals;
++import static org.junit.Assert.assertFalse;
++import static org.junit.Assert.assertTrue;
++import static org.junit.Assume.assumeTrue;
++import static org.mockito.Mockito.doReturn;
++import static org.mockito.Mockito.mock;
++import static org.mockito.Mockito.mockingDetails;
++import static org.mockito.Mockito.when;
++
++public class ProbeVolumeDeviceWaitTest
++{
++    @Rule
++    public final TemporaryFolder directory = new TemporaryFolder();
++
++    @Rule
++    public final Timeout timeout = Timeout.seconds(15);
++
++    private FileSystemWatch watch;
++    private Path device;
++    private Path link;
++    private StorPool pool;
++    private ProbeProvider provider;
++    private ErrorReporter reporter;
++    private ScheduledExecutorService executor;
++
++    @Before
++    public void setUp() throws Exception
++    {
++        assumeTrue(Platform.isLinux());
++        device = directory.newFile("zd-test").toPath();
++        link = directory.getRoot().toPath().resolve("probe");
++        executor = Executors.newSingleThreadScheduledExecutor();
++        reporter = mock(ErrorReporter.class);
++        watch = new FileSystemWatch(reporter);
++        watch.start();
++        pool = mock(StorPool.class);
++        when(pool.getName()).thenReturn(new StorPoolName("data"));
++        when(pool.getVolumes(null)).thenReturn(Collections.emptyList());
++        when(pool.getProps(null)).thenReturn(mock(Props.class));
++        provider = new ProbeProvider(providerInit());
++    }
++
++    @After
++    public void tearDown() throws Exception
++    {
++        if (executor != null)
++        {
++            executor.shutdownNow();
++            assertTrue(executor.awaitTermination(2, TimeUnit.SECONDS));
++        }
++        if (watch != null)
++        {
++            watch.shutdown(false);
++            watch.awaitShutdown(2000);
++            watch.cancelAllWatchKeys();
++        }
++    }
++
++    @Test
++    public void delayedDevicePublishesPropertiesBeforeCleanup() throws Exception
++    {
++        provider.delayMillis = 50;
++        assertPublished(probe());
++        assertCleaned(1);
++        assertEquals(0, warningCount());
++    }
++
++    @Test
++    public void existingProbeDevicePublishesProperties() throws Exception
++    {
++        assertPublished(probe());
++        assertCleaned(1);
++    }
++
++    @Test
++    public void missingDeviceTimesOutAndCleansEveryAttempt() throws Exception
++    {
++        provider.delayMillis = -1;
++        provider.timeoutMillis = 20;
++        assertTrue(probe().isEmpty());
++        assertCleaned(3);
++        assertEquals(1, warningCount());
++    }
++
++    @Test
++    public void failedCreationStillCleansEveryAttempt() throws Exception
++    {
++        provider.failCreateTimes = Integer.MAX_VALUE;
++        assertTrue(probe().isEmpty());
++        assertCleaned(3);
++        assertEquals(1, warningCount());
++    }
++
++    @Test
++    public void transientCreationFailureIsRetried() throws Exception
++    {
++        provider.failCreateTimes = 1;
++        provider.delayMillis = 50;
++        assertPublished(probe());
++        assertCleaned(2);
++        assertEquals(0, warningCount());
++    }
++
++    @Test
++    public void nullProbePathDoesNotPublishProperties() throws Exception
++    {
++        provider.nullPath = true;
++        assertTrue(probe().isEmpty());
++        assertCleaned(3);
++        assertEquals(1, warningCount());
++    }
++
++    @Test
++    public void nullFirstPathDoesNotSkipUsableVolume() throws Exception
++    {
++        Files.createSymbolicLink(link, device);
++        doReturn(List.of(volume(null), volume(link))).when(pool).getVolumes(null);
++        assertPublished(probe());
++        assertEquals(0, provider.createCalls);
++        assertEquals(0, provider.deleteCalls);
++    }
++
++    @Test
++    public void missingFirstPathDoesNotSkipUsableVolume() throws Exception
++    {
++        Files.createSymbolicLink(link, device);
++        doReturn(List.of(volume(link.resolveSibling("missing")), volume(link))).when(pool).getVolumes(null);
++        assertPublished(probe());
++        assertEquals(0, provider.createCalls);
++        assertEquals(0, provider.deleteCalls);
++    }
++
++    @Test
++    public void allNullPathsFallBackToProbe() throws Exception
++    {
++        doReturn(List.of(volume(null))).when(pool).getVolumes(null);
++        provider.delayMillis = 50;
++        assertPublished(probe());
++        assertCleaned(1);
++    }
++
++    @Test
++    public void allMissingPathsFallBackToProbe() throws Exception
++    {
++        doReturn(List.of(
++            volume(link.resolveSibling("missing-a")), volume(link.resolveSibling("missing-b"))
++        )).when(pool).getVolumes(null);
++        provider.delayMillis = 50;
++        assertPublished(probe());
++        assertCleaned(1);
++    }
++
++    @Test
++    public void cleanupFailureAfterSuccessIsReported() throws Exception
++    {
++        provider.failDelete = true;
++        assertPublished(probe());
++        assertEquals(1, provider.createCalls);
++        assertEquals(1, provider.deleteCalls);
++        assertEquals(1, warningCount());
++    }
++
++    @Test
++    public void cleanupFailurePreventsAnotherCreationAttempt() throws Exception
++    {
++        provider.delayMillis = -1;
++        provider.timeoutMillis = 20;
++        provider.failDelete = true;
++        assertTrue(probe().isEmpty());
++        assertEquals(1, provider.createCalls);
++        assertEquals(1, provider.deleteCalls);
++        assertEquals(2, warningCount());
++    }
++
++    @Test
++    public void interruptedDeviceWaitCleansUpAndPreservesInterrupt() throws Exception
++    {
++        provider.delayMillis = -1;
++        Thread callingThread = Thread.currentThread();
++        executor.schedule(callingThread::interrupt, 50, TimeUnit.MILLISECONDS);
++        try
++        {
++            assertTrue(probe().isEmpty());
++            assertTrue(callingThread.isInterrupted());
++            assertCleaned(1);
++            assertEquals(1, warningCount());
++        }
++        finally
++        {
++            Thread.interrupted();
++        }
++    }
++
++    @Test
++    public void interruptedRetryDelayDoesNotCreateAnotherProbe() throws Exception
++    {
++        provider.failCreateTimes = Integer.MAX_VALUE;
++        Thread callingThread = Thread.currentThread();
++        executor.schedule(callingThread::interrupt, 100, TimeUnit.MILLISECONDS);
++        try
++        {
++            assertTrue(probe().isEmpty());
++            assertTrue(callingThread.isInterrupted());
++            assertCleaned(1);
++            assertEquals(1, warningCount());
++        }
++        finally
++        {
++            Thread.interrupted();
++        }
++    }
++
++    @Test
++    public void interruptedCleanupPreservesInterruptAndStopsRetries() throws Exception
++    {
++        provider.failCreateTimes = Integer.MAX_VALUE;
++        provider.interruptDelete = true;
++        try
++        {
++            assertTrue(probe().isEmpty());
++            assertTrue(Thread.currentThread().isInterrupted());
++            assertEquals(1, provider.createCalls);
++            assertEquals(1, provider.deleteCalls);
++        }
++        finally
++        {
++            Thread.interrupted();
++        }
++    }
++
++    @Test
++    public void concurrentProbesDoNotShareTheTemporaryVolume() throws Exception
++    {
++        provider.creationDelayMillis = 200;
++        ExecutorService callers = Executors.newFixedThreadPool(2);
++        CountDownLatch ready = new CountDownLatch(2);
++        CountDownLatch start = new CountDownLatch(1);
++        Callable<LocalPropsChangePojo> call = () ->
++        {
++            ready.countDown();
++            start.await();
++            return probe();
++        };
++        try
++        {
++            Future<LocalPropsChangePojo> first = callers.submit(call);
++            Future<LocalPropsChangePojo> second = callers.submit(call);
++            assertTrue(ready.await(2, TimeUnit.SECONDS));
++            start.countDown();
++            assertFalse(first.get(10, TimeUnit.SECONDS).isEmpty());
++            assertFalse(second.get(10, TimeUnit.SECONDS).isEmpty());
++            assertEquals(1, provider.peakActiveProbes.get());
++            assertCleaned(2);
++        }
++        finally
++        {
++            callers.shutdownNow();
++            assertTrue(callers.awaitTermination(2, TimeUnit.SECONDS));
++        }
++    }
++
++    @Test
++    public void inactiveLvmVolumesDoNotCreateProbe() throws Exception
++    {
++        doReturn(List.of(volume(null))).when(pool).getVolumes(null);
++        LvmProvider lvm = new LvmProvider(providerInit())
++        {
++            @Override
++            public String createTmpProbeVlm(StorPool ignored)
++            {
++                throw new AssertionError("Inactive shared LVM volumes must not trigger a probe volume");
++            }
++
++            @Override
++            public void deleteTmpProbeVlm(StorPool ignored)
++            {
++                throw new AssertionError("No probe volume was created");
++            }
++        };
++        LocalPropsChangePojo changes = new LocalPropsChangePojo();
++        lvm.updateMinIoSize(pool, changes);
++        assertTrue(changes.isEmpty());
++    }
++
++    private AbsStorageProviderInit providerInit()
++    {
++        return new AbsStorageProviderInit(
++            reporter, null, null, null, null, null, null, null, null, null, watch, null, null, null
++        );
++    }
++
++    private LocalPropsChangePojo probe() throws Exception
++    {
++        LocalPropsChangePojo changes = new LocalPropsChangePojo();
++        provider.updateMinIoSize(pool, changes);
++        return changes;
++    }
++
++    private void assertPublished(LocalPropsChangePojo changesRef)
++    {
++        String namespace = StorageConstants.NAMESPACE_INTERNAL + '/';
++        assertEquals(Map.of(
++            namespace + StorageConstants.BLK_DEV_MIN_IO_SIZE, Long.toString(BlockSizeConsts.DFLT_IO_SIZE),
++            namespace + StorageConstants.BLK_DEV_OPT_IO_SIZE, Long.toString(BlockSizeConsts.DFLT_OPT_IO_SIZE)
++        ), changesRef.changedStorPoolProps.get(pool.getName()));
++    }
++
++    private void assertCleaned(int attemptsRef)
++    {
++        assertEquals(attemptsRef, provider.createCalls);
++        assertEquals(attemptsRef, provider.deleteCalls);
++        assertFalse(Files.exists(link));
++    }
++
++    @SuppressWarnings("unchecked")
++    private VlmProviderObject<Resource> volume(Path pathRef)
++    {
++        VlmProviderObject<Resource> volume = mock(VlmProviderObject.class);
++        when(volume.getDevicePath()).thenReturn(pathRef == null ? null : pathRef.toString());
++        return volume;
++    }
++
++    private long warningCount()
++    {
++        return mockingDetails(reporter).getInvocations().stream()
++            .filter(invocation -> invocation.getMethod().getName().equals("logWarning"))
++            .count();
++    }
++
++    private class ProbeProvider extends ZfsThinProvider
++    {
++        private long delayMillis;
++        private long creationDelayMillis;
++        private long timeoutMillis = 4000;
++        private int failCreateTimes;
++        private boolean nullPath;
++        private boolean failDelete;
++        private boolean interruptDelete;
++        private int createCalls;
++        private int deleteCalls;
++        private ScheduledFuture<?> create;
++        private final AtomicInteger activeProbes = new AtomicInteger();
++        private final AtomicInteger peakActiveProbes = new AtomicInteger();
++
++        ProbeProvider(AbsStorageProviderInit initRef)
++        {
++            super(initRef);
++        }
++
++        @Override
++        protected long getWaitTimeoutAfterCreate(StorPool ignored)
++        {
++            return timeoutMillis;
++        }
++
++        @Override
++        public String createTmpProbeVlm(StorPool ignored) throws StorageException
++        {
++            peakActiveProbes.accumulateAndGet(activeProbes.incrementAndGet(), Math::max);
++            createCalls++;
++            if (creationDelayMillis > 0)
++            {
++                try
++                {
++                    Thread.sleep(creationDelayMillis);
++                }
++                catch (InterruptedException exc)
++                {
++                    throw new StorageException("Test probe creation interrupted", exc);
++                }
++            }
++            if (failCreateTimes > 0)
++            {
++                failCreateTimes--;
++                throw new StorageException("Probe creation failed");
++            }
++            if (nullPath)
++            {
++                return null;
++            }
++            if (delayMillis == 0)
++            {
++                try
++                {
++                    Files.createSymbolicLink(link, device);
++                }
++                catch (IOException exc)
++                {
++                    throw new StorageException("Test device creation failed", exc);
++                }
++            }
++            else if (delayMillis > 0)
++            {
++                create = executor.schedule(() -> Files.createSymbolicLink(link, device),
++                    delayMillis, TimeUnit.MILLISECONDS);
++            }
++            return link.toString();
++        }
++
++        @Override
++        public void deleteTmpProbeVlm(StorPool ignored) throws StorageException
++        {
++            deleteCalls++;
++            if (interruptDelete)
++            {
++                throw new StorageException("Probe cleanup interrupted", new InterruptedException());
++            }
++            if (failDelete)
++            {
++                throw new StorageException("Probe cleanup failed");
++            }
++            try
++            {
++                if (create != null && !create.cancel(false))
++                {
++                    create.get();
++                }
++                Files.deleteIfExists(link);
++                activeProbes.decrementAndGet();
++            }
++            catch (Exception exc)
++            {
++                throw new StorageException("Test device cleanup failed", exc);
++            }
++        }
++    }
++}
diff --git a/packages/system/linstor/images/piraeus-server/patches/native-protoc.diff b/packages/system/linstor/images/piraeus-server/patches/native-protoc.diff
new file mode 100644
index 0000000000..f3e601698f
--- /dev/null
+++ b/packages/system/linstor/images/piraeus-server/patches/native-protoc.diff
@@ -0,0 +1,41 @@
+diff --git a/build.gradle b/build.gradle
+index 75b7f64..d2dfec9 100644
+--- a/build.gradle
++++ b/build.gradle
+@@ -37,6 +37,9 @@ configurations {
+ }
+ 
+ def protobufVersion = '31.1'
++// protoc runs on the build host, so fetch the build it can execute rather
++// than always the x86_64 one.
++def protocPlatform = System.getProperty('os.arch') in ['aarch64', 'arm64'] ? 'linux-aarch_64' : 'linux-x86_64'
+ def protoc = file("${projectDir}/tools/protoc-" + protobufVersion + '/bin/protoc')
+ def logbackConfig = "logback.xml"
+ def jvmOpts = ["-Xms32M"]
+@@ -577,7 +580,7 @@ tasks.register('buildTestCommands', Exec) {
+ tasks.register('unzipProtoc', Copy) {
+     dependsOn(downloadProtoc)
+ 
+-    def zipFile = file("tools/protoc-" + protobufVersion + '-linux-x86_64.zip')
++    def zipFile = file("tools/protoc-" + protobufVersion + '-' + protocPlatform + '.zip')
+     def outputDir = file("tools/protoc-" + protobufVersion)
+ 
+     from zipTree(zipFile)
+@@ -591,7 +594,7 @@ tasks.register('unzipProtoc', Copy) {
+ 
+ tasks.register('downloadProtoc') {
+     outputs.dir "tools"
+-    def protozip = new File("${projectDir}/tools/protoc-" + protobufVersion + '-linux-x86_64.zip')
++    def protozip = new File("${projectDir}/tools/protoc-" + protobufVersion + '-' + protocPlatform + '.zip')
+     outputs.file protozip
+ 
+     doLast {
+@@ -599,7 +602,7 @@ tasks.register('downloadProtoc') {
+             mkdir "tools"
+             println "downloading protoc..."
+             new URL('https://github.com/google/protobuf/releases/download/v'
+-                    + protobufVersion + '/protoc-' + protobufVersion + '-linux-x86_64.zip')
++                    + protobufVersion + '/protoc-' + protobufVersion + '-' + protocPlatform + '.zip')
+                     .withInputStream { i -> protozip.withOutputStream { it << i } }
+         }
+     }
diff --git a/packages/system/linstor/images/piraeus-server/patches/snapshot-restore-drbd-initialized.diff b/packages/system/linstor/images/piraeus-server/patches/snapshot-restore-drbd-initialized.diff
new file mode 100644
index 0000000000..7c72aab69d
--- /dev/null
+++ b/packages/system/linstor/images/piraeus-server/patches/snapshot-restore-drbd-initialized.diff
@@ -0,0 +1,67 @@
+diff --git a/controller/src/main/java/com/linbit/linstor/core/apicallhandler/controller/CtrlSnapshotRestoreApiCallHandler.java b/controller/src/main/java/com/linbit/linstor/core/apicallhandler/controller/CtrlSnapshotRestoreApiCallHandler.java
+index a639c27cc..4dabc1a83 100644
+--- a/controller/src/main/java/com/linbit/linstor/core/apicallhandler/controller/CtrlSnapshotRestoreApiCallHandler.java
++++ b/controller/src/main/java/com/linbit/linstor/core/apicallhandler/controller/CtrlSnapshotRestoreApiCallHandler.java
+@@ -434,26 +434,39 @@ public class CtrlSnapshotRestoreApiCallHandler
+         }
+     }
+ 
+-    /*
+-     * When a snapshot was received as a backup, it is marked to re-create its local metadata. Before the
+-     * snapshot was sent the new DRBD_INITIALIZED flag and the VlmDfn property InitialUpToDateOn were
++    /**
++     * <p>Sets the {@value InternalApiConsts#KEY_LINSTOR_DRBD_INITIAL_UPTODATE_ON} property to the nodeName
++     * of the first Snapshot (which has to have a disk) of the given SnapshotDefinition.</p>
++     *
++     * <p>If this SnapshotDefinition is a backup, we also unset the {@link VolumeDefinition.Flags#DRBD_INITIALIZED}
++     * flag. Otherwise we ensure the same flag is set.</p>
++     *
++     * <p>Backup path: When a snapshot was received as a backup, it is marked to re-create its local metadata.
++     * Before the snapshot was sent the new DRBD_INITIALIZED flag and the VlmDfn property InitialUpToDateOn were
+      * cleared. If DRBD_INITIALZED would be set, no peer would even read the property (on purpose).
+      * Without the property, no peer would think of itself as a winner, thus the DRBD resource would never
+      * become UpToDate.
+      * To avoid this, this method sets the InitialUpToDateOn property to let the first resource win the
+-     * race, so it can become UpToDate and therefore also pull the other peers eventually into UpToDate state.
++     * race, so it can become UpToDate and therefore also pull the other peers eventually into UpToDate state. </p>
+      *
+-     * If the given SnapDfn had also non-backup snapshots, those should be able to keep their metadata.
++     * <p>If the given SnapDfn had also non-backup snapshots, those should be able to keep their metadata.
+      * In that case we do not have to do anything. If however all snapshots are descendants from backups
+      * we must pick one and decide the UpToDate race upfront so that the winner can set its local DRBD
+-     * as UpToDate, which also triggers the controller to set the DRBD_INITIALZED flag eventually.
++     * as UpToDate, which also triggers the controller to set the DRBD_INITIALZED flag eventually.</p>
++     *
++     * <p>Non-Backup path: When a regular snapshot (i.e. not from a backup) is restored, we can or even should
++     * assume that the backing snapshot LVs have correct metadata which do not need be be initialized. When
++     * a SnapshotVolumeDefinition is created it unfortunately does not properly store the VolumeDefinition's flags,
++     * therefore the restored VolumeDefinition will also not have the DRBD_INITIALIZED flag set, although it
++     * refers to a device with healthy and UpToDate metadata. To fix this issue we simply set the flag in this case.</p>
+      */
+     private void checkDrbdInitializedState(ResourceDefinition rscDfnRef) throws AccessDeniedException
+     {
+         AccessContext accCtx = peerAccCtx.get();
+-        if (DrbdLayerUtils.isForceInitialSyncSet(accCtx, rscDfnRef) && rscDfnRef.getDiskfulCount(accCtx) > 0)
++        if (rscDfnRef.getDiskfulCount(accCtx) > 0)
+         {
+             String winnerNodeName = rscDfnRef.getDiskfulResources(accCtx).get(0).getNode().getName().value;
++            boolean uninitializeDrbd = DrbdLayerUtils.isForceInitialSyncSet(accCtx, rscDfnRef);
+             Iterator<VolumeDefinition> vlmDfnIt = rscDfnRef.iterateVolumeDfn(accCtx);
+             while (vlmDfnIt.hasNext())
+             {
+@@ -462,7 +475,14 @@ public class CtrlSnapshotRestoreApiCallHandler
+                 {
+                     vlmDfn.getProps(accCtx)
+                         .setProp(InternalApiConsts.KEY_LINSTOR_DRBD_INITIAL_UPTODATE_ON, winnerNodeName);
+-                    vlmDfn.getFlags().disableFlags(accCtx, VolumeDefinition.Flags.DRBD_INITIALIZED);
++                    if (uninitializeDrbd)
++                    {
++                        vlmDfn.getFlags().disableFlags(accCtx, VolumeDefinition.Flags.DRBD_INITIALIZED);
++                    }
++                    else
++                    {
++                        vlmDfn.getFlags().enableFlags(accCtx, VolumeDefinition.Flags.DRBD_INITIALIZED);
++                    }
+                 }
+                 catch (InvalidKeyException | InvalidValueException exc)
+                 {
diff --git a/packages/system/linstor/templates/cluster.yaml b/packages/system/linstor/templates/cluster.yaml
index ab349cf5d2..ba51543750 100644
--- a/packages/system/linstor/templates/cluster.yaml
+++ b/packages/system/linstor/templates/cluster.yaml
@@ -39,6 +39,16 @@ spec:
         containers:
         - name: linstor-controller
           image: {{ .Values.piraeusServer.image.repository }}:{{ .Values.piraeusServer.image.tag }}
+          # Guarantee CPU/memory so the JVM keeps answering its /health probe
+          # under node contention. Requests only — see values.yaml controller.*.
+          resources:
+            {{- toYaml .Values.controller.resources | nindent 12 }}
+          # Partial override: piraeus-operator merges podTemplate as a strategic
+          # merge patch, so only these timing fields change. The operator's
+          # httpGet (GET /health on the api port) is preserved as-is.
+          livenessProbe:
+            timeoutSeconds: {{ .Values.controller.livenessProbe.timeoutSeconds }}
+            failureThreshold: {{ .Values.controller.livenessProbe.failureThreshold }}
         - name: plunger
           image: {{ .Values.piraeusServer.image.repository }}:{{ .Values.piraeusServer.image.tag }}
           command:
@@ -73,6 +83,36 @@ spec:
         containers:
         - name: linstor-csi
           image: {{ .Values.linstorCSI.image.repository }}:{{ .Values.linstorCSI.image.tag }}
+        {{- if .Values.linstorCSI.strictTopology }}
+        {{- /* A `#` comment in a rendered template is part of the output: it
+               is applied to the live LinstorCluster and read back on every
+               `kubectl get`. Explanations therefore live in a template comment,
+               which is stripped at render, and not in a YAML one.
+
+               See values.yaml linstorCSI.strictTopology for what this prevents.
+               The full argument list is restated because `args` has no
+               patchMergeKey, so a strategic merge REPLACES it rather than
+               appending. That makes this list a drift hazard: re-check it
+               against the operator's defaults on every piraeus-operator bump,
+               or a newly added upstream flag is silently dropped -- nothing in
+               the suite can observe that, see tests/csi-topology_test.yaml. The
+               $(VAR) references are resolved from the container's env by
+               Kubernetes and are stable across versions. */}}
+        - name: csi-provisioner
+          args:
+          - --v=$(VERBOSE)
+          - --csi-address=$(ADDRESS)
+          - --timeout=$(TIMEOUT)
+          - --leader-election=$(LEADER_ELECTION)
+          - --leader-election-namespace=$(NAMESPACE)
+          - --worker-threads=$(WORKER_THREADS)
+          - --http-endpoint=$(HTTP_ENDPOINT)
+          - --default-fstype=$(DEFAULT_FS_TYPE)
+          - --enable-capacity=$(ENABLE_CAPACITY)
+          - --extra-create-metadata=$(EXTRA_CREATE_METADATA)
+          - --capacity-ownerref-level=$(CAPACITY_OWNERREF_LEVEL)
+          - --strict-topology
+        {{- end }}
   csiNode:
     podTemplate:
       spec:
diff --git a/packages/system/linstor/templates/satellites-cozy.yaml b/packages/system/linstor/templates/satellites-cozy.yaml
index e6f877a047..7897189f46 100644
--- a/packages/system/linstor/templates/satellites-cozy.yaml
+++ b/packages/system/linstor/templates/satellites-cozy.yaml
@@ -14,6 +14,24 @@ spec:
       containers:
       - name: linstor-satellite
         image: {{ .Values.piraeusServer.image.repository }}:{{ .Values.piraeusServer.image.tag }}
+        # The satellite DaemonSet ran BestEffort on every storage node, which
+        # made it a standing victim for the Talos userspace OOM handler
+        # (v1.12+): that handler only ever kills cgroups with no memory.max, and
+        # picks by QoS class rather than by what caused the pressure. A tenant
+        # workload thrashing against its own limit would get the satellite
+        # killed, taking DRBD connections down with it.
+        #
+        # Note this is the opposite call from linstor-controller, which is
+        # deliberately left limit-free in values.yaml (a JVM that must not be
+        # OOM-killed mid-operation). The satellite is a Go binary with a bounded
+        # working set, so a generous limit costs nothing and buys immunity.
+        # 14d peak 368Mi on a 3-node dev cluster; grows with resource count.
+        resources:
+          requests:
+            cpu: 100m
+            memory: 128Mi
+          limits:
+            memory: 2Gi
         startupProbe:
           tcpSocket:
             port: linstor
diff --git a/packages/system/linstor/templates/satellites-no-drbd.yaml b/packages/system/linstor/templates/satellites-no-drbd.yaml
new file mode 100644
index 0000000000..1a2d95f725
--- /dev/null
+++ b/packages/system/linstor/templates/satellites-no-drbd.yaml
@@ -0,0 +1,41 @@
+{{- if not .Values.drbd.enabled }}
+{{- if not .Values.talos.enabled }}
+{{- /* Turning DRBD off removes the drbd-logger sidecar below, and nothing else.
+       The satellite DaemonSet also carries two DRBD-only initContainers that
+       piraeus-operator contributes unconditionally -- drbd-module-loader, which
+       fails when the module is absent, and drbd-shutdown-guard -- and the only
+       configuration that deletes them is satellites-talos.yaml, gated on
+       talos.enabled. So with both flags off the satellite renders and can never
+       reach Ready, which is the exact state drbd.enabled=false exists to avoid.
+       Refuse the combination rather than shipping a DaemonSet that cannot come
+       up: a render error names the problem, an unschedulable satellite does
+       not. */}}
+{{- fail "linstor: drbd.enabled=false requires talos.enabled=true. The DRBD-only initContainers (drbd-module-loader, drbd-shutdown-guard) are contributed unconditionally by piraeus-operator and are removed only by the Talos satellite configuration, so on a generic-Linux substrate the satellite would never become Ready. Run a DRBD-less substrate on Talos nodes, or keep drbd.enabled=true and make the DRBD module loadable on the host. Support for other substrates is tracked in cozystack/cozystack#4092." }}
+{{- end }}
+apiVersion: piraeus.io/v1
+kind: LinstorSatelliteConfiguration
+metadata:
+  name: cozystack-no-drbd
+spec:
+  # podTemplate is a sparse strategic-merge input. Omitting a container there
+  # does not delete one contributed by another configuration or retained in the
+  # effective Satellite spec, so remove the DRBD-only logger from the generated
+  # DaemonSet explicitly.
+  patches:
+  - target:
+      group: apps
+      version: v1
+      kind: DaemonSet
+      name: linstor-satellite
+    patch: |
+      apiVersion: apps/v1
+      kind: DaemonSet
+      metadata:
+        name: linstor-satellite
+      spec:
+        template:
+          spec:
+            containers:
+            - name: drbd-logger
+              $patch: delete
+{{- end }}
diff --git a/packages/system/linstor/templates/satellites-plunger.yaml b/packages/system/linstor/templates/satellites-plunger.yaml
index ab71298bfe..78109e167b 100644
--- a/packages/system/linstor/templates/satellites-plunger.yaml
+++ b/packages/system/linstor/templates/satellites-plunger.yaml
@@ -12,6 +12,17 @@ spec:
       containers:
       - name: plunger
         image: {{ .Values.piraeusServer.image.repository }}:{{ .Values.piraeusServer.image.tag }}
+        # Sidecars in the satellite pod. Every container needs a memory limit
+        # for the pod cgroup to get memory.max, which is what keeps the pod out
+        # of the Talos userspace OOM handler's victim set — one limit-free
+        # sidecar is enough to put the whole satellite pod back in it.
+        # 14d peaks on a 3-node dev cluster: plunger 18Mi, drbd-logger 5Mi.
+        resources:
+          requests:
+            cpu: 10m
+            memory: 32Mi
+          limits:
+            memory: 128Mi
         command:
         - "/scripts/plunger-satellite.sh"
         securityContext:
@@ -47,8 +58,15 @@ spec:
         - mountPath: /scripts
           name: script-volume
           readOnly: true
+{{- if .Values.drbd.enabled }}
       - name: drbd-logger
         image: {{ .Values.piraeusServer.image.repository }}:{{ .Values.piraeusServer.image.tag }}
+        resources:
+          requests:
+            cpu: 10m
+            memory: 32Mi
+          limits:
+            memory: 128Mi
         command:
         - "/scripts/plunger-drbd-logger.sh"
         securityContext:
@@ -70,6 +88,7 @@ spec:
         - mountPath: /scripts
           name: script-volume
           readOnly: true
+{{- end }}
       volumes:
       - name: script-volume
         configMap:
diff --git a/packages/system/linstor/templates/satellites-talos.yaml b/packages/system/linstor/templates/satellites-talos.yaml
index 21da32a6c4..6a986c95e9 100644
--- a/packages/system/linstor/templates/satellites-talos.yaml
+++ b/packages/system/linstor/templates/satellites-talos.yaml
@@ -1,9 +1,31 @@
 {{- if .Values.talos.enabled }}
+{{- $shutdown := .Values.talos.gracefulShutdown | default dict }}
+{{- $enabled := dig "enabled" false $shutdown }}
+{{- if kindIs "invalid" $enabled }}{{- $enabled = false }}{{- end }}
+{{- if not (kindIs "bool" $enabled) }}
+{{- fail "linstor: talos.gracefulShutdown.enabled must be a boolean" }}
+{{- end }}
 apiVersion: piraeus.io/v1
 kind: LinstorSatelliteConfiguration
 metadata:
   name: cozystack-talos
 spec:
+{{- if and .Values.drbd.enabled $enabled }}
+  podTemplate:
+    spec:
+      terminationGracePeriodSeconds: 90
+      containers:
+      - name: linstor-satellite
+        lifecycle:
+          preStop:
+            exec:
+              command:
+              - /usr/bin/python3
+              - -c
+              - |
+{{ required "satellite pre-stop script is missing" (.Files.Get "hack/satellite-pre-stop.py") | indent 16 }}
+              - --execute
+{{- end }}
   patches:
   - target:
       group: apps
diff --git a/packages/system/linstor/tests/cluster_test.yaml b/packages/system/linstor/tests/cluster_test.yaml
new file mode 100644
index 0000000000..4bf7ba0946
--- /dev/null
+++ b/packages/system/linstor/tests/cluster_test.yaml
@@ -0,0 +1,75 @@
+suite: LinstorCluster controller resources and liveness hardening
+
+# Pins the controller-pod surface this package adds on top of the
+# piraeus-operator defaults. The operator merges spec.controller.podTemplate
+# into the generated linstor-controller Deployment as a strategic merge patch
+# (containers merged by name, struct fields merged field-by-field), so:
+#   - resources.requests guarantee the JVM gets scheduled CPU/memory so it can
+#     answer GET /health under node CPU contention (no limits: avoid throttling
+#     / OOM-killing the JVM);
+#   - the livenessProbe override carries ONLY the timing fields (timeoutSeconds,
+#     failureThreshold) relaxed from the operator defaults (1s / 3) so a JVM GC
+#     pause or CPU contention does not trip a liveness kill. The httpGet target
+#     (GET /health on the api port) is intentionally NOT overridden — it is
+#     supplied by the operator, and re-stating it risks a wrong path/scheme.
+
+templates:
+  - templates/cluster.yaml
+
+tests:
+  - it: "linstor-controller container carries CPU and memory requests (no limits)"
+    asserts:
+      - isKind:
+          of: LinstorCluster
+      - equal:
+          path: spec.controller.podTemplate.spec.containers[0].name
+          value: linstor-controller
+      - equal:
+          path: spec.controller.podTemplate.spec.containers[0].resources.requests.cpu
+          value: 250m
+      - equal:
+          path: spec.controller.podTemplate.spec.containers[0].resources.requests.memory
+          value: 700Mi
+      - notExists:
+          path: spec.controller.podTemplate.spec.containers[0].resources.limits
+
+  - it: "linstor-controller liveness probe relaxes timing but leaves httpGet to the operator"
+    asserts:
+      - equal:
+          path: spec.controller.podTemplate.spec.containers[0].livenessProbe.timeoutSeconds
+          value: 5
+      - equal:
+          path: spec.controller.podTemplate.spec.containers[0].livenessProbe.failureThreshold
+          value: 6
+      - notExists:
+          path: spec.controller.podTemplate.spec.containers[0].livenessProbe.httpGet
+
+  - it: "resource and liveness knobs are values-driven"
+    set:
+      controller:
+        resources:
+          requests:
+            cpu: 500m
+            memory: 1Gi
+        livenessProbe:
+          timeoutSeconds: 10
+          failureThreshold: 9
+    asserts:
+      - equal:
+          path: spec.controller.podTemplate.spec.containers[0].resources.requests.cpu
+          value: 500m
+      - equal:
+          path: spec.controller.podTemplate.spec.containers[0].resources.requests.memory
+          value: 1Gi
+      - equal:
+          path: spec.controller.podTemplate.spec.containers[0].livenessProbe.timeoutSeconds
+          value: 10
+      - equal:
+          path: spec.controller.podTemplate.spec.containers[0].livenessProbe.failureThreshold
+          value: 9
+
+  - it: "controller image pin is preserved alongside the new fields"
+    asserts:
+      - matchRegex:
+          path: spec.controller.podTemplate.spec.containers[0].image
+          pattern: "^ghcr\\.io/cozystack/cozystack/piraeus-server:"
diff --git a/packages/system/linstor/tests/csi-topology_test.yaml b/packages/system/linstor/tests/csi-topology_test.yaml
new file mode 100644
index 0000000000..fbde97a2d9
--- /dev/null
+++ b/packages/system/linstor/tests/csi-topology_test.yaml
@@ -0,0 +1,61 @@
+suite: CSI provisioner strict topology
+
+# Without --strict-topology, external-provisioner passes every topology segment
+# as `requisite` and only *prefers* the node the scheduler picked, so linstor-csi
+# may legally place a node-pinned volume elsewhere when that node is full. The
+# pod is then unschedulable forever against a PV whose affinity contradicts its
+# other volumes -- a silent, permanent deadlock on a healthy-looking cluster.
+#
+# Reproduced and fixed by measurement 2026-08-25; see values.yaml for the full
+# mechanism and what was measured versus reasoned.
+
+templates:
+  - templates/cluster.yaml
+
+tests:
+  - it: the provisioner is constrained to the scheduler's chosen node by default
+    template: templates/cluster.yaml
+    asserts:
+      - contains:
+          path: spec.csiController.podTemplate.spec.containers[?(@.name=="csi-provisioner")].args
+          content: --strict-topology
+
+  # The whole argument list is restated by the patch because `args` has no
+  # patchMergeKey and a strategic merge replaces it, so a piraeus-operator bump
+  # that adds an upstream flag silently drops it here.
+  #
+  # This case does NOT catch that, and it is worth being explicit about why: the
+  # assertion reads the chart's own rendered args, and those do not move when
+  # upstream adds a flag, so the count stays 12 and the suite stays green. What
+  # it catches is an edit to this chart that changes the list without changing
+  # the count with it. Catching the upstream half would mean diffing against the
+  # operator's own defaults, and the tree vendors the piraeus chart but not the
+  # operator resources that carry them, so there is nothing in-tree to diff.
+  # Until there is, the re-check on a bump is a human obligation, stated in
+  # templates/cluster.yaml beside the list.
+  #
+  # The list was last verified complete against piraeus-operator v2.10.2:
+  # eleven upstream flags plus --strict-topology.
+  - it: the restated argument list is complete
+    template: templates/cluster.yaml
+    asserts:
+      - lengthEqual:
+          path: spec.csiController.podTemplate.spec.containers[?(@.name=="csi-provisioner")].args
+          count: 12
+      - contains:
+          path: spec.csiController.podTemplate.spec.containers[?(@.name=="csi-provisioner")].args
+          content: --enable-capacity=$(ENABLE_CAPACITY)
+
+  # Asserted by container count, not a negated `contains`: a negation against a
+  # path that no longer resolves passes vacuously.
+  - it: the override can be switched off
+    template: templates/cluster.yaml
+    set:
+      linstorCSI.strictTopology: false
+    asserts:
+      - lengthEqual:
+          path: spec.csiController.podTemplate.spec.containers
+          count: 1
+      - equal:
+          path: spec.csiController.podTemplate.spec.containers[0].name
+          value: linstor-csi
diff --git a/packages/system/linstor/tests/linstor_test.yaml b/packages/system/linstor/tests/linstor_test.yaml
new file mode 100644
index 0000000000..1d0441d464
--- /dev/null
+++ b/packages/system/linstor/tests/linstor_test.yaml
@@ -0,0 +1,27 @@
+suite: cozy-linstor image pins
+release:
+  name: linstor
+  namespace: cozy-linstor
+tests:
+  - it: pins the controller and CSI to the cozystack-built images
+    template: templates/cluster.yaml
+    documentSelector:
+      path: kind
+      value: LinstorCluster
+    asserts:
+      - matchRegex:
+          path: spec.controller.podTemplate.spec.containers[0].image
+          pattern: '^ghcr\.io/cozystack/cozystack/piraeus-server:[^@]+@sha256:[0-9a-f]{64}$'
+      - matchRegex:
+          path: spec.csiController.podTemplate.spec.containers[0].image
+          pattern: '^ghcr\.io/cozystack/cozystack/linstor-csi:[^@]+@sha256:[0-9a-f]{64}$'
+
+  - it: pins the satellite to the cozystack-built piraeus-server image
+    template: templates/satellites-cozy.yaml
+    documentSelector:
+      path: kind
+      value: LinstorSatelliteConfiguration
+    asserts:
+      - matchRegex:
+          path: spec.podTemplate.spec.containers[0].image
+          pattern: '^ghcr\.io/cozystack/cozystack/piraeus-server:[^@]+@sha256:[0-9a-f]{64}$'
diff --git a/packages/system/linstor/tests/satellites_test.yaml b/packages/system/linstor/tests/satellites_test.yaml
new file mode 100644
index 0000000000..b31bb1ed93
--- /dev/null
+++ b/packages/system/linstor/tests/satellites_test.yaml
@@ -0,0 +1,121 @@
+suite: satellite pod resource limits
+
+# The satellite DaemonSet ran BestEffort, which made it a standing victim for the
+# Talos userspace OOM handler (v1.12+): that handler only ever kills cgroups with
+# no memory.max, and picks its victim by QoS class rather than by what caused the
+# pressure. A tenant workload thrashing against its own limit would get the
+# satellite killed, taking DRBD connections on that node down with it.
+#
+# Every container in the pod needs a limit for the pod cgroup to get memory.max,
+# so the plunger sidecars are pinned alongside the satellite itself — one
+# limit-free sidecar is enough to put the whole pod back in the victim set.
+#
+# Note this is the opposite call from linstor-controller, which cluster_test.yaml
+# pins as deliberately limit-free (a JVM that must not be OOM-killed mid-operation).
+
+templates:
+  - templates/satellites-cozy.yaml
+  - templates/satellites-no-drbd.yaml
+  - templates/satellites-plunger.yaml
+
+tests:
+  - it: satellite declares a memory limit and request
+    template: templates/satellites-cozy.yaml
+    asserts:
+      - equal:
+          path: spec.podTemplate.spec.containers[?(@.name=="linstor-satellite")].resources.limits.memory
+          value: 2Gi
+      - equal:
+          path: spec.podTemplate.spec.containers[?(@.name=="linstor-satellite")].resources.requests.memory
+          value: 128Mi
+
+  - it: plunger sidecars declare memory limits
+    template: templates/satellites-plunger.yaml
+    asserts:
+      - equal:
+          path: spec.podTemplate.spec.containers[?(@.name=="plunger")].resources.limits.memory
+          value: 128Mi
+      - equal:
+          path: spec.podTemplate.spec.containers[?(@.name=="drbd-logger")].resources.limits.memory
+          value: 128Mi
+
+  # `drbd.enabled: false` is the difference between working storage and NO
+  # storage on a substrate without DRBD, not a logging preference: the sidecar
+  # exits immediately when the module is absent, the satellite pod is then never
+  # Ready, and piraeus consequently registers zero nodes — so every PVC hangs
+  # Pending behind a cluster that otherwise looks healthy.
+  #
+  # Asserted by container count and name rather than a negated `contains`: a
+  # negation against a path that no longer resolves passes vacuously, so it would
+  # go on passing if the containers list vanished entirely.
+  - it: both plunger sidecars are present by default
+    template: templates/satellites-plunger.yaml
+    asserts:
+      - lengthEqual:
+          path: spec.podTemplate.spec.containers
+          count: 2
+      - equal:
+          path: spec.podTemplate.spec.containers[0].name
+          value: plunger
+      - equal:
+          path: spec.podTemplate.spec.containers[1].name
+          value: drbd-logger
+
+  - it: drbd-logger is omitted when the substrate cannot run DRBD
+    template: templates/satellites-plunger.yaml
+    set:
+      drbd.enabled: false
+    asserts:
+      - lengthEqual:
+          path: spec.podTemplate.spec.containers
+          count: 1
+      - equal:
+          path: spec.podTemplate.spec.containers[0].name
+          value: plunger
+      # the surviving sidecar must keep its limit, or the whole pod re-enters the
+      # Talos OOM handler's victim set that this suite exists to guard
+      - equal:
+          path: spec.podTemplate.spec.containers[0].resources.limits.memory
+          value: 128Mi
+
+  - it: no DaemonSet deletion patch is emitted on a DRBD-capable substrate
+    template: templates/satellites-no-drbd.yaml
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  - it: drbd-logger is deleted from the effective DaemonSet without DRBD
+    template: templates/satellites-no-drbd.yaml
+    set:
+      drbd.enabled: false
+    asserts:
+      - isKind:
+          of: LinstorSatelliteConfiguration
+      - equal:
+          path: metadata.name
+          value: cozystack-no-drbd
+      - equal:
+          path: spec.patches[0].target
+          value:
+            group: apps
+            version: v1
+            kind: DaemonSet
+            name: linstor-satellite
+      - matchRegex:
+          path: spec.patches[0].patch
+          pattern: '(?s)containers:\s*- name: drbd-logger\s*\$patch: delete'
+
+  # The flag removes the drbd-logger sidecar and nothing else, while the
+  # satellite DaemonSet also carries two DRBD-only initContainers that only
+  # satellites-talos.yaml deletes. Off both flags the render would produce a
+  # satellite that can never reach Ready, so the chart refuses instead. Asserted
+  # on the message rather than on the failure alone: a template that starts
+  # failing for an unrelated reason would otherwise keep this case green.
+  - it: the DRBD-less generic-Linux combination is refused at render time
+    template: templates/satellites-no-drbd.yaml
+    set:
+      drbd.enabled: false
+      talos.enabled: false
+    asserts:
+      - failedTemplate:
+          errorPattern: 'drbd\.enabled=false requires talos\.enabled=true'
diff --git a/packages/system/linstor/tests/talos_shutdown_test.yaml b/packages/system/linstor/tests/talos_shutdown_test.yaml
new file mode 100644
index 0000000000..a2de6ab2c6
--- /dev/null
+++ b/packages/system/linstor/tests/talos_shutdown_test.yaml
@@ -0,0 +1,80 @@
+suite: Talos satellite graceful shutdown
+templates:
+  - templates/satellites-talos.yaml
+
+tests:
+  - it: preserves the existing satellite lifecycle by default
+    asserts:
+      - isKind:
+          of: LinstorSatelliteConfiguration
+      - equal:
+          path: metadata.name
+          value: cozystack-talos
+      - notExists:
+          path: spec.podTemplate
+
+  - it: runs the bounded hook only inside the satellite container
+    set:
+      talos.gracefulShutdown.enabled: true
+    asserts:
+      - equal:
+          path: metadata.name
+          value: cozystack-talos
+      - equal:
+          path: spec.podTemplate.spec.terminationGracePeriodSeconds
+          value: 90
+      - lengthEqual:
+          path: spec.podTemplate.spec.containers
+          count: 1
+      - equal:
+          path: spec.podTemplate.spec.containers[0].name
+          value: linstor-satellite
+      - equal:
+          path: spec.podTemplate.spec.containers[0].lifecycle.preStop.exec.command[0]
+          value: /usr/bin/python3
+      - equal:
+          path: spec.podTemplate.spec.containers[0].lifecycle.preStop.exec.command[1]
+          value: -c
+      - matchRegex:
+          path: spec.podTemplate.spec.containers[0].lifecycle.preStop.exec.command[2]
+          pattern: 'def main\(\):'
+      - equal:
+          path: spec.podTemplate.spec.containers[0].lifecycle.preStop.exec.command[3]
+          value: --execute
+
+  - it: does not turn a quoted false into an enabled shutdown hook
+    set:
+      talos.gracefulShutdown.enabled: "false"
+    asserts:
+      - failedTemplate:
+          errorMessage: 'linstor: talos.gracefulShutdown.enabled must be a boolean'
+
+  - it: clearing the opt-in value restores the default
+    set:
+      talos.gracefulShutdown.enabled: null
+    asserts:
+      - isKind:
+          of: LinstorSatelliteConfiguration
+      - notExists:
+          path: spec.podTemplate
+
+  - it: leaves the systemd shutdown guard to Piraeus on generic Linux
+    set:
+      talos.enabled: false
+      talos.gracefulShutdown.enabled: true
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  - it: omits the hook on Talos substrates without DRBD
+    set:
+      drbd.enabled: false
+      talos.gracefulShutdown.enabled: true
+    asserts:
+      - isKind:
+          of: LinstorSatelliteConfiguration
+      - notExists:
+          path: spec.podTemplate
+      - matchRegex:
+          path: spec.patches[0].patch
+          pattern: 'name: drbd-shutdown-guard'
diff --git a/packages/system/linstor/tests/test_satellite_pre_stop.py b/packages/system/linstor/tests/test_satellite_pre_stop.py
new file mode 100644
index 0000000000..25a7aff34d
--- /dev/null
+++ b/packages/system/linstor/tests/test_satellite_pre_stop.py
@@ -0,0 +1,244 @@
+import copy
+import importlib.util
+import io
+import json
+from pathlib import Path
+import subprocess
+import sys
+import unittest
+from unittest.mock import patch
+
+
+REAL_RUN = subprocess.run
+SCRIPT = Path(__file__).resolve().parents[1] / "hack" / "satellite-pre-stop.py"
+SPEC = importlib.util.spec_from_file_location("satellite_pre_stop", SCRIPT)
+hook = importlib.util.module_from_spec(SPEC)
+SPEC.loader.exec_module(hook)
+
+
+def resource(name="r1", role="Secondary", opened=False):
+    return {"name": name, "role": role, "devices": [{"volume": 0, "open": opened}]}
+
+
+class SatellitePreStopTest(unittest.TestCase):
+    def setUp(self):
+        self.run = self.enterContext(patch.object(hook.subprocess, "run"))
+        self.enterContext(patch.object(hook.sys, "argv", ["hook", "--execute"]))
+        self.clock = self.enterContext(patch.object(hook.time, "monotonic", return_value=0))
+        self.events = self.enterContext(patch.object(hook, "log"))
+
+    def status(self, *resources):
+        return subprocess.CompletedProcess([], 0, json.dumps(resources), "")
+
+    def test_rechecks_unused_secondary_before_down(self):
+        self.run.side_effect = [self.status(resource()), self.status(resource()), subprocess.CompletedProcess([], 0)]
+        hook.main()
+        self.assertEqual([call.args[0] for call in self.run.call_args_list], [
+            ["/usr/sbin/drbdsetup", "status", "--json"],
+            ["/usr/sbin/drbdsetup", "status", "r1", "--json"],
+            ["/usr/sbin/drbdsetup", "down", "r1"],
+        ])
+        self.assertEqual(self.run.call_args.kwargs["timeout"], 10)
+        self.assertEqual([call.args[0] for call in self.events.call_args_list], ["down-start", "down-finished", "finished"])
+
+    def test_keeps_primary_even_when_not_open_and_keeps_open_secondary(self):
+        self.run.return_value = self.status(resource(role="Primary"), resource("r2", opened=True))
+        hook.main()
+        self.assertEqual(self.run.call_count, 1)
+        self.assertEqual([call.args[0] for call in self.events.call_args_list], ["skip-in-use", "skip-in-use", "finished"])
+
+    def test_handles_multiple_unused_resources_without_a_fixed_inventory(self):
+        first, second = resource("pvc-a"), resource("volume.2_test")
+        self.run.side_effect = [self.status(first, second), self.status(first), subprocess.CompletedProcess([], 0),
+                                self.status(second), subprocess.CompletedProcess([], 0)]
+        hook.main()
+        down = [call.args[0] for call in self.run.call_args_list if call.args[0][1] == "down"]
+        self.assertEqual(down, [["/usr/sbin/drbdsetup", "down", "pvc-a"], ["/usr/sbin/drbdsetup", "down", "volume.2_test"]])
+
+    def test_keeps_resource_when_any_volume_is_open(self):
+        current = resource()
+        current["devices"].append({"volume": 1, "open": True})
+        self.run.return_value = self.status(current)
+        hook.main()
+        self.assertEqual(self.run.call_count, 1)
+
+    def test_state_change_between_reads_prevents_down(self):
+        for changed in [resource(role="Primary"), resource(opened=True)]:
+            with self.subTest(changed=changed):
+                self.run.reset_mock()
+                self.run.side_effect = [self.status(resource()), self.status(changed)]
+                hook.main()
+                self.assertEqual(self.run.call_count, 2)
+                self.assertEqual(self.events.call_args_list[-2].args[0], "skip-state-changed")
+
+    def test_recheck_must_identify_exact_resource(self):
+        for reply in [self.status(), self.status(resource("other")), self.status(resource(), resource("other"))]:
+            with self.subTest(reply=reply):
+                self.run.reset_mock()
+                self.run.side_effect = [self.status(resource()), reply]
+                with self.assertRaisesRegex(ValueError, "resource-read-mismatch"):
+                    hook.main()
+                self.assertEqual(self.run.call_count, 2)
+
+    def test_ambiguous_status_prevents_all_down_actions(self):
+        invalid = [None, {}, [None], [resource(), resource()], [resource(role="Unknown")]]
+        for field, value in [("name", "--all"), ("name", "r1;id"), ("devices", []), ("devices", None)]:
+            current = resource()
+            current[field] = value
+            invalid.append([current])
+        for field, value in [("open", None), ("open", "false"), ("open", 0), ("volume", -1), ("volume", True)]:
+            current = resource()
+            current["devices"][0][field] = value
+            invalid.append([current])
+        current = resource()
+        current["devices"][0].pop("open")
+        invalid.append([current])
+        current = resource()
+        current["devices"].append(copy.deepcopy(current["devices"][0]))
+        invalid.append([current])
+        for value in invalid:
+            with self.subTest(value=value):
+                self.run.reset_mock()
+                self.run.return_value = subprocess.CompletedProcess([], 0, json.dumps(value), "")
+                with self.assertRaises(ValueError):
+                    hook.main()
+                self.assertEqual(self.run.call_count, 1)
+
+    def test_status_error_or_timeout_aborts(self):
+        self.run.return_value = subprocess.CompletedProcess([], 1, "", "failed")
+        with self.assertRaisesRegex(RuntimeError, "status-command-failed"):
+            hook.main()
+        self.assertEqual(self.run.call_count, 1)
+        self.run.reset_mock()
+        self.run.side_effect = subprocess.TimeoutExpired("status", 4)
+        with self.assertRaises(subprocess.TimeoutExpired):
+            hook.main()
+        self.assertEqual(self.run.call_count, 1)
+
+    def test_down_failure_or_timeout_stops_before_next_resource(self):
+        for failure in [subprocess.CompletedProcess([], 1), subprocess.TimeoutExpired("down", 10)]:
+            with self.subTest(failure=failure):
+                self.run.reset_mock()
+                self.run.side_effect = [self.status(resource(), resource("r2")), self.status(resource()), failure]
+                with self.assertRaises((RuntimeError, subprocess.TimeoutExpired)):
+                    hook.main()
+                self.assertEqual(self.run.call_count, 3)
+
+    def test_abort_logs_bounded_status_diagnostics_without_down(self):
+        stderr = "discarded-prefix" + "x" * 2048 + "permission denied"
+        self.run.return_value = subprocess.CompletedProcess([], 12, "", stderr)
+        with patch.object(hook, "connect_container_stdout"):
+            self.assertEqual(hook.run_hook(), 1)
+        self.assertEqual(self.run.call_count, 1)
+        self.assertEqual(self.run.call_args.kwargs["errors"], "replace")
+        self.events.assert_called_once_with(
+            "abort-no-further-actions", error_type="RuntimeError",
+            error="status-command-failed (exit=12): " + stderr[-2048:],
+        )
+
+    def test_abort_logs_down_diagnostics_and_stops_before_next_resource(self):
+        stderr = "discarded-prefix" + "x" * 2048 + "device busy"
+        self.run.side_effect = [self.status(resource(), resource("r2")), self.status(resource()),
+                                subprocess.CompletedProcess([], 17, stderr=stderr)]
+        with patch.object(hook, "connect_container_stdout"):
+            self.assertEqual(hook.run_hook(), 1)
+        self.assertEqual(self.run.call_count, 3)
+        self.assertEqual(self.run.call_args.kwargs["stderr"], subprocess.PIPE)
+        self.assertTrue(self.run.call_args.kwargs["text"])
+        self.assertEqual(self.run.call_args.kwargs["errors"], "replace")
+        self.events.assert_called_with(
+            "abort-no-further-actions", error_type="RuntimeError",
+            error="down-command-failed (exit=17): " + stderr[-2048:],
+        )
+
+    def test_abort_logs_partial_timeout_stderr_for_status_and_down(self):
+        stderr = b"discarded-prefix" + b"x" * 2048 + b"device busy\xff"
+        for command in ["status", "down"]:
+            with self.subTest(command=command):
+                self.run.reset_mock()
+                self.events.reset_mock()
+                failure = subprocess.TimeoutExpired(command, 4, stderr=stderr)
+                responses = [failure] if command == "status" else [
+                    self.status(resource(), resource("r2")), self.status(resource()), failure,
+                ]
+                self.run.side_effect = responses
+                with patch.object(hook, "connect_container_stdout"):
+                    self.assertEqual(hook.run_hook(), 1)
+                self.assertEqual(self.run.call_count, len(responses))
+                self.events.assert_called_with(
+                    "abort-no-further-actions", error_type="TimeoutExpired",
+                    error=str(failure), stderr=stderr.decode("utf-8", errors="replace")[-2048:],
+                )
+
+    def test_deadline_prevents_further_down_and_bounds_command_timeout(self):
+        self.clock.side_effect = [0, 60]
+        self.run.side_effect = [self.status(resource()), self.status(resource())]
+        with self.assertRaisesRegex(RuntimeError, "hook-deadline"):
+            hook.main()
+        self.assertEqual(self.run.call_count, 1)
+        self.clock.side_effect = [0, 57, 58]
+        self.run.side_effect = [self.status(resource()), self.status(resource()), subprocess.CompletedProcess([], 0)]
+        hook.main()
+        self.assertEqual(self.run.call_args_list[-2].kwargs["timeout"], 3)
+        self.assertEqual(self.run.call_args.kwargs["timeout"], 2)
+
+    def test_deadline_stops_rechecks_when_resources_keep_becoming_busy(self):
+        self.clock.side_effect = [0, 1, 60]
+        self.run.side_effect = [self.status(resource(), resource("r2")), self.status(resource(opened=True))]
+        with self.assertRaisesRegex(RuntimeError, "hook-deadline"):
+            hook.main()
+        self.assertEqual(self.run.call_count, 2)
+
+    def test_default_dry_run_never_downs(self):
+        hook.sys.argv = ["hook"]
+        self.run.return_value = self.status(resource())
+        hook.main()
+        self.assertEqual(self.run.call_count, 2)
+        self.assertEqual(self.events.call_args_list[-2].args[0], "would-down")
+
+    def test_unknown_argument_prevents_even_status(self):
+        hook.sys.argv = ["hook", "--force"]
+        with self.assertRaisesRegex(ValueError, "unsupported-arguments"):
+            hook.main()
+        self.run.assert_not_called()
+
+    def test_chart_command_form_passes_execute_as_the_only_argument(self):
+        # The chart renders `python3 -c <script> --execute`; CPython sets
+        # sys.argv[0] to "-c" for that form, so main() receives ["--execute"].
+        probe = REAL_RUN([sys.executable, "-c", "import sys; print(sys.argv)", "--execute"],
+                         capture_output=True, text=True, check=True)
+        self.assertEqual(probe.stdout.strip(), "['-c', '--execute']")
+        hook.sys.argv = ["-c", "--execute"]
+        self.run.return_value = self.status()
+        hook.main()
+        self.events.assert_called_once_with("finished", execute=True, resources=0)
+
+    def test_script_name_placeholder_before_execute_is_rejected(self):
+        hook.sys.argv = ["-c", "hook", "--execute"]
+        with self.assertRaisesRegex(ValueError, "unsupported-arguments"):
+            hook.main()
+        self.run.assert_not_called()
+
+    def test_empty_resource_list_is_a_noop(self):
+        self.run.return_value = self.status()
+        hook.main()
+        self.assertEqual(self.run.call_count, 1)
+        self.events.assert_called_once_with("finished", execute=True, resources=0)
+
+    def test_logs_to_java_in_same_container_not_shared_pid_one(self):
+        files = {"/proc/self/cgroup": "satellite", "/proc/1/cgroup": "sandbox", "/proc/1/comm": "pause",
+                 "/proc/2/cgroup": "other", "/proc/2/comm": "java", "/proc/3/cgroup": "satellite", "/proc/3/comm": "java"}
+        def read(path):
+            if path not in files:
+                raise FileNotFoundError(path)
+            return io.StringIO(files[path])
+        with patch("builtins.open", side_effect=read), patch.object(hook.os, "listdir", return_value=["1", "2", "3", "4", "self"]), \
+                patch.object(hook.os, "open", return_value=100) as fd, patch.object(hook.os, "dup2") as dup, patch.object(hook.os, "close") as close:
+            hook.connect_container_stdout()
+            self.assertEqual(fd.call_args.args[0], "/proc/3/fd/1")
+            self.assertEqual([call.args for call in dup.call_args_list], [(100, 1), (100, 2)])
+            close.assert_called_once_with(100)
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/packages/system/linstor/values.yaml b/packages/system/linstor/values.yaml
index 5d5accef7d..4ee1429ecf 100644
--- a/packages/system/linstor/values.yaml
+++ b/packages/system/linstor/values.yaml
@@ -1,16 +1,121 @@
 piraeusServer:
   image:
     repository: ghcr.io/cozystack/cozystack/piraeus-server
-    tag: 1.33.2@sha256:7962188dd7485b997f3ea9a0ee51f9e41f1edf656201435f98eadfe7846007de
+    tag: v1.6.0@sha256:70ddd1a66fbc1ea58078f4645fc572ab8e2e189dbb4d9a5f9ca43d5663106483
 # Talos-specific workarounds (disable for generic Linux like Ubuntu/Debian)
 talos:
   enabled: true
+  gracefulShutdown:
+    # Release unused Secondary DRBD resources before satellite termination so
+    # ZFS can release their backing zvols during normal Talos shutdown.
+    # The hook also runs on satellite pod restarts. Enable only when satellite
+    # and node restarts are serialized: Piraeus has one DaemonSet per node, so
+    # a shared configuration change can otherwise stop several replicas at once.
+    enabled: false
+# Whether the node substrate can run DRBD at all.
+#
+# Disable on any substrate where the DRBD kernel module is unavailable or
+# unusable. The concrete case is Talos nodes running as containers: DRBD's
+# resource registry is global per kernel, so three containers sharing one kernel
+# cannot represent three DRBD nodes — the second `new-resource` for a given name
+# silently aliases the first instead of failing, which is worse than an error
+# because LINSTOR records a replica it does not have.
+#
+# What this flag does, and all it does: the `drbd-logger` sidecar is omitted from
+# Cozystack's sparse pod template and deleted explicitly from the effective
+# DaemonSet. Omission alone is not enough because piraeus strategically merges
+# satellite configurations. That sidecar tails DRBD state and exits immediately
+# when the module is absent, and because the whole satellite pod is then never
+# Ready, piraeus never registers the node: LINSTOR reports zero nodes,
+# `linstor-csi-node` hangs in Init polling for a node that does not exist, and
+# every PVC stays Pending. So this flag is the difference between working storage
+# and no storage at all on such a substrate, not a cosmetic reduction in logging.
+#
+# What it does NOT do: it does not touch a StorageClass. Cozystack does not own
+# them — an operator writes them by hand from the install guide — so a class
+# carrying `linstor.csi.linbit.com/layerList: "drbd storage"` still exists after
+# setting this false, and volumes on it will never provision. On such a substrate
+# create only storage-only, node-pinned classes (`layerList: "storage"`,
+# `allowRemoteVolumeAccess: "false"`); the install docs say so beside the
+# examples.
+#
+# What it REQUIRES: talos.enabled must stay true. Removing the sidecar is not the
+# whole job — the satellite DaemonSet also carries two DRBD-only initContainers
+# that piraeus-operator contributes unconditionally (drbd-module-loader, which
+# fails outright when the module is absent, and drbd-shutdown-guard), and the
+# only configuration that deletes them is the Talos one. On generic Linux the
+# satellite would therefore still never reach Ready, so the chart refuses the
+# combination at render time rather than shipping a DaemonSet that cannot come
+# up. A DRBD-less substrate has to be Talos today; making generic Linux work
+# means moving those two deletions out from under talos.enabled, tracked in
+# cozystack/cozystack#4092.
+#
+# Leaving it true on a DRBD-capable node is always correct; this only ever needs
+# disabling where DRBD genuinely cannot work.
+drbd:
+  enabled: true
 linstor:
   autoDiskful:
     enabled: true
     minutes: 30
     allowCleanup: true
 linstorCSI:
+  ## Constrain provisioning to the node the scheduler actually picked.
+  ##
+  ## Without it, external-provisioner passes EVERY topology segment as
+  ## `requisite` and merely *prefers* the selected node, so when that node is out
+  ## of space linstor-csi may legally provision the volume somewhere else. For a
+  ## node-pinned volume (`allowRemoteVolumeAccess: false`, the `local` class that
+  ## is the cluster default) the result is a PV whose node affinity contradicts
+  ## the pod's other volumes, and the pod is then unschedulable FOREVER:
+  ##
+  ##   pv "pvc-..." node affinity doesn't match node "srv1": no matching NodeSelectorTerms
+  ##
+  ## It bites hardest on CDI imports, because an importer pod mounts two volumes
+  ## -- the disk and a ~21 GiB scratch volume that CDI only creates AFTER the pod
+  ## is scheduled. The scheduler therefore sizes the node against the disk alone,
+  ## can place two importers on a node that cannot hold both disks plus both
+  ## scratch volumes, and the second scratch is then placed elsewhere.
+  ##
+  ## Measured on the wire, on a three-node dev stand: the CreateVolume request
+  ## for a WaitForFirstConsumer volume carries `requisite` as the single segment
+  ## the scheduler chose when the flag is set, and all three node segments when
+  ## it is not, the chosen one merely first in `preferred`.
+  ##
+  ## Reproduced and fixed by measurement 2026-08-25 on a three-node cluster: with
+  ## the flag absent the scratch PV landed on a different node than its disk and
+  ## the import hung indefinitely at ImportScheduled with no error anywhere; with
+  ## it set the scratch PVC stays Pending and the pod reports the actionable
+  ## `1 node(s) did not have enough free storage`, then binds and completes on
+  ## its own once space frees up. A silent permanent deadlock becomes a legible,
+  ## self-correcting wait.
+  ##
+  ## Verified for node-pinned (`local`) volumes, which is what the cluster
+  ## default uses. `replicated` is untouched for a sharper reason than its PV
+  ## being remotely accessible: it binds `Immediate`, and external-provisioner
+  ## scopes strict topology to late binding, so the flag never reaches that
+  ## path at all. The switch stays because the flag is an upstream default this
+  ## chart overrides, not because the other class is in doubt.
+  strictTopology: true
   image:
     repository: ghcr.io/cozystack/cozystack/linstor-csi
-    tag: v1.10.6@sha256:5d3a649074559e7ca5bd0bc66b2abc0c96e14de0db3c88acf4b88d989b7d1d32
+    tag: v1.6.0@sha256:ae854423de62e94fb89b59d92c20da8939196e643e83b2d60d9f6915d5b0e55c
+controller:
+  # Resource requests for the linstor-controller JVM. Requests (not limits) are
+  # set on purpose: a CPU request guarantees CPU shares so the JVM can answer its
+  # GET /health liveness probe under node CPU contention, while omitting limits
+  # avoids throttling the JVM (CPU limit) or OOM-killing it (memory limit). The
+  # memory value is a conservative starting estimate for the JVM heap + overhead;
+  # tune it to observed RSS.
+  resources:
+    requests:
+      cpu: 250m
+      memory: 700Mi
+  # Liveness-probe timing for the linstor-controller container. Only these timing
+  # fields are overridden; the httpGet target (GET /health on the api port) is
+  # supplied by piraeus-operator and intentionally left untouched. Relaxed from
+  # the operator defaults (timeoutSeconds 1, failureThreshold 3) so a JVM GC
+  # pause or CPU contention does not trip a kubelet liveness kill.
+  livenessProbe:
+    timeoutSeconds: 5
+    failureThreshold: 6
diff --git a/packages/system/local-storage/.helmignore b/packages/system/local-storage/.helmignore
new file mode 100644
index 0000000000..f67b1706e1
--- /dev/null
+++ b/packages/system/local-storage/.helmignore
@@ -0,0 +1,4 @@
+images
+hack
+.gitkeep
+tests
diff --git a/packages/system/local-storage/Chart.yaml b/packages/system/local-storage/Chart.yaml
new file mode 100644
index 0000000000..9696ab9f12
--- /dev/null
+++ b/packages/system/local-storage/Chart.yaml
@@ -0,0 +1,7 @@
+apiVersion: v2
+name: cozy-local-storage
+version: 0.0.0 # Placeholder, the actual version will be automatically set during the build process
+dependencies:
+  - name: localpv-provisioner
+    version: 4.5.1
+    repository: https://openebs.github.io/dynamic-localpv-provisioner
diff --git a/packages/system/local-storage/Makefile b/packages/system/local-storage/Makefile
new file mode 100644
index 0000000000..6a24051f6b
--- /dev/null
+++ b/packages/system/local-storage/Makefile
@@ -0,0 +1,28 @@
+export NAME=local-storage
+export NAMESPACE=cozy-$(NAME)
+
+include ../../../hack/common-envs.mk
+include ../../../hack/package.mk
+
+LOCALPV_CHART_VERSION = 4.5.1
+HELPER_IMAGE_VERSION = 4.5.0
+
+.PHONY: update update-image-pins test
+
+test:
+	helm unittest .
+	python3 tests/rbac_test.py
+
+update:
+	@test "$$(yq '.dependencies[] | select(.name == "localpv-provisioner") | .version' Chart.yaml)" = "$(LOCALPV_CHART_VERSION)"
+	rm -rf charts
+	helm pull localpv-provisioner --repo https://openebs.github.io/dynamic-localpv-provisioner --untar --untardir charts --version $(LOCALPV_CHART_VERSION)
+	patch -p1 < patches/rbac.diff
+	$(MAKE) update-image-pins
+
+# Keep third-party pins visible in umbrella values, without rebuilding or mirroring them.
+update-image-pins:
+	@digest=$$(skopeo inspect --format '{{.Digest}}' docker://docker.io/openebs/provisioner-localpv:$(LOCALPV_CHART_VERSION)) && \
+	  IMAGE_TAG="$(LOCALPV_CHART_VERSION)@$$digest" yq -i '.localpv-provisioner.localpv.image.tag = strenv(IMAGE_TAG)' values.yaml
+	@digest=$$(skopeo inspect --format '{{.Digest}}' docker://docker.io/openebs/linux-utils:$(HELPER_IMAGE_VERSION)) && \
+	  IMAGE_TAG="$(HELPER_IMAGE_VERSION)@$$digest" yq -i '.localpv-provisioner.helperPod.image.tag = strenv(IMAGE_TAG)' values.yaml
diff --git a/packages/system/local-storage/README.md b/packages/system/local-storage/README.md
new file mode 100644
index 0000000000..bfe6da4942
--- /dev/null
+++ b/packages/system/local-storage/README.md
@@ -0,0 +1,60 @@
+# OpenEBS LocalPV Hostpath
+
+This optional system package provisions node-local hostpath volumes through OpenEBS Dynamic LocalPV 4.5.1. Its StorageClass is `cozystack-local-hostpath`, uses `WaitForFirstConsumer`, and is not the cluster default. Volumes are bound to one node; the package does not provide replication, CSI snapshots or automatic recovery from node/disk loss. The default `Delete` reclaim policy removes the volume directory after the PVC is deleted.
+
+## Installation and configuration
+
+The platform registers `cozystack.local-storage` as a PackageSource even when its bundles are disabled. Install its `default` variant explicitly with `cozypkg add cozystack.local-storage` and acknowledge privileged components when prompted. The networking Package dependency must be available; current cozypkg resolves dependencies, while applying a Package manifest directly requires preparing those dependencies separately. Alternatively, a system bundle can include `cozystack.local-storage` in `bundles.enabledPackages`; `bundles.disabledPackages` takes precedence. No built-in variant installs it automatically.
+
+For explicit configuration, use a Package resource:
+
+```yaml
+apiVersion: cozystack.io/v1alpha1
+kind: Package
+metadata:
+  name: cozystack.local-storage
+spec:
+  variant: default
+  components:
+    local-storage:
+      values:
+        localpv-provisioner:
+          hostpathClass:
+            name: cozystack-local-hostpath
+            isDefaultClass: false
+            reclaimPolicy: Delete
+```
+
+Use `storageClassName: cozystack-local-hostpath` in PVCs. Setting `hostpathClass.isDefaultClass: true` is an administrator opt-in: first inspect and explicitly resolve any existing default StorageClass. The chart does not demote or adopt other classes. A PVC with `storageClassName: ""` explicitly requests no class; omitting the field allows Kubernetes to select the default. Choose a different name before installation if `cozystack-local-hostpath` already exists under another owner; changing a live StorageClass name creates a new class rather than migrating existing volumes.
+
+Only one OpenEBS LocalPV controller using the provisioner identity `openebs.io/local` may manage the cluster. Do not install this package beside a separately managed controller with that identity: a distinct StorageClass name does not isolate their reconciliation. This does not conflict with the ordinary Cozystack LINSTOR provisioner.
+
+The upstream Deployment creates privileged helper Pods in the release namespace (normally `cozy-local-storage`) to create and remove directories under `/var/openebs/local` on the selected node. That directory must be writable and backed by the intended persistent filesystem on every eligible node. RBAC limits helper Pod, leader-election Lease and optional analytics ConfigMap operations to the release namespace. PV/PVC discovery and reconciliation, node discovery, StorageClass reads and PVC events remain cluster-scoped. A privileged storage controller still has host filesystem access; namespace-scoped Pod permissions are not a tenant filesystem isolation boundary.
+
+Drain or remove applications and verify PVC/PV reclamation before uninstalling the controller. `Retain` leaves data and PV reclamation to the administrator. Hostpath volumes do not survive losing their backing node or directory. This package adds no container-cluster E2E workflow or storage migration.
+
+## Maintenance
+
+`make update` downloads chart 4.5.1, reapplies `patches/rbac.diff`, refreshes the provisioner/helper image index pins. `make test` renders the chart and checks storage, configuration and RBAC boundaries locally. Image pins are third-party pass-through references in the umbrella values; they are not rebuilt or mirrored by Cozystack. The pinned indices include Linux amd64, arm64, arm/v7 and ppc64le; actual provisioning remains subject to node filesystem and security prerequisites.
+
+The RBAC patch follows [LocalPV helper calls](https://github.com/openebs/dynamic-localpv-provisioner/blob/v4.5.1/cmd/provisioner-localpv/app/helper_hostpath.go), [startup and analytics](https://github.com/openebs/dynamic-localpv-provisioner/blob/v4.5.1/cmd/provisioner-localpv/app/start.go), and [external provisioner controller v13](https://github.com/kubernetes-sigs/sig-storage-lib-external-provisioner/blob/v13.0.0/controller/controller.go). Recheck these calls when updating upstream.
+
+## Parameters
+
+The upstream values root is `localpv-provisioner`. This system chart follows the vendored chart values convention; it does not expose an ApplicationDefinition or generated API schema.
+
+| Value under `localpv-provisioner` | Default | Effect |
+| --- | --- | --- |
+| `hostpathClass.name` | `cozystack-local-hostpath` | Name of the managed StorageClass. |
+| `hostpathClass.isDefaultClass` | `false` | Explicit administrator opt-in to default-class selection. |
+| `hostpathClass.enabled` | `true` | Whether to create the StorageClass. |
+| `hostpathClass.reclaimPolicy` | `Delete` | Use `Retain` for manual reclamation. |
+| `hostpathClass.basePath` | empty | Override the directory inherited from `localpv.basePath`. |
+| `localpv.basePath` | `/var/openebs/local` | Writable host directory used by helper Pods. |
+| `analytics.enabled` | `false` | Send upstream usage telemetry. |
+| `localpv.image` | upstream 4.5.1, pinned index | Provisioner image, refreshed by `make update-image-pins`. |
+| `helperPod.image` | upstream 4.5.0, pinned index | Privileged filesystem helper image. |
+| `serviceAccount.name` | generated from the release | Optional account name used by the controller and helpers. |
+| `rbac.create` | `true` | Create the package RBAC; when false the administrator must provide permissions. |
+
+Other supported upstream values, including image pull secrets, node selectors and helper timeouts, are documented in the [vendored chart](charts/localpv-provisioner/README.md).
diff --git a/packages/system/local-storage/charts/localpv-provisioner/Chart.yaml b/packages/system/local-storage/charts/localpv-provisioner/Chart.yaml
new file mode 100644
index 0000000000..68be3c1736
--- /dev/null
+++ b/packages/system/local-storage/charts/localpv-provisioner/Chart.yaml
@@ -0,0 +1,15 @@
+apiVersion: v2
+appVersion: 4.5.1
+description: Helm chart for OpenEBS Dynamic Local PV. For instructions to install
+  OpenEBS Dynamic Local PV using helm chart, refer to https://openebs.github.io/dynamic-localpv-provisioner/.
+home: https://openebs.io
+icon: https://raw.githubusercontent.com/cncf/artwork/master/projects/openebs/icon/color/openebs-icon-color.png
+keywords:
+- storage
+- local
+- dynamic-localpv
+name: localpv-provisioner
+sources:
+- https://github.com/openebs/dynamic-localpv-provisioner
+type: application
+version: 4.5.1
diff --git a/packages/system/local-storage/charts/localpv-provisioner/README.md b/packages/system/local-storage/charts/localpv-provisioner/README.md
new file mode 100644
index 0000000000..32027e2edd
--- /dev/null
+++ b/packages/system/local-storage/charts/localpv-provisioner/README.md
@@ -0,0 +1,124 @@
+#  OpenEBS LocalPV Provisioner
+
+[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
+![Chart Lint and Test](https://github.com/openebs/dynamic-localpv-provisioner/workflows/Chart%20Lint%20and%20Test/badge.svg)
+![Release Charts](https://github.com/openebs/dynamic-localpv-provisioner/workflows/Release%20Charts/badge.svg?branch=develop)
+
+A Helm chart for openebs dynamic localpv provisioner. This chart bootstraps OpenEBS Dynamic LocalPV provisioner deployment on a [Kubernetes](http://kubernetes.io) cluster using the  [Helm](https://helm.sh) package manager.
+
+
+**Homepage:** <http://www.openebs.io/>
+
+## Get Repo Info
+
+```console
+helm repo add openebs-localpv https://openebs.github.io/dynamic-localpv-provisioner
+helm repo update
+```
+
+_See [helm repo](https://helm.sh/docs/helm/helm_repo/) for command documentation._
+
+## Install Chart
+
+Please visit the [link](https://openebs.github.io/dynamic-localpv-provisioner/) for install instructions via helm3.
+
+```console
+# Helm
+helm install [RELEASE_NAME] openebs-localpv/localpv-provisioner --namespace [NAMESPACE] --create-namespace
+```
+
+_See [configuration](#configuration) below._
+
+_See [helm install](https://helm.sh/docs/helm/helm_install/) for command documentation._
+
+## Uninstall Chart
+
+```console
+# Helm
+helm uninstall [RELEASE_NAME] --namespace [NAMESPACE]
+```
+
+This removes all the Kubernetes components associated with the chart and deletes the release.
+
+_See [helm uninstall](https://helm.sh/docs/helm/helm_uninstall/) for command documentation._
+
+## Upgrading Chart
+
+```console
+# Helm
+helm upgrade [RELEASE_NAME] [CHART] --install --namespace [NAMESPACE]
+```
+
+
+## Configuration
+
+The following table lists the configurable parameters of the OpenEBS Dynamic LocalPV Provisioner chart and their default values.
+
+You can modify different parameters by specifying the desired value in the `helm install` command by using the `--set` and/or the `--set-string` flag(s).
+
+```console
+helm install openebs-localpv openebs-localpv/localpv-provisioner --namespace openebs --create-namespace
+```
+
+Sample command to install the provisioner with nodeAffinityLabels "openebs.io/node-affinity-key-1" and "openebs.io/node-affinity-key-2" on the hostpath StorageClass:
+```console
+helm install openebs-localpv openebs-localpv/localpv-provisioner --namespace openebs --create-namespace \
+	--set-string hostpathClass.nodeAffinityLabels="{openebs.io/node-affinity-key-1,openebs.io/node-affinity-key-2}"
+```
+
+| Parameter                                 | Description                                                                                                                        | Default                       |
+|-------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------|-------------------------------|
+| `globalImageRegistryOverride`             | When set to true, the value of `global.imageRegistry` will override all image registry settings defined at local level             | `"false"`                     |
+| `global.imagePullSecrets`                 | Global image pull secrets (merged with local imagePullSecrets and not overridden)                                                  | `[]`                          |
+| `global.imagePullPolicy`                  | Global override for image pull policy                                                                                              | `""`                          |
+| `global.analytics.enabled`                | Global override for analytics                                                                                                      | `null`                        |
+| `analytics.enabled`                       | Enable sending stats to Google Analytics                                                                                           | `true`                        |
+| `analytics.pingInterval`                  | Duration(hours) between sending ping stat                                                                                          | `24h`                         |
+| `extraLabels`                             | Additional labels to add to all chart resources                                                                                    | `{}`                          |
+| `global.imageRegistry`                    | Global override for container image registry (when `globalImageRegistryOverride` is set to true)                                   | `"docker.io"`                 |
+| `helperPod.image.registry`                | Registry for helper image                                                                                                          | `""`                          |
+| `helperPod.image.repository`              | Image for helper pod                                                                                                               | `"openebs/linux-utils"`       |
+| `helperPod.image.pullPolicy`              | Pull policy for helper pod                                                                                                         | `IfNotPresent`                |
+| `helperPod.image.tag`                     | Image tag for helper image                                                                                                         | `4.5.0`                       |
+| `helperPod.timeoutSecs`                   | The maximum number of seconds to wait for a helperPod (init, cleanup, quota) to complete                                           | `120`                         |
+| `hostpathClass.basePath`                  | BasePath for openebs-hostpath StorageClass                                                                                         | `"/var/openebs/local"`        |
+| `hostpathClass.enabled`                   | Enables creation of default Hostpath StorageClass                                                                                  | `true`                        |
+| `hostpathClass.isDefaultClass`            | Make openebs-hostpath the default StorageClass                                                                                     | `"false"`                     |
+| `hostpathClass.nodeAffinityLabels`        | Custom node label(or labels) key to uniquely identify nodes. `kubernetes.io/hostname` is the default label key for node selection. | `[]`                          |
+| `hostpathClass.xfsQuota.enabled`          | Enable XFS Quota (requires XFS filesystem)                                                                                         | `false`                       |
+| `hostpathClass.ext4Quota.enabled`         | Enable EXT4 Quota (requires EXT4 filesystem)                                                                                       | `false`                       |
+| `hostpathClass.reclaimPolicy`             | ReclaimPolicy for Hostpath PVs                                                                                                     | `"Delete"`                    |
+| `imagePullSecrets`                        | Provides image pull secrect                                                                                                        | `""`                          |
+| `localpv.controller.workers`              | The no. of concurrent worker goroutines for processing PVC create/delete events                                                    | `4`                           |
+| `localpv.enabled`                         | Enable LocalPV Provisioner                                                                                                         | `true`                        |
+| `localpv.image.registry`                  | Registry for LocalPV Provisioner image                                                                                             | `""`                          |
+| `localpv.image.repository`                | Image repository for LocalPV Provisioner                                                                                           | `openebs/localpv-provisioner` |
+| `localpv.image.pullPolicy`                | Image pull policy for LocalPV Provisioner                                                                                          | `IfNotPresent`                |
+| `localpv.image.tag`                         | Image tag for LocalPV Provisioner                                                                                                                                                           | `4.5.1`                       |
+| `localpv.updateStrategy.type`             | Update strategy for LocalPV Provisioner                                                                                            | `RollingUpdate`               |
+| `localpv.annotations`                     | Annotations for LocalPV Provisioner metadata                                                                                       | `""`                          |
+| `localpv.podAnnotations`                  | Annotations for LocalPV Provisioner pods metadata                                                                                  | `""`                          |
+| `localpv.privileged`                      | Run LocalPV Provisioner with extra privileges                                                                                      | `true`                        |
+| `localpv.resources`                       | Resource and request and limit for containers                                                                                      | `""`                          |
+| `localpv.podLabels`                       | Appends labels to the pods                                                                                                         | `""`                          |
+| `localpv.nodeSelector`                    | Nodeselector for LocalPV Provisioner pods                                                                                          | `""`                          |
+| `localpv.nodeDeployment.enabled`          | Enabled the NodeDeployment mode of installation                                                                                    | `""`                          |
+| `localpv.tolerations`                     | LocalPV Provisioner pod toleration values                                                                                          | `""`                          |
+| `localpv.securityContext`                 | Seurity context for container                                                                                                      | `""`                          |
+| `localpv.healthCheck.initialDelaySeconds` | Delay before liveness probe is initiated                                                                                           | `30`                          |
+| `localpv.healthCheck.periodSeconds`       | How often to perform the liveness probe                                                                                            | `60`                          |
+| `localpv.replicas`                        | No. of LocalPV Provisioner replica                                                                                                 | `1`                           |
+| `localpv.enableLeaderElection`            | Enable leader election                                                                                                             | `true`                        |
+| `localpv.affinity`                        | LocalPV Provisioner pod affinity                                                                                                   | `{}`                          |
+| `localpv.priorityClassName`               | Sets priorityClassName in pod                                                                                                      | `""`                          |
+| `rbac.create`                             | Enable RBAC Resources                                                                                                              | `true`                        |
+| `rbac.pspEnabled`                         | Create pod security policy resources                                                                                               | `false`                       |
+
+
+A YAML file that specifies the values for the parameters can be provided while installing the chart. For example,
+
+```bash
+helm install <release-name> -f values.yaml --namespace openebs openebs-localpv/localpv-provisioner
+```
+
+> **Tip**: You can use the default [values.yaml](values.yaml)
diff --git a/packages/system/local-storage/charts/localpv-provisioner/templates/NOTES.txt b/packages/system/local-storage/charts/localpv-provisioner/templates/NOTES.txt
new file mode 100644
index 0000000000..54ab551c65
--- /dev/null
+++ b/packages/system/local-storage/charts/localpv-provisioner/templates/NOTES.txt
@@ -0,0 +1,9 @@
+The OpenEBS Dynamic LocalPV Provisioner has been installed.
+Check its status by running:
+$ kubectl get pods -n {{ .Release.Namespace }}
+
+Get started with the Dynamic LocalPV Provisioner Quickstart guide at:
+https://github.com/openebs/dynamic-localpv-provisioner/blob/develop/docs/quickstart.md
+
+For more information, visit our Slack at https://kubernetes.slack.com/messages/openebs or view 
+the OpenEBS documentation online at https://openebs.io/docs
diff --git a/packages/system/local-storage/charts/localpv-provisioner/templates/_helpers.tpl b/packages/system/local-storage/charts/localpv-provisioner/templates/_helpers.tpl
new file mode 100644
index 0000000000..97b21b29e9
--- /dev/null
+++ b/packages/system/local-storage/charts/localpv-provisioner/templates/_helpers.tpl
@@ -0,0 +1,200 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "localpv.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified localpv provisioner name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "localpv.fullname" -}}
+{{- if .Values.fullnameOverride -}}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- if contains $name .Release.Name -}}
+{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "localpv.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+
+{{/*
+Meta labels
+*/}}
+{{- define "localpv.common.metaLabels" -}}
+chart: {{ template "localpv.chart" . }}
+heritage: {{ .Release.Service }}
+{{- end -}}
+
+{{/*
+Selector labels
+*/}}
+{{- define "localpv.selectorLabels" -}}
+app: {{ template "localpv.name" . }}
+release: {{ .Release.Name }}
+component: {{ .Values.localpv.name | quote }}
+{{- end -}}
+
+{{/*
+Component labels
+*/}}
+{{- define "localpv.componentLabels" -}}
+openebs.io/component-name: openebs-{{ .Values.localpv.name }}
+{{- end -}}
+
+{{/*
+Common labels
+*/}}
+{{- define "localpv.labels" -}}
+{{ include "localpv.common.metaLabels" . }}
+{{ include "localpv.selectorLabels" . }}
+{{ include "localpv.componentLabels" . }}
+{{- end -}}
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "localpv.serviceAccountName" -}}
+{{- if .Values.serviceAccount.create -}}
+    {{ default (include "localpv.fullname" .) .Values.serviceAccount.name }}
+{{- else -}}
+    {{ default "default" .Values.serviceAccount.name }}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Name of the ConfigMap used to record analytics install-event state for the
+current Helm release.
+
+Usage:
+  {{ include "localpv.analyticsStateCM.name" . }}
+*/}}
+{{- define "localpv.analyticsStateCM.name" -}}
+{{- printf "%s-analytics-state" (include "localpv.fullname" .) | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Name of the Lease used by the provisioner to elect a single analytics
+emitter in node-deployment mode.
+
+Usage:
+  {{ include "localpv.analyticsLease.name" . }}
+*/}}
+{{- define "localpv.analyticsLease.name" -}}
+{{- printf "%s-analytics" (include "localpv.fullname" .) | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Creates the tolerations based on the global tolerations, with early eviction
+Usage:
+{{ include "tolerations_with_early_eviction" . }}
+*/}}
+{{- define "tolerations_with_early_eviction" -}}
+{{- if .Values.earlyEvictionTolerations }}
+    {{- toYaml .Values.earlyEvictionTolerations | nindent 8 }}
+{{- end }}
+{{- if .Values.localpv.tolerations }}
+    {{- toYaml .Values.localpv.tolerations | nindent 8 }}
+{{- end }}
+{{- end }}
+
+{{/*
+Creates the image URL ie registry/repository:tag
+*/}}
+{{- define "localpv.common.image" -}}
+{{ $registryName := "" }}
+{{- if .override -}}
+{{- $registryName = default .imageRoot.registry .global.imageRegistry | trimSuffix "/" -}}
+{{- else -}}
+{{- $registryName = default .global.imageRegistry .imageRoot.registry | trimSuffix "/" -}}
+{{- end -}}
+{{- $repositoryName := .imageRoot.repository -}}
+{{- $termination := .imageRoot.tag | toString -}}
+{{- if $registryName }}
+    {{- printf "%s/%s:%s" $registryName $repositoryName $termination -}}
+{{- else -}}
+    {{- printf "%s:%s"  $repositoryName $termination -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Concatenates imagepullsecrets, outputs in ENV format and handles different formats (example - secret or - name: secret)
+*/}}
+{{- define "localpv.helper.pullSecrets" -}}
+{{- $names := list -}}
+{{- with .Values.global.imagePullSecrets -}}
+  {{- range . -}}
+    {{- if kindIs "map" . }}
+      {{- if and (hasKey . "name") (not (empty .name)) -}}
+        {{ $names = append $names .name }}
+      {{- end -}}
+    {{- else if not (empty .) -}}
+      {{ $names = append $names . -}}
+    {{- end -}}
+  {{- end -}}
+{{- end -}}
+{{- with .Values.imagePullSecrets -}}
+  {{- range . }}
+    {{- if kindIs "map" . -}}
+      {{- if and (hasKey . "name") (not (empty .name)) -}}
+        {{- $names = append $names .name }}
+      {{- end -}}
+    {{- else if not (empty .) -}}
+      {{- $names = append $names . -}}
+    {{- end -}}
+  {{- end -}}
+{{- end -}}
+{{- if $names }}
+- name: OPENEBS_IO_IMAGE_PULL_SECRETS
+  value: "{{ join "," ($names | uniq) }}"
+{{- end -}}
+{{- end -}}
+
+{{/*
+Concatenates imagepullsecrets and handles different formats (example - secret or - name: secret)
+*/}}
+{{- define "localpv.common.pullSecrets" -}}
+{{- $names := list -}}
+{{- with .Values.global.imagePullSecrets -}}
+  {{- range . -}}
+    {{- if kindIs "map" . }}
+      {{- if and (hasKey . "name") (not (empty .name)) -}}
+        {{ $names = append $names .name }}
+      {{- end -}}
+    {{- else if not (empty .) -}}
+      {{ $names = append $names . -}}
+    {{- end -}}
+  {{- end -}}
+{{- end -}}
+{{- with .Values.imagePullSecrets -}}
+  {{- range . }}
+    {{- if kindIs "map" . -}}
+      {{- if and (hasKey . "name") (not (empty .name)) -}}
+        {{- $names = append $names .name }}
+      {{- end -}}
+    {{- else if not (empty .) -}}
+      {{- $names = append $names . -}}
+    {{- end -}}
+  {{- end -}}
+{{- end -}}
+{{- $names = uniq $names -}}
+{{- if $names -}}
+  {{- range $names }}
+- name: {{ . }}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
diff --git a/packages/system/local-storage/charts/localpv-provisioner/templates/analytics.yaml b/packages/system/local-storage/charts/localpv-provisioner/templates/analytics.yaml
new file mode 100644
index 0000000000..20af6ac6ba
--- /dev/null
+++ b/packages/system/local-storage/charts/localpv-provisioner/templates/analytics.yaml
@@ -0,0 +1,27 @@
+{{/*
+Chart-managed Lease for analytics leader election (node-deployment mode only).
+
+Elects a single analytics emitter across DaemonSet pods. Helm-managed so
+`helm uninstall` cleanly removes it; without this, the Lease would persist
+in the namespace with the previous holder's identity, and the next install
+would have to wait out LeaseDuration before acquiring leadership.
+*/}}
+{{- if .Values.localpv.enabled }}
+{{- $analyticsEnabled := .Values.analytics.enabled -}}
+{{- if kindIs "bool" .Values.global.analytics.enabled -}}
+  {{- $analyticsEnabled = .Values.global.analytics.enabled -}}
+{{- end -}}
+{{- if and $analyticsEnabled .Values.localpv.nodeDeployment.enabled }}
+apiVersion: coordination.k8s.io/v1
+kind: Lease
+metadata:
+  name: {{ include "localpv.analyticsLease.name" . }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "localpv.labels" . | nindent 4 }}
+    {{- if .Values.extraLabels -}}
+      {{- toYaml .Values.extraLabels | nindent 4 }}
+    {{- end }}
+spec: {}
+{{- end }}
+{{- end }}
diff --git a/packages/system/local-storage/charts/localpv-provisioner/templates/daemonset.yaml b/packages/system/local-storage/charts/localpv-provisioner/templates/daemonset.yaml
new file mode 100644
index 0000000000..cb757dd053
--- /dev/null
+++ b/packages/system/local-storage/charts/localpv-provisioner/templates/daemonset.yaml
@@ -0,0 +1,183 @@
+{{- if .Values.localpv.enabled }}
+{{- if .Values.localpv.nodeDeployment.enabled }}
+apiVersion: apps/v1
+kind: DaemonSet
+metadata:
+  name: {{ template "localpv.fullname" . }}-node
+  {{- with .Values.localpv.annotations }}
+  annotations: {{ toYaml . | nindent 4 }}
+  {{- end }}
+  labels:
+    {{- include "localpv.labels" . | nindent 4 }}
+    {{- if .Values.extraLabels -}}
+      {{- toYaml .Values.extraLabels | nindent 4 }}
+    {{- end }}
+spec:
+  selector:
+    matchLabels:
+      {{- include "localpv.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      {{- with .Values.localpv.podAnnotations }}
+      annotations: {{ toYaml . | nindent 8 }}
+      {{- end }}
+      labels:
+        {{- include "localpv.labels" . | nindent 8 }}
+        {{- if .Values.extraLabels -}}
+          {{- toYaml .Values.extraLabels | nindent 8 }}
+        {{- end }}
+        {{- with .Values.localpv.podLabels }}
+          {{- toYaml . | nindent 8 }}
+        {{- end }}
+        {{- with .Values.loggingLabels}}
+          {{ toYaml . | nindent 8 -}}
+        {{- end}}
+    spec:
+    {{- if .Values.localpv.priorityClassName }}
+      priorityClassName: {{ tpl .Values.localpv.priorityClassName . }}
+    {{- end }}
+      {{- if or .Values.global.imagePullSecrets .Values.imagePullSecrets }}
+      imagePullSecrets:
+      {{- include "localpv.common.pullSecrets" . | indent 6 }}
+      {{- end }}
+      serviceAccountName: {{ template "localpv.serviceAccountName" . }}
+      securityContext:
+        {{- toYaml .Values.podSecurityContext | nindent 8 }}
+      containers:
+      - name: {{ template "localpv.fullname" . }}
+        image: "{{ include "localpv.common.image" (dict "imageRoot" .Values.localpv.image "global" .Values.global "override" .Values.globalImageRegistryOverride) }}"
+        imagePullPolicy: {{ default .Values.localpv.image.pullPolicy .Values.global.imagePullPolicy }}
+        {{- if .Values.localpv.privileged }}
+        securityContext:
+          privileged: true
+        {{- end }}
+        resources:
+{{ toYaml .Values.localpv.resources | indent 10 }}
+        env:
+        # OPENEBS_IO_K8S_MASTER enables openebs provisioner to connect to K8s
+        # based on this address. This is ignored if empty.
+        # This is supported for openebs provisioner version 0.5.2 onwards
+        #- name: OPENEBS_IO_K8S_MASTER
+        #  value: "http://10.128.0.12:8080"
+        # OPENEBS_IO_KUBE_CONFIG enables openebs provisioner to connect to K8s
+        # based on this config. This is ignored if empty.
+        # This is supported for openebs provisioner version 0.5.2 onwards
+        #- name: OPENEBS_IO_KUBE_CONFIG
+        #  value: "/home/ubuntu/.kube/config"
+        - name: OPENEBS_NAMESPACE
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.namespace
+        - name: NODE_NAME
+          valueFrom:
+            fieldRef:
+              fieldPath: spec.nodeName
+        # POD_NAME is consumed by the analytics leader-election code in
+        # node-deployment mode so that each DaemonSet pod has a stable,
+        # unique lease identity. Required for correct singleton behavior
+        # of install/ping/heartbeat events.
+        - name: POD_NAME
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.name
+        # OPENEBS_SERVICE_ACCOUNT provides the service account of this pod as
+        # environment variable
+        - name: OPENEBS_SERVICE_ACCOUNT
+          valueFrom:
+            fieldRef:
+              fieldPath: spec.serviceAccountName
+        # OPENEBS_IO_BASE_PATH is the environment variable that provides the
+        # default base path on the node where host-path PVs will be provisioned.
+        {{-  if kindIs "bool" .Values.global.analytics.enabled }}
+        - name: OPENEBS_IO_ENABLE_ANALYTICS
+          value: "{{ .Values.global.analytics.enabled }}"
+        {{- else }}
+        - name: OPENEBS_IO_ENABLE_ANALYTICS
+          value: "{{ .Values.analytics.enabled }}"
+        {{- end }}
+          # OPENEBS_IO_ANALYTICS_STATE_CM names the ConfigMap consulted to
+          # decide whether to emit the install event for this Helm release
+          # and to persist ping/heartbeat timestamps across pod restarts.
+          # The provisioner creates and updates this ConfigMap itself; it
+          # is not managed by Helm.
+        - name: OPENEBS_IO_ANALYTICS_STATE_CM
+          value: {{ include "localpv.analyticsStateCM.name" . | quote }}
+          # OPENEBS_IO_ANALYTICS_LEASE names the Lease used to elect a single
+          # analytics emitter across all DaemonSet pods. Release-scoped so
+          # multiple releases in the same namespace do not collide. The
+          # provisioner creates the Lease on-demand via client-go's
+          # leader-election; it is not managed by Helm.
+        - name: OPENEBS_IO_ANALYTICS_LEASE
+          value: {{ include "localpv.analyticsLease.name" . | quote }}
+        {{- if .Values.analytics.gaId }}
+        - name: GA_ID
+          value: {{ .Values.analytics.gaId | quote }}
+        {{- end }}
+        {{- if .Values.analytics.gaKey }}
+        - name: GA_KEY
+          value: {{ .Values.analytics.gaKey | quote }}
+        {{- end }}
+        - name: OPENEBS_IO_BASE_PATH
+          value: "{{ .Values.localpv.basePath }}"
+        - name: OPENEBS_IO_WORKER_THREADS
+          value: {{ .Values.localpv.controller.workers | quote }}
+        - name: OPENEBS_IO_HELPER_IMAGE
+          value: "{{ include "localpv.common.image" (dict "imageRoot" .Values.helperPod.image "global" .Values.global "override" .Values.globalImageRegistryOverride) }}"
+        - name: OPENEBS_IO_HELPER_POD_HOST_NETWORK
+          value: "{{ .Values.helperPod.hostNetwork }}"
+        - name: OPENEBS_IO_INSTALLER_TYPE
+          value: "localpv-charts-helm-nodedeploy"
+        - name: OPENEBS_IO_HELPER_POD_TIMEOUT_SECS
+          value: {{ .Values.helperPod.timeoutSecs | quote }}
+        # Disable leader election in node deployment mode.
+        # Not related to anonymous usage analytics leader election.
+        - name: LEADER_ELECTION_ENABLED
+          value: "false"
+        # Enable node deployment mode
+        - name: NODE_DEPLOYMENT
+          value: "true"
+{{- include "localpv.helper.pullSecrets" . | indent 8 }}
+        args:
+        - "--node-deployment=true"
+        # Process name used for matching is limited to the 15 characters
+        # present in the pgrep output.
+        # So fullname can't be used here with pgrep (>15 chars).A regular expression
+        # that matches the entire command name has to specified.
+        # Anchor `^` : matches any string that starts with `provisioner-loc`
+        # `.*`: matches any string that has `provisioner-loc` followed by zero or more char
+        livenessProbe:
+          exec:
+            command:
+            - sh
+            - -c
+            - test `pgrep -c "^provisioner-loc.*"` = 1
+          initialDelaySeconds: {{ .Values.localpv.healthCheck.initialDelaySeconds }}
+          periodSeconds: {{ .Values.localpv.healthCheck.periodSeconds }}
+        volumeMounts:
+        - name: host-root
+          mountPath: /host
+          mountPropagation: HostToContainer
+{{- if .Values.localpv.nodeDeployment.additionalVolumeMounts }}
+{{ toYaml .Values.localpv.nodeDeployment.additionalVolumeMounts | indent 8 }}
+{{- end }}
+      volumes:
+      - name: host-root
+        hostPath:
+          path: /
+          type: Directory
+{{- if .Values.localpv.nodeDeployment.additionalVolumes }}
+{{ toYaml .Values.localpv.nodeDeployment.additionalVolumes | indent 6 }}
+{{- end }}
+{{- if .Values.localpv.nodeSelector }}
+      nodeSelector:
+{{ toYaml .Values.localpv.nodeSelector | indent 8 }}
+{{- end }}
+{{- if $tolerations := include "tolerations_with_early_eviction" . }}
+      tolerations: {{ $tolerations }}
+{{- end }}
+{{- if .Values.localpv.affinity }}
+      affinity:
+{{ toYaml .Values.localpv.affinity | indent 8 }}
+{{- end }}
+{{- end }}
+{{- end }}
diff --git a/packages/system/local-storage/charts/localpv-provisioner/templates/deployment.yaml b/packages/system/local-storage/charts/localpv-provisioner/templates/deployment.yaml
new file mode 100644
index 0000000000..06c9361736
--- /dev/null
+++ b/packages/system/local-storage/charts/localpv-provisioner/templates/deployment.yaml
@@ -0,0 +1,151 @@
+{{- if .Values.localpv.enabled }}
+{{- if not .Values.localpv.nodeDeployment.enabled }}
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ template "localpv.fullname" . }}
+  namespace: {{ .Release.Namespace }}
+  {{- with .Values.localpv.annotations }}
+  annotations: {{ toYaml . | nindent 4 }}
+  {{- end }}
+  labels:
+    {{- include "localpv.labels" . | nindent 4 }}
+    {{- if .Values.extraLabels -}}
+      {{- toYaml .Values.extraLabels | nindent 4 }}
+    {{- end }}
+spec:
+  replicas: {{ .Values.localpv.replicas }}
+  strategy:
+    type: "Recreate"
+    rollingUpdate: null
+  selector:
+    matchLabels:
+      {{- include "localpv.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      {{- with .Values.localpv.podAnnotations }}
+      annotations: {{ toYaml . | nindent 8 }}
+      {{- end }}
+      labels:
+        {{- include "localpv.labels" . | nindent 8 }}
+        {{- if .Values.extraLabels -}}
+          {{- toYaml .Values.extraLabels | nindent 8 }}
+        {{- end }}
+        {{- with .Values.localpv.podLabels }}
+          {{- toYaml . | nindent 8 }}
+        {{- end }}
+        {{- with .Values.loggingLabels}}
+          {{ toYaml . | nindent 8 -}}
+        {{- end}}
+    spec:
+    {{- if .Values.localpv.priorityClassName }}
+      priorityClassName: {{ tpl .Values.localpv.priorityClassName . }}
+    {{- end }}
+      {{- if or .Values.global.imagePullSecrets .Values.imagePullSecrets }}
+      imagePullSecrets:
+      {{- include "localpv.common.pullSecrets" . | indent 6 }}
+      {{- end }}
+      serviceAccountName: {{ template "localpv.serviceAccountName" . }}
+      securityContext:
+        {{- toYaml .Values.podSecurityContext | nindent 8 }}
+      containers:
+      - name: {{ template "localpv.fullname" . }}
+        image: "{{ include "localpv.common.image" (dict "imageRoot" .Values.localpv.image "global" .Values.global "override" .Values.globalImageRegistryOverride) }}"
+        imagePullPolicy: {{ default .Values.localpv.image.pullPolicy .Values.global.imagePullPolicy }}
+        resources:
+{{ toYaml .Values.localpv.resources | indent 10 }}
+        env:
+        # OPENEBS_IO_K8S_MASTER enables openebs provisioner to connect to K8s
+        # based on this address. This is ignored if empty.
+        # This is supported for openebs provisioner version 0.5.2 onwards
+        #- name: OPENEBS_IO_K8S_MASTER
+        #  value: "http://10.128.0.12:8080"
+        # OPENEBS_IO_KUBE_CONFIG enables openebs provisioner to connect to K8s
+        # based on this config. This is ignored if empty.
+        # This is supported for openebs provisioner version 0.5.2 onwards
+        #- name: OPENEBS_IO_KUBE_CONFIG
+        #  value: "/home/ubuntu/.kube/config"
+        - name: OPENEBS_NAMESPACE
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.namespace
+        - name: NODE_NAME
+          valueFrom:
+            fieldRef:
+              fieldPath: spec.nodeName
+        # OPENEBS_SERVICE_ACCOUNT provides the service account of this pod as
+        # environment variable
+        - name: OPENEBS_SERVICE_ACCOUNT
+          valueFrom:
+            fieldRef:
+              fieldPath: spec.serviceAccountName
+        # OPENEBS_IO_BASE_PATH is the environment variable that provides the
+        # default base path on the node where host-path PVs will be provisioned.
+        {{-  if kindIs "bool" .Values.global.analytics.enabled }}
+        - name: OPENEBS_IO_ENABLE_ANALYTICS
+          value: "{{ .Values.global.analytics.enabled }}"
+        {{- else }}
+        - name: OPENEBS_IO_ENABLE_ANALYTICS
+          value: "{{ .Values.analytics.enabled }}"
+        {{- end }}
+          # OPENEBS_IO_ANALYTICS_STATE_CM names the ConfigMap consulted to
+          # decide whether to emit the install event for this Helm release
+          # and to persist ping/heartbeat timestamps across pod restarts.
+          # The provisioner creates and updates this ConfigMap itself; it
+          # is not managed by Helm. helm uninstall does not remove it, so
+          # reinstalls into the same namespace will not re-fire the install
+          # event unless the ConfigMap is deleted manually.
+        - name: OPENEBS_IO_ANALYTICS_STATE_CM
+          value: {{ include "localpv.analyticsStateCM.name" . | quote }}
+        {{- if .Values.analytics.gaId }}
+        - name: GA_ID
+          value: {{ .Values.analytics.gaId | quote }}
+        {{- end }}
+        {{- if .Values.analytics.gaKey }}
+        - name: GA_KEY
+          value: {{ .Values.analytics.gaKey | quote }}
+        {{- end }}
+        - name: OPENEBS_IO_BASE_PATH
+          value: "{{ .Values.localpv.basePath }}"
+        - name: OPENEBS_IO_WORKER_THREADS
+          value: {{ .Values.localpv.controller.workers | quote }}
+        - name: OPENEBS_IO_HELPER_IMAGE
+          value: "{{ include "localpv.common.image" (dict "imageRoot" .Values.helperPod.image "global" .Values.global "override" .Values.globalImageRegistryOverride) }}"
+        - name: OPENEBS_IO_HELPER_POD_HOST_NETWORK
+          value: "{{ .Values.helperPod.hostNetwork }}"
+        - name: OPENEBS_IO_INSTALLER_TYPE
+          value: "localpv-charts-helm-helperpod"
+        - name: OPENEBS_IO_HELPER_POD_TIMEOUT_SECS
+          value: {{ .Values.helperPod.timeoutSecs | quote }}
+        # LEADER_ELECTION_ENABLED is used to enable/disable leader election. By default
+        # leader election is enabled.
+        - name: LEADER_ELECTION_ENABLED
+          value: "{{ .Values.localpv.enableLeaderElection }}"
+{{- include "localpv.helper.pullSecrets" . | indent 8 }}
+        # Process name used for matching is limited to the 15 characters
+        # present in the pgrep output.
+        # So fullname can't be used here with pgrep (>15 chars).A regular expression
+        # that matches the entire command name has to specified.
+        # Anchor `^` : matches any string that starts with `provisioner-loc`
+        # `.*`: matches any string that has `provisioner-loc` followed by zero or more char
+        livenessProbe:
+          exec:
+            command:
+            - sh
+            - -c
+            - test `pgrep -c "^provisioner-loc.*"` = 1
+          initialDelaySeconds: {{ .Values.localpv.healthCheck.initialDelaySeconds }}
+          periodSeconds: {{ .Values.localpv.healthCheck.periodSeconds }}
+{{- if .Values.localpv.nodeSelector }}
+      nodeSelector:
+{{ toYaml .Values.localpv.nodeSelector | indent 8 }}
+{{- end }}
+{{- if $tolerations := include "tolerations_with_early_eviction" . }}
+      tolerations: {{ $tolerations }}
+{{- end }}
+{{- if .Values.localpv.affinity }}
+      affinity:
+{{ toYaml .Values.localpv.affinity | indent 8 }}
+{{- end }}
+{{- end }}
+{{- end }}
diff --git a/packages/system/local-storage/charts/localpv-provisioner/templates/hostpath-class.yaml b/packages/system/local-storage/charts/localpv-provisioner/templates/hostpath-class.yaml
new file mode 100644
index 0000000000..7c5be71c1b
--- /dev/null
+++ b/packages/system/local-storage/charts/localpv-provisioner/templates/hostpath-class.yaml
@@ -0,0 +1,43 @@
+{{- if .Values.hostpathClass.enabled }}
+apiVersion: storage.k8s.io/v1
+kind: StorageClass
+metadata:
+  name: {{ tpl (.Values.hostpathClass.name) .}}
+  annotations:
+    openebs.io/cas-type: local
+    cas.openebs.io/config: |
+      - name: StorageType
+        value: "hostpath"
+{{- if or .Values.localpv.basePath .Values.hostpathClass.basePath }}
+      - name: BasePath
+        value: {{ tpl (.Values.hostpathClass.basePath | default .Values.localpv.basePath | quote) . }}
+{{- end }}
+{{- if .Values.hostpathClass.nodeAffinityLabels }}
+      - name: NodeAffinityLabels
+        list:
+{{ toYaml .Values.hostpathClass.nodeAffinityLabels | indent 10 }}
+{{- end }}
+{{- if .Values.hostpathClass.xfsQuota.enabled }}
+      - name: XFSQuota
+        enabled: "{{ .Values.hostpathClass.xfsQuota.enabled }}"
+        data:
+          softLimitGrace: "{{ .Values.hostpathClass.xfsQuota.softLimitGrace }}"
+          hardLimitGrace: "{{ .Values.hostpathClass.xfsQuota.hardLimitGrace }}"
+{{- end }}
+{{- if .Values.hostpathClass.ext4Quota.enabled }}
+      - name: EXT4Quota
+        enabled: "{{ .Values.hostpathClass.ext4Quota.enabled }}"
+        data:
+          softLimitGrace: "{{ .Values.hostpathClass.ext4Quota.softLimitGrace }}"
+          hardLimitGrace: "{{ .Values.hostpathClass.ext4Quota.hardLimitGrace }}"
+{{- end }}
+{{- if .Values.hostpathClass.isDefaultClass }}
+    storageclass.kubernetes.io/is-default-class: "true"
+{{- end }}
+{{- if .Values.extraLabels }}
+  labels: {{- toYaml .Values.extraLabels | nindent 4 -}}
+{{- end }}
+provisioner: openebs.io/local
+volumeBindingMode: WaitForFirstConsumer
+reclaimPolicy: {{ .Values.hostpathClass.reclaimPolicy }}
+{{- end }}
diff --git a/packages/system/local-storage/charts/localpv-provisioner/templates/psp.yaml b/packages/system/local-storage/charts/localpv-provisioner/templates/psp.yaml
new file mode 100644
index 0000000000..ed97e28c41
--- /dev/null
+++ b/packages/system/local-storage/charts/localpv-provisioner/templates/psp.yaml
@@ -0,0 +1,33 @@
+{{- if .Values.rbac.pspEnabled }}
+apiVersion: policy/v1beta1
+kind: PodSecurityPolicy
+metadata:
+  name: {{ template "localpv.fullname" . }}-psp
+  {{- with .Values.localpv.annotations }}
+  annotations: {{ toYaml . | nindent 4 }}
+  {{- end }}
+  labels:
+    {{- include "localpv.labels" . | nindent 4 }}
+    {{- if .Values.extraLabels -}}
+      {{- toYaml .Values.extraLabels | nindent 4 }}
+    {{- end }}
+spec:
+  privileged: {{ .Values.localpv.privileged }}
+  allowPrivilegeEscalation: true
+  allowedCapabilities: ['*']
+  volumes: ['*']
+  hostNetwork: true
+  hostPorts:
+  - min: 0
+    max: 65535
+  hostIPC: true
+  hostPID: true
+  runAsUser:
+    rule: 'RunAsAny'
+  seLinux:
+    rule: 'RunAsAny'
+  supplementalGroups:
+    rule: 'RunAsAny'
+  fsGroup:
+    rule: 'RunAsAny'
+{{- end }}
diff --git a/packages/system/local-storage/charts/localpv-provisioner/templates/rbac.yaml b/packages/system/local-storage/charts/localpv-provisioner/templates/rbac.yaml
new file mode 100644
index 0000000000..0fde9e035c
--- /dev/null
+++ b/packages/system/local-storage/charts/localpv-provisioner/templates/rbac.yaml
@@ -0,0 +1,146 @@
+{{- if .Values.serviceAccount.create -}}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ include "localpv.serviceAccountName" . }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "localpv.labels" . | nindent 4 }}
+    {{- if .Values.extraLabels -}}
+      {{- toYaml .Values.extraLabels | nindent 4 }}
+    {{- end }}
+  {{- with .Values.serviceAccount.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+{{- end }}
+{{- if .Values.rbac.create }}
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: {{ template "localpv.fullname" . }}
+  {{- with .Values.localpv.annotations }}
+  annotations: {{ toYaml . | nindent 4 }}
+  {{- end }}
+  labels:
+    {{- include "localpv.labels" . | nindent 4 }}
+    {{- if .Values.extraLabels -}}
+      {{- toYaml .Values.extraLabels | nindent 4 }}
+    {{- end }}
+rules:
+- apiGroups: [""]
+  resources: ["nodes"]
+  verbs: ["get", "list"]
+- apiGroups: [""]
+  resources: ["persistentvolumeclaims"]
+  verbs: ["get", "list", "watch", "update"]
+- apiGroups: [""]
+  resources: ["persistentvolumes"]
+  verbs: ["get", "list", "watch", "create", "delete", "patch"]
+- apiGroups: ["storage.k8s.io"]
+  resources: ["storageclasses"]
+  verbs: ["get", "list", "watch"]
+- apiGroups: [""]
+  resources: ["events"]
+  verbs: ["create", "update", "patch"]
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: {{ template "localpv.fullname" . }}
+  {{- with .Values.localpv.annotations }}
+  annotations: {{ toYaml . | nindent 4 }}
+  {{- end }}
+  labels:
+    {{- include "localpv.labels" . | nindent 4 }}
+    {{- if .Values.extraLabels -}}
+      {{- toYaml .Values.extraLabels | nindent 4 }}
+    {{- end }}
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: {{ template "localpv.fullname" . }}
+subjects:
+- kind: ServiceAccount
+  name: {{ template "localpv.serviceAccountName" . }}
+  namespace: {{ .Release.Namespace }}
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: {{ template "localpv.fullname" . }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "localpv.labels" . | nindent 4 }}
+# Helpers operate on host paths but their API objects stay in the release namespace.
+rules:
+- apiGroups: [""]
+  resources: ["pods"]
+  verbs: ["get", "create", "delete"]
+- apiGroups: ["coordination.k8s.io"]
+  resources: ["leases"]
+  verbs: ["get", "create", "update"]
+- apiGroups: [""]
+  resources: ["configmaps"]
+  verbs: ["get", "create", "patch"]
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: {{ template "localpv.fullname" . }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "localpv.labels" . | nindent 4 }}
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: {{ template "localpv.fullname" . }}
+subjects:
+- kind: ServiceAccount
+  name: {{ template "localpv.serviceAccountName" . }}
+  namespace: {{ .Release.Namespace }}
+{{- if .Values.rbac.pspEnabled }}
+---
+kind: ClusterRole
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: {{ template "localpv.fullname" . }}-psp
+  {{- with .Values.localpv.annotations }}
+  annotations: {{ toYaml . | nindent 4 }}
+  {{- end }}
+  labels:
+    {{- include "localpv.labels" . | nindent 4 }}
+    {{- if .Values.extraLabels -}}
+      {{- toYaml .Values.extraLabels | nindent 4 }}
+    {{- end }}
+rules:
+- apiGroups: ['policy']
+  resources: ['podsecuritypolicies']
+  verbs:     ['use']
+  resourceNames:
+  - {{ template "localpv.fullname" . }}-psp
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: {{ template "localpv.fullname" . }}-psp
+  {{- with .Values.localpv.annotations }}
+  annotations: {{ toYaml . | nindent 4 }}
+  {{- end }}
+  labels:
+    {{- include "localpv.labels" . | nindent 4 }}
+    {{- if .Values.extraLabels -}}
+      {{- toYaml .Values.extraLabels | nindent 4 }}
+    {{- end }}
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: {{ template "localpv.fullname" . }}-psp
+subjects:
+  - kind: ServiceAccount
+    name: {{ template "localpv.serviceAccountName" . }}
+    namespace: {{ $.Release.Namespace }}
+{{- end }}
+{{- end }}
+
diff --git a/packages/system/local-storage/charts/localpv-provisioner/values.yaml b/packages/system/local-storage/charts/localpv-provisioner/values.yaml
new file mode 100644
index 0000000000..667962113a
--- /dev/null
+++ b/packages/system/local-storage/charts/localpv-provisioner/values.yaml
@@ -0,0 +1,174 @@
+# Default values for localpv.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+global:
+  # Global override for container image registry (when `globalImageRegistryOverride` is set to true)
+  imageRegistry: "docker.io"
+  # Global image pull secrets (merged with local imagePullSecrets and not overridden)
+  # - secret
+  imagePullSecrets: []
+  # Global override for image pull policy
+  imagePullPolicy: ""
+  analytics:
+    # Global override for analytics
+    enabled:
+
+# When set to true, the value of `global.imageRegistry` will override all image registry settings defined at local level
+globalImageRegistryOverride: false
+
+rbac:
+  # rbac.create: `true` if rbac resources should be created
+  create: true
+  # rbac.pspEnabled: `true` if PodSecurityPolicy resources should be created
+  pspEnabled: false
+
+earlyEvictionTolerations:
+  - effect: NoExecute
+    key: node.kubernetes.io/unreachable
+    operator: Exists
+    tolerationSeconds: 5
+  - effect: NoExecute
+    key: node.kubernetes.io/not-ready
+    operator: Exists
+    tolerationSeconds: 5
+
+localpv:
+  name: localpv-provisioner
+  enabled: true
+  controller:
+    # The number of concurrent worker goroutines for processing PVC create and delete events.
+    # Higher values increase provisioning throughput when many PVC events are received simultaneously.
+    workers: 4
+  image:
+    registry: "docker.io/"
+    repository: openebs/provisioner-localpv
+    tag: 4.5.1
+    pullPolicy: IfNotPresent
+  updateStrategy:
+    type: RollingUpdate
+  # If set to false, containers created by the localpv provisioner will run without extra privileges.
+  privileged: true
+  annotations: {}
+  podAnnotations: {}
+  ## Labels to be added to localpv provisioner deployment pods
+  podLabels:
+    name: openebs-localpv-provisioner
+  healthCheck:
+    initialDelaySeconds: 30
+    periodSeconds: 60
+  replicas: 1
+  enableLeaderElection: true
+  basePath: "/var/openebs/local"
+  # Node deployment configuration for distributed provisioning mode
+  nodeDeployment:
+    # Enable the NodeDeployment mode. This deploys the provisioner as a DaemonSet on
+    # cluster nodes. NodeDeployment avoids the need to spin up a HelperPod at volume
+    # creation/deletion time, and instead performs volume operations via the DaemonSet
+    # container.
+    # NOTE: This mode mounts the host '/' path on to container, as it does not use a
+    # HelperPod and must be able to cater to different BasePath paths.
+    enabled: false
+    # Additional volume mounts for the provisioner container
+    additionalVolumeMounts: []
+    # Additional volumes for the provisioner pod
+    additionalVolumes: []
+  resources:
+  # We usually recommend not to specify default resources and to leave this as a conscious
+  # choice for the user. This also increases chances charts run on environments with little
+  # resources, such as Minikube. If you do want to specify resources, uncomment the following
+  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
+  #  limits:
+  #    cpu: 100m
+  #    memory: 128Mi
+  #  requests:
+  #    cpu: 100m
+  #    memory: 128Mi
+  nodeSelector: {}
+  tolerations: []
+  affinity: {}
+  securityContext: {}
+  ## Sets priorityClassName in pod
+  priorityClassName: ""
+
+imagePullSecrets:
+# - name: img-pull-secret
+podSecurityContext: {}
+# fsGroup: 2000
+
+nameOverride: ""
+fullnameOverride: ""
+
+serviceAccount:
+  # Specifies whether a service account should be created
+  create: true
+  # Annotations to add to the service account
+  annotations: {}
+  # The name of the service account to use.
+  # If not set and create is true, a name is generated using the fullname template
+  name:
+
+hostpathClass:
+  # Name of the default hostpath StorageClass
+  name: openebs-hostpath
+  # If true, enables creation of the openebs-hostpath StorageClass
+  enabled: true
+  # Available reclaim policies: Delete/Retain, defaults: Delete.
+  reclaimPolicy: Delete
+  # If true, sets the openebs-hostpath StorageClass as the default StorageClass
+  isDefaultClass: false
+  # Path on the host where local volumes of this storage class are mounted under.
+  # NOTE: If not specified, this defaults to the value of localpv.basePath.
+  basePath: ""
+  # Custom node affinity label(s) for example "openebs.io/node-affinity-value"
+  # that will be used instead of hostnames
+  # This helps in cases where the hostname changes when the node is removed and
+  # added back with the disks still intact.
+  # Example:
+  #          nodeAffinityLabels:
+  #            - "openebs.io/node-affinity-key-1"
+  #            - "openebs.io/node-affinity-key-2"
+  nodeAffinityLabels: []
+  # Prerequisite: XFS Quota requires an XFS filesystem mounted with
+  # the 'pquota' or 'prjquota' mount option.
+  xfsQuota:
+    # If true, enables XFS project quota
+    enabled: false
+    # Detailed configuration options for XFS project quota.
+    # If XFS Quota is enabled with the default values, the usage limit
+    # is set at the storage capacity specified in the PVC.
+    softLimitGrace: "0%"
+    hardLimitGrace: "0%"
+  # Prerequisite: EXT4 Quota requires an EXT4 filesystem mounted with
+  # the 'prjquota' mount option.
+  ext4Quota:
+    # If true, enables XFS project quota
+    enabled: false
+    # Detailed configuration options for EXT4 project quota.
+    # If EXT4 Quota is enabled with the default values, the usage limit
+    # is set at the storage capacity specified in the PVC.
+    softLimitGrace: "0%"
+    hardLimitGrace: "0%"
+
+helperPod:
+  image:
+    registry: ""
+    repository: openebs/linux-utils
+    pullPolicy: IfNotPresent
+    # Overrides the image tag whose default is the chart appVersion.
+    tag: 4.5.0
+  hostNetwork: false
+  # The maximum number of seconds to wait for a helperPod (init, cleanup, quota) to complete before timing out.
+  timeoutSecs: 120
+
+# Additional labels to add to all chart resources
+extraLabels: {}
+
+loggingLabels:
+  openebs.io/logging: "true"
+
+analytics:
+  # Enable sending stats to Google Analytics
+  enabled: true
+  # Specify in hours the duration after which a ping event needs to be sent.
+  pingInterval: "24h"
diff --git a/packages/system/local-storage/patches/rbac.diff b/packages/system/local-storage/patches/rbac.diff
new file mode 100644
index 0000000000..b656f10c40
--- /dev/null
+++ b/packages/system/local-storage/patches/rbac.diff
@@ -0,0 +1,91 @@
+--- a/charts/localpv-provisioner/templates/rbac.yaml
++++ b/charts/localpv-provisioner/templates/rbac.yaml
+@@ -29,34 +29,21 @@
+       {{- toYaml .Values.extraLabels | nindent 4 }}
+     {{- end }}
+ rules:
+-- apiGroups: ["*"]
++- apiGroups: [""]
+   resources: ["nodes"]
++  verbs: ["get", "list"]
++- apiGroups: [""]
++  resources: ["persistentvolumeclaims"]
++  verbs: ["get", "list", "watch", "update"]
++- apiGroups: [""]
++  resources: ["persistentvolumes"]
++  verbs: ["get", "list", "watch", "create", "delete", "patch"]
++- apiGroups: ["storage.k8s.io"]
++  resources: ["storageclasses"]
+   verbs: ["get", "list", "watch"]
+-- apiGroups: ["*"]
+-  resources: ["namespaces", "pods", "events", "endpoints"]
+-  verbs: ["*"]
+-- apiGroups: ["*"]
+-  resources: ["resourcequotas", "limitranges"]
+-  verbs: ["list", "watch"]
+-- apiGroups: ["*"]
+-  resources: ["storageclasses", "persistentvolumeclaims", "persistentvolumes"]
+-  verbs: ["*"]
+-- apiGroups: ["apiextensions.k8s.io"]
+-  resources: ["customresourcedefinitions"]
+-  verbs: [ "get", "list", "create", "update", "delete", "patch"]
+-- apiGroups: ["openebs.io"]
+-  resources: [ "*"]
+-  verbs: ["*" ]
+-- apiGroups: ["coordination.k8s.io"]
+-  resources: ["leases"]
+-  verbs: ["get", "create", "update"]
+-  # Analytics state ConfigMap: the provisioner creates and updates this
+-  # ConfigMap itself to persist install/ping/heartbeat timestamps.
+ - apiGroups: [""]
+-  resources: ["configmaps"]
+-  verbs: ["get", "create", "update", "patch"]
+-- nonResourceURLs: ["/metrics"]
+-  verbs: ["get"]
++  resources: ["events"]
++  verbs: ["create", "update", "patch"]
+ ---
+ apiVersion: rbac.authorization.k8s.io/v1
+ kind: ClusterRoleBinding
+@@ -73,6 +60,41 @@
+ roleRef:
+   apiGroup: rbac.authorization.k8s.io
+   kind: ClusterRole
++  name: {{ template "localpv.fullname" . }}
++subjects:
++- kind: ServiceAccount
++  name: {{ template "localpv.serviceAccountName" . }}
++  namespace: {{ .Release.Namespace }}
++---
++apiVersion: rbac.authorization.k8s.io/v1
++kind: Role
++metadata:
++  name: {{ template "localpv.fullname" . }}
++  namespace: {{ .Release.Namespace }}
++  labels:
++    {{- include "localpv.labels" . | nindent 4 }}
++# Helpers operate on host paths but their API objects stay in the release namespace.
++rules:
++- apiGroups: [""]
++  resources: ["pods"]
++  verbs: ["get", "create", "delete"]
++- apiGroups: ["coordination.k8s.io"]
++  resources: ["leases"]
++  verbs: ["get", "create", "update"]
++- apiGroups: [""]
++  resources: ["configmaps"]
++  verbs: ["get", "create", "patch"]
++---
++apiVersion: rbac.authorization.k8s.io/v1
++kind: RoleBinding
++metadata:
++  name: {{ template "localpv.fullname" . }}
++  namespace: {{ .Release.Namespace }}
++  labels:
++    {{- include "localpv.labels" . | nindent 4 }}
++roleRef:
++  apiGroup: rbac.authorization.k8s.io
++  kind: Role
+   name: {{ template "localpv.fullname" . }}
+ subjects:
+ - kind: ServiceAccount
diff --git a/packages/system/local-storage/tests/rbac_test.py b/packages/system/local-storage/tests/rbac_test.py
new file mode 100644
index 0000000000..dfaba7a917
--- /dev/null
+++ b/packages/system/local-storage/tests/rbac_test.py
@@ -0,0 +1,95 @@
+"""Check effective permissions of the rendered provisioner service account."""
+import json
+import subprocess
+import unittest
+from pathlib import Path
+
+CHART = Path(__file__).resolve().parents[1]
+
+
+def render(namespace, settings):
+    command = ["helm", "template", "test", str(CHART), "--namespace", namespace]
+    for value in settings:
+        command.extend(["--set", value])
+    output = subprocess.run(command, check=True, capture_output=True, text=True).stdout
+    parsed = subprocess.run(["yq", "-o=json", "-I=0", ".", "-"], input=output,
+                            check=True, capture_output=True, text=True).stdout
+    return [obj for line in parsed.splitlines() if (obj := json.loads(line))]
+
+
+def permits(objects, namespace, service_account, verb, resource, target_namespace="", group=""):
+    for binding in objects:
+        kind = binding["kind"]
+        if kind not in ("RoleBinding", "ClusterRoleBinding"):
+            continue
+        if kind == "RoleBinding" and binding["metadata"]["namespace"] != target_namespace:
+            continue
+        subject = {"kind": "ServiceAccount", "name": service_account, "namespace": namespace}
+        if subject not in binding["subjects"]:
+            continue
+        ref = binding["roleRef"]
+        for role in objects:
+            if role["kind"] != ref["kind"] or role["metadata"]["name"] != ref["name"]:
+                continue
+            if ref["kind"] == "Role" and role["metadata"]["namespace"] != binding["metadata"]["namespace"]:
+                continue
+            for rule in role["rules"]:
+                if all(value in rule.get(key, []) or "*" in rule.get(key, [])
+                       for key, value in (("verbs", verb), ("resources", resource), ("apiGroups", group))):
+                    return True
+    return False
+
+
+class LocalPVPermissions(unittest.TestCase):
+    def test_lifecycle_and_namespace_boundary(self):
+        for namespace, settings in (("cozy-local-storage", []), ("custom-storage", [
+                "localpv-provisioner.fullnameOverride=custom-provisioner",
+                "localpv-provisioner.serviceAccount.name=custom-account"])):
+            with self.subTest(namespace=namespace):
+                objects = render(namespace, settings)
+                deployment = next(o for o in objects if o["kind"] == "Deployment")
+                account = deployment["spec"]["template"]["spec"]["serviceAccountName"]
+                allow = lambda *args: permits(objects, namespace, account, *args)
+                for verb, resource, target, group in [
+                    ("get", "nodes", "", ""), ("list", "nodes", "", ""),
+                    ("list", "persistentvolumes", "", ""), ("watch", "persistentvolumes", "", ""),
+                    ("create", "persistentvolumes", "", ""), ("delete", "persistentvolumes", "", ""),
+                    ("patch", "persistentvolumes", "", ""),
+                    ("list", "persistentvolumeclaims", "tenant-a", ""),
+                    ("watch", "persistentvolumeclaims", "tenant-a", ""),
+                    ("update", "persistentvolumeclaims", "tenant-a", ""),
+                    ("get", "storageclasses", "", "storage.k8s.io"),
+                    ("list", "storageclasses", "", "storage.k8s.io"),
+                    ("watch", "storageclasses", "", "storage.k8s.io"),
+                    ("create", "events", "tenant-a", ""), ("patch", "events", "tenant-a", ""),
+                    ("get", "pods", namespace, ""), ("create", "pods", namespace, ""),
+                    ("delete", "pods", namespace, ""),
+                    ("get", "leases", namespace, "coordination.k8s.io"),
+                    ("create", "leases", namespace, "coordination.k8s.io"),
+                    ("update", "leases", namespace, "coordination.k8s.io"),
+                    ("get", "configmaps", namespace, ""), ("create", "configmaps", namespace, ""),
+                    ("patch", "configmaps", namespace, ""),
+                ]:
+                    self.assertTrue(allow(verb, resource, target, group), (verb, resource, target))
+                for verb, resource, target, group in [
+                    ("delete", "namespaces", "", ""), ("create", "namespaces", "", ""),
+                    ("get", "secrets", namespace, ""), ("list", "secrets", "tenant-a", ""),
+                    ("create", "pods", "tenant-a", ""), ("delete", "pods", "tenant-a", ""),
+                    ("create", "pods", "kube-system", ""),
+                    ("patch", "configmaps", "tenant-a", ""),
+                    ("update", "leases", "tenant-a", "coordination.k8s.io"),
+                    ("delete", "storageclasses", "", "storage.k8s.io"),
+                    ("delete", "persistentvolumeclaims", "tenant-a", ""),
+                    ("create", "customresourcedefinitions", "", "apiextensions.k8s.io"),
+                    ("delete", "blockdevices", "", "openebs.io"),
+                ]:
+                    self.assertFalse(allow(verb, resource, target, group), (verb, resource, target))
+
+    def test_external_rbac_is_not_granted(self):
+        objects = render("custom-storage", ["localpv-provisioner.rbac.create=false"])
+        self.assertFalse(any(o["kind"] in ("Role", "RoleBinding", "ClusterRole", "ClusterRoleBinding")
+                             for o in objects))
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/packages/system/local-storage/tests/storage_test.yaml b/packages/system/local-storage/tests/storage_test.yaml
new file mode 100644
index 0000000000..4cc5528bab
--- /dev/null
+++ b/packages/system/local-storage/tests/storage_test.yaml
@@ -0,0 +1,82 @@
+suite: local hostpath storage contract
+release:
+  name: local-storage
+  namespace: storage-install
+tests:
+  - it: uses a distinct class with delayed binding and no automatic default
+    templates:
+      - charts/localpv-provisioner/templates/hostpath-class.yaml
+    asserts:
+      - equal:
+          path: metadata.name
+          value: cozystack-local-hostpath
+      - equal:
+          path: provisioner
+          value: openebs.io/local
+      - equal:
+          path: volumeBindingMode
+          value: WaitForFirstConsumer
+      - equal:
+          path: reclaimPolicy
+          value: Delete
+      - notExists:
+          path: metadata.annotations["storageclass.kubernetes.io/is-default-class"]
+  - it: makes default selection an explicit opt in
+    templates:
+      - charts/localpv-provisioner/templates/hostpath-class.yaml
+    set:
+      localpv-provisioner.hostpathClass.isDefaultClass: true
+    asserts:
+      - equal:
+          path: metadata.annotations["storageclass.kubernetes.io/is-default-class"]
+          value: "true"
+  - it: accepts administrator class and backing-directory configuration
+    templates:
+      - charts/localpv-provisioner/templates/hostpath-class.yaml
+    set:
+      localpv-provisioner.hostpathClass.name: selected-hostpath
+      localpv-provisioner.hostpathClass.reclaimPolicy: Retain
+      localpv-provisioner.hostpathClass.basePath: /mnt/local-data
+    asserts:
+      - equal:
+          path: metadata.name
+          value: selected-hostpath
+      - equal:
+          path: reclaimPolicy
+          value: Retain
+      - matchRegex:
+          path: metadata.annotations["cas.openebs.io/config"]
+          pattern: /mnt/local-data
+  - it: can leave StorageClass creation to an administrator
+    templates:
+      - charts/localpv-provisioner/templates/hostpath-class.yaml
+    set:
+      localpv-provisioner.hostpathClass.enabled: false
+    asserts:
+      - hasDocuments:
+          count: 0
+  - it: sends the release namespace and disabled telemetry to the provisioner
+    templates:
+      - charts/localpv-provisioner/templates/deployment.yaml
+    asserts:
+      - equal:
+          path: metadata.namespace
+          value: storage-install
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: OPENEBS_NAMESPACE
+            valueFrom:
+              fieldRef:
+                fieldPath: metadata.namespace
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: OPENEBS_IO_ENABLE_ANALYTICS
+            value: "false"
+      - matchRegex:
+          path: spec.template.spec.containers[0].image
+          pattern: '^docker.io/openebs/provisioner-localpv:4\.5\.1@sha256:[a-f0-9]{64}$'
+      - matchRegex:
+          path: spec.template.spec.containers[0].env[?(@.name == "OPENEBS_IO_HELPER_IMAGE")].value
+          pattern: '^docker.io/openebs/linux-utils:4\.5\.0@sha256:[a-f0-9]{64}$'
diff --git a/packages/system/local-storage/values.yaml b/packages/system/local-storage/values.yaml
new file mode 100644
index 0000000000..60d1a22160
--- /dev/null
+++ b/packages/system/local-storage/values.yaml
@@ -0,0 +1,24 @@
+# OpenEBS LocalPV Hostpath defaults.
+
+localpv-provisioner:
+  analytics:
+    enabled: false
+  hostpathClass:
+    # StorageClass name; must not name an existing class owned by another provisioner.
+    name: cozystack-local-hostpath
+    # Explicitly make this the cluster default; the administrator must first handle any other default class.
+    isDefaultClass: false
+    # Delete removes the directory after PVC deletion; Retain requires manual reclamation.
+    reclaimPolicy: Delete
+  localpv:
+    image:
+      registry: docker.io
+      repository: openebs/provisioner-localpv
+      # Provisioner version and immutable image index; refreshed by make update-image-pins.
+      tag: "4.5.1@sha256:a1b4659ea4bba01235593ab796424d1503cf25e1b31fe278fef2a4829385fc61"
+  helperPod:
+    image:
+      registry: docker.io
+      repository: openebs/linux-utils
+      # Helper version and immutable image index; refreshed by make update-image-pins.
+      tag: "4.5.0@sha256:e90916c22a077e5f983afaa67f3f085e08575efb7f9828db3bb9dd53671c947f"
diff --git a/packages/system/mariadb-operator/values.yaml b/packages/system/mariadb-operator/values.yaml
index 11aadd80de..2728c084ef 100644
--- a/packages/system/mariadb-operator/values.yaml
+++ b/packages/system/mariadb-operator/values.yaml
@@ -3,5 +3,6 @@ mariadb-operator:
   metrics:
     enabled: true
   webhook:
-    certificate:
-      certManager: true
+    cert:
+      certManager:
+        enabled: true
diff --git a/packages/system/mariadb-rd/cozyrds/mariadb.yaml b/packages/system/mariadb-rd/cozyrds/mariadb.yaml
index 912a624355..66b852518d 100644
--- a/packages/system/mariadb-rd/cozyrds/mariadb.yaml
+++ b/packages/system/mariadb-rd/cozyrds/mariadb.yaml
@@ -8,7 +8,7 @@ spec:
     plural: mariadbs
     singular: mariadb
     openAPISchema: |-
-      {"title":"Chart Values","type":"object","properties":{"replicas":{"description":"Number of MariaDB replicas.","type":"integer","default":2},"resources":{"description":"Explicit CPU and memory configuration for each MariaDB replica. When omitted, the preset defined in `resourcesPreset` is applied.","type":"object","default":{},"properties":{"cpu":{"description":"CPU available to each replica.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Memory (RAM) available to each replica.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}},"resourcesPreset":{"description":"Default sizing preset used when `resources` is omitted.","type":"string","default":"t1.nano","enum":["t1.nano","t1.micro","t1.small","t1.medium","t1.large","t1.xlarge","t1.2xlarge","t1.4xlarge","c1.nano","c1.micro","c1.small","c1.medium","c1.large","c1.xlarge","c1.2xlarge","c1.4xlarge","s1.nano","s1.micro","s1.small","s1.medium","s1.large","s1.xlarge","s1.2xlarge","s1.4xlarge","u1.nano","u1.micro","u1.small","u1.medium","u1.large","u1.xlarge","u1.2xlarge","u1.4xlarge","m1.nano","m1.micro","m1.small","m1.medium","m1.large","m1.xlarge","m1.2xlarge","m1.4xlarge","nano","micro","small","medium","large","xlarge","2xlarge"]},"size":{"description":"Persistent Volume Claim size available for application data.","default":"10Gi","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"storageClass":{"description":"StorageClass used to store the data.","type":"string","default":"","x-kubernetes-validations":[{"rule":"self == oldSelf","message":"storageClass is immutable"}]},"external":{"description":"Enable external access from outside the cluster.","type":"boolean","default":false},"version":{"description":"MariaDB major.minor version to deploy","type":"string","default":"v11.8","enum":["v11.8","v11.4","v10.11","v10.6"]},"users":{"description":"Users configuration map.","type":"object","default":{},"additionalProperties":{"type":"object","required":["maxUserConnections","password"],"properties":{"maxUserConnections":{"description":"Maximum number of connections.","type":"integer"},"password":{"description":"Password for the user.","type":"string"}}}},"databases":{"description":"Databases configuration map.","type":"object","default":{},"additionalProperties":{"type":"object","properties":{"roles":{"description":"Roles assigned to users.","type":"object","properties":{"admin":{"description":"List of users with admin privileges.","type":"array","items":{"type":"string"}},"readonly":{"description":"List of users with read-only privileges.","type":"array","items":{"type":"string"}}}}}}},"backup":{"description":"DEPRECATED: Backup configuration. Prefer the BackupClass / Plan flow under examples/backups/mariadb/.","type":"object","default":{},"required":["cleanupStrategy","enabled","resticPassword","s3AccessKey","s3Bucket","s3Region","s3SecretKey","schedule"],"properties":{"cleanupStrategy":{"description":"DEPRECATED: Retention strategy for cleaning up old backups.","type":"string","default":"--keep-last=3 --keep-daily=3 --keep-within-weekly=1m"},"enabled":{"description":"DEPRECATED: Enable regular backups (default: false).","type":"boolean","default":false},"resticPassword":{"description":"DEPRECATED: Password for Restic backup encryption.","type":"string","default":"<password>"},"s3AccessKey":{"description":"DEPRECATED: Access key for S3 authentication.","type":"string","default":"<your-access-key>"},"s3Bucket":{"description":"DEPRECATED: S3 bucket used for storing backups.","type":"string","default":"s3.example.org/mariadb-backups"},"s3Region":{"description":"DEPRECATED: AWS S3 region where backups are stored.","type":"string","default":"us-east-1"},"s3SecretKey":{"description":"DEPRECATED: Secret key for S3 authentication.","type":"string","default":"<your-secret-key>"},"schedule":{"description":"DEPRECATED: Cron schedule for automated backups.","type":"string","default":"0 2 * * *"}}}}}
+      {"title":"Chart Values","type":"object","properties":{"replicas":{"description":"Number of MariaDB replicas.","type":"integer","default":2},"resources":{"description":"Explicit CPU and memory configuration for each MariaDB replica. When omitted, the preset defined in `resourcesPreset` is applied.","type":"object","default":{},"properties":{"cpu":{"description":"CPU available to each replica.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Memory (RAM) available to each replica.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}},"resourcesPreset":{"description":"Default sizing preset used when `resources` is omitted.","type":"string","default":"t1.nano","enum":["t1.nano","t1.micro","t1.small","t1.medium","t1.large","t1.xlarge","t1.2xlarge","t1.4xlarge","c1.nano","c1.micro","c1.small","c1.medium","c1.large","c1.xlarge","c1.2xlarge","c1.4xlarge","s1.nano","s1.micro","s1.small","s1.medium","s1.large","s1.xlarge","s1.2xlarge","s1.4xlarge","u1.nano","u1.micro","u1.small","u1.medium","u1.large","u1.xlarge","u1.2xlarge","u1.4xlarge","m1.nano","m1.micro","m1.small","m1.medium","m1.large","m1.xlarge","m1.2xlarge","m1.4xlarge","nano","micro","small","medium","large","xlarge","2xlarge"]},"size":{"description":"Persistent Volume Claim size available for application data.","default":"10Gi","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"storageClass":{"description":"StorageClass used to store the data.","type":"string","default":"","x-kubernetes-validations":[{"rule":"self == oldSelf","message":"storageClass is immutable"}],"x-cozystack-options":{"source":"storageclass"}},"external":{"description":"Enable external access from outside the cluster.","type":"boolean","default":false},"tls":{"description":"TLS configuration. Selects who issues the certificates and whether plaintext is refused; TLS itself is always served.","type":"object","default":{},"properties":{"issuer":{"description":"Who issues the server certificate: `operator` uses the CA mariadb-operator manages itself, `cert-manager` gives the instance its own CA and is what covers the external hostname. Named for the issuer because TLS is served under both, unlike the similarly-spelled `tls.enabled` in some other charts, which does switch TLS on and off.","type":"string","default":"operator","enum":["operator","cert-manager"]},"required":{"description":"Refuse plaintext connections (sets MariaDB require_secure_transport=ON). Applies under either issuer. Opt-in: turn it on once every client connects over TLS, since it disconnects those that do not.","type":"boolean"}}},"version":{"description":"MariaDB major.minor version to deploy","type":"string","default":"v11.8","enum":["v11.8","v11.4","v10.11","v10.6"]},"users":{"description":"Users configuration map. Passwords (including the `root` account) are always auto-generated and stored in the `<release>-credentials` Secret; they cannot be set from values — read a user's password from that Secret. A `password` left over in values from before the field was removed is ignored by the render and draws an admission warning, but it is not inert on an upgraded release: the chart preserves whatever password is already in the Secret, which on the first upgrade is the value that was set before removal, so that value stays the live credential until it is rotated (dedicated rotation is tracked in cozystack/community#72). The live password lives only in the Secret.","type":"object","default":{},"additionalProperties":{"type":"object","required":["maxUserConnections"],"properties":{"maxUserConnections":{"description":"Maximum number of connections.","type":"integer"}}}},"databases":{"description":"Databases configuration map.","type":"object","default":{},"additionalProperties":{"type":"object","properties":{"roles":{"description":"Roles assigned to users.","type":"object","properties":{"admin":{"description":"List of users with admin privileges.","type":"array","items":{"type":"string"}},"readonly":{"description":"List of users with read-only privileges.","type":"array","items":{"type":"string"}}}}}}},"backup":{"description":"DEPRECATED: Backup configuration. Prefer the BackupClass / Plan flow under examples/backups/mariadb/.","type":"object","default":{},"required":["cleanupStrategy","enabled","resticPassword","s3AccessKey","s3Bucket","s3Region","s3SecretKey","schedule"],"properties":{"cleanupStrategy":{"description":"DEPRECATED: Retention strategy for cleaning up old backups.","type":"string","default":"--keep-last=3 --keep-daily=3 --keep-within-weekly=1m"},"enabled":{"description":"DEPRECATED: Enable regular backups (default: false).","type":"boolean","default":false},"resticPassword":{"description":"DEPRECATED: Password for Restic backup encryption.","type":"string","default":"<password>"},"s3AccessKey":{"description":"DEPRECATED: Access key for S3 authentication.","type":"string","default":"<your-access-key>"},"s3Bucket":{"description":"DEPRECATED: S3 bucket used for storing backups.","type":"string","default":"s3.example.org/mariadb-backups"},"s3Region":{"description":"DEPRECATED: AWS S3 region where backups are stored.","type":"string","default":"us-east-1"},"s3SecretKey":{"description":"DEPRECATED: Secret key for S3 authentication.","type":"string","default":"<your-secret-key>"},"schedule":{"description":"DEPRECATED: Cron schedule for automated backups.","type":"string","default":"0 2 * * *"}}}}}
   release:
     prefix: mariadb-
     labels:
@@ -25,15 +25,75 @@ spec:
     tags:
       - database
     icon: PHN2ZyB3aWR0aD0iMTQ0IiBoZWlnaHQ9IjE0NCIgdmlld0JveD0iMCAwIDE0NCAxNDQiIGZpbGw9Im5vbmUiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+CjxyZWN0IHg9Ii0wLjAwMTk1MzEyIiB3aWR0aD0iMTQ0IiBoZWlnaHQ9IjE0NCIgcng9IjI0IiBmaWxsPSJ1cmwoI3BhaW50MF9saW5lYXJfNjgzXzI5MzApIi8+CjxwYXRoIGQ9Ik0xMzMuMTkxIDI5LjAwMjJDMTMxLjIxMyAyOS4wNjU0IDEzMS44MzkgMjkuNjM1NCAxMjcuNTY0IDMwLjY4NzNDMTIzLjI0OCAzMS43NDk2IDExNy45NzUgMzEuNDIzOSAxMTMuMzI3IDMzLjM3MzNDOTkuNDUxNiAzOS4xOTI0IDk2LjY2NzYgNTkuMDgxMyA4NC4wNTM1IDY2LjIwNTlDNzQuNjI0NyA3MS41MzE4IDY1LjExMiA3MS45NTY1IDU2LjU1OTQgNzQuNjM2NUM1MC45Mzg5IDc2LjM5OSA0NC43OTA2IDgwLjAxMzUgMzkuNjk4MiA4NC40MDE4QzM1Ljc0NTUgODcuODA5MyAzNS42NDIzIDkwLjgwNTQgMzEuNTEyMyA5NS4wNzkxQzI3LjA5NDcgOTkuNjUwNCAxMy45NTUxIDk1LjE1NjQgOCAxMDIuMTUzQzkuOTE4MzUgMTA0LjA5MyAxMC43NTk0IDEwNC42MzYgMTQuNTM5OCAxMDQuMTMzQzEzLjc1NzEgMTA1LjYxNiA5LjE0MzMyIDEwNi44NjYgMTAuMDQ2NSAxMDkuMDQ5QzEwLjk5NjggMTExLjM0NSAyMi4xNTExIDExMi45MDEgMzIuMjkwOCAxMDYuNzhDMzcuMDEzMSAxMDMuOTI5IDQwLjc3NDMgOTkuODE5MyA0OC4xMjg4IDk4LjgzODRDNTcuNjQ1OSA5Ny41Njk5IDY4LjYwOTMgOTkuNjUyIDc5LjYyNjggMTAxLjI0MUM3Ny45OTMyIDEwNi4xMTIgNzQuNzEzMyAxMDkuMzUxIDcyLjA4NiAxMTMuMjMxQzcxLjI3MjQgMTE0LjEwNyA3My43MjAyIDExNC4yMDUgNzYuNTEyNiAxMTMuNjc1QzgxLjUzNTkgMTEyLjQzMyA4NS4xNTYxIDExMS40MzMgODguOTQ3MiAxMDkuMjI3QzkzLjYwNDcgMTA2LjUxNSA5NC4zMTA0IDk5LjU2MzkgMTAwLjAyNSA5OC4wNTk5QzEwMy4yMDkgMTAyLjk1NCAxMTEuODY5IDEwNC4xMSAxMTcuMjQyIDEwMC4xOTVDMTEyLjUyNyA5OC44NjA3IDExMS4yMjQgODguODI0NCAxMTIuODE1IDg0LjQwMThDMTE0LjMyMyA4MC4yMTU2IDExNS44MTMgNzMuNTE5MiAxMTcuMzMxIDY3Ljk4NTVDMTE4Ljk2MSA2Mi4wNDI1IDExOS41NjIgNTQuNTUxOSAxMjEuNTM1IDUxLjUyNDdDMTI0LjUwMyA0Ni45NzAxIDEyNy43ODMgNDUuNDA2IDEzMC42MyA0Mi44Mzc3QzEzMy40NzcgNDAuMjY5NSAxMzYuMDgzIDM3Ljc2OTQgMTM1Ljk5OCAzMS44OTI3QzEzNS45NyAyOS45OTk4IDEzNC45OTIgMjguOTQ0NyAxMzMuMTkxIDI5LjAwMjJaIiBmaWxsPSIjMDQyNDRFIi8+CjxwYXRoIGQ9Ik0xMjguOTUzIDMyLjQ4NDRDMTI5LjQyNyAzNC4xMDA0IDEzMC4xNjggMzQuODQyMSAxMzMuMzc1IDM1LjEzODdDMTMyLjkwNiAzOS4yMDQxIDEzMC4xOTUgNDEuNDI3NiAxMjcuMTU0IDQzLjU2MTFDMTI0LjQ3OSA0NS40Mzc2IDEyMS41NDcgNDcuMjQ0NSAxMTkuNjY0IDUwLjE3NTdDMTE3LjczNCA1My4xNzg1IDExNi41MDkgNjMuNDU1NCAxMTMuNTE3IDczLjYwNDRDMTEwLjkzMSA4Mi4zNzM4IDEwNy4wMjUgOTEuMDQ0NSAxMDAuMjA0IDk0Ljg0MzdDOTkuNDkxOSA5My4wNTAyIDEwMC4yOTUgODkuNzQgOTguODc4IDg4LjY1MkM5Ny45NjExIDkxLjI2NzQgOTYuOTI0MiA5My43NjI3IDk1LjcwOTggOTYuMDgyMUM5MS43MDc3IDEwMy43MzIgODUuNzgyMiAxMDkuNDU5IDc1Ljg4MDEgMTExLjIwOEM4MC41Nzg1IDEwNC44NSA4NS4wNzEgOTguMjg0NCA4NS4xNjgzIDg3LjMyNjJDODEuODYxNyA4OC4wNDE3IDgxLjkzMTkgOTUuODUyMiA3OC41MzQ1IDk3Ljk0MDJDNzYuMzU2MyA5OC4xNzcyIDc0LjE0OTggOTguMTc1OCA3MS45MjkxIDk4LjA0MjRDNjIuODA5MSA5Ny40OTU5IDUzLjQ1MzUgOTQuNzU0OSA0NC45MjE5IDk3LjQ5MjNDMzkuMTEyOCA5OS4zNTY4IDM0LjM2MTkgMTAzLjc1NSAyOS40NDI4IDEwNS44ODhDMjMuNjYxNCAxMDguMzk2IDE5LjI4MzEgMTA5LjQyNyAxMi4wODM2IDEwOC4zOTZDMTEuMTY5NSAxMDcuMTY0IDE3LjM1MjYgMTA1LjU3NSAxNi45ODI5IDEwMi45MDJDMTQuMTY1MyAxMDIuNTkgMTIuNTI5MyAxMDMuMjczIDEwLjA4MDEgMTAyLjE2QzEwLjM1MDUgMTAxLjY2MiAxMC43NDc5IDEwMS4yNDcgMTEuMjQ4MyAxMDAuOTAxQzE1LjczNzMgOTcuNzk0IDI4LjQ4ODIgMTAwLjE2NyAzMS45MDA2IDk2LjgxNjdDMzQuMDA3IDk0Ljc1IDM1LjM4ODkgOTIuNTg2NyAzNi44MTk3IDkwLjQ4MzhDMzguMjA3MiA4OC40NDM0IDM5LjY0MTUgODYuNDU5NyA0MS44MjY4IDg0LjY3MTlDNDIuNjMzNyA4NC4wMTE4IDQzLjUxMSA4My4zNTk2IDQ0LjQ0MjEgODIuNzIzQzQ4LjE2NiA4MC4xNzQzIDUyLjc3MjkgNzcuODYyOCA1Ny4zMDY2IDc2LjI2OTRDNjMuNDgyNiA3NC4wOTg0IDY5Ljc0MSA3My45MTk1IDc2LjMyMzcgNzEuNDA0M0M4MC4zOTA0IDY5Ljg1IDg0LjgxMjcgNjcuOTMwMiA4OC40MTc0IDY1LjI0MzlDODkuMjczMyA2NC42MDUxIDkwLjA4MzEgNjMuOTI0NSA5MC44MzE5IDYzLjE5NDlDMTAxLjEyNSA1My4xNjA4IDEwMy4xNjUgMzUuNDYxIDExOS4yMjQgMzMuODExNkMxMjEuMTY2IDMzLjYxMjEgMTIyLjc1NiAzMy42NzY3IDEyNC4yMDMgMzMuNjMyN0MxMjUuODcxIDMzLjU4MyAxMjcuMzQ3IDMzLjM4OTMgMTI4Ljk1MyAzMi40ODQ0Wk0xMDkuMzc1IDg5LjEzMzlDMTA5LjU2NyA5Mi4yMDEzIDExMS4zNDggOTguMjg3MiAxMTIuOTIgOTkuNzY2M0MxMDkuODQxIDEwMC41MTUgMTA0LjUzNyA5OS4yNzggMTAzLjE3NyA5Ny4xMDYyQzEwMy44NzYgOTMuOTcwNyAxMDcuNTE0IDkxLjEwNDEgMTA5LjM3NSA4OS4xMzM5WiIgZmlsbD0id2hpdGUiLz4KPHBhdGggZD0iTTEzMC4xMDkgMzUuOTE4N0MxMjkuNDkgMzcuMjE2OSAxMjguMzA1IDM4Ljg5MDggMTI4LjMwNSA0Mi4xOTU2QzEyOC4zIDQyLjc2MyAxMjcuODc1IDQzLjE1MTcgMTI3Ljg2NyA0Mi4yNzdDMTI3Ljg5OSAzOS4wNDcgMTI4Ljc1NCAzNy42NTA3IDEyOS42NjIgMzUuODE1NUMxMzAuMDg1IDM1LjA2MzYgMTMwLjMzOSAzNS4zNzM4IDEzMC4xMDkgMzUuOTE4N1pNMTI5LjQ4NiAzNS40Mjk3QzEyOC43NTYgMzYuNjY4NCAxMjYuOTk4IDM4LjkyNzggMTI2LjcwNyA0Mi4yMjAzQzEyNi42NTMgNDIuNzg0OCAxMjYuMTk0IDQzLjEzNDMgMTI2LjI2NCA0Mi4yNjE4QzEyNi41ODEgMzkuMDQ3NyAxMjcuOTg2IDM3LjAzNiAxMjkuMDUyIDM1LjI4NzNDMTI5LjUzNiAzNC41NzYxIDEyOS43NjMgMzQuOTA3NCAxMjkuNDg2IDM1LjQyOTdaTTEyOC45MTggMzQuNzgxN0MxMjguMDg2IDM1Ljk1NDMgMTI1LjM4IDM4LjY2NzggMTI0LjgxNCA0MS45MjQ3QzEyNC43MTIgNDIuNDgxOSAxMjQuMjI1IDQyLjc5MjggMTI0LjM2OCA0MS45MjlDMTI0Ljk1NCAzOC43NTIgMTI3LjI4NyAzNi4yNTUgMTI4LjQ5NiAzNC42MDM3QzEyOS4wMzggMzMuOTM0NiAxMjkuMjM3IDM0LjI4NCAxMjguOTE4IDM0Ljc4MTdaTTEyOC40MTEgMzQuMDU4OEwxMjguMTM3IDM0LjM0OTlDMTI2LjkyNyAzNS42NDcyIDEyNC4xMTYgMzguODExNCAxMjMuMTc5IDQxLjcwNzRDMTIyLjk5OSA0Mi4yNDUgMTIyLjQ3NCA0Mi40ODQ4IDEyMi43MzcgNDEuNjQ5M0MxMjMuNzYzIDM4LjU4NjQgMTI2LjU4OSAzNS4yODczIDEyOC4wMTggMzMuODIyN0MxMjguNjUgMzMuMjM2NCAxMjguNzk2IDMzLjYxMDYgMTI4LjQxMSAzNC4wNTg4Wk0xMTMuODg2IDQwLjYxNjJDMTE0LjUxMyAzNy45MjMxIDExNi42MDcgMzYuNjk2IDEyMC4yMjMgMzYuOTk1M0MxMjEuMDk2IDQxLjAxNTEgMTE2LjIxMyA0Mi42MzY2IDExMy44ODYgNDAuNjE2MloiIGZpbGw9IiMwNDI0NEUiLz4KPGRlZnM+CjxsaW5lYXJHcmFkaWVudCBpZD0icGFpbnQwX2xpbmVhcl82ODNfMjkzMCIgeDE9IjE0MC41IiB5MT0iMTQxIiB4Mj0iNS45OTk5OSIgeTI9Ii01LjUwMjI4ZS0wNiIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiPgo8c3RvcCBzdG9wLWNvbG9yPSIjQzQ5QTZDIi8+CjxzdG9wIG9mZnNldD0iMSIgc3RvcC1jb2xvcj0iI0U3QkY5MyIvPgo8L2xpbmVhckdyYWRpZW50Pgo8L2RlZnM+Cjwvc3ZnPgo=
-    keysOrder: [["apiVersion"], ["appVersion"], ["kind"], ["metadata"], ["metadata", "name"], ["spec", "replicas"], ["spec", "resources"], ["spec", "resourcesPreset"], ["spec", "size"], ["spec", "storageClass"], ["spec", "external"], ["spec", "version"], ["spec", "users"], ["spec", "databases"], ["spec", "backup"], ["spec", "backup", "enabled"], ["spec", "backup", "s3Region"], ["spec", "backup", "s3Bucket"], ["spec", "backup", "schedule"], ["spec", "backup", "cleanupStrategy"], ["spec", "backup", "s3AccessKey"], ["spec", "backup", "s3SecretKey"], ["spec", "backup", "resticPassword"]]
+    keysOrder: [["apiVersion"], ["appVersion"], ["kind"], ["metadata"], ["metadata", "name"], ["spec", "replicas"], ["spec", "resources"], ["spec", "resourcesPreset"], ["spec", "size"], ["spec", "storageClass"], ["spec", "external"], ["spec", "tls"], ["spec", "tls", "issuer"], ["spec", "version"], ["spec", "users"], ["spec", "databases"], ["spec", "backup"], ["spec", "backup", "enabled"], ["spec", "backup", "s3Region"], ["spec", "backup", "s3Bucket"], ["spec", "backup", "schedule"], ["spec", "backup", "cleanupStrategy"], ["spec", "backup", "s3AccessKey"], ["spec", "backup", "s3SecretKey"], ["spec", "backup", "resticPassword"]]
+  # The operator reconciles <release>-ca-bundle whenever TLS is on. It holds
+  # ca.crt alone, never a private key, and it keeps the previous CA alongside
+  # the new one across a rollover, so it is the trust anchor to publish from —
+  # a source the CA private key never sits next to at all. The chart lifts it
+  # into the tenant-ca projection itself (templates/tenant-projection.yaml);
+  # this ApplicationDefinition only needs to select on the resulting label
+  # below, matching every other converged engine.
   secrets:
-    exclude: []
+    # Backstop for the include selector below. matchLabels carries no name
+    # constraint, so any Secret of this instance that acquires the tenant-ca
+    # label gets promoted with its data copied verbatim. The source label is
+    # guarded by a policy; the destination label is not. Exclude wins over
+    # include, so naming the dangerous Secrets here closes the enumerable part
+    # of that gap.
+    #
+    # The guarantee is exactly as wide as this list: matching is by exact name,
+    # there are no globs, so a Secret introduced by a future operator version
+    # or created transiently mid-rotation is not covered. The real protection
+    # stays the fact that only the extraction controller stamps the label —
+    # this closes the set we can enumerate, not the set that can exist.
+    exclude:
+      - resourceNames:
+          # Private keys. .ca-tls and .tls are issued by this chart through
+          # cert-manager and hold the CA and server keys. Of the operator's own,
+          # -server-cert exists only when it issues the server leg, but -ca and
+          # -client-cert exist under both issuers: the chart never sets the
+          # client refs, so that leg is never delegated to cert-manager.
+          - mariadb-{{ .name }}.ca-tls
+          - mariadb-{{ .name }}.tls
+          - mariadb-{{ .name }}-ca
+          - mariadb-{{ .name }}-server-cert
+          - mariadb-{{ .name }}-client-cert
+          # Database credentials. -credentials is the tenant's own and is
+          # included below; these are the internal ones it must not also get.
+          - mariadb-{{ .name }}-root
+          - mariadb-{{ .name }}-password
+          - mariadb-{{ .name }}-repl-password
+          - mariadb-{{ .name }}-metrics-password
+          # The exporter's my.cnf. Holds the same password as -metrics-password
+          # in plaintext, and the exporter user is granted SELECT on *.*, so it
+          # reads every table in every database.
+          - mariadb-{{ .name }}-metrics-config
+          # Backup credentials: S3 keys and the restic password, which together
+          # grant read access to every dump ever taken.
+          - mariadb-{{ .name }}-backup
+          # Registry pull credentials.
+          - mariadb-{{ .name }}-regsecret
     include:
       - resourceNames:
           - mariadb-{{ .name }}-credentials
+      # The key-free trust anchor the CA-extraction controller publishes from
+      # the chart's TenantProjection. The selector is deliberately specific: an
+      # empty one compiles to match-everything, and the lineage webhook
+      # evaluates it against every Secret whose ownership resolves to this
+      # instance — the operator's own -ca, -server-cert, -client-cert and
+      # -ca-bundle, which reach the MariaDB resource through ownerReferences
+      # and are none of them meant to reach the tenant by name. The
+      # cert-manager Secrets resolve to nothing while
+      # enableCertificateOwnerRef stays false, since lineage walks
+      # ownerReferences or the Flux helm label and a cert-manager Secret
+      # carries neither; they stay excluded by name above because that is one
+      # setting away from changing.
+      - matchLabels:
+          internal.cozystack.io/tenant-ca: "true"
   services:
     exclude: []
     include:
       - resourceNames:
+          - mariadb-{{ .name }}
           - mariadb-{{ .name }}-primary
           - mariadb-{{ .name }}-secondary
diff --git a/packages/system/metallb/Makefile b/packages/system/metallb/Makefile
index b8973a23fc..b2d4fb2e76 100644
--- a/packages/system/metallb/Makefile
+++ b/packages/system/metallb/Makefile
@@ -17,12 +17,10 @@ image-controller image-speaker:
 	$(eval TARGET := $(subst image-,,$@))
 	$(eval VERSION := $(shell yq '.appVersion' charts/metallb/Chart.yaml))
 	docker buildx build images/metallb \
-		--platform=linux/amd64 \
 		--target $(TARGET) \
 		--build-arg VERSION=$(VERSION) \
 		$(call image-tags,metallb-$(TARGET),$(VERSION)) \
-		--cache-from type=registry,ref=$(REGISTRY)/metallb-$(TARGET):latest \
-		--cache-to type=inline \
+		$(call cache-args,metallb-$(TARGET)) \
 		--metadata-file images/$(TARGET).json \
 		$(BUILDX_ARGS)
 	REPOSITORY="$(REGISTRY)/metallb-$(TARGET)" \
diff --git a/packages/system/metallb/images/metallb/Dockerfile b/packages/system/metallb/images/metallb/Dockerfile
index feaa3b4e53..48c4f2513d 100644
--- a/packages/system/metallb/images/metallb/Dockerfile
+++ b/packages/system/metallb/images/metallb/Dockerfile
@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1.2
+# syntax=docker/dockerfile:1.2@sha256:e2a8561e419ab1ba6b2fe6cbdf49fd92b95912df1cf7d313c3e2230a333fdbcc
 
 ARG VERSION
 
diff --git a/packages/system/metallb/tests/metallb_test.yaml b/packages/system/metallb/tests/metallb_test.yaml
index 2f11c0ffd1..3af5ad68e5 100644
--- a/packages/system/metallb/tests/metallb_test.yaml
+++ b/packages/system/metallb/tests/metallb_test.yaml
@@ -94,40 +94,42 @@ tests:
       - hasDocuments:
           count: 0
 
-  # The cozystack outer values.yaml pins .metallb.controller.image.tag and
-  # .metallb.speaker.image.tag to a ghcr.io/cozystack/cozystack build that
-  # MUST match the appVersion of the vendored chart. v0.16.0 introduced a
-  # new probe contract (/healthz on port 17472) that earlier binaries don't
-  # serve — a bump that lets these two drift produces CrashLoopBackOff pods
-  # on the default branch between merge and the next release-prep commit.
-  # The two assertions below pin the rendered image tag to the exact string
-  # captured at chart appVersion v0.16.1; any in-place edit to values.yaml
-  # (intentional or otherwise) without a matching test fixture refresh fails
-  # CI before the change lands. Treat a failure here as "you edited
-  # values.yaml; if the edit was intentional, run `make image` to push fresh
-  # digests and update this fixture in the same commit". A future appVersion
-  # bump in Chart.yaml requires updating both halves: `make image` writes
-  # the new digest to values.yaml, then the fixture below is regenerated to
-  # match — the test catches a forgotten regeneration as part of the bump.
-  - it: pins controller image tag to the chart appVersion
+  # The cozystack outer values.yaml pins the controller and speaker images to
+  # a ghcr.io/cozystack/cozystack build addressed by digest. Do NOT pin the
+  # exact version+digest literal here: release-prep re-stamps every image tag
+  # to the platform version (e.g. v1.5.0-rc.2) and rebuilds the digest, so
+  # neither half is stable across a release cut. An exact-literal assertion is
+  # green on the default branch but breaks on every release branch — and that
+  # breakage stays hidden until a release PR drops the `release` label, since
+  # that label skips the Build job that runs `make unit-tests`.
+  #
+  # What MUST hold is weaker but real: the image is the cozystack-built
+  # repository and is pinned by an @sha256 digest, never a floating tag. The
+  # two assertions below enforce that form; the version string is left free on
+  # purpose. A wrong repository (e.g. an upstream quay.io/metallb image) or a
+  # tag with no digest still fails the suite. The probe-contract guarantee the
+  # old literal was meant to provide actually comes from the build itself —
+  # the image is built with `--build-arg VERSION=<appVersion>` — not from the
+  # tag string rendered here.
+  - it: pins the controller image to a digest-addressed cozystack build
     template: charts/metallb/templates/controller.yaml
     documentSelector:
       path: kind
       value: Deployment
     asserts:
-      - equal:
+      - matchRegex:
           path: spec.template.spec.containers[0].image
-          value: ghcr.io/cozystack/cozystack/metallb-controller:v0.16.1@sha256:0d8d567780c0f1d487e15a5df2377c40f9c608a55f1a24581052c7c69eb4ccfd
+          pattern: '^ghcr\.io/cozystack/cozystack/metallb-controller:[^@]+@sha256:[0-9a-f]{64}$'
 
-  - it: pins speaker image tag to the chart appVersion
+  - it: pins the speaker image to a digest-addressed cozystack build
     template: charts/metallb/templates/speaker.yaml
     documentSelector:
       path: kind
       value: DaemonSet
     asserts:
-      - equal:
+      - matchRegex:
           path: spec.template.spec.containers[0].image
-          value: ghcr.io/cozystack/cozystack/metallb-speaker:v0.16.1@sha256:aa16cee1c88923b67dbfcf69fe3e4dcb9a4ded95125a7f078752b4be240b5690
+          pattern: '^ghcr\.io/cozystack/cozystack/metallb-speaker:[^@]+@sha256:[0-9a-f]{64}$'
 
   # The values.yaml header comment documents that operators can revert the
   # speaker to legacy FRR mode by flipping these two keys. Pin both halves
@@ -183,3 +185,49 @@ tests:
       - equal:
           path: metadata.name
           value: metallb-frr-k8s
+
+  # Both node DaemonSets must carry a memory limit. That limit is what sets
+  # memory.max on the pod cgroup, and the Talos userspace OOM handler (v1.12+)
+  # only ever kills cgroups that lack one — a regression here silently puts the
+  # speaker back in the victim set, which is the failure this pins against.
+  - it: speaker declares a memory limit and request
+    template: charts/metallb/templates/speaker.yaml
+    documentSelector:
+      path: kind
+      value: DaemonSet
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].resources.limits.memory
+          value: 512Mi
+      - equal:
+          path: spec.template.spec.containers[0].resources.requests.memory
+          value: 64Mi
+
+  - it: every frr-k8s long-running container declares a memory limit
+    template: charts/metallb/charts/frr-k8s/templates/controller.yaml
+    documentSelector:
+      path: kind
+      value: DaemonSet
+    # Asserted one container at a time. A negated matcher over the container
+    # list looks like it covers all five but passes vacuously, so each limit is
+    # pinned explicitly instead.
+    #
+    # The four cp-* initContainers are intentionally not asserted: upstream
+    # hardcodes them with no resources knob, so they rely on the
+    # operator-managed namespace LimitRange instead.
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[?(@.name=="controller")].resources.limits.memory
+          value: 512Mi
+      - equal:
+          path: spec.template.spec.containers[?(@.name=="frr")].resources.limits.memory
+          value: 512Mi
+      - equal:
+          path: spec.template.spec.containers[?(@.name=="reloader")].resources.limits.memory
+          value: 128Mi
+      - equal:
+          path: spec.template.spec.containers[?(@.name=="frr-metrics")].resources.limits.memory
+          value: 256Mi
+      - equal:
+          path: spec.template.spec.containers[?(@.name=="frr-status")].resources.limits.memory
+          value: 256Mi
diff --git a/packages/system/metallb/values.yaml b/packages/system/metallb/values.yaml
index 988f7b78f6..2099486739 100644
--- a/packages/system/metallb/values.yaml
+++ b/packages/system/metallb/values.yaml
@@ -37,11 +37,27 @@ metallb:
   controller:
     image:
       repository: ghcr.io/cozystack/cozystack/metallb-controller
-      tag: v0.16.1@sha256:0d8d567780c0f1d487e15a5df2377c40f9c608a55f1a24581052c7c69eb4ccfd
+      tag: v1.6.0@sha256:cb7321c5674509048dfbea7938378b84013d1370eca5ace7f9665fc79b4a8a05
   speaker:
     image:
       repository: ghcr.io/cozystack/cozystack/metallb-speaker
-      tag: v0.16.1@sha256:aa16cee1c88923b67dbfcf69fe3e4dcb9a4ded95125a7f078752b4be240b5690
+      tag: v1.6.0@sha256:61ab7e2381f0897607b15df7cb5ba4d51a947c261c1c197fcda3b79c7a280016
+    # A memory limit is what sets memory.max on the pod cgroup, and the Talos
+    # userspace OOM handler (v1.12+) only ever kills cgroups that lack it. The
+    # speaker ran BestEffort, so it was picked as the victim whenever a tenant
+    # workload drove node memory PSI — the pressure and the victim being
+    # unrelated by design. See the same block on every node DaemonSet below.
+    #
+    # Requests come from observed usage (14d peak 97Mi on a 3-node dev cluster);
+    # limits are deliberately loose, sized as a runaway backstop rather than a
+    # fitted ceiling, because undersizing here converts a rare pressure-driven
+    # kill into a deterministic one.
+    resources:
+      requests:
+        cpu: 50m
+        memory: 64Mi
+      limits:
+        memory: 512Mi
   # The vendored metallb chart's values.yaml leaves `frr-k8s.prometheus:` as
   # a YAML block containing only commented examples — it parses to null.
   # Helm-controller's deep-merge then writes that null over the frr-k8s
@@ -62,3 +78,47 @@ metallb:
         enabled: false
       podMonitor:
         enabled: false
+    # Same reasoning as speaker.resources above. frr-k8s is the sibling node
+    # DaemonSet that actually speaks BGP, so it shares the speaker's exposure.
+    # 14d peaks on a 3-node dev cluster: controller ~124Mi, frr 43Mi,
+    # frr-metrics 49Mi, frr-status 31Mi, reloader 7Mi.
+    #
+    # The four cp-* init containers are NOT covered here: the upstream chart
+    # hardcodes them with no resources knob, so the pod-level memory.max still
+    # depends on the default LimitRange the operator maintains in every system
+    # namespace. Lifting that needs an upstream change in metallb/frr-k8s.
+    frrk8s:
+      resources:
+        requests:
+          cpu: 50m
+          memory: 64Mi
+        limits:
+          memory: 512Mi
+      frr:
+        resources:
+          requests:
+            cpu: 50m
+            memory: 64Mi
+          limits:
+            memory: 512Mi
+      reloader:
+        resources:
+          requests:
+            cpu: 10m
+            memory: 16Mi
+          limits:
+            memory: 128Mi
+      frrMetrics:
+        resources:
+          requests:
+            cpu: 10m
+            memory: 32Mi
+          limits:
+            memory: 256Mi
+      frrStatus:
+        resources:
+          requests:
+            cpu: 10m
+            memory: 32Mi
+          limits:
+            memory: 256Mi
diff --git a/packages/system/metrics-server/Makefile b/packages/system/metrics-server/Makefile
index 87477ea032..5de56744a9 100644
--- a/packages/system/metrics-server/Makefile
+++ b/packages/system/metrics-server/Makefile
@@ -3,6 +3,9 @@ export NAMESPACE=cozy-monitoring
 
 include ../../../hack/package.mk
 
+test:
+	helm unittest .
+
 update:
 	rm -rf charts
 	helm repo add metrics-server https://kubernetes-sigs.github.io/metrics-server/
diff --git a/packages/system/metrics-server/tests/container_port_test.yaml b/packages/system/metrics-server/tests/container_port_test.yaml
new file mode 100644
index 0000000000..3c8cc341f0
--- /dev/null
+++ b/packages/system/metrics-server/tests/container_port_test.yaml
@@ -0,0 +1,84 @@
+suite: metrics-server container port
+
+# Keeps metrics-server's own listener off 10250, the port it scrapes kubelets
+# on. The values.yaml override this guards carries the reasoning; it is not
+# repeated here.
+#
+# The first test is the regression guard. The vendored chart ships no
+# values.schema.json, so an upstream rename of `containerPort` is accepted and
+# silently ignored rather than failing helm — this test is the only thing
+# between a re-vendored chart and a silent return to 10250.
+#
+# The rest pin preconditions the fix depends on and that already hold on their
+# own: that the port lives in the Pod's network namespace rather than the
+# node's, and that the Service and both probes reach it by name rather than by
+# number, which is what lets the number move without anything else having to
+# be taught to follow it. `make update` re-vendors this chart wholesale, so
+# these are the regression surface for that too.
+
+templates:
+  - charts/metrics-server/templates/deployment.yaml
+  - charts/metrics-server/templates/service.yaml
+
+release:
+  name: metrics-server
+  namespace: cozy-monitoring
+
+tests:
+  - it: serves on 4443, not 10250, the port it scrapes kubelets on
+    template: charts/metrics-server/templates/deployment.yaml
+    asserts:
+      - isKind:
+          of: Deployment
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: --secure-port=4443
+      - equal:
+          path: spec.template.spec.containers[0].ports[0]
+          value:
+            name: https
+            protocol: TCP
+            containerPort: 4443
+
+  # Also a tripwire: enabling hostNetwork here trips this test, which is the
+  # intended prompt to go and add 4443 to the clusterwide policy in
+  # packages/system/cilium-networkpolicy before the listener joins the node's
+  # namespace. See the reasoning in values.yaml.
+  - it: keeps metrics-server off the host network, so the port lives in the Pod netns
+    template: charts/metrics-server/templates/deployment.yaml
+    asserts:
+      # The template emits the key only when hostNetwork.enabled is truthy, so
+      # absence is the only shape a disabled hostNetwork can take here.
+      # isNullOrEmpty would not do: it fails on a path that does not exist.
+      - notExists:
+          path: spec.template.spec.hostNetwork
+
+  - it: reaches the container by port name, so the port can move without a traffic gap
+    template: charts/metrics-server/templates/service.yaml
+    asserts:
+      - isKind:
+          of: Service
+      - equal:
+          path: spec.ports[0].name
+          value: https
+      - equal:
+          path: spec.ports[0].port
+          value: 443
+      # A name, not a number. A numeric targetPort is copied into every
+      # endpoint regardless of what each Pod actually listens on, which would
+      # aim the Service at a port the outgoing Pod does not serve until its
+      # replacement passes readiness. Upstream already names it here; if that
+      # ever regresses to an integer, moving the port reintroduces that gap.
+      - equal:
+          path: spec.ports[0].targetPort
+          value: https
+
+  - it: probes the container by port name, so a port change cannot strand readiness
+    template: charts/metrics-server/templates/deployment.yaml
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].livenessProbe.httpGet.port
+          value: https
+      - equal:
+          path: spec.template.spec.containers[0].readinessProbe.httpGet.port
+          value: https
diff --git a/packages/system/metrics-server/values.yaml b/packages/system/metrics-server/values.yaml
index 98d74b6cfc..68437b8eee 100644
--- a/packages/system/metrics-server/values.yaml
+++ b/packages/system/metrics-server/values.yaml
@@ -1,4 +1,63 @@
 metrics-server:
+  # Upstream defaults this to 10250 — the kubelet's port, and the port
+  # metrics-server itself scrapes every kubelet on.
+  #
+  # That default makes hostNetwork unusable. The chart offers
+  # hostNetwork.enabled for clusters whose apiserver cannot reach Pod IPs, but
+  # enabling it at the default puts metrics-server in the node's namespace
+  # where the kubelet already holds 10250, and the process exits with "bind:
+  # address already in use". Upstream has had this reported
+  # (kubernetes-sigs/metrics-server#1026) and kept the default anyway, on the
+  # view that hostNetwork is non-standard here and that those users can set a
+  # port themselves. This is that port, picked before the need rather than
+  # after it.
+  #
+  # It also removes a collision that would make a misrouted connection hard to
+  # read. Were a connection to the metrics-server Service to arrive at a node
+  # IP instead of a Pod IP, it would reach the kubelet, listening on the same
+  # number. Nothing here establishes that this happens — with pod-networked
+  # endpoints there is no ordinary path to it — so this is not the fix for a
+  # known routing bug. It only decides how such a misroute would present: as a
+  # connection refusal, rather than as a rejection from an unexpected daemon.
+  # That distinction is sharper here than for a webhook, because this chart's
+  # APIService sets insecureSkipTLSVerify, so the aggregation layer never
+  # checks whose certificate it received and nothing in the resulting error
+  # would name the mismatch.
+  #
+  # What the override gives up is worth stating. Upstream moved to 10250 so
+  # metrics-server would be covered by the firewall rules most clusters
+  # already have between control plane and nodes, and work without new ones. A
+  # substrate permitting only 443 and 10250 to nodes therefore needs this
+  # value reconsidered. Cozystack's own — Talos, k3s, kubeadm — do not filter
+  # it, but this package also ships into every tenant cluster and no e2e
+  # exercises the metrics API, so a wrong guess here would first surface as a
+  # user's HPA quietly not scaling, or as the dashboard's cluster-usage view
+  # going blank.
+  #
+  # 4443 is the value upstream's manifests carried through v0.6.4, before
+  # v0.7.0 shipped 10250, so it is a number already associated with this
+  # component. It sits clear of the 10248-10259 block the node components
+  # occupy, and nothing in this repo binds it.
+  #
+  # Under hostNetwork this listener joins the node's namespace, where the
+  # clusterwide policy in packages/system/cilium-networkpolicy denies 10250
+  # from the world but has no entry for 4443. That matters more than it would
+  # elsewhere, because metrics.enabled below makes the chart add
+  # --authorization-always-allow-paths=/metrics, leaving that one path
+  # unauthenticated. What it exposes is metrics-server's own scrape
+  # instrumentation, not the resource data, which stays behind the
+  # authenticated aggregated API — but enabling hostNetwork still means adding
+  # 4443 to that policy first rather than opening it on every node IP.
+  #
+  # Every reference to the port inside the chart is by name — the Service's
+  # targetPort and both probes — so the number moves without aiming any
+  # endpoint at a port its Pod does not serve. (The ServiceMonitor names the
+  # Service port rather than this one, so it is unaffected either way.)
+  # tests/container_port_test.yaml pins that and the value itself: the
+  # vendored chart ships no values.schema.json, so an upstream rename of this
+  # key would be silently ignored rather than failing helm.
+  containerPort: 4443
+
   defaultArgs:
     - --cert-dir=/tmp
     - --kubelet-preferred-address-types=InternalIP,ExternalIP,Hostname
@@ -12,4 +71,12 @@ metrics-server:
   serviceMonitor:
     enabled: true
 
+  resources:
+    limits:
+      cpu: 500m
+      memory: 500Mi
+    requests:
+      cpu: 100m
+      memory: 200Mi
+
 
diff --git a/packages/system/migration-controller/Chart.yaml b/packages/system/migration-controller/Chart.yaml
new file mode 100644
index 0000000000..6aa7e22280
--- /dev/null
+++ b/packages/system/migration-controller/Chart.yaml
@@ -0,0 +1,3 @@
+apiVersion: v2
+name: cozy-migration-controller
+version: 0.0.0 # Placeholder, the actual version will be automatically set during the build process
diff --git a/packages/system/migration-controller/Makefile b/packages/system/migration-controller/Makefile
new file mode 100644
index 0000000000..5c22ea80fa
--- /dev/null
+++ b/packages/system/migration-controller/Makefile
@@ -0,0 +1,20 @@
+NAME=migration-controller
+NAMESPACE=cozy-migration-controller
+
+include ../../../hack/common-envs.mk
+include ../../../hack/package.mk
+
+test:
+	helm unittest .
+
+image: image-migration-controller
+
+image-migration-controller:
+	docker buildx build -f images/migration-controller/Dockerfile ../../.. \
+		$(call image-tags,migration-controller,v$(COZYSTACK_VERSION)) \
+		$(call cache-args,migration-controller) \
+		--metadata-file images/migration-controller.json \
+		$(BUILDX_ARGS)
+	IMAGE="$(REGISTRY)/migration-controller:$(IMAGE_TAG)@$$(yq e '."containerimage.digest"' images/migration-controller.json -o json -r)" \
+		yq -i '.migrationController.image = strenv(IMAGE)' values.yaml
+	rm -f images/migration-controller.json
diff --git a/packages/system/migration-controller/README.md b/packages/system/migration-controller/README.md
new file mode 100644
index 0000000000..35e5b956f1
--- /dev/null
+++ b/packages/system/migration-controller/README.md
@@ -0,0 +1,195 @@
+# migration-controller
+
+Reconciles `forklift.cozystack.io`: `VMImportSource` connections and the `VMImportTask` operations that run over them. Konveyor Forklift is the transfer engine underneath; this controller owns the tenant-facing API, drives Forklift's objects, and turns each finished transfer into a Cozystack `VMDisk` and `VMInstance`.
+
+Opt-in. Add all three packages to `bundles.enabledPackages`:
+
+```yaml
+bundles:
+  enabledPackages:
+  - cozystack.forklift-operator
+  - cozystack.forklift
+  - cozystack.migration-controller
+```
+
+## Before the first import
+
+Four checks, each of which otherwise fails late and obscurely. All were hit on a real cluster.
+
+1. **The storage class must bind `Immediate`.** A `WaitForFirstConsumer` class deadlocks an import: nothing consumes the claim while it is being populated. The task refuses such a class up front rather than hanging, but the *cluster default* is frequently `WaitForFirstConsumer`, so `spec.storageClass` usually has to be named explicitly. Check with `kubectl get storageclass`.
+2. **The ESXi host must be reachable, and must not collide with the Service CIDR.** See [When the cluster cannot reach the ESXi host](#when-the-cluster-cannot-reach-the-esxi-host). This is the one that costs a whole transfer before it announces itself.
+3. **The vCenter account needs its domain.** `mtv-migration` is rejected as an incorrect username; `mtv-migration@vsphere.local` is not. The engine reports it as a credentials failure either way, which reads like the wrong password.
+4. **The engine's own certificates must be current.** Forklift rotates its serving certificates and updates the secret, but does not restart its pods, so a long-lived deployment can serve a certificate its own published CA no longer matches. The controller verifies that CA and will refuse the connection. `kubectl -n cozy-forklift rollout restart deploy/forklift-controller` resolves it; the same staleness eventually expires the certificate outright.
+
+## Platform configuration
+
+One key, and only for VMware:
+
+```yaml
+vmImport:
+  vddkImage: registry.example.com/vddk:8.0.3
+```
+
+Cozystack neither ships nor mirrors that image: it is built from VMware's proprietary Virtual Disk Development Kit, which we have no licence to redistribute. An operator who holds one builds it, pushes it where the cluster can pull from, and names it here. Only the reference travels to the controller — never a credential.
+
+Leaving it empty is a normal, supported state. A vSphere `VMImportSource` then reports `Ready=False` with reason `VDDKNotConfigured` at the moment it is created, so a tenant learns the path is unavailable at registration rather than watching a transfer die halfway through. Nothing is materialized for such a source — not even its credentials Secret.
+
+## What a tenant creates
+
+A connection, reusable across imports:
+
+```yaml
+apiVersion: forklift.cozystack.io/v1alpha1
+kind: VMImportSource
+metadata:
+  name: vcenter-prod
+  namespace: tenant-foo
+spec:
+  type: vsphere
+  url: https://vcenter.example.com/sdk
+  credentials:
+    username: mtv-migration@vsphere.local
+    password: "..."
+    caCert: |
+      -----BEGIN CERTIFICATE-----
+      ...
+      -----END CERTIFICATE-----
+```
+
+Then an import, which is one-shot:
+
+```yaml
+apiVersion: forklift.cozystack.io/v1alpha1
+kind: VMImportTask
+metadata:
+  name: import-web-tier
+  namespace: tenant-foo
+spec:
+  sourceRef:
+    name: vcenter-prod
+  vms:
+  - id: vm-1234          # managed-object reference, from the vSphere client URL or `govc ls -i`
+    name: web-01
+  storageClass: replicated
+```
+
+Deleting the task removes the migration machinery and leaves `web-01` and its disks in place: they are ordinary Cozystack objects from the moment they exist, and carry no owner reference back to the task. Deleting the source deregisters the connection — its Forklift Provider and projected Secret go with it, and nothing already imported is touched.
+
+Created VMs start `Halted`, not running. A freshly imported guest usually needs its network reconfigured, and booting it the instant the transfer finishes can put a second copy of a still-running production machine on the network.
+
+## When the cluster cannot reach the ESXi host
+
+Disk data does not travel through vCenter. The VDDK opens its connection straight to the ESXi host holding the VM, at whatever address vCenter advertises for that host — and that address is often one the cluster cannot use.
+
+Check it before the first import, because the failure comes late. The address vCenter advertises must be routable from the worker nodes and, critically, **must not fall inside the cluster's Service CIDR**: an address in that range is claimed by service routing, the packets never leave the node, and the transfer dies after validation has already passed. Compare the two:
+
+```sh
+# what vCenter advertises for the host, as the engine sees it
+kubectl -n cozy-forklift exec deploy/forklift-controller -c inventory -- \
+  curl -sk "https://localhost:8443/providers/vsphere/<provider-uid>/hosts"
+
+# the cluster's Service CIDR, via the address of the kubernetes service
+kubectl get svc -n default kubernetes -o jsonpath='{.spec.clusterIP}'
+```
+
+A host that is unreachable, or that collides, gets an entry on the source:
+
+```yaml
+spec:
+  hosts:
+  - id: host-10              # the host's managed-object id, as the VM's inventory record names it
+    address: 10.31.0.29      # an address the cluster can actually reach
+    credentials:
+      username: root
+      password: "..."
+      insecureSkipVerify: true
+```
+
+The credentials are the ESXi host's own account, not the vCenter one: the host authenticates this connection itself rather than honouring the vCenter session, and the engine connection-tests the pair before any transfer starts. That is also why the field takes a full credential rather than a bare address.
+
+Symptom when the override is missing: the task reaches `Transferring`, sits there, and then fails with an NBD error — `nbd_connect_uri: the server has no export named ''` — which names neither the address nor the reason.
+
+## TLS: caCert or insecureSkipVerify, not a thumbprint
+
+Exactly one of these must be set, and the API rejects the object at admission otherwise.
+
+`caCert` is the PEM certificate authority that signed the endpoint's certificate. `insecureSkipVerify: true` turns verification off — convenient in a lab and a poor idea anywhere else, since the credentials above travel over that same connection.
+
+A SHA-1 **thumbprint does not work here**, and this is worth stating plainly because the engine's own error is misleading. Forklift's vSphere provider validation requires `user`, `password`, and either a `cacert` key or `insecureSkipVerify`; given a thumbprint instead it marks the provider `SecretNotValid` with the message "The secret is not valid", which reads like a credentials problem and is not. A thumbprint is what the engine wants for a *direct ESXi host* connection, a path this version does not expose.
+
+## vCenter privileges
+
+Neither `Administrator` nor a plain read-only role is right. Read-only cannot do the job, and Administrator hands the cluster a credential whose blast radius is the entire vCenter — and that credential lands in a Secret in the tenant's own namespace.
+
+Clone the read-only role, add the privileges Forklift documents, and assign it to a service account created for the migration campaign and disabled afterwards. Scope it to the datacenter being migrated, propagated to children — not the whole vCenter.
+
+Eleven privileges cover a cold migration, and several of them are writes, which is why read-only is not enough:
+
+- `Datastore.Browse`, `Datastore.FileManagement`
+- `Sessions.ValidateSession`
+- `VirtualMachine.Interact.PowerOff`, `.PowerOn`, `.GuestControl`
+- `VirtualMachine.Provisioning.DiskRandomAccess`, `.FileRandomAccess`, `.DiskRandomRead`, `.GetVmFiles`, `.PutVmFiles`
+
+Warm migration adds `VirtualMachine.State.CreateSnapshot` and `.RemoveSnapshot`; encrypted guests need the `Cryptographer.*` set. Older vendor documentation asks for all fifteen `Provisioning` privileges — the remainder only matter for template migration, which this path does not do.
+
+Two things about that role are worth knowing before you build it. vCenter **silently ignores an unknown privilege**, so a typo produces a role that looks correct and is quietly under-privileged; enumerate the valid identifiers with `govc role.ls Admin` rather than trusting a document. And the identifiers themselves have drifted between versions — what one document calls `Cryptographic.Direct access` is `Cryptographer.Access` on vSphere 7.
+
+Note that the VDDK opens NFC connections to the **ESXi hosts** on TCP 443 and 902, not only to vCenter. That matters more than it sounds: vCenter frequently advertises a host on an address the cluster cannot reach, and the transfer then fails with `VixDiskLib_Open ... The server refused connection` while everything about the provider still looks healthy. When that address is unusable, list the host under `spec.hosts` with an address the cluster can reach and its own ESXi credentials — the host authenticates that connection itself rather than honouring the vCenter session.
+
+A related trap on the cluster side: if the cluster's Service CIDR overlaps the ESXi network, the VDDK breaks before anything else does.
+
+*The privilege detail above comes from the operational work on the original VMware import implementation, validated against a real vCenter.*
+
+## Storage
+
+Every disk of a task lands on `spec.storageClass`, or the cluster default when it is omitted. Either way the class must bind `Immediate`.
+
+A `WaitForFirstConsumer` class does not fail an import, it **hangs** it: nothing consumes the claim while CDI populates it, so the transfer waits forever. The controller checks the binding mode before creating anything and fails the task with a message naming the class. On a stock Cozystack install the default class is `local`, which is `WaitForFirstConsumer` — so a task that names no class fails immediately with that explanation. `replicated` qualifies.
+
+The transferred volume is handed to its `VMDisk` without being copied: the `PersistentVolume` is retained and re-bound into the claim the disk expects. `Retain` is held for the swap only. Between deleting the transferred claim and re-pointing the volume's `claimRef`, the volume is `Released`, and under `Delete` the provisioner would reclaim it on the spot. Once the new claim and the volume both report `Bound` to each other, the transferred claim is gone, and CDI has adopted the claim into the `VMDisk`'s DataVolume as its sole owner, the controller sets the volume back to the reclaim policy its StorageClass declares (`Delete` when the class names none or no longer exists). Only then does it create the `VMInstance` and mark the VM `Succeeded`, so a task in `Creating` a little longer than the transfer itself is this step waiting on the PV controller and CDI. From then on an imported disk behaves like any other: deleting the `VMDisk` removes its DataVolume, garbage collection takes the claim, and the volume and its backing storage go with it.
+
+Imports finished by a controller older than this behaviour left their volumes on `Retain` for good, so deleting such a `VMDisk` leaves a `Released` volume that no tenant can see or remove. Setting `persistentVolumeReclaimPolicy` back to the class's policy on those volumes, while their `VMDisk` still exists, lets them clean up like the rest; on one already `Released`, the same patch makes the provisioner delete it.
+
+**Budget roughly twice each disk's size against the tenant quota while an import runs.** CDI allocates a prime volume of the target size *and* a scratch volume of about 106% of it, so a 230 GiB disk occupies around 474 GiB until the transfer finishes. On a tenant near its quota this shows up as the import stalling on `exceeded quota` rather than as anything resembling a storage error, and it clears on its own once the previous disk releases its transit volumes.
+
+Also expect a second phase that nothing reports. After the download, CDI runs `qemu-img convert` from scratch onto the target volume — around half an hour per 230 GiB — while the DataVolume's own progress sits frozen at 99.92%, because that counter only ever measured the download. The real percentage is only visible in the importer pod's log.
+
+## Timings, for planning
+
+Measured on a real vSphere source during the original implementation work, on a 16 GiB UEFI Linux guest:
+
+| Path | Duration |
+|---|---|
+| VDDK raw copy (what this version does) | ≈2 min 55 s |
+| virt-v2v conversion plus its cross-namespace clone | ≈5 min 46 s |
+
+The factor of two is the second copy, not the conversion. For scale at the other end: a 160 GiB Windows Server OVF expanding to 295 GiB took about an hour and five minutes end to end, with the disk transfer itself running near 80 MiB/s.
+
+## Privilege model
+
+Nothing on the transfer path is privileged. With guest conversion off — the only mode this version offers — no Forklift pod moves the bytes at all: Forklift emits a CDI DataVolume with a VDDK source and CDI's own importer does the work, and that pod satisfies the `restricted` Pod Security Standard. Verified against Forklift v2.11.5 and CDI v1.64.0, and confirmed on a live cluster by importing into a namespace enforcing `restricted` with no admission denial.
+
+Guest conversion is a separate matter: it needs a node-level seccomp profile, because libguestfs starts `passt`, which unconditionally creates its own namespaces. It is deliberately not part of this version.
+
+Tenants get read and write on both kinds through the standard aggregation labels, and no access at all to `forklift.konveyor.io` — the Forklift objects a task builds are internal machinery.
+
+## Failure modes worth recognising
+
+**A task stuck in `Creating` with the transfer finished** usually means the engine reported success without producing anything. A Plan that already has a failed attempt in its history can report `SUCCEEDED` on a retry while creating neither the volume nor the VM; the task surfaces this rather than hanging, and the remedy is a new task (which builds a new Plan) rather than retrying the old one.
+
+**A transfer whose progress sits at 0 for many minutes** is not reported as an error on any of the migration objects. Look at the target namespace's claim events — the usual cause is the VDDK failing to reach an ESXi host, which surfaces there and nowhere else. When it eventually does fail, the message is `Unable to connect to vddk data source: nbd_connect_uri: the server has no export named ''`, which sounds like a missing disk and is almost always an unreachable host address: see [When the cluster cannot reach the ESXi host](#when-the-cluster-cannot-reach-the-esxi-host).
+
+**A VM that reports `SecretNotValid` or an authentication failure** on a vCenter source is usually the username, not the password: vCenter wants the SSO domain (`user@vsphere.local`), and rejects a bare account name with the same message it uses for a wrong password.
+
+**`server-side dry run does not protect you here.`** `kubectl apply --dry-run=server` is not honoured by Cozystack's aggregated API: for `apps.cozystack.io` resources it really creates the object. That applies to the `VMInstance` and `VMDisk` an import produces, so do not use it as a safety net when experimenting.
+
+**Instance types are not interchangeable after the fact.** A `VirtualMachineInstance` is immutable, so changing `instanceType` on an imported VM requires deleting the VMI to have it re-created. Some catalog sizes also request hugepages, which a node without them cannot satisfy — the VM then stays `Pending` with `Insufficient hugepages-2Mi` rather than failing outright.
+
+## Uninstalling
+
+Remove the `ForkliftController` operand before the operator, or CRD deletion deadlocks on the operand's finalizer with nothing left running to clear it:
+
+```sh
+kubectl patch forkliftcontroller -n cozy-forklift forklift-controller \
+  --type merge -p '{"metadata":{"finalizers":null}}'
+```
diff --git a/packages/system/migration-controller/definitions/forklift.cozystack.io_vmimportsources.yaml b/packages/system/migration-controller/definitions/forklift.cozystack.io_vmimportsources.yaml
new file mode 100644
index 0000000000..6ebe3e80b7
--- /dev/null
+++ b/packages/system/migration-controller/definitions/forklift.cozystack.io_vmimportsources.yaml
@@ -0,0 +1,284 @@
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.16.4
+  name: vmimportsources.forklift.cozystack.io
+spec:
+  group: forklift.cozystack.io
+  names:
+    kind: VMImportSource
+    listKind: VMImportSourceList
+    plural: vmimportsources
+    shortNames:
+    - vmis
+    - vmimportsrc
+    singular: vmimportsource
+  scope: Namespaced
+  versions:
+  - additionalPrinterColumns:
+    - jsonPath: .spec.type
+      name: Type
+      type: string
+    - jsonPath: .spec.url
+      name: URL
+      type: string
+    - jsonPath: .status.conditions[?(@.type=='Ready')].status
+      name: Ready
+      type: string
+    - jsonPath: .status.conditions[?(@.type=='Ready')].reason
+      name: Reason
+      priority: 1
+      type: string
+    - jsonPath: .metadata.creationTimestamp
+      name: Age
+      type: date
+    name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        description: |-
+          VMImportSource registers a reusable connection to a source virtualization
+          platform. It is long-lived: VMImportTasks reference it, and deleting it
+          deregisters the connection without touching anything already imported.
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: VMImportSourceSpec describes a connection to a source virtualization
+              platform.
+            properties:
+              credentials:
+                description: Credentials is the account used to reach the provider.
+                properties:
+                  caCert:
+                    description: |-
+                      CACert is the PEM-encoded certificate authority that signed the
+                      endpoint's TLS certificate. Required unless insecureSkipVerify is set:
+                      the migration engine refuses a vSphere connection that can neither
+                      verify the endpoint nor was told not to.
+
+                      This is a CA certificate, not a fingerprint. A SHA-1 thumbprint is what
+                      the engine wants for a direct ESXi host connection, which v1 does not
+                      expose, and supplying one here does not satisfy the check.
+                    type: string
+                  insecureSkipVerify:
+                    description: |-
+                      InsecureSkipVerify disables verification of the endpoint's TLS
+                      certificate. Convenient in a lab and a bad idea anywhere else: the
+                      credentials above travel over that connection. Prefer caCert.
+                    type: boolean
+                  password:
+                    description: Password is the account's password.
+                    minLength: 1
+                    type: string
+                  username:
+                    description: |-
+                      Username is the account used to authenticate against the provider
+                      (e.g. `migration@vsphere.local`).
+                    minLength: 1
+                    type: string
+                required:
+                - password
+                - username
+                type: object
+                x-kubernetes-validations:
+                - message: 'either caCert must be set or insecureSkipVerify must be
+                    true: the migration engine will not open a vSphere connection
+                    it can neither verify nor was told to trust'
+                  rule: has(self.caCert) || (has(self.insecureSkipVerify) && self.insecureSkipVerify)
+              hosts:
+                description: |-
+                  Hosts redirects the disk transfer for individual ESXi hosts.
+
+                  Disk data does not travel through vCenter. VDDK opens its connection
+                  straight to the ESXi host holding the VM, at whatever address vCenter
+                  advertises for it — and that address is frequently one the cluster
+                  cannot reach: a management network the workers are not on, or, worse,
+                  one that collides with the cluster's own Service CIDR, where the packet
+                  is swallowed by service routing and never leaves. The transfer then
+                  fails late, after validation has passed, with an NBD error naming
+                  neither the address nor the reason.
+
+                  An entry here names the host and the address to use instead. Each
+                  carries its own credentials because the ESXi host authenticates the
+                  connection itself rather than honouring the vCenter session, and the
+                  engine connection-tests them before the transfer starts.
+                items:
+                  description: HostOverride redirects the disk transfer for one ESXi
+                    host.
+                  properties:
+                    address:
+                      description: |-
+                        Address is the address the cluster should use to reach this host for the
+                        disk transfer, replacing the one vCenter advertises.
+                      minLength: 1
+                      type: string
+                    credentials:
+                      description: |-
+                        Credentials is the account on the ESXi host itself. The host
+                        authenticates the transfer connection directly, so the provider's
+                        vCenter account does not carry over.
+                      properties:
+                        caCert:
+                          description: |-
+                            CACert is the PEM-encoded certificate authority that signed the
+                            endpoint's TLS certificate. Required unless insecureSkipVerify is set:
+                            the migration engine refuses a vSphere connection that can neither
+                            verify the endpoint nor was told not to.
+
+                            This is a CA certificate, not a fingerprint. A SHA-1 thumbprint is what
+                            the engine wants for a direct ESXi host connection, which v1 does not
+                            expose, and supplying one here does not satisfy the check.
+                          type: string
+                        insecureSkipVerify:
+                          description: |-
+                            InsecureSkipVerify disables verification of the endpoint's TLS
+                            certificate. Convenient in a lab and a bad idea anywhere else: the
+                            credentials above travel over that connection. Prefer caCert.
+                          type: boolean
+                        password:
+                          description: Password is the account's password.
+                          minLength: 1
+                          type: string
+                        username:
+                          description: |-
+                            Username is the account used to authenticate against the provider
+                            (e.g. `migration@vsphere.local`).
+                          minLength: 1
+                          type: string
+                      required:
+                      - password
+                      - username
+                      type: object
+                      x-kubernetes-validations:
+                      - message: 'either caCert must be set or insecureSkipVerify
+                          must be true: the migration engine will not open a connection
+                          to the host it can neither verify nor was told to trust'
+                        rule: has(self.caCert) || (has(self.insecureSkipVerify) &&
+                          self.insecureSkipVerify)
+                    id:
+                      description: |-
+                        ID is the host's managed-object reference in the source inventory
+                        (e.g. `host-10`). It is what the VM's inventory record names as its
+                        host, not the hostname.
+                      minLength: 1
+                      type: string
+                  required:
+                  - address
+                  - credentials
+                  - id
+                  type: object
+                type: array
+                x-kubernetes-list-map-keys:
+                - id
+                x-kubernetes-list-type: map
+              type:
+                description: Type is the source platform this connection speaks to.
+                enum:
+                - vsphere
+                type: string
+                x-kubernetes-validations:
+                - message: type is immutable
+                  rule: self == oldSelf
+              url:
+                description: URL is the provider's API endpoint (e.g. `https://vcenter.example.com/sdk`).
+                minLength: 1
+                type: string
+            required:
+            - credentials
+            - type
+            - url
+            type: object
+          status:
+            description: VMImportSourceStatus reports whether the connection is usable.
+            properties:
+              conditions:
+                description: |-
+                  Conditions represents the latest available observations of the connection's state.
+                  The Ready condition is the connection's readiness: it is true only once the
+                  endpoint has answered and every platform prerequisite for this provider
+                  type is satisfied.
+                items:
+                  description: Condition contains details for one aspect of the current
+                    state of this API Resource.
+                  properties:
+                    lastTransitionTime:
+                      description: |-
+                        lastTransitionTime is the last time the condition transitioned from one status to another.
+                        This should be when the underlying condition changed.  If that is not known, then using the time when the API field changed is acceptable.
+                      format: date-time
+                      type: string
+                    message:
+                      description: |-
+                        message is a human readable message indicating details about the transition.
+                        This may be an empty string.
+                      maxLength: 32768
+                      type: string
+                    observedGeneration:
+                      description: |-
+                        observedGeneration represents the .metadata.generation that the condition was set based upon.
+                        For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date
+                        with respect to the current state of the instance.
+                      format: int64
+                      minimum: 0
+                      type: integer
+                    reason:
+                      description: |-
+                        reason contains a programmatic identifier indicating the reason for the condition's last transition.
+                        Producers of specific condition types may define expected values and meanings for this field,
+                        and whether the values are considered a guaranteed API.
+                        The value should be a CamelCase string.
+                        This field may not be empty.
+                      maxLength: 1024
+                      minLength: 1
+                      pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
+                      type: string
+                    status:
+                      description: status of the condition, one of True, False, Unknown.
+                      enum:
+                      - "True"
+                      - "False"
+                      - Unknown
+                      type: string
+                    type:
+                      description: type of condition in CamelCase or in foo.example.com/CamelCase.
+                      maxLength: 316
+                      pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
+                      type: string
+                  required:
+                  - lastTransitionTime
+                  - message
+                  - reason
+                  - status
+                  - type
+                  type: object
+                type: array
+              observedGeneration:
+                description: ObservedGeneration is the .metadata.generation the conditions
+                  were computed from.
+                format: int64
+                type: integer
+            type: object
+        type: object
+    selectableFields:
+    - jsonPath: .spec.type
+    served: true
+    storage: true
+    subresources:
+      status: {}
diff --git a/packages/system/migration-controller/definitions/forklift.cozystack.io_vmimporttasks.yaml b/packages/system/migration-controller/definitions/forklift.cozystack.io_vmimporttasks.yaml
new file mode 100644
index 0000000000..add40351e4
--- /dev/null
+++ b/packages/system/migration-controller/definitions/forklift.cozystack.io_vmimporttasks.yaml
@@ -0,0 +1,311 @@
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.16.4
+    options.cozystack.io/source.sourceRef.name: vmimportsource
+    options.cozystack.io/source.storageClass: storageclass
+    options.cozystack.io/source.vms.id: vmimportvm.{sourceRef.name}
+    options.cozystack.io/source.vms.instanceProfile: instanceprofile
+    options.cozystack.io/source.vms.instanceType: instancetype
+  name: vmimporttasks.forklift.cozystack.io
+spec:
+  group: forklift.cozystack.io
+  names:
+    kind: VMImportTask
+    listKind: VMImportTaskList
+    plural: vmimporttasks
+    shortNames:
+    - vmit
+    - vmimporttask
+    singular: vmimporttask
+  scope: Namespaced
+  versions:
+  - additionalPrinterColumns:
+    - jsonPath: .spec.sourceRef.name
+      name: Source
+      type: string
+    - jsonPath: .status.phase
+      name: Phase
+      type: string
+    - jsonPath: .metadata.creationTimestamp
+      name: Age
+      type: date
+    - jsonPath: .status.message
+      name: Message
+      priority: 1
+      type: string
+    name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        description: |-
+          VMImportTask runs a one-shot import of VMs from a registered source. It
+          produces VMDisks and VMInstances that outlive it: deleting the task removes
+          the migration machinery and leaves everything already imported in place.
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: VMImportTaskSpec describes a one-shot import of one or more
+              VMs.
+            properties:
+              sourceRef:
+                description: |-
+                  SourceRef names the VMImportSource to import from. It must live in this
+                  task's own namespace.
+                properties:
+                  name:
+                    default: ""
+                    description: |-
+                      Name of the referent.
+                      This field is effectively required, but due to backwards compatibility is
+                      allowed to be empty. Instances of this type with an empty value here are
+                      almost certainly wrong.
+                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                    type: string
+                type: object
+                x-kubernetes-map-type: atomic
+                x-kubernetes-validations:
+                - message: sourceRef is immutable
+                  rule: self == oldSelf
+              storageClass:
+                description: |-
+                  StorageClass is the StorageClass every disk of this task is imported
+                  onto. It must bind Immediate: a WaitForFirstConsumer class deadlocks the
+                  import, because nothing consumes the claim while it is populated. Empty
+                  uses the cluster default, which is validated the same way.
+                type: string
+                x-kubernetes-validations:
+                - message: storageClass is immutable
+                  rule: self == oldSelf
+              vms:
+                description: |-
+                  VMs lists the source VMs to import. Each produces one VMInstance over
+                  one VMDisk per source disk.
+                items:
+                  description: VMImportRequest names one source VM to import and what
+                    to call the result.
+                  properties:
+                    id:
+                      description: |-
+                        ID is the VM's managed-object reference in the source inventory
+                        (e.g. `vm-1234` on vSphere). It appears in the vSphere client's URL, and
+                        `govc ls -i` prints it.
+                      minLength: 1
+                      type: string
+                    instanceProfile:
+                      description: |-
+                        InstanceProfile is the Cozystack instance profile (guest preference set)
+                        for the created VMInstance.
+                      type: string
+                    instanceType:
+                      description: |-
+                        InstanceType is the Cozystack instance type for the created VMInstance.
+                        When omitted the controller sets explicit resources matching the source
+                        VM's CPU and memory, so an import never silently resizes a guest.
+                      type: string
+                    name:
+                      description: |-
+                        Name is the name of the VMInstance to create. Its disks are named after
+                        it. Must be a valid Kubernetes object name; defaults to the source VM's
+                        name normalized to one when omitted.
+
+                        Capped at 46 rather than the usual 63 because the name is not used alone:
+                        each disk becomes `vm-disk-<name>-disk-<i>`, and that whole string is
+                        stamped as the DataVolume's `app.kubernetes.io/instance` label value,
+                        which Kubernetes limits to 63 characters. The fixed parts cost 14
+                        (`vm-disk-` plus `-disk-`), leaving 49 to share between the name and the
+                        disk index; 46 keeps a VM with up to a thousand disks inside the limit.
+                        Overflowing it does not fail cleanly — the DataVolume is simply rejected
+                        after the transfer has already run.
+                      maxLength: 46
+                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                      type: string
+                  required:
+                  - id
+                  type: object
+                minItems: 1
+                type: array
+                x-kubernetes-validations:
+                - message: vms is immutable
+                  rule: self == oldSelf
+            required:
+            - sourceRef
+            - vms
+            type: object
+          status:
+            description: VMImportTaskStatus represents the observed state of a VMImportTask.
+            properties:
+              completedAt:
+                description: CompletedAt is the time the task reached a terminal phase.
+                format: date-time
+                type: string
+              conditions:
+                description: Conditions represents the latest available observations
+                  of the task's state.
+                items:
+                  description: Condition contains details for one aspect of the current
+                    state of this API Resource.
+                  properties:
+                    lastTransitionTime:
+                      description: |-
+                        lastTransitionTime is the last time the condition transitioned from one status to another.
+                        This should be when the underlying condition changed.  If that is not known, then using the time when the API field changed is acceptable.
+                      format: date-time
+                      type: string
+                    message:
+                      description: |-
+                        message is a human readable message indicating details about the transition.
+                        This may be an empty string.
+                      maxLength: 32768
+                      type: string
+                    observedGeneration:
+                      description: |-
+                        observedGeneration represents the .metadata.generation that the condition was set based upon.
+                        For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date
+                        with respect to the current state of the instance.
+                      format: int64
+                      minimum: 0
+                      type: integer
+                    reason:
+                      description: |-
+                        reason contains a programmatic identifier indicating the reason for the condition's last transition.
+                        Producers of specific condition types may define expected values and meanings for this field,
+                        and whether the values are considered a guaranteed API.
+                        The value should be a CamelCase string.
+                        This field may not be empty.
+                      maxLength: 1024
+                      minLength: 1
+                      pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
+                      type: string
+                    status:
+                      description: status of the condition, one of True, False, Unknown.
+                      enum:
+                      - "True"
+                      - "False"
+                      - Unknown
+                      type: string
+                    type:
+                      description: type of condition in CamelCase or in foo.example.com/CamelCase.
+                      maxLength: 316
+                      pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
+                      type: string
+                  required:
+                  - lastTransitionTime
+                  - message
+                  - reason
+                  - status
+                  - type
+                  type: object
+                type: array
+              message:
+                description: Message is a human-readable message about the current
+                  phase.
+                type: string
+              observedGeneration:
+                description: ObservedGeneration is the .metadata.generation the status
+                  was computed from.
+                format: int64
+                type: integer
+              phase:
+                description: Phase is a high-level summary of the task's state.
+                enum:
+                - ""
+                - Pending
+                - Validating
+                - Transferring
+                - Creating
+                - Succeeded
+                - Failed
+                type: string
+              startedAt:
+                description: StartedAt is the time the task began validating.
+                format: date-time
+                type: string
+              vms:
+                description: VMs reports per-VM progress, one entry per spec.vms entry.
+                items:
+                  description: VMImportStatus reports the progress of one VM within
+                    a task.
+                  properties:
+                    disks:
+                      description: Disks lists the names of the created VMDisks, in
+                        the source VM's disk order.
+                      items:
+                        type: string
+                      type: array
+                    id:
+                      description: ID is the source VM's managed-object reference,
+                        matching the request.
+                      type: string
+                    message:
+                      description: Message explains this VM's current phase when it
+                        needs explaining.
+                      type: string
+                    name:
+                      description: Name is the name of the VMInstance being created
+                        for this VM.
+                      type: string
+                    phase:
+                      description: Phase is this VM's own lifecycle phase; a task's
+                        phase aggregates these.
+                      enum:
+                      - ""
+                      - Pending
+                      - Validating
+                      - Transferring
+                      - Creating
+                      - Succeeded
+                      - Failed
+                      type: string
+                    progress:
+                      description: Progress is the percentage of disk data transferred,
+                        0-100.
+                      format: int32
+                      maximum: 100
+                      minimum: 0
+                      type: integer
+                    reason:
+                      description: |-
+                        Reason is a machine-readable cause for this VM's phase, from the same set
+                        the task's conditions use. Message says the same thing to a person; a
+                        caller deciding whether a failure is worth retrying should read this.
+                      type: string
+                    vmInstance:
+                      description: VMInstance is the name of the created VMInstance,
+                        once it exists.
+                      type: string
+                  required:
+                  - id
+                  type: object
+                type: array
+            type: object
+        type: object
+        x-kubernetes-validations:
+        - message: 'metadata.name must be at most 63 characters: the task''s name
+            is carried as a label value on the Forklift objects it owns, and Kubernetes
+            limits label values to 63'
+          rule: self.metadata.name.size() <= 63
+    selectableFields:
+    - jsonPath: .spec.sourceRef.name
+    - jsonPath: .status.phase
+    served: true
+    storage: true
+    subresources:
+      status: {}
diff --git a/packages/system/migration-controller/images/migration-controller/Dockerfile b/packages/system/migration-controller/images/migration-controller/Dockerfile
new file mode 100644
index 0000000000..67a78a4f2e
--- /dev/null
+++ b/packages/system/migration-controller/images/migration-controller/Dockerfile
@@ -0,0 +1,30 @@
+# Pinned to the build host's own architecture, not the target's: the Go
+# toolchain cross-compiles perfectly well, and running it under QEMU emulation
+# instead makes its garbage collector die with "found bad pointer in Go heap"
+# on an arm64 host building for amd64. The output binary is identical either
+# way, and a native build is far faster.
+FROM --platform=$BUILDPLATFORM golang:1.27-alpine@sha256:8a5910f31396cd4d89662f56c68b3ae31d374308270a1c3bd96672ee5ed43414 AS builder
+ARG GOPROXY
+
+ARG TARGETOS
+ARG TARGETARCH
+
+WORKDIR /workspace
+
+COPY go.mod go.sum ./
+RUN for attempt in 1 2 3; do GOOS=$TARGETOS GOARCH=$TARGETARCH go mod download && break; [ "$attempt" = 3 ] && exit 1; sleep $((attempt * 10)); done
+
+COPY api api/
+COPY pkg pkg/
+COPY cmd cmd/
+COPY internal internal/
+
+RUN GOOS=$TARGETOS GOARCH=$TARGETARCH CGO_ENABLED=0 go build -ldflags="-extldflags=-static" -o /migration-controller cmd/migration-controller/main.go
+
+FROM scratch
+
+COPY --from=builder /migration-controller /migration-controller
+COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
+
+USER 65532:65532
+ENTRYPOINT ["/migration-controller"]
diff --git a/packages/system/migration-controller/templates/crds.yaml b/packages/system/migration-controller/templates/crds.yaml
new file mode 100644
index 0000000000..32b438c1b8
--- /dev/null
+++ b/packages/system/migration-controller/templates/crds.yaml
@@ -0,0 +1,4 @@
+{{- range $path, $_ := .Files.Glob "definitions/*.yaml" }}
+---
+{{ $.Files.Get $path }}
+{{- end }}
diff --git a/packages/system/migration-controller/templates/deployment.yaml b/packages/system/migration-controller/templates/deployment.yaml
new file mode 100644
index 0000000000..31f0a0ec7d
--- /dev/null
+++ b/packages/system/migration-controller/templates/deployment.yaml
@@ -0,0 +1,85 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: migration-controller
+  labels:
+    app: migration-controller
+spec:
+  replicas: {{ .Values.migrationController.replicas }}
+  selector:
+    matchLabels:
+      app: migration-controller
+  template:
+    metadata:
+      labels:
+        app: migration-controller
+    spec:
+      tolerations:
+      - key: "node-role.kubernetes.io/control-plane"
+        operator: "Exists"
+        effect: "NoSchedule"
+      - key: "node-role.kubernetes.io/master"
+        operator: "Exists"
+        effect: "NoSchedule"
+      serviceAccountName: migration-controller
+      {{- /*
+        A controller whose whole purpose is to keep an import inside the
+        restricted Pod Security Standard has no business violating it itself.
+        The image is a static binary in a scratch layer, so there is nothing to
+        give up here: without these fields the apiserver admits the pod with a
+        restricted-violation warning, which is both a bad example and noise in
+        every operator's audit log.
+      */}}
+      securityContext:
+        runAsNonRoot: true
+        runAsUser: 65532
+        runAsGroup: 65532
+        seccompProfile:
+          type: RuntimeDefault
+      containers:
+      - name: migration-controller
+        image: "{{ .Values.migrationController.image }}"
+        securityContext:
+          allowPrivilegeEscalation: false
+          readOnlyRootFilesystem: true
+          capabilities:
+            drop: ["ALL"]
+        args:
+        - --leader-elect
+        {{- if .Values.migrationController.metrics.enabled }}
+        - --metrics-bind-address={{ .Values.migrationController.metrics.bindAddress }}
+        {{- end }}
+        {{- if .Values.migrationController.debug }}
+        - --zap-log-level=debug
+        {{- else }}
+        - --zap-log-level=info
+        {{- end }}
+        env:
+        {{- /*
+          The VDDK image reference travels as configuration, not as a tenant
+          value, and only a reference travels — never a credential. Empty is a
+          valid, documented state: the vSphere path then reports itself
+          unavailable on each VMImportSource instead of failing mid-transfer.
+        */}}
+        - name: MIGRATION_VDDK_IMAGE
+          value: {{ .Values.vddkImage | default "" | quote }}
+        ports:
+        - name: metrics
+          containerPort: {{ splitList ":" .Values.migrationController.metrics.bindAddress | mustLast }}
+        - name: health
+          containerPort: 8081
+        readinessProbe:
+          httpGet:
+            path: /readyz
+            port: health
+          initialDelaySeconds: 5
+          periodSeconds: 10
+        livenessProbe:
+          httpGet:
+            path: /healthz
+            port: health
+          initialDelaySeconds: 15
+          periodSeconds: 20
+        {{- with .Values.migrationController.resources }}
+        resources: {{- . | toYaml | nindent 10 }}
+        {{- end }}
diff --git a/packages/system/migration-controller/templates/rbac-bind.yaml b/packages/system/migration-controller/templates/rbac-bind.yaml
new file mode 100644
index 0000000000..6cce4f016d
--- /dev/null
+++ b/packages/system/migration-controller/templates/rbac-bind.yaml
@@ -0,0 +1,12 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: forklift.cozystack.io:controller
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: forklift.cozystack.io:controller
+subjects:
+- kind: ServiceAccount
+  name: migration-controller
+  namespace: {{ .Release.Namespace }}
diff --git a/packages/system/migration-controller/templates/rbac.yaml b/packages/system/migration-controller/templates/rbac.yaml
new file mode 100644
index 0000000000..f9ec9e9e89
--- /dev/null
+++ b/packages/system/migration-controller/templates/rbac.yaml
@@ -0,0 +1,81 @@
+kind: ClusterRole
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: forklift.cozystack.io:controller
+rules:
+# The API this controller owns. `update` covers finalizers and nothing else:
+# a task is held open while the engine's transfer volumes are removed, and
+# releasing it means writing metadata.finalizers, which is a write to the object
+# rather than to its status. Spec fields are never written — every one of them
+# is immutable on admission anyway.
+- apiGroups: ["forklift.cozystack.io"]
+  resources: ["vmimportsources", "vmimporttasks"]
+  verbs: ["get", "list", "watch", "update"]
+- apiGroups: ["forklift.cozystack.io"]
+  resources: ["vmimportsources/status", "vmimporttasks/status"]
+  verbs: ["get", "update", "patch"]
+# Forklift is the migration engine. The controller renders the whole object
+# graph a transfer needs and reads back the verdicts Forklift publishes on it,
+# which is why it needs no provider client of its own.
+- apiGroups: ["forklift.konveyor.io"]
+  resources: ["providers", "plans", "migrations", "networkmaps", "storagemaps", "hosts"]
+  verbs: ["get", "list", "watch", "create", "update", "patch", "delete"]
+# The credentials Secret projected for Forklift to consume, plus the CA of
+# Forklift's inventory service, read by name from Forklift's own namespace.
+# Deliberately no list or watch: every Secret this controller touches is read by
+# name, so a cluster-wide Secret informer is neither needed nor granted.
+- apiGroups: [""]
+  resources: ["secrets"]
+  verbs: ["get", "create", "update", "patch", "delete"]
+# The machine list a Source publishes for the console's VM picker. It is written
+# to a ConfigMap owned by the Source rather than onto its status, so refreshing
+# thousands of entries does not wake everything watching the Source.
+- apiGroups: [""]
+  resources: ["configmaps"]
+  verbs: ["get", "list", "watch", "create", "update", "patch"]
+# The copy-free handoff: a transferred volume is retained and re-bound into the
+# claim a VMDisk expects. Volumes are cluster-scoped, which is why this role is
+# cluster-wide rather than namespaced.
+- apiGroups: [""]
+  resources: ["persistentvolumes"]
+  verbs: ["get", "list", "watch", "update", "patch"]
+- apiGroups: [""]
+  resources: ["persistentvolumeclaims"]
+  verbs: ["get", "list", "watch", "create", "update", "patch", "delete"]
+# Storage classes are read to reject a binding mode that would deadlock an
+# import before anything is created, and to give each imported volume its
+# class's reclaim policy back once the handoff is over.
+- apiGroups: ["storage.k8s.io"]
+  resources: ["storageclasses"]
+  verbs: ["get", "list", "watch"]
+# CDI DataVolumes: created for the VMDisk release to adopt, and the
+# transferring one is removed before its claim is re-pointed.
+- apiGroups: ["cdi.kubevirt.io"]
+  resources: ["datavolumes"]
+  verbs: ["get", "list", "watch", "create", "update", "patch", "delete"]
+# The KubeVirt VirtualMachine Forklift builds is read for the source VM's shape
+# and then discarded. It is never started.
+#
+# `create` is here even though this controller never creates a VirtualMachine
+# itself. Forklift's Plan admission webhook runs a SubjectAccessReview against
+# whoever creates the Plan and refuses it unless that identity could create
+# VirtualMachines in the Plan's target namespace — Forklift is going to create
+# one on their behalf, and it declines to act with more authority than the
+# requester has. Without this verb every Plan is denied at admission with
+# "Action is forbidden", and the import never starts.
+- apiGroups: ["kubevirt.io"]
+  resources: ["virtualmachines"]
+  verbs: ["get", "list", "watch", "create", "delete"]
+# The imported objects. Create and read only: an import produces tenant
+# objects, and nothing here may edit or delete a disk or instance a tenant
+# already owns.
+- apiGroups: ["apps.cozystack.io"]
+  resources: ["vmdisks", "vminstances"]
+  verbs: ["get", "list", "watch", "create"]
+# Leader election (--leader-elect) and events.
+- apiGroups: ["coordination.k8s.io"]
+  resources: ["leases"]
+  verbs: ["get", "list", "watch", "create", "update", "patch"]
+- apiGroups: [""]
+  resources: ["events"]
+  verbs: ["create", "patch"]
diff --git a/packages/system/migration-controller/templates/sa.yaml b/packages/system/migration-controller/templates/sa.yaml
new file mode 100644
index 0000000000..cba986a691
--- /dev/null
+++ b/packages/system/migration-controller/templates/sa.yaml
@@ -0,0 +1,4 @@
+kind: ServiceAccount
+apiVersion: v1
+metadata:
+  name: migration-controller
diff --git a/packages/system/migration-controller/templates/tenant-clusterroles.yaml b/packages/system/migration-controller/templates/tenant-clusterroles.yaml
new file mode 100644
index 0000000000..ba28d635cb
--- /dev/null
+++ b/packages/system/migration-controller/templates/tenant-clusterroles.yaml
@@ -0,0 +1,55 @@
+---
+# == migration view cluster role ==
+# Aggregated into cozy-tenant-view (and consequently use, admin, super-admin)
+# Provides read-only access to the migration API.
+#
+# Tenant access to a new API group is shipped by the package that owns the
+# group, not by a change to platform policy: cozystack-basics defines the
+# cozy:tenant:* roles as aggregation roles, so a ClusterRole carrying the label
+# below is folded in. This is the same mechanism backup-controller uses for
+# backups.cozystack.io.
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: cozy:migration:view
+  labels:
+    rbac.cozystack.io/aggregate-to-tenant-view: "true"
+rules:
+- apiGroups: ["forklift.cozystack.io"]
+  resources:
+  - vmimportsources
+  - vmimporttasks
+  verbs:
+  - get
+  - list
+  - watch
+---
+# == migration admin cluster role ==
+# Aggregated into cozy-tenant-admin (and consequently super-admin)
+# Provides write access to both kinds.
+#
+# Unlike the backup API there is no admin-only class object to withhold here:
+# the one platform-scoped setting is the VDDK image, which is platform
+# configuration on the controller rather than a CRD a tenant could see. A
+# tenant registers their own connection to their own vCenter and runs their own
+# imports, which is the whole point of the API.
+#
+# Note what is NOT granted anywhere: forklift.konveyor.io. The Forklift objects
+# a task creates are internal machinery, so a tenant can neither read nor
+# tamper with them — they only ever see the migration API's own status.
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: cozy:migration:admin
+  labels:
+    rbac.cozystack.io/aggregate-to-tenant-admin: "true"
+rules:
+- apiGroups: ["forklift.cozystack.io"]
+  resources:
+  - vmimportsources
+  - vmimporttasks
+  verbs:
+  - create
+  - update
+  - patch
+  - delete
diff --git a/packages/system/migration-controller/tests/migration_controller_test.yaml b/packages/system/migration-controller/tests/migration_controller_test.yaml
new file mode 100644
index 0000000000..1c35e49770
--- /dev/null
+++ b/packages/system/migration-controller/tests/migration_controller_test.yaml
@@ -0,0 +1,153 @@
+suite: migration-controller packaging
+release:
+  name: migration-controller
+  namespace: cozy-migration-controller
+tests:
+  # The VDDK reference is the one piece of platform configuration this
+  # controller takes. It must arrive as an environment variable rather than a
+  # flag default baked into the image, so an operator can set it without a
+  # rebuild — and it must be present even when empty, because empty is a
+  # meaningful, documented state (the vSphere path reports itself unavailable).
+  - it: passes the operator-configured VDDK image to the controller
+    templates:
+      - templates/deployment.yaml
+    set:
+      vddkImage: registry.example.com/vddk:8.0.3
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: MIGRATION_VDDK_IMAGE
+            value: registry.example.com/vddk:8.0.3
+
+  - it: still declares the VDDK variable when the platform has not set one
+    templates:
+      - templates/deployment.yaml
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: MIGRATION_VDDK_IMAGE
+            value: ""
+
+  - it: runs with leader election so a second replica cannot race a handoff
+    templates:
+      - templates/deployment.yaml
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: --leader-elect
+
+  # Both CRDs must ship with the controller that reconciles them: a cluster
+  # that installs one without the other has an API nothing serves, or a
+  # controller watching a kind that does not exist.
+  - it: ships both custom resource definitions
+    templates:
+      - templates/crds.yaml
+    asserts:
+      - containsDocument:
+          apiVersion: apiextensions.k8s.io/v1
+          kind: CustomResourceDefinition
+          name: vmimportsources.forklift.cozystack.io
+          any: true
+      - containsDocument:
+          apiVersion: apiextensions.k8s.io/v1
+          kind: CustomResourceDefinition
+          name: vmimporttasks.forklift.cozystack.io
+          any: true
+
+  # Tenant access to a new API group travels with the package that owns the
+  # group. Losing these labels does not break anything visibly — it silently
+  # makes the whole feature invisible to every tenant, which is exactly the
+  # kind of regression worth a test.
+  - it: aggregates read access into the tenant view role
+    templates:
+      - templates/tenant-clusterroles.yaml
+    documentSelector:
+      path: metadata.name
+      value: cozy:migration:view
+    asserts:
+      - equal:
+          path: metadata.labels["rbac.cozystack.io/aggregate-to-tenant-view"]
+          value: "true"
+      - contains:
+          path: rules[0].resources
+          content: vmimportsources
+      - contains:
+          path: rules[0].resources
+          content: vmimporttasks
+      - contains:
+          path: rules[0].verbs
+          content: watch
+
+  - it: aggregates write access into the tenant admin role
+    templates:
+      - templates/tenant-clusterroles.yaml
+    documentSelector:
+      path: metadata.name
+      value: cozy:migration:admin
+    asserts:
+      - equal:
+          path: metadata.labels["rbac.cozystack.io/aggregate-to-tenant-admin"]
+          value: "true"
+      - contains:
+          path: rules[0].verbs
+          content: create
+      - contains:
+          path: rules[0].verbs
+          content: delete
+
+  # Tenants must never reach the Forklift objects a task builds: those are
+  # internal machinery, and a tenant editing a Plan mid-transfer is a support
+  # case nobody wants. They see the migration API's status and nothing else.
+  - it: grants tenants no access to the Forklift API
+    templates:
+      - templates/tenant-clusterroles.yaml
+    asserts:
+      - notContains:
+          path: rules[0].apiGroups
+          content: forklift.konveyor.io
+        documentSelector:
+          path: metadata.name
+          value: cozy:migration:view
+      - notContains:
+          path: rules[0].apiGroups
+          content: forklift.konveyor.io
+        documentSelector:
+          path: metadata.name
+          value: cozy:migration:admin
+
+  # The imported disk and instance are the point of the whole operation and
+  # belong to the tenant from the moment they exist. The controller creates
+  # them and must not be able to modify or remove them afterwards — that is
+  # what makes deleting a finished task safe.
+  - it: lets the controller create imported objects but never delete them
+    templates:
+      - templates/rbac.yaml
+    asserts:
+      - notContains:
+          path: rules
+          content:
+            apiGroups: ["apps.cozystack.io"]
+            resources: ["vmdisks", "vminstances"]
+            verbs: ["get", "list", "watch", "create", "update", "patch", "delete"]
+      - contains:
+          path: rules
+          content:
+            apiGroups: ["apps.cozystack.io"]
+            resources: ["vmdisks", "vminstances"]
+            verbs: ["get", "list", "watch", "create"]
+
+  # No list or watch on Secrets: the controller reads the credentials Secrets it
+  # owns by name, and a cluster-wide Secret informer would both need RBAC this
+  # package refuses to grant and hold every tenant's Secret in memory.
+  - it: never grants list or watch on Secrets
+    templates:
+      - templates/rbac.yaml
+    asserts:
+      - contains:
+          path: rules
+          content:
+            apiGroups: [""]
+            resources: ["secrets"]
+            verbs: ["get", "create", "update", "patch", "delete"]
diff --git a/packages/system/migration-controller/values.yaml b/packages/system/migration-controller/values.yaml
new file mode 100644
index 0000000000..7317bfc036
--- /dev/null
+++ b/packages/system/migration-controller/values.yaml
@@ -0,0 +1,24 @@
+migrationController:
+  image: "ghcr.io/cozystack/cozystack/migration-controller:latest"
+  replicas: 1
+  debug: false
+  metrics:
+    enabled: true
+    bindAddress: ":8443"
+  resources:
+    requests:
+      cpu: 10m
+      memory: 64Mi
+    limits:
+      cpu: 500m
+      memory: 256Mi
+
+## The VMware Virtual Disk Development Kit image, delivered from the platform.
+## Never a tenant value: naming an image the cluster will run is not a tenant's
+## decision, and this one is built from a proprietary SDK that Cozystack can
+## neither ship nor mirror. An operator holding a VDDK licence builds it, pushes
+## it somewhere the cluster can pull from, and sets `vmImport.vddkImage` in the
+## platform values, which the iaas bundle forwards into this chart.
+## Empty is the normal state and means the vSphere import path is unavailable
+## rather than broken: a vSphere VMImportSource reports it on its own status.
+vddkImage: ""
diff --git a/packages/system/mongodb-operator/charts/psmdb-operator/Chart.yaml b/packages/system/mongodb-operator/charts/psmdb-operator/Chart.yaml
index 4c268c1357..ff0e33169e 100644
--- a/packages/system/mongodb-operator/charts/psmdb-operator/Chart.yaml
+++ b/packages/system/mongodb-operator/charts/psmdb-operator/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 1.21.1
+appVersion: 1.22.0
 description: A Helm chart for deploying the Percona Operator for MongoDB
 home: https://docs.percona.com/percona-operator-for-mongodb/
 maintainers:
@@ -9,5 +9,7 @@ maintainers:
   name: jvpasinatto
 - email: eleonora.zinchenko@percona.com
   name: eleo007
+- email: valmira.nogueira@percona.com
+  name: valmiranogueira
 name: psmdb-operator
-version: 1.21.2
+version: 1.22.0
diff --git a/packages/system/mongodb-operator/charts/psmdb-operator/README.md b/packages/system/mongodb-operator/charts/psmdb-operator/README.md
index 18292d1741..9502d3b6bf 100644
--- a/packages/system/mongodb-operator/charts/psmdb-operator/README.md
+++ b/packages/system/mongodb-operator/charts/psmdb-operator/README.md
@@ -6,7 +6,7 @@ Useful links:
 - [Operator Documentation](https://www.percona.com/doc/kubernetes-operator-for-psmongodb/index.html)
 
 ## Pre-requisites
-* Kubernetes 1.30+
+* Kubernetes 1.32+
 * Helm v3
 
 # Installation
@@ -15,22 +15,75 @@ This chart will deploy the Operator Pod for the further Percona Server for Mongo
 
 ## Installing the chart
 
-To install the chart with the `psmdb` release name using a dedicated namespace (recommended):
+There are two ways to insall operator: using separate chart with operator Custom Resource Defenitions or using CRDs from the `crds/` directory.
+
+### Using separate chart
+
+Install CRD chart:
 
 ```sh
 helm repo add percona https://percona.github.io/percona-helm-charts/
-helm install my-operator percona/psmdb-operator --version 1.21.2 --namespace my-namespace
+helm install psmdb-operator-crds percona/psmdb-operator-crds --namespace psmdb --create-namespace
+```
+> **Note:** Deleting CRD chart will trigger deletion of all the custom resources created using the CRDs thus deleting all clusters.
+>  Uninstalling percona/psmdb-operator-crds chart should be approached with caution.
+
+
+Install operator chart:
+```sh
+helm install my-operator percona/psmdb-operator --version 1.22.0 --namespace my-namespace
+```
+
+### Using the `crds/` directory.
+
+```sh
+helm repo add percona https://percona.github.io/percona-helm-charts/
+helm install my-operator percona/psmdb-operator --version 1.22.0 --namespace my-namespace
+```
+
+## Upgrading CRDs
+
+By default, Helm installs CRDs from the `crds/` directory only during initial installation and does not upgrade them. To upgrade CRDs, you have two options:
+
+### Option 1: Use the Separate CRD Chart
+
+Install or upgrade CRDs using the dedicated CRD chart:
+
+```sh
+helm repo update
+helm upgrade --install psmdb-operator-crds percona/psmdb-operator-crds --namespace my-namespace
 ```
 
+> **Note:** If you're using Helm 3.17.0 or later, use `--take-ownership` to take over CRDs that were previously installed via the `crds/` directory:
+>
+> ```sh
+> helm upgrade --install psmdb-operator-crds percona/psmdb-operator-crds --namespace my-namespace --take-ownership
+> ```
+
+For Helm versions older than 3.17.0, manually add ownership labels and annotations before running the upgrade:
+
+```sh
+CRDS=(perconaservermongodbs.psmdb.percona.com perconaservermongodbbackups.psmdb.percona.com perconaservermongodbrestores.psmdb.percona.com)
+kubectl label crds "${CRDS[@]}" app.kubernetes.io/managed-by=Helm --overwrite
+kubectl annotate crds "${CRDS[@]}" meta.helm.sh/release-name=psmdb-operator-crds --overwrite
+kubectl annotate crds "${CRDS[@]}" meta.helm.sh/release-namespace=my-namespace --overwrite
+```
+
+### Option 2: Use kubectl to upgrade the CRDs
+
+kubectl apply --server-side -f https://raw.githubusercontent.com/percona/percona-server-mongodb-operator/v1.22.0/deploy/crd.yaml -n my-namespace
+
+
 The chart can be customized using the following configurable parameters:
 
 | Parameter                    | Description                                                                                                  | Default                                   |
 | ---------------------------- | ------------------------------------------------------------------------------------------------------------ | ----------------------------------------- |
 | `image.repository`           | PSMDB Operator Container image name                                                                          | `percona/percona-server-mongodb-operator` |
-| `image.tag`                  | PSMDB Operator Container image tag                                                                           | `1.21.1`                                  |
-| `image.pullPolicy`           | PSMDB Operator Container pull policy                                                                         | `Always`                                  |
-| `image.pullSecrets`          | PSMDB Operator Pod pull secret                                                                               | `[]`                                      |
+| `image.tag`                  | PSMDB Operator Container image tag                                                                           | `1.22.0`                                  |
+| `image.pullPolicy`           | PSMDB Operator Container pull policy                                                                         | `IfNotPresent`                            |
+| `imagePullSecrets`           | PSMDB Operator Pod pull secret                                                                               | `[]`                                      |
 | `replicaCount`               | PSMDB Operator Pod quantity                                                                                  | `1`                                       |
+| `revisionHistoryLimit`       | Quantity of old ReplicaSets to retain for rollback purposes                                                  | ``                                        |
 | `tolerations`                | List of node taints to tolerate                                                                              | `[]`                                      |
 | `annotations`                | PSMDB Operator Deployment annotations                                                                        | `{}`                                      |
 | `podAnnotations`             | PSMDB Operator Pod annotations                                                                               | `{}`                                      |
@@ -38,7 +91,6 @@ The chart can be customized using the following configurable parameters:
 | `podLabels`                  | PSMDB Operator Pod labels                                                                                    | `{}`                                      |
 | `resources`                  | Resource requests and limits                                                                                 | `{}`                                      |
 | `nodeSelector`               | Labels for Pod assignment                                                                                    | `{}`                                      |
-| `podAnnotations`             | Annotations for pod                                                                                          | `{}`                                      |
 | `podSecurityContext`         | Pod Security Context                                                                                         | `{}`                                      |
 | `watchNamespace`             | Set when a different from default namespace is needed to watch (comma separated if multiple needed)          | `""`                                      |
 | `createNamespace`            | Set if you want to create watched namespaces with helm                                                       | `false`                                   |
diff --git a/packages/system/mongodb-operator/charts/psmdb-operator/crds/crd.yaml b/packages/system/mongodb-operator/charts/psmdb-operator/crds/crd.yaml
index 47d11591cc..64fc72478a 100644
--- a/packages/system/mongodb-operator/charts/psmdb-operator/crds/crd.yaml
+++ b/packages/system/mongodb-operator/charts/psmdb-operator/crds/crd.yaml
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/component: crd
     app.kubernetes.io/name: percona-server-mongodb
     app.kubernetes.io/part-of: percona-server-mongodb-operator
-    app.kubernetes.io/version: v1.21.1
+    app.kubernetes.io/version: v1.22.0
   name: perconaservermongodbbackups.psmdb.percona.com
 spec:
   group: psmdb.percona.com
@@ -72,7 +72,9 @@ spec:
               compressionType:
                 type: string
               startingDeadlineSeconds:
+                default: 120
                 format: int64
+                minimum: 1
                 type: integer
               storageName:
                 type: string
@@ -151,6 +153,50 @@ spec:
               latestRestorableTime:
                 format: date-time
                 type: string
+              minio:
+                properties:
+                  bucket:
+                    type: string
+                  caBundle:
+                    properties:
+                      key:
+                        type: string
+                      name:
+                        default: ""
+                        type: string
+                      optional:
+                        type: boolean
+                    required:
+                    - key
+                    type: object
+                    x-kubernetes-map-type: atomic
+                  credentialsSecret:
+                    type: string
+                  debugTrace:
+                    type: boolean
+                  endpointUrl:
+                    type: string
+                  forcePathStyle:
+                    type: boolean
+                  insecureSkipTLSVerify:
+                    type: boolean
+                  partSize:
+                    format: int64
+                    type: integer
+                  prefix:
+                    type: string
+                  region:
+                    type: string
+                  retryer:
+                    properties:
+                      numMaxRetries:
+                        type: integer
+                    required:
+                    - numMaxRetries
+                    type: object
+                  secure:
+                    type: boolean
+                type: object
               pbmName:
                 type: string
               pbmPod:
@@ -238,7 +284,7 @@ metadata:
     app.kubernetes.io/component: crd
     app.kubernetes.io/name: percona-server-mongodb
     app.kubernetes.io/part-of: percona-server-mongodb-operator
-    app.kubernetes.io/version: v1.21.1
+    app.kubernetes.io/version: v1.22.0
   name: perconaservermongodbrestores.psmdb.percona.com
 spec:
   group: psmdb.percona.com
@@ -345,6 +391,50 @@ spec:
                   latestRestorableTime:
                     format: date-time
                     type: string
+                  minio:
+                    properties:
+                      bucket:
+                        type: string
+                      caBundle:
+                        properties:
+                          key:
+                            type: string
+                          name:
+                            default: ""
+                            type: string
+                          optional:
+                            type: boolean
+                        required:
+                        - key
+                        type: object
+                        x-kubernetes-map-type: atomic
+                      credentialsSecret:
+                        type: string
+                      debugTrace:
+                        type: boolean
+                      endpointUrl:
+                        type: string
+                      forcePathStyle:
+                        type: boolean
+                      insecureSkipTLSVerify:
+                        type: boolean
+                      partSize:
+                        format: int64
+                        type: integer
+                      prefix:
+                        type: string
+                      region:
+                        type: string
+                      retryer:
+                        properties:
+                          numMaxRetries:
+                            type: integer
+                        required:
+                        - numMaxRetries
+                        type: object
+                      secure:
+                        type: boolean
+                    type: object
                   pbmName:
                     type: string
                   pbmPod:
@@ -433,8 +523,10 @@ spec:
                     ([01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9]$'))
                 - message: Date should not be used when 'latest' type is used
                   rule: self.type != 'latest' || !has(self.date)
-              replset:
-                type: string
+              replsetRemapping:
+                additionalProperties:
+                  type: string
+                type: object
               selective:
                 properties:
                   namespaces:
@@ -479,7 +571,7 @@ metadata:
     app.kubernetes.io/component: crd
     app.kubernetes.io/name: percona-server-mongodb
     app.kubernetes.io/part-of: percona-server-mongodb-operator
-    app.kubernetes.io/version: v1.21.1
+    app.kubernetes.io/version: v1.22.0
   name: perconaservermongodbs.psmdb.percona.com
 spec:
   group: psmdb.percona.com
@@ -958,6 +1050,16 @@ spec:
                     type: object
                   enabled:
                     type: boolean
+                  hookScript:
+                    properties:
+                      configMapRef:
+                        properties:
+                          name:
+                            type: string
+                        type: object
+                      script:
+                        type: string
+                    type: object
                   image:
                     type: string
                   labels:
@@ -1094,7 +1196,9 @@ spec:
                   serviceAccountName:
                     type: string
                   startingDeadlineSeconds:
+                    default: 120
                     format: int64
+                    minimum: 1
                     type: integer
                   storages:
                     additionalProperties:
@@ -1150,6 +1254,50 @@ spec:
                           type: object
                         main:
                           type: boolean
+                        minio:
+                          properties:
+                            bucket:
+                              type: string
+                            caBundle:
+                              properties:
+                                key:
+                                  type: string
+                                name:
+                                  default: ""
+                                  type: string
+                                optional:
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            credentialsSecret:
+                              type: string
+                            debugTrace:
+                              type: boolean
+                            endpointUrl:
+                              type: string
+                            forcePathStyle:
+                              type: boolean
+                            insecureSkipTLSVerify:
+                              type: boolean
+                            partSize:
+                              format: int64
+                              type: integer
+                            prefix:
+                              type: string
+                            region:
+                              type: string
+                            retryer:
+                              properties:
+                                numMaxRetries:
+                                  type: integer
+                              required:
+                              - numMaxRetries
+                              type: object
+                            secure:
+                              type: boolean
+                          type: object
                         s3:
                           properties:
                             bucket:
@@ -1458,10 +1606,133 @@ spec:
                     type: object
                   enabled:
                     type: boolean
+                  env:
+                    items:
+                      properties:
+                        name:
+                          type: string
+                        value:
+                          type: string
+                        valueFrom:
+                          properties:
+                            configMapKeyRef:
+                              properties:
+                                key:
+                                  type: string
+                                name:
+                                  default: ""
+                                  type: string
+                                optional:
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            fieldRef:
+                              properties:
+                                apiVersion:
+                                  type: string
+                                fieldPath:
+                                  type: string
+                              required:
+                              - fieldPath
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            fileKeyRef:
+                              properties:
+                                key:
+                                  type: string
+                                optional:
+                                  default: false
+                                  type: boolean
+                                path:
+                                  type: string
+                                volumeName:
+                                  type: string
+                              required:
+                              - key
+                              - path
+                              - volumeName
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            resourceFieldRef:
+                              properties:
+                                containerName:
+                                  type: string
+                                divisor:
+                                  anyOf:
+                                  - type: integer
+                                  - type: string
+                                  pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                  x-kubernetes-int-or-string: true
+                                resource:
+                                  type: string
+                              required:
+                              - resource
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            secretKeyRef:
+                              properties:
+                                key:
+                                  type: string
+                                name:
+                                  default: ""
+                                  type: string
+                                optional:
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                          type: object
+                      required:
+                      - name
+                      type: object
+                    type: array
+                  envFrom:
+                    items:
+                      properties:
+                        configMapRef:
+                          properties:
+                            name:
+                              default: ""
+                              type: string
+                            optional:
+                              type: boolean
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        prefix:
+                          type: string
+                        secretRef:
+                          properties:
+                            name:
+                              default: ""
+                              type: string
+                            optional:
+                              type: boolean
+                          type: object
+                          x-kubernetes-map-type: atomic
+                      type: object
+                    type: array
                   image:
                     type: string
                   imagePullPolicy:
                     type: string
+                  logrotate:
+                    properties:
+                      configuration:
+                        type: string
+                      extraConfig:
+                        properties:
+                          name:
+                            default: ""
+                            type: string
+                        type: object
+                        x-kubernetes-map-type: atomic
+                      schedule:
+                        default: 0 0 * * *
+                        type: string
+                    type: object
                   resources:
                     properties:
                       claims:
@@ -2534,6 +2805,16 @@ spec:
                           type: object
                         enabled:
                           type: boolean
+                        hookScript:
+                          properties:
+                            configMapRef:
+                              properties:
+                                name:
+                                  type: string
+                              type: object
+                            script:
+                              type: string
+                          type: object
                         labels:
                           additionalProperties:
                             type: string
@@ -3369,6 +3650,10 @@ spec:
                                               type: integer
                                             signerName:
                                               type: string
+                                            userAnnotations:
+                                              additionalProperties:
+                                                type: string
+                                              type: object
                                           required:
                                           - keyType
                                           - signerName
@@ -4438,6 +4723,114 @@ spec:
                               type: string
                           type: object
                       type: object
+                    env:
+                      items:
+                        properties:
+                          name:
+                            type: string
+                          value:
+                            type: string
+                          valueFrom:
+                            properties:
+                              configMapKeyRef:
+                                properties:
+                                  key:
+                                    type: string
+                                  name:
+                                    default: ""
+                                    type: string
+                                  optional:
+                                    type: boolean
+                                required:
+                                - key
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              fieldRef:
+                                properties:
+                                  apiVersion:
+                                    type: string
+                                  fieldPath:
+                                    type: string
+                                required:
+                                - fieldPath
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              fileKeyRef:
+                                properties:
+                                  key:
+                                    type: string
+                                  optional:
+                                    default: false
+                                    type: boolean
+                                  path:
+                                    type: string
+                                  volumeName:
+                                    type: string
+                                required:
+                                - key
+                                - path
+                                - volumeName
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              resourceFieldRef:
+                                properties:
+                                  containerName:
+                                    type: string
+                                  divisor:
+                                    anyOf:
+                                    - type: integer
+                                    - type: string
+                                    pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                    x-kubernetes-int-or-string: true
+                                  resource:
+                                    type: string
+                                required:
+                                - resource
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              secretKeyRef:
+                                properties:
+                                  key:
+                                    type: string
+                                  name:
+                                    default: ""
+                                    type: string
+                                  optional:
+                                    type: boolean
+                                required:
+                                - key
+                                type: object
+                                x-kubernetes-map-type: atomic
+                            type: object
+                        required:
+                        - name
+                        type: object
+                      type: array
+                    envFrom:
+                      items:
+                        properties:
+                          configMapRef:
+                            properties:
+                              name:
+                                default: ""
+                                type: string
+                              optional:
+                                type: boolean
+                            type: object
+                            x-kubernetes-map-type: atomic
+                          prefix:
+                            type: string
+                          secretRef:
+                            properties:
+                              name:
+                                default: ""
+                                type: string
+                              optional:
+                                type: boolean
+                            type: object
+                            x-kubernetes-map-type: atomic
+                        type: object
+                      type: array
                     expose:
                       properties:
                         annotations:
@@ -5026,6 +5419,16 @@ spec:
                           type: object
                         enabled:
                           type: boolean
+                        hookScript:
+                          properties:
+                            configMapRef:
+                              properties:
+                                name:
+                                  type: string
+                              type: object
+                            script:
+                              type: string
+                          type: object
                         labels:
                           additionalProperties:
                             type: string
@@ -6104,6 +6507,10 @@ spec:
                                               type: integer
                                             signerName:
                                               type: string
+                                            userAnnotations:
+                                              additionalProperties:
+                                                type: string
+                                              type: object
                                           required:
                                           - keyType
                                           - signerName
@@ -7216,6 +7623,16 @@ spec:
                       - enabled
                       - size
                       type: object
+                    hookScript:
+                      properties:
+                        configMapRef:
+                          properties:
+                            name:
+                              type: string
+                          type: object
+                        script:
+                          type: string
+                      type: object
                     hostAliases:
                       items:
                         properties:
@@ -7849,6 +8266,16 @@ spec:
                           type: object
                         enabled:
                           type: boolean
+                        hookScript:
+                          properties:
+                            configMapRef:
+                              properties:
+                                name:
+                                  type: string
+                              type: object
+                            script:
+                              type: string
+                          type: object
                         labels:
                           additionalProperties:
                             type: string
@@ -8927,6 +9354,10 @@ spec:
                                               type: integer
                                             signerName:
                                               type: string
+                                            userAnnotations:
+                                              additionalProperties:
+                                                type: string
+                                              type: object
                                           required:
                                           - keyType
                                           - signerName
@@ -11047,6 +11478,10 @@ spec:
                                           type: integer
                                         signerName:
                                           type: string
+                                        userAnnotations:
+                                          additionalProperties:
+                                            type: string
+                                          type: object
                                       required:
                                       - keyType
                                       - signerName
@@ -13199,6 +13634,16 @@ spec:
                             type: object
                           enabled:
                             type: boolean
+                          hookScript:
+                            properties:
+                              configMapRef:
+                                properties:
+                                  name:
+                                    type: string
+                                type: object
+                              script:
+                                type: string
+                            type: object
                           labels:
                             additionalProperties:
                               type: string
@@ -14034,6 +14479,10 @@ spec:
                                                 type: integer
                                               signerName:
                                                 type: string
+                                              userAnnotations:
+                                                additionalProperties:
+                                                  type: string
+                                                type: object
                                             required:
                                             - keyType
                                             - signerName
@@ -15103,6 +15552,114 @@ spec:
                                 type: string
                             type: object
                         type: object
+                      env:
+                        items:
+                          properties:
+                            name:
+                              type: string
+                            value:
+                              type: string
+                            valueFrom:
+                              properties:
+                                configMapKeyRef:
+                                  properties:
+                                    key:
+                                      type: string
+                                    name:
+                                      default: ""
+                                      type: string
+                                    optional:
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                fieldRef:
+                                  properties:
+                                    apiVersion:
+                                      type: string
+                                    fieldPath:
+                                      type: string
+                                  required:
+                                  - fieldPath
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                fileKeyRef:
+                                  properties:
+                                    key:
+                                      type: string
+                                    optional:
+                                      default: false
+                                      type: boolean
+                                    path:
+                                      type: string
+                                    volumeName:
+                                      type: string
+                                  required:
+                                  - key
+                                  - path
+                                  - volumeName
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                resourceFieldRef:
+                                  properties:
+                                    containerName:
+                                      type: string
+                                    divisor:
+                                      anyOf:
+                                      - type: integer
+                                      - type: string
+                                      pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                      x-kubernetes-int-or-string: true
+                                    resource:
+                                      type: string
+                                  required:
+                                  - resource
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                secretKeyRef:
+                                  properties:
+                                    key:
+                                      type: string
+                                    name:
+                                      default: ""
+                                      type: string
+                                    optional:
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                              type: object
+                          required:
+                          - name
+                          type: object
+                        type: array
+                      envFrom:
+                        items:
+                          properties:
+                            configMapRef:
+                              properties:
+                                name:
+                                  default: ""
+                                  type: string
+                                optional:
+                                  type: boolean
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            prefix:
+                              type: string
+                            secretRef:
+                              properties:
+                                name:
+                                  default: ""
+                                  type: string
+                                optional:
+                                  type: boolean
+                              type: object
+                              x-kubernetes-map-type: atomic
+                          type: object
+                        type: array
                       expose:
                         properties:
                           annotations:
@@ -15691,6 +16248,16 @@ spec:
                             type: object
                           enabled:
                             type: boolean
+                          hookScript:
+                            properties:
+                              configMapRef:
+                                properties:
+                                  name:
+                                    type: string
+                                type: object
+                              script:
+                                type: string
+                            type: object
                           labels:
                             additionalProperties:
                               type: string
@@ -16769,6 +17336,10 @@ spec:
                                                 type: integer
                                               signerName:
                                                 type: string
+                                              userAnnotations:
+                                                additionalProperties:
+                                                  type: string
+                                                type: object
                                             required:
                                             - keyType
                                             - signerName
@@ -17881,6 +18452,16 @@ spec:
                         - enabled
                         - size
                         type: object
+                      hookScript:
+                        properties:
+                          configMapRef:
+                            properties:
+                              name:
+                                type: string
+                            type: object
+                          script:
+                            type: string
+                        type: object
                       hostAliases:
                         items:
                           properties:
@@ -18514,6 +19095,16 @@ spec:
                             type: object
                           enabled:
                             type: boolean
+                          hookScript:
+                            properties:
+                              configMapRef:
+                                properties:
+                                  name:
+                                    type: string
+                                type: object
+                              script:
+                                type: string
+                            type: object
                           labels:
                             additionalProperties:
                               type: string
@@ -19592,6 +20183,10 @@ spec:
                                                 type: integer
                                               signerName:
                                                 type: string
+                                              userAnnotations:
+                                                additionalProperties:
+                                                  type: string
+                                                type: object
                                             required:
                                             - keyType
                                             - signerName
@@ -21712,6 +22307,10 @@ spec:
                                             type: integer
                                           signerName:
                                             type: string
+                                          userAnnotations:
+                                            additionalProperties:
+                                              type: string
+                                            type: object
                                         required:
                                         - keyType
                                         - signerName
@@ -23401,6 +24000,114 @@ spec:
                                 type: string
                             type: object
                         type: object
+                      env:
+                        items:
+                          properties:
+                            name:
+                              type: string
+                            value:
+                              type: string
+                            valueFrom:
+                              properties:
+                                configMapKeyRef:
+                                  properties:
+                                    key:
+                                      type: string
+                                    name:
+                                      default: ""
+                                      type: string
+                                    optional:
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                fieldRef:
+                                  properties:
+                                    apiVersion:
+                                      type: string
+                                    fieldPath:
+                                      type: string
+                                  required:
+                                  - fieldPath
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                fileKeyRef:
+                                  properties:
+                                    key:
+                                      type: string
+                                    optional:
+                                      default: false
+                                      type: boolean
+                                    path:
+                                      type: string
+                                    volumeName:
+                                      type: string
+                                  required:
+                                  - key
+                                  - path
+                                  - volumeName
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                resourceFieldRef:
+                                  properties:
+                                    containerName:
+                                      type: string
+                                    divisor:
+                                      anyOf:
+                                      - type: integer
+                                      - type: string
+                                      pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                      x-kubernetes-int-or-string: true
+                                    resource:
+                                      type: string
+                                  required:
+                                  - resource
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                secretKeyRef:
+                                  properties:
+                                    key:
+                                      type: string
+                                    name:
+                                      default: ""
+                                      type: string
+                                    optional:
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                              type: object
+                          required:
+                          - name
+                          type: object
+                        type: array
+                      envFrom:
+                        items:
+                          properties:
+                            configMapRef:
+                              properties:
+                                name:
+                                  default: ""
+                                  type: string
+                                optional:
+                                  type: boolean
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            prefix:
+                              type: string
+                            secretRef:
+                              properties:
+                                name:
+                                  default: ""
+                                  type: string
+                                optional:
+                                  type: boolean
+                              type: object
+                              x-kubernetes-map-type: atomic
+                          type: object
+                        type: array
                       expose:
                         properties:
                           annotations:
@@ -23439,6 +24146,16 @@ spec:
                           type:
                             type: string
                         type: object
+                      hookScript:
+                        properties:
+                          configMapRef:
+                            properties:
+                              name:
+                                type: string
+                            type: object
+                          script:
+                            type: string
+                        type: object
                       hostAliases:
                         items:
                           properties:
@@ -24542,6 +25259,10 @@ spec:
                                             type: integer
                                           signerName:
                                             type: string
+                                          userAnnotations:
+                                            additionalProperties:
+                                              type: string
+                                            type: object
                                         required:
                                         - keyType
                                         - signerName
@@ -25535,6 +26256,46 @@ spec:
                 required:
                 - enabled
                 type: object
+              storageScaling:
+                properties:
+                  autoscaling:
+                    properties:
+                      enabled:
+                        type: boolean
+                      growthStep:
+                        anyOf:
+                        - type: integer
+                        - type: string
+                        default: 2Gi
+                        pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                        x-kubernetes-int-or-string: true
+                      maxSize:
+                        anyOf:
+                        - type: integer
+                        - type: string
+                        pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                        x-kubernetes-int-or-string: true
+                      triggerThresholdPercent:
+                        default: 80
+                        maximum: 95
+                        minimum: 50
+                        type: integer
+                    type: object
+                  enableExternalAutoscaling:
+                    type: boolean
+                  enableVolumeScaling:
+                    type: boolean
+                type: object
+                x-kubernetes-validations:
+                - message: autoscaling cannot be enabled when enableVolumeScaling
+                    is disabled
+                  rule: '!has(self.autoscaling) || !has(self.autoscaling.enabled)
+                    || !self.autoscaling.enabled || self.enableVolumeScaling'
+                - message: autoscaling cannot be enabled when enableExternalAutoscaling
+                    is enabled
+                  rule: '!has(self.autoscaling) || !has(self.autoscaling.enabled)
+                    || !self.autoscaling.enabled || !has(self.enableExternalAutoscaling)
+                    || !self.enableExternalAutoscaling'
               tls:
                 properties:
                   allowInvalidCertificates:
@@ -25616,6 +26377,29 @@ spec:
                   - roles
                   type: object
                 type: array
+              vault:
+                properties:
+                  endpointURL:
+                    type: string
+                    x-kubernetes-validations:
+                    - message: endpointURL must be a valid URL
+                      rule: isURL(self)
+                  syncUsers:
+                    properties:
+                      keyPath:
+                        type: string
+                      mountPath:
+                        type: string
+                      role:
+                        type: string
+                      tokenSecret:
+                        type: string
+                    type: object
+                  tlsSecret:
+                    type: string
+                required:
+                - endpointURL
+                type: object
             required:
             - image
             type: object
@@ -25718,6 +26502,21 @@ spec:
                 type: integer
               state:
                 type: string
+              storageAutoscaling:
+                additionalProperties:
+                  properties:
+                    currentSize:
+                      type: string
+                    lastError:
+                      type: string
+                    lastResizeTime:
+                      format: date-time
+                      type: string
+                    resizeCount:
+                      format: int32
+                      type: integer
+                  type: object
+                type: object
             required:
             - ready
             - size
diff --git a/packages/system/mongodb-operator/charts/psmdb-operator/templates/NOTES.txt b/packages/system/mongodb-operator/charts/psmdb-operator/templates/NOTES.txt
index 9276ae0394..4b37d3bfd8 100644
--- a/packages/system/mongodb-operator/charts/psmdb-operator/templates/NOTES.txt
+++ b/packages/system/mongodb-operator/charts/psmdb-operator/templates/NOTES.txt
@@ -1,16 +1,16 @@
 1. Percona Operator for MongoDB is deployed.
   See if the operator Pod is running:
 
-    kubectl get pods -l app.kubernetes.io/name=psmdb-operator --namespace {{ .Release.Namespace }}
+    kubectl get pods -l app.kubernetes.io/name=psmdb-operator --namespace {{ include "psmdb-operator.namespace" . }}
 
   Check the operator logs if the Pod is not starting:
 
-    export POD=$(kubectl get pods -l app.kubernetes.io/name=psmdb-operator --namespace {{ .Release.Namespace }} --output name)
-    kubectl logs $POD --namespace={{ .Release.Namespace }}
+    export POD=$(kubectl get pods -l app.kubernetes.io/name=psmdb-operator --namespace {{ include "psmdb-operator.namespace" . }} --output name)
+    kubectl logs $POD --namespace={{ include "psmdb-operator.namespace" . }}
 
 2. Deploy the database cluster from psmdb-db chart:
 
-    helm install my-db percona/psmdb-db --namespace={{ .Release.Namespace }}
+    helm install my-db percona/psmdb-db --namespace={{ include "psmdb-operator.namespace" . }}
 
 {{- if .Release.IsUpgrade }}
   {{- $ctx := dict "upgradeCrd" false }}
diff --git a/packages/system/mongodb-operator/charts/psmdb-operator/templates/_helpers.tpl b/packages/system/mongodb-operator/charts/psmdb-operator/templates/_helpers.tpl
index 1bf81ed17d..19b9eaf1d8 100644
--- a/packages/system/mongodb-operator/charts/psmdb-operator/templates/_helpers.tpl
+++ b/packages/system/mongodb-operator/charts/psmdb-operator/templates/_helpers.tpl
@@ -24,6 +24,17 @@ If release name contains chart name it will be used as a full name.
 {{- end -}}
 {{- end -}}
 
+{{/*
+Create a default namespace.
+*/}}
+{{- define "psmdb-operator.namespace" -}}
+{{- if .Values.namespaceOverride }}
+{{- .Values.namespaceOverride }}
+{{- else }}
+{{- .Release.Namespace }}
+{{- end }}
+{{- end -}}
+
 {{/*
 Create chart name and version as used by the chart label.
 */}}
diff --git a/packages/system/mongodb-operator/charts/psmdb-operator/templates/deployment.yaml b/packages/system/mongodb-operator/charts/psmdb-operator/templates/deployment.yaml
index 14e2eb89d2..c7d89c605e 100644
--- a/packages/system/mongodb-operator/charts/psmdb-operator/templates/deployment.yaml
+++ b/packages/system/mongodb-operator/charts/psmdb-operator/templates/deployment.yaml
@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "psmdb-operator.fullname" . }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "psmdb-operator.namespace" . }}
   labels:
     {{- include "psmdb-operator.labels" . | nindent 4 }}
     {{- with .Values.labels }}
@@ -14,6 +14,9 @@ metadata:
   {{- end }}
 spec:
   replicas: {{ .Values.replicaCount }}
+  {{- with .Values.revisionHistoryLimit }}
+  revisionHistoryLimit: {{ . }}
+  {{- end }}
   selector:
     matchLabels:
       app.kubernetes.io/name: {{ include "psmdb-operator.name" . }}
@@ -67,7 +70,7 @@ spec:
               {{- if .Values.watchAllNamespaces }}
               value: ""
               {{- else }}
-              value: "{{ default .Release.Namespace .Values.watchNamespace }}"
+              value: "{{ default (include "psmdb-operator.namespace" .) .Values.watchNamespace }}"
               {{- end }}
             - name: POD_NAME
               valueFrom:
diff --git a/packages/system/mongodb-operator/charts/psmdb-operator/templates/role-binding.yaml b/packages/system/mongodb-operator/charts/psmdb-operator/templates/role-binding.yaml
index a815869d45..b76c361855 100644
--- a/packages/system/mongodb-operator/charts/psmdb-operator/templates/role-binding.yaml
+++ b/packages/system/mongodb-operator/charts/psmdb-operator/templates/role-binding.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ include "psmdb-operator.fullname" . }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "psmdb-operator.namespace" . }}
   {{- with .Values.serviceAccount.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
@@ -20,7 +20,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: service-account-{{ include "psmdb-operator.fullname" . }}
 {{- if not (or .Values.watchNamespace .Values.watchAllNamespaces) }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "psmdb-operator.namespace" . }}
 {{- end }}
   labels:
 {{ include "psmdb-operator.labels" . | indent 4 }}
@@ -28,7 +28,7 @@ subjects:
 - kind: ServiceAccount
   name: {{ include "psmdb-operator.fullname" . }}
   {{- if or .Values.watchNamespace .Values.watchAllNamespaces }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "psmdb-operator.namespace" . }}
   {{- end }}
 roleRef:
   {{- if or .Values.watchNamespace .Values.watchAllNamespaces }}
diff --git a/packages/system/mongodb-operator/charts/psmdb-operator/templates/role.yaml b/packages/system/mongodb-operator/charts/psmdb-operator/templates/role.yaml
index 4d65e6a7a7..682b4779cd 100644
--- a/packages/system/mongodb-operator/charts/psmdb-operator/templates/role.yaml
+++ b/packages/system/mongodb-operator/charts/psmdb-operator/templates/role.yaml
@@ -8,7 +8,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: {{ include "psmdb-operator.fullname" . }}
 {{- if not (or .Values.watchNamespace .Values.watchAllNamespaces) }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "psmdb-operator.namespace" . }}
 {{- end }}
   labels:
 {{ include "psmdb-operator.labels" . | indent 4 }}
@@ -133,6 +133,15 @@ rules:
     - watch
     - create
     - patch
+{{- if or .Values.watchNamespace .Values.watchAllNamespaces }}
+  - apiGroups:
+    - metrics.k8s.io
+    resources:
+    - pods
+    verbs:
+    - get
+    - list
+{{- end }}
   - apiGroups:
     - certmanager.k8s.io
     - cert-manager.io
diff --git a/packages/system/mongodb-operator/charts/psmdb-operator/values.yaml b/packages/system/mongodb-operator/charts/psmdb-operator/values.yaml
index cc5ece0b83..1ee89c2f1e 100644
--- a/packages/system/mongodb-operator/charts/psmdb-operator/values.yaml
+++ b/packages/system/mongodb-operator/charts/psmdb-operator/values.yaml
@@ -3,10 +3,11 @@
 # Declare variables to be passed into your templates.
 
 replicaCount: 1
+# revisionHistoryLimit: 10
 
 image:
   repository: percona/percona-server-mongodb-operator
-  tag: 1.21.1
+  tag: 1.22.0
   pullPolicy: IfNotPresent
 
 # disableTelemetry: according to
@@ -16,7 +17,7 @@ image:
 disableTelemetry: false
 
 # set if you want to specify a namespace to watch
-# defaults to `.Release.namespace` if left blank
+# defaults to the operator namespace (`namespaceOverride` or `.Release.Namespace`) if left blank
 # multiple namespaces can be specified and separated by comma
 # watchNamespace:
 # set if you want that watched namespaces are created by helm
@@ -72,6 +73,7 @@ securityContext: {}
 
 imagePullSecrets: []
 nameOverride: ""
+namespaceOverride: ""
 fullnameOverride: ""
 
 env:
@@ -98,6 +100,6 @@ affinity: {}
 logStructured: false
 logLevel: "INFO"
 
-# maxConcurrentReconciles controls the number of concurrent workers 
+# maxConcurrentReconciles controls the number of concurrent workers
 # that can reconcile resources in Percona Server for MongoDB clusters in parallel.
 maxConcurrentReconciles: "1"
diff --git a/packages/system/mongodb-rd/cozyrds/mongodb.yaml b/packages/system/mongodb-rd/cozyrds/mongodb.yaml
index 209c8892bc..9d42f5e203 100644
--- a/packages/system/mongodb-rd/cozyrds/mongodb.yaml
+++ b/packages/system/mongodb-rd/cozyrds/mongodb.yaml
@@ -8,7 +8,7 @@ spec:
     singular: mongodb
     plural: mongodbs
     openAPISchema: |-
-      {"title":"Chart Values","type":"object","properties":{"replicas":{"description":"Number of MongoDB replicas in replica set.","type":"integer","default":3},"resources":{"description":"Explicit CPU and memory configuration for each MongoDB replica. When omitted, the preset defined in `resourcesPreset` is applied.","type":"object","default":{},"properties":{"cpu":{"description":"CPU available to each replica.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Memory (RAM) available to each replica.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}},"resourcesPreset":{"description":"Default sizing preset used when `resources` is omitted.","type":"string","default":"t1.small","enum":["t1.nano","t1.micro","t1.small","t1.medium","t1.large","t1.xlarge","t1.2xlarge","t1.4xlarge","c1.nano","c1.micro","c1.small","c1.medium","c1.large","c1.xlarge","c1.2xlarge","c1.4xlarge","s1.nano","s1.micro","s1.small","s1.medium","s1.large","s1.xlarge","s1.2xlarge","s1.4xlarge","u1.nano","u1.micro","u1.small","u1.medium","u1.large","u1.xlarge","u1.2xlarge","u1.4xlarge","m1.nano","m1.micro","m1.small","m1.medium","m1.large","m1.xlarge","m1.2xlarge","m1.4xlarge","nano","micro","small","medium","large","xlarge","2xlarge"]},"size":{"description":"Persistent Volume Claim size available for application data.","default":"10Gi","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"storageClass":{"description":"StorageClass used to store the data.","type":"string","default":"","x-kubernetes-validations":[{"rule":"self == oldSelf","message":"storageClass is immutable"}]},"external":{"description":"Enable external access from outside the cluster.","type":"boolean","default":false},"version":{"description":"MongoDB major version to deploy.","type":"string","default":"v8","enum":["v8","v7","v6"]},"sharding":{"description":"Enable sharded cluster mode. When disabled, deploys a replica set.","type":"boolean","default":false},"shardingConfig":{"description":"Configuration for sharded cluster mode.","type":"object","default":{},"required":["configServerSize","configServers","mongos"],"properties":{"configServerSize":{"description":"PVC size for config servers.","default":"3Gi","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"configServers":{"description":"Number of config server replicas.","type":"integer","default":3},"mongos":{"description":"Number of mongos router replicas.","type":"integer","default":2},"shards":{"description":"List of shard configurations.","type":"array","default":[{"name":"rs0","replicas":3,"size":"10Gi"}],"items":{"type":"object","required":["name","replicas","size"],"properties":{"name":{"description":"Shard name.","type":"string"},"replicas":{"description":"Number of replicas in this shard.","type":"integer"},"size":{"description":"PVC size for this shard.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}}}}},"users":{"description":"Users configuration map.","type":"object","default":{},"additionalProperties":{"type":"object","properties":{"password":{"description":"Password for the user (auto-generated if omitted).","type":"string"}}}},"databases":{"description":"Databases configuration map.","type":"object","default":{},"additionalProperties":{"type":"object","properties":{"roles":{"description":"Roles assigned to users.","type":"object","properties":{"admin":{"description":"List of users with admin privileges (readWrite + dbAdmin).","type":"array","items":{"type":"string"}},"readonly":{"description":"List of users with read-only privileges.","type":"array","items":{"type":"string"}}}}}}},"backup":{"description":"Backup configuration.","type":"object","default":{},"required":["enabled"],"properties":{"destinationPath":{"description":"Destination path for backups (e.g. s3://bucket/path/).","type":"string","default":"s3://bucket/path/to/folder/"},"enabled":{"description":"Enable regular backups.","type":"boolean","default":false},"endpointURL":{"description":"S3 endpoint URL for uploads.","type":"string","default":"http://minio-gateway-service:9000"},"retentionPolicy":{"description":"Retention policy (e.g. \"30d\").","type":"string","default":"30d"},"s3AccessKey":{"description":"Access key for S3 authentication.","type":"string","default":""},"s3SecretKey":{"description":"Secret key for S3 authentication.","type":"string","default":""},"schedule":{"description":"Cron schedule for automated backups.","type":"string","default":"0 2 * * *"}}},"bootstrap":{"description":"Bootstrap configuration.","type":"object","default":{},"required":["backupName","enabled"],"properties":{"backupName":{"description":"Name of backup to restore from.","type":"string","default":""},"enabled":{"description":"Whether to restore from a backup.","type":"boolean","default":false},"recoveryTime":{"description":"Timestamp for point-in-time recovery; empty means latest.","type":"string","default":""}}}}}
+      {"title":"Chart Values","type":"object","properties":{"replicas":{"description":"Number of MongoDB replicas in replica set.","type":"integer","default":3},"resources":{"description":"Explicit CPU and memory configuration for each MongoDB replica. When omitted, the preset defined in `resourcesPreset` is applied.","type":"object","default":{},"properties":{"cpu":{"description":"CPU available to each replica.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Memory (RAM) available to each replica.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}},"resourcesPreset":{"description":"Default sizing preset used when `resources` is omitted.","type":"string","default":"t1.small","enum":["t1.nano","t1.micro","t1.small","t1.medium","t1.large","t1.xlarge","t1.2xlarge","t1.4xlarge","c1.nano","c1.micro","c1.small","c1.medium","c1.large","c1.xlarge","c1.2xlarge","c1.4xlarge","s1.nano","s1.micro","s1.small","s1.medium","s1.large","s1.xlarge","s1.2xlarge","s1.4xlarge","u1.nano","u1.micro","u1.small","u1.medium","u1.large","u1.xlarge","u1.2xlarge","u1.4xlarge","m1.nano","m1.micro","m1.small","m1.medium","m1.large","m1.xlarge","m1.2xlarge","m1.4xlarge","nano","micro","small","medium","large","xlarge","2xlarge"]},"size":{"description":"Persistent Volume Claim size available for application data.","default":"10Gi","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"storageClass":{"description":"StorageClass used to store the data.","type":"string","default":"","x-kubernetes-validations":[{"rule":"self == oldSelf","message":"storageClass is immutable"}],"x-cozystack-options":{"source":"storageclass"}},"external":{"description":"Enable external access from outside the cluster.","type":"boolean","default":false},"version":{"description":"MongoDB major version to deploy.","type":"string","default":"v8","enum":["v8","v7","v6"]},"sharding":{"description":"Enable sharded cluster mode. When disabled, deploys a replica set.","type":"boolean","default":false},"shardingConfig":{"description":"Configuration for sharded cluster mode.","type":"object","default":{},"required":["configServerSize","configServers","mongos"],"properties":{"configServerSize":{"description":"PVC size for config servers.","default":"3Gi","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"configServers":{"description":"Number of config server replicas.","type":"integer","default":3},"mongos":{"description":"Number of mongos router replicas.","type":"integer","default":2},"shards":{"description":"List of shard configurations.","type":"array","default":[{"name":"rs0","replicas":3,"size":"10Gi"}],"items":{"type":"object","required":["name","replicas","size"],"properties":{"name":{"description":"Shard name.","type":"string"},"replicas":{"description":"Number of replicas in this shard.","type":"integer"},"size":{"description":"PVC size for this shard.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}}}}},"users":{"description":"Users configuration map.","type":"object","default":{},"additionalProperties":{"type":"object","properties":{"password":{"description":"Password for the user (auto-generated if omitted).","type":"string"}}}},"databases":{"description":"Databases configuration map.","type":"object","default":{},"additionalProperties":{"type":"object","properties":{"roles":{"description":"Roles assigned to users.","type":"object","properties":{"admin":{"description":"List of users with admin privileges (readWrite + dbAdmin).","type":"array","items":{"type":"string"}},"readonly":{"description":"List of users with read-only privileges.","type":"array","items":{"type":"string"}}}}}}},"backup":{"description":"Backup configuration.","type":"object","default":{},"required":["enabled"],"properties":{"destinationPath":{"description":"Destination path for backups (e.g. s3://bucket/path/). Ignored when useSystemBucket is true (the driver injects the platform bucket).","type":"string","default":"s3://bucket/path/to/folder/"},"enabled":{"description":"Enable regular backups.","type":"boolean","default":false},"endpointURL":{"description":"S3 endpoint URL for uploads. Ignored when useSystemBucket is true (the strategy supplies the platform endpoint).","type":"string","default":"http://minio-gateway-service:9000"},"insecureSkipTLSVerify":{"description":"Skip TLS verification for the S3 endpoint (self-signed, e.g. in-cluster seaweedfs). Ignored when useSystemBucket is true (the platform backupStorage knob applies instead).","type":"boolean","default":false},"retentionPolicy":{"description":"Retention policy (e.g. \"30d\"). Ignored when useSystemBucket is true (no engine-side retention on that flow).","type":"string","default":"30d"},"s3AccessKey":{"description":"Access key for S3 authentication. Ignored when useSystemBucket is true (credentials come from the projected cozy-backups-creds).","type":"string","default":""},"s3SecretKey":{"description":"Secret key for S3 authentication. Ignored when useSystemBucket is true (credentials come from the projected cozy-backups-creds).","type":"string","default":""},"schedule":{"description":"Cron schedule for automated backups. Ignored when useSystemBucket is true (scheduling moves to the BackupClass Plan).","type":"string","default":"0 2 * * *"},"useSystemBucket":{"description":"Opt-in: back up to the platform system bucket without supplying S3 credentials. The cozy-default MongoDB BackupClass injects the storage at BackupJob time; tenants do not set s3AccessKey/s3SecretKey/destinationPath/endpointURL, and backups scope to `<namespace>/<application>`. Scheduling moves to a BackupClass Plan; `schedule`, `retentionPolicy` and PITR are ignored while this is on, and this flow has no retention yet (see docs/operations/backup-classes.md). Requires `backup.enabled: true` (the pbm agents run on that flag); the chart refuses the combination with `enabled: false` at render time; the schema carries the same rule as a marker for the UI and for the day the apiserver enforces CEL on application schemas (cozystack/cozystack#2657), which it does not yet. A release that has not yet rendered this flag (its cluster still carries the chart's scheduled tasks and PITR) holds a BackupJob until it does, so the tenant's own storage is never injected over.","type":"boolean","default":false}},"x-kubernetes-validations":[{"message":"backup.useSystemBucket requires backup.enabled: the percona-backup-mongodb agents only run when backups are enabled","rule":"!(has(self.useSystemBucket) && self.useSystemBucket) || (has(self.enabled) && self.enabled)"}]},"bootstrap":{"description":"Bootstrap configuration.","type":"object","default":{},"required":["backupName","enabled"],"properties":{"backupName":{"description":"Name of backup to restore from.","type":"string","default":""},"enabled":{"description":"Whether to restore from a backup.","type":"boolean","default":false},"recoveryTime":{"description":"Timestamp for point-in-time recovery; empty means latest.","type":"string","default":""}}}}}
   release:
     prefix: mongodb-
     labels:
@@ -25,12 +25,47 @@ spec:
     tags:
       - database
     icon: PHN2ZyB3aWR0aD0iMTQ0IiBoZWlnaHQ9IjE0NCIgdmlld0JveD0iMCAwIDE0NCAxNDQiIGZpbGw9Im5vbmUiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+CjxyZWN0IHdpZHRoPSIxNDQiIGhlaWdodD0iMTQ0IiByeD0iMjQiIGZpbGw9InVybCgjcGFpbnQwX3JhZGlhbF8zMzBfNDg5ODEpIi8+CjxwYXRoIGQ9Ik05NS4xMzg3IDYxLjQwMjhDODkuNjI3NiAzNy4yMjc1IDc2LjYwMzIgMjkuMjc4NSA3NS4yMDA3IDI2LjI0MTZDNzMuNjY3IDI0LjA5OSA3Mi4xMTI5IDIwLjI4NzkgNzIuMTEyOSAyMC4yODc5QzcyLjA4NzMgMjAuMjIzNiA3Mi4wNDY0IDIwLjExMDEgNzEuOTk4NyAyMEM3MS44NDAyIDIyLjE0MjYgNzEuNzU4NCAyMi45NjkyIDY5LjcyMDMgMjUuMTMwNUM2Ni41NjQzIDI3LjU4MzEgNTAuMzcyIDQxLjA4NzYgNDkuMDU0NyA2OC41NTRDNDcuODI2MSA5NC4xNzA4IDY3LjY3MiAxMDkuNDM1IDcwLjM1NiAxMTEuMzgxTDcwLjY2MSAxMTEuNTk2VjExMS41NzhDNzAuNjc4IDExMS43MDcgNzEuNTEzIDExNy42NzUgNzIuMDk5MyAxMjRINzQuMjAyMUM3NC42OTU1IDExOS41MjkgNzUuNDM1MSAxMTUuMDg5IDc2LjQxNzUgMTEwLjY5OUw3Ni41ODc5IDExMC41ODlDNzcuNzg4NCAxMDkuNzMzIDc4LjkzMzEgMTA4LjgwMiA4MC4wMTQ4IDEwNy44MDJMODAuMTM3NSAxMDcuNjkyQzg1Ljg0MjggMTAyLjQ1MyA5Ni4wOTk4IDkwLjMzNjEgOTUuOTk5MyA3MS4wMTY4Qzk1Ljk3OCA2Ny43OTQxIDk1LjY5MDIgNjQuNTc4NiA5NS4xMzg3IDYxLjQwMjhaTTcxLjg3NiA5Ni45MTgxQzcxLjg3NiA5Ni45MTgxIDcxLjg3NiA2MC45ODk2IDczLjA2ODkgNjAuOTk2M0M3My45OTkzIDYwLjk5NjMgNzUuMjA0MSAxMDcuMzQgNzUuMjA0MSAxMDcuMzRDNzMuNTQ3NyAxMDcuMTQyIDcxLjg3NiA5OS43MTI4IDcxLjg3NiA5Ni45MTgxWiIgZmlsbD0id2hpdGUiLz4KPGRlZnM+CjxyYWRpYWxHcmFkaWVudCBpZD0icGFpbnQwX3JhZGlhbF8zMzBfNDg5ODEiIGN4PSIwIiBjeT0iMCIgcj0iMSIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIGdyYWRpZW50VHJhbnNmb3JtPSJ0cmFuc2xhdGUoMS4zMjI5OGUtMDUgLTcuNTAwMDEpIHJvdGF0ZSg0NC43MTc4KSBzY2FsZSgyMTUuMzE3IDMxMi40NTUpIj4KPHN0b3Agc3RvcC1jb2xvcj0iIzI1RkY4MCIvPgo8c3RvcCBvZmZzZXQ9IjEiIHN0b3AtY29sb3I9IiMxM0FBNTIiLz4KPC9yYWRpYWxHcmFkaWVudD4KPC9kZWZzPgo8L3N2Zz4K
-    keysOrder: [["apiVersion"], ["appVersion"], ["kind"], ["metadata"], ["metadata", "name"], ["spec", "replicas"], ["spec", "resources"], ["spec", "resourcesPreset"], ["spec", "size"], ["spec", "storageClass"], ["spec", "external"], ["spec", "version"], ["spec", "sharding"], ["spec", "shardingConfig"], ["spec", "shardingConfig", "configServers"], ["spec", "shardingConfig", "configServerSize"], ["spec", "shardingConfig", "mongos"], ["spec", "shardingConfig", "shards"], ["spec", "users"], ["spec", "databases"], ["spec", "backup"], ["spec", "backup", "enabled"], ["spec", "backup", "schedule"], ["spec", "backup", "retentionPolicy"], ["spec", "backup", "destinationPath"], ["spec", "backup", "endpointURL"], ["spec", "backup", "s3AccessKey"], ["spec", "backup", "s3SecretKey"], ["spec", "bootstrap"], ["spec", "bootstrap", "enabled"], ["spec", "bootstrap", "recoveryTime"], ["spec", "bootstrap", "backupName"]]
+    keysOrder: [["apiVersion"], ["appVersion"], ["kind"], ["metadata"], ["metadata", "name"], ["spec", "replicas"], ["spec", "resources"], ["spec", "resourcesPreset"], ["spec", "size"], ["spec", "storageClass"], ["spec", "external"], ["spec", "version"], ["spec", "sharding"], ["spec", "shardingConfig"], ["spec", "shardingConfig", "configServers"], ["spec", "shardingConfig", "configServerSize"], ["spec", "shardingConfig", "mongos"], ["spec", "shardingConfig", "shards"], ["spec", "users"], ["spec", "databases"], ["spec", "backup"], ["spec", "backup", "enabled"], ["spec", "backup", "useSystemBucket"], ["spec", "backup", "schedule"], ["spec", "backup", "retentionPolicy"], ["spec", "backup", "destinationPath"], ["spec", "backup", "endpointURL"], ["spec", "backup", "insecureSkipTLSVerify"], ["spec", "backup", "s3AccessKey"], ["spec", "backup", "s3SecretKey"], ["spec", "bootstrap"], ["spec", "bootstrap", "enabled"], ["spec", "bootstrap", "recoveryTime"], ["spec", "bootstrap", "backupName"]]
   secrets:
-    exclude: []
+    # Evaluated before include, so this is a structural backstop rather than a
+    # restatement: the include selector below matches by label with no name
+    # constraint, and a single mis-stamp of the trust-anchor label on one of
+    # these would promote a private key to the tenant.
+    #
+    # Bounded by the enumeration, not absolute — matching is by exact name with
+    # no globs, so a Secret a future operator version introduces stays in scope
+    # of the label-only include. The per-user Secrets carry the username in
+    # their name and cannot be enumerated at all; they and the backup
+    # credentials hold tenant-supplied values, so surfacing one back to its own
+    # tenant crosses no privilege boundary.
+    exclude:
+      - resourceNames:
+          - mongodb-{{ .name }}-ca-cert
+          - mongodb-{{ .name }}-ssl
+          - mongodb-{{ .name }}-ssl-internal
+          # Rotation snapshots of the leaf Secrets, holding the same server
+          # private keys. They carry no ownerReference, so an interrupted
+          # rotation can leave them behind after the release is gone.
+          - mongodb-{{ .name }}-ssl-old
+          - mongodb-{{ .name }}-ssl-internal-old
+          # System-user passwords, operator state, and the at-rest encryption
+          # key. Not TLS, but in scope of the same label-only include.
+          - mongodb-{{ .name }}-percona-server-mongodb-users
+          - mongodb-{{ .name }}-mongodb-encryption-key
+          - mongodb-{{ .name }}-mongodb-keyfile
+          - mongodb-{{ .name }}-s3-creds
+          # Both forms are real: the operator's own deletion finalizer
+          # enumerates the bare name alongside the -users one.
+          - internal-mongodb-{{ .name }}
+          - internal-mongodb-{{ .name }}-users
     include:
       - resourceNames:
           - mongodb-{{ .name }}-credentials
+      # The key-free trust anchor the CA-extraction controller publishes. This
+      # is the single, engine-agnostic selector every converged engine shares;
+      # it carries no per-release name templating.
+      - matchLabels:
+          internal.cozystack.io/tenant-ca: "true"
   services:
     exclude: []
     include:
diff --git a/packages/system/monitoring-agents/Makefile b/packages/system/monitoring-agents/Makefile
index 339b15a29b..6510790c12 100644
--- a/packages/system/monitoring-agents/Makefile
+++ b/packages/system/monitoring-agents/Makefile
@@ -3,6 +3,12 @@ export NAMESPACE=cozy-monitoring
 
 include ../../../hack/package.mk
 
+# hack/helm-unit-tests.sh discovers work by probing for this target, so a
+# package without one is skipped in silence however many suites sit under
+# tests/. This package had suites and no target, so none of them had ever run.
+test:
+	helm unittest .
+
 update:
 	rm -rf charts
 	helm repo add prometheus-community https://prometheus-community.github.io/helm-charts
diff --git a/packages/system/monitoring-agents/alerts/vmagent.yaml b/packages/system/monitoring-agents/alerts/vmagent.yaml
new file mode 100644
index 0000000000..3fb69fde23
--- /dev/null
+++ b/packages/system/monitoring-agents/alerts/vmagent.yaml
@@ -0,0 +1,26 @@
+apiVersion: operator.victoriametrics.com/v1beta1
+kind: VMRule
+metadata:
+  name: alerts-vmagent
+spec:
+  groups:
+  - name: vmagent
+    params: {}
+    rules:
+    - alert: VMAgentScrapeSizeExceeded
+      expr: increase(vm_promscrape_max_scrape_size_exceeded_errors_total[10m]) > 0
+      for: 5m
+      labels:
+        severity: warning
+        exported_instance: '{{ $labels.namespace }}/{{ $labels.pod }}'
+        service: vmagent
+      annotations:
+        summary: vmagent refuses scrape responses larger than its size limit.
+        description: >-
+          vmagent {{ $labels.namespace }}/{{ $labels.pod }} in cluster {{ $labels.cluster }} dropped
+          scrape responses that exceed -promscrape.maxScrapeSize or the scrape's max_scrape_size.
+          The affected targets report up == 0, so TargetDown or KubeAPIDown may fire for a healthy
+          target. The counter carries no target label: find the target on the vmagent /targets
+          page, where the last error names the size limit, then raise max_scrape_size on that
+          scrape. For kube-apiserver on the management cluster this is the
+          vmagent.apiserverMaxScrapeSize value of the monitoring-agents component.
diff --git a/packages/system/monitoring-agents/templates/_tenant-log-routes.tpl b/packages/system/monitoring-agents/templates/_tenant-log-routes.tpl
new file mode 100644
index 0000000000..e59a0cf4b7
--- /dev/null
+++ b/packages/system/monitoring-agents/templates/_tenant-log-routes.tpl
@@ -0,0 +1,30 @@
+{{- /*
+  Tenant log routes for the node fluent-bit, as JSON {"<target>": ["<namespace>", ...]}.
+
+  The tenant chart sets namespace.cozystack.io/monitoring on every tenant
+  namespace to the nearest tenant (itself or an ancestor) that runs its own
+  monitoring stack, so the label names the VictoriaLogs a namespace's logs
+  belong to. A namespace is routed when that label is set and names a tenant
+  other than global.target; an unlabelled namespace, an empty label, or one
+  pointing at global.target stays on the default outputs.
+
+  lookup results are not part of the digest helm-controller compares, so a
+  namespace gaining, changing or losing the label does not re-render this
+  release by itself. The tenantlogrouting reconciler in cozystack-controller
+  (internal/controller/tenantlogrouting) forces an upgrade of this release
+  whenever any namespace's label changes, so a new selection here that reads
+  anything beyond that label must be taught to the reconciler too. Offline
+  renders (helm template, dry-run) get no namespaces back from lookup and route
+  nothing.
+*/ -}}
+{{- define "monitoring-agents.tenantLogRoutes" -}}
+{{- $routes := dict -}}
+{{- $namespaces := lookup "v1" "Namespace" "" "" -}}
+{{- range $ns := ($namespaces.items | default list) -}}
+{{- $target := index ($ns.metadata.labels | default dict) "namespace.cozystack.io/monitoring" | default "" -}}
+{{- if and $target (ne $target $.Values.global.target) -}}
+{{- $_ := set $routes $target (append (get $routes $target | default list) $ns.metadata.name) -}}
+{{- end -}}
+{{- end -}}
+{{- toJson $routes -}}
+{{- end -}}
diff --git a/packages/system/monitoring-agents/templates/apiserver-scrape.yaml b/packages/system/monitoring-agents/templates/apiserver-scrape.yaml
index f3f7b9826d..5750b55f9d 100644
--- a/packages/system/monitoring-agents/templates/apiserver-scrape.yaml
+++ b/packages/system/monitoring-agents/templates/apiserver-scrape.yaml
@@ -9,6 +9,9 @@ spec:
   - bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
     port: https
     scheme: https
+    {{- with .Values.vmagent.apiserverMaxScrapeSize }}
+    max_scrape_size: {{ . | quote }}
+    {{- end }}
     relabelConfigs:
     - action: labeldrop
       regex: (endpoint|namespace|pod|container)
diff --git a/packages/system/monitoring-agents/templates/etcd-proxy-scrape.yaml b/packages/system/monitoring-agents/templates/etcd-proxy-scrape.yaml
index 9f3ecc7c1d..96482d79a8 100644
--- a/packages/system/monitoring-agents/templates/etcd-proxy-scrape.yaml
+++ b/packages/system/monitoring-agents/templates/etcd-proxy-scrape.yaml
@@ -31,7 +31,7 @@ spec:
         node-role.kubernetes.io/control-plane: ""
       containers:
       - name: kube-rbac-proxy
-        image: quay.io/brancz/kube-rbac-proxy:v0.11.0
+        image: quay.io/brancz/kube-rbac-proxy:v0.22.0
         args:
         - "--secure-listen-address=$(NODE_IP):9443"
         - "--upstream=http://127.0.0.1:2381/"
diff --git a/packages/system/monitoring-agents/templates/vpa.yaml b/packages/system/monitoring-agents/templates/vpa.yaml
index 4da978e73a..9a31fab944 100644
--- a/packages/system/monitoring-agents/templates/vpa.yaml
+++ b/packages/system/monitoring-agents/templates/vpa.yaml
@@ -1,3 +1,11 @@
+{{- /*
+  updateMode is Initial, not Auto. Auto mode evicts running pods to apply new
+  recommendations; during install that churn recreates pods faster than Cilium
+  releases their endpoint IPs, tripping the cluster-pool IPAM "IP already in
+  use" (putEndpointIdInvalid) leak that wedges a pod and stalls the install.
+  Initial sets requests at creation without evicting, removing the trigger.
+  Do not switch back to Auto without fixing the underlying Cilium IP-reuse race.
+*/ -}}
 apiVersion: autoscaling.k8s.io/v1
 kind: VerticalPodAutoscaler
 metadata:
@@ -8,7 +16,7 @@ spec:
     kind: VMAgent
     name: vmagent
   updatePolicy:
-    updateMode: Auto
+    updateMode: Initial
     minReplicas: 1
   resourcePolicy:
     containerPolicies:
diff --git a/packages/system/monitoring-agents/tests/fluent-bit_probes_test.yaml b/packages/system/monitoring-agents/tests/fluent-bit_probes_test.yaml
new file mode 100644
index 0000000000..3816091a65
--- /dev/null
+++ b/packages/system/monitoring-agents/tests/fluent-bit_probes_test.yaml
@@ -0,0 +1,53 @@
+suite: fluent-bit liveness/readiness probes carry load headroom
+
+# Regression guard for the fluent-bit crash loop on a loaded install. The
+# subchart default probes (initialDelaySeconds 0, timeoutSeconds 1,
+# failureThreshold 3) fire into a connection-refused :2020 before fluent-bit's
+# HTTP server binds — that bind happens only AFTER the kubernetes filter's
+# "testing connectivity with API server" step, which the kube-API can gate for
+# ~10s under a concurrent install. The aggressive defaults then liveness-kill
+# fluent-bit into a restart loop, timing out the HelmRelease. The umbrella
+# values relax both probes. Pin the relaxed timing AND the unchanged target
+# (httpGet path / on port http = :2020) — a wrong path/port would make the
+# probe always fail, strictly worse than the bug it fixes.
+release:
+  name: monitoring-agents
+  namespace: cozy-monitoring
+tests:
+  - it: liveness probe keeps :2020 target and gains load headroom
+    template: charts/fluent-bit/templates/daemonset.yaml
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].livenessProbe.httpGet.path
+          value: /
+      - equal:
+          path: spec.template.spec.containers[0].livenessProbe.httpGet.port
+          value: http
+      - equal:
+          path: spec.template.spec.containers[0].livenessProbe.initialDelaySeconds
+          value: 15
+      - equal:
+          path: spec.template.spec.containers[0].livenessProbe.periodSeconds
+          value: 10
+      - equal:
+          path: spec.template.spec.containers[0].livenessProbe.timeoutSeconds
+          value: 5
+      - equal:
+          path: spec.template.spec.containers[0].livenessProbe.failureThreshold
+          value: 6
+
+  - it: readiness probe keeps :2020 target and gains load headroom
+    template: charts/fluent-bit/templates/daemonset.yaml
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].readinessProbe.httpGet.path
+          value: /
+      - equal:
+          path: spec.template.spec.containers[0].readinessProbe.httpGet.port
+          value: http
+      - equal:
+          path: spec.template.spec.containers[0].readinessProbe.timeoutSeconds
+          value: 5
+      - equal:
+          path: spec.template.spec.containers[0].readinessProbe.failureThreshold
+          value: 6
diff --git a/packages/system/monitoring-agents/tests/fluent-bit_tenant_log_routing_offline_test.yaml b/packages/system/monitoring-agents/tests/fluent-bit_tenant_log_routing_offline_test.yaml
new file mode 100644
index 0000000000..b272d019ae
--- /dev/null
+++ b/packages/system/monitoring-agents/tests/fluent-bit_tenant_log_routing_offline_test.yaml
@@ -0,0 +1,19 @@
+suite: fluent-bit routes no tenant logs when lookup sees no cluster
+
+# No kubernetesProvider: lookup returns nothing, as it does under helm template
+# and dry-run. The config must then carry no routing at all, rather than a
+# rewrite_tag with no Rule or an output with an empty host.
+templates:
+  - charts/fluent-bit/templates/configmap.yaml
+release:
+  name: monitoring-agents
+  namespace: cozy-monitoring
+set:
+  global:
+    target: tenant-root
+tests:
+  - it: renders no rewrite_tag filter, tenant output or tenant label override
+    asserts:
+      - notMatchRegex:
+          path: data["fluent-bit.conf"]
+          pattern: 'rewrite_tag|Match tenant\.|Set tenant'
diff --git a/packages/system/monitoring-agents/tests/fluent-bit_tenant_log_routing_test.yaml b/packages/system/monitoring-agents/tests/fluent-bit_tenant_log_routing_test.yaml
new file mode 100644
index 0000000000..6616d34047
--- /dev/null
+++ b/packages/system/monitoring-agents/tests/fluent-bit_tenant_log_routing_test.yaml
@@ -0,0 +1,115 @@
+suite: fluent-bit routes tenant logs by the namespace monitoring label
+
+# The node fluent-bit sends a namespace's container logs to the VictoriaLogs
+# named by its namespace.cozystack.io/monitoring label, when that label names a
+# tenant other than global.target. These cases pin which namespaces get a rule
+# and an output, which are skipped, and that a routed record is labelled with
+# the tenant it lands in rather than with global.target.
+templates:
+  - charts/fluent-bit/templates/configmap.yaml
+release:
+  name: monitoring-agents
+  namespace: cozy-monitoring
+set:
+  global:
+    target: tenant-root
+kubernetesProvider:
+  scheme:
+    "v1/Namespace":
+      gvr:
+        version: v1
+        resource: namespaces
+      namespaced: false
+  objects:
+    - kind: Namespace
+      apiVersion: v1
+      metadata:
+        name: cozy-system
+    - kind: Namespace
+      apiVersion: v1
+      metadata:
+        name: tenant-empty
+        labels:
+          namespace.cozystack.io/monitoring: ""
+    - kind: Namespace
+      apiVersion: v1
+      metadata:
+        name: tenant-root
+        labels:
+          namespace.cozystack.io/monitoring: tenant-root
+    - kind: Namespace
+      apiVersion: v1
+      metadata:
+        name: tenant-inherits-root
+        labels:
+          namespace.cozystack.io/monitoring: tenant-root
+    - kind: Namespace
+      apiVersion: v1
+      metadata:
+        name: tenant-a
+        labels:
+          namespace.cozystack.io/monitoring: tenant-a
+    - kind: Namespace
+      apiVersion: v1
+      metadata:
+        name: tenant-a-child
+        labels:
+          namespace.cozystack.io/monitoring: tenant-a
+    - kind: Namespace
+      apiVersion: v1
+      metadata:
+        name: tenant-b
+        labels:
+          namespace.cozystack.io/monitoring: tenant-b
+tests:
+  - it: routes every namespace of a monitored tenant through one rewrite_tag filter
+    asserts:
+      - matchRegex:
+          path: data["fluent-bit.conf"]
+          pattern: 'Name rewrite_tag\n\s+Match kube\.\*\n\s+Rule \$kubernetes_namespace_name \^\(tenant-a\|tenant-a-child\)\$ tenant\.tenant-a\.\$TAG false\n\s+Rule \$kubernetes_namespace_name \^\(tenant-b\)\$ tenant\.tenant-b\.\$TAG false\n'
+
+  - it: writes one output per monitored tenant, to that tenant's vlinsert
+    asserts:
+      - matchRegex:
+          path: data["fluent-bit.conf"]
+          pattern: 'Match tenant\.tenant-a\.\*\n\s+Host vlinsert-generic\.tenant-a\.svc'
+      - matchRegex:
+          path: data["fluent-bit.conf"]
+          pattern: 'Match tenant\.tenant-b\.\*\n\s+Host vlinsert-generic\.tenant-b\.svc'
+
+  - it: labels a routed record with the tenant it is sent to
+    asserts:
+      - matchRegex:
+          path: data["fluent-bit.conf"]
+          pattern: 'Match tenant\.tenant-a\.\*\n\s+Set tenant tenant-a\n'
+      - matchRegex:
+          path: data["fluent-bit.conf"]
+          pattern: 'Match tenant\.tenant-b\.\*\n\s+Set tenant tenant-b\n'
+
+  - it: leaves unlabelled, empty-labelled and global.target namespaces on the default outputs
+    asserts:
+      - notMatchRegex:
+          path: data["fluent-bit.conf"]
+          pattern: 'cozy-system|tenant-empty|tenant-inherits-root'
+      - notMatchRegex:
+          path: data["fluent-bit.conf"]
+          pattern: 'tenant\.tenant-root\.|\(tenant-root\)|Host vlinsert-generic\.\.svc|tenant\.\.'
+
+  - it: keeps global.target on the default outputs
+    asserts:
+      - matchRegex:
+          path: data["fluent-bit.conf"]
+          pattern: 'Match kube\.\*\n\s+Host vlinsert-generic\.tenant-root\.svc'
+
+  - it: follows global.target when it names a tenant that is otherwise routed
+    set:
+      global:
+        target: tenant-a
+    asserts:
+      - notMatchRegex:
+          path: data["fluent-bit.conf"]
+          pattern: 'tenant\.tenant-a\.'
+      - matchRegex:
+          path: data["fluent-bit.conf"]
+          pattern: 'Rule \$kubernetes_namespace_name \^\(tenant-inherits-root\|tenant-root\)\$ tenant\.tenant-root\.\$TAG false'
+
diff --git a/packages/system/monitoring-agents/tests/kube_state_metrics_resources_test.yaml b/packages/system/monitoring-agents/tests/kube_state_metrics_resources_test.yaml
new file mode 100644
index 0000000000..7545adccb1
--- /dev/null
+++ b/packages/system/monitoring-agents/tests/kube_state_metrics_resources_test.yaml
@@ -0,0 +1,26 @@
+suite: kube-state-metrics carries a memory limit sized above its measured peak
+# Without a memory limit the container sets no memory.max on its pod cgroup, and
+# the Talos userspace OOM handler only ever selects cgroups that lack one, so it
+# is an eviction candidate on every node regardless of what caused the pressure.
+# The numbers come from a measured 14d peak of 307Mi on the smallest cluster we
+# run; the limit carries headroom because this component scales with object
+# count. A CPU limit is deliberately absent: it does not affect the OOM ranking
+# and a binding ceiling turns into scrape timeouts.
+templates:
+  - charts/kube-state-metrics/templates/deployment.yaml
+tests:
+  - it: sets a memory limit above the measured peak and a request above the mean
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].resources.limits.memory
+          value: 2Gi
+      - equal:
+          path: spec.template.spec.containers[0].resources.requests.memory
+          value: 192Mi
+      - equal:
+          path: spec.template.spec.containers[0].resources.requests.cpu
+          value: 50m
+  - it: sets no CPU limit
+    asserts:
+      - notExists:
+          path: spec.template.spec.containers[0].resources.limits.cpu
diff --git a/packages/system/monitoring-agents/tests/node_daemonset_resources_test.yaml b/packages/system/monitoring-agents/tests/node_daemonset_resources_test.yaml
new file mode 100644
index 0000000000..f057bee847
--- /dev/null
+++ b/packages/system/monitoring-agents/tests/node_daemonset_resources_test.yaml
@@ -0,0 +1,37 @@
+suite: node DaemonSet memory requests and limits
+
+# fluent-bit and node-exporter both run on every node and both ran BestEffort.
+# The Talos userspace OOM handler (v1.12+) only ever selects cgroups that lack
+# memory.max, and it picks its victim by QoS class rather than by what caused
+# the pressure — so either one could be killed for a tenant workload thrashing
+# against its own limit, on a node that was otherwise healthy.
+#
+# A memory limit is the only thing that sets memory.max, so the limits below are
+# the load-bearing assertions; the requests are pinned alongside them because
+# they are what the values were sized from and a silent drift in either
+# direction is worth catching. Both are set from the umbrella values.yaml, which
+# means an upstream subchart bump that renames or moves the key would render
+# nothing at all and leave no other trace — exactly what these pin against.
+release:
+  name: monitoring-agents
+  namespace: cozy-monitoring
+tests:
+  - it: fluent-bit declares a memory limit and request
+    template: charts/fluent-bit/templates/daemonset.yaml
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[?(@.name=="fluent-bit")].resources.limits.memory
+          value: 1Gi
+      - equal:
+          path: spec.template.spec.containers[?(@.name=="fluent-bit")].resources.requests.memory
+          value: 128Mi
+
+  - it: node-exporter declares a memory limit and request
+    template: charts/prometheus-node-exporter/templates/daemonset.yaml
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[?(@.name=="node-exporter")].resources.limits.memory
+          value: 256Mi
+      - equal:
+          path: spec.template.spec.containers[?(@.name=="node-exporter")].resources.requests.memory
+          value: 32Mi
diff --git a/packages/system/monitoring-agents/tests/vmagent_scrape_size_test.yaml b/packages/system/monitoring-agents/tests/vmagent_scrape_size_test.yaml
new file mode 100644
index 0000000000..b4e3809d98
--- /dev/null
+++ b/packages/system/monitoring-agents/tests/vmagent_scrape_size_test.yaml
@@ -0,0 +1,69 @@
+suite: kube-apiserver scrape size limit and its alert
+
+# kube-apiserver's /metrics grows with the number of resources and CRDs, and a
+# full install pushes it past the global 32MB -promscrape.maxScrapeSize. vmagent
+# then refuses every scrape of it, so up == 0 and KubeAPIDown fires on a
+# healthy API server. The apiserver endpoint carries its own max_scrape_size,
+# which replaces the global flag for that job only (upward too), so the guard
+# for every other target stays at 32MB. vmagent buffers the whole uncompressed
+# body even with streamParse, so the per-job limit is a memory ceiling and must
+# stay finite.
+release:
+  name: monitoring-agents
+  namespace: cozy-monitoring
+tests:
+  - it: apiserver endpoint gets its own scrape size limit by default
+    template: templates/apiserver-scrape.yaml
+    asserts:
+      - equal:
+          path: spec.endpoints[0].max_scrape_size
+          value: 128MB
+
+  - it: apiserver scrape size limit follows the value
+    template: templates/apiserver-scrape.yaml
+    set:
+      vmagent.apiserverMaxScrapeSize: 512MB
+    asserts:
+      - equal:
+          path: spec.endpoints[0].max_scrape_size
+          value: 512MB
+
+  - it: a byte count renders as a string, as the CRD field requires
+    template: templates/apiserver-scrape.yaml
+    set:
+      vmagent.apiserverMaxScrapeSize: 134217728
+    asserts:
+      - matchRegex:
+          path: spec.endpoints[0].max_scrape_size
+          pattern: ^[0-9.e+]+$
+
+  - it: an empty value falls back to the global flag
+    template: templates/apiserver-scrape.yaml
+    set:
+      vmagent.apiserverMaxScrapeSize: ""
+    asserts:
+      - notExists:
+          path: spec.endpoints[0].max_scrape_size
+
+  - it: the global limit for every other target is not loosened
+    template: templates/vmagent.yaml
+    asserts:
+      - equal:
+          path: spec.extraArgs["promscrape.maxScrapeSize"]
+          value: 32MB
+
+  - it: a refused oversized scrape raises its own alert
+    template: templates/alerts.yaml
+    documentSelector:
+      path: metadata.name
+      value: alerts-vmagent
+    asserts:
+      - equal:
+          path: spec.groups[0].rules[0].alert
+          value: VMAgentScrapeSizeExceeded
+      - equal:
+          path: spec.groups[0].rules[0].expr
+          value: increase(vm_promscrape_max_scrape_size_exceeded_errors_total[10m]) > 0
+      - equal:
+          path: spec.groups[0].rules[0].labels.severity
+          value: warning
diff --git a/packages/system/monitoring-agents/values.yaml b/packages/system/monitoring-agents/values.yaml
index bcdee0e0b7..78a6ec9fdf 100644
--- a/packages/system/monitoring-agents/values.yaml
+++ b/packages/system/monitoring-agents/values.yaml
@@ -2,6 +2,30 @@ global:
   target: cozy-monitoring
 
 kube-state-metrics:
+  # Sized from a measured 14d peak of 307Mi working set on a 3-node cluster with
+  # 322 pods and roughly 25.6k series, which is the smallest cluster we run. The
+  # request sits above the 176Mi mean rather than at the peak, and the limit
+  # carries wide headroom on purpose: this component's memory scales with the
+  # number of objects in the cluster, and --metric-labels-allowlist below widens
+  # every pod and deployment series further, so a cluster larger than the one
+  # measured will land well above the peak seen here.
+  # 2Gi is 6.7x that peak, so scaling linearly with object count it stays a
+  # ceiling rather than a bound up to roughly 2100 pods and 170k series.
+  #
+  # A memory limit is what sets memory.max on the pod cgroup, and the Talos
+  # userspace OOM handler only ever selects cgroups that lack one, so running
+  # this without a limit leaves it an eviction candidate on every node. See
+  # docs/operations/system-memory-limits.md.
+  #
+  # No CPU limit: it is irrelevant to that OOM ranking, and a ceiling that binds
+  # only buys CFS throttling, which for a metrics scraper turns into scrape
+  # timeouts rather than backpressure.
+  resources:
+    requests:
+      cpu: 50m
+      memory: 192Mi
+    limits:
+      memory: 2Gi
   extraArgs:
     - --metric-labels-allowlist=pods=[*],deployments=[*]
   rbac:
@@ -283,13 +307,47 @@ vmagent:
       - http://vminsert-shortterm.{{ .Values.global.target }}.svc:8480/insert/0/prometheus
       - http://vminsert-longterm.{{ .Values.global.target }}.svc:8480/insert/0/prometheus
   extraArgs: {}
+  # Replaces the global promscrape.maxScrapeSize (32MB) for the kube-apiserver
+  # job only. Its /metrics grows with the number of CRDs and outgrows 32MB on a
+  # full install. vmagent buffers the whole uncompressed response even with
+  # streamParse, so keep this finite. It replaces the global in both
+  # directions: if extraArgs raises promscrape.maxScrapeSize above this value,
+  # raise this one too. An empty value falls back to the global.
+  apiserverMaxScrapeSize: 128MB
 
 fluent-bit:
+  # 14d peak 319Mi; scales with log volume, so the limit carries wide headroom.
+  # See the node-DaemonSet note at the bottom of this file.
+  resources:
+    requests:
+      cpu: 50m
+      memory: 128Mi
+    limits:
+      memory: 1Gi
   rbac:
     eventsAccess: true
+  # Relax probe timing to survive a loaded install. Fluent-bit's HTTP server on
+  # :2020 (the probe target) does not bind until AFTER the kubernetes filter's
+  # "testing connectivity with API server" step; under concurrent install the
+  # kube-API can be unreachable for ~10s, delaying the :2020 bind, and the
+  # single-threaded HTTP server can miss a 1s timeout while the engine is busy.
+  # The subchart defaults (initialDelaySeconds 0, timeoutSeconds 1,
+  # failureThreshold 3) then liveness-kill fluent-bit into a crash loop. httpGet
+  # stays on path / port http (:2020) — same target as the subchart defaults.
+  livenessProbe:
+    httpGet:
+      path: /
+      port: http
+    initialDelaySeconds: 15
+    periodSeconds: 10
+    timeoutSeconds: 5
+    failureThreshold: 6
   readinessProbe:
     httpGet:
       path: /
+      port: http
+    timeoutSeconds: 5
+    failureThreshold: 6
   daemonSetVolumes:
     - name: varlog
       hostPath:
@@ -358,7 +416,7 @@ fluent-bit:
           Host vlinsert-generic.{{ .Values.global.target }}.svc
           port 9481
           compress gzip
-          uri /insert/jsonline?_stream_fields=log_source,reason,meatdata_namespace,metadata_name&_msg_field=message&_time_field=date
+          uri /insert/jsonline?_stream_fields=log_source,reason,metadata_namespace,metadata_name&_msg_field=message&_time_field=date
           format json_lines
           json_date_format iso8601
           header AccountID 0
@@ -374,6 +432,19 @@ fluent-bit:
           json_date_format iso8601
           header AccountID 0
           header ProjectID 0
+      {{- range $target, $_ := include "monitoring-agents.tenantLogRoutes" . | fromJson }}
+      [OUTPUT]
+          Name http
+          Match tenant.{{ $target }}.*
+          Host vlinsert-generic.{{ $target }}.svc
+          port 9481
+          compress gzip
+          uri /insert/jsonline?_stream_fields=log_source,stream,kubernetes_pod_name,kubernetes_container_name,kubernetes_namespace_name&_msg_field=log&_time_field=date
+          format json_lines
+          json_date_format iso8601
+          header AccountID 0
+          header ProjectID 0
+      {{- end }}
     filters: |
       [FILTER]
           Name kubernetes
@@ -423,6 +494,61 @@ fluent-bit:
           Name modify
           Match *
           Add cluster root-cluster
+      [FILTER]
+          Name modify
+          Match kube.*
+          Rename kubernetes_pod_name keep_kubernetes_pod_name
+          Rename kubernetes_namespace_name keep_kubernetes_namespace_name
+          Rename kubernetes_container_name keep_kubernetes_container_name
+      [FILTER]
+          Name modify
+          Match kube.*
+          Remove_wildcard kubernetes_
+      [FILTER]
+          Name modify
+          Match kube.*
+          Rename keep_kubernetes_pod_name kubernetes_pod_name
+          Rename keep_kubernetes_namespace_name kubernetes_namespace_name
+          Rename keep_kubernetes_container_name kubernetes_container_name
+      {{- /*
+        Routed records are re-tagged with keep false: they leave the default
+        outputs, so a tenant that runs its own monitoring holds its logs and the
+        root store no longer does. rewrite_tag sits last so the re-tagged record
+        already carries the kube.* processing above; the record then re-enters
+        the chain under its new tag, where the Match * "Add tenant" is a no-op
+        (Add never overwrites), hence the per-target Set.
+      */}}
+      {{- $routes := include "monitoring-agents.tenantLogRoutes" . | fromJson }}
+      {{- if $routes }}
+      [FILTER]
+          Name rewrite_tag
+          Match kube.*
+      {{- range $target, $namespaces := $routes }}
+          Rule $kubernetes_namespace_name ^({{ $namespaces | sortAlpha | join "|" }})$ tenant.{{ $target }}.$TAG false
+      {{- end }}
+      {{- range $target, $_ := $routes }}
+      [FILTER]
+          Name modify
+          Match tenant.{{ $target }}.*
+          Set tenant {{ $target }}
+      {{- end }}
+      {{- end }}
 scrapeRules:
   etcd:
     enabled: false
+
+# Node DaemonSets: a memory limit is what sets memory.max on the pod cgroup, and
+# the Talos userspace OOM handler (v1.12+) only ever kills cgroups that lack one.
+# Both of these ran BestEffort on every node, so they were eviction candidates
+# whenever a tenant workload drove node memory PSI. Requests come from observed
+# usage (14d peak on a 3-node dev cluster); limits are a runaway backstop rather
+# than a fitted ceiling — fluent-bit in particular scales with log volume, which
+# a dev cluster understates.
+prometheus-node-exporter:
+  # 14d peak 42Mi.
+  resources:
+    requests:
+      cpu: 10m
+      memory: 32Mi
+    limits:
+      memory: 256Mi
diff --git a/packages/system/monitoring-rd/cozyrds/monitoring.yaml b/packages/system/monitoring-rd/cozyrds/monitoring.yaml
index ce4d75c5d1..2cb67482c4 100644
--- a/packages/system/monitoring-rd/cozyrds/monitoring.yaml
+++ b/packages/system/monitoring-rd/cozyrds/monitoring.yaml
@@ -2,13 +2,25 @@ apiVersion: cozystack.io/v1alpha1
 kind: ApplicationDefinition
 metadata:
   name: monitoring
+  annotations:
+    # Monitoring's HR bootstraps Grafana + Alerta + VMCluster + CNPG
+    # (postgres for Grafana state) + optionally two Keycloak CRs
+    # (KeycloakClient, KeycloakClientScope) under `spec.oidc.mode:
+    # System`, plus a post-install/post-upgrade Job that reconciles
+    # `spec.oidc.users` into Grafana org membership. The Keycloak-side
+    # reconciliation is asynchronous against an operator in
+    # `cozy-keycloak`, not the tenant namespace, so Flux's default 5m
+    # install window is tight even before adding OIDC. Override to
+    # 15m — matches the precedent set by tenant-rd/kubernetes-rd
+    # cozyrds annotations for long-bootstrap stacks.
+    release.cozystack.io/helm-install-timeout: "15m"
 spec:
   application:
     kind: Monitoring
     singular: monitoring
     plural: monitorings
     openAPISchema: |-
-      {"title":"Chart Values","type":"object","properties":{"host":{"description":"The hostname used to access Grafana externally (defaults to 'grafana' subdomain for the tenant host).","type":"string","default":""},"metricsStorages":{"description":"Configuration of metrics storage instances.","type":"array","default":[{"deduplicationInterval":"15s","name":"shortterm","retentionPeriod":"3d","storage":"10Gi","storageClassName":""},{"deduplicationInterval":"5m","name":"longterm","retentionPeriod":"14d","storage":"10Gi","storageClassName":""}],"items":{"type":"object","required":["deduplicationInterval","name","retentionPeriod","storage"],"properties":{"deduplicationInterval":{"description":"Deduplication interval for metrics.","type":"string"},"name":{"description":"Name of the storage instance.","type":"string"},"retentionPeriod":{"description":"Retention period for metrics.","type":"string"},"storage":{"description":"Persistent volume size.","type":"string","default":"10Gi"},"storageClassName":{"description":"StorageClass used for the data.","type":"string"},"vminsert":{"description":"Configuration for vminsert.","type":"object","properties":{"maxAllowed":{"description":"Maximum allowed resources.","type":"object","properties":{"cpu":{"description":"CPU limit.","default":1,"pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Memory limit.","default":"1Gi","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}},"minAllowed":{"description":"Minimum guaranteed resources.","type":"object","properties":{"cpu":{"description":"CPU request.","default":"100m","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Memory request.","default":"256Mi","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}}}},"vmselect":{"description":"Configuration for vmselect.","type":"object","properties":{"maxAllowed":{"description":"Maximum allowed resources.","type":"object","properties":{"cpu":{"description":"CPU limit.","default":1,"pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Memory limit.","default":"1Gi","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}},"minAllowed":{"description":"Minimum guaranteed resources.","type":"object","properties":{"cpu":{"description":"CPU request.","default":"100m","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Memory request.","default":"256Mi","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}}}},"vmstorage":{"description":"Configuration for vmstorage.","type":"object","properties":{"maxAllowed":{"description":"Maximum allowed resources.","type":"object","properties":{"cpu":{"description":"CPU limit.","default":1,"pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Memory limit.","default":"1Gi","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}},"minAllowed":{"description":"Minimum guaranteed resources.","type":"object","properties":{"cpu":{"description":"CPU request.","default":"100m","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Memory request.","default":"256Mi","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}}}}}}},"logsStorages":{"description":"Configuration of logs storage instances.","type":"array","default":[{"name":"generic","retentionPeriod":"1","storage":"10Gi","storageClassName":"replicated"}],"items":{"type":"object","required":["name","retentionPeriod","storage","storageClassName"],"properties":{"name":{"description":"Name of the storage instance.","type":"string"},"retentionPeriod":{"description":"Retention period for logs.","type":"string","default":"1"},"storage":{"description":"Persistent volume size.","type":"string","default":"10Gi"},"storageClassName":{"description":"StorageClass used to store the data.","type":"string","default":"replicated"}}}},"alerta":{"description":"Configuration for the Alerta service.","type":"object","default":{},"properties":{"alerts":{"description":"Alert routing configuration.","type":"object","default":{},"properties":{"slack":{"description":"Configuration for Slack alerts.","type":"object","default":{},"required":["url"],"properties":{"disabledSeverity":{"description":"List of severities without alerts (e.g. [\"informational\",\"warning\"]).","type":"array","default":[],"items":{"type":"string"}},"url":{"description":"Configuration uri for Slack alerts.","type":"string","default":""}}},"telegram":{"description":"Configuration for Telegram alerts.","type":"object","default":{},"required":["chatID","token"],"properties":{"chatID":{"description":"Telegram chat ID(s), separated by commas.","type":"string","default":""},"disabledSeverity":{"description":"List of severities without alerts (e.g. [\"informational\",\"warning\"]).","type":"array","default":[],"items":{"type":"string"}},"token":{"description":"Telegram bot token.","type":"string","default":""}}}}},"resources":{"description":"Resource configuration.","type":"object","default":{},"properties":{"limits":{"description":"Resource limits.","type":"object","default":{},"properties":{"cpu":{"description":"CPU limit.","default":1,"pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Memory limit.","default":"1Gi","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}},"requests":{"description":"Resource requests.","type":"object","default":{},"properties":{"cpu":{"description":"CPU request.","default":"100m","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Memory request.","default":"256Mi","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}}}},"storage":{"description":"Persistent volume size for the database.","type":"string","default":"10Gi"},"storageClassName":{"description":"StorageClass used for the database.","type":"string","default":""}}},"grafana":{"description":"Configuration for Grafana.","type":"object","default":{},"properties":{"db":{"description":"Database configuration.","type":"object","default":{},"properties":{"size":{"description":"Persistent volume size for the database.","type":"string","default":"10Gi"}}},"resources":{"description":"Resource configuration.","type":"object","default":{},"properties":{"limits":{"description":"Resource limits.","type":"object","default":{},"properties":{"cpu":{"description":"CPU limit.","default":1,"pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Memory limit.","default":"1Gi","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}},"requests":{"description":"Resource requests.","type":"object","default":{},"properties":{"cpu":{"description":"CPU request.","default":"100m","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Memory request.","default":"256Mi","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}}}}}},"vmagent":{"description":"Configuration for VictoriaMetrics Agent.","type":"object","default":{},"properties":{"externalLabels":{"description":"External labels applied to all metrics.","type":"object","default":{"cluster":"cozystack"}},"remoteWrite":{"description":"Remote write configuration.","type":"object","default":{"urls":["http://vminsert-shortterm:8480/insert/0/prometheus","http://vminsert-longterm:8480/insert/0/prometheus"]}}}}}}
+      {"title":"Chart Values","type":"object","properties":{"host":{"description":"The hostname used to access Grafana externally (defaults to 'grafana' subdomain for the tenant host).","type":"string","default":""},"metricsStorages":{"description":"Configuration of metrics storage instances.","type":"array","default":[{"deduplicationInterval":"15s","name":"shortterm","retentionPeriod":"3d","storage":"10Gi","storageClassName":""},{"deduplicationInterval":"5m","name":"longterm","retentionPeriod":"14d","storage":"10Gi","storageClassName":""}],"items":{"type":"object","required":["deduplicationInterval","name","retentionPeriod","storage"],"properties":{"deduplicationInterval":{"description":"Deduplication interval for metrics.","type":"string"},"name":{"description":"Name of the storage instance.","type":"string"},"retentionPeriod":{"description":"Retention period for metrics.","type":"string"},"storage":{"description":"Persistent volume size.","type":"string","default":"10Gi"},"storageClassName":{"description":"StorageClass used for the data.","type":"string"},"vminsert":{"description":"Configuration for vminsert.","type":"object","properties":{"maxAllowed":{"description":"Maximum allowed resources.","type":"object","properties":{"cpu":{"description":"CPU limit.","default":1,"pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Memory limit.","default":"1Gi","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}},"minAllowed":{"description":"Minimum guaranteed resources.","type":"object","properties":{"cpu":{"description":"CPU request.","default":"100m","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Memory request.","default":"256Mi","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}}}},"vmselect":{"description":"Configuration for vmselect.","type":"object","properties":{"maxAllowed":{"description":"Maximum allowed resources.","type":"object","properties":{"cpu":{"description":"CPU limit.","default":1,"pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Memory limit.","default":"1Gi","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}},"minAllowed":{"description":"Minimum guaranteed resources.","type":"object","properties":{"cpu":{"description":"CPU request.","default":"100m","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Memory request.","default":"256Mi","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}}}},"vmstorage":{"description":"Configuration for vmstorage.","type":"object","properties":{"maxAllowed":{"description":"Maximum allowed resources.","type":"object","properties":{"cpu":{"description":"CPU limit.","default":1,"pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Memory limit.","default":"1Gi","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}},"minAllowed":{"description":"Minimum guaranteed resources.","type":"object","properties":{"cpu":{"description":"CPU request.","default":"100m","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Memory request.","default":"256Mi","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}}}}}}},"logsStorages":{"description":"Configuration of logs storage instances.","type":"array","default":[{"name":"generic","retentionPeriod":"1","storage":"10Gi","storageClassName":"replicated"}],"items":{"type":"object","required":["name","retentionPeriod","storage","storageClassName"],"properties":{"name":{"description":"Name of the storage instance.","type":"string"},"retentionPeriod":{"description":"Retention period for logs.","type":"string","default":"1"},"storage":{"description":"Persistent volume size.","type":"string","default":"10Gi"},"storageClassName":{"description":"StorageClass used to store the data.","type":"string","default":"replicated"}}}},"tracingStorages":{"description":"Configuration of traces storage instances. Empty by default (tracing off): no backend and no trace collector are rendered. Adding an entry provisions a VictoriaTraces backend and, while tracingCollector.enabled is true, deploys the OTLP collector in front of it. A tenant with shared-central tracing (the Tenant's tracingCentral) gets the collector, while tracingCollector.enabled is true, without an entry, which then exports to the shared store; entries still listed keep their store and datasource, so traces stored before the switch stay readable until the entry is removed.","type":"array","default":[],"items":{"type":"object","required":["mode","name","retentionPeriod","storage","storageClassName"],"properties":{"mode":{"description":"Deployment mode: \"cluster\" renders a VTCluster; \"single\" renders a single-binary VTSingle for edge/dev/small clusters. Treat as immutable once a backend exists: mode selects which Kind is rendered under the same name, so changing it on a running backend re-identifies the object rather than reconfiguring it. Switching from \"single\" to \"cluster\" prunes the VTSingle and the operator garbage-collects its PVC (stored traces are lost); switching from \"cluster\" to \"single\" (or removing the entry) leaves the vtstorage PVCs Bound and billed until the whole Monitoring release is deleted. The API cannot guard this (transition rules are not available on an array-item field), so this note is the only guard: migrate deliberately, accepting the loss.","type":"string","default":"cluster","enum":["cluster","single"]},"name":{"description":"Name of the storage instance: a lowercase RFC 1123 label of at most 42 characters. Treat as immutable once a backend exists: the VTCluster/VTSingle, its Services, PVCs and Grafana datasource are all named after it, so renaming an entry deploys a new, empty backend and removes the old one, the same way changing mode does (single mode loses the old PVC, cluster mode leaves the old vtstorage PVCs Bound until the whole Monitoring release is deleted).","type":"string"},"retentionDiskUsageBytes":{"description":"Optional disk-usage cap as a VictoriaMetrics BytesString (e.g. \"8GB\" or \"8GiB\"), bounding disk use on top of the age-based retentionPeriod. Uses byte-suffix grammar (kb/mb/gb/tb, KiB/MiB/GiB/TiB), NOT the Kubernetes-quantity grammar of the sibling storage field, so \"8Gi\" is rejected by the operator. In cluster mode the cap is per vtstorage replica (replicaCount 2), so the effective total is twice the value. Unset, the store drops its oldest day once its filesystem is 80% full instead, so every store is disk-bounded. Either way VictoriaTraces keeps the last two days, so spans arriving faster than the cap allows for two days can still fill the disk.","type":"string"},"retentionPeriod":{"description":"Retention period for traces.","type":"string","default":"14d"},"storage":{"description":"Persistent volume size.","default":"10Gi","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"storageClassName":{"description":"StorageClass used to store the data.","type":"string","default":"replicated"}}}},"tracingCentralHost":{"description":"tenant-root only: accept spans from tenants that turned on shared-central tracing (the Tenant's tracingCentral) into this Monitoring's tracingStorages entry named `generic`, which must be in `cluster` mode. Every central tenant then shares that store's disk and retention with tenant-root, and nothing reserves space per tenant: once the store's disk cap is reached (retentionDiskUsageBytes, or 80% of its filesystem) the oldest spans of all of them are evicted together. Each tenant is held to the platform's monitoring.tracingCentralTenantBytesPerSecond, which by default lets one tenant write at most the cap of a default 10Gi store, counted uncompressed and before the tenant's sampling, over the two days VictoriaTraces always keeps, so raise it with the store; several tenants writing at their limit together still can fill it. That bound holds for a tenant whose collector keeps running: each collector pod starts with a full bucket, up to 5 MiB or one second of its share of the rate when that is larger, and any change to the tenant's Monitoring rolls every collector pod, so a tenant that keeps changing it writes that much more on each rollout, for up to ten replicas; closing that needs a limiter with shared state, which the collector does not run. Ignored outside tenant-root. The tenant-root namespace is inside the trust boundary of the shared store, as it is for the metrics of tenants that rely on a parent's monitoring: vmauth pins each central tenant to its own account, but workloads in tenant-root reach the store directly, and one that learns a tenant's account ID (a hash of its namespace name and UID, which its VMUsers carry) can read and write that account. Whoever tenant-root admits to its Grafana is inside it too, since tenant-root's own datasource for the store reaches vtselect without vmauth; who that is follows its Grafana's oidc mode (with System, tenant-root's own groups, which already hold the same access level in every tenant under tenant-root). The render refuses to stop hosting while central tenants remain, but removing the tenant-root Monitoring altogether is not a render and is not refused: turn tracingCentral off on the central tenants first, since until then every Monitoring render of theirs fails, their metrics, logs and alerting changes included. The refusals read each other's objects when they render, so a tenant turning tracingCentral on while tenant-root stops hosting can pass both: that tenant's collector then exports to a vmauth that is gone while every release reports Ready, until its Monitoring renders again. Recover by hosting again; turning that tenant's tracingCentral off instead ends the silent drop, and turning it on again is then refused until tenant-root hosts.","type":"boolean","default":false},"tracingCollector":{"description":"OpenTelemetry Collector for trace ingestion. With shared-central tracing it refuses spans above the platform's per-tenant write rate: OTLP/HTTP senders retry them, OTLP/gRPC senders drop them, so export over HTTP. It also refuses a request larger than 3 MiB (decompressed) with a 400, which senders do not retry, so keep export batches below that.","type":"object","default":{},"required":["enabled","replicas","samplingPercentage"],"properties":{"enabled":{"description":"Deploy the OTLP collector. When disabled, applications must send OTLP straight to the traces backend (no central sampling/redaction); with shared-central tracing they have no path to it, so no new spans arrive, while the traces already stored stay readable. The collector fronts a single backend, and the limit holds with shared-central tracing too, since turning that off makes it export to the local entry again: while it is enabled, tracingStorages must hold at most one entry, and adding a second one fails the whole Monitoring render until the extra entry is removed or the collector is disabled.","type":"boolean","default":true},"redactAttributes":{"description":"Span attribute keys to drop before export (the PII/secret control point, e.g. db.statement).","type":"array","default":[],"items":{"type":"string"}},"replicas":{"description":"Number of collector replicas. Head sampling is trace-id-deterministic, so replicas>1 are safe and remove the single-ingest-path SPOF. With shared-central tracing each replica sends up to two requests at a time against this tenant's write limit of four per vmauth replica, so more replicas do not raise the tenant's throughput; the tenant's write rate (the platform's monitoring.tracingCentralTenantBytesPerSecond) is split across them as well, so a sender whose connection stays on one replica gets that replica's share, and each replica that starts lets through above the rate up to 5 MiB, or one second of its share when that is larger, which is why shared-central tracing allows at most 10 replicas and fails the render above that.","type":"integer","default":1,"minimum":1},"resources":{"description":"Resource configuration for the collector.","type":"object","default":{},"properties":{"limits":{"description":"Resource limits.","type":"object","default":{},"properties":{"cpu":{"description":"CPU limit.","default":1,"pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Memory limit.","default":"1Gi","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}},"requests":{"description":"Resource requests.","type":"object","default":{},"properties":{"cpu":{"description":"CPU request.","default":"100m","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Memory request.","default":"256Mi","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}}}},"samplingPercentage":{"description":"Head-sampling percentage applied at the collector before export.","type":"integer","default":10,"maximum":100,"minimum":0}}},"alerta":{"description":"Configuration for the Alerta service.","type":"object","default":{},"properties":{"alerts":{"description":"Alert routing configuration.","type":"object","default":{},"properties":{"email":{"description":"Configuration for email alerts. Alerts carrying the label notify_email with the string value true are emailed when their severity is in the severities list (default critical and major). A bare YAML boolean does not match. Alerts listed in alertnames are emailed unless matched by an earlier platform route.","type":"object","default":{},"required":["from","smarthost","to"],"properties":{"alertnames":{"description":"Alert names emailed whether or not the rule carries the notify_email label, with no severity filter. Earlier platform routes still take precedence. Alerts with `event=\"Heartbeat\"`, including `Watchdog`, go only to Alerta, and alerts with severity `none`, `CDIDefaultStorageClassDegraded` and `CDINoDefaultStorageClass` are blackholed and never reach email. This is the way to opt in alerts the platform ships, since their helm-owned rule definitions cannot be labelled per cluster. Entries must be plain Prometheus alert names such as `KubeAPIDown`, and anything else fails the render. Empty adds no extra route.","type":"array","default":[],"items":{"type":"string"}},"authUsername":{"description":"Username for SMTP LOGIN/PLAIN authentication. The password is read from the `password` key of a Secret named `alertmanager-email-password` in the release namespace, which the platform operator creates. The name is fixed and the Secret is mounted into Alertmanager, so a missing Secret blocks the whole Alertmanager rollout, not only email delivery. The credential in it must belong to this tenant alone. `smarthost` is chosen by whoever writes the Monitoring, so one relay credential provisioned under the same name in every namespace can be collected by pointing `smarthost` at a host the tenant controls.","type":"string","default":""},"from":{"description":"Sender address, one only. A display name is accepted. It takes the same narrower form as `to`, and an address outside it fails the render.","type":"string","default":""},"repeatInterval":{"description":"Minimum time before a still-firing alert is emailed again, as an Alertmanager duration with units `y`, `w`, `d`, `h`, `m`, `s`, `ms` in descending order, each at most once, such as `5m`, `12h` or `1h30m`. Delivery is evaluated every 5m, so shorter intervals take effect at 5m and other intervals round up to a multiple of 5m. Zero, a unit out of order and a total beyond what Alertmanager accepts fail the render. Empty keeps the 12h default.","type":"string","default":""},"severities":{"description":"Severities the notify_email route accepts (e.g. [\"critical\",\"major\",\"warning\"]). Empty keeps the default of critical and major. List every severity in use to email opted-in alerts regardless of severity. Entries must be plain severity names, and anything else fails the render.","type":"array","default":[],"items":{"type":"string"}},"smarthost":{"description":"SMTP server as `host:port` (e.g. \"smtp.example.com:465\"). A value without a port, an invalid bracketed IP address or a port with leading zeros fails the render. Port 465 uses implicit TLS, other ports use STARTTLS.","type":"string","default":""},"to":{"description":"Recipient address, or several separated by commas. A display name is accepted, such as `Oncall <oncall@example.org>`, as long as it carries no comma. Quote display names containing punctuation such as `:`, `@`, parentheses or `?`. RFC 2047 encoded words are not accepted. IP domain literals accept dotted-quad IPv4 only. IPv6 literals are rejected because Go mail parsers disagree on their syntax across versions. ASCII control characters are rejected. Addresses must be literal, so Alertmanager template actions are rejected. The accepted form is deliberately narrower than RFC 5322. The local part must be a dot-atom, with no leading, trailing or doubled dot, and quoted local parts, comments and a `mailto:` prefix are rejected. An address outside that form fails the render, because Alertmanager parses addresses only when it sends and drops the notification with no record a tenant can read.","type":"string","default":""}}},"slack":{"description":"Configuration for Slack alerts.","type":"object","default":{},"required":["url"],"properties":{"disabledSeverity":{"description":"List of severities without alerts (e.g. [\"informational\",\"warning\"]).","type":"array","default":[],"items":{"type":"string"}},"url":{"description":"Configuration uri for Slack alerts.","type":"string","default":""}}},"telegram":{"description":"Configuration for Telegram alerts.","type":"object","default":{},"required":["chatID","token"],"properties":{"chatID":{"description":"Telegram chat ID(s), separated by commas.","type":"string","default":""},"disabledSeverity":{"description":"List of severities without alerts (e.g. [\"informational\",\"warning\"]).","type":"array","default":[],"items":{"type":"string"}},"token":{"description":"Telegram bot token.","type":"string","default":""}}}}},"resources":{"description":"Resource configuration.","type":"object","default":{},"properties":{"limits":{"description":"Resource limits.","type":"object","default":{},"properties":{"cpu":{"description":"CPU limit.","default":1,"pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Memory limit.","default":"1Gi","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}},"requests":{"description":"Resource requests.","type":"object","default":{},"properties":{"cpu":{"description":"CPU request.","default":"100m","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Memory request.","default":"256Mi","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}}}},"storage":{"description":"Persistent volume size for the database.","type":"string","default":"10Gi"},"storageClassName":{"description":"StorageClass used for the database.","type":"string","default":""}}},"grafana":{"description":"Configuration for Grafana.","type":"object","default":{},"properties":{"db":{"description":"Database configuration.","type":"object","default":{},"properties":{"size":{"description":"Persistent volume size for the database.","type":"string","default":"10Gi"}}},"resources":{"description":"Resource configuration.","type":"object","default":{},"properties":{"limits":{"description":"Resource limits.","type":"object","default":{},"properties":{"cpu":{"description":"CPU limit.","default":1,"pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Memory limit.","default":"1Gi","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}},"requests":{"description":"Resource requests.","type":"object","default":{},"properties":{"cpu":{"description":"CPU request.","default":"100m","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Memory request.","default":"256Mi","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}}}}}},"vmagent":{"description":"Configuration for VictoriaMetrics Agent.","type":"object","default":{},"properties":{"externalLabels":{"description":"External labels applied to all metrics.","type":"object","default":{"cluster":"cozystack"}},"remoteWrite":{"description":"Remote write configuration.","type":"object","default":{"urls":["http://vminsert-shortterm:8480/insert/0/prometheus","http://vminsert-longterm:8480/insert/0/prometheus"]}}}},"oidc":{"description":"OIDC authentication for the Grafana instance. See docs/oidc-grafana.md for the operator guide.","type":"object","default":{},"required":["mode"],"properties":{"customConfig":{"description":"Tenant-supplied `[auth.generic_oauth]` payload; consumed only when `mode: CustomConfig`.","type":"object","default":{},"properties":{"config":{"description":"Inline map of `[auth.generic_oauth]` keys. Written verbatim into the Grafana CR `spec.config`. Mutually exclusive with `secretRef.name`.","type":"object","default":{}},"secretRef":{"description":"Reference to a Secret holding an `auth.ini` fragment; mounted under `/etc/grafana/oidc` and loaded via `GF_PATHS_CUSTOM_INI`. With shared-central tracing only its `auth.ini` key is mounted, so the fragment cannot read another key of the Secret with `$__file{}`.","type":"object","default":{},"properties":{"name":{"description":"Name of an existing Secret in the release namespace whose `auth.ini` key holds a ready-made `[auth.generic_oauth]` block. Mutually exclusive with `customConfig.config`.","type":"string","default":""}}}}},"mode":{"description":"Identity mode. `None`: no OIDC, only the `grafana-admin-password` Secret works. `System`: trust the platform `cozy` realm via a per-instance confidential client and audience binding; zero-config default. `CustomConfig`: trust a tenant-supplied issuer directly (BYO); `cozy` is not in the path.","type":"string","default":"None","enum":["None","System","CustomConfig"]},"users":{"description":"Users granted access to this Grafana instance's org. Each entry is reconciled into Grafana org membership + role by a chart-owned post-install/post-upgrade Job. Works for both `System` and `CustomConfig` modes; ignored when `mode: None`. Users not listed here get nothing (no default org role from group mapping).","type":"array","default":[],"items":{"type":"object","required":["email","role"],"properties":{"email":{"description":"Email address matched against the `email` claim from the issuer. The chart pre-provisions a Grafana account with this email so the users-Job can set the org role before the operator's first login (`oauth_allow_insecure_email_lookup = true` glues the two together). Must match a conservative pattern: local part is `[A-Za-z0-9._%+-]+`, domain is `[A-Za-z0-9.-]+\\.[A-Za-z]{2,}`. Whitespace, quoted literals, and unusual URL-reserved characters are rejected on schema level so the reconcile-Job's shell handling never has to defend against malformed input.","type":"string"},"role":{"description":"Grafana org role to bind: `Admin`, `Editor`, or `Viewer`. Applied to the release's Grafana org (`Main Org.`); server-level `GrafanaAdmin` promotion is out of scope for Phase 1. Required — the users-Job POSTs `{loginOrEmail, role}` to `/api/orgs/1/users` and PATCHes `{role}` to converge across re-runs; omitting the field would render `role: \"null\"` into the body and fail with HTTP 400.","type":"string","enum":["Admin","Editor","Viewer"]}}}}}}}}
   release:
     prefix: ""
     labels:
@@ -26,7 +38,7 @@ spec:
     description: Monitoring and observability stack
     module: true
     icon: PHN2ZyB3aWR0aD0iMTQ0IiBoZWlnaHQ9IjE0NCIgdmlld0JveD0iMCAwIDE0NCAxNDQiIGZpbGw9Im5vbmUiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+CjxyZWN0IHdpZHRoPSIxNDQiIGhlaWdodD0iMTQ0IiByeD0iMjQiIGZpbGw9InVybCgjcGFpbnQwX2xpbmVhcl82ODdfMzI2OCkiLz4KPGcgY2xpcC1wYXRoPSJ1cmwoI2NsaXAwXzY4N18zMjY4KSI+CjxwYXRoIGQ9Ik04OS41MDM5IDExMS43MDdINTQuNDk3QzU0LjE3MjcgMTExLjcwNyA1NC4wMTA4IDExMS4yMjEgNTQuMzM0OSAxMTEuMDU5TDU3LjI1MjIgMTA4Ljk1MkM2MC4zMzE0IDEwNi42ODMgNjEuOTUyMiAxMDIuNjMxIDYwLjk3OTcgOTguNzQxMkg4My4wMjFDODIuMDQ4NSAxMDIuNjMxIDgzLjY2OTMgMTA2LjY4MyA4Ni43NDg1IDEwOC45NTJMODkuNjY1OCAxMTEuMDU5Qzg5Ljk5IDExMS4yMjEgODkuODI3OSAxMTEuNzA3IDg5LjUwMzkgMTExLjcwN1oiIGZpbGw9IiNCMEI2QkIiLz4KPHBhdGggZD0iTTExMy4zMjggOTguNzQxSDMwLjY3MjVDMjcuNTkzMSA5OC43NDEgMjUgOTYuMTQ4IDI1IDkzLjA2ODdWMzMuMTAzMkMyNSAzMC4wMjM5IDI3LjU5MzEgMjcuNDMwNyAzMC42NzI1IDI3LjQzMDdIMTEzLjMyOEMxMTYuNDA3IDI3LjQzMDcgMTE5IDMwLjAyMzcgMTE5IDMzLjEwMzJWOTMuMDY4N0MxMTkgOTYuMTQ4IDExNi40MDcgOTguNzQxIDExMy4zMjggOTguNzQxWiIgZmlsbD0iI0U4RURFRSIvPgo8cGF0aCBkPSJNMTE5IDg0LjE1NDlIMjVWMzMuMTAzMkMyNSAzMC4wMjM5IDI3LjU5MzEgMjcuNDMwNyAzMC42NzI1IDI3LjQzMDdIMTEzLjMyOEMxMTYuNDA3IDI3LjQzMDcgMTE5IDMwLjAyMzcgMTE5IDMzLjEwMzJMMTE5IDg0LjE1NDlaIiBmaWxsPSIjMzg0NTRGIi8+CjxwYXRoIGQ9Ik05MC42Mzc0IDExNi41NjlINTMuMzYxNkM1Mi4wNjUxIDExNi41NjkgNTAuOTMwNyAxMTUuNDM1IDUwLjkzMDcgMTE0LjEzOEM1MC45MzA3IDExMi44NDEgNTIuMDY1MSAxMTEuNzA3IDUzLjM2MTYgMTExLjcwN0g5MC42Mzc0QzkxLjkzMzkgMTExLjcwNyA5My4wNjg0IDExMi44NDEgOTMuMDY4NCAxMTQuMTM4QzkzLjA2ODQgMTE1LjQzNSA5MS45MzM5IDExNi41NjkgOTAuNjM3NCAxMTYuNTY5WiIgZmlsbD0iI0U4RURFRSIvPgo8cGF0aCBkPSJNNTQuMTcyMiAzOC43NzU3SDMzLjEwMzJDMzIuMTMwNyAzOC43NzU3IDMxLjQ4MjQgMzguMTI3NCAzMS40ODI0IDM3LjE1NDlDMzEuNDgyNCAzNi4xODI0IDMyLjEzMDcgMzUuNTM0MiAzMy4xMDMyIDM1LjUzNDJINTQuMTcyMkM1NS4xNDQ3IDM1LjUzNDIgNTUuNzkzIDM2LjE4MjQgNTUuNzkzIDM3LjE1NDlDNTUuNzkyOCAzOC4xMjc0IDU1LjE0NDUgMzguNzc1NyA1NC4xNzIyIDM4Ljc3NTdaIiBmaWxsPSIjREQzNDJFIi8+CjxwYXRoIGQ9Ik02My44OTYzIDQ1LjI1OTFINDEuMjA2N0M0MC4yMzQyIDQ1LjI1OTEgMzkuNTg1OSA0NC42MTA4IDM5LjU4NTkgNDMuNjM4M0MzOS41ODU5IDQyLjY2NTggNDAuMjM0MiA0Mi4wMTc2IDQxLjIwNjcgNDIuMDE3Nkg2My44OTYzQzY0Ljg2ODggNDIuMDE3NiA2NS41MTcxIDQyLjY2NTggNjUuNTE3MSA0My42MzgzQzY1LjUxNzEgNDQuNjEwOCA2NC44Njg4IDQ1LjI1OTEgNjMuODk2MyA0NS4yNTkxWiIgZmlsbD0iIzczODNCRiIvPgo8cGF0aCBkPSJNMzQuNzI0IDQ1LjI1OTFIMzMuMTAzMkMzMi4xMzA3IDQ1LjI1OTEgMzEuNDgyNCA0NC42MTA4IDMxLjQ4MjQgNDMuNjM4M0MzMS40ODI0IDQyLjY2NTggMzIuMTMwNyA0Mi4wMTc2IDMzLjEwMzIgNDIuMDE3NkgzNC43MjRDMzUuNjk2NCA0Mi4wMTc2IDM2LjM0NDcgNDIuNjY1OCAzNi4zNDQ3IDQzLjYzODNDMzYuMzQ0NyA0NC42MTA4IDM1LjY5NjMgNDUuMjU5MSAzNC43MjQgNDUuMjU5MVoiIGZpbGw9IiM0MkIwNUMiLz4KPHBhdGggZD0iTTYzLjg5NjMgMzguNzc1N0g2MC42NTQ5QzU5LjY4MjQgMzguNzc1NyA1OS4wMzQyIDM4LjEyNzQgNTkuMDM0MiAzNy4xNTQ5QzU5LjAzNDIgMzYuMTgyNCA1OS42ODI0IDM1LjUzNDIgNjAuNjU0OSAzNS41MzQySDYzLjg5NjNDNjQuODY4OCAzNS41MzQyIDY1LjUxNzEgMzYuMTgyNCA2NS41MTcxIDM3LjE1NDlDNjUuNTE3MSAzOC4xMjc0IDY0Ljg2ODggMzguNzc1NyA2My44OTYzIDM4Ljc3NTdaIiBmaWxsPSIjRUNCQTE2Ii8+CjxwYXRoIGQ9Ik00Ny42ODkzIDUxLjc0MTNIMzMuMTAzMkMzMi4xMzA3IDUxLjc0MTMgMzEuNDgyNCA1MS4wOTMxIDMxLjQ4MjQgNTAuMTIwNkMzMS40ODI0IDQ5LjE0ODEgMzIuMTMwNyA0OC41IDMzLjEwMzIgNDguNUg0Ny42ODkzQzQ4LjY2MTggNDguNSA0OS4zMTAxIDQ5LjE0ODMgNDkuMzEwMSA1MC4xMjA4QzQ5LjMxMDEgNTEuMDkzMyA0OC42NjE4IDUxLjc0MTMgNDcuNjg5MyA1MS43NDEzWiIgZmlsbD0iI0REMzQyRSIvPgo8cGF0aCBkPSJNNjMuODk2OCA1MS43NDEzSDU0LjE3MjVDNTMuMiA1MS43NDEzIDUyLjU1MTggNTEuMDkzMSA1Mi41NTE4IDUwLjEyMDZDNTIuNTUxOCA0OS4xNDgxIDUzLjIwMDIgNDguNSA1NC4xNzI3IDQ4LjVINjMuODk2OUM2NC44Njk0IDQ4LjUgNjUuNTE3NyA0OS4xNDgzIDY1LjUxNzcgNTAuMTIwOEM2NS41MTc3IDUxLjA5MzMgNjQuODY5MiA1MS43NDEzIDYzLjg5NjggNTEuNzQxM1oiIGZpbGw9IiNFQ0JBMTYiLz4KPHBhdGggZD0iTTU0LjE3MjIgNTguMjI0SDMzLjEwMzJDMzIuMTMwNyA1OC4yMjQgMzEuNDgyNCA1Ny41NzU3IDMxLjQ4MjQgNTYuNjAzMkMzMS40ODI0IDU1LjYzMDcgMzIuMTMwNyA1NC45ODI0IDMzLjEwMzIgNTQuOTgyNEg1NC4xNzIyQzU1LjE0NDcgNTQuOTgyNCA1NS43OTMgNTUuNjMwNyA1NS43OTMgNTYuNjAzMkM1NS43OTMgNTcuNTc1NyA1NS4xNDQ1IDU4LjIyNCA1NC4xNzIyIDU4LjIyNFoiIGZpbGw9IiM0MkIwNUMiLz4KPHBhdGggZD0iTTYzLjg5NjMgNjQuNzA3NEg0MS4yMDY3QzQwLjIzNDIgNjQuNzA3NCAzOS41ODU5IDY0LjA1OTEgMzkuNTg1OSA2My4wODY2QzM5LjU4NTkgNjIuMTE0MSA0MC4yMzQyIDYxLjQ2NTggNDEuMjA2NyA2MS40NjU4SDYzLjg5NjNDNjQuODY4OCA2MS40NjU4IDY1LjUxNzEgNjIuMTE0MSA2NS41MTcxIDYzLjA4NjZDNjUuNTE3MSA2NC4wNTkxIDY0Ljg2ODggNjQuNzA3NCA2My44OTYzIDY0LjcwNzRaIiBmaWxsPSIjRUNCQTE2Ii8+CjxwYXRoIGQ9Ik0zNC43MjQgNjQuNzA3NEgzMy4xMDMyQzMyLjEzMDcgNjQuNzA3NCAzMS40ODI0IDY0LjA1OTEgMzEuNDgyNCA2My4wODY2QzMxLjQ4MjQgNjIuMTE0MSAzMi4xMzA3IDYxLjQ2NTggMzMuMTAzMiA2MS40NjU4SDM0LjcyNEMzNS42OTY0IDYxLjQ2NTggMzYuMzQ0NyA2Mi4xMTQxIDM2LjM0NDcgNjMuMDg2NkMzNi4zNDQ3IDY0LjA1OTEgMzUuNjk2MyA2NC43MDc0IDM0LjcyNCA2NC43MDc0WiIgZmlsbD0iI0REMzQyRSIvPgo8cGF0aCBkPSJNNDcuNjg5MyA3MS4xODk4SDMzLjEwMzJDMzIuMTMwNyA3MS4xODk4IDMxLjQ4MjQgNzAuNTQxNSAzMS40ODI0IDY5LjU2OUMzMS40ODI0IDY4LjU5NjUgMzIuMTMwNyA2Ny45NDgyIDMzLjEwMzIgNjcuOTQ4Mkg0Ny42ODkzQzQ4LjY2MTggNjcuOTQ4MiA0OS4zMTAxIDY4LjU5NjUgNDkuMzEwMSA2OS41NjlDNDkuMzEwMSA3MC41NDE1IDQ4LjY2MTggNzEuMTg5OCA0Ny42ODkzIDcxLjE4OThaIiBmaWxsPSIjNDJCMDVDIi8+CjxwYXRoIGQ9Ik02My44OTY4IDcxLjE4OThINTQuMTcyNUM1My4yIDcxLjE4OTggNTIuNTUxOCA3MC41NDE1IDUyLjU1MTggNjkuNTY5QzUyLjU1MTggNjguNTk2NSA1My4yIDY3Ljk0ODIgNTQuMTcyNSA2Ny45NDgySDYzLjg5NjhDNjQuODY5MiA2Ny45NDgyIDY1LjUxNzUgNjguNTk2NSA2NS41MTc1IDY5LjU2OUM2NS41MTc1IDcwLjU0MTUgNjQuODY5MiA3MS4xODk4IDYzLjg5NjggNzEuMTg5OFoiIGZpbGw9IiM3MzgzQkYiLz4KPHBhdGggZD0iTTU0LjE3MjIgNzcuNjcyMkgzMy4xMDMyQzMyLjEzMDcgNzcuNjcyMiAzMS40ODI0IDc3LjAyMzkgMzEuNDgyNCA3Ni4wNTE0QzMxLjQ4MjQgNzUuMDc4OSAzMi4xMzA3IDc0LjQzMDcgMzMuMTAzMiA3NC40MzA3SDU0LjE3MjJDNTUuMTQ0NyA3NC40MzA3IDU1Ljc5MyA3NS4wNzg5IDU1Ljc5MyA3Ni4wNTE0QzU1Ljc5MjggNzcuMDIzOSA1NS4xNDQ1IDc3LjY3MjIgNTQuMTcyMiA3Ny42NzIyWiIgZmlsbD0iI0VDQkExNiIvPgo8cGF0aCBkPSJNNjMuODk2MyA3Ny42NzIySDYwLjY1NDlDNTkuNjgyNCA3Ny42NzIyIDU5LjAzNDIgNzcuMDIzOSA1OS4wMzQyIDc2LjA1MTRDNTkuMDM0MiA3NS4wNzg5IDU5LjY4MjQgNzQuNDMwNyA2MC42NTQ5IDc0LjQzMDdINjMuODk2M0M2NC44Njg4IDc0LjQzMDcgNjUuNTE3MSA3NS4wNzg5IDY1LjUxNzEgNzYuMDUxNEM2NS41MTcxIDc3LjAyMzkgNjQuODY4OCA3Ny42NzIyIDYzLjg5NjMgNzcuNjcyMloiIGZpbGw9IiM0MkIwNUMiLz4KPHBhdGggZD0iTTEwMS4xNzIgNzcuNjcyMkg4MC4xMDMyQzc5LjEzMDcgNzcuNjcyMiA3OC40ODI0IDc3LjAyMzkgNzguNDgyNCA3Ni4wNTE0Qzc4LjQ4MjQgNzUuMDc4OSA3OS4xMzA3IDc0LjQzMDcgODAuMTAzMiA3NC40MzA3SDEwMS4xNzJDMTAyLjE0NSA3NC40MzA3IDEwMi43OTMgNzUuMDc4OSAxMDIuNzkzIDc2LjA1MTRDMTAyLjc5MyA3Ny4wMjM5IDEwMi4xNDUgNzcuNjcyMiAxMDEuMTcyIDc3LjY3MjJaIiBmaWxsPSIjREQzNDJFIi8+CjxwYXRoIGQ9Ik0xMTAuODk2IDc3LjY3MjJIMTA3LjY1NUMxMDYuNjgyIDc3LjY3MjIgMTA2LjAzNCA3Ny4wMjM5IDEwNi4wMzQgNzYuMDUxNEMxMDYuMDM0IDc1LjA3ODkgMTA2LjY4MiA3NC40MzA3IDEwNy42NTUgNzQuNDMwN0gxMTAuODk2QzExMS44NjkgNzQuNDMwNyAxMTIuNTE3IDc1LjA3ODkgMTEyLjUxNyA3Ni4wNTE0QzExMi41MTcgNzcuMDIzOSAxMTEuODY5IDc3LjY3MjIgMTEwLjg5NiA3Ny42NzIyWiIgZmlsbD0iIzQyQjA1QyIvPgo8cGF0aCBkPSJNNjMuODk2MyA1OC4yMjRINjAuNjU0OUM1OS42ODI0IDU4LjIyNCA1OS4wMzQyIDU3LjU3NTcgNTkuMDM0MiA1Ni42MDMyQzU5LjAzNDIgNTUuNjMwNyA1OS42ODI0IDU0Ljk4MjQgNjAuNjU0OSA1NC45ODI0SDYzLjg5NjNDNjQuODY4OCA1NC45ODI0IDY1LjUxNzEgNTUuNjMwNyA2NS41MTcxIDU2LjYwMzJDNjUuNTE3MSA1Ny41NzU3IDY0Ljg2ODggNTguMjI0IDYzLjg5NjMgNTguMjI0WiIgZmlsbD0iIzczODNCRiIvPgo8cGF0aCBkPSJNMTEyLjUxNyA1MS43NDExQzExMi41MTcgNjAuNjU0OSAxMDUuMjI0IDY3Ljk0OCA5Ni4zMTA0IDY3Ljk0OEM4Ny4zOTY2IDY3Ljk0OCA4MC4xMDM1IDYwLjY1NDkgODAuMTAzNSA1MS43NDExQzgwLjEwMzUgNDIuODI3MyA4Ny4zOTY2IDM1LjUzNDIgOTYuMzEwNCAzNS41MzQyQzEwNS4yMjQgMzUuNTM0MiAxMTIuNTE3IDQyLjgyNzMgMTEyLjUxNyA1MS43NDExWiIgZmlsbD0iI0VDQkExNiIvPgo8cGF0aCBkPSJNODAuMTAzNSA1MS43NDExQzgwLjEwMzUgNTIuMjI3MyA4MC4xMDM1IDUyLjg3NTUgODAuMTAzNSA1My4zNjE5SDk2LjMxMDRWMzUuNTM0MkM4Ny4zOTY2IDM1LjUzNDIgODAuMTAzNSA0Mi44MjczIDgwLjEwMzUgNTEuNzQxMVoiIGZpbGw9IiM0MkIwNUMiLz4KPC9nPgo8ZGVmcz4KPGxpbmVhckdyYWRpZW50IGlkPSJwYWludDBfbGluZWFyXzY4N18zMjY4IiB4MT0iMS4yMzIzOWUtMDYiIHkxPSItOS41MDAwMSIgeDI9IjE2OCIgeTI9IjE2MiIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiPgo8c3RvcCBzdG9wLWNvbG9yPSIjOEZEREZGIi8+CjxzdG9wIG9mZnNldD0iMSIgc3RvcC1jb2xvcj0iIzAwNzVGRiIvPgo8L2xpbmVhckdyYWRpZW50Pgo8Y2xpcFBhdGggaWQ9ImNsaXAwXzY4N18zMjY4Ij4KPHJlY3Qgd2lkdGg9Ijk0IiBoZWlnaHQ9Ijk0IiBmaWxsPSJ3aGl0ZSIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoMjUgMjUpIi8+CjwvY2xpcFBhdGg+CjwvZGVmcz4KPC9zdmc+Cg==
-    keysOrder: [["apiVersion"], ["appVersion"], ["kind"], ["metadata"], ["metadata", "name"], ["spec", "host"], ["spec", "metricsStorages"], ["spec", "logsStorages"], ["spec", "alerta"], ["spec", "alerta", "storage"], ["spec", "alerta", "storageClassName"], ["spec", "alerta", "resources"], ["spec", "alerta", "resources", "limits"], ["spec", "alerta", "resources", "limits", "cpu"], ["spec", "alerta", "resources", "limits", "memory"], ["spec", "alerta", "resources", "requests"], ["spec", "alerta", "resources", "requests", "cpu"], ["spec", "alerta", "resources", "requests", "memory"], ["spec", "alerta", "alerts"], ["spec", "alerta", "alerts", "telegram"], ["spec", "alerta", "alerts", "telegram", "token"], ["spec", "alerta", "alerts", "telegram", "chatID"], ["spec", "alerta", "alerts", "telegram", "disabledSeverity"], ["spec", "alerta", "alerts", "slack"], ["spec", "alerta", "alerts", "slack", "url"], ["spec", "alerta", "alerts", "slack", "disabledSeverity"], ["spec", "grafana"], ["spec", "grafana", "db"], ["spec", "grafana", "db", "size"], ["spec", "grafana", "resources"], ["spec", "grafana", "resources", "limits"], ["spec", "grafana", "resources", "limits", "cpu"], ["spec", "grafana", "resources", "limits", "memory"], ["spec", "grafana", "resources", "requests"], ["spec", "grafana", "resources", "requests", "cpu"], ["spec", "grafana", "resources", "requests", "memory"], ["spec", "vmagent"], ["spec", "vmagent", "externalLabels"], ["spec", "vmagent", "externalLabels", "cluster"], ["spec", "vmagent", "remoteWrite"], ["spec", "vmagent", "remoteWrite", "urls"]]
+    keysOrder: [["apiVersion"], ["appVersion"], ["kind"], ["metadata"], ["metadata", "name"], ["spec", "host"], ["spec", "metricsStorages"], ["spec", "logsStorages"], ["spec", "tracingStorages"], ["spec", "tracingCentralHost"], ["spec", "tracingCollector"], ["spec", "tracingCollector", "enabled"], ["spec", "tracingCollector", "replicas"], ["spec", "tracingCollector", "samplingPercentage"], ["spec", "tracingCollector", "redactAttributes"], ["spec", "tracingCollector", "resources"], ["spec", "tracingCollector", "resources", "limits"], ["spec", "tracingCollector", "resources", "limits", "cpu"], ["spec", "tracingCollector", "resources", "limits", "memory"], ["spec", "tracingCollector", "resources", "requests"], ["spec", "tracingCollector", "resources", "requests", "cpu"], ["spec", "tracingCollector", "resources", "requests", "memory"], ["spec", "alerta"], ["spec", "alerta", "storage"], ["spec", "alerta", "storageClassName"], ["spec", "alerta", "resources"], ["spec", "alerta", "resources", "limits"], ["spec", "alerta", "resources", "limits", "cpu"], ["spec", "alerta", "resources", "limits", "memory"], ["spec", "alerta", "resources", "requests"], ["spec", "alerta", "resources", "requests", "cpu"], ["spec", "alerta", "resources", "requests", "memory"], ["spec", "alerta", "alerts"], ["spec", "alerta", "alerts", "telegram"], ["spec", "alerta", "alerts", "telegram", "token"], ["spec", "alerta", "alerts", "telegram", "chatID"], ["spec", "alerta", "alerts", "telegram", "disabledSeverity"], ["spec", "alerta", "alerts", "slack"], ["spec", "alerta", "alerts", "slack", "url"], ["spec", "alerta", "alerts", "slack", "disabledSeverity"], ["spec", "alerta", "alerts", "email"], ["spec", "alerta", "alerts", "email", "to"], ["spec", "alerta", "alerts", "email", "from"], ["spec", "alerta", "alerts", "email", "smarthost"], ["spec", "alerta", "alerts", "email", "authUsername"], ["spec", "alerta", "alerts", "email", "repeatInterval"], ["spec", "alerta", "alerts", "email", "alertnames"], ["spec", "alerta", "alerts", "email", "severities"], ["spec", "grafana"], ["spec", "grafana", "db"], ["spec", "grafana", "db", "size"], ["spec", "grafana", "resources"], ["spec", "grafana", "resources", "limits"], ["spec", "grafana", "resources", "limits", "cpu"], ["spec", "grafana", "resources", "limits", "memory"], ["spec", "grafana", "resources", "requests"], ["spec", "grafana", "resources", "requests", "cpu"], ["spec", "grafana", "resources", "requests", "memory"], ["spec", "vmagent"], ["spec", "vmagent", "externalLabels"], ["spec", "vmagent", "externalLabels", "cluster"], ["spec", "vmagent", "remoteWrite"], ["spec", "vmagent", "remoteWrite", "urls"], ["spec", "oidc"], ["spec", "oidc", "mode"], ["spec", "oidc", "customConfig"], ["spec", "oidc", "customConfig", "config"], ["spec", "oidc", "customConfig", "secretRef"], ["spec", "oidc", "customConfig", "secretRef", "name"], ["spec", "oidc", "users"]]
   secrets:
     exclude: []
     include:
diff --git a/packages/system/monitoring/Makefile b/packages/system/monitoring/Makefile
index 7d3b56a26b..c392b0a548 100644
--- a/packages/system/monitoring/Makefile
+++ b/packages/system/monitoring/Makefile
@@ -1,18 +1,30 @@
-GRAFANA_TAG = $(shell awk '$$1 == "version:" {print $$2}' Chart.yaml)
-
 NAME=monitoring
 NAMESPACE=cozy-$(NAME)
 
 include ../../../hack/common-envs.mk
 include ../../../hack/package.mk
 
-image:
-	docker buildx build images/grafana \
-		$(call image-tags,grafana,$(GRAFANA_TAG)) \
-		--cache-from type=registry,ref=$(REGISTRY)/grafana:latest \
-		--cache-to type=inline \
-		--metadata-file images/grafana.json \
+test:
+	helm unittest .
+
+.PHONY: image image-otelcol-tracing
+
+# The collector is versioned by its upstream release, pinned in the
+# Containerfile; bump COZYSTACK_REV for a respin on the same release (a new
+# component in builder-config.yaml, a Go toolchain bump).
+OTELCOL_VERSION = $(shell awk -F= '/^ARG VERSION=/{print $$2}' images/otelcol-tracing/Containerfile)
+COZYSTACK_REV = 0
+COMPONENT_VERSION = v$(OTELCOL_VERSION)-cozystack.$(COZYSTACK_REV)
+
+image: image-otelcol-tracing
+
+image-otelcol-tracing:
+	docker buildx build images/otelcol-tracing \
+		--file images/otelcol-tracing/Containerfile \
+		$(call image-tags,otelcol-tracing,$(COMPONENT_VERSION)) \
+		$(call cache-args,otelcol-tracing) \
+		--metadata-file images/otelcol-tracing.json \
 		$(BUILDX_ARGS)
-	echo "$(REGISTRY)/grafana:$(IMAGE_TAG)@$$(yq e '."containerimage.digest"' images/grafana.json -o json -r)" \
-		> images/grafana.tag
-	rm -f images/grafana.json
+	IMAGE="$(REGISTRY)/otelcol-tracing:$(COMPONENT_VERSION)@$$(yq e '."containerimage.digest"' images/otelcol-tracing.json -o json -r)" \
+		yq -i '.tracingCollector.image = strenv(IMAGE)' values.yaml
+	rm -f images/otelcol-tracing.json
diff --git a/packages/system/monitoring/dashboards-infra.list b/packages/system/monitoring/dashboards-infra.list
index 4c7e494dc4..5a7e753a0f 100644
--- a/packages/system/monitoring/dashboards-infra.list
+++ b/packages/system/monitoring/dashboards-infra.list
@@ -37,3 +37,4 @@ gpu/gpu-efficiency
 gpu/gpu-quotas
 gpu/gpu-fleet
 gpu/gpu-tenants
+tenants/overview
diff --git a/packages/system/monitoring/dashboards.list b/packages/system/monitoring/dashboards.list
index aee8c2dc18..55ef46f90c 100644
--- a/packages/system/monitoring/dashboards.list
+++ b/packages/system/monitoring/dashboards.list
@@ -7,6 +7,8 @@ ingress/namespace-detail
 db/cloudnativepg
 db/maria-db
 db/redis
+db/database-autoscaling
+vm/virtual-machines
 kafka/strimzi-kafka
 clickhouse/altinity-clickhouse-operator-dashboard
 nats/nats-jetstream
diff --git a/packages/system/monitoring/images/grafana.tag b/packages/system/monitoring/images/grafana.tag
deleted file mode 100644
index 06eb755ab9..0000000000
--- a/packages/system/monitoring/images/grafana.tag
+++ /dev/null
@@ -1 +0,0 @@
-ghcr.io/cozystack/cozystack/grafana:0.0.0@sha256:58ee26efdccf81ee79b4d5478df347b91398280600971eaf4b9626b0ca72ed35
diff --git a/packages/system/monitoring/images/grafana/Dockerfile b/packages/system/monitoring/images/grafana/Dockerfile
deleted file mode 100644
index cc65c9d368..0000000000
--- a/packages/system/monitoring/images/grafana/Dockerfile
+++ /dev/null
@@ -1,16 +0,0 @@
-FROM grafana/grafana:11.4.0
-
-USER root
-
-RUN mkdir -p /var/lib/grafana-plugins \
- && chown -R grafana:0 /var/lib/grafana-plugins
-
-USER grafana
-
-ARG VLOGS_VERSION=v0.14.1
-RUN curl -L https://github.com/VictoriaMetrics/victorialogs-datasource/releases/download/${VLOGS_VERSION}/victoriametrics-logs-datasource-${VLOGS_VERSION}.tar.gz | \
-      tar -xzf - -C /var/lib/grafana-plugins
-
-RUN grafana-cli --pluginsDir /var/lib/grafana-plugins plugins install natel-discrete-panel
-RUN grafana-cli --pluginsDir /var/lib/grafana-plugins plugins install grafana-worldmap-panel
-RUN grafana-cli --pluginsDir /var/lib/grafana-plugins plugins install marcusolsson-dynamictext-panel
diff --git a/packages/system/monitoring/images/kubectl.tag b/packages/system/monitoring/images/kubectl.tag
new file mode 100644
index 0000000000..80d1e903c9
--- /dev/null
+++ b/packages/system/monitoring/images/kubectl.tag
@@ -0,0 +1 @@
+docker.io/alpine/k8s:1.33.4@sha256:b0523f0a244ddc4c8e055aa335c040d3d78b3ead5528f4544395f7f9f69c7b68
diff --git a/packages/system/monitoring/images/otelcol-tracing/Containerfile b/packages/system/monitoring/images/otelcol-tracing/Containerfile
new file mode 100644
index 0000000000..d8439a00c6
--- /dev/null
+++ b/packages/system/monitoring/images/otelcol-tracing/Containerfile
@@ -0,0 +1,26 @@
+FROM --platform=$BUILDPLATFORM golang:1.27-alpine@sha256:8a5910f31396cd4d89662f56c68b3ae31d374308270a1c3bd96672ee5ed43414 AS builder
+
+ARG VERSION=0.136.0
+ARG TARGETOS
+ARG TARGETARCH
+ARG GOPROXY
+
+# git lets the GOPROXY fallback to direct fetching work when the proxy fails.
+RUN apk add --no-cache git
+
+# The builder runs on the build platform; only the collector it compiles
+# targets the image platform.
+RUN go install go.opentelemetry.io/collector/cmd/builder@v${VERSION}
+
+WORKDIR /build
+COPY builder-config.yaml .
+RUN GOOS=$TARGETOS GOARCH=$TARGETARCH CGO_ENABLED=0 builder --config builder-config.yaml
+
+FROM scratch
+
+COPY --from=builder /build/dist/otelcol-tracing /otelcol-tracing
+COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
+
+# The collector Deployment runs as 10001, the user of the upstream image.
+USER 10001:10001
+ENTRYPOINT ["/otelcol-tracing"]
diff --git a/packages/system/monitoring/images/otelcol-tracing/builder-config.yaml b/packages/system/monitoring/images/otelcol-tracing/builder-config.yaml
new file mode 100644
index 0000000000..30257222c6
--- /dev/null
+++ b/packages/system/monitoring/images/otelcol-tracing/builder-config.yaml
@@ -0,0 +1,29 @@
+# OpenTelemetry Collector Builder manifest for the tenant traces collector.
+# Every component the chart's collector config uses must be listed here, at the
+# collector version in the Containerfile. The rate limiter is the one component
+# outside the upstream distributions: no OpenTelemetry processor limits
+# throughput, and a shared-central store needs each tenant held to a rate.
+# Its v0.8.2 is the release built against collector v0.135.0, the last one
+# before v0.137.0; it builds against v0.136.0 unchanged.
+dist:
+  name: otelcol-tracing
+  description: OpenTelemetry Collector for cozystack tenant traces
+  version: 0.136.0
+  output_path: /build/dist
+receivers:
+  - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.136.0
+processors:
+  - gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.136.0
+  - gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.136.0
+  - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor v0.136.0
+  - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.136.0
+  - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.136.0
+  - gomod: github.com/elastic/opentelemetry-collector-components/processor/ratelimitprocessor v0.8.2
+exporters:
+  - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.136.0
+extensions:
+  - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.136.0
+  - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/basicauthextension v0.136.0
+providers:
+  - gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v1.42.0
+  - gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v1.42.0
diff --git a/packages/system/monitoring/templates/_helpers.tpl b/packages/system/monitoring/templates/_helpers.tpl
new file mode 100644
index 0000000000..3897209591
--- /dev/null
+++ b/packages/system/monitoring/templates/_helpers.tpl
@@ -0,0 +1,338 @@
+{{- /*
+  Helpers for the Grafana OIDC integration.
+
+  Naming — the identity unit is the Monitoring release, so the clientId
+  and the audience scope are `<namespace>-<release>` prefixed. That
+  gives:
+    tenant-foo/monitoring-system   (per-tenant Grafana in tenant-foo ns)
+    tenant-root/monitoring-system  (platform Grafana in the tenant-root ns)
+  A token minted for one instance is rejected by the other's Grafana
+  because the per-cluster audience scope binds `id_token.aud` to the
+  clientId — same isolation primitive as the tenant kube-apiserver PR
+  (cozystack/cozystack#3044).
+
+  Authorization is NOT modelled on Keycloak realm groups: the chart
+  does not own directory objects and Grafana's built-in group→role
+  mapping (`role_attribute_path`) is not wired up. Instead, `spec.oidc`
+  carries a `users:` map and a chart-owned post-install/post-upgrade
+  Job reconciles that map into Grafana org membership/roles via the
+  admin API. `skip_org_role_sync = true` prevents a login from
+  overwriting those app-side assignments. Same operator UX as the
+  tenant kube-apiserver sibling in #3044.
+*/}}
+
+{{- define "monitoring.oidc.clientId" -}}
+{{- printf "%s-%s" .Release.Namespace .Release.Name -}}
+{{- end -}}
+
+{{- define "monitoring.oidc.audienceScopeName" -}}
+{{- printf "%s-%s-audience" .Release.Namespace .Release.Name -}}
+{{- end -}}
+
+{{- define "monitoring.oidc.clientSecretName" -}}
+{{- printf "%s-oidc-client" .Release.Name -}}
+{{- end -}}
+
+{{- define "monitoring.oidc.grafanaHost" -}}
+{{- $namespaceHost := include "cozy-lib.ns-host-required" . -}}
+{{- printf "grafana.%s" (.Values.host | default $namespaceHost) -}}
+{{- end -}}
+
+{{- define "monitoring.oidc.redirectUri" -}}
+{{- printf "https://%s/login/generic_oauth" (include "monitoring.oidc.grafanaHost" .) -}}
+{{- end -}}
+
+{{- define "monitoring.oidc.systemIssuerURL" -}}
+{{- $host := index .Values._cluster "root-host" -}}
+{{- $realm := index .Values._cluster "oidc-realm-name" | default "cozy" | toString -}}
+{{- printf "https://keycloak.%s/realms/%s" $host $realm -}}
+{{- end -}}
+
+{{- /*
+  Space-separated list of the four tenant-scoped Keycloak groups the
+  Monitoring release's Grafana will accept on login (allowed_groups in
+  auth.generic_oauth). The tenant chart (packages/apps/tenant) already
+  provisions `<namespace>-{view,use,admin,super-admin}` KeycloakRealmGroups
+  in the `cozy` realm — the namespace name is the tenant identifier for
+  both root and nested tenants (see tenant.name in the tenant chart
+  helpers), so `.Release.Namespace` is the correct prefix here.
+
+  Why all four groups instead of just those referenced in
+  `spec.oidc.users[].role`: the users-map controls Grafana org role
+  assignment, not authentication. A tenant admin whose email is not in
+  users[] should still be able to log in and land at the release's
+  configured hands-off default (auto_assign_org_role=Viewer) — being a
+  member of the tenant is the credential that says "you belong to this
+  Grafana", regardless of whether the chart also happens to have
+  pre-provisioned them an org role.
+*/}}
+{{- define "monitoring.oidc.allowedGroups" -}}
+{{- $ns := .Release.Namespace -}}
+{{- printf "%s-view %s-use %s-admin %s-super-admin" $ns $ns $ns $ns -}}
+{{- end -}}
+
+{{- /*
+  Fail-fast when `mode: System` is requested without the platform-level
+  OIDC feature being on. Mirrors the identical guard from the tenant
+  kube-apiserver chart — see the note there for the reasoning.
+*/}}
+{{- define "monitoring.oidc.assertSystemEnabled" -}}
+{{- $oidcEnabled := dig "oidc-enabled" "" (.Values._cluster | default dict) -}}
+{{- if ne ($oidcEnabled | toString) "true" -}}
+{{-   fail "spec.oidc.mode: System requires the platform-level OIDC feature (authentication.oidc.enabled) — enable it in cozystack-values, or use mode: CustomConfig for a tenant-supplied issuer." -}}
+{{- end -}}
+{{- end -}}
+
+{{- /*
+  Fail-fast when `mode: System` is requested but the Keycloak operator
+  CRDs (`v1.edp.epam.com/v1`) are not yet registered in the target
+  cluster. Without this guard the chart would silently drop the whole
+  Keycloak side (KeycloakClient / KeycloakClientScope) while still
+  rendering Grafana's `auth.generic_oauth` block pointing at a client
+  that never gets provisioned — a broken login path with no clear
+  error. For the platform `monitoring-system` release the `oidc`
+  variant of `cozystack.monitoring-application` waits on
+  `cozystack.keycloak-operator` (see
+  packages/core/platform/sources/monitoring-application.yaml) so the
+  CRDs are registered before this chart reconciles; the assertion
+  turns any residual race (or a manual `mode: System` toggle on a
+  cluster where the operator is not deployed) into an actionable
+  render error instead of a silent misconfiguration.
+*/}}
+{{- define "monitoring.oidc.assertSystemKeycloakCRD" -}}
+{{- if not (.Capabilities.APIVersions.Has "v1.edp.epam.com/v1") -}}
+{{-   fail "spec.oidc.mode: System requires the Keycloak operator CRDs (v1.edp.epam.com/v1). If cozystack.keycloak-operator is still bootstrapping this will resolve on the next reconcile; otherwise verify the keycloak-operator package is deployed and its CRDs are registered." -}}
+{{- end -}}
+{{- end -}}
+
+{{- /*
+  Fail-fast when the CustomConfig branch has neither or both payloads
+  set — mutually exclusive.
+*/}}
+{{- define "monitoring.oidc.assertCustomConfigXor" -}}
+{{- $oidc := .Values.oidc | default dict -}}
+{{- $customConfig := $oidc.customConfig | default dict -}}
+{{- $inline := $customConfig.config | default dict -}}
+{{- $secretName := dig "secretRef" "name" "" $customConfig -}}
+{{- $hasInline := gt (len $inline) 0 -}}
+{{- $hasSecretRef := ne ($secretName | toString) "" -}}
+{{- if and $hasInline $hasSecretRef -}}
+{{-   fail "spec.oidc.customConfig: set exactly one of `config` (inline) or `secretRef.name` — they are mutually exclusive." -}}
+{{- end -}}
+{{- if not (or $hasInline $hasSecretRef) -}}
+{{-   fail "spec.oidc.mode: CustomConfig requires either spec.oidc.customConfig.config (inline generic_oauth map) or spec.oidc.customConfig.secretRef.name (Secret with an `auth.ini` key)." -}}
+{{- end -}}
+{{- end -}}
+
+{{- /*
+  Normalised `spec.oidc.users` list. Yields an empty list when
+  `spec.oidc` is omitted, `null`, or has no `users:` key. Consumers
+  should range over this without further nil-checks.
+*/}}
+{{- define "monitoring.oidc.users" -}}
+{{- $oidc := .Values.oidc | default dict -}}
+{{- $users := $oidc.users | default (list) -}}
+{{- toYaml $users -}}
+{{- end -}}
+
+{{- /*
+  Prologue that all templates touching spec.oidc.users should include
+  ONCE, near the top. Runs the incompatibility check (secretRef + users)
+  before the per-entry regexes so operators see the most actionable
+  error first — combining incompatible top-level fields is a
+  configuration bug the operator can fix immediately; a per-user
+  malformed email is a data-entry issue in the CR body.
+*/}}
+{{- define "monitoring.oidc.assertUsersPrologue" -}}
+{{-   include "monitoring.oidc.assertCustomSecretRefUsersEmpty" . }}
+{{-   include "monitoring.oidc.assertUsersRoleShape" . }}
+{{-   include "monitoring.oidc.assertUsersEmailShape" . }}
+{{- end -}}
+
+{{- /*
+  Reject `spec.oidc.users[]` entries missing `role` or carrying an
+  unknown role. openAPISchema also marks `role` required, but a stale
+  schema (dashboard-emitted CR generated before the field was added, or
+  a direct-helm invocation that bypasses the API validation) would
+  otherwise render `role: "null"` into the users-Job's Grafana admin API
+  body and fail with HTTP 400 at hook execution. Failing at render
+  time surfaces the root cause instead of a mysterious backoffLimit
+  exhaustion.
+*/}}
+{{- define "monitoring.oidc.assertUsersRoleShape" -}}
+{{- $oidc := .Values.oidc | default dict -}}
+{{- $users := $oidc.users | default (list) -}}
+{{- $allowed := list "Admin" "Editor" "Viewer" -}}
+{{- range $i, $u := $users -}}
+{{-   $role := $u.role | default "" -}}
+{{-   if eq $role "" -}}
+{{-     fail (printf "spec.oidc.users[%d].role: is required and must be one of Admin, Editor, Viewer. Omitting the field would render null into the Grafana admin API body and fail the post-install users-Job with HTTP 400." $i) -}}
+{{-   end -}}
+{{-   if not (has $role $allowed) -}}
+{{-     fail (printf "spec.oidc.users[%d].role: %q is not one of the allowed values Admin, Editor, Viewer." $i $role) -}}
+{{-   end -}}
+{{- end -}}
+{{- end -}}
+
+{{- /*
+  Reject malformed emails in `spec.oidc.users`. Grafana passes the
+  string verbatim into a query string (/api/users/lookup?loginOrEmail=)
+  and into JSON bodies (create_body / add_body); the users-Job's shell
+  reader is NUL-safe and URL-encodes, but rejecting at render time is
+  cheaper than debugging a 400 from Grafana. Pattern is intentionally
+  conservative — no whitespace, no quoted literals, no bracketed IP
+  domains, no unicode; RFC 5322 in its full generality is out of scope.
+*/}}
+{{- define "monitoring.oidc.assertUsersEmailShape" -}}
+{{- $oidc := .Values.oidc | default dict -}}
+{{- $users := $oidc.users | default (list) -}}
+{{- range $i, $u := $users -}}
+{{-   $email := $u.email | default "" -}}
+{{-   if not (regexMatch "^[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\\.[A-Za-z]{2,}$" $email) -}}
+{{-     fail (printf "spec.oidc.users[%d].email: %q does not match the conservative email pattern ^[A-Za-z0-9._%%+-]+@[A-Za-z0-9.-]+\\.[A-Za-z]{2,}$. Whitespace, quoted literals, and non-ASCII characters are rejected on template level so the reconcile-Job's shell handling never has to defend against malformed input." $i $email) -}}
+{{-   end -}}
+{{- end -}}
+{{- end -}}
+
+{{- /*
+  Reject `spec.oidc.users` in CustomConfig+secretRef mode: the
+  operator's `auth.ini` fragment is authoritative and the chart cannot
+  inject `skip_org_role_sync=true` / `oauth_allow_insecure_email_lookup=true`
+  into it. Without those two settings the users-Job's role assignments
+  are overwritten on the operator's next login (skip_org_role_sync) and
+  the pre-provisioned local account is orphaned (email lookup) — the
+  Job's contract silently breaks. Force the operator into an explicit
+  choice: either use `customConfig.config` (inline) and let the chart
+  merge the two settings, or omit `spec.oidc.users` and manage
+  authorization themselves inside the mounted ini.
+*/}}
+{{- define "monitoring.oidc.assertCustomSecretRefUsersEmpty" -}}
+{{- $oidc := .Values.oidc | default dict -}}
+{{- $customConfig := $oidc.customConfig | default dict -}}
+{{- $secretName := dig "secretRef" "name" "" $customConfig -}}
+{{- $users := $oidc.users | default (list) -}}
+{{- if and (ne ($secretName | toString) "") (gt (len $users) 0) -}}
+{{-   fail "spec.oidc: `users` is not honoured under `customConfig.secretRef` — the operator's mounted auth.ini is authoritative and the chart cannot inject `skip_org_role_sync=true` / `oauth_allow_insecure_email_lookup=true`, so the users-Job's role assignments would be overwritten on the operator's next login. Either switch to `customConfig.config` (inline map, merged with the chart-forced settings) or unset `users` and manage authorization inside the ini fragment yourself." -}}
+{{- end -}}
+{{- end -}}
+
+{{- /*
+  Values here reach the VictoriaTraces CRs unchecked: the installed CRDs are the
+  trimmed ones (crds.plain: false), so spec is x-kubernetes-preserve-unknown-fields.
+    - name is at most 42 characters: the operator names the StatefulSet
+      vtstorage-<name>, and each pod carries the label controller-revision-hash:
+      vtstorage-<name>-<hash> (hash up to 10 characters, value capped at 63).
+    - storage is positive: in single mode the operator mounts an EmptyDir when
+      the requested size IsZero, so the store reports operational with no volume.
+    - retentionDiskUsageBytes uses the operator's BytesString grammar, which
+      rejects the Kubernetes-quantity `Gi` suffix that storage uses.
+*/ -}}
+{{- define "monitoring.tracingStorages.validate" -}}
+{{- $seen := dict -}}
+{{- range $i, $s := .Values.tracingStorages -}}
+{{-   $name := $s.name | default "" | toString -}}
+{{-   if or (not (regexMatch "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$" $name)) (gt (len $name) 42) -}}
+{{-     fail (printf "monitoring: tracingStorages[%d].name %q must be a valid RFC 1123 label (lowercase alphanumeric and '-', starting and ending alphanumeric) of at most 42 characters, so that the vtstorage-<name>-<hash> pod revision label stays within 63." $i $name) -}}
+{{-   end -}}
+{{-   if hasKey $seen $name -}}
+{{-     fail (printf "monitoring: tracingStorages[%d].name %q is duplicated — names must be unique across tracingStorages, since each keys a VTCluster/VTSingle and a GrafanaDatasource and a collision silently overwrites the first." $i $name) -}}
+{{-   end -}}
+{{-   $_ := set $seen $name true -}}
+{{-   $mode := $s.mode | default "cluster" -}}
+{{-   if and (ne $mode "cluster") (ne $mode "single") -}}
+{{-     fail (printf "monitoring: tracingStorages[%s].mode must be either \"cluster\" or \"single\"" $name) -}}
+{{-   end -}}
+{{-   $storage := $s.storage | default "" | toString -}}
+{{-   if or (regexMatch "^[+-]?[0.]*([KMGTPE]i|[numkMGTPE]|[eE][+-]?[0-9]+)?$" $storage) (hasPrefix "-" $storage) -}}
+{{-     fail (printf "monitoring: tracingStorages[%s].storage must be a positive Kubernetes quantity (e.g. 10Gi). A zero size makes the operator mount an EmptyDir instead of a PVC in single mode, so the backend reports Ready while every stored span is lost on the next reschedule; a negative one fails the release when the PVC is created." $name) -}}
+{{-   end -}}
+{{-   with $s.retentionDiskUsageBytes -}}
+{{-     $bytes := . | toString -}}
+{{-     if not (regexMatch "^[0-9]+(kb|mb|gb|tb|KB|MB|GB|TB|KiB|MiB|GiB|TiB)?$" $bytes) -}}
+{{-       fail (printf "monitoring: tracingStorages[%s].retentionDiskUsageBytes %q is not a valid VictoriaMetrics BytesString (^[0-9]+(kb|mb|gb|tb|KB|MB|GB|TB|KiB|MiB|GiB|TiB)?$). Its units differ from the sibling `storage` field (a Kubernetes quantity like 10Gi): write 8GB or 8GiB, not 8Gi." $name $bytes) -}}
+{{-     end -}}
+{{-   end -}}
+{{- end -}}
+{{- end -}}
+
+{{- /*
+  The shared VictoriaTraces store separates tenants only by the AccountID and
+  ProjectID request headers (two uint32s), so each tenant needs a stable pair it
+  cannot choose. It is derived from the namespace: the first 16 hex digits of
+  the sha256 of its name and UID, split into two uint32s, which needs no
+  allocator and no stored state. The UID keeps a tenant re-created under a
+  deleted tenant's name out of that tenant's retained spans; an offline render
+  has no UID and hashes the name alone. tenant-root's own spans stay in the
+  header-less default 0:0, since its collector always writes locally. Renders
+  "<AccountID>:<ProjectID>".
+*/ -}}
+{{- define "monitoring.tracingTenantID" -}}
+{{- $digits := dict "0" 0 "1" 1 "2" 2 "3" 3 "4" 4 "5" 5 "6" 6 "7" 7 "8" 8 "9" 9 "a" 10 "b" 11 "c" 12 "d" 13 "e" 14 "f" 15 -}}
+{{- $key := .Release.Namespace -}}
+{{- with dig "metadata" "uid" "" (lookup "v1" "Namespace" "" .Release.Namespace) -}}
+{{-   $key = printf "%s:%s" $key . -}}
+{{- end -}}
+{{- $sum := sha256sum $key -}}
+{{- $ids := list -}}
+{{- range $part := list (substr 0 8 $sum) (substr 8 16 $sum) -}}
+{{-   $n := 0 -}}
+{{-   range $c := splitList "" $part -}}
+{{-     $n = add (mul $n 16) (get $digits $c) -}}
+{{-   end -}}
+{{-   $ids = append $ids $n -}}
+{{- end -}}
+{{- printf "%d:%d" (index $ids 0 | int64) (index $ids 1 | int64) -}}
+{{- end -}}
+
+{{- /*
+  The central tenant's vmauth password: the one already stored, else a new
+  random one. Both the Secret and the collector's rollout checksum read it, and
+  randAlphaNum differs per call, so the first result is kept in .Values, which
+  every template of one render shares.
+*/ -}}
+{{- define "monitoring.tracingCentralPassword" -}}
+{{- $ctx := index . 0 -}}
+{{- $secret := index . 1 -}}
+{{- $key := printf "_tracingCentralPassword_%s" $secret -}}
+{{- if not (hasKey $ctx.Values $key) -}}
+{{-   $password := "" -}}
+{{-   with (index (lookup "v1" "Secret" $ctx.Release.Namespace $secret) "data") -}}
+{{-     with .password }}{{ $password = b64dec . }}{{ end -}}
+{{-   end -}}
+{{-   if not $password }}{{ $password = randAlphaNum 32 }}{{ end -}}
+{{-   $_ := set $ctx.Values $key $password -}}
+{{- end -}}
+{{- index $ctx.Values $key -}}
+{{- end -}}
+
+{{- /* tenant-root hosts the shared store only when it opts in with
+       tracingCentralHost, since the store is also its own, and lists a
+       cluster-mode entry named generic, the store every central VMUser routes
+       to. Renders "true" or "". */}}
+{{- define "monitoring.tracingCentralStore" -}}
+{{- if and (eq .Release.Namespace "tenant-root") (eq (toString .Values.tracingCentralHost) "true") -}}
+{{-   range .Values.tracingStorages -}}
+{{-     if and (eq .name "generic") (eq (.mode | default "cluster") "cluster") }}true{{ end -}}
+{{-   end -}}
+{{- end -}}
+{{- end -}}
+
+{{- /*
+  Shared-central tracing is switched on only by the tenant chart, through
+  _namespace in the cozystack-values Secret: the apps API refuses `_` keys, so a
+  Monitoring application cannot opt itself in without the egress rules the
+  tenant chart renders under the same condition. tenant-root hosts the shared
+  store and never exports to it. Renders "true" or "".
+*/ -}}
+{{- define "monitoring.tracingCentral" -}}
+{{- if and (ne .Release.Namespace "tenant-root") (eq (toString (dig "tracingCentral" false (.Values._namespace | default dict))) "true") -}}true{{- end -}}
+{{- end -}}
+
+{{- /*
+  Alertmanager replica count. vmalert lists each replica as its own
+  notifier from the same number, because the Alertmanager cluster only
+  deduplicates notifications when every replica receives every alert.
+*/}}
+{{- define "monitoring.alertmanager.replicas" -}}
+3
+{{- end -}}
diff --git a/packages/system/monitoring/templates/alerta/alerta.yaml b/packages/system/monitoring/templates/alerta/alerta.yaml
index 4e098a9746..6376eaa9e1 100644
--- a/packages/system/monitoring/templates/alerta/alerta.yaml
+++ b/packages/system/monitoring/templates/alerta/alerta.yaml
@@ -1,9 +1,107 @@
 {{- $solver := (index .Values._cluster "solver") | default "http01" }}
 {{- $clusterIssuer := (index .Values._cluster "issuer-name") | default "letsencrypt-prod" }}
 {{- $ingress := .Values._namespace.ingress }}
-{{- $host := .Values._namespace.host }}
+{{- $host := include "cozy-lib.ns-host-required" . }}
 {{- $exposeIngress := (index .Values._cluster "expose-ingress") | default "tenant-root" }}
 {{- $gatewayEnabled := (index .Values._cluster "gateway-enabled") | default "false" }}
+{{- $wildcardSecret := (index .Values._cluster "wildcard-secret-name") | default "" }}
+
+{{- $email := ((.Values.alerta.alerts).email) | default dict }}
+{{- $emailAlertnames := $email.alertnames | default list }}
+{{- $emailSeverities := $email.severities | default (list "critical" "major") }}
+{{- $emailPasswordSecret := "alertmanager-email-password" }}
+{{- $emailSet := list }}
+{{- range $field := list "to" "from" "smarthost" "authUsername" "repeatInterval" "alertnames" "severities" }}
+{{- if index $email $field }}{{ $emailSet = append $emailSet $field }}{{ end }}
+{{- end }}
+{{- $emailEnabled := gt (len $emailSet) 0 }}
+{{- if $emailEnabled }}
+{{- if not (and $email.to $email.smarthost $email.from) }}
+{{- fail (printf "alerta.alerts.email to, from and smarthost must all be set to enable email alerts. To turn email off, clear every field under alerta.alerts.email. Fields still set are %s" (join ", " $emailSet)) }}
+{{- end }}
+{{- $ipv4Octet := "(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])" }}
+{{- $ipv4 := printf "%s(\\.%s){3}" $ipv4Octet $ipv4Octet }}
+{{- $ipLiteral := printf "\\[%s\\]" $ipv4 }}
+{{- $mailboxAddr := printf "[A-Za-z0-9!#$%%&'*+/=?^_`{|}~-]+(\\.[A-Za-z0-9!#$%%&'*+/=?^_`{|}~-]+)*@(%s|[A-Za-z0-9]([A-Za-z0-9-]*[A-Za-z0-9])?(\\.[A-Za-z0-9]([A-Za-z0-9-]*[A-Za-z0-9])?)*)" $ipLiteral }}
+{{- $nameAtom := "[^\\x00-\\x20\\x7f()<>\\[\\]:;@\\\\,\"?]+" }}
+{{- $nameQuoted := "\"([^\\x00-\\x1f\\x7f\"\\\\,]|\\\\[ -~])*\"" }}
+{{- $nameWord := printf "(%s|%s)" $nameAtom $nameQuoted }}
+{{- $displayName := printf "(%s( +%s)* *)?" $nameWord $nameWord }}
+{{- $mailbox := printf "^(%s|%s<%s>)$" $mailboxAddr $displayName $mailboxAddr }}
+{{- $emailFrom := trimAll " " (toString $email.from) }}
+{{- if contains "{{" $emailFrom }}
+{{- fail "alerta.alerts.email.from must contain a literal address, without template actions" }}
+{{- end }}
+{{- if not (regexMatch $mailbox $emailFrom) }}
+{{- fail (printf "alerta.alerts.email.from must be one address, such as alerts@example.org or Alerts <alerts@example.org>, got %q" $emailFrom) }}
+{{- end }}
+{{- range $recipient := splitList "," (toString $email.to) }}
+{{- $trimmed := trimAll " " $recipient }}
+{{- if contains "{{" $trimmed }}
+{{- fail "alerta.alerts.email.to must contain literal addresses, without template actions" }}
+{{- end }}
+{{- if eq $trimmed "" }}
+{{- fail (printf "alerta.alerts.email.to has an empty entry, got %q" (toString $email.to)) }}
+{{- end }}
+{{- if not (regexMatch $mailbox $trimmed) }}
+{{- fail (printf "alerta.alerts.email.to must be an address or a comma-separated list of addresses, such as oncall@example.org, got %q" $trimmed) }}
+{{- end }}
+{{- end }}
+{{- $smarthost := toString $email.smarthost }}
+{{- if not (regexMatch "^(\\[[0-9A-Fa-f:.]+\\]|[A-Za-z0-9]([A-Za-z0-9-]*[A-Za-z0-9])?(\\.[A-Za-z0-9]([A-Za-z0-9-]*[A-Za-z0-9])?)*):[0-9]{1,5}$" $smarthost) }}
+{{- fail (printf "alerta.alerts.email.smarthost must be host:port, such as smtp.example.com:587, got %q" $smarthost) }}
+{{- end }}
+{{- $smtpHost := regexReplaceAll ":[0-9]+$" $smarthost "" }}
+{{- if hasPrefix "[" $smtpHost }}
+{{- $ip := trimSuffix "]" (trimPrefix "[" $smtpHost) }}
+{{- $isIPv4 := regexMatch (printf "^%s$" $ipv4) $ip }}
+{{- $ip = regexReplaceAll (printf ":%s$" $ipv4) $ip ":0:0" }}
+{{- $hexGroups := "[0-9A-Fa-f]{1,4}(:[0-9A-Fa-f]{1,4}){0,6}" }}
+{{- $fullIPv6 := regexMatch "^([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4}$" $ip }}
+{{- $compressedIPv6 := and (regexMatch (printf "^(%s)?::(%s)?$" $hexGroups $hexGroups) $ip) (lt (len (regexFindAll "[0-9A-Fa-f]+" $ip -1)) 8) }}
+{{- if not (or $isIPv4 $fullIPv6 $compressedIPv6) }}
+{{- fail (printf "alerta.alerts.email.smarthost must be host:port, such as smtp.example.com:587, got %q" $smarthost) }}
+{{- end }}
+{{- end }}
+{{- $smtpPortText := regexReplaceAll "^.*:" $smarthost "" }}
+{{- if and (gt (len $smtpPortText) 1) (hasPrefix "0" $smtpPortText) }}
+{{- fail (printf "alerta.alerts.email.smarthost port must not contain leading zeros, got %q" $smarthost) }}
+{{- end }}
+{{- $smtpPort := int $smtpPortText }}
+{{- if or (lt $smtpPort 1) (gt $smtpPort 65535) }}
+{{- fail (printf "alerta.alerts.email.smarthost port must be between 1 and 65535, got %q" $smarthost) }}
+{{- end }}
+{{- if $email.repeatInterval }}
+{{- $repeat := toString $email.repeatInterval }}
+{{- if not (regexMatch "^([0-9]+y)?([0-9]+w)?([0-9]+d)?([0-9]+h)?([0-9]+m)?([0-9]+s)?([0-9]+ms)?$" $repeat) }}
+{{- fail (printf "alerta.alerts.email.repeatInterval must be an Alertmanager duration with units in descending order, each at most once, such as 5m, 12h or 1h30m, got %q" $repeat) }}
+{{- end }}
+{{- $repeatMs := int64 0 }}
+{{- $maxRepeatMs := int64 9223372036854 }}
+{{- $unitMs := dict "y" 31536000000 "w" 604800000 "d" 86400000 "h" 3600000 "m" 60000 "s" 1000 "ms" 1 }}
+{{- range $part := regexFindAll "[0-9]+(ms|[ywdhms])" $repeat -1 }}
+{{- $amount := regexReplaceAll "^0+" (regexReplaceAll "[a-z]+$" $part "") "" | default "0" }}
+{{- $scale := index $unitMs (regexReplaceAll "^[0-9]+" $part "") }}
+{{- if or (gt (len $amount) 13) (gt (int64 $amount) (div (sub $maxRepeatMs $repeatMs) $scale)) }}
+{{- fail (printf "alerta.alerts.email.repeatInterval is out of range for Alertmanager, got %q" $repeat) }}
+{{- end }}
+{{- $repeatMs = add $repeatMs (mul (int64 $amount) $scale) }}
+{{- end }}
+{{- if eq (int64 $repeatMs) (int64 0) }}
+{{- fail (printf "alerta.alerts.email.repeatInterval cannot be zero, got %q" $repeat) }}
+{{- end }}
+{{- end }}
+{{- range $name := $emailAlertnames }}
+{{- if not (regexMatch "^[a-zA-Z_:][a-zA-Z0-9_:]*$" (toString $name)) }}
+{{- fail (printf "alerta.alerts.email.alertnames entries must be Prometheus alert names, got %q" (toString $name)) }}
+{{- end }}
+{{- end }}
+{{- range $severity := $emailSeverities }}
+{{- if not (regexMatch "^[a-zA-Z0-9_-]+$" (toString $severity)) }}
+{{- fail (printf "alerta.alerts.email.severities entries must be plain severity names, got %q" (toString $severity)) }}
+{{- end }}
+{{- end }}
+{{- end }}
 
 {{- $apiKey := randAlphaNum 32 }}
 {{- $existingSecret := lookup "v1" "Secret" .Release.Namespace "alerta" }}
@@ -75,7 +173,7 @@ spec:
     spec:
       containers:
         - name: alerta
-          image: "alerta/alerta-web:9.0.4"
+          image: "alerta/alerta-web:9.1.0"
           imagePullPolicy: IfNotPresent
           resources: {{- toYaml .Values.alerta.resources | nindent 12 }}
           env:
@@ -182,17 +280,25 @@ metadata:
   name: alerta
   labels:
     app: alerta
+  {{- /* Operator wildcard mode: nginx serves the default SSL cert, so skip per-host ACME. */}}
+  {{- if not $wildcardSecret }}
   annotations:
     {{- if eq $solver "http01" }}
     acme.cert-manager.io/http01-ingress-ingressclassname: {{ $ingress }}
     {{- end }}
     cert-manager.io/cluster-issuer: {{ $clusterIssuer }}
+  {{- end }}
 spec:
   ingressClassName: {{ $ingress }}
   tls:
     - hosts:
         - "{{ printf "alerta.%s" (.Values.host | default $host) }}"
+      {{- /* Operator wildcard mode: no per-host secret — ingress-nginx falls
+             back to the default SSL certificate while the tls section keeps
+             the HTTP-to-HTTPS redirect enforced. */}}
+      {{- if not $wildcardSecret }}
       secretName: alerta-tls
+      {{- end }}
   rules:
     - host: "{{ printf "alerta.%s" (.Values.host | default $host) }}"
       http:
@@ -230,6 +336,8 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: alertmanager
+  labels:
+    app: alertmanager
 type: Opaque
 stringData:
   alertmanager.yaml: |
@@ -252,6 +360,32 @@ stringData:
       - receiver: blackhole
         matchers:
         - 'alertname=~"CDIDefaultStorageClassDegraded|CDINoDefaultStorageClass"'
+      {{- if $emailEnabled }}
+      - receiver: alerta
+        continue: true
+        matchers:
+        - 'severity=~"{{ join "|" $emailSeverities }}"'
+        - 'notify_email="true"'
+      - receiver: email
+        group_wait: 1m
+        group_interval: 5m
+        repeat_interval: {{ $email.repeatInterval | default "12h" | quote }}
+        matchers:
+        - 'severity=~"{{ join "|" $emailSeverities }}"'
+        - 'notify_email="true"'
+      {{- if $emailAlertnames }}
+      - receiver: alerta
+        continue: true
+        matchers:
+        - 'alertname=~"^({{ join "|" $emailAlertnames }})$"'
+      - receiver: email
+        group_wait: 1m
+        group_interval: 5m
+        repeat_interval: {{ $email.repeatInterval | default "12h" | quote }}
+        matchers:
+        - 'alertname=~"^({{ join "|" $emailAlertnames }})$"'
+      {{- end }}
+      {{- end }}
     receivers:
     - name: blackhole
     - name: "alerta"
@@ -262,6 +396,18 @@ stringData:
       webhook_configs:
       - url: 'http://alerta/api/webhooks/prometheus?api-key={{ $apiKey }}'
         send_resolved: false
+    {{- if $emailEnabled }}
+    - name: email
+      email_configs:
+      - to: {{ $email.to | quote }}
+        from: {{ $email.from | quote }}
+        smarthost: {{ $email.smarthost | quote }}
+        {{- if $email.authUsername }}
+        auth_username: {{ $email.authUsername | quote }}
+        auth_password_file: {{ printf "/etc/vm/secrets/%s/password" $emailPasswordSecret | quote }}
+        {{- end }}
+        send_resolved: true
+    {{- end }}
 ---
 apiVersion: operator.victoriametrics.com/v1beta1
 kind: VMAlertmanager
@@ -273,8 +419,12 @@ spec:
       apps.cozystack.io/application.group: apps.cozystack.io
       apps.cozystack.io/application.kind: Monitoring
       apps.cozystack.io/application.name: {{ $.Release.Name }}
-  replicaCount: 3
+  replicaCount: {{ include "monitoring.alertmanager.replicas" $ }}
   configSecret: alertmanager
+  {{- if and $emailEnabled $email.authUsername }}
+  secrets:
+  - {{ $emailPasswordSecret | quote }}
+  {{- end }}
   podMetadata:
     labels:
       policy.cozystack.io/allow-to-apiserver: "true"
diff --git a/packages/system/monitoring/templates/grafana/grafana.yaml b/packages/system/monitoring/templates/grafana/grafana.yaml
index 5c07c757d4..85517151a8 100644
--- a/packages/system/monitoring/templates/grafana/grafana.yaml
+++ b/packages/system/monitoring/templates/grafana/grafana.yaml
@@ -1,8 +1,87 @@
 {{- $solver := (index .Values._cluster "solver") | default "http01" }}
 {{- $clusterIssuer := (index .Values._cluster "issuer-name") | default "letsencrypt-prod" }}
 {{- $ingress := .Values._namespace.ingress }}
-{{- $host := .Values._namespace.host }}
+{{- $host := include "cozy-lib.ns-host-required" . }}
 {{- $gatewayEnabled := (index .Values._cluster "gateway-enabled") | default "false" }}
+{{- $wildcardSecret := (index .Values._cluster "wildcard-secret-name") | default "" }}
+
+{{- /*
+  OIDC (see values.yaml — oidc.mode).
+  System        → chart-owned Keycloak client + audience client scope +
+                  persisted client-secret. Grafana authorization is
+                  app-side: `spec.oidc.users` is reconciled into
+                  Grafana org membership/roles by the users-Job.
+                  Grafana's group-based `role_attribute_path` is NOT
+                  wired up; `skip_org_role_sync = true` prevents a
+                  subsequent login from overwriting the app-side
+                  assignments.
+  CustomConfig  → operator-supplied auth.generic_oauth payload — either
+                  inline as a map (customConfig.config), or as a Secret
+                  with a ready-made ini fragment
+                  (customConfig.secretRef.name). XOR-guarded via the
+                  assertCustomConfigXor helper. `spec.oidc.users` is
+                  also honoured in this mode by the users-Job (users
+                  are matched to Grafana identities by the `email`
+                  claim from the tenant-supplied issuer).
+  None          → no auth.generic_oauth section, no OIDC env — the
+                  admin_user/admin_password Secret remains the only auth
+                  path.
+*/}}
+{{- $oidc := .Values.oidc | default dict }}
+{{- $oidcMode := $oidc.mode | default "None" }}
+{{- /*
+  Users-map prologue is included from oidc-users-job.yaml (rendered in
+  every mode), so the secretRef+users incompat is caught even when
+  oidc-users-job.yaml is disabled downstream. Only the CustomConfig-XOR
+  check is grafana.yaml-scoped.
+*/}}
+{{- if eq $oidcMode "CustomConfig" }}
+{{-   include "monitoring.oidc.assertCustomConfigXor" . }}
+{{- end }}
+{{- /*
+  Symmetric assertions with templates/grafana/oidc-keycloak.yaml so a
+  missing platform OIDC feature or missing Keycloak operator CRD
+  hard-fails the render instead of bringing Grafana up with an
+  `auth.generic_oauth` block pointing at a client that never gets
+  provisioned.
+*/}}
+{{- if eq $oidcMode "System" }}
+{{-   include "monitoring.oidc.assertSystemEnabled" . }}
+{{-   include "monitoring.oidc.assertSystemKeycloakCRD" . }}
+{{- end }}
+{{- $customConfig := $oidc.customConfig | default dict }}
+{{- $customInline := $customConfig.config | default dict }}
+{{- $customSecretRefName := dig "secretRef" "name" "" $customConfig }}
+{{- $useCustomInline := and (eq $oidcMode "CustomConfig") (gt (len $customInline) 0) }}
+{{- $useCustomSecretRef := and (eq $oidcMode "CustomConfig") (ne $customSecretRefName "") }}
+{{- $users := $oidc.users | default (list) }}
+{{- /*
+  The users-map is the switch that turns the chart's authorization
+  contract on. When it's non-empty:
+    * skip_org_role_sync=true keeps a login from overwriting the
+      users-Job's org-role assignments;
+    * oauth_allow_insecure_email_lookup=true binds the OIDC identity
+      to the pre-provisioned local account by email;
+    * allow_sign_up=false rejects any OIDC identity whose email is
+      NOT in `users:` — otherwise Grafana's default allow_sign_up=true
+      combined with skip_org_role_sync=true would silently mint a
+      Viewer account for every cozy-realm user until the next
+      helm-upgrade prune pass.
+  When users[] is empty the chart hands the auth.generic_oauth block
+  to the operator (System mode → chart-supplied issuer defaults;
+  CustomConfig-inline → operator's map applied verbatim; secretRef →
+  operator's ini fragment is authoritative). The users-Job also does
+  not render in that state so nothing app-side touches org membership.
+*/}}
+{{- $usersMapActive := gt (len $users) 0 }}
+{{- $chartForcedOidc := dict }}
+{{- if $usersMapActive }}
+{{-   $chartForcedOidc = dict
+        "skip_org_role_sync" "true"
+        "oauth_allow_insecure_email_lookup" "true"
+        "allow_sign_up" "false"
+}}
+{{- end }}
 ---
 apiVersion: grafana.integreatly.org/v1beta1
 kind: Grafana
@@ -28,8 +107,70 @@ spec:
     security:
       admin_user: user
       admin_password: ${GF_PASSWORD}
-    plugins:
-      allow_loading_unsigned_plugins: "victoriametrics-logs-datasource"
+    {{- /*
+      $chartForcedOidc is prepared above at file scope — it is a non-empty
+      dict when the users-map is active (skip_org_role_sync +
+      oauth_allow_insecure_email_lookup + allow_sign_up=false) and an
+      empty dict otherwise. Merged on top of System's generated block AND
+      on top of the operator's inline map in CustomConfig, so the users-
+      Job contract holds regardless of mode. In CustomConfig secretRef
+      mode the operator's ini fragment is authoritative and the chart
+      cannot inject anything — see _helpers.tpl
+      assertCustomSecretRefUsersEmpty.
+    */}}
+    {{- if eq $oidcMode "System" }}
+    {{- /*
+      Tenant-membership gate — chart-owned and unconditional in System
+      mode. `groups` is requested so Keycloak emits the caller's realm
+      groups in the token (via the platform-managed `groups`
+      KeycloakClientScope + oidc-group-membership-mapper — see
+      packages/system/keycloak-configure). `allowed_groups` then rejects
+      any login whose token does not carry at least one of this
+      tenant's `<namespace>-{view,use,admin,super-admin}` groups. This
+      closes the cross-tenant hole where a user in the shared `cozy`
+      realm could otherwise sign into any tenant's Grafana just by
+      being authenticated: the audience mapper stops REPLAY of a
+      minted token, the allowed_groups check stops ISSUANCE of a
+      usable one to callers outside the tenant.
+    */}}
+    {{- /*
+      `groups_attribute_path` is REQUIRED (not optional) alongside
+      `allowed_groups` on Grafana v11.x+. Without it Grafana leaves
+      the extracted user's Groups slice empty regardless of what the
+      userinfo endpoint returns, and the `allowed_groups` gate rejects
+      every login with "user not a member of one of the required
+      groups" — even when the token carries the correct claim. Verified
+      end-to-end on a test cluster with Grafana v11.6.15: id_token AND userinfo
+      both contained `groups: [<ns>-super-admin, ...]`, `allowed_groups`
+      listed `<ns>-super-admin`, but login failed until
+      `groups_attribute_path=groups` was added. JMESPath expression
+      "groups" reads the top-level `groups` array from userinfo — the
+      shape Keycloak's oidc-group-membership-mapper emits.
+    */}}
+    {{- $systemOidc := dict
+        "enabled" "true"
+        "name" "Keycloak"
+        "client_id" (include "monitoring.oidc.clientId" .)
+        "client_secret" "${GF_AUTH_GENERIC_OAUTH_CLIENT_SECRET}"
+        "auth_url" (printf "%s/protocol/openid-connect/auth" (include "monitoring.oidc.systemIssuerURL" .))
+        "token_url" (printf "%s/protocol/openid-connect/token" (include "monitoring.oidc.systemIssuerURL" .))
+        "api_url" (printf "%s/protocol/openid-connect/userinfo" (include "monitoring.oidc.systemIssuerURL" .))
+        "scopes" (printf "openid email profile groups %s" (include "monitoring.oidc.audienceScopeName" .))
+        "groups_attribute_path" "groups"
+        "allowed_groups" (include "monitoring.oidc.allowedGroups" .)
+        "email_attribute_path" "email"
+        "auto_login" "false"
+    }}
+    auth.generic_oauth:
+      {{- toYaml (merge $chartForcedOidc $systemOidc) | nindent 6 }}
+    {{- else if $useCustomInline }}
+    auth.generic_oauth:
+      {{- /* $chartForcedOidc wins over $customInline via `merge` semantics:
+             merge lhs rhs = lhs values kept, rhs fills only missing keys.
+             So the operator can NOT override skip_org_role_sync=true or
+             oauth_allow_insecure_email_lookup=true — those are contract. */}}
+      {{- toYaml (merge $chartForcedOidc $customInline) | nindent 6 }}
+    {{- end }}
   deployment:
     spec:
       replicas: 2
@@ -38,17 +179,51 @@ spec:
           containers:
             - name: grafana
               resources: {{- toYaml .Values.grafana.resources | nindent 16 }}
-              image: "{{ $.Files.Get "images/grafana.tag" | trim }}"
+              image: {{ include "cozy-lib.image" (list .Values.grafana.image $) }}
               securityContext:
                 allowPrivilegeEscalation: false
                 readOnlyRootFilesystem: false
               readinessProbe:
                 failureThreshold: 3
               env:
-              #- name: GF_INSTALL_PLUGINS
-              #  value: grafana-worldmap-panel,natel-discrete-panel
-              - name: GF_PATHS_PLUGINS
-                value: /var/lib/grafana-plugins
+              {{- /*
+                Plugins are installed at container startup instead of being
+                baked into a rebuilt Grafana image. This keeps the deployment
+                on the upstream grafana/grafana image and removes the need to
+                redistribute an AGPL-3.0 Grafana rebuild.
+
+                The zips are served by the in-cluster grafana-dashboards
+                static file server, which mirrors them from the official
+                Grafana catalog (https://grafana.com/grafana/plugins) at image
+                build time — so pod startup needs no egress to the internet
+                and keeps working on air-gapped installs. Keep the ids and
+                versions in sync with the plugin list in
+                packages/system/grafana-operator/images/grafana-dashboards/Dockerfile.
+                Tenant egress to that server is opened by the
+                allow-to-grafana-dashboards CiliumNetworkPolicy in
+                packages/apps/tenant.
+                  * victoriametrics-logs-datasource — the VictoriaLogs
+                    datasource (signed, the reason the image was rebuilt);
+                  * the three panels reproduce the set previously vendored in
+                    the removed Dockerfile. Versions are pinned to releases
+                    compatible with the Grafana version above.
+                Plugins land in the default GF_PATHS_PLUGINS
+                (/var/lib/grafana/plugins), which is writable in the upstream
+                image, so no custom plugins path is needed.
+              */}}
+              {{- $pluginsURL := "http://grafana-dashboards.cozy-grafana-operator.svc/plugins" }}
+              {{- $plugins := dict
+                    "victoriametrics-logs-datasource" "0.29.0"
+                    "natel-discrete-panel" "0.1.1"
+                    "grafana-worldmap-panel" "1.0.6"
+                    "marcusolsson-dynamictext-panel" "6.2.0"
+              }}
+              {{- $specs := list }}
+              {{- range $id, $ver := $plugins }}
+              {{- $specs = append $specs (printf "%s/%s-%s.zip;%s" $pluginsURL $id $ver $id) }}
+              {{- end }}
+              - name: GF_INSTALL_PLUGINS
+                value: "{{ join "," $specs }}"
               - name: ONCALL_API_URL
                 value: http://grafana-oncall-engine:8080
               - name: GF_DATABASE_HOST
@@ -71,14 +246,51 @@ spec:
                   secretKeyRef:
                     key: password
                     name: grafana-admin-password
+              {{- if eq $oidcMode "System" }}
+              - name: GF_AUTH_GENERIC_OAUTH_CLIENT_SECRET
+                valueFrom:
+                  secretKeyRef:
+                    name: {{ include "monitoring.oidc.clientSecretName" . }}
+                    key: client-secret
+              {{- end }}
+              {{- if $useCustomSecretRef }}
+              - name: GF_PATHS_CUSTOM_INI
+                value: /etc/grafana/oidc/auth.ini
+              {{- end }}
+              {{- if $useCustomSecretRef }}
+              volumeMounts:
+                - name: oidc-custom-ini
+                  mountPath: /etc/grafana/oidc
+                  readOnly: true
+              {{- end }}
+          {{- if $useCustomSecretRef }}
+          volumes:
+            - name: oidc-custom-ini
+              secret:
+                secretName: {{ $customSecretRefName }}
+                {{- /* The tenant names the Secret; for a central tenant,
+                       mounting only the key Grafana reads keeps any other
+                       one, such as its collector's vmauth password, out of a
+                       pod that can reach the shared traces store. Other
+                       tenants keep the whole Secret, which an auth.ini
+                       reading a sibling key with $__file{} relies on. */}}
+                {{- if eq (include "monitoring.tracingCentral" $) "true" }}
+                items:
+                  - key: auth.ini
+                    path: auth.ini
+                {{- end }}
+          {{- end }}
   {{- if ne $gatewayEnabled "true" }}
   ingress:
+    {{- /* Operator wildcard mode: nginx serves the default SSL cert, so skip per-host ACME. */}}
+    {{- if not $wildcardSecret }}
     metadata:
       annotations:
         {{- if eq $solver "http01" }}
         acme.cert-manager.io/http01-ingress-ingressclassname: "{{ $ingress }}"
         {{- end }}
         cert-manager.io/cluster-issuer: {{ $clusterIssuer }}
+    {{- end }}
     spec:
       ingressClassName: "{{ $ingress }}"
       rules:
@@ -95,5 +307,10 @@ spec:
       tls:
       - hosts:
         - "{{ printf "grafana.%s" (.Values.host | default $host) }}"
+        {{- /* Operator wildcard mode: no per-host secret — ingress-nginx falls
+               back to the default SSL certificate while the tls section keeps
+               the HTTP-to-HTTPS redirect enforced. */}}
+        {{- if not $wildcardSecret }}
         secretName: grafana-ingress-tls
+        {{- end }}
   {{- end }}
diff --git a/packages/system/monitoring/templates/grafana/httproute.yaml b/packages/system/monitoring/templates/grafana/httproute.yaml
index eac25aec91..7c58a256d4 100644
--- a/packages/system/monitoring/templates/grafana/httproute.yaml
+++ b/packages/system/monitoring/templates/grafana/httproute.yaml
@@ -1,4 +1,4 @@
-{{- $host := .Values._namespace.host }}
+{{- $host := include "cozy-lib.ns-host-required" . }}
 {{- $exposeIngress := (index .Values._cluster "expose-ingress") | default "tenant-root" }}
 {{- $gatewayEnabled := (index .Values._cluster "gateway-enabled") | default "false" }}
 {{- if eq $gatewayEnabled "true" }}
diff --git a/packages/system/monitoring/templates/grafana/oidc-client-secret.yaml b/packages/system/monitoring/templates/grafana/oidc-client-secret.yaml
new file mode 100644
index 0000000000..b0f1b1e96b
--- /dev/null
+++ b/packages/system/monitoring/templates/grafana/oidc-client-secret.yaml
@@ -0,0 +1,44 @@
+{{- /*
+  Persistent Secret carrying the confidential OIDC client secret.
+
+  Consumed by two parties:
+    1. The EDP-Keycloak operator, referenced from oidc-keycloak.yaml
+       via the `$<secret>:client-secret` syntax on `spec.secret`.
+    2. The Grafana pod, referenced from grafana.yaml as
+       `GF_AUTH_GENERIC_OAUTH_CLIENT_SECRET` env — Grafana's `.ini`
+       supports `${VAR}` interpolation.
+
+  Random on first install, preserved on upgrades via `lookup` (same
+  pattern as packages/system/dashboard/templates/keycloakclient.yaml).
+  Rotating the value requires deleting the Secret and re-running the
+  release.
+
+  Rendered only for System mode. In CustomConfig mode the operator
+  supplies their own credentials — either inline in
+  spec.oidc.customConfig.config (plaintext) or through
+  spec.oidc.customConfig.secretRef pointing at their own Secret.
+*/}}
+{{- $oidc := .Values.oidc | default dict }}
+{{- if eq ($oidc.mode | default "None") "System" }}
+{{-   $secretName := include "monitoring.oidc.clientSecretName" . }}
+{{-   $existing := lookup "v1" "Secret" .Release.Namespace $secretName }}
+{{-   $clientSecret := "" }}
+{{-   if $existing }}
+{{-     $existingValue := dig "data" "client-secret" "" $existing }}
+{{-     if $existingValue }}
+{{-       $clientSecret = $existingValue | b64dec }}
+{{-     end }}
+{{-   end }}
+{{-   if eq $clientSecret "" }}
+{{-     $clientSecret = randAlphaNum 32 }}
+{{-   end }}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ $secretName }}
+  namespace: {{ .Release.Namespace }}
+type: Opaque
+data:
+  client-secret: {{ $clientSecret | b64enc }}
+{{- end }}
diff --git a/packages/system/monitoring/templates/grafana/oidc-keycloak.yaml b/packages/system/monitoring/templates/grafana/oidc-keycloak.yaml
new file mode 100644
index 0000000000..2f10894c0c
--- /dev/null
+++ b/packages/system/monitoring/templates/grafana/oidc-keycloak.yaml
@@ -0,0 +1,110 @@
+{{- /*
+  Phase 1 — System mode: render one per-instance Keycloak client and a
+  per-instance audience client scope inside the platform `cozy` realm.
+
+  The clientId is namespace-prefixed so it is globally unique across
+  the realm; the audience scope binds `id_token.aud` to that clientId
+  so a token minted for one Monitoring instance is rejected by
+  another's Grafana — the per-instance isolation primitive in the
+  absence of per-tenant realms.
+
+  Two distinct group-based gates are wired:
+    * `defaultClientScopes: [groups, <audience>]` on the client causes
+      Keycloak to emit the caller's realm-group membership in the
+      `groups` claim. Grafana's `allowed_groups` in grafana.yaml then
+      rejects any login whose token does not carry at least one of the
+      release's tenant-scoped groups
+      (`<namespace>-{view,use,admin,super-admin}`, provisioned by the
+      tenant chart in packages/apps/tenant). This is the isolation gate
+      that stops tenant-alice from signing into tenant-bob's Grafana.
+    * `spec.oidc.users`, reconciled into Grafana org membership/roles
+      by the users-Job (templates/grafana/oidc-users-job.yaml), is the
+      per-user authorization layer that runs INSIDE Grafana after the
+      Keycloak-side gate has already admitted the login.
+  No KeycloakRealmGroup is provisioned by this chart — group directory
+  ownership stays with the tenant chart. See docs/oidc-grafana.md.
+
+  Nothing is rendered for `mode: CustomConfig` or `mode: None`: in
+  those modes `cozy` is not in the path.
+
+  The `_cluster.oidc-enabled` guard catches the case where an
+  operator toggles `mode: System` without the platform-level OIDC
+  feature (authentication.oidc.enabled) being on. The
+  `v1.edp.epam.com/v1` capability guard turns a missing Keycloak
+  operator CRD into an explicit render error rather than a silent
+  half-rendered state — see monitoring.oidc.assertSystemKeycloakCRD
+  in _helpers.tpl and grafana.yaml where the same assertion gates
+  `auth.generic_oauth` so Grafana never comes up pointing at a
+  client that never gets provisioned.
+*/}}
+{{- $oidc := .Values.oidc | default dict }}
+{{- if eq ($oidc.mode | default "None") "System" }}
+{{-   include "monitoring.oidc.assertSystemEnabled" . }}
+{{-   include "monitoring.oidc.assertSystemKeycloakCRD" . }}
+{{-   $clientId := include "monitoring.oidc.clientId" . }}
+{{-   $scopeName := include "monitoring.oidc.audienceScopeName" . }}
+{{-   $clientSecretName := include "monitoring.oidc.clientSecretName" . }}
+{{-   $grafanaHost := include "monitoring.oidc.grafanaHost" . }}
+---
+apiVersion: v1.edp.epam.com/v1
+kind: KeycloakClientScope
+metadata:
+  name: {{ $scopeName }}
+  namespace: {{ .Release.Namespace }}
+spec:
+  name: {{ $scopeName }}
+  realmRef:
+    name: keycloakrealm-cozy
+    kind: ClusterKeycloakRealm
+  description: "Per-instance audience for Grafana {{ .Release.Name }}"
+  protocol: openid-connect
+  default: false
+  attributes:
+    "include.in.token.scope": "true"
+  protocolMappers:
+    - name: audience
+      protocol: openid-connect
+      protocolMapper: "oidc-audience-mapper"
+      config:
+        "included.client.audience": {{ $clientId | quote }}
+        "id.token.claim": "true"
+        "access.token.claim": "true"
+        "introspection.token.claim": "true"
+        "lightweight.claim": "false"
+---
+apiVersion: v1.edp.epam.com/v1
+kind: KeycloakClient
+metadata:
+  name: {{ $clientId }}
+  namespace: {{ .Release.Namespace }}
+spec:
+  clientId: {{ $clientId }}
+  name: {{ $clientId }}
+  realmRef:
+    name: keycloakrealm-cozy
+    kind: ClusterKeycloakRealm
+  public: false
+  directAccess: false
+  advancedProtocolMappers: true
+  secret: "${{ $clientSecretName }}:client-secret"
+  webUrl: "https://{{ $grafanaHost }}"
+  redirectUris:
+    - "https://{{ $grafanaHost }}/login/generic_oauth"
+  defaultClientScopes:
+    # Platform-provisioned realm-default scope carrying an
+    # oidc-group-membership-mapper that emits the caller's Keycloak
+    # groups into the `groups` claim of every token. Grafana's
+    # `allowed_groups` reads that claim to gate login on tenant-scoped
+    # group membership (see grafana.yaml). EDP's KeycloakClient does NOT
+    # merge realm-level defaults into `defaultClientScopes` — we must
+    # list it here explicitly, or the claim would be missing and
+    # `allowed_groups` would reject every login.
+    - groups
+    # Per-instance audience: binds `id_token.aud` to this client's
+    # `clientId` so a token minted for another Monitoring release
+    # (tenant-alice's Grafana) is rejected by this Grafana even if the
+    # caller also happens to be a member of this tenant's groups.
+    - {{ $scopeName }}
+  attributes:
+    "post.logout.redirect.uris": "+"
+{{- end }}
diff --git a/packages/system/monitoring/templates/grafana/oidc-users-job.yaml b/packages/system/monitoring/templates/grafana/oidc-users-job.yaml
new file mode 100644
index 0000000000..90dfad3be9
--- /dev/null
+++ b/packages/system/monitoring/templates/grafana/oidc-users-job.yaml
@@ -0,0 +1,316 @@
+{{- /*
+  OIDC user reconcile Job — runs as Helm post-install,post-upgrade
+  hook and syncs `spec.oidc.users` into the release's Grafana org via
+  Grafana's admin API. Same operator UX as the tenant kube-apiserver
+  sibling in cozystack/cozystack#3044 (users-map → ClusterRoleBindings
+  in the guest cluster); here the target is Grafana org membership
+  because grafana-operator has no user CRD.
+
+  Contract:
+    - For each `spec.oidc.users[]` entry:
+        * pre-provision a local Grafana account with the given email
+          (random password — the account is a shell so the users-Job
+          can set an org role before the operator's first OIDC login,
+          and `oauth_allow_insecure_email_lookup = true` glues them
+          together at login time);
+        * add the account to Main Org. with the requested role
+          (`Admin` / `Editor` / `Viewer`), promoting/demoting on
+          re-run.
+    - Prune every non-admin Main-Org member whose email is not in the
+      desired list — handles removal of a `users:` entry.
+    - `skip_org_role_sync = true` in the Grafana generic_oauth block
+      (see grafana.yaml) makes sure a later login never overwrites the
+      role this Job sets.
+
+  Renders only when `spec.oidc.users` is non-empty. `users: []` (or
+  unset) is the switch that says "the chart owns nothing in Grafana
+  orgs" — a prune pass with an empty desired list would silently
+  delete every non-admin Main-Org member on every helm upgrade. That
+  covers three empty-users states that all resolve to the same
+  hands-off contract:
+    * mode=None                          → OIDC off, no chart-managed
+                                           org membership at all.
+    * customConfig.secretRef mode        → users[] is forbidden by
+                                           the assertion helper; the
+                                           operator's ini fragment is
+                                           authoritative.
+    * System / CustomConfig-inline with
+      users[] unset                      → the operator opted into
+                                           OIDC but not into the
+                                           chart-managed users-map;
+                                           they own org membership
+                                           themselves.
+  Removing the last `users:` entry therefore no longer prunes it —
+  the operator cleans up any leftover OIDC-provisioned accounts by
+  hand, matching the already-documented `System → None` posture.
+
+  Lifecycle:
+    - The Job itself is a Helm hook (post-install,post-upgrade) with
+      `helm.sh/hook-delete-policy: before-hook-creation` so `helm
+      upgrade` re-runs it on every reconcile.
+    - No ServiceAccount/Role/RoleBinding: the Job only talks to
+      Grafana over the in-cluster Service and reads the admin
+      credentials from the chart-managed `grafana-admin-password`
+      Secret via `envFrom`.
+    - `activeDeadlineSeconds` caps a stuck Job so a broken Grafana
+      does not hold the release in `pending-upgrade`.
+*/}}
+{{- $oidc := .Values.oidc | default dict }}
+{{- $mode := $oidc.mode | default "None" }}
+{{- $users := $oidc.users | default (list) }}
+{{- /*
+  Prologue: incompat (secretRef+users) first, then per-entry role +
+  email validation. See monitoring.oidc.assertUsersPrologue. Runs in
+  every mode so a malformed users[] entry fails render even when the
+  Job itself is not emitted (mode=None).
+*/}}
+{{- include "monitoring.oidc.assertUsersPrologue" . }}
+{{- /*
+  Render gate — two independent guards ANDed together:
+    * mode != None    keeps pre-OIDC installs safe on `monitoring`
+                      HR reconciles (empty users but no OIDC at all).
+    * users non-empty covers `customConfig.secretRef` (users forbidden
+                      by assertion) and System / CustomConfig-inline
+                      with `users:` unset — both cases where the
+                      operator opted into OIDC but not into the
+                      chart-managed users-map.
+*/}}
+{{- if and (ne $mode "None") (gt (len $users) 0) }}
+---
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: {{ .Release.Name }}-oidc-users
+  namespace: {{ .Release.Namespace }}
+  annotations:
+    "helm.sh/hook": post-install,post-upgrade
+    "helm.sh/hook-weight": "10"
+    "helm.sh/hook-delete-policy": before-hook-creation
+spec:
+  backoffLimit: 6
+  activeDeadlineSeconds: 900
+  # Non-hook cleanup: `hook-delete-policy: before-hook-creation` only fires
+  # on the NEXT hook activation, never on release uninstall — a succeeded
+  # Job + Pod would otherwise linger in the namespace forever. Cozystack
+  # convention: 3600s.
+  ttlSecondsAfterFinished: 3600
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/name: monitoring-oidc-users
+        app.kubernetes.io/instance: {{ .Release.Name }}
+    spec:
+      restartPolicy: OnFailure
+      securityContext:
+        runAsNonRoot: true
+        runAsUser: 65534
+        runAsGroup: 65534
+        seccompProfile:
+          type: RuntimeDefault
+      containers:
+        - name: reconcile
+          # Route through cozy-lib.image so mirrored / air-gapped
+          # installations (`_cluster.images-registry`) resolve the image;
+          # matches the pattern in
+          # packages/apps/mariadb/templates/hooks/cleanup-pvc.yaml.
+          image: {{ include "cozy-lib.image" (list ($.Files.Get "images/kubectl.tag" | trim) $) }}
+          imagePullPolicy: IfNotPresent
+          securityContext:
+            allowPrivilegeEscalation: false
+            readOnlyRootFilesystem: true
+            capabilities:
+              drop: ["ALL"]
+          env:
+            - name: HOME
+              value: /tmp
+            - name: GRAFANA_URL
+              value: "http://grafana-service.{{ .Release.Namespace }}.svc:3000"
+            - name: GF_ADMIN_USER
+              valueFrom:
+                secretKeyRef:
+                  name: grafana-admin-password
+                  key: user
+            - name: GF_ADMIN_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: grafana-admin-password
+                  key: password
+            - name: OIDC_MODE
+              value: {{ $mode | quote }}
+            - name: DESIRED_USERS_JSON
+              value: {{ $users | toJson | quote }}
+          resources:
+            requests:
+              cpu: 10m
+              memory: 64Mi
+            limits:
+              cpu: 200m
+              memory: 256Mi
+          command:
+            - /bin/sh
+            - -c
+            - |
+              set -eu
+
+              log() { printf '%s\n' "$*" >&2; }
+
+              api() {
+                # api METHOD PATH [json-body]
+                method=$1
+                path=$2
+                body=${3:-}
+                if [ -n "$body" ]; then
+                  curl --silent --show-error --output /tmp/resp --write-out '%{http_code}' \
+                    --user "$GF_ADMIN_USER:$GF_ADMIN_PASSWORD" \
+                    --header 'Content-Type: application/json' \
+                    --request "$method" \
+                    --data "$body" \
+                    "$GRAFANA_URL$path"
+                else
+                  curl --silent --show-error --output /tmp/resp --write-out '%{http_code}' \
+                    --user "$GF_ADMIN_USER:$GF_ADMIN_PASSWORD" \
+                    --request "$method" \
+                    "$GRAFANA_URL$path"
+                fi
+              }
+
+              log "Waiting for Grafana at $GRAFANA_URL/api/health..."
+              deadline=$(( $(date +%s) + 600 ))
+              while :; do
+                if curl --silent --fail --output /dev/null --max-time 5 \
+                  "$GRAFANA_URL/api/health"; then
+                  break
+                fi
+                if [ "$(date +%s)" -ge "$deadline" ]; then
+                  log "Grafana did not become ready within 10m; aborting"
+                  exit 1
+                fi
+                sleep 5
+              done
+
+              # Main Org. is orgId=1 in Grafana OSS. We only ever
+              # touch that one org — the chart does not create
+              # additional orgs.
+              ORG_ID=1
+
+              # Emit desired emails one per line. Portable — BusyBox
+              # coreutils in the alpine base do not support jq
+              # --raw-output0 (jq 1.7+) nor `read -d ''`. The template-
+              # level assertUsersEmailShape helper already rejects any
+              # email containing whitespace / control characters, so
+              # line-oriented iteration is safe here.
+              printf '%s' "$DESIRED_USERS_JSON" | jq --raw-output '.[].email' > /tmp/desired-emails 2>/dev/null || : > /tmp/desired-emails
+
+              # URL-encode a string via jq (@uri) — used for query-string
+              # values like /api/users/lookup?loginOrEmail=<encoded>.
+              urlencode() { printf '%s' "$1" | jq --slurp --raw-input --raw-output '@uri'; }
+
+              if [ "$OIDC_MODE" != "None" ]; then
+                log "Reconciling ${OIDC_MODE} users into Grafana org $ORG_ID..."
+                while IFS= read -r email; do
+                  [ -n "$email" ] || continue
+                  role=$(printf '%s' "$DESIRED_USERS_JSON" | jq --raw-output --arg e "$email" '.[] | select(.email == $e) | .role')
+                  log "  ensure user: email=$email role=$role"
+
+                  # 1. Pre-provision the local account so the operator
+                  #    can be assigned a role before their first login.
+                  #    409 is expected on re-run — already provisioned.
+                  # BusyBox `head` / `tr` support only short flags.
+                  password=$(head -c 24 /dev/urandom | base64 | tr -d '=+/' | head -c 32)
+                  create_body=$(jq --null-input --compact-output \
+                    --arg name "$email" \
+                    --arg email "$email" \
+                    --arg login "$email" \
+                    --arg password "$password" \
+                    '{name:$name,email:$email,login:$login,password:$password}')
+                  code=$(api POST /api/admin/users "$create_body")
+                  case "$code" in
+                    200|201) log "    created Grafana account" ;;
+                    412|409|400) log "    account already exists (code $code) — proceeding" ;;
+                    *) log "    POST /api/admin/users failed with code $code:"; cat /tmp/resp >&2; exit 1 ;;
+                  esac
+
+                  # 2. Add to Main Org. — 409 means already a member,
+                  #    we'll PATCH the role below either way.
+                  add_body=$(jq --null-input --compact-output \
+                    --arg loginOrEmail "$email" \
+                    --arg role "$role" \
+                    '{loginOrEmail:$loginOrEmail,role:$role}')
+                  code=$(api POST "/api/orgs/$ORG_ID/users" "$add_body")
+                  case "$code" in
+                    200|201) log "    added to org $ORG_ID with role $role" ;;
+                    409) log "    already a member of org $ORG_ID — will PATCH role" ;;
+                    *) log "    POST /api/orgs/$ORG_ID/users failed with code $code:"; cat /tmp/resp >&2; exit 1 ;;
+                  esac
+
+                  # 3. Look up userId, then PATCH the role to converge
+                  #    demotions/promotions across re-runs. Query-string
+                  #    value URL-encoded so & = ? in the local part parse
+                  #    correctly on the Grafana side.
+                  email_enc=$(urlencode "$email")
+                  code=$(api GET "/api/users/lookup?loginOrEmail=$email_enc")
+                  if [ "$code" != "200" ]; then
+                    log "    GET /api/users/lookup failed with code $code:"; cat /tmp/resp >&2; exit 1
+                  fi
+                  user_id=$(jq --raw-output '.id' < /tmp/resp)
+                  patch_body=$(jq --null-input --compact-output --arg role "$role" '{role:$role}')
+                  code=$(api PATCH "/api/orgs/$ORG_ID/users/$user_id" "$patch_body")
+                  case "$code" in
+                    200) log "    role set to $role" ;;
+                    *) log "    PATCH role failed with code $code:"; cat /tmp/resp >&2; exit 1 ;;
+                  esac
+                done < /tmp/desired-emails
+              else
+                log "mode=None: skipping user reconcile, running prune only."
+              fi
+
+              # Prune — remove every non-admin Main-Org member whose
+              # email is not in the desired list.
+              log "Pruning stale org members..."
+              code=$(api GET "/api/orgs/$ORG_ID/users")
+              if [ "$code" != "200" ]; then
+                log "  GET /api/orgs/$ORG_ID/users failed with code $code:"; cat /tmp/resp >&2; exit 1
+              fi
+              cp /tmp/resp /tmp/members.json
+
+              # The chart-managed admin login name — never pruned.
+              admin_login="$GF_ADMIN_USER"
+
+              # Membership stream: one TAB-separated record per line —
+              # portable across BusyBox coreutils (no jq --raw-output0,
+              # no `read -d ''`, no `grep -z`). Safe because the
+              # template-level email-shape guard already rejects
+              # whitespace / TAB / newline in `spec.oidc.users[].email`.
+              jq --raw-output '.[] | [.userId, .login, .email] | @tsv' < /tmp/members.json > /tmp/members.tsv
+
+              # IFS holds a literal TAB char (POSIX portable — some
+              # ash variants don't handle $'\t' escape).
+              IFS="$(printf '\t')"
+              while read -r uid ulogin uemail; do
+                if [ -z "$uid" ] || [ "$uid" = "null" ]; then continue; fi
+                if [ "$ulogin" = "$admin_login" ]; then
+                  log "  keep admin: login=$ulogin uid=$uid"
+                  continue
+                fi
+                # Match uemail / ulogin against desired list. -F fixed
+                # strings, -x line-anchored, -q quiet. Portable across
+                # BusyBox and GNU grep.
+                if grep -Fxq -e "$uemail" -e "$ulogin" /tmp/desired-emails; then
+                  continue
+                fi
+                log "  removing stale member: login=$ulogin email=$uemail uid=$uid"
+                code=$(api DELETE "/api/orgs/$ORG_ID/users/$uid")
+                case "$code" in
+                  200) : ;;
+                  *) log "    DELETE failed with code $code:"; cat /tmp/resp >&2; exit 1 ;;
+                esac
+              done < /tmp/members.tsv
+
+              log "Done."
+          volumeMounts:
+            - name: tmp
+              mountPath: /tmp
+      volumes:
+        - name: tmp
+          emptyDir: {}
+{{- end }}
diff --git a/packages/system/monitoring/templates/vlogs/grafana-datasource.yaml b/packages/system/monitoring/templates/vlogs/grafana-datasource.yaml
index 72755c6f5a..835355053a 100644
--- a/packages/system/monitoring/templates/vlogs/grafana-datasource.yaml
+++ b/packages/system/monitoring/templates/vlogs/grafana-datasource.yaml
@@ -1,4 +1,5 @@
 {{- range .Values.logsStorages }}
+---
 apiVersion: grafana.integreatly.org/v1beta1
 kind: GrafanaDatasource
 metadata:
diff --git a/packages/system/monitoring/templates/vlogs/vlogs.yaml b/packages/system/monitoring/templates/vlogs/vlogs.yaml
index 106d3aaf83..0e3d6add13 100644
--- a/packages/system/monitoring/templates/vlogs/vlogs.yaml
+++ b/packages/system/monitoring/templates/vlogs/vlogs.yaml
@@ -1,3 +1,13 @@
+{{- /*
+  Reject an empty logsStorages outright. With no entry no VLCluster is
+  rendered, the monitoring-system HelmRelease readiness gate (which keys on the
+  VLCluster) has nothing to match, and fluent-bit ends up shipping to a
+  vlinsert-generic that never exists — silently dropping logs (issue #3181).
+  Fail the render instead so the misconfiguration is loud, not silent.
+*/ -}}
+{{- if not .Values.logsStorages }}
+{{- fail "monitoring: logsStorages must define at least one entry; an empty list renders no VLCluster and fluent-bit silently drops logs to a non-existent vlinsert-generic (issue #3181)" }}
+{{- end }}
 {{- range .Values.logsStorages }}
 ---
 apiVersion: operator.victoriametrics.com/v1
@@ -22,6 +32,14 @@ spec:
     resources: {}
     storage:
       volumeClaimTemplate:
+        metadata:
+          # Stamped on the claim template so vm-operator copies it onto the
+          # storage PVCs (IntoSTSVolume). The operator does NOT apply
+          # spec.managedMetadata to PVCs, so the claim template is the only path
+          # that lands a label on them. The monitoring post-delete cleanup hook
+          # selects PVCs by this label to stay release-scoped.
+          labels:
+            apps.cozystack.io/application.name: {{ $.Release.Name }}
         spec:
           {{- with .storageClassName }}
           storageClassName: {{ . }}
diff --git a/packages/system/monitoring/templates/vm/vmalert.yaml b/packages/system/monitoring/templates/vm/vmalert.yaml
index 8da03e152d..b4f0c8aa18 100644
--- a/packages/system/monitoring/templates/vm/vmalert.yaml
+++ b/packages/system/monitoring/templates/vm/vmalert.yaml
@@ -16,7 +16,9 @@ spec:
   extraArgs:
     remoteWrite.disablePathAppend: "true"
   notifiers:
-  - url: http://vmalertmanager-alertmanager.{{ $.Release.Namespace }}.svc:9093
+  {{- range $i := until (int (include "monitoring.alertmanager.replicas" $)) }}
+  - url: http://vmalertmanager-alertmanager-{{ $i }}.vmalertmanager-alertmanager.{{ $.Release.Namespace }}.svc:9093
+  {{- end }}
   remoteRead:
     url: http://vmselect-{{ .name }}.{{ $.Release.Namespace }}.svc:8481/select/0/prometheus
   remoteWrite:
diff --git a/packages/system/monitoring/templates/vm/vmcluster.yaml b/packages/system/monitoring/templates/vm/vmcluster.yaml
index 1bc3992317..e2962a12a7 100644
--- a/packages/system/monitoring/templates/vm/vmcluster.yaml
+++ b/packages/system/monitoring/templates/vm/vmcluster.yaml
@@ -29,6 +29,14 @@ spec:
     cacheMountPath: /select-cache
     storage:
       volumeClaimTemplate:
+        metadata:
+          # Stamped on the claim template so vm-operator copies it onto the
+          # storage PVCs (IntoSTSVolume). The operator does NOT apply
+          # spec.managedMetadata to PVCs, so the claim template is the only path
+          # that lands a label on them. The monitoring post-delete cleanup hook
+          # selects PVCs by this label to stay release-scoped.
+          labels:
+            apps.cozystack.io/application.name: {{ $.Release.Name }}
         spec:
           {{- with .storageClassName }}
           storageClassName: {{ . }}
@@ -41,6 +49,14 @@ spec:
     resources: {}
     storage:
       volumeClaimTemplate:
+        metadata:
+          # Stamped on the claim template so vm-operator copies it onto the
+          # storage PVCs (IntoSTSVolume). The operator does NOT apply
+          # spec.managedMetadata to PVCs, so the claim template is the only path
+          # that lands a label on them. The monitoring post-delete cleanup hook
+          # selects PVCs by this label to stay release-scoped.
+          labels:
+            apps.cozystack.io/application.name: {{ $.Release.Name }}
         spec:
           {{- with .storageClassName }}
           storageClassName: {{ . }}
diff --git a/packages/system/monitoring/templates/vpa.yaml b/packages/system/monitoring/templates/vpa.yaml
index 551f831029..50b91aee6d 100644
--- a/packages/system/monitoring/templates/vpa.yaml
+++ b/packages/system/monitoring/templates/vpa.yaml
@@ -1,3 +1,13 @@
+{{- /*
+  updateMode is Initial, not Auto. In Auto mode the VPA Updater evicts running
+  pods to apply new recommendations. During install that eviction churn
+  recreates pods faster than Cilium releases their endpoint IPs, tripping the
+  cluster-pool IPAM "IP already in use" (putEndpointIdInvalid) leak: a pod gets
+  wedged in ContainerCreating and the install stalls (e.g. vmstorage/vmagent
+  evictions wedging vmalertmanager / fluent-bit). Initial sets requests at pod
+  creation without ever evicting, which removes the trigger. Do not switch back
+  to Auto without first fixing the underlying Cilium IP-reuse race.
+*/ -}}
 {{- range .Values.metricsStorages }}
 ---
 apiVersion: autoscaling.k8s.io/v1
@@ -10,7 +20,7 @@ spec:
     kind: Deployment
     name: vminsert-{{ .name }}
   updatePolicy:
-    updateMode: Auto
+    updateMode: Initial
   resourcePolicy:
     containerPolicies:
       - containerName: vminsert
@@ -39,7 +49,7 @@ spec:
     kind: StatefulSet
     name: vmselect-{{ .name }}
   updatePolicy:
-    updateMode: Auto
+    updateMode: Initial
   resourcePolicy:
     containerPolicies:
       - containerName: vmselect
@@ -47,8 +57,8 @@ spec:
           {{- if and .vmselect .vmselect.minAllowed }}
           {{- toYaml .vmselect.minAllowed | nindent 10 }}
           {{- else }}
-          cpu: 25m
-          memory: 64Mi
+          cpu: 200m
+          memory: 512Mi
           {{- end }}
         maxAllowed:
           {{- if and .vmselect .vmselect.maxAllowed }}
@@ -68,7 +78,7 @@ spec:
     kind: StatefulSet
     name: vmstorage-{{ .name }}
   updatePolicy:
-    updateMode: Auto
+    updateMode: Initial
   resourcePolicy:
     containerPolicies:
       - containerName: vmstorage
@@ -76,8 +86,8 @@ spec:
           {{- if and .vmstorage .vmstorage.minAllowed }}
           {{- toYaml .vmstorage.minAllowed | nindent 10 }}
           {{- else }}
-          cpu: 25m
-          memory: 64Mi
+          cpu: 200m
+          memory: 512Mi
           {{- end }}
         maxAllowed:
           {{- if and .vmstorage .vmstorage.maxAllowed }}
@@ -99,7 +109,7 @@ spec:
     kind: Deployment
     name: vlinsert-{{ .name }}
   updatePolicy:
-    updateMode: Auto
+    updateMode: Initial
   resourcePolicy:
     containerPolicies:
       - containerName: vlinsert
@@ -128,7 +138,7 @@ spec:
     kind: Deployment
     name: vlselect-{{ .name }}
   updatePolicy:
-    updateMode: Auto
+    updateMode: Initial
   resourcePolicy:
     containerPolicies:
       - containerName: vlselect
@@ -157,7 +167,7 @@ spec:
     kind: StatefulSet
     name: vlstorage-{{ .name }}
   updatePolicy:
-    updateMode: Auto
+    updateMode: Initial
   resourcePolicy:
     containerPolicies:
       - containerName: vlstorage
@@ -176,3 +186,125 @@ spec:
           memory: 8Gi
           {{- end }}
 {{- end }}
+{{- /*
+  Trace components. tracingStorages has no resource knobs, so bounds are
+  hardcoded (no dead min/maxAllowed conditionals like the logs entries above).
+  Component kinds per victoria-metrics-operator: vtinsert/vtselect are
+  Deployments, vtstorage a StatefulSet, vtsingle a Deployment. tracingStorages
+  is empty by default, so this renders nothing until a backend is configured.
+*/ -}}
+{{- range .Values.tracingStorages }}
+{{- if eq (.mode | default "cluster") "single" }}
+---
+# VTSingle mounts a plain ReadWriteOnce PVC by claim name (not a volume claim
+# template), so an evicting VPA would deadlock on multi-attach — updateMode
+# Initial (file-wide) avoids that on top of the Cilium IP-reuse race.
+apiVersion: autoscaling.k8s.io/v1
+kind: VerticalPodAutoscaler
+metadata:
+  name: vpa-vtsingle-{{ .name }}
+spec:
+  targetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: vtsingle-{{ .name }}
+  updatePolicy:
+    updateMode: Initial
+  resourcePolicy:
+    containerPolicies:
+      - containerName: vtsingle
+        minAllowed:
+          cpu: 25m
+          memory: 128Mi
+        maxAllowed:
+          cpu: 4000m
+          memory: 8Gi
+{{- else }}
+---
+apiVersion: autoscaling.k8s.io/v1
+kind: VerticalPodAutoscaler
+metadata:
+  name: vpa-vtinsert-{{ .name }}
+spec:
+  targetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: vtinsert-{{ .name }}
+  updatePolicy:
+    updateMode: Initial
+  resourcePolicy:
+    containerPolicies:
+      - containerName: vtinsert
+        minAllowed:
+          cpu: 25m
+          memory: 64Mi
+        maxAllowed:
+          cpu: 2000m
+          memory: 4Gi
+---
+apiVersion: autoscaling.k8s.io/v1
+kind: VerticalPodAutoscaler
+metadata:
+  name: vpa-vtselect-{{ .name }}
+spec:
+  targetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: vtselect-{{ .name }}
+  updatePolicy:
+    updateMode: Initial
+  resourcePolicy:
+    containerPolicies:
+      - containerName: vtselect
+        minAllowed:
+          cpu: 25m
+          memory: 64Mi
+        maxAllowed:
+          cpu: 4000m
+          memory: 8Gi
+---
+apiVersion: autoscaling.k8s.io/v1
+kind: VerticalPodAutoscaler
+metadata:
+  name: vpa-vtstorage-{{ .name }}
+spec:
+  targetRef:
+    apiVersion: apps/v1
+    kind: StatefulSet
+    name: vtstorage-{{ .name }}
+  updatePolicy:
+    updateMode: Initial
+  resourcePolicy:
+    containerPolicies:
+      - containerName: vtstorage
+        minAllowed:
+          cpu: 25m
+          memory: 64Mi
+        maxAllowed:
+          cpu: 4000m
+          memory: 8Gi
+{{- end }}
+{{- end }}
+{{- if include "monitoring.tracingCentralStore" . }}
+---
+apiVersion: autoscaling.k8s.io/v1
+kind: VerticalPodAutoscaler
+metadata:
+  name: vpa-vmauth-traces-central
+spec:
+  targetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: vmauth-traces-central
+  updatePolicy:
+    updateMode: Initial
+  resourcePolicy:
+    containerPolicies:
+      - containerName: vmauth
+        minAllowed:
+          cpu: 25m
+          memory: 64Mi
+        maxAllowed:
+          cpu: 2000m
+          memory: 2Gi
+{{- end }}
diff --git a/packages/system/monitoring/templates/vtraces/central-credentials.yaml b/packages/system/monitoring/templates/vtraces/central-credentials.yaml
new file mode 100644
index 0000000000..b9625e4d74
--- /dev/null
+++ b/packages/system/monitoring/templates/vtraces/central-credentials.yaml
@@ -0,0 +1,25 @@
+{{- /*
+  The central tenant's logins at the tenant-root vmauth: one the collector
+  writes with, one the Grafana datasource reads with, each referenced by its
+  VMUser. Grafana's must not be able to write, or a write sent through its
+  datasource proxy would pass the collector's rate limit. Owned here because
+  the operator publishes a VMUser's generated Secret only while some VMAuth
+  selects that user, so the collector would otherwise wait on a Secret that
+  never appears when tenant-root has no central store. Each password is kept
+  across renders (monitoring.tracingCentralPassword).
+*/ -}}
+{{- if include "monitoring.tracingCentral" . }}
+{{- range $secret, $username := dict "traces-central-credentials" $.Release.Namespace "traces-central-reader-credentials" (printf "%s.reader" $.Release.Namespace) }}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ $secret }}
+  labels:
+    apps.cozystack.io/application.name: {{ $.Release.Name }}
+type: Opaque
+stringData:
+  username: {{ $username | quote }}
+  password: {{ include "monitoring.tracingCentralPassword" (list $ $secret) | quote }}
+{{- end }}
+{{- end }}
diff --git a/packages/system/monitoring/templates/vtraces/collector.yaml b/packages/system/monitoring/templates/vtraces/collector.yaml
new file mode 100644
index 0000000000..09399a2ab8
--- /dev/null
+++ b/packages/system/monitoring/templates/vtraces/collector.yaml
@@ -0,0 +1,278 @@
+{{- /*
+  Per-tenant OpenTelemetry Collector — the app-facing OTLP ingest gateway for
+  traces (design-proposals/distributed-tracing, phase 2). It lives in the tenant
+  namespace (like a per-tenant vmagent), so app -> collector traffic is
+  intra-namespace and never crosses the tenant boundary. It applies head
+  sampling and optional attribute redaction, then exports over OTLP/HTTP to the
+  tracingStorages backend. No OpenTelemetry operator exists in the platform, so
+  this is a plain Deployment + ConfigMap + Service (the fluent-bit pattern).
+
+  Trust boundary: the collector is the place where sampling/redaction are
+  enforced, but its OTLP receiver is unauthenticated and the Service is a plain
+  ClusterIP — actual tenant isolation is provided by the tenant NetworkPolicies
+  and, with shared-central tracing, by the vmauth in tenant-root, which pins the
+  account to the tenant's login whatever this collector sends.
+
+  Off by default: tracingStorages is empty out of the box, so the collector
+  renders only once a backend is configured (local) or central mode is selected
+  — there is no producer/backend to wire otherwise. Gating on that, rather than
+  failing on empty, keeps "no backend" a clean off-state (an app's OTLP exporter
+  simply finds no collector Service and retries harmlessly) instead of aborting
+  the whole monitoring release.
+
+  Backend topology (monitoring.tracingCentral):
+    - local (default): the exporter targets the tenant's own tracingStorages[0]
+      in this namespace. A collector fronting more than one local backend is
+      rejected below rather than silently writing to only the first.
+    - central (shared-central topology): the exporter writes to the shared
+      VictoriaTraces in tenant-root through its vmauth, logged in as this
+      tenant's VMUser (vmuser.yaml). vmauth sets the account from that login,
+      so the account does not depend on what the collector, or anything else
+      running with its pod label, sends.
+*/ -}}
+{{- define "monitoring.tracingCollectorConfig" -}}
+{{- $c := .Values.tracingCollector -}}
+{{- /* Drop empty redact keys: the schema admits "" (free-form []string, no
+       minLength), and an empty key would render `- key: ""`, which the otel
+       attributes processor rejects at startup — crashlooping the collector on the
+       PII/secret control point. Filtering here also means an all-empty list emits
+       no attributes/redact processor at all, rather than one with empty actions. */}}
+{{- $redact := list -}}
+{{- range ($c.redactAttributes | default list) -}}
+{{- if . }}{{- $redact = append $redact . -}}{{- end -}}
+{{- end -}}
+{{- $central := eq (include "monitoring.tracingCentral" .) "true" -}}
+{{- $endpoint := "" -}}
+{{- $rate := 0 -}}
+{{- $burst := 0 -}}
+{{- if $central -}}
+{{- $endpoint = "http://vmauth-traces-central.tenant-root.svc:8427/insert/opentelemetry/v1/traces" -}}
+{{- /* The platform sets the tenant's rate in _cluster, which reaches this
+       release through the cozystack-values Secret, so a change upgrades it.
+       Without one, or on a value that is not a positive number, the default
+       holds: floor(2 vtstorage replicas * 80% of a 10Gi volume / 172800 s),
+       at which one tenant writes at most a default store's disk cap,
+       uncompressed and before sampling, over the two days VictoriaTraces
+       always keeps. The rate is split across the replicas the Service
+       spreads its senders over. The limiter sees the requests the receiver
+       admits, so the receiver caps them at 3 MiB (decompressed for HTTP). It
+       counts a request as the collector re-encodes it, which pdata makes
+       larger by writing the empty value of an attribute the wire may omit:
+       1.4x for a valid request of spans with empty-valued attributes. Burst
+       holds that at 3 MiB, since a request counted above burst never passes,
+       and is at least one second of rate. Requests the spec calls invalid,
+       spans without IDs, grow further and are refused for good. The limiter
+       runs right after memory_limiter, before the sampler adds a tracestate
+       to each span it keeps and resource/tenant an attribute to each
+       resource, either of which could push an admitted request past burst.
+       A refused request gets a 429 over OTLP/HTTP, which senders retry, and
+       RESOURCE_EXHAUSTED without RetryInfo over gRPC, which is final. Each pod
+       starts with a full bucket, so burst is also what a pod start lets
+       through above the rate. */ -}}
+{{- $tenantRate := int64 99420 -}}
+{{- $configured := toString (index (.Values._cluster | default dict) "tracing-central-tenant-bytes-per-second" | default "") -}}
+{{- if regexMatch "^[1-9][0-9]{0,12}$" $configured }}{{ $tenantRate = int64 $configured }}{{ end -}}
+{{- $replicas := int64 $c.replicas -}}
+{{- if gt $replicas 10 }}{{ fail (printf "monitoring: shared-central tracing allows at most 10 collector replicas (tracingCollector.replicas is %d): each replica starts with a full rate bucket, so more of them would let a tenant write further above its rate on every rollout." $replicas) }}{{ end -}}
+{{- $rate = div (add $tenantRate (sub $replicas 1)) $replicas -}}
+{{- $burst = max 5242880 $rate -}}
+{{- else -}}
+{{- $backend := index .Values.tracingStorages 0 -}}
+{{- $mode := $backend.mode | default "cluster" -}}
+{{- $endpoint = ternary (printf "http://vtsingle-%s.%s.svc:10428/insert/opentelemetry/v1/traces" $backend.name .Release.Namespace) (printf "http://vtinsert-%s.%s.svc:10481/insert/opentelemetry/v1/traces" $backend.name .Release.Namespace) (eq $mode "single") -}}
+{{- end -}}
+receivers:
+  otlp:
+    protocols:
+      grpc:
+        endpoint: 0.0.0.0:4317
+{{- if $central }}
+        max_recv_msg_size_mib: 3
+{{- end }}
+      http:
+        endpoint: 0.0.0.0:4318
+{{- if $central }}
+        max_request_body_size: 3145728
+{{- end }}
+processors:
+  memory_limiter:
+    check_interval: 5s
+    limit_percentage: 80
+    spike_limit_percentage: 25
+  probabilistic_sampler:
+    sampling_percentage: {{ $c.samplingPercentage }}
+  batch: {}
+{{- if $central }}
+  # The account already separates tenants; the attribute keeps the source
+  # tenant on each span once it is copied out of the store, where the account
+  # does not travel. Prefixed so it does not overwrite an application's own
+  # `tenant`.
+  resource/tenant:
+    attributes:
+      - key: cozystack.tenant
+        value: {{ .Release.Namespace }}
+        action: upsert
+  # Runs right after memory_limiter: a request later processors grew past burst would be refused for good.
+  ratelimit/tenant:
+    strategy: bytes
+    rate: {{ $rate }}
+    burst: {{ $burst }}
+    throttle_behavior: error
+{{- end }}
+{{- if $redact }}
+  attributes/redact:
+    actions:
+{{- /* quote: redactAttributes is a free-form []string with no schema pattern, so a
+       key with YAML structural chars (e.g. "foo: bar") would otherwise emit invalid
+       config and crashloop the collector, and a key YAML re-types ("true"/"123"/"null")
+       would reach the processor as a non-string and silently fail to redact — the
+       worse outcome on the PII/secret control point. */}}
+{{- range $redact }}
+      - key: {{ . | quote }}
+        action: delete
+{{- end }}
+{{- end }}
+exporters:
+  # vtinsert (cluster) / VTSingle accept OTLP/HTTP natively; gRPC would require
+  # -otlpGRPCListenAddr on the backend, so export over HTTP.
+  otlphttp/victoriatraces:
+    traces_endpoint: {{ $endpoint }}
+{{- if $central }}
+    auth:
+      authenticator: basicauth/vmauth
+    # The write VMUser allows four requests in flight per vmauth replica; two
+    # senders keep writes under it.
+    sending_queue:
+      num_consumers: 2
+{{- end }}
+extensions:
+  health_check:
+    endpoint: 0.0.0.0:13133
+{{- if $central }}
+  basicauth/vmauth:
+    client_auth:
+      username: ${env:VMAUTH_USERNAME}
+      password: ${env:VMAUTH_PASSWORD}
+{{- end }}
+service:
+  extensions: [health_check{{ if $central }}, basicauth/vmauth{{ end }}]
+  pipelines:
+    traces:
+      receivers: [otlp]
+      processors: [memory_limiter, {{ if $central }}ratelimit/tenant, {{ end }}probabilistic_sampler, {{ if $redact }}attributes/redact, {{ end }}{{ if $central }}resource/tenant, {{ end }}batch]
+      exporters: [otlphttp/victoriatraces]
+{{- end -}}
+{{- if and .Values.tracingCollector.enabled (or (include "monitoring.tracingCentral" .) (not (empty .Values.tracingStorages))) }}
+{{- if gt (len .Values.tracingStorages) 1 }}
+{{- if include "monitoring.tracingCentral" . }}
+{{- fail "monitoring: tracingCollector fronts a single traces backend, but tracingStorages has more than one entry: once shared-central tracing is turned off, the collector would export to the first and leave the rest empty. Reduce tracingStorages to one entry or set tracingCollector.enabled=false." }}
+{{- end }}
+{{- fail "monitoring: tracingCollector fronts a single traces backend, but tracingStorages has more than one entry — the collector would export to the first and leave the rest empty. Reduce tracingStorages to one entry or set tracingCollector.enabled=false (apps then send OTLP straight to each backend)." }}
+{{- end }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: otel-traces
+  labels:
+    app.kubernetes.io/name: otel-traces
+    apps.cozystack.io/application.name: {{ .Release.Name }}
+data:
+  config.yaml: |
+{{ include "monitoring.tracingCollectorConfig" . | indent 4 }}
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: otel-traces
+  labels:
+    app.kubernetes.io/name: otel-traces
+    apps.cozystack.io/application.name: {{ .Release.Name }}
+spec:
+  replicas: {{ .Values.tracingCollector.replicas }}
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: otel-traces
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/name: otel-traces
+      annotations:
+        checksum/config: {{ include "monitoring.tracingCollectorConfig" . | sha256sum }}
+        {{- if eq (include "monitoring.tracingCentral" .) "true" }}
+        {{- /* The login is read from env at start, so a new one needs a new pod. */}}
+        checksum/credentials: {{ include "monitoring.tracingCentralPassword" (list . "traces-central-credentials") | sha256sum }}
+        {{- end }}
+    spec:
+      securityContext:
+        runAsNonRoot: true
+        runAsUser: 10001
+        runAsGroup: 10001
+        seccompProfile:
+          type: RuntimeDefault
+      containers:
+        - name: otel-collector
+          image: {{ include "cozy-lib.image" (list .Values.tracingCollector.image $) }}
+          args:
+            - --config=/etc/otel-traces/config.yaml
+          {{- if eq (include "monitoring.tracingCentral" .) "true" }}
+          env:
+            - name: VMAUTH_USERNAME
+              valueFrom:
+                secretKeyRef:
+                  name: traces-central-credentials
+                  key: username
+            - name: VMAUTH_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: traces-central-credentials
+                  key: password
+          {{- end }}
+          securityContext:
+            allowPrivilegeEscalation: false
+            readOnlyRootFilesystem: true
+            capabilities:
+              drop:
+                - ALL
+          ports:
+            - name: otlp-grpc
+              containerPort: 4317
+            - name: otlp-http
+              containerPort: 4318
+          livenessProbe:
+            httpGet:
+              path: /
+              port: 13133
+          readinessProbe:
+            httpGet:
+              path: /
+              port: 13133
+          resources: {{ .Values.tracingCollector.resources | toYaml | nindent 12 }}
+          volumeMounts:
+            - name: config
+              mountPath: /etc/otel-traces
+      volumes:
+        - name: config
+          configMap:
+            name: otel-traces
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: otel-traces
+  labels:
+    app.kubernetes.io/name: otel-traces
+    apps.cozystack.io/application.name: {{ .Release.Name }}
+spec:
+  selector:
+    app.kubernetes.io/name: otel-traces
+  ports:
+    - name: otlp-grpc
+      port: 4317
+      targetPort: 4317
+      protocol: TCP
+    - name: otlp-http
+      port: 4318
+      targetPort: 4318
+      protocol: TCP
+{{- end }}
diff --git a/packages/system/monitoring/templates/vtraces/grafana-datasource.yaml b/packages/system/monitoring/templates/vtraces/grafana-datasource.yaml
new file mode 100644
index 0000000000..d16bd23643
--- /dev/null
+++ b/packages/system/monitoring/templates/vtraces/grafana-datasource.yaml
@@ -0,0 +1,65 @@
+{{- /*
+  VictoriaTraces serves a Jaeger Query Service API on its select component, so
+  each entry gets a built-in Grafana `jaeger` datasource — no plugin install,
+  unlike the logs datasource. Service names follow the operator's vt-prefix
+  convention (as vlselect-* for VLCluster); ports and paths are per upstream
+  docs (https://docs.victoriametrics.com/victoriatraces/querying/grafana/):
+    cluster -> vtselect  :10471/select/jaeger
+    single  -> vtsingle  :10428/select/jaeger
+  A Tempo Query API (/select/tempo, Grafana `tempo` datasource, richer TraceQL)
+  also exists but is upstream-experimental, so the stable Jaeger API is default.
+*/ -}}
+{{- range .Values.tracingStorages }}
+---
+apiVersion: grafana.integreatly.org/v1beta1
+kind: GrafanaDatasource
+metadata:
+  name: vtraces-{{ .name }}
+spec:
+  datasource:
+    access: proxy
+    type: jaeger
+    name: vtraces-{{ .name }}
+    {{- if eq (.mode | default "cluster") "single" }}
+    url: http://vtsingle-{{ .name }}.{{ $.Release.Namespace }}.svc:10428/select/jaeger
+    {{- else }}
+    url: http://vtselect-{{ .name }}.{{ $.Release.Namespace }}.svc:10471/select/jaeger
+    {{- end }}
+  instanceSelector:
+    matchLabels:
+      dashboards: grafana
+{{- end }}
+{{- if include "monitoring.tracingCentral" . }}
+{{- /* Central mode reads the shared store only through the tenant-root vmauth,
+       as this tenant's read-only VMUser (vmuser.yaml). The operator substitutes ${key}
+       with that key of the referenced Secret. */}}
+---
+apiVersion: grafana.integreatly.org/v1beta1
+kind: GrafanaDatasource
+metadata:
+  name: traces-central
+spec:
+  valuesFrom:
+    - targetPath: basicAuthUser
+      valueFrom:
+        secretKeyRef:
+          name: traces-central-reader-credentials
+          key: username
+    - targetPath: secureJsonData.basicAuthPassword
+      valueFrom:
+        secretKeyRef:
+          name: traces-central-reader-credentials
+          key: password
+  datasource:
+    access: proxy
+    type: jaeger
+    name: traces-central
+    url: http://vmauth-traces-central.tenant-root.svc:8427/select/jaeger
+    basicAuth: true
+    basicAuthUser: ${username}
+    secureJsonData:
+      basicAuthPassword: ${password}
+  instanceSelector:
+    matchLabels:
+      dashboards: grafana
+{{- end }}
diff --git a/packages/system/monitoring/templates/vtraces/vmauth.yaml b/packages/system/monitoring/templates/vtraces/vmauth.yaml
new file mode 100644
index 0000000000..1f031b958e
--- /dev/null
+++ b/packages/system/monitoring/templates/vtraces/vmauth.yaml
@@ -0,0 +1,75 @@
+{{- /*
+  The only way other tenants have into the shared-central store. vtinsert and
+  vtselect take the account from the AccountID/ProjectID headers verbatim, so a
+  writer or reader reaching them directly could use any account; tenant egress
+  keeps other tenants off them, while tenant-root's own workloads, inside the
+  store's trust boundary, reach them directly. tenant-root therefore fronts
+  its shared `generic` store with vmauth: every central tenant's collector and
+  Grafana log in as its own VMUser, whose headers vmauth sets on the proxied
+  request, replacing whatever the client sent. It needs a cluster-mode store,
+  since a VMUser routes to the vtinsert and vtselect components.
+
+  VMUsers are picked up only from tenant namespaces and only with the reader
+  label; tenants have no RBAC on VMUser objects, so the monitoring chart is the
+  only writer of either.
+*/ -}}
+{{- /* Dropping the hosting removes the vmauth every central tenant writes
+       through, and an in-sync tenant release is not re-rendered to notice, so
+       the render refuses while a central tenant's VMUser remains. One already
+       being deleted is not waited on: its tenant is leaving. An offline
+       render lists no VMUsers, so it is never refused. */}}
+{{- if and (eq .Release.Namespace "tenant-root") (eq (toString .Values.tracingCentralHost) "true") (not (include "monitoring.tracingCentralStore" .)) }}
+{{-   fail "monitoring: tracingCentralHost is set, but tracingStorages has no entry named \"generic\" in cluster mode to host the shared store in." }}
+{{- end }}
+{{- if and (eq .Release.Namespace "tenant-root") (not (include "monitoring.tracingCentralStore" .)) }}
+{{-   $users := list }}
+{{-   range (lookup "operator.victoriametrics.com/v1beta1" "VMUser" "" "").items | default list }}
+{{-     if and (eq (dig "metadata" "labels" "tracing.cozystack.io/central-reader" "" .) "true") (not (dig "metadata" "deletionTimestamp" "" .)) }}
+{{-       $users = append $users .metadata.namespace }}
+{{-     end }}
+{{-   end }}
+{{-   with $users }}
+{{-     fail (printf "monitoring: tenant-root cannot stop hosting shared-central tracing while these tenants still use it: %s. Turn tracingCentral off on them first, then wait until each has reconciled its Monitoring and its VMUsers traces-central and traces-central-reader are gone." (join ", " (sortAlpha (uniq .)))) }}
+{{-   end }}
+{{- end }}
+{{- if include "monitoring.tracingCentralStore" . }}
+---
+apiVersion: operator.victoriametrics.com/v1beta1
+kind: VMAuth
+metadata:
+  name: traces-central
+spec:
+  managedMetadata:
+    labels:
+      apps.cozystack.io/application.group: apps.cozystack.io
+      apps.cozystack.io/application.kind: Monitoring
+      apps.cozystack.io/application.name: {{ .Release.Name }}
+  replicaCount: 2
+  # Every central tenant writes and reads through this one vmauth.
+  podDisruptionBudget:
+    maxUnavailable: 1
+  topologySpreadConstraints:
+    - maxSkew: 1
+      topologyKey: kubernetes.io/hostname
+      whenUnsatisfiable: ScheduleAnyway
+      labelSelector:
+        matchLabels:
+          app.kubernetes.io/name: vmauth
+          app.kubernetes.io/instance: traces-central
+  # config-init and config-reloader read the config Secret from the apiserver,
+  # which tenant egress allows only to pods carrying this label.
+  podMetadata:
+    labels:
+      policy.cozystack.io/allow-to-apiserver: "true"
+  # Tenant egress allows only the proxy port; /metrics names every tenant's
+  # user and /-/reload takes no credentials, so they move off it.
+  internalListenPort: "8426"
+  selectAllByDefault: false
+  userSelector:
+    matchLabels:
+      tracing.cozystack.io/central-reader: "true"
+  userNamespaceSelector:
+    matchExpressions:
+      - key: namespace.cozystack.io/monitoring
+        operator: Exists
+{{- end }}
diff --git a/packages/system/monitoring/templates/vtraces/vmuser.yaml b/packages/system/monitoring/templates/vtraces/vmuser.yaml
new file mode 100644
index 0000000000..00511d2dc4
--- /dev/null
+++ b/packages/system/monitoring/templates/vtraces/vmuser.yaml
@@ -0,0 +1,49 @@
+{{- /*
+  A central-mode tenant's logins at the tenant-root vmauth (vmauth.yaml), both
+  pinned to the tenant's one account: traces-central for the collector, which
+  may only write, and traces-central-reader for Grafana, which may only read.
+  vmauth cleans the request path before it picks a route, so a login holding
+  both routes would let a Grafana user send a write through the datasource
+  proxy as ../insert, past the collector's rate limit. A namespace name holds
+  no dot, so the reader's username never matches another tenant's. Their
+  passwords live in the chart-owned Secrets of central-credentials.yaml.
+*/ -}}
+{{- if include "monitoring.tracingCentral" . }}
+{{- /* Without the tenant-root VMAuth every export fails while every object
+       reports Ready. A live render sees the release namespace; an offline one
+       sees nothing and cannot tell a missing store from a missing cluster. */}}
+{{- if and (lookup "v1" "Namespace" "" .Release.Namespace) (not (lookup "operator.victoriametrics.com/v1beta1" "VMAuth" "tenant-root" "traces-central")) }}
+{{- fail "monitoring: shared-central tracing is on for this tenant, but tenant-root does not host a shared traces store (VMAuth tenant-root/traces-central is missing), so every span would be dropped. In the tenant-root Monitoring set tracingCentralHost: true with a tracingStorages entry named \"generic\" in cluster mode, or turn tracingCentral off for this tenant." }}
+{{- end }}
+{{- $tenantID := splitList ":" (include "monitoring.tracingTenantID" .) }}
+{{- range $login := list (dict "name" "traces-central" "username" $.Release.Namespace "kind" "VTCluster/vtinsert" "path" "/insert/opentelemetry/v1/traces") (dict "name" "traces-central-reader" "username" (printf "%s.reader" $.Release.Namespace) "kind" "VTCluster/vtselect" "path" "/select/jaeger/.*") }}
+---
+apiVersion: operator.victoriametrics.com/v1beta1
+kind: VMUser
+metadata:
+  name: {{ $login.name }}
+  labels:
+    tracing.cozystack.io/central-reader: "true"
+spec:
+  username: {{ $login.username }}
+  passwordRef:
+    name: {{ $login.name }}-credentials
+    key: password
+  disable_secret_creation: true
+  # Every central tenant shares one vmauth; this caps what each of its logins
+  # holds in flight on each vmauth replica. Above it vmauth queues a request
+  # for up to 10s (-maxQueueDuration), then answers 429: the collector's
+  # exporter retries it, Grafana shows the query as failed.
+  max_concurrent_requests: 4
+  targetRefs:
+    - crd:
+        kind: {{ $login.kind }}
+        name: generic
+        namespace: tenant-root
+      paths:
+        - {{ $login.path }}
+      headers:
+        - "AccountID: {{ index $tenantID 0 }}"
+        - "ProjectID: {{ index $tenantID 1 }}"
+{{- end }}
+{{- end }}
diff --git a/packages/system/monitoring/templates/vtraces/vtraces.yaml b/packages/system/monitoring/templates/vtraces/vtraces.yaml
new file mode 100644
index 0000000000..c7f3d386f4
--- /dev/null
+++ b/packages/system/monitoring/templates/vtraces/vtraces.yaml
@@ -0,0 +1,105 @@
+{{- /*
+  tracingStorages is empty by default, so tracing is off out of the box and no
+  VTCluster/VTSingle is provisioned. Unlike logsStorages, an absent backend
+  drops no data here: nothing produces spans unless a backend is configured. The
+  trace collector renders only once a backend exists and gates on a non-empty
+  tracingStorages rather than failing on empty (see collector.yaml), so "no
+  backend" stays a clean off-state — there is deliberately no fail-on-empty
+  guard here (contrast the logsStorages #3181 guard, which must fire because
+  fluent-bit ships logs unconditionally, so an absent log store drops data).
+
+  Shared-central topology (monitoring.tracingCentral) moves only the collector's
+  export. The entries still listed here stay rendered: the switch belongs to the
+  parent tenant and the stores to this one, and a VTSingle takes its PVC with it.
+
+  Every store is disk-bounded, not only age-bounded, so a full PVC cannot
+  block ingest: without a byte cap it drops its oldest day once its filesystem
+  is 80% full. VictoriaTraces refuses to start with both limits, so only one is
+  rendered. It always keeps the last two days, which a flood faster than that
+  can still push past the limit.
+
+  The readiness-gate healthCheckExprs on VTCluster/VTSingle stay unconditional:
+  Flux evaluates them only against CRs present in the release inventory, so with
+  nothing rendered they are inert.
+*/ -}}
+{{- include "monitoring.tracingStorages.validate" . }}
+{{- range .Values.tracingStorages }}
+{{- $mode := .mode | default "cluster" }}
+---
+{{- if eq $mode "single" }}
+apiVersion: operator.victoriametrics.com/v1
+kind: VTSingle
+metadata:
+  name: {{ .name | quote }}
+spec:
+  managedMetadata:
+    labels:
+      apps.cozystack.io/application.group: apps.cozystack.io
+      apps.cozystack.io/application.kind: Monitoring
+      apps.cozystack.io/application.name: {{ $.Release.Name }}
+  retentionPeriod: {{ .retentionPeriod | quote }}
+  {{- with .retentionDiskUsageBytes }}
+  retentionMaxDiskSpaceUsageBytes: {{ . | quote }}
+  {{- else }}
+  extraArgs:
+    retention.maxDiskUsagePercent: "80"
+  {{- end }}
+  # Stamped on the storage PVC so the monitoring post-delete cleanup hook can
+  # select it by this label (same release-scoped cleanup as logs/metrics).
+  storageMetadata:
+    labels:
+      apps.cozystack.io/application.name: {{ $.Release.Name }}
+  storage:
+    {{- with .storageClassName }}
+    storageClassName: {{ . }}
+    {{- end }}
+    accessModes:
+      - ReadWriteOnce
+    resources:
+      requests:
+        storage: {{ .storage }}
+{{- else }}
+apiVersion: operator.victoriametrics.com/v1
+kind: VTCluster
+metadata:
+  name: {{ .name | quote }}
+spec:
+  managedMetadata:
+    labels:
+      apps.cozystack.io/application.group: apps.cozystack.io
+      apps.cozystack.io/application.kind: Monitoring
+      apps.cozystack.io/application.name: {{ $.Release.Name }}
+  insert:
+    replicaCount: 2
+    resources: {}
+  select:
+    replicaCount: 2
+    resources: {}
+  storage:
+    retentionPeriod: {{ .retentionPeriod | quote }}
+    {{- with .retentionDiskUsageBytes }}
+    retentionMaxDiskSpaceUsageBytes: {{ . | quote }}
+    {{- else }}
+    extraArgs:
+      retention.maxDiskUsagePercent: "80"
+    {{- end }}
+    replicaCount: 2
+    resources: {}
+    storage:
+      volumeClaimTemplate:
+        metadata:
+          # Stamped on the claim template so vm-operator copies it onto the
+          # storage PVCs; managedMetadata is not applied to PVCs. The monitoring
+          # post-delete cleanup hook selects PVCs by this label to stay
+          # release-scoped (mirrors vlogs/vmcluster).
+          labels:
+            apps.cozystack.io/application.name: {{ $.Release.Name }}
+        spec:
+          {{- with .storageClassName }}
+          storageClassName: {{ . }}
+          {{- end }}
+          resources:
+            requests:
+              storage: {{ .storage }}
+{{- end }}
+{{- end }}
diff --git a/packages/system/monitoring/tests/alerta_ingress_wildcard_test.yaml b/packages/system/monitoring/tests/alerta_ingress_wildcard_test.yaml
new file mode 100644
index 0000000000..c15e723ee7
--- /dev/null
+++ b/packages/system/monitoring/tests/alerta_ingress_wildcard_test.yaml
@@ -0,0 +1,57 @@
+suite: alerta ingress wildcard mode drops per-host ACME
+templates:
+  - templates/alerta/alerta.yaml
+
+release:
+  name: monitoring
+  namespace: tenant-root
+
+# alerta.yaml renders several documents; documentSelector targets the
+# Ingress. In wildcard mode the cert-manager annotations block (the
+# Ingress carries only the labels otherwise) and the per-host tls
+# secretName are dropped (the tls section stays so the HTTPS redirect
+# keeps working against the default SSL certificate).
+
+tests:
+  - it: drops cert-manager annotations and tls secretName when wildcard secret is set
+    documentSelector:
+      path: kind
+      value: Ingress
+    set:
+      _cluster:
+        issuer-name: letsencrypt-prod
+        solver: http01
+        expose-ingress: tenant-root
+        gateway-enabled: "false"
+        wildcard-secret-name: wildcard-tls
+      _namespace:
+        host: example.org
+        ingress: tenant-root
+    asserts:
+      - notExists:
+          path: metadata.annotations
+      - exists:
+          path: spec.tls
+      - notExists:
+          path: spec.tls[0].secretName
+
+  - it: keeps cert-manager annotations and tls secretName without wildcard secret
+    documentSelector:
+      path: kind
+      value: Ingress
+    set:
+      _cluster:
+        issuer-name: letsencrypt-prod
+        solver: http01
+        expose-ingress: tenant-root
+        gateway-enabled: "false"
+      _namespace:
+        host: example.org
+        ingress: tenant-root
+    asserts:
+      - equal:
+          path: metadata.annotations["cert-manager.io/cluster-issuer"]
+          value: letsencrypt-prod
+      - equal:
+          path: spec.tls[0].secretName
+          value: alerta-tls
diff --git a/packages/system/monitoring/tests/alertmanager_email_test.yaml b/packages/system/monitoring/tests/alertmanager_email_test.yaml
new file mode 100644
index 0000000000..0d92cd2edc
--- /dev/null
+++ b/packages/system/monitoring/tests/alertmanager_email_test.yaml
@@ -0,0 +1,1151 @@
+suite: Alertmanager email receiver
+templates:
+  - templates/alerta/alerta.yaml
+
+release:
+  name: monitoring
+  namespace: tenant-root
+
+# Baseline `_cluster` / `_namespace` values wired by cozystack-basics
+# at install time. Individual tests override `alerta.alerts.email.*`.
+set:
+  _cluster:
+    root-host: example.org
+  _namespace:
+    host: tenant-root.example.org
+    ingress: tenant-root
+
+# Email delivery is opt-in twice: the receiver only renders when
+# alerta.alerts.email is configured, and even then only alerts labelled
+# notify_email="true" with a severity from the severities list (default
+# critical|major) are routed to it. The alertnames list is the values-side
+# producer: names on it are emailed with no label or severity requirement, so
+# platform-shipped rules can be opted in per cluster. Every route to email is
+# preceded by an alerta route with `continue: true`, so a broken SMTP path can
+# never swallow an alert from the primary channel.
+tests:
+  - it: renders no email receiver, email routes or secrets mount by default
+    asserts:
+      - documentSelector:
+          path: metadata.labels.app
+          value: alertmanager
+        notMatchRegex:
+          path: stringData["alertmanager.yaml"]
+          pattern: "name: email"
+      - documentSelector:
+          path: metadata.labels.app
+          value: alertmanager
+        notMatchRegex:
+          path: stringData["alertmanager.yaml"]
+          pattern: "receiver: email"
+      - documentSelector:
+          path: metadata.labels.app
+          value: alertmanager
+        notMatchRegex:
+          path: stringData["alertmanager.yaml"]
+          pattern: "notify_email"
+      - documentSelector:
+          path: kind
+          value: VMAlertmanager
+        notExists:
+          path: spec.secrets
+
+  - it: renders the email receiver, both routes and the fixed password Secret mount when configured
+    set:
+      alerta:
+        alerts:
+          email:
+            to: "oncall@example.org"
+            from: "alerts@example.org"
+            smarthost: "smtp.example.org:465"
+            authUsername: "mailer@example.org"
+    asserts:
+      - documentSelector:
+          path: metadata.labels.app
+          value: alertmanager
+        matchRegex:
+          path: stringData["alertmanager.yaml"]
+          pattern: '- name: email\n  email_configs:\n  - to: "oncall@example\.org"\n    from: "alerts@example\.org"\n    smarthost: "smtp\.example\.org:465"\n    auth_username: "mailer@example\.org"\n    auth_password_file: "/etc/vm/secrets/alertmanager-email-password/password"\n    send_resolved: true'
+      - documentSelector:
+          path: metadata.labels.app
+          value: alertmanager
+        matchRegex:
+          path: stringData["alertmanager.yaml"]
+          pattern: '  - receiver: alerta\n    continue: true\n    matchers:\n    - .severity=~"critical\|major".\n    - .notify_email="true".\n  - receiver: email\n    group_wait: 1m\n    group_interval: 5m\n    repeat_interval: "12h"\n    matchers:\n    - .severity=~"critical\|major".\n    - .notify_email="true".'
+      - documentSelector:
+          path: kind
+          value: VMAlertmanager
+        equal:
+          path: spec.secrets
+          value:
+            - alertmanager-email-password
+
+  - it: mounts only the fixed password Secret when the values name another one
+    set:
+      alerta:
+        alerts:
+          email:
+            to: "oncall@example.org"
+            from: "alerts@example.org"
+            smarthost: "smtp.example.org:465"
+            authUsername: "mailer@example.org"
+            secretName: grafana-db-app
+    asserts:
+      - documentSelector:
+          path: metadata.labels.app
+          value: alertmanager
+        matchRegex:
+          path: stringData["alertmanager.yaml"]
+          pattern: 'auth_password_file: "/etc/vm/secrets/alertmanager-email-password/password"'
+      - documentSelector:
+          path: kind
+          value: VMAlertmanager
+        equal:
+          path: spec.secrets
+          value:
+            - alertmanager-email-password
+
+  - it: lets the email routes inherit the root group_by
+    set:
+      alerta:
+        alerts:
+          email:
+            to: "oncall@example.org"
+            from: "alerts@example.org"
+            smarthost: "smtp.example.org:465"
+            alertnames: ["KubeAPIDown"]
+    asserts:
+      - documentSelector:
+          path: metadata.labels.app
+          value: alertmanager
+        matchRegex:
+          path: stringData["alertmanager.yaml"]
+          pattern: '^global:\n  resolve_timeout: 5m\nroute:\n  group_by: \[alertname, namespace, cluster\]\n'
+      - documentSelector:
+          path: metadata.labels.app
+          value: alertmanager
+        notMatchRegex:
+          path: stringData["alertmanager.yaml"]
+          pattern: 'group_by: \[alertname, cluster\]'
+
+  - it: works without SMTP auth when authUsername is omitted
+    set:
+      alerta:
+        alerts:
+          email:
+            to: "oncall@example.org"
+            from: "alerts@example.org"
+            smarthost: "smtp.example.org:25"
+    asserts:
+      - documentSelector:
+          path: metadata.labels.app
+          value: alertmanager
+        matchRegex:
+          path: stringData["alertmanager.yaml"]
+          pattern: '- name: email\n  email_configs:\n  - to: "oncall@example\.org"\n    from: "alerts@example\.org"\n    smarthost: "smtp\.example\.org:25"\n    send_resolved: true'
+      - documentSelector:
+          path: metadata.labels.app
+          value: alertmanager
+        notMatchRegex:
+          path: stringData["alertmanager.yaml"]
+          pattern: "auth_username"
+      - documentSelector:
+          path: metadata.labels.app
+          value: alertmanager
+        notMatchRegex:
+          path: stringData["alertmanager.yaml"]
+          pattern: "auth_password_file"
+      - documentSelector:
+          path: kind
+          value: VMAlertmanager
+        notExists:
+          path: spec.secrets
+
+  - it: never renders a Subject header or html body
+    set:
+      alerta:
+        alerts:
+          email:
+            to: "oncall@example.org"
+            from: "alerts@example.org"
+            smarthost: "smtp.example.org:465"
+            authUsername: "mailer@example.org"
+    asserts:
+      - documentSelector:
+          path: metadata.labels.app
+          value: alertmanager
+        notMatchRegex:
+          path: stringData["alertmanager.yaml"]
+          pattern: "Subject:"
+      - documentSelector:
+          path: metadata.labels.app
+          value: alertmanager
+        notMatchRegex:
+          path: stringData["alertmanager.yaml"]
+          pattern: "html:"
+
+  - it: accepts a bracketed IPv6 smarthost
+    set:
+      alerta:
+        alerts:
+          email:
+            to: "oncall@example.org"
+            from: "alerts@example.org"
+            smarthost: "[2001:db8::25]:587"
+    asserts:
+      - documentSelector:
+          path: metadata.labels.app
+          value: alertmanager
+        matchRegex:
+          path: stringData["alertmanager.yaml"]
+          pattern: '    smarthost: "\[2001:db8::25\]:587"\n'
+
+  - it: fails the render when smarthost has no port
+    set:
+      alerta:
+        alerts:
+          email:
+            to: "oncall@example.org"
+            from: "alerts@example.org"
+            smarthost: "smtp.example.org"
+    asserts:
+      - failedTemplate:
+          errorMessage: 'alerta.alerts.email.smarthost must be host:port, such as smtp.example.com:587, got "smtp.example.org"'
+
+  - it: fails the render when the smarthost port is zero
+    set:
+      alerta:
+        alerts:
+          email:
+            to: "oncall@example.org"
+            from: "alerts@example.org"
+            smarthost: "smtp.example.org:0"
+    asserts:
+      - failedTemplate:
+          errorMessage: 'alerta.alerts.email.smarthost port must be between 1 and 65535, got "smtp.example.org:0"'
+
+  - it: fails the render when the smarthost port is above 65535
+    set:
+      alerta:
+        alerts:
+          email:
+            to: "oncall@example.org"
+            from: "alerts@example.org"
+            smarthost: "smtp.example.org:70000"
+    asserts:
+      - failedTemplate:
+          errorMessage: 'alerta.alerts.email.smarthost port must be between 1 and 65535, got "smtp.example.org:70000"'
+
+  - it: fails the render when smarthost carries a scheme or path
+    set:
+      alerta:
+        alerts:
+          email:
+            to: "oncall@example.org"
+            from: "alerts@example.org"
+            smarthost: "smtp://smtp.example.org:465/"
+    asserts:
+      - failedTemplate:
+          errorMessage: 'alerta.alerts.email.smarthost must be host:port, such as smtp.example.com:587, got "smtp://smtp.example.org:465/"'
+
+  - it: fails the render when the email block is only partially configured
+    set:
+      alerta:
+        alerts:
+          email:
+            to: "oncall@example.org"
+    asserts:
+      - failedTemplate:
+          errorMessage: "alerta.alerts.email to, from and smarthost must all be set to enable email alerts. To turn email off, clear every field under alerta.alerts.email. Fields still set are to"
+
+  - it: names the residual fields when the addresses are cleared to turn email off
+    set:
+      alerta:
+        alerts:
+          email:
+            to: ""
+            from: ""
+            smarthost: ""
+            repeatInterval: "6h"
+            severities: ["critical"]
+    asserts:
+      - failedTemplate:
+          errorMessage: "alerta.alerts.email to, from and smarthost must all be set to enable email alerts. To turn email off, clear every field under alerta.alerts.email. Fields still set are repeatInterval, severities"
+
+  - it: fails the render when only authUsername is set
+    set:
+      alerta:
+        alerts:
+          email:
+            authUsername: "mailer@example.org"
+    asserts:
+      - failedTemplate:
+          errorMessage: "alerta.alerts.email to, from and smarthost must all be set to enable email alerts. To turn email off, clear every field under alerta.alerts.email. Fields still set are authUsername"
+
+  - it: fails the render when only repeatInterval is set
+    set:
+      alerta:
+        alerts:
+          email:
+            repeatInterval: "6h"
+    asserts:
+      - failedTemplate:
+          errorMessage: "alerta.alerts.email to, from and smarthost must all be set to enable email alerts. To turn email off, clear every field under alerta.alerts.email. Fields still set are repeatInterval"
+
+  - it: fails the render when only alertnames is set
+    set:
+      alerta:
+        alerts:
+          email:
+            alertnames: ["KubeAPIDown"]
+    asserts:
+      - failedTemplate:
+          errorMessage: "alerta.alerts.email to, from and smarthost must all be set to enable email alerts. To turn email off, clear every field under alerta.alerts.email. Fields still set are alertnames"
+
+  - it: fails the render when only severities is set
+    set:
+      alerta:
+        alerts:
+          email:
+            severities: ["critical"]
+    asserts:
+      - failedTemplate:
+          errorMessage: "alerta.alerts.email to, from and smarthost must all be set to enable email alerts. To turn email off, clear every field under alerta.alerts.email. Fields still set are severities"
+
+  - it: fails the render when repeatInterval is not a duration
+    set:
+      alerta:
+        alerts:
+          email:
+            to: "oncall@example.org"
+            from: "alerts@example.org"
+            smarthost: "smtp.example.org:465"
+            repeatInterval: "tomorrow"
+    asserts:
+      - failedTemplate:
+          errorMessage: 'alerta.alerts.email.repeatInterval must be an Alertmanager duration with units in descending order, each at most once, such as 5m, 12h or 1h30m, got "tomorrow"'
+
+  - it: fails the render when repeatInterval lists its units out of order
+    set:
+      alerta:
+        alerts:
+          email:
+            to: "oncall@example.org"
+            from: "alerts@example.org"
+            smarthost: "smtp.example.org:465"
+            repeatInterval: "30s5m"
+    asserts:
+      - failedTemplate:
+          errorMessage: 'alerta.alerts.email.repeatInterval must be an Alertmanager duration with units in descending order, each at most once, such as 5m, 12h or 1h30m, got "30s5m"'
+
+  - it: fails the render when repeatInterval repeats a unit
+    set:
+      alerta:
+        alerts:
+          email:
+            to: "oncall@example.org"
+            from: "alerts@example.org"
+            smarthost: "smtp.example.org:465"
+            repeatInterval: "5m5m"
+    asserts:
+      - failedTemplate:
+          errorMessage: 'alerta.alerts.email.repeatInterval must be an Alertmanager duration with units in descending order, each at most once, such as 5m, 12h or 1h30m, got "5m5m"'
+
+  - it: fails the render when repeatInterval is zero
+    set:
+      alerta:
+        alerts:
+          email:
+            to: "oncall@example.org"
+            from: "alerts@example.org"
+            smarthost: "smtp.example.org:465"
+            repeatInterval: "0s"
+    asserts:
+      - failedTemplate:
+          errorMessage: 'alerta.alerts.email.repeatInterval cannot be zero, got "0s"'
+
+  - it: fails the render when repeatInterval overflows what Alertmanager accepts
+    set:
+      alerta:
+        alerts:
+          email:
+            to: "oncall@example.org"
+            from: "alerts@example.org"
+            smarthost: "smtp.example.org:465"
+            repeatInterval: "999y"
+    asserts:
+      - failedTemplate:
+          errorMessage: 'alerta.alerts.email.repeatInterval is out of range for Alertmanager, got "999y"'
+
+  - it: fails the render one year past the Alertmanager duration limit
+    set:
+      alerta:
+        alerts:
+          email:
+            to: "oncall@example.org"
+            from: "alerts@example.org"
+            smarthost: "smtp.example.org:465"
+            repeatInterval: "293y"
+    asserts:
+      - failedTemplate:
+          errorMessage: 'alerta.alerts.email.repeatInterval is out of range for Alertmanager, got "293y"'
+
+  - it: accepts whole years near the Alertmanager duration limit
+    set:
+      alerta:
+        alerts:
+          email:
+            to: "oncall@example.org"
+            from: "alerts@example.org"
+            smarthost: "smtp.example.org:465"
+            repeatInterval: "292y"
+    asserts:
+      - documentSelector:
+          path: metadata.labels.app
+          value: alertmanager
+        matchRegex:
+          path: stringData["alertmanager.yaml"]
+          pattern: '    repeat_interval: "292y"\n'
+
+  - it: quotes a custom repeatInterval so a stray value cannot break out of the config
+    set:
+      alerta:
+        alerts:
+          email:
+            to: "oncall@example.org"
+            from: "alerts@example.org"
+            smarthost: "smtp.example.org:465"
+            repeatInterval: "1h30m"
+    asserts:
+      - documentSelector:
+          path: metadata.labels.app
+          value: alertmanager
+        matchRegex:
+          path: stringData["alertmanager.yaml"]
+          pattern: '    repeat_interval: "1h30m"\n'
+
+  - it: accepts a repeatInterval with every unit in order
+    set:
+      alerta:
+        alerts:
+          email:
+            to: "oncall@example.org"
+            from: "alerts@example.org"
+            smarthost: "smtp.example.org:465"
+            repeatInterval: "1y2w3d4h5m6s7ms"
+    asserts:
+      - documentSelector:
+          path: metadata.labels.app
+          value: alertmanager
+        matchRegex:
+          path: stringData["alertmanager.yaml"]
+          pattern: '    repeat_interval: "1y2w3d4h5m6s7ms"\n'
+
+  - it: renders the alertname routes after the notify_email routes when alertnames is set
+    set:
+      alerta:
+        alerts:
+          email:
+            to: "oncall@example.org"
+            from: "alerts@example.org"
+            smarthost: "smtp.example.org:465"
+            alertnames: ["KubeAPIDown", "etcdMembersDown"]
+    asserts:
+      - documentSelector:
+          path: metadata.labels.app
+          value: alertmanager
+        matchRegex:
+          path: stringData["alertmanager.yaml"]
+          pattern: '  - receiver: alerta\n    continue: true\n    matchers:\n    - .severity=~"critical\|major".\n    - .notify_email="true".\n  - receiver: email\n    group_wait: 1m\n    group_interval: 5m\n    repeat_interval: "12h"\n    matchers:\n    - .severity=~"critical\|major".\n    - .notify_email="true".\n  - receiver: alerta\n    continue: true\n    matchers:\n    - .alertname=~"\^\(KubeAPIDown\|etcdMembersDown\)\$".\n  - receiver: email\n    group_wait: 1m\n    group_interval: 5m\n    repeat_interval: "12h"\n    matchers:\n    - .alertname=~"\^\(KubeAPIDown\|etcdMembersDown\)\$".'
+
+  - it: renders no alertname route when alertnames is empty
+    set:
+      alerta:
+        alerts:
+          email:
+            to: "oncall@example.org"
+            from: "alerts@example.org"
+            smarthost: "smtp.example.org:465"
+    asserts:
+      - documentSelector:
+          path: metadata.labels.app
+          value: alertmanager
+        notMatchRegex:
+          path: stringData["alertmanager.yaml"]
+          pattern: 'alertname=~"\^'
+
+  - it: renders a custom severities matcher on both notify_email routes
+    set:
+      alerta:
+        alerts:
+          email:
+            to: "oncall@example.org"
+            from: "alerts@example.org"
+            smarthost: "smtp.example.org:465"
+            severities: ["critical", "major", "warning"]
+    asserts:
+      - documentSelector:
+          path: metadata.labels.app
+          value: alertmanager
+        matchRegex:
+          path: stringData["alertmanager.yaml"]
+          pattern: '  - receiver: alerta\n    continue: true\n    matchers:\n    - .severity=~"critical\|major\|warning".\n    - .notify_email="true".\n  - receiver: email\n    group_wait: 1m\n    group_interval: 5m\n    repeat_interval: "12h"\n    matchers:\n    - .severity=~"critical\|major\|warning".\n    - .notify_email="true".'
+
+  - it: fails the render when an alertnames entry is not a plain alert name
+    set:
+      alerta:
+        alerts:
+          email:
+            to: "oncall@example.org"
+            from: "alerts@example.org"
+            smarthost: "smtp.example.org:465"
+            alertnames: ["bad name"]
+    asserts:
+      - failedTemplate:
+          errorMessage: 'alerta.alerts.email.alertnames entries must be Prometheus alert names, got "bad name"'
+
+  - it: fails the render when a severities entry is not a plain severity name
+    set:
+      alerta:
+        alerts:
+          email:
+            to: "oncall@example.org"
+            from: "alerts@example.org"
+            smarthost: "smtp.example.org:465"
+            severities: ['critical"']
+    asserts:
+      - failedTemplate:
+          errorMessage: 'alerta.alerts.email.severities entries must be plain severity names, got "critical\""'
+
+  - it: accepts a comma-separated recipient list
+    set:
+      alerta:
+        alerts:
+          email:
+            to: "oncall@example.org, backup@example.org"
+            from: "alerts@example.org"
+            smarthost: "smtp.example.org:587"
+    asserts:
+      - documentSelector:
+          path: metadata.labels.app
+          value: alertmanager
+        matchRegex:
+          path: stringData["alertmanager.yaml"]
+          pattern: '  - to: "oncall@example\.org, backup@example\.org"'
+
+  - it: accepts a display name on both addresses
+    set:
+      alerta:
+        alerts:
+          email:
+            to: "Oncall <oncall@example.org>"
+            from: "Alerts <alerts@example.org>"
+            smarthost: "smtp.example.org:587"
+    asserts:
+      - documentSelector:
+          path: metadata.labels.app
+          value: alertmanager
+        matchRegex:
+          path: stringData["alertmanager.yaml"]
+          pattern: '  - to: "Oncall <oncall@example\.org>"\n    from: "Alerts <alerts@example\.org>"'
+
+  - it: accepts a domain literal, the way smarthost accepts a bracketed address
+    set:
+      alerta:
+        alerts:
+          email:
+            to: "oncall@[192.0.2.25]"
+            from: "alerts@example.org"
+            smarthost: "smtp.example.org:587"
+    asserts:
+      - documentSelector:
+          path: metadata.labels.app
+          value: alertmanager
+        matchRegex:
+          path: stringData["alertmanager.yaml"]
+          pattern: '  - to: "oncall@\[192\.0\.2\.25\]"'
+
+  - it: fails the render when a recipient address has no at sign
+    set:
+      alerta:
+        alerts:
+          email:
+            to: "oncall.example.org"
+            from: "alerts@example.org"
+            smarthost: "smtp.example.org:587"
+    asserts:
+      - failedTemplate:
+          errorMessage: 'alerta.alerts.email.to must be an address or a comma-separated list of addresses, such as oncall@example.org, got "oncall.example.org"'
+
+  - it: fails the render when a recipient address carries a space
+    set:
+      alerta:
+        alerts:
+          email:
+            to: "oncall example.org"
+            from: "alerts@example.org"
+            smarthost: "smtp.example.org:587"
+    asserts:
+      - failedTemplate:
+          errorMessage: 'alerta.alerts.email.to must be an address or a comma-separated list of addresses, such as oncall@example.org, got "oncall example.org"'
+
+  - it: fails the render when a recipient local part has a doubled dot
+    set:
+      alerta:
+        alerts:
+          email:
+            to: "john..doe@example.org"
+            from: "alerts@example.org"
+            smarthost: "smtp.example.org:587"
+    asserts:
+      - failedTemplate:
+          errorMessage: 'alerta.alerts.email.to must be an address or a comma-separated list of addresses, such as oncall@example.org, got "john..doe@example.org"'
+
+  - it: fails the render when a recipient local part has a leading dot
+    set:
+      alerta:
+        alerts:
+          email:
+            to: ".john@example.org"
+            from: "alerts@example.org"
+            smarthost: "smtp.example.org:587"
+    asserts:
+      - failedTemplate:
+          errorMessage: 'alerta.alerts.email.to must be an address or a comma-separated list of addresses, such as oncall@example.org, got ".john@example.org"'
+
+  - it: fails the render when a recipient local part has a dot before the at sign
+    set:
+      alerta:
+        alerts:
+          email:
+            to: "john.doe.@example.org"
+            from: "alerts@example.org"
+            smarthost: "smtp.example.org:587"
+    asserts:
+      - failedTemplate:
+          errorMessage: 'alerta.alerts.email.to must be an address or a comma-separated list of addresses, such as oncall@example.org, got "john.doe.@example.org"'
+
+  - it: fails the render when a recipient address carries a pasted mailto prefix
+    set:
+      alerta:
+        alerts:
+          email:
+            to: "mailto:oncall@example.org"
+            from: "alerts@example.org"
+            smarthost: "smtp.example.org:587"
+    asserts:
+      - failedTemplate:
+          errorMessage: 'alerta.alerts.email.to must be an address or a comma-separated list of addresses, such as oncall@example.org, got "mailto:oncall@example.org"'
+
+  - it: fails the render when one recipient in the list is malformed
+    set:
+      alerta:
+        alerts:
+          email:
+            to: "oncall@example.org, backup example.org"
+            from: "alerts@example.org"
+            smarthost: "smtp.example.org:587"
+    asserts:
+      - failedTemplate:
+          errorMessage: 'alerta.alerts.email.to must be an address or a comma-separated list of addresses, such as oncall@example.org, got "backup example.org"'
+
+  - it: fails the render when the recipient list has an empty entry
+    set:
+      alerta:
+        alerts:
+          email:
+            to: "oncall@example.org,"
+            from: "alerts@example.org"
+            smarthost: "smtp.example.org:587"
+    asserts:
+      - failedTemplate:
+          errorMessage: 'alerta.alerts.email.to has an empty entry, got "oncall@example.org,"'
+
+  - it: fails the render when from carries a list instead of one address
+    set:
+      alerta:
+        alerts:
+          email:
+            to: "oncall@example.org"
+            from: "alerts@example.org, second@example.org"
+            smarthost: "smtp.example.org:587"
+    asserts:
+      - failedTemplate:
+          errorMessage: 'alerta.alerts.email.from must be one address, such as alerts@example.org or Alerts <alerts@example.org>, got "alerts@example.org, second@example.org"'
+
+  - it: fails the render when the sender address carries a space
+    set:
+      alerta:
+        alerts:
+          email:
+            to: "oncall@example.org"
+            from: "alerts example.org"
+            smarthost: "smtp.example.org:587"
+    asserts:
+      - failedTemplate:
+          errorMessage: 'alerta.alerts.email.from must be one address, such as alerts@example.org or Alerts <alerts@example.org>, got "alerts example.org"'
+
+  - it: fails the render when to is the only address missing
+    set:
+      alerta:
+        alerts:
+          email:
+            from: "alerts@example.org"
+            smarthost: "smtp.example.org:587"
+    asserts:
+      - failedTemplate:
+          errorMessage: "alerta.alerts.email to, from and smarthost must all be set to enable email alerts. To turn email off, clear every field under alerta.alerts.email. Fields still set are from, smarthost"
+
+  - it: fails the render when from is the only address missing
+    set:
+      alerta:
+        alerts:
+          email:
+            to: "oncall@example.org"
+            smarthost: "smtp.example.org:587"
+    asserts:
+      - failedTemplate:
+          errorMessage: "alerta.alerts.email to, from and smarthost must all be set to enable email alerts. To turn email off, clear every field under alerta.alerts.email. Fields still set are to, smarthost"
+
+  - it: fails the render when smarthost is the only field missing
+    set:
+      alerta:
+        alerts:
+          email:
+            to: "oncall@example.org"
+            from: "alerts@example.org"
+    asserts:
+      - failedTemplate:
+          errorMessage: "alerta.alerts.email to, from and smarthost must all be set to enable email alerts. To turn email off, clear every field under alerta.alerts.email. Fields still set are to, from"
+
+  - it: rejects an unquoted colon in the recipient name
+    set:
+      alerta.alerts.email.to: "Bad:Name <oncall@example.org>"
+      alerta.alerts.email.from: "alerts@example.org"
+      alerta.alerts.email.smarthost: smtp.example.org:587
+    asserts:
+      - failedTemplate:
+          errorMessage: "alerta.alerts.email.to must be an address or a comma-separated list of addresses, such as oncall@example.org, got \"Bad:Name <oncall@example.org>\""
+
+  - it: rejects an unquoted at sign in the recipient name
+    set:
+      alerta.alerts.email.to: "Bad@Name <oncall@example.org>"
+      alerta.alerts.email.from: "alerts@example.org"
+      alerta.alerts.email.smarthost: smtp.example.org:587
+    asserts:
+      - failedTemplate:
+          errorMessage: "alerta.alerts.email.to must be an address or a comma-separated list of addresses, such as oncall@example.org, got \"Bad@Name <oncall@example.org>\""
+
+  - it: rejects an unmatched opening comment
+    set:
+      alerta.alerts.email.to: "Bad(Name <oncall@example.org>"
+      alerta.alerts.email.from: "alerts@example.org"
+      alerta.alerts.email.smarthost: smtp.example.org:587
+    asserts:
+      - failedTemplate:
+          errorMessage: "alerta.alerts.email.to must be an address or a comma-separated list of addresses, such as oncall@example.org, got \"Bad(Name <oncall@example.org>\""
+
+  - it: rejects an unmatched closing comment
+    set:
+      alerta.alerts.email.to: "Bad)Name <oncall@example.org>"
+      alerta.alerts.email.from: "alerts@example.org"
+      alerta.alerts.email.smarthost: smtp.example.org:587
+    asserts:
+      - failedTemplate:
+          errorMessage: "alerta.alerts.email.to must be an address or a comma-separated list of addresses, such as oncall@example.org, got \"Bad)Name <oncall@example.org>\""
+
+  - it: rejects an unquoted backslash in the recipient name
+    set:
+      alerta.alerts.email.to: "Bad\\Name <oncall@example.org>"
+      alerta.alerts.email.from: "alerts@example.org"
+      alerta.alerts.email.smarthost: smtp.example.org:587
+    asserts:
+      - failedTemplate:
+          errorMessage: "alerta.alerts.email.to must be an address or a comma-separated list of addresses, such as oncall@example.org, got \"Bad\\\\Name <oncall@example.org>\""
+
+  - it: rejects an unclosed quoted name
+    set:
+      alerta.alerts.email.to: "\"Bad name <oncall@example.org>"
+      alerta.alerts.email.from: "alerts@example.org"
+      alerta.alerts.email.smarthost: smtp.example.org:587
+    asserts:
+      - failedTemplate:
+          errorMessage: "alerta.alerts.email.to must be an address or a comma-separated list of addresses, such as oncall@example.org, got \"\\\"Bad name <oncall@example.org>\""
+
+  - it: rejects an IPv4 octet above 255
+    set:
+      alerta.alerts.email.to: "bad@[999.999.999.999]"
+      alerta.alerts.email.from: "alerts@example.org"
+      alerta.alerts.email.smarthost: smtp.example.org:587
+    asserts:
+      - failedTemplate:
+          errorMessage: "alerta.alerts.email.to must be an address or a comma-separated list of addresses, such as oncall@example.org, got \"bad@[999.999.999.999]\""
+
+  - it: rejects a leading zero in an IPv4 octet
+    set:
+      alerta.alerts.email.to: "bad@[01.2.3.4]"
+      alerta.alerts.email.from: "alerts@example.org"
+      alerta.alerts.email.smarthost: smtp.example.org:587
+    asserts:
+      - failedTemplate:
+          errorMessage: "alerta.alerts.email.to must be an address or a comma-separated list of addresses, such as oncall@example.org, got \"bad@[01.2.3.4]\""
+
+  - it: rejects a non-IP domain literal
+    set:
+      alerta.alerts.email.to: "bad@[abc]"
+      alerta.alerts.email.from: "alerts@example.org"
+      alerta.alerts.email.smarthost: smtp.example.org:587
+    asserts:
+      - failedTemplate:
+          errorMessage: "alerta.alerts.email.to must be an address or a comma-separated list of addresses, such as oncall@example.org, got \"bad@[abc]\""
+
+  - it: rejects multiple IPv6 compression markers
+    set:
+      alerta.alerts.email.to: "bad@[1::2::3]"
+      alerta.alerts.email.from: "alerts@example.org"
+      alerta.alerts.email.smarthost: smtp.example.org:587
+    asserts:
+      - failedTemplate:
+          errorMessage: "alerta.alerts.email.to must be an address or a comma-separated list of addresses, such as oncall@example.org, got \"bad@[1::2::3]\""
+
+  - it: rejects an incomplete uncompressed IPv6 address
+    set:
+      alerta.alerts.email.to: "bad@[1:2:3:4:5:6:7]"
+      alerta.alerts.email.from: "alerts@example.org"
+      alerta.alerts.email.smarthost: smtp.example.org:587
+    asserts:
+      - failedTemplate:
+          errorMessage: "alerta.alerts.email.to must be an address or a comma-separated list of addresses, such as oncall@example.org, got \"bad@[1:2:3:4:5:6:7]\""
+
+  - it: rejects an IPv6 address with no room for compression
+    set:
+      alerta.alerts.email.to: "bad@[1:2:3:4:5:6:7:8::]"
+      alerta.alerts.email.from: "alerts@example.org"
+      alerta.alerts.email.smarthost: smtp.example.org:587
+    asserts:
+      - failedTemplate:
+          errorMessage: "alerta.alerts.email.to must be an address or a comma-separated list of addresses, such as oncall@example.org, got \"bad@[1:2:3:4:5:6:7:8::]\""
+
+  - it: rejects a malformed named recipient later in the list
+    set:
+      alerta.alerts.email.to: "oncall@example.org, Bad:Name <backup@example.org>"
+      alerta.alerts.email.from: "alerts@example.org"
+      alerta.alerts.email.smarthost: smtp.example.org:587
+    asserts:
+      - failedTemplate:
+          errorMessage: "alerta.alerts.email.to must be an address or a comma-separated list of addresses, such as oncall@example.org, got \"Bad:Name <backup@example.org>\""
+
+  - it: rejects an unquoted colon in the sender name
+    set:
+      alerta.alerts.email.to: "oncall@example.org"
+      alerta.alerts.email.from: "Bad:Name <alerts@example.org>"
+      alerta.alerts.email.smarthost: smtp.example.org:587
+    asserts:
+      - failedTemplate:
+          errorMessage: "alerta.alerts.email.from must be one address, such as alerts@example.org or Alerts <alerts@example.org>, got \"Bad:Name <alerts@example.org>\""
+
+  - it: rejects an invalid sender IP literal
+    set:
+      alerta.alerts.email.to: "oncall@example.org"
+      alerta.alerts.email.from: "alerts@[999.0.0.1]"
+      alerta.alerts.email.smarthost: smtp.example.org:587
+    asserts:
+      - failedTemplate:
+          errorMessage: "alerta.alerts.email.from must be one address, such as alerts@example.org or Alerts <alerts@example.org>, got \"alerts@[999.0.0.1]\""
+
+  - it: rejects a bracketed tag in the sender name
+    set:
+      alerta.alerts.email.to: "oncall@example.org"
+      alerta.alerts.email.from: "[Alerts] <alerts@example.org>"
+      alerta.alerts.email.smarthost: smtp.example.org:587
+    asserts:
+      - failedTemplate:
+          errorMessage: "alerta.alerts.email.from must be one address, such as alerts@example.org or Alerts <alerts@example.org>, got \"[Alerts] <alerts@example.org>\""
+
+  - it: rejects an IPv4 literal with three parts
+    set:
+      alerta.alerts.email.to: "oncall@[192.0.2]"
+      alerta.alerts.email.from: "alerts@example.org"
+      alerta.alerts.email.smarthost: smtp.example.org:587
+    asserts:
+      - failedTemplate:
+          errorMessage: "alerta.alerts.email.to must be an address or a comma-separated list of addresses, such as oncall@example.org, got \"oncall@[192.0.2]\""
+
+  - it: rejects an IPv6 literal made only of colons
+    set:
+      alerta.alerts.email.to: "oncall@[::::]"
+      alerta.alerts.email.from: "alerts@example.org"
+      alerta.alerts.email.smarthost: smtp.example.org:587
+    asserts:
+      - failedTemplate:
+          errorMessage: "alerta.alerts.email.to must be an address or a comma-separated list of addresses, such as oncall@example.org, got \"oncall@[::::]\""
+
+  - it: rejects a newline around the sender address
+    set:
+      alerta.alerts.email.to: "oncall@example.org"
+      alerta.alerts.email.from: "alerts@example.org\n"
+      alerta.alerts.email.smarthost: smtp.example.org:587
+    asserts:
+      - failedTemplate:
+          errorMessage: "alerta.alerts.email.from must be one address, such as alerts@example.org or Alerts <alerts@example.org>, got \"alerts@example.org\\n\""
+
+  - it: rejects a newline around a recipient address
+    set:
+      alerta.alerts.email.to: "oncall@example.org\r\n"
+      alerta.alerts.email.from: "alerts@example.org"
+      alerta.alerts.email.smarthost: smtp.example.org:587
+    asserts:
+      - failedTemplate:
+          errorMessage: "alerta.alerts.email.to must be an address or a comma-separated list of addresses, such as oncall@example.org, got \"oncall@example.org\\r\\n\""
+
+  - it: rejects non-ASCII whitespace around a bare address
+    set:
+      alerta.alerts.email.to: " oncall@example.org"
+      alerta.alerts.email.from: "alerts@example.org"
+      alerta.alerts.email.smarthost: smtp.example.org:587
+    asserts:
+      - failedTemplate:
+          errorMessage: "alerta.alerts.email.to must be an address or a comma-separated list of addresses, such as oncall@example.org, got \"\\u00a0oncall@example.org\""
+
+  - it: accepts a quoted recipient name with punctuation
+    set:
+      alerta.alerts.email.to: "\"Bad:Name@Oncall (primary)\" <oncall@example.org>"
+      alerta.alerts.email.from: '"Alerts: Primary" <alerts@example.org>'
+      alerta.alerts.email.smarthost: smtp.example.org:587
+    asserts:
+      - documentSelector:
+          path: metadata.labels.app
+          value: alertmanager
+        matchRegex:
+          path: stringData["alertmanager.yaml"]
+          pattern: "(?m)^  - to: \"\\\\\"Bad:Name@Oncall \\(primary\\)\\\\\" <oncall@example\\.org>\"$"
+
+  - it: accepts an escaped quote in a quoted name
+    set:
+      alerta.alerts.email.to: "\"Oncall \\\"primary\\\"\" <oncall@example.org>"
+      alerta.alerts.email.from: '"Alerts: Primary" <alerts@example.org>'
+      alerta.alerts.email.smarthost: smtp.example.org:587
+    asserts:
+      - documentSelector:
+          path: metadata.labels.app
+          value: alertmanager
+        matchRegex:
+          path: stringData["alertmanager.yaml"]
+          pattern: "(?m)^  - to: \"\\\\\"Oncall \\\\\\\\\\\\\"primary\\\\\\\\\\\\\"\\\\\" <oncall@example\\.org>\"$"
+
+  - it: accepts a UTF-8 display name
+    set:
+      alerta.alerts.email.to: "Дежурный инженер <oncall@example.org>"
+      alerta.alerts.email.from: '"Alerts: Primary" <alerts@example.org>'
+      alerta.alerts.email.smarthost: smtp.example.org:587
+    asserts:
+      - documentSelector:
+          path: metadata.labels.app
+          value: alertmanager
+        matchRegex:
+          path: stringData["alertmanager.yaml"]
+          pattern: "(?m)^  - to: \"Дежурный инженер <oncall@example\\.org>\"$"
+
+  - it: accepts several named recipients
+    set:
+      alerta.alerts.email.to: "Oncall <oncall@example.org>, Backup Team <backup@example.org>"
+      alerta.alerts.email.from: '"Alerts: Primary" <alerts@example.org>'
+      alerta.alerts.email.smarthost: smtp.example.org:587
+    asserts:
+      - documentSelector:
+          path: metadata.labels.app
+          value: alertmanager
+        matchRegex:
+          path: stringData["alertmanager.yaml"]
+          pattern: "(?m)^  - to: \"Oncall <oncall@example\\.org>, Backup Team <backup@example\\.org>\"$"
+
+  - it: accepts IPv4 octet boundaries
+    set:
+      alerta.alerts.email.to: "oncall@[0.9.10.255]"
+      alerta.alerts.email.from: '"Alerts: Primary" <alerts@example.org>'
+      alerta.alerts.email.smarthost: smtp.example.org:587
+    asserts:
+      - documentSelector:
+          path: metadata.labels.app
+          value: alertmanager
+        matchRegex:
+          path: stringData["alertmanager.yaml"]
+          pattern: "(?m)^  - to: \"oncall@\\[0\\.9\\.10\\.255\\]\"$"
+
+  - it: rejects an uncompressed IPv6 literal
+    set:
+      alerta.alerts.email.to: "oncall@[2001:db8:1:2:3:4:5:6]"
+      alerta.alerts.email.from: alerts@example.org
+      alerta.alerts.email.smarthost: smtp.example.org:587
+    asserts:
+      - failedTemplate:
+          errorMessage: "alerta.alerts.email.to must be an address or a comma-separated list of addresses, such as oncall@example.org, got \"oncall@[2001:db8:1:2:3:4:5:6]\""
+
+  - it: rejects a compressed IPv6 literal
+    set:
+      alerta.alerts.email.to: "oncall@[2001:db8::25]"
+      alerta.alerts.email.from: alerts@example.org
+      alerta.alerts.email.smarthost: smtp.example.org:587
+    asserts:
+      - failedTemplate:
+          errorMessage: "alerta.alerts.email.to must be an address or a comma-separated list of addresses, such as oncall@example.org, got \"oncall@[2001:db8::25]\""
+
+  - it: rejects an IPv6 loopback literal
+    set:
+      alerta.alerts.email.to: "oncall@[::1]"
+      alerta.alerts.email.from: alerts@example.org
+      alerta.alerts.email.smarthost: smtp.example.org:587
+    asserts:
+      - failedTemplate:
+          errorMessage: "alerta.alerts.email.to must be an address or a comma-separated list of addresses, such as oncall@example.org, got \"oncall@[::1]\""
+
+  - it: rejects the unspecified IPv6 literal
+    set:
+      alerta.alerts.email.to: "oncall@[::]"
+      alerta.alerts.email.from: alerts@example.org
+      alerta.alerts.email.smarthost: smtp.example.org:587
+    asserts:
+      - failedTemplate:
+          errorMessage: "alerta.alerts.email.to must be an address or a comma-separated list of addresses, such as oncall@example.org, got \"oncall@[::]\""
+
+  - it: rejects a trailing IPv6 compression
+    set:
+      alerta.alerts.email.to: "oncall@[2001:db8::]"
+      alerta.alerts.email.from: alerts@example.org
+      alerta.alerts.email.smarthost: smtp.example.org:587
+    asserts:
+      - failedTemplate:
+          errorMessage: "alerta.alerts.email.to must be an address or a comma-separated list of addresses, such as oncall@example.org, got \"oncall@[2001:db8::]\""
+
+  - it: rejects an IPv4-mapped IPv6 literal
+    set:
+      alerta.alerts.email.to: "oncall@[::ffff:192.0.2.25]"
+      alerta.alerts.email.from: alerts@example.org
+      alerta.alerts.email.smarthost: smtp.example.org:587
+    asserts:
+      - failedTemplate:
+          errorMessage: "alerta.alerts.email.to must be an address or a comma-separated list of addresses, such as oncall@example.org, got \"oncall@[::ffff:192.0.2.25]\""
+
+  - it: rejects an uncompressed mixed IPv6 literal
+    set:
+      alerta.alerts.email.to: "oncall@[2001:db8:1:2:3:4:192.0.2.25]"
+      alerta.alerts.email.from: alerts@example.org
+      alerta.alerts.email.smarthost: smtp.example.org:587
+    asserts:
+      - failedTemplate:
+          errorMessage: "alerta.alerts.email.to must be an address or a comma-separated list of addresses, such as oncall@example.org, got \"oncall@[2001:db8:1:2:3:4:192.0.2.25]\""
+
+  - it: accepts a quoted question in a display name
+    set:
+      alerta.alerts.email.to: "\"Who?\" <oncall@example.org>"
+      alerta.alerts.email.from: '"Alerts: Primary" <alerts@example.org>'
+      alerta.alerts.email.smarthost: smtp.example.org:587
+    asserts:
+      - documentSelector:
+          path: metadata.labels.app
+          value: alertmanager
+        matchRegex:
+          path: stringData["alertmanager.yaml"]
+          pattern: "(?m)^  - to: \"\\\\\"Who\\?\\\\\" <oncall@example\\.org>\"$"
+
+  - it: rejects an encoded display name with an unknown charset
+    set:
+      alerta.alerts.email.to: "=?unknown?Q?Oncall?= <oncall@example.org>"
+      alerta.alerts.email.from: alerts@example.org
+      alerta.alerts.email.smarthost: smtp.example.org:587
+    asserts:
+      - failedTemplate:
+          errorMessage: "alerta.alerts.email.to must be an address or a comma-separated list of addresses, such as oncall@example.org, got \"=?unknown?Q?Oncall?= <oncall@example.org>\""
+
+  - it: rejects a control character in a quoted name
+    set:
+      alerta.alerts.email.to: "\"Oncall\u0001\" <oncall@example.org>"
+      alerta.alerts.email.from: alerts@example.org
+      alerta.alerts.email.smarthost: smtp.example.org:587
+    asserts:
+      - failedTemplate:
+          errorMessage: "alerta.alerts.email.to must be an address or a comma-separated list of addresses, such as oncall@example.org, got \"\\\"Oncall\\x01\\\" <oncall@example.org>\""
+
+  - it: rejects template actions in the recipient local part
+    set:
+      alerta.alerts.email.to: "on{{bad}}@example.org"
+      alerta.alerts.email.from: alerts@example.org
+      alerta.alerts.email.smarthost: smtp.example.org:587
+    asserts:
+      - failedTemplate:
+          errorMessage: "alerta.alerts.email.to must contain literal addresses, without template actions"
+
+  - it: rejects template actions in a quoted recipient name
+    set:
+      alerta.alerts.email.to: '"{{bad}}" <oncall@example.org>'
+      alerta.alerts.email.from: alerts@example.org
+      alerta.alerts.email.smarthost: smtp.example.org:587
+    asserts:
+      - failedTemplate:
+          errorMessage: "alerta.alerts.email.to must contain literal addresses, without template actions"
+
+  - it: rejects template actions in the sender local part
+    set:
+      alerta.alerts.email.to: oncall@example.org
+      alerta.alerts.email.from: "alerts{{bad}}@example.org"
+      alerta.alerts.email.smarthost: smtp.example.org:587
+    asserts:
+      - failedTemplate:
+          errorMessage: "alerta.alerts.email.from must contain a literal address, without template actions"
+
+  - it: accepts single literal braces in addresses
+    set:
+      alerta.alerts.email.to: "on{call}@example.org"
+      alerta.alerts.email.from: "alerts{primary}@example.org"
+      alerta.alerts.email.smarthost: smtp.example.org:587
+    asserts:
+      - documentSelector:
+          path: metadata.labels.app
+          value: alertmanager
+        matchRegex:
+          path: stringData["alertmanager.yaml"]
+          pattern: '(?m)^  - to: "on\{call\}@example\.org"$'
+  - it: rejects an IPv4 octet just above the maximum
+    set:
+      alerta.alerts.email.to: "oncall@[256.1.1.1]"
+      alerta.alerts.email.from: "alerts@example.org"
+      alerta.alerts.email.smarthost: smtp.example.org:587
+    asserts:
+      - failedTemplate:
+          errorMessage: "alerta.alerts.email.to must be an address or a comma-separated list of addresses, such as oncall@example.org, got \"oncall@[256.1.1.1]\""
+
+  - it: rejects a sender IPv4 octet just above the maximum
+    set:
+      alerta.alerts.email.to: "oncall@example.org"
+      alerta.alerts.email.from: "alerts@[256.1.1.1]"
+      alerta.alerts.email.smarthost: smtp.example.org:587
+    asserts:
+      - failedTemplate:
+          errorMessage: "alerta.alerts.email.from must be one address, such as alerts@example.org or Alerts <alerts@example.org>, got \"alerts@[256.1.1.1]\""
+
+  - it: rejects an IPv6 sender literal
+    set:
+      alerta.alerts.email.to: "oncall@example.org"
+      alerta.alerts.email.from: "alerts@[::1]"
+      alerta.alerts.email.smarthost: smtp.example.org:587
+    asserts:
+      - failedTemplate:
+          errorMessage: "alerta.alerts.email.from must be one address, such as alerts@example.org or Alerts <alerts@example.org>, got \"alerts@[::1]\""
+
+  - it: rejects an IPv6 prefix in a recipient literal
+    set:
+      alerta.alerts.email.to: "oncall@[IPv6:2001:db8::25]"
+      alerta.alerts.email.from: "alerts@example.org"
+      alerta.alerts.email.smarthost: smtp.example.org:587
+    asserts:
+      - failedTemplate:
+          errorMessage: "alerta.alerts.email.to must be an address or a comma-separated list of addresses, such as oncall@example.org, got \"oncall@[IPv6:2001:db8::25]\""
+
+  - it: rejects an IPv6 prefix in a sender literal
+    set:
+      alerta.alerts.email.to: "oncall@example.org"
+      alerta.alerts.email.from: "alerts@[IPv6:2001:db8::25]"
+      alerta.alerts.email.smarthost: smtp.example.org:587
+    asserts:
+      - failedTemplate:
+          errorMessage: "alerta.alerts.email.from must be one address, such as alerts@example.org or Alerts <alerts@example.org>, got \"alerts@[IPv6:2001:db8::25]\""
diff --git a/packages/system/monitoring/tests/alertmanager_email_validation_test.yaml b/packages/system/monitoring/tests/alertmanager_email_validation_test.yaml
new file mode 100644
index 0000000000..9691a57462
--- /dev/null
+++ b/packages/system/monitoring/tests/alertmanager_email_validation_test.yaml
@@ -0,0 +1,228 @@
+suite: Alertmanager email input boundaries
+templates:
+  - templates/alerta/alerta.yaml
+release:
+  name: monitoring
+  namespace: tenant-root
+set:
+  _cluster.root-host: example.org
+  _namespace.host: tenant-root.example.org
+  _namespace.ingress: tenant-root
+  alerta.alerts.email.to: oncall@example.org
+  alerta.alerts.email.from: alerts@example.org
+  alerta.alerts.email.smarthost: smtp.example.org:465
+tests:
+  - it: "rejects malformed bracketed smarthost [deadbeef]:25"
+    set:
+      alerta.alerts.email.smarthost: "[deadbeef]:25"
+    asserts:
+      - failedTemplate:
+          errorMessage: "alerta.alerts.email.smarthost must be host:port, such as smtp.example.com:587, got \"[deadbeef]:25\""
+
+  - it: "rejects malformed bracketed smarthost [...]:25"
+    set:
+      alerta.alerts.email.smarthost: "[...]:25"
+    asserts:
+      - failedTemplate:
+          errorMessage: "alerta.alerts.email.smarthost must be host:port, such as smtp.example.com:587, got \"[...]:25\""
+
+  - it: "rejects malformed bracketed smarthost [1:2:3:4:5:6:7:8:9]:25"
+    set:
+      alerta.alerts.email.smarthost: "[1:2:3:4:5:6:7:8:9]:25"
+    asserts:
+      - failedTemplate:
+          errorMessage: "alerta.alerts.email.smarthost must be host:port, such as smtp.example.com:587, got \"[1:2:3:4:5:6:7:8:9]:25\""
+
+  - it: "rejects malformed bracketed smarthost [1::2::3]:25"
+    set:
+      alerta.alerts.email.smarthost: "[1::2::3]:25"
+    asserts:
+      - failedTemplate:
+          errorMessage: "alerta.alerts.email.smarthost must be host:port, such as smtp.example.com:587, got \"[1::2::3]:25\""
+
+  - it: "rejects malformed bracketed smarthost [1:2:3:4:5:6:7:8::]:25"
+    set:
+      alerta.alerts.email.smarthost: "[1:2:3:4:5:6:7:8::]:25"
+    asserts:
+      - failedTemplate:
+          errorMessage: "alerta.alerts.email.smarthost must be host:port, such as smtp.example.com:587, got \"[1:2:3:4:5:6:7:8::]:25\""
+
+  - it: "rejects malformed bracketed smarthost [1:2:3:4::5:6:7:8]:25"
+    set:
+      alerta.alerts.email.smarthost: "[1:2:3:4::5:6:7:8]:25"
+    asserts:
+      - failedTemplate:
+          errorMessage: "alerta.alerts.email.smarthost must be host:port, such as smtp.example.com:587, got \"[1:2:3:4::5:6:7:8]:25\""
+
+  - it: "rejects malformed bracketed smarthost [::ffff:256.0.0.1]:25"
+    set:
+      alerta.alerts.email.smarthost: "[::ffff:256.0.0.1]:25"
+    asserts:
+      - failedTemplate:
+          errorMessage: "alerta.alerts.email.smarthost must be host:port, such as smtp.example.com:587, got \"[::ffff:256.0.0.1]:25\""
+
+  - it: "rejects malformed bracketed smarthost [192.0.2.256]:25"
+    set:
+      alerta.alerts.email.smarthost: "[192.0.2.256]:25"
+    asserts:
+      - failedTemplate:
+          errorMessage: "alerta.alerts.email.smarthost must be host:port, such as smtp.example.com:587, got \"[192.0.2.256]:25\""
+
+  - it: "rejects a leading zero in the SMTP port smtp.example.org:0465"
+    set:
+      alerta.alerts.email.smarthost: "smtp.example.org:0465"
+    asserts:
+      - failedTemplate:
+          errorMessage: "alerta.alerts.email.smarthost port must not contain leading zeros, got \"smtp.example.org:0465\""
+
+  - it: "rejects a leading zero in the SMTP port [::1]:00025"
+    set:
+      alerta.alerts.email.smarthost: "[::1]:00025"
+    asserts:
+      - failedTemplate:
+          errorMessage: "alerta.alerts.email.smarthost port must not contain leading zeros, got \"[::1]:00025\""
+
+  - it: "accepts IP smarthost [::]:25"
+    set:
+      alerta.alerts.email.smarthost: "[::]:25"
+    asserts:
+      - documentSelector:
+          path: metadata.labels.app
+          value: alertmanager
+        matchRegex:
+          path: stringData["alertmanager.yaml"]
+          pattern: "smarthost: \"\\[::\\]:25\""
+
+  - it: "accepts IP smarthost [2001:db8:0:1:2:3:4:5]:587"
+    set:
+      alerta.alerts.email.smarthost: "[2001:db8:0:1:2:3:4:5]:587"
+    asserts:
+      - documentSelector:
+          path: metadata.labels.app
+          value: alertmanager
+        matchRegex:
+          path: stringData["alertmanager.yaml"]
+          pattern: "smarthost: \"\\[2001:db8:0:1:2:3:4:5\\]:587\""
+
+  - it: "accepts IP smarthost [::ffff:192.0.2.1]:465"
+    set:
+      alerta.alerts.email.smarthost: "[::ffff:192.0.2.1]:465"
+    asserts:
+      - documentSelector:
+          path: metadata.labels.app
+          value: alertmanager
+        matchRegex:
+          path: stringData["alertmanager.yaml"]
+          pattern: "smarthost: \"\\[::ffff:192\\.0\\.2\\.1\\]:465\""
+
+  - it: "accepts IP smarthost [1:2:3:4:5:6:192.0.2.1]:587"
+    set:
+      alerta.alerts.email.smarthost: "[1:2:3:4:5:6:192.0.2.1]:587"
+    asserts:
+      - documentSelector:
+          path: metadata.labels.app
+          value: alertmanager
+        matchRegex:
+          path: stringData["alertmanager.yaml"]
+          pattern: "smarthost: \"\\[1:2:3:4:5:6:192\\.0\\.2\\.1\\]:587\""
+
+  - it: "accepts IP smarthost [192.0.2.1]:25"
+    set:
+      alerta.alerts.email.smarthost: "[192.0.2.1]:25"
+    asserts:
+      - documentSelector:
+          path: metadata.labels.app
+          value: alertmanager
+        matchRegex:
+          path: stringData["alertmanager.yaml"]
+          pattern: "smarthost: \"\\[192\\.0\\.2\\.1\\]:25\""
+
+  - it: "accepts repeat interval 100000000ms"
+    set:
+      alerta.alerts.email.repeatInterval: "100000000ms"
+    asserts:
+      - documentSelector:
+          path: metadata.labels.app
+          value: alertmanager
+        matchRegex:
+          path: stringData["alertmanager.yaml"]
+          pattern: "repeat_interval: \"100000000ms\""
+
+  - it: "accepts repeat interval 9223372036854ms"
+    set:
+      alerta.alerts.email.repeatInterval: "9223372036854ms"
+    asserts:
+      - documentSelector:
+          path: metadata.labels.app
+          value: alertmanager
+        matchRegex:
+          path: stringData["alertmanager.yaml"]
+          pattern: "repeat_interval: \"9223372036854ms\""
+
+  - it: "accepts repeat interval 9223372036s854ms"
+    set:
+      alerta.alerts.email.repeatInterval: "9223372036s854ms"
+    asserts:
+      - documentSelector:
+          path: metadata.labels.app
+          value: alertmanager
+        matchRegex:
+          path: stringData["alertmanager.yaml"]
+          pattern: "repeat_interval: \"9223372036s854ms\""
+
+  - it: "accepts repeat interval 000000000000000000000005m"
+    set:
+      alerta.alerts.email.repeatInterval: "000000000000000000000005m"
+    asserts:
+      - documentSelector:
+          path: metadata.labels.app
+          value: alertmanager
+        matchRegex:
+          path: stringData["alertmanager.yaml"]
+          pattern: "repeat_interval: \"000000000000000000000005m\""
+
+  - it: "accepts repeat interval 30s"
+    set:
+      alerta.alerts.email.repeatInterval: "30s"
+    asserts:
+      - documentSelector:
+          path: metadata.labels.app
+          value: alertmanager
+        matchRegex:
+          path: stringData["alertmanager.yaml"]
+          pattern: "repeat_interval: \"30s\""
+
+  - it: "rejects overflowing repeat interval 9223372036855ms"
+    set:
+      alerta.alerts.email.repeatInterval: "9223372036855ms"
+    asserts:
+      - failedTemplate:
+          errorMessage: "alerta.alerts.email.repeatInterval is out of range for Alertmanager, got \"9223372036855ms\""
+
+  - it: "rejects overflowing repeat interval 9223372036s855ms"
+    set:
+      alerta.alerts.email.repeatInterval: "9223372036s855ms"
+    asserts:
+      - failedTemplate:
+          errorMessage: "alerta.alerts.email.repeatInterval is out of range for Alertmanager, got \"9223372036s855ms\""
+
+  - it: "rejects overflowing repeat interval 9999999999999999999999999999999999y"
+    set:
+      alerta.alerts.email.repeatInterval: "9999999999999999999999999999999999y"
+    asserts:
+      - failedTemplate:
+          errorMessage: "alerta.alerts.email.repeatInterval is out of range for Alertmanager, got \"9999999999999999999999999999999999y\""
+
+  - it: "rejects overflowing repeat interval 9223372036854h"
+    set:
+      alerta.alerts.email.repeatInterval: "9223372036854h"
+    asserts:
+      - failedTemplate:
+          errorMessage: "alerta.alerts.email.repeatInterval is out of range for Alertmanager, got \"9223372036854h\""
+
+  - it: "reports a whitespace-only recipient"
+    set:
+      alerta.alerts.email.to: "   "
+    asserts:
+      - failedTemplate:
+          errorMessage: "alerta.alerts.email.to has an empty entry, got \"   \""
diff --git a/packages/system/monitoring/tests/grafana_ingress_wildcard_test.yaml b/packages/system/monitoring/tests/grafana_ingress_wildcard_test.yaml
new file mode 100644
index 0000000000..a4cf5abeac
--- /dev/null
+++ b/packages/system/monitoring/tests/grafana_ingress_wildcard_test.yaml
@@ -0,0 +1,54 @@
+suite: grafana ingress wildcard mode drops per-host ACME
+templates:
+  - templates/grafana/grafana.yaml
+
+release:
+  name: monitoring
+  namespace: tenant-root
+
+# grafana exposes its ingress inside the Grafana CR's spec.ingress.
+# Issue #2812 names grafana explicitly in its acceptance criteria, so
+# this is the load-bearing acceptance test for the ingress-nginx path.
+# In wildcard mode the whole spec.ingress.metadata block (its only
+# content was the cert-manager annotations) and the per-host tls
+# secretName are dropped (the tls section stays so the HTTPS redirect
+# keeps working against the default SSL certificate).
+
+tests:
+  - it: drops cert-manager metadata and tls secretName when wildcard secret is set
+    set:
+      _cluster:
+        issuer-name: letsencrypt-prod
+        solver: http01
+        gateway-enabled: "false"
+        wildcard-secret-name: wildcard-tls
+      _namespace:
+        host: example.org
+        ingress: tenant-root
+    asserts:
+      - equal:
+          path: kind
+          value: Grafana
+      - notExists:
+          path: spec.ingress.metadata
+      - exists:
+          path: spec.ingress.spec.tls
+      - notExists:
+          path: spec.ingress.spec.tls[0].secretName
+
+  - it: keeps cert-manager metadata and tls secretName without wildcard secret
+    set:
+      _cluster:
+        issuer-name: letsencrypt-prod
+        solver: http01
+        gateway-enabled: "false"
+      _namespace:
+        host: example.org
+        ingress: tenant-root
+    asserts:
+      - equal:
+          path: spec.ingress.metadata.annotations["cert-manager.io/cluster-issuer"]
+          value: letsencrypt-prod
+      - equal:
+          path: spec.ingress.spec.tls[0].secretName
+          value: grafana-ingress-tls
diff --git a/packages/system/monitoring/tests/grafana_upstream_image_plugins_test.yaml b/packages/system/monitoring/tests/grafana_upstream_image_plugins_test.yaml
new file mode 100644
index 0000000000..2503bfd26b
--- /dev/null
+++ b/packages/system/monitoring/tests/grafana_upstream_image_plugins_test.yaml
@@ -0,0 +1,65 @@
+suite: grafana runs the upstream image with in-cluster catalog plugins
+templates:
+  - templates/grafana/grafana.yaml
+
+release:
+  name: monitoring
+  namespace: tenant-root
+
+# Regression cover for the switch off the rebuilt AGPL Grafana image
+# (PR #3378): the Grafana CR must reference the upstream grafana/grafana
+# image routed through cozy-lib.image (so mirrored-registry installs keep
+# working), and install its plugins via GF_INSTALL_PLUGINS from the
+# in-cluster grafana-dashboards server rather than the public catalog
+# (air-gapped installs have no internet egress at pod startup).
+
+tests:
+  - it: uses the digest-pinned upstream image untouched on a default install
+    set:
+      _cluster:
+        issuer-name: letsencrypt-prod
+        solver: http01
+        gateway-enabled: "false"
+      _namespace:
+        host: example.org
+        ingress: tenant-root
+    asserts:
+      - equal:
+          path: kind
+          value: Grafana
+      - equal:
+          path: spec.deployment.spec.template.spec.containers[0].image
+          value: docker.io/grafana/grafana:11.6.15@sha256:f739273dfed04760428fcfbfccd1752b3b7fc87ef0a3d5637e2e87cce151e1a2
+
+  - it: prefixes the image with the cluster images-registry when set
+    set:
+      _cluster:
+        issuer-name: letsencrypt-prod
+        solver: http01
+        gateway-enabled: "false"
+        images-registry: mirror.example.com
+      _namespace:
+        host: example.org
+        ingress: tenant-root
+    asserts:
+      - equal:
+          path: spec.deployment.spec.template.spec.containers[0].image
+          value: mirror.example.com/docker.io/grafana/grafana:11.6.15@sha256:f739273dfed04760428fcfbfccd1752b3b7fc87ef0a3d5637e2e87cce151e1a2
+
+  - it: installs pinned plugins from the in-cluster grafana-dashboards server
+    set:
+      _cluster:
+        issuer-name: letsencrypt-prod
+        solver: http01
+        gateway-enabled: "false"
+      _namespace:
+        host: example.org
+        ingress: tenant-root
+    asserts:
+      - contains:
+          path: spec.deployment.spec.template.spec.containers[0].env
+          content:
+            name: GF_INSTALL_PLUGINS
+            value: "http://grafana-dashboards.cozy-grafana-operator.svc/plugins/grafana-worldmap-panel-1.0.6.zip;grafana-worldmap-panel,http://grafana-dashboards.cozy-grafana-operator.svc/plugins/marcusolsson-dynamictext-panel-6.2.0.zip;marcusolsson-dynamictext-panel,http://grafana-dashboards.cozy-grafana-operator.svc/plugins/natel-discrete-panel-0.1.1.zip;natel-discrete-panel,http://grafana-dashboards.cozy-grafana-operator.svc/plugins/victoriametrics-logs-datasource-0.29.0.zip;victoriametrics-logs-datasource"
+      - notExists:
+          path: spec.config.plugins
diff --git a/packages/system/monitoring/tests/host_guard_alerta_test.yaml b/packages/system/monitoring/tests/host_guard_alerta_test.yaml
new file mode 100644
index 0000000000..1e1dd6b4c1
--- /dev/null
+++ b/packages/system/monitoring/tests/host_guard_alerta_test.yaml
@@ -0,0 +1,38 @@
+suite: alerta guards an empty apex in isolation
+templates:
+  - templates/alerta/alerta.yaml
+
+release:
+  name: monitoring
+  namespace: tenant-root
+
+tests:
+  - it: fails when _namespace is injected with an empty host and no host override
+    set:
+      _namespace:
+        host: ""
+        ingress: tenant-root
+      _cluster:
+        issuer-name: letsencrypt-prod
+        solver: http01
+        gateway-enabled: "false"
+    asserts:
+      - failedTemplate:
+          errorMessage: "the tenant apex (_namespace.host) is empty and this app sets no host override, so its ingress hostname would be malformed. Set tenant.spec.host on this tenant, inherit it from a parent that has host set, or set this app's host value."
+
+  - it: renders the alerta ingress host from the apex when it is set
+    set:
+      _namespace:
+        host: example.org
+        ingress: tenant-root
+      _cluster:
+        issuer-name: letsencrypt-prod
+        solver: http01
+        gateway-enabled: "false"
+    documentSelector:
+      path: kind
+      value: Ingress
+    asserts:
+      - equal:
+          path: spec.rules[0].host
+          value: alerta.example.org
diff --git a/packages/system/monitoring/tests/host_guard_grafana_httproute_test.yaml b/packages/system/monitoring/tests/host_guard_grafana_httproute_test.yaml
new file mode 100644
index 0000000000..c46ec938ce
--- /dev/null
+++ b/packages/system/monitoring/tests/host_guard_grafana_httproute_test.yaml
@@ -0,0 +1,31 @@
+suite: grafana HTTPRoute guards an empty apex in isolation
+templates:
+  - templates/grafana/httproute.yaml
+
+release:
+  name: monitoring
+  namespace: tenant-root
+
+tests:
+  - it: fails when _namespace is injected with an empty host and no host override
+    set:
+      _namespace:
+        host: ""
+        ingress: tenant-root
+      _cluster:
+        gateway-enabled: "true"
+    asserts:
+      - failedTemplate:
+          errorMessage: "the tenant apex (_namespace.host) is empty and this app sets no host override, so its ingress hostname would be malformed. Set tenant.spec.host on this tenant, inherit it from a parent that has host set, or set this app's host value."
+
+  - it: renders the HTTPRoute hostname from the apex when it is set
+    set:
+      _namespace:
+        host: example.org
+        ingress: tenant-root
+      _cluster:
+        gateway-enabled: "true"
+    asserts:
+      - equal:
+          path: spec.hostnames[0]
+          value: grafana.example.org
diff --git a/packages/system/monitoring/tests/host_guard_grafana_oidc_test.yaml b/packages/system/monitoring/tests/host_guard_grafana_oidc_test.yaml
new file mode 100644
index 0000000000..72c9a45b16
--- /dev/null
+++ b/packages/system/monitoring/tests/host_guard_grafana_oidc_test.yaml
@@ -0,0 +1,44 @@
+suite: grafana OIDC client (grafanaHost helper) guards an empty apex in isolation
+templates:
+  - templates/grafana/oidc-keycloak.yaml
+
+release:
+  name: monitoring
+  namespace: tenant-root
+
+capabilities:
+  apiVersions:
+    - v1.edp.epam.com/v1
+
+tests:
+  - it: fails when mode is System and the apex is empty with no host override
+    set:
+      oidc:
+        mode: System
+      _cluster:
+        oidc-enabled: "true"
+        root-host: example.org
+      _namespace:
+        host: ""
+        ingress: tenant-root
+    asserts:
+      - failedTemplate:
+          errorMessage: "the tenant apex (_namespace.host) is empty and this app sets no host override, so its ingress hostname would be malformed. Set tenant.spec.host on this tenant, inherit it from a parent that has host set, or set this app's host value."
+
+  - it: renders the KeycloakClient webUrl from the apex when it is set
+    set:
+      oidc:
+        mode: System
+      _cluster:
+        oidc-enabled: "true"
+        root-host: example.org
+      _namespace:
+        host: example.org
+        ingress: tenant-root
+    documentSelector:
+      path: kind
+      value: KeycloakClient
+    asserts:
+      - equal:
+          path: spec.webUrl
+          value: https://grafana.example.org
diff --git a/packages/system/monitoring/tests/host_guard_test.yaml b/packages/system/monitoring/tests/host_guard_test.yaml
new file mode 100644
index 0000000000..3bde6572f3
--- /dev/null
+++ b/packages/system/monitoring/tests/host_guard_test.yaml
@@ -0,0 +1,41 @@
+suite: grafana root_url fails on an empty injected apex
+
+templates:
+  - templates/grafana/grafana.yaml
+
+release:
+  name: monitoring
+  namespace: tenant-root
+
+# monitoring declares _namespace: {} and renders standalone with an empty map
+# (the guard stays silent there). A NON-empty _namespace with an empty host is
+# the injected-misconfig case the guard catches; grafana.yaml composes
+# grafana.<apex> in root_url on every render.
+
+tests:
+  - it: fails when _namespace is injected with an empty host and no host override
+    set:
+      _namespace:
+        ingress: tenant-root
+        host: ""
+      _cluster:
+        issuer-name: letsencrypt-prod
+        solver: http01
+        gateway-enabled: "false"
+    asserts:
+      - failedTemplate:
+          errorMessage: "the tenant apex (_namespace.host) is empty and this app sets no host override, so its ingress hostname would be malformed. Set tenant.spec.host on this tenant, inherit it from a parent that has host set, or set this app's host value."
+
+  - it: renders the Grafana CR when the apex is set
+    set:
+      _namespace:
+        ingress: tenant-root
+        host: example.org
+      _cluster:
+        issuer-name: letsencrypt-prod
+        solver: http01
+        gateway-enabled: "false"
+    asserts:
+      - equal:
+          path: kind
+          value: Grafana
diff --git a/packages/system/monitoring/tests/oidc_crd_missing_test.yaml b/packages/system/monitoring/tests/oidc_crd_missing_test.yaml
new file mode 100644
index 0000000000..878040c6cb
--- /dev/null
+++ b/packages/system/monitoring/tests/oidc_crd_missing_test.yaml
@@ -0,0 +1,38 @@
+suite: OIDC selector — Keycloak operator CRD missing (Phase 1)
+# Split from oidc_test.yaml because the suite-level `capabilities`
+# override in that file installs `v1.edp.epam.com/v1`, and per-test
+# `capabilities` in helm-unittest v1.0.3 merges with the suite-level
+# list instead of replacing it — so the CRD-missing fail-close guard
+# needs its own suite where the capability list is empty at the top.
+templates:
+  - templates/grafana/oidc-keycloak.yaml
+  - templates/grafana/grafana.yaml
+
+release:
+  name: monitoring
+  namespace: tenant-root
+
+set:
+  _cluster:
+    root-host: example.org
+    oidc-enabled: "true"
+  _namespace:
+    host: tenant-root.example.org
+    ingress: tenant-root
+
+capabilities:
+  apiVersions: []
+
+tests:
+  - it: mode=System hard-fails the render when the Keycloak operator CRD is missing
+    # oidc-keycloak.yaml fires the assertion first because helm renders all
+    # templates in one pass; grafana.yaml carries the same assertion as
+    # defense-in-depth so a future refactor that removes oidc-keycloak.yaml
+    # cannot bring Grafana up pointing at a client that never gets
+    # provisioned. See monitoring.oidc.assertSystemKeycloakCRD in _helpers.tpl.
+    template: templates/grafana/oidc-keycloak.yaml
+    set:
+      oidc.mode: System
+    asserts:
+      - failedTemplate:
+          errorMessage: "spec.oidc.mode: System requires the Keycloak operator CRDs (v1.edp.epam.com/v1). If cozystack.keycloak-operator is still bootstrapping this will resolve on the next reconcile; otherwise verify the keycloak-operator package is deployed and its CRDs are registered."
diff --git a/packages/system/monitoring/tests/oidc_test.yaml b/packages/system/monitoring/tests/oidc_test.yaml
new file mode 100644
index 0000000000..917ce85a4a
--- /dev/null
+++ b/packages/system/monitoring/tests/oidc_test.yaml
@@ -0,0 +1,802 @@
+suite: OIDC selector on the Grafana instance (Phase 1)
+templates:
+  - templates/grafana/oidc-keycloak.yaml
+  - templates/grafana/oidc-client-secret.yaml
+  - templates/grafana/oidc-users-job.yaml
+  - templates/grafana/grafana.yaml
+
+release:
+  name: monitoring-system
+  namespace: tenant-root
+
+# Baseline `_cluster` / `_namespace` values wired by cozystack-basics
+# at install time. Individual tests override `oidc.*` and re-set the
+# oidc-enabled gate as needed.
+set:
+  _cluster:
+    root-host: example.org
+  _namespace:
+    host: tenant-root.example.org
+    ingress: tenant-root
+
+capabilities:
+  apiVersions:
+    - v1.edp.epam.com/v1
+
+tests:
+  ##########################################################
+  # Defensive rendering — omitted / null oidc block
+  ##########################################################
+
+  - it: oidc omitted entirely renders as if mode=None
+    template: templates/grafana/grafana.yaml
+    asserts:
+      - notExists:
+          path: spec.config["auth.generic_oauth"]
+
+  - it: oidc=null does not blow up nil-deref on grafana.yaml
+    template: templates/grafana/grafana.yaml
+    set:
+      oidc: ~
+    asserts:
+      - notExists:
+          path: spec.config["auth.generic_oauth"]
+
+  - it: oidc=null does not blow up nil-deref on oidc-keycloak.yaml
+    template: templates/grafana/oidc-keycloak.yaml
+    set:
+      oidc: ~
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  - it: oidc=null does not blow up nil-deref on oidc-client-secret.yaml
+    template: templates/grafana/oidc-client-secret.yaml
+    set:
+      oidc: ~
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  ##########################################################
+  # mode: None
+  ##########################################################
+
+  - it: mode=None emits no KeycloakClient / KeycloakClientScope
+    template: templates/grafana/oidc-keycloak.yaml
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  - it: mode=None emits no client-secret Secret
+    template: templates/grafana/oidc-client-secret.yaml
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  - it: mode=None grafana.yaml carries no auth.generic_oauth and no OIDC env
+    template: templates/grafana/grafana.yaml
+    asserts:
+      - notExists:
+          path: spec.config["auth.generic_oauth"]
+      # Anchor the index before asserting on it. notContains passes whenever its
+      # path resolves to something that lacks the content, and a different
+      # container at [0] qualifies, so without this both guards go green if a
+      # sidecar is ever placed ahead of grafana in the CR's deployment spec.
+      - equal:
+          path: spec.deployment.spec.template.spec.containers[0].name
+          value: grafana
+      # any: true matches on the element name alone. Without it the comparison
+      # is a deep-equal against the whole entry, and the real ones carry a
+      # valueFrom or a value alongside the name, so {name: ...} matches nothing
+      # and the guard passes whether or not the variable is rendered.
+      - notContains:
+          path: spec.deployment.spec.template.spec.containers[0].env
+          any: true
+          content:
+            name: GF_AUTH_GENERIC_OAUTH_CLIENT_SECRET
+      - notContains:
+          path: spec.deployment.spec.template.spec.containers[0].env
+          any: true
+          content:
+            name: GF_PATHS_CUSTOM_INI
+
+  - it: mode=None does NOT render the users-Job (upgrade safety guard)
+    # Regression guard against a test-cluster finding: if the Job were
+    # rendered in mode=None, the post-upgrade prune pass would silently
+    # delete every non-admin Main-Org member on any monitoring HR
+    # reconcile — clobbering users added manually through the Grafana
+    # UI on installations that predate this PR (where `spec.oidc` did
+    # not exist and Grafana orgs were operator-curated by hand).
+    template: templates/grafana/oidc-users-job.yaml
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  - it: mode=None with non-empty users still does NOT render the users-Job
+    template: templates/grafana/oidc-users-job.yaml
+    set:
+      oidc.users:
+        - email: alice@example.com
+          role: Admin
+    asserts:
+      # The Job is not rendered because `mode: None` short-circuits the
+      # gate; the prologue-level shape checks (email/role) still fire
+      # so a typo in the users[] entries doesn't slip through unnoticed.
+      - hasDocuments:
+          count: 0
+
+  ##########################################################
+  # mode: System — happy path
+  ##########################################################
+
+  - it: mode=System renders one KeycloakClient + one audience KeycloakClientScope (chart-owned only)
+    template: templates/grafana/oidc-keycloak.yaml
+    set:
+      oidc.mode: System
+      _cluster.oidc-enabled: "true"
+    asserts:
+      - hasDocuments:
+          count: 2
+      - equal:
+          path: kind
+          value: KeycloakClientScope
+        documentIndex: 0
+      - equal:
+          path: kind
+          value: KeycloakClient
+        documentIndex: 1
+
+  - it: mode=System KeycloakClient is confidential and points to the persistent Secret
+    template: templates/grafana/oidc-keycloak.yaml
+    set:
+      oidc.mode: System
+      _cluster.oidc-enabled: "true"
+    asserts:
+      - equal:
+          path: spec.public
+          value: false
+        documentIndex: 1
+      - equal:
+          path: spec.secret
+          value: "$monitoring-system-oidc-client:client-secret"
+        documentIndex: 1
+      - equal:
+          path: spec.redirectUris[0]
+          value: "https://grafana.tenant-root.example.org/login/generic_oauth"
+        documentIndex: 1
+      - contains:
+          path: spec.defaultClientScopes
+          content: tenant-root-monitoring-system-audience
+        documentIndex: 1
+      # `groups` scope is the platform-managed realm-default that emits
+      # the caller's Keycloak groups into the token; must be listed
+      # explicitly here because EDP KeycloakClient overrides (does NOT
+      # merge with) realm-level defaults. Without it, allowed_groups on
+      # the Grafana side would reject every login.
+      - contains:
+          path: spec.defaultClientScopes
+          content: groups
+        documentIndex: 1
+
+  # The count and kind assertions above already reject extra realm objects. Keep
+  # this named invariant beside them so ownership remains explicit: the tenant
+  # chart, rather than each Monitoring release, provisions the group directory.
+  - it: mode=System provisions no KeycloakRealmGroup
+    template: templates/grafana/oidc-keycloak.yaml
+    set:
+      oidc.mode: System
+      _cluster.oidc-enabled: "true"
+    asserts:
+      # Positive control first: the template DOES emit here, so the negative
+      # below is a statement about KeycloakRealmGroup rather than about an empty
+      # render.
+      - containsDocument:
+          apiVersion: v1.edp.epam.com/v1
+          kind: KeycloakClient
+          any: true
+      - containsDocument:
+          apiVersion: v1.edp.epam.com/v1
+          kind: KeycloakRealmGroup
+          any: true
+        not: true
+
+  - it: mode=System audience scope pins id_token.aud to the per-instance clientId
+    template: templates/grafana/oidc-keycloak.yaml
+    set:
+      oidc.mode: System
+      _cluster.oidc-enabled: "true"
+    asserts:
+      - equal:
+          path: metadata.name
+          value: tenant-root-monitoring-system-audience
+        documentIndex: 0
+      - equal:
+          path: spec.protocolMappers[0].protocolMapper
+          value: oidc-audience-mapper
+        documentIndex: 0
+      - equal:
+          path: spec.protocolMappers[0].config["included.client.audience"]
+          value: tenant-root-monitoring-system
+        documentIndex: 0
+
+  - it: mode=System persists a random client-secret at install
+    template: templates/grafana/oidc-client-secret.yaml
+    set:
+      oidc.mode: System
+      _cluster.oidc-enabled: "true"
+    asserts:
+      - hasDocuments:
+          count: 1
+      - equal:
+          path: kind
+          value: Secret
+      - equal:
+          path: metadata.name
+          value: monitoring-system-oidc-client
+      # 32 random alphanumeric chars base64-encoded → 44 chars (43 + '=' padding).
+      - matchRegex:
+          path: data["client-secret"]
+          pattern: "^[A-Za-z0-9+/]{43}=$"
+
+  - it: mode=System grafana.yaml emits auth.generic_oauth pointing at the cozy realm
+    template: templates/grafana/grafana.yaml
+    set:
+      oidc.mode: System
+      _cluster.oidc-enabled: "true"
+      oidc.users:
+        - email: alice@example.com
+          role: Admin
+    asserts:
+      - equal:
+          path: spec.config["auth.generic_oauth"].enabled
+          value: "true"
+      - equal:
+          path: spec.config["auth.generic_oauth"].client_id
+          value: tenant-root-monitoring-system
+      - equal:
+          path: spec.config["auth.generic_oauth"].client_secret
+          value: "${GF_AUTH_GENERIC_OAUTH_CLIENT_SECRET}"
+      - equal:
+          path: spec.config["auth.generic_oauth"].auth_url
+          value: "https://keycloak.example.org/realms/cozy/protocol/openid-connect/auth"
+      - equal:
+          path: spec.config["auth.generic_oauth"].scopes
+          value: "openid email profile groups tenant-root-monitoring-system-audience"
+      # Tenant-membership gate — unconditionally emitted in System mode
+      # (chart-owned, not tied to spec.oidc.users). Rejects logins whose
+      # token does not carry at least one of the release's tenant-scoped
+      # groups. Space-separated per Grafana generic_oauth semantics.
+      - equal:
+          path: spec.config["auth.generic_oauth"].allowed_groups
+          value: "tenant-root-view tenant-root-use tenant-root-admin tenant-root-super-admin"
+      # groups_attribute_path is REQUIRED alongside allowed_groups on
+      # Grafana v11.x+ — without it Grafana leaves the extracted
+      # user.Groups slice empty and the allowed_groups gate rejects
+      # every login (verified end-to-end on a test cluster with v11.6.15). "groups"
+      # points at the top-level `groups` array from userinfo — the
+      # shape Keycloak's oidc-group-membership-mapper emits.
+      - equal:
+          path: spec.config["auth.generic_oauth"].groups_attribute_path
+          value: "groups"
+      # No group-based mapping; the users-Job drives roles instead.
+      - notExists:
+          path: spec.config["auth.generic_oauth"].role_attribute_path
+      - notExists:
+          path: spec.config["auth.generic_oauth"].allow_assign_grafana_admin
+      # skip_org_role_sync=true keeps a login from overwriting the
+      # users-Job's role assignments.
+      - equal:
+          path: spec.config["auth.generic_oauth"].skip_org_role_sync
+          value: "true"
+      # Insecure-email-lookup is required to attach the OIDC identity to
+      # the pre-provisioned local account.
+      - equal:
+          path: spec.config["auth.generic_oauth"].oauth_allow_insecure_email_lookup
+          value: "true"
+      # allow_sign_up=false is the isolation lever — without it,
+      # Grafana's default (allow_sign_up=true) combined with
+      # skip_org_role_sync=true would mint a Viewer account for every
+      # cozy-realm identity that hits the login flow, then wait for the
+      # next helm-upgrade prune pass to clean them up.
+      - equal:
+          path: spec.config["auth.generic_oauth"].allow_sign_up
+          value: "false"
+
+  - it: mode=System with empty users omits users-map isolation dict but keeps the tenant-membership gate
+    # Reviewer's minor from PR#3176 round-2: with empty users[] the
+    # users-Job contract keys (skip_org_role_sync, insecure_email_lookup,
+    # allow_sign_up=false) are dropped so a BYO-IdP-like hands-off flow
+    # applies inside Grafana. But `allowed_groups` and the `groups` scope
+    # STAY UNCONDITIONALLY — they are the cross-tenant isolation gate
+    # (see round-3 review from lllamnyp), NOT part of the users-map
+    # contract. Without them a tenant-alice user could sign into
+    # tenant-bob's Grafana and get auto-assigned Viewer.
+    template: templates/grafana/grafana.yaml
+    set:
+      oidc.mode: System
+      _cluster.oidc-enabled: "true"
+    asserts:
+      - equal:
+          path: spec.config["auth.generic_oauth"].enabled
+          value: "true"
+      - notExists:
+          path: spec.config["auth.generic_oauth"].skip_org_role_sync
+      - notExists:
+          path: spec.config["auth.generic_oauth"].oauth_allow_insecure_email_lookup
+      - notExists:
+          path: spec.config["auth.generic_oauth"].allow_sign_up
+      # Tenant-membership gate stays regardless of users-map state.
+      - equal:
+          path: spec.config["auth.generic_oauth"].allowed_groups
+          value: "tenant-root-view tenant-root-use tenant-root-admin tenant-root-super-admin"
+      # groups_attribute_path must stay too — without it the gate is a
+      # silent no-op on Grafana v11.x+ regardless of whether the
+      # users-map is active.
+      - equal:
+          path: spec.config["auth.generic_oauth"].groups_attribute_path
+          value: "groups"
+      - equal:
+          path: spec.config["auth.generic_oauth"].scopes
+          value: "openid email profile groups tenant-root-monitoring-system-audience"
+
+  - it: mode=System allowed_groups uses the release namespace as tenant prefix (nested tenant)
+    # Regression guard against a helper regression that would compute
+    # groups from something else (e.g. .Release.Name or a hardcoded
+    # "tenant-root"): the tenant chart provisions the groups under
+    # `<namespace>-{view,...}` — see packages/apps/tenant/templates/
+    # keycloakgroups.yaml — so a mismatch here would silently lock out
+    # every user of the release on a nested tenant.
+    template: templates/grafana/grafana.yaml
+    release:
+      name: monitoring-system
+      namespace: tenant-foo-bar
+    set:
+      _cluster:
+        root-host: example.org
+        oidc-enabled: "true"
+      _namespace:
+        host: tenant-foo-bar.example.org
+        ingress: tenant-foo-bar
+      oidc.mode: System
+    asserts:
+      - equal:
+          path: spec.config["auth.generic_oauth"].allowed_groups
+          value: "tenant-foo-bar-view tenant-foo-bar-use tenant-foo-bar-admin tenant-foo-bar-super-admin"
+
+  - it: mode=System with empty users does NOT render the users-Job
+    template: templates/grafana/oidc-users-job.yaml
+    set:
+      oidc.mode: System
+      _cluster.oidc-enabled: "true"
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  - it: mode=System grafana.yaml wires GF_AUTH_GENERIC_OAUTH_CLIENT_SECRET from the Secret
+    template: templates/grafana/grafana.yaml
+    set:
+      oidc.mode: System
+      _cluster.oidc-enabled: "true"
+      oidc.users:
+        - email: alice@example.com
+          role: Admin
+    asserts:
+      - contains:
+          path: spec.deployment.spec.template.spec.containers[0].env
+          content:
+            name: GF_AUTH_GENERIC_OAUTH_CLIENT_SECRET
+            valueFrom:
+              secretKeyRef:
+                name: monitoring-system-oidc-client
+                key: client-secret
+
+  - it: mode=System keeps disable_login_form false so admin creds stay a break-glass path
+    template: templates/grafana/grafana.yaml
+    set:
+      oidc.mode: System
+      _cluster.oidc-enabled: "true"
+    asserts:
+      - equal:
+          path: spec.config.auth.disable_login_form
+          value: "false"
+
+  ##########################################################
+  # users-Job — post-install/post-upgrade hook, RBAC-free
+  ##########################################################
+
+  - it: users-Job is a helm hook, has a finite deadline, and needs no ServiceAccount
+    template: templates/grafana/oidc-users-job.yaml
+    set:
+      oidc.mode: System
+      _cluster.oidc-enabled: "true"
+      oidc.users:
+        - email: alice@example.com
+          role: Admin
+    asserts:
+      - equal:
+          path: kind
+          value: Job
+      - equal:
+          path: metadata.name
+          value: monitoring-system-oidc-users
+      - equal:
+          path: metadata.annotations["helm.sh/hook"]
+          value: post-install,post-upgrade
+      - equal:
+          path: metadata.annotations["helm.sh/hook-delete-policy"]
+          value: before-hook-creation
+      - equal:
+          path: spec.activeDeadlineSeconds
+          value: 900
+      # No SA name → falls back to `default` — the Job never talks to
+      # the kube API, only to Grafana over the in-cluster Service.
+      - notExists:
+          path: spec.template.spec.serviceAccountName
+
+  - it: users-Job mounts admin credentials from the chart-managed Secret
+    template: templates/grafana/oidc-users-job.yaml
+    set:
+      oidc.mode: System
+      _cluster.oidc-enabled: "true"
+      oidc.users:
+        - email: alice@example.com
+          role: Admin
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: GF_ADMIN_USER
+            valueFrom:
+              secretKeyRef:
+                name: grafana-admin-password
+                key: user
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: GF_ADMIN_PASSWORD
+            valueFrom:
+              secretKeyRef:
+                name: grafana-admin-password
+                key: password
+
+  - it: users-Job serialises spec.oidc.users into DESIRED_USERS_JSON
+    template: templates/grafana/oidc-users-job.yaml
+    set:
+      oidc.mode: System
+      _cluster.oidc-enabled: "true"
+      oidc.users:
+        - email: alice@example.com
+          role: Admin
+        - email: bob@example.com
+          role: Viewer
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: OIDC_MODE
+            value: System
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: DESIRED_USERS_JSON
+            value: '[{"email":"alice@example.com","role":"Admin"},{"email":"bob@example.com","role":"Viewer"}]'
+
+  - it: users-Job runs a non-root, read-only-rootfs container
+    template: templates/grafana/oidc-users-job.yaml
+    set:
+      oidc.mode: System
+      _cluster.oidc-enabled: "true"
+      oidc.users:
+        - email: alice@example.com
+          role: Admin
+    asserts:
+      - equal:
+          path: spec.template.spec.securityContext.runAsNonRoot
+          value: true
+      - equal:
+          path: spec.template.spec.containers[0].securityContext.readOnlyRootFilesystem
+          value: true
+      - equal:
+          path: spec.template.spec.containers[0].securityContext.allowPrivilegeEscalation
+          value: false
+
+  ##########################################################
+  # mode: System — fail-close guard
+  ##########################################################
+
+  - it: mode=System hard-fails the render when the platform OIDC feature is off
+    template: templates/grafana/oidc-keycloak.yaml
+    set:
+      oidc.mode: System
+      # _cluster.oidc-enabled deliberately unset
+    asserts:
+      - failedTemplate:
+          errorMessage: "spec.oidc.mode: System requires the platform-level OIDC feature (authentication.oidc.enabled) — enable it in cozystack-values, or use mode: CustomConfig for a tenant-supplied issuer."
+
+  ##########################################################
+  # mode: CustomConfig — inline
+  ##########################################################
+
+  - it: mode=CustomConfig with inline config emits no cozy realm objects
+    template: templates/grafana/oidc-keycloak.yaml
+    set:
+      oidc.mode: CustomConfig
+      oidc.customConfig.config:
+        client_id: my-client
+        client_secret: xyz
+        auth_url: https://idp.example/auth
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  - it: mode=CustomConfig inline emits no client-secret Secret (operator brings their own)
+    template: templates/grafana/oidc-client-secret.yaml
+    set:
+      oidc.mode: CustomConfig
+      oidc.customConfig.config:
+        client_id: my-client
+        client_secret: xyz
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  - it: mode=CustomConfig inline preserves the operator's map + chart-forced settings (users active)
+    template: templates/grafana/grafana.yaml
+    set:
+      oidc.mode: CustomConfig
+      oidc.customConfig.config:
+        client_id: my-client
+        client_secret: xyz
+        auth_url: https://idp.example/auth
+      oidc.users:
+        - email: alice@example.com
+          role: Admin
+    asserts:
+      - equal:
+          path: spec.config["auth.generic_oauth"].client_id
+          value: my-client
+      - equal:
+          path: spec.config["auth.generic_oauth"].client_secret
+          value: xyz
+      - equal:
+          path: spec.config["auth.generic_oauth"].auth_url
+          value: https://idp.example/auth
+      # Contract: chart-forced settings are merged on top of CustomConfig
+      # inline, so the users-Job's role assignments survive login.
+      - equal:
+          path: spec.config["auth.generic_oauth"].skip_org_role_sync
+          value: "true"
+      - equal:
+          path: spec.config["auth.generic_oauth"].oauth_allow_insecure_email_lookup
+          value: "true"
+      - equal:
+          path: spec.config["auth.generic_oauth"].allow_sign_up
+          value: "false"
+
+  - it: mode=CustomConfig inline with empty users hands off — chart forces nothing
+    # Reviewer's minor from PR#3176 round-2: a BYO-IdP operator who does
+    # NOT use the users-map should not get insecure-email-lookup or
+    # allow_sign_up=false forced on top of their config — the chart has
+    # nothing app-side to protect and the extra keys are a needless
+    # account-linking surface against issuers that don't verify emails.
+    template: templates/grafana/grafana.yaml
+    set:
+      oidc.mode: CustomConfig
+      oidc.customConfig.config:
+        client_id: my-client
+        client_secret: xyz
+        auth_url: https://idp.example/auth
+    asserts:
+      - equal:
+          path: spec.config["auth.generic_oauth"].client_id
+          value: my-client
+      - notExists:
+          path: spec.config["auth.generic_oauth"].skip_org_role_sync
+      - notExists:
+          path: spec.config["auth.generic_oauth"].oauth_allow_insecure_email_lookup
+      - notExists:
+          path: spec.config["auth.generic_oauth"].allow_sign_up
+
+  - it: mode=CustomConfig inline — operator cannot override chart-forced OIDC settings
+    template: templates/grafana/grafana.yaml
+    set:
+      oidc.mode: CustomConfig
+      oidc.customConfig.config:
+        client_id: my-client
+        # Operator tries to disable all three — chart still wins because
+        # users-map is active.
+        skip_org_role_sync: "false"
+        oauth_allow_insecure_email_lookup: "false"
+        allow_sign_up: "true"
+      oidc.users:
+        - email: alice@example.com
+          role: Admin
+    asserts:
+      - equal:
+          path: spec.config["auth.generic_oauth"].skip_org_role_sync
+          value: "true"
+      - equal:
+          path: spec.config["auth.generic_oauth"].oauth_allow_insecure_email_lookup
+          value: "true"
+      - equal:
+          path: spec.config["auth.generic_oauth"].allow_sign_up
+          value: "false"
+
+  - it: mode=CustomConfig users-Job runs and honours the desired list
+    template: templates/grafana/oidc-users-job.yaml
+    set:
+      oidc.mode: CustomConfig
+      oidc.customConfig.config:
+        client_id: my-client
+      oidc.users:
+        - email: carol@example.com
+          role: Editor
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: OIDC_MODE
+            value: CustomConfig
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: DESIRED_USERS_JSON
+            value: '[{"email":"carol@example.com","role":"Editor"}]'
+
+  ##########################################################
+  # mode: CustomConfig — secretRef
+  ##########################################################
+
+  - it: mode=CustomConfig with secretRef mounts the operator Secret + GF_PATHS_CUSTOM_INI
+    template: templates/grafana/grafana.yaml
+    set:
+      oidc.mode: CustomConfig
+      oidc.customConfig.secretRef.name: my-oauth-secret
+    asserts:
+      # spec.config carries no auth.generic_oauth — the ini fragment is
+      # authoritative in this branch.
+      - notExists:
+          path: spec.config["auth.generic_oauth"]
+      - contains:
+          path: spec.deployment.spec.template.spec.containers[0].env
+          content:
+            name: GF_PATHS_CUSTOM_INI
+            value: /etc/grafana/oidc/auth.ini
+      - contains:
+          path: spec.deployment.spec.template.spec.containers[0].volumeMounts
+          content:
+            name: oidc-custom-ini
+            mountPath: /etc/grafana/oidc
+            readOnly: true
+      # Without shared-central tracing the whole Secret is mounted, so an
+      # auth.ini that reads a sibling key with $__file{} keeps working.
+      - contains:
+          path: spec.deployment.spec.template.spec.volumes
+          content:
+            name: oidc-custom-ini
+            secret:
+              secretName: my-oauth-secret
+
+  - it: mode=CustomConfig with secretRef mounts only auth.ini for a central tenant
+    template: templates/grafana/grafana.yaml
+    release:
+      namespace: tenant-foo
+    set:
+      _namespace:
+        host: tenant-foo.example.org
+        ingress: tenant-root
+        tracingCentral: true
+      oidc.mode: CustomConfig
+      oidc.customConfig.secretRef.name: my-oauth-secret
+    asserts:
+      # The tenant names the Secret, and any other key of it (its collector's
+      # vmauth password, for one) must not land in a pod that can reach the
+      # shared traces store.
+      - contains:
+          path: spec.deployment.spec.template.spec.volumes
+          content:
+            name: oidc-custom-ini
+            secret:
+              secretName: my-oauth-secret
+              items:
+                - key: auth.ini
+                  path: auth.ini
+
+  ##########################################################
+  # mode: CustomConfig — XOR guards
+  ##########################################################
+
+  - it: mode=CustomConfig with BOTH inline and secretRef fails the render
+    template: templates/grafana/grafana.yaml
+    set:
+      oidc.mode: CustomConfig
+      oidc.customConfig.config:
+        client_id: a
+      oidc.customConfig.secretRef.name: b
+    asserts:
+      - failedTemplate:
+          errorMessage: "spec.oidc.customConfig: set exactly one of `config` (inline) or `secretRef.name` — they are mutually exclusive."
+
+  - it: mode=CustomConfig with NEITHER inline nor secretRef fails the render
+    template: templates/grafana/grafana.yaml
+    set:
+      oidc.mode: CustomConfig
+    asserts:
+      - failedTemplate:
+          errorMessage: "spec.oidc.mode: CustomConfig requires either spec.oidc.customConfig.config (inline generic_oauth map) or spec.oidc.customConfig.secretRef.name (Secret with an `auth.ini` key)."
+
+  - it: mode=CustomConfig secretRef + non-empty users fails the render (contract incompat)
+    # Prologue fires from the users-Job template — that's where all
+    # spec.oidc.users assertions live, so the fail surfaces there.
+    template: templates/grafana/oidc-users-job.yaml
+    set:
+      oidc.mode: CustomConfig
+      oidc.customConfig.secretRef.name: my-oauth-secret
+      oidc.users:
+        - email: alice@example.com
+          role: Admin
+    asserts:
+      - failedTemplate:
+          errorMessage: "spec.oidc: `users` is not honoured under `customConfig.secretRef` — the operator's mounted auth.ini is authoritative and the chart cannot inject `skip_org_role_sync=true` / `oauth_allow_insecure_email_lookup=true`, so the users-Job's role assignments would be overwritten on the operator's next login. Either switch to `customConfig.config` (inline map, merged with the chart-forced settings) or unset `users` and manage authorization inside the ini fragment yourself."
+
+  - it: mode=CustomConfig secretRef + empty users renders successfully
+    template: templates/grafana/grafana.yaml
+    set:
+      oidc.mode: CustomConfig
+      oidc.customConfig.secretRef.name: my-oauth-secret
+    asserts:
+      # spec.config still carries no auth.generic_oauth in this branch,
+      # matching the earlier secretRef test — this is the compatible path.
+      - notExists:
+          path: spec.config["auth.generic_oauth"]
+
+  ##########################################################
+  # spec.oidc.users[].role — schema contract regression guard
+  ##########################################################
+
+  # Even though the openAPISchema now marks `role` as required, downstream
+  # clients (Flux HelmRelease valuesFrom, direct helm CLI, dashboard-
+  # emitted CRs during a stale schema window) may still pass a
+  # role-less entry. The template must reject that at render time so the
+  # users-Job never fires with `role: "null"` on Grafana's admin API.
+  - it: oidc.users entry missing role fails the render (contract regression guard)
+    template: templates/grafana/oidc-users-job.yaml
+    set:
+      oidc.mode: System
+      _cluster.oidc-enabled: "true"
+      oidc.users:
+        - email: someone@example.com
+    asserts:
+      - failedTemplate:
+          errorMessage: "spec.oidc.users[0].role: is required and must be one of Admin, Editor, Viewer. Omitting the field would render null into the Grafana admin API body and fail the post-install users-Job with HTTP 400."
+
+  - it: oidc.users entry with unknown role fails the render
+    template: templates/grafana/oidc-users-job.yaml
+    set:
+      oidc.mode: System
+      _cluster.oidc-enabled: "true"
+      oidc.users:
+        - email: someone@example.com
+          role: Superuser
+    asserts:
+      - failedTemplate:
+          errorMessage: "spec.oidc.users[0].role: \"Superuser\" is not one of the allowed values Admin, Editor, Viewer."
+
+  # The grafana OIDC issuer realm is driven by _cluster.oidc-realm-name
+  # (authentication.oidc.realmName in the platform). A renamed realm must reach
+  # grafana's auth/token/userinfo URLs, or Grafana SSO breaks against a realm
+  # Keycloak no longer serves under the old name.
+  - it: mode=System grafana.yaml threads a custom realm name into the OIDC URLs
+    template: templates/grafana/grafana.yaml
+    set:
+      oidc.mode: System
+      _cluster.oidc-enabled: "true"
+      _cluster.oidc-realm-name: acme
+      oidc.users:
+        - email: alice@example.com
+          role: Admin
+    asserts:
+      - equal:
+          path: spec.config["auth.generic_oauth"].auth_url
+          value: "https://keycloak.example.org/realms/acme/protocol/openid-connect/auth"
diff --git a/packages/system/monitoring/tests/standalone_render_test.yaml b/packages/system/monitoring/tests/standalone_render_test.yaml
new file mode 100644
index 0000000000..c0cbc7d8c5
--- /dev/null
+++ b/packages/system/monitoring/tests/standalone_render_test.yaml
@@ -0,0 +1,24 @@
+suite: monitoring renders with no platform values injected
+release:
+  name: monitoring
+  namespace: cozy-monitoring
+
+# The platform injects _cluster and _namespace through the cozystack-values
+# Secret, so every case that sets them itself renders fine whether or not
+# values.yaml declares the keys. This case supplies neither. Drop the
+# _cluster declaration and the render dies on "index of untyped nil"; drop
+# the _namespace one and it dies on "nil pointer evaluating interface
+# {}.host". Both are what keep the chart renderable outside a cluster. No
+# suite-level `templates:` list here on purpose: it would narrow the render
+# to the listed files and let a later template reintroduce the same
+# breakage unseen.
+
+tests:
+  - it: still renders grafana and no route when _cluster and _namespace are absent
+    asserts:
+      - template: templates/grafana/grafana.yaml
+        hasDocuments:
+          count: 1
+      - template: templates/grafana/httproute.yaml
+        hasDocuments:
+          count: 0
diff --git a/packages/system/monitoring/tests/storage_pvc_label_test.yaml b/packages/system/monitoring/tests/storage_pvc_label_test.yaml
new file mode 100644
index 0000000000..3501116df5
--- /dev/null
+++ b/packages/system/monitoring/tests/storage_pvc_label_test.yaml
@@ -0,0 +1,87 @@
+suite: VM/VL storage claim templates carry the release-scoping cleanup label
+
+# The extra/monitoring post-delete cleanup hook deletes orphaned VM/VL storage
+# PVCs scoped to this release via apps.cozystack.io/application.name=<release>.
+# vm-operator does NOT apply spec.managedMetadata to PVCs, so the label must be
+# stamped on the claim template itself — vm-operator copies
+# volumeClaimTemplate.metadata.labels onto the PVCs (IntoSTSVolume). release.name
+# mirrors the flux release of this chart (monitoring-system), which is exactly
+# what the hook selector expects.
+
+release:
+  name: monitoring-system
+  namespace: tenant-root
+
+# Dunder values so the rest of the chart (grafana httproute etc.) renders;
+# they do not affect the VMCluster/VLCluster storage templates under test.
+set:
+  _namespace:
+    host: example.org
+    ingress: tenant-root
+  _cluster:
+    expose-ingress: ingress
+    host: example.org
+
+tests:
+  - it: stamps the cleanup label on vmstorage and vmselect claim templates
+    templates:
+      - templates/vm/vmcluster.yaml
+    documentSelector:
+      path: metadata.name
+      value: shortterm
+    asserts:
+      - equal:
+          path: spec.vmstorage.storage.volumeClaimTemplate.metadata.labels["apps.cozystack.io/application.name"]
+          value: monitoring-system
+      - equal:
+          path: spec.vmselect.storage.volumeClaimTemplate.metadata.labels["apps.cozystack.io/application.name"]
+          value: monitoring-system
+
+  - it: stamps the cleanup label on the vlstorage claim template
+    templates:
+      - templates/vlogs/vlogs.yaml
+    documentSelector:
+      path: metadata.name
+      value: generic
+    asserts:
+      - equal:
+          path: spec.vlstorage.storage.volumeClaimTemplate.metadata.labels["apps.cozystack.io/application.name"]
+          value: monitoring-system
+
+  - it: stamps the cleanup label on the VTCluster storage claim template
+    templates:
+      - templates/vtraces/vtraces.yaml
+    set:
+      tracingStorages:
+        - name: generic
+          mode: cluster
+          retentionPeriod: "14d"
+          storage: 10Gi
+    documentSelector:
+      path: metadata.name
+      value: generic
+    asserts:
+      - equal:
+          path: spec.storage.storage.volumeClaimTemplate.metadata.labels["apps.cozystack.io/application.name"]
+          value: monitoring-system
+
+  # Single mode stamps the label through a different field (spec.storageMetadata)
+  # than cluster mode, so it needs its own assertion — the post-delete cleanup
+  # hook selects PVCs by this label, and a dropped storageMetadata block would
+  # orphan the VTSingle PVC on tenant deletion.
+  - it: stamps the cleanup label on the VTSingle storage metadata (single mode)
+    templates:
+      - templates/vtraces/vtraces.yaml
+    set:
+      tracingStorages:
+        - name: generic
+          mode: single
+          retentionPeriod: "14d"
+          storage: 10Gi
+    documentSelector:
+      path: metadata.name
+      value: generic
+    asserts:
+      - equal:
+          path: spec.storageMetadata.labels["apps.cozystack.io/application.name"]
+          value: monitoring-system
diff --git a/packages/system/monitoring/tests/vlogs_datasource_documents_test.yaml b/packages/system/monitoring/tests/vlogs_datasource_documents_test.yaml
new file mode 100644
index 0000000000..ad061718e1
--- /dev/null
+++ b/packages/system/monitoring/tests/vlogs_datasource_documents_test.yaml
@@ -0,0 +1,35 @@
+suite: vlogs GrafanaDatasource is one document per logsStorages entry
+templates:
+  - templates/vlogs/grafana-datasource.yaml
+
+release:
+  name: monitoring
+  namespace: tenant-root
+
+# The range emits one GrafanaDatasource per logsStorages entry. Without a `---`
+# separator inside the range two entries concatenate into a single document with
+# duplicate keys, the later entry overwrites the earlier one, and every log store
+# but the last gets no datasource. These cases pin that each entry is its own
+# document.
+tests:
+  - it: renders one datasource for the default single-entry logsStorages
+    asserts:
+      - hasDocuments:
+          count: 1
+      - containsDocument:
+          apiVersion: grafana.integreatly.org/v1beta1
+          kind: GrafanaDatasource
+          name: vlogs-generic
+
+  - it: renders a separate datasource document per logsStorages entry
+    set:
+      logsStorages:
+        - name: generic
+          retentionPeriod: "1"
+          storage: 10Gi
+        - name: audit
+          retentionPeriod: "7"
+          storage: 10Gi
+    asserts:
+      - hasDocuments:
+          count: 2
diff --git a/packages/system/monitoring/tests/vlogs_logsstorages_required_test.yaml b/packages/system/monitoring/tests/vlogs_logsstorages_required_test.yaml
new file mode 100644
index 0000000000..30cb379ecf
--- /dev/null
+++ b/packages/system/monitoring/tests/vlogs_logsstorages_required_test.yaml
@@ -0,0 +1,41 @@
+suite: VLCluster rendering requires a non-empty logsStorages
+templates:
+  - templates/vlogs/vlogs.yaml
+
+release:
+  name: monitoring
+  namespace: tenant-root
+
+# logsStorages drives the VLCluster(s) that back platform log ingestion. An
+# empty list renders no VLCluster, so the monitoring-system HelmRelease
+# readiness gate has nothing to match and fluent-bit silently drops logs to a
+# non-existent vlinsert-generic (issue #3181). The template rejects that
+# outright rather than documenting it, so the misconfiguration is loud. These
+# cases pin both the valid default and the rejected empty configuration.
+tests:
+  - it: renders a VLCluster for the default (non-empty) logsStorages
+    asserts:
+      - containsDocument:
+          apiVersion: operator.victoriametrics.com/v1
+          kind: VLCluster
+          name: generic
+
+  - it: renders one VLCluster per logsStorages entry
+    set:
+      logsStorages:
+        - name: generic
+          retentionPeriod: "1"
+          storage: 10Gi
+        - name: audit
+          retentionPeriod: "7"
+          storage: 10Gi
+    asserts:
+      - hasDocuments:
+          count: 2
+
+  - it: fails the render when logsStorages is empty
+    set:
+      logsStorages: []
+    asserts:
+      - failedTemplate:
+          errorMessage: "monitoring: logsStorages must define at least one entry; an empty list renders no VLCluster and fluent-bit silently drops logs to a non-existent vlinsert-generic (issue #3181)"
diff --git a/packages/system/monitoring/tests/vmalert_notifiers_test.yaml b/packages/system/monitoring/tests/vmalert_notifiers_test.yaml
new file mode 100644
index 0000000000..6133b1f557
--- /dev/null
+++ b/packages/system/monitoring/tests/vmalert_notifiers_test.yaml
@@ -0,0 +1,55 @@
+suite: vmalert notifies every Alertmanager replica
+templates:
+  - templates/vm/vmalert.yaml
+  - templates/alerta/alerta.yaml
+
+release:
+  name: monitoring
+  namespace: tenant-root
+
+set:
+  _cluster:
+    root-host: example.org
+  _namespace:
+    host: tenant-root.example.org
+    ingress: tenant-root
+  metricsStorages:
+    - name: shortterm
+      retentionPeriod: "3d"
+      deduplicationInterval: "15s"
+
+# The Alertmanager cluster deduplicates notifications only when every replica
+# receives every alert. A notifier pointing at the headless Service reaches
+# one pod per connection, so an alert lives on whichever replica that
+# connection landed on and moves when vmalert reconnects. Each replica it
+# leaves sends a resolved notification and each one it reaches sends a new
+# firing one.
+tests:
+  - it: lists each Alertmanager pod as a notifier instead of the shared Service
+    template: templates/vm/vmalert.yaml
+    asserts:
+      - equal:
+          path: spec.notifiers
+          value:
+            - url: http://vmalertmanager-alertmanager-0.vmalertmanager-alertmanager.tenant-root.svc:9093
+            - url: http://vmalertmanager-alertmanager-1.vmalertmanager-alertmanager.tenant-root.svc:9093
+            - url: http://vmalertmanager-alertmanager-2.vmalertmanager-alertmanager.tenant-root.svc:9093
+
+  - it: runs as many Alertmanager replicas as vmalert has notifiers
+    template: templates/alerta/alerta.yaml
+    documentSelector:
+      path: kind
+      value: VMAlertmanager
+    asserts:
+      - equal:
+          path: spec.replicaCount
+          value: 3
+
+  - it: addresses the Alertmanager pods in the release namespace
+    template: templates/vm/vmalert.yaml
+    release:
+      namespace: tenant-foo
+    asserts:
+      - equal:
+          path: spec.notifiers[2].url
+          value: http://vmalertmanager-alertmanager-2.vmalertmanager-alertmanager.tenant-foo.svc:9093
diff --git a/packages/system/monitoring/tests/vpa_traces_test.yaml b/packages/system/monitoring/tests/vpa_traces_test.yaml
new file mode 100644
index 0000000000..38400cc83a
--- /dev/null
+++ b/packages/system/monitoring/tests/vpa_traces_test.yaml
@@ -0,0 +1,172 @@
+suite: VPA for the VictoriaTraces backend components
+templates:
+  - templates/vpa.yaml
+
+# Every metrics/logs component gets a VerticalPodAutoscaler so it is right-sized;
+# the trace components must too, or they sit at the operator's static defaults
+# forever with no way to size them (tracingStorages has no resource knobs). VPAs
+# use updateMode: Initial like the rest of this file (no eviction — see the file
+# header), which is also required for VTSingle's plain RWO PVC. Trace VPAs render
+# per tracingStorages entry, so an empty (off) list renders none.
+release:
+  name: monitoring
+  namespace: tenant-root
+
+tests:
+  - it: renders a VPA per cluster component (vtinsert/vtselect Deployment, vtstorage StatefulSet)
+    set:
+      tracingStorages:
+        - name: generic
+          mode: cluster
+          retentionPeriod: "14d"
+          storage: 10Gi
+    asserts:
+      - documentSelector:
+          path: metadata.name
+          value: vpa-vtinsert-generic
+        equal:
+          path: spec.targetRef.kind
+          value: Deployment
+      - documentSelector:
+          path: metadata.name
+          value: vpa-vtinsert-generic
+        equal:
+          path: spec.targetRef.name
+          value: vtinsert-generic
+      - documentSelector:
+          path: metadata.name
+          value: vpa-vtinsert-generic
+        equal:
+          path: spec.resourcePolicy.containerPolicies[0].containerName
+          value: vtinsert
+      - documentSelector:
+          path: metadata.name
+          value: vpa-vtselect-generic
+        equal:
+          path: spec.targetRef.kind
+          value: Deployment
+      - documentSelector:
+          path: metadata.name
+          value: vpa-vtstorage-generic
+        equal:
+          path: spec.targetRef.kind
+          value: StatefulSet
+      - documentSelector:
+          path: metadata.name
+          value: vpa-vtstorage-generic
+        equal:
+          path: spec.resourcePolicy.containerPolicies[0].containerName
+          value: vtstorage
+
+  - it: renders a single VTSingle VPA (Deployment) in single mode, updateMode Initial
+    set:
+      tracingStorages:
+        - name: generic
+          mode: single
+          retentionPeriod: "14d"
+          storage: 10Gi
+    asserts:
+      - documentSelector:
+          path: metadata.name
+          value: vpa-vtsingle-generic
+        equal:
+          path: spec.targetRef.kind
+          value: Deployment
+      - documentSelector:
+          path: metadata.name
+          value: vpa-vtsingle-generic
+        equal:
+          path: spec.updatePolicy.updateMode
+          value: Initial
+      - documentSelector:
+          path: metadata.name
+          value: vpa-vtsingle-generic
+        equal:
+          path: spec.resourcePolicy.containerPolicies[0].containerName
+          value: vtsingle
+      # No per-component cluster VPA in single mode.
+      - containsDocument:
+          apiVersion: autoscaling.k8s.io/v1
+          kind: VerticalPodAutoscaler
+          name: vpa-vtstorage-generic
+          any: true
+        not: true
+
+  - it: keeps the VPAs of the local stores central mode keeps
+    release:
+      namespace: tenant-foo
+    set:
+      _namespace:
+        tracingCentral: true
+      tracingStorages:
+        - name: generic
+          mode: cluster
+          retentionPeriod: "14d"
+          storage: 10Gi
+        - name: edge
+          mode: single
+          retentionPeriod: "7d"
+          storage: 10Gi
+    asserts:
+      - containsDocument:
+          apiVersion: autoscaling.k8s.io/v1
+          kind: VerticalPodAutoscaler
+          name: vpa-vtinsert-generic
+          any: true
+      - containsDocument:
+          apiVersion: autoscaling.k8s.io/v1
+          kind: VerticalPodAutoscaler
+          name: vpa-vtsingle-edge
+          any: true
+
+  - it: sizes the tenant-root shared-store vmauth like the other trace components
+    set:
+      tracingCentralHost: true
+      tracingStorages:
+        - name: generic
+          mode: cluster
+          retentionPeriod: "14d"
+          storage: 10Gi
+    documentSelector:
+      path: metadata.name
+      value: vpa-vmauth-traces-central
+    asserts:
+      - equal:
+          path: spec.targetRef
+          value:
+            apiVersion: apps/v1
+            kind: Deployment
+            name: vmauth-traces-central
+      - equal:
+          path: spec.updatePolicy.updateMode
+          value: Initial
+      - equal:
+          path: spec.resourcePolicy.containerPolicies[0].containerName
+          value: vmauth
+
+  - it: renders no vmauth VPA where no shared store is hosted
+    release:
+      namespace: tenant-foo
+    set:
+      tracingCentralHost: true
+      tracingStorages:
+        - name: generic
+          mode: cluster
+          retentionPeriod: "14d"
+          storage: 10Gi
+    asserts:
+      - containsDocument:
+          apiVersion: autoscaling.k8s.io/v1
+          kind: VerticalPodAutoscaler
+          name: vpa-vmauth-traces-central
+          any: true
+        not: true
+
+  - it: renders no trace VPA when tracingStorages is empty (tracing off)
+    asserts:
+      - containsDocument:
+          apiVersion: autoscaling.k8s.io/v1
+          kind: VerticalPodAutoscaler
+          name: vpa-vtinsert-generic
+          any: true
+        not: true
diff --git a/packages/system/monitoring/tests/vtraces_central_credentials_test.yaml b/packages/system/monitoring/tests/vtraces_central_credentials_test.yaml
new file mode 100644
index 0000000000..afc427755d
--- /dev/null
+++ b/packages/system/monitoring/tests/vtraces_central_credentials_test.yaml
@@ -0,0 +1,121 @@
+suite: shared-central traces credentials
+templates:
+  - templates/vtraces/central-credentials.yaml
+
+# The collector writes and Grafana reads through the tenant-root vmauth, each
+# with a login of its own, so the one Grafana holds cannot write past the
+# collector's rate limit. The chart owns them rather than the operator, which creates a
+# VMUser's Secret only while some VMAuth selects that user: without a central
+# store the collector would wait on a Secret that never appears.
+release:
+  name: monitoring
+  namespace: tenant-foo
+
+tests:
+  - it: generates the credentials for a central tenant
+    set:
+      _namespace:
+        tracingCentral: true
+    documentIndex: 0
+    asserts:
+      - hasDocuments:
+          count: 2
+      - isKind:
+          of: Secret
+      - equal:
+          path: metadata.name
+          value: traces-central-credentials
+      - equal:
+          path: stringData.username
+          value: tenant-foo
+      # Random by design; only its presence is the contract.
+      - matchRegex:
+          path: stringData.password
+          pattern: "^.+$"
+
+  - it: generates a separate read-only login for Grafana
+    set:
+      _namespace:
+        tracingCentral: true
+    documentIndex: 1
+    asserts:
+      - isKind:
+          of: Secret
+      - equal:
+          path: metadata.name
+          value: traces-central-reader-credentials
+      - equal:
+          path: stringData.username
+          value: tenant-foo.reader
+      - matchRegex:
+          path: stringData.password
+          pattern: "^.+$"
+
+  - it: preserves the existing password rather than rotating it
+    set:
+      _namespace:
+        tracingCentral: true
+    kubernetesProvider:
+      scheme:
+        "v1/Secret":
+          gvr:
+            version: "v1"
+            resource: "secrets"
+          namespaced: true
+      objects:
+        - kind: Secret
+          apiVersion: v1
+          metadata:
+            name: traces-central-credentials
+            namespace: tenant-foo
+          data:
+            # base64 of "tenant-foo" and "preserved-password"
+            username: dGVuYW50LWZvbw==
+            password: cHJlc2VydmVkLXBhc3N3b3Jk
+    asserts:
+      - documentIndex: 0
+        equal:
+          path: stringData.password
+          value: preserved-password
+      # Each login keeps its own password: the write password must never
+      # reach the Secret Grafana reads.
+      - documentIndex: 1
+        notEqual:
+          path: stringData.password
+          value: preserved-password
+
+  - it: preserves the read-only password rather than rotating it
+    set:
+      _namespace:
+        tracingCentral: true
+    kubernetesProvider:
+      scheme:
+        "v1/Secret":
+          gvr:
+            version: "v1"
+            resource: "secrets"
+          namespaced: true
+      objects:
+        - kind: Secret
+          apiVersion: v1
+          metadata:
+            name: traces-central-reader-credentials
+            namespace: tenant-foo
+          data:
+            # base64 of "tenant-foo.reader" and "preserved-reader"
+            username: dGVuYW50LWZvby5yZWFkZXI=
+            password: cHJlc2VydmVkLXJlYWRlcg==
+    asserts:
+      - documentIndex: 1
+        equal:
+          path: stringData.password
+          value: preserved-reader
+      - documentIndex: 0
+        notEqual:
+          path: stringData.password
+          value: preserved-reader
+
+  - it: renders no credentials outside central mode
+    asserts:
+      - hasDocuments:
+          count: 0
diff --git a/packages/system/monitoring/tests/vtraces_central_host_removal_test.yaml b/packages/system/monitoring/tests/vtraces_central_host_removal_test.yaml
new file mode 100644
index 0000000000..537eea51a5
--- /dev/null
+++ b/packages/system/monitoring/tests/vtraces_central_host_removal_test.yaml
@@ -0,0 +1,140 @@
+suite: tenant-root keeps hosting while central tenants depend on it
+templates:
+  - templates/vtraces/vmauth.yaml
+
+# Dropping the hosting (the flag, the generic store or its cluster mode) removes
+# the vmauth every central tenant writes through, and a tenant release that is
+# already in sync is not re-rendered, so its own check never runs. tenant-root's
+# live render therefore refuses while any central tenant is left.
+release:
+  name: monitoring
+  namespace: tenant-root
+
+tests:
+  - it: refuses to stop hosting while a central tenant still depends on it
+    set:
+      tracingStorages:
+        - name: generic
+          mode: cluster
+          storage: 10Gi
+    kubernetesProvider:
+      scheme: &scheme
+        "v1/Namespace":
+          gvr:
+            version: "v1"
+            resource: "namespaces"
+          namespaced: false
+        "operator.victoriametrics.com/v1beta1/VMUser":
+          gvr:
+            group: "operator.victoriametrics.com"
+            version: "v1beta1"
+            resource: "vmusers"
+          namespaced: true
+      objects:
+        - &root
+          kind: Namespace
+          apiVersion: v1
+          metadata:
+            name: tenant-root
+        - &reader
+          kind: VMUser
+          apiVersion: operator.victoriametrics.com/v1beta1
+          metadata:
+            name: traces-central
+            namespace: tenant-foo
+            labels:
+              tracing.cozystack.io/central-reader: "true"
+    asserts:
+      - failedTemplate:
+          errorMessage: "monitoring: tenant-root cannot stop hosting shared-central tracing while these tenants still use it: tenant-foo. Turn tracingCentral off on them first, then wait until each has reconciled its Monitoring and its VMUsers traces-central and traces-central-reader are gone."
+
+  # Each central tenant has a write and a read VMUser; it is named once.
+  - it: names a tenant once though both of its VMUsers remain
+    set:
+      tracingStorages:
+        - name: generic
+          mode: cluster
+          storage: 10Gi
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - *root
+        - *reader
+        - kind: VMUser
+          apiVersion: operator.victoriametrics.com/v1beta1
+          metadata:
+            name: traces-central-reader
+            namespace: tenant-foo
+            labels:
+              tracing.cozystack.io/central-reader: "true"
+    asserts:
+      - failedTemplate:
+          errorMessage: "monitoring: tenant-root cannot stop hosting shared-central tracing while these tenants still use it: tenant-foo. Turn tracingCentral off on them first, then wait until each has reconciled its Monitoring and its VMUsers traces-central and traces-central-reader are gone."
+
+  - it: keeps hosting without complaint when central tenants exist
+    set:
+      tracingCentralHost: true
+      tracingStorages:
+        - name: generic
+          mode: cluster
+          storage: 10Gi
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - *root
+        - *reader
+    asserts:
+      - hasDocuments:
+          count: 1
+
+  - it: stops hosting when no central tenant is left
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - *root
+        - kind: VMUser
+          apiVersion: operator.victoriametrics.com/v1beta1
+          metadata:
+            name: someone-else
+            namespace: tenant-foo
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  # A VMUser already being deleted belongs to a tenant on its way out, most
+  # often a namespace that is terminating; waiting on its finalizers would
+  # hold tenant-root back for no tenant that still exports.
+  - it: stops hosting when the only central VMUser left is being deleted
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - *root
+        - kind: VMUser
+          apiVersion: operator.victoriametrics.com/v1beta1
+          metadata:
+            name: traces-central
+            namespace: tenant-foo
+            deletionTimestamp: "2026-09-30T00:00:00Z"
+            finalizers:
+              - apps.victoriametrics.com/finalizer
+            labels:
+              tracing.cozystack.io/central-reader: "true"
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  - it: refuses the host flag without a store it could host
+    set:
+      tracingCentralHost: true
+      tracingStorages:
+        - name: generic
+          mode: single
+          storage: 10Gi
+    asserts:
+      - failedTemplate:
+          errorMessage: 'monitoring: tracingCentralHost is set, but tracingStorages has no entry named "generic" in cluster mode to host the shared store in.'
+
+  - it: does not refuse an offline render, which cannot see the tenants
+    asserts:
+      - hasDocuments:
+          count: 0
diff --git a/packages/system/monitoring/tests/vtraces_central_prereq_test.yaml b/packages/system/monitoring/tests/vtraces_central_prereq_test.yaml
new file mode 100644
index 0000000000..5977f6d060
--- /dev/null
+++ b/packages/system/monitoring/tests/vtraces_central_prereq_test.yaml
@@ -0,0 +1,75 @@
+suite: shared-central tracing needs the tenant-root store
+templates:
+  - templates/vtraces/vmuser.yaml
+
+# Without the tenant-root VMAuth every export fails while every object reports
+# Ready, so a live render refuses central mode until it exists. An offline
+# render cannot see the cluster and is not refused.
+release:
+  name: monitoring
+  namespace: tenant-foo
+
+tests:
+  - it: refuses central mode on a live cluster with no shared store in tenant-root
+    set:
+      _namespace:
+        tracingCentral: true
+    kubernetesProvider:
+      scheme: &scheme
+        "v1/Namespace":
+          gvr:
+            version: "v1"
+            resource: "namespaces"
+          namespaced: false
+        "operator.victoriametrics.com/v1beta1/VMAuth":
+          gvr:
+            group: "operator.victoriametrics.com"
+            version: "v1beta1"
+            resource: "vmauths"
+          namespaced: true
+      objects:
+        - &ns
+          kind: Namespace
+          apiVersion: v1
+          metadata:
+            name: tenant-foo
+            uid: 3f0e7a1c-5b2d-4c8e-9a6f-1d2e3c4b5a69
+    asserts:
+      - failedTemplate:
+          errorMessage: 'monitoring: shared-central tracing is on for this tenant, but tenant-root does not host a shared traces store (VMAuth tenant-root/traces-central is missing), so every span would be dropped. In the tenant-root Monitoring set tracingCentralHost: true with a tracingStorages entry named "generic" in cluster mode, or turn tracingCentral off for this tenant.'
+
+  - it: renders central mode once the shared store exists
+    set:
+      _namespace:
+        tracingCentral: true
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - *ns
+        - kind: VMAuth
+          apiVersion: operator.victoriametrics.com/v1beta1
+          metadata:
+            name: traces-central
+            namespace: tenant-root
+    asserts:
+      # The write and the read-only login.
+      - hasDocuments:
+          count: 2
+
+  - it: does not refuse an offline render, which cannot see the cluster
+    set:
+      _namespace:
+        tracingCentral: true
+    asserts:
+      # The write and the read-only login.
+      - hasDocuments:
+          count: 2
+
+  - it: does not look for the shared store in local mode
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - *ns
+    asserts:
+      - hasDocuments:
+          count: 0
diff --git a/packages/system/monitoring/tests/vtraces_central_ratelimit_test.yaml b/packages/system/monitoring/tests/vtraces_central_ratelimit_test.yaml
new file mode 100644
index 0000000000..11c45cd122
--- /dev/null
+++ b/packages/system/monitoring/tests/vtraces_central_ratelimit_test.yaml
@@ -0,0 +1,283 @@
+suite: shared-central tracing holds each tenant to a write rate
+# A store sharing one disk among tenants is protected by its disk cap only as
+# long as no tenant writes faster than the cap can absorb: VictoriaTraces always
+# keeps the last two days, so a tenant that fills the cap within two days fills
+# the disk for all of them. The platform sets the rate, it reaches every tenant
+# in _cluster, and each central tenant's collector enforces it.
+templates:
+  - templates/vtraces/collector.yaml
+
+release:
+  name: monitoring
+  namespace: tenant-foo
+
+tests:
+  - it: limits a central tenant's collector to the rate the platform sets
+    template: templates/vtraces/collector.yaml
+    set:
+      _cluster:
+        tracing-central-tenant-bytes-per-second: "100000"
+      _namespace:
+        tracingCentral: true
+      tracingCollector:
+        replicas: 1
+    documentSelector:
+      path: kind
+      value: ConfigMap
+    asserts:
+      - matchRegex:
+          path: data["config.yaml"]
+          pattern: "(?m)^  ratelimit/tenant:\\n    strategy: bytes\\n    rate: 100000\\n    burst: 5242880\\n    throttle_behavior: error$"
+      # Before batch: the batch processor sends asynchronously, so a refusal
+      # behind it would never reach the application and its spans would be
+      # dropped without the sender knowing. Right after memory_limiter: the
+      # sampler adds a tracestate to every span it keeps and resource/tenant
+      # an attribute to every resource, either of which would push a request
+      # the receiver admitted at its cap past burst, and such a request never
+      # passes.
+      - matchRegex:
+          path: data["config.yaml"]
+          pattern: "processors: \\[memory_limiter, ratelimit/tenant, probabilistic_sampler, resource/tenant, batch\\]"
+
+  - it: counts a request before redaction as well
+    template: templates/vtraces/collector.yaml
+    set:
+      _namespace:
+        tracingCentral: true
+      tracingCollector:
+        replicas: 1
+        redactAttributes:
+          - http.request.header.authorization
+    documentSelector:
+      path: kind
+      value: ConfigMap
+    asserts:
+      - matchRegex:
+          path: data["config.yaml"]
+          pattern: "processors: \\[memory_limiter, ratelimit/tenant, probabilistic_sampler, attributes/redact, resource/tenant, batch\\]"
+
+  - it: splits the tenant rate across collector replicas
+    template: templates/vtraces/collector.yaml
+    set:
+      _cluster:
+        tracing-central-tenant-bytes-per-second: "100000"
+      _namespace:
+        tracingCentral: true
+      tracingCollector:
+        replicas: 3
+    documentSelector:
+      path: kind
+      value: ConfigMap
+    asserts:
+      - matchRegex:
+          path: data["config.yaml"]
+          pattern: "(?m)^    rate: 33334$"
+
+  # A request larger than burst can never pass the limiter, so burst never
+  # drops below what one second of the rate needs.
+  - it: raises burst to one second of a rate above 5 MiB per second
+    template: templates/vtraces/collector.yaml
+    set:
+      _cluster:
+        tracing-central-tenant-bytes-per-second: "200000000"
+      _namespace:
+        tracingCentral: true
+      tracingCollector:
+        replicas: 1
+    documentSelector:
+      path: kind
+      value: ConfigMap
+    asserts:
+      - matchRegex:
+          path: data["config.yaml"]
+          pattern: "(?m)^    rate: 200000000\\n    burst: 200000000$"
+
+  # Without a rate from the platform, and on one that is not a positive number,
+  # the collector holds the tenant to the default: floor(2 vtstorage replicas *
+  # 80% of a 10Gi volume / 172800 s), never to no limit.
+  - it: falls back to the default rate when the platform sets none
+    template: templates/vtraces/collector.yaml
+    set:
+      _namespace:
+        tracingCentral: true
+      tracingCollector:
+        replicas: 1
+    documentSelector:
+      path: kind
+      value: ConfigMap
+    asserts:
+      - matchRegex:
+          path: data["config.yaml"]
+          pattern: "(?m)^    rate: 99420$"
+
+  - it: falls back to the default rate on a value that is not a positive number
+    template: templates/vtraces/collector.yaml
+    set:
+      _cluster:
+        tracing-central-tenant-bytes-per-second: "fast"
+      _namespace:
+        tracingCentral: true
+      tracingCollector:
+        replicas: 1
+    documentSelector:
+      path: kind
+      value: ConfigMap
+    asserts:
+      - matchRegex:
+          path: data["config.yaml"]
+          pattern: "(?m)^    rate: 99420$"
+
+  # int64 returns 0 for digits beyond int64, which the processor refuses at
+  # start; the platform never writes such a value, but a collector that cannot
+  # start would take the tenant's tracing down with it.
+  - it: falls back to the default rate on digits beyond int64
+    template: templates/vtraces/collector.yaml
+    set:
+      _cluster:
+        tracing-central-tenant-bytes-per-second: "99999999999999999999"
+      _namespace:
+        tracingCentral: true
+      tracingCollector:
+        replicas: 1
+    documentSelector:
+      path: kind
+      value: ConfigMap
+    asserts:
+      - matchRegex:
+          path: data["config.yaml"]
+          pattern: "(?m)^    rate: 99420$"
+
+  - it: falls back to the default rate on 0
+    template: templates/vtraces/collector.yaml
+    set:
+      _cluster:
+        tracing-central-tenant-bytes-per-second: "0"
+      _namespace:
+        tracingCentral: true
+      tracingCollector:
+        replicas: 1
+    documentSelector:
+      path: kind
+      value: ConfigMap
+    asserts:
+      - matchRegex:
+          path: data["config.yaml"]
+          pattern: "(?m)^    rate: 99420$"
+
+  - it: falls back to the default rate on -1
+    template: templates/vtraces/collector.yaml
+    set:
+      _cluster:
+        tracing-central-tenant-bytes-per-second: "-1"
+      _namespace:
+        tracingCentral: true
+      tracingCollector:
+        replicas: 1
+    documentSelector:
+      path: kind
+      value: ConfigMap
+    asserts:
+      - matchRegex:
+          path: data["config.yaml"]
+          pattern: "(?m)^    rate: 99420$"
+
+  # The limiter sees requests the receiver admits, so the receiver caps them at
+  # 3 MiB, decompressed for HTTP. The limiter counts a request as the collector
+  # re-encodes it, which is larger: pdata writes the empty value of an
+  # attribute the wire may omit, so a valid request of spans with empty-valued
+  # attributes is counted 1.4x. 1.4 x 3 MiB stays below the 5 MiB burst, so an
+  # admitted request always fits it; a 4 MiB cap would not, and a larger burst
+  # would be what each new pod lets through above the rate.
+  - it: caps a central collector's requests so their re-encoding fits the burst floor
+    template: templates/vtraces/collector.yaml
+    set:
+      _namespace:
+        tracingCentral: true
+      tracingCollector:
+        replicas: 1
+    documentSelector:
+      path: kind
+      value: ConfigMap
+    asserts:
+      - matchRegex:
+          path: data["config.yaml"]
+          pattern: "(?m)^      grpc:\\n        endpoint: 0\\.0\\.0\\.0:4317\\n        max_recv_msg_size_mib: 3$"
+      - matchRegex:
+          path: data["config.yaml"]
+          pattern: "(?m)^      http:\\n        endpoint: 0\\.0\\.0\\.0:4318\\n        max_request_body_size: 3145728$"
+
+  - it: leaves a local collector's request size at the receiver defaults
+    template: templates/vtraces/collector.yaml
+    set:
+      tracingStorages:
+        - name: generic
+          mode: cluster
+          storage: 10Gi
+    documentSelector:
+      path: kind
+      value: ConfigMap
+    asserts:
+      - notMatchRegex:
+          path: data["config.yaml"]
+          pattern: "max_recv_msg_size_mib|max_request_body_size"
+
+  - it: sets no rate limit on a collector writing to its own store
+    template: templates/vtraces/collector.yaml
+    set:
+      tracingStorages:
+        - name: generic
+          mode: cluster
+          storage: 10Gi
+    documentSelector:
+      path: kind
+      value: ConfigMap
+    asserts:
+      - notMatchRegex:
+          path: data["config.yaml"]
+          pattern: "ratelimit"
+
+  # Each replica starts with a full bucket, so the replica count bounds what a
+  # central tenant writes above its rate on a rollout. A collector writing to
+  # the tenant's own store has no rate, so its replica count stays free.
+  - it: refuses more than ten replicas for a central tenant's collector
+    template: templates/vtraces/collector.yaml
+    set:
+      _namespace:
+        tracingCentral: true
+      tracingCollector:
+        replicas: 11
+    asserts:
+      - failedTemplate:
+          errorPattern: "shared-central tracing allows at most 10 collector replicas"
+
+  - it: accepts ten replicas for a central tenant's collector
+    template: templates/vtraces/collector.yaml
+    set:
+      _namespace:
+        tracingCentral: true
+      tracingCollector:
+        replicas: 10
+    documentSelector:
+      path: kind
+      value: Deployment
+    asserts:
+      - equal:
+          path: spec.replicas
+          value: 10
+
+  - it: accepts more than ten replicas for a collector writing to its own store
+    template: templates/vtraces/collector.yaml
+    set:
+      tracingStorages:
+        - name: generic
+          mode: cluster
+          storage: 10Gi
+      tracingCollector:
+        replicas: 12
+    documentSelector:
+      path: kind
+      value: Deployment
+    asserts:
+      - equal:
+          path: spec.replicas
+          value: 12
diff --git a/packages/system/monitoring/tests/vtraces_central_read_test.yaml b/packages/system/monitoring/tests/vtraces_central_read_test.yaml
new file mode 100644
index 0000000000..31e2518a6c
--- /dev/null
+++ b/packages/system/monitoring/tests/vtraces_central_read_test.yaml
@@ -0,0 +1,405 @@
+suite: shared-central traces read path
+templates:
+  - templates/vtraces/vmauth.yaml
+  - templates/vtraces/vmuser.yaml
+  - templates/vtraces/grafana-datasource.yaml
+  - templates/vtraces/vtraces.yaml
+
+# Expected IDs are sha256 values computed outside helm (python hashlib): of the
+# namespace name in an offline render, of "<name>:<uid>" when the namespace is
+# known.
+tests:
+  - it: fronts the shared generic store with a VMAuth in tenant-root
+    release:
+      namespace: tenant-root
+    set:
+      tracingCentralHost: true
+      tracingStorages:
+        - name: generic
+          mode: cluster
+          storage: 10Gi
+    template: templates/vtraces/vmauth.yaml
+    asserts:
+      - hasDocuments:
+          count: 1
+      - isKind:
+          of: VMAuth
+      - equal:
+          path: metadata.name
+          value: traces-central
+      - equal:
+          path: spec.selectAllByDefault
+          value: false
+      - equal:
+          path: spec.internalListenPort
+          value: "8426"
+      # Two replicas are what make maxUnavailable: 1 leave one serving.
+      - equal:
+          path: spec.replicaCount
+          value: 2
+      # Every central tenant writes and reads through this one vmauth, so a
+      # single node drain must not take both replicas down.
+      - equal:
+          path: spec.podDisruptionBudget
+          value:
+            maxUnavailable: 1
+      - equal:
+          path: spec.topologySpreadConstraints
+          value:
+            - maxSkew: 1
+              topologyKey: kubernetes.io/hostname
+              whenUnsatisfiable: ScheduleAnyway
+              labelSelector:
+                matchLabels:
+                  app.kubernetes.io/name: vmauth
+                  app.kubernetes.io/instance: traces-central
+      # Its config-init and config-reloader read the config Secret from the
+      # apiserver, which tenant egress allows only to pods carrying this label.
+      - equal:
+          path: spec.podMetadata.labels["policy.cozystack.io/allow-to-apiserver"]
+          value: "true"
+      - equal:
+          path: spec.userSelector
+          value:
+            matchLabels:
+              tracing.cozystack.io/central-reader: "true"
+      - equal:
+          path: spec.userNamespaceSelector
+          value:
+            matchExpressions:
+              - key: namespace.cozystack.io/monitoring
+                operator: Exists
+
+  # A store named generic is also tenant-root's own; accepting other tenants'
+  # spans into it is a separate decision.
+  - it: renders no VMAuth in tenant-root that did not opt in to hosting
+    release:
+      namespace: tenant-root
+    set:
+      tracingStorages:
+        - name: generic
+          mode: cluster
+          storage: 10Gi
+    template: templates/vtraces/vmauth.yaml
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  - it: treats a tracingCentralHost string other than true as no consent
+    release:
+      namespace: tenant-root
+    set:
+      tracingCentralHost: "no"
+      tracingStorages:
+        - name: generic
+          mode: cluster
+          storage: 10Gi
+    template: templates/vtraces/vmauth.yaml
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  - it: refuses hosting in tenant-root without a generic store
+    release:
+      namespace: tenant-root
+    set:
+      tracingCentralHost: true
+      tracingStorages:
+        - name: other
+          mode: cluster
+          storage: 10Gi
+    template: templates/vtraces/vmauth.yaml
+    asserts:
+      - failedTemplate:
+          errorMessage: 'monitoring: tracingCentralHost is set, but tracingStorages has no entry named "generic" in cluster mode to host the shared store in.'
+
+  - it: refuses hosting on a single-mode generic store, which has no vtselect
+    release:
+      namespace: tenant-root
+    set:
+      tracingCentralHost: true
+      tracingStorages:
+        - name: generic
+          mode: single
+          storage: 10Gi
+    template: templates/vtraces/vmauth.yaml
+    asserts:
+      - failedTemplate:
+          errorMessage: 'monitoring: tracingCentralHost is set, but tracingStorages has no entry named "generic" in cluster mode to host the shared store in.'
+
+  - it: renders no VMAuth outside tenant-root
+    release:
+      namespace: tenant-foo
+    set:
+      tracingCentralHost: true
+      tracingStorages:
+        - name: generic
+          mode: cluster
+          storage: 10Gi
+    template: templates/vtraces/vmauth.yaml
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  # The collector holds the tenant to its write rate, so the only login that
+  # may write is the collector's. Grafana gets a login that can only read:
+  # vmauth cleans the request path before it picks a route, so a write sent
+  # through a Grafana datasource proxy as ../insert would otherwise reach
+  # vtinsert past the limiter.
+  - it: gives a central tenant a write login pinned to its own account
+    release:
+      namespace: tenant-foo
+    set:
+      _namespace:
+        tracingCentral: true
+    template: templates/vtraces/vmuser.yaml
+    documentIndex: 0
+    asserts:
+      - hasDocuments:
+          count: 2
+      - isKind:
+          of: VMUser
+      - equal:
+          path: metadata.name
+          value: traces-central
+      - equal:
+          path: metadata.labels["tracing.cozystack.io/central-reader"]
+          value: "true"
+      # The default username is metadata.name, the same in every tenant.
+      - equal:
+          path: spec.username
+          value: tenant-foo
+      # The chart owns the credentials; the operator must not generate a
+      # second password it only publishes once a VMAuth selects this user.
+      - equal:
+          path: spec.passwordRef
+          value:
+            name: traces-central-credentials
+            key: password
+      - equal:
+          path: spec.disable_secret_creation
+          value: true
+      - notExists:
+          path: spec.generatePassword
+      # One tenant must not take all of the shared vmauth: past this many
+      # requests in flight vmauth answers 429, which the exporter retries.
+      - equal:
+          path: spec.max_concurrent_requests
+          value: 4
+      - equal:
+          path: spec.targetRefs
+          value:
+            - crd:
+                kind: VTCluster/vtinsert
+                name: generic
+                namespace: tenant-root
+              paths:
+                - /insert/opentelemetry/v1/traces
+              headers:
+                - "AccountID: 3333747902"
+                - "ProjectID: 2511166196"
+
+  - it: gives a central tenant a read-only login pinned to the same account
+    release:
+      namespace: tenant-foo
+    set:
+      _namespace:
+        tracingCentral: true
+    template: templates/vtraces/vmuser.yaml
+    documentIndex: 1
+    asserts:
+      - isKind:
+          of: VMUser
+      - equal:
+          path: metadata.name
+          value: traces-central-reader
+      - equal:
+          path: metadata.labels["tracing.cozystack.io/central-reader"]
+          value: "true"
+      # A namespace name holds no dot, so no tenant's write login can share it.
+      - equal:
+          path: spec.username
+          value: tenant-foo.reader
+      - equal:
+          path: spec.passwordRef
+          value:
+            name: traces-central-reader-credentials
+            key: password
+      - equal:
+          path: spec.disable_secret_creation
+          value: true
+      - notExists:
+          path: spec.generatePassword
+      - equal:
+          path: spec.max_concurrent_requests
+          value: 4
+      - equal:
+          path: spec.targetRefs
+          value:
+            - crd:
+                kind: VTCluster/vtselect
+                name: generic
+                namespace: tenant-root
+              paths:
+                - /select/jaeger/.*
+              headers:
+                - "AccountID: 3333747902"
+                - "ProjectID: 2511166196"
+
+  # A tenant re-created under a deleted tenant's name must not get its spans.
+  - it: derives the account from the namespace UID as well as its name
+    release:
+      namespace: tenant-foo
+    set:
+      _namespace:
+        tracingCentral: true
+    kubernetesProvider:
+      scheme:
+        "v1/Namespace":
+          gvr:
+            version: "v1"
+            resource: "namespaces"
+          namespaced: false
+        "operator.victoriametrics.com/v1beta1/VMAuth":
+          gvr:
+            group: "operator.victoriametrics.com"
+            version: "v1beta1"
+            resource: "vmauths"
+          namespaced: true
+      objects:
+        - kind: Namespace
+          apiVersion: v1
+          metadata:
+            name: tenant-foo
+            uid: 3f0e7a1c-5b2d-4c8e-9a6f-1d2e3c4b5a69
+        - kind: VMAuth
+          apiVersion: operator.victoriametrics.com/v1beta1
+          metadata:
+            name: traces-central
+            namespace: tenant-root
+    template: templates/vtraces/vmuser.yaml
+    asserts:
+      - documentIndex: 0
+        equal:
+          path: spec.targetRefs[0].headers
+          value:
+            - "AccountID: 3341781467"
+            - "ProjectID: 10782784"
+      - documentIndex: 1
+        equal:
+          path: spec.targetRefs[0].headers
+          value:
+            - "AccountID: 3341781467"
+            - "ProjectID: 10782784"
+
+  - it: gives a different tenant a different account, including IDs above 2^31
+    release:
+      namespace: tenant-bar
+    set:
+      _namespace:
+        tracingCentral: true
+    template: templates/vtraces/vmuser.yaml
+    asserts:
+      - documentIndex: 0
+        equal:
+          path: spec.targetRefs[0].headers
+          value:
+            - "AccountID: 4290741035"
+            - "ProjectID: 2806397044"
+
+  # A backend value in the Monitoring application is not a switch.
+  - it: ignores a backend value set in the Monitoring application
+    release:
+      namespace: tenant-foo
+    set:
+      tracingCollector:
+        backend: central
+    template: templates/vtraces/vmuser.yaml
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  - it: never treats tenant-root as a central tenant, so its store stays rendered
+    release:
+      namespace: tenant-root
+    set:
+      _namespace:
+        tracingCentral: true
+      tracingStorages:
+        - name: generic
+          mode: cluster
+          storage: 10Gi
+    templates:
+      - templates/vtraces/vmuser.yaml
+      - templates/vtraces/vtraces.yaml
+    asserts:
+      - template: templates/vtraces/vmuser.yaml
+        hasDocuments:
+          count: 0
+      - template: templates/vtraces/vtraces.yaml
+        containsDocument:
+          apiVersion: operator.victoriametrics.com/v1
+          kind: VTCluster
+          name: generic
+
+  # Only a real true switches it on; a string that merely reads truthy does not.
+  - it: treats a tracingCentral string other than true as off
+    release:
+      namespace: tenant-foo
+    set:
+      _namespace:
+        tracingCentral: "false"
+    template: templates/vtraces/vmuser.yaml
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  - it: renders no VMUser in local mode
+    release:
+      namespace: tenant-foo
+    template: templates/vtraces/vmuser.yaml
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  - it: points a central tenant's datasource at vmauth with the read-only login
+    release:
+      namespace: tenant-foo
+    set:
+      _namespace:
+        tracingCentral: true
+    template: templates/vtraces/grafana-datasource.yaml
+    asserts:
+      - hasDocuments:
+          count: 1
+      - equal:
+          path: metadata.name
+          value: traces-central
+      - equal:
+          path: spec.datasource.type
+          value: jaeger
+      - equal:
+          path: spec.datasource.url
+          value: http://vmauth-traces-central.tenant-root.svc:8427/select/jaeger
+      - equal:
+          path: spec.datasource.basicAuth
+          value: true
+      - equal:
+          path: spec.datasource.basicAuthUser
+          value: ${username}
+      - equal:
+          path: spec.datasource.secureJsonData.basicAuthPassword
+          value: ${password}
+      - equal:
+          path: spec.valuesFrom
+          value:
+            - targetPath: basicAuthUser
+              valueFrom:
+                secretKeyRef:
+                  name: traces-central-reader-credentials
+                  key: username
+            - targetPath: secureJsonData.basicAuthPassword
+              valueFrom:
+                secretKeyRef:
+                  name: traces-central-reader-credentials
+                  key: password
diff --git a/packages/system/monitoring/tests/vtraces_collector_test.yaml b/packages/system/monitoring/tests/vtraces_collector_test.yaml
new file mode 100644
index 0000000000..b450bf520e
--- /dev/null
+++ b/packages/system/monitoring/tests/vtraces_collector_test.yaml
@@ -0,0 +1,483 @@
+suite: OTLP traces collector
+templates:
+  - templates/vtraces/collector.yaml
+
+release:
+  name: monitoring
+  namespace: tenant-root
+
+# The per-tenant OpenTelemetry Collector is the app-facing OTLP gateway and
+# trust boundary: it receives OTLP, head-samples, optionally redacts, and
+# exports over OTLP/HTTP to the tracingStorages backend. tracingStorages is
+# empty by default (tracing off), so the collector renders only when a backend
+# is configured AND tracingCollector.enabled is true. These cases configure a
+# backend at the suite level; the off-states override it.
+set:
+  tracingStorages:
+    - name: generic
+      mode: cluster
+      retentionPeriod: "14d"
+      storage: 10Gi
+tests:
+  - it: renders nothing by default when tracingStorages is empty (tracing off)
+    set:
+      tracingStorages: []
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  - it: renders exactly the ConfigMap, Deployment and Service when enabled
+    asserts:
+      - hasDocuments:
+          count: 3
+
+  - it: renders the collector ConfigMap
+    documentSelector:
+      path: kind
+      value: ConfigMap
+    asserts:
+      - isKind:
+          of: ConfigMap
+      - equal:
+          path: metadata.name
+          value: otel-traces
+
+  - it: renders the collector Deployment
+    documentSelector:
+      path: kind
+      value: Deployment
+    asserts:
+      - isKind:
+          of: Deployment
+      - equal:
+          path: metadata.name
+          value: otel-traces
+
+  - it: renders the collector Service
+    documentSelector:
+      path: kind
+      value: Service
+    asserts:
+      - isKind:
+          of: Service
+      - equal:
+          path: metadata.name
+          value: otel-traces
+
+  - it: renders nothing when the collector is disabled
+    set:
+      tracingCollector:
+        enabled: false
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  - it: fails the render when an enabled collector fronts more than one backend
+    set:
+      tracingStorages:
+        - name: generic
+          mode: cluster
+          retentionPeriod: "14d"
+          storage: 10Gi
+        - name: audit
+          mode: single
+          retentionPeriod: "7d"
+          storage: 10Gi
+    asserts:
+      - failedTemplate:
+          errorMessage: "monitoring: tracingCollector fronts a single traces backend, but tracingStorages has more than one entry — the collector would export to the first and leave the rest empty. Reduce tracingStorages to one entry or set tracingCollector.enabled=false (apps then send OTLP straight to each backend)."
+
+  - it: allows more than one backend when the collector is disabled
+    set:
+      tracingCollector:
+        enabled: false
+      tracingStorages:
+        - name: generic
+          mode: cluster
+          retentionPeriod: "14d"
+          storage: 10Gi
+        - name: audit
+          mode: single
+          retentionPeriod: "7d"
+          storage: 10Gi
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  # Central mode keeps the local stores and turning it off exports to them
+  # again, so the one-store limit holds in both modes: checked at the switch
+  # on, not first discovered when the parent turns central off.
+  - it: refuses more than one local entry in central mode too
+    release:
+      namespace: tenant-foo
+    set:
+      _namespace:
+        tracingCentral: true
+      tracingStorages:
+        - name: generic
+          mode: cluster
+          retentionPeriod: "14d"
+          storage: 10Gi
+        - name: audit
+          mode: single
+          retentionPeriod: "7d"
+          storage: 10Gi
+    asserts:
+      - failedTemplate:
+          errorMessage: "monitoring: tracingCollector fronts a single traces backend, but tracingStorages has more than one entry: once shared-central tracing is turned off, the collector would export to the first and leave the rest empty. Reduce tracingStorages to one entry or set tracingCollector.enabled=false."
+
+  - it: exports through the tenant-root vmauth and stamps the tenant in central mode
+    release:
+      namespace: tenant-foo
+    set:
+      _namespace:
+        tracingCentral: true
+      tracingCollector:
+        enabled: true
+      tracingStorages: []
+    documentSelector:
+      path: kind
+      value: ConfigMap
+    asserts:
+      - matchRegex:
+          path: data["config.yaml"]
+          pattern: "traces_endpoint: http://vmauth-traces-central\\.tenant-root\\.svc:8427/insert/opentelemetry/v1/traces\\n"
+      - matchRegex:
+          path: data["config.yaml"]
+          pattern: "key: cozystack.tenant\\n        value: tenant-foo\\n"
+      - matchRegex:
+          path: data["config.yaml"]
+          pattern: "processors: \\[memory_limiter, ratelimit/tenant, probabilistic_sampler, resource/tenant, batch\\]"
+
+  - it: stamps each tenant with its own namespace
+    release:
+      namespace: tenant-bar
+    set:
+      _namespace:
+        tracingCentral: true
+      tracingStorages: []
+    documentSelector:
+      path: kind
+      value: ConfigMap
+    asserts:
+      - matchRegex:
+          path: data["config.yaml"]
+          pattern: "key: cozystack.tenant\\n        value: tenant-bar\\n"
+
+  - it: authenticates the central export with the VMUser credentials
+    release:
+      namespace: tenant-foo
+    set:
+      _namespace:
+        tracingCentral: true
+      tracingCollector:
+        enabled: true
+      tracingStorages: []
+    documentSelector:
+      path: kind
+      value: ConfigMap
+    asserts:
+      - matchRegex:
+          path: data["config.yaml"]
+          pattern: "(?s)otlphttp/victoriatraces:\\n    traces_endpoint: \\S+\\n    auth:\\n      authenticator: basicauth/vmauth\\n"
+      - matchRegex:
+          path: data["config.yaml"]
+          pattern: "basicauth/vmauth:\\n    client_auth:\\n      username: \\$\\{env:VMAUTH_USERNAME\\}\\n      password: \\$\\{env:VMAUTH_PASSWORD\\}\\n"
+      - matchRegex:
+          path: data["config.yaml"]
+          pattern: "extensions: \\[health_check, basicauth/vmauth\\]"
+      # Writes must fit under the VMUser's request limit and leave room for the
+      # tenant's Grafana reads, which share it.
+      - matchRegex:
+          path: data["config.yaml"]
+          pattern: "(?s)otlphttp/victoriatraces:\\n.*    sending_queue:\\n      num_consumers: 2\\n"
+      - notMatchRegex:
+          path: data["config.yaml"]
+          pattern: "AccountID|ProjectID|include_metadata|headers_setter"
+
+  - it: reads the VMUser credentials from the chart-owned Secret
+    release:
+      namespace: tenant-foo
+    set:
+      _namespace:
+        tracingCentral: true
+      tracingCollector:
+        enabled: true
+      tracingStorages: []
+    documentSelector:
+      path: kind
+      value: Deployment
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].env
+          value:
+            - name: VMAUTH_USERNAME
+              valueFrom:
+                secretKeyRef:
+                  name: traces-central-credentials
+                  key: username
+            - name: VMAUTH_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: traces-central-credentials
+                  key: password
+
+  # The collector reads its login at start, so a changed password must roll it.
+  # Expected: sha256("preserved-password"), computed outside helm.
+  - it: rolls the collector when its credentials change
+    release:
+      namespace: tenant-foo
+    set:
+      _namespace:
+        tracingCentral: true
+      tracingStorages: []
+    kubernetesProvider:
+      scheme:
+        "v1/Secret":
+          gvr:
+            version: "v1"
+            resource: "secrets"
+          namespaced: true
+      objects:
+        - kind: Secret
+          apiVersion: v1
+          metadata:
+            name: traces-central-credentials
+            namespace: tenant-foo
+          data:
+            username: dGVuYW50LWZvbw==
+            password: cHJlc2VydmVkLXBhc3N3b3Jk
+    documentSelector:
+      path: kind
+      value: Deployment
+    asserts:
+      - equal:
+          path: spec.template.metadata.annotations["checksum/credentials"]
+          value: 4a7b30942acd20b646228ac2775efdab90761871e054986f9b28279d3e03959d
+
+  - it: sends no credentials or account headers to a local backend
+    release:
+      namespace: tenant-foo
+    asserts:
+      - notMatchRegex:
+          path: data["config.yaml"]
+          pattern: "AccountID|ProjectID|basicauth|vmauth"
+        documentSelector:
+          path: kind
+          value: ConfigMap
+      - notExists:
+          path: spec.template.spec.containers[0].env
+        documentSelector:
+          path: kind
+          value: Deployment
+      - notExists:
+          path: spec.template.metadata.annotations["checksum/credentials"]
+        documentSelector:
+          path: kind
+          value: Deployment
+
+  - it: renders the collector in central mode with no local tracingStorages
+    release:
+      namespace: tenant-foo
+    set:
+      _namespace:
+        tracingCentral: true
+      tracingCollector:
+        enabled: true
+      tracingStorages: []
+    asserts:
+      - hasDocuments:
+          count: 3
+
+  - it: honours the configured replica count
+    set:
+      tracingCollector:
+        enabled: true
+        replicas: 2
+    documentSelector:
+      path: kind
+      value: Deployment
+    asserts:
+      - equal:
+          path: spec.replicas
+          value: 2
+
+  - it: exposes the OTLP gRPC and HTTP ports on the app-facing Service
+    documentSelector:
+      path: kind
+      value: Service
+    asserts:
+      - contains:
+          path: spec.ports
+          content:
+            name: otlp-grpc
+            port: 4317
+            targetPort: 4317
+            protocol: TCP
+      - contains:
+          path: spec.ports
+          content:
+            name: otlp-http
+            port: 4318
+            targetPort: 4318
+            protocol: TCP
+
+  - it: exports to the cluster vtinsert OTLP/HTTP endpoint by default
+    documentSelector:
+      path: kind
+      value: ConfigMap
+    asserts:
+      - matchRegex:
+          path: data["config.yaml"]
+          pattern: "traces_endpoint: http://vtinsert-generic\\.tenant-root\\.svc:10481/insert/opentelemetry/v1/traces"
+
+  - it: exports to the VTSingle OTLP/HTTP endpoint in single mode
+    set:
+      tracingStorages:
+        - name: generic
+          mode: single
+          retentionPeriod: "14d"
+          storage: 10Gi
+    documentSelector:
+      path: kind
+      value: ConfigMap
+    asserts:
+      - matchRegex:
+          path: data["config.yaml"]
+          pattern: "traces_endpoint: http://vtsingle-generic\\.tenant-root\\.svc:10428/insert/opentelemetry/v1/traces"
+
+  - it: applies the configured head-sampling percentage
+    set:
+      tracingCollector:
+        enabled: true
+        samplingPercentage: 25
+    documentSelector:
+      path: kind
+      value: ConfigMap
+    asserts:
+      - matchRegex:
+          path: data["config.yaml"]
+          pattern: "sampling_percentage: 25"
+
+  - it: adds the redaction processor to the pipeline only when redactAttributes is set
+    set:
+      tracingCollector:
+        enabled: true
+        redactAttributes:
+          - db.statement
+    documentSelector:
+      path: kind
+      value: ConfigMap
+    asserts:
+      - matchRegex:
+          path: data["config.yaml"]
+          pattern: "attributes/redact:"
+      - matchRegex:
+          path: data["config.yaml"]
+          pattern: "processors: \\[memory_limiter, probabilistic_sampler, attributes/redact, batch\\]"
+
+  - it: quotes redaction keys so structural or re-typed YAML cannot corrupt the config
+    # redactAttributes is a free-form []string with no schema pattern, so the
+    # template must survive any admitted string: a key with YAML structural chars
+    # ("foo: bar") would otherwise emit invalid config and crashloop the collector,
+    # and a key YAML re-types ("123") would reach the processor as a non-string and
+    # silently fail to redact — the worse outcome on the PII/secret control point.
+    set:
+      tracingCollector:
+        enabled: true
+        redactAttributes:
+          - "foo: bar"
+          - "123"
+    documentSelector:
+      path: kind
+      value: ConfigMap
+    asserts:
+      - matchRegex:
+          path: data["config.yaml"]
+          pattern: '- key: "foo: bar"'
+      - matchRegex:
+          path: data["config.yaml"]
+          pattern: '- key: "123"'
+
+  - it: drops empty redact keys so an empty entry cannot crashloop the collector
+    # The schema admits "" (free-form []string, no minLength); an empty key would
+    # render `- key: ""`, which the otel attributes processor rejects at startup.
+    # Empty entries are filtered: a real key still redacts, the "" is skipped.
+    set:
+      tracingCollector:
+        enabled: true
+        redactAttributes:
+          - db.statement
+          - ""
+    documentSelector:
+      path: kind
+      value: ConfigMap
+    asserts:
+      - matchRegex:
+          path: data["config.yaml"]
+          pattern: '- key: "db.statement"'
+      - notMatchRegex:
+          path: data["config.yaml"]
+          pattern: '- key: ""'
+
+  - it: emits no redaction processor when every redact key is empty
+    # An all-empty list must not render `attributes/redact` with empty actions
+    # (also rejected by the processor) — the stage is dropped from the pipeline.
+    set:
+      tracingCollector:
+        enabled: true
+        redactAttributes:
+          - ""
+          - ""
+    documentSelector:
+      path: kind
+      value: ConfigMap
+    asserts:
+      - notMatchRegex:
+          path: data["config.yaml"]
+          pattern: "attributes/redact"
+      - matchRegex:
+          path: data["config.yaml"]
+          pattern: "processors: \\[memory_limiter, probabilistic_sampler, batch\\]"
+
+  - it: omits the redaction processor by default
+    documentSelector:
+      path: kind
+      value: ConfigMap
+    asserts:
+      - notMatchRegex:
+          path: data["config.yaml"]
+          pattern: "attributes/redact"
+      - matchRegex:
+          path: data["config.yaml"]
+          pattern: "processors: \\[memory_limiter, probabilistic_sampler, batch\\]"
+
+  - it: ships a PSS-restricted-compliant pod and container security context
+    documentSelector:
+      path: kind
+      value: Deployment
+    asserts:
+      - equal:
+          path: spec.template.spec.securityContext.runAsNonRoot
+          value: true
+      - equal:
+          path: spec.template.spec.securityContext.seccompProfile.type
+          value: RuntimeDefault
+      - equal:
+          path: spec.template.spec.containers[0].securityContext.allowPrivilegeEscalation
+          value: false
+      - equal:
+          path: spec.template.spec.containers[0].securityContext.readOnlyRootFilesystem
+          value: true
+      - contains:
+          path: spec.template.spec.containers[0].securityContext.capabilities.drop
+          content: ALL
+
+  - it: pins the collector image through the cozy-lib.image helper
+    documentSelector:
+      path: kind
+      value: Deployment
+    asserts:
+      - matchRegex:
+          path: spec.template.spec.containers[0].image
+          pattern: "opentelemetry-collector-contrib:.*@sha256:"
diff --git a/packages/system/monitoring/tests/vtraces_tracingstorages_required_test.yaml b/packages/system/monitoring/tests/vtraces_tracingstorages_required_test.yaml
new file mode 100644
index 0000000000..88c0c166f6
--- /dev/null
+++ b/packages/system/monitoring/tests/vtraces_tracingstorages_required_test.yaml
@@ -0,0 +1,601 @@
+suite: VictoriaTraces backend renders per tracingStorages entry (off by default)
+templates:
+  - templates/vtraces/vtraces.yaml
+  - templates/vtraces/grafana-datasource.yaml
+
+# tracingStorages drives the VTCluster/VTSingle backend(s) for distributed
+# tracing. It is EMPTY by default, so tracing is off out of the box and nothing
+# is provisioned — nothing produces spans until the trace collector ships, so an
+# absent backend drops no data (unlike logsStorages, which is why there is no
+# fail-on-empty guard here yet). These cases pin the off-by-default state, the
+# cluster/single split, the datasource, and the rejected invalid mode.
+
+release:
+  name: monitoring
+  namespace: tenant-root
+
+tests:
+  - it: renders nothing by default (tracing off, empty tracingStorages)
+    templates:
+      - templates/vtraces/vtraces.yaml
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  - it: renders no datasource by default (tracing off)
+    templates:
+      - templates/vtraces/grafana-datasource.yaml
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  - it: renders a VTCluster for a cluster-mode entry
+    templates:
+      - templates/vtraces/vtraces.yaml
+    set:
+      tracingStorages:
+        - name: generic
+          mode: cluster
+          retentionPeriod: "14d"
+          storage: 10Gi
+    asserts:
+      - containsDocument:
+          apiVersion: operator.victoriametrics.com/v1
+          kind: VTCluster
+          name: generic
+
+  - it: renders a VTSingle when mode is single
+    templates:
+      - templates/vtraces/vtraces.yaml
+    set:
+      tracingStorages:
+        - name: generic
+          mode: single
+          retentionPeriod: "14d"
+          storage: 10Gi
+    asserts:
+      - containsDocument:
+          apiVersion: operator.victoriametrics.com/v1
+          kind: VTSingle
+          name: generic
+
+  - it: renders one traces backend per tracingStorages entry
+    templates:
+      - templates/vtraces/vtraces.yaml
+    set:
+      tracingStorages:
+        - name: generic
+          mode: cluster
+          retentionPeriod: "14d"
+          storage: 10Gi
+        - name: audit
+          mode: single
+          retentionPeriod: "7d"
+          storage: 10Gi
+    asserts:
+      - hasDocuments:
+          count: 2
+
+  - it: sets the retention period on the VTCluster storage component
+    templates:
+      - templates/vtraces/vtraces.yaml
+    set:
+      tracingStorages:
+        - name: generic
+          mode: cluster
+          retentionPeriod: "14d"
+          storage: 10Gi
+    documentSelector:
+      path: metadata.name
+      value: generic
+    asserts:
+      - equal:
+          path: spec.storage.retentionPeriod
+          value: "14d"
+
+  - it: renders an optional disk-usage cap only when set (cluster mode)
+    templates:
+      - templates/vtraces/vtraces.yaml
+    set:
+      tracingStorages:
+        - name: generic
+          mode: cluster
+          retentionPeriod: "14d"
+          storage: 10Gi
+          retentionDiskUsageBytes: "8GB"
+    asserts:
+      - equal:
+          path: spec.storage.retentionMaxDiskSpaceUsageBytes
+          value: "8GB"
+
+  - it: renders the disk-usage cap at the top level for single mode
+    templates:
+      - templates/vtraces/vtraces.yaml
+    set:
+      tracingStorages:
+        - name: generic
+          mode: single
+          retentionPeriod: "14d"
+          storage: 10Gi
+          retentionDiskUsageBytes: "4GB"
+    asserts:
+      - equal:
+          path: spec.retentionMaxDiskSpaceUsageBytes
+          value: "4GB"
+
+  # The design requires every traces backend to be disk-bounded, not only
+  # age-bounded, so a full PVC cannot block ingest. Without an explicit byte cap
+  # the store drops its oldest day once its filesystem is 80% full. The two
+  # flags are mutually exclusive: VictoriaTraces refuses to start with both.
+  - it: bounds a cluster-mode store at 80% of its filesystem without a byte cap
+    templates:
+      - templates/vtraces/vtraces.yaml
+    set:
+      tracingStorages:
+        - name: generic
+          mode: cluster
+          retentionPeriod: "14d"
+          storage: 10Gi
+    asserts:
+      - equal:
+          path: spec.storage.extraArgs["retention.maxDiskUsagePercent"]
+          value: "80"
+      - notExists:
+          path: spec.storage.retentionMaxDiskSpaceUsageBytes
+
+  - it: bounds a single-mode store at 80% of its filesystem without a byte cap
+    templates:
+      - templates/vtraces/vtraces.yaml
+    set:
+      tracingStorages:
+        - name: generic
+          mode: single
+          retentionPeriod: "14d"
+          storage: 10Gi
+    asserts:
+      - equal:
+          path: spec.extraArgs["retention.maxDiskUsagePercent"]
+          value: "80"
+      - notExists:
+          path: spec.retentionMaxDiskSpaceUsageBytes
+
+  - it: sets no percentage cap on a cluster-mode store that has a byte cap
+    templates:
+      - templates/vtraces/vtraces.yaml
+    set:
+      tracingStorages:
+        - name: generic
+          mode: cluster
+          retentionPeriod: "14d"
+          storage: 10Gi
+          retentionDiskUsageBytes: "8GB"
+    asserts:
+      - notExists:
+          path: spec.storage.extraArgs
+
+  - it: sets no percentage cap on a single-mode store that has a byte cap
+    templates:
+      - templates/vtraces/vtraces.yaml
+    set:
+      tracingStorages:
+        - name: generic
+          mode: single
+          retentionPeriod: "14d"
+          storage: 10Gi
+          retentionDiskUsageBytes: "4GB"
+    asserts:
+      - notExists:
+          path: spec.extraArgs
+
+  - it: renders a Jaeger-typed Grafana datasource at vtselect:10471 for cluster mode
+    templates:
+      - templates/vtraces/grafana-datasource.yaml
+    set:
+      tracingStorages:
+        - name: generic
+          mode: cluster
+          retentionPeriod: "14d"
+          storage: 10Gi
+    asserts:
+      - containsDocument:
+          apiVersion: grafana.integreatly.org/v1beta1
+          kind: GrafanaDatasource
+          name: vtraces-generic
+      - equal:
+          path: spec.datasource.type
+          value: jaeger
+      - equal:
+          path: spec.datasource.url
+          value: http://vtselect-generic.tenant-root.svc:10471/select/jaeger
+
+  - it: points the datasource at vtsingle:10428 for single mode
+    templates:
+      - templates/vtraces/grafana-datasource.yaml
+    set:
+      tracingStorages:
+        - name: generic
+          mode: single
+          retentionPeriod: "14d"
+          storage: 10Gi
+    asserts:
+      - equal:
+          path: spec.datasource.url
+          value: http://vtsingle-generic.tenant-root.svc:10428/select/jaeger
+
+  # tracingCentral is set by the parent tenant's admin, the stores by this
+  # tenant: switching must not delete them, and a single-mode store's PVC goes
+  # with its VTSingle. They stay until this tenant removes the entries.
+  - it: keeps the tenant's local stores in central mode
+    templates:
+      - templates/vtraces/vtraces.yaml
+    release:
+      namespace: tenant-foo
+    set:
+      _namespace:
+        tracingCentral: true
+      tracingStorages:
+        - name: generic
+          mode: cluster
+          retentionPeriod: "14d"
+          storage: 10Gi
+        - name: edge
+          mode: single
+          retentionPeriod: "7d"
+          storage: 10Gi
+    asserts:
+      - containsDocument:
+          apiVersion: operator.victoriametrics.com/v1
+          kind: VTCluster
+          name: generic
+          any: true
+      - containsDocument:
+          apiVersion: operator.victoriametrics.com/v1
+          kind: VTSingle
+          name: edge
+          any: true
+
+  - it: keeps the local datasources next to the central one, so kept stores stay readable
+    templates:
+      - templates/vtraces/grafana-datasource.yaml
+    release:
+      namespace: tenant-foo
+    set:
+      _namespace:
+        tracingCentral: true
+      tracingStorages:
+        - name: generic
+          mode: cluster
+          retentionPeriod: "14d"
+          storage: 10Gi
+        - name: edge
+          mode: single
+          retentionPeriod: "7d"
+          storage: 10Gi
+    asserts:
+      - hasDocuments:
+          count: 3
+      - containsDocument:
+          apiVersion: grafana.integreatly.org/v1beta1
+          kind: GrafanaDatasource
+          name: vtraces-generic
+          any: true
+      - containsDocument:
+          apiVersion: grafana.integreatly.org/v1beta1
+          kind: GrafanaDatasource
+          name: traces-central
+          any: true
+
+  # Local datasources are named vtraces-<entry>; the shared one must not be a
+  # name an entry can take, or one silently replaces the other.
+  - it: keeps the shared datasource apart from a local store named central
+    templates:
+      - templates/vtraces/grafana-datasource.yaml
+    release:
+      namespace: tenant-foo
+    set:
+      _namespace:
+        tracingCentral: true
+      tracingStorages:
+        - name: central
+          mode: cluster
+          retentionPeriod: "14d"
+          storage: 10Gi
+    asserts:
+      - containsDocument:
+          apiVersion: grafana.integreatly.org/v1beta1
+          kind: GrafanaDatasource
+          name: vtraces-central
+          any: true
+      - containsDocument:
+          apiVersion: grafana.integreatly.org/v1beta1
+          kind: GrafanaDatasource
+          name: traces-central
+          any: true
+
+  - it: fails the render when mode is neither cluster nor single
+    templates:
+      - templates/vtraces/vtraces.yaml
+    set:
+      tracingStorages:
+        - name: generic
+          mode: singel
+          retentionPeriod: "14d"
+          storage: 10Gi
+    asserts:
+      - failedTemplate:
+          errorMessage: 'monitoring: tracingStorages[generic].mode must be either "cluster" or "single"'
+
+  - it: rejects retentionDiskUsageBytes in Kubernetes-quantity grammar (8Gi)
+    templates:
+      - templates/vtraces/vtraces.yaml
+    set:
+      tracingStorages:
+        - name: generic
+          mode: cluster
+          retentionPeriod: "14d"
+          storage: 10Gi
+          retentionDiskUsageBytes: "8Gi"
+    asserts:
+      - failedTemplate:
+          errorMessage: 'monitoring: tracingStorages[generic].retentionDiskUsageBytes "8Gi" is not a valid VictoriaMetrics BytesString (^[0-9]+(kb|mb|gb|tb|KB|MB|GB|TB|KiB|MiB|GiB|TiB)?$). Its units differ from the sibling `storage` field (a Kubernetes quantity like 10Gi): write 8GB or 8GiB, not 8Gi.'
+
+  - it: rejects duplicate names across tracingStorages
+    templates:
+      - templates/vtraces/vtraces.yaml
+    set:
+      tracingStorages:
+        - name: dup
+          mode: cluster
+          retentionPeriod: "14d"
+          storage: 10Gi
+        - name: dup
+          mode: single
+          retentionPeriod: "7d"
+          storage: 10Gi
+    asserts:
+      - failedTemplate:
+          errorMessage: 'monitoring: tracingStorages[1].name "dup" is duplicated — names must be unique across tracingStorages, since each keys a VTCluster/VTSingle and a GrafanaDatasource and a collision silently overwrites the first.'
+
+  - it: rejects a name that is not an RFC 1123 label
+    templates:
+      - templates/vtraces/vtraces.yaml
+    set:
+      tracingStorages:
+        - name: Main_1
+          mode: cluster
+          retentionPeriod: "14d"
+          storage: 10Gi
+    asserts:
+      - failedTemplate:
+          errorMessage: "monitoring: tracingStorages[0].name \"Main_1\" must be a valid RFC 1123 label (lowercase alphanumeric and '-', starting and ending alphanumeric) of at most 42 characters, so that the vtstorage-<name>-<hash> pod revision label stays within 63."
+
+  - it: renders a 42-character name (the longest the revision label allows)
+    templates:
+      - templates/vtraces/vtraces.yaml
+    set:
+      tracingStorages:
+        - name: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+          mode: cluster
+          retentionPeriod: "14d"
+          storage: 10Gi
+    asserts:
+      - containsDocument:
+          apiVersion: operator.victoriametrics.com/v1
+          kind: VTCluster
+          name: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+
+  - it: rejects a 43-character name (vtstorage-<name>-<hash> revision label over 63)
+    templates:
+      - templates/vtraces/vtraces.yaml
+    set:
+      tracingStorages:
+        - name: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+          mode: cluster
+          retentionPeriod: "14d"
+          storage: 10Gi
+    asserts:
+      - failedTemplate:
+          errorMessage: "monitoring: tracingStorages[0].name \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\" must be a valid RFC 1123 label (lowercase alphanumeric and '-', starting and ending alphanumeric) of at most 42 characters, so that the vtstorage-<name>-<hash> pod revision label stays within 63."
+
+  - it: renders a numeric name as a string
+    templates:
+      - templates/vtraces/vtraces.yaml
+    set:
+      tracingStorages:
+        - name: 2024
+          mode: cluster
+          retentionPeriod: "14d"
+          storage: 10Gi
+    asserts:
+      - equal:
+          path: metadata.name
+          value: "2024"
+
+  - it: rejects an empty storage in single mode (the operator would mount an EmptyDir)
+    templates:
+      - templates/vtraces/vtraces.yaml
+    set:
+      tracingStorages:
+        - name: generic
+          mode: single
+          retentionPeriod: "14d"
+          storage: ""
+    asserts:
+      - failedTemplate:
+          errorMessage: "monitoring: tracingStorages[generic].storage must be a positive Kubernetes quantity (e.g. 10Gi). A zero size makes the operator mount an EmptyDir instead of a PVC in single mode, so the backend reports Ready while every stored span is lost on the next reschedule; a negative one fails the release when the PVC is created."
+
+  - it: rejects a zero storage (0Gi) in single mode (the operator would mount an EmptyDir)
+    templates:
+      - templates/vtraces/vtraces.yaml
+    set:
+      tracingStorages:
+        - name: generic
+          mode: single
+          retentionPeriod: "14d"
+          storage: 0Gi
+    asserts:
+      - failedTemplate:
+          errorMessage: "monitoring: tracingStorages[generic].storage must be a positive Kubernetes quantity (e.g. 10Gi). A zero size makes the operator mount an EmptyDir instead of a PVC in single mode, so the backend reports Ready while every stored span is lost on the next reschedule; a negative one fails the release when the PVC is created."
+
+  - it: rejects a zero storage (0) in single mode (the operator would mount an EmptyDir)
+    templates:
+      - templates/vtraces/vtraces.yaml
+    set:
+      tracingStorages:
+        - name: generic
+          mode: single
+          retentionPeriod: "14d"
+          storage: "0"
+    asserts:
+      - failedTemplate:
+          errorMessage: "monitoring: tracingStorages[generic].storage must be a positive Kubernetes quantity (e.g. 10Gi). A zero size makes the operator mount an EmptyDir instead of a PVC in single mode, so the backend reports Ready while every stored span is lost on the next reschedule; a negative one fails the release when the PVC is created."
+
+  - it: rejects a zero storage (0.0) in single mode (the operator would mount an EmptyDir)
+    templates:
+      - templates/vtraces/vtraces.yaml
+    set:
+      tracingStorages:
+        - name: generic
+          mode: single
+          retentionPeriod: "14d"
+          storage: "0.0"
+    asserts:
+      - failedTemplate:
+          errorMessage: "monitoring: tracingStorages[generic].storage must be a positive Kubernetes quantity (e.g. 10Gi). A zero size makes the operator mount an EmptyDir instead of a PVC in single mode, so the backend reports Ready while every stored span is lost on the next reschedule; a negative one fails the release when the PVC is created."
+
+  - it: rejects a zero storage (0e3) in single mode (the operator would mount an EmptyDir)
+    templates:
+      - templates/vtraces/vtraces.yaml
+    set:
+      tracingStorages:
+        - name: generic
+          mode: single
+          retentionPeriod: "14d"
+          storage: "0e3"
+    asserts:
+      - failedTemplate:
+          errorMessage: "monitoring: tracingStorages[generic].storage must be a positive Kubernetes quantity (e.g. 10Gi). A zero size makes the operator mount an EmptyDir instead of a PVC in single mode, so the backend reports Ready while every stored span is lost on the next reschedule; a negative one fails the release when the PVC is created."
+
+  - it: rejects a zero storage (.0) in single mode (the operator would mount an EmptyDir)
+    templates:
+      - templates/vtraces/vtraces.yaml
+    set:
+      tracingStorages:
+        - name: generic
+          mode: single
+          retentionPeriod: "14d"
+          storage: ".0"
+    asserts:
+      - failedTemplate:
+          errorMessage: "monitoring: tracingStorages[generic].storage must be a positive Kubernetes quantity (e.g. 10Gi). A zero size makes the operator mount an EmptyDir instead of a PVC in single mode, so the backend reports Ready while every stored span is lost on the next reschedule; a negative one fails the release when the PVC is created."
+
+  - it: rejects a zero storage (0m) in single mode (the operator would mount an EmptyDir)
+    templates:
+      - templates/vtraces/vtraces.yaml
+    set:
+      tracingStorages:
+        - name: generic
+          mode: single
+          retentionPeriod: "14d"
+          storage: "0m"
+    asserts:
+      - failedTemplate:
+          errorMessage: "monitoring: tracingStorages[generic].storage must be a positive Kubernetes quantity (e.g. 10Gi). A zero size makes the operator mount an EmptyDir instead of a PVC in single mode, so the backend reports Ready while every stored span is lost on the next reschedule; a negative one fails the release when the PVC is created."
+
+  - it: rejects a zero storage (+0) in single mode (the operator would mount an EmptyDir)
+    templates:
+      - templates/vtraces/vtraces.yaml
+    set:
+      tracingStorages:
+        - name: generic
+          mode: single
+          retentionPeriod: "14d"
+          storage: "+0"
+    asserts:
+      - failedTemplate:
+          errorMessage: "monitoring: tracingStorages[generic].storage must be a positive Kubernetes quantity (e.g. 10Gi). A zero size makes the operator mount an EmptyDir instead of a PVC in single mode, so the backend reports Ready while every stored span is lost on the next reschedule; a negative one fails the release when the PVC is created."
+
+  - it: rejects a zero storage (-0Mi) in single mode (the operator would mount an EmptyDir)
+    templates:
+      - templates/vtraces/vtraces.yaml
+    set:
+      tracingStorages:
+        - name: generic
+          mode: single
+          retentionPeriod: "14d"
+          storage: "-0Mi"
+    asserts:
+      - failedTemplate:
+          errorMessage: "monitoring: tracingStorages[generic].storage must be a positive Kubernetes quantity (e.g. 10Gi). A zero size makes the operator mount an EmptyDir instead of a PVC in single mode, so the backend reports Ready while every stored span is lost on the next reschedule; a negative one fails the release when the PVC is created."
+
+  - it: rejects a negative storage (-1Gi)
+    templates:
+      - templates/vtraces/vtraces.yaml
+    set:
+      tracingStorages:
+        - name: generic
+          mode: cluster
+          retentionPeriod: "14d"
+          storage: "-1Gi"
+    asserts:
+      - failedTemplate:
+          errorMessage: "monitoring: tracingStorages[generic].storage must be a positive Kubernetes quantity (e.g. 10Gi). A zero size makes the operator mount an EmptyDir instead of a PVC in single mode, so the backend reports Ready while every stored span is lost on the next reschedule; a negative one fails the release when the PVC is created."
+
+  - it: accepts an explicitly signed positive storage (+5Gi)
+    templates:
+      - templates/vtraces/vtraces.yaml
+    set:
+      tracingStorages:
+        - name: generic
+          mode: single
+          retentionPeriod: "14d"
+          storage: "+5Gi"
+    asserts:
+      - containsDocument:
+          apiVersion: operator.victoriametrics.com/v1
+          kind: VTSingle
+          name: generic
+
+  - it: accepts a non-zero storage written with an exponent (5e3)
+    templates:
+      - templates/vtraces/vtraces.yaml
+    set:
+      tracingStorages:
+        - name: generic
+          mode: single
+          retentionPeriod: "14d"
+          storage: "5e3"
+    asserts:
+      - containsDocument:
+          apiVersion: operator.victoriametrics.com/v1
+          kind: VTSingle
+          name: generic
+
+  - it: renders a numeric name as a string in single mode
+    templates:
+      - templates/vtraces/vtraces.yaml
+    set:
+      tracingStorages:
+        - name: 2024
+          mode: single
+          retentionPeriod: "14d"
+          storage: 10Gi
+    asserts:
+      - equal:
+          path: metadata.name
+          value: "2024"
+
+  - it: accepts a fractional non-zero storage (0.5Gi)
+    templates:
+      - templates/vtraces/vtraces.yaml
+    set:
+      tracingStorages:
+        - name: generic
+          mode: single
+          retentionPeriod: "14d"
+          storage: 0.5Gi
+    asserts:
+      - containsDocument:
+          apiVersion: operator.victoriametrics.com/v1
+          kind: VTSingle
+          name: generic
diff --git a/packages/system/monitoring/values.yaml b/packages/system/monitoring/values.yaml
index 3b632cbe24..2abaed3682 100644
--- a/packages/system/monitoring/values.yaml
+++ b/packages/system/monitoring/values.yaml
@@ -1,3 +1,8 @@
+# Injected by the platform from the cozystack-values Secret. The empty
+# defaults keep the chart renderable on its own, outside a cluster.
+_cluster: {}
+_namespace: {}
+
 host: ""
 
 metricsStorages:
@@ -45,6 +50,23 @@ logsStorages:
   retentionPeriod: "1"
   storage: 10Gi
   storageClassName: ""
+
+tracingStorages: []
+tracingCentralHost: false
+
+tracingCollector:
+  enabled: true
+  replicas: 1
+  samplingPercentage: 10
+  image: docker.io/otel/opentelemetry-collector-contrib:0.136.0@sha256:45392d534c1edcc809c2d112394029246bc679d2ae5ea7081414a1fc74f2c621
+  redactAttributes: []
+  resources:
+    limits:
+      cpu: "1"
+      memory: 1Gi
+    requests:
+      cpu: 100m
+      memory: 256Mi
 alerta:
   storage: 10Gi
   storageClassName: ""
@@ -65,7 +87,21 @@ alerta:
       disabledSeverity: []
       dashboardUrl: ""
       summaryFmt: ""
+    email:
+      to: ""
+      from: ""
+      smarthost: ""
+      authUsername: ""
+      repeatInterval: ""
+      alertnames: []
+      severities: []
 grafana:
+  # Upstream Grafana image, pinned by digest and routed through
+  # cozy-lib.image (so mirrored-registry installs work). Plugins (VictoriaLogs
+  # datasource + panels) are installed at startup via GF_INSTALL_PLUGINS from
+  # the in-cluster grafana-dashboards server, so no custom rebuilt Grafana
+  # image is published anymore.
+  image: docker.io/grafana/grafana:11.6.15@sha256:f739273dfed04760428fcfbfccd1752b3b7fc87ef0a3d5637e2e87cce151e1a2
   db:
     size: 10Gi
   resources:
@@ -87,3 +123,81 @@ vmagent:
   ##   - job_name: "custom"
   ##     static_configs:
   ##       - targets: ["my-service:9090"]
+
+## OIDC authentication for the Grafana instance.
+##
+## Identity mode picks the auth source for `[auth.generic_oauth]`:
+##   None         no OIDC; login form + admin_user/admin_password Secret
+##                stay the only auth path (default).
+##   System       trust the platform Keycloak realm (`cozy` by default) via a
+##                per-instance confidential client and audience binding.
+##                Requires the platform-level authentication.oidc.enabled
+##                flag; the chart hard-fails the render otherwise.
+##   CustomConfig trust a tenant-supplied issuer directly (BYO IdP).
+##                Exactly one of `customConfig.config` (inline) or
+##                `customConfig.secretRef.name` (existing Secret) must be
+##                set — the chart fails the render otherwise. `cozy` is
+##                not in the path in this mode.
+##
+## Authorization is app-side: `users` is reconciled into Grafana org
+## membership/roles by a chart-owned post-install/post-upgrade Job.
+## Users not listed here get nothing when they log in — no default org
+## role from group mapping.
+##
+## The admin_user / admin_password Secret stays a documented break-glass
+## path regardless of mode.
+oidc:
+  mode: "None"
+  ## CustomConfig payload — consumed only when `mode: CustomConfig`.
+  ## Exactly one of `config` or `secretRef.name` MUST be set.
+  customConfig:
+    ## Inline map of grafana.ini `[auth.generic_oauth]` keys. Any key
+    ## accepted by Grafana's generic_oauth provider is valid; typical
+    ## keys are `enabled: "true"`, `client_id`, `client_secret`,
+    ## `auth_url`, `token_url`, `api_url`, `scopes`. Grafana defaults
+    ## `enabled: false`, so an inline map without an explicit
+    ## `enabled: "true"` is inert — remember to set it.
+    ##
+    ## The chart merges TWO chart-forced settings on top of this map so
+    ## the users-Job contract holds:
+    ##   * `skip_org_role_sync: "true"` (login never overwrites the
+    ##     Job's org-role assignments);
+    ##   * `oauth_allow_insecure_email_lookup: "true"` (OIDC identity
+    ##     binds to the pre-provisioned local account by email).
+    ## These two keys cannot be overridden — set them explicitly here
+    ## and the chart still wins. `role_attribute_path` would be dead
+    ## config; the Job manages roles.
+    ##
+    ## Mutually exclusive with `customConfig.secretRef.name`.
+    config: {}
+    ## Reference to an operator-managed Secret carrying a ready-made
+    ## `[auth.generic_oauth]` ini fragment in the `auth.ini` key. The
+    ## chart mounts it and Grafana loads it via
+    ## `GF_PATHS_CUSTOM_INI`. Mutually exclusive with
+    ## `customConfig.config`.
+    ##
+    ## IMPORTANT — users-map is NOT supported in this branch: the
+    ## chart cannot inject `skip_org_role_sync=true` /
+    ## `oauth_allow_insecure_email_lookup=true` into a Secret-mounted
+    ## ini fragment, so the users-Job's role assignments would be
+    ## silently overwritten on the next login. Either use
+    ## `customConfig.config` (inline) and let the chart merge the two
+    ## settings, or leave `spec.oidc.users` empty and manage
+    ## authorization inside the mounted ini fragment yourself. The
+    ## chart hard-fails render when both `secretRef.name` and non-empty
+    ## `users` are set.
+    secretRef:
+      name: ""
+  ## Users granted access to this Grafana instance's org. Each entry
+  ## produces one pre-provisioned Grafana account (matched to the OIDC
+  ## login by `email`) and one org membership + role in the release's
+  ## `Main Org.`. Empty by default — no OIDC user gets any role until
+  ## an operator lists them here.
+  ##
+  ## Example:
+  ##   users:
+  ##     - email: alice@example.com
+  ##       role: Admin
+  ##     - email: bob@example.com
+  ##       role: Viewer
+  users: []
diff --git a/packages/system/multus/Makefile b/packages/system/multus/Makefile
index 87ea8f3b91..62736fdec0 100644
--- a/packages/system/multus/Makefile
+++ b/packages/system/multus/Makefile
@@ -4,20 +4,29 @@ export NAMESPACE=cozy-$(NAME)
 include ../../../hack/common-envs.mk
 include ../../../hack/package.mk
 
+test:
+	helm unittest .
+
+# The patch seeds the init container it adds with the UPSTREAM image
+# reference, so the release rewrite runs after it and covers that line too --
+# leaving every `multus-cni` line at one reference rather than the added one
+# alone at `snapshot-thick`. Only `image` below stamps the built reference.
+# A tree committed between the two targets is caught by the assertion on
+# ^ghcr\.io/cozystack/cozystack/multus-cni: in
+# packages/system/multus/tests/multus_test.yaml.
 update:
 	rm -rf templates
 	mkdir templates
 	$(eval RELEASE := $(shell curl -s https://api.github.com/repos/k8snetworkplumbingwg/multus-cni/releases/latest?per_page=1 | jq -r '.name'))
 	wget -q https://raw.githubusercontent.com/k8snetworkplumbingwg/multus-cni/refs/tags/$(RELEASE)/deployments/multus-daemonset-thick.yml -O templates/multus-daemonset-thick.yml
-	sed -i '/multus-cni/s/snapshot-thick/$(RELEASE)-thick/' templates/multus-daemonset-thick.yml && \
-	patch --no-backup-if-mismatch -p4 < patches/customize-deployment.patch
+	patch --no-backup-if-mismatch -p4 < patches/customize-deployment.patch && \
+	sed -i '/multus-cni/s/snapshot-thick/$(RELEASE)-thick/' templates/multus-daemonset-thick.yml
 	$(SED_INPLACE) "/ARG VERSION/ s|=.*|=$(RELEASE)|g" images/multus-cni/Dockerfile
 
 image:
 	docker buildx build images/multus-cni \
 		$(call image-tags,multus-cni,v$(COZYSTACK_VERSION)) \
-		--cache-from type=registry,ref=$(REGISTRY)/multus-cni:latest \
-		--cache-to type=inline \
+		$(call cache-args,multus-cni) \
 		--metadata-file images/multus-cni.json \
 		$(BUILDX_ARGS)
 	DIGEST=$$(yq e '."containerimage.digest"' images/multus-cni.json -o json -r) && \
diff --git a/packages/system/multus/images/multus-cni/Dockerfile b/packages/system/multus/images/multus-cni/Dockerfile
index feecbc6c05..db005804f4 100644
--- a/packages/system/multus/images/multus-cni/Dockerfile
+++ b/packages/system/multus/images/multus-cni/Dockerfile
@@ -1,6 +1,7 @@
-FROM --platform=$BUILDPLATFORM golang:1.24 AS build
+FROM --platform=$BUILDPLATFORM golang:1.27@sha256:3680233e3204827fbdc66088528ae6d4b3d034f51d03a99d454f6de034888244 AS build
+ARG GOPROXY
 
-ARG VERSION=v4.2.3
+ARG VERSION=v4.3.0
 ARG TARGETPLATFORM
 
 WORKDIR /usr/src/multus-cni
@@ -13,13 +14,72 @@ RUN git init && git config user.email "build@cozystack" && git config user.name
     git add -A && git commit -m "init" && git tag ${VERSION} && \
     git apply /patches/*.diff
 
+# The tests of pkg/multus, the package the patch touches, create network
+# namespaces (mount --make-rshared /var/run/netns), which a build container is
+# not allowed to do, so the image build does not run them.
 RUN ./hack/build-go.sh
+# The upstream reference CNI plugins, installed into the host /opt/cni/bin by
+# the install-cni-plugins init container. See packages/system/multus/values.yaml
+# for the switch.
+#
+# Four of the release's plugins are not staged:
+#
+#   loopback   the runtime calls it for every pod sandbox, not only for pods
+#              using a NAD; cilium and kube-ovn both install it already.
+#   dhcp       needs a long-running host daemon this package does not run.
+#   tap, dummy no consumer in this tree.
+#
+# The list here, the count, and docs/vm-external-vlan.md are asserted against
+# each other in hack/cni-plugins-staging-contract.bats.
+#
+# kube-ovn installs portmap and macvlan into the same directory from its own
+# image, so those two have a second writer, and its plugins version lives inside
+# its base image rather than in this tree. The marker below records the kube-ovn
+# release CNI_PLUGINS_VERSION was last checked against; the same test compares
+# the two.
+#
+# kube-ovn-cni-plugins-checked-against: v1.15.26
+#
+# Talos strips the same upstream release in siderolabs/talos' Dockerfile down to
+# bridge, firewall, host-local, loopback and portmap, and adds flannel from a
+# different repo. Four of those are names this image stages -- loopback is not,
+# it is excluded above, and flannel was never in the reference set. Staging is on
+# for Talos too, so those four are rewritten on every pod recreation; that is
+# safe only while both sides pin the SAME containernetworking/plugins version.
+# The marker records the Talos release whose pin was compared with
+# CNI_PLUGINS_VERSION above -- it is about the VERSIONS matching, not about
+# which plugins exist.
+#
+# talos-cni-plugins-checked-against: v1.14.2
+ARG TARGETARCH
+ARG CNI_PLUGINS_VERSION=v1.9.1
+# SHA-256 of cni-plugins-linux-<arch>-<version>.tgz, from the release's per-asset
+# .sha256 sidecar. Bump together with CNI_PLUGINS_VERSION.
+RUN set -eux; \
+    case "${TARGETARCH}" in \
+      amd64) sha256="b98f74a0f8522f0a83867178729c1aa70f2158f90c45a2ca8fa791db1c76b303" ;; \
+      arm64) sha256="56171987d3947707c3563db2f4001bccaf50fd63468611b9f3cbecb1375ee7ec" ;; \
+      *) echo "unsupported TARGETARCH=${TARGETARCH:-<empty>} (build with buildx)" >&2; exit 1 ;; \
+    esac; \
+    curl --fail --silent --show-error --location -o /tmp/cni-plugins.tgz \
+      "https://github.com/containernetworking/plugins/releases/download/${CNI_PLUGINS_VERSION}/cni-plugins-linux-${TARGETARCH}-${CNI_PLUGINS_VERSION}.tgz"; \
+    echo "${sha256}  /tmp/cni-plugins.tgz" | sha256sum -c -; \
+    mkdir -p /cni-plugins /cni-plugins-licenses; \
+    tar -xz -C /cni-plugins -f /tmp/cni-plugins.tgz \
+      ./bridge ./host-local ./static ./macvlan ./ipvlan ./vlan \
+      ./tuning ./portmap ./firewall ./bandwidth ./host-device ./ptp ./sbr ./vrf; \
+    tar -xz -C /cni-plugins-licenses -f /tmp/cni-plugins.tgz ./LICENSE; \
+    rm -f /tmp/cni-plugins.tgz
 
-FROM debian:stable-slim
+FROM debian:stable-slim@sha256:5bc3287b25407c965a30f38e32603dc253a3869e1b12a21ac09bfc27fd8b13ce
 LABEL org.opencontainers.image.source=https://github.com/cozystack/cozystack
 COPY --from=build /usr/src/multus-cni/bin /usr/src/multus-cni/bin
 COPY --from=build /usr/src/multus-cni/LICENSE /usr/src/multus-cni/LICENSE
 COPY --from=build /usr/src/multus-cni/bin/cert-approver /
+COPY --from=build /cni-plugins /cni-plugins
+# Apache-2.0 licence of the plugins redistributed above. Kept out of
+# /cni-plugins so it is not installed as a plugin.
+COPY --from=build /cni-plugins-licenses /cni-plugins-licenses
 WORKDIR /
 
 ENTRYPOINT ["/usr/src/multus-cni/bin/multus-daemon"]
diff --git a/packages/system/multus/patches/customize-deployment.patch b/packages/system/multus/patches/customize-deployment.patch
index b62d57e7fb..c83a085b86 100644
--- a/packages/system/multus/patches/customize-deployment.patch
+++ b/packages/system/multus/patches/customize-deployment.patch
@@ -1,6 +1,6 @@
 --- a/packages/system/multus/templates/multus-daemonset-thick.yml
 +++ b/packages/system/multus/templates/multus-daemonset-thick.yml
-@@ -93,19 +93,19 @@ roleRef:
+@@ -94,19 +94,19 @@
  subjects:
    - kind: ServiceAccount
      name: multus
@@ -23,7 +23,14 @@
    labels:
      tier: node
      app: multus
-@@ -125,8 +125,8 @@ data:
+@@ -120,14 +120,15 @@
+         "cniConfigDir": "/host/etc/cni/net.d",
+         "multusAutoconfigDir": "/host/etc/cni/net.d",
+         "multusConfigFile": "auto",
++        "multusMasterCNI": "05-cilium.conflist",
+         "socketDir": "/host/run/multus/"
+     }
+ ---
  apiVersion: apps/v1
  kind: DaemonSet
  metadata:
@@ -34,15 +41,139 @@
    labels:
      tier: node
      app: multus
-@@ -159,10 +159,9 @@ spec:
+@@ -157,13 +158,32 @@
+         - name: kube-multus
+           image: ghcr.io/k8snetworkplumbingwg/multus-cni:snapshot-thick
+           command: [ "/usr/src/multus-cni/bin/multus-daemon" ]
++          # Keep a memory limit: without one the pod cgroup has no memory.max,
++          # and the Talos userspace OOM handler (v1.12+) only ever kills cgroups
++          # that lack it, which makes multus an eviction candidate on every node.
++          #
++          # Size it as a backstop rather than a ceiling: 14d peak
++          # is 230Mi on a 3-node dev cluster and this grows with pods per node,
++          # so upstream's 50Mi was never survivable and a fitted value would
++          # trade a rare pressure-driven kill for a deterministic one.
++          #
++          # Far above that peak rather than a tighter multiple of it, because the
++          # peak is the part least worth trusting here: multus-daemon holds
++          # per-pod state and a 3-node dev cluster understates pods per node more
++          # than it understates anything else measured here. The scar
++          # this avoids is the vertical-pod-autoscaler updater, which OOM-looped
++          # at a 110Mi limit for the same reason -- it scaled with pods in the
++          # cluster -- and was given a limit 2.5x its measured request to stop
++          # it. A limit costs nothing until it is hit; only the request reserves.
++          #
++          # The values themselves, and why there is no CPU limit, are in
++          # values.yaml.
            resources:
-             requests:
-               cpu: "100m"
+-            requests:
+-              cpu: "100m"
 -              memory: "50Mi"
-+              memory: "100Mi"
-             limits:
-               cpu: "100m"
+-            limits:
+-              cpu: "100m"
 -              memory: "50Mi"
++            {{- if not (kindIs "map" .Values.resources) }}{{- fail (printf "resources: expected a map, got %s" (kindOf .Values.resources)) }}{{- end }}
++            {{- range $key := list "limits" "requests" }}{{- $value := index $.Values.resources $key }}{{- if not (or (kindIs "invalid" $value) (kindIs "map" $value)) }}{{- fail (printf "resources.%s: expected a map, got %s" $key (kindOf $value)) }}{{- end }}{{- end }}
++            {{- if not (dig "limits" "memory" "" .Values.resources) }}{{- fail "resources.limits.memory must be set: without it the pod cgroup has no memory.max and the Talos OOM handler may evict multus on any node" }}{{- end }}
++            {{- if not (dig "requests" "memory" "" .Values.resources) }}{{- fail "resources.requests.memory must be set: without it the request defaults to the limit and a node with less allocatable memory is left without multus" }}{{- end }}
++            {{- toYaml .Values.resources | nindent 12 }}
+           securityContext:
+             privileged: true
+           terminationMessagePolicy: FallbackToLogsOnError
+@@ -209,10 +229,14 @@
+             - "/host/opt/cni/bin"
+             - "-t"
+             - "thick"
++          # Short-lived, but it still needs a limit for the pod cgroup to get
++          # memory.max — the init container counts.
+           resources:
+             requests:
+               cpu: "10m"
+               memory: "15Mi"
++            limits:
++              memory: "128Mi"
            securityContext:
              privileged: true
            terminationMessagePolicy: FallbackToLogsOnError
+@@ -220,6 +244,81 @@
+             - name: cnibin
+               mountPath: /host/opt/cni/bin
+               mountPropagation: Bidirectional
++{{- $stageCniPlugins := lower (ternary "false" (printf "%v" .Values.stageCniPlugins) (kindIs "invalid" .Values.stageCniPlugins)) }}
++{{- if not (has $stageCniPlugins (list "true" "yes" "on" "1" "false" "no" "off" "0")) }}{{- fail (printf "stageCniPlugins: expected a boolean, got %q" $stageCniPlugins) }}{{- end }}
++{{- if has $stageCniPlugins (list "true" "yes" "on" "1") }}
++        - name: install-cni-plugins
++          image: ghcr.io/k8snetworkplumbingwg/multus-cni:snapshot-thick
++          command:
++            - "sh"
++            - "-c"
++            - |
++              set -eu
++              # cilium and kube-ovn write into this directory too, and a
++              # plugin here may be executing, so each install is a rename.
++              trap 'rm -rf /host/opt/cni/bin/.tmp-cozystack-multus-* || :' EXIT
++              if [ ! -d /cni-plugins ]; then
++                echo "no /cni-plugins in this image; skipping staging" >&2
++                exit 0
++              fi
++              failed=
++              for plugin in /cni-plugins/*; do
++                [ -e "$plugin" ] || continue
++                name="${plugin##*/}"
++                tmp="/host/opt/cni/bin/.tmp-cozystack-multus-${name}"
++                # A directory at either end makes every step succeed while
++                # installing nothing.
++                rm -rf "$tmp" || { failed="${failed} ${name}"; continue; }
++                if [ -d "/host/opt/cni/bin/${name}" ]; then
++                  echo "${name} is a directory, not a plugin binary; left as is" >&2
++                  failed="${failed} ${name}"
++                  continue
++                fi
++                if cp -f "$plugin" "$tmp" && chmod 0755 "$tmp" &&
++                   mv -f "$tmp" "/host/opt/cni/bin/${name}"; then
++                  continue
++                fi
++                rm -rf "$tmp" || :
++                failed="${failed} ${name}"
++              done
++              if [ -n "$failed" ]; then
++                echo "failed to install:${failed}" >&2
++                echo "those were left as they were" >&2
++                echo "the cause for each is earlier in this log" >&2
++                echo "failed to install:${failed}" > /dev/termination-log 2>/dev/null || true
++              fi
++              exit 0
++          # Short-lived, but it still needs a limit for the pod cgroup to get
++          # memory.max — the init container counts. Same 128Mi as the sibling
++          # install-multus-binary above: both only copy binaries to the host.
++          resources:
++            requests:
++              cpu: "10m"
++              memory: "15Mi"
++            limits:
++              memory: "128Mi"
++          # cilium's install-cni-binaries copies plugin binaries into this same
++          # directory with ALL capabilities dropped, in the spc_t domain, with
++          # no privileged flag. On a node with SELinux enforcing, a container
++          # that has dropped every capability still cannot write a host-labelled
++          # directory without a domain that permits it.
++          #
++          # mountPropagation is absent: it governs mounts made INSIDE the
++          # container, which this script does not make, and the API server
++          # rejects Bidirectional unless the container is privileged.
++          securityContext:
++            allowPrivilegeEscalation: false
++            capabilities:
++              drop:
++                - ALL
++            seLinuxOptions:
++              level: s0
++              type: spc_t
++          terminationMessagePolicy: FallbackToLogsOnError
++          volumeMounts:
++            - name: cnibin
++              mountPath: /host/opt/cni/bin
++{{- end }}
+       terminationGracePeriodSeconds: 10
+       volumes:
+         - name: cni
diff --git a/packages/system/multus/templates/multus-daemonset-thick.yml b/packages/system/multus/templates/multus-daemonset-thick.yml
index 0652ef764b..ee4a33d4a0 100644
--- a/packages/system/multus/templates/multus-daemonset-thick.yml
+++ b/packages/system/multus/templates/multus-daemonset-thick.yml
@@ -19,6 +19,7 @@ spec:
     singular: network-attachment-definition
     kind: NetworkAttachmentDefinition
     shortNames:
+      - nad
       - net-attach-def
   versions:
     - name: v1
@@ -155,14 +156,34 @@ spec:
       serviceAccountName: multus
       containers:
         - name: kube-multus
-          image: ghcr.io/cozystack/cozystack/multus-cni:v1.4.0-rc.2@sha256:5bd56090aebb493a044333e0009d079927641ffac664b07521b5186082a8f6c0
+          image: ghcr.io/cozystack/cozystack/multus-cni:v1.6.0@sha256:0a92e861ead179dd6b46f475fd8878d44b3cfa40ce4d7a8ff92f790d54250d25
           command: [ "/usr/src/multus-cni/bin/multus-daemon" ]
+          # Keep a memory limit: without one the pod cgroup has no memory.max,
+          # and the Talos userspace OOM handler (v1.12+) only ever kills cgroups
+          # that lack it, which makes multus an eviction candidate on every node.
+          #
+          # Size it as a backstop rather than a ceiling: 14d peak
+          # is 230Mi on a 3-node dev cluster and this grows with pods per node,
+          # so upstream's 50Mi was never survivable and a fitted value would
+          # trade a rare pressure-driven kill for a deterministic one.
+          #
+          # Far above that peak rather than a tighter multiple of it, because the
+          # peak is the part least worth trusting here: multus-daemon holds
+          # per-pod state and a 3-node dev cluster understates pods per node more
+          # than it understates anything else measured here. The scar
+          # this avoids is the vertical-pod-autoscaler updater, which OOM-looped
+          # at a 110Mi limit for the same reason -- it scaled with pods in the
+          # cluster -- and was given a limit 2.5x its measured request to stop
+          # it. A limit costs nothing until it is hit; only the request reserves.
+          #
+          # The values themselves, and why there is no CPU limit, are in
+          # values.yaml.
           resources:
-            requests:
-              cpu: "100m"
-              memory: "100Mi"
-            limits:
-              cpu: "100m"
+            {{- if not (kindIs "map" .Values.resources) }}{{- fail (printf "resources: expected a map, got %s" (kindOf .Values.resources)) }}{{- end }}
+            {{- range $key := list "limits" "requests" }}{{- $value := index $.Values.resources $key }}{{- if not (or (kindIs "invalid" $value) (kindIs "map" $value)) }}{{- fail (printf "resources.%s: expected a map, got %s" $key (kindOf $value)) }}{{- end }}{{- end }}
+            {{- if not (dig "limits" "memory" "" .Values.resources) }}{{- fail "resources.limits.memory must be set: without it the pod cgroup has no memory.max and the Talos OOM handler may evict multus on any node" }}{{- end }}
+            {{- if not (dig "requests" "memory" "" .Values.resources) }}{{- fail "resources.requests.memory must be set: without it the request defaults to the limit and a node with less allocatable memory is left without multus" }}{{- end }}
+            {{- toYaml .Values.resources | nindent 12 }}
           securityContext:
             privileged: true
           terminationMessagePolicy: FallbackToLogsOnError
@@ -201,17 +222,21 @@ spec:
                   fieldPath: spec.nodeName
       initContainers:
         - name: install-multus-binary
-          image: ghcr.io/cozystack/cozystack/multus-cni:v1.4.0-rc.2@sha256:5bd56090aebb493a044333e0009d079927641ffac664b07521b5186082a8f6c0
+          image: ghcr.io/cozystack/cozystack/multus-cni:v1.6.0@sha256:0a92e861ead179dd6b46f475fd8878d44b3cfa40ce4d7a8ff92f790d54250d25
           command:
             - "/usr/src/multus-cni/bin/install_multus"
             - "-d"
             - "/host/opt/cni/bin"
             - "-t"
             - "thick"
+          # Short-lived, but it still needs a limit for the pod cgroup to get
+          # memory.max — the init container counts.
           resources:
             requests:
               cpu: "10m"
               memory: "15Mi"
+            limits:
+              memory: "128Mi"
           securityContext:
             privileged: true
           terminationMessagePolicy: FallbackToLogsOnError
@@ -219,6 +244,81 @@ spec:
             - name: cnibin
               mountPath: /host/opt/cni/bin
               mountPropagation: Bidirectional
+{{- $stageCniPlugins := lower (ternary "false" (printf "%v" .Values.stageCniPlugins) (kindIs "invalid" .Values.stageCniPlugins)) }}
+{{- if not (has $stageCniPlugins (list "true" "yes" "on" "1" "false" "no" "off" "0")) }}{{- fail (printf "stageCniPlugins: expected a boolean, got %q" $stageCniPlugins) }}{{- end }}
+{{- if has $stageCniPlugins (list "true" "yes" "on" "1") }}
+        - name: install-cni-plugins
+          image: ghcr.io/cozystack/cozystack/multus-cni:v1.6.0@sha256:0a92e861ead179dd6b46f475fd8878d44b3cfa40ce4d7a8ff92f790d54250d25
+          command:
+            - "sh"
+            - "-c"
+            - |
+              set -eu
+              # cilium and kube-ovn write into this directory too, and a
+              # plugin here may be executing, so each install is a rename.
+              trap 'rm -rf /host/opt/cni/bin/.tmp-cozystack-multus-* || :' EXIT
+              if [ ! -d /cni-plugins ]; then
+                echo "no /cni-plugins in this image; skipping staging" >&2
+                exit 0
+              fi
+              failed=
+              for plugin in /cni-plugins/*; do
+                [ -e "$plugin" ] || continue
+                name="${plugin##*/}"
+                tmp="/host/opt/cni/bin/.tmp-cozystack-multus-${name}"
+                # A directory at either end makes every step succeed while
+                # installing nothing.
+                rm -rf "$tmp" || { failed="${failed} ${name}"; continue; }
+                if [ -d "/host/opt/cni/bin/${name}" ]; then
+                  echo "${name} is a directory, not a plugin binary; left as is" >&2
+                  failed="${failed} ${name}"
+                  continue
+                fi
+                if cp -f "$plugin" "$tmp" && chmod 0755 "$tmp" &&
+                   mv -f "$tmp" "/host/opt/cni/bin/${name}"; then
+                  continue
+                fi
+                rm -rf "$tmp" || :
+                failed="${failed} ${name}"
+              done
+              if [ -n "$failed" ]; then
+                echo "failed to install:${failed}" >&2
+                echo "those were left as they were" >&2
+                echo "the cause for each is earlier in this log" >&2
+                echo "failed to install:${failed}" > /dev/termination-log 2>/dev/null || true
+              fi
+              exit 0
+          # Short-lived, but it still needs a limit for the pod cgroup to get
+          # memory.max — the init container counts. Same 128Mi as the sibling
+          # install-multus-binary above: both only copy binaries to the host.
+          resources:
+            requests:
+              cpu: "10m"
+              memory: "15Mi"
+            limits:
+              memory: "128Mi"
+          # cilium's install-cni-binaries copies plugin binaries into this same
+          # directory with ALL capabilities dropped, in the spc_t domain, with
+          # no privileged flag. On a node with SELinux enforcing, a container
+          # that has dropped every capability still cannot write a host-labelled
+          # directory without a domain that permits it.
+          #
+          # mountPropagation is absent: it governs mounts made INSIDE the
+          # container, which this script does not make, and the API server
+          # rejects Bidirectional unless the container is privileged.
+          securityContext:
+            allowPrivilegeEscalation: false
+            capabilities:
+              drop:
+                - ALL
+            seLinuxOptions:
+              level: s0
+              type: spc_t
+          terminationMessagePolicy: FallbackToLogsOnError
+          volumeMounts:
+            - name: cnibin
+              mountPath: /host/opt/cni/bin
+{{- end }}
       terminationGracePeriodSeconds: 10
       volumes:
         - name: cni
diff --git a/packages/system/multus/tests/multus_test.yaml b/packages/system/multus/tests/multus_test.yaml
new file mode 100644
index 0000000000..e3ceaed35b
--- /dev/null
+++ b/packages/system/multus/tests/multus_test.yaml
@@ -0,0 +1,550 @@
+suite: cozy-multus daemonset invariants
+release:
+  name: multus
+  namespace: cozy-multus
+tests:
+  # The daemonset image tag tracks the cozystack release version and is
+  # re-pinned by release-prep, so pin the repository (cozystack-built, not the
+  # upstream k8snetworkplumbingwg image) rather than the volatile tag.
+  - it: runs the cozystack-built multus image
+    template: templates/multus-daemonset-thick.yml
+    documentSelector:
+      path: kind
+      value: DaemonSet
+    asserts:
+      - matchRegex:
+          path: spec.template.spec.containers[0].image
+          pattern: '^ghcr\.io/cozystack/cozystack/multus-cni:'
+
+  # multus runs on every node and had a CPU limit but no memory one, which
+  # leaves the pod cgroup without memory.max. The Talos userspace OOM handler
+  # (v1.12+) only ever selects cgroups that lack it, and picks its victim by QoS
+  # class rather than by what caused the pressure, so multus was an eviction
+  # candidate on every node however healthy it was itself.
+  #
+  # memory.max lands on the POD cgroup only when EVERY container carries a
+  # limit. install-cni-plugins is asserted further down, where the rest of that
+  # container's contract lives; the two below complete the set for a default
+  # render. Keep all three: dropping any one silently returns the whole pod to
+  # the victim set while the other assertions still pass.
+  - it: kube-multus and its binary installer declare memory limits
+    template: templates/multus-daemonset-thick.yml
+    documentSelector:
+      path: kind
+      value: DaemonSet
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[?(@.name=="kube-multus")].resources.limits.memory
+          value: 4Gi
+      - equal:
+          path: spec.template.spec.containers[?(@.name=="kube-multus")].resources.requests.memory
+          value: 100Mi
+      - equal:
+          path: spec.template.spec.initContainers[?(@.name=="install-multus-binary")].resources.limits.memory
+          value: 128Mi
+
+  # Every pod sandbox on the node goes through kube-multus, so a CPU limit
+  # throttles the whole node's CNI queue: after a CNI outage the backlog
+  # outgrows kubelet's retry interval and never drains.
+  - it: kube-multus has a CPU request but no CPU limit
+    template: templates/multus-daemonset-thick.yml
+    documentSelector:
+      path: kind
+      value: DaemonSet
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[?(@.name=="kube-multus")].resources.requests.cpu
+          value: 100m
+      - notExists:
+          path: spec.template.spec.containers[?(@.name=="kube-multus")].resources.limits.cpu
+
+  - it: kube-multus resources are overridable from values
+    template: templates/multus-daemonset-thick.yml
+    documentSelector:
+      path: kind
+      value: DaemonSet
+    set:
+      resources:
+        limits:
+          cpu: "2"
+          memory: 8Gi
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[?(@.name=="kube-multus")].resources
+          value:
+            requests:
+              cpu: 100m
+              memory: 100Mi
+            limits:
+              cpu: "2"
+              memory: 8Gi
+
+  # Deep-merge keeps both memory keys for every partial override; only an
+  # explicit null drops them. Every case below must stop the render.
+  - it: refuses to render without a memory limit
+    set:
+      resources:
+        limits:
+          memory: null
+    asserts:
+      - failedTemplate:
+          errorMessage: 'resources.limits.memory must be set: without it the pod cgroup has no memory.max and the Talos OOM handler may evict multus on any node'
+
+  - it: refuses to render with resources.limits cleared
+    set:
+      resources:
+        limits: null
+    asserts:
+      - failedTemplate:
+          errorMessage: 'resources.limits.memory must be set: without it the pod cgroup has no memory.max and the Talos OOM handler may evict multus on any node'
+
+  - it: refuses to render with resources cleared
+    set:
+      resources: null
+    asserts:
+      - failedTemplate:
+          errorMessage: 'resources: expected a map, got invalid'
+
+  - it: refuses to render with resources that are not a map
+    set:
+      resources: big
+    asserts:
+      - failedTemplate:
+          errorMessage: 'resources: expected a map, got string'
+
+  - it: refuses resources.limits that are not a map
+    set:
+      resources:
+        limits: 4Gi
+    asserts:
+      - failedTemplate:
+          errorMessage: 'resources.limits: expected a map, got string'
+
+  - it: refuses resources.requests that are not a map
+    set:
+      resources:
+        requests: false
+    asserts:
+      - failedTemplate:
+          errorMessage: 'resources.requests: expected a map, got bool'
+
+  # An absent request defaults to the limit, so every node would reserve 4Gi
+  # and one with less allocatable memory would be left without multus.
+  - it: refuses to render without a memory request
+    set:
+      resources:
+        requests:
+          memory: null
+    asserts:
+      - failedTemplate:
+          errorMessage: 'resources.requests.memory must be set: without it the request defaults to the limit and a node with less allocatable memory is left without multus'
+
+  - it: refuses to render with resources.requests cleared
+    set:
+      resources:
+        requests: null
+    asserts:
+      - failedTemplate:
+          errorMessage: 'resources.requests.memory must be set: without it the request defaults to the limit and a node with less allocatable memory is left without multus'
+
+  # Guards the cozystack CNI-ordering fix (multusMasterCNI pinned to the cilium
+  # conflist) so multus does not auto-detect kube-ovn ahead of cilium at node
+  # startup and bypass the cilium CNI chain. This is a hand-edit that lives in
+  # patches/customize-deployment.patch so it survives every make update.
+  - it: pins the master CNI to the cilium conflist
+    template: templates/multus-daemonset-thick.yml
+    documentSelector:
+      path: kind
+      value: ConfigMap
+    asserts:
+      - matchRegex:
+          path: data["daemon-config.json"]
+          # Anchored to the top level of the JSON object, whose keys the template
+          # writes at four spaces: the same text nested inside another key
+          # satisfies an unanchored match while the effective value points
+          # somewhere else. This pins the position the template produces, which
+          # is as far as a pattern can go -- deciding which key is effective
+          # needs a JSON parser, and helm-unittest has none.
+          pattern: '(?m)^    "multusMasterCNI": "05-cilium\.conflist"'
+
+  # A quoted "false" is a non-empty string; a truthiness test would read it as
+  # on. The value is compared as text.
+  - it: treats a quoted "false" as off, not as a non-empty string
+    set:
+      stageCniPlugins: "false"
+    template: templates/multus-daemonset-thick.yml
+    documentSelector:
+      path: kind
+      value: DaemonSet
+    asserts:
+      - lengthEqual:
+          path: spec.template.spec.initContainers
+          count: 1
+      - equal:
+          path: spec.template.spec.initContainers[0].name
+          value: install-multus-binary
+
+  - it: stages when the value arrives as a quoted "true"
+    set:
+      stageCniPlugins: "true"
+    template: templates/multus-daemonset-thick.yml
+    documentSelector:
+      path: kind
+      value: DaemonSet
+    asserts:
+      - equal:
+          path: spec.template.spec.initContainers[1].name
+          value: install-cni-plugins
+
+  # The chart is reachable directly (helm install, the cozypkg dev loop), so it
+  # holds the same line as the platform helper: an unreadable spelling stops the
+  # render instead of resolving to off.
+  - it: refuses a value that is neither true nor false
+    set:
+      stageCniPlugins: maybe
+    asserts:
+      - failedTemplate:
+          errorMessage: 'stageCniPlugins: expected a boolean, got "maybe"'
+
+  # An explicit null is how a values file clears the key, and the platform helper
+  # folds it back onto its default rather than treating it as a spelling. The
+  # chart does the same with ITS default, off -- without this the render fails
+  # naming "<nil>", a spelling the operator never typed.
+  - it: reads an explicit null as the chart default rather than refusing it
+    set:
+      stageCniPlugins: null
+    template: templates/multus-daemonset-thick.yml
+    documentSelector:
+      path: kind
+      value: DaemonSet
+    asserts:
+      - lengthEqual:
+          path: spec.template.spec.initContainers
+          count: 1
+      - equal:
+          path: spec.template.spec.initContainers[0].name
+          value: install-multus-binary
+
+  - it: does not stage anything unless asked to
+    template: templates/multus-daemonset-thick.yml
+    documentSelector:
+      path: kind
+      value: DaemonSet
+    asserts:
+      - equal:
+          path: spec.template.spec.initContainers[0].name
+          value: install-multus-binary
+      - lengthEqual:
+          path: spec.template.spec.initContainers
+          count: 1
+
+  # The staging init container installs the plugins bundled in the image into
+  # /opt/cni/bin. Distros like k3s do not populate it with them. The container
+  # lives in patches/customize-deployment.patch so it survives every make update.
+  - it: stages the reference CNI plugins into the host cni bin dir
+    template: templates/multus-daemonset-thick.yml
+    set:
+      stageCniPlugins: true
+    documentSelector:
+      path: kind
+      value: DaemonSet
+    asserts:
+      - equal:
+          path: spec.template.spec.initContainers[1].name
+          value: install-cni-plugins
+      # What runs the script, not only what it says. The behavioural suite
+      # executes command[2] under sh and never reads command[0] and [1], so a
+      # container handed the same text to `echo` would print it, exit 0 and
+      # stage nothing while every suite stays green.
+      - equal:
+          path: spec.template.spec.initContainers[1].command[0]
+          value: sh
+      - equal:
+          path: spec.template.spec.initContainers[1].command[1]
+          value: -c
+      # restartPolicy on an init container makes it a native sidecar: the
+      # kubelet restarts it when it exits, so the staging loop would rewrite
+      # /opt/cni/bin continuously instead of once per pod recreation, which is
+      # what the bundle comment and the commit message both claim it does.
+      - notExists:
+          path: spec.template.spec.initContainers[1].restartPolicy
+      # args are appended after command[2], where they become the positional
+      # parameters of the script rather than more script.
+      - notExists:
+          path: spec.template.spec.initContainers[1].args
+      # The volume NAME, not only the mountPath: which hostPath sits behind it is
+      # decided here. Swapping cnibin for hostroot, mounted at /, keeps every
+      # other assertion true while the plugins land elsewhere.
+      - equal:
+          path: spec.template.spec.initContainers[1].volumeMounts[0].name
+          value: cnibin
+      - equal:
+          path: spec.template.spec.initContainers[1].volumeMounts[0].mountPath
+          value: /host/opt/cni/bin
+      # subPath moves what the mountPath actually resolves to: with
+      # `subPath: staging` the container writes into <hostPath>/staging and
+      # every step still succeeds, so the script reports a clean install while
+      # the live plugin directory is untouched. subPathExpr is the same field
+      # with variable expansion.
+      - notExists:
+          path: spec.template.spec.initContainers[1].volumeMounts[0].subPath
+      - notExists:
+          path: spec.template.spec.initContainers[1].volumeMounts[0].subPathExpr
+      # And exactly one mount: asserting [0] says nothing about a second one.
+      # A mount at /cni-plugins masks the image payload, so the loop would
+      # install whatever that volume holds instead of the fourteen plugins.
+      - lengthEqual:
+          path: spec.template.spec.initContainers[1].volumeMounts
+          count: 1
+      # The script writes its report to the literal /dev/termination-log, and
+      # this field decides where the kubelet reads it from. Point it elsewhere
+      # and `kubectl describe` shows nothing while the container still exits 0.
+      - notExists:
+          path: spec.template.spec.initContainers[1].terminationMessagePath
+      # FallbackToLogsOnError reads the container log into the status message
+      # only when the container exits with an ERROR and the termination file is
+      # empty (k8s.io/api core/v1: TerminationMessageFallbackToLogsOnError).
+      # This container exits 0 by design, so on the ordinary path the file is
+      # what `kubectl describe` shows and the policy changes nothing -- a failed
+      # write leaves the message empty either way, and only the container log
+      # keeps the report. It is pinned for the other path: if the script ever
+      # dies before reaching `exit 0`, the log is then the only place the reason
+      # exists, and `File` would report nothing at all.
+      - equal:
+          path: spec.template.spec.initContainers[1].terminationMessagePolicy
+          value: FallbackToLogsOnError
+      # The LSM side that is not SELinux, and the one place this container asks
+      # for nothing. Leaving the field unset means containerd's default profile
+      # applies, which permits ordinary file writes, so staging works under it.
+      # Unset is therefore the state to hold: setting it is how the container
+      # would gain LSM privilege it does not need, and cilium's nsenter escape
+      # hatch in packages/system/cilium/values-apparmor.yaml shows what asking
+      # looks like. Should a future default profile ever refuse these writes,
+      # the remedy is `appArmorProfile: {type: Unconfined}` -- and changing this
+      # assertion is then a deliberate act rather than an accident.
+      - notExists:
+          path: spec.template.spec.initContainers[1].securityContext.appArmorProfile
+      - notExists:
+          path: spec.template.spec.securityContext.appArmorProfile
+      # A read-only mount is refused by the kernel on every write, so the script
+      # reports each plugin as failed, exits 0 by design, and the pod goes Ready
+      # having staged nothing.
+      - notEqual:
+          path: spec.template.spec.initContainers[1].volumeMounts[0].readOnly
+          value: true
+      # The volume itself, name and hostPath together: the mount names cnibin,
+      # but which host directory sits behind that name is decided in volumes,
+      # and nothing above reads it. Asserted as a pair rather than by index.
+      - contains:
+          path: spec.template.spec.volumes
+          content:
+            name: cnibin
+            hostPath:
+              path: /opt/cni/bin
+      # mountPropagation governs mounts made INSIDE the container; this script
+      # makes none, and its only other effect is to force privileged.
+      - notExists:
+          path: spec.template.spec.initContainers[1].volumeMounts[0].mountPropagation
+      - notExists:
+          path: spec.template.spec.initContainers[1].securityContext.privileged
+      - equal:
+          path: spec.template.spec.initContainers[1].securityContext.allowPrivilegeEscalation
+          value: false
+      - contains:
+          path: spec.template.spec.initContainers[1].securityContext.capabilities.drop
+          content: ALL
+      # `drop: [ALL]` alone is not "every capability dropped": `add` is applied
+      # after it, so a later NET_ADMIN would be granted with this assertion
+      # still green.
+      - notExists:
+          path: spec.template.spec.initContainers[1].securityContext.capabilities.add
+      # On an enforcing node a container with every capability dropped cannot
+      # write a host-labelled /opt/cni/bin without a domain that allows it.
+      - equal:
+          path: spec.template.spec.initContainers[1].securityContext.seLinuxOptions.type
+          value: spc_t
+      # The level is part of the label, not decoration: an invalid or
+      # incompatible one stops the kubelet from creating the container at all,
+      # before the script has a chance to run.
+      - equal:
+          path: spec.template.spec.initContainers[1].securityContext.seLinuxOptions.level
+          value: s0
+      # env is the other half of "what runs": the command is pinned above, but a
+      # PATH pointing at nothing makes sh itself unresolvable, and the container
+      # then stages nothing while every assertion here still holds.
+      - notExists:
+          path: spec.template.spec.initContainers[1].env
+      # envFrom reaches the same variables by another route, and a referenced
+      # ConfigMap that is missing and not optional stops the container from
+      # starting at all.
+      - notExists:
+          path: spec.template.spec.initContainers[1].envFrom
+      # workingDir is resolved before the command runs: point it at a directory
+      # that does not exist and the container never starts, so the same 'nothing
+      # was staged' outcome arrives as a crashloop instead of a clean exit.
+      - notExists:
+          path: spec.template.spec.initContainers[1].workingDir
+      # What this costs on every node. Multus is a DaemonSet, so an init
+      # container's requests are charged once per node in the fleet, and an
+      # init container's requests also set the floor for the whole pod while it
+      # runs. Pinned so a change is a decision rather than a drift.
+      - equal:
+          path: spec.template.spec.initContainers[1].resources.requests.cpu
+          value: 10m
+      - equal:
+          path: spec.template.spec.initContainers[1].resources.requests.memory
+          value: 15Mi
+      # And a memory limit, which this assertion used to deny. The reasoning it
+      # carried -- nothing here is worth capping, it copies fourteen files and
+      # exits -- is about capping runtime, and that is not what the limit is
+      # for. A limit is what puts memory.max on the POD cgroup, and the Talos
+      # userspace OOM handler (v1.12+) only ever selects cgroups that lack it.
+      # The value is per-pod, not per-container: one limit-free container here
+      # leaves the whole multus pod in the victim set, and the system bundle
+      # defaults stageCniPlugins to true, so that is the default deployment.
+      #
+      # The original worry stands on its own terms and is answered by the size,
+      # not by omitting the limit: 128Mi is what would have to be low enough to
+      # kill a `cp` of fourteen small binaries. It matches install-multus-binary
+      # above, which does the same work, and page cache charged to the cgroup is
+      # reclaimable under pressure rather than a cause of OOM.
+      - equal:
+          path: spec.template.spec.initContainers[1].resources.limits.memory
+          value: 128Mi
+      # Writing into the hostPath needs uid 0 IN THE CONTAINER. Nothing sets a
+      # user today, so it runs as root; a runAsUser or runAsNonRoot at either
+      # level turns every install into a permission error, and the script then
+      # reports them, exits 0 by design and leaves the pod Ready with nothing
+      # staged. hack/multus-install-cni-plugins.bats cannot see this: it runs
+      # the extracted script as whoever runs the suite, not through the kubelet.
+      # The pod level matters as much as the container level -- `make update`
+      # re-fetches this manifest from upstream, and a pod-level hardening added
+      # there would be inherited without touching the patch.
+      - notExists:
+          path: spec.template.spec.initContainers[1].securityContext.runAsUser
+      - notExists:
+          path: spec.template.spec.initContainers[1].securityContext.runAsNonRoot
+      - notExists:
+          path: spec.template.spec.securityContext.runAsUser
+      - notExists:
+          path: spec.template.spec.securityContext.runAsNonRoot
+
+  # kube-ovn installs portmap and macvlan into the same /opt/cni/bin with a
+  # plain cp, so plugins are replaced while the kubelet may be executing them.
+  # A rename is atomic within the mount; writing onto the live path is not.
+  - it: installs each plugin atomically rather than writing onto the live path
+    template: templates/multus-daemonset-thick.yml
+    set:
+      stageCniPlugins: true
+    documentSelector:
+      path: kind
+      value: DaemonSet
+    asserts:
+      # Index [1] is the right container only while it is still named this, and a
+      # negative assert against the wrong container passes without checking.
+      - equal:
+          path: spec.template.spec.initContainers[1].name
+          value: install-cni-plugins
+      # The copy must target the temp name...
+      - matchRegex:
+          path: spec.template.spec.initContainers[1].command[2]
+          pattern: '(?m)^\s*if cp -f "\$plugin" "\$tmp"'
+      # ...and only the rename may publish the final name.
+      - matchRegex:
+          path: spec.template.spec.initContainers[1].command[2]
+          pattern: '(?m)^\s*mv -f "\$tmp" "/host/opt/cni/bin/\$\{name\}"'
+      # Catches the literal spellings of the regression. A copy reaching the same
+      # path through a variable has no literal to match, so
+      # hack/multus-install-cni-plugins.bats owns the real guarantee by asserting
+      # the replaced inode changes. (?m) is load-bearing: Go anchors $ to end of
+      # text, not end of line.
+      - notMatchRegex:
+          path: spec.template.spec.initContainers[1].command[2]
+          pattern: '(?m)^[^#\n]*\b(cp|install)\b[^\n]*/host/opt/cni/bin(/|"|\s|$)'
+
+      # Unlinking the live name before the rename is not a replacement by
+      # rename: it opens a window where the path does not exist at all, and a
+      # failure after it destroys the copy that was working. The inode still
+      # changes, so the runtime check in hack/multus-install-cni-plugins.bats
+      # cannot tell the two apart. The trap's glob is a different path.
+      - notMatchRegex:
+          path: spec.template.spec.initContainers[1].command[2]
+          pattern: '(?m)^[^#\n]*\brm\b[^\n]*/host/opt/cni/bin/"?\$\{?name\}?'
+
+      # release-prep bakes the digest, so between a Dockerfile change and the next
+      # bake the pinned image can predate the staging and have no /cni-plugins.
+      # A successfully built image always has the directory -- the Dockerfile's
+      # tar fails otherwise -- so the guard can only ever mask that skew.
+  - it: skips staging instead of crashlooping when the image predates the plugins
+    template: templates/multus-daemonset-thick.yml
+    set:
+      stageCniPlugins: true
+    documentSelector:
+      path: kind
+      value: DaemonSet
+    asserts:
+      - equal:
+          path: spec.template.spec.initContainers[1].name
+          value: install-cni-plugins
+      # Guard and body as one pattern: an unanchored `exit 0` is satisfied by any
+      # exit in the script. The trailing anchor matters too -- `exit 01` exits 1
+      # and contains `exit 0`.
+      - matchRegex:
+          path: spec.template.spec.initContainers[1].command[2]
+          pattern: '(?m)^\s*if \[ ! -d /cni-plugins \]; then\n[^\n]*\n[^\n]*exit 0\s*$'
+      # Deleting any of the next four leaves every other assertion green -- found
+      # by deleting each executable line of the script in turn and seeing which
+      # deletions nothing noticed.
+      #
+      # The shell options, as the first command: -u turns a mistyped variable
+      # into an error instead of an empty string, which here would mean cp'ing
+      # to "" or removing the wrong path.
+      - matchRegex:
+          path: spec.template.spec.initContainers[1].command[2]
+          pattern: '(?m)\A\s*set -eu\s*$'
+      # The two operator-facing lines of the failure report. The summary and the
+      # plugin name are pinned by hack/multus-install-cni-plugins.bats; these two
+      # carry what remains and where to look, and nothing held them.
+      - matchRegex:
+          path: spec.template.spec.initContainers[1].command[2]
+          pattern: '(?m)^\s*echo "those were left as they were" >&2\s*$'
+      - matchRegex:
+          path: spec.template.spec.initContainers[1].command[2]
+          pattern: '(?m)^\s*echo "the cause for each is earlier in this log" >&2\s*$'
+      # The explicit exit, as the last command. Without it the container's status
+      # is whatever the preceding command returned; that is 0 today by accident
+      # of what stands last, and the design does not want to depend on it.
+      - matchRegex:
+          path: spec.template.spec.initContainers[1].command[2]
+          pattern: '(?m)^\s*exit 0\s*\z'
+
+      # A kill between the copy and the rename strands a temp file in a directory
+      # shared with cilium and kube-ovn, as multus's own CopyFileAtomic handles.
+      # hack/multus-install-cni-plugins.bats covers the behaviour; this pins the
+      # trap into the rendered manifest.
+  - it: does not leak temp files into the shared cni bin dir
+    template: templates/multus-daemonset-thick.yml
+    set:
+      stageCniPlugins: true
+    documentSelector:
+      path: kind
+      value: DaemonSet
+    asserts:
+      - equal:
+          path: spec.template.spec.initContainers[1].name
+          value: install-cni-plugins
+      - matchRegex:
+          path: spec.template.spec.initContainers[1].command[2]
+          pattern: "(?m)^\\s*trap 'rm -rf /host/opt/cni/bin/\\.tmp-cozystack-multus-\\* \\|\\| :' EXIT\\s*$"
+      # The plugins live only in the cozystack-built image. Regenerated with the
+      # upstream one, /cni-plugins is absent and the script SKIPS, staging
+      # nothing on any node.
+      - matchRegex:
+          path: spec.template.spec.initContainers[1].image
+          pattern: '^ghcr\.io/cozystack/cozystack/multus-cni:'
+      # The script is an argv string in the file the package's `image:` target
+      # rewrites with `sed s|image: .*multus-cni.*|...|g`, so a line inside it
+      # carrying both tokens would be replaced by an image reference.
+      - notMatchRegex:
+          path: spec.template.spec.initContainers[1].command[2]
+          pattern: 'image:'
diff --git a/packages/system/multus/values.yaml b/packages/system/multus/values.yaml
index e69de29bb2..dfd0dcaba8 100644
--- a/packages/system/multus/values.yaml
+++ b/packages/system/multus/values.yaml
@@ -0,0 +1,27 @@
+## @param stageCniPlugins install the reference CNI plugins bundled in the multus image into the node's /opt/cni/bin
+## Set this through the platform, not here: networking.stageCniPlugins on the cozystack-platform
+## Package resolves the per-variant default. See packages/core/platform/values.yaml.
+##
+## Accepted spellings are true/yes/on/1 and false/no/off/0, in any case; anything else stops the
+## render rather than resolving to off.
+##
+stageCniPlugins: false
+
+## @param resources resources of the kube-multus container
+## Set this through the platform, not here: networking.multus.resources on the cozystack-platform
+## Package. See packages/core/platform/values.yaml.
+##
+## Every pod sandbox on the node waits on this container, which is why there is no CPU limit:
+## after a CNI outage left ~600 dead sandboxes for 220 pods on one node, multus at 100m answered
+## slower than kubelet's two-minute CRI deadline, every call was retried and the queue only grew.
+## With the CPU limit lifted it OOM-looped at 1Gi and cleared the backlog in minutes at 4Gi.
+##
+## The render fails without limits.memory or requests.memory: the comment above `resources` in
+## templates/multus-daemonset-thick.yml explains why a memory limit is kept at any size.
+##
+resources:
+  requests:
+    cpu: 100m
+    memory: 100Mi
+  limits:
+    memory: 4Gi
diff --git a/packages/system/nats-rd/cozyrds/nats.yaml b/packages/system/nats-rd/cozyrds/nats.yaml
index 2fddf69cd5..c825fd19dc 100644
--- a/packages/system/nats-rd/cozyrds/nats.yaml
+++ b/packages/system/nats-rd/cozyrds/nats.yaml
@@ -8,7 +8,7 @@ spec:
     plural: natses
     singular: nats
     openAPISchema: |-
-      {"title":"Chart Values","type":"object","properties":{"replicas":{"description":"Number of replicas.","type":"integer","default":2},"resources":{"description":"Explicit CPU and memory configuration for each NATS replica. When omitted, the preset defined in `resourcesPreset` is applied.","type":"object","default":{},"properties":{"cpu":{"description":"CPU available to each replica.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Memory (RAM) available to each replica.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}},"resourcesPreset":{"description":"Default sizing preset used when `resources` is omitted.","type":"string","default":"t1.nano","enum":["t1.nano","t1.micro","t1.small","t1.medium","t1.large","t1.xlarge","t1.2xlarge","t1.4xlarge","c1.nano","c1.micro","c1.small","c1.medium","c1.large","c1.xlarge","c1.2xlarge","c1.4xlarge","s1.nano","s1.micro","s1.small","s1.medium","s1.large","s1.xlarge","s1.2xlarge","s1.4xlarge","u1.nano","u1.micro","u1.small","u1.medium","u1.large","u1.xlarge","u1.2xlarge","u1.4xlarge","m1.nano","m1.micro","m1.small","m1.medium","m1.large","m1.xlarge","m1.2xlarge","m1.4xlarge","nano","micro","small","medium","large","xlarge","2xlarge"]},"storageClass":{"description":"StorageClass used to store the data.","type":"string","default":"","x-kubernetes-validations":[{"rule":"self == oldSelf","message":"storageClass is immutable"}]},"external":{"description":"Enable external access from outside the cluster.","type":"boolean","default":false},"tls":{"description":"TLS configuration. When omitted, TLS follows the `external` flag.","type":"object","default":{},"properties":{"enabled":{"description":"Enable TLS. When omitted, TLS is enabled automatically when `external` is true.","type":"boolean"}}},"users":{"description":"Users configuration map.","type":"object","default":{},"additionalProperties":{"type":"object","properties":{"password":{"description":"Password for the user.","type":"string"}}}},"jetstream":{"description":"Jetstream configuration.","type":"object","default":{},"required":["enabled","size"],"properties":{"enabled":{"description":"Enable or disable Jetstream for persistent messaging in NATS.","type":"boolean","default":true},"size":{"description":"Jetstream persistent storage size.","default":"10Gi","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}},"config":{"description":"NATS configuration.","type":"object","default":{},"properties":{"merge":{"description":"Additional configuration to merge into NATS config.","type":"object","default":{},"x-kubernetes-preserve-unknown-fields":true},"resolver":{"description":"Additional resolver configuration to merge into NATS config.","type":"object","default":{},"x-kubernetes-preserve-unknown-fields":true}}}}}
+      {"title":"Chart Values","type":"object","properties":{"replicas":{"description":"Number of replicas.","type":"integer","default":2},"resources":{"description":"Explicit CPU and memory configuration for each NATS replica. When omitted, the preset defined in `resourcesPreset` is applied.","type":"object","default":{},"properties":{"cpu":{"description":"CPU available to each replica.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Memory (RAM) available to each replica.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}},"resourcesPreset":{"description":"Default sizing preset used when `resources` is omitted.","type":"string","default":"t1.nano","enum":["t1.nano","t1.micro","t1.small","t1.medium","t1.large","t1.xlarge","t1.2xlarge","t1.4xlarge","c1.nano","c1.micro","c1.small","c1.medium","c1.large","c1.xlarge","c1.2xlarge","c1.4xlarge","s1.nano","s1.micro","s1.small","s1.medium","s1.large","s1.xlarge","s1.2xlarge","s1.4xlarge","u1.nano","u1.micro","u1.small","u1.medium","u1.large","u1.xlarge","u1.2xlarge","u1.4xlarge","m1.nano","m1.micro","m1.small","m1.medium","m1.large","m1.xlarge","m1.2xlarge","m1.4xlarge","nano","micro","small","medium","large","xlarge","2xlarge"]},"storageClass":{"description":"StorageClass used to store the data.","type":"string","default":"","x-kubernetes-validations":[{"rule":"self == oldSelf","message":"storageClass is immutable"}],"x-cozystack-options":{"source":"storageclass"}},"external":{"description":"Enable external access from outside the cluster.","type":"boolean","default":false},"tls":{"description":"TLS configuration. When omitted, TLS follows the `external` flag.","type":"object","default":{},"properties":{"enabled":{"description":"Enable TLS. When omitted, TLS is enabled automatically when `external` is true.","type":"boolean"}}},"users":{"description":"Users configuration map.","type":"object","default":{},"additionalProperties":{"type":"object","properties":{"password":{"description":"Password for the user.","type":"string"}}}},"jetstream":{"description":"Jetstream configuration.","type":"object","default":{},"required":["enabled","size"],"properties":{"enabled":{"description":"Enable or disable Jetstream for persistent messaging in NATS.","type":"boolean","default":true},"size":{"description":"Jetstream persistent storage size.","default":"10Gi","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}},"config":{"description":"NATS configuration.","type":"object","default":{},"properties":{"merge":{"description":"Additional configuration to merge into NATS config.","type":"object","default":{},"x-kubernetes-preserve-unknown-fields":true},"resolver":{"description":"Additional resolver configuration to merge into NATS config.","type":"object","default":{},"x-kubernetes-preserve-unknown-fields":true}}}}}
   release:
     prefix: nats-
     labels:
@@ -31,6 +31,11 @@ spec:
     include:
       - resourceNames:
           - nats-{{ .name }}-credentials
+      # The key-free trust anchor the CA-extraction controller publishes. This
+      # is the single, engine-agnostic selector every converged engine shares;
+      # it carries no per-release name templating.
+      - matchLabels:
+          internal.cozystack.io/tenant-ca: "true"
   services:
     exclude: []
     include:
diff --git a/packages/system/nats/Makefile b/packages/system/nats/Makefile
index 88883ab0a6..1fd4febc61 100644
--- a/packages/system/nats/Makefile
+++ b/packages/system/nats/Makefile
@@ -1,7 +1,10 @@
 include ../../../hack/package.mk
 
+test:
+	helm unittest .
+
 update:
 	rm -rf charts
 	helm repo add nats https://nats-io.github.io/k8s/helm/charts/
 	helm repo update nats
-	helm pull nats/nats --untar --untardir charts
+	helm pull nats/nats --untar --untardir charts --version 1.3.16
diff --git a/packages/system/nats/charts/nats/Chart.yaml b/packages/system/nats/charts/nats/Chart.yaml
index 2f0edf48b2..12ed4c8649 100644
--- a/packages/system/nats/charts/nats/Chart.yaml
+++ b/packages/system/nats/charts/nats/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 2.11.8
+appVersion: 2.11.10
 description: A Helm chart for the NATS.io High Speed Cloud Native Distributed Communications
   Technology.
 home: http://github.com/nats-io/k8s
@@ -13,4 +13,4 @@ maintainers:
   name: The NATS Authors
   url: https://github.com/nats-io
 name: nats
-version: 1.3.13
+version: 1.3.16
diff --git a/packages/system/nats/charts/nats/files/nats-box/deployment/container.yaml b/packages/system/nats/charts/nats/files/nats-box/deployment/container.yaml
index aa1753b4b5..331c7d6acb 100644
--- a/packages/system/nats/charts/nats/files/nats-box/deployment/container.yaml
+++ b/packages/system/nats/charts/nats/files/nats-box/deployment/container.yaml
@@ -44,3 +44,6 @@ volumeMounts:
 - name: {{ .name | quote }}
   mountPath: {{ .dir | quote }}
 {{- end }}
+
+resources:
+  {{- toYaml .Values.natsBox.container.resources | nindent 2 }}
\ No newline at end of file
diff --git a/packages/system/nats/charts/nats/files/stateful-set/nats-container.yaml b/packages/system/nats/charts/nats/files/stateful-set/nats-container.yaml
index c5402efea4..8f8646fc0f 100644
--- a/packages/system/nats/charts/nats/files/stateful-set/nats-container.yaml
+++ b/packages/system/nats/charts/nats/files/stateful-set/nats-container.yaml
@@ -104,3 +104,6 @@ volumeMounts:
 - name: {{ .name | quote }}
   mountPath: {{ .dir | quote }}
 {{- end }}
+
+resources:
+  {{- toYaml .Values.container.resources | nindent 2 }}
diff --git a/packages/system/nats/charts/nats/values.yaml b/packages/system/nats/charts/nats/values.yaml
index fa402f183c..ceb450a7e8 100644
--- a/packages/system/nats/charts/nats/values.yaml
+++ b/packages/system/nats/charts/nats/values.yaml
@@ -313,7 +313,7 @@ config:
 container:
   image:
     repository: nats
-    tag: 2.11.8-alpine
+    tag: 2.11.10-alpine
     pullPolicy:
     registry:
     # if digest is provided, it overrides tag (example: "sha256:abcdef1234567890")
@@ -351,6 +351,15 @@ container:
   merge: {}
   patch: []
 
+  # container resources
+  resources: {}
+  #  requests:
+  #    cpu: 100m
+  #    memory: 128Mi
+  #  limits:
+  #    cpu: 100m
+  #    memory: 128Mi
+
 ############################################################
 # stateful set -> pod template -> reloader container
 ############################################################
@@ -358,7 +367,7 @@ reloader:
   enabled: true
   image:
     repository: natsio/nats-server-config-reloader
-    tag: 0.19.1
+    tag: 0.20.1
     pullPolicy:
     registry:
     digest:
@@ -574,11 +583,12 @@ natsBox:
   container:
     image:
       repository: natsio/nats-box
-      tag: 0.18.0
+      tag: 0.19.2
       pullPolicy:
       registry:
       digest:
       fullImageName:
+      resources: {}
 
     # env var map, see nats.env for an example
     env: {}
diff --git a/packages/system/nats/tests/nats_test.yaml b/packages/system/nats/tests/nats_test.yaml
new file mode 100644
index 0000000000..95b27d829f
--- /dev/null
+++ b/packages/system/nats/tests/nats_test.yaml
@@ -0,0 +1,36 @@
+suite: cozy-nats chart rendering invariants
+release:
+  name: nats
+  namespace: cozy-nats
+tests:
+  - it: renders the nats StatefulSet on the pinned server image
+    template: charts/nats/templates/stateful-set.yaml
+    documentSelector:
+      path: kind
+      value: StatefulSet
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].image
+          value: nats:2.11.10-alpine
+
+  - it: keeps the cozystack PVC retention policy (delete on scale-down and teardown)
+    template: charts/nats/templates/stateful-set.yaml
+    documentSelector:
+      path: kind
+      value: StatefulSet
+    asserts:
+      - equal:
+          path: spec.persistentVolumeClaimRetentionPolicy.whenDeleted
+          value: Delete
+      - equal:
+          path: spec.persistentVolumeClaimRetentionPolicy.whenScaled
+          value: Delete
+
+  - it: emits a PodMonitor when the cozystack prometheus exporter is enabled
+    template: charts/nats/templates/pod-monitor.yaml
+    asserts:
+      - hasDocuments:
+          count: 1
+      - equal:
+          path: kind
+          value: PodMonitor
diff --git a/packages/system/nfs-driver/charts/csi-driver-nfs/Chart.yaml b/packages/system/nfs-driver/charts/csi-driver-nfs/Chart.yaml
index 75f3d0dbee..bd5a0fadc7 100644
--- a/packages/system/nfs-driver/charts/csi-driver-nfs/Chart.yaml
+++ b/packages/system/nfs-driver/charts/csi-driver-nfs/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
-appVersion: 4.11.0
+appVersion: 4.13.3
 description: CSI NFS Driver for Kubernetes
 name: csi-driver-nfs
-version: 4.11.0
+version: 4.13.3
diff --git a/packages/system/nfs-driver/charts/csi-driver-nfs/templates/csi-nfs-controller.yaml b/packages/system/nfs-driver/charts/csi-driver-nfs/templates/csi-nfs-controller.yaml
index f4b9dd7c75..30eccddbfc 100644
--- a/packages/system/nfs-driver/charts/csi-driver-nfs/templates/csi-nfs-controller.yaml
+++ b/packages/system/nfs-driver/charts/csi-driver-nfs/templates/csi-nfs-controller.yaml
@@ -71,7 +71,7 @@ spec:
             - "--leader-election"
             - "--leader-election-namespace={{ .Release.Namespace }}"
             - "--extra-create-metadata=true"
-            - "--feature-gates=HonorPVReclaimPolicy=true"
+            - "--feature-gates=HonorPVReclaimPolicy=true,VolumeAttributesClass=false"
             - "--timeout=1200s"
             - "--retry-interval-max=30m"
           env:
@@ -99,6 +99,7 @@ spec:
             - "-leader-election"
             - "--leader-election-namespace={{ .Release.Namespace }}"
             - '-handle-volume-inuse-error=false'
+            - '-feature-gates=VolumeAttributesClass=false'
           env:
             - name: ADDRESS
               value: /csi/csi.sock
@@ -182,6 +183,7 @@ spec:
             - "--working-mount-dir={{ .Values.controller.workingMountDir }}"
             - "--default-ondelete-policy={{ .Values.controller.defaultOnDeletePolicy }}"
             - "--use-tar-command-in-snapshot={{ .Values.controller.useTarCommandInSnapshot }}"
+            - "--enable-snapshot-compression={{ .Values.controller.enableSnapshotCompression }}"
           env:
             - name: NODE_ID
               valueFrom:
diff --git a/packages/system/nfs-driver/charts/csi-driver-nfs/templates/csi-nfs-node.yaml b/packages/system/nfs-driver/charts/csi-driver-nfs/templates/csi-nfs-node.yaml
index 1a71c85012..1b0061c75e 100644
--- a/packages/system/nfs-driver/charts/csi-driver-nfs/templates/csi-nfs-node.yaml
+++ b/packages/system/nfs-driver/charts/csi-driver-nfs/templates/csi-nfs-node.yaml
@@ -23,7 +23,7 @@ spec:
 {{ toYaml .Values.imagePullSecrets | indent 8 }}
       {{- end }}
       hostNetwork: true # original nfs connection would be broken without hostNetwork setting
-      dnsPolicy: {{ .Values.controller.dnsPolicy }}
+      dnsPolicy: {{ .Values.node.dnsPolicy }}
       serviceAccountName: {{ .Values.serviceAccount.node }}
       priorityClassName: {{ .Values.node.priorityClassName }}
       securityContext:
@@ -74,6 +74,10 @@ spec:
             - --v=2
             - --csi-address=/csi/csi.sock
             - --kubelet-registration-path=$(DRIVER_REG_SOCK_PATH)
+            - --timeout={{ .Values.nodeDriverRegistrar.timeout }}s
+{{- if .Values.nodeDriverRegistrar.livenessProbe.enabled }}
+            - --http-endpoint=localhost:{{ .Values.nodeDriverRegistrar.healthPort }}
+{{- end }}
           env:
             - name: DRIVER_REG_SOCK_PATH
               value: {{ .Values.kubeletDir }}/plugins/csi-nfsplugin/csi.sock
@@ -87,6 +91,21 @@ spec:
               mountPath: /csi
             - name: registration-dir
               mountPath: /registration
+{{- if .Values.nodeDriverRegistrar.livenessProbe.enabled }}
+          ports:
+            - name: healthz
+              containerPort: {{ .Values.nodeDriverRegistrar.healthPort }}
+              protocol: TCP
+          livenessProbe:
+            httpGet:
+              host: localhost
+              path: /healthz
+              port: healthz
+            initialDelaySeconds: {{ .Values.nodeDriverRegistrar.livenessProbe.initialDelaySeconds }}
+            timeoutSeconds: {{ .Values.nodeDriverRegistrar.livenessProbe.timeoutSeconds }}
+            periodSeconds: {{ .Values.nodeDriverRegistrar.livenessProbe.periodSeconds }}
+            failureThreshold: {{ .Values.nodeDriverRegistrar.livenessProbe.failureThreshold }}
+{{- end }}
           resources: {{- toYaml .Values.node.resources.nodeDriverRegistrar | nindent 12 }}
           securityContext:
             capabilities:
diff --git a/packages/system/nfs-driver/charts/csi-driver-nfs/templates/storageclass.yaml b/packages/system/nfs-driver/charts/csi-driver-nfs/templates/storageclass.yaml
index 1d0a241c0b..3adead2c56 100644
--- a/packages/system/nfs-driver/charts/csi-driver-nfs/templates/storageclass.yaml
+++ b/packages/system/nfs-driver/charts/csi-driver-nfs/templates/storageclass.yaml
@@ -5,10 +5,10 @@ kind: StorageClass
 metadata:
   name: {{ .Values.storageClass.name }}
 {{ include "nfs.labels" . | indent 2 }}
+  {{- with .Values.storageClass.annotations }}
   annotations:
-    {{- with .Values.storageClass.annotations }}
     {{- toYaml . | nindent 4 }}
-    {{- end }}
+  {{- end }}
 provisioner: {{ .Values.driver.name }}
 {{- with .Values.storageClass.parameters }}
 parameters:
@@ -22,3 +22,33 @@ mountOptions:
 {{ toYaml . | nindent 2 }}
 {{- end }}
 {{- end }}
+{{- if .Values.storageClasses }}
+{{- range .Values.storageClasses }}
+---
+apiVersion: storage.k8s.io/v1
+kind: StorageClass
+metadata:
+  name: {{ .name }}
+{{ include "nfs.labels" $ | indent 2 }}
+  {{- with .annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+provisioner: {{ $.Values.driver.name }}
+{{- with .parameters }}
+parameters:
+{{ toYaml . | indent 2 }}
+{{- end }}
+reclaimPolicy: {{ .reclaimPolicy | default "Delete" }}
+volumeBindingMode: {{ .volumeBindingMode | default "Immediate" }}
+{{- if hasKey . "allowVolumeExpansion" }}
+allowVolumeExpansion: {{ .allowVolumeExpansion }}
+{{- else }}
+allowVolumeExpansion: true
+{{- end }}
+{{- with .mountOptions }}
+mountOptions:
+{{ toYaml . | nindent 2 }}
+{{- end }}
+{{- end }}
+{{- end }}
diff --git a/packages/system/nfs-driver/charts/csi-driver-nfs/values.yaml b/packages/system/nfs-driver/charts/csi-driver-nfs/values.yaml
index 17b0f4f4c9..a748d4e639 100644
--- a/packages/system/nfs-driver/charts/csi-driver-nfs/values.yaml
+++ b/packages/system/nfs-driver/charts/csi-driver-nfs/values.yaml
@@ -3,31 +3,31 @@ image:
     baseRepo: registry.k8s.io
     nfs:
         repository: registry.k8s.io/sig-storage/nfsplugin
-        tag: v4.11.0
+        tag: v4.13.3
         pullPolicy: IfNotPresent
     csiProvisioner:
-        repository: registry.k8s.io/sig-storage/csi-provisioner
-        tag: v5.2.0
+        repository: /sig-storage/csi-provisioner
+        tag: v6.1.0
         pullPolicy: IfNotPresent
     csiResizer:
-        repository: registry.k8s.io/sig-storage/csi-resizer
-        tag: v1.13.1
+        repository: /sig-storage/csi-resizer
+        tag: v2.0.0
         pullPolicy: IfNotPresent
     csiSnapshotter:
-        repository: registry.k8s.io/sig-storage/csi-snapshotter
-        tag: v8.2.0
+        repository: /sig-storage/csi-snapshotter
+        tag: v8.4.0
         pullPolicy: IfNotPresent
     livenessProbe:
-        repository: registry.k8s.io/sig-storage/livenessprobe
-        tag: v2.15.0
+        repository: /sig-storage/livenessprobe
+        tag: v2.17.0
         pullPolicy: IfNotPresent
     nodeDriverRegistrar:
-        repository: registry.k8s.io/sig-storage/csi-node-driver-registrar
-        tag: v2.13.0
+        repository: /sig-storage/csi-node-driver-registrar
+        tag: v2.15.0
         pullPolicy: IfNotPresent
     externalSnapshotter:
-        repository: registry.k8s.io/sig-storage/snapshot-controller
-        tag: v8.2.0
+        repository: /sig-storage/snapshot-controller
+        tag: v8.4.0
         pullPolicy: IfNotPresent
 
 serviceAccount:
@@ -58,6 +58,7 @@ controller:
   runOnControlPlane: false
   enableSnapshotter: true
   useTarCommandInSnapshot: false
+  enableSnapshotCompression: true
   livenessProbe:
     healthPort: 29652
   logLevel: 5
@@ -112,6 +113,16 @@ controller:
         cpu: 10m
         memory: 20Mi
 
+nodeDriverRegistrar:
+  timeout: 60
+  healthPort: 19809
+  livenessProbe:
+    enabled: true
+    initialDelaySeconds: 20
+    timeoutSeconds: 10
+    periodSeconds: 5
+    failureThreshold: 2
+
 node:
   name: csi-nfs-node
   dnsPolicy: ClusterFirstWithHostNet  # available values: Default, ClusterFirstWithHostNet, ClusterFirst
@@ -183,7 +194,7 @@ storageClass:
 #     server: nfs-server.default.svc.cluster.local
 #     share: /
 #     subDir:
-#     mountPermissions: "0"
+#     mountPermissions: "0755"
 #     csi.storage.k8s.io/provisioner-secret is only needed for providing mountOptions in DeleteVolume
 #     csi.storage.k8s.io/provisioner-secret-name: "mount-options"
 #     csi.storage.k8s.io/provisioner-secret-namespace: "default"
@@ -191,3 +202,30 @@ storageClass:
 #   volumeBindingMode: Immediate
 #   mountOptions:
 #     - nfsvers=4.1
+
+## StorageClass resources for creating multiple storage classes:
+## If you want multiple storage classes with different configurations, use this instead of storageClass above
+# storageClasses:
+#   - name: nfs-delete
+#     annotations:
+#       storageclass.kubernetes.io/is-default-class: "true"
+#     parameters:
+#       server: nfs-server.default.svc.cluster.local
+#       share: /
+#       # subDir:
+#       # mountPermissions: "0"
+#       # csi.storage.k8s.io/provisioner-secret is only needed for providing mountOptions in DeleteVolume
+#       # csi.storage.k8s.io/provisioner-secret-name: "mount-options"
+#       # csi.storage.k8s.io/provisioner-secret-namespace: "default"
+#     reclaimPolicy: Delete
+#     volumeBindingMode: Immediate
+#     mountOptions:
+#       - nfsvers=4.1
+#   - name: nfs-retain
+#     parameters:
+#       server: nfs-server.default.svc.cluster.local
+#       share: /
+#     reclaimPolicy: Retain
+#     volumeBindingMode: Immediate
+#     mountOptions:
+#       - nfsvers=4.1
diff --git a/packages/system/objectstorage-controller/Makefile b/packages/system/objectstorage-controller/Makefile
index c8f0836af5..efd70a5832 100644
--- a/packages/system/objectstorage-controller/Makefile
+++ b/packages/system/objectstorage-controller/Makefile
@@ -19,8 +19,7 @@ image-controller image-sidecar:
 	docker buildx build images/objectstorage \
 		--target $(TARGET) \
 		$(call image-tags,objectstorage-$(TARGET),v$(COZYSTACK_VERSION)) \
-		--cache-from type=registry,ref=$(REGISTRY)/objectstorage-$(TARGET):latest \
-		--cache-to   type=inline \
+		$(call cache-args,objectstorage-$(TARGET)) \
 		--metadata-file images/$(TARGET).json \
 		$(BUILDX_ARGS)
 	IMAGE="$(REGISTRY)/objectstorage-$(TARGET):$(IMAGE_TAG)@$$(yq e '."containerimage.digest"' images/$(TARGET).json -r)" \
diff --git a/packages/system/objectstorage-controller/images/objectstorage/Dockerfile b/packages/system/objectstorage-controller/images/objectstorage/Dockerfile
index d71e5566b0..662a26799c 100644
--- a/packages/system/objectstorage-controller/images/objectstorage/Dockerfile
+++ b/packages/system/objectstorage-controller/images/objectstorage/Dockerfile
@@ -1,6 +1,6 @@
-# syntax=docker/dockerfile:1.2
+# syntax=docker/dockerfile:1.2@sha256:e2a8561e419ab1ba6b2fe6cbdf49fd92b95912df1cf7d313c3e2230a333fdbcc
 
-FROM alpine AS source
+FROM alpine@sha256:294b683cb724975bec92580e1e685676bd4b50bda910ddb8c51d4cabeaec77e6 AS source
 ARG COMMIT_REF=v0.2.2
 RUN apk add --no-cache curl tar git
 WORKDIR /src
@@ -11,24 +11,39 @@ RUN curl -sSL https://github.com/kubernetes-sigs/container-object-storage-interf
 COPY patches /patches
 RUN git apply /patches/*.diff
 
-FROM --platform=$BUILDPLATFORM docker.io/golang:1.24 AS builder
+FROM --platform=$BUILDPLATFORM docker.io/golang:1.27@sha256:3680233e3204827fbdc66088528ae6d4b3d034f51d03a99d454f6de034888244 AS builder
+ARG GOPROXY
 ARG TARGETOS
 ARG TARGETARCH
 
 WORKDIR /go/src/cosi
 
 COPY --from=source /src/go.mod /src/go.sum /src ./
-RUN go mod download
+RUN for attempt in 1 2 3; do go mod download && break; [ "$attempt" = 3 ] && exit 1; sleep $((attempt * 10)); done
+
+COPY --from=source /patches /patches
+
+# go build never compiles a _test.go, so nothing else runs the tests of the
+# packages the patches touch. Each package is tested from its own directory:
+# that finds the module it belongs to (internal/ is one of its own), and an
+# empty list runs nothing.
+# The list is read into a variable first: a for loop drops the exit status
+# of a command substitution, so a patch git cannot read would leave the list
+# empty and the step green.
+RUN files=$(git apply --numstat /patches/*.diff) || exit 1; \
+    for dir in $(printf '%s\n' "$files" | cut -f3 | grep '\.go$' | xargs -r -n1 dirname | sort -u); do \
+      (cd "$dir" && go test .) || exit 1; \
+    done
 
 RUN CGO_ENABLED=0 GOOS=$TARGETOS GOARCH=$TARGETARCH go build -o /build/controller ./controller/cmd \
  && CGO_ENABLED=0 GOOS=$TARGETOS GOARCH=$TARGETARCH go build -o /build/sidecar ./sidecar/cmd
 
-FROM gcr.io/distroless/static:nonroot AS controller
+FROM gcr.io/distroless/static:nonroot@sha256:e2e927ec666bae08560abb3c55d0659eceabb657f56b6782ab500a9fc7f555e3 AS controller
 COPY --from=builder /build/controller /controller
 USER 65532:65532
 ENTRYPOINT ["/controller"]
 
-FROM gcr.io/distroless/static:nonroot AS sidecar
+FROM gcr.io/distroless/static:nonroot@sha256:e2e927ec666bae08560abb3c55d0659eceabb657f56b6782ab500a9fc7f555e3 AS sidecar
 COPY --from=builder /build/sidecar /sidecar
 USER 65532:65532
 ENTRYPOINT ["/sidecar"]
diff --git a/packages/system/objectstorage-controller/images/objectstorage/patches/92-bucketclaim-propagate-ready.diff b/packages/system/objectstorage-controller/images/objectstorage/patches/92-bucketclaim-propagate-ready.diff
new file mode 100644
index 0000000000..ae245287db
--- /dev/null
+++ b/packages/system/objectstorage-controller/images/objectstorage/patches/92-bucketclaim-propagate-ready.diff
@@ -0,0 +1,190 @@
+diff --git a/controller/pkg/bucketclaim/bucketclaim.go b/controller/pkg/bucketclaim/bucketclaim.go
+index 2b55c49..9195195 100644
+--- a/controller/pkg/bucketclaim/bucketclaim.go
++++ b/controller/pkg/bucketclaim/bucketclaim.go
+@@ -213,8 +213,23 @@ func (b *BucketClaimListener) provisionBucketClaimOperation(ctx context.Context,
+ 			return b.recordError(inputBucketClaim, v1.EventTypeWarning, v1alpha1.FailedCreateBucket, err)
+ 		}
+ 
++		// The Bucket for this claim may already exist from an earlier reconcile,
++		// in which case the sidecar may have provisioned the backend and flipped
++		// the Bucket to ready in the meantime. The controller does not watch
++		// Buckets, so re-read the live object and propagate its readiness here;
++		// otherwise the BucketClaim stays BucketReady=false forever (each resync
++		// re-enters this branch, Create returns AlreadyExists, and the readiness
++		// transition is never reflected), so BucketAccess can never be granted.
++		createdBucket, getErr := b.buckets().Get(ctx, bucketName, metav1.GetOptions{})
++		if getErr != nil {
++			klog.V(3).ErrorS(getErr, "Error reading bucket after create",
++				"bucket", bucketName,
++				"bucketClaim", bucketClaim.ObjectMeta.Name)
++			return b.recordError(inputBucketClaim, v1.EventTypeWarning, v1alpha1.FailedCreateBucket, getErr)
++		}
++
+ 		bucketClaim.Status.BucketName = bucketName
+-		bucketClaim.Status.BucketReady = false
++		bucketClaim.Status.BucketReady = createdBucket.Status.BucketReady
+ 	}
+ 
+ 	// Update status with retry logic for conflict errors
+@@ -282,6 +297,22 @@ func (b *BucketClaimListener) provisionBucketClaimOperation(ctx context.Context,
+ 		return b.recordError(inputBucketClaim, v1.EventTypeWarning, v1alpha1.FailedCreateBucket, err)
+ 	}
+ 
++	// The backend Bucket is provisioned asynchronously by the sidecar, which
++	// flips Bucket.status.bucketReady on an object this controller does not
++	// watch. The periodic informer resync cannot re-drive convergence either:
++	// the generic controller drops no-op resync deltas (reflect.DeepEqual in
++	// internal/runtime/controller.go) and nothing mutates the BucketClaim after
++	// this point. So while the Bucket is not ready, return an error to force a
++	// rate-limited requeue; each retry re-reads the live Bucket above until its
++	// readiness has been propagated onto the claim. Surface a Warning event so
++	// an operator can see why the claim is still pending (the returned error is
++	// logged at klog.V(3), suppressed at default verbosity); event aggregation
++	// folds the per-requeue repetition into a single counted entry.
++	if !statusBucketReady {
++		err := fmt.Errorf("backend Bucket %q for BucketClaim %q not ready yet; requeuing", bucketName, bucketClaim.ObjectMeta.Name)
++		return b.recordError(inputBucketClaim, v1.EventTypeWarning, v1alpha1.WaitingForBucket, err)
++	}
++
+ 	klog.V(3).Infof("Finished creating Bucket %v", bucketName)
+ 	return nil
+ }
+diff --git a/controller/pkg/bucketclaim/bucketclaim_test.go b/controller/pkg/bucketclaim/bucketclaim_test.go
+index fea6f16..837f7e5 100644
+--- a/controller/pkg/bucketclaim/bucketclaim_test.go
++++ b/controller/pkg/bucketclaim/bucketclaim_test.go
+@@ -3,6 +3,7 @@ package bucketclaim
+ import (
+ 	"context"
+ 	"fmt"
++	"strings"
+ 	"sync"
+ 	"testing"
+ 
+@@ -379,6 +380,18 @@ func TestRetryOnConflictStatusUpdate(t *testing.T) {
+ 		t.Fatalf("Error occurred when creating BucketClaim: %v", err)
+ 	}
+ 
++	// Pre-create the backend Bucket already flipped to ready so readiness
++	// propagation lands true and Add completes. This test exercises the
++	// status-update conflict-retry path, not the not-ready requeue path
++	// (the latter is covered by TestProvisionRequeuesUntilBucketReady).
++	readyBucket := &v1alpha1.Bucket{
++		ObjectMeta: metav1.ObjectMeta{Name: fmt.Sprintf("bucket-%s", bucketClaim.UID)},
++		Status:     v1alpha1.BucketStatus{BucketReady: true},
++	}
++	if _, err := client.ObjectstorageV1alpha1().Buckets().Create(ctx, readyBucket, metav1.CreateOptions{}); err != nil {
++		t.Fatalf("Error occurred when pre-creating ready Bucket: %v", err)
++	}
++
+ 	// Cleanup
+ 	defer util.DeleteObjects(ctx, client, *bucketClaim, *bucketclass)
+ 
+@@ -436,8 +449,8 @@ func TestRetryOnConflictStatusUpdate(t *testing.T) {
+ 		t.Errorf("Expected BucketName %s, got %s", expectedBucketName, updatedClaim.Status.BucketName)
+ 	}
+ 
+-	if updatedClaim.Status.BucketReady != false {
+-		t.Errorf("Expected BucketReady to be false, got %v", updatedClaim.Status.BucketReady)
++	if updatedClaim.Status.BucketReady != true {
++		t.Errorf("Expected BucketReady to be true, got %v", updatedClaim.Status.BucketReady)
+ 	}
+ 
+ 	// Verify finalizer was added
+@@ -445,3 +458,95 @@ func TestRetryOnConflictStatusUpdate(t *testing.T) {
+ 		t.Errorf("Expected finalizer to be added, but it was not found")
+ 	}
+ }
++
++// TestProvisionRequeuesUntilBucketReady pins the readiness-propagation contract.
++// The controller does not watch Bucket objects and the generic controller drops
++// no-op resync deltas, so the BucketClaim must be driven to ready by the
++// provision path itself: Add returns an error (forcing a rate-limited requeue)
++// while the backend Bucket is not ready, and returns nil with BucketReady=true
++// once the Bucket's readiness has propagated. Without the requeue the claim
++// would stay BucketReady=false forever and BucketAccess would never be granted.
++func TestProvisionRequeuesUntilBucketReady(t *testing.T) {
++	newListener := func(client *fakebucketclientset.Clientset) *BucketClaimListener {
++		l := NewBucketClaimListener()
++		l.InitializeKubeClient(fakekubeclientset.NewSimpleClientset())
++		l.InitializeBucketClient(client)
++		l.InitializeEventRecorder(record.NewFakeRecorder(3))
++		return l
++	}
++
++	t.Run("requeues while backend Bucket is not ready", func(t *testing.T) {
++		ctx, cancel := context.WithCancel(context.Background())
++		defer cancel()
++
++		client := fakebucketclientset.NewSimpleClientset()
++		if _, err := util.CreateBucketClass(ctx, client, &goldClass); err != nil {
++			t.Fatalf("Error occurred when creating BucketClass: %v", err)
++		}
++		bucketClaim, err := util.CreateBucketClaim(ctx, client, &bucketClaim1)
++		if err != nil {
++			t.Fatalf("Error occurred when creating BucketClaim: %v", err)
++		}
++
++		// The controller creates the Bucket with BucketReady=false and nothing
++		// flips it here, so Add must report an error to force a requeue.
++		err = newListener(client).Add(ctx, bucketClaim)
++		if err == nil {
++			t.Fatal("Add should return an error to requeue while the backend Bucket is not ready")
++		}
++		// Pin the stable substring the production requeue error carries. A
++		// refactor that drops the requeue (returning nil or a different error)
++		// would silently regress convergence; this keeps the contract loud.
++		if !strings.Contains(err.Error(), "not ready yet") {
++			t.Fatalf("Expected requeue error to contain %q, got: %v", "not ready yet", err)
++		}
++
++		updated, err := client.ObjectstorageV1alpha1().BucketClaims(bucketClaim.Namespace).Get(ctx, bucketClaim.Name, metav1.GetOptions{})
++		if err != nil {
++			t.Fatalf("Error occurred when reading BucketClaim: %v", err)
++		}
++		if updated.Status.BucketReady {
++			t.Errorf("Expected BucketReady to stay false while the backend Bucket is not ready")
++		}
++		// Status (name + finalizer) is still persisted before the requeue.
++		if updated.Status.BucketName != fmt.Sprintf("bucket-%s", bucketClaim.UID) {
++			t.Errorf("Expected BucketName to be set even while not ready, got %q", updated.Status.BucketName)
++		}
++	})
++
++	t.Run("converges once the backend Bucket is ready", func(t *testing.T) {
++		ctx, cancel := context.WithCancel(context.Background())
++		defer cancel()
++
++		client := fakebucketclientset.NewSimpleClientset()
++		if _, err := util.CreateBucketClass(ctx, client, &goldClass); err != nil {
++			t.Fatalf("Error occurred when creating BucketClass: %v", err)
++		}
++		bucketClaim, err := util.CreateBucketClaim(ctx, client, &bucketClaim1)
++		if err != nil {
++			t.Fatalf("Error occurred when creating BucketClaim: %v", err)
++		}
++
++		// Simulate the sidecar having already provisioned the backend and
++		// flipped the Bucket to ready before this reconcile.
++		readyBucket := &v1alpha1.Bucket{
++			ObjectMeta: metav1.ObjectMeta{Name: fmt.Sprintf("bucket-%s", bucketClaim.UID)},
++			Status:     v1alpha1.BucketStatus{BucketReady: true},
++		}
++		if _, err := client.ObjectstorageV1alpha1().Buckets().Create(ctx, readyBucket, metav1.CreateOptions{}); err != nil {
++			t.Fatalf("Error occurred when pre-creating ready Bucket: %v", err)
++		}
++
++		if err := newListener(client).Add(ctx, bucketClaim); err != nil {
++			t.Fatalf("Add should succeed once the backend Bucket is ready: %v", err)
++		}
++
++		updated, err := client.ObjectstorageV1alpha1().BucketClaims(bucketClaim.Namespace).Get(ctx, bucketClaim.Name, metav1.GetOptions{})
++		if err != nil {
++			t.Fatalf("Error occurred when reading BucketClaim: %v", err)
++		}
++		if !updated.Status.BucketReady {
++			t.Errorf("Expected BucketReady to propagate true once the backend Bucket is ready")
++		}
++	})
++}
diff --git a/packages/system/objectstorage-controller/images/objectstorage/patches/93-shorten-leaderelection-lease.diff b/packages/system/objectstorage-controller/images/objectstorage/patches/93-shorten-leaderelection-lease.diff
new file mode 100644
index 0000000000..1181f62e67
--- /dev/null
+++ b/packages/system/objectstorage-controller/images/objectstorage/patches/93-shorten-leaderelection-lease.diff
@@ -0,0 +1,23 @@
+diff --git a/internal/runtime/controller.go b/internal/runtime/controller.go
+index 902116a..4cbe4c3 100644
+--- a/internal/runtime/controller.go
++++ b/internal/runtime/controller.go
+@@ -171,10 +171,14 @@ func NewObjectStorageControllerWithClientset(identity string, leaderLockName str
+ 		threadiness:  threads,
+ 
+ 		ResyncPeriod: 30 * time.Second,
+-		// leader election
+-		LeaseDuration: 150 * time.Second,
+-		RenewDeadline: 120 * time.Second,
+-		RetryPeriod:   60 * time.Second,
++		// Leader election. The COSI controller and the per-driver sidecar both
++		// run single-replica, so leader election provides no HA — it only gates
++		// how fast a freshly recreated pod takes over. Use the standard
++		// Kubernetes leader-election timings instead of the upstream 150/120/60s
++		// so a recreated pod resumes reconciliation in ~15s rather than ~150s.
++		LeaseDuration: 15 * time.Second,
++		RenewDeadline: 10 * time.Second,
++		RetryPeriod:   2 * time.Second,
+ 
+ 		opMap: &sync.Map{},
+ 	}, nil
diff --git a/packages/system/objectstorage-controller/values.yaml b/packages/system/objectstorage-controller/values.yaml
index 6e7e715933..be5263fdee 100644
--- a/packages/system/objectstorage-controller/values.yaml
+++ b/packages/system/objectstorage-controller/values.yaml
@@ -1,3 +1,3 @@
 objectstorage:
   controller:
-    image: "ghcr.io/cozystack/cozystack/objectstorage-controller:v1.4.0-rc.2@sha256:9caab08581817e9d2abc3e63dabeb845af65df6f72977c8ac0cc4e685c47e28c"
+    image: "ghcr.io/cozystack/cozystack/objectstorage-controller:v1.6.0@sha256:9c284ef4f2fbbf5ee3ccd75f86ec6c993dc60aa673c6df3f9bd15d21a7e8485c"
diff --git a/packages/system/openbao-rd/cozyrds/openbao.yaml b/packages/system/openbao-rd/cozyrds/openbao.yaml
index 57c718703d..13e9c54537 100644
--- a/packages/system/openbao-rd/cozyrds/openbao.yaml
+++ b/packages/system/openbao-rd/cozyrds/openbao.yaml
@@ -8,7 +8,7 @@ spec:
     plural: openbaos
     singular: openbao
     openAPISchema: |-
-      {"title":"Chart Values","type":"object","properties":{"replicas":{"description":"Number of OpenBAO replicas. HA with Raft is automatically enabled when replicas > 1. Switching between standalone (file storage) and HA (Raft storage) modes requires data migration.","type":"integer","default":1},"resources":{"description":"Explicit CPU and memory configuration for each OpenBAO replica. When omitted, the preset defined in `resourcesPreset` is applied.","type":"object","default":{},"properties":{"cpu":{"description":"CPU available to each replica.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Memory (RAM) available to each replica.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}},"resourcesPreset":{"description":"Default sizing preset used when `resources` is omitted.","type":"string","default":"t1.small","enum":["t1.nano","t1.micro","t1.small","t1.medium","t1.large","t1.xlarge","t1.2xlarge","t1.4xlarge","c1.nano","c1.micro","c1.small","c1.medium","c1.large","c1.xlarge","c1.2xlarge","c1.4xlarge","s1.nano","s1.micro","s1.small","s1.medium","s1.large","s1.xlarge","s1.2xlarge","s1.4xlarge","u1.nano","u1.micro","u1.small","u1.medium","u1.large","u1.xlarge","u1.2xlarge","u1.4xlarge","m1.nano","m1.micro","m1.small","m1.medium","m1.large","m1.xlarge","m1.2xlarge","m1.4xlarge","nano","micro","small","medium","large","xlarge","2xlarge"]},"size":{"description":"Persistent Volume Claim size for data storage.","default":"10Gi","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"storageClass":{"description":"StorageClass used to store the data.","type":"string","default":"","x-kubernetes-validations":[{"rule":"self == oldSelf","message":"storageClass is immutable"}]},"external":{"description":"Enable external access from outside the cluster.","type":"boolean","default":false},"ui":{"description":"Enable the OpenBAO web UI.","type":"boolean","default":true}}}
+      {"title":"Chart Values","type":"object","properties":{"replicas":{"description":"Number of OpenBAO replicas. HA with Raft is automatically enabled when replicas > 1. Switching between standalone (file storage) and HA (Raft storage) modes requires data migration.","type":"integer","default":1},"resources":{"description":"Explicit CPU and memory configuration for each OpenBAO replica. When omitted, the preset defined in `resourcesPreset` is applied.","type":"object","default":{},"properties":{"cpu":{"description":"CPU available to each replica.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Memory (RAM) available to each replica.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}},"resourcesPreset":{"description":"Default sizing preset used when `resources` is omitted.","type":"string","default":"t1.small","enum":["t1.nano","t1.micro","t1.small","t1.medium","t1.large","t1.xlarge","t1.2xlarge","t1.4xlarge","c1.nano","c1.micro","c1.small","c1.medium","c1.large","c1.xlarge","c1.2xlarge","c1.4xlarge","s1.nano","s1.micro","s1.small","s1.medium","s1.large","s1.xlarge","s1.2xlarge","s1.4xlarge","u1.nano","u1.micro","u1.small","u1.medium","u1.large","u1.xlarge","u1.2xlarge","u1.4xlarge","m1.nano","m1.micro","m1.small","m1.medium","m1.large","m1.xlarge","m1.2xlarge","m1.4xlarge","nano","micro","small","medium","large","xlarge","2xlarge"]},"size":{"description":"Persistent Volume Claim size for data storage.","default":"10Gi","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"storageClass":{"description":"StorageClass used to store the data.","type":"string","default":"","x-kubernetes-validations":[{"rule":"self == oldSelf","message":"storageClass is immutable"}],"x-cozystack-options":{"source":"storageclass"}},"external":{"description":"Enable external access from outside the cluster.","type":"boolean","default":false},"ui":{"description":"Enable the OpenBAO web UI.","type":"boolean","default":true},"seal":{"description":"Seal configuration. The default is Shamir key shares. Set `type: static` for auto-unseal.","type":"object","default":{},"required":["keyId","secretName","type"],"properties":{"allowMigration":{"description":"Acknowledge a seal migration. The chart refuses to change `type` on an existing instance unless this is `true`. Set it only while running `bao operator unseal -migrate`, then remove it.","type":"boolean","default":false},"keyId":{"description":"Permanent identifier of the current key. OpenBAO stores it with the data the key wraps and picks the key by it, so change it whenever the key material changes. Lowercase alphanumerics, `-`, `.` and `_`, starting and ending with an alphanumeric, because the upstream chart evaluates the server config as a template and rewrites upper case placeholders such as `HOSTNAME` in it. Required when `type` is `static`.","type":"string","default":"","pattern":"^([a-z0-9]([-a-z0-9._]*[a-z0-9])?)?$"},"previousKeyId":{"description":"Identifier of the previous key, with the same character constraints as `keyId`. Required when `previousSecretName` is set.","type":"string","default":"","pattern":"^([a-z0-9]([-a-z0-9._]*[a-z0-9])?)?$"},"previousSecretName":{"description":"Secret holding the previous key during an n-1 key rotation, with the same name constraints as `secretName`. Keep it until the pods have been replaced and the active node has logged `upgrading stored keys`, see the README.","type":"string","default":"","maxLength":52,"pattern":"^([a-z0-9]([-a-z0-9]*[a-z0-9])?)?$"},"secretName":{"description":"Existing Secret in the tenant namespace whose key `key` holds the base64 text of 32 random bytes (for example `openssl rand -base64 32`). A cluster administrator creates it, because tenant roles cannot create Secrets. Lowercase alphanumerics and hyphens, at most 52 characters, because the pod volume is named `userconfig-<name>` and a volume name is a DNS label. Required when `type` is `static`.","type":"string","default":"","maxLength":52,"pattern":"^([a-z0-9]([-a-z0-9]*[a-z0-9])?)?$"},"type":{"description":"Seal type. `shamir` keeps the current behaviour, `static` enables auto-unseal from `secretName`.","type":"string","default":"shamir","enum":["shamir","static"]}}}}}
   release:
     prefix: openbao-
     labels:
@@ -25,7 +25,7 @@ spec:
     tags:
       - secrets
     icon: PHN2ZyB3aWR0aD0iMTQ0IiBoZWlnaHQ9IjE0NCIgdmlld0JveD0iMCAwIDE0NCAxNDQiIGZpbGw9Im5vbmUiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+CjxyZWN0IHdpZHRoPSIxNDQiIGhlaWdodD0iMTQ0IiByeD0iMjQiIGZpbGw9InVybCgjcGFpbnQwX2xpbmVhcikiLz4KPHJlY3Qgd2lkdGg9IjE0NCIgaGVpZ2h0PSIxNDQiIHJ4PSIyNCIgZmlsbD0iYmxhY2siIGZpbGwtb3BhY2l0eT0iMC4zIi8+CjxwYXRoIGZpbGwtcnVsZT0iZXZlbm9kZCIgY2xpcC1ydWxlPSJldmVub2RkIiBkPSJNNzIgMzBDNTMuMjIyIDMwIDM4IDQ1LjIyMiAzOCA2NHY4Yy0zLjMxNCAwLTYgMi42ODYtNiA2djMwYzAgMy4zMTQgMi42ODYgNiA2IDZoNjhjMy4zMTQgMCA2LTIuNjg2IDYtNlY3OGMwLTMuMzE0LTIuNjg2LTYtNi02di04QzEwNiA0NS4yMjIgOTAuNzc4IDMwIDcyIDMwem0tOCA0MnYtOGMwLTQuNDE4IDMuNTgyLTggOC04czggMy41ODIgOCA4djhINjR6bTI2IDB2LThjMC04LjgzNy03LjE2My0xNi0xNi0xNnMtMTYgNy4xNjMtMTYgMTZ2OGgtMnYyOGg2MFY3Mkg5MHptLTIyIDE0YTQgNCAwIDExOCAwIDQgNCAwIDAxLTggMHptNC04YTggOCAwIDEwMCAxNiA4IDggMCAwMDAtMTZ6IiBmaWxsPSJ3aGl0ZSIvPgo8ZGVmcz4KPGxpbmVhckdyYWRpZW50IGlkPSJwYWludDBfbGluZWFyIiB4MT0iMTAiIHkxPSIxNS41IiB4Mj0iMTQ0IiB5Mj0iMTMxLjUiIGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIj4KPHN0b3Agc3RvcC1jb2xvcj0iIzg3ZDZiZSIvPgo8c3RvcCBvZmZzZXQ9IjEiIHN0b3AtY29sb3I9IiM3OWMwYWIiLz4KPC9saW5lYXJHcmFkaWVudD4KPC9kZWZzPgo8L3N2Zz4K
-    keysOrder: [["apiVersion"], ["appVersion"], ["kind"], ["metadata"], ["metadata", "name"], ["spec", "replicas"], ["spec", "resources"], ["spec", "resourcesPreset"], ["spec", "size"], ["spec", "storageClass"], ["spec", "external"], ["spec", "ui"]]
+    keysOrder: [["apiVersion"], ["appVersion"], ["kind"], ["metadata"], ["metadata", "name"], ["spec", "replicas"], ["spec", "resources"], ["spec", "resourcesPreset"], ["spec", "size"], ["spec", "storageClass"], ["spec", "external"], ["spec", "ui"], ["spec", "seal"], ["spec", "seal", "type"], ["spec", "seal", "secretName"], ["spec", "seal", "keyId"], ["spec", "seal", "previousSecretName"], ["spec", "seal", "previousKeyId"], ["spec", "seal", "allowMigration"]]
   secrets:
     exclude: []
     include: []
diff --git a/packages/system/openbao/Makefile b/packages/system/openbao/Makefile
index 4ae6190e3b..5fad700eb3 100644
--- a/packages/system/openbao/Makefile
+++ b/packages/system/openbao/Makefile
@@ -7,4 +7,7 @@ export CHART_VERSION=^0.25
 
 include ../../../hack/package.mk
 
+test:
+	helm unittest .
+
 update: clean openbao-update
diff --git a/packages/system/openbao/charts/openbao/Chart.yaml b/packages/system/openbao/charts/openbao/Chart.yaml
index 4914439e1e..fb38973a14 100644
--- a/packages/system/openbao/charts/openbao/Chart.yaml
+++ b/packages/system/openbao/charts/openbao/Chart.yaml
@@ -2,11 +2,10 @@ annotations:
   artifacthub.io/changes: |
     - kind: changed
       description: |
-        fix: Add extraPorts to server Service in ha
-  artifacthub.io/containsSecurityUpdates: "false"
+        fix: Add job selector in Grafana dashboard
   charts.openshift.io/name: Openbao
 apiVersion: v2
-appVersion: v2.5.0
+appVersion: v2.5.1
 description: Official OpenBao Chart
 home: https://github.com/openbao/openbao-helm
 icon: https://raw.githubusercontent.com/openbao/artwork/refs/heads/main/color/openbao-color.svg
@@ -27,4 +26,4 @@ maintainers:
 name: openbao
 sources:
 - https://github.com/openbao/openbao-helm
-version: 0.25.3
+version: 0.25.7
diff --git a/packages/system/openbao/charts/openbao/README.md b/packages/system/openbao/charts/openbao/README.md
index bcdf92b143..f042aeabcb 100644
--- a/packages/system/openbao/charts/openbao/README.md
+++ b/packages/system/openbao/charts/openbao/README.md
@@ -1,6 +1,6 @@
 # openbao
 
-![Version: 0.25.3](https://img.shields.io/badge/Version-0.25.3-informational?style=flat-square) ![AppVersion: v2.5.0](https://img.shields.io/badge/AppVersion-v2.5.0-informational?style=flat-square)
+![Version: 0.25.7](https://img.shields.io/badge/Version-0.25.7-informational?style=flat-square) ![AppVersion: v2.5.1](https://img.shields.io/badge/AppVersion-v2.5.1-informational?style=flat-square)
 
 Official OpenBao Chart
 
@@ -280,6 +280,7 @@ Kubernetes: `>= 1.30.0-0`
 | server.service.externalTrafficPolicy | string | `"Cluster"` |  |
 | server.service.extraLabels | object | `{}` |  |
 | server.service.extraPorts | list | `[]` | extraPorts is a list of extra ports. Specified as a YAML list. This is useful if you need to add additional ports to the server service in dynamic way. |
+| server.service.headless.annotations | object | `{}` |  |
 | server.service.instanceSelector.enabled | bool | `true` |  |
 | server.service.ipFamilies | list | `[]` |  |
 | server.service.ipFamilyPolicy | string | `""` |  |
@@ -337,7 +338,7 @@ Kubernetes: `>= 1.30.0-0`
 | snapshotAgent.extraVolumeMounts | list | `[]` | List of additional volumeMounts for the snapshot cronjob container. |
 | snapshotAgent.extraVolumes | list | `[]` | List of extraVolumes made available to the snapshot cronjob container. |
 | snapshotAgent.image.repository | string | `"ghcr.io/openbao/openbao-snapshot-agent"` |  |
-| snapshotAgent.image.tag | string | `"0.2.4"` |  |
+| snapshotAgent.image.tag | string | `"0.3.0"` |  |
 | snapshotAgent.resources | object | `{}` |  |
 | snapshotAgent.restartPolicy | string | `"OnFailure"` |  |
 | snapshotAgent.s3CredentialsSecret | string | `"my-s3-credentials"` |  |
diff --git a/packages/system/openbao/charts/openbao/grafana/dashboards/dashboard.json b/packages/system/openbao/charts/openbao/grafana/dashboards/dashboard.json
index b4eb93b92d..68399027af 100644
--- a/packages/system/openbao/charts/openbao/grafana/dashboards/dashboard.json
+++ b/packages/system/openbao/charts/openbao/grafana/dashboards/dashboard.json
@@ -133,7 +133,7 @@
       "pluginVersion": "7.0.3",
       "targets": [
         {
-          "expr": "up{job=\"openbao-internal\"}",
+          "expr": "up{job=\"${job}\"}",
           "format": "time_series",
           "interval": "",
           "legendFormat": "{{ instance }}",
@@ -203,7 +203,7 @@
       "pluginVersion": "7.0.3",
       "targets": [
         {
-          "expr": "sum by (exported_namespace,mount_point) (${metrics_prefix}_secret_kv_count)",
+          "expr": "sum by (exported_namespace,mount_point) (${metrics_prefix}_secret_kv_count{job=\"${job}\"})",
           "format": "table",
           "instant": true,
           "interval": "",
@@ -284,7 +284,7 @@
       "pluginVersion": "7.0.3",
       "targets": [
         {
-          "expr": "avg(${metrics_prefix}_identity_num_entities)",
+          "expr": "avg(${metrics_prefix}_identity_num_entities{job=\"${job}\"})",
           "interval": "",
           "legendFormat": "",
           "refId": "A"
@@ -353,7 +353,7 @@
       "strokeWidth": "3",
       "targets": [
         {
-          "expr": "avg without(instance) (${metrics_prefix}_identity_entity_alias_count)",
+          "expr": "avg without(instance) (${metrics_prefix}_identity_entity_alias_count{job=\"${job}\"})",
           "format": "time_series",
           "interval": "",
           "legendFormat": "{{ auth_method }}",
@@ -433,7 +433,7 @@
       "pluginVersion": "7.0.3",
       "targets": [
         {
-          "expr": "max(1 + ${metrics_prefix}_core_unsealed{})",
+          "expr": "max(1 + ${metrics_prefix}_core_unsealed{job=\"${job}\"})",
           "format": "time_series",
           "interval": "",
           "legendFormat": "{{ instance }}",
@@ -496,7 +496,7 @@
       "pluginVersion": "7.0.3",
       "targets": [
         {
-          "expr": "avg(${metrics_prefix}_expire_num_leases)",
+          "expr": "avg(${metrics_prefix}_expire_num_leases{job=\"${job}\"})",
           "interval": "",
           "legendFormat": "",
           "refId": "A"
@@ -580,7 +580,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "avg(increase(${metrics_prefix}_route_create_${mountpoint}__count[5m]))",
+              "expr": "avg(increase(${metrics_prefix}_route_create_${mountpoint}__count{job=\"${job}\"}[5m]))",
               "format": "time_series",
               "hide": false,
               "interval": "5m",
@@ -588,14 +588,14 @@
               "refId": "A"
             },
             {
-              "expr": "avg(increase(${metrics_prefix}_route_delete_${mountpoint}__count[5m]))",
+              "expr": "avg(increase(${metrics_prefix}_route_delete_${mountpoint}__count{job=\"${job}\"}[5m]))",
               "hide": false,
               "interval": "5m",
               "legendFormat": "Delete",
               "refId": "B"
             },
             {
-              "expr": "avg(increase(${metrics_prefix}_route_read_${mountpoint}__count[5m]))",
+              "expr": "avg(increase(${metrics_prefix}_route_read_${mountpoint}__count{job=\"${job}\"}[5m]))",
               "format": "time_series",
               "hide": false,
               "instant": false,
@@ -605,7 +605,7 @@
               "refId": "C"
             },
             {
-              "expr": "avg(increase(${metrics_prefix}_route_list_${mountpoint}__count[5m]))",
+              "expr": "avg(increase(${metrics_prefix}_route_list_${mountpoint}__count{job=\"${job}\"}[5m]))",
               "format": "time_series",
               "hide": false,
               "interval": "5m",
@@ -613,7 +613,7 @@
               "refId": "D"
             },
             {
-              "expr": "avg(increase(${metrics_prefix}_route_rollback_${mountpoint}__count[5m]))",
+              "expr": "avg(increase(${metrics_prefix}_route_rollback_${mountpoint}__count{job=\"${job}\"}[5m]))",
               "hide": true,
               "interval": "5m",
               "legendFormat": "Rollback",
@@ -726,7 +726,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "avg(rate(${metrics_prefix}_route_create_${mountpoint}__sum[1m]) / rate(${metrics_prefix}_route_create_${mountpoint}__count[1m]) * 1000)",
+              "expr": "avg(rate(${metrics_prefix}_route_create_${mountpoint}__sum{job=\"${job}\"}[1m]) / rate(${metrics_prefix}_route_create_${mountpoint}__count{job=\"${job}\"}[1m]) * 1000)",
               "format": "time_series",
               "interval": "",
               "intervalFactor": 1,
@@ -734,27 +734,27 @@
               "refId": "A"
             },
             {
-              "expr": "avg(rate(${metrics_prefix}_route_delete_${mountpoint}__sum[1m]) / rate(${metrics_prefix}_route_delete_${mountpoint}__count[1m]) * 1000)",
+              "expr": "avg(rate(${metrics_prefix}_route_delete_${mountpoint}__sum{job=\"${job}\"}[1m]) / rate(${metrics_prefix}_route_delete_${mountpoint}__count{job=\"${job}\"}[1m]) * 1000)",
               "interval": "",
               "legendFormat": "Delete",
               "refId": "B"
             },
             {
-              "expr": "avg(rate(${metrics_prefix}_route_read_${mountpoint}__sum[1m]) / rate(${metrics_prefix}_route_read_${mountpoint}__count[1m]) * 1000)",
+              "expr": "avg(rate(${metrics_prefix}_route_read_${mountpoint}__sum{job=\"${job}\"}[1m]) / rate(${metrics_prefix}_route_read_${mountpoint}__count{job=\"${job}\"}[1m]) * 1000)",
               "hide": false,
               "interval": "",
               "legendFormat": "Read",
               "refId": "C"
             },
             {
-              "expr": "avg(rate(${metrics_prefix}_route_list_${mountpoint}__sum[1m]) / rate(${metrics_prefix}_route_list_${mountpoint}__count[1m]) * 1000)",
+              "expr": "avg(rate(${metrics_prefix}_route_list_${mountpoint}__sum{job=\"${job}\"}[1m]) / rate(${metrics_prefix}_route_list_${mountpoint}__count{job=\"${job}\"}[1m]) * 1000)",
               "hide": false,
               "interval": "",
               "legendFormat": "List",
               "refId": "D"
             },
             {
-              "expr": "avg(rate(${metrics_prefix}_route_rollback_${mountpoint}__sum[1m]) / rate(${metrics_prefix}_route_rollback_${mountpoint}__count[1m]) * 1000)",
+              "expr": "avg(rate(${metrics_prefix}_route_rollback_${mountpoint}__sum{job=\"${job}\"}[1m]) / rate(${metrics_prefix}_route_rollback_${mountpoint}__count{job=\"${job}\"}[1m]) * 1000)",
               "hide": true,
               "interval": "",
               "legendFormat": "Rollback",
@@ -870,7 +870,7 @@
       "pluginVersion": "7.0.3",
       "targets": [
         {
-          "expr": "avg(${metrics_prefix}_runtime_heap_objects{} / ${metrics_prefix}_runtime_malloc_count{})",
+          "expr": "avg(${metrics_prefix}_runtime_heap_objects{job=\"${job}\"} / ${metrics_prefix}_runtime_malloc_count{job=\"${job}\"})",
           "interval": "",
           "intervalFactor": 10,
           "legendFormat": "",
@@ -934,7 +934,7 @@
       "pluginVersion": "7.0.3",
       "targets": [
         {
-          "expr": "avg(${metrics_prefix}_runtime_num_goroutines{})",
+          "expr": "avg(${metrics_prefix}_runtime_num_goroutines{job=\"${job}\"})",
           "interval": "",
           "legendFormat": "",
           "refId": "A"
@@ -1012,7 +1012,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "avg(${metrics_prefix}_runtime_alloc_bytes{})",
+          "expr": "avg(${metrics_prefix}_runtime_alloc_bytes{job=\"${job}\"})",
           "interval": "",
           "intervalFactor": 5,
           "legendFormat": "$node",
@@ -1116,7 +1116,7 @@
       "pluginVersion": "7.0.3",
       "targets": [
         {
-          "expr": "avg(${metrics_prefix}_token_count)",
+          "expr": "avg(${metrics_prefix}_token_count{job=\"${job}\"})",
           "interval": "",
           "legendFormat": "",
           "refId": "A"
@@ -1177,7 +1177,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "avg without(instance) (${metrics_prefix}_token_count_by_policy)",
+          "expr": "avg without(instance) (${metrics_prefix}_token_count_by_policy{job=\"${job}\"})",
           "interval": "",
           "legendFormat": "{{ policy }}",
           "refId": "A"
@@ -1283,7 +1283,7 @@
       "pluginVersion": "7.0.3",
       "targets": [
         {
-          "expr": "avg(${metrics_prefix}_token_create_count - ${metrics_prefix}_token_store_count)",
+          "expr": "avg(${metrics_prefix}_token_create_count{job=\"${job}\"} - ${metrics_prefix}_token_store_count{job=\"${job}\"})",
           "format": "time_series",
           "interval": "",
           "intervalFactor": 1,
@@ -1346,7 +1346,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "avg without(instance) (${metrics_prefix}_token_count_by_ttl)",
+          "expr": "avg without(instance) (${metrics_prefix}_token_count_by_ttl{job=\"${job}\"})",
           "format": "time_series",
           "interval": "",
           "legendFormat": "{{ creation_ttl }}",
@@ -1446,7 +1446,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "avg without(instance) (${metrics_prefix}_token_count_by_auth)",
+          "expr": "avg without(instance) (${metrics_prefix}_token_count_by_auth{job=\"${job}\"})",
           "interval": "",
           "legendFormat": "{{ auth_method }}",
           "refId": "A"
@@ -1563,7 +1563,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "avg by(auth_method, creation_ttl) (${metrics_prefix}_token_creation)",
+          "expr": "avg by(auth_method, creation_ttl) (${metrics_prefix}_token_creation{job=\"${job}\"})",
           "format": "time_series",
           "instant": false,
           "interval": "",
@@ -1667,7 +1667,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "avg without(instance) (${metrics_prefix}_token_create_count)",
+          "expr": "avg without(instance) (${metrics_prefix}_token_create_count{job=\"${job}\"})",
           "format": "time_series",
           "instant": false,
           "interval": "",
@@ -1676,7 +1676,7 @@
           "refId": "A"
         },
         {
-          "expr": "avg without(instance) (${metrics_prefix}_token_store_count)",
+          "expr": "avg without(instance) (${metrics_prefix}_token_store_count{job=\"${job}\"})",
           "format": "time_series",
           "hide": false,
           "instant": false,
@@ -1784,7 +1784,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "avg(irate(${metrics_prefix}_token_lookup_count[1m]))",
+          "expr": "avg(irate(${metrics_prefix}_token_lookup_count{job=\"${job}\"}[1m]))",
           "hide": false,
           "interval": "",
           "legendFormat": "Lookups",
@@ -1894,7 +1894,7 @@
       "pluginVersion": "7.0.3",
       "targets": [
         {
-          "expr": "max(idelta(${metrics_prefix}_audit_log_request_failure[1m]))",
+          "expr": "max(idelta(${metrics_prefix}_audit_log_request_failure{job=\"${job}\"}[1m]))",
           "format": "time_series",
           "interval": "",
           "legendFormat": "Request",
@@ -1959,7 +1959,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "avg(irate(${metrics_prefix}_audit_log_request_count[1m]))",
+          "expr": "avg(irate(${metrics_prefix}_audit_log_request_count{job=\"${job}\"}[1m]))",
           "format": "time_series",
           "instant": false,
           "interval": "",
@@ -1968,7 +1968,7 @@
           "refId": "A"
         },
         {
-          "expr": "avg(irate(${metrics_prefix}_audit_log_response_count[1m]))",
+          "expr": "avg(irate(${metrics_prefix}_audit_log_response_count{job=\"${job}\"}[1m]))",
           "format": "time_series",
           "hide": false,
           "instant": false,
@@ -1978,7 +1978,7 @@
           "refId": "B"
         },
         {
-          "expr": "avg(irate(${metrics_prefix}_core_handle_request_count[1m]))",
+          "expr": "avg(irate(${metrics_prefix}_core_handle_request_count{job=\"${job}\"}[1m]))",
           "format": "time_series",
           "hide": false,
           "interval": "",
@@ -2079,26 +2079,26 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "avg(irate(${metrics_prefix}_consul_get_count[1m]))",
+          "expr": "avg(irate(${metrics_prefix}_consul_get_count{job=\"${job}\"}[1m]))",
           "interval": "",
           "intervalFactor": 1,
           "legendFormat": "GET",
           "refId": "A"
         },
         {
-          "expr": "avg(irate(${metrics_prefix}_consul_put_count[1m]))",
+          "expr": "avg(irate(${metrics_prefix}_consul_put_count{job=\"${job}\"}[1m]))",
           "interval": "",
           "legendFormat": "PUT",
           "refId": "B"
         },
         {
-          "expr": "avg(irate(${metrics_prefix}_consul_delete_count[1m]))",
+          "expr": "avg(irate(${metrics_prefix}_consul_delete_count{job=\"${job}\"}[1m]))",
           "interval": "",
           "legendFormat": "DELETE",
           "refId": "C"
         },
         {
-          "expr": "irate(${metrics_prefix}_consul_list_count{instance=\"$node:$port\"}[1m])",
+          "expr": "irate(${metrics_prefix}_consul_list_count{instance=\"$node:$port\", job=\"${job}\"}[1m])",
           "interval": "",
           "legendFormat": "LIST",
           "refId": "D"
@@ -2192,7 +2192,7 @@
       "pluginVersion": "7.0.3",
       "targets": [
         {
-          "expr": "max(idelta(${metrics_prefix}_audit_log_response_failure[1m]))",
+          "expr": "max(idelta(${metrics_prefix}_audit_log_response_failure{job=\"${job}\"}[1m]))",
           "format": "time_series",
           "interval": "",
           "legendFormat": "Request",
@@ -2269,7 +2269,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "avg(irate(${metrics_prefix}_policy_set_policy_count[1m]))",
+          "expr": "avg(irate(${metrics_prefix}_policy_set_policy_count{job=\"${job}\"}[1m]))",
           "format": "time_series",
           "interval": "",
           "intervalFactor": 1,
@@ -2370,7 +2370,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "avg(irate(${metrics_prefix}_policy_get_policy_count[1m]))",
+          "expr": "avg(irate(${metrics_prefix}_policy_get_policy_count{job=\"${job}\"}[1m]))",
           "format": "time_series",
           "interval": "",
           "intervalFactor": 1,
@@ -2445,16 +2445,39 @@
       },
       {
         "allValue": null,
+        "allowCustomValue": false,
         "current": {},
         "datasource": "${DS_PROMXY}",
-        "definition": "label_values(up{job=\"openbao-internal\"}, instance)",
+        "definition": "label_values(${metrics_prefix}_core_active,job)",
+        "hide": 0,
+        "includeAll": false,
+        "label": "Job:",
+        "name": "job",
+        "multi": false,
+        "options": [],
+        "query": "label_values(${metrics_prefix}_core_active,job)",
+        "refresh": 1,
+        "regex": "",
+        "skipUrlSync": false,
+        "sort": 0,
+        "tagValuesQuery": "",
+        "tags": [],
+        "tagsQuery": "",
+        "type": "query",
+        "useTags": false
+      },
+      {
+        "allValue": null,
+        "current": {},
+        "datasource": "${DS_PROMXY}",
+        "definition": "label_values(up{job=\"$job\"}, instance)",
         "hide": 2,
         "includeAll": false,
         "label": "Host:",
         "multi": false,
         "name": "node",
         "options": [],
-        "query": "label_values(up{job=\"openbao-internal\"}, instance)",
+        "query": "label_values(up{job=\"$job\"}, instance)",
         "refresh": 1,
         "regex": "/([^:]+):.*/",
         "skipUrlSync": false,
@@ -2469,14 +2492,14 @@
         "allValue": null,
         "current": {},
         "datasource": "${DS_PROMXY}",
-        "definition": "label_values(up{job=\"openbao-internal\",instance=~\"$node:(.*)\"}, instance)",
+        "definition": "label_values(up{job=\"$job\",instance=~\"$node:(.*)\"}, instance)",
         "hide": 2,
         "includeAll": false,
         "label": null,
         "multi": false,
         "name": "port",
         "options": [],
-        "query": "label_values(up{job=\"openbao-internal\",instance=~\"$node:(.*)\"}, instance)",
+        "query": "label_values(up{job=\"$job\",instance=~\"$node:(.*)\"}, instance)",
         "refresh": 1,
         "regex": "/[^:]+:(.*)/",
         "skipUrlSync": false,
@@ -2491,14 +2514,14 @@
         "allValue": "",
         "current": {},
         "datasource": "${DS_PROMXY}",
-        "definition": "label_values(${metrics_prefix}_secret_kv_count, mount_point)",
+        "definition": "label_values(${metrics_prefix}_secret_kv_count{job=\"$job\"}, mount_point)",
         "hide": 0,
         "includeAll": true,
         "label": "Mount Point:",
         "multi": true,
         "name": "mountpoint",
         "options": [],
-        "query": "label_values(${metrics_prefix}_secret_kv_count, mount_point)",
+        "query": "label_values(${metrics_prefix}_secret_kv_count{job=\"$job\"}, mount_point)",
         "refresh": 2,
         "regex": "/(.*)//",
         "skipUrlSync": false,
diff --git a/packages/system/openbao/charts/openbao/templates/_helpers.tpl b/packages/system/openbao/charts/openbao/templates/_helpers.tpl
index 3597697b41..d380c5d11b 100644
--- a/packages/system/openbao/charts/openbao/templates/_helpers.tpl
+++ b/packages/system/openbao/charts/openbao/templates/_helpers.tpl
@@ -786,6 +786,23 @@ Sets extra openbao server Service (standby) annotations
   {{- end }}
 {{- end -}}
 
+{{/*
+Sets extra openbao server Service (headless) annotations
+*/}}
+{{- define "openbao.service.headless.annotations" -}}
+  {{- $headless := .Values.server.service.headless.annotations -}}
+  {{- $generic := .Values.server.service.annotations -}}
+  {{- if or $headless $generic }}
+  annotations:
+    {{- if $headless }}
+      {{- include "openbao.annotations.render.4" (list . $headless) -}}
+    {{- end }}
+    {{- if $generic }}
+      {{- include "openbao.annotations.render.4" (list . $generic) -}}
+    {{- end }}
+  {{- end }}
+{{- end -}}
+
 {{/*
 Sets PodSecurityPolicy annotations
 */}}
diff --git a/packages/system/openbao/charts/openbao/templates/server-headless-service.yaml b/packages/system/openbao/charts/openbao/templates/server-headless-service.yaml
index b3441c8f2e..c0a208abfa 100644
--- a/packages/system/openbao/charts/openbao/templates/server-headless-service.yaml
+++ b/packages/system/openbao/charts/openbao/templates/server-headless-service.yaml
@@ -19,7 +19,7 @@ metadata:
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     openbao-internal: "true"
-{{ template "openbao.service.annotations" .}}
+{{- template "openbao.service.headless.annotations" .}}
 spec:
   {{- if (semverCompare ">= 1.23-0" .Capabilities.KubeVersion.Version) }}
   {{- if .Values.server.service.ipFamilyPolicy }}
diff --git a/packages/system/openbao/charts/openbao/values.yaml b/packages/system/openbao/charts/openbao/values.yaml
index 7e2f604fbf..332d3e1396 100644
--- a/packages/system/openbao/charts/openbao/values.yaml
+++ b/packages/system/openbao/charts/openbao/values.yaml
@@ -807,6 +807,11 @@ server:
       # Extra labels for the service definition.
       # This should be a YAML map of the labels to apply to the standby service
       extraLabels: {}
+    headless:
+      # Extra annotations for the headless service definition. This can either be YAML or a
+      # YAML-formatted multi-line templated string map of the annotations to apply
+      # to the headless service.
+      annotations: {}
     # If enabled, the service selectors will include `app.kubernetes.io/instance: {{ .Release.Name }}`
     # When disabled, services may select OpenBao pods not deployed from the chart.
     # Does not affect the headless openbao-internal service with `ClusterIP: None`
@@ -1524,7 +1529,7 @@ snapshotAgent:
   # The image settings for the snapshot agent
   image:
     repository: ghcr.io/openbao/openbao-snapshot-agent
-    tag: 0.2.4
+    tag: 0.3.0
 
   # -- List of extraVolumes made available to the snapshot cronjob container.
   extraVolumes: []
diff --git a/packages/system/openbao/tests/openbao_test.yaml b/packages/system/openbao/tests/openbao_test.yaml
new file mode 100644
index 0000000000..5817bd3dd5
--- /dev/null
+++ b/packages/system/openbao/tests/openbao_test.yaml
@@ -0,0 +1,29 @@
+suite: cozy-openbao chart rendering invariants
+release:
+  name: openbao
+  namespace: cozy-openbao
+tests:
+  - it: renders the openbao server StatefulSet on the pinned image
+    template: charts/openbao/templates/server-statefulset.yaml
+    documentSelector:
+      path: kind
+      value: StatefulSet
+    asserts:
+      # Pin the full registry-qualified image. A partial regex on
+      # openbao/openbao:2.5.1 would also pass a wrong registry (e.g.
+      # docker.io); the chart configures quay.io, so assert it verbatim.
+      - equal:
+          path: spec.template.spec.containers[0].image
+          value: quay.io/openbao/openbao:2.5.1
+
+  - it: keeps the agent injector disabled (cozystack override)
+    template: charts/openbao/templates/injector-deployment.yaml
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  - it: keeps the CSI provider disabled (cozystack override)
+    template: charts/openbao/templates/csi-daemonset.yaml
+    asserts:
+      - hasDocuments:
+          count: 0
diff --git a/packages/system/opencost/Makefile b/packages/system/opencost/Makefile
index 43ee703261..3038885e43 100644
--- a/packages/system/opencost/Makefile
+++ b/packages/system/opencost/Makefile
@@ -3,8 +3,15 @@ export NAMESPACE=cozy-$(NAME)
 
 include ../../../hack/package.mk
 
+test:
+	helm unittest .
+
 update:
 	rm -rf charts
 	helm repo add opencost-charts https://opencost.github.io/opencost-helm-chart
 	helm repo update opencost-charts
-	helm pull opencost-charts/opencost --untar --untardir charts
+	helm pull opencost-charts/opencost --untar --untardir charts --version 2.5.23
+	# Drop the upstream chart's own helm-unittest suite: it is snapshot-based
+	# and fails in the cozystack render context (configsChecksum can't resolve
+	# the custom-pricing configmap glob). cozystack ships its own tests/.
+	rm -rf charts/opencost/tests
diff --git a/packages/system/opencost/charts/opencost/Chart.yaml b/packages/system/opencost/charts/opencost/Chart.yaml
index e68536701e..3ae75e7e31 100644
--- a/packages/system/opencost/charts/opencost/Chart.yaml
+++ b/packages/system/opencost/charts/opencost/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 1.111.0
+appVersion: 1.120.3
 description: OpenCost and OpenCost UI
 home: https://github.com/opencost/opencost-helm-chart
 keywords:
@@ -9,11 +9,11 @@ keywords:
 - monitoring
 - opencost
 maintainers:
-- name: mattray
-  url: https://mattray.dev
+- name: jessegoodier
 - name: toscott
+- name: mittal-ishaan
 - email: rafa@stormforge.io
   name: brito-rafa
 name: opencost
 type: application
-version: 1.41.0
+version: 2.5.23
diff --git a/packages/system/opencost/charts/opencost/README.md b/packages/system/opencost/charts/opencost/README.md
index 69c7d45315..e35a0de95e 100644
--- a/packages/system/opencost/charts/opencost/README.md
+++ b/packages/system/opencost/charts/opencost/README.md
@@ -2,9 +2,9 @@
 
 OpenCost and OpenCost UI
 
-![Version: 1.41.0](https://img.shields.io/badge/Version-1.41.0-informational?style=flat-square)
+![Version: 2.5.23](https://img.shields.io/badge/Version-2.5.23-informational?style=flat-square)
 ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
-![AppVersion: 1.111.0](https://img.shields.io/badge/AppVersion-1.111.0-informational?style=flat-square)
+![AppVersion: 1.120.3](https://img.shields.io/badge/AppVersion-1.120.3-informational?style=flat-square)
 [![Artifact Hub](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/opencost)](https://artifacthub.io/packages/search?repo=opencost)
 [![Artifact Hub](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/opencost-oci)](https://artifacthub.io/packages/search?repo=opencost-oci)
 
@@ -12,8 +12,9 @@ OpenCost and OpenCost UI
 
 | Name | Email | Url |
 | ---- | ------ | --- |
-| mattray |  | <https://mattray.dev> |
+| jessegoodier |  |  |
 | toscott |  |  |
+| mittal-ishaan |  |  |
 | brito-rafa | <rafa@stormforge.io> |  |
 
 ## Installing the Chart
@@ -29,6 +30,8 @@ $ helm install opencost opencost/opencost
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
 | annotations | object | `{}` | Annotations to add to the all the resources |
+| clusterName | string | `"cluster.local"` | Override the default name of cluster - Can be found in /etc/kubernetes/admin.conf: clusters -> cluster -> name |
+| extraObjects | list | `[]` | Array of extra K8s manifests rendered through `tpl` and owned by the release. |
 | extraVolumes | list | `[]` | A list of volumes to be added to the pod |
 | fullnameOverride | string | `""` | Overwrite all resources name created by the chart |
 | imagePullSecrets | list | `[]` | List of secret names to use for pulling the images |
@@ -48,29 +51,54 @@ $ helm install opencost opencost/opencost
 | opencost.cloudCost.queryWindowDays | int | `7` | The max number of days that any single query will be made to construct Cloud Costs |
 | opencost.cloudCost.refreshRateHours | int | `6` | Number of hours between each run of the Cloud Cost pipeline |
 | opencost.cloudCost.runWindowDays | int | `3` | Number of days into the past that a Cloud Cost standard run will query for |
-| opencost.cloudIntegrationSecret | string | `""` |  |
+| opencost.cloudIntegrationJSON | string | `""` | Raw JSON for `cloud-integration.json`. Creates a Secret named `<fullname>-cloud-integration` in the release namespace. Mutually exclusive with `opencost.cloudIntegrationSecret`. |
+| opencost.cloudIntegrationSecret | string | `""` | Existing Secret containing `cloud-integration.json` for Cloud Costs. See https://www.opencost.io/docs/configuration/#cloud-costs. Create with: `kubectl create secret generic <SECRET_NAME> --from-file=cloud-integration.json -n opencost`. Mutually exclusive with `opencost.cloudIntegrationJSON`. |
 | opencost.customPricing.configPath | string | `"/tmp/custom-config"` | Path for the pricing configuration. |
 | opencost.customPricing.configmapName | string | `"custom-pricing-model"` | Customize the configmap name used for custom pricing |
 | opencost.customPricing.costModel | object | `{"CPU":1.25,"GPU":0.95,"RAM":0.5,"description":"Modified pricing configuration.","internetNetworkEgress":0.12,"regionNetworkEgress":0.01,"spotCPU":0.006655,"spotRAM":0.000892,"storage":0.25,"zoneNetworkEgress":0.01}` | More information about these values here: https://www.opencost.io/docs/configuration/on-prem#custom-pricing-using-the-opencost-helm-chart |
 | opencost.customPricing.createConfigmap | bool | `true` | Configures the pricing model provided in the values file. |
 | opencost.customPricing.enabled | bool | `false` | Enables custom pricing configuration |
 | opencost.customPricing.provider | string | `"custom"` | Sets the provider type for the custom pricing file. |
-| opencost.dataRetention.dailyResolutionDays | int | `15` |  |
+| opencost.exporter.adminToken.enabled | bool | `false` | When true, the chart creates the admin-token Secret (if value is set) or mounts existingSecret as ADMIN_TOKEN. When false, ADMIN_TOKEN is not set and no secret is deployed. |
+| opencost.exporter.adminToken.existingSecret | string | `""` | Use an existing Secret for the admin token (recommended). Secret must contain the key below. |
+| opencost.exporter.adminToken.secretKey | string | `"ADMIN_TOKEN"` | Key in the Secret that holds the admin token (used for both value-created and existing secrets). |
+| opencost.exporter.adminToken.value | string | `""` | If set, the chart creates a Secret with this value and sets ADMIN_TOKEN from it (not recommended for production; use existingSecret instead). |
+| opencost.exporter.apiHttpRoute | object | `{"annotations":{},"enabled":false,"hostnames":[],"labels":{},"parentRefs":[{"name":"","namespace":"","sectionName":""}],"rules":[{"backendRefs":[{"name":"","port":9003}],"matches":[{"path":{"type":"PathPrefix","value":"/"}}]}]}` | HTTPRoute for OpenCost API (Gateway API) |
+| opencost.exporter.apiHttpRoute.annotations | object | `{}` | Annotations for HTTPRoute resource |
+| opencost.exporter.apiHttpRoute.enabled | bool | `false` | Enable HTTPRoute resource |
+| opencost.exporter.apiHttpRoute.hostnames | list | `[]` | Hostnames for the HTTPRoute |
+| opencost.exporter.apiHttpRoute.labels | object | `{}` | Labels for HTTPRoute resource |
+| opencost.exporter.apiHttpRoute.parentRefs | list | See [values.yaml](values.yaml) | Gateway API parent references |
+| opencost.exporter.apiHttpRoute.rules | list | See [values.yaml](values.yaml) | HTTPRoute rules. Each rule supports an optional `filters` list at the rule level and per-backendRef `filters` for Gateway API filter configuration (e.g. basic auth via `ExtensionRef`, header modification via `RequestHeaderModifier`, etc.). |
+| opencost.exporter.apiIngress.annotations | object | `{}` | Annotations for Ingress resource |
+| opencost.exporter.apiIngress.enabled | bool | `false` | Ingress for OpenCost API |
+| opencost.exporter.apiIngress.hosts | list | See [values.yaml](values.yaml) | A list of host rules used to configure the Ingress |
+| opencost.exporter.apiIngress.ingressClassName | string | `""` | Ingress controller which implements the resource |
+| opencost.exporter.apiIngress.servicePort | string | `"http"` | Redirect ingress to an extraPort defined on the service such as oauth-proxy |
+| opencost.exporter.apiIngress.tls | list | `[]` | Ingress TLS configuration |
 | opencost.exporter.apiPort | int | `9003` |  |
 | opencost.exporter.aws.access_key_id | string | `""` | AWS secret key id |
 | opencost.exporter.aws.secret_access_key | string | `""` | AWS secret access key |
 | opencost.exporter.cloudProviderApiKey | string | `""` | The GCP Pricing API requires a key. This is supplied just for evaluation. |
+| opencost.exporter.collectorDataSource.enabled | bool | `false` |  |
+| opencost.exporter.collectorDataSource.networkPort | int | `3001` | The port at which network pods are open to egress |
+| opencost.exporter.collectorDataSource.retention10m | int | `36` | The number of 10m intervals the Collector DataSource should maintain |
+| opencost.exporter.collectorDataSource.retention1d | int | `15` | The number of 1d intervals the Collector DataSource should maintain |
+| opencost.exporter.collectorDataSource.retention1h | int | `49` | The number of 1h intervals the Collector DataSource should maintain |
+| opencost.exporter.collectorDataSource.scrapeInterval | string | `"30s"` | define the interval at which the collector scrapes for data points (10s, 15s, 1m) |
+| opencost.exporter.command | list | `[]` | Optional command to override the default container command |
 | opencost.exporter.csv_path | string | `""` |  |
 | opencost.exporter.defaultClusterId | string | `"default-cluster"` | Default cluster ID to use if cluster_id is not set in Prometheus metrics. |
 | opencost.exporter.env | list | `[]` | List of additional environment variables to set in the container |
 | opencost.exporter.extraArgs | list | `[]` | List of extra arguments for the command, e.g.: log-format=json |
 | opencost.exporter.extraEnv | object | `{}` | Any extra environment variables you would like to pass on to the pod |
 | opencost.exporter.extraVolumeMounts | list | `[]` | A list of volume mounts to be added to the pod |
+| opencost.exporter.image | object | `{"fullImageName":null,"pullPolicy":"IfNotPresent","registry":"ghcr.io","repository":"opencost/opencost","tag":"1.120.3@sha256:9f282400e59a4fc886e5fa3bca3c777b9dcae866b781641ca1d1271525d15f72"}` | This overrides the above defaultClusterId. Ensure the ConfigMap exists and contains the required CLUSTER_ID key. clusterIdConfigmap: cluster-id-configmap |
 | opencost.exporter.image.fullImageName | string | `nil` | Override the full image name for development purposes |
 | opencost.exporter.image.pullPolicy | string | `"IfNotPresent"` | Exporter container image pull policy |
 | opencost.exporter.image.registry | string | `"ghcr.io"` | Exporter container image registry |
 | opencost.exporter.image.repository | string | `"opencost/opencost"` | Exporter container image name |
-| opencost.exporter.image.tag | string | `"1.111.0@sha256:6aa68e52a24b14ba41f23db08d1b9db1429a1c0300f4c0381ecc2c61fc311a97"` | Exporter container image tag |
+| opencost.exporter.image.tag | string | `"1.120.3@sha256:9f282400e59a4fc886e5fa3bca3c777b9dcae866b781641ca1d1271525d15f72"` | Exporter container image tag |
 | opencost.exporter.livenessProbe.enabled | bool | `true` | Whether probe is enabled |
 | opencost.exporter.livenessProbe.failureThreshold | int | `3` | Number of failures for probe to be considered failed |
 | opencost.exporter.livenessProbe.initialDelaySeconds | int | `10` | Number of seconds before probe is initiated |
@@ -79,15 +107,17 @@ $ helm install opencost opencost/opencost
 | opencost.exporter.persistence.accessMode | string | `""` | Access mode for persistent volume |
 | opencost.exporter.persistence.annotations | object | `{}` | Annotations for persistent volume |
 | opencost.exporter.persistence.enabled | bool | `false` |  |
+| opencost.exporter.persistence.mountPath | string | `"/mnt/export"` | The path that the PV will be mounted to the exporter at |
 | opencost.exporter.persistence.size | string | `""` | Size for persistent volume |
 | opencost.exporter.persistence.storageClass | string | `""` | Storage class for persistent volume |
+| opencost.exporter.prometheusDataSource.queryResolutionSeconds | int | `300` |  |
 | opencost.exporter.readinessProbe.enabled | bool | `true` | Whether probe is enabled |
 | opencost.exporter.readinessProbe.failureThreshold | int | `3` | Number of failures for probe to be considered failed |
 | opencost.exporter.readinessProbe.initialDelaySeconds | int | `10` | Number of seconds before probe is initiated |
 | opencost.exporter.readinessProbe.path | string | `"/healthz"` | Probe path |
 | opencost.exporter.readinessProbe.periodSeconds | int | `10` | Probe frequency in seconds |
 | opencost.exporter.replicas | int | `1` | Number of OpenCost replicas to run |
-| opencost.exporter.resources.limits | object | `{"cpu":"999m","memory":"1Gi"}` | CPU/Memory resource limits |
+| opencost.exporter.resources.limits | object | `{"memory":"1Gi"}` | CPU/Memory resource limits |
 | opencost.exporter.resources.requests | object | `{"cpu":"10m","memory":"55Mi"}` | CPU/Memory resource requests |
 | opencost.exporter.securityContext | object | `{}` | The security options the container should be run with |
 | opencost.exporter.startupProbe.enabled | bool | `true` | Whether probe is enabled |
@@ -96,6 +126,21 @@ $ helm install opencost opencost/opencost
 | opencost.exporter.startupProbe.path | string | `"/healthz"` | Probe path |
 | opencost.exporter.startupProbe.periodSeconds | int | `5` | Probe frequency in seconds |
 | opencost.extraContainers | list | `[]` | extra sidecars to add to the pod.  Useful for things like oauth-proxy for the UI |
+| opencost.mcp | object | `{"enabled":true,"httpRoute":{"annotations":{},"enabled":false,"hostnames":[],"labels":{},"parentRefs":[{"name":"","namespace":"","sectionName":""}],"rules":[{"backendRefs":[{"name":"","port":8081}],"matches":[{"path":{"type":"PathPrefix","value":"/"}}]}]},"ingress":{"annotations":{},"enabled":false,"hosts":[{"host":"example.local","paths":[{"path":"/","pathType":"Prefix"}]}],"ingressClassName":"","tls":[]},"port":8081}` | MCP (Model Context Protocol) Server Configuration The MCP server provides AI agents with access to cost allocation and asset data |
+| opencost.mcp.enabled | bool | `true` | Enable MCP server for AI agent integration (default: true) Set to false to disable MCP server completely |
+| opencost.mcp.httpRoute | object | `{"annotations":{},"enabled":false,"hostnames":[],"labels":{},"parentRefs":[{"name":"","namespace":"","sectionName":""}],"rules":[{"backendRefs":[{"name":"","port":8081}],"matches":[{"path":{"type":"PathPrefix","value":"/"}}]}]}` | HTTPRoute for MCP server (Gateway API) |
+| opencost.mcp.httpRoute.annotations | object | `{}` | Annotations for HTTPRoute resource |
+| opencost.mcp.httpRoute.enabled | bool | `false` | Enable HTTPRoute resource |
+| opencost.mcp.httpRoute.hostnames | list | `[]` | Hostnames for the HTTPRoute |
+| opencost.mcp.httpRoute.labels | object | `{}` | Labels for HTTPRoute resource |
+| opencost.mcp.httpRoute.parentRefs | list | See [values.yaml](values.yaml) | Gateway API parent references |
+| opencost.mcp.httpRoute.rules | list | See [values.yaml](values.yaml) | HTTPRoute rules. Each rule supports an optional `filters` list at the rule level and per-backendRef `filters` for Gateway API filter configuration (e.g. basic auth via `ExtensionRef`, header modification via `RequestHeaderModifier`, etc.). |
+| opencost.mcp.ingress.annotations | object | `{}` | Annotations for Ingress resource |
+| opencost.mcp.ingress.enabled | bool | `false` | Ingress for MCP server |
+| opencost.mcp.ingress.hosts | list | See [values.yaml](values.yaml) | A list of host rules used to configure the Ingress |
+| opencost.mcp.ingress.ingressClassName | string | `""` | Ingress controller which implements the resource |
+| opencost.mcp.ingress.tls | list | `[]` | Ingress TLS configuration |
+| opencost.mcp.port | int | `8081` | HTTP port for MCP server (default: 8081) Change this if port 8081 conflicts with other services |
 | opencost.metrics.config.configmapName | string | `"custom-metrics"` | Customize the configmap name used for metrics |
 | opencost.metrics.config.disabledMetrics | list | `[]` | List of metrics to be disabled |
 | opencost.metrics.config.enabled | bool | `false` | Enables creating the metrics.json configuration as a ConfigMap |
@@ -115,6 +160,13 @@ $ helm install opencost opencost/opencost
 | opencost.metrics.serviceMonitor.scrapeTimeout | string | `"10s"` | Timeout after which the scrape is ended |
 | opencost.metrics.serviceMonitor.tlsConfig | object | `{}` | TLS configuration for scraping metrics |
 | opencost.nodeSelector | object | `{}` | Node labels for pod assignment |
+| opencost.platforms.openshift.createMonitoringClusterRoleBinding | bool | `false` | If true, the helm chart will create a ClusterRoleBinding to grant the OpenCost ServiceAccount access to query Prometheus. |
+| opencost.platforms.openshift.createMonitoringResourceReaderRoleBinding | bool | `false` | If true, create a Role and RoleBinding to allow Prometheus to list and watch OpenCost resources. |
+| opencost.platforms.openshift.enablePromAccess | bool | `false` | If true, enable internal prom access |
+| opencost.platforms.openshift.enableSCC | bool | `false` | If true, set Security Context Constraints on serviceaccount for read/write premissions |
+| opencost.platforms.openshift.enabled | bool | `false` | Enable OpenShift specific configurations |
+| opencost.platforms.openshift.monitoringServiceAccountName | string | `"prometheus-k8s"` | Name of the Prometheus serviceaccount to bind to the Resource Reader Role Binding. |
+| opencost.platforms.openshift.monitoringServiceAccountNamespace | string | `"openshift-monitoring"` | Namespace of the Prometheus serviceaccount to bind to the Resource Reader Role Binding. |
 | opencost.prometheus.amp.enabled | bool | `false` | Use Amazon Managed Service for Prometheus (AMP) |
 | opencost.prometheus.amp.workspaceId | string | `""` | Workspace ID for AMP |
 | opencost.prometheus.bearer_token | string | `""` | Prometheus Bearer token |
@@ -122,10 +174,14 @@ $ helm install opencost opencost/opencost
 | opencost.prometheus.existingSecretName | string | `nil` | Existing secret name that contains credentials for Prometheus |
 | opencost.prometheus.external.enabled | bool | `false` | Use external Prometheus (eg. Grafana Cloud) |
 | opencost.prometheus.external.url | string | `"https://prometheus.example.com/prometheus"` | External Prometheus url |
+| opencost.prometheus.insecureSkipVerify | bool | `false` | Whether to disable SSL certificate verification |
 | opencost.prometheus.internal.enabled | bool | `true` | Use in-cluster Prometheus |
 | opencost.prometheus.internal.namespaceName | string | `"prometheus-system"` | Namespace of in-cluster Prometheus |
+| opencost.prometheus.internal.path | string | `""` | Path to access the Prometheus API, this is neccesary if the Prometheus server is behind a reverse proxy(mimir) or has a different path. |
 | opencost.prometheus.internal.port | int | `80` | Service port of in-cluster Prometheus |
+| opencost.prometheus.internal.scheme | string | `"http"` | Scheme to use for in-cluster Prometheus |
 | opencost.prometheus.internal.serviceName | string | `"prometheus-server"` | Service name of in-cluster Prometheus |
+| opencost.prometheus.kubeRBACProxy | bool | `false` | If true, opencost will use kube-rbac-proxy to authenticate with in cluster Prometheus for openshift |
 | opencost.prometheus.password | string | `""` | Prometheus Basic auth password |
 | opencost.prometheus.password_key | string | `"DB_BASIC_AUTH_PW"` | Key in the secret that references the password |
 | opencost.prometheus.secret_name | string | `nil` | Secret name that contains credentials for Prometheus |
@@ -135,11 +191,14 @@ $ helm install opencost opencost/opencost
 | opencost.prometheus.thanos.internal.enabled | bool | `true` |  |
 | opencost.prometheus.thanos.internal.namespaceName | string | `"opencost"` |  |
 | opencost.prometheus.thanos.internal.port | int | `10901` |  |
+| opencost.prometheus.thanos.internal.scheme | string | `"http"` |  |
 | opencost.prometheus.thanos.internal.serviceName | string | `"my-thanos-query"` |  |
 | opencost.prometheus.thanos.maxSourceResolution | string | `""` |  |
 | opencost.prometheus.thanos.queryOffset | string | `""` |  |
 | opencost.prometheus.username | string | `""` | Prometheus Basic auth username |
 | opencost.prometheus.username_key | string | `"DB_BASIC_AUTH_USERNAME"` | Key in the secret that references the username |
+| opencost.retention1d | int | `15` |  |
+| opencost.retention1h | int | `49` |  |
 | opencost.sigV4Proxy.extraEnv | string | `nil` |  |
 | opencost.sigV4Proxy.host | string | `"aps-workspaces.us-west-2.amazonaws.com"` |  |
 | opencost.sigV4Proxy.image | string | `"public.ecr.aws/aws-observability/aws-sigv4-proxy:latest"` |  |
@@ -154,6 +213,13 @@ $ helm install opencost opencost/opencost
 | opencost.ui.enabled | bool | `true` | Enable OpenCost UI |
 | opencost.ui.extraEnv | list | `[]` | A list of environment variables to be added to the pod |
 | opencost.ui.extraVolumeMounts | list | `[]` | A list of volume mounts to be added to the pod |
+| opencost.ui.httpRoute | object | `{"annotations":{},"enabled":false,"hostnames":[],"labels":{},"parentRefs":[{"name":"","namespace":"","sectionName":""}],"rules":[{"backendRefs":[{"name":"","port":9090}],"matches":[{"path":{"type":"PathPrefix","value":"/"}}]}]}` | HTTPRoute for OpenCost UI (Gateway API) |
+| opencost.ui.httpRoute.annotations | object | `{}` | Annotations for HTTPRoute resource |
+| opencost.ui.httpRoute.enabled | bool | `false` | Enable HTTPRoute resource |
+| opencost.ui.httpRoute.hostnames | list | `[]` | Hostnames for the HTTPRoute |
+| opencost.ui.httpRoute.labels | object | `{}` | Labels for HTTPRoute resource |
+| opencost.ui.httpRoute.parentRefs | list | See [values.yaml](values.yaml) | Gateway API parent references |
+| opencost.ui.httpRoute.rules | list | See [values.yaml](values.yaml) | HTTPRoute rules. Each rule supports an optional `filters` list at the rule level and per-backendRef `filters` for Gateway API filter configuration (e.g. basic auth via `ExtensionRef`, header modification via `RequestHeaderModifier`, etc.). |
 | opencost.ui.image.fullImageName | string | `nil` | Override the full image name for development purposes |
 | opencost.ui.image.pullPolicy | string | `"IfNotPresent"` | UI container image pull policy |
 | opencost.ui.image.registry | string | `"ghcr.io"` | UI container image registry |
@@ -170,20 +236,47 @@ $ helm install opencost opencost/opencost
 | opencost.ui.livenessProbe.initialDelaySeconds | int | `30` | Number of seconds before probe is initiated |
 | opencost.ui.livenessProbe.path | string | `"/healthz"` | Probe path |
 | opencost.ui.livenessProbe.periodSeconds | int | `10` | Probe frequency in seconds |
+| opencost.ui.nginx | object | `{"proxyConnectTimeout":180,"proxyReadTimeout":180,"proxySendTimeout":180}` | Nginx proxy timeout settings (in seconds) |
+| opencost.ui.nginx.proxyConnectTimeout | int | `180` | Timeout for establishing a connection with the proxied server |
+| opencost.ui.nginx.proxyReadTimeout | int | `180` | Timeout for reading a response from the proxied server |
+| opencost.ui.nginx.proxySendTimeout | int | `180` | Timeout for transmitting a request to the proxied server |
 | opencost.ui.readinessProbe.enabled | bool | `true` | Whether probe is enabled |
 | opencost.ui.readinessProbe.failureThreshold | int | `3` | Number of failures for probe to be considered failed |
 | opencost.ui.readinessProbe.initialDelaySeconds | int | `30` | Number of seconds before probe is initiated |
 | opencost.ui.readinessProbe.path | string | `"/healthz"` | Probe path |
 | opencost.ui.readinessProbe.periodSeconds | int | `10` | Probe frequency in seconds |
-| opencost.ui.resources.limits | object | `{"cpu":"999m","memory":"1Gi"}` | CPU/Memory resource limits |
+| opencost.ui.resources.limits | object | `{"memory":"1Gi"}` | CPU/Memory resource limits |
 | opencost.ui.resources.requests | object | `{"cpu":"10m","memory":"55Mi"}` | CPU/Memory resource requests |
+| opencost.ui.route.annotations | object | `{}` | Annotations for Ingress resource |
+| opencost.ui.route.enabled | bool | `false` | OpenShift route for OpenCost UI |
+| opencost.ui.route.host | string | `"example.local"` |  |
+| opencost.ui.route.path | string | `nil` |  |
+| opencost.ui.route.targetPort | string | `"http-ui"` | Redirect ingress to an extraPort defined on the service such as oauth-proxy |
+| opencost.ui.route.tls | object | `{}` | Route TLS configuration as a map (e.g. with `termination` and `insecureEdgeTerminationPolicy` fields) |
 | opencost.ui.securityContext | object | `{}` | The security options the container should be run with |
+| opencost.ui.uiPath | string | `"/"` |  |
 | opencost.ui.uiPort | int | `9090` |  |
+| opencost.ui.useDefaultFqdn | bool | `false` |  |
+| opencost.ui.useIPv6 | bool | `true` |  |
+| opencost.updateCaTrust.caCertsSecret | string | `"ca-certs-secret"` |  |
+| opencost.updateCaTrust.enabled | bool | `false` |  |
+| opencost.updateCaTrust.resources | object | `{}` |  |
+| opencost.updateCaTrust.securityContext.allowPrivilegeEscalation | bool | `false` |  |
+| opencost.updateCaTrust.securityContext.readOnlyRootFilesystem | bool | `true` |  |
+| opencost.updateCaTrust.securityContext.runAsGroup | int | `0` |  |
+| opencost.updateCaTrust.securityContext.runAsNonRoot | bool | `false` |  |
+| opencost.updateCaTrust.securityContext.runAsUser | int | `0` |  |
+| opencost.updateCaTrust.securityContext.seccompProfile.type | string | `"RuntimeDefault"` |  |
+| pdb.enabled | bool | `false` |  |
+| pdb.maxUnavailable | string | `nil` | Maximum number of pods that can be unavailable after the eviction |
+| pdb.minAvailable | string | `nil` | Minimum number of pods that must be available after the eviction |
 | plugins.configs | string | `nil` |  |
 | plugins.enabled | bool | `false` |  |
+| plugins.existingSecret | string | `""` | Use an existing Secret for plugin configuration instead of generating one from `plugins.configs`. The referenced Secret MUST contain a `<plugin>_config.json` key for every entry in `plugins.install.plugins` (and for every plugin whose configs key would otherwise drive the install/mount list) -- the Deployment mounts those files via subPath and missing keys cause Pod startup failures. This is useful when using ExternalSecrets, Vault, or other secret-management tools so that plugin credentials do not have to be committed via `plugins.configs`. Mutually exclusive with `plugins.configs`: when `existingSecret` is set, the chart does not render a generated Secret and any `plugins.configs` entries would be silently ignored, so the chart will `fail` template rendering in that case. |
 | plugins.folder | string | `"/opt/opencost/plugin"` |  |
 | plugins.install.enabled | bool | `true` |  |
 | plugins.install.fullImageName | string | `"curlimages/curl:latest"` |  |
+| plugins.install.plugins | list | `[]` | List of plugins to download, independent of `plugins.configs`. When specified, these plugins are downloaded regardless of what's in configs, which enables using `plugins.existingSecret` for credentials while still downloading plugin binaries. This list also drives which `<plugin>_config.json` subPaths the Deployment mounts, so each listed plugin MUST have a matching config source -- either a `plugins.configs.<plugin>` entry (when `plugins.existingSecret` is empty) or a `<plugin>_config.json` key in the Secret referenced by `plugins.existingSecret`. Missing entries cause Pod startup failures because the mounted subPath will not exist. When `plugins.existingSecret` is empty, the chart validates this at template-render time and fails with an actionable error; the check is skipped when `plugins.existingSecret` is set because the contents of an externally-managed Secret cannot be introspected from Helm. Example: ["datadog", "mongodb"]. If empty, falls back to downloading plugins based on keys in configs (legacy behavior). |
 | plugins.install.securityContext.allowPrivilegeEscalation | bool | `false` |  |
 | plugins.install.securityContext.capabilities.drop[0] | string | `"ALL"` |  |
 | plugins.install.securityContext.readOnlyRootFilesystem | bool | `true` |  |
@@ -191,6 +284,7 @@ $ helm install opencost opencost/opencost
 | plugins.install.securityContext.runAsUser | int | `1000` |  |
 | plugins.install.securityContext.seccompProfile.type | string | `"RuntimeDefault"` |  |
 | podAnnotations | object | `{}` | Annotations to add to the OpenCost Pod |
+| podAutomountServiceAccountToken | bool | `true` | Enable automounting of service account token at the pod level |
 | podLabels | object | `{}` | Labels to add to the OpenCost Pod |
 | podSecurityContext | object | `{}` | Holds pod-level security attributes and common container settings |
 | priorityClassName | string | `nil` | Pod priority |
diff --git a/packages/system/opencost/charts/opencost/templates/NOTES.txt b/packages/system/opencost/charts/opencost/templates/NOTES.txt
new file mode 100644
index 0000000000..4e1ff1b062
--- /dev/null
+++ b/packages/system/opencost/charts/opencost/templates/NOTES.txt
@@ -0,0 +1,21 @@
+Thank you for installing the OpenCost Helm Chart!
+
+Your release is named: {{ .Release.Name }}
+
+To verify that OpenCost is running, execute the following commands:
+
+1. Check the status of the pods:
+   kubectl get pods -l app.kubernetes.io/instance={{ .Release.Name }} -n {{ .Release.Namespace }}
+
+2. Access the OpenCost UI:
+
+   If the service is only accessible within the cluster, you can use port-forwarding:
+   export SVC_NAME={{ include "opencost.fullname" . }}
+   kubectl port-forward svc/$SVC_NAME 9090 -n {{ .Release.Namespace }}
+
+   Alternatively, you can port-forward directly to the OpenCost pod:
+   export POD_NAME=$(kubectl get pod -l app.kubernetes.io/instance={{ .Release.Name }} -n {{ .Release.Namespace }} -o jsonpath="{.items[0].metadata.name}")
+   kubectl -n {{ .Release.Namespace }} port-forward $POD_NAME 9090
+
+For more information, visit the OpenCost documentation:
+https://www.opencost.io/docs/
\ No newline at end of file
diff --git a/packages/system/opencost/charts/opencost/templates/_helpers.tpl b/packages/system/opencost/charts/opencost/templates/_helpers.tpl
index ec38d3df48..644bf74f40 100644
--- a/packages/system/opencost/charts/opencost/templates/_helpers.tpl
+++ b/packages/system/opencost/charts/opencost/templates/_helpers.tpl
@@ -53,6 +53,85 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
   {{- end -}}
 {{- end -}}
 
+{{/*
+Resolve the secret name that stores plugin config files.
+*/}}
+{{- define "opencost.pluginsConfigSecretName" -}}
+  {{- if .Values.plugins.existingSecret -}}
+    {{- .Values.plugins.existingSecret -}}
+  {{- else -}}
+    {{- printf "%s-plugins-config" (include "opencost.fullname" .) -}}
+  {{- end -}}
+{{- end -}}
+
+{{/*
+Resolve plugin names to install/mount. Prefer explicit install list, then configs keys.
+*/}}
+{{- define "opencost.plugins.installList" -}}
+  {{- if .Values.plugins.install.plugins -}}
+    {{- toYaml .Values.plugins.install.plugins -}}
+  {{- else if .Values.plugins.configs -}}
+    {{- toYaml (keys .Values.plugins.configs | sortAlpha) -}}
+  {{- else -}}
+[]
+  {{- end -}}
+{{- end -}}
+
+{{/*
+Plugin configuration check. Fails fast on misconfigurations that would otherwise
+produce silent data loss or runtime Pod start failures:
+
+  1. plugins.existingSecret and plugins.configs are mutually exclusive. When
+     existingSecret is set, the chart no longer renders the generated Secret
+     from .Values.plugins.configs, so any configs entries would be silently
+     ignored.
+  2. When plugins.existingSecret is empty, every plugin listed in
+     plugins.install.plugins must have a matching key in plugins.configs --
+     otherwise the Deployment will mount a subPath that doesn't exist in the
+     generated Secret and the Pod will fail to start. (We intentionally skip
+     this check when existingSecret is set: the chart cannot introspect an
+     externally-managed secret at template-render time.)
+*/}}
+{{- define "opencost.plugins.configCheck" -}}
+  {{- if not .Values.plugins.enabled -}}
+    {{- /* nothing to validate when plugins are off */ -}}
+  {{- else -}}
+    {{- if and .Values.plugins.existingSecret .Values.plugins.configs -}}
+      {{- fail "plugins.existingSecret and plugins.configs are mutually exclusive. When plugins.existingSecret is set the chart does not render a generated Secret from plugins.configs, so any configs entries would be silently ignored. Please specify only one." -}}
+    {{- end -}}
+    {{- if and (not .Values.plugins.existingSecret) .Values.plugins.install.plugins -}}
+      {{- $configs := default (dict) .Values.plugins.configs -}}
+      {{- range $p := .Values.plugins.install.plugins -}}
+        {{- if not (hasKey $configs $p) -}}
+          {{- fail (printf "plugins.install.plugins contains %q but plugins.configs has no matching %q entry. The Deployment mounts %s_config.json from the generated plugin secret, so the Pod will fail to start with a missing subPath. Either add a plugins.configs.%s entry or set plugins.existingSecret to a Secret that contains %s_config.json." $p $p $p $p $p) -}}
+        {{- end -}}
+      {{- end -}}
+    {{- end -}}
+  {{- end -}}
+{{- end -}}
+
+{{/*
+Cloud integration source contents check. Either the Secret must be specified or the JSON, not both.
+*/}}
+{{- define "opencost.cloudIntegration.secretConfigCheck" -}}
+  {{- if and .Values.opencost.cloudIntegrationSecret .Values.opencost.cloudIntegrationJSON -}}
+    {{- fail "opencost.cloudIntegrationSecret and opencost.cloudIntegrationJSON are mutually exclusive. Please specify only one." -}}
+  {{- end -}}
+{{- end -}}
+
+{{/*
+Compute the cloud integration secret name when enabled.
+*/}}
+{{- define "opencost.cloudIntegration.secretName" -}}
+  {{- if or .Values.opencost.cloudIntegrationSecret .Values.opencost.cloudIntegrationJSON -}}
+    {{- if .Values.opencost.cloudIntegrationSecret -}}
+      {{- .Values.opencost.cloudIntegrationSecret -}}
+    {{- else -}}
+      {{- printf "%s-cloud-integration" (include "opencost.fullname" .) -}}
+    {{- end -}}
+  {{- end -}}
+{{- end -}}
+
 {{/*
 Common labels
 */}}
@@ -84,7 +163,7 @@ Create the name of the controller service account to use
   {{- if .Values.serviceAccount.create -}}
     {{- default (include "opencost.fullname" .) .Values.serviceAccount.name }}
   {{- else -}}
-    {{- default "default" .Values.serviceAccount.name }}
+    {{- default "opencost" .Values.serviceAccount.name }}
   {{- end -}}
 {{- end -}}
 
@@ -98,12 +177,19 @@ Create the name of the controller service account to use
     {{- $port := .Values.opencost.sigV4Proxy.port | int }}
     {{- $ws := .Values.opencost.prometheus.amp.workspaceId }}
     {{- printf "http://localhost:%d/workspaces/%v" $port $ws -}}
-  {{- else -}}
+{{- else -}}
     {{- $host := tpl .Values.opencost.prometheus.internal.serviceName . }}
     {{- $ns := tpl .Values.opencost.prometheus.internal.namespaceName . }}
+    {{- $clusterName := .Values.clusterName }}
+    {{- $scheme := .Values.opencost.prometheus.internal.scheme | default "http"}}
     {{- $port := .Values.opencost.prometheus.internal.port | int }}
-    {{- printf "http://%s.%s.svc.cluster.local:%d" $host $ns $port -}}
-  {{- end -}}
+    {{- $path := .Values.opencost.prometheus.internal.path | default "" }}
+    {{- if $path }}
+      {{- printf "%s://%s.%s.svc.%s:%d%s" $scheme $host $ns $clusterName $port $path -}}
+    {{- else }}
+      {{- printf "%s://%s.%s.svc.%s:%d" $scheme $host $ns $clusterName $port -}}
+    {{- end }}
+{{- end -}}
 {{- end -}}
 
 {{/*
@@ -115,11 +201,22 @@ Check that either thanos external or internal is defined
   {{- else -}}
     {{- $host := .Values.opencost.prometheus.thanos.internal.serviceName }}
     {{- $ns := .Values.opencost.prometheus.thanos.internal.namespaceName }}
+    {{- $clusterName := .Values.clusterName }}
     {{- $port := .Values.opencost.prometheus.thanos.internal.port | int }}
-    {{- printf "http://%s.%s.svc.cluster.local:%d" $host $ns $port -}}
+    {{- $scheme := .Values.opencost.prometheus.thanos.internal.scheme | default "http"}}
+    {{- printf "%s://%s.%s.svc.%s:%d" $scheme $host $ns $clusterName $port -}}
   {{- end -}}
 {{- end -}}
 
+{{/*
+  Fail if both kube-rbac-proxy and bearer token are set
+*/}}
+{{- define "kubeRBACProxyBearerTokenCheck" -}}
+{{- if and .Values.opencost.prometheus.kubeRBACProxy .Values.opencost.prometheus.bearer_token }}
+  {{- fail "Both kubeRBACProxy and bearer_token are set. Please specify only one." -}}
+{{- end -}}
+{{- end -}}
+
 {{/*
 Check that the config is valid
 */}}
@@ -179,4 +276,39 @@ apiVersion: networking.k8s.io/v1beta1
 {{- else}}
 {{- .Values.opencost.ui.image.registry -}}/{{- .Values.opencost.ui.image.repository -}}:{{- include "opencostUi.imageTag" . -}}
 {{- end -}}
-{{- end -}}
\ No newline at end of file
+{{- end -}}
+
+
+{{- define "opencost.sccName" -}}
+{{include "opencost.fullname" .}}-scc
+{{- end -}}
+
+{{- /*
+  Compute a checksum based on the rendered content of specific ConfigMaps and Secrets.
+*/ -}}
+{{- define "configsChecksum" -}}
+{{- $files := list
+  "configmap-custom-pricing.yaml"
+  "configmap-frontend.yaml"
+  "configmap-metrics-config.yaml"
+  "secret-cloud-integration.yaml"
+  "secret.yaml"
+  "secret-admin-token.yaml"
+-}}
+{{- $checksum := "" -}}
+{{- range $files -}}
+  {{- $content := include (print $.Template.BasePath (printf "/%s" .)) $ -}}
+  {{- $checksum = printf "%s%s" $checksum $content | sha256sum -}}
+{{- end -}}
+{{- $checksum | sha256sum -}}
+{{- end -}}
+
+{{- define "opencost.caCertsSecretConfig.check" }}
+  {{- if .Values.opencost.updateCaTrust.enabled }}
+    {{- if and .Values.opencost.updateCaTrust.caCertsSecret .Values.opencost.updateCaTrust.caCertsConfig }}
+      {{- fail "Both caCertsSecret and caCertsConfig are defined. Please specify only one." }}
+    {{- else if and (not .Values.opencost.updateCaTrust.caCertsSecret) (not .Values.opencost.updateCaTrust.caCertsConfig) }}
+      {{- fail "Neither caCertsSecret nor caCertsConfig is defined, but updateCaTrust is enabled. Please specify one." }}
+    {{- end }}
+  {{- end }}
+{{- end }}
diff --git a/packages/system/opencost/charts/opencost/templates/clusterrole.yaml b/packages/system/opencost/charts/opencost/templates/clusterrole.yaml
index f033a03693..45593941f9 100644
--- a/packages/system/opencost/charts/opencost/templates/clusterrole.yaml
+++ b/packages/system/opencost/charts/opencost/templates/clusterrole.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.rbac.enabled }}
 # Cluster role giving opencost to get, list, watch required resources
 # No write permissions are required
 apiVersion: rbac.authorization.k8s.io/v1
@@ -11,6 +12,9 @@ rules:
       - configmaps
       - deployments
       - nodes
+      {{- if .Values.opencost.exporter.collectorDataSource.enabled }}
+      - nodes/proxy
+      {{- end }}
       - pods
       - services
       - resourcequotas
@@ -77,3 +81,19 @@ rules:
       - get
       - list
       - watch
+
+{{- if and .Values.opencost.platforms.openshift.enabled .Values.opencost.platforms.openshift.enablePromAccess }}
+  - apiGroups:
+      - monitoring.coreos.com
+    resources:
+      - prometheuses
+      - thanosrulers
+    verbs:
+      - get
+      - list
+      - watch
+      - create
+      - update
+      - patch
+{{- end }}
+{{- end }}
diff --git a/packages/system/opencost/charts/opencost/templates/clusterrolebinding.yaml b/packages/system/opencost/charts/opencost/templates/clusterrolebinding.yaml
index 56f4e00b20..1cd231d952 100644
--- a/packages/system/opencost/charts/opencost/templates/clusterrolebinding.yaml
+++ b/packages/system/opencost/charts/opencost/templates/clusterrolebinding.yaml
@@ -15,4 +15,43 @@ subjects:
   - kind: ServiceAccount
     name: {{ template "opencost.serviceAccountName" . }}
     namespace: {{ include "opencost.namespace" . }}
+---
 {{- end }}
+{{- if and .Values.opencost.platforms.openshift.enabled .Values.opencost.platforms.openshift.createMonitoringClusterRoleBinding }}
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: {{ include "opencost.fullname" . }}-operator
+  labels: {{- include "opencost.labels" . | nindent 4 }}
+  {{- with .Values.annotations }}
+  annotations: {{- toYaml . | nindent 4 }}
+  {{- end }}
+roleRef:
+  # Grant the OpenCost ServiceAccount the cluster-monitoring-view role to enable it to query a KUBE_RBAC_PROXY enabled Prometheus.
+  # This is necessary for OpenCost to get access and query the in-cluster Prometheus instance using its service account token.
+  # https://docs.redhat.com/en/documentation/openshift_container_platform/4.2/html/monitoring/cluster-monitoring#monitoring-accessing-prometheus-alerting-ui-grafana-using-the-web-console_accessing-prometheus
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: cluster-monitoring-view
+subjects:
+  - kind: ServiceAccount
+    name: {{ template "opencost.serviceAccountName" . }}
+    namespace: {{ include "opencost.namespace" . }}
+---
+{{- end }}
+
+{{- if and .Values.opencost.platforms.openshift.enabled .Values.opencost.platforms.openshift.enableSCC }}
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: opencost-scc-binding
+  namespace: {{include "opencost.namespace" .}}
+subjects:
+  - kind: ServiceAccount
+    name: {{template "opencost.serviceAccountName"}}
+    namespace: {{include "opencost.namespace" .}}
+roleRef:
+  kind: Role
+  name: system:openshift:scc:{{ include "opencost.sccName" . }}
+  apiGroup: rbac.authorization.k8s.io
+{{- end}}
diff --git a/packages/system/opencost/charts/opencost/templates/configmap-custom-pricing.yaml b/packages/system/opencost/charts/opencost/templates/configmap-custom-pricing.yaml
index d749737977..9675a51338 100644
--- a/packages/system/opencost/charts/opencost/templates/configmap-custom-pricing.yaml
+++ b/packages/system/opencost/charts/opencost/templates/configmap-custom-pricing.yaml
@@ -5,7 +5,6 @@ metadata:
   name: {{ .Values.opencost.customPricing.configmapName }}
   namespace: {{ include "opencost.namespace" . }}
 data:
-  {{ include "opencost.configFileName" . }}.json: |-
     {
 {{- range $key, $val := .Values.opencost.customPricing.costModel }}
 {{ $key | quote | indent 6}}: {{ $val | quote }},
diff --git a/packages/system/opencost/charts/opencost/templates/configmap-frontend.yaml b/packages/system/opencost/charts/opencost/templates/configmap-frontend.yaml
new file mode 100644
index 0000000000..76b115d668
--- /dev/null
+++ b/packages/system/opencost/charts/opencost/templates/configmap-frontend.yaml
@@ -0,0 +1,94 @@
+{{- if .Values.opencost.ui.enabled }}
+{{- $serviceName := include "opencost.fullname" . -}}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: opencost-ui-nginx-config
+  namespace: {{ include "opencost.namespace" . }}
+data:
+  nginx.conf: |
+    gzip_static  on;
+    gzip on;
+    gzip_min_length 50000;
+    gzip_proxied expired no-cache no-store private auth;
+    gzip_types
+        application/atom+xml
+        application/geo+json
+        application/javascript
+        application/x-javascript
+        application/json
+        application/ld+json
+        application/manifest+json
+        application/rdf+xml
+        application/rss+xml
+        application/vnd.ms-fontobject
+        application/wasm
+        application/x-web-app-manifest+json
+        application/xhtml+xml
+        application/xml
+        font/eot
+        font/otf
+        font/ttf
+        image/bmp
+        image/svg+xml
+        text/cache-manifest
+        text/calendar
+        text/css
+        text/javascript
+        text/markdown
+        text/plain
+        text/xml
+        text/x-component
+        text/x-cross-domain-policy;
+
+    upstream model {
+    {{- if .Values.opencost.ui.useDefaultFqdn }}
+            server {{ $serviceName }}.{{ include "opencost.namespace" . }}.svc.cluster.local:9003;
+    {{- else if .Values.opencost.ui.modelFqdn }}
+            server {{ .Values.opencost.ui.modelFqdn }};
+    {{- else }}
+            server {{ $serviceName }}.{{ include "opencost.namespace" . }}:9003;
+    {{- end }}
+    }
+
+    server {
+        server_name _;
+        root /var/www;
+        index index.html;
+        large_client_header_buffers 4 32k;
+        add_header Cache-Control "must-revalidate";
+
+        error_page 504 /custom_504.html;
+        location = /custom_504.html {
+            internal;
+        }
+
+        add_header Cache-Control "max-age=300";
+        location {{ .Values.opencost.ui.uiPath }} {
+            alias /var/www/;
+            try_files $uri /index.html;
+        }
+
+        add_header ETag "1.96.0";
+        listen {{ .Values.opencost.ui.uiPort }};
+        {{- if .Values.opencost.ui.useIPv6 }}
+        listen [::]:{{ .Values.opencost.ui.uiPort }};
+        {{- end }}
+        resolver 127.0.0.1 valid=5s;
+        location /healthz {
+            access_log /dev/null;
+            return 200 'OK';
+        }
+        location {{ .Values.opencost.ui.uiPath | trimSuffix "/" }}/model/ {
+            proxy_connect_timeout       {{ .Values.opencost.ui.nginx.proxyConnectTimeout }};
+            proxy_send_timeout          {{ .Values.opencost.ui.nginx.proxySendTimeout }};
+            proxy_read_timeout          {{ .Values.opencost.ui.nginx.proxyReadTimeout }};
+            proxy_pass http://model/;
+            proxy_redirect off;
+            proxy_http_version 1.1;
+            proxy_set_header Connection "";
+            proxy_set_header  X-Real-IP  $remote_addr;
+            proxy_set_header  X-Forwarded-For $proxy_add_x_forwarded_for;
+        }
+    }
+{{- end }}
diff --git a/packages/system/opencost/charts/opencost/templates/deployment.yaml b/packages/system/opencost/charts/opencost/templates/deployment.yaml
index 1d8e291267..186e334314 100644
--- a/packages/system/opencost/charts/opencost/templates/deployment.yaml
+++ b/packages/system/opencost/charts/opencost/templates/deployment.yaml
@@ -1,13 +1,20 @@
 {{- include  "isPrometheusConfigValid" . }}
+{{- include  "kubeRBACProxyBearerTokenCheck" . }}
+{{ include "opencost.caCertsSecretConfig.check" . }}
+{{ include "opencost.cloudIntegration.secretConfigCheck" . }}
+{{ include "opencost.plugins.configCheck" . }}
+{{- $cloudIntegrationSecretName := include "opencost.cloudIntegration.secretName" . -}}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "opencost.fullname" . }}
   namespace: {{ include "opencost.namespace" . }}
   labels: {{- include "opencost.labels" . | nindent 4 }}
-  {{- with .Values.annotations }}
-  annotations: {{- toYaml . | nindent 4 }}
-  {{- end }}
+  annotations:
+    checksum/configs: {{ include "configsChecksum" . }}
+    {{- with .Values.annotations }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
 spec:
   replicas: {{ .Values.opencost.exporter.replicas }}
   selector:
@@ -34,6 +41,7 @@ spec:
       securityContext: {{- toYaml . | nindent 8 }}
       {{- end }}
       serviceAccountName: {{ template "opencost.serviceAccountName" . }}
+      automountServiceAccountToken: {{ .Values.podAutomountServiceAccountToken }}
       {{- with .Values.opencost.tolerations }}
       tolerations: {{- toYaml . | nindent 8 }}
       {{- end }}
@@ -46,24 +54,53 @@ spec:
       {{- with.Values.opencost.topologySpreadConstraints }}
       topologySpreadConstraints: {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- if (and .Values.plugins.enabled .Values.plugins.install.enabled )}}
       initContainers:
+        {{- if (and .Values.plugins.enabled .Values.plugins.install.enabled ) }}
         - name: plugin-installer
           image: {{ .Values.plugins.install.fullImageName }}
           command: ["sh", "/install/install_plugins.sh"]
-      {{- with .Values.plugins.install.securityContext }}
+          {{- with .Values.plugins.install.securityContext }}
           securityContext: {{- toYaml . | nindent 12 }}
-      {{- end }}
+          {{- end }}
           volumeMounts:
             - name: install-script
               mountPath: /install
             - name: plugins-dir
               mountPath: {{ .Values.plugins.folder }}
-      {{- end }}
+        {{- end }}
+        {{- if .Values.opencost.updateCaTrust.enabled }}
+        - name: update-ca-trust
+          image: {{ include "opencost.fullImageName" . }}
+          imagePullPolicy: {{ .Values.opencost.exporter.image.pullPolicy }}
+          {{- with .Values.opencost.updateCaTrust.securityContext }}
+          securityContext: {{- toYaml . | nindent 12 }}
+          {{- end }}
+          {{- with .Values.opencost.updateCaTrust.resources }}
+          resources:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+          command:
+            - 'sh'
+            - '-c'
+            - >
+              mkdir -p /etc/ssl/certs;
+              update-ca-certificates;
+          volumeMounts:
+            - name: ca-certs-secret
+              mountPath: "/usr/local/share/ca-certificates"
+            - name: ssl-path
+              mountPath: "/etc/ssl/certs"
+              readOnly: false
+          {{- end}}
       containers:
         - name: {{ include "opencost.fullname" . }}
           image: {{ include "opencost.fullImageName" . }}
           imagePullPolicy: {{ .Values.opencost.exporter.image.pullPolicy }}
+          {{- with .Values.opencost.exporter.command }}
+          {{- if . }}
+          command: {{- toYaml . | nindent 12 }}
+          {{- end }}
+          {{- end }}
           args:
           {{- range .Values.opencost.exporter.extraArgs }}
           - --{{ . }}
@@ -71,6 +108,10 @@ spec:
           ports:
             - containerPort: {{ .Values.opencost.exporter.apiPort }}
               name: http
+            {{- if .Values.opencost.mcp.enabled }}
+            - containerPort: {{ .Values.opencost.mcp.port }}
+              name: mcp-server
+            {{- end }}
           resources: {{- toYaml .Values.opencost.exporter.resources | nindent 12 }}
           {{- if .Values.opencost.exporter.startupProbe.enabled }}
           startupProbe:
@@ -107,8 +148,40 @@ spec:
               value: {{ .Values.loglevel }}
             - name: CUSTOM_COST_ENABLED
               value: {{ .Values.plugins.enabled | quote }}
-            - name: KUBECOST_NAMESPACE
+            - name: INSTALL_NAMESPACE
               value: {{ include "opencost.namespace" . }}
+            {{- with .Values.opencost.exporter.prometheusDataSource }}
+            {{- if .queryResolutionSeconds }}
+            - name: PROMETHEUS_QUERY_RESOLUTION_SECONDS
+              value: {{ .queryResolutionSeconds | quote }}
+            {{- end }}
+            {{- end }}
+            {{- with .Values.opencost.exporter.collectorDataSource }}
+            {{- if .enabled }}
+            - name: COLLECTOR_DATA_SOURCE_ENABLED
+              value: "true"
+            {{- if .scrapeInterval }}
+            - name: COLLECTOR_SCRAPE_INTERVAL
+              value: {{ .scrapeInterval | quote }}
+            {{- end }}
+            {{- if .networkPort }}
+            - name: NETWORK_PORT
+              value: {{ .networkPort | quote }}
+            {{- end }}
+            {{- if .retention10m }}
+            - name: COLLECTOR_RESOLUTION_10M_RETENTION
+              value: {{ .retention10m | quote }}
+            {{- end }}
+            {{- if .retention1h }}
+            - name: COLLECTOR_RESOLUTION_1H_RETENTION
+              value: {{ .retention1h | quote }}
+            {{- end }}
+            {{- if .retention1d }}
+            - name: COLLECTOR_RESOLUTION_1D_RETENTION
+              value: {{ .retention1d | quote }}
+            {{- end }}
+            {{- end }}
+            {{- end }}
             {{- if .Values.opencost.metrics.config.enabled }}
             - name: METRICS_CONFIGMAP_NAME
               value: {{ .Values.opencost.metrics.config.configmapName }}
@@ -123,6 +196,8 @@ spec:
             {{- end }}
             - name: PROMETHEUS_SERVER_ENDPOINT
               value: {{ include "opencost.prometheusServerEndpoint" . | quote }}
+            - name: INSECURE_SKIP_VERIFY
+              value: {{ .Values.opencost.prometheus.insecureSkipVerify | quote }}
             {{- if .Values.opencost.exporter.cloudProviderApiKey }}
             - name: CLOUD_PROVIDER_API_KEY
               valueFrom:
@@ -130,8 +205,17 @@ spec:
                   name: {{ include "opencost.prometheus.secretname" . }}
                   key: CLOUD_PROVIDER_API_KEY
             {{- end }}
+            {{- if and (.Values.opencost.exporter.defaultClusterId) (not .Values.opencost.exporter.clusterIdConfigmap) }}
             - name: CLUSTER_ID
               value: {{ .Values.opencost.exporter.defaultClusterId | quote }}
+            {{- end }}
+            {{- if .Values.opencost.exporter.clusterIdConfigmap }}
+            - name: CLUSTER_ID
+              valueFrom:
+                configMapKeyRef:
+                  name: {{ .Values.opencost.exporter.clusterIdConfigmap }}
+                  key: CLUSTER_ID
+            {{- end }}
             {{- if .Values.opencost.exporter.aws.access_key_id }}
             - name: AWS_ACCESS_KEY_ID
               valueFrom:
@@ -166,7 +250,15 @@ spec:
                   name: {{ .Values.opencost.prometheus.existingSecretName | default (include "opencost.prometheus.secretname" .) }}
                   key: {{ .Values.opencost.prometheus.bearer_token_key }}
             {{- end }}
-            {{- if and .Values.opencost.exporter.persistence.enabled .Values.opencost.exporter.csv_path }}
+            {{- if .Values.opencost.prometheus.kubeRBACProxy }}
+            - name: KUBE_RBAC_PROXY_ENABLED
+              value: {{ (quote .Values.opencost.prometheus.kubeRBACProxy) }}
+            {{- end }}
+            {{- if  .Values.opencost.exporter.persistence.enabled }}
+            - name: PV_MOUNT_PATH
+              value: {{ (.Values.opencost.exporter.persistence.mountPath | default "mnt/export") | quote }}
+            {{- end }}
+            {{- if .Values.opencost.exporter.csv_path }}
             - name: EXPORT_CSV_FILE
               value: {{ .Values.opencost.exporter.csv_path | quote }}
             {{- end }}
@@ -190,9 +282,17 @@ spec:
             {{- if .Values.opencost.customPricing.enabled }}
             - name: CONFIG_PATH
               value: {{ .Values.opencost.customPricing.configPath | quote }}
+            - name: PRICING_CONFIGMAP_NAME
+              value: {{ .Values.opencost.customPricing.configmapName | quote }}
             {{- end }}
-            - name: DATA_RETENTION_DAILY_RESOLUTION_DAYS
+            - name: RESOLUTION_1D_RETENTION
+            {{- if (.Values.opencost.dataRetention).dailyResolutionDays}}
               value: {{ .Values.opencost.dataRetention.dailyResolutionDays | quote }}
+            {{- else }}
+              value: {{ .Values.opencost.retention1d | quote }}
+            {{- end }}
+            - name: RESOLUTION_1H_RETENTION
+              value: {{ .Values.opencost.retention1h | quote }}
             - name: CLOUD_COST_ENABLED
               value: {{ .Values.opencost.cloudCost.enabled | quote }}
             - name: CLOUD_COST_MONTH_TO_DATE_INTERVAL
@@ -224,13 +324,31 @@ spec:
             - name: {{ $key }}
               value: {{ $value | quote }}
             {{- end }}
-          {{- if or .Values.plugins.enabled .Values.opencost.exporter.persistence.enabled .Values.opencost.exporter.extraVolumeMounts .Values.opencost.customPricing.enabled .Values.opencost.cloudIntegrationSecret}}
+            {{- if and .Values.opencost.exporter.adminToken.enabled (or .Values.opencost.exporter.adminToken.value .Values.opencost.exporter.adminToken.existingSecret) }}
+            - name: ADMIN_TOKEN
+              valueFrom:
+                secretKeyRef:
+                  name: {{ .Values.opencost.exporter.adminToken.existingSecret | default (printf "%s-admin-token" (include "opencost.fullname" .)) }}
+                  key: {{ .Values.opencost.exporter.adminToken.secretKey | default "ADMIN_TOKEN" }}
+            {{- end }}
+            {{- if .Values.opencost.mcp.enabled }}
+            # MCP Server Configuration
+            - name: MCP_SERVER_ENABLED
+              value: "true"
+            - name: MCP_HTTP_PORT
+              value: {{ .Values.opencost.mcp.port | quote }}
+            {{- else }}
+            - name: MCP_SERVER_ENABLED
+              value: "false"
+            {{- end }}
+          {{- if or .Values.plugins.enabled .Values.opencost.exporter.persistence.enabled .Values.opencost.exporter.extraVolumeMounts .Values.opencost.customPricing.enabled .Values.opencost.metrics.config.enabled $cloudIntegrationSecretName .Values.opencost.updateCaTrust.enabled}}
           volumeMounts:
             {{- if .Values.plugins.enabled }}
             - mountPath: /opt/opencost/plugin
               name: plugins-dir
               readOnly: false
-            {{- range $key, $config := .Values.plugins.configs }}
+            {{- $pluginList := include "opencost.plugins.installList" . | fromYamlArray }}
+            {{- range $key := $pluginList }}
             - mountPath: /opt/opencost/plugin/config/{{$key}}_config.json
               subPath: {{$key}}_config.json
               name: plugins-config
@@ -238,25 +356,28 @@ spec:
             {{- end }}
             {{- end }}
             {{- if .Values.opencost.exporter.persistence.enabled }}
-            - mountPath: /mnt/export
+            - mountPath: {{ (.Values.opencost.exporter.persistence.mountPath | default "mnt/export") }}
               name: opencost-export
               readOnly: false
             {{- end }}
-            {{- if .Values.opencost.customPricing.enabled }}
-            - mountPath: {{ .Values.opencost.customPricing.configPath }}/{{ include "opencost.configFileName" . }}.json
+            {{- if or .Values.opencost.customPricing.enabled .Values.opencost.metrics.config.enabled }}
+            - mountPath: {{ .Values.opencost.customPricing.configPath }}
               name: custom-configs
-              subPath: {{ include "opencost.configFileName" . }}.json
-              readOnly: true
             {{- end }}
-            {{- if .Values.opencost.metrics.config.enabled }}
-            - mountPath: {{ .Values.opencost.customPricing.configPath }}/metrics.json
-              name: custom-metrics
-              subPath: metrics.json
+            {{- if $cloudIntegrationSecretName }}
+            - name: var-configs
+              mountPath: /var/configs
+            - name: cloud-integration
+              mountPath: /var/configs/cloud-integration.json
+              subPath: cloud-integration.json
               readOnly: true
             {{- end }}
-            {{- if .Values.opencost.cloudIntegrationSecret }}
-            - name: cloud-integration
-              mountPath: /var/configs/cloud-integration
+            {{- if .Values.opencost.updateCaTrust.enabled }}
+            - name: ca-certs-secret
+              mountPath: "/usr/local/share/ca-certificates"
+            - name: ssl-path
+              mountPath: "/etc/ssl/certs"
+              readOnly: false
             {{- end }}
             {{- with .Values.opencost.exporter.extraVolumeMounts }}
               {{- toYaml . | nindent 12 }}
@@ -307,9 +428,17 @@ spec:
           {{- with .Values.opencost.ui.securityContext }}
           securityContext: {{- toYaml . | nindent 12 }}
           {{- end }}
+          volumeMounts:
           {{- with .Values.opencost.ui.extraVolumeMounts }}
-          volumeMounts: {{- toYaml . | nindent 12 }}
+            {{- toYaml . | nindent 12 }}
           {{- end }}
+            - name: opencost-ui-nginx-config-volume
+              mountPath: /etc/nginx/conf.d/default.nginx.conf
+              subPath: default.nginx.conf
+            {{- if .Values.opencost.platforms.openshift.enabled }}
+            - name: empty-var-www
+              mountPath: /var/www
+            {{- end }}
         {{- end }}
         {{- with .Values.opencost.extraContainers }}
           {{- toYaml . | nindent 8 }}
@@ -347,7 +476,7 @@ spec:
           {{- toYaml . | nindent 12 }}
           {{- end }}
         {{- end }}
-      {{- if or .Values.plugins.enabled .Values.opencost.exporter.persistence.enabled .Values.extraVolumes .Values.opencost.customPricing.enabled .Values.opencost.cloudIntegrationSecret}}
+      {{- if or .Values.plugins.enabled .Values.opencost.exporter.persistence.enabled .Values.extraVolumes .Values.opencost.customPricing.enabled .Values.opencost.metrics.config.enabled $cloudIntegrationSecretName .Values.opencost.ui.enabled .Values.opencost.updateCaTrust.enabled }}
       volumes:
         {{- if .Values.plugins.enabled  }}
         {{- if .Values.plugins.install.enabled}}
@@ -359,31 +488,52 @@ spec:
           emptyDir: {}
         - name: plugins-config
           secret:
-            secretName:  {{ template "opencost.fullname" . }}-plugins-config
+            secretName: {{ include "opencost.pluginsConfigSecretName" . }}
         {{- end }}
-        {{- if .Values.opencost.customPricing.enabled }}
+        {{- if or .Values.opencost.customPricing.enabled .Values.opencost.metrics.config.enabled }}
         - name: custom-configs
-          configMap:
-            name: {{ .Values.opencost.customPricing.configmapName }}
-        {{- end }}
-        {{- if .Values.opencost.metrics.config.enabled }}
-        - name: custom-metrics
-          configMap:
-            name: {{ .Values.opencost.metrics.config.configmapName }}
+          emptyDir: {}
         {{- end }}
         {{- if .Values.opencost.exporter.persistence.enabled }}
         - name: opencost-export
           persistentVolumeClaim:
             claimName: {{ include "opencost.fullname" . }}-pvc
         {{- end }}
-        {{- if .Values.opencost.cloudIntegrationSecret }}
+        {{- if $cloudIntegrationSecretName }}
+        - name: var-configs
+          emptyDir: {}
         - name: cloud-integration
           secret:
-            secretName: {{ .Values.opencost.cloudIntegrationSecret }}
+            secretName: {{ $cloudIntegrationSecretName }}
             items:
               - key: cloud-integration.json
                 path: cloud-integration.json
+        {{- end }}
+        {{- if .Values.opencost.ui.enabled }}
+        - name: opencost-ui-nginx-config-volume
+          configMap:
+            name: opencost-ui-nginx-config
+            items:
+              - key: nginx.conf
+                path: default.nginx.conf
+        {{- if .Values.opencost.platforms.openshift.enabled }}
+        - name: empty-var-www
+          emptyDir: {}
+        {{- end }}
+        {{- end }}
+        {{- if .Values.opencost.updateCaTrust.enabled }}
+        - name: ca-certs-secret
+          {{- if .Values.opencost.updateCaTrust.caCertsSecret }}
+          secret:
+            defaultMode: 420
+            secretName: {{ .Values.opencost.updateCaTrust.caCertsSecret }}
+          {{- else }}
+          configMap:
+            name: {{ .Values.opencost.updateCaTrust.caCertsConfig }}
           {{- end }}
+        - name: ssl-path
+          emptyDir: {}
+        {{- end }}
         {{- with .Values.extraVolumes }}
           {{- toYaml . | nindent 8 }}
         {{- end }}
diff --git a/packages/system/opencost/charts/opencost/templates/extra-objects.yaml b/packages/system/opencost/charts/opencost/templates/extra-objects.yaml
new file mode 100644
index 0000000000..b058f886db
--- /dev/null
+++ b/packages/system/opencost/charts/opencost/templates/extra-objects.yaml
@@ -0,0 +1,4 @@
+{{- range .Values.extraObjects }}
+---
+{{ tpl (toYaml .) $ }}
+{{- end }}
diff --git a/packages/system/opencost/charts/opencost/templates/httproute.yaml b/packages/system/opencost/charts/opencost/templates/httproute.yaml
new file mode 100644
index 0000000000..4f17ebfc5f
--- /dev/null
+++ b/packages/system/opencost/charts/opencost/templates/httproute.yaml
@@ -0,0 +1,155 @@
+{{- if and .Values.opencost.ui.enabled .Values.opencost.ui.httpRoute.enabled }}
+apiVersion: gateway.networking.k8s.io/v1
+kind: HTTPRoute
+metadata:
+  name: {{ include "opencost.fullname" . }}-ui
+  namespace: {{ include "opencost.namespace" . }}
+  labels: {{- include "opencost.labels" . | nindent 4 }}
+  {{- with .Values.opencost.ui.httpRoute.labels }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- with .Values.opencost.ui.httpRoute.annotations }}
+  annotations: {{- toYaml . | nindent 4 }}
+  {{- end }}
+spec:
+  parentRefs:
+    {{- range .Values.opencost.ui.httpRoute.parentRefs }}
+    - name: {{ .name }}
+      {{- if .namespace }}
+      namespace: {{ .namespace }}
+      {{- end }}
+      {{- if .sectionName }}
+      sectionName: {{ .sectionName }}
+      {{- end }}
+    {{- end }}
+  {{- with .Values.opencost.ui.httpRoute.hostnames }}
+  hostnames:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  rules:
+    {{- range .Values.opencost.ui.httpRoute.rules }}
+    - matches:
+        {{- range .matches }}
+        - path:
+            type: {{ .path.type }}
+            value: {{ .path.value }}
+        {{- end }}
+      {{- with .filters }}
+      filters:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      backendRefs:
+        {{- range .backendRefs }}
+        - name: {{ default (include "opencost.fullname" $) .name }}
+          port: {{ default $.Values.opencost.ui.uiPort .port }}
+          {{- with .filters }}
+          filters:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+        {{- end }}
+    {{- end }}
+---
+{{- end }}
+{{- if .Values.opencost.exporter.apiHttpRoute.enabled }}
+apiVersion: gateway.networking.k8s.io/v1
+kind: HTTPRoute
+metadata:
+  name: {{ include "opencost.fullname" . }}-api
+  namespace: {{ include "opencost.namespace" . }}
+  labels: {{- include "opencost.labels" . | nindent 4 }}
+  {{- with .Values.opencost.exporter.apiHttpRoute.labels }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- with .Values.opencost.exporter.apiHttpRoute.annotations }}
+  annotations: {{- toYaml . | nindent 4 }}
+  {{- end }}
+spec:
+  parentRefs:
+    {{- range .Values.opencost.exporter.apiHttpRoute.parentRefs }}
+    - name: {{ .name }}
+      {{- if .namespace }}
+      namespace: {{ .namespace }}
+      {{- end }}
+      {{- if .sectionName }}
+      sectionName: {{ .sectionName }}
+      {{- end }}
+    {{- end }}
+  {{- with .Values.opencost.exporter.apiHttpRoute.hostnames }}
+  hostnames:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  rules:
+    {{- range .Values.opencost.exporter.apiHttpRoute.rules }}
+    - matches:
+        {{- range .matches }}
+        - path:
+            type: {{ .path.type }}
+            value: {{ .path.value }}
+        {{- end }}
+      {{- with .filters }}
+      filters:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      backendRefs:
+        {{- range .backendRefs }}
+        - name: {{ default (include "opencost.fullname" $) .name }}
+          port: {{ default $.Values.opencost.exporter.apiPort .port }}
+          {{- with .filters }}
+          filters:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+        {{- end }}
+    {{- end }}
+---
+{{- end }}
+{{- if and .Values.opencost.mcp.enabled .Values.opencost.mcp.httpRoute.enabled }}
+apiVersion: gateway.networking.k8s.io/v1
+kind: HTTPRoute
+metadata:
+  name: {{ include "opencost.fullname" . }}-mcp
+  namespace: {{ include "opencost.namespace" . }}
+  labels: {{- include "opencost.labels" . | nindent 4 }}
+  {{- with .Values.opencost.mcp.httpRoute.labels }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- with .Values.opencost.mcp.httpRoute.annotations }}
+  annotations: {{- toYaml . | nindent 4 }}
+  {{- end }}
+spec:
+  parentRefs:
+    {{- range .Values.opencost.mcp.httpRoute.parentRefs }}
+    - name: {{ .name }}
+      {{- if .namespace }}
+      namespace: {{ .namespace }}
+      {{- end }}
+      {{- if .sectionName }}
+      sectionName: {{ .sectionName }}
+      {{- end }}
+    {{- end }}
+  {{- with .Values.opencost.mcp.httpRoute.hostnames }}
+  hostnames:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  rules:
+    {{- range .Values.opencost.mcp.httpRoute.rules }}
+    - matches:
+        {{- range .matches }}
+        - path:
+            type: {{ .path.type }}
+            value: {{ .path.value }}
+        {{- end }}
+      {{- with .filters }}
+      filters:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      backendRefs:
+        {{- range .backendRefs }}
+        - name: {{ default (include "opencost.fullname" $) .name }}
+          port: {{ default $.Values.opencost.mcp.port .port }}
+          {{- with .filters }}
+          filters:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+        {{- end }}
+    {{- end }}
+{{- end }}
diff --git a/packages/system/opencost/charts/opencost/templates/ingress.yaml b/packages/system/opencost/charts/opencost/templates/ingress.yaml
index 7973d12e8a..4f107535ae 100644
--- a/packages/system/opencost/charts/opencost/templates/ingress.yaml
+++ b/packages/system/opencost/charts/opencost/templates/ingress.yaml
@@ -37,4 +37,86 @@ spec:
                   name: {{ $.Values.opencost.ui.ingress.servicePort }}
         {{- end }}
   {{- end }}
+---
+{{- end }}
+{{- if .Values.opencost.exporter.apiIngress.enabled }}
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: {{ include "opencost.fullname" . }}-api-ingress
+  namespace: {{ include "opencost.namespace" . }}
+  labels: {{- include "opencost.labels" . | nindent 4 }}
+  {{- with .Values.opencost.exporter.apiIngress.annotations }}
+  annotations: {{- toYaml . | nindent 4 }}
+  {{- end }}
+spec:
+  {{- with .Values.opencost.exporter.apiIngress.ingressClassName }}
+  ingressClassName: {{ . }}
+  {{- end }}
+  {{- if .Values.opencost.exporter.apiIngress.tls }}
+  tls:
+    {{- range .Values.opencost.exporter.apiIngress.tls }}
+    - hosts:
+        {{- range .hosts }}
+        - {{ . | quote }}
+        {{- end }}
+      secretName: {{ .secretName }}
+    {{- end }}
+  {{- end }}
+  rules:
+    {{- range .Values.opencost.exporter.apiIngress.hosts }}
+    - host: {{ .host | quote }}
+      http:
+        paths:
+          {{- range .paths }}
+          - path: {{ .path }}
+            pathType: {{ .pathType }}
+            backend:
+              service:
+                name: {{ include "opencost.fullname" $ }}
+                port:
+                  name: {{ $.Values.opencost.exporter.apiIngress.servicePort }}
+        {{- end }}
+  {{- end }}
+---
+{{- end }}
+{{- if and .Values.opencost.mcp.enabled .Values.opencost.mcp.ingress.enabled }}
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: {{ include "opencost.fullname" . }}-mcp-ingress
+  namespace: {{ include "opencost.namespace" . }}
+  labels: {{- include "opencost.labels" . | nindent 4 }}
+  {{- with .Values.opencost.mcp.ingress.annotations }}
+  annotations: {{- toYaml . | nindent 4 }}
+  {{- end }}
+spec:
+  {{- with .Values.opencost.mcp.ingress.ingressClassName }}
+  ingressClassName: {{ . }}
+  {{- end }}
+  {{- if .Values.opencost.mcp.ingress.tls }}
+  tls:
+    {{- range .Values.opencost.mcp.ingress.tls }}
+    - hosts:
+        {{- range .hosts }}
+        - {{ . | quote }}
+        {{- end }}
+      secretName: {{ .secretName }}
+    {{- end }}
+  {{- end }}
+  rules:
+    {{- range .Values.opencost.mcp.ingress.hosts }}
+    - host: {{ .host | quote }}
+      http:
+        paths:
+          {{- range .paths }}
+          - path: {{ .path }}
+            pathType: {{ .pathType }}
+            backend:
+              service:
+                name: {{ include "opencost.fullname" $ }}
+                port:
+                  name: mcp-server
+        {{- end }}
+  {{- end }}
 {{- end }}
\ No newline at end of file
diff --git a/packages/system/opencost/charts/opencost/templates/install-plugins.yaml b/packages/system/opencost/charts/opencost/templates/install-plugins.yaml
index 31d7dbe196..a21240e103 100644
--- a/packages/system/opencost/charts/opencost/templates/install-plugins.yaml
+++ b/packages/system/opencost/charts/opencost/templates/install-plugins.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ template "opencost.fullname" . }}-install-plugins
+  namespace: {{ include "opencost.namespace" . }}
   labels:
     app: {{ template "opencost.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
@@ -38,9 +39,10 @@ data:
       VER=$(curl --silent https://api.github.com/repos/opencost/opencost-plugins/releases/latest | grep ".tag_name" | awk -F\" '{print $4}')
       {{- end }}
 
-      {{- range $pluginName, $config := .Values.plugins.configs }}
+      {{- $pluginList := include "opencost.plugins.installList" . | fromYamlArray }}
+      {{- range $pluginName := $pluginList }}
       curl -fsSLO "https://github.com/opencost/opencost-plugins/releases/download/$VER/{{ $pluginName }}.ocplugin.$OS.$ARCH"
       chmod a+rx "{{ $pluginName }}.ocplugin.$OS.$ARCH"
       {{- end }}
     {{- end }}
-{{- end }}
\ No newline at end of file
+{{- end }}
diff --git a/packages/system/opencost/charts/opencost/templates/monitoring-role-binding-template.yaml b/packages/system/opencost/charts/opencost/templates/monitoring-role-binding-template.yaml
new file mode 100644
index 0000000000..0e79588b66
--- /dev/null
+++ b/packages/system/opencost/charts/opencost/templates/monitoring-role-binding-template.yaml
@@ -0,0 +1,15 @@
+{{- if and .Values.opencost.platforms.openshift.enabled .Values.opencost.platforms.openshift.createMonitoringResourceReaderRoleBinding }}
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  namespace: {{ include "opencost.namespace" . }}
+  name: {{ include "opencost.fullname" . }}-reader
+subjects:
+- kind: ServiceAccount
+  name: {{ .Values.opencost.platforms.openshift.monitoringServiceAccountName | quote }}
+  namespace: {{ .Values.opencost.platforms.openshift.monitoringServiceAccountNamespace | quote }}
+roleRef:
+  kind: Role
+  name: {{ include "opencost.fullname" . }}-reader
+  apiGroup: rbac.authorization.k8s.io
+{{- end -}}
diff --git a/packages/system/opencost/charts/opencost/templates/monitoring-role-template.yaml b/packages/system/opencost/charts/opencost/templates/monitoring-role-template.yaml
new file mode 100644
index 0000000000..3f85cc7294
--- /dev/null
+++ b/packages/system/opencost/charts/opencost/templates/monitoring-role-template.yaml
@@ -0,0 +1,17 @@
+{{- if and .Values.opencost.platforms.openshift.enabled .Values.opencost.platforms.openshift.createMonitoringResourceReaderRoleBinding }}
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  namespace: {{ include "opencost.namespace" . }}
+  name: {{ include "opencost.fullname" . }}-reader
+rules:
+  - apiGroups: 
+      - ''
+    resources:
+      - "pods"
+      - "services"
+      - "endpoints"
+    verbs:
+      - list
+      - watch
+{{- end -}}
\ No newline at end of file
diff --git a/packages/system/opencost/charts/opencost/templates/pdb.yaml b/packages/system/opencost/charts/opencost/templates/pdb.yaml
new file mode 100644
index 0000000000..5d6c38fd30
--- /dev/null
+++ b/packages/system/opencost/charts/opencost/templates/pdb.yaml
@@ -0,0 +1,18 @@
+{{- if .Values.pdb.enabled }}
+apiVersion: policy/v1
+kind: PodDisruptionBudget
+metadata:
+  name: {{ include "opencost.fullname" . }}
+  namespace: {{ include "opencost.namespace" . }}
+  labels: {{- include "opencost.labels" . | nindent 4 }}
+spec:
+  {{- if .Values.pdb.minAvailable }}
+  minAvailable: {{ .Values.pdb.minAvailable }}
+  {{- end }}
+  {{- if .Values.pdb.maxUnavailable }}
+  maxUnavailable: {{ .Values.pdb.maxUnavailable }}
+  {{- end }}
+  selector:
+    matchLabels:
+      {{- include "opencost.selectorLabels" . | nindent 6 }}
+{{- end }}
diff --git a/packages/system/opencost/charts/opencost/templates/plugins-config.yaml b/packages/system/opencost/charts/opencost/templates/plugins-config.yaml
index 2a6f0ac428..fa648ee92f 100644
--- a/packages/system/opencost/charts/opencost/templates/plugins-config.yaml
+++ b/packages/system/opencost/charts/opencost/templates/plugins-config.yaml
@@ -1,8 +1,11 @@
-{{- if .Values.plugins.enabled }}
+{{- include "opencost.plugins.configCheck" . }}
+{{- /* Only create the plugins-config secret if plugins are enabled and existingSecret is not specified */}}
+{{- if and .Values.plugins.enabled (not .Values.plugins.existingSecret) }}
 apiVersion: v1
 kind: Secret
 metadata:
-  name: {{ template "opencost.fullname" . }}-plugins-config
+  name: {{ include "opencost.pluginsConfigSecretName" . }}
+  namespace: {{ include "opencost.namespace" . }}
   labels:
     app: {{ template "opencost.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
diff --git a/packages/system/opencost/charts/opencost/templates/pvc.yaml b/packages/system/opencost/charts/opencost/templates/pvc.yaml
index 1295765b83..ce5c0c7131 100644
--- a/packages/system/opencost/charts/opencost/templates/pvc.yaml
+++ b/packages/system/opencost/charts/opencost/templates/pvc.yaml
@@ -11,7 +11,9 @@ metadata:
 spec:
   accessModes:
     - {{ .Values.opencost.exporter.persistence.accessMode | quote }}
-  storageClassName: {{ default "" .Values.opencost.exporter.persistence.storageClass }}
+  {{- if .Values.opencost.exporter.persistence.storageClass }}
+  storageClassName: {{ .Values.opencost.exporter.persistence.storageClass }}
+  {{- end }}
   resources:
     requests:
       storage: {{ .Values.opencost.exporter.persistence.size | quote }}
diff --git a/packages/system/opencost/charts/opencost/templates/route.yaml b/packages/system/opencost/charts/opencost/templates/route.yaml
new file mode 100644
index 0000000000..6ee7cfca34
--- /dev/null
+++ b/packages/system/opencost/charts/opencost/templates/route.yaml
@@ -0,0 +1,32 @@
+{{- if and (.Capabilities.APIVersions.Has "route.openshift.io/v1/Route") .Values.opencost.ui.enabled .Values.opencost.ui.route.enabled }}
+apiVersion: route.openshift.io/v1
+kind: Route
+metadata:
+  name: {{ include "opencost.fullname" . }}-route
+  namespace: {{ include "opencost.namespace" . }}
+  labels: {{- include "opencost.labels" . | nindent 4 }}
+  {{- with .Values.opencost.ui.route.annotations }}
+  annotations: {{- toYaml . | nindent 4 }}
+  {{- end }}
+spec:
+  host: {{ .Values.opencost.ui.route.host | quote }}
+  {{- if .Values.opencost.ui.route.path }}
+  path: {{ .Values.opencost.ui.route.path }}
+  {{- end }}
+  port:
+    targetPort: {{ .Values.opencost.ui.route.targetPort }}
+  to:
+    kind: Service
+    name: {{ include "opencost.fullname" . }}
+    weight: 100
+  wildcardPolicy: None
+  {{- if .Values.opencost.ui.route.tls }}
+  tls:
+    {{- if .Values.opencost.ui.route.tls.insecureEdgeTerminationPolicy }}
+    insecureEdgeTerminationPolicy: {{ .Values.opencost.ui.route.tls.insecureEdgeTerminationPolicy }}
+    {{- end }}
+    {{- if .Values.opencost.ui.route.tls.termination }}
+    termination: {{ .Values.opencost.ui.route.tls.termination }}
+    {{- end }}
+  {{- end }}
+{{- end }}
diff --git a/packages/system/opencost/charts/opencost/templates/scc.yaml b/packages/system/opencost/charts/opencost/templates/scc.yaml
new file mode 100644
index 0000000000..012d1e1e2c
--- /dev/null
+++ b/packages/system/opencost/charts/opencost/templates/scc.yaml
@@ -0,0 +1,41 @@
+{{- if and .Values.opencost.platforms.openshift.enabled .Values.opencost.platforms.openshift.enableSCC }}
+apiVersion: security.openshift.io/v1
+kind: SecurityContextConstraints
+metadata:
+  name: {{include "opencost.sccName" .}}
+priority: 10
+allowPrivilegedContainer: false
+allowHostDirVolumePlugin: false
+allowHostIPC: false
+allowHostNetwork: false
+allowHostPID: false
+allowHostPorts: false
+allowPrivilegeEscalation: false
+readOnlyRootFilesystem: false
+allowedCapabilities:
+  - CHOWN
+  - FOWNER
+  - FSETID
+  - KILL
+  - NET_BIND_SERVICE
+  - SETFCAP
+  - SETGID
+  - SETPCAP
+  - SETUID
+runAsUser:
+  type: MustRunAs
+  uid: 1001
+seLinuxContext:
+  type: MustRunAs
+fsGroup:
+  type: RunAsAny
+supplementalGroups:
+  type: RunAsAny
+volumes:
+  - configMap
+  - downwardAPI
+  - emptyDir
+  - persistentVolumeClaim
+  - projected
+  - secret
+{{- end}}
diff --git a/packages/system/opencost/charts/opencost/templates/secret-admin-token.yaml b/packages/system/opencost/charts/opencost/templates/secret-admin-token.yaml
new file mode 100644
index 0000000000..13de660b41
--- /dev/null
+++ b/packages/system/opencost/charts/opencost/templates/secret-admin-token.yaml
@@ -0,0 +1,14 @@
+{{- if and .Values.opencost.exporter.adminToken.enabled .Values.opencost.exporter.adminToken.value (not .Values.opencost.exporter.adminToken.existingSecret) }}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ include "opencost.fullname" . }}-admin-token
+  namespace: {{ include "opencost.namespace" . }}
+  labels: {{- include "opencost.labels" . | nindent 4 }}
+  {{- with .Values.secretAnnotations }}
+  annotations: {{- toYaml . | nindent 4 }}
+  {{- end }}
+type: Opaque
+data:
+  {{ .Values.opencost.exporter.adminToken.secretKey | default "ADMIN_TOKEN" }}: {{ .Values.opencost.exporter.adminToken.value | toString | b64enc | quote }}
+{{- end }}
diff --git a/packages/system/opencost/charts/opencost/templates/secret-cloud-integration.yaml b/packages/system/opencost/charts/opencost/templates/secret-cloud-integration.yaml
new file mode 100644
index 0000000000..e78e20d6bc
--- /dev/null
+++ b/packages/system/opencost/charts/opencost/templates/secret-cloud-integration.yaml
@@ -0,0 +1,12 @@
+{{- if .Values.opencost.cloudIntegrationJSON }}
+apiVersion: v1
+kind: Secret
+type: Opaque
+metadata:
+  name: {{ include "opencost.cloudIntegration.secretName" . }}
+  namespace: {{ include "opencost.namespace" . }}
+  labels:
+    {{- include "opencost.labels" . | nindent 4 }}
+data:
+  cloud-integration.json: {{ .Values.opencost.cloudIntegrationJSON | trimSuffix "\n" | b64enc | quote }}
+{{- end }}
diff --git a/packages/system/opencost/charts/opencost/templates/service.yaml b/packages/system/opencost/charts/opencost/templates/service.yaml
index 4c8c8e5a8a..cd9be20692 100644
--- a/packages/system/opencost/charts/opencost/templates/service.yaml
+++ b/packages/system/opencost/charts/opencost/templates/service.yaml
@@ -27,6 +27,11 @@ spec:
     - name: http
       port: {{ .Values.opencost.exporter.apiPort }}
       targetPort: {{ .Values.opencost.exporter.apiPort }}
+    {{- if .Values.opencost.mcp.enabled }}
+    - name: mcp-server
+      port: {{ .Values.opencost.mcp.port }}
+      targetPort: {{ .Values.opencost.mcp.port }}
+    {{- end }}
     {{- if .Values.opencost.ui.enabled }}
     - name: http-ui
       port: {{ .Values.opencost.ui.uiPort }}
@@ -45,4 +50,4 @@ spec:
     {{- with .Values.service.extraPorts }}
       {{- toYaml . | nindent 4 }}
     {{- end }}
-{{- end }}
+{{- end }}
\ No newline at end of file
diff --git a/packages/system/opencost/charts/opencost/tests/deployment_test.yaml b/packages/system/opencost/charts/opencost/tests/deployment_test.yaml
deleted file mode 100644
index 79cd0842df..0000000000
--- a/packages/system/opencost/charts/opencost/tests/deployment_test.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-suite: test deployment
-templates:
-  - templates/deployment.yaml
-tests:
-  - it: should work
-    set:
-      image.tag: latest
-    asserts:
-      - isKind:
-          of: Deployment
-      - matchRegex:
-          path: metadata.name
-          pattern: -opencost$
-      - matchRegex:
-          path: spec.template.spec.containers[0].image
-          pattern: ghcr\.io\/opencost\/opencost:[0-9]*\.[0-9]*\.[0-9]*
diff --git a/packages/system/opencost/charts/opencost/tests/opencost_test.yaml b/packages/system/opencost/charts/opencost/tests/opencost_test.yaml
deleted file mode 100644
index bd84e6a8e9..0000000000
--- a/packages/system/opencost/charts/opencost/tests/opencost_test.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-suite: test deployment snapshot
-templates:
-  - templates/deployment.yaml
-tests:
-  - it: pod spec should match snapshot
-    asserts:
-      - matchSnapshot: {}
diff --git a/packages/system/opencost/charts/opencost/tests/service_test.yaml b/packages/system/opencost/charts/opencost/tests/service_test.yaml
deleted file mode 100644
index b1fec3a8cf..0000000000
--- a/packages/system/opencost/charts/opencost/tests/service_test.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-suite: test service
-templates:
-  - templates/service.yaml
-tests:
-  - it: should work
-    set:
-      service:
-        type: ClusterIP
-    asserts:
-      - equal:
-          path: spec.type
-          value: ClusterIP
-  - it: should render right if values given
-    set:
-      service:
-        type: NodePort
-        NodePort: 30200
-    asserts:
-      - equal:
-          path: spec.type
-          value: NodePort
-  - it: should render right if values given
-    set:
-      service:
-        type: LoadBalancer
-    asserts:
-      - equal:
-          path: spec.type
-          value: LoadBalancer
diff --git a/packages/system/opencost/charts/opencost/values-openshift.yaml b/packages/system/opencost/charts/opencost/values-openshift.yaml
new file mode 100644
index 0000000000..0c32847401
--- /dev/null
+++ b/packages/system/opencost/charts/opencost/values-openshift.yaml
@@ -0,0 +1,7 @@
+# This Helm values file is a modified version of `values.yaml`.
+# This file is meant to be used by users deploying Opencost to OpenShift (OCP) clusters. For more configuration options, see `values.yaml`.
+opencost:
+  platforms:
+    openshift:
+      enabled: true
+
diff --git a/packages/system/opencost/charts/opencost/values.yaml b/packages/system/opencost/charts/opencost/values.yaml
index ed1ce77688..7b0926d636 100644
--- a/packages/system/opencost/charts/opencost/values.yaml
+++ b/packages/system/opencost/charts/opencost/values.yaml
@@ -4,6 +4,8 @@ nameOverride: ""
 fullnameOverride: ""
 # -- Override the deployment namespace
 namespaceOverride: ""
+# -- Override the default name of cluster - Can be found in /etc/kubernetes/admin.conf: clusters -> cluster -> name
+clusterName: "cluster.local"
 
 loglevel: info
 
@@ -22,9 +24,38 @@ plugins:
       readOnlyRootFilesystem: true
       runAsNonRoot: true
       runAsUser: 1000
+    # -- List of plugins to download, independent of `plugins.configs`.
+    # When specified, these plugins are downloaded regardless of what's in configs,
+    # which enables using `plugins.existingSecret` for credentials while still
+    # downloading plugin binaries. This list also drives which `<plugin>_config.json`
+    # subPaths the Deployment mounts, so each listed plugin MUST have a matching
+    # config source -- either a `plugins.configs.<plugin>` entry (when
+    # `plugins.existingSecret` is empty) or a `<plugin>_config.json` key in the
+    # Secret referenced by `plugins.existingSecret`. Missing entries cause Pod
+    # startup failures because the mounted subPath will not exist. When
+    # `plugins.existingSecret` is empty, the chart validates this at
+    # template-render time and fails with an actionable error; the check is
+    # skipped when `plugins.existingSecret` is set because the contents of an
+    # externally-managed Secret cannot be introspected from Helm.
+    # Example: ["datadog", "mongodb"].
+    # If empty, falls back to downloading plugins based on keys in configs (legacy behavior).
+    plugins: []
   folder: /opt/opencost/plugin
   # leave this commented to always download most recent version of plugins
   # version: <INSERT_SPECIFIC_PLUGINS_VERSION>
+  # -- Use an existing Secret for plugin configuration instead of generating
+  # one from `plugins.configs`. The referenced Secret MUST contain a
+  # `<plugin>_config.json` key for every entry in `plugins.install.plugins`
+  # (and for every plugin whose configs key would otherwise drive the
+  # install/mount list) -- the Deployment mounts those files via subPath and
+  # missing keys cause Pod startup failures. This is useful when using
+  # ExternalSecrets, Vault, or other secret-management tools so that plugin
+  # credentials do not have to be committed via `plugins.configs`. Mutually
+  # exclusive with `plugins.configs`: when `existingSecret` is set, the chart
+  # does not render a generated Secret and any `plugins.configs` entries would
+  # be silently ignored, so the chart will `fail` template rendering in that
+  # case.
+  existingSecret: ""
   configs:
     # datadog: |
     #   {
@@ -82,6 +113,8 @@ secretAnnotations: {}
 podLabels: {}
 # --  Pod priority
 priorityClassName: ~
+# --  Enable automounting of service account token at the pod level
+podAutomountServiceAccountToken: true
 
 # -- Holds pod-level security attributes and common container settings
 podSecurityContext: {}
@@ -112,10 +145,152 @@ service:
 rbac:
   enabled: true
 
+# PodDisruptionBudget for high availability
+pdb:
+  enabled: false
+  # -- Minimum number of pods that must be available after the eviction
+  minAvailable: ~
+  # -- Maximum number of pods that can be unavailable after the eviction
+  maxUnavailable: ~
+
 opencost:
-  # -- <SECRET_NAME> for the secret containing the Cloud Costs cloud-integration.json https://www.opencost.io/docs/configuration/#cloud-costs
-  # -- kubectl create secret generic <SECRET_NAME> --from-file=cloud-integration.json -n opencost
+  # -- Existing Secret containing `cloud-integration.json` for Cloud Costs. See
+  # https://www.opencost.io/docs/configuration/#cloud-costs.
+  # Create with: `kubectl create secret generic <SECRET_NAME> --from-file=cloud-integration.json -n opencost`.
+  # Mutually exclusive with `opencost.cloudIntegrationJSON`.
   cloudIntegrationSecret: ""
+  # -- Raw JSON for `cloud-integration.json`. Creates a Secret named
+  # `<fullname>-cloud-integration` in the release namespace.
+  # Mutually exclusive with `opencost.cloudIntegrationSecret`.
+  cloudIntegrationJSON: ""
+  # cloudIntegrationJSON: |-
+  #   {
+  #     "aws": [
+  #       {
+  #         "athenaBucketName": "s3://AWS_cloud_integration_athenaBucketName",
+  #         "athenaRegion": "AWS_cloud_integration_athenaRegion",
+  #         "athenaDatabase": "AWS_cloud_integration_athenaDatabase",
+  #         "athenaTable": "AWS_cloud_integration_athenaTable",
+  #         "projectID": "AWS_cloud_integration_athena_projectID",
+  #         "serviceKeyName": "AWS_cloud_integration_athena_serviceKeyName",
+  #         "serviceKeySecret": "AWS_cloud_integration_athena_serviceKeySecret"
+  #       }
+  #     ],
+  #     "azure": [
+  #       {
+  #         "azureSubscriptionID": "my-subscription-id",
+  #         "azureStorageAccount": "my-storage-account",
+  #         "azureStorageAccessKey": "my-storage-access-key",
+  #         "azureStorageContainer": "my-storage-container"
+  #       }
+  #     ],
+  #     "gcp": [
+  #       {
+  #         "projectID": "my-project-id",
+  #         "billingDataDataset": "detailedbilling.my-billing-dataset",
+  #         "key": {
+  #           "type": "service_account",
+  #           "project_id": "my-project-id",
+  #           "private_key_id": "my-private-key-id",
+  #           "private_key": "my-pem-encoded-private-key",
+  #           "client_email": "my-service-account-name@my-project-id.iam.gserviceaccount.com",
+  #           "client_id": "my-client-id",
+  #           "auth_uri": "auth-uri",
+  #           "token_uri": "token-uri",
+  #           "auth_provider_x509_cert_url": "my-x509-provider-cert",
+  #           "client_x509_cert_url": "my-x509-cert-url"
+  #         }
+  #       }
+  #     ],
+  #     "oci": {
+  #       "usageApi": [
+  #         {
+  #           "tenancyID": "ocid1.tenancy.oc1..my-tenancy-ocid",
+  #           "region": "us-ashburn-1",
+  #           "authorizer": {
+  #             "authorizerType": "OCIRawConfigProvider",
+  #             "tenancyID": "ocid1.tenancy.oc1..my-tenancy-ocid",
+  #             "userID": "ocid1.user.oc1..my-user-ocid",
+  #             "region": "us-ashburn-1",
+  #             "fingerprint": "xx:xx:xx:xx:xx:xx:xx:xx:xx:xx:xx:xx:xx:xx:xx:xx",
+  #             "privateKey": "REPLACE_WITH_YOUR_OCI_KEY_FILE_CONTENTS"
+  #           }
+  #         }
+  #       ]
+  #     }
+  #   }
+
+  # -- MCP (Model Context Protocol) Server Configuration
+  # The MCP server provides AI agents with access to cost allocation and asset data
+  mcp:
+    # -- Enable MCP server for AI agent integration (default: true)
+    # Set to false to disable MCP server completely
+    enabled: true
+    # -- HTTP port for MCP server (default: 8081)
+    # Change this if port 8081 conflicts with other services
+    port: 8081
+    ingress:
+      # -- Ingress for MCP server
+      enabled: false
+      # -- Ingress controller which implements the resource
+      ingressClassName: ""
+      # -- Annotations for Ingress resource
+      annotations: {}
+        # kubernetes.io/tls-acme: "true"
+      # -- A list of host rules used to configure the Ingress
+      # @default -- See [values.yaml](values.yaml)
+      hosts:
+      - host: example.local
+        paths:
+        - path: /
+          pathType: Prefix
+      # -- Ingress TLS configuration
+      tls: []
+        #  - secretName: chart-example-tls
+        #    hosts:
+        #      - chart-example.local
+    # -- HTTPRoute for MCP server (Gateway API)
+    httpRoute:
+      # -- Enable HTTPRoute resource
+      enabled: false
+      # -- Gateway API parent references
+      # @default -- See [values.yaml](values.yaml)
+      parentRefs:
+        - name: ""
+          namespace: ""
+          sectionName: ""
+      # -- Hostnames for the HTTPRoute
+      hostnames: []
+        # - mcp.example.local
+      # -- Annotations for HTTPRoute resource
+      annotations: {}
+      # -- Labels for HTTPRoute resource
+      labels: {}
+      # -- HTTPRoute rules. Each rule supports an optional `filters` list at the rule level
+      # and per-backendRef `filters` for Gateway API filter configuration (e.g. basic auth
+      # via `ExtensionRef`, header modification via `RequestHeaderModifier`, etc.).
+      # @default -- See [values.yaml](values.yaml)
+      rules:
+        - matches:
+            - path:
+                type: PathPrefix
+                value: /
+          # filters:
+          #   - type: ExtensionRef
+          #     extensionRef:
+          #       group: gateway.envoyproxy.io
+          #       kind: SecurityPolicy
+          #       name: basic-auth-policy
+          backendRefs:
+            - name: ""  # Will default to service name
+              port: 8081
+              # filters:
+              #   - type: RequestHeaderModifier
+              #     requestHeaderModifier:
+              #       add:
+              #         - name: X-Custom-Header
+              #           value: my-value
+
   exporter:
     # API_PORT for the cost-model to listen on
     apiPort: 9003
@@ -124,19 +299,24 @@ opencost:
     cloudProviderApiKey: ""
     # -- Default cluster ID to use if cluster_id is not set in Prometheus metrics.
     defaultClusterId: 'default-cluster'
+    # -- If clusterIdConfigmap is defined, use user-generated ConfigMap with key CLUSTER_ID as default cluster ID.
+    # -- This overrides the above defaultClusterId. Ensure the ConfigMap exists and contains the required CLUSTER_ID key.
+    # clusterIdConfigmap: cluster-id-configmap
     image:
       # -- Exporter container image registry
       registry: ghcr.io
       # -- Exporter container image name
       repository: opencost/opencost
       # -- Exporter container image tag
-      tag: "1.111.0@sha256:6aa68e52a24b14ba41f23db08d1b9db1429a1c0300f4c0381ecc2c61fc311a97"
+      tag: "1.120.3@sha256:9f282400e59a4fc886e5fa3bca3c777b9dcae866b781641ca1d1271525d15f72"
       # -- Exporter container image pull policy
       pullPolicy: IfNotPresent
       # -- Override the full image name for development purposes
       fullImageName: null
     # -- List of extra arguments for the command, e.g.: log-format=json
     extraArgs: []
+    # -- Optional command to override the default container command
+    command: []
     # -- Number of OpenCost replicas to run
     replicas: 1
     resources:
@@ -146,7 +326,6 @@ opencost:
         memory: '55Mi'
       # -- CPU/Memory resource limits
       limits:
-        cpu: '999m'
         memory: '1Gi'
     # Startup probe configuration
     startupProbe:
@@ -196,9 +375,31 @@ opencost:
     # Path of CSV file
     csv_path: ""
 
+    prometheusDataSource:
+      # Set the resolution in second that prometheus queries will be performed at
+      queryResolutionSeconds: 300
+
+    # Collector DataSource collects cluster data without a dependency on Prometheus
+    # It is recommended that persistence is enabled alongside it to preserve the state
+    # between pod restarts
+    collectorDataSource:
+      enabled: false
+      # -- define the interval at which the collector scrapes for data points (10s, 15s, 1m)
+      scrapeInterval: 30s
+      # -- The port at which network pods are open to egress
+      networkPort: 3001
+      # -- The number of 10m intervals the Collector DataSource should maintain
+      retention10m: 36
+      # -- The number of 1h intervals the Collector DataSource should maintain
+      retention1h: 49
+      # -- The number of 1d intervals the Collector DataSource should maintain
+      retention1d: 15
+
     # Persistent volume claim for storing the data. eg: csv file
     persistence:
       enabled: false
+      # -- The path that the PV will be mounted to the exporter at
+      mountPath: /mnt/export
       # -- Annotations for persistent volume
       annotations: {}
       # -- Access mode for persistent volume
@@ -222,6 +423,81 @@ opencost:
       # FOO: BAR
       # For example, if accessing mimir directly and getting 401 Unauthorized
       # PROMETHEUS_HEADER_X_SCOPE_ORGID: anonymous
+    # Admin token for write operations (e.g. POST /serviceKey, cloud config endpoints).
+    # Set ADMIN_TOKEN env from a chart-created secret or an existing secret.
+    adminToken:
+      # -- When true, the chart creates the admin-token Secret (if value is set) or mounts existingSecret as ADMIN_TOKEN. When false, ADMIN_TOKEN is not set and no secret is deployed.
+      enabled: false
+      # -- If set, the chart creates a Secret with this value and sets ADMIN_TOKEN from it (not recommended for production; use existingSecret instead).
+      value: ""
+      # -- Use an existing Secret for the admin token (recommended). Secret must contain the key below.
+      existingSecret: ""
+      # -- Key in the Secret that holds the admin token (used for both value-created and existing secrets).
+      secretKey: "ADMIN_TOKEN"
+    apiIngress:
+      # -- Ingress for OpenCost API
+      enabled: false
+      # -- Ingress controller which implements the resource
+      ingressClassName: ""
+      # -- Annotations for Ingress resource
+      annotations: {}
+        # kubernetes.io/tls-acme: "true"
+      # -- A list of host rules used to configure the Ingress
+      # @default -- See [values.yaml](values.yaml)
+      hosts:
+      - host: example.local
+        paths:
+        - path: /
+          pathType: Prefix
+      # -- Redirect ingress to an extraPort defined on the service such as oauth-proxy
+      servicePort: http
+      # servicePort: oauth-proxy
+      # -- Ingress TLS configuration
+      tls: []
+        #  - secretName: chart-example-tls
+        #    hosts:
+        #      - chart-example.local
+    # -- HTTPRoute for OpenCost API (Gateway API)
+    apiHttpRoute:
+      # -- Enable HTTPRoute resource
+      enabled: false
+      # -- Gateway API parent references
+      # @default -- See [values.yaml](values.yaml)
+      parentRefs:
+        - name: ""
+          namespace: ""
+          sectionName: ""
+      # -- Hostnames for the HTTPRoute
+      hostnames: []
+        # - api.example.local
+      # -- Annotations for HTTPRoute resource
+      annotations: {}
+      # -- Labels for HTTPRoute resource
+      labels: {}
+      # -- HTTPRoute rules. Each rule supports an optional `filters` list at the rule level
+      # and per-backendRef `filters` for Gateway API filter configuration (e.g. basic auth
+      # via `ExtensionRef`, header modification via `RequestHeaderModifier`, etc.).
+      # @default -- See [values.yaml](values.yaml)
+      rules:
+        - matches:
+            - path:
+                type: PathPrefix
+                value: /
+          # filters:
+          #   - type: ExtensionRef
+          #     extensionRef:
+          #       group: gateway.envoyproxy.io
+          #       kind: SecurityPolicy
+          #       name: basic-auth-policy
+          backendRefs:
+            - name: ""  # Will default to service name
+              port: 9003
+              # filters:
+              #   - type: RequestHeaderModifier
+              #     requestHeaderModifier:
+              #       add:
+              #         - name: X-Custom-Header
+              #           value: my-value
   customPricing:
     # -- Enables custom pricing configuration
     enabled: false
@@ -246,8 +522,8 @@ opencost:
       regionNetworkEgress: 0.01
       internetNetworkEgress: 0.12
 
-  dataRetention:
-    dailyResolutionDays: 15
+  retention1d: 15
+  retention1h: 49
 
   carbonCost:
     # -- Enable carbon cost exposed in the API
@@ -265,7 +541,6 @@ opencost:
     # -- The max number of days that any single query will be made to construct Cloud Costs
     queryWindowDays: 7
 
-
   metrics:
     kubeStateMetrics:
       # -- (bool) Enable emission of pod annotations
@@ -333,6 +608,10 @@ opencost:
     # -- Prometheus Bearer token
     bearer_token: ""
     bearer_token_key: DB_BEARER_TOKEN
+    # -- If true, opencost will use kube-rbac-proxy to authenticate with in cluster Prometheus for openshift
+    kubeRBACProxy: false
+    # -- Whether to disable SSL certificate verification
+    insecureSkipVerify: false
     external:
       # -- Use external Prometheus (eg. Grafana Cloud)
       enabled: false
@@ -347,9 +626,13 @@ opencost:
       namespaceName: prometheus-system
       # -- Service port of in-cluster Prometheus
       port: 80
+      # -- Path to access the Prometheus API, this is neccesary if the Prometheus server is behind a reverse proxy(mimir) or has a different path.
+      path: ""
+      # -- Scheme to use for in-cluster Prometheus
+      scheme: http
     amp:
       # -- Use Amazon Managed Service for Prometheus (AMP)
-      enabled: false  # If true, opencost will be configured to remote_write and query from Amazon Managed Service for Prometheus.
+      enabled: false # If true, opencost will be configured to remote_write and query from Amazon Managed Service for Prometheus.
       # -- Workspace ID for AMP
       workspaceId: ""
     thanos:
@@ -361,6 +644,7 @@ opencost:
         serviceName: my-thanos-query
         namespaceName: opencost
         port: 10901
+        scheme: http
       external:
         enabled: false
         url: 'https://thanos-query.example.com/thanos'
@@ -375,7 +659,7 @@ opencost:
       repository: opencost/opencost-ui
       # -- UI container image tag
       # @default -- `""` (use appVersion in Chart.yaml)
-      tag: "1.111.0@sha256:f7221e7a708d71663f5eca6c238268757eb4352f3e9f46b1029d33ab4e53fd8a"
+      tag: "1.120.3@sha256:12b6e7a844c17f9a4019cdd55e5bfe6c720c1a0961d8a9be2333a97c69bffcc9"
       # -- UI container image pull policy
       pullPolicy: IfNotPresent
       # -- Override the full image name for development purposes
@@ -387,11 +671,15 @@ opencost:
         memory: '55Mi'
       # -- CPU/Memory resource limits
       limits:
-        cpu: '999m'
         memory: '1Gi'
     # used in the default.nginx.conf if you want to switch for using with Docker
     # apiServer: 0.0.0.0
     uiPort: 9090
+    # Base path for serving the UI.
+    # Requires building a custom image using the build argument "ui_path".
+    uiPath: /
+    # Set to true to use IPv6
+    useIPv6: true
     # Liveness probe configuration
     livenessProbe:
       # -- Whether probe is enabled
@@ -431,6 +719,21 @@ opencost:
     # -- A list of volume mounts to be added to the pod
     extraVolumeMounts: []
 
+    # set to true to set upstream to use <service>.<namespace>.svc.cluster.local instead of just <service>.<namespace>
+    useDefaultFqdn: false
+
+    # -- Nginx proxy timeout settings (in seconds)
+    nginx:
+      # -- Timeout for establishing a connection with the proxied server
+      proxyConnectTimeout: 180
+      # -- Timeout for transmitting a request to the proxied server
+      proxySendTimeout: 180
+      # -- Timeout for reading a response from the proxied server
+      proxyReadTimeout: 180
+
+    # Set the model fqdn to use for the upstream
+    # modelFqdn: opencost.opencost.svc.cluster.local:9003
+
     ingress:
       # -- Ingress for OpenCost UI
       enabled: false
@@ -442,9 +745,9 @@ opencost:
       # -- A list of host rules used to configure the Ingress
       # @default -- See [values.yaml](values.yaml)
       hosts:
-        - host: example.local
-          paths:
-            - /
+      - host: example.local
+        paths:
+        - /
       # -- Redirect ingress to an extraPort defined on the service such as oauth-proxy
       servicePort: http-ui
       # servicePort: oauth-proxy
@@ -453,6 +756,63 @@ opencost:
         #  - secretName: chart-example-tls
         #    hosts:
         #      - chart-example.local
+    route:
+      # -- OpenShift route for OpenCost UI
+      enabled: false
+      # -- Annotations for Ingress resource
+      annotations: {}
+        # haproxy.router.openshift.io/timeout: 1m
+      # @default -- See [values.yaml](values.yaml)
+      host: example.local
+      path:
+      # -- Redirect ingress to an extraPort defined on the service such as oauth-proxy
+      targetPort: http-ui
+      # targetPort: oauth-proxy
+      # -- Route TLS configuration as a map (e.g. with `termination` and `insecureEdgeTerminationPolicy` fields)
+      tls: {}
+        # insecureEdgeTerminationPolicy: Redirect
+        # termination: edge
+    # -- HTTPRoute for OpenCost UI (Gateway API)
+    httpRoute:
+      # -- Enable HTTPRoute resource
+      enabled: false
+      # -- Gateway API parent references
+      # @default -- See [values.yaml](values.yaml)
+      parentRefs:
+        - name: ""
+          namespace: ""
+          sectionName: ""
+      # -- Hostnames for the HTTPRoute
+      hostnames: []
+        # - example.local
+      # -- Annotations for HTTPRoute resource
+      annotations: {}
+      # -- Labels for HTTPRoute resource
+      labels: {}
+      # -- HTTPRoute rules. Each rule supports an optional `filters` list at the rule level
+      # and per-backendRef `filters` for Gateway API filter configuration (e.g. basic auth
+      # via `ExtensionRef`, header modification via `RequestHeaderModifier`, etc.).
+      # @default -- See [values.yaml](values.yaml)
+      rules:
+        - matches:
+            - path:
+                type: PathPrefix
+                value: /
+          # filters:
+          #   - type: ExtensionRef
+          #     extensionRef:
+          #       group: gateway.envoyproxy.io
+          #       kind: SecurityPolicy
+          #       name: basic-auth-policy
+          backendRefs:
+            - name: ""  # Will default to service name
+              port: 9090
+              # filters:
+              #   - type: RequestHeaderModifier
+              #     requestHeaderModifier:
+              #       add:
+              #         - name: X-Custom-Header
+              #           value: my-value
 
   sigV4Proxy:
     image: public.ecr.aws/aws-observability/aws-sigv4-proxy:latest
@@ -508,5 +868,44 @@ opencost:
     #       protocol: TCP
     #   resources: {}
 
+  updateCaTrust:
+    enabled: false
+    ## Security context settings for the init container.
+    securityContext:
+      runAsUser: 0
+      runAsGroup: 0
+      runAsNonRoot: false
+      allowPrivilegeEscalation: false
+      readOnlyRootFilesystem: true
+      seccompProfile:
+        type: RuntimeDefault
+    caCertsSecret: ca-certs-secret # The name of the Secret containing custom CA certificates to mount to the opencost container.
+    # caCertsConfig: ca-certs-config  # The name of the ConfigMap containing the CA trust configuration.
+    resources: {}
+
+  platforms:
+    openshift:
+      # -- Enable OpenShift specific configurations
+      enabled: false
+      # OPTIONAL. The following configs only to be enabled when using a Prometheus instance already installed in the cluster.
+      # -- If true, the helm chart will create a ClusterRoleBinding to grant the OpenCost ServiceAccount access to query Prometheus.
+      createMonitoringClusterRoleBinding: false
+      # -- If true, create a Role and RoleBinding to allow Prometheus to list and watch OpenCost resources.
+      createMonitoringResourceReaderRoleBinding: false
+      # -- Name of the Prometheus serviceaccount to bind to the Resource Reader Role Binding.
+      monitoringServiceAccountName: prometheus-k8s
+      # -- Namespace of the Prometheus serviceaccount to bind to the Resource Reader Role Binding.
+      monitoringServiceAccountNamespace: openshift-monitoring
+      # -- If true, set Security Context Constraints on serviceaccount for read/write premissions
+      enableSCC: false
+      # -- If true, enable internal prom access
+      enablePromAccess: false
 # -- A list of volumes to be added to the pod
 extraVolumes: []
+
+# -- Array of extra K8s manifests rendered through `tpl` and owned by the release.
+extraObjects: []
+  # - apiVersion: external-secrets.io/v1beta1
+  #   kind: ExternalSecret
+  #   metadata:
+  #     name: '{{ include "opencost.fullname" . }}-cloud-integration'
diff --git a/packages/system/opencost/tests/opencost_test.yaml b/packages/system/opencost/tests/opencost_test.yaml
new file mode 100644
index 0000000000..ab7a7b70e9
--- /dev/null
+++ b/packages/system/opencost/tests/opencost_test.yaml
@@ -0,0 +1,19 @@
+suite: cozy-opencost chart rendering invariants
+release:
+  name: opencost
+  namespace: cozy-opencost
+tests:
+  - it: pins the opencost image and wires the cluster prometheus endpoint
+    template: charts/opencost/templates/deployment.yaml
+    documentSelector:
+      path: kind
+      value: Deployment
+    asserts:
+      - matchRegex:
+          path: spec.template.spec.containers[0].image
+          pattern: 'opencost/opencost:1\.120\.3'
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: PROMETHEUS_SERVER_ENDPOINT
+            value: "http://vmselect-shortterm.tenant-root.svc:8481/select/0/prometheus"
diff --git a/packages/system/opensearch-operator/Makefile b/packages/system/opensearch-operator/Makefile
index 3652249565..b36ea95dcf 100644
--- a/packages/system/opensearch-operator/Makefile
+++ b/packages/system/opensearch-operator/Makefile
@@ -1,10 +1,32 @@
+# Single source for the version: the image's ARG VERSION. The chart and the
+# binary have to move together, because the chart ships the CRDs the binary is
+# compiled against.
+OPENSEARCH_OPERATOR_TAG=$(shell grep -F 'ARG VERSION=' images/opensearch-operator/Dockerfile | cut -f2 -d=)
+
 export NAME=opensearch-operator
 export NAMESPACE=cozy-$(NAME)
 
+include ../../../hack/common-envs.mk
 include ../../../hack/package.mk
 
 update:
 	rm -rf charts
 	helm repo add opensearch-operator https://opensearch-project.github.io/opensearch-k8s-operator/
 	helm repo update opensearch-operator
-	helm pull opensearch-operator/opensearch-operator --version 2.8.0 --untar --untardir charts
+	helm pull opensearch-operator/opensearch-operator --version $(patsubst v%,%,$(OPENSEARCH_OPERATOR_TAG)) --untar --untardir charts
+	patch --no-backup-if-mismatch -p1 < patches/leaderElection.diff
+
+image:
+	docker buildx build images/opensearch-operator \
+		$(call image-tags,opensearch-operator,$(OPENSEARCH_OPERATOR_TAG)) \
+		$(call cache-args,opensearch-operator) \
+		--metadata-file images/opensearch-operator.json \
+		$(BUILDX_ARGS)
+	REPOSITORY="$(REGISTRY)/opensearch-operator" \
+		yq -i '.opensearch-operator.manager.image.repository = strenv(REPOSITORY)' values.yaml
+	TAG=$(IMAGE_TAG)@$$(yq e '."containerimage.digest"' images/opensearch-operator.json -o json -r) \
+		yq -i '.opensearch-operator.manager.image.tag = strenv(TAG)' values.yaml
+	rm -f images/opensearch-operator.json
+
+test:
+	helm unittest .
diff --git a/packages/system/opensearch-operator/charts/opensearch-operator/templates/opensearch-operator-controller-manager-deployment.yaml b/packages/system/opensearch-operator/charts/opensearch-operator/templates/opensearch-operator-controller-manager-deployment.yaml
index 114e6b200e..b12a770728 100644
--- a/packages/system/opensearch-operator/charts/opensearch-operator/templates/opensearch-operator-controller-manager-deployment.yaml
+++ b/packages/system/opensearch-operator/charts/opensearch-operator/templates/opensearch-operator-controller-manager-deployment.yaml
@@ -5,7 +5,25 @@ metadata:
     control-plane: controller-manager
   name: {{ include "opensearch-operator.fullname" . }}-controller-manager
 spec:
-  replicas: 1
+  replicas: {{ .Values.manager.replicaCount | default 1 }}
+  {{- if le (int (.Values.manager.replicaCount | default 1)) 1 }}
+  # Leader election is gated off on a single replica, so a rollout should not run two
+  # managers side by side. maxSurge: 0 caps total pods at replicas, so the old manager is
+  # scaled down before the new one is scaled up (maxUnavailable: 1 permits the gap),
+  # unlike the default 25% surge which starts a second manager while the first is fully
+  # live. This is not Recreate's exclusivity: the old manager may still be draining
+  # in-flight reconciles (up to terminationGracePeriodSeconds) as the new one starts.
+  # Recreate cannot be used here: under server-side apply (helm-controller's default) the
+  # apiserver-defaulted rollingUpdate block on an existing Deployment is not owned by the
+  # helm-controller field manager, so switching type to Recreate does not clear it and the
+  # merged object is rejected as invalid ("spec.strategy.rollingUpdate: Forbidden").
+  # Multi-replica installs keep the default (25%) with leader election on.
+  strategy:
+    type: RollingUpdate
+    rollingUpdate:
+      maxSurge: 0
+      maxUnavailable: 1
+  {{- end }}
   selector:
     matchLabels:
       control-plane: controller-manager
@@ -49,7 +67,9 @@ spec:
       - args:
         - --health-probe-bind-address=:8081
         - --metrics-bind-address=127.0.0.1:8080
+        {{- if gt (int (.Values.manager.replicaCount | default 1)) 1 }}
         - --leader-elect
+        {{- end }}
         {{- if .Values.manager.watchNamespace }}
         - --watch-namespace={{ .Values.manager.watchNamespace }}
         {{- end }}
diff --git a/packages/system/opensearch-operator/images/opensearch-operator/Dockerfile b/packages/system/opensearch-operator/images/opensearch-operator/Dockerfile
new file mode 100644
index 0000000000..655c91b4a8
--- /dev/null
+++ b/packages/system/opensearch-operator/images/opensearch-operator/Dockerfile
@@ -0,0 +1,107 @@
+# Build the manager binary from the upstream sources with the Cozystack patches
+# applied.
+#
+# patches/bootstrap-voting-exclusion.diff keeps a single-replica cluster
+# electable when the operator retires its bootstrap pod; see
+# https://github.com/opensearch-project/opensearch-k8s-operator/issues/1448.
+#
+# patches/restart-on-permanently-yellow.diff carries
+# https://github.com/opensearch-project/opensearch-k8s-operator/pull/1569 back to
+# this version: a cluster whose replicas can never be assigned stays yellow for
+# good, and the restart gate held every rolling restart and upgrade on it. The
+# part of that change that counts tiered data roles (data_hot and the like) as
+# data nodes is left out, because packages/apps/opensearch renders the plain
+# data role only; carry it as well if that ever changes. Drop the patch on the
+# first operator release that includes the change.
+#
+# patches/skip-unusable-drain-exclusion.diff is the other half of that change,
+# for a release with three or more nodes, where packages/apps/opensearch turns
+# drainDataNodes on. The gate above now lets a permanently yellow cluster reach
+# PreparePodForDelete, which excludes the candidate from allocation before it can
+# know whether the drain will finish. On the cluster that made the gate wait, it
+# never does, and the exclusion is only withdrawn after a pod is really deleted,
+# so a data node stays out of allocation for as long as the restart is stuck. The
+# patch asks the allocator first, and only while nothing is moving. Tracked
+# upstream as opensearch-project/opensearch-k8s-operator#1585, fixed by #1586;
+# drop it on the first release carrying that.
+#
+# patches/timeout-cluster-api-calls.diff bounds the calls the operator makes to
+# a cluster's HTTP API. Upstream builds its own http.Transport, which carries no
+# dial, handshake or response-header timeout; it passes context.Background() to
+# every call it makes on its own behalf; the calls that take a context from the
+# caller are handed one with no deadline on it; and no http.Client is
+# configured, so there is no timeout there either. A cluster that accepts a
+# connection and then says nothing therefore holds the call for as long as the
+# process lives, and with one worker per controller that one call stops every
+# OpenSearchCluster from being reconciled. The deletion that then waits out its
+# whole termination timeout is the visible end of it. The patch bounds a request
+# on the RoundTripper, the one level that also reaches the product check
+# opensearch-go runs for itself before a client's first request, and bounds the
+# call again where the call site can be reached, because the library retries a
+# request up to three more times on 502, 503 and 504 and the transport's
+# deadline starts over on each. Tracked as cozystack/cozystack#4337;
+# it belongs upstream, there is no upstream issue for it yet, and the patch goes
+# away with the first release that carries a fix.
+#
+# patches/trace-stalled-component-reconcilers.diff names the component a
+# reconcile is stuck in. The cluster controller runs nine component reconcilers
+# in sequence and none of them logs unconditionally when it is entered, so a
+# call that never returns leaves the operator log ending on whatever ran before
+# it, and an object that is silently no longer reconciled. Twice in e2e the
+# operator went quiet at the moment the chart rewrote the CR and reconciled
+# nothing for the rest of the test, with no line saying where it was:
+# https://github.com/cozystack/cozystack/issues/4332. The watchdog writes
+# nothing while a component behaves, so it costs nothing on a healthy cluster.
+# It reports rather than repairs: drop it once the stall itself is understood
+# and fixed.
+#
+# The patches are applied in the order the glob expands, which is alphabetical.
+# skip-unusable-drain-exclusion builds on restart-on-permanently-yellow, and
+# timeout-cluster-api-calls rewrites os_client.go call sites that
+# skip-unusable-drain-exclusion both adds and quotes as context, so it has to
+# come after it. A rename that reorders them fails the build rather than
+# producing a wrong binary.
+FROM --platform=$BUILDPLATFORM golang:1.27@sha256:3680233e3204827fbdc66088528ae6d4b3d034f51d03a99d454f6de034888244 AS builder
+ARG GOPROXY
+
+# Keep in step with the chart version pulled by `make update`: the chart's
+# appVersion is what picks the operator image upstream, so a mismatch here would
+# run one version's binary against another's CRDs.
+ARG VERSION=v2.8.0
+
+ARG TARGETOS
+ARG TARGETARCH
+
+WORKDIR /workspace
+
+RUN curl -sSL https://github.com/opensearch-project/opensearch-k8s-operator/archive/refs/tags/${VERSION}.tar.gz | tar -xzvf- --strip=1
+
+COPY patches /patches
+RUN git apply /patches/*.diff
+
+# go build never compiles a _test.go, so nothing else runs the tests of the
+# packages the patches touch. Each package is tested from its own directory:
+# that finds the module it belongs to, and an empty list runs nothing.
+# The list is read into a variable first: a for loop drops the exit status
+# of a command substitution, so a patch git cannot read would leave the list
+# empty and the step green.
+# controllers/ is left out: its suite is envtest, which execs etcd and
+# kube-apiserver binaries the builder does not carry.
+# -race is on because the timeout tests run a listener in one goroutine and
+# inspect what it accepted from another: an unsynchronised access there passes
+# the plain run, so nothing else would catch it. The builder has cgo and gcc.
+RUN files=$(git apply --numstat /patches/*.diff) || exit 1; \
+    for dir in $(printf '%s\n' "$files" | cut -f3 | grep '\.go$' | xargs -r -n1 dirname | sort -u | grep -vx 'opensearch-operator/controllers'); do \
+      (cd "$dir" && go test -race .) || exit 1; \
+    done
+
+WORKDIR /workspace/opensearch-operator
+
+RUN GOOS=$TARGETOS GOARCH=$TARGETARCH CGO_ENABLED=0 go build -a -o manager main.go
+
+FROM gcr.io/distroless/static:nonroot@sha256:e2e927ec666bae08560abb3c55d0659eceabb657f56b6782ab500a9fc7f555e3
+WORKDIR /
+COPY --from=builder /workspace/opensearch-operator/manager .
+USER 65532:65532
+
+ENTRYPOINT ["/manager"]
diff --git a/packages/system/opensearch-operator/images/opensearch-operator/patches/bootstrap-voting-exclusion.diff b/packages/system/opensearch-operator/images/opensearch-operator/patches/bootstrap-voting-exclusion.diff
new file mode 100644
index 0000000000..c4cba48e28
--- /dev/null
+++ b/packages/system/opensearch-operator/images/opensearch-operator/patches/bootstrap-voting-exclusion.diff
@@ -0,0 +1,282 @@
+diff --git a/opensearch-operator/opensearch-gateway/services/os_client.go b/opensearch-operator/opensearch-gateway/services/os_client.go
+index 2ec30c5..a33fa11 100644
+--- a/opensearch-operator/opensearch-gateway/services/os_client.go
++++ b/opensearch-operator/opensearch-gateway/services/os_client.go
+@@ -4,6 +4,7 @@ import (
+ 	"context"
+ 	"crypto/tls"
+ 	"encoding/json"
++	"fmt"
+ 	"github.com/Opster/opensearch-k8s-operator/opensearch-operator/pkg/helpers"
+ 	"io"
+ 	"k8s.io/utils/ptr"
+@@ -535,3 +536,115 @@ func generateAPIPathSnapshotUpdatePolicies(resource, name string, seqno, primary
+ 	path.WriteString(strconv.Itoa(primaryterm))
+ 	return path
+ }
++
++// votingConfigState is the slice of the cluster state that says who may vote.
++// The coordination metadata names voters by node id, so the node list travels
++// in the same response to resolve an id back to a name.
++type votingConfigState struct {
++	Nodes map[string]struct {
++		Name string `json:"name"`
++	} `json:"nodes"`
++	Metadata struct {
++		ClusterCoordination struct {
++			LastCommittedConfig    []string `json:"last_committed_config"`
++			VotingConfigExclusions []struct {
++				NodeName string `json:"node_name"`
++			} `json:"voting_config_exclusions"`
++		} `json:"cluster_coordination"`
++	} `json:"metadata"`
++}
++
++// ExcludeNodeFromVotingConfig commits a voting configuration that leaves
++// nodeName out, which is what makes the node safe to remove: a node still in
++// the configuration is a vote the cluster keeps counting on.
++func (client *OsClusterClient) ExcludeNodeFromVotingConfig(ctx context.Context, nodeName string) error {
++	path := generateAPIPathVotingConfigExclusions(nodeName)
++	res, err := doHTTPPost(ctx, client.client, path, nil)
++	if err != nil {
++		return err
++	}
++	defer helpers.SafeClose(res.Body)
++	if res.IsError() {
++		return fmt.Errorf("excluding %s from the voting configuration returned %s", nodeName, res.Status())
++	}
++	return nil
++}
++
++// ClearVotingConfigExclusions empties the exclusion list, which is capped and
++// would otherwise keep entries for nodes that are long gone. wait_for_removal
++// stays at its default: clearing without it can re-admit a node that is still
++// running, and the caller has already removed the one it excluded.
++func (client *OsClusterClient) ClearVotingConfigExclusions(ctx context.Context) error {
++	var path strings.Builder
++	path.WriteString("/_cluster/voting_config_exclusions")
++	res, err := doHTTPDelete(ctx, client.client, path)
++	if err != nil {
++		return err
++	}
++	defer helpers.SafeClose(res.Body)
++	if res.IsError() {
++		return fmt.Errorf("clearing the voting configuration exclusions returned %s", res.Status())
++	}
++	return nil
++}
++
++func (client *OsClusterClient) readVotingConfigState(ctx context.Context) (votingConfigState, error) {
++	var state votingConfigState
++	var path strings.Builder
++	path.WriteString("/_cluster/state/nodes,metadata")
++	path.WriteString("?filter_path=nodes.*.name,metadata.cluster_coordination.last_committed_config")
++	path.WriteString(",metadata.cluster_coordination.voting_config_exclusions")
++	res, err := doHTTPGet(ctx, client.client, path)
++	if err != nil {
++		return state, err
++	}
++	defer helpers.SafeClose(res.Body)
++	if res.IsError() {
++		return state, fmt.Errorf("reading the voting configuration returned %s", res.Status())
++	}
++	err = json.NewDecoder(res.Body).Decode(&state)
++	return state, err
++}
++
++// IsInVotingConfig reports whether nodeName is still one of the nodes whose
++// vote counts. An exclusion is committed through the cluster state rather than
++// applied by the time the request returns, so this is what tells a caller the
++// exclusion has actually taken.
++func (client *OsClusterClient) IsInVotingConfig(ctx context.Context, nodeName string) (bool, error) {
++	state, err := client.readVotingConfigState(ctx)
++	if err != nil {
++		return false, err
++	}
++
++	for _, id := range state.Metadata.ClusterCoordination.LastCommittedConfig {
++		if node, ok := state.Nodes[id]; ok && node.Name == nodeName {
++			return true, nil
++		}
++	}
++	return false, nil
++}
++
++// IsVotingConfigExcluded reports whether nodeName is still named in the
++// exclusion list. The list is capped, so an entry left behind for a node that
++// no longer exists costs capacity a later membership change may need.
++func (client *OsClusterClient) IsVotingConfigExcluded(ctx context.Context, nodeName string) (bool, error) {
++	state, err := client.readVotingConfigState(ctx)
++	if err != nil {
++		return false, err
++	}
++
++	for _, ex := range state.Metadata.ClusterCoordination.VotingConfigExclusions {
++		if ex.NodeName == nodeName {
++			return true, nil
++		}
++	}
++	return false, nil
++}
++
++func generateAPIPathVotingConfigExclusions(nodeName string) strings.Builder {
++	var path strings.Builder
++	path.Grow(len("/_cluster/voting_config_exclusions?node_names=") + len(nodeName))
++	path.WriteString("/_cluster/voting_config_exclusions?node_names=")
++	path.WriteString(nodeName)
++	return path
++}
+diff --git a/opensearch-operator/pkg/reconcilers/cluster.go b/opensearch-operator/pkg/reconcilers/cluster.go
+index 710f585..c199fa0 100644
+--- a/opensearch-operator/pkg/reconcilers/cluster.go
++++ b/opensearch-operator/pkg/reconcilers/cluster.go
+@@ -4,7 +4,9 @@ import (
+ 	"context"
+ 	"fmt"
+ 	"strings"
++	"time"
+ 
++	"github.com/Opster/opensearch-k8s-operator/opensearch-operator/opensearch-gateway/services"
+ 	"github.com/Opster/opensearch-k8s-operator/opensearch-operator/pkg/reconcilers/k8s"
+ 	"github.com/Opster/opensearch-k8s-operator/opensearch-operator/pkg/reconcilers/util"
+ 	policyv1 "k8s.io/api/policy/v1"
+@@ -17,6 +19,8 @@ import (
+ 	"github.com/go-logr/logr"
+ 	"github.com/samber/lo"
+ 	appsv1 "k8s.io/api/apps/v1"
++	corev1 "k8s.io/api/core/v1"
++	k8serrors "k8s.io/apimachinery/pkg/api/errors"
+ 	"k8s.io/apimachinery/pkg/api/resource"
+ 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+ 	"k8s.io/client-go/tools/record"
+@@ -25,6 +29,12 @@ import (
+ 	"sigs.k8s.io/controller-runtime/pkg/log"
+ )
+ 
++// How long to wait before trying again when the cluster cannot be reached or
++// has not yet committed the exclusion. Short enough that a healthy cluster
++// sheds its bootstrap pod promptly, long enough not to spin on an API that is
++// still coming up.
++const bootstrapRetireRetry = 10 * time.Second
++
+ type ClusterReconciler struct {
+ 	client            k8s.K8sClient
+ 	ctx               context.Context
+@@ -98,7 +108,7 @@ func (r *ClusterReconciler) Reconcile() (ctrl.Result, error) {
+ 	bootstrapPod := builders.NewBootstrapPod(r.instance, r.reconcilerContext.Volumes, r.reconcilerContext.VolumeMounts)
+ 	result.CombineErr(ctrl.SetControllerReference(r.instance, bootstrapPod, r.client.Scheme()))
+ 	if r.instance.Status.Initialized {
+-		result.Combine(r.client.ReconcileResource(bootstrapPod, reconciler.StateAbsent))
++		result.Combine(r.retireBootstrapPod(bootstrapPod))
+ 	} else {
+ 		result.Combine(r.client.ReconcileResource(bootstrapPod, reconciler.StatePresent))
+ 	}
+@@ -130,6 +140,108 @@ func (r *ClusterReconciler) Reconcile() (ctrl.Result, error) {
+ 	return result.Result, result.Err
+ }
+ 
++// retireBootstrapPod takes the bootstrap node out of the voting configuration
++// before deleting its pod.
++//
++// The bootstrap node is the one that formed the cluster, so it is the voter the
++// cluster keeps while the voting configuration holds a single node, which is
++// what it holds whenever exactly two nodes are cluster_manager-eligible: the
++// bootstrap pod and one node pool replica. Deleting the pod then takes away the
++// only vote there was, and the survivor can never hold an election again,
++// because changing the voting configuration itself needs a quorum. Excluding
++// the node first moves the configuration onto the surviving node, which is what
++// makes the deletion safe.
++//
++// Every failure to reach the cluster leaves the pod alone and requeues. A
++// bootstrap pod that outlives its purpose costs a pod; a cluster that cannot
++// elect a cluster-manager does not recover without a human.
++func (r *ClusterReconciler) retireBootstrapPod(bootstrapPod *corev1.Pod) (*ctrl.Result, error) {
++	podGone := false
++	if _, err := r.client.GetPod(bootstrapPod.Name, bootstrapPod.Namespace); err != nil {
++		if !k8serrors.IsNotFound(err) {
++			return &ctrl.Result{}, err
++		}
++		podGone = true
++	}
++
++	annotations := map[string]string{"cluster-name": r.instance.GetName()}
++	nodeName := builders.BootstrapPodName(r.instance)
++
++	clusterClient, err := util.CreateClientForCluster(r.client, r.ctx, r.instance, nil)
++	if err != nil {
++		r.logger.Error(err, "Failed to create os client to retire the bootstrap node", "node", nodeName)
++		r.recorder.AnnotatedEventf(r.instance, annotations, "Warning", "Bootstrap",
++			"Cannot reach the cluster to exclude %s from voting; keeping the bootstrap pod", nodeName)
++		return &ctrl.Result{RequeueAfter: bootstrapRetireRetry}, nil
++	}
++
++	// Deleting the pod is a request, not a wait, so the clearing step below can
++	// find the node still in the cluster and fail. Retrying it here is what
++	// keeps a stale entry from sitting in the capped exclusion list forever,
++	// where it would cost a later membership change the capacity it needs.
++	if podGone {
++		return r.clearBootstrapExclusion(clusterClient, nodeName)
++	}
++
++	if err := clusterClient.ExcludeNodeFromVotingConfig(r.ctx, nodeName); err != nil {
++		r.logger.Error(err, "Failed to exclude the bootstrap node from the voting configuration", "node", nodeName)
++		r.recorder.AnnotatedEventf(r.instance, annotations, "Warning", "Bootstrap",
++			"Could not exclude %s from voting; keeping the bootstrap pod", nodeName)
++		return &ctrl.Result{RequeueAfter: bootstrapRetireRetry}, nil
++	}
++
++	// The exclusion travels through the cluster state, so it is committed a
++	// moment after the request returns rather than by the time it does.
++	stillVoting, err := clusterClient.IsInVotingConfig(r.ctx, nodeName)
++	if err != nil {
++		r.logger.Error(err, "Failed to read the voting configuration", "node", nodeName)
++		return &ctrl.Result{RequeueAfter: bootstrapRetireRetry}, nil
++	}
++	if stillVoting {
++		r.logger.Info("Waiting for the bootstrap node to leave the voting configuration", "node", nodeName)
++		return &ctrl.Result{RequeueAfter: bootstrapRetireRetry}, nil
++	}
++
++	result, err := r.client.ReconcileResource(bootstrapPod, reconciler.StateAbsent)
++	if err != nil {
++		return result, err
++	}
++
++	r.recorder.AnnotatedEventf(r.instance, annotations, "Normal", "Bootstrap",
++		"Excluded %s from voting and removed the bootstrap pod", nodeName)
++
++	if cleared, err := r.clearBootstrapExclusion(clusterClient, nodeName); err != nil || cleared.RequeueAfter > 0 {
++		return cleared, err
++	}
++	return result, nil
++}
++
++// clearBootstrapExclusion drops the exclusion this reconciler added, once the
++// node it named is really gone.
++//
++// Clearing empties the whole list rather than one entry, so it is left at the
++// API's default wait_for_removal=true: that is what stops it from re-admitting
++// a node some other operation excluded and is still draining. A failure is
++// therefore expected while the bootstrap pod is terminating, and is answered
++// with a requeue rather than a log line, because nothing else will come back to
++// it.
++func (r *ClusterReconciler) clearBootstrapExclusion(clusterClient *services.OsClusterClient, nodeName string) (*ctrl.Result, error) {
++	excluded, err := clusterClient.IsVotingConfigExcluded(r.ctx, nodeName)
++	if err != nil {
++		r.logger.Error(err, "Failed to read the voting configuration exclusions", "node", nodeName)
++		return &ctrl.Result{RequeueAfter: bootstrapRetireRetry}, nil
++	}
++	if !excluded {
++		return &ctrl.Result{}, nil
++	}
++
++	if err := clusterClient.ClearVotingConfigExclusions(r.ctx); err != nil {
++		r.logger.Error(err, "Failed to clear the voting configuration exclusions", "node", nodeName)
++		return &ctrl.Result{RequeueAfter: bootstrapRetireRetry}, nil
++	}
++	return &ctrl.Result{}, nil
++}
++
+ func (r *ClusterReconciler) reconcileNodeStatefulSet(nodePool opsterv1.NodePool, username string) (*ctrl.Result, error) {
+ 	found, nodePoolConfig := r.reconcilerContext.fetchNodePoolHash(nodePool.Component)
+ 
diff --git a/packages/system/opensearch-operator/images/opensearch-operator/patches/restart-on-permanently-yellow.diff b/packages/system/opensearch-operator/images/opensearch-operator/patches/restart-on-permanently-yellow.diff
new file mode 100644
index 0000000000..8362eb2e8d
--- /dev/null
+++ b/packages/system/opensearch-operator/images/opensearch-operator/patches/restart-on-permanently-yellow.diff
@@ -0,0 +1,368 @@
+diff --git a/opensearch-operator/opensearch-gateway/responses/ClusterHealthResponse.go b/opensearch-operator/opensearch-gateway/responses/ClusterHealthResponse.go
+--- a/opensearch-operator/opensearch-gateway/responses/ClusterHealthResponse.go
++++ b/opensearch-operator/opensearch-gateway/responses/ClusterHealthResponse.go
+@@ -2,10 +2,13 @@
+ 
+ type ClusterHealthResponse struct {
+ 	Status             string                 `json:"status,omitempty"`
++	NumberOfDataNodes  int                    `json:"number_of_data_nodes,omitempty"`
+ 	ActiveShards       int                    `json:"active_shards,omitempty"`
+ 	RelocatingShards   int                    `json:"relocating_shards,omitempty"`
+ 	InitializingShards int                    `json:"initializing_shards,omitempty"`
+ 	UnassignedShards   int                    `json:"unassigned_shards,omitempty"`
++	DelayedUnassigned  int                    `json:"delayed_unassigned_shards,omitempty"`
++	InFlightFetch      int                    `json:"number_of_in_flight_fetch,omitempty"`
+ 	PercentActive      float32                `json:"active_shards_percent_as_number,omitempty"`
+ 	Indices            map[string]IndexHealth `json:"indices,omitempty"`
+ }
+diff --git a/opensearch-operator/opensearch-gateway/services/os_data_service.go b/opensearch-operator/opensearch-gateway/services/os_data_service.go
+--- a/opensearch-operator/opensearch-gateway/services/os_data_service.go
++++ b/opensearch-operator/opensearch-gateway/services/os_data_service.go
+@@ -54,6 +54,26 @@
+ 	return false, err
+ }
+ 
++// extractNodeName returns the source node of a _cat/shards node column, which
++// for a relocating shard reads "source -> ip id target".
++func extractNodeName(fullNodeName string) string {
++	fields := strings.Fields(fullNodeName)
++	if len(fields) == 0 {
++		return ""
++	}
++	return fields[0]
++}
++
++func shardsOnNodeFromResponse(response []responses.CatShardsResponse, nodeName string) []responses.CatShardsResponse {
++	var matched []responses.CatShardsResponse
++	for _, shard := range response {
++		if extractNodeName(shard.NodeName) == nodeName {
++			matched = append(matched, shard)
++		}
++	}
++	return matched
++}
++
+ func HasIndexPrimariesOnNode(service *OsClusterClient, nodeName string, indices []string) (bool, error) {
+ 	var headers []string
+ 	response, err := service.CatNamedIndicesShards(headers, indices)
+@@ -153,7 +173,7 @@
+ 	}}
+ }
+ 
+-func CheckClusterStatusForRestart(service *OsClusterClient, drainNodes bool) (bool, string, error) {
++func CheckClusterStatusForRestart(service *OsClusterClient, drainNodes bool, dataNodes int32) (bool, string, error) {
+ 	health, err := service.GetHealth()
+ 	if err != nil {
+ 		return false, "failed to fetch health", err
+@@ -163,7 +183,33 @@
+ 		return true, "", nil
+ 	}
+ 
+-	if continueRestartWithYellowHealth(health) {
++	if health.Status == "yellow" {
++		// Yellow means every primary is active. Lift our own allocation throttle
++		// (PreparePodForDelete sets "primaries") so it can't masquerade as a
++		// permanently unassignable replica.
++		flatSettings, err := service.GetFlatClusterSettings()
++		if err != nil {
++			return false, "could not fetch cluster settings", err
++		}
++		if flatSettings.Transient.ClusterRoutingAllocationEnable != string(ClusterSettingsAllocationAll) {
++			if err := SetClusterShardAllocation(service, ClusterSettingsAllocationAll); err != nil {
++				return false, "failed to set shard allocation", err
++			}
++			return false, "enabled shard allocation", nil
++		}
++		// A data node that hasn't (re)joined yet leaves no trace in the shard
++		// activity counters once its delayed allocation expires, and a pod can be
++		// Ready before it joins. Wait until every data node is part of the cluster.
++		if health.NumberOfDataNodes < int(dataNodes) {
++			return false, "waiting for all data nodes to join the cluster", nil
++		}
++		// With all data nodes present, allocation enabled and no shard activity,
++		// the allocator has already decided the remaining replicas cannot be placed
++		// (same_shard, awareness, filters, disk watermarks): waiting never turns it
++		// green. The candidate itself is vetted in PreparePodForDelete.
++		if hasShardActivity(health) {
++			return false, "waiting for shard recovery to finish", nil
++		}
+ 		return true, "", nil
+ 	}
+ 
+@@ -222,19 +268,40 @@
+ 			if err != nil {
+ 				return false, err
+ 			}
+-			lg.Info(fmt.Sprintf("Waiting to drain primary replicas for system indices from node %s before deleting", podName))
+-			return !systemPrimaries, nil
++			if systemPrimaries {
++				lg.Info(fmt.Sprintf("Waiting to drain primary replicas for system indices from node %s before deleting", podName))
++				return false, nil
++			}
++		} else {
++			// Check if there are any shards on the node
++			nodeNotEmpty, err := HasShardsOnNode(service, podName)
++			if err != nil {
++				return false, err
++			}
++			if nodeNotEmpty {
++				// If the node isn't empty requeue to wait for shards to drain
++				lg.Info(fmt.Sprintf("Waiting for node %s to drain before deleting", podName))
++				return false, nil
++			}
+ 		}
+-
+-		// Check if there are any shards on the node
+-		nodeNotEmpty, err := HasShardsOnNode(service, podName)
++	}
++	// Whatever is still on the node goes offline with it. Never take down the
++	// only active copy of a shard that is supposed to have others (red window,
++	// permanent loss on emptyDir). A lone data node is exempt: there is nowhere
++	// else a copy could live, same as a green cluster with number_of_replicas: 0.
++	if nodeCount > 1 {
++		shards, err := service.CatShards([]string{"index", "shard", "prirep", "state", "node"})
+ 		if err != nil {
+ 			return false, err
+ 		}
+-		// If the node isn't empty requeue to wait for shards to drain
+-		lg.Info(fmt.Sprintf("Waiting for node %s to drain before deleting", podName))
+-		return !nodeNotEmpty, nil
++		if shard, ok := soleActiveCopyOnNode(shards, podName); ok {
++			lg.Info(fmt.Sprintf("Not restarting %s: it holds the only active copy of %s[%s]", podName, shard.Index, shard.Shard))
++			return false, nil
++		}
+ 	}
++	if drainNode {
++		return true, nil
++	}
+ 	// Update cluster routing before deleting appropriate ordinal pod
+ 	if err := SetClusterShardAllocation(service, ClusterSettingsAllocationPrimaries); err != nil {
+ 		return false, err
+@@ -263,24 +330,37 @@
+ 	return existing, nil
+ }
+ 
+-// continueRestartWithYellowHealth allows upgrades and rolling restarts to continue when the cluster is yellow
+-// if the yellow status is caused by the .opensearch-observability index.  This is a new index that is created
+-// on upgrade and will be yellow until at least 2 data nodes are upgraded.
+-func continueRestartWithYellowHealth(health responses.ClusterHealthResponse) bool {
+-	if health.Status != "yellow" {
+-		return false
+-	}
++// hasShardActivity reports whether the allocator is still making progress:
++// shards moving, initializing, waiting on delayed allocation or on shard fetches.
++func hasShardActivity(h responses.ClusterHealthResponse) bool {
++	return h.RelocatingShards > 0 || h.InitializingShards > 0 || h.DelayedUnassigned > 0 || h.InFlightFetch > 0
++}
+ 
+-	if health.RelocatingShards > 0 || health.InitializingShards > 0 || health.UnassignedShards > 1 {
+-		return false
++// soleActiveCopyOnNode returns a shard whose only active copy is on nodeName
++// while other copies of it exist but are not active. Shards with no other
++// copies (number_of_replicas: 0) are ignored, as they are on a green cluster.
++// Search replicas can't be promoted to primary, so they are not counted.
++func soleActiveCopyOnNode(shards []responses.CatShardsResponse, nodeName string) (responses.CatShardsResponse, bool) {
++	type key struct{ index, shard string }
++	copies := map[key]int{}
++	activeElsewhere := map[key]int{}
++	for _, s := range shards {
++		if s.PrimaryOrReplica == "s" {
++			continue
++		}
++		k := key{s.Index, s.Shard}
++		copies[k]++
++		if extractNodeName(s.NodeName) != nodeName && (s.State == "STARTED" || s.State == "RELOCATING") {
++			activeElsewhere[k]++
++		}
+ 	}
+-
+-	observabilityIndex, ok := health.Indices[".opensearch-observability"]
+-	if !ok {
+-		return false
++	for _, s := range shardsOnNodeFromResponse(shards, nodeName) {
++		k := key{s.Index, s.Shard}
++		if copies[k] > 1 && activeElsewhere[k] == 0 {
++			return s, true
++		}
+ 	}
+-
+-	return observabilityIndex.Status == "yellow"
++	return responses.CatShardsResponse{}, false
+ }
+ 
+ // IndexTemplatePath returns a strings.Builder pointing to /_index_template/<templateName>
+diff --git a/opensearch-operator/opensearch-gateway/services/restart_gate_test.go b/opensearch-operator/opensearch-gateway/services/restart_gate_test.go
+new file mode 100644
+--- /dev/null
++++ b/opensearch-operator/opensearch-gateway/services/restart_gate_test.go
+@@ -0,0 +1,146 @@
++package services
++
++import (
++	"net/http"
++	"testing"
++
++	"github.com/Opster/opensearch-k8s-operator/opensearch-operator/opensearch-gateway/responses"
++	"github.com/go-logr/logr"
++	"github.com/jarcoal/httpmock"
++)
++
++func TestSoleActiveCopyOnNode(t *testing.T) {
++	sh := func(idx, s, pr, state, node string) responses.CatShardsResponse {
++		return responses.CatShardsResponse{Index: idx, Shard: s, PrimaryOrReplica: pr, State: state, NodeName: node}
++	}
++	tests := []struct {
++		name   string
++		shards []responses.CatShardsResponse
++		node   string
++		want   bool
++	}{
++		{"primary with unassigned replica", []responses.CatShardsResponse{sh("a", "0", "p", "STARTED", "n0"), sh("a", "0", "r", "UNASSIGNED", "")}, "n0", true},
++		{"replica started elsewhere", []responses.CatShardsResponse{sh("a", "0", "p", "STARTED", "n0"), sh("a", "0", "r", "STARTED", "n1")}, "n0", false},
++		{"zero replicas behaves like green", []responses.CatShardsResponse{sh("a", "0", "p", "STARTED", "n0")}, "n0", false},
++		{"replica on candidate, primary elsewhere, extra replica unassigned", []responses.CatShardsResponse{sh("a", "0", "p", "STARTED", "n1"), sh("a", "0", "r", "STARTED", "n0"), sh("a", "0", "r", "UNASSIGNED", "")}, "n0", false},
++		{"candidate holds only an initializing copy", []responses.CatShardsResponse{sh("a", "0", "p", "STARTED", "n1"), sh("a", "0", "r", "INITIALIZING", "n0")}, "n0", false},
++		{"relocating source elsewhere counts as active", []responses.CatShardsResponse{sh("a", "0", "p", "RELOCATING", "n1 -> 10.0.0.2 id n2"), sh("a", "0", "r", "STARTED", "n0")}, "n0", false},
++		{"candidate is relocating source of a sole copy", []responses.CatShardsResponse{sh("a", "0", "p", "RELOCATING", "n0 -> 10.0.0.2 id n2"), sh("a", "0", "r", "UNASSIGNED", "")}, "n0", true},
++		{"master-only candidate holds nothing", []responses.CatShardsResponse{sh("a", "0", "p", "STARTED", "n0"), sh("a", "0", "r", "UNASSIGNED", "")}, "master-0", false},
++		{"search replica elsewhere is not a copy", []responses.CatShardsResponse{sh("a", "0", "p", "STARTED", "n0"), sh("a", "0", "s", "STARTED", "n1"), sh("a", "0", "r", "UNASSIGNED", "")}, "n0", true},
++		{"search replica with zero replicas behaves like green", []responses.CatShardsResponse{sh("a", "0", "p", "STARTED", "n0"), sh("a", "0", "s", "STARTED", "n1")}, "n0", false},
++	}
++	for _, tt := range tests {
++		t.Run(tt.name, func(t *testing.T) {
++			if _, got := soleActiveCopyOnNode(tt.shards, tt.node); got != tt.want {
++				t.Errorf("got %v, want %v", got, tt.want)
++			}
++		})
++	}
++}
++
++func mockClient(t *testing.T, health, transientEnable, catShards string) (*OsClusterClient, *httpmock.MockTransport, *string) {
++	tr := httpmock.NewMockTransport()
++	for _, m := range []string{http.MethodGet, http.MethodHead} {
++		tr.RegisterResponder(m, `=~^http://os.test:9200/?$`, httpmock.NewStringResponder(200, `{"version":{"number":"2.0.0"}}`))
++	}
++	tr.RegisterResponder(http.MethodGet, `=~/_cluster/health`, httpmock.NewStringResponder(200, health))
++	tr.RegisterResponder(http.MethodGet, `=~/_cluster/settings`, httpmock.NewStringResponder(200, `{"transient":{"cluster.routing.allocation.enable":"`+transientEnable+`"},"persistent":{}}`))
++	put := new(string)
++	tr.RegisterResponder(http.MethodPut, `=~/_cluster/settings`, func(r *http.Request) (*http.Response, error) {
++		*put = "called"
++		return httpmock.NewStringResponse(200, `{}`), nil
++	})
++	tr.RegisterResponder(http.MethodGet, `=~/_cat/shards`, httpmock.NewStringResponder(200, catShards))
++	c, err := NewOsClusterClient("http://os.test:9200", "u", "p", WithTransport(tr))
++	if err != nil {
++		t.Fatal(err)
++	}
++	return c, tr, put
++}
++
++func TestCheckClusterStatusForRestartYellow(t *testing.T) {
++	quiet := `{"status":"yellow","unassigned_shards":3,"number_of_data_nodes":3}`
++	tests := []struct {
++		name, health, enable string
++		drain, want          bool
++		wantPut              bool
++	}{
++		{"quiet yellow proceeds", quiet, "all", false, true, false},
++		{"quiet yellow proceeds with drain", quiet, "all", true, true, false},
++		{"own primaries throttle is lifted first", quiet, "primaries", false, false, true},
++		{"throttle lifted with drain too", quiet, "none", true, false, true},
++		{"missing data node waits", `{"status":"yellow","number_of_data_nodes":2}`, "all", false, false, false},
++		{"initializing waits", `{"status":"yellow","number_of_data_nodes":3,"initializing_shards":1}`, "all", false, false, false},
++		{"delayed allocation waits", `{"status":"yellow","number_of_data_nodes":3,"delayed_unassigned_shards":2}`, "all", false, false, false},
++		{"in-flight fetch waits", `{"status":"yellow","number_of_data_nodes":3,"number_of_in_flight_fetch":1}`, "all", false, false, false},
++		{"red never proceeds", `{"status":"red"}`, "all", true, false, false},
++	}
++	for _, tt := range tests {
++		t.Run(tt.name, func(t *testing.T) {
++			c, tr, put := mockClient(t, tt.health, tt.enable, `[]`)
++			got, msg, err := CheckClusterStatusForRestart(c, tt.drain, 3)
++			if err != nil {
++				t.Fatal(err)
++			}
++			if got != tt.want || (*put != "") != tt.wantPut {
++				t.Errorf("got %v (%q) put=%q, want %v put=%v", got, msg, *put, tt.want, tt.wantPut)
++			}
++			if n := tr.GetCallCountInfo()["GET =~/_cat/shards"]; n != 0 {
++				t.Errorf("health gate must not list shards, got %d calls", n)
++			}
++		})
++	}
++}
++
++func TestPreparePodForDeleteSoleCopy(t *testing.T) {
++	sole := `[{"index":"a","shard":"0","prirep":"p","state":"STARTED","node":"n0"},{"index":"a","shard":"0","prirep":"r","state":"UNASSIGNED","node":null}]`
++	tests := []struct {
++		name      string
++		nodeCount int32
++		want      bool
++	}{
++		{"multi-node blocks sole copy", 3, false},
++		{"single data node is exempt", 1, true},
++	}
++	for _, tt := range tests {
++		t.Run(tt.name, func(t *testing.T) {
++			c, _, put := mockClient(t, `{}`, "all", sole)
++			got, err := PreparePodForDelete(c, logr.Discard(), "n0", false, tt.nodeCount)
++			if err != nil {
++				t.Fatal(err)
++			}
++			if got != tt.want || (*put != "") != tt.want {
++				t.Errorf("got %v put=%q, want %v", got, *put, tt.want)
++			}
++		})
++	}
++}
++
++// With drain and 2 data nodes only system-index primaries are drained, so the
++// sole-copy check must still guard the rest.
++func TestPreparePodForDeleteDrainTwoNodes(t *testing.T) {
++	system := `[{"index":".opendistro_security","shard":"0","prirep":"p","state":"STARTED","node":"n1"}]`
++	tests := []struct {
++		name, shards string
++		want         bool
++	}{
++		{"sole copy blocks", `[{"index":"a","shard":"0","prirep":"p","state":"STARTED","node":"n0"},{"index":"a","shard":"0","prirep":"r","state":"UNASSIGNED","node":null}]`, false},
++		{"replica elsewhere proceeds", `[{"index":"a","shard":"0","prirep":"p","state":"STARTED","node":"n0"},{"index":"a","shard":"0","prirep":"r","state":"STARTED","node":"n1"}]`, true},
++	}
++	for _, tt := range tests {
++		t.Run(tt.name, func(t *testing.T) {
++			c, tr, _ := mockClient(t, `{}`, "all", tt.shards)
++			tr.RegisterResponder(http.MethodGet, `=~/_cat/indices/`, httpmock.NewStringResponder(404, `{}`))
++			tr.RegisterResponder(http.MethodGet, `http://os.test:9200/_cat/indices/.opendistro_security`, httpmock.NewStringResponder(200, `[{"index":".opendistro_security"}]`))
++			tr.RegisterResponder(http.MethodGet, `http://os.test:9200/_cat/shards/.opendistro_security`, httpmock.NewStringResponder(200, system))
++			got, err := PreparePodForDelete(c, logr.Discard(), "n0", true, 2)
++			if err != nil {
++				t.Fatal(err)
++			}
++			if got != tt.want {
++				t.Errorf("got %v, want %v", got, tt.want)
++			}
++		})
++	}
++}
+diff --git a/opensearch-operator/pkg/reconcilers/rollingRestart.go b/opensearch-operator/pkg/reconcilers/rollingRestart.go
+--- a/opensearch-operator/pkg/reconcilers/rollingRestart.go
++++ b/opensearch-operator/pkg/reconcilers/rollingRestart.go
+@@ -174,7 +174,7 @@
+ 		lg.Info("Only 2 data nodes and drain is set, some shards may not drain")
+ 	}
+ 
+-	ready, message, err := services.CheckClusterStatusForRestart(r.osClient, r.instance.Spec.General.DrainDataNodes)
++	ready, message, err := services.CheckClusterStatusForRestart(r.osClient, r.instance.Spec.General.DrainDataNodes, dataCount)
+ 	if err != nil {
+ 		return ctrl.Result{}, err
+ 	}
+diff --git a/opensearch-operator/pkg/reconcilers/upgrade.go b/opensearch-operator/pkg/reconcilers/upgrade.go
+--- a/opensearch-operator/pkg/reconcilers/upgrade.go
++++ b/opensearch-operator/pkg/reconcilers/upgrade.go
+@@ -303,7 +303,7 @@
+ 		return nil
+ 	}
+ 
+-	ready, condition, err := services.CheckClusterStatusForRestart(r.osClient, r.instance.Spec.General.DrainDataNodes)
++	ready, condition, err := services.CheckClusterStatusForRestart(r.osClient, r.instance.Spec.General.DrainDataNodes, dataCount)
+ 	if err != nil {
+ 		r.logger.Error(err, "Could not check opensearch cluster status")
+ 		conditions = append(conditions, "Could not check opensearch cluster status")
diff --git a/packages/system/opensearch-operator/images/opensearch-operator/patches/skip-unusable-drain-exclusion.diff b/packages/system/opensearch-operator/images/opensearch-operator/patches/skip-unusable-drain-exclusion.diff
new file mode 100644
index 0000000000..c9602c3cad
--- /dev/null
+++ b/packages/system/opensearch-operator/images/opensearch-operator/patches/skip-unusable-drain-exclusion.diff
@@ -0,0 +1,300 @@
+diff --git a/opensearch-operator/opensearch-gateway/responses/AllocationExplainResponse.go b/opensearch-operator/opensearch-gateway/responses/AllocationExplainResponse.go
+new file mode 100644
+--- /dev/null
++++ b/opensearch-operator/opensearch-gateway/responses/AllocationExplainResponse.go
+@@ -0,0 +1,13 @@
++package responses
++
++// AllocationExplainResponse carries the part of _cluster/allocation/explain this
++// operator reads. The endpoint returns a great deal more; everything else is
++// left out on purpose, so a field the operator never consults cannot break
++// decoding when OpenSearch renames it.
++type AllocationExplainResponse struct {
++	Index string `json:"index"`
++	Shard int    `json:"shard"`
++	// CanMoveToOtherNode is "yes", "no" or "throttled", and is only present for a
++	// shard that is currently assigned.
++	CanMoveToOtherNode string `json:"can_move_to_other_node,omitempty"`
++}
+diff --git a/opensearch-operator/opensearch-gateway/services/drain_progress_test.go b/opensearch-operator/opensearch-gateway/services/drain_progress_test.go
+new file mode 100644
+--- /dev/null
++++ b/opensearch-operator/opensearch-gateway/services/drain_progress_test.go
+@@ -0,0 +1,165 @@
++package services
++
++import (
++	"encoding/json"
++	"io"
++	"net/http"
++	"strings"
++	"testing"
++
++	"github.com/go-logr/logr"
++	"github.com/jarcoal/httpmock"
++)
++
++// drainMockClient serves the endpoints a drain decision reads: health, cluster
++// settings (with the exclude list), the shard table, and one allocation
++// explanation per shard, keyed by "<index>/<shard>".
++func drainMockClient(t *testing.T, health, excluded, catShards string, explains map[string]string) (*OsClusterClient, *httpmock.MockTransport, *[]string) {
++	t.Helper()
++	tr := httpmock.NewMockTransport()
++	for _, m := range []string{http.MethodGet, http.MethodHead} {
++		tr.RegisterResponder(m, `=~^http://os.test:9200/?$`, httpmock.NewStringResponder(200, `{"version":{"number":"2.0.0"}}`))
++	}
++	tr.RegisterResponder(http.MethodGet, `=~/_cluster/health`, httpmock.NewStringResponder(200, health))
++	tr.RegisterResponder(http.MethodGet, `=~/_cluster/settings`, httpmock.NewStringResponder(200,
++		`{"transient":{"cluster":{"routing":{"allocation":{"enable":"all","exclude":{"_name":"`+excluded+`"}}}}},"persistent":{}}`))
++	puts := &[]string{}
++	tr.RegisterResponder(http.MethodPut, `=~/_cluster/settings`, func(r *http.Request) (*http.Response, error) {
++		b, _ := io.ReadAll(r.Body)
++		*puts = append(*puts, string(b))
++		return httpmock.NewStringResponse(200, `{}`), nil
++	})
++	tr.RegisterResponder(http.MethodGet, `=~/_cat/shards`, httpmock.NewStringResponder(200, catShards))
++	tr.RegisterResponder(http.MethodGet, `=~/_cat/indices`, httpmock.NewStringResponder(200, `[]`))
++	tr.RegisterResponder(http.MethodPost, `=~/_cluster/allocation/explain`, func(r *http.Request) (*http.Response, error) {
++		var req struct {
++			Index string `json:"index"`
++			Shard int    `json:"shard"`
++		}
++		b, _ := io.ReadAll(r.Body)
++		if err := json.Unmarshal(b, &req); err != nil {
++			return httpmock.NewStringResponse(400, `{}`), nil
++		}
++		body, ok := explains[req.Index]
++		if !ok {
++			return httpmock.NewStringResponse(404, `{}`), nil
++		}
++		return httpmock.NewStringResponse(200, body), nil
++	})
++	c, err := NewOsClusterClient("http://os.test:9200", "u", "p", WithTransport(tr))
++	if err != nil {
++		t.Fatal(err)
++	}
++	return c, tr, puts
++}
++
++func explainBody(canMove string) string {
++	return `{"index":"a","shard":0,"primary":true,"current_state":"started","can_remain_on_current_node":"no","can_move_to_other_node":"` + canMove + `","node_allocation_decisions":[]}`
++}
++
++func TestDrainCanProceed(t *testing.T) {
++	onNode := `[{"index":"a","shard":"0","prirep":"p","state":"STARTED","node":"n0"}]`
++	tests := []struct {
++		name     string
++		shards   string
++		explains map[string]string
++		want     bool
++	}{
++		{"a shard that can move keeps the drain alive", onNode, map[string]string{"a": explainBody("yes")}, true},
++		{"a shard with nowhere to go stops it", onNode, map[string]string{"a": explainBody("no")}, false},
++		{
++			"one immovable shard is enough to stop it",
++			`[{"index":"a","shard":"0","prirep":"p","state":"STARTED","node":"n0"},{"index":"b","shard":"0","prirep":"p","state":"STARTED","node":"n0"}]`,
++			map[string]string{"a": explainBody("yes"), "b": explainBody("no")},
++			false,
++		},
++		{"an empty node has nothing to block it", `[]`, nil, true},
++		{"shards on other nodes are not this node's problem",
++			`[{"index":"a","shard":"0","prirep":"p","state":"STARTED","node":"n1"}]`,
++			map[string]string{"a": explainBody("no")}, true},
++		{"a relocating shard is already moving",
++			`[{"index":"a","shard":"0","prirep":"p","state":"RELOCATING","node":"n0 -> 10.0.0.2 id n2"}]`,
++			map[string]string{"a": explainBody("no")}, true},
++	}
++	for _, tt := range tests {
++		t.Run(tt.name, func(t *testing.T) {
++			c, _, _ := drainMockClient(t, `{"status":"yellow"}`, "", tt.shards, tt.explains)
++			got, _, err := drainCanProceed(c, "n0")
++			if err != nil {
++				t.Fatal(err)
++			}
++			if got != tt.want {
++				t.Errorf("got %v, want %v", got, tt.want)
++			}
++		})
++	}
++}
++
++// The node holds a shard nothing else can take, so the drain will not finish.
++// The exclusion has to be released rather than held for as long as the restart
++// is stuck, and it must not be re-applied on the next pass either.
++func TestPreparePodForDeleteReleasesAnUnproductiveExclusion(t *testing.T) {
++	stuck := `[{"index":"a","shard":"0","prirep":"p","state":"STARTED","node":"n0"},{"index":"a","shard":"0","prirep":"r","state":"UNASSIGNED","node":null}]`
++	quietYellow := `{"status":"yellow","number_of_data_nodes":3,"unassigned_shards":1}`
++
++	t.Run("an exclusion already in place is withdrawn", func(t *testing.T) {
++		c, _, puts := drainMockClient(t, quietYellow, "n0", stuck, map[string]string{"a": explainBody("no")})
++		ready, err := PreparePodForDelete(c, logr.Discard(), "n0", true, 3)
++		if err != nil {
++			t.Fatal(err)
++		}
++		if ready {
++			t.Fatal("the pod is not safe to delete, it still holds a shard")
++		}
++		if len(*puts) != 1 {
++			t.Fatalf("expected exactly one settings write, got %d: %v", len(*puts), *puts)
++		}
++		if strings.Contains((*puts)[0], `"n0"`) {
++			t.Errorf("the write should clear the exclusion, got %s", (*puts)[0])
++		}
++	})
++
++	t.Run("no exclusion is applied in the first place", func(t *testing.T) {
++		c, _, puts := drainMockClient(t, quietYellow, "", stuck, map[string]string{"a": explainBody("no")})
++		ready, err := PreparePodForDelete(c, logr.Discard(), "n0", true, 3)
++		if err != nil {
++			t.Fatal(err)
++		}
++		if ready {
++			t.Fatal("the pod is not safe to delete, it still holds a shard")
++		}
++		if len(*puts) != 0 {
++			t.Errorf("nothing should be written when the node was never excluded, got %v", *puts)
++		}
++	})
++}
++
++// A drain that can still make progress keeps the behaviour it had: exclude the
++// node and wait for it to empty.
++func TestPreparePodForDeleteStillDrainsWhenItCan(t *testing.T) {
++	movable := `[{"index":"a","shard":"0","prirep":"p","state":"STARTED","node":"n0"},{"index":"a","shard":"0","prirep":"r","state":"STARTED","node":"n1"}]`
++	c, _, puts := drainMockClient(t, `{"status":"green","number_of_data_nodes":3}`, "", movable, map[string]string{"a": explainBody("yes")})
++	ready, err := PreparePodForDelete(c, logr.Discard(), "n0", true, 3)
++	if err != nil {
++		t.Fatal(err)
++	}
++	if ready {
++		t.Fatal("the node is not empty yet")
++	}
++	if len(*puts) != 1 || !strings.Contains((*puts)[0], `n0`) {
++		t.Fatalf("expected the node to be excluded, writes were %v", *puts)
++	}
++}
++
++// While shards are actually moving there is nothing to decide, and the
++// allocation explanation must not be asked for at all.
++func TestPreparePodForDeleteDoesNotExplainWhileShardsMove(t *testing.T) {
++	moving := `[{"index":"a","shard":"0","prirep":"p","state":"STARTED","node":"n0"},{"index":"a","shard":"0","prirep":"r","state":"UNASSIGNED","node":null}]`
++	c, tr, _ := drainMockClient(t, `{"status":"yellow","number_of_data_nodes":3,"relocating_shards":1}`, "n0", moving, map[string]string{"a": explainBody("no")})
++	if _, err := PreparePodForDelete(c, logr.Discard(), "n0", true, 3); err != nil {
++		t.Fatal(err)
++	}
++	if n := tr.GetCallCountInfo()["POST =~/_cluster/allocation/explain"]; n != 0 {
++		t.Errorf("explain must not be called while the allocator is busy, got %d calls", n)
++	}
++}
+diff --git a/opensearch-operator/opensearch-gateway/services/os_client.go b/opensearch-operator/opensearch-gateway/services/os_client.go
+--- a/opensearch-operator/opensearch-gateway/services/os_client.go
++++ b/opensearch-operator/opensearch-gateway/services/os_client.go
+@@ -171,6 +171,26 @@ func (client *OsClusterClient) CatIndices() ([]responses.CatIndicesResponse, err
+ 	return response, err
+ }
+ 
++func (client *OsClusterClient) GetAllocationExplain(index string, shard int, primary bool) (responses.AllocationExplainResponse, error) {
++	body := map[string]interface{}{
++		"index":   index,
++		"shard":   shard,
++		"primary": primary,
++	}
++	req := opensearchapi.ClusterAllocationExplainRequest{Body: opensearchutil.NewJSONReader(body)}
++	explainRes, err := req.Do(context.Background(), client.client)
++	var response responses.AllocationExplainResponse
++	if err != nil {
++		return response, err
++	}
++	defer helpers.SafeClose(explainRes.Body)
++	if explainRes.IsError() {
++		return response, fmt.Errorf("failed to get allocation explanation: %s", explainRes.String())
++	}
++	err = json.NewDecoder(explainRes.Body).Decode(&response)
++	return response, err
++}
++
+ func (client *OsClusterClient) CatShards(headers []string) ([]responses.CatShardsResponse, error) {
+ 	req := opensearchapi.CatShardsRequest{Format: "json", H: headers}
+ 	indicesRes, err := req.Do(context.Background(), client.client)
+diff --git a/opensearch-operator/opensearch-gateway/services/os_data_service.go b/opensearch-operator/opensearch-gateway/services/os_data_service.go
+--- a/opensearch-operator/opensearch-gateway/services/os_data_service.go
++++ b/opensearch-operator/opensearch-gateway/services/os_data_service.go
+@@ -4,6 +4,7 @@ import (
+ 	"context"
+ 	"encoding/json"
+ 	"fmt"
++	"strconv"
+ 	"strings"
+ 
+ 	"github.com/google/go-cmp/cmp"
+@@ -249,8 +250,70 @@ func ReactivateShardAllocation(service *OsClusterClient) error {
+ 	return nil
+ }
+ 
++// drainCanProceed reports whether the allocator still has somewhere to put what
++// is left on nodeName. A drain waits for the node to empty, so one shard that
++// can be placed nowhere else is what turns that wait into a permanent one; the
++// reason for the first such shard is returned for the caller's log line.
++//
++// Only STARTED copies are asked about: a relocating one is already on its way
++// out, and an unassigned one is not on this node to begin with.
++func drainCanProceed(service *OsClusterClient, nodeName string) (bool, string, error) {
++	shards, err := service.CatShards([]string{"index", "shard", "prirep", "state", "node"})
++	if err != nil {
++		return false, "", err
++	}
++	for _, shard := range shardsOnNodeFromResponse(shards, nodeName) {
++		if shard.State != "STARTED" {
++			continue
++		}
++		shardNum, err := strconv.Atoi(shard.Shard)
++		if err != nil {
++			continue
++		}
++		explain, err := service.GetAllocationExplain(shard.Index, shardNum, shard.PrimaryOrReplica == "p")
++		if err != nil {
++			return false, "", err
++		}
++		if strings.EqualFold(explain.CanMoveToOtherNode, "no") {
++			return false, fmt.Sprintf("%s[%s] has no other node to move to", shard.Index, shard.Shard), nil
++		}
++	}
++	return true, "", nil
++}
++
+ func PreparePodForDelete(service *OsClusterClient, lg logr.Logger, podName string, drainNode bool, nodeCount int32) (bool, error) {
+ 	if drainNode {
++		// Excluding a node is only worth anything while the allocator can move its
++		// shards elsewhere. When it cannot, the node never empties, the restart
++		// waits for something that will not happen, and the exclusion keeps a data
++		// node out of allocation for the whole of it. Two data nodes are exempt:
++		// that path never waits for a full drain, only for system-index primaries.
++		//
++		// Asked only while nothing is moving, so a drain in progress pays nothing:
++		// the cost is one allocation explanation per started shard on the node, and
++		// it stops at the first shard that cannot move.
++		if nodeCount != 2 {
++			health, err := service.GetHealth()
++			if err != nil {
++				return false, err
++			}
++			if !hasShardActivity(health) {
++				canDrain, reason, err := drainCanProceed(service, podName)
++				if err != nil {
++					return false, err
++				}
++				if !canDrain {
++					// Withdraw an exclusion left by an earlier pass. With an empty
++					// exclude list this writes nothing.
++					if _, err := RemoveExcludeNodeHost(service, podName); err != nil {
++						return false, err
++					}
++					lg.Info(fmt.Sprintf("Not draining %s: %s. Leaving allocation as it is until that changes", podName, reason))
++					return false, nil
++				}
++			}
++		}
++
+ 		// If we are draining nodes then drain the working node
+ 		_, err := AppendExcludeNodeHost(service, podName)
+ 		if err != nil {
diff --git a/packages/system/opensearch-operator/images/opensearch-operator/patches/timeout-cluster-api-calls.diff b/packages/system/opensearch-operator/images/opensearch-operator/patches/timeout-cluster-api-calls.diff
new file mode 100644
index 0000000000..d0230dacfb
--- /dev/null
+++ b/packages/system/opensearch-operator/images/opensearch-operator/patches/timeout-cluster-api-calls.diff
@@ -0,0 +1,783 @@
+diff --git a/opensearch-operator/opensearch-gateway/services/http_request.go b/opensearch-operator/opensearch-gateway/services/http_request.go
+index 724ccf8..8ef9a5e 100644
+--- a/opensearch-operator/opensearch-gateway/services/http_request.go
++++ b/opensearch-operator/opensearch-gateway/services/http_request.go
+@@ -17,16 +17,7 @@ func doHTTPGet(ctx context.Context, client *opensearch.Client, path strings.Buil
+ 		return nil, err
+ 	}
+ 
+-	if ctx != nil {
+-		req = req.WithContext(ctx)
+-	}
+-
+-	res, err := client.Perform(req)
+-	if err != nil {
+-		return nil, err
+-	}
+-
+-	return &opensearchapi.Response{StatusCode: res.StatusCode, Body: res.Body, Header: res.Header}, nil
++	return performRequest(ctx, client, req)
+ }
+ 
+ // doHTTPPost performs a HTTP POST request
+@@ -36,17 +27,9 @@ func doHTTPPost(ctx context.Context, client *opensearch.Client, path strings.Bui
+ 		return nil, err
+ 	}
+ 
+-	if ctx != nil {
+-		req = req.WithContext(ctx)
+-	}
+ 	req.Header.Add(headerContentType, jsonContentHeader)
+ 
+-	res, err := client.Perform(req)
+-	if err != nil {
+-		return nil, err
+-	}
+-
+-	return &opensearchapi.Response{StatusCode: res.StatusCode, Body: res.Body, Header: res.Header}, nil
++	return performRequest(ctx, client, req)
+ }
+ 
+ // doHTTPHead performs a HTTP HEAD request
+@@ -56,16 +39,7 @@ func doHTTPHead(ctx context.Context, client *opensearch.Client, path strings.Bui
+ 		return nil, err
+ 	}
+ 
+-	if ctx != nil {
+-		req = req.WithContext(ctx)
+-	}
+-
+-	res, err := client.Perform(req)
+-	if err != nil {
+-		return nil, err
+-	}
+-
+-	return &opensearchapi.Response{StatusCode: res.StatusCode, Body: res.Body, Header: res.Header}, nil
++	return performRequest(ctx, client, req)
+ }
+ 
+ // doHTTPPut performs a HTTP PUT request
+@@ -75,17 +49,9 @@ func doHTTPPut(ctx context.Context, client *opensearch.Client, path strings.Buil
+ 		return nil, err
+ 	}
+ 
+-	if ctx != nil {
+-		req = req.WithContext(ctx)
+-	}
+ 	req.Header.Add(headerContentType, jsonContentHeader)
+ 
+-	res, err := client.Perform(req)
+-	if err != nil {
+-		return nil, err
+-	}
+-
+-	return &opensearchapi.Response{StatusCode: res.StatusCode, Body: res.Body, Header: res.Header}, nil
++	return performRequest(ctx, client, req)
+ }
+ 
+ // doHTTPDelete performs a HTTP DELETE request
+@@ -95,14 +61,51 @@ func doHTTPDelete(ctx context.Context, client *opensearch.Client, path strings.B
+ 		return nil, err
+ 	}
+ 
+-	if ctx != nil {
+-		req = req.WithContext(ctx)
++	return performRequest(ctx, client, req)
++}
++
++// performRequest sends req and bounds the whole exchange, the body read
++// included, with requestTimeout.
++//
++// The deadline has to outlive this function, because the response body goes
++// back to the caller still open and cancelling here would fail their read. It
++// therefore rides on the body and is released when the body is closed, which is
++// how http.Client applies its own Timeout. A caller that never closes the body
++// holds the timer until the deadline passes, and the deadline then closes the
++// connection on its behalf.
++//
++// boundedTransport already bounds each request that goes out, and this is the
++// deadline for the series: opensearch-go retries a request up to three more
++// times on 502, 503 and 504, and the transport's deadline starts again on every
++// one of them. Nothing on the reconcile path puts a deadline on the context it
++// passes in, so without this the series has no bound.
++func performRequest(ctx context.Context, client *opensearch.Client, req *http.Request) (*opensearchapi.Response, error) {
++	if ctx == nil {
++		ctx = context.Background()
+ 	}
++	ctx, cancel := context.WithTimeout(ctx, requestTimeout)
+ 
+-	res, err := client.Perform(req)
++	res, err := client.Perform(req.WithContext(ctx))
+ 	if err != nil {
++		cancel()
+ 		return nil, err
+ 	}
+ 
+-	return &opensearchapi.Response{StatusCode: res.StatusCode, Body: res.Body, Header: res.Header}, nil
++	return &opensearchapi.Response{
++		StatusCode: res.StatusCode,
++		Body:       &deadlineBody{ReadCloser: res.Body, cancel: cancel},
++		Header:     res.Header,
++	}, nil
++}
++
++// deadlineBody releases its request's deadline when the body is closed.
++type deadlineBody struct {
++	io.ReadCloser
++	cancel context.CancelFunc
++}
++
++func (b *deadlineBody) Close() error {
++	err := b.ReadCloser.Close()
++	b.cancel()
++	return err
+ }
+diff --git a/opensearch-operator/opensearch-gateway/services/os_client.go b/opensearch-operator/opensearch-gateway/services/os_client.go
+index 741ea4a..2496c54 100644
+--- a/opensearch-operator/opensearch-gateway/services/os_client.go
++++ b/opensearch-operator/opensearch-gateway/services/os_client.go
+@@ -8,6 +8,7 @@ import (
+ 	"github.com/Opster/opensearch-k8s-operator/opensearch-operator/pkg/helpers"
+ 	"io"
+ 	"k8s.io/utils/ptr"
++	"net"
+ 	"net/http"
+ 	"strconv"
+ 	"strings"
+@@ -42,6 +43,100 @@ var AdditionalSystemIndices = []string{
+ 	".replication-metadata-store",
+ }
+ 
++// A request to a cluster's HTTP API has no bound of its own: a fresh
++// http.Transport carries no dial, handshake or response-header timeout, the
++// client is built without an http.Client, and the Timeout field on a request
++// type is the server-side query parameter, which only helps once something
++// answers. The operator runs one worker per controller, so a single call that
++// never returns stops every OpenSearchCluster from being reconciled, and the
++// finalizer on the next deletion waits out its own termination timeout with
++// nothing in the log to say why.
++//
++// requestTimeout is applied at two levels, because one of them alone leaves a
++// gap. boundedTransport puts it on every request that goes out, which is the
++// only level that reaches the requests opensearch-go builds for itself. That
++// bounds an attempt, and opensearch-go retries a request up to three times on
++// 502, 503 and 504, so the calls below carry it a second time for the series:
++// through requestContext where the call decodes the answer before it returns,
++// and through performRequest where the still-open body goes back to the caller.
++//
++// These are variables rather than constants so the tests can shorten them.
++var (
++	// requestTimeout bounds one exchange with a cluster, from the dial to the
++	// last byte of the body. Every call answers in well under a second on a
++	// healthy cluster, and the controllers requeue on the order of tens of
++	// seconds, so a call still running at this point is not going to produce an
++	// answer worth waiting for.
++	requestTimeout = 30 * time.Second
++
++	// connectTimeout bounds getting a connection up: the dial and the TLS
++	// handshake, each separately. Both sit inside requestTimeout, which would
++	// end the attempt anyway; what this buys is an unreachable node failing in
++	// a third of the budget, with an error that names what went wrong.
++	connectTimeout = 10 * time.Second
++)
++
++// requestContext bounds a single call. The caller must cancel it only once it
++// is done with the response body, which for the calls that use it is when the
++// body has been decoded: cancelling earlier fails the read.
++//
++// It hangs off context.Background() rather than the caller's context, which the
++// methods below do not take: threading one through would change every signature
++// and every call site of a patch meant to be dropped. The cost is that an
++// operator shutting down waits out a call it could have abandoned.
++func requestContext() (context.Context, context.CancelFunc) {
++	return context.WithTimeout(context.Background(), requestTimeout)
++}
++
++// clusterDialer is the dialer the transport below dials with. It is built here
++// rather than inline so the bound on it can be read back: DialContext is a
++// function on the transport, and a timeout closed over inside one is not
++// something a test can assert.
++func clusterDialer() *net.Dialer {
++	return &net.Dialer{Timeout: connectTimeout}
++}
++
++// clusterTransport is the transport used when the caller supplies none.
++func clusterTransport() *http.Transport {
++	return &http.Transport{
++		TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
++		// These options are needed as otherwise connections would be kept and leak memory
++		// Connection reuse is not really possible due to each reconcile run being independent
++		DisableKeepAlives:   true,
++		MaxIdleConns:        1,
++		DialContext:         clusterDialer().DialContext,
++		TLSHandshakeTimeout: connectTimeout,
++	}
++}
++
++// boundedTransport puts requestTimeout on every request that goes through it.
++// It is the only level that reaches the requests opensearch-go makes for
++// itself: before a client's first request the library runs a product check,
++// which builds its own request with a context.Background() and decodes the body
++// of the answer, so a cluster that flushes the headers and then stops holds the
++// check, and with it the reconcile, for as long as the process lives. Each
++// reconcile builds its own client, so each one runs that check.
++//
++// The deadline outlives RoundTrip, because the body goes back to the caller
++// still open and cancelling here would fail their read. It rides on the body
++// and is released by Close, the same way http.Client applies its own Timeout.
++type boundedTransport struct {
++	http.RoundTripper
++}
++
++func (t boundedTransport) RoundTrip(req *http.Request) (*http.Response, error) {
++	ctx, cancel := context.WithTimeout(req.Context(), requestTimeout)
++
++	res, err := t.RoundTripper.RoundTrip(req.WithContext(ctx))
++	if err != nil || res.Body == nil {
++		cancel()
++		return res, err
++	}
++
++	res.Body = &deadlineBody{ReadCloser: res.Body, cancel: cancel}
++	return res, nil
++}
++
+ type OsClusterClient struct {
+ 	OsClusterClientOptions
+ 	client   *opensearch.Client
+@@ -74,13 +169,7 @@ func NewOsClusterClient(clusterUrl string, username string, password string, opt
+ 			if options.transport != nil {
+ 				return options.transport
+ 			}
+-			return &http.Transport{
+-				TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
+-				// These options are needed as otherwise connections would be kept and leak memory
+-				// Connection reuse is not really possible due to each reconcile run being independent
+-				DisableKeepAlives: true,
+-				MaxIdleConns:      1,
+-			}
++			return clusterTransport()
+ 		}(),
+ 		Addresses: []string{clusterUrl},
+ 		Username:  username,
+@@ -97,13 +186,23 @@ func NewOsClusterClient(clusterUrl string, username string, password string, opt
+ }
+ 
+ func NewOsClusterClientFromConfig(config opensearch.Config) (*OsClusterClient, error) {
++	// Every request a client makes goes through its RoundTripper, the ones
++	// opensearch-go makes for itself included, so this is the one place a
++	// deadline reaches all of them. Both ways into this package arrive here.
++	if config.Transport == nil {
++		config.Transport = http.DefaultTransport
++	}
++	config.Transport = boundedTransport{config.Transport}
++
+ 	service := new(OsClusterClient)
+ 	client, err := opensearch.NewClient(config)
+ 	if err == nil {
+ 		service.client = client
+ 	}
+ 	pingReq := opensearchapi.PingRequest{}
+-	pingRes, err := pingReq.Do(context.Background(), client)
++	ctx, cancel := requestContext()
++	defer cancel()
++	pingRes, err := pingReq.Do(ctx, client)
+ 	if err == nil && pingRes.StatusCode == 200 {
+ 		mainPageResponse, err := MainPage(client)
+ 		if err == nil {
+@@ -115,7 +214,9 @@ func NewOsClusterClientFromConfig(config opensearch.Config) (*OsClusterClient, e
+ 
+ func MainPage(client *opensearch.Client) (responses.MainResponse, error) {
+ 	req := opensearchapi.InfoRequest{}
+-	infoRes, err := req.Do(context.Background(), client)
++	ctx, cancel := requestContext()
++	defer cancel()
++	infoRes, err := req.Do(ctx, client)
+ 	var response responses.MainResponse
+ 	if err == nil {
+ 		defer helpers.SafeClose(infoRes.Body)
+@@ -128,7 +229,9 @@ func (client *OsClusterClient) GetHealth() (responses.ClusterHealthResponse, err
+ 	req := opensearchapi.ClusterHealthRequest{
+ 		Level: "indices",
+ 	}
+-	catNodesRes, err := req.Do(context.Background(), client.client)
++	ctx, cancel := requestContext()
++	defer cancel()
++	catNodesRes, err := req.Do(ctx, client.client)
+ 	var response responses.ClusterHealthResponse
+ 	if err == nil {
+ 		defer helpers.SafeClose(catNodesRes.Body)
+@@ -139,7 +242,9 @@ func (client *OsClusterClient) GetHealth() (responses.ClusterHealthResponse, err
+ 
+ func (client *OsClusterClient) CatNodes() ([]responses.CatNodesResponse, error) {
+ 	req := opensearchapi.CatNodesRequest{Format: "json"}
+-	catNodesRes, err := req.Do(context.Background(), client.client)
++	ctx, cancel := requestContext()
++	defer cancel()
++	catNodesRes, err := req.Do(ctx, client.client)
+ 	var response []responses.CatNodesResponse
+ 	if err == nil {
+ 		defer helpers.SafeClose(catNodesRes.Body)
+@@ -150,7 +255,9 @@ func (client *OsClusterClient) CatNodes() ([]responses.CatNodesResponse, error)
+ 
+ func (client *OsClusterClient) NodesStats() (responses.NodesStatsResponse, error) {
+ 	req := opensearchapi.NodesStatsRequest{}
+-	catNodesRes, err := req.Do(context.Background(), client.client)
++	ctx, cancel := requestContext()
++	defer cancel()
++	catNodesRes, err := req.Do(ctx, client.client)
+ 	var response responses.NodesStatsResponse
+ 	if err == nil {
+ 		defer helpers.SafeClose(catNodesRes.Body)
+@@ -161,7 +268,9 @@ func (client *OsClusterClient) NodesStats() (responses.NodesStatsResponse, error
+ 
+ func (client *OsClusterClient) CatIndices() ([]responses.CatIndicesResponse, error) {
+ 	req := opensearchapi.CatIndicesRequest{Format: "json"}
+-	indicesRes, err := req.Do(context.Background(), client.client)
++	ctx, cancel := requestContext()
++	defer cancel()
++	indicesRes, err := req.Do(ctx, client.client)
+ 	var response []responses.CatIndicesResponse
+ 	if err != nil {
+ 		return response, err
+@@ -178,7 +287,9 @@ func (client *OsClusterClient) GetAllocationExplain(index string, shard int, pri
+ 		"primary": primary,
+ 	}
+ 	req := opensearchapi.ClusterAllocationExplainRequest{Body: opensearchutil.NewJSONReader(body)}
+-	explainRes, err := req.Do(context.Background(), client.client)
++	ctx, cancel := requestContext()
++	defer cancel()
++	explainRes, err := req.Do(ctx, client.client)
+ 	var response responses.AllocationExplainResponse
+ 	if err != nil {
+ 		return response, err
+@@ -193,7 +304,9 @@ func (client *OsClusterClient) GetAllocationExplain(index string, shard int, pri
+ 
+ func (client *OsClusterClient) CatShards(headers []string) ([]responses.CatShardsResponse, error) {
+ 	req := opensearchapi.CatShardsRequest{Format: "json", H: headers}
+-	indicesRes, err := req.Do(context.Background(), client.client)
++	ctx, cancel := requestContext()
++	defer cancel()
++	indicesRes, err := req.Do(ctx, client.client)
+ 	var response []responses.CatShardsResponse
+ 	if err != nil {
+ 		return response, err
+@@ -209,7 +322,9 @@ func (client *OsClusterClient) CatNamedIndicesShards(headers []string, indices [
+ 		Format: "json",
+ 		H:      headers,
+ 	}
+-	indicesRes, err := req.Do(context.Background(), client.client)
++	ctx, cancel := requestContext()
++	defer cancel()
++	indicesRes, err := req.Do(ctx, client.client)
+ 	var response []responses.CatShardsResponse
+ 	if err != nil {
+ 		return response, err
+@@ -221,7 +336,9 @@ func (client *OsClusterClient) CatNamedIndicesShards(headers []string, indices [
+ 
+ func (client *OsClusterClient) GetClusterSettings() (responses.ClusterSettingsResponse, error) {
+ 	req := opensearchapi.ClusterGetSettingsRequest{Pretty: true}
+-	settingsRes, err := req.Do(context.Background(), client.client)
++	ctx, cancel := requestContext()
++	defer cancel()
++	settingsRes, err := req.Do(ctx, client.client)
+ 	var response responses.ClusterSettingsResponse
+ 	if err != nil {
+ 		return response, err
+@@ -235,7 +352,9 @@ func (client *OsClusterClient) GetFlatClusterSettings() (responses.FlatClusterSe
+ 	req := opensearchapi.ClusterGetSettingsRequest{
+ 		FlatSettings: ptr.To(true),
+ 	}
+-	settingsRes, err := req.Do(context.Background(), client.client)
++	ctx, cancel := requestContext()
++	defer cancel()
++	settingsRes, err := req.Do(ctx, client.client)
+ 	var response responses.FlatClusterSettingsResponse
+ 	if err != nil {
+ 		return response, err
+@@ -253,7 +372,9 @@ func (client *OsClusterClient) GetFlatClusterSettings() (responses.FlatClusterSe
+ func (client *OsClusterClient) PutClusterSettings(settings responses.ClusterSettingsResponse) (responses.ClusterSettingsResponse, error) {
+ 	body := opensearchutil.NewJSONReader(settings)
+ 	req := opensearchapi.ClusterPutSettingsRequest{Body: body}
+-	settingsRes, err := req.Do(context.Background(), client.client)
++	ctx, cancel := requestContext()
++	defer cancel()
++	settingsRes, err := req.Do(ctx, client.client)
+ 	var response responses.ClusterSettingsResponse
+ 	if err != nil {
+ 		return response, err
+@@ -266,7 +387,9 @@ func (client *OsClusterClient) PutClusterSettings(settings responses.ClusterSett
+ func (client *OsClusterClient) ReRouteShard(rerouteJson string) (responses.ClusterRerouteResponse, error) {
+ 	body := strings.NewReader(rerouteJson)
+ 	req := opensearchapi.ClusterRerouteRequest{Body: body}
+-	settingsRes, err := req.Do(context.Background(), client.client)
++	ctx, cancel := requestContext()
++	defer cancel()
++	settingsRes, err := req.Do(ctx, client.client)
+ 	var response responses.ClusterRerouteResponse
+ 	if err != nil {
+ 		return response, err
+@@ -282,7 +405,9 @@ func (client *OsClusterClient) GetClusterHealth() (responses.ClusterHealthRespon
+ 	}
+ 
+ 	health := responses.ClusterHealthResponse{}
+-	resp, err := req.Do(context.Background(), client.client)
++	ctx, cancel := requestContext()
++	defer cancel()
++	resp, err := req.Do(ctx, client.client)
+ 	if err != nil {
+ 		return health, err
+ 	}
+@@ -303,7 +428,9 @@ func (client *OsClusterClient) IndexExists(indexName string) (bool, error) {
+ 			indexName,
+ 		},
+ 	}
+-	indicesRes, err := req.Do(context.Background(), client.client)
++	ctx, cancel := requestContext()
++	defer cancel()
++	indicesRes, err := req.Do(ctx, client.client)
+ 	if err != nil {
+ 		return false, err
+ 	}
+diff --git a/opensearch-operator/opensearch-gateway/services/os_client_timeout_test.go b/opensearch-operator/opensearch-gateway/services/os_client_timeout_test.go
+new file mode 100644
+index 0000000..4a8ce1f
+--- /dev/null
++++ b/opensearch-operator/opensearch-gateway/services/os_client_timeout_test.go
+@@ -0,0 +1,336 @@
++package services
++
++import (
++	"context"
++	"io"
++	"net"
++	"net/http"
++	"net/http/httptest"
++	"runtime"
++	"strings"
++	"sync"
++	"testing"
++	"time"
++
++	"github.com/opensearch-project/opensearch-go"
++)
++
++// blockedTransport is a cluster that has stopped answering: the request goes
++// out and nothing comes back until whoever sent it gives up.
++//
++// It answers the root path, and only the root path, because opensearch-go
++// checks the product it is talking to on a client's first request and gives
++// that check a context.Background() of its own, inside the library, where a
++// deadline set at the call site cannot reach it. This transport is handed
++// straight to opensearch.NewClient rather than going through
++// NewOsClusterClient, so boundedTransport is not in the way here and the
++// deadline under test is the one the call carries.
++type blockedTransport struct{}
++
++func (blockedTransport) RoundTrip(req *http.Request) (*http.Response, error) {
++	if req.URL.Path == "/" {
++		return &http.Response{
++			StatusCode: http.StatusOK,
++			Header:     http.Header{"Content-Type": []string{"application/json"}},
++			Body:       io.NopCloser(strings.NewReader(`{"version":{"number":"2.0.0","distribution":"opensearch"}}`)),
++			Request:    req,
++		}, nil
++	}
++	<-req.Context().Done()
++	return nil, req.Context().Err()
++}
++
++// callIsAnsweredOrAbandoned runs call in the background and fails the test if it
++// is still running after grace. Waiting in the test rather than in the call is
++// what turns an unbounded call into a failure instead of a test run that hangs
++// until the CI job is killed.
++func callIsAnsweredOrAbandoned(t *testing.T, grace time.Duration, what string, call func() error) {
++	t.Helper()
++	done := make(chan error, 1)
++	go func() { done <- call() }()
++	select {
++	case err := <-done:
++		if err == nil {
++			t.Fatalf("%s: expected the call to fail once its deadline passed", what)
++		}
++	case <-time.After(grace):
++		t.Fatalf("%s: still running after %s, so the call is unbounded", what, grace)
++	}
++}
++
++// silentListener accepts connections and answers nothing on them. The accepted
++// connections are returned rather than dropped because an unreachable net.Conn
++// is closed by the garbage collector: net.netFD carries a finalizer that closes
++// the descriptor, so a dropped connection turns this into a server that resets
++// the connection, and a request against it then fails for a reason that has
++// nothing to do with the timeout under test.
++func silentListener(t *testing.T) (net.Listener, *[]net.Conn) {
++	t.Helper()
++	ln, err := net.Listen("tcp", "127.0.0.1:0")
++	if err != nil {
++		t.Fatal(err)
++	}
++	t.Cleanup(func() { _ = ln.Close() })
++
++	var mu sync.Mutex
++	accepted := &[]net.Conn{}
++	go func() {
++		for {
++			conn, err := ln.Accept()
++			if err != nil {
++				return
++			}
++			mu.Lock()
++			*accepted = append(*accepted, conn)
++			mu.Unlock()
++		}
++	}()
++
++	// Collect throughout, so that a connection this listener stops holding is
++	// closed while the test is still waiting rather than after it.
++	stop := make(chan struct{})
++	t.Cleanup(func() { close(stop) })
++	go func() {
++		for {
++			select {
++			case <-stop:
++				return
++			default:
++				runtime.GC()
++				time.Sleep(10 * time.Millisecond)
++			}
++		}
++	}()
++
++	return ln, accepted
++}
++
++// keepReachable is the deferred hold that keeps the accepted connections alive
++// to the end of the test, and the reason silentListener forces a collection on
++// every accept: with the connections dropped instead, that collection closes
++// them and the test passes with the bound it exists to pin removed. It holds
++// the slice without reading it, because the accept goroutine writes the header
++// under a lock this side has no access to, and reading it here is a data race.
++func keepReachable(conns *[]net.Conn) {
++	runtime.KeepAlive(conns)
++}
++
++func TestCallToAClusterThatNeverAnswersGivesUp(t *testing.T) {
++	old := requestTimeout
++	requestTimeout = 200 * time.Millisecond
++	t.Cleanup(func() { requestTimeout = old })
++
++	raw, err := opensearch.NewClient(opensearch.Config{
++		Addresses: []string{"http://os.test:9200"},
++		Transport: blockedTransport{},
++	})
++	if err != nil {
++		t.Fatal(err)
++	}
++	client := &OsClusterClient{client: raw}
++
++	callIsAnsweredOrAbandoned(t, 10*time.Second, "GetHealth", func() error {
++		_, err := client.GetHealth()
++		return err
++	})
++	callIsAnsweredOrAbandoned(t, 10*time.Second, "CatNodes", func() error {
++		_, err := client.CatNodes()
++		return err
++	})
++}
++
++func TestTransportGivesUpOnAServerThatAcceptsAndSaysNothing(t *testing.T) {
++	old := requestTimeout
++	requestTimeout = 200 * time.Millisecond
++	t.Cleanup(func() { requestTimeout = old })
++
++	ln, accepted := silentListener(t)
++	defer keepReachable(accepted)
++
++	req, err := http.NewRequest(http.MethodGet, "http://"+ln.Addr().String()+"/", nil)
++	if err != nil {
++		t.Fatal(err)
++	}
++	inner := clusterTransport()
++	t.Cleanup(inner.CloseIdleConnections)
++	transport := boundedTransport{inner}
++
++	callIsAnsweredOrAbandoned(t, 10*time.Second, "GET through the operator's transport", func() error {
++		res, err := transport.RoundTrip(req)
++		if res != nil {
++			_ = res.Body.Close()
++		}
++		return err
++	})
++}
++
++// TestTransportCarriesConnectionTimeouts pins the bounds the test above cannot
++// reach. A dial that hangs needs an address that neither answers nor refuses,
++// and a TLS handshake that hangs needs a server that stops mid-handshake:
++// neither is something a test can arrange on loopback. Both are therefore
++// asserted by value, the dial through the dialer the transport is built from,
++// since a dialer reaches the transport as a function and a timeout closed over
++// inside one cannot be read back.
++func TestTransportCarriesConnectionTimeouts(t *testing.T) {
++	transport := clusterTransport()
++
++	if transport.DialContext == nil {
++		t.Error("DialContext is unset, so the transport dials with no timeout at all")
++	}
++	if dialer := clusterDialer(); dialer.Timeout != connectTimeout {
++		t.Errorf("the dialer's Timeout is %s, want %s", dialer.Timeout, connectTimeout)
++	}
++	if transport.TLSHandshakeTimeout != connectTimeout {
++		t.Errorf("TLSHandshakeTimeout is %s, want %s", transport.TLSHandshakeTimeout, connectTimeout)
++	}
++}
++
++// answeringServer answers the two requests a new client makes before anything
++// else: the ping, and the product check opensearch-go runs on a client's first
++// request. Every other path is handed to serve.
++func answeringServer(t *testing.T, serve http.HandlerFunc) *httptest.Server {
++	t.Helper()
++	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
++		if r.URL.Path == "/" {
++			_, _ = io.WriteString(w, `{"version":{"number":"2.0.0","distribution":"opensearch"}}`)
++			return
++		}
++		serve(w, r)
++	}))
++	t.Cleanup(srv.Close)
++	return srv
++}
++
++// TestBodyThatStopsHalfwayIsBounded covers the calls that take a context from
++// the caller: nothing on the reconcile path puts a deadline on that context,
++// and the transport's ResponseHeaderTimeout stops counting the moment the
++// headers arrive, so a body that starts and then stops is bounded by the
++// deadline the request carries or by nothing.
++func TestBodyThatStopsHalfwayIsBounded(t *testing.T) {
++	oldRequest := requestTimeout
++	requestTimeout = 200 * time.Millisecond
++	t.Cleanup(func() { requestTimeout = oldRequest })
++
++	stall := make(chan struct{})
++	srv := answeringServer(t, func(w http.ResponseWriter, r *http.Request) {
++		w.Header().Set("Content-Length", "100")
++		w.WriteHeader(http.StatusOK)
++		w.(http.Flusher).Flush()
++		<-stall
++	})
++	t.Cleanup(func() { close(stall) })
++
++	client, err := NewOsClusterClient(srv.URL, "u", "p")
++	if err != nil {
++		t.Fatal(err)
++	}
++
++	callIsAnsweredOrAbandoned(t, 10*time.Second, "reading a body that stopped halfway", func() error {
++		res, err := client.GetIndices(context.Background(), "test-*")
++		if err != nil {
++			return err
++		}
++		defer func() { _ = res.Body.Close() }()
++		_, err = io.ReadAll(res.Body)
++		return err
++	})
++}
++
++// TestBodyOutlivesTheCallThatFetchedIt is the other half: the deadline is
++// released by the body's Close and not by the call's return, because these
++// calls hand the body back still open and the caller reads it afterwards.
++func TestBodyOutlivesTheCallThatFetchedIt(t *testing.T) {
++	const chunk = 64 << 10
++	const chunks = 16
++
++	srv := answeringServer(t, func(w http.ResponseWriter, r *http.Request) {
++		w.Header().Set("Content-Type", "application/json")
++		w.WriteHeader(http.StatusOK)
++		for i := 0; i < chunks; i++ {
++			_, _ = w.Write([]byte(strings.Repeat("x", chunk)))
++			w.(http.Flusher).Flush()
++			time.Sleep(5 * time.Millisecond)
++		}
++	})
++
++	client, err := NewOsClusterClient(srv.URL, "u", "p")
++	if err != nil {
++		t.Fatal(err)
++	}
++
++	res, err := client.GetIndices(context.Background(), "test-*")
++	if err != nil {
++		t.Fatal(err)
++	}
++	defer func() { _ = res.Body.Close() }()
++
++	body, err := io.ReadAll(res.Body)
++	if err != nil {
++		t.Fatalf("reading the body after the call returned: %v", err)
++	}
++	if len(body) != chunk*chunks {
++		t.Errorf("read %d bytes of the body, want %d", len(body), chunk*chunks)
++	}
++}
++
++// TestNewClientGivesUpWhenTheProductCheckStalls covers the one request the call
++// site cannot reach: opensearch-go runs a product check before the first
++// request a client makes, builds it with a context.Background() of its own and
++// decodes its body, so a cluster that flushes the headers of that response and
++// then stops holds the check for as long as the process lives. The check runs
++// per client, and the operator builds one per reconcile.
++func TestNewClientGivesUpWhenTheProductCheckStalls(t *testing.T) {
++	old := requestTimeout
++	requestTimeout = 200 * time.Millisecond
++	t.Cleanup(func() { requestTimeout = old })
++
++	stall := make(chan struct{})
++	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
++		w.Header().Set("Content-Type", "application/json")
++		w.Header().Set("Content-Length", "57")
++		w.WriteHeader(http.StatusOK)
++		w.(http.Flusher).Flush()
++		<-stall
++	}))
++	t.Cleanup(srv.Close)
++	t.Cleanup(func() { close(stall) })
++
++	callIsAnsweredOrAbandoned(t, 10*time.Second, "a new client whose product check stalls", func() error {
++		_, err := NewOsClusterClient(srv.URL, "u", "p")
++		return err
++	})
++}
++
++// TestARetriedCallIsBoundedAsAWhole covers what a per-request deadline does not
++// reach: opensearch-go retries a request up to three more times on 502, 503 and
++// 504, and a bound that only sits on the transport starts again on each of
++// them, so a proxy that answers 504 slowly holds the call for four times the
++// budget. The deadline the call carries is what bounds the series.
++func TestARetriedCallIsBoundedAsAWhole(t *testing.T) {
++	const perAttempt = 200 * time.Millisecond
++
++	old := requestTimeout
++	requestTimeout = 300 * time.Millisecond
++	t.Cleanup(func() { requestTimeout = old })
++
++	srv := answeringServer(t, func(w http.ResponseWriter, r *http.Request) {
++		time.Sleep(perAttempt)
++		w.WriteHeader(http.StatusServiceUnavailable)
++	})
++
++	client, err := NewOsClusterClient(srv.URL, "u", "p")
++	if err != nil {
++		t.Fatal(err)
++	}
++
++	start := time.Now()
++	res, err := client.GetIndices(context.Background(), "test-*")
++	elapsed := time.Since(start)
++	if err == nil {
++		_ = res.Body.Close()
++		t.Fatal("expected the call to fail once its deadline passed, not to run the retries out")
++	}
++	if elapsed > 3*perAttempt {
++		t.Errorf("the call took %s, which is more than one attempt plus its deadline: the series is unbounded", elapsed)
++	}
++}
diff --git a/packages/system/opensearch-operator/images/opensearch-operator/patches/trace-stalled-component-reconcilers.diff b/packages/system/opensearch-operator/images/opensearch-operator/patches/trace-stalled-component-reconcilers.diff
new file mode 100644
index 0000000000..3e83429964
--- /dev/null
+++ b/packages/system/opensearch-operator/images/opensearch-operator/patches/trace-stalled-component-reconcilers.diff
@@ -0,0 +1,307 @@
+diff --git a/opensearch-operator/controllers/opensearchController.go b/opensearch-operator/controllers/opensearchController.go
+index 6bf9f9c..5ef3e39 100644
+--- a/opensearch-operator/controllers/opensearchController.go
++++ b/opensearch-operator/controllers/opensearchController.go
+@@ -201,6 +201,10 @@ func (r *OpenSearchClusterReconciler) deleteExternalResources(ctx context.Contex
+ 		r.Instance,
+ 	)
+ 
++	// Not wrapped: every DeleteResources at this version returns immediately
++	// (tls.go:578, securityconfig.go:254, configuration.go:182, cluster.go:384,
++	// dashboards.go:188), so a watchdog here could only ever spawn goroutines
++	// for a call that cannot block.
+ 	componentReconcilers := []reconcilers.ComponentReconciler{
+ 		tls.DeleteResources,
+ 		securityconfig.DeleteResources,
+@@ -234,6 +238,15 @@ func (r *OpenSearchClusterReconciler) reconcilePhasePending(ctx context.Context)
+ 	return ctrl.Result{Requeue: true}, nil
+ }
+ 
++// A pass through the components takes seconds on a healthy cluster: the
++// controller requeues itself every 30s, and on the e2e runs that prompted this
++// the reconciles of a settled cluster came about 10s apart, driven by watch
++// events on top of that requeue. A minute is past anything normal and still
++// early enough to name a stall while whoever is watching is still watching,
++// and it is both how long a call may run before it is reported and how often
++// the report then repeats.
++const componentStallReportEvery = time.Minute
++
+ func (r *OpenSearchClusterReconciler) reconcilePhaseRunning(ctx context.Context) (ctrl.Result, error) {
+ 	// Update initialized status first
+ 	if !r.Instance.Status.Initialized {
+@@ -313,16 +326,19 @@ func (r *OpenSearchClusterReconciler) reconcilePhaseRunning(ctx context.Context)
+ 		r.Instance,
+ 	)
+ 
++	// Wrapped so a component that stops returning is named in the log. Without
++	// it the loop goes quiet mid-pass and the object is left unreconciled with
++	// nothing written about it.
+ 	componentReconcilers := []reconcilers.ComponentReconciler{
+-		tls.Reconcile,
+-		securityconfig.Reconcile,
+-		config.Reconcile,
+-		cluster.Reconcile,
+-		scaler.Reconcile,
+-		dashboards.Reconcile,
+-		upgrade.Reconcile,
+-		restart.Reconcile,
+-		snapshotrepository.Reconcile,
++		reconcilers.WithStallWatchdog(r.Logger, "tls", componentStallReportEvery, componentStallReportEvery, tls.Reconcile),
++		reconcilers.WithStallWatchdog(r.Logger, "securityconfig", componentStallReportEvery, componentStallReportEvery, securityconfig.Reconcile),
++		reconcilers.WithStallWatchdog(r.Logger, "config", componentStallReportEvery, componentStallReportEvery, config.Reconcile),
++		reconcilers.WithStallWatchdog(r.Logger, "cluster", componentStallReportEvery, componentStallReportEvery, cluster.Reconcile),
++		reconcilers.WithStallWatchdog(r.Logger, "scaler", componentStallReportEvery, componentStallReportEvery, scaler.Reconcile),
++		reconcilers.WithStallWatchdog(r.Logger, "dashboards", componentStallReportEvery, componentStallReportEvery, dashboards.Reconcile),
++		reconcilers.WithStallWatchdog(r.Logger, "upgrade", componentStallReportEvery, componentStallReportEvery, upgrade.Reconcile),
++		reconcilers.WithStallWatchdog(r.Logger, "restart", componentStallReportEvery, componentStallReportEvery, restart.Reconcile),
++		reconcilers.WithStallWatchdog(r.Logger, "snapshotrepository", componentStallReportEvery, componentStallReportEvery, snapshotrepository.Reconcile),
+ 	}
+ 	for _, rec := range componentReconcilers {
+ 		result, err := rec()
+diff --git a/opensearch-operator/pkg/reconcilers/stallwatchdog.go b/opensearch-operator/pkg/reconcilers/stallwatchdog.go
+new file mode 100644
+index 0000000..75e2e49
+--- /dev/null
++++ b/opensearch-operator/pkg/reconcilers/stallwatchdog.go
+@@ -0,0 +1,75 @@
++package reconcilers
++
++import (
++	"time"
++
++	"github.com/go-logr/logr"
++	"sigs.k8s.io/controller-runtime/pkg/reconcile"
++)
++
++// WithStallWatchdog wraps a component reconciler so a call that stops returning
++// keeps saying so, under the name of the component it is stuck in.
++//
++// None of the components the cluster controller runs in sequence logs
++// unconditionally when it is entered. The TLS one has a line above its work,
++// but it sits on the early return for a cluster with no security section, which
++// the chart in this repository never produces, and the rolling restart one
++// opens at V(1), off at the verbosity the operator ships with. So a call that
++// never comes back leaves nothing behind at all: the last line in the operator
++// log stays whatever was written before the stall, the object stops being
++// reconciled, and the two look identical from the outside. Logging every entry
++// instead would put nine lines per cluster into the log every reconcile, so
++// nothing is written while a component behaves.
++//
++// The report repeats rather than firing once, so a log read at any point during
++// a stall says which component is in flight and for how long. A single line
++// dated at the start of the stall does not answer the question a reader has
++// five minutes in, which is whether the call is still there.
++func WithStallWatchdog(logger logr.Logger, name string, warnAfter, repeatEvery time.Duration, rec ComponentReconciler) ComponentReconciler {
++	return func() (reconcile.Result, error) {
++		done := make(chan struct{})
++		defer close(done)
++
++		// Taken here rather than inside the goroutine: on a host loaded enough to
++		// be worth a stall report, the two differ by however long the scheduler
++		// took, which is measured into the one number the report carries.
++		started := time.Now()
++
++		go func() {
++			timer := time.NewTimer(warnAfter)
++			defer timer.Stop()
++			select {
++			case <-done:
++				return
++			case <-timer.C:
++			}
++
++			ticker := time.NewTicker(repeatEvery)
++			defer ticker.Stop()
++			for {
++				// Narrows the window on a false report, does not close it: a
++				// tick landing on the return would otherwise write its line
++				// half the time, because a select with both cases ready picks
++				// at random. A preemption between this check and the write
++				// still gets one line out.
++				select {
++				case <-done:
++					return
++				default:
++				}
++
++				logger.Info("component reconciler has not returned",
++					"component", name,
++					"elapsed", time.Since(started).String())
++
++				select {
++				case <-done:
++					return
++				case <-ticker.C:
++				}
++			}
++		}()
++
++		return rec()
++	}
++}
+diff --git a/opensearch-operator/pkg/reconcilers/stallwatchdog_test.go b/opensearch-operator/pkg/reconcilers/stallwatchdog_test.go
+new file mode 100644
+index 0000000..0092f4e
+--- /dev/null
++++ b/opensearch-operator/pkg/reconcilers/stallwatchdog_test.go
+@@ -0,0 +1,160 @@
++package reconcilers
++
++import (
++	"errors"
++	"regexp"
++	"sync"
++	"time"
++
++	"github.com/go-logr/logr/funcr"
++	. "github.com/onsi/ginkgo/v2"
++	. "github.com/onsi/gomega"
++	"sigs.k8s.io/controller-runtime/pkg/reconcile"
++)
++
++type recordingSink struct {
++	mu    sync.Mutex
++	lines []string
++}
++
++func (r *recordingSink) write(prefix, args string) {
++	r.mu.Lock()
++	defer r.mu.Unlock()
++	r.lines = append(r.lines, prefix+args)
++}
++
++func (r *recordingSink) snapshot() []string {
++	r.mu.Lock()
++	defer r.mu.Unlock()
++	out := make([]string, len(r.lines))
++	copy(out, r.lines)
++	return out
++}
++
++var errStallWatchdogTest = errors.New("component failed")
++
++var elapsedPattern = regexp.MustCompile(`"elapsed"="([^"]+)"`)
++
++var _ = Describe("component reconciler stall watchdog", func() {
++	var sink *recordingSink
++
++	BeforeEach(func() {
++		sink = &recordingSink{}
++	})
++
++	It("passes the wrapped result and error through untouched", func() {
++		want := reconcile.Result{Requeue: true, RequeueAfter: 7 * time.Second}
++		wrapped := WithStallWatchdog(funcr.New(sink.write, funcr.Options{}), "cluster", time.Hour, time.Hour, func() (reconcile.Result, error) {
++			return want, errStallWatchdogTest
++		})
++
++		got, err := wrapped()
++
++		Expect(got).To(Equal(want))
++		Expect(err).To(MatchError(errStallWatchdogTest))
++	})
++
++	It("stays silent while the component returns promptly", func() {
++		// The call takes long enough for a watchdog that ignored warnAfter to
++		// get its report out, and warnAfter is far enough away that a loaded CI
++		// host cannot reach it: what is pinned is the threshold, not the speed
++		// of the scheduler.
++		wrapped := WithStallWatchdog(funcr.New(sink.write, funcr.Options{}), "cluster", 10*time.Second, 10*time.Second, func() (reconcile.Result, error) {
++			time.Sleep(150 * time.Millisecond)
++			return reconcile.Result{}, nil
++		})
++
++		_, err := wrapped()
++		Expect(err).ToNot(HaveOccurred())
++
++		Consistently(sink.snapshot, 200*time.Millisecond, 20*time.Millisecond).Should(BeEmpty())
++	})
++
++	It("drops the watchdog when the call returns before the threshold", func() {
++		wrapped := WithStallWatchdog(funcr.New(sink.write, funcr.Options{}), "cluster", 120*time.Millisecond, 120*time.Millisecond, func() (reconcile.Result, error) {
++			return reconcile.Result{}, nil
++		})
++
++		_, err := wrapped()
++		Expect(err).ToNot(HaveOccurred())
++
++		// Well past the threshold: a watchdog that does not notice the call
++		// returned would report here, once per wrapped call on every reconcile
++		// of every cluster, which is the cost this design claims not to have.
++		Consistently(sink.snapshot, 400*time.Millisecond, 40*time.Millisecond).Should(BeEmpty())
++	})
++
++	It("keeps reporting while the call stays blocked", func() {
++		release := make(chan struct{})
++		returned := make(chan struct{})
++		wrapped := WithStallWatchdog(funcr.New(sink.write, funcr.Options{}), "restart", 10*time.Millisecond, 10*time.Millisecond, func() (reconcile.Result, error) {
++			<-release
++			return reconcile.Result{}, nil
++		})
++
++		go func() {
++			defer GinkgoRecover()
++			defer close(returned)
++			_, err := wrapped()
++			Expect(err).ToNot(HaveOccurred())
++		}()
++
++		// A single report would satisfy the spec above and say nothing about
++		// whether the call is still in flight by the time anyone reads the
++		// log: what a reader needs is a line dated now, not one dated at the
++		// moment the stall began.
++		Eventually(func() int { return len(sink.snapshot()) }).Should(BeNumerically(">=", 3))
++
++		// The report carries how long the call has been in flight, and that
++		// number has to move: a frozen or zero elapsed says nothing about
++		// whether the stall started a second or an hour ago. One snapshot
++		// feeds both halves of the assertion, since the ticker appends
++		// between two reads and they then disagree on the count.
++		lines := sink.snapshot()
++		var elapsed []string
++		for _, line := range lines {
++			if m := elapsedPattern.FindStringSubmatch(line); m != nil {
++				elapsed = append(elapsed, m[1])
++			}
++		}
++		Expect(elapsed).To(HaveLen(len(lines)))
++		Expect(elapsed[0]).ToNot(Equal("0s"))
++		Expect(elapsed[1]).ToNot(Equal(elapsed[0]))
++
++		close(release)
++		Eventually(returned).Should(BeClosed())
++	})
++
++	It("names the component while its call is still in flight", func() {
++		release := make(chan struct{})
++		returned := make(chan struct{})
++		wrapped := WithStallWatchdog(funcr.New(sink.write, funcr.Options{}), "securityconfig", 10*time.Millisecond, 10*time.Millisecond, func() (reconcile.Result, error) {
++			<-release
++			return reconcile.Result{}, nil
++		})
++
++		go func() {
++			defer GinkgoRecover()
++			defer close(returned)
++			_, err := wrapped()
++			Expect(err).ToNot(HaveOccurred())
++		}()
++
++		Eventually(sink.snapshot).Should(ContainElement(ContainSubstring("securityconfig")))
++
++		close(release)
++		Eventually(returned).Should(BeClosed())
++
++		// The goroutine has to stop with the call, or every stalled reconcile
++		// leaves one behind writing for the life of the process. A report
++		// already in flight when the call returned is allowed to land, so what
++		// is pinned is that the count settles at all rather than the moment it
++		// does: a goroutine still running adds a line every interval and never
++		// lets two readings five intervals apart agree.
++		Eventually(func() bool {
++			before := len(sink.snapshot())
++			time.Sleep(50 * time.Millisecond)
++			return len(sink.snapshot()) == before
++		}, 2*time.Second, 10*time.Millisecond).Should(BeTrue())
++	})
++})
diff --git a/packages/system/opensearch-operator/patches/leaderElection.diff b/packages/system/opensearch-operator/patches/leaderElection.diff
new file mode 100644
index 0000000000..2d66511c5c
--- /dev/null
+++ b/packages/system/opensearch-operator/patches/leaderElection.diff
@@ -0,0 +1,40 @@
+diff --git a/charts/opensearch-operator/templates/opensearch-operator-controller-manager-deployment.yaml b/charts/opensearch-operator/templates/opensearch-operator-controller-manager-deployment.yaml
+--- a/charts/opensearch-operator/templates/opensearch-operator-controller-manager-deployment.yaml
++++ b/charts/opensearch-operator/templates/opensearch-operator-controller-manager-deployment.yaml
+@@ -5,7 +5,25 @@ metadata:
+     control-plane: controller-manager
+   name: {{ include "opensearch-operator.fullname" . }}-controller-manager
+ spec:
+-  replicas: 1
++  replicas: {{ .Values.manager.replicaCount | default 1 }}
++  {{- if le (int (.Values.manager.replicaCount | default 1)) 1 }}
++  # Leader election is gated off on a single replica, so a rollout should not run two
++  # managers side by side. maxSurge: 0 caps total pods at replicas, so the old manager is
++  # scaled down before the new one is scaled up (maxUnavailable: 1 permits the gap),
++  # unlike the default 25% surge which starts a second manager while the first is fully
++  # live. This is not Recreate's exclusivity: the old manager may still be draining
++  # in-flight reconciles (up to terminationGracePeriodSeconds) as the new one starts.
++  # Recreate cannot be used here: under server-side apply (helm-controller's default) the
++  # apiserver-defaulted rollingUpdate block on an existing Deployment is not owned by the
++  # helm-controller field manager, so switching type to Recreate does not clear it and the
++  # merged object is rejected as invalid ("spec.strategy.rollingUpdate: Forbidden").
++  # Multi-replica installs keep the default (25%) with leader election on.
++  strategy:
++    type: RollingUpdate
++    rollingUpdate:
++      maxSurge: 0
++      maxUnavailable: 1
++  {{- end }}
+   selector:
+     matchLabels:
+       control-plane: controller-manager
+@@ -49,7 +67,9 @@ spec:
+       - args:
+         - --health-probe-bind-address=:8081
+         - --metrics-bind-address=127.0.0.1:8080
++        {{- if gt (int (.Values.manager.replicaCount | default 1)) 1 }}
+         - --leader-elect
++        {{- end }}
+         {{- if .Values.manager.watchNamespace }}
+         - --watch-namespace={{ .Values.manager.watchNamespace }}
+         {{- end }}
diff --git a/packages/system/opensearch-operator/templates/sysctl-daemonset.yaml b/packages/system/opensearch-operator/templates/sysctl-daemonset.yaml
new file mode 100644
index 0000000000..22ec8fcb44
--- /dev/null
+++ b/packages/system/opensearch-operator/templates/sysctl-daemonset.yaml
@@ -0,0 +1,96 @@
+{{- /*
+OpenSearch refuses to start when vm.max_map_count is below 262144 and the store
+may use mmap; the kernel default is 65530 and nothing in the platform's node
+configuration raises it.
+
+It cannot be raised from the OpenSearch pod itself. The kernel does not
+namespace vm.*, so kubelet rejects it both in a pod's securityContext.sysctls
+and in --allowed-unsafe-sysctls, which admits namespaced sysctls only. The
+operator's own answer, spec.general.setVMMaxMapCount, appends a privileged
+init container to every OpenSearch pod. Tenant namespaces carry no PodSecurity
+label of their own, so they take the cluster default, which Talos ships as
+baseline through the apiserver's PodSecurityConfiguration; that default rejects
+the container outright (cozystack/cozystack#4131).
+
+This DaemonSet carries the value instead, from a namespace the platform labels
+enforce=privileged, and it is the only carrier: the app chart sets
+spec.general.setVMMaxMapCount to false, so no OpenSearch pod asks the operator
+for the sysctl.
+
+system-node-critical buys scheduling priority, not start ordering: on a freshly
+joined node an OpenSearch pod can still start before this one has written the
+value, fail its own bootstrap check, and retry until the value is in.
+
+The write goes to /proc/sys and nowhere else. The pod restarts with the node
+and reapplies the value, so persisting it into the host's own configuration
+would buy nothing and would mutate a node this chart does not own.
+*/}}
+apiVersion: apps/v1
+kind: DaemonSet
+metadata:
+  name: {{ .Release.Name }}-sysctl
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: {{ .Release.Name }}-sysctl
+    app.kubernetes.io/component: sysctl
+spec:
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: {{ .Release.Name }}-sysctl
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/name: {{ .Release.Name }}-sysctl
+    spec:
+      priorityClassName: system-node-critical
+      automountServiceAccountToken: false
+      initContainers:
+      - name: init-sysctl
+        image: {{ .Values.sysctl.image | quote }}
+        # A floor, not an assignment. vm.max_map_count is node-global, so a node
+        # already tuned above 262144 for some other mmap-heavy workload must keep
+        # its value; writing it unconditionally would lower the limit for
+        # everything on that node, on every boot.
+        command:
+        - sh
+        - -c
+        - 'set -e; current=$(sysctl -n vm.max_map_count); if [ "$current" -lt 262144 ]; then sysctl -w vm.max_map_count=262144; fi'
+        securityContext:
+          privileged: true
+        resources:
+          requests:
+            cpu: 1m
+            memory: 4Mi
+          limits:
+            memory: 16Mi
+      containers:
+      # Carries no work: it exists so the pod stays scheduled, because a
+      # DaemonSet pod that ran only an init container would complete and be
+      # restarted continuously.
+      #
+      # Do not simplify this back to a bare sleep. The kernel delivers a signal
+      # to PID 1 of a namespace only when PID 1 installed a handler for it, and
+      # busybox sleep installs none, so a bare sleep ignores SIGTERM and every
+      # pod is SIGKILLed after the full grace period on each rollout and drain.
+      # The shell installs the handler, and wait returns when it fires.
+      - name: idle
+        image: {{ .Values.sysctl.image | quote }}
+        command: ["sh", "-c", "trap 'exit 0' TERM INT; sleep infinity & wait"]
+        securityContext:
+          allowPrivilegeEscalation: false
+          readOnlyRootFilesystem: true
+          runAsNonRoot: true
+          runAsUser: 65534
+          capabilities:
+            drop: ["ALL"]
+        resources:
+          requests:
+            cpu: 1m
+            memory: 4Mi
+          limits:
+            memory: 16Mi
+      tolerations:
+      - operator: Exists
+        effect: NoSchedule
+      - operator: Exists
+        effect: NoExecute
diff --git a/packages/system/opensearch-operator/tests/dns_base_test.yaml b/packages/system/opensearch-operator/tests/dns_base_test.yaml
new file mode 100644
index 0000000000..0b2c758fc7
--- /dev/null
+++ b/packages/system/opensearch-operator/tests/dns_base_test.yaml
@@ -0,0 +1,40 @@
+suite: opensearch-operator DNS base follows the value set on the umbrella key
+
+release:
+  name: opensearch-operator
+  namespace: cozy-opensearch-operator
+
+# The platform carries the cluster domain to this package under the subchart key
+# in the shared values Secret (packages/core/platform/templates/apps.yaml). The
+# vendored chart reads it as manager.dnsBase and hands it to the manager as
+# DNS_BASE, from which the operator builds the securityconfig job target, its own
+# OpenSearch API client URL, the Dashboards host and the SANs it writes into node
+# certificates. Rendered without the Secret the package stays on the upstream
+# cluster.local default.
+
+tests:
+  - it: passes the domain set on the umbrella key through to the manager env
+    set:
+      opensearch-operator.manager.dnsBase: example.test
+    template: charts/opensearch-operator/templates/opensearch-operator-controller-manager-deployment.yaml
+    documentSelector:
+      path: kind
+      value: Deployment
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[1].env
+          content:
+            name: DNS_BASE
+            value: example.test
+
+  - it: keeps the upstream default when the platform sets nothing
+    template: charts/opensearch-operator/templates/opensearch-operator-controller-manager-deployment.yaml
+    documentSelector:
+      path: kind
+      value: Deployment
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[1].env
+          content:
+            name: DNS_BASE
+            value: cluster.local
diff --git a/packages/system/opensearch-operator/tests/leader_election_test.yaml b/packages/system/opensearch-operator/tests/leader_election_test.yaml
new file mode 100644
index 0000000000..3fc647f575
--- /dev/null
+++ b/packages/system/opensearch-operator/tests/leader_election_test.yaml
@@ -0,0 +1,66 @@
+suite: opensearch-operator leader election is gated on replica count
+
+# The operator Deployment ships a single replica. Leader election on one replica
+# adds no HA value but lets a transient apiserver/etcd lease-renewal blip make the
+# manager self-terminate (controller-runtime os.Exit on "leader election lost"),
+# which surfaces at install time as a crashlooping Deployment marked Failed.
+# Gate --leader-elect on replica count: off for the default single replica, back
+# on automatically when an operator scales to more than one replica for real HA.
+release:
+  name: opensearch-operator
+  namespace: cozy-opensearch-operator
+tests:
+  - it: default single-replica install drops --leader-elect from the manager
+    template: charts/opensearch-operator/templates/opensearch-operator-controller-manager-deployment.yaml
+    documentSelector:
+      path: kind
+      value: Deployment
+    asserts:
+      - equal:
+          path: spec.replicas
+          value: 1
+      # Guard container ordering: kube-rbac-proxy is [0], manager is [1].
+      - equal:
+          path: spec.template.spec.containers[1].name
+          value: operator-controller-manager
+      - notContains:
+          path: spec.template.spec.containers[1].args
+          content: --leader-elect
+      # maxSurge: 0 caps total pods at replicas, so the old manager is scaled down before
+      # the new one is scaled up, rather than the default 25% surge starting a second
+      # manager while the first is fully live. type stays RollingUpdate because under
+      # server-side apply a switch to Recreate does not clear the apiserver-defaulted
+      # rollingUpdate block on an existing Deployment, and the merged object is invalid.
+      - equal:
+          path: spec.strategy.type
+          value: RollingUpdate
+      - equal:
+          path: spec.strategy.rollingUpdate.maxSurge
+          value: 0
+      - equal:
+          path: spec.strategy.rollingUpdate.maxUnavailable
+          value: 1
+
+  - it: scaling past one replica re-enables --leader-elect for real HA
+    template: charts/opensearch-operator/templates/opensearch-operator-controller-manager-deployment.yaml
+    documentSelector:
+      path: kind
+      value: Deployment
+    set:
+      opensearch-operator:
+        manager:
+          replicaCount: 2
+    asserts:
+      - equal:
+          path: spec.replicas
+          value: 2
+      - equal:
+          path: spec.template.spec.containers[1].name
+          value: operator-controller-manager
+      - contains:
+          path: spec.template.spec.containers[1].args
+          content: --leader-elect
+      # Multi-replica installs keep the default RollingUpdate (no explicit
+      # strategy) so rollouts stay available.
+      - notExists:
+          path: spec.strategy
diff --git a/packages/system/opensearch-operator/tests/sysctl_daemonset_test.yaml b/packages/system/opensearch-operator/tests/sysctl_daemonset_test.yaml
new file mode 100644
index 0000000000..abee8b201b
--- /dev/null
+++ b/packages/system/opensearch-operator/tests/sysctl_daemonset_test.yaml
@@ -0,0 +1,102 @@
+suite: opensearch-operator raises vm.max_map_count per node
+
+# OpenSearch will not start below vm.max_map_count=262144 and the sysctl is not
+# namespaced, so no pod can set it for itself. This DaemonSet is the platform's
+# carrier for it, which is why its shape is the contract: privileged init, that
+# exact sysctl, and nothing mounted from the host.
+release:
+  name: opensearch-operator
+  namespace: cozy-opensearch-operator
+tests:
+  # The command is pinned whole because both halves of it are the contract: the
+  # threshold OpenSearch needs, and the comparison that makes it a floor. Writing
+  # the value unconditionally would lower vm.max_map_count on any node already
+  # tuned above it, node-wide, on every boot.
+  - it: raises the sysctl to a floor from a privileged init container
+    template: templates/sysctl-daemonset.yaml
+    asserts:
+      - equal:
+          path: kind
+          value: DaemonSet
+      - equal:
+          path: spec.template.spec.initContainers[0].name
+          value: init-sysctl
+      - equal:
+          path: spec.template.spec.initContainers[0].command
+          value:
+            - sh
+            - -c
+            - 'set -e; current=$(sysctl -n vm.max_map_count); if [ "$current" -lt 262144 ]; then sysctl -w vm.max_map_count=262144; fi'
+      - equal:
+          path: spec.template.spec.initContainers[0].securityContext.privileged
+          value: true
+
+  - it: keeps the privilege in the init container only
+    template: templates/sysctl-daemonset.yaml
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].name
+          value: idle
+      # The trap is the contract, not decoration. PID 1 of a namespace receives
+      # only the signals it installed a handler for, so a bare sleep here ignores
+      # SIGTERM and every pod is SIGKILLed after the full grace period on each
+      # rollout and node drain.
+      - equal:
+          path: spec.template.spec.containers[0].command
+          value: ["sh", "-c", "trap 'exit 0' TERM INT; sleep infinity & wait"]
+      - notExists:
+          path: spec.template.spec.containers[0].securityContext.privileged
+      - equal:
+          path: spec.template.spec.containers[0].securityContext.allowPrivilegeEscalation
+          value: false
+      - equal:
+          path: spec.template.spec.containers[0].securityContext.capabilities.drop
+          value: ["ALL"]
+
+  # Nothing may reach the host filesystem: the write belongs in /proc/sys and
+  # the pod reapplies it on every node restart.
+  - it: touches no host path
+    template: templates/sysctl-daemonset.yaml
+    asserts:
+      - notExists:
+          path: spec.template.spec.volumes
+      - notExists:
+          path: spec.template.spec.initContainers[0].volumeMounts
+      - notExists:
+          path: spec.template.spec.containers[0].volumeMounts
+      - equal:
+          path: spec.template.spec.automountServiceAccountToken
+          value: false
+      - equal:
+          path: spec.template.spec.priorityClassName
+          value: system-node-critical
+
+  - it: lands on tainted nodes and pins the image by digest
+    template: templates/sysctl-daemonset.yaml
+    asserts:
+      - contains:
+          path: spec.template.spec.tolerations
+          content:
+            operator: Exists
+            effect: NoSchedule
+      - contains:
+          path: spec.template.spec.tolerations
+          content:
+            operator: Exists
+            effect: NoExecute
+      - matchRegex:
+          path: spec.template.spec.initContainers[0].image
+          pattern: '^docker\.io/library/busybox:[^@]+@sha256:[0-9a-f]{64}$'
+
+  - it: takes the image override for an air-gapped registry
+    template: templates/sysctl-daemonset.yaml
+    set:
+      sysctl:
+        image: registry.example.test/library/busybox:1.37.0@sha256:0000000000000000000000000000000000000000000000000000000000000000
+    asserts:
+      - equal:
+          path: spec.template.spec.initContainers[0].image
+          value: registry.example.test/library/busybox:1.37.0@sha256:0000000000000000000000000000000000000000000000000000000000000000
+      - equal:
+          path: spec.template.spec.containers[0].image
+          value: registry.example.test/library/busybox:1.37.0@sha256:0000000000000000000000000000000000000000000000000000000000000000
diff --git a/packages/system/opensearch-operator/values.yaml b/packages/system/opensearch-operator/values.yaml
index 137a7f5b35..b3b835bc96 100644
--- a/packages/system/opensearch-operator/values.yaml
+++ b/packages/system/opensearch-operator/values.yaml
@@ -1,8 +1,30 @@
 opensearch-operator:
   manager:
+    # Number of operator replicas. Leader election is enabled automatically only
+    # when this is greater than 1. On a single replica leader election adds no HA
+    # value but lets a transient apiserver/etcd lease-renewal blip self-terminate
+    # the manager (controller-runtime exits on "leader election lost"), which
+    # surfaces at install time as a crashlooping, Failed Deployment.
+    replicaCount: 1
     # Enable cluster-wide mode to watch all namespaces
     watchNamespace: ""
+    # Built in-tree from images/opensearch-operator, which carries the patches
+    # under its patches/ directory. Without this block the vendored chart
+    # falls back to opensearchproject/opensearch-operator at the chart's
+    # appVersion, which is the unpatched upstream build, and the reference stays
+    # outside the first-party set hack/lib/image-refs.sh collects for promote,
+    # retag and mirror. `make image` rewrites both keys on every build.
+    image:
+      repository: ghcr.io/cozystack/cozystack/opensearch-operator
+      tag: v2.8.0@sha256:cbe6b50f13aa5abf338209d38dfcd80e73296e97510465b5fca73a0130bfaad7
   kubeRbacProxy:
     image:
       # gcr.io/kubebuilder/kube-rbac-proxy was sunset; use the original upstream
       repository: "quay.io/brancz/kube-rbac-proxy"
+
+sysctl:
+  # busybox carries the sysctl applet and doubles as the idle main container.
+  # Third-party pass-through pinned by digest, the same reference the kubernetes
+  # package vendors; docs/agents/image-refs.md covers why such a ref is neither
+  # retagged nor mirrored.
+  image: docker.io/library/busybox:1.37.0@sha256:1487d0af5f52b4ba31c7e465126ee2123fe3f2305d638e7827681e7cf6c83d5e
diff --git a/packages/system/opensearch-rd/cozyrds/opensearch.yaml b/packages/system/opensearch-rd/cozyrds/opensearch.yaml
index 91c8b2382c..b56958ddac 100644
--- a/packages/system/opensearch-rd/cozyrds/opensearch.yaml
+++ b/packages/system/opensearch-rd/cozyrds/opensearch.yaml
@@ -8,7 +8,7 @@ spec:
     singular: opensearch
     plural: opensearches
     openAPISchema: |-
-      {"title":"Chart Values","type":"object","properties":{"replicas":{"description":"Number of OpenSearch nodes in the cluster.","type":"integer","default":3},"resources":{"description":"Explicit CPU and memory configuration for each OpenSearch node. When omitted, the preset defined in `resourcesPreset` is applied.","type":"object","default":{},"properties":{"cpu":{"description":"CPU available to each node.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Memory (RAM) available to each node.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}},"resourcesPreset":{"description":"Default sizing preset used when `resources` is omitted. OpenSearch requires minimum 2Gi memory.","type":"string","default":"c1.medium","enum":["t1.nano","t1.micro","t1.small","t1.medium","t1.large","t1.xlarge","t1.2xlarge","t1.4xlarge","c1.nano","c1.micro","c1.small","c1.medium","c1.large","c1.xlarge","c1.2xlarge","c1.4xlarge","s1.nano","s1.micro","s1.small","s1.medium","s1.large","s1.xlarge","s1.2xlarge","s1.4xlarge","u1.nano","u1.micro","u1.small","u1.medium","u1.large","u1.xlarge","u1.2xlarge","u1.4xlarge","m1.nano","m1.micro","m1.small","m1.medium","m1.large","m1.xlarge","m1.2xlarge","m1.4xlarge","nano","micro","small","medium","large","xlarge","2xlarge"]},"size":{"description":"Persistent Volume Claim size available for application data.","default":"10Gi","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"storageClass":{"description":"StorageClass used to store the data.","type":"string","default":"","x-kubernetes-validations":[{"rule":"self == oldSelf","message":"storageClass is immutable"}]},"external":{"description":"Enable external access from outside the cluster.","type":"boolean","default":false},"topologySpreadPolicy":{"description":"How strictly to enforce pod distribution across nodes and zones.","type":"string","default":"soft","enum":["soft","hard"]},"version":{"description":"OpenSearch major version to deploy.","type":"string","default":"v2","enum":["v3","v2","v1"]},"images":{"description":"Container images used by the operator.","type":"object","default":{},"required":["opensearch"],"properties":{"opensearch":{"description":"OpenSearch image.","type":"string","default":""}}},"nodeRoles":{"description":"Node roles configuration.","type":"object","default":{},"required":["data","ingest","master","ml"],"properties":{"data":{"description":"Enable data role.","type":"boolean","default":true},"ingest":{"description":"Enable ingest role.","type":"boolean","default":true},"master":{"description":"Enable cluster_manager role.","type":"boolean","default":true},"ml":{"description":"Enable machine learning role.","type":"boolean","default":false}}},"users":{"description":"Custom OpenSearch users configuration map.","type":"object","default":{},"additionalProperties":{"type":"object","properties":{"password":{"description":"Password for the user (auto-generated if omitted).","type":"string"},"roles":{"description":"List of OpenSearch roles.","type":"array","items":{"type":"string"}}}}},"dashboards":{"description":"OpenSearch Dashboards configuration.","type":"object","default":{},"required":["enabled","replicas","resourcesPreset"],"properties":{"enabled":{"description":"Enable OpenSearch Dashboards deployment.","type":"boolean","default":false},"replicas":{"description":"Number of Dashboards replicas.","type":"integer","default":1},"resources":{"description":"Explicit CPU and memory configuration for Dashboards.","type":"object","default":{},"properties":{"cpu":{"description":"CPU available to each node.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Memory (RAM) available to each node.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}},"resourcesPreset":{"description":"Default sizing preset for Dashboards.","type":"string","default":"c1.small","enum":["t1.nano","t1.micro","t1.small","t1.medium","t1.large","t1.xlarge","t1.2xlarge","t1.4xlarge","c1.nano","c1.micro","c1.small","c1.medium","c1.large","c1.xlarge","c1.2xlarge","c1.4xlarge","s1.nano","s1.micro","s1.small","s1.medium","s1.large","s1.xlarge","s1.2xlarge","s1.4xlarge","u1.nano","u1.micro","u1.small","u1.medium","u1.large","u1.xlarge","u1.2xlarge","u1.4xlarge","m1.nano","m1.micro","m1.small","m1.medium","m1.large","m1.xlarge","m1.2xlarge","m1.4xlarge","nano","micro","small","medium","large","xlarge","2xlarge"]}}}}}
+      {"title":"Chart Values","type":"object","properties":{"replicas":{"description":"Number of OpenSearch nodes in the cluster.","type":"integer","default":3},"resources":{"description":"Explicit CPU and memory configuration for each OpenSearch node. When omitted, the preset defined in `resourcesPreset` is applied.","type":"object","default":{},"properties":{"cpu":{"description":"CPU available to each node.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Memory (RAM) available to each node.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}},"resourcesPreset":{"description":"Default sizing preset used when `resources` is omitted. OpenSearch requires minimum 2Gi memory.","type":"string","default":"c1.medium","enum":["t1.nano","t1.micro","t1.small","t1.medium","t1.large","t1.xlarge","t1.2xlarge","t1.4xlarge","c1.nano","c1.micro","c1.small","c1.medium","c1.large","c1.xlarge","c1.2xlarge","c1.4xlarge","s1.nano","s1.micro","s1.small","s1.medium","s1.large","s1.xlarge","s1.2xlarge","s1.4xlarge","u1.nano","u1.micro","u1.small","u1.medium","u1.large","u1.xlarge","u1.2xlarge","u1.4xlarge","m1.nano","m1.micro","m1.small","m1.medium","m1.large","m1.xlarge","m1.2xlarge","m1.4xlarge","nano","micro","small","medium","large","xlarge","2xlarge"]},"size":{"description":"Persistent Volume Claim size available for application data.","default":"10Gi","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"storageClass":{"description":"StorageClass used to store the data.","type":"string","default":"","x-kubernetes-validations":[{"rule":"self == oldSelf","message":"storageClass is immutable"}],"x-cozystack-options":{"source":"storageclass"}},"external":{"description":"Enable external access from outside the cluster.","type":"boolean","default":false},"topologySpreadPolicy":{"description":"How strictly to enforce pod distribution across nodes and zones.","type":"string","default":"soft","enum":["soft","hard"]},"version":{"description":"OpenSearch major version to deploy.","type":"string","default":"v2","enum":["v3","v2","v1"]},"tls":{"description":"HTTP-layer TLS configuration. Selects who issues the HTTP server certificate; TLS itself is always served.","type":"object","default":{},"properties":{"issuer":{"description":"Who issues the HTTP server certificate: `operator` uses the CA the opster operator manages itself, `cert-manager` gives the release its own CA, covers the external hostname and publishes a trust anchor the tenant can verify against. Unset follows external: `cert-manager` when it is true, `operator` when it is false. Named for the issuer because TLS is served under both, unlike the similarly-spelled `tls.enabled` in some other charts, which does switch TLS on and off.","type":"string","enum":["operator","cert-manager"]}}},"images":{"description":"Container images used by the operator.","type":"object","default":{},"required":["opensearch"],"properties":{"opensearch":{"description":"OpenSearch image.","type":"string","default":""}}},"nodeRoles":{"description":"Node roles configuration.","type":"object","default":{},"required":["data","ingest","master","ml"],"properties":{"data":{"description":"Enable data role.","type":"boolean","default":true},"ingest":{"description":"Enable ingest role.","type":"boolean","default":true},"master":{"description":"Enable cluster_manager role.","type":"boolean","default":true},"ml":{"description":"Enable machine learning role.","type":"boolean","default":false}}},"users":{"description":"Custom OpenSearch users configuration map.","type":"object","default":{},"additionalProperties":{"type":"object","properties":{"password":{"description":"Password for the user (auto-generated if omitted).","type":"string"},"roles":{"description":"List of OpenSearch roles.","type":"array","items":{"type":"string"}}}}},"dashboards":{"description":"OpenSearch Dashboards configuration.","type":"object","default":{},"required":["enabled","replicas","resourcesPreset"],"properties":{"enabled":{"description":"Enable OpenSearch Dashboards deployment. The application name is then limited to 41 characters, and to 32 when external access is also on, because the Dashboards Service the operator creates would otherwise exceed the 63-character DNS label limit, and the operator stops upgrading and restarting the release for as long as that Service is refused.","type":"boolean","default":false},"replicas":{"description":"Number of Dashboards replicas.","type":"integer","default":1},"resources":{"description":"Explicit CPU and memory configuration for Dashboards.","type":"object","default":{},"properties":{"cpu":{"description":"CPU available to each node.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Memory (RAM) available to each node.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}},"resourcesPreset":{"description":"Default sizing preset for Dashboards.","type":"string","default":"c1.small","enum":["t1.nano","t1.micro","t1.small","t1.medium","t1.large","t1.xlarge","t1.2xlarge","t1.4xlarge","c1.nano","c1.micro","c1.small","c1.medium","c1.large","c1.xlarge","c1.2xlarge","c1.4xlarge","s1.nano","s1.micro","s1.small","s1.medium","s1.large","s1.xlarge","s1.2xlarge","s1.4xlarge","u1.nano","u1.micro","u1.small","u1.medium","u1.large","u1.xlarge","u1.2xlarge","u1.4xlarge","m1.nano","m1.micro","m1.small","m1.medium","m1.large","m1.xlarge","m1.2xlarge","m1.4xlarge","nano","micro","small","medium","large","xlarge","2xlarge"]}}}}}
   release:
     prefix: opensearch-
     labels:
@@ -26,12 +26,19 @@ spec:
       - database
       - search
     icon: PHN2ZyB3aWR0aD0iMTQ0IiBoZWlnaHQ9IjE0NCIgdmlld0JveD0iMCAwIDE0NCAxNDQiIGZpbGw9Im5vbmUiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+CjxyZWN0IHdpZHRoPSIxNDQiIGhlaWdodD0iMTQ0IiByeD0iMjQiIGZpbGw9InVybCgjcGFpbnQwX2xpbmVhcl9vcGVuc2VhcmNoKSIvPgo8cGF0aCBkPSJNNzIgMzZDNDQgMzYgMjggNTIgMjggNzJDMjggOTIgNDQgMTA4IDcyIDEwOEMxMDAgMTA4IDExNiA5MiAxMTYgNzIiIHN0cm9rZT0iIzAwNUVCOCIgc3Ryb2tlLXdpZHRoPSI4IiBzdHJva2UtbGluZWNhcD0icm91bmQiIGZpbGw9Im5vbmUiLz4KPGNpcmNsZSBjeD0iMTE2IiBjeT0iNzIiIHI9IjgiIGZpbGw9IiMwMDVFQjgiLz4KPGRlZnM+CjxsaW5lYXJHcmFkaWVudCBpZD0icGFpbnQwX2xpbmVhcl9vcGVuc2VhcmNoIiB4MT0iMTQwIiB5MT0iMTMwLjUiIHgyPSI0IiB5Mj0iOS40OTk5OSIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiPgo8c3RvcCBzdG9wLWNvbG9yPSIjMDAzQjVDIi8+CjxzdG9wIG9mZnNldD0iMSIgc3RvcC1jb2xvcj0iIzAwNUVCOCIvPgo8L2xpbmVhckdyYWRpZW50Pgo8L2RlZnM+Cjwvc3ZnPgo=
-    keysOrder: [["apiVersion"], ["appVersion"], ["kind"], ["metadata"], ["metadata", "name"], ["spec", "replicas"], ["spec", "resources"], ["spec", "resourcesPreset"], ["spec", "size"], ["spec", "storageClass"], ["spec", "external"], ["spec", "topologySpreadPolicy"], ["spec", "version"], ["spec", "images"], ["spec", "images", "opensearch"], ["spec", "nodeRoles"], ["spec", "nodeRoles", "master"], ["spec", "nodeRoles", "data"], ["spec", "nodeRoles", "ingest"], ["spec", "nodeRoles", "ml"], ["spec", "users"], ["spec", "dashboards"], ["spec", "dashboards", "enabled"], ["spec", "dashboards", "replicas"], ["spec", "dashboards", "resources"], ["spec", "dashboards", "resourcesPreset"]]
+    keysOrder: [["apiVersion"], ["appVersion"], ["kind"], ["metadata"], ["metadata", "name"], ["spec", "replicas"], ["spec", "resources"], ["spec", "resourcesPreset"], ["spec", "size"], ["spec", "storageClass"], ["spec", "external"], ["spec", "topologySpreadPolicy"], ["spec", "version"], ["spec", "tls"], ["spec", "images"], ["spec", "images", "opensearch"], ["spec", "nodeRoles"], ["spec", "nodeRoles", "master"], ["spec", "nodeRoles", "data"], ["spec", "nodeRoles", "ingest"], ["spec", "nodeRoles", "ml"], ["spec", "users"], ["spec", "dashboards"], ["spec", "dashboards", "enabled"], ["spec", "dashboards", "replicas"], ["spec", "dashboards", "resources"], ["spec", "dashboards", "resourcesPreset"]]
   secrets:
     exclude: []
     include:
       - resourceNames:
           - opensearch-{{ .name }}-credentials
+      # The key-free trust anchor the CA-extraction controller publishes. The chart
+      # mints the HTTP CA through cert-manager and names that Secret as the extraction
+      # source in a TenantProjection sentinel, so what this selects is the projection
+      # the controller writes, never the key-bearing source it was lifted from. This
+      # is the engine-agnostic selector every converged engine shares.
+      - matchLabels:
+          internal.cozystack.io/tenant-ca: "true"
   services:
     exclude: []
     include:
diff --git a/packages/system/ouroboros/Makefile b/packages/system/ouroboros/Makefile
index 92b4ad39aa..b07c793d3e 100644
--- a/packages/system/ouroboros/Makefile
+++ b/packages/system/ouroboros/Makefile
@@ -26,8 +26,8 @@ include ../../../hack/package.mk
 # and update both lines below; resolve the new image digest with
 #   crane digest ghcr.io/lexfrei/ouroboros:<new-tag>
 # and update values.yaml.
-OUROBOROS_CHART_VERSION ?= 0.7.2
-OUROBOROS_CHART_DIGEST ?= sha256:c67315551196a766aeb97cee6065083a5f4d78b67ab0377e25257e61d4615a43
+OUROBOROS_CHART_VERSION ?= 0.8.1
+OUROBOROS_CHART_DIGEST ?= sha256:40fd5b639ff73594989856076eab5dfbd0dfab8ee16d1cab915756e24b54458b
 
 test:
 	helm unittest .
@@ -38,6 +38,11 @@ update:
 	# version. A digest mismatch (someone bumped DIGEST without
 	# bumping VERSION, or vice versa) trips the assert and aborts.
 	helm pull oci://ghcr.io/lexfrei/charts/ouroboros@$(OUROBOROS_CHART_DIGEST) --untar --untardir charts
+	# Pulling by digest also leaves an empty directory named after the
+	# digest ref next to the untarred chart. Git ignores empty directories
+	# so it never shows as drift, which is exactly why it lingers
+	# unnoticed; drop it so `make update` leaves the tree clean.
+	rm -rf "charts/ouroboros@$(OUROBOROS_CHART_DIGEST)"
 	@actual_version=$$(awk '/^version:/ {print $$2}' charts/ouroboros/Chart.yaml | tr -d '"'); \
 	if [ "$$actual_version" != "$(OUROBOROS_CHART_VERSION)" ]; then \
 	  echo "ERROR: pulled chart Chart.yaml version=$$actual_version but Makefile OUROBOROS_CHART_VERSION=$(OUROBOROS_CHART_VERSION). Bump both in lockstep."; \
diff --git a/packages/system/ouroboros/charts/ouroboros/Chart.yaml b/packages/system/ouroboros/charts/ouroboros/Chart.yaml
index 5a5a204fa9..7a70fe826d 100644
--- a/packages/system/ouroboros/charts/ouroboros/Chart.yaml
+++ b/packages/system/ouroboros/charts/ouroboros/Chart.yaml
@@ -2,7 +2,7 @@ annotations:
   artifacthub.io/category: networking
   artifacthub.io/license: BSD-3-Clause
 apiVersion: v2
-appVersion: 0.7.2
+appVersion: 0.8.1
 description: In-cluster controller + TCP proxy that fixes hairpin-NAT for Ingress
   controllers behind PROXY-protocol
 home: https://github.com/lexfrei/ouroboros
@@ -22,4 +22,4 @@ name: ouroboros
 sources:
 - https://github.com/lexfrei/ouroboros
 type: application
-version: 0.7.2
+version: 0.8.1
diff --git a/packages/system/ouroboros/charts/ouroboros/templates/controller-deployment.yaml b/packages/system/ouroboros/charts/ouroboros/templates/controller-deployment.yaml
index 5df6dd30a8..7b4593c9fa 100644
--- a/packages/system/ouroboros/charts/ouroboros/templates/controller-deployment.yaml
+++ b/packages/system/ouroboros/charts/ouroboros/templates/controller-deployment.yaml
@@ -13,14 +13,54 @@ metadata:
     {{- include "ouroboros.labels" . | nindent 4 }}
 spec:
   replicas: {{ .Values.controller.replicaCount }}
-  {{- if eq $mode "external-dns" }}
-  # Recreate strategy: external-dns mode has no leader-election, so the
-  # default RollingUpdate (maxSurge=25% rounds to 1 with replicaCount=1)
-  # would briefly run two reconcilers during chart upgrades and produce
-  # the exact Get-Update race the replicaCount > 1 chart-fail prevents.
+  {{- /* The controller has no leader-election in any mode and no serving
+         path (no ports, no probes), so surging a second pod during a
+         rollout buys no availability anywhere. In external-dns mode it
+         actively hurts: that reconciler Updates DNSEndpoints with no
+         conflict retry, so two overlapping reconcilers race on
+         Get->Update. The coredns paths wrap Get->Update in
+         RetryOnConflict and converge instead, which is why only
+         external-dns rejects replicaCount > 1 above — that asymmetry is
+         deliberate, do not extend the guard to coredns. The default
+         maxSurge=25% rounds to 1 on a single replica and keeps the old
+         pod fully live and reconciling until the new one reports Ready.
+
+         maxSurge=0 is deliberately NOT claimed to be Recreate-equivalent
+         exclusivity: the surge budget counts rs.Spec.Replicas (desired),
+         not live pods, so once the old ReplicaSet's desired count hits 0
+         the new pod is created even though the old one may still be
+         Terminating. rolloutRecreate gates scale-up on oldPodsRunning;
+         the rolling path has no equivalent. What maxSurge=0 does
+         guarantee is enough here: the old pod is sent SIGTERM at
+         scale-down, before the new pod is created, and SIGTERM cancels
+         the reconciler context (see signalContext in cmd/ouroboros), so
+         the old reconciler has stopped well before the new pod finishes
+         starting and syncing its caches. Overlapping *reconcile* is what
+         matters, and that window is effectively nil. Nothing is lost by
+         the gap either: CoreDNS keeps serving the last written Corefile,
+         and the controller reconciles from scratch at startup.
+
+         Rendered for every mode on purpose. While this block was gated
+         on external-dns, switching controller.mode on a live release
+         mutated spec.strategy, adding type: Recreate on top of the
+         rollingUpdate block that the apiserver defaults onto any
+         Deployment created without one:
+           spec.strategy.rollingUpdate: Forbidden: may not be specified
+           when strategy `type` is 'Recreate'
+         That rejection fires only under server-side apply, so a
+         `helm upgrade` does not reproduce it — DeploymentSpec.Strategy
+         carries patchStrategy:"retainKeys", so a client-side strategic
+         merge clears rollingUpdate on the way through. Server-side apply
+         has no such retainKeys step and the two fields collide; Flux's
+         helm-controller applies server-side by default. Rendering the
+         same RollingUpdate block in every mode means a mode switch
+         changes no strategy field at all, so the combination cannot
+         arise on any transition. */}}
   strategy:
-    type: Recreate
-  {{- end }}
+    type: RollingUpdate
+    rollingUpdate:
+      maxSurge: 0
+      maxUnavailable: 1
   selector:
     matchLabels:
       {{- include "ouroboros.selectorLabels" . | nindent 6 }}
diff --git a/packages/system/ouroboros/charts/ouroboros/values.yaml b/packages/system/ouroboros/charts/ouroboros/values.yaml
index bc7e8b7624..159bdbe6e6 100644
--- a/packages/system/ouroboros/charts/ouroboros/values.yaml
+++ b/packages/system/ouroboros/charts/ouroboros/values.yaml
@@ -105,9 +105,14 @@ controller:
     # alpine-based kubectl: needs a shell so the wrapper script can run.
     # rancher/kubectl is FROM scratch and StartErrors without /bin/sh.
     # alpine/kubectl is multi-arch and busybox-derived (sh + sed + kubectl).
-    repository: alpine/kubectl
-    # renovate: datasource=docker depName=alpine/kubectl
-    tag: "1.36.0"
+    # Pulled via mirror.gcr.io (Google's read-only mirror for a curated set of
+    # popular Docker Hub images) to sidestep anonymous Docker Hub rate-limits on
+    # shared CI/runner IP ranges. alpine/kubectl is on the mirror's curated
+    # list; very recently cut tags may take a short window to propagate, so a
+    # Renovate-cut bump to a brand-new tag may temporarily render an image
+    # reference that 404s on pull until Google's mirror picks it up.
+    repository: mirror.gcr.io/alpine/kubectl
+    tag: "1.36.1"
     pullPolicy: IfNotPresent
   # -- Informer resync period. Doubles as the worst-case event-to-reconcile
   # latency when the underlying Ingress watch silently dies (kamaji-managed
@@ -230,9 +235,14 @@ externalDns:
     # rancher/kubectl is FROM scratch with no /bin/sh — the wrapper script
     # would StartError immediately. alpine/kubectl is multi-arch and has
     # /bin/sh + kubectl + grep, which is everything the hook needs.
-    repository: alpine/kubectl
-    # renovate: datasource=docker depName=alpine/kubectl
-    tag: "1.36.0"
+    # Pulled via mirror.gcr.io (Google's read-only mirror for a curated set of
+    # popular Docker Hub images) to sidestep anonymous Docker Hub rate-limits on
+    # shared CI/runner IP ranges. alpine/kubectl is on the mirror's curated
+    # list; very recently cut tags may take a short window to propagate, so a
+    # Renovate-cut bump to a brand-new tag may temporarily render an image
+    # reference that 404s on pull until Google's mirror picks it up.
+    repository: mirror.gcr.io/alpine/kubectl
+    tag: "1.36.1"
     pullPolicy: IfNotPresent
 
 # -- Optional /etc/hosts DaemonSet (alt to CoreDNS).
diff --git a/packages/system/ouroboros/tests/controller_test.yaml b/packages/system/ouroboros/tests/controller_test.yaml
index 25fb65b31a..3329cb66ef 100644
--- a/packages/system/ouroboros/tests/controller_test.yaml
+++ b/packages/system/ouroboros/tests/controller_test.yaml
@@ -22,16 +22,32 @@ tests:
       - contains:
           path: spec.template.spec.containers[0].args
           content: --proxy-service-namespace=cozy-ouroboros
-      - notContains:
-          path: spec.template.spec.containers[0].args
-          content: --proxy-fqdn=ouroboros-proxy.cozy-ouroboros.svc.cluster.local.
+      # Match the flag name per element, not one whole element against one
+      # value: contains and notContains compare elements for equality, and the
+      # baked FQDN carries whatever controller.clusterDomain is set to, so an
+      # equality check against the form the default cluster-domain produces
+      # leaves every other value unforbidden.
+      - notMatchRegex:
+          path: spec.template.spec.containers[0].args[*]
+          pattern: "^--proxy-fqdn"
 
   - it: leaves Gateway-API watching off at the parent default (consumer enables)
     template: charts/ouroboros/templates/controller-deployment.yaml
     asserts:
-      - notContains:
-          path: spec.template.spec.containers[0].args
-          content: --gateway-api
+      # Anchor the index before asserting on it. A negative assert passes
+      # whenever its path resolves to something that does not match, and a
+      # different container at [0] qualifies — as does an index resolving to
+      # nothing at all — so without this the guard goes green if a sidecar is
+      # ever placed ahead of the controller.
+      - equal:
+          path: spec.template.spec.containers[0].name
+          value: controller
+      # Match the flag name per element. An equality check against the bare
+      # form the chart renders today would go on passing if it ever rendered
+      # --gateway-api=true, with watching on.
+      - notMatchRegex:
+          path: spec.template.spec.containers[0].args[*]
+          pattern: "^--gateway-api"
 
   - it: emits chart-default --resync=30s — host scenario inherits the upstream chart default (changed from 10m in upstream v0.7.x). The reduction is the controller's only recovery path when an Ingress watch silently dies, and 30s caps worst-case event-to-reconcile latency under broken-watch conditions. Pinning here catches a future upstream bump back to the longer value before it lands as a CI surprise.
     template: charts/ouroboros/templates/controller-deployment.yaml
@@ -47,6 +63,77 @@ tests:
           path: spec.template.spec.containers[0].args
           content: --log-level=info
 
+  # The upstream chart owns this contract and tests it across every mode;
+  # these pins exist because cozystack is the kind of consumer the
+  # contract protects — helm-controller applies server-side, and
+  # server-side apply is the only path on which a mode-gated strategy
+  # breaks. Up to chart 0.8.0 the strategy was rendered only in
+  # external-dns mode, as type: Recreate. Switching a live release into
+  # that mode laid Recreate on top of the rollingUpdate block the
+  # apiserver defaults onto any Deployment created without one, and the
+  # apiserver rejected it with "spec.strategy.rollingUpdate: Forbidden:
+  # may not be specified when strategy `type` is 'Recreate'". A
+  # client-side helm upgrade clears rollingUpdate via retainKeys and
+  # never reproduces it, so no local render catches a regression here.
+  #
+  # cozystack pins coredns on the host and coredns-import for tenants,
+  # and configures external-dns nowhere, so the break is not reachable
+  # from any shipped configuration — this is a latent break and the pins
+  # are defence in depth for a user-settable value. All three modes are
+  # asserted, external-dns included: it is the only mode that ever
+  # rendered Recreate, so a bump that re-gates the block would slip past
+  # a coredns-only suite unnoticed.
+  - it: renders a no-surge RollingUpdate strategy, never Recreate — the mode-switch upgrade path is server-side-apply-only and breaks on any other shape
+    template: charts/ouroboros/templates/controller-deployment.yaml
+    asserts:
+      - equal:
+          path: spec.strategy.type
+          value: RollingUpdate
+      - equal:
+          path: spec.strategy.rollingUpdate.maxSurge
+          value: 0
+      - equal:
+          path: spec.strategy.rollingUpdate.maxUnavailable
+          value: 1
+
+  - it: renders that same strategy in coredns-import mode — the mode tenants actually run
+    template: charts/ouroboros/templates/controller-deployment.yaml
+    set:
+      ouroboros:
+        controller:
+          mode: coredns-import
+    asserts:
+      - equal:
+          path: spec.strategy.type
+          value: RollingUpdate
+      - equal:
+          path: spec.strategy.rollingUpdate.maxSurge
+          value: 0
+      - equal:
+          path: spec.strategy.rollingUpdate.maxUnavailable
+          value: 1
+
+  # The mode that rendered type: Recreate up to 0.8.0, and the only one a
+  # transition into which could trip the rejection. A re-gate that
+  # restored Recreate here while leaving the coredns paths on
+  # RollingUpdate would satisfy every other case in this file.
+  - it: renders that same strategy in external-dns mode — the one mode that previously rendered Recreate
+    template: charts/ouroboros/templates/controller-deployment.yaml
+    set:
+      ouroboros:
+        controller:
+          mode: external-dns
+    asserts:
+      - equal:
+          path: spec.strategy.type
+          value: RollingUpdate
+      - equal:
+          path: spec.strategy.rollingUpdate.maxSurge
+          value: 0
+      - equal:
+          path: spec.strategy.rollingUpdate.maxUnavailable
+          value: 1
+
   - it: writes into the kube-system/coredns Corefile by default (host mode)
     template: charts/ouroboros/templates/controller-deployment.yaml
     asserts:
@@ -80,15 +167,15 @@ tests:
       # too — this is the mode tenants actually run, so a future refactor
       # in the upstream controller-deployment template that drops the
       # composition block from this branch only would break tenants
-      # silently. The negative-assert pins that --proxy-fqdn does NOT
-      # bake the cluster-domain at render time when no clusterDomain is
-      # configured (the platform-agnostic default).
+      # silently. The negative assert pins that no --proxy-fqdn is baked at
+      # render time when no clusterDomain is configured (the
+      # platform-agnostic default).
       - contains:
           path: spec.template.spec.containers[0].args
           content: --proxy-service-name=ouroboros-proxy
       - contains:
           path: spec.template.spec.containers[0].args
           content: --proxy-service-namespace=cozy-ouroboros
-      - notContains:
-          path: spec.template.spec.containers[0].args
-          content: --proxy-fqdn=ouroboros-proxy.cozy-ouroboros.svc.cluster.local.
+      - notMatchRegex:
+          path: spec.template.spec.containers[0].args[*]
+          pattern: "^--proxy-fqdn"
diff --git a/packages/system/ouroboros/tests/cozystack_overrides_test.yaml b/packages/system/ouroboros/tests/cozystack_overrides_test.yaml
index 5fcf79dec1..f90f23858c 100644
--- a/packages/system/ouroboros/tests/cozystack_overrides_test.yaml
+++ b/packages/system/ouroboros/tests/cozystack_overrides_test.yaml
@@ -27,9 +27,15 @@ tests:
       - contains:
           path: spec.template.spec.containers[0].args
           content: --target-service-namespace=cozy-ingress-nginx
-      - notContains:
-          path: spec.template.spec.containers[0].args
-          content: --target-host=
+      # Match the flag name per element, not one whole element against one
+      # value: contains and notContains compare elements for equality, so
+      # `--target-host=` never equals a rendered `--target-host=<value>` and
+      # that negative could not fail. A length assertion would not do either,
+      # since an upstream bump that adds the flag while consolidating another
+      # argument keeps the count.
+      - notMatchRegex:
+          path: spec.template.spec.containers[0].args[*]
+          pattern: "^--target-host"
 
   - it: controller image is pinned to the digest the values.yaml ships
     template: charts/ouroboros/templates/controller-deployment.yaml
@@ -40,4 +46,4 @@ tests:
       # a Makefile bump that forgets to bump the tag (or vice versa).
       - equal:
           path: spec.template.spec.containers[0].image
-          value: ghcr.io/lexfrei/ouroboros:0.7.2@sha256:1a8479b42ed34640752df2bfe0e9ccf052448c6849826c24cab4c30e10d76393
+          value: ghcr.io/lexfrei/ouroboros:0.8.1@sha256:cf285fe6f1eff6ac34e45871d4eef9c2f3ef590d76a6fc272019a9387519891d
diff --git a/packages/system/ouroboros/values.yaml b/packages/system/ouroboros/values.yaml
index 0182d28933..3d72e9eaa4 100644
--- a/packages/system/ouroboros/values.yaml
+++ b/packages/system/ouroboros/values.yaml
@@ -6,7 +6,7 @@ ouroboros:
     # Air-gapped operators must mirror both this image and the OCI chart
     # at oci://ghcr.io/lexfrei/charts/ouroboros separately. Bump the tag
     # here together with OUROBOROS_CHART_VERSION in the Makefile.
-    tag: 0.7.2@sha256:1a8479b42ed34640752df2bfe0e9ccf052448c6849826c24cab4c30e10d76393
+    tag: 0.8.1@sha256:cf285fe6f1eff6ac34e45871d4eef9c2f3ef590d76a6fc272019a9387519891d
   controller:
     # Host scenario default: mutate the live kube-system/coredns Corefile
     # directly. The host CoreDNS on cozystack is Talos-managed and its
@@ -30,14 +30,26 @@ ouroboros:
     # this field for tenants that DO install Gateway-API.
   proxy:
     target:
-      # cozystack deploys ingress-nginx into cozy-ingress-nginx in both
-      # the host control plane and every tenant control plane (the tenant
-      # HelmRelease sets fullnameOverride: ingress-nginx + targetNamespace:
-      # cozy-ingress-nginx). Override the chart-default `ingress-nginx`
-      # namespace; the chart-default serviceName matches as-is. Leaving
-      # `host:` empty (chart-default) tells the proxy to compose the
-      # backend host at runtime as
+      # Tenant-cluster fallback default. A managed Kubernetes tenant
+      # cluster deploys ingress-nginx into cozy-ingress-nginx (its
+      # HelmRelease sets fullnameOverride: ingress-nginx +
+      # targetNamespace: cozy-ingress-nginx), so overriding the
+      # chart-default `ingress-nginx` namespace to cozy-ingress-nginx
+      # matches there; the chart-default serviceName lines up as-is.
+      #
+      # The HOST is different: extra/ingress deploys ingress-nginx into
+      # the root tenant namespace (publishing.ingressName, default
+      # tenant-root) as <short>-ingress-controller (e.g.
+      # root-ingress-controller), NOT cozy-ingress-nginx. The host
+      # platform bundle (core/platform templates/bundles/system.yaml)
+      # therefore overrides proxy.target.{namespace,serviceName} when it
+      # emits cozystack.ouroboros, derived from publishing.ingressName.
+      # This default is never effective on the host once that override
+      # lands.
+      #
+      # Leaving `host:` empty (chart-default) tells the proxy to compose
+      # the backend host at runtime as
       # `<serviceName>.<namespace>.svc.<auto-detected-cluster-domain>`,
-      # which works on cozy.local (cozystack tenants), cluster.local
-      # (kubeadm), or any other domain without operator override.
+      # which works on cozy.local (cozystack), cluster.local (kubeadm),
+      # or any other domain without operator override.
       namespace: cozy-ingress-nginx
diff --git a/packages/system/piraeus-operator/alerts/piraeus-datastore.yaml b/packages/system/piraeus-operator/alerts/piraeus-datastore.yaml
index 0cc39fe875..ab679d663f 100644
--- a/packages/system/piraeus-operator/alerts/piraeus-datastore.yaml
+++ b/packages/system/piraeus-operator/alerts/piraeus-datastore.yaml
@@ -63,7 +63,7 @@ spec:
               Storage pool "{{ $labels.storage_pool }}" on node "{{ $labels.node }}" ({{ $labels.driver }}={{ $labels.backing_pool }}) has less than 20% free space available.
           expr: ( linstor_storage_pool_capacity_free_bytes / linstor_storage_pool_capacity_total_bytes ) < 0.20
           labels:
-            severity: warn
+            severity: warning
     - name: drbd.rules
       rules:
         - alert: drbdReactorOffline
@@ -79,14 +79,14 @@ spec:
               DRBD Resource "{{ $labels.name }}" on "{{ $labels.node }}" is not connected to "{{ $labels.conn_name }}": {{ $labels.drbd_connection_state }}.
           expr: drbd_connection_state{drbd_connection_state!="Connected"} > 0
           labels:
-            severity: warn
+            severity: warning
         - alert: drbdDeviceNotUpToDate
           annotations:
             description: |
               DRBD device "{{ $labels.name }}" on "{{ $labels.node }}" has unexpected device state "{{ $labels.drbd_device_state }}".
           expr: drbd_device_state{drbd_device_state!~"UpToDate|Diskless"} > 0
           labels:
-            severity: warn
+            severity: warning
         - alert: drbdDeviceUnintentionalDiskless
           annotations:
             description: |
@@ -94,7 +94,7 @@ spec:
               This usually indicates IO errors reported on the backing device. Check the kernel log.
           expr: drbd_device_unintentionaldiskless > 0
           labels:
-            severity: warn
+            severity: warning
         - alert: drbdDeviceWithoutQuorum
           annotations:
             description: |
@@ -102,7 +102,7 @@ spec:
               This usually indicates connectivity issues.
           expr: drbd_device_quorum == 0
           labels:
-            severity: warn
+            severity: warning
         - alert: drbdResourceSuspended
           annotations:
             description: |
@@ -110,7 +110,7 @@ spec:
           for: 1m
           expr: drbd_resource_suspended > 0
           labels:
-            severity: warn
+            severity: warning
         - alert: drbdResourceResyncWithoutProgress
           annotations:
             description: |
@@ -118,7 +118,7 @@ spec:
               This may indicate there is no connection to UpToDate data, or a stuck resync.
           expr: drbd_device_state{drbd_device_state="Inconsistent"} and delta(drbd_peerdevice_outofsync_bytes[5m]) >= 0
           labels:
-            severity: warn
+            severity: warning
         - alert: drbdResourceWithNoUpToDateReplicas
           annotations:
             description: |
diff --git a/packages/system/postgres-operator/Makefile b/packages/system/postgres-operator/Makefile
index 5279f8a746..d73deefd95 100644
--- a/packages/system/postgres-operator/Makefile
+++ b/packages/system/postgres-operator/Makefile
@@ -10,5 +10,7 @@ update:
 	rm -rf charts
 	helm repo add cnpg https://cloudnative-pg.github.io/charts
 	helm repo update cnpg
-	helm pull cnpg/cloudnative-pg --untar --untardir charts --version 0.26.1
+	helm pull cnpg/cloudnative-pg --untar --untardir charts --version 0.29.0
 	rm -rf charts/cloudnative-pg/charts
+	helm pull cnpg/plugin-barman-cloud --untar --untardir charts --version 0.7.0
+	rm -rf charts/plugin-barman-cloud/charts
diff --git a/packages/system/postgres-operator/alerts/cnpg-default-alerts.yaml b/packages/system/postgres-operator/alerts/cnpg-default-alerts.yaml
index 9c346e41ac..d35543741c 100644
--- a/packages/system/postgres-operator/alerts/cnpg-default-alerts.yaml
+++ b/packages/system/postgres-operator/alerts/cnpg-default-alerts.yaml
@@ -61,6 +61,26 @@ spec:
         severity: warning
         namespace: "{{ $labels.namespace }}"
         job: "{{ $labels.job }}"
+    # LastFailedArchiveTime resolves on any archive that succeeds, so archiving
+    # that fails intermittently, or runs slower than WAL is written, never keeps
+    # it firing while the backlog grows. A healthy archiver empties the queue
+    # within seconds of each switch; one that has not in 30 minutes is behind.
+    # A recreated pod gets a new instance label and so a new series. Taking the
+    # minimum of every raw series before grouping by pod name keeps the window
+    # across it and counts every scraped zero, which a sampling subquery would
+    # skip; only a pod name newer than 30 minutes is judged on less, and the
+    # hold sets its floor at 10.
+    - alert: CNPGWALArchiveBacklog
+      annotations:
+        description: Pod {{ $labels.pod }} in Namespace {{ $labels.namespace }} has had at least {{ $value }} WAL segments waiting to be archived without the queue emptying once in the last 30 minutes, or since the pod first appeared if that is more recent. Point-in-time recovery stops at the last archived segment, and the waiting segments stay on the Postgres volume until it is full.
+        summary: WAL archiving is not keeping up.
+      expr: |-
+        min by (namespace, job, pod) (min_over_time(cnpg_collector_pg_wal_archive_status{value="ready"}[30m])) > 0
+      for: 10m
+      labels:
+        severity: critical
+        namespace: "{{ $labels.namespace }}"
+        job: "{{ $labels.job }}"
     - alert: DatabaseDeadlockConflicts
       annotations:
         description: There are over 10 deadlock conflicts in Namespace {{ $labels.namespace }} Job {{ $labels.job }} Pod {{ $labels.pod }}
diff --git a/packages/system/postgres-operator/charts/cloudnative-pg/Chart.lock b/packages/system/postgres-operator/charts/cloudnative-pg/Chart.lock
index 610070fb76..ca3548df10 100644
--- a/packages/system/postgres-operator/charts/cloudnative-pg/Chart.lock
+++ b/packages/system/postgres-operator/charts/cloudnative-pg/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: cluster
   repository: https://cloudnative-pg.github.io/grafana-dashboards
-  version: 0.0.2
-digest: sha256:fcf16ad357c17be3dd79c138723e78e9e101fecc5d07d9371299c32b9f85dbd9
-generated: "2024-04-25T12:32:36.61779032-04:00"
+  version: 0.0.5
+digest: sha256:92acaa7742cad61339d69da604eda609e3d5e02f05efa224f5a58f2b845cd2b4
+generated: "2026-01-19T21:05:18.955160552+02:00"
diff --git a/packages/system/postgres-operator/charts/cloudnative-pg/Chart.yaml b/packages/system/postgres-operator/charts/cloudnative-pg/Chart.yaml
index 31e6afd0e2..faf357ee1c 100644
--- a/packages/system/postgres-operator/charts/cloudnative-pg/Chart.yaml
+++ b/packages/system/postgres-operator/charts/cloudnative-pg/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 1.27.1
+appVersion: 1.30.0
 dependencies:
 - alias: monitoring
   condition: monitoring.grafanaDashboard.create
@@ -15,6 +15,7 @@ keywords:
 - postgresql
 - postgres
 - database
+kubeVersion: '>=1.29.0-0'
 maintainers:
 - email: p.scorsolini@gmail.com
   name: phisco
@@ -22,4 +23,4 @@ name: cloudnative-pg
 sources:
 - https://github.com/cloudnative-pg/charts
 type: application
-version: 0.26.1
+version: 0.29.0
diff --git a/packages/system/postgres-operator/charts/cloudnative-pg/README.md b/packages/system/postgres-operator/charts/cloudnative-pg/README.md
index 10a69657ef..232ff0b653 100644
--- a/packages/system/postgres-operator/charts/cloudnative-pg/README.md
+++ b/packages/system/postgres-operator/charts/cloudnative-pg/README.md
@@ -1,16 +1,103 @@
 # cloudnative-pg
 
-![Version: 0.26.1](https://img.shields.io/badge/Version-0.26.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.27.1](https://img.shields.io/badge/AppVersion-1.27.1-informational?style=flat-square)
+![Version: 0.29.0](https://img.shields.io/badge/Version-0.29.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.30.0](https://img.shields.io/badge/AppVersion-1.30.0-informational?style=flat-square)
 
 CloudNativePG Operator Helm Chart
 
 **Homepage:** <https://cloudnative-pg.io>
 
-## Maintainers
+About this chart
+----------------
 
-| Name | Email | Url |
-| ---- | ------ | --- |
-| phisco | <p.scorsolini@gmail.com> |  |
+Helm chart to install the [CloudNativePG operator](https://cloudnative-pg.io), originally created and sponsored
+by [EDB](https://www.enterprisedb.com/) to manage PostgreSQL workloads on any supported Kubernetes cluster
+running in private, public, or hybrid cloud environments.
+
+**NOTE**: this chart supports only the latest point release of the CloudNativePG operator.
+
+The chart installs only the operator (controller manager, webhooks, RBAC and CRDs). To provision a PostgreSQL
+`Cluster` resource, use the companion [`cluster`](https://github.com/cloudnative-pg/charts/tree/main/charts/cluster) chart
+(see the [Cluster chart README](https://github.com/cloudnative-pg/charts/blob/main/charts/cluster/README.md) for details)
+or apply your own `Cluster` manifest.
+
+Getting Started
+---------------
+
+### Add the chart repository
+
+```console
+helm repo add cnpg https://cloudnative-pg.github.io/charts
+helm repo update
+```
+
+### Install the operator
+
+```console
+helm upgrade --install cnpg \
+  --namespace cnpg-system \
+  --create-namespace \
+  cnpg/cloudnative-pg
+```
+
+### Install with custom parameters
+
+You can override individual chart values from the command line with `--set`.
+For example, to enable the Prometheus `PodMonitor`:
+
+```console
+helm upgrade --install cnpg \
+  --namespace cnpg-system \
+  --create-namespace \
+  --set monitoring.podMonitorEnabled=true \
+  cnpg/cloudnative-pg
+```
+
+> **Note**
+> Enabling the `PodMonitor` requires the Prometheus Operator CRDs to be installed in the cluster.
+> Without them the install fails with `no matches for kind "PodMonitor"`.
+
+See the [Values](#values) section below for the full list of configurable parameters.
+
+### Verify the installation
+
+```console
+kubectl -n cnpg-system get deploy
+kubectl -n cnpg-system rollout status deploy/cnpg-cloudnative-pg
+```
+
+Single namespace installation
+-----------------------------
+
+It is possible to limit the operator's capabilities to solely the namespace in which it has been installed.
+With this restriction, the cluster-level permissions required by the operator will be substantially reduced,
+and the security profile of the installation will be enhanced.
+
+You can install the operator in single-namespace mode by setting the `config.clusterWide` flag to `false`,
+as in the following example:
+
+```console
+helm upgrade --install cnpg \
+  --namespace cnpg-system \
+  --create-namespace \
+  --set config.clusterWide=false \
+  cnpg/cloudnative-pg
+```
+
+**IMPORTANT**: the single-namespace installation mode can't coexist with the cluster-wide operator. Otherwise
+there would be collisions when managing the resources in the namespace watched by the single-namespace
+operator. It is up to the user to ensure there is no collision between operators.
+
+Uninstalling
+------------
+
+```console
+helm uninstall cnpg --namespace cnpg-system
+```
+
+> **Warning**
+> Uninstalling the chart does not remove the CRDs. Deleting them cascade-deletes every `Cluster` (and other
+> CloudNativePG) resource across the whole cluster, together with the PostgreSQL data stored in their PVCs.
+> This is irreversible, so only delete the CRDs if you intend to permanently remove all managed databases.
 
 ## Source Code
 
@@ -18,6 +105,8 @@ CloudNativePG Operator Helm Chart
 
 ## Requirements
 
+Kubernetes: `>=1.29.0-0`
+
 | Repository | Name | Version |
 |------------|------|---------|
 | https://cloudnative-pg.github.io/grafana-dashboards | monitoring(cluster) | 0.0 |
@@ -27,7 +116,7 @@ CloudNativePG Operator Helm Chart
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
 | additionalArgs | list | `[]` | Additional arguments to be added to the operator's args list. |
-| additionalEnv | list | `[]` | Array containing extra environment variables which can be templated. For example:  - name: RELEASE_NAME    value: "{{ .Release.Name }}"  - name: MY_VAR    value: "mySpecialKey" |
+| additionalEnv | list | `[]` | Array containing extra environment variables which can be templated. |
 | affinity | object | `{}` | Affinity for the operator to be installed. |
 | commonAnnotations | object | `{}` | Annotations to be added to all other resources. |
 | config.clusterWide | bool | `true` | This option determines if the operator is responsible for observing events across the entire Kubernetes cluster or if its focus should be narrowed down to the specific namespace within which it has been deployed. |
@@ -50,14 +139,14 @@ CloudNativePG Operator Helm Chart
 | monitoring.grafanaDashboard.create | bool | `false` |  |
 | monitoring.grafanaDashboard.labels | object | `{}` | Labels that ConfigMaps should have to get configured in Grafana. |
 | monitoring.grafanaDashboard.namespace | string | `""` | Allows overriding the namespace where the ConfigMap will be created, defaulting to the same one as the Release. |
-| monitoring.grafanaDashboard.sidecarLabel | string | `"grafana_dashboard"` | Label that ConfigMaps should have to be loaded as dashboards.  DEPRECATED: Use labels instead. |
-| monitoring.grafanaDashboard.sidecarLabelValue | string | `"1"` | Label value that ConfigMaps should have to be loaded as dashboards.  DEPRECATED: Use labels instead. |
+| monitoring.grafanaDashboard.sidecarLabel | string | `"grafana_dashboard"` | Label that ConfigMaps should have to be loaded as dashboards. DEPRECATED: Use labels instead. |
+| monitoring.grafanaDashboard.sidecarLabelValue | string | `"1"` | Label value that ConfigMaps should have to be loaded as dashboards. DEPRECATED: Use labels instead. |
 | monitoring.podMonitorAdditionalLabels | object | `{}` | Additional labels for the podMonitor |
 | monitoring.podMonitorEnabled | bool | `false` | Specifies whether the monitoring should be enabled. Requires Prometheus Operator CRDs. |
 | monitoring.podMonitorMetricRelabelings | list | `[]` | Metrics relabel configurations to apply to samples before ingestion. |
 | monitoring.podMonitorRelabelings | list | `[]` | Relabel configurations to apply to samples before scraping. |
 | monitoringQueriesConfigMap.name | string | `"cnpg-default-monitoring"` | The name of the default monitoring configmap. |
-| monitoringQueriesConfigMap.queries | string | `"backends:\n  query: |\n   SELECT sa.datname\n       , sa.usename\n       , sa.application_name\n       , states.state\n       , COALESCE(sa.count, 0) AS total\n       , COALESCE(sa.max_tx_secs, 0) AS max_tx_duration_seconds\n       FROM ( VALUES ('active')\n           , ('idle')\n           , ('idle in transaction')\n           , ('idle in transaction (aborted)')\n           , ('fastpath function call')\n           , ('disabled')\n           ) AS states(state)\n       LEFT JOIN (\n           SELECT datname\n               , state\n               , usename\n               , COALESCE(application_name, '') AS application_name\n               , COUNT(*)\n               , COALESCE(EXTRACT (EPOCH FROM (max(now() - xact_start))), 0) AS max_tx_secs\n           FROM pg_catalog.pg_stat_activity\n           GROUP BY datname, state, usename, application_name\n       ) sa ON states.state = sa.state\n       WHERE sa.usename IS NOT NULL\n  metrics:\n    - datname:\n        usage: \"LABEL\"\n        description: \"Name of the database\"\n    - usename:\n        usage: \"LABEL\"\n        description: \"Name of the user\"\n    - application_name:\n        usage: \"LABEL\"\n        description: \"Name of the application\"\n    - state:\n        usage: \"LABEL\"\n        description: \"State of the backend\"\n    - total:\n        usage: \"GAUGE\"\n        description: \"Number of backends\"\n    - max_tx_duration_seconds:\n        usage: \"GAUGE\"\n        description: \"Maximum duration of a transaction in seconds\"\n\nbackends_waiting:\n  query: |\n   SELECT count(*) AS total\n   FROM pg_catalog.pg_locks blocked_locks\n   JOIN pg_catalog.pg_locks blocking_locks\n     ON blocking_locks.locktype = blocked_locks.locktype\n     AND blocking_locks.database IS NOT DISTINCT FROM blocked_locks.database\n     AND blocking_locks.relation IS NOT DISTINCT FROM blocked_locks.relation\n     AND blocking_locks.page IS NOT DISTINCT FROM blocked_locks.page\n     AND blocking_locks.tuple IS NOT DISTINCT FROM blocked_locks.tuple\n     AND blocking_locks.virtualxid IS NOT DISTINCT FROM blocked_locks.virtualxid\n     AND blocking_locks.transactionid IS NOT DISTINCT FROM blocked_locks.transactionid\n     AND blocking_locks.classid IS NOT DISTINCT FROM blocked_locks.classid\n     AND blocking_locks.objid IS NOT DISTINCT FROM blocked_locks.objid\n     AND blocking_locks.objsubid IS NOT DISTINCT FROM blocked_locks.objsubid\n     AND blocking_locks.pid != blocked_locks.pid\n   JOIN pg_catalog.pg_stat_activity blocking_activity ON blocking_activity.pid = blocking_locks.pid\n   WHERE NOT blocked_locks.granted\n  metrics:\n    - total:\n        usage: \"GAUGE\"\n        description: \"Total number of backends that are currently waiting on other queries\"\n\npg_database:\n  query: |\n    SELECT datname\n      , pg_catalog.pg_database_size(datname) AS size_bytes\n      , pg_catalog.age(datfrozenxid) AS xid_age\n      , pg_catalog.mxid_age(datminmxid) AS mxid_age\n    FROM pg_catalog.pg_database\n    WHERE datallowconn\n  metrics:\n    - datname:\n        usage: \"LABEL\"\n        description: \"Name of the database\"\n    - size_bytes:\n        usage: \"GAUGE\"\n        description: \"Disk space used by the database\"\n    - xid_age:\n        usage: \"GAUGE\"\n        description: \"Number of transactions from the frozen XID to the current one\"\n    - mxid_age:\n        usage: \"GAUGE\"\n        description: \"Number of multiple transactions (Multixact) from the frozen XID to the current one\"\n\npg_postmaster:\n  query: |\n    SELECT EXTRACT(EPOCH FROM pg_postmaster_start_time) AS start_time\n    FROM pg_catalog.pg_postmaster_start_time()\n  metrics:\n    - start_time:\n        usage: \"GAUGE\"\n        description: \"Time at which postgres started (based on epoch)\"\n\npg_replication:\n  query: \"SELECT CASE WHEN (\n            NOT pg_catalog.pg_is_in_recovery()\n            OR pg_catalog.pg_last_wal_receive_lsn() = pg_catalog.pg_last_wal_replay_lsn())\n          THEN 0\n          ELSE GREATEST (0,\n            EXTRACT(EPOCH FROM (now() - pg_catalog.pg_last_xact_replay_timestamp())))\n          END AS lag,\n          pg_catalog.pg_is_in_recovery() AS in_recovery,\n          EXISTS (TABLE pg_stat_wal_receiver) AS is_wal_receiver_up,\n          (SELECT count(*) FROM pg_catalog.pg_stat_replication) AS streaming_replicas\"\n  metrics:\n    - lag:\n        usage: \"GAUGE\"\n        description: \"Replication lag behind primary in seconds\"\n    - in_recovery:\n        usage: \"GAUGE\"\n        description: \"Whether the instance is in recovery\"\n    - is_wal_receiver_up:\n        usage: \"GAUGE\"\n        description: \"Whether the instance wal_receiver is up\"\n    - streaming_replicas:\n        usage: \"GAUGE\"\n        description: \"Number of streaming replicas connected to the instance\"\n\npg_replication_slots:\n  query: |\n    SELECT slot_name,\n      slot_type,\n      database,\n      active,\n      (CASE pg_catalog.pg_is_in_recovery()\n        WHEN TRUE THEN pg_catalog.pg_wal_lsn_diff(pg_catalog.pg_last_wal_receive_lsn(), restart_lsn)\n        ELSE pg_catalog.pg_wal_lsn_diff(pg_catalog.pg_current_wal_lsn(), restart_lsn)\n      END) as pg_wal_lsn_diff\n    FROM pg_catalog.pg_replication_slots\n    WHERE NOT temporary\n  metrics:\n    - slot_name:\n        usage: \"LABEL\"\n        description: \"Name of the replication slot\"\n    - slot_type:\n        usage: \"LABEL\"\n        description: \"Type of the replication slot\"\n    - database:\n        usage: \"LABEL\"\n        description: \"Name of the database\"\n    - active:\n        usage: \"GAUGE\"\n        description: \"Flag indicating whether the slot is active\"\n    - pg_wal_lsn_diff:\n        usage: \"GAUGE\"\n        description: \"Replication lag in bytes\"\n\npg_stat_archiver:\n  query: |\n    SELECT archived_count\n      , failed_count\n      , COALESCE(EXTRACT(EPOCH FROM (now() - last_archived_time)), -1) AS seconds_since_last_archival\n      , COALESCE(EXTRACT(EPOCH FROM (now() - last_failed_time)), -1) AS seconds_since_last_failure\n      , COALESCE(EXTRACT(EPOCH FROM last_archived_time), -1) AS last_archived_time\n      , COALESCE(EXTRACT(EPOCH FROM last_failed_time), -1) AS last_failed_time\n      , COALESCE(CAST(CAST('x'||pg_catalog.right(pg_catalog.split_part(last_archived_wal, '.', 1), 16) AS pg_catalog.bit(64)) AS pg_catalog.int8), -1) AS last_archived_wal_start_lsn\n      , COALESCE(CAST(CAST('x'||pg_catalog.right(pg_catalog.split_part(last_failed_wal, '.', 1), 16) AS pg_catalog.bit(64)) AS pg_catalog.int8), -1) AS last_failed_wal_start_lsn\n      , EXTRACT(EPOCH FROM stats_reset) AS stats_reset_time\n    FROM pg_catalog.pg_stat_archiver\n  metrics:\n    - archived_count:\n        usage: \"COUNTER\"\n        description: \"Number of WAL files that have been successfully archived\"\n    - failed_count:\n        usage: \"COUNTER\"\n        description: \"Number of failed attempts for archiving WAL files\"\n    - seconds_since_last_archival:\n        usage: \"GAUGE\"\n        description: \"Seconds since the last successful archival operation\"\n    - seconds_since_last_failure:\n        usage: \"GAUGE\"\n        description: \"Seconds since the last failed archival operation\"\n    - last_archived_time:\n        usage: \"GAUGE\"\n        description: \"Epoch of the last time WAL archiving succeeded\"\n    - last_failed_time:\n        usage: \"GAUGE\"\n        description: \"Epoch of the last time WAL archiving failed\"\n    - last_archived_wal_start_lsn:\n        usage: \"GAUGE\"\n        description: \"Archived WAL start LSN\"\n    - last_failed_wal_start_lsn:\n        usage: \"GAUGE\"\n        description: \"Last failed WAL LSN\"\n    - stats_reset_time:\n        usage: \"GAUGE\"\n        description: \"Time at which these statistics were last reset\"\n\npg_stat_bgwriter:\n  runonserver: \"<17.0.0\"\n  query: |\n    SELECT checkpoints_timed\n      , checkpoints_req\n      , checkpoint_write_time\n      , checkpoint_sync_time\n      , buffers_checkpoint\n      , buffers_clean\n      , maxwritten_clean\n      , buffers_backend\n      , buffers_backend_fsync\n      , buffers_alloc\n    FROM pg_catalog.pg_stat_bgwriter\n  metrics:\n    - checkpoints_timed:\n        usage: \"COUNTER\"\n        description: \"Number of scheduled checkpoints that have been performed\"\n    - checkpoints_req:\n        usage: \"COUNTER\"\n        description: \"Number of requested checkpoints that have been performed\"\n    - checkpoint_write_time:\n        usage: \"COUNTER\"\n        description: \"Total amount of time that has been spent in the portion of checkpoint processing where files are written to disk, in milliseconds\"\n    - checkpoint_sync_time:\n        usage: \"COUNTER\"\n        description: \"Total amount of time that has been spent in the portion of checkpoint processing where files are synchronized to disk, in milliseconds\"\n    - buffers_checkpoint:\n        usage: \"COUNTER\"\n        description: \"Number of buffers written during checkpoints\"\n    - buffers_clean:\n        usage: \"COUNTER\"\n        description: \"Number of buffers written by the background writer\"\n    - maxwritten_clean:\n        usage: \"COUNTER\"\n        description: \"Number of times the background writer stopped a cleaning scan because it had written too many buffers\"\n    - buffers_backend:\n        usage: \"COUNTER\"\n        description: \"Number of buffers written directly by a backend\"\n    - buffers_backend_fsync:\n        usage: \"COUNTER\"\n        description: \"Number of times a backend had to execute its own fsync call (normally the background writer handles those even when the backend does its own write)\"\n    - buffers_alloc:\n        usage: \"COUNTER\"\n        description: \"Number of buffers allocated\"\n\npg_stat_bgwriter_17:\n  runonserver: \">=17.0.0\"\n  name: pg_stat_bgwriter\n  query: |\n    SELECT buffers_clean\n      , maxwritten_clean\n      , buffers_alloc\n      , EXTRACT(EPOCH FROM stats_reset) AS stats_reset_time\n    FROM pg_catalog.pg_stat_bgwriter\n  metrics:\n    - buffers_clean:\n        usage: \"COUNTER\"\n        description: \"Number of buffers written by the background writer\"\n    - maxwritten_clean:\n        usage: \"COUNTER\"\n        description: \"Number of times the background writer stopped a cleaning scan because it had written too many buffers\"\n    - buffers_alloc:\n        usage: \"COUNTER\"\n        description: \"Number of buffers allocated\"\n    - stats_reset_time:\n        usage: \"GAUGE\"\n        description: \"Time at which these statistics were last reset\"\n\npg_stat_checkpointer:\n  runonserver: \">=17.0.0\"\n  query: |\n    SELECT num_timed AS checkpoints_timed\n      , num_requested AS checkpoints_req\n      , restartpoints_timed\n      , restartpoints_req\n      , restartpoints_done\n      , write_time\n      , sync_time\n      , buffers_written\n      , EXTRACT(EPOCH FROM stats_reset) AS stats_reset_time\n    FROM pg_catalog.pg_stat_checkpointer\n  metrics:\n    - checkpoints_timed:\n        usage: \"COUNTER\"\n        description: \"Number of scheduled checkpoints that have been performed\"\n    - checkpoints_req:\n        usage: \"COUNTER\"\n        description: \"Number of requested checkpoints that have been performed\"\n    - restartpoints_timed:\n        usage: \"COUNTER\"\n        description: \"Number of scheduled restartpoints due to timeout or after a failed attempt to perform it\"\n    - restartpoints_req:\n        usage: \"COUNTER\"\n        description: \"Number of requested restartpoints that have been performed\"\n    - restartpoints_done:\n        usage: \"COUNTER\"\n        description: \"Number of restartpoints that have been performed\"\n    - write_time:\n        usage: \"COUNTER\"\n        description: \"Total amount of time that has been spent in the portion of processing checkpoints and restartpoints where files are written to disk, in milliseconds\"\n    - sync_time:\n        usage: \"COUNTER\"\n        description: \"Total amount of time that has been spent in the portion of processing checkpoints and restartpoints where files are synchronized to disk, in milliseconds\"\n    - buffers_written:\n        usage: \"COUNTER\"\n        description: \"Number of buffers written during checkpoints and restartpoints\"\n    - stats_reset_time:\n        usage: \"GAUGE\"\n        description: \"Time at which these statistics were last reset\"\n\npg_stat_database:\n  query: |\n    SELECT datname\n      , xact_commit\n      , xact_rollback\n      , blks_read\n      , blks_hit\n      , tup_returned\n      , tup_fetched\n      , tup_inserted\n      , tup_updated\n      , tup_deleted\n      , conflicts\n      , temp_files\n      , temp_bytes\n      , deadlocks\n      , blk_read_time\n      , blk_write_time\n    FROM pg_catalog.pg_stat_database\n  metrics:\n    - datname:\n        usage: \"LABEL\"\n        description: \"Name of this database\"\n    - xact_commit:\n        usage: \"COUNTER\"\n        description: \"Number of transactions in this database that have been committed\"\n    - xact_rollback:\n        usage: \"COUNTER\"\n        description: \"Number of transactions in this database that have been rolled back\"\n    - blks_read:\n        usage: \"COUNTER\"\n        description: \"Number of disk blocks read in this database\"\n    - blks_hit:\n        usage: \"COUNTER\"\n        description: \"Number of times disk blocks were found already in the buffer cache, so that a read was not necessary (this only includes hits in the PostgreSQL buffer cache, not the operating system's file system cache)\"\n    - tup_returned:\n        usage: \"COUNTER\"\n        description: \"Number of rows returned by queries in this database\"\n    - tup_fetched:\n        usage: \"COUNTER\"\n        description: \"Number of rows fetched by queries in this database\"\n    - tup_inserted:\n        usage: \"COUNTER\"\n        description: \"Number of rows inserted by queries in this database\"\n    - tup_updated:\n        usage: \"COUNTER\"\n        description: \"Number of rows updated by queries in this database\"\n    - tup_deleted:\n        usage: \"COUNTER\"\n        description: \"Number of rows deleted by queries in this database\"\n    - conflicts:\n        usage: \"COUNTER\"\n        description: \"Number of queries canceled due to conflicts with recovery in this database\"\n    - temp_files:\n        usage: \"COUNTER\"\n        description: \"Number of temporary files created by queries in this database\"\n    - temp_bytes:\n        usage: \"COUNTER\"\n        description: \"Total amount of data written to temporary files by queries in this database\"\n    - deadlocks:\n        usage: \"COUNTER\"\n        description: \"Number of deadlocks detected in this database\"\n    - blk_read_time:\n        usage: \"COUNTER\"\n        description: \"Time spent reading data file blocks by backends in this database, in milliseconds\"\n    - blk_write_time:\n        usage: \"COUNTER\"\n        description: \"Time spent writing data file blocks by backends in this database, in milliseconds\"\n\npg_stat_replication:\n  primary: true\n  query: |\n   SELECT usename\n     , COALESCE(application_name, '') AS application_name\n     , COALESCE(client_addr::text, '') AS client_addr\n     , COALESCE(client_port::text, '') AS client_port\n     , EXTRACT(EPOCH FROM backend_start) AS backend_start\n     , COALESCE(pg_catalog.age(backend_xmin), 0) AS backend_xmin_age\n     , pg_catalog.pg_wal_lsn_diff(pg_catalog.pg_current_wal_lsn(), sent_lsn) AS sent_diff_bytes\n     , pg_catalog.pg_wal_lsn_diff(pg_catalog.pg_current_wal_lsn(), write_lsn) AS write_diff_bytes\n     , pg_catalog.pg_wal_lsn_diff(pg_catalog.pg_current_wal_lsn(), flush_lsn) AS flush_diff_bytes\n     , COALESCE(pg_catalog.pg_wal_lsn_diff(pg_catalog.pg_current_wal_lsn(), replay_lsn),0) AS replay_diff_bytes\n     , COALESCE((EXTRACT(EPOCH FROM write_lag)),0)::float AS write_lag_seconds\n     , COALESCE((EXTRACT(EPOCH FROM flush_lag)),0)::float AS flush_lag_seconds\n     , COALESCE((EXTRACT(EPOCH FROM replay_lag)),0)::float AS replay_lag_seconds\n   FROM pg_catalog.pg_stat_replication\n  metrics:\n    - usename:\n        usage: \"LABEL\"\n        description: \"Name of the replication user\"\n    - application_name:\n        usage: \"LABEL\"\n        description: \"Name of the application\"\n    - client_addr:\n        usage: \"LABEL\"\n        description: \"Client IP address\"\n    - client_port:\n        usage: \"LABEL\"\n        description: \"Client TCP port\"\n    - backend_start:\n        usage: \"COUNTER\"\n        description: \"Time when this process was started\"\n    - backend_xmin_age:\n        usage: \"COUNTER\"\n        description: \"The age of this standby's xmin horizon\"\n    - sent_diff_bytes:\n        usage: \"GAUGE\"\n        description: \"Difference in bytes from the last write-ahead log location sent on this connection\"\n    - write_diff_bytes:\n        usage: \"GAUGE\"\n        description: \"Difference in bytes from the last write-ahead log location written to disk by this standby server\"\n    - flush_diff_bytes:\n        usage: \"GAUGE\"\n        description: \"Difference in bytes from the last write-ahead log location flushed to disk by this standby server\"\n    - replay_diff_bytes:\n        usage: \"GAUGE\"\n        description: \"Difference in bytes from the last write-ahead log location replayed into the database on this standby server\"\n    - write_lag_seconds:\n        usage: \"GAUGE\"\n        description: \"Time elapsed between flushing recent WAL locally and receiving notification that this standby server has written it\"\n    - flush_lag_seconds:\n        usage: \"GAUGE\"\n        description: \"Time elapsed between flushing recent WAL locally and receiving notification that this standby server has written and flushed it\"\n    - replay_lag_seconds:\n        usage: \"GAUGE\"\n        description: \"Time elapsed between flushing recent WAL locally and receiving notification that this standby server has written, flushed and applied it\"\n\npg_settings:\n  query: |\n    SELECT name,\n    CASE setting WHEN 'on' THEN '1' WHEN 'off' THEN '0' ELSE setting END AS setting\n    FROM pg_catalog.pg_settings\n    WHERE vartype IN ('integer', 'real', 'bool')\n    ORDER BY 1\n  metrics:\n    - name:\n        usage: \"LABEL\"\n        description: \"Name of the setting\"\n    - setting:\n        usage: \"GAUGE\"\n        description: \"Setting value\"\n\npg_extensions:\n  query: |\n    SELECT\n     current_database() as datname,\n     name as extname,\n     default_version,\n     installed_version,\n     CASE\n       WHEN default_version = installed_version THEN 0\n       ELSE 1\n    END AS update_available\n    FROM pg_catalog.pg_available_extensions\n    WHERE installed_version IS NOT NULL\n  metrics:\n    - datname:\n        usage: \"LABEL\"\n        description: \"Name of the database\"\n    - extname:\n        usage: \"LABEL\"\n        description: \"Extension name\"\n    - default_version:\n        usage: \"LABEL\"\n        description: \"Default version\"\n    - installed_version:\n        usage: \"LABEL\"\n        description: \"Installed version\"\n    - update_available:\n        usage: \"GAUGE\"\n        description: \"An update is available\"\n  target_databases:\n    - '*'\n"` | A string representation of a YAML defining monitoring queries. |
+| monitoringQueriesConfigMap.queries | string | `"backends:\n  query: |\n    SELECT sa.datname\n      , sa.usename\n      , sa.application_name\n      , states.state\n      , COALESCE(sa.count, 0) AS total\n      , COALESCE(sa.max_tx_secs, 0) AS max_tx_duration_seconds\n    FROM ( VALUES ('active')\n      , ('idle')\n      , ('idle in transaction')\n      , ('idle in transaction (aborted)')\n      , ('fastpath function call')\n      , ('disabled')\n      ) AS states(state)\n    LEFT JOIN (\n      SELECT datname\n        , state\n        , usename\n        , COALESCE(application_name, '') AS application_name\n        , pg_catalog.count(*)\n        , COALESCE(EXTRACT (EPOCH FROM (pg_catalog.max(pg_catalog.now() OPERATOR(pg_catalog.-) xact_start))), 0) AS max_tx_secs\n      FROM pg_catalog.pg_stat_activity\n      GROUP BY datname, state, usename, application_name\n    ) sa ON states.state OPERATOR(pg_catalog.=) sa.state\n    WHERE sa.usename IS NOT NULL\n  metrics:\n    - datname:\n        usage: \"LABEL\"\n        description: \"Name of the database\"\n    - usename:\n        usage: \"LABEL\"\n        description: \"Name of the user\"\n    - application_name:\n        usage: \"LABEL\"\n        description: \"Name of the application\"\n    - state:\n        usage: \"LABEL\"\n        description: \"State of the backend\"\n    - total:\n        usage: \"GAUGE\"\n        description: \"Number of backends\"\n    - max_tx_duration_seconds:\n        usage: \"GAUGE\"\n        description: \"Maximum duration of a transaction in seconds\"\n\nbackends_waiting:\n  query: |\n    SELECT pg_catalog.count(*) AS total\n    FROM pg_catalog.pg_locks blocked_locks\n    JOIN pg_catalog.pg_locks blocking_locks\n      ON blocking_locks.locktype OPERATOR(pg_catalog.=) blocked_locks.locktype\n      AND blocking_locks.database IS NOT DISTINCT FROM blocked_locks.database\n      AND blocking_locks.relation IS NOT DISTINCT FROM blocked_locks.relation\n      AND blocking_locks.page IS NOT DISTINCT FROM blocked_locks.page\n      AND blocking_locks.tuple IS NOT DISTINCT FROM blocked_locks.tuple\n      AND blocking_locks.virtualxid IS NOT DISTINCT FROM blocked_locks.virtualxid\n      AND blocking_locks.transactionid IS NOT DISTINCT FROM blocked_locks.transactionid\n      AND blocking_locks.classid IS NOT DISTINCT FROM blocked_locks.classid\n      AND blocking_locks.objid IS NOT DISTINCT FROM blocked_locks.objid\n      AND blocking_locks.objsubid IS NOT DISTINCT FROM blocked_locks.objsubid\n      AND blocking_locks.pid OPERATOR(pg_catalog.<>) blocked_locks.pid\n    JOIN pg_catalog.pg_stat_activity blocking_activity ON blocking_activity.pid OPERATOR(pg_catalog.=) blocking_locks.pid\n    WHERE NOT blocked_locks.granted\n  metrics:\n    - total:\n        usage: \"GAUGE\"\n        description: \"Total number of backends that are currently waiting on other queries\"\n\npg_database:\n  query: |\n    SELECT datname\n      , pg_catalog.pg_database_size(datname) AS size_bytes\n      , pg_catalog.age(datfrozenxid) AS xid_age\n      , pg_catalog.mxid_age(datminmxid) AS mxid_age\n    FROM pg_catalog.pg_database\n    WHERE datallowconn\n  metrics:\n    - datname:\n        usage: \"LABEL\"\n        description: \"Name of the database\"\n    - size_bytes:\n        usage: \"GAUGE\"\n        description: \"Disk space used by the database\"\n    - xid_age:\n        usage: \"GAUGE\"\n        description: \"Number of transactions from the frozen XID to the current one\"\n    - mxid_age:\n        usage: \"GAUGE\"\n        description: \"Number of multiple transactions (Multixact) from the frozen XID to the current one\"\n\npg_postmaster:\n  query: |\n    SELECT EXTRACT(EPOCH FROM pg_postmaster_start_time) AS start_time\n    FROM pg_catalog.pg_postmaster_start_time()\n  metrics:\n    - start_time:\n        usage: \"GAUGE\"\n        description: \"Time at which postgres started (based on epoch)\"\n\npg_replication:\n  query: |\n    SELECT CASE WHEN (\n        NOT pg_catalog.pg_is_in_recovery()\n        OR pg_catalog.pg_last_wal_receive_lsn() OPERATOR(pg_catalog.=) pg_catalog.pg_last_wal_replay_lsn())\n      THEN 0\n      ELSE GREATEST (0,\n        EXTRACT(EPOCH FROM (pg_catalog.now() OPERATOR(pg_catalog.-) pg_catalog.pg_last_xact_replay_timestamp())))\n      END AS lag,\n      pg_catalog.pg_is_in_recovery() AS in_recovery,\n      EXISTS (TABLE pg_catalog.pg_stat_wal_receiver) AS is_wal_receiver_up,\n      (SELECT pg_catalog.count(*) FROM pg_catalog.pg_stat_replication) AS streaming_replicas\n  metrics:\n    - lag:\n        usage: \"GAUGE\"\n        description: \"Replication lag behind primary in seconds\"\n    - in_recovery:\n        usage: \"GAUGE\"\n        description: \"Whether the instance is in recovery\"\n    - is_wal_receiver_up:\n        usage: \"GAUGE\"\n        description: \"Whether the instance wal_receiver is up\"\n    - streaming_replicas:\n        usage: \"GAUGE\"\n        description: \"Number of streaming replicas connected to the instance\"\n\npg_replication_slots:\n  query: |\n    SELECT slot_name,\n      slot_type,\n      database,\n      active,\n      (CASE pg_catalog.pg_is_in_recovery()\n        WHEN TRUE THEN pg_catalog.pg_wal_lsn_diff(pg_catalog.pg_last_wal_receive_lsn(), restart_lsn)\n        ELSE pg_catalog.pg_wal_lsn_diff(pg_catalog.pg_current_wal_lsn(), restart_lsn)\n      END) as pg_wal_lsn_diff\n    FROM pg_catalog.pg_replication_slots\n    WHERE NOT temporary\n  metrics:\n    - slot_name:\n        usage: \"LABEL\"\n        description: \"Name of the replication slot\"\n    - slot_type:\n        usage: \"LABEL\"\n        description: \"Type of the replication slot\"\n    - database:\n        usage: \"LABEL\"\n        description: \"Name of the database\"\n    - active:\n        usage: \"GAUGE\"\n        description: \"Flag indicating whether the slot is active\"\n    - pg_wal_lsn_diff:\n        usage: \"GAUGE\"\n        description: \"Replication lag in bytes\"\n\npg_stat_archiver:\n  query: |\n    SELECT archived_count\n      , failed_count\n      , COALESCE(EXTRACT(EPOCH FROM (pg_catalog.now() OPERATOR(pg_catalog.-) last_archived_time)), -1) AS seconds_since_last_archival\n      , COALESCE(EXTRACT(EPOCH FROM (pg_catalog.now() OPERATOR(pg_catalog.-) last_failed_time)), -1) AS seconds_since_last_failure\n      , COALESCE(EXTRACT(EPOCH FROM last_archived_time), -1) AS last_archived_time\n      , COALESCE(EXTRACT(EPOCH FROM last_failed_time), -1) AS last_failed_time\n      , COALESCE(CAST(CAST('x' OPERATOR(pg_catalog.||) pg_catalog.right(pg_catalog.split_part(last_archived_wal, '.', 1), 16) AS pg_catalog.bit(64)) AS pg_catalog.int8), -1) AS last_archived_wal_start_lsn\n      , COALESCE(CAST(CAST('x' OPERATOR(pg_catalog.||) pg_catalog.right(pg_catalog.split_part(last_failed_wal, '.', 1), 16) AS pg_catalog.bit(64)) AS pg_catalog.int8), -1) AS last_failed_wal_start_lsn\n      , EXTRACT(EPOCH FROM stats_reset) AS stats_reset_time\n    FROM pg_catalog.pg_stat_archiver\n  predicate_query: |\n    SELECT NOT pg_catalog.pg_is_in_recovery()\n      OR pg_catalog.current_setting('archive_mode') OPERATOR(pg_catalog.=) 'always'\n  metrics:\n    - archived_count:\n        usage: \"COUNTER\"\n        description: \"Number of WAL files that have been successfully archived\"\n    - failed_count:\n        usage: \"COUNTER\"\n        description: \"Number of failed attempts for archiving WAL files\"\n    - seconds_since_last_archival:\n        usage: \"GAUGE\"\n        description: \"Seconds since the last successful archival operation\"\n    - seconds_since_last_failure:\n        usage: \"GAUGE\"\n        description: \"Seconds since the last failed archival operation\"\n    - last_archived_time:\n        usage: \"GAUGE\"\n        description: \"Epoch of the last time WAL archiving succeeded\"\n    - last_failed_time:\n        usage: \"GAUGE\"\n        description: \"Epoch of the last time WAL archiving failed\"\n    - last_archived_wal_start_lsn:\n        usage: \"GAUGE\"\n        description: \"Archived WAL start LSN\"\n    - last_failed_wal_start_lsn:\n        usage: \"GAUGE\"\n        description: \"Last failed WAL LSN\"\n    - stats_reset_time:\n        usage: \"GAUGE\"\n        description: \"Time at which these statistics were last reset\"\n\npg_stat_bgwriter:\n  runonserver: \"<17.0.0\"\n  query: |\n    SELECT checkpoints_timed\n      , checkpoints_req\n      , checkpoint_write_time\n      , checkpoint_sync_time\n      , buffers_checkpoint\n      , buffers_clean\n      , maxwritten_clean\n      , buffers_backend\n      , buffers_backend_fsync\n      , buffers_alloc\n    FROM pg_catalog.pg_stat_bgwriter\n  metrics:\n    - checkpoints_timed:\n        usage: \"COUNTER\"\n        description: \"Number of scheduled checkpoints that have been performed\"\n    - checkpoints_req:\n        usage: \"COUNTER\"\n        description: \"Number of requested checkpoints that have been performed\"\n    - checkpoint_write_time:\n        usage: \"COUNTER\"\n        description: \"Total amount of time that has been spent in the portion of checkpoint processing where files are written to disk, in milliseconds\"\n    - checkpoint_sync_time:\n        usage: \"COUNTER\"\n        description: \"Total amount of time that has been spent in the portion of checkpoint processing where files are synchronized to disk, in milliseconds\"\n    - buffers_checkpoint:\n        usage: \"COUNTER\"\n        description: \"Number of buffers written during checkpoints\"\n    - buffers_clean:\n        usage: \"COUNTER\"\n        description: \"Number of buffers written by the background writer\"\n    - maxwritten_clean:\n        usage: \"COUNTER\"\n        description: \"Number of times the background writer stopped a cleaning scan because it had written too many buffers\"\n    - buffers_backend:\n        usage: \"COUNTER\"\n        description: \"Number of buffers written directly by a backend\"\n    - buffers_backend_fsync:\n        usage: \"COUNTER\"\n        description: \"Number of times a backend had to execute its own fsync call (normally the background writer handles those even when the backend does its own write)\"\n    - buffers_alloc:\n        usage: \"COUNTER\"\n        description: \"Number of buffers allocated\"\n\npg_stat_bgwriter_17:\n  runonserver: \">=17.0.0\"\n  name: pg_stat_bgwriter\n  query: |\n    SELECT buffers_clean\n      , maxwritten_clean\n      , buffers_alloc\n      , EXTRACT(EPOCH FROM stats_reset) AS stats_reset_time\n    FROM pg_catalog.pg_stat_bgwriter\n  metrics:\n    - buffers_clean:\n        usage: \"COUNTER\"\n        description: \"Number of buffers written by the background writer\"\n    - maxwritten_clean:\n        usage: \"COUNTER\"\n        description: \"Number of times the background writer stopped a cleaning scan because it had written too many buffers\"\n    - buffers_alloc:\n        usage: \"COUNTER\"\n        description: \"Number of buffers allocated\"\n    - stats_reset_time:\n        usage: \"GAUGE\"\n        description: \"Time at which these statistics were last reset\"\n\npg_stat_checkpointer:\n  runonserver: \">=17.0.0\"\n  query: |\n    SELECT num_timed AS checkpoints_timed\n      , num_requested AS checkpoints_req\n      , restartpoints_timed\n      , restartpoints_req\n      , restartpoints_done\n      , write_time\n      , sync_time\n      , buffers_written\n      , EXTRACT(EPOCH FROM stats_reset) AS stats_reset_time\n    FROM pg_catalog.pg_stat_checkpointer\n  metrics:\n    - checkpoints_timed:\n        usage: \"COUNTER\"\n        description: \"Number of scheduled checkpoints that have been performed\"\n    - checkpoints_req:\n        usage: \"COUNTER\"\n        description: \"Number of requested checkpoints that have been performed\"\n    - restartpoints_timed:\n        usage: \"COUNTER\"\n        description: \"Number of scheduled restartpoints due to timeout or after a failed attempt to perform it\"\n    - restartpoints_req:\n        usage: \"COUNTER\"\n        description: \"Number of requested restartpoints that have been performed\"\n    - restartpoints_done:\n        usage: \"COUNTER\"\n        description: \"Number of restartpoints that have been performed\"\n    - write_time:\n        usage: \"COUNTER\"\n        description: \"Total amount of time that has been spent in the portion of processing checkpoints and restartpoints where files are written to disk, in milliseconds\"\n    - sync_time:\n        usage: \"COUNTER\"\n        description: \"Total amount of time that has been spent in the portion of processing checkpoints and restartpoints where files are synchronized to disk, in milliseconds\"\n    - buffers_written:\n        usage: \"COUNTER\"\n        description: \"Number of buffers written during checkpoints and restartpoints\"\n    - stats_reset_time:\n        usage: \"GAUGE\"\n        description: \"Time at which these statistics were last reset\"\n\npg_stat_database:\n  query: |\n    SELECT datname\n      , xact_commit\n      , xact_rollback\n      , blks_read\n      , blks_hit\n      , tup_returned\n      , tup_fetched\n      , tup_inserted\n      , tup_updated\n      , tup_deleted\n      , conflicts\n      , temp_files\n      , temp_bytes\n      , deadlocks\n      , blk_read_time\n      , blk_write_time\n    FROM pg_catalog.pg_stat_database\n  metrics:\n    - datname:\n        usage: \"LABEL\"\n        description: \"Name of this database\"\n    - xact_commit:\n        usage: \"COUNTER\"\n        description: \"Number of transactions in this database that have been committed\"\n    - xact_rollback:\n        usage: \"COUNTER\"\n        description: \"Number of transactions in this database that have been rolled back\"\n    - blks_read:\n        usage: \"COUNTER\"\n        description: \"Number of disk blocks read in this database\"\n    - blks_hit:\n        usage: \"COUNTER\"\n        description: \"Number of times disk blocks were found already in the buffer cache, so that a read was not necessary (this only includes hits in the PostgreSQL buffer cache, not the operating system's file system cache)\"\n    - tup_returned:\n        usage: \"COUNTER\"\n        description: \"Number of rows returned by queries in this database\"\n    - tup_fetched:\n        usage: \"COUNTER\"\n        description: \"Number of rows fetched by queries in this database\"\n    - tup_inserted:\n        usage: \"COUNTER\"\n        description: \"Number of rows inserted by queries in this database\"\n    - tup_updated:\n        usage: \"COUNTER\"\n        description: \"Number of rows updated by queries in this database\"\n    - tup_deleted:\n        usage: \"COUNTER\"\n        description: \"Number of rows deleted by queries in this database\"\n    - conflicts:\n        usage: \"COUNTER\"\n        description: \"Number of queries canceled due to conflicts with recovery in this database\"\n    - temp_files:\n        usage: \"COUNTER\"\n        description: \"Number of temporary files created by queries in this database\"\n    - temp_bytes:\n        usage: \"COUNTER\"\n        description: \"Total amount of data written to temporary files by queries in this database\"\n    - deadlocks:\n        usage: \"COUNTER\"\n        description: \"Number of deadlocks detected in this database\"\n    - blk_read_time:\n        usage: \"COUNTER\"\n        description: \"Time spent reading data file blocks by backends in this database, in milliseconds\"\n    - blk_write_time:\n        usage: \"COUNTER\"\n        description: \"Time spent writing data file blocks by backends in this database, in milliseconds\"\n\npg_stat_replication:\n  primary: true\n  query: |\n    SELECT usename\n      , COALESCE(application_name, '') AS application_name\n      , COALESCE(client_addr::text, '') AS client_addr\n      , COALESCE(client_port::text, '') AS client_port\n      , EXTRACT(EPOCH FROM backend_start) AS backend_start\n      , COALESCE(pg_catalog.age(backend_xmin), 0) AS backend_xmin_age\n      , pg_catalog.pg_wal_lsn_diff(pg_catalog.pg_current_wal_lsn(), sent_lsn) AS sent_diff_bytes\n      , pg_catalog.pg_wal_lsn_diff(pg_catalog.pg_current_wal_lsn(), write_lsn) AS write_diff_bytes\n      , pg_catalog.pg_wal_lsn_diff(pg_catalog.pg_current_wal_lsn(), flush_lsn) AS flush_diff_bytes\n      , COALESCE(pg_catalog.pg_wal_lsn_diff(pg_catalog.pg_current_wal_lsn(), replay_lsn),0) AS replay_diff_bytes\n      , COALESCE((EXTRACT(EPOCH FROM write_lag)),0)::float AS write_lag_seconds\n      , COALESCE((EXTRACT(EPOCH FROM flush_lag)),0)::float AS flush_lag_seconds\n      , COALESCE((EXTRACT(EPOCH FROM replay_lag)),0)::float AS replay_lag_seconds\n    FROM pg_catalog.pg_stat_replication\n  metrics:\n    - usename:\n        usage: \"LABEL\"\n        description: \"Name of the replication user\"\n    - application_name:\n        usage: \"LABEL\"\n        description: \"Name of the application\"\n    - client_addr:\n        usage: \"LABEL\"\n        description: \"Client IP address\"\n    - client_port:\n        usage: \"LABEL\"\n        description: \"Client TCP port\"\n    - backend_start:\n        usage: \"COUNTER\"\n        description: \"Time when this process was started\"\n    - backend_xmin_age:\n        usage: \"COUNTER\"\n        description: \"The age of this standby's xmin horizon\"\n    - sent_diff_bytes:\n        usage: \"GAUGE\"\n        description: \"Difference in bytes from the last write-ahead log location sent on this connection\"\n    - write_diff_bytes:\n        usage: \"GAUGE\"\n        description: \"Difference in bytes from the last write-ahead log location written to disk by this standby server\"\n    - flush_diff_bytes:\n        usage: \"GAUGE\"\n        description: \"Difference in bytes from the last write-ahead log location flushed to disk by this standby server\"\n    - replay_diff_bytes:\n        usage: \"GAUGE\"\n        description: \"Difference in bytes from the last write-ahead log location replayed into the database on this standby server\"\n    - write_lag_seconds:\n        usage: \"GAUGE\"\n        description: \"Time elapsed between flushing recent WAL locally and receiving notification that this standby server has written it\"\n    - flush_lag_seconds:\n        usage: \"GAUGE\"\n        description: \"Time elapsed between flushing recent WAL locally and receiving notification that this standby server has written and flushed it\"\n    - replay_lag_seconds:\n        usage: \"GAUGE\"\n        description: \"Time elapsed between flushing recent WAL locally and receiving notification that this standby server has written, flushed and applied it\"\n\npg_settings:\n  query: |\n    SELECT name,\n    CASE setting WHEN 'on' THEN '1' WHEN 'off' THEN '0' ELSE setting END AS setting\n    FROM pg_catalog.pg_settings\n    WHERE vartype IN ('integer', 'real', 'bool')\n    ORDER BY 1\n  metrics:\n    - name:\n        usage: \"LABEL\"\n        description: \"Name of the setting\"\n    - setting:\n        usage: \"GAUGE\"\n        description: \"Setting value\"\n\npg_extensions:\n  query: |\n    SELECT\n      pg_catalog.current_database() as datname,\n      name as extname,\n      default_version,\n      installed_version,\n      CASE\n        WHEN default_version OPERATOR(pg_catalog.=) installed_version THEN 0\n        ELSE 1\n    END AS update_available\n    FROM pg_catalog.pg_available_extensions\n    WHERE installed_version IS NOT NULL\n  metrics:\n    - datname:\n        usage: \"LABEL\"\n        description: \"Name of the database\"\n    - extname:\n        usage: \"LABEL\"\n        description: \"Extension name\"\n    - default_version:\n        usage: \"LABEL\"\n        description: \"Default version\"\n    - installed_version:\n        usage: \"LABEL\"\n        description: \"Installed version\"\n    - update_available:\n        usage: \"GAUGE\"\n        description: \"An update is available\"\n  target_databases:\n    - '*'\n"` | A string representation of a YAML defining monitoring queries. |
 | nameOverride | string | `""` |  |
 | namespaceOverride | string | `""` |  |
 | nodeSelector | object | `{}` | Nodeselector for the operator to be installed. |
@@ -71,13 +160,29 @@ CloudNativePG Operator Helm Chart
 | resources | object | `{}` |  |
 | service.ipFamilies | list | `[]` | Sets the families that should be supported and the order in which they should be applied to ClusterIP as well. Can be IPv4 and/or IPv6. |
 | service.ipFamilyPolicy | string | `""` | Set the ip family policy to configure dual-stack see [Configure dual-stack](https://kubernetes.io/docs/concepts/services-networking/dual-stack/#services) |
-| service.name | string | `"cnpg-webhook-service"` | DO NOT CHANGE THE SERVICE NAME as it is currently used to generate the certificate and can not be configured |
+| service.name | string | `"cnpg-webhook-service"` | The name of the Webhook Service. |
 | service.port | int | `443` |  |
 | service.type | string | `"ClusterIP"` |  |
 | serviceAccount.create | bool | `true` | Specifies whether the service account should be created. |
 | serviceAccount.name | string | `""` | The name of the service account to use. If not set and create is true, a name is generated using the fullname template. |
 | tolerations | list | `[]` | Tolerations for the operator to be installed. |
 | topologySpreadConstraints | list | `[]` | Topology Spread Constraints for the operator to be installed. |
-| updateStrategy | object | `{}` | Update strategy for the operator. ref: https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#strategy For example:  type: RollingUpdate  rollingUpdate:    maxSurge: 25%    maxUnavailable: 25% |
+| updateStrategy | object | `{}` | Update strategy for the operator. ref: https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#strategy |
 | webhook | object | `{"livenessProbe":{"initialDelaySeconds":3},"mutating":{"create":true,"failurePolicy":"Fail"},"port":9443,"readinessProbe":{"initialDelaySeconds":3},"startupProbe":{"failureThreshold":6,"periodSeconds":5},"validating":{"create":true,"failurePolicy":"Fail"}}` | The webhook configuration. |
 
+## Maintainers
+
+| Name | Email | Url |
+| ---- | ------ | --- |
+| phisco | <p.scorsolini@gmail.com> |  |
+
+Contributing
+------------
+
+Please read the [code of conduct](https://github.com/cloudnative-pg/charts/blob/main/CODE-OF-CONDUCT.md) and the
+[guidelines](https://github.com/cloudnative-pg/charts/blob/main/CONTRIBUTING.md) to contribute to the project.
+
+Copyright
+---------
+
+Helm charts for CloudNativePG are distributed under [Apache License 2.0](./LICENSE).
diff --git a/packages/system/postgres-operator/charts/cloudnative-pg/README.md.gotmpl b/packages/system/postgres-operator/charts/cloudnative-pg/README.md.gotmpl
new file mode 100644
index 0000000000..1a12a7559f
--- /dev/null
+++ b/packages/system/postgres-operator/charts/cloudnative-pg/README.md.gotmpl
@@ -0,0 +1,139 @@
+{{ template "chart.header" . }}
+
+
+{{ template "chart.deprecationWarning" . }}
+
+
+{{ template "chart.badgesSection" . }}
+
+
+{{ template "chart.description" . }}
+
+
+{{ template "chart.homepageLine" . }}
+
+
+About this chart
+----------------
+
+Helm chart to install the [CloudNativePG operator](https://cloudnative-pg.io), originally created and sponsored
+by [EDB](https://www.enterprisedb.com/) to manage PostgreSQL workloads on any supported Kubernetes cluster
+running in private, public, or hybrid cloud environments.
+
+**NOTE**: this chart supports only the latest point release of the CloudNativePG operator.
+
+The chart installs only the operator (controller manager, webhooks, RBAC and CRDs). To provision a PostgreSQL
+`Cluster` resource, use the companion [`cluster`](https://github.com/cloudnative-pg/charts/tree/main/charts/cluster) chart
+(see the [Cluster chart README](https://github.com/cloudnative-pg/charts/blob/main/charts/cluster/README.md) for details)
+or apply your own `Cluster` manifest.
+
+
+Getting Started
+---------------
+
+### Add the chart repository
+
+```console
+helm repo add cnpg https://cloudnative-pg.github.io/charts
+helm repo update
+```
+
+### Install the operator
+
+```console
+helm upgrade --install cnpg \
+  --namespace cnpg-system \
+  --create-namespace \
+  cnpg/cloudnative-pg
+```
+
+### Install with custom parameters
+
+You can override individual chart values from the command line with `--set`.
+For example, to enable the Prometheus `PodMonitor`:
+
+```console
+helm upgrade --install cnpg \
+  --namespace cnpg-system \
+  --create-namespace \
+  --set monitoring.podMonitorEnabled=true \
+  cnpg/cloudnative-pg
+```
+
+> **Note**
+> Enabling the `PodMonitor` requires the Prometheus Operator CRDs to be installed in the cluster.
+> Without them the install fails with `no matches for kind "PodMonitor"`.
+
+See the [Values](#values) section below for the full list of configurable parameters.
+
+### Verify the installation
+
+```console
+kubectl -n cnpg-system get deploy
+kubectl -n cnpg-system rollout status deploy/cnpg-cloudnative-pg
+```
+
+
+Single namespace installation
+-----------------------------
+
+It is possible to limit the operator's capabilities to solely the namespace in which it has been installed.
+With this restriction, the cluster-level permissions required by the operator will be substantially reduced,
+and the security profile of the installation will be enhanced.
+
+You can install the operator in single-namespace mode by setting the `config.clusterWide` flag to `false`,
+as in the following example:
+
+```console
+helm upgrade --install cnpg \
+  --namespace cnpg-system \
+  --create-namespace \
+  --set config.clusterWide=false \
+  cnpg/cloudnative-pg
+```
+
+**IMPORTANT**: the single-namespace installation mode can't coexist with the cluster-wide operator. Otherwise
+there would be collisions when managing the resources in the namespace watched by the single-namespace
+operator. It is up to the user to ensure there is no collision between operators.
+
+
+Uninstalling
+------------
+
+```console
+helm uninstall cnpg --namespace cnpg-system
+```
+
+> **Warning**
+> Uninstalling the chart does not remove the CRDs. Deleting them cascade-deletes every `Cluster` (and other
+> CloudNativePG) resource across the whole cluster, together with the PostgreSQL data stored in their PVCs.
+> This is irreversible, so only delete the CRDs if you intend to permanently remove all managed databases.
+
+
+{{ template "chart.sourcesSection" . }}
+
+
+{{ template "chart.requirementsSection" . }}
+
+
+{{ template "chart.valuesSection" . }}
+
+
+{{ template "chart.maintainersSection" . }}
+
+Contributing
+------------
+
+Please read the [code of conduct](https://github.com/cloudnative-pg/charts/blob/main/CODE-OF-CONDUCT.md) and the
+[guidelines](https://github.com/cloudnative-pg/charts/blob/main/CONTRIBUTING.md) to contribute to the project.
+
+
+Copyright
+---------
+
+Helm charts for CloudNativePG are distributed under [Apache License 2.0](./LICENSE).
+
+
+{{- if not .SkipVersionFooter }}
+{{ template "helm-docs.versionFooter" . }}
+{{- end }}
diff --git a/packages/system/postgres-operator/charts/cloudnative-pg/templates/_helpers.tpl b/packages/system/postgres-operator/charts/cloudnative-pg/templates/_helpers.tpl
index 045b06d9da..6c6e031ea9 100644
--- a/packages/system/postgres-operator/charts/cloudnative-pg/templates/_helpers.tpl
+++ b/packages/system/postgres-operator/charts/cloudnative-pg/templates/_helpers.tpl
@@ -167,7 +167,17 @@ namespace scope or clusterwide
   verbs:
   - create
   - get
+  - list
   - update
+  - watch
+- apiGroups:
+  - discovery.k8s.io
+  resources:
+  - endpointslices
+  verbs:
+  - get
+  - list
+  - watch
 - apiGroups:
   - monitoring.coreos.com
   resources:
@@ -196,6 +206,7 @@ namespace scope or clusterwide
   resources:
   - backups
   - clusters
+  - databaseroles
   - databases
   - poolers
   - publications
@@ -243,6 +254,7 @@ namespace scope or clusterwide
   - postgresql.cnpg.io
   resources:
   - clusters/finalizers
+  - databaseroles/finalizers
   - poolers/finalizers
   verbs:
   - update
@@ -250,6 +262,7 @@ namespace scope or clusterwide
   - postgresql.cnpg.io
   resources:
   - clusters/status
+  - databaseroles/status
   - poolers/status
   - failoverquorums/status
   verbs:
diff --git a/packages/system/postgres-operator/charts/cloudnative-pg/templates/crds/crds.yaml b/packages/system/postgres-operator/charts/cloudnative-pg/templates/crds/crds.yaml
index ef934e1b86..62c8634b56 100644
--- a/packages/system/postgres-operator/charts/cloudnative-pg/templates/crds/crds.yaml
+++ b/packages/system/postgres-operator/charts/cloudnative-pg/templates/crds/crds.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.19.0
+    controller-gen.kubebuilder.io/version: v0.21.0
     helm.sh/resource-policy: keep
   name: backups.postgresql.cnpg.io
 spec:
@@ -215,6 +215,11 @@ spec:
                     - key
                     - name
                     type: object
+                  useDefaultAzureCredentials:
+                    description: |-
+                      Use the default Azure authentication flow, which includes DefaultAzureCredential.
+                      This allows authentication using environment variables and managed identities.
+                    type: boolean
                 type: object
               backupId:
                 description: The ID of the Barman backup
@@ -312,6 +317,13 @@ spec:
                   podName:
                     description: The pod name
                     type: string
+                  sessionID:
+                    description: |-
+                      The instance manager session ID. This is a unique identifier generated at instance manager
+                      startup and changes on every restart (including container reboots). Used to detect if
+                      the instance manager was restarted during long-running operations like backups, which
+                      would terminate any running backup process.
+                    type: string
                 type: object
               majorVersion:
                 description: |-
@@ -333,6 +345,15 @@ spec:
                   type: string
                 description: A map containing the plugin metadata
                 type: object
+              reconciliationStartedAt:
+                description: When the backup process was started by the operator
+                format: date-time
+                type: string
+              reconciliationTerminatedAt:
+                description: When the reconciliation was terminated by the operator
+                  (either successfully or not)
+                format: date-time
+                type: string
               s3Credentials:
                 description: The credentials to use to upload data to S3
                 properties:
@@ -428,11 +449,12 @@ spec:
                     type: array
                 type: object
               startedAt:
-                description: When the backup was started
+                description: When the backup execution was started by the backup tool
                 format: date-time
                 type: string
               stoppedAt:
-                description: When the backup was terminated
+                description: When the backup execution was terminated by the backup
+                  tool
                 format: date-time
                 type: string
               tablespaceMapFile:
@@ -454,7 +476,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.19.0
+    controller-gen.kubebuilder.io/version: v0.21.0
     helm.sh/resource-policy: keep
   name: clusterimagecatalogs.postgresql.cnpg.io
 spec:
@@ -498,11 +520,150 @@ spec:
               Specification of the desired behavior of the ClusterImageCatalog.
               More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#spec-and-status
             properties:
+              componentImages:
+                description: |-
+                  ComponentImages is a list of named images for components other than PostgreSQL
+                  (e.g. pgbouncer). Keys must be unique within a catalog.
+                items:
+                  description: CatalogComponentImage is a named image entry for a
+                    non-PostgreSQL component.
+                  properties:
+                    image:
+                      description: Image is the container image reference.
+                      type: string
+                    key:
+                      description: Key is the unique identifier for this image within
+                        the catalog.
+                      maxLength: 63
+                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                      type: string
+                  required:
+                  - image
+                  - key
+                  type: object
+                maxItems: 32
+                type: array
+                x-kubernetes-list-map-keys:
+                - key
+                x-kubernetes-list-type: map
+                x-kubernetes-validations:
+                - message: Component image keys must be unique
+                  rule: self.all(e, self.filter(f, f.key==e.key).size() == 1)
               images:
                 description: List of CatalogImages available in the catalog
                 items:
                   description: CatalogImage defines the image and major version
                   properties:
+                    extensions:
+                      description: The configuration of the extensions to be added
+                      items:
+                        description: |-
+                          ExtensionConfiguration is the configuration used to add
+                          PostgreSQL extensions to the Cluster.
+                        properties:
+                          bin_path:
+                            description: |-
+                              A list of directories within the image to be appended to the
+                              PostgreSQL process's `PATH` environment variable.
+                            items:
+                              type: string
+                            type: array
+                          dynamic_library_path:
+                            description: |-
+                              The list of directories inside the image which should be added to dynamic_library_path.
+                              If not defined, defaults to "/lib".
+                            items:
+                              type: string
+                            type: array
+                          env:
+                            description: |-
+                              Env is a list of custom environment variables to be set in the
+                              PostgreSQL process for this extension. It is the responsibility of the
+                              cluster administrator to ensure the variables are correct for the
+                              specific extension. Note that changes to these variables require
+                              a manual cluster restart to take effect.
+                            items:
+                              description: |-
+                                ExtensionEnvVar defines an environment variable for a specific extension
+                                image volume.
+                              properties:
+                                name:
+                                  description: |-
+                                    Name of the environment variable to be injected into the
+                                    PostgreSQL process.
+                                  minLength: 1
+                                  pattern: ^[a-zA-Z_][a-zA-Z0-9_]*$
+                                  type: string
+                                value:
+                                  description: |-
+                                    Value of the environment variable. CloudNativePG performs a direct
+                                    replacement of this value, with support for placeholder expansion.
+                                    The ${`image_root`} placeholder resolves to the absolute mount path
+                                    of the extension's volume (e.g., `/extensions/my-extension`). This
+                                    is particularly useful for allowing applications or libraries to
+                                    locate specific directories within the mounted image.
+                                    Unrecognized placeholders are rejected. To include a literal ${...}
+                                    in the value, escape it as $${...}.
+                                  minLength: 1
+                                  type: string
+                              required:
+                              - name
+                              - value
+                              type: object
+                            type: array
+                            x-kubernetes-list-map-keys:
+                            - name
+                            x-kubernetes-list-type: map
+                          extension_control_path:
+                            description: |-
+                              The list of directories inside the image which should be added to extension_control_path.
+                              If not defined, defaults to "/share".
+                            items:
+                              type: string
+                            type: array
+                          image:
+                            description: The image containing the extension.
+                            properties:
+                              pullPolicy:
+                                description: |-
+                                  Policy for pulling OCI objects. Possible values are:
+                                  Always: the kubelet always attempts to pull the reference. Container creation will fail If the pull fails.
+                                  Never: the kubelet never pulls the reference and only uses a local image or artifact. Container creation will fail if the reference isn't present.
+                                  IfNotPresent: the kubelet pulls if the reference isn't already present on disk. Container creation will fail if the reference isn't present and the pull fails.
+                                  Defaults to Always if :latest tag is specified, or IfNotPresent otherwise.
+                                type: string
+                              reference:
+                                description: |-
+                                  Required: Image or artifact reference to be used.
+                                  Behaves in the same way as pod.spec.containers[*].image.
+                                  Pull secrets will be assembled in the same way as for the container image by looking up node credentials, SA image pull secrets, and pod spec image pull secrets.
+                                  More info: https://kubernetes.io/docs/concepts/containers/images
+                                  This field is optional to allow higher level config management to default or override
+                                  container images in workload controllers like Deployments and StatefulSets.
+                                type: string
+                            type: object
+                          ld_library_path:
+                            description: The list of directories inside the image
+                              which should be added to ld_library_path.
+                            items:
+                              type: string
+                            type: array
+                          name:
+                            description: |-
+                              The name of the extension, required. The limit of 59 characters
+                              leaves room for the prefix the operator adds when deriving the
+                              extension's Kubernetes Volume name (capped at 63 characters).
+                            maxLength: 59
+                            minLength: 1
+                            pattern: ^[a-z0-9]([-a-z0-9_]*[a-z0-9])?$
+                            type: string
+                        required:
+                        - name
+                        type: object
+                      type: array
+                      x-kubernetes-list-map-keys:
+                      - name
+                      x-kubernetes-list-type: map
                     image:
                       description: The image reference
                       type: string
@@ -536,7 +697,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.19.0
+    controller-gen.kubebuilder.io/version: v0.21.0
     helm.sh/resource-policy: keep
   name: clusters.postgresql.cnpg.io
 spec:
@@ -1554,9 +1715,10 @@ spec:
                         operator:
                           description: |-
                             Operator represents a key's relationship to the value.
-                            Valid operators are Exists and Equal. Defaults to Equal.
+                            Valid operators are Exists, Equal, Lt, and Gt. Defaults to Equal.
                             Exists is equivalent to wildcard for value, so that a pod can
                             tolerate all taints of a particular category.
+                            Lt and Gt perform numeric comparisons (requires feature gate TaintTolerationComparisonOperators).
                           type: string
                         tolerationSeconds:
                           description: |-
@@ -1649,6 +1811,11 @@ spec:
                             - key
                             - name
                             type: object
+                          useDefaultAzureCredentials:
+                            description: |-
+                              Use the default Azure authentication flow, which includes DefaultAzureCredential.
+                              This allows authentication using environment variables and managed identities.
+                            type: boolean
                         type: object
                       data:
                         description: |-
@@ -1680,10 +1847,11 @@ spec:
                             description: |-
                               Compress a backup file (a tar file per tablespace) while streaming it
                               to the object store. Available options are empty string (no
-                              compression, default), `gzip`, `bzip2`, and `snappy`.
+                              compression, default), `gzip`, `bzip2`, `lz4`, and `snappy`.
                             enum:
                             - bzip2
                             - gzip
+                            - lz4
                             - snappy
                             type: string
                           encryption:
@@ -2070,19 +2238,59 @@ spec:
                             type: array
                           pgDumpExtraOptions:
                             description: |-
-                              List of custom options to pass to the `pg_dump` command. IMPORTANT:
-                              Use these options with caution and at your own risk, as the operator
-                              does not validate their content. Be aware that certain options may
-                              conflict with the operator's intended functionality or design.
+                              List of custom options to pass to the `pg_dump` command.
+
+                              IMPORTANT: Use with caution. The operator does not validate these options,
+                              and certain flags may interfere with its intended functionality or design.
+                              You are responsible for ensuring that the provided options are compatible
+                              with your environment and desired behavior.
+                            items:
+                              type: string
+                            type: array
+                          pgRestoreDataOptions:
+                            description: |-
+                              Custom options to pass to the `pg_restore` command during the `data`
+                              section. This setting overrides the generic `pgRestoreExtraOptions` value.
+
+                              IMPORTANT: Use with caution. The operator does not validate these options,
+                              and certain flags may interfere with its intended functionality or design.
+                              You are responsible for ensuring that the provided options are compatible
+                              with your environment and desired behavior.
                             items:
                               type: string
                             type: array
                           pgRestoreExtraOptions:
                             description: |-
-                              List of custom options to pass to the `pg_restore` command. IMPORTANT:
-                              Use these options with caution and at your own risk, as the operator
-                              does not validate their content. Be aware that certain options may
-                              conflict with the operator's intended functionality or design.
+                              List of custom options to pass to the `pg_restore` command.
+
+                              IMPORTANT: Use with caution. The operator does not validate these options,
+                              and certain flags may interfere with its intended functionality or design.
+                              You are responsible for ensuring that the provided options are compatible
+                              with your environment and desired behavior.
+                            items:
+                              type: string
+                            type: array
+                          pgRestorePostdataOptions:
+                            description: |-
+                              Custom options to pass to the `pg_restore` command during the `post-data`
+                              section. This setting overrides the generic `pgRestoreExtraOptions` value.
+
+                              IMPORTANT: Use with caution. The operator does not validate these options,
+                              and certain flags may interfere with its intended functionality or design.
+                              You are responsible for ensuring that the provided options are compatible
+                              with your environment and desired behavior.
+                            items:
+                              type: string
+                            type: array
+                          pgRestorePredataOptions:
+                            description: |-
+                              Custom options to pass to the `pg_restore` command during the `pre-data`
+                              section. This setting overrides the generic `pgRestoreExtraOptions` value.
+
+                              IMPORTANT: Use with caution. The operator does not validate these options,
+                              and certain flags may interfere with its intended functionality or design.
+                              You are responsible for ensuring that the provided options are compatible
+                              with your environment and desired behavior.
                             items:
                               type: string
                             type: array
@@ -2146,6 +2354,7 @@ spec:
                       options:
                         description: |-
                           The list of options that must be passed to initdb when creating the cluster.
+
                           Deprecated: This could lead to inconsistent configurations,
                           please use the explicit provided parameters instead.
                           If defined, explicit values will be ignored.
@@ -2470,8 +2679,9 @@ spec:
                               integer)
                             type: string
                           targetTime:
-                            description: The target time as a timestamp in the RFC3339
-                              standard
+                            description: |-
+                              The target time as a timestamp in RFC3339 format or PostgreSQL timestamp format.
+                              Timestamps without an explicit timezone are interpreted as UTC.
                             type: string
                           targetXID:
                             description: The target transaction ID
@@ -2990,7 +3200,7 @@ spec:
                           resources:
                             description: |-
                               resources represents the minimum resources the volume should have.
-                              If RecoverVolumeExpansionFailure feature is enabled users are allowed to specify resource requirements
+                              Users are allowed to specify resource requirements
                               that are lower than previous value but must still be higher than capacity recorded in the
                               status field of the claim.
                               More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources
@@ -3194,6 +3404,11 @@ spec:
                               - key
                               - name
                               type: object
+                            useDefaultAzureCredentials:
+                              description: |-
+                                Use the default Azure authentication flow, which includes DefaultAzureCredential.
+                                This allows authentication using environment variables and managed identities.
+                              type: boolean
                           type: object
                         data:
                           description: |-
@@ -3225,10 +3440,11 @@ spec:
                               description: |-
                                 Compress a backup file (a tar file per tablespace) while streaming it
                                 to the object store. Available options are empty string (no
-                                compression, default), `gzip`, `bzip2`, and `snappy`.
+                                compression, default), `gzip`, `bzip2`, `lz4`, and `snappy`.
                               enum:
                               - bzip2
                               - gzip
+                              - lz4
                               - snappy
                               type: string
                             encryption:
@@ -3779,6 +3995,8 @@ spec:
                           description: |-
                             List of one or more existing roles to which this role will be
                             immediately added as a new member. Default empty.
+                            Changes to the list are applied to an existing role through
+                            `GRANT` and `REVOKE` statements, not only at role creation.
                           items:
                             type: string
                           type: array
@@ -3786,7 +4004,7 @@ spec:
                           default: true
                           description: |-
                             Whether a role "inherits" the privileges of roles it is a member of.
-                            Defaults is `true`.
+                            Default is `true`.
                           type: boolean
                         login:
                           description: |-
@@ -3800,8 +4018,10 @@ spec:
                           type: string
                         passwordSecret:
                           description: |-
-                            Secret containing the password of the role (if present)
-                            If null, the password will be ignored unless DisablePassword is set
+                            Secret containing the password of the role (if present).
+                            If null, the password will be ignored unless DisablePassword is set.
+                            When set, the secret must follow the `kubernetes.io/basic-auth` format
+                            and contain both a `username` and a `password` field.
                           properties:
                             name:
                               description: Name of the referent.
@@ -4334,6 +4554,14 @@ spec:
                       Deprecated: This feature will be removed in an upcoming release. If
                       you need this functionality, you can create a PodMonitor manually.
                     type: boolean
+                  metricsQueriesTTL:
+                    description: |-
+                      The interval during which metrics computed from queries are considered current.
+                      Once it is exceeded, a new scrape will trigger a rerun
+                      of the queries.
+                      If not set, defaults to 30 seconds, in line with Prometheus scraping defaults.
+                      Setting this to zero disables the caching mechanism and can cause heavy load on the PostgreSQL server.
+                    type: string
                   podMonitorMetricRelabelings:
                     description: |-
                       The list of metric relabelings for the `PodMonitor`. Applied to samples before ingestion.
@@ -4575,6 +4803,318 @@ spec:
                   - name
                   type: object
                 type: array
+              podSecurityContext:
+                description: |-
+                  Override the PodSecurityContext applied to every Pod of the cluster.
+                  When set, this overrides the operator's default PodSecurityContext for the cluster.
+                  If omitted, the operator defaults are used.
+                  This field doesn't have any effect if SecurityContextConstraints are present.
+                properties:
+                  appArmorProfile:
+                    description: |-
+                      appArmorProfile is the AppArmor options to use by the containers in this pod.
+                      Note that this field cannot be set when spec.os.name is windows.
+                    properties:
+                      localhostProfile:
+                        description: |-
+                          localhostProfile indicates a profile loaded on the node that should be used.
+                          The profile must be preconfigured on the node to work.
+                          Must match the loaded name of the profile.
+                          Must be set if and only if type is "Localhost".
+                        type: string
+                      type:
+                        description: |-
+                          type indicates which kind of AppArmor profile will be applied.
+                          Valid options are:
+                            Localhost - a profile pre-loaded on the node.
+                            RuntimeDefault - the container runtime's default profile.
+                            Unconfined - no AppArmor enforcement.
+                        type: string
+                    required:
+                    - type
+                    type: object
+                  fsGroup:
+                    description: |-
+                      A special supplemental group that applies to all containers in a pod.
+                      Some volume types allow the Kubelet to change the ownership of that volume
+                      to be owned by the pod:
+
+                      1. The owning GID will be the FSGroup
+                      2. The setgid bit is set (new files created in the volume will be owned by FSGroup)
+                      3. The permission bits are OR'd with rw-rw----
+
+                      If unset, the Kubelet will not modify the ownership and permissions of any volume.
+                      Note that this field cannot be set when spec.os.name is windows.
+                    format: int64
+                    type: integer
+                  fsGroupChangePolicy:
+                    description: |-
+                      fsGroupChangePolicy defines behavior of changing ownership and permission of the volume
+                      before being exposed inside Pod. This field will only apply to
+                      volume types which support fsGroup based ownership(and permissions).
+                      It will have no effect on ephemeral volume types such as: secret, configmaps
+                      and emptydir.
+                      Valid values are "OnRootMismatch" and "Always". If not specified, "Always" is used.
+                      Note that this field cannot be set when spec.os.name is windows.
+                    type: string
+                  runAsGroup:
+                    description: |-
+                      The GID to run the entrypoint of the container process.
+                      Uses runtime default if unset.
+                      May also be set in SecurityContext.  If set in both SecurityContext and
+                      PodSecurityContext, the value specified in SecurityContext takes precedence
+                      for that container.
+                      Note that this field cannot be set when spec.os.name is windows.
+                    format: int64
+                    type: integer
+                  runAsNonRoot:
+                    description: |-
+                      Indicates that the container must run as a non-root user.
+                      If true, the Kubelet will validate the image at runtime to ensure that it
+                      does not run as UID 0 (root) and fail to start the container if it does.
+                      If unset or false, no such validation will be performed.
+                      May also be set in SecurityContext.  If set in both SecurityContext and
+                      PodSecurityContext, the value specified in SecurityContext takes precedence.
+                    type: boolean
+                  runAsUser:
+                    description: |-
+                      The UID to run the entrypoint of the container process.
+                      Defaults to user specified in image metadata if unspecified.
+                      May also be set in SecurityContext.  If set in both SecurityContext and
+                      PodSecurityContext, the value specified in SecurityContext takes precedence
+                      for that container.
+                      Note that this field cannot be set when spec.os.name is windows.
+                    format: int64
+                    type: integer
+                  seLinuxChangePolicy:
+                    description: |-
+                      seLinuxChangePolicy defines how the container's SELinux label is applied to all volumes used by the Pod.
+                      It has no effect on nodes that do not support SELinux or to volumes does not support SELinux.
+                      Valid values are "MountOption" and "Recursive".
+
+                      "Recursive" means relabeling of all files on all Pod volumes by the container runtime.
+                      This may be slow for large volumes, but allows mixing privileged and unprivileged Pods sharing the same volume on the same node.
+
+                      "MountOption" mounts all eligible Pod volumes with `-o context` mount option.
+                      This requires all Pods that share the same volume to use the same SELinux label.
+                      It is not possible to share the same volume among privileged and unprivileged Pods.
+                      Eligible volumes are in-tree FibreChannel and iSCSI volumes, and all CSI volumes
+                      whose CSI driver announces SELinux support by setting spec.seLinuxMount: true in their
+                      CSIDriver instance. Other volumes are always re-labelled recursively.
+                      "MountOption" value is allowed only when SELinuxMount feature gate is enabled.
+
+                      If not specified and SELinuxMount feature gate is enabled, "MountOption" is used.
+                      If not specified and SELinuxMount feature gate is disabled, "MountOption" is used for ReadWriteOncePod volumes
+                      and "Recursive" for all other volumes.
+
+                      This field affects only Pods that have SELinux label set, either in PodSecurityContext or in SecurityContext of all containers.
+
+                      All Pods that use the same volume should use the same seLinuxChangePolicy, otherwise some pods can get stuck in ContainerCreating state.
+                      Note that this field cannot be set when spec.os.name is windows.
+                    type: string
+                  seLinuxOptions:
+                    description: |-
+                      The SELinux context to be applied to all containers.
+                      If unspecified, the container runtime will allocate a random SELinux context for each
+                      container.  May also be set in SecurityContext.  If set in
+                      both SecurityContext and PodSecurityContext, the value specified in SecurityContext
+                      takes precedence for that container.
+                      Note that this field cannot be set when spec.os.name is windows.
+                    properties:
+                      level:
+                        description: Level is SELinux level label that applies to
+                          the container.
+                        type: string
+                      role:
+                        description: Role is a SELinux role label that applies to
+                          the container.
+                        type: string
+                      type:
+                        description: Type is a SELinux type label that applies to
+                          the container.
+                        type: string
+                      user:
+                        description: User is a SELinux user label that applies to
+                          the container.
+                        type: string
+                    type: object
+                  seccompProfile:
+                    description: |-
+                      The seccomp options to use by the containers in this pod.
+                      Note that this field cannot be set when spec.os.name is windows.
+                    properties:
+                      localhostProfile:
+                        description: |-
+                          localhostProfile indicates a profile defined in a file on the node should be used.
+                          The profile must be preconfigured on the node to work.
+                          Must be a descending path, relative to the kubelet's configured seccomp profile location.
+                          Must be set if type is "Localhost". Must NOT be set for any other type.
+                        type: string
+                      type:
+                        description: |-
+                          type indicates which kind of seccomp profile will be applied.
+                          Valid options are:
+
+                          Localhost - a profile defined in a file on the node should be used.
+                          RuntimeDefault - the container runtime default profile should be used.
+                          Unconfined - no profile should be applied.
+                        type: string
+                    required:
+                    - type
+                    type: object
+                  supplementalGroups:
+                    description: |-
+                      A list of groups applied to the first process run in each container, in
+                      addition to the container's primary GID and fsGroup (if specified).  If
+                      the SupplementalGroupsPolicy feature is enabled, the
+                      supplementalGroupsPolicy field determines whether these are in addition
+                      to or instead of any group memberships defined in the container image.
+                      If unspecified, no additional groups are added, though group memberships
+                      defined in the container image may still be used, depending on the
+                      supplementalGroupsPolicy field.
+                      Note that this field cannot be set when spec.os.name is windows.
+                    items:
+                      format: int64
+                      type: integer
+                    type: array
+                    x-kubernetes-list-type: atomic
+                  supplementalGroupsPolicy:
+                    description: |-
+                      Defines how supplemental groups of the first container processes are calculated.
+                      Valid values are "Merge" and "Strict". If not specified, "Merge" is used.
+                      (Alpha) Using the field requires the SupplementalGroupsPolicy feature gate to be enabled
+                      and the container runtime must implement support for this feature.
+                      Note that this field cannot be set when spec.os.name is windows.
+                    type: string
+                  sysctls:
+                    description: |-
+                      Sysctls hold a list of namespaced sysctls used for the pod. Pods with unsupported
+                      sysctls (by the container runtime) might fail to launch.
+                      Note that this field cannot be set when spec.os.name is windows.
+                    items:
+                      description: Sysctl defines a kernel parameter to be set
+                      properties:
+                        name:
+                          description: Name of a property to set
+                          type: string
+                        value:
+                          description: Value of a property to set
+                          type: string
+                      required:
+                      - name
+                      - value
+                      type: object
+                    type: array
+                    x-kubernetes-list-type: atomic
+                  windowsOptions:
+                    description: |-
+                      The Windows specific settings applied to all containers.
+                      If unspecified, the options within a container's SecurityContext will be used.
+                      If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence.
+                      Note that this field cannot be set when spec.os.name is linux.
+                    properties:
+                      gmsaCredentialSpec:
+                        description: |-
+                          GMSACredentialSpec is where the GMSA admission webhook
+                          (https://github.com/kubernetes-sigs/windows-gmsa) inlines the contents of the
+                          GMSA credential spec named by the GMSACredentialSpecName field.
+                        type: string
+                      gmsaCredentialSpecName:
+                        description: GMSACredentialSpecName is the name of the GMSA
+                          credential spec to use.
+                        type: string
+                      hostProcess:
+                        description: |-
+                          HostProcess determines if a container should be run as a 'Host Process' container.
+                          All of a Pod's containers must have the same effective HostProcess value
+                          (it is not allowed to have a mix of HostProcess containers and non-HostProcess containers).
+                          In addition, if HostProcess is true then HostNetwork must also be set to true.
+                        type: boolean
+                      runAsUserName:
+                        description: |-
+                          The UserName in Windows to run the entrypoint of the container process.
+                          Defaults to the user specified in image metadata if unspecified.
+                          May also be set in PodSecurityContext. If set in both SecurityContext and
+                          PodSecurityContext, the value specified in SecurityContext takes precedence.
+                        type: string
+                    type: object
+                type: object
+              podSelectorRefs:
+                description: |-
+                  PodSelectorRefs defines named pod label selectors that can be referenced
+                  in pg_hba rules using the ${podselector:NAME} syntax in the address field.
+                  The operator resolves matching pod IPs and the instance manager expands
+                  pg_hba lines accordingly. Only pods in the Cluster's own namespace are considered.
+                items:
+                  description: |-
+                    PodSelectorRef defines a named pod label selector for use in pg_hba rules.
+                    Pods matching the selector in the Cluster's namespace will have their IPs
+                    resolved and made available for pg_hba address expansion via the
+                    `${podselector:NAME}` syntax.
+                  properties:
+                    name:
+                      description: |-
+                        Name is the identifier used to reference this selector in pg_hba rules
+                        via the ${podselector:NAME} syntax in the address field.
+                      minLength: 1
+                      pattern: ^[a-z]([a-z0-9_-]*[a-z0-9])?$
+                      type: string
+                    selector:
+                      description: |-
+                        Selector is a label selector that identifies the pods whose IPs
+                        should be resolved. Only pods in the Cluster's namespace are considered.
+                      properties:
+                        matchExpressions:
+                          description: matchExpressions is a list of label selector
+                            requirements. The requirements are ANDed.
+                          items:
+                            description: |-
+                              A label selector requirement is a selector that contains values, a key, and an operator that
+                              relates the key and values.
+                            properties:
+                              key:
+                                description: key is the label key that the selector
+                                  applies to.
+                                type: string
+                              operator:
+                                description: |-
+                                  operator represents a key's relationship to a set of values.
+                                  Valid operators are In, NotIn, Exists and DoesNotExist.
+                                type: string
+                              values:
+                                description: |-
+                                  values is an array of string values. If the operator is In or NotIn,
+                                  the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                  the values array must be empty. This array is replaced during a strategic
+                                  merge patch.
+                                items:
+                                  type: string
+                                type: array
+                                x-kubernetes-list-type: atomic
+                            required:
+                            - key
+                            - operator
+                            type: object
+                          type: array
+                          x-kubernetes-list-type: atomic
+                        matchLabels:
+                          additionalProperties:
+                            type: string
+                          description: |-
+                            matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                            map is equivalent to an element of matchExpressions, whose key field is "key", the
+                            operator is "In", and the values array contains only "value". The requirements are ANDed.
+                          type: object
+                      type: object
+                      x-kubernetes-map-type: atomic
+                  required:
+                  - name
+                  - selector
+                  type: object
+                type: array
+                x-kubernetes-list-map-keys:
+                - name
+                x-kubernetes-list-type: map
               postgresGID:
                 default: 26
                 description: The GID of the `postgres` user inside the image, defaults
@@ -4604,6 +5144,13 @@ spec:
                         ExtensionConfiguration is the configuration used to add
                         PostgreSQL extensions to the Cluster.
                       properties:
+                        bin_path:
+                          description: |-
+                            A list of directories within the image to be appended to the
+                            PostgreSQL process's `PATH` environment variable.
+                          items:
+                            type: string
+                          type: array
                         dynamic_library_path:
                           description: |-
                             The list of directories inside the image which should be added to dynamic_library_path.
@@ -4611,6 +5158,45 @@ spec:
                           items:
                             type: string
                           type: array
+                        env:
+                          description: |-
+                            Env is a list of custom environment variables to be set in the
+                            PostgreSQL process for this extension. It is the responsibility of the
+                            cluster administrator to ensure the variables are correct for the
+                            specific extension. Note that changes to these variables require
+                            a manual cluster restart to take effect.
+                          items:
+                            description: |-
+                              ExtensionEnvVar defines an environment variable for a specific extension
+                              image volume.
+                            properties:
+                              name:
+                                description: |-
+                                  Name of the environment variable to be injected into the
+                                  PostgreSQL process.
+                                minLength: 1
+                                pattern: ^[a-zA-Z_][a-zA-Z0-9_]*$
+                                type: string
+                              value:
+                                description: |-
+                                  Value of the environment variable. CloudNativePG performs a direct
+                                  replacement of this value, with support for placeholder expansion.
+                                  The ${`image_root`} placeholder resolves to the absolute mount path
+                                  of the extension's volume (e.g., `/extensions/my-extension`). This
+                                  is particularly useful for allowing applications or libraries to
+                                  locate specific directories within the mounted image.
+                                  Unrecognized placeholders are rejected. To include a literal ${...}
+                                  in the value, escape it as $${...}.
+                                minLength: 1
+                                type: string
+                            required:
+                            - name
+                            - value
+                            type: object
+                          type: array
+                          x-kubernetes-list-map-keys:
+                          - name
+                          x-kubernetes-list-type: map
                         extension_control_path:
                           description: |-
                             The list of directories inside the image which should be added to extension_control_path.
@@ -4619,7 +5205,7 @@ spec:
                             type: string
                           type: array
                         image:
-                          description: The image containing the extension, required
+                          description: The image containing the extension.
                           properties:
                             pullPolicy:
                               description: |-
@@ -4639,9 +5225,6 @@ spec:
                                 container images in workload controllers like Deployments and StatefulSets.
                               type: string
                           type: object
-                          x-kubernetes-validations:
-                          - message: An image reference is required
-                            rule: has(self.reference)
                         ld_library_path:
                           description: The list of directories inside the image which
                             should be added to ld_library_path.
@@ -4649,15 +5232,21 @@ spec:
                             type: string
                           type: array
                         name:
-                          description: The name of the extension, required
+                          description: |-
+                            The name of the extension, required. The limit of 59 characters
+                            leaves room for the prefix the operator adds when deriving the
+                            extension's Kubernetes Volume name (capped at 63 characters).
+                          maxLength: 59
                           minLength: 1
-                          pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                          pattern: ^[a-z0-9]([-a-z0-9_]*[a-z0-9])?$
                           type: string
                       required:
-                      - image
                       - name
                       type: object
                     type: array
+                    x-kubernetes-list-map-keys:
+                    - name
+                    x-kubernetes-list-type: map
                   ldap:
                     description: Options to specify LDAP configuration
                     properties:
@@ -4739,7 +5328,9 @@ spec:
                   pg_hba:
                     description: |-
                       PostgreSQL Host Based Authentication rules (lines to be appended
-                      to the pg_hba.conf file)
+                      to the pg_hba.conf file).
+                      Use the ${podselector:NAME} syntax to reference a pod selector;
+                      the rule will be expanded for each Pod IP matching that selector.
                     items:
                       type: string
                     type: array
@@ -4798,6 +5389,12 @@ spec:
                         - required
                         - preferred
                         type: string
+                      failoverQuorum:
+                        description: |-
+                          FailoverQuorum enables a quorum-based check before failover, improving
+                          data durability and safety during failover events in CloudNativePG-managed
+                          PostgreSQL clusters.
+                        type: boolean
                       maxStandbyNamesFromCluster:
                         description: |-
                           Specifies the maximum number of local cluster pods that can be
@@ -4849,12 +5446,62 @@ spec:
                         || self.standbyNamesPre.size()==0) && (!has(self.standbyNamesPost)
                         || self.standbyNamesPost.size()==0))
                 type: object
+              primaryLease:
+                description: |-
+                  Configuration of the Kubernetes `Lease` used to coordinate safe primary
+                  election within the cluster. When omitted, the operator applies built-in
+                  defaults; tune these values only if you understand the consequences for
+                  failover timing.
+                properties:
+                  leaseDurationSeconds:
+                    default: 15
+                    description: |-
+                      How long, in seconds, the primary lease is considered valid before it
+                      expires and another instance may acquire it. It must be greater than
+                      `renewDeadlineSeconds`.
+                      Defaults to 15.
+                    format: int32
+                    minimum: 1
+                    type: integer
+                  releasedLeaseDurationSeconds:
+                    default: 1
+                    description: |-
+                      The TTL, in seconds, written when the primary explicitly releases the
+                      lease on a clean shutdown, allowing a replica to promote without waiting
+                      for the full lease duration to expire.
+                      Defaults to 1.
+                    format: int32
+                    minimum: 1
+                    type: integer
+                  renewDeadlineSeconds:
+                    default: 10
+                    description: |-
+                      How long, in seconds, the current primary keeps retrying to renew the
+                      lease before giving up and stopping. It must be smaller than
+                      `leaseDurationSeconds`.
+                      Defaults to 10.
+                    format: int32
+                    minimum: 1
+                    type: integer
+                  retryPeriodSeconds:
+                    default: 2
+                    description: |-
+                      How frequently, in seconds, a non-holder instance retries acquiring or
+                      renewing the lease.
+                      Defaults to 2.
+                    format: int32
+                    minimum: 1
+                    type: integer
+                type: object
               primaryUpdateMethod:
                 default: restart
                 description: |-
                   Method to follow to upgrade the primary server during a rolling
                   update procedure, after all replicas have been successfully updated:
-                  it can be with a switchover (`switchover`) or in-place (`restart` - default)
+                  it can be with a switchover (`switchover`) or in-place (`restart` - default).
+                  Note: when using `switchover`, the operator will reject updates that change both
+                  the image name and PostgreSQL configuration parameters simultaneously to avoid
+                  configuration mismatches during the switchover process.
                 enum:
                 - switchover
                 - restart
@@ -5430,6 +6077,24 @@ spec:
                               description: Kubelet's generated CSRs will be addressed
                                 to this signer.
                               type: string
+                            userAnnotations:
+                              additionalProperties:
+                                type: string
+                              description: |-
+                                userAnnotations allow pod authors to pass additional information to
+                                the signer implementation.  Kubernetes does not restrict or validate this
+                                metadata in any way.
+
+                                These values are copied verbatim into the `spec.unverifiedUserAnnotations` field of
+                                the PodCertificateRequest objects that Kubelet creates.
+
+                                Entries are subject to the same validation as object metadata annotations,
+                                with the addition that all keys must be domain-prefixed. No restrictions
+                                are placed on values, except an overall size limitation on the entire field.
+
+                                Signers should document the keys and values they support. Signers should
+                                deny requests that contain keys they do not recognize.
+                              type: object
                           required:
                           - keyType
                           - signerName
@@ -5726,6 +6391,212 @@ spec:
                 required:
                 - type
                 type: object
+              securityContext:
+                description: |-
+                  Override the SecurityContext applied to every Container in the Pod of the cluster.
+                  When set, this overrides the operator's default Container SecurityContext.
+                  If omitted, the operator defaults are used.
+                properties:
+                  allowPrivilegeEscalation:
+                    description: |-
+                      AllowPrivilegeEscalation controls whether a process can gain more
+                      privileges than its parent process. This bool directly controls if
+                      the no_new_privs flag will be set on the container process.
+                      AllowPrivilegeEscalation is true always when the container is:
+                      1) run as Privileged
+                      2) has CAP_SYS_ADMIN
+                      Note that this field cannot be set when spec.os.name is windows.
+                    type: boolean
+                  appArmorProfile:
+                    description: |-
+                      appArmorProfile is the AppArmor options to use by this container. If set, this profile
+                      overrides the pod's appArmorProfile.
+                      Note that this field cannot be set when spec.os.name is windows.
+                    properties:
+                      localhostProfile:
+                        description: |-
+                          localhostProfile indicates a profile loaded on the node that should be used.
+                          The profile must be preconfigured on the node to work.
+                          Must match the loaded name of the profile.
+                          Must be set if and only if type is "Localhost".
+                        type: string
+                      type:
+                        description: |-
+                          type indicates which kind of AppArmor profile will be applied.
+                          Valid options are:
+                            Localhost - a profile pre-loaded on the node.
+                            RuntimeDefault - the container runtime's default profile.
+                            Unconfined - no AppArmor enforcement.
+                        type: string
+                    required:
+                    - type
+                    type: object
+                  capabilities:
+                    description: |-
+                      The capabilities to add/drop when running containers.
+                      Defaults to the default set of capabilities granted by the container runtime.
+                      Note that this field cannot be set when spec.os.name is windows.
+                    properties:
+                      add:
+                        description: Added capabilities
+                        items:
+                          description: Capability represent POSIX capabilities type
+                          type: string
+                        type: array
+                        x-kubernetes-list-type: atomic
+                      drop:
+                        description: Removed capabilities
+                        items:
+                          description: Capability represent POSIX capabilities type
+                          type: string
+                        type: array
+                        x-kubernetes-list-type: atomic
+                    type: object
+                  privileged:
+                    description: |-
+                      Run container in privileged mode.
+                      Processes in privileged containers are essentially equivalent to root on the host.
+                      Defaults to false.
+                      Note that this field cannot be set when spec.os.name is windows.
+                    type: boolean
+                  procMount:
+                    description: |-
+                      procMount denotes the type of proc mount to use for the containers.
+                      The default value is Default which uses the container runtime defaults for
+                      readonly paths and masked paths.
+                      Note that this field cannot be set when spec.os.name is windows.
+                    type: string
+                  readOnlyRootFilesystem:
+                    description: |-
+                      Whether this container has a read-only root filesystem.
+                      Default is false.
+                      Note that this field cannot be set when spec.os.name is windows.
+                    type: boolean
+                  runAsGroup:
+                    description: |-
+                      The GID to run the entrypoint of the container process.
+                      Uses runtime default if unset.
+                      May also be set in PodSecurityContext.  If set in both SecurityContext and
+                      PodSecurityContext, the value specified in SecurityContext takes precedence.
+                      Note that this field cannot be set when spec.os.name is windows.
+                    format: int64
+                    type: integer
+                  runAsNonRoot:
+                    description: |-
+                      Indicates that the container must run as a non-root user.
+                      If true, the Kubelet will validate the image at runtime to ensure that it
+                      does not run as UID 0 (root) and fail to start the container if it does.
+                      If unset or false, no such validation will be performed.
+                      May also be set in PodSecurityContext.  If set in both SecurityContext and
+                      PodSecurityContext, the value specified in SecurityContext takes precedence.
+                    type: boolean
+                  runAsUser:
+                    description: |-
+                      The UID to run the entrypoint of the container process.
+                      Defaults to user specified in image metadata if unspecified.
+                      May also be set in PodSecurityContext.  If set in both SecurityContext and
+                      PodSecurityContext, the value specified in SecurityContext takes precedence.
+                      Note that this field cannot be set when spec.os.name is windows.
+                    format: int64
+                    type: integer
+                  seLinuxOptions:
+                    description: |-
+                      The SELinux context to be applied to the container.
+                      If unspecified, the container runtime will allocate a random SELinux context for each
+                      container.  May also be set in PodSecurityContext.  If set in both SecurityContext and
+                      PodSecurityContext, the value specified in SecurityContext takes precedence.
+                      Note that this field cannot be set when spec.os.name is windows.
+                    properties:
+                      level:
+                        description: Level is SELinux level label that applies to
+                          the container.
+                        type: string
+                      role:
+                        description: Role is a SELinux role label that applies to
+                          the container.
+                        type: string
+                      type:
+                        description: Type is a SELinux type label that applies to
+                          the container.
+                        type: string
+                      user:
+                        description: User is a SELinux user label that applies to
+                          the container.
+                        type: string
+                    type: object
+                  seccompProfile:
+                    description: |-
+                      The seccomp options to use by this container. If seccomp options are
+                      provided at both the pod & container level, the container options
+                      override the pod options.
+                      Note that this field cannot be set when spec.os.name is windows.
+                    properties:
+                      localhostProfile:
+                        description: |-
+                          localhostProfile indicates a profile defined in a file on the node should be used.
+                          The profile must be preconfigured on the node to work.
+                          Must be a descending path, relative to the kubelet's configured seccomp profile location.
+                          Must be set if type is "Localhost". Must NOT be set for any other type.
+                        type: string
+                      type:
+                        description: |-
+                          type indicates which kind of seccomp profile will be applied.
+                          Valid options are:
+
+                          Localhost - a profile defined in a file on the node should be used.
+                          RuntimeDefault - the container runtime default profile should be used.
+                          Unconfined - no profile should be applied.
+                        type: string
+                    required:
+                    - type
+                    type: object
+                  windowsOptions:
+                    description: |-
+                      The Windows specific settings applied to all containers.
+                      If unspecified, the options from the PodSecurityContext will be used.
+                      If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence.
+                      Note that this field cannot be set when spec.os.name is linux.
+                    properties:
+                      gmsaCredentialSpec:
+                        description: |-
+                          GMSACredentialSpec is where the GMSA admission webhook
+                          (https://github.com/kubernetes-sigs/windows-gmsa) inlines the contents of the
+                          GMSA credential spec named by the GMSACredentialSpecName field.
+                        type: string
+                      gmsaCredentialSpecName:
+                        description: GMSACredentialSpecName is the name of the GMSA
+                          credential spec to use.
+                        type: string
+                      hostProcess:
+                        description: |-
+                          HostProcess determines if a container should be run as a 'Host Process' container.
+                          All of a Pod's containers must have the same effective HostProcess value
+                          (it is not allowed to have a mix of HostProcess containers and non-HostProcess containers).
+                          In addition, if HostProcess is true then HostNetwork must also be set to true.
+                        type: boolean
+                      runAsUserName:
+                        description: |-
+                          The UserName in Windows to run the entrypoint of the container process.
+                          Defaults to the user specified in image metadata if unspecified.
+                          May also be set in PodSecurityContext. If set in both SecurityContext and
+                          PodSecurityContext, the value specified in SecurityContext takes precedence.
+                        type: string
+                    type: object
+                type: object
+              serviceAccountName:
+                description: |-
+                  Name of an existing ServiceAccount in the same namespace to use for the cluster.
+                  When specified, the operator will not create a new ServiceAccount
+                  but will use the provided one. This is useful for sharing a single
+                  ServiceAccount across multiple clusters (e.g., for cloud IAM configurations).
+                  If not specified, a ServiceAccount will be created with the cluster name.
+                  Mutually exclusive with ServiceAccountTemplate.
+                maxLength: 253
+                pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                type: string
+                x-kubernetes-validations:
+                - message: serviceAccountName is immutable
+                  rule: self == oldSelf
               serviceAccountTemplate:
                 description: Configure the generation of the service account
                 properties:
@@ -5878,7 +6749,7 @@ spec:
                       resources:
                         description: |-
                           resources represents the minimum resources the volume should have.
-                          If RecoverVolumeExpansionFailure feature is enabled users are allowed to specify resource requirements
+                          Users are allowed to specify resource requirements
                           that are lower than previous value but must still be higher than capacity recorded in the
                           status field of the claim.
                           More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources
@@ -6134,7 +7005,7 @@ spec:
                             resources:
                               description: |-
                                 resources represents the minimum resources the volume should have.
-                                If RecoverVolumeExpansionFailure feature is enabled users are allowed to specify resource requirements
+                                Users are allowed to specify resource requirements
                                 that are lower than previous value but must still be higher than capacity recorded in the
                                 status field of the claim.
                                 More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources
@@ -6542,7 +7413,7 @@ spec:
                       resources:
                         description: |-
                           resources represents the minimum resources the volume should have.
-                          If RecoverVolumeExpansionFailure feature is enabled users are allowed to specify resource requirements
+                          Users are allowed to specify resource requirements
                           that are lower than previous value but must still be higher than capacity recorded in the
                           status field of the claim.
                           More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources
@@ -6952,8 +7823,10 @@ spec:
                   Deprecated: the field is not set for backup plugins.
                 type: object
               latestGeneratedNode:
-                description: ID of the latest generated node (used to avoid node name
-                  clashing)
+                description: |-
+                  ID of the latest generated node (used to avoid node name clashing)
+
+                  Deprecated: this field is not set anymore
                 type: integer
               managedRolesStatus:
                 description: ManagedRolesStatus reports the state of the managed roles
@@ -6972,8 +7845,10 @@ spec:
                         type: string
                       type: array
                     description: |-
-                      CannotReconcile lists roles that cannot be reconciled in PostgreSQL,
-                      with an explanation of the cause
+                      CannotReconcile lists roles that cannot be reconciled, with an
+                      explanation of the cause. Failures may originate in PostgreSQL
+                      (e.g. dropping a role that owns objects) or in Kubernetes (e.g.
+                      the referenced password Secret cannot be fetched).
                     type: object
                   passwordStatus:
                     additionalProperties:
@@ -6997,10 +7872,124 @@ spec:
                 description: OnlineUpdateEnabled shows if the online upgrade is enabled
                   inside the cluster
                 type: boolean
+              operatorCertificateFingerprint:
+                description: |-
+                  OperatorCertificateFingerprint is the SHA256 fingerprint of the operator's
+                  in-memory client certificate public key. The instance manager pins this
+                  fingerprint to authenticate requests from the operator.
+                type: string
               pgDataImageInfo:
                 description: PGDataImageInfo contains the details of the latest image
                   that has run on the current data directory.
                 properties:
+                  extensions:
+                    description: Extensions contains the container image extensions
+                      available for the current Image
+                    items:
+                      description: |-
+                        ExtensionConfiguration is the configuration used to add
+                        PostgreSQL extensions to the Cluster.
+                      properties:
+                        bin_path:
+                          description: |-
+                            A list of directories within the image to be appended to the
+                            PostgreSQL process's `PATH` environment variable.
+                          items:
+                            type: string
+                          type: array
+                        dynamic_library_path:
+                          description: |-
+                            The list of directories inside the image which should be added to dynamic_library_path.
+                            If not defined, defaults to "/lib".
+                          items:
+                            type: string
+                          type: array
+                        env:
+                          description: |-
+                            Env is a list of custom environment variables to be set in the
+                            PostgreSQL process for this extension. It is the responsibility of the
+                            cluster administrator to ensure the variables are correct for the
+                            specific extension. Note that changes to these variables require
+                            a manual cluster restart to take effect.
+                          items:
+                            description: |-
+                              ExtensionEnvVar defines an environment variable for a specific extension
+                              image volume.
+                            properties:
+                              name:
+                                description: |-
+                                  Name of the environment variable to be injected into the
+                                  PostgreSQL process.
+                                minLength: 1
+                                pattern: ^[a-zA-Z_][a-zA-Z0-9_]*$
+                                type: string
+                              value:
+                                description: |-
+                                  Value of the environment variable. CloudNativePG performs a direct
+                                  replacement of this value, with support for placeholder expansion.
+                                  The ${`image_root`} placeholder resolves to the absolute mount path
+                                  of the extension's volume (e.g., `/extensions/my-extension`). This
+                                  is particularly useful for allowing applications or libraries to
+                                  locate specific directories within the mounted image.
+                                  Unrecognized placeholders are rejected. To include a literal ${...}
+                                  in the value, escape it as $${...}.
+                                minLength: 1
+                                type: string
+                            required:
+                            - name
+                            - value
+                            type: object
+                          type: array
+                          x-kubernetes-list-map-keys:
+                          - name
+                          x-kubernetes-list-type: map
+                        extension_control_path:
+                          description: |-
+                            The list of directories inside the image which should be added to extension_control_path.
+                            If not defined, defaults to "/share".
+                          items:
+                            type: string
+                          type: array
+                        image:
+                          description: The image containing the extension.
+                          properties:
+                            pullPolicy:
+                              description: |-
+                                Policy for pulling OCI objects. Possible values are:
+                                Always: the kubelet always attempts to pull the reference. Container creation will fail If the pull fails.
+                                Never: the kubelet never pulls the reference and only uses a local image or artifact. Container creation will fail if the reference isn't present.
+                                IfNotPresent: the kubelet pulls if the reference isn't already present on disk. Container creation will fail if the reference isn't present and the pull fails.
+                                Defaults to Always if :latest tag is specified, or IfNotPresent otherwise.
+                              type: string
+                            reference:
+                              description: |-
+                                Required: Image or artifact reference to be used.
+                                Behaves in the same way as pod.spec.containers[*].image.
+                                Pull secrets will be assembled in the same way as for the container image by looking up node credentials, SA image pull secrets, and pod spec image pull secrets.
+                                More info: https://kubernetes.io/docs/concepts/containers/images
+                                This field is optional to allow higher level config management to default or override
+                                container images in workload controllers like Deployments and StatefulSets.
+                              type: string
+                          type: object
+                        ld_library_path:
+                          description: The list of directories inside the image which
+                            should be added to ld_library_path.
+                          items:
+                            type: string
+                          type: array
+                        name:
+                          description: |-
+                            The name of the extension, required. The limit of 59 characters
+                            leaves room for the prefix the operator adds when deriving the
+                            extension's Kubernetes Volume name (capped at 63 characters).
+                          maxLength: 59
+                          minLength: 1
+                          pattern: ^[a-z0-9]([-a-z0-9_]*[a-z0-9])?$
+                          type: string
+                      required:
+                      - name
+                      type: object
+                    type: array
                   image:
                     description: Image is the image name
                     type: string
@@ -7074,6 +8063,31 @@ spec:
                   - version
                   type: object
                 type: array
+              podSelectorRefs:
+                description: |-
+                  PodSelectorRefs contains the resolved pod IPs for each named selector
+                  defined in spec.podSelectorRefs.
+                items:
+                  description: PodSelectorRefStatus contains the resolved pod IPs
+                    for a named selector.
+                  properties:
+                    ips:
+                      description: |-
+                        IPs is the list of pod IPs matching the selector.
+                        Each IP is a single address (no CIDR notation).
+                      items:
+                        type: string
+                      type: array
+                    name:
+                      description: Name corresponds to the name in the spec's PodSelectorRef.
+                      type: string
+                  required:
+                  - name
+                  type: object
+                type: array
+                x-kubernetes-list-map-keys:
+                - name
+                x-kubernetes-list-type: map
               poolerIntegrations:
                 description: The integration needed by poolers referencing the cluster
                 properties:
@@ -7157,6 +8171,13 @@ spec:
                     description: The resource version of the "postgres" user secret
                     type: string
                 type: object
+              selector:
+                description: |-
+                  Selector is the serialized form of the label selector that identifies
+                  the pods managed by this cluster. Populated by the operator and exposed
+                  through the scale sub-resource so an autoscaler (such as HPA or VPA)
+                  can discover the managed instance pods.
+                type: string
               switchReplicaClusterStatus:
                 description: SwitchReplicaClusterStatus is the status of the switch
                   to replica cluster
@@ -7193,75 +8214,528 @@ spec:
                   - state
                   type: object
                 type: array
-              targetPrimary:
+              targetPgDataImageInfo:
                 description: |-
-                  Target primary instance, this is different from the previous one
-                  during a switchover or a failover
-                type: string
-              targetPrimaryTimestamp:
-                description: The timestamp when the last request for a new primary
-                  has occurred
-                type: string
-              timelineID:
-                description: The timeline of the Postgres cluster
-                type: integer
-              topology:
-                description: Instances topology.
+                  TargetPGDataImageInfo contains the details of the target image for an
+                  in-progress major upgrade. It is set before the upgrade Job is created,
+                  and cleared on successful completion or when the upgrade is rolled back.
                 properties:
-                  instances:
-                    additionalProperties:
-                      additionalProperties:
-                        type: string
-                      description: PodTopologyLabels represent the topology of a Pod.
-                        map[labelName]labelValue
-                      type: object
-                    description: Instances contains the pod topology of the instances
-                    type: object
-                  nodesUsed:
-                    description: |-
-                      NodesUsed represents the count of distinct nodes accommodating the instances.
-                      A value of '1' suggests that all instances are hosted on a single node,
-                      implying the absence of High Availability (HA). Ideally, this value should
-                      be the same as the number of instances in the Postgres HA cluster, implying
-                      shared nothing architecture on the compute side.
-                    format: int32
-                    type: integer
-                  successfullyExtracted:
-                    description: |-
-                      SuccessfullyExtracted indicates if the topology data was extract. It is useful to enact fallback behaviors
-                      in synchronous replica election in case of failures
-                    type: boolean
-                type: object
-              unusablePVC:
-                description: List of all the PVCs that are unusable because another
-                  PVC is missing
-                items:
-                  type: string
-                type: array
-              writeService:
-                description: Current write pod
-                type: string
-            type: object
-        required:
-        - metadata
-        - spec
-        type: object
-    served: true
-    storage: true
-    subresources:
-      scale:
-        specReplicasPath: .spec.instances
-        statusReplicasPath: .status.instances
-      status: {}
----
-apiVersion: apiextensions.k8s.io/v1
-kind: CustomResourceDefinition
-metadata:
-  annotations:
-    controller-gen.kubebuilder.io/version: v0.19.0
-    helm.sh/resource-policy: keep
-  name: databases.postgresql.cnpg.io
-spec:
+                  extensions:
+                    description: Extensions contains the container image extensions
+                      available for the current Image
+                    items:
+                      description: |-
+                        ExtensionConfiguration is the configuration used to add
+                        PostgreSQL extensions to the Cluster.
+                      properties:
+                        bin_path:
+                          description: |-
+                            A list of directories within the image to be appended to the
+                            PostgreSQL process's `PATH` environment variable.
+                          items:
+                            type: string
+                          type: array
+                        dynamic_library_path:
+                          description: |-
+                            The list of directories inside the image which should be added to dynamic_library_path.
+                            If not defined, defaults to "/lib".
+                          items:
+                            type: string
+                          type: array
+                        env:
+                          description: |-
+                            Env is a list of custom environment variables to be set in the
+                            PostgreSQL process for this extension. It is the responsibility of the
+                            cluster administrator to ensure the variables are correct for the
+                            specific extension. Note that changes to these variables require
+                            a manual cluster restart to take effect.
+                          items:
+                            description: |-
+                              ExtensionEnvVar defines an environment variable for a specific extension
+                              image volume.
+                            properties:
+                              name:
+                                description: |-
+                                  Name of the environment variable to be injected into the
+                                  PostgreSQL process.
+                                minLength: 1
+                                pattern: ^[a-zA-Z_][a-zA-Z0-9_]*$
+                                type: string
+                              value:
+                                description: |-
+                                  Value of the environment variable. CloudNativePG performs a direct
+                                  replacement of this value, with support for placeholder expansion.
+                                  The ${`image_root`} placeholder resolves to the absolute mount path
+                                  of the extension's volume (e.g., `/extensions/my-extension`). This
+                                  is particularly useful for allowing applications or libraries to
+                                  locate specific directories within the mounted image.
+                                  Unrecognized placeholders are rejected. To include a literal ${...}
+                                  in the value, escape it as $${...}.
+                                minLength: 1
+                                type: string
+                            required:
+                            - name
+                            - value
+                            type: object
+                          type: array
+                          x-kubernetes-list-map-keys:
+                          - name
+                          x-kubernetes-list-type: map
+                        extension_control_path:
+                          description: |-
+                            The list of directories inside the image which should be added to extension_control_path.
+                            If not defined, defaults to "/share".
+                          items:
+                            type: string
+                          type: array
+                        image:
+                          description: The image containing the extension.
+                          properties:
+                            pullPolicy:
+                              description: |-
+                                Policy for pulling OCI objects. Possible values are:
+                                Always: the kubelet always attempts to pull the reference. Container creation will fail If the pull fails.
+                                Never: the kubelet never pulls the reference and only uses a local image or artifact. Container creation will fail if the reference isn't present.
+                                IfNotPresent: the kubelet pulls if the reference isn't already present on disk. Container creation will fail if the reference isn't present and the pull fails.
+                                Defaults to Always if :latest tag is specified, or IfNotPresent otherwise.
+                              type: string
+                            reference:
+                              description: |-
+                                Required: Image or artifact reference to be used.
+                                Behaves in the same way as pod.spec.containers[*].image.
+                                Pull secrets will be assembled in the same way as for the container image by looking up node credentials, SA image pull secrets, and pod spec image pull secrets.
+                                More info: https://kubernetes.io/docs/concepts/containers/images
+                                This field is optional to allow higher level config management to default or override
+                                container images in workload controllers like Deployments and StatefulSets.
+                              type: string
+                          type: object
+                        ld_library_path:
+                          description: The list of directories inside the image which
+                            should be added to ld_library_path.
+                          items:
+                            type: string
+                          type: array
+                        name:
+                          description: |-
+                            The name of the extension, required. The limit of 59 characters
+                            leaves room for the prefix the operator adds when deriving the
+                            extension's Kubernetes Volume name (capped at 63 characters).
+                          maxLength: 59
+                          minLength: 1
+                          pattern: ^[a-z0-9]([-a-z0-9_]*[a-z0-9])?$
+                          type: string
+                      required:
+                      - name
+                      type: object
+                    type: array
+                  image:
+                    description: Image is the image name
+                    type: string
+                  majorVersion:
+                    description: MajorVersion is the major version of the image
+                    type: integer
+                required:
+                - image
+                - majorVersion
+                type: object
+              targetPrimary:
+                description: |-
+                  Target primary instance, this is different from the previous one
+                  during a switchover or a failover
+                type: string
+              targetPrimaryTimestamp:
+                description: The timestamp when the last request for a new primary
+                  has occurred
+                type: string
+              timelineID:
+                description: The timeline of the Postgres cluster
+                type: integer
+              topology:
+                description: Instances topology.
+                properties:
+                  instances:
+                    additionalProperties:
+                      additionalProperties:
+                        type: string
+                      description: PodTopologyLabels represent the topology of a Pod.
+                        map[labelName]labelValue
+                      type: object
+                    description: Instances contains the pod topology of the instances
+                    type: object
+                  nodesUsed:
+                    description: |-
+                      NodesUsed represents the count of distinct nodes accommodating the instances.
+                      A value of '1' suggests that all instances are hosted on a single node,
+                      implying the absence of High Availability (HA). Ideally, this value should
+                      be the same as the number of instances in the Postgres HA cluster, implying
+                      shared nothing architecture on the compute side.
+                    format: int32
+                    type: integer
+                  successfullyExtracted:
+                    description: |-
+                      SuccessfullyExtracted indicates if the topology data was extract. It is useful to enact fallback behaviors
+                      in synchronous replica election in case of failures
+                    type: boolean
+                type: object
+              unusablePVC:
+                description: List of all the PVCs that are unusable because another
+                  PVC is missing
+                items:
+                  type: string
+                type: array
+              writeService:
+                description: Current write pod
+                type: string
+            type: object
+        required:
+        - metadata
+        - spec
+        type: object
+    served: true
+    storage: true
+    subresources:
+      scale:
+        labelSelectorPath: .status.selector
+        specReplicasPath: .spec.instances
+        statusReplicasPath: .status.instances
+      status: {}
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.21.0
+    helm.sh/resource-policy: keep
+  name: databaseroles.postgresql.cnpg.io
+spec:
+  group: postgresql.cnpg.io
+  names:
+    kind: DatabaseRole
+    listKind: DatabaseRoleList
+    plural: databaseroles
+    singular: databaserole
+  scope: Namespaced
+  versions:
+  - additionalPrinterColumns:
+    - jsonPath: .metadata.creationTimestamp
+      name: Age
+      type: date
+    - jsonPath: .spec.cluster.name
+      name: Cluster
+      type: string
+    - jsonPath: .spec.name
+      name: PG Name
+      type: string
+    - jsonPath: .status.applied
+      name: Applied
+      type: boolean
+    - description: Latest reconciliation message
+      jsonPath: .status.message
+      name: Message
+      type: string
+    name: v1
+    schema:
+      openAPIV3Schema:
+        description: DatabaseRole is the Schema for the databaseroles API
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: |-
+              Specification of the desired DatabaseRole.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#spec-and-status
+            properties:
+              bypassrls:
+                description: |-
+                  Whether a role bypasses every row-level security (RLS) policy.
+                  Default is `false`.
+                type: boolean
+              clientCertificate:
+                description: |-
+                  ClientCertificate configures the operator to generate and renew a TLS client
+                  certificate for this role, signed by the cluster's client CA. The certificate
+                  is stored in a Secret named `<databaserole-name>-client-cert`.
+                  Requires login to be true.
+                properties:
+                  enabled:
+                    default: true
+                    description: |-
+                      Enabled turns on client certificate issuance for this role. When true,
+                      the role must have login enabled. Defaults to true when the block is present.
+                    type: boolean
+                type: object
+              cluster:
+                description: The corresponding cluster
+                properties:
+                  name:
+                    default: ""
+                    description: |-
+                      Name of the referent.
+                      This field is effectively required, but due to backwards compatibility is
+                      allowed to be empty. Instances of this type with an empty value here are
+                      almost certainly wrong.
+                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                    type: string
+                type: object
+                x-kubernetes-map-type: atomic
+                x-kubernetes-validations:
+                - message: cluster reference is immutable after creation
+                  rule: self == oldSelf
+              comment:
+                description: Description of the role
+                type: string
+              connectionLimit:
+                default: -1
+                description: |-
+                  If the role can log in, this specifies how many concurrent
+                  connections the role can make. `-1` (the default) means no limit.
+                format: int64
+                type: integer
+              createdb:
+                description: |-
+                  When set to `true`, the role being defined will be allowed to create
+                  new databases. Specifying `false` (default) will deny a role the
+                  ability to create databases.
+                type: boolean
+              createrole:
+                description: |-
+                  Whether the role will be permitted to create, alter, drop, comment
+                  on, change the security label for, and grant or revoke membership in
+                  other roles. Default is `false`.
+                type: boolean
+              databaseRoleReclaimPolicy:
+                default: retain
+                description: The policy for end-of-life maintenance of this role
+                enum:
+                - delete
+                - retain
+                type: string
+              disablePassword:
+                description: DisablePassword indicates that a role's password should
+                  be set to NULL in Postgres
+                type: boolean
+              ensure:
+                default: present
+                description: Ensure the role is `present` or `absent` - defaults to
+                  "present"
+                enum:
+                - present
+                - absent
+                type: string
+              inRoles:
+                description: |-
+                  List of one or more existing roles to which this role will be
+                  immediately added as a new member. Default empty.
+                  Changes to the list are applied to an existing role through
+                  `GRANT` and `REVOKE` statements, not only at role creation.
+                items:
+                  type: string
+                type: array
+              inherit:
+                default: true
+                description: |-
+                  Whether a role "inherits" the privileges of roles it is a member of.
+                  Default is `true`.
+                type: boolean
+              login:
+                description: |-
+                  Whether the role is allowed to log in. A role having the `login`
+                  attribute can be thought of as a user. Roles without this attribute
+                  are useful for managing database privileges, but are not users in
+                  the usual sense of the word. Default is `false`.
+                type: boolean
+              name:
+                description: Name of the role
+                type: string
+              passwordSecret:
+                description: |-
+                  Secret containing the password of the role (if present).
+                  If null, the password will be ignored unless DisablePassword is set.
+                  When set, the secret must follow the `kubernetes.io/basic-auth` format
+                  and contain both a `username` and a `password` field.
+                properties:
+                  name:
+                    description: Name of the referent.
+                    type: string
+                required:
+                - name
+                type: object
+              replication:
+                description: |-
+                  Whether a role is a replication role. A role must have this
+                  attribute (or be a superuser) in order to be able to connect to the
+                  server in replication mode (physical or logical replication) and in
+                  order to be able to create or drop replication slots. A role having
+                  the `replication` attribute is a very highly privileged role, and
+                  should only be used on roles actually used for replication. Default
+                  is `false`.
+                type: boolean
+              superuser:
+                description: |-
+                  Whether the role is a `superuser` who can override all access
+                  restrictions within the database - superuser status is dangerous and
+                  should be used only when really needed. You must yourself be a
+                  superuser to create a new superuser. Defaults is `false`.
+                type: boolean
+              validUntil:
+                description: |-
+                  Date and time after which the role's password is no longer valid.
+                  When omitted, the password will never expire (default).
+                format: date-time
+                type: string
+            required:
+            - cluster
+            - name
+            type: object
+            x-kubernetes-validations:
+            - message: name is immutable
+              rule: self.name == oldSelf.name
+            - message: 'ensure: absent is not supported for DatabaseRole; delete the
+                resource with databaseRoleReclaimPolicy: delete instead'
+              rule: '!has(self.ensure) || self.ensure != ''absent'''
+            - message: the role name postgres is reserved
+              rule: self.name != 'postgres'
+            - message: the role name streaming_replica is reserved
+              rule: self.name != 'streaming_replica'
+            - message: role names starting with pg_ are reserved by PostgreSQL
+              rule: '!self.name.startsWith(''pg_'')'
+            - message: role names starting with cnpg_ are reserved by the operator
+              rule: '!self.name.startsWith(''cnpg_'')'
+            - message: role name must not be empty
+              rule: self.name.size() != 0
+            - message: passwordSecret and disablePassword are mutually exclusive
+              rule: '!has(self.passwordSecret) || !has(self.disablePassword) || !self.disablePassword'
+            - message: clientCertificate requires the role to have login enabled
+              rule: '!has(self.clientCertificate) || !self.clientCertificate.enabled
+                || self.login'
+          status:
+            description: |-
+              Most recently observed status of the DatabaseRole. This data may not be up
+              to date. Populated by the system. Read-only.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#spec-and-status
+            properties:
+              applied:
+                description: Applied is true if the role was reconciled correctly
+                type: boolean
+              clientCertificate:
+                description: |-
+                  ClientCertificate holds the observed state of the generated TLS client
+                  certificate, when client certificate issuance is enabled.
+                properties:
+                  expiration:
+                    description: Expiration is the expiration time of the generated
+                      client certificate, in RFC3339 format.
+                    type: string
+                  message:
+                    description: |-
+                      Message contains a human-readable explanation of the current certificate status,
+                      such as why issuance was skipped or why an existing Secret was left untouched.
+                    type: string
+                type: object
+              conditions:
+                description: Conditions for the DatabaseRole object
+                items:
+                  description: Condition contains details for one aspect of the current
+                    state of this API Resource.
+                  properties:
+                    lastTransitionTime:
+                      description: |-
+                        lastTransitionTime is the last time the condition transitioned from one status to another.
+                        This should be when the underlying condition changed.  If that is not known, then using the time when the API field changed is acceptable.
+                      format: date-time
+                      type: string
+                    message:
+                      description: |-
+                        message is a human readable message indicating details about the transition.
+                        This may be an empty string.
+                      maxLength: 32768
+                      type: string
+                    observedGeneration:
+                      description: |-
+                        observedGeneration represents the .metadata.generation that the condition was set based upon.
+                        For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date
+                        with respect to the current state of the instance.
+                      format: int64
+                      minimum: 0
+                      type: integer
+                    reason:
+                      description: |-
+                        reason contains a programmatic identifier indicating the reason for the condition's last transition.
+                        Producers of specific condition types may define expected values and meanings for this field,
+                        and whether the values are considered a guaranteed API.
+                        The value should be a CamelCase string.
+                        This field may not be empty.
+                      maxLength: 1024
+                      minLength: 1
+                      pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
+                      type: string
+                    status:
+                      description: status of the condition, one of True, False, Unknown.
+                      enum:
+                      - "True"
+                      - "False"
+                      - Unknown
+                      type: string
+                    type:
+                      description: type of condition in CamelCase or in foo.example.com/CamelCase.
+                      maxLength: 316
+                      pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
+                      type: string
+                  required:
+                  - lastTransitionTime
+                  - message
+                  - reason
+                  - status
+                  - type
+                  type: object
+                type: array
+              message:
+                description: Message is the reconciliation error message
+                type: string
+              observedGeneration:
+                description: |-
+                  A sequence number representing the latest
+                  desired state that was synchronized
+                format: int64
+                type: integer
+              secretResourceVersion:
+                description: |-
+                  SecretResourceVersion is the resource version of the password secret
+                  last applied to the role; a change to it triggers reconciliation.
+                type: string
+            type: object
+        required:
+        - metadata
+        - spec
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.21.0
+    helm.sh/resource-policy: keep
+  name: databases.postgresql.cnpg.io
+spec:
   group: postgresql.cnpg.io
   names:
     kind: Database
@@ -7343,6 +8817,9 @@ spec:
                     type: string
                 type: object
                 x-kubernetes-map-type: atomic
+                x-kubernetes-validations:
+                - message: cluster reference is immutable after creation
+                  rule: self == oldSelf
               collationVersion:
                 description: |-
                   Maps to the `COLLATION_VERSION` parameter of `CREATE DATABASE`. This
@@ -7388,16 +8865,16 @@ spec:
                     ensure:
                       default: present
                       description: |-
-                        Specifies whether an extension/schema should be present or absent in
-                        the database. If set to `present`, the extension/schema will be
-                        created if it does not exist. If set to `absent`, the
-                        extension/schema will be removed if it exists.
+                        Specifies whether an object (e.g schema) should be present or absent
+                        in the database. If set to `present`, the object will be created if
+                        it does not exist. If set to `absent`, the extension/schema will be
+                        removed if it exists.
                       enum:
                       - present
                       - absent
                       type: string
                     name:
-                      description: Name of the extension/schema
+                      description: Name of the object (extension, schema, FDW, server)
                       type: string
                     schema:
                       description: |-
@@ -7417,6 +8894,100 @@ spec:
                   - name
                   type: object
                 type: array
+              fdws:
+                description: The list of foreign data wrappers to be managed in the
+                  database
+                items:
+                  description: FDWSpec configures an Foreign Data Wrapper in a database
+                  properties:
+                    ensure:
+                      default: present
+                      description: |-
+                        Specifies whether an object (e.g schema) should be present or absent
+                        in the database. If set to `present`, the object will be created if
+                        it does not exist. If set to `absent`, the extension/schema will be
+                        removed if it exists.
+                      enum:
+                      - present
+                      - absent
+                      type: string
+                    handler:
+                      description: |-
+                        Name of the handler function (e.g., "postgres_fdw_handler").
+                        This will be empty if no handler is specified. In that case,
+                        the default handler is registered when the FDW extension is created.
+                      type: string
+                    name:
+                      description: Name of the object (extension, schema, FDW, server)
+                      type: string
+                    options:
+                      description: Options specifies the configuration options for
+                        the FDW.
+                      items:
+                        description: OptionSpec holds the name, value and the ensure
+                          field for an option
+                        properties:
+                          ensure:
+                            default: present
+                            description: |-
+                              Specifies whether an option should be present or absent in
+                              the database. If set to `present`, the option will be
+                              created if it does not exist. If set to `absent`, the
+                              option will be removed if it exists.
+                            enum:
+                            - present
+                            - absent
+                            type: string
+                          name:
+                            description: Name of the option
+                            type: string
+                          value:
+                            description: Value of the option
+                            type: string
+                        required:
+                        - name
+                        - value
+                        type: object
+                      type: array
+                    owner:
+                      description: |-
+                        Owner specifies the database role that will own the Foreign Data Wrapper.
+                        The role must have superuser privileges in the target database.
+                      type: string
+                    usage:
+                      description: List of roles for which `USAGE` privileges on the
+                        FDW are granted or revoked.
+                      items:
+                        description: UsageSpec configures a usage for a foreign data
+                          wrapper
+                        properties:
+                          name:
+                            description: Name of the usage
+                            type: string
+                            x-kubernetes-validations:
+                            - message: name is required
+                              rule: self != ''
+                          type:
+                            default: grant
+                            description: The type of usage
+                            enum:
+                            - grant
+                            - revoke
+                            type: string
+                        required:
+                        - name
+                        type: object
+                      type: array
+                    validator:
+                      description: |-
+                        Name of the validator function (e.g., "postgres_fdw_validator").
+                        This will be empty if no validator is specified. In that case,
+                        the default validator is registered when the FDW extension is created.
+                      type: string
+                  required:
+                  - name
+                  type: object
+                type: array
               icuLocale:
                 description: |-
                   Maps to the `ICU_LOCALE` parameter of `CREATE DATABASE`. This
@@ -7504,16 +9075,16 @@ spec:
                     ensure:
                       default: present
                       description: |-
-                        Specifies whether an extension/schema should be present or absent in
-                        the database. If set to `present`, the extension/schema will be
-                        created if it does not exist. If set to `absent`, the
-                        extension/schema will be removed if it exists.
+                        Specifies whether an object (e.g schema) should be present or absent
+                        in the database. If set to `present`, the object will be created if
+                        it does not exist. If set to `absent`, the extension/schema will be
+                        removed if it exists.
                       enum:
                       - present
                       - absent
                       type: string
                     name:
-                      description: Name of the extension/schema
+                      description: Name of the object (extension, schema, FDW, server)
                       type: string
                     owner:
                       description: |-
@@ -7525,6 +9096,90 @@ spec:
                   - name
                   type: object
                 type: array
+              servers:
+                description: The list of foreign servers to be managed in the database
+                items:
+                  description: ServerSpec configures a server of a foreign data wrapper
+                  properties:
+                    ensure:
+                      default: present
+                      description: |-
+                        Specifies whether an object (e.g schema) should be present or absent
+                        in the database. If set to `present`, the object will be created if
+                        it does not exist. If set to `absent`, the extension/schema will be
+                        removed if it exists.
+                      enum:
+                      - present
+                      - absent
+                      type: string
+                    fdw:
+                      description: The name of the Foreign Data Wrapper (FDW)
+                      type: string
+                      x-kubernetes-validations:
+                      - message: fdw is required
+                        rule: self != ''
+                    name:
+                      description: Name of the object (extension, schema, FDW, server)
+                      type: string
+                    options:
+                      description: |-
+                        Options specifies the configuration options for the server
+                        (key is the option name, value is the option value).
+                      items:
+                        description: OptionSpec holds the name, value and the ensure
+                          field for an option
+                        properties:
+                          ensure:
+                            default: present
+                            description: |-
+                              Specifies whether an option should be present or absent in
+                              the database. If set to `present`, the option will be
+                              created if it does not exist. If set to `absent`, the
+                              option will be removed if it exists.
+                            enum:
+                            - present
+                            - absent
+                            type: string
+                          name:
+                            description: Name of the option
+                            type: string
+                          value:
+                            description: Value of the option
+                            type: string
+                        required:
+                        - name
+                        - value
+                        type: object
+                      type: array
+                    usage:
+                      description: List of roles for which `USAGE` privileges on the
+                        server are granted or revoked.
+                      items:
+                        description: UsageSpec configures a usage for a foreign data
+                          wrapper
+                        properties:
+                          name:
+                            description: Name of the usage
+                            type: string
+                            x-kubernetes-validations:
+                            - message: name is required
+                              rule: self != ''
+                          type:
+                            default: grant
+                            description: The type of usage
+                            enum:
+                            - grant
+                            - revoke
+                            type: string
+                        required:
+                        - name
+                        type: object
+                      type: array
+                  required:
+                  - fdw
+                  - name
+                  type: object
+                type: array
               tablespace:
                 description: |-
                   Maps to the `TABLESPACE` parameter of `CREATE DATABASE`.
@@ -7586,6 +9241,28 @@ spec:
                   - name
                   type: object
                 type: array
+              fdws:
+                description: FDWs is the status of the managed FDWs
+                items:
+                  description: DatabaseObjectStatus is the status of the managed database
+                    objects
+                  properties:
+                    applied:
+                      description: |-
+                        True of the object has been installed successfully in
+                        the database
+                      type: boolean
+                    message:
+                      description: Message is the object reconciliation message
+                      type: string
+                    name:
+                      description: The name of the object
+                      type: string
+                  required:
+                  - applied
+                  - name
+                  type: object
+                type: array
               message:
                 description: Message is the reconciliation output message
                 type: string
@@ -7617,6 +9294,28 @@ spec:
                   - name
                   type: object
                 type: array
+              servers:
+                description: Servers is the status of the managed servers
+                items:
+                  description: DatabaseObjectStatus is the status of the managed database
+                    objects
+                  properties:
+                    applied:
+                      description: |-
+                        True of the object has been installed successfully in
+                        the database
+                      type: boolean
+                    message:
+                      description: Message is the object reconciliation message
+                      type: string
+                    name:
+                      description: The name of the object
+                      type: string
+                  required:
+                  - applied
+                  - name
+                  type: object
+                type: array
             type: object
         required:
         - metadata
@@ -7631,7 +9330,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.19.0
+    controller-gen.kubebuilder.io/version: v0.21.0
     helm.sh/resource-policy: keep
   name: failoverquorums.postgresql.cnpg.io
 spec:
@@ -7709,7 +9408,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.19.0
+    controller-gen.kubebuilder.io/version: v0.21.0
     helm.sh/resource-policy: keep
   name: imagecatalogs.postgresql.cnpg.io
 spec:
@@ -7752,11 +9451,150 @@ spec:
               Specification of the desired behavior of the ImageCatalog.
               More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#spec-and-status
             properties:
+              componentImages:
+                description: |-
+                  ComponentImages is a list of named images for components other than PostgreSQL
+                  (e.g. pgbouncer). Keys must be unique within a catalog.
+                items:
+                  description: CatalogComponentImage is a named image entry for a
+                    non-PostgreSQL component.
+                  properties:
+                    image:
+                      description: Image is the container image reference.
+                      type: string
+                    key:
+                      description: Key is the unique identifier for this image within
+                        the catalog.
+                      maxLength: 63
+                      pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                      type: string
+                  required:
+                  - image
+                  - key
+                  type: object
+                maxItems: 32
+                type: array
+                x-kubernetes-list-map-keys:
+                - key
+                x-kubernetes-list-type: map
+                x-kubernetes-validations:
+                - message: Component image keys must be unique
+                  rule: self.all(e, self.filter(f, f.key==e.key).size() == 1)
               images:
                 description: List of CatalogImages available in the catalog
                 items:
                   description: CatalogImage defines the image and major version
                   properties:
+                    extensions:
+                      description: The configuration of the extensions to be added
+                      items:
+                        description: |-
+                          ExtensionConfiguration is the configuration used to add
+                          PostgreSQL extensions to the Cluster.
+                        properties:
+                          bin_path:
+                            description: |-
+                              A list of directories within the image to be appended to the
+                              PostgreSQL process's `PATH` environment variable.
+                            items:
+                              type: string
+                            type: array
+                          dynamic_library_path:
+                            description: |-
+                              The list of directories inside the image which should be added to dynamic_library_path.
+                              If not defined, defaults to "/lib".
+                            items:
+                              type: string
+                            type: array
+                          env:
+                            description: |-
+                              Env is a list of custom environment variables to be set in the
+                              PostgreSQL process for this extension. It is the responsibility of the
+                              cluster administrator to ensure the variables are correct for the
+                              specific extension. Note that changes to these variables require
+                              a manual cluster restart to take effect.
+                            items:
+                              description: |-
+                                ExtensionEnvVar defines an environment variable for a specific extension
+                                image volume.
+                              properties:
+                                name:
+                                  description: |-
+                                    Name of the environment variable to be injected into the
+                                    PostgreSQL process.
+                                  minLength: 1
+                                  pattern: ^[a-zA-Z_][a-zA-Z0-9_]*$
+                                  type: string
+                                value:
+                                  description: |-
+                                    Value of the environment variable. CloudNativePG performs a direct
+                                    replacement of this value, with support for placeholder expansion.
+                                    The ${`image_root`} placeholder resolves to the absolute mount path
+                                    of the extension's volume (e.g., `/extensions/my-extension`). This
+                                    is particularly useful for allowing applications or libraries to
+                                    locate specific directories within the mounted image.
+                                    Unrecognized placeholders are rejected. To include a literal ${...}
+                                    in the value, escape it as $${...}.
+                                  minLength: 1
+                                  type: string
+                              required:
+                              - name
+                              - value
+                              type: object
+                            type: array
+                            x-kubernetes-list-map-keys:
+                            - name
+                            x-kubernetes-list-type: map
+                          extension_control_path:
+                            description: |-
+                              The list of directories inside the image which should be added to extension_control_path.
+                              If not defined, defaults to "/share".
+                            items:
+                              type: string
+                            type: array
+                          image:
+                            description: The image containing the extension.
+                            properties:
+                              pullPolicy:
+                                description: |-
+                                  Policy for pulling OCI objects. Possible values are:
+                                  Always: the kubelet always attempts to pull the reference. Container creation will fail If the pull fails.
+                                  Never: the kubelet never pulls the reference and only uses a local image or artifact. Container creation will fail if the reference isn't present.
+                                  IfNotPresent: the kubelet pulls if the reference isn't already present on disk. Container creation will fail if the reference isn't present and the pull fails.
+                                  Defaults to Always if :latest tag is specified, or IfNotPresent otherwise.
+                                type: string
+                              reference:
+                                description: |-
+                                  Required: Image or artifact reference to be used.
+                                  Behaves in the same way as pod.spec.containers[*].image.
+                                  Pull secrets will be assembled in the same way as for the container image by looking up node credentials, SA image pull secrets, and pod spec image pull secrets.
+                                  More info: https://kubernetes.io/docs/concepts/containers/images
+                                  This field is optional to allow higher level config management to default or override
+                                  container images in workload controllers like Deployments and StatefulSets.
+                                type: string
+                            type: object
+                          ld_library_path:
+                            description: The list of directories inside the image
+                              which should be added to ld_library_path.
+                            items:
+                              type: string
+                            type: array
+                          name:
+                            description: |-
+                              The name of the extension, required. The limit of 59 characters
+                              leaves room for the prefix the operator adds when deriving the
+                              extension's Kubernetes Volume name (capped at 63 characters).
+                            maxLength: 59
+                            minLength: 1
+                            pattern: ^[a-z0-9]([-a-z0-9_]*[a-z0-9])?$
+                            type: string
+                        required:
+                        - name
+                        type: object
+                      type: array
+                      x-kubernetes-list-map-keys:
+                      - name
+                      x-kubernetes-list-type: map
                     image:
                       description: The image reference
                       type: string
@@ -7790,7 +9628,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.19.0
+    controller-gen.kubebuilder.io/version: v0.21.0
     helm.sh/resource-policy: keep
   name: poolers.postgresql.cnpg.io
 spec:
@@ -7812,6 +9650,9 @@ spec:
     - jsonPath: .spec.type
       name: Type
       type: string
+    - jsonPath: .status.phase
+      name: Phase
+      type: string
     name: v1
     schema:
       openAPIV3Schema:
@@ -7850,6 +9691,9 @@ spec:
                 required:
                 - name
                 type: object
+                x-kubernetes-validations:
+                - message: cluster reference is immutable after creation
+                  rule: self == oldSelf
               deploymentStrategy:
                 description: The deployment strategy to use for pgbouncer to replace
                   existing pods with new ones
@@ -7904,19 +9748,23 @@ spec:
                 format: int32
                 type: integer
               monitoring:
-                description: |-
-                  The configuration of the monitoring infrastructure of this pooler.
-
-                  Deprecated: This feature will be removed in an upcoming release. If
-                  you need this functionality, you can create a PodMonitor manually.
+                description: The configuration of the monitoring infrastructure of
+                  this pooler.
                 properties:
                   enablePodMonitor:
                     default: false
-                    description: Enable or disable the `PodMonitor`
+                    description: |-
+                      Enable or disable the `PodMonitor`
+
+                      Deprecated: This feature will be removed in an upcoming release. If
+                      you need this functionality, you can create a PodMonitor manually.
                     type: boolean
                   podMonitorMetricRelabelings:
-                    description: The list of metric relabelings for the `PodMonitor`.
-                      Applied to samples before ingestion.
+                    description: |-
+                      The list of metric relabelings for the `PodMonitor`. Applied to samples before ingestion.
+
+                      Deprecated: This feature will be removed in an upcoming release. If
+                      you need this functionality, you can create a PodMonitor manually.
                     items:
                       description: |-
                         RelabelConfig allows dynamic rewriting of the label set for targets, alerts,
@@ -8003,8 +9851,11 @@ spec:
                       type: object
                     type: array
                   podMonitorRelabelings:
-                    description: The list of relabelings for the `PodMonitor`. Applied
-                      to samples before scraping.
+                    description: |-
+                      The list of relabelings for the `PodMonitor`. Applied to samples before scraping.
+
+                      Deprecated: This feature will be removed in an upcoming release. If
+                      you need this functionality, you can create a PodMonitor manually.
                     items:
                       description: |-
                         RelabelConfig allows dynamic rewriting of the label set for targets, alerts,
@@ -8090,6 +9941,18 @@ spec:
                           type: string
                       type: object
                     type: array
+                  tls:
+                    description: |-
+                      Configure TLS communication for the metrics endpoint.
+                      Changing tls.enabled option will force a rollout of all instances.
+                    properties:
+                      enabled:
+                        default: false
+                        description: |-
+                          Enable TLS for the monitoring endpoint.
+                          Changing this option will force a rollout of all instances.
+                        type: boolean
+                    type: object
                 type: object
               pgbouncer:
                 description: The PgBouncer configuration
@@ -8107,6 +9970,30 @@ spec:
                       query. In case it is specified, also an AuthQuery
                       (e.g. "SELECT usename, passwd FROM pg_catalog.pg_shadow WHERE usename=$1")
                       has to be specified and no automatic CNPG Cluster integration will be triggered.
+
+                      Deprecated.
+                    properties:
+                      name:
+                        description: Name of the referent.
+                        type: string
+                    required:
+                    - name
+                    type: object
+                  clientCASecret:
+                    description: |-
+                      ClientCASecret provides PgBouncer’s client_tls_ca_file, the root
+                      CA for validating client certificates
+                    properties:
+                      name:
+                        description: Name of the referent.
+                        type: string
+                    required:
+                    - name
+                    type: object
+                  clientTLSSecret:
+                    description: |-
+                      ClientTLSSecret provides PgBouncer’s client_tls_key_file (private key)
+                      and client_tls_cert_file (certificate) used to accept client connections
                     properties:
                       name:
                         description: Name of the referent.
@@ -8114,6 +10001,46 @@ spec:
                     required:
                     - name
                     type: object
+                  image:
+                    description: |-
+                      Image is the pgbouncer container image to use. When set, it takes
+                      precedence over ImageCatalogRef and the operator default, but is
+                      overridden by an explicit image set in the pod template.
+                    type: string
+                  imageCatalogRef:
+                    description: |-
+                      ImageCatalogRef points to an entry in an ImageCatalog or ClusterImageCatalog.
+                      Mutually exclusive with Image.
+                    properties:
+                      apiGroup:
+                        description: |-
+                          APIGroup is the group for the resource being referenced.
+                          If APIGroup is not specified, the specified Kind must be in the core API group.
+                          For any other third-party types, APIGroup is required.
+                        type: string
+                      key:
+                        description: Key identifies the entry within the catalog's
+                          componentImages list.
+                        maxLength: 63
+                        pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                        type: string
+                      kind:
+                        description: Kind is the type of resource being referenced
+                        type: string
+                      name:
+                        description: Name is the name of resource being referenced
+                        type: string
+                    required:
+                    - key
+                    - kind
+                    - name
+                    type: object
+                    x-kubernetes-map-type: atomic
+                    x-kubernetes-validations:
+                    - message: Only ImageCatalog and ClusterImageCatalog are supported
+                      rule: self.kind == 'ImageCatalog' || self.kind == 'ClusterImageCatalog'
+                    - message: apiGroup must be postgresql.cnpg.io
+                      rule: self.apiGroup == 'postgresql.cnpg.io'
                   parameters:
                     additionalProperties:
                       type: string
@@ -8143,7 +10070,46 @@ spec:
                     - session
                     - transaction
                     type: string
+                  serverCASecret:
+                    description: |-
+                      ServerCASecret provides PgBouncer’s server_tls_ca_file, the root
+                      CA for validating PostgreSQL certificates
+                    properties:
+                      name:
+                        description: Name of the referent.
+                        type: string
+                    required:
+                    - name
+                    type: object
+                  serverTLSSecret:
+                    description: |-
+                      ServerTLSSecret, when pointing to a TLS secret, provides pgbouncer's
+                      `server_tls_key_file` and `server_tls_cert_file`, used when
+                      authenticating against PostgreSQL.
+                    properties:
+                      name:
+                        description: Name of the referent.
+                        type: string
+                    required:
+                    - name
+                    type: object
                 type: object
+                x-kubernetes-validations:
+                - message: image and imageCatalogRef are mutually exclusive
+                  rule: '!(has(self.image) && has(self.imageCatalogRef))'
+              serviceAccountName:
+                description: |-
+                  Name of an existing ServiceAccount in the same namespace to use for the pooler.
+                  When specified, the operator will not create a new ServiceAccount
+                  but will use the provided one. This is useful for sharing a single
+                  ServiceAccount across multiple poolers (e.g., for cloud IAM configurations).
+                  If not specified, a ServiceAccount will be created with the pooler name.
+                maxLength: 253
+                pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
+                type: string
+                x-kubernetes-validations:
+                - message: serviceAccountName is immutable
+                  rule: self == oldSelf
               serviceTemplate:
                 description: Template for the Service to be created
                 properties:
@@ -10375,7 +12341,9 @@ spec:
                                   type: integer
                               type: object
                             resizePolicy:
-                              description: Resources resize policy for the container.
+                              description: |-
+                                Resources resize policy for the container.
+                                This field cannot be set on ephemeral containers.
                               items:
                                 description: ContainerResizePolicy represents resource
                                   resize policy for the container.
@@ -10605,7 +12573,6 @@ spec:
                                     procMount denotes the type of proc mount to use for the containers.
                                     The default value is Default which uses the container runtime defaults for
                                     readonly paths and masked paths.
-                                    This requires the ProcMountType feature flag to be enabled.
                                     Note that this field cannot be set when spec.os.name is windows.
                                   type: string
                                 readOnlyRootFilesystem:
@@ -12176,7 +14143,6 @@ spec:
                                     procMount denotes the type of proc mount to use for the containers.
                                     The default value is Default which uses the container runtime defaults for
                                     readonly paths and masked paths.
-                                    This requires the ProcMountType feature flag to be enabled.
                                     Note that this field cannot be set when spec.os.name is windows.
                                   type: string
                                 readOnlyRootFilesystem:
@@ -12660,7 +14626,6 @@ spec:
                           When set to false, a new userns is created for the pod. Setting false is useful for
                           mitigating container breakout vulnerabilities even allowing users to run their
                           containers as root without actually having root privileges on the host.
-                          This field is alpha-level and is only honored by servers that enable the UserNamespacesSupport feature.
                         type: boolean
                       hostname:
                         description: |-
@@ -13598,7 +15563,9 @@ spec:
                                   type: integer
                               type: object
                             resizePolicy:
-                              description: Resources resize policy for the container.
+                              description: |-
+                                Resources resize policy for the container.
+                                This field cannot be set on ephemeral containers.
                               items:
                                 description: ContainerResizePolicy represents resource
                                   resize policy for the container.
@@ -13828,7 +15795,6 @@ spec:
                                     procMount denotes the type of proc mount to use for the containers.
                                     The default value is Default which uses the container runtime defaults for
                                     readonly paths and masked paths.
-                                    This requires the ProcMountType feature flag to be enabled.
                                     Note that this field cannot be set when spec.os.name is windows.
                                   type: string
                                 readOnlyRootFilesystem:
@@ -14385,8 +16351,8 @@ spec:
                           will be made available to those containers which consume them
                           by name.
 
-                          This is an alpha field and requires enabling the
-                          DynamicResourceAllocation feature gate.
+                          This is a stable field but requires that the
+                          DynamicResourceAllocation feature gate is enabled.
 
                           This field is immutable.
                         items:
@@ -14397,6 +16363,14 @@ spec:
 
                             It adds a name to it that uniquely identifies the ResourceClaim inside the Pod.
                             Containers that need access to the ResourceClaim reference it with this name.
+
+                            When the DRAWorkloadResourceClaims feature gate is enabled and this Pod
+                            belongs to a PodGroup, a PodResourceClaim is matched to a
+                            PodGroupResourceClaim if all of their fields are equal (Name,
+                            ResourceClaimName, and ResourceClaimTemplateName). A matched claim references
+                            a single ResourceClaim shared across all Pods in the PodGroup, reserved for
+                            the PodGroup in ResourceClaimStatus.ReservedFor rather than for individual
+                            Pods.
                           properties:
                             name:
                               description: |-
@@ -14422,6 +16396,16 @@ spec:
                                 generated component, will be used to form a unique name for the
                                 ResourceClaim, which will be recorded in pod.status.resourceClaimStatuses.
 
+                                When the DRAWorkloadResourceClaims feature gate is enabled and the pod
+                                belongs to a PodGroup that defines a PodGroupResourceClaim with the same
+                                Name and ResourceClaimTemplateName, this PodResourceClaim resolves to the
+                                ResourceClaim generated for the PodGroup. All pods in the group that
+                                define an equivalent PodResourceClaim matching the
+                                PodGroupResourceClaim's Name and ResourceClaimTemplateName share the same
+                                generated ResourceClaim. ResourceClaims generated for a PodGroup are
+                                owned by the PodGroup and their lifecycles are tied to the PodGroup
+                                instead of any individual pod.
+
                                 This field is immutable and no changes will be made to the
                                 corresponding ResourceClaim by the control plane after creating the
                                 ResourceClaim.
@@ -14547,6 +16531,28 @@ spec:
                         x-kubernetes-list-map-keys:
                         - name
                         x-kubernetes-list-type: map
+                      schedulingGroup:
+                        description: |-
+                          SchedulingGroup provides a reference to the immediate scheduling runtime
+                          grouping object that this Pod belongs to.
+                          This field is used by the scheduler to identify the group and apply the
+                          correct group scheduling policies. The association with a group also
+                          impacts other lifecycle aspects of a Pod that are relevant in a wider context
+                          of scheduling like preemption, resource attachment, etc. If not specified,
+                          the Pod is treated as a single unit in all of these aspects.
+                          The group object referenced by this field may not exist at the time the
+                          Pod is created.
+                          This field is immutable, but a group object with the same name may be
+                          recreated with different policies. Doing this during pod scheduling
+                          may result in the placement not conforming to the expected policies.
+                        properties:
+                          podGroupName:
+                            description: |-
+                              PodGroupName specifies the name of the standalone PodGroup object
+                              that represents the runtime instance of this group.
+                              Must be a DNS subdomain.
+                            type: string
+                        type: object
                       securityContext:
                         description: |-
                           SecurityContext holds pod-level security attributes and common container settings.
@@ -14845,9 +16851,10 @@ spec:
                             operator:
                               description: |-
                                 Operator represents a key's relationship to the value.
-                                Valid operators are Exists and Equal. Defaults to Equal.
+                                Valid operators are Exists, Equal, Lt, and Gt. Defaults to Equal.
                                 Exists is equivalent to wildcard for value, so that a pod can
                                 tolerate all taints of a particular category.
+                                Lt and Gt perform numeric comparisons (requires feature gate TaintTolerationComparisonOperators).
                               type: string
                             tolerationSeconds:
                               description: |-
@@ -15641,7 +17648,7 @@ spec:
                                         resources:
                                           description: |-
                                             resources represents the minimum resources the volume should have.
-                                            If RecoverVolumeExpansionFailure feature is enabled users are allowed to specify resource requirements
+                                            Users are allowed to specify resource requirements
                                             that are lower than previous value but must still be higher than capacity recorded in the
                                             status field of the claim.
                                             More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources
@@ -15974,7 +17981,7 @@ spec:
                                 A failure to resolve or pull the image during pod startup will block containers from starting and may add significant latency. Failures will be retried using normal volume backoff and will be reported on the pod reason and message.
                                 The types of objects that may be mounted by this volume are defined by the container runtime implementation on a host machine and at minimum must include all valid types supported by the container image field.
                                 The OCI object gets mounted in a single directory (spec.containers[*].volumeMounts.mountPath) by merging the manifest layers in the same way as for container images.
-                                The volume will be mounted read-only (ro) and non-executable files (noexec).
+                                The volume will be mounted read-only (ro).
                                 Sub path mounts for containers are not supported (spec.containers[*].volumeMounts.subpath) before 1.33.
                                 The field spec.securityContext.fsGroupChangePolicy has no effect on this volume type.
                               properties:
@@ -16146,8 +18153,7 @@ spec:
                               description: |-
                                 portworxVolume represents a portworx volume attached and mounted on kubelets host machine.
                                 Deprecated: PortworxVolume is deprecated. All operations for the in-tree portworxVolume type
-                                are redirected to the pxd.portworx.com CSI driver when the CSIMigrationPortworx feature-gate
-                                is on.
+                                are redirected to the pxd.portworx.com CSI driver.
                               properties:
                                 fsType:
                                   description: |-
@@ -16527,6 +18533,24 @@ spec:
                                             description: Kubelet's generated CSRs
                                               will be addressed to this signer.
                                             type: string
+                                          userAnnotations:
+                                            additionalProperties:
+                                              type: string
+                                            description: |-
+                                              userAnnotations allow pod authors to pass additional information to
+                                              the signer implementation.  Kubernetes does not restrict or validate this
+                                              metadata in any way.
+
+                                              These values are copied verbatim into the `spec.unverifiedUserAnnotations` field of
+                                              the PodCertificateRequest objects that Kubelet creates.
+
+                                              Entries are subject to the same validation as object metadata annotations,
+                                              with the addition that all keys must be domain-prefixed. No restrictions
+                                              are placed on values, except an overall size limitation on the entire field.
+
+                                              Signers should document the keys and values they support. Signers should
+                                              deny requests that contain keys they do not recognize.
+                                            type: object
                                         required:
                                         - keyType
                                         - signerName
@@ -16974,10 +18998,34 @@ spec:
               date. Populated by the system. Read-only.
               More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#spec-and-status
             properties:
+              error:
+                description: Error is the latest admission validation error
+                type: string
+              image:
+                description: |-
+                  Image is the resolved pgbouncer container image that the operator is
+                  using for this Pooler, including any override coming from spec.template.
+                  While Phase is Active or Paused this field reflects what the Deployment
+                  actually runs; while Phase is Inactive or Failed it may carry the last
+                  successfully resolved value (or be empty if the Pooler has never reconciled
+                  successfully).
+                type: string
               instances:
                 description: The number of pods trying to be scheduled
                 format: int32
                 type: integer
+              phase:
+                description: Phase summarizes the overall lifecycle state of the Pooler.
+                enum:
+                - active
+                - paused
+                - inactive
+                - failed
+                type: string
+              phaseReason:
+                description: PhaseReason is a human-readable explanation of the current
+                  Phase.
+                type: string
               secrets:
                 description: The resource version of the config object
                 properties:
@@ -16991,6 +19039,16 @@ spec:
                         description: The ResourceVersion of the secret
                         type: string
                     type: object
+                  clientTLS:
+                    description: The client TLS secret version
+                    properties:
+                      name:
+                        description: The name of the secret
+                        type: string
+                      version:
+                        description: The ResourceVersion of the secret
+                        type: string
+                    type: object
                   pgBouncerSecrets:
                     description: The version of the secrets used by PgBouncer
                     properties:
@@ -17043,7 +19101,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.19.0
+    controller-gen.kubebuilder.io/version: v0.21.0
     helm.sh/resource-policy: keep
   name: publications.postgresql.cnpg.io
 spec:
@@ -17112,6 +19170,9 @@ spec:
                     type: string
                 type: object
                 x-kubernetes-map-type: atomic
+                x-kubernetes-validations:
+                - message: cluster reference is immutable after creation
+                  rule: self == oldSelf
               dbname:
                 description: |-
                   The name of the database where the publication will be installed in
@@ -17239,7 +19300,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.19.0
+    controller-gen.kubebuilder.io/version: v0.21.0
     helm.sh/resource-policy: keep
   name: scheduledbackups.postgresql.cnpg.io
 spec:
@@ -17309,6 +19370,9 @@ spec:
                 required:
                 - name
                 type: object
+                x-kubernetes-validations:
+                - message: cluster reference is immutable after creation
+                  rule: self == oldSelf
               immediate:
                 description: If the first backup has to be immediately start after
                   creation or not
@@ -17404,6 +19468,9 @@ spec:
               to date. Populated by the system. Read-only.
               More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#spec-and-status
             properties:
+              error:
+                description: Error is the latest admission validation error
+                type: string
               lastCheckTime:
                 description: The latest time the schedule
                 format: date-time
@@ -17431,7 +19498,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.19.0
+    controller-gen.kubebuilder.io/version: v0.21.0
     helm.sh/resource-policy: keep
   name: subscriptions.postgresql.cnpg.io
 spec:
@@ -17500,6 +19567,9 @@ spec:
                     type: string
                 type: object
                 x-kubernetes-map-type: atomic
+                x-kubernetes-validations:
+                - message: cluster reference is immutable after creation
+                  rule: self == oldSelf
               dbname:
                 description: |-
                   The name of the database where the publication will be installed in
diff --git a/packages/system/postgres-operator/charts/cloudnative-pg/templates/deployment.yaml b/packages/system/postgres-operator/charts/cloudnative-pg/templates/deployment.yaml
index 760b37685a..c17e6a7493 100644
--- a/packages/system/postgres-operator/charts/cloudnative-pg/templates/deployment.yaml
+++ b/packages/system/postgres-operator/charts/cloudnative-pg/templates/deployment.yaml
@@ -101,7 +101,7 @@ spec:
         livenessProbe:
           httpGet:
             path: /readyz
-            port: {{ .Values.webhook.port }}
+            port: webhook-server
             scheme: HTTPS
           {{- if .Values.webhook.livenessProbe.initialDelaySeconds }}
           initialDelaySeconds: {{ .Values.webhook.livenessProbe.initialDelaySeconds }}
@@ -117,7 +117,7 @@ spec:
         readinessProbe:
           httpGet:
             path: /readyz
-            port: {{ .Values.webhook.port }}
+            port: webhook-server
             scheme: HTTPS
           {{- if .Values.webhook.readinessProbe.initialDelaySeconds }}
           initialDelaySeconds: {{ .Values.webhook.readinessProbe.initialDelaySeconds }}
@@ -132,7 +132,7 @@ spec:
           {{- end }}
           httpGet:
             path: /readyz
-            port: {{ .Values.webhook.port }}
+            port: webhook-server
             scheme: HTTPS
           {{- if .Values.webhook.startupProbe.periodSeconds }}
           periodSeconds: {{ .Values.webhook.startupProbe.periodSeconds }}
diff --git a/packages/system/postgres-operator/charts/cloudnative-pg/templates/rbac.yaml b/packages/system/postgres-operator/charts/cloudnative-pg/templates/rbac.yaml
index 0dc17080d1..759b0bc02b 100644
--- a/packages/system/postgres-operator/charts/cloudnative-pg/templates/rbac.yaml
+++ b/packages/system/postgres-operator/charts/cloudnative-pg/templates/rbac.yaml
@@ -132,6 +132,7 @@ rules:
   - backups
   - clusters
   - clusters/status
+  - databaseroles
   - databases
   - failoverquorums
   - poolers
@@ -162,6 +163,7 @@ rules:
   - backups
   - clusters
   - clusters/status
+  - databaseroles
   - databases
   - failoverquorums
   - poolers
diff --git a/packages/system/postgres-operator/charts/cloudnative-pg/values.schema.json b/packages/system/postgres-operator/charts/cloudnative-pg/values.schema.json
index 4c69aae69a..efdd012e85 100644
--- a/packages/system/postgres-operator/charts/cloudnative-pg/values.schema.json
+++ b/packages/system/postgres-operator/charts/cloudnative-pg/values.schema.json
@@ -1,313 +1,470 @@
 {
-    "$schema": "http://json-schema.org/schema#",
-    "type": "object",
-    "properties": {
-        "additionalArgs": {
-            "type": "array"
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "properties": {
+    "additionalArgs": {
+      "description": "Additional arguments to be added to the operator's args list.",
+      "items": {
+        "required": []
+      },
+      "type": "array"
+    },
+    "additionalEnv": {
+      "description": "Array containing extra environment variables which can be templated.",
+      "items": {
+        "required": []
+      },
+      "type": "array"
+    },
+    "affinity": {
+      "description": "Affinity for the operator to be installed.",
+      "required": [],
+      "type": "object"
+    },
+    "commonAnnotations": {
+      "description": "Annotations to be added to all other resources.",
+      "required": [],
+      "type": "object"
+    },
+    "config": {
+      "description": "Operator configuration.",
+      "properties": {
+        "clusterWide": {
+          "default": true,
+          "description": "This option determines if the operator is responsible for observing\nevents across the entire Kubernetes cluster or if its focus should be\nnarrowed down to the specific namespace within which it has been deployed.",
+          "type": "boolean"
         },
-        "additionalEnv": {
-            "type": "array"
+        "create": {
+          "default": true,
+          "description": "Specifies whether the secret should be created.",
+          "type": "boolean"
         },
-        "affinity": {
-            "type": "object"
+        "data": {
+          "description": "The content of the configmap/secret, see\nhttps://cloudnative-pg.io/documentation/current/operator_conf/#available-options\nfor all the available options.",
+          "required": [],
+          "type": "object"
         },
-        "commonAnnotations": {
-            "type": "object"
+        "maxConcurrentReconciles": {
+          "default": 10,
+          "description": "The maximum number of concurrent reconciles. Defaults to 10.",
+          "type": "integer"
         },
-        "config": {
-            "type": "object",
-            "properties": {
-                "clusterWide": {
-                    "type": "boolean"
-                },
-                "create": {
-                    "type": "boolean"
-                },
-                "data": {
-                    "type": "object"
-                },
-                "maxConcurrentReconciles": {
-                    "type": "integer"
-                },
-                "name": {
-                    "type": "string"
-                },
-                "secret": {
-                    "type": "boolean"
-                }
-            }
+        "name": {
+          "default": "cnpg-controller-manager-config",
+          "description": "The name of the configmap/secret to use.",
+          "type": "string"
         },
-        "containerSecurityContext": {
-            "type": "object",
-            "properties": {
-                "allowPrivilegeEscalation": {
-                    "type": "boolean"
-                },
-                "capabilities": {
-                    "type": "object",
-                    "properties": {
-                        "drop": {
-                            "type": "array",
-                            "items": {
-                                "type": "string"
-                            }
-                        }
-                    }
-                },
-                "readOnlyRootFilesystem": {
-                    "type": "boolean"
-                },
-                "runAsGroup": {
-                    "type": "integer"
-                },
-                "runAsUser": {
-                    "type": "integer"
-                },
-                "seccompProfile": {
-                    "type": "object",
-                    "properties": {
-                        "type": {
-                            "type": "string"
-                        }
-                    }
-                }
-            }
+        "secret": {
+          "default": false,
+          "description": "Specifies whether it should be stored in a secret, instead of a configmap.",
+          "type": "boolean"
+        }
+      },
+      "required": [],
+      "type": "object"
+    },
+    "containerSecurityContext": {
+      "description": "Container Security Context.",
+      "properties": {
+        "allowPrivilegeEscalation": {
+          "default": false,
+          "type": "boolean"
         },
-        "crds": {
-            "type": "object",
-            "properties": {
-                "create": {
-                    "type": "boolean"
-                }
+        "capabilities": {
+          "properties": {
+            "drop": {
+              "items": {
+                "anyOf": [
+                  {
+                    "type": "string"
+                  }
+                ],
+                "required": []
+              },
+              "type": "array"
             }
+          },
+          "required": [],
+          "type": "object"
         },
-        "dnsPolicy": {
-            "type": "string"
+        "readOnlyRootFilesystem": {
+          "default": true,
+          "type": "boolean"
         },
-        "fullnameOverride": {
-            "type": "string"
+        "runAsGroup": {
+          "default": 10001,
+          "type": "integer"
         },
-        "hostNetwork": {
-            "type": "boolean"
+        "runAsUser": {
+          "default": 10001,
+          "type": "integer"
         },
-        "image": {
-            "type": "object",
-            "properties": {
-                "pullPolicy": {
-                    "type": "string"
-                },
-                "repository": {
-                    "type": "string"
-                },
-                "tag": {
-                    "type": "string"
-                }
+        "seccompProfile": {
+          "properties": {
+            "type": {
+              "default": "RuntimeDefault",
+              "type": "string"
             }
+          },
+          "required": [],
+          "type": "object"
+        }
+      },
+      "required": [],
+      "type": "object"
+    },
+    "crds": {
+      "properties": {
+        "create": {
+          "default": true,
+          "description": "Specifies whether the CRDs should be created when installing the chart.",
+          "type": "boolean"
+        }
+      },
+      "required": [],
+      "type": "object"
+    },
+    "dnsPolicy": {
+      "default": "",
+      "type": "string"
+    },
+    "fullnameOverride": {
+      "default": "",
+      "type": "string"
+    },
+    "global": {
+      "description": "Global values are values that can be accessed from any chart or subchart by exactly the same name.",
+      "required": [],
+      "type": "object"
+    },
+    "hostNetwork": {
+      "default": false,
+      "type": "boolean"
+    },
+    "image": {
+      "properties": {
+        "pullPolicy": {
+          "default": "IfNotPresent",
+          "type": "string"
         },
-        "imagePullSecrets": {
-            "type": "array"
-        },
-        "monitoring": {
-            "type": "object",
-            "properties": {
-                "grafanaDashboard": {
-                    "type": "object",
-                    "properties": {
-                        "annotations": {
-                            "type": "object"
-                        },
-                        "configMapName": {
-                            "type": "string"
-                        },
-                        "create": {
-                            "type": "boolean"
-                        },
-                        "labels": {
-                            "type": "object"
-                        },
-                        "namespace": {
-                            "type": "string"
-                        },
-                        "sidecarLabel": {
-                            "type": "string"
-                        },
-                        "sidecarLabelValue": {
-                            "type": "string"
-                        }
-                    }
-                },
-                "podMonitorAdditionalLabels": {
-                    "type": "object"
-                },
-                "podMonitorEnabled": {
-                    "type": "boolean"
-                },
-                "podMonitorMetricRelabelings": {
-                    "type": "array"
-                },
-                "podMonitorRelabelings": {
-                    "type": "array"
-                }
-            }
+        "repository": {
+          "default": "ghcr.io/cloudnative-pg/cloudnative-pg",
+          "type": "string"
         },
-        "monitoringQueriesConfigMap": {
-            "type": "object",
-            "properties": {
-                "name": {
-                    "type": "string"
-                },
-                "queries": {
-                    "type": "string"
-                }
+        "tag": {
+          "default": "",
+          "description": "Overrides the image tag whose default is the chart appVersion.",
+          "type": "string"
+        }
+      },
+      "required": [],
+      "type": "object"
+    },
+    "imagePullSecrets": {
+      "items": {
+        "required": []
+      },
+      "type": "array"
+    },
+    "monitoring": {
+      "properties": {
+        "grafanaDashboard": {
+          "properties": {
+            "annotations": {
+              "description": "Annotations that ConfigMaps can have to get configured in Grafana.",
+              "required": [],
+              "type": "object"
+            },
+            "configMapName": {
+              "default": "cnpg-grafana-dashboard",
+              "description": "The name of the ConfigMap containing the dashboard.",
+              "type": "string"
+            },
+            "create": {
+              "default": false,
+              "type": "boolean"
+            },
+            "labels": {
+              "description": "Labels that ConfigMaps should have to get configured in Grafana.",
+              "required": [],
+              "type": "object"
+            },
+            "namespace": {
+              "default": "",
+              "description": "Allows overriding the namespace where the ConfigMap will be created, defaulting to the same one as the Release.",
+              "type": "string"
+            },
+            "sidecarLabel": {
+              "default": "grafana_dashboard",
+              "description": "Label that ConfigMaps should have to be loaded as dashboards. DEPRECATED: Use labels instead.",
+              "type": "string"
+            },
+            "sidecarLabelValue": {
+              "default": "1",
+              "description": "Label value that ConfigMaps should have to be loaded as dashboards. DEPRECATED: Use labels instead.",
+              "type": "string"
             }
+          },
+          "required": [],
+          "type": "object"
         },
-        "nameOverride": {
-            "type": "string"
+        "podMonitorAdditionalLabels": {
+          "description": "Additional labels for the podMonitor",
+          "required": [],
+          "type": "object"
         },
-        "namespaceOverride": {
-            "type": "string"
+        "podMonitorEnabled": {
+          "default": false,
+          "description": "Specifies whether the monitoring should be enabled. Requires Prometheus Operator CRDs.",
+          "type": "boolean"
         },
-        "nodeSelector": {
-            "type": "object"
+        "podMonitorMetricRelabelings": {
+          "description": "Metrics relabel configurations to apply to samples before ingestion.",
+          "items": {
+            "required": []
+          },
+          "type": "array"
         },
-        "podAnnotations": {
-            "type": "object"
+        "podMonitorRelabelings": {
+          "description": "Relabel configurations to apply to samples before scraping.",
+          "items": {
+            "required": []
+          },
+          "type": "array"
+        }
+      },
+      "required": [],
+      "type": "object"
+    },
+    "monitoringQueriesConfigMap": {
+      "description": "Default monitoring queries",
+      "properties": {
+        "name": {
+          "default": "cnpg-default-monitoring",
+          "description": "The name of the default monitoring configmap.",
+          "type": "string"
         },
-        "podLabels": {
-            "type": "object"
+        "queries": {
+          "default": "backends:\n  query: |\n    SELECT sa.datname\n      , sa.usename\n      , sa.application_name\n      , states.state\n      , COALESCE(sa.count, 0) AS total\n      , COALESCE(sa.max_tx_secs, 0) AS max_tx_duration_seconds\n    FROM ( VALUES ('active')\n      , ('idle')\n      , ('idle in transaction')\n      , ('idle in transaction (aborted)')\n      , ('fastpath function call')\n      , ('disabled')\n      ) AS states(state)\n    LEFT JOIN (\n      SELECT datname\n        , state\n        , usename\n        , COALESCE(application_name, '') AS application_name\n        , pg_catalog.count(*)\n        , COALESCE(EXTRACT (EPOCH FROM (pg_catalog.max(pg_catalog.now() OPERATOR(pg_catalog.-) xact_start))), 0) AS max_tx_secs\n      FROM pg_catalog.pg_stat_activity\n      GROUP BY datname, state, usename, application_name\n    ) sa ON states.state OPERATOR(pg_catalog.=) sa.state\n    WHERE sa.usename IS NOT NULL\n  metrics:\n    - datname:\n        usage: \"LABEL\"\n        description: \"Name of the database\"\n    - usename:\n        usage: \"LABEL\"\n        description: \"Name of the user\"\n    - application_name:\n        usage: \"LABEL\"\n        description: \"Name of the application\"\n    - state:\n        usage: \"LABEL\"\n        description: \"State of the backend\"\n    - total:\n        usage: \"GAUGE\"\n        description: \"Number of backends\"\n    - max_tx_duration_seconds:\n        usage: \"GAUGE\"\n        description: \"Maximum duration of a transaction in seconds\"\n\nbackends_waiting:\n  query: |\n    SELECT pg_catalog.count(*) AS total\n    FROM pg_catalog.pg_locks blocked_locks\n    JOIN pg_catalog.pg_locks blocking_locks\n      ON blocking_locks.locktype OPERATOR(pg_catalog.=) blocked_locks.locktype\n      AND blocking_locks.database IS NOT DISTINCT FROM blocked_locks.database\n      AND blocking_locks.relation IS NOT DISTINCT FROM blocked_locks.relation\n      AND blocking_locks.page IS NOT DISTINCT FROM blocked_locks.page\n      AND blocking_locks.tuple IS NOT DISTINCT FROM blocked_locks.tuple\n      AND blocking_locks.virtualxid IS NOT DISTINCT FROM blocked_locks.virtualxid\n      AND blocking_locks.transactionid IS NOT DISTINCT FROM blocked_locks.transactionid\n      AND blocking_locks.classid IS NOT DISTINCT FROM blocked_locks.classid\n      AND blocking_locks.objid IS NOT DISTINCT FROM blocked_locks.objid\n      AND blocking_locks.objsubid IS NOT DISTINCT FROM blocked_locks.objsubid\n      AND blocking_locks.pid OPERATOR(pg_catalog.\u003c\u003e) blocked_locks.pid\n    JOIN pg_catalog.pg_stat_activity blocking_activity ON blocking_activity.pid OPERATOR(pg_catalog.=) blocking_locks.pid\n    WHERE NOT blocked_locks.granted\n  metrics:\n    - total:\n        usage: \"GAUGE\"\n        description: \"Total number of backends that are currently waiting on other queries\"\n\npg_database:\n  query: |\n    SELECT datname\n      , pg_catalog.pg_database_size(datname) AS size_bytes\n      , pg_catalog.age(datfrozenxid) AS xid_age\n      , pg_catalog.mxid_age(datminmxid) AS mxid_age\n    FROM pg_catalog.pg_database\n    WHERE datallowconn\n  metrics:\n    - datname:\n        usage: \"LABEL\"\n        description: \"Name of the database\"\n    - size_bytes:\n        usage: \"GAUGE\"\n        description: \"Disk space used by the database\"\n    - xid_age:\n        usage: \"GAUGE\"\n        description: \"Number of transactions from the frozen XID to the current one\"\n    - mxid_age:\n        usage: \"GAUGE\"\n        description: \"Number of multiple transactions (Multixact) from the frozen XID to the current one\"\n\npg_postmaster:\n  query: |\n    SELECT EXTRACT(EPOCH FROM pg_postmaster_start_time) AS start_time\n    FROM pg_catalog.pg_postmaster_start_time()\n  metrics:\n    - start_time:\n        usage: \"GAUGE\"\n        description: \"Time at which postgres started (based on epoch)\"\n\npg_replication:\n  query: |\n    SELECT CASE WHEN (\n        NOT pg_catalog.pg_is_in_recovery()\n        OR pg_catalog.pg_last_wal_receive_lsn() OPERATOR(pg_catalog.=) pg_catalog.pg_last_wal_replay_lsn())\n      THEN 0\n      ELSE GREATEST (0,\n        EXTRACT(EPOCH FROM (pg_catalog.now() OPERATOR(pg_catalog.-) pg_catalog.pg_last_xact_replay_timestamp())))\n      END AS lag,\n      pg_catalog.pg_is_in_recovery() AS in_recovery,\n      EXISTS (TABLE pg_catalog.pg_stat_wal_receiver) AS is_wal_receiver_up,\n      (SELECT pg_catalog.count(*) FROM pg_catalog.pg_stat_replication) AS streaming_replicas\n  metrics:\n    - lag:\n        usage: \"GAUGE\"\n        description: \"Replication lag behind primary in seconds\"\n    - in_recovery:\n        usage: \"GAUGE\"\n        description: \"Whether the instance is in recovery\"\n    - is_wal_receiver_up:\n        usage: \"GAUGE\"\n        description: \"Whether the instance wal_receiver is up\"\n    - streaming_replicas:\n        usage: \"GAUGE\"\n        description: \"Number of streaming replicas connected to the instance\"\n\npg_replication_slots:\n  query: |\n    SELECT slot_name,\n      slot_type,\n      database,\n      active,\n      (CASE pg_catalog.pg_is_in_recovery()\n        WHEN TRUE THEN pg_catalog.pg_wal_lsn_diff(pg_catalog.pg_last_wal_receive_lsn(), restart_lsn)\n        ELSE pg_catalog.pg_wal_lsn_diff(pg_catalog.pg_current_wal_lsn(), restart_lsn)\n      END) as pg_wal_lsn_diff\n    FROM pg_catalog.pg_replication_slots\n    WHERE NOT temporary\n  metrics:\n    - slot_name:\n        usage: \"LABEL\"\n        description: \"Name of the replication slot\"\n    - slot_type:\n        usage: \"LABEL\"\n        description: \"Type of the replication slot\"\n    - database:\n        usage: \"LABEL\"\n        description: \"Name of the database\"\n    - active:\n        usage: \"GAUGE\"\n        description: \"Flag indicating whether the slot is active\"\n    - pg_wal_lsn_diff:\n        usage: \"GAUGE\"\n        description: \"Replication lag in bytes\"\n\npg_stat_archiver:\n  query: |\n    SELECT archived_count\n      , failed_count\n      , COALESCE(EXTRACT(EPOCH FROM (pg_catalog.now() OPERATOR(pg_catalog.-) last_archived_time)), -1) AS seconds_since_last_archival\n      , COALESCE(EXTRACT(EPOCH FROM (pg_catalog.now() OPERATOR(pg_catalog.-) last_failed_time)), -1) AS seconds_since_last_failure\n      , COALESCE(EXTRACT(EPOCH FROM last_archived_time), -1) AS last_archived_time\n      , COALESCE(EXTRACT(EPOCH FROM last_failed_time), -1) AS last_failed_time\n      , COALESCE(CAST(CAST('x' OPERATOR(pg_catalog.||) pg_catalog.right(pg_catalog.split_part(last_archived_wal, '.', 1), 16) AS pg_catalog.bit(64)) AS pg_catalog.int8), -1) AS last_archived_wal_start_lsn\n      , COALESCE(CAST(CAST('x' OPERATOR(pg_catalog.||) pg_catalog.right(pg_catalog.split_part(last_failed_wal, '.', 1), 16) AS pg_catalog.bit(64)) AS pg_catalog.int8), -1) AS last_failed_wal_start_lsn\n      , EXTRACT(EPOCH FROM stats_reset) AS stats_reset_time\n    FROM pg_catalog.pg_stat_archiver\n  predicate_query: |\n    SELECT NOT pg_catalog.pg_is_in_recovery()\n      OR pg_catalog.current_setting('archive_mode') OPERATOR(pg_catalog.=) 'always'\n  metrics:\n    - archived_count:\n        usage: \"COUNTER\"\n        description: \"Number of WAL files that have been successfully archived\"\n    - failed_count:\n        usage: \"COUNTER\"\n        description: \"Number of failed attempts for archiving WAL files\"\n    - seconds_since_last_archival:\n        usage: \"GAUGE\"\n        description: \"Seconds since the last successful archival operation\"\n    - seconds_since_last_failure:\n        usage: \"GAUGE\"\n        description: \"Seconds since the last failed archival operation\"\n    - last_archived_time:\n        usage: \"GAUGE\"\n        description: \"Epoch of the last time WAL archiving succeeded\"\n    - last_failed_time:\n        usage: \"GAUGE\"\n        description: \"Epoch of the last time WAL archiving failed\"\n    - last_archived_wal_start_lsn:\n        usage: \"GAUGE\"\n        description: \"Archived WAL start LSN\"\n    - last_failed_wal_start_lsn:\n        usage: \"GAUGE\"\n        description: \"Last failed WAL LSN\"\n    - stats_reset_time:\n        usage: \"GAUGE\"\n        description: \"Time at which these statistics were last reset\"\n\npg_stat_bgwriter:\n  runonserver: \"\u003c17.0.0\"\n  query: |\n    SELECT checkpoints_timed\n      , checkpoints_req\n      , checkpoint_write_time\n      , checkpoint_sync_time\n      , buffers_checkpoint\n      , buffers_clean\n      , maxwritten_clean\n      , buffers_backend\n      , buffers_backend_fsync\n      , buffers_alloc\n    FROM pg_catalog.pg_stat_bgwriter\n  metrics:\n    - checkpoints_timed:\n        usage: \"COUNTER\"\n        description: \"Number of scheduled checkpoints that have been performed\"\n    - checkpoints_req:\n        usage: \"COUNTER\"\n        description: \"Number of requested checkpoints that have been performed\"\n    - checkpoint_write_time:\n        usage: \"COUNTER\"\n        description: \"Total amount of time that has been spent in the portion of checkpoint processing where files are written to disk, in milliseconds\"\n    - checkpoint_sync_time:\n        usage: \"COUNTER\"\n        description: \"Total amount of time that has been spent in the portion of checkpoint processing where files are synchronized to disk, in milliseconds\"\n    - buffers_checkpoint:\n        usage: \"COUNTER\"\n        description: \"Number of buffers written during checkpoints\"\n    - buffers_clean:\n        usage: \"COUNTER\"\n        description: \"Number of buffers written by the background writer\"\n    - maxwritten_clean:\n        usage: \"COUNTER\"\n        description: \"Number of times the background writer stopped a cleaning scan because it had written too many buffers\"\n    - buffers_backend:\n        usage: \"COUNTER\"\n        description: \"Number of buffers written directly by a backend\"\n    - buffers_backend_fsync:\n        usage: \"COUNTER\"\n        description: \"Number of times a backend had to execute its own fsync call (normally the background writer handles those even when the backend does its own write)\"\n    - buffers_alloc:\n        usage: \"COUNTER\"\n        description: \"Number of buffers allocated\"\n\npg_stat_bgwriter_17:\n  runonserver: \"\u003e=17.0.0\"\n  name: pg_stat_bgwriter\n  query: |\n    SELECT buffers_clean\n      , maxwritten_clean\n      , buffers_alloc\n      , EXTRACT(EPOCH FROM stats_reset) AS stats_reset_time\n    FROM pg_catalog.pg_stat_bgwriter\n  metrics:\n    - buffers_clean:\n        usage: \"COUNTER\"\n        description: \"Number of buffers written by the background writer\"\n    - maxwritten_clean:\n        usage: \"COUNTER\"\n        description: \"Number of times the background writer stopped a cleaning scan because it had written too many buffers\"\n    - buffers_alloc:\n        usage: \"COUNTER\"\n        description: \"Number of buffers allocated\"\n    - stats_reset_time:\n        usage: \"GAUGE\"\n        description: \"Time at which these statistics were last reset\"\n\npg_stat_checkpointer:\n  runonserver: \"\u003e=17.0.0\"\n  query: |\n    SELECT num_timed AS checkpoints_timed\n      , num_requested AS checkpoints_req\n      , restartpoints_timed\n      , restartpoints_req\n      , restartpoints_done\n      , write_time\n      , sync_time\n      , buffers_written\n      , EXTRACT(EPOCH FROM stats_reset) AS stats_reset_time\n    FROM pg_catalog.pg_stat_checkpointer\n  metrics:\n    - checkpoints_timed:\n        usage: \"COUNTER\"\n        description: \"Number of scheduled checkpoints that have been performed\"\n    - checkpoints_req:\n        usage: \"COUNTER\"\n        description: \"Number of requested checkpoints that have been performed\"\n    - restartpoints_timed:\n        usage: \"COUNTER\"\n        description: \"Number of scheduled restartpoints due to timeout or after a failed attempt to perform it\"\n    - restartpoints_req:\n        usage: \"COUNTER\"\n        description: \"Number of requested restartpoints that have been performed\"\n    - restartpoints_done:\n        usage: \"COUNTER\"\n        description: \"Number of restartpoints that have been performed\"\n    - write_time:\n        usage: \"COUNTER\"\n        description: \"Total amount of time that has been spent in the portion of processing checkpoints and restartpoints where files are written to disk, in milliseconds\"\n    - sync_time:\n        usage: \"COUNTER\"\n        description: \"Total amount of time that has been spent in the portion of processing checkpoints and restartpoints where files are synchronized to disk, in milliseconds\"\n    - buffers_written:\n        usage: \"COUNTER\"\n        description: \"Number of buffers written during checkpoints and restartpoints\"\n    - stats_reset_time:\n        usage: \"GAUGE\"\n        description: \"Time at which these statistics were last reset\"\n\npg_stat_database:\n  query: |\n    SELECT datname\n      , xact_commit\n      , xact_rollback\n      , blks_read\n      , blks_hit\n      , tup_returned\n      , tup_fetched\n      , tup_inserted\n      , tup_updated\n      , tup_deleted\n      , conflicts\n      , temp_files\n      , temp_bytes\n      , deadlocks\n      , blk_read_time\n      , blk_write_time\n    FROM pg_catalog.pg_stat_database\n  metrics:\n    - datname:\n        usage: \"LABEL\"\n        description: \"Name of this database\"\n    - xact_commit:\n        usage: \"COUNTER\"\n        description: \"Number of transactions in this database that have been committed\"\n    - xact_rollback:\n        usage: \"COUNTER\"\n        description: \"Number of transactions in this database that have been rolled back\"\n    - blks_read:\n        usage: \"COUNTER\"\n        description: \"Number of disk blocks read in this database\"\n    - blks_hit:\n        usage: \"COUNTER\"\n        description: \"Number of times disk blocks were found already in the buffer cache, so that a read was not necessary (this only includes hits in the PostgreSQL buffer cache, not the operating system's file system cache)\"\n    - tup_returned:\n        usage: \"COUNTER\"\n        description: \"Number of rows returned by queries in this database\"\n    - tup_fetched:\n        usage: \"COUNTER\"\n        description: \"Number of rows fetched by queries in this database\"\n    - tup_inserted:\n        usage: \"COUNTER\"\n        description: \"Number of rows inserted by queries in this database\"\n    - tup_updated:\n        usage: \"COUNTER\"\n        description: \"Number of rows updated by queries in this database\"\n    - tup_deleted:\n        usage: \"COUNTER\"\n        description: \"Number of rows deleted by queries in this database\"\n    - conflicts:\n        usage: \"COUNTER\"\n        description: \"Number of queries canceled due to conflicts with recovery in this database\"\n    - temp_files:\n        usage: \"COUNTER\"\n        description: \"Number of temporary files created by queries in this database\"\n    - temp_bytes:\n        usage: \"COUNTER\"\n        description: \"Total amount of data written to temporary files by queries in this database\"\n    - deadlocks:\n        usage: \"COUNTER\"\n        description: \"Number of deadlocks detected in this database\"\n    - blk_read_time:\n        usage: \"COUNTER\"\n        description: \"Time spent reading data file blocks by backends in this database, in milliseconds\"\n    - blk_write_time:\n        usage: \"COUNTER\"\n        description: \"Time spent writing data file blocks by backends in this database, in milliseconds\"\n\npg_stat_replication:\n  primary: true\n  query: |\n    SELECT usename\n      , COALESCE(application_name, '') AS application_name\n      , COALESCE(client_addr::text, '') AS client_addr\n      , COALESCE(client_port::text, '') AS client_port\n      , EXTRACT(EPOCH FROM backend_start) AS backend_start\n      , COALESCE(pg_catalog.age(backend_xmin), 0) AS backend_xmin_age\n      , pg_catalog.pg_wal_lsn_diff(pg_catalog.pg_current_wal_lsn(), sent_lsn) AS sent_diff_bytes\n      , pg_catalog.pg_wal_lsn_diff(pg_catalog.pg_current_wal_lsn(), write_lsn) AS write_diff_bytes\n      , pg_catalog.pg_wal_lsn_diff(pg_catalog.pg_current_wal_lsn(), flush_lsn) AS flush_diff_bytes\n      , COALESCE(pg_catalog.pg_wal_lsn_diff(pg_catalog.pg_current_wal_lsn(), replay_lsn),0) AS replay_diff_bytes\n      , COALESCE((EXTRACT(EPOCH FROM write_lag)),0)::float AS write_lag_seconds\n      , COALESCE((EXTRACT(EPOCH FROM flush_lag)),0)::float AS flush_lag_seconds\n      , COALESCE((EXTRACT(EPOCH FROM replay_lag)),0)::float AS replay_lag_seconds\n    FROM pg_catalog.pg_stat_replication\n  metrics:\n    - usename:\n        usage: \"LABEL\"\n        description: \"Name of the replication user\"\n    - application_name:\n        usage: \"LABEL\"\n        description: \"Name of the application\"\n    - client_addr:\n        usage: \"LABEL\"\n        description: \"Client IP address\"\n    - client_port:\n        usage: \"LABEL\"\n        description: \"Client TCP port\"\n    - backend_start:\n        usage: \"COUNTER\"\n        description: \"Time when this process was started\"\n    - backend_xmin_age:\n        usage: \"COUNTER\"\n        description: \"The age of this standby's xmin horizon\"\n    - sent_diff_bytes:\n        usage: \"GAUGE\"\n        description: \"Difference in bytes from the last write-ahead log location sent on this connection\"\n    - write_diff_bytes:\n        usage: \"GAUGE\"\n        description: \"Difference in bytes from the last write-ahead log location written to disk by this standby server\"\n    - flush_diff_bytes:\n        usage: \"GAUGE\"\n        description: \"Difference in bytes from the last write-ahead log location flushed to disk by this standby server\"\n    - replay_diff_bytes:\n        usage: \"GAUGE\"\n        description: \"Difference in bytes from the last write-ahead log location replayed into the database on this standby server\"\n    - write_lag_seconds:\n        usage: \"GAUGE\"\n        description: \"Time elapsed between flushing recent WAL locally and receiving notification that this standby server has written it\"\n    - flush_lag_seconds:\n        usage: \"GAUGE\"\n        description: \"Time elapsed between flushing recent WAL locally and receiving notification that this standby server has written and flushed it\"\n    - replay_lag_seconds:\n        usage: \"GAUGE\"\n        description: \"Time elapsed between flushing recent WAL locally and receiving notification that this standby server has written, flushed and applied it\"\n\npg_settings:\n  query: |\n    SELECT name,\n    CASE setting WHEN 'on' THEN '1' WHEN 'off' THEN '0' ELSE setting END AS setting\n    FROM pg_catalog.pg_settings\n    WHERE vartype IN ('integer', 'real', 'bool')\n    ORDER BY 1\n  metrics:\n    - name:\n        usage: \"LABEL\"\n        description: \"Name of the setting\"\n    - setting:\n        usage: \"GAUGE\"\n        description: \"Setting value\"\n\npg_extensions:\n  query: |\n    SELECT\n      pg_catalog.current_database() as datname,\n      name as extname,\n      default_version,\n      installed_version,\n      CASE\n        WHEN default_version OPERATOR(pg_catalog.=) installed_version THEN 0\n        ELSE 1\n    END AS update_available\n    FROM pg_catalog.pg_available_extensions\n    WHERE installed_version IS NOT NULL\n  metrics:\n    - datname:\n        usage: \"LABEL\"\n        description: \"Name of the database\"\n    - extname:\n        usage: \"LABEL\"\n        description: \"Extension name\"\n    - default_version:\n        usage: \"LABEL\"\n        description: \"Default version\"\n    - installed_version:\n        usage: \"LABEL\"\n        description: \"Installed version\"\n    - update_available:\n        usage: \"GAUGE\"\n        description: \"An update is available\"\n  target_databases:\n    - '*'\n",
+          "description": "A string representation of a YAML defining monitoring queries.",
+          "type": "string"
+        }
+      },
+      "required": [],
+      "type": "object"
+    },
+    "nameOverride": {
+      "default": "",
+      "type": "string"
+    },
+    "namespaceOverride": {
+      "default": "",
+      "type": "string"
+    },
+    "nodeSelector": {
+      "description": "Nodeselector for the operator to be installed.",
+      "required": [],
+      "type": "object"
+    },
+    "podAnnotations": {
+      "description": "Annotations to be added to the pod.",
+      "required": [],
+      "type": "object"
+    },
+    "podLabels": {
+      "description": "Labels to be added to the pod.",
+      "required": [],
+      "type": "object"
+    },
+    "podSecurityContext": {
+      "description": "Security Context for the whole pod.",
+      "properties": {
+        "runAsNonRoot": {
+          "default": true,
+          "type": "boolean"
         },
-        "podSecurityContext": {
-            "type": "object",
-            "properties": {
-                "runAsNonRoot": {
-                    "type": "boolean"
-                },
-                "seccompProfile": {
-                    "type": "object",
-                    "properties": {
-                        "type": {
-                            "type": "string"
-                        }
-                    }
-                }
+        "seccompProfile": {
+          "properties": {
+            "type": {
+              "default": "RuntimeDefault",
+              "type": "string"
             }
+          },
+          "required": [],
+          "type": "object"
+        }
+      },
+      "required": [],
+      "type": "object"
+    },
+    "priorityClassName": {
+      "default": "",
+      "description": "Priority indicates the importance of a Pod relative to other Pods.",
+      "type": "string"
+    },
+    "rbac": {
+      "properties": {
+        "aggregateClusterRoles": {
+          "default": false,
+          "description": "Aggregate ClusterRoles to Kubernetes default user-facing roles.\nRef: https://kubernetes.io/docs/reference/access-authn-authz/rbac/#user-facing-roles",
+          "type": "boolean"
         },
-        "priorityClassName": {
-            "type": "string"
+        "create": {
+          "default": true,
+          "description": "Specifies whether ClusterRole and ClusterRoleBinding should be created.",
+          "type": "boolean"
+        }
+      },
+      "required": [],
+      "type": "object"
+    },
+    "replicaCount": {
+      "default": 1,
+      "type": "integer"
+    },
+    "resources": {
+      "required": [],
+      "type": "object"
+    },
+    "service": {
+      "properties": {
+        "ipFamilies": {
+          "description": "Sets the families that should be supported and the order in which they should be applied to ClusterIP as well. Can be IPv4 and/or IPv6.",
+          "items": {
+            "required": []
+          },
+          "type": "array"
         },
-        "rbac": {
-            "type": "object",
-            "properties": {
-                "aggregateClusterRoles": {
-                    "type": "boolean"
-                },
-                "create": {
-                    "type": "boolean"
-                }
-            }
+        "ipFamilyPolicy": {
+          "default": "",
+          "description": "Set the ip family policy to configure dual-stack see [Configure dual-stack](https://kubernetes.io/docs/concepts/services-networking/dual-stack/#services)",
+          "type": "string"
         },
-        "replicaCount": {
-            "type": "integer"
+        "name": {
+          "default": "cnpg-webhook-service",
+          "description": "The name of the Webhook Service.",
+          "type": "string"
         },
-        "resources": {
-            "type": "object"
+        "port": {
+          "default": 443,
+          "type": "integer"
         },
-        "service": {
-            "type": "object",
-            "properties": {
-                "ipFamilies": {
-                    "type": "array"
-                },
-                "ipFamilyPolicy": {
-                    "type": "string"
-                },
-                "name": {
-                    "type": "string"
-                },
-                "port": {
-                    "type": "integer"
-                },
-                "type": {
-                    "type": "string"
-                }
+        "type": {
+          "default": "ClusterIP",
+          "type": "string"
+        }
+      },
+      "required": [],
+      "type": "object"
+    },
+    "serviceAccount": {
+      "properties": {
+        "create": {
+          "default": true,
+          "description": "Specifies whether the service account should be created.",
+          "type": "boolean"
+        },
+        "name": {
+          "default": "",
+          "description": "The name of the service account to use.\nIf not set and create is true, a name is generated using the fullname template.",
+          "type": "string"
+        }
+      },
+      "required": [],
+      "type": "object"
+    },
+    "tolerations": {
+      "description": "Tolerations for the operator to be installed.",
+      "items": {
+        "required": []
+      },
+      "type": "array"
+    },
+    "topologySpreadConstraints": {
+      "description": "Topology Spread Constraints for the operator to be installed.",
+      "items": {
+        "required": []
+      },
+      "type": "array"
+    },
+    "updateStrategy": {
+      "description": "Update strategy for the operator.\nref: https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#strategy",
+      "required": [],
+      "type": "object"
+    },
+    "webhook": {
+      "description": "The webhook configuration.",
+      "properties": {
+        "livenessProbe": {
+          "properties": {
+            "initialDelaySeconds": {
+              "default": 3,
+              "type": "integer"
             }
+          },
+          "required": [],
+          "type": "object"
         },
-        "serviceAccount": {
-            "type": "object",
-            "properties": {
-                "create": {
-                    "type": "boolean"
-                },
-                "name": {
-                    "type": "string"
-                }
+        "mutating": {
+          "properties": {
+            "create": {
+              "default": true,
+              "type": "boolean"
+            },
+            "failurePolicy": {
+              "default": "Fail",
+              "type": "string"
             }
+          },
+          "required": [],
+          "type": "object"
         },
-        "tolerations": {
-            "type": "array"
+        "port": {
+          "default": 9443,
+          "type": "integer"
         },
-        "topologySpreadConstraints": {
-            "type": "array"
+        "readinessProbe": {
+          "properties": {
+            "initialDelaySeconds": {
+              "default": 3,
+              "type": "integer"
+            }
+          },
+          "required": [],
+          "type": "object"
         },
-        "updateStrategy": {
-            "type": "object"
+        "startupProbe": {
+          "properties": {
+            "failureThreshold": {
+              "default": 6,
+              "type": "integer"
+            },
+            "periodSeconds": {
+              "default": 5,
+              "type": "integer"
+            }
+          },
+          "required": [],
+          "type": "object"
         },
-        "webhook": {
-            "type": "object",
-            "properties": {
-                "livenessProbe": {
-                    "type": "object",
-                    "properties": {
-                        "initialDelaySeconds": {
-                            "type": "integer"
-                        }
-                    }
-                },
-                "mutating": {
-                    "type": "object",
-                    "properties": {
-                        "create": {
-                            "type": "boolean"
-                        },
-                        "failurePolicy": {
-                            "type": "string"
-                        }
-                    }
-                },
-                "port": {
-                    "type": "integer"
-                },
-                "readinessProbe": {
-                    "type": "object",
-                    "properties": {
-                        "initialDelaySeconds": {
-                            "type": "integer"
-                        }
-                    }
-                },
-                "startupProbe": {
-                    "type": "object",
-                    "properties": {
-                        "failureThreshold": {
-                            "type": "integer"
-                        },
-                        "periodSeconds": {
-                            "type": "integer"
-                        }
-                    }
-                },
-                "validating": {
-                    "type": "object",
-                    "properties": {
-                        "create": {
-                            "type": "boolean"
-                        },
-                        "failurePolicy": {
-                            "type": "string"
-                        }
-                    }
-                }
+        "validating": {
+          "properties": {
+            "create": {
+              "default": true,
+              "type": "boolean"
+            },
+            "failurePolicy": {
+              "default": "Fail",
+              "type": "string"
             }
+          },
+          "required": [],
+          "type": "object"
         }
+      },
+      "required": [],
+      "type": "object"
     }
+  },
+  "required": [],
+  "type": "object"
 }
diff --git a/packages/system/postgres-operator/charts/cloudnative-pg/values.yaml b/packages/system/postgres-operator/charts/cloudnative-pg/values.yaml
index cbba75053b..2fcfd0e999 100644
--- a/packages/system/postgres-operator/charts/cloudnative-pg/values.yaml
+++ b/packages/system/postgres-operator/charts/cloudnative-pg/values.yaml
@@ -38,12 +38,12 @@ dnsPolicy: ""
 
 # -- Update strategy for the operator.
 # ref: https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#strategy
+updateStrategy: {}
 # For example:
 #  type: RollingUpdate
 #  rollingUpdate:
 #    maxSurge: 25%
 #    maxUnavailable: 25%
-updateStrategy: {}
 
 crds:
   # -- Specifies whether the CRDs should be created when installing the chart.
@@ -85,6 +85,7 @@ config:
   # INHERITED_ANNOTATIONS: categories
   # INHERITED_LABELS: environment, workload, app
   # WATCH_NAMESPACE: namespace-a,namespace-b
+
   # -- The maximum number of concurrent reconciles. Defaults to 10.
   maxConcurrentReconciles: 10
 
@@ -92,12 +93,12 @@ config:
 additionalArgs: []
 
 # -- Array containing extra environment variables which can be templated.
+additionalEnv: []
 # For example:
 #  - name: RELEASE_NAME
 #    value: "{{ .Release.Name }}"
 #  - name: MY_VAR
 #    value: "mySpecialKey"
-additionalEnv: []
 
 serviceAccount:
   # -- Specifies whether the service account should be created.
@@ -144,9 +145,11 @@ priorityClassName: ""
 
 service:
   type: ClusterIP
-  # -- DO NOT CHANGE THE SERVICE NAME as it is currently used to generate the certificate
-  # and can not be configured
+  # -- The name of the Webhook Service.
   name: cnpg-webhook-service
+  # DO NOT CHANGE THE SERVICE NAME as it is currently used to generate the certificate
+  # and can not be configured
+
   port: 443
   # -- Set the ip family policy to configure dual-stack see [Configure dual-stack](https://kubernetes.io/docs/concepts/services-networking/dual-stack/#services)
   ipFamilyPolicy: ""
@@ -193,9 +196,9 @@ monitoring:
     namespace: ""
     # -- The name of the ConfigMap containing the dashboard.
     configMapName: "cnpg-grafana-dashboard"
-    # -- Label that ConfigMaps should have to be loaded as dashboards.  DEPRECATED: Use labels instead.
+    # -- Label that ConfigMaps should have to be loaded as dashboards. DEPRECATED: Use labels instead.
     sidecarLabel: "grafana_dashboard"
-    # -- Label value that ConfigMaps should have to be loaded as dashboards.  DEPRECATED: Use labels instead.
+    # -- Label value that ConfigMaps should have to be loaded as dashboards. DEPRECATED: Use labels instead.
     sidecarLabelValue: "1"
     # -- Labels that ConfigMaps should have to get configured in Grafana.
     labels: {}
@@ -210,30 +213,30 @@ monitoringQueriesConfigMap:
   queries: |
     backends:
       query: |
-       SELECT sa.datname
-           , sa.usename
-           , sa.application_name
-           , states.state
-           , COALESCE(sa.count, 0) AS total
-           , COALESCE(sa.max_tx_secs, 0) AS max_tx_duration_seconds
-           FROM ( VALUES ('active')
-               , ('idle')
-               , ('idle in transaction')
-               , ('idle in transaction (aborted)')
-               , ('fastpath function call')
-               , ('disabled')
-               ) AS states(state)
-           LEFT JOIN (
-               SELECT datname
-                   , state
-                   , usename
-                   , COALESCE(application_name, '') AS application_name
-                   , COUNT(*)
-                   , COALESCE(EXTRACT (EPOCH FROM (max(now() - xact_start))), 0) AS max_tx_secs
-               FROM pg_catalog.pg_stat_activity
-               GROUP BY datname, state, usename, application_name
-           ) sa ON states.state = sa.state
-           WHERE sa.usename IS NOT NULL
+        SELECT sa.datname
+          , sa.usename
+          , sa.application_name
+          , states.state
+          , COALESCE(sa.count, 0) AS total
+          , COALESCE(sa.max_tx_secs, 0) AS max_tx_duration_seconds
+        FROM ( VALUES ('active')
+          , ('idle')
+          , ('idle in transaction')
+          , ('idle in transaction (aborted)')
+          , ('fastpath function call')
+          , ('disabled')
+          ) AS states(state)
+        LEFT JOIN (
+          SELECT datname
+            , state
+            , usename
+            , COALESCE(application_name, '') AS application_name
+            , pg_catalog.count(*)
+            , COALESCE(EXTRACT (EPOCH FROM (pg_catalog.max(pg_catalog.now() OPERATOR(pg_catalog.-) xact_start))), 0) AS max_tx_secs
+          FROM pg_catalog.pg_stat_activity
+          GROUP BY datname, state, usename, application_name
+        ) sa ON states.state OPERATOR(pg_catalog.=) sa.state
+        WHERE sa.usename IS NOT NULL
       metrics:
         - datname:
             usage: "LABEL"
@@ -256,22 +259,22 @@ monitoringQueriesConfigMap:
 
     backends_waiting:
       query: |
-       SELECT count(*) AS total
-       FROM pg_catalog.pg_locks blocked_locks
-       JOIN pg_catalog.pg_locks blocking_locks
-         ON blocking_locks.locktype = blocked_locks.locktype
-         AND blocking_locks.database IS NOT DISTINCT FROM blocked_locks.database
-         AND blocking_locks.relation IS NOT DISTINCT FROM blocked_locks.relation
-         AND blocking_locks.page IS NOT DISTINCT FROM blocked_locks.page
-         AND blocking_locks.tuple IS NOT DISTINCT FROM blocked_locks.tuple
-         AND blocking_locks.virtualxid IS NOT DISTINCT FROM blocked_locks.virtualxid
-         AND blocking_locks.transactionid IS NOT DISTINCT FROM blocked_locks.transactionid
-         AND blocking_locks.classid IS NOT DISTINCT FROM blocked_locks.classid
-         AND blocking_locks.objid IS NOT DISTINCT FROM blocked_locks.objid
-         AND blocking_locks.objsubid IS NOT DISTINCT FROM blocked_locks.objsubid
-         AND blocking_locks.pid != blocked_locks.pid
-       JOIN pg_catalog.pg_stat_activity blocking_activity ON blocking_activity.pid = blocking_locks.pid
-       WHERE NOT blocked_locks.granted
+        SELECT pg_catalog.count(*) AS total
+        FROM pg_catalog.pg_locks blocked_locks
+        JOIN pg_catalog.pg_locks blocking_locks
+          ON blocking_locks.locktype OPERATOR(pg_catalog.=) blocked_locks.locktype
+          AND blocking_locks.database IS NOT DISTINCT FROM blocked_locks.database
+          AND blocking_locks.relation IS NOT DISTINCT FROM blocked_locks.relation
+          AND blocking_locks.page IS NOT DISTINCT FROM blocked_locks.page
+          AND blocking_locks.tuple IS NOT DISTINCT FROM blocked_locks.tuple
+          AND blocking_locks.virtualxid IS NOT DISTINCT FROM blocked_locks.virtualxid
+          AND blocking_locks.transactionid IS NOT DISTINCT FROM blocked_locks.transactionid
+          AND blocking_locks.classid IS NOT DISTINCT FROM blocked_locks.classid
+          AND blocking_locks.objid IS NOT DISTINCT FROM blocked_locks.objid
+          AND blocking_locks.objsubid IS NOT DISTINCT FROM blocked_locks.objsubid
+          AND blocking_locks.pid OPERATOR(pg_catalog.<>) blocked_locks.pid
+        JOIN pg_catalog.pg_stat_activity blocking_activity ON blocking_activity.pid OPERATOR(pg_catalog.=) blocking_locks.pid
+        WHERE NOT blocked_locks.granted
       metrics:
         - total:
             usage: "GAUGE"
@@ -309,16 +312,17 @@ monitoringQueriesConfigMap:
             description: "Time at which postgres started (based on epoch)"
 
     pg_replication:
-      query: "SELECT CASE WHEN (
-                NOT pg_catalog.pg_is_in_recovery()
-                OR pg_catalog.pg_last_wal_receive_lsn() = pg_catalog.pg_last_wal_replay_lsn())
-              THEN 0
-              ELSE GREATEST (0,
-                EXTRACT(EPOCH FROM (now() - pg_catalog.pg_last_xact_replay_timestamp())))
-              END AS lag,
-              pg_catalog.pg_is_in_recovery() AS in_recovery,
-              EXISTS (TABLE pg_stat_wal_receiver) AS is_wal_receiver_up,
-              (SELECT count(*) FROM pg_catalog.pg_stat_replication) AS streaming_replicas"
+      query: |
+        SELECT CASE WHEN (
+            NOT pg_catalog.pg_is_in_recovery()
+            OR pg_catalog.pg_last_wal_receive_lsn() OPERATOR(pg_catalog.=) pg_catalog.pg_last_wal_replay_lsn())
+          THEN 0
+          ELSE GREATEST (0,
+            EXTRACT(EPOCH FROM (pg_catalog.now() OPERATOR(pg_catalog.-) pg_catalog.pg_last_xact_replay_timestamp())))
+          END AS lag,
+          pg_catalog.pg_is_in_recovery() AS in_recovery,
+          EXISTS (TABLE pg_catalog.pg_stat_wal_receiver) AS is_wal_receiver_up,
+          (SELECT pg_catalog.count(*) FROM pg_catalog.pg_stat_replication) AS streaming_replicas
       metrics:
         - lag:
             usage: "GAUGE"
@@ -366,14 +370,17 @@ monitoringQueriesConfigMap:
       query: |
         SELECT archived_count
           , failed_count
-          , COALESCE(EXTRACT(EPOCH FROM (now() - last_archived_time)), -1) AS seconds_since_last_archival
-          , COALESCE(EXTRACT(EPOCH FROM (now() - last_failed_time)), -1) AS seconds_since_last_failure
+          , COALESCE(EXTRACT(EPOCH FROM (pg_catalog.now() OPERATOR(pg_catalog.-) last_archived_time)), -1) AS seconds_since_last_archival
+          , COALESCE(EXTRACT(EPOCH FROM (pg_catalog.now() OPERATOR(pg_catalog.-) last_failed_time)), -1) AS seconds_since_last_failure
           , COALESCE(EXTRACT(EPOCH FROM last_archived_time), -1) AS last_archived_time
           , COALESCE(EXTRACT(EPOCH FROM last_failed_time), -1) AS last_failed_time
-          , COALESCE(CAST(CAST('x'||pg_catalog.right(pg_catalog.split_part(last_archived_wal, '.', 1), 16) AS pg_catalog.bit(64)) AS pg_catalog.int8), -1) AS last_archived_wal_start_lsn
-          , COALESCE(CAST(CAST('x'||pg_catalog.right(pg_catalog.split_part(last_failed_wal, '.', 1), 16) AS pg_catalog.bit(64)) AS pg_catalog.int8), -1) AS last_failed_wal_start_lsn
+          , COALESCE(CAST(CAST('x' OPERATOR(pg_catalog.||) pg_catalog.right(pg_catalog.split_part(last_archived_wal, '.', 1), 16) AS pg_catalog.bit(64)) AS pg_catalog.int8), -1) AS last_archived_wal_start_lsn
+          , COALESCE(CAST(CAST('x' OPERATOR(pg_catalog.||) pg_catalog.right(pg_catalog.split_part(last_failed_wal, '.', 1), 16) AS pg_catalog.bit(64)) AS pg_catalog.int8), -1) AS last_failed_wal_start_lsn
           , EXTRACT(EPOCH FROM stats_reset) AS stats_reset_time
         FROM pg_catalog.pg_stat_archiver
+      predicate_query: |
+        SELECT NOT pg_catalog.pg_is_in_recovery()
+          OR pg_catalog.current_setting('archive_mode') OPERATOR(pg_catalog.=) 'always'
       metrics:
         - archived_count:
             usage: "COUNTER"
@@ -586,20 +593,20 @@ monitoringQueriesConfigMap:
     pg_stat_replication:
       primary: true
       query: |
-       SELECT usename
-         , COALESCE(application_name, '') AS application_name
-         , COALESCE(client_addr::text, '') AS client_addr
-         , COALESCE(client_port::text, '') AS client_port
-         , EXTRACT(EPOCH FROM backend_start) AS backend_start
-         , COALESCE(pg_catalog.age(backend_xmin), 0) AS backend_xmin_age
-         , pg_catalog.pg_wal_lsn_diff(pg_catalog.pg_current_wal_lsn(), sent_lsn) AS sent_diff_bytes
-         , pg_catalog.pg_wal_lsn_diff(pg_catalog.pg_current_wal_lsn(), write_lsn) AS write_diff_bytes
-         , pg_catalog.pg_wal_lsn_diff(pg_catalog.pg_current_wal_lsn(), flush_lsn) AS flush_diff_bytes
-         , COALESCE(pg_catalog.pg_wal_lsn_diff(pg_catalog.pg_current_wal_lsn(), replay_lsn),0) AS replay_diff_bytes
-         , COALESCE((EXTRACT(EPOCH FROM write_lag)),0)::float AS write_lag_seconds
-         , COALESCE((EXTRACT(EPOCH FROM flush_lag)),0)::float AS flush_lag_seconds
-         , COALESCE((EXTRACT(EPOCH FROM replay_lag)),0)::float AS replay_lag_seconds
-       FROM pg_catalog.pg_stat_replication
+        SELECT usename
+          , COALESCE(application_name, '') AS application_name
+          , COALESCE(client_addr::text, '') AS client_addr
+          , COALESCE(client_port::text, '') AS client_port
+          , EXTRACT(EPOCH FROM backend_start) AS backend_start
+          , COALESCE(pg_catalog.age(backend_xmin), 0) AS backend_xmin_age
+          , pg_catalog.pg_wal_lsn_diff(pg_catalog.pg_current_wal_lsn(), sent_lsn) AS sent_diff_bytes
+          , pg_catalog.pg_wal_lsn_diff(pg_catalog.pg_current_wal_lsn(), write_lsn) AS write_diff_bytes
+          , pg_catalog.pg_wal_lsn_diff(pg_catalog.pg_current_wal_lsn(), flush_lsn) AS flush_diff_bytes
+          , COALESCE(pg_catalog.pg_wal_lsn_diff(pg_catalog.pg_current_wal_lsn(), replay_lsn),0) AS replay_diff_bytes
+          , COALESCE((EXTRACT(EPOCH FROM write_lag)),0)::float AS write_lag_seconds
+          , COALESCE((EXTRACT(EPOCH FROM flush_lag)),0)::float AS flush_lag_seconds
+          , COALESCE((EXTRACT(EPOCH FROM replay_lag)),0)::float AS replay_lag_seconds
+        FROM pg_catalog.pg_stat_replication
       metrics:
         - usename:
             usage: "LABEL"
@@ -659,13 +666,13 @@ monitoringQueriesConfigMap:
     pg_extensions:
       query: |
         SELECT
-         current_database() as datname,
-         name as extname,
-         default_version,
-         installed_version,
-         CASE
-           WHEN default_version = installed_version THEN 0
-           ELSE 1
+          pg_catalog.current_database() as datname,
+          name as extname,
+          default_version,
+          installed_version,
+          CASE
+            WHEN default_version OPERATOR(pg_catalog.=) installed_version THEN 0
+            ELSE 1
         END AS update_available
         FROM pg_catalog.pg_available_extensions
         WHERE installed_version IS NOT NULL
diff --git a/packages/system/etcd-operator/charts/etcd-operator/.helmignore b/packages/system/postgres-operator/charts/plugin-barman-cloud/.helmignore
similarity index 100%
rename from packages/system/etcd-operator/charts/etcd-operator/.helmignore
rename to packages/system/postgres-operator/charts/plugin-barman-cloud/.helmignore
diff --git a/packages/system/postgres-operator/charts/plugin-barman-cloud/Chart.yaml b/packages/system/postgres-operator/charts/plugin-barman-cloud/Chart.yaml
new file mode 100644
index 0000000000..f2a8aa780e
--- /dev/null
+++ b/packages/system/postgres-operator/charts/plugin-barman-cloud/Chart.yaml
@@ -0,0 +1,27 @@
+apiVersion: v2
+appVersion: v0.13.0
+description: Helm Chart for CloudNativePG's CNPG-I backup plugin using Barman Cloud
+home: https://cloudnative-pg.io
+icon: https://raw.githubusercontent.com/cloudnative-pg/artwork/main/cloudnativepg-logo.svg
+keywords:
+- barman
+- cloud
+- backup
+- postgresql
+- postgres
+- database
+- cloudnativepg
+- cloudnative-pg
+kubeVersion: '>=1.29.0-0'
+maintainers:
+- email: itay@verito.digital
+  name: itay-grudev
+- email: thibaud.vaisseau@gmail.com
+  name: quantumenigmaa
+- email: quentin.bisson@gmail.com
+  name: quentinbisson
+name: plugin-barman-cloud
+sources:
+- https://github.com/cloudnative-pg/plugin-barman-cloud
+type: application
+version: 0.7.0
diff --git a/packages/system/postgres-operator/charts/plugin-barman-cloud/LICENSE b/packages/system/postgres-operator/charts/plugin-barman-cloud/LICENSE
new file mode 100644
index 0000000000..d645695673
--- /dev/null
+++ b/packages/system/postgres-operator/charts/plugin-barman-cloud/LICENSE
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/packages/system/postgres-operator/charts/plugin-barman-cloud/README.md b/packages/system/postgres-operator/charts/plugin-barman-cloud/README.md
new file mode 100644
index 0000000000..ebd78e5def
--- /dev/null
+++ b/packages/system/postgres-operator/charts/plugin-barman-cloud/README.md
@@ -0,0 +1,145 @@
+# plugin-barman-cloud
+
+![Version: 0.7.0](https://img.shields.io/badge/Version-0.7.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.13.0](https://img.shields.io/badge/AppVersion-v0.13.0-informational?style=flat-square)
+
+Helm Chart for CloudNativePG's CNPG-I backup plugin using Barman Cloud
+
+**Homepage:** <https://cloudnative-pg.io>
+
+About this chart
+----------------
+
+Helm chart to install the [CNPG-I Barman Cloud Plugin](https://github.com/cloudnative-pg/plugin-barman-cloud),
+the [CloudNativePG](https://cloudnative-pg.io) plugin that adds backup and restore capabilities to PostgreSQL
+`Cluster` resources via [Barman Cloud](https://pgbarman.org/).
+
+**NOTE**: this chart supports only the latest point release of the plugin.
+
+**IMPORTANT**: this chart requires a working installation of [cert-manager](https://cert-manager.io/).
+Please refer to the cert-manager
+[installation page](https://cert-manager.io/docs/installation/helm/) for more information.
+
+The chart deploys the plugin only. It does **not** install the CloudNativePG operator (use the companion
+[`cloudnative-pg`](https://github.com/cloudnative-pg/charts/tree/main/charts/cloudnative-pg) chart for that),
+and it does not create any `Cluster` resource. To provision a PostgreSQL cluster that uses this plugin, use
+the [`cluster`](https://github.com/cloudnative-pg/charts/tree/main/charts/cluster) chart
+(see the [Cluster chart README](https://github.com/cloudnative-pg/charts/blob/main/charts/cluster/README.md) for details)
+or apply your own `Cluster` manifest.
+
+Getting Started
+---------------
+
+### Prerequisites
+
+This chart requires [cert-manager](https://cert-manager.io/) to issue the plugin's TLS certificates.
+Install it and wait until it is ready **before** installing this chart, otherwise the install fails because
+the certificates cannot be issued.
+
+### Add the chart repository
+
+```console
+helm repo add cnpg https://cloudnative-pg.github.io/charts
+helm repo update
+```
+
+### Install the plugin
+
+```console
+helm upgrade --install plugin-barman-cloud \
+  --namespace cnpg-system \
+  cnpg/plugin-barman-cloud
+```
+
+See the [Values](#values) section below for the full list of configurable parameters.
+
+### Verify the installation
+
+```console
+kubectl -n cnpg-system get deploy
+kubectl -n cnpg-system rollout status deploy/plugin-barman-cloud
+```
+
+Uninstalling
+------------
+
+```console
+helm uninstall plugin-barman-cloud --namespace cnpg-system
+```
+
+> **Warning**
+> Uninstalling the chart does not remove the plugin's CRDs (for example `ObjectStore`). Deleting them removes
+> every `ObjectStore` resource and the backup configuration it holds, so only delete the CRDs if you are sure
+> no resource depends on them.
+
+## Source Code
+
+* <https://github.com/cloudnative-pg/plugin-barman-cloud>
+
+## Requirements
+
+Kubernetes: `>=1.29.0-0`
+
+## Values
+
+| Key | Type | Default | Description |
+|-----|------|---------|-------------|
+| additionalArgs | list | `[]` | Additional arguments to be added to the operator's args list. |
+| additionalEnv | list | `[]` | Array containing extra environment variables which can be templated. |
+| affinity | object | `{}` | Affinity for the operator to be installed. |
+| certificate.createClientCertificate | bool | `true` | Specifies whether the client certificate should be created. |
+| certificate.createServerCertificate | bool | `true` | Specifies whether the server certificate should be created. |
+| certificate.duration | string | `"2160h"` | The duration of the certificates. |
+| certificate.issuerName | string | `"selfsigned-issuer"` | The name of the issuer to use for the certificates. |
+| certificate.renewBefore | string | `"360h"` | The renew before time for the certificates. |
+| commonAnnotations | object | `{}` | Annotations to be added to all other resources. |
+| containerSecurityContext | object | `{"allowPrivilegeEscalation":false,"capabilities":{"drop":["ALL"]},"readOnlyRootFilesystem":true,"runAsGroup":10001,"runAsUser":10001,"seccompProfile":{"type":"RuntimeDefault"}}` | Container Security Context. |
+| crds.create | bool | `true` | Specifies whether the CRDs should be created when installing the chart. |
+| dnsPolicy | string | `""` |  |
+| fullnameOverride | string | `""` |  |
+| hostNetwork | bool | `false` |  |
+| image.pullPolicy | string | `"IfNotPresent"` |  |
+| image.registry | string | `"ghcr.io"` |  |
+| image.repository | string | `"cloudnative-pg/plugin-barman-cloud"` |  |
+| image.tag | string | `""` | Overrides the image tag whose default is the chart appVersion. |
+| imagePullSecrets | list | `[]` |  |
+| nameOverride | string | `""` |  |
+| namespaceOverride | string | `""` |  |
+| nodeSelector | object | `{}` | Nodeselector for the operator to be installed. |
+| podAnnotations | object | `{}` | Annotations to be added to the pod. |
+| podLabels | object | `{}` | Labels to be added to the pod. |
+| podSecurityContext | object | `{"runAsNonRoot":true,"seccompProfile":{"type":"RuntimeDefault"}}` | Security Context for the whole pod. |
+| priorityClassName | string | `""` | Priority indicates the importance of a Pod relative to other Pods. |
+| rbac.create | bool | `true` | Specifies whether Role and RoleBinding should be created. |
+| replicaCount | int | `1` |  |
+| resources | object | `{}` |  |
+| service.ipFamilies | list | `[]` | Sets the families that should be supported and the order in which they should be applied to ClusterIP as well. Can be IPv4 and/or IPv6. |
+| service.ipFamilyPolicy | string | `""` | Set the ip family policy to configure dual-stack see [Configure dual-stack](https://kubernetes.io/docs/concepts/services-networking/dual-stack/#services) |
+| service.name | string | `"barman-cloud"` | DO NOT CHANGE THE SERVICE NAME as it is currently used to generate the certificate and can not be configured |
+| service.port | int | `9090` |  |
+| serviceAccount.create | bool | `true` | Specifies whether the service account should be created. |
+| serviceAccount.name | string | `""` | The name of the service account to use. If not set and create is true, a name is generated using the fullname template. |
+| sidecarImage.registry | string | `"ghcr.io"` |  |
+| sidecarImage.repository | string | `"cloudnative-pg/plugin-barman-cloud-sidecar"` |  |
+| sidecarImage.tag | string | `""` | Overrides the image tag whose default is the chart appVersion. |
+| tolerations | list | `[]` | Tolerations for the operator to be installed. |
+| topologySpreadConstraints | list | `[]` | Topology Spread Constraints for the operator to be installed. |
+| updateStrategy | object | `{}` | Update strategy for the operator. ref: https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#strategy |
+
+## Maintainers
+
+| Name | Email | Url |
+| ---- | ------ | --- |
+| itay-grudev | <itay@verito.digital> |  |
+| quantumenigmaa | <thibaud.vaisseau@gmail.com> |  |
+| quentinbisson | <quentin.bisson@gmail.com> |  |
+
+Contributing
+------------
+
+Please read the [code of conduct](https://github.com/cloudnative-pg/charts/blob/main/CODE-OF-CONDUCT.md) and the
+[guidelines](https://github.com/cloudnative-pg/charts/blob/main/CONTRIBUTING.md) to contribute to the project.
+
+Copyright
+---------
+
+Helm charts for CloudNativePG are distributed under [Apache License 2.0](./LICENSE).
diff --git a/packages/system/postgres-operator/charts/plugin-barman-cloud/README.md.gotmpl b/packages/system/postgres-operator/charts/plugin-barman-cloud/README.md.gotmpl
new file mode 100644
index 0000000000..77c421d642
--- /dev/null
+++ b/packages/system/postgres-operator/charts/plugin-barman-cloud/README.md.gotmpl
@@ -0,0 +1,108 @@
+{{ template "chart.header" . }}
+
+
+{{ template "chart.deprecationWarning" . }}
+
+
+{{ template "chart.badgesSection" . }}
+
+
+{{ template "chart.description" . }}
+
+
+{{ template "chart.homepageLine" . }}
+
+
+About this chart
+----------------
+
+Helm chart to install the [CNPG-I Barman Cloud Plugin](https://github.com/cloudnative-pg/plugin-barman-cloud),
+the [CloudNativePG](https://cloudnative-pg.io) plugin that adds backup and restore capabilities to PostgreSQL
+`Cluster` resources via [Barman Cloud](https://pgbarman.org/).
+
+**NOTE**: this chart supports only the latest point release of the plugin.
+
+**IMPORTANT**: this chart requires a working installation of [cert-manager](https://cert-manager.io/).
+Please refer to the cert-manager
+[installation page](https://cert-manager.io/docs/installation/helm/) for more information.
+
+The chart deploys the plugin only. It does **not** install the CloudNativePG operator (use the companion
+[`cloudnative-pg`](https://github.com/cloudnative-pg/charts/tree/main/charts/cloudnative-pg) chart for that),
+and it does not create any `Cluster` resource. To provision a PostgreSQL cluster that uses this plugin, use
+the [`cluster`](https://github.com/cloudnative-pg/charts/tree/main/charts/cluster) chart
+(see the [Cluster chart README](https://github.com/cloudnative-pg/charts/blob/main/charts/cluster/README.md) for details)
+or apply your own `Cluster` manifest.
+
+
+Getting Started
+---------------
+
+### Prerequisites
+
+This chart requires [cert-manager](https://cert-manager.io/) to issue the plugin's TLS certificates.
+Install it and wait until it is ready **before** installing this chart, otherwise the install fails because
+the certificates cannot be issued.
+
+### Add the chart repository
+
+```console
+helm repo add cnpg https://cloudnative-pg.github.io/charts
+helm repo update
+```
+
+### Install the plugin
+
+```console
+helm upgrade --install plugin-barman-cloud \
+  --namespace cnpg-system \
+  cnpg/plugin-barman-cloud
+```
+
+See the [Values](#values) section below for the full list of configurable parameters.
+
+### Verify the installation
+
+```console
+kubectl -n cnpg-system get deploy
+kubectl -n cnpg-system rollout status deploy/plugin-barman-cloud
+```
+
+
+Uninstalling
+------------
+
+```console
+helm uninstall plugin-barman-cloud --namespace cnpg-system
+```
+
+> **Warning**
+> Uninstalling the chart does not remove the plugin's CRDs (for example `ObjectStore`). Deleting them removes
+> every `ObjectStore` resource and the backup configuration it holds, so only delete the CRDs if you are sure
+> no resource depends on them.
+
+{{ template "chart.sourcesSection" . }}
+
+
+{{ template "chart.requirementsSection" . }}
+
+
+{{ template "chart.valuesSection" . }}
+
+{{ template "chart.maintainersSection" . }}
+
+Contributing
+------------
+
+Please read the [code of conduct](https://github.com/cloudnative-pg/charts/blob/main/CODE-OF-CONDUCT.md) and the
+[guidelines](https://github.com/cloudnative-pg/charts/blob/main/CONTRIBUTING.md) to contribute to the project.
+
+
+Copyright
+---------
+
+Helm charts for CloudNativePG are distributed under [Apache License 2.0](./LICENSE).
+
+
+{{- if not .SkipVersionFooter }}
+{{ template "helm-docs.versionFooter" . }}
+{{- end }}
diff --git a/packages/system/postgres-operator/charts/plugin-barman-cloud/templates/_helpers.tpl b/packages/system/postgres-operator/charts/plugin-barman-cloud/templates/_helpers.tpl
new file mode 100644
index 0000000000..150573ae92
--- /dev/null
+++ b/packages/system/postgres-operator/charts/plugin-barman-cloud/templates/_helpers.tpl
@@ -0,0 +1,73 @@
+{{/*
+Allow the release namespace to be overridden for multi-namespace deployments in combined charts
+*/}}
+{{- define "plugin-barman-cloud.namespace" -}}
+  {{- if .Values.namespaceOverride -}}
+    {{- .Values.namespaceOverride -}}
+  {{- else -}}
+    {{- .Release.Namespace -}}
+  {{- end -}}
+{{- end -}}
+
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "plugin-barman-cloud.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "plugin-barman-cloud.fullname" -}}
+{{- if .Values.fullnameOverride }}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- $name := default .Chart.Name .Values.nameOverride }}
+{{- if contains $name .Release.Name }}
+{{- .Release.Name | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
+{{- end }}
+{{- end }}
+{{- end }}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "plugin-barman-cloud.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Common labels
+*/}}
+{{- define "plugin-barman-cloud.labels" -}}
+helm.sh/chart: {{ include "plugin-barman-cloud.chart" . }}
+{{ include "plugin-barman-cloud.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "plugin-barman-cloud.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "plugin-barman-cloud.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "plugin-barman-cloud.serviceAccountName" -}}
+{{- if .Values.serviceAccount.create }}
+{{- default (include "plugin-barman-cloud.fullname" .) .Values.serviceAccount.name }}
+{{- else }}
+{{- default "default" .Values.serviceAccount.name }}
+{{- end }}
+{{- end }}
diff --git a/packages/system/postgres-operator/charts/plugin-barman-cloud/templates/additional-rbac/leader_election.yaml b/packages/system/postgres-operator/charts/plugin-barman-cloud/templates/additional-rbac/leader_election.yaml
new file mode 100644
index 0000000000..524af3e19b
--- /dev/null
+++ b/packages/system/postgres-operator/charts/plugin-barman-cloud/templates/additional-rbac/leader_election.yaml
@@ -0,0 +1,75 @@
+#
+# Copyright © contributors to CloudNativePG, established as
+# CloudNativePG a Series of LF Projects, LLC.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# permissions to do leader election.
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  labels:
+    {{- include "plugin-barman-cloud.labels" . | nindent 4 }}
+  name: {{ include "plugin-barman-cloud.fullname" . }}-leader-election-role
+  namespace: {{ include "plugin-barman-cloud.namespace" . }}
+rules:
+- apiGroups:
+  - ""
+  resources:
+  - configmaps
+  verbs:
+  - get
+  - list
+  - watch
+  - create
+  - update
+  - patch
+  - delete
+- apiGroups:
+  - coordination.k8s.io
+  resources:
+  - leases
+  verbs:
+  - get
+  - list
+  - watch
+  - create
+  - update
+  - patch
+  - delete
+- apiGroups:
+  - ""
+  resources:
+  - events
+  verbs:
+  - create
+  - patch
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  labels:
+    {{- include "plugin-barman-cloud.labels" . | nindent 4 }}
+  name: {{ include "plugin-barman-cloud.fullname" . }}-leader-election-rolebinding
+  namespace: {{ include "plugin-barman-cloud.namespace" . }}
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: {{ include "plugin-barman-cloud.fullname" . }}-leader-election-role
+subjects:
+- kind: ServiceAccount
+  name: {{ include "plugin-barman-cloud.serviceAccountName" . }}
+  namespace: {{ include "plugin-barman-cloud.namespace" . }}
diff --git a/packages/system/postgres-operator/charts/plugin-barman-cloud/templates/certificate-issuer.yaml b/packages/system/postgres-operator/charts/plugin-barman-cloud/templates/certificate-issuer.yaml
new file mode 100644
index 0000000000..64f078e8e6
--- /dev/null
+++ b/packages/system/postgres-operator/charts/plugin-barman-cloud/templates/certificate-issuer.yaml
@@ -0,0 +1,26 @@
+#
+# Copyright © contributors to CloudNativePG, established as
+# CloudNativePG a Series of LF Projects, LLC.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+---
+apiVersion: cert-manager.io/v1
+kind: Issuer
+metadata:
+  name: {{ include "plugin-barman-cloud.fullname" . }}-selfsigned-issuer
+  namespace: {{ include "plugin-barman-cloud.namespace" . }}
+spec:
+  selfSigned: {}
diff --git a/packages/system/postgres-operator/charts/plugin-barman-cloud/templates/client-certificate.yaml b/packages/system/postgres-operator/charts/plugin-barman-cloud/templates/client-certificate.yaml
new file mode 100644
index 0000000000..5f4aeafe76
--- /dev/null
+++ b/packages/system/postgres-operator/charts/plugin-barman-cloud/templates/client-certificate.yaml
@@ -0,0 +1,40 @@
+#
+# Copyright © contributors to CloudNativePG, established as
+# CloudNativePG a Series of LF Projects, LLC.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+{{- if .Values.certificate.createClientCertificate }}
+---
+apiVersion: cert-manager.io/v1
+kind: Certificate
+metadata:
+  name: barman-cloud-client
+  namespace: {{ include "plugin-barman-cloud.namespace" . }}
+spec:
+  commonName: barman-cloud-client
+  duration: {{ .Values.certificate.duration | default "2160h" }}
+  isCA: false
+  issuerRef:
+    group: cert-manager.io
+    kind: Issuer
+    name: {{ include "plugin-barman-cloud.fullname" . }}-selfsigned-issuer
+  renewBefore: {{ .Values.certificate.renewBefore | default "360h" }}
+  secretName: barman-cloud-client-tls
+  usages:
+    - client auth
+  privateKey:
+    rotationPolicy: Always
+{{- end }}
diff --git a/packages/system/postgres-operator/charts/plugin-barman-cloud/templates/configmap.yaml b/packages/system/postgres-operator/charts/plugin-barman-cloud/templates/configmap.yaml
new file mode 100644
index 0000000000..c52bbaca07
--- /dev/null
+++ b/packages/system/postgres-operator/charts/plugin-barman-cloud/templates/configmap.yaml
@@ -0,0 +1,26 @@
+#
+# Copyright © contributors to CloudNativePG, established as
+# CloudNativePG a Series of LF Projects, LLC.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+---
+apiVersion: v1
+data:
+  SIDECAR_IMAGE: "{{ .Values.sidecarImage.registry }}/{{ .Values.sidecarImage.repository }}:{{ .Values.sidecarImage.tag | default .Chart.AppVersion }}"
+kind: ConfigMap
+metadata:
+  name: plugin-barman-cloud-config
+  namespace: {{ include "plugin-barman-cloud.namespace" . }}
diff --git a/packages/system/postgres-operator/charts/plugin-barman-cloud/templates/crds/crds.yaml b/packages/system/postgres-operator/charts/plugin-barman-cloud/templates/crds/crds.yaml
new file mode 100644
index 0000000000..1cde99b057
--- /dev/null
+++ b/packages/system/postgres-operator/charts/plugin-barman-cloud/templates/crds/crds.yaml
@@ -0,0 +1,721 @@
+{{- if .Values.crds.create }}
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.21.0
+    helm.sh/resource-policy: keep
+  name: objectstores.barmancloud.cnpg.io
+spec:
+  group: barmancloud.cnpg.io
+  names:
+    kind: ObjectStore
+    listKind: ObjectStoreList
+    plural: objectstores
+    singular: objectstore
+  scope: Namespaced
+  versions:
+  - name: v1
+    schema:
+      openAPIV3Schema:
+        description: ObjectStore is the Schema for the objectstores API.
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: |-
+              Specification of the desired behavior of the ObjectStore.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#spec-and-status
+            properties:
+              configuration:
+                description: The configuration for the barman-cloud tool suite
+                properties:
+                  azureCredentials:
+                    description: The credentials to use to upload data to Azure Blob
+                      Storage
+                    properties:
+                      connectionString:
+                        description: The connection string to be used
+                        properties:
+                          key:
+                            description: The key to select
+                            type: string
+                          name:
+                            description: Name of the referent.
+                            type: string
+                        required:
+                        - key
+                        - name
+                        type: object
+                      inheritFromAzureAD:
+                        description: Use the Azure AD based authentication without
+                          providing explicitly the keys.
+                        type: boolean
+                      storageAccount:
+                        description: The storage account where to upload data
+                        properties:
+                          key:
+                            description: The key to select
+                            type: string
+                          name:
+                            description: Name of the referent.
+                            type: string
+                        required:
+                        - key
+                        - name
+                        type: object
+                      storageKey:
+                        description: |-
+                          The storage account key to be used in conjunction
+                          with the storage account name
+                        properties:
+                          key:
+                            description: The key to select
+                            type: string
+                          name:
+                            description: Name of the referent.
+                            type: string
+                        required:
+                        - key
+                        - name
+                        type: object
+                      storageSasToken:
+                        description: |-
+                          A shared-access-signature to be used in conjunction with
+                          the storage account name
+                        properties:
+                          key:
+                            description: The key to select
+                            type: string
+                          name:
+                            description: Name of the referent.
+                            type: string
+                        required:
+                        - key
+                        - name
+                        type: object
+                      useDefaultAzureCredentials:
+                        description: |-
+                          Use the default Azure authentication flow, which includes DefaultAzureCredential.
+                          This allows authentication using environment variables and managed identities.
+                        type: boolean
+                    type: object
+                  data:
+                    description: |-
+                      The configuration to be used to backup the data files
+                      When not defined, base backups files will be stored uncompressed and may
+                      be unencrypted in the object store, according to the bucket default
+                      policy.
+                    properties:
+                      additionalCommandArgs:
+                        description: |-
+                          AdditionalCommandArgs represents additional arguments that can be appended
+                          to the 'barman-cloud-backup' command-line invocation. These arguments
+                          provide flexibility to customize the backup process further according to
+                          specific requirements or configurations.
+
+                          Example:
+                          In a scenario where specialized backup options are required, such as setting
+                          a specific timeout or defining custom behavior, users can use this field
+                          to specify additional command arguments.
+
+                          Note:
+                          It's essential to ensure that the provided arguments are valid and supported
+                          by the 'barman-cloud-backup' command, to avoid potential errors or unintended
+                          behavior during execution.
+                        items:
+                          type: string
+                        type: array
+                      compression:
+                        description: |-
+                          Compress a backup file (a tar file per tablespace) while streaming it
+                          to the object store. Available options are empty string (no
+                          compression, default), `gzip`, `bzip2`, `lz4`, and `snappy`.
+                        enum:
+                        - bzip2
+                        - gzip
+                        - lz4
+                        - snappy
+                        type: string
+                      encryption:
+                        description: |-
+                          Whenever to force the encryption of files (if the bucket is
+                          not already configured for that).
+                          Allowed options are empty string (use the bucket policy, default),
+                          `AES256` and `aws:kms`
+                        enum:
+                        - AES256
+                        - aws:kms
+                        type: string
+                      immediateCheckpoint:
+                        description: |-
+                          Control whether the I/O workload for the backup initial checkpoint will
+                          be limited, according to the `checkpoint_completion_target` setting on
+                          the PostgreSQL server. If set to true, an immediate checkpoint will be
+                          used, meaning PostgreSQL will complete the checkpoint as soon as
+                          possible. `false` by default.
+                        type: boolean
+                      jobs:
+                        description: |-
+                          The number of parallel jobs to be used to upload the backup, defaults
+                          to 2
+                        format: int32
+                        minimum: 1
+                        type: integer
+                      restoreAdditionalCommandArgs:
+                        description: |-
+                          Additional arguments that can be appended to the 'barman-cloud-restore'
+                          command-line invocation. These arguments provide flexibility to customize
+                          the data restore process further, according to specific requirements or
+                          configurations.
+
+                          Example:
+                          In a scenario where specialized restore options are required, such as setting
+                          a specific read timeout or defining custom behavior, users can use this field
+                          to specify additional command arguments.
+
+                          Note:
+                          It's essential to ensure that the provided arguments are valid and supported
+                          by the 'barman-cloud-restore' command, to avoid potential errors or unintended
+                          behavior during execution.
+                        items:
+                          type: string
+                        type: array
+                    type: object
+                  destinationPath:
+                    description: |-
+                      The path where to store the backup (i.e. s3://bucket/path/to/folder)
+                      this path, with different destination folders, will be used for WALs
+                      and for data
+                    minLength: 1
+                    type: string
+                  endpointCA:
+                    description: |-
+                      EndpointCA store the CA bundle of the barman endpoint.
+                      Useful when using self-signed certificates to avoid
+                      errors with certificate issuer and barman-cloud-wal-archive
+                    properties:
+                      key:
+                        description: The key to select
+                        type: string
+                      name:
+                        description: Name of the referent.
+                        type: string
+                    required:
+                    - key
+                    - name
+                    type: object
+                  endpointURL:
+                    description: |-
+                      Endpoint to be used to upload data to the cloud,
+                      overriding the automatic endpoint discovery
+                    type: string
+                  googleCredentials:
+                    description: The credentials to use to upload data to Google Cloud
+                      Storage
+                    properties:
+                      applicationCredentials:
+                        description: The secret containing the Google Cloud Storage
+                          JSON file with the credentials
+                        properties:
+                          key:
+                            description: The key to select
+                            type: string
+                          name:
+                            description: Name of the referent.
+                            type: string
+                        required:
+                        - key
+                        - name
+                        type: object
+                      gkeEnvironment:
+                        description: |-
+                          If set to true, will presume that it's running inside a GKE environment,
+                          default to false.
+                        type: boolean
+                    type: object
+                  historyTags:
+                    additionalProperties:
+                      type: string
+                    description: |-
+                      HistoryTags is a list of key value pairs that will be passed to the
+                      Barman --history-tags option.
+                    type: object
+                  s3Credentials:
+                    description: The credentials to use to upload data to S3
+                    properties:
+                      accessKeyId:
+                        description: The reference to the access key id
+                        properties:
+                          key:
+                            description: The key to select
+                            type: string
+                          name:
+                            description: Name of the referent.
+                            type: string
+                        required:
+                        - key
+                        - name
+                        type: object
+                      inheritFromIAMRole:
+                        description: Use the role based authentication without providing
+                          explicitly the keys.
+                        type: boolean
+                      region:
+                        description: The reference to the secret containing the region
+                          name
+                        properties:
+                          key:
+                            description: The key to select
+                            type: string
+                          name:
+                            description: Name of the referent.
+                            type: string
+                        required:
+                        - key
+                        - name
+                        type: object
+                      secretAccessKey:
+                        description: The reference to the secret access key
+                        properties:
+                          key:
+                            description: The key to select
+                            type: string
+                          name:
+                            description: Name of the referent.
+                            type: string
+                        required:
+                        - key
+                        - name
+                        type: object
+                      sessionToken:
+                        description: The references to the session key
+                        properties:
+                          key:
+                            description: The key to select
+                            type: string
+                          name:
+                            description: Name of the referent.
+                            type: string
+                        required:
+                        - key
+                        - name
+                        type: object
+                    type: object
+                  serverName:
+                    description: |-
+                      The server name on S3, the cluster name is used if this
+                      parameter is omitted
+                    type: string
+                  tags:
+                    additionalProperties:
+                      type: string
+                    description: |-
+                      Tags is a list of key value pairs that will be passed to the
+                      Barman --tags option.
+                    type: object
+                  wal:
+                    description: |-
+                      The configuration for the backup of the WAL stream.
+                      When not defined, WAL files will be stored uncompressed and may be
+                      unencrypted in the object store, according to the bucket default policy.
+                    properties:
+                      archiveAdditionalCommandArgs:
+                        description: |-
+                          Additional arguments that can be appended to the 'barman-cloud-wal-archive'
+                          command-line invocation. These arguments provide flexibility to customize
+                          the WAL archive process further, according to specific requirements or configurations.
+
+                          Example:
+                          In a scenario where specialized backup options are required, such as setting
+                          a specific timeout or defining custom behavior, users can use this field
+                          to specify additional command arguments.
+
+                          Note:
+                          It's essential to ensure that the provided arguments are valid and supported
+                          by the 'barman-cloud-wal-archive' command, to avoid potential errors or unintended
+                          behavior during execution.
+                        items:
+                          type: string
+                        type: array
+                      compression:
+                        description: |-
+                          Compress a WAL file before sending it to the object store. Available
+                          options are empty string (no compression, default), `gzip`, `bzip2`,
+                          `lz4`, `snappy`, `xz`, and `zstd`.
+                        enum:
+                        - bzip2
+                        - gzip
+                        - lz4
+                        - snappy
+                        - xz
+                        - zstd
+                        type: string
+                      encryption:
+                        description: |-
+                          Whenever to force the encryption of files (if the bucket is
+                          not already configured for that).
+                          Allowed options are empty string (use the bucket policy, default),
+                          `AES256` and `aws:kms`
+                        enum:
+                        - AES256
+                        - aws:kms
+                        type: string
+                      maxParallel:
+                        description: |-
+                          Number of WAL files to be either archived in parallel (when the
+                          PostgreSQL instance is archiving to a backup object store) or
+                          restored in parallel (when a PostgreSQL standby is fetching WAL
+                          files from a recovery object store). If not specified, WAL files
+                          will be processed one at a time. It accepts a positive integer as a
+                          value - with 1 being the minimum accepted value.
+                        minimum: 1
+                        type: integer
+                      restoreAdditionalCommandArgs:
+                        description: |-
+                          Additional arguments that can be appended to the 'barman-cloud-wal-restore'
+                          command-line invocation. These arguments provide flexibility to customize
+                          the WAL restore process further, according to specific requirements or configurations.
+
+                          Example:
+                          In a scenario where specialized backup options are required, such as setting
+                          a specific timeout or defining custom behavior, users can use this field
+                          to specify additional command arguments.
+
+                          Note:
+                          It's essential to ensure that the provided arguments are valid and supported
+                          by the 'barman-cloud-wal-restore' command, to avoid potential errors or unintended
+                          behavior during execution.
+                        items:
+                          type: string
+                        type: array
+                    type: object
+                required:
+                - destinationPath
+                type: object
+                x-kubernetes-validations:
+                - fieldPath: .serverName
+                  message: use the 'serverName' plugin parameter in the Cluster resource
+                  reason: FieldValueForbidden
+                  rule: '!has(self.serverName)'
+              instanceSidecarConfiguration:
+                description: The configuration for the sidecar that runs in the instance
+                  pods
+                properties:
+                  additionalContainerArgs:
+                    description: |-
+                      AdditionalContainerArgs is an optional list of command-line arguments
+                      to be passed to the sidecar container when it starts.
+                      The provided arguments are appended to the container’s default arguments.
+                    items:
+                      type: string
+                    type: array
+                    x-kubernetes-validations:
+                    - message: do not set --log-level in additionalContainerArgs;
+                        use spec.instanceSidecarConfiguration.logLevel
+                      reason: FieldValueForbidden
+                      rule: '!self.exists(a, a.startsWith(''--log-level''))'
+                  env:
+                    description: The environment to be explicitly passed to the sidecar
+                    items:
+                      description: EnvVar represents an environment variable present
+                        in a Container.
+                      properties:
+                        name:
+                          description: |-
+                            Name of the environment variable.
+                            May consist of any printable ASCII characters except '='.
+                          type: string
+                        value:
+                          description: |-
+                            Variable references $(VAR_NAME) are expanded
+                            using the previously defined environment variables in the container and
+                            any service environment variables. If a variable cannot be resolved,
+                            the reference in the input string will be unchanged. Double $$ are reduced
+                            to a single $, which allows for escaping the $(VAR_NAME) syntax: i.e.
+                            "$$(VAR_NAME)" will produce the string literal "$(VAR_NAME)".
+                            Escaped references will never be expanded, regardless of whether the variable
+                            exists or not.
+                            Defaults to "".
+                          type: string
+                        valueFrom:
+                          description: Source for the environment variable's value.
+                            Cannot be used if value is not empty.
+                          properties:
+                            configMapKeyRef:
+                              description: Selects a key of a ConfigMap.
+                              properties:
+                                key:
+                                  description: The key to select.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the ConfigMap or its
+                                    key must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            fieldRef:
+                              description: |-
+                                Selects a field of the pod: supports metadata.name, metadata.namespace, `metadata.labels['<KEY>']`, `metadata.annotations['<KEY>']`,
+                                spec.nodeName, spec.serviceAccountName, status.hostIP, status.podIP, status.podIPs.
+                              properties:
+                                apiVersion:
+                                  description: Version of the schema the FieldPath
+                                    is written in terms of, defaults to "v1".
+                                  type: string
+                                fieldPath:
+                                  description: Path of the field to select in the
+                                    specified API version.
+                                  type: string
+                              required:
+                              - fieldPath
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            fileKeyRef:
+                              description: |-
+                                FileKeyRef selects a key of the env file.
+                                Requires the EnvFiles feature gate to be enabled.
+                              properties:
+                                key:
+                                  description: |-
+                                    The key within the env file. An invalid key will prevent the pod from starting.
+                                    The keys defined within a source may consist of any printable ASCII characters except '='.
+                                    During Alpha stage of the EnvFiles feature gate, the key size is limited to 128 characters.
+                                  type: string
+                                optional:
+                                  default: false
+                                  description: |-
+                                    Specify whether the file or its key must be defined. If the file or key
+                                    does not exist, then the env var is not published.
+                                    If optional is set to true and the specified key does not exist,
+                                    the environment variable will not be set in the Pod's containers.
+
+                                    If optional is set to false and the specified key does not exist,
+                                    an error will be returned during Pod creation.
+                                  type: boolean
+                                path:
+                                  description: |-
+                                    The path within the volume from which to select the file.
+                                    Must be relative and may not contain the '..' path or start with '..'.
+                                  type: string
+                                volumeName:
+                                  description: The name of the volume mount containing
+                                    the env file.
+                                  type: string
+                              required:
+                              - key
+                              - path
+                              - volumeName
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            resourceFieldRef:
+                              description: |-
+                                Selects a resource of the container: only resources limits and requests
+                                (limits.cpu, limits.memory, limits.ephemeral-storage, requests.cpu, requests.memory and requests.ephemeral-storage) are currently supported.
+                              properties:
+                                containerName:
+                                  description: 'Container name: required for volumes,
+                                    optional for env vars'
+                                  type: string
+                                divisor:
+                                  anyOf:
+                                  - type: integer
+                                  - type: string
+                                  description: Specifies the output format of the
+                                    exposed resources, defaults to "1"
+                                  pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                  x-kubernetes-int-or-string: true
+                                resource:
+                                  description: 'Required: resource to select'
+                                  type: string
+                              required:
+                              - resource
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            secretKeyRef:
+                              description: Selects a key of a secret in the pod's
+                                namespace
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                          type: object
+                      required:
+                      - name
+                      type: object
+                    type: array
+                  logLevel:
+                    default: info
+                    description: 'The log level for PostgreSQL instances. Valid values
+                      are: `error`, `warning`, `info` (default), `debug`, `trace`'
+                    enum:
+                    - error
+                    - warning
+                    - info
+                    - debug
+                    - trace
+                    type: string
+                  resources:
+                    description: Resources define cpu/memory requests and limits for
+                      the sidecar that runs in the instance pods.
+                    properties:
+                      claims:
+                        description: |-
+                          Claims lists the names of resources, defined in spec.resourceClaims,
+                          that are used by this container.
+
+                          This field depends on the
+                          DynamicResourceAllocation feature gate.
+
+                          This field is immutable. It can only be set for containers.
+                        items:
+                          description: ResourceClaim references one entry in PodSpec.ResourceClaims.
+                          properties:
+                            name:
+                              description: |-
+                                Name must match the name of one entry in pod.spec.resourceClaims of
+                                the Pod where this field is used. It makes that resource available
+                                inside a container.
+                              type: string
+                            request:
+                              description: |-
+                                Request is the name chosen for a request in the referenced claim.
+                                If empty, everything from the claim is made available, otherwise
+                                only the result of this request.
+                              type: string
+                          required:
+                          - name
+                          type: object
+                        type: array
+                        x-kubernetes-list-map-keys:
+                        - name
+                        x-kubernetes-list-type: map
+                      limits:
+                        additionalProperties:
+                          anyOf:
+                          - type: integer
+                          - type: string
+                          pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                          x-kubernetes-int-or-string: true
+                        description: |-
+                          Limits describes the maximum amount of compute resources allowed.
+                          More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+                        type: object
+                      requests:
+                        additionalProperties:
+                          anyOf:
+                          - type: integer
+                          - type: string
+                          pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                          x-kubernetes-int-or-string: true
+                        description: |-
+                          Requests describes the minimum amount of compute resources required.
+                          If Requests is omitted for a container, it defaults to Limits if that is explicitly specified,
+                          otherwise to an implementation-defined value. Requests cannot exceed Limits.
+                          More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+                        type: object
+                    type: object
+                  retentionPolicyIntervalSeconds:
+                    default: 1800
+                    description: |-
+                      The retentionCheckInterval defines the frequency at which the
+                      system checks and enforces retention policies.
+                    type: integer
+                type: object
+              retentionPolicy:
+                description: |-
+                  RetentionPolicy is the retention policy to be used for backups
+                  and WALs (i.e. '60d'). The retention policy is expressed in the form
+                  of `XXu` where `XX` is a positive integer and `u` is in `[dwm]` -
+                  days, weeks, months.
+                pattern: ^[1-9][0-9]*[dwm]$
+                type: string
+            required:
+            - configuration
+            type: object
+          status:
+            description: |-
+              Most recently observed status of the ObjectStore. This data may not be up to
+              date. Populated by the system. Read-only.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#spec-and-status
+            properties:
+              serverRecoveryWindow:
+                additionalProperties:
+                  description: |-
+                    RecoveryWindow represents the time span between the first
+                    recoverability point and the last successful backup of a PostgreSQL
+                    server, defining the period during which data can be restored.
+                  properties:
+                    firstRecoverabilityPoint:
+                      description: |-
+                        The first recoverability point in a PostgreSQL server refers to
+                        the earliest point in time to which the database can be
+                        restored.
+                      format: date-time
+                      type: string
+                    lastFailedBackupTime:
+                      description: The last failed backup time
+                      format: date-time
+                      type: string
+                    lastSuccessfulBackupTime:
+                      description: The last successful backup time
+                      format: date-time
+                      type: string
+                  type: object
+                description: ServerRecoveryWindow maps each server to its recovery
+                  window
+                type: object
+            type: object
+        required:
+        - metadata
+        - spec
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}
+{{- end }}
diff --git a/packages/system/postgres-operator/charts/plugin-barman-cloud/templates/deployment.yaml b/packages/system/postgres-operator/charts/plugin-barman-cloud/templates/deployment.yaml
new file mode 100644
index 0000000000..893fdc2fc8
--- /dev/null
+++ b/packages/system/postgres-operator/charts/plugin-barman-cloud/templates/deployment.yaml
@@ -0,0 +1,119 @@
+#
+# Copyright © contributors to CloudNativePG, established as
+# CloudNativePG a Series of LF Projects, LLC.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  labels:
+    {{- include "plugin-barman-cloud.labels" . | nindent 4 }}
+  {{- with .Values.commonAnnotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  name: {{ include "plugin-barman-cloud.fullname" . }}
+  namespace: {{ include "plugin-barman-cloud.namespace" . }}
+spec:
+  replicas: {{ .Values.replicaCount }}
+  selector:
+    matchLabels:
+      {{- include "plugin-barman-cloud.selectorLabels" . | nindent 6 }}
+  # RollingUpdate strategy is not supported by the operator yet, so it can only use the Recreate strategy.
+  strategy:
+    type: Recreate
+  template:
+    metadata:
+      labels:
+        {{- include "plugin-barman-cloud.selectorLabels" . | nindent 8 }}
+        {{- with .Values.podLabels }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+    spec:
+      {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      containers:
+      - args:
+        - operator
+        - --server-cert=/server/tls.crt
+        - --server-key=/server/tls.key
+        - --client-cert=/client/tls.crt
+        - --server-address=:9090
+        - --leader-elect
+        - --log-level=debug
+        {{- range .Values.additionalArgs }}
+        - {{ . }}
+        {{- end }}
+        env:
+        - name: SIDECAR_IMAGE
+          valueFrom:
+            configMapKeyRef:
+              key: SIDECAR_IMAGE
+              name: plugin-barman-cloud-config
+        {{- if .Values.additionalEnv }}
+        {{- tpl (.Values.additionalEnv | toYaml) . | nindent 8 }}
+        {{- end }}
+        image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+        name: barman-cloud
+        ports:
+        - containerPort: 9090
+          protocol: TCP
+        readinessProbe:
+          initialDelaySeconds: 10
+          periodSeconds: 10
+          tcpSocket:
+            port: 9090
+        resources:
+          {{- toYaml .Values.resources | nindent 10 }}
+        securityContext:
+          {{- toYaml .Values.containerSecurityContext | nindent 10 }}
+        volumeMounts:
+        - mountPath: /server
+          name: server
+        - mountPath: /client
+          name: client
+      {{- if .Values.priorityClassName }}
+      priorityClassName: {{ .Values.priorityClassName }}
+      {{- end }}
+      securityContext:
+        {{- toYaml .Values.podSecurityContext | nindent 8 }}
+      serviceAccountName: {{ include "plugin-barman-cloud.serviceAccountName" . }}
+      {{- with .Values.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.topologySpreadConstraints }}
+      topologySpreadConstraints:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      volumes:
+      - name: server
+        secret:
+          secretName: barman-cloud-server-tls
+      - name: client
+        secret:
+          secretName: barman-cloud-client-tls
diff --git a/packages/system/postgres-operator/charts/plugin-barman-cloud/templates/rbac.yaml b/packages/system/postgres-operator/charts/plugin-barman-cloud/templates/rbac.yaml
new file mode 100644
index 0000000000..6a550c136f
--- /dev/null
+++ b/packages/system/postgres-operator/charts/plugin-barman-cloud/templates/rbac.yaml
@@ -0,0 +1,117 @@
+#
+# Copyright © contributors to CloudNativePG, established as
+# CloudNativePG a Series of LF Projects, LLC.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+{{- if .Values.serviceAccount.create }}
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  labels:
+    {{- include "plugin-barman-cloud.labels" . | nindent 4 }}
+  {{- with .Values.commonAnnotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  name: {{ include "plugin-barman-cloud.serviceAccountName" . }}
+  namespace: {{ include "plugin-barman-cloud.namespace" . }}
+{{- end }}
+{{- if .Values.rbac.create }}
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: {{ include "plugin-barman-cloud.fullname" . }}
+rules:
+- apiGroups:
+  - ""
+  resources:
+  - secrets
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - watch
+- apiGroups:
+  - barmancloud.cnpg.io
+  resources:
+  - objectstores
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - barmancloud.cnpg.io
+  resources:
+  - objectstores/finalizers
+  verbs:
+  - update
+- apiGroups:
+  - barmancloud.cnpg.io
+  resources:
+  - objectstores/status
+  verbs:
+  - get
+  - patch
+  - update
+- apiGroups:
+  - postgresql.cnpg.io
+  resources:
+  - backups
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - postgresql.cnpg.io
+  resources:
+  - clusters/finalizers
+  verbs:
+  - update
+- apiGroups:
+  - rbac.authorization.k8s.io
+  resources:
+  - rolebindings
+  - roles
+  verbs:
+  - create
+  - get
+  - list
+  - patch
+  - update
+  - watch
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  labels:
+    {{- include "plugin-barman-cloud.labels" . | nindent 4 }}
+  name: {{ include "plugin-barman-cloud.fullname" . }}-binding
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: {{ include "plugin-barman-cloud.fullname" . }}
+subjects:
+- kind: ServiceAccount
+  name: {{ include "plugin-barman-cloud.serviceAccountName" . }}
+  namespace: {{ include "plugin-barman-cloud.namespace" . }}
+{{- end }}
diff --git a/packages/system/postgres-operator/charts/plugin-barman-cloud/templates/server-certificate.yaml b/packages/system/postgres-operator/charts/plugin-barman-cloud/templates/server-certificate.yaml
new file mode 100644
index 0000000000..e82eaa34ba
--- /dev/null
+++ b/packages/system/postgres-operator/charts/plugin-barman-cloud/templates/server-certificate.yaml
@@ -0,0 +1,42 @@
+#
+# Copyright © contributors to CloudNativePG, established as
+# CloudNativePG a Series of LF Projects, LLC.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+{{- if .Values.certificate.createServerCertificate }}
+---
+apiVersion: cert-manager.io/v1
+kind: Certificate
+metadata:
+  name: barman-cloud-server
+  namespace: {{ include "plugin-barman-cloud.namespace" . }}
+spec:
+  commonName: {{ .Values.service.name }}
+  dnsNames:
+  - {{ .Values.service.name }}
+  duration: {{ .Values.certificate.duration | default "2160h" }}
+  isCA: false
+  issuerRef:
+    group: cert-manager.io
+    kind: Issuer
+    name: {{ include "plugin-barman-cloud.fullname" . }}-selfsigned-issuer
+  renewBefore: {{ .Values.certificate.renewBefore | default "360h" }}
+  secretName: barman-cloud-server-tls
+  usages:
+    - server auth
+  privateKey:
+    rotationPolicy: Always
+{{- end }}
diff --git a/packages/system/postgres-operator/charts/plugin-barman-cloud/templates/service.yaml b/packages/system/postgres-operator/charts/plugin-barman-cloud/templates/service.yaml
new file mode 100644
index 0000000000..d98f55fbac
--- /dev/null
+++ b/packages/system/postgres-operator/charts/plugin-barman-cloud/templates/service.yaml
@@ -0,0 +1,47 @@
+#
+# Copyright © contributors to CloudNativePG, established as
+# CloudNativePG a Series of LF Projects, LLC.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+---
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    {{- include "plugin-barman-cloud.labels" . | nindent 4 }}
+    cnpg.io/pluginName: barman-cloud.cloudnative-pg.io
+  annotations:
+    cnpg.io/pluginClientSecret: barman-cloud-client-tls
+    cnpg.io/pluginPort: {{ .Values.service.port | quote }}
+    cnpg.io/pluginServerSecret: barman-cloud-server-tls
+  {{- with .Values.commonAnnotations }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  name: {{ .Values.service.name }}
+  namespace: {{ include "plugin-barman-cloud.namespace" . }}
+spec:
+  {{- if .Values.service.ipFamilyPolicy }}
+  ipFamilyPolicy: {{ .Values.service.ipFamilyPolicy }}
+  {{- end }}
+  {{- if .Values.service.ipFamilies }}
+  ipFamilies: {{ .Values.service.ipFamilies | toYaml | nindent 2 }}
+  {{- end }}
+  ports:
+  - port: {{ .Values.service.port }}
+    protocol: TCP
+    targetPort: 9090
+  selector:
+    {{- include "plugin-barman-cloud.selectorLabels" . | nindent 4 }}
diff --git a/packages/system/postgres-operator/charts/plugin-barman-cloud/test/simple-deployment/01-simple_deployment-assert.yaml b/packages/system/postgres-operator/charts/plugin-barman-cloud/test/simple-deployment/01-simple_deployment-assert.yaml
new file mode 100644
index 0000000000..37e11d27bf
--- /dev/null
+++ b/packages/system/postgres-operator/charts/plugin-barman-cloud/test/simple-deployment/01-simple_deployment-assert.yaml
@@ -0,0 +1,254 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: plugin-barman-cloud
+spec:
+  replicas: 1
+  template:
+    spec:
+      containers:
+      - name: barman-cloud
+        args:
+          - operator
+          - --server-cert=/server/tls.crt
+          - --server-key=/server/tls.key
+          - --client-cert=/client/tls.crt
+          - --server-address=:9090
+          - --leader-elect
+          - --log-level=debug
+        ports:
+        - containerPort: 9090
+          protocol: TCP
+        readinessProbe:
+          initialDelaySeconds: 10
+          periodSeconds: 10
+          tcpSocket:
+            port: 9090
+        resources:
+          limits:
+            cpu: 100m
+            memory: 200Mi
+          requests:
+            cpu: 100m
+            memory: 100Mi
+        securityContext:
+          allowPrivilegeEscalation: false
+          readOnlyRootFilesystem: true
+          runAsUser: 10001
+          runAsGroup: 10001
+          seccompProfile:
+            type: RuntimeDefault
+          capabilities:
+            drop:
+              - "ALL"
+        volumeMounts:
+        - mountPath: /server
+          name: server
+        - mountPath: /client
+          name: client
+      securityContext:
+        runAsNonRoot: true
+        seccompProfile:
+          type: RuntimeDefault
+      serviceAccountName: plugin-barman-cloud
+      volumes:
+      - name: server
+        secret:
+          secretName: barman-cloud-server-tls
+      - name: client
+        secret:
+          secretName: barman-cloud-client-tls
+---
+apiVersion: v1
+kind: Service
+metadata:
+  annotations:
+    cnpg.io/pluginClientSecret: barman-cloud-client-tls
+    cnpg.io/pluginPort: "9090"
+    cnpg.io/pluginServerSecret: barman-cloud-server-tls
+  name: barman-cloud
+spec:
+  ports:
+  - port: 9090
+    protocol: TCP
+    targetPort: 9090
+  selector:
+    app.kubernetes.io/name: plugin-barman-cloud
+    app.kubernetes.io/instance: plugin-barman-cloud
+---
+apiVersion: cert-manager.io/v1
+kind: Issuer
+metadata:
+  name: plugin-barman-cloud-selfsigned-issuer
+spec:
+  selfSigned: {}
+---
+apiVersion: cert-manager.io/v1
+kind: Certificate
+metadata:
+  name: barman-cloud-client
+spec:
+  commonName: barman-cloud-client
+  duration: 2160h
+  isCA: false
+  issuerRef:
+    group: cert-manager.io
+    kind: Issuer
+    name: plugin-barman-cloud-selfsigned-issuer
+  renewBefore: 360h
+  secretName: barman-cloud-client-tls
+  usages:
+    - client auth
+---
+apiVersion: cert-manager.io/v1
+kind: Certificate
+metadata:
+  name: barman-cloud-server
+spec:
+  commonName: barman-cloud
+  dnsNames:
+  - barman-cloud
+  duration: 2160h
+  isCA: false
+  issuerRef:
+    group: cert-manager.io
+    kind: Issuer
+    name: plugin-barman-cloud-selfsigned-issuer
+  renewBefore: 360h
+  secretName: barman-cloud-server-tls
+  usages:
+    - server auth
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: plugin-barman-cloud
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: plugin-barman-cloud
+rules:
+- apiGroups:
+  - ""
+  resources:
+  - secrets
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - watch
+- apiGroups:
+  - barmancloud.cnpg.io
+  resources:
+  - objectstores
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - barmancloud.cnpg.io
+  resources:
+  - objectstores/finalizers
+  verbs:
+  - update
+- apiGroups:
+  - barmancloud.cnpg.io
+  resources:
+  - objectstores/status
+  verbs:
+  - get
+  - patch
+  - update
+- apiGroups:
+  - postgresql.cnpg.io
+  resources:
+  - backups
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - postgresql.cnpg.io
+  resources:
+  - clusters/finalizers
+  verbs:
+  - update
+- apiGroups:
+  - rbac.authorization.k8s.io
+  resources:
+  - rolebindings
+  - roles
+  verbs:
+  - create
+  - get
+  - list
+  - patch
+  - update
+  - watch
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: plugin-barman-cloud-binding
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: plugin-barman-cloud
+subjects:
+- kind: ServiceAccount
+  name: plugin-barman-cloud
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: plugin-barman-cloud-leader-election-role
+rules:
+- apiGroups:
+  - ""
+  resources:
+  - configmaps
+  verbs:
+  - get
+  - list
+  - watch
+  - create
+  - update
+  - patch
+  - delete
+- apiGroups:
+  - coordination.k8s.io
+  resources:
+  - leases
+  verbs:
+  - get
+  - list
+  - watch
+  - create
+  - update
+  - patch
+  - delete
+- apiGroups:
+  - ""
+  resources:
+  - events
+  verbs:
+  - create
+  - patch
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: plugin-barman-cloud-leader-election-rolebinding
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: plugin-barman-cloud-leader-election-role
+subjects:
+- kind: ServiceAccount
+  name: plugin-barman-cloud
diff --git a/packages/system/postgres-operator/charts/plugin-barman-cloud/test/simple-deployment/01-simple_deployment.yaml b/packages/system/postgres-operator/charts/plugin-barman-cloud/test/simple-deployment/01-simple_deployment.yaml
new file mode 100644
index 0000000000..3ea0a66150
--- /dev/null
+++ b/packages/system/postgres-operator/charts/plugin-barman-cloud/test/simple-deployment/01-simple_deployment.yaml
@@ -0,0 +1,7 @@
+resources:
+  limits:
+    cpu: 100m
+    memory: 200Mi
+  requests:
+    cpu: 100m
+    memory: 100Mi
diff --git a/packages/system/postgres-operator/charts/plugin-barman-cloud/test/simple-deployment/chainsaw-test.yaml b/packages/system/postgres-operator/charts/plugin-barman-cloud/test/simple-deployment/chainsaw-test.yaml
new file mode 100644
index 0000000000..d77b7c8d5d
--- /dev/null
+++ b/packages/system/postgres-operator/charts/plugin-barman-cloud/test/simple-deployment/chainsaw-test.yaml
@@ -0,0 +1,31 @@
+##
+# This is a test that checks if all resources are correctly provisioned when requested.
+apiVersion: chainsaw.kyverno.io/v1alpha1
+kind: Test
+metadata:
+  name: simple-deployment
+spec:
+  timeouts:
+    apply: 1s
+    exec: 30s
+    assert: 10s
+    cleanup: 30s
+  steps:
+    - name: Install barman cloud plugin
+      try:
+        - script:
+            content: |
+              helm upgrade \
+                --install \
+                --namespace $NAMESPACE \
+                --values ./01-simple_deployment.yaml \
+                --wait \
+                plugin-barman-cloud ../../
+        - assert:
+            file: ./01-simple_deployment-assert.yaml
+    - name: Cleanup
+      try:
+        - script:
+            content: |
+              helm uninstall --namespace $NAMESPACE plugin-barman-cloud
+              kubectl delete customresourcedefinitions.apiextensions.k8s.io objectstores.barmancloud.cnpg.io
diff --git a/packages/system/postgres-operator/charts/plugin-barman-cloud/values.schema.json b/packages/system/postgres-operator/charts/plugin-barman-cloud/values.schema.json
new file mode 100644
index 0000000000..dd85a69a9b
--- /dev/null
+++ b/packages/system/postgres-operator/charts/plugin-barman-cloud/values.schema.json
@@ -0,0 +1,327 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "properties": {
+    "additionalArgs": {
+      "additionalProperties": true,
+      "description": "Additional arguments to be added to the operator's args list.",
+      "items": {
+        "required": []
+      },
+      "required": []
+    },
+    "additionalEnv": {
+      "additionalProperties": true,
+      "description": "Array containing extra environment variables which can be templated.",
+      "items": {
+        "required": []
+      },
+      "required": []
+    },
+    "affinity": {
+      "additionalProperties": true,
+      "description": "Affinity for the operator to be installed.",
+      "required": []
+    },
+    "certificate": {
+      "properties": {
+        "createClientCertificate": {
+          "default": true,
+          "description": "Specifies whether the client certificate should be created.",
+          "type": "boolean"
+        },
+        "createServerCertificate": {
+          "default": true,
+          "description": "Specifies whether the server certificate should be created.",
+          "type": "boolean"
+        },
+        "duration": {
+          "default": "2160h",
+          "description": "The duration of the certificates.",
+          "type": "string"
+        },
+        "issuerName": {
+          "default": "selfsigned-issuer",
+          "description": "The name of the issuer to use for the certificates.",
+          "type": "string"
+        },
+        "renewBefore": {
+          "default": "360h",
+          "description": "The renew before time for the certificates.",
+          "type": "string"
+        }
+      },
+      "required": [],
+      "type": "object"
+    },
+    "commonAnnotations": {
+      "additionalProperties": true,
+      "description": "Annotations to be added to all other resources.",
+      "required": []
+    },
+    "containerSecurityContext": {
+      "description": "Container Security Context.",
+      "properties": {
+        "allowPrivilegeEscalation": {
+          "default": false,
+          "type": "boolean"
+        },
+        "capabilities": {
+          "properties": {
+            "drop": {
+              "items": {
+                "anyOf": [
+                  {
+                    "type": "string"
+                  }
+                ],
+                "required": []
+              },
+              "type": "array"
+            }
+          },
+          "required": [],
+          "type": "object"
+        },
+        "readOnlyRootFilesystem": {
+          "default": true,
+          "type": "boolean"
+        },
+        "runAsGroup": {
+          "default": 10001,
+          "type": "integer"
+        },
+        "runAsUser": {
+          "default": 10001,
+          "type": "integer"
+        },
+        "seccompProfile": {
+          "properties": {
+            "type": {
+              "default": "RuntimeDefault",
+              "type": "string"
+            }
+          },
+          "required": [],
+          "type": "object"
+        }
+      },
+      "required": [],
+      "type": "object"
+    },
+    "crds": {
+      "properties": {
+        "create": {
+          "default": true,
+          "description": "Specifies whether the CRDs should be created when installing the chart.",
+          "type": "boolean"
+        }
+      },
+      "required": [],
+      "type": "object"
+    },
+    "dnsPolicy": {
+      "default": "",
+      "type": "string"
+    },
+    "fullnameOverride": {
+      "default": "",
+      "type": "string"
+    },
+    "global": {
+      "description": "Global values are values that can be accessed from any chart or subchart by exactly the same name.",
+      "required": [],
+      "type": "object"
+    },
+    "hostNetwork": {
+      "default": false,
+      "type": "boolean"
+    },
+    "image": {
+      "properties": {
+        "pullPolicy": {
+          "default": "IfNotPresent",
+          "type": "string"
+        },
+        "registry": {
+          "default": "ghcr.io",
+          "type": "string"
+        },
+        "repository": {
+          "default": "cloudnative-pg/plugin-barman-cloud",
+          "type": "string"
+        },
+        "tag": {
+          "default": "",
+          "description": "Overrides the image tag whose default is the chart appVersion.",
+          "type": "string"
+        }
+      },
+      "required": [],
+      "type": "object"
+    },
+    "imagePullSecrets": {
+      "additionalProperties": true,
+      "items": {
+        "required": []
+      },
+      "required": []
+    },
+    "nameOverride": {
+      "default": "",
+      "type": "string"
+    },
+    "namespaceOverride": {
+      "default": "",
+      "type": "string"
+    },
+    "nodeSelector": {
+      "additionalProperties": true,
+      "description": "Nodeselector for the operator to be installed.",
+      "required": []
+    },
+    "podAnnotations": {
+      "additionalProperties": true,
+      "description": "Annotations to be added to the pod.",
+      "required": []
+    },
+    "podLabels": {
+      "additionalProperties": true,
+      "description": "Labels to be added to the pod.",
+      "required": []
+    },
+    "podSecurityContext": {
+      "description": "Security Context for the whole pod.",
+      "properties": {
+        "runAsNonRoot": {
+          "default": true,
+          "type": "boolean"
+        },
+        "seccompProfile": {
+          "properties": {
+            "type": {
+              "default": "RuntimeDefault",
+              "type": "string"
+            }
+          },
+          "required": [],
+          "type": "object"
+        }
+      },
+      "required": [],
+      "type": "object"
+    },
+    "priorityClassName": {
+      "default": "",
+      "description": "Priority indicates the importance of a Pod relative to other Pods.",
+      "type": "string"
+    },
+    "rbac": {
+      "properties": {
+        "create": {
+          "default": true,
+          "description": "Specifies whether Role and RoleBinding should be created.",
+          "type": "boolean"
+        }
+      },
+      "required": [],
+      "type": "object"
+    },
+    "replicaCount": {
+      "default": 1,
+      "type": "integer"
+    },
+    "resources": {
+      "additionalProperties": true,
+      "required": []
+    },
+    "service": {
+      "properties": {
+        "ipFamilies": {
+          "description": "Sets the families that should be supported and the order in which they should be applied to ClusterIP as well. Can be IPv4 and/or IPv6.",
+          "items": {
+            "enum": [
+              "IPv4",
+              "IPv6"
+            ],
+            "required": []
+          },
+          "type": "array"
+        },
+        "ipFamilyPolicy": {
+          "default": "",
+          "description": "Set the ip family policy to configure dual-stack see [Configure dual-stack](https://kubernetes.io/docs/concepts/services-networking/dual-stack/#services)",
+          "type": "string"
+        },
+        "name": {
+          "default": "barman-cloud",
+          "description": "DO NOT CHANGE THE SERVICE NAME as it is currently used to generate the certificate\nand can not be configured",
+          "type": "string"
+        },
+        "port": {
+          "default": 9090,
+          "type": "integer"
+        }
+      },
+      "required": [],
+      "type": "object"
+    },
+    "serviceAccount": {
+      "properties": {
+        "create": {
+          "default": true,
+          "description": "Specifies whether the service account should be created.",
+          "type": "boolean"
+        },
+        "name": {
+          "default": "",
+          "description": "The name of the service account to use.\nIf not set and create is true, a name is generated using the fullname template.",
+          "type": "string"
+        }
+      },
+      "required": [],
+      "type": "object"
+    },
+    "sidecarImage": {
+      "properties": {
+        "registry": {
+          "default": "ghcr.io",
+          "type": "string"
+        },
+        "repository": {
+          "default": "cloudnative-pg/plugin-barman-cloud-sidecar",
+          "type": "string"
+        },
+        "tag": {
+          "default": "",
+          "description": "Overrides the image tag whose default is the chart appVersion.",
+          "type": "string"
+        }
+      },
+      "required": [],
+      "type": "object"
+    },
+    "tolerations": {
+      "additionalProperties": true,
+      "description": "Tolerations for the operator to be installed.",
+      "items": {
+        "required": []
+      },
+      "required": []
+    },
+    "topologySpreadConstraints": {
+      "additionalProperties": true,
+      "description": "Topology Spread Constraints for the operator to be installed.",
+      "items": {
+        "required": []
+      },
+      "required": []
+    },
+    "updateStrategy": {
+      "additionalProperties": true,
+      "description": "Update strategy for the operator.\nref: https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#strategy",
+      "required": []
+    }
+  },
+  "required": [],
+  "type": "object"
+}
diff --git a/packages/system/postgres-operator/charts/plugin-barman-cloud/values.yaml b/packages/system/postgres-operator/charts/plugin-barman-cloud/values.yaml
new file mode 100644
index 0000000000..f71c5a078f
--- /dev/null
+++ b/packages/system/postgres-operator/charts/plugin-barman-cloud/values.yaml
@@ -0,0 +1,197 @@
+#
+# Copyright © contributors to CloudNativePG, established as
+# CloudNativePG a Series of LF Projects, LLC.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Default values for CloudNativePG.
+# This is a YAML-formatted file.
+# Please declare variables to be passed to your templates.
+
+replicaCount: 1
+
+image:
+  registry: ghcr.io
+  repository: cloudnative-pg/plugin-barman-cloud
+  pullPolicy: IfNotPresent
+  # -- Overrides the image tag whose default is the chart appVersion.
+  tag: ""
+
+sidecarImage:
+  registry: ghcr.io
+  repository: cloudnative-pg/plugin-barman-cloud-sidecar
+  # -- Overrides the image tag whose default is the chart appVersion.
+  tag: ""
+
+# @schema
+# additionalProperties: true
+# @schema
+imagePullSecrets: []
+nameOverride: ""
+fullnameOverride: ""
+namespaceOverride: ""
+
+hostNetwork: false
+dnsPolicy: ""
+
+# @schema
+# additionalProperties: true
+# @schema
+# -- Update strategy for the operator.
+# ref: https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#strategy
+updateStrategy: {}
+# For example:
+#  type: RollingUpdate
+#  rollingUpdate:
+#    maxSurge: 25%
+#    maxUnavailable: 25%
+#
+# WARNING: the RollingUpdate strategy is not supported by the operator yet so it can
+# currently only use the Recreate strategy.
+
+crds:
+  # -- Specifies whether the CRDs should be created when installing the chart.
+  create: true
+
+# @schema
+# additionalProperties: true
+# @schema
+# -- Additional arguments to be added to the operator's args list.
+additionalArgs: []
+
+# @schema
+# additionalProperties: true
+# @schema
+# -- Array containing extra environment variables which can be templated.
+additionalEnv: []
+# For example:
+#  - name: RELEASE_NAME
+#    value: "{{ .Release.Name }}"
+#  - name: MY_VAR
+#    value: "mySpecialKey"
+
+serviceAccount:
+  # -- Specifies whether the service account should be created.
+  create: true
+  # -- The name of the service account to use.
+  # If not set and create is true, a name is generated using the fullname template.
+  name: ""
+
+rbac:
+  # -- Specifies whether Role and RoleBinding should be created.
+  create: true
+
+# @schema
+# additionalProperties: true
+# @schema
+# -- Annotations to be added to all other resources.
+commonAnnotations: {}
+# @schema
+# additionalProperties: true
+# @schema
+# -- Annotations to be added to the pod.
+podAnnotations: {}
+# @schema
+# additionalProperties: true
+# @schema
+# -- Labels to be added to the pod.
+podLabels: {}
+
+# -- Container Security Context.
+containerSecurityContext:
+  allowPrivilegeEscalation: false
+  readOnlyRootFilesystem: true
+  runAsUser: 10001
+  runAsGroup: 10001
+  seccompProfile:
+    type: RuntimeDefault
+  capabilities:
+    drop:
+      - "ALL"
+
+# -- Security Context for the whole pod.
+podSecurityContext:
+  runAsNonRoot: true
+  seccompProfile:
+    type: RuntimeDefault
+  # fsGroup: 2000
+
+# -- Priority indicates the importance of a Pod relative to other Pods.
+priorityClassName: ""
+
+service:
+  # -- DO NOT CHANGE THE SERVICE NAME as it is currently used to generate the certificate
+  # and can not be configured
+  name: barman-cloud
+  port: 9090
+  # -- Set the ip family policy to configure dual-stack see [Configure dual-stack](https://kubernetes.io/docs/concepts/services-networking/dual-stack/#services)
+  ipFamilyPolicy: ""
+  # @schema
+  # type: array
+  # items:
+  #  enum: [IPv4, IPv6]
+  # @schema
+  # -- Sets the families that should be supported and the order in which they should be applied to ClusterIP as well. Can be IPv4 and/or IPv6.
+  ipFamilies: []
+
+# @schema
+# additionalProperties: true
+# @schema
+resources: {}
+  # If you want to specify resources, uncomment the following
+  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
+  #
+  # limits:
+  #   cpu: 100m
+  #   memory: 200Mi
+  # requests:
+  #   cpu: 100m
+  #   memory: 100Mi
+
+# @schema
+# additionalProperties: true
+# @schema
+# -- Nodeselector for the operator to be installed.
+nodeSelector: {}
+
+# @schema
+# additionalProperties: true
+# @schema
+# -- Topology Spread Constraints for the operator to be installed.
+topologySpreadConstraints: []
+
+# @schema
+# additionalProperties: true
+# @schema
+# -- Tolerations for the operator to be installed.
+tolerations: []
+
+# @schema
+# additionalProperties: true
+# @schema
+# -- Affinity for the operator to be installed.
+affinity: {}
+
+certificate:
+  # -- Specifies whether the client certificate should be created.
+  createClientCertificate: true
+  # -- Specifies whether the server certificate should be created.
+  createServerCertificate: true
+  # -- The name of the issuer to use for the certificates.
+  issuerName: selfsigned-issuer
+  # -- The duration of the certificates.
+  duration: 2160h
+  # -- The renew before time for the certificates.
+  renewBefore: 360h
diff --git a/packages/system/postgres-operator/tests/alerts_test.yaml b/packages/system/postgres-operator/tests/alerts_test.yaml
new file mode 100644
index 0000000000..b02f61b958
--- /dev/null
+++ b/packages/system/postgres-operator/tests/alerts_test.yaml
@@ -0,0 +1,23 @@
+suite: CNPG alert rules
+
+templates:
+  - templates/alerts.yaml
+
+release:
+  name: postgres-operator
+  namespace: cozy-postgres-operator
+
+tests:
+  # The rules reach the cluster only through the .Files.Glob in
+  # templates/alerts.yaml, which drops a file silently if it moves or is renamed.
+  - it: ships the WAL archive backlog rule as a critical alert
+    asserts:
+      - contains:
+          path: spec.groups[0].rules
+          any: true
+          content:
+            alert: CNPGWALArchiveBacklog
+            labels:
+              severity: critical
+              namespace: "{{ $labels.namespace }}"
+              job: "{{ $labels.job }}"
diff --git a/packages/system/postgres-operator/tests/cnpg-version_test.yaml b/packages/system/postgres-operator/tests/cnpg-version_test.yaml
new file mode 100644
index 0000000000..1506fcc2c6
--- /dev/null
+++ b/packages/system/postgres-operator/tests/cnpg-version_test.yaml
@@ -0,0 +1,46 @@
+suite: CNPG operator and CRDs stay aligned
+
+templates:
+  - charts/cloudnative-pg/templates/deployment.yaml
+  - charts/cloudnative-pg/templates/rbac.yaml
+  - charts/cloudnative-pg/templates/config.yaml
+  - charts/cloudnative-pg/templates/monitoring-configmap.yaml
+  - charts/cloudnative-pg/templates/crds/crds.yaml
+
+release:
+  name: postgres-operator
+  namespace: cozy-postgres-operator
+
+tests:
+  - it: runs the CNPG 1.30.0 operator image
+    template: charts/cloudnative-pg/templates/deployment.yaml
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].image
+          value: ghcr.io/cloudnative-pg/cloudnative-pg:1.30.0
+      - equal:
+          path: spec.template.spec.containers[0].env[0].value
+          value: ghcr.io/cloudnative-pg/cloudnative-pg:1.30.0
+      - equal:
+          path: metadata.labels["app.kubernetes.io/version"]
+          value: 1.30.0
+
+  - it: ships the CNPG 1.30.0 CRDs with the Cluster scale-subresource selector
+    template: charts/cloudnative-pg/templates/crds/crds.yaml
+    asserts:
+      - documentIndex: 0
+        equal:
+          path: metadata.annotations["controller-gen.kubebuilder.io/version"]
+          value: v0.21.0
+      # The reason for the >= 1.28.4 floor (we ship 1.30.0, the only published
+      # chart carrying it): the Cluster scale subresource must serve status.selector
+      # so a stock HPA (via KEDA) can drive it (cloudnative-pg#8996); without it the
+      # HPA fails with InvalidSelector. documentIndex 2 is the clusters CRD.
+      - documentIndex: 2
+        equal:
+          path: metadata.name
+          value: clusters.postgresql.cnpg.io
+      - documentIndex: 2
+        equal:
+          path: spec.versions[0].subresources.scale.labelSelectorPath
+          value: .status.selector
diff --git a/packages/system/postgres-operator/values.yaml b/packages/system/postgres-operator/values.yaml
index c408220e84..bb6cc606a1 100644
--- a/packages/system/postgres-operator/values.yaml
+++ b/packages/system/postgres-operator/values.yaml
@@ -1,8 +1,34 @@
 cloudnative-pg:
   crds:
     create: true
-  image:
-    tag: "1.27.3"
+  # The vendored chart is 0.29.0 (appVersion 1.30.0), pulled directly by `make update`.
+  # The operator image and its CRDs both come from that published chart, so they are
+  # aligned by construction - there is no patch step. (This replaced
+  # patches/cloudnative-pg-1.28.2.patch, which hand-carried the 1.28 line to appVersion
+  # 1.28.2 because upstream published no chart for that appVersion - charts ship only per
+  # minor .0/.1; chart 0.29.0 carries appVersion 1.30.0 natively, so the patch is gone.)
+  #
+  # Do NOT pin image.tag here: the tag follows the chart's appVersion, so operator and CRDs stay
+  # in lockstep. Pinning image.tag to a version the CRDs do not match makes the operator write
+  # status fields the CRD prunes (e.g. status.instanceID.sessionID, added in CNPG 1.27.3),
+  # failing every backup cluster-wide. To move the operator + CRDs, bump the chart version
+  # in the Makefile.
+
+# CloudNativePG Barman Cloud Plugin (github.com/cloudnative-pg/plugin-barman-cloud).
+# Native spec.backup.barmanObjectStore is deprecated in CNPG 1.27 and removed in 1.29,
+# and the `standard` postgresql image variant this platform pins no longer ships the
+# barman-cloud-* binaries. The plugin runs the barman tooling in a sidecar instead, so
+# it must be co-located with the CNPG operator: CNPG discovers plugins by listing
+# Services carrying the cnpg.io/pluginName label *in the operator's own namespace*
+# (cozy-postgres-operator). The subchart renders every object into .Release.Namespace,
+# which cozyhr/Flux set to cozy-postgres-operator, so no namespaceOverride is needed.
+#
+# Requires cert-manager: the subchart mints a self-signed Issuer plus the
+# barman-cloud-server-tls / barman-cloud-client-tls Secrets that carry the mTLS between
+# the operator and the plugin.
+plugin-barman-cloud:
+  crds:
+    create: true
 # Image used by the post-install webhook-readiness Job (see templates/webhook-ready-hook.yaml).
 # Any image with kubectl on PATH works; the Job calls the apiserver service proxy with the
 # hook ServiceAccount's token to confirm the mcluster.cnpg.io webhook is reachable end-to-end
diff --git a/packages/system/postgres-rd/Makefile b/packages/system/postgres-rd/Makefile
index 7da8103ac0..41d651a74b 100644
--- a/packages/system/postgres-rd/Makefile
+++ b/packages/system/postgres-rd/Makefile
@@ -2,3 +2,6 @@ export NAME=postgres-rd
 export NAMESPACE=cozy-system
 
 include ../../../hack/package.mk
+
+test:
+	helm unittest .
diff --git a/packages/system/postgres-rd/cozyrds/postgres.yaml b/packages/system/postgres-rd/cozyrds/postgres.yaml
index de888af378..39adc0f580 100644
--- a/packages/system/postgres-rd/cozyrds/postgres.yaml
+++ b/packages/system/postgres-rd/cozyrds/postgres.yaml
@@ -2,13 +2,35 @@ apiVersion: cozystack.io/v1alpha1
 kind: ApplicationDefinition
 metadata:
   name: postgres
+  annotations:
+    # Force client-side (two-way) Helm apply for every Postgres HelmRelease.
+    # helm-controller v1.5.0 defaults to server-side apply, which force-owns every
+    # rendered field and would revert spec.instances from KEDA's live /scale value on
+    # every reconcile, collapsing an autoscaled cluster. Client-side apply diffs the
+    # previous vs new rendered manifest and does not consult live state, so the chart's
+    # constant instances seed is a no-op and KEDA's value survives.
+    # Kind-wide is deliberate (every Postgres release, not only autoscaled ones): a
+    # per-instance flip would force an SSA->client-side handoff on the live
+    # spec.instances the moment autoscaling is enabled (helm-controller resolves an
+    # unset serverSideApply from the last release's method), the live field handoff
+    # this design avoids. Trade-off: a never-autoscaled release is client-side too, so
+    # a chart field that drifts on the live CR is no longer re-asserted (client-side
+    # never reads live state; driftDetection is unset) - accepted, the platform relies
+    # on GitOps re-render, and per-instance apply strategy is a follow-up.
+    # Rollout is gradual, not fleet-wide at the platform upgrade that ships this: an
+    # existing Postgres HelmRelease keeps server-side apply until its Application is next
+    # written through the aggregated API (the ApplicationDefinition reconciler syncs only
+    # chartRef/valuesFrom/labels onto a live HelmRelease, not the apply strategy), so an
+    # upgraded fleet flips one app at a time as each is next reconciled.
+    # See HelmServerSideApplyAnnotation in pkg/config/config.go.
+    release.cozystack.io/helm-server-side-apply: "false"
 spec:
   application:
     kind: Postgres
     singular: postgres
     plural: postgreses
     openAPISchema: |-
-      {"title":"Chart Values","type":"object","properties":{"replicas":{"description":"Number of Postgres replicas.","type":"integer","default":2},"resources":{"description":"Explicit CPU and memory configuration for each PostgreSQL replica. When omitted, the preset defined in `resourcesPreset` is applied.","type":"object","default":{},"properties":{"cpu":{"description":"CPU available to each replica.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Memory (RAM) available to each replica.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}},"resourcesPreset":{"description":"Default sizing preset used when `resources` is omitted.","type":"string","default":"t1.micro","enum":["t1.nano","t1.micro","t1.small","t1.medium","t1.large","t1.xlarge","t1.2xlarge","t1.4xlarge","c1.nano","c1.micro","c1.small","c1.medium","c1.large","c1.xlarge","c1.2xlarge","c1.4xlarge","s1.nano","s1.micro","s1.small","s1.medium","s1.large","s1.xlarge","s1.2xlarge","s1.4xlarge","u1.nano","u1.micro","u1.small","u1.medium","u1.large","u1.xlarge","u1.2xlarge","u1.4xlarge","m1.nano","m1.micro","m1.small","m1.medium","m1.large","m1.xlarge","m1.2xlarge","m1.4xlarge","nano","micro","small","medium","large","xlarge","2xlarge"]},"size":{"description":"Persistent Volume Claim size available for application data.","default":"10Gi","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"storageClass":{"description":"StorageClass used to store the data.","type":"string","default":"","x-kubernetes-validations":[{"rule":"self == oldSelf","message":"storageClass is immutable"}]},"external":{"description":"Enable external access from outside the cluster.","type":"boolean","default":false},"version":{"description":"PostgreSQL major version to deploy","type":"string","default":"v18","enum":["v18","v17","v16","v15","v14","v13"]},"tls":{"description":"TLS configuration for server connections.","type":"object","default":{},"properties":{"enabled":{"description":"Tri-state switch controlling whether the chart injects the external hostname into the operator-managed CNPG cert via spec.certificates.serverAltDNSNames. When omitted, the chart injects the SAN if `external: true` and skips it otherwise. Set explicitly to `true` to inject regardless of `external` (no-op when `external: false` since there is no external hostname to add). Set to `false` to skip injection. Note that CNPG keeps its built-in TLS on the wire regardless of this flag — this toggle only controls the chart-side SAN injection; to disable PostgreSQL TLS entirely set `postgresql.parameters.ssl = \"off\"` at the CNPG layer.","type":"boolean"}}},"postgresql":{"description":"PostgreSQL server configuration.","type":"object","default":{},"properties":{"parameters":{"description":"PostgreSQL server parameters. Values may be strings or integers; integers are coerced to strings by the template (e.g. both `max_connections: 100` and `max_connections: \"100\"` are accepted). BLOCKED (enable arbitrary code execution): archive_command, restore_command, ssl_passphrase_command, archive_cleanup_command, recovery_end_command, dynamic_library_path, local_preload_libraries, session_preload_libraries, shared_preload_libraries. Do NOT override CloudNativePG-managed parameters: archive_mode, primary_conninfo, wal_level, max_replication_slots.","type":"object","default":{"max_connections":"100"},"additionalProperties":{"anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}}},"quorum":{"description":"Quorum configuration for synchronous replication.","type":"object","default":{},"required":["maxSyncReplicas","minSyncReplicas"],"properties":{"maxSyncReplicas":{"description":"Maximum number of synchronous replicas allowed (must be less than total replicas).","type":"integer","default":0},"minSyncReplicas":{"description":"Minimum number of synchronous replicas required for commit.","type":"integer","default":0}}},"users":{"description":"Users configuration map.","type":"object","default":{},"additionalProperties":{"type":"object","properties":{"password":{"description":"Password for the user.","type":"string"},"replication":{"description":"Whether the user has replication privileges.","type":"boolean"}}}},"databases":{"description":"Databases configuration map.","type":"object","default":{},"additionalProperties":{"type":"object","properties":{"extensions":{"description":"List of enabled PostgreSQL extensions.","type":"array","items":{"type":"string"}},"roles":{"description":"Roles assigned to users.","type":"object","properties":{"admin":{"description":"List of users with admin privileges.","type":"array","items":{"type":"string"}},"readonly":{"description":"List of users with read-only privileges.","type":"array","items":{"type":"string"}}}}}}},"backup":{"description":"Backup configuration.","type":"object","default":{},"required":["enabled"],"properties":{"destinationPath":{"description":"DEPRECATED. Per-tenant S3 configuration is superseded by the platform-managed `cozy-default` BackupClass and the `cozy-backups` system bucket. Leave empty for new installations; the BackupClass driver picks up the system-managed coordinates. Kept for in-place upgrade compatibility.","type":"string","default":"s3://bucket/path/to/folder/"},"enabled":{"description":"Enable regular backups.","type":"boolean","default":false},"endpointCA":{"description":"DEPRECATED. Pre-existing Secret with the CA bundle Barman should trust when reaching a self-signed S3 endpoint. Used for both backup and bootstrap recovery in the legacy chart-managed flow.","type":"object","default":{},"properties":{"key":{"description":"Key within the Secret containing the CA bundle. Defaults to `ca.crt`.","type":"string","default":""},"name":{"description":"Name of the Secret in the application namespace. Empty means no endpointCA is emitted (Barman uses the system trust store).","type":"string","default":""}}},"endpointURL":{"description":"DEPRECATED. See `destinationPath`.","type":"string","default":"http://minio-gateway-service:9000"},"retentionPolicy":{"description":"Retention policy (e.g. \"30d\").","type":"string","default":"30d"},"s3AccessKey":{"description":"DEPRECATED. Tenants no longer supply S3 keys; the system Bucket Secret is projected into the tenant namespace by the backup controller. Ignored when `s3CredentialsSecret.name` is set or `useSystemBucket` is true. The chart skips materialising `<release>-s3-creds` whenever this field is empty so a default install does not leak placeholder credentials into the tenant namespace.","type":"string","default":""},"s3CredentialsSecret":{"description":"DEPRECATED. Pre-existing Secret with S3 credentials. Use the platform-managed `cozy-default` BackupClass instead. When set, the chart references this Secret directly (legacy chart-managed flow). The CNPG backup driver writes this field on restore so credentials never land in the CR `.spec`.","type":"object","default":{},"properties":{"accessKeyIDKey":{"description":"Key in the Secret holding the access key ID. Defaults to `AWS_ACCESS_KEY_ID`.","type":"string","default":""},"name":{"description":"Name of the Secret in the application namespace. Empty means the chart materialises `<release>-s3-creds` from `s3AccessKey`/`s3SecretKey`.","type":"string","default":""},"secretAccessKeyKey":{"description":"Key in the Secret holding the secret access key. Defaults to `AWS_SECRET_ACCESS_KEY`.","type":"string","default":""}}},"s3SecretKey":{"description":"DEPRECATED. See `s3AccessKey`.","type":"string","default":""},"schedule":{"description":"Legacy. Cron schedule (CNPG 6-field format) for the chart-emitted ScheduledBackup. Empty means no chart-managed schedule, which is the recommended setup when a `BackupClass` from `backups.cozystack.io` already drives backup orchestration. In the legacy chart-managed flow `spec.backup.barmanObjectStore` is rendered when `backup.enabled=true` AND `useSystemBucket=false` AND `destinationPath` is non-empty AND inline-or-external creds are supplied; in the platform `useSystemBucket=true` flow the chart skips emitting `barmanObjectStore` and the CNPG driver SSA-patches it onto the live Cluster at first BackupJob time.","type":"string","default":""},"useSystemBucket":{"description":"Opt-in: when true, the chart-emitted `<release>-s3-creds` Secret is skipped AND `spec.backup.barmanObjectStore` is left UNSET in the chart-rendered Cluster — the cozy-default BackupClass driver SSA-patches the live Cluster with destinationPath/endpointURL/credentials when the first BackupJob runs. Consequence: `archive_command` is NOT active until that first BackupJob fires; WAL accumulates on the PVC in the meantime, so fire an ad-hoc BackupJob immediately after enabling the flag on existing releases. Use together with the platform `cozy-default` BackupClass — tenants do not need to fill `s3AccessKey`/`s3SecretKey` or `destinationPath`/`endpointURL`. The destination path automatically scopes to `s3://cozy-backups/<namespace>/<release>/`.","type":"boolean","default":false}}},"bootstrap":{"description":"Bootstrap configuration.","type":"object","default":{},"required":["enabled","oldName"],"properties":{"enabled":{"description":"Whether to restore from a backup.","type":"boolean","default":false},"oldName":{"description":"Previous cluster name before deletion.","type":"string","default":""},"recoveryTime":{"description":"Timestamp (RFC3339) for point-in-time recovery; empty means latest.","type":"string","default":""},"serverName":{"description":"Barman server name (S3 path prefix) used by the original cluster when writing backups. Set this only when the original cluster had an explicit barmanObjectStore.serverName that differed from its Kubernetes resource name.","type":"string","default":""}}}}}
+      {"title":"Chart Values","type":"object","properties":{"replicas":{"description":"Number of Postgres replicas. Under active autoscaling this is the resting/seed count, not the live count — KEDA drives the live count via `/scale`. Disabling autoscaling does NOT automatically bring the live count back to `replicas`: the client-side merge writes `instances` only when the rendered value changes, so a cluster KEDA grew past `replicas` stays there with no autoscaler left to reduce it — lower `replicas` to the count you want and it rebases down (shedding the surplus replicas + PVCs). Lowering it below the live count, or disabling/dry-running while it sits below the live count, sheds in one step past the scaleDown pacing; stage it to the live count first (suspend the HelmRelease and `kubectl scale` if needed) to avoid a transient. Must stay greater than `quorum.maxSyncReplicas`.","type":"integer","default":2},"resources":{"description":"Explicit CPU and memory configuration for each PostgreSQL replica. When omitted, the preset defined in `resourcesPreset` is applied.","type":"object","default":{},"properties":{"cpu":{"description":"CPU available to each replica.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Memory (RAM) available to each replica.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}},"resourcesPreset":{"description":"Default sizing preset used when `resources` is omitted.","type":"string","default":"t1.micro","enum":["t1.nano","t1.micro","t1.small","t1.medium","t1.large","t1.xlarge","t1.2xlarge","t1.4xlarge","c1.nano","c1.micro","c1.small","c1.medium","c1.large","c1.xlarge","c1.2xlarge","c1.4xlarge","s1.nano","s1.micro","s1.small","s1.medium","s1.large","s1.xlarge","s1.2xlarge","s1.4xlarge","u1.nano","u1.micro","u1.small","u1.medium","u1.large","u1.xlarge","u1.2xlarge","u1.4xlarge","m1.nano","m1.micro","m1.small","m1.medium","m1.large","m1.xlarge","m1.2xlarge","m1.4xlarge","nano","micro","small","medium","large","xlarge","2xlarge"]},"size":{"description":"Persistent Volume Claim size available for application data.","default":"10Gi","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"storageClass":{"description":"StorageClass used to store the data.","type":"string","default":"","x-kubernetes-validations":[{"rule":"self == oldSelf","message":"storageClass is immutable"}],"x-cozystack-options":{"source":"storageclass"}},"external":{"description":"Enable external access from outside the cluster.","type":"boolean","default":false},"version":{"description":"PostgreSQL major version to deploy","type":"string","default":"v18","enum":["v18","v17","v16","v15","v14","v13"]},"flavor":{"description":"PostgreSQL image flavor, fixed when the cluster is created. `postgresql` uses the CloudNativePG PostgreSQL image. `postgis` uses the CloudNativePG PostGIS image, which adds postgis, postgis_raster, postgis_topology, postgis_sfcgal, postgis_tiger_geocoder and address_standardizer; enable them per database in `databases.<name>.extensions`. Changing the flavor of an existing cluster is refused, and a backup restores only into a cluster of the flavor it was taken from: to change flavor, create a new cluster and move the data with a logical dump (pg_dump / pg_restore).","type":"string","default":"postgresql","enum":["postgresql","postgis"]},"tls":{"description":"TLS configuration for server connections.","type":"object","default":{},"properties":{"enabled":{"description":"Tri-state switch controlling whether the chart injects the external hostnames into the operator-managed CNPG cert via spec.certificates.serverAltDNSNames. When omitted, the chart injects them if `external: true` and skips them otherwise. Set explicitly to `true` to inject regardless of `external` (no-op when `external: false` since there is no external hostname to add). Set to `false` to skip injection. Note that CNPG keeps its built-in TLS on the wire regardless of this flag — this toggle only controls the chart-side SAN injection; to disable PostgreSQL TLS entirely set `postgresql.parameters.ssl = \"off\"` at the CNPG layer.","type":"boolean"},"required":{"description":"Tri-state switch controlling whether the server refuses sessions that are not encrypted. When omitted, it is on if `external: true` and off otherwise. When on, the chart renders `spec.postgresql.pg_hba` with `hostssl all all all scram-sha-256` (`md5` on PostgreSQL 13, matching CloudNativePG's default rule) followed by `host all all all reject`, so a client that connects with `sslmode=disable` is refused instead of getting a plaintext session; in-cluster clients are held to the same rule, since the pod network cannot be told apart from an external client. Set to `false` to keep accepting plaintext sessions on an external instance, or to `true` to require TLS on an in-cluster one. Rendering fails if `postgresql.parameters.ssl` is off while this is in effect.","type":"boolean"}}},"postgresql":{"description":"PostgreSQL server configuration.","type":"object","default":{},"properties":{"parameters":{"description":"PostgreSQL server parameters. Values may be strings or integers; integers are coerced to strings by the template (e.g. both `max_connections: 100` and `max_connections: \"100\"` are accepted). BLOCKED (enable arbitrary code execution): archive_command, restore_command, ssl_passphrase_command, archive_cleanup_command, recovery_end_command, dynamic_library_path, local_preload_libraries, session_preload_libraries, shared_preload_libraries. Do NOT override CloudNativePG-managed parameters: archive_mode, primary_conninfo, wal_level, max_replication_slots.","type":"object","default":{"max_connections":"100"},"additionalProperties":{"anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}},"sharedPreloadLibraries":{"description":"Libraries loaded at server start, restricted to an allowlist of modules already shipped in the PostgreSQL image. CloudNativePG also preloads `pg_stat_statements`, `auto_explain` and `pgaudit` by itself whenever `parameters` sets a key under their prefix (e.g. `pg_stat_statements.track`), so removing one of them from this list does not unload it while such a key is set; `pg_prewarm` is preloaded only through this list. Changing the list restarts PostgreSQL on every instance, the primary included, so writes pause briefly.","type":"array","items":{"type":"string","enum":["pg_stat_statements","auto_explain","pgaudit","pg_prewarm"]}}}},"quorum":{"description":"Quorum configuration for synchronous replication.","type":"object","default":{},"required":["maxSyncReplicas","minSyncReplicas"],"properties":{"maxSyncReplicas":{"description":"Maximum number of synchronous replicas allowed (must be less than total replicas). Under autoscaling it also sets the scale-down floor (the effective minimum is `max(minReplicas, maxSyncReplicas+1, 2)`); the chart fails to render if that floor exceeds `autoscaling.maxReplicas`.","type":"integer","default":0},"minSyncReplicas":{"description":"Minimum number of synchronous replicas required for commit.","type":"integer","default":0}}},"autoscaling":{"description":"Read-replica autoscaling configuration.","type":"object","default":{},"required":["dryRun","enabled","maxReplicas","maxReplicationLagSeconds","metric","minReplicas","serverAddress","target","transition"],"properties":{"dryRun":{"description":"Recommendation mode: keep the static count and render the ScaledObject with both scaling directions paused, so KEDA keeps the HPA and keeps serving its trigger metric but actuates neither way. Note both scaling policies are disabled, so the HPA's desiredReplicas is frozen to the current count - read the recommendation from the matching read-load dashboard panel for your metric (connections or CPU): desired = 1 + ceil(read load / target), clamped to [effectiveMin..maxReplicas] where effectiveMin = max(minReplicas, maxSyncReplicas+1, 2), not from the desired-replicas line. Like disabling, flipping a LIVE autoscaled cluster into dryRun re-renders `instances: replicas` (the raw static value, which can be below the autoscaling floor); if `replicas` is below the live count, stage it to the live count first (see the enablement note) or the cluster sheds down to `replicas`. No shed occurs when the rendered value is unchanged (replicas already equals the active seed) — client-side merge is then a no-op and the live count is preserved. Permanent, unlike `transition`.","type":"boolean","default":false},"enabled":{"description":"Enable horizontal autoscaling of read replicas. Requires the platform `keda` package to be enabled by an administrator first; the chart fails to render (rather than break the release) if KEDA is not installed. Prerequisite: the queried vmselect must hold BOTH the CNPG metrics (cnpg_backends_total / container CPU) AND kube_pod_labels (kube-state-metrics). This holds for a tenant on the shared root monitoring stack (`monitoring: false`, both land in tenant-root). A tenant running its OWN Monitoring app (`monitoring: true`) has the CNPG metrics but not kube_pod_labels (KSM is root-only), so it must set `serverAddress` to a vmselect carrying both series or autoscaling never actuates.","type":"boolean","default":false},"maxReplicas":{"description":"Maximum total instances. Must be >= minReplicas and >= the synchronous-quorum floor (maxSyncReplicas+1); the chart fails to render (rather than silently run an unbounded instance count) if the effective floor exceeds it - raise maxReplicas. HAZARD: lowering maxReplicas below the live count makes the HPA cut straight to the new maximum in one step (the current>max branch bypasses the scale-down pacing), shedding the surplus replicas + PVCs at once; to lower it deliberately, suspend the HelmRelease and pin the live count with `kubectl scale` first.","type":"integer","default":6},"maxReplicationLagSeconds":{"description":"Freeze scaling while replication lag exceeds this (seconds) and the primary is writing. 0 disables the brake. Default 0: the freeze branch has only been validated on a live cluster in its non-braking (pass-through) form, so the lag brake is opt-in until the braking path is exercised under load; set a positive value (e.g. 30) to enable it.","type":"integer","default":0},"metric":{"description":"Read-load signal to scale on.","type":"string","default":"ReadConnections","enum":["ReadConnections","ReadCPUUtilization"]},"minReplicas":{"description":"Minimum total instances; raised to the synchronous-quorum floor (`maxSyncReplicas + 1`) and to 2 when either is higher.","type":"integer","default":2},"serverAddress":{"description":"Override the Prometheus/vmselect URL the ScaledObject queries. Empty (default) derives `http://vmselect-shortterm.<monitoring-ns>.svc:8481/select/0/prometheus`. Set it when the derived vmselect does not hold both the CNPG metrics and kube_pod_labels (e.g. `monitoring: true` tenants, or a non-default `metricsStorages` name). SSRF constraint: the host must be an in-cluster Service DNS name (`<svc>.<ns>.svc[.<clusterDomain>]`) whose namespace is within the tenant's own subtree (its namespace, its parents, or `tenant-root`) — the cluster-privileged KEDA operator fetches this URL every poll, so it is refused a metadata endpoint, an external host, or a sibling/system namespace. Residual surface (accepted trade-off): `tenant-root` is always allowed because the derived default points there, so a tenant can still aim the operator at any Service in `tenant-root` on any port/path (a blind in-cluster reachability probe — the operator reads no response body back to the tenant); the egress NetworkPolicy does not narrow that.","type":"string","default":""},"target":{"description":"Target read load per read-serving replica (unit depends on `metric`: active connections, or CPU millicores). Dimensionless integer - a resource.Quantity here would accept `150m`, which PromQL reads as 150 minutes and KEDA cannot use as a threshold.","type":"integer","default":150},"transition":{"description":"Migration phase 1: render `.spec.instances` from `replicas` (which the operator stages to the current live count) AND pause the ScaledObject in both directions, so KEDA stands up with its HPA present but not actuating. Flip to false (phase 2) to hand the runtime count to KEDA. Because the both-direction pause keeps the HPA (not the HPA-deleting full pause), KEDA is genuinely warm at phase 2 — no HPA recreate — and because the active seed is max(replicas, effectiveMin), phase 2 re-renders the same instance count phase 1 did (when `replicas` is staged at/above the floor), so the flip is a merge no-op with no dip. The HPA's scaleUp stabilization window still smooths the first actuation.","type":"boolean","default":false}}},"users":{"description":"Users configuration map. Passwords are always auto-generated and stored in the `<release>-credentials` Secret; they cannot be set from values — read a user's password from that Secret. A `password` left over in values from before the field was removed is ignored by the render and draws an admission warning, but it is not inert on an upgraded release: the chart preserves whatever password is already in the Secret, which on the first upgrade is the value that was set before removal, so that value stays the live credential until it is rotated (dedicated rotation is tracked in cozystack/community#72). The live password lives only in the Secret.","type":"object","default":{},"additionalProperties":{"type":"object","properties":{"bypassRls":{"description":"Whether the user can bypass row-level security policies (BYPASSRLS). A role can only create other roles carrying BYPASSRLS if it holds the attribute itself, so this is required alongside `createRole` to provision a privileged service role.","type":"boolean"},"createRole":{"description":"Whether the user can create and manage roles (CREATEROLE). Requires PostgreSQL 16 or newer. Setting it back to `false` withdraws the attribute only: the roles the user created, and its ADMIN and SET memberships in them, stay. Once any user has held it, the chart no longer adopts an existing role it did not create, so a user or database declared later under the name of such a role fails the init job until a platform administrator drops that role.","type":"boolean"},"replication":{"description":"Whether the user has replication privileges.","type":"boolean"}}}},"databases":{"description":"Databases configuration map.","type":"object","default":{},"additionalProperties":{"type":"object","properties":{"extensions":{"description":"List of enabled PostgreSQL extensions.","type":"array","items":{"type":"string"}},"roles":{"description":"Roles assigned to users.","type":"object","properties":{"admin":{"description":"List of users with admin privileges.","type":"array","items":{"type":"string"}},"readonly":{"description":"List of users with read-only privileges.","type":"array","items":{"type":"string"}}}}}}},"backup":{"description":"Backup configuration.","type":"object","default":{},"required":["enabled"],"properties":{"destinationPath":{"description":"DEPRECATED. Per-tenant S3 configuration is superseded by the platform-managed `cozy-default` BackupClass and the `cozy-backups` system bucket. Leave empty for new installations; the BackupClass driver picks up the system-managed coordinates. Kept for in-place upgrade compatibility.","type":"string","default":"s3://bucket/path/to/folder/"},"enabled":{"description":"Enable regular backups.","type":"boolean","default":false},"endpointCA":{"description":"DEPRECATED. Pre-existing Secret with the CA bundle the barman-cloud plugin should trust when reaching a self-signed S3 endpoint. Used for both backup and bootstrap recovery in the legacy chart-managed flow.","type":"object","default":{},"properties":{"key":{"description":"Key within the Secret containing the CA bundle. Defaults to `ca.crt`.","type":"string","default":""},"name":{"description":"Name of the Secret in the application namespace. Empty means no endpointCA is emitted (the plugin uses the system trust store).","type":"string","default":""}}},"endpointURL":{"description":"DEPRECATED. See `destinationPath`.","type":"string","default":"http://minio-gateway-service:9000"},"retentionPolicy":{"description":"Retention policy (e.g. \"30d\").","type":"string","default":"30d"},"s3AccessKey":{"description":"DEPRECATED. Tenants no longer supply S3 keys; the system Bucket Secret is projected into the tenant namespace by the backup controller. Ignored when `s3CredentialsSecret.name` is set or `useSystemBucket` is true. The chart skips materialising `<release>-s3-creds` whenever this field is empty so a default install does not leak placeholder credentials into the tenant namespace.","type":"string","default":""},"s3CredentialsSecret":{"description":"DEPRECATED. Pre-existing Secret with S3 credentials. Use the platform-managed `cozy-default` BackupClass instead. When set, the chart references this Secret directly (legacy chart-managed flow). The CNPG backup driver writes this field on restore so credentials never land in the CR `.spec`.","type":"object","default":{},"properties":{"accessKeyIDKey":{"description":"Key in the Secret holding the access key ID. Defaults to `AWS_ACCESS_KEY_ID`.","type":"string","default":""},"name":{"description":"Name of the Secret in the application namespace. Empty means the chart materialises `<release>-s3-creds` from `s3AccessKey`/`s3SecretKey`.","type":"string","default":""},"secretAccessKeyKey":{"description":"Key in the Secret holding the secret access key. Defaults to `AWS_SECRET_ACCESS_KEY`.","type":"string","default":""}}},"s3SecretKey":{"description":"DEPRECATED. See `s3AccessKey`.","type":"string","default":""},"schedule":{"description":"Legacy. Cron schedule (CNPG 6-field format) for the chart-emitted ScheduledBackup. Empty means no chart-managed schedule, which is the recommended setup when a `BackupClass` from `backups.cozystack.io` already drives backup orchestration. In the legacy chart-managed flow `spec.plugins` plus the barman-cloud ObjectStore is rendered when `backup.enabled=true` AND `useSystemBucket=false` AND `destinationPath` is non-empty AND inline-or-external creds are supplied; in the platform `useSystemBucket=true` flow the chart skips emitting `spec.plugins` and the CNPG driver SSA-applies the ObjectStore and patches `spec.plugins` onto the live Cluster at first BackupJob time.","type":"string","default":""},"useSystemBucket":{"description":"Opt-in: when true, the chart-emitted `<release>-s3-creds` Secret is skipped AND `spec.plugins` (plus the barman-cloud ObjectStore) is left UNSET in the chart-rendered Cluster — the cozy-default BackupClass driver SSA-applies an ObjectStore (carrying destinationPath/endpointURL/credentials) and patches `spec.plugins` on the live Cluster when the first BackupJob runs. Consequence: plugin WAL archiving is NOT active until that first BackupJob fires; WAL accumulates on the PVC in the meantime, so fire an ad-hoc BackupJob immediately after enabling the flag on existing releases. Use together with the platform `cozy-default` BackupClass — tenants do not need to fill `s3AccessKey`/`s3SecretKey` or `destinationPath`/`endpointURL`. The destination path automatically scopes to `s3://cozy-backups/<namespace>/<release>/`.","type":"boolean","default":false}}},"bootstrap":{"description":"Bootstrap configuration.","type":"object","default":{},"required":["enabled","oldName"],"properties":{"backupID":{"description":"Barman ID of the base backup to recover from, passed as `recoveryTarget.backupID`. Empty lets the barman-cloud plugin pick one: the newest backup when `recoveryTime` is empty, otherwise the newest one ending at or before it, on any timeline. The CNPG backup driver sets this on restore.","type":"string","default":""},"enabled":{"description":"Whether to restore from a backup.","type":"boolean","default":false},"newServerName":{"description":"WAL-archive server name (S3 path prefix) the RESTORED cluster writes to. Must differ from `serverName` (the recovery source) so a restored cluster archives to a fresh, empty prefix and barman-cloud-check-wal-archive passes while it recovers from the source's prefix. The CNPG backup driver sets this on restore; empty means the cluster archives under its own name.","type":"string","default":""},"oldName":{"description":"Previous cluster name before deletion.","type":"string","default":""},"recoveryTime":{"description":"Timestamp (RFC3339) for point-in-time recovery; empty means latest.","type":"string","default":""},"serverName":{"description":"Server name (S3 path prefix) used by the original cluster when writing backups; passed to the barman-cloud plugin via `externalClusters[].plugin.parameters.serverName`. Defaults to `bootstrap.oldName`. Set this only when the original cluster wrote backups under an explicit server name that differed from its Kubernetes resource name.","type":"string","default":""}}}}}
   release:
     prefix: postgres-
     labels:
@@ -17,6 +39,25 @@ spec:
       kind: ExternalArtifact
       name: cozystack-postgres-application-default-postgres
       namespace: cozy-system
+    # A ScaledObject whose Prometheus trigger cannot resolve (a `monitoring: true`
+    # tenant who enabled autoscaling.enabled but did not point serverAddress at a
+    # vmselect carrying kube_pod_labels) stays Ready=False with reason=TriggerError
+    # forever. helm-controller's default wait blocks the WHOLE HelmRelease on every
+    # rendered resource's kstatus, so that one unready ScaledObject drives the
+    # release to UpgradeFailed and it retries forever - wedging an otherwise healthy
+    # database and blocking every later chart change to it, with the tenant unable to
+    # read the ScaledObject to see why. Autoscaling health is a degraded-but-alive
+    # state surfaced by the DatabaseAutoscaler* alerts, NOT a release-readiness gate.
+    # Treat the ScaledObject as always-ready for release readiness (current: "true");
+    # the CNPG Cluster and every other resource keep their built-in kstatus wait, so
+    # the database's own health still gates the release. Setting any healthCheckExprs
+    # couples WaitStrategy to poller (see config.ResolveWaitStrategy); that the poller
+    # wait stays equivalent to the default for the kstatus-checked Cluster is verified
+    # on cozystack-pr-test, not here (render-blind).
+    healthCheckExprs:
+      - apiVersion: keda.sh/v1alpha1
+        kind: ScaledObject
+        current: "true"
   dashboard:
     category: PaaS
     singular: PostgreSQL
@@ -33,12 +74,17 @@ spec:
     #    labelSelector:
     #      helm.toolkit.fluxcd.io/name: "{reqs[0]['metadata','name']}"
 
-    keysOrder: [["apiVersion"], ["appVersion"], ["kind"], ["metadata"], ["metadata", "name"], ["spec", "replicas"], ["spec", "resources"], ["spec", "resourcesPreset"], ["spec", "size"], ["spec", "storageClass"], ["spec", "external"], ["spec", "version"], ["spec", "tls"], ["spec", "postgresql"], ["spec", "postgresql", "parameters"], ["spec", "postgresql", "parameters", "max_connections"], ["spec", "quorum"], ["spec", "quorum", "minSyncReplicas"], ["spec", "quorum", "maxSyncReplicas"], ["spec", "users"], ["spec", "databases"], ["spec", "backup"], ["spec", "backup", "enabled"], ["spec", "backup", "useSystemBucket"], ["spec", "backup", "retentionPolicy"], ["spec", "backup", "destinationPath"], ["spec", "backup", "endpointURL"], ["spec", "backup", "schedule"], ["spec", "backup", "s3AccessKey"], ["spec", "backup", "s3SecretKey"], ["spec", "backup", "s3CredentialsSecret"], ["spec", "backup", "s3CredentialsSecret", "name"], ["spec", "backup", "s3CredentialsSecret", "accessKeyIDKey"], ["spec", "backup", "s3CredentialsSecret", "secretAccessKeyKey"], ["spec", "backup", "endpointCA"], ["spec", "backup", "endpointCA", "name"], ["spec", "backup", "endpointCA", "key"], ["spec", "bootstrap"], ["spec", "bootstrap", "enabled"], ["spec", "bootstrap", "recoveryTime"], ["spec", "bootstrap", "oldName"], ["spec", "bootstrap", "serverName"]]
+    keysOrder: [["apiVersion"], ["appVersion"], ["kind"], ["metadata"], ["metadata", "name"], ["spec", "replicas"], ["spec", "resources"], ["spec", "resourcesPreset"], ["spec", "size"], ["spec", "storageClass"], ["spec", "external"], ["spec", "version"], ["spec", "flavor"], ["spec", "tls"], ["spec", "postgresql"], ["spec", "postgresql", "parameters"], ["spec", "postgresql", "parameters", "max_connections"], ["spec", "quorum"], ["spec", "quorum", "minSyncReplicas"], ["spec", "quorum", "maxSyncReplicas"], ["spec", "autoscaling"], ["spec", "autoscaling", "enabled"], ["spec", "autoscaling", "serverAddress"], ["spec", "autoscaling", "minReplicas"], ["spec", "autoscaling", "maxReplicas"], ["spec", "autoscaling", "metric"], ["spec", "autoscaling", "target"], ["spec", "autoscaling", "maxReplicationLagSeconds"], ["spec", "autoscaling", "dryRun"], ["spec", "autoscaling", "transition"], ["spec", "users"], ["spec", "databases"], ["spec", "backup"], ["spec", "backup", "enabled"], ["spec", "backup", "useSystemBucket"], ["spec", "backup", "retentionPolicy"], ["spec", "backup", "destinationPath"], ["spec", "backup", "endpointURL"], ["spec", "backup", "schedule"], ["spec", "backup", "s3AccessKey"], ["spec", "backup", "s3SecretKey"], ["spec", "backup", "s3CredentialsSecret"], ["spec", "backup", "s3CredentialsSecret", "name"], ["spec", "backup", "s3CredentialsSecret", "accessKeyIDKey"], ["spec", "backup", "s3CredentialsSecret", "secretAccessKeyKey"], ["spec", "backup", "endpointCA"], ["spec", "backup", "endpointCA", "name"], ["spec", "backup", "endpointCA", "key"], ["spec", "bootstrap"], ["spec", "bootstrap", "enabled"], ["spec", "bootstrap", "recoveryTime"], ["spec", "bootstrap", "backupID"], ["spec", "bootstrap", "oldName"], ["spec", "bootstrap", "serverName"], ["spec", "bootstrap", "newServerName"]]
   secrets:
     exclude: []
     include:
       - resourceNames:
           - postgres-{{ .name }}-credentials
+      # The key-free trust anchor the CA-extraction controller publishes. This
+      # is the single, engine-agnostic selector every converged engine shares;
+      # it carries no per-release name templating.
+      - matchLabels:
+          internal.cozystack.io/tenant-ca: "true"
   services:
     exclude: []
     include:
diff --git a/packages/system/postgres-rd/tests/cozyrd_test.yaml b/packages/system/postgres-rd/tests/cozyrd_test.yaml
new file mode 100644
index 0000000000..83d7f4822b
--- /dev/null
+++ b/packages/system/postgres-rd/tests/cozyrd_test.yaml
@@ -0,0 +1,43 @@
+suite: postgres-rd ApplicationDefinition
+release:
+  name: postgres-rd
+  namespace: cozy-system
+templates:
+  - templates/cozyrd.yaml
+tests:
+  # The postgres ApplicationDefinition carries release.cozystack.io/helm-server-side-apply:
+  # "false" — the load-bearing switch for read-replica autoscaling. Under the helm-controller
+  # default (server-side apply) the rendered spec.instances would force-own and revert KEDA's
+  # live /scale value on every reconcile, collapsing an autoscaled cluster. The Go builder
+  # test (rest_serversideapply_test.go) pins the plumbing that CONSUMES the annotation but not
+  # the annotation itself; this guards it at the point it is set, so dropping it goes red.
+  - it: forces client-side Helm apply on the postgres ApplicationDefinition
+    documentSelector:
+      path: metadata.name
+      value: postgres
+    asserts:
+      - isKind:
+          of: ApplicationDefinition
+      - equal:
+          path: metadata.annotations["release.cozystack.io/helm-server-side-apply"]
+          value: "false"
+  # A ScaledObject whose Prometheus trigger cannot resolve stays Ready=False
+  # (TriggerError) forever; helm-controller's default wait would then block the
+  # WHOLE Postgres HelmRelease on it, wedging an otherwise-healthy database. The
+  # cozyrd carries a healthCheckExpr that treats the ScaledObject as always-ready
+  # for release readiness (autoscaling health is surfaced by alerts, not by the
+  # release gate). Dropping it re-opens the wedge, so this goes red.
+  - it: neutralises ScaledObject readiness so it cannot wedge the release
+    documentSelector:
+      path: metadata.name
+      value: postgres
+    asserts:
+      - equal:
+          path: spec.release.healthCheckExprs[0].apiVersion
+          value: keda.sh/v1alpha1
+      - equal:
+          path: spec.release.healthCheckExprs[0].kind
+          value: ScaledObject
+      - equal:
+          path: spec.release.healthCheckExprs[0].current
+          value: "true"
diff --git a/packages/system/prometheus-operator-crds/Makefile b/packages/system/prometheus-operator-crds/Makefile
index ed55f28672..931cd38595 100644
--- a/packages/system/prometheus-operator-crds/Makefile
+++ b/packages/system/prometheus-operator-crds/Makefile
@@ -3,8 +3,11 @@ export NAMESPACE=cozy-victoria-metrics-operator
 
 include ../../../hack/package.mk
 
+test:
+	helm unittest .
+
 update:
 	helm repo add prometheus-community https://prometheus-community.github.io/helm-charts
 	helm repo update prometheus-community
-	helm pull prometheus-community/prometheus-operator-crds --untar --untardir charts
-	rm -f -- `find charts/prometheus-operator-crds/charts/crds/templates -maxdepth 1 -mindepth 1 | grep -v 'servicemonitor\|podmonitor\|prometheusrule\|probe'`
+	rm -rf charts/prometheus-operator-crds
+	helm pull prometheus-community/prometheus-operator-crds --version 25.0.0 --untar --untardir charts
diff --git a/packages/system/prometheus-operator-crds/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml b/packages/system/prometheus-operator-crds/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml
new file mode 100644
index 0000000000..953dd9fde9
--- /dev/null
+++ b/packages/system/prometheus-operator-crds/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml
@@ -0,0 +1,12074 @@
+{{- if .Values.alertmanagerconfigs.enabled -}}
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.87.0/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+{{- with .Values.annotations }}
+{{- toYaml . | nindent 4 }}
+{{- end }}
+    controller-gen.kubebuilder.io/version: v0.19.0
+    operator.prometheus.io/version: 0.87.0
+  name: alertmanagerconfigs.monitoring.coreos.com
+spec:
+  group: monitoring.coreos.com
+  names:
+    categories:
+    - prometheus-operator
+    kind: AlertmanagerConfig
+    listKind: AlertmanagerConfigList
+    plural: alertmanagerconfigs
+    shortNames:
+    - amcfg
+    singular: alertmanagerconfig
+  scope: Namespaced
+  versions:
+  - name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        description: |-
+          AlertmanagerConfig configures the Prometheus Alertmanager,
+          specifying how alerts should be grouped, inhibited and notified to external systems.
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: spec defines the specification of AlertmanagerConfigSpec
+            properties:
+              inhibitRules:
+                description: |-
+                  inhibitRules defines the list of inhibition rules. The rules will only apply to alerts matching
+                  the resource's namespace.
+                items:
+                  description: |-
+                    InhibitRule defines an inhibition rule that allows to mute alerts when other
+                    alerts are already firing.
+                    See https://prometheus.io/docs/alerting/latest/configuration/#inhibit_rule
+                  properties:
+                    equal:
+                      description: |-
+                        equal defines labels that must have an equal value in the source and target alert
+                        for the inhibition to take effect. This ensures related alerts are properly grouped.
+                      items:
+                        type: string
+                      type: array
+                    sourceMatch:
+                      description: |-
+                        sourceMatch defines matchers for which one or more alerts have to exist for the inhibition
+                        to take effect. The operator enforces that the alert matches the resource's namespace.
+                        These are the "trigger" alerts that cause other alerts to be inhibited.
+                      items:
+                        description: Matcher defines how to match on alert's labels.
+                        properties:
+                          matchType:
+                            description: |-
+                              matchType defines the match operation available with AlertManager >= v0.22.0.
+                              Takes precedence over Regex (deprecated) if non-empty.
+                              Valid values: "=" (equality), "!=" (inequality), "=~" (regex match), "!~" (regex non-match).
+                            enum:
+                            - '!='
+                            - =
+                            - =~
+                            - '!~'
+                            type: string
+                          name:
+                            description: |-
+                              name defines the label to match.
+                              This specifies which alert label should be evaluated.
+                            minLength: 1
+                            type: string
+                          regex:
+                            description: |-
+                              regex defines whether to match on equality (false) or regular-expression (true).
+                              Deprecated: for AlertManager >= v0.22.0, `matchType` should be used instead.
+                            type: boolean
+                          value:
+                            description: |-
+                              value defines the label value to match.
+                              This is the expected value for the specified label.
+                            type: string
+                        required:
+                        - name
+                        type: object
+                      type: array
+                    targetMatch:
+                      description: |-
+                        targetMatch defines matchers that have to be fulfilled in the alerts to be muted.
+                        The operator enforces that the alert matches the resource's namespace.
+                        When these conditions are met, matching alerts will be inhibited (silenced).
+                      items:
+                        description: Matcher defines how to match on alert's labels.
+                        properties:
+                          matchType:
+                            description: |-
+                              matchType defines the match operation available with AlertManager >= v0.22.0.
+                              Takes precedence over Regex (deprecated) if non-empty.
+                              Valid values: "=" (equality), "!=" (inequality), "=~" (regex match), "!~" (regex non-match).
+                            enum:
+                            - '!='
+                            - =
+                            - =~
+                            - '!~'
+                            type: string
+                          name:
+                            description: |-
+                              name defines the label to match.
+                              This specifies which alert label should be evaluated.
+                            minLength: 1
+                            type: string
+                          regex:
+                            description: |-
+                              regex defines whether to match on equality (false) or regular-expression (true).
+                              Deprecated: for AlertManager >= v0.22.0, `matchType` should be used instead.
+                            type: boolean
+                          value:
+                            description: |-
+                              value defines the label value to match.
+                              This is the expected value for the specified label.
+                            type: string
+                        required:
+                        - name
+                        type: object
+                      type: array
+                  type: object
+                type: array
+              muteTimeIntervals:
+                description: muteTimeIntervals defines the list of MuteTimeInterval
+                  specifying when the routes should be muted.
+                items:
+                  description: MuteTimeInterval specifies the periods in time when
+                    notifications will be muted
+                  properties:
+                    name:
+                      description: name of the time interval
+                      type: string
+                    timeIntervals:
+                      description: timeIntervals defines a list of TimeInterval
+                      items:
+                        description: TimeInterval describes intervals of time
+                        properties:
+                          daysOfMonth:
+                            description: daysOfMonth defines a list of DayOfMonthRange
+                            items:
+                              description: DayOfMonthRange is an inclusive range of
+                                days of the month beginning at 1
+                              properties:
+                                end:
+                                  description: end of the inclusive range
+                                  maximum: 31
+                                  minimum: -31
+                                  type: integer
+                                start:
+                                  description: start of the inclusive range
+                                  maximum: 31
+                                  minimum: -31
+                                  type: integer
+                              type: object
+                            type: array
+                          months:
+                            description: months defines a list of MonthRange
+                            items:
+                              description: |-
+                                MonthRange is an inclusive range of months of the year beginning in January
+                                Months can be specified by name (e.g 'January') by numerical month (e.g '1') or as an inclusive range (e.g 'January:March', '1:3', '1:March')
+                              pattern: ^((?i)january|february|march|april|may|june|july|august|september|october|november|december|1[0-2]|[1-9])(?:((:((?i)january|february|march|april|may|june|july|august|september|october|november|december|1[0-2]|[1-9]))$)|$)
+                              type: string
+                            type: array
+                          times:
+                            description: times defines a list of TimeRange
+                            items:
+                              description: TimeRange defines a start and end time
+                                in 24hr format
+                              properties:
+                                endTime:
+                                  description: endTime defines the end time in 24hr
+                                    format.
+                                  pattern: ^((([01][0-9])|(2[0-3])):[0-5][0-9])$|(^24:00$)
+                                  type: string
+                                startTime:
+                                  description: startTime defines the start time in
+                                    24hr format.
+                                  pattern: ^((([01][0-9])|(2[0-3])):[0-5][0-9])$|(^24:00$)
+                                  type: string
+                              type: object
+                            type: array
+                          weekdays:
+                            description: weekdays defines a list of WeekdayRange
+                            items:
+                              description: |-
+                                WeekdayRange is an inclusive range of days of the week beginning on Sunday
+                                Days can be specified by name (e.g 'Sunday') or as an inclusive range (e.g 'Monday:Friday')
+                              pattern: ^((?i)sun|mon|tues|wednes|thurs|fri|satur)day(?:((:(sun|mon|tues|wednes|thurs|fri|satur)day)$)|$)
+                              type: string
+                            type: array
+                          years:
+                            description: years defines a list of YearRange
+                            items:
+                              description: YearRange is an inclusive range of years
+                              pattern: ^2\d{3}(?::2\d{3}|$)
+                              type: string
+                            type: array
+                        type: object
+                      type: array
+                  required:
+                  - name
+                  type: object
+                type: array
+              receivers:
+                description: receivers defines the list of receivers.
+                items:
+                  description: Receiver defines one or more notification integrations.
+                  properties:
+                    discordConfigs:
+                      description: discordConfigs defines the list of Slack configurations.
+                      items:
+                        description: |-
+                          DiscordConfig configures notifications via Discord.
+                          See https://prometheus.io/docs/alerting/latest/configuration/#discord_config
+                        properties:
+                          apiURL:
+                            description: |-
+                              apiURL defines the secret's key that contains the Discord webhook URL.
+                              The secret needs to be in the same namespace as the AlertmanagerConfig
+                              object and accessible by the Prometheus Operator.
+                            properties:
+                              key:
+                                description: The key of the secret to select from.  Must
+                                  be a valid secret key.
+                                type: string
+                              name:
+                                default: ""
+                                description: |-
+                                  Name of the referent.
+                                  This field is effectively required, but due to backwards compatibility is
+                                  allowed to be empty. Instances of this type with an empty value here are
+                                  almost certainly wrong.
+                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                type: string
+                              optional:
+                                description: Specify whether the Secret or its key
+                                  must be defined
+                                type: boolean
+                            required:
+                            - key
+                            type: object
+                            x-kubernetes-map-type: atomic
+                          avatarURL:
+                            description: avatarURL defines the avatar url of the message
+                              sender.
+                            pattern: ^https?://.+$
+                            type: string
+                          content:
+                            description: content defines the template of the content's
+                              body.
+                            minLength: 1
+                            type: string
+                          httpConfig:
+                            description: httpConfig defines the HTTP client configuration.
+                            properties:
+                              authorization:
+                                description: |-
+                                  authorization defines the authorization header configuration for the client.
+                                  This is mutually exclusive with BasicAuth and is only available starting from Alertmanager v0.22+.
+                                properties:
+                                  credentials:
+                                    description: credentials defines a key of a Secret
+                                      in the namespace that contains the credentials
+                                      for authentication.
+                                    properties:
+                                      key:
+                                        description: The key of the secret to select
+                                          from.  Must be a valid secret key.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the Secret or
+                                          its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  type:
+                                    description: |-
+                                      type defines the authentication type. The value is case-insensitive.
+
+                                      "Basic" is not a supported value.
+
+                                      Default: "Bearer"
+                                    type: string
+                                type: object
+                              basicAuth:
+                                description: |-
+                                  basicAuth defines the basic authentication credentials for the client.
+                                  This is mutually exclusive with Authorization. If both are defined, BasicAuth takes precedence.
+                                properties:
+                                  password:
+                                    description: |-
+                                      password defines a key of a Secret containing the password for
+                                      authentication.
+                                    properties:
+                                      key:
+                                        description: The key of the secret to select
+                                          from.  Must be a valid secret key.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the Secret or
+                                          its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  username:
+                                    description: |-
+                                      username defines a key of a Secret containing the username for
+                                      authentication.
+                                    properties:
+                                      key:
+                                        description: The key of the secret to select
+                                          from.  Must be a valid secret key.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the Secret or
+                                          its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                type: object
+                              bearerTokenSecret:
+                                description: |-
+                                  bearerTokenSecret defines the secret's key that contains the bearer token to be used by the client
+                                  for authentication.
+                                  The secret needs to be in the same namespace as the AlertmanagerConfig
+                                  object and accessible by the Prometheus Operator.
+                                properties:
+                                  key:
+                                    description: The key of the secret to select from.  Must
+                                      be a valid secret key.
+                                    type: string
+                                  name:
+                                    default: ""
+                                    description: |-
+                                      Name of the referent.
+                                      This field is effectively required, but due to backwards compatibility is
+                                      allowed to be empty. Instances of this type with an empty value here are
+                                      almost certainly wrong.
+                                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                    type: string
+                                  optional:
+                                    description: Specify whether the Secret or its
+                                      key must be defined
+                                    type: boolean
+                                required:
+                                - key
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              enableHttp2:
+                                description: enableHttp2 can be used to disable HTTP2.
+                                type: boolean
+                              followRedirects:
+                                description: |-
+                                  followRedirects specifies whether the client should follow HTTP 3xx redirects.
+                                  When true, the client will automatically follow redirect responses.
+                                type: boolean
+                              noProxy:
+                                description: |-
+                                  noProxy defines a comma-separated string that can contain IPs, CIDR notation, domain names
+                                  that should be excluded from proxying. IP and domain names can
+                                  contain port numbers.
+
+                                  It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                                type: string
+                              oauth2:
+                                description: |-
+                                  oauth2 defines the OAuth2 client credentials used to fetch a token for the targets.
+                                  This enables OAuth2 authentication flow for HTTP requests.
+                                properties:
+                                  clientId:
+                                    description: |-
+                                      clientId defines a key of a Secret or ConfigMap containing the
+                                      OAuth2 client's ID.
+                                    properties:
+                                      configMap:
+                                        description: configMap defines the ConfigMap
+                                          containing data to use for the targets.
+                                        properties:
+                                          key:
+                                            description: The key to select.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the ConfigMap
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      secret:
+                                        description: secret defines the Secret containing
+                                          data to use for the targets.
+                                        properties:
+                                          key:
+                                            description: The key of the secret to
+                                              select from.  Must be a valid secret
+                                              key.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the Secret
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                    type: object
+                                  clientSecret:
+                                    description: |-
+                                      clientSecret defines a key of a Secret containing the OAuth2
+                                      client's secret.
+                                    properties:
+                                      key:
+                                        description: The key of the secret to select
+                                          from.  Must be a valid secret key.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the Secret or
+                                          its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  endpointParams:
+                                    additionalProperties:
+                                      type: string
+                                    description: |-
+                                      endpointParams configures the HTTP parameters to append to the token
+                                      URL.
+                                    type: object
+                                  noProxy:
+                                    description: |-
+                                      noProxy defines a comma-separated string that can contain IPs, CIDR notation, domain names
+                                      that should be excluded from proxying. IP and domain names can
+                                      contain port numbers.
+
+                                      It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                                    type: string
+                                  proxyConnectHeader:
+                                    additionalProperties:
+                                      items:
+                                        description: SecretKeySelector selects a key
+                                          of a Secret.
+                                        properties:
+                                          key:
+                                            description: The key of the secret to
+                                              select from.  Must be a valid secret
+                                              key.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the Secret
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      type: array
+                                    description: |-
+                                      proxyConnectHeader optionally specifies headers to send to
+                                      proxies during CONNECT requests.
+
+                                      It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  proxyFromEnvironment:
+                                    description: |-
+                                      proxyFromEnvironment defines whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+
+                                      It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                                    type: boolean
+                                  proxyUrl:
+                                    description: proxyUrl defines the HTTP proxy server
+                                      to use.
+                                    pattern: ^(http|https|socks5)://.+$
+                                    type: string
+                                  scopes:
+                                    description: scopes defines the OAuth2 scopes
+                                      used for the token request.
+                                    items:
+                                      type: string
+                                    type: array
+                                  tlsConfig:
+                                    description: |-
+                                      tlsConfig defines the TLS configuration to use when connecting to the OAuth2 server.
+                                      It requires Prometheus >= v2.43.0.
+                                    properties:
+                                      ca:
+                                        description: ca defines the Certificate authority
+                                          used when verifying server certificates.
+                                        properties:
+                                          configMap:
+                                            description: configMap defines the ConfigMap
+                                              containing data to use for the targets.
+                                            properties:
+                                              key:
+                                                description: The key to select.
+                                                type: string
+                                              name:
+                                                default: ""
+                                                description: |-
+                                                  Name of the referent.
+                                                  This field is effectively required, but due to backwards compatibility is
+                                                  allowed to be empty. Instances of this type with an empty value here are
+                                                  almost certainly wrong.
+                                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                                type: string
+                                              optional:
+                                                description: Specify whether the ConfigMap
+                                                  or its key must be defined
+                                                type: boolean
+                                            required:
+                                            - key
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                          secret:
+                                            description: secret defines the Secret
+                                              containing data to use for the targets.
+                                            properties:
+                                              key:
+                                                description: The key of the secret
+                                                  to select from.  Must be a valid
+                                                  secret key.
+                                                type: string
+                                              name:
+                                                default: ""
+                                                description: |-
+                                                  Name of the referent.
+                                                  This field is effectively required, but due to backwards compatibility is
+                                                  allowed to be empty. Instances of this type with an empty value here are
+                                                  almost certainly wrong.
+                                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                                type: string
+                                              optional:
+                                                description: Specify whether the Secret
+                                                  or its key must be defined
+                                                type: boolean
+                                            required:
+                                            - key
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                        type: object
+                                      cert:
+                                        description: cert defines the Client certificate
+                                          to present when doing client-authentication.
+                                        properties:
+                                          configMap:
+                                            description: configMap defines the ConfigMap
+                                              containing data to use for the targets.
+                                            properties:
+                                              key:
+                                                description: The key to select.
+                                                type: string
+                                              name:
+                                                default: ""
+                                                description: |-
+                                                  Name of the referent.
+                                                  This field is effectively required, but due to backwards compatibility is
+                                                  allowed to be empty. Instances of this type with an empty value here are
+                                                  almost certainly wrong.
+                                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                                type: string
+                                              optional:
+                                                description: Specify whether the ConfigMap
+                                                  or its key must be defined
+                                                type: boolean
+                                            required:
+                                            - key
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                          secret:
+                                            description: secret defines the Secret
+                                              containing data to use for the targets.
+                                            properties:
+                                              key:
+                                                description: The key of the secret
+                                                  to select from.  Must be a valid
+                                                  secret key.
+                                                type: string
+                                              name:
+                                                default: ""
+                                                description: |-
+                                                  Name of the referent.
+                                                  This field is effectively required, but due to backwards compatibility is
+                                                  allowed to be empty. Instances of this type with an empty value here are
+                                                  almost certainly wrong.
+                                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                                type: string
+                                              optional:
+                                                description: Specify whether the Secret
+                                                  or its key must be defined
+                                                type: boolean
+                                            required:
+                                            - key
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                        type: object
+                                      insecureSkipVerify:
+                                        description: insecureSkipVerify defines how
+                                          to disable target certificate validation.
+                                        type: boolean
+                                      keySecret:
+                                        description: keySecret defines the Secret
+                                          containing the client key file for the targets.
+                                        properties:
+                                          key:
+                                            description: The key of the secret to
+                                              select from.  Must be a valid secret
+                                              key.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the Secret
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      maxVersion:
+                                        description: |-
+                                          maxVersion defines the maximum acceptable TLS version.
+
+                                          It requires Prometheus >= v2.41.0 or Thanos >= v0.31.0.
+                                        enum:
+                                        - TLS10
+                                        - TLS11
+                                        - TLS12
+                                        - TLS13
+                                        type: string
+                                      minVersion:
+                                        description: |-
+                                          minVersion defines the minimum acceptable TLS version.
+
+                                          It requires Prometheus >= v2.35.0 or Thanos >= v0.28.0.
+                                        enum:
+                                        - TLS10
+                                        - TLS11
+                                        - TLS12
+                                        - TLS13
+                                        type: string
+                                      serverName:
+                                        description: serverName is used to verify
+                                          the hostname for the targets.
+                                        type: string
+                                    type: object
+                                  tokenUrl:
+                                    description: tokenUrl defines the URL to fetch
+                                      the token from.
+                                    minLength: 1
+                                    type: string
+                                required:
+                                - clientId
+                                - clientSecret
+                                - tokenUrl
+                                type: object
+                              proxyConnectHeader:
+                                additionalProperties:
+                                  items:
+                                    description: SecretKeySelector selects a key of
+                                      a Secret.
+                                    properties:
+                                      key:
+                                        description: The key of the secret to select
+                                          from.  Must be a valid secret key.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the Secret or
+                                          its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  type: array
+                                description: |-
+                                  proxyConnectHeader optionally specifies headers to send to
+                                  proxies during CONNECT requests.
+
+                                  It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              proxyFromEnvironment:
+                                description: |-
+                                  proxyFromEnvironment defines whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+
+                                  It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                                type: boolean
+                              proxyURL:
+                                description: |-
+                                  proxyURL defines an optional proxy URL for HTTP requests.
+                                  If defined, this field takes precedence over `proxyUrl`.
+                                type: string
+                              proxyUrl:
+                                description: proxyUrl defines the HTTP proxy server
+                                  to use.
+                                pattern: ^(http|https|socks5)://.+$
+                                type: string
+                              tlsConfig:
+                                description: |-
+                                  tlsConfig defines the TLS configuration for the client.
+                                  This includes settings for certificates, CA validation, and TLS protocol options.
+                                properties:
+                                  ca:
+                                    description: ca defines the Certificate authority
+                                      used when verifying server certificates.
+                                    properties:
+                                      configMap:
+                                        description: configMap defines the ConfigMap
+                                          containing data to use for the targets.
+                                        properties:
+                                          key:
+                                            description: The key to select.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the ConfigMap
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      secret:
+                                        description: secret defines the Secret containing
+                                          data to use for the targets.
+                                        properties:
+                                          key:
+                                            description: The key of the secret to
+                                              select from.  Must be a valid secret
+                                              key.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the Secret
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                    type: object
+                                  cert:
+                                    description: cert defines the Client certificate
+                                      to present when doing client-authentication.
+                                    properties:
+                                      configMap:
+                                        description: configMap defines the ConfigMap
+                                          containing data to use for the targets.
+                                        properties:
+                                          key:
+                                            description: The key to select.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the ConfigMap
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      secret:
+                                        description: secret defines the Secret containing
+                                          data to use for the targets.
+                                        properties:
+                                          key:
+                                            description: The key of the secret to
+                                              select from.  Must be a valid secret
+                                              key.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the Secret
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                    type: object
+                                  insecureSkipVerify:
+                                    description: insecureSkipVerify defines how to
+                                      disable target certificate validation.
+                                    type: boolean
+                                  keySecret:
+                                    description: keySecret defines the Secret containing
+                                      the client key file for the targets.
+                                    properties:
+                                      key:
+                                        description: The key of the secret to select
+                                          from.  Must be a valid secret key.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the Secret or
+                                          its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  maxVersion:
+                                    description: |-
+                                      maxVersion defines the maximum acceptable TLS version.
+
+                                      It requires Prometheus >= v2.41.0 or Thanos >= v0.31.0.
+                                    enum:
+                                    - TLS10
+                                    - TLS11
+                                    - TLS12
+                                    - TLS13
+                                    type: string
+                                  minVersion:
+                                    description: |-
+                                      minVersion defines the minimum acceptable TLS version.
+
+                                      It requires Prometheus >= v2.35.0 or Thanos >= v0.28.0.
+                                    enum:
+                                    - TLS10
+                                    - TLS11
+                                    - TLS12
+                                    - TLS13
+                                    type: string
+                                  serverName:
+                                    description: serverName is used to verify the
+                                      hostname for the targets.
+                                    type: string
+                                type: object
+                            type: object
+                          message:
+                            description: message defines the template of the message's
+                              body.
+                            type: string
+                          sendResolved:
+                            description: sendResolved defines whether or not to notify
+                              about resolved alerts.
+                            type: boolean
+                          title:
+                            description: title defines the template of the message's
+                              title.
+                            type: string
+                          username:
+                            description: username defines the username of the message
+                              sender.
+                            minLength: 1
+                            type: string
+                        required:
+                        - apiURL
+                        type: object
+                      type: array
+                    emailConfigs:
+                      description: emailConfigs defines the list of Email configurations.
+                      items:
+                        description: EmailConfig configures notifications via Email.
+                        properties:
+                          authIdentity:
+                            description: |-
+                              authIdentity defines the identity to use for SMTP authentication.
+                              This is typically used with PLAIN authentication mechanism.
+                            type: string
+                          authPassword:
+                            description: |-
+                              authPassword defines the secret's key that contains the password to use for authentication.
+                              The secret needs to be in the same namespace as the AlertmanagerConfig
+                              object and accessible by the Prometheus Operator.
+                            properties:
+                              key:
+                                description: The key of the secret to select from.  Must
+                                  be a valid secret key.
+                                type: string
+                              name:
+                                default: ""
+                                description: |-
+                                  Name of the referent.
+                                  This field is effectively required, but due to backwards compatibility is
+                                  allowed to be empty. Instances of this type with an empty value here are
+                                  almost certainly wrong.
+                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                type: string
+                              optional:
+                                description: Specify whether the Secret or its key
+                                  must be defined
+                                type: boolean
+                            required:
+                            - key
+                            type: object
+                            x-kubernetes-map-type: atomic
+                          authSecret:
+                            description: |-
+                              authSecret defines the secret's key that contains the CRAM-MD5 secret.
+                              This is used for CRAM-MD5 authentication mechanism.
+                              The secret needs to be in the same namespace as the AlertmanagerConfig
+                              object and accessible by the Prometheus Operator.
+                            properties:
+                              key:
+                                description: The key of the secret to select from.  Must
+                                  be a valid secret key.
+                                type: string
+                              name:
+                                default: ""
+                                description: |-
+                                  Name of the referent.
+                                  This field is effectively required, but due to backwards compatibility is
+                                  allowed to be empty. Instances of this type with an empty value here are
+                                  almost certainly wrong.
+                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                type: string
+                              optional:
+                                description: Specify whether the Secret or its key
+                                  must be defined
+                                type: boolean
+                            required:
+                            - key
+                            type: object
+                            x-kubernetes-map-type: atomic
+                          authUsername:
+                            description: |-
+                              authUsername defines the username to use for SMTP authentication.
+                              This is used for SMTP AUTH when the server requires authentication.
+                            type: string
+                          from:
+                            description: |-
+                              from defines the sender address for email notifications.
+                              This appears as the "From" field in the email header.
+                            type: string
+                          headers:
+                            description: |-
+                              headers defines additional email header key/value pairs.
+                              These override any headers previously set by the notification implementation.
+                            items:
+                              description: KeyValue defines a (key, value) tuple.
+                              properties:
+                                key:
+                                  description: |-
+                                    key defines the key of the tuple.
+                                    This is the identifier or name part of the key-value pair.
+                                  minLength: 1
+                                  type: string
+                                value:
+                                  description: |-
+                                    value defines the value of the tuple.
+                                    This is the data or content associated with the key.
+                                  type: string
+                              required:
+                              - key
+                              - value
+                              type: object
+                            type: array
+                          hello:
+                            description: |-
+                              hello defines the hostname to identify to the SMTP server.
+                              This is used in the SMTP HELO/EHLO command during the connection handshake.
+                            type: string
+                          html:
+                            description: |-
+                              html defines the HTML body of the email notification.
+                              This allows for rich formatting in the email content.
+                            type: string
+                          requireTLS:
+                            description: |-
+                              requireTLS defines the SMTP TLS requirement.
+                              Note that Go does not support unencrypted connections to remote SMTP endpoints.
+                            type: boolean
+                          sendResolved:
+                            description: sendResolved defines whether or not to notify
+                              about resolved alerts.
+                            type: boolean
+                          smarthost:
+                            description: |-
+                              smarthost defines the SMTP host and port through which emails are sent.
+                              Format should be "hostname:port", e.g. "smtp.example.com:587".
+                            type: string
+                          text:
+                            description: |-
+                              text defines the plain text body of the email notification.
+                              This provides a fallback for email clients that don't support HTML.
+                            type: string
+                          tlsConfig:
+                            description: |-
+                              tlsConfig defines the TLS configuration for SMTP connections.
+                              This includes settings for certificates, CA validation, and TLS protocol options.
+                            properties:
+                              ca:
+                                description: ca defines the Certificate authority
+                                  used when verifying server certificates.
+                                properties:
+                                  configMap:
+                                    description: configMap defines the ConfigMap containing
+                                      data to use for the targets.
+                                    properties:
+                                      key:
+                                        description: The key to select.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the ConfigMap
+                                          or its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  secret:
+                                    description: secret defines the Secret containing
+                                      data to use for the targets.
+                                    properties:
+                                      key:
+                                        description: The key of the secret to select
+                                          from.  Must be a valid secret key.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the Secret or
+                                          its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                type: object
+                              cert:
+                                description: cert defines the Client certificate to
+                                  present when doing client-authentication.
+                                properties:
+                                  configMap:
+                                    description: configMap defines the ConfigMap containing
+                                      data to use for the targets.
+                                    properties:
+                                      key:
+                                        description: The key to select.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the ConfigMap
+                                          or its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  secret:
+                                    description: secret defines the Secret containing
+                                      data to use for the targets.
+                                    properties:
+                                      key:
+                                        description: The key of the secret to select
+                                          from.  Must be a valid secret key.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the Secret or
+                                          its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                type: object
+                              insecureSkipVerify:
+                                description: insecureSkipVerify defines how to disable
+                                  target certificate validation.
+                                type: boolean
+                              keySecret:
+                                description: keySecret defines the Secret containing
+                                  the client key file for the targets.
+                                properties:
+                                  key:
+                                    description: The key of the secret to select from.  Must
+                                      be a valid secret key.
+                                    type: string
+                                  name:
+                                    default: ""
+                                    description: |-
+                                      Name of the referent.
+                                      This field is effectively required, but due to backwards compatibility is
+                                      allowed to be empty. Instances of this type with an empty value here are
+                                      almost certainly wrong.
+                                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                    type: string
+                                  optional:
+                                    description: Specify whether the Secret or its
+                                      key must be defined
+                                    type: boolean
+                                required:
+                                - key
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              maxVersion:
+                                description: |-
+                                  maxVersion defines the maximum acceptable TLS version.
+
+                                  It requires Prometheus >= v2.41.0 or Thanos >= v0.31.0.
+                                enum:
+                                - TLS10
+                                - TLS11
+                                - TLS12
+                                - TLS13
+                                type: string
+                              minVersion:
+                                description: |-
+                                  minVersion defines the minimum acceptable TLS version.
+
+                                  It requires Prometheus >= v2.35.0 or Thanos >= v0.28.0.
+                                enum:
+                                - TLS10
+                                - TLS11
+                                - TLS12
+                                - TLS13
+                                type: string
+                              serverName:
+                                description: serverName is used to verify the hostname
+                                  for the targets.
+                                type: string
+                            type: object
+                          to:
+                            description: |-
+                              to defines the email address to send notifications to.
+                              This is the recipient address for alert notifications.
+                            type: string
+                        type: object
+                      type: array
+                    msteamsConfigs:
+                      description: |-
+                        msteamsConfigs defines the list of MSTeams configurations.
+                        It requires Alertmanager >= 0.26.0.
+                      items:
+                        description: |-
+                          MSTeamsConfig configures notifications via Microsoft Teams.
+                          It requires Alertmanager >= 0.26.0.
+                        properties:
+                          httpConfig:
+                            description: httpConfig defines the HTTP client configuration
+                              for Teams webhook requests.
+                            properties:
+                              authorization:
+                                description: |-
+                                  authorization defines the authorization header configuration for the client.
+                                  This is mutually exclusive with BasicAuth and is only available starting from Alertmanager v0.22+.
+                                properties:
+                                  credentials:
+                                    description: credentials defines a key of a Secret
+                                      in the namespace that contains the credentials
+                                      for authentication.
+                                    properties:
+                                      key:
+                                        description: The key of the secret to select
+                                          from.  Must be a valid secret key.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the Secret or
+                                          its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  type:
+                                    description: |-
+                                      type defines the authentication type. The value is case-insensitive.
+
+                                      "Basic" is not a supported value.
+
+                                      Default: "Bearer"
+                                    type: string
+                                type: object
+                              basicAuth:
+                                description: |-
+                                  basicAuth defines the basic authentication credentials for the client.
+                                  This is mutually exclusive with Authorization. If both are defined, BasicAuth takes precedence.
+                                properties:
+                                  password:
+                                    description: |-
+                                      password defines a key of a Secret containing the password for
+                                      authentication.
+                                    properties:
+                                      key:
+                                        description: The key of the secret to select
+                                          from.  Must be a valid secret key.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the Secret or
+                                          its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  username:
+                                    description: |-
+                                      username defines a key of a Secret containing the username for
+                                      authentication.
+                                    properties:
+                                      key:
+                                        description: The key of the secret to select
+                                          from.  Must be a valid secret key.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the Secret or
+                                          its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                type: object
+                              bearerTokenSecret:
+                                description: |-
+                                  bearerTokenSecret defines the secret's key that contains the bearer token to be used by the client
+                                  for authentication.
+                                  The secret needs to be in the same namespace as the AlertmanagerConfig
+                                  object and accessible by the Prometheus Operator.
+                                properties:
+                                  key:
+                                    description: The key of the secret to select from.  Must
+                                      be a valid secret key.
+                                    type: string
+                                  name:
+                                    default: ""
+                                    description: |-
+                                      Name of the referent.
+                                      This field is effectively required, but due to backwards compatibility is
+                                      allowed to be empty. Instances of this type with an empty value here are
+                                      almost certainly wrong.
+                                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                    type: string
+                                  optional:
+                                    description: Specify whether the Secret or its
+                                      key must be defined
+                                    type: boolean
+                                required:
+                                - key
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              enableHttp2:
+                                description: enableHttp2 can be used to disable HTTP2.
+                                type: boolean
+                              followRedirects:
+                                description: |-
+                                  followRedirects specifies whether the client should follow HTTP 3xx redirects.
+                                  When true, the client will automatically follow redirect responses.
+                                type: boolean
+                              noProxy:
+                                description: |-
+                                  noProxy defines a comma-separated string that can contain IPs, CIDR notation, domain names
+                                  that should be excluded from proxying. IP and domain names can
+                                  contain port numbers.
+
+                                  It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                                type: string
+                              oauth2:
+                                description: |-
+                                  oauth2 defines the OAuth2 client credentials used to fetch a token for the targets.
+                                  This enables OAuth2 authentication flow for HTTP requests.
+                                properties:
+                                  clientId:
+                                    description: |-
+                                      clientId defines a key of a Secret or ConfigMap containing the
+                                      OAuth2 client's ID.
+                                    properties:
+                                      configMap:
+                                        description: configMap defines the ConfigMap
+                                          containing data to use for the targets.
+                                        properties:
+                                          key:
+                                            description: The key to select.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the ConfigMap
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      secret:
+                                        description: secret defines the Secret containing
+                                          data to use for the targets.
+                                        properties:
+                                          key:
+                                            description: The key of the secret to
+                                              select from.  Must be a valid secret
+                                              key.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the Secret
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                    type: object
+                                  clientSecret:
+                                    description: |-
+                                      clientSecret defines a key of a Secret containing the OAuth2
+                                      client's secret.
+                                    properties:
+                                      key:
+                                        description: The key of the secret to select
+                                          from.  Must be a valid secret key.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the Secret or
+                                          its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  endpointParams:
+                                    additionalProperties:
+                                      type: string
+                                    description: |-
+                                      endpointParams configures the HTTP parameters to append to the token
+                                      URL.
+                                    type: object
+                                  noProxy:
+                                    description: |-
+                                      noProxy defines a comma-separated string that can contain IPs, CIDR notation, domain names
+                                      that should be excluded from proxying. IP and domain names can
+                                      contain port numbers.
+
+                                      It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                                    type: string
+                                  proxyConnectHeader:
+                                    additionalProperties:
+                                      items:
+                                        description: SecretKeySelector selects a key
+                                          of a Secret.
+                                        properties:
+                                          key:
+                                            description: The key of the secret to
+                                              select from.  Must be a valid secret
+                                              key.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the Secret
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      type: array
+                                    description: |-
+                                      proxyConnectHeader optionally specifies headers to send to
+                                      proxies during CONNECT requests.
+
+                                      It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  proxyFromEnvironment:
+                                    description: |-
+                                      proxyFromEnvironment defines whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+
+                                      It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                                    type: boolean
+                                  proxyUrl:
+                                    description: proxyUrl defines the HTTP proxy server
+                                      to use.
+                                    pattern: ^(http|https|socks5)://.+$
+                                    type: string
+                                  scopes:
+                                    description: scopes defines the OAuth2 scopes
+                                      used for the token request.
+                                    items:
+                                      type: string
+                                    type: array
+                                  tlsConfig:
+                                    description: |-
+                                      tlsConfig defines the TLS configuration to use when connecting to the OAuth2 server.
+                                      It requires Prometheus >= v2.43.0.
+                                    properties:
+                                      ca:
+                                        description: ca defines the Certificate authority
+                                          used when verifying server certificates.
+                                        properties:
+                                          configMap:
+                                            description: configMap defines the ConfigMap
+                                              containing data to use for the targets.
+                                            properties:
+                                              key:
+                                                description: The key to select.
+                                                type: string
+                                              name:
+                                                default: ""
+                                                description: |-
+                                                  Name of the referent.
+                                                  This field is effectively required, but due to backwards compatibility is
+                                                  allowed to be empty. Instances of this type with an empty value here are
+                                                  almost certainly wrong.
+                                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                                type: string
+                                              optional:
+                                                description: Specify whether the ConfigMap
+                                                  or its key must be defined
+                                                type: boolean
+                                            required:
+                                            - key
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                          secret:
+                                            description: secret defines the Secret
+                                              containing data to use for the targets.
+                                            properties:
+                                              key:
+                                                description: The key of the secret
+                                                  to select from.  Must be a valid
+                                                  secret key.
+                                                type: string
+                                              name:
+                                                default: ""
+                                                description: |-
+                                                  Name of the referent.
+                                                  This field is effectively required, but due to backwards compatibility is
+                                                  allowed to be empty. Instances of this type with an empty value here are
+                                                  almost certainly wrong.
+                                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                                type: string
+                                              optional:
+                                                description: Specify whether the Secret
+                                                  or its key must be defined
+                                                type: boolean
+                                            required:
+                                            - key
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                        type: object
+                                      cert:
+                                        description: cert defines the Client certificate
+                                          to present when doing client-authentication.
+                                        properties:
+                                          configMap:
+                                            description: configMap defines the ConfigMap
+                                              containing data to use for the targets.
+                                            properties:
+                                              key:
+                                                description: The key to select.
+                                                type: string
+                                              name:
+                                                default: ""
+                                                description: |-
+                                                  Name of the referent.
+                                                  This field is effectively required, but due to backwards compatibility is
+                                                  allowed to be empty. Instances of this type with an empty value here are
+                                                  almost certainly wrong.
+                                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                                type: string
+                                              optional:
+                                                description: Specify whether the ConfigMap
+                                                  or its key must be defined
+                                                type: boolean
+                                            required:
+                                            - key
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                          secret:
+                                            description: secret defines the Secret
+                                              containing data to use for the targets.
+                                            properties:
+                                              key:
+                                                description: The key of the secret
+                                                  to select from.  Must be a valid
+                                                  secret key.
+                                                type: string
+                                              name:
+                                                default: ""
+                                                description: |-
+                                                  Name of the referent.
+                                                  This field is effectively required, but due to backwards compatibility is
+                                                  allowed to be empty. Instances of this type with an empty value here are
+                                                  almost certainly wrong.
+                                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                                type: string
+                                              optional:
+                                                description: Specify whether the Secret
+                                                  or its key must be defined
+                                                type: boolean
+                                            required:
+                                            - key
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                        type: object
+                                      insecureSkipVerify:
+                                        description: insecureSkipVerify defines how
+                                          to disable target certificate validation.
+                                        type: boolean
+                                      keySecret:
+                                        description: keySecret defines the Secret
+                                          containing the client key file for the targets.
+                                        properties:
+                                          key:
+                                            description: The key of the secret to
+                                              select from.  Must be a valid secret
+                                              key.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the Secret
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      maxVersion:
+                                        description: |-
+                                          maxVersion defines the maximum acceptable TLS version.
+
+                                          It requires Prometheus >= v2.41.0 or Thanos >= v0.31.0.
+                                        enum:
+                                        - TLS10
+                                        - TLS11
+                                        - TLS12
+                                        - TLS13
+                                        type: string
+                                      minVersion:
+                                        description: |-
+                                          minVersion defines the minimum acceptable TLS version.
+
+                                          It requires Prometheus >= v2.35.0 or Thanos >= v0.28.0.
+                                        enum:
+                                        - TLS10
+                                        - TLS11
+                                        - TLS12
+                                        - TLS13
+                                        type: string
+                                      serverName:
+                                        description: serverName is used to verify
+                                          the hostname for the targets.
+                                        type: string
+                                    type: object
+                                  tokenUrl:
+                                    description: tokenUrl defines the URL to fetch
+                                      the token from.
+                                    minLength: 1
+                                    type: string
+                                required:
+                                - clientId
+                                - clientSecret
+                                - tokenUrl
+                                type: object
+                              proxyConnectHeader:
+                                additionalProperties:
+                                  items:
+                                    description: SecretKeySelector selects a key of
+                                      a Secret.
+                                    properties:
+                                      key:
+                                        description: The key of the secret to select
+                                          from.  Must be a valid secret key.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the Secret or
+                                          its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  type: array
+                                description: |-
+                                  proxyConnectHeader optionally specifies headers to send to
+                                  proxies during CONNECT requests.
+
+                                  It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              proxyFromEnvironment:
+                                description: |-
+                                  proxyFromEnvironment defines whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+
+                                  It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                                type: boolean
+                              proxyURL:
+                                description: |-
+                                  proxyURL defines an optional proxy URL for HTTP requests.
+                                  If defined, this field takes precedence over `proxyUrl`.
+                                type: string
+                              proxyUrl:
+                                description: proxyUrl defines the HTTP proxy server
+                                  to use.
+                                pattern: ^(http|https|socks5)://.+$
+                                type: string
+                              tlsConfig:
+                                description: |-
+                                  tlsConfig defines the TLS configuration for the client.
+                                  This includes settings for certificates, CA validation, and TLS protocol options.
+                                properties:
+                                  ca:
+                                    description: ca defines the Certificate authority
+                                      used when verifying server certificates.
+                                    properties:
+                                      configMap:
+                                        description: configMap defines the ConfigMap
+                                          containing data to use for the targets.
+                                        properties:
+                                          key:
+                                            description: The key to select.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the ConfigMap
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      secret:
+                                        description: secret defines the Secret containing
+                                          data to use for the targets.
+                                        properties:
+                                          key:
+                                            description: The key of the secret to
+                                              select from.  Must be a valid secret
+                                              key.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the Secret
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                    type: object
+                                  cert:
+                                    description: cert defines the Client certificate
+                                      to present when doing client-authentication.
+                                    properties:
+                                      configMap:
+                                        description: configMap defines the ConfigMap
+                                          containing data to use for the targets.
+                                        properties:
+                                          key:
+                                            description: The key to select.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the ConfigMap
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      secret:
+                                        description: secret defines the Secret containing
+                                          data to use for the targets.
+                                        properties:
+                                          key:
+                                            description: The key of the secret to
+                                              select from.  Must be a valid secret
+                                              key.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the Secret
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                    type: object
+                                  insecureSkipVerify:
+                                    description: insecureSkipVerify defines how to
+                                      disable target certificate validation.
+                                    type: boolean
+                                  keySecret:
+                                    description: keySecret defines the Secret containing
+                                      the client key file for the targets.
+                                    properties:
+                                      key:
+                                        description: The key of the secret to select
+                                          from.  Must be a valid secret key.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the Secret or
+                                          its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  maxVersion:
+                                    description: |-
+                                      maxVersion defines the maximum acceptable TLS version.
+
+                                      It requires Prometheus >= v2.41.0 or Thanos >= v0.31.0.
+                                    enum:
+                                    - TLS10
+                                    - TLS11
+                                    - TLS12
+                                    - TLS13
+                                    type: string
+                                  minVersion:
+                                    description: |-
+                                      minVersion defines the minimum acceptable TLS version.
+
+                                      It requires Prometheus >= v2.35.0 or Thanos >= v0.28.0.
+                                    enum:
+                                    - TLS10
+                                    - TLS11
+                                    - TLS12
+                                    - TLS13
+                                    type: string
+                                  serverName:
+                                    description: serverName is used to verify the
+                                      hostname for the targets.
+                                    type: string
+                                type: object
+                            type: object
+                          sendResolved:
+                            description: sendResolved defines whether or not to notify
+                              about resolved alerts.
+                            type: boolean
+                          summary:
+                            description: |-
+                              summary defines the message summary template for Teams notifications.
+                              This provides a brief overview that appears in Teams notification previews.
+                              It requires Alertmanager >= 0.27.0.
+                            type: string
+                          text:
+                            description: |-
+                              text defines the message body template for Teams notifications.
+                              This contains the detailed content of the Teams message.
+                            type: string
+                          title:
+                            description: |-
+                              title defines the message title template for Teams notifications.
+                              This appears as the main heading of the Teams message card.
+                            type: string
+                          webhookUrl:
+                            description: |-
+                              webhookUrl defines the MSTeams webhook URL for sending notifications.
+                              This is the incoming webhook URL configured in your Teams channel.
+                            properties:
+                              key:
+                                description: The key of the secret to select from.  Must
+                                  be a valid secret key.
+                                type: string
+                              name:
+                                default: ""
+                                description: |-
+                                  Name of the referent.
+                                  This field is effectively required, but due to backwards compatibility is
+                                  allowed to be empty. Instances of this type with an empty value here are
+                                  almost certainly wrong.
+                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                type: string
+                              optional:
+                                description: Specify whether the Secret or its key
+                                  must be defined
+                                type: boolean
+                            required:
+                            - key
+                            type: object
+                            x-kubernetes-map-type: atomic
+                        required:
+                        - webhookUrl
+                        type: object
+                      type: array
+                    msteamsv2Configs:
+                      description: |-
+                        msteamsv2Configs defines the list of MSTeamsV2 configurations.
+                        It requires Alertmanager >= 0.28.0.
+                      items:
+                        description: |-
+                          MSTeamsV2Config configures notifications via Microsoft Teams using the new message format with adaptive cards as required by flows.
+                          See https://prometheus.io/docs/alerting/latest/configuration/#msteamsv2_config
+                          It requires Alertmanager >= 0.28.0.
+                        properties:
+                          httpConfig:
+                            description: httpConfig defines the HTTP client configuration
+                              for Teams webhook requests.
+                            properties:
+                              authorization:
+                                description: |-
+                                  authorization defines the authorization header configuration for the client.
+                                  This is mutually exclusive with BasicAuth and is only available starting from Alertmanager v0.22+.
+                                properties:
+                                  credentials:
+                                    description: credentials defines a key of a Secret
+                                      in the namespace that contains the credentials
+                                      for authentication.
+                                    properties:
+                                      key:
+                                        description: The key of the secret to select
+                                          from.  Must be a valid secret key.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the Secret or
+                                          its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  type:
+                                    description: |-
+                                      type defines the authentication type. The value is case-insensitive.
+
+                                      "Basic" is not a supported value.
+
+                                      Default: "Bearer"
+                                    type: string
+                                type: object
+                              basicAuth:
+                                description: |-
+                                  basicAuth defines the basic authentication credentials for the client.
+                                  This is mutually exclusive with Authorization. If both are defined, BasicAuth takes precedence.
+                                properties:
+                                  password:
+                                    description: |-
+                                      password defines a key of a Secret containing the password for
+                                      authentication.
+                                    properties:
+                                      key:
+                                        description: The key of the secret to select
+                                          from.  Must be a valid secret key.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the Secret or
+                                          its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  username:
+                                    description: |-
+                                      username defines a key of a Secret containing the username for
+                                      authentication.
+                                    properties:
+                                      key:
+                                        description: The key of the secret to select
+                                          from.  Must be a valid secret key.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the Secret or
+                                          its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                type: object
+                              bearerTokenSecret:
+                                description: |-
+                                  bearerTokenSecret defines the secret's key that contains the bearer token to be used by the client
+                                  for authentication.
+                                  The secret needs to be in the same namespace as the AlertmanagerConfig
+                                  object and accessible by the Prometheus Operator.
+                                properties:
+                                  key:
+                                    description: The key of the secret to select from.  Must
+                                      be a valid secret key.
+                                    type: string
+                                  name:
+                                    default: ""
+                                    description: |-
+                                      Name of the referent.
+                                      This field is effectively required, but due to backwards compatibility is
+                                      allowed to be empty. Instances of this type with an empty value here are
+                                      almost certainly wrong.
+                                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                    type: string
+                                  optional:
+                                    description: Specify whether the Secret or its
+                                      key must be defined
+                                    type: boolean
+                                required:
+                                - key
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              enableHttp2:
+                                description: enableHttp2 can be used to disable HTTP2.
+                                type: boolean
+                              followRedirects:
+                                description: |-
+                                  followRedirects specifies whether the client should follow HTTP 3xx redirects.
+                                  When true, the client will automatically follow redirect responses.
+                                type: boolean
+                              noProxy:
+                                description: |-
+                                  noProxy defines a comma-separated string that can contain IPs, CIDR notation, domain names
+                                  that should be excluded from proxying. IP and domain names can
+                                  contain port numbers.
+
+                                  It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                                type: string
+                              oauth2:
+                                description: |-
+                                  oauth2 defines the OAuth2 client credentials used to fetch a token for the targets.
+                                  This enables OAuth2 authentication flow for HTTP requests.
+                                properties:
+                                  clientId:
+                                    description: |-
+                                      clientId defines a key of a Secret or ConfigMap containing the
+                                      OAuth2 client's ID.
+                                    properties:
+                                      configMap:
+                                        description: configMap defines the ConfigMap
+                                          containing data to use for the targets.
+                                        properties:
+                                          key:
+                                            description: The key to select.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the ConfigMap
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      secret:
+                                        description: secret defines the Secret containing
+                                          data to use for the targets.
+                                        properties:
+                                          key:
+                                            description: The key of the secret to
+                                              select from.  Must be a valid secret
+                                              key.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the Secret
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                    type: object
+                                  clientSecret:
+                                    description: |-
+                                      clientSecret defines a key of a Secret containing the OAuth2
+                                      client's secret.
+                                    properties:
+                                      key:
+                                        description: The key of the secret to select
+                                          from.  Must be a valid secret key.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the Secret or
+                                          its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  endpointParams:
+                                    additionalProperties:
+                                      type: string
+                                    description: |-
+                                      endpointParams configures the HTTP parameters to append to the token
+                                      URL.
+                                    type: object
+                                  noProxy:
+                                    description: |-
+                                      noProxy defines a comma-separated string that can contain IPs, CIDR notation, domain names
+                                      that should be excluded from proxying. IP and domain names can
+                                      contain port numbers.
+
+                                      It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                                    type: string
+                                  proxyConnectHeader:
+                                    additionalProperties:
+                                      items:
+                                        description: SecretKeySelector selects a key
+                                          of a Secret.
+                                        properties:
+                                          key:
+                                            description: The key of the secret to
+                                              select from.  Must be a valid secret
+                                              key.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the Secret
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      type: array
+                                    description: |-
+                                      proxyConnectHeader optionally specifies headers to send to
+                                      proxies during CONNECT requests.
+
+                                      It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  proxyFromEnvironment:
+                                    description: |-
+                                      proxyFromEnvironment defines whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+
+                                      It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                                    type: boolean
+                                  proxyUrl:
+                                    description: proxyUrl defines the HTTP proxy server
+                                      to use.
+                                    pattern: ^(http|https|socks5)://.+$
+                                    type: string
+                                  scopes:
+                                    description: scopes defines the OAuth2 scopes
+                                      used for the token request.
+                                    items:
+                                      type: string
+                                    type: array
+                                  tlsConfig:
+                                    description: |-
+                                      tlsConfig defines the TLS configuration to use when connecting to the OAuth2 server.
+                                      It requires Prometheus >= v2.43.0.
+                                    properties:
+                                      ca:
+                                        description: ca defines the Certificate authority
+                                          used when verifying server certificates.
+                                        properties:
+                                          configMap:
+                                            description: configMap defines the ConfigMap
+                                              containing data to use for the targets.
+                                            properties:
+                                              key:
+                                                description: The key to select.
+                                                type: string
+                                              name:
+                                                default: ""
+                                                description: |-
+                                                  Name of the referent.
+                                                  This field is effectively required, but due to backwards compatibility is
+                                                  allowed to be empty. Instances of this type with an empty value here are
+                                                  almost certainly wrong.
+                                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                                type: string
+                                              optional:
+                                                description: Specify whether the ConfigMap
+                                                  or its key must be defined
+                                                type: boolean
+                                            required:
+                                            - key
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                          secret:
+                                            description: secret defines the Secret
+                                              containing data to use for the targets.
+                                            properties:
+                                              key:
+                                                description: The key of the secret
+                                                  to select from.  Must be a valid
+                                                  secret key.
+                                                type: string
+                                              name:
+                                                default: ""
+                                                description: |-
+                                                  Name of the referent.
+                                                  This field is effectively required, but due to backwards compatibility is
+                                                  allowed to be empty. Instances of this type with an empty value here are
+                                                  almost certainly wrong.
+                                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                                type: string
+                                              optional:
+                                                description: Specify whether the Secret
+                                                  or its key must be defined
+                                                type: boolean
+                                            required:
+                                            - key
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                        type: object
+                                      cert:
+                                        description: cert defines the Client certificate
+                                          to present when doing client-authentication.
+                                        properties:
+                                          configMap:
+                                            description: configMap defines the ConfigMap
+                                              containing data to use for the targets.
+                                            properties:
+                                              key:
+                                                description: The key to select.
+                                                type: string
+                                              name:
+                                                default: ""
+                                                description: |-
+                                                  Name of the referent.
+                                                  This field is effectively required, but due to backwards compatibility is
+                                                  allowed to be empty. Instances of this type with an empty value here are
+                                                  almost certainly wrong.
+                                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                                type: string
+                                              optional:
+                                                description: Specify whether the ConfigMap
+                                                  or its key must be defined
+                                                type: boolean
+                                            required:
+                                            - key
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                          secret:
+                                            description: secret defines the Secret
+                                              containing data to use for the targets.
+                                            properties:
+                                              key:
+                                                description: The key of the secret
+                                                  to select from.  Must be a valid
+                                                  secret key.
+                                                type: string
+                                              name:
+                                                default: ""
+                                                description: |-
+                                                  Name of the referent.
+                                                  This field is effectively required, but due to backwards compatibility is
+                                                  allowed to be empty. Instances of this type with an empty value here are
+                                                  almost certainly wrong.
+                                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                                type: string
+                                              optional:
+                                                description: Specify whether the Secret
+                                                  or its key must be defined
+                                                type: boolean
+                                            required:
+                                            - key
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                        type: object
+                                      insecureSkipVerify:
+                                        description: insecureSkipVerify defines how
+                                          to disable target certificate validation.
+                                        type: boolean
+                                      keySecret:
+                                        description: keySecret defines the Secret
+                                          containing the client key file for the targets.
+                                        properties:
+                                          key:
+                                            description: The key of the secret to
+                                              select from.  Must be a valid secret
+                                              key.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the Secret
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      maxVersion:
+                                        description: |-
+                                          maxVersion defines the maximum acceptable TLS version.
+
+                                          It requires Prometheus >= v2.41.0 or Thanos >= v0.31.0.
+                                        enum:
+                                        - TLS10
+                                        - TLS11
+                                        - TLS12
+                                        - TLS13
+                                        type: string
+                                      minVersion:
+                                        description: |-
+                                          minVersion defines the minimum acceptable TLS version.
+
+                                          It requires Prometheus >= v2.35.0 or Thanos >= v0.28.0.
+                                        enum:
+                                        - TLS10
+                                        - TLS11
+                                        - TLS12
+                                        - TLS13
+                                        type: string
+                                      serverName:
+                                        description: serverName is used to verify
+                                          the hostname for the targets.
+                                        type: string
+                                    type: object
+                                  tokenUrl:
+                                    description: tokenUrl defines the URL to fetch
+                                      the token from.
+                                    minLength: 1
+                                    type: string
+                                required:
+                                - clientId
+                                - clientSecret
+                                - tokenUrl
+                                type: object
+                              proxyConnectHeader:
+                                additionalProperties:
+                                  items:
+                                    description: SecretKeySelector selects a key of
+                                      a Secret.
+                                    properties:
+                                      key:
+                                        description: The key of the secret to select
+                                          from.  Must be a valid secret key.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the Secret or
+                                          its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  type: array
+                                description: |-
+                                  proxyConnectHeader optionally specifies headers to send to
+                                  proxies during CONNECT requests.
+
+                                  It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              proxyFromEnvironment:
+                                description: |-
+                                  proxyFromEnvironment defines whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+
+                                  It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                                type: boolean
+                              proxyURL:
+                                description: |-
+                                  proxyURL defines an optional proxy URL for HTTP requests.
+                                  If defined, this field takes precedence over `proxyUrl`.
+                                type: string
+                              proxyUrl:
+                                description: proxyUrl defines the HTTP proxy server
+                                  to use.
+                                pattern: ^(http|https|socks5)://.+$
+                                type: string
+                              tlsConfig:
+                                description: |-
+                                  tlsConfig defines the TLS configuration for the client.
+                                  This includes settings for certificates, CA validation, and TLS protocol options.
+                                properties:
+                                  ca:
+                                    description: ca defines the Certificate authority
+                                      used when verifying server certificates.
+                                    properties:
+                                      configMap:
+                                        description: configMap defines the ConfigMap
+                                          containing data to use for the targets.
+                                        properties:
+                                          key:
+                                            description: The key to select.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the ConfigMap
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      secret:
+                                        description: secret defines the Secret containing
+                                          data to use for the targets.
+                                        properties:
+                                          key:
+                                            description: The key of the secret to
+                                              select from.  Must be a valid secret
+                                              key.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the Secret
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                    type: object
+                                  cert:
+                                    description: cert defines the Client certificate
+                                      to present when doing client-authentication.
+                                    properties:
+                                      configMap:
+                                        description: configMap defines the ConfigMap
+                                          containing data to use for the targets.
+                                        properties:
+                                          key:
+                                            description: The key to select.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the ConfigMap
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      secret:
+                                        description: secret defines the Secret containing
+                                          data to use for the targets.
+                                        properties:
+                                          key:
+                                            description: The key of the secret to
+                                              select from.  Must be a valid secret
+                                              key.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the Secret
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                    type: object
+                                  insecureSkipVerify:
+                                    description: insecureSkipVerify defines how to
+                                      disable target certificate validation.
+                                    type: boolean
+                                  keySecret:
+                                    description: keySecret defines the Secret containing
+                                      the client key file for the targets.
+                                    properties:
+                                      key:
+                                        description: The key of the secret to select
+                                          from.  Must be a valid secret key.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the Secret or
+                                          its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  maxVersion:
+                                    description: |-
+                                      maxVersion defines the maximum acceptable TLS version.
+
+                                      It requires Prometheus >= v2.41.0 or Thanos >= v0.31.0.
+                                    enum:
+                                    - TLS10
+                                    - TLS11
+                                    - TLS12
+                                    - TLS13
+                                    type: string
+                                  minVersion:
+                                    description: |-
+                                      minVersion defines the minimum acceptable TLS version.
+
+                                      It requires Prometheus >= v2.35.0 or Thanos >= v0.28.0.
+                                    enum:
+                                    - TLS10
+                                    - TLS11
+                                    - TLS12
+                                    - TLS13
+                                    type: string
+                                  serverName:
+                                    description: serverName is used to verify the
+                                      hostname for the targets.
+                                    type: string
+                                type: object
+                            type: object
+                          sendResolved:
+                            description: sendResolved defines whether or not to notify
+                              about resolved alerts.
+                            type: boolean
+                          text:
+                            description: |-
+                              text defines the message body template for adaptive card notifications.
+                              This contains the detailed content displayed in the Teams adaptive card format.
+                            minLength: 1
+                            type: string
+                          title:
+                            description: |-
+                              title defines the message title template for adaptive card notifications.
+                              This appears as the main heading in the Teams adaptive card.
+                            minLength: 1
+                            type: string
+                          webhookURL:
+                            description: |-
+                              webhookURL defines the MSTeams incoming webhook URL for adaptive card notifications.
+                              This webhook must support the newer adaptive cards format required by Teams flows.
+                            properties:
+                              key:
+                                description: The key of the secret to select from.  Must
+                                  be a valid secret key.
+                                type: string
+                              name:
+                                default: ""
+                                description: |-
+                                  Name of the referent.
+                                  This field is effectively required, but due to backwards compatibility is
+                                  allowed to be empty. Instances of this type with an empty value here are
+                                  almost certainly wrong.
+                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                type: string
+                              optional:
+                                description: Specify whether the Secret or its key
+                                  must be defined
+                                type: boolean
+                            required:
+                            - key
+                            type: object
+                            x-kubernetes-map-type: atomic
+                        type: object
+                      type: array
+                    name:
+                      description: name defines the name of the receiver. Must be
+                        unique across all items from the list.
+                      minLength: 1
+                      type: string
+                    opsgenieConfigs:
+                      description: opsgenieConfigs defines the list of OpsGenie configurations.
+                      items:
+                        description: |-
+                          OpsGenieConfig configures notifications via OpsGenie.
+                          See https://prometheus.io/docs/alerting/latest/configuration/#opsgenie_config
+                        properties:
+                          actions:
+                            description: |-
+                              actions defines a comma separated list of actions that will be available for the alert.
+                              These appear as action buttons in the OpsGenie interface.
+                            type: string
+                          apiKey:
+                            description: |-
+                              apiKey defines the secret's key that contains the OpsGenie API key.
+                              The secret needs to be in the same namespace as the AlertmanagerConfig
+                              object and accessible by the Prometheus Operator.
+                            properties:
+                              key:
+                                description: The key of the secret to select from.  Must
+                                  be a valid secret key.
+                                type: string
+                              name:
+                                default: ""
+                                description: |-
+                                  Name of the referent.
+                                  This field is effectively required, but due to backwards compatibility is
+                                  allowed to be empty. Instances of this type with an empty value here are
+                                  almost certainly wrong.
+                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                type: string
+                              optional:
+                                description: Specify whether the Secret or its key
+                                  must be defined
+                                type: boolean
+                            required:
+                            - key
+                            type: object
+                            x-kubernetes-map-type: atomic
+                          apiURL:
+                            description: |-
+                              apiURL defines the URL to send OpsGenie API requests to.
+                              When not specified, defaults to the standard OpsGenie API endpoint.
+                            type: string
+                          description:
+                            description: |-
+                              description defines the detailed description of the incident.
+                              This provides additional context beyond the message field.
+                            type: string
+                          details:
+                            description: |-
+                              details defines a set of arbitrary key/value pairs that provide further detail about the incident.
+                              These appear as additional fields in the OpsGenie alert.
+                            items:
+                              description: KeyValue defines a (key, value) tuple.
+                              properties:
+                                key:
+                                  description: |-
+                                    key defines the key of the tuple.
+                                    This is the identifier or name part of the key-value pair.
+                                  minLength: 1
+                                  type: string
+                                value:
+                                  description: |-
+                                    value defines the value of the tuple.
+                                    This is the data or content associated with the key.
+                                  type: string
+                              required:
+                              - key
+                              - value
+                              type: object
+                            type: array
+                          entity:
+                            description: |-
+                              entity defines an optional field that can be used to specify which domain alert is related to.
+                              This helps group related alerts together in OpsGenie.
+                            type: string
+                          httpConfig:
+                            description: httpConfig defines the HTTP client configuration
+                              for OpsGenie API requests.
+                            properties:
+                              authorization:
+                                description: |-
+                                  authorization defines the authorization header configuration for the client.
+                                  This is mutually exclusive with BasicAuth and is only available starting from Alertmanager v0.22+.
+                                properties:
+                                  credentials:
+                                    description: credentials defines a key of a Secret
+                                      in the namespace that contains the credentials
+                                      for authentication.
+                                    properties:
+                                      key:
+                                        description: The key of the secret to select
+                                          from.  Must be a valid secret key.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the Secret or
+                                          its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  type:
+                                    description: |-
+                                      type defines the authentication type. The value is case-insensitive.
+
+                                      "Basic" is not a supported value.
+
+                                      Default: "Bearer"
+                                    type: string
+                                type: object
+                              basicAuth:
+                                description: |-
+                                  basicAuth defines the basic authentication credentials for the client.
+                                  This is mutually exclusive with Authorization. If both are defined, BasicAuth takes precedence.
+                                properties:
+                                  password:
+                                    description: |-
+                                      password defines a key of a Secret containing the password for
+                                      authentication.
+                                    properties:
+                                      key:
+                                        description: The key of the secret to select
+                                          from.  Must be a valid secret key.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the Secret or
+                                          its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  username:
+                                    description: |-
+                                      username defines a key of a Secret containing the username for
+                                      authentication.
+                                    properties:
+                                      key:
+                                        description: The key of the secret to select
+                                          from.  Must be a valid secret key.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the Secret or
+                                          its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                type: object
+                              bearerTokenSecret:
+                                description: |-
+                                  bearerTokenSecret defines the secret's key that contains the bearer token to be used by the client
+                                  for authentication.
+                                  The secret needs to be in the same namespace as the AlertmanagerConfig
+                                  object and accessible by the Prometheus Operator.
+                                properties:
+                                  key:
+                                    description: The key of the secret to select from.  Must
+                                      be a valid secret key.
+                                    type: string
+                                  name:
+                                    default: ""
+                                    description: |-
+                                      Name of the referent.
+                                      This field is effectively required, but due to backwards compatibility is
+                                      allowed to be empty. Instances of this type with an empty value here are
+                                      almost certainly wrong.
+                                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                    type: string
+                                  optional:
+                                    description: Specify whether the Secret or its
+                                      key must be defined
+                                    type: boolean
+                                required:
+                                - key
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              enableHttp2:
+                                description: enableHttp2 can be used to disable HTTP2.
+                                type: boolean
+                              followRedirects:
+                                description: |-
+                                  followRedirects specifies whether the client should follow HTTP 3xx redirects.
+                                  When true, the client will automatically follow redirect responses.
+                                type: boolean
+                              noProxy:
+                                description: |-
+                                  noProxy defines a comma-separated string that can contain IPs, CIDR notation, domain names
+                                  that should be excluded from proxying. IP and domain names can
+                                  contain port numbers.
+
+                                  It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                                type: string
+                              oauth2:
+                                description: |-
+                                  oauth2 defines the OAuth2 client credentials used to fetch a token for the targets.
+                                  This enables OAuth2 authentication flow for HTTP requests.
+                                properties:
+                                  clientId:
+                                    description: |-
+                                      clientId defines a key of a Secret or ConfigMap containing the
+                                      OAuth2 client's ID.
+                                    properties:
+                                      configMap:
+                                        description: configMap defines the ConfigMap
+                                          containing data to use for the targets.
+                                        properties:
+                                          key:
+                                            description: The key to select.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the ConfigMap
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      secret:
+                                        description: secret defines the Secret containing
+                                          data to use for the targets.
+                                        properties:
+                                          key:
+                                            description: The key of the secret to
+                                              select from.  Must be a valid secret
+                                              key.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the Secret
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                    type: object
+                                  clientSecret:
+                                    description: |-
+                                      clientSecret defines a key of a Secret containing the OAuth2
+                                      client's secret.
+                                    properties:
+                                      key:
+                                        description: The key of the secret to select
+                                          from.  Must be a valid secret key.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the Secret or
+                                          its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  endpointParams:
+                                    additionalProperties:
+                                      type: string
+                                    description: |-
+                                      endpointParams configures the HTTP parameters to append to the token
+                                      URL.
+                                    type: object
+                                  noProxy:
+                                    description: |-
+                                      noProxy defines a comma-separated string that can contain IPs, CIDR notation, domain names
+                                      that should be excluded from proxying. IP and domain names can
+                                      contain port numbers.
+
+                                      It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                                    type: string
+                                  proxyConnectHeader:
+                                    additionalProperties:
+                                      items:
+                                        description: SecretKeySelector selects a key
+                                          of a Secret.
+                                        properties:
+                                          key:
+                                            description: The key of the secret to
+                                              select from.  Must be a valid secret
+                                              key.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the Secret
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      type: array
+                                    description: |-
+                                      proxyConnectHeader optionally specifies headers to send to
+                                      proxies during CONNECT requests.
+
+                                      It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  proxyFromEnvironment:
+                                    description: |-
+                                      proxyFromEnvironment defines whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+
+                                      It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                                    type: boolean
+                                  proxyUrl:
+                                    description: proxyUrl defines the HTTP proxy server
+                                      to use.
+                                    pattern: ^(http|https|socks5)://.+$
+                                    type: string
+                                  scopes:
+                                    description: scopes defines the OAuth2 scopes
+                                      used for the token request.
+                                    items:
+                                      type: string
+                                    type: array
+                                  tlsConfig:
+                                    description: |-
+                                      tlsConfig defines the TLS configuration to use when connecting to the OAuth2 server.
+                                      It requires Prometheus >= v2.43.0.
+                                    properties:
+                                      ca:
+                                        description: ca defines the Certificate authority
+                                          used when verifying server certificates.
+                                        properties:
+                                          configMap:
+                                            description: configMap defines the ConfigMap
+                                              containing data to use for the targets.
+                                            properties:
+                                              key:
+                                                description: The key to select.
+                                                type: string
+                                              name:
+                                                default: ""
+                                                description: |-
+                                                  Name of the referent.
+                                                  This field is effectively required, but due to backwards compatibility is
+                                                  allowed to be empty. Instances of this type with an empty value here are
+                                                  almost certainly wrong.
+                                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                                type: string
+                                              optional:
+                                                description: Specify whether the ConfigMap
+                                                  or its key must be defined
+                                                type: boolean
+                                            required:
+                                            - key
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                          secret:
+                                            description: secret defines the Secret
+                                              containing data to use for the targets.
+                                            properties:
+                                              key:
+                                                description: The key of the secret
+                                                  to select from.  Must be a valid
+                                                  secret key.
+                                                type: string
+                                              name:
+                                                default: ""
+                                                description: |-
+                                                  Name of the referent.
+                                                  This field is effectively required, but due to backwards compatibility is
+                                                  allowed to be empty. Instances of this type with an empty value here are
+                                                  almost certainly wrong.
+                                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                                type: string
+                                              optional:
+                                                description: Specify whether the Secret
+                                                  or its key must be defined
+                                                type: boolean
+                                            required:
+                                            - key
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                        type: object
+                                      cert:
+                                        description: cert defines the Client certificate
+                                          to present when doing client-authentication.
+                                        properties:
+                                          configMap:
+                                            description: configMap defines the ConfigMap
+                                              containing data to use for the targets.
+                                            properties:
+                                              key:
+                                                description: The key to select.
+                                                type: string
+                                              name:
+                                                default: ""
+                                                description: |-
+                                                  Name of the referent.
+                                                  This field is effectively required, but due to backwards compatibility is
+                                                  allowed to be empty. Instances of this type with an empty value here are
+                                                  almost certainly wrong.
+                                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                                type: string
+                                              optional:
+                                                description: Specify whether the ConfigMap
+                                                  or its key must be defined
+                                                type: boolean
+                                            required:
+                                            - key
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                          secret:
+                                            description: secret defines the Secret
+                                              containing data to use for the targets.
+                                            properties:
+                                              key:
+                                                description: The key of the secret
+                                                  to select from.  Must be a valid
+                                                  secret key.
+                                                type: string
+                                              name:
+                                                default: ""
+                                                description: |-
+                                                  Name of the referent.
+                                                  This field is effectively required, but due to backwards compatibility is
+                                                  allowed to be empty. Instances of this type with an empty value here are
+                                                  almost certainly wrong.
+                                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                                type: string
+                                              optional:
+                                                description: Specify whether the Secret
+                                                  or its key must be defined
+                                                type: boolean
+                                            required:
+                                            - key
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                        type: object
+                                      insecureSkipVerify:
+                                        description: insecureSkipVerify defines how
+                                          to disable target certificate validation.
+                                        type: boolean
+                                      keySecret:
+                                        description: keySecret defines the Secret
+                                          containing the client key file for the targets.
+                                        properties:
+                                          key:
+                                            description: The key of the secret to
+                                              select from.  Must be a valid secret
+                                              key.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the Secret
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      maxVersion:
+                                        description: |-
+                                          maxVersion defines the maximum acceptable TLS version.
+
+                                          It requires Prometheus >= v2.41.0 or Thanos >= v0.31.0.
+                                        enum:
+                                        - TLS10
+                                        - TLS11
+                                        - TLS12
+                                        - TLS13
+                                        type: string
+                                      minVersion:
+                                        description: |-
+                                          minVersion defines the minimum acceptable TLS version.
+
+                                          It requires Prometheus >= v2.35.0 or Thanos >= v0.28.0.
+                                        enum:
+                                        - TLS10
+                                        - TLS11
+                                        - TLS12
+                                        - TLS13
+                                        type: string
+                                      serverName:
+                                        description: serverName is used to verify
+                                          the hostname for the targets.
+                                        type: string
+                                    type: object
+                                  tokenUrl:
+                                    description: tokenUrl defines the URL to fetch
+                                      the token from.
+                                    minLength: 1
+                                    type: string
+                                required:
+                                - clientId
+                                - clientSecret
+                                - tokenUrl
+                                type: object
+                              proxyConnectHeader:
+                                additionalProperties:
+                                  items:
+                                    description: SecretKeySelector selects a key of
+                                      a Secret.
+                                    properties:
+                                      key:
+                                        description: The key of the secret to select
+                                          from.  Must be a valid secret key.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the Secret or
+                                          its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  type: array
+                                description: |-
+                                  proxyConnectHeader optionally specifies headers to send to
+                                  proxies during CONNECT requests.
+
+                                  It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              proxyFromEnvironment:
+                                description: |-
+                                  proxyFromEnvironment defines whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+
+                                  It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                                type: boolean
+                              proxyURL:
+                                description: |-
+                                  proxyURL defines an optional proxy URL for HTTP requests.
+                                  If defined, this field takes precedence over `proxyUrl`.
+                                type: string
+                              proxyUrl:
+                                description: proxyUrl defines the HTTP proxy server
+                                  to use.
+                                pattern: ^(http|https|socks5)://.+$
+                                type: string
+                              tlsConfig:
+                                description: |-
+                                  tlsConfig defines the TLS configuration for the client.
+                                  This includes settings for certificates, CA validation, and TLS protocol options.
+                                properties:
+                                  ca:
+                                    description: ca defines the Certificate authority
+                                      used when verifying server certificates.
+                                    properties:
+                                      configMap:
+                                        description: configMap defines the ConfigMap
+                                          containing data to use for the targets.
+                                        properties:
+                                          key:
+                                            description: The key to select.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the ConfigMap
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      secret:
+                                        description: secret defines the Secret containing
+                                          data to use for the targets.
+                                        properties:
+                                          key:
+                                            description: The key of the secret to
+                                              select from.  Must be a valid secret
+                                              key.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the Secret
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                    type: object
+                                  cert:
+                                    description: cert defines the Client certificate
+                                      to present when doing client-authentication.
+                                    properties:
+                                      configMap:
+                                        description: configMap defines the ConfigMap
+                                          containing data to use for the targets.
+                                        properties:
+                                          key:
+                                            description: The key to select.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the ConfigMap
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      secret:
+                                        description: secret defines the Secret containing
+                                          data to use for the targets.
+                                        properties:
+                                          key:
+                                            description: The key of the secret to
+                                              select from.  Must be a valid secret
+                                              key.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the Secret
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                    type: object
+                                  insecureSkipVerify:
+                                    description: insecureSkipVerify defines how to
+                                      disable target certificate validation.
+                                    type: boolean
+                                  keySecret:
+                                    description: keySecret defines the Secret containing
+                                      the client key file for the targets.
+                                    properties:
+                                      key:
+                                        description: The key of the secret to select
+                                          from.  Must be a valid secret key.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the Secret or
+                                          its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  maxVersion:
+                                    description: |-
+                                      maxVersion defines the maximum acceptable TLS version.
+
+                                      It requires Prometheus >= v2.41.0 or Thanos >= v0.31.0.
+                                    enum:
+                                    - TLS10
+                                    - TLS11
+                                    - TLS12
+                                    - TLS13
+                                    type: string
+                                  minVersion:
+                                    description: |-
+                                      minVersion defines the minimum acceptable TLS version.
+
+                                      It requires Prometheus >= v2.35.0 or Thanos >= v0.28.0.
+                                    enum:
+                                    - TLS10
+                                    - TLS11
+                                    - TLS12
+                                    - TLS13
+                                    type: string
+                                  serverName:
+                                    description: serverName is used to verify the
+                                      hostname for the targets.
+                                    type: string
+                                type: object
+                            type: object
+                          message:
+                            description: |-
+                              message defines the alert text limited to 130 characters.
+                              This appears as the main alert title in OpsGenie.
+                            type: string
+                          note:
+                            description: |-
+                              note defines an additional alert note.
+                              This provides supplementary information about the alert.
+                            type: string
+                          priority:
+                            description: |-
+                              priority defines the priority level of alert.
+                              Possible values are P1, P2, P3, P4, and P5, where P1 is highest priority.
+                            type: string
+                          responders:
+                            description: |-
+                              responders defines the list of responders responsible for notifications.
+                              These determine who gets notified when the alert is created.
+                            items:
+                              description: |-
+                                OpsGenieConfigResponder defines a responder to an incident.
+                                One of `id`, `name` or `username` has to be defined.
+                              properties:
+                                id:
+                                  description: |-
+                                    id defines the unique identifier of the responder.
+                                    This corresponds to the responder's ID within OpsGenie.
+                                  type: string
+                                name:
+                                  description: |-
+                                    name defines the display name of the responder.
+                                    This is used when the responder is identified by name rather than ID.
+                                  type: string
+                                type:
+                                  description: |-
+                                    type defines the type of responder.
+                                    Valid values include "user", "team", "schedule", and "escalation".
+                                    This determines how OpsGenie interprets the other identifier fields.
+                                  enum:
+                                  - team
+                                  - teams
+                                  - user
+                                  - escalation
+                                  - schedule
+                                  minLength: 1
+                                  type: string
+                                username:
+                                  description: |-
+                                    username defines the username of the responder.
+                                    This is typically used for user-type responders when identifying by username.
+                                  type: string
+                              required:
+                              - type
+                              type: object
+                            type: array
+                          sendResolved:
+                            description: sendResolved defines whether or not to notify
+                              about resolved alerts.
+                            type: boolean
+                          source:
+                            description: |-
+                              source defines the backlink to the sender of the notification.
+                              This helps identify where the alert originated from.
+                            type: string
+                          tags:
+                            description: |-
+                              tags defines a comma separated list of tags attached to the notifications.
+                              These help categorize and filter alerts within OpsGenie.
+                            type: string
+                          updateAlerts:
+                            description: |-
+                              updateAlerts defines Whether to update message and description of the alert in OpsGenie if it already exists
+                              By default, the alert is never updated in OpsGenie, the new message only appears in activity log.
+                            type: boolean
+                        type: object
+                      type: array
+                    pagerdutyConfigs:
+                      description: pagerdutyConfigs defines the List of PagerDuty
+                        configurations.
+                      items:
+                        description: |-
+                          PagerDutyConfig configures notifications via PagerDuty.
+                          See https://prometheus.io/docs/alerting/latest/configuration/#pagerduty_config
+                        properties:
+                          class:
+                            description: class defines the class/type of the event.
+                            type: string
+                          client:
+                            description: client defines the client identification.
+                            type: string
+                          clientURL:
+                            description: clientURL defines the backlink to the sender
+                              of notification.
+                            type: string
+                          component:
+                            description: component defines the part or component of
+                              the affected system that is broken.
+                            type: string
+                          description:
+                            description: description of the incident.
+                            type: string
+                          details:
+                            description: details defines the arbitrary key/value pairs
+                              that provide further detail about the incident.
+                            items:
+                              description: KeyValue defines a (key, value) tuple.
+                              properties:
+                                key:
+                                  description: |-
+                                    key defines the key of the tuple.
+                                    This is the identifier or name part of the key-value pair.
+                                  minLength: 1
+                                  type: string
+                                value:
+                                  description: |-
+                                    value defines the value of the tuple.
+                                    This is the data or content associated with the key.
+                                  type: string
+                              required:
+                              - key
+                              - value
+                              type: object
+                            type: array
+                          group:
+                            description: group defines a cluster or grouping of sources.
+                            type: string
+                          httpConfig:
+                            description: httpConfig defines the HTTP client configuration.
+                            properties:
+                              authorization:
+                                description: |-
+                                  authorization defines the authorization header configuration for the client.
+                                  This is mutually exclusive with BasicAuth and is only available starting from Alertmanager v0.22+.
+                                properties:
+                                  credentials:
+                                    description: credentials defines a key of a Secret
+                                      in the namespace that contains the credentials
+                                      for authentication.
+                                    properties:
+                                      key:
+                                        description: The key of the secret to select
+                                          from.  Must be a valid secret key.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the Secret or
+                                          its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  type:
+                                    description: |-
+                                      type defines the authentication type. The value is case-insensitive.
+
+                                      "Basic" is not a supported value.
+
+                                      Default: "Bearer"
+                                    type: string
+                                type: object
+                              basicAuth:
+                                description: |-
+                                  basicAuth defines the basic authentication credentials for the client.
+                                  This is mutually exclusive with Authorization. If both are defined, BasicAuth takes precedence.
+                                properties:
+                                  password:
+                                    description: |-
+                                      password defines a key of a Secret containing the password for
+                                      authentication.
+                                    properties:
+                                      key:
+                                        description: The key of the secret to select
+                                          from.  Must be a valid secret key.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the Secret or
+                                          its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  username:
+                                    description: |-
+                                      username defines a key of a Secret containing the username for
+                                      authentication.
+                                    properties:
+                                      key:
+                                        description: The key of the secret to select
+                                          from.  Must be a valid secret key.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the Secret or
+                                          its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                type: object
+                              bearerTokenSecret:
+                                description: |-
+                                  bearerTokenSecret defines the secret's key that contains the bearer token to be used by the client
+                                  for authentication.
+                                  The secret needs to be in the same namespace as the AlertmanagerConfig
+                                  object and accessible by the Prometheus Operator.
+                                properties:
+                                  key:
+                                    description: The key of the secret to select from.  Must
+                                      be a valid secret key.
+                                    type: string
+                                  name:
+                                    default: ""
+                                    description: |-
+                                      Name of the referent.
+                                      This field is effectively required, but due to backwards compatibility is
+                                      allowed to be empty. Instances of this type with an empty value here are
+                                      almost certainly wrong.
+                                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                    type: string
+                                  optional:
+                                    description: Specify whether the Secret or its
+                                      key must be defined
+                                    type: boolean
+                                required:
+                                - key
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              enableHttp2:
+                                description: enableHttp2 can be used to disable HTTP2.
+                                type: boolean
+                              followRedirects:
+                                description: |-
+                                  followRedirects specifies whether the client should follow HTTP 3xx redirects.
+                                  When true, the client will automatically follow redirect responses.
+                                type: boolean
+                              noProxy:
+                                description: |-
+                                  noProxy defines a comma-separated string that can contain IPs, CIDR notation, domain names
+                                  that should be excluded from proxying. IP and domain names can
+                                  contain port numbers.
+
+                                  It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                                type: string
+                              oauth2:
+                                description: |-
+                                  oauth2 defines the OAuth2 client credentials used to fetch a token for the targets.
+                                  This enables OAuth2 authentication flow for HTTP requests.
+                                properties:
+                                  clientId:
+                                    description: |-
+                                      clientId defines a key of a Secret or ConfigMap containing the
+                                      OAuth2 client's ID.
+                                    properties:
+                                      configMap:
+                                        description: configMap defines the ConfigMap
+                                          containing data to use for the targets.
+                                        properties:
+                                          key:
+                                            description: The key to select.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the ConfigMap
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      secret:
+                                        description: secret defines the Secret containing
+                                          data to use for the targets.
+                                        properties:
+                                          key:
+                                            description: The key of the secret to
+                                              select from.  Must be a valid secret
+                                              key.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the Secret
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                    type: object
+                                  clientSecret:
+                                    description: |-
+                                      clientSecret defines a key of a Secret containing the OAuth2
+                                      client's secret.
+                                    properties:
+                                      key:
+                                        description: The key of the secret to select
+                                          from.  Must be a valid secret key.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the Secret or
+                                          its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  endpointParams:
+                                    additionalProperties:
+                                      type: string
+                                    description: |-
+                                      endpointParams configures the HTTP parameters to append to the token
+                                      URL.
+                                    type: object
+                                  noProxy:
+                                    description: |-
+                                      noProxy defines a comma-separated string that can contain IPs, CIDR notation, domain names
+                                      that should be excluded from proxying. IP and domain names can
+                                      contain port numbers.
+
+                                      It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                                    type: string
+                                  proxyConnectHeader:
+                                    additionalProperties:
+                                      items:
+                                        description: SecretKeySelector selects a key
+                                          of a Secret.
+                                        properties:
+                                          key:
+                                            description: The key of the secret to
+                                              select from.  Must be a valid secret
+                                              key.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the Secret
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      type: array
+                                    description: |-
+                                      proxyConnectHeader optionally specifies headers to send to
+                                      proxies during CONNECT requests.
+
+                                      It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  proxyFromEnvironment:
+                                    description: |-
+                                      proxyFromEnvironment defines whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+
+                                      It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                                    type: boolean
+                                  proxyUrl:
+                                    description: proxyUrl defines the HTTP proxy server
+                                      to use.
+                                    pattern: ^(http|https|socks5)://.+$
+                                    type: string
+                                  scopes:
+                                    description: scopes defines the OAuth2 scopes
+                                      used for the token request.
+                                    items:
+                                      type: string
+                                    type: array
+                                  tlsConfig:
+                                    description: |-
+                                      tlsConfig defines the TLS configuration to use when connecting to the OAuth2 server.
+                                      It requires Prometheus >= v2.43.0.
+                                    properties:
+                                      ca:
+                                        description: ca defines the Certificate authority
+                                          used when verifying server certificates.
+                                        properties:
+                                          configMap:
+                                            description: configMap defines the ConfigMap
+                                              containing data to use for the targets.
+                                            properties:
+                                              key:
+                                                description: The key to select.
+                                                type: string
+                                              name:
+                                                default: ""
+                                                description: |-
+                                                  Name of the referent.
+                                                  This field is effectively required, but due to backwards compatibility is
+                                                  allowed to be empty. Instances of this type with an empty value here are
+                                                  almost certainly wrong.
+                                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                                type: string
+                                              optional:
+                                                description: Specify whether the ConfigMap
+                                                  or its key must be defined
+                                                type: boolean
+                                            required:
+                                            - key
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                          secret:
+                                            description: secret defines the Secret
+                                              containing data to use for the targets.
+                                            properties:
+                                              key:
+                                                description: The key of the secret
+                                                  to select from.  Must be a valid
+                                                  secret key.
+                                                type: string
+                                              name:
+                                                default: ""
+                                                description: |-
+                                                  Name of the referent.
+                                                  This field is effectively required, but due to backwards compatibility is
+                                                  allowed to be empty. Instances of this type with an empty value here are
+                                                  almost certainly wrong.
+                                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                                type: string
+                                              optional:
+                                                description: Specify whether the Secret
+                                                  or its key must be defined
+                                                type: boolean
+                                            required:
+                                            - key
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                        type: object
+                                      cert:
+                                        description: cert defines the Client certificate
+                                          to present when doing client-authentication.
+                                        properties:
+                                          configMap:
+                                            description: configMap defines the ConfigMap
+                                              containing data to use for the targets.
+                                            properties:
+                                              key:
+                                                description: The key to select.
+                                                type: string
+                                              name:
+                                                default: ""
+                                                description: |-
+                                                  Name of the referent.
+                                                  This field is effectively required, but due to backwards compatibility is
+                                                  allowed to be empty. Instances of this type with an empty value here are
+                                                  almost certainly wrong.
+                                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                                type: string
+                                              optional:
+                                                description: Specify whether the ConfigMap
+                                                  or its key must be defined
+                                                type: boolean
+                                            required:
+                                            - key
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                          secret:
+                                            description: secret defines the Secret
+                                              containing data to use for the targets.
+                                            properties:
+                                              key:
+                                                description: The key of the secret
+                                                  to select from.  Must be a valid
+                                                  secret key.
+                                                type: string
+                                              name:
+                                                default: ""
+                                                description: |-
+                                                  Name of the referent.
+                                                  This field is effectively required, but due to backwards compatibility is
+                                                  allowed to be empty. Instances of this type with an empty value here are
+                                                  almost certainly wrong.
+                                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                                type: string
+                                              optional:
+                                                description: Specify whether the Secret
+                                                  or its key must be defined
+                                                type: boolean
+                                            required:
+                                            - key
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                        type: object
+                                      insecureSkipVerify:
+                                        description: insecureSkipVerify defines how
+                                          to disable target certificate validation.
+                                        type: boolean
+                                      keySecret:
+                                        description: keySecret defines the Secret
+                                          containing the client key file for the targets.
+                                        properties:
+                                          key:
+                                            description: The key of the secret to
+                                              select from.  Must be a valid secret
+                                              key.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the Secret
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      maxVersion:
+                                        description: |-
+                                          maxVersion defines the maximum acceptable TLS version.
+
+                                          It requires Prometheus >= v2.41.0 or Thanos >= v0.31.0.
+                                        enum:
+                                        - TLS10
+                                        - TLS11
+                                        - TLS12
+                                        - TLS13
+                                        type: string
+                                      minVersion:
+                                        description: |-
+                                          minVersion defines the minimum acceptable TLS version.
+
+                                          It requires Prometheus >= v2.35.0 or Thanos >= v0.28.0.
+                                        enum:
+                                        - TLS10
+                                        - TLS11
+                                        - TLS12
+                                        - TLS13
+                                        type: string
+                                      serverName:
+                                        description: serverName is used to verify
+                                          the hostname for the targets.
+                                        type: string
+                                    type: object
+                                  tokenUrl:
+                                    description: tokenUrl defines the URL to fetch
+                                      the token from.
+                                    minLength: 1
+                                    type: string
+                                required:
+                                - clientId
+                                - clientSecret
+                                - tokenUrl
+                                type: object
+                              proxyConnectHeader:
+                                additionalProperties:
+                                  items:
+                                    description: SecretKeySelector selects a key of
+                                      a Secret.
+                                    properties:
+                                      key:
+                                        description: The key of the secret to select
+                                          from.  Must be a valid secret key.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the Secret or
+                                          its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  type: array
+                                description: |-
+                                  proxyConnectHeader optionally specifies headers to send to
+                                  proxies during CONNECT requests.
+
+                                  It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              proxyFromEnvironment:
+                                description: |-
+                                  proxyFromEnvironment defines whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+
+                                  It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                                type: boolean
+                              proxyURL:
+                                description: |-
+                                  proxyURL defines an optional proxy URL for HTTP requests.
+                                  If defined, this field takes precedence over `proxyUrl`.
+                                type: string
+                              proxyUrl:
+                                description: proxyUrl defines the HTTP proxy server
+                                  to use.
+                                pattern: ^(http|https|socks5)://.+$
+                                type: string
+                              tlsConfig:
+                                description: |-
+                                  tlsConfig defines the TLS configuration for the client.
+                                  This includes settings for certificates, CA validation, and TLS protocol options.
+                                properties:
+                                  ca:
+                                    description: ca defines the Certificate authority
+                                      used when verifying server certificates.
+                                    properties:
+                                      configMap:
+                                        description: configMap defines the ConfigMap
+                                          containing data to use for the targets.
+                                        properties:
+                                          key:
+                                            description: The key to select.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the ConfigMap
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      secret:
+                                        description: secret defines the Secret containing
+                                          data to use for the targets.
+                                        properties:
+                                          key:
+                                            description: The key of the secret to
+                                              select from.  Must be a valid secret
+                                              key.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the Secret
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                    type: object
+                                  cert:
+                                    description: cert defines the Client certificate
+                                      to present when doing client-authentication.
+                                    properties:
+                                      configMap:
+                                        description: configMap defines the ConfigMap
+                                          containing data to use for the targets.
+                                        properties:
+                                          key:
+                                            description: The key to select.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the ConfigMap
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      secret:
+                                        description: secret defines the Secret containing
+                                          data to use for the targets.
+                                        properties:
+                                          key:
+                                            description: The key of the secret to
+                                              select from.  Must be a valid secret
+                                              key.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the Secret
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                    type: object
+                                  insecureSkipVerify:
+                                    description: insecureSkipVerify defines how to
+                                      disable target certificate validation.
+                                    type: boolean
+                                  keySecret:
+                                    description: keySecret defines the Secret containing
+                                      the client key file for the targets.
+                                    properties:
+                                      key:
+                                        description: The key of the secret to select
+                                          from.  Must be a valid secret key.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the Secret or
+                                          its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  maxVersion:
+                                    description: |-
+                                      maxVersion defines the maximum acceptable TLS version.
+
+                                      It requires Prometheus >= v2.41.0 or Thanos >= v0.31.0.
+                                    enum:
+                                    - TLS10
+                                    - TLS11
+                                    - TLS12
+                                    - TLS13
+                                    type: string
+                                  minVersion:
+                                    description: |-
+                                      minVersion defines the minimum acceptable TLS version.
+
+                                      It requires Prometheus >= v2.35.0 or Thanos >= v0.28.0.
+                                    enum:
+                                    - TLS10
+                                    - TLS11
+                                    - TLS12
+                                    - TLS13
+                                    type: string
+                                  serverName:
+                                    description: serverName is used to verify the
+                                      hostname for the targets.
+                                    type: string
+                                type: object
+                            type: object
+                          pagerDutyImageConfigs:
+                            description: pagerDutyImageConfigs defines a list of image
+                              details to attach that provide further detail about
+                              an incident.
+                            items:
+                              description: PagerDutyImageConfig attaches images to
+                                an incident
+                              properties:
+                                alt:
+                                  description: alt is the optional alternative text
+                                    for the image.
+                                  type: string
+                                href:
+                                  description: href defines the optional URL; makes
+                                    the image a clickable link.
+                                  type: string
+                                src:
+                                  description: src of the image being attached to
+                                    the incident
+                                  type: string
+                              type: object
+                            type: array
+                          pagerDutyLinkConfigs:
+                            description: pagerDutyLinkConfigs defines a list of link
+                              details to attach that provide further detail about
+                              an incident.
+                            items:
+                              description: PagerDutyLinkConfig attaches text links
+                                to an incident
+                              properties:
+                                alt:
+                                  description: alt defines the text that describes
+                                    the purpose of the link, and can be used as the
+                                    link's text.
+                                  type: string
+                                href:
+                                  description: href defines the URL of the link to
+                                    be attached
+                                  type: string
+                              type: object
+                            type: array
+                          routingKey:
+                            description: |-
+                              routingKey defines the secret's key that contains the PagerDuty integration key (when using
+                              Events API v2). Either this field or `serviceKey` needs to be defined.
+                              The secret needs to be in the same namespace as the AlertmanagerConfig
+                              object and accessible by the Prometheus Operator.
+                            properties:
+                              key:
+                                description: The key of the secret to select from.  Must
+                                  be a valid secret key.
+                                type: string
+                              name:
+                                default: ""
+                                description: |-
+                                  Name of the referent.
+                                  This field is effectively required, but due to backwards compatibility is
+                                  allowed to be empty. Instances of this type with an empty value here are
+                                  almost certainly wrong.
+                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                type: string
+                              optional:
+                                description: Specify whether the Secret or its key
+                                  must be defined
+                                type: boolean
+                            required:
+                            - key
+                            type: object
+                            x-kubernetes-map-type: atomic
+                          sendResolved:
+                            description: sendResolved defines whether or not to notify
+                              about resolved alerts.
+                            type: boolean
+                          serviceKey:
+                            description: |-
+                              serviceKey defines the secret's key that contains the PagerDuty service key (when using
+                              integration type "Prometheus"). Either this field or `routingKey` needs to
+                              be defined.
+                              The secret needs to be in the same namespace as the AlertmanagerConfig
+                              object and accessible by the Prometheus Operator.
+                            properties:
+                              key:
+                                description: The key of the secret to select from.  Must
+                                  be a valid secret key.
+                                type: string
+                              name:
+                                default: ""
+                                description: |-
+                                  Name of the referent.
+                                  This field is effectively required, but due to backwards compatibility is
+                                  allowed to be empty. Instances of this type with an empty value here are
+                                  almost certainly wrong.
+                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                type: string
+                              optional:
+                                description: Specify whether the Secret or its key
+                                  must be defined
+                                type: boolean
+                            required:
+                            - key
+                            type: object
+                            x-kubernetes-map-type: atomic
+                          severity:
+                            description: severity of the incident.
+                            type: string
+                          source:
+                            description: source defines the unique location of the
+                              affected system.
+                            type: string
+                          url:
+                            description: url defines the URL to send requests to.
+                            type: string
+                        type: object
+                      type: array
+                    pushoverConfigs:
+                      description: pushoverConfigs defines the list of Pushover configurations.
+                      items:
+                        description: |-
+                          PushoverConfig configures notifications via Pushover.
+                          See https://prometheus.io/docs/alerting/latest/configuration/#pushover_config
+                        properties:
+                          device:
+                            description: |-
+                              device defines the name of a specific device to send the notification to.
+                              If not specified, the notification is sent to all user's devices.
+                            type: string
+                          expire:
+                            description: |-
+                              expire defines how long your notification will continue to be retried for,
+                              unless the user acknowledges the notification. Only applies to priority 2 notifications.
+                            pattern: ^(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?$
+                            type: string
+                          html:
+                            description: |-
+                              html defines whether notification message is HTML or plain text.
+                              When true, the message can include HTML formatting tags.
+                            type: boolean
+                          httpConfig:
+                            description: httpConfig defines the HTTP client configuration
+                              for Pushover API requests.
+                            properties:
+                              authorization:
+                                description: |-
+                                  authorization defines the authorization header configuration for the client.
+                                  This is mutually exclusive with BasicAuth and is only available starting from Alertmanager v0.22+.
+                                properties:
+                                  credentials:
+                                    description: credentials defines a key of a Secret
+                                      in the namespace that contains the credentials
+                                      for authentication.
+                                    properties:
+                                      key:
+                                        description: The key of the secret to select
+                                          from.  Must be a valid secret key.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the Secret or
+                                          its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  type:
+                                    description: |-
+                                      type defines the authentication type. The value is case-insensitive.
+
+                                      "Basic" is not a supported value.
+
+                                      Default: "Bearer"
+                                    type: string
+                                type: object
+                              basicAuth:
+                                description: |-
+                                  basicAuth defines the basic authentication credentials for the client.
+                                  This is mutually exclusive with Authorization. If both are defined, BasicAuth takes precedence.
+                                properties:
+                                  password:
+                                    description: |-
+                                      password defines a key of a Secret containing the password for
+                                      authentication.
+                                    properties:
+                                      key:
+                                        description: The key of the secret to select
+                                          from.  Must be a valid secret key.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the Secret or
+                                          its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  username:
+                                    description: |-
+                                      username defines a key of a Secret containing the username for
+                                      authentication.
+                                    properties:
+                                      key:
+                                        description: The key of the secret to select
+                                          from.  Must be a valid secret key.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the Secret or
+                                          its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                type: object
+                              bearerTokenSecret:
+                                description: |-
+                                  bearerTokenSecret defines the secret's key that contains the bearer token to be used by the client
+                                  for authentication.
+                                  The secret needs to be in the same namespace as the AlertmanagerConfig
+                                  object and accessible by the Prometheus Operator.
+                                properties:
+                                  key:
+                                    description: The key of the secret to select from.  Must
+                                      be a valid secret key.
+                                    type: string
+                                  name:
+                                    default: ""
+                                    description: |-
+                                      Name of the referent.
+                                      This field is effectively required, but due to backwards compatibility is
+                                      allowed to be empty. Instances of this type with an empty value here are
+                                      almost certainly wrong.
+                                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                    type: string
+                                  optional:
+                                    description: Specify whether the Secret or its
+                                      key must be defined
+                                    type: boolean
+                                required:
+                                - key
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              enableHttp2:
+                                description: enableHttp2 can be used to disable HTTP2.
+                                type: boolean
+                              followRedirects:
+                                description: |-
+                                  followRedirects specifies whether the client should follow HTTP 3xx redirects.
+                                  When true, the client will automatically follow redirect responses.
+                                type: boolean
+                              noProxy:
+                                description: |-
+                                  noProxy defines a comma-separated string that can contain IPs, CIDR notation, domain names
+                                  that should be excluded from proxying. IP and domain names can
+                                  contain port numbers.
+
+                                  It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                                type: string
+                              oauth2:
+                                description: |-
+                                  oauth2 defines the OAuth2 client credentials used to fetch a token for the targets.
+                                  This enables OAuth2 authentication flow for HTTP requests.
+                                properties:
+                                  clientId:
+                                    description: |-
+                                      clientId defines a key of a Secret or ConfigMap containing the
+                                      OAuth2 client's ID.
+                                    properties:
+                                      configMap:
+                                        description: configMap defines the ConfigMap
+                                          containing data to use for the targets.
+                                        properties:
+                                          key:
+                                            description: The key to select.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the ConfigMap
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      secret:
+                                        description: secret defines the Secret containing
+                                          data to use for the targets.
+                                        properties:
+                                          key:
+                                            description: The key of the secret to
+                                              select from.  Must be a valid secret
+                                              key.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the Secret
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                    type: object
+                                  clientSecret:
+                                    description: |-
+                                      clientSecret defines a key of a Secret containing the OAuth2
+                                      client's secret.
+                                    properties:
+                                      key:
+                                        description: The key of the secret to select
+                                          from.  Must be a valid secret key.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the Secret or
+                                          its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  endpointParams:
+                                    additionalProperties:
+                                      type: string
+                                    description: |-
+                                      endpointParams configures the HTTP parameters to append to the token
+                                      URL.
+                                    type: object
+                                  noProxy:
+                                    description: |-
+                                      noProxy defines a comma-separated string that can contain IPs, CIDR notation, domain names
+                                      that should be excluded from proxying. IP and domain names can
+                                      contain port numbers.
+
+                                      It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                                    type: string
+                                  proxyConnectHeader:
+                                    additionalProperties:
+                                      items:
+                                        description: SecretKeySelector selects a key
+                                          of a Secret.
+                                        properties:
+                                          key:
+                                            description: The key of the secret to
+                                              select from.  Must be a valid secret
+                                              key.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the Secret
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      type: array
+                                    description: |-
+                                      proxyConnectHeader optionally specifies headers to send to
+                                      proxies during CONNECT requests.
+
+                                      It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  proxyFromEnvironment:
+                                    description: |-
+                                      proxyFromEnvironment defines whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+
+                                      It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                                    type: boolean
+                                  proxyUrl:
+                                    description: proxyUrl defines the HTTP proxy server
+                                      to use.
+                                    pattern: ^(http|https|socks5)://.+$
+                                    type: string
+                                  scopes:
+                                    description: scopes defines the OAuth2 scopes
+                                      used for the token request.
+                                    items:
+                                      type: string
+                                    type: array
+                                  tlsConfig:
+                                    description: |-
+                                      tlsConfig defines the TLS configuration to use when connecting to the OAuth2 server.
+                                      It requires Prometheus >= v2.43.0.
+                                    properties:
+                                      ca:
+                                        description: ca defines the Certificate authority
+                                          used when verifying server certificates.
+                                        properties:
+                                          configMap:
+                                            description: configMap defines the ConfigMap
+                                              containing data to use for the targets.
+                                            properties:
+                                              key:
+                                                description: The key to select.
+                                                type: string
+                                              name:
+                                                default: ""
+                                                description: |-
+                                                  Name of the referent.
+                                                  This field is effectively required, but due to backwards compatibility is
+                                                  allowed to be empty. Instances of this type with an empty value here are
+                                                  almost certainly wrong.
+                                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                                type: string
+                                              optional:
+                                                description: Specify whether the ConfigMap
+                                                  or its key must be defined
+                                                type: boolean
+                                            required:
+                                            - key
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                          secret:
+                                            description: secret defines the Secret
+                                              containing data to use for the targets.
+                                            properties:
+                                              key:
+                                                description: The key of the secret
+                                                  to select from.  Must be a valid
+                                                  secret key.
+                                                type: string
+                                              name:
+                                                default: ""
+                                                description: |-
+                                                  Name of the referent.
+                                                  This field is effectively required, but due to backwards compatibility is
+                                                  allowed to be empty. Instances of this type with an empty value here are
+                                                  almost certainly wrong.
+                                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                                type: string
+                                              optional:
+                                                description: Specify whether the Secret
+                                                  or its key must be defined
+                                                type: boolean
+                                            required:
+                                            - key
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                        type: object
+                                      cert:
+                                        description: cert defines the Client certificate
+                                          to present when doing client-authentication.
+                                        properties:
+                                          configMap:
+                                            description: configMap defines the ConfigMap
+                                              containing data to use for the targets.
+                                            properties:
+                                              key:
+                                                description: The key to select.
+                                                type: string
+                                              name:
+                                                default: ""
+                                                description: |-
+                                                  Name of the referent.
+                                                  This field is effectively required, but due to backwards compatibility is
+                                                  allowed to be empty. Instances of this type with an empty value here are
+                                                  almost certainly wrong.
+                                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                                type: string
+                                              optional:
+                                                description: Specify whether the ConfigMap
+                                                  or its key must be defined
+                                                type: boolean
+                                            required:
+                                            - key
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                          secret:
+                                            description: secret defines the Secret
+                                              containing data to use for the targets.
+                                            properties:
+                                              key:
+                                                description: The key of the secret
+                                                  to select from.  Must be a valid
+                                                  secret key.
+                                                type: string
+                                              name:
+                                                default: ""
+                                                description: |-
+                                                  Name of the referent.
+                                                  This field is effectively required, but due to backwards compatibility is
+                                                  allowed to be empty. Instances of this type with an empty value here are
+                                                  almost certainly wrong.
+                                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                                type: string
+                                              optional:
+                                                description: Specify whether the Secret
+                                                  or its key must be defined
+                                                type: boolean
+                                            required:
+                                            - key
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                        type: object
+                                      insecureSkipVerify:
+                                        description: insecureSkipVerify defines how
+                                          to disable target certificate validation.
+                                        type: boolean
+                                      keySecret:
+                                        description: keySecret defines the Secret
+                                          containing the client key file for the targets.
+                                        properties:
+                                          key:
+                                            description: The key of the secret to
+                                              select from.  Must be a valid secret
+                                              key.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the Secret
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      maxVersion:
+                                        description: |-
+                                          maxVersion defines the maximum acceptable TLS version.
+
+                                          It requires Prometheus >= v2.41.0 or Thanos >= v0.31.0.
+                                        enum:
+                                        - TLS10
+                                        - TLS11
+                                        - TLS12
+                                        - TLS13
+                                        type: string
+                                      minVersion:
+                                        description: |-
+                                          minVersion defines the minimum acceptable TLS version.
+
+                                          It requires Prometheus >= v2.35.0 or Thanos >= v0.28.0.
+                                        enum:
+                                        - TLS10
+                                        - TLS11
+                                        - TLS12
+                                        - TLS13
+                                        type: string
+                                      serverName:
+                                        description: serverName is used to verify
+                                          the hostname for the targets.
+                                        type: string
+                                    type: object
+                                  tokenUrl:
+                                    description: tokenUrl defines the URL to fetch
+                                      the token from.
+                                    minLength: 1
+                                    type: string
+                                required:
+                                - clientId
+                                - clientSecret
+                                - tokenUrl
+                                type: object
+                              proxyConnectHeader:
+                                additionalProperties:
+                                  items:
+                                    description: SecretKeySelector selects a key of
+                                      a Secret.
+                                    properties:
+                                      key:
+                                        description: The key of the secret to select
+                                          from.  Must be a valid secret key.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the Secret or
+                                          its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  type: array
+                                description: |-
+                                  proxyConnectHeader optionally specifies headers to send to
+                                  proxies during CONNECT requests.
+
+                                  It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              proxyFromEnvironment:
+                                description: |-
+                                  proxyFromEnvironment defines whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+
+                                  It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                                type: boolean
+                              proxyURL:
+                                description: |-
+                                  proxyURL defines an optional proxy URL for HTTP requests.
+                                  If defined, this field takes precedence over `proxyUrl`.
+                                type: string
+                              proxyUrl:
+                                description: proxyUrl defines the HTTP proxy server
+                                  to use.
+                                pattern: ^(http|https|socks5)://.+$
+                                type: string
+                              tlsConfig:
+                                description: |-
+                                  tlsConfig defines the TLS configuration for the client.
+                                  This includes settings for certificates, CA validation, and TLS protocol options.
+                                properties:
+                                  ca:
+                                    description: ca defines the Certificate authority
+                                      used when verifying server certificates.
+                                    properties:
+                                      configMap:
+                                        description: configMap defines the ConfigMap
+                                          containing data to use for the targets.
+                                        properties:
+                                          key:
+                                            description: The key to select.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the ConfigMap
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      secret:
+                                        description: secret defines the Secret containing
+                                          data to use for the targets.
+                                        properties:
+                                          key:
+                                            description: The key of the secret to
+                                              select from.  Must be a valid secret
+                                              key.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the Secret
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                    type: object
+                                  cert:
+                                    description: cert defines the Client certificate
+                                      to present when doing client-authentication.
+                                    properties:
+                                      configMap:
+                                        description: configMap defines the ConfigMap
+                                          containing data to use for the targets.
+                                        properties:
+                                          key:
+                                            description: The key to select.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the ConfigMap
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      secret:
+                                        description: secret defines the Secret containing
+                                          data to use for the targets.
+                                        properties:
+                                          key:
+                                            description: The key of the secret to
+                                              select from.  Must be a valid secret
+                                              key.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the Secret
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                    type: object
+                                  insecureSkipVerify:
+                                    description: insecureSkipVerify defines how to
+                                      disable target certificate validation.
+                                    type: boolean
+                                  keySecret:
+                                    description: keySecret defines the Secret containing
+                                      the client key file for the targets.
+                                    properties:
+                                      key:
+                                        description: The key of the secret to select
+                                          from.  Must be a valid secret key.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the Secret or
+                                          its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  maxVersion:
+                                    description: |-
+                                      maxVersion defines the maximum acceptable TLS version.
+
+                                      It requires Prometheus >= v2.41.0 or Thanos >= v0.31.0.
+                                    enum:
+                                    - TLS10
+                                    - TLS11
+                                    - TLS12
+                                    - TLS13
+                                    type: string
+                                  minVersion:
+                                    description: |-
+                                      minVersion defines the minimum acceptable TLS version.
+
+                                      It requires Prometheus >= v2.35.0 or Thanos >= v0.28.0.
+                                    enum:
+                                    - TLS10
+                                    - TLS11
+                                    - TLS12
+                                    - TLS13
+                                    type: string
+                                  serverName:
+                                    description: serverName is used to verify the
+                                      hostname for the targets.
+                                    type: string
+                                type: object
+                            type: object
+                          message:
+                            description: |-
+                              message defines the notification message content.
+                              This is the main body text of the Pushover notification.
+                            type: string
+                          monospace:
+                            description: |-
+                              monospace optional HTML/monospace formatting for the message, see https://pushover.net/api#html
+                              html and monospace formatting are mutually exclusive.
+                            type: boolean
+                          priority:
+                            description: |-
+                              priority defines the notification priority level.
+                              See https://pushover.net/api#priority for valid values and behavior.
+                            type: string
+                          retry:
+                            description: |-
+                              retry defines how often the Pushover servers will send the same notification to the user.
+                              Must be at least 30 seconds. Only applies to priority 2 notifications.
+                            pattern: ^(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?$
+                            type: string
+                          sendResolved:
+                            description: sendResolved defines whether or not to notify
+                              about resolved alerts.
+                            type: boolean
+                          sound:
+                            description: |-
+                              sound defines the name of one of the sounds supported by device clients.
+                              This overrides the user's default sound choice for this notification.
+                            type: string
+                          title:
+                            description: |-
+                              title defines the notification title displayed in the Pushover message.
+                              This appears as the bold header text in the notification.
+                            type: string
+                          token:
+                            description: |-
+                              token defines the secret's key that contains the registered application's API token.
+                              See https://pushover.net/apps for application registration.
+                              The secret needs to be in the same namespace as the AlertmanagerConfig
+                              object and accessible by the Prometheus Operator.
+                              Either `token` or `tokenFile` is required.
+                            properties:
+                              key:
+                                description: The key of the secret to select from.  Must
+                                  be a valid secret key.
+                                type: string
+                              name:
+                                default: ""
+                                description: |-
+                                  Name of the referent.
+                                  This field is effectively required, but due to backwards compatibility is
+                                  allowed to be empty. Instances of this type with an empty value here are
+                                  almost certainly wrong.
+                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                type: string
+                              optional:
+                                description: Specify whether the Secret or its key
+                                  must be defined
+                                type: boolean
+                            required:
+                            - key
+                            type: object
+                            x-kubernetes-map-type: atomic
+                          tokenFile:
+                            description: |-
+                              tokenFile defines the token file that contains the registered application's API token.
+                              See https://pushover.net/apps for application registration.
+                              Either `token` or `tokenFile` is required.
+                              It requires Alertmanager >= v0.26.0.
+                            type: string
+                          ttl:
+                            description: |-
+                              ttl defines the time to live for the alert notification.
+                              This determines how long the notification remains active before expiring.
+                            pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
+                            type: string
+                          url:
+                            description: |-
+                              url defines a supplementary URL shown alongside the message.
+                              This creates a clickable link within the Pushover notification.
+                            type: string
+                          urlTitle:
+                            description: |-
+                              urlTitle defines a title for the supplementary URL.
+                              If not specified, the raw URL is shown instead.
+                            type: string
+                          userKey:
+                            description: |-
+                              userKey defines the secret's key that contains the recipient user's user key.
+                              The secret needs to be in the same namespace as the AlertmanagerConfig
+                              object and accessible by the Prometheus Operator.
+                              Either `userKey` or `userKeyFile` is required.
+                            properties:
+                              key:
+                                description: The key of the secret to select from.  Must
+                                  be a valid secret key.
+                                type: string
+                              name:
+                                default: ""
+                                description: |-
+                                  Name of the referent.
+                                  This field is effectively required, but due to backwards compatibility is
+                                  allowed to be empty. Instances of this type with an empty value here are
+                                  almost certainly wrong.
+                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                type: string
+                              optional:
+                                description: Specify whether the Secret or its key
+                                  must be defined
+                                type: boolean
+                            required:
+                            - key
+                            type: object
+                            x-kubernetes-map-type: atomic
+                          userKeyFile:
+                            description: |-
+                              userKeyFile defines the user key file that contains the recipient user's user key.
+                              Either `userKey` or `userKeyFile` is required.
+                              It requires Alertmanager >= v0.26.0.
+                            type: string
+                        type: object
+                      type: array
+                    rocketchatConfigs:
+                      description: |-
+                        rocketchatConfigs defines the list of RocketChat configurations.
+                        It requires Alertmanager >= 0.28.0.
+                      items:
+                        description: |-
+                          RocketChatConfig configures notifications via RocketChat.
+                          It requires Alertmanager >= 0.28.0.
+                        properties:
+                          actions:
+                            description: |-
+                              actions defines interactive actions to include in the message.
+                              These appear as buttons that users can click to trigger responses.
+                            items:
+                              description: RocketChatActionConfig defines actions
+                                for RocketChat messages.
+                              properties:
+                                msg:
+                                  description: |-
+                                    msg defines the message to send when the button is clicked.
+                                    This allows the button to post a predefined message to the channel.
+                                  minLength: 1
+                                  type: string
+                                text:
+                                  description: |-
+                                    text defines the button text displayed to users.
+                                    This is the label that appears on the interactive button.
+                                  minLength: 1
+                                  type: string
+                                url:
+                                  description: |-
+                                    url defines the URL the button links to when clicked.
+                                    This creates a clickable button that opens the specified URL.
+                                  pattern: ^https?://.+$
+                                  type: string
+                              type: object
+                            minItems: 1
+                            type: array
+                          apiURL:
+                            description: |-
+                              apiURL defines the API URL for RocketChat.
+                              Defaults to https://open.rocket.chat/ if not specified.
+                            pattern: ^https?://.+$
+                            type: string
+                          channel:
+                            description: |-
+                              channel defines the channel to send alerts to.
+                              This can be a channel name (e.g., "#alerts") or a direct message recipient.
+                            minLength: 1
+                            type: string
+                          color:
+                            description: |-
+                              color defines the message color displayed in RocketChat.
+                              This appears as a colored bar alongside the message.
+                            minLength: 1
+                            type: string
+                          emoji:
+                            description: |-
+                              emoji defines the emoji to be displayed as an avatar.
+                              If provided, this emoji will be used instead of the default avatar or iconURL.
+                            minLength: 1
+                            type: string
+                          fields:
+                            description: |-
+                              fields defines additional fields for the message attachment.
+                              These appear as structured key-value pairs within the message.
+                            items:
+                              description: RocketChatFieldConfig defines additional
+                                fields for RocketChat messages.
+                              properties:
+                                short:
+                                  description: |-
+                                    short defines whether this field should be a short field.
+                                    When true, the field may be displayed inline with other short fields to save space.
+                                  type: boolean
+                                title:
+                                  description: |-
+                                    title defines the title of this field.
+                                    This appears as bold text labeling the field content.
+                                  minLength: 1
+                                  type: string
+                                value:
+                                  description: |-
+                                    value defines the value of this field, displayed underneath the title.
+                                    This contains the actual data or content for the field.
+                                  minLength: 1
+                                  type: string
+                              type: object
+                            minItems: 1
+                            type: array
+                          httpConfig:
+                            description: httpConfig defines the HTTP client configuration
+                              for RocketChat API requests.
+                            properties:
+                              authorization:
+                                description: |-
+                                  authorization defines the authorization header configuration for the client.
+                                  This is mutually exclusive with BasicAuth and is only available starting from Alertmanager v0.22+.
+                                properties:
+                                  credentials:
+                                    description: credentials defines a key of a Secret
+                                      in the namespace that contains the credentials
+                                      for authentication.
+                                    properties:
+                                      key:
+                                        description: The key of the secret to select
+                                          from.  Must be a valid secret key.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the Secret or
+                                          its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  type:
+                                    description: |-
+                                      type defines the authentication type. The value is case-insensitive.
+
+                                      "Basic" is not a supported value.
+
+                                      Default: "Bearer"
+                                    type: string
+                                type: object
+                              basicAuth:
+                                description: |-
+                                  basicAuth defines the basic authentication credentials for the client.
+                                  This is mutually exclusive with Authorization. If both are defined, BasicAuth takes precedence.
+                                properties:
+                                  password:
+                                    description: |-
+                                      password defines a key of a Secret containing the password for
+                                      authentication.
+                                    properties:
+                                      key:
+                                        description: The key of the secret to select
+                                          from.  Must be a valid secret key.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the Secret or
+                                          its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  username:
+                                    description: |-
+                                      username defines a key of a Secret containing the username for
+                                      authentication.
+                                    properties:
+                                      key:
+                                        description: The key of the secret to select
+                                          from.  Must be a valid secret key.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the Secret or
+                                          its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                type: object
+                              bearerTokenSecret:
+                                description: |-
+                                  bearerTokenSecret defines the secret's key that contains the bearer token to be used by the client
+                                  for authentication.
+                                  The secret needs to be in the same namespace as the AlertmanagerConfig
+                                  object and accessible by the Prometheus Operator.
+                                properties:
+                                  key:
+                                    description: The key of the secret to select from.  Must
+                                      be a valid secret key.
+                                    type: string
+                                  name:
+                                    default: ""
+                                    description: |-
+                                      Name of the referent.
+                                      This field is effectively required, but due to backwards compatibility is
+                                      allowed to be empty. Instances of this type with an empty value here are
+                                      almost certainly wrong.
+                                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                    type: string
+                                  optional:
+                                    description: Specify whether the Secret or its
+                                      key must be defined
+                                    type: boolean
+                                required:
+                                - key
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              enableHttp2:
+                                description: enableHttp2 can be used to disable HTTP2.
+                                type: boolean
+                              followRedirects:
+                                description: |-
+                                  followRedirects specifies whether the client should follow HTTP 3xx redirects.
+                                  When true, the client will automatically follow redirect responses.
+                                type: boolean
+                              noProxy:
+                                description: |-
+                                  noProxy defines a comma-separated string that can contain IPs, CIDR notation, domain names
+                                  that should be excluded from proxying. IP and domain names can
+                                  contain port numbers.
+
+                                  It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                                type: string
+                              oauth2:
+                                description: |-
+                                  oauth2 defines the OAuth2 client credentials used to fetch a token for the targets.
+                                  This enables OAuth2 authentication flow for HTTP requests.
+                                properties:
+                                  clientId:
+                                    description: |-
+                                      clientId defines a key of a Secret or ConfigMap containing the
+                                      OAuth2 client's ID.
+                                    properties:
+                                      configMap:
+                                        description: configMap defines the ConfigMap
+                                          containing data to use for the targets.
+                                        properties:
+                                          key:
+                                            description: The key to select.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the ConfigMap
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      secret:
+                                        description: secret defines the Secret containing
+                                          data to use for the targets.
+                                        properties:
+                                          key:
+                                            description: The key of the secret to
+                                              select from.  Must be a valid secret
+                                              key.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the Secret
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                    type: object
+                                  clientSecret:
+                                    description: |-
+                                      clientSecret defines a key of a Secret containing the OAuth2
+                                      client's secret.
+                                    properties:
+                                      key:
+                                        description: The key of the secret to select
+                                          from.  Must be a valid secret key.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the Secret or
+                                          its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  endpointParams:
+                                    additionalProperties:
+                                      type: string
+                                    description: |-
+                                      endpointParams configures the HTTP parameters to append to the token
+                                      URL.
+                                    type: object
+                                  noProxy:
+                                    description: |-
+                                      noProxy defines a comma-separated string that can contain IPs, CIDR notation, domain names
+                                      that should be excluded from proxying. IP and domain names can
+                                      contain port numbers.
+
+                                      It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                                    type: string
+                                  proxyConnectHeader:
+                                    additionalProperties:
+                                      items:
+                                        description: SecretKeySelector selects a key
+                                          of a Secret.
+                                        properties:
+                                          key:
+                                            description: The key of the secret to
+                                              select from.  Must be a valid secret
+                                              key.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the Secret
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      type: array
+                                    description: |-
+                                      proxyConnectHeader optionally specifies headers to send to
+                                      proxies during CONNECT requests.
+
+                                      It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  proxyFromEnvironment:
+                                    description: |-
+                                      proxyFromEnvironment defines whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+
+                                      It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                                    type: boolean
+                                  proxyUrl:
+                                    description: proxyUrl defines the HTTP proxy server
+                                      to use.
+                                    pattern: ^(http|https|socks5)://.+$
+                                    type: string
+                                  scopes:
+                                    description: scopes defines the OAuth2 scopes
+                                      used for the token request.
+                                    items:
+                                      type: string
+                                    type: array
+                                  tlsConfig:
+                                    description: |-
+                                      tlsConfig defines the TLS configuration to use when connecting to the OAuth2 server.
+                                      It requires Prometheus >= v2.43.0.
+                                    properties:
+                                      ca:
+                                        description: ca defines the Certificate authority
+                                          used when verifying server certificates.
+                                        properties:
+                                          configMap:
+                                            description: configMap defines the ConfigMap
+                                              containing data to use for the targets.
+                                            properties:
+                                              key:
+                                                description: The key to select.
+                                                type: string
+                                              name:
+                                                default: ""
+                                                description: |-
+                                                  Name of the referent.
+                                                  This field is effectively required, but due to backwards compatibility is
+                                                  allowed to be empty. Instances of this type with an empty value here are
+                                                  almost certainly wrong.
+                                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                                type: string
+                                              optional:
+                                                description: Specify whether the ConfigMap
+                                                  or its key must be defined
+                                                type: boolean
+                                            required:
+                                            - key
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                          secret:
+                                            description: secret defines the Secret
+                                              containing data to use for the targets.
+                                            properties:
+                                              key:
+                                                description: The key of the secret
+                                                  to select from.  Must be a valid
+                                                  secret key.
+                                                type: string
+                                              name:
+                                                default: ""
+                                                description: |-
+                                                  Name of the referent.
+                                                  This field is effectively required, but due to backwards compatibility is
+                                                  allowed to be empty. Instances of this type with an empty value here are
+                                                  almost certainly wrong.
+                                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                                type: string
+                                              optional:
+                                                description: Specify whether the Secret
+                                                  or its key must be defined
+                                                type: boolean
+                                            required:
+                                            - key
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                        type: object
+                                      cert:
+                                        description: cert defines the Client certificate
+                                          to present when doing client-authentication.
+                                        properties:
+                                          configMap:
+                                            description: configMap defines the ConfigMap
+                                              containing data to use for the targets.
+                                            properties:
+                                              key:
+                                                description: The key to select.
+                                                type: string
+                                              name:
+                                                default: ""
+                                                description: |-
+                                                  Name of the referent.
+                                                  This field is effectively required, but due to backwards compatibility is
+                                                  allowed to be empty. Instances of this type with an empty value here are
+                                                  almost certainly wrong.
+                                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                                type: string
+                                              optional:
+                                                description: Specify whether the ConfigMap
+                                                  or its key must be defined
+                                                type: boolean
+                                            required:
+                                            - key
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                          secret:
+                                            description: secret defines the Secret
+                                              containing data to use for the targets.
+                                            properties:
+                                              key:
+                                                description: The key of the secret
+                                                  to select from.  Must be a valid
+                                                  secret key.
+                                                type: string
+                                              name:
+                                                default: ""
+                                                description: |-
+                                                  Name of the referent.
+                                                  This field is effectively required, but due to backwards compatibility is
+                                                  allowed to be empty. Instances of this type with an empty value here are
+                                                  almost certainly wrong.
+                                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                                type: string
+                                              optional:
+                                                description: Specify whether the Secret
+                                                  or its key must be defined
+                                                type: boolean
+                                            required:
+                                            - key
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                        type: object
+                                      insecureSkipVerify:
+                                        description: insecureSkipVerify defines how
+                                          to disable target certificate validation.
+                                        type: boolean
+                                      keySecret:
+                                        description: keySecret defines the Secret
+                                          containing the client key file for the targets.
+                                        properties:
+                                          key:
+                                            description: The key of the secret to
+                                              select from.  Must be a valid secret
+                                              key.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the Secret
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      maxVersion:
+                                        description: |-
+                                          maxVersion defines the maximum acceptable TLS version.
+
+                                          It requires Prometheus >= v2.41.0 or Thanos >= v0.31.0.
+                                        enum:
+                                        - TLS10
+                                        - TLS11
+                                        - TLS12
+                                        - TLS13
+                                        type: string
+                                      minVersion:
+                                        description: |-
+                                          minVersion defines the minimum acceptable TLS version.
+
+                                          It requires Prometheus >= v2.35.0 or Thanos >= v0.28.0.
+                                        enum:
+                                        - TLS10
+                                        - TLS11
+                                        - TLS12
+                                        - TLS13
+                                        type: string
+                                      serverName:
+                                        description: serverName is used to verify
+                                          the hostname for the targets.
+                                        type: string
+                                    type: object
+                                  tokenUrl:
+                                    description: tokenUrl defines the URL to fetch
+                                      the token from.
+                                    minLength: 1
+                                    type: string
+                                required:
+                                - clientId
+                                - clientSecret
+                                - tokenUrl
+                                type: object
+                              proxyConnectHeader:
+                                additionalProperties:
+                                  items:
+                                    description: SecretKeySelector selects a key of
+                                      a Secret.
+                                    properties:
+                                      key:
+                                        description: The key of the secret to select
+                                          from.  Must be a valid secret key.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the Secret or
+                                          its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  type: array
+                                description: |-
+                                  proxyConnectHeader optionally specifies headers to send to
+                                  proxies during CONNECT requests.
+
+                                  It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              proxyFromEnvironment:
+                                description: |-
+                                  proxyFromEnvironment defines whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+
+                                  It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                                type: boolean
+                              proxyURL:
+                                description: |-
+                                  proxyURL defines an optional proxy URL for HTTP requests.
+                                  If defined, this field takes precedence over `proxyUrl`.
+                                type: string
+                              proxyUrl:
+                                description: proxyUrl defines the HTTP proxy server
+                                  to use.
+                                pattern: ^(http|https|socks5)://.+$
+                                type: string
+                              tlsConfig:
+                                description: |-
+                                  tlsConfig defines the TLS configuration for the client.
+                                  This includes settings for certificates, CA validation, and TLS protocol options.
+                                properties:
+                                  ca:
+                                    description: ca defines the Certificate authority
+                                      used when verifying server certificates.
+                                    properties:
+                                      configMap:
+                                        description: configMap defines the ConfigMap
+                                          containing data to use for the targets.
+                                        properties:
+                                          key:
+                                            description: The key to select.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the ConfigMap
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      secret:
+                                        description: secret defines the Secret containing
+                                          data to use for the targets.
+                                        properties:
+                                          key:
+                                            description: The key of the secret to
+                                              select from.  Must be a valid secret
+                                              key.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the Secret
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                    type: object
+                                  cert:
+                                    description: cert defines the Client certificate
+                                      to present when doing client-authentication.
+                                    properties:
+                                      configMap:
+                                        description: configMap defines the ConfigMap
+                                          containing data to use for the targets.
+                                        properties:
+                                          key:
+                                            description: The key to select.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the ConfigMap
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      secret:
+                                        description: secret defines the Secret containing
+                                          data to use for the targets.
+                                        properties:
+                                          key:
+                                            description: The key of the secret to
+                                              select from.  Must be a valid secret
+                                              key.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the Secret
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                    type: object
+                                  insecureSkipVerify:
+                                    description: insecureSkipVerify defines how to
+                                      disable target certificate validation.
+                                    type: boolean
+                                  keySecret:
+                                    description: keySecret defines the Secret containing
+                                      the client key file for the targets.
+                                    properties:
+                                      key:
+                                        description: The key of the secret to select
+                                          from.  Must be a valid secret key.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the Secret or
+                                          its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  maxVersion:
+                                    description: |-
+                                      maxVersion defines the maximum acceptable TLS version.
+
+                                      It requires Prometheus >= v2.41.0 or Thanos >= v0.31.0.
+                                    enum:
+                                    - TLS10
+                                    - TLS11
+                                    - TLS12
+                                    - TLS13
+                                    type: string
+                                  minVersion:
+                                    description: |-
+                                      minVersion defines the minimum acceptable TLS version.
+
+                                      It requires Prometheus >= v2.35.0 or Thanos >= v0.28.0.
+                                    enum:
+                                    - TLS10
+                                    - TLS11
+                                    - TLS12
+                                    - TLS13
+                                    type: string
+                                  serverName:
+                                    description: serverName is used to verify the
+                                      hostname for the targets.
+                                    type: string
+                                type: object
+                            type: object
+                          iconURL:
+                            description: |-
+                              iconURL defines the icon URL for the message avatar.
+                              This displays a custom image as the message sender's avatar.
+                            pattern: ^https?://.+$
+                            type: string
+                          imageURL:
+                            description: |-
+                              imageURL defines the image URL to display within the message.
+                              This embeds an image directly in the message attachment.
+                            pattern: ^https?://.+$
+                            type: string
+                          linkNames:
+                            description: |-
+                              linkNames defines whether to enable automatic linking of usernames and channels.
+                              When true, @username and #channel references become clickable links.
+                            type: boolean
+                          sendResolved:
+                            description: sendResolved defines whether or not to notify
+                              about resolved alerts.
+                            type: boolean
+                          shortFields:
+                            description: |-
+                              shortFields defines whether to use short fields in the message layout.
+                              When true, fields may be displayed side by side to save space.
+                            type: boolean
+                          text:
+                            description: |-
+                              text defines the message text to send.
+                              This is optional because attachments can be used instead of or alongside text.
+                            minLength: 1
+                            type: string
+                          thumbURL:
+                            description: |-
+                              thumbURL defines the thumbnail URL for the message.
+                              This displays a small thumbnail image alongside the message content.
+                            pattern: ^https?://.+$
+                            type: string
+                          title:
+                            description: |-
+                              title defines the message title displayed prominently in the message.
+                              This appears as bold text at the top of the message attachment.
+                            minLength: 1
+                            type: string
+                          titleLink:
+                            description: |-
+                              titleLink defines the URL that the title will link to when clicked.
+                              This makes the message title clickable in the RocketChat interface.
+                            minLength: 1
+                            type: string
+                          token:
+                            description: |-
+                              token defines the sender token for RocketChat authentication.
+                              This is the personal access token or bot token used to authenticate API requests.
+                            properties:
+                              key:
+                                description: The key of the secret to select from.  Must
+                                  be a valid secret key.
+                                type: string
+                              name:
+                                default: ""
+                                description: |-
+                                  Name of the referent.
+                                  This field is effectively required, but due to backwards compatibility is
+                                  allowed to be empty. Instances of this type with an empty value here are
+                                  almost certainly wrong.
+                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                type: string
+                              optional:
+                                description: Specify whether the Secret or its key
+                                  must be defined
+                                type: boolean
+                            required:
+                            - key
+                            type: object
+                            x-kubernetes-map-type: atomic
+                          tokenID:
+                            description: |-
+                              tokenID defines the sender token ID for RocketChat authentication.
+                              This is the user ID associated with the token used for API requests.
+                            properties:
+                              key:
+                                description: The key of the secret to select from.  Must
+                                  be a valid secret key.
+                                type: string
+                              name:
+                                default: ""
+                                description: |-
+                                  Name of the referent.
+                                  This field is effectively required, but due to backwards compatibility is
+                                  allowed to be empty. Instances of this type with an empty value here are
+                                  almost certainly wrong.
+                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                type: string
+                              optional:
+                                description: Specify whether the Secret or its key
+                                  must be defined
+                                type: boolean
+                            required:
+                            - key
+                            type: object
+                            x-kubernetes-map-type: atomic
+                        required:
+                        - token
+                        - tokenID
+                        type: object
+                      type: array
+                    slackConfigs:
+                      description: slackConfigs defines the list of Slack configurations.
+                      items:
+                        description: |-
+                          SlackConfig configures notifications via Slack.
+                          See https://prometheus.io/docs/alerting/latest/configuration/#slack_config
+                        properties:
+                          actions:
+                            description: actions defines a list of Slack actions that
+                              are sent with each notification.
+                            items:
+                              description: |-
+                                SlackAction configures a single Slack action that is sent with each
+                                notification.
+                                See https://api.slack.com/docs/message-attachments#action_fields and
+                                https://api.slack.com/docs/message-buttons for more information.
+                              properties:
+                                confirm:
+                                  description: |-
+                                    confirm defines an optional confirmation dialog that appears before the action is executed.
+                                    When set, users must confirm their intent before the action proceeds.
+                                  properties:
+                                    dismissText:
+                                      description: |-
+                                        dismissText defines the label for the cancel button in the dialog.
+                                        When not specified, defaults to "Cancel". This button cancels the action.
+                                      type: string
+                                    okText:
+                                      description: |-
+                                        okText defines the label for the confirmation button in the dialog.
+                                        When not specified, defaults to "Okay". This button proceeds with the action.
+                                      type: string
+                                    text:
+                                      description: |-
+                                        text defines the main message displayed in the confirmation dialog.
+                                        This should be a clear question or statement asking the user to confirm their action.
+                                      minLength: 1
+                                      type: string
+                                    title:
+                                      description: |-
+                                        title defines the title text displayed at the top of the confirmation dialog.
+                                        When not specified, a default title will be used.
+                                      type: string
+                                  required:
+                                  - text
+                                  type: object
+                                name:
+                                  description: |-
+                                    name defines a unique identifier for the action within the message.
+                                    This value is sent back to your application when the action is triggered.
+                                  type: string
+                                style:
+                                  description: |-
+                                    style defines the visual appearance of the action element.
+                                    Valid values include "default", "primary" (green), and "danger" (red).
+                                  type: string
+                                text:
+                                  description: |-
+                                    text defines the user-visible label displayed on the action element.
+                                    For buttons, this is the button text. For select menus, this is the placeholder text.
+                                  minLength: 1
+                                  type: string
+                                type:
+                                  description: |-
+                                    type defines the type of interactive component.
+                                    Common values include "button" for clickable buttons and "select" for dropdown menus.
+                                  minLength: 1
+                                  type: string
+                                url:
+                                  description: |-
+                                    url defines the URL to open when the action is triggered.
+                                    Only applicable for button-type actions. When set, clicking the button opens this URL.
+                                  type: string
+                                value:
+                                  description: |-
+                                    value defines the payload sent when the action is triggered.
+                                    This data is included in the callback sent to your application.
+                                  type: string
+                              required:
+                              - text
+                              - type
+                              type: object
+                            type: array
+                          apiURL:
+                            description: |-
+                              apiURL defines the secret's key that contains the Slack webhook URL.
+                              The secret needs to be in the same namespace as the AlertmanagerConfig
+                              object and accessible by the Prometheus Operator.
+                            properties:
+                              key:
+                                description: The key of the secret to select from.  Must
+                                  be a valid secret key.
+                                type: string
+                              name:
+                                default: ""
+                                description: |-
+                                  Name of the referent.
+                                  This field is effectively required, but due to backwards compatibility is
+                                  allowed to be empty. Instances of this type with an empty value here are
+                                  almost certainly wrong.
+                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                type: string
+                              optional:
+                                description: Specify whether the Secret or its key
+                                  must be defined
+                                type: boolean
+                            required:
+                            - key
+                            type: object
+                            x-kubernetes-map-type: atomic
+                          callbackId:
+                            description: callbackId defines an identifier for the
+                              message used in interactive components.
+                            type: string
+                          channel:
+                            description: channel defines the channel or user to send
+                              notifications to.
+                            type: string
+                          color:
+                            description: |-
+                              color defines the color of the left border of the Slack message attachment.
+                              Can be a hex color code (e.g., "#ff0000") or a predefined color name.
+                            type: string
+                          fallback:
+                            description: fallback defines a plain-text summary of
+                              the attachment for clients that don't support attachments.
+                            type: string
+                          fields:
+                            description: fields defines a list of Slack fields that
+                              are sent with each notification.
+                            items:
+                              description: |-
+                                SlackField configures a single Slack field that is sent with each notification.
+                                Each field must contain a title, value, and optionally, a boolean value to indicate if the field
+                                is short enough to be displayed next to other fields designated as short.
+                                See https://api.slack.com/docs/message-attachments#fields for more information.
+                              properties:
+                                short:
+                                  description: |-
+                                    short determines whether this field can be displayed alongside other short fields.
+                                    When true, Slack may display this field side by side with other short fields.
+                                    When false or not specified, the field takes the full width of the message.
+                                  type: boolean
+                                title:
+                                  description: |-
+                                    title defines the label or header text displayed for this field.
+                                    This appears as bold text above the field value in the Slack message.
+                                  minLength: 1
+                                  type: string
+                                value:
+                                  description: |-
+                                    value defines the content or data displayed for this field.
+                                    This appears below the title and can contain plain text or Slack markdown.
+                                  minLength: 1
+                                  type: string
+                              required:
+                              - title
+                              - value
+                              type: object
+                            type: array
+                          footer:
+                            description: footer defines small text displayed at the
+                              bottom of the message attachment.
+                            type: string
+                          httpConfig:
+                            description: httpConfig defines the HTTP client configuration.
+                            properties:
+                              authorization:
+                                description: |-
+                                  authorization defines the authorization header configuration for the client.
+                                  This is mutually exclusive with BasicAuth and is only available starting from Alertmanager v0.22+.
+                                properties:
+                                  credentials:
+                                    description: credentials defines a key of a Secret
+                                      in the namespace that contains the credentials
+                                      for authentication.
+                                    properties:
+                                      key:
+                                        description: The key of the secret to select
+                                          from.  Must be a valid secret key.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the Secret or
+                                          its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  type:
+                                    description: |-
+                                      type defines the authentication type. The value is case-insensitive.
+
+                                      "Basic" is not a supported value.
+
+                                      Default: "Bearer"
+                                    type: string
+                                type: object
+                              basicAuth:
+                                description: |-
+                                  basicAuth defines the basic authentication credentials for the client.
+                                  This is mutually exclusive with Authorization. If both are defined, BasicAuth takes precedence.
+                                properties:
+                                  password:
+                                    description: |-
+                                      password defines a key of a Secret containing the password for
+                                      authentication.
+                                    properties:
+                                      key:
+                                        description: The key of the secret to select
+                                          from.  Must be a valid secret key.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the Secret or
+                                          its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  username:
+                                    description: |-
+                                      username defines a key of a Secret containing the username for
+                                      authentication.
+                                    properties:
+                                      key:
+                                        description: The key of the secret to select
+                                          from.  Must be a valid secret key.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the Secret or
+                                          its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                type: object
+                              bearerTokenSecret:
+                                description: |-
+                                  bearerTokenSecret defines the secret's key that contains the bearer token to be used by the client
+                                  for authentication.
+                                  The secret needs to be in the same namespace as the AlertmanagerConfig
+                                  object and accessible by the Prometheus Operator.
+                                properties:
+                                  key:
+                                    description: The key of the secret to select from.  Must
+                                      be a valid secret key.
+                                    type: string
+                                  name:
+                                    default: ""
+                                    description: |-
+                                      Name of the referent.
+                                      This field is effectively required, but due to backwards compatibility is
+                                      allowed to be empty. Instances of this type with an empty value here are
+                                      almost certainly wrong.
+                                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                    type: string
+                                  optional:
+                                    description: Specify whether the Secret or its
+                                      key must be defined
+                                    type: boolean
+                                required:
+                                - key
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              enableHttp2:
+                                description: enableHttp2 can be used to disable HTTP2.
+                                type: boolean
+                              followRedirects:
+                                description: |-
+                                  followRedirects specifies whether the client should follow HTTP 3xx redirects.
+                                  When true, the client will automatically follow redirect responses.
+                                type: boolean
+                              noProxy:
+                                description: |-
+                                  noProxy defines a comma-separated string that can contain IPs, CIDR notation, domain names
+                                  that should be excluded from proxying. IP and domain names can
+                                  contain port numbers.
+
+                                  It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                                type: string
+                              oauth2:
+                                description: |-
+                                  oauth2 defines the OAuth2 client credentials used to fetch a token for the targets.
+                                  This enables OAuth2 authentication flow for HTTP requests.
+                                properties:
+                                  clientId:
+                                    description: |-
+                                      clientId defines a key of a Secret or ConfigMap containing the
+                                      OAuth2 client's ID.
+                                    properties:
+                                      configMap:
+                                        description: configMap defines the ConfigMap
+                                          containing data to use for the targets.
+                                        properties:
+                                          key:
+                                            description: The key to select.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the ConfigMap
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      secret:
+                                        description: secret defines the Secret containing
+                                          data to use for the targets.
+                                        properties:
+                                          key:
+                                            description: The key of the secret to
+                                              select from.  Must be a valid secret
+                                              key.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the Secret
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                    type: object
+                                  clientSecret:
+                                    description: |-
+                                      clientSecret defines a key of a Secret containing the OAuth2
+                                      client's secret.
+                                    properties:
+                                      key:
+                                        description: The key of the secret to select
+                                          from.  Must be a valid secret key.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the Secret or
+                                          its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  endpointParams:
+                                    additionalProperties:
+                                      type: string
+                                    description: |-
+                                      endpointParams configures the HTTP parameters to append to the token
+                                      URL.
+                                    type: object
+                                  noProxy:
+                                    description: |-
+                                      noProxy defines a comma-separated string that can contain IPs, CIDR notation, domain names
+                                      that should be excluded from proxying. IP and domain names can
+                                      contain port numbers.
+
+                                      It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                                    type: string
+                                  proxyConnectHeader:
+                                    additionalProperties:
+                                      items:
+                                        description: SecretKeySelector selects a key
+                                          of a Secret.
+                                        properties:
+                                          key:
+                                            description: The key of the secret to
+                                              select from.  Must be a valid secret
+                                              key.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the Secret
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      type: array
+                                    description: |-
+                                      proxyConnectHeader optionally specifies headers to send to
+                                      proxies during CONNECT requests.
+
+                                      It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  proxyFromEnvironment:
+                                    description: |-
+                                      proxyFromEnvironment defines whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+
+                                      It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                                    type: boolean
+                                  proxyUrl:
+                                    description: proxyUrl defines the HTTP proxy server
+                                      to use.
+                                    pattern: ^(http|https|socks5)://.+$
+                                    type: string
+                                  scopes:
+                                    description: scopes defines the OAuth2 scopes
+                                      used for the token request.
+                                    items:
+                                      type: string
+                                    type: array
+                                  tlsConfig:
+                                    description: |-
+                                      tlsConfig defines the TLS configuration to use when connecting to the OAuth2 server.
+                                      It requires Prometheus >= v2.43.0.
+                                    properties:
+                                      ca:
+                                        description: ca defines the Certificate authority
+                                          used when verifying server certificates.
+                                        properties:
+                                          configMap:
+                                            description: configMap defines the ConfigMap
+                                              containing data to use for the targets.
+                                            properties:
+                                              key:
+                                                description: The key to select.
+                                                type: string
+                                              name:
+                                                default: ""
+                                                description: |-
+                                                  Name of the referent.
+                                                  This field is effectively required, but due to backwards compatibility is
+                                                  allowed to be empty. Instances of this type with an empty value here are
+                                                  almost certainly wrong.
+                                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                                type: string
+                                              optional:
+                                                description: Specify whether the ConfigMap
+                                                  or its key must be defined
+                                                type: boolean
+                                            required:
+                                            - key
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                          secret:
+                                            description: secret defines the Secret
+                                              containing data to use for the targets.
+                                            properties:
+                                              key:
+                                                description: The key of the secret
+                                                  to select from.  Must be a valid
+                                                  secret key.
+                                                type: string
+                                              name:
+                                                default: ""
+                                                description: |-
+                                                  Name of the referent.
+                                                  This field is effectively required, but due to backwards compatibility is
+                                                  allowed to be empty. Instances of this type with an empty value here are
+                                                  almost certainly wrong.
+                                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                                type: string
+                                              optional:
+                                                description: Specify whether the Secret
+                                                  or its key must be defined
+                                                type: boolean
+                                            required:
+                                            - key
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                        type: object
+                                      cert:
+                                        description: cert defines the Client certificate
+                                          to present when doing client-authentication.
+                                        properties:
+                                          configMap:
+                                            description: configMap defines the ConfigMap
+                                              containing data to use for the targets.
+                                            properties:
+                                              key:
+                                                description: The key to select.
+                                                type: string
+                                              name:
+                                                default: ""
+                                                description: |-
+                                                  Name of the referent.
+                                                  This field is effectively required, but due to backwards compatibility is
+                                                  allowed to be empty. Instances of this type with an empty value here are
+                                                  almost certainly wrong.
+                                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                                type: string
+                                              optional:
+                                                description: Specify whether the ConfigMap
+                                                  or its key must be defined
+                                                type: boolean
+                                            required:
+                                            - key
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                          secret:
+                                            description: secret defines the Secret
+                                              containing data to use for the targets.
+                                            properties:
+                                              key:
+                                                description: The key of the secret
+                                                  to select from.  Must be a valid
+                                                  secret key.
+                                                type: string
+                                              name:
+                                                default: ""
+                                                description: |-
+                                                  Name of the referent.
+                                                  This field is effectively required, but due to backwards compatibility is
+                                                  allowed to be empty. Instances of this type with an empty value here are
+                                                  almost certainly wrong.
+                                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                                type: string
+                                              optional:
+                                                description: Specify whether the Secret
+                                                  or its key must be defined
+                                                type: boolean
+                                            required:
+                                            - key
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                        type: object
+                                      insecureSkipVerify:
+                                        description: insecureSkipVerify defines how
+                                          to disable target certificate validation.
+                                        type: boolean
+                                      keySecret:
+                                        description: keySecret defines the Secret
+                                          containing the client key file for the targets.
+                                        properties:
+                                          key:
+                                            description: The key of the secret to
+                                              select from.  Must be a valid secret
+                                              key.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the Secret
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      maxVersion:
+                                        description: |-
+                                          maxVersion defines the maximum acceptable TLS version.
+
+                                          It requires Prometheus >= v2.41.0 or Thanos >= v0.31.0.
+                                        enum:
+                                        - TLS10
+                                        - TLS11
+                                        - TLS12
+                                        - TLS13
+                                        type: string
+                                      minVersion:
+                                        description: |-
+                                          minVersion defines the minimum acceptable TLS version.
+
+                                          It requires Prometheus >= v2.35.0 or Thanos >= v0.28.0.
+                                        enum:
+                                        - TLS10
+                                        - TLS11
+                                        - TLS12
+                                        - TLS13
+                                        type: string
+                                      serverName:
+                                        description: serverName is used to verify
+                                          the hostname for the targets.
+                                        type: string
+                                    type: object
+                                  tokenUrl:
+                                    description: tokenUrl defines the URL to fetch
+                                      the token from.
+                                    minLength: 1
+                                    type: string
+                                required:
+                                - clientId
+                                - clientSecret
+                                - tokenUrl
+                                type: object
+                              proxyConnectHeader:
+                                additionalProperties:
+                                  items:
+                                    description: SecretKeySelector selects a key of
+                                      a Secret.
+                                    properties:
+                                      key:
+                                        description: The key of the secret to select
+                                          from.  Must be a valid secret key.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the Secret or
+                                          its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  type: array
+                                description: |-
+                                  proxyConnectHeader optionally specifies headers to send to
+                                  proxies during CONNECT requests.
+
+                                  It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              proxyFromEnvironment:
+                                description: |-
+                                  proxyFromEnvironment defines whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+
+                                  It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                                type: boolean
+                              proxyURL:
+                                description: |-
+                                  proxyURL defines an optional proxy URL for HTTP requests.
+                                  If defined, this field takes precedence over `proxyUrl`.
+                                type: string
+                              proxyUrl:
+                                description: proxyUrl defines the HTTP proxy server
+                                  to use.
+                                pattern: ^(http|https|socks5)://.+$
+                                type: string
+                              tlsConfig:
+                                description: |-
+                                  tlsConfig defines the TLS configuration for the client.
+                                  This includes settings for certificates, CA validation, and TLS protocol options.
+                                properties:
+                                  ca:
+                                    description: ca defines the Certificate authority
+                                      used when verifying server certificates.
+                                    properties:
+                                      configMap:
+                                        description: configMap defines the ConfigMap
+                                          containing data to use for the targets.
+                                        properties:
+                                          key:
+                                            description: The key to select.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the ConfigMap
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      secret:
+                                        description: secret defines the Secret containing
+                                          data to use for the targets.
+                                        properties:
+                                          key:
+                                            description: The key of the secret to
+                                              select from.  Must be a valid secret
+                                              key.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the Secret
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                    type: object
+                                  cert:
+                                    description: cert defines the Client certificate
+                                      to present when doing client-authentication.
+                                    properties:
+                                      configMap:
+                                        description: configMap defines the ConfigMap
+                                          containing data to use for the targets.
+                                        properties:
+                                          key:
+                                            description: The key to select.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the ConfigMap
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      secret:
+                                        description: secret defines the Secret containing
+                                          data to use for the targets.
+                                        properties:
+                                          key:
+                                            description: The key of the secret to
+                                              select from.  Must be a valid secret
+                                              key.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the Secret
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                    type: object
+                                  insecureSkipVerify:
+                                    description: insecureSkipVerify defines how to
+                                      disable target certificate validation.
+                                    type: boolean
+                                  keySecret:
+                                    description: keySecret defines the Secret containing
+                                      the client key file for the targets.
+                                    properties:
+                                      key:
+                                        description: The key of the secret to select
+                                          from.  Must be a valid secret key.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the Secret or
+                                          its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  maxVersion:
+                                    description: |-
+                                      maxVersion defines the maximum acceptable TLS version.
+
+                                      It requires Prometheus >= v2.41.0 or Thanos >= v0.31.0.
+                                    enum:
+                                    - TLS10
+                                    - TLS11
+                                    - TLS12
+                                    - TLS13
+                                    type: string
+                                  minVersion:
+                                    description: |-
+                                      minVersion defines the minimum acceptable TLS version.
+
+                                      It requires Prometheus >= v2.35.0 or Thanos >= v0.28.0.
+                                    enum:
+                                    - TLS10
+                                    - TLS11
+                                    - TLS12
+                                    - TLS13
+                                    type: string
+                                  serverName:
+                                    description: serverName is used to verify the
+                                      hostname for the targets.
+                                    type: string
+                                type: object
+                            type: object
+                          iconEmoji:
+                            description: iconEmoji defines the emoji to use as the
+                              bot's avatar (e.g., ":ghost:").
+                            type: string
+                          iconURL:
+                            description: iconURL defines the URL to an image to use
+                              as the bot's avatar.
+                            type: string
+                          imageURL:
+                            description: imageURL defines the URL to an image file
+                              that will be displayed inside the message attachment.
+                            type: string
+                          linkNames:
+                            description: |-
+                              linkNames enables automatic linking of channel names and usernames in the message.
+                              When true, @channel and @username will be converted to clickable links.
+                            type: boolean
+                          mrkdwnIn:
+                            description: |-
+                              mrkdwnIn defines which fields should be parsed as Slack markdown.
+                              Valid values include "pretext", "text", and "fields".
+                            items:
+                              type: string
+                            type: array
+                          pretext:
+                            description: pretext defines optional text that appears
+                              above the message attachment block.
+                            type: string
+                          sendResolved:
+                            description: sendResolved defines whether or not to notify
+                              about resolved alerts.
+                            type: boolean
+                          shortFields:
+                            description: |-
+                              shortFields determines whether fields are displayed in a compact format.
+                              When true, fields are shown side by side when possible.
+                            type: boolean
+                          text:
+                            description: text defines the main text content of the
+                              Slack message attachment.
+                            type: string
+                          thumbURL:
+                            description: |-
+                              thumbURL defines the URL to an image file that will be displayed as a thumbnail
+                              on the right side of the message attachment.
+                            type: string
+                          title:
+                            description: title defines the title text displayed in
+                              the Slack message attachment.
+                            type: string
+                          titleLink:
+                            description: titleLink defines the URL that the title
+                              will link to when clicked.
+                            type: string
+                          username:
+                            description: username defines the slack bot user name.
+                            type: string
+                        type: object
+                      type: array
+                    snsConfigs:
+                      description: snsConfigs defines the list of SNS configurations
+                      items:
+                        description: |-
+                          SNSConfig configures notifications via AWS SNS.
+                          See https://prometheus.io/docs/alerting/latest/configuration/#sns_configs
+                        properties:
+                          apiURL:
+                            description: |-
+                              apiURL defines the SNS API URL, e.g. https://sns.us-east-2.amazonaws.com.
+                              If not specified, the SNS API URL from the SNS SDK will be used.
+                            type: string
+                          attributes:
+                            additionalProperties:
+                              type: string
+                            description: |-
+                              attributes defines SNS message attributes as key-value pairs.
+                              These provide additional metadata that can be used for message filtering and routing.
+                            type: object
+                          httpConfig:
+                            description: httpConfig defines the HTTP client configuration
+                              for SNS API requests.
+                            properties:
+                              authorization:
+                                description: |-
+                                  authorization defines the authorization header configuration for the client.
+                                  This is mutually exclusive with BasicAuth and is only available starting from Alertmanager v0.22+.
+                                properties:
+                                  credentials:
+                                    description: credentials defines a key of a Secret
+                                      in the namespace that contains the credentials
+                                      for authentication.
+                                    properties:
+                                      key:
+                                        description: The key of the secret to select
+                                          from.  Must be a valid secret key.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the Secret or
+                                          its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  type:
+                                    description: |-
+                                      type defines the authentication type. The value is case-insensitive.
+
+                                      "Basic" is not a supported value.
+
+                                      Default: "Bearer"
+                                    type: string
+                                type: object
+                              basicAuth:
+                                description: |-
+                                  basicAuth defines the basic authentication credentials for the client.
+                                  This is mutually exclusive with Authorization. If both are defined, BasicAuth takes precedence.
+                                properties:
+                                  password:
+                                    description: |-
+                                      password defines a key of a Secret containing the password for
+                                      authentication.
+                                    properties:
+                                      key:
+                                        description: The key of the secret to select
+                                          from.  Must be a valid secret key.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the Secret or
+                                          its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  username:
+                                    description: |-
+                                      username defines a key of a Secret containing the username for
+                                      authentication.
+                                    properties:
+                                      key:
+                                        description: The key of the secret to select
+                                          from.  Must be a valid secret key.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the Secret or
+                                          its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                type: object
+                              bearerTokenSecret:
+                                description: |-
+                                  bearerTokenSecret defines the secret's key that contains the bearer token to be used by the client
+                                  for authentication.
+                                  The secret needs to be in the same namespace as the AlertmanagerConfig
+                                  object and accessible by the Prometheus Operator.
+                                properties:
+                                  key:
+                                    description: The key of the secret to select from.  Must
+                                      be a valid secret key.
+                                    type: string
+                                  name:
+                                    default: ""
+                                    description: |-
+                                      Name of the referent.
+                                      This field is effectively required, but due to backwards compatibility is
+                                      allowed to be empty. Instances of this type with an empty value here are
+                                      almost certainly wrong.
+                                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                    type: string
+                                  optional:
+                                    description: Specify whether the Secret or its
+                                      key must be defined
+                                    type: boolean
+                                required:
+                                - key
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              enableHttp2:
+                                description: enableHttp2 can be used to disable HTTP2.
+                                type: boolean
+                              followRedirects:
+                                description: |-
+                                  followRedirects specifies whether the client should follow HTTP 3xx redirects.
+                                  When true, the client will automatically follow redirect responses.
+                                type: boolean
+                              noProxy:
+                                description: |-
+                                  noProxy defines a comma-separated string that can contain IPs, CIDR notation, domain names
+                                  that should be excluded from proxying. IP and domain names can
+                                  contain port numbers.
+
+                                  It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                                type: string
+                              oauth2:
+                                description: |-
+                                  oauth2 defines the OAuth2 client credentials used to fetch a token for the targets.
+                                  This enables OAuth2 authentication flow for HTTP requests.
+                                properties:
+                                  clientId:
+                                    description: |-
+                                      clientId defines a key of a Secret or ConfigMap containing the
+                                      OAuth2 client's ID.
+                                    properties:
+                                      configMap:
+                                        description: configMap defines the ConfigMap
+                                          containing data to use for the targets.
+                                        properties:
+                                          key:
+                                            description: The key to select.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the ConfigMap
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      secret:
+                                        description: secret defines the Secret containing
+                                          data to use for the targets.
+                                        properties:
+                                          key:
+                                            description: The key of the secret to
+                                              select from.  Must be a valid secret
+                                              key.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the Secret
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                    type: object
+                                  clientSecret:
+                                    description: |-
+                                      clientSecret defines a key of a Secret containing the OAuth2
+                                      client's secret.
+                                    properties:
+                                      key:
+                                        description: The key of the secret to select
+                                          from.  Must be a valid secret key.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the Secret or
+                                          its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  endpointParams:
+                                    additionalProperties:
+                                      type: string
+                                    description: |-
+                                      endpointParams configures the HTTP parameters to append to the token
+                                      URL.
+                                    type: object
+                                  noProxy:
+                                    description: |-
+                                      noProxy defines a comma-separated string that can contain IPs, CIDR notation, domain names
+                                      that should be excluded from proxying. IP and domain names can
+                                      contain port numbers.
+
+                                      It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                                    type: string
+                                  proxyConnectHeader:
+                                    additionalProperties:
+                                      items:
+                                        description: SecretKeySelector selects a key
+                                          of a Secret.
+                                        properties:
+                                          key:
+                                            description: The key of the secret to
+                                              select from.  Must be a valid secret
+                                              key.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the Secret
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      type: array
+                                    description: |-
+                                      proxyConnectHeader optionally specifies headers to send to
+                                      proxies during CONNECT requests.
+
+                                      It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  proxyFromEnvironment:
+                                    description: |-
+                                      proxyFromEnvironment defines whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+
+                                      It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                                    type: boolean
+                                  proxyUrl:
+                                    description: proxyUrl defines the HTTP proxy server
+                                      to use.
+                                    pattern: ^(http|https|socks5)://.+$
+                                    type: string
+                                  scopes:
+                                    description: scopes defines the OAuth2 scopes
+                                      used for the token request.
+                                    items:
+                                      type: string
+                                    type: array
+                                  tlsConfig:
+                                    description: |-
+                                      tlsConfig defines the TLS configuration to use when connecting to the OAuth2 server.
+                                      It requires Prometheus >= v2.43.0.
+                                    properties:
+                                      ca:
+                                        description: ca defines the Certificate authority
+                                          used when verifying server certificates.
+                                        properties:
+                                          configMap:
+                                            description: configMap defines the ConfigMap
+                                              containing data to use for the targets.
+                                            properties:
+                                              key:
+                                                description: The key to select.
+                                                type: string
+                                              name:
+                                                default: ""
+                                                description: |-
+                                                  Name of the referent.
+                                                  This field is effectively required, but due to backwards compatibility is
+                                                  allowed to be empty. Instances of this type with an empty value here are
+                                                  almost certainly wrong.
+                                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                                type: string
+                                              optional:
+                                                description: Specify whether the ConfigMap
+                                                  or its key must be defined
+                                                type: boolean
+                                            required:
+                                            - key
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                          secret:
+                                            description: secret defines the Secret
+                                              containing data to use for the targets.
+                                            properties:
+                                              key:
+                                                description: The key of the secret
+                                                  to select from.  Must be a valid
+                                                  secret key.
+                                                type: string
+                                              name:
+                                                default: ""
+                                                description: |-
+                                                  Name of the referent.
+                                                  This field is effectively required, but due to backwards compatibility is
+                                                  allowed to be empty. Instances of this type with an empty value here are
+                                                  almost certainly wrong.
+                                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                                type: string
+                                              optional:
+                                                description: Specify whether the Secret
+                                                  or its key must be defined
+                                                type: boolean
+                                            required:
+                                            - key
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                        type: object
+                                      cert:
+                                        description: cert defines the Client certificate
+                                          to present when doing client-authentication.
+                                        properties:
+                                          configMap:
+                                            description: configMap defines the ConfigMap
+                                              containing data to use for the targets.
+                                            properties:
+                                              key:
+                                                description: The key to select.
+                                                type: string
+                                              name:
+                                                default: ""
+                                                description: |-
+                                                  Name of the referent.
+                                                  This field is effectively required, but due to backwards compatibility is
+                                                  allowed to be empty. Instances of this type with an empty value here are
+                                                  almost certainly wrong.
+                                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                                type: string
+                                              optional:
+                                                description: Specify whether the ConfigMap
+                                                  or its key must be defined
+                                                type: boolean
+                                            required:
+                                            - key
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                          secret:
+                                            description: secret defines the Secret
+                                              containing data to use for the targets.
+                                            properties:
+                                              key:
+                                                description: The key of the secret
+                                                  to select from.  Must be a valid
+                                                  secret key.
+                                                type: string
+                                              name:
+                                                default: ""
+                                                description: |-
+                                                  Name of the referent.
+                                                  This field is effectively required, but due to backwards compatibility is
+                                                  allowed to be empty. Instances of this type with an empty value here are
+                                                  almost certainly wrong.
+                                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                                type: string
+                                              optional:
+                                                description: Specify whether the Secret
+                                                  or its key must be defined
+                                                type: boolean
+                                            required:
+                                            - key
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                        type: object
+                                      insecureSkipVerify:
+                                        description: insecureSkipVerify defines how
+                                          to disable target certificate validation.
+                                        type: boolean
+                                      keySecret:
+                                        description: keySecret defines the Secret
+                                          containing the client key file for the targets.
+                                        properties:
+                                          key:
+                                            description: The key of the secret to
+                                              select from.  Must be a valid secret
+                                              key.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the Secret
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      maxVersion:
+                                        description: |-
+                                          maxVersion defines the maximum acceptable TLS version.
+
+                                          It requires Prometheus >= v2.41.0 or Thanos >= v0.31.0.
+                                        enum:
+                                        - TLS10
+                                        - TLS11
+                                        - TLS12
+                                        - TLS13
+                                        type: string
+                                      minVersion:
+                                        description: |-
+                                          minVersion defines the minimum acceptable TLS version.
+
+                                          It requires Prometheus >= v2.35.0 or Thanos >= v0.28.0.
+                                        enum:
+                                        - TLS10
+                                        - TLS11
+                                        - TLS12
+                                        - TLS13
+                                        type: string
+                                      serverName:
+                                        description: serverName is used to verify
+                                          the hostname for the targets.
+                                        type: string
+                                    type: object
+                                  tokenUrl:
+                                    description: tokenUrl defines the URL to fetch
+                                      the token from.
+                                    minLength: 1
+                                    type: string
+                                required:
+                                - clientId
+                                - clientSecret
+                                - tokenUrl
+                                type: object
+                              proxyConnectHeader:
+                                additionalProperties:
+                                  items:
+                                    description: SecretKeySelector selects a key of
+                                      a Secret.
+                                    properties:
+                                      key:
+                                        description: The key of the secret to select
+                                          from.  Must be a valid secret key.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the Secret or
+                                          its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  type: array
+                                description: |-
+                                  proxyConnectHeader optionally specifies headers to send to
+                                  proxies during CONNECT requests.
+
+                                  It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              proxyFromEnvironment:
+                                description: |-
+                                  proxyFromEnvironment defines whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+
+                                  It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                                type: boolean
+                              proxyURL:
+                                description: |-
+                                  proxyURL defines an optional proxy URL for HTTP requests.
+                                  If defined, this field takes precedence over `proxyUrl`.
+                                type: string
+                              proxyUrl:
+                                description: proxyUrl defines the HTTP proxy server
+                                  to use.
+                                pattern: ^(http|https|socks5)://.+$
+                                type: string
+                              tlsConfig:
+                                description: |-
+                                  tlsConfig defines the TLS configuration for the client.
+                                  This includes settings for certificates, CA validation, and TLS protocol options.
+                                properties:
+                                  ca:
+                                    description: ca defines the Certificate authority
+                                      used when verifying server certificates.
+                                    properties:
+                                      configMap:
+                                        description: configMap defines the ConfigMap
+                                          containing data to use for the targets.
+                                        properties:
+                                          key:
+                                            description: The key to select.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the ConfigMap
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      secret:
+                                        description: secret defines the Secret containing
+                                          data to use for the targets.
+                                        properties:
+                                          key:
+                                            description: The key of the secret to
+                                              select from.  Must be a valid secret
+                                              key.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the Secret
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                    type: object
+                                  cert:
+                                    description: cert defines the Client certificate
+                                      to present when doing client-authentication.
+                                    properties:
+                                      configMap:
+                                        description: configMap defines the ConfigMap
+                                          containing data to use for the targets.
+                                        properties:
+                                          key:
+                                            description: The key to select.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the ConfigMap
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      secret:
+                                        description: secret defines the Secret containing
+                                          data to use for the targets.
+                                        properties:
+                                          key:
+                                            description: The key of the secret to
+                                              select from.  Must be a valid secret
+                                              key.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the Secret
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                    type: object
+                                  insecureSkipVerify:
+                                    description: insecureSkipVerify defines how to
+                                      disable target certificate validation.
+                                    type: boolean
+                                  keySecret:
+                                    description: keySecret defines the Secret containing
+                                      the client key file for the targets.
+                                    properties:
+                                      key:
+                                        description: The key of the secret to select
+                                          from.  Must be a valid secret key.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the Secret or
+                                          its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  maxVersion:
+                                    description: |-
+                                      maxVersion defines the maximum acceptable TLS version.
+
+                                      It requires Prometheus >= v2.41.0 or Thanos >= v0.31.0.
+                                    enum:
+                                    - TLS10
+                                    - TLS11
+                                    - TLS12
+                                    - TLS13
+                                    type: string
+                                  minVersion:
+                                    description: |-
+                                      minVersion defines the minimum acceptable TLS version.
+
+                                      It requires Prometheus >= v2.35.0 or Thanos >= v0.28.0.
+                                    enum:
+                                    - TLS10
+                                    - TLS11
+                                    - TLS12
+                                    - TLS13
+                                    type: string
+                                  serverName:
+                                    description: serverName is used to verify the
+                                      hostname for the targets.
+                                    type: string
+                                type: object
+                            type: object
+                          message:
+                            description: |-
+                              message defines the message content of the SNS notification.
+                              This is the actual notification text that will be sent to subscribers.
+                            type: string
+                          phoneNumber:
+                            description: |-
+                              phoneNumber defines the phone number if message is delivered via SMS in E.164 format.
+                              If you don't specify this value, you must specify a value for the TopicARN or TargetARN.
+                            type: string
+                          sendResolved:
+                            description: sendResolved defines whether or not to notify
+                              about resolved alerts.
+                            type: boolean
+                          sigv4:
+                            description: |-
+                              sigv4 configures AWS's Signature Verification 4 signing process to sign requests.
+                              This includes AWS credentials and region configuration for authentication.
+                            properties:
+                              accessKey:
+                                description: |-
+                                  accessKey defines the AWS API key. If not specified, the environment variable
+                                  `AWS_ACCESS_KEY_ID` is used.
+                                properties:
+                                  key:
+                                    description: The key of the secret to select from.  Must
+                                      be a valid secret key.
+                                    type: string
+                                  name:
+                                    default: ""
+                                    description: |-
+                                      Name of the referent.
+                                      This field is effectively required, but due to backwards compatibility is
+                                      allowed to be empty. Instances of this type with an empty value here are
+                                      almost certainly wrong.
+                                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                    type: string
+                                  optional:
+                                    description: Specify whether the Secret or its
+                                      key must be defined
+                                    type: boolean
+                                required:
+                                - key
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              profile:
+                                description: profile defines the named AWS profile
+                                  used to authenticate.
+                                type: string
+                              region:
+                                description: region defines the AWS region. If blank,
+                                  the region from the default credentials chain used.
+                                type: string
+                              roleArn:
+                                description: roleArn defines the named AWS profile
+                                  used to authenticate.
+                                type: string
+                              secretKey:
+                                description: |-
+                                  secretKey defines the AWS API secret. If not specified, the environment
+                                  variable `AWS_SECRET_ACCESS_KEY` is used.
+                                properties:
+                                  key:
+                                    description: The key of the secret to select from.  Must
+                                      be a valid secret key.
+                                    type: string
+                                  name:
+                                    default: ""
+                                    description: |-
+                                      Name of the referent.
+                                      This field is effectively required, but due to backwards compatibility is
+                                      allowed to be empty. Instances of this type with an empty value here are
+                                      almost certainly wrong.
+                                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                    type: string
+                                  optional:
+                                    description: Specify whether the Secret or its
+                                      key must be defined
+                                    type: boolean
+                                required:
+                                - key
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              useFIPSSTSEndpoint:
+                                description: |-
+                                  useFIPSSTSEndpoint defines the FIPS mode for the AWS STS endpoint.
+                                  It requires Prometheus >= v2.54.0.
+                                type: boolean
+                            type: object
+                          subject:
+                            description: |-
+                              subject defines the subject line when the message is delivered to email endpoints.
+                              This field is only used when sending to email subscribers of an SNS topic.
+                            type: string
+                          targetARN:
+                            description: |-
+                              targetARN defines the mobile platform endpoint ARN if message is delivered via mobile notifications.
+                              If you don't specify this value, you must specify a value for the TopicARN or PhoneNumber.
+                            type: string
+                          topicARN:
+                            description: |-
+                              topicARN defines the SNS topic ARN, e.g. arn:aws:sns:us-east-2:698519295917:My-Topic.
+                              If you don't specify this value, you must specify a value for the PhoneNumber or TargetARN.
+                            type: string
+                        type: object
+                      type: array
+                    telegramConfigs:
+                      description: telegramConfigs defines the list of Telegram configurations.
+                      items:
+                        description: |-
+                          TelegramConfig configures notifications via Telegram.
+                          See https://prometheus.io/docs/alerting/latest/configuration/#telegram_config
+                        properties:
+                          apiURL:
+                            description: |-
+                              apiURL defines the Telegram API URL, e.g. https://api.telegram.org.
+                              If not specified, the default Telegram API URL will be used.
+                            type: string
+                          botToken:
+                            description: |-
+                              botToken defines the Telegram bot token. It is mutually exclusive with `botTokenFile`.
+                              The secret needs to be in the same namespace as the AlertmanagerConfig
+                              object and accessible by the Prometheus Operator.
+                              Either `botToken` or `botTokenFile` is required.
+                            properties:
+                              key:
+                                description: The key of the secret to select from.  Must
+                                  be a valid secret key.
+                                type: string
+                              name:
+                                default: ""
+                                description: |-
+                                  Name of the referent.
+                                  This field is effectively required, but due to backwards compatibility is
+                                  allowed to be empty. Instances of this type with an empty value here are
+                                  almost certainly wrong.
+                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                type: string
+                              optional:
+                                description: Specify whether the Secret or its key
+                                  must be defined
+                                type: boolean
+                            required:
+                            - key
+                            type: object
+                            x-kubernetes-map-type: atomic
+                          botTokenFile:
+                            description: |-
+                              botTokenFile defines the file to read the Telegram bot token from.
+                              It is mutually exclusive with `botToken`.
+                              Either `botToken` or `botTokenFile` is required.
+                              It requires Alertmanager >= v0.26.0.
+                            type: string
+                          chatID:
+                            description: |-
+                              chatID defines the Telegram chat ID where messages will be sent.
+                              This can be a user ID, group ID, or channel ID (with @ prefix for public channels).
+                            format: int64
+                            type: integer
+                          disableNotifications:
+                            description: |-
+                              disableNotifications controls whether Telegram notifications are sent silently.
+                              When true, users will receive the message without notification sounds.
+                            type: boolean
+                          httpConfig:
+                            description: httpConfig defines the HTTP client configuration
+                              for Telegram API requests.
+                            properties:
+                              authorization:
+                                description: |-
+                                  authorization defines the authorization header configuration for the client.
+                                  This is mutually exclusive with BasicAuth and is only available starting from Alertmanager v0.22+.
+                                properties:
+                                  credentials:
+                                    description: credentials defines a key of a Secret
+                                      in the namespace that contains the credentials
+                                      for authentication.
+                                    properties:
+                                      key:
+                                        description: The key of the secret to select
+                                          from.  Must be a valid secret key.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the Secret or
+                                          its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  type:
+                                    description: |-
+                                      type defines the authentication type. The value is case-insensitive.
+
+                                      "Basic" is not a supported value.
+
+                                      Default: "Bearer"
+                                    type: string
+                                type: object
+                              basicAuth:
+                                description: |-
+                                  basicAuth defines the basic authentication credentials for the client.
+                                  This is mutually exclusive with Authorization. If both are defined, BasicAuth takes precedence.
+                                properties:
+                                  password:
+                                    description: |-
+                                      password defines a key of a Secret containing the password for
+                                      authentication.
+                                    properties:
+                                      key:
+                                        description: The key of the secret to select
+                                          from.  Must be a valid secret key.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the Secret or
+                                          its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  username:
+                                    description: |-
+                                      username defines a key of a Secret containing the username for
+                                      authentication.
+                                    properties:
+                                      key:
+                                        description: The key of the secret to select
+                                          from.  Must be a valid secret key.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the Secret or
+                                          its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                type: object
+                              bearerTokenSecret:
+                                description: |-
+                                  bearerTokenSecret defines the secret's key that contains the bearer token to be used by the client
+                                  for authentication.
+                                  The secret needs to be in the same namespace as the AlertmanagerConfig
+                                  object and accessible by the Prometheus Operator.
+                                properties:
+                                  key:
+                                    description: The key of the secret to select from.  Must
+                                      be a valid secret key.
+                                    type: string
+                                  name:
+                                    default: ""
+                                    description: |-
+                                      Name of the referent.
+                                      This field is effectively required, but due to backwards compatibility is
+                                      allowed to be empty. Instances of this type with an empty value here are
+                                      almost certainly wrong.
+                                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                    type: string
+                                  optional:
+                                    description: Specify whether the Secret or its
+                                      key must be defined
+                                    type: boolean
+                                required:
+                                - key
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              enableHttp2:
+                                description: enableHttp2 can be used to disable HTTP2.
+                                type: boolean
+                              followRedirects:
+                                description: |-
+                                  followRedirects specifies whether the client should follow HTTP 3xx redirects.
+                                  When true, the client will automatically follow redirect responses.
+                                type: boolean
+                              noProxy:
+                                description: |-
+                                  noProxy defines a comma-separated string that can contain IPs, CIDR notation, domain names
+                                  that should be excluded from proxying. IP and domain names can
+                                  contain port numbers.
+
+                                  It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                                type: string
+                              oauth2:
+                                description: |-
+                                  oauth2 defines the OAuth2 client credentials used to fetch a token for the targets.
+                                  This enables OAuth2 authentication flow for HTTP requests.
+                                properties:
+                                  clientId:
+                                    description: |-
+                                      clientId defines a key of a Secret or ConfigMap containing the
+                                      OAuth2 client's ID.
+                                    properties:
+                                      configMap:
+                                        description: configMap defines the ConfigMap
+                                          containing data to use for the targets.
+                                        properties:
+                                          key:
+                                            description: The key to select.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the ConfigMap
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      secret:
+                                        description: secret defines the Secret containing
+                                          data to use for the targets.
+                                        properties:
+                                          key:
+                                            description: The key of the secret to
+                                              select from.  Must be a valid secret
+                                              key.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the Secret
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                    type: object
+                                  clientSecret:
+                                    description: |-
+                                      clientSecret defines a key of a Secret containing the OAuth2
+                                      client's secret.
+                                    properties:
+                                      key:
+                                        description: The key of the secret to select
+                                          from.  Must be a valid secret key.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the Secret or
+                                          its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  endpointParams:
+                                    additionalProperties:
+                                      type: string
+                                    description: |-
+                                      endpointParams configures the HTTP parameters to append to the token
+                                      URL.
+                                    type: object
+                                  noProxy:
+                                    description: |-
+                                      noProxy defines a comma-separated string that can contain IPs, CIDR notation, domain names
+                                      that should be excluded from proxying. IP and domain names can
+                                      contain port numbers.
+
+                                      It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                                    type: string
+                                  proxyConnectHeader:
+                                    additionalProperties:
+                                      items:
+                                        description: SecretKeySelector selects a key
+                                          of a Secret.
+                                        properties:
+                                          key:
+                                            description: The key of the secret to
+                                              select from.  Must be a valid secret
+                                              key.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the Secret
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      type: array
+                                    description: |-
+                                      proxyConnectHeader optionally specifies headers to send to
+                                      proxies during CONNECT requests.
+
+                                      It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  proxyFromEnvironment:
+                                    description: |-
+                                      proxyFromEnvironment defines whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+
+                                      It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                                    type: boolean
+                                  proxyUrl:
+                                    description: proxyUrl defines the HTTP proxy server
+                                      to use.
+                                    pattern: ^(http|https|socks5)://.+$
+                                    type: string
+                                  scopes:
+                                    description: scopes defines the OAuth2 scopes
+                                      used for the token request.
+                                    items:
+                                      type: string
+                                    type: array
+                                  tlsConfig:
+                                    description: |-
+                                      tlsConfig defines the TLS configuration to use when connecting to the OAuth2 server.
+                                      It requires Prometheus >= v2.43.0.
+                                    properties:
+                                      ca:
+                                        description: ca defines the Certificate authority
+                                          used when verifying server certificates.
+                                        properties:
+                                          configMap:
+                                            description: configMap defines the ConfigMap
+                                              containing data to use for the targets.
+                                            properties:
+                                              key:
+                                                description: The key to select.
+                                                type: string
+                                              name:
+                                                default: ""
+                                                description: |-
+                                                  Name of the referent.
+                                                  This field is effectively required, but due to backwards compatibility is
+                                                  allowed to be empty. Instances of this type with an empty value here are
+                                                  almost certainly wrong.
+                                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                                type: string
+                                              optional:
+                                                description: Specify whether the ConfigMap
+                                                  or its key must be defined
+                                                type: boolean
+                                            required:
+                                            - key
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                          secret:
+                                            description: secret defines the Secret
+                                              containing data to use for the targets.
+                                            properties:
+                                              key:
+                                                description: The key of the secret
+                                                  to select from.  Must be a valid
+                                                  secret key.
+                                                type: string
+                                              name:
+                                                default: ""
+                                                description: |-
+                                                  Name of the referent.
+                                                  This field is effectively required, but due to backwards compatibility is
+                                                  allowed to be empty. Instances of this type with an empty value here are
+                                                  almost certainly wrong.
+                                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                                type: string
+                                              optional:
+                                                description: Specify whether the Secret
+                                                  or its key must be defined
+                                                type: boolean
+                                            required:
+                                            - key
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                        type: object
+                                      cert:
+                                        description: cert defines the Client certificate
+                                          to present when doing client-authentication.
+                                        properties:
+                                          configMap:
+                                            description: configMap defines the ConfigMap
+                                              containing data to use for the targets.
+                                            properties:
+                                              key:
+                                                description: The key to select.
+                                                type: string
+                                              name:
+                                                default: ""
+                                                description: |-
+                                                  Name of the referent.
+                                                  This field is effectively required, but due to backwards compatibility is
+                                                  allowed to be empty. Instances of this type with an empty value here are
+                                                  almost certainly wrong.
+                                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                                type: string
+                                              optional:
+                                                description: Specify whether the ConfigMap
+                                                  or its key must be defined
+                                                type: boolean
+                                            required:
+                                            - key
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                          secret:
+                                            description: secret defines the Secret
+                                              containing data to use for the targets.
+                                            properties:
+                                              key:
+                                                description: The key of the secret
+                                                  to select from.  Must be a valid
+                                                  secret key.
+                                                type: string
+                                              name:
+                                                default: ""
+                                                description: |-
+                                                  Name of the referent.
+                                                  This field is effectively required, but due to backwards compatibility is
+                                                  allowed to be empty. Instances of this type with an empty value here are
+                                                  almost certainly wrong.
+                                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                                type: string
+                                              optional:
+                                                description: Specify whether the Secret
+                                                  or its key must be defined
+                                                type: boolean
+                                            required:
+                                            - key
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                        type: object
+                                      insecureSkipVerify:
+                                        description: insecureSkipVerify defines how
+                                          to disable target certificate validation.
+                                        type: boolean
+                                      keySecret:
+                                        description: keySecret defines the Secret
+                                          containing the client key file for the targets.
+                                        properties:
+                                          key:
+                                            description: The key of the secret to
+                                              select from.  Must be a valid secret
+                                              key.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the Secret
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      maxVersion:
+                                        description: |-
+                                          maxVersion defines the maximum acceptable TLS version.
+
+                                          It requires Prometheus >= v2.41.0 or Thanos >= v0.31.0.
+                                        enum:
+                                        - TLS10
+                                        - TLS11
+                                        - TLS12
+                                        - TLS13
+                                        type: string
+                                      minVersion:
+                                        description: |-
+                                          minVersion defines the minimum acceptable TLS version.
+
+                                          It requires Prometheus >= v2.35.0 or Thanos >= v0.28.0.
+                                        enum:
+                                        - TLS10
+                                        - TLS11
+                                        - TLS12
+                                        - TLS13
+                                        type: string
+                                      serverName:
+                                        description: serverName is used to verify
+                                          the hostname for the targets.
+                                        type: string
+                                    type: object
+                                  tokenUrl:
+                                    description: tokenUrl defines the URL to fetch
+                                      the token from.
+                                    minLength: 1
+                                    type: string
+                                required:
+                                - clientId
+                                - clientSecret
+                                - tokenUrl
+                                type: object
+                              proxyConnectHeader:
+                                additionalProperties:
+                                  items:
+                                    description: SecretKeySelector selects a key of
+                                      a Secret.
+                                    properties:
+                                      key:
+                                        description: The key of the secret to select
+                                          from.  Must be a valid secret key.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the Secret or
+                                          its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  type: array
+                                description: |-
+                                  proxyConnectHeader optionally specifies headers to send to
+                                  proxies during CONNECT requests.
+
+                                  It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              proxyFromEnvironment:
+                                description: |-
+                                  proxyFromEnvironment defines whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+
+                                  It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                                type: boolean
+                              proxyURL:
+                                description: |-
+                                  proxyURL defines an optional proxy URL for HTTP requests.
+                                  If defined, this field takes precedence over `proxyUrl`.
+                                type: string
+                              proxyUrl:
+                                description: proxyUrl defines the HTTP proxy server
+                                  to use.
+                                pattern: ^(http|https|socks5)://.+$
+                                type: string
+                              tlsConfig:
+                                description: |-
+                                  tlsConfig defines the TLS configuration for the client.
+                                  This includes settings for certificates, CA validation, and TLS protocol options.
+                                properties:
+                                  ca:
+                                    description: ca defines the Certificate authority
+                                      used when verifying server certificates.
+                                    properties:
+                                      configMap:
+                                        description: configMap defines the ConfigMap
+                                          containing data to use for the targets.
+                                        properties:
+                                          key:
+                                            description: The key to select.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the ConfigMap
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      secret:
+                                        description: secret defines the Secret containing
+                                          data to use for the targets.
+                                        properties:
+                                          key:
+                                            description: The key of the secret to
+                                              select from.  Must be a valid secret
+                                              key.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the Secret
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                    type: object
+                                  cert:
+                                    description: cert defines the Client certificate
+                                      to present when doing client-authentication.
+                                    properties:
+                                      configMap:
+                                        description: configMap defines the ConfigMap
+                                          containing data to use for the targets.
+                                        properties:
+                                          key:
+                                            description: The key to select.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the ConfigMap
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      secret:
+                                        description: secret defines the Secret containing
+                                          data to use for the targets.
+                                        properties:
+                                          key:
+                                            description: The key of the secret to
+                                              select from.  Must be a valid secret
+                                              key.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the Secret
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                    type: object
+                                  insecureSkipVerify:
+                                    description: insecureSkipVerify defines how to
+                                      disable target certificate validation.
+                                    type: boolean
+                                  keySecret:
+                                    description: keySecret defines the Secret containing
+                                      the client key file for the targets.
+                                    properties:
+                                      key:
+                                        description: The key of the secret to select
+                                          from.  Must be a valid secret key.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the Secret or
+                                          its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  maxVersion:
+                                    description: |-
+                                      maxVersion defines the maximum acceptable TLS version.
+
+                                      It requires Prometheus >= v2.41.0 or Thanos >= v0.31.0.
+                                    enum:
+                                    - TLS10
+                                    - TLS11
+                                    - TLS12
+                                    - TLS13
+                                    type: string
+                                  minVersion:
+                                    description: |-
+                                      minVersion defines the minimum acceptable TLS version.
+
+                                      It requires Prometheus >= v2.35.0 or Thanos >= v0.28.0.
+                                    enum:
+                                    - TLS10
+                                    - TLS11
+                                    - TLS12
+                                    - TLS13
+                                    type: string
+                                  serverName:
+                                    description: serverName is used to verify the
+                                      hostname for the targets.
+                                    type: string
+                                type: object
+                            type: object
+                          message:
+                            description: |-
+                              message defines the message template for the Telegram notification.
+                              This is the content that will be sent to the specified chat.
+                            type: string
+                          messageThreadID:
+                            description: |-
+                              messageThreadID defines the Telegram Group Topic ID for threaded messages.
+                              This allows sending messages to specific topics within Telegram groups.
+                              It requires Alertmanager >= 0.26.0.
+                            format: int64
+                            type: integer
+                          parseMode:
+                            description: |-
+                              parseMode defines the parse mode for telegram message formatting.
+                              Valid values are "MarkdownV2", "Markdown", and "HTML".
+                              This determines how text formatting is interpreted in the message.
+                            enum:
+                            - MarkdownV2
+                            - Markdown
+                            - HTML
+                            type: string
+                          sendResolved:
+                            description: sendResolved defines whether or not to notify
+                              about resolved alerts.
+                            type: boolean
+                        required:
+                        - chatID
+                        type: object
+                      type: array
+                    victoropsConfigs:
+                      description: victoropsConfigs defines the list of VictorOps
+                        configurations.
+                      items:
+                        description: |-
+                          VictorOpsConfig configures notifications via VictorOps.
+                          See https://prometheus.io/docs/alerting/latest/configuration/#victorops_config
+                        properties:
+                          apiKey:
+                            description: |-
+                              apiKey defines the secret's key that contains the API key to use when talking to the VictorOps API.
+                              The secret needs to be in the same namespace as the AlertmanagerConfig
+                              object and accessible by the Prometheus Operator.
+                            properties:
+                              key:
+                                description: The key of the secret to select from.  Must
+                                  be a valid secret key.
+                                type: string
+                              name:
+                                default: ""
+                                description: |-
+                                  Name of the referent.
+                                  This field is effectively required, but due to backwards compatibility is
+                                  allowed to be empty. Instances of this type with an empty value here are
+                                  almost certainly wrong.
+                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                type: string
+                              optional:
+                                description: Specify whether the Secret or its key
+                                  must be defined
+                                type: boolean
+                            required:
+                            - key
+                            type: object
+                            x-kubernetes-map-type: atomic
+                          apiUrl:
+                            description: |-
+                              apiUrl defines the VictorOps API URL.
+                              When not specified, defaults to the standard VictorOps API endpoint.
+                            type: string
+                          customFields:
+                            description: |-
+                              customFields defines additional custom fields for notification.
+                              These provide extra metadata that will be included with the VictorOps incident.
+                            items:
+                              description: KeyValue defines a (key, value) tuple.
+                              properties:
+                                key:
+                                  description: |-
+                                    key defines the key of the tuple.
+                                    This is the identifier or name part of the key-value pair.
+                                  minLength: 1
+                                  type: string
+                                value:
+                                  description: |-
+                                    value defines the value of the tuple.
+                                    This is the data or content associated with the key.
+                                  type: string
+                              required:
+                              - key
+                              - value
+                              type: object
+                            type: array
+                          entityDisplayName:
+                            description: |-
+                              entityDisplayName contains a summary of the alerted problem.
+                              This appears as the main title or identifier for the incident.
+                            type: string
+                          httpConfig:
+                            description: httpConfig defines the HTTP client's configuration
+                              for VictorOps API requests.
+                            properties:
+                              authorization:
+                                description: |-
+                                  authorization defines the authorization header configuration for the client.
+                                  This is mutually exclusive with BasicAuth and is only available starting from Alertmanager v0.22+.
+                                properties:
+                                  credentials:
+                                    description: credentials defines a key of a Secret
+                                      in the namespace that contains the credentials
+                                      for authentication.
+                                    properties:
+                                      key:
+                                        description: The key of the secret to select
+                                          from.  Must be a valid secret key.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the Secret or
+                                          its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  type:
+                                    description: |-
+                                      type defines the authentication type. The value is case-insensitive.
+
+                                      "Basic" is not a supported value.
+
+                                      Default: "Bearer"
+                                    type: string
+                                type: object
+                              basicAuth:
+                                description: |-
+                                  basicAuth defines the basic authentication credentials for the client.
+                                  This is mutually exclusive with Authorization. If both are defined, BasicAuth takes precedence.
+                                properties:
+                                  password:
+                                    description: |-
+                                      password defines a key of a Secret containing the password for
+                                      authentication.
+                                    properties:
+                                      key:
+                                        description: The key of the secret to select
+                                          from.  Must be a valid secret key.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the Secret or
+                                          its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  username:
+                                    description: |-
+                                      username defines a key of a Secret containing the username for
+                                      authentication.
+                                    properties:
+                                      key:
+                                        description: The key of the secret to select
+                                          from.  Must be a valid secret key.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the Secret or
+                                          its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                type: object
+                              bearerTokenSecret:
+                                description: |-
+                                  bearerTokenSecret defines the secret's key that contains the bearer token to be used by the client
+                                  for authentication.
+                                  The secret needs to be in the same namespace as the AlertmanagerConfig
+                                  object and accessible by the Prometheus Operator.
+                                properties:
+                                  key:
+                                    description: The key of the secret to select from.  Must
+                                      be a valid secret key.
+                                    type: string
+                                  name:
+                                    default: ""
+                                    description: |-
+                                      Name of the referent.
+                                      This field is effectively required, but due to backwards compatibility is
+                                      allowed to be empty. Instances of this type with an empty value here are
+                                      almost certainly wrong.
+                                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                    type: string
+                                  optional:
+                                    description: Specify whether the Secret or its
+                                      key must be defined
+                                    type: boolean
+                                required:
+                                - key
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              enableHttp2:
+                                description: enableHttp2 can be used to disable HTTP2.
+                                type: boolean
+                              followRedirects:
+                                description: |-
+                                  followRedirects specifies whether the client should follow HTTP 3xx redirects.
+                                  When true, the client will automatically follow redirect responses.
+                                type: boolean
+                              noProxy:
+                                description: |-
+                                  noProxy defines a comma-separated string that can contain IPs, CIDR notation, domain names
+                                  that should be excluded from proxying. IP and domain names can
+                                  contain port numbers.
+
+                                  It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                                type: string
+                              oauth2:
+                                description: |-
+                                  oauth2 defines the OAuth2 client credentials used to fetch a token for the targets.
+                                  This enables OAuth2 authentication flow for HTTP requests.
+                                properties:
+                                  clientId:
+                                    description: |-
+                                      clientId defines a key of a Secret or ConfigMap containing the
+                                      OAuth2 client's ID.
+                                    properties:
+                                      configMap:
+                                        description: configMap defines the ConfigMap
+                                          containing data to use for the targets.
+                                        properties:
+                                          key:
+                                            description: The key to select.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the ConfigMap
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      secret:
+                                        description: secret defines the Secret containing
+                                          data to use for the targets.
+                                        properties:
+                                          key:
+                                            description: The key of the secret to
+                                              select from.  Must be a valid secret
+                                              key.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the Secret
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                    type: object
+                                  clientSecret:
+                                    description: |-
+                                      clientSecret defines a key of a Secret containing the OAuth2
+                                      client's secret.
+                                    properties:
+                                      key:
+                                        description: The key of the secret to select
+                                          from.  Must be a valid secret key.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the Secret or
+                                          its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  endpointParams:
+                                    additionalProperties:
+                                      type: string
+                                    description: |-
+                                      endpointParams configures the HTTP parameters to append to the token
+                                      URL.
+                                    type: object
+                                  noProxy:
+                                    description: |-
+                                      noProxy defines a comma-separated string that can contain IPs, CIDR notation, domain names
+                                      that should be excluded from proxying. IP and domain names can
+                                      contain port numbers.
+
+                                      It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                                    type: string
+                                  proxyConnectHeader:
+                                    additionalProperties:
+                                      items:
+                                        description: SecretKeySelector selects a key
+                                          of a Secret.
+                                        properties:
+                                          key:
+                                            description: The key of the secret to
+                                              select from.  Must be a valid secret
+                                              key.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the Secret
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      type: array
+                                    description: |-
+                                      proxyConnectHeader optionally specifies headers to send to
+                                      proxies during CONNECT requests.
+
+                                      It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  proxyFromEnvironment:
+                                    description: |-
+                                      proxyFromEnvironment defines whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+
+                                      It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                                    type: boolean
+                                  proxyUrl:
+                                    description: proxyUrl defines the HTTP proxy server
+                                      to use.
+                                    pattern: ^(http|https|socks5)://.+$
+                                    type: string
+                                  scopes:
+                                    description: scopes defines the OAuth2 scopes
+                                      used for the token request.
+                                    items:
+                                      type: string
+                                    type: array
+                                  tlsConfig:
+                                    description: |-
+                                      tlsConfig defines the TLS configuration to use when connecting to the OAuth2 server.
+                                      It requires Prometheus >= v2.43.0.
+                                    properties:
+                                      ca:
+                                        description: ca defines the Certificate authority
+                                          used when verifying server certificates.
+                                        properties:
+                                          configMap:
+                                            description: configMap defines the ConfigMap
+                                              containing data to use for the targets.
+                                            properties:
+                                              key:
+                                                description: The key to select.
+                                                type: string
+                                              name:
+                                                default: ""
+                                                description: |-
+                                                  Name of the referent.
+                                                  This field is effectively required, but due to backwards compatibility is
+                                                  allowed to be empty. Instances of this type with an empty value here are
+                                                  almost certainly wrong.
+                                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                                type: string
+                                              optional:
+                                                description: Specify whether the ConfigMap
+                                                  or its key must be defined
+                                                type: boolean
+                                            required:
+                                            - key
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                          secret:
+                                            description: secret defines the Secret
+                                              containing data to use for the targets.
+                                            properties:
+                                              key:
+                                                description: The key of the secret
+                                                  to select from.  Must be a valid
+                                                  secret key.
+                                                type: string
+                                              name:
+                                                default: ""
+                                                description: |-
+                                                  Name of the referent.
+                                                  This field is effectively required, but due to backwards compatibility is
+                                                  allowed to be empty. Instances of this type with an empty value here are
+                                                  almost certainly wrong.
+                                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                                type: string
+                                              optional:
+                                                description: Specify whether the Secret
+                                                  or its key must be defined
+                                                type: boolean
+                                            required:
+                                            - key
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                        type: object
+                                      cert:
+                                        description: cert defines the Client certificate
+                                          to present when doing client-authentication.
+                                        properties:
+                                          configMap:
+                                            description: configMap defines the ConfigMap
+                                              containing data to use for the targets.
+                                            properties:
+                                              key:
+                                                description: The key to select.
+                                                type: string
+                                              name:
+                                                default: ""
+                                                description: |-
+                                                  Name of the referent.
+                                                  This field is effectively required, but due to backwards compatibility is
+                                                  allowed to be empty. Instances of this type with an empty value here are
+                                                  almost certainly wrong.
+                                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                                type: string
+                                              optional:
+                                                description: Specify whether the ConfigMap
+                                                  or its key must be defined
+                                                type: boolean
+                                            required:
+                                            - key
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                          secret:
+                                            description: secret defines the Secret
+                                              containing data to use for the targets.
+                                            properties:
+                                              key:
+                                                description: The key of the secret
+                                                  to select from.  Must be a valid
+                                                  secret key.
+                                                type: string
+                                              name:
+                                                default: ""
+                                                description: |-
+                                                  Name of the referent.
+                                                  This field is effectively required, but due to backwards compatibility is
+                                                  allowed to be empty. Instances of this type with an empty value here are
+                                                  almost certainly wrong.
+                                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                                type: string
+                                              optional:
+                                                description: Specify whether the Secret
+                                                  or its key must be defined
+                                                type: boolean
+                                            required:
+                                            - key
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                        type: object
+                                      insecureSkipVerify:
+                                        description: insecureSkipVerify defines how
+                                          to disable target certificate validation.
+                                        type: boolean
+                                      keySecret:
+                                        description: keySecret defines the Secret
+                                          containing the client key file for the targets.
+                                        properties:
+                                          key:
+                                            description: The key of the secret to
+                                              select from.  Must be a valid secret
+                                              key.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the Secret
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      maxVersion:
+                                        description: |-
+                                          maxVersion defines the maximum acceptable TLS version.
+
+                                          It requires Prometheus >= v2.41.0 or Thanos >= v0.31.0.
+                                        enum:
+                                        - TLS10
+                                        - TLS11
+                                        - TLS12
+                                        - TLS13
+                                        type: string
+                                      minVersion:
+                                        description: |-
+                                          minVersion defines the minimum acceptable TLS version.
+
+                                          It requires Prometheus >= v2.35.0 or Thanos >= v0.28.0.
+                                        enum:
+                                        - TLS10
+                                        - TLS11
+                                        - TLS12
+                                        - TLS13
+                                        type: string
+                                      serverName:
+                                        description: serverName is used to verify
+                                          the hostname for the targets.
+                                        type: string
+                                    type: object
+                                  tokenUrl:
+                                    description: tokenUrl defines the URL to fetch
+                                      the token from.
+                                    minLength: 1
+                                    type: string
+                                required:
+                                - clientId
+                                - clientSecret
+                                - tokenUrl
+                                type: object
+                              proxyConnectHeader:
+                                additionalProperties:
+                                  items:
+                                    description: SecretKeySelector selects a key of
+                                      a Secret.
+                                    properties:
+                                      key:
+                                        description: The key of the secret to select
+                                          from.  Must be a valid secret key.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the Secret or
+                                          its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  type: array
+                                description: |-
+                                  proxyConnectHeader optionally specifies headers to send to
+                                  proxies during CONNECT requests.
+
+                                  It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              proxyFromEnvironment:
+                                description: |-
+                                  proxyFromEnvironment defines whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+
+                                  It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                                type: boolean
+                              proxyURL:
+                                description: |-
+                                  proxyURL defines an optional proxy URL for HTTP requests.
+                                  If defined, this field takes precedence over `proxyUrl`.
+                                type: string
+                              proxyUrl:
+                                description: proxyUrl defines the HTTP proxy server
+                                  to use.
+                                pattern: ^(http|https|socks5)://.+$
+                                type: string
+                              tlsConfig:
+                                description: |-
+                                  tlsConfig defines the TLS configuration for the client.
+                                  This includes settings for certificates, CA validation, and TLS protocol options.
+                                properties:
+                                  ca:
+                                    description: ca defines the Certificate authority
+                                      used when verifying server certificates.
+                                    properties:
+                                      configMap:
+                                        description: configMap defines the ConfigMap
+                                          containing data to use for the targets.
+                                        properties:
+                                          key:
+                                            description: The key to select.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the ConfigMap
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      secret:
+                                        description: secret defines the Secret containing
+                                          data to use for the targets.
+                                        properties:
+                                          key:
+                                            description: The key of the secret to
+                                              select from.  Must be a valid secret
+                                              key.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the Secret
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                    type: object
+                                  cert:
+                                    description: cert defines the Client certificate
+                                      to present when doing client-authentication.
+                                    properties:
+                                      configMap:
+                                        description: configMap defines the ConfigMap
+                                          containing data to use for the targets.
+                                        properties:
+                                          key:
+                                            description: The key to select.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the ConfigMap
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      secret:
+                                        description: secret defines the Secret containing
+                                          data to use for the targets.
+                                        properties:
+                                          key:
+                                            description: The key of the secret to
+                                              select from.  Must be a valid secret
+                                              key.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the Secret
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                    type: object
+                                  insecureSkipVerify:
+                                    description: insecureSkipVerify defines how to
+                                      disable target certificate validation.
+                                    type: boolean
+                                  keySecret:
+                                    description: keySecret defines the Secret containing
+                                      the client key file for the targets.
+                                    properties:
+                                      key:
+                                        description: The key of the secret to select
+                                          from.  Must be a valid secret key.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the Secret or
+                                          its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  maxVersion:
+                                    description: |-
+                                      maxVersion defines the maximum acceptable TLS version.
+
+                                      It requires Prometheus >= v2.41.0 or Thanos >= v0.31.0.
+                                    enum:
+                                    - TLS10
+                                    - TLS11
+                                    - TLS12
+                                    - TLS13
+                                    type: string
+                                  minVersion:
+                                    description: |-
+                                      minVersion defines the minimum acceptable TLS version.
+
+                                      It requires Prometheus >= v2.35.0 or Thanos >= v0.28.0.
+                                    enum:
+                                    - TLS10
+                                    - TLS11
+                                    - TLS12
+                                    - TLS13
+                                    type: string
+                                  serverName:
+                                    description: serverName is used to verify the
+                                      hostname for the targets.
+                                    type: string
+                                type: object
+                            type: object
+                          messageType:
+                            description: |-
+                              messageType describes the behavior of the alert.
+                              Valid values are "CRITICAL", "WARNING", and "INFO".
+                            type: string
+                          monitoringTool:
+                            description: |-
+                              monitoringTool defines the monitoring tool the state message is from.
+                              This helps identify the source system that generated the alert.
+                            type: string
+                          routingKey:
+                            description: |-
+                              routingKey defines a key used to map the alert to a team.
+                              This determines which VictorOps team will receive the alert notification.
+                            type: string
+                          sendResolved:
+                            description: sendResolved defines whether or not to notify
+                              about resolved alerts.
+                            type: boolean
+                          stateMessage:
+                            description: |-
+                              stateMessage contains a long explanation of the alerted problem.
+                              This provides detailed context about the incident.
+                            type: string
+                        type: object
+                      type: array
+                    webexConfigs:
+                      description: webexConfigs defines the list of Webex configurations.
+                      items:
+                        description: |-
+                          WebexConfig configures notification via Cisco Webex
+                          See https://prometheus.io/docs/alerting/latest/configuration/#webex_config
+                        properties:
+                          apiURL:
+                            description: apiURL defines the Webex Teams API URL i.e.
+                              https://webexapis.com/v1/messages
+                            pattern: ^https?://.+$
+                            type: string
+                          httpConfig:
+                            description: httpConfig defines the HTTP client's configuration.
+                            properties:
+                              authorization:
+                                description: |-
+                                  authorization defines the authorization header configuration for the client.
+                                  This is mutually exclusive with BasicAuth and is only available starting from Alertmanager v0.22+.
+                                properties:
+                                  credentials:
+                                    description: credentials defines a key of a Secret
+                                      in the namespace that contains the credentials
+                                      for authentication.
+                                    properties:
+                                      key:
+                                        description: The key of the secret to select
+                                          from.  Must be a valid secret key.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the Secret or
+                                          its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  type:
+                                    description: |-
+                                      type defines the authentication type. The value is case-insensitive.
+
+                                      "Basic" is not a supported value.
+
+                                      Default: "Bearer"
+                                    type: string
+                                type: object
+                              basicAuth:
+                                description: |-
+                                  basicAuth defines the basic authentication credentials for the client.
+                                  This is mutually exclusive with Authorization. If both are defined, BasicAuth takes precedence.
+                                properties:
+                                  password:
+                                    description: |-
+                                      password defines a key of a Secret containing the password for
+                                      authentication.
+                                    properties:
+                                      key:
+                                        description: The key of the secret to select
+                                          from.  Must be a valid secret key.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the Secret or
+                                          its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  username:
+                                    description: |-
+                                      username defines a key of a Secret containing the username for
+                                      authentication.
+                                    properties:
+                                      key:
+                                        description: The key of the secret to select
+                                          from.  Must be a valid secret key.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the Secret or
+                                          its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                type: object
+                              bearerTokenSecret:
+                                description: |-
+                                  bearerTokenSecret defines the secret's key that contains the bearer token to be used by the client
+                                  for authentication.
+                                  The secret needs to be in the same namespace as the AlertmanagerConfig
+                                  object and accessible by the Prometheus Operator.
+                                properties:
+                                  key:
+                                    description: The key of the secret to select from.  Must
+                                      be a valid secret key.
+                                    type: string
+                                  name:
+                                    default: ""
+                                    description: |-
+                                      Name of the referent.
+                                      This field is effectively required, but due to backwards compatibility is
+                                      allowed to be empty. Instances of this type with an empty value here are
+                                      almost certainly wrong.
+                                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                    type: string
+                                  optional:
+                                    description: Specify whether the Secret or its
+                                      key must be defined
+                                    type: boolean
+                                required:
+                                - key
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              enableHttp2:
+                                description: enableHttp2 can be used to disable HTTP2.
+                                type: boolean
+                              followRedirects:
+                                description: |-
+                                  followRedirects specifies whether the client should follow HTTP 3xx redirects.
+                                  When true, the client will automatically follow redirect responses.
+                                type: boolean
+                              noProxy:
+                                description: |-
+                                  noProxy defines a comma-separated string that can contain IPs, CIDR notation, domain names
+                                  that should be excluded from proxying. IP and domain names can
+                                  contain port numbers.
+
+                                  It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                                type: string
+                              oauth2:
+                                description: |-
+                                  oauth2 defines the OAuth2 client credentials used to fetch a token for the targets.
+                                  This enables OAuth2 authentication flow for HTTP requests.
+                                properties:
+                                  clientId:
+                                    description: |-
+                                      clientId defines a key of a Secret or ConfigMap containing the
+                                      OAuth2 client's ID.
+                                    properties:
+                                      configMap:
+                                        description: configMap defines the ConfigMap
+                                          containing data to use for the targets.
+                                        properties:
+                                          key:
+                                            description: The key to select.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the ConfigMap
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      secret:
+                                        description: secret defines the Secret containing
+                                          data to use for the targets.
+                                        properties:
+                                          key:
+                                            description: The key of the secret to
+                                              select from.  Must be a valid secret
+                                              key.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the Secret
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                    type: object
+                                  clientSecret:
+                                    description: |-
+                                      clientSecret defines a key of a Secret containing the OAuth2
+                                      client's secret.
+                                    properties:
+                                      key:
+                                        description: The key of the secret to select
+                                          from.  Must be a valid secret key.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the Secret or
+                                          its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  endpointParams:
+                                    additionalProperties:
+                                      type: string
+                                    description: |-
+                                      endpointParams configures the HTTP parameters to append to the token
+                                      URL.
+                                    type: object
+                                  noProxy:
+                                    description: |-
+                                      noProxy defines a comma-separated string that can contain IPs, CIDR notation, domain names
+                                      that should be excluded from proxying. IP and domain names can
+                                      contain port numbers.
+
+                                      It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                                    type: string
+                                  proxyConnectHeader:
+                                    additionalProperties:
+                                      items:
+                                        description: SecretKeySelector selects a key
+                                          of a Secret.
+                                        properties:
+                                          key:
+                                            description: The key of the secret to
+                                              select from.  Must be a valid secret
+                                              key.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the Secret
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      type: array
+                                    description: |-
+                                      proxyConnectHeader optionally specifies headers to send to
+                                      proxies during CONNECT requests.
+
+                                      It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  proxyFromEnvironment:
+                                    description: |-
+                                      proxyFromEnvironment defines whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+
+                                      It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                                    type: boolean
+                                  proxyUrl:
+                                    description: proxyUrl defines the HTTP proxy server
+                                      to use.
+                                    pattern: ^(http|https|socks5)://.+$
+                                    type: string
+                                  scopes:
+                                    description: scopes defines the OAuth2 scopes
+                                      used for the token request.
+                                    items:
+                                      type: string
+                                    type: array
+                                  tlsConfig:
+                                    description: |-
+                                      tlsConfig defines the TLS configuration to use when connecting to the OAuth2 server.
+                                      It requires Prometheus >= v2.43.0.
+                                    properties:
+                                      ca:
+                                        description: ca defines the Certificate authority
+                                          used when verifying server certificates.
+                                        properties:
+                                          configMap:
+                                            description: configMap defines the ConfigMap
+                                              containing data to use for the targets.
+                                            properties:
+                                              key:
+                                                description: The key to select.
+                                                type: string
+                                              name:
+                                                default: ""
+                                                description: |-
+                                                  Name of the referent.
+                                                  This field is effectively required, but due to backwards compatibility is
+                                                  allowed to be empty. Instances of this type with an empty value here are
+                                                  almost certainly wrong.
+                                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                                type: string
+                                              optional:
+                                                description: Specify whether the ConfigMap
+                                                  or its key must be defined
+                                                type: boolean
+                                            required:
+                                            - key
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                          secret:
+                                            description: secret defines the Secret
+                                              containing data to use for the targets.
+                                            properties:
+                                              key:
+                                                description: The key of the secret
+                                                  to select from.  Must be a valid
+                                                  secret key.
+                                                type: string
+                                              name:
+                                                default: ""
+                                                description: |-
+                                                  Name of the referent.
+                                                  This field is effectively required, but due to backwards compatibility is
+                                                  allowed to be empty. Instances of this type with an empty value here are
+                                                  almost certainly wrong.
+                                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                                type: string
+                                              optional:
+                                                description: Specify whether the Secret
+                                                  or its key must be defined
+                                                type: boolean
+                                            required:
+                                            - key
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                        type: object
+                                      cert:
+                                        description: cert defines the Client certificate
+                                          to present when doing client-authentication.
+                                        properties:
+                                          configMap:
+                                            description: configMap defines the ConfigMap
+                                              containing data to use for the targets.
+                                            properties:
+                                              key:
+                                                description: The key to select.
+                                                type: string
+                                              name:
+                                                default: ""
+                                                description: |-
+                                                  Name of the referent.
+                                                  This field is effectively required, but due to backwards compatibility is
+                                                  allowed to be empty. Instances of this type with an empty value here are
+                                                  almost certainly wrong.
+                                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                                type: string
+                                              optional:
+                                                description: Specify whether the ConfigMap
+                                                  or its key must be defined
+                                                type: boolean
+                                            required:
+                                            - key
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                          secret:
+                                            description: secret defines the Secret
+                                              containing data to use for the targets.
+                                            properties:
+                                              key:
+                                                description: The key of the secret
+                                                  to select from.  Must be a valid
+                                                  secret key.
+                                                type: string
+                                              name:
+                                                default: ""
+                                                description: |-
+                                                  Name of the referent.
+                                                  This field is effectively required, but due to backwards compatibility is
+                                                  allowed to be empty. Instances of this type with an empty value here are
+                                                  almost certainly wrong.
+                                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                                type: string
+                                              optional:
+                                                description: Specify whether the Secret
+                                                  or its key must be defined
+                                                type: boolean
+                                            required:
+                                            - key
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                        type: object
+                                      insecureSkipVerify:
+                                        description: insecureSkipVerify defines how
+                                          to disable target certificate validation.
+                                        type: boolean
+                                      keySecret:
+                                        description: keySecret defines the Secret
+                                          containing the client key file for the targets.
+                                        properties:
+                                          key:
+                                            description: The key of the secret to
+                                              select from.  Must be a valid secret
+                                              key.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the Secret
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      maxVersion:
+                                        description: |-
+                                          maxVersion defines the maximum acceptable TLS version.
+
+                                          It requires Prometheus >= v2.41.0 or Thanos >= v0.31.0.
+                                        enum:
+                                        - TLS10
+                                        - TLS11
+                                        - TLS12
+                                        - TLS13
+                                        type: string
+                                      minVersion:
+                                        description: |-
+                                          minVersion defines the minimum acceptable TLS version.
+
+                                          It requires Prometheus >= v2.35.0 or Thanos >= v0.28.0.
+                                        enum:
+                                        - TLS10
+                                        - TLS11
+                                        - TLS12
+                                        - TLS13
+                                        type: string
+                                      serverName:
+                                        description: serverName is used to verify
+                                          the hostname for the targets.
+                                        type: string
+                                    type: object
+                                  tokenUrl:
+                                    description: tokenUrl defines the URL to fetch
+                                      the token from.
+                                    minLength: 1
+                                    type: string
+                                required:
+                                - clientId
+                                - clientSecret
+                                - tokenUrl
+                                type: object
+                              proxyConnectHeader:
+                                additionalProperties:
+                                  items:
+                                    description: SecretKeySelector selects a key of
+                                      a Secret.
+                                    properties:
+                                      key:
+                                        description: The key of the secret to select
+                                          from.  Must be a valid secret key.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the Secret or
+                                          its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  type: array
+                                description: |-
+                                  proxyConnectHeader optionally specifies headers to send to
+                                  proxies during CONNECT requests.
+
+                                  It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              proxyFromEnvironment:
+                                description: |-
+                                  proxyFromEnvironment defines whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+
+                                  It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                                type: boolean
+                              proxyURL:
+                                description: |-
+                                  proxyURL defines an optional proxy URL for HTTP requests.
+                                  If defined, this field takes precedence over `proxyUrl`.
+                                type: string
+                              proxyUrl:
+                                description: proxyUrl defines the HTTP proxy server
+                                  to use.
+                                pattern: ^(http|https|socks5)://.+$
+                                type: string
+                              tlsConfig:
+                                description: |-
+                                  tlsConfig defines the TLS configuration for the client.
+                                  This includes settings for certificates, CA validation, and TLS protocol options.
+                                properties:
+                                  ca:
+                                    description: ca defines the Certificate authority
+                                      used when verifying server certificates.
+                                    properties:
+                                      configMap:
+                                        description: configMap defines the ConfigMap
+                                          containing data to use for the targets.
+                                        properties:
+                                          key:
+                                            description: The key to select.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the ConfigMap
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      secret:
+                                        description: secret defines the Secret containing
+                                          data to use for the targets.
+                                        properties:
+                                          key:
+                                            description: The key of the secret to
+                                              select from.  Must be a valid secret
+                                              key.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the Secret
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                    type: object
+                                  cert:
+                                    description: cert defines the Client certificate
+                                      to present when doing client-authentication.
+                                    properties:
+                                      configMap:
+                                        description: configMap defines the ConfigMap
+                                          containing data to use for the targets.
+                                        properties:
+                                          key:
+                                            description: The key to select.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the ConfigMap
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      secret:
+                                        description: secret defines the Secret containing
+                                          data to use for the targets.
+                                        properties:
+                                          key:
+                                            description: The key of the secret to
+                                              select from.  Must be a valid secret
+                                              key.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the Secret
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                    type: object
+                                  insecureSkipVerify:
+                                    description: insecureSkipVerify defines how to
+                                      disable target certificate validation.
+                                    type: boolean
+                                  keySecret:
+                                    description: keySecret defines the Secret containing
+                                      the client key file for the targets.
+                                    properties:
+                                      key:
+                                        description: The key of the secret to select
+                                          from.  Must be a valid secret key.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the Secret or
+                                          its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  maxVersion:
+                                    description: |-
+                                      maxVersion defines the maximum acceptable TLS version.
+
+                                      It requires Prometheus >= v2.41.0 or Thanos >= v0.31.0.
+                                    enum:
+                                    - TLS10
+                                    - TLS11
+                                    - TLS12
+                                    - TLS13
+                                    type: string
+                                  minVersion:
+                                    description: |-
+                                      minVersion defines the minimum acceptable TLS version.
+
+                                      It requires Prometheus >= v2.35.0 or Thanos >= v0.28.0.
+                                    enum:
+                                    - TLS10
+                                    - TLS11
+                                    - TLS12
+                                    - TLS13
+                                    type: string
+                                  serverName:
+                                    description: serverName is used to verify the
+                                      hostname for the targets.
+                                    type: string
+                                type: object
+                            type: object
+                          message:
+                            description: message defines the message template
+                            type: string
+                          roomID:
+                            description: roomID defines the ID of the Webex Teams
+                              room where to send the messages.
+                            minLength: 1
+                            type: string
+                          sendResolved:
+                            description: sendResolved defines whether or not to notify
+                              about resolved alerts.
+                            type: boolean
+                        required:
+                        - roomID
+                        type: object
+                      type: array
+                    webhookConfigs:
+                      description: webhookConfigs defines the List of webhook configurations.
+                      items:
+                        description: |-
+                          WebhookConfig configures notifications via a generic receiver supporting the webhook payload.
+                          See https://prometheus.io/docs/alerting/latest/configuration/#webhook_config
+                        properties:
+                          httpConfig:
+                            description: httpConfig defines the HTTP client configuration
+                              for webhook requests.
+                            properties:
+                              authorization:
+                                description: |-
+                                  authorization defines the authorization header configuration for the client.
+                                  This is mutually exclusive with BasicAuth and is only available starting from Alertmanager v0.22+.
+                                properties:
+                                  credentials:
+                                    description: credentials defines a key of a Secret
+                                      in the namespace that contains the credentials
+                                      for authentication.
+                                    properties:
+                                      key:
+                                        description: The key of the secret to select
+                                          from.  Must be a valid secret key.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the Secret or
+                                          its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  type:
+                                    description: |-
+                                      type defines the authentication type. The value is case-insensitive.
+
+                                      "Basic" is not a supported value.
+
+                                      Default: "Bearer"
+                                    type: string
+                                type: object
+                              basicAuth:
+                                description: |-
+                                  basicAuth defines the basic authentication credentials for the client.
+                                  This is mutually exclusive with Authorization. If both are defined, BasicAuth takes precedence.
+                                properties:
+                                  password:
+                                    description: |-
+                                      password defines a key of a Secret containing the password for
+                                      authentication.
+                                    properties:
+                                      key:
+                                        description: The key of the secret to select
+                                          from.  Must be a valid secret key.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the Secret or
+                                          its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  username:
+                                    description: |-
+                                      username defines a key of a Secret containing the username for
+                                      authentication.
+                                    properties:
+                                      key:
+                                        description: The key of the secret to select
+                                          from.  Must be a valid secret key.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the Secret or
+                                          its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                type: object
+                              bearerTokenSecret:
+                                description: |-
+                                  bearerTokenSecret defines the secret's key that contains the bearer token to be used by the client
+                                  for authentication.
+                                  The secret needs to be in the same namespace as the AlertmanagerConfig
+                                  object and accessible by the Prometheus Operator.
+                                properties:
+                                  key:
+                                    description: The key of the secret to select from.  Must
+                                      be a valid secret key.
+                                    type: string
+                                  name:
+                                    default: ""
+                                    description: |-
+                                      Name of the referent.
+                                      This field is effectively required, but due to backwards compatibility is
+                                      allowed to be empty. Instances of this type with an empty value here are
+                                      almost certainly wrong.
+                                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                    type: string
+                                  optional:
+                                    description: Specify whether the Secret or its
+                                      key must be defined
+                                    type: boolean
+                                required:
+                                - key
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              enableHttp2:
+                                description: enableHttp2 can be used to disable HTTP2.
+                                type: boolean
+                              followRedirects:
+                                description: |-
+                                  followRedirects specifies whether the client should follow HTTP 3xx redirects.
+                                  When true, the client will automatically follow redirect responses.
+                                type: boolean
+                              noProxy:
+                                description: |-
+                                  noProxy defines a comma-separated string that can contain IPs, CIDR notation, domain names
+                                  that should be excluded from proxying. IP and domain names can
+                                  contain port numbers.
+
+                                  It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                                type: string
+                              oauth2:
+                                description: |-
+                                  oauth2 defines the OAuth2 client credentials used to fetch a token for the targets.
+                                  This enables OAuth2 authentication flow for HTTP requests.
+                                properties:
+                                  clientId:
+                                    description: |-
+                                      clientId defines a key of a Secret or ConfigMap containing the
+                                      OAuth2 client's ID.
+                                    properties:
+                                      configMap:
+                                        description: configMap defines the ConfigMap
+                                          containing data to use for the targets.
+                                        properties:
+                                          key:
+                                            description: The key to select.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the ConfigMap
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      secret:
+                                        description: secret defines the Secret containing
+                                          data to use for the targets.
+                                        properties:
+                                          key:
+                                            description: The key of the secret to
+                                              select from.  Must be a valid secret
+                                              key.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the Secret
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                    type: object
+                                  clientSecret:
+                                    description: |-
+                                      clientSecret defines a key of a Secret containing the OAuth2
+                                      client's secret.
+                                    properties:
+                                      key:
+                                        description: The key of the secret to select
+                                          from.  Must be a valid secret key.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the Secret or
+                                          its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  endpointParams:
+                                    additionalProperties:
+                                      type: string
+                                    description: |-
+                                      endpointParams configures the HTTP parameters to append to the token
+                                      URL.
+                                    type: object
+                                  noProxy:
+                                    description: |-
+                                      noProxy defines a comma-separated string that can contain IPs, CIDR notation, domain names
+                                      that should be excluded from proxying. IP and domain names can
+                                      contain port numbers.
+
+                                      It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                                    type: string
+                                  proxyConnectHeader:
+                                    additionalProperties:
+                                      items:
+                                        description: SecretKeySelector selects a key
+                                          of a Secret.
+                                        properties:
+                                          key:
+                                            description: The key of the secret to
+                                              select from.  Must be a valid secret
+                                              key.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the Secret
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      type: array
+                                    description: |-
+                                      proxyConnectHeader optionally specifies headers to send to
+                                      proxies during CONNECT requests.
+
+                                      It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  proxyFromEnvironment:
+                                    description: |-
+                                      proxyFromEnvironment defines whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+
+                                      It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                                    type: boolean
+                                  proxyUrl:
+                                    description: proxyUrl defines the HTTP proxy server
+                                      to use.
+                                    pattern: ^(http|https|socks5)://.+$
+                                    type: string
+                                  scopes:
+                                    description: scopes defines the OAuth2 scopes
+                                      used for the token request.
+                                    items:
+                                      type: string
+                                    type: array
+                                  tlsConfig:
+                                    description: |-
+                                      tlsConfig defines the TLS configuration to use when connecting to the OAuth2 server.
+                                      It requires Prometheus >= v2.43.0.
+                                    properties:
+                                      ca:
+                                        description: ca defines the Certificate authority
+                                          used when verifying server certificates.
+                                        properties:
+                                          configMap:
+                                            description: configMap defines the ConfigMap
+                                              containing data to use for the targets.
+                                            properties:
+                                              key:
+                                                description: The key to select.
+                                                type: string
+                                              name:
+                                                default: ""
+                                                description: |-
+                                                  Name of the referent.
+                                                  This field is effectively required, but due to backwards compatibility is
+                                                  allowed to be empty. Instances of this type with an empty value here are
+                                                  almost certainly wrong.
+                                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                                type: string
+                                              optional:
+                                                description: Specify whether the ConfigMap
+                                                  or its key must be defined
+                                                type: boolean
+                                            required:
+                                            - key
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                          secret:
+                                            description: secret defines the Secret
+                                              containing data to use for the targets.
+                                            properties:
+                                              key:
+                                                description: The key of the secret
+                                                  to select from.  Must be a valid
+                                                  secret key.
+                                                type: string
+                                              name:
+                                                default: ""
+                                                description: |-
+                                                  Name of the referent.
+                                                  This field is effectively required, but due to backwards compatibility is
+                                                  allowed to be empty. Instances of this type with an empty value here are
+                                                  almost certainly wrong.
+                                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                                type: string
+                                              optional:
+                                                description: Specify whether the Secret
+                                                  or its key must be defined
+                                                type: boolean
+                                            required:
+                                            - key
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                        type: object
+                                      cert:
+                                        description: cert defines the Client certificate
+                                          to present when doing client-authentication.
+                                        properties:
+                                          configMap:
+                                            description: configMap defines the ConfigMap
+                                              containing data to use for the targets.
+                                            properties:
+                                              key:
+                                                description: The key to select.
+                                                type: string
+                                              name:
+                                                default: ""
+                                                description: |-
+                                                  Name of the referent.
+                                                  This field is effectively required, but due to backwards compatibility is
+                                                  allowed to be empty. Instances of this type with an empty value here are
+                                                  almost certainly wrong.
+                                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                                type: string
+                                              optional:
+                                                description: Specify whether the ConfigMap
+                                                  or its key must be defined
+                                                type: boolean
+                                            required:
+                                            - key
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                          secret:
+                                            description: secret defines the Secret
+                                              containing data to use for the targets.
+                                            properties:
+                                              key:
+                                                description: The key of the secret
+                                                  to select from.  Must be a valid
+                                                  secret key.
+                                                type: string
+                                              name:
+                                                default: ""
+                                                description: |-
+                                                  Name of the referent.
+                                                  This field is effectively required, but due to backwards compatibility is
+                                                  allowed to be empty. Instances of this type with an empty value here are
+                                                  almost certainly wrong.
+                                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                                type: string
+                                              optional:
+                                                description: Specify whether the Secret
+                                                  or its key must be defined
+                                                type: boolean
+                                            required:
+                                            - key
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                        type: object
+                                      insecureSkipVerify:
+                                        description: insecureSkipVerify defines how
+                                          to disable target certificate validation.
+                                        type: boolean
+                                      keySecret:
+                                        description: keySecret defines the Secret
+                                          containing the client key file for the targets.
+                                        properties:
+                                          key:
+                                            description: The key of the secret to
+                                              select from.  Must be a valid secret
+                                              key.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the Secret
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      maxVersion:
+                                        description: |-
+                                          maxVersion defines the maximum acceptable TLS version.
+
+                                          It requires Prometheus >= v2.41.0 or Thanos >= v0.31.0.
+                                        enum:
+                                        - TLS10
+                                        - TLS11
+                                        - TLS12
+                                        - TLS13
+                                        type: string
+                                      minVersion:
+                                        description: |-
+                                          minVersion defines the minimum acceptable TLS version.
+
+                                          It requires Prometheus >= v2.35.0 or Thanos >= v0.28.0.
+                                        enum:
+                                        - TLS10
+                                        - TLS11
+                                        - TLS12
+                                        - TLS13
+                                        type: string
+                                      serverName:
+                                        description: serverName is used to verify
+                                          the hostname for the targets.
+                                        type: string
+                                    type: object
+                                  tokenUrl:
+                                    description: tokenUrl defines the URL to fetch
+                                      the token from.
+                                    minLength: 1
+                                    type: string
+                                required:
+                                - clientId
+                                - clientSecret
+                                - tokenUrl
+                                type: object
+                              proxyConnectHeader:
+                                additionalProperties:
+                                  items:
+                                    description: SecretKeySelector selects a key of
+                                      a Secret.
+                                    properties:
+                                      key:
+                                        description: The key of the secret to select
+                                          from.  Must be a valid secret key.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the Secret or
+                                          its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  type: array
+                                description: |-
+                                  proxyConnectHeader optionally specifies headers to send to
+                                  proxies during CONNECT requests.
+
+                                  It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              proxyFromEnvironment:
+                                description: |-
+                                  proxyFromEnvironment defines whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+
+                                  It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                                type: boolean
+                              proxyURL:
+                                description: |-
+                                  proxyURL defines an optional proxy URL for HTTP requests.
+                                  If defined, this field takes precedence over `proxyUrl`.
+                                type: string
+                              proxyUrl:
+                                description: proxyUrl defines the HTTP proxy server
+                                  to use.
+                                pattern: ^(http|https|socks5)://.+$
+                                type: string
+                              tlsConfig:
+                                description: |-
+                                  tlsConfig defines the TLS configuration for the client.
+                                  This includes settings for certificates, CA validation, and TLS protocol options.
+                                properties:
+                                  ca:
+                                    description: ca defines the Certificate authority
+                                      used when verifying server certificates.
+                                    properties:
+                                      configMap:
+                                        description: configMap defines the ConfigMap
+                                          containing data to use for the targets.
+                                        properties:
+                                          key:
+                                            description: The key to select.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the ConfigMap
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      secret:
+                                        description: secret defines the Secret containing
+                                          data to use for the targets.
+                                        properties:
+                                          key:
+                                            description: The key of the secret to
+                                              select from.  Must be a valid secret
+                                              key.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the Secret
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                    type: object
+                                  cert:
+                                    description: cert defines the Client certificate
+                                      to present when doing client-authentication.
+                                    properties:
+                                      configMap:
+                                        description: configMap defines the ConfigMap
+                                          containing data to use for the targets.
+                                        properties:
+                                          key:
+                                            description: The key to select.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the ConfigMap
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      secret:
+                                        description: secret defines the Secret containing
+                                          data to use for the targets.
+                                        properties:
+                                          key:
+                                            description: The key of the secret to
+                                              select from.  Must be a valid secret
+                                              key.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the Secret
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                    type: object
+                                  insecureSkipVerify:
+                                    description: insecureSkipVerify defines how to
+                                      disable target certificate validation.
+                                    type: boolean
+                                  keySecret:
+                                    description: keySecret defines the Secret containing
+                                      the client key file for the targets.
+                                    properties:
+                                      key:
+                                        description: The key of the secret to select
+                                          from.  Must be a valid secret key.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the Secret or
+                                          its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  maxVersion:
+                                    description: |-
+                                      maxVersion defines the maximum acceptable TLS version.
+
+                                      It requires Prometheus >= v2.41.0 or Thanos >= v0.31.0.
+                                    enum:
+                                    - TLS10
+                                    - TLS11
+                                    - TLS12
+                                    - TLS13
+                                    type: string
+                                  minVersion:
+                                    description: |-
+                                      minVersion defines the minimum acceptable TLS version.
+
+                                      It requires Prometheus >= v2.35.0 or Thanos >= v0.28.0.
+                                    enum:
+                                    - TLS10
+                                    - TLS11
+                                    - TLS12
+                                    - TLS13
+                                    type: string
+                                  serverName:
+                                    description: serverName is used to verify the
+                                      hostname for the targets.
+                                    type: string
+                                type: object
+                            type: object
+                          maxAlerts:
+                            description: |-
+                              maxAlerts defines the maximum number of alerts to be sent per webhook message.
+                              When 0, all alerts are included in the webhook payload.
+                            format: int32
+                            minimum: 0
+                            type: integer
+                          sendResolved:
+                            description: sendResolved defines whether or not to notify
+                              about resolved alerts.
+                            type: boolean
+                          timeout:
+                            description: |-
+                              timeout defines the maximum time to wait for a webhook request to complete,
+                              before failing the request and allowing it to be retried.
+                              It requires Alertmanager >= v0.28.0.
+                            pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
+                            type: string
+                          url:
+                            description: |-
+                              url defines the URL to send HTTP POST requests to.
+                              urlSecret takes precedence over url. One of urlSecret and url should be defined.
+                            type: string
+                          urlSecret:
+                            description: |-
+                              urlSecret defines the secret's key that contains the webhook URL to send HTTP requests to.
+                              urlSecret takes precedence over url. One of urlSecret and url should be defined.
+                              The secret needs to be in the same namespace as the AlertmanagerConfig
+                              object and accessible by the Prometheus Operator.
+                            properties:
+                              key:
+                                description: The key of the secret to select from.  Must
+                                  be a valid secret key.
+                                type: string
+                              name:
+                                default: ""
+                                description: |-
+                                  Name of the referent.
+                                  This field is effectively required, but due to backwards compatibility is
+                                  allowed to be empty. Instances of this type with an empty value here are
+                                  almost certainly wrong.
+                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                type: string
+                              optional:
+                                description: Specify whether the Secret or its key
+                                  must be defined
+                                type: boolean
+                            required:
+                            - key
+                            type: object
+                            x-kubernetes-map-type: atomic
+                        type: object
+                      type: array
+                    wechatConfigs:
+                      description: wechatConfigs defines the list of WeChat configurations.
+                      items:
+                        description: |-
+                          WeChatConfig configures notifications via WeChat.
+                          See https://prometheus.io/docs/alerting/latest/configuration/#wechat_config
+                        properties:
+                          agentID:
+                            description: |-
+                              agentID defines the application agent ID within WeChat Work.
+                              This identifies which WeChat Work application will send the notifications.
+                            type: string
+                          apiSecret:
+                            description: |-
+                              apiSecret defines the secret's key that contains the WeChat API key.
+                              The secret needs to be in the same namespace as the AlertmanagerConfig
+                              object and accessible by the Prometheus Operator.
+                            properties:
+                              key:
+                                description: The key of the secret to select from.  Must
+                                  be a valid secret key.
+                                type: string
+                              name:
+                                default: ""
+                                description: |-
+                                  Name of the referent.
+                                  This field is effectively required, but due to backwards compatibility is
+                                  allowed to be empty. Instances of this type with an empty value here are
+                                  almost certainly wrong.
+                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                type: string
+                              optional:
+                                description: Specify whether the Secret or its key
+                                  must be defined
+                                type: boolean
+                            required:
+                            - key
+                            type: object
+                            x-kubernetes-map-type: atomic
+                          apiURL:
+                            description: |-
+                              apiURL defines the WeChat API URL.
+                              When not specified, defaults to the standard WeChat Work API endpoint.
+                            type: string
+                          corpID:
+                            description: |-
+                              corpID defines the corp id for authentication.
+                              This is the unique identifier for your WeChat Work organization.
+                            type: string
+                          httpConfig:
+                            description: httpConfig defines the HTTP client configuration
+                              for WeChat API requests.
+                            properties:
+                              authorization:
+                                description: |-
+                                  authorization defines the authorization header configuration for the client.
+                                  This is mutually exclusive with BasicAuth and is only available starting from Alertmanager v0.22+.
+                                properties:
+                                  credentials:
+                                    description: credentials defines a key of a Secret
+                                      in the namespace that contains the credentials
+                                      for authentication.
+                                    properties:
+                                      key:
+                                        description: The key of the secret to select
+                                          from.  Must be a valid secret key.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the Secret or
+                                          its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  type:
+                                    description: |-
+                                      type defines the authentication type. The value is case-insensitive.
+
+                                      "Basic" is not a supported value.
+
+                                      Default: "Bearer"
+                                    type: string
+                                type: object
+                              basicAuth:
+                                description: |-
+                                  basicAuth defines the basic authentication credentials for the client.
+                                  This is mutually exclusive with Authorization. If both are defined, BasicAuth takes precedence.
+                                properties:
+                                  password:
+                                    description: |-
+                                      password defines a key of a Secret containing the password for
+                                      authentication.
+                                    properties:
+                                      key:
+                                        description: The key of the secret to select
+                                          from.  Must be a valid secret key.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the Secret or
+                                          its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  username:
+                                    description: |-
+                                      username defines a key of a Secret containing the username for
+                                      authentication.
+                                    properties:
+                                      key:
+                                        description: The key of the secret to select
+                                          from.  Must be a valid secret key.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the Secret or
+                                          its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                type: object
+                              bearerTokenSecret:
+                                description: |-
+                                  bearerTokenSecret defines the secret's key that contains the bearer token to be used by the client
+                                  for authentication.
+                                  The secret needs to be in the same namespace as the AlertmanagerConfig
+                                  object and accessible by the Prometheus Operator.
+                                properties:
+                                  key:
+                                    description: The key of the secret to select from.  Must
+                                      be a valid secret key.
+                                    type: string
+                                  name:
+                                    default: ""
+                                    description: |-
+                                      Name of the referent.
+                                      This field is effectively required, but due to backwards compatibility is
+                                      allowed to be empty. Instances of this type with an empty value here are
+                                      almost certainly wrong.
+                                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                    type: string
+                                  optional:
+                                    description: Specify whether the Secret or its
+                                      key must be defined
+                                    type: boolean
+                                required:
+                                - key
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              enableHttp2:
+                                description: enableHttp2 can be used to disable HTTP2.
+                                type: boolean
+                              followRedirects:
+                                description: |-
+                                  followRedirects specifies whether the client should follow HTTP 3xx redirects.
+                                  When true, the client will automatically follow redirect responses.
+                                type: boolean
+                              noProxy:
+                                description: |-
+                                  noProxy defines a comma-separated string that can contain IPs, CIDR notation, domain names
+                                  that should be excluded from proxying. IP and domain names can
+                                  contain port numbers.
+
+                                  It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                                type: string
+                              oauth2:
+                                description: |-
+                                  oauth2 defines the OAuth2 client credentials used to fetch a token for the targets.
+                                  This enables OAuth2 authentication flow for HTTP requests.
+                                properties:
+                                  clientId:
+                                    description: |-
+                                      clientId defines a key of a Secret or ConfigMap containing the
+                                      OAuth2 client's ID.
+                                    properties:
+                                      configMap:
+                                        description: configMap defines the ConfigMap
+                                          containing data to use for the targets.
+                                        properties:
+                                          key:
+                                            description: The key to select.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the ConfigMap
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      secret:
+                                        description: secret defines the Secret containing
+                                          data to use for the targets.
+                                        properties:
+                                          key:
+                                            description: The key of the secret to
+                                              select from.  Must be a valid secret
+                                              key.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the Secret
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                    type: object
+                                  clientSecret:
+                                    description: |-
+                                      clientSecret defines a key of a Secret containing the OAuth2
+                                      client's secret.
+                                    properties:
+                                      key:
+                                        description: The key of the secret to select
+                                          from.  Must be a valid secret key.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the Secret or
+                                          its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  endpointParams:
+                                    additionalProperties:
+                                      type: string
+                                    description: |-
+                                      endpointParams configures the HTTP parameters to append to the token
+                                      URL.
+                                    type: object
+                                  noProxy:
+                                    description: |-
+                                      noProxy defines a comma-separated string that can contain IPs, CIDR notation, domain names
+                                      that should be excluded from proxying. IP and domain names can
+                                      contain port numbers.
+
+                                      It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                                    type: string
+                                  proxyConnectHeader:
+                                    additionalProperties:
+                                      items:
+                                        description: SecretKeySelector selects a key
+                                          of a Secret.
+                                        properties:
+                                          key:
+                                            description: The key of the secret to
+                                              select from.  Must be a valid secret
+                                              key.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the Secret
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      type: array
+                                    description: |-
+                                      proxyConnectHeader optionally specifies headers to send to
+                                      proxies during CONNECT requests.
+
+                                      It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  proxyFromEnvironment:
+                                    description: |-
+                                      proxyFromEnvironment defines whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+
+                                      It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                                    type: boolean
+                                  proxyUrl:
+                                    description: proxyUrl defines the HTTP proxy server
+                                      to use.
+                                    pattern: ^(http|https|socks5)://.+$
+                                    type: string
+                                  scopes:
+                                    description: scopes defines the OAuth2 scopes
+                                      used for the token request.
+                                    items:
+                                      type: string
+                                    type: array
+                                  tlsConfig:
+                                    description: |-
+                                      tlsConfig defines the TLS configuration to use when connecting to the OAuth2 server.
+                                      It requires Prometheus >= v2.43.0.
+                                    properties:
+                                      ca:
+                                        description: ca defines the Certificate authority
+                                          used when verifying server certificates.
+                                        properties:
+                                          configMap:
+                                            description: configMap defines the ConfigMap
+                                              containing data to use for the targets.
+                                            properties:
+                                              key:
+                                                description: The key to select.
+                                                type: string
+                                              name:
+                                                default: ""
+                                                description: |-
+                                                  Name of the referent.
+                                                  This field is effectively required, but due to backwards compatibility is
+                                                  allowed to be empty. Instances of this type with an empty value here are
+                                                  almost certainly wrong.
+                                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                                type: string
+                                              optional:
+                                                description: Specify whether the ConfigMap
+                                                  or its key must be defined
+                                                type: boolean
+                                            required:
+                                            - key
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                          secret:
+                                            description: secret defines the Secret
+                                              containing data to use for the targets.
+                                            properties:
+                                              key:
+                                                description: The key of the secret
+                                                  to select from.  Must be a valid
+                                                  secret key.
+                                                type: string
+                                              name:
+                                                default: ""
+                                                description: |-
+                                                  Name of the referent.
+                                                  This field is effectively required, but due to backwards compatibility is
+                                                  allowed to be empty. Instances of this type with an empty value here are
+                                                  almost certainly wrong.
+                                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                                type: string
+                                              optional:
+                                                description: Specify whether the Secret
+                                                  or its key must be defined
+                                                type: boolean
+                                            required:
+                                            - key
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                        type: object
+                                      cert:
+                                        description: cert defines the Client certificate
+                                          to present when doing client-authentication.
+                                        properties:
+                                          configMap:
+                                            description: configMap defines the ConfigMap
+                                              containing data to use for the targets.
+                                            properties:
+                                              key:
+                                                description: The key to select.
+                                                type: string
+                                              name:
+                                                default: ""
+                                                description: |-
+                                                  Name of the referent.
+                                                  This field is effectively required, but due to backwards compatibility is
+                                                  allowed to be empty. Instances of this type with an empty value here are
+                                                  almost certainly wrong.
+                                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                                type: string
+                                              optional:
+                                                description: Specify whether the ConfigMap
+                                                  or its key must be defined
+                                                type: boolean
+                                            required:
+                                            - key
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                          secret:
+                                            description: secret defines the Secret
+                                              containing data to use for the targets.
+                                            properties:
+                                              key:
+                                                description: The key of the secret
+                                                  to select from.  Must be a valid
+                                                  secret key.
+                                                type: string
+                                              name:
+                                                default: ""
+                                                description: |-
+                                                  Name of the referent.
+                                                  This field is effectively required, but due to backwards compatibility is
+                                                  allowed to be empty. Instances of this type with an empty value here are
+                                                  almost certainly wrong.
+                                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                                type: string
+                                              optional:
+                                                description: Specify whether the Secret
+                                                  or its key must be defined
+                                                type: boolean
+                                            required:
+                                            - key
+                                            type: object
+                                            x-kubernetes-map-type: atomic
+                                        type: object
+                                      insecureSkipVerify:
+                                        description: insecureSkipVerify defines how
+                                          to disable target certificate validation.
+                                        type: boolean
+                                      keySecret:
+                                        description: keySecret defines the Secret
+                                          containing the client key file for the targets.
+                                        properties:
+                                          key:
+                                            description: The key of the secret to
+                                              select from.  Must be a valid secret
+                                              key.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the Secret
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      maxVersion:
+                                        description: |-
+                                          maxVersion defines the maximum acceptable TLS version.
+
+                                          It requires Prometheus >= v2.41.0 or Thanos >= v0.31.0.
+                                        enum:
+                                        - TLS10
+                                        - TLS11
+                                        - TLS12
+                                        - TLS13
+                                        type: string
+                                      minVersion:
+                                        description: |-
+                                          minVersion defines the minimum acceptable TLS version.
+
+                                          It requires Prometheus >= v2.35.0 or Thanos >= v0.28.0.
+                                        enum:
+                                        - TLS10
+                                        - TLS11
+                                        - TLS12
+                                        - TLS13
+                                        type: string
+                                      serverName:
+                                        description: serverName is used to verify
+                                          the hostname for the targets.
+                                        type: string
+                                    type: object
+                                  tokenUrl:
+                                    description: tokenUrl defines the URL to fetch
+                                      the token from.
+                                    minLength: 1
+                                    type: string
+                                required:
+                                - clientId
+                                - clientSecret
+                                - tokenUrl
+                                type: object
+                              proxyConnectHeader:
+                                additionalProperties:
+                                  items:
+                                    description: SecretKeySelector selects a key of
+                                      a Secret.
+                                    properties:
+                                      key:
+                                        description: The key of the secret to select
+                                          from.  Must be a valid secret key.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the Secret or
+                                          its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  type: array
+                                description: |-
+                                  proxyConnectHeader optionally specifies headers to send to
+                                  proxies during CONNECT requests.
+
+                                  It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              proxyFromEnvironment:
+                                description: |-
+                                  proxyFromEnvironment defines whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+
+                                  It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                                type: boolean
+                              proxyURL:
+                                description: |-
+                                  proxyURL defines an optional proxy URL for HTTP requests.
+                                  If defined, this field takes precedence over `proxyUrl`.
+                                type: string
+                              proxyUrl:
+                                description: proxyUrl defines the HTTP proxy server
+                                  to use.
+                                pattern: ^(http|https|socks5)://.+$
+                                type: string
+                              tlsConfig:
+                                description: |-
+                                  tlsConfig defines the TLS configuration for the client.
+                                  This includes settings for certificates, CA validation, and TLS protocol options.
+                                properties:
+                                  ca:
+                                    description: ca defines the Certificate authority
+                                      used when verifying server certificates.
+                                    properties:
+                                      configMap:
+                                        description: configMap defines the ConfigMap
+                                          containing data to use for the targets.
+                                        properties:
+                                          key:
+                                            description: The key to select.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the ConfigMap
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      secret:
+                                        description: secret defines the Secret containing
+                                          data to use for the targets.
+                                        properties:
+                                          key:
+                                            description: The key of the secret to
+                                              select from.  Must be a valid secret
+                                              key.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the Secret
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                    type: object
+                                  cert:
+                                    description: cert defines the Client certificate
+                                      to present when doing client-authentication.
+                                    properties:
+                                      configMap:
+                                        description: configMap defines the ConfigMap
+                                          containing data to use for the targets.
+                                        properties:
+                                          key:
+                                            description: The key to select.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the ConfigMap
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      secret:
+                                        description: secret defines the Secret containing
+                                          data to use for the targets.
+                                        properties:
+                                          key:
+                                            description: The key of the secret to
+                                              select from.  Must be a valid secret
+                                              key.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the Secret
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                    type: object
+                                  insecureSkipVerify:
+                                    description: insecureSkipVerify defines how to
+                                      disable target certificate validation.
+                                    type: boolean
+                                  keySecret:
+                                    description: keySecret defines the Secret containing
+                                      the client key file for the targets.
+                                    properties:
+                                      key:
+                                        description: The key of the secret to select
+                                          from.  Must be a valid secret key.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the Secret or
+                                          its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  maxVersion:
+                                    description: |-
+                                      maxVersion defines the maximum acceptable TLS version.
+
+                                      It requires Prometheus >= v2.41.0 or Thanos >= v0.31.0.
+                                    enum:
+                                    - TLS10
+                                    - TLS11
+                                    - TLS12
+                                    - TLS13
+                                    type: string
+                                  minVersion:
+                                    description: |-
+                                      minVersion defines the minimum acceptable TLS version.
+
+                                      It requires Prometheus >= v2.35.0 or Thanos >= v0.28.0.
+                                    enum:
+                                    - TLS10
+                                    - TLS11
+                                    - TLS12
+                                    - TLS13
+                                    type: string
+                                  serverName:
+                                    description: serverName is used to verify the
+                                      hostname for the targets.
+                                    type: string
+                                type: object
+                            type: object
+                          message:
+                            description: |-
+                              message defines the API request data as defined by the WeChat API.
+                              This contains the actual notification content to be sent.
+                            type: string
+                          messageType:
+                            description: |-
+                              messageType defines the type of message to send.
+                              Valid values include "text", "markdown", and other WeChat Work supported message types.
+                            type: string
+                          sendResolved:
+                            description: sendResolved defines whether or not to notify
+                              about resolved alerts.
+                            type: boolean
+                          toParty:
+                            description: |-
+                              toParty defines the target department(s) to receive the notification.
+                              Can be a single department ID or multiple department IDs separated by '|'.
+                            type: string
+                          toTag:
+                            description: |-
+                              toTag defines the target tag(s) to receive the notification.
+                              Can be a single tag ID or multiple tag IDs separated by '|'.
+                            type: string
+                          toUser:
+                            description: |-
+                              toUser defines the target user(s) to receive the notification.
+                              Can be a single user ID or multiple user IDs separated by '|'.
+                            type: string
+                        type: object
+                      type: array
+                  required:
+                  - name
+                  type: object
+                type: array
+              route:
+                description: |-
+                  route defines the Alertmanager route definition for alerts matching the resource's
+                  namespace. If present, it will be added to the generated Alertmanager
+                  configuration as a first-level route.
+                properties:
+                  activeTimeIntervals:
+                    description: activeTimeIntervals is a list of MuteTimeInterval
+                      names when this route should be active.
+                    items:
+                      type: string
+                    type: array
+                  continue:
+                    description: |-
+                      continue defines the boolean indicating whether an alert should continue matching subsequent
+                      sibling nodes. It will always be overridden to true for the first-level
+                      route by the Prometheus operator.
+                    type: boolean
+                  groupBy:
+                    description: |-
+                      groupBy defines the list of labels to group by.
+                      Labels must not be repeated (unique list).
+                      Special label "..." (aggregate by all possible labels), if provided, must be the only element in the list.
+                    items:
+                      type: string
+                    type: array
+                  groupInterval:
+                    description: |-
+                      groupInterval defines how long to wait before sending an updated notification.
+                      Must match the regular expression`^(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?$`
+                      Example: "5m"
+                    type: string
+                  groupWait:
+                    description: |-
+                      groupWait defines how long to wait before sending the initial notification.
+                      Must match the regular expression`^(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?$`
+                      Example: "30s"
+                    type: string
+                  matchers:
+                    description: |-
+                      matchers defines the list of matchers that the alert's labels should match. For the first
+                      level route, the operator removes any existing equality and regexp
+                      matcher on the `namespace` label and adds a `namespace: <object
+                      namespace>` matcher.
+                    items:
+                      description: Matcher defines how to match on alert's labels.
+                      properties:
+                        matchType:
+                          description: |-
+                            matchType defines the match operation available with AlertManager >= v0.22.0.
+                            Takes precedence over Regex (deprecated) if non-empty.
+                            Valid values: "=" (equality), "!=" (inequality), "=~" (regex match), "!~" (regex non-match).
+                          enum:
+                          - '!='
+                          - =
+                          - =~
+                          - '!~'
+                          type: string
+                        name:
+                          description: |-
+                            name defines the label to match.
+                            This specifies which alert label should be evaluated.
+                          minLength: 1
+                          type: string
+                        regex:
+                          description: |-
+                            regex defines whether to match on equality (false) or regular-expression (true).
+                            Deprecated: for AlertManager >= v0.22.0, `matchType` should be used instead.
+                          type: boolean
+                        value:
+                          description: |-
+                            value defines the label value to match.
+                            This is the expected value for the specified label.
+                          type: string
+                      required:
+                      - name
+                      type: object
+                    type: array
+                  muteTimeIntervals:
+                    description: muteTimeIntervals is a list of MuteTimeInterval names
+                      that will mute this route when matched,
+                    items:
+                      type: string
+                    type: array
+                  receiver:
+                    description: |-
+                      receiver defines the name of the receiver for this route. If not empty, it should be listed in
+                      the `receivers` field.
+                    type: string
+                  repeatInterval:
+                    description: |-
+                      repeatInterval defines how long to wait before repeating the last notification.
+                      Must match the regular expression`^(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?$`
+                      Example: "4h"
+                    type: string
+                  routes:
+                    description: routes defines the child routes.
+                    items:
+                      x-kubernetes-preserve-unknown-fields: true
+                    type: array
+                type: object
+            type: object
+        required:
+        - spec
+        type: object
+    served: true
+    storage: true
+{{- end -}}
diff --git a/packages/system/prometheus-operator-crds/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml b/packages/system/prometheus-operator-crds/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml
new file mode 100644
index 0000000000..6e6044fac7
--- /dev/null
+++ b/packages/system/prometheus-operator-crds/charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml
@@ -0,0 +1,9868 @@
+{{- if .Values.alertmanagers.enabled -}}
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.87.0/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+{{- with .Values.annotations }}
+{{- toYaml . | nindent 4 }}
+{{- end }}
+    controller-gen.kubebuilder.io/version: v0.19.0
+    operator.prometheus.io/version: 0.87.0
+  name: alertmanagers.monitoring.coreos.com
+spec:
+  group: monitoring.coreos.com
+  names:
+    categories:
+    - prometheus-operator
+    kind: Alertmanager
+    listKind: AlertmanagerList
+    plural: alertmanagers
+    shortNames:
+    - am
+    singular: alertmanager
+  scope: Namespaced
+  versions:
+  - additionalPrinterColumns:
+    - description: The version of Alertmanager
+      jsonPath: .spec.version
+      name: Version
+      type: string
+    - description: The number of desired replicas
+      jsonPath: .spec.replicas
+      name: Replicas
+      type: integer
+    - description: The number of ready replicas
+      jsonPath: .status.availableReplicas
+      name: Ready
+      type: integer
+    - jsonPath: .status.conditions[?(@.type == 'Reconciled')].status
+      name: Reconciled
+      type: string
+    - jsonPath: .status.conditions[?(@.type == 'Available')].status
+      name: Available
+      type: string
+    - jsonPath: .metadata.creationTimestamp
+      name: Age
+      type: date
+    - description: Whether the resource reconciliation is paused or not
+      jsonPath: .status.paused
+      name: Paused
+      priority: 1
+      type: boolean
+    name: v1
+    schema:
+      openAPIV3Schema:
+        description: |-
+          The `Alertmanager` custom resource definition (CRD) defines a desired [Alertmanager](https://prometheus.io/docs/alerting) setup to run in a Kubernetes cluster. It allows to specify many options such as the number of replicas, persistent storage and many more.
+
+          For each `Alertmanager` resource, the Operator deploys a `StatefulSet` in the same namespace. When there are two or more configured replicas, the Operator runs the Alertmanager instances in high-availability mode.
+
+          The resource defines via label and namespace selectors which `AlertmanagerConfig` objects should be associated to the deployed Alertmanager instances.
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: |-
+              spec defines the specification of the desired behavior of the Alertmanager cluster. More info:
+              https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#spec-and-status
+            properties:
+              additionalArgs:
+                description: |-
+                  additionalArgs allows setting additional arguments for the 'Alertmanager' container.
+                  It is intended for e.g. activating hidden flags which are not supported by
+                  the dedicated configuration options yet. The arguments are passed as-is to the
+                  Alertmanager container which may cause issues if they are invalid or not supported
+                  by the given Alertmanager version.
+                items:
+                  description: Argument as part of the AdditionalArgs list.
+                  properties:
+                    name:
+                      description: name of the argument, e.g. "scrape.discovery-reload-interval".
+                      minLength: 1
+                      type: string
+                    value:
+                      description: value defines the argument value, e.g. 30s. Can
+                        be empty for name-only arguments (e.g. --storage.tsdb.no-lockfile)
+                      type: string
+                  required:
+                  - name
+                  type: object
+                type: array
+              additionalPeers:
+                description: additionalPeers allows injecting a set of additional
+                  Alertmanagers to peer with to form a highly available cluster.
+                items:
+                  type: string
+                type: array
+              affinity:
+                description: affinity defines the pod's scheduling constraints.
+                properties:
+                  nodeAffinity:
+                    description: Describes node affinity scheduling rules for the
+                      pod.
+                    properties:
+                      preferredDuringSchedulingIgnoredDuringExecution:
+                        description: |-
+                          The scheduler will prefer to schedule pods to nodes that satisfy
+                          the affinity expressions specified by this field, but it may choose
+                          a node that violates one or more of the expressions. The node that is
+                          most preferred is the one with the greatest sum of weights, i.e.
+                          for each node that meets all of the scheduling requirements (resource
+                          request, requiredDuringScheduling affinity expressions, etc.),
+                          compute a sum by iterating through the elements of this field and adding
+                          "weight" to the sum if the node matches the corresponding matchExpressions; the
+                          node(s) with the highest sum are the most preferred.
+                        items:
+                          description: |-
+                            An empty preferred scheduling term matches all objects with implicit weight 0
+                            (i.e. it's a no-op). A null preferred scheduling term matches no objects (i.e. is also a no-op).
+                          properties:
+                            preference:
+                              description: A node selector term, associated with the
+                                corresponding weight.
+                              properties:
+                                matchExpressions:
+                                  description: A list of node selector requirements
+                                    by node's labels.
+                                  items:
+                                    description: |-
+                                      A node selector requirement is a selector that contains values, a key, and an operator
+                                      that relates the key and values.
+                                    properties:
+                                      key:
+                                        description: The label key that the selector
+                                          applies to.
+                                        type: string
+                                      operator:
+                                        description: |-
+                                          Represents a key's relationship to a set of values.
+                                          Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt.
+                                        type: string
+                                      values:
+                                        description: |-
+                                          An array of string values. If the operator is In or NotIn,
+                                          the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                          the values array must be empty. If the operator is Gt or Lt, the values
+                                          array must have a single element, which will be interpreted as an integer.
+                                          This array is replaced during a strategic merge patch.
+                                        items:
+                                          type: string
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                    required:
+                                    - key
+                                    - operator
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                matchFields:
+                                  description: A list of node selector requirements
+                                    by node's fields.
+                                  items:
+                                    description: |-
+                                      A node selector requirement is a selector that contains values, a key, and an operator
+                                      that relates the key and values.
+                                    properties:
+                                      key:
+                                        description: The label key that the selector
+                                          applies to.
+                                        type: string
+                                      operator:
+                                        description: |-
+                                          Represents a key's relationship to a set of values.
+                                          Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt.
+                                        type: string
+                                      values:
+                                        description: |-
+                                          An array of string values. If the operator is In or NotIn,
+                                          the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                          the values array must be empty. If the operator is Gt or Lt, the values
+                                          array must have a single element, which will be interpreted as an integer.
+                                          This array is replaced during a strategic merge patch.
+                                        items:
+                                          type: string
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                    required:
+                                    - key
+                                    - operator
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            weight:
+                              description: Weight associated with matching the corresponding
+                                nodeSelectorTerm, in the range 1-100.
+                              format: int32
+                              type: integer
+                          required:
+                          - preference
+                          - weight
+                          type: object
+                        type: array
+                        x-kubernetes-list-type: atomic
+                      requiredDuringSchedulingIgnoredDuringExecution:
+                        description: |-
+                          If the affinity requirements specified by this field are not met at
+                          scheduling time, the pod will not be scheduled onto the node.
+                          If the affinity requirements specified by this field cease to be met
+                          at some point during pod execution (e.g. due to an update), the system
+                          may or may not try to eventually evict the pod from its node.
+                        properties:
+                          nodeSelectorTerms:
+                            description: Required. A list of node selector terms.
+                              The terms are ORed.
+                            items:
+                              description: |-
+                                A null or empty node selector term matches no objects. The requirements of
+                                them are ANDed.
+                                The TopologySelectorTerm type implements a subset of the NodeSelectorTerm.
+                              properties:
+                                matchExpressions:
+                                  description: A list of node selector requirements
+                                    by node's labels.
+                                  items:
+                                    description: |-
+                                      A node selector requirement is a selector that contains values, a key, and an operator
+                                      that relates the key and values.
+                                    properties:
+                                      key:
+                                        description: The label key that the selector
+                                          applies to.
+                                        type: string
+                                      operator:
+                                        description: |-
+                                          Represents a key's relationship to a set of values.
+                                          Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt.
+                                        type: string
+                                      values:
+                                        description: |-
+                                          An array of string values. If the operator is In or NotIn,
+                                          the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                          the values array must be empty. If the operator is Gt or Lt, the values
+                                          array must have a single element, which will be interpreted as an integer.
+                                          This array is replaced during a strategic merge patch.
+                                        items:
+                                          type: string
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                    required:
+                                    - key
+                                    - operator
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                matchFields:
+                                  description: A list of node selector requirements
+                                    by node's fields.
+                                  items:
+                                    description: |-
+                                      A node selector requirement is a selector that contains values, a key, and an operator
+                                      that relates the key and values.
+                                    properties:
+                                      key:
+                                        description: The label key that the selector
+                                          applies to.
+                                        type: string
+                                      operator:
+                                        description: |-
+                                          Represents a key's relationship to a set of values.
+                                          Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt.
+                                        type: string
+                                      values:
+                                        description: |-
+                                          An array of string values. If the operator is In or NotIn,
+                                          the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                          the values array must be empty. If the operator is Gt or Lt, the values
+                                          array must have a single element, which will be interpreted as an integer.
+                                          This array is replaced during a strategic merge patch.
+                                        items:
+                                          type: string
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                    required:
+                                    - key
+                                    - operator
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            type: array
+                            x-kubernetes-list-type: atomic
+                        required:
+                        - nodeSelectorTerms
+                        type: object
+                        x-kubernetes-map-type: atomic
+                    type: object
+                  podAffinity:
+                    description: Describes pod affinity scheduling rules (e.g. co-locate
+                      this pod in the same node, zone, etc. as some other pod(s)).
+                    properties:
+                      preferredDuringSchedulingIgnoredDuringExecution:
+                        description: |-
+                          The scheduler will prefer to schedule pods to nodes that satisfy
+                          the affinity expressions specified by this field, but it may choose
+                          a node that violates one or more of the expressions. The node that is
+                          most preferred is the one with the greatest sum of weights, i.e.
+                          for each node that meets all of the scheduling requirements (resource
+                          request, requiredDuringScheduling affinity expressions, etc.),
+                          compute a sum by iterating through the elements of this field and adding
+                          "weight" to the sum if the node has pods which matches the corresponding podAffinityTerm; the
+                          node(s) with the highest sum are the most preferred.
+                        items:
+                          description: The weights of all of the matched WeightedPodAffinityTerm
+                            fields are added per-node to find the most preferred node(s)
+                          properties:
+                            podAffinityTerm:
+                              description: Required. A pod affinity term, associated
+                                with the corresponding weight.
+                              properties:
+                                labelSelector:
+                                  description: |-
+                                    A label query over a set of resources, in this case pods.
+                                    If it's null, this PodAffinityTerm matches with no Pods.
+                                  properties:
+                                    matchExpressions:
+                                      description: matchExpressions is a list of label
+                                        selector requirements. The requirements are
+                                        ANDed.
+                                      items:
+                                        description: |-
+                                          A label selector requirement is a selector that contains values, a key, and an operator that
+                                          relates the key and values.
+                                        properties:
+                                          key:
+                                            description: key is the label key that
+                                              the selector applies to.
+                                            type: string
+                                          operator:
+                                            description: |-
+                                              operator represents a key's relationship to a set of values.
+                                              Valid operators are In, NotIn, Exists and DoesNotExist.
+                                            type: string
+                                          values:
+                                            description: |-
+                                              values is an array of string values. If the operator is In or NotIn,
+                                              the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                              the values array must be empty. This array is replaced during a strategic
+                                              merge patch.
+                                            items:
+                                              type: string
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                        required:
+                                        - key
+                                        - operator
+                                        type: object
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    matchLabels:
+                                      additionalProperties:
+                                        type: string
+                                      description: |-
+                                        matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                        map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                        operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                      type: object
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                matchLabelKeys:
+                                  description: |-
+                                    MatchLabelKeys is a set of pod label keys to select which pods will
+                                    be taken into consideration. The keys are used to lookup values from the
+                                    incoming pod labels, those key-value labels are merged with `labelSelector` as `key in (value)`
+                                    to select the group of existing pods which pods will be taken into consideration
+                                    for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+                                    pod labels will be ignored. The default value is empty.
+                                    The same key is forbidden to exist in both matchLabelKeys and labelSelector.
+                                    Also, matchLabelKeys cannot be set when labelSelector isn't set.
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                mismatchLabelKeys:
+                                  description: |-
+                                    MismatchLabelKeys is a set of pod label keys to select which pods will
+                                    be taken into consideration. The keys are used to lookup values from the
+                                    incoming pod labels, those key-value labels are merged with `labelSelector` as `key notin (value)`
+                                    to select the group of existing pods which pods will be taken into consideration
+                                    for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+                                    pod labels will be ignored. The default value is empty.
+                                    The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
+                                    Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                namespaceSelector:
+                                  description: |-
+                                    A label query over the set of namespaces that the term applies to.
+                                    The term is applied to the union of the namespaces selected by this field
+                                    and the ones listed in the namespaces field.
+                                    null selector and null or empty namespaces list means "this pod's namespace".
+                                    An empty selector ({}) matches all namespaces.
+                                  properties:
+                                    matchExpressions:
+                                      description: matchExpressions is a list of label
+                                        selector requirements. The requirements are
+                                        ANDed.
+                                      items:
+                                        description: |-
+                                          A label selector requirement is a selector that contains values, a key, and an operator that
+                                          relates the key and values.
+                                        properties:
+                                          key:
+                                            description: key is the label key that
+                                              the selector applies to.
+                                            type: string
+                                          operator:
+                                            description: |-
+                                              operator represents a key's relationship to a set of values.
+                                              Valid operators are In, NotIn, Exists and DoesNotExist.
+                                            type: string
+                                          values:
+                                            description: |-
+                                              values is an array of string values. If the operator is In or NotIn,
+                                              the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                              the values array must be empty. This array is replaced during a strategic
+                                              merge patch.
+                                            items:
+                                              type: string
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                        required:
+                                        - key
+                                        - operator
+                                        type: object
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    matchLabels:
+                                      additionalProperties:
+                                        type: string
+                                      description: |-
+                                        matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                        map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                        operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                      type: object
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                namespaces:
+                                  description: |-
+                                    namespaces specifies a static list of namespace names that the term applies to.
+                                    The term is applied to the union of the namespaces listed in this field
+                                    and the ones selected by namespaceSelector.
+                                    null or empty namespaces list and null namespaceSelector means "this pod's namespace".
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                topologyKey:
+                                  description: |-
+                                    This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching
+                                    the labelSelector in the specified namespaces, where co-located is defined as running on a node
+                                    whose value of the label with key topologyKey matches that of any node on which any of the
+                                    selected pods is running.
+                                    Empty topologyKey is not allowed.
+                                  type: string
+                              required:
+                              - topologyKey
+                              type: object
+                            weight:
+                              description: |-
+                                weight associated with matching the corresponding podAffinityTerm,
+                                in the range 1-100.
+                              format: int32
+                              type: integer
+                          required:
+                          - podAffinityTerm
+                          - weight
+                          type: object
+                        type: array
+                        x-kubernetes-list-type: atomic
+                      requiredDuringSchedulingIgnoredDuringExecution:
+                        description: |-
+                          If the affinity requirements specified by this field are not met at
+                          scheduling time, the pod will not be scheduled onto the node.
+                          If the affinity requirements specified by this field cease to be met
+                          at some point during pod execution (e.g. due to a pod label update), the
+                          system may or may not try to eventually evict the pod from its node.
+                          When there are multiple elements, the lists of nodes corresponding to each
+                          podAffinityTerm are intersected, i.e. all terms must be satisfied.
+                        items:
+                          description: |-
+                            Defines a set of pods (namely those matching the labelSelector
+                            relative to the given namespace(s)) that this pod should be
+                            co-located (affinity) or not co-located (anti-affinity) with,
+                            where co-located is defined as running on a node whose value of
+                            the label with key <topologyKey> matches that of any node on which
+                            a pod of the set of pods is running
+                          properties:
+                            labelSelector:
+                              description: |-
+                                A label query over a set of resources, in this case pods.
+                                If it's null, this PodAffinityTerm matches with no Pods.
+                              properties:
+                                matchExpressions:
+                                  description: matchExpressions is a list of label
+                                    selector requirements. The requirements are ANDed.
+                                  items:
+                                    description: |-
+                                      A label selector requirement is a selector that contains values, a key, and an operator that
+                                      relates the key and values.
+                                    properties:
+                                      key:
+                                        description: key is the label key that the
+                                          selector applies to.
+                                        type: string
+                                      operator:
+                                        description: |-
+                                          operator represents a key's relationship to a set of values.
+                                          Valid operators are In, NotIn, Exists and DoesNotExist.
+                                        type: string
+                                      values:
+                                        description: |-
+                                          values is an array of string values. If the operator is In or NotIn,
+                                          the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                          the values array must be empty. This array is replaced during a strategic
+                                          merge patch.
+                                        items:
+                                          type: string
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                    required:
+                                    - key
+                                    - operator
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                matchLabels:
+                                  additionalProperties:
+                                    type: string
+                                  description: |-
+                                    matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                    map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                    operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                  type: object
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            matchLabelKeys:
+                              description: |-
+                                MatchLabelKeys is a set of pod label keys to select which pods will
+                                be taken into consideration. The keys are used to lookup values from the
+                                incoming pod labels, those key-value labels are merged with `labelSelector` as `key in (value)`
+                                to select the group of existing pods which pods will be taken into consideration
+                                for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+                                pod labels will be ignored. The default value is empty.
+                                The same key is forbidden to exist in both matchLabelKeys and labelSelector.
+                                Also, matchLabelKeys cannot be set when labelSelector isn't set.
+                              items:
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            mismatchLabelKeys:
+                              description: |-
+                                MismatchLabelKeys is a set of pod label keys to select which pods will
+                                be taken into consideration. The keys are used to lookup values from the
+                                incoming pod labels, those key-value labels are merged with `labelSelector` as `key notin (value)`
+                                to select the group of existing pods which pods will be taken into consideration
+                                for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+                                pod labels will be ignored. The default value is empty.
+                                The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
+                                Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
+                              items:
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            namespaceSelector:
+                              description: |-
+                                A label query over the set of namespaces that the term applies to.
+                                The term is applied to the union of the namespaces selected by this field
+                                and the ones listed in the namespaces field.
+                                null selector and null or empty namespaces list means "this pod's namespace".
+                                An empty selector ({}) matches all namespaces.
+                              properties:
+                                matchExpressions:
+                                  description: matchExpressions is a list of label
+                                    selector requirements. The requirements are ANDed.
+                                  items:
+                                    description: |-
+                                      A label selector requirement is a selector that contains values, a key, and an operator that
+                                      relates the key and values.
+                                    properties:
+                                      key:
+                                        description: key is the label key that the
+                                          selector applies to.
+                                        type: string
+                                      operator:
+                                        description: |-
+                                          operator represents a key's relationship to a set of values.
+                                          Valid operators are In, NotIn, Exists and DoesNotExist.
+                                        type: string
+                                      values:
+                                        description: |-
+                                          values is an array of string values. If the operator is In or NotIn,
+                                          the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                          the values array must be empty. This array is replaced during a strategic
+                                          merge patch.
+                                        items:
+                                          type: string
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                    required:
+                                    - key
+                                    - operator
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                matchLabels:
+                                  additionalProperties:
+                                    type: string
+                                  description: |-
+                                    matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                    map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                    operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                  type: object
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            namespaces:
+                              description: |-
+                                namespaces specifies a static list of namespace names that the term applies to.
+                                The term is applied to the union of the namespaces listed in this field
+                                and the ones selected by namespaceSelector.
+                                null or empty namespaces list and null namespaceSelector means "this pod's namespace".
+                              items:
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            topologyKey:
+                              description: |-
+                                This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching
+                                the labelSelector in the specified namespaces, where co-located is defined as running on a node
+                                whose value of the label with key topologyKey matches that of any node on which any of the
+                                selected pods is running.
+                                Empty topologyKey is not allowed.
+                              type: string
+                          required:
+                          - topologyKey
+                          type: object
+                        type: array
+                        x-kubernetes-list-type: atomic
+                    type: object
+                  podAntiAffinity:
+                    description: Describes pod anti-affinity scheduling rules (e.g.
+                      avoid putting this pod in the same node, zone, etc. as some
+                      other pod(s)).
+                    properties:
+                      preferredDuringSchedulingIgnoredDuringExecution:
+                        description: |-
+                          The scheduler will prefer to schedule pods to nodes that satisfy
+                          the anti-affinity expressions specified by this field, but it may choose
+                          a node that violates one or more of the expressions. The node that is
+                          most preferred is the one with the greatest sum of weights, i.e.
+                          for each node that meets all of the scheduling requirements (resource
+                          request, requiredDuringScheduling anti-affinity expressions, etc.),
+                          compute a sum by iterating through the elements of this field and subtracting
+                          "weight" from the sum if the node has pods which matches the corresponding podAffinityTerm; the
+                          node(s) with the highest sum are the most preferred.
+                        items:
+                          description: The weights of all of the matched WeightedPodAffinityTerm
+                            fields are added per-node to find the most preferred node(s)
+                          properties:
+                            podAffinityTerm:
+                              description: Required. A pod affinity term, associated
+                                with the corresponding weight.
+                              properties:
+                                labelSelector:
+                                  description: |-
+                                    A label query over a set of resources, in this case pods.
+                                    If it's null, this PodAffinityTerm matches with no Pods.
+                                  properties:
+                                    matchExpressions:
+                                      description: matchExpressions is a list of label
+                                        selector requirements. The requirements are
+                                        ANDed.
+                                      items:
+                                        description: |-
+                                          A label selector requirement is a selector that contains values, a key, and an operator that
+                                          relates the key and values.
+                                        properties:
+                                          key:
+                                            description: key is the label key that
+                                              the selector applies to.
+                                            type: string
+                                          operator:
+                                            description: |-
+                                              operator represents a key's relationship to a set of values.
+                                              Valid operators are In, NotIn, Exists and DoesNotExist.
+                                            type: string
+                                          values:
+                                            description: |-
+                                              values is an array of string values. If the operator is In or NotIn,
+                                              the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                              the values array must be empty. This array is replaced during a strategic
+                                              merge patch.
+                                            items:
+                                              type: string
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                        required:
+                                        - key
+                                        - operator
+                                        type: object
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    matchLabels:
+                                      additionalProperties:
+                                        type: string
+                                      description: |-
+                                        matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                        map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                        operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                      type: object
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                matchLabelKeys:
+                                  description: |-
+                                    MatchLabelKeys is a set of pod label keys to select which pods will
+                                    be taken into consideration. The keys are used to lookup values from the
+                                    incoming pod labels, those key-value labels are merged with `labelSelector` as `key in (value)`
+                                    to select the group of existing pods which pods will be taken into consideration
+                                    for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+                                    pod labels will be ignored. The default value is empty.
+                                    The same key is forbidden to exist in both matchLabelKeys and labelSelector.
+                                    Also, matchLabelKeys cannot be set when labelSelector isn't set.
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                mismatchLabelKeys:
+                                  description: |-
+                                    MismatchLabelKeys is a set of pod label keys to select which pods will
+                                    be taken into consideration. The keys are used to lookup values from the
+                                    incoming pod labels, those key-value labels are merged with `labelSelector` as `key notin (value)`
+                                    to select the group of existing pods which pods will be taken into consideration
+                                    for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+                                    pod labels will be ignored. The default value is empty.
+                                    The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
+                                    Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                namespaceSelector:
+                                  description: |-
+                                    A label query over the set of namespaces that the term applies to.
+                                    The term is applied to the union of the namespaces selected by this field
+                                    and the ones listed in the namespaces field.
+                                    null selector and null or empty namespaces list means "this pod's namespace".
+                                    An empty selector ({}) matches all namespaces.
+                                  properties:
+                                    matchExpressions:
+                                      description: matchExpressions is a list of label
+                                        selector requirements. The requirements are
+                                        ANDed.
+                                      items:
+                                        description: |-
+                                          A label selector requirement is a selector that contains values, a key, and an operator that
+                                          relates the key and values.
+                                        properties:
+                                          key:
+                                            description: key is the label key that
+                                              the selector applies to.
+                                            type: string
+                                          operator:
+                                            description: |-
+                                              operator represents a key's relationship to a set of values.
+                                              Valid operators are In, NotIn, Exists and DoesNotExist.
+                                            type: string
+                                          values:
+                                            description: |-
+                                              values is an array of string values. If the operator is In or NotIn,
+                                              the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                              the values array must be empty. This array is replaced during a strategic
+                                              merge patch.
+                                            items:
+                                              type: string
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                        required:
+                                        - key
+                                        - operator
+                                        type: object
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    matchLabels:
+                                      additionalProperties:
+                                        type: string
+                                      description: |-
+                                        matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                        map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                        operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                      type: object
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                namespaces:
+                                  description: |-
+                                    namespaces specifies a static list of namespace names that the term applies to.
+                                    The term is applied to the union of the namespaces listed in this field
+                                    and the ones selected by namespaceSelector.
+                                    null or empty namespaces list and null namespaceSelector means "this pod's namespace".
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                topologyKey:
+                                  description: |-
+                                    This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching
+                                    the labelSelector in the specified namespaces, where co-located is defined as running on a node
+                                    whose value of the label with key topologyKey matches that of any node on which any of the
+                                    selected pods is running.
+                                    Empty topologyKey is not allowed.
+                                  type: string
+                              required:
+                              - topologyKey
+                              type: object
+                            weight:
+                              description: |-
+                                weight associated with matching the corresponding podAffinityTerm,
+                                in the range 1-100.
+                              format: int32
+                              type: integer
+                          required:
+                          - podAffinityTerm
+                          - weight
+                          type: object
+                        type: array
+                        x-kubernetes-list-type: atomic
+                      requiredDuringSchedulingIgnoredDuringExecution:
+                        description: |-
+                          If the anti-affinity requirements specified by this field are not met at
+                          scheduling time, the pod will not be scheduled onto the node.
+                          If the anti-affinity requirements specified by this field cease to be met
+                          at some point during pod execution (e.g. due to a pod label update), the
+                          system may or may not try to eventually evict the pod from its node.
+                          When there are multiple elements, the lists of nodes corresponding to each
+                          podAffinityTerm are intersected, i.e. all terms must be satisfied.
+                        items:
+                          description: |-
+                            Defines a set of pods (namely those matching the labelSelector
+                            relative to the given namespace(s)) that this pod should be
+                            co-located (affinity) or not co-located (anti-affinity) with,
+                            where co-located is defined as running on a node whose value of
+                            the label with key <topologyKey> matches that of any node on which
+                            a pod of the set of pods is running
+                          properties:
+                            labelSelector:
+                              description: |-
+                                A label query over a set of resources, in this case pods.
+                                If it's null, this PodAffinityTerm matches with no Pods.
+                              properties:
+                                matchExpressions:
+                                  description: matchExpressions is a list of label
+                                    selector requirements. The requirements are ANDed.
+                                  items:
+                                    description: |-
+                                      A label selector requirement is a selector that contains values, a key, and an operator that
+                                      relates the key and values.
+                                    properties:
+                                      key:
+                                        description: key is the label key that the
+                                          selector applies to.
+                                        type: string
+                                      operator:
+                                        description: |-
+                                          operator represents a key's relationship to a set of values.
+                                          Valid operators are In, NotIn, Exists and DoesNotExist.
+                                        type: string
+                                      values:
+                                        description: |-
+                                          values is an array of string values. If the operator is In or NotIn,
+                                          the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                          the values array must be empty. This array is replaced during a strategic
+                                          merge patch.
+                                        items:
+                                          type: string
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                    required:
+                                    - key
+                                    - operator
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                matchLabels:
+                                  additionalProperties:
+                                    type: string
+                                  description: |-
+                                    matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                    map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                    operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                  type: object
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            matchLabelKeys:
+                              description: |-
+                                MatchLabelKeys is a set of pod label keys to select which pods will
+                                be taken into consideration. The keys are used to lookup values from the
+                                incoming pod labels, those key-value labels are merged with `labelSelector` as `key in (value)`
+                                to select the group of existing pods which pods will be taken into consideration
+                                for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+                                pod labels will be ignored. The default value is empty.
+                                The same key is forbidden to exist in both matchLabelKeys and labelSelector.
+                                Also, matchLabelKeys cannot be set when labelSelector isn't set.
+                              items:
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            mismatchLabelKeys:
+                              description: |-
+                                MismatchLabelKeys is a set of pod label keys to select which pods will
+                                be taken into consideration. The keys are used to lookup values from the
+                                incoming pod labels, those key-value labels are merged with `labelSelector` as `key notin (value)`
+                                to select the group of existing pods which pods will be taken into consideration
+                                for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+                                pod labels will be ignored. The default value is empty.
+                                The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
+                                Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
+                              items:
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            namespaceSelector:
+                              description: |-
+                                A label query over the set of namespaces that the term applies to.
+                                The term is applied to the union of the namespaces selected by this field
+                                and the ones listed in the namespaces field.
+                                null selector and null or empty namespaces list means "this pod's namespace".
+                                An empty selector ({}) matches all namespaces.
+                              properties:
+                                matchExpressions:
+                                  description: matchExpressions is a list of label
+                                    selector requirements. The requirements are ANDed.
+                                  items:
+                                    description: |-
+                                      A label selector requirement is a selector that contains values, a key, and an operator that
+                                      relates the key and values.
+                                    properties:
+                                      key:
+                                        description: key is the label key that the
+                                          selector applies to.
+                                        type: string
+                                      operator:
+                                        description: |-
+                                          operator represents a key's relationship to a set of values.
+                                          Valid operators are In, NotIn, Exists and DoesNotExist.
+                                        type: string
+                                      values:
+                                        description: |-
+                                          values is an array of string values. If the operator is In or NotIn,
+                                          the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                          the values array must be empty. This array is replaced during a strategic
+                                          merge patch.
+                                        items:
+                                          type: string
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                    required:
+                                    - key
+                                    - operator
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                matchLabels:
+                                  additionalProperties:
+                                    type: string
+                                  description: |-
+                                    matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                    map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                    operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                  type: object
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            namespaces:
+                              description: |-
+                                namespaces specifies a static list of namespace names that the term applies to.
+                                The term is applied to the union of the namespaces listed in this field
+                                and the ones selected by namespaceSelector.
+                                null or empty namespaces list and null namespaceSelector means "this pod's namespace".
+                              items:
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            topologyKey:
+                              description: |-
+                                This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching
+                                the labelSelector in the specified namespaces, where co-located is defined as running on a node
+                                whose value of the label with key topologyKey matches that of any node on which any of the
+                                selected pods is running.
+                                Empty topologyKey is not allowed.
+                              type: string
+                          required:
+                          - topologyKey
+                          type: object
+                        type: array
+                        x-kubernetes-list-type: atomic
+                    type: object
+                type: object
+              alertmanagerConfigMatcherStrategy:
+                description: |-
+                  alertmanagerConfigMatcherStrategy defines how AlertmanagerConfig objects
+                  process incoming alerts.
+                properties:
+                  type:
+                    default: OnNamespace
+                    description: |-
+                      type defines the strategy used by
+                      AlertmanagerConfig objects to match alerts in the routes and inhibition
+                      rules.
+
+                      The default value is `OnNamespace`.
+                    enum:
+                    - OnNamespace
+                    - OnNamespaceExceptForAlertmanagerNamespace
+                    - None
+                    type: string
+                type: object
+              alertmanagerConfigNamespaceSelector:
+                description: |-
+                  alertmanagerConfigNamespaceSelector defines the namespaces to be selected for AlertmanagerConfig discovery. If nil, only
+                  check own namespace.
+                properties:
+                  matchExpressions:
+                    description: matchExpressions is a list of label selector requirements.
+                      The requirements are ANDed.
+                    items:
+                      description: |-
+                        A label selector requirement is a selector that contains values, a key, and an operator that
+                        relates the key and values.
+                      properties:
+                        key:
+                          description: key is the label key that the selector applies
+                            to.
+                          type: string
+                        operator:
+                          description: |-
+                            operator represents a key's relationship to a set of values.
+                            Valid operators are In, NotIn, Exists and DoesNotExist.
+                          type: string
+                        values:
+                          description: |-
+                            values is an array of string values. If the operator is In or NotIn,
+                            the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                            the values array must be empty. This array is replaced during a strategic
+                            merge patch.
+                          items:
+                            type: string
+                          type: array
+                          x-kubernetes-list-type: atomic
+                      required:
+                      - key
+                      - operator
+                      type: object
+                    type: array
+                    x-kubernetes-list-type: atomic
+                  matchLabels:
+                    additionalProperties:
+                      type: string
+                    description: |-
+                      matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                      map is equivalent to an element of matchExpressions, whose key field is "key", the
+                      operator is "In", and the values array contains only "value". The requirements are ANDed.
+                    type: object
+                type: object
+                x-kubernetes-map-type: atomic
+              alertmanagerConfigSelector:
+                description: alertmanagerConfigSelector defines the selector to be
+                  used for to merge and configure Alertmanager with.
+                properties:
+                  matchExpressions:
+                    description: matchExpressions is a list of label selector requirements.
+                      The requirements are ANDed.
+                    items:
+                      description: |-
+                        A label selector requirement is a selector that contains values, a key, and an operator that
+                        relates the key and values.
+                      properties:
+                        key:
+                          description: key is the label key that the selector applies
+                            to.
+                          type: string
+                        operator:
+                          description: |-
+                            operator represents a key's relationship to a set of values.
+                            Valid operators are In, NotIn, Exists and DoesNotExist.
+                          type: string
+                        values:
+                          description: |-
+                            values is an array of string values. If the operator is In or NotIn,
+                            the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                            the values array must be empty. This array is replaced during a strategic
+                            merge patch.
+                          items:
+                            type: string
+                          type: array
+                          x-kubernetes-list-type: atomic
+                      required:
+                      - key
+                      - operator
+                      type: object
+                    type: array
+                    x-kubernetes-list-type: atomic
+                  matchLabels:
+                    additionalProperties:
+                      type: string
+                    description: |-
+                      matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                      map is equivalent to an element of matchExpressions, whose key field is "key", the
+                      operator is "In", and the values array contains only "value". The requirements are ANDed.
+                    type: object
+                type: object
+                x-kubernetes-map-type: atomic
+              alertmanagerConfiguration:
+                description: |-
+                  alertmanagerConfiguration defines the configuration of Alertmanager.
+
+                  If defined, it takes precedence over the `configSecret` field.
+
+                  This is an *experimental feature*, it may change in any upcoming release
+                  in a breaking way.
+                properties:
+                  global:
+                    description: global defines the global parameters of the Alertmanager
+                      configuration.
+                    properties:
+                      httpConfig:
+                        description: httpConfig defines the default HTTP configuration.
+                        properties:
+                          authorization:
+                            description: |-
+                              authorization configures the Authorization header credentials used by
+                              the client.
+
+                              Cannot be set at the same time as `basicAuth`, `bearerTokenSecret` or `oauth2`.
+                            properties:
+                              credentials:
+                                description: credentials defines a key of a Secret
+                                  in the namespace that contains the credentials for
+                                  authentication.
+                                properties:
+                                  key:
+                                    description: The key of the secret to select from.  Must
+                                      be a valid secret key.
+                                    type: string
+                                  name:
+                                    default: ""
+                                    description: |-
+                                      Name of the referent.
+                                      This field is effectively required, but due to backwards compatibility is
+                                      allowed to be empty. Instances of this type with an empty value here are
+                                      almost certainly wrong.
+                                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                    type: string
+                                  optional:
+                                    description: Specify whether the Secret or its
+                                      key must be defined
+                                    type: boolean
+                                required:
+                                - key
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              type:
+                                description: |-
+                                  type defines the authentication type. The value is case-insensitive.
+
+                                  "Basic" is not a supported value.
+
+                                  Default: "Bearer"
+                                type: string
+                            type: object
+                          basicAuth:
+                            description: |-
+                              basicAuth defines the Basic Authentication credentials used by the
+                              client.
+
+                              Cannot be set at the same time as `authorization`, `bearerTokenSecret` or `oauth2`.
+                            properties:
+                              password:
+                                description: |-
+                                  password defines a key of a Secret containing the password for
+                                  authentication.
+                                properties:
+                                  key:
+                                    description: The key of the secret to select from.  Must
+                                      be a valid secret key.
+                                    type: string
+                                  name:
+                                    default: ""
+                                    description: |-
+                                      Name of the referent.
+                                      This field is effectively required, but due to backwards compatibility is
+                                      allowed to be empty. Instances of this type with an empty value here are
+                                      almost certainly wrong.
+                                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                    type: string
+                                  optional:
+                                    description: Specify whether the Secret or its
+                                      key must be defined
+                                    type: boolean
+                                required:
+                                - key
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              username:
+                                description: |-
+                                  username defines a key of a Secret containing the username for
+                                  authentication.
+                                properties:
+                                  key:
+                                    description: The key of the secret to select from.  Must
+                                      be a valid secret key.
+                                    type: string
+                                  name:
+                                    default: ""
+                                    description: |-
+                                      Name of the referent.
+                                      This field is effectively required, but due to backwards compatibility is
+                                      allowed to be empty. Instances of this type with an empty value here are
+                                      almost certainly wrong.
+                                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                    type: string
+                                  optional:
+                                    description: Specify whether the Secret or its
+                                      key must be defined
+                                    type: boolean
+                                required:
+                                - key
+                                type: object
+                                x-kubernetes-map-type: atomic
+                            type: object
+                          bearerTokenSecret:
+                            description: |-
+                              bearerTokenSecret defines a key of a Secret containing the bearer token
+                              used by the client for authentication. The secret needs to be in the
+                              same namespace as the custom resource and readable by the Prometheus
+                              Operator.
+
+                              Cannot be set at the same time as `authorization`, `basicAuth` or `oauth2`.
+
+                              Deprecated: use `authorization` instead.
+                            properties:
+                              key:
+                                description: The key of the secret to select from.  Must
+                                  be a valid secret key.
+                                type: string
+                              name:
+                                default: ""
+                                description: |-
+                                  Name of the referent.
+                                  This field is effectively required, but due to backwards compatibility is
+                                  allowed to be empty. Instances of this type with an empty value here are
+                                  almost certainly wrong.
+                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                type: string
+                              optional:
+                                description: Specify whether the Secret or its key
+                                  must be defined
+                                type: boolean
+                            required:
+                            - key
+                            type: object
+                            x-kubernetes-map-type: atomic
+                          enableHttp2:
+                            description: enableHttp2 can be used to disable HTTP2.
+                            type: boolean
+                          followRedirects:
+                            description: |-
+                              followRedirects defines whether the client should follow HTTP 3xx
+                              redirects.
+                            type: boolean
+                          noProxy:
+                            description: |-
+                              noProxy defines a comma-separated string that can contain IPs, CIDR notation, domain names
+                              that should be excluded from proxying. IP and domain names can
+                              contain port numbers.
+
+                              It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                            type: string
+                          oauth2:
+                            description: |-
+                              oauth2 defines the OAuth2 settings used by the client.
+
+                              It requires Prometheus >= 2.27.0.
+
+                              Cannot be set at the same time as `authorization`, `basicAuth` or `bearerTokenSecret`.
+                            properties:
+                              clientId:
+                                description: |-
+                                  clientId defines a key of a Secret or ConfigMap containing the
+                                  OAuth2 client's ID.
+                                properties:
+                                  configMap:
+                                    description: configMap defines the ConfigMap containing
+                                      data to use for the targets.
+                                    properties:
+                                      key:
+                                        description: The key to select.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the ConfigMap
+                                          or its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  secret:
+                                    description: secret defines the Secret containing
+                                      data to use for the targets.
+                                    properties:
+                                      key:
+                                        description: The key of the secret to select
+                                          from.  Must be a valid secret key.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the Secret or
+                                          its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                type: object
+                              clientSecret:
+                                description: |-
+                                  clientSecret defines a key of a Secret containing the OAuth2
+                                  client's secret.
+                                properties:
+                                  key:
+                                    description: The key of the secret to select from.  Must
+                                      be a valid secret key.
+                                    type: string
+                                  name:
+                                    default: ""
+                                    description: |-
+                                      Name of the referent.
+                                      This field is effectively required, but due to backwards compatibility is
+                                      allowed to be empty. Instances of this type with an empty value here are
+                                      almost certainly wrong.
+                                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                    type: string
+                                  optional:
+                                    description: Specify whether the Secret or its
+                                      key must be defined
+                                    type: boolean
+                                required:
+                                - key
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              endpointParams:
+                                additionalProperties:
+                                  type: string
+                                description: |-
+                                  endpointParams configures the HTTP parameters to append to the token
+                                  URL.
+                                type: object
+                              noProxy:
+                                description: |-
+                                  noProxy defines a comma-separated string that can contain IPs, CIDR notation, domain names
+                                  that should be excluded from proxying. IP and domain names can
+                                  contain port numbers.
+
+                                  It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                                type: string
+                              proxyConnectHeader:
+                                additionalProperties:
+                                  items:
+                                    description: SecretKeySelector selects a key of
+                                      a Secret.
+                                    properties:
+                                      key:
+                                        description: The key of the secret to select
+                                          from.  Must be a valid secret key.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the Secret or
+                                          its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  type: array
+                                description: |-
+                                  proxyConnectHeader optionally specifies headers to send to
+                                  proxies during CONNECT requests.
+
+                                  It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              proxyFromEnvironment:
+                                description: |-
+                                  proxyFromEnvironment defines whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+
+                                  It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                                type: boolean
+                              proxyUrl:
+                                description: proxyUrl defines the HTTP proxy server
+                                  to use.
+                                pattern: ^(http|https|socks5)://.+$
+                                type: string
+                              scopes:
+                                description: scopes defines the OAuth2 scopes used
+                                  for the token request.
+                                items:
+                                  type: string
+                                type: array
+                              tlsConfig:
+                                description: |-
+                                  tlsConfig defines the TLS configuration to use when connecting to the OAuth2 server.
+                                  It requires Prometheus >= v2.43.0.
+                                properties:
+                                  ca:
+                                    description: ca defines the Certificate authority
+                                      used when verifying server certificates.
+                                    properties:
+                                      configMap:
+                                        description: configMap defines the ConfigMap
+                                          containing data to use for the targets.
+                                        properties:
+                                          key:
+                                            description: The key to select.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the ConfigMap
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      secret:
+                                        description: secret defines the Secret containing
+                                          data to use for the targets.
+                                        properties:
+                                          key:
+                                            description: The key of the secret to
+                                              select from.  Must be a valid secret
+                                              key.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the Secret
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                    type: object
+                                  cert:
+                                    description: cert defines the Client certificate
+                                      to present when doing client-authentication.
+                                    properties:
+                                      configMap:
+                                        description: configMap defines the ConfigMap
+                                          containing data to use for the targets.
+                                        properties:
+                                          key:
+                                            description: The key to select.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the ConfigMap
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      secret:
+                                        description: secret defines the Secret containing
+                                          data to use for the targets.
+                                        properties:
+                                          key:
+                                            description: The key of the secret to
+                                              select from.  Must be a valid secret
+                                              key.
+                                            type: string
+                                          name:
+                                            default: ""
+                                            description: |-
+                                              Name of the referent.
+                                              This field is effectively required, but due to backwards compatibility is
+                                              allowed to be empty. Instances of this type with an empty value here are
+                                              almost certainly wrong.
+                                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                            type: string
+                                          optional:
+                                            description: Specify whether the Secret
+                                              or its key must be defined
+                                            type: boolean
+                                        required:
+                                        - key
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                    type: object
+                                  insecureSkipVerify:
+                                    description: insecureSkipVerify defines how to
+                                      disable target certificate validation.
+                                    type: boolean
+                                  keySecret:
+                                    description: keySecret defines the Secret containing
+                                      the client key file for the targets.
+                                    properties:
+                                      key:
+                                        description: The key of the secret to select
+                                          from.  Must be a valid secret key.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the Secret or
+                                          its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  maxVersion:
+                                    description: |-
+                                      maxVersion defines the maximum acceptable TLS version.
+
+                                      It requires Prometheus >= v2.41.0 or Thanos >= v0.31.0.
+                                    enum:
+                                    - TLS10
+                                    - TLS11
+                                    - TLS12
+                                    - TLS13
+                                    type: string
+                                  minVersion:
+                                    description: |-
+                                      minVersion defines the minimum acceptable TLS version.
+
+                                      It requires Prometheus >= v2.35.0 or Thanos >= v0.28.0.
+                                    enum:
+                                    - TLS10
+                                    - TLS11
+                                    - TLS12
+                                    - TLS13
+                                    type: string
+                                  serverName:
+                                    description: serverName is used to verify the
+                                      hostname for the targets.
+                                    type: string
+                                type: object
+                              tokenUrl:
+                                description: tokenUrl defines the URL to fetch the
+                                  token from.
+                                minLength: 1
+                                type: string
+                            required:
+                            - clientId
+                            - clientSecret
+                            - tokenUrl
+                            type: object
+                          proxyConnectHeader:
+                            additionalProperties:
+                              items:
+                                description: SecretKeySelector selects a key of a
+                                  Secret.
+                                properties:
+                                  key:
+                                    description: The key of the secret to select from.  Must
+                                      be a valid secret key.
+                                    type: string
+                                  name:
+                                    default: ""
+                                    description: |-
+                                      Name of the referent.
+                                      This field is effectively required, but due to backwards compatibility is
+                                      allowed to be empty. Instances of this type with an empty value here are
+                                      almost certainly wrong.
+                                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                    type: string
+                                  optional:
+                                    description: Specify whether the Secret or its
+                                      key must be defined
+                                    type: boolean
+                                required:
+                                - key
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              type: array
+                            description: |-
+                              proxyConnectHeader optionally specifies headers to send to
+                              proxies during CONNECT requests.
+
+                              It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                            type: object
+                            x-kubernetes-map-type: atomic
+                          proxyFromEnvironment:
+                            description: |-
+                              proxyFromEnvironment defines whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+
+                              It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                            type: boolean
+                          proxyUrl:
+                            description: proxyUrl defines the HTTP proxy server to
+                              use.
+                            pattern: ^(http|https|socks5)://.+$
+                            type: string
+                          tlsConfig:
+                            description: tlsConfig defines the TLS configuration used
+                              by the client.
+                            properties:
+                              ca:
+                                description: ca defines the Certificate authority
+                                  used when verifying server certificates.
+                                properties:
+                                  configMap:
+                                    description: configMap defines the ConfigMap containing
+                                      data to use for the targets.
+                                    properties:
+                                      key:
+                                        description: The key to select.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the ConfigMap
+                                          or its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  secret:
+                                    description: secret defines the Secret containing
+                                      data to use for the targets.
+                                    properties:
+                                      key:
+                                        description: The key of the secret to select
+                                          from.  Must be a valid secret key.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the Secret or
+                                          its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                type: object
+                              cert:
+                                description: cert defines the Client certificate to
+                                  present when doing client-authentication.
+                                properties:
+                                  configMap:
+                                    description: configMap defines the ConfigMap containing
+                                      data to use for the targets.
+                                    properties:
+                                      key:
+                                        description: The key to select.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the ConfigMap
+                                          or its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  secret:
+                                    description: secret defines the Secret containing
+                                      data to use for the targets.
+                                    properties:
+                                      key:
+                                        description: The key of the secret to select
+                                          from.  Must be a valid secret key.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the Secret or
+                                          its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                type: object
+                              insecureSkipVerify:
+                                description: insecureSkipVerify defines how to disable
+                                  target certificate validation.
+                                type: boolean
+                              keySecret:
+                                description: keySecret defines the Secret containing
+                                  the client key file for the targets.
+                                properties:
+                                  key:
+                                    description: The key of the secret to select from.  Must
+                                      be a valid secret key.
+                                    type: string
+                                  name:
+                                    default: ""
+                                    description: |-
+                                      Name of the referent.
+                                      This field is effectively required, but due to backwards compatibility is
+                                      allowed to be empty. Instances of this type with an empty value here are
+                                      almost certainly wrong.
+                                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                    type: string
+                                  optional:
+                                    description: Specify whether the Secret or its
+                                      key must be defined
+                                    type: boolean
+                                required:
+                                - key
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              maxVersion:
+                                description: |-
+                                  maxVersion defines the maximum acceptable TLS version.
+
+                                  It requires Prometheus >= v2.41.0 or Thanos >= v0.31.0.
+                                enum:
+                                - TLS10
+                                - TLS11
+                                - TLS12
+                                - TLS13
+                                type: string
+                              minVersion:
+                                description: |-
+                                  minVersion defines the minimum acceptable TLS version.
+
+                                  It requires Prometheus >= v2.35.0 or Thanos >= v0.28.0.
+                                enum:
+                                - TLS10
+                                - TLS11
+                                - TLS12
+                                - TLS13
+                                type: string
+                              serverName:
+                                description: serverName is used to verify the hostname
+                                  for the targets.
+                                type: string
+                            type: object
+                        type: object
+                      jira:
+                        description: jira defines the default configuration for Jira.
+                        properties:
+                          apiURL:
+                            description: |-
+                              apiURL defines the default Jira API URL.
+
+                              It requires Alertmanager >= v0.28.0.
+                            pattern: ^(http|https)://.+$
+                            type: string
+                        type: object
+                      opsGenieApiKey:
+                        description: opsGenieApiKey defines the default OpsGenie API
+                          Key.
+                        properties:
+                          key:
+                            description: The key of the secret to select from.  Must
+                              be a valid secret key.
+                            type: string
+                          name:
+                            default: ""
+                            description: |-
+                              Name of the referent.
+                              This field is effectively required, but due to backwards compatibility is
+                              allowed to be empty. Instances of this type with an empty value here are
+                              almost certainly wrong.
+                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                            type: string
+                          optional:
+                            description: Specify whether the Secret or its key must
+                              be defined
+                            type: boolean
+                        required:
+                        - key
+                        type: object
+                        x-kubernetes-map-type: atomic
+                      opsGenieApiUrl:
+                        description: opsGenieApiUrl defines the default OpsGenie API
+                          URL.
+                        properties:
+                          key:
+                            description: The key of the secret to select from.  Must
+                              be a valid secret key.
+                            type: string
+                          name:
+                            default: ""
+                            description: |-
+                              Name of the referent.
+                              This field is effectively required, but due to backwards compatibility is
+                              allowed to be empty. Instances of this type with an empty value here are
+                              almost certainly wrong.
+                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                            type: string
+                          optional:
+                            description: Specify whether the Secret or its key must
+                              be defined
+                            type: boolean
+                        required:
+                        - key
+                        type: object
+                        x-kubernetes-map-type: atomic
+                      pagerdutyUrl:
+                        description: pagerdutyUrl defines the default Pagerduty URL.
+                        pattern: ^(http|https)://.+$
+                        type: string
+                      resolveTimeout:
+                        description: |-
+                          resolveTimeout defines the default value used by alertmanager if the alert does
+                          not include EndsAt, after this time passes it can declare the alert as resolved if it has not been updated.
+                          This has no impact on alerts from Prometheus, as they always include EndsAt.
+                        pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
+                        type: string
+                      rocketChat:
+                        description: rocketChat defines the default configuration
+                          for Rocket Chat.
+                        properties:
+                          apiURL:
+                            description: |-
+                              apiURL defines the default Rocket Chat API URL.
+
+                              It requires Alertmanager >= v0.28.0.
+                            pattern: ^(http|https)://.+$
+                            type: string
+                          token:
+                            description: |-
+                              token defines the default Rocket Chat token.
+
+                              It requires Alertmanager >= v0.28.0.
+                            properties:
+                              key:
+                                description: The key of the secret to select from.  Must
+                                  be a valid secret key.
+                                type: string
+                              name:
+                                default: ""
+                                description: |-
+                                  Name of the referent.
+                                  This field is effectively required, but due to backwards compatibility is
+                                  allowed to be empty. Instances of this type with an empty value here are
+                                  almost certainly wrong.
+                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                type: string
+                              optional:
+                                description: Specify whether the Secret or its key
+                                  must be defined
+                                type: boolean
+                            required:
+                            - key
+                            type: object
+                            x-kubernetes-map-type: atomic
+                          tokenID:
+                            description: |-
+                              tokenID defines the default Rocket Chat Token ID.
+
+                              It requires Alertmanager >= v0.28.0.
+                            properties:
+                              key:
+                                description: The key of the secret to select from.  Must
+                                  be a valid secret key.
+                                type: string
+                              name:
+                                default: ""
+                                description: |-
+                                  Name of the referent.
+                                  This field is effectively required, but due to backwards compatibility is
+                                  allowed to be empty. Instances of this type with an empty value here are
+                                  almost certainly wrong.
+                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                type: string
+                              optional:
+                                description: Specify whether the Secret or its key
+                                  must be defined
+                                type: boolean
+                            required:
+                            - key
+                            type: object
+                            x-kubernetes-map-type: atomic
+                        type: object
+                      slackApiUrl:
+                        description: slackApiUrl defines the default Slack API URL.
+                        properties:
+                          key:
+                            description: The key of the secret to select from.  Must
+                              be a valid secret key.
+                            type: string
+                          name:
+                            default: ""
+                            description: |-
+                              Name of the referent.
+                              This field is effectively required, but due to backwards compatibility is
+                              allowed to be empty. Instances of this type with an empty value here are
+                              almost certainly wrong.
+                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                            type: string
+                          optional:
+                            description: Specify whether the Secret or its key must
+                              be defined
+                            type: boolean
+                        required:
+                        - key
+                        type: object
+                        x-kubernetes-map-type: atomic
+                      smtp:
+                        description: smtp defines global SMTP parameters.
+                        properties:
+                          authIdentity:
+                            description: authIdentity represents SMTP Auth using PLAIN
+                            type: string
+                          authPassword:
+                            description: authPassword represents SMTP Auth using LOGIN
+                              and PLAIN.
+                            properties:
+                              key:
+                                description: The key of the secret to select from.  Must
+                                  be a valid secret key.
+                                type: string
+                              name:
+                                default: ""
+                                description: |-
+                                  Name of the referent.
+                                  This field is effectively required, but due to backwards compatibility is
+                                  allowed to be empty. Instances of this type with an empty value here are
+                                  almost certainly wrong.
+                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                type: string
+                              optional:
+                                description: Specify whether the Secret or its key
+                                  must be defined
+                                type: boolean
+                            required:
+                            - key
+                            type: object
+                            x-kubernetes-map-type: atomic
+                          authSecret:
+                            description: authSecret represents SMTP Auth using CRAM-MD5.
+                            properties:
+                              key:
+                                description: The key of the secret to select from.  Must
+                                  be a valid secret key.
+                                type: string
+                              name:
+                                default: ""
+                                description: |-
+                                  Name of the referent.
+                                  This field is effectively required, but due to backwards compatibility is
+                                  allowed to be empty. Instances of this type with an empty value here are
+                                  almost certainly wrong.
+                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                type: string
+                              optional:
+                                description: Specify whether the Secret or its key
+                                  must be defined
+                                type: boolean
+                            required:
+                            - key
+                            type: object
+                            x-kubernetes-map-type: atomic
+                          authUsername:
+                            description: authUsername represents SMTP Auth using CRAM-MD5,
+                              LOGIN and PLAIN. If empty, Alertmanager doesn't authenticate
+                              to the SMTP server.
+                            type: string
+                          from:
+                            description: from defines the default SMTP From header
+                              field.
+                            type: string
+                          hello:
+                            description: hello defines the default hostname to identify
+                              to the SMTP server.
+                            type: string
+                          requireTLS:
+                            description: |-
+                              requireTLS defines the default SMTP TLS requirement.
+                              Note that Go does not support unencrypted connections to remote SMTP endpoints.
+                            type: boolean
+                          smartHost:
+                            description: smartHost defines the default SMTP smarthost
+                              used for sending emails.
+                            properties:
+                              host:
+                                description: host defines the host's address, it can
+                                  be a DNS name or a literal IP address.
+                                minLength: 1
+                                type: string
+                              port:
+                                description: port defines the host's port, it can
+                                  be a literal port number or a port name.
+                                minLength: 1
+                                type: string
+                            required:
+                            - host
+                            - port
+                            type: object
+                          tlsConfig:
+                            description: tlsConfig defines the default TLS configuration
+                              for SMTP receivers
+                            properties:
+                              ca:
+                                description: ca defines the Certificate authority
+                                  used when verifying server certificates.
+                                properties:
+                                  configMap:
+                                    description: configMap defines the ConfigMap containing
+                                      data to use for the targets.
+                                    properties:
+                                      key:
+                                        description: The key to select.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the ConfigMap
+                                          or its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  secret:
+                                    description: secret defines the Secret containing
+                                      data to use for the targets.
+                                    properties:
+                                      key:
+                                        description: The key of the secret to select
+                                          from.  Must be a valid secret key.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the Secret or
+                                          its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                type: object
+                              cert:
+                                description: cert defines the Client certificate to
+                                  present when doing client-authentication.
+                                properties:
+                                  configMap:
+                                    description: configMap defines the ConfigMap containing
+                                      data to use for the targets.
+                                    properties:
+                                      key:
+                                        description: The key to select.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the ConfigMap
+                                          or its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  secret:
+                                    description: secret defines the Secret containing
+                                      data to use for the targets.
+                                    properties:
+                                      key:
+                                        description: The key of the secret to select
+                                          from.  Must be a valid secret key.
+                                        type: string
+                                      name:
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        type: string
+                                      optional:
+                                        description: Specify whether the Secret or
+                                          its key must be defined
+                                        type: boolean
+                                    required:
+                                    - key
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                type: object
+                              insecureSkipVerify:
+                                description: insecureSkipVerify defines how to disable
+                                  target certificate validation.
+                                type: boolean
+                              keySecret:
+                                description: keySecret defines the Secret containing
+                                  the client key file for the targets.
+                                properties:
+                                  key:
+                                    description: The key of the secret to select from.  Must
+                                      be a valid secret key.
+                                    type: string
+                                  name:
+                                    default: ""
+                                    description: |-
+                                      Name of the referent.
+                                      This field is effectively required, but due to backwards compatibility is
+                                      allowed to be empty. Instances of this type with an empty value here are
+                                      almost certainly wrong.
+                                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                    type: string
+                                  optional:
+                                    description: Specify whether the Secret or its
+                                      key must be defined
+                                    type: boolean
+                                required:
+                                - key
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              maxVersion:
+                                description: |-
+                                  maxVersion defines the maximum acceptable TLS version.
+
+                                  It requires Prometheus >= v2.41.0 or Thanos >= v0.31.0.
+                                enum:
+                                - TLS10
+                                - TLS11
+                                - TLS12
+                                - TLS13
+                                type: string
+                              minVersion:
+                                description: |-
+                                  minVersion defines the minimum acceptable TLS version.
+
+                                  It requires Prometheus >= v2.35.0 or Thanos >= v0.28.0.
+                                enum:
+                                - TLS10
+                                - TLS11
+                                - TLS12
+                                - TLS13
+                                type: string
+                              serverName:
+                                description: serverName is used to verify the hostname
+                                  for the targets.
+                                type: string
+                            type: object
+                        type: object
+                      telegram:
+                        description: telegram defines the default Telegram config
+                        properties:
+                          apiURL:
+                            description: |-
+                              apiURL defines he default Telegram API URL.
+
+                              It requires Alertmanager >= v0.24.0.
+                            pattern: ^(http|https)://.+$
+                            type: string
+                        type: object
+                      victorops:
+                        description: victorops defines the default configuration for
+                          VictorOps.
+                        properties:
+                          apiKey:
+                            description: apiKey defines the default VictorOps API
+                              Key.
+                            properties:
+                              key:
+                                description: The key of the secret to select from.  Must
+                                  be a valid secret key.
+                                type: string
+                              name:
+                                default: ""
+                                description: |-
+                                  Name of the referent.
+                                  This field is effectively required, but due to backwards compatibility is
+                                  allowed to be empty. Instances of this type with an empty value here are
+                                  almost certainly wrong.
+                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                type: string
+                              optional:
+                                description: Specify whether the Secret or its key
+                                  must be defined
+                                type: boolean
+                            required:
+                            - key
+                            type: object
+                            x-kubernetes-map-type: atomic
+                          apiURL:
+                            description: apiURL defines the default VictorOps API
+                              URL.
+                            pattern: ^(http|https)://.+$
+                            type: string
+                        type: object
+                      webex:
+                        description: webex defines the default configuration for Jira.
+                        properties:
+                          apiURL:
+                            description: |-
+                              apiURL defines the is the default Webex API URL.
+
+                              It requires Alertmanager >= v0.25.0.
+                            pattern: ^(http|https)://.+$
+                            type: string
+                        type: object
+                      wechat:
+                        description: wechat defines the default WeChat Config
+                        properties:
+                          apiCorpID:
+                            description: apiCorpID defines the default WeChat API
+                              Corporate ID.
+                            minLength: 1
+                            type: string
+                          apiSecret:
+                            description: apiSecret defines the default WeChat API
+                              Secret.
+                            properties:
+                              key:
+                                description: The key of the secret to select from.  Must
+                                  be a valid secret key.
+                                type: string
+                              name:
+                                default: ""
+                                description: |-
+                                  Name of the referent.
+                                  This field is effectively required, but due to backwards compatibility is
+                                  allowed to be empty. Instances of this type with an empty value here are
+                                  almost certainly wrong.
+                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                type: string
+                              optional:
+                                description: Specify whether the Secret or its key
+                                  must be defined
+                                type: boolean
+                            required:
+                            - key
+                            type: object
+                            x-kubernetes-map-type: atomic
+                          apiURL:
+                            description: |-
+                              apiURL defines he default WeChat API URL.
+                              The default value is "https://qyapi.weixin.qq.com/cgi-bin/"
+                            pattern: ^(http|https)://.+$
+                            type: string
+                        type: object
+                    type: object
+                  name:
+                    description: |-
+                      name defines the name of the AlertmanagerConfig custom resource which is used to generate the Alertmanager configuration.
+                      It must be defined in the same namespace as the Alertmanager object.
+                      The operator will not enforce a `namespace` label for routes and inhibition rules.
+                    minLength: 1
+                    type: string
+                  templates:
+                    description: templates defines the custom notification templates.
+                    items:
+                      description: SecretOrConfigMap allows to specify data as a Secret
+                        or ConfigMap. Fields are mutually exclusive.
+                      properties:
+                        configMap:
+                          description: configMap defines the ConfigMap containing
+                            data to use for the targets.
+                          properties:
+                            key:
+                              description: The key to select.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the ConfigMap or its key
+                                must be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        secret:
+                          description: secret defines the Secret containing data to
+                            use for the targets.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                      type: object
+                    type: array
+                type: object
+              automountServiceAccountToken:
+                description: |-
+                  automountServiceAccountToken defines whether a service account token should be automatically mounted in the pod.
+                  If the service account has `automountServiceAccountToken: true`, set the field to `false` to opt out of automounting API credentials.
+                type: boolean
+              baseImage:
+                description: |-
+                  baseImage that is used to deploy pods, without tag.
+                  Deprecated: use 'image' instead.
+                type: string
+              clusterAdvertiseAddress:
+                description: |-
+                  clusterAdvertiseAddress defines the explicit address to advertise in cluster.
+                  Needs to be provided for non RFC1918 [1] (public) addresses.
+                  [1] RFC1918: https://tools.ietf.org/html/rfc1918
+                type: string
+              clusterGossipInterval:
+                description: clusterGossipInterval defines the interval between gossip
+                  attempts.
+                pattern: ^(0|(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
+                type: string
+              clusterLabel:
+                description: |-
+                  clusterLabel defines the identifier that uniquely identifies the Alertmanager cluster.
+                  You should only set it when the Alertmanager cluster includes Alertmanager instances which are external to this Alertmanager resource. In practice, the addresses of the external instances are provided via the `.spec.additionalPeers` field.
+                type: string
+              clusterPeerTimeout:
+                description: clusterPeerTimeout defines the timeout for cluster peering.
+                pattern: ^(0|(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
+                type: string
+              clusterPushpullInterval:
+                description: clusterPushpullInterval defines the interval between
+                  pushpull attempts.
+                pattern: ^(0|(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
+                type: string
+              clusterTLS:
+                description: |-
+                  clusterTLS defines the mutual TLS configuration for the Alertmanager cluster's gossip protocol.
+
+                  It requires Alertmanager >= 0.24.0.
+                properties:
+                  client:
+                    description: client defines the client-side configuration for
+                      mutual TLS.
+                    properties:
+                      ca:
+                        description: ca defines the Certificate authority used when
+                          verifying server certificates.
+                        properties:
+                          configMap:
+                            description: configMap defines the ConfigMap containing
+                              data to use for the targets.
+                            properties:
+                              key:
+                                description: The key to select.
+                                type: string
+                              name:
+                                default: ""
+                                description: |-
+                                  Name of the referent.
+                                  This field is effectively required, but due to backwards compatibility is
+                                  allowed to be empty. Instances of this type with an empty value here are
+                                  almost certainly wrong.
+                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                type: string
+                              optional:
+                                description: Specify whether the ConfigMap or its
+                                  key must be defined
+                                type: boolean
+                            required:
+                            - key
+                            type: object
+                            x-kubernetes-map-type: atomic
+                          secret:
+                            description: secret defines the Secret containing data
+                              to use for the targets.
+                            properties:
+                              key:
+                                description: The key of the secret to select from.  Must
+                                  be a valid secret key.
+                                type: string
+                              name:
+                                default: ""
+                                description: |-
+                                  Name of the referent.
+                                  This field is effectively required, but due to backwards compatibility is
+                                  allowed to be empty. Instances of this type with an empty value here are
+                                  almost certainly wrong.
+                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                type: string
+                              optional:
+                                description: Specify whether the Secret or its key
+                                  must be defined
+                                type: boolean
+                            required:
+                            - key
+                            type: object
+                            x-kubernetes-map-type: atomic
+                        type: object
+                      cert:
+                        description: cert defines the Client certificate to present
+                          when doing client-authentication.
+                        properties:
+                          configMap:
+                            description: configMap defines the ConfigMap containing
+                              data to use for the targets.
+                            properties:
+                              key:
+                                description: The key to select.
+                                type: string
+                              name:
+                                default: ""
+                                description: |-
+                                  Name of the referent.
+                                  This field is effectively required, but due to backwards compatibility is
+                                  allowed to be empty. Instances of this type with an empty value here are
+                                  almost certainly wrong.
+                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                type: string
+                              optional:
+                                description: Specify whether the ConfigMap or its
+                                  key must be defined
+                                type: boolean
+                            required:
+                            - key
+                            type: object
+                            x-kubernetes-map-type: atomic
+                          secret:
+                            description: secret defines the Secret containing data
+                              to use for the targets.
+                            properties:
+                              key:
+                                description: The key of the secret to select from.  Must
+                                  be a valid secret key.
+                                type: string
+                              name:
+                                default: ""
+                                description: |-
+                                  Name of the referent.
+                                  This field is effectively required, but due to backwards compatibility is
+                                  allowed to be empty. Instances of this type with an empty value here are
+                                  almost certainly wrong.
+                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                type: string
+                              optional:
+                                description: Specify whether the Secret or its key
+                                  must be defined
+                                type: boolean
+                            required:
+                            - key
+                            type: object
+                            x-kubernetes-map-type: atomic
+                        type: object
+                      insecureSkipVerify:
+                        description: insecureSkipVerify defines how to disable target
+                          certificate validation.
+                        type: boolean
+                      keySecret:
+                        description: keySecret defines the Secret containing the client
+                          key file for the targets.
+                        properties:
+                          key:
+                            description: The key of the secret to select from.  Must
+                              be a valid secret key.
+                            type: string
+                          name:
+                            default: ""
+                            description: |-
+                              Name of the referent.
+                              This field is effectively required, but due to backwards compatibility is
+                              allowed to be empty. Instances of this type with an empty value here are
+                              almost certainly wrong.
+                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                            type: string
+                          optional:
+                            description: Specify whether the Secret or its key must
+                              be defined
+                            type: boolean
+                        required:
+                        - key
+                        type: object
+                        x-kubernetes-map-type: atomic
+                      maxVersion:
+                        description: |-
+                          maxVersion defines the maximum acceptable TLS version.
+
+                          It requires Prometheus >= v2.41.0 or Thanos >= v0.31.0.
+                        enum:
+                        - TLS10
+                        - TLS11
+                        - TLS12
+                        - TLS13
+                        type: string
+                      minVersion:
+                        description: |-
+                          minVersion defines the minimum acceptable TLS version.
+
+                          It requires Prometheus >= v2.35.0 or Thanos >= v0.28.0.
+                        enum:
+                        - TLS10
+                        - TLS11
+                        - TLS12
+                        - TLS13
+                        type: string
+                      serverName:
+                        description: serverName is used to verify the hostname for
+                          the targets.
+                        type: string
+                    type: object
+                  server:
+                    description: server defines the server-side configuration for
+                      mutual TLS.
+                    properties:
+                      cert:
+                        description: |-
+                          cert defines the Secret or ConfigMap containing the TLS certificate for the web server.
+
+                          Either `keySecret` or `keyFile` must be defined.
+
+                          It is mutually exclusive with `certFile`.
+                        properties:
+                          configMap:
+                            description: configMap defines the ConfigMap containing
+                              data to use for the targets.
+                            properties:
+                              key:
+                                description: The key to select.
+                                type: string
+                              name:
+                                default: ""
+                                description: |-
+                                  Name of the referent.
+                                  This field is effectively required, but due to backwards compatibility is
+                                  allowed to be empty. Instances of this type with an empty value here are
+                                  almost certainly wrong.
+                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                type: string
+                              optional:
+                                description: Specify whether the ConfigMap or its
+                                  key must be defined
+                                type: boolean
+                            required:
+                            - key
+                            type: object
+                            x-kubernetes-map-type: atomic
+                          secret:
+                            description: secret defines the Secret containing data
+                              to use for the targets.
+                            properties:
+                              key:
+                                description: The key of the secret to select from.  Must
+                                  be a valid secret key.
+                                type: string
+                              name:
+                                default: ""
+                                description: |-
+                                  Name of the referent.
+                                  This field is effectively required, but due to backwards compatibility is
+                                  allowed to be empty. Instances of this type with an empty value here are
+                                  almost certainly wrong.
+                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                type: string
+                              optional:
+                                description: Specify whether the Secret or its key
+                                  must be defined
+                                type: boolean
+                            required:
+                            - key
+                            type: object
+                            x-kubernetes-map-type: atomic
+                        type: object
+                      certFile:
+                        description: |-
+                          certFile defines the path to the TLS certificate file in the container for the web server.
+
+                          Either `keySecret` or `keyFile` must be defined.
+
+                          It is mutually exclusive with `cert`.
+                        type: string
+                      cipherSuites:
+                        description: |-
+                          cipherSuites defines the list of supported cipher suites for TLS versions up to TLS 1.2.
+
+                          If not defined, the Go default cipher suites are used.
+                          Available cipher suites are documented in the Go documentation:
+                          https://golang.org/pkg/crypto/tls/#pkg-constants
+                        items:
+                          type: string
+                        type: array
+                      client_ca:
+                        description: |-
+                          client_ca defines the Secret or ConfigMap containing the CA certificate for client certificate
+                          authentication to the server.
+
+                          It is mutually exclusive with `clientCAFile`.
+                        properties:
+                          configMap:
+                            description: configMap defines the ConfigMap containing
+                              data to use for the targets.
+                            properties:
+                              key:
+                                description: The key to select.
+                                type: string
+                              name:
+                                default: ""
+                                description: |-
+                                  Name of the referent.
+                                  This field is effectively required, but due to backwards compatibility is
+                                  allowed to be empty. Instances of this type with an empty value here are
+                                  almost certainly wrong.
+                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                type: string
+                              optional:
+                                description: Specify whether the ConfigMap or its
+                                  key must be defined
+                                type: boolean
+                            required:
+                            - key
+                            type: object
+                            x-kubernetes-map-type: atomic
+                          secret:
+                            description: secret defines the Secret containing data
+                              to use for the targets.
+                            properties:
+                              key:
+                                description: The key of the secret to select from.  Must
+                                  be a valid secret key.
+                                type: string
+                              name:
+                                default: ""
+                                description: |-
+                                  Name of the referent.
+                                  This field is effectively required, but due to backwards compatibility is
+                                  allowed to be empty. Instances of this type with an empty value here are
+                                  almost certainly wrong.
+                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                type: string
+                              optional:
+                                description: Specify whether the Secret or its key
+                                  must be defined
+                                type: boolean
+                            required:
+                            - key
+                            type: object
+                            x-kubernetes-map-type: atomic
+                        type: object
+                      clientAuthType:
+                        description: |-
+                          clientAuthType defines the server policy for client TLS authentication.
+
+                          For more detail on clientAuth options:
+                          https://golang.org/pkg/crypto/tls/#ClientAuthType
+                        type: string
+                      clientCAFile:
+                        description: |-
+                          clientCAFile defines the path to the CA certificate file for client certificate authentication to
+                          the server.
+
+                          It is mutually exclusive with `client_ca`.
+                        type: string
+                      curvePreferences:
+                        description: |-
+                          curvePreferences defines elliptic curves that will be used in an ECDHE handshake, in preference
+                          order.
+
+                          Available curves are documented in the Go documentation:
+                          https://golang.org/pkg/crypto/tls/#CurveID
+                        items:
+                          type: string
+                        type: array
+                      keyFile:
+                        description: |-
+                          keyFile defines the path to the TLS private key file in the container for the web server.
+
+                          If defined, either `cert` or `certFile` must be defined.
+
+                          It is mutually exclusive with `keySecret`.
+                        type: string
+                      keySecret:
+                        description: |-
+                          keySecret defines the secret containing the TLS private key for the web server.
+
+                          Either `cert` or `certFile` must be defined.
+
+                          It is mutually exclusive with `keyFile`.
+                        properties:
+                          key:
+                            description: The key of the secret to select from.  Must
+                              be a valid secret key.
+                            type: string
+                          name:
+                            default: ""
+                            description: |-
+                              Name of the referent.
+                              This field is effectively required, but due to backwards compatibility is
+                              allowed to be empty. Instances of this type with an empty value here are
+                              almost certainly wrong.
+                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                            type: string
+                          optional:
+                            description: Specify whether the Secret or its key must
+                              be defined
+                            type: boolean
+                        required:
+                        - key
+                        type: object
+                        x-kubernetes-map-type: atomic
+                      maxVersion:
+                        description: maxVersion defines the Maximum TLS version that
+                          is acceptable.
+                        type: string
+                      minVersion:
+                        description: minVersion defines the minimum TLS version that
+                          is acceptable.
+                        type: string
+                      preferServerCipherSuites:
+                        description: |-
+                          preferServerCipherSuites defines whether the server selects the client's most preferred cipher
+                          suite, or the server's most preferred cipher suite.
+
+                          If true then the server's preference, as expressed in
+                          the order of elements in cipherSuites, is used.
+                        type: boolean
+                    type: object
+                required:
+                - client
+                - server
+                type: object
+              configMaps:
+                description: |-
+                  configMaps defines a list of ConfigMaps in the same namespace as the Alertmanager
+                  object, which shall be mounted into the Alertmanager Pods.
+                  Each ConfigMap is added to the StatefulSet definition as a volume named `configmap-<configmap-name>`.
+                  The ConfigMaps are mounted into `/etc/alertmanager/configmaps/<configmap-name>` in the 'alertmanager' container.
+                items:
+                  type: string
+                type: array
+              configSecret:
+                description: |-
+                  configSecret defines the name of a Kubernetes Secret in the same namespace as the
+                  Alertmanager object, which contains the configuration for this Alertmanager
+                  instance. If empty, it defaults to `alertmanager-<alertmanager-name>`.
+
+                  The Alertmanager configuration should be available under the
+                  `alertmanager.yaml` key. Additional keys from the original secret are
+                  copied to the generated secret and mounted into the
+                  `/etc/alertmanager/config` directory in the `alertmanager` container.
+
+                  If either the secret or the `alertmanager.yaml` key is missing, the
+                  operator provisions a minimal Alertmanager configuration with one empty
+                  receiver (effectively dropping alert notifications).
+                type: string
+              containers:
+                description: |-
+                  containers allows injecting additional containers. This is meant to
+                  allow adding an authentication proxy to an Alertmanager pod.
+                  Containers described here modify an operator generated container if they
+                  share the same name and modifications are done via a strategic merge
+                  patch. The current container names are: `alertmanager` and
+                  `config-reloader`. Overriding containers is entirely outside the scope
+                  of what the maintainers will support and by doing so, you accept that
+                  this behaviour may break at any time without notice.
+                items:
+                  description: A single application container that you want to run
+                    within a pod.
+                  properties:
+                    args:
+                      description: |-
+                        Arguments to the entrypoint.
+                        The container image's CMD is used if this is not provided.
+                        Variable references $(VAR_NAME) are expanded using the container's environment. If a variable
+                        cannot be resolved, the reference in the input string will be unchanged. Double $$ are reduced
+                        to a single $, which allows for escaping the $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)" will
+                        produce the string literal "$(VAR_NAME)". Escaped references will never be expanded, regardless
+                        of whether the variable exists or not. Cannot be updated.
+                        More info: https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell
+                      items:
+                        type: string
+                      type: array
+                      x-kubernetes-list-type: atomic
+                    command:
+                      description: |-
+                        Entrypoint array. Not executed within a shell.
+                        The container image's ENTRYPOINT is used if this is not provided.
+                        Variable references $(VAR_NAME) are expanded using the container's environment. If a variable
+                        cannot be resolved, the reference in the input string will be unchanged. Double $$ are reduced
+                        to a single $, which allows for escaping the $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)" will
+                        produce the string literal "$(VAR_NAME)". Escaped references will never be expanded, regardless
+                        of whether the variable exists or not. Cannot be updated.
+                        More info: https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell
+                      items:
+                        type: string
+                      type: array
+                      x-kubernetes-list-type: atomic
+                    env:
+                      description: |-
+                        List of environment variables to set in the container.
+                        Cannot be updated.
+                      items:
+                        description: EnvVar represents an environment variable present
+                          in a Container.
+                        properties:
+                          name:
+                            description: |-
+                              Name of the environment variable.
+                              May consist of any printable ASCII characters except '='.
+                            type: string
+                          value:
+                            description: |-
+                              Variable references $(VAR_NAME) are expanded
+                              using the previously defined environment variables in the container and
+                              any service environment variables. If a variable cannot be resolved,
+                              the reference in the input string will be unchanged. Double $$ are reduced
+                              to a single $, which allows for escaping the $(VAR_NAME) syntax: i.e.
+                              "$$(VAR_NAME)" will produce the string literal "$(VAR_NAME)".
+                              Escaped references will never be expanded, regardless of whether the variable
+                              exists or not.
+                              Defaults to "".
+                            type: string
+                          valueFrom:
+                            description: Source for the environment variable's value.
+                              Cannot be used if value is not empty.
+                            properties:
+                              configMapKeyRef:
+                                description: Selects a key of a ConfigMap.
+                                properties:
+                                  key:
+                                    description: The key to select.
+                                    type: string
+                                  name:
+                                    default: ""
+                                    description: |-
+                                      Name of the referent.
+                                      This field is effectively required, but due to backwards compatibility is
+                                      allowed to be empty. Instances of this type with an empty value here are
+                                      almost certainly wrong.
+                                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                    type: string
+                                  optional:
+                                    description: Specify whether the ConfigMap or
+                                      its key must be defined
+                                    type: boolean
+                                required:
+                                - key
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              fieldRef:
+                                description: |-
+                                  Selects a field of the pod: supports metadata.name, metadata.namespace, `metadata.labels['<KEY>']`, `metadata.annotations['<KEY>']`,
+                                  spec.nodeName, spec.serviceAccountName, status.hostIP, status.podIP, status.podIPs.
+                                properties:
+                                  apiVersion:
+                                    description: Version of the schema the FieldPath
+                                      is written in terms of, defaults to "v1".
+                                    type: string
+                                  fieldPath:
+                                    description: Path of the field to select in the
+                                      specified API version.
+                                    type: string
+                                required:
+                                - fieldPath
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              fileKeyRef:
+                                description: |-
+                                  FileKeyRef selects a key of the env file.
+                                  Requires the EnvFiles feature gate to be enabled.
+                                properties:
+                                  key:
+                                    description: |-
+                                      The key within the env file. An invalid key will prevent the pod from starting.
+                                      The keys defined within a source may consist of any printable ASCII characters except '='.
+                                      During Alpha stage of the EnvFiles feature gate, the key size is limited to 128 characters.
+                                    type: string
+                                  optional:
+                                    default: false
+                                    description: |-
+                                      Specify whether the file or its key must be defined. If the file or key
+                                      does not exist, then the env var is not published.
+                                      If optional is set to true and the specified key does not exist,
+                                      the environment variable will not be set in the Pod's containers.
+
+                                      If optional is set to false and the specified key does not exist,
+                                      an error will be returned during Pod creation.
+                                    type: boolean
+                                  path:
+                                    description: |-
+                                      The path within the volume from which to select the file.
+                                      Must be relative and may not contain the '..' path or start with '..'.
+                                    type: string
+                                  volumeName:
+                                    description: The name of the volume mount containing
+                                      the env file.
+                                    type: string
+                                required:
+                                - key
+                                - path
+                                - volumeName
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              resourceFieldRef:
+                                description: |-
+                                  Selects a resource of the container: only resources limits and requests
+                                  (limits.cpu, limits.memory, limits.ephemeral-storage, requests.cpu, requests.memory and requests.ephemeral-storage) are currently supported.
+                                properties:
+                                  containerName:
+                                    description: 'Container name: required for volumes,
+                                      optional for env vars'
+                                    type: string
+                                  divisor:
+                                    anyOf:
+                                    - type: integer
+                                    - type: string
+                                    description: Specifies the output format of the
+                                      exposed resources, defaults to "1"
+                                    pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                    x-kubernetes-int-or-string: true
+                                  resource:
+                                    description: 'Required: resource to select'
+                                    type: string
+                                required:
+                                - resource
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              secretKeyRef:
+                                description: Selects a key of a secret in the pod's
+                                  namespace
+                                properties:
+                                  key:
+                                    description: The key of the secret to select from.  Must
+                                      be a valid secret key.
+                                    type: string
+                                  name:
+                                    default: ""
+                                    description: |-
+                                      Name of the referent.
+                                      This field is effectively required, but due to backwards compatibility is
+                                      allowed to be empty. Instances of this type with an empty value here are
+                                      almost certainly wrong.
+                                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                    type: string
+                                  optional:
+                                    description: Specify whether the Secret or its
+                                      key must be defined
+                                    type: boolean
+                                required:
+                                - key
+                                type: object
+                                x-kubernetes-map-type: atomic
+                            type: object
+                        required:
+                        - name
+                        type: object
+                      type: array
+                      x-kubernetes-list-map-keys:
+                      - name
+                      x-kubernetes-list-type: map
+                    envFrom:
+                      description: |-
+                        List of sources to populate environment variables in the container.
+                        The keys defined within a source may consist of any printable ASCII characters except '='.
+                        When a key exists in multiple
+                        sources, the value associated with the last source will take precedence.
+                        Values defined by an Env with a duplicate key will take precedence.
+                        Cannot be updated.
+                      items:
+                        description: EnvFromSource represents the source of a set
+                          of ConfigMaps or Secrets
+                        properties:
+                          configMapRef:
+                            description: The ConfigMap to select from
+                            properties:
+                              name:
+                                default: ""
+                                description: |-
+                                  Name of the referent.
+                                  This field is effectively required, but due to backwards compatibility is
+                                  allowed to be empty. Instances of this type with an empty value here are
+                                  almost certainly wrong.
+                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                type: string
+                              optional:
+                                description: Specify whether the ConfigMap must be
+                                  defined
+                                type: boolean
+                            type: object
+                            x-kubernetes-map-type: atomic
+                          prefix:
+                            description: |-
+                              Optional text to prepend to the name of each environment variable.
+                              May consist of any printable ASCII characters except '='.
+                            type: string
+                          secretRef:
+                            description: The Secret to select from
+                            properties:
+                              name:
+                                default: ""
+                                description: |-
+                                  Name of the referent.
+                                  This field is effectively required, but due to backwards compatibility is
+                                  allowed to be empty. Instances of this type with an empty value here are
+                                  almost certainly wrong.
+                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                type: string
+                              optional:
+                                description: Specify whether the Secret must be defined
+                                type: boolean
+                            type: object
+                            x-kubernetes-map-type: atomic
+                        type: object
+                      type: array
+                      x-kubernetes-list-type: atomic
+                    image:
+                      description: |-
+                        Container image name.
+                        More info: https://kubernetes.io/docs/concepts/containers/images
+                        This field is optional to allow higher level config management to default or override
+                        container images in workload controllers like Deployments and StatefulSets.
+                      type: string
+                    imagePullPolicy:
+                      description: |-
+                        Image pull policy.
+                        One of Always, Never, IfNotPresent.
+                        Defaults to Always if :latest tag is specified, or IfNotPresent otherwise.
+                        Cannot be updated.
+                        More info: https://kubernetes.io/docs/concepts/containers/images#updating-images
+                      type: string
+                    lifecycle:
+                      description: |-
+                        Actions that the management system should take in response to container lifecycle events.
+                        Cannot be updated.
+                      properties:
+                        postStart:
+                          description: |-
+                            PostStart is called immediately after a container is created. If the handler fails,
+                            the container is terminated and restarted according to its restart policy.
+                            Other management of the container blocks until the hook completes.
+                            More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
+                          properties:
+                            exec:
+                              description: Exec specifies a command to execute in
+                                the container.
+                              properties:
+                                command:
+                                  description: |-
+                                    Command is the command line to execute inside the container, the working directory for the
+                                    command  is root ('/') in the container's filesystem. The command is simply exec'd, it is
+                                    not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use
+                                    a shell, you need to explicitly call out to that shell.
+                                    Exit status of 0 is treated as live/healthy and non-zero is unhealthy.
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                              type: object
+                            httpGet:
+                              description: HTTPGet specifies an HTTP GET request to
+                                perform.
+                              properties:
+                                host:
+                                  description: |-
+                                    Host name to connect to, defaults to the pod IP. You probably want to set
+                                    "Host" in httpHeaders instead.
+                                  type: string
+                                httpHeaders:
+                                  description: Custom headers to set in the request.
+                                    HTTP allows repeated headers.
+                                  items:
+                                    description: HTTPHeader describes a custom header
+                                      to be used in HTTP probes
+                                    properties:
+                                      name:
+                                        description: |-
+                                          The header field name.
+                                          This will be canonicalized upon output, so case-variant names will be understood as the same header.
+                                        type: string
+                                      value:
+                                        description: The header field value
+                                        type: string
+                                    required:
+                                    - name
+                                    - value
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                path:
+                                  description: Path to access on the HTTP server.
+                                  type: string
+                                port:
+                                  anyOf:
+                                  - type: integer
+                                  - type: string
+                                  description: |-
+                                    Name or number of the port to access on the container.
+                                    Number must be in the range 1 to 65535.
+                                    Name must be an IANA_SVC_NAME.
+                                  x-kubernetes-int-or-string: true
+                                scheme:
+                                  description: |-
+                                    Scheme to use for connecting to the host.
+                                    Defaults to HTTP.
+                                  type: string
+                              required:
+                              - port
+                              type: object
+                            sleep:
+                              description: Sleep represents a duration that the container
+                                should sleep.
+                              properties:
+                                seconds:
+                                  description: Seconds is the number of seconds to
+                                    sleep.
+                                  format: int64
+                                  type: integer
+                              required:
+                              - seconds
+                              type: object
+                            tcpSocket:
+                              description: |-
+                                Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
+                                for backward compatibility. There is no validation of this field and
+                                lifecycle hooks will fail at runtime when it is specified.
+                              properties:
+                                host:
+                                  description: 'Optional: Host name to connect to,
+                                    defaults to the pod IP.'
+                                  type: string
+                                port:
+                                  anyOf:
+                                  - type: integer
+                                  - type: string
+                                  description: |-
+                                    Number or name of the port to access on the container.
+                                    Number must be in the range 1 to 65535.
+                                    Name must be an IANA_SVC_NAME.
+                                  x-kubernetes-int-or-string: true
+                              required:
+                              - port
+                              type: object
+                          type: object
+                        preStop:
+                          description: |-
+                            PreStop is called immediately before a container is terminated due to an
+                            API request or management event such as liveness/startup probe failure,
+                            preemption, resource contention, etc. The handler is not called if the
+                            container crashes or exits. The Pod's termination grace period countdown begins before the
+                            PreStop hook is executed. Regardless of the outcome of the handler, the
+                            container will eventually terminate within the Pod's termination grace
+                            period (unless delayed by finalizers). Other management of the container blocks until the hook completes
+                            or until the termination grace period is reached.
+                            More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
+                          properties:
+                            exec:
+                              description: Exec specifies a command to execute in
+                                the container.
+                              properties:
+                                command:
+                                  description: |-
+                                    Command is the command line to execute inside the container, the working directory for the
+                                    command  is root ('/') in the container's filesystem. The command is simply exec'd, it is
+                                    not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use
+                                    a shell, you need to explicitly call out to that shell.
+                                    Exit status of 0 is treated as live/healthy and non-zero is unhealthy.
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                              type: object
+                            httpGet:
+                              description: HTTPGet specifies an HTTP GET request to
+                                perform.
+                              properties:
+                                host:
+                                  description: |-
+                                    Host name to connect to, defaults to the pod IP. You probably want to set
+                                    "Host" in httpHeaders instead.
+                                  type: string
+                                httpHeaders:
+                                  description: Custom headers to set in the request.
+                                    HTTP allows repeated headers.
+                                  items:
+                                    description: HTTPHeader describes a custom header
+                                      to be used in HTTP probes
+                                    properties:
+                                      name:
+                                        description: |-
+                                          The header field name.
+                                          This will be canonicalized upon output, so case-variant names will be understood as the same header.
+                                        type: string
+                                      value:
+                                        description: The header field value
+                                        type: string
+                                    required:
+                                    - name
+                                    - value
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                path:
+                                  description: Path to access on the HTTP server.
+                                  type: string
+                                port:
+                                  anyOf:
+                                  - type: integer
+                                  - type: string
+                                  description: |-
+                                    Name or number of the port to access on the container.
+                                    Number must be in the range 1 to 65535.
+                                    Name must be an IANA_SVC_NAME.
+                                  x-kubernetes-int-or-string: true
+                                scheme:
+                                  description: |-
+                                    Scheme to use for connecting to the host.
+                                    Defaults to HTTP.
+                                  type: string
+                              required:
+                              - port
+                              type: object
+                            sleep:
+                              description: Sleep represents a duration that the container
+                                should sleep.
+                              properties:
+                                seconds:
+                                  description: Seconds is the number of seconds to
+                                    sleep.
+                                  format: int64
+                                  type: integer
+                              required:
+                              - seconds
+                              type: object
+                            tcpSocket:
+                              description: |-
+                                Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
+                                for backward compatibility. There is no validation of this field and
+                                lifecycle hooks will fail at runtime when it is specified.
+                              properties:
+                                host:
+                                  description: 'Optional: Host name to connect to,
+                                    defaults to the pod IP.'
+                                  type: string
+                                port:
+                                  anyOf:
+                                  - type: integer
+                                  - type: string
+                                  description: |-
+                                    Number or name of the port to access on the container.
+                                    Number must be in the range 1 to 65535.
+                                    Name must be an IANA_SVC_NAME.
+                                  x-kubernetes-int-or-string: true
+                              required:
+                              - port
+                              type: object
+                          type: object
+                        stopSignal:
+                          description: |-
+                            StopSignal defines which signal will be sent to a container when it is being stopped.
+                            If not specified, the default is defined by the container runtime in use.
+                            StopSignal can only be set for Pods with a non-empty .spec.os.name
+                          type: string
+                      type: object
+                    livenessProbe:
+                      description: |-
+                        Periodic probe of container liveness.
+                        Container will be restarted if the probe fails.
+                        Cannot be updated.
+                        More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                      properties:
+                        exec:
+                          description: Exec specifies a command to execute in the
+                            container.
+                          properties:
+                            command:
+                              description: |-
+                                Command is the command line to execute inside the container, the working directory for the
+                                command  is root ('/') in the container's filesystem. The command is simply exec'd, it is
+                                not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use
+                                a shell, you need to explicitly call out to that shell.
+                                Exit status of 0 is treated as live/healthy and non-zero is unhealthy.
+                              items:
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                          type: object
+                        failureThreshold:
+                          description: |-
+                            Minimum consecutive failures for the probe to be considered failed after having succeeded.
+                            Defaults to 3. Minimum value is 1.
+                          format: int32
+                          type: integer
+                        grpc:
+                          description: GRPC specifies a GRPC HealthCheckRequest.
+                          properties:
+                            port:
+                              description: Port number of the gRPC service. Number
+                                must be in the range 1 to 65535.
+                              format: int32
+                              type: integer
+                            service:
+                              default: ""
+                              description: |-
+                                Service is the name of the service to place in the gRPC HealthCheckRequest
+                                (see https://github.com/grpc/grpc/blob/master/doc/health-checking.md).
+
+                                If this is not specified, the default behavior is defined by gRPC.
+                              type: string
+                          required:
+                          - port
+                          type: object
+                        httpGet:
+                          description: HTTPGet specifies an HTTP GET request to perform.
+                          properties:
+                            host:
+                              description: |-
+                                Host name to connect to, defaults to the pod IP. You probably want to set
+                                "Host" in httpHeaders instead.
+                              type: string
+                            httpHeaders:
+                              description: Custom headers to set in the request. HTTP
+                                allows repeated headers.
+                              items:
+                                description: HTTPHeader describes a custom header
+                                  to be used in HTTP probes
+                                properties:
+                                  name:
+                                    description: |-
+                                      The header field name.
+                                      This will be canonicalized upon output, so case-variant names will be understood as the same header.
+                                    type: string
+                                  value:
+                                    description: The header field value
+                                    type: string
+                                required:
+                                - name
+                                - value
+                                type: object
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            path:
+                              description: Path to access on the HTTP server.
+                              type: string
+                            port:
+                              anyOf:
+                              - type: integer
+                              - type: string
+                              description: |-
+                                Name or number of the port to access on the container.
+                                Number must be in the range 1 to 65535.
+                                Name must be an IANA_SVC_NAME.
+                              x-kubernetes-int-or-string: true
+                            scheme:
+                              description: |-
+                                Scheme to use for connecting to the host.
+                                Defaults to HTTP.
+                              type: string
+                          required:
+                          - port
+                          type: object
+                        initialDelaySeconds:
+                          description: |-
+                            Number of seconds after the container has started before liveness probes are initiated.
+                            More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                          format: int32
+                          type: integer
+                        periodSeconds:
+                          description: |-
+                            How often (in seconds) to perform the probe.
+                            Default to 10 seconds. Minimum value is 1.
+                          format: int32
+                          type: integer
+                        successThreshold:
+                          description: |-
+                            Minimum consecutive successes for the probe to be considered successful after having failed.
+                            Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
+                          format: int32
+                          type: integer
+                        tcpSocket:
+                          description: TCPSocket specifies a connection to a TCP port.
+                          properties:
+                            host:
+                              description: 'Optional: Host name to connect to, defaults
+                                to the pod IP.'
+                              type: string
+                            port:
+                              anyOf:
+                              - type: integer
+                              - type: string
+                              description: |-
+                                Number or name of the port to access on the container.
+                                Number must be in the range 1 to 65535.
+                                Name must be an IANA_SVC_NAME.
+                              x-kubernetes-int-or-string: true
+                          required:
+                          - port
+                          type: object
+                        terminationGracePeriodSeconds:
+                          description: |-
+                            Optional duration in seconds the pod needs to terminate gracefully upon probe failure.
+                            The grace period is the duration in seconds after the processes running in the pod are sent
+                            a termination signal and the time when the processes are forcibly halted with a kill signal.
+                            Set this value longer than the expected cleanup time for your process.
+                            If this value is nil, the pod's terminationGracePeriodSeconds will be used. Otherwise, this
+                            value overrides the value provided by the pod spec.
+                            Value must be non-negative integer. The value zero indicates stop immediately via
+                            the kill signal (no opportunity to shut down).
+                            This is a beta field and requires enabling ProbeTerminationGracePeriod feature gate.
+                            Minimum value is 1. spec.terminationGracePeriodSeconds is used if unset.
+                          format: int64
+                          type: integer
+                        timeoutSeconds:
+                          description: |-
+                            Number of seconds after which the probe times out.
+                            Defaults to 1 second. Minimum value is 1.
+                            More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                          format: int32
+                          type: integer
+                      type: object
+                    name:
+                      description: |-
+                        Name of the container specified as a DNS_LABEL.
+                        Each container in a pod must have a unique name (DNS_LABEL).
+                        Cannot be updated.
+                      type: string
+                    ports:
+                      description: |-
+                        List of ports to expose from the container. Not specifying a port here
+                        DOES NOT prevent that port from being exposed. Any port which is
+                        listening on the default "0.0.0.0" address inside a container will be
+                        accessible from the network.
+                        Modifying this array with strategic merge patch may corrupt the data.
+                        For more information See https://github.com/kubernetes/kubernetes/issues/108255.
+                        Cannot be updated.
+                      items:
+                        description: ContainerPort represents a network port in a
+                          single container.
+                        properties:
+                          containerPort:
+                            description: |-
+                              Number of port to expose on the pod's IP address.
+                              This must be a valid port number, 0 < x < 65536.
+                            format: int32
+                            type: integer
+                          hostIP:
+                            description: What host IP to bind the external port to.
+                            type: string
+                          hostPort:
+                            description: |-
+                              Number of port to expose on the host.
+                              If specified, this must be a valid port number, 0 < x < 65536.
+                              If HostNetwork is specified, this must match ContainerPort.
+                              Most containers do not need this.
+                            format: int32
+                            type: integer
+                          name:
+                            description: |-
+                              If specified, this must be an IANA_SVC_NAME and unique within the pod. Each
+                              named port in a pod must have a unique name. Name for the port that can be
+                              referred to by services.
+                            type: string
+                          protocol:
+                            default: TCP
+                            description: |-
+                              Protocol for port. Must be UDP, TCP, or SCTP.
+                              Defaults to "TCP".
+                            type: string
+                        required:
+                        - containerPort
+                        type: object
+                      type: array
+                      x-kubernetes-list-map-keys:
+                      - containerPort
+                      - protocol
+                      x-kubernetes-list-type: map
+                    readinessProbe:
+                      description: |-
+                        Periodic probe of container service readiness.
+                        Container will be removed from service endpoints if the probe fails.
+                        Cannot be updated.
+                        More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                      properties:
+                        exec:
+                          description: Exec specifies a command to execute in the
+                            container.
+                          properties:
+                            command:
+                              description: |-
+                                Command is the command line to execute inside the container, the working directory for the
+                                command  is root ('/') in the container's filesystem. The command is simply exec'd, it is
+                                not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use
+                                a shell, you need to explicitly call out to that shell.
+                                Exit status of 0 is treated as live/healthy and non-zero is unhealthy.
+                              items:
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                          type: object
+                        failureThreshold:
+                          description: |-
+                            Minimum consecutive failures for the probe to be considered failed after having succeeded.
+                            Defaults to 3. Minimum value is 1.
+                          format: int32
+                          type: integer
+                        grpc:
+                          description: GRPC specifies a GRPC HealthCheckRequest.
+                          properties:
+                            port:
+                              description: Port number of the gRPC service. Number
+                                must be in the range 1 to 65535.
+                              format: int32
+                              type: integer
+                            service:
+                              default: ""
+                              description: |-
+                                Service is the name of the service to place in the gRPC HealthCheckRequest
+                                (see https://github.com/grpc/grpc/blob/master/doc/health-checking.md).
+
+                                If this is not specified, the default behavior is defined by gRPC.
+                              type: string
+                          required:
+                          - port
+                          type: object
+                        httpGet:
+                          description: HTTPGet specifies an HTTP GET request to perform.
+                          properties:
+                            host:
+                              description: |-
+                                Host name to connect to, defaults to the pod IP. You probably want to set
+                                "Host" in httpHeaders instead.
+                              type: string
+                            httpHeaders:
+                              description: Custom headers to set in the request. HTTP
+                                allows repeated headers.
+                              items:
+                                description: HTTPHeader describes a custom header
+                                  to be used in HTTP probes
+                                properties:
+                                  name:
+                                    description: |-
+                                      The header field name.
+                                      This will be canonicalized upon output, so case-variant names will be understood as the same header.
+                                    type: string
+                                  value:
+                                    description: The header field value
+                                    type: string
+                                required:
+                                - name
+                                - value
+                                type: object
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            path:
+                              description: Path to access on the HTTP server.
+                              type: string
+                            port:
+                              anyOf:
+                              - type: integer
+                              - type: string
+                              description: |-
+                                Name or number of the port to access on the container.
+                                Number must be in the range 1 to 65535.
+                                Name must be an IANA_SVC_NAME.
+                              x-kubernetes-int-or-string: true
+                            scheme:
+                              description: |-
+                                Scheme to use for connecting to the host.
+                                Defaults to HTTP.
+                              type: string
+                          required:
+                          - port
+                          type: object
+                        initialDelaySeconds:
+                          description: |-
+                            Number of seconds after the container has started before liveness probes are initiated.
+                            More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                          format: int32
+                          type: integer
+                        periodSeconds:
+                          description: |-
+                            How often (in seconds) to perform the probe.
+                            Default to 10 seconds. Minimum value is 1.
+                          format: int32
+                          type: integer
+                        successThreshold:
+                          description: |-
+                            Minimum consecutive successes for the probe to be considered successful after having failed.
+                            Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
+                          format: int32
+                          type: integer
+                        tcpSocket:
+                          description: TCPSocket specifies a connection to a TCP port.
+                          properties:
+                            host:
+                              description: 'Optional: Host name to connect to, defaults
+                                to the pod IP.'
+                              type: string
+                            port:
+                              anyOf:
+                              - type: integer
+                              - type: string
+                              description: |-
+                                Number or name of the port to access on the container.
+                                Number must be in the range 1 to 65535.
+                                Name must be an IANA_SVC_NAME.
+                              x-kubernetes-int-or-string: true
+                          required:
+                          - port
+                          type: object
+                        terminationGracePeriodSeconds:
+                          description: |-
+                            Optional duration in seconds the pod needs to terminate gracefully upon probe failure.
+                            The grace period is the duration in seconds after the processes running in the pod are sent
+                            a termination signal and the time when the processes are forcibly halted with a kill signal.
+                            Set this value longer than the expected cleanup time for your process.
+                            If this value is nil, the pod's terminationGracePeriodSeconds will be used. Otherwise, this
+                            value overrides the value provided by the pod spec.
+                            Value must be non-negative integer. The value zero indicates stop immediately via
+                            the kill signal (no opportunity to shut down).
+                            This is a beta field and requires enabling ProbeTerminationGracePeriod feature gate.
+                            Minimum value is 1. spec.terminationGracePeriodSeconds is used if unset.
+                          format: int64
+                          type: integer
+                        timeoutSeconds:
+                          description: |-
+                            Number of seconds after which the probe times out.
+                            Defaults to 1 second. Minimum value is 1.
+                            More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                          format: int32
+                          type: integer
+                      type: object
+                    resizePolicy:
+                      description: Resources resize policy for the container.
+                      items:
+                        description: ContainerResizePolicy represents resource resize
+                          policy for the container.
+                        properties:
+                          resourceName:
+                            description: |-
+                              Name of the resource to which this resource resize policy applies.
+                              Supported values: cpu, memory.
+                            type: string
+                          restartPolicy:
+                            description: |-
+                              Restart policy to apply when specified resource is resized.
+                              If not specified, it defaults to NotRequired.
+                            type: string
+                        required:
+                        - resourceName
+                        - restartPolicy
+                        type: object
+                      type: array
+                      x-kubernetes-list-type: atomic
+                    resources:
+                      description: |-
+                        Compute Resources required by this container.
+                        Cannot be updated.
+                        More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+                      properties:
+                        claims:
+                          description: |-
+                            Claims lists the names of resources, defined in spec.resourceClaims,
+                            that are used by this container.
+
+                            This field depends on the
+                            DynamicResourceAllocation feature gate.
+
+                            This field is immutable. It can only be set for containers.
+                          items:
+                            description: ResourceClaim references one entry in PodSpec.ResourceClaims.
+                            properties:
+                              name:
+                                description: |-
+                                  Name must match the name of one entry in pod.spec.resourceClaims of
+                                  the Pod where this field is used. It makes that resource available
+                                  inside a container.
+                                type: string
+                              request:
+                                description: |-
+                                  Request is the name chosen for a request in the referenced claim.
+                                  If empty, everything from the claim is made available, otherwise
+                                  only the result of this request.
+                                type: string
+                            required:
+                            - name
+                            type: object
+                          type: array
+                          x-kubernetes-list-map-keys:
+                          - name
+                          x-kubernetes-list-type: map
+                        limits:
+                          additionalProperties:
+                            anyOf:
+                            - type: integer
+                            - type: string
+                            pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                            x-kubernetes-int-or-string: true
+                          description: |-
+                            Limits describes the maximum amount of compute resources allowed.
+                            More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+                          type: object
+                        requests:
+                          additionalProperties:
+                            anyOf:
+                            - type: integer
+                            - type: string
+                            pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                            x-kubernetes-int-or-string: true
+                          description: |-
+                            Requests describes the minimum amount of compute resources required.
+                            If Requests is omitted for a container, it defaults to Limits if that is explicitly specified,
+                            otherwise to an implementation-defined value. Requests cannot exceed Limits.
+                            More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+                          type: object
+                      type: object
+                    restartPolicy:
+                      description: |-
+                        RestartPolicy defines the restart behavior of individual containers in a pod.
+                        This overrides the pod-level restart policy. When this field is not specified,
+                        the restart behavior is defined by the Pod's restart policy and the container type.
+                        Additionally, setting the RestartPolicy as "Always" for the init container will
+                        have the following effect:
+                        this init container will be continually restarted on
+                        exit until all regular containers have terminated. Once all regular
+                        containers have completed, all init containers with restartPolicy "Always"
+                        will be shut down. This lifecycle differs from normal init containers and
+                        is often referred to as a "sidecar" container. Although this init
+                        container still starts in the init container sequence, it does not wait
+                        for the container to complete before proceeding to the next init
+                        container. Instead, the next init container starts immediately after this
+                        init container is started, or after any startupProbe has successfully
+                        completed.
+                      type: string
+                    restartPolicyRules:
+                      description: |-
+                        Represents a list of rules to be checked to determine if the
+                        container should be restarted on exit. The rules are evaluated in
+                        order. Once a rule matches a container exit condition, the remaining
+                        rules are ignored. If no rule matches the container exit condition,
+                        the Container-level restart policy determines the whether the container
+                        is restarted or not. Constraints on the rules:
+                        - At most 20 rules are allowed.
+                        - Rules can have the same action.
+                        - Identical rules are not forbidden in validations.
+                        When rules are specified, container MUST set RestartPolicy explicitly
+                        even it if matches the Pod's RestartPolicy.
+                      items:
+                        description: ContainerRestartRule describes how a container
+                          exit is handled.
+                        properties:
+                          action:
+                            description: |-
+                              Specifies the action taken on a container exit if the requirements
+                              are satisfied. The only possible value is "Restart" to restart the
+                              container.
+                            type: string
+                          exitCodes:
+                            description: Represents the exit codes to check on container
+                              exits.
+                            properties:
+                              operator:
+                                description: |-
+                                  Represents the relationship between the container exit code(s) and the
+                                  specified values. Possible values are:
+                                  - In: the requirement is satisfied if the container exit code is in the
+                                    set of specified values.
+                                  - NotIn: the requirement is satisfied if the container exit code is
+                                    not in the set of specified values.
+                                type: string
+                              values:
+                                description: |-
+                                  Specifies the set of values to check for container exit codes.
+                                  At most 255 elements are allowed.
+                                items:
+                                  format: int32
+                                  type: integer
+                                type: array
+                                x-kubernetes-list-type: set
+                            required:
+                            - operator
+                            type: object
+                        required:
+                        - action
+                        type: object
+                      type: array
+                      x-kubernetes-list-type: atomic
+                    securityContext:
+                      description: |-
+                        SecurityContext defines the security options the container should be run with.
+                        If set, the fields of SecurityContext override the equivalent fields of PodSecurityContext.
+                        More info: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/
+                      properties:
+                        allowPrivilegeEscalation:
+                          description: |-
+                            AllowPrivilegeEscalation controls whether a process can gain more
+                            privileges than its parent process. This bool directly controls if
+                            the no_new_privs flag will be set on the container process.
+                            AllowPrivilegeEscalation is true always when the container is:
+                            1) run as Privileged
+                            2) has CAP_SYS_ADMIN
+                            Note that this field cannot be set when spec.os.name is windows.
+                          type: boolean
+                        appArmorProfile:
+                          description: |-
+                            appArmorProfile is the AppArmor options to use by this container. If set, this profile
+                            overrides the pod's appArmorProfile.
+                            Note that this field cannot be set when spec.os.name is windows.
+                          properties:
+                            localhostProfile:
+                              description: |-
+                                localhostProfile indicates a profile loaded on the node that should be used.
+                                The profile must be preconfigured on the node to work.
+                                Must match the loaded name of the profile.
+                                Must be set if and only if type is "Localhost".
+                              type: string
+                            type:
+                              description: |-
+                                type indicates which kind of AppArmor profile will be applied.
+                                Valid options are:
+                                  Localhost - a profile pre-loaded on the node.
+                                  RuntimeDefault - the container runtime's default profile.
+                                  Unconfined - no AppArmor enforcement.
+                              type: string
+                          required:
+                          - type
+                          type: object
+                        capabilities:
+                          description: |-
+                            The capabilities to add/drop when running containers.
+                            Defaults to the default set of capabilities granted by the container runtime.
+                            Note that this field cannot be set when spec.os.name is windows.
+                          properties:
+                            add:
+                              description: Added capabilities
+                              items:
+                                description: Capability represent POSIX capabilities
+                                  type
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            drop:
+                              description: Removed capabilities
+                              items:
+                                description: Capability represent POSIX capabilities
+                                  type
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                          type: object
+                        privileged:
+                          description: |-
+                            Run container in privileged mode.
+                            Processes in privileged containers are essentially equivalent to root on the host.
+                            Defaults to false.
+                            Note that this field cannot be set when spec.os.name is windows.
+                          type: boolean
+                        procMount:
+                          description: |-
+                            procMount denotes the type of proc mount to use for the containers.
+                            The default value is Default which uses the container runtime defaults for
+                            readonly paths and masked paths.
+                            This requires the ProcMountType feature flag to be enabled.
+                            Note that this field cannot be set when spec.os.name is windows.
+                          type: string
+                        readOnlyRootFilesystem:
+                          description: |-
+                            Whether this container has a read-only root filesystem.
+                            Default is false.
+                            Note that this field cannot be set when spec.os.name is windows.
+                          type: boolean
+                        runAsGroup:
+                          description: |-
+                            The GID to run the entrypoint of the container process.
+                            Uses runtime default if unset.
+                            May also be set in PodSecurityContext.  If set in both SecurityContext and
+                            PodSecurityContext, the value specified in SecurityContext takes precedence.
+                            Note that this field cannot be set when spec.os.name is windows.
+                          format: int64
+                          type: integer
+                        runAsNonRoot:
+                          description: |-
+                            Indicates that the container must run as a non-root user.
+                            If true, the Kubelet will validate the image at runtime to ensure that it
+                            does not run as UID 0 (root) and fail to start the container if it does.
+                            If unset or false, no such validation will be performed.
+                            May also be set in PodSecurityContext.  If set in both SecurityContext and
+                            PodSecurityContext, the value specified in SecurityContext takes precedence.
+                          type: boolean
+                        runAsUser:
+                          description: |-
+                            The UID to run the entrypoint of the container process.
+                            Defaults to user specified in image metadata if unspecified.
+                            May also be set in PodSecurityContext.  If set in both SecurityContext and
+                            PodSecurityContext, the value specified in SecurityContext takes precedence.
+                            Note that this field cannot be set when spec.os.name is windows.
+                          format: int64
+                          type: integer
+                        seLinuxOptions:
+                          description: |-
+                            The SELinux context to be applied to the container.
+                            If unspecified, the container runtime will allocate a random SELinux context for each
+                            container.  May also be set in PodSecurityContext.  If set in both SecurityContext and
+                            PodSecurityContext, the value specified in SecurityContext takes precedence.
+                            Note that this field cannot be set when spec.os.name is windows.
+                          properties:
+                            level:
+                              description: Level is SELinux level label that applies
+                                to the container.
+                              type: string
+                            role:
+                              description: Role is a SELinux role label that applies
+                                to the container.
+                              type: string
+                            type:
+                              description: Type is a SELinux type label that applies
+                                to the container.
+                              type: string
+                            user:
+                              description: User is a SELinux user label that applies
+                                to the container.
+                              type: string
+                          type: object
+                        seccompProfile:
+                          description: |-
+                            The seccomp options to use by this container. If seccomp options are
+                            provided at both the pod & container level, the container options
+                            override the pod options.
+                            Note that this field cannot be set when spec.os.name is windows.
+                          properties:
+                            localhostProfile:
+                              description: |-
+                                localhostProfile indicates a profile defined in a file on the node should be used.
+                                The profile must be preconfigured on the node to work.
+                                Must be a descending path, relative to the kubelet's configured seccomp profile location.
+                                Must be set if type is "Localhost". Must NOT be set for any other type.
+                              type: string
+                            type:
+                              description: |-
+                                type indicates which kind of seccomp profile will be applied.
+                                Valid options are:
+
+                                Localhost - a profile defined in a file on the node should be used.
+                                RuntimeDefault - the container runtime default profile should be used.
+                                Unconfined - no profile should be applied.
+                              type: string
+                          required:
+                          - type
+                          type: object
+                        windowsOptions:
+                          description: |-
+                            The Windows specific settings applied to all containers.
+                            If unspecified, the options from the PodSecurityContext will be used.
+                            If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence.
+                            Note that this field cannot be set when spec.os.name is linux.
+                          properties:
+                            gmsaCredentialSpec:
+                              description: |-
+                                GMSACredentialSpec is where the GMSA admission webhook
+                                (https://github.com/kubernetes-sigs/windows-gmsa) inlines the contents of the
+                                GMSA credential spec named by the GMSACredentialSpecName field.
+                              type: string
+                            gmsaCredentialSpecName:
+                              description: GMSACredentialSpecName is the name of the
+                                GMSA credential spec to use.
+                              type: string
+                            hostProcess:
+                              description: |-
+                                HostProcess determines if a container should be run as a 'Host Process' container.
+                                All of a Pod's containers must have the same effective HostProcess value
+                                (it is not allowed to have a mix of HostProcess containers and non-HostProcess containers).
+                                In addition, if HostProcess is true then HostNetwork must also be set to true.
+                              type: boolean
+                            runAsUserName:
+                              description: |-
+                                The UserName in Windows to run the entrypoint of the container process.
+                                Defaults to the user specified in image metadata if unspecified.
+                                May also be set in PodSecurityContext. If set in both SecurityContext and
+                                PodSecurityContext, the value specified in SecurityContext takes precedence.
+                              type: string
+                          type: object
+                      type: object
+                    startupProbe:
+                      description: |-
+                        StartupProbe indicates that the Pod has successfully initialized.
+                        If specified, no other probes are executed until this completes successfully.
+                        If this probe fails, the Pod will be restarted, just as if the livenessProbe failed.
+                        This can be used to provide different probe parameters at the beginning of a Pod's lifecycle,
+                        when it might take a long time to load data or warm a cache, than during steady-state operation.
+                        This cannot be updated.
+                        More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                      properties:
+                        exec:
+                          description: Exec specifies a command to execute in the
+                            container.
+                          properties:
+                            command:
+                              description: |-
+                                Command is the command line to execute inside the container, the working directory for the
+                                command  is root ('/') in the container's filesystem. The command is simply exec'd, it is
+                                not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use
+                                a shell, you need to explicitly call out to that shell.
+                                Exit status of 0 is treated as live/healthy and non-zero is unhealthy.
+                              items:
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                          type: object
+                        failureThreshold:
+                          description: |-
+                            Minimum consecutive failures for the probe to be considered failed after having succeeded.
+                            Defaults to 3. Minimum value is 1.
+                          format: int32
+                          type: integer
+                        grpc:
+                          description: GRPC specifies a GRPC HealthCheckRequest.
+                          properties:
+                            port:
+                              description: Port number of the gRPC service. Number
+                                must be in the range 1 to 65535.
+                              format: int32
+                              type: integer
+                            service:
+                              default: ""
+                              description: |-
+                                Service is the name of the service to place in the gRPC HealthCheckRequest
+                                (see https://github.com/grpc/grpc/blob/master/doc/health-checking.md).
+
+                                If this is not specified, the default behavior is defined by gRPC.
+                              type: string
+                          required:
+                          - port
+                          type: object
+                        httpGet:
+                          description: HTTPGet specifies an HTTP GET request to perform.
+                          properties:
+                            host:
+                              description: |-
+                                Host name to connect to, defaults to the pod IP. You probably want to set
+                                "Host" in httpHeaders instead.
+                              type: string
+                            httpHeaders:
+                              description: Custom headers to set in the request. HTTP
+                                allows repeated headers.
+                              items:
+                                description: HTTPHeader describes a custom header
+                                  to be used in HTTP probes
+                                properties:
+                                  name:
+                                    description: |-
+                                      The header field name.
+                                      This will be canonicalized upon output, so case-variant names will be understood as the same header.
+                                    type: string
+                                  value:
+                                    description: The header field value
+                                    type: string
+                                required:
+                                - name
+                                - value
+                                type: object
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            path:
+                              description: Path to access on the HTTP server.
+                              type: string
+                            port:
+                              anyOf:
+                              - type: integer
+                              - type: string
+                              description: |-
+                                Name or number of the port to access on the container.
+                                Number must be in the range 1 to 65535.
+                                Name must be an IANA_SVC_NAME.
+                              x-kubernetes-int-or-string: true
+                            scheme:
+                              description: |-
+                                Scheme to use for connecting to the host.
+                                Defaults to HTTP.
+                              type: string
+                          required:
+                          - port
+                          type: object
+                        initialDelaySeconds:
+                          description: |-
+                            Number of seconds after the container has started before liveness probes are initiated.
+                            More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                          format: int32
+                          type: integer
+                        periodSeconds:
+                          description: |-
+                            How often (in seconds) to perform the probe.
+                            Default to 10 seconds. Minimum value is 1.
+                          format: int32
+                          type: integer
+                        successThreshold:
+                          description: |-
+                            Minimum consecutive successes for the probe to be considered successful after having failed.
+                            Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
+                          format: int32
+                          type: integer
+                        tcpSocket:
+                          description: TCPSocket specifies a connection to a TCP port.
+                          properties:
+                            host:
+                              description: 'Optional: Host name to connect to, defaults
+                                to the pod IP.'
+                              type: string
+                            port:
+                              anyOf:
+                              - type: integer
+                              - type: string
+                              description: |-
+                                Number or name of the port to access on the container.
+                                Number must be in the range 1 to 65535.
+                                Name must be an IANA_SVC_NAME.
+                              x-kubernetes-int-or-string: true
+                          required:
+                          - port
+                          type: object
+                        terminationGracePeriodSeconds:
+                          description: |-
+                            Optional duration in seconds the pod needs to terminate gracefully upon probe failure.
+                            The grace period is the duration in seconds after the processes running in the pod are sent
+                            a termination signal and the time when the processes are forcibly halted with a kill signal.
+                            Set this value longer than the expected cleanup time for your process.
+                            If this value is nil, the pod's terminationGracePeriodSeconds will be used. Otherwise, this
+                            value overrides the value provided by the pod spec.
+                            Value must be non-negative integer. The value zero indicates stop immediately via
+                            the kill signal (no opportunity to shut down).
+                            This is a beta field and requires enabling ProbeTerminationGracePeriod feature gate.
+                            Minimum value is 1. spec.terminationGracePeriodSeconds is used if unset.
+                          format: int64
+                          type: integer
+                        timeoutSeconds:
+                          description: |-
+                            Number of seconds after which the probe times out.
+                            Defaults to 1 second. Minimum value is 1.
+                            More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                          format: int32
+                          type: integer
+                      type: object
+                    stdin:
+                      description: |-
+                        Whether this container should allocate a buffer for stdin in the container runtime. If this
+                        is not set, reads from stdin in the container will always result in EOF.
+                        Default is false.
+                      type: boolean
+                    stdinOnce:
+                      description: |-
+                        Whether the container runtime should close the stdin channel after it has been opened by
+                        a single attach. When stdin is true the stdin stream will remain open across multiple attach
+                        sessions. If stdinOnce is set to true, stdin is opened on container start, is empty until the
+                        first client attaches to stdin, and then remains open and accepts data until the client disconnects,
+                        at which time stdin is closed and remains closed until the container is restarted. If this
+                        flag is false, a container processes that reads from stdin will never receive an EOF.
+                        Default is false
+                      type: boolean
+                    terminationMessagePath:
+                      description: |-
+                        Optional: Path at which the file to which the container's termination message
+                        will be written is mounted into the container's filesystem.
+                        Message written is intended to be brief final status, such as an assertion failure message.
+                        Will be truncated by the node if greater than 4096 bytes. The total message length across
+                        all containers will be limited to 12kb.
+                        Defaults to /dev/termination-log.
+                        Cannot be updated.
+                      type: string
+                    terminationMessagePolicy:
+                      description: |-
+                        Indicate how the termination message should be populated. File will use the contents of
+                        terminationMessagePath to populate the container status message on both success and failure.
+                        FallbackToLogsOnError will use the last chunk of container log output if the termination
+                        message file is empty and the container exited with an error.
+                        The log output is limited to 2048 bytes or 80 lines, whichever is smaller.
+                        Defaults to File.
+                        Cannot be updated.
+                      type: string
+                    tty:
+                      description: |-
+                        Whether this container should allocate a TTY for itself, also requires 'stdin' to be true.
+                        Default is false.
+                      type: boolean
+                    volumeDevices:
+                      description: volumeDevices is the list of block devices to be
+                        used by the container.
+                      items:
+                        description: volumeDevice describes a mapping of a raw block
+                          device within a container.
+                        properties:
+                          devicePath:
+                            description: devicePath is the path inside of the container
+                              that the device will be mapped to.
+                            type: string
+                          name:
+                            description: name must match the name of a persistentVolumeClaim
+                              in the pod
+                            type: string
+                        required:
+                        - devicePath
+                        - name
+                        type: object
+                      type: array
+                      x-kubernetes-list-map-keys:
+                      - devicePath
+                      x-kubernetes-list-type: map
+                    volumeMounts:
+                      description: |-
+                        Pod volumes to mount into the container's filesystem.
+                        Cannot be updated.
+                      items:
+                        description: VolumeMount describes a mounting of a Volume
+                          within a container.
+                        properties:
+                          mountPath:
+                            description: |-
+                              Path within the container at which the volume should be mounted.  Must
+                              not contain ':'.
+                            type: string
+                          mountPropagation:
+                            description: |-
+                              mountPropagation determines how mounts are propagated from the host
+                              to container and the other way around.
+                              When not set, MountPropagationNone is used.
+                              This field is beta in 1.10.
+                              When RecursiveReadOnly is set to IfPossible or to Enabled, MountPropagation must be None or unspecified
+                              (which defaults to None).
+                            type: string
+                          name:
+                            description: This must match the Name of a Volume.
+                            type: string
+                          readOnly:
+                            description: |-
+                              Mounted read-only if true, read-write otherwise (false or unspecified).
+                              Defaults to false.
+                            type: boolean
+                          recursiveReadOnly:
+                            description: |-
+                              RecursiveReadOnly specifies whether read-only mounts should be handled
+                              recursively.
+
+                              If ReadOnly is false, this field has no meaning and must be unspecified.
+
+                              If ReadOnly is true, and this field is set to Disabled, the mount is not made
+                              recursively read-only.  If this field is set to IfPossible, the mount is made
+                              recursively read-only, if it is supported by the container runtime.  If this
+                              field is set to Enabled, the mount is made recursively read-only if it is
+                              supported by the container runtime, otherwise the pod will not be started and
+                              an error will be generated to indicate the reason.
+
+                              If this field is set to IfPossible or Enabled, MountPropagation must be set to
+                              None (or be unspecified, which defaults to None).
+
+                              If this field is not specified, it is treated as an equivalent of Disabled.
+                            type: string
+                          subPath:
+                            description: |-
+                              Path within the volume from which the container's volume should be mounted.
+                              Defaults to "" (volume's root).
+                            type: string
+                          subPathExpr:
+                            description: |-
+                              Expanded path within the volume from which the container's volume should be mounted.
+                              Behaves similarly to SubPath but environment variable references $(VAR_NAME) are expanded using the container's environment.
+                              Defaults to "" (volume's root).
+                              SubPathExpr and SubPath are mutually exclusive.
+                            type: string
+                        required:
+                        - mountPath
+                        - name
+                        type: object
+                      type: array
+                      x-kubernetes-list-map-keys:
+                      - mountPath
+                      x-kubernetes-list-type: map
+                    workingDir:
+                      description: |-
+                        Container's working directory.
+                        If not specified, the container runtime's default will be used, which
+                        might be configured in the container image.
+                        Cannot be updated.
+                      type: string
+                  required:
+                  - name
+                  type: object
+                type: array
+              dnsConfig:
+                description: dnsConfig defines the DNS configuration for the pods.
+                properties:
+                  nameservers:
+                    description: |-
+                      nameservers defines the list of DNS name server IP addresses.
+                      This will be appended to the base nameservers generated from DNSPolicy.
+                    items:
+                      minLength: 1
+                      type: string
+                    type: array
+                    x-kubernetes-list-type: set
+                  options:
+                    description: |-
+                      options defines the list of DNS resolver options.
+                      This will be merged with the base options generated from DNSPolicy.
+                      Resolution options given in Options
+                      will override those that appear in the base DNSPolicy.
+                    items:
+                      description: PodDNSConfigOption defines DNS resolver options
+                        of a pod.
+                      properties:
+                        name:
+                          description: name is required and must be unique.
+                          minLength: 1
+                          type: string
+                        value:
+                          description: value is optional.
+                          type: string
+                      required:
+                      - name
+                      type: object
+                    type: array
+                    x-kubernetes-list-map-keys:
+                    - name
+                    x-kubernetes-list-type: map
+                  searches:
+                    description: |-
+                      searches defines the list of DNS search domains for host-name lookup.
+                      This will be appended to the base search paths generated from DNSPolicy.
+                    items:
+                      minLength: 1
+                      type: string
+                    type: array
+                    x-kubernetes-list-type: set
+                type: object
+              dnsPolicy:
+                description: dnsPolicy defines the DNS policy for the pods.
+                enum:
+                - ClusterFirstWithHostNet
+                - ClusterFirst
+                - Default
+                - None
+                type: string
+              enableFeatures:
+                description: |-
+                  enableFeatures defines the Alertmanager's feature flags. By default, no features are enabled.
+                  Enabling features which are disabled by default is entirely outside the
+                  scope of what the maintainers will support and by doing so, you accept
+                  that this behaviour may break at any time without notice.
+
+                  It requires Alertmanager >= 0.27.0.
+                items:
+                  type: string
+                type: array
+              enableServiceLinks:
+                description: enableServiceLinks defines whether information about
+                  services should be injected into pod's environment variables
+                type: boolean
+              externalUrl:
+                description: |-
+                  externalUrl defines the URL used to access the Alertmanager web service. This is
+                  necessary to generate correct URLs. This is necessary if Alertmanager is not
+                  served from root of a DNS name.
+                type: string
+              forceEnableClusterMode:
+                description: |-
+                  forceEnableClusterMode ensures Alertmanager does not deactivate the cluster mode when running with a single replica.
+                  Use case is e.g. spanning an Alertmanager cluster across Kubernetes clusters with a single replica in each.
+                type: boolean
+              hostAliases:
+                description: hostAliases Pods configuration
+                items:
+                  description: |-
+                    HostAlias holds the mapping between IP and hostnames that will be injected as an entry in the
+                    pod's hosts file.
+                  properties:
+                    hostnames:
+                      description: hostnames defines hostnames for the above IP address.
+                      items:
+                        type: string
+                      type: array
+                    ip:
+                      description: ip defines the IP address of the host file entry.
+                      type: string
+                  required:
+                  - hostnames
+                  - ip
+                  type: object
+                type: array
+                x-kubernetes-list-map-keys:
+                - ip
+                x-kubernetes-list-type: map
+              hostUsers:
+                description: |-
+                  hostUsers supports the user space in Kubernetes.
+
+                  More info: https://kubernetes.io/docs/tasks/configure-pod-container/user-namespaces/
+
+                  The feature requires at least Kubernetes 1.28 with the `UserNamespacesSupport` feature gate enabled.
+                  Starting Kubernetes 1.33, the feature is enabled by default.
+                type: boolean
+              image:
+                description: |-
+                  image if specified has precedence over baseImage, tag and sha
+                  combinations. Specifying the version is still necessary to ensure the
+                  Prometheus Operator knows what version of Alertmanager is being
+                  configured.
+                type: string
+              imagePullPolicy:
+                description: |-
+                  imagePullPolicy for the 'alertmanager', 'init-config-reloader' and 'config-reloader' containers.
+                  See https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy for more details.
+                enum:
+                - ""
+                - Always
+                - Never
+                - IfNotPresent
+                type: string
+              imagePullSecrets:
+                description: |-
+                  imagePullSecrets An optional list of references to secrets in the same namespace
+                  to use for pulling prometheus and alertmanager images from registries
+                  see https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
+                items:
+                  description: |-
+                    LocalObjectReference contains enough information to let you locate the
+                    referenced object inside the same namespace.
+                  properties:
+                    name:
+                      default: ""
+                      description: |-
+                        Name of the referent.
+                        This field is effectively required, but due to backwards compatibility is
+                        allowed to be empty. Instances of this type with an empty value here are
+                        almost certainly wrong.
+                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                      type: string
+                  type: object
+                  x-kubernetes-map-type: atomic
+                type: array
+              initContainers:
+                description: |-
+                  initContainers allows adding initContainers to the pod definition. Those can be used to e.g.
+                  fetch secrets for injection into the Alertmanager configuration from external sources. Any
+                  errors during the execution of an initContainer will lead to a restart of the Pod. More info: https://kubernetes.io/docs/concepts/workloads/pods/init-containers/
+                  InitContainers described here modify an operator
+                  generated init containers if they share the same name and modifications are
+                  done via a strategic merge patch. The current init container name is:
+                  `init-config-reloader`. Overriding init containers is entirely outside the
+                  scope of what the maintainers will support and by doing so, you accept that
+                  this behaviour may break at any time without notice.
+                items:
+                  description: A single application container that you want to run
+                    within a pod.
+                  properties:
+                    args:
+                      description: |-
+                        Arguments to the entrypoint.
+                        The container image's CMD is used if this is not provided.
+                        Variable references $(VAR_NAME) are expanded using the container's environment. If a variable
+                        cannot be resolved, the reference in the input string will be unchanged. Double $$ are reduced
+                        to a single $, which allows for escaping the $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)" will
+                        produce the string literal "$(VAR_NAME)". Escaped references will never be expanded, regardless
+                        of whether the variable exists or not. Cannot be updated.
+                        More info: https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell
+                      items:
+                        type: string
+                      type: array
+                      x-kubernetes-list-type: atomic
+                    command:
+                      description: |-
+                        Entrypoint array. Not executed within a shell.
+                        The container image's ENTRYPOINT is used if this is not provided.
+                        Variable references $(VAR_NAME) are expanded using the container's environment. If a variable
+                        cannot be resolved, the reference in the input string will be unchanged. Double $$ are reduced
+                        to a single $, which allows for escaping the $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)" will
+                        produce the string literal "$(VAR_NAME)". Escaped references will never be expanded, regardless
+                        of whether the variable exists or not. Cannot be updated.
+                        More info: https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell
+                      items:
+                        type: string
+                      type: array
+                      x-kubernetes-list-type: atomic
+                    env:
+                      description: |-
+                        List of environment variables to set in the container.
+                        Cannot be updated.
+                      items:
+                        description: EnvVar represents an environment variable present
+                          in a Container.
+                        properties:
+                          name:
+                            description: |-
+                              Name of the environment variable.
+                              May consist of any printable ASCII characters except '='.
+                            type: string
+                          value:
+                            description: |-
+                              Variable references $(VAR_NAME) are expanded
+                              using the previously defined environment variables in the container and
+                              any service environment variables. If a variable cannot be resolved,
+                              the reference in the input string will be unchanged. Double $$ are reduced
+                              to a single $, which allows for escaping the $(VAR_NAME) syntax: i.e.
+                              "$$(VAR_NAME)" will produce the string literal "$(VAR_NAME)".
+                              Escaped references will never be expanded, regardless of whether the variable
+                              exists or not.
+                              Defaults to "".
+                            type: string
+                          valueFrom:
+                            description: Source for the environment variable's value.
+                              Cannot be used if value is not empty.
+                            properties:
+                              configMapKeyRef:
+                                description: Selects a key of a ConfigMap.
+                                properties:
+                                  key:
+                                    description: The key to select.
+                                    type: string
+                                  name:
+                                    default: ""
+                                    description: |-
+                                      Name of the referent.
+                                      This field is effectively required, but due to backwards compatibility is
+                                      allowed to be empty. Instances of this type with an empty value here are
+                                      almost certainly wrong.
+                                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                    type: string
+                                  optional:
+                                    description: Specify whether the ConfigMap or
+                                      its key must be defined
+                                    type: boolean
+                                required:
+                                - key
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              fieldRef:
+                                description: |-
+                                  Selects a field of the pod: supports metadata.name, metadata.namespace, `metadata.labels['<KEY>']`, `metadata.annotations['<KEY>']`,
+                                  spec.nodeName, spec.serviceAccountName, status.hostIP, status.podIP, status.podIPs.
+                                properties:
+                                  apiVersion:
+                                    description: Version of the schema the FieldPath
+                                      is written in terms of, defaults to "v1".
+                                    type: string
+                                  fieldPath:
+                                    description: Path of the field to select in the
+                                      specified API version.
+                                    type: string
+                                required:
+                                - fieldPath
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              fileKeyRef:
+                                description: |-
+                                  FileKeyRef selects a key of the env file.
+                                  Requires the EnvFiles feature gate to be enabled.
+                                properties:
+                                  key:
+                                    description: |-
+                                      The key within the env file. An invalid key will prevent the pod from starting.
+                                      The keys defined within a source may consist of any printable ASCII characters except '='.
+                                      During Alpha stage of the EnvFiles feature gate, the key size is limited to 128 characters.
+                                    type: string
+                                  optional:
+                                    default: false
+                                    description: |-
+                                      Specify whether the file or its key must be defined. If the file or key
+                                      does not exist, then the env var is not published.
+                                      If optional is set to true and the specified key does not exist,
+                                      the environment variable will not be set in the Pod's containers.
+
+                                      If optional is set to false and the specified key does not exist,
+                                      an error will be returned during Pod creation.
+                                    type: boolean
+                                  path:
+                                    description: |-
+                                      The path within the volume from which to select the file.
+                                      Must be relative and may not contain the '..' path or start with '..'.
+                                    type: string
+                                  volumeName:
+                                    description: The name of the volume mount containing
+                                      the env file.
+                                    type: string
+                                required:
+                                - key
+                                - path
+                                - volumeName
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              resourceFieldRef:
+                                description: |-
+                                  Selects a resource of the container: only resources limits and requests
+                                  (limits.cpu, limits.memory, limits.ephemeral-storage, requests.cpu, requests.memory and requests.ephemeral-storage) are currently supported.
+                                properties:
+                                  containerName:
+                                    description: 'Container name: required for volumes,
+                                      optional for env vars'
+                                    type: string
+                                  divisor:
+                                    anyOf:
+                                    - type: integer
+                                    - type: string
+                                    description: Specifies the output format of the
+                                      exposed resources, defaults to "1"
+                                    pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                    x-kubernetes-int-or-string: true
+                                  resource:
+                                    description: 'Required: resource to select'
+                                    type: string
+                                required:
+                                - resource
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              secretKeyRef:
+                                description: Selects a key of a secret in the pod's
+                                  namespace
+                                properties:
+                                  key:
+                                    description: The key of the secret to select from.  Must
+                                      be a valid secret key.
+                                    type: string
+                                  name:
+                                    default: ""
+                                    description: |-
+                                      Name of the referent.
+                                      This field is effectively required, but due to backwards compatibility is
+                                      allowed to be empty. Instances of this type with an empty value here are
+                                      almost certainly wrong.
+                                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                    type: string
+                                  optional:
+                                    description: Specify whether the Secret or its
+                                      key must be defined
+                                    type: boolean
+                                required:
+                                - key
+                                type: object
+                                x-kubernetes-map-type: atomic
+                            type: object
+                        required:
+                        - name
+                        type: object
+                      type: array
+                      x-kubernetes-list-map-keys:
+                      - name
+                      x-kubernetes-list-type: map
+                    envFrom:
+                      description: |-
+                        List of sources to populate environment variables in the container.
+                        The keys defined within a source may consist of any printable ASCII characters except '='.
+                        When a key exists in multiple
+                        sources, the value associated with the last source will take precedence.
+                        Values defined by an Env with a duplicate key will take precedence.
+                        Cannot be updated.
+                      items:
+                        description: EnvFromSource represents the source of a set
+                          of ConfigMaps or Secrets
+                        properties:
+                          configMapRef:
+                            description: The ConfigMap to select from
+                            properties:
+                              name:
+                                default: ""
+                                description: |-
+                                  Name of the referent.
+                                  This field is effectively required, but due to backwards compatibility is
+                                  allowed to be empty. Instances of this type with an empty value here are
+                                  almost certainly wrong.
+                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                type: string
+                              optional:
+                                description: Specify whether the ConfigMap must be
+                                  defined
+                                type: boolean
+                            type: object
+                            x-kubernetes-map-type: atomic
+                          prefix:
+                            description: |-
+                              Optional text to prepend to the name of each environment variable.
+                              May consist of any printable ASCII characters except '='.
+                            type: string
+                          secretRef:
+                            description: The Secret to select from
+                            properties:
+                              name:
+                                default: ""
+                                description: |-
+                                  Name of the referent.
+                                  This field is effectively required, but due to backwards compatibility is
+                                  allowed to be empty. Instances of this type with an empty value here are
+                                  almost certainly wrong.
+                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                type: string
+                              optional:
+                                description: Specify whether the Secret must be defined
+                                type: boolean
+                            type: object
+                            x-kubernetes-map-type: atomic
+                        type: object
+                      type: array
+                      x-kubernetes-list-type: atomic
+                    image:
+                      description: |-
+                        Container image name.
+                        More info: https://kubernetes.io/docs/concepts/containers/images
+                        This field is optional to allow higher level config management to default or override
+                        container images in workload controllers like Deployments and StatefulSets.
+                      type: string
+                    imagePullPolicy:
+                      description: |-
+                        Image pull policy.
+                        One of Always, Never, IfNotPresent.
+                        Defaults to Always if :latest tag is specified, or IfNotPresent otherwise.
+                        Cannot be updated.
+                        More info: https://kubernetes.io/docs/concepts/containers/images#updating-images
+                      type: string
+                    lifecycle:
+                      description: |-
+                        Actions that the management system should take in response to container lifecycle events.
+                        Cannot be updated.
+                      properties:
+                        postStart:
+                          description: |-
+                            PostStart is called immediately after a container is created. If the handler fails,
+                            the container is terminated and restarted according to its restart policy.
+                            Other management of the container blocks until the hook completes.
+                            More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
+                          properties:
+                            exec:
+                              description: Exec specifies a command to execute in
+                                the container.
+                              properties:
+                                command:
+                                  description: |-
+                                    Command is the command line to execute inside the container, the working directory for the
+                                    command  is root ('/') in the container's filesystem. The command is simply exec'd, it is
+                                    not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use
+                                    a shell, you need to explicitly call out to that shell.
+                                    Exit status of 0 is treated as live/healthy and non-zero is unhealthy.
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                              type: object
+                            httpGet:
+                              description: HTTPGet specifies an HTTP GET request to
+                                perform.
+                              properties:
+                                host:
+                                  description: |-
+                                    Host name to connect to, defaults to the pod IP. You probably want to set
+                                    "Host" in httpHeaders instead.
+                                  type: string
+                                httpHeaders:
+                                  description: Custom headers to set in the request.
+                                    HTTP allows repeated headers.
+                                  items:
+                                    description: HTTPHeader describes a custom header
+                                      to be used in HTTP probes
+                                    properties:
+                                      name:
+                                        description: |-
+                                          The header field name.
+                                          This will be canonicalized upon output, so case-variant names will be understood as the same header.
+                                        type: string
+                                      value:
+                                        description: The header field value
+                                        type: string
+                                    required:
+                                    - name
+                                    - value
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                path:
+                                  description: Path to access on the HTTP server.
+                                  type: string
+                                port:
+                                  anyOf:
+                                  - type: integer
+                                  - type: string
+                                  description: |-
+                                    Name or number of the port to access on the container.
+                                    Number must be in the range 1 to 65535.
+                                    Name must be an IANA_SVC_NAME.
+                                  x-kubernetes-int-or-string: true
+                                scheme:
+                                  description: |-
+                                    Scheme to use for connecting to the host.
+                                    Defaults to HTTP.
+                                  type: string
+                              required:
+                              - port
+                              type: object
+                            sleep:
+                              description: Sleep represents a duration that the container
+                                should sleep.
+                              properties:
+                                seconds:
+                                  description: Seconds is the number of seconds to
+                                    sleep.
+                                  format: int64
+                                  type: integer
+                              required:
+                              - seconds
+                              type: object
+                            tcpSocket:
+                              description: |-
+                                Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
+                                for backward compatibility. There is no validation of this field and
+                                lifecycle hooks will fail at runtime when it is specified.
+                              properties:
+                                host:
+                                  description: 'Optional: Host name to connect to,
+                                    defaults to the pod IP.'
+                                  type: string
+                                port:
+                                  anyOf:
+                                  - type: integer
+                                  - type: string
+                                  description: |-
+                                    Number or name of the port to access on the container.
+                                    Number must be in the range 1 to 65535.
+                                    Name must be an IANA_SVC_NAME.
+                                  x-kubernetes-int-or-string: true
+                              required:
+                              - port
+                              type: object
+                          type: object
+                        preStop:
+                          description: |-
+                            PreStop is called immediately before a container is terminated due to an
+                            API request or management event such as liveness/startup probe failure,
+                            preemption, resource contention, etc. The handler is not called if the
+                            container crashes or exits. The Pod's termination grace period countdown begins before the
+                            PreStop hook is executed. Regardless of the outcome of the handler, the
+                            container will eventually terminate within the Pod's termination grace
+                            period (unless delayed by finalizers). Other management of the container blocks until the hook completes
+                            or until the termination grace period is reached.
+                            More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
+                          properties:
+                            exec:
+                              description: Exec specifies a command to execute in
+                                the container.
+                              properties:
+                                command:
+                                  description: |-
+                                    Command is the command line to execute inside the container, the working directory for the
+                                    command  is root ('/') in the container's filesystem. The command is simply exec'd, it is
+                                    not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use
+                                    a shell, you need to explicitly call out to that shell.
+                                    Exit status of 0 is treated as live/healthy and non-zero is unhealthy.
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                              type: object
+                            httpGet:
+                              description: HTTPGet specifies an HTTP GET request to
+                                perform.
+                              properties:
+                                host:
+                                  description: |-
+                                    Host name to connect to, defaults to the pod IP. You probably want to set
+                                    "Host" in httpHeaders instead.
+                                  type: string
+                                httpHeaders:
+                                  description: Custom headers to set in the request.
+                                    HTTP allows repeated headers.
+                                  items:
+                                    description: HTTPHeader describes a custom header
+                                      to be used in HTTP probes
+                                    properties:
+                                      name:
+                                        description: |-
+                                          The header field name.
+                                          This will be canonicalized upon output, so case-variant names will be understood as the same header.
+                                        type: string
+                                      value:
+                                        description: The header field value
+                                        type: string
+                                    required:
+                                    - name
+                                    - value
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                path:
+                                  description: Path to access on the HTTP server.
+                                  type: string
+                                port:
+                                  anyOf:
+                                  - type: integer
+                                  - type: string
+                                  description: |-
+                                    Name or number of the port to access on the container.
+                                    Number must be in the range 1 to 65535.
+                                    Name must be an IANA_SVC_NAME.
+                                  x-kubernetes-int-or-string: true
+                                scheme:
+                                  description: |-
+                                    Scheme to use for connecting to the host.
+                                    Defaults to HTTP.
+                                  type: string
+                              required:
+                              - port
+                              type: object
+                            sleep:
+                              description: Sleep represents a duration that the container
+                                should sleep.
+                              properties:
+                                seconds:
+                                  description: Seconds is the number of seconds to
+                                    sleep.
+                                  format: int64
+                                  type: integer
+                              required:
+                              - seconds
+                              type: object
+                            tcpSocket:
+                              description: |-
+                                Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
+                                for backward compatibility. There is no validation of this field and
+                                lifecycle hooks will fail at runtime when it is specified.
+                              properties:
+                                host:
+                                  description: 'Optional: Host name to connect to,
+                                    defaults to the pod IP.'
+                                  type: string
+                                port:
+                                  anyOf:
+                                  - type: integer
+                                  - type: string
+                                  description: |-
+                                    Number or name of the port to access on the container.
+                                    Number must be in the range 1 to 65535.
+                                    Name must be an IANA_SVC_NAME.
+                                  x-kubernetes-int-or-string: true
+                              required:
+                              - port
+                              type: object
+                          type: object
+                        stopSignal:
+                          description: |-
+                            StopSignal defines which signal will be sent to a container when it is being stopped.
+                            If not specified, the default is defined by the container runtime in use.
+                            StopSignal can only be set for Pods with a non-empty .spec.os.name
+                          type: string
+                      type: object
+                    livenessProbe:
+                      description: |-
+                        Periodic probe of container liveness.
+                        Container will be restarted if the probe fails.
+                        Cannot be updated.
+                        More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                      properties:
+                        exec:
+                          description: Exec specifies a command to execute in the
+                            container.
+                          properties:
+                            command:
+                              description: |-
+                                Command is the command line to execute inside the container, the working directory for the
+                                command  is root ('/') in the container's filesystem. The command is simply exec'd, it is
+                                not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use
+                                a shell, you need to explicitly call out to that shell.
+                                Exit status of 0 is treated as live/healthy and non-zero is unhealthy.
+                              items:
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                          type: object
+                        failureThreshold:
+                          description: |-
+                            Minimum consecutive failures for the probe to be considered failed after having succeeded.
+                            Defaults to 3. Minimum value is 1.
+                          format: int32
+                          type: integer
+                        grpc:
+                          description: GRPC specifies a GRPC HealthCheckRequest.
+                          properties:
+                            port:
+                              description: Port number of the gRPC service. Number
+                                must be in the range 1 to 65535.
+                              format: int32
+                              type: integer
+                            service:
+                              default: ""
+                              description: |-
+                                Service is the name of the service to place in the gRPC HealthCheckRequest
+                                (see https://github.com/grpc/grpc/blob/master/doc/health-checking.md).
+
+                                If this is not specified, the default behavior is defined by gRPC.
+                              type: string
+                          required:
+                          - port
+                          type: object
+                        httpGet:
+                          description: HTTPGet specifies an HTTP GET request to perform.
+                          properties:
+                            host:
+                              description: |-
+                                Host name to connect to, defaults to the pod IP. You probably want to set
+                                "Host" in httpHeaders instead.
+                              type: string
+                            httpHeaders:
+                              description: Custom headers to set in the request. HTTP
+                                allows repeated headers.
+                              items:
+                                description: HTTPHeader describes a custom header
+                                  to be used in HTTP probes
+                                properties:
+                                  name:
+                                    description: |-
+                                      The header field name.
+                                      This will be canonicalized upon output, so case-variant names will be understood as the same header.
+                                    type: string
+                                  value:
+                                    description: The header field value
+                                    type: string
+                                required:
+                                - name
+                                - value
+                                type: object
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            path:
+                              description: Path to access on the HTTP server.
+                              type: string
+                            port:
+                              anyOf:
+                              - type: integer
+                              - type: string
+                              description: |-
+                                Name or number of the port to access on the container.
+                                Number must be in the range 1 to 65535.
+                                Name must be an IANA_SVC_NAME.
+                              x-kubernetes-int-or-string: true
+                            scheme:
+                              description: |-
+                                Scheme to use for connecting to the host.
+                                Defaults to HTTP.
+                              type: string
+                          required:
+                          - port
+                          type: object
+                        initialDelaySeconds:
+                          description: |-
+                            Number of seconds after the container has started before liveness probes are initiated.
+                            More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                          format: int32
+                          type: integer
+                        periodSeconds:
+                          description: |-
+                            How often (in seconds) to perform the probe.
+                            Default to 10 seconds. Minimum value is 1.
+                          format: int32
+                          type: integer
+                        successThreshold:
+                          description: |-
+                            Minimum consecutive successes for the probe to be considered successful after having failed.
+                            Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
+                          format: int32
+                          type: integer
+                        tcpSocket:
+                          description: TCPSocket specifies a connection to a TCP port.
+                          properties:
+                            host:
+                              description: 'Optional: Host name to connect to, defaults
+                                to the pod IP.'
+                              type: string
+                            port:
+                              anyOf:
+                              - type: integer
+                              - type: string
+                              description: |-
+                                Number or name of the port to access on the container.
+                                Number must be in the range 1 to 65535.
+                                Name must be an IANA_SVC_NAME.
+                              x-kubernetes-int-or-string: true
+                          required:
+                          - port
+                          type: object
+                        terminationGracePeriodSeconds:
+                          description: |-
+                            Optional duration in seconds the pod needs to terminate gracefully upon probe failure.
+                            The grace period is the duration in seconds after the processes running in the pod are sent
+                            a termination signal and the time when the processes are forcibly halted with a kill signal.
+                            Set this value longer than the expected cleanup time for your process.
+                            If this value is nil, the pod's terminationGracePeriodSeconds will be used. Otherwise, this
+                            value overrides the value provided by the pod spec.
+                            Value must be non-negative integer. The value zero indicates stop immediately via
+                            the kill signal (no opportunity to shut down).
+                            This is a beta field and requires enabling ProbeTerminationGracePeriod feature gate.
+                            Minimum value is 1. spec.terminationGracePeriodSeconds is used if unset.
+                          format: int64
+                          type: integer
+                        timeoutSeconds:
+                          description: |-
+                            Number of seconds after which the probe times out.
+                            Defaults to 1 second. Minimum value is 1.
+                            More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                          format: int32
+                          type: integer
+                      type: object
+                    name:
+                      description: |-
+                        Name of the container specified as a DNS_LABEL.
+                        Each container in a pod must have a unique name (DNS_LABEL).
+                        Cannot be updated.
+                      type: string
+                    ports:
+                      description: |-
+                        List of ports to expose from the container. Not specifying a port here
+                        DOES NOT prevent that port from being exposed. Any port which is
+                        listening on the default "0.0.0.0" address inside a container will be
+                        accessible from the network.
+                        Modifying this array with strategic merge patch may corrupt the data.
+                        For more information See https://github.com/kubernetes/kubernetes/issues/108255.
+                        Cannot be updated.
+                      items:
+                        description: ContainerPort represents a network port in a
+                          single container.
+                        properties:
+                          containerPort:
+                            description: |-
+                              Number of port to expose on the pod's IP address.
+                              This must be a valid port number, 0 < x < 65536.
+                            format: int32
+                            type: integer
+                          hostIP:
+                            description: What host IP to bind the external port to.
+                            type: string
+                          hostPort:
+                            description: |-
+                              Number of port to expose on the host.
+                              If specified, this must be a valid port number, 0 < x < 65536.
+                              If HostNetwork is specified, this must match ContainerPort.
+                              Most containers do not need this.
+                            format: int32
+                            type: integer
+                          name:
+                            description: |-
+                              If specified, this must be an IANA_SVC_NAME and unique within the pod. Each
+                              named port in a pod must have a unique name. Name for the port that can be
+                              referred to by services.
+                            type: string
+                          protocol:
+                            default: TCP
+                            description: |-
+                              Protocol for port. Must be UDP, TCP, or SCTP.
+                              Defaults to "TCP".
+                            type: string
+                        required:
+                        - containerPort
+                        type: object
+                      type: array
+                      x-kubernetes-list-map-keys:
+                      - containerPort
+                      - protocol
+                      x-kubernetes-list-type: map
+                    readinessProbe:
+                      description: |-
+                        Periodic probe of container service readiness.
+                        Container will be removed from service endpoints if the probe fails.
+                        Cannot be updated.
+                        More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                      properties:
+                        exec:
+                          description: Exec specifies a command to execute in the
+                            container.
+                          properties:
+                            command:
+                              description: |-
+                                Command is the command line to execute inside the container, the working directory for the
+                                command  is root ('/') in the container's filesystem. The command is simply exec'd, it is
+                                not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use
+                                a shell, you need to explicitly call out to that shell.
+                                Exit status of 0 is treated as live/healthy and non-zero is unhealthy.
+                              items:
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                          type: object
+                        failureThreshold:
+                          description: |-
+                            Minimum consecutive failures for the probe to be considered failed after having succeeded.
+                            Defaults to 3. Minimum value is 1.
+                          format: int32
+                          type: integer
+                        grpc:
+                          description: GRPC specifies a GRPC HealthCheckRequest.
+                          properties:
+                            port:
+                              description: Port number of the gRPC service. Number
+                                must be in the range 1 to 65535.
+                              format: int32
+                              type: integer
+                            service:
+                              default: ""
+                              description: |-
+                                Service is the name of the service to place in the gRPC HealthCheckRequest
+                                (see https://github.com/grpc/grpc/blob/master/doc/health-checking.md).
+
+                                If this is not specified, the default behavior is defined by gRPC.
+                              type: string
+                          required:
+                          - port
+                          type: object
+                        httpGet:
+                          description: HTTPGet specifies an HTTP GET request to perform.
+                          properties:
+                            host:
+                              description: |-
+                                Host name to connect to, defaults to the pod IP. You probably want to set
+                                "Host" in httpHeaders instead.
+                              type: string
+                            httpHeaders:
+                              description: Custom headers to set in the request. HTTP
+                                allows repeated headers.
+                              items:
+                                description: HTTPHeader describes a custom header
+                                  to be used in HTTP probes
+                                properties:
+                                  name:
+                                    description: |-
+                                      The header field name.
+                                      This will be canonicalized upon output, so case-variant names will be understood as the same header.
+                                    type: string
+                                  value:
+                                    description: The header field value
+                                    type: string
+                                required:
+                                - name
+                                - value
+                                type: object
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            path:
+                              description: Path to access on the HTTP server.
+                              type: string
+                            port:
+                              anyOf:
+                              - type: integer
+                              - type: string
+                              description: |-
+                                Name or number of the port to access on the container.
+                                Number must be in the range 1 to 65535.
+                                Name must be an IANA_SVC_NAME.
+                              x-kubernetes-int-or-string: true
+                            scheme:
+                              description: |-
+                                Scheme to use for connecting to the host.
+                                Defaults to HTTP.
+                              type: string
+                          required:
+                          - port
+                          type: object
+                        initialDelaySeconds:
+                          description: |-
+                            Number of seconds after the container has started before liveness probes are initiated.
+                            More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                          format: int32
+                          type: integer
+                        periodSeconds:
+                          description: |-
+                            How often (in seconds) to perform the probe.
+                            Default to 10 seconds. Minimum value is 1.
+                          format: int32
+                          type: integer
+                        successThreshold:
+                          description: |-
+                            Minimum consecutive successes for the probe to be considered successful after having failed.
+                            Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
+                          format: int32
+                          type: integer
+                        tcpSocket:
+                          description: TCPSocket specifies a connection to a TCP port.
+                          properties:
+                            host:
+                              description: 'Optional: Host name to connect to, defaults
+                                to the pod IP.'
+                              type: string
+                            port:
+                              anyOf:
+                              - type: integer
+                              - type: string
+                              description: |-
+                                Number or name of the port to access on the container.
+                                Number must be in the range 1 to 65535.
+                                Name must be an IANA_SVC_NAME.
+                              x-kubernetes-int-or-string: true
+                          required:
+                          - port
+                          type: object
+                        terminationGracePeriodSeconds:
+                          description: |-
+                            Optional duration in seconds the pod needs to terminate gracefully upon probe failure.
+                            The grace period is the duration in seconds after the processes running in the pod are sent
+                            a termination signal and the time when the processes are forcibly halted with a kill signal.
+                            Set this value longer than the expected cleanup time for your process.
+                            If this value is nil, the pod's terminationGracePeriodSeconds will be used. Otherwise, this
+                            value overrides the value provided by the pod spec.
+                            Value must be non-negative integer. The value zero indicates stop immediately via
+                            the kill signal (no opportunity to shut down).
+                            This is a beta field and requires enabling ProbeTerminationGracePeriod feature gate.
+                            Minimum value is 1. spec.terminationGracePeriodSeconds is used if unset.
+                          format: int64
+                          type: integer
+                        timeoutSeconds:
+                          description: |-
+                            Number of seconds after which the probe times out.
+                            Defaults to 1 second. Minimum value is 1.
+                            More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                          format: int32
+                          type: integer
+                      type: object
+                    resizePolicy:
+                      description: Resources resize policy for the container.
+                      items:
+                        description: ContainerResizePolicy represents resource resize
+                          policy for the container.
+                        properties:
+                          resourceName:
+                            description: |-
+                              Name of the resource to which this resource resize policy applies.
+                              Supported values: cpu, memory.
+                            type: string
+                          restartPolicy:
+                            description: |-
+                              Restart policy to apply when specified resource is resized.
+                              If not specified, it defaults to NotRequired.
+                            type: string
+                        required:
+                        - resourceName
+                        - restartPolicy
+                        type: object
+                      type: array
+                      x-kubernetes-list-type: atomic
+                    resources:
+                      description: |-
+                        Compute Resources required by this container.
+                        Cannot be updated.
+                        More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+                      properties:
+                        claims:
+                          description: |-
+                            Claims lists the names of resources, defined in spec.resourceClaims,
+                            that are used by this container.
+
+                            This field depends on the
+                            DynamicResourceAllocation feature gate.
+
+                            This field is immutable. It can only be set for containers.
+                          items:
+                            description: ResourceClaim references one entry in PodSpec.ResourceClaims.
+                            properties:
+                              name:
+                                description: |-
+                                  Name must match the name of one entry in pod.spec.resourceClaims of
+                                  the Pod where this field is used. It makes that resource available
+                                  inside a container.
+                                type: string
+                              request:
+                                description: |-
+                                  Request is the name chosen for a request in the referenced claim.
+                                  If empty, everything from the claim is made available, otherwise
+                                  only the result of this request.
+                                type: string
+                            required:
+                            - name
+                            type: object
+                          type: array
+                          x-kubernetes-list-map-keys:
+                          - name
+                          x-kubernetes-list-type: map
+                        limits:
+                          additionalProperties:
+                            anyOf:
+                            - type: integer
+                            - type: string
+                            pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                            x-kubernetes-int-or-string: true
+                          description: |-
+                            Limits describes the maximum amount of compute resources allowed.
+                            More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+                          type: object
+                        requests:
+                          additionalProperties:
+                            anyOf:
+                            - type: integer
+                            - type: string
+                            pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                            x-kubernetes-int-or-string: true
+                          description: |-
+                            Requests describes the minimum amount of compute resources required.
+                            If Requests is omitted for a container, it defaults to Limits if that is explicitly specified,
+                            otherwise to an implementation-defined value. Requests cannot exceed Limits.
+                            More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+                          type: object
+                      type: object
+                    restartPolicy:
+                      description: |-
+                        RestartPolicy defines the restart behavior of individual containers in a pod.
+                        This overrides the pod-level restart policy. When this field is not specified,
+                        the restart behavior is defined by the Pod's restart policy and the container type.
+                        Additionally, setting the RestartPolicy as "Always" for the init container will
+                        have the following effect:
+                        this init container will be continually restarted on
+                        exit until all regular containers have terminated. Once all regular
+                        containers have completed, all init containers with restartPolicy "Always"
+                        will be shut down. This lifecycle differs from normal init containers and
+                        is often referred to as a "sidecar" container. Although this init
+                        container still starts in the init container sequence, it does not wait
+                        for the container to complete before proceeding to the next init
+                        container. Instead, the next init container starts immediately after this
+                        init container is started, or after any startupProbe has successfully
+                        completed.
+                      type: string
+                    restartPolicyRules:
+                      description: |-
+                        Represents a list of rules to be checked to determine if the
+                        container should be restarted on exit. The rules are evaluated in
+                        order. Once a rule matches a container exit condition, the remaining
+                        rules are ignored. If no rule matches the container exit condition,
+                        the Container-level restart policy determines the whether the container
+                        is restarted or not. Constraints on the rules:
+                        - At most 20 rules are allowed.
+                        - Rules can have the same action.
+                        - Identical rules are not forbidden in validations.
+                        When rules are specified, container MUST set RestartPolicy explicitly
+                        even it if matches the Pod's RestartPolicy.
+                      items:
+                        description: ContainerRestartRule describes how a container
+                          exit is handled.
+                        properties:
+                          action:
+                            description: |-
+                              Specifies the action taken on a container exit if the requirements
+                              are satisfied. The only possible value is "Restart" to restart the
+                              container.
+                            type: string
+                          exitCodes:
+                            description: Represents the exit codes to check on container
+                              exits.
+                            properties:
+                              operator:
+                                description: |-
+                                  Represents the relationship between the container exit code(s) and the
+                                  specified values. Possible values are:
+                                  - In: the requirement is satisfied if the container exit code is in the
+                                    set of specified values.
+                                  - NotIn: the requirement is satisfied if the container exit code is
+                                    not in the set of specified values.
+                                type: string
+                              values:
+                                description: |-
+                                  Specifies the set of values to check for container exit codes.
+                                  At most 255 elements are allowed.
+                                items:
+                                  format: int32
+                                  type: integer
+                                type: array
+                                x-kubernetes-list-type: set
+                            required:
+                            - operator
+                            type: object
+                        required:
+                        - action
+                        type: object
+                      type: array
+                      x-kubernetes-list-type: atomic
+                    securityContext:
+                      description: |-
+                        SecurityContext defines the security options the container should be run with.
+                        If set, the fields of SecurityContext override the equivalent fields of PodSecurityContext.
+                        More info: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/
+                      properties:
+                        allowPrivilegeEscalation:
+                          description: |-
+                            AllowPrivilegeEscalation controls whether a process can gain more
+                            privileges than its parent process. This bool directly controls if
+                            the no_new_privs flag will be set on the container process.
+                            AllowPrivilegeEscalation is true always when the container is:
+                            1) run as Privileged
+                            2) has CAP_SYS_ADMIN
+                            Note that this field cannot be set when spec.os.name is windows.
+                          type: boolean
+                        appArmorProfile:
+                          description: |-
+                            appArmorProfile is the AppArmor options to use by this container. If set, this profile
+                            overrides the pod's appArmorProfile.
+                            Note that this field cannot be set when spec.os.name is windows.
+                          properties:
+                            localhostProfile:
+                              description: |-
+                                localhostProfile indicates a profile loaded on the node that should be used.
+                                The profile must be preconfigured on the node to work.
+                                Must match the loaded name of the profile.
+                                Must be set if and only if type is "Localhost".
+                              type: string
+                            type:
+                              description: |-
+                                type indicates which kind of AppArmor profile will be applied.
+                                Valid options are:
+                                  Localhost - a profile pre-loaded on the node.
+                                  RuntimeDefault - the container runtime's default profile.
+                                  Unconfined - no AppArmor enforcement.
+                              type: string
+                          required:
+                          - type
+                          type: object
+                        capabilities:
+                          description: |-
+                            The capabilities to add/drop when running containers.
+                            Defaults to the default set of capabilities granted by the container runtime.
+                            Note that this field cannot be set when spec.os.name is windows.
+                          properties:
+                            add:
+                              description: Added capabilities
+                              items:
+                                description: Capability represent POSIX capabilities
+                                  type
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            drop:
+                              description: Removed capabilities
+                              items:
+                                description: Capability represent POSIX capabilities
+                                  type
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                          type: object
+                        privileged:
+                          description: |-
+                            Run container in privileged mode.
+                            Processes in privileged containers are essentially equivalent to root on the host.
+                            Defaults to false.
+                            Note that this field cannot be set when spec.os.name is windows.
+                          type: boolean
+                        procMount:
+                          description: |-
+                            procMount denotes the type of proc mount to use for the containers.
+                            The default value is Default which uses the container runtime defaults for
+                            readonly paths and masked paths.
+                            This requires the ProcMountType feature flag to be enabled.
+                            Note that this field cannot be set when spec.os.name is windows.
+                          type: string
+                        readOnlyRootFilesystem:
+                          description: |-
+                            Whether this container has a read-only root filesystem.
+                            Default is false.
+                            Note that this field cannot be set when spec.os.name is windows.
+                          type: boolean
+                        runAsGroup:
+                          description: |-
+                            The GID to run the entrypoint of the container process.
+                            Uses runtime default if unset.
+                            May also be set in PodSecurityContext.  If set in both SecurityContext and
+                            PodSecurityContext, the value specified in SecurityContext takes precedence.
+                            Note that this field cannot be set when spec.os.name is windows.
+                          format: int64
+                          type: integer
+                        runAsNonRoot:
+                          description: |-
+                            Indicates that the container must run as a non-root user.
+                            If true, the Kubelet will validate the image at runtime to ensure that it
+                            does not run as UID 0 (root) and fail to start the container if it does.
+                            If unset or false, no such validation will be performed.
+                            May also be set in PodSecurityContext.  If set in both SecurityContext and
+                            PodSecurityContext, the value specified in SecurityContext takes precedence.
+                          type: boolean
+                        runAsUser:
+                          description: |-
+                            The UID to run the entrypoint of the container process.
+                            Defaults to user specified in image metadata if unspecified.
+                            May also be set in PodSecurityContext.  If set in both SecurityContext and
+                            PodSecurityContext, the value specified in SecurityContext takes precedence.
+                            Note that this field cannot be set when spec.os.name is windows.
+                          format: int64
+                          type: integer
+                        seLinuxOptions:
+                          description: |-
+                            The SELinux context to be applied to the container.
+                            If unspecified, the container runtime will allocate a random SELinux context for each
+                            container.  May also be set in PodSecurityContext.  If set in both SecurityContext and
+                            PodSecurityContext, the value specified in SecurityContext takes precedence.
+                            Note that this field cannot be set when spec.os.name is windows.
+                          properties:
+                            level:
+                              description: Level is SELinux level label that applies
+                                to the container.
+                              type: string
+                            role:
+                              description: Role is a SELinux role label that applies
+                                to the container.
+                              type: string
+                            type:
+                              description: Type is a SELinux type label that applies
+                                to the container.
+                              type: string
+                            user:
+                              description: User is a SELinux user label that applies
+                                to the container.
+                              type: string
+                          type: object
+                        seccompProfile:
+                          description: |-
+                            The seccomp options to use by this container. If seccomp options are
+                            provided at both the pod & container level, the container options
+                            override the pod options.
+                            Note that this field cannot be set when spec.os.name is windows.
+                          properties:
+                            localhostProfile:
+                              description: |-
+                                localhostProfile indicates a profile defined in a file on the node should be used.
+                                The profile must be preconfigured on the node to work.
+                                Must be a descending path, relative to the kubelet's configured seccomp profile location.
+                                Must be set if type is "Localhost". Must NOT be set for any other type.
+                              type: string
+                            type:
+                              description: |-
+                                type indicates which kind of seccomp profile will be applied.
+                                Valid options are:
+
+                                Localhost - a profile defined in a file on the node should be used.
+                                RuntimeDefault - the container runtime default profile should be used.
+                                Unconfined - no profile should be applied.
+                              type: string
+                          required:
+                          - type
+                          type: object
+                        windowsOptions:
+                          description: |-
+                            The Windows specific settings applied to all containers.
+                            If unspecified, the options from the PodSecurityContext will be used.
+                            If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence.
+                            Note that this field cannot be set when spec.os.name is linux.
+                          properties:
+                            gmsaCredentialSpec:
+                              description: |-
+                                GMSACredentialSpec is where the GMSA admission webhook
+                                (https://github.com/kubernetes-sigs/windows-gmsa) inlines the contents of the
+                                GMSA credential spec named by the GMSACredentialSpecName field.
+                              type: string
+                            gmsaCredentialSpecName:
+                              description: GMSACredentialSpecName is the name of the
+                                GMSA credential spec to use.
+                              type: string
+                            hostProcess:
+                              description: |-
+                                HostProcess determines if a container should be run as a 'Host Process' container.
+                                All of a Pod's containers must have the same effective HostProcess value
+                                (it is not allowed to have a mix of HostProcess containers and non-HostProcess containers).
+                                In addition, if HostProcess is true then HostNetwork must also be set to true.
+                              type: boolean
+                            runAsUserName:
+                              description: |-
+                                The UserName in Windows to run the entrypoint of the container process.
+                                Defaults to the user specified in image metadata if unspecified.
+                                May also be set in PodSecurityContext. If set in both SecurityContext and
+                                PodSecurityContext, the value specified in SecurityContext takes precedence.
+                              type: string
+                          type: object
+                      type: object
+                    startupProbe:
+                      description: |-
+                        StartupProbe indicates that the Pod has successfully initialized.
+                        If specified, no other probes are executed until this completes successfully.
+                        If this probe fails, the Pod will be restarted, just as if the livenessProbe failed.
+                        This can be used to provide different probe parameters at the beginning of a Pod's lifecycle,
+                        when it might take a long time to load data or warm a cache, than during steady-state operation.
+                        This cannot be updated.
+                        More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                      properties:
+                        exec:
+                          description: Exec specifies a command to execute in the
+                            container.
+                          properties:
+                            command:
+                              description: |-
+                                Command is the command line to execute inside the container, the working directory for the
+                                command  is root ('/') in the container's filesystem. The command is simply exec'd, it is
+                                not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use
+                                a shell, you need to explicitly call out to that shell.
+                                Exit status of 0 is treated as live/healthy and non-zero is unhealthy.
+                              items:
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                          type: object
+                        failureThreshold:
+                          description: |-
+                            Minimum consecutive failures for the probe to be considered failed after having succeeded.
+                            Defaults to 3. Minimum value is 1.
+                          format: int32
+                          type: integer
+                        grpc:
+                          description: GRPC specifies a GRPC HealthCheckRequest.
+                          properties:
+                            port:
+                              description: Port number of the gRPC service. Number
+                                must be in the range 1 to 65535.
+                              format: int32
+                              type: integer
+                            service:
+                              default: ""
+                              description: |-
+                                Service is the name of the service to place in the gRPC HealthCheckRequest
+                                (see https://github.com/grpc/grpc/blob/master/doc/health-checking.md).
+
+                                If this is not specified, the default behavior is defined by gRPC.
+                              type: string
+                          required:
+                          - port
+                          type: object
+                        httpGet:
+                          description: HTTPGet specifies an HTTP GET request to perform.
+                          properties:
+                            host:
+                              description: |-
+                                Host name to connect to, defaults to the pod IP. You probably want to set
+                                "Host" in httpHeaders instead.
+                              type: string
+                            httpHeaders:
+                              description: Custom headers to set in the request. HTTP
+                                allows repeated headers.
+                              items:
+                                description: HTTPHeader describes a custom header
+                                  to be used in HTTP probes
+                                properties:
+                                  name:
+                                    description: |-
+                                      The header field name.
+                                      This will be canonicalized upon output, so case-variant names will be understood as the same header.
+                                    type: string
+                                  value:
+                                    description: The header field value
+                                    type: string
+                                required:
+                                - name
+                                - value
+                                type: object
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            path:
+                              description: Path to access on the HTTP server.
+                              type: string
+                            port:
+                              anyOf:
+                              - type: integer
+                              - type: string
+                              description: |-
+                                Name or number of the port to access on the container.
+                                Number must be in the range 1 to 65535.
+                                Name must be an IANA_SVC_NAME.
+                              x-kubernetes-int-or-string: true
+                            scheme:
+                              description: |-
+                                Scheme to use for connecting to the host.
+                                Defaults to HTTP.
+                              type: string
+                          required:
+                          - port
+                          type: object
+                        initialDelaySeconds:
+                          description: |-
+                            Number of seconds after the container has started before liveness probes are initiated.
+                            More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                          format: int32
+                          type: integer
+                        periodSeconds:
+                          description: |-
+                            How often (in seconds) to perform the probe.
+                            Default to 10 seconds. Minimum value is 1.
+                          format: int32
+                          type: integer
+                        successThreshold:
+                          description: |-
+                            Minimum consecutive successes for the probe to be considered successful after having failed.
+                            Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
+                          format: int32
+                          type: integer
+                        tcpSocket:
+                          description: TCPSocket specifies a connection to a TCP port.
+                          properties:
+                            host:
+                              description: 'Optional: Host name to connect to, defaults
+                                to the pod IP.'
+                              type: string
+                            port:
+                              anyOf:
+                              - type: integer
+                              - type: string
+                              description: |-
+                                Number or name of the port to access on the container.
+                                Number must be in the range 1 to 65535.
+                                Name must be an IANA_SVC_NAME.
+                              x-kubernetes-int-or-string: true
+                          required:
+                          - port
+                          type: object
+                        terminationGracePeriodSeconds:
+                          description: |-
+                            Optional duration in seconds the pod needs to terminate gracefully upon probe failure.
+                            The grace period is the duration in seconds after the processes running in the pod are sent
+                            a termination signal and the time when the processes are forcibly halted with a kill signal.
+                            Set this value longer than the expected cleanup time for your process.
+                            If this value is nil, the pod's terminationGracePeriodSeconds will be used. Otherwise, this
+                            value overrides the value provided by the pod spec.
+                            Value must be non-negative integer. The value zero indicates stop immediately via
+                            the kill signal (no opportunity to shut down).
+                            This is a beta field and requires enabling ProbeTerminationGracePeriod feature gate.
+                            Minimum value is 1. spec.terminationGracePeriodSeconds is used if unset.
+                          format: int64
+                          type: integer
+                        timeoutSeconds:
+                          description: |-
+                            Number of seconds after which the probe times out.
+                            Defaults to 1 second. Minimum value is 1.
+                            More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                          format: int32
+                          type: integer
+                      type: object
+                    stdin:
+                      description: |-
+                        Whether this container should allocate a buffer for stdin in the container runtime. If this
+                        is not set, reads from stdin in the container will always result in EOF.
+                        Default is false.
+                      type: boolean
+                    stdinOnce:
+                      description: |-
+                        Whether the container runtime should close the stdin channel after it has been opened by
+                        a single attach. When stdin is true the stdin stream will remain open across multiple attach
+                        sessions. If stdinOnce is set to true, stdin is opened on container start, is empty until the
+                        first client attaches to stdin, and then remains open and accepts data until the client disconnects,
+                        at which time stdin is closed and remains closed until the container is restarted. If this
+                        flag is false, a container processes that reads from stdin will never receive an EOF.
+                        Default is false
+                      type: boolean
+                    terminationMessagePath:
+                      description: |-
+                        Optional: Path at which the file to which the container's termination message
+                        will be written is mounted into the container's filesystem.
+                        Message written is intended to be brief final status, such as an assertion failure message.
+                        Will be truncated by the node if greater than 4096 bytes. The total message length across
+                        all containers will be limited to 12kb.
+                        Defaults to /dev/termination-log.
+                        Cannot be updated.
+                      type: string
+                    terminationMessagePolicy:
+                      description: |-
+                        Indicate how the termination message should be populated. File will use the contents of
+                        terminationMessagePath to populate the container status message on both success and failure.
+                        FallbackToLogsOnError will use the last chunk of container log output if the termination
+                        message file is empty and the container exited with an error.
+                        The log output is limited to 2048 bytes or 80 lines, whichever is smaller.
+                        Defaults to File.
+                        Cannot be updated.
+                      type: string
+                    tty:
+                      description: |-
+                        Whether this container should allocate a TTY for itself, also requires 'stdin' to be true.
+                        Default is false.
+                      type: boolean
+                    volumeDevices:
+                      description: volumeDevices is the list of block devices to be
+                        used by the container.
+                      items:
+                        description: volumeDevice describes a mapping of a raw block
+                          device within a container.
+                        properties:
+                          devicePath:
+                            description: devicePath is the path inside of the container
+                              that the device will be mapped to.
+                            type: string
+                          name:
+                            description: name must match the name of a persistentVolumeClaim
+                              in the pod
+                            type: string
+                        required:
+                        - devicePath
+                        - name
+                        type: object
+                      type: array
+                      x-kubernetes-list-map-keys:
+                      - devicePath
+                      x-kubernetes-list-type: map
+                    volumeMounts:
+                      description: |-
+                        Pod volumes to mount into the container's filesystem.
+                        Cannot be updated.
+                      items:
+                        description: VolumeMount describes a mounting of a Volume
+                          within a container.
+                        properties:
+                          mountPath:
+                            description: |-
+                              Path within the container at which the volume should be mounted.  Must
+                              not contain ':'.
+                            type: string
+                          mountPropagation:
+                            description: |-
+                              mountPropagation determines how mounts are propagated from the host
+                              to container and the other way around.
+                              When not set, MountPropagationNone is used.
+                              This field is beta in 1.10.
+                              When RecursiveReadOnly is set to IfPossible or to Enabled, MountPropagation must be None or unspecified
+                              (which defaults to None).
+                            type: string
+                          name:
+                            description: This must match the Name of a Volume.
+                            type: string
+                          readOnly:
+                            description: |-
+                              Mounted read-only if true, read-write otherwise (false or unspecified).
+                              Defaults to false.
+                            type: boolean
+                          recursiveReadOnly:
+                            description: |-
+                              RecursiveReadOnly specifies whether read-only mounts should be handled
+                              recursively.
+
+                              If ReadOnly is false, this field has no meaning and must be unspecified.
+
+                              If ReadOnly is true, and this field is set to Disabled, the mount is not made
+                              recursively read-only.  If this field is set to IfPossible, the mount is made
+                              recursively read-only, if it is supported by the container runtime.  If this
+                              field is set to Enabled, the mount is made recursively read-only if it is
+                              supported by the container runtime, otherwise the pod will not be started and
+                              an error will be generated to indicate the reason.
+
+                              If this field is set to IfPossible or Enabled, MountPropagation must be set to
+                              None (or be unspecified, which defaults to None).
+
+                              If this field is not specified, it is treated as an equivalent of Disabled.
+                            type: string
+                          subPath:
+                            description: |-
+                              Path within the volume from which the container's volume should be mounted.
+                              Defaults to "" (volume's root).
+                            type: string
+                          subPathExpr:
+                            description: |-
+                              Expanded path within the volume from which the container's volume should be mounted.
+                              Behaves similarly to SubPath but environment variable references $(VAR_NAME) are expanded using the container's environment.
+                              Defaults to "" (volume's root).
+                              SubPathExpr and SubPath are mutually exclusive.
+                            type: string
+                        required:
+                        - mountPath
+                        - name
+                        type: object
+                      type: array
+                      x-kubernetes-list-map-keys:
+                      - mountPath
+                      x-kubernetes-list-type: map
+                    workingDir:
+                      description: |-
+                        Container's working directory.
+                        If not specified, the container runtime's default will be used, which
+                        might be configured in the container image.
+                        Cannot be updated.
+                      type: string
+                  required:
+                  - name
+                  type: object
+                type: array
+              limits:
+                description: limits defines the limits command line flags when starting
+                  Alertmanager.
+                properties:
+                  maxPerSilenceBytes:
+                    description: |-
+                      maxPerSilenceBytes defines the maximum size of an individual silence as stored on disk. This corresponds to the Alertmanager's
+                      `--silences.max-per-silence-bytes` flag.
+                      It requires Alertmanager >= v0.28.0.
+                    pattern: (^0|([0-9]*[.])?[0-9]+((K|M|G|T|E|P)i?)?B)$
+                    type: string
+                  maxSilences:
+                    description: |-
+                      maxSilences defines the maximum number active and pending silences. This corresponds to the
+                      Alertmanager's `--silences.max-silences` flag.
+                      It requires Alertmanager >= v0.28.0.
+                    format: int32
+                    minimum: 0
+                    type: integer
+                type: object
+              listenLocal:
+                description: |-
+                  listenLocal defines the Alertmanager server listen on loopback, so that it
+                  does not bind against the Pod IP. Note this is only for the Alertmanager
+                  UI, not the gossip communication.
+                type: boolean
+              logFormat:
+                description: logFormat for Alertmanager to be configured with.
+                enum:
+                - ""
+                - logfmt
+                - json
+                type: string
+              logLevel:
+                description: logLevel for Alertmanager to be configured with.
+                enum:
+                - ""
+                - debug
+                - info
+                - warn
+                - error
+                type: string
+              minReadySeconds:
+                description: |-
+                  minReadySeconds defines the minimum number of seconds for which a newly created pod should be ready
+                  without any of its container crashing for it to be considered available.
+
+                  If unset, pods will be considered available as soon as they are ready.
+                format: int32
+                minimum: 0
+                type: integer
+              nodeSelector:
+                additionalProperties:
+                  type: string
+                description: nodeSelector defines which Nodes the Pods are scheduled
+                  on.
+                type: object
+              paused:
+                description: |-
+                  paused if set to true all actions on the underlying managed objects are not
+                  going to be performed, except for delete actions.
+                type: boolean
+              persistentVolumeClaimRetentionPolicy:
+                description: |-
+                  persistentVolumeClaimRetentionPolicy controls if and how PVCs are deleted during the lifecycle of a StatefulSet.
+                  The default behavior is all PVCs are retained.
+                  This is an alpha field from kubernetes 1.23 until 1.26 and a beta field from 1.26.
+                  It requires enabling the StatefulSetAutoDeletePVC feature gate.
+                properties:
+                  whenDeleted:
+                    description: |-
+                      WhenDeleted specifies what happens to PVCs created from StatefulSet
+                      VolumeClaimTemplates when the StatefulSet is deleted. The default policy
+                      of `Retain` causes PVCs to not be affected by StatefulSet deletion. The
+                      `Delete` policy causes those PVCs to be deleted.
+                    type: string
+                  whenScaled:
+                    description: |-
+                      WhenScaled specifies what happens to PVCs created from StatefulSet
+                      VolumeClaimTemplates when the StatefulSet is scaled down. The default
+                      policy of `Retain` causes PVCs to not be affected by a scaledown. The
+                      `Delete` policy causes the associated PVCs for any excess pods above
+                      the replica count to be deleted.
+                    type: string
+                type: object
+              podMetadata:
+                description: |-
+                  podMetadata defines labels and annotations which are propagated to the Alertmanager pods.
+
+                  The following items are reserved and cannot be overridden:
+                  * "alertmanager" label, set to the name of the Alertmanager instance.
+                  * "app.kubernetes.io/instance" label, set to the name of the Alertmanager instance.
+                  * "app.kubernetes.io/managed-by" label, set to "prometheus-operator".
+                  * "app.kubernetes.io/name" label, set to "alertmanager".
+                  * "app.kubernetes.io/version" label, set to the Alertmanager version.
+                  * "kubectl.kubernetes.io/default-container" annotation, set to "alertmanager".
+                properties:
+                  annotations:
+                    additionalProperties:
+                      type: string
+                    description: |-
+                      annotations defines an unstructured key value map stored with a resource that may be
+                      set by external tools to store and retrieve arbitrary metadata. They are not
+                      queryable and should be preserved when modifying objects.
+                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
+                    type: object
+                  labels:
+                    additionalProperties:
+                      type: string
+                    description: |-
+                      labels define the map of string keys and values that can be used to organize and categorize
+                      (scope and select) objects. May match selectors of replication controllers
+                      and services.
+                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
+                    type: object
+                  name:
+                    description: |-
+                      name must be unique within a namespace. Is required when creating resources, although
+                      some resources may allow a client to request the generation of an appropriate name
+                      automatically. Name is primarily intended for creation idempotence and configuration
+                      definition.
+                      Cannot be updated.
+                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/
+                    type: string
+                type: object
+              portName:
+                default: web
+                description: |-
+                  portName defines the port's name for the pods and governing service.
+                  Defaults to `web`.
+                type: string
+              priorityClassName:
+                description: priorityClassName assigned to the Pods
+                type: string
+              replicas:
+                description: |-
+                  replicas defines the expected size of the alertmanager cluster. The controller will
+                  eventually make the size of the running cluster equal to the expected
+                  size.
+                format: int32
+                type: integer
+              resources:
+                description: resources defines the resource requests and limits of
+                  the Pods.
+                properties:
+                  claims:
+                    description: |-
+                      Claims lists the names of resources, defined in spec.resourceClaims,
+                      that are used by this container.
+
+                      This field depends on the
+                      DynamicResourceAllocation feature gate.
+
+                      This field is immutable. It can only be set for containers.
+                    items:
+                      description: ResourceClaim references one entry in PodSpec.ResourceClaims.
+                      properties:
+                        name:
+                          description: |-
+                            Name must match the name of one entry in pod.spec.resourceClaims of
+                            the Pod where this field is used. It makes that resource available
+                            inside a container.
+                          type: string
+                        request:
+                          description: |-
+                            Request is the name chosen for a request in the referenced claim.
+                            If empty, everything from the claim is made available, otherwise
+                            only the result of this request.
+                          type: string
+                      required:
+                      - name
+                      type: object
+                    type: array
+                    x-kubernetes-list-map-keys:
+                    - name
+                    x-kubernetes-list-type: map
+                  limits:
+                    additionalProperties:
+                      anyOf:
+                      - type: integer
+                      - type: string
+                      pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                      x-kubernetes-int-or-string: true
+                    description: |-
+                      Limits describes the maximum amount of compute resources allowed.
+                      More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+                    type: object
+                  requests:
+                    additionalProperties:
+                      anyOf:
+                      - type: integer
+                      - type: string
+                      pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                      x-kubernetes-int-or-string: true
+                    description: |-
+                      Requests describes the minimum amount of compute resources required.
+                      If Requests is omitted for a container, it defaults to Limits if that is explicitly specified,
+                      otherwise to an implementation-defined value. Requests cannot exceed Limits.
+                      More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+                    type: object
+                type: object
+              retention:
+                default: 120h
+                description: |-
+                  retention defines the time duration Alertmanager shall retain data for. Default is '120h',
+                  and must match the regular expression `[0-9]+(ms|s|m|h)` (milliseconds seconds minutes hours).
+                pattern: ^(0|(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
+                type: string
+              routePrefix:
+                description: |-
+                  routePrefix Alertmanager registers HTTP handlers for. This is useful,
+                  if using ExternalURL and a proxy is rewriting HTTP routes of a request,
+                  and the actual ExternalURL is still true, but the server serves requests
+                  under a different route prefix. For example for use with `kubectl proxy`.
+                type: string
+              secrets:
+                description: |-
+                  secrets is a list of Secrets in the same namespace as the Alertmanager
+                  object, which shall be mounted into the Alertmanager Pods.
+                  Each Secret is added to the StatefulSet definition as a volume named `secret-<secret-name>`.
+                  The Secrets are mounted into `/etc/alertmanager/secrets/<secret-name>` in the 'alertmanager' container.
+                items:
+                  type: string
+                type: array
+              securityContext:
+                description: |-
+                  securityContext holds pod-level security attributes and common container settings.
+                  This defaults to the default PodSecurityContext.
+                properties:
+                  appArmorProfile:
+                    description: |-
+                      appArmorProfile is the AppArmor options to use by the containers in this pod.
+                      Note that this field cannot be set when spec.os.name is windows.
+                    properties:
+                      localhostProfile:
+                        description: |-
+                          localhostProfile indicates a profile loaded on the node that should be used.
+                          The profile must be preconfigured on the node to work.
+                          Must match the loaded name of the profile.
+                          Must be set if and only if type is "Localhost".
+                        type: string
+                      type:
+                        description: |-
+                          type indicates which kind of AppArmor profile will be applied.
+                          Valid options are:
+                            Localhost - a profile pre-loaded on the node.
+                            RuntimeDefault - the container runtime's default profile.
+                            Unconfined - no AppArmor enforcement.
+                        type: string
+                    required:
+                    - type
+                    type: object
+                  fsGroup:
+                    description: |-
+                      A special supplemental group that applies to all containers in a pod.
+                      Some volume types allow the Kubelet to change the ownership of that volume
+                      to be owned by the pod:
+
+                      1. The owning GID will be the FSGroup
+                      2. The setgid bit is set (new files created in the volume will be owned by FSGroup)
+                      3. The permission bits are OR'd with rw-rw----
+
+                      If unset, the Kubelet will not modify the ownership and permissions of any volume.
+                      Note that this field cannot be set when spec.os.name is windows.
+                    format: int64
+                    type: integer
+                  fsGroupChangePolicy:
+                    description: |-
+                      fsGroupChangePolicy defines behavior of changing ownership and permission of the volume
+                      before being exposed inside Pod. This field will only apply to
+                      volume types which support fsGroup based ownership(and permissions).
+                      It will have no effect on ephemeral volume types such as: secret, configmaps
+                      and emptydir.
+                      Valid values are "OnRootMismatch" and "Always". If not specified, "Always" is used.
+                      Note that this field cannot be set when spec.os.name is windows.
+                    type: string
+                  runAsGroup:
+                    description: |-
+                      The GID to run the entrypoint of the container process.
+                      Uses runtime default if unset.
+                      May also be set in SecurityContext.  If set in both SecurityContext and
+                      PodSecurityContext, the value specified in SecurityContext takes precedence
+                      for that container.
+                      Note that this field cannot be set when spec.os.name is windows.
+                    format: int64
+                    type: integer
+                  runAsNonRoot:
+                    description: |-
+                      Indicates that the container must run as a non-root user.
+                      If true, the Kubelet will validate the image at runtime to ensure that it
+                      does not run as UID 0 (root) and fail to start the container if it does.
+                      If unset or false, no such validation will be performed.
+                      May also be set in SecurityContext.  If set in both SecurityContext and
+                      PodSecurityContext, the value specified in SecurityContext takes precedence.
+                    type: boolean
+                  runAsUser:
+                    description: |-
+                      The UID to run the entrypoint of the container process.
+                      Defaults to user specified in image metadata if unspecified.
+                      May also be set in SecurityContext.  If set in both SecurityContext and
+                      PodSecurityContext, the value specified in SecurityContext takes precedence
+                      for that container.
+                      Note that this field cannot be set when spec.os.name is windows.
+                    format: int64
+                    type: integer
+                  seLinuxChangePolicy:
+                    description: |-
+                      seLinuxChangePolicy defines how the container's SELinux label is applied to all volumes used by the Pod.
+                      It has no effect on nodes that do not support SELinux or to volumes does not support SELinux.
+                      Valid values are "MountOption" and "Recursive".
+
+                      "Recursive" means relabeling of all files on all Pod volumes by the container runtime.
+                      This may be slow for large volumes, but allows mixing privileged and unprivileged Pods sharing the same volume on the same node.
+
+                      "MountOption" mounts all eligible Pod volumes with `-o context` mount option.
+                      This requires all Pods that share the same volume to use the same SELinux label.
+                      It is not possible to share the same volume among privileged and unprivileged Pods.
+                      Eligible volumes are in-tree FibreChannel and iSCSI volumes, and all CSI volumes
+                      whose CSI driver announces SELinux support by setting spec.seLinuxMount: true in their
+                      CSIDriver instance. Other volumes are always re-labelled recursively.
+                      "MountOption" value is allowed only when SELinuxMount feature gate is enabled.
+
+                      If not specified and SELinuxMount feature gate is enabled, "MountOption" is used.
+                      If not specified and SELinuxMount feature gate is disabled, "MountOption" is used for ReadWriteOncePod volumes
+                      and "Recursive" for all other volumes.
+
+                      This field affects only Pods that have SELinux label set, either in PodSecurityContext or in SecurityContext of all containers.
+
+                      All Pods that use the same volume should use the same seLinuxChangePolicy, otherwise some pods can get stuck in ContainerCreating state.
+                      Note that this field cannot be set when spec.os.name is windows.
+                    type: string
+                  seLinuxOptions:
+                    description: |-
+                      The SELinux context to be applied to all containers.
+                      If unspecified, the container runtime will allocate a random SELinux context for each
+                      container.  May also be set in SecurityContext.  If set in
+                      both SecurityContext and PodSecurityContext, the value specified in SecurityContext
+                      takes precedence for that container.
+                      Note that this field cannot be set when spec.os.name is windows.
+                    properties:
+                      level:
+                        description: Level is SELinux level label that applies to
+                          the container.
+                        type: string
+                      role:
+                        description: Role is a SELinux role label that applies to
+                          the container.
+                        type: string
+                      type:
+                        description: Type is a SELinux type label that applies to
+                          the container.
+                        type: string
+                      user:
+                        description: User is a SELinux user label that applies to
+                          the container.
+                        type: string
+                    type: object
+                  seccompProfile:
+                    description: |-
+                      The seccomp options to use by the containers in this pod.
+                      Note that this field cannot be set when spec.os.name is windows.
+                    properties:
+                      localhostProfile:
+                        description: |-
+                          localhostProfile indicates a profile defined in a file on the node should be used.
+                          The profile must be preconfigured on the node to work.
+                          Must be a descending path, relative to the kubelet's configured seccomp profile location.
+                          Must be set if type is "Localhost". Must NOT be set for any other type.
+                        type: string
+                      type:
+                        description: |-
+                          type indicates which kind of seccomp profile will be applied.
+                          Valid options are:
+
+                          Localhost - a profile defined in a file on the node should be used.
+                          RuntimeDefault - the container runtime default profile should be used.
+                          Unconfined - no profile should be applied.
+                        type: string
+                    required:
+                    - type
+                    type: object
+                  supplementalGroups:
+                    description: |-
+                      A list of groups applied to the first process run in each container, in
+                      addition to the container's primary GID and fsGroup (if specified).  If
+                      the SupplementalGroupsPolicy feature is enabled, the
+                      supplementalGroupsPolicy field determines whether these are in addition
+                      to or instead of any group memberships defined in the container image.
+                      If unspecified, no additional groups are added, though group memberships
+                      defined in the container image may still be used, depending on the
+                      supplementalGroupsPolicy field.
+                      Note that this field cannot be set when spec.os.name is windows.
+                    items:
+                      format: int64
+                      type: integer
+                    type: array
+                    x-kubernetes-list-type: atomic
+                  supplementalGroupsPolicy:
+                    description: |-
+                      Defines how supplemental groups of the first container processes are calculated.
+                      Valid values are "Merge" and "Strict". If not specified, "Merge" is used.
+                      (Alpha) Using the field requires the SupplementalGroupsPolicy feature gate to be enabled
+                      and the container runtime must implement support for this feature.
+                      Note that this field cannot be set when spec.os.name is windows.
+                    type: string
+                  sysctls:
+                    description: |-
+                      Sysctls hold a list of namespaced sysctls used for the pod. Pods with unsupported
+                      sysctls (by the container runtime) might fail to launch.
+                      Note that this field cannot be set when spec.os.name is windows.
+                    items:
+                      description: Sysctl defines a kernel parameter to be set
+                      properties:
+                        name:
+                          description: Name of a property to set
+                          type: string
+                        value:
+                          description: Value of a property to set
+                          type: string
+                      required:
+                      - name
+                      - value
+                      type: object
+                    type: array
+                    x-kubernetes-list-type: atomic
+                  windowsOptions:
+                    description: |-
+                      The Windows specific settings applied to all containers.
+                      If unspecified, the options within a container's SecurityContext will be used.
+                      If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence.
+                      Note that this field cannot be set when spec.os.name is linux.
+                    properties:
+                      gmsaCredentialSpec:
+                        description: |-
+                          GMSACredentialSpec is where the GMSA admission webhook
+                          (https://github.com/kubernetes-sigs/windows-gmsa) inlines the contents of the
+                          GMSA credential spec named by the GMSACredentialSpecName field.
+                        type: string
+                      gmsaCredentialSpecName:
+                        description: GMSACredentialSpecName is the name of the GMSA
+                          credential spec to use.
+                        type: string
+                      hostProcess:
+                        description: |-
+                          HostProcess determines if a container should be run as a 'Host Process' container.
+                          All of a Pod's containers must have the same effective HostProcess value
+                          (it is not allowed to have a mix of HostProcess containers and non-HostProcess containers).
+                          In addition, if HostProcess is true then HostNetwork must also be set to true.
+                        type: boolean
+                      runAsUserName:
+                        description: |-
+                          The UserName in Windows to run the entrypoint of the container process.
+                          Defaults to the user specified in image metadata if unspecified.
+                          May also be set in PodSecurityContext. If set in both SecurityContext and
+                          PodSecurityContext, the value specified in SecurityContext takes precedence.
+                        type: string
+                    type: object
+                type: object
+              serviceAccountName:
+                description: |-
+                  serviceAccountName is the name of the ServiceAccount to use to run the
+                  Prometheus Pods.
+                type: string
+              serviceName:
+                description: |-
+                  serviceName defines the service name used by the underlying StatefulSet(s) as the governing service.
+                  If defined, the Service  must be created before the Alertmanager resource in the same namespace and it must define a selector that matches the pod labels.
+                  If empty, the operator will create and manage a headless service named `alertmanager-operated` for Alertmanager resources.
+                  When deploying multiple Alertmanager resources in the same namespace, it is recommended to specify a different value for each.
+                  See https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#stable-network-id for more details.
+                minLength: 1
+                type: string
+              sha:
+                description: |-
+                  sha of Alertmanager container image to be deployed. Defaults to the value of `version`.
+                  Similar to a tag, but the SHA explicitly deploys an immutable container image.
+                  Version and Tag are ignored if SHA is set.
+                  Deprecated: use 'image' instead. The image digest can be specified as part of the image URL.
+                type: string
+              storage:
+                description: |-
+                  storage defines the definition of how storage will be used by the Alertmanager
+                  instances.
+                properties:
+                  disableMountSubPath:
+                    description: 'disableMountSubPath deprecated: subPath usage will
+                      be removed in a future release.'
+                    type: boolean
+                  emptyDir:
+                    description: |-
+                      emptyDir to be used by the StatefulSet.
+                      If specified, it takes precedence over `ephemeral` and `volumeClaimTemplate`.
+                      More info: https://kubernetes.io/docs/concepts/storage/volumes/#emptydir
+                    properties:
+                      medium:
+                        description: |-
+                          medium represents what type of storage medium should back this directory.
+                          The default is "" which means to use the node's default medium.
+                          Must be an empty string (default) or Memory.
+                          More info: https://kubernetes.io/docs/concepts/storage/volumes#emptydir
+                        type: string
+                      sizeLimit:
+                        anyOf:
+                        - type: integer
+                        - type: string
+                        description: |-
+                          sizeLimit is the total amount of local storage required for this EmptyDir volume.
+                          The size limit is also applicable for memory medium.
+                          The maximum usage on memory medium EmptyDir would be the minimum value between
+                          the SizeLimit specified here and the sum of memory limits of all containers in a pod.
+                          The default is nil which means that the limit is undefined.
+                          More info: https://kubernetes.io/docs/concepts/storage/volumes#emptydir
+                        pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                        x-kubernetes-int-or-string: true
+                    type: object
+                  ephemeral:
+                    description: |-
+                      ephemeral to be used by the StatefulSet.
+                      This is a beta field in k8s 1.21 and GA in 1.15.
+                      For lower versions, starting with k8s 1.19, it requires enabling the GenericEphemeralVolume feature gate.
+                      More info: https://kubernetes.io/docs/concepts/storage/ephemeral-volumes/#generic-ephemeral-volumes
+                    properties:
+                      volumeClaimTemplate:
+                        description: |-
+                          Will be used to create a stand-alone PVC to provision the volume.
+                          The pod in which this EphemeralVolumeSource is embedded will be the
+                          owner of the PVC, i.e. the PVC will be deleted together with the
+                          pod.  The name of the PVC will be `<pod name>-<volume name>` where
+                          `<volume name>` is the name from the `PodSpec.Volumes` array
+                          entry. Pod validation will reject the pod if the concatenated name
+                          is not valid for a PVC (for example, too long).
+
+                          An existing PVC with that name that is not owned by the pod
+                          will *not* be used for the pod to avoid using an unrelated
+                          volume by mistake. Starting the pod is then blocked until
+                          the unrelated PVC is removed. If such a pre-created PVC is
+                          meant to be used by the pod, the PVC has to updated with an
+                          owner reference to the pod once the pod exists. Normally
+                          this should not be necessary, but it may be useful when
+                          manually reconstructing a broken cluster.
+
+                          This field is read-only and no changes will be made by Kubernetes
+                          to the PVC after it has been created.
+
+                          Required, must not be nil.
+                        properties:
+                          metadata:
+                            description: |-
+                              May contain labels and annotations that will be copied into the PVC
+                              when creating it. No other fields are allowed and will be rejected during
+                              validation.
+                            type: object
+                          spec:
+                            description: |-
+                              The specification for the PersistentVolumeClaim. The entire content is
+                              copied unchanged into the PVC that gets created from this
+                              template. The same fields as in a PersistentVolumeClaim
+                              are also valid here.
+                            properties:
+                              accessModes:
+                                description: |-
+                                  accessModes contains the desired access modes the volume should have.
+                                  More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#access-modes-1
+                                items:
+                                  type: string
+                                type: array
+                                x-kubernetes-list-type: atomic
+                              dataSource:
+                                description: |-
+                                  dataSource field can be used to specify either:
+                                  * An existing VolumeSnapshot object (snapshot.storage.k8s.io/VolumeSnapshot)
+                                  * An existing PVC (PersistentVolumeClaim)
+                                  If the provisioner or an external controller can support the specified data source,
+                                  it will create a new volume based on the contents of the specified data source.
+                                  When the AnyVolumeDataSource feature gate is enabled, dataSource contents will be copied to dataSourceRef,
+                                  and dataSourceRef contents will be copied to dataSource when dataSourceRef.namespace is not specified.
+                                  If the namespace is specified, then dataSourceRef will not be copied to dataSource.
+                                properties:
+                                  apiGroup:
+                                    description: |-
+                                      APIGroup is the group for the resource being referenced.
+                                      If APIGroup is not specified, the specified Kind must be in the core API group.
+                                      For any other third-party types, APIGroup is required.
+                                    type: string
+                                  kind:
+                                    description: Kind is the type of resource being
+                                      referenced
+                                    type: string
+                                  name:
+                                    description: Name is the name of resource being
+                                      referenced
+                                    type: string
+                                required:
+                                - kind
+                                - name
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              dataSourceRef:
+                                description: |-
+                                  dataSourceRef specifies the object from which to populate the volume with data, if a non-empty
+                                  volume is desired. This may be any object from a non-empty API group (non
+                                  core object) or a PersistentVolumeClaim object.
+                                  When this field is specified, volume binding will only succeed if the type of
+                                  the specified object matches some installed volume populator or dynamic
+                                  provisioner.
+                                  This field will replace the functionality of the dataSource field and as such
+                                  if both fields are non-empty, they must have the same value. For backwards
+                                  compatibility, when namespace isn't specified in dataSourceRef,
+                                  both fields (dataSource and dataSourceRef) will be set to the same
+                                  value automatically if one of them is empty and the other is non-empty.
+                                  When namespace is specified in dataSourceRef,
+                                  dataSource isn't set to the same value and must be empty.
+                                  There are three important differences between dataSource and dataSourceRef:
+                                  * While dataSource only allows two specific types of objects, dataSourceRef
+                                    allows any non-core object, as well as PersistentVolumeClaim objects.
+                                  * While dataSource ignores disallowed values (dropping them), dataSourceRef
+                                    preserves all values, and generates an error if a disallowed value is
+                                    specified.
+                                  * While dataSource only allows local objects, dataSourceRef allows objects
+                                    in any namespaces.
+                                  (Beta) Using this field requires the AnyVolumeDataSource feature gate to be enabled.
+                                  (Alpha) Using the namespace field of dataSourceRef requires the CrossNamespaceVolumeDataSource feature gate to be enabled.
+                                properties:
+                                  apiGroup:
+                                    description: |-
+                                      APIGroup is the group for the resource being referenced.
+                                      If APIGroup is not specified, the specified Kind must be in the core API group.
+                                      For any other third-party types, APIGroup is required.
+                                    type: string
+                                  kind:
+                                    description: Kind is the type of resource being
+                                      referenced
+                                    type: string
+                                  name:
+                                    description: Name is the name of resource being
+                                      referenced
+                                    type: string
+                                  namespace:
+                                    description: |-
+                                      Namespace is the namespace of resource being referenced
+                                      Note that when a namespace is specified, a gateway.networking.k8s.io/ReferenceGrant object is required in the referent namespace to allow that namespace's owner to accept the reference. See the ReferenceGrant documentation for details.
+                                      (Alpha) This field requires the CrossNamespaceVolumeDataSource feature gate to be enabled.
+                                    type: string
+                                required:
+                                - kind
+                                - name
+                                type: object
+                              resources:
+                                description: |-
+                                  resources represents the minimum resources the volume should have.
+                                  If RecoverVolumeExpansionFailure feature is enabled users are allowed to specify resource requirements
+                                  that are lower than previous value but must still be higher than capacity recorded in the
+                                  status field of the claim.
+                                  More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources
+                                properties:
+                                  limits:
+                                    additionalProperties:
+                                      anyOf:
+                                      - type: integer
+                                      - type: string
+                                      pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                      x-kubernetes-int-or-string: true
+                                    description: |-
+                                      Limits describes the maximum amount of compute resources allowed.
+                                      More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+                                    type: object
+                                  requests:
+                                    additionalProperties:
+                                      anyOf:
+                                      - type: integer
+                                      - type: string
+                                      pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                      x-kubernetes-int-or-string: true
+                                    description: |-
+                                      Requests describes the minimum amount of compute resources required.
+                                      If Requests is omitted for a container, it defaults to Limits if that is explicitly specified,
+                                      otherwise to an implementation-defined value. Requests cannot exceed Limits.
+                                      More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+                                    type: object
+                                type: object
+                              selector:
+                                description: selector is a label query over volumes
+                                  to consider for binding.
+                                properties:
+                                  matchExpressions:
+                                    description: matchExpressions is a list of label
+                                      selector requirements. The requirements are
+                                      ANDed.
+                                    items:
+                                      description: |-
+                                        A label selector requirement is a selector that contains values, a key, and an operator that
+                                        relates the key and values.
+                                      properties:
+                                        key:
+                                          description: key is the label key that the
+                                            selector applies to.
+                                          type: string
+                                        operator:
+                                          description: |-
+                                            operator represents a key's relationship to a set of values.
+                                            Valid operators are In, NotIn, Exists and DoesNotExist.
+                                          type: string
+                                        values:
+                                          description: |-
+                                            values is an array of string values. If the operator is In or NotIn,
+                                            the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                            the values array must be empty. This array is replaced during a strategic
+                                            merge patch.
+                                          items:
+                                            type: string
+                                          type: array
+                                          x-kubernetes-list-type: atomic
+                                      required:
+                                      - key
+                                      - operator
+                                      type: object
+                                    type: array
+                                    x-kubernetes-list-type: atomic
+                                  matchLabels:
+                                    additionalProperties:
+                                      type: string
+                                    description: |-
+                                      matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                      map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                      operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                    type: object
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              storageClassName:
+                                description: |-
+                                  storageClassName is the name of the StorageClass required by the claim.
+                                  More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#class-1
+                                type: string
+                              volumeAttributesClassName:
+                                description: |-
+                                  volumeAttributesClassName may be used to set the VolumeAttributesClass used by this claim.
+                                  If specified, the CSI driver will create or update the volume with the attributes defined
+                                  in the corresponding VolumeAttributesClass. This has a different purpose than storageClassName,
+                                  it can be changed after the claim is created. An empty string or nil value indicates that no
+                                  VolumeAttributesClass will be applied to the claim. If the claim enters an Infeasible error state,
+                                  this field can be reset to its previous value (including nil) to cancel the modification.
+                                  If the resource referred to by volumeAttributesClass does not exist, this PersistentVolumeClaim will be
+                                  set to a Pending state, as reflected by the modifyVolumeStatus field, until such as a resource
+                                  exists.
+                                  More info: https://kubernetes.io/docs/concepts/storage/volume-attributes-classes/
+                                type: string
+                              volumeMode:
+                                description: |-
+                                  volumeMode defines what type of volume is required by the claim.
+                                  Value of Filesystem is implied when not included in claim spec.
+                                type: string
+                              volumeName:
+                                description: volumeName is the binding reference to
+                                  the PersistentVolume backing this claim.
+                                type: string
+                            type: object
+                        required:
+                        - spec
+                        type: object
+                    type: object
+                  volumeClaimTemplate:
+                    description: |-
+                      volumeClaimTemplate defines the PVC spec to be used by the Prometheus StatefulSets.
+                      The easiest way to use a volume that cannot be automatically provisioned
+                      is to use a label selector alongside manually created PersistentVolumes.
+                    properties:
+                      apiVersion:
+                        description: |-
+                          APIVersion defines the versioned schema of this representation of an object.
+                          Servers should convert recognized schemas to the latest internal value, and
+                          may reject unrecognized values.
+                          More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+                        type: string
+                      kind:
+                        description: |-
+                          Kind is a string value representing the REST resource this object represents.
+                          Servers may infer this from the endpoint the client submits requests to.
+                          Cannot be updated.
+                          In CamelCase.
+                          More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+                        type: string
+                      metadata:
+                        description: metadata defines EmbeddedMetadata contains metadata
+                          relevant to an EmbeddedResource.
+                        properties:
+                          annotations:
+                            additionalProperties:
+                              type: string
+                            description: |-
+                              annotations defines an unstructured key value map stored with a resource that may be
+                              set by external tools to store and retrieve arbitrary metadata. They are not
+                              queryable and should be preserved when modifying objects.
+                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
+                            type: object
+                          labels:
+                            additionalProperties:
+                              type: string
+                            description: |-
+                              labels define the map of string keys and values that can be used to organize and categorize
+                              (scope and select) objects. May match selectors of replication controllers
+                              and services.
+                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
+                            type: object
+                          name:
+                            description: |-
+                              name must be unique within a namespace. Is required when creating resources, although
+                              some resources may allow a client to request the generation of an appropriate name
+                              automatically. Name is primarily intended for creation idempotence and configuration
+                              definition.
+                              Cannot be updated.
+                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/
+                            type: string
+                        type: object
+                      spec:
+                        description: |-
+                          spec defines the specification of the  characteristics of a volume requested by a pod author.
+                          More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#persistentvolumeclaims
+                        properties:
+                          accessModes:
+                            description: |-
+                              accessModes contains the desired access modes the volume should have.
+                              More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#access-modes-1
+                            items:
+                              type: string
+                            type: array
+                            x-kubernetes-list-type: atomic
+                          dataSource:
+                            description: |-
+                              dataSource field can be used to specify either:
+                              * An existing VolumeSnapshot object (snapshot.storage.k8s.io/VolumeSnapshot)
+                              * An existing PVC (PersistentVolumeClaim)
+                              If the provisioner or an external controller can support the specified data source,
+                              it will create a new volume based on the contents of the specified data source.
+                              When the AnyVolumeDataSource feature gate is enabled, dataSource contents will be copied to dataSourceRef,
+                              and dataSourceRef contents will be copied to dataSource when dataSourceRef.namespace is not specified.
+                              If the namespace is specified, then dataSourceRef will not be copied to dataSource.
+                            properties:
+                              apiGroup:
+                                description: |-
+                                  APIGroup is the group for the resource being referenced.
+                                  If APIGroup is not specified, the specified Kind must be in the core API group.
+                                  For any other third-party types, APIGroup is required.
+                                type: string
+                              kind:
+                                description: Kind is the type of resource being referenced
+                                type: string
+                              name:
+                                description: Name is the name of resource being referenced
+                                type: string
+                            required:
+                            - kind
+                            - name
+                            type: object
+                            x-kubernetes-map-type: atomic
+                          dataSourceRef:
+                            description: |-
+                              dataSourceRef specifies the object from which to populate the volume with data, if a non-empty
+                              volume is desired. This may be any object from a non-empty API group (non
+                              core object) or a PersistentVolumeClaim object.
+                              When this field is specified, volume binding will only succeed if the type of
+                              the specified object matches some installed volume populator or dynamic
+                              provisioner.
+                              This field will replace the functionality of the dataSource field and as such
+                              if both fields are non-empty, they must have the same value. For backwards
+                              compatibility, when namespace isn't specified in dataSourceRef,
+                              both fields (dataSource and dataSourceRef) will be set to the same
+                              value automatically if one of them is empty and the other is non-empty.
+                              When namespace is specified in dataSourceRef,
+                              dataSource isn't set to the same value and must be empty.
+                              There are three important differences between dataSource and dataSourceRef:
+                              * While dataSource only allows two specific types of objects, dataSourceRef
+                                allows any non-core object, as well as PersistentVolumeClaim objects.
+                              * While dataSource ignores disallowed values (dropping them), dataSourceRef
+                                preserves all values, and generates an error if a disallowed value is
+                                specified.
+                              * While dataSource only allows local objects, dataSourceRef allows objects
+                                in any namespaces.
+                              (Beta) Using this field requires the AnyVolumeDataSource feature gate to be enabled.
+                              (Alpha) Using the namespace field of dataSourceRef requires the CrossNamespaceVolumeDataSource feature gate to be enabled.
+                            properties:
+                              apiGroup:
+                                description: |-
+                                  APIGroup is the group for the resource being referenced.
+                                  If APIGroup is not specified, the specified Kind must be in the core API group.
+                                  For any other third-party types, APIGroup is required.
+                                type: string
+                              kind:
+                                description: Kind is the type of resource being referenced
+                                type: string
+                              name:
+                                description: Name is the name of resource being referenced
+                                type: string
+                              namespace:
+                                description: |-
+                                  Namespace is the namespace of resource being referenced
+                                  Note that when a namespace is specified, a gateway.networking.k8s.io/ReferenceGrant object is required in the referent namespace to allow that namespace's owner to accept the reference. See the ReferenceGrant documentation for details.
+                                  (Alpha) This field requires the CrossNamespaceVolumeDataSource feature gate to be enabled.
+                                type: string
+                            required:
+                            - kind
+                            - name
+                            type: object
+                          resources:
+                            description: |-
+                              resources represents the minimum resources the volume should have.
+                              If RecoverVolumeExpansionFailure feature is enabled users are allowed to specify resource requirements
+                              that are lower than previous value but must still be higher than capacity recorded in the
+                              status field of the claim.
+                              More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources
+                            properties:
+                              limits:
+                                additionalProperties:
+                                  anyOf:
+                                  - type: integer
+                                  - type: string
+                                  pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                  x-kubernetes-int-or-string: true
+                                description: |-
+                                  Limits describes the maximum amount of compute resources allowed.
+                                  More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+                                type: object
+                              requests:
+                                additionalProperties:
+                                  anyOf:
+                                  - type: integer
+                                  - type: string
+                                  pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                  x-kubernetes-int-or-string: true
+                                description: |-
+                                  Requests describes the minimum amount of compute resources required.
+                                  If Requests is omitted for a container, it defaults to Limits if that is explicitly specified,
+                                  otherwise to an implementation-defined value. Requests cannot exceed Limits.
+                                  More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+                                type: object
+                            type: object
+                          selector:
+                            description: selector is a label query over volumes to
+                              consider for binding.
+                            properties:
+                              matchExpressions:
+                                description: matchExpressions is a list of label selector
+                                  requirements. The requirements are ANDed.
+                                items:
+                                  description: |-
+                                    A label selector requirement is a selector that contains values, a key, and an operator that
+                                    relates the key and values.
+                                  properties:
+                                    key:
+                                      description: key is the label key that the selector
+                                        applies to.
+                                      type: string
+                                    operator:
+                                      description: |-
+                                        operator represents a key's relationship to a set of values.
+                                        Valid operators are In, NotIn, Exists and DoesNotExist.
+                                      type: string
+                                    values:
+                                      description: |-
+                                        values is an array of string values. If the operator is In or NotIn,
+                                        the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                        the values array must be empty. This array is replaced during a strategic
+                                        merge patch.
+                                      items:
+                                        type: string
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                  required:
+                                  - key
+                                  - operator
+                                  type: object
+                                type: array
+                                x-kubernetes-list-type: atomic
+                              matchLabels:
+                                additionalProperties:
+                                  type: string
+                                description: |-
+                                  matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                  map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                  operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                type: object
+                            type: object
+                            x-kubernetes-map-type: atomic
+                          storageClassName:
+                            description: |-
+                              storageClassName is the name of the StorageClass required by the claim.
+                              More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#class-1
+                            type: string
+                          volumeAttributesClassName:
+                            description: |-
+                              volumeAttributesClassName may be used to set the VolumeAttributesClass used by this claim.
+                              If specified, the CSI driver will create or update the volume with the attributes defined
+                              in the corresponding VolumeAttributesClass. This has a different purpose than storageClassName,
+                              it can be changed after the claim is created. An empty string or nil value indicates that no
+                              VolumeAttributesClass will be applied to the claim. If the claim enters an Infeasible error state,
+                              this field can be reset to its previous value (including nil) to cancel the modification.
+                              If the resource referred to by volumeAttributesClass does not exist, this PersistentVolumeClaim will be
+                              set to a Pending state, as reflected by the modifyVolumeStatus field, until such as a resource
+                              exists.
+                              More info: https://kubernetes.io/docs/concepts/storage/volume-attributes-classes/
+                            type: string
+                          volumeMode:
+                            description: |-
+                              volumeMode defines what type of volume is required by the claim.
+                              Value of Filesystem is implied when not included in claim spec.
+                            type: string
+                          volumeName:
+                            description: volumeName is the binding reference to the
+                              PersistentVolume backing this claim.
+                            type: string
+                        type: object
+                      status:
+                        description: 'status is deprecated: this field is never set.'
+                        properties:
+                          accessModes:
+                            description: |-
+                              accessModes contains the actual access modes the volume backing the PVC has.
+                              More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#access-modes-1
+                            items:
+                              type: string
+                            type: array
+                            x-kubernetes-list-type: atomic
+                          allocatedResourceStatuses:
+                            additionalProperties:
+                              description: |-
+                                When a controller receives persistentvolume claim update with ClaimResourceStatus for a resource
+                                that it does not recognizes, then it should ignore that update and let other controllers
+                                handle it.
+                              type: string
+                            description: "allocatedResourceStatuses stores status
+                              of resource being resized for the given PVC.\nKey names
+                              follow standard Kubernetes label syntax. Valid values
+                              are either:\n\t* Un-prefixed keys:\n\t\t- storage -
+                              the capacity of the volume.\n\t* Custom resources must
+                              use implementation-defined prefixed names such as \"example.com/my-custom-resource\"\nApart
+                              from above values - keys that are unprefixed or have
+                              kubernetes.io prefix are considered\nreserved and hence
+                              may not be used.\n\nClaimResourceStatus can be in any
+                              of following states:\n\t- ControllerResizeInProgress:\n\t\tState
+                              set when resize controller starts resizing the volume
+                              in control-plane.\n\t- ControllerResizeFailed:\n\t\tState
+                              set when resize has failed in resize controller with
+                              a terminal error.\n\t- NodeResizePending:\n\t\tState
+                              set when resize controller has finished resizing the
+                              volume but further resizing of\n\t\tvolume is needed
+                              on the node.\n\t- NodeResizeInProgress:\n\t\tState set
+                              when kubelet starts resizing the volume.\n\t- NodeResizeFailed:\n\t\tState
+                              set when resizing has failed in kubelet with a terminal
+                              error. Transient errors don't set\n\t\tNodeResizeFailed.\nFor
+                              example: if expanding a PVC for more capacity - this
+                              field can be one of the following states:\n\t- pvc.status.allocatedResourceStatus['storage']
+                              = \"ControllerResizeInProgress\"\n     - pvc.status.allocatedResourceStatus['storage']
+                              = \"ControllerResizeFailed\"\n     - pvc.status.allocatedResourceStatus['storage']
+                              = \"NodeResizePending\"\n     - pvc.status.allocatedResourceStatus['storage']
+                              = \"NodeResizeInProgress\"\n     - pvc.status.allocatedResourceStatus['storage']
+                              = \"NodeResizeFailed\"\nWhen this field is not set,
+                              it means that no resize operation is in progress for
+                              the given PVC.\n\nA controller that receives PVC update
+                              with previously unknown resourceName or ClaimResourceStatus\nshould
+                              ignore the update for the purpose it was designed. For
+                              example - a controller that\nonly is responsible for
+                              resizing capacity of the volume, should ignore PVC updates
+                              that change other valid\nresources associated with PVC.\n\nThis
+                              is an alpha field and requires enabling RecoverVolumeExpansionFailure
+                              feature."
+                            type: object
+                            x-kubernetes-map-type: granular
+                          allocatedResources:
+                            additionalProperties:
+                              anyOf:
+                              - type: integer
+                              - type: string
+                              pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                              x-kubernetes-int-or-string: true
+                            description: "allocatedResources tracks the resources
+                              allocated to a PVC including its capacity.\nKey names
+                              follow standard Kubernetes label syntax. Valid values
+                              are either:\n\t* Un-prefixed keys:\n\t\t- storage -
+                              the capacity of the volume.\n\t* Custom resources must
+                              use implementation-defined prefixed names such as \"example.com/my-custom-resource\"\nApart
+                              from above values - keys that are unprefixed or have
+                              kubernetes.io prefix are considered\nreserved and hence
+                              may not be used.\n\nCapacity reported here may be larger
+                              than the actual capacity when a volume expansion operation\nis
+                              requested.\nFor storage quota, the larger value from
+                              allocatedResources and PVC.spec.resources is used.\nIf
+                              allocatedResources is not set, PVC.spec.resources alone
+                              is used for quota calculation.\nIf a volume expansion
+                              capacity request is lowered, allocatedResources is only\nlowered
+                              if there are no expansion operations in progress and
+                              if the actual volume capacity\nis equal or lower than
+                              the requested capacity.\n\nA controller that receives
+                              PVC update with previously unknown resourceName\nshould
+                              ignore the update for the purpose it was designed. For
+                              example - a controller that\nonly is responsible for
+                              resizing capacity of the volume, should ignore PVC updates
+                              that change other valid\nresources associated with PVC.\n\nThis
+                              is an alpha field and requires enabling RecoverVolumeExpansionFailure
+                              feature."
+                            type: object
+                          capacity:
+                            additionalProperties:
+                              anyOf:
+                              - type: integer
+                              - type: string
+                              pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                              x-kubernetes-int-or-string: true
+                            description: capacity represents the actual resources
+                              of the underlying volume.
+                            type: object
+                          conditions:
+                            description: |-
+                              conditions is the current Condition of persistent volume claim. If underlying persistent volume is being
+                              resized then the Condition will be set to 'Resizing'.
+                            items:
+                              description: PersistentVolumeClaimCondition contains
+                                details about state of pvc
+                              properties:
+                                lastProbeTime:
+                                  description: lastProbeTime is the time we probed
+                                    the condition.
+                                  format: date-time
+                                  type: string
+                                lastTransitionTime:
+                                  description: lastTransitionTime is the time the
+                                    condition transitioned from one status to another.
+                                  format: date-time
+                                  type: string
+                                message:
+                                  description: message is the human-readable message
+                                    indicating details about last transition.
+                                  type: string
+                                reason:
+                                  description: |-
+                                    reason is a unique, this should be a short, machine understandable string that gives the reason
+                                    for condition's last transition. If it reports "Resizing" that means the underlying
+                                    persistent volume is being resized.
+                                  type: string
+                                status:
+                                  description: |-
+                                    Status is the status of the condition.
+                                    Can be True, False, Unknown.
+                                    More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=state%20of%20pvc-,conditions.status,-(string)%2C%20required
+                                  type: string
+                                type:
+                                  description: |-
+                                    Type is the type of the condition.
+                                    More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=set%20to%20%27ResizeStarted%27.-,PersistentVolumeClaimCondition,-contains%20details%20about
+                                  type: string
+                              required:
+                              - status
+                              - type
+                              type: object
+                            type: array
+                            x-kubernetes-list-map-keys:
+                            - type
+                            x-kubernetes-list-type: map
+                          currentVolumeAttributesClassName:
+                            description: |-
+                              currentVolumeAttributesClassName is the current name of the VolumeAttributesClass the PVC is using.
+                              When unset, there is no VolumeAttributeClass applied to this PersistentVolumeClaim
+                            type: string
+                          modifyVolumeStatus:
+                            description: |-
+                              ModifyVolumeStatus represents the status object of ControllerModifyVolume operation.
+                              When this is unset, there is no ModifyVolume operation being attempted.
+                            properties:
+                              status:
+                                description: "status is the status of the ControllerModifyVolume
+                                  operation. It can be in any of following states:\n
+                                  - Pending\n   Pending indicates that the PersistentVolumeClaim
+                                  cannot be modified due to unmet requirements, such
+                                  as\n   the specified VolumeAttributesClass not existing.\n
+                                  - InProgress\n   InProgress indicates that the volume
+                                  is being modified.\n - Infeasible\n  Infeasible
+                                  indicates that the request has been rejected as
+                                  invalid by the CSI driver. To\n\t  resolve the error,
+                                  a valid VolumeAttributesClass needs to be specified.\nNote:
+                                  New statuses can be added in the future. Consumers
+                                  should check for unknown statuses and fail appropriately."
+                                type: string
+                              targetVolumeAttributesClassName:
+                                description: targetVolumeAttributesClassName is the
+                                  name of the VolumeAttributesClass the PVC currently
+                                  being reconciled
+                                type: string
+                            required:
+                            - status
+                            type: object
+                          phase:
+                            description: phase represents the current phase of PersistentVolumeClaim.
+                            type: string
+                        type: object
+                    type: object
+                type: object
+              tag:
+                description: |-
+                  tag of Alertmanager container image to be deployed. Defaults to the value of `version`.
+                  Version is ignored if Tag is set.
+                  Deprecated: use 'image' instead. The image tag can be specified as part of the image URL.
+                type: string
+              terminationGracePeriodSeconds:
+                description: |-
+                  terminationGracePeriodSeconds defines the Optional duration in seconds the pod needs to terminate gracefully.
+                  Value must be non-negative integer. The value zero indicates stop immediately via
+                  the kill signal (no opportunity to shut down) which may lead to data corruption.
+
+                  Defaults to 120 seconds.
+                format: int64
+                minimum: 0
+                type: integer
+              tolerations:
+                description: tolerations defines the pod's tolerations.
+                items:
+                  description: |-
+                    The pod this Toleration is attached to tolerates any taint that matches
+                    the triple <key,value,effect> using the matching operator <operator>.
+                  properties:
+                    effect:
+                      description: |-
+                        Effect indicates the taint effect to match. Empty means match all taint effects.
+                        When specified, allowed values are NoSchedule, PreferNoSchedule and NoExecute.
+                      type: string
+                    key:
+                      description: |-
+                        Key is the taint key that the toleration applies to. Empty means match all taint keys.
+                        If the key is empty, operator must be Exists; this combination means to match all values and all keys.
+                      type: string
+                    operator:
+                      description: |-
+                        Operator represents a key's relationship to the value.
+                        Valid operators are Exists and Equal. Defaults to Equal.
+                        Exists is equivalent to wildcard for value, so that a pod can
+                        tolerate all taints of a particular category.
+                      type: string
+                    tolerationSeconds:
+                      description: |-
+                        TolerationSeconds represents the period of time the toleration (which must be
+                        of effect NoExecute, otherwise this field is ignored) tolerates the taint. By default,
+                        it is not set, which means tolerate the taint forever (do not evict). Zero and
+                        negative values will be treated as 0 (evict immediately) by the system.
+                      format: int64
+                      type: integer
+                    value:
+                      description: |-
+                        Value is the taint value the toleration matches to.
+                        If the operator is Exists, the value should be empty, otherwise just a regular string.
+                      type: string
+                  type: object
+                type: array
+              topologySpreadConstraints:
+                description: topologySpreadConstraints defines the Pod's topology
+                  spread constraints.
+                items:
+                  description: TopologySpreadConstraint specifies how to spread matching
+                    pods among the given topology.
+                  properties:
+                    labelSelector:
+                      description: |-
+                        LabelSelector is used to find matching pods.
+                        Pods that match this label selector are counted to determine the number of pods
+                        in their corresponding topology domain.
+                      properties:
+                        matchExpressions:
+                          description: matchExpressions is a list of label selector
+                            requirements. The requirements are ANDed.
+                          items:
+                            description: |-
+                              A label selector requirement is a selector that contains values, a key, and an operator that
+                              relates the key and values.
+                            properties:
+                              key:
+                                description: key is the label key that the selector
+                                  applies to.
+                                type: string
+                              operator:
+                                description: |-
+                                  operator represents a key's relationship to a set of values.
+                                  Valid operators are In, NotIn, Exists and DoesNotExist.
+                                type: string
+                              values:
+                                description: |-
+                                  values is an array of string values. If the operator is In or NotIn,
+                                  the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                  the values array must be empty. This array is replaced during a strategic
+                                  merge patch.
+                                items:
+                                  type: string
+                                type: array
+                                x-kubernetes-list-type: atomic
+                            required:
+                            - key
+                            - operator
+                            type: object
+                          type: array
+                          x-kubernetes-list-type: atomic
+                        matchLabels:
+                          additionalProperties:
+                            type: string
+                          description: |-
+                            matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                            map is equivalent to an element of matchExpressions, whose key field is "key", the
+                            operator is "In", and the values array contains only "value". The requirements are ANDed.
+                          type: object
+                      type: object
+                      x-kubernetes-map-type: atomic
+                    matchLabelKeys:
+                      description: |-
+                        MatchLabelKeys is a set of pod label keys to select the pods over which
+                        spreading will be calculated. The keys are used to lookup values from the
+                        incoming pod labels, those key-value labels are ANDed with labelSelector
+                        to select the group of existing pods over which spreading will be calculated
+                        for the incoming pod. The same key is forbidden to exist in both MatchLabelKeys and LabelSelector.
+                        MatchLabelKeys cannot be set when LabelSelector isn't set.
+                        Keys that don't exist in the incoming pod labels will
+                        be ignored. A null or empty list means only match against labelSelector.
+
+                        This is a beta field and requires the MatchLabelKeysInPodTopologySpread feature gate to be enabled (enabled by default).
+                      items:
+                        type: string
+                      type: array
+                      x-kubernetes-list-type: atomic
+                    maxSkew:
+                      description: |-
+                        MaxSkew describes the degree to which pods may be unevenly distributed.
+                        When `whenUnsatisfiable=DoNotSchedule`, it is the maximum permitted difference
+                        between the number of matching pods in the target topology and the global minimum.
+                        The global minimum is the minimum number of matching pods in an eligible domain
+                        or zero if the number of eligible domains is less than MinDomains.
+                        For example, in a 3-zone cluster, MaxSkew is set to 1, and pods with the same
+                        labelSelector spread as 2/2/1:
+                        In this case, the global minimum is 1.
+                        | zone1 | zone2 | zone3 |
+                        |  P P  |  P P  |   P   |
+                        - if MaxSkew is 1, incoming pod can only be scheduled to zone3 to become 2/2/2;
+                        scheduling it onto zone1(zone2) would make the ActualSkew(3-1) on zone1(zone2)
+                        violate MaxSkew(1).
+                        - if MaxSkew is 2, incoming pod can be scheduled onto any zone.
+                        When `whenUnsatisfiable=ScheduleAnyway`, it is used to give higher precedence
+                        to topologies that satisfy it.
+                        It's a required field. Default value is 1 and 0 is not allowed.
+                      format: int32
+                      type: integer
+                    minDomains:
+                      description: |-
+                        MinDomains indicates a minimum number of eligible domains.
+                        When the number of eligible domains with matching topology keys is less than minDomains,
+                        Pod Topology Spread treats "global minimum" as 0, and then the calculation of Skew is performed.
+                        And when the number of eligible domains with matching topology keys equals or greater than minDomains,
+                        this value has no effect on scheduling.
+                        As a result, when the number of eligible domains is less than minDomains,
+                        scheduler won't schedule more than maxSkew Pods to those domains.
+                        If value is nil, the constraint behaves as if MinDomains is equal to 1.
+                        Valid values are integers greater than 0.
+                        When value is not nil, WhenUnsatisfiable must be DoNotSchedule.
+
+                        For example, in a 3-zone cluster, MaxSkew is set to 2, MinDomains is set to 5 and pods with the same
+                        labelSelector spread as 2/2/2:
+                        | zone1 | zone2 | zone3 |
+                        |  P P  |  P P  |  P P  |
+                        The number of domains is less than 5(MinDomains), so "global minimum" is treated as 0.
+                        In this situation, new pod with the same labelSelector cannot be scheduled,
+                        because computed skew will be 3(3 - 0) if new Pod is scheduled to any of the three zones,
+                        it will violate MaxSkew.
+                      format: int32
+                      type: integer
+                    nodeAffinityPolicy:
+                      description: |-
+                        NodeAffinityPolicy indicates how we will treat Pod's nodeAffinity/nodeSelector
+                        when calculating pod topology spread skew. Options are:
+                        - Honor: only nodes matching nodeAffinity/nodeSelector are included in the calculations.
+                        - Ignore: nodeAffinity/nodeSelector are ignored. All nodes are included in the calculations.
+
+                        If this value is nil, the behavior is equivalent to the Honor policy.
+                      type: string
+                    nodeTaintsPolicy:
+                      description: |-
+                        NodeTaintsPolicy indicates how we will treat node taints when calculating
+                        pod topology spread skew. Options are:
+                        - Honor: nodes without taints, along with tainted nodes for which the incoming pod
+                        has a toleration, are included.
+                        - Ignore: node taints are ignored. All nodes are included.
+
+                        If this value is nil, the behavior is equivalent to the Ignore policy.
+                      type: string
+                    topologyKey:
+                      description: |-
+                        TopologyKey is the key of node labels. Nodes that have a label with this key
+                        and identical values are considered to be in the same topology.
+                        We consider each <key, value> as a "bucket", and try to put balanced number
+                        of pods into each bucket.
+                        We define a domain as a particular instance of a topology.
+                        Also, we define an eligible domain as a domain whose nodes meet the requirements of
+                        nodeAffinityPolicy and nodeTaintsPolicy.
+                        e.g. If TopologyKey is "kubernetes.io/hostname", each Node is a domain of that topology.
+                        And, if TopologyKey is "topology.kubernetes.io/zone", each zone is a domain of that topology.
+                        It's a required field.
+                      type: string
+                    whenUnsatisfiable:
+                      description: |-
+                        WhenUnsatisfiable indicates how to deal with a pod if it doesn't satisfy
+                        the spread constraint.
+                        - DoNotSchedule (default) tells the scheduler not to schedule it.
+                        - ScheduleAnyway tells the scheduler to schedule the pod in any location,
+                          but giving higher precedence to topologies that would help reduce the
+                          skew.
+                        A constraint is considered "Unsatisfiable" for an incoming pod
+                        if and only if every possible node assignment for that pod would violate
+                        "MaxSkew" on some topology.
+                        For example, in a 3-zone cluster, MaxSkew is set to 1, and pods with the same
+                        labelSelector spread as 3/1/1:
+                        | zone1 | zone2 | zone3 |
+                        | P P P |   P   |   P   |
+                        If WhenUnsatisfiable is set to DoNotSchedule, incoming pod can only be scheduled
+                        to zone2(zone3) to become 3/2/1(3/1/2) as ActualSkew(2-1) on zone2(zone3) satisfies
+                        MaxSkew(1). In other words, the cluster can still be imbalanced, but scheduler
+                        won't make it *more* imbalanced.
+                        It's a required field.
+                      type: string
+                  required:
+                  - maxSkew
+                  - topologyKey
+                  - whenUnsatisfiable
+                  type: object
+                type: array
+              version:
+                description: version the cluster should be on.
+                type: string
+              volumeMounts:
+                description: |-
+                  volumeMounts allows configuration of additional VolumeMounts on the output StatefulSet definition.
+                  VolumeMounts specified will be appended to other VolumeMounts in the alertmanager container,
+                  that are generated as a result of StorageSpec objects.
+                items:
+                  description: VolumeMount describes a mounting of a Volume within
+                    a container.
+                  properties:
+                    mountPath:
+                      description: |-
+                        Path within the container at which the volume should be mounted.  Must
+                        not contain ':'.
+                      type: string
+                    mountPropagation:
+                      description: |-
+                        mountPropagation determines how mounts are propagated from the host
+                        to container and the other way around.
+                        When not set, MountPropagationNone is used.
+                        This field is beta in 1.10.
+                        When RecursiveReadOnly is set to IfPossible or to Enabled, MountPropagation must be None or unspecified
+                        (which defaults to None).
+                      type: string
+                    name:
+                      description: This must match the Name of a Volume.
+                      type: string
+                    readOnly:
+                      description: |-
+                        Mounted read-only if true, read-write otherwise (false or unspecified).
+                        Defaults to false.
+                      type: boolean
+                    recursiveReadOnly:
+                      description: |-
+                        RecursiveReadOnly specifies whether read-only mounts should be handled
+                        recursively.
+
+                        If ReadOnly is false, this field has no meaning and must be unspecified.
+
+                        If ReadOnly is true, and this field is set to Disabled, the mount is not made
+                        recursively read-only.  If this field is set to IfPossible, the mount is made
+                        recursively read-only, if it is supported by the container runtime.  If this
+                        field is set to Enabled, the mount is made recursively read-only if it is
+                        supported by the container runtime, otherwise the pod will not be started and
+                        an error will be generated to indicate the reason.
+
+                        If this field is set to IfPossible or Enabled, MountPropagation must be set to
+                        None (or be unspecified, which defaults to None).
+
+                        If this field is not specified, it is treated as an equivalent of Disabled.
+                      type: string
+                    subPath:
+                      description: |-
+                        Path within the volume from which the container's volume should be mounted.
+                        Defaults to "" (volume's root).
+                      type: string
+                    subPathExpr:
+                      description: |-
+                        Expanded path within the volume from which the container's volume should be mounted.
+                        Behaves similarly to SubPath but environment variable references $(VAR_NAME) are expanded using the container's environment.
+                        Defaults to "" (volume's root).
+                        SubPathExpr and SubPath are mutually exclusive.
+                      type: string
+                  required:
+                  - mountPath
+                  - name
+                  type: object
+                type: array
+              volumes:
+                description: |-
+                  volumes allows configuration of additional volumes on the output StatefulSet definition.
+                  Volumes specified will be appended to other volumes that are generated as a result of
+                  StorageSpec objects.
+                items:
+                  description: Volume represents a named volume in a pod that may
+                    be accessed by any container in the pod.
+                  properties:
+                    awsElasticBlockStore:
+                      description: |-
+                        awsElasticBlockStore represents an AWS Disk resource that is attached to a
+                        kubelet's host machine and then exposed to the pod.
+                        Deprecated: AWSElasticBlockStore is deprecated. All operations for the in-tree
+                        awsElasticBlockStore type are redirected to the ebs.csi.aws.com CSI driver.
+                        More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
+                      properties:
+                        fsType:
+                          description: |-
+                            fsType is the filesystem type of the volume that you want to mount.
+                            Tip: Ensure that the filesystem type is supported by the host operating system.
+                            Examples: "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
+                            More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
+                          type: string
+                        partition:
+                          description: |-
+                            partition is the partition in the volume that you want to mount.
+                            If omitted, the default is to mount by volume name.
+                            Examples: For volume /dev/sda1, you specify the partition as "1".
+                            Similarly, the volume partition for /dev/sda is "0" (or you can leave the property empty).
+                          format: int32
+                          type: integer
+                        readOnly:
+                          description: |-
+                            readOnly value true will force the readOnly setting in VolumeMounts.
+                            More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
+                          type: boolean
+                        volumeID:
+                          description: |-
+                            volumeID is unique ID of the persistent disk resource in AWS (Amazon EBS volume).
+                            More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
+                          type: string
+                      required:
+                      - volumeID
+                      type: object
+                    azureDisk:
+                      description: |-
+                        azureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.
+                        Deprecated: AzureDisk is deprecated. All operations for the in-tree azureDisk type
+                        are redirected to the disk.csi.azure.com CSI driver.
+                      properties:
+                        cachingMode:
+                          description: 'cachingMode is the Host Caching mode: None,
+                            Read Only, Read Write.'
+                          type: string
+                        diskName:
+                          description: diskName is the Name of the data disk in the
+                            blob storage
+                          type: string
+                        diskURI:
+                          description: diskURI is the URI of data disk in the blob
+                            storage
+                          type: string
+                        fsType:
+                          default: ext4
+                          description: |-
+                            fsType is Filesystem type to mount.
+                            Must be a filesystem type supported by the host operating system.
+                            Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
+                          type: string
+                        kind:
+                          description: 'kind expected values are Shared: multiple
+                            blob disks per storage account  Dedicated: single blob
+                            disk per storage account  Managed: azure managed data
+                            disk (only in managed availability set). defaults to shared'
+                          type: string
+                        readOnly:
+                          default: false
+                          description: |-
+                            readOnly Defaults to false (read/write). ReadOnly here will force
+                            the ReadOnly setting in VolumeMounts.
+                          type: boolean
+                      required:
+                      - diskName
+                      - diskURI
+                      type: object
+                    azureFile:
+                      description: |-
+                        azureFile represents an Azure File Service mount on the host and bind mount to the pod.
+                        Deprecated: AzureFile is deprecated. All operations for the in-tree azureFile type
+                        are redirected to the file.csi.azure.com CSI driver.
+                      properties:
+                        readOnly:
+                          description: |-
+                            readOnly defaults to false (read/write). ReadOnly here will force
+                            the ReadOnly setting in VolumeMounts.
+                          type: boolean
+                        secretName:
+                          description: secretName is the  name of secret that contains
+                            Azure Storage Account Name and Key
+                          type: string
+                        shareName:
+                          description: shareName is the azure share Name
+                          type: string
+                      required:
+                      - secretName
+                      - shareName
+                      type: object
+                    cephfs:
+                      description: |-
+                        cephFS represents a Ceph FS mount on the host that shares a pod's lifetime.
+                        Deprecated: CephFS is deprecated and the in-tree cephfs type is no longer supported.
+                      properties:
+                        monitors:
+                          description: |-
+                            monitors is Required: Monitors is a collection of Ceph monitors
+                            More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it
+                          items:
+                            type: string
+                          type: array
+                          x-kubernetes-list-type: atomic
+                        path:
+                          description: 'path is Optional: Used as the mounted root,
+                            rather than the full Ceph tree, default is /'
+                          type: string
+                        readOnly:
+                          description: |-
+                            readOnly is Optional: Defaults to false (read/write). ReadOnly here will force
+                            the ReadOnly setting in VolumeMounts.
+                            More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it
+                          type: boolean
+                        secretFile:
+                          description: |-
+                            secretFile is Optional: SecretFile is the path to key ring for User, default is /etc/ceph/user.secret
+                            More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it
+                          type: string
+                        secretRef:
+                          description: |-
+                            secretRef is Optional: SecretRef is reference to the authentication secret for User, default is empty.
+                            More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it
+                          properties:
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        user:
+                          description: |-
+                            user is optional: User is the rados user name, default is admin
+                            More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it
+                          type: string
+                      required:
+                      - monitors
+                      type: object
+                    cinder:
+                      description: |-
+                        cinder represents a cinder volume attached and mounted on kubelets host machine.
+                        Deprecated: Cinder is deprecated. All operations for the in-tree cinder type
+                        are redirected to the cinder.csi.openstack.org CSI driver.
+                        More info: https://examples.k8s.io/mysql-cinder-pd/README.md
+                      properties:
+                        fsType:
+                          description: |-
+                            fsType is the filesystem type to mount.
+                            Must be a filesystem type supported by the host operating system.
+                            Examples: "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
+                            More info: https://examples.k8s.io/mysql-cinder-pd/README.md
+                          type: string
+                        readOnly:
+                          description: |-
+                            readOnly defaults to false (read/write). ReadOnly here will force
+                            the ReadOnly setting in VolumeMounts.
+                            More info: https://examples.k8s.io/mysql-cinder-pd/README.md
+                          type: boolean
+                        secretRef:
+                          description: |-
+                            secretRef is optional: points to a secret object containing parameters used to connect
+                            to OpenStack.
+                          properties:
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        volumeID:
+                          description: |-
+                            volumeID used to identify the volume in cinder.
+                            More info: https://examples.k8s.io/mysql-cinder-pd/README.md
+                          type: string
+                      required:
+                      - volumeID
+                      type: object
+                    configMap:
+                      description: configMap represents a configMap that should populate
+                        this volume
+                      properties:
+                        defaultMode:
+                          description: |-
+                            defaultMode is optional: mode bits used to set permissions on created files by default.
+                            Must be an octal value between 0000 and 0777 or a decimal value between 0 and 511.
+                            YAML accepts both octal and decimal values, JSON requires decimal values for mode bits.
+                            Defaults to 0644.
+                            Directories within the path are not affected by this setting.
+                            This might be in conflict with other options that affect the file
+                            mode, like fsGroup, and the result can be other mode bits set.
+                          format: int32
+                          type: integer
+                        items:
+                          description: |-
+                            items if unspecified, each key-value pair in the Data field of the referenced
+                            ConfigMap will be projected into the volume as a file whose name is the
+                            key and content is the value. If specified, the listed keys will be
+                            projected into the specified paths, and unlisted keys will not be
+                            present. If a key is specified which is not present in the ConfigMap,
+                            the volume setup will error unless it is marked optional. Paths must be
+                            relative and may not contain the '..' path or start with '..'.
+                          items:
+                            description: Maps a string key to a path within a volume.
+                            properties:
+                              key:
+                                description: key is the key to project.
+                                type: string
+                              mode:
+                                description: |-
+                                  mode is Optional: mode bits used to set permissions on this file.
+                                  Must be an octal value between 0000 and 0777 or a decimal value between 0 and 511.
+                                  YAML accepts both octal and decimal values, JSON requires decimal values for mode bits.
+                                  If not specified, the volume defaultMode will be used.
+                                  This might be in conflict with other options that affect the file
+                                  mode, like fsGroup, and the result can be other mode bits set.
+                                format: int32
+                                type: integer
+                              path:
+                                description: |-
+                                  path is the relative path of the file to map the key to.
+                                  May not be an absolute path.
+                                  May not contain the path element '..'.
+                                  May not start with the string '..'.
+                                type: string
+                            required:
+                            - key
+                            - path
+                            type: object
+                          type: array
+                          x-kubernetes-list-type: atomic
+                        name:
+                          default: ""
+                          description: |-
+                            Name of the referent.
+                            This field is effectively required, but due to backwards compatibility is
+                            allowed to be empty. Instances of this type with an empty value here are
+                            almost certainly wrong.
+                            More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                          type: string
+                        optional:
+                          description: optional specify whether the ConfigMap or its
+                            keys must be defined
+                          type: boolean
+                      type: object
+                      x-kubernetes-map-type: atomic
+                    csi:
+                      description: csi (Container Storage Interface) represents ephemeral
+                        storage that is handled by certain external CSI drivers.
+                      properties:
+                        driver:
+                          description: |-
+                            driver is the name of the CSI driver that handles this volume.
+                            Consult with your admin for the correct name as registered in the cluster.
+                          type: string
+                        fsType:
+                          description: |-
+                            fsType to mount. Ex. "ext4", "xfs", "ntfs".
+                            If not provided, the empty value is passed to the associated CSI driver
+                            which will determine the default filesystem to apply.
+                          type: string
+                        nodePublishSecretRef:
+                          description: |-
+                            nodePublishSecretRef is a reference to the secret object containing
+                            sensitive information to pass to the CSI driver to complete the CSI
+                            NodePublishVolume and NodeUnpublishVolume calls.
+                            This field is optional, and  may be empty if no secret is required. If the
+                            secret object contains more than one secret, all secret references are passed.
+                          properties:
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        readOnly:
+                          description: |-
+                            readOnly specifies a read-only configuration for the volume.
+                            Defaults to false (read/write).
+                          type: boolean
+                        volumeAttributes:
+                          additionalProperties:
+                            type: string
+                          description: |-
+                            volumeAttributes stores driver-specific properties that are passed to the CSI
+                            driver. Consult your driver's documentation for supported values.
+                          type: object
+                      required:
+                      - driver
+                      type: object
+                    downwardAPI:
+                      description: downwardAPI represents downward API about the pod
+                        that should populate this volume
+                      properties:
+                        defaultMode:
+                          description: |-
+                            Optional: mode bits to use on created files by default. Must be a
+                            Optional: mode bits used to set permissions on created files by default.
+                            Must be an octal value between 0000 and 0777 or a decimal value between 0 and 511.
+                            YAML accepts both octal and decimal values, JSON requires decimal values for mode bits.
+                            Defaults to 0644.
+                            Directories within the path are not affected by this setting.
+                            This might be in conflict with other options that affect the file
+                            mode, like fsGroup, and the result can be other mode bits set.
+                          format: int32
+                          type: integer
+                        items:
+                          description: Items is a list of downward API volume file
+                          items:
+                            description: DownwardAPIVolumeFile represents information
+                              to create the file containing the pod field
+                            properties:
+                              fieldRef:
+                                description: 'Required: Selects a field of the pod:
+                                  only annotations, labels, name, namespace and uid
+                                  are supported.'
+                                properties:
+                                  apiVersion:
+                                    description: Version of the schema the FieldPath
+                                      is written in terms of, defaults to "v1".
+                                    type: string
+                                  fieldPath:
+                                    description: Path of the field to select in the
+                                      specified API version.
+                                    type: string
+                                required:
+                                - fieldPath
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              mode:
+                                description: |-
+                                  Optional: mode bits used to set permissions on this file, must be an octal value
+                                  between 0000 and 0777 or a decimal value between 0 and 511.
+                                  YAML accepts both octal and decimal values, JSON requires decimal values for mode bits.
+                                  If not specified, the volume defaultMode will be used.
+                                  This might be in conflict with other options that affect the file
+                                  mode, like fsGroup, and the result can be other mode bits set.
+                                format: int32
+                                type: integer
+                              path:
+                                description: 'Required: Path is  the relative path
+                                  name of the file to be created. Must not be absolute
+                                  or contain the ''..'' path. Must be utf-8 encoded.
+                                  The first item of the relative path must not start
+                                  with ''..'''
+                                type: string
+                              resourceFieldRef:
+                                description: |-
+                                  Selects a resource of the container: only resources limits and requests
+                                  (limits.cpu, limits.memory, requests.cpu and requests.memory) are currently supported.
+                                properties:
+                                  containerName:
+                                    description: 'Container name: required for volumes,
+                                      optional for env vars'
+                                    type: string
+                                  divisor:
+                                    anyOf:
+                                    - type: integer
+                                    - type: string
+                                    description: Specifies the output format of the
+                                      exposed resources, defaults to "1"
+                                    pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                    x-kubernetes-int-or-string: true
+                                  resource:
+                                    description: 'Required: resource to select'
+                                    type: string
+                                required:
+                                - resource
+                                type: object
+                                x-kubernetes-map-type: atomic
+                            required:
+                            - path
+                            type: object
+                          type: array
+                          x-kubernetes-list-type: atomic
+                      type: object
+                    emptyDir:
+                      description: |-
+                        emptyDir represents a temporary directory that shares a pod's lifetime.
+                        More info: https://kubernetes.io/docs/concepts/storage/volumes#emptydir
+                      properties:
+                        medium:
+                          description: |-
+                            medium represents what type of storage medium should back this directory.
+                            The default is "" which means to use the node's default medium.
+                            Must be an empty string (default) or Memory.
+                            More info: https://kubernetes.io/docs/concepts/storage/volumes#emptydir
+                          type: string
+                        sizeLimit:
+                          anyOf:
+                          - type: integer
+                          - type: string
+                          description: |-
+                            sizeLimit is the total amount of local storage required for this EmptyDir volume.
+                            The size limit is also applicable for memory medium.
+                            The maximum usage on memory medium EmptyDir would be the minimum value between
+                            the SizeLimit specified here and the sum of memory limits of all containers in a pod.
+                            The default is nil which means that the limit is undefined.
+                            More info: https://kubernetes.io/docs/concepts/storage/volumes#emptydir
+                          pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                          x-kubernetes-int-or-string: true
+                      type: object
+                    ephemeral:
+                      description: |-
+                        ephemeral represents a volume that is handled by a cluster storage driver.
+                        The volume's lifecycle is tied to the pod that defines it - it will be created before the pod starts,
+                        and deleted when the pod is removed.
+
+                        Use this if:
+                        a) the volume is only needed while the pod runs,
+                        b) features of normal volumes like restoring from snapshot or capacity
+                           tracking are needed,
+                        c) the storage driver is specified through a storage class, and
+                        d) the storage driver supports dynamic volume provisioning through
+                           a PersistentVolumeClaim (see EphemeralVolumeSource for more
+                           information on the connection between this volume type
+                           and PersistentVolumeClaim).
+
+                        Use PersistentVolumeClaim or one of the vendor-specific
+                        APIs for volumes that persist for longer than the lifecycle
+                        of an individual pod.
+
+                        Use CSI for light-weight local ephemeral volumes if the CSI driver is meant to
+                        be used that way - see the documentation of the driver for
+                        more information.
+
+                        A pod can use both types of ephemeral volumes and
+                        persistent volumes at the same time.
+                      properties:
+                        volumeClaimTemplate:
+                          description: |-
+                            Will be used to create a stand-alone PVC to provision the volume.
+                            The pod in which this EphemeralVolumeSource is embedded will be the
+                            owner of the PVC, i.e. the PVC will be deleted together with the
+                            pod.  The name of the PVC will be `<pod name>-<volume name>` where
+                            `<volume name>` is the name from the `PodSpec.Volumes` array
+                            entry. Pod validation will reject the pod if the concatenated name
+                            is not valid for a PVC (for example, too long).
+
+                            An existing PVC with that name that is not owned by the pod
+                            will *not* be used for the pod to avoid using an unrelated
+                            volume by mistake. Starting the pod is then blocked until
+                            the unrelated PVC is removed. If such a pre-created PVC is
+                            meant to be used by the pod, the PVC has to updated with an
+                            owner reference to the pod once the pod exists. Normally
+                            this should not be necessary, but it may be useful when
+                            manually reconstructing a broken cluster.
+
+                            This field is read-only and no changes will be made by Kubernetes
+                            to the PVC after it has been created.
+
+                            Required, must not be nil.
+                          properties:
+                            metadata:
+                              description: |-
+                                May contain labels and annotations that will be copied into the PVC
+                                when creating it. No other fields are allowed and will be rejected during
+                                validation.
+                              type: object
+                            spec:
+                              description: |-
+                                The specification for the PersistentVolumeClaim. The entire content is
+                                copied unchanged into the PVC that gets created from this
+                                template. The same fields as in a PersistentVolumeClaim
+                                are also valid here.
+                              properties:
+                                accessModes:
+                                  description: |-
+                                    accessModes contains the desired access modes the volume should have.
+                                    More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#access-modes-1
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                dataSource:
+                                  description: |-
+                                    dataSource field can be used to specify either:
+                                    * An existing VolumeSnapshot object (snapshot.storage.k8s.io/VolumeSnapshot)
+                                    * An existing PVC (PersistentVolumeClaim)
+                                    If the provisioner or an external controller can support the specified data source,
+                                    it will create a new volume based on the contents of the specified data source.
+                                    When the AnyVolumeDataSource feature gate is enabled, dataSource contents will be copied to dataSourceRef,
+                                    and dataSourceRef contents will be copied to dataSource when dataSourceRef.namespace is not specified.
+                                    If the namespace is specified, then dataSourceRef will not be copied to dataSource.
+                                  properties:
+                                    apiGroup:
+                                      description: |-
+                                        APIGroup is the group for the resource being referenced.
+                                        If APIGroup is not specified, the specified Kind must be in the core API group.
+                                        For any other third-party types, APIGroup is required.
+                                      type: string
+                                    kind:
+                                      description: Kind is the type of resource being
+                                        referenced
+                                      type: string
+                                    name:
+                                      description: Name is the name of resource being
+                                        referenced
+                                      type: string
+                                  required:
+                                  - kind
+                                  - name
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                dataSourceRef:
+                                  description: |-
+                                    dataSourceRef specifies the object from which to populate the volume with data, if a non-empty
+                                    volume is desired. This may be any object from a non-empty API group (non
+                                    core object) or a PersistentVolumeClaim object.
+                                    When this field is specified, volume binding will only succeed if the type of
+                                    the specified object matches some installed volume populator or dynamic
+                                    provisioner.
+                                    This field will replace the functionality of the dataSource field and as such
+                                    if both fields are non-empty, they must have the same value. For backwards
+                                    compatibility, when namespace isn't specified in dataSourceRef,
+                                    both fields (dataSource and dataSourceRef) will be set to the same
+                                    value automatically if one of them is empty and the other is non-empty.
+                                    When namespace is specified in dataSourceRef,
+                                    dataSource isn't set to the same value and must be empty.
+                                    There are three important differences between dataSource and dataSourceRef:
+                                    * While dataSource only allows two specific types of objects, dataSourceRef
+                                      allows any non-core object, as well as PersistentVolumeClaim objects.
+                                    * While dataSource ignores disallowed values (dropping them), dataSourceRef
+                                      preserves all values, and generates an error if a disallowed value is
+                                      specified.
+                                    * While dataSource only allows local objects, dataSourceRef allows objects
+                                      in any namespaces.
+                                    (Beta) Using this field requires the AnyVolumeDataSource feature gate to be enabled.
+                                    (Alpha) Using the namespace field of dataSourceRef requires the CrossNamespaceVolumeDataSource feature gate to be enabled.
+                                  properties:
+                                    apiGroup:
+                                      description: |-
+                                        APIGroup is the group for the resource being referenced.
+                                        If APIGroup is not specified, the specified Kind must be in the core API group.
+                                        For any other third-party types, APIGroup is required.
+                                      type: string
+                                    kind:
+                                      description: Kind is the type of resource being
+                                        referenced
+                                      type: string
+                                    name:
+                                      description: Name is the name of resource being
+                                        referenced
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        Namespace is the namespace of resource being referenced
+                                        Note that when a namespace is specified, a gateway.networking.k8s.io/ReferenceGrant object is required in the referent namespace to allow that namespace's owner to accept the reference. See the ReferenceGrant documentation for details.
+                                        (Alpha) This field requires the CrossNamespaceVolumeDataSource feature gate to be enabled.
+                                      type: string
+                                  required:
+                                  - kind
+                                  - name
+                                  type: object
+                                resources:
+                                  description: |-
+                                    resources represents the minimum resources the volume should have.
+                                    If RecoverVolumeExpansionFailure feature is enabled users are allowed to specify resource requirements
+                                    that are lower than previous value but must still be higher than capacity recorded in the
+                                    status field of the claim.
+                                    More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources
+                                  properties:
+                                    limits:
+                                      additionalProperties:
+                                        anyOf:
+                                        - type: integer
+                                        - type: string
+                                        pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                        x-kubernetes-int-or-string: true
+                                      description: |-
+                                        Limits describes the maximum amount of compute resources allowed.
+                                        More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+                                      type: object
+                                    requests:
+                                      additionalProperties:
+                                        anyOf:
+                                        - type: integer
+                                        - type: string
+                                        pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                        x-kubernetes-int-or-string: true
+                                      description: |-
+                                        Requests describes the minimum amount of compute resources required.
+                                        If Requests is omitted for a container, it defaults to Limits if that is explicitly specified,
+                                        otherwise to an implementation-defined value. Requests cannot exceed Limits.
+                                        More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+                                      type: object
+                                  type: object
+                                selector:
+                                  description: selector is a label query over volumes
+                                    to consider for binding.
+                                  properties:
+                                    matchExpressions:
+                                      description: matchExpressions is a list of label
+                                        selector requirements. The requirements are
+                                        ANDed.
+                                      items:
+                                        description: |-
+                                          A label selector requirement is a selector that contains values, a key, and an operator that
+                                          relates the key and values.
+                                        properties:
+                                          key:
+                                            description: key is the label key that
+                                              the selector applies to.
+                                            type: string
+                                          operator:
+                                            description: |-
+                                              operator represents a key's relationship to a set of values.
+                                              Valid operators are In, NotIn, Exists and DoesNotExist.
+                                            type: string
+                                          values:
+                                            description: |-
+                                              values is an array of string values. If the operator is In or NotIn,
+                                              the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                              the values array must be empty. This array is replaced during a strategic
+                                              merge patch.
+                                            items:
+                                              type: string
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                        required:
+                                        - key
+                                        - operator
+                                        type: object
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    matchLabels:
+                                      additionalProperties:
+                                        type: string
+                                      description: |-
+                                        matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                        map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                        operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                      type: object
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                storageClassName:
+                                  description: |-
+                                    storageClassName is the name of the StorageClass required by the claim.
+                                    More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#class-1
+                                  type: string
+                                volumeAttributesClassName:
+                                  description: |-
+                                    volumeAttributesClassName may be used to set the VolumeAttributesClass used by this claim.
+                                    If specified, the CSI driver will create or update the volume with the attributes defined
+                                    in the corresponding VolumeAttributesClass. This has a different purpose than storageClassName,
+                                    it can be changed after the claim is created. An empty string or nil value indicates that no
+                                    VolumeAttributesClass will be applied to the claim. If the claim enters an Infeasible error state,
+                                    this field can be reset to its previous value (including nil) to cancel the modification.
+                                    If the resource referred to by volumeAttributesClass does not exist, this PersistentVolumeClaim will be
+                                    set to a Pending state, as reflected by the modifyVolumeStatus field, until such as a resource
+                                    exists.
+                                    More info: https://kubernetes.io/docs/concepts/storage/volume-attributes-classes/
+                                  type: string
+                                volumeMode:
+                                  description: |-
+                                    volumeMode defines what type of volume is required by the claim.
+                                    Value of Filesystem is implied when not included in claim spec.
+                                  type: string
+                                volumeName:
+                                  description: volumeName is the binding reference
+                                    to the PersistentVolume backing this claim.
+                                  type: string
+                              type: object
+                          required:
+                          - spec
+                          type: object
+                      type: object
+                    fc:
+                      description: fc represents a Fibre Channel resource that is
+                        attached to a kubelet's host machine and then exposed to the
+                        pod.
+                      properties:
+                        fsType:
+                          description: |-
+                            fsType is the filesystem type to mount.
+                            Must be a filesystem type supported by the host operating system.
+                            Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
+                          type: string
+                        lun:
+                          description: 'lun is Optional: FC target lun number'
+                          format: int32
+                          type: integer
+                        readOnly:
+                          description: |-
+                            readOnly is Optional: Defaults to false (read/write). ReadOnly here will force
+                            the ReadOnly setting in VolumeMounts.
+                          type: boolean
+                        targetWWNs:
+                          description: 'targetWWNs is Optional: FC target worldwide
+                            names (WWNs)'
+                          items:
+                            type: string
+                          type: array
+                          x-kubernetes-list-type: atomic
+                        wwids:
+                          description: |-
+                            wwids Optional: FC volume world wide identifiers (wwids)
+                            Either wwids or combination of targetWWNs and lun must be set, but not both simultaneously.
+                          items:
+                            type: string
+                          type: array
+                          x-kubernetes-list-type: atomic
+                      type: object
+                    flexVolume:
+                      description: |-
+                        flexVolume represents a generic volume resource that is
+                        provisioned/attached using an exec based plugin.
+                        Deprecated: FlexVolume is deprecated. Consider using a CSIDriver instead.
+                      properties:
+                        driver:
+                          description: driver is the name of the driver to use for
+                            this volume.
+                          type: string
+                        fsType:
+                          description: |-
+                            fsType is the filesystem type to mount.
+                            Must be a filesystem type supported by the host operating system.
+                            Ex. "ext4", "xfs", "ntfs". The default filesystem depends on FlexVolume script.
+                          type: string
+                        options:
+                          additionalProperties:
+                            type: string
+                          description: 'options is Optional: this field holds extra
+                            command options if any.'
+                          type: object
+                        readOnly:
+                          description: |-
+                            readOnly is Optional: defaults to false (read/write). ReadOnly here will force
+                            the ReadOnly setting in VolumeMounts.
+                          type: boolean
+                        secretRef:
+                          description: |-
+                            secretRef is Optional: secretRef is reference to the secret object containing
+                            sensitive information to pass to the plugin scripts. This may be
+                            empty if no secret object is specified. If the secret object
+                            contains more than one secret, all secrets are passed to the plugin
+                            scripts.
+                          properties:
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                          type: object
+                          x-kubernetes-map-type: atomic
+                      required:
+                      - driver
+                      type: object
+                    flocker:
+                      description: |-
+                        flocker represents a Flocker volume attached to a kubelet's host machine. This depends on the Flocker control service being running.
+                        Deprecated: Flocker is deprecated and the in-tree flocker type is no longer supported.
+                      properties:
+                        datasetName:
+                          description: |-
+                            datasetName is Name of the dataset stored as metadata -> name on the dataset for Flocker
+                            should be considered as deprecated
+                          type: string
+                        datasetUUID:
+                          description: datasetUUID is the UUID of the dataset. This
+                            is unique identifier of a Flocker dataset
+                          type: string
+                      type: object
+                    gcePersistentDisk:
+                      description: |-
+                        gcePersistentDisk represents a GCE Disk resource that is attached to a
+                        kubelet's host machine and then exposed to the pod.
+                        Deprecated: GCEPersistentDisk is deprecated. All operations for the in-tree
+                        gcePersistentDisk type are redirected to the pd.csi.storage.gke.io CSI driver.
+                        More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
+                      properties:
+                        fsType:
+                          description: |-
+                            fsType is filesystem type of the volume that you want to mount.
+                            Tip: Ensure that the filesystem type is supported by the host operating system.
+                            Examples: "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
+                            More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
+                          type: string
+                        partition:
+                          description: |-
+                            partition is the partition in the volume that you want to mount.
+                            If omitted, the default is to mount by volume name.
+                            Examples: For volume /dev/sda1, you specify the partition as "1".
+                            Similarly, the volume partition for /dev/sda is "0" (or you can leave the property empty).
+                            More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
+                          format: int32
+                          type: integer
+                        pdName:
+                          description: |-
+                            pdName is unique name of the PD resource in GCE. Used to identify the disk in GCE.
+                            More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
+                          type: string
+                        readOnly:
+                          description: |-
+                            readOnly here will force the ReadOnly setting in VolumeMounts.
+                            Defaults to false.
+                            More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
+                          type: boolean
+                      required:
+                      - pdName
+                      type: object
+                    gitRepo:
+                      description: |-
+                        gitRepo represents a git repository at a particular revision.
+                        Deprecated: GitRepo is deprecated. To provision a container with a git repo, mount an
+                        EmptyDir into an InitContainer that clones the repo using git, then mount the EmptyDir
+                        into the Pod's container.
+                      properties:
+                        directory:
+                          description: |-
+                            directory is the target directory name.
+                            Must not contain or start with '..'.  If '.' is supplied, the volume directory will be the
+                            git repository.  Otherwise, if specified, the volume will contain the git repository in
+                            the subdirectory with the given name.
+                          type: string
+                        repository:
+                          description: repository is the URL
+                          type: string
+                        revision:
+                          description: revision is the commit hash for the specified
+                            revision.
+                          type: string
+                      required:
+                      - repository
+                      type: object
+                    glusterfs:
+                      description: |-
+                        glusterfs represents a Glusterfs mount on the host that shares a pod's lifetime.
+                        Deprecated: Glusterfs is deprecated and the in-tree glusterfs type is no longer supported.
+                      properties:
+                        endpoints:
+                          description: endpoints is the endpoint name that details
+                            Glusterfs topology.
+                          type: string
+                        path:
+                          description: |-
+                            path is the Glusterfs volume path.
+                            More info: https://examples.k8s.io/volumes/glusterfs/README.md#create-a-pod
+                          type: string
+                        readOnly:
+                          description: |-
+                            readOnly here will force the Glusterfs volume to be mounted with read-only permissions.
+                            Defaults to false.
+                            More info: https://examples.k8s.io/volumes/glusterfs/README.md#create-a-pod
+                          type: boolean
+                      required:
+                      - endpoints
+                      - path
+                      type: object
+                    hostPath:
+                      description: |-
+                        hostPath represents a pre-existing file or directory on the host
+                        machine that is directly exposed to the container. This is generally
+                        used for system agents or other privileged things that are allowed
+                        to see the host machine. Most containers will NOT need this.
+                        More info: https://kubernetes.io/docs/concepts/storage/volumes#hostpath
+                      properties:
+                        path:
+                          description: |-
+                            path of the directory on the host.
+                            If the path is a symlink, it will follow the link to the real path.
+                            More info: https://kubernetes.io/docs/concepts/storage/volumes#hostpath
+                          type: string
+                        type:
+                          description: |-
+                            type for HostPath Volume
+                            Defaults to ""
+                            More info: https://kubernetes.io/docs/concepts/storage/volumes#hostpath
+                          type: string
+                      required:
+                      - path
+                      type: object
+                    image:
+                      description: |-
+                        image represents an OCI object (a container image or artifact) pulled and mounted on the kubelet's host machine.
+                        The volume is resolved at pod startup depending on which PullPolicy value is provided:
+
+                        - Always: the kubelet always attempts to pull the reference. Container creation will fail If the pull fails.
+                        - Never: the kubelet never pulls the reference and only uses a local image or artifact. Container creation will fail if the reference isn't present.
+                        - IfNotPresent: the kubelet pulls if the reference isn't already present on disk. Container creation will fail if the reference isn't present and the pull fails.
+
+                        The volume gets re-resolved if the pod gets deleted and recreated, which means that new remote content will become available on pod recreation.
+                        A failure to resolve or pull the image during pod startup will block containers from starting and may add significant latency. Failures will be retried using normal volume backoff and will be reported on the pod reason and message.
+                        The types of objects that may be mounted by this volume are defined by the container runtime implementation on a host machine and at minimum must include all valid types supported by the container image field.
+                        The OCI object gets mounted in a single directory (spec.containers[*].volumeMounts.mountPath) by merging the manifest layers in the same way as for container images.
+                        The volume will be mounted read-only (ro) and non-executable files (noexec).
+                        Sub path mounts for containers are not supported (spec.containers[*].volumeMounts.subpath) before 1.33.
+                        The field spec.securityContext.fsGroupChangePolicy has no effect on this volume type.
+                      properties:
+                        pullPolicy:
+                          description: |-
+                            Policy for pulling OCI objects. Possible values are:
+                            Always: the kubelet always attempts to pull the reference. Container creation will fail If the pull fails.
+                            Never: the kubelet never pulls the reference and only uses a local image or artifact. Container creation will fail if the reference isn't present.
+                            IfNotPresent: the kubelet pulls if the reference isn't already present on disk. Container creation will fail if the reference isn't present and the pull fails.
+                            Defaults to Always if :latest tag is specified, or IfNotPresent otherwise.
+                          type: string
+                        reference:
+                          description: |-
+                            Required: Image or artifact reference to be used.
+                            Behaves in the same way as pod.spec.containers[*].image.
+                            Pull secrets will be assembled in the same way as for the container image by looking up node credentials, SA image pull secrets, and pod spec image pull secrets.
+                            More info: https://kubernetes.io/docs/concepts/containers/images
+                            This field is optional to allow higher level config management to default or override
+                            container images in workload controllers like Deployments and StatefulSets.
+                          type: string
+                      type: object
+                    iscsi:
+                      description: |-
+                        iscsi represents an ISCSI Disk resource that is attached to a
+                        kubelet's host machine and then exposed to the pod.
+                        More info: https://kubernetes.io/docs/concepts/storage/volumes/#iscsi
+                      properties:
+                        chapAuthDiscovery:
+                          description: chapAuthDiscovery defines whether support iSCSI
+                            Discovery CHAP authentication
+                          type: boolean
+                        chapAuthSession:
+                          description: chapAuthSession defines whether support iSCSI
+                            Session CHAP authentication
+                          type: boolean
+                        fsType:
+                          description: |-
+                            fsType is the filesystem type of the volume that you want to mount.
+                            Tip: Ensure that the filesystem type is supported by the host operating system.
+                            Examples: "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
+                            More info: https://kubernetes.io/docs/concepts/storage/volumes#iscsi
+                          type: string
+                        initiatorName:
+                          description: |-
+                            initiatorName is the custom iSCSI Initiator Name.
+                            If initiatorName is specified with iscsiInterface simultaneously, new iSCSI interface
+                            <target portal>:<volume name> will be created for the connection.
+                          type: string
+                        iqn:
+                          description: iqn is the target iSCSI Qualified Name.
+                          type: string
+                        iscsiInterface:
+                          default: default
+                          description: |-
+                            iscsiInterface is the interface Name that uses an iSCSI transport.
+                            Defaults to 'default' (tcp).
+                          type: string
+                        lun:
+                          description: lun represents iSCSI Target Lun number.
+                          format: int32
+                          type: integer
+                        portals:
+                          description: |-
+                            portals is the iSCSI Target Portal List. The portal is either an IP or ip_addr:port if the port
+                            is other than default (typically TCP ports 860 and 3260).
+                          items:
+                            type: string
+                          type: array
+                          x-kubernetes-list-type: atomic
+                        readOnly:
+                          description: |-
+                            readOnly here will force the ReadOnly setting in VolumeMounts.
+                            Defaults to false.
+                          type: boolean
+                        secretRef:
+                          description: secretRef is the CHAP Secret for iSCSI target
+                            and initiator authentication
+                          properties:
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        targetPortal:
+                          description: |-
+                            targetPortal is iSCSI Target Portal. The Portal is either an IP or ip_addr:port if the port
+                            is other than default (typically TCP ports 860 and 3260).
+                          type: string
+                      required:
+                      - iqn
+                      - lun
+                      - targetPortal
+                      type: object
+                    name:
+                      description: |-
+                        name of the volume.
+                        Must be a DNS_LABEL and unique within the pod.
+                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                      type: string
+                    nfs:
+                      description: |-
+                        nfs represents an NFS mount on the host that shares a pod's lifetime
+                        More info: https://kubernetes.io/docs/concepts/storage/volumes#nfs
+                      properties:
+                        path:
+                          description: |-
+                            path that is exported by the NFS server.
+                            More info: https://kubernetes.io/docs/concepts/storage/volumes#nfs
+                          type: string
+                        readOnly:
+                          description: |-
+                            readOnly here will force the NFS export to be mounted with read-only permissions.
+                            Defaults to false.
+                            More info: https://kubernetes.io/docs/concepts/storage/volumes#nfs
+                          type: boolean
+                        server:
+                          description: |-
+                            server is the hostname or IP address of the NFS server.
+                            More info: https://kubernetes.io/docs/concepts/storage/volumes#nfs
+                          type: string
+                      required:
+                      - path
+                      - server
+                      type: object
+                    persistentVolumeClaim:
+                      description: |-
+                        persistentVolumeClaimVolumeSource represents a reference to a
+                        PersistentVolumeClaim in the same namespace.
+                        More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#persistentvolumeclaims
+                      properties:
+                        claimName:
+                          description: |-
+                            claimName is the name of a PersistentVolumeClaim in the same namespace as the pod using this volume.
+                            More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#persistentvolumeclaims
+                          type: string
+                        readOnly:
+                          description: |-
+                            readOnly Will force the ReadOnly setting in VolumeMounts.
+                            Default false.
+                          type: boolean
+                      required:
+                      - claimName
+                      type: object
+                    photonPersistentDisk:
+                      description: |-
+                        photonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets host machine.
+                        Deprecated: PhotonPersistentDisk is deprecated and the in-tree photonPersistentDisk type is no longer supported.
+                      properties:
+                        fsType:
+                          description: |-
+                            fsType is the filesystem type to mount.
+                            Must be a filesystem type supported by the host operating system.
+                            Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
+                          type: string
+                        pdID:
+                          description: pdID is the ID that identifies Photon Controller
+                            persistent disk
+                          type: string
+                      required:
+                      - pdID
+                      type: object
+                    portworxVolume:
+                      description: |-
+                        portworxVolume represents a portworx volume attached and mounted on kubelets host machine.
+                        Deprecated: PortworxVolume is deprecated. All operations for the in-tree portworxVolume type
+                        are redirected to the pxd.portworx.com CSI driver when the CSIMigrationPortworx feature-gate
+                        is on.
+                      properties:
+                        fsType:
+                          description: |-
+                            fSType represents the filesystem type to mount
+                            Must be a filesystem type supported by the host operating system.
+                            Ex. "ext4", "xfs". Implicitly inferred to be "ext4" if unspecified.
+                          type: string
+                        readOnly:
+                          description: |-
+                            readOnly defaults to false (read/write). ReadOnly here will force
+                            the ReadOnly setting in VolumeMounts.
+                          type: boolean
+                        volumeID:
+                          description: volumeID uniquely identifies a Portworx volume
+                          type: string
+                      required:
+                      - volumeID
+                      type: object
+                    projected:
+                      description: projected items for all in one resources secrets,
+                        configmaps, and downward API
+                      properties:
+                        defaultMode:
+                          description: |-
+                            defaultMode are the mode bits used to set permissions on created files by default.
+                            Must be an octal value between 0000 and 0777 or a decimal value between 0 and 511.
+                            YAML accepts both octal and decimal values, JSON requires decimal values for mode bits.
+                            Directories within the path are not affected by this setting.
+                            This might be in conflict with other options that affect the file
+                            mode, like fsGroup, and the result can be other mode bits set.
+                          format: int32
+                          type: integer
+                        sources:
+                          description: |-
+                            sources is the list of volume projections. Each entry in this list
+                            handles one source.
+                          items:
+                            description: |-
+                              Projection that may be projected along with other supported volume types.
+                              Exactly one of these fields must be set.
+                            properties:
+                              clusterTrustBundle:
+                                description: |-
+                                  ClusterTrustBundle allows a pod to access the `.spec.trustBundle` field
+                                  of ClusterTrustBundle objects in an auto-updating file.
+
+                                  Alpha, gated by the ClusterTrustBundleProjection feature gate.
+
+                                  ClusterTrustBundle objects can either be selected by name, or by the
+                                  combination of signer name and a label selector.
+
+                                  Kubelet performs aggressive normalization of the PEM contents written
+                                  into the pod filesystem.  Esoteric PEM features such as inter-block
+                                  comments and block headers are stripped.  Certificates are deduplicated.
+                                  The ordering of certificates within the file is arbitrary, and Kubelet
+                                  may change the order over time.
+                                properties:
+                                  labelSelector:
+                                    description: |-
+                                      Select all ClusterTrustBundles that match this label selector.  Only has
+                                      effect if signerName is set.  Mutually-exclusive with name.  If unset,
+                                      interpreted as "match nothing".  If set but empty, interpreted as "match
+                                      everything".
+                                    properties:
+                                      matchExpressions:
+                                        description: matchExpressions is a list of
+                                          label selector requirements. The requirements
+                                          are ANDed.
+                                        items:
+                                          description: |-
+                                            A label selector requirement is a selector that contains values, a key, and an operator that
+                                            relates the key and values.
+                                          properties:
+                                            key:
+                                              description: key is the label key that
+                                                the selector applies to.
+                                              type: string
+                                            operator:
+                                              description: |-
+                                                operator represents a key's relationship to a set of values.
+                                                Valid operators are In, NotIn, Exists and DoesNotExist.
+                                              type: string
+                                            values:
+                                              description: |-
+                                                values is an array of string values. If the operator is In or NotIn,
+                                                the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                                the values array must be empty. This array is replaced during a strategic
+                                                merge patch.
+                                              items:
+                                                type: string
+                                              type: array
+                                              x-kubernetes-list-type: atomic
+                                          required:
+                                          - key
+                                          - operator
+                                          type: object
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                      matchLabels:
+                                        additionalProperties:
+                                          type: string
+                                        description: |-
+                                          matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                          map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                          operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                        type: object
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  name:
+                                    description: |-
+                                      Select a single ClusterTrustBundle by object name.  Mutually-exclusive
+                                      with signerName and labelSelector.
+                                    type: string
+                                  optional:
+                                    description: |-
+                                      If true, don't block pod startup if the referenced ClusterTrustBundle(s)
+                                      aren't available.  If using name, then the named ClusterTrustBundle is
+                                      allowed not to exist.  If using signerName, then the combination of
+                                      signerName and labelSelector is allowed to match zero
+                                      ClusterTrustBundles.
+                                    type: boolean
+                                  path:
+                                    description: Relative path from the volume root
+                                      to write the bundle.
+                                    type: string
+                                  signerName:
+                                    description: |-
+                                      Select all ClusterTrustBundles that match this signer name.
+                                      Mutually-exclusive with name.  The contents of all selected
+                                      ClusterTrustBundles will be unified and deduplicated.
+                                    type: string
+                                required:
+                                - path
+                                type: object
+                              configMap:
+                                description: configMap information about the configMap
+                                  data to project
+                                properties:
+                                  items:
+                                    description: |-
+                                      items if unspecified, each key-value pair in the Data field of the referenced
+                                      ConfigMap will be projected into the volume as a file whose name is the
+                                      key and content is the value. If specified, the listed keys will be
+                                      projected into the specified paths, and unlisted keys will not be
+                                      present. If a key is specified which is not present in the ConfigMap,
+                                      the volume setup will error unless it is marked optional. Paths must be
+                                      relative and may not contain the '..' path or start with '..'.
+                                    items:
+                                      description: Maps a string key to a path within
+                                        a volume.
+                                      properties:
+                                        key:
+                                          description: key is the key to project.
+                                          type: string
+                                        mode:
+                                          description: |-
+                                            mode is Optional: mode bits used to set permissions on this file.
+                                            Must be an octal value between 0000 and 0777 or a decimal value between 0 and 511.
+                                            YAML accepts both octal and decimal values, JSON requires decimal values for mode bits.
+                                            If not specified, the volume defaultMode will be used.
+                                            This might be in conflict with other options that affect the file
+                                            mode, like fsGroup, and the result can be other mode bits set.
+                                          format: int32
+                                          type: integer
+                                        path:
+                                          description: |-
+                                            path is the relative path of the file to map the key to.
+                                            May not be an absolute path.
+                                            May not contain the path element '..'.
+                                            May not start with the string '..'.
+                                          type: string
+                                      required:
+                                      - key
+                                      - path
+                                      type: object
+                                    type: array
+                                    x-kubernetes-list-type: atomic
+                                  name:
+                                    default: ""
+                                    description: |-
+                                      Name of the referent.
+                                      This field is effectively required, but due to backwards compatibility is
+                                      allowed to be empty. Instances of this type with an empty value here are
+                                      almost certainly wrong.
+                                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                    type: string
+                                  optional:
+                                    description: optional specify whether the ConfigMap
+                                      or its keys must be defined
+                                    type: boolean
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              downwardAPI:
+                                description: downwardAPI information about the downwardAPI
+                                  data to project
+                                properties:
+                                  items:
+                                    description: Items is a list of DownwardAPIVolume
+                                      file
+                                    items:
+                                      description: DownwardAPIVolumeFile represents
+                                        information to create the file containing
+                                        the pod field
+                                      properties:
+                                        fieldRef:
+                                          description: 'Required: Selects a field
+                                            of the pod: only annotations, labels,
+                                            name, namespace and uid are supported.'
+                                          properties:
+                                            apiVersion:
+                                              description: Version of the schema the
+                                                FieldPath is written in terms of,
+                                                defaults to "v1".
+                                              type: string
+                                            fieldPath:
+                                              description: Path of the field to select
+                                                in the specified API version.
+                                              type: string
+                                          required:
+                                          - fieldPath
+                                          type: object
+                                          x-kubernetes-map-type: atomic
+                                        mode:
+                                          description: |-
+                                            Optional: mode bits used to set permissions on this file, must be an octal value
+                                            between 0000 and 0777 or a decimal value between 0 and 511.
+                                            YAML accepts both octal and decimal values, JSON requires decimal values for mode bits.
+                                            If not specified, the volume defaultMode will be used.
+                                            This might be in conflict with other options that affect the file
+                                            mode, like fsGroup, and the result can be other mode bits set.
+                                          format: int32
+                                          type: integer
+                                        path:
+                                          description: 'Required: Path is  the relative
+                                            path name of the file to be created. Must
+                                            not be absolute or contain the ''..''
+                                            path. Must be utf-8 encoded. The first
+                                            item of the relative path must not start
+                                            with ''..'''
+                                          type: string
+                                        resourceFieldRef:
+                                          description: |-
+                                            Selects a resource of the container: only resources limits and requests
+                                            (limits.cpu, limits.memory, requests.cpu and requests.memory) are currently supported.
+                                          properties:
+                                            containerName:
+                                              description: 'Container name: required
+                                                for volumes, optional for env vars'
+                                              type: string
+                                            divisor:
+                                              anyOf:
+                                              - type: integer
+                                              - type: string
+                                              description: Specifies the output format
+                                                of the exposed resources, defaults
+                                                to "1"
+                                              pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                              x-kubernetes-int-or-string: true
+                                            resource:
+                                              description: 'Required: resource to
+                                                select'
+                                              type: string
+                                          required:
+                                          - resource
+                                          type: object
+                                          x-kubernetes-map-type: atomic
+                                      required:
+                                      - path
+                                      type: object
+                                    type: array
+                                    x-kubernetes-list-type: atomic
+                                type: object
+                              podCertificate:
+                                description: |-
+                                  Projects an auto-rotating credential bundle (private key and certificate
+                                  chain) that the pod can use either as a TLS client or server.
+
+                                  Kubelet generates a private key and uses it to send a
+                                  PodCertificateRequest to the named signer.  Once the signer approves the
+                                  request and issues a certificate chain, Kubelet writes the key and
+                                  certificate chain to the pod filesystem.  The pod does not start until
+                                  certificates have been issued for each podCertificate projected volume
+                                  source in its spec.
+
+                                  Kubelet will begin trying to rotate the certificate at the time indicated
+                                  by the signer using the PodCertificateRequest.Status.BeginRefreshAt
+                                  timestamp.
+
+                                  Kubelet can write a single file, indicated by the credentialBundlePath
+                                  field, or separate files, indicated by the keyPath and
+                                  certificateChainPath fields.
+
+                                  The credential bundle is a single file in PEM format.  The first PEM
+                                  entry is the private key (in PKCS#8 format), and the remaining PEM
+                                  entries are the certificate chain issued by the signer (typically,
+                                  signers will return their certificate chain in leaf-to-root order).
+
+                                  Prefer using the credential bundle format, since your application code
+                                  can read it atomically.  If you use keyPath and certificateChainPath,
+                                  your application must make two separate file reads. If these coincide
+                                  with a certificate rotation, it is possible that the private key and leaf
+                                  certificate you read may not correspond to each other.  Your application
+                                  will need to check for this condition, and re-read until they are
+                                  consistent.
+
+                                  The named signer controls chooses the format of the certificate it
+                                  issues; consult the signer implementation's documentation to learn how to
+                                  use the certificates it issues.
+                                properties:
+                                  certificateChainPath:
+                                    description: |-
+                                      Write the certificate chain at this path in the projected volume.
+
+                                      Most applications should use credentialBundlePath.  When using keyPath
+                                      and certificateChainPath, your application needs to check that the key
+                                      and leaf certificate are consistent, because it is possible to read the
+                                      files mid-rotation.
+                                    type: string
+                                  credentialBundlePath:
+                                    description: |-
+                                      Write the credential bundle at this path in the projected volume.
+
+                                      The credential bundle is a single file that contains multiple PEM blocks.
+                                      The first PEM block is a PRIVATE KEY block, containing a PKCS#8 private
+                                      key.
+
+                                      The remaining blocks are CERTIFICATE blocks, containing the issued
+                                      certificate chain from the signer (leaf and any intermediates).
+
+                                      Using credentialBundlePath lets your Pod's application code make a single
+                                      atomic read that retrieves a consistent key and certificate chain.  If you
+                                      project them to separate files, your application code will need to
+                                      additionally check that the leaf certificate was issued to the key.
+                                    type: string
+                                  keyPath:
+                                    description: |-
+                                      Write the key at this path in the projected volume.
+
+                                      Most applications should use credentialBundlePath.  When using keyPath
+                                      and certificateChainPath, your application needs to check that the key
+                                      and leaf certificate are consistent, because it is possible to read the
+                                      files mid-rotation.
+                                    type: string
+                                  keyType:
+                                    description: |-
+                                      The type of keypair Kubelet will generate for the pod.
+
+                                      Valid values are "RSA3072", "RSA4096", "ECDSAP256", "ECDSAP384",
+                                      "ECDSAP521", and "ED25519".
+                                    type: string
+                                  maxExpirationSeconds:
+                                    description: |-
+                                      maxExpirationSeconds is the maximum lifetime permitted for the
+                                      certificate.
+
+                                      Kubelet copies this value verbatim into the PodCertificateRequests it
+                                      generates for this projection.
+
+                                      If omitted, kube-apiserver will set it to 86400(24 hours). kube-apiserver
+                                      will reject values shorter than 3600 (1 hour).  The maximum allowable
+                                      value is 7862400 (91 days).
+
+                                      The signer implementation is then free to issue a certificate with any
+                                      lifetime *shorter* than MaxExpirationSeconds, but no shorter than 3600
+                                      seconds (1 hour).  This constraint is enforced by kube-apiserver.
+                                      `kubernetes.io` signers will never issue certificates with a lifetime
+                                      longer than 24 hours.
+                                    format: int32
+                                    type: integer
+                                  signerName:
+                                    description: Kubelet's generated CSRs will be
+                                      addressed to this signer.
+                                    type: string
+                                required:
+                                - keyType
+                                - signerName
+                                type: object
+                              secret:
+                                description: secret information about the secret data
+                                  to project
+                                properties:
+                                  items:
+                                    description: |-
+                                      items if unspecified, each key-value pair in the Data field of the referenced
+                                      Secret will be projected into the volume as a file whose name is the
+                                      key and content is the value. If specified, the listed keys will be
+                                      projected into the specified paths, and unlisted keys will not be
+                                      present. If a key is specified which is not present in the Secret,
+                                      the volume setup will error unless it is marked optional. Paths must be
+                                      relative and may not contain the '..' path or start with '..'.
+                                    items:
+                                      description: Maps a string key to a path within
+                                        a volume.
+                                      properties:
+                                        key:
+                                          description: key is the key to project.
+                                          type: string
+                                        mode:
+                                          description: |-
+                                            mode is Optional: mode bits used to set permissions on this file.
+                                            Must be an octal value between 0000 and 0777 or a decimal value between 0 and 511.
+                                            YAML accepts both octal and decimal values, JSON requires decimal values for mode bits.
+                                            If not specified, the volume defaultMode will be used.
+                                            This might be in conflict with other options that affect the file
+                                            mode, like fsGroup, and the result can be other mode bits set.
+                                          format: int32
+                                          type: integer
+                                        path:
+                                          description: |-
+                                            path is the relative path of the file to map the key to.
+                                            May not be an absolute path.
+                                            May not contain the path element '..'.
+                                            May not start with the string '..'.
+                                          type: string
+                                      required:
+                                      - key
+                                      - path
+                                      type: object
+                                    type: array
+                                    x-kubernetes-list-type: atomic
+                                  name:
+                                    default: ""
+                                    description: |-
+                                      Name of the referent.
+                                      This field is effectively required, but due to backwards compatibility is
+                                      allowed to be empty. Instances of this type with an empty value here are
+                                      almost certainly wrong.
+                                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                    type: string
+                                  optional:
+                                    description: optional field specify whether the
+                                      Secret or its key must be defined
+                                    type: boolean
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              serviceAccountToken:
+                                description: serviceAccountToken is information about
+                                  the serviceAccountToken data to project
+                                properties:
+                                  audience:
+                                    description: |-
+                                      audience is the intended audience of the token. A recipient of a token
+                                      must identify itself with an identifier specified in the audience of the
+                                      token, and otherwise should reject the token. The audience defaults to the
+                                      identifier of the apiserver.
+                                    type: string
+                                  expirationSeconds:
+                                    description: |-
+                                      expirationSeconds is the requested duration of validity of the service
+                                      account token. As the token approaches expiration, the kubelet volume
+                                      plugin will proactively rotate the service account token. The kubelet will
+                                      start trying to rotate the token if the token is older than 80 percent of
+                                      its time to live or if the token is older than 24 hours.Defaults to 1 hour
+                                      and must be at least 10 minutes.
+                                    format: int64
+                                    type: integer
+                                  path:
+                                    description: |-
+                                      path is the path relative to the mount point of the file to project the
+                                      token into.
+                                    type: string
+                                required:
+                                - path
+                                type: object
+                            type: object
+                          type: array
+                          x-kubernetes-list-type: atomic
+                      type: object
+                    quobyte:
+                      description: |-
+                        quobyte represents a Quobyte mount on the host that shares a pod's lifetime.
+                        Deprecated: Quobyte is deprecated and the in-tree quobyte type is no longer supported.
+                      properties:
+                        group:
+                          description: |-
+                            group to map volume access to
+                            Default is no group
+                          type: string
+                        readOnly:
+                          description: |-
+                            readOnly here will force the Quobyte volume to be mounted with read-only permissions.
+                            Defaults to false.
+                          type: boolean
+                        registry:
+                          description: |-
+                            registry represents a single or multiple Quobyte Registry services
+                            specified as a string as host:port pair (multiple entries are separated with commas)
+                            which acts as the central registry for volumes
+                          type: string
+                        tenant:
+                          description: |-
+                            tenant owning the given Quobyte volume in the Backend
+                            Used with dynamically provisioned Quobyte volumes, value is set by the plugin
+                          type: string
+                        user:
+                          description: |-
+                            user to map volume access to
+                            Defaults to serivceaccount user
+                          type: string
+                        volume:
+                          description: volume is a string that references an already
+                            created Quobyte volume by name.
+                          type: string
+                      required:
+                      - registry
+                      - volume
+                      type: object
+                    rbd:
+                      description: |-
+                        rbd represents a Rados Block Device mount on the host that shares a pod's lifetime.
+                        Deprecated: RBD is deprecated and the in-tree rbd type is no longer supported.
+                      properties:
+                        fsType:
+                          description: |-
+                            fsType is the filesystem type of the volume that you want to mount.
+                            Tip: Ensure that the filesystem type is supported by the host operating system.
+                            Examples: "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
+                            More info: https://kubernetes.io/docs/concepts/storage/volumes#rbd
+                          type: string
+                        image:
+                          description: |-
+                            image is the rados image name.
+                            More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it
+                          type: string
+                        keyring:
+                          default: /etc/ceph/keyring
+                          description: |-
+                            keyring is the path to key ring for RBDUser.
+                            Default is /etc/ceph/keyring.
+                            More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it
+                          type: string
+                        monitors:
+                          description: |-
+                            monitors is a collection of Ceph monitors.
+                            More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it
+                          items:
+                            type: string
+                          type: array
+                          x-kubernetes-list-type: atomic
+                        pool:
+                          default: rbd
+                          description: |-
+                            pool is the rados pool name.
+                            Default is rbd.
+                            More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it
+                          type: string
+                        readOnly:
+                          description: |-
+                            readOnly here will force the ReadOnly setting in VolumeMounts.
+                            Defaults to false.
+                            More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it
+                          type: boolean
+                        secretRef:
+                          description: |-
+                            secretRef is name of the authentication secret for RBDUser. If provided
+                            overrides keyring.
+                            Default is nil.
+                            More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it
+                          properties:
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        user:
+                          default: admin
+                          description: |-
+                            user is the rados user name.
+                            Default is admin.
+                            More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it
+                          type: string
+                      required:
+                      - image
+                      - monitors
+                      type: object
+                    scaleIO:
+                      description: |-
+                        scaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.
+                        Deprecated: ScaleIO is deprecated and the in-tree scaleIO type is no longer supported.
+                      properties:
+                        fsType:
+                          default: xfs
+                          description: |-
+                            fsType is the filesystem type to mount.
+                            Must be a filesystem type supported by the host operating system.
+                            Ex. "ext4", "xfs", "ntfs".
+                            Default is "xfs".
+                          type: string
+                        gateway:
+                          description: gateway is the host address of the ScaleIO
+                            API Gateway.
+                          type: string
+                        protectionDomain:
+                          description: protectionDomain is the name of the ScaleIO
+                            Protection Domain for the configured storage.
+                          type: string
+                        readOnly:
+                          description: |-
+                            readOnly Defaults to false (read/write). ReadOnly here will force
+                            the ReadOnly setting in VolumeMounts.
+                          type: boolean
+                        secretRef:
+                          description: |-
+                            secretRef references to the secret for ScaleIO user and other
+                            sensitive information. If this is not provided, Login operation will fail.
+                          properties:
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        sslEnabled:
+                          description: sslEnabled Flag enable/disable SSL communication
+                            with Gateway, default false
+                          type: boolean
+                        storageMode:
+                          default: ThinProvisioned
+                          description: |-
+                            storageMode indicates whether the storage for a volume should be ThickProvisioned or ThinProvisioned.
+                            Default is ThinProvisioned.
+                          type: string
+                        storagePool:
+                          description: storagePool is the ScaleIO Storage Pool associated
+                            with the protection domain.
+                          type: string
+                        system:
+                          description: system is the name of the storage system as
+                            configured in ScaleIO.
+                          type: string
+                        volumeName:
+                          description: |-
+                            volumeName is the name of a volume already created in the ScaleIO system
+                            that is associated with this volume source.
+                          type: string
+                      required:
+                      - gateway
+                      - secretRef
+                      - system
+                      type: object
+                    secret:
+                      description: |-
+                        secret represents a secret that should populate this volume.
+                        More info: https://kubernetes.io/docs/concepts/storage/volumes#secret
+                      properties:
+                        defaultMode:
+                          description: |-
+                            defaultMode is Optional: mode bits used to set permissions on created files by default.
+                            Must be an octal value between 0000 and 0777 or a decimal value between 0 and 511.
+                            YAML accepts both octal and decimal values, JSON requires decimal values
+                            for mode bits. Defaults to 0644.
+                            Directories within the path are not affected by this setting.
+                            This might be in conflict with other options that affect the file
+                            mode, like fsGroup, and the result can be other mode bits set.
+                          format: int32
+                          type: integer
+                        items:
+                          description: |-
+                            items If unspecified, each key-value pair in the Data field of the referenced
+                            Secret will be projected into the volume as a file whose name is the
+                            key and content is the value. If specified, the listed keys will be
+                            projected into the specified paths, and unlisted keys will not be
+                            present. If a key is specified which is not present in the Secret,
+                            the volume setup will error unless it is marked optional. Paths must be
+                            relative and may not contain the '..' path or start with '..'.
+                          items:
+                            description: Maps a string key to a path within a volume.
+                            properties:
+                              key:
+                                description: key is the key to project.
+                                type: string
+                              mode:
+                                description: |-
+                                  mode is Optional: mode bits used to set permissions on this file.
+                                  Must be an octal value between 0000 and 0777 or a decimal value between 0 and 511.
+                                  YAML accepts both octal and decimal values, JSON requires decimal values for mode bits.
+                                  If not specified, the volume defaultMode will be used.
+                                  This might be in conflict with other options that affect the file
+                                  mode, like fsGroup, and the result can be other mode bits set.
+                                format: int32
+                                type: integer
+                              path:
+                                description: |-
+                                  path is the relative path of the file to map the key to.
+                                  May not be an absolute path.
+                                  May not contain the path element '..'.
+                                  May not start with the string '..'.
+                                type: string
+                            required:
+                            - key
+                            - path
+                            type: object
+                          type: array
+                          x-kubernetes-list-type: atomic
+                        optional:
+                          description: optional field specify whether the Secret or
+                            its keys must be defined
+                          type: boolean
+                        secretName:
+                          description: |-
+                            secretName is the name of the secret in the pod's namespace to use.
+                            More info: https://kubernetes.io/docs/concepts/storage/volumes#secret
+                          type: string
+                      type: object
+                    storageos:
+                      description: |-
+                        storageOS represents a StorageOS volume attached and mounted on Kubernetes nodes.
+                        Deprecated: StorageOS is deprecated and the in-tree storageos type is no longer supported.
+                      properties:
+                        fsType:
+                          description: |-
+                            fsType is the filesystem type to mount.
+                            Must be a filesystem type supported by the host operating system.
+                            Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
+                          type: string
+                        readOnly:
+                          description: |-
+                            readOnly defaults to false (read/write). ReadOnly here will force
+                            the ReadOnly setting in VolumeMounts.
+                          type: boolean
+                        secretRef:
+                          description: |-
+                            secretRef specifies the secret to use for obtaining the StorageOS API
+                            credentials.  If not specified, default values will be attempted.
+                          properties:
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        volumeName:
+                          description: |-
+                            volumeName is the human-readable name of the StorageOS volume.  Volume
+                            names are only unique within a namespace.
+                          type: string
+                        volumeNamespace:
+                          description: |-
+                            volumeNamespace specifies the scope of the volume within StorageOS.  If no
+                            namespace is specified then the Pod's namespace will be used.  This allows the
+                            Kubernetes name scoping to be mirrored within StorageOS for tighter integration.
+                            Set VolumeName to any name to override the default behaviour.
+                            Set to "default" if you are not using namespaces within StorageOS.
+                            Namespaces that do not pre-exist within StorageOS will be created.
+                          type: string
+                      type: object
+                    vsphereVolume:
+                      description: |-
+                        vsphereVolume represents a vSphere volume attached and mounted on kubelets host machine.
+                        Deprecated: VsphereVolume is deprecated. All operations for the in-tree vsphereVolume type
+                        are redirected to the csi.vsphere.vmware.com CSI driver.
+                      properties:
+                        fsType:
+                          description: |-
+                            fsType is filesystem type to mount.
+                            Must be a filesystem type supported by the host operating system.
+                            Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
+                          type: string
+                        storagePolicyID:
+                          description: storagePolicyID is the storage Policy Based
+                            Management (SPBM) profile ID associated with the StoragePolicyName.
+                          type: string
+                        storagePolicyName:
+                          description: storagePolicyName is the storage Policy Based
+                            Management (SPBM) profile name.
+                          type: string
+                        volumePath:
+                          description: volumePath is the path that identifies vSphere
+                            volume vmdk
+                          type: string
+                      required:
+                      - volumePath
+                      type: object
+                  required:
+                  - name
+                  type: object
+                type: array
+              web:
+                description: web defines the web command line flags when starting
+                  Alertmanager.
+                properties:
+                  getConcurrency:
+                    description: |-
+                      getConcurrency defines the maximum number of GET requests processed concurrently. This corresponds to the
+                      Alertmanager's `--web.get-concurrency` flag.
+                    format: int32
+                    type: integer
+                  httpConfig:
+                    description: httpConfig defines HTTP parameters for web server.
+                    properties:
+                      headers:
+                        description: headers defines a list of headers that can be
+                          added to HTTP responses.
+                        properties:
+                          contentSecurityPolicy:
+                            description: |-
+                              contentSecurityPolicy defines the Content-Security-Policy header to HTTP responses.
+                              Unset if blank.
+                            type: string
+                          strictTransportSecurity:
+                            description: |-
+                              strictTransportSecurity defines the Strict-Transport-Security header to HTTP responses.
+                              Unset if blank.
+                              Please make sure that you use this with care as this header might force
+                              browsers to load Prometheus and the other applications hosted on the same
+                              domain and subdomains over HTTPS.
+                              https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Strict-Transport-Security
+                            type: string
+                          xContentTypeOptions:
+                            description: |-
+                              xContentTypeOptions defines the X-Content-Type-Options header to HTTP responses.
+                              Unset if blank. Accepted value is nosniff.
+                              https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-Content-Type-Options
+                            enum:
+                            - ""
+                            - NoSniff
+                            type: string
+                          xFrameOptions:
+                            description: |-
+                              xFrameOptions defines the X-Frame-Options header to HTTP responses.
+                              Unset if blank. Accepted values are deny and sameorigin.
+                              https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-Frame-Options
+                            enum:
+                            - ""
+                            - Deny
+                            - SameOrigin
+                            type: string
+                          xXSSProtection:
+                            description: |-
+                              xXSSProtection defines the X-XSS-Protection header to all responses.
+                              Unset if blank.
+                              https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-XSS-Protection
+                            type: string
+                        type: object
+                      http2:
+                        description: |-
+                          http2 enable HTTP/2 support. Note that HTTP/2 is only supported with TLS.
+                          When TLSConfig is not configured, HTTP/2 will be disabled.
+                          Whenever the value of the field changes, a rolling update will be triggered.
+                        type: boolean
+                    type: object
+                  timeout:
+                    description: |-
+                      timeout for HTTP requests. This corresponds to the Alertmanager's
+                      `--web.timeout` flag.
+                    format: int32
+                    type: integer
+                  tlsConfig:
+                    description: tlsConfig defines the TLS parameters for HTTPS.
+                    properties:
+                      cert:
+                        description: |-
+                          cert defines the Secret or ConfigMap containing the TLS certificate for the web server.
+
+                          Either `keySecret` or `keyFile` must be defined.
+
+                          It is mutually exclusive with `certFile`.
+                        properties:
+                          configMap:
+                            description: configMap defines the ConfigMap containing
+                              data to use for the targets.
+                            properties:
+                              key:
+                                description: The key to select.
+                                type: string
+                              name:
+                                default: ""
+                                description: |-
+                                  Name of the referent.
+                                  This field is effectively required, but due to backwards compatibility is
+                                  allowed to be empty. Instances of this type with an empty value here are
+                                  almost certainly wrong.
+                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                type: string
+                              optional:
+                                description: Specify whether the ConfigMap or its
+                                  key must be defined
+                                type: boolean
+                            required:
+                            - key
+                            type: object
+                            x-kubernetes-map-type: atomic
+                          secret:
+                            description: secret defines the Secret containing data
+                              to use for the targets.
+                            properties:
+                              key:
+                                description: The key of the secret to select from.  Must
+                                  be a valid secret key.
+                                type: string
+                              name:
+                                default: ""
+                                description: |-
+                                  Name of the referent.
+                                  This field is effectively required, but due to backwards compatibility is
+                                  allowed to be empty. Instances of this type with an empty value here are
+                                  almost certainly wrong.
+                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                type: string
+                              optional:
+                                description: Specify whether the Secret or its key
+                                  must be defined
+                                type: boolean
+                            required:
+                            - key
+                            type: object
+                            x-kubernetes-map-type: atomic
+                        type: object
+                      certFile:
+                        description: |-
+                          certFile defines the path to the TLS certificate file in the container for the web server.
+
+                          Either `keySecret` or `keyFile` must be defined.
+
+                          It is mutually exclusive with `cert`.
+                        type: string
+                      cipherSuites:
+                        description: |-
+                          cipherSuites defines the list of supported cipher suites for TLS versions up to TLS 1.2.
+
+                          If not defined, the Go default cipher suites are used.
+                          Available cipher suites are documented in the Go documentation:
+                          https://golang.org/pkg/crypto/tls/#pkg-constants
+                        items:
+                          type: string
+                        type: array
+                      client_ca:
+                        description: |-
+                          client_ca defines the Secret or ConfigMap containing the CA certificate for client certificate
+                          authentication to the server.
+
+                          It is mutually exclusive with `clientCAFile`.
+                        properties:
+                          configMap:
+                            description: configMap defines the ConfigMap containing
+                              data to use for the targets.
+                            properties:
+                              key:
+                                description: The key to select.
+                                type: string
+                              name:
+                                default: ""
+                                description: |-
+                                  Name of the referent.
+                                  This field is effectively required, but due to backwards compatibility is
+                                  allowed to be empty. Instances of this type with an empty value here are
+                                  almost certainly wrong.
+                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                type: string
+                              optional:
+                                description: Specify whether the ConfigMap or its
+                                  key must be defined
+                                type: boolean
+                            required:
+                            - key
+                            type: object
+                            x-kubernetes-map-type: atomic
+                          secret:
+                            description: secret defines the Secret containing data
+                              to use for the targets.
+                            properties:
+                              key:
+                                description: The key of the secret to select from.  Must
+                                  be a valid secret key.
+                                type: string
+                              name:
+                                default: ""
+                                description: |-
+                                  Name of the referent.
+                                  This field is effectively required, but due to backwards compatibility is
+                                  allowed to be empty. Instances of this type with an empty value here are
+                                  almost certainly wrong.
+                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                type: string
+                              optional:
+                                description: Specify whether the Secret or its key
+                                  must be defined
+                                type: boolean
+                            required:
+                            - key
+                            type: object
+                            x-kubernetes-map-type: atomic
+                        type: object
+                      clientAuthType:
+                        description: |-
+                          clientAuthType defines the server policy for client TLS authentication.
+
+                          For more detail on clientAuth options:
+                          https://golang.org/pkg/crypto/tls/#ClientAuthType
+                        type: string
+                      clientCAFile:
+                        description: |-
+                          clientCAFile defines the path to the CA certificate file for client certificate authentication to
+                          the server.
+
+                          It is mutually exclusive with `client_ca`.
+                        type: string
+                      curvePreferences:
+                        description: |-
+                          curvePreferences defines elliptic curves that will be used in an ECDHE handshake, in preference
+                          order.
+
+                          Available curves are documented in the Go documentation:
+                          https://golang.org/pkg/crypto/tls/#CurveID
+                        items:
+                          type: string
+                        type: array
+                      keyFile:
+                        description: |-
+                          keyFile defines the path to the TLS private key file in the container for the web server.
+
+                          If defined, either `cert` or `certFile` must be defined.
+
+                          It is mutually exclusive with `keySecret`.
+                        type: string
+                      keySecret:
+                        description: |-
+                          keySecret defines the secret containing the TLS private key for the web server.
+
+                          Either `cert` or `certFile` must be defined.
+
+                          It is mutually exclusive with `keyFile`.
+                        properties:
+                          key:
+                            description: The key of the secret to select from.  Must
+                              be a valid secret key.
+                            type: string
+                          name:
+                            default: ""
+                            description: |-
+                              Name of the referent.
+                              This field is effectively required, but due to backwards compatibility is
+                              allowed to be empty. Instances of this type with an empty value here are
+                              almost certainly wrong.
+                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                            type: string
+                          optional:
+                            description: Specify whether the Secret or its key must
+                              be defined
+                            type: boolean
+                        required:
+                        - key
+                        type: object
+                        x-kubernetes-map-type: atomic
+                      maxVersion:
+                        description: maxVersion defines the Maximum TLS version that
+                          is acceptable.
+                        type: string
+                      minVersion:
+                        description: minVersion defines the minimum TLS version that
+                          is acceptable.
+                        type: string
+                      preferServerCipherSuites:
+                        description: |-
+                          preferServerCipherSuites defines whether the server selects the client's most preferred cipher
+                          suite, or the server's most preferred cipher suite.
+
+                          If true then the server's preference, as expressed in
+                          the order of elements in cipherSuites, is used.
+                        type: boolean
+                    type: object
+                type: object
+            type: object
+          status:
+            description: |-
+              status defines the most recent observed status of the Alertmanager cluster. Read-only.
+              More info:
+              https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#spec-and-status
+            properties:
+              availableReplicas:
+                description: |-
+                  availableReplicas defines the total number of available pods (ready for at least minReadySeconds)
+                  targeted by this Alertmanager cluster.
+                format: int32
+                type: integer
+              conditions:
+                description: conditions defines the current state of the Alertmanager
+                  object.
+                items:
+                  description: |-
+                    Condition represents the state of the resources associated with the
+                    Prometheus, Alertmanager or ThanosRuler resource.
+                  properties:
+                    lastTransitionTime:
+                      description: lastTransitionTime is the time of the last update
+                        to the current status property.
+                      format: date-time
+                      type: string
+                    message:
+                      description: message defines human-readable message indicating
+                        details for the condition's last transition.
+                      type: string
+                    observedGeneration:
+                      description: |-
+                        observedGeneration defines the .metadata.generation that the
+                        condition was set based upon. For instance, if `.metadata.generation` is
+                        currently 12, but the `.status.conditions[].observedGeneration` is 9, the
+                        condition is out of date with respect to the current state of the
+                        instance.
+                      format: int64
+                      type: integer
+                    reason:
+                      description: reason for the condition's last transition.
+                      type: string
+                    status:
+                      description: status of the condition.
+                      minLength: 1
+                      type: string
+                    type:
+                      description: type of the condition being reported.
+                      minLength: 1
+                      type: string
+                  required:
+                  - lastTransitionTime
+                  - status
+                  - type
+                  type: object
+                type: array
+                x-kubernetes-list-map-keys:
+                - type
+                x-kubernetes-list-type: map
+              paused:
+                description: |-
+                  paused defines whether any actions on the underlying managed objects are
+                  being performed. Only delete actions will be performed.
+                type: boolean
+              replicas:
+                description: |-
+                  replicas defines the total number of non-terminated pods targeted by this Alertmanager
+                  object (their labels match the selector).
+                format: int32
+                type: integer
+              selector:
+                description: selector used to match the pods targeted by this Alertmanager
+                  object.
+                type: string
+              unavailableReplicas:
+                description: unavailableReplicas defines the total number of unavailable
+                  pods targeted by this Alertmanager object.
+                format: int32
+                type: integer
+              updatedReplicas:
+                description: |-
+                  updatedReplicas defines the total number of non-terminated pods targeted by this Alertmanager
+                  object that have the desired version spec.
+                format: int32
+                type: integer
+            type: object
+        required:
+        - spec
+        type: object
+    served: true
+    storage: true
+    subresources:
+      scale:
+        labelSelectorPath: .status.selector
+        specReplicasPath: .spec.replicas
+        statusReplicasPath: .status.replicas
+      status: {}
+{{- end -}}
diff --git a/packages/system/prometheus-operator-crds/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml b/packages/system/prometheus-operator-crds/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml
new file mode 100644
index 0000000000..9bba762ef5
--- /dev/null
+++ b/packages/system/prometheus-operator-crds/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml
@@ -0,0 +1,11326 @@
+{{- if .Values.prometheusagents.enabled -}}
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.87.0/example/prometheus-operator-crd/monitoring.coreos.com_prometheusagents.yaml
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+{{- with .Values.annotations }}
+{{- toYaml . | nindent 4 }}
+{{- end }}
+    controller-gen.kubebuilder.io/version: v0.19.0
+    operator.prometheus.io/version: 0.87.0
+  name: prometheusagents.monitoring.coreos.com
+spec:
+  group: monitoring.coreos.com
+  names:
+    categories:
+    - prometheus-operator
+    kind: PrometheusAgent
+    listKind: PrometheusAgentList
+    plural: prometheusagents
+    shortNames:
+    - promagent
+    singular: prometheusagent
+  scope: Namespaced
+  versions:
+  - additionalPrinterColumns:
+    - description: The version of Prometheus agent
+      jsonPath: .spec.version
+      name: Version
+      type: string
+    - description: The number of desired replicas
+      jsonPath: .spec.replicas
+      name: Desired
+      type: integer
+    - description: The number of ready replicas
+      jsonPath: .status.availableReplicas
+      name: Ready
+      type: integer
+    - jsonPath: .status.conditions[?(@.type == 'Reconciled')].status
+      name: Reconciled
+      type: string
+    - jsonPath: .status.conditions[?(@.type == 'Available')].status
+      name: Available
+      type: string
+    - jsonPath: .metadata.creationTimestamp
+      name: Age
+      type: date
+    - description: Whether the resource reconciliation is paused or not
+      jsonPath: .status.paused
+      name: Paused
+      priority: 1
+      type: boolean
+    name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        description: |-
+          The `PrometheusAgent` custom resource definition (CRD) defines a desired [Prometheus Agent](https://prometheus.io/blog/2021/11/16/agent/) setup to run in a Kubernetes cluster.
+
+          The CRD is very similar to the `Prometheus` CRD except for features which aren't available in agent mode like rule evaluation, persistent storage and Thanos sidecar.
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: |-
+              spec defines the specification of the desired behavior of the Prometheus agent. More info:
+              https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#spec-and-status
+            properties:
+              additionalArgs:
+                description: |-
+                  additionalArgs allows setting additional arguments for the 'prometheus' container.
+
+                  It is intended for e.g. activating hidden flags which are not supported by
+                  the dedicated configuration options yet. The arguments are passed as-is to the
+                  Prometheus container which may cause issues if they are invalid or not supported
+                  by the given Prometheus version.
+
+                  In case of an argument conflict (e.g. an argument which is already set by the
+                  operator itself) or when providing an invalid argument, the reconciliation will
+                  fail and an error will be logged.
+                items:
+                  description: Argument as part of the AdditionalArgs list.
+                  properties:
+                    name:
+                      description: name of the argument, e.g. "scrape.discovery-reload-interval".
+                      minLength: 1
+                      type: string
+                    value:
+                      description: value defines the argument value, e.g. 30s. Can
+                        be empty for name-only arguments (e.g. --storage.tsdb.no-lockfile)
+                      type: string
+                  required:
+                  - name
+                  type: object
+                type: array
+              additionalScrapeConfigs:
+                description: |-
+                  additionalScrapeConfigs allows specifying a key of a Secret containing
+                  additional Prometheus scrape configurations. Scrape configurations
+                  specified are appended to the configurations generated by the Prometheus
+                  Operator. Job configurations specified must have the form as specified
+                  in the official Prometheus documentation:
+                  https://prometheus.io/docs/prometheus/latest/configuration/configuration/#scrape_config.
+                  As scrape configs are appended, the user is responsible to make sure it
+                  is valid. Note that using this feature may expose the possibility to
+                  break upgrades of Prometheus. It is advised to review Prometheus release
+                  notes to ensure that no incompatible scrape configs are going to break
+                  Prometheus after the upgrade.
+                properties:
+                  key:
+                    description: The key of the secret to select from.  Must be a
+                      valid secret key.
+                    type: string
+                  name:
+                    default: ""
+                    description: |-
+                      Name of the referent.
+                      This field is effectively required, but due to backwards compatibility is
+                      allowed to be empty. Instances of this type with an empty value here are
+                      almost certainly wrong.
+                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                    type: string
+                  optional:
+                    description: Specify whether the Secret or its key must be defined
+                    type: boolean
+                required:
+                - key
+                type: object
+                x-kubernetes-map-type: atomic
+              affinity:
+                description: affinity defines the Pods' affinity scheduling rules
+                  if specified.
+                properties:
+                  nodeAffinity:
+                    description: Describes node affinity scheduling rules for the
+                      pod.
+                    properties:
+                      preferredDuringSchedulingIgnoredDuringExecution:
+                        description: |-
+                          The scheduler will prefer to schedule pods to nodes that satisfy
+                          the affinity expressions specified by this field, but it may choose
+                          a node that violates one or more of the expressions. The node that is
+                          most preferred is the one with the greatest sum of weights, i.e.
+                          for each node that meets all of the scheduling requirements (resource
+                          request, requiredDuringScheduling affinity expressions, etc.),
+                          compute a sum by iterating through the elements of this field and adding
+                          "weight" to the sum if the node matches the corresponding matchExpressions; the
+                          node(s) with the highest sum are the most preferred.
+                        items:
+                          description: |-
+                            An empty preferred scheduling term matches all objects with implicit weight 0
+                            (i.e. it's a no-op). A null preferred scheduling term matches no objects (i.e. is also a no-op).
+                          properties:
+                            preference:
+                              description: A node selector term, associated with the
+                                corresponding weight.
+                              properties:
+                                matchExpressions:
+                                  description: A list of node selector requirements
+                                    by node's labels.
+                                  items:
+                                    description: |-
+                                      A node selector requirement is a selector that contains values, a key, and an operator
+                                      that relates the key and values.
+                                    properties:
+                                      key:
+                                        description: The label key that the selector
+                                          applies to.
+                                        type: string
+                                      operator:
+                                        description: |-
+                                          Represents a key's relationship to a set of values.
+                                          Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt.
+                                        type: string
+                                      values:
+                                        description: |-
+                                          An array of string values. If the operator is In or NotIn,
+                                          the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                          the values array must be empty. If the operator is Gt or Lt, the values
+                                          array must have a single element, which will be interpreted as an integer.
+                                          This array is replaced during a strategic merge patch.
+                                        items:
+                                          type: string
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                    required:
+                                    - key
+                                    - operator
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                matchFields:
+                                  description: A list of node selector requirements
+                                    by node's fields.
+                                  items:
+                                    description: |-
+                                      A node selector requirement is a selector that contains values, a key, and an operator
+                                      that relates the key and values.
+                                    properties:
+                                      key:
+                                        description: The label key that the selector
+                                          applies to.
+                                        type: string
+                                      operator:
+                                        description: |-
+                                          Represents a key's relationship to a set of values.
+                                          Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt.
+                                        type: string
+                                      values:
+                                        description: |-
+                                          An array of string values. If the operator is In or NotIn,
+                                          the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                          the values array must be empty. If the operator is Gt or Lt, the values
+                                          array must have a single element, which will be interpreted as an integer.
+                                          This array is replaced during a strategic merge patch.
+                                        items:
+                                          type: string
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                    required:
+                                    - key
+                                    - operator
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            weight:
+                              description: Weight associated with matching the corresponding
+                                nodeSelectorTerm, in the range 1-100.
+                              format: int32
+                              type: integer
+                          required:
+                          - preference
+                          - weight
+                          type: object
+                        type: array
+                        x-kubernetes-list-type: atomic
+                      requiredDuringSchedulingIgnoredDuringExecution:
+                        description: |-
+                          If the affinity requirements specified by this field are not met at
+                          scheduling time, the pod will not be scheduled onto the node.
+                          If the affinity requirements specified by this field cease to be met
+                          at some point during pod execution (e.g. due to an update), the system
+                          may or may not try to eventually evict the pod from its node.
+                        properties:
+                          nodeSelectorTerms:
+                            description: Required. A list of node selector terms.
+                              The terms are ORed.
+                            items:
+                              description: |-
+                                A null or empty node selector term matches no objects. The requirements of
+                                them are ANDed.
+                                The TopologySelectorTerm type implements a subset of the NodeSelectorTerm.
+                              properties:
+                                matchExpressions:
+                                  description: A list of node selector requirements
+                                    by node's labels.
+                                  items:
+                                    description: |-
+                                      A node selector requirement is a selector that contains values, a key, and an operator
+                                      that relates the key and values.
+                                    properties:
+                                      key:
+                                        description: The label key that the selector
+                                          applies to.
+                                        type: string
+                                      operator:
+                                        description: |-
+                                          Represents a key's relationship to a set of values.
+                                          Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt.
+                                        type: string
+                                      values:
+                                        description: |-
+                                          An array of string values. If the operator is In or NotIn,
+                                          the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                          the values array must be empty. If the operator is Gt or Lt, the values
+                                          array must have a single element, which will be interpreted as an integer.
+                                          This array is replaced during a strategic merge patch.
+                                        items:
+                                          type: string
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                    required:
+                                    - key
+                                    - operator
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                matchFields:
+                                  description: A list of node selector requirements
+                                    by node's fields.
+                                  items:
+                                    description: |-
+                                      A node selector requirement is a selector that contains values, a key, and an operator
+                                      that relates the key and values.
+                                    properties:
+                                      key:
+                                        description: The label key that the selector
+                                          applies to.
+                                        type: string
+                                      operator:
+                                        description: |-
+                                          Represents a key's relationship to a set of values.
+                                          Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt.
+                                        type: string
+                                      values:
+                                        description: |-
+                                          An array of string values. If the operator is In or NotIn,
+                                          the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                          the values array must be empty. If the operator is Gt or Lt, the values
+                                          array must have a single element, which will be interpreted as an integer.
+                                          This array is replaced during a strategic merge patch.
+                                        items:
+                                          type: string
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                    required:
+                                    - key
+                                    - operator
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            type: array
+                            x-kubernetes-list-type: atomic
+                        required:
+                        - nodeSelectorTerms
+                        type: object
+                        x-kubernetes-map-type: atomic
+                    type: object
+                  podAffinity:
+                    description: Describes pod affinity scheduling rules (e.g. co-locate
+                      this pod in the same node, zone, etc. as some other pod(s)).
+                    properties:
+                      preferredDuringSchedulingIgnoredDuringExecution:
+                        description: |-
+                          The scheduler will prefer to schedule pods to nodes that satisfy
+                          the affinity expressions specified by this field, but it may choose
+                          a node that violates one or more of the expressions. The node that is
+                          most preferred is the one with the greatest sum of weights, i.e.
+                          for each node that meets all of the scheduling requirements (resource
+                          request, requiredDuringScheduling affinity expressions, etc.),
+                          compute a sum by iterating through the elements of this field and adding
+                          "weight" to the sum if the node has pods which matches the corresponding podAffinityTerm; the
+                          node(s) with the highest sum are the most preferred.
+                        items:
+                          description: The weights of all of the matched WeightedPodAffinityTerm
+                            fields are added per-node to find the most preferred node(s)
+                          properties:
+                            podAffinityTerm:
+                              description: Required. A pod affinity term, associated
+                                with the corresponding weight.
+                              properties:
+                                labelSelector:
+                                  description: |-
+                                    A label query over a set of resources, in this case pods.
+                                    If it's null, this PodAffinityTerm matches with no Pods.
+                                  properties:
+                                    matchExpressions:
+                                      description: matchExpressions is a list of label
+                                        selector requirements. The requirements are
+                                        ANDed.
+                                      items:
+                                        description: |-
+                                          A label selector requirement is a selector that contains values, a key, and an operator that
+                                          relates the key and values.
+                                        properties:
+                                          key:
+                                            description: key is the label key that
+                                              the selector applies to.
+                                            type: string
+                                          operator:
+                                            description: |-
+                                              operator represents a key's relationship to a set of values.
+                                              Valid operators are In, NotIn, Exists and DoesNotExist.
+                                            type: string
+                                          values:
+                                            description: |-
+                                              values is an array of string values. If the operator is In or NotIn,
+                                              the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                              the values array must be empty. This array is replaced during a strategic
+                                              merge patch.
+                                            items:
+                                              type: string
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                        required:
+                                        - key
+                                        - operator
+                                        type: object
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    matchLabels:
+                                      additionalProperties:
+                                        type: string
+                                      description: |-
+                                        matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                        map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                        operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                      type: object
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                matchLabelKeys:
+                                  description: |-
+                                    MatchLabelKeys is a set of pod label keys to select which pods will
+                                    be taken into consideration. The keys are used to lookup values from the
+                                    incoming pod labels, those key-value labels are merged with `labelSelector` as `key in (value)`
+                                    to select the group of existing pods which pods will be taken into consideration
+                                    for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+                                    pod labels will be ignored. The default value is empty.
+                                    The same key is forbidden to exist in both matchLabelKeys and labelSelector.
+                                    Also, matchLabelKeys cannot be set when labelSelector isn't set.
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                mismatchLabelKeys:
+                                  description: |-
+                                    MismatchLabelKeys is a set of pod label keys to select which pods will
+                                    be taken into consideration. The keys are used to lookup values from the
+                                    incoming pod labels, those key-value labels are merged with `labelSelector` as `key notin (value)`
+                                    to select the group of existing pods which pods will be taken into consideration
+                                    for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+                                    pod labels will be ignored. The default value is empty.
+                                    The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
+                                    Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                namespaceSelector:
+                                  description: |-
+                                    A label query over the set of namespaces that the term applies to.
+                                    The term is applied to the union of the namespaces selected by this field
+                                    and the ones listed in the namespaces field.
+                                    null selector and null or empty namespaces list means "this pod's namespace".
+                                    An empty selector ({}) matches all namespaces.
+                                  properties:
+                                    matchExpressions:
+                                      description: matchExpressions is a list of label
+                                        selector requirements. The requirements are
+                                        ANDed.
+                                      items:
+                                        description: |-
+                                          A label selector requirement is a selector that contains values, a key, and an operator that
+                                          relates the key and values.
+                                        properties:
+                                          key:
+                                            description: key is the label key that
+                                              the selector applies to.
+                                            type: string
+                                          operator:
+                                            description: |-
+                                              operator represents a key's relationship to a set of values.
+                                              Valid operators are In, NotIn, Exists and DoesNotExist.
+                                            type: string
+                                          values:
+                                            description: |-
+                                              values is an array of string values. If the operator is In or NotIn,
+                                              the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                              the values array must be empty. This array is replaced during a strategic
+                                              merge patch.
+                                            items:
+                                              type: string
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                        required:
+                                        - key
+                                        - operator
+                                        type: object
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    matchLabels:
+                                      additionalProperties:
+                                        type: string
+                                      description: |-
+                                        matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                        map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                        operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                      type: object
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                namespaces:
+                                  description: |-
+                                    namespaces specifies a static list of namespace names that the term applies to.
+                                    The term is applied to the union of the namespaces listed in this field
+                                    and the ones selected by namespaceSelector.
+                                    null or empty namespaces list and null namespaceSelector means "this pod's namespace".
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                topologyKey:
+                                  description: |-
+                                    This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching
+                                    the labelSelector in the specified namespaces, where co-located is defined as running on a node
+                                    whose value of the label with key topologyKey matches that of any node on which any of the
+                                    selected pods is running.
+                                    Empty topologyKey is not allowed.
+                                  type: string
+                              required:
+                              - topologyKey
+                              type: object
+                            weight:
+                              description: |-
+                                weight associated with matching the corresponding podAffinityTerm,
+                                in the range 1-100.
+                              format: int32
+                              type: integer
+                          required:
+                          - podAffinityTerm
+                          - weight
+                          type: object
+                        type: array
+                        x-kubernetes-list-type: atomic
+                      requiredDuringSchedulingIgnoredDuringExecution:
+                        description: |-
+                          If the affinity requirements specified by this field are not met at
+                          scheduling time, the pod will not be scheduled onto the node.
+                          If the affinity requirements specified by this field cease to be met
+                          at some point during pod execution (e.g. due to a pod label update), the
+                          system may or may not try to eventually evict the pod from its node.
+                          When there are multiple elements, the lists of nodes corresponding to each
+                          podAffinityTerm are intersected, i.e. all terms must be satisfied.
+                        items:
+                          description: |-
+                            Defines a set of pods (namely those matching the labelSelector
+                            relative to the given namespace(s)) that this pod should be
+                            co-located (affinity) or not co-located (anti-affinity) with,
+                            where co-located is defined as running on a node whose value of
+                            the label with key <topologyKey> matches that of any node on which
+                            a pod of the set of pods is running
+                          properties:
+                            labelSelector:
+                              description: |-
+                                A label query over a set of resources, in this case pods.
+                                If it's null, this PodAffinityTerm matches with no Pods.
+                              properties:
+                                matchExpressions:
+                                  description: matchExpressions is a list of label
+                                    selector requirements. The requirements are ANDed.
+                                  items:
+                                    description: |-
+                                      A label selector requirement is a selector that contains values, a key, and an operator that
+                                      relates the key and values.
+                                    properties:
+                                      key:
+                                        description: key is the label key that the
+                                          selector applies to.
+                                        type: string
+                                      operator:
+                                        description: |-
+                                          operator represents a key's relationship to a set of values.
+                                          Valid operators are In, NotIn, Exists and DoesNotExist.
+                                        type: string
+                                      values:
+                                        description: |-
+                                          values is an array of string values. If the operator is In or NotIn,
+                                          the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                          the values array must be empty. This array is replaced during a strategic
+                                          merge patch.
+                                        items:
+                                          type: string
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                    required:
+                                    - key
+                                    - operator
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                matchLabels:
+                                  additionalProperties:
+                                    type: string
+                                  description: |-
+                                    matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                    map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                    operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                  type: object
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            matchLabelKeys:
+                              description: |-
+                                MatchLabelKeys is a set of pod label keys to select which pods will
+                                be taken into consideration. The keys are used to lookup values from the
+                                incoming pod labels, those key-value labels are merged with `labelSelector` as `key in (value)`
+                                to select the group of existing pods which pods will be taken into consideration
+                                for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+                                pod labels will be ignored. The default value is empty.
+                                The same key is forbidden to exist in both matchLabelKeys and labelSelector.
+                                Also, matchLabelKeys cannot be set when labelSelector isn't set.
+                              items:
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            mismatchLabelKeys:
+                              description: |-
+                                MismatchLabelKeys is a set of pod label keys to select which pods will
+                                be taken into consideration. The keys are used to lookup values from the
+                                incoming pod labels, those key-value labels are merged with `labelSelector` as `key notin (value)`
+                                to select the group of existing pods which pods will be taken into consideration
+                                for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+                                pod labels will be ignored. The default value is empty.
+                                The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
+                                Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
+                              items:
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            namespaceSelector:
+                              description: |-
+                                A label query over the set of namespaces that the term applies to.
+                                The term is applied to the union of the namespaces selected by this field
+                                and the ones listed in the namespaces field.
+                                null selector and null or empty namespaces list means "this pod's namespace".
+                                An empty selector ({}) matches all namespaces.
+                              properties:
+                                matchExpressions:
+                                  description: matchExpressions is a list of label
+                                    selector requirements. The requirements are ANDed.
+                                  items:
+                                    description: |-
+                                      A label selector requirement is a selector that contains values, a key, and an operator that
+                                      relates the key and values.
+                                    properties:
+                                      key:
+                                        description: key is the label key that the
+                                          selector applies to.
+                                        type: string
+                                      operator:
+                                        description: |-
+                                          operator represents a key's relationship to a set of values.
+                                          Valid operators are In, NotIn, Exists and DoesNotExist.
+                                        type: string
+                                      values:
+                                        description: |-
+                                          values is an array of string values. If the operator is In or NotIn,
+                                          the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                          the values array must be empty. This array is replaced during a strategic
+                                          merge patch.
+                                        items:
+                                          type: string
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                    required:
+                                    - key
+                                    - operator
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                matchLabels:
+                                  additionalProperties:
+                                    type: string
+                                  description: |-
+                                    matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                    map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                    operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                  type: object
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            namespaces:
+                              description: |-
+                                namespaces specifies a static list of namespace names that the term applies to.
+                                The term is applied to the union of the namespaces listed in this field
+                                and the ones selected by namespaceSelector.
+                                null or empty namespaces list and null namespaceSelector means "this pod's namespace".
+                              items:
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            topologyKey:
+                              description: |-
+                                This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching
+                                the labelSelector in the specified namespaces, where co-located is defined as running on a node
+                                whose value of the label with key topologyKey matches that of any node on which any of the
+                                selected pods is running.
+                                Empty topologyKey is not allowed.
+                              type: string
+                          required:
+                          - topologyKey
+                          type: object
+                        type: array
+                        x-kubernetes-list-type: atomic
+                    type: object
+                  podAntiAffinity:
+                    description: Describes pod anti-affinity scheduling rules (e.g.
+                      avoid putting this pod in the same node, zone, etc. as some
+                      other pod(s)).
+                    properties:
+                      preferredDuringSchedulingIgnoredDuringExecution:
+                        description: |-
+                          The scheduler will prefer to schedule pods to nodes that satisfy
+                          the anti-affinity expressions specified by this field, but it may choose
+                          a node that violates one or more of the expressions. The node that is
+                          most preferred is the one with the greatest sum of weights, i.e.
+                          for each node that meets all of the scheduling requirements (resource
+                          request, requiredDuringScheduling anti-affinity expressions, etc.),
+                          compute a sum by iterating through the elements of this field and subtracting
+                          "weight" from the sum if the node has pods which matches the corresponding podAffinityTerm; the
+                          node(s) with the highest sum are the most preferred.
+                        items:
+                          description: The weights of all of the matched WeightedPodAffinityTerm
+                            fields are added per-node to find the most preferred node(s)
+                          properties:
+                            podAffinityTerm:
+                              description: Required. A pod affinity term, associated
+                                with the corresponding weight.
+                              properties:
+                                labelSelector:
+                                  description: |-
+                                    A label query over a set of resources, in this case pods.
+                                    If it's null, this PodAffinityTerm matches with no Pods.
+                                  properties:
+                                    matchExpressions:
+                                      description: matchExpressions is a list of label
+                                        selector requirements. The requirements are
+                                        ANDed.
+                                      items:
+                                        description: |-
+                                          A label selector requirement is a selector that contains values, a key, and an operator that
+                                          relates the key and values.
+                                        properties:
+                                          key:
+                                            description: key is the label key that
+                                              the selector applies to.
+                                            type: string
+                                          operator:
+                                            description: |-
+                                              operator represents a key's relationship to a set of values.
+                                              Valid operators are In, NotIn, Exists and DoesNotExist.
+                                            type: string
+                                          values:
+                                            description: |-
+                                              values is an array of string values. If the operator is In or NotIn,
+                                              the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                              the values array must be empty. This array is replaced during a strategic
+                                              merge patch.
+                                            items:
+                                              type: string
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                        required:
+                                        - key
+                                        - operator
+                                        type: object
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    matchLabels:
+                                      additionalProperties:
+                                        type: string
+                                      description: |-
+                                        matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                        map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                        operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                      type: object
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                matchLabelKeys:
+                                  description: |-
+                                    MatchLabelKeys is a set of pod label keys to select which pods will
+                                    be taken into consideration. The keys are used to lookup values from the
+                                    incoming pod labels, those key-value labels are merged with `labelSelector` as `key in (value)`
+                                    to select the group of existing pods which pods will be taken into consideration
+                                    for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+                                    pod labels will be ignored. The default value is empty.
+                                    The same key is forbidden to exist in both matchLabelKeys and labelSelector.
+                                    Also, matchLabelKeys cannot be set when labelSelector isn't set.
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                mismatchLabelKeys:
+                                  description: |-
+                                    MismatchLabelKeys is a set of pod label keys to select which pods will
+                                    be taken into consideration. The keys are used to lookup values from the
+                                    incoming pod labels, those key-value labels are merged with `labelSelector` as `key notin (value)`
+                                    to select the group of existing pods which pods will be taken into consideration
+                                    for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+                                    pod labels will be ignored. The default value is empty.
+                                    The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
+                                    Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                namespaceSelector:
+                                  description: |-
+                                    A label query over the set of namespaces that the term applies to.
+                                    The term is applied to the union of the namespaces selected by this field
+                                    and the ones listed in the namespaces field.
+                                    null selector and null or empty namespaces list means "this pod's namespace".
+                                    An empty selector ({}) matches all namespaces.
+                                  properties:
+                                    matchExpressions:
+                                      description: matchExpressions is a list of label
+                                        selector requirements. The requirements are
+                                        ANDed.
+                                      items:
+                                        description: |-
+                                          A label selector requirement is a selector that contains values, a key, and an operator that
+                                          relates the key and values.
+                                        properties:
+                                          key:
+                                            description: key is the label key that
+                                              the selector applies to.
+                                            type: string
+                                          operator:
+                                            description: |-
+                                              operator represents a key's relationship to a set of values.
+                                              Valid operators are In, NotIn, Exists and DoesNotExist.
+                                            type: string
+                                          values:
+                                            description: |-
+                                              values is an array of string values. If the operator is In or NotIn,
+                                              the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                              the values array must be empty. This array is replaced during a strategic
+                                              merge patch.
+                                            items:
+                                              type: string
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                        required:
+                                        - key
+                                        - operator
+                                        type: object
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    matchLabels:
+                                      additionalProperties:
+                                        type: string
+                                      description: |-
+                                        matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                        map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                        operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                      type: object
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                namespaces:
+                                  description: |-
+                                    namespaces specifies a static list of namespace names that the term applies to.
+                                    The term is applied to the union of the namespaces listed in this field
+                                    and the ones selected by namespaceSelector.
+                                    null or empty namespaces list and null namespaceSelector means "this pod's namespace".
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                topologyKey:
+                                  description: |-
+                                    This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching
+                                    the labelSelector in the specified namespaces, where co-located is defined as running on a node
+                                    whose value of the label with key topologyKey matches that of any node on which any of the
+                                    selected pods is running.
+                                    Empty topologyKey is not allowed.
+                                  type: string
+                              required:
+                              - topologyKey
+                              type: object
+                            weight:
+                              description: |-
+                                weight associated with matching the corresponding podAffinityTerm,
+                                in the range 1-100.
+                              format: int32
+                              type: integer
+                          required:
+                          - podAffinityTerm
+                          - weight
+                          type: object
+                        type: array
+                        x-kubernetes-list-type: atomic
+                      requiredDuringSchedulingIgnoredDuringExecution:
+                        description: |-
+                          If the anti-affinity requirements specified by this field are not met at
+                          scheduling time, the pod will not be scheduled onto the node.
+                          If the anti-affinity requirements specified by this field cease to be met
+                          at some point during pod execution (e.g. due to a pod label update), the
+                          system may or may not try to eventually evict the pod from its node.
+                          When there are multiple elements, the lists of nodes corresponding to each
+                          podAffinityTerm are intersected, i.e. all terms must be satisfied.
+                        items:
+                          description: |-
+                            Defines a set of pods (namely those matching the labelSelector
+                            relative to the given namespace(s)) that this pod should be
+                            co-located (affinity) or not co-located (anti-affinity) with,
+                            where co-located is defined as running on a node whose value of
+                            the label with key <topologyKey> matches that of any node on which
+                            a pod of the set of pods is running
+                          properties:
+                            labelSelector:
+                              description: |-
+                                A label query over a set of resources, in this case pods.
+                                If it's null, this PodAffinityTerm matches with no Pods.
+                              properties:
+                                matchExpressions:
+                                  description: matchExpressions is a list of label
+                                    selector requirements. The requirements are ANDed.
+                                  items:
+                                    description: |-
+                                      A label selector requirement is a selector that contains values, a key, and an operator that
+                                      relates the key and values.
+                                    properties:
+                                      key:
+                                        description: key is the label key that the
+                                          selector applies to.
+                                        type: string
+                                      operator:
+                                        description: |-
+                                          operator represents a key's relationship to a set of values.
+                                          Valid operators are In, NotIn, Exists and DoesNotExist.
+                                        type: string
+                                      values:
+                                        description: |-
+                                          values is an array of string values. If the operator is In or NotIn,
+                                          the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                          the values array must be empty. This array is replaced during a strategic
+                                          merge patch.
+                                        items:
+                                          type: string
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                    required:
+                                    - key
+                                    - operator
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                matchLabels:
+                                  additionalProperties:
+                                    type: string
+                                  description: |-
+                                    matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                    map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                    operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                  type: object
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            matchLabelKeys:
+                              description: |-
+                                MatchLabelKeys is a set of pod label keys to select which pods will
+                                be taken into consideration. The keys are used to lookup values from the
+                                incoming pod labels, those key-value labels are merged with `labelSelector` as `key in (value)`
+                                to select the group of existing pods which pods will be taken into consideration
+                                for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+                                pod labels will be ignored. The default value is empty.
+                                The same key is forbidden to exist in both matchLabelKeys and labelSelector.
+                                Also, matchLabelKeys cannot be set when labelSelector isn't set.
+                              items:
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            mismatchLabelKeys:
+                              description: |-
+                                MismatchLabelKeys is a set of pod label keys to select which pods will
+                                be taken into consideration. The keys are used to lookup values from the
+                                incoming pod labels, those key-value labels are merged with `labelSelector` as `key notin (value)`
+                                to select the group of existing pods which pods will be taken into consideration
+                                for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+                                pod labels will be ignored. The default value is empty.
+                                The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
+                                Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
+                              items:
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            namespaceSelector:
+                              description: |-
+                                A label query over the set of namespaces that the term applies to.
+                                The term is applied to the union of the namespaces selected by this field
+                                and the ones listed in the namespaces field.
+                                null selector and null or empty namespaces list means "this pod's namespace".
+                                An empty selector ({}) matches all namespaces.
+                              properties:
+                                matchExpressions:
+                                  description: matchExpressions is a list of label
+                                    selector requirements. The requirements are ANDed.
+                                  items:
+                                    description: |-
+                                      A label selector requirement is a selector that contains values, a key, and an operator that
+                                      relates the key and values.
+                                    properties:
+                                      key:
+                                        description: key is the label key that the
+                                          selector applies to.
+                                        type: string
+                                      operator:
+                                        description: |-
+                                          operator represents a key's relationship to a set of values.
+                                          Valid operators are In, NotIn, Exists and DoesNotExist.
+                                        type: string
+                                      values:
+                                        description: |-
+                                          values is an array of string values. If the operator is In or NotIn,
+                                          the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                          the values array must be empty. This array is replaced during a strategic
+                                          merge patch.
+                                        items:
+                                          type: string
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                    required:
+                                    - key
+                                    - operator
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                matchLabels:
+                                  additionalProperties:
+                                    type: string
+                                  description: |-
+                                    matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                    map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                    operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                  type: object
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            namespaces:
+                              description: |-
+                                namespaces specifies a static list of namespace names that the term applies to.
+                                The term is applied to the union of the namespaces listed in this field
+                                and the ones selected by namespaceSelector.
+                                null or empty namespaces list and null namespaceSelector means "this pod's namespace".
+                              items:
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            topologyKey:
+                              description: |-
+                                This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching
+                                the labelSelector in the specified namespaces, where co-located is defined as running on a node
+                                whose value of the label with key topologyKey matches that of any node on which any of the
+                                selected pods is running.
+                                Empty topologyKey is not allowed.
+                              type: string
+                          required:
+                          - topologyKey
+                          type: object
+                        type: array
+                        x-kubernetes-list-type: atomic
+                    type: object
+                type: object
+              apiserverConfig:
+                description: |-
+                  apiserverConfig allows specifying a host and auth methods to access the
+                  Kuberntees API server.
+                  If null, Prometheus is assumed to run inside of the cluster: it will
+                  discover the API servers automatically and use the Pod's CA certificate
+                  and bearer token file at /var/run/secrets/kubernetes.io/serviceaccount/.
+                properties:
+                  authorization:
+                    description: |-
+                      authorization section for the API server.
+
+                      Cannot be set at the same time as `basicAuth`, `bearerToken`, or
+                      `bearerTokenFile`.
+                    properties:
+                      credentials:
+                        description: credentials defines a key of a Secret in the
+                          namespace that contains the credentials for authentication.
+                        properties:
+                          key:
+                            description: The key of the secret to select from.  Must
+                              be a valid secret key.
+                            type: string
+                          name:
+                            default: ""
+                            description: |-
+                              Name of the referent.
+                              This field is effectively required, but due to backwards compatibility is
+                              allowed to be empty. Instances of this type with an empty value here are
+                              almost certainly wrong.
+                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                            type: string
+                          optional:
+                            description: Specify whether the Secret or its key must
+                              be defined
+                            type: boolean
+                        required:
+                        - key
+                        type: object
+                        x-kubernetes-map-type: atomic
+                      credentialsFile:
+                        description: credentialsFile defines the file to read a secret
+                          from, mutually exclusive with `credentials`.
+                        type: string
+                      type:
+                        description: |-
+                          type defines the authentication type. The value is case-insensitive.
+
+                          "Basic" is not a supported value.
+
+                          Default: "Bearer"
+                        type: string
+                    type: object
+                  basicAuth:
+                    description: |-
+                      basicAuth configuration for the API server.
+
+                      Cannot be set at the same time as `authorization`, `bearerToken`, or
+                      `bearerTokenFile`.
+                    properties:
+                      password:
+                        description: |-
+                          password defines a key of a Secret containing the password for
+                          authentication.
+                        properties:
+                          key:
+                            description: The key of the secret to select from.  Must
+                              be a valid secret key.
+                            type: string
+                          name:
+                            default: ""
+                            description: |-
+                              Name of the referent.
+                              This field is effectively required, but due to backwards compatibility is
+                              allowed to be empty. Instances of this type with an empty value here are
+                              almost certainly wrong.
+                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                            type: string
+                          optional:
+                            description: Specify whether the Secret or its key must
+                              be defined
+                            type: boolean
+                        required:
+                        - key
+                        type: object
+                        x-kubernetes-map-type: atomic
+                      username:
+                        description: |-
+                          username defines a key of a Secret containing the username for
+                          authentication.
+                        properties:
+                          key:
+                            description: The key of the secret to select from.  Must
+                              be a valid secret key.
+                            type: string
+                          name:
+                            default: ""
+                            description: |-
+                              Name of the referent.
+                              This field is effectively required, but due to backwards compatibility is
+                              allowed to be empty. Instances of this type with an empty value here are
+                              almost certainly wrong.
+                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                            type: string
+                          optional:
+                            description: Specify whether the Secret or its key must
+                              be defined
+                            type: boolean
+                        required:
+                        - key
+                        type: object
+                        x-kubernetes-map-type: atomic
+                    type: object
+                  bearerToken:
+                    description: |-
+                      bearerToken is deprecated: this will be removed in a future release.
+                       *Warning: this field shouldn't be used because the token value appears
+                      in clear-text. Prefer using `authorization`.*
+                    type: string
+                  bearerTokenFile:
+                    description: |-
+                      bearerTokenFile defines the file to read bearer token for accessing apiserver.
+
+                      Cannot be set at the same time as `basicAuth`, `authorization`, or `bearerToken`.
+
+                      Deprecated: this will be removed in a future release. Prefer using `authorization`.
+                    type: string
+                  host:
+                    description: |-
+                      host defines the Kubernetes API address consisting of a hostname or IP address followed
+                      by an optional port number.
+                    type: string
+                  noProxy:
+                    description: |-
+                      noProxy defines a comma-separated string that can contain IPs, CIDR notation, domain names
+                      that should be excluded from proxying. IP and domain names can
+                      contain port numbers.
+
+                      It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                    type: string
+                  proxyConnectHeader:
+                    additionalProperties:
+                      items:
+                        description: SecretKeySelector selects a key of a Secret.
+                        properties:
+                          key:
+                            description: The key of the secret to select from.  Must
+                              be a valid secret key.
+                            type: string
+                          name:
+                            default: ""
+                            description: |-
+                              Name of the referent.
+                              This field is effectively required, but due to backwards compatibility is
+                              allowed to be empty. Instances of this type with an empty value here are
+                              almost certainly wrong.
+                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                            type: string
+                          optional:
+                            description: Specify whether the Secret or its key must
+                              be defined
+                            type: boolean
+                        required:
+                        - key
+                        type: object
+                        x-kubernetes-map-type: atomic
+                      type: array
+                    description: |-
+                      proxyConnectHeader optionally specifies headers to send to
+                      proxies during CONNECT requests.
+
+                      It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                    type: object
+                    x-kubernetes-map-type: atomic
+                  proxyFromEnvironment:
+                    description: |-
+                      proxyFromEnvironment defines whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+
+                      It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                    type: boolean
+                  proxyUrl:
+                    description: proxyUrl defines the HTTP proxy server to use.
+                    pattern: ^(http|https|socks5)://.+$
+                    type: string
+                  tlsConfig:
+                    description: tlsConfig to use for the API server.
+                    properties:
+                      ca:
+                        description: ca defines the Certificate authority used when
+                          verifying server certificates.
+                        properties:
+                          configMap:
+                            description: configMap defines the ConfigMap containing
+                              data to use for the targets.
+                            properties:
+                              key:
+                                description: The key to select.
+                                type: string
+                              name:
+                                default: ""
+                                description: |-
+                                  Name of the referent.
+                                  This field is effectively required, but due to backwards compatibility is
+                                  allowed to be empty. Instances of this type with an empty value here are
+                                  almost certainly wrong.
+                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                type: string
+                              optional:
+                                description: Specify whether the ConfigMap or its
+                                  key must be defined
+                                type: boolean
+                            required:
+                            - key
+                            type: object
+                            x-kubernetes-map-type: atomic
+                          secret:
+                            description: secret defines the Secret containing data
+                              to use for the targets.
+                            properties:
+                              key:
+                                description: The key of the secret to select from.  Must
+                                  be a valid secret key.
+                                type: string
+                              name:
+                                default: ""
+                                description: |-
+                                  Name of the referent.
+                                  This field is effectively required, but due to backwards compatibility is
+                                  allowed to be empty. Instances of this type with an empty value here are
+                                  almost certainly wrong.
+                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                type: string
+                              optional:
+                                description: Specify whether the Secret or its key
+                                  must be defined
+                                type: boolean
+                            required:
+                            - key
+                            type: object
+                            x-kubernetes-map-type: atomic
+                        type: object
+                      caFile:
+                        description: caFile defines the path to the CA cert in the
+                          Prometheus container to use for the targets.
+                        type: string
+                      cert:
+                        description: cert defines the Client certificate to present
+                          when doing client-authentication.
+                        properties:
+                          configMap:
+                            description: configMap defines the ConfigMap containing
+                              data to use for the targets.
+                            properties:
+                              key:
+                                description: The key to select.
+                                type: string
+                              name:
+                                default: ""
+                                description: |-
+                                  Name of the referent.
+                                  This field is effectively required, but due to backwards compatibility is
+                                  allowed to be empty. Instances of this type with an empty value here are
+                                  almost certainly wrong.
+                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                type: string
+                              optional:
+                                description: Specify whether the ConfigMap or its
+                                  key must be defined
+                                type: boolean
+                            required:
+                            - key
+                            type: object
+                            x-kubernetes-map-type: atomic
+                          secret:
+                            description: secret defines the Secret containing data
+                              to use for the targets.
+                            properties:
+                              key:
+                                description: The key of the secret to select from.  Must
+                                  be a valid secret key.
+                                type: string
+                              name:
+                                default: ""
+                                description: |-
+                                  Name of the referent.
+                                  This field is effectively required, but due to backwards compatibility is
+                                  allowed to be empty. Instances of this type with an empty value here are
+                                  almost certainly wrong.
+                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                type: string
+                              optional:
+                                description: Specify whether the Secret or its key
+                                  must be defined
+                                type: boolean
+                            required:
+                            - key
+                            type: object
+                            x-kubernetes-map-type: atomic
+                        type: object
+                      certFile:
+                        description: certFile defines the path to the client cert
+                          file in the Prometheus container for the targets.
+                        type: string
+                      insecureSkipVerify:
+                        description: insecureSkipVerify defines how to disable target
+                          certificate validation.
+                        type: boolean
+                      keyFile:
+                        description: keyFile defines the path to the client key file
+                          in the Prometheus container for the targets.
+                        type: string
+                      keySecret:
+                        description: keySecret defines the Secret containing the client
+                          key file for the targets.
+                        properties:
+                          key:
+                            description: The key of the secret to select from.  Must
+                              be a valid secret key.
+                            type: string
+                          name:
+                            default: ""
+                            description: |-
+                              Name of the referent.
+                              This field is effectively required, but due to backwards compatibility is
+                              allowed to be empty. Instances of this type with an empty value here are
+                              almost certainly wrong.
+                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                            type: string
+                          optional:
+                            description: Specify whether the Secret or its key must
+                              be defined
+                            type: boolean
+                        required:
+                        - key
+                        type: object
+                        x-kubernetes-map-type: atomic
+                      maxVersion:
+                        description: |-
+                          maxVersion defines the maximum acceptable TLS version.
+
+                          It requires Prometheus >= v2.41.0 or Thanos >= v0.31.0.
+                        enum:
+                        - TLS10
+                        - TLS11
+                        - TLS12
+                        - TLS13
+                        type: string
+                      minVersion:
+                        description: |-
+                          minVersion defines the minimum acceptable TLS version.
+
+                          It requires Prometheus >= v2.35.0 or Thanos >= v0.28.0.
+                        enum:
+                        - TLS10
+                        - TLS11
+                        - TLS12
+                        - TLS13
+                        type: string
+                      serverName:
+                        description: serverName is used to verify the hostname for
+                          the targets.
+                        type: string
+                    type: object
+                required:
+                - host
+                type: object
+              arbitraryFSAccessThroughSMs:
+                description: |-
+                  arbitraryFSAccessThroughSMs when true, ServiceMonitor, PodMonitor and Probe object are forbidden to
+                  reference arbitrary files on the file system of the 'prometheus'
+                  container.
+                  When a ServiceMonitor's endpoint specifies a `bearerTokenFile` value
+                  (e.g.  '/var/run/secrets/kubernetes.io/serviceaccount/token'), a
+                  malicious target can get access to the Prometheus service account's
+                  token in the Prometheus' scrape request. Setting
+                  `spec.arbitraryFSAccessThroughSM` to 'true' would prevent the attack.
+                  Users should instead provide the credentials using the
+                  `spec.bearerTokenSecret` field.
+                properties:
+                  deny:
+                    description: |-
+                      deny prevents service monitors from accessing arbitrary files on the file system.
+                      When true, service monitors cannot use file-based configurations like BearerTokenFile
+                      that could potentially access sensitive files. When false (default), such access is allowed.
+                      Setting this to true enhances security by preventing potential credential theft attacks.
+                    type: boolean
+                type: object
+              automountServiceAccountToken:
+                description: |-
+                  automountServiceAccountToken defines whether a service account token should be automatically mounted in the pod.
+                  If the field isn't set, the operator mounts the service account token by default.
+
+                  **Warning:** be aware that by default, Prometheus requires the service account token for Kubernetes service discovery.
+                  It is possible to use strategic merge patch to project the service account token into the 'prometheus' container.
+                type: boolean
+              bodySizeLimit:
+                description: |-
+                  bodySizeLimit defines per-scrape on response body size.
+                  Only valid in Prometheus versions 2.45.0 and newer.
+
+                  Note that the global limit only applies to scrape objects that don't specify an explicit limit value.
+                  If you want to enforce a maximum limit for all scrape objects, refer to enforcedBodySizeLimit.
+                pattern: (^0|([0-9]*[.])?[0-9]+((K|M|G|T|E|P)i?)?B)$
+                type: string
+              configMaps:
+                description: |-
+                  configMaps defines a list of ConfigMaps in the same namespace as the Prometheus
+                  object, which shall be mounted into the Prometheus Pods.
+                  Each ConfigMap is added to the StatefulSet definition as a volume named `configmap-<configmap-name>`.
+                  The ConfigMaps are mounted into /etc/prometheus/configmaps/<configmap-name> in the 'prometheus' container.
+                items:
+                  type: string
+                type: array
+              containers:
+                description: |-
+                  containers allows injecting additional containers or modifying operator
+                  generated containers. This can be used to allow adding an authentication
+                  proxy to the Pods or to change the behavior of an operator generated
+                  container. Containers described here modify an operator generated
+                  container if they share the same name and modifications are done via a
+                  strategic merge patch.
+
+                  The names of containers managed by the operator are:
+                  * `prometheus`
+                  * `config-reloader`
+                  * `thanos-sidecar`
+
+                  Overriding containers is entirely outside the scope of what the
+                  maintainers will support and by doing so, you accept that this behaviour
+                  may break at any time without notice.
+                items:
+                  description: A single application container that you want to run
+                    within a pod.
+                  properties:
+                    args:
+                      description: |-
+                        Arguments to the entrypoint.
+                        The container image's CMD is used if this is not provided.
+                        Variable references $(VAR_NAME) are expanded using the container's environment. If a variable
+                        cannot be resolved, the reference in the input string will be unchanged. Double $$ are reduced
+                        to a single $, which allows for escaping the $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)" will
+                        produce the string literal "$(VAR_NAME)". Escaped references will never be expanded, regardless
+                        of whether the variable exists or not. Cannot be updated.
+                        More info: https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell
+                      items:
+                        type: string
+                      type: array
+                      x-kubernetes-list-type: atomic
+                    command:
+                      description: |-
+                        Entrypoint array. Not executed within a shell.
+                        The container image's ENTRYPOINT is used if this is not provided.
+                        Variable references $(VAR_NAME) are expanded using the container's environment. If a variable
+                        cannot be resolved, the reference in the input string will be unchanged. Double $$ are reduced
+                        to a single $, which allows for escaping the $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)" will
+                        produce the string literal "$(VAR_NAME)". Escaped references will never be expanded, regardless
+                        of whether the variable exists or not. Cannot be updated.
+                        More info: https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell
+                      items:
+                        type: string
+                      type: array
+                      x-kubernetes-list-type: atomic
+                    env:
+                      description: |-
+                        List of environment variables to set in the container.
+                        Cannot be updated.
+                      items:
+                        description: EnvVar represents an environment variable present
+                          in a Container.
+                        properties:
+                          name:
+                            description: |-
+                              Name of the environment variable.
+                              May consist of any printable ASCII characters except '='.
+                            type: string
+                          value:
+                            description: |-
+                              Variable references $(VAR_NAME) are expanded
+                              using the previously defined environment variables in the container and
+                              any service environment variables. If a variable cannot be resolved,
+                              the reference in the input string will be unchanged. Double $$ are reduced
+                              to a single $, which allows for escaping the $(VAR_NAME) syntax: i.e.
+                              "$$(VAR_NAME)" will produce the string literal "$(VAR_NAME)".
+                              Escaped references will never be expanded, regardless of whether the variable
+                              exists or not.
+                              Defaults to "".
+                            type: string
+                          valueFrom:
+                            description: Source for the environment variable's value.
+                              Cannot be used if value is not empty.
+                            properties:
+                              configMapKeyRef:
+                                description: Selects a key of a ConfigMap.
+                                properties:
+                                  key:
+                                    description: The key to select.
+                                    type: string
+                                  name:
+                                    default: ""
+                                    description: |-
+                                      Name of the referent.
+                                      This field is effectively required, but due to backwards compatibility is
+                                      allowed to be empty. Instances of this type with an empty value here are
+                                      almost certainly wrong.
+                                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                    type: string
+                                  optional:
+                                    description: Specify whether the ConfigMap or
+                                      its key must be defined
+                                    type: boolean
+                                required:
+                                - key
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              fieldRef:
+                                description: |-
+                                  Selects a field of the pod: supports metadata.name, metadata.namespace, `metadata.labels['<KEY>']`, `metadata.annotations['<KEY>']`,
+                                  spec.nodeName, spec.serviceAccountName, status.hostIP, status.podIP, status.podIPs.
+                                properties:
+                                  apiVersion:
+                                    description: Version of the schema the FieldPath
+                                      is written in terms of, defaults to "v1".
+                                    type: string
+                                  fieldPath:
+                                    description: Path of the field to select in the
+                                      specified API version.
+                                    type: string
+                                required:
+                                - fieldPath
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              fileKeyRef:
+                                description: |-
+                                  FileKeyRef selects a key of the env file.
+                                  Requires the EnvFiles feature gate to be enabled.
+                                properties:
+                                  key:
+                                    description: |-
+                                      The key within the env file. An invalid key will prevent the pod from starting.
+                                      The keys defined within a source may consist of any printable ASCII characters except '='.
+                                      During Alpha stage of the EnvFiles feature gate, the key size is limited to 128 characters.
+                                    type: string
+                                  optional:
+                                    default: false
+                                    description: |-
+                                      Specify whether the file or its key must be defined. If the file or key
+                                      does not exist, then the env var is not published.
+                                      If optional is set to true and the specified key does not exist,
+                                      the environment variable will not be set in the Pod's containers.
+
+                                      If optional is set to false and the specified key does not exist,
+                                      an error will be returned during Pod creation.
+                                    type: boolean
+                                  path:
+                                    description: |-
+                                      The path within the volume from which to select the file.
+                                      Must be relative and may not contain the '..' path or start with '..'.
+                                    type: string
+                                  volumeName:
+                                    description: The name of the volume mount containing
+                                      the env file.
+                                    type: string
+                                required:
+                                - key
+                                - path
+                                - volumeName
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              resourceFieldRef:
+                                description: |-
+                                  Selects a resource of the container: only resources limits and requests
+                                  (limits.cpu, limits.memory, limits.ephemeral-storage, requests.cpu, requests.memory and requests.ephemeral-storage) are currently supported.
+                                properties:
+                                  containerName:
+                                    description: 'Container name: required for volumes,
+                                      optional for env vars'
+                                    type: string
+                                  divisor:
+                                    anyOf:
+                                    - type: integer
+                                    - type: string
+                                    description: Specifies the output format of the
+                                      exposed resources, defaults to "1"
+                                    pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                    x-kubernetes-int-or-string: true
+                                  resource:
+                                    description: 'Required: resource to select'
+                                    type: string
+                                required:
+                                - resource
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              secretKeyRef:
+                                description: Selects a key of a secret in the pod's
+                                  namespace
+                                properties:
+                                  key:
+                                    description: The key of the secret to select from.  Must
+                                      be a valid secret key.
+                                    type: string
+                                  name:
+                                    default: ""
+                                    description: |-
+                                      Name of the referent.
+                                      This field is effectively required, but due to backwards compatibility is
+                                      allowed to be empty. Instances of this type with an empty value here are
+                                      almost certainly wrong.
+                                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                    type: string
+                                  optional:
+                                    description: Specify whether the Secret or its
+                                      key must be defined
+                                    type: boolean
+                                required:
+                                - key
+                                type: object
+                                x-kubernetes-map-type: atomic
+                            type: object
+                        required:
+                        - name
+                        type: object
+                      type: array
+                      x-kubernetes-list-map-keys:
+                      - name
+                      x-kubernetes-list-type: map
+                    envFrom:
+                      description: |-
+                        List of sources to populate environment variables in the container.
+                        The keys defined within a source may consist of any printable ASCII characters except '='.
+                        When a key exists in multiple
+                        sources, the value associated with the last source will take precedence.
+                        Values defined by an Env with a duplicate key will take precedence.
+                        Cannot be updated.
+                      items:
+                        description: EnvFromSource represents the source of a set
+                          of ConfigMaps or Secrets
+                        properties:
+                          configMapRef:
+                            description: The ConfigMap to select from
+                            properties:
+                              name:
+                                default: ""
+                                description: |-
+                                  Name of the referent.
+                                  This field is effectively required, but due to backwards compatibility is
+                                  allowed to be empty. Instances of this type with an empty value here are
+                                  almost certainly wrong.
+                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                type: string
+                              optional:
+                                description: Specify whether the ConfigMap must be
+                                  defined
+                                type: boolean
+                            type: object
+                            x-kubernetes-map-type: atomic
+                          prefix:
+                            description: |-
+                              Optional text to prepend to the name of each environment variable.
+                              May consist of any printable ASCII characters except '='.
+                            type: string
+                          secretRef:
+                            description: The Secret to select from
+                            properties:
+                              name:
+                                default: ""
+                                description: |-
+                                  Name of the referent.
+                                  This field is effectively required, but due to backwards compatibility is
+                                  allowed to be empty. Instances of this type with an empty value here are
+                                  almost certainly wrong.
+                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                type: string
+                              optional:
+                                description: Specify whether the Secret must be defined
+                                type: boolean
+                            type: object
+                            x-kubernetes-map-type: atomic
+                        type: object
+                      type: array
+                      x-kubernetes-list-type: atomic
+                    image:
+                      description: |-
+                        Container image name.
+                        More info: https://kubernetes.io/docs/concepts/containers/images
+                        This field is optional to allow higher level config management to default or override
+                        container images in workload controllers like Deployments and StatefulSets.
+                      type: string
+                    imagePullPolicy:
+                      description: |-
+                        Image pull policy.
+                        One of Always, Never, IfNotPresent.
+                        Defaults to Always if :latest tag is specified, or IfNotPresent otherwise.
+                        Cannot be updated.
+                        More info: https://kubernetes.io/docs/concepts/containers/images#updating-images
+                      type: string
+                    lifecycle:
+                      description: |-
+                        Actions that the management system should take in response to container lifecycle events.
+                        Cannot be updated.
+                      properties:
+                        postStart:
+                          description: |-
+                            PostStart is called immediately after a container is created. If the handler fails,
+                            the container is terminated and restarted according to its restart policy.
+                            Other management of the container blocks until the hook completes.
+                            More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
+                          properties:
+                            exec:
+                              description: Exec specifies a command to execute in
+                                the container.
+                              properties:
+                                command:
+                                  description: |-
+                                    Command is the command line to execute inside the container, the working directory for the
+                                    command  is root ('/') in the container's filesystem. The command is simply exec'd, it is
+                                    not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use
+                                    a shell, you need to explicitly call out to that shell.
+                                    Exit status of 0 is treated as live/healthy and non-zero is unhealthy.
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                              type: object
+                            httpGet:
+                              description: HTTPGet specifies an HTTP GET request to
+                                perform.
+                              properties:
+                                host:
+                                  description: |-
+                                    Host name to connect to, defaults to the pod IP. You probably want to set
+                                    "Host" in httpHeaders instead.
+                                  type: string
+                                httpHeaders:
+                                  description: Custom headers to set in the request.
+                                    HTTP allows repeated headers.
+                                  items:
+                                    description: HTTPHeader describes a custom header
+                                      to be used in HTTP probes
+                                    properties:
+                                      name:
+                                        description: |-
+                                          The header field name.
+                                          This will be canonicalized upon output, so case-variant names will be understood as the same header.
+                                        type: string
+                                      value:
+                                        description: The header field value
+                                        type: string
+                                    required:
+                                    - name
+                                    - value
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                path:
+                                  description: Path to access on the HTTP server.
+                                  type: string
+                                port:
+                                  anyOf:
+                                  - type: integer
+                                  - type: string
+                                  description: |-
+                                    Name or number of the port to access on the container.
+                                    Number must be in the range 1 to 65535.
+                                    Name must be an IANA_SVC_NAME.
+                                  x-kubernetes-int-or-string: true
+                                scheme:
+                                  description: |-
+                                    Scheme to use for connecting to the host.
+                                    Defaults to HTTP.
+                                  type: string
+                              required:
+                              - port
+                              type: object
+                            sleep:
+                              description: Sleep represents a duration that the container
+                                should sleep.
+                              properties:
+                                seconds:
+                                  description: Seconds is the number of seconds to
+                                    sleep.
+                                  format: int64
+                                  type: integer
+                              required:
+                              - seconds
+                              type: object
+                            tcpSocket:
+                              description: |-
+                                Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
+                                for backward compatibility. There is no validation of this field and
+                                lifecycle hooks will fail at runtime when it is specified.
+                              properties:
+                                host:
+                                  description: 'Optional: Host name to connect to,
+                                    defaults to the pod IP.'
+                                  type: string
+                                port:
+                                  anyOf:
+                                  - type: integer
+                                  - type: string
+                                  description: |-
+                                    Number or name of the port to access on the container.
+                                    Number must be in the range 1 to 65535.
+                                    Name must be an IANA_SVC_NAME.
+                                  x-kubernetes-int-or-string: true
+                              required:
+                              - port
+                              type: object
+                          type: object
+                        preStop:
+                          description: |-
+                            PreStop is called immediately before a container is terminated due to an
+                            API request or management event such as liveness/startup probe failure,
+                            preemption, resource contention, etc. The handler is not called if the
+                            container crashes or exits. The Pod's termination grace period countdown begins before the
+                            PreStop hook is executed. Regardless of the outcome of the handler, the
+                            container will eventually terminate within the Pod's termination grace
+                            period (unless delayed by finalizers). Other management of the container blocks until the hook completes
+                            or until the termination grace period is reached.
+                            More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
+                          properties:
+                            exec:
+                              description: Exec specifies a command to execute in
+                                the container.
+                              properties:
+                                command:
+                                  description: |-
+                                    Command is the command line to execute inside the container, the working directory for the
+                                    command  is root ('/') in the container's filesystem. The command is simply exec'd, it is
+                                    not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use
+                                    a shell, you need to explicitly call out to that shell.
+                                    Exit status of 0 is treated as live/healthy and non-zero is unhealthy.
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                              type: object
+                            httpGet:
+                              description: HTTPGet specifies an HTTP GET request to
+                                perform.
+                              properties:
+                                host:
+                                  description: |-
+                                    Host name to connect to, defaults to the pod IP. You probably want to set
+                                    "Host" in httpHeaders instead.
+                                  type: string
+                                httpHeaders:
+                                  description: Custom headers to set in the request.
+                                    HTTP allows repeated headers.
+                                  items:
+                                    description: HTTPHeader describes a custom header
+                                      to be used in HTTP probes
+                                    properties:
+                                      name:
+                                        description: |-
+                                          The header field name.
+                                          This will be canonicalized upon output, so case-variant names will be understood as the same header.
+                                        type: string
+                                      value:
+                                        description: The header field value
+                                        type: string
+                                    required:
+                                    - name
+                                    - value
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                path:
+                                  description: Path to access on the HTTP server.
+                                  type: string
+                                port:
+                                  anyOf:
+                                  - type: integer
+                                  - type: string
+                                  description: |-
+                                    Name or number of the port to access on the container.
+                                    Number must be in the range 1 to 65535.
+                                    Name must be an IANA_SVC_NAME.
+                                  x-kubernetes-int-or-string: true
+                                scheme:
+                                  description: |-
+                                    Scheme to use for connecting to the host.
+                                    Defaults to HTTP.
+                                  type: string
+                              required:
+                              - port
+                              type: object
+                            sleep:
+                              description: Sleep represents a duration that the container
+                                should sleep.
+                              properties:
+                                seconds:
+                                  description: Seconds is the number of seconds to
+                                    sleep.
+                                  format: int64
+                                  type: integer
+                              required:
+                              - seconds
+                              type: object
+                            tcpSocket:
+                              description: |-
+                                Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
+                                for backward compatibility. There is no validation of this field and
+                                lifecycle hooks will fail at runtime when it is specified.
+                              properties:
+                                host:
+                                  description: 'Optional: Host name to connect to,
+                                    defaults to the pod IP.'
+                                  type: string
+                                port:
+                                  anyOf:
+                                  - type: integer
+                                  - type: string
+                                  description: |-
+                                    Number or name of the port to access on the container.
+                                    Number must be in the range 1 to 65535.
+                                    Name must be an IANA_SVC_NAME.
+                                  x-kubernetes-int-or-string: true
+                              required:
+                              - port
+                              type: object
+                          type: object
+                        stopSignal:
+                          description: |-
+                            StopSignal defines which signal will be sent to a container when it is being stopped.
+                            If not specified, the default is defined by the container runtime in use.
+                            StopSignal can only be set for Pods with a non-empty .spec.os.name
+                          type: string
+                      type: object
+                    livenessProbe:
+                      description: |-
+                        Periodic probe of container liveness.
+                        Container will be restarted if the probe fails.
+                        Cannot be updated.
+                        More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                      properties:
+                        exec:
+                          description: Exec specifies a command to execute in the
+                            container.
+                          properties:
+                            command:
+                              description: |-
+                                Command is the command line to execute inside the container, the working directory for the
+                                command  is root ('/') in the container's filesystem. The command is simply exec'd, it is
+                                not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use
+                                a shell, you need to explicitly call out to that shell.
+                                Exit status of 0 is treated as live/healthy and non-zero is unhealthy.
+                              items:
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                          type: object
+                        failureThreshold:
+                          description: |-
+                            Minimum consecutive failures for the probe to be considered failed after having succeeded.
+                            Defaults to 3. Minimum value is 1.
+                          format: int32
+                          type: integer
+                        grpc:
+                          description: GRPC specifies a GRPC HealthCheckRequest.
+                          properties:
+                            port:
+                              description: Port number of the gRPC service. Number
+                                must be in the range 1 to 65535.
+                              format: int32
+                              type: integer
+                            service:
+                              default: ""
+                              description: |-
+                                Service is the name of the service to place in the gRPC HealthCheckRequest
+                                (see https://github.com/grpc/grpc/blob/master/doc/health-checking.md).
+
+                                If this is not specified, the default behavior is defined by gRPC.
+                              type: string
+                          required:
+                          - port
+                          type: object
+                        httpGet:
+                          description: HTTPGet specifies an HTTP GET request to perform.
+                          properties:
+                            host:
+                              description: |-
+                                Host name to connect to, defaults to the pod IP. You probably want to set
+                                "Host" in httpHeaders instead.
+                              type: string
+                            httpHeaders:
+                              description: Custom headers to set in the request. HTTP
+                                allows repeated headers.
+                              items:
+                                description: HTTPHeader describes a custom header
+                                  to be used in HTTP probes
+                                properties:
+                                  name:
+                                    description: |-
+                                      The header field name.
+                                      This will be canonicalized upon output, so case-variant names will be understood as the same header.
+                                    type: string
+                                  value:
+                                    description: The header field value
+                                    type: string
+                                required:
+                                - name
+                                - value
+                                type: object
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            path:
+                              description: Path to access on the HTTP server.
+                              type: string
+                            port:
+                              anyOf:
+                              - type: integer
+                              - type: string
+                              description: |-
+                                Name or number of the port to access on the container.
+                                Number must be in the range 1 to 65535.
+                                Name must be an IANA_SVC_NAME.
+                              x-kubernetes-int-or-string: true
+                            scheme:
+                              description: |-
+                                Scheme to use for connecting to the host.
+                                Defaults to HTTP.
+                              type: string
+                          required:
+                          - port
+                          type: object
+                        initialDelaySeconds:
+                          description: |-
+                            Number of seconds after the container has started before liveness probes are initiated.
+                            More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                          format: int32
+                          type: integer
+                        periodSeconds:
+                          description: |-
+                            How often (in seconds) to perform the probe.
+                            Default to 10 seconds. Minimum value is 1.
+                          format: int32
+                          type: integer
+                        successThreshold:
+                          description: |-
+                            Minimum consecutive successes for the probe to be considered successful after having failed.
+                            Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
+                          format: int32
+                          type: integer
+                        tcpSocket:
+                          description: TCPSocket specifies a connection to a TCP port.
+                          properties:
+                            host:
+                              description: 'Optional: Host name to connect to, defaults
+                                to the pod IP.'
+                              type: string
+                            port:
+                              anyOf:
+                              - type: integer
+                              - type: string
+                              description: |-
+                                Number or name of the port to access on the container.
+                                Number must be in the range 1 to 65535.
+                                Name must be an IANA_SVC_NAME.
+                              x-kubernetes-int-or-string: true
+                          required:
+                          - port
+                          type: object
+                        terminationGracePeriodSeconds:
+                          description: |-
+                            Optional duration in seconds the pod needs to terminate gracefully upon probe failure.
+                            The grace period is the duration in seconds after the processes running in the pod are sent
+                            a termination signal and the time when the processes are forcibly halted with a kill signal.
+                            Set this value longer than the expected cleanup time for your process.
+                            If this value is nil, the pod's terminationGracePeriodSeconds will be used. Otherwise, this
+                            value overrides the value provided by the pod spec.
+                            Value must be non-negative integer. The value zero indicates stop immediately via
+                            the kill signal (no opportunity to shut down).
+                            This is a beta field and requires enabling ProbeTerminationGracePeriod feature gate.
+                            Minimum value is 1. spec.terminationGracePeriodSeconds is used if unset.
+                          format: int64
+                          type: integer
+                        timeoutSeconds:
+                          description: |-
+                            Number of seconds after which the probe times out.
+                            Defaults to 1 second. Minimum value is 1.
+                            More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                          format: int32
+                          type: integer
+                      type: object
+                    name:
+                      description: |-
+                        Name of the container specified as a DNS_LABEL.
+                        Each container in a pod must have a unique name (DNS_LABEL).
+                        Cannot be updated.
+                      type: string
+                    ports:
+                      description: |-
+                        List of ports to expose from the container. Not specifying a port here
+                        DOES NOT prevent that port from being exposed. Any port which is
+                        listening on the default "0.0.0.0" address inside a container will be
+                        accessible from the network.
+                        Modifying this array with strategic merge patch may corrupt the data.
+                        For more information See https://github.com/kubernetes/kubernetes/issues/108255.
+                        Cannot be updated.
+                      items:
+                        description: ContainerPort represents a network port in a
+                          single container.
+                        properties:
+                          containerPort:
+                            description: |-
+                              Number of port to expose on the pod's IP address.
+                              This must be a valid port number, 0 < x < 65536.
+                            format: int32
+                            type: integer
+                          hostIP:
+                            description: What host IP to bind the external port to.
+                            type: string
+                          hostPort:
+                            description: |-
+                              Number of port to expose on the host.
+                              If specified, this must be a valid port number, 0 < x < 65536.
+                              If HostNetwork is specified, this must match ContainerPort.
+                              Most containers do not need this.
+                            format: int32
+                            type: integer
+                          name:
+                            description: |-
+                              If specified, this must be an IANA_SVC_NAME and unique within the pod. Each
+                              named port in a pod must have a unique name. Name for the port that can be
+                              referred to by services.
+                            type: string
+                          protocol:
+                            default: TCP
+                            description: |-
+                              Protocol for port. Must be UDP, TCP, or SCTP.
+                              Defaults to "TCP".
+                            type: string
+                        required:
+                        - containerPort
+                        type: object
+                      type: array
+                      x-kubernetes-list-map-keys:
+                      - containerPort
+                      - protocol
+                      x-kubernetes-list-type: map
+                    readinessProbe:
+                      description: |-
+                        Periodic probe of container service readiness.
+                        Container will be removed from service endpoints if the probe fails.
+                        Cannot be updated.
+                        More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                      properties:
+                        exec:
+                          description: Exec specifies a command to execute in the
+                            container.
+                          properties:
+                            command:
+                              description: |-
+                                Command is the command line to execute inside the container, the working directory for the
+                                command  is root ('/') in the container's filesystem. The command is simply exec'd, it is
+                                not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use
+                                a shell, you need to explicitly call out to that shell.
+                                Exit status of 0 is treated as live/healthy and non-zero is unhealthy.
+                              items:
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                          type: object
+                        failureThreshold:
+                          description: |-
+                            Minimum consecutive failures for the probe to be considered failed after having succeeded.
+                            Defaults to 3. Minimum value is 1.
+                          format: int32
+                          type: integer
+                        grpc:
+                          description: GRPC specifies a GRPC HealthCheckRequest.
+                          properties:
+                            port:
+                              description: Port number of the gRPC service. Number
+                                must be in the range 1 to 65535.
+                              format: int32
+                              type: integer
+                            service:
+                              default: ""
+                              description: |-
+                                Service is the name of the service to place in the gRPC HealthCheckRequest
+                                (see https://github.com/grpc/grpc/blob/master/doc/health-checking.md).
+
+                                If this is not specified, the default behavior is defined by gRPC.
+                              type: string
+                          required:
+                          - port
+                          type: object
+                        httpGet:
+                          description: HTTPGet specifies an HTTP GET request to perform.
+                          properties:
+                            host:
+                              description: |-
+                                Host name to connect to, defaults to the pod IP. You probably want to set
+                                "Host" in httpHeaders instead.
+                              type: string
+                            httpHeaders:
+                              description: Custom headers to set in the request. HTTP
+                                allows repeated headers.
+                              items:
+                                description: HTTPHeader describes a custom header
+                                  to be used in HTTP probes
+                                properties:
+                                  name:
+                                    description: |-
+                                      The header field name.
+                                      This will be canonicalized upon output, so case-variant names will be understood as the same header.
+                                    type: string
+                                  value:
+                                    description: The header field value
+                                    type: string
+                                required:
+                                - name
+                                - value
+                                type: object
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            path:
+                              description: Path to access on the HTTP server.
+                              type: string
+                            port:
+                              anyOf:
+                              - type: integer
+                              - type: string
+                              description: |-
+                                Name or number of the port to access on the container.
+                                Number must be in the range 1 to 65535.
+                                Name must be an IANA_SVC_NAME.
+                              x-kubernetes-int-or-string: true
+                            scheme:
+                              description: |-
+                                Scheme to use for connecting to the host.
+                                Defaults to HTTP.
+                              type: string
+                          required:
+                          - port
+                          type: object
+                        initialDelaySeconds:
+                          description: |-
+                            Number of seconds after the container has started before liveness probes are initiated.
+                            More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                          format: int32
+                          type: integer
+                        periodSeconds:
+                          description: |-
+                            How often (in seconds) to perform the probe.
+                            Default to 10 seconds. Minimum value is 1.
+                          format: int32
+                          type: integer
+                        successThreshold:
+                          description: |-
+                            Minimum consecutive successes for the probe to be considered successful after having failed.
+                            Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
+                          format: int32
+                          type: integer
+                        tcpSocket:
+                          description: TCPSocket specifies a connection to a TCP port.
+                          properties:
+                            host:
+                              description: 'Optional: Host name to connect to, defaults
+                                to the pod IP.'
+                              type: string
+                            port:
+                              anyOf:
+                              - type: integer
+                              - type: string
+                              description: |-
+                                Number or name of the port to access on the container.
+                                Number must be in the range 1 to 65535.
+                                Name must be an IANA_SVC_NAME.
+                              x-kubernetes-int-or-string: true
+                          required:
+                          - port
+                          type: object
+                        terminationGracePeriodSeconds:
+                          description: |-
+                            Optional duration in seconds the pod needs to terminate gracefully upon probe failure.
+                            The grace period is the duration in seconds after the processes running in the pod are sent
+                            a termination signal and the time when the processes are forcibly halted with a kill signal.
+                            Set this value longer than the expected cleanup time for your process.
+                            If this value is nil, the pod's terminationGracePeriodSeconds will be used. Otherwise, this
+                            value overrides the value provided by the pod spec.
+                            Value must be non-negative integer. The value zero indicates stop immediately via
+                            the kill signal (no opportunity to shut down).
+                            This is a beta field and requires enabling ProbeTerminationGracePeriod feature gate.
+                            Minimum value is 1. spec.terminationGracePeriodSeconds is used if unset.
+                          format: int64
+                          type: integer
+                        timeoutSeconds:
+                          description: |-
+                            Number of seconds after which the probe times out.
+                            Defaults to 1 second. Minimum value is 1.
+                            More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                          format: int32
+                          type: integer
+                      type: object
+                    resizePolicy:
+                      description: Resources resize policy for the container.
+                      items:
+                        description: ContainerResizePolicy represents resource resize
+                          policy for the container.
+                        properties:
+                          resourceName:
+                            description: |-
+                              Name of the resource to which this resource resize policy applies.
+                              Supported values: cpu, memory.
+                            type: string
+                          restartPolicy:
+                            description: |-
+                              Restart policy to apply when specified resource is resized.
+                              If not specified, it defaults to NotRequired.
+                            type: string
+                        required:
+                        - resourceName
+                        - restartPolicy
+                        type: object
+                      type: array
+                      x-kubernetes-list-type: atomic
+                    resources:
+                      description: |-
+                        Compute Resources required by this container.
+                        Cannot be updated.
+                        More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+                      properties:
+                        claims:
+                          description: |-
+                            Claims lists the names of resources, defined in spec.resourceClaims,
+                            that are used by this container.
+
+                            This field depends on the
+                            DynamicResourceAllocation feature gate.
+
+                            This field is immutable. It can only be set for containers.
+                          items:
+                            description: ResourceClaim references one entry in PodSpec.ResourceClaims.
+                            properties:
+                              name:
+                                description: |-
+                                  Name must match the name of one entry in pod.spec.resourceClaims of
+                                  the Pod where this field is used. It makes that resource available
+                                  inside a container.
+                                type: string
+                              request:
+                                description: |-
+                                  Request is the name chosen for a request in the referenced claim.
+                                  If empty, everything from the claim is made available, otherwise
+                                  only the result of this request.
+                                type: string
+                            required:
+                            - name
+                            type: object
+                          type: array
+                          x-kubernetes-list-map-keys:
+                          - name
+                          x-kubernetes-list-type: map
+                        limits:
+                          additionalProperties:
+                            anyOf:
+                            - type: integer
+                            - type: string
+                            pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                            x-kubernetes-int-or-string: true
+                          description: |-
+                            Limits describes the maximum amount of compute resources allowed.
+                            More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+                          type: object
+                        requests:
+                          additionalProperties:
+                            anyOf:
+                            - type: integer
+                            - type: string
+                            pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                            x-kubernetes-int-or-string: true
+                          description: |-
+                            Requests describes the minimum amount of compute resources required.
+                            If Requests is omitted for a container, it defaults to Limits if that is explicitly specified,
+                            otherwise to an implementation-defined value. Requests cannot exceed Limits.
+                            More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+                          type: object
+                      type: object
+                    restartPolicy:
+                      description: |-
+                        RestartPolicy defines the restart behavior of individual containers in a pod.
+                        This overrides the pod-level restart policy. When this field is not specified,
+                        the restart behavior is defined by the Pod's restart policy and the container type.
+                        Additionally, setting the RestartPolicy as "Always" for the init container will
+                        have the following effect:
+                        this init container will be continually restarted on
+                        exit until all regular containers have terminated. Once all regular
+                        containers have completed, all init containers with restartPolicy "Always"
+                        will be shut down. This lifecycle differs from normal init containers and
+                        is often referred to as a "sidecar" container. Although this init
+                        container still starts in the init container sequence, it does not wait
+                        for the container to complete before proceeding to the next init
+                        container. Instead, the next init container starts immediately after this
+                        init container is started, or after any startupProbe has successfully
+                        completed.
+                      type: string
+                    restartPolicyRules:
+                      description: |-
+                        Represents a list of rules to be checked to determine if the
+                        container should be restarted on exit. The rules are evaluated in
+                        order. Once a rule matches a container exit condition, the remaining
+                        rules are ignored. If no rule matches the container exit condition,
+                        the Container-level restart policy determines the whether the container
+                        is restarted or not. Constraints on the rules:
+                        - At most 20 rules are allowed.
+                        - Rules can have the same action.
+                        - Identical rules are not forbidden in validations.
+                        When rules are specified, container MUST set RestartPolicy explicitly
+                        even it if matches the Pod's RestartPolicy.
+                      items:
+                        description: ContainerRestartRule describes how a container
+                          exit is handled.
+                        properties:
+                          action:
+                            description: |-
+                              Specifies the action taken on a container exit if the requirements
+                              are satisfied. The only possible value is "Restart" to restart the
+                              container.
+                            type: string
+                          exitCodes:
+                            description: Represents the exit codes to check on container
+                              exits.
+                            properties:
+                              operator:
+                                description: |-
+                                  Represents the relationship between the container exit code(s) and the
+                                  specified values. Possible values are:
+                                  - In: the requirement is satisfied if the container exit code is in the
+                                    set of specified values.
+                                  - NotIn: the requirement is satisfied if the container exit code is
+                                    not in the set of specified values.
+                                type: string
+                              values:
+                                description: |-
+                                  Specifies the set of values to check for container exit codes.
+                                  At most 255 elements are allowed.
+                                items:
+                                  format: int32
+                                  type: integer
+                                type: array
+                                x-kubernetes-list-type: set
+                            required:
+                            - operator
+                            type: object
+                        required:
+                        - action
+                        type: object
+                      type: array
+                      x-kubernetes-list-type: atomic
+                    securityContext:
+                      description: |-
+                        SecurityContext defines the security options the container should be run with.
+                        If set, the fields of SecurityContext override the equivalent fields of PodSecurityContext.
+                        More info: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/
+                      properties:
+                        allowPrivilegeEscalation:
+                          description: |-
+                            AllowPrivilegeEscalation controls whether a process can gain more
+                            privileges than its parent process. This bool directly controls if
+                            the no_new_privs flag will be set on the container process.
+                            AllowPrivilegeEscalation is true always when the container is:
+                            1) run as Privileged
+                            2) has CAP_SYS_ADMIN
+                            Note that this field cannot be set when spec.os.name is windows.
+                          type: boolean
+                        appArmorProfile:
+                          description: |-
+                            appArmorProfile is the AppArmor options to use by this container. If set, this profile
+                            overrides the pod's appArmorProfile.
+                            Note that this field cannot be set when spec.os.name is windows.
+                          properties:
+                            localhostProfile:
+                              description: |-
+                                localhostProfile indicates a profile loaded on the node that should be used.
+                                The profile must be preconfigured on the node to work.
+                                Must match the loaded name of the profile.
+                                Must be set if and only if type is "Localhost".
+                              type: string
+                            type:
+                              description: |-
+                                type indicates which kind of AppArmor profile will be applied.
+                                Valid options are:
+                                  Localhost - a profile pre-loaded on the node.
+                                  RuntimeDefault - the container runtime's default profile.
+                                  Unconfined - no AppArmor enforcement.
+                              type: string
+                          required:
+                          - type
+                          type: object
+                        capabilities:
+                          description: |-
+                            The capabilities to add/drop when running containers.
+                            Defaults to the default set of capabilities granted by the container runtime.
+                            Note that this field cannot be set when spec.os.name is windows.
+                          properties:
+                            add:
+                              description: Added capabilities
+                              items:
+                                description: Capability represent POSIX capabilities
+                                  type
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            drop:
+                              description: Removed capabilities
+                              items:
+                                description: Capability represent POSIX capabilities
+                                  type
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                          type: object
+                        privileged:
+                          description: |-
+                            Run container in privileged mode.
+                            Processes in privileged containers are essentially equivalent to root on the host.
+                            Defaults to false.
+                            Note that this field cannot be set when spec.os.name is windows.
+                          type: boolean
+                        procMount:
+                          description: |-
+                            procMount denotes the type of proc mount to use for the containers.
+                            The default value is Default which uses the container runtime defaults for
+                            readonly paths and masked paths.
+                            This requires the ProcMountType feature flag to be enabled.
+                            Note that this field cannot be set when spec.os.name is windows.
+                          type: string
+                        readOnlyRootFilesystem:
+                          description: |-
+                            Whether this container has a read-only root filesystem.
+                            Default is false.
+                            Note that this field cannot be set when spec.os.name is windows.
+                          type: boolean
+                        runAsGroup:
+                          description: |-
+                            The GID to run the entrypoint of the container process.
+                            Uses runtime default if unset.
+                            May also be set in PodSecurityContext.  If set in both SecurityContext and
+                            PodSecurityContext, the value specified in SecurityContext takes precedence.
+                            Note that this field cannot be set when spec.os.name is windows.
+                          format: int64
+                          type: integer
+                        runAsNonRoot:
+                          description: |-
+                            Indicates that the container must run as a non-root user.
+                            If true, the Kubelet will validate the image at runtime to ensure that it
+                            does not run as UID 0 (root) and fail to start the container if it does.
+                            If unset or false, no such validation will be performed.
+                            May also be set in PodSecurityContext.  If set in both SecurityContext and
+                            PodSecurityContext, the value specified in SecurityContext takes precedence.
+                          type: boolean
+                        runAsUser:
+                          description: |-
+                            The UID to run the entrypoint of the container process.
+                            Defaults to user specified in image metadata if unspecified.
+                            May also be set in PodSecurityContext.  If set in both SecurityContext and
+                            PodSecurityContext, the value specified in SecurityContext takes precedence.
+                            Note that this field cannot be set when spec.os.name is windows.
+                          format: int64
+                          type: integer
+                        seLinuxOptions:
+                          description: |-
+                            The SELinux context to be applied to the container.
+                            If unspecified, the container runtime will allocate a random SELinux context for each
+                            container.  May also be set in PodSecurityContext.  If set in both SecurityContext and
+                            PodSecurityContext, the value specified in SecurityContext takes precedence.
+                            Note that this field cannot be set when spec.os.name is windows.
+                          properties:
+                            level:
+                              description: Level is SELinux level label that applies
+                                to the container.
+                              type: string
+                            role:
+                              description: Role is a SELinux role label that applies
+                                to the container.
+                              type: string
+                            type:
+                              description: Type is a SELinux type label that applies
+                                to the container.
+                              type: string
+                            user:
+                              description: User is a SELinux user label that applies
+                                to the container.
+                              type: string
+                          type: object
+                        seccompProfile:
+                          description: |-
+                            The seccomp options to use by this container. If seccomp options are
+                            provided at both the pod & container level, the container options
+                            override the pod options.
+                            Note that this field cannot be set when spec.os.name is windows.
+                          properties:
+                            localhostProfile:
+                              description: |-
+                                localhostProfile indicates a profile defined in a file on the node should be used.
+                                The profile must be preconfigured on the node to work.
+                                Must be a descending path, relative to the kubelet's configured seccomp profile location.
+                                Must be set if type is "Localhost". Must NOT be set for any other type.
+                              type: string
+                            type:
+                              description: |-
+                                type indicates which kind of seccomp profile will be applied.
+                                Valid options are:
+
+                                Localhost - a profile defined in a file on the node should be used.
+                                RuntimeDefault - the container runtime default profile should be used.
+                                Unconfined - no profile should be applied.
+                              type: string
+                          required:
+                          - type
+                          type: object
+                        windowsOptions:
+                          description: |-
+                            The Windows specific settings applied to all containers.
+                            If unspecified, the options from the PodSecurityContext will be used.
+                            If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence.
+                            Note that this field cannot be set when spec.os.name is linux.
+                          properties:
+                            gmsaCredentialSpec:
+                              description: |-
+                                GMSACredentialSpec is where the GMSA admission webhook
+                                (https://github.com/kubernetes-sigs/windows-gmsa) inlines the contents of the
+                                GMSA credential spec named by the GMSACredentialSpecName field.
+                              type: string
+                            gmsaCredentialSpecName:
+                              description: GMSACredentialSpecName is the name of the
+                                GMSA credential spec to use.
+                              type: string
+                            hostProcess:
+                              description: |-
+                                HostProcess determines if a container should be run as a 'Host Process' container.
+                                All of a Pod's containers must have the same effective HostProcess value
+                                (it is not allowed to have a mix of HostProcess containers and non-HostProcess containers).
+                                In addition, if HostProcess is true then HostNetwork must also be set to true.
+                              type: boolean
+                            runAsUserName:
+                              description: |-
+                                The UserName in Windows to run the entrypoint of the container process.
+                                Defaults to the user specified in image metadata if unspecified.
+                                May also be set in PodSecurityContext. If set in both SecurityContext and
+                                PodSecurityContext, the value specified in SecurityContext takes precedence.
+                              type: string
+                          type: object
+                      type: object
+                    startupProbe:
+                      description: |-
+                        StartupProbe indicates that the Pod has successfully initialized.
+                        If specified, no other probes are executed until this completes successfully.
+                        If this probe fails, the Pod will be restarted, just as if the livenessProbe failed.
+                        This can be used to provide different probe parameters at the beginning of a Pod's lifecycle,
+                        when it might take a long time to load data or warm a cache, than during steady-state operation.
+                        This cannot be updated.
+                        More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                      properties:
+                        exec:
+                          description: Exec specifies a command to execute in the
+                            container.
+                          properties:
+                            command:
+                              description: |-
+                                Command is the command line to execute inside the container, the working directory for the
+                                command  is root ('/') in the container's filesystem. The command is simply exec'd, it is
+                                not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use
+                                a shell, you need to explicitly call out to that shell.
+                                Exit status of 0 is treated as live/healthy and non-zero is unhealthy.
+                              items:
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                          type: object
+                        failureThreshold:
+                          description: |-
+                            Minimum consecutive failures for the probe to be considered failed after having succeeded.
+                            Defaults to 3. Minimum value is 1.
+                          format: int32
+                          type: integer
+                        grpc:
+                          description: GRPC specifies a GRPC HealthCheckRequest.
+                          properties:
+                            port:
+                              description: Port number of the gRPC service. Number
+                                must be in the range 1 to 65535.
+                              format: int32
+                              type: integer
+                            service:
+                              default: ""
+                              description: |-
+                                Service is the name of the service to place in the gRPC HealthCheckRequest
+                                (see https://github.com/grpc/grpc/blob/master/doc/health-checking.md).
+
+                                If this is not specified, the default behavior is defined by gRPC.
+                              type: string
+                          required:
+                          - port
+                          type: object
+                        httpGet:
+                          description: HTTPGet specifies an HTTP GET request to perform.
+                          properties:
+                            host:
+                              description: |-
+                                Host name to connect to, defaults to the pod IP. You probably want to set
+                                "Host" in httpHeaders instead.
+                              type: string
+                            httpHeaders:
+                              description: Custom headers to set in the request. HTTP
+                                allows repeated headers.
+                              items:
+                                description: HTTPHeader describes a custom header
+                                  to be used in HTTP probes
+                                properties:
+                                  name:
+                                    description: |-
+                                      The header field name.
+                                      This will be canonicalized upon output, so case-variant names will be understood as the same header.
+                                    type: string
+                                  value:
+                                    description: The header field value
+                                    type: string
+                                required:
+                                - name
+                                - value
+                                type: object
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            path:
+                              description: Path to access on the HTTP server.
+                              type: string
+                            port:
+                              anyOf:
+                              - type: integer
+                              - type: string
+                              description: |-
+                                Name or number of the port to access on the container.
+                                Number must be in the range 1 to 65535.
+                                Name must be an IANA_SVC_NAME.
+                              x-kubernetes-int-or-string: true
+                            scheme:
+                              description: |-
+                                Scheme to use for connecting to the host.
+                                Defaults to HTTP.
+                              type: string
+                          required:
+                          - port
+                          type: object
+                        initialDelaySeconds:
+                          description: |-
+                            Number of seconds after the container has started before liveness probes are initiated.
+                            More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                          format: int32
+                          type: integer
+                        periodSeconds:
+                          description: |-
+                            How often (in seconds) to perform the probe.
+                            Default to 10 seconds. Minimum value is 1.
+                          format: int32
+                          type: integer
+                        successThreshold:
+                          description: |-
+                            Minimum consecutive successes for the probe to be considered successful after having failed.
+                            Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
+                          format: int32
+                          type: integer
+                        tcpSocket:
+                          description: TCPSocket specifies a connection to a TCP port.
+                          properties:
+                            host:
+                              description: 'Optional: Host name to connect to, defaults
+                                to the pod IP.'
+                              type: string
+                            port:
+                              anyOf:
+                              - type: integer
+                              - type: string
+                              description: |-
+                                Number or name of the port to access on the container.
+                                Number must be in the range 1 to 65535.
+                                Name must be an IANA_SVC_NAME.
+                              x-kubernetes-int-or-string: true
+                          required:
+                          - port
+                          type: object
+                        terminationGracePeriodSeconds:
+                          description: |-
+                            Optional duration in seconds the pod needs to terminate gracefully upon probe failure.
+                            The grace period is the duration in seconds after the processes running in the pod are sent
+                            a termination signal and the time when the processes are forcibly halted with a kill signal.
+                            Set this value longer than the expected cleanup time for your process.
+                            If this value is nil, the pod's terminationGracePeriodSeconds will be used. Otherwise, this
+                            value overrides the value provided by the pod spec.
+                            Value must be non-negative integer. The value zero indicates stop immediately via
+                            the kill signal (no opportunity to shut down).
+                            This is a beta field and requires enabling ProbeTerminationGracePeriod feature gate.
+                            Minimum value is 1. spec.terminationGracePeriodSeconds is used if unset.
+                          format: int64
+                          type: integer
+                        timeoutSeconds:
+                          description: |-
+                            Number of seconds after which the probe times out.
+                            Defaults to 1 second. Minimum value is 1.
+                            More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                          format: int32
+                          type: integer
+                      type: object
+                    stdin:
+                      description: |-
+                        Whether this container should allocate a buffer for stdin in the container runtime. If this
+                        is not set, reads from stdin in the container will always result in EOF.
+                        Default is false.
+                      type: boolean
+                    stdinOnce:
+                      description: |-
+                        Whether the container runtime should close the stdin channel after it has been opened by
+                        a single attach. When stdin is true the stdin stream will remain open across multiple attach
+                        sessions. If stdinOnce is set to true, stdin is opened on container start, is empty until the
+                        first client attaches to stdin, and then remains open and accepts data until the client disconnects,
+                        at which time stdin is closed and remains closed until the container is restarted. If this
+                        flag is false, a container processes that reads from stdin will never receive an EOF.
+                        Default is false
+                      type: boolean
+                    terminationMessagePath:
+                      description: |-
+                        Optional: Path at which the file to which the container's termination message
+                        will be written is mounted into the container's filesystem.
+                        Message written is intended to be brief final status, such as an assertion failure message.
+                        Will be truncated by the node if greater than 4096 bytes. The total message length across
+                        all containers will be limited to 12kb.
+                        Defaults to /dev/termination-log.
+                        Cannot be updated.
+                      type: string
+                    terminationMessagePolicy:
+                      description: |-
+                        Indicate how the termination message should be populated. File will use the contents of
+                        terminationMessagePath to populate the container status message on both success and failure.
+                        FallbackToLogsOnError will use the last chunk of container log output if the termination
+                        message file is empty and the container exited with an error.
+                        The log output is limited to 2048 bytes or 80 lines, whichever is smaller.
+                        Defaults to File.
+                        Cannot be updated.
+                      type: string
+                    tty:
+                      description: |-
+                        Whether this container should allocate a TTY for itself, also requires 'stdin' to be true.
+                        Default is false.
+                      type: boolean
+                    volumeDevices:
+                      description: volumeDevices is the list of block devices to be
+                        used by the container.
+                      items:
+                        description: volumeDevice describes a mapping of a raw block
+                          device within a container.
+                        properties:
+                          devicePath:
+                            description: devicePath is the path inside of the container
+                              that the device will be mapped to.
+                            type: string
+                          name:
+                            description: name must match the name of a persistentVolumeClaim
+                              in the pod
+                            type: string
+                        required:
+                        - devicePath
+                        - name
+                        type: object
+                      type: array
+                      x-kubernetes-list-map-keys:
+                      - devicePath
+                      x-kubernetes-list-type: map
+                    volumeMounts:
+                      description: |-
+                        Pod volumes to mount into the container's filesystem.
+                        Cannot be updated.
+                      items:
+                        description: VolumeMount describes a mounting of a Volume
+                          within a container.
+                        properties:
+                          mountPath:
+                            description: |-
+                              Path within the container at which the volume should be mounted.  Must
+                              not contain ':'.
+                            type: string
+                          mountPropagation:
+                            description: |-
+                              mountPropagation determines how mounts are propagated from the host
+                              to container and the other way around.
+                              When not set, MountPropagationNone is used.
+                              This field is beta in 1.10.
+                              When RecursiveReadOnly is set to IfPossible or to Enabled, MountPropagation must be None or unspecified
+                              (which defaults to None).
+                            type: string
+                          name:
+                            description: This must match the Name of a Volume.
+                            type: string
+                          readOnly:
+                            description: |-
+                              Mounted read-only if true, read-write otherwise (false or unspecified).
+                              Defaults to false.
+                            type: boolean
+                          recursiveReadOnly:
+                            description: |-
+                              RecursiveReadOnly specifies whether read-only mounts should be handled
+                              recursively.
+
+                              If ReadOnly is false, this field has no meaning and must be unspecified.
+
+                              If ReadOnly is true, and this field is set to Disabled, the mount is not made
+                              recursively read-only.  If this field is set to IfPossible, the mount is made
+                              recursively read-only, if it is supported by the container runtime.  If this
+                              field is set to Enabled, the mount is made recursively read-only if it is
+                              supported by the container runtime, otherwise the pod will not be started and
+                              an error will be generated to indicate the reason.
+
+                              If this field is set to IfPossible or Enabled, MountPropagation must be set to
+                              None (or be unspecified, which defaults to None).
+
+                              If this field is not specified, it is treated as an equivalent of Disabled.
+                            type: string
+                          subPath:
+                            description: |-
+                              Path within the volume from which the container's volume should be mounted.
+                              Defaults to "" (volume's root).
+                            type: string
+                          subPathExpr:
+                            description: |-
+                              Expanded path within the volume from which the container's volume should be mounted.
+                              Behaves similarly to SubPath but environment variable references $(VAR_NAME) are expanded using the container's environment.
+                              Defaults to "" (volume's root).
+                              SubPathExpr and SubPath are mutually exclusive.
+                            type: string
+                        required:
+                        - mountPath
+                        - name
+                        type: object
+                      type: array
+                      x-kubernetes-list-map-keys:
+                      - mountPath
+                      x-kubernetes-list-type: map
+                    workingDir:
+                      description: |-
+                        Container's working directory.
+                        If not specified, the container runtime's default will be used, which
+                        might be configured in the container image.
+                        Cannot be updated.
+                      type: string
+                  required:
+                  - name
+                  type: object
+                type: array
+              convertClassicHistogramsToNHCB:
+                description: |-
+                  convertClassicHistogramsToNHCB defines whether to convert all scraped classic histograms into a native
+                  histogram with custom buckets.
+
+                  It requires Prometheus >= v3.4.0.
+                type: boolean
+              dnsConfig:
+                description: dnsConfig defines the DNS configuration for the pods.
+                properties:
+                  nameservers:
+                    description: |-
+                      nameservers defines the list of DNS name server IP addresses.
+                      This will be appended to the base nameservers generated from DNSPolicy.
+                    items:
+                      minLength: 1
+                      type: string
+                    type: array
+                    x-kubernetes-list-type: set
+                  options:
+                    description: |-
+                      options defines the list of DNS resolver options.
+                      This will be merged with the base options generated from DNSPolicy.
+                      Resolution options given in Options
+                      will override those that appear in the base DNSPolicy.
+                    items:
+                      description: PodDNSConfigOption defines DNS resolver options
+                        of a pod.
+                      properties:
+                        name:
+                          description: name is required and must be unique.
+                          minLength: 1
+                          type: string
+                        value:
+                          description: value is optional.
+                          type: string
+                      required:
+                      - name
+                      type: object
+                    type: array
+                    x-kubernetes-list-map-keys:
+                    - name
+                    x-kubernetes-list-type: map
+                  searches:
+                    description: |-
+                      searches defines the list of DNS search domains for host-name lookup.
+                      This will be appended to the base search paths generated from DNSPolicy.
+                    items:
+                      minLength: 1
+                      type: string
+                    type: array
+                    x-kubernetes-list-type: set
+                type: object
+              dnsPolicy:
+                description: dnsPolicy defines the DNS policy for the pods.
+                enum:
+                - ClusterFirstWithHostNet
+                - ClusterFirst
+                - Default
+                - None
+                type: string
+              enableFeatures:
+                description: |-
+                  enableFeatures enables access to Prometheus feature flags. By default, no features are enabled.
+
+                  Enabling features which are disabled by default is entirely outside the
+                  scope of what the maintainers will support and by doing so, you accept
+                  that this behaviour may break at any time without notice.
+
+                  For more information see https://prometheus.io/docs/prometheus/latest/feature_flags/
+                items:
+                  minLength: 1
+                  type: string
+                type: array
+                x-kubernetes-list-type: set
+              enableOTLPReceiver:
+                description: |-
+                  enableOTLPReceiver defines the Prometheus to be used as a receiver for the OTLP Metrics protocol.
+
+                  Note that the OTLP receiver endpoint is automatically enabled if `.spec.otlpConfig` is defined.
+
+                  It requires Prometheus >= v2.47.0.
+                type: boolean
+              enableRemoteWriteReceiver:
+                description: |-
+                  enableRemoteWriteReceiver defines the Prometheus to be used as a receiver for the Prometheus remote
+                  write protocol.
+
+                  WARNING: This is not considered an efficient way of ingesting samples.
+                  Use it with caution for specific low-volume use cases.
+                  It is not suitable for replacing the ingestion via scraping and turning
+                  Prometheus into a push-based metrics collection system.
+                  For more information see https://prometheus.io/docs/prometheus/latest/querying/api/#remote-write-receiver
+
+                  It requires Prometheus >= v2.33.0.
+                type: boolean
+              enableServiceLinks:
+                description: enableServiceLinks defines whether information about
+                  services should be injected into pod's environment variables
+                type: boolean
+              enforcedBodySizeLimit:
+                description: |-
+                  enforcedBodySizeLimit when defined specifies a global limit on the size
+                  of uncompressed response body that will be accepted by Prometheus.
+                  Targets responding with a body larger than this many bytes will cause
+                  the scrape to fail.
+
+                  It requires Prometheus >= v2.28.0.
+
+                  When both `enforcedBodySizeLimit` and `bodySizeLimit` are defined and greater than zero, the following rules apply:
+                  * Scrape objects without a defined bodySizeLimit value will inherit the global bodySizeLimit value (Prometheus >= 2.45.0) or the enforcedBodySizeLimit value (Prometheus < v2.45.0).
+                    If Prometheus version is >= 2.45.0 and the `enforcedBodySizeLimit` is greater than the `bodySizeLimit`, the `bodySizeLimit` will be set to `enforcedBodySizeLimit`.
+                  * Scrape objects with a bodySizeLimit value less than or equal to enforcedBodySizeLimit keep their specific value.
+                  * Scrape objects with a bodySizeLimit value greater than enforcedBodySizeLimit are set to enforcedBodySizeLimit.
+                pattern: (^0|([0-9]*[.])?[0-9]+((K|M|G|T|E|P)i?)?B)$
+                type: string
+              enforcedKeepDroppedTargets:
+                description: |-
+                  enforcedKeepDroppedTargets when defined specifies a global limit on the number of targets
+                  dropped by relabeling that will be kept in memory. The value overrides
+                  any `spec.keepDroppedTargets` set by
+                  ServiceMonitor, PodMonitor, Probe objects unless `spec.keepDroppedTargets` is
+                  greater than zero and less than `spec.enforcedKeepDroppedTargets`.
+
+                  It requires Prometheus >= v2.47.0.
+
+                  When both `enforcedKeepDroppedTargets` and `keepDroppedTargets` are defined and greater than zero, the following rules apply:
+                  * Scrape objects without a defined keepDroppedTargets value will inherit the global keepDroppedTargets value (Prometheus >= 2.45.0) or the enforcedKeepDroppedTargets value (Prometheus < v2.45.0).
+                    If Prometheus version is >= 2.45.0 and the `enforcedKeepDroppedTargets` is greater than the `keepDroppedTargets`, the `keepDroppedTargets` will be set to `enforcedKeepDroppedTargets`.
+                  * Scrape objects with a keepDroppedTargets value less than or equal to enforcedKeepDroppedTargets keep their specific value.
+                  * Scrape objects with a keepDroppedTargets value greater than enforcedKeepDroppedTargets are set to enforcedKeepDroppedTargets.
+                format: int64
+                type: integer
+              enforcedLabelLimit:
+                description: |-
+                  enforcedLabelLimit when defined specifies a global limit on the number
+                  of labels per sample. The value overrides any `spec.labelLimit` set by
+                  ServiceMonitor, PodMonitor, Probe objects unless `spec.labelLimit` is
+                  greater than zero and less than `spec.enforcedLabelLimit`.
+
+                  It requires Prometheus >= v2.27.0.
+
+                  When both `enforcedLabelLimit` and `labelLimit` are defined and greater than zero, the following rules apply:
+                  * Scrape objects without a defined labelLimit value will inherit the global labelLimit value (Prometheus >= 2.45.0) or the enforcedLabelLimit value (Prometheus < v2.45.0).
+                    If Prometheus version is >= 2.45.0 and the `enforcedLabelLimit` is greater than the `labelLimit`, the `labelLimit` will be set to `enforcedLabelLimit`.
+                  * Scrape objects with a labelLimit value less than or equal to enforcedLabelLimit keep their specific value.
+                  * Scrape objects with a labelLimit value greater than enforcedLabelLimit are set to enforcedLabelLimit.
+                format: int64
+                type: integer
+              enforcedLabelNameLengthLimit:
+                description: |-
+                  enforcedLabelNameLengthLimit when defined specifies a global limit on the length
+                  of labels name per sample. The value overrides any `spec.labelNameLengthLimit` set by
+                  ServiceMonitor, PodMonitor, Probe objects unless `spec.labelNameLengthLimit` is
+                  greater than zero and less than `spec.enforcedLabelNameLengthLimit`.
+
+                  It requires Prometheus >= v2.27.0.
+
+                  When both `enforcedLabelNameLengthLimit` and `labelNameLengthLimit` are defined and greater than zero, the following rules apply:
+                  * Scrape objects without a defined labelNameLengthLimit value will inherit the global labelNameLengthLimit value (Prometheus >= 2.45.0) or the enforcedLabelNameLengthLimit value (Prometheus < v2.45.0).
+                    If Prometheus version is >= 2.45.0 and the `enforcedLabelNameLengthLimit` is greater than the `labelNameLengthLimit`, the `labelNameLengthLimit` will be set to `enforcedLabelNameLengthLimit`.
+                  * Scrape objects with a labelNameLengthLimit value less than or equal to enforcedLabelNameLengthLimit keep their specific value.
+                  * Scrape objects with a labelNameLengthLimit value greater than enforcedLabelNameLengthLimit are set to enforcedLabelNameLengthLimit.
+                format: int64
+                type: integer
+              enforcedLabelValueLengthLimit:
+                description: |-
+                  enforcedLabelValueLengthLimit when not null defines a global limit on the length
+                  of labels value per sample. The value overrides any `spec.labelValueLengthLimit` set by
+                  ServiceMonitor, PodMonitor, Probe objects unless `spec.labelValueLengthLimit` is
+                  greater than zero and less than `spec.enforcedLabelValueLengthLimit`.
+
+                  It requires Prometheus >= v2.27.0.
+
+                  When both `enforcedLabelValueLengthLimit` and `labelValueLengthLimit` are defined and greater than zero, the following rules apply:
+                  * Scrape objects without a defined labelValueLengthLimit value will inherit the global labelValueLengthLimit value (Prometheus >= 2.45.0) or the enforcedLabelValueLengthLimit value (Prometheus < v2.45.0).
+                    If Prometheus version is >= 2.45.0 and the `enforcedLabelValueLengthLimit` is greater than the `labelValueLengthLimit`, the `labelValueLengthLimit` will be set to `enforcedLabelValueLengthLimit`.
+                  * Scrape objects with a labelValueLengthLimit value less than or equal to enforcedLabelValueLengthLimit keep their specific value.
+                  * Scrape objects with a labelValueLengthLimit value greater than enforcedLabelValueLengthLimit are set to enforcedLabelValueLengthLimit.
+                format: int64
+                type: integer
+              enforcedNamespaceLabel:
+                description: |-
+                  enforcedNamespaceLabel when not empty, a label will be added to:
+
+                  1. All metrics scraped from `ServiceMonitor`, `PodMonitor`, `Probe` and `ScrapeConfig` objects.
+                  2. All metrics generated from recording rules defined in `PrometheusRule` objects.
+                  3. All alerts generated from alerting rules defined in `PrometheusRule` objects.
+                  4. All vector selectors of PromQL expressions defined in `PrometheusRule` objects.
+
+                  The label will not added for objects referenced in `spec.excludedFromEnforcement`.
+
+                  The label's name is this field's value.
+                  The label's value is the namespace of the `ServiceMonitor`,
+                  `PodMonitor`, `Probe`, `PrometheusRule` or `ScrapeConfig` object.
+                type: string
+              enforcedSampleLimit:
+                description: |-
+                  enforcedSampleLimit when defined specifies a global limit on the number
+                  of scraped samples that will be accepted. This overrides any
+                  `spec.sampleLimit` set by ServiceMonitor, PodMonitor, Probe objects
+                  unless `spec.sampleLimit` is greater than zero and less than
+                  `spec.enforcedSampleLimit`.
+
+                  It is meant to be used by admins to keep the overall number of
+                  samples/series under a desired limit.
+
+                  When both `enforcedSampleLimit` and `sampleLimit` are defined and greater than zero, the following rules apply:
+                  * Scrape objects without a defined sampleLimit value will inherit the global sampleLimit value (Prometheus >= 2.45.0) or the enforcedSampleLimit value (Prometheus < v2.45.0).
+                    If Prometheus version is >= 2.45.0 and the `enforcedSampleLimit` is greater than the `sampleLimit`, the `sampleLimit` will be set to `enforcedSampleLimit`.
+                  * Scrape objects with a sampleLimit value less than or equal to enforcedSampleLimit keep their specific value.
+                  * Scrape objects with a sampleLimit value greater than enforcedSampleLimit are set to enforcedSampleLimit.
+                format: int64
+                type: integer
+              enforcedTargetLimit:
+                description: |-
+                  enforcedTargetLimit when defined specifies a global limit on the number
+                  of scraped targets. The value overrides any `spec.targetLimit` set by
+                  ServiceMonitor, PodMonitor, Probe objects unless `spec.targetLimit` is
+                  greater than zero and less than `spec.enforcedTargetLimit`.
+
+                  It is meant to be used by admins to to keep the overall number of
+                  targets under a desired limit.
+
+                  When both `enforcedTargetLimit` and `targetLimit` are defined and greater than zero, the following rules apply:
+                  * Scrape objects without a defined targetLimit value will inherit the global targetLimit value (Prometheus >= 2.45.0) or the enforcedTargetLimit value (Prometheus < v2.45.0).
+                    If Prometheus version is >= 2.45.0 and the `enforcedTargetLimit` is greater than the `targetLimit`, the `targetLimit` will be set to `enforcedTargetLimit`.
+                  * Scrape objects with a targetLimit value less than or equal to enforcedTargetLimit keep their specific value.
+                  * Scrape objects with a targetLimit value greater than enforcedTargetLimit are set to enforcedTargetLimit.
+                format: int64
+                type: integer
+              excludedFromEnforcement:
+                description: |-
+                  excludedFromEnforcement defines the list of references to PodMonitor, ServiceMonitor, Probe and PrometheusRule objects
+                  to be excluded from enforcing a namespace label of origin.
+
+                  It is only applicable if `spec.enforcedNamespaceLabel` set to true.
+                items:
+                  description: ObjectReference references a PodMonitor, ServiceMonitor,
+                    Probe or PrometheusRule object.
+                  properties:
+                    group:
+                      default: monitoring.coreos.com
+                      description: group of the referent. When not specified, it defaults
+                        to `monitoring.coreos.com`
+                      enum:
+                      - monitoring.coreos.com
+                      type: string
+                    name:
+                      description: name of the referent. When not set, all resources
+                        in the namespace are matched.
+                      type: string
+                    namespace:
+                      description: |-
+                        namespace of the referent.
+                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/
+                      minLength: 1
+                      type: string
+                    resource:
+                      description: resource of the referent.
+                      enum:
+                      - prometheusrules
+                      - servicemonitors
+                      - podmonitors
+                      - probes
+                      - scrapeconfigs
+                      type: string
+                  required:
+                  - namespace
+                  - resource
+                  type: object
+                type: array
+              externalLabels:
+                additionalProperties:
+                  type: string
+                description: |-
+                  externalLabels defines the labels to add to any time series or alerts when communicating with
+                  external systems (federation, remote storage, Alertmanager).
+                  Labels defined by `spec.replicaExternalLabelName` and
+                  `spec.prometheusExternalLabelName` take precedence over this list.
+                type: object
+              externalUrl:
+                description: |-
+                  externalUrl defines the external URL under which the Prometheus service is externally
+                  available. This is necessary to generate correct URLs (for instance if
+                  Prometheus is accessible behind an Ingress resource).
+                type: string
+              hostAliases:
+                description: |-
+                  hostAliases defines the optional list of hosts and IPs that will be injected into the Pod's
+                  hosts file if specified.
+                items:
+                  description: |-
+                    HostAlias holds the mapping between IP and hostnames that will be injected as an entry in the
+                    pod's hosts file.
+                  properties:
+                    hostnames:
+                      description: hostnames defines hostnames for the above IP address.
+                      items:
+                        type: string
+                      type: array
+                    ip:
+                      description: ip defines the IP address of the host file entry.
+                      type: string
+                  required:
+                  - hostnames
+                  - ip
+                  type: object
+                type: array
+                x-kubernetes-list-map-keys:
+                - ip
+                x-kubernetes-list-type: map
+              hostNetwork:
+                description: |-
+                  hostNetwork defines the host's network namespace if true.
+
+                  Make sure to understand the security implications if you want to enable
+                  it (https://kubernetes.io/docs/concepts/configuration/overview/ ).
+
+                  When hostNetwork is enabled, this will set the DNS policy to
+                  `ClusterFirstWithHostNet` automatically (unless `.spec.DNSPolicy` is set
+                  to a different value).
+                type: boolean
+              hostUsers:
+                description: |-
+                  hostUsers supports the user space in Kubernetes.
+
+                  More info: https://kubernetes.io/docs/tasks/configure-pod-container/user-namespaces/
+
+                  The feature requires at least Kubernetes 1.28 with the `UserNamespacesSupport` feature gate enabled.
+                  Starting Kubernetes 1.33, the feature is enabled by default.
+                type: boolean
+              ignoreNamespaceSelectors:
+                description: |-
+                  ignoreNamespaceSelectors when true, `spec.namespaceSelector` from all PodMonitor, ServiceMonitor
+                  and Probe objects will be ignored. They will only discover targets
+                  within the namespace of the PodMonitor, ServiceMonitor and Probe
+                  object.
+                type: boolean
+              image:
+                description: |-
+                  image defines the container image name for Prometheus. If specified, it takes precedence
+                  over the `spec.baseImage`, `spec.tag` and `spec.sha` fields.
+
+                  Specifying `spec.version` is still necessary to ensure the Prometheus
+                  Operator knows which version of Prometheus is being configured.
+
+                  If neither `spec.image` nor `spec.baseImage` are defined, the operator
+                  will use the latest upstream version of Prometheus available at the time
+                  when the operator was released.
+                type: string
+              imagePullPolicy:
+                description: |-
+                  imagePullPolicy defines the image pull policy for the 'prometheus', 'init-config-reloader' and 'config-reloader' containers.
+                  See https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy for more details.
+                enum:
+                - ""
+                - Always
+                - Never
+                - IfNotPresent
+                type: string
+              imagePullSecrets:
+                description: |-
+                  imagePullSecrets defines an optional list of references to Secrets in the same namespace
+                  to use for pulling images from registries.
+                  See http://kubernetes.io/docs/user-guide/images#specifying-imagepullsecrets-on-a-pod
+                items:
+                  description: |-
+                    LocalObjectReference contains enough information to let you locate the
+                    referenced object inside the same namespace.
+                  properties:
+                    name:
+                      default: ""
+                      description: |-
+                        Name of the referent.
+                        This field is effectively required, but due to backwards compatibility is
+                        allowed to be empty. Instances of this type with an empty value here are
+                        almost certainly wrong.
+                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                      type: string
+                  type: object
+                  x-kubernetes-map-type: atomic
+                type: array
+              initContainers:
+                description: |-
+                  initContainers allows injecting initContainers to the Pod definition. Those
+                  can be used to e.g.  fetch secrets for injection into the Prometheus
+                  configuration from external sources. Any errors during the execution of
+                  an initContainer will lead to a restart of the Pod. More info:
+                  https://kubernetes.io/docs/concepts/workloads/pods/init-containers/
+                  InitContainers described here modify an operator generated init
+                  containers if they share the same name and modifications are done via a
+                  strategic merge patch.
+
+                  The names of init container name managed by the operator are:
+                  * `init-config-reloader`.
+
+                  Overriding init containers is entirely outside the scope of what the
+                  maintainers will support and by doing so, you accept that this behaviour
+                  may break at any time without notice.
+                items:
+                  description: A single application container that you want to run
+                    within a pod.
+                  properties:
+                    args:
+                      description: |-
+                        Arguments to the entrypoint.
+                        The container image's CMD is used if this is not provided.
+                        Variable references $(VAR_NAME) are expanded using the container's environment. If a variable
+                        cannot be resolved, the reference in the input string will be unchanged. Double $$ are reduced
+                        to a single $, which allows for escaping the $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)" will
+                        produce the string literal "$(VAR_NAME)". Escaped references will never be expanded, regardless
+                        of whether the variable exists or not. Cannot be updated.
+                        More info: https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell
+                      items:
+                        type: string
+                      type: array
+                      x-kubernetes-list-type: atomic
+                    command:
+                      description: |-
+                        Entrypoint array. Not executed within a shell.
+                        The container image's ENTRYPOINT is used if this is not provided.
+                        Variable references $(VAR_NAME) are expanded using the container's environment. If a variable
+                        cannot be resolved, the reference in the input string will be unchanged. Double $$ are reduced
+                        to a single $, which allows for escaping the $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)" will
+                        produce the string literal "$(VAR_NAME)". Escaped references will never be expanded, regardless
+                        of whether the variable exists or not. Cannot be updated.
+                        More info: https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell
+                      items:
+                        type: string
+                      type: array
+                      x-kubernetes-list-type: atomic
+                    env:
+                      description: |-
+                        List of environment variables to set in the container.
+                        Cannot be updated.
+                      items:
+                        description: EnvVar represents an environment variable present
+                          in a Container.
+                        properties:
+                          name:
+                            description: |-
+                              Name of the environment variable.
+                              May consist of any printable ASCII characters except '='.
+                            type: string
+                          value:
+                            description: |-
+                              Variable references $(VAR_NAME) are expanded
+                              using the previously defined environment variables in the container and
+                              any service environment variables. If a variable cannot be resolved,
+                              the reference in the input string will be unchanged. Double $$ are reduced
+                              to a single $, which allows for escaping the $(VAR_NAME) syntax: i.e.
+                              "$$(VAR_NAME)" will produce the string literal "$(VAR_NAME)".
+                              Escaped references will never be expanded, regardless of whether the variable
+                              exists or not.
+                              Defaults to "".
+                            type: string
+                          valueFrom:
+                            description: Source for the environment variable's value.
+                              Cannot be used if value is not empty.
+                            properties:
+                              configMapKeyRef:
+                                description: Selects a key of a ConfigMap.
+                                properties:
+                                  key:
+                                    description: The key to select.
+                                    type: string
+                                  name:
+                                    default: ""
+                                    description: |-
+                                      Name of the referent.
+                                      This field is effectively required, but due to backwards compatibility is
+                                      allowed to be empty. Instances of this type with an empty value here are
+                                      almost certainly wrong.
+                                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                    type: string
+                                  optional:
+                                    description: Specify whether the ConfigMap or
+                                      its key must be defined
+                                    type: boolean
+                                required:
+                                - key
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              fieldRef:
+                                description: |-
+                                  Selects a field of the pod: supports metadata.name, metadata.namespace, `metadata.labels['<KEY>']`, `metadata.annotations['<KEY>']`,
+                                  spec.nodeName, spec.serviceAccountName, status.hostIP, status.podIP, status.podIPs.
+                                properties:
+                                  apiVersion:
+                                    description: Version of the schema the FieldPath
+                                      is written in terms of, defaults to "v1".
+                                    type: string
+                                  fieldPath:
+                                    description: Path of the field to select in the
+                                      specified API version.
+                                    type: string
+                                required:
+                                - fieldPath
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              fileKeyRef:
+                                description: |-
+                                  FileKeyRef selects a key of the env file.
+                                  Requires the EnvFiles feature gate to be enabled.
+                                properties:
+                                  key:
+                                    description: |-
+                                      The key within the env file. An invalid key will prevent the pod from starting.
+                                      The keys defined within a source may consist of any printable ASCII characters except '='.
+                                      During Alpha stage of the EnvFiles feature gate, the key size is limited to 128 characters.
+                                    type: string
+                                  optional:
+                                    default: false
+                                    description: |-
+                                      Specify whether the file or its key must be defined. If the file or key
+                                      does not exist, then the env var is not published.
+                                      If optional is set to true and the specified key does not exist,
+                                      the environment variable will not be set in the Pod's containers.
+
+                                      If optional is set to false and the specified key does not exist,
+                                      an error will be returned during Pod creation.
+                                    type: boolean
+                                  path:
+                                    description: |-
+                                      The path within the volume from which to select the file.
+                                      Must be relative and may not contain the '..' path or start with '..'.
+                                    type: string
+                                  volumeName:
+                                    description: The name of the volume mount containing
+                                      the env file.
+                                    type: string
+                                required:
+                                - key
+                                - path
+                                - volumeName
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              resourceFieldRef:
+                                description: |-
+                                  Selects a resource of the container: only resources limits and requests
+                                  (limits.cpu, limits.memory, limits.ephemeral-storage, requests.cpu, requests.memory and requests.ephemeral-storage) are currently supported.
+                                properties:
+                                  containerName:
+                                    description: 'Container name: required for volumes,
+                                      optional for env vars'
+                                    type: string
+                                  divisor:
+                                    anyOf:
+                                    - type: integer
+                                    - type: string
+                                    description: Specifies the output format of the
+                                      exposed resources, defaults to "1"
+                                    pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                    x-kubernetes-int-or-string: true
+                                  resource:
+                                    description: 'Required: resource to select'
+                                    type: string
+                                required:
+                                - resource
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              secretKeyRef:
+                                description: Selects a key of a secret in the pod's
+                                  namespace
+                                properties:
+                                  key:
+                                    description: The key of the secret to select from.  Must
+                                      be a valid secret key.
+                                    type: string
+                                  name:
+                                    default: ""
+                                    description: |-
+                                      Name of the referent.
+                                      This field is effectively required, but due to backwards compatibility is
+                                      allowed to be empty. Instances of this type with an empty value here are
+                                      almost certainly wrong.
+                                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                    type: string
+                                  optional:
+                                    description: Specify whether the Secret or its
+                                      key must be defined
+                                    type: boolean
+                                required:
+                                - key
+                                type: object
+                                x-kubernetes-map-type: atomic
+                            type: object
+                        required:
+                        - name
+                        type: object
+                      type: array
+                      x-kubernetes-list-map-keys:
+                      - name
+                      x-kubernetes-list-type: map
+                    envFrom:
+                      description: |-
+                        List of sources to populate environment variables in the container.
+                        The keys defined within a source may consist of any printable ASCII characters except '='.
+                        When a key exists in multiple
+                        sources, the value associated with the last source will take precedence.
+                        Values defined by an Env with a duplicate key will take precedence.
+                        Cannot be updated.
+                      items:
+                        description: EnvFromSource represents the source of a set
+                          of ConfigMaps or Secrets
+                        properties:
+                          configMapRef:
+                            description: The ConfigMap to select from
+                            properties:
+                              name:
+                                default: ""
+                                description: |-
+                                  Name of the referent.
+                                  This field is effectively required, but due to backwards compatibility is
+                                  allowed to be empty. Instances of this type with an empty value here are
+                                  almost certainly wrong.
+                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                type: string
+                              optional:
+                                description: Specify whether the ConfigMap must be
+                                  defined
+                                type: boolean
+                            type: object
+                            x-kubernetes-map-type: atomic
+                          prefix:
+                            description: |-
+                              Optional text to prepend to the name of each environment variable.
+                              May consist of any printable ASCII characters except '='.
+                            type: string
+                          secretRef:
+                            description: The Secret to select from
+                            properties:
+                              name:
+                                default: ""
+                                description: |-
+                                  Name of the referent.
+                                  This field is effectively required, but due to backwards compatibility is
+                                  allowed to be empty. Instances of this type with an empty value here are
+                                  almost certainly wrong.
+                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                type: string
+                              optional:
+                                description: Specify whether the Secret must be defined
+                                type: boolean
+                            type: object
+                            x-kubernetes-map-type: atomic
+                        type: object
+                      type: array
+                      x-kubernetes-list-type: atomic
+                    image:
+                      description: |-
+                        Container image name.
+                        More info: https://kubernetes.io/docs/concepts/containers/images
+                        This field is optional to allow higher level config management to default or override
+                        container images in workload controllers like Deployments and StatefulSets.
+                      type: string
+                    imagePullPolicy:
+                      description: |-
+                        Image pull policy.
+                        One of Always, Never, IfNotPresent.
+                        Defaults to Always if :latest tag is specified, or IfNotPresent otherwise.
+                        Cannot be updated.
+                        More info: https://kubernetes.io/docs/concepts/containers/images#updating-images
+                      type: string
+                    lifecycle:
+                      description: |-
+                        Actions that the management system should take in response to container lifecycle events.
+                        Cannot be updated.
+                      properties:
+                        postStart:
+                          description: |-
+                            PostStart is called immediately after a container is created. If the handler fails,
+                            the container is terminated and restarted according to its restart policy.
+                            Other management of the container blocks until the hook completes.
+                            More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
+                          properties:
+                            exec:
+                              description: Exec specifies a command to execute in
+                                the container.
+                              properties:
+                                command:
+                                  description: |-
+                                    Command is the command line to execute inside the container, the working directory for the
+                                    command  is root ('/') in the container's filesystem. The command is simply exec'd, it is
+                                    not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use
+                                    a shell, you need to explicitly call out to that shell.
+                                    Exit status of 0 is treated as live/healthy and non-zero is unhealthy.
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                              type: object
+                            httpGet:
+                              description: HTTPGet specifies an HTTP GET request to
+                                perform.
+                              properties:
+                                host:
+                                  description: |-
+                                    Host name to connect to, defaults to the pod IP. You probably want to set
+                                    "Host" in httpHeaders instead.
+                                  type: string
+                                httpHeaders:
+                                  description: Custom headers to set in the request.
+                                    HTTP allows repeated headers.
+                                  items:
+                                    description: HTTPHeader describes a custom header
+                                      to be used in HTTP probes
+                                    properties:
+                                      name:
+                                        description: |-
+                                          The header field name.
+                                          This will be canonicalized upon output, so case-variant names will be understood as the same header.
+                                        type: string
+                                      value:
+                                        description: The header field value
+                                        type: string
+                                    required:
+                                    - name
+                                    - value
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                path:
+                                  description: Path to access on the HTTP server.
+                                  type: string
+                                port:
+                                  anyOf:
+                                  - type: integer
+                                  - type: string
+                                  description: |-
+                                    Name or number of the port to access on the container.
+                                    Number must be in the range 1 to 65535.
+                                    Name must be an IANA_SVC_NAME.
+                                  x-kubernetes-int-or-string: true
+                                scheme:
+                                  description: |-
+                                    Scheme to use for connecting to the host.
+                                    Defaults to HTTP.
+                                  type: string
+                              required:
+                              - port
+                              type: object
+                            sleep:
+                              description: Sleep represents a duration that the container
+                                should sleep.
+                              properties:
+                                seconds:
+                                  description: Seconds is the number of seconds to
+                                    sleep.
+                                  format: int64
+                                  type: integer
+                              required:
+                              - seconds
+                              type: object
+                            tcpSocket:
+                              description: |-
+                                Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
+                                for backward compatibility. There is no validation of this field and
+                                lifecycle hooks will fail at runtime when it is specified.
+                              properties:
+                                host:
+                                  description: 'Optional: Host name to connect to,
+                                    defaults to the pod IP.'
+                                  type: string
+                                port:
+                                  anyOf:
+                                  - type: integer
+                                  - type: string
+                                  description: |-
+                                    Number or name of the port to access on the container.
+                                    Number must be in the range 1 to 65535.
+                                    Name must be an IANA_SVC_NAME.
+                                  x-kubernetes-int-or-string: true
+                              required:
+                              - port
+                              type: object
+                          type: object
+                        preStop:
+                          description: |-
+                            PreStop is called immediately before a container is terminated due to an
+                            API request or management event such as liveness/startup probe failure,
+                            preemption, resource contention, etc. The handler is not called if the
+                            container crashes or exits. The Pod's termination grace period countdown begins before the
+                            PreStop hook is executed. Regardless of the outcome of the handler, the
+                            container will eventually terminate within the Pod's termination grace
+                            period (unless delayed by finalizers). Other management of the container blocks until the hook completes
+                            or until the termination grace period is reached.
+                            More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
+                          properties:
+                            exec:
+                              description: Exec specifies a command to execute in
+                                the container.
+                              properties:
+                                command:
+                                  description: |-
+                                    Command is the command line to execute inside the container, the working directory for the
+                                    command  is root ('/') in the container's filesystem. The command is simply exec'd, it is
+                                    not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use
+                                    a shell, you need to explicitly call out to that shell.
+                                    Exit status of 0 is treated as live/healthy and non-zero is unhealthy.
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                              type: object
+                            httpGet:
+                              description: HTTPGet specifies an HTTP GET request to
+                                perform.
+                              properties:
+                                host:
+                                  description: |-
+                                    Host name to connect to, defaults to the pod IP. You probably want to set
+                                    "Host" in httpHeaders instead.
+                                  type: string
+                                httpHeaders:
+                                  description: Custom headers to set in the request.
+                                    HTTP allows repeated headers.
+                                  items:
+                                    description: HTTPHeader describes a custom header
+                                      to be used in HTTP probes
+                                    properties:
+                                      name:
+                                        description: |-
+                                          The header field name.
+                                          This will be canonicalized upon output, so case-variant names will be understood as the same header.
+                                        type: string
+                                      value:
+                                        description: The header field value
+                                        type: string
+                                    required:
+                                    - name
+                                    - value
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                path:
+                                  description: Path to access on the HTTP server.
+                                  type: string
+                                port:
+                                  anyOf:
+                                  - type: integer
+                                  - type: string
+                                  description: |-
+                                    Name or number of the port to access on the container.
+                                    Number must be in the range 1 to 65535.
+                                    Name must be an IANA_SVC_NAME.
+                                  x-kubernetes-int-or-string: true
+                                scheme:
+                                  description: |-
+                                    Scheme to use for connecting to the host.
+                                    Defaults to HTTP.
+                                  type: string
+                              required:
+                              - port
+                              type: object
+                            sleep:
+                              description: Sleep represents a duration that the container
+                                should sleep.
+                              properties:
+                                seconds:
+                                  description: Seconds is the number of seconds to
+                                    sleep.
+                                  format: int64
+                                  type: integer
+                              required:
+                              - seconds
+                              type: object
+                            tcpSocket:
+                              description: |-
+                                Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
+                                for backward compatibility. There is no validation of this field and
+                                lifecycle hooks will fail at runtime when it is specified.
+                              properties:
+                                host:
+                                  description: 'Optional: Host name to connect to,
+                                    defaults to the pod IP.'
+                                  type: string
+                                port:
+                                  anyOf:
+                                  - type: integer
+                                  - type: string
+                                  description: |-
+                                    Number or name of the port to access on the container.
+                                    Number must be in the range 1 to 65535.
+                                    Name must be an IANA_SVC_NAME.
+                                  x-kubernetes-int-or-string: true
+                              required:
+                              - port
+                              type: object
+                          type: object
+                        stopSignal:
+                          description: |-
+                            StopSignal defines which signal will be sent to a container when it is being stopped.
+                            If not specified, the default is defined by the container runtime in use.
+                            StopSignal can only be set for Pods with a non-empty .spec.os.name
+                          type: string
+                      type: object
+                    livenessProbe:
+                      description: |-
+                        Periodic probe of container liveness.
+                        Container will be restarted if the probe fails.
+                        Cannot be updated.
+                        More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                      properties:
+                        exec:
+                          description: Exec specifies a command to execute in the
+                            container.
+                          properties:
+                            command:
+                              description: |-
+                                Command is the command line to execute inside the container, the working directory for the
+                                command  is root ('/') in the container's filesystem. The command is simply exec'd, it is
+                                not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use
+                                a shell, you need to explicitly call out to that shell.
+                                Exit status of 0 is treated as live/healthy and non-zero is unhealthy.
+                              items:
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                          type: object
+                        failureThreshold:
+                          description: |-
+                            Minimum consecutive failures for the probe to be considered failed after having succeeded.
+                            Defaults to 3. Minimum value is 1.
+                          format: int32
+                          type: integer
+                        grpc:
+                          description: GRPC specifies a GRPC HealthCheckRequest.
+                          properties:
+                            port:
+                              description: Port number of the gRPC service. Number
+                                must be in the range 1 to 65535.
+                              format: int32
+                              type: integer
+                            service:
+                              default: ""
+                              description: |-
+                                Service is the name of the service to place in the gRPC HealthCheckRequest
+                                (see https://github.com/grpc/grpc/blob/master/doc/health-checking.md).
+
+                                If this is not specified, the default behavior is defined by gRPC.
+                              type: string
+                          required:
+                          - port
+                          type: object
+                        httpGet:
+                          description: HTTPGet specifies an HTTP GET request to perform.
+                          properties:
+                            host:
+                              description: |-
+                                Host name to connect to, defaults to the pod IP. You probably want to set
+                                "Host" in httpHeaders instead.
+                              type: string
+                            httpHeaders:
+                              description: Custom headers to set in the request. HTTP
+                                allows repeated headers.
+                              items:
+                                description: HTTPHeader describes a custom header
+                                  to be used in HTTP probes
+                                properties:
+                                  name:
+                                    description: |-
+                                      The header field name.
+                                      This will be canonicalized upon output, so case-variant names will be understood as the same header.
+                                    type: string
+                                  value:
+                                    description: The header field value
+                                    type: string
+                                required:
+                                - name
+                                - value
+                                type: object
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            path:
+                              description: Path to access on the HTTP server.
+                              type: string
+                            port:
+                              anyOf:
+                              - type: integer
+                              - type: string
+                              description: |-
+                                Name or number of the port to access on the container.
+                                Number must be in the range 1 to 65535.
+                                Name must be an IANA_SVC_NAME.
+                              x-kubernetes-int-or-string: true
+                            scheme:
+                              description: |-
+                                Scheme to use for connecting to the host.
+                                Defaults to HTTP.
+                              type: string
+                          required:
+                          - port
+                          type: object
+                        initialDelaySeconds:
+                          description: |-
+                            Number of seconds after the container has started before liveness probes are initiated.
+                            More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                          format: int32
+                          type: integer
+                        periodSeconds:
+                          description: |-
+                            How often (in seconds) to perform the probe.
+                            Default to 10 seconds. Minimum value is 1.
+                          format: int32
+                          type: integer
+                        successThreshold:
+                          description: |-
+                            Minimum consecutive successes for the probe to be considered successful after having failed.
+                            Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
+                          format: int32
+                          type: integer
+                        tcpSocket:
+                          description: TCPSocket specifies a connection to a TCP port.
+                          properties:
+                            host:
+                              description: 'Optional: Host name to connect to, defaults
+                                to the pod IP.'
+                              type: string
+                            port:
+                              anyOf:
+                              - type: integer
+                              - type: string
+                              description: |-
+                                Number or name of the port to access on the container.
+                                Number must be in the range 1 to 65535.
+                                Name must be an IANA_SVC_NAME.
+                              x-kubernetes-int-or-string: true
+                          required:
+                          - port
+                          type: object
+                        terminationGracePeriodSeconds:
+                          description: |-
+                            Optional duration in seconds the pod needs to terminate gracefully upon probe failure.
+                            The grace period is the duration in seconds after the processes running in the pod are sent
+                            a termination signal and the time when the processes are forcibly halted with a kill signal.
+                            Set this value longer than the expected cleanup time for your process.
+                            If this value is nil, the pod's terminationGracePeriodSeconds will be used. Otherwise, this
+                            value overrides the value provided by the pod spec.
+                            Value must be non-negative integer. The value zero indicates stop immediately via
+                            the kill signal (no opportunity to shut down).
+                            This is a beta field and requires enabling ProbeTerminationGracePeriod feature gate.
+                            Minimum value is 1. spec.terminationGracePeriodSeconds is used if unset.
+                          format: int64
+                          type: integer
+                        timeoutSeconds:
+                          description: |-
+                            Number of seconds after which the probe times out.
+                            Defaults to 1 second. Minimum value is 1.
+                            More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                          format: int32
+                          type: integer
+                      type: object
+                    name:
+                      description: |-
+                        Name of the container specified as a DNS_LABEL.
+                        Each container in a pod must have a unique name (DNS_LABEL).
+                        Cannot be updated.
+                      type: string
+                    ports:
+                      description: |-
+                        List of ports to expose from the container. Not specifying a port here
+                        DOES NOT prevent that port from being exposed. Any port which is
+                        listening on the default "0.0.0.0" address inside a container will be
+                        accessible from the network.
+                        Modifying this array with strategic merge patch may corrupt the data.
+                        For more information See https://github.com/kubernetes/kubernetes/issues/108255.
+                        Cannot be updated.
+                      items:
+                        description: ContainerPort represents a network port in a
+                          single container.
+                        properties:
+                          containerPort:
+                            description: |-
+                              Number of port to expose on the pod's IP address.
+                              This must be a valid port number, 0 < x < 65536.
+                            format: int32
+                            type: integer
+                          hostIP:
+                            description: What host IP to bind the external port to.
+                            type: string
+                          hostPort:
+                            description: |-
+                              Number of port to expose on the host.
+                              If specified, this must be a valid port number, 0 < x < 65536.
+                              If HostNetwork is specified, this must match ContainerPort.
+                              Most containers do not need this.
+                            format: int32
+                            type: integer
+                          name:
+                            description: |-
+                              If specified, this must be an IANA_SVC_NAME and unique within the pod. Each
+                              named port in a pod must have a unique name. Name for the port that can be
+                              referred to by services.
+                            type: string
+                          protocol:
+                            default: TCP
+                            description: |-
+                              Protocol for port. Must be UDP, TCP, or SCTP.
+                              Defaults to "TCP".
+                            type: string
+                        required:
+                        - containerPort
+                        type: object
+                      type: array
+                      x-kubernetes-list-map-keys:
+                      - containerPort
+                      - protocol
+                      x-kubernetes-list-type: map
+                    readinessProbe:
+                      description: |-
+                        Periodic probe of container service readiness.
+                        Container will be removed from service endpoints if the probe fails.
+                        Cannot be updated.
+                        More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                      properties:
+                        exec:
+                          description: Exec specifies a command to execute in the
+                            container.
+                          properties:
+                            command:
+                              description: |-
+                                Command is the command line to execute inside the container, the working directory for the
+                                command  is root ('/') in the container's filesystem. The command is simply exec'd, it is
+                                not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use
+                                a shell, you need to explicitly call out to that shell.
+                                Exit status of 0 is treated as live/healthy and non-zero is unhealthy.
+                              items:
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                          type: object
+                        failureThreshold:
+                          description: |-
+                            Minimum consecutive failures for the probe to be considered failed after having succeeded.
+                            Defaults to 3. Minimum value is 1.
+                          format: int32
+                          type: integer
+                        grpc:
+                          description: GRPC specifies a GRPC HealthCheckRequest.
+                          properties:
+                            port:
+                              description: Port number of the gRPC service. Number
+                                must be in the range 1 to 65535.
+                              format: int32
+                              type: integer
+                            service:
+                              default: ""
+                              description: |-
+                                Service is the name of the service to place in the gRPC HealthCheckRequest
+                                (see https://github.com/grpc/grpc/blob/master/doc/health-checking.md).
+
+                                If this is not specified, the default behavior is defined by gRPC.
+                              type: string
+                          required:
+                          - port
+                          type: object
+                        httpGet:
+                          description: HTTPGet specifies an HTTP GET request to perform.
+                          properties:
+                            host:
+                              description: |-
+                                Host name to connect to, defaults to the pod IP. You probably want to set
+                                "Host" in httpHeaders instead.
+                              type: string
+                            httpHeaders:
+                              description: Custom headers to set in the request. HTTP
+                                allows repeated headers.
+                              items:
+                                description: HTTPHeader describes a custom header
+                                  to be used in HTTP probes
+                                properties:
+                                  name:
+                                    description: |-
+                                      The header field name.
+                                      This will be canonicalized upon output, so case-variant names will be understood as the same header.
+                                    type: string
+                                  value:
+                                    description: The header field value
+                                    type: string
+                                required:
+                                - name
+                                - value
+                                type: object
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            path:
+                              description: Path to access on the HTTP server.
+                              type: string
+                            port:
+                              anyOf:
+                              - type: integer
+                              - type: string
+                              description: |-
+                                Name or number of the port to access on the container.
+                                Number must be in the range 1 to 65535.
+                                Name must be an IANA_SVC_NAME.
+                              x-kubernetes-int-or-string: true
+                            scheme:
+                              description: |-
+                                Scheme to use for connecting to the host.
+                                Defaults to HTTP.
+                              type: string
+                          required:
+                          - port
+                          type: object
+                        initialDelaySeconds:
+                          description: |-
+                            Number of seconds after the container has started before liveness probes are initiated.
+                            More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                          format: int32
+                          type: integer
+                        periodSeconds:
+                          description: |-
+                            How often (in seconds) to perform the probe.
+                            Default to 10 seconds. Minimum value is 1.
+                          format: int32
+                          type: integer
+                        successThreshold:
+                          description: |-
+                            Minimum consecutive successes for the probe to be considered successful after having failed.
+                            Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
+                          format: int32
+                          type: integer
+                        tcpSocket:
+                          description: TCPSocket specifies a connection to a TCP port.
+                          properties:
+                            host:
+                              description: 'Optional: Host name to connect to, defaults
+                                to the pod IP.'
+                              type: string
+                            port:
+                              anyOf:
+                              - type: integer
+                              - type: string
+                              description: |-
+                                Number or name of the port to access on the container.
+                                Number must be in the range 1 to 65535.
+                                Name must be an IANA_SVC_NAME.
+                              x-kubernetes-int-or-string: true
+                          required:
+                          - port
+                          type: object
+                        terminationGracePeriodSeconds:
+                          description: |-
+                            Optional duration in seconds the pod needs to terminate gracefully upon probe failure.
+                            The grace period is the duration in seconds after the processes running in the pod are sent
+                            a termination signal and the time when the processes are forcibly halted with a kill signal.
+                            Set this value longer than the expected cleanup time for your process.
+                            If this value is nil, the pod's terminationGracePeriodSeconds will be used. Otherwise, this
+                            value overrides the value provided by the pod spec.
+                            Value must be non-negative integer. The value zero indicates stop immediately via
+                            the kill signal (no opportunity to shut down).
+                            This is a beta field and requires enabling ProbeTerminationGracePeriod feature gate.
+                            Minimum value is 1. spec.terminationGracePeriodSeconds is used if unset.
+                          format: int64
+                          type: integer
+                        timeoutSeconds:
+                          description: |-
+                            Number of seconds after which the probe times out.
+                            Defaults to 1 second. Minimum value is 1.
+                            More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                          format: int32
+                          type: integer
+                      type: object
+                    resizePolicy:
+                      description: Resources resize policy for the container.
+                      items:
+                        description: ContainerResizePolicy represents resource resize
+                          policy for the container.
+                        properties:
+                          resourceName:
+                            description: |-
+                              Name of the resource to which this resource resize policy applies.
+                              Supported values: cpu, memory.
+                            type: string
+                          restartPolicy:
+                            description: |-
+                              Restart policy to apply when specified resource is resized.
+                              If not specified, it defaults to NotRequired.
+                            type: string
+                        required:
+                        - resourceName
+                        - restartPolicy
+                        type: object
+                      type: array
+                      x-kubernetes-list-type: atomic
+                    resources:
+                      description: |-
+                        Compute Resources required by this container.
+                        Cannot be updated.
+                        More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+                      properties:
+                        claims:
+                          description: |-
+                            Claims lists the names of resources, defined in spec.resourceClaims,
+                            that are used by this container.
+
+                            This field depends on the
+                            DynamicResourceAllocation feature gate.
+
+                            This field is immutable. It can only be set for containers.
+                          items:
+                            description: ResourceClaim references one entry in PodSpec.ResourceClaims.
+                            properties:
+                              name:
+                                description: |-
+                                  Name must match the name of one entry in pod.spec.resourceClaims of
+                                  the Pod where this field is used. It makes that resource available
+                                  inside a container.
+                                type: string
+                              request:
+                                description: |-
+                                  Request is the name chosen for a request in the referenced claim.
+                                  If empty, everything from the claim is made available, otherwise
+                                  only the result of this request.
+                                type: string
+                            required:
+                            - name
+                            type: object
+                          type: array
+                          x-kubernetes-list-map-keys:
+                          - name
+                          x-kubernetes-list-type: map
+                        limits:
+                          additionalProperties:
+                            anyOf:
+                            - type: integer
+                            - type: string
+                            pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                            x-kubernetes-int-or-string: true
+                          description: |-
+                            Limits describes the maximum amount of compute resources allowed.
+                            More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+                          type: object
+                        requests:
+                          additionalProperties:
+                            anyOf:
+                            - type: integer
+                            - type: string
+                            pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                            x-kubernetes-int-or-string: true
+                          description: |-
+                            Requests describes the minimum amount of compute resources required.
+                            If Requests is omitted for a container, it defaults to Limits if that is explicitly specified,
+                            otherwise to an implementation-defined value. Requests cannot exceed Limits.
+                            More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+                          type: object
+                      type: object
+                    restartPolicy:
+                      description: |-
+                        RestartPolicy defines the restart behavior of individual containers in a pod.
+                        This overrides the pod-level restart policy. When this field is not specified,
+                        the restart behavior is defined by the Pod's restart policy and the container type.
+                        Additionally, setting the RestartPolicy as "Always" for the init container will
+                        have the following effect:
+                        this init container will be continually restarted on
+                        exit until all regular containers have terminated. Once all regular
+                        containers have completed, all init containers with restartPolicy "Always"
+                        will be shut down. This lifecycle differs from normal init containers and
+                        is often referred to as a "sidecar" container. Although this init
+                        container still starts in the init container sequence, it does not wait
+                        for the container to complete before proceeding to the next init
+                        container. Instead, the next init container starts immediately after this
+                        init container is started, or after any startupProbe has successfully
+                        completed.
+                      type: string
+                    restartPolicyRules:
+                      description: |-
+                        Represents a list of rules to be checked to determine if the
+                        container should be restarted on exit. The rules are evaluated in
+                        order. Once a rule matches a container exit condition, the remaining
+                        rules are ignored. If no rule matches the container exit condition,
+                        the Container-level restart policy determines the whether the container
+                        is restarted or not. Constraints on the rules:
+                        - At most 20 rules are allowed.
+                        - Rules can have the same action.
+                        - Identical rules are not forbidden in validations.
+                        When rules are specified, container MUST set RestartPolicy explicitly
+                        even it if matches the Pod's RestartPolicy.
+                      items:
+                        description: ContainerRestartRule describes how a container
+                          exit is handled.
+                        properties:
+                          action:
+                            description: |-
+                              Specifies the action taken on a container exit if the requirements
+                              are satisfied. The only possible value is "Restart" to restart the
+                              container.
+                            type: string
+                          exitCodes:
+                            description: Represents the exit codes to check on container
+                              exits.
+                            properties:
+                              operator:
+                                description: |-
+                                  Represents the relationship between the container exit code(s) and the
+                                  specified values. Possible values are:
+                                  - In: the requirement is satisfied if the container exit code is in the
+                                    set of specified values.
+                                  - NotIn: the requirement is satisfied if the container exit code is
+                                    not in the set of specified values.
+                                type: string
+                              values:
+                                description: |-
+                                  Specifies the set of values to check for container exit codes.
+                                  At most 255 elements are allowed.
+                                items:
+                                  format: int32
+                                  type: integer
+                                type: array
+                                x-kubernetes-list-type: set
+                            required:
+                            - operator
+                            type: object
+                        required:
+                        - action
+                        type: object
+                      type: array
+                      x-kubernetes-list-type: atomic
+                    securityContext:
+                      description: |-
+                        SecurityContext defines the security options the container should be run with.
+                        If set, the fields of SecurityContext override the equivalent fields of PodSecurityContext.
+                        More info: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/
+                      properties:
+                        allowPrivilegeEscalation:
+                          description: |-
+                            AllowPrivilegeEscalation controls whether a process can gain more
+                            privileges than its parent process. This bool directly controls if
+                            the no_new_privs flag will be set on the container process.
+                            AllowPrivilegeEscalation is true always when the container is:
+                            1) run as Privileged
+                            2) has CAP_SYS_ADMIN
+                            Note that this field cannot be set when spec.os.name is windows.
+                          type: boolean
+                        appArmorProfile:
+                          description: |-
+                            appArmorProfile is the AppArmor options to use by this container. If set, this profile
+                            overrides the pod's appArmorProfile.
+                            Note that this field cannot be set when spec.os.name is windows.
+                          properties:
+                            localhostProfile:
+                              description: |-
+                                localhostProfile indicates a profile loaded on the node that should be used.
+                                The profile must be preconfigured on the node to work.
+                                Must match the loaded name of the profile.
+                                Must be set if and only if type is "Localhost".
+                              type: string
+                            type:
+                              description: |-
+                                type indicates which kind of AppArmor profile will be applied.
+                                Valid options are:
+                                  Localhost - a profile pre-loaded on the node.
+                                  RuntimeDefault - the container runtime's default profile.
+                                  Unconfined - no AppArmor enforcement.
+                              type: string
+                          required:
+                          - type
+                          type: object
+                        capabilities:
+                          description: |-
+                            The capabilities to add/drop when running containers.
+                            Defaults to the default set of capabilities granted by the container runtime.
+                            Note that this field cannot be set when spec.os.name is windows.
+                          properties:
+                            add:
+                              description: Added capabilities
+                              items:
+                                description: Capability represent POSIX capabilities
+                                  type
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            drop:
+                              description: Removed capabilities
+                              items:
+                                description: Capability represent POSIX capabilities
+                                  type
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                          type: object
+                        privileged:
+                          description: |-
+                            Run container in privileged mode.
+                            Processes in privileged containers are essentially equivalent to root on the host.
+                            Defaults to false.
+                            Note that this field cannot be set when spec.os.name is windows.
+                          type: boolean
+                        procMount:
+                          description: |-
+                            procMount denotes the type of proc mount to use for the containers.
+                            The default value is Default which uses the container runtime defaults for
+                            readonly paths and masked paths.
+                            This requires the ProcMountType feature flag to be enabled.
+                            Note that this field cannot be set when spec.os.name is windows.
+                          type: string
+                        readOnlyRootFilesystem:
+                          description: |-
+                            Whether this container has a read-only root filesystem.
+                            Default is false.
+                            Note that this field cannot be set when spec.os.name is windows.
+                          type: boolean
+                        runAsGroup:
+                          description: |-
+                            The GID to run the entrypoint of the container process.
+                            Uses runtime default if unset.
+                            May also be set in PodSecurityContext.  If set in both SecurityContext and
+                            PodSecurityContext, the value specified in SecurityContext takes precedence.
+                            Note that this field cannot be set when spec.os.name is windows.
+                          format: int64
+                          type: integer
+                        runAsNonRoot:
+                          description: |-
+                            Indicates that the container must run as a non-root user.
+                            If true, the Kubelet will validate the image at runtime to ensure that it
+                            does not run as UID 0 (root) and fail to start the container if it does.
+                            If unset or false, no such validation will be performed.
+                            May also be set in PodSecurityContext.  If set in both SecurityContext and
+                            PodSecurityContext, the value specified in SecurityContext takes precedence.
+                          type: boolean
+                        runAsUser:
+                          description: |-
+                            The UID to run the entrypoint of the container process.
+                            Defaults to user specified in image metadata if unspecified.
+                            May also be set in PodSecurityContext.  If set in both SecurityContext and
+                            PodSecurityContext, the value specified in SecurityContext takes precedence.
+                            Note that this field cannot be set when spec.os.name is windows.
+                          format: int64
+                          type: integer
+                        seLinuxOptions:
+                          description: |-
+                            The SELinux context to be applied to the container.
+                            If unspecified, the container runtime will allocate a random SELinux context for each
+                            container.  May also be set in PodSecurityContext.  If set in both SecurityContext and
+                            PodSecurityContext, the value specified in SecurityContext takes precedence.
+                            Note that this field cannot be set when spec.os.name is windows.
+                          properties:
+                            level:
+                              description: Level is SELinux level label that applies
+                                to the container.
+                              type: string
+                            role:
+                              description: Role is a SELinux role label that applies
+                                to the container.
+                              type: string
+                            type:
+                              description: Type is a SELinux type label that applies
+                                to the container.
+                              type: string
+                            user:
+                              description: User is a SELinux user label that applies
+                                to the container.
+                              type: string
+                          type: object
+                        seccompProfile:
+                          description: |-
+                            The seccomp options to use by this container. If seccomp options are
+                            provided at both the pod & container level, the container options
+                            override the pod options.
+                            Note that this field cannot be set when spec.os.name is windows.
+                          properties:
+                            localhostProfile:
+                              description: |-
+                                localhostProfile indicates a profile defined in a file on the node should be used.
+                                The profile must be preconfigured on the node to work.
+                                Must be a descending path, relative to the kubelet's configured seccomp profile location.
+                                Must be set if type is "Localhost". Must NOT be set for any other type.
+                              type: string
+                            type:
+                              description: |-
+                                type indicates which kind of seccomp profile will be applied.
+                                Valid options are:
+
+                                Localhost - a profile defined in a file on the node should be used.
+                                RuntimeDefault - the container runtime default profile should be used.
+                                Unconfined - no profile should be applied.
+                              type: string
+                          required:
+                          - type
+                          type: object
+                        windowsOptions:
+                          description: |-
+                            The Windows specific settings applied to all containers.
+                            If unspecified, the options from the PodSecurityContext will be used.
+                            If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence.
+                            Note that this field cannot be set when spec.os.name is linux.
+                          properties:
+                            gmsaCredentialSpec:
+                              description: |-
+                                GMSACredentialSpec is where the GMSA admission webhook
+                                (https://github.com/kubernetes-sigs/windows-gmsa) inlines the contents of the
+                                GMSA credential spec named by the GMSACredentialSpecName field.
+                              type: string
+                            gmsaCredentialSpecName:
+                              description: GMSACredentialSpecName is the name of the
+                                GMSA credential spec to use.
+                              type: string
+                            hostProcess:
+                              description: |-
+                                HostProcess determines if a container should be run as a 'Host Process' container.
+                                All of a Pod's containers must have the same effective HostProcess value
+                                (it is not allowed to have a mix of HostProcess containers and non-HostProcess containers).
+                                In addition, if HostProcess is true then HostNetwork must also be set to true.
+                              type: boolean
+                            runAsUserName:
+                              description: |-
+                                The UserName in Windows to run the entrypoint of the container process.
+                                Defaults to the user specified in image metadata if unspecified.
+                                May also be set in PodSecurityContext. If set in both SecurityContext and
+                                PodSecurityContext, the value specified in SecurityContext takes precedence.
+                              type: string
+                          type: object
+                      type: object
+                    startupProbe:
+                      description: |-
+                        StartupProbe indicates that the Pod has successfully initialized.
+                        If specified, no other probes are executed until this completes successfully.
+                        If this probe fails, the Pod will be restarted, just as if the livenessProbe failed.
+                        This can be used to provide different probe parameters at the beginning of a Pod's lifecycle,
+                        when it might take a long time to load data or warm a cache, than during steady-state operation.
+                        This cannot be updated.
+                        More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                      properties:
+                        exec:
+                          description: Exec specifies a command to execute in the
+                            container.
+                          properties:
+                            command:
+                              description: |-
+                                Command is the command line to execute inside the container, the working directory for the
+                                command  is root ('/') in the container's filesystem. The command is simply exec'd, it is
+                                not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use
+                                a shell, you need to explicitly call out to that shell.
+                                Exit status of 0 is treated as live/healthy and non-zero is unhealthy.
+                              items:
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                          type: object
+                        failureThreshold:
+                          description: |-
+                            Minimum consecutive failures for the probe to be considered failed after having succeeded.
+                            Defaults to 3. Minimum value is 1.
+                          format: int32
+                          type: integer
+                        grpc:
+                          description: GRPC specifies a GRPC HealthCheckRequest.
+                          properties:
+                            port:
+                              description: Port number of the gRPC service. Number
+                                must be in the range 1 to 65535.
+                              format: int32
+                              type: integer
+                            service:
+                              default: ""
+                              description: |-
+                                Service is the name of the service to place in the gRPC HealthCheckRequest
+                                (see https://github.com/grpc/grpc/blob/master/doc/health-checking.md).
+
+                                If this is not specified, the default behavior is defined by gRPC.
+                              type: string
+                          required:
+                          - port
+                          type: object
+                        httpGet:
+                          description: HTTPGet specifies an HTTP GET request to perform.
+                          properties:
+                            host:
+                              description: |-
+                                Host name to connect to, defaults to the pod IP. You probably want to set
+                                "Host" in httpHeaders instead.
+                              type: string
+                            httpHeaders:
+                              description: Custom headers to set in the request. HTTP
+                                allows repeated headers.
+                              items:
+                                description: HTTPHeader describes a custom header
+                                  to be used in HTTP probes
+                                properties:
+                                  name:
+                                    description: |-
+                                      The header field name.
+                                      This will be canonicalized upon output, so case-variant names will be understood as the same header.
+                                    type: string
+                                  value:
+                                    description: The header field value
+                                    type: string
+                                required:
+                                - name
+                                - value
+                                type: object
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            path:
+                              description: Path to access on the HTTP server.
+                              type: string
+                            port:
+                              anyOf:
+                              - type: integer
+                              - type: string
+                              description: |-
+                                Name or number of the port to access on the container.
+                                Number must be in the range 1 to 65535.
+                                Name must be an IANA_SVC_NAME.
+                              x-kubernetes-int-or-string: true
+                            scheme:
+                              description: |-
+                                Scheme to use for connecting to the host.
+                                Defaults to HTTP.
+                              type: string
+                          required:
+                          - port
+                          type: object
+                        initialDelaySeconds:
+                          description: |-
+                            Number of seconds after the container has started before liveness probes are initiated.
+                            More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                          format: int32
+                          type: integer
+                        periodSeconds:
+                          description: |-
+                            How often (in seconds) to perform the probe.
+                            Default to 10 seconds. Minimum value is 1.
+                          format: int32
+                          type: integer
+                        successThreshold:
+                          description: |-
+                            Minimum consecutive successes for the probe to be considered successful after having failed.
+                            Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
+                          format: int32
+                          type: integer
+                        tcpSocket:
+                          description: TCPSocket specifies a connection to a TCP port.
+                          properties:
+                            host:
+                              description: 'Optional: Host name to connect to, defaults
+                                to the pod IP.'
+                              type: string
+                            port:
+                              anyOf:
+                              - type: integer
+                              - type: string
+                              description: |-
+                                Number or name of the port to access on the container.
+                                Number must be in the range 1 to 65535.
+                                Name must be an IANA_SVC_NAME.
+                              x-kubernetes-int-or-string: true
+                          required:
+                          - port
+                          type: object
+                        terminationGracePeriodSeconds:
+                          description: |-
+                            Optional duration in seconds the pod needs to terminate gracefully upon probe failure.
+                            The grace period is the duration in seconds after the processes running in the pod are sent
+                            a termination signal and the time when the processes are forcibly halted with a kill signal.
+                            Set this value longer than the expected cleanup time for your process.
+                            If this value is nil, the pod's terminationGracePeriodSeconds will be used. Otherwise, this
+                            value overrides the value provided by the pod spec.
+                            Value must be non-negative integer. The value zero indicates stop immediately via
+                            the kill signal (no opportunity to shut down).
+                            This is a beta field and requires enabling ProbeTerminationGracePeriod feature gate.
+                            Minimum value is 1. spec.terminationGracePeriodSeconds is used if unset.
+                          format: int64
+                          type: integer
+                        timeoutSeconds:
+                          description: |-
+                            Number of seconds after which the probe times out.
+                            Defaults to 1 second. Minimum value is 1.
+                            More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                          format: int32
+                          type: integer
+                      type: object
+                    stdin:
+                      description: |-
+                        Whether this container should allocate a buffer for stdin in the container runtime. If this
+                        is not set, reads from stdin in the container will always result in EOF.
+                        Default is false.
+                      type: boolean
+                    stdinOnce:
+                      description: |-
+                        Whether the container runtime should close the stdin channel after it has been opened by
+                        a single attach. When stdin is true the stdin stream will remain open across multiple attach
+                        sessions. If stdinOnce is set to true, stdin is opened on container start, is empty until the
+                        first client attaches to stdin, and then remains open and accepts data until the client disconnects,
+                        at which time stdin is closed and remains closed until the container is restarted. If this
+                        flag is false, a container processes that reads from stdin will never receive an EOF.
+                        Default is false
+                      type: boolean
+                    terminationMessagePath:
+                      description: |-
+                        Optional: Path at which the file to which the container's termination message
+                        will be written is mounted into the container's filesystem.
+                        Message written is intended to be brief final status, such as an assertion failure message.
+                        Will be truncated by the node if greater than 4096 bytes. The total message length across
+                        all containers will be limited to 12kb.
+                        Defaults to /dev/termination-log.
+                        Cannot be updated.
+                      type: string
+                    terminationMessagePolicy:
+                      description: |-
+                        Indicate how the termination message should be populated. File will use the contents of
+                        terminationMessagePath to populate the container status message on both success and failure.
+                        FallbackToLogsOnError will use the last chunk of container log output if the termination
+                        message file is empty and the container exited with an error.
+                        The log output is limited to 2048 bytes or 80 lines, whichever is smaller.
+                        Defaults to File.
+                        Cannot be updated.
+                      type: string
+                    tty:
+                      description: |-
+                        Whether this container should allocate a TTY for itself, also requires 'stdin' to be true.
+                        Default is false.
+                      type: boolean
+                    volumeDevices:
+                      description: volumeDevices is the list of block devices to be
+                        used by the container.
+                      items:
+                        description: volumeDevice describes a mapping of a raw block
+                          device within a container.
+                        properties:
+                          devicePath:
+                            description: devicePath is the path inside of the container
+                              that the device will be mapped to.
+                            type: string
+                          name:
+                            description: name must match the name of a persistentVolumeClaim
+                              in the pod
+                            type: string
+                        required:
+                        - devicePath
+                        - name
+                        type: object
+                      type: array
+                      x-kubernetes-list-map-keys:
+                      - devicePath
+                      x-kubernetes-list-type: map
+                    volumeMounts:
+                      description: |-
+                        Pod volumes to mount into the container's filesystem.
+                        Cannot be updated.
+                      items:
+                        description: VolumeMount describes a mounting of a Volume
+                          within a container.
+                        properties:
+                          mountPath:
+                            description: |-
+                              Path within the container at which the volume should be mounted.  Must
+                              not contain ':'.
+                            type: string
+                          mountPropagation:
+                            description: |-
+                              mountPropagation determines how mounts are propagated from the host
+                              to container and the other way around.
+                              When not set, MountPropagationNone is used.
+                              This field is beta in 1.10.
+                              When RecursiveReadOnly is set to IfPossible or to Enabled, MountPropagation must be None or unspecified
+                              (which defaults to None).
+                            type: string
+                          name:
+                            description: This must match the Name of a Volume.
+                            type: string
+                          readOnly:
+                            description: |-
+                              Mounted read-only if true, read-write otherwise (false or unspecified).
+                              Defaults to false.
+                            type: boolean
+                          recursiveReadOnly:
+                            description: |-
+                              RecursiveReadOnly specifies whether read-only mounts should be handled
+                              recursively.
+
+                              If ReadOnly is false, this field has no meaning and must be unspecified.
+
+                              If ReadOnly is true, and this field is set to Disabled, the mount is not made
+                              recursively read-only.  If this field is set to IfPossible, the mount is made
+                              recursively read-only, if it is supported by the container runtime.  If this
+                              field is set to Enabled, the mount is made recursively read-only if it is
+                              supported by the container runtime, otherwise the pod will not be started and
+                              an error will be generated to indicate the reason.
+
+                              If this field is set to IfPossible or Enabled, MountPropagation must be set to
+                              None (or be unspecified, which defaults to None).
+
+                              If this field is not specified, it is treated as an equivalent of Disabled.
+                            type: string
+                          subPath:
+                            description: |-
+                              Path within the volume from which the container's volume should be mounted.
+                              Defaults to "" (volume's root).
+                            type: string
+                          subPathExpr:
+                            description: |-
+                              Expanded path within the volume from which the container's volume should be mounted.
+                              Behaves similarly to SubPath but environment variable references $(VAR_NAME) are expanded using the container's environment.
+                              Defaults to "" (volume's root).
+                              SubPathExpr and SubPath are mutually exclusive.
+                            type: string
+                        required:
+                        - mountPath
+                        - name
+                        type: object
+                      type: array
+                      x-kubernetes-list-map-keys:
+                      - mountPath
+                      x-kubernetes-list-type: map
+                    workingDir:
+                      description: |-
+                        Container's working directory.
+                        If not specified, the container runtime's default will be used, which
+                        might be configured in the container image.
+                        Cannot be updated.
+                      type: string
+                  required:
+                  - name
+                  type: object
+                type: array
+              keepDroppedTargets:
+                description: |-
+                  keepDroppedTargets defines the per-scrape limit on the number of targets dropped by relabeling
+                  that will be kept in memory. 0 means no limit.
+
+                  It requires Prometheus >= v2.47.0.
+
+                  Note that the global limit only applies to scrape objects that don't specify an explicit limit value.
+                  If you want to enforce a maximum limit for all scrape objects, refer to enforcedKeepDroppedTargets.
+                format: int64
+                type: integer
+              labelLimit:
+                description: |-
+                  labelLimit defines per-scrape limit on number of labels that will be accepted for a sample.
+                  Only valid in Prometheus versions 2.45.0 and newer.
+
+                  Note that the global limit only applies to scrape objects that don't specify an explicit limit value.
+                  If you want to enforce a maximum limit for all scrape objects, refer to enforcedLabelLimit.
+                format: int64
+                type: integer
+              labelNameLengthLimit:
+                description: |-
+                  labelNameLengthLimit defines the per-scrape limit on length of labels name that will be accepted for a sample.
+                  Only valid in Prometheus versions 2.45.0 and newer.
+
+                  Note that the global limit only applies to scrape objects that don't specify an explicit limit value.
+                  If you want to enforce a maximum limit for all scrape objects, refer to enforcedLabelNameLengthLimit.
+                format: int64
+                type: integer
+              labelValueLengthLimit:
+                description: |-
+                  labelValueLengthLimit defines the per-scrape limit on length of labels value that will be accepted for a sample.
+                  Only valid in Prometheus versions 2.45.0 and newer.
+
+                  Note that the global limit only applies to scrape objects that don't specify an explicit limit value.
+                  If you want to enforce a maximum limit for all scrape objects, refer to enforcedLabelValueLengthLimit.
+                format: int64
+                type: integer
+              listenLocal:
+                description: |-
+                  listenLocal when true, the Prometheus server listens on the loopback address
+                  instead of the Pod IP's address.
+                type: boolean
+              logFormat:
+                description: logFormat for Log level for Prometheus and the config-reloader
+                  sidecar.
+                enum:
+                - ""
+                - logfmt
+                - json
+                type: string
+              logLevel:
+                description: logLevel for Prometheus and the config-reloader sidecar.
+                enum:
+                - ""
+                - debug
+                - info
+                - warn
+                - error
+                type: string
+              maximumStartupDurationSeconds:
+                description: |-
+                  maximumStartupDurationSeconds defines the maximum time that the `prometheus` container's startup probe will wait before being considered failed. The startup probe will return success after the WAL replay is complete.
+                  If set, the value should be greater than 60 (seconds). Otherwise it will be equal to 900 seconds (15 minutes).
+                format: int32
+                minimum: 60
+                type: integer
+              minReadySeconds:
+                description: |-
+                  minReadySeconds defines the minimum number of seconds for which a newly created Pod should be ready
+                  without any of its container crashing for it to be considered available.
+
+                  If unset, pods will be considered available as soon as they are ready.
+                format: int32
+                minimum: 0
+                type: integer
+              mode:
+                description: |-
+                  mode defines how the Prometheus operator deploys the PrometheusAgent pod(s).
+
+                  (Alpha) Using this field requires the `PrometheusAgentDaemonSet` feature gate to be enabled.
+                enum:
+                - StatefulSet
+                - DaemonSet
+                type: string
+              nameEscapingScheme:
+                description: |-
+                  nameEscapingScheme defines the character escaping scheme that will be requested when scraping
+                  for metric and label names that do not conform to the legacy Prometheus
+                  character set.
+
+                  It requires Prometheus >= v3.4.0.
+                enum:
+                - AllowUTF8
+                - Underscores
+                - Dots
+                - Values
+                type: string
+              nameValidationScheme:
+                description: |-
+                  nameValidationScheme defines the validation scheme for metric and label names.
+
+                  It requires Prometheus >= v2.55.0.
+                enum:
+                - UTF8
+                - Legacy
+                type: string
+              nodeSelector:
+                additionalProperties:
+                  type: string
+                description: nodeSelector defines on which Nodes the Pods are scheduled.
+                type: object
+              otlp:
+                description: |-
+                  otlp defines the settings related to the OTLP receiver feature.
+                  It requires Prometheus >= v2.55.0.
+                properties:
+                  convertHistogramsToNHCB:
+                    description: |-
+                      convertHistogramsToNHCB defines optional translation of OTLP explicit bucket histograms into native histograms with custom buckets.
+                      It requires Prometheus >= v3.4.0.
+                    type: boolean
+                  ignoreResourceAttributes:
+                    description: |-
+                      ignoreResourceAttributes defines the list of OpenTelemetry resource attributes to ignore when `promoteAllResourceAttributes` is true.
+
+                      It requires `promoteAllResourceAttributes` to be true.
+                      It requires Prometheus >= v3.5.0.
+                    items:
+                      minLength: 1
+                      type: string
+                    minItems: 1
+                    type: array
+                    x-kubernetes-list-type: set
+                  keepIdentifyingResourceAttributes:
+                    description: |-
+                      keepIdentifyingResourceAttributes enables adding `service.name`, `service.namespace` and `service.instance.id`
+                      resource attributes to the `target_info` metric, on top of converting them into the `instance` and `job` labels.
+
+                      It requires Prometheus >= v3.1.0.
+                    type: boolean
+                  promoteAllResourceAttributes:
+                    description: |-
+                      promoteAllResourceAttributes promotes all resource attributes to metric labels except the ones defined in `ignoreResourceAttributes`.
+
+                      Cannot be true when `promoteResourceAttributes` is defined.
+                      It requires Prometheus >= v3.5.0.
+                    type: boolean
+                  promoteResourceAttributes:
+                    description: |-
+                      promoteResourceAttributes defines the list of OpenTelemetry Attributes that should be promoted to metric labels, defaults to none.
+                      Cannot be defined when `promoteAllResourceAttributes` is true.
+                    items:
+                      minLength: 1
+                      type: string
+                    minItems: 1
+                    type: array
+                    x-kubernetes-list-type: set
+                  promoteScopeMetadata:
+                    description: |-
+                      promoteScopeMetadata controls whether to promote OpenTelemetry scope metadata (i.e. name, version, schema URL, and attributes) to metric labels.
+                      As per the OpenTelemetry specification, the aforementioned scope metadata should be identifying, i.e. made into metric labels.
+                      It requires Prometheus >= v3.6.0.
+                    type: boolean
+                  translationStrategy:
+                    description: |-
+                      translationStrategy defines how the OTLP receiver endpoint translates the incoming metrics.
+
+                      It requires Prometheus >= v3.0.0.
+                    enum:
+                    - NoUTF8EscapingWithSuffixes
+                    - UnderscoreEscapingWithSuffixes
+                    - NoTranslation
+                    - UnderscoreEscapingWithoutSuffixes
+                    type: string
+                type: object
+              overrideHonorLabels:
+                description: |-
+                  overrideHonorLabels when true, Prometheus resolves label conflicts by renaming the labels in the scraped data
+                   to “exported_” for all targets created from ServiceMonitor, PodMonitor and
+                  ScrapeConfig objects. Otherwise the HonorLabels field of the service or pod monitor applies.
+                  In practice,`OverrideHonorLabels:true` enforces `honorLabels:false`
+                  for all ServiceMonitor, PodMonitor and ScrapeConfig objects.
+                type: boolean
+              overrideHonorTimestamps:
+                description: |-
+                  overrideHonorTimestamps when true, Prometheus ignores the timestamps for all the targets created
+                  from service and pod monitors.
+                  Otherwise the HonorTimestamps field of the service or pod monitor applies.
+                type: boolean
+              paused:
+                description: |-
+                  paused defines when a Prometheus deployment is paused, no actions except for deletion
+                  will be performed on the underlying objects.
+                type: boolean
+              persistentVolumeClaimRetentionPolicy:
+                description: |-
+                  persistentVolumeClaimRetentionPolicy defines the field controls if and how PVCs are deleted during the lifecycle of a StatefulSet.
+                  The default behavior is all PVCs are retained.
+                  This is an alpha field from kubernetes 1.23 until 1.26 and a beta field from 1.26.
+                  It requires enabling the StatefulSetAutoDeletePVC feature gate.
+                properties:
+                  whenDeleted:
+                    description: |-
+                      WhenDeleted specifies what happens to PVCs created from StatefulSet
+                      VolumeClaimTemplates when the StatefulSet is deleted. The default policy
+                      of `Retain` causes PVCs to not be affected by StatefulSet deletion. The
+                      `Delete` policy causes those PVCs to be deleted.
+                    type: string
+                  whenScaled:
+                    description: |-
+                      WhenScaled specifies what happens to PVCs created from StatefulSet
+                      VolumeClaimTemplates when the StatefulSet is scaled down. The default
+                      policy of `Retain` causes PVCs to not be affected by a scaledown. The
+                      `Delete` policy causes the associated PVCs for any excess pods above
+                      the replica count to be deleted.
+                    type: string
+                type: object
+              podMetadata:
+                description: |-
+                  podMetadata defines labels and annotations which are propagated to the Prometheus pods.
+
+                  The following items are reserved and cannot be overridden:
+                  * "prometheus" label, set to the name of the Prometheus object.
+                  * "app.kubernetes.io/instance" label, set to the name of the Prometheus object.
+                  * "app.kubernetes.io/managed-by" label, set to "prometheus-operator".
+                  * "app.kubernetes.io/name" label, set to "prometheus".
+                  * "app.kubernetes.io/version" label, set to the Prometheus version.
+                  * "operator.prometheus.io/name" label, set to the name of the Prometheus object.
+                  * "operator.prometheus.io/shard" label, set to the shard number of the Prometheus object.
+                  * "kubectl.kubernetes.io/default-container" annotation, set to "prometheus".
+                properties:
+                  annotations:
+                    additionalProperties:
+                      type: string
+                    description: |-
+                      annotations defines an unstructured key value map stored with a resource that may be
+                      set by external tools to store and retrieve arbitrary metadata. They are not
+                      queryable and should be preserved when modifying objects.
+                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
+                    type: object
+                  labels:
+                    additionalProperties:
+                      type: string
+                    description: |-
+                      labels define the map of string keys and values that can be used to organize and categorize
+                      (scope and select) objects. May match selectors of replication controllers
+                      and services.
+                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
+                    type: object
+                  name:
+                    description: |-
+                      name must be unique within a namespace. Is required when creating resources, although
+                      some resources may allow a client to request the generation of an appropriate name
+                      automatically. Name is primarily intended for creation idempotence and configuration
+                      definition.
+                      Cannot be updated.
+                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/
+                    type: string
+                type: object
+              podMonitorNamespaceSelector:
+                description: |-
+                  podMonitorNamespaceSelector defines the namespaces to match for PodMonitors discovery. An empty label selector
+                  matches all namespaces. A null label selector (default value) matches the current
+                  namespace only.
+                properties:
+                  matchExpressions:
+                    description: matchExpressions is a list of label selector requirements.
+                      The requirements are ANDed.
+                    items:
+                      description: |-
+                        A label selector requirement is a selector that contains values, a key, and an operator that
+                        relates the key and values.
+                      properties:
+                        key:
+                          description: key is the label key that the selector applies
+                            to.
+                          type: string
+                        operator:
+                          description: |-
+                            operator represents a key's relationship to a set of values.
+                            Valid operators are In, NotIn, Exists and DoesNotExist.
+                          type: string
+                        values:
+                          description: |-
+                            values is an array of string values. If the operator is In or NotIn,
+                            the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                            the values array must be empty. This array is replaced during a strategic
+                            merge patch.
+                          items:
+                            type: string
+                          type: array
+                          x-kubernetes-list-type: atomic
+                      required:
+                      - key
+                      - operator
+                      type: object
+                    type: array
+                    x-kubernetes-list-type: atomic
+                  matchLabels:
+                    additionalProperties:
+                      type: string
+                    description: |-
+                      matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                      map is equivalent to an element of matchExpressions, whose key field is "key", the
+                      operator is "In", and the values array contains only "value". The requirements are ANDed.
+                    type: object
+                type: object
+                x-kubernetes-map-type: atomic
+              podMonitorSelector:
+                description: |-
+                  podMonitorSelector defines the podMonitors to be selected for target discovery. An empty label selector
+                  matches all objects. A null label selector matches no objects.
+
+                  If `spec.serviceMonitorSelector`, `spec.podMonitorSelector`, `spec.probeSelector`
+                  and `spec.scrapeConfigSelector` are null, the Prometheus configuration is unmanaged.
+                  The Prometheus operator will ensure that the Prometheus configuration's
+                  Secret exists, but it is the responsibility of the user to provide the raw
+                  gzipped Prometheus configuration under the `prometheus.yaml.gz` key.
+                  This behavior is *deprecated* and will be removed in the next major version
+                  of the custom resource definition. It is recommended to use
+                  `spec.additionalScrapeConfigs` instead.
+                properties:
+                  matchExpressions:
+                    description: matchExpressions is a list of label selector requirements.
+                      The requirements are ANDed.
+                    items:
+                      description: |-
+                        A label selector requirement is a selector that contains values, a key, and an operator that
+                        relates the key and values.
+                      properties:
+                        key:
+                          description: key is the label key that the selector applies
+                            to.
+                          type: string
+                        operator:
+                          description: |-
+                            operator represents a key's relationship to a set of values.
+                            Valid operators are In, NotIn, Exists and DoesNotExist.
+                          type: string
+                        values:
+                          description: |-
+                            values is an array of string values. If the operator is In or NotIn,
+                            the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                            the values array must be empty. This array is replaced during a strategic
+                            merge patch.
+                          items:
+                            type: string
+                          type: array
+                          x-kubernetes-list-type: atomic
+                      required:
+                      - key
+                      - operator
+                      type: object
+                    type: array
+                    x-kubernetes-list-type: atomic
+                  matchLabels:
+                    additionalProperties:
+                      type: string
+                    description: |-
+                      matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                      map is equivalent to an element of matchExpressions, whose key field is "key", the
+                      operator is "In", and the values array contains only "value". The requirements are ANDed.
+                    type: object
+                type: object
+                x-kubernetes-map-type: atomic
+              podTargetLabels:
+                description: |-
+                  podTargetLabels are appended to the `spec.podTargetLabels` field of all
+                  PodMonitor and ServiceMonitor objects.
+                items:
+                  type: string
+                type: array
+              portName:
+                default: web
+                description: |-
+                  portName used for the pods and governing service.
+                  Default: "web"
+                type: string
+              priorityClassName:
+                description: priorityClassName assigned to the Pods.
+                type: string
+              probeNamespaceSelector:
+                description: |-
+                  probeNamespaceSelector defines the namespaces to match for Probe discovery. An empty label
+                  selector matches all namespaces. A null label selector matches the
+                  current namespace only.
+                properties:
+                  matchExpressions:
+                    description: matchExpressions is a list of label selector requirements.
+                      The requirements are ANDed.
+                    items:
+                      description: |-
+                        A label selector requirement is a selector that contains values, a key, and an operator that
+                        relates the key and values.
+                      properties:
+                        key:
+                          description: key is the label key that the selector applies
+                            to.
+                          type: string
+                        operator:
+                          description: |-
+                            operator represents a key's relationship to a set of values.
+                            Valid operators are In, NotIn, Exists and DoesNotExist.
+                          type: string
+                        values:
+                          description: |-
+                            values is an array of string values. If the operator is In or NotIn,
+                            the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                            the values array must be empty. This array is replaced during a strategic
+                            merge patch.
+                          items:
+                            type: string
+                          type: array
+                          x-kubernetes-list-type: atomic
+                      required:
+                      - key
+                      - operator
+                      type: object
+                    type: array
+                    x-kubernetes-list-type: atomic
+                  matchLabels:
+                    additionalProperties:
+                      type: string
+                    description: |-
+                      matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                      map is equivalent to an element of matchExpressions, whose key field is "key", the
+                      operator is "In", and the values array contains only "value". The requirements are ANDed.
+                    type: object
+                type: object
+                x-kubernetes-map-type: atomic
+              probeSelector:
+                description: |-
+                  probeSelector defines the probes to be selected for target discovery. An empty label selector
+                  matches all objects. A null label selector matches no objects.
+
+                  If `spec.serviceMonitorSelector`, `spec.podMonitorSelector`, `spec.probeSelector`
+                  and `spec.scrapeConfigSelector` are null, the Prometheus configuration is unmanaged.
+                  The Prometheus operator will ensure that the Prometheus configuration's
+                  Secret exists, but it is the responsibility of the user to provide the raw
+                  gzipped Prometheus configuration under the `prometheus.yaml.gz` key.
+                  This behavior is *deprecated* and will be removed in the next major version
+                  of the custom resource definition. It is recommended to use
+                  `spec.additionalScrapeConfigs` instead.
+                properties:
+                  matchExpressions:
+                    description: matchExpressions is a list of label selector requirements.
+                      The requirements are ANDed.
+                    items:
+                      description: |-
+                        A label selector requirement is a selector that contains values, a key, and an operator that
+                        relates the key and values.
+                      properties:
+                        key:
+                          description: key is the label key that the selector applies
+                            to.
+                          type: string
+                        operator:
+                          description: |-
+                            operator represents a key's relationship to a set of values.
+                            Valid operators are In, NotIn, Exists and DoesNotExist.
+                          type: string
+                        values:
+                          description: |-
+                            values is an array of string values. If the operator is In or NotIn,
+                            the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                            the values array must be empty. This array is replaced during a strategic
+                            merge patch.
+                          items:
+                            type: string
+                          type: array
+                          x-kubernetes-list-type: atomic
+                      required:
+                      - key
+                      - operator
+                      type: object
+                    type: array
+                    x-kubernetes-list-type: atomic
+                  matchLabels:
+                    additionalProperties:
+                      type: string
+                    description: |-
+                      matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                      map is equivalent to an element of matchExpressions, whose key field is "key", the
+                      operator is "In", and the values array contains only "value". The requirements are ANDed.
+                    type: object
+                type: object
+                x-kubernetes-map-type: atomic
+              prometheusExternalLabelName:
+                description: |-
+                  prometheusExternalLabelName defines the name of Prometheus external label used to denote the Prometheus instance
+                  name. The external label will _not_ be added when the field is set to
+                  the empty string (`""`).
+
+                  Default: "prometheus"
+                type: string
+              reloadStrategy:
+                description: |-
+                  reloadStrategy defines the strategy used to reload the Prometheus configuration.
+                  If not specified, the configuration is reloaded using the /-/reload HTTP endpoint.
+                enum:
+                - HTTP
+                - ProcessSignal
+                type: string
+              remoteWrite:
+                description: remoteWrite defines the list of remote write configurations.
+                items:
+                  description: |-
+                    RemoteWriteSpec defines the configuration to write samples from Prometheus
+                    to a remote endpoint.
+                  properties:
+                    authorization:
+                      description: |-
+                        authorization section for the URL.
+
+                        It requires Prometheus >= v2.26.0 or Thanos >= v0.24.0.
+
+                        Cannot be set at the same time as `sigv4`, `basicAuth`, `oauth2`, or `azureAd`.
+                      properties:
+                        credentials:
+                          description: credentials defines a key of a Secret in the
+                            namespace that contains the credentials for authentication.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        credentialsFile:
+                          description: credentialsFile defines the file to read a
+                            secret from, mutually exclusive with `credentials`.
+                          type: string
+                        type:
+                          description: |-
+                            type defines the authentication type. The value is case-insensitive.
+
+                            "Basic" is not a supported value.
+
+                            Default: "Bearer"
+                          type: string
+                      type: object
+                    azureAd:
+                      description: |-
+                        azureAd for the URL.
+
+                        It requires Prometheus >= v2.45.0 or Thanos >= v0.31.0.
+
+                        Cannot be set at the same time as `authorization`, `basicAuth`, `oauth2`, or `sigv4`.
+                      properties:
+                        cloud:
+                          description: cloud defines the Azure Cloud. Options are
+                            'AzurePublic', 'AzureChina', or 'AzureGovernment'.
+                          enum:
+                          - AzureChina
+                          - AzureGovernment
+                          - AzurePublic
+                          type: string
+                        managedIdentity:
+                          description: |-
+                            managedIdentity defines the Azure User-assigned Managed identity.
+                            Cannot be set at the same time as `oauth` or `sdk`.
+                          properties:
+                            clientId:
+                              description: |-
+                                clientId defines the Azure User-assigned Managed identity.
+
+                                For Prometheus >= 3.5.0 and Thanos >= 0.40.0, this field is allowed to be empty to support system-assigned managed identities.
+                              minLength: 1
+                              type: string
+                          type: object
+                        oauth:
+                          description: |-
+                            oauth defines the oauth config that is being used to authenticate.
+                            Cannot be set at the same time as `managedIdentity` or `sdk`.
+
+                            It requires Prometheus >= v2.48.0 or Thanos >= v0.31.0.
+                          properties:
+                            clientId:
+                              description: clientId defines the clientId of the Azure
+                                Active Directory application that is being used to
+                                authenticate.
+                              minLength: 1
+                              type: string
+                            clientSecret:
+                              description: clientSecret specifies a key of a Secret
+                                containing the client secret of the Azure Active Directory
+                                application that is being used to authenticate.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            tenantId:
+                              description: tenantId is the tenant ID of the Azure
+                                Active Directory application that is being used to
+                                authenticate.
+                              minLength: 1
+                              pattern: ^[0-9a-zA-Z-.]+$
+                              type: string
+                          required:
+                          - clientId
+                          - clientSecret
+                          - tenantId
+                          type: object
+                        sdk:
+                          description: |-
+                            sdk defines the Azure SDK config that is being used to authenticate.
+                            See https://learn.microsoft.com/en-us/azure/developer/go/azure-sdk-authentication
+                            Cannot be set at the same time as `oauth` or `managedIdentity`.
+
+                            It requires Prometheus >= v2.52.0 or Thanos >= v0.36.0.
+                          properties:
+                            tenantId:
+                              description: tenantId defines the tenant ID of the azure
+                                active directory application that is being used to
+                                authenticate.
+                              pattern: ^[0-9a-zA-Z-.]+$
+                              type: string
+                          type: object
+                      type: object
+                    basicAuth:
+                      description: |-
+                        basicAuth configuration for the URL.
+
+                        Cannot be set at the same time as `sigv4`, `authorization`, `oauth2`, or `azureAd`.
+                      properties:
+                        password:
+                          description: |-
+                            password defines a key of a Secret containing the password for
+                            authentication.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        username:
+                          description: |-
+                            username defines a key of a Secret containing the username for
+                            authentication.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                      type: object
+                    bearerToken:
+                      description: |-
+                        bearerToken is deprecated: this will be removed in a future release.
+                        *Warning: this field shouldn't be used because the token value appears
+                        in clear-text. Prefer using `authorization`.*
+                      type: string
+                    bearerTokenFile:
+                      description: |-
+                        bearerTokenFile defines the file from which to read bearer token for the URL.
+
+                        Deprecated: this will be removed in a future release. Prefer using `authorization`.
+                      type: string
+                    enableHTTP2:
+                      description: enableHTTP2 defines whether to enable HTTP2.
+                      type: boolean
+                    followRedirects:
+                      description: |-
+                        followRedirects defines whether HTTP requests follow HTTP 3xx redirects.
+
+                        It requires Prometheus >= v2.26.0 or Thanos >= v0.24.0.
+                      type: boolean
+                    headers:
+                      additionalProperties:
+                        type: string
+                      description: |-
+                        headers defines the custom HTTP headers to be sent along with each remote write request.
+                        Be aware that headers that are set by Prometheus itself can't be overwritten.
+
+                        It requires Prometheus >= v2.25.0 or Thanos >= v0.24.0.
+                      type: object
+                    messageVersion:
+                      description: |-
+                        messageVersion defines the Remote Write message's version to use when writing to the endpoint.
+
+                        `Version1.0` corresponds to the `prometheus.WriteRequest` protobuf message introduced in Remote Write 1.0.
+                        `Version2.0` corresponds to the `io.prometheus.write.v2.Request` protobuf message introduced in Remote Write 2.0.
+
+                        When `Version2.0` is selected, Prometheus will automatically be
+                        configured to append the metadata of scraped metrics to the WAL.
+
+                        Before setting this field, consult with your remote storage provider
+                        what message version it supports.
+
+                        It requires Prometheus >= v2.54.0 or Thanos >= v0.37.0.
+                      enum:
+                      - V1.0
+                      - V2.0
+                      type: string
+                    metadataConfig:
+                      description: |-
+                        metadataConfig defines how to send a series metadata to the remote storage.
+
+                        When the field is empty, **no metadata** is sent. But when the field is
+                        null, metadata is sent.
+                      properties:
+                        maxSamplesPerSend:
+                          description: |-
+                            maxSamplesPerSend defines the maximum number of metadata samples per send.
+
+                            It requires Prometheus >= v2.29.0.
+                          format: int32
+                          minimum: -1
+                          type: integer
+                        send:
+                          description: send defines whether metric metadata is sent
+                            to the remote storage or not.
+                          type: boolean
+                        sendInterval:
+                          description: sendInterval defines how frequently metric
+                            metadata is sent to the remote storage.
+                          pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
+                          type: string
+                      type: object
+                    name:
+                      description: |-
+                        name of the remote write queue, it must be unique if specified. The
+                        name is used in metrics and logging in order to differentiate queues.
+
+                        It requires Prometheus >= v2.15.0 or Thanos >= 0.24.0.
+                      type: string
+                    noProxy:
+                      description: |-
+                        noProxy defines a comma-separated string that can contain IPs, CIDR notation, domain names
+                        that should be excluded from proxying. IP and domain names can
+                        contain port numbers.
+
+                        It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                      type: string
+                    oauth2:
+                      description: |-
+                        oauth2 configuration for the URL.
+
+                        It requires Prometheus >= v2.27.0 or Thanos >= v0.24.0.
+
+                        Cannot be set at the same time as `sigv4`, `authorization`, `basicAuth`, or `azureAd`.
+                      properties:
+                        clientId:
+                          description: |-
+                            clientId defines a key of a Secret or ConfigMap containing the
+                            OAuth2 client's ID.
+                          properties:
+                            configMap:
+                              description: configMap defines the ConfigMap containing
+                                data to use for the targets.
+                              properties:
+                                key:
+                                  description: The key to select.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the ConfigMap or its
+                                    key must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            secret:
+                              description: secret defines the Secret containing data
+                                to use for the targets.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                          type: object
+                        clientSecret:
+                          description: |-
+                            clientSecret defines a key of a Secret containing the OAuth2
+                            client's secret.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        endpointParams:
+                          additionalProperties:
+                            type: string
+                          description: |-
+                            endpointParams configures the HTTP parameters to append to the token
+                            URL.
+                          type: object
+                        noProxy:
+                          description: |-
+                            noProxy defines a comma-separated string that can contain IPs, CIDR notation, domain names
+                            that should be excluded from proxying. IP and domain names can
+                            contain port numbers.
+
+                            It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                          type: string
+                        proxyConnectHeader:
+                          additionalProperties:
+                            items:
+                              description: SecretKeySelector selects a key of a Secret.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            type: array
+                          description: |-
+                            proxyConnectHeader optionally specifies headers to send to
+                            proxies during CONNECT requests.
+
+                            It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        proxyFromEnvironment:
+                          description: |-
+                            proxyFromEnvironment defines whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+
+                            It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                          type: boolean
+                        proxyUrl:
+                          description: proxyUrl defines the HTTP proxy server to use.
+                          pattern: ^(http|https|socks5)://.+$
+                          type: string
+                        scopes:
+                          description: scopes defines the OAuth2 scopes used for the
+                            token request.
+                          items:
+                            type: string
+                          type: array
+                        tlsConfig:
+                          description: |-
+                            tlsConfig defines the TLS configuration to use when connecting to the OAuth2 server.
+                            It requires Prometheus >= v2.43.0.
+                          properties:
+                            ca:
+                              description: ca defines the Certificate authority used
+                                when verifying server certificates.
+                              properties:
+                                configMap:
+                                  description: configMap defines the ConfigMap containing
+                                    data to use for the targets.
+                                  properties:
+                                    key:
+                                      description: The key to select.
+                                      type: string
+                                    name:
+                                      default: ""
+                                      description: |-
+                                        Name of the referent.
+                                        This field is effectively required, but due to backwards compatibility is
+                                        allowed to be empty. Instances of this type with an empty value here are
+                                        almost certainly wrong.
+                                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                      type: string
+                                    optional:
+                                      description: Specify whether the ConfigMap or
+                                        its key must be defined
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                secret:
+                                  description: secret defines the Secret containing
+                                    data to use for the targets.
+                                  properties:
+                                    key:
+                                      description: The key of the secret to select
+                                        from.  Must be a valid secret key.
+                                      type: string
+                                    name:
+                                      default: ""
+                                      description: |-
+                                        Name of the referent.
+                                        This field is effectively required, but due to backwards compatibility is
+                                        allowed to be empty. Instances of this type with an empty value here are
+                                        almost certainly wrong.
+                                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                      type: string
+                                    optional:
+                                      description: Specify whether the Secret or its
+                                        key must be defined
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                              type: object
+                            cert:
+                              description: cert defines the Client certificate to
+                                present when doing client-authentication.
+                              properties:
+                                configMap:
+                                  description: configMap defines the ConfigMap containing
+                                    data to use for the targets.
+                                  properties:
+                                    key:
+                                      description: The key to select.
+                                      type: string
+                                    name:
+                                      default: ""
+                                      description: |-
+                                        Name of the referent.
+                                        This field is effectively required, but due to backwards compatibility is
+                                        allowed to be empty. Instances of this type with an empty value here are
+                                        almost certainly wrong.
+                                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                      type: string
+                                    optional:
+                                      description: Specify whether the ConfigMap or
+                                        its key must be defined
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                secret:
+                                  description: secret defines the Secret containing
+                                    data to use for the targets.
+                                  properties:
+                                    key:
+                                      description: The key of the secret to select
+                                        from.  Must be a valid secret key.
+                                      type: string
+                                    name:
+                                      default: ""
+                                      description: |-
+                                        Name of the referent.
+                                        This field is effectively required, but due to backwards compatibility is
+                                        allowed to be empty. Instances of this type with an empty value here are
+                                        almost certainly wrong.
+                                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                      type: string
+                                    optional:
+                                      description: Specify whether the Secret or its
+                                        key must be defined
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                              type: object
+                            insecureSkipVerify:
+                              description: insecureSkipVerify defines how to disable
+                                target certificate validation.
+                              type: boolean
+                            keySecret:
+                              description: keySecret defines the Secret containing
+                                the client key file for the targets.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            maxVersion:
+                              description: |-
+                                maxVersion defines the maximum acceptable TLS version.
+
+                                It requires Prometheus >= v2.41.0 or Thanos >= v0.31.0.
+                              enum:
+                              - TLS10
+                              - TLS11
+                              - TLS12
+                              - TLS13
+                              type: string
+                            minVersion:
+                              description: |-
+                                minVersion defines the minimum acceptable TLS version.
+
+                                It requires Prometheus >= v2.35.0 or Thanos >= v0.28.0.
+                              enum:
+                              - TLS10
+                              - TLS11
+                              - TLS12
+                              - TLS13
+                              type: string
+                            serverName:
+                              description: serverName is used to verify the hostname
+                                for the targets.
+                              type: string
+                          type: object
+                        tokenUrl:
+                          description: tokenUrl defines the URL to fetch the token
+                            from.
+                          minLength: 1
+                          type: string
+                      required:
+                      - clientId
+                      - clientSecret
+                      - tokenUrl
+                      type: object
+                    proxyConnectHeader:
+                      additionalProperties:
+                        items:
+                          description: SecretKeySelector selects a key of a Secret.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        type: array
+                      description: |-
+                        proxyConnectHeader optionally specifies headers to send to
+                        proxies during CONNECT requests.
+
+                        It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                      type: object
+                      x-kubernetes-map-type: atomic
+                    proxyFromEnvironment:
+                      description: |-
+                        proxyFromEnvironment defines whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+
+                        It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                      type: boolean
+                    proxyUrl:
+                      description: proxyUrl defines the HTTP proxy server to use.
+                      pattern: ^(http|https|socks5)://.+$
+                      type: string
+                    queueConfig:
+                      description: queueConfig allows tuning of the remote write queue
+                        parameters.
+                      properties:
+                        batchSendDeadline:
+                          description: batchSendDeadline defines the maximum time
+                            a sample will wait in buffer.
+                          pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
+                          type: string
+                        capacity:
+                          description: |-
+                            capacity defines the number of samples to buffer per shard before we start
+                            dropping them.
+                          type: integer
+                        maxBackoff:
+                          description: maxBackoff defines the maximum retry delay.
+                          pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
+                          type: string
+                        maxRetries:
+                          description: maxRetries defines the maximum number of times
+                            to retry a batch on recoverable errors.
+                          type: integer
+                        maxSamplesPerSend:
+                          description: maxSamplesPerSend defines the maximum number
+                            of samples per send.
+                          type: integer
+                        maxShards:
+                          description: maxShards defines the maximum number of shards,
+                            i.e. amount of concurrency.
+                          type: integer
+                        minBackoff:
+                          description: minBackoff defines the initial retry delay.
+                            Gets doubled for every retry.
+                          pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
+                          type: string
+                        minShards:
+                          description: minShards defines the minimum number of shards,
+                            i.e. amount of concurrency.
+                          type: integer
+                        retryOnRateLimit:
+                          description: |-
+                            retryOnRateLimit defines the retry upon receiving a 429 status code from the remote-write storage.
+
+                            This is an *experimental feature*, it may change in any upcoming release
+                            in a breaking way.
+                          type: boolean
+                        sampleAgeLimit:
+                          description: |-
+                            sampleAgeLimit drops samples older than the limit.
+                            It requires Prometheus >= v2.50.0 or Thanos >= v0.32.0.
+                          pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
+                          type: string
+                      type: object
+                    remoteTimeout:
+                      description: remoteTimeout defines the timeout for requests
+                        to the remote write endpoint.
+                      pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
+                      type: string
+                    roundRobinDNS:
+                      description: "roundRobinDNS controls the DNS resolution behavior
+                        for remote-write connections.\nWhen enabled:\n  - The remote-write
+                        mechanism will resolve the hostname via DNS.\n  - It will
+                        randomly select one of the resolved IP addresses and connect
+                        to it.\n\nWhen disabled (default behavior):\n  - The Go standard
+                        library will handle hostname resolution.\n  - It will attempt
+                        connections to each resolved IP address sequentially.\n\nNote:
+                        The connection timeout applies to the entire resolution and
+                        connection process.\n\n\tIf disabled, the timeout is distributed
+                        across all connection attempts.\n\nIt requires Prometheus
+                        >= v3.1.0 or Thanos >= v0.38.0."
+                      type: boolean
+                    sendExemplars:
+                      description: |-
+                        sendExemplars enables sending of exemplars over remote write. Note that
+                        exemplar-storage itself must be enabled using the `spec.enableFeatures`
+                        option for exemplars to be scraped in the first place.
+
+                        It requires Prometheus >= v2.27.0 or Thanos >= v0.24.0.
+                      type: boolean
+                    sendNativeHistograms:
+                      description: |-
+                        sendNativeHistograms enables sending of native histograms, also known as sparse histograms
+                        over remote write.
+
+                        It requires Prometheus >= v2.40.0 or Thanos >= v0.30.0.
+                      type: boolean
+                    sigv4:
+                      description: |-
+                        sigv4 defines the AWS's Signature Verification 4 for the URL.
+
+                        It requires Prometheus >= v2.26.0 or Thanos >= v0.24.0.
+
+                        Cannot be set at the same time as `authorization`, `basicAuth`, `oauth2`, or `azureAd`.
+                      properties:
+                        accessKey:
+                          description: |-
+                            accessKey defines the AWS API key. If not specified, the environment variable
+                            `AWS_ACCESS_KEY_ID` is used.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        profile:
+                          description: profile defines the named AWS profile used
+                            to authenticate.
+                          type: string
+                        region:
+                          description: region defines the AWS region. If blank, the
+                            region from the default credentials chain used.
+                          type: string
+                        roleArn:
+                          description: roleArn defines the named AWS profile used
+                            to authenticate.
+                          type: string
+                        secretKey:
+                          description: |-
+                            secretKey defines the AWS API secret. If not specified, the environment
+                            variable `AWS_SECRET_ACCESS_KEY` is used.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        useFIPSSTSEndpoint:
+                          description: |-
+                            useFIPSSTSEndpoint defines the FIPS mode for the AWS STS endpoint.
+                            It requires Prometheus >= v2.54.0.
+                          type: boolean
+                      type: object
+                    tlsConfig:
+                      description: tlsConfig to use for the URL.
+                      properties:
+                        ca:
+                          description: ca defines the Certificate authority used when
+                            verifying server certificates.
+                          properties:
+                            configMap:
+                              description: configMap defines the ConfigMap containing
+                                data to use for the targets.
+                              properties:
+                                key:
+                                  description: The key to select.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the ConfigMap or its
+                                    key must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            secret:
+                              description: secret defines the Secret containing data
+                                to use for the targets.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                          type: object
+                        caFile:
+                          description: caFile defines the path to the CA cert in the
+                            Prometheus container to use for the targets.
+                          type: string
+                        cert:
+                          description: cert defines the Client certificate to present
+                            when doing client-authentication.
+                          properties:
+                            configMap:
+                              description: configMap defines the ConfigMap containing
+                                data to use for the targets.
+                              properties:
+                                key:
+                                  description: The key to select.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the ConfigMap or its
+                                    key must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            secret:
+                              description: secret defines the Secret containing data
+                                to use for the targets.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                          type: object
+                        certFile:
+                          description: certFile defines the path to the client cert
+                            file in the Prometheus container for the targets.
+                          type: string
+                        insecureSkipVerify:
+                          description: insecureSkipVerify defines how to disable target
+                            certificate validation.
+                          type: boolean
+                        keyFile:
+                          description: keyFile defines the path to the client key
+                            file in the Prometheus container for the targets.
+                          type: string
+                        keySecret:
+                          description: keySecret defines the Secret containing the
+                            client key file for the targets.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        maxVersion:
+                          description: |-
+                            maxVersion defines the maximum acceptable TLS version.
+
+                            It requires Prometheus >= v2.41.0 or Thanos >= v0.31.0.
+                          enum:
+                          - TLS10
+                          - TLS11
+                          - TLS12
+                          - TLS13
+                          type: string
+                        minVersion:
+                          description: |-
+                            minVersion defines the minimum acceptable TLS version.
+
+                            It requires Prometheus >= v2.35.0 or Thanos >= v0.28.0.
+                          enum:
+                          - TLS10
+                          - TLS11
+                          - TLS12
+                          - TLS13
+                          type: string
+                        serverName:
+                          description: serverName is used to verify the hostname for
+                            the targets.
+                          type: string
+                      type: object
+                    url:
+                      description: url defines the URL of the endpoint to send samples
+                        to.
+                      minLength: 1
+                      type: string
+                    writeRelabelConfigs:
+                      description: writeRelabelConfigs defines the list of remote
+                        write relabel configurations.
+                      items:
+                        description: |-
+                          RelabelConfig allows dynamic rewriting of the label set for targets, alerts,
+                          scraped samples and remote write samples.
+
+                          More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config
+                        properties:
+                          action:
+                            default: replace
+                            description: |-
+                              action to perform based on the regex matching.
+
+                              `Uppercase` and `Lowercase` actions require Prometheus >= v2.36.0.
+                              `DropEqual` and `KeepEqual` actions require Prometheus >= v2.41.0.
+
+                              Default: "Replace"
+                            enum:
+                            - replace
+                            - Replace
+                            - keep
+                            - Keep
+                            - drop
+                            - Drop
+                            - hashmod
+                            - HashMod
+                            - labelmap
+                            - LabelMap
+                            - labeldrop
+                            - LabelDrop
+                            - labelkeep
+                            - LabelKeep
+                            - lowercase
+                            - Lowercase
+                            - uppercase
+                            - Uppercase
+                            - keepequal
+                            - KeepEqual
+                            - dropequal
+                            - DropEqual
+                            type: string
+                          modulus:
+                            description: |-
+                              modulus to take of the hash of the source label values.
+
+                              Only applicable when the action is `HashMod`.
+                            format: int64
+                            type: integer
+                          regex:
+                            description: regex defines the regular expression against
+                              which the extracted value is matched.
+                            type: string
+                          replacement:
+                            description: |-
+                              replacement value against which a Replace action is performed if the
+                              regular expression matches.
+
+                              Regex capture groups are available.
+                            type: string
+                          separator:
+                            description: separator defines the string between concatenated
+                              SourceLabels.
+                            type: string
+                          sourceLabels:
+                            description: |-
+                              sourceLabels defines the source labels select values from existing labels. Their content is
+                              concatenated using the configured Separator and matched against the
+                              configured regular expression.
+                            items:
+                              description: |-
+                                LabelName is a valid Prometheus label name.
+                                For Prometheus 3.x, a label name is valid if it contains UTF-8 characters.
+                                For Prometheus 2.x, a label name is only valid if it contains ASCII characters, letters, numbers, as well as underscores.
+                              type: string
+                            type: array
+                          targetLabel:
+                            description: |-
+                              targetLabel defines the label to which the resulting string is written in a replacement.
+
+                              It is mandatory for `Replace`, `HashMod`, `Lowercase`, `Uppercase`,
+                              `KeepEqual` and `DropEqual` actions.
+
+                              Regex capture groups are available.
+                            type: string
+                        type: object
+                      type: array
+                  required:
+                  - url
+                  type: object
+                type: array
+              remoteWriteReceiverMessageVersions:
+                description: |-
+                  remoteWriteReceiverMessageVersions list of the protobuf message versions to accept when receiving the
+                  remote writes.
+
+                  It requires Prometheus >= v2.54.0.
+                items:
+                  enum:
+                  - V1.0
+                  - V2.0
+                  type: string
+                minItems: 1
+                type: array
+                x-kubernetes-list-type: set
+              replicaExternalLabelName:
+                description: |-
+                  replicaExternalLabelName defines the name of Prometheus external label used to denote the replica name.
+                  The external label will _not_ be added when the field is set to the
+                  empty string (`""`).
+
+                  Default: "prometheus_replica"
+                type: string
+              replicas:
+                description: |-
+                  replicas defines the number of replicas of each shard to deploy for a Prometheus deployment.
+                  `spec.replicas` multiplied by `spec.shards` is the total number of Pods
+                  created.
+
+                  Default: 1
+                format: int32
+                type: integer
+              resources:
+                description: resources defines the resources requests and limits of
+                  the 'prometheus' container.
+                properties:
+                  claims:
+                    description: |-
+                      Claims lists the names of resources, defined in spec.resourceClaims,
+                      that are used by this container.
+
+                      This field depends on the
+                      DynamicResourceAllocation feature gate.
+
+                      This field is immutable. It can only be set for containers.
+                    items:
+                      description: ResourceClaim references one entry in PodSpec.ResourceClaims.
+                      properties:
+                        name:
+                          description: |-
+                            Name must match the name of one entry in pod.spec.resourceClaims of
+                            the Pod where this field is used. It makes that resource available
+                            inside a container.
+                          type: string
+                        request:
+                          description: |-
+                            Request is the name chosen for a request in the referenced claim.
+                            If empty, everything from the claim is made available, otherwise
+                            only the result of this request.
+                          type: string
+                      required:
+                      - name
+                      type: object
+                    type: array
+                    x-kubernetes-list-map-keys:
+                    - name
+                    x-kubernetes-list-type: map
+                  limits:
+                    additionalProperties:
+                      anyOf:
+                      - type: integer
+                      - type: string
+                      pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                      x-kubernetes-int-or-string: true
+                    description: |-
+                      Limits describes the maximum amount of compute resources allowed.
+                      More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+                    type: object
+                  requests:
+                    additionalProperties:
+                      anyOf:
+                      - type: integer
+                      - type: string
+                      pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                      x-kubernetes-int-or-string: true
+                    description: |-
+                      Requests describes the minimum amount of compute resources required.
+                      If Requests is omitted for a container, it defaults to Limits if that is explicitly specified,
+                      otherwise to an implementation-defined value. Requests cannot exceed Limits.
+                      More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+                    type: object
+                type: object
+              routePrefix:
+                description: |-
+                  routePrefix defines the route prefix Prometheus registers HTTP handlers for.
+
+                  This is useful when using `spec.externalURL`, and a proxy is rewriting
+                  HTTP routes of a request, and the actual ExternalURL is still true, but
+                  the server serves requests under a different route prefix. For example
+                  for use with `kubectl proxy`.
+                type: string
+              runtime:
+                description: runtime defines the values for the Prometheus process
+                  behavior
+                properties:
+                  goGC:
+                    description: |-
+                      goGC defines the Go garbage collection target percentage. Lowering this number may increase the CPU usage.
+                      See: https://tip.golang.org/doc/gc-guide#GOGC
+                    format: int32
+                    minimum: -1
+                    type: integer
+                type: object
+              sampleLimit:
+                description: |-
+                  sampleLimit defines per-scrape limit on number of scraped samples that will be accepted.
+                  Only valid in Prometheus versions 2.45.0 and newer.
+
+                  Note that the global limit only applies to scrape objects that don't specify an explicit limit value.
+                  If you want to enforce a maximum limit for all scrape objects, refer to enforcedSampleLimit.
+                format: int64
+                type: integer
+              scrapeClasses:
+                description: |-
+                  scrapeClasses defines the list of scrape classes to expose to scraping objects such as
+                  PodMonitors, ServiceMonitors, Probes and ScrapeConfigs.
+
+                  This is an *experimental feature*, it may change in any upcoming release
+                  in a breaking way.
+                items:
+                  properties:
+                    attachMetadata:
+                      description: |-
+                        attachMetadata defines additional metadata to the discovered targets.
+                        When the scrape object defines its own configuration, it takes
+                        precedence over the scrape class configuration.
+                      properties:
+                        node:
+                          description: |-
+                            node when set to true, Prometheus attaches node metadata to the discovered
+                            targets.
+
+                            The Prometheus service account must have the `list` and `watch`
+                            permissions on the `Nodes` objects.
+                          type: boolean
+                      type: object
+                    authorization:
+                      description: |-
+                        authorization section for the ScrapeClass.
+                        It will only apply if the scrape resource doesn't specify any Authorization.
+                      properties:
+                        credentials:
+                          description: credentials defines a key of a Secret in the
+                            namespace that contains the credentials for authentication.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        credentialsFile:
+                          description: credentialsFile defines the file to read a
+                            secret from, mutually exclusive with `credentials`.
+                          type: string
+                        type:
+                          description: |-
+                            type defines the authentication type. The value is case-insensitive.
+
+                            "Basic" is not a supported value.
+
+                            Default: "Bearer"
+                          type: string
+                      type: object
+                    default:
+                      description: |-
+                        default defines that the scrape applies to all scrape objects that
+                        don't configure an explicit scrape class name.
+
+                        Only one scrape class can be set as the default.
+                      type: boolean
+                    fallbackScrapeProtocol:
+                      description: |-
+                        fallbackScrapeProtocol defines the protocol to use if a scrape returns blank, unparseable, or otherwise invalid Content-Type.
+                        It will only apply if the scrape resource doesn't specify any FallbackScrapeProtocol
+
+                        It requires Prometheus >= v3.0.0.
+                      enum:
+                      - PrometheusProto
+                      - OpenMetricsText0.0.1
+                      - OpenMetricsText1.0.0
+                      - PrometheusText0.0.4
+                      - PrometheusText1.0.0
+                      type: string
+                    metricRelabelings:
+                      description: |-
+                        metricRelabelings defines the relabeling rules to apply to all samples before ingestion.
+
+                        The Operator adds the scrape class metric relabelings defined here.
+                        Then the Operator adds the target-specific metric relabelings defined in ServiceMonitors, PodMonitors, Probes and ScrapeConfigs.
+                        Then the Operator adds namespace enforcement relabeling rule, specified in '.spec.enforcedNamespaceLabel'.
+
+                        More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#metric_relabel_configs
+                      items:
+                        description: |-
+                          RelabelConfig allows dynamic rewriting of the label set for targets, alerts,
+                          scraped samples and remote write samples.
+
+                          More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config
+                        properties:
+                          action:
+                            default: replace
+                            description: |-
+                              action to perform based on the regex matching.
+
+                              `Uppercase` and `Lowercase` actions require Prometheus >= v2.36.0.
+                              `DropEqual` and `KeepEqual` actions require Prometheus >= v2.41.0.
+
+                              Default: "Replace"
+                            enum:
+                            - replace
+                            - Replace
+                            - keep
+                            - Keep
+                            - drop
+                            - Drop
+                            - hashmod
+                            - HashMod
+                            - labelmap
+                            - LabelMap
+                            - labeldrop
+                            - LabelDrop
+                            - labelkeep
+                            - LabelKeep
+                            - lowercase
+                            - Lowercase
+                            - uppercase
+                            - Uppercase
+                            - keepequal
+                            - KeepEqual
+                            - dropequal
+                            - DropEqual
+                            type: string
+                          modulus:
+                            description: |-
+                              modulus to take of the hash of the source label values.
+
+                              Only applicable when the action is `HashMod`.
+                            format: int64
+                            type: integer
+                          regex:
+                            description: regex defines the regular expression against
+                              which the extracted value is matched.
+                            type: string
+                          replacement:
+                            description: |-
+                              replacement value against which a Replace action is performed if the
+                              regular expression matches.
+
+                              Regex capture groups are available.
+                            type: string
+                          separator:
+                            description: separator defines the string between concatenated
+                              SourceLabels.
+                            type: string
+                          sourceLabels:
+                            description: |-
+                              sourceLabels defines the source labels select values from existing labels. Their content is
+                              concatenated using the configured Separator and matched against the
+                              configured regular expression.
+                            items:
+                              description: |-
+                                LabelName is a valid Prometheus label name.
+                                For Prometheus 3.x, a label name is valid if it contains UTF-8 characters.
+                                For Prometheus 2.x, a label name is only valid if it contains ASCII characters, letters, numbers, as well as underscores.
+                              type: string
+                            type: array
+                          targetLabel:
+                            description: |-
+                              targetLabel defines the label to which the resulting string is written in a replacement.
+
+                              It is mandatory for `Replace`, `HashMod`, `Lowercase`, `Uppercase`,
+                              `KeepEqual` and `DropEqual` actions.
+
+                              Regex capture groups are available.
+                            type: string
+                        type: object
+                      type: array
+                    name:
+                      description: name of the scrape class.
+                      minLength: 1
+                      type: string
+                    relabelings:
+                      description: |-
+                        relabelings defines the relabeling rules to apply to all scrape targets.
+
+                        The Operator automatically adds relabelings for a few standard Kubernetes fields
+                        like `__meta_kubernetes_namespace` and `__meta_kubernetes_service_name`.
+                        Then the Operator adds the scrape class relabelings defined here.
+                        Then the Operator adds the target-specific relabelings defined in the scrape object.
+
+                        More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config
+                      items:
+                        description: |-
+                          RelabelConfig allows dynamic rewriting of the label set for targets, alerts,
+                          scraped samples and remote write samples.
+
+                          More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config
+                        properties:
+                          action:
+                            default: replace
+                            description: |-
+                              action to perform based on the regex matching.
+
+                              `Uppercase` and `Lowercase` actions require Prometheus >= v2.36.0.
+                              `DropEqual` and `KeepEqual` actions require Prometheus >= v2.41.0.
+
+                              Default: "Replace"
+                            enum:
+                            - replace
+                            - Replace
+                            - keep
+                            - Keep
+                            - drop
+                            - Drop
+                            - hashmod
+                            - HashMod
+                            - labelmap
+                            - LabelMap
+                            - labeldrop
+                            - LabelDrop
+                            - labelkeep
+                            - LabelKeep
+                            - lowercase
+                            - Lowercase
+                            - uppercase
+                            - Uppercase
+                            - keepequal
+                            - KeepEqual
+                            - dropequal
+                            - DropEqual
+                            type: string
+                          modulus:
+                            description: |-
+                              modulus to take of the hash of the source label values.
+
+                              Only applicable when the action is `HashMod`.
+                            format: int64
+                            type: integer
+                          regex:
+                            description: regex defines the regular expression against
+                              which the extracted value is matched.
+                            type: string
+                          replacement:
+                            description: |-
+                              replacement value against which a Replace action is performed if the
+                              regular expression matches.
+
+                              Regex capture groups are available.
+                            type: string
+                          separator:
+                            description: separator defines the string between concatenated
+                              SourceLabels.
+                            type: string
+                          sourceLabels:
+                            description: |-
+                              sourceLabels defines the source labels select values from existing labels. Their content is
+                              concatenated using the configured Separator and matched against the
+                              configured regular expression.
+                            items:
+                              description: |-
+                                LabelName is a valid Prometheus label name.
+                                For Prometheus 3.x, a label name is valid if it contains UTF-8 characters.
+                                For Prometheus 2.x, a label name is only valid if it contains ASCII characters, letters, numbers, as well as underscores.
+                              type: string
+                            type: array
+                          targetLabel:
+                            description: |-
+                              targetLabel defines the label to which the resulting string is written in a replacement.
+
+                              It is mandatory for `Replace`, `HashMod`, `Lowercase`, `Uppercase`,
+                              `KeepEqual` and `DropEqual` actions.
+
+                              Regex capture groups are available.
+                            type: string
+                        type: object
+                      type: array
+                    tlsConfig:
+                      description: |-
+                        tlsConfig defines the TLS settings to use for the scrape. When the
+                        scrape objects define their own CA, certificate and/or key, they take
+                        precedence over the corresponding scrape class fields.
+
+                        For now only the `caFile`, `certFile` and `keyFile` fields are supported.
+                      properties:
+                        ca:
+                          description: ca defines the Certificate authority used when
+                            verifying server certificates.
+                          properties:
+                            configMap:
+                              description: configMap defines the ConfigMap containing
+                                data to use for the targets.
+                              properties:
+                                key:
+                                  description: The key to select.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the ConfigMap or its
+                                    key must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            secret:
+                              description: secret defines the Secret containing data
+                                to use for the targets.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                          type: object
+                        caFile:
+                          description: caFile defines the path to the CA cert in the
+                            Prometheus container to use for the targets.
+                          type: string
+                        cert:
+                          description: cert defines the Client certificate to present
+                            when doing client-authentication.
+                          properties:
+                            configMap:
+                              description: configMap defines the ConfigMap containing
+                                data to use for the targets.
+                              properties:
+                                key:
+                                  description: The key to select.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the ConfigMap or its
+                                    key must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            secret:
+                              description: secret defines the Secret containing data
+                                to use for the targets.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                          type: object
+                        certFile:
+                          description: certFile defines the path to the client cert
+                            file in the Prometheus container for the targets.
+                          type: string
+                        insecureSkipVerify:
+                          description: insecureSkipVerify defines how to disable target
+                            certificate validation.
+                          type: boolean
+                        keyFile:
+                          description: keyFile defines the path to the client key
+                            file in the Prometheus container for the targets.
+                          type: string
+                        keySecret:
+                          description: keySecret defines the Secret containing the
+                            client key file for the targets.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        maxVersion:
+                          description: |-
+                            maxVersion defines the maximum acceptable TLS version.
+
+                            It requires Prometheus >= v2.41.0 or Thanos >= v0.31.0.
+                          enum:
+                          - TLS10
+                          - TLS11
+                          - TLS12
+                          - TLS13
+                          type: string
+                        minVersion:
+                          description: |-
+                            minVersion defines the minimum acceptable TLS version.
+
+                            It requires Prometheus >= v2.35.0 or Thanos >= v0.28.0.
+                          enum:
+                          - TLS10
+                          - TLS11
+                          - TLS12
+                          - TLS13
+                          type: string
+                        serverName:
+                          description: serverName is used to verify the hostname for
+                            the targets.
+                          type: string
+                      type: object
+                  required:
+                  - name
+                  type: object
+                type: array
+                x-kubernetes-list-map-keys:
+                - name
+                x-kubernetes-list-type: map
+              scrapeClassicHistograms:
+                description: |-
+                  scrapeClassicHistograms defines whether to scrape a classic histogram that is also exposed as a native histogram.
+
+                  Notice: `scrapeClassicHistograms` corresponds to the `always_scrape_classic_histograms` field in the Prometheus configuration.
+
+                  It requires Prometheus >= v3.5.0.
+                type: boolean
+              scrapeConfigNamespaceSelector:
+                description: |-
+                  scrapeConfigNamespaceSelector defines the namespaces to match for ScrapeConfig discovery. An empty label selector
+                  matches all namespaces. A null label selector matches the current
+                  namespace only.
+
+                  Note that the ScrapeConfig custom resource definition is currently at Alpha level.
+                properties:
+                  matchExpressions:
+                    description: matchExpressions is a list of label selector requirements.
+                      The requirements are ANDed.
+                    items:
+                      description: |-
+                        A label selector requirement is a selector that contains values, a key, and an operator that
+                        relates the key and values.
+                      properties:
+                        key:
+                          description: key is the label key that the selector applies
+                            to.
+                          type: string
+                        operator:
+                          description: |-
+                            operator represents a key's relationship to a set of values.
+                            Valid operators are In, NotIn, Exists and DoesNotExist.
+                          type: string
+                        values:
+                          description: |-
+                            values is an array of string values. If the operator is In or NotIn,
+                            the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                            the values array must be empty. This array is replaced during a strategic
+                            merge patch.
+                          items:
+                            type: string
+                          type: array
+                          x-kubernetes-list-type: atomic
+                      required:
+                      - key
+                      - operator
+                      type: object
+                    type: array
+                    x-kubernetes-list-type: atomic
+                  matchLabels:
+                    additionalProperties:
+                      type: string
+                    description: |-
+                      matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                      map is equivalent to an element of matchExpressions, whose key field is "key", the
+                      operator is "In", and the values array contains only "value". The requirements are ANDed.
+                    type: object
+                type: object
+                x-kubernetes-map-type: atomic
+              scrapeConfigSelector:
+                description: |-
+                  scrapeConfigSelector defines the scrapeConfigs to be selected for target discovery. An empty label
+                  selector matches all objects. A null label selector matches no objects.
+
+                  If `spec.serviceMonitorSelector`, `spec.podMonitorSelector`, `spec.probeSelector`
+                  and `spec.scrapeConfigSelector` are null, the Prometheus configuration is unmanaged.
+                  The Prometheus operator will ensure that the Prometheus configuration's
+                  Secret exists, but it is the responsibility of the user to provide the raw
+                  gzipped Prometheus configuration under the `prometheus.yaml.gz` key.
+                  This behavior is *deprecated* and will be removed in the next major version
+                  of the custom resource definition. It is recommended to use
+                  `spec.additionalScrapeConfigs` instead.
+
+                  Note that the ScrapeConfig custom resource definition is currently at Alpha level.
+                properties:
+                  matchExpressions:
+                    description: matchExpressions is a list of label selector requirements.
+                      The requirements are ANDed.
+                    items:
+                      description: |-
+                        A label selector requirement is a selector that contains values, a key, and an operator that
+                        relates the key and values.
+                      properties:
+                        key:
+                          description: key is the label key that the selector applies
+                            to.
+                          type: string
+                        operator:
+                          description: |-
+                            operator represents a key's relationship to a set of values.
+                            Valid operators are In, NotIn, Exists and DoesNotExist.
+                          type: string
+                        values:
+                          description: |-
+                            values is an array of string values. If the operator is In or NotIn,
+                            the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                            the values array must be empty. This array is replaced during a strategic
+                            merge patch.
+                          items:
+                            type: string
+                          type: array
+                          x-kubernetes-list-type: atomic
+                      required:
+                      - key
+                      - operator
+                      type: object
+                    type: array
+                    x-kubernetes-list-type: atomic
+                  matchLabels:
+                    additionalProperties:
+                      type: string
+                    description: |-
+                      matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                      map is equivalent to an element of matchExpressions, whose key field is "key", the
+                      operator is "In", and the values array contains only "value". The requirements are ANDed.
+                    type: object
+                type: object
+                x-kubernetes-map-type: atomic
+              scrapeFailureLogFile:
+                description: |-
+                  scrapeFailureLogFile defines the file to which scrape failures are logged.
+                  Reloading the configuration will reopen the file.
+
+                  If the filename has an empty path, e.g. 'file.log', The Prometheus Pods
+                  will mount the file into an emptyDir volume at `/var/log/prometheus`.
+                  If a full path is provided, e.g. '/var/log/prometheus/file.log', you
+                  must mount a volume in the specified directory and it must be writable.
+                  It requires Prometheus >= v2.55.0.
+                minLength: 1
+                type: string
+              scrapeInterval:
+                default: 30s
+                description: |-
+                  scrapeInterval defines interval between consecutive scrapes.
+
+                  Default: "30s"
+                pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
+                type: string
+              scrapeProtocols:
+                description: |-
+                  scrapeProtocols defines the protocols to negotiate during a scrape. It tells clients the
+                  protocols supported by Prometheus in order of preference (from most to least preferred).
+
+                  If unset, Prometheus uses its default value.
+
+                  It requires Prometheus >= v2.49.0.
+
+                  `PrometheusText1.0.0` requires Prometheus >= v3.0.0.
+                items:
+                  description: |-
+                    ScrapeProtocol represents a protocol used by Prometheus for scraping metrics.
+                    Supported values are:
+                    * `OpenMetricsText0.0.1`
+                    * `OpenMetricsText1.0.0`
+                    * `PrometheusProto`
+                    * `PrometheusText0.0.4`
+                    * `PrometheusText1.0.0`
+                  enum:
+                  - PrometheusProto
+                  - OpenMetricsText0.0.1
+                  - OpenMetricsText1.0.0
+                  - PrometheusText0.0.4
+                  - PrometheusText1.0.0
+                  type: string
+                type: array
+                x-kubernetes-list-type: set
+              scrapeTimeout:
+                description: |-
+                  scrapeTimeout defines the number of seconds to wait until a scrape request times out.
+                  The value cannot be greater than the scrape interval otherwise the operator will reject the resource.
+                pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
+                type: string
+              secrets:
+                description: |-
+                  secrets defines a list of Secrets in the same namespace as the Prometheus
+                  object, which shall be mounted into the Prometheus Pods.
+                  Each Secret is added to the StatefulSet definition as a volume named `secret-<secret-name>`.
+                  The Secrets are mounted into /etc/prometheus/secrets/<secret-name> in the 'prometheus' container.
+                items:
+                  type: string
+                type: array
+                x-kubernetes-list-type: set
+              securityContext:
+                description: |-
+                  securityContext holds pod-level security attributes and common container settings.
+                  This defaults to the default PodSecurityContext.
+                properties:
+                  appArmorProfile:
+                    description: |-
+                      appArmorProfile is the AppArmor options to use by the containers in this pod.
+                      Note that this field cannot be set when spec.os.name is windows.
+                    properties:
+                      localhostProfile:
+                        description: |-
+                          localhostProfile indicates a profile loaded on the node that should be used.
+                          The profile must be preconfigured on the node to work.
+                          Must match the loaded name of the profile.
+                          Must be set if and only if type is "Localhost".
+                        type: string
+                      type:
+                        description: |-
+                          type indicates which kind of AppArmor profile will be applied.
+                          Valid options are:
+                            Localhost - a profile pre-loaded on the node.
+                            RuntimeDefault - the container runtime's default profile.
+                            Unconfined - no AppArmor enforcement.
+                        type: string
+                    required:
+                    - type
+                    type: object
+                  fsGroup:
+                    description: |-
+                      A special supplemental group that applies to all containers in a pod.
+                      Some volume types allow the Kubelet to change the ownership of that volume
+                      to be owned by the pod:
+
+                      1. The owning GID will be the FSGroup
+                      2. The setgid bit is set (new files created in the volume will be owned by FSGroup)
+                      3. The permission bits are OR'd with rw-rw----
+
+                      If unset, the Kubelet will not modify the ownership and permissions of any volume.
+                      Note that this field cannot be set when spec.os.name is windows.
+                    format: int64
+                    type: integer
+                  fsGroupChangePolicy:
+                    description: |-
+                      fsGroupChangePolicy defines behavior of changing ownership and permission of the volume
+                      before being exposed inside Pod. This field will only apply to
+                      volume types which support fsGroup based ownership(and permissions).
+                      It will have no effect on ephemeral volume types such as: secret, configmaps
+                      and emptydir.
+                      Valid values are "OnRootMismatch" and "Always". If not specified, "Always" is used.
+                      Note that this field cannot be set when spec.os.name is windows.
+                    type: string
+                  runAsGroup:
+                    description: |-
+                      The GID to run the entrypoint of the container process.
+                      Uses runtime default if unset.
+                      May also be set in SecurityContext.  If set in both SecurityContext and
+                      PodSecurityContext, the value specified in SecurityContext takes precedence
+                      for that container.
+                      Note that this field cannot be set when spec.os.name is windows.
+                    format: int64
+                    type: integer
+                  runAsNonRoot:
+                    description: |-
+                      Indicates that the container must run as a non-root user.
+                      If true, the Kubelet will validate the image at runtime to ensure that it
+                      does not run as UID 0 (root) and fail to start the container if it does.
+                      If unset or false, no such validation will be performed.
+                      May also be set in SecurityContext.  If set in both SecurityContext and
+                      PodSecurityContext, the value specified in SecurityContext takes precedence.
+                    type: boolean
+                  runAsUser:
+                    description: |-
+                      The UID to run the entrypoint of the container process.
+                      Defaults to user specified in image metadata if unspecified.
+                      May also be set in SecurityContext.  If set in both SecurityContext and
+                      PodSecurityContext, the value specified in SecurityContext takes precedence
+                      for that container.
+                      Note that this field cannot be set when spec.os.name is windows.
+                    format: int64
+                    type: integer
+                  seLinuxChangePolicy:
+                    description: |-
+                      seLinuxChangePolicy defines how the container's SELinux label is applied to all volumes used by the Pod.
+                      It has no effect on nodes that do not support SELinux or to volumes does not support SELinux.
+                      Valid values are "MountOption" and "Recursive".
+
+                      "Recursive" means relabeling of all files on all Pod volumes by the container runtime.
+                      This may be slow for large volumes, but allows mixing privileged and unprivileged Pods sharing the same volume on the same node.
+
+                      "MountOption" mounts all eligible Pod volumes with `-o context` mount option.
+                      This requires all Pods that share the same volume to use the same SELinux label.
+                      It is not possible to share the same volume among privileged and unprivileged Pods.
+                      Eligible volumes are in-tree FibreChannel and iSCSI volumes, and all CSI volumes
+                      whose CSI driver announces SELinux support by setting spec.seLinuxMount: true in their
+                      CSIDriver instance. Other volumes are always re-labelled recursively.
+                      "MountOption" value is allowed only when SELinuxMount feature gate is enabled.
+
+                      If not specified and SELinuxMount feature gate is enabled, "MountOption" is used.
+                      If not specified and SELinuxMount feature gate is disabled, "MountOption" is used for ReadWriteOncePod volumes
+                      and "Recursive" for all other volumes.
+
+                      This field affects only Pods that have SELinux label set, either in PodSecurityContext or in SecurityContext of all containers.
+
+                      All Pods that use the same volume should use the same seLinuxChangePolicy, otherwise some pods can get stuck in ContainerCreating state.
+                      Note that this field cannot be set when spec.os.name is windows.
+                    type: string
+                  seLinuxOptions:
+                    description: |-
+                      The SELinux context to be applied to all containers.
+                      If unspecified, the container runtime will allocate a random SELinux context for each
+                      container.  May also be set in SecurityContext.  If set in
+                      both SecurityContext and PodSecurityContext, the value specified in SecurityContext
+                      takes precedence for that container.
+                      Note that this field cannot be set when spec.os.name is windows.
+                    properties:
+                      level:
+                        description: Level is SELinux level label that applies to
+                          the container.
+                        type: string
+                      role:
+                        description: Role is a SELinux role label that applies to
+                          the container.
+                        type: string
+                      type:
+                        description: Type is a SELinux type label that applies to
+                          the container.
+                        type: string
+                      user:
+                        description: User is a SELinux user label that applies to
+                          the container.
+                        type: string
+                    type: object
+                  seccompProfile:
+                    description: |-
+                      The seccomp options to use by the containers in this pod.
+                      Note that this field cannot be set when spec.os.name is windows.
+                    properties:
+                      localhostProfile:
+                        description: |-
+                          localhostProfile indicates a profile defined in a file on the node should be used.
+                          The profile must be preconfigured on the node to work.
+                          Must be a descending path, relative to the kubelet's configured seccomp profile location.
+                          Must be set if type is "Localhost". Must NOT be set for any other type.
+                        type: string
+                      type:
+                        description: |-
+                          type indicates which kind of seccomp profile will be applied.
+                          Valid options are:
+
+                          Localhost - a profile defined in a file on the node should be used.
+                          RuntimeDefault - the container runtime default profile should be used.
+                          Unconfined - no profile should be applied.
+                        type: string
+                    required:
+                    - type
+                    type: object
+                  supplementalGroups:
+                    description: |-
+                      A list of groups applied to the first process run in each container, in
+                      addition to the container's primary GID and fsGroup (if specified).  If
+                      the SupplementalGroupsPolicy feature is enabled, the
+                      supplementalGroupsPolicy field determines whether these are in addition
+                      to or instead of any group memberships defined in the container image.
+                      If unspecified, no additional groups are added, though group memberships
+                      defined in the container image may still be used, depending on the
+                      supplementalGroupsPolicy field.
+                      Note that this field cannot be set when spec.os.name is windows.
+                    items:
+                      format: int64
+                      type: integer
+                    type: array
+                    x-kubernetes-list-type: atomic
+                  supplementalGroupsPolicy:
+                    description: |-
+                      Defines how supplemental groups of the first container processes are calculated.
+                      Valid values are "Merge" and "Strict". If not specified, "Merge" is used.
+                      (Alpha) Using the field requires the SupplementalGroupsPolicy feature gate to be enabled
+                      and the container runtime must implement support for this feature.
+                      Note that this field cannot be set when spec.os.name is windows.
+                    type: string
+                  sysctls:
+                    description: |-
+                      Sysctls hold a list of namespaced sysctls used for the pod. Pods with unsupported
+                      sysctls (by the container runtime) might fail to launch.
+                      Note that this field cannot be set when spec.os.name is windows.
+                    items:
+                      description: Sysctl defines a kernel parameter to be set
+                      properties:
+                        name:
+                          description: Name of a property to set
+                          type: string
+                        value:
+                          description: Value of a property to set
+                          type: string
+                      required:
+                      - name
+                      - value
+                      type: object
+                    type: array
+                    x-kubernetes-list-type: atomic
+                  windowsOptions:
+                    description: |-
+                      The Windows specific settings applied to all containers.
+                      If unspecified, the options within a container's SecurityContext will be used.
+                      If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence.
+                      Note that this field cannot be set when spec.os.name is linux.
+                    properties:
+                      gmsaCredentialSpec:
+                        description: |-
+                          GMSACredentialSpec is where the GMSA admission webhook
+                          (https://github.com/kubernetes-sigs/windows-gmsa) inlines the contents of the
+                          GMSA credential spec named by the GMSACredentialSpecName field.
+                        type: string
+                      gmsaCredentialSpecName:
+                        description: GMSACredentialSpecName is the name of the GMSA
+                          credential spec to use.
+                        type: string
+                      hostProcess:
+                        description: |-
+                          HostProcess determines if a container should be run as a 'Host Process' container.
+                          All of a Pod's containers must have the same effective HostProcess value
+                          (it is not allowed to have a mix of HostProcess containers and non-HostProcess containers).
+                          In addition, if HostProcess is true then HostNetwork must also be set to true.
+                        type: boolean
+                      runAsUserName:
+                        description: |-
+                          The UserName in Windows to run the entrypoint of the container process.
+                          Defaults to the user specified in image metadata if unspecified.
+                          May also be set in PodSecurityContext. If set in both SecurityContext and
+                          PodSecurityContext, the value specified in SecurityContext takes precedence.
+                        type: string
+                    type: object
+                type: object
+              serviceAccountName:
+                description: |-
+                  serviceAccountName is the name of the ServiceAccount to use to run the
+                  Prometheus Pods.
+                type: string
+              serviceDiscoveryRole:
+                description: |-
+                  serviceDiscoveryRole defines the service discovery role used to discover targets from
+                  `ServiceMonitor` objects and Alertmanager endpoints.
+
+                  If set, the value should be either "Endpoints" or "EndpointSlice".
+                  If unset, the operator assumes the "Endpoints" role.
+                enum:
+                - Endpoints
+                - EndpointSlice
+                type: string
+              serviceMonitorNamespaceSelector:
+                description: |-
+                  serviceMonitorNamespaceSelector defines the namespaces to match for ServicedMonitors discovery. An empty label selector
+                  matches all namespaces. A null label selector (default value) matches the current
+                  namespace only.
+                properties:
+                  matchExpressions:
+                    description: matchExpressions is a list of label selector requirements.
+                      The requirements are ANDed.
+                    items:
+                      description: |-
+                        A label selector requirement is a selector that contains values, a key, and an operator that
+                        relates the key and values.
+                      properties:
+                        key:
+                          description: key is the label key that the selector applies
+                            to.
+                          type: string
+                        operator:
+                          description: |-
+                            operator represents a key's relationship to a set of values.
+                            Valid operators are In, NotIn, Exists and DoesNotExist.
+                          type: string
+                        values:
+                          description: |-
+                            values is an array of string values. If the operator is In or NotIn,
+                            the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                            the values array must be empty. This array is replaced during a strategic
+                            merge patch.
+                          items:
+                            type: string
+                          type: array
+                          x-kubernetes-list-type: atomic
+                      required:
+                      - key
+                      - operator
+                      type: object
+                    type: array
+                    x-kubernetes-list-type: atomic
+                  matchLabels:
+                    additionalProperties:
+                      type: string
+                    description: |-
+                      matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                      map is equivalent to an element of matchExpressions, whose key field is "key", the
+                      operator is "In", and the values array contains only "value". The requirements are ANDed.
+                    type: object
+                type: object
+                x-kubernetes-map-type: atomic
+              serviceMonitorSelector:
+                description: |-
+                  serviceMonitorSelector defines the serviceMonitors to be selected for target discovery. An empty label
+                  selector matches all objects. A null label selector matches no objects.
+
+                  If `spec.serviceMonitorSelector`, `spec.podMonitorSelector`, `spec.probeSelector`
+                  and `spec.scrapeConfigSelector` are null, the Prometheus configuration is unmanaged.
+                  The Prometheus operator will ensure that the Prometheus configuration's
+                  Secret exists, but it is the responsibility of the user to provide the raw
+                  gzipped Prometheus configuration under the `prometheus.yaml.gz` key.
+                  This behavior is *deprecated* and will be removed in the next major version
+                  of the custom resource definition. It is recommended to use
+                  `spec.additionalScrapeConfigs` instead.
+                properties:
+                  matchExpressions:
+                    description: matchExpressions is a list of label selector requirements.
+                      The requirements are ANDed.
+                    items:
+                      description: |-
+                        A label selector requirement is a selector that contains values, a key, and an operator that
+                        relates the key and values.
+                      properties:
+                        key:
+                          description: key is the label key that the selector applies
+                            to.
+                          type: string
+                        operator:
+                          description: |-
+                            operator represents a key's relationship to a set of values.
+                            Valid operators are In, NotIn, Exists and DoesNotExist.
+                          type: string
+                        values:
+                          description: |-
+                            values is an array of string values. If the operator is In or NotIn,
+                            the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                            the values array must be empty. This array is replaced during a strategic
+                            merge patch.
+                          items:
+                            type: string
+                          type: array
+                          x-kubernetes-list-type: atomic
+                      required:
+                      - key
+                      - operator
+                      type: object
+                    type: array
+                    x-kubernetes-list-type: atomic
+                  matchLabels:
+                    additionalProperties:
+                      type: string
+                    description: |-
+                      matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                      map is equivalent to an element of matchExpressions, whose key field is "key", the
+                      operator is "In", and the values array contains only "value". The requirements are ANDed.
+                    type: object
+                type: object
+                x-kubernetes-map-type: atomic
+              serviceName:
+                description: |-
+                  serviceName defines the name of the service name used by the underlying StatefulSet(s) as the governing service.
+                  If defined, the Service  must be created before the Prometheus/PrometheusAgent resource in the same namespace and it must define a selector that matches the pod labels.
+                  If empty, the operator will create and manage a headless service named `prometheus-operated` for Prometheus resources,
+                  or `prometheus-agent-operated` for PrometheusAgent resources.
+                  When deploying multiple Prometheus/PrometheusAgent resources in the same namespace, it is recommended to specify a different value for each.
+                  See https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#stable-network-id for more details.
+                minLength: 1
+                type: string
+              shards:
+                description: |-
+                  shards defines the number of shards to distribute the scraped targets onto.
+
+                  `spec.replicas` multiplied by `spec.shards` is the total number of Pods
+                  being created.
+
+                  When not defined, the operator assumes only one shard.
+
+                  Note that scaling down shards will not reshard data onto the remaining
+                  instances, it must be manually moved. Increasing shards will not reshard
+                  data either but it will continue to be available from the same
+                  instances. To query globally, use either
+                  * Thanos sidecar + querier for query federation and Thanos Ruler for rules.
+                  * Remote-write to send metrics to a central location.
+
+                  By default, the sharding of targets is performed on:
+                  * The `__address__` target's metadata label for PodMonitor,
+                  ServiceMonitor and ScrapeConfig resources.
+                  * The `__param_target__` label for Probe resources.
+
+                  Users can define their own sharding implementation by setting the
+                  `__tmp_hash` label during the target discovery with relabeling
+                  configuration (either in the monitoring resources or via scrape class).
+
+                  You can also disable sharding on a specific target by setting the
+                  `__tmp_disable_sharding` label with relabeling configuration. When
+                  the label value isn't empty, all Prometheus shards will scrape the target.
+                format: int32
+                type: integer
+              storage:
+                description: storage defines the storage used by Prometheus.
+                properties:
+                  disableMountSubPath:
+                    description: 'disableMountSubPath deprecated: subPath usage will
+                      be removed in a future release.'
+                    type: boolean
+                  emptyDir:
+                    description: |-
+                      emptyDir to be used by the StatefulSet.
+                      If specified, it takes precedence over `ephemeral` and `volumeClaimTemplate`.
+                      More info: https://kubernetes.io/docs/concepts/storage/volumes/#emptydir
+                    properties:
+                      medium:
+                        description: |-
+                          medium represents what type of storage medium should back this directory.
+                          The default is "" which means to use the node's default medium.
+                          Must be an empty string (default) or Memory.
+                          More info: https://kubernetes.io/docs/concepts/storage/volumes#emptydir
+                        type: string
+                      sizeLimit:
+                        anyOf:
+                        - type: integer
+                        - type: string
+                        description: |-
+                          sizeLimit is the total amount of local storage required for this EmptyDir volume.
+                          The size limit is also applicable for memory medium.
+                          The maximum usage on memory medium EmptyDir would be the minimum value between
+                          the SizeLimit specified here and the sum of memory limits of all containers in a pod.
+                          The default is nil which means that the limit is undefined.
+                          More info: https://kubernetes.io/docs/concepts/storage/volumes#emptydir
+                        pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                        x-kubernetes-int-or-string: true
+                    type: object
+                  ephemeral:
+                    description: |-
+                      ephemeral to be used by the StatefulSet.
+                      This is a beta field in k8s 1.21 and GA in 1.15.
+                      For lower versions, starting with k8s 1.19, it requires enabling the GenericEphemeralVolume feature gate.
+                      More info: https://kubernetes.io/docs/concepts/storage/ephemeral-volumes/#generic-ephemeral-volumes
+                    properties:
+                      volumeClaimTemplate:
+                        description: |-
+                          Will be used to create a stand-alone PVC to provision the volume.
+                          The pod in which this EphemeralVolumeSource is embedded will be the
+                          owner of the PVC, i.e. the PVC will be deleted together with the
+                          pod.  The name of the PVC will be `<pod name>-<volume name>` where
+                          `<volume name>` is the name from the `PodSpec.Volumes` array
+                          entry. Pod validation will reject the pod if the concatenated name
+                          is not valid for a PVC (for example, too long).
+
+                          An existing PVC with that name that is not owned by the pod
+                          will *not* be used for the pod to avoid using an unrelated
+                          volume by mistake. Starting the pod is then blocked until
+                          the unrelated PVC is removed. If such a pre-created PVC is
+                          meant to be used by the pod, the PVC has to updated with an
+                          owner reference to the pod once the pod exists. Normally
+                          this should not be necessary, but it may be useful when
+                          manually reconstructing a broken cluster.
+
+                          This field is read-only and no changes will be made by Kubernetes
+                          to the PVC after it has been created.
+
+                          Required, must not be nil.
+                        properties:
+                          metadata:
+                            description: |-
+                              May contain labels and annotations that will be copied into the PVC
+                              when creating it. No other fields are allowed and will be rejected during
+                              validation.
+                            type: object
+                          spec:
+                            description: |-
+                              The specification for the PersistentVolumeClaim. The entire content is
+                              copied unchanged into the PVC that gets created from this
+                              template. The same fields as in a PersistentVolumeClaim
+                              are also valid here.
+                            properties:
+                              accessModes:
+                                description: |-
+                                  accessModes contains the desired access modes the volume should have.
+                                  More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#access-modes-1
+                                items:
+                                  type: string
+                                type: array
+                                x-kubernetes-list-type: atomic
+                              dataSource:
+                                description: |-
+                                  dataSource field can be used to specify either:
+                                  * An existing VolumeSnapshot object (snapshot.storage.k8s.io/VolumeSnapshot)
+                                  * An existing PVC (PersistentVolumeClaim)
+                                  If the provisioner or an external controller can support the specified data source,
+                                  it will create a new volume based on the contents of the specified data source.
+                                  When the AnyVolumeDataSource feature gate is enabled, dataSource contents will be copied to dataSourceRef,
+                                  and dataSourceRef contents will be copied to dataSource when dataSourceRef.namespace is not specified.
+                                  If the namespace is specified, then dataSourceRef will not be copied to dataSource.
+                                properties:
+                                  apiGroup:
+                                    description: |-
+                                      APIGroup is the group for the resource being referenced.
+                                      If APIGroup is not specified, the specified Kind must be in the core API group.
+                                      For any other third-party types, APIGroup is required.
+                                    type: string
+                                  kind:
+                                    description: Kind is the type of resource being
+                                      referenced
+                                    type: string
+                                  name:
+                                    description: Name is the name of resource being
+                                      referenced
+                                    type: string
+                                required:
+                                - kind
+                                - name
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              dataSourceRef:
+                                description: |-
+                                  dataSourceRef specifies the object from which to populate the volume with data, if a non-empty
+                                  volume is desired. This may be any object from a non-empty API group (non
+                                  core object) or a PersistentVolumeClaim object.
+                                  When this field is specified, volume binding will only succeed if the type of
+                                  the specified object matches some installed volume populator or dynamic
+                                  provisioner.
+                                  This field will replace the functionality of the dataSource field and as such
+                                  if both fields are non-empty, they must have the same value. For backwards
+                                  compatibility, when namespace isn't specified in dataSourceRef,
+                                  both fields (dataSource and dataSourceRef) will be set to the same
+                                  value automatically if one of them is empty and the other is non-empty.
+                                  When namespace is specified in dataSourceRef,
+                                  dataSource isn't set to the same value and must be empty.
+                                  There are three important differences between dataSource and dataSourceRef:
+                                  * While dataSource only allows two specific types of objects, dataSourceRef
+                                    allows any non-core object, as well as PersistentVolumeClaim objects.
+                                  * While dataSource ignores disallowed values (dropping them), dataSourceRef
+                                    preserves all values, and generates an error if a disallowed value is
+                                    specified.
+                                  * While dataSource only allows local objects, dataSourceRef allows objects
+                                    in any namespaces.
+                                  (Beta) Using this field requires the AnyVolumeDataSource feature gate to be enabled.
+                                  (Alpha) Using the namespace field of dataSourceRef requires the CrossNamespaceVolumeDataSource feature gate to be enabled.
+                                properties:
+                                  apiGroup:
+                                    description: |-
+                                      APIGroup is the group for the resource being referenced.
+                                      If APIGroup is not specified, the specified Kind must be in the core API group.
+                                      For any other third-party types, APIGroup is required.
+                                    type: string
+                                  kind:
+                                    description: Kind is the type of resource being
+                                      referenced
+                                    type: string
+                                  name:
+                                    description: Name is the name of resource being
+                                      referenced
+                                    type: string
+                                  namespace:
+                                    description: |-
+                                      Namespace is the namespace of resource being referenced
+                                      Note that when a namespace is specified, a gateway.networking.k8s.io/ReferenceGrant object is required in the referent namespace to allow that namespace's owner to accept the reference. See the ReferenceGrant documentation for details.
+                                      (Alpha) This field requires the CrossNamespaceVolumeDataSource feature gate to be enabled.
+                                    type: string
+                                required:
+                                - kind
+                                - name
+                                type: object
+                              resources:
+                                description: |-
+                                  resources represents the minimum resources the volume should have.
+                                  If RecoverVolumeExpansionFailure feature is enabled users are allowed to specify resource requirements
+                                  that are lower than previous value but must still be higher than capacity recorded in the
+                                  status field of the claim.
+                                  More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources
+                                properties:
+                                  limits:
+                                    additionalProperties:
+                                      anyOf:
+                                      - type: integer
+                                      - type: string
+                                      pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                      x-kubernetes-int-or-string: true
+                                    description: |-
+                                      Limits describes the maximum amount of compute resources allowed.
+                                      More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+                                    type: object
+                                  requests:
+                                    additionalProperties:
+                                      anyOf:
+                                      - type: integer
+                                      - type: string
+                                      pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                      x-kubernetes-int-or-string: true
+                                    description: |-
+                                      Requests describes the minimum amount of compute resources required.
+                                      If Requests is omitted for a container, it defaults to Limits if that is explicitly specified,
+                                      otherwise to an implementation-defined value. Requests cannot exceed Limits.
+                                      More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+                                    type: object
+                                type: object
+                              selector:
+                                description: selector is a label query over volumes
+                                  to consider for binding.
+                                properties:
+                                  matchExpressions:
+                                    description: matchExpressions is a list of label
+                                      selector requirements. The requirements are
+                                      ANDed.
+                                    items:
+                                      description: |-
+                                        A label selector requirement is a selector that contains values, a key, and an operator that
+                                        relates the key and values.
+                                      properties:
+                                        key:
+                                          description: key is the label key that the
+                                            selector applies to.
+                                          type: string
+                                        operator:
+                                          description: |-
+                                            operator represents a key's relationship to a set of values.
+                                            Valid operators are In, NotIn, Exists and DoesNotExist.
+                                          type: string
+                                        values:
+                                          description: |-
+                                            values is an array of string values. If the operator is In or NotIn,
+                                            the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                            the values array must be empty. This array is replaced during a strategic
+                                            merge patch.
+                                          items:
+                                            type: string
+                                          type: array
+                                          x-kubernetes-list-type: atomic
+                                      required:
+                                      - key
+                                      - operator
+                                      type: object
+                                    type: array
+                                    x-kubernetes-list-type: atomic
+                                  matchLabels:
+                                    additionalProperties:
+                                      type: string
+                                    description: |-
+                                      matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                      map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                      operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                    type: object
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              storageClassName:
+                                description: |-
+                                  storageClassName is the name of the StorageClass required by the claim.
+                                  More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#class-1
+                                type: string
+                              volumeAttributesClassName:
+                                description: |-
+                                  volumeAttributesClassName may be used to set the VolumeAttributesClass used by this claim.
+                                  If specified, the CSI driver will create or update the volume with the attributes defined
+                                  in the corresponding VolumeAttributesClass. This has a different purpose than storageClassName,
+                                  it can be changed after the claim is created. An empty string or nil value indicates that no
+                                  VolumeAttributesClass will be applied to the claim. If the claim enters an Infeasible error state,
+                                  this field can be reset to its previous value (including nil) to cancel the modification.
+                                  If the resource referred to by volumeAttributesClass does not exist, this PersistentVolumeClaim will be
+                                  set to a Pending state, as reflected by the modifyVolumeStatus field, until such as a resource
+                                  exists.
+                                  More info: https://kubernetes.io/docs/concepts/storage/volume-attributes-classes/
+                                type: string
+                              volumeMode:
+                                description: |-
+                                  volumeMode defines what type of volume is required by the claim.
+                                  Value of Filesystem is implied when not included in claim spec.
+                                type: string
+                              volumeName:
+                                description: volumeName is the binding reference to
+                                  the PersistentVolume backing this claim.
+                                type: string
+                            type: object
+                        required:
+                        - spec
+                        type: object
+                    type: object
+                  volumeClaimTemplate:
+                    description: |-
+                      volumeClaimTemplate defines the PVC spec to be used by the Prometheus StatefulSets.
+                      The easiest way to use a volume that cannot be automatically provisioned
+                      is to use a label selector alongside manually created PersistentVolumes.
+                    properties:
+                      apiVersion:
+                        description: |-
+                          APIVersion defines the versioned schema of this representation of an object.
+                          Servers should convert recognized schemas to the latest internal value, and
+                          may reject unrecognized values.
+                          More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+                        type: string
+                      kind:
+                        description: |-
+                          Kind is a string value representing the REST resource this object represents.
+                          Servers may infer this from the endpoint the client submits requests to.
+                          Cannot be updated.
+                          In CamelCase.
+                          More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+                        type: string
+                      metadata:
+                        description: metadata defines EmbeddedMetadata contains metadata
+                          relevant to an EmbeddedResource.
+                        properties:
+                          annotations:
+                            additionalProperties:
+                              type: string
+                            description: |-
+                              annotations defines an unstructured key value map stored with a resource that may be
+                              set by external tools to store and retrieve arbitrary metadata. They are not
+                              queryable and should be preserved when modifying objects.
+                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
+                            type: object
+                          labels:
+                            additionalProperties:
+                              type: string
+                            description: |-
+                              labels define the map of string keys and values that can be used to organize and categorize
+                              (scope and select) objects. May match selectors of replication controllers
+                              and services.
+                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
+                            type: object
+                          name:
+                            description: |-
+                              name must be unique within a namespace. Is required when creating resources, although
+                              some resources may allow a client to request the generation of an appropriate name
+                              automatically. Name is primarily intended for creation idempotence and configuration
+                              definition.
+                              Cannot be updated.
+                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/
+                            type: string
+                        type: object
+                      spec:
+                        description: |-
+                          spec defines the specification of the  characteristics of a volume requested by a pod author.
+                          More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#persistentvolumeclaims
+                        properties:
+                          accessModes:
+                            description: |-
+                              accessModes contains the desired access modes the volume should have.
+                              More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#access-modes-1
+                            items:
+                              type: string
+                            type: array
+                            x-kubernetes-list-type: atomic
+                          dataSource:
+                            description: |-
+                              dataSource field can be used to specify either:
+                              * An existing VolumeSnapshot object (snapshot.storage.k8s.io/VolumeSnapshot)
+                              * An existing PVC (PersistentVolumeClaim)
+                              If the provisioner or an external controller can support the specified data source,
+                              it will create a new volume based on the contents of the specified data source.
+                              When the AnyVolumeDataSource feature gate is enabled, dataSource contents will be copied to dataSourceRef,
+                              and dataSourceRef contents will be copied to dataSource when dataSourceRef.namespace is not specified.
+                              If the namespace is specified, then dataSourceRef will not be copied to dataSource.
+                            properties:
+                              apiGroup:
+                                description: |-
+                                  APIGroup is the group for the resource being referenced.
+                                  If APIGroup is not specified, the specified Kind must be in the core API group.
+                                  For any other third-party types, APIGroup is required.
+                                type: string
+                              kind:
+                                description: Kind is the type of resource being referenced
+                                type: string
+                              name:
+                                description: Name is the name of resource being referenced
+                                type: string
+                            required:
+                            - kind
+                            - name
+                            type: object
+                            x-kubernetes-map-type: atomic
+                          dataSourceRef:
+                            description: |-
+                              dataSourceRef specifies the object from which to populate the volume with data, if a non-empty
+                              volume is desired. This may be any object from a non-empty API group (non
+                              core object) or a PersistentVolumeClaim object.
+                              When this field is specified, volume binding will only succeed if the type of
+                              the specified object matches some installed volume populator or dynamic
+                              provisioner.
+                              This field will replace the functionality of the dataSource field and as such
+                              if both fields are non-empty, they must have the same value. For backwards
+                              compatibility, when namespace isn't specified in dataSourceRef,
+                              both fields (dataSource and dataSourceRef) will be set to the same
+                              value automatically if one of them is empty and the other is non-empty.
+                              When namespace is specified in dataSourceRef,
+                              dataSource isn't set to the same value and must be empty.
+                              There are three important differences between dataSource and dataSourceRef:
+                              * While dataSource only allows two specific types of objects, dataSourceRef
+                                allows any non-core object, as well as PersistentVolumeClaim objects.
+                              * While dataSource ignores disallowed values (dropping them), dataSourceRef
+                                preserves all values, and generates an error if a disallowed value is
+                                specified.
+                              * While dataSource only allows local objects, dataSourceRef allows objects
+                                in any namespaces.
+                              (Beta) Using this field requires the AnyVolumeDataSource feature gate to be enabled.
+                              (Alpha) Using the namespace field of dataSourceRef requires the CrossNamespaceVolumeDataSource feature gate to be enabled.
+                            properties:
+                              apiGroup:
+                                description: |-
+                                  APIGroup is the group for the resource being referenced.
+                                  If APIGroup is not specified, the specified Kind must be in the core API group.
+                                  For any other third-party types, APIGroup is required.
+                                type: string
+                              kind:
+                                description: Kind is the type of resource being referenced
+                                type: string
+                              name:
+                                description: Name is the name of resource being referenced
+                                type: string
+                              namespace:
+                                description: |-
+                                  Namespace is the namespace of resource being referenced
+                                  Note that when a namespace is specified, a gateway.networking.k8s.io/ReferenceGrant object is required in the referent namespace to allow that namespace's owner to accept the reference. See the ReferenceGrant documentation for details.
+                                  (Alpha) This field requires the CrossNamespaceVolumeDataSource feature gate to be enabled.
+                                type: string
+                            required:
+                            - kind
+                            - name
+                            type: object
+                          resources:
+                            description: |-
+                              resources represents the minimum resources the volume should have.
+                              If RecoverVolumeExpansionFailure feature is enabled users are allowed to specify resource requirements
+                              that are lower than previous value but must still be higher than capacity recorded in the
+                              status field of the claim.
+                              More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources
+                            properties:
+                              limits:
+                                additionalProperties:
+                                  anyOf:
+                                  - type: integer
+                                  - type: string
+                                  pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                  x-kubernetes-int-or-string: true
+                                description: |-
+                                  Limits describes the maximum amount of compute resources allowed.
+                                  More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+                                type: object
+                              requests:
+                                additionalProperties:
+                                  anyOf:
+                                  - type: integer
+                                  - type: string
+                                  pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                  x-kubernetes-int-or-string: true
+                                description: |-
+                                  Requests describes the minimum amount of compute resources required.
+                                  If Requests is omitted for a container, it defaults to Limits if that is explicitly specified,
+                                  otherwise to an implementation-defined value. Requests cannot exceed Limits.
+                                  More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+                                type: object
+                            type: object
+                          selector:
+                            description: selector is a label query over volumes to
+                              consider for binding.
+                            properties:
+                              matchExpressions:
+                                description: matchExpressions is a list of label selector
+                                  requirements. The requirements are ANDed.
+                                items:
+                                  description: |-
+                                    A label selector requirement is a selector that contains values, a key, and an operator that
+                                    relates the key and values.
+                                  properties:
+                                    key:
+                                      description: key is the label key that the selector
+                                        applies to.
+                                      type: string
+                                    operator:
+                                      description: |-
+                                        operator represents a key's relationship to a set of values.
+                                        Valid operators are In, NotIn, Exists and DoesNotExist.
+                                      type: string
+                                    values:
+                                      description: |-
+                                        values is an array of string values. If the operator is In or NotIn,
+                                        the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                        the values array must be empty. This array is replaced during a strategic
+                                        merge patch.
+                                      items:
+                                        type: string
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                  required:
+                                  - key
+                                  - operator
+                                  type: object
+                                type: array
+                                x-kubernetes-list-type: atomic
+                              matchLabels:
+                                additionalProperties:
+                                  type: string
+                                description: |-
+                                  matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                  map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                  operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                type: object
+                            type: object
+                            x-kubernetes-map-type: atomic
+                          storageClassName:
+                            description: |-
+                              storageClassName is the name of the StorageClass required by the claim.
+                              More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#class-1
+                            type: string
+                          volumeAttributesClassName:
+                            description: |-
+                              volumeAttributesClassName may be used to set the VolumeAttributesClass used by this claim.
+                              If specified, the CSI driver will create or update the volume with the attributes defined
+                              in the corresponding VolumeAttributesClass. This has a different purpose than storageClassName,
+                              it can be changed after the claim is created. An empty string or nil value indicates that no
+                              VolumeAttributesClass will be applied to the claim. If the claim enters an Infeasible error state,
+                              this field can be reset to its previous value (including nil) to cancel the modification.
+                              If the resource referred to by volumeAttributesClass does not exist, this PersistentVolumeClaim will be
+                              set to a Pending state, as reflected by the modifyVolumeStatus field, until such as a resource
+                              exists.
+                              More info: https://kubernetes.io/docs/concepts/storage/volume-attributes-classes/
+                            type: string
+                          volumeMode:
+                            description: |-
+                              volumeMode defines what type of volume is required by the claim.
+                              Value of Filesystem is implied when not included in claim spec.
+                            type: string
+                          volumeName:
+                            description: volumeName is the binding reference to the
+                              PersistentVolume backing this claim.
+                            type: string
+                        type: object
+                      status:
+                        description: 'status is deprecated: this field is never set.'
+                        properties:
+                          accessModes:
+                            description: |-
+                              accessModes contains the actual access modes the volume backing the PVC has.
+                              More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#access-modes-1
+                            items:
+                              type: string
+                            type: array
+                            x-kubernetes-list-type: atomic
+                          allocatedResourceStatuses:
+                            additionalProperties:
+                              description: |-
+                                When a controller receives persistentvolume claim update with ClaimResourceStatus for a resource
+                                that it does not recognizes, then it should ignore that update and let other controllers
+                                handle it.
+                              type: string
+                            description: "allocatedResourceStatuses stores status
+                              of resource being resized for the given PVC.\nKey names
+                              follow standard Kubernetes label syntax. Valid values
+                              are either:\n\t* Un-prefixed keys:\n\t\t- storage -
+                              the capacity of the volume.\n\t* Custom resources must
+                              use implementation-defined prefixed names such as \"example.com/my-custom-resource\"\nApart
+                              from above values - keys that are unprefixed or have
+                              kubernetes.io prefix are considered\nreserved and hence
+                              may not be used.\n\nClaimResourceStatus can be in any
+                              of following states:\n\t- ControllerResizeInProgress:\n\t\tState
+                              set when resize controller starts resizing the volume
+                              in control-plane.\n\t- ControllerResizeFailed:\n\t\tState
+                              set when resize has failed in resize controller with
+                              a terminal error.\n\t- NodeResizePending:\n\t\tState
+                              set when resize controller has finished resizing the
+                              volume but further resizing of\n\t\tvolume is needed
+                              on the node.\n\t- NodeResizeInProgress:\n\t\tState set
+                              when kubelet starts resizing the volume.\n\t- NodeResizeFailed:\n\t\tState
+                              set when resizing has failed in kubelet with a terminal
+                              error. Transient errors don't set\n\t\tNodeResizeFailed.\nFor
+                              example: if expanding a PVC for more capacity - this
+                              field can be one of the following states:\n\t- pvc.status.allocatedResourceStatus['storage']
+                              = \"ControllerResizeInProgress\"\n     - pvc.status.allocatedResourceStatus['storage']
+                              = \"ControllerResizeFailed\"\n     - pvc.status.allocatedResourceStatus['storage']
+                              = \"NodeResizePending\"\n     - pvc.status.allocatedResourceStatus['storage']
+                              = \"NodeResizeInProgress\"\n     - pvc.status.allocatedResourceStatus['storage']
+                              = \"NodeResizeFailed\"\nWhen this field is not set,
+                              it means that no resize operation is in progress for
+                              the given PVC.\n\nA controller that receives PVC update
+                              with previously unknown resourceName or ClaimResourceStatus\nshould
+                              ignore the update for the purpose it was designed. For
+                              example - a controller that\nonly is responsible for
+                              resizing capacity of the volume, should ignore PVC updates
+                              that change other valid\nresources associated with PVC.\n\nThis
+                              is an alpha field and requires enabling RecoverVolumeExpansionFailure
+                              feature."
+                            type: object
+                            x-kubernetes-map-type: granular
+                          allocatedResources:
+                            additionalProperties:
+                              anyOf:
+                              - type: integer
+                              - type: string
+                              pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                              x-kubernetes-int-or-string: true
+                            description: "allocatedResources tracks the resources
+                              allocated to a PVC including its capacity.\nKey names
+                              follow standard Kubernetes label syntax. Valid values
+                              are either:\n\t* Un-prefixed keys:\n\t\t- storage -
+                              the capacity of the volume.\n\t* Custom resources must
+                              use implementation-defined prefixed names such as \"example.com/my-custom-resource\"\nApart
+                              from above values - keys that are unprefixed or have
+                              kubernetes.io prefix are considered\nreserved and hence
+                              may not be used.\n\nCapacity reported here may be larger
+                              than the actual capacity when a volume expansion operation\nis
+                              requested.\nFor storage quota, the larger value from
+                              allocatedResources and PVC.spec.resources is used.\nIf
+                              allocatedResources is not set, PVC.spec.resources alone
+                              is used for quota calculation.\nIf a volume expansion
+                              capacity request is lowered, allocatedResources is only\nlowered
+                              if there are no expansion operations in progress and
+                              if the actual volume capacity\nis equal or lower than
+                              the requested capacity.\n\nA controller that receives
+                              PVC update with previously unknown resourceName\nshould
+                              ignore the update for the purpose it was designed. For
+                              example - a controller that\nonly is responsible for
+                              resizing capacity of the volume, should ignore PVC updates
+                              that change other valid\nresources associated with PVC.\n\nThis
+                              is an alpha field and requires enabling RecoverVolumeExpansionFailure
+                              feature."
+                            type: object
+                          capacity:
+                            additionalProperties:
+                              anyOf:
+                              - type: integer
+                              - type: string
+                              pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                              x-kubernetes-int-or-string: true
+                            description: capacity represents the actual resources
+                              of the underlying volume.
+                            type: object
+                          conditions:
+                            description: |-
+                              conditions is the current Condition of persistent volume claim. If underlying persistent volume is being
+                              resized then the Condition will be set to 'Resizing'.
+                            items:
+                              description: PersistentVolumeClaimCondition contains
+                                details about state of pvc
+                              properties:
+                                lastProbeTime:
+                                  description: lastProbeTime is the time we probed
+                                    the condition.
+                                  format: date-time
+                                  type: string
+                                lastTransitionTime:
+                                  description: lastTransitionTime is the time the
+                                    condition transitioned from one status to another.
+                                  format: date-time
+                                  type: string
+                                message:
+                                  description: message is the human-readable message
+                                    indicating details about last transition.
+                                  type: string
+                                reason:
+                                  description: |-
+                                    reason is a unique, this should be a short, machine understandable string that gives the reason
+                                    for condition's last transition. If it reports "Resizing" that means the underlying
+                                    persistent volume is being resized.
+                                  type: string
+                                status:
+                                  description: |-
+                                    Status is the status of the condition.
+                                    Can be True, False, Unknown.
+                                    More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=state%20of%20pvc-,conditions.status,-(string)%2C%20required
+                                  type: string
+                                type:
+                                  description: |-
+                                    Type is the type of the condition.
+                                    More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=set%20to%20%27ResizeStarted%27.-,PersistentVolumeClaimCondition,-contains%20details%20about
+                                  type: string
+                              required:
+                              - status
+                              - type
+                              type: object
+                            type: array
+                            x-kubernetes-list-map-keys:
+                            - type
+                            x-kubernetes-list-type: map
+                          currentVolumeAttributesClassName:
+                            description: |-
+                              currentVolumeAttributesClassName is the current name of the VolumeAttributesClass the PVC is using.
+                              When unset, there is no VolumeAttributeClass applied to this PersistentVolumeClaim
+                            type: string
+                          modifyVolumeStatus:
+                            description: |-
+                              ModifyVolumeStatus represents the status object of ControllerModifyVolume operation.
+                              When this is unset, there is no ModifyVolume operation being attempted.
+                            properties:
+                              status:
+                                description: "status is the status of the ControllerModifyVolume
+                                  operation. It can be in any of following states:\n
+                                  - Pending\n   Pending indicates that the PersistentVolumeClaim
+                                  cannot be modified due to unmet requirements, such
+                                  as\n   the specified VolumeAttributesClass not existing.\n
+                                  - InProgress\n   InProgress indicates that the volume
+                                  is being modified.\n - Infeasible\n  Infeasible
+                                  indicates that the request has been rejected as
+                                  invalid by the CSI driver. To\n\t  resolve the error,
+                                  a valid VolumeAttributesClass needs to be specified.\nNote:
+                                  New statuses can be added in the future. Consumers
+                                  should check for unknown statuses and fail appropriately."
+                                type: string
+                              targetVolumeAttributesClassName:
+                                description: targetVolumeAttributesClassName is the
+                                  name of the VolumeAttributesClass the PVC currently
+                                  being reconciled
+                                type: string
+                            required:
+                            - status
+                            type: object
+                          phase:
+                            description: phase represents the current phase of PersistentVolumeClaim.
+                            type: string
+                        type: object
+                    type: object
+                type: object
+              targetLimit:
+                description: |-
+                  targetLimit defines a limit on the number of scraped targets that will be accepted.
+                  Only valid in Prometheus versions 2.45.0 and newer.
+
+                  Note that the global limit only applies to scrape objects that don't specify an explicit limit value.
+                  If you want to enforce a maximum limit for all scrape objects, refer to enforcedTargetLimit.
+                format: int64
+                type: integer
+              terminationGracePeriodSeconds:
+                description: |-
+                  terminationGracePeriodSeconds defines the optional duration in seconds the pod needs to terminate gracefully.
+                  Value must be non-negative integer. The value zero indicates stop immediately via
+                  the kill signal (no opportunity to shut down) which may lead to data corruption.
+
+                  Defaults to 600 seconds.
+                format: int64
+                minimum: 0
+                type: integer
+              tolerations:
+                description: tolerations defines the Pods' tolerations if specified.
+                items:
+                  description: |-
+                    The pod this Toleration is attached to tolerates any taint that matches
+                    the triple <key,value,effect> using the matching operator <operator>.
+                  properties:
+                    effect:
+                      description: |-
+                        Effect indicates the taint effect to match. Empty means match all taint effects.
+                        When specified, allowed values are NoSchedule, PreferNoSchedule and NoExecute.
+                      type: string
+                    key:
+                      description: |-
+                        Key is the taint key that the toleration applies to. Empty means match all taint keys.
+                        If the key is empty, operator must be Exists; this combination means to match all values and all keys.
+                      type: string
+                    operator:
+                      description: |-
+                        Operator represents a key's relationship to the value.
+                        Valid operators are Exists and Equal. Defaults to Equal.
+                        Exists is equivalent to wildcard for value, so that a pod can
+                        tolerate all taints of a particular category.
+                      type: string
+                    tolerationSeconds:
+                      description: |-
+                        TolerationSeconds represents the period of time the toleration (which must be
+                        of effect NoExecute, otherwise this field is ignored) tolerates the taint. By default,
+                        it is not set, which means tolerate the taint forever (do not evict). Zero and
+                        negative values will be treated as 0 (evict immediately) by the system.
+                      format: int64
+                      type: integer
+                    value:
+                      description: |-
+                        Value is the taint value the toleration matches to.
+                        If the operator is Exists, the value should be empty, otherwise just a regular string.
+                      type: string
+                  type: object
+                type: array
+              topologySpreadConstraints:
+                description: topologySpreadConstraints defines the pod's topology
+                  spread constraints if specified.
+                items:
+                  properties:
+                    additionalLabelSelectors:
+                      description: additionalLabelSelectors Defines what Prometheus
+                        Operator managed labels should be added to labelSelector on
+                        the topologySpreadConstraint.
+                      enum:
+                      - OnResource
+                      - OnShard
+                      type: string
+                    labelSelector:
+                      description: |-
+                        LabelSelector is used to find matching pods.
+                        Pods that match this label selector are counted to determine the number of pods
+                        in their corresponding topology domain.
+                      properties:
+                        matchExpressions:
+                          description: matchExpressions is a list of label selector
+                            requirements. The requirements are ANDed.
+                          items:
+                            description: |-
+                              A label selector requirement is a selector that contains values, a key, and an operator that
+                              relates the key and values.
+                            properties:
+                              key:
+                                description: key is the label key that the selector
+                                  applies to.
+                                type: string
+                              operator:
+                                description: |-
+                                  operator represents a key's relationship to a set of values.
+                                  Valid operators are In, NotIn, Exists and DoesNotExist.
+                                type: string
+                              values:
+                                description: |-
+                                  values is an array of string values. If the operator is In or NotIn,
+                                  the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                  the values array must be empty. This array is replaced during a strategic
+                                  merge patch.
+                                items:
+                                  type: string
+                                type: array
+                                x-kubernetes-list-type: atomic
+                            required:
+                            - key
+                            - operator
+                            type: object
+                          type: array
+                          x-kubernetes-list-type: atomic
+                        matchLabels:
+                          additionalProperties:
+                            type: string
+                          description: |-
+                            matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                            map is equivalent to an element of matchExpressions, whose key field is "key", the
+                            operator is "In", and the values array contains only "value". The requirements are ANDed.
+                          type: object
+                      type: object
+                      x-kubernetes-map-type: atomic
+                    matchLabelKeys:
+                      description: |-
+                        MatchLabelKeys is a set of pod label keys to select the pods over which
+                        spreading will be calculated. The keys are used to lookup values from the
+                        incoming pod labels, those key-value labels are ANDed with labelSelector
+                        to select the group of existing pods over which spreading will be calculated
+                        for the incoming pod. The same key is forbidden to exist in both MatchLabelKeys and LabelSelector.
+                        MatchLabelKeys cannot be set when LabelSelector isn't set.
+                        Keys that don't exist in the incoming pod labels will
+                        be ignored. A null or empty list means only match against labelSelector.
+
+                        This is a beta field and requires the MatchLabelKeysInPodTopologySpread feature gate to be enabled (enabled by default).
+                      items:
+                        type: string
+                      type: array
+                      x-kubernetes-list-type: atomic
+                    maxSkew:
+                      description: |-
+                        MaxSkew describes the degree to which pods may be unevenly distributed.
+                        When `whenUnsatisfiable=DoNotSchedule`, it is the maximum permitted difference
+                        between the number of matching pods in the target topology and the global minimum.
+                        The global minimum is the minimum number of matching pods in an eligible domain
+                        or zero if the number of eligible domains is less than MinDomains.
+                        For example, in a 3-zone cluster, MaxSkew is set to 1, and pods with the same
+                        labelSelector spread as 2/2/1:
+                        In this case, the global minimum is 1.
+                        | zone1 | zone2 | zone3 |
+                        |  P P  |  P P  |   P   |
+                        - if MaxSkew is 1, incoming pod can only be scheduled to zone3 to become 2/2/2;
+                        scheduling it onto zone1(zone2) would make the ActualSkew(3-1) on zone1(zone2)
+                        violate MaxSkew(1).
+                        - if MaxSkew is 2, incoming pod can be scheduled onto any zone.
+                        When `whenUnsatisfiable=ScheduleAnyway`, it is used to give higher precedence
+                        to topologies that satisfy it.
+                        It's a required field. Default value is 1 and 0 is not allowed.
+                      format: int32
+                      type: integer
+                    minDomains:
+                      description: |-
+                        MinDomains indicates a minimum number of eligible domains.
+                        When the number of eligible domains with matching topology keys is less than minDomains,
+                        Pod Topology Spread treats "global minimum" as 0, and then the calculation of Skew is performed.
+                        And when the number of eligible domains with matching topology keys equals or greater than minDomains,
+                        this value has no effect on scheduling.
+                        As a result, when the number of eligible domains is less than minDomains,
+                        scheduler won't schedule more than maxSkew Pods to those domains.
+                        If value is nil, the constraint behaves as if MinDomains is equal to 1.
+                        Valid values are integers greater than 0.
+                        When value is not nil, WhenUnsatisfiable must be DoNotSchedule.
+
+                        For example, in a 3-zone cluster, MaxSkew is set to 2, MinDomains is set to 5 and pods with the same
+                        labelSelector spread as 2/2/2:
+                        | zone1 | zone2 | zone3 |
+                        |  P P  |  P P  |  P P  |
+                        The number of domains is less than 5(MinDomains), so "global minimum" is treated as 0.
+                        In this situation, new pod with the same labelSelector cannot be scheduled,
+                        because computed skew will be 3(3 - 0) if new Pod is scheduled to any of the three zones,
+                        it will violate MaxSkew.
+                      format: int32
+                      type: integer
+                    nodeAffinityPolicy:
+                      description: |-
+                        NodeAffinityPolicy indicates how we will treat Pod's nodeAffinity/nodeSelector
+                        when calculating pod topology spread skew. Options are:
+                        - Honor: only nodes matching nodeAffinity/nodeSelector are included in the calculations.
+                        - Ignore: nodeAffinity/nodeSelector are ignored. All nodes are included in the calculations.
+
+                        If this value is nil, the behavior is equivalent to the Honor policy.
+                      type: string
+                    nodeTaintsPolicy:
+                      description: |-
+                        NodeTaintsPolicy indicates how we will treat node taints when calculating
+                        pod topology spread skew. Options are:
+                        - Honor: nodes without taints, along with tainted nodes for which the incoming pod
+                        has a toleration, are included.
+                        - Ignore: node taints are ignored. All nodes are included.
+
+                        If this value is nil, the behavior is equivalent to the Ignore policy.
+                      type: string
+                    topologyKey:
+                      description: |-
+                        TopologyKey is the key of node labels. Nodes that have a label with this key
+                        and identical values are considered to be in the same topology.
+                        We consider each <key, value> as a "bucket", and try to put balanced number
+                        of pods into each bucket.
+                        We define a domain as a particular instance of a topology.
+                        Also, we define an eligible domain as a domain whose nodes meet the requirements of
+                        nodeAffinityPolicy and nodeTaintsPolicy.
+                        e.g. If TopologyKey is "kubernetes.io/hostname", each Node is a domain of that topology.
+                        And, if TopologyKey is "topology.kubernetes.io/zone", each zone is a domain of that topology.
+                        It's a required field.
+                      type: string
+                    whenUnsatisfiable:
+                      description: |-
+                        WhenUnsatisfiable indicates how to deal with a pod if it doesn't satisfy
+                        the spread constraint.
+                        - DoNotSchedule (default) tells the scheduler not to schedule it.
+                        - ScheduleAnyway tells the scheduler to schedule the pod in any location,
+                          but giving higher precedence to topologies that would help reduce the
+                          skew.
+                        A constraint is considered "Unsatisfiable" for an incoming pod
+                        if and only if every possible node assignment for that pod would violate
+                        "MaxSkew" on some topology.
+                        For example, in a 3-zone cluster, MaxSkew is set to 1, and pods with the same
+                        labelSelector spread as 3/1/1:
+                        | zone1 | zone2 | zone3 |
+                        | P P P |   P   |   P   |
+                        If WhenUnsatisfiable is set to DoNotSchedule, incoming pod can only be scheduled
+                        to zone2(zone3) to become 3/2/1(3/1/2) as ActualSkew(2-1) on zone2(zone3) satisfies
+                        MaxSkew(1). In other words, the cluster can still be imbalanced, but scheduler
+                        won't make it *more* imbalanced.
+                        It's a required field.
+                      type: string
+                  required:
+                  - maxSkew
+                  - topologyKey
+                  - whenUnsatisfiable
+                  type: object
+                type: array
+              tracingConfig:
+                description: |-
+                  tracingConfig defines tracing in Prometheus.
+
+                  This is an *experimental feature*, it may change in any upcoming release
+                  in a breaking way.
+                properties:
+                  clientType:
+                    description: clientType defines the client used to export the
+                      traces. Supported values are `http` or `grpc`.
+                    enum:
+                    - http
+                    - grpc
+                    type: string
+                  compression:
+                    description: compression key for supported compression types.
+                      The only supported value is `gzip`.
+                    enum:
+                    - gzip
+                    type: string
+                  endpoint:
+                    description: endpoint to send the traces to. Should be provided
+                      in format <host>:<port>.
+                    minLength: 1
+                    type: string
+                  headers:
+                    additionalProperties:
+                      type: string
+                    description: headers defines the key-value pairs to be used as
+                      headers associated with gRPC or HTTP requests.
+                    type: object
+                  insecure:
+                    description: insecure if disabled, the client will use a secure
+                      connection.
+                    type: boolean
+                  samplingFraction:
+                    anyOf:
+                    - type: integer
+                    - type: string
+                    description: samplingFraction defines the probability a given
+                      trace will be sampled. Must be a float from 0 through 1.
+                    pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                    x-kubernetes-int-or-string: true
+                  timeout:
+                    description: timeout defines the maximum time the exporter will
+                      wait for each batch export.
+                    pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
+                    type: string
+                  tlsConfig:
+                    description: tlsConfig to use when sending traces.
+                    properties:
+                      ca:
+                        description: ca defines the Certificate authority used when
+                          verifying server certificates.
+                        properties:
+                          configMap:
+                            description: configMap defines the ConfigMap containing
+                              data to use for the targets.
+                            properties:
+                              key:
+                                description: The key to select.
+                                type: string
+                              name:
+                                default: ""
+                                description: |-
+                                  Name of the referent.
+                                  This field is effectively required, but due to backwards compatibility is
+                                  allowed to be empty. Instances of this type with an empty value here are
+                                  almost certainly wrong.
+                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                type: string
+                              optional:
+                                description: Specify whether the ConfigMap or its
+                                  key must be defined
+                                type: boolean
+                            required:
+                            - key
+                            type: object
+                            x-kubernetes-map-type: atomic
+                          secret:
+                            description: secret defines the Secret containing data
+                              to use for the targets.
+                            properties:
+                              key:
+                                description: The key of the secret to select from.  Must
+                                  be a valid secret key.
+                                type: string
+                              name:
+                                default: ""
+                                description: |-
+                                  Name of the referent.
+                                  This field is effectively required, but due to backwards compatibility is
+                                  allowed to be empty. Instances of this type with an empty value here are
+                                  almost certainly wrong.
+                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                type: string
+                              optional:
+                                description: Specify whether the Secret or its key
+                                  must be defined
+                                type: boolean
+                            required:
+                            - key
+                            type: object
+                            x-kubernetes-map-type: atomic
+                        type: object
+                      caFile:
+                        description: caFile defines the path to the CA cert in the
+                          Prometheus container to use for the targets.
+                        type: string
+                      cert:
+                        description: cert defines the Client certificate to present
+                          when doing client-authentication.
+                        properties:
+                          configMap:
+                            description: configMap defines the ConfigMap containing
+                              data to use for the targets.
+                            properties:
+                              key:
+                                description: The key to select.
+                                type: string
+                              name:
+                                default: ""
+                                description: |-
+                                  Name of the referent.
+                                  This field is effectively required, but due to backwards compatibility is
+                                  allowed to be empty. Instances of this type with an empty value here are
+                                  almost certainly wrong.
+                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                type: string
+                              optional:
+                                description: Specify whether the ConfigMap or its
+                                  key must be defined
+                                type: boolean
+                            required:
+                            - key
+                            type: object
+                            x-kubernetes-map-type: atomic
+                          secret:
+                            description: secret defines the Secret containing data
+                              to use for the targets.
+                            properties:
+                              key:
+                                description: The key of the secret to select from.  Must
+                                  be a valid secret key.
+                                type: string
+                              name:
+                                default: ""
+                                description: |-
+                                  Name of the referent.
+                                  This field is effectively required, but due to backwards compatibility is
+                                  allowed to be empty. Instances of this type with an empty value here are
+                                  almost certainly wrong.
+                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                type: string
+                              optional:
+                                description: Specify whether the Secret or its key
+                                  must be defined
+                                type: boolean
+                            required:
+                            - key
+                            type: object
+                            x-kubernetes-map-type: atomic
+                        type: object
+                      certFile:
+                        description: certFile defines the path to the client cert
+                          file in the Prometheus container for the targets.
+                        type: string
+                      insecureSkipVerify:
+                        description: insecureSkipVerify defines how to disable target
+                          certificate validation.
+                        type: boolean
+                      keyFile:
+                        description: keyFile defines the path to the client key file
+                          in the Prometheus container for the targets.
+                        type: string
+                      keySecret:
+                        description: keySecret defines the Secret containing the client
+                          key file for the targets.
+                        properties:
+                          key:
+                            description: The key of the secret to select from.  Must
+                              be a valid secret key.
+                            type: string
+                          name:
+                            default: ""
+                            description: |-
+                              Name of the referent.
+                              This field is effectively required, but due to backwards compatibility is
+                              allowed to be empty. Instances of this type with an empty value here are
+                              almost certainly wrong.
+                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                            type: string
+                          optional:
+                            description: Specify whether the Secret or its key must
+                              be defined
+                            type: boolean
+                        required:
+                        - key
+                        type: object
+                        x-kubernetes-map-type: atomic
+                      maxVersion:
+                        description: |-
+                          maxVersion defines the maximum acceptable TLS version.
+
+                          It requires Prometheus >= v2.41.0 or Thanos >= v0.31.0.
+                        enum:
+                        - TLS10
+                        - TLS11
+                        - TLS12
+                        - TLS13
+                        type: string
+                      minVersion:
+                        description: |-
+                          minVersion defines the minimum acceptable TLS version.
+
+                          It requires Prometheus >= v2.35.0 or Thanos >= v0.28.0.
+                        enum:
+                        - TLS10
+                        - TLS11
+                        - TLS12
+                        - TLS13
+                        type: string
+                      serverName:
+                        description: serverName is used to verify the hostname for
+                          the targets.
+                        type: string
+                    type: object
+                required:
+                - endpoint
+                type: object
+              tsdb:
+                description: |-
+                  tsdb defines the runtime reloadable configuration of the timeseries database(TSDB).
+                  It requires Prometheus >= v2.39.0 or PrometheusAgent >= v2.54.0.
+                properties:
+                  outOfOrderTimeWindow:
+                    description: |-
+                      outOfOrderTimeWindow defines how old an out-of-order/out-of-bounds sample can be with
+                      respect to the TSDB max time.
+
+                      An out-of-order/out-of-bounds sample is ingested into the TSDB as long as
+                      the timestamp of the sample is >= (TSDB.MaxTime - outOfOrderTimeWindow).
+
+                      This is an *experimental feature*, it may change in any upcoming release
+                      in a breaking way.
+
+                      It requires Prometheus >= v2.39.0 or PrometheusAgent >= v2.54.0.
+                    pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
+                    type: string
+                type: object
+              version:
+                description: |-
+                  version of Prometheus being deployed. The operator uses this information
+                  to generate the Prometheus StatefulSet + configuration files.
+
+                  If not specified, the operator assumes the latest upstream version of
+                  Prometheus available at the time when the version of the operator was
+                  released.
+                type: string
+              volumeMounts:
+                description: |-
+                  volumeMounts allows the configuration of additional VolumeMounts.
+
+                  VolumeMounts will be appended to other VolumeMounts in the 'prometheus'
+                  container, that are generated as a result of StorageSpec objects.
+                items:
+                  description: VolumeMount describes a mounting of a Volume within
+                    a container.
+                  properties:
+                    mountPath:
+                      description: |-
+                        Path within the container at which the volume should be mounted.  Must
+                        not contain ':'.
+                      type: string
+                    mountPropagation:
+                      description: |-
+                        mountPropagation determines how mounts are propagated from the host
+                        to container and the other way around.
+                        When not set, MountPropagationNone is used.
+                        This field is beta in 1.10.
+                        When RecursiveReadOnly is set to IfPossible or to Enabled, MountPropagation must be None or unspecified
+                        (which defaults to None).
+                      type: string
+                    name:
+                      description: This must match the Name of a Volume.
+                      type: string
+                    readOnly:
+                      description: |-
+                        Mounted read-only if true, read-write otherwise (false or unspecified).
+                        Defaults to false.
+                      type: boolean
+                    recursiveReadOnly:
+                      description: |-
+                        RecursiveReadOnly specifies whether read-only mounts should be handled
+                        recursively.
+
+                        If ReadOnly is false, this field has no meaning and must be unspecified.
+
+                        If ReadOnly is true, and this field is set to Disabled, the mount is not made
+                        recursively read-only.  If this field is set to IfPossible, the mount is made
+                        recursively read-only, if it is supported by the container runtime.  If this
+                        field is set to Enabled, the mount is made recursively read-only if it is
+                        supported by the container runtime, otherwise the pod will not be started and
+                        an error will be generated to indicate the reason.
+
+                        If this field is set to IfPossible or Enabled, MountPropagation must be set to
+                        None (or be unspecified, which defaults to None).
+
+                        If this field is not specified, it is treated as an equivalent of Disabled.
+                      type: string
+                    subPath:
+                      description: |-
+                        Path within the volume from which the container's volume should be mounted.
+                        Defaults to "" (volume's root).
+                      type: string
+                    subPathExpr:
+                      description: |-
+                        Expanded path within the volume from which the container's volume should be mounted.
+                        Behaves similarly to SubPath but environment variable references $(VAR_NAME) are expanded using the container's environment.
+                        Defaults to "" (volume's root).
+                        SubPathExpr and SubPath are mutually exclusive.
+                      type: string
+                  required:
+                  - mountPath
+                  - name
+                  type: object
+                type: array
+              volumes:
+                description: |-
+                  volumes allows the configuration of additional volumes on the output
+                  StatefulSet definition. Volumes specified will be appended to other
+                  volumes that are generated as a result of StorageSpec objects.
+                items:
+                  description: Volume represents a named volume in a pod that may
+                    be accessed by any container in the pod.
+                  properties:
+                    awsElasticBlockStore:
+                      description: |-
+                        awsElasticBlockStore represents an AWS Disk resource that is attached to a
+                        kubelet's host machine and then exposed to the pod.
+                        Deprecated: AWSElasticBlockStore is deprecated. All operations for the in-tree
+                        awsElasticBlockStore type are redirected to the ebs.csi.aws.com CSI driver.
+                        More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
+                      properties:
+                        fsType:
+                          description: |-
+                            fsType is the filesystem type of the volume that you want to mount.
+                            Tip: Ensure that the filesystem type is supported by the host operating system.
+                            Examples: "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
+                            More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
+                          type: string
+                        partition:
+                          description: |-
+                            partition is the partition in the volume that you want to mount.
+                            If omitted, the default is to mount by volume name.
+                            Examples: For volume /dev/sda1, you specify the partition as "1".
+                            Similarly, the volume partition for /dev/sda is "0" (or you can leave the property empty).
+                          format: int32
+                          type: integer
+                        readOnly:
+                          description: |-
+                            readOnly value true will force the readOnly setting in VolumeMounts.
+                            More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
+                          type: boolean
+                        volumeID:
+                          description: |-
+                            volumeID is unique ID of the persistent disk resource in AWS (Amazon EBS volume).
+                            More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
+                          type: string
+                      required:
+                      - volumeID
+                      type: object
+                    azureDisk:
+                      description: |-
+                        azureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.
+                        Deprecated: AzureDisk is deprecated. All operations for the in-tree azureDisk type
+                        are redirected to the disk.csi.azure.com CSI driver.
+                      properties:
+                        cachingMode:
+                          description: 'cachingMode is the Host Caching mode: None,
+                            Read Only, Read Write.'
+                          type: string
+                        diskName:
+                          description: diskName is the Name of the data disk in the
+                            blob storage
+                          type: string
+                        diskURI:
+                          description: diskURI is the URI of data disk in the blob
+                            storage
+                          type: string
+                        fsType:
+                          default: ext4
+                          description: |-
+                            fsType is Filesystem type to mount.
+                            Must be a filesystem type supported by the host operating system.
+                            Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
+                          type: string
+                        kind:
+                          description: 'kind expected values are Shared: multiple
+                            blob disks per storage account  Dedicated: single blob
+                            disk per storage account  Managed: azure managed data
+                            disk (only in managed availability set). defaults to shared'
+                          type: string
+                        readOnly:
+                          default: false
+                          description: |-
+                            readOnly Defaults to false (read/write). ReadOnly here will force
+                            the ReadOnly setting in VolumeMounts.
+                          type: boolean
+                      required:
+                      - diskName
+                      - diskURI
+                      type: object
+                    azureFile:
+                      description: |-
+                        azureFile represents an Azure File Service mount on the host and bind mount to the pod.
+                        Deprecated: AzureFile is deprecated. All operations for the in-tree azureFile type
+                        are redirected to the file.csi.azure.com CSI driver.
+                      properties:
+                        readOnly:
+                          description: |-
+                            readOnly defaults to false (read/write). ReadOnly here will force
+                            the ReadOnly setting in VolumeMounts.
+                          type: boolean
+                        secretName:
+                          description: secretName is the  name of secret that contains
+                            Azure Storage Account Name and Key
+                          type: string
+                        shareName:
+                          description: shareName is the azure share Name
+                          type: string
+                      required:
+                      - secretName
+                      - shareName
+                      type: object
+                    cephfs:
+                      description: |-
+                        cephFS represents a Ceph FS mount on the host that shares a pod's lifetime.
+                        Deprecated: CephFS is deprecated and the in-tree cephfs type is no longer supported.
+                      properties:
+                        monitors:
+                          description: |-
+                            monitors is Required: Monitors is a collection of Ceph monitors
+                            More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it
+                          items:
+                            type: string
+                          type: array
+                          x-kubernetes-list-type: atomic
+                        path:
+                          description: 'path is Optional: Used as the mounted root,
+                            rather than the full Ceph tree, default is /'
+                          type: string
+                        readOnly:
+                          description: |-
+                            readOnly is Optional: Defaults to false (read/write). ReadOnly here will force
+                            the ReadOnly setting in VolumeMounts.
+                            More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it
+                          type: boolean
+                        secretFile:
+                          description: |-
+                            secretFile is Optional: SecretFile is the path to key ring for User, default is /etc/ceph/user.secret
+                            More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it
+                          type: string
+                        secretRef:
+                          description: |-
+                            secretRef is Optional: SecretRef is reference to the authentication secret for User, default is empty.
+                            More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it
+                          properties:
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        user:
+                          description: |-
+                            user is optional: User is the rados user name, default is admin
+                            More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it
+                          type: string
+                      required:
+                      - monitors
+                      type: object
+                    cinder:
+                      description: |-
+                        cinder represents a cinder volume attached and mounted on kubelets host machine.
+                        Deprecated: Cinder is deprecated. All operations for the in-tree cinder type
+                        are redirected to the cinder.csi.openstack.org CSI driver.
+                        More info: https://examples.k8s.io/mysql-cinder-pd/README.md
+                      properties:
+                        fsType:
+                          description: |-
+                            fsType is the filesystem type to mount.
+                            Must be a filesystem type supported by the host operating system.
+                            Examples: "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
+                            More info: https://examples.k8s.io/mysql-cinder-pd/README.md
+                          type: string
+                        readOnly:
+                          description: |-
+                            readOnly defaults to false (read/write). ReadOnly here will force
+                            the ReadOnly setting in VolumeMounts.
+                            More info: https://examples.k8s.io/mysql-cinder-pd/README.md
+                          type: boolean
+                        secretRef:
+                          description: |-
+                            secretRef is optional: points to a secret object containing parameters used to connect
+                            to OpenStack.
+                          properties:
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        volumeID:
+                          description: |-
+                            volumeID used to identify the volume in cinder.
+                            More info: https://examples.k8s.io/mysql-cinder-pd/README.md
+                          type: string
+                      required:
+                      - volumeID
+                      type: object
+                    configMap:
+                      description: configMap represents a configMap that should populate
+                        this volume
+                      properties:
+                        defaultMode:
+                          description: |-
+                            defaultMode is optional: mode bits used to set permissions on created files by default.
+                            Must be an octal value between 0000 and 0777 or a decimal value between 0 and 511.
+                            YAML accepts both octal and decimal values, JSON requires decimal values for mode bits.
+                            Defaults to 0644.
+                            Directories within the path are not affected by this setting.
+                            This might be in conflict with other options that affect the file
+                            mode, like fsGroup, and the result can be other mode bits set.
+                          format: int32
+                          type: integer
+                        items:
+                          description: |-
+                            items if unspecified, each key-value pair in the Data field of the referenced
+                            ConfigMap will be projected into the volume as a file whose name is the
+                            key and content is the value. If specified, the listed keys will be
+                            projected into the specified paths, and unlisted keys will not be
+                            present. If a key is specified which is not present in the ConfigMap,
+                            the volume setup will error unless it is marked optional. Paths must be
+                            relative and may not contain the '..' path or start with '..'.
+                          items:
+                            description: Maps a string key to a path within a volume.
+                            properties:
+                              key:
+                                description: key is the key to project.
+                                type: string
+                              mode:
+                                description: |-
+                                  mode is Optional: mode bits used to set permissions on this file.
+                                  Must be an octal value between 0000 and 0777 or a decimal value between 0 and 511.
+                                  YAML accepts both octal and decimal values, JSON requires decimal values for mode bits.
+                                  If not specified, the volume defaultMode will be used.
+                                  This might be in conflict with other options that affect the file
+                                  mode, like fsGroup, and the result can be other mode bits set.
+                                format: int32
+                                type: integer
+                              path:
+                                description: |-
+                                  path is the relative path of the file to map the key to.
+                                  May not be an absolute path.
+                                  May not contain the path element '..'.
+                                  May not start with the string '..'.
+                                type: string
+                            required:
+                            - key
+                            - path
+                            type: object
+                          type: array
+                          x-kubernetes-list-type: atomic
+                        name:
+                          default: ""
+                          description: |-
+                            Name of the referent.
+                            This field is effectively required, but due to backwards compatibility is
+                            allowed to be empty. Instances of this type with an empty value here are
+                            almost certainly wrong.
+                            More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                          type: string
+                        optional:
+                          description: optional specify whether the ConfigMap or its
+                            keys must be defined
+                          type: boolean
+                      type: object
+                      x-kubernetes-map-type: atomic
+                    csi:
+                      description: csi (Container Storage Interface) represents ephemeral
+                        storage that is handled by certain external CSI drivers.
+                      properties:
+                        driver:
+                          description: |-
+                            driver is the name of the CSI driver that handles this volume.
+                            Consult with your admin for the correct name as registered in the cluster.
+                          type: string
+                        fsType:
+                          description: |-
+                            fsType to mount. Ex. "ext4", "xfs", "ntfs".
+                            If not provided, the empty value is passed to the associated CSI driver
+                            which will determine the default filesystem to apply.
+                          type: string
+                        nodePublishSecretRef:
+                          description: |-
+                            nodePublishSecretRef is a reference to the secret object containing
+                            sensitive information to pass to the CSI driver to complete the CSI
+                            NodePublishVolume and NodeUnpublishVolume calls.
+                            This field is optional, and  may be empty if no secret is required. If the
+                            secret object contains more than one secret, all secret references are passed.
+                          properties:
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        readOnly:
+                          description: |-
+                            readOnly specifies a read-only configuration for the volume.
+                            Defaults to false (read/write).
+                          type: boolean
+                        volumeAttributes:
+                          additionalProperties:
+                            type: string
+                          description: |-
+                            volumeAttributes stores driver-specific properties that are passed to the CSI
+                            driver. Consult your driver's documentation for supported values.
+                          type: object
+                      required:
+                      - driver
+                      type: object
+                    downwardAPI:
+                      description: downwardAPI represents downward API about the pod
+                        that should populate this volume
+                      properties:
+                        defaultMode:
+                          description: |-
+                            Optional: mode bits to use on created files by default. Must be a
+                            Optional: mode bits used to set permissions on created files by default.
+                            Must be an octal value between 0000 and 0777 or a decimal value between 0 and 511.
+                            YAML accepts both octal and decimal values, JSON requires decimal values for mode bits.
+                            Defaults to 0644.
+                            Directories within the path are not affected by this setting.
+                            This might be in conflict with other options that affect the file
+                            mode, like fsGroup, and the result can be other mode bits set.
+                          format: int32
+                          type: integer
+                        items:
+                          description: Items is a list of downward API volume file
+                          items:
+                            description: DownwardAPIVolumeFile represents information
+                              to create the file containing the pod field
+                            properties:
+                              fieldRef:
+                                description: 'Required: Selects a field of the pod:
+                                  only annotations, labels, name, namespace and uid
+                                  are supported.'
+                                properties:
+                                  apiVersion:
+                                    description: Version of the schema the FieldPath
+                                      is written in terms of, defaults to "v1".
+                                    type: string
+                                  fieldPath:
+                                    description: Path of the field to select in the
+                                      specified API version.
+                                    type: string
+                                required:
+                                - fieldPath
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              mode:
+                                description: |-
+                                  Optional: mode bits used to set permissions on this file, must be an octal value
+                                  between 0000 and 0777 or a decimal value between 0 and 511.
+                                  YAML accepts both octal and decimal values, JSON requires decimal values for mode bits.
+                                  If not specified, the volume defaultMode will be used.
+                                  This might be in conflict with other options that affect the file
+                                  mode, like fsGroup, and the result can be other mode bits set.
+                                format: int32
+                                type: integer
+                              path:
+                                description: 'Required: Path is  the relative path
+                                  name of the file to be created. Must not be absolute
+                                  or contain the ''..'' path. Must be utf-8 encoded.
+                                  The first item of the relative path must not start
+                                  with ''..'''
+                                type: string
+                              resourceFieldRef:
+                                description: |-
+                                  Selects a resource of the container: only resources limits and requests
+                                  (limits.cpu, limits.memory, requests.cpu and requests.memory) are currently supported.
+                                properties:
+                                  containerName:
+                                    description: 'Container name: required for volumes,
+                                      optional for env vars'
+                                    type: string
+                                  divisor:
+                                    anyOf:
+                                    - type: integer
+                                    - type: string
+                                    description: Specifies the output format of the
+                                      exposed resources, defaults to "1"
+                                    pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                    x-kubernetes-int-or-string: true
+                                  resource:
+                                    description: 'Required: resource to select'
+                                    type: string
+                                required:
+                                - resource
+                                type: object
+                                x-kubernetes-map-type: atomic
+                            required:
+                            - path
+                            type: object
+                          type: array
+                          x-kubernetes-list-type: atomic
+                      type: object
+                    emptyDir:
+                      description: |-
+                        emptyDir represents a temporary directory that shares a pod's lifetime.
+                        More info: https://kubernetes.io/docs/concepts/storage/volumes#emptydir
+                      properties:
+                        medium:
+                          description: |-
+                            medium represents what type of storage medium should back this directory.
+                            The default is "" which means to use the node's default medium.
+                            Must be an empty string (default) or Memory.
+                            More info: https://kubernetes.io/docs/concepts/storage/volumes#emptydir
+                          type: string
+                        sizeLimit:
+                          anyOf:
+                          - type: integer
+                          - type: string
+                          description: |-
+                            sizeLimit is the total amount of local storage required for this EmptyDir volume.
+                            The size limit is also applicable for memory medium.
+                            The maximum usage on memory medium EmptyDir would be the minimum value between
+                            the SizeLimit specified here and the sum of memory limits of all containers in a pod.
+                            The default is nil which means that the limit is undefined.
+                            More info: https://kubernetes.io/docs/concepts/storage/volumes#emptydir
+                          pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                          x-kubernetes-int-or-string: true
+                      type: object
+                    ephemeral:
+                      description: |-
+                        ephemeral represents a volume that is handled by a cluster storage driver.
+                        The volume's lifecycle is tied to the pod that defines it - it will be created before the pod starts,
+                        and deleted when the pod is removed.
+
+                        Use this if:
+                        a) the volume is only needed while the pod runs,
+                        b) features of normal volumes like restoring from snapshot or capacity
+                           tracking are needed,
+                        c) the storage driver is specified through a storage class, and
+                        d) the storage driver supports dynamic volume provisioning through
+                           a PersistentVolumeClaim (see EphemeralVolumeSource for more
+                           information on the connection between this volume type
+                           and PersistentVolumeClaim).
+
+                        Use PersistentVolumeClaim or one of the vendor-specific
+                        APIs for volumes that persist for longer than the lifecycle
+                        of an individual pod.
+
+                        Use CSI for light-weight local ephemeral volumes if the CSI driver is meant to
+                        be used that way - see the documentation of the driver for
+                        more information.
+
+                        A pod can use both types of ephemeral volumes and
+                        persistent volumes at the same time.
+                      properties:
+                        volumeClaimTemplate:
+                          description: |-
+                            Will be used to create a stand-alone PVC to provision the volume.
+                            The pod in which this EphemeralVolumeSource is embedded will be the
+                            owner of the PVC, i.e. the PVC will be deleted together with the
+                            pod.  The name of the PVC will be `<pod name>-<volume name>` where
+                            `<volume name>` is the name from the `PodSpec.Volumes` array
+                            entry. Pod validation will reject the pod if the concatenated name
+                            is not valid for a PVC (for example, too long).
+
+                            An existing PVC with that name that is not owned by the pod
+                            will *not* be used for the pod to avoid using an unrelated
+                            volume by mistake. Starting the pod is then blocked until
+                            the unrelated PVC is removed. If such a pre-created PVC is
+                            meant to be used by the pod, the PVC has to updated with an
+                            owner reference to the pod once the pod exists. Normally
+                            this should not be necessary, but it may be useful when
+                            manually reconstructing a broken cluster.
+
+                            This field is read-only and no changes will be made by Kubernetes
+                            to the PVC after it has been created.
+
+                            Required, must not be nil.
+                          properties:
+                            metadata:
+                              description: |-
+                                May contain labels and annotations that will be copied into the PVC
+                                when creating it. No other fields are allowed and will be rejected during
+                                validation.
+                              type: object
+                            spec:
+                              description: |-
+                                The specification for the PersistentVolumeClaim. The entire content is
+                                copied unchanged into the PVC that gets created from this
+                                template. The same fields as in a PersistentVolumeClaim
+                                are also valid here.
+                              properties:
+                                accessModes:
+                                  description: |-
+                                    accessModes contains the desired access modes the volume should have.
+                                    More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#access-modes-1
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                dataSource:
+                                  description: |-
+                                    dataSource field can be used to specify either:
+                                    * An existing VolumeSnapshot object (snapshot.storage.k8s.io/VolumeSnapshot)
+                                    * An existing PVC (PersistentVolumeClaim)
+                                    If the provisioner or an external controller can support the specified data source,
+                                    it will create a new volume based on the contents of the specified data source.
+                                    When the AnyVolumeDataSource feature gate is enabled, dataSource contents will be copied to dataSourceRef,
+                                    and dataSourceRef contents will be copied to dataSource when dataSourceRef.namespace is not specified.
+                                    If the namespace is specified, then dataSourceRef will not be copied to dataSource.
+                                  properties:
+                                    apiGroup:
+                                      description: |-
+                                        APIGroup is the group for the resource being referenced.
+                                        If APIGroup is not specified, the specified Kind must be in the core API group.
+                                        For any other third-party types, APIGroup is required.
+                                      type: string
+                                    kind:
+                                      description: Kind is the type of resource being
+                                        referenced
+                                      type: string
+                                    name:
+                                      description: Name is the name of resource being
+                                        referenced
+                                      type: string
+                                  required:
+                                  - kind
+                                  - name
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                dataSourceRef:
+                                  description: |-
+                                    dataSourceRef specifies the object from which to populate the volume with data, if a non-empty
+                                    volume is desired. This may be any object from a non-empty API group (non
+                                    core object) or a PersistentVolumeClaim object.
+                                    When this field is specified, volume binding will only succeed if the type of
+                                    the specified object matches some installed volume populator or dynamic
+                                    provisioner.
+                                    This field will replace the functionality of the dataSource field and as such
+                                    if both fields are non-empty, they must have the same value. For backwards
+                                    compatibility, when namespace isn't specified in dataSourceRef,
+                                    both fields (dataSource and dataSourceRef) will be set to the same
+                                    value automatically if one of them is empty and the other is non-empty.
+                                    When namespace is specified in dataSourceRef,
+                                    dataSource isn't set to the same value and must be empty.
+                                    There are three important differences between dataSource and dataSourceRef:
+                                    * While dataSource only allows two specific types of objects, dataSourceRef
+                                      allows any non-core object, as well as PersistentVolumeClaim objects.
+                                    * While dataSource ignores disallowed values (dropping them), dataSourceRef
+                                      preserves all values, and generates an error if a disallowed value is
+                                      specified.
+                                    * While dataSource only allows local objects, dataSourceRef allows objects
+                                      in any namespaces.
+                                    (Beta) Using this field requires the AnyVolumeDataSource feature gate to be enabled.
+                                    (Alpha) Using the namespace field of dataSourceRef requires the CrossNamespaceVolumeDataSource feature gate to be enabled.
+                                  properties:
+                                    apiGroup:
+                                      description: |-
+                                        APIGroup is the group for the resource being referenced.
+                                        If APIGroup is not specified, the specified Kind must be in the core API group.
+                                        For any other third-party types, APIGroup is required.
+                                      type: string
+                                    kind:
+                                      description: Kind is the type of resource being
+                                        referenced
+                                      type: string
+                                    name:
+                                      description: Name is the name of resource being
+                                        referenced
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        Namespace is the namespace of resource being referenced
+                                        Note that when a namespace is specified, a gateway.networking.k8s.io/ReferenceGrant object is required in the referent namespace to allow that namespace's owner to accept the reference. See the ReferenceGrant documentation for details.
+                                        (Alpha) This field requires the CrossNamespaceVolumeDataSource feature gate to be enabled.
+                                      type: string
+                                  required:
+                                  - kind
+                                  - name
+                                  type: object
+                                resources:
+                                  description: |-
+                                    resources represents the minimum resources the volume should have.
+                                    If RecoverVolumeExpansionFailure feature is enabled users are allowed to specify resource requirements
+                                    that are lower than previous value but must still be higher than capacity recorded in the
+                                    status field of the claim.
+                                    More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources
+                                  properties:
+                                    limits:
+                                      additionalProperties:
+                                        anyOf:
+                                        - type: integer
+                                        - type: string
+                                        pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                        x-kubernetes-int-or-string: true
+                                      description: |-
+                                        Limits describes the maximum amount of compute resources allowed.
+                                        More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+                                      type: object
+                                    requests:
+                                      additionalProperties:
+                                        anyOf:
+                                        - type: integer
+                                        - type: string
+                                        pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                        x-kubernetes-int-or-string: true
+                                      description: |-
+                                        Requests describes the minimum amount of compute resources required.
+                                        If Requests is omitted for a container, it defaults to Limits if that is explicitly specified,
+                                        otherwise to an implementation-defined value. Requests cannot exceed Limits.
+                                        More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+                                      type: object
+                                  type: object
+                                selector:
+                                  description: selector is a label query over volumes
+                                    to consider for binding.
+                                  properties:
+                                    matchExpressions:
+                                      description: matchExpressions is a list of label
+                                        selector requirements. The requirements are
+                                        ANDed.
+                                      items:
+                                        description: |-
+                                          A label selector requirement is a selector that contains values, a key, and an operator that
+                                          relates the key and values.
+                                        properties:
+                                          key:
+                                            description: key is the label key that
+                                              the selector applies to.
+                                            type: string
+                                          operator:
+                                            description: |-
+                                              operator represents a key's relationship to a set of values.
+                                              Valid operators are In, NotIn, Exists and DoesNotExist.
+                                            type: string
+                                          values:
+                                            description: |-
+                                              values is an array of string values. If the operator is In or NotIn,
+                                              the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                              the values array must be empty. This array is replaced during a strategic
+                                              merge patch.
+                                            items:
+                                              type: string
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                        required:
+                                        - key
+                                        - operator
+                                        type: object
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    matchLabels:
+                                      additionalProperties:
+                                        type: string
+                                      description: |-
+                                        matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                        map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                        operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                      type: object
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                storageClassName:
+                                  description: |-
+                                    storageClassName is the name of the StorageClass required by the claim.
+                                    More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#class-1
+                                  type: string
+                                volumeAttributesClassName:
+                                  description: |-
+                                    volumeAttributesClassName may be used to set the VolumeAttributesClass used by this claim.
+                                    If specified, the CSI driver will create or update the volume with the attributes defined
+                                    in the corresponding VolumeAttributesClass. This has a different purpose than storageClassName,
+                                    it can be changed after the claim is created. An empty string or nil value indicates that no
+                                    VolumeAttributesClass will be applied to the claim. If the claim enters an Infeasible error state,
+                                    this field can be reset to its previous value (including nil) to cancel the modification.
+                                    If the resource referred to by volumeAttributesClass does not exist, this PersistentVolumeClaim will be
+                                    set to a Pending state, as reflected by the modifyVolumeStatus field, until such as a resource
+                                    exists.
+                                    More info: https://kubernetes.io/docs/concepts/storage/volume-attributes-classes/
+                                  type: string
+                                volumeMode:
+                                  description: |-
+                                    volumeMode defines what type of volume is required by the claim.
+                                    Value of Filesystem is implied when not included in claim spec.
+                                  type: string
+                                volumeName:
+                                  description: volumeName is the binding reference
+                                    to the PersistentVolume backing this claim.
+                                  type: string
+                              type: object
+                          required:
+                          - spec
+                          type: object
+                      type: object
+                    fc:
+                      description: fc represents a Fibre Channel resource that is
+                        attached to a kubelet's host machine and then exposed to the
+                        pod.
+                      properties:
+                        fsType:
+                          description: |-
+                            fsType is the filesystem type to mount.
+                            Must be a filesystem type supported by the host operating system.
+                            Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
+                          type: string
+                        lun:
+                          description: 'lun is Optional: FC target lun number'
+                          format: int32
+                          type: integer
+                        readOnly:
+                          description: |-
+                            readOnly is Optional: Defaults to false (read/write). ReadOnly here will force
+                            the ReadOnly setting in VolumeMounts.
+                          type: boolean
+                        targetWWNs:
+                          description: 'targetWWNs is Optional: FC target worldwide
+                            names (WWNs)'
+                          items:
+                            type: string
+                          type: array
+                          x-kubernetes-list-type: atomic
+                        wwids:
+                          description: |-
+                            wwids Optional: FC volume world wide identifiers (wwids)
+                            Either wwids or combination of targetWWNs and lun must be set, but not both simultaneously.
+                          items:
+                            type: string
+                          type: array
+                          x-kubernetes-list-type: atomic
+                      type: object
+                    flexVolume:
+                      description: |-
+                        flexVolume represents a generic volume resource that is
+                        provisioned/attached using an exec based plugin.
+                        Deprecated: FlexVolume is deprecated. Consider using a CSIDriver instead.
+                      properties:
+                        driver:
+                          description: driver is the name of the driver to use for
+                            this volume.
+                          type: string
+                        fsType:
+                          description: |-
+                            fsType is the filesystem type to mount.
+                            Must be a filesystem type supported by the host operating system.
+                            Ex. "ext4", "xfs", "ntfs". The default filesystem depends on FlexVolume script.
+                          type: string
+                        options:
+                          additionalProperties:
+                            type: string
+                          description: 'options is Optional: this field holds extra
+                            command options if any.'
+                          type: object
+                        readOnly:
+                          description: |-
+                            readOnly is Optional: defaults to false (read/write). ReadOnly here will force
+                            the ReadOnly setting in VolumeMounts.
+                          type: boolean
+                        secretRef:
+                          description: |-
+                            secretRef is Optional: secretRef is reference to the secret object containing
+                            sensitive information to pass to the plugin scripts. This may be
+                            empty if no secret object is specified. If the secret object
+                            contains more than one secret, all secrets are passed to the plugin
+                            scripts.
+                          properties:
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                          type: object
+                          x-kubernetes-map-type: atomic
+                      required:
+                      - driver
+                      type: object
+                    flocker:
+                      description: |-
+                        flocker represents a Flocker volume attached to a kubelet's host machine. This depends on the Flocker control service being running.
+                        Deprecated: Flocker is deprecated and the in-tree flocker type is no longer supported.
+                      properties:
+                        datasetName:
+                          description: |-
+                            datasetName is Name of the dataset stored as metadata -> name on the dataset for Flocker
+                            should be considered as deprecated
+                          type: string
+                        datasetUUID:
+                          description: datasetUUID is the UUID of the dataset. This
+                            is unique identifier of a Flocker dataset
+                          type: string
+                      type: object
+                    gcePersistentDisk:
+                      description: |-
+                        gcePersistentDisk represents a GCE Disk resource that is attached to a
+                        kubelet's host machine and then exposed to the pod.
+                        Deprecated: GCEPersistentDisk is deprecated. All operations for the in-tree
+                        gcePersistentDisk type are redirected to the pd.csi.storage.gke.io CSI driver.
+                        More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
+                      properties:
+                        fsType:
+                          description: |-
+                            fsType is filesystem type of the volume that you want to mount.
+                            Tip: Ensure that the filesystem type is supported by the host operating system.
+                            Examples: "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
+                            More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
+                          type: string
+                        partition:
+                          description: |-
+                            partition is the partition in the volume that you want to mount.
+                            If omitted, the default is to mount by volume name.
+                            Examples: For volume /dev/sda1, you specify the partition as "1".
+                            Similarly, the volume partition for /dev/sda is "0" (or you can leave the property empty).
+                            More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
+                          format: int32
+                          type: integer
+                        pdName:
+                          description: |-
+                            pdName is unique name of the PD resource in GCE. Used to identify the disk in GCE.
+                            More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
+                          type: string
+                        readOnly:
+                          description: |-
+                            readOnly here will force the ReadOnly setting in VolumeMounts.
+                            Defaults to false.
+                            More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
+                          type: boolean
+                      required:
+                      - pdName
+                      type: object
+                    gitRepo:
+                      description: |-
+                        gitRepo represents a git repository at a particular revision.
+                        Deprecated: GitRepo is deprecated. To provision a container with a git repo, mount an
+                        EmptyDir into an InitContainer that clones the repo using git, then mount the EmptyDir
+                        into the Pod's container.
+                      properties:
+                        directory:
+                          description: |-
+                            directory is the target directory name.
+                            Must not contain or start with '..'.  If '.' is supplied, the volume directory will be the
+                            git repository.  Otherwise, if specified, the volume will contain the git repository in
+                            the subdirectory with the given name.
+                          type: string
+                        repository:
+                          description: repository is the URL
+                          type: string
+                        revision:
+                          description: revision is the commit hash for the specified
+                            revision.
+                          type: string
+                      required:
+                      - repository
+                      type: object
+                    glusterfs:
+                      description: |-
+                        glusterfs represents a Glusterfs mount on the host that shares a pod's lifetime.
+                        Deprecated: Glusterfs is deprecated and the in-tree glusterfs type is no longer supported.
+                      properties:
+                        endpoints:
+                          description: endpoints is the endpoint name that details
+                            Glusterfs topology.
+                          type: string
+                        path:
+                          description: |-
+                            path is the Glusterfs volume path.
+                            More info: https://examples.k8s.io/volumes/glusterfs/README.md#create-a-pod
+                          type: string
+                        readOnly:
+                          description: |-
+                            readOnly here will force the Glusterfs volume to be mounted with read-only permissions.
+                            Defaults to false.
+                            More info: https://examples.k8s.io/volumes/glusterfs/README.md#create-a-pod
+                          type: boolean
+                      required:
+                      - endpoints
+                      - path
+                      type: object
+                    hostPath:
+                      description: |-
+                        hostPath represents a pre-existing file or directory on the host
+                        machine that is directly exposed to the container. This is generally
+                        used for system agents or other privileged things that are allowed
+                        to see the host machine. Most containers will NOT need this.
+                        More info: https://kubernetes.io/docs/concepts/storage/volumes#hostpath
+                      properties:
+                        path:
+                          description: |-
+                            path of the directory on the host.
+                            If the path is a symlink, it will follow the link to the real path.
+                            More info: https://kubernetes.io/docs/concepts/storage/volumes#hostpath
+                          type: string
+                        type:
+                          description: |-
+                            type for HostPath Volume
+                            Defaults to ""
+                            More info: https://kubernetes.io/docs/concepts/storage/volumes#hostpath
+                          type: string
+                      required:
+                      - path
+                      type: object
+                    image:
+                      description: |-
+                        image represents an OCI object (a container image or artifact) pulled and mounted on the kubelet's host machine.
+                        The volume is resolved at pod startup depending on which PullPolicy value is provided:
+
+                        - Always: the kubelet always attempts to pull the reference. Container creation will fail If the pull fails.
+                        - Never: the kubelet never pulls the reference and only uses a local image or artifact. Container creation will fail if the reference isn't present.
+                        - IfNotPresent: the kubelet pulls if the reference isn't already present on disk. Container creation will fail if the reference isn't present and the pull fails.
+
+                        The volume gets re-resolved if the pod gets deleted and recreated, which means that new remote content will become available on pod recreation.
+                        A failure to resolve or pull the image during pod startup will block containers from starting and may add significant latency. Failures will be retried using normal volume backoff and will be reported on the pod reason and message.
+                        The types of objects that may be mounted by this volume are defined by the container runtime implementation on a host machine and at minimum must include all valid types supported by the container image field.
+                        The OCI object gets mounted in a single directory (spec.containers[*].volumeMounts.mountPath) by merging the manifest layers in the same way as for container images.
+                        The volume will be mounted read-only (ro) and non-executable files (noexec).
+                        Sub path mounts for containers are not supported (spec.containers[*].volumeMounts.subpath) before 1.33.
+                        The field spec.securityContext.fsGroupChangePolicy has no effect on this volume type.
+                      properties:
+                        pullPolicy:
+                          description: |-
+                            Policy for pulling OCI objects. Possible values are:
+                            Always: the kubelet always attempts to pull the reference. Container creation will fail If the pull fails.
+                            Never: the kubelet never pulls the reference and only uses a local image or artifact. Container creation will fail if the reference isn't present.
+                            IfNotPresent: the kubelet pulls if the reference isn't already present on disk. Container creation will fail if the reference isn't present and the pull fails.
+                            Defaults to Always if :latest tag is specified, or IfNotPresent otherwise.
+                          type: string
+                        reference:
+                          description: |-
+                            Required: Image or artifact reference to be used.
+                            Behaves in the same way as pod.spec.containers[*].image.
+                            Pull secrets will be assembled in the same way as for the container image by looking up node credentials, SA image pull secrets, and pod spec image pull secrets.
+                            More info: https://kubernetes.io/docs/concepts/containers/images
+                            This field is optional to allow higher level config management to default or override
+                            container images in workload controllers like Deployments and StatefulSets.
+                          type: string
+                      type: object
+                    iscsi:
+                      description: |-
+                        iscsi represents an ISCSI Disk resource that is attached to a
+                        kubelet's host machine and then exposed to the pod.
+                        More info: https://kubernetes.io/docs/concepts/storage/volumes/#iscsi
+                      properties:
+                        chapAuthDiscovery:
+                          description: chapAuthDiscovery defines whether support iSCSI
+                            Discovery CHAP authentication
+                          type: boolean
+                        chapAuthSession:
+                          description: chapAuthSession defines whether support iSCSI
+                            Session CHAP authentication
+                          type: boolean
+                        fsType:
+                          description: |-
+                            fsType is the filesystem type of the volume that you want to mount.
+                            Tip: Ensure that the filesystem type is supported by the host operating system.
+                            Examples: "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
+                            More info: https://kubernetes.io/docs/concepts/storage/volumes#iscsi
+                          type: string
+                        initiatorName:
+                          description: |-
+                            initiatorName is the custom iSCSI Initiator Name.
+                            If initiatorName is specified with iscsiInterface simultaneously, new iSCSI interface
+                            <target portal>:<volume name> will be created for the connection.
+                          type: string
+                        iqn:
+                          description: iqn is the target iSCSI Qualified Name.
+                          type: string
+                        iscsiInterface:
+                          default: default
+                          description: |-
+                            iscsiInterface is the interface Name that uses an iSCSI transport.
+                            Defaults to 'default' (tcp).
+                          type: string
+                        lun:
+                          description: lun represents iSCSI Target Lun number.
+                          format: int32
+                          type: integer
+                        portals:
+                          description: |-
+                            portals is the iSCSI Target Portal List. The portal is either an IP or ip_addr:port if the port
+                            is other than default (typically TCP ports 860 and 3260).
+                          items:
+                            type: string
+                          type: array
+                          x-kubernetes-list-type: atomic
+                        readOnly:
+                          description: |-
+                            readOnly here will force the ReadOnly setting in VolumeMounts.
+                            Defaults to false.
+                          type: boolean
+                        secretRef:
+                          description: secretRef is the CHAP Secret for iSCSI target
+                            and initiator authentication
+                          properties:
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        targetPortal:
+                          description: |-
+                            targetPortal is iSCSI Target Portal. The Portal is either an IP or ip_addr:port if the port
+                            is other than default (typically TCP ports 860 and 3260).
+                          type: string
+                      required:
+                      - iqn
+                      - lun
+                      - targetPortal
+                      type: object
+                    name:
+                      description: |-
+                        name of the volume.
+                        Must be a DNS_LABEL and unique within the pod.
+                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                      type: string
+                    nfs:
+                      description: |-
+                        nfs represents an NFS mount on the host that shares a pod's lifetime
+                        More info: https://kubernetes.io/docs/concepts/storage/volumes#nfs
+                      properties:
+                        path:
+                          description: |-
+                            path that is exported by the NFS server.
+                            More info: https://kubernetes.io/docs/concepts/storage/volumes#nfs
+                          type: string
+                        readOnly:
+                          description: |-
+                            readOnly here will force the NFS export to be mounted with read-only permissions.
+                            Defaults to false.
+                            More info: https://kubernetes.io/docs/concepts/storage/volumes#nfs
+                          type: boolean
+                        server:
+                          description: |-
+                            server is the hostname or IP address of the NFS server.
+                            More info: https://kubernetes.io/docs/concepts/storage/volumes#nfs
+                          type: string
+                      required:
+                      - path
+                      - server
+                      type: object
+                    persistentVolumeClaim:
+                      description: |-
+                        persistentVolumeClaimVolumeSource represents a reference to a
+                        PersistentVolumeClaim in the same namespace.
+                        More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#persistentvolumeclaims
+                      properties:
+                        claimName:
+                          description: |-
+                            claimName is the name of a PersistentVolumeClaim in the same namespace as the pod using this volume.
+                            More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#persistentvolumeclaims
+                          type: string
+                        readOnly:
+                          description: |-
+                            readOnly Will force the ReadOnly setting in VolumeMounts.
+                            Default false.
+                          type: boolean
+                      required:
+                      - claimName
+                      type: object
+                    photonPersistentDisk:
+                      description: |-
+                        photonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets host machine.
+                        Deprecated: PhotonPersistentDisk is deprecated and the in-tree photonPersistentDisk type is no longer supported.
+                      properties:
+                        fsType:
+                          description: |-
+                            fsType is the filesystem type to mount.
+                            Must be a filesystem type supported by the host operating system.
+                            Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
+                          type: string
+                        pdID:
+                          description: pdID is the ID that identifies Photon Controller
+                            persistent disk
+                          type: string
+                      required:
+                      - pdID
+                      type: object
+                    portworxVolume:
+                      description: |-
+                        portworxVolume represents a portworx volume attached and mounted on kubelets host machine.
+                        Deprecated: PortworxVolume is deprecated. All operations for the in-tree portworxVolume type
+                        are redirected to the pxd.portworx.com CSI driver when the CSIMigrationPortworx feature-gate
+                        is on.
+                      properties:
+                        fsType:
+                          description: |-
+                            fSType represents the filesystem type to mount
+                            Must be a filesystem type supported by the host operating system.
+                            Ex. "ext4", "xfs". Implicitly inferred to be "ext4" if unspecified.
+                          type: string
+                        readOnly:
+                          description: |-
+                            readOnly defaults to false (read/write). ReadOnly here will force
+                            the ReadOnly setting in VolumeMounts.
+                          type: boolean
+                        volumeID:
+                          description: volumeID uniquely identifies a Portworx volume
+                          type: string
+                      required:
+                      - volumeID
+                      type: object
+                    projected:
+                      description: projected items for all in one resources secrets,
+                        configmaps, and downward API
+                      properties:
+                        defaultMode:
+                          description: |-
+                            defaultMode are the mode bits used to set permissions on created files by default.
+                            Must be an octal value between 0000 and 0777 or a decimal value between 0 and 511.
+                            YAML accepts both octal and decimal values, JSON requires decimal values for mode bits.
+                            Directories within the path are not affected by this setting.
+                            This might be in conflict with other options that affect the file
+                            mode, like fsGroup, and the result can be other mode bits set.
+                          format: int32
+                          type: integer
+                        sources:
+                          description: |-
+                            sources is the list of volume projections. Each entry in this list
+                            handles one source.
+                          items:
+                            description: |-
+                              Projection that may be projected along with other supported volume types.
+                              Exactly one of these fields must be set.
+                            properties:
+                              clusterTrustBundle:
+                                description: |-
+                                  ClusterTrustBundle allows a pod to access the `.spec.trustBundle` field
+                                  of ClusterTrustBundle objects in an auto-updating file.
+
+                                  Alpha, gated by the ClusterTrustBundleProjection feature gate.
+
+                                  ClusterTrustBundle objects can either be selected by name, or by the
+                                  combination of signer name and a label selector.
+
+                                  Kubelet performs aggressive normalization of the PEM contents written
+                                  into the pod filesystem.  Esoteric PEM features such as inter-block
+                                  comments and block headers are stripped.  Certificates are deduplicated.
+                                  The ordering of certificates within the file is arbitrary, and Kubelet
+                                  may change the order over time.
+                                properties:
+                                  labelSelector:
+                                    description: |-
+                                      Select all ClusterTrustBundles that match this label selector.  Only has
+                                      effect if signerName is set.  Mutually-exclusive with name.  If unset,
+                                      interpreted as "match nothing".  If set but empty, interpreted as "match
+                                      everything".
+                                    properties:
+                                      matchExpressions:
+                                        description: matchExpressions is a list of
+                                          label selector requirements. The requirements
+                                          are ANDed.
+                                        items:
+                                          description: |-
+                                            A label selector requirement is a selector that contains values, a key, and an operator that
+                                            relates the key and values.
+                                          properties:
+                                            key:
+                                              description: key is the label key that
+                                                the selector applies to.
+                                              type: string
+                                            operator:
+                                              description: |-
+                                                operator represents a key's relationship to a set of values.
+                                                Valid operators are In, NotIn, Exists and DoesNotExist.
+                                              type: string
+                                            values:
+                                              description: |-
+                                                values is an array of string values. If the operator is In or NotIn,
+                                                the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                                the values array must be empty. This array is replaced during a strategic
+                                                merge patch.
+                                              items:
+                                                type: string
+                                              type: array
+                                              x-kubernetes-list-type: atomic
+                                          required:
+                                          - key
+                                          - operator
+                                          type: object
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                      matchLabels:
+                                        additionalProperties:
+                                          type: string
+                                        description: |-
+                                          matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                          map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                          operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                        type: object
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  name:
+                                    description: |-
+                                      Select a single ClusterTrustBundle by object name.  Mutually-exclusive
+                                      with signerName and labelSelector.
+                                    type: string
+                                  optional:
+                                    description: |-
+                                      If true, don't block pod startup if the referenced ClusterTrustBundle(s)
+                                      aren't available.  If using name, then the named ClusterTrustBundle is
+                                      allowed not to exist.  If using signerName, then the combination of
+                                      signerName and labelSelector is allowed to match zero
+                                      ClusterTrustBundles.
+                                    type: boolean
+                                  path:
+                                    description: Relative path from the volume root
+                                      to write the bundle.
+                                    type: string
+                                  signerName:
+                                    description: |-
+                                      Select all ClusterTrustBundles that match this signer name.
+                                      Mutually-exclusive with name.  The contents of all selected
+                                      ClusterTrustBundles will be unified and deduplicated.
+                                    type: string
+                                required:
+                                - path
+                                type: object
+                              configMap:
+                                description: configMap information about the configMap
+                                  data to project
+                                properties:
+                                  items:
+                                    description: |-
+                                      items if unspecified, each key-value pair in the Data field of the referenced
+                                      ConfigMap will be projected into the volume as a file whose name is the
+                                      key and content is the value. If specified, the listed keys will be
+                                      projected into the specified paths, and unlisted keys will not be
+                                      present. If a key is specified which is not present in the ConfigMap,
+                                      the volume setup will error unless it is marked optional. Paths must be
+                                      relative and may not contain the '..' path or start with '..'.
+                                    items:
+                                      description: Maps a string key to a path within
+                                        a volume.
+                                      properties:
+                                        key:
+                                          description: key is the key to project.
+                                          type: string
+                                        mode:
+                                          description: |-
+                                            mode is Optional: mode bits used to set permissions on this file.
+                                            Must be an octal value between 0000 and 0777 or a decimal value between 0 and 511.
+                                            YAML accepts both octal and decimal values, JSON requires decimal values for mode bits.
+                                            If not specified, the volume defaultMode will be used.
+                                            This might be in conflict with other options that affect the file
+                                            mode, like fsGroup, and the result can be other mode bits set.
+                                          format: int32
+                                          type: integer
+                                        path:
+                                          description: |-
+                                            path is the relative path of the file to map the key to.
+                                            May not be an absolute path.
+                                            May not contain the path element '..'.
+                                            May not start with the string '..'.
+                                          type: string
+                                      required:
+                                      - key
+                                      - path
+                                      type: object
+                                    type: array
+                                    x-kubernetes-list-type: atomic
+                                  name:
+                                    default: ""
+                                    description: |-
+                                      Name of the referent.
+                                      This field is effectively required, but due to backwards compatibility is
+                                      allowed to be empty. Instances of this type with an empty value here are
+                                      almost certainly wrong.
+                                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                    type: string
+                                  optional:
+                                    description: optional specify whether the ConfigMap
+                                      or its keys must be defined
+                                    type: boolean
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              downwardAPI:
+                                description: downwardAPI information about the downwardAPI
+                                  data to project
+                                properties:
+                                  items:
+                                    description: Items is a list of DownwardAPIVolume
+                                      file
+                                    items:
+                                      description: DownwardAPIVolumeFile represents
+                                        information to create the file containing
+                                        the pod field
+                                      properties:
+                                        fieldRef:
+                                          description: 'Required: Selects a field
+                                            of the pod: only annotations, labels,
+                                            name, namespace and uid are supported.'
+                                          properties:
+                                            apiVersion:
+                                              description: Version of the schema the
+                                                FieldPath is written in terms of,
+                                                defaults to "v1".
+                                              type: string
+                                            fieldPath:
+                                              description: Path of the field to select
+                                                in the specified API version.
+                                              type: string
+                                          required:
+                                          - fieldPath
+                                          type: object
+                                          x-kubernetes-map-type: atomic
+                                        mode:
+                                          description: |-
+                                            Optional: mode bits used to set permissions on this file, must be an octal value
+                                            between 0000 and 0777 or a decimal value between 0 and 511.
+                                            YAML accepts both octal and decimal values, JSON requires decimal values for mode bits.
+                                            If not specified, the volume defaultMode will be used.
+                                            This might be in conflict with other options that affect the file
+                                            mode, like fsGroup, and the result can be other mode bits set.
+                                          format: int32
+                                          type: integer
+                                        path:
+                                          description: 'Required: Path is  the relative
+                                            path name of the file to be created. Must
+                                            not be absolute or contain the ''..''
+                                            path. Must be utf-8 encoded. The first
+                                            item of the relative path must not start
+                                            with ''..'''
+                                          type: string
+                                        resourceFieldRef:
+                                          description: |-
+                                            Selects a resource of the container: only resources limits and requests
+                                            (limits.cpu, limits.memory, requests.cpu and requests.memory) are currently supported.
+                                          properties:
+                                            containerName:
+                                              description: 'Container name: required
+                                                for volumes, optional for env vars'
+                                              type: string
+                                            divisor:
+                                              anyOf:
+                                              - type: integer
+                                              - type: string
+                                              description: Specifies the output format
+                                                of the exposed resources, defaults
+                                                to "1"
+                                              pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                              x-kubernetes-int-or-string: true
+                                            resource:
+                                              description: 'Required: resource to
+                                                select'
+                                              type: string
+                                          required:
+                                          - resource
+                                          type: object
+                                          x-kubernetes-map-type: atomic
+                                      required:
+                                      - path
+                                      type: object
+                                    type: array
+                                    x-kubernetes-list-type: atomic
+                                type: object
+                              podCertificate:
+                                description: |-
+                                  Projects an auto-rotating credential bundle (private key and certificate
+                                  chain) that the pod can use either as a TLS client or server.
+
+                                  Kubelet generates a private key and uses it to send a
+                                  PodCertificateRequest to the named signer.  Once the signer approves the
+                                  request and issues a certificate chain, Kubelet writes the key and
+                                  certificate chain to the pod filesystem.  The pod does not start until
+                                  certificates have been issued for each podCertificate projected volume
+                                  source in its spec.
+
+                                  Kubelet will begin trying to rotate the certificate at the time indicated
+                                  by the signer using the PodCertificateRequest.Status.BeginRefreshAt
+                                  timestamp.
+
+                                  Kubelet can write a single file, indicated by the credentialBundlePath
+                                  field, or separate files, indicated by the keyPath and
+                                  certificateChainPath fields.
+
+                                  The credential bundle is a single file in PEM format.  The first PEM
+                                  entry is the private key (in PKCS#8 format), and the remaining PEM
+                                  entries are the certificate chain issued by the signer (typically,
+                                  signers will return their certificate chain in leaf-to-root order).
+
+                                  Prefer using the credential bundle format, since your application code
+                                  can read it atomically.  If you use keyPath and certificateChainPath,
+                                  your application must make two separate file reads. If these coincide
+                                  with a certificate rotation, it is possible that the private key and leaf
+                                  certificate you read may not correspond to each other.  Your application
+                                  will need to check for this condition, and re-read until they are
+                                  consistent.
+
+                                  The named signer controls chooses the format of the certificate it
+                                  issues; consult the signer implementation's documentation to learn how to
+                                  use the certificates it issues.
+                                properties:
+                                  certificateChainPath:
+                                    description: |-
+                                      Write the certificate chain at this path in the projected volume.
+
+                                      Most applications should use credentialBundlePath.  When using keyPath
+                                      and certificateChainPath, your application needs to check that the key
+                                      and leaf certificate are consistent, because it is possible to read the
+                                      files mid-rotation.
+                                    type: string
+                                  credentialBundlePath:
+                                    description: |-
+                                      Write the credential bundle at this path in the projected volume.
+
+                                      The credential bundle is a single file that contains multiple PEM blocks.
+                                      The first PEM block is a PRIVATE KEY block, containing a PKCS#8 private
+                                      key.
+
+                                      The remaining blocks are CERTIFICATE blocks, containing the issued
+                                      certificate chain from the signer (leaf and any intermediates).
+
+                                      Using credentialBundlePath lets your Pod's application code make a single
+                                      atomic read that retrieves a consistent key and certificate chain.  If you
+                                      project them to separate files, your application code will need to
+                                      additionally check that the leaf certificate was issued to the key.
+                                    type: string
+                                  keyPath:
+                                    description: |-
+                                      Write the key at this path in the projected volume.
+
+                                      Most applications should use credentialBundlePath.  When using keyPath
+                                      and certificateChainPath, your application needs to check that the key
+                                      and leaf certificate are consistent, because it is possible to read the
+                                      files mid-rotation.
+                                    type: string
+                                  keyType:
+                                    description: |-
+                                      The type of keypair Kubelet will generate for the pod.
+
+                                      Valid values are "RSA3072", "RSA4096", "ECDSAP256", "ECDSAP384",
+                                      "ECDSAP521", and "ED25519".
+                                    type: string
+                                  maxExpirationSeconds:
+                                    description: |-
+                                      maxExpirationSeconds is the maximum lifetime permitted for the
+                                      certificate.
+
+                                      Kubelet copies this value verbatim into the PodCertificateRequests it
+                                      generates for this projection.
+
+                                      If omitted, kube-apiserver will set it to 86400(24 hours). kube-apiserver
+                                      will reject values shorter than 3600 (1 hour).  The maximum allowable
+                                      value is 7862400 (91 days).
+
+                                      The signer implementation is then free to issue a certificate with any
+                                      lifetime *shorter* than MaxExpirationSeconds, but no shorter than 3600
+                                      seconds (1 hour).  This constraint is enforced by kube-apiserver.
+                                      `kubernetes.io` signers will never issue certificates with a lifetime
+                                      longer than 24 hours.
+                                    format: int32
+                                    type: integer
+                                  signerName:
+                                    description: Kubelet's generated CSRs will be
+                                      addressed to this signer.
+                                    type: string
+                                required:
+                                - keyType
+                                - signerName
+                                type: object
+                              secret:
+                                description: secret information about the secret data
+                                  to project
+                                properties:
+                                  items:
+                                    description: |-
+                                      items if unspecified, each key-value pair in the Data field of the referenced
+                                      Secret will be projected into the volume as a file whose name is the
+                                      key and content is the value. If specified, the listed keys will be
+                                      projected into the specified paths, and unlisted keys will not be
+                                      present. If a key is specified which is not present in the Secret,
+                                      the volume setup will error unless it is marked optional. Paths must be
+                                      relative and may not contain the '..' path or start with '..'.
+                                    items:
+                                      description: Maps a string key to a path within
+                                        a volume.
+                                      properties:
+                                        key:
+                                          description: key is the key to project.
+                                          type: string
+                                        mode:
+                                          description: |-
+                                            mode is Optional: mode bits used to set permissions on this file.
+                                            Must be an octal value between 0000 and 0777 or a decimal value between 0 and 511.
+                                            YAML accepts both octal and decimal values, JSON requires decimal values for mode bits.
+                                            If not specified, the volume defaultMode will be used.
+                                            This might be in conflict with other options that affect the file
+                                            mode, like fsGroup, and the result can be other mode bits set.
+                                          format: int32
+                                          type: integer
+                                        path:
+                                          description: |-
+                                            path is the relative path of the file to map the key to.
+                                            May not be an absolute path.
+                                            May not contain the path element '..'.
+                                            May not start with the string '..'.
+                                          type: string
+                                      required:
+                                      - key
+                                      - path
+                                      type: object
+                                    type: array
+                                    x-kubernetes-list-type: atomic
+                                  name:
+                                    default: ""
+                                    description: |-
+                                      Name of the referent.
+                                      This field is effectively required, but due to backwards compatibility is
+                                      allowed to be empty. Instances of this type with an empty value here are
+                                      almost certainly wrong.
+                                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                    type: string
+                                  optional:
+                                    description: optional field specify whether the
+                                      Secret or its key must be defined
+                                    type: boolean
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              serviceAccountToken:
+                                description: serviceAccountToken is information about
+                                  the serviceAccountToken data to project
+                                properties:
+                                  audience:
+                                    description: |-
+                                      audience is the intended audience of the token. A recipient of a token
+                                      must identify itself with an identifier specified in the audience of the
+                                      token, and otherwise should reject the token. The audience defaults to the
+                                      identifier of the apiserver.
+                                    type: string
+                                  expirationSeconds:
+                                    description: |-
+                                      expirationSeconds is the requested duration of validity of the service
+                                      account token. As the token approaches expiration, the kubelet volume
+                                      plugin will proactively rotate the service account token. The kubelet will
+                                      start trying to rotate the token if the token is older than 80 percent of
+                                      its time to live or if the token is older than 24 hours.Defaults to 1 hour
+                                      and must be at least 10 minutes.
+                                    format: int64
+                                    type: integer
+                                  path:
+                                    description: |-
+                                      path is the path relative to the mount point of the file to project the
+                                      token into.
+                                    type: string
+                                required:
+                                - path
+                                type: object
+                            type: object
+                          type: array
+                          x-kubernetes-list-type: atomic
+                      type: object
+                    quobyte:
+                      description: |-
+                        quobyte represents a Quobyte mount on the host that shares a pod's lifetime.
+                        Deprecated: Quobyte is deprecated and the in-tree quobyte type is no longer supported.
+                      properties:
+                        group:
+                          description: |-
+                            group to map volume access to
+                            Default is no group
+                          type: string
+                        readOnly:
+                          description: |-
+                            readOnly here will force the Quobyte volume to be mounted with read-only permissions.
+                            Defaults to false.
+                          type: boolean
+                        registry:
+                          description: |-
+                            registry represents a single or multiple Quobyte Registry services
+                            specified as a string as host:port pair (multiple entries are separated with commas)
+                            which acts as the central registry for volumes
+                          type: string
+                        tenant:
+                          description: |-
+                            tenant owning the given Quobyte volume in the Backend
+                            Used with dynamically provisioned Quobyte volumes, value is set by the plugin
+                          type: string
+                        user:
+                          description: |-
+                            user to map volume access to
+                            Defaults to serivceaccount user
+                          type: string
+                        volume:
+                          description: volume is a string that references an already
+                            created Quobyte volume by name.
+                          type: string
+                      required:
+                      - registry
+                      - volume
+                      type: object
+                    rbd:
+                      description: |-
+                        rbd represents a Rados Block Device mount on the host that shares a pod's lifetime.
+                        Deprecated: RBD is deprecated and the in-tree rbd type is no longer supported.
+                      properties:
+                        fsType:
+                          description: |-
+                            fsType is the filesystem type of the volume that you want to mount.
+                            Tip: Ensure that the filesystem type is supported by the host operating system.
+                            Examples: "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
+                            More info: https://kubernetes.io/docs/concepts/storage/volumes#rbd
+                          type: string
+                        image:
+                          description: |-
+                            image is the rados image name.
+                            More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it
+                          type: string
+                        keyring:
+                          default: /etc/ceph/keyring
+                          description: |-
+                            keyring is the path to key ring for RBDUser.
+                            Default is /etc/ceph/keyring.
+                            More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it
+                          type: string
+                        monitors:
+                          description: |-
+                            monitors is a collection of Ceph monitors.
+                            More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it
+                          items:
+                            type: string
+                          type: array
+                          x-kubernetes-list-type: atomic
+                        pool:
+                          default: rbd
+                          description: |-
+                            pool is the rados pool name.
+                            Default is rbd.
+                            More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it
+                          type: string
+                        readOnly:
+                          description: |-
+                            readOnly here will force the ReadOnly setting in VolumeMounts.
+                            Defaults to false.
+                            More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it
+                          type: boolean
+                        secretRef:
+                          description: |-
+                            secretRef is name of the authentication secret for RBDUser. If provided
+                            overrides keyring.
+                            Default is nil.
+                            More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it
+                          properties:
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        user:
+                          default: admin
+                          description: |-
+                            user is the rados user name.
+                            Default is admin.
+                            More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it
+                          type: string
+                      required:
+                      - image
+                      - monitors
+                      type: object
+                    scaleIO:
+                      description: |-
+                        scaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.
+                        Deprecated: ScaleIO is deprecated and the in-tree scaleIO type is no longer supported.
+                      properties:
+                        fsType:
+                          default: xfs
+                          description: |-
+                            fsType is the filesystem type to mount.
+                            Must be a filesystem type supported by the host operating system.
+                            Ex. "ext4", "xfs", "ntfs".
+                            Default is "xfs".
+                          type: string
+                        gateway:
+                          description: gateway is the host address of the ScaleIO
+                            API Gateway.
+                          type: string
+                        protectionDomain:
+                          description: protectionDomain is the name of the ScaleIO
+                            Protection Domain for the configured storage.
+                          type: string
+                        readOnly:
+                          description: |-
+                            readOnly Defaults to false (read/write). ReadOnly here will force
+                            the ReadOnly setting in VolumeMounts.
+                          type: boolean
+                        secretRef:
+                          description: |-
+                            secretRef references to the secret for ScaleIO user and other
+                            sensitive information. If this is not provided, Login operation will fail.
+                          properties:
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        sslEnabled:
+                          description: sslEnabled Flag enable/disable SSL communication
+                            with Gateway, default false
+                          type: boolean
+                        storageMode:
+                          default: ThinProvisioned
+                          description: |-
+                            storageMode indicates whether the storage for a volume should be ThickProvisioned or ThinProvisioned.
+                            Default is ThinProvisioned.
+                          type: string
+                        storagePool:
+                          description: storagePool is the ScaleIO Storage Pool associated
+                            with the protection domain.
+                          type: string
+                        system:
+                          description: system is the name of the storage system as
+                            configured in ScaleIO.
+                          type: string
+                        volumeName:
+                          description: |-
+                            volumeName is the name of a volume already created in the ScaleIO system
+                            that is associated with this volume source.
+                          type: string
+                      required:
+                      - gateway
+                      - secretRef
+                      - system
+                      type: object
+                    secret:
+                      description: |-
+                        secret represents a secret that should populate this volume.
+                        More info: https://kubernetes.io/docs/concepts/storage/volumes#secret
+                      properties:
+                        defaultMode:
+                          description: |-
+                            defaultMode is Optional: mode bits used to set permissions on created files by default.
+                            Must be an octal value between 0000 and 0777 or a decimal value between 0 and 511.
+                            YAML accepts both octal and decimal values, JSON requires decimal values
+                            for mode bits. Defaults to 0644.
+                            Directories within the path are not affected by this setting.
+                            This might be in conflict with other options that affect the file
+                            mode, like fsGroup, and the result can be other mode bits set.
+                          format: int32
+                          type: integer
+                        items:
+                          description: |-
+                            items If unspecified, each key-value pair in the Data field of the referenced
+                            Secret will be projected into the volume as a file whose name is the
+                            key and content is the value. If specified, the listed keys will be
+                            projected into the specified paths, and unlisted keys will not be
+                            present. If a key is specified which is not present in the Secret,
+                            the volume setup will error unless it is marked optional. Paths must be
+                            relative and may not contain the '..' path or start with '..'.
+                          items:
+                            description: Maps a string key to a path within a volume.
+                            properties:
+                              key:
+                                description: key is the key to project.
+                                type: string
+                              mode:
+                                description: |-
+                                  mode is Optional: mode bits used to set permissions on this file.
+                                  Must be an octal value between 0000 and 0777 or a decimal value between 0 and 511.
+                                  YAML accepts both octal and decimal values, JSON requires decimal values for mode bits.
+                                  If not specified, the volume defaultMode will be used.
+                                  This might be in conflict with other options that affect the file
+                                  mode, like fsGroup, and the result can be other mode bits set.
+                                format: int32
+                                type: integer
+                              path:
+                                description: |-
+                                  path is the relative path of the file to map the key to.
+                                  May not be an absolute path.
+                                  May not contain the path element '..'.
+                                  May not start with the string '..'.
+                                type: string
+                            required:
+                            - key
+                            - path
+                            type: object
+                          type: array
+                          x-kubernetes-list-type: atomic
+                        optional:
+                          description: optional field specify whether the Secret or
+                            its keys must be defined
+                          type: boolean
+                        secretName:
+                          description: |-
+                            secretName is the name of the secret in the pod's namespace to use.
+                            More info: https://kubernetes.io/docs/concepts/storage/volumes#secret
+                          type: string
+                      type: object
+                    storageos:
+                      description: |-
+                        storageOS represents a StorageOS volume attached and mounted on Kubernetes nodes.
+                        Deprecated: StorageOS is deprecated and the in-tree storageos type is no longer supported.
+                      properties:
+                        fsType:
+                          description: |-
+                            fsType is the filesystem type to mount.
+                            Must be a filesystem type supported by the host operating system.
+                            Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
+                          type: string
+                        readOnly:
+                          description: |-
+                            readOnly defaults to false (read/write). ReadOnly here will force
+                            the ReadOnly setting in VolumeMounts.
+                          type: boolean
+                        secretRef:
+                          description: |-
+                            secretRef specifies the secret to use for obtaining the StorageOS API
+                            credentials.  If not specified, default values will be attempted.
+                          properties:
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        volumeName:
+                          description: |-
+                            volumeName is the human-readable name of the StorageOS volume.  Volume
+                            names are only unique within a namespace.
+                          type: string
+                        volumeNamespace:
+                          description: |-
+                            volumeNamespace specifies the scope of the volume within StorageOS.  If no
+                            namespace is specified then the Pod's namespace will be used.  This allows the
+                            Kubernetes name scoping to be mirrored within StorageOS for tighter integration.
+                            Set VolumeName to any name to override the default behaviour.
+                            Set to "default" if you are not using namespaces within StorageOS.
+                            Namespaces that do not pre-exist within StorageOS will be created.
+                          type: string
+                      type: object
+                    vsphereVolume:
+                      description: |-
+                        vsphereVolume represents a vSphere volume attached and mounted on kubelets host machine.
+                        Deprecated: VsphereVolume is deprecated. All operations for the in-tree vsphereVolume type
+                        are redirected to the csi.vsphere.vmware.com CSI driver.
+                      properties:
+                        fsType:
+                          description: |-
+                            fsType is filesystem type to mount.
+                            Must be a filesystem type supported by the host operating system.
+                            Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
+                          type: string
+                        storagePolicyID:
+                          description: storagePolicyID is the storage Policy Based
+                            Management (SPBM) profile ID associated with the StoragePolicyName.
+                          type: string
+                        storagePolicyName:
+                          description: storagePolicyName is the storage Policy Based
+                            Management (SPBM) profile name.
+                          type: string
+                        volumePath:
+                          description: volumePath is the path that identifies vSphere
+                            volume vmdk
+                          type: string
+                      required:
+                      - volumePath
+                      type: object
+                  required:
+                  - name
+                  type: object
+                type: array
+              walCompression:
+                description: |-
+                  walCompression defines the compression of the write-ahead log (WAL) using Snappy.
+
+                  WAL compression is enabled by default for Prometheus >= 2.20.0
+
+                  Requires Prometheus v2.11.0 and above.
+                type: boolean
+              web:
+                description: web defines the configuration of the Prometheus web server.
+                properties:
+                  httpConfig:
+                    description: httpConfig defines HTTP parameters for web server.
+                    properties:
+                      headers:
+                        description: headers defines a list of headers that can be
+                          added to HTTP responses.
+                        properties:
+                          contentSecurityPolicy:
+                            description: |-
+                              contentSecurityPolicy defines the Content-Security-Policy header to HTTP responses.
+                              Unset if blank.
+                            type: string
+                          strictTransportSecurity:
+                            description: |-
+                              strictTransportSecurity defines the Strict-Transport-Security header to HTTP responses.
+                              Unset if blank.
+                              Please make sure that you use this with care as this header might force
+                              browsers to load Prometheus and the other applications hosted on the same
+                              domain and subdomains over HTTPS.
+                              https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Strict-Transport-Security
+                            type: string
+                          xContentTypeOptions:
+                            description: |-
+                              xContentTypeOptions defines the X-Content-Type-Options header to HTTP responses.
+                              Unset if blank. Accepted value is nosniff.
+                              https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-Content-Type-Options
+                            enum:
+                            - ""
+                            - NoSniff
+                            type: string
+                          xFrameOptions:
+                            description: |-
+                              xFrameOptions defines the X-Frame-Options header to HTTP responses.
+                              Unset if blank. Accepted values are deny and sameorigin.
+                              https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-Frame-Options
+                            enum:
+                            - ""
+                            - Deny
+                            - SameOrigin
+                            type: string
+                          xXSSProtection:
+                            description: |-
+                              xXSSProtection defines the X-XSS-Protection header to all responses.
+                              Unset if blank.
+                              https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-XSS-Protection
+                            type: string
+                        type: object
+                      http2:
+                        description: |-
+                          http2 enable HTTP/2 support. Note that HTTP/2 is only supported with TLS.
+                          When TLSConfig is not configured, HTTP/2 will be disabled.
+                          Whenever the value of the field changes, a rolling update will be triggered.
+                        type: boolean
+                    type: object
+                  maxConnections:
+                    description: |-
+                      maxConnections defines the maximum number of simultaneous connections
+                      A zero value means that Prometheus doesn't accept any incoming connection.
+                    format: int32
+                    minimum: 0
+                    type: integer
+                  pageTitle:
+                    description: pageTitle defines the prometheus web page title.
+                    type: string
+                  tlsConfig:
+                    description: tlsConfig defines the TLS parameters for HTTPS.
+                    properties:
+                      cert:
+                        description: |-
+                          cert defines the Secret or ConfigMap containing the TLS certificate for the web server.
+
+                          Either `keySecret` or `keyFile` must be defined.
+
+                          It is mutually exclusive with `certFile`.
+                        properties:
+                          configMap:
+                            description: configMap defines the ConfigMap containing
+                              data to use for the targets.
+                            properties:
+                              key:
+                                description: The key to select.
+                                type: string
+                              name:
+                                default: ""
+                                description: |-
+                                  Name of the referent.
+                                  This field is effectively required, but due to backwards compatibility is
+                                  allowed to be empty. Instances of this type with an empty value here are
+                                  almost certainly wrong.
+                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                type: string
+                              optional:
+                                description: Specify whether the ConfigMap or its
+                                  key must be defined
+                                type: boolean
+                            required:
+                            - key
+                            type: object
+                            x-kubernetes-map-type: atomic
+                          secret:
+                            description: secret defines the Secret containing data
+                              to use for the targets.
+                            properties:
+                              key:
+                                description: The key of the secret to select from.  Must
+                                  be a valid secret key.
+                                type: string
+                              name:
+                                default: ""
+                                description: |-
+                                  Name of the referent.
+                                  This field is effectively required, but due to backwards compatibility is
+                                  allowed to be empty. Instances of this type with an empty value here are
+                                  almost certainly wrong.
+                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                type: string
+                              optional:
+                                description: Specify whether the Secret or its key
+                                  must be defined
+                                type: boolean
+                            required:
+                            - key
+                            type: object
+                            x-kubernetes-map-type: atomic
+                        type: object
+                      certFile:
+                        description: |-
+                          certFile defines the path to the TLS certificate file in the container for the web server.
+
+                          Either `keySecret` or `keyFile` must be defined.
+
+                          It is mutually exclusive with `cert`.
+                        type: string
+                      cipherSuites:
+                        description: |-
+                          cipherSuites defines the list of supported cipher suites for TLS versions up to TLS 1.2.
+
+                          If not defined, the Go default cipher suites are used.
+                          Available cipher suites are documented in the Go documentation:
+                          https://golang.org/pkg/crypto/tls/#pkg-constants
+                        items:
+                          type: string
+                        type: array
+                      client_ca:
+                        description: |-
+                          client_ca defines the Secret or ConfigMap containing the CA certificate for client certificate
+                          authentication to the server.
+
+                          It is mutually exclusive with `clientCAFile`.
+                        properties:
+                          configMap:
+                            description: configMap defines the ConfigMap containing
+                              data to use for the targets.
+                            properties:
+                              key:
+                                description: The key to select.
+                                type: string
+                              name:
+                                default: ""
+                                description: |-
+                                  Name of the referent.
+                                  This field is effectively required, but due to backwards compatibility is
+                                  allowed to be empty. Instances of this type with an empty value here are
+                                  almost certainly wrong.
+                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                type: string
+                              optional:
+                                description: Specify whether the ConfigMap or its
+                                  key must be defined
+                                type: boolean
+                            required:
+                            - key
+                            type: object
+                            x-kubernetes-map-type: atomic
+                          secret:
+                            description: secret defines the Secret containing data
+                              to use for the targets.
+                            properties:
+                              key:
+                                description: The key of the secret to select from.  Must
+                                  be a valid secret key.
+                                type: string
+                              name:
+                                default: ""
+                                description: |-
+                                  Name of the referent.
+                                  This field is effectively required, but due to backwards compatibility is
+                                  allowed to be empty. Instances of this type with an empty value here are
+                                  almost certainly wrong.
+                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                type: string
+                              optional:
+                                description: Specify whether the Secret or its key
+                                  must be defined
+                                type: boolean
+                            required:
+                            - key
+                            type: object
+                            x-kubernetes-map-type: atomic
+                        type: object
+                      clientAuthType:
+                        description: |-
+                          clientAuthType defines the server policy for client TLS authentication.
+
+                          For more detail on clientAuth options:
+                          https://golang.org/pkg/crypto/tls/#ClientAuthType
+                        type: string
+                      clientCAFile:
+                        description: |-
+                          clientCAFile defines the path to the CA certificate file for client certificate authentication to
+                          the server.
+
+                          It is mutually exclusive with `client_ca`.
+                        type: string
+                      curvePreferences:
+                        description: |-
+                          curvePreferences defines elliptic curves that will be used in an ECDHE handshake, in preference
+                          order.
+
+                          Available curves are documented in the Go documentation:
+                          https://golang.org/pkg/crypto/tls/#CurveID
+                        items:
+                          type: string
+                        type: array
+                      keyFile:
+                        description: |-
+                          keyFile defines the path to the TLS private key file in the container for the web server.
+
+                          If defined, either `cert` or `certFile` must be defined.
+
+                          It is mutually exclusive with `keySecret`.
+                        type: string
+                      keySecret:
+                        description: |-
+                          keySecret defines the secret containing the TLS private key for the web server.
+
+                          Either `cert` or `certFile` must be defined.
+
+                          It is mutually exclusive with `keyFile`.
+                        properties:
+                          key:
+                            description: The key of the secret to select from.  Must
+                              be a valid secret key.
+                            type: string
+                          name:
+                            default: ""
+                            description: |-
+                              Name of the referent.
+                              This field is effectively required, but due to backwards compatibility is
+                              allowed to be empty. Instances of this type with an empty value here are
+                              almost certainly wrong.
+                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                            type: string
+                          optional:
+                            description: Specify whether the Secret or its key must
+                              be defined
+                            type: boolean
+                        required:
+                        - key
+                        type: object
+                        x-kubernetes-map-type: atomic
+                      maxVersion:
+                        description: maxVersion defines the Maximum TLS version that
+                          is acceptable.
+                        type: string
+                      minVersion:
+                        description: minVersion defines the minimum TLS version that
+                          is acceptable.
+                        type: string
+                      preferServerCipherSuites:
+                        description: |-
+                          preferServerCipherSuites defines whether the server selects the client's most preferred cipher
+                          suite, or the server's most preferred cipher suite.
+
+                          If true then the server's preference, as expressed in
+                          the order of elements in cipherSuites, is used.
+                        type: boolean
+                    type: object
+                type: object
+            type: object
+            x-kubernetes-validations:
+            - message: replicas cannot be set when mode is DaemonSet
+              rule: '!(has(self.mode) && self.mode == ''DaemonSet'' && has(self.replicas))'
+            - message: storage cannot be set when mode is DaemonSet
+              rule: '!(has(self.mode) && self.mode == ''DaemonSet'' && has(self.storage))'
+            - message: shards cannot be greater than 1 when mode is DaemonSet
+              rule: '!(has(self.mode) && self.mode == ''DaemonSet'' && has(self.shards)
+                && self.shards > 1)'
+            - message: persistentVolumeClaimRetentionPolicy cannot be set when mode
+                is DaemonSet
+              rule: '!(has(self.mode) && self.mode == ''DaemonSet'' && has(self.persistentVolumeClaimRetentionPolicy))'
+            - message: scrapeConfigSelector cannot be set when mode is DaemonSet
+              rule: '!(has(self.mode) && self.mode == ''DaemonSet'' && has(self.scrapeConfigSelector))'
+            - message: probeSelector cannot be set when mode is DaemonSet
+              rule: '!(has(self.mode) && self.mode == ''DaemonSet'' && has(self.probeSelector))'
+          status:
+            description: |-
+              status defines the most recent observed status of the Prometheus cluster. Read-only.
+              More info:
+              https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#spec-and-status
+            properties:
+              availableReplicas:
+                description: |-
+                  availableReplicas defines the total number of available pods (ready for at least minReadySeconds)
+                  targeted by this Prometheus deployment.
+                format: int32
+                type: integer
+              conditions:
+                description: conditions defines the current state of the Prometheus
+                  deployment.
+                items:
+                  description: |-
+                    Condition represents the state of the resources associated with the
+                    Prometheus, Alertmanager or ThanosRuler resource.
+                  properties:
+                    lastTransitionTime:
+                      description: lastTransitionTime is the time of the last update
+                        to the current status property.
+                      format: date-time
+                      type: string
+                    message:
+                      description: message defines human-readable message indicating
+                        details for the condition's last transition.
+                      type: string
+                    observedGeneration:
+                      description: |-
+                        observedGeneration defines the .metadata.generation that the
+                        condition was set based upon. For instance, if `.metadata.generation` is
+                        currently 12, but the `.status.conditions[].observedGeneration` is 9, the
+                        condition is out of date with respect to the current state of the
+                        instance.
+                      format: int64
+                      type: integer
+                    reason:
+                      description: reason for the condition's last transition.
+                      type: string
+                    status:
+                      description: status of the condition.
+                      minLength: 1
+                      type: string
+                    type:
+                      description: type of the condition being reported.
+                      minLength: 1
+                      type: string
+                  required:
+                  - lastTransitionTime
+                  - status
+                  - type
+                  type: object
+                type: array
+                x-kubernetes-list-map-keys:
+                - type
+                x-kubernetes-list-type: map
+              paused:
+                description: |-
+                  paused defines whether any actions on the underlying managed objects are
+                  being performed. Only delete actions will be performed.
+                type: boolean
+              replicas:
+                description: |-
+                  replicas defines the total number of non-terminated pods targeted by this Prometheus deployment
+                  (their labels match the selector).
+                format: int32
+                type: integer
+              selector:
+                description: selector used to match the pods targeted by this Prometheus
+                  resource.
+                type: string
+              shardStatuses:
+                description: shardStatuses defines the list has one entry per shard.
+                  Each entry provides a summary of the shard status.
+                items:
+                  properties:
+                    availableReplicas:
+                      description: |-
+                        availableReplicas defines the total number of available pods (ready for at least minReadySeconds)
+                        targeted by this shard.
+                      format: int32
+                      type: integer
+                    replicas:
+                      description: replicas defines the total number of pods targeted
+                        by this shard.
+                      format: int32
+                      type: integer
+                    shardID:
+                      description: shardID defines the identifier of the shard.
+                      type: string
+                    unavailableReplicas:
+                      description: unavailableReplicas defines the Total number of
+                        unavailable pods targeted by this shard.
+                      format: int32
+                      type: integer
+                    updatedReplicas:
+                      description: |-
+                        updatedReplicas defines the total number of non-terminated pods targeted by this shard
+                        that have the desired spec.
+                      format: int32
+                      type: integer
+                  required:
+                  - availableReplicas
+                  - replicas
+                  - shardID
+                  - unavailableReplicas
+                  - updatedReplicas
+                  type: object
+                type: array
+                x-kubernetes-list-map-keys:
+                - shardID
+                x-kubernetes-list-type: map
+              shards:
+                description: shards defines the most recently observed number of shards.
+                format: int32
+                type: integer
+              unavailableReplicas:
+                description: unavailableReplicas defines the total number of unavailable
+                  pods targeted by this Prometheus deployment.
+                format: int32
+                type: integer
+              updatedReplicas:
+                description: |-
+                  updatedReplicas defines the total number of non-terminated pods targeted by this Prometheus deployment
+                  that have the desired version spec.
+                format: int32
+                type: integer
+            type: object
+        required:
+        - spec
+        type: object
+    served: true
+    storage: true
+    subresources:
+      scale:
+        labelSelectorPath: .status.selector
+        specReplicasPath: .spec.shards
+        statusReplicasPath: .status.shards
+      status: {}
+{{- end -}}
diff --git a/packages/system/prometheus-operator-crds/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheuses.yaml b/packages/system/prometheus-operator-crds/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheuses.yaml
new file mode 100644
index 0000000000..c2016208c8
--- /dev/null
+++ b/packages/system/prometheus-operator-crds/charts/prometheus-operator-crds/charts/crds/templates/crd-prometheuses.yaml
@@ -0,0 +1,13608 @@
+{{- if .Values.prometheuses.enabled -}}
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.87.0/example/prometheus-operator-crd/monitoring.coreos.com_prometheuses.yaml
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+{{- with .Values.annotations }}
+{{- toYaml . | nindent 4 }}
+{{- end }}
+    controller-gen.kubebuilder.io/version: v0.19.0
+    operator.prometheus.io/version: 0.87.0
+  name: prometheuses.monitoring.coreos.com
+spec:
+  group: monitoring.coreos.com
+  names:
+    categories:
+    - prometheus-operator
+    kind: Prometheus
+    listKind: PrometheusList
+    plural: prometheuses
+    shortNames:
+    - prom
+    singular: prometheus
+  scope: Namespaced
+  versions:
+  - additionalPrinterColumns:
+    - description: The version of Prometheus
+      jsonPath: .spec.version
+      name: Version
+      type: string
+    - description: The number of desired replicas
+      jsonPath: .spec.replicas
+      name: Desired
+      type: integer
+    - description: The number of ready replicas
+      jsonPath: .status.availableReplicas
+      name: Ready
+      type: integer
+    - jsonPath: .status.conditions[?(@.type == 'Reconciled')].status
+      name: Reconciled
+      type: string
+    - jsonPath: .status.conditions[?(@.type == 'Available')].status
+      name: Available
+      type: string
+    - jsonPath: .metadata.creationTimestamp
+      name: Age
+      type: date
+    - description: Whether the resource reconciliation is paused or not
+      jsonPath: .status.paused
+      name: Paused
+      priority: 1
+      type: boolean
+    name: v1
+    schema:
+      openAPIV3Schema:
+        description: |-
+          The `Prometheus` custom resource definition (CRD) defines a desired [Prometheus](https://prometheus.io/docs/prometheus) setup to run in a Kubernetes cluster. It allows to specify many options such as the number of replicas, persistent storage, and Alertmanagers where firing alerts should be sent and many more.
+
+          For each `Prometheus` resource, the Operator deploys one or several `StatefulSet` objects in the same namespace. The number of StatefulSets is equal to the number of shards which is 1 by default.
+
+          The resource defines via label and namespace selectors which `ServiceMonitor`, `PodMonitor`, `Probe` and `PrometheusRule` objects should be associated to the deployed Prometheus instances.
+
+          The Operator continuously reconciles the scrape and rules configuration and a sidecar container running in the Prometheus pods triggers a reload of the configuration when needed.
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: |-
+              spec defines the specification of the desired behavior of the Prometheus cluster. More info:
+              https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#spec-and-status
+            properties:
+              additionalAlertManagerConfigs:
+                description: |-
+                  additionalAlertManagerConfigs defines a key of a Secret containing
+                  additional Prometheus Alertmanager configurations. The Alertmanager
+                  configurations are appended to the configuration generated by the
+                  Prometheus Operator. They must be formatted according to the official
+                  Prometheus documentation:
+
+                  https://prometheus.io/docs/prometheus/latest/configuration/configuration/#alertmanager_config
+
+                  The user is responsible for making sure that the configurations are valid
+
+                  Note that using this feature may expose the possibility to break
+                  upgrades of Prometheus. It is advised to review Prometheus release notes
+                  to ensure that no incompatible AlertManager configs are going to break
+                  Prometheus after the upgrade.
+                properties:
+                  key:
+                    description: The key of the secret to select from.  Must be a
+                      valid secret key.
+                    type: string
+                  name:
+                    default: ""
+                    description: |-
+                      Name of the referent.
+                      This field is effectively required, but due to backwards compatibility is
+                      allowed to be empty. Instances of this type with an empty value here are
+                      almost certainly wrong.
+                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                    type: string
+                  optional:
+                    description: Specify whether the Secret or its key must be defined
+                    type: boolean
+                required:
+                - key
+                type: object
+                x-kubernetes-map-type: atomic
+              additionalAlertRelabelConfigs:
+                description: |-
+                  additionalAlertRelabelConfigs defines a key of a Secret containing
+                  additional Prometheus alert relabel configurations. The alert relabel
+                  configurations are appended to the configuration generated by the
+                  Prometheus Operator. They must be formatted according to the official
+                  Prometheus documentation:
+
+                  https://prometheus.io/docs/prometheus/latest/configuration/configuration/#alert_relabel_configs
+
+                  The user is responsible for making sure that the configurations are valid
+
+                  Note that using this feature may expose the possibility to break
+                  upgrades of Prometheus. It is advised to review Prometheus release notes
+                  to ensure that no incompatible alert relabel configs are going to break
+                  Prometheus after the upgrade.
+                properties:
+                  key:
+                    description: The key of the secret to select from.  Must be a
+                      valid secret key.
+                    type: string
+                  name:
+                    default: ""
+                    description: |-
+                      Name of the referent.
+                      This field is effectively required, but due to backwards compatibility is
+                      allowed to be empty. Instances of this type with an empty value here are
+                      almost certainly wrong.
+                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                    type: string
+                  optional:
+                    description: Specify whether the Secret or its key must be defined
+                    type: boolean
+                required:
+                - key
+                type: object
+                x-kubernetes-map-type: atomic
+              additionalArgs:
+                description: |-
+                  additionalArgs allows setting additional arguments for the 'prometheus' container.
+
+                  It is intended for e.g. activating hidden flags which are not supported by
+                  the dedicated configuration options yet. The arguments are passed as-is to the
+                  Prometheus container which may cause issues if they are invalid or not supported
+                  by the given Prometheus version.
+
+                  In case of an argument conflict (e.g. an argument which is already set by the
+                  operator itself) or when providing an invalid argument, the reconciliation will
+                  fail and an error will be logged.
+                items:
+                  description: Argument as part of the AdditionalArgs list.
+                  properties:
+                    name:
+                      description: name of the argument, e.g. "scrape.discovery-reload-interval".
+                      minLength: 1
+                      type: string
+                    value:
+                      description: value defines the argument value, e.g. 30s. Can
+                        be empty for name-only arguments (e.g. --storage.tsdb.no-lockfile)
+                      type: string
+                  required:
+                  - name
+                  type: object
+                type: array
+              additionalScrapeConfigs:
+                description: |-
+                  additionalScrapeConfigs allows specifying a key of a Secret containing
+                  additional Prometheus scrape configurations. Scrape configurations
+                  specified are appended to the configurations generated by the Prometheus
+                  Operator. Job configurations specified must have the form as specified
+                  in the official Prometheus documentation:
+                  https://prometheus.io/docs/prometheus/latest/configuration/configuration/#scrape_config.
+                  As scrape configs are appended, the user is responsible to make sure it
+                  is valid. Note that using this feature may expose the possibility to
+                  break upgrades of Prometheus. It is advised to review Prometheus release
+                  notes to ensure that no incompatible scrape configs are going to break
+                  Prometheus after the upgrade.
+                properties:
+                  key:
+                    description: The key of the secret to select from.  Must be a
+                      valid secret key.
+                    type: string
+                  name:
+                    default: ""
+                    description: |-
+                      Name of the referent.
+                      This field is effectively required, but due to backwards compatibility is
+                      allowed to be empty. Instances of this type with an empty value here are
+                      almost certainly wrong.
+                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                    type: string
+                  optional:
+                    description: Specify whether the Secret or its key must be defined
+                    type: boolean
+                required:
+                - key
+                type: object
+                x-kubernetes-map-type: atomic
+              affinity:
+                description: affinity defines the Pods' affinity scheduling rules
+                  if specified.
+                properties:
+                  nodeAffinity:
+                    description: Describes node affinity scheduling rules for the
+                      pod.
+                    properties:
+                      preferredDuringSchedulingIgnoredDuringExecution:
+                        description: |-
+                          The scheduler will prefer to schedule pods to nodes that satisfy
+                          the affinity expressions specified by this field, but it may choose
+                          a node that violates one or more of the expressions. The node that is
+                          most preferred is the one with the greatest sum of weights, i.e.
+                          for each node that meets all of the scheduling requirements (resource
+                          request, requiredDuringScheduling affinity expressions, etc.),
+                          compute a sum by iterating through the elements of this field and adding
+                          "weight" to the sum if the node matches the corresponding matchExpressions; the
+                          node(s) with the highest sum are the most preferred.
+                        items:
+                          description: |-
+                            An empty preferred scheduling term matches all objects with implicit weight 0
+                            (i.e. it's a no-op). A null preferred scheduling term matches no objects (i.e. is also a no-op).
+                          properties:
+                            preference:
+                              description: A node selector term, associated with the
+                                corresponding weight.
+                              properties:
+                                matchExpressions:
+                                  description: A list of node selector requirements
+                                    by node's labels.
+                                  items:
+                                    description: |-
+                                      A node selector requirement is a selector that contains values, a key, and an operator
+                                      that relates the key and values.
+                                    properties:
+                                      key:
+                                        description: The label key that the selector
+                                          applies to.
+                                        type: string
+                                      operator:
+                                        description: |-
+                                          Represents a key's relationship to a set of values.
+                                          Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt.
+                                        type: string
+                                      values:
+                                        description: |-
+                                          An array of string values. If the operator is In or NotIn,
+                                          the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                          the values array must be empty. If the operator is Gt or Lt, the values
+                                          array must have a single element, which will be interpreted as an integer.
+                                          This array is replaced during a strategic merge patch.
+                                        items:
+                                          type: string
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                    required:
+                                    - key
+                                    - operator
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                matchFields:
+                                  description: A list of node selector requirements
+                                    by node's fields.
+                                  items:
+                                    description: |-
+                                      A node selector requirement is a selector that contains values, a key, and an operator
+                                      that relates the key and values.
+                                    properties:
+                                      key:
+                                        description: The label key that the selector
+                                          applies to.
+                                        type: string
+                                      operator:
+                                        description: |-
+                                          Represents a key's relationship to a set of values.
+                                          Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt.
+                                        type: string
+                                      values:
+                                        description: |-
+                                          An array of string values. If the operator is In or NotIn,
+                                          the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                          the values array must be empty. If the operator is Gt or Lt, the values
+                                          array must have a single element, which will be interpreted as an integer.
+                                          This array is replaced during a strategic merge patch.
+                                        items:
+                                          type: string
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                    required:
+                                    - key
+                                    - operator
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            weight:
+                              description: Weight associated with matching the corresponding
+                                nodeSelectorTerm, in the range 1-100.
+                              format: int32
+                              type: integer
+                          required:
+                          - preference
+                          - weight
+                          type: object
+                        type: array
+                        x-kubernetes-list-type: atomic
+                      requiredDuringSchedulingIgnoredDuringExecution:
+                        description: |-
+                          If the affinity requirements specified by this field are not met at
+                          scheduling time, the pod will not be scheduled onto the node.
+                          If the affinity requirements specified by this field cease to be met
+                          at some point during pod execution (e.g. due to an update), the system
+                          may or may not try to eventually evict the pod from its node.
+                        properties:
+                          nodeSelectorTerms:
+                            description: Required. A list of node selector terms.
+                              The terms are ORed.
+                            items:
+                              description: |-
+                                A null or empty node selector term matches no objects. The requirements of
+                                them are ANDed.
+                                The TopologySelectorTerm type implements a subset of the NodeSelectorTerm.
+                              properties:
+                                matchExpressions:
+                                  description: A list of node selector requirements
+                                    by node's labels.
+                                  items:
+                                    description: |-
+                                      A node selector requirement is a selector that contains values, a key, and an operator
+                                      that relates the key and values.
+                                    properties:
+                                      key:
+                                        description: The label key that the selector
+                                          applies to.
+                                        type: string
+                                      operator:
+                                        description: |-
+                                          Represents a key's relationship to a set of values.
+                                          Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt.
+                                        type: string
+                                      values:
+                                        description: |-
+                                          An array of string values. If the operator is In or NotIn,
+                                          the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                          the values array must be empty. If the operator is Gt or Lt, the values
+                                          array must have a single element, which will be interpreted as an integer.
+                                          This array is replaced during a strategic merge patch.
+                                        items:
+                                          type: string
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                    required:
+                                    - key
+                                    - operator
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                matchFields:
+                                  description: A list of node selector requirements
+                                    by node's fields.
+                                  items:
+                                    description: |-
+                                      A node selector requirement is a selector that contains values, a key, and an operator
+                                      that relates the key and values.
+                                    properties:
+                                      key:
+                                        description: The label key that the selector
+                                          applies to.
+                                        type: string
+                                      operator:
+                                        description: |-
+                                          Represents a key's relationship to a set of values.
+                                          Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt.
+                                        type: string
+                                      values:
+                                        description: |-
+                                          An array of string values. If the operator is In or NotIn,
+                                          the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                          the values array must be empty. If the operator is Gt or Lt, the values
+                                          array must have a single element, which will be interpreted as an integer.
+                                          This array is replaced during a strategic merge patch.
+                                        items:
+                                          type: string
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                    required:
+                                    - key
+                                    - operator
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            type: array
+                            x-kubernetes-list-type: atomic
+                        required:
+                        - nodeSelectorTerms
+                        type: object
+                        x-kubernetes-map-type: atomic
+                    type: object
+                  podAffinity:
+                    description: Describes pod affinity scheduling rules (e.g. co-locate
+                      this pod in the same node, zone, etc. as some other pod(s)).
+                    properties:
+                      preferredDuringSchedulingIgnoredDuringExecution:
+                        description: |-
+                          The scheduler will prefer to schedule pods to nodes that satisfy
+                          the affinity expressions specified by this field, but it may choose
+                          a node that violates one or more of the expressions. The node that is
+                          most preferred is the one with the greatest sum of weights, i.e.
+                          for each node that meets all of the scheduling requirements (resource
+                          request, requiredDuringScheduling affinity expressions, etc.),
+                          compute a sum by iterating through the elements of this field and adding
+                          "weight" to the sum if the node has pods which matches the corresponding podAffinityTerm; the
+                          node(s) with the highest sum are the most preferred.
+                        items:
+                          description: The weights of all of the matched WeightedPodAffinityTerm
+                            fields are added per-node to find the most preferred node(s)
+                          properties:
+                            podAffinityTerm:
+                              description: Required. A pod affinity term, associated
+                                with the corresponding weight.
+                              properties:
+                                labelSelector:
+                                  description: |-
+                                    A label query over a set of resources, in this case pods.
+                                    If it's null, this PodAffinityTerm matches with no Pods.
+                                  properties:
+                                    matchExpressions:
+                                      description: matchExpressions is a list of label
+                                        selector requirements. The requirements are
+                                        ANDed.
+                                      items:
+                                        description: |-
+                                          A label selector requirement is a selector that contains values, a key, and an operator that
+                                          relates the key and values.
+                                        properties:
+                                          key:
+                                            description: key is the label key that
+                                              the selector applies to.
+                                            type: string
+                                          operator:
+                                            description: |-
+                                              operator represents a key's relationship to a set of values.
+                                              Valid operators are In, NotIn, Exists and DoesNotExist.
+                                            type: string
+                                          values:
+                                            description: |-
+                                              values is an array of string values. If the operator is In or NotIn,
+                                              the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                              the values array must be empty. This array is replaced during a strategic
+                                              merge patch.
+                                            items:
+                                              type: string
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                        required:
+                                        - key
+                                        - operator
+                                        type: object
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    matchLabels:
+                                      additionalProperties:
+                                        type: string
+                                      description: |-
+                                        matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                        map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                        operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                      type: object
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                matchLabelKeys:
+                                  description: |-
+                                    MatchLabelKeys is a set of pod label keys to select which pods will
+                                    be taken into consideration. The keys are used to lookup values from the
+                                    incoming pod labels, those key-value labels are merged with `labelSelector` as `key in (value)`
+                                    to select the group of existing pods which pods will be taken into consideration
+                                    for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+                                    pod labels will be ignored. The default value is empty.
+                                    The same key is forbidden to exist in both matchLabelKeys and labelSelector.
+                                    Also, matchLabelKeys cannot be set when labelSelector isn't set.
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                mismatchLabelKeys:
+                                  description: |-
+                                    MismatchLabelKeys is a set of pod label keys to select which pods will
+                                    be taken into consideration. The keys are used to lookup values from the
+                                    incoming pod labels, those key-value labels are merged with `labelSelector` as `key notin (value)`
+                                    to select the group of existing pods which pods will be taken into consideration
+                                    for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+                                    pod labels will be ignored. The default value is empty.
+                                    The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
+                                    Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                namespaceSelector:
+                                  description: |-
+                                    A label query over the set of namespaces that the term applies to.
+                                    The term is applied to the union of the namespaces selected by this field
+                                    and the ones listed in the namespaces field.
+                                    null selector and null or empty namespaces list means "this pod's namespace".
+                                    An empty selector ({}) matches all namespaces.
+                                  properties:
+                                    matchExpressions:
+                                      description: matchExpressions is a list of label
+                                        selector requirements. The requirements are
+                                        ANDed.
+                                      items:
+                                        description: |-
+                                          A label selector requirement is a selector that contains values, a key, and an operator that
+                                          relates the key and values.
+                                        properties:
+                                          key:
+                                            description: key is the label key that
+                                              the selector applies to.
+                                            type: string
+                                          operator:
+                                            description: |-
+                                              operator represents a key's relationship to a set of values.
+                                              Valid operators are In, NotIn, Exists and DoesNotExist.
+                                            type: string
+                                          values:
+                                            description: |-
+                                              values is an array of string values. If the operator is In or NotIn,
+                                              the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                              the values array must be empty. This array is replaced during a strategic
+                                              merge patch.
+                                            items:
+                                              type: string
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                        required:
+                                        - key
+                                        - operator
+                                        type: object
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    matchLabels:
+                                      additionalProperties:
+                                        type: string
+                                      description: |-
+                                        matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                        map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                        operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                      type: object
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                namespaces:
+                                  description: |-
+                                    namespaces specifies a static list of namespace names that the term applies to.
+                                    The term is applied to the union of the namespaces listed in this field
+                                    and the ones selected by namespaceSelector.
+                                    null or empty namespaces list and null namespaceSelector means "this pod's namespace".
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                topologyKey:
+                                  description: |-
+                                    This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching
+                                    the labelSelector in the specified namespaces, where co-located is defined as running on a node
+                                    whose value of the label with key topologyKey matches that of any node on which any of the
+                                    selected pods is running.
+                                    Empty topologyKey is not allowed.
+                                  type: string
+                              required:
+                              - topologyKey
+                              type: object
+                            weight:
+                              description: |-
+                                weight associated with matching the corresponding podAffinityTerm,
+                                in the range 1-100.
+                              format: int32
+                              type: integer
+                          required:
+                          - podAffinityTerm
+                          - weight
+                          type: object
+                        type: array
+                        x-kubernetes-list-type: atomic
+                      requiredDuringSchedulingIgnoredDuringExecution:
+                        description: |-
+                          If the affinity requirements specified by this field are not met at
+                          scheduling time, the pod will not be scheduled onto the node.
+                          If the affinity requirements specified by this field cease to be met
+                          at some point during pod execution (e.g. due to a pod label update), the
+                          system may or may not try to eventually evict the pod from its node.
+                          When there are multiple elements, the lists of nodes corresponding to each
+                          podAffinityTerm are intersected, i.e. all terms must be satisfied.
+                        items:
+                          description: |-
+                            Defines a set of pods (namely those matching the labelSelector
+                            relative to the given namespace(s)) that this pod should be
+                            co-located (affinity) or not co-located (anti-affinity) with,
+                            where co-located is defined as running on a node whose value of
+                            the label with key <topologyKey> matches that of any node on which
+                            a pod of the set of pods is running
+                          properties:
+                            labelSelector:
+                              description: |-
+                                A label query over a set of resources, in this case pods.
+                                If it's null, this PodAffinityTerm matches with no Pods.
+                              properties:
+                                matchExpressions:
+                                  description: matchExpressions is a list of label
+                                    selector requirements. The requirements are ANDed.
+                                  items:
+                                    description: |-
+                                      A label selector requirement is a selector that contains values, a key, and an operator that
+                                      relates the key and values.
+                                    properties:
+                                      key:
+                                        description: key is the label key that the
+                                          selector applies to.
+                                        type: string
+                                      operator:
+                                        description: |-
+                                          operator represents a key's relationship to a set of values.
+                                          Valid operators are In, NotIn, Exists and DoesNotExist.
+                                        type: string
+                                      values:
+                                        description: |-
+                                          values is an array of string values. If the operator is In or NotIn,
+                                          the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                          the values array must be empty. This array is replaced during a strategic
+                                          merge patch.
+                                        items:
+                                          type: string
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                    required:
+                                    - key
+                                    - operator
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                matchLabels:
+                                  additionalProperties:
+                                    type: string
+                                  description: |-
+                                    matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                    map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                    operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                  type: object
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            matchLabelKeys:
+                              description: |-
+                                MatchLabelKeys is a set of pod label keys to select which pods will
+                                be taken into consideration. The keys are used to lookup values from the
+                                incoming pod labels, those key-value labels are merged with `labelSelector` as `key in (value)`
+                                to select the group of existing pods which pods will be taken into consideration
+                                for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+                                pod labels will be ignored. The default value is empty.
+                                The same key is forbidden to exist in both matchLabelKeys and labelSelector.
+                                Also, matchLabelKeys cannot be set when labelSelector isn't set.
+                              items:
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            mismatchLabelKeys:
+                              description: |-
+                                MismatchLabelKeys is a set of pod label keys to select which pods will
+                                be taken into consideration. The keys are used to lookup values from the
+                                incoming pod labels, those key-value labels are merged with `labelSelector` as `key notin (value)`
+                                to select the group of existing pods which pods will be taken into consideration
+                                for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+                                pod labels will be ignored. The default value is empty.
+                                The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
+                                Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
+                              items:
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            namespaceSelector:
+                              description: |-
+                                A label query over the set of namespaces that the term applies to.
+                                The term is applied to the union of the namespaces selected by this field
+                                and the ones listed in the namespaces field.
+                                null selector and null or empty namespaces list means "this pod's namespace".
+                                An empty selector ({}) matches all namespaces.
+                              properties:
+                                matchExpressions:
+                                  description: matchExpressions is a list of label
+                                    selector requirements. The requirements are ANDed.
+                                  items:
+                                    description: |-
+                                      A label selector requirement is a selector that contains values, a key, and an operator that
+                                      relates the key and values.
+                                    properties:
+                                      key:
+                                        description: key is the label key that the
+                                          selector applies to.
+                                        type: string
+                                      operator:
+                                        description: |-
+                                          operator represents a key's relationship to a set of values.
+                                          Valid operators are In, NotIn, Exists and DoesNotExist.
+                                        type: string
+                                      values:
+                                        description: |-
+                                          values is an array of string values. If the operator is In or NotIn,
+                                          the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                          the values array must be empty. This array is replaced during a strategic
+                                          merge patch.
+                                        items:
+                                          type: string
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                    required:
+                                    - key
+                                    - operator
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                matchLabels:
+                                  additionalProperties:
+                                    type: string
+                                  description: |-
+                                    matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                    map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                    operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                  type: object
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            namespaces:
+                              description: |-
+                                namespaces specifies a static list of namespace names that the term applies to.
+                                The term is applied to the union of the namespaces listed in this field
+                                and the ones selected by namespaceSelector.
+                                null or empty namespaces list and null namespaceSelector means "this pod's namespace".
+                              items:
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            topologyKey:
+                              description: |-
+                                This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching
+                                the labelSelector in the specified namespaces, where co-located is defined as running on a node
+                                whose value of the label with key topologyKey matches that of any node on which any of the
+                                selected pods is running.
+                                Empty topologyKey is not allowed.
+                              type: string
+                          required:
+                          - topologyKey
+                          type: object
+                        type: array
+                        x-kubernetes-list-type: atomic
+                    type: object
+                  podAntiAffinity:
+                    description: Describes pod anti-affinity scheduling rules (e.g.
+                      avoid putting this pod in the same node, zone, etc. as some
+                      other pod(s)).
+                    properties:
+                      preferredDuringSchedulingIgnoredDuringExecution:
+                        description: |-
+                          The scheduler will prefer to schedule pods to nodes that satisfy
+                          the anti-affinity expressions specified by this field, but it may choose
+                          a node that violates one or more of the expressions. The node that is
+                          most preferred is the one with the greatest sum of weights, i.e.
+                          for each node that meets all of the scheduling requirements (resource
+                          request, requiredDuringScheduling anti-affinity expressions, etc.),
+                          compute a sum by iterating through the elements of this field and subtracting
+                          "weight" from the sum if the node has pods which matches the corresponding podAffinityTerm; the
+                          node(s) with the highest sum are the most preferred.
+                        items:
+                          description: The weights of all of the matched WeightedPodAffinityTerm
+                            fields are added per-node to find the most preferred node(s)
+                          properties:
+                            podAffinityTerm:
+                              description: Required. A pod affinity term, associated
+                                with the corresponding weight.
+                              properties:
+                                labelSelector:
+                                  description: |-
+                                    A label query over a set of resources, in this case pods.
+                                    If it's null, this PodAffinityTerm matches with no Pods.
+                                  properties:
+                                    matchExpressions:
+                                      description: matchExpressions is a list of label
+                                        selector requirements. The requirements are
+                                        ANDed.
+                                      items:
+                                        description: |-
+                                          A label selector requirement is a selector that contains values, a key, and an operator that
+                                          relates the key and values.
+                                        properties:
+                                          key:
+                                            description: key is the label key that
+                                              the selector applies to.
+                                            type: string
+                                          operator:
+                                            description: |-
+                                              operator represents a key's relationship to a set of values.
+                                              Valid operators are In, NotIn, Exists and DoesNotExist.
+                                            type: string
+                                          values:
+                                            description: |-
+                                              values is an array of string values. If the operator is In or NotIn,
+                                              the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                              the values array must be empty. This array is replaced during a strategic
+                                              merge patch.
+                                            items:
+                                              type: string
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                        required:
+                                        - key
+                                        - operator
+                                        type: object
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    matchLabels:
+                                      additionalProperties:
+                                        type: string
+                                      description: |-
+                                        matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                        map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                        operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                      type: object
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                matchLabelKeys:
+                                  description: |-
+                                    MatchLabelKeys is a set of pod label keys to select which pods will
+                                    be taken into consideration. The keys are used to lookup values from the
+                                    incoming pod labels, those key-value labels are merged with `labelSelector` as `key in (value)`
+                                    to select the group of existing pods which pods will be taken into consideration
+                                    for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+                                    pod labels will be ignored. The default value is empty.
+                                    The same key is forbidden to exist in both matchLabelKeys and labelSelector.
+                                    Also, matchLabelKeys cannot be set when labelSelector isn't set.
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                mismatchLabelKeys:
+                                  description: |-
+                                    MismatchLabelKeys is a set of pod label keys to select which pods will
+                                    be taken into consideration. The keys are used to lookup values from the
+                                    incoming pod labels, those key-value labels are merged with `labelSelector` as `key notin (value)`
+                                    to select the group of existing pods which pods will be taken into consideration
+                                    for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+                                    pod labels will be ignored. The default value is empty.
+                                    The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
+                                    Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                namespaceSelector:
+                                  description: |-
+                                    A label query over the set of namespaces that the term applies to.
+                                    The term is applied to the union of the namespaces selected by this field
+                                    and the ones listed in the namespaces field.
+                                    null selector and null or empty namespaces list means "this pod's namespace".
+                                    An empty selector ({}) matches all namespaces.
+                                  properties:
+                                    matchExpressions:
+                                      description: matchExpressions is a list of label
+                                        selector requirements. The requirements are
+                                        ANDed.
+                                      items:
+                                        description: |-
+                                          A label selector requirement is a selector that contains values, a key, and an operator that
+                                          relates the key and values.
+                                        properties:
+                                          key:
+                                            description: key is the label key that
+                                              the selector applies to.
+                                            type: string
+                                          operator:
+                                            description: |-
+                                              operator represents a key's relationship to a set of values.
+                                              Valid operators are In, NotIn, Exists and DoesNotExist.
+                                            type: string
+                                          values:
+                                            description: |-
+                                              values is an array of string values. If the operator is In or NotIn,
+                                              the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                              the values array must be empty. This array is replaced during a strategic
+                                              merge patch.
+                                            items:
+                                              type: string
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                        required:
+                                        - key
+                                        - operator
+                                        type: object
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    matchLabels:
+                                      additionalProperties:
+                                        type: string
+                                      description: |-
+                                        matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                        map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                        operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                      type: object
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                namespaces:
+                                  description: |-
+                                    namespaces specifies a static list of namespace names that the term applies to.
+                                    The term is applied to the union of the namespaces listed in this field
+                                    and the ones selected by namespaceSelector.
+                                    null or empty namespaces list and null namespaceSelector means "this pod's namespace".
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                topologyKey:
+                                  description: |-
+                                    This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching
+                                    the labelSelector in the specified namespaces, where co-located is defined as running on a node
+                                    whose value of the label with key topologyKey matches that of any node on which any of the
+                                    selected pods is running.
+                                    Empty topologyKey is not allowed.
+                                  type: string
+                              required:
+                              - topologyKey
+                              type: object
+                            weight:
+                              description: |-
+                                weight associated with matching the corresponding podAffinityTerm,
+                                in the range 1-100.
+                              format: int32
+                              type: integer
+                          required:
+                          - podAffinityTerm
+                          - weight
+                          type: object
+                        type: array
+                        x-kubernetes-list-type: atomic
+                      requiredDuringSchedulingIgnoredDuringExecution:
+                        description: |-
+                          If the anti-affinity requirements specified by this field are not met at
+                          scheduling time, the pod will not be scheduled onto the node.
+                          If the anti-affinity requirements specified by this field cease to be met
+                          at some point during pod execution (e.g. due to a pod label update), the
+                          system may or may not try to eventually evict the pod from its node.
+                          When there are multiple elements, the lists of nodes corresponding to each
+                          podAffinityTerm are intersected, i.e. all terms must be satisfied.
+                        items:
+                          description: |-
+                            Defines a set of pods (namely those matching the labelSelector
+                            relative to the given namespace(s)) that this pod should be
+                            co-located (affinity) or not co-located (anti-affinity) with,
+                            where co-located is defined as running on a node whose value of
+                            the label with key <topologyKey> matches that of any node on which
+                            a pod of the set of pods is running
+                          properties:
+                            labelSelector:
+                              description: |-
+                                A label query over a set of resources, in this case pods.
+                                If it's null, this PodAffinityTerm matches with no Pods.
+                              properties:
+                                matchExpressions:
+                                  description: matchExpressions is a list of label
+                                    selector requirements. The requirements are ANDed.
+                                  items:
+                                    description: |-
+                                      A label selector requirement is a selector that contains values, a key, and an operator that
+                                      relates the key and values.
+                                    properties:
+                                      key:
+                                        description: key is the label key that the
+                                          selector applies to.
+                                        type: string
+                                      operator:
+                                        description: |-
+                                          operator represents a key's relationship to a set of values.
+                                          Valid operators are In, NotIn, Exists and DoesNotExist.
+                                        type: string
+                                      values:
+                                        description: |-
+                                          values is an array of string values. If the operator is In or NotIn,
+                                          the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                          the values array must be empty. This array is replaced during a strategic
+                                          merge patch.
+                                        items:
+                                          type: string
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                    required:
+                                    - key
+                                    - operator
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                matchLabels:
+                                  additionalProperties:
+                                    type: string
+                                  description: |-
+                                    matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                    map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                    operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                  type: object
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            matchLabelKeys:
+                              description: |-
+                                MatchLabelKeys is a set of pod label keys to select which pods will
+                                be taken into consideration. The keys are used to lookup values from the
+                                incoming pod labels, those key-value labels are merged with `labelSelector` as `key in (value)`
+                                to select the group of existing pods which pods will be taken into consideration
+                                for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+                                pod labels will be ignored. The default value is empty.
+                                The same key is forbidden to exist in both matchLabelKeys and labelSelector.
+                                Also, matchLabelKeys cannot be set when labelSelector isn't set.
+                              items:
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            mismatchLabelKeys:
+                              description: |-
+                                MismatchLabelKeys is a set of pod label keys to select which pods will
+                                be taken into consideration. The keys are used to lookup values from the
+                                incoming pod labels, those key-value labels are merged with `labelSelector` as `key notin (value)`
+                                to select the group of existing pods which pods will be taken into consideration
+                                for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+                                pod labels will be ignored. The default value is empty.
+                                The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
+                                Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
+                              items:
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            namespaceSelector:
+                              description: |-
+                                A label query over the set of namespaces that the term applies to.
+                                The term is applied to the union of the namespaces selected by this field
+                                and the ones listed in the namespaces field.
+                                null selector and null or empty namespaces list means "this pod's namespace".
+                                An empty selector ({}) matches all namespaces.
+                              properties:
+                                matchExpressions:
+                                  description: matchExpressions is a list of label
+                                    selector requirements. The requirements are ANDed.
+                                  items:
+                                    description: |-
+                                      A label selector requirement is a selector that contains values, a key, and an operator that
+                                      relates the key and values.
+                                    properties:
+                                      key:
+                                        description: key is the label key that the
+                                          selector applies to.
+                                        type: string
+                                      operator:
+                                        description: |-
+                                          operator represents a key's relationship to a set of values.
+                                          Valid operators are In, NotIn, Exists and DoesNotExist.
+                                        type: string
+                                      values:
+                                        description: |-
+                                          values is an array of string values. If the operator is In or NotIn,
+                                          the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                          the values array must be empty. This array is replaced during a strategic
+                                          merge patch.
+                                        items:
+                                          type: string
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                    required:
+                                    - key
+                                    - operator
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                matchLabels:
+                                  additionalProperties:
+                                    type: string
+                                  description: |-
+                                    matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                    map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                    operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                  type: object
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            namespaces:
+                              description: |-
+                                namespaces specifies a static list of namespace names that the term applies to.
+                                The term is applied to the union of the namespaces listed in this field
+                                and the ones selected by namespaceSelector.
+                                null or empty namespaces list and null namespaceSelector means "this pod's namespace".
+                              items:
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            topologyKey:
+                              description: |-
+                                This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching
+                                the labelSelector in the specified namespaces, where co-located is defined as running on a node
+                                whose value of the label with key topologyKey matches that of any node on which any of the
+                                selected pods is running.
+                                Empty topologyKey is not allowed.
+                              type: string
+                          required:
+                          - topologyKey
+                          type: object
+                        type: array
+                        x-kubernetes-list-type: atomic
+                    type: object
+                type: object
+              alerting:
+                description: alerting defines the settings related to Alertmanager.
+                properties:
+                  alertmanagers:
+                    description: alertmanagers endpoints where Prometheus should send
+                      alerts to.
+                    items:
+                      description: |-
+                        AlertmanagerEndpoints defines a selection of a single Endpoints object
+                        containing Alertmanager IPs to fire alerts against.
+                      properties:
+                        alertRelabelings:
+                          description: |-
+                            alertRelabelings defines the relabeling configs applied before sending alerts to a specific Alertmanager.
+                            It requires Prometheus >= v2.51.0.
+                          items:
+                            description: |-
+                              RelabelConfig allows dynamic rewriting of the label set for targets, alerts,
+                              scraped samples and remote write samples.
+
+                              More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config
+                            properties:
+                              action:
+                                default: replace
+                                description: |-
+                                  action to perform based on the regex matching.
+
+                                  `Uppercase` and `Lowercase` actions require Prometheus >= v2.36.0.
+                                  `DropEqual` and `KeepEqual` actions require Prometheus >= v2.41.0.
+
+                                  Default: "Replace"
+                                enum:
+                                - replace
+                                - Replace
+                                - keep
+                                - Keep
+                                - drop
+                                - Drop
+                                - hashmod
+                                - HashMod
+                                - labelmap
+                                - LabelMap
+                                - labeldrop
+                                - LabelDrop
+                                - labelkeep
+                                - LabelKeep
+                                - lowercase
+                                - Lowercase
+                                - uppercase
+                                - Uppercase
+                                - keepequal
+                                - KeepEqual
+                                - dropequal
+                                - DropEqual
+                                type: string
+                              modulus:
+                                description: |-
+                                  modulus to take of the hash of the source label values.
+
+                                  Only applicable when the action is `HashMod`.
+                                format: int64
+                                type: integer
+                              regex:
+                                description: regex defines the regular expression
+                                  against which the extracted value is matched.
+                                type: string
+                              replacement:
+                                description: |-
+                                  replacement value against which a Replace action is performed if the
+                                  regular expression matches.
+
+                                  Regex capture groups are available.
+                                type: string
+                              separator:
+                                description: separator defines the string between
+                                  concatenated SourceLabels.
+                                type: string
+                              sourceLabels:
+                                description: |-
+                                  sourceLabels defines the source labels select values from existing labels. Their content is
+                                  concatenated using the configured Separator and matched against the
+                                  configured regular expression.
+                                items:
+                                  description: |-
+                                    LabelName is a valid Prometheus label name.
+                                    For Prometheus 3.x, a label name is valid if it contains UTF-8 characters.
+                                    For Prometheus 2.x, a label name is only valid if it contains ASCII characters, letters, numbers, as well as underscores.
+                                  type: string
+                                type: array
+                              targetLabel:
+                                description: |-
+                                  targetLabel defines the label to which the resulting string is written in a replacement.
+
+                                  It is mandatory for `Replace`, `HashMod`, `Lowercase`, `Uppercase`,
+                                  `KeepEqual` and `DropEqual` actions.
+
+                                  Regex capture groups are available.
+                                type: string
+                            type: object
+                          type: array
+                        apiVersion:
+                          description: |-
+                            apiVersion defines the version of the Alertmanager API that Prometheus uses to send alerts.
+                            It can be "V1" or "V2".
+                            The field has no effect for Prometheus >= v3.0.0 because only the v2 API is supported.
+                          enum:
+                          - v1
+                          - V1
+                          - v2
+                          - V2
+                          type: string
+                        authorization:
+                          description: |-
+                            authorization section for Alertmanager.
+
+                            Cannot be set at the same time as `basicAuth`, `bearerTokenFile` or `sigv4`.
+                          properties:
+                            credentials:
+                              description: credentials defines a key of a Secret in
+                                the namespace that contains the credentials for authentication.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            type:
+                              description: |-
+                                type defines the authentication type. The value is case-insensitive.
+
+                                "Basic" is not a supported value.
+
+                                Default: "Bearer"
+                              type: string
+                          type: object
+                        basicAuth:
+                          description: |-
+                            basicAuth configuration for Alertmanager.
+
+                            Cannot be set at the same time as `bearerTokenFile`, `authorization` or `sigv4`.
+                          properties:
+                            password:
+                              description: |-
+                                password defines a key of a Secret containing the password for
+                                authentication.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            username:
+                              description: |-
+                                username defines a key of a Secret containing the username for
+                                authentication.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                          type: object
+                        bearerTokenFile:
+                          description: |-
+                            bearerTokenFile defines the file to read bearer token for Alertmanager.
+
+                            Cannot be set at the same time as `basicAuth`, `authorization`, or `sigv4`.
+
+                            Deprecated: this will be removed in a future release. Prefer using `authorization`.
+                          type: string
+                        enableHttp2:
+                          description: enableHttp2 defines whether to enable HTTP2.
+                          type: boolean
+                        name:
+                          description: name of the Endpoints object in the namespace.
+                          minLength: 1
+                          type: string
+                        namespace:
+                          description: |-
+                            namespace of the Endpoints object.
+
+                            If not set, the object will be discovered in the namespace of the
+                            Prometheus object.
+                          minLength: 1
+                          type: string
+                        noProxy:
+                          description: |-
+                            noProxy defines a comma-separated string that can contain IPs, CIDR notation, domain names
+                            that should be excluded from proxying. IP and domain names can
+                            contain port numbers.
+
+                            It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                          type: string
+                        pathPrefix:
+                          description: pathPrefix defines the prefix for the HTTP
+                            path alerts are pushed to.
+                          minLength: 1
+                          type: string
+                        port:
+                          anyOf:
+                          - type: integer
+                          - type: string
+                          description: port on which the Alertmanager API is exposed.
+                          x-kubernetes-int-or-string: true
+                        proxyConnectHeader:
+                          additionalProperties:
+                            items:
+                              description: SecretKeySelector selects a key of a Secret.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            type: array
+                          description: |-
+                            proxyConnectHeader optionally specifies headers to send to
+                            proxies during CONNECT requests.
+
+                            It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        proxyFromEnvironment:
+                          description: |-
+                            proxyFromEnvironment defines whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+
+                            It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                          type: boolean
+                        proxyUrl:
+                          description: proxyUrl defines the HTTP proxy server to use.
+                          pattern: ^(http|https|socks5)://.+$
+                          type: string
+                        relabelings:
+                          description: relabelings defines the relabel configuration
+                            applied to the discovered Alertmanagers.
+                          items:
+                            description: |-
+                              RelabelConfig allows dynamic rewriting of the label set for targets, alerts,
+                              scraped samples and remote write samples.
+
+                              More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config
+                            properties:
+                              action:
+                                default: replace
+                                description: |-
+                                  action to perform based on the regex matching.
+
+                                  `Uppercase` and `Lowercase` actions require Prometheus >= v2.36.0.
+                                  `DropEqual` and `KeepEqual` actions require Prometheus >= v2.41.0.
+
+                                  Default: "Replace"
+                                enum:
+                                - replace
+                                - Replace
+                                - keep
+                                - Keep
+                                - drop
+                                - Drop
+                                - hashmod
+                                - HashMod
+                                - labelmap
+                                - LabelMap
+                                - labeldrop
+                                - LabelDrop
+                                - labelkeep
+                                - LabelKeep
+                                - lowercase
+                                - Lowercase
+                                - uppercase
+                                - Uppercase
+                                - keepequal
+                                - KeepEqual
+                                - dropequal
+                                - DropEqual
+                                type: string
+                              modulus:
+                                description: |-
+                                  modulus to take of the hash of the source label values.
+
+                                  Only applicable when the action is `HashMod`.
+                                format: int64
+                                type: integer
+                              regex:
+                                description: regex defines the regular expression
+                                  against which the extracted value is matched.
+                                type: string
+                              replacement:
+                                description: |-
+                                  replacement value against which a Replace action is performed if the
+                                  regular expression matches.
+
+                                  Regex capture groups are available.
+                                type: string
+                              separator:
+                                description: separator defines the string between
+                                  concatenated SourceLabels.
+                                type: string
+                              sourceLabels:
+                                description: |-
+                                  sourceLabels defines the source labels select values from existing labels. Their content is
+                                  concatenated using the configured Separator and matched against the
+                                  configured regular expression.
+                                items:
+                                  description: |-
+                                    LabelName is a valid Prometheus label name.
+                                    For Prometheus 3.x, a label name is valid if it contains UTF-8 characters.
+                                    For Prometheus 2.x, a label name is only valid if it contains ASCII characters, letters, numbers, as well as underscores.
+                                  type: string
+                                type: array
+                              targetLabel:
+                                description: |-
+                                  targetLabel defines the label to which the resulting string is written in a replacement.
+
+                                  It is mandatory for `Replace`, `HashMod`, `Lowercase`, `Uppercase`,
+                                  `KeepEqual` and `DropEqual` actions.
+
+                                  Regex capture groups are available.
+                                type: string
+                            type: object
+                          type: array
+                        scheme:
+                          description: scheme defines the HTTP scheme to use when
+                            sending alerts.
+                          enum:
+                          - http
+                          - https
+                          - HTTP
+                          - HTTPS
+                          type: string
+                        sigv4:
+                          description: |-
+                            sigv4 defines AWS's Signature Verification 4 for the URL.
+
+                            It requires Prometheus >= v2.48.0.
+
+                            Cannot be set at the same time as `basicAuth`, `bearerTokenFile` or `authorization`.
+                          properties:
+                            accessKey:
+                              description: |-
+                                accessKey defines the AWS API key. If not specified, the environment variable
+                                `AWS_ACCESS_KEY_ID` is used.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            profile:
+                              description: profile defines the named AWS profile used
+                                to authenticate.
+                              type: string
+                            region:
+                              description: region defines the AWS region. If blank,
+                                the region from the default credentials chain used.
+                              type: string
+                            roleArn:
+                              description: roleArn defines the named AWS profile used
+                                to authenticate.
+                              type: string
+                            secretKey:
+                              description: |-
+                                secretKey defines the AWS API secret. If not specified, the environment
+                                variable `AWS_SECRET_ACCESS_KEY` is used.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            useFIPSSTSEndpoint:
+                              description: |-
+                                useFIPSSTSEndpoint defines the FIPS mode for the AWS STS endpoint.
+                                It requires Prometheus >= v2.54.0.
+                              type: boolean
+                          type: object
+                        timeout:
+                          description: timeout defines a per-target Alertmanager timeout
+                            when pushing alerts.
+                          pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
+                          type: string
+                        tlsConfig:
+                          description: tlsConfig to use for Alertmanager.
+                          properties:
+                            ca:
+                              description: ca defines the Certificate authority used
+                                when verifying server certificates.
+                              properties:
+                                configMap:
+                                  description: configMap defines the ConfigMap containing
+                                    data to use for the targets.
+                                  properties:
+                                    key:
+                                      description: The key to select.
+                                      type: string
+                                    name:
+                                      default: ""
+                                      description: |-
+                                        Name of the referent.
+                                        This field is effectively required, but due to backwards compatibility is
+                                        allowed to be empty. Instances of this type with an empty value here are
+                                        almost certainly wrong.
+                                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                      type: string
+                                    optional:
+                                      description: Specify whether the ConfigMap or
+                                        its key must be defined
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                secret:
+                                  description: secret defines the Secret containing
+                                    data to use for the targets.
+                                  properties:
+                                    key:
+                                      description: The key of the secret to select
+                                        from.  Must be a valid secret key.
+                                      type: string
+                                    name:
+                                      default: ""
+                                      description: |-
+                                        Name of the referent.
+                                        This field is effectively required, but due to backwards compatibility is
+                                        allowed to be empty. Instances of this type with an empty value here are
+                                        almost certainly wrong.
+                                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                      type: string
+                                    optional:
+                                      description: Specify whether the Secret or its
+                                        key must be defined
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                              type: object
+                            caFile:
+                              description: caFile defines the path to the CA cert
+                                in the Prometheus container to use for the targets.
+                              type: string
+                            cert:
+                              description: cert defines the Client certificate to
+                                present when doing client-authentication.
+                              properties:
+                                configMap:
+                                  description: configMap defines the ConfigMap containing
+                                    data to use for the targets.
+                                  properties:
+                                    key:
+                                      description: The key to select.
+                                      type: string
+                                    name:
+                                      default: ""
+                                      description: |-
+                                        Name of the referent.
+                                        This field is effectively required, but due to backwards compatibility is
+                                        allowed to be empty. Instances of this type with an empty value here are
+                                        almost certainly wrong.
+                                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                      type: string
+                                    optional:
+                                      description: Specify whether the ConfigMap or
+                                        its key must be defined
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                secret:
+                                  description: secret defines the Secret containing
+                                    data to use for the targets.
+                                  properties:
+                                    key:
+                                      description: The key of the secret to select
+                                        from.  Must be a valid secret key.
+                                      type: string
+                                    name:
+                                      default: ""
+                                      description: |-
+                                        Name of the referent.
+                                        This field is effectively required, but due to backwards compatibility is
+                                        allowed to be empty. Instances of this type with an empty value here are
+                                        almost certainly wrong.
+                                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                      type: string
+                                    optional:
+                                      description: Specify whether the Secret or its
+                                        key must be defined
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                              type: object
+                            certFile:
+                              description: certFile defines the path to the client
+                                cert file in the Prometheus container for the targets.
+                              type: string
+                            insecureSkipVerify:
+                              description: insecureSkipVerify defines how to disable
+                                target certificate validation.
+                              type: boolean
+                            keyFile:
+                              description: keyFile defines the path to the client
+                                key file in the Prometheus container for the targets.
+                              type: string
+                            keySecret:
+                              description: keySecret defines the Secret containing
+                                the client key file for the targets.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            maxVersion:
+                              description: |-
+                                maxVersion defines the maximum acceptable TLS version.
+
+                                It requires Prometheus >= v2.41.0 or Thanos >= v0.31.0.
+                              enum:
+                              - TLS10
+                              - TLS11
+                              - TLS12
+                              - TLS13
+                              type: string
+                            minVersion:
+                              description: |-
+                                minVersion defines the minimum acceptable TLS version.
+
+                                It requires Prometheus >= v2.35.0 or Thanos >= v0.28.0.
+                              enum:
+                              - TLS10
+                              - TLS11
+                              - TLS12
+                              - TLS13
+                              type: string
+                            serverName:
+                              description: serverName is used to verify the hostname
+                                for the targets.
+                              type: string
+                          type: object
+                      required:
+                      - name
+                      - port
+                      type: object
+                    type: array
+                required:
+                - alertmanagers
+                type: object
+              allowOverlappingBlocks:
+                description: |-
+                  allowOverlappingBlocks enables vertical compaction and vertical query
+                  merge in Prometheus.
+
+                  Deprecated: this flag has no effect for Prometheus >= 2.39.0 where overlapping blocks are enabled by default.
+                type: boolean
+              apiserverConfig:
+                description: |-
+                  apiserverConfig allows specifying a host and auth methods to access the
+                  Kuberntees API server.
+                  If null, Prometheus is assumed to run inside of the cluster: it will
+                  discover the API servers automatically and use the Pod's CA certificate
+                  and bearer token file at /var/run/secrets/kubernetes.io/serviceaccount/.
+                properties:
+                  authorization:
+                    description: |-
+                      authorization section for the API server.
+
+                      Cannot be set at the same time as `basicAuth`, `bearerToken`, or
+                      `bearerTokenFile`.
+                    properties:
+                      credentials:
+                        description: credentials defines a key of a Secret in the
+                          namespace that contains the credentials for authentication.
+                        properties:
+                          key:
+                            description: The key of the secret to select from.  Must
+                              be a valid secret key.
+                            type: string
+                          name:
+                            default: ""
+                            description: |-
+                              Name of the referent.
+                              This field is effectively required, but due to backwards compatibility is
+                              allowed to be empty. Instances of this type with an empty value here are
+                              almost certainly wrong.
+                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                            type: string
+                          optional:
+                            description: Specify whether the Secret or its key must
+                              be defined
+                            type: boolean
+                        required:
+                        - key
+                        type: object
+                        x-kubernetes-map-type: atomic
+                      credentialsFile:
+                        description: credentialsFile defines the file to read a secret
+                          from, mutually exclusive with `credentials`.
+                        type: string
+                      type:
+                        description: |-
+                          type defines the authentication type. The value is case-insensitive.
+
+                          "Basic" is not a supported value.
+
+                          Default: "Bearer"
+                        type: string
+                    type: object
+                  basicAuth:
+                    description: |-
+                      basicAuth configuration for the API server.
+
+                      Cannot be set at the same time as `authorization`, `bearerToken`, or
+                      `bearerTokenFile`.
+                    properties:
+                      password:
+                        description: |-
+                          password defines a key of a Secret containing the password for
+                          authentication.
+                        properties:
+                          key:
+                            description: The key of the secret to select from.  Must
+                              be a valid secret key.
+                            type: string
+                          name:
+                            default: ""
+                            description: |-
+                              Name of the referent.
+                              This field is effectively required, but due to backwards compatibility is
+                              allowed to be empty. Instances of this type with an empty value here are
+                              almost certainly wrong.
+                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                            type: string
+                          optional:
+                            description: Specify whether the Secret or its key must
+                              be defined
+                            type: boolean
+                        required:
+                        - key
+                        type: object
+                        x-kubernetes-map-type: atomic
+                      username:
+                        description: |-
+                          username defines a key of a Secret containing the username for
+                          authentication.
+                        properties:
+                          key:
+                            description: The key of the secret to select from.  Must
+                              be a valid secret key.
+                            type: string
+                          name:
+                            default: ""
+                            description: |-
+                              Name of the referent.
+                              This field is effectively required, but due to backwards compatibility is
+                              allowed to be empty. Instances of this type with an empty value here are
+                              almost certainly wrong.
+                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                            type: string
+                          optional:
+                            description: Specify whether the Secret or its key must
+                              be defined
+                            type: boolean
+                        required:
+                        - key
+                        type: object
+                        x-kubernetes-map-type: atomic
+                    type: object
+                  bearerToken:
+                    description: |-
+                      bearerToken is deprecated: this will be removed in a future release.
+                       *Warning: this field shouldn't be used because the token value appears
+                      in clear-text. Prefer using `authorization`.*
+                    type: string
+                  bearerTokenFile:
+                    description: |-
+                      bearerTokenFile defines the file to read bearer token for accessing apiserver.
+
+                      Cannot be set at the same time as `basicAuth`, `authorization`, or `bearerToken`.
+
+                      Deprecated: this will be removed in a future release. Prefer using `authorization`.
+                    type: string
+                  host:
+                    description: |-
+                      host defines the Kubernetes API address consisting of a hostname or IP address followed
+                      by an optional port number.
+                    type: string
+                  noProxy:
+                    description: |-
+                      noProxy defines a comma-separated string that can contain IPs, CIDR notation, domain names
+                      that should be excluded from proxying. IP and domain names can
+                      contain port numbers.
+
+                      It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                    type: string
+                  proxyConnectHeader:
+                    additionalProperties:
+                      items:
+                        description: SecretKeySelector selects a key of a Secret.
+                        properties:
+                          key:
+                            description: The key of the secret to select from.  Must
+                              be a valid secret key.
+                            type: string
+                          name:
+                            default: ""
+                            description: |-
+                              Name of the referent.
+                              This field is effectively required, but due to backwards compatibility is
+                              allowed to be empty. Instances of this type with an empty value here are
+                              almost certainly wrong.
+                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                            type: string
+                          optional:
+                            description: Specify whether the Secret or its key must
+                              be defined
+                            type: boolean
+                        required:
+                        - key
+                        type: object
+                        x-kubernetes-map-type: atomic
+                      type: array
+                    description: |-
+                      proxyConnectHeader optionally specifies headers to send to
+                      proxies during CONNECT requests.
+
+                      It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                    type: object
+                    x-kubernetes-map-type: atomic
+                  proxyFromEnvironment:
+                    description: |-
+                      proxyFromEnvironment defines whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+
+                      It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                    type: boolean
+                  proxyUrl:
+                    description: proxyUrl defines the HTTP proxy server to use.
+                    pattern: ^(http|https|socks5)://.+$
+                    type: string
+                  tlsConfig:
+                    description: tlsConfig to use for the API server.
+                    properties:
+                      ca:
+                        description: ca defines the Certificate authority used when
+                          verifying server certificates.
+                        properties:
+                          configMap:
+                            description: configMap defines the ConfigMap containing
+                              data to use for the targets.
+                            properties:
+                              key:
+                                description: The key to select.
+                                type: string
+                              name:
+                                default: ""
+                                description: |-
+                                  Name of the referent.
+                                  This field is effectively required, but due to backwards compatibility is
+                                  allowed to be empty. Instances of this type with an empty value here are
+                                  almost certainly wrong.
+                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                type: string
+                              optional:
+                                description: Specify whether the ConfigMap or its
+                                  key must be defined
+                                type: boolean
+                            required:
+                            - key
+                            type: object
+                            x-kubernetes-map-type: atomic
+                          secret:
+                            description: secret defines the Secret containing data
+                              to use for the targets.
+                            properties:
+                              key:
+                                description: The key of the secret to select from.  Must
+                                  be a valid secret key.
+                                type: string
+                              name:
+                                default: ""
+                                description: |-
+                                  Name of the referent.
+                                  This field is effectively required, but due to backwards compatibility is
+                                  allowed to be empty. Instances of this type with an empty value here are
+                                  almost certainly wrong.
+                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                type: string
+                              optional:
+                                description: Specify whether the Secret or its key
+                                  must be defined
+                                type: boolean
+                            required:
+                            - key
+                            type: object
+                            x-kubernetes-map-type: atomic
+                        type: object
+                      caFile:
+                        description: caFile defines the path to the CA cert in the
+                          Prometheus container to use for the targets.
+                        type: string
+                      cert:
+                        description: cert defines the Client certificate to present
+                          when doing client-authentication.
+                        properties:
+                          configMap:
+                            description: configMap defines the ConfigMap containing
+                              data to use for the targets.
+                            properties:
+                              key:
+                                description: The key to select.
+                                type: string
+                              name:
+                                default: ""
+                                description: |-
+                                  Name of the referent.
+                                  This field is effectively required, but due to backwards compatibility is
+                                  allowed to be empty. Instances of this type with an empty value here are
+                                  almost certainly wrong.
+                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                type: string
+                              optional:
+                                description: Specify whether the ConfigMap or its
+                                  key must be defined
+                                type: boolean
+                            required:
+                            - key
+                            type: object
+                            x-kubernetes-map-type: atomic
+                          secret:
+                            description: secret defines the Secret containing data
+                              to use for the targets.
+                            properties:
+                              key:
+                                description: The key of the secret to select from.  Must
+                                  be a valid secret key.
+                                type: string
+                              name:
+                                default: ""
+                                description: |-
+                                  Name of the referent.
+                                  This field is effectively required, but due to backwards compatibility is
+                                  allowed to be empty. Instances of this type with an empty value here are
+                                  almost certainly wrong.
+                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                type: string
+                              optional:
+                                description: Specify whether the Secret or its key
+                                  must be defined
+                                type: boolean
+                            required:
+                            - key
+                            type: object
+                            x-kubernetes-map-type: atomic
+                        type: object
+                      certFile:
+                        description: certFile defines the path to the client cert
+                          file in the Prometheus container for the targets.
+                        type: string
+                      insecureSkipVerify:
+                        description: insecureSkipVerify defines how to disable target
+                          certificate validation.
+                        type: boolean
+                      keyFile:
+                        description: keyFile defines the path to the client key file
+                          in the Prometheus container for the targets.
+                        type: string
+                      keySecret:
+                        description: keySecret defines the Secret containing the client
+                          key file for the targets.
+                        properties:
+                          key:
+                            description: The key of the secret to select from.  Must
+                              be a valid secret key.
+                            type: string
+                          name:
+                            default: ""
+                            description: |-
+                              Name of the referent.
+                              This field is effectively required, but due to backwards compatibility is
+                              allowed to be empty. Instances of this type with an empty value here are
+                              almost certainly wrong.
+                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                            type: string
+                          optional:
+                            description: Specify whether the Secret or its key must
+                              be defined
+                            type: boolean
+                        required:
+                        - key
+                        type: object
+                        x-kubernetes-map-type: atomic
+                      maxVersion:
+                        description: |-
+                          maxVersion defines the maximum acceptable TLS version.
+
+                          It requires Prometheus >= v2.41.0 or Thanos >= v0.31.0.
+                        enum:
+                        - TLS10
+                        - TLS11
+                        - TLS12
+                        - TLS13
+                        type: string
+                      minVersion:
+                        description: |-
+                          minVersion defines the minimum acceptable TLS version.
+
+                          It requires Prometheus >= v2.35.0 or Thanos >= v0.28.0.
+                        enum:
+                        - TLS10
+                        - TLS11
+                        - TLS12
+                        - TLS13
+                        type: string
+                      serverName:
+                        description: serverName is used to verify the hostname for
+                          the targets.
+                        type: string
+                    type: object
+                required:
+                - host
+                type: object
+              arbitraryFSAccessThroughSMs:
+                description: |-
+                  arbitraryFSAccessThroughSMs when true, ServiceMonitor, PodMonitor and Probe object are forbidden to
+                  reference arbitrary files on the file system of the 'prometheus'
+                  container.
+                  When a ServiceMonitor's endpoint specifies a `bearerTokenFile` value
+                  (e.g.  '/var/run/secrets/kubernetes.io/serviceaccount/token'), a
+                  malicious target can get access to the Prometheus service account's
+                  token in the Prometheus' scrape request. Setting
+                  `spec.arbitraryFSAccessThroughSM` to 'true' would prevent the attack.
+                  Users should instead provide the credentials using the
+                  `spec.bearerTokenSecret` field.
+                properties:
+                  deny:
+                    description: |-
+                      deny prevents service monitors from accessing arbitrary files on the file system.
+                      When true, service monitors cannot use file-based configurations like BearerTokenFile
+                      that could potentially access sensitive files. When false (default), such access is allowed.
+                      Setting this to true enhances security by preventing potential credential theft attacks.
+                    type: boolean
+                type: object
+              automountServiceAccountToken:
+                description: |-
+                  automountServiceAccountToken defines whether a service account token should be automatically mounted in the pod.
+                  If the field isn't set, the operator mounts the service account token by default.
+
+                  **Warning:** be aware that by default, Prometheus requires the service account token for Kubernetes service discovery.
+                  It is possible to use strategic merge patch to project the service account token into the 'prometheus' container.
+                type: boolean
+              baseImage:
+                description: 'baseImage is deprecated: use ''spec.image'' instead.'
+                type: string
+              bodySizeLimit:
+                description: |-
+                  bodySizeLimit defines per-scrape on response body size.
+                  Only valid in Prometheus versions 2.45.0 and newer.
+
+                  Note that the global limit only applies to scrape objects that don't specify an explicit limit value.
+                  If you want to enforce a maximum limit for all scrape objects, refer to enforcedBodySizeLimit.
+                pattern: (^0|([0-9]*[.])?[0-9]+((K|M|G|T|E|P)i?)?B)$
+                type: string
+              configMaps:
+                description: |-
+                  configMaps defines a list of ConfigMaps in the same namespace as the Prometheus
+                  object, which shall be mounted into the Prometheus Pods.
+                  Each ConfigMap is added to the StatefulSet definition as a volume named `configmap-<configmap-name>`.
+                  The ConfigMaps are mounted into /etc/prometheus/configmaps/<configmap-name> in the 'prometheus' container.
+                items:
+                  type: string
+                type: array
+              containers:
+                description: |-
+                  containers allows injecting additional containers or modifying operator
+                  generated containers. This can be used to allow adding an authentication
+                  proxy to the Pods or to change the behavior of an operator generated
+                  container. Containers described here modify an operator generated
+                  container if they share the same name and modifications are done via a
+                  strategic merge patch.
+
+                  The names of containers managed by the operator are:
+                  * `prometheus`
+                  * `config-reloader`
+                  * `thanos-sidecar`
+
+                  Overriding containers is entirely outside the scope of what the
+                  maintainers will support and by doing so, you accept that this behaviour
+                  may break at any time without notice.
+                items:
+                  description: A single application container that you want to run
+                    within a pod.
+                  properties:
+                    args:
+                      description: |-
+                        Arguments to the entrypoint.
+                        The container image's CMD is used if this is not provided.
+                        Variable references $(VAR_NAME) are expanded using the container's environment. If a variable
+                        cannot be resolved, the reference in the input string will be unchanged. Double $$ are reduced
+                        to a single $, which allows for escaping the $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)" will
+                        produce the string literal "$(VAR_NAME)". Escaped references will never be expanded, regardless
+                        of whether the variable exists or not. Cannot be updated.
+                        More info: https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell
+                      items:
+                        type: string
+                      type: array
+                      x-kubernetes-list-type: atomic
+                    command:
+                      description: |-
+                        Entrypoint array. Not executed within a shell.
+                        The container image's ENTRYPOINT is used if this is not provided.
+                        Variable references $(VAR_NAME) are expanded using the container's environment. If a variable
+                        cannot be resolved, the reference in the input string will be unchanged. Double $$ are reduced
+                        to a single $, which allows for escaping the $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)" will
+                        produce the string literal "$(VAR_NAME)". Escaped references will never be expanded, regardless
+                        of whether the variable exists or not. Cannot be updated.
+                        More info: https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell
+                      items:
+                        type: string
+                      type: array
+                      x-kubernetes-list-type: atomic
+                    env:
+                      description: |-
+                        List of environment variables to set in the container.
+                        Cannot be updated.
+                      items:
+                        description: EnvVar represents an environment variable present
+                          in a Container.
+                        properties:
+                          name:
+                            description: |-
+                              Name of the environment variable.
+                              May consist of any printable ASCII characters except '='.
+                            type: string
+                          value:
+                            description: |-
+                              Variable references $(VAR_NAME) are expanded
+                              using the previously defined environment variables in the container and
+                              any service environment variables. If a variable cannot be resolved,
+                              the reference in the input string will be unchanged. Double $$ are reduced
+                              to a single $, which allows for escaping the $(VAR_NAME) syntax: i.e.
+                              "$$(VAR_NAME)" will produce the string literal "$(VAR_NAME)".
+                              Escaped references will never be expanded, regardless of whether the variable
+                              exists or not.
+                              Defaults to "".
+                            type: string
+                          valueFrom:
+                            description: Source for the environment variable's value.
+                              Cannot be used if value is not empty.
+                            properties:
+                              configMapKeyRef:
+                                description: Selects a key of a ConfigMap.
+                                properties:
+                                  key:
+                                    description: The key to select.
+                                    type: string
+                                  name:
+                                    default: ""
+                                    description: |-
+                                      Name of the referent.
+                                      This field is effectively required, but due to backwards compatibility is
+                                      allowed to be empty. Instances of this type with an empty value here are
+                                      almost certainly wrong.
+                                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                    type: string
+                                  optional:
+                                    description: Specify whether the ConfigMap or
+                                      its key must be defined
+                                    type: boolean
+                                required:
+                                - key
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              fieldRef:
+                                description: |-
+                                  Selects a field of the pod: supports metadata.name, metadata.namespace, `metadata.labels['<KEY>']`, `metadata.annotations['<KEY>']`,
+                                  spec.nodeName, spec.serviceAccountName, status.hostIP, status.podIP, status.podIPs.
+                                properties:
+                                  apiVersion:
+                                    description: Version of the schema the FieldPath
+                                      is written in terms of, defaults to "v1".
+                                    type: string
+                                  fieldPath:
+                                    description: Path of the field to select in the
+                                      specified API version.
+                                    type: string
+                                required:
+                                - fieldPath
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              fileKeyRef:
+                                description: |-
+                                  FileKeyRef selects a key of the env file.
+                                  Requires the EnvFiles feature gate to be enabled.
+                                properties:
+                                  key:
+                                    description: |-
+                                      The key within the env file. An invalid key will prevent the pod from starting.
+                                      The keys defined within a source may consist of any printable ASCII characters except '='.
+                                      During Alpha stage of the EnvFiles feature gate, the key size is limited to 128 characters.
+                                    type: string
+                                  optional:
+                                    default: false
+                                    description: |-
+                                      Specify whether the file or its key must be defined. If the file or key
+                                      does not exist, then the env var is not published.
+                                      If optional is set to true and the specified key does not exist,
+                                      the environment variable will not be set in the Pod's containers.
+
+                                      If optional is set to false and the specified key does not exist,
+                                      an error will be returned during Pod creation.
+                                    type: boolean
+                                  path:
+                                    description: |-
+                                      The path within the volume from which to select the file.
+                                      Must be relative and may not contain the '..' path or start with '..'.
+                                    type: string
+                                  volumeName:
+                                    description: The name of the volume mount containing
+                                      the env file.
+                                    type: string
+                                required:
+                                - key
+                                - path
+                                - volumeName
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              resourceFieldRef:
+                                description: |-
+                                  Selects a resource of the container: only resources limits and requests
+                                  (limits.cpu, limits.memory, limits.ephemeral-storage, requests.cpu, requests.memory and requests.ephemeral-storage) are currently supported.
+                                properties:
+                                  containerName:
+                                    description: 'Container name: required for volumes,
+                                      optional for env vars'
+                                    type: string
+                                  divisor:
+                                    anyOf:
+                                    - type: integer
+                                    - type: string
+                                    description: Specifies the output format of the
+                                      exposed resources, defaults to "1"
+                                    pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                    x-kubernetes-int-or-string: true
+                                  resource:
+                                    description: 'Required: resource to select'
+                                    type: string
+                                required:
+                                - resource
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              secretKeyRef:
+                                description: Selects a key of a secret in the pod's
+                                  namespace
+                                properties:
+                                  key:
+                                    description: The key of the secret to select from.  Must
+                                      be a valid secret key.
+                                    type: string
+                                  name:
+                                    default: ""
+                                    description: |-
+                                      Name of the referent.
+                                      This field is effectively required, but due to backwards compatibility is
+                                      allowed to be empty. Instances of this type with an empty value here are
+                                      almost certainly wrong.
+                                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                    type: string
+                                  optional:
+                                    description: Specify whether the Secret or its
+                                      key must be defined
+                                    type: boolean
+                                required:
+                                - key
+                                type: object
+                                x-kubernetes-map-type: atomic
+                            type: object
+                        required:
+                        - name
+                        type: object
+                      type: array
+                      x-kubernetes-list-map-keys:
+                      - name
+                      x-kubernetes-list-type: map
+                    envFrom:
+                      description: |-
+                        List of sources to populate environment variables in the container.
+                        The keys defined within a source may consist of any printable ASCII characters except '='.
+                        When a key exists in multiple
+                        sources, the value associated with the last source will take precedence.
+                        Values defined by an Env with a duplicate key will take precedence.
+                        Cannot be updated.
+                      items:
+                        description: EnvFromSource represents the source of a set
+                          of ConfigMaps or Secrets
+                        properties:
+                          configMapRef:
+                            description: The ConfigMap to select from
+                            properties:
+                              name:
+                                default: ""
+                                description: |-
+                                  Name of the referent.
+                                  This field is effectively required, but due to backwards compatibility is
+                                  allowed to be empty. Instances of this type with an empty value here are
+                                  almost certainly wrong.
+                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                type: string
+                              optional:
+                                description: Specify whether the ConfigMap must be
+                                  defined
+                                type: boolean
+                            type: object
+                            x-kubernetes-map-type: atomic
+                          prefix:
+                            description: |-
+                              Optional text to prepend to the name of each environment variable.
+                              May consist of any printable ASCII characters except '='.
+                            type: string
+                          secretRef:
+                            description: The Secret to select from
+                            properties:
+                              name:
+                                default: ""
+                                description: |-
+                                  Name of the referent.
+                                  This field is effectively required, but due to backwards compatibility is
+                                  allowed to be empty. Instances of this type with an empty value here are
+                                  almost certainly wrong.
+                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                type: string
+                              optional:
+                                description: Specify whether the Secret must be defined
+                                type: boolean
+                            type: object
+                            x-kubernetes-map-type: atomic
+                        type: object
+                      type: array
+                      x-kubernetes-list-type: atomic
+                    image:
+                      description: |-
+                        Container image name.
+                        More info: https://kubernetes.io/docs/concepts/containers/images
+                        This field is optional to allow higher level config management to default or override
+                        container images in workload controllers like Deployments and StatefulSets.
+                      type: string
+                    imagePullPolicy:
+                      description: |-
+                        Image pull policy.
+                        One of Always, Never, IfNotPresent.
+                        Defaults to Always if :latest tag is specified, or IfNotPresent otherwise.
+                        Cannot be updated.
+                        More info: https://kubernetes.io/docs/concepts/containers/images#updating-images
+                      type: string
+                    lifecycle:
+                      description: |-
+                        Actions that the management system should take in response to container lifecycle events.
+                        Cannot be updated.
+                      properties:
+                        postStart:
+                          description: |-
+                            PostStart is called immediately after a container is created. If the handler fails,
+                            the container is terminated and restarted according to its restart policy.
+                            Other management of the container blocks until the hook completes.
+                            More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
+                          properties:
+                            exec:
+                              description: Exec specifies a command to execute in
+                                the container.
+                              properties:
+                                command:
+                                  description: |-
+                                    Command is the command line to execute inside the container, the working directory for the
+                                    command  is root ('/') in the container's filesystem. The command is simply exec'd, it is
+                                    not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use
+                                    a shell, you need to explicitly call out to that shell.
+                                    Exit status of 0 is treated as live/healthy and non-zero is unhealthy.
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                              type: object
+                            httpGet:
+                              description: HTTPGet specifies an HTTP GET request to
+                                perform.
+                              properties:
+                                host:
+                                  description: |-
+                                    Host name to connect to, defaults to the pod IP. You probably want to set
+                                    "Host" in httpHeaders instead.
+                                  type: string
+                                httpHeaders:
+                                  description: Custom headers to set in the request.
+                                    HTTP allows repeated headers.
+                                  items:
+                                    description: HTTPHeader describes a custom header
+                                      to be used in HTTP probes
+                                    properties:
+                                      name:
+                                        description: |-
+                                          The header field name.
+                                          This will be canonicalized upon output, so case-variant names will be understood as the same header.
+                                        type: string
+                                      value:
+                                        description: The header field value
+                                        type: string
+                                    required:
+                                    - name
+                                    - value
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                path:
+                                  description: Path to access on the HTTP server.
+                                  type: string
+                                port:
+                                  anyOf:
+                                  - type: integer
+                                  - type: string
+                                  description: |-
+                                    Name or number of the port to access on the container.
+                                    Number must be in the range 1 to 65535.
+                                    Name must be an IANA_SVC_NAME.
+                                  x-kubernetes-int-or-string: true
+                                scheme:
+                                  description: |-
+                                    Scheme to use for connecting to the host.
+                                    Defaults to HTTP.
+                                  type: string
+                              required:
+                              - port
+                              type: object
+                            sleep:
+                              description: Sleep represents a duration that the container
+                                should sleep.
+                              properties:
+                                seconds:
+                                  description: Seconds is the number of seconds to
+                                    sleep.
+                                  format: int64
+                                  type: integer
+                              required:
+                              - seconds
+                              type: object
+                            tcpSocket:
+                              description: |-
+                                Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
+                                for backward compatibility. There is no validation of this field and
+                                lifecycle hooks will fail at runtime when it is specified.
+                              properties:
+                                host:
+                                  description: 'Optional: Host name to connect to,
+                                    defaults to the pod IP.'
+                                  type: string
+                                port:
+                                  anyOf:
+                                  - type: integer
+                                  - type: string
+                                  description: |-
+                                    Number or name of the port to access on the container.
+                                    Number must be in the range 1 to 65535.
+                                    Name must be an IANA_SVC_NAME.
+                                  x-kubernetes-int-or-string: true
+                              required:
+                              - port
+                              type: object
+                          type: object
+                        preStop:
+                          description: |-
+                            PreStop is called immediately before a container is terminated due to an
+                            API request or management event such as liveness/startup probe failure,
+                            preemption, resource contention, etc. The handler is not called if the
+                            container crashes or exits. The Pod's termination grace period countdown begins before the
+                            PreStop hook is executed. Regardless of the outcome of the handler, the
+                            container will eventually terminate within the Pod's termination grace
+                            period (unless delayed by finalizers). Other management of the container blocks until the hook completes
+                            or until the termination grace period is reached.
+                            More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
+                          properties:
+                            exec:
+                              description: Exec specifies a command to execute in
+                                the container.
+                              properties:
+                                command:
+                                  description: |-
+                                    Command is the command line to execute inside the container, the working directory for the
+                                    command  is root ('/') in the container's filesystem. The command is simply exec'd, it is
+                                    not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use
+                                    a shell, you need to explicitly call out to that shell.
+                                    Exit status of 0 is treated as live/healthy and non-zero is unhealthy.
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                              type: object
+                            httpGet:
+                              description: HTTPGet specifies an HTTP GET request to
+                                perform.
+                              properties:
+                                host:
+                                  description: |-
+                                    Host name to connect to, defaults to the pod IP. You probably want to set
+                                    "Host" in httpHeaders instead.
+                                  type: string
+                                httpHeaders:
+                                  description: Custom headers to set in the request.
+                                    HTTP allows repeated headers.
+                                  items:
+                                    description: HTTPHeader describes a custom header
+                                      to be used in HTTP probes
+                                    properties:
+                                      name:
+                                        description: |-
+                                          The header field name.
+                                          This will be canonicalized upon output, so case-variant names will be understood as the same header.
+                                        type: string
+                                      value:
+                                        description: The header field value
+                                        type: string
+                                    required:
+                                    - name
+                                    - value
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                path:
+                                  description: Path to access on the HTTP server.
+                                  type: string
+                                port:
+                                  anyOf:
+                                  - type: integer
+                                  - type: string
+                                  description: |-
+                                    Name or number of the port to access on the container.
+                                    Number must be in the range 1 to 65535.
+                                    Name must be an IANA_SVC_NAME.
+                                  x-kubernetes-int-or-string: true
+                                scheme:
+                                  description: |-
+                                    Scheme to use for connecting to the host.
+                                    Defaults to HTTP.
+                                  type: string
+                              required:
+                              - port
+                              type: object
+                            sleep:
+                              description: Sleep represents a duration that the container
+                                should sleep.
+                              properties:
+                                seconds:
+                                  description: Seconds is the number of seconds to
+                                    sleep.
+                                  format: int64
+                                  type: integer
+                              required:
+                              - seconds
+                              type: object
+                            tcpSocket:
+                              description: |-
+                                Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
+                                for backward compatibility. There is no validation of this field and
+                                lifecycle hooks will fail at runtime when it is specified.
+                              properties:
+                                host:
+                                  description: 'Optional: Host name to connect to,
+                                    defaults to the pod IP.'
+                                  type: string
+                                port:
+                                  anyOf:
+                                  - type: integer
+                                  - type: string
+                                  description: |-
+                                    Number or name of the port to access on the container.
+                                    Number must be in the range 1 to 65535.
+                                    Name must be an IANA_SVC_NAME.
+                                  x-kubernetes-int-or-string: true
+                              required:
+                              - port
+                              type: object
+                          type: object
+                        stopSignal:
+                          description: |-
+                            StopSignal defines which signal will be sent to a container when it is being stopped.
+                            If not specified, the default is defined by the container runtime in use.
+                            StopSignal can only be set for Pods with a non-empty .spec.os.name
+                          type: string
+                      type: object
+                    livenessProbe:
+                      description: |-
+                        Periodic probe of container liveness.
+                        Container will be restarted if the probe fails.
+                        Cannot be updated.
+                        More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                      properties:
+                        exec:
+                          description: Exec specifies a command to execute in the
+                            container.
+                          properties:
+                            command:
+                              description: |-
+                                Command is the command line to execute inside the container, the working directory for the
+                                command  is root ('/') in the container's filesystem. The command is simply exec'd, it is
+                                not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use
+                                a shell, you need to explicitly call out to that shell.
+                                Exit status of 0 is treated as live/healthy and non-zero is unhealthy.
+                              items:
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                          type: object
+                        failureThreshold:
+                          description: |-
+                            Minimum consecutive failures for the probe to be considered failed after having succeeded.
+                            Defaults to 3. Minimum value is 1.
+                          format: int32
+                          type: integer
+                        grpc:
+                          description: GRPC specifies a GRPC HealthCheckRequest.
+                          properties:
+                            port:
+                              description: Port number of the gRPC service. Number
+                                must be in the range 1 to 65535.
+                              format: int32
+                              type: integer
+                            service:
+                              default: ""
+                              description: |-
+                                Service is the name of the service to place in the gRPC HealthCheckRequest
+                                (see https://github.com/grpc/grpc/blob/master/doc/health-checking.md).
+
+                                If this is not specified, the default behavior is defined by gRPC.
+                              type: string
+                          required:
+                          - port
+                          type: object
+                        httpGet:
+                          description: HTTPGet specifies an HTTP GET request to perform.
+                          properties:
+                            host:
+                              description: |-
+                                Host name to connect to, defaults to the pod IP. You probably want to set
+                                "Host" in httpHeaders instead.
+                              type: string
+                            httpHeaders:
+                              description: Custom headers to set in the request. HTTP
+                                allows repeated headers.
+                              items:
+                                description: HTTPHeader describes a custom header
+                                  to be used in HTTP probes
+                                properties:
+                                  name:
+                                    description: |-
+                                      The header field name.
+                                      This will be canonicalized upon output, so case-variant names will be understood as the same header.
+                                    type: string
+                                  value:
+                                    description: The header field value
+                                    type: string
+                                required:
+                                - name
+                                - value
+                                type: object
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            path:
+                              description: Path to access on the HTTP server.
+                              type: string
+                            port:
+                              anyOf:
+                              - type: integer
+                              - type: string
+                              description: |-
+                                Name or number of the port to access on the container.
+                                Number must be in the range 1 to 65535.
+                                Name must be an IANA_SVC_NAME.
+                              x-kubernetes-int-or-string: true
+                            scheme:
+                              description: |-
+                                Scheme to use for connecting to the host.
+                                Defaults to HTTP.
+                              type: string
+                          required:
+                          - port
+                          type: object
+                        initialDelaySeconds:
+                          description: |-
+                            Number of seconds after the container has started before liveness probes are initiated.
+                            More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                          format: int32
+                          type: integer
+                        periodSeconds:
+                          description: |-
+                            How often (in seconds) to perform the probe.
+                            Default to 10 seconds. Minimum value is 1.
+                          format: int32
+                          type: integer
+                        successThreshold:
+                          description: |-
+                            Minimum consecutive successes for the probe to be considered successful after having failed.
+                            Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
+                          format: int32
+                          type: integer
+                        tcpSocket:
+                          description: TCPSocket specifies a connection to a TCP port.
+                          properties:
+                            host:
+                              description: 'Optional: Host name to connect to, defaults
+                                to the pod IP.'
+                              type: string
+                            port:
+                              anyOf:
+                              - type: integer
+                              - type: string
+                              description: |-
+                                Number or name of the port to access on the container.
+                                Number must be in the range 1 to 65535.
+                                Name must be an IANA_SVC_NAME.
+                              x-kubernetes-int-or-string: true
+                          required:
+                          - port
+                          type: object
+                        terminationGracePeriodSeconds:
+                          description: |-
+                            Optional duration in seconds the pod needs to terminate gracefully upon probe failure.
+                            The grace period is the duration in seconds after the processes running in the pod are sent
+                            a termination signal and the time when the processes are forcibly halted with a kill signal.
+                            Set this value longer than the expected cleanup time for your process.
+                            If this value is nil, the pod's terminationGracePeriodSeconds will be used. Otherwise, this
+                            value overrides the value provided by the pod spec.
+                            Value must be non-negative integer. The value zero indicates stop immediately via
+                            the kill signal (no opportunity to shut down).
+                            This is a beta field and requires enabling ProbeTerminationGracePeriod feature gate.
+                            Minimum value is 1. spec.terminationGracePeriodSeconds is used if unset.
+                          format: int64
+                          type: integer
+                        timeoutSeconds:
+                          description: |-
+                            Number of seconds after which the probe times out.
+                            Defaults to 1 second. Minimum value is 1.
+                            More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                          format: int32
+                          type: integer
+                      type: object
+                    name:
+                      description: |-
+                        Name of the container specified as a DNS_LABEL.
+                        Each container in a pod must have a unique name (DNS_LABEL).
+                        Cannot be updated.
+                      type: string
+                    ports:
+                      description: |-
+                        List of ports to expose from the container. Not specifying a port here
+                        DOES NOT prevent that port from being exposed. Any port which is
+                        listening on the default "0.0.0.0" address inside a container will be
+                        accessible from the network.
+                        Modifying this array with strategic merge patch may corrupt the data.
+                        For more information See https://github.com/kubernetes/kubernetes/issues/108255.
+                        Cannot be updated.
+                      items:
+                        description: ContainerPort represents a network port in a
+                          single container.
+                        properties:
+                          containerPort:
+                            description: |-
+                              Number of port to expose on the pod's IP address.
+                              This must be a valid port number, 0 < x < 65536.
+                            format: int32
+                            type: integer
+                          hostIP:
+                            description: What host IP to bind the external port to.
+                            type: string
+                          hostPort:
+                            description: |-
+                              Number of port to expose on the host.
+                              If specified, this must be a valid port number, 0 < x < 65536.
+                              If HostNetwork is specified, this must match ContainerPort.
+                              Most containers do not need this.
+                            format: int32
+                            type: integer
+                          name:
+                            description: |-
+                              If specified, this must be an IANA_SVC_NAME and unique within the pod. Each
+                              named port in a pod must have a unique name. Name for the port that can be
+                              referred to by services.
+                            type: string
+                          protocol:
+                            default: TCP
+                            description: |-
+                              Protocol for port. Must be UDP, TCP, or SCTP.
+                              Defaults to "TCP".
+                            type: string
+                        required:
+                        - containerPort
+                        type: object
+                      type: array
+                      x-kubernetes-list-map-keys:
+                      - containerPort
+                      - protocol
+                      x-kubernetes-list-type: map
+                    readinessProbe:
+                      description: |-
+                        Periodic probe of container service readiness.
+                        Container will be removed from service endpoints if the probe fails.
+                        Cannot be updated.
+                        More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                      properties:
+                        exec:
+                          description: Exec specifies a command to execute in the
+                            container.
+                          properties:
+                            command:
+                              description: |-
+                                Command is the command line to execute inside the container, the working directory for the
+                                command  is root ('/') in the container's filesystem. The command is simply exec'd, it is
+                                not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use
+                                a shell, you need to explicitly call out to that shell.
+                                Exit status of 0 is treated as live/healthy and non-zero is unhealthy.
+                              items:
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                          type: object
+                        failureThreshold:
+                          description: |-
+                            Minimum consecutive failures for the probe to be considered failed after having succeeded.
+                            Defaults to 3. Minimum value is 1.
+                          format: int32
+                          type: integer
+                        grpc:
+                          description: GRPC specifies a GRPC HealthCheckRequest.
+                          properties:
+                            port:
+                              description: Port number of the gRPC service. Number
+                                must be in the range 1 to 65535.
+                              format: int32
+                              type: integer
+                            service:
+                              default: ""
+                              description: |-
+                                Service is the name of the service to place in the gRPC HealthCheckRequest
+                                (see https://github.com/grpc/grpc/blob/master/doc/health-checking.md).
+
+                                If this is not specified, the default behavior is defined by gRPC.
+                              type: string
+                          required:
+                          - port
+                          type: object
+                        httpGet:
+                          description: HTTPGet specifies an HTTP GET request to perform.
+                          properties:
+                            host:
+                              description: |-
+                                Host name to connect to, defaults to the pod IP. You probably want to set
+                                "Host" in httpHeaders instead.
+                              type: string
+                            httpHeaders:
+                              description: Custom headers to set in the request. HTTP
+                                allows repeated headers.
+                              items:
+                                description: HTTPHeader describes a custom header
+                                  to be used in HTTP probes
+                                properties:
+                                  name:
+                                    description: |-
+                                      The header field name.
+                                      This will be canonicalized upon output, so case-variant names will be understood as the same header.
+                                    type: string
+                                  value:
+                                    description: The header field value
+                                    type: string
+                                required:
+                                - name
+                                - value
+                                type: object
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            path:
+                              description: Path to access on the HTTP server.
+                              type: string
+                            port:
+                              anyOf:
+                              - type: integer
+                              - type: string
+                              description: |-
+                                Name or number of the port to access on the container.
+                                Number must be in the range 1 to 65535.
+                                Name must be an IANA_SVC_NAME.
+                              x-kubernetes-int-or-string: true
+                            scheme:
+                              description: |-
+                                Scheme to use for connecting to the host.
+                                Defaults to HTTP.
+                              type: string
+                          required:
+                          - port
+                          type: object
+                        initialDelaySeconds:
+                          description: |-
+                            Number of seconds after the container has started before liveness probes are initiated.
+                            More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                          format: int32
+                          type: integer
+                        periodSeconds:
+                          description: |-
+                            How often (in seconds) to perform the probe.
+                            Default to 10 seconds. Minimum value is 1.
+                          format: int32
+                          type: integer
+                        successThreshold:
+                          description: |-
+                            Minimum consecutive successes for the probe to be considered successful after having failed.
+                            Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
+                          format: int32
+                          type: integer
+                        tcpSocket:
+                          description: TCPSocket specifies a connection to a TCP port.
+                          properties:
+                            host:
+                              description: 'Optional: Host name to connect to, defaults
+                                to the pod IP.'
+                              type: string
+                            port:
+                              anyOf:
+                              - type: integer
+                              - type: string
+                              description: |-
+                                Number or name of the port to access on the container.
+                                Number must be in the range 1 to 65535.
+                                Name must be an IANA_SVC_NAME.
+                              x-kubernetes-int-or-string: true
+                          required:
+                          - port
+                          type: object
+                        terminationGracePeriodSeconds:
+                          description: |-
+                            Optional duration in seconds the pod needs to terminate gracefully upon probe failure.
+                            The grace period is the duration in seconds after the processes running in the pod are sent
+                            a termination signal and the time when the processes are forcibly halted with a kill signal.
+                            Set this value longer than the expected cleanup time for your process.
+                            If this value is nil, the pod's terminationGracePeriodSeconds will be used. Otherwise, this
+                            value overrides the value provided by the pod spec.
+                            Value must be non-negative integer. The value zero indicates stop immediately via
+                            the kill signal (no opportunity to shut down).
+                            This is a beta field and requires enabling ProbeTerminationGracePeriod feature gate.
+                            Minimum value is 1. spec.terminationGracePeriodSeconds is used if unset.
+                          format: int64
+                          type: integer
+                        timeoutSeconds:
+                          description: |-
+                            Number of seconds after which the probe times out.
+                            Defaults to 1 second. Minimum value is 1.
+                            More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                          format: int32
+                          type: integer
+                      type: object
+                    resizePolicy:
+                      description: Resources resize policy for the container.
+                      items:
+                        description: ContainerResizePolicy represents resource resize
+                          policy for the container.
+                        properties:
+                          resourceName:
+                            description: |-
+                              Name of the resource to which this resource resize policy applies.
+                              Supported values: cpu, memory.
+                            type: string
+                          restartPolicy:
+                            description: |-
+                              Restart policy to apply when specified resource is resized.
+                              If not specified, it defaults to NotRequired.
+                            type: string
+                        required:
+                        - resourceName
+                        - restartPolicy
+                        type: object
+                      type: array
+                      x-kubernetes-list-type: atomic
+                    resources:
+                      description: |-
+                        Compute Resources required by this container.
+                        Cannot be updated.
+                        More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+                      properties:
+                        claims:
+                          description: |-
+                            Claims lists the names of resources, defined in spec.resourceClaims,
+                            that are used by this container.
+
+                            This field depends on the
+                            DynamicResourceAllocation feature gate.
+
+                            This field is immutable. It can only be set for containers.
+                          items:
+                            description: ResourceClaim references one entry in PodSpec.ResourceClaims.
+                            properties:
+                              name:
+                                description: |-
+                                  Name must match the name of one entry in pod.spec.resourceClaims of
+                                  the Pod where this field is used. It makes that resource available
+                                  inside a container.
+                                type: string
+                              request:
+                                description: |-
+                                  Request is the name chosen for a request in the referenced claim.
+                                  If empty, everything from the claim is made available, otherwise
+                                  only the result of this request.
+                                type: string
+                            required:
+                            - name
+                            type: object
+                          type: array
+                          x-kubernetes-list-map-keys:
+                          - name
+                          x-kubernetes-list-type: map
+                        limits:
+                          additionalProperties:
+                            anyOf:
+                            - type: integer
+                            - type: string
+                            pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                            x-kubernetes-int-or-string: true
+                          description: |-
+                            Limits describes the maximum amount of compute resources allowed.
+                            More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+                          type: object
+                        requests:
+                          additionalProperties:
+                            anyOf:
+                            - type: integer
+                            - type: string
+                            pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                            x-kubernetes-int-or-string: true
+                          description: |-
+                            Requests describes the minimum amount of compute resources required.
+                            If Requests is omitted for a container, it defaults to Limits if that is explicitly specified,
+                            otherwise to an implementation-defined value. Requests cannot exceed Limits.
+                            More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+                          type: object
+                      type: object
+                    restartPolicy:
+                      description: |-
+                        RestartPolicy defines the restart behavior of individual containers in a pod.
+                        This overrides the pod-level restart policy. When this field is not specified,
+                        the restart behavior is defined by the Pod's restart policy and the container type.
+                        Additionally, setting the RestartPolicy as "Always" for the init container will
+                        have the following effect:
+                        this init container will be continually restarted on
+                        exit until all regular containers have terminated. Once all regular
+                        containers have completed, all init containers with restartPolicy "Always"
+                        will be shut down. This lifecycle differs from normal init containers and
+                        is often referred to as a "sidecar" container. Although this init
+                        container still starts in the init container sequence, it does not wait
+                        for the container to complete before proceeding to the next init
+                        container. Instead, the next init container starts immediately after this
+                        init container is started, or after any startupProbe has successfully
+                        completed.
+                      type: string
+                    restartPolicyRules:
+                      description: |-
+                        Represents a list of rules to be checked to determine if the
+                        container should be restarted on exit. The rules are evaluated in
+                        order. Once a rule matches a container exit condition, the remaining
+                        rules are ignored. If no rule matches the container exit condition,
+                        the Container-level restart policy determines the whether the container
+                        is restarted or not. Constraints on the rules:
+                        - At most 20 rules are allowed.
+                        - Rules can have the same action.
+                        - Identical rules are not forbidden in validations.
+                        When rules are specified, container MUST set RestartPolicy explicitly
+                        even it if matches the Pod's RestartPolicy.
+                      items:
+                        description: ContainerRestartRule describes how a container
+                          exit is handled.
+                        properties:
+                          action:
+                            description: |-
+                              Specifies the action taken on a container exit if the requirements
+                              are satisfied. The only possible value is "Restart" to restart the
+                              container.
+                            type: string
+                          exitCodes:
+                            description: Represents the exit codes to check on container
+                              exits.
+                            properties:
+                              operator:
+                                description: |-
+                                  Represents the relationship between the container exit code(s) and the
+                                  specified values. Possible values are:
+                                  - In: the requirement is satisfied if the container exit code is in the
+                                    set of specified values.
+                                  - NotIn: the requirement is satisfied if the container exit code is
+                                    not in the set of specified values.
+                                type: string
+                              values:
+                                description: |-
+                                  Specifies the set of values to check for container exit codes.
+                                  At most 255 elements are allowed.
+                                items:
+                                  format: int32
+                                  type: integer
+                                type: array
+                                x-kubernetes-list-type: set
+                            required:
+                            - operator
+                            type: object
+                        required:
+                        - action
+                        type: object
+                      type: array
+                      x-kubernetes-list-type: atomic
+                    securityContext:
+                      description: |-
+                        SecurityContext defines the security options the container should be run with.
+                        If set, the fields of SecurityContext override the equivalent fields of PodSecurityContext.
+                        More info: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/
+                      properties:
+                        allowPrivilegeEscalation:
+                          description: |-
+                            AllowPrivilegeEscalation controls whether a process can gain more
+                            privileges than its parent process. This bool directly controls if
+                            the no_new_privs flag will be set on the container process.
+                            AllowPrivilegeEscalation is true always when the container is:
+                            1) run as Privileged
+                            2) has CAP_SYS_ADMIN
+                            Note that this field cannot be set when spec.os.name is windows.
+                          type: boolean
+                        appArmorProfile:
+                          description: |-
+                            appArmorProfile is the AppArmor options to use by this container. If set, this profile
+                            overrides the pod's appArmorProfile.
+                            Note that this field cannot be set when spec.os.name is windows.
+                          properties:
+                            localhostProfile:
+                              description: |-
+                                localhostProfile indicates a profile loaded on the node that should be used.
+                                The profile must be preconfigured on the node to work.
+                                Must match the loaded name of the profile.
+                                Must be set if and only if type is "Localhost".
+                              type: string
+                            type:
+                              description: |-
+                                type indicates which kind of AppArmor profile will be applied.
+                                Valid options are:
+                                  Localhost - a profile pre-loaded on the node.
+                                  RuntimeDefault - the container runtime's default profile.
+                                  Unconfined - no AppArmor enforcement.
+                              type: string
+                          required:
+                          - type
+                          type: object
+                        capabilities:
+                          description: |-
+                            The capabilities to add/drop when running containers.
+                            Defaults to the default set of capabilities granted by the container runtime.
+                            Note that this field cannot be set when spec.os.name is windows.
+                          properties:
+                            add:
+                              description: Added capabilities
+                              items:
+                                description: Capability represent POSIX capabilities
+                                  type
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            drop:
+                              description: Removed capabilities
+                              items:
+                                description: Capability represent POSIX capabilities
+                                  type
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                          type: object
+                        privileged:
+                          description: |-
+                            Run container in privileged mode.
+                            Processes in privileged containers are essentially equivalent to root on the host.
+                            Defaults to false.
+                            Note that this field cannot be set when spec.os.name is windows.
+                          type: boolean
+                        procMount:
+                          description: |-
+                            procMount denotes the type of proc mount to use for the containers.
+                            The default value is Default which uses the container runtime defaults for
+                            readonly paths and masked paths.
+                            This requires the ProcMountType feature flag to be enabled.
+                            Note that this field cannot be set when spec.os.name is windows.
+                          type: string
+                        readOnlyRootFilesystem:
+                          description: |-
+                            Whether this container has a read-only root filesystem.
+                            Default is false.
+                            Note that this field cannot be set when spec.os.name is windows.
+                          type: boolean
+                        runAsGroup:
+                          description: |-
+                            The GID to run the entrypoint of the container process.
+                            Uses runtime default if unset.
+                            May also be set in PodSecurityContext.  If set in both SecurityContext and
+                            PodSecurityContext, the value specified in SecurityContext takes precedence.
+                            Note that this field cannot be set when spec.os.name is windows.
+                          format: int64
+                          type: integer
+                        runAsNonRoot:
+                          description: |-
+                            Indicates that the container must run as a non-root user.
+                            If true, the Kubelet will validate the image at runtime to ensure that it
+                            does not run as UID 0 (root) and fail to start the container if it does.
+                            If unset or false, no such validation will be performed.
+                            May also be set in PodSecurityContext.  If set in both SecurityContext and
+                            PodSecurityContext, the value specified in SecurityContext takes precedence.
+                          type: boolean
+                        runAsUser:
+                          description: |-
+                            The UID to run the entrypoint of the container process.
+                            Defaults to user specified in image metadata if unspecified.
+                            May also be set in PodSecurityContext.  If set in both SecurityContext and
+                            PodSecurityContext, the value specified in SecurityContext takes precedence.
+                            Note that this field cannot be set when spec.os.name is windows.
+                          format: int64
+                          type: integer
+                        seLinuxOptions:
+                          description: |-
+                            The SELinux context to be applied to the container.
+                            If unspecified, the container runtime will allocate a random SELinux context for each
+                            container.  May also be set in PodSecurityContext.  If set in both SecurityContext and
+                            PodSecurityContext, the value specified in SecurityContext takes precedence.
+                            Note that this field cannot be set when spec.os.name is windows.
+                          properties:
+                            level:
+                              description: Level is SELinux level label that applies
+                                to the container.
+                              type: string
+                            role:
+                              description: Role is a SELinux role label that applies
+                                to the container.
+                              type: string
+                            type:
+                              description: Type is a SELinux type label that applies
+                                to the container.
+                              type: string
+                            user:
+                              description: User is a SELinux user label that applies
+                                to the container.
+                              type: string
+                          type: object
+                        seccompProfile:
+                          description: |-
+                            The seccomp options to use by this container. If seccomp options are
+                            provided at both the pod & container level, the container options
+                            override the pod options.
+                            Note that this field cannot be set when spec.os.name is windows.
+                          properties:
+                            localhostProfile:
+                              description: |-
+                                localhostProfile indicates a profile defined in a file on the node should be used.
+                                The profile must be preconfigured on the node to work.
+                                Must be a descending path, relative to the kubelet's configured seccomp profile location.
+                                Must be set if type is "Localhost". Must NOT be set for any other type.
+                              type: string
+                            type:
+                              description: |-
+                                type indicates which kind of seccomp profile will be applied.
+                                Valid options are:
+
+                                Localhost - a profile defined in a file on the node should be used.
+                                RuntimeDefault - the container runtime default profile should be used.
+                                Unconfined - no profile should be applied.
+                              type: string
+                          required:
+                          - type
+                          type: object
+                        windowsOptions:
+                          description: |-
+                            The Windows specific settings applied to all containers.
+                            If unspecified, the options from the PodSecurityContext will be used.
+                            If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence.
+                            Note that this field cannot be set when spec.os.name is linux.
+                          properties:
+                            gmsaCredentialSpec:
+                              description: |-
+                                GMSACredentialSpec is where the GMSA admission webhook
+                                (https://github.com/kubernetes-sigs/windows-gmsa) inlines the contents of the
+                                GMSA credential spec named by the GMSACredentialSpecName field.
+                              type: string
+                            gmsaCredentialSpecName:
+                              description: GMSACredentialSpecName is the name of the
+                                GMSA credential spec to use.
+                              type: string
+                            hostProcess:
+                              description: |-
+                                HostProcess determines if a container should be run as a 'Host Process' container.
+                                All of a Pod's containers must have the same effective HostProcess value
+                                (it is not allowed to have a mix of HostProcess containers and non-HostProcess containers).
+                                In addition, if HostProcess is true then HostNetwork must also be set to true.
+                              type: boolean
+                            runAsUserName:
+                              description: |-
+                                The UserName in Windows to run the entrypoint of the container process.
+                                Defaults to the user specified in image metadata if unspecified.
+                                May also be set in PodSecurityContext. If set in both SecurityContext and
+                                PodSecurityContext, the value specified in SecurityContext takes precedence.
+                              type: string
+                          type: object
+                      type: object
+                    startupProbe:
+                      description: |-
+                        StartupProbe indicates that the Pod has successfully initialized.
+                        If specified, no other probes are executed until this completes successfully.
+                        If this probe fails, the Pod will be restarted, just as if the livenessProbe failed.
+                        This can be used to provide different probe parameters at the beginning of a Pod's lifecycle,
+                        when it might take a long time to load data or warm a cache, than during steady-state operation.
+                        This cannot be updated.
+                        More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                      properties:
+                        exec:
+                          description: Exec specifies a command to execute in the
+                            container.
+                          properties:
+                            command:
+                              description: |-
+                                Command is the command line to execute inside the container, the working directory for the
+                                command  is root ('/') in the container's filesystem. The command is simply exec'd, it is
+                                not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use
+                                a shell, you need to explicitly call out to that shell.
+                                Exit status of 0 is treated as live/healthy and non-zero is unhealthy.
+                              items:
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                          type: object
+                        failureThreshold:
+                          description: |-
+                            Minimum consecutive failures for the probe to be considered failed after having succeeded.
+                            Defaults to 3. Minimum value is 1.
+                          format: int32
+                          type: integer
+                        grpc:
+                          description: GRPC specifies a GRPC HealthCheckRequest.
+                          properties:
+                            port:
+                              description: Port number of the gRPC service. Number
+                                must be in the range 1 to 65535.
+                              format: int32
+                              type: integer
+                            service:
+                              default: ""
+                              description: |-
+                                Service is the name of the service to place in the gRPC HealthCheckRequest
+                                (see https://github.com/grpc/grpc/blob/master/doc/health-checking.md).
+
+                                If this is not specified, the default behavior is defined by gRPC.
+                              type: string
+                          required:
+                          - port
+                          type: object
+                        httpGet:
+                          description: HTTPGet specifies an HTTP GET request to perform.
+                          properties:
+                            host:
+                              description: |-
+                                Host name to connect to, defaults to the pod IP. You probably want to set
+                                "Host" in httpHeaders instead.
+                              type: string
+                            httpHeaders:
+                              description: Custom headers to set in the request. HTTP
+                                allows repeated headers.
+                              items:
+                                description: HTTPHeader describes a custom header
+                                  to be used in HTTP probes
+                                properties:
+                                  name:
+                                    description: |-
+                                      The header field name.
+                                      This will be canonicalized upon output, so case-variant names will be understood as the same header.
+                                    type: string
+                                  value:
+                                    description: The header field value
+                                    type: string
+                                required:
+                                - name
+                                - value
+                                type: object
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            path:
+                              description: Path to access on the HTTP server.
+                              type: string
+                            port:
+                              anyOf:
+                              - type: integer
+                              - type: string
+                              description: |-
+                                Name or number of the port to access on the container.
+                                Number must be in the range 1 to 65535.
+                                Name must be an IANA_SVC_NAME.
+                              x-kubernetes-int-or-string: true
+                            scheme:
+                              description: |-
+                                Scheme to use for connecting to the host.
+                                Defaults to HTTP.
+                              type: string
+                          required:
+                          - port
+                          type: object
+                        initialDelaySeconds:
+                          description: |-
+                            Number of seconds after the container has started before liveness probes are initiated.
+                            More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                          format: int32
+                          type: integer
+                        periodSeconds:
+                          description: |-
+                            How often (in seconds) to perform the probe.
+                            Default to 10 seconds. Minimum value is 1.
+                          format: int32
+                          type: integer
+                        successThreshold:
+                          description: |-
+                            Minimum consecutive successes for the probe to be considered successful after having failed.
+                            Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
+                          format: int32
+                          type: integer
+                        tcpSocket:
+                          description: TCPSocket specifies a connection to a TCP port.
+                          properties:
+                            host:
+                              description: 'Optional: Host name to connect to, defaults
+                                to the pod IP.'
+                              type: string
+                            port:
+                              anyOf:
+                              - type: integer
+                              - type: string
+                              description: |-
+                                Number or name of the port to access on the container.
+                                Number must be in the range 1 to 65535.
+                                Name must be an IANA_SVC_NAME.
+                              x-kubernetes-int-or-string: true
+                          required:
+                          - port
+                          type: object
+                        terminationGracePeriodSeconds:
+                          description: |-
+                            Optional duration in seconds the pod needs to terminate gracefully upon probe failure.
+                            The grace period is the duration in seconds after the processes running in the pod are sent
+                            a termination signal and the time when the processes are forcibly halted with a kill signal.
+                            Set this value longer than the expected cleanup time for your process.
+                            If this value is nil, the pod's terminationGracePeriodSeconds will be used. Otherwise, this
+                            value overrides the value provided by the pod spec.
+                            Value must be non-negative integer. The value zero indicates stop immediately via
+                            the kill signal (no opportunity to shut down).
+                            This is a beta field and requires enabling ProbeTerminationGracePeriod feature gate.
+                            Minimum value is 1. spec.terminationGracePeriodSeconds is used if unset.
+                          format: int64
+                          type: integer
+                        timeoutSeconds:
+                          description: |-
+                            Number of seconds after which the probe times out.
+                            Defaults to 1 second. Minimum value is 1.
+                            More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                          format: int32
+                          type: integer
+                      type: object
+                    stdin:
+                      description: |-
+                        Whether this container should allocate a buffer for stdin in the container runtime. If this
+                        is not set, reads from stdin in the container will always result in EOF.
+                        Default is false.
+                      type: boolean
+                    stdinOnce:
+                      description: |-
+                        Whether the container runtime should close the stdin channel after it has been opened by
+                        a single attach. When stdin is true the stdin stream will remain open across multiple attach
+                        sessions. If stdinOnce is set to true, stdin is opened on container start, is empty until the
+                        first client attaches to stdin, and then remains open and accepts data until the client disconnects,
+                        at which time stdin is closed and remains closed until the container is restarted. If this
+                        flag is false, a container processes that reads from stdin will never receive an EOF.
+                        Default is false
+                      type: boolean
+                    terminationMessagePath:
+                      description: |-
+                        Optional: Path at which the file to which the container's termination message
+                        will be written is mounted into the container's filesystem.
+                        Message written is intended to be brief final status, such as an assertion failure message.
+                        Will be truncated by the node if greater than 4096 bytes. The total message length across
+                        all containers will be limited to 12kb.
+                        Defaults to /dev/termination-log.
+                        Cannot be updated.
+                      type: string
+                    terminationMessagePolicy:
+                      description: |-
+                        Indicate how the termination message should be populated. File will use the contents of
+                        terminationMessagePath to populate the container status message on both success and failure.
+                        FallbackToLogsOnError will use the last chunk of container log output if the termination
+                        message file is empty and the container exited with an error.
+                        The log output is limited to 2048 bytes or 80 lines, whichever is smaller.
+                        Defaults to File.
+                        Cannot be updated.
+                      type: string
+                    tty:
+                      description: |-
+                        Whether this container should allocate a TTY for itself, also requires 'stdin' to be true.
+                        Default is false.
+                      type: boolean
+                    volumeDevices:
+                      description: volumeDevices is the list of block devices to be
+                        used by the container.
+                      items:
+                        description: volumeDevice describes a mapping of a raw block
+                          device within a container.
+                        properties:
+                          devicePath:
+                            description: devicePath is the path inside of the container
+                              that the device will be mapped to.
+                            type: string
+                          name:
+                            description: name must match the name of a persistentVolumeClaim
+                              in the pod
+                            type: string
+                        required:
+                        - devicePath
+                        - name
+                        type: object
+                      type: array
+                      x-kubernetes-list-map-keys:
+                      - devicePath
+                      x-kubernetes-list-type: map
+                    volumeMounts:
+                      description: |-
+                        Pod volumes to mount into the container's filesystem.
+                        Cannot be updated.
+                      items:
+                        description: VolumeMount describes a mounting of a Volume
+                          within a container.
+                        properties:
+                          mountPath:
+                            description: |-
+                              Path within the container at which the volume should be mounted.  Must
+                              not contain ':'.
+                            type: string
+                          mountPropagation:
+                            description: |-
+                              mountPropagation determines how mounts are propagated from the host
+                              to container and the other way around.
+                              When not set, MountPropagationNone is used.
+                              This field is beta in 1.10.
+                              When RecursiveReadOnly is set to IfPossible or to Enabled, MountPropagation must be None or unspecified
+                              (which defaults to None).
+                            type: string
+                          name:
+                            description: This must match the Name of a Volume.
+                            type: string
+                          readOnly:
+                            description: |-
+                              Mounted read-only if true, read-write otherwise (false or unspecified).
+                              Defaults to false.
+                            type: boolean
+                          recursiveReadOnly:
+                            description: |-
+                              RecursiveReadOnly specifies whether read-only mounts should be handled
+                              recursively.
+
+                              If ReadOnly is false, this field has no meaning and must be unspecified.
+
+                              If ReadOnly is true, and this field is set to Disabled, the mount is not made
+                              recursively read-only.  If this field is set to IfPossible, the mount is made
+                              recursively read-only, if it is supported by the container runtime.  If this
+                              field is set to Enabled, the mount is made recursively read-only if it is
+                              supported by the container runtime, otherwise the pod will not be started and
+                              an error will be generated to indicate the reason.
+
+                              If this field is set to IfPossible or Enabled, MountPropagation must be set to
+                              None (or be unspecified, which defaults to None).
+
+                              If this field is not specified, it is treated as an equivalent of Disabled.
+                            type: string
+                          subPath:
+                            description: |-
+                              Path within the volume from which the container's volume should be mounted.
+                              Defaults to "" (volume's root).
+                            type: string
+                          subPathExpr:
+                            description: |-
+                              Expanded path within the volume from which the container's volume should be mounted.
+                              Behaves similarly to SubPath but environment variable references $(VAR_NAME) are expanded using the container's environment.
+                              Defaults to "" (volume's root).
+                              SubPathExpr and SubPath are mutually exclusive.
+                            type: string
+                        required:
+                        - mountPath
+                        - name
+                        type: object
+                      type: array
+                      x-kubernetes-list-map-keys:
+                      - mountPath
+                      x-kubernetes-list-type: map
+                    workingDir:
+                      description: |-
+                        Container's working directory.
+                        If not specified, the container runtime's default will be used, which
+                        might be configured in the container image.
+                        Cannot be updated.
+                      type: string
+                  required:
+                  - name
+                  type: object
+                type: array
+              convertClassicHistogramsToNHCB:
+                description: |-
+                  convertClassicHistogramsToNHCB defines whether to convert all scraped classic histograms into a native
+                  histogram with custom buckets.
+
+                  It requires Prometheus >= v3.4.0.
+                type: boolean
+              disableCompaction:
+                description: |-
+                  disableCompaction when true, the Prometheus compaction is disabled.
+                  When `spec.thanos.objectStorageConfig` or `spec.objectStorageConfigFile` are defined, the operator automatically
+                  disables block compaction to avoid race conditions during block uploads (as the Thanos documentation recommends).
+                type: boolean
+              dnsConfig:
+                description: dnsConfig defines the DNS configuration for the pods.
+                properties:
+                  nameservers:
+                    description: |-
+                      nameservers defines the list of DNS name server IP addresses.
+                      This will be appended to the base nameservers generated from DNSPolicy.
+                    items:
+                      minLength: 1
+                      type: string
+                    type: array
+                    x-kubernetes-list-type: set
+                  options:
+                    description: |-
+                      options defines the list of DNS resolver options.
+                      This will be merged with the base options generated from DNSPolicy.
+                      Resolution options given in Options
+                      will override those that appear in the base DNSPolicy.
+                    items:
+                      description: PodDNSConfigOption defines DNS resolver options
+                        of a pod.
+                      properties:
+                        name:
+                          description: name is required and must be unique.
+                          minLength: 1
+                          type: string
+                        value:
+                          description: value is optional.
+                          type: string
+                      required:
+                      - name
+                      type: object
+                    type: array
+                    x-kubernetes-list-map-keys:
+                    - name
+                    x-kubernetes-list-type: map
+                  searches:
+                    description: |-
+                      searches defines the list of DNS search domains for host-name lookup.
+                      This will be appended to the base search paths generated from DNSPolicy.
+                    items:
+                      minLength: 1
+                      type: string
+                    type: array
+                    x-kubernetes-list-type: set
+                type: object
+              dnsPolicy:
+                description: dnsPolicy defines the DNS policy for the pods.
+                enum:
+                - ClusterFirstWithHostNet
+                - ClusterFirst
+                - Default
+                - None
+                type: string
+              enableAdminAPI:
+                description: |-
+                  enableAdminAPI defines access to the Prometheus web admin API.
+
+                  WARNING: Enabling the admin APIs enables mutating endpoints, to delete data,
+                  shutdown Prometheus, and more. Enabling this should be done with care and the
+                  user is advised to add additional authentication authorization via a proxy to
+                  ensure only clients authorized to perform these actions can do so.
+
+                  For more information:
+                  https://prometheus.io/docs/prometheus/latest/querying/api/#tsdb-admin-apis
+                type: boolean
+              enableFeatures:
+                description: |-
+                  enableFeatures enables access to Prometheus feature flags. By default, no features are enabled.
+
+                  Enabling features which are disabled by default is entirely outside the
+                  scope of what the maintainers will support and by doing so, you accept
+                  that this behaviour may break at any time without notice.
+
+                  For more information see https://prometheus.io/docs/prometheus/latest/feature_flags/
+                items:
+                  minLength: 1
+                  type: string
+                type: array
+                x-kubernetes-list-type: set
+              enableOTLPReceiver:
+                description: |-
+                  enableOTLPReceiver defines the Prometheus to be used as a receiver for the OTLP Metrics protocol.
+
+                  Note that the OTLP receiver endpoint is automatically enabled if `.spec.otlpConfig` is defined.
+
+                  It requires Prometheus >= v2.47.0.
+                type: boolean
+              enableRemoteWriteReceiver:
+                description: |-
+                  enableRemoteWriteReceiver defines the Prometheus to be used as a receiver for the Prometheus remote
+                  write protocol.
+
+                  WARNING: This is not considered an efficient way of ingesting samples.
+                  Use it with caution for specific low-volume use cases.
+                  It is not suitable for replacing the ingestion via scraping and turning
+                  Prometheus into a push-based metrics collection system.
+                  For more information see https://prometheus.io/docs/prometheus/latest/querying/api/#remote-write-receiver
+
+                  It requires Prometheus >= v2.33.0.
+                type: boolean
+              enableServiceLinks:
+                description: enableServiceLinks defines whether information about
+                  services should be injected into pod's environment variables
+                type: boolean
+              enforcedBodySizeLimit:
+                description: |-
+                  enforcedBodySizeLimit when defined specifies a global limit on the size
+                  of uncompressed response body that will be accepted by Prometheus.
+                  Targets responding with a body larger than this many bytes will cause
+                  the scrape to fail.
+
+                  It requires Prometheus >= v2.28.0.
+
+                  When both `enforcedBodySizeLimit` and `bodySizeLimit` are defined and greater than zero, the following rules apply:
+                  * Scrape objects without a defined bodySizeLimit value will inherit the global bodySizeLimit value (Prometheus >= 2.45.0) or the enforcedBodySizeLimit value (Prometheus < v2.45.0).
+                    If Prometheus version is >= 2.45.0 and the `enforcedBodySizeLimit` is greater than the `bodySizeLimit`, the `bodySizeLimit` will be set to `enforcedBodySizeLimit`.
+                  * Scrape objects with a bodySizeLimit value less than or equal to enforcedBodySizeLimit keep their specific value.
+                  * Scrape objects with a bodySizeLimit value greater than enforcedBodySizeLimit are set to enforcedBodySizeLimit.
+                pattern: (^0|([0-9]*[.])?[0-9]+((K|M|G|T|E|P)i?)?B)$
+                type: string
+              enforcedKeepDroppedTargets:
+                description: |-
+                  enforcedKeepDroppedTargets when defined specifies a global limit on the number of targets
+                  dropped by relabeling that will be kept in memory. The value overrides
+                  any `spec.keepDroppedTargets` set by
+                  ServiceMonitor, PodMonitor, Probe objects unless `spec.keepDroppedTargets` is
+                  greater than zero and less than `spec.enforcedKeepDroppedTargets`.
+
+                  It requires Prometheus >= v2.47.0.
+
+                  When both `enforcedKeepDroppedTargets` and `keepDroppedTargets` are defined and greater than zero, the following rules apply:
+                  * Scrape objects without a defined keepDroppedTargets value will inherit the global keepDroppedTargets value (Prometheus >= 2.45.0) or the enforcedKeepDroppedTargets value (Prometheus < v2.45.0).
+                    If Prometheus version is >= 2.45.0 and the `enforcedKeepDroppedTargets` is greater than the `keepDroppedTargets`, the `keepDroppedTargets` will be set to `enforcedKeepDroppedTargets`.
+                  * Scrape objects with a keepDroppedTargets value less than or equal to enforcedKeepDroppedTargets keep their specific value.
+                  * Scrape objects with a keepDroppedTargets value greater than enforcedKeepDroppedTargets are set to enforcedKeepDroppedTargets.
+                format: int64
+                type: integer
+              enforcedLabelLimit:
+                description: |-
+                  enforcedLabelLimit when defined specifies a global limit on the number
+                  of labels per sample. The value overrides any `spec.labelLimit` set by
+                  ServiceMonitor, PodMonitor, Probe objects unless `spec.labelLimit` is
+                  greater than zero and less than `spec.enforcedLabelLimit`.
+
+                  It requires Prometheus >= v2.27.0.
+
+                  When both `enforcedLabelLimit` and `labelLimit` are defined and greater than zero, the following rules apply:
+                  * Scrape objects without a defined labelLimit value will inherit the global labelLimit value (Prometheus >= 2.45.0) or the enforcedLabelLimit value (Prometheus < v2.45.0).
+                    If Prometheus version is >= 2.45.0 and the `enforcedLabelLimit` is greater than the `labelLimit`, the `labelLimit` will be set to `enforcedLabelLimit`.
+                  * Scrape objects with a labelLimit value less than or equal to enforcedLabelLimit keep their specific value.
+                  * Scrape objects with a labelLimit value greater than enforcedLabelLimit are set to enforcedLabelLimit.
+                format: int64
+                type: integer
+              enforcedLabelNameLengthLimit:
+                description: |-
+                  enforcedLabelNameLengthLimit when defined specifies a global limit on the length
+                  of labels name per sample. The value overrides any `spec.labelNameLengthLimit` set by
+                  ServiceMonitor, PodMonitor, Probe objects unless `spec.labelNameLengthLimit` is
+                  greater than zero and less than `spec.enforcedLabelNameLengthLimit`.
+
+                  It requires Prometheus >= v2.27.0.
+
+                  When both `enforcedLabelNameLengthLimit` and `labelNameLengthLimit` are defined and greater than zero, the following rules apply:
+                  * Scrape objects without a defined labelNameLengthLimit value will inherit the global labelNameLengthLimit value (Prometheus >= 2.45.0) or the enforcedLabelNameLengthLimit value (Prometheus < v2.45.0).
+                    If Prometheus version is >= 2.45.0 and the `enforcedLabelNameLengthLimit` is greater than the `labelNameLengthLimit`, the `labelNameLengthLimit` will be set to `enforcedLabelNameLengthLimit`.
+                  * Scrape objects with a labelNameLengthLimit value less than or equal to enforcedLabelNameLengthLimit keep their specific value.
+                  * Scrape objects with a labelNameLengthLimit value greater than enforcedLabelNameLengthLimit are set to enforcedLabelNameLengthLimit.
+                format: int64
+                type: integer
+              enforcedLabelValueLengthLimit:
+                description: |-
+                  enforcedLabelValueLengthLimit when not null defines a global limit on the length
+                  of labels value per sample. The value overrides any `spec.labelValueLengthLimit` set by
+                  ServiceMonitor, PodMonitor, Probe objects unless `spec.labelValueLengthLimit` is
+                  greater than zero and less than `spec.enforcedLabelValueLengthLimit`.
+
+                  It requires Prometheus >= v2.27.0.
+
+                  When both `enforcedLabelValueLengthLimit` and `labelValueLengthLimit` are defined and greater than zero, the following rules apply:
+                  * Scrape objects without a defined labelValueLengthLimit value will inherit the global labelValueLengthLimit value (Prometheus >= 2.45.0) or the enforcedLabelValueLengthLimit value (Prometheus < v2.45.0).
+                    If Prometheus version is >= 2.45.0 and the `enforcedLabelValueLengthLimit` is greater than the `labelValueLengthLimit`, the `labelValueLengthLimit` will be set to `enforcedLabelValueLengthLimit`.
+                  * Scrape objects with a labelValueLengthLimit value less than or equal to enforcedLabelValueLengthLimit keep their specific value.
+                  * Scrape objects with a labelValueLengthLimit value greater than enforcedLabelValueLengthLimit are set to enforcedLabelValueLengthLimit.
+                format: int64
+                type: integer
+              enforcedNamespaceLabel:
+                description: |-
+                  enforcedNamespaceLabel when not empty, a label will be added to:
+
+                  1. All metrics scraped from `ServiceMonitor`, `PodMonitor`, `Probe` and `ScrapeConfig` objects.
+                  2. All metrics generated from recording rules defined in `PrometheusRule` objects.
+                  3. All alerts generated from alerting rules defined in `PrometheusRule` objects.
+                  4. All vector selectors of PromQL expressions defined in `PrometheusRule` objects.
+
+                  The label will not added for objects referenced in `spec.excludedFromEnforcement`.
+
+                  The label's name is this field's value.
+                  The label's value is the namespace of the `ServiceMonitor`,
+                  `PodMonitor`, `Probe`, `PrometheusRule` or `ScrapeConfig` object.
+                type: string
+              enforcedSampleLimit:
+                description: |-
+                  enforcedSampleLimit when defined specifies a global limit on the number
+                  of scraped samples that will be accepted. This overrides any
+                  `spec.sampleLimit` set by ServiceMonitor, PodMonitor, Probe objects
+                  unless `spec.sampleLimit` is greater than zero and less than
+                  `spec.enforcedSampleLimit`.
+
+                  It is meant to be used by admins to keep the overall number of
+                  samples/series under a desired limit.
+
+                  When both `enforcedSampleLimit` and `sampleLimit` are defined and greater than zero, the following rules apply:
+                  * Scrape objects without a defined sampleLimit value will inherit the global sampleLimit value (Prometheus >= 2.45.0) or the enforcedSampleLimit value (Prometheus < v2.45.0).
+                    If Prometheus version is >= 2.45.0 and the `enforcedSampleLimit` is greater than the `sampleLimit`, the `sampleLimit` will be set to `enforcedSampleLimit`.
+                  * Scrape objects with a sampleLimit value less than or equal to enforcedSampleLimit keep their specific value.
+                  * Scrape objects with a sampleLimit value greater than enforcedSampleLimit are set to enforcedSampleLimit.
+                format: int64
+                type: integer
+              enforcedTargetLimit:
+                description: |-
+                  enforcedTargetLimit when defined specifies a global limit on the number
+                  of scraped targets. The value overrides any `spec.targetLimit` set by
+                  ServiceMonitor, PodMonitor, Probe objects unless `spec.targetLimit` is
+                  greater than zero and less than `spec.enforcedTargetLimit`.
+
+                  It is meant to be used by admins to to keep the overall number of
+                  targets under a desired limit.
+
+                  When both `enforcedTargetLimit` and `targetLimit` are defined and greater than zero, the following rules apply:
+                  * Scrape objects without a defined targetLimit value will inherit the global targetLimit value (Prometheus >= 2.45.0) or the enforcedTargetLimit value (Prometheus < v2.45.0).
+                    If Prometheus version is >= 2.45.0 and the `enforcedTargetLimit` is greater than the `targetLimit`, the `targetLimit` will be set to `enforcedTargetLimit`.
+                  * Scrape objects with a targetLimit value less than or equal to enforcedTargetLimit keep their specific value.
+                  * Scrape objects with a targetLimit value greater than enforcedTargetLimit are set to enforcedTargetLimit.
+                format: int64
+                type: integer
+              evaluationInterval:
+                default: 30s
+                description: |-
+                  evaluationInterval defines the interval between rule evaluations.
+                  Default: "30s"
+                pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
+                type: string
+              excludedFromEnforcement:
+                description: |-
+                  excludedFromEnforcement defines the list of references to PodMonitor, ServiceMonitor, Probe and PrometheusRule objects
+                  to be excluded from enforcing a namespace label of origin.
+
+                  It is only applicable if `spec.enforcedNamespaceLabel` set to true.
+                items:
+                  description: ObjectReference references a PodMonitor, ServiceMonitor,
+                    Probe or PrometheusRule object.
+                  properties:
+                    group:
+                      default: monitoring.coreos.com
+                      description: group of the referent. When not specified, it defaults
+                        to `monitoring.coreos.com`
+                      enum:
+                      - monitoring.coreos.com
+                      type: string
+                    name:
+                      description: name of the referent. When not set, all resources
+                        in the namespace are matched.
+                      type: string
+                    namespace:
+                      description: |-
+                        namespace of the referent.
+                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/
+                      minLength: 1
+                      type: string
+                    resource:
+                      description: resource of the referent.
+                      enum:
+                      - prometheusrules
+                      - servicemonitors
+                      - podmonitors
+                      - probes
+                      - scrapeconfigs
+                      type: string
+                  required:
+                  - namespace
+                  - resource
+                  type: object
+                type: array
+              exemplars:
+                description: |-
+                  exemplars related settings that are runtime reloadable.
+                  It requires to enable the `exemplar-storage` feature flag to be effective.
+                properties:
+                  maxSize:
+                    description: |-
+                      maxSize defines the maximum number of exemplars stored in memory for all series.
+
+                      exemplar-storage itself must be enabled using the `spec.enableFeature`
+                      option for exemplars to be scraped in the first place.
+
+                      If not set, Prometheus uses its default value. A value of zero or less
+                      than zero disables the storage.
+                    format: int64
+                    type: integer
+                type: object
+              externalLabels:
+                additionalProperties:
+                  type: string
+                description: |-
+                  externalLabels defines the labels to add to any time series or alerts when communicating with
+                  external systems (federation, remote storage, Alertmanager).
+                  Labels defined by `spec.replicaExternalLabelName` and
+                  `spec.prometheusExternalLabelName` take precedence over this list.
+                type: object
+              externalUrl:
+                description: |-
+                  externalUrl defines the external URL under which the Prometheus service is externally
+                  available. This is necessary to generate correct URLs (for instance if
+                  Prometheus is accessible behind an Ingress resource).
+                type: string
+              hostAliases:
+                description: |-
+                  hostAliases defines the optional list of hosts and IPs that will be injected into the Pod's
+                  hosts file if specified.
+                items:
+                  description: |-
+                    HostAlias holds the mapping between IP and hostnames that will be injected as an entry in the
+                    pod's hosts file.
+                  properties:
+                    hostnames:
+                      description: hostnames defines hostnames for the above IP address.
+                      items:
+                        type: string
+                      type: array
+                    ip:
+                      description: ip defines the IP address of the host file entry.
+                      type: string
+                  required:
+                  - hostnames
+                  - ip
+                  type: object
+                type: array
+                x-kubernetes-list-map-keys:
+                - ip
+                x-kubernetes-list-type: map
+              hostNetwork:
+                description: |-
+                  hostNetwork defines the host's network namespace if true.
+
+                  Make sure to understand the security implications if you want to enable
+                  it (https://kubernetes.io/docs/concepts/configuration/overview/ ).
+
+                  When hostNetwork is enabled, this will set the DNS policy to
+                  `ClusterFirstWithHostNet` automatically (unless `.spec.DNSPolicy` is set
+                  to a different value).
+                type: boolean
+              hostUsers:
+                description: |-
+                  hostUsers supports the user space in Kubernetes.
+
+                  More info: https://kubernetes.io/docs/tasks/configure-pod-container/user-namespaces/
+
+                  The feature requires at least Kubernetes 1.28 with the `UserNamespacesSupport` feature gate enabled.
+                  Starting Kubernetes 1.33, the feature is enabled by default.
+                type: boolean
+              ignoreNamespaceSelectors:
+                description: |-
+                  ignoreNamespaceSelectors when true, `spec.namespaceSelector` from all PodMonitor, ServiceMonitor
+                  and Probe objects will be ignored. They will only discover targets
+                  within the namespace of the PodMonitor, ServiceMonitor and Probe
+                  object.
+                type: boolean
+              image:
+                description: |-
+                  image defines the container image name for Prometheus. If specified, it takes precedence
+                  over the `spec.baseImage`, `spec.tag` and `spec.sha` fields.
+
+                  Specifying `spec.version` is still necessary to ensure the Prometheus
+                  Operator knows which version of Prometheus is being configured.
+
+                  If neither `spec.image` nor `spec.baseImage` are defined, the operator
+                  will use the latest upstream version of Prometheus available at the time
+                  when the operator was released.
+                type: string
+              imagePullPolicy:
+                description: |-
+                  imagePullPolicy defines the image pull policy for the 'prometheus', 'init-config-reloader' and 'config-reloader' containers.
+                  See https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy for more details.
+                enum:
+                - ""
+                - Always
+                - Never
+                - IfNotPresent
+                type: string
+              imagePullSecrets:
+                description: |-
+                  imagePullSecrets defines an optional list of references to Secrets in the same namespace
+                  to use for pulling images from registries.
+                  See http://kubernetes.io/docs/user-guide/images#specifying-imagepullsecrets-on-a-pod
+                items:
+                  description: |-
+                    LocalObjectReference contains enough information to let you locate the
+                    referenced object inside the same namespace.
+                  properties:
+                    name:
+                      default: ""
+                      description: |-
+                        Name of the referent.
+                        This field is effectively required, but due to backwards compatibility is
+                        allowed to be empty. Instances of this type with an empty value here are
+                        almost certainly wrong.
+                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                      type: string
+                  type: object
+                  x-kubernetes-map-type: atomic
+                type: array
+              initContainers:
+                description: |-
+                  initContainers allows injecting initContainers to the Pod definition. Those
+                  can be used to e.g.  fetch secrets for injection into the Prometheus
+                  configuration from external sources. Any errors during the execution of
+                  an initContainer will lead to a restart of the Pod. More info:
+                  https://kubernetes.io/docs/concepts/workloads/pods/init-containers/
+                  InitContainers described here modify an operator generated init
+                  containers if they share the same name and modifications are done via a
+                  strategic merge patch.
+
+                  The names of init container name managed by the operator are:
+                  * `init-config-reloader`.
+
+                  Overriding init containers is entirely outside the scope of what the
+                  maintainers will support and by doing so, you accept that this behaviour
+                  may break at any time without notice.
+                items:
+                  description: A single application container that you want to run
+                    within a pod.
+                  properties:
+                    args:
+                      description: |-
+                        Arguments to the entrypoint.
+                        The container image's CMD is used if this is not provided.
+                        Variable references $(VAR_NAME) are expanded using the container's environment. If a variable
+                        cannot be resolved, the reference in the input string will be unchanged. Double $$ are reduced
+                        to a single $, which allows for escaping the $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)" will
+                        produce the string literal "$(VAR_NAME)". Escaped references will never be expanded, regardless
+                        of whether the variable exists or not. Cannot be updated.
+                        More info: https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell
+                      items:
+                        type: string
+                      type: array
+                      x-kubernetes-list-type: atomic
+                    command:
+                      description: |-
+                        Entrypoint array. Not executed within a shell.
+                        The container image's ENTRYPOINT is used if this is not provided.
+                        Variable references $(VAR_NAME) are expanded using the container's environment. If a variable
+                        cannot be resolved, the reference in the input string will be unchanged. Double $$ are reduced
+                        to a single $, which allows for escaping the $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)" will
+                        produce the string literal "$(VAR_NAME)". Escaped references will never be expanded, regardless
+                        of whether the variable exists or not. Cannot be updated.
+                        More info: https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell
+                      items:
+                        type: string
+                      type: array
+                      x-kubernetes-list-type: atomic
+                    env:
+                      description: |-
+                        List of environment variables to set in the container.
+                        Cannot be updated.
+                      items:
+                        description: EnvVar represents an environment variable present
+                          in a Container.
+                        properties:
+                          name:
+                            description: |-
+                              Name of the environment variable.
+                              May consist of any printable ASCII characters except '='.
+                            type: string
+                          value:
+                            description: |-
+                              Variable references $(VAR_NAME) are expanded
+                              using the previously defined environment variables in the container and
+                              any service environment variables. If a variable cannot be resolved,
+                              the reference in the input string will be unchanged. Double $$ are reduced
+                              to a single $, which allows for escaping the $(VAR_NAME) syntax: i.e.
+                              "$$(VAR_NAME)" will produce the string literal "$(VAR_NAME)".
+                              Escaped references will never be expanded, regardless of whether the variable
+                              exists or not.
+                              Defaults to "".
+                            type: string
+                          valueFrom:
+                            description: Source for the environment variable's value.
+                              Cannot be used if value is not empty.
+                            properties:
+                              configMapKeyRef:
+                                description: Selects a key of a ConfigMap.
+                                properties:
+                                  key:
+                                    description: The key to select.
+                                    type: string
+                                  name:
+                                    default: ""
+                                    description: |-
+                                      Name of the referent.
+                                      This field is effectively required, but due to backwards compatibility is
+                                      allowed to be empty. Instances of this type with an empty value here are
+                                      almost certainly wrong.
+                                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                    type: string
+                                  optional:
+                                    description: Specify whether the ConfigMap or
+                                      its key must be defined
+                                    type: boolean
+                                required:
+                                - key
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              fieldRef:
+                                description: |-
+                                  Selects a field of the pod: supports metadata.name, metadata.namespace, `metadata.labels['<KEY>']`, `metadata.annotations['<KEY>']`,
+                                  spec.nodeName, spec.serviceAccountName, status.hostIP, status.podIP, status.podIPs.
+                                properties:
+                                  apiVersion:
+                                    description: Version of the schema the FieldPath
+                                      is written in terms of, defaults to "v1".
+                                    type: string
+                                  fieldPath:
+                                    description: Path of the field to select in the
+                                      specified API version.
+                                    type: string
+                                required:
+                                - fieldPath
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              fileKeyRef:
+                                description: |-
+                                  FileKeyRef selects a key of the env file.
+                                  Requires the EnvFiles feature gate to be enabled.
+                                properties:
+                                  key:
+                                    description: |-
+                                      The key within the env file. An invalid key will prevent the pod from starting.
+                                      The keys defined within a source may consist of any printable ASCII characters except '='.
+                                      During Alpha stage of the EnvFiles feature gate, the key size is limited to 128 characters.
+                                    type: string
+                                  optional:
+                                    default: false
+                                    description: |-
+                                      Specify whether the file or its key must be defined. If the file or key
+                                      does not exist, then the env var is not published.
+                                      If optional is set to true and the specified key does not exist,
+                                      the environment variable will not be set in the Pod's containers.
+
+                                      If optional is set to false and the specified key does not exist,
+                                      an error will be returned during Pod creation.
+                                    type: boolean
+                                  path:
+                                    description: |-
+                                      The path within the volume from which to select the file.
+                                      Must be relative and may not contain the '..' path or start with '..'.
+                                    type: string
+                                  volumeName:
+                                    description: The name of the volume mount containing
+                                      the env file.
+                                    type: string
+                                required:
+                                - key
+                                - path
+                                - volumeName
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              resourceFieldRef:
+                                description: |-
+                                  Selects a resource of the container: only resources limits and requests
+                                  (limits.cpu, limits.memory, limits.ephemeral-storage, requests.cpu, requests.memory and requests.ephemeral-storage) are currently supported.
+                                properties:
+                                  containerName:
+                                    description: 'Container name: required for volumes,
+                                      optional for env vars'
+                                    type: string
+                                  divisor:
+                                    anyOf:
+                                    - type: integer
+                                    - type: string
+                                    description: Specifies the output format of the
+                                      exposed resources, defaults to "1"
+                                    pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                    x-kubernetes-int-or-string: true
+                                  resource:
+                                    description: 'Required: resource to select'
+                                    type: string
+                                required:
+                                - resource
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              secretKeyRef:
+                                description: Selects a key of a secret in the pod's
+                                  namespace
+                                properties:
+                                  key:
+                                    description: The key of the secret to select from.  Must
+                                      be a valid secret key.
+                                    type: string
+                                  name:
+                                    default: ""
+                                    description: |-
+                                      Name of the referent.
+                                      This field is effectively required, but due to backwards compatibility is
+                                      allowed to be empty. Instances of this type with an empty value here are
+                                      almost certainly wrong.
+                                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                    type: string
+                                  optional:
+                                    description: Specify whether the Secret or its
+                                      key must be defined
+                                    type: boolean
+                                required:
+                                - key
+                                type: object
+                                x-kubernetes-map-type: atomic
+                            type: object
+                        required:
+                        - name
+                        type: object
+                      type: array
+                      x-kubernetes-list-map-keys:
+                      - name
+                      x-kubernetes-list-type: map
+                    envFrom:
+                      description: |-
+                        List of sources to populate environment variables in the container.
+                        The keys defined within a source may consist of any printable ASCII characters except '='.
+                        When a key exists in multiple
+                        sources, the value associated with the last source will take precedence.
+                        Values defined by an Env with a duplicate key will take precedence.
+                        Cannot be updated.
+                      items:
+                        description: EnvFromSource represents the source of a set
+                          of ConfigMaps or Secrets
+                        properties:
+                          configMapRef:
+                            description: The ConfigMap to select from
+                            properties:
+                              name:
+                                default: ""
+                                description: |-
+                                  Name of the referent.
+                                  This field is effectively required, but due to backwards compatibility is
+                                  allowed to be empty. Instances of this type with an empty value here are
+                                  almost certainly wrong.
+                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                type: string
+                              optional:
+                                description: Specify whether the ConfigMap must be
+                                  defined
+                                type: boolean
+                            type: object
+                            x-kubernetes-map-type: atomic
+                          prefix:
+                            description: |-
+                              Optional text to prepend to the name of each environment variable.
+                              May consist of any printable ASCII characters except '='.
+                            type: string
+                          secretRef:
+                            description: The Secret to select from
+                            properties:
+                              name:
+                                default: ""
+                                description: |-
+                                  Name of the referent.
+                                  This field is effectively required, but due to backwards compatibility is
+                                  allowed to be empty. Instances of this type with an empty value here are
+                                  almost certainly wrong.
+                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                type: string
+                              optional:
+                                description: Specify whether the Secret must be defined
+                                type: boolean
+                            type: object
+                            x-kubernetes-map-type: atomic
+                        type: object
+                      type: array
+                      x-kubernetes-list-type: atomic
+                    image:
+                      description: |-
+                        Container image name.
+                        More info: https://kubernetes.io/docs/concepts/containers/images
+                        This field is optional to allow higher level config management to default or override
+                        container images in workload controllers like Deployments and StatefulSets.
+                      type: string
+                    imagePullPolicy:
+                      description: |-
+                        Image pull policy.
+                        One of Always, Never, IfNotPresent.
+                        Defaults to Always if :latest tag is specified, or IfNotPresent otherwise.
+                        Cannot be updated.
+                        More info: https://kubernetes.io/docs/concepts/containers/images#updating-images
+                      type: string
+                    lifecycle:
+                      description: |-
+                        Actions that the management system should take in response to container lifecycle events.
+                        Cannot be updated.
+                      properties:
+                        postStart:
+                          description: |-
+                            PostStart is called immediately after a container is created. If the handler fails,
+                            the container is terminated and restarted according to its restart policy.
+                            Other management of the container blocks until the hook completes.
+                            More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
+                          properties:
+                            exec:
+                              description: Exec specifies a command to execute in
+                                the container.
+                              properties:
+                                command:
+                                  description: |-
+                                    Command is the command line to execute inside the container, the working directory for the
+                                    command  is root ('/') in the container's filesystem. The command is simply exec'd, it is
+                                    not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use
+                                    a shell, you need to explicitly call out to that shell.
+                                    Exit status of 0 is treated as live/healthy and non-zero is unhealthy.
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                              type: object
+                            httpGet:
+                              description: HTTPGet specifies an HTTP GET request to
+                                perform.
+                              properties:
+                                host:
+                                  description: |-
+                                    Host name to connect to, defaults to the pod IP. You probably want to set
+                                    "Host" in httpHeaders instead.
+                                  type: string
+                                httpHeaders:
+                                  description: Custom headers to set in the request.
+                                    HTTP allows repeated headers.
+                                  items:
+                                    description: HTTPHeader describes a custom header
+                                      to be used in HTTP probes
+                                    properties:
+                                      name:
+                                        description: |-
+                                          The header field name.
+                                          This will be canonicalized upon output, so case-variant names will be understood as the same header.
+                                        type: string
+                                      value:
+                                        description: The header field value
+                                        type: string
+                                    required:
+                                    - name
+                                    - value
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                path:
+                                  description: Path to access on the HTTP server.
+                                  type: string
+                                port:
+                                  anyOf:
+                                  - type: integer
+                                  - type: string
+                                  description: |-
+                                    Name or number of the port to access on the container.
+                                    Number must be in the range 1 to 65535.
+                                    Name must be an IANA_SVC_NAME.
+                                  x-kubernetes-int-or-string: true
+                                scheme:
+                                  description: |-
+                                    Scheme to use for connecting to the host.
+                                    Defaults to HTTP.
+                                  type: string
+                              required:
+                              - port
+                              type: object
+                            sleep:
+                              description: Sleep represents a duration that the container
+                                should sleep.
+                              properties:
+                                seconds:
+                                  description: Seconds is the number of seconds to
+                                    sleep.
+                                  format: int64
+                                  type: integer
+                              required:
+                              - seconds
+                              type: object
+                            tcpSocket:
+                              description: |-
+                                Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
+                                for backward compatibility. There is no validation of this field and
+                                lifecycle hooks will fail at runtime when it is specified.
+                              properties:
+                                host:
+                                  description: 'Optional: Host name to connect to,
+                                    defaults to the pod IP.'
+                                  type: string
+                                port:
+                                  anyOf:
+                                  - type: integer
+                                  - type: string
+                                  description: |-
+                                    Number or name of the port to access on the container.
+                                    Number must be in the range 1 to 65535.
+                                    Name must be an IANA_SVC_NAME.
+                                  x-kubernetes-int-or-string: true
+                              required:
+                              - port
+                              type: object
+                          type: object
+                        preStop:
+                          description: |-
+                            PreStop is called immediately before a container is terminated due to an
+                            API request or management event such as liveness/startup probe failure,
+                            preemption, resource contention, etc. The handler is not called if the
+                            container crashes or exits. The Pod's termination grace period countdown begins before the
+                            PreStop hook is executed. Regardless of the outcome of the handler, the
+                            container will eventually terminate within the Pod's termination grace
+                            period (unless delayed by finalizers). Other management of the container blocks until the hook completes
+                            or until the termination grace period is reached.
+                            More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
+                          properties:
+                            exec:
+                              description: Exec specifies a command to execute in
+                                the container.
+                              properties:
+                                command:
+                                  description: |-
+                                    Command is the command line to execute inside the container, the working directory for the
+                                    command  is root ('/') in the container's filesystem. The command is simply exec'd, it is
+                                    not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use
+                                    a shell, you need to explicitly call out to that shell.
+                                    Exit status of 0 is treated as live/healthy and non-zero is unhealthy.
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                              type: object
+                            httpGet:
+                              description: HTTPGet specifies an HTTP GET request to
+                                perform.
+                              properties:
+                                host:
+                                  description: |-
+                                    Host name to connect to, defaults to the pod IP. You probably want to set
+                                    "Host" in httpHeaders instead.
+                                  type: string
+                                httpHeaders:
+                                  description: Custom headers to set in the request.
+                                    HTTP allows repeated headers.
+                                  items:
+                                    description: HTTPHeader describes a custom header
+                                      to be used in HTTP probes
+                                    properties:
+                                      name:
+                                        description: |-
+                                          The header field name.
+                                          This will be canonicalized upon output, so case-variant names will be understood as the same header.
+                                        type: string
+                                      value:
+                                        description: The header field value
+                                        type: string
+                                    required:
+                                    - name
+                                    - value
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                path:
+                                  description: Path to access on the HTTP server.
+                                  type: string
+                                port:
+                                  anyOf:
+                                  - type: integer
+                                  - type: string
+                                  description: |-
+                                    Name or number of the port to access on the container.
+                                    Number must be in the range 1 to 65535.
+                                    Name must be an IANA_SVC_NAME.
+                                  x-kubernetes-int-or-string: true
+                                scheme:
+                                  description: |-
+                                    Scheme to use for connecting to the host.
+                                    Defaults to HTTP.
+                                  type: string
+                              required:
+                              - port
+                              type: object
+                            sleep:
+                              description: Sleep represents a duration that the container
+                                should sleep.
+                              properties:
+                                seconds:
+                                  description: Seconds is the number of seconds to
+                                    sleep.
+                                  format: int64
+                                  type: integer
+                              required:
+                              - seconds
+                              type: object
+                            tcpSocket:
+                              description: |-
+                                Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
+                                for backward compatibility. There is no validation of this field and
+                                lifecycle hooks will fail at runtime when it is specified.
+                              properties:
+                                host:
+                                  description: 'Optional: Host name to connect to,
+                                    defaults to the pod IP.'
+                                  type: string
+                                port:
+                                  anyOf:
+                                  - type: integer
+                                  - type: string
+                                  description: |-
+                                    Number or name of the port to access on the container.
+                                    Number must be in the range 1 to 65535.
+                                    Name must be an IANA_SVC_NAME.
+                                  x-kubernetes-int-or-string: true
+                              required:
+                              - port
+                              type: object
+                          type: object
+                        stopSignal:
+                          description: |-
+                            StopSignal defines which signal will be sent to a container when it is being stopped.
+                            If not specified, the default is defined by the container runtime in use.
+                            StopSignal can only be set for Pods with a non-empty .spec.os.name
+                          type: string
+                      type: object
+                    livenessProbe:
+                      description: |-
+                        Periodic probe of container liveness.
+                        Container will be restarted if the probe fails.
+                        Cannot be updated.
+                        More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                      properties:
+                        exec:
+                          description: Exec specifies a command to execute in the
+                            container.
+                          properties:
+                            command:
+                              description: |-
+                                Command is the command line to execute inside the container, the working directory for the
+                                command  is root ('/') in the container's filesystem. The command is simply exec'd, it is
+                                not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use
+                                a shell, you need to explicitly call out to that shell.
+                                Exit status of 0 is treated as live/healthy and non-zero is unhealthy.
+                              items:
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                          type: object
+                        failureThreshold:
+                          description: |-
+                            Minimum consecutive failures for the probe to be considered failed after having succeeded.
+                            Defaults to 3. Minimum value is 1.
+                          format: int32
+                          type: integer
+                        grpc:
+                          description: GRPC specifies a GRPC HealthCheckRequest.
+                          properties:
+                            port:
+                              description: Port number of the gRPC service. Number
+                                must be in the range 1 to 65535.
+                              format: int32
+                              type: integer
+                            service:
+                              default: ""
+                              description: |-
+                                Service is the name of the service to place in the gRPC HealthCheckRequest
+                                (see https://github.com/grpc/grpc/blob/master/doc/health-checking.md).
+
+                                If this is not specified, the default behavior is defined by gRPC.
+                              type: string
+                          required:
+                          - port
+                          type: object
+                        httpGet:
+                          description: HTTPGet specifies an HTTP GET request to perform.
+                          properties:
+                            host:
+                              description: |-
+                                Host name to connect to, defaults to the pod IP. You probably want to set
+                                "Host" in httpHeaders instead.
+                              type: string
+                            httpHeaders:
+                              description: Custom headers to set in the request. HTTP
+                                allows repeated headers.
+                              items:
+                                description: HTTPHeader describes a custom header
+                                  to be used in HTTP probes
+                                properties:
+                                  name:
+                                    description: |-
+                                      The header field name.
+                                      This will be canonicalized upon output, so case-variant names will be understood as the same header.
+                                    type: string
+                                  value:
+                                    description: The header field value
+                                    type: string
+                                required:
+                                - name
+                                - value
+                                type: object
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            path:
+                              description: Path to access on the HTTP server.
+                              type: string
+                            port:
+                              anyOf:
+                              - type: integer
+                              - type: string
+                              description: |-
+                                Name or number of the port to access on the container.
+                                Number must be in the range 1 to 65535.
+                                Name must be an IANA_SVC_NAME.
+                              x-kubernetes-int-or-string: true
+                            scheme:
+                              description: |-
+                                Scheme to use for connecting to the host.
+                                Defaults to HTTP.
+                              type: string
+                          required:
+                          - port
+                          type: object
+                        initialDelaySeconds:
+                          description: |-
+                            Number of seconds after the container has started before liveness probes are initiated.
+                            More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                          format: int32
+                          type: integer
+                        periodSeconds:
+                          description: |-
+                            How often (in seconds) to perform the probe.
+                            Default to 10 seconds. Minimum value is 1.
+                          format: int32
+                          type: integer
+                        successThreshold:
+                          description: |-
+                            Minimum consecutive successes for the probe to be considered successful after having failed.
+                            Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
+                          format: int32
+                          type: integer
+                        tcpSocket:
+                          description: TCPSocket specifies a connection to a TCP port.
+                          properties:
+                            host:
+                              description: 'Optional: Host name to connect to, defaults
+                                to the pod IP.'
+                              type: string
+                            port:
+                              anyOf:
+                              - type: integer
+                              - type: string
+                              description: |-
+                                Number or name of the port to access on the container.
+                                Number must be in the range 1 to 65535.
+                                Name must be an IANA_SVC_NAME.
+                              x-kubernetes-int-or-string: true
+                          required:
+                          - port
+                          type: object
+                        terminationGracePeriodSeconds:
+                          description: |-
+                            Optional duration in seconds the pod needs to terminate gracefully upon probe failure.
+                            The grace period is the duration in seconds after the processes running in the pod are sent
+                            a termination signal and the time when the processes are forcibly halted with a kill signal.
+                            Set this value longer than the expected cleanup time for your process.
+                            If this value is nil, the pod's terminationGracePeriodSeconds will be used. Otherwise, this
+                            value overrides the value provided by the pod spec.
+                            Value must be non-negative integer. The value zero indicates stop immediately via
+                            the kill signal (no opportunity to shut down).
+                            This is a beta field and requires enabling ProbeTerminationGracePeriod feature gate.
+                            Minimum value is 1. spec.terminationGracePeriodSeconds is used if unset.
+                          format: int64
+                          type: integer
+                        timeoutSeconds:
+                          description: |-
+                            Number of seconds after which the probe times out.
+                            Defaults to 1 second. Minimum value is 1.
+                            More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                          format: int32
+                          type: integer
+                      type: object
+                    name:
+                      description: |-
+                        Name of the container specified as a DNS_LABEL.
+                        Each container in a pod must have a unique name (DNS_LABEL).
+                        Cannot be updated.
+                      type: string
+                    ports:
+                      description: |-
+                        List of ports to expose from the container. Not specifying a port here
+                        DOES NOT prevent that port from being exposed. Any port which is
+                        listening on the default "0.0.0.0" address inside a container will be
+                        accessible from the network.
+                        Modifying this array with strategic merge patch may corrupt the data.
+                        For more information See https://github.com/kubernetes/kubernetes/issues/108255.
+                        Cannot be updated.
+                      items:
+                        description: ContainerPort represents a network port in a
+                          single container.
+                        properties:
+                          containerPort:
+                            description: |-
+                              Number of port to expose on the pod's IP address.
+                              This must be a valid port number, 0 < x < 65536.
+                            format: int32
+                            type: integer
+                          hostIP:
+                            description: What host IP to bind the external port to.
+                            type: string
+                          hostPort:
+                            description: |-
+                              Number of port to expose on the host.
+                              If specified, this must be a valid port number, 0 < x < 65536.
+                              If HostNetwork is specified, this must match ContainerPort.
+                              Most containers do not need this.
+                            format: int32
+                            type: integer
+                          name:
+                            description: |-
+                              If specified, this must be an IANA_SVC_NAME and unique within the pod. Each
+                              named port in a pod must have a unique name. Name for the port that can be
+                              referred to by services.
+                            type: string
+                          protocol:
+                            default: TCP
+                            description: |-
+                              Protocol for port. Must be UDP, TCP, or SCTP.
+                              Defaults to "TCP".
+                            type: string
+                        required:
+                        - containerPort
+                        type: object
+                      type: array
+                      x-kubernetes-list-map-keys:
+                      - containerPort
+                      - protocol
+                      x-kubernetes-list-type: map
+                    readinessProbe:
+                      description: |-
+                        Periodic probe of container service readiness.
+                        Container will be removed from service endpoints if the probe fails.
+                        Cannot be updated.
+                        More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                      properties:
+                        exec:
+                          description: Exec specifies a command to execute in the
+                            container.
+                          properties:
+                            command:
+                              description: |-
+                                Command is the command line to execute inside the container, the working directory for the
+                                command  is root ('/') in the container's filesystem. The command is simply exec'd, it is
+                                not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use
+                                a shell, you need to explicitly call out to that shell.
+                                Exit status of 0 is treated as live/healthy and non-zero is unhealthy.
+                              items:
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                          type: object
+                        failureThreshold:
+                          description: |-
+                            Minimum consecutive failures for the probe to be considered failed after having succeeded.
+                            Defaults to 3. Minimum value is 1.
+                          format: int32
+                          type: integer
+                        grpc:
+                          description: GRPC specifies a GRPC HealthCheckRequest.
+                          properties:
+                            port:
+                              description: Port number of the gRPC service. Number
+                                must be in the range 1 to 65535.
+                              format: int32
+                              type: integer
+                            service:
+                              default: ""
+                              description: |-
+                                Service is the name of the service to place in the gRPC HealthCheckRequest
+                                (see https://github.com/grpc/grpc/blob/master/doc/health-checking.md).
+
+                                If this is not specified, the default behavior is defined by gRPC.
+                              type: string
+                          required:
+                          - port
+                          type: object
+                        httpGet:
+                          description: HTTPGet specifies an HTTP GET request to perform.
+                          properties:
+                            host:
+                              description: |-
+                                Host name to connect to, defaults to the pod IP. You probably want to set
+                                "Host" in httpHeaders instead.
+                              type: string
+                            httpHeaders:
+                              description: Custom headers to set in the request. HTTP
+                                allows repeated headers.
+                              items:
+                                description: HTTPHeader describes a custom header
+                                  to be used in HTTP probes
+                                properties:
+                                  name:
+                                    description: |-
+                                      The header field name.
+                                      This will be canonicalized upon output, so case-variant names will be understood as the same header.
+                                    type: string
+                                  value:
+                                    description: The header field value
+                                    type: string
+                                required:
+                                - name
+                                - value
+                                type: object
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            path:
+                              description: Path to access on the HTTP server.
+                              type: string
+                            port:
+                              anyOf:
+                              - type: integer
+                              - type: string
+                              description: |-
+                                Name or number of the port to access on the container.
+                                Number must be in the range 1 to 65535.
+                                Name must be an IANA_SVC_NAME.
+                              x-kubernetes-int-or-string: true
+                            scheme:
+                              description: |-
+                                Scheme to use for connecting to the host.
+                                Defaults to HTTP.
+                              type: string
+                          required:
+                          - port
+                          type: object
+                        initialDelaySeconds:
+                          description: |-
+                            Number of seconds after the container has started before liveness probes are initiated.
+                            More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                          format: int32
+                          type: integer
+                        periodSeconds:
+                          description: |-
+                            How often (in seconds) to perform the probe.
+                            Default to 10 seconds. Minimum value is 1.
+                          format: int32
+                          type: integer
+                        successThreshold:
+                          description: |-
+                            Minimum consecutive successes for the probe to be considered successful after having failed.
+                            Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
+                          format: int32
+                          type: integer
+                        tcpSocket:
+                          description: TCPSocket specifies a connection to a TCP port.
+                          properties:
+                            host:
+                              description: 'Optional: Host name to connect to, defaults
+                                to the pod IP.'
+                              type: string
+                            port:
+                              anyOf:
+                              - type: integer
+                              - type: string
+                              description: |-
+                                Number or name of the port to access on the container.
+                                Number must be in the range 1 to 65535.
+                                Name must be an IANA_SVC_NAME.
+                              x-kubernetes-int-or-string: true
+                          required:
+                          - port
+                          type: object
+                        terminationGracePeriodSeconds:
+                          description: |-
+                            Optional duration in seconds the pod needs to terminate gracefully upon probe failure.
+                            The grace period is the duration in seconds after the processes running in the pod are sent
+                            a termination signal and the time when the processes are forcibly halted with a kill signal.
+                            Set this value longer than the expected cleanup time for your process.
+                            If this value is nil, the pod's terminationGracePeriodSeconds will be used. Otherwise, this
+                            value overrides the value provided by the pod spec.
+                            Value must be non-negative integer. The value zero indicates stop immediately via
+                            the kill signal (no opportunity to shut down).
+                            This is a beta field and requires enabling ProbeTerminationGracePeriod feature gate.
+                            Minimum value is 1. spec.terminationGracePeriodSeconds is used if unset.
+                          format: int64
+                          type: integer
+                        timeoutSeconds:
+                          description: |-
+                            Number of seconds after which the probe times out.
+                            Defaults to 1 second. Minimum value is 1.
+                            More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                          format: int32
+                          type: integer
+                      type: object
+                    resizePolicy:
+                      description: Resources resize policy for the container.
+                      items:
+                        description: ContainerResizePolicy represents resource resize
+                          policy for the container.
+                        properties:
+                          resourceName:
+                            description: |-
+                              Name of the resource to which this resource resize policy applies.
+                              Supported values: cpu, memory.
+                            type: string
+                          restartPolicy:
+                            description: |-
+                              Restart policy to apply when specified resource is resized.
+                              If not specified, it defaults to NotRequired.
+                            type: string
+                        required:
+                        - resourceName
+                        - restartPolicy
+                        type: object
+                      type: array
+                      x-kubernetes-list-type: atomic
+                    resources:
+                      description: |-
+                        Compute Resources required by this container.
+                        Cannot be updated.
+                        More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+                      properties:
+                        claims:
+                          description: |-
+                            Claims lists the names of resources, defined in spec.resourceClaims,
+                            that are used by this container.
+
+                            This field depends on the
+                            DynamicResourceAllocation feature gate.
+
+                            This field is immutable. It can only be set for containers.
+                          items:
+                            description: ResourceClaim references one entry in PodSpec.ResourceClaims.
+                            properties:
+                              name:
+                                description: |-
+                                  Name must match the name of one entry in pod.spec.resourceClaims of
+                                  the Pod where this field is used. It makes that resource available
+                                  inside a container.
+                                type: string
+                              request:
+                                description: |-
+                                  Request is the name chosen for a request in the referenced claim.
+                                  If empty, everything from the claim is made available, otherwise
+                                  only the result of this request.
+                                type: string
+                            required:
+                            - name
+                            type: object
+                          type: array
+                          x-kubernetes-list-map-keys:
+                          - name
+                          x-kubernetes-list-type: map
+                        limits:
+                          additionalProperties:
+                            anyOf:
+                            - type: integer
+                            - type: string
+                            pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                            x-kubernetes-int-or-string: true
+                          description: |-
+                            Limits describes the maximum amount of compute resources allowed.
+                            More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+                          type: object
+                        requests:
+                          additionalProperties:
+                            anyOf:
+                            - type: integer
+                            - type: string
+                            pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                            x-kubernetes-int-or-string: true
+                          description: |-
+                            Requests describes the minimum amount of compute resources required.
+                            If Requests is omitted for a container, it defaults to Limits if that is explicitly specified,
+                            otherwise to an implementation-defined value. Requests cannot exceed Limits.
+                            More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+                          type: object
+                      type: object
+                    restartPolicy:
+                      description: |-
+                        RestartPolicy defines the restart behavior of individual containers in a pod.
+                        This overrides the pod-level restart policy. When this field is not specified,
+                        the restart behavior is defined by the Pod's restart policy and the container type.
+                        Additionally, setting the RestartPolicy as "Always" for the init container will
+                        have the following effect:
+                        this init container will be continually restarted on
+                        exit until all regular containers have terminated. Once all regular
+                        containers have completed, all init containers with restartPolicy "Always"
+                        will be shut down. This lifecycle differs from normal init containers and
+                        is often referred to as a "sidecar" container. Although this init
+                        container still starts in the init container sequence, it does not wait
+                        for the container to complete before proceeding to the next init
+                        container. Instead, the next init container starts immediately after this
+                        init container is started, or after any startupProbe has successfully
+                        completed.
+                      type: string
+                    restartPolicyRules:
+                      description: |-
+                        Represents a list of rules to be checked to determine if the
+                        container should be restarted on exit. The rules are evaluated in
+                        order. Once a rule matches a container exit condition, the remaining
+                        rules are ignored. If no rule matches the container exit condition,
+                        the Container-level restart policy determines the whether the container
+                        is restarted or not. Constraints on the rules:
+                        - At most 20 rules are allowed.
+                        - Rules can have the same action.
+                        - Identical rules are not forbidden in validations.
+                        When rules are specified, container MUST set RestartPolicy explicitly
+                        even it if matches the Pod's RestartPolicy.
+                      items:
+                        description: ContainerRestartRule describes how a container
+                          exit is handled.
+                        properties:
+                          action:
+                            description: |-
+                              Specifies the action taken on a container exit if the requirements
+                              are satisfied. The only possible value is "Restart" to restart the
+                              container.
+                            type: string
+                          exitCodes:
+                            description: Represents the exit codes to check on container
+                              exits.
+                            properties:
+                              operator:
+                                description: |-
+                                  Represents the relationship between the container exit code(s) and the
+                                  specified values. Possible values are:
+                                  - In: the requirement is satisfied if the container exit code is in the
+                                    set of specified values.
+                                  - NotIn: the requirement is satisfied if the container exit code is
+                                    not in the set of specified values.
+                                type: string
+                              values:
+                                description: |-
+                                  Specifies the set of values to check for container exit codes.
+                                  At most 255 elements are allowed.
+                                items:
+                                  format: int32
+                                  type: integer
+                                type: array
+                                x-kubernetes-list-type: set
+                            required:
+                            - operator
+                            type: object
+                        required:
+                        - action
+                        type: object
+                      type: array
+                      x-kubernetes-list-type: atomic
+                    securityContext:
+                      description: |-
+                        SecurityContext defines the security options the container should be run with.
+                        If set, the fields of SecurityContext override the equivalent fields of PodSecurityContext.
+                        More info: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/
+                      properties:
+                        allowPrivilegeEscalation:
+                          description: |-
+                            AllowPrivilegeEscalation controls whether a process can gain more
+                            privileges than its parent process. This bool directly controls if
+                            the no_new_privs flag will be set on the container process.
+                            AllowPrivilegeEscalation is true always when the container is:
+                            1) run as Privileged
+                            2) has CAP_SYS_ADMIN
+                            Note that this field cannot be set when spec.os.name is windows.
+                          type: boolean
+                        appArmorProfile:
+                          description: |-
+                            appArmorProfile is the AppArmor options to use by this container. If set, this profile
+                            overrides the pod's appArmorProfile.
+                            Note that this field cannot be set when spec.os.name is windows.
+                          properties:
+                            localhostProfile:
+                              description: |-
+                                localhostProfile indicates a profile loaded on the node that should be used.
+                                The profile must be preconfigured on the node to work.
+                                Must match the loaded name of the profile.
+                                Must be set if and only if type is "Localhost".
+                              type: string
+                            type:
+                              description: |-
+                                type indicates which kind of AppArmor profile will be applied.
+                                Valid options are:
+                                  Localhost - a profile pre-loaded on the node.
+                                  RuntimeDefault - the container runtime's default profile.
+                                  Unconfined - no AppArmor enforcement.
+                              type: string
+                          required:
+                          - type
+                          type: object
+                        capabilities:
+                          description: |-
+                            The capabilities to add/drop when running containers.
+                            Defaults to the default set of capabilities granted by the container runtime.
+                            Note that this field cannot be set when spec.os.name is windows.
+                          properties:
+                            add:
+                              description: Added capabilities
+                              items:
+                                description: Capability represent POSIX capabilities
+                                  type
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            drop:
+                              description: Removed capabilities
+                              items:
+                                description: Capability represent POSIX capabilities
+                                  type
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                          type: object
+                        privileged:
+                          description: |-
+                            Run container in privileged mode.
+                            Processes in privileged containers are essentially equivalent to root on the host.
+                            Defaults to false.
+                            Note that this field cannot be set when spec.os.name is windows.
+                          type: boolean
+                        procMount:
+                          description: |-
+                            procMount denotes the type of proc mount to use for the containers.
+                            The default value is Default which uses the container runtime defaults for
+                            readonly paths and masked paths.
+                            This requires the ProcMountType feature flag to be enabled.
+                            Note that this field cannot be set when spec.os.name is windows.
+                          type: string
+                        readOnlyRootFilesystem:
+                          description: |-
+                            Whether this container has a read-only root filesystem.
+                            Default is false.
+                            Note that this field cannot be set when spec.os.name is windows.
+                          type: boolean
+                        runAsGroup:
+                          description: |-
+                            The GID to run the entrypoint of the container process.
+                            Uses runtime default if unset.
+                            May also be set in PodSecurityContext.  If set in both SecurityContext and
+                            PodSecurityContext, the value specified in SecurityContext takes precedence.
+                            Note that this field cannot be set when spec.os.name is windows.
+                          format: int64
+                          type: integer
+                        runAsNonRoot:
+                          description: |-
+                            Indicates that the container must run as a non-root user.
+                            If true, the Kubelet will validate the image at runtime to ensure that it
+                            does not run as UID 0 (root) and fail to start the container if it does.
+                            If unset or false, no such validation will be performed.
+                            May also be set in PodSecurityContext.  If set in both SecurityContext and
+                            PodSecurityContext, the value specified in SecurityContext takes precedence.
+                          type: boolean
+                        runAsUser:
+                          description: |-
+                            The UID to run the entrypoint of the container process.
+                            Defaults to user specified in image metadata if unspecified.
+                            May also be set in PodSecurityContext.  If set in both SecurityContext and
+                            PodSecurityContext, the value specified in SecurityContext takes precedence.
+                            Note that this field cannot be set when spec.os.name is windows.
+                          format: int64
+                          type: integer
+                        seLinuxOptions:
+                          description: |-
+                            The SELinux context to be applied to the container.
+                            If unspecified, the container runtime will allocate a random SELinux context for each
+                            container.  May also be set in PodSecurityContext.  If set in both SecurityContext and
+                            PodSecurityContext, the value specified in SecurityContext takes precedence.
+                            Note that this field cannot be set when spec.os.name is windows.
+                          properties:
+                            level:
+                              description: Level is SELinux level label that applies
+                                to the container.
+                              type: string
+                            role:
+                              description: Role is a SELinux role label that applies
+                                to the container.
+                              type: string
+                            type:
+                              description: Type is a SELinux type label that applies
+                                to the container.
+                              type: string
+                            user:
+                              description: User is a SELinux user label that applies
+                                to the container.
+                              type: string
+                          type: object
+                        seccompProfile:
+                          description: |-
+                            The seccomp options to use by this container. If seccomp options are
+                            provided at both the pod & container level, the container options
+                            override the pod options.
+                            Note that this field cannot be set when spec.os.name is windows.
+                          properties:
+                            localhostProfile:
+                              description: |-
+                                localhostProfile indicates a profile defined in a file on the node should be used.
+                                The profile must be preconfigured on the node to work.
+                                Must be a descending path, relative to the kubelet's configured seccomp profile location.
+                                Must be set if type is "Localhost". Must NOT be set for any other type.
+                              type: string
+                            type:
+                              description: |-
+                                type indicates which kind of seccomp profile will be applied.
+                                Valid options are:
+
+                                Localhost - a profile defined in a file on the node should be used.
+                                RuntimeDefault - the container runtime default profile should be used.
+                                Unconfined - no profile should be applied.
+                              type: string
+                          required:
+                          - type
+                          type: object
+                        windowsOptions:
+                          description: |-
+                            The Windows specific settings applied to all containers.
+                            If unspecified, the options from the PodSecurityContext will be used.
+                            If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence.
+                            Note that this field cannot be set when spec.os.name is linux.
+                          properties:
+                            gmsaCredentialSpec:
+                              description: |-
+                                GMSACredentialSpec is where the GMSA admission webhook
+                                (https://github.com/kubernetes-sigs/windows-gmsa) inlines the contents of the
+                                GMSA credential spec named by the GMSACredentialSpecName field.
+                              type: string
+                            gmsaCredentialSpecName:
+                              description: GMSACredentialSpecName is the name of the
+                                GMSA credential spec to use.
+                              type: string
+                            hostProcess:
+                              description: |-
+                                HostProcess determines if a container should be run as a 'Host Process' container.
+                                All of a Pod's containers must have the same effective HostProcess value
+                                (it is not allowed to have a mix of HostProcess containers and non-HostProcess containers).
+                                In addition, if HostProcess is true then HostNetwork must also be set to true.
+                              type: boolean
+                            runAsUserName:
+                              description: |-
+                                The UserName in Windows to run the entrypoint of the container process.
+                                Defaults to the user specified in image metadata if unspecified.
+                                May also be set in PodSecurityContext. If set in both SecurityContext and
+                                PodSecurityContext, the value specified in SecurityContext takes precedence.
+                              type: string
+                          type: object
+                      type: object
+                    startupProbe:
+                      description: |-
+                        StartupProbe indicates that the Pod has successfully initialized.
+                        If specified, no other probes are executed until this completes successfully.
+                        If this probe fails, the Pod will be restarted, just as if the livenessProbe failed.
+                        This can be used to provide different probe parameters at the beginning of a Pod's lifecycle,
+                        when it might take a long time to load data or warm a cache, than during steady-state operation.
+                        This cannot be updated.
+                        More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                      properties:
+                        exec:
+                          description: Exec specifies a command to execute in the
+                            container.
+                          properties:
+                            command:
+                              description: |-
+                                Command is the command line to execute inside the container, the working directory for the
+                                command  is root ('/') in the container's filesystem. The command is simply exec'd, it is
+                                not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use
+                                a shell, you need to explicitly call out to that shell.
+                                Exit status of 0 is treated as live/healthy and non-zero is unhealthy.
+                              items:
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                          type: object
+                        failureThreshold:
+                          description: |-
+                            Minimum consecutive failures for the probe to be considered failed after having succeeded.
+                            Defaults to 3. Minimum value is 1.
+                          format: int32
+                          type: integer
+                        grpc:
+                          description: GRPC specifies a GRPC HealthCheckRequest.
+                          properties:
+                            port:
+                              description: Port number of the gRPC service. Number
+                                must be in the range 1 to 65535.
+                              format: int32
+                              type: integer
+                            service:
+                              default: ""
+                              description: |-
+                                Service is the name of the service to place in the gRPC HealthCheckRequest
+                                (see https://github.com/grpc/grpc/blob/master/doc/health-checking.md).
+
+                                If this is not specified, the default behavior is defined by gRPC.
+                              type: string
+                          required:
+                          - port
+                          type: object
+                        httpGet:
+                          description: HTTPGet specifies an HTTP GET request to perform.
+                          properties:
+                            host:
+                              description: |-
+                                Host name to connect to, defaults to the pod IP. You probably want to set
+                                "Host" in httpHeaders instead.
+                              type: string
+                            httpHeaders:
+                              description: Custom headers to set in the request. HTTP
+                                allows repeated headers.
+                              items:
+                                description: HTTPHeader describes a custom header
+                                  to be used in HTTP probes
+                                properties:
+                                  name:
+                                    description: |-
+                                      The header field name.
+                                      This will be canonicalized upon output, so case-variant names will be understood as the same header.
+                                    type: string
+                                  value:
+                                    description: The header field value
+                                    type: string
+                                required:
+                                - name
+                                - value
+                                type: object
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            path:
+                              description: Path to access on the HTTP server.
+                              type: string
+                            port:
+                              anyOf:
+                              - type: integer
+                              - type: string
+                              description: |-
+                                Name or number of the port to access on the container.
+                                Number must be in the range 1 to 65535.
+                                Name must be an IANA_SVC_NAME.
+                              x-kubernetes-int-or-string: true
+                            scheme:
+                              description: |-
+                                Scheme to use for connecting to the host.
+                                Defaults to HTTP.
+                              type: string
+                          required:
+                          - port
+                          type: object
+                        initialDelaySeconds:
+                          description: |-
+                            Number of seconds after the container has started before liveness probes are initiated.
+                            More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                          format: int32
+                          type: integer
+                        periodSeconds:
+                          description: |-
+                            How often (in seconds) to perform the probe.
+                            Default to 10 seconds. Minimum value is 1.
+                          format: int32
+                          type: integer
+                        successThreshold:
+                          description: |-
+                            Minimum consecutive successes for the probe to be considered successful after having failed.
+                            Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
+                          format: int32
+                          type: integer
+                        tcpSocket:
+                          description: TCPSocket specifies a connection to a TCP port.
+                          properties:
+                            host:
+                              description: 'Optional: Host name to connect to, defaults
+                                to the pod IP.'
+                              type: string
+                            port:
+                              anyOf:
+                              - type: integer
+                              - type: string
+                              description: |-
+                                Number or name of the port to access on the container.
+                                Number must be in the range 1 to 65535.
+                                Name must be an IANA_SVC_NAME.
+                              x-kubernetes-int-or-string: true
+                          required:
+                          - port
+                          type: object
+                        terminationGracePeriodSeconds:
+                          description: |-
+                            Optional duration in seconds the pod needs to terminate gracefully upon probe failure.
+                            The grace period is the duration in seconds after the processes running in the pod are sent
+                            a termination signal and the time when the processes are forcibly halted with a kill signal.
+                            Set this value longer than the expected cleanup time for your process.
+                            If this value is nil, the pod's terminationGracePeriodSeconds will be used. Otherwise, this
+                            value overrides the value provided by the pod spec.
+                            Value must be non-negative integer. The value zero indicates stop immediately via
+                            the kill signal (no opportunity to shut down).
+                            This is a beta field and requires enabling ProbeTerminationGracePeriod feature gate.
+                            Minimum value is 1. spec.terminationGracePeriodSeconds is used if unset.
+                          format: int64
+                          type: integer
+                        timeoutSeconds:
+                          description: |-
+                            Number of seconds after which the probe times out.
+                            Defaults to 1 second. Minimum value is 1.
+                            More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                          format: int32
+                          type: integer
+                      type: object
+                    stdin:
+                      description: |-
+                        Whether this container should allocate a buffer for stdin in the container runtime. If this
+                        is not set, reads from stdin in the container will always result in EOF.
+                        Default is false.
+                      type: boolean
+                    stdinOnce:
+                      description: |-
+                        Whether the container runtime should close the stdin channel after it has been opened by
+                        a single attach. When stdin is true the stdin stream will remain open across multiple attach
+                        sessions. If stdinOnce is set to true, stdin is opened on container start, is empty until the
+                        first client attaches to stdin, and then remains open and accepts data until the client disconnects,
+                        at which time stdin is closed and remains closed until the container is restarted. If this
+                        flag is false, a container processes that reads from stdin will never receive an EOF.
+                        Default is false
+                      type: boolean
+                    terminationMessagePath:
+                      description: |-
+                        Optional: Path at which the file to which the container's termination message
+                        will be written is mounted into the container's filesystem.
+                        Message written is intended to be brief final status, such as an assertion failure message.
+                        Will be truncated by the node if greater than 4096 bytes. The total message length across
+                        all containers will be limited to 12kb.
+                        Defaults to /dev/termination-log.
+                        Cannot be updated.
+                      type: string
+                    terminationMessagePolicy:
+                      description: |-
+                        Indicate how the termination message should be populated. File will use the contents of
+                        terminationMessagePath to populate the container status message on both success and failure.
+                        FallbackToLogsOnError will use the last chunk of container log output if the termination
+                        message file is empty and the container exited with an error.
+                        The log output is limited to 2048 bytes or 80 lines, whichever is smaller.
+                        Defaults to File.
+                        Cannot be updated.
+                      type: string
+                    tty:
+                      description: |-
+                        Whether this container should allocate a TTY for itself, also requires 'stdin' to be true.
+                        Default is false.
+                      type: boolean
+                    volumeDevices:
+                      description: volumeDevices is the list of block devices to be
+                        used by the container.
+                      items:
+                        description: volumeDevice describes a mapping of a raw block
+                          device within a container.
+                        properties:
+                          devicePath:
+                            description: devicePath is the path inside of the container
+                              that the device will be mapped to.
+                            type: string
+                          name:
+                            description: name must match the name of a persistentVolumeClaim
+                              in the pod
+                            type: string
+                        required:
+                        - devicePath
+                        - name
+                        type: object
+                      type: array
+                      x-kubernetes-list-map-keys:
+                      - devicePath
+                      x-kubernetes-list-type: map
+                    volumeMounts:
+                      description: |-
+                        Pod volumes to mount into the container's filesystem.
+                        Cannot be updated.
+                      items:
+                        description: VolumeMount describes a mounting of a Volume
+                          within a container.
+                        properties:
+                          mountPath:
+                            description: |-
+                              Path within the container at which the volume should be mounted.  Must
+                              not contain ':'.
+                            type: string
+                          mountPropagation:
+                            description: |-
+                              mountPropagation determines how mounts are propagated from the host
+                              to container and the other way around.
+                              When not set, MountPropagationNone is used.
+                              This field is beta in 1.10.
+                              When RecursiveReadOnly is set to IfPossible or to Enabled, MountPropagation must be None or unspecified
+                              (which defaults to None).
+                            type: string
+                          name:
+                            description: This must match the Name of a Volume.
+                            type: string
+                          readOnly:
+                            description: |-
+                              Mounted read-only if true, read-write otherwise (false or unspecified).
+                              Defaults to false.
+                            type: boolean
+                          recursiveReadOnly:
+                            description: |-
+                              RecursiveReadOnly specifies whether read-only mounts should be handled
+                              recursively.
+
+                              If ReadOnly is false, this field has no meaning and must be unspecified.
+
+                              If ReadOnly is true, and this field is set to Disabled, the mount is not made
+                              recursively read-only.  If this field is set to IfPossible, the mount is made
+                              recursively read-only, if it is supported by the container runtime.  If this
+                              field is set to Enabled, the mount is made recursively read-only if it is
+                              supported by the container runtime, otherwise the pod will not be started and
+                              an error will be generated to indicate the reason.
+
+                              If this field is set to IfPossible or Enabled, MountPropagation must be set to
+                              None (or be unspecified, which defaults to None).
+
+                              If this field is not specified, it is treated as an equivalent of Disabled.
+                            type: string
+                          subPath:
+                            description: |-
+                              Path within the volume from which the container's volume should be mounted.
+                              Defaults to "" (volume's root).
+                            type: string
+                          subPathExpr:
+                            description: |-
+                              Expanded path within the volume from which the container's volume should be mounted.
+                              Behaves similarly to SubPath but environment variable references $(VAR_NAME) are expanded using the container's environment.
+                              Defaults to "" (volume's root).
+                              SubPathExpr and SubPath are mutually exclusive.
+                            type: string
+                        required:
+                        - mountPath
+                        - name
+                        type: object
+                      type: array
+                      x-kubernetes-list-map-keys:
+                      - mountPath
+                      x-kubernetes-list-type: map
+                    workingDir:
+                      description: |-
+                        Container's working directory.
+                        If not specified, the container runtime's default will be used, which
+                        might be configured in the container image.
+                        Cannot be updated.
+                      type: string
+                  required:
+                  - name
+                  type: object
+                type: array
+              keepDroppedTargets:
+                description: |-
+                  keepDroppedTargets defines the per-scrape limit on the number of targets dropped by relabeling
+                  that will be kept in memory. 0 means no limit.
+
+                  It requires Prometheus >= v2.47.0.
+
+                  Note that the global limit only applies to scrape objects that don't specify an explicit limit value.
+                  If you want to enforce a maximum limit for all scrape objects, refer to enforcedKeepDroppedTargets.
+                format: int64
+                type: integer
+              labelLimit:
+                description: |-
+                  labelLimit defines per-scrape limit on number of labels that will be accepted for a sample.
+                  Only valid in Prometheus versions 2.45.0 and newer.
+
+                  Note that the global limit only applies to scrape objects that don't specify an explicit limit value.
+                  If you want to enforce a maximum limit for all scrape objects, refer to enforcedLabelLimit.
+                format: int64
+                type: integer
+              labelNameLengthLimit:
+                description: |-
+                  labelNameLengthLimit defines the per-scrape limit on length of labels name that will be accepted for a sample.
+                  Only valid in Prometheus versions 2.45.0 and newer.
+
+                  Note that the global limit only applies to scrape objects that don't specify an explicit limit value.
+                  If you want to enforce a maximum limit for all scrape objects, refer to enforcedLabelNameLengthLimit.
+                format: int64
+                type: integer
+              labelValueLengthLimit:
+                description: |-
+                  labelValueLengthLimit defines the per-scrape limit on length of labels value that will be accepted for a sample.
+                  Only valid in Prometheus versions 2.45.0 and newer.
+
+                  Note that the global limit only applies to scrape objects that don't specify an explicit limit value.
+                  If you want to enforce a maximum limit for all scrape objects, refer to enforcedLabelValueLengthLimit.
+                format: int64
+                type: integer
+              listenLocal:
+                description: |-
+                  listenLocal when true, the Prometheus server listens on the loopback address
+                  instead of the Pod IP's address.
+                type: boolean
+              logFormat:
+                description: logFormat for Log level for Prometheus and the config-reloader
+                  sidecar.
+                enum:
+                - ""
+                - logfmt
+                - json
+                type: string
+              logLevel:
+                description: logLevel for Prometheus and the config-reloader sidecar.
+                enum:
+                - ""
+                - debug
+                - info
+                - warn
+                - error
+                type: string
+              maximumStartupDurationSeconds:
+                description: |-
+                  maximumStartupDurationSeconds defines the maximum time that the `prometheus` container's startup probe will wait before being considered failed. The startup probe will return success after the WAL replay is complete.
+                  If set, the value should be greater than 60 (seconds). Otherwise it will be equal to 900 seconds (15 minutes).
+                format: int32
+                minimum: 60
+                type: integer
+              minReadySeconds:
+                description: |-
+                  minReadySeconds defines the minimum number of seconds for which a newly created Pod should be ready
+                  without any of its container crashing for it to be considered available.
+
+                  If unset, pods will be considered available as soon as they are ready.
+                format: int32
+                minimum: 0
+                type: integer
+              nameEscapingScheme:
+                description: |-
+                  nameEscapingScheme defines the character escaping scheme that will be requested when scraping
+                  for metric and label names that do not conform to the legacy Prometheus
+                  character set.
+
+                  It requires Prometheus >= v3.4.0.
+                enum:
+                - AllowUTF8
+                - Underscores
+                - Dots
+                - Values
+                type: string
+              nameValidationScheme:
+                description: |-
+                  nameValidationScheme defines the validation scheme for metric and label names.
+
+                  It requires Prometheus >= v2.55.0.
+                enum:
+                - UTF8
+                - Legacy
+                type: string
+              nodeSelector:
+                additionalProperties:
+                  type: string
+                description: nodeSelector defines on which Nodes the Pods are scheduled.
+                type: object
+              otlp:
+                description: |-
+                  otlp defines the settings related to the OTLP receiver feature.
+                  It requires Prometheus >= v2.55.0.
+                properties:
+                  convertHistogramsToNHCB:
+                    description: |-
+                      convertHistogramsToNHCB defines optional translation of OTLP explicit bucket histograms into native histograms with custom buckets.
+                      It requires Prometheus >= v3.4.0.
+                    type: boolean
+                  ignoreResourceAttributes:
+                    description: |-
+                      ignoreResourceAttributes defines the list of OpenTelemetry resource attributes to ignore when `promoteAllResourceAttributes` is true.
+
+                      It requires `promoteAllResourceAttributes` to be true.
+                      It requires Prometheus >= v3.5.0.
+                    items:
+                      minLength: 1
+                      type: string
+                    minItems: 1
+                    type: array
+                    x-kubernetes-list-type: set
+                  keepIdentifyingResourceAttributes:
+                    description: |-
+                      keepIdentifyingResourceAttributes enables adding `service.name`, `service.namespace` and `service.instance.id`
+                      resource attributes to the `target_info` metric, on top of converting them into the `instance` and `job` labels.
+
+                      It requires Prometheus >= v3.1.0.
+                    type: boolean
+                  promoteAllResourceAttributes:
+                    description: |-
+                      promoteAllResourceAttributes promotes all resource attributes to metric labels except the ones defined in `ignoreResourceAttributes`.
+
+                      Cannot be true when `promoteResourceAttributes` is defined.
+                      It requires Prometheus >= v3.5.0.
+                    type: boolean
+                  promoteResourceAttributes:
+                    description: |-
+                      promoteResourceAttributes defines the list of OpenTelemetry Attributes that should be promoted to metric labels, defaults to none.
+                      Cannot be defined when `promoteAllResourceAttributes` is true.
+                    items:
+                      minLength: 1
+                      type: string
+                    minItems: 1
+                    type: array
+                    x-kubernetes-list-type: set
+                  promoteScopeMetadata:
+                    description: |-
+                      promoteScopeMetadata controls whether to promote OpenTelemetry scope metadata (i.e. name, version, schema URL, and attributes) to metric labels.
+                      As per the OpenTelemetry specification, the aforementioned scope metadata should be identifying, i.e. made into metric labels.
+                      It requires Prometheus >= v3.6.0.
+                    type: boolean
+                  translationStrategy:
+                    description: |-
+                      translationStrategy defines how the OTLP receiver endpoint translates the incoming metrics.
+
+                      It requires Prometheus >= v3.0.0.
+                    enum:
+                    - NoUTF8EscapingWithSuffixes
+                    - UnderscoreEscapingWithSuffixes
+                    - NoTranslation
+                    - UnderscoreEscapingWithoutSuffixes
+                    type: string
+                type: object
+              overrideHonorLabels:
+                description: |-
+                  overrideHonorLabels when true, Prometheus resolves label conflicts by renaming the labels in the scraped data
+                   to “exported_” for all targets created from ServiceMonitor, PodMonitor and
+                  ScrapeConfig objects. Otherwise the HonorLabels field of the service or pod monitor applies.
+                  In practice,`OverrideHonorLabels:true` enforces `honorLabels:false`
+                  for all ServiceMonitor, PodMonitor and ScrapeConfig objects.
+                type: boolean
+              overrideHonorTimestamps:
+                description: |-
+                  overrideHonorTimestamps when true, Prometheus ignores the timestamps for all the targets created
+                  from service and pod monitors.
+                  Otherwise the HonorTimestamps field of the service or pod monitor applies.
+                type: boolean
+              paused:
+                description: |-
+                  paused defines when a Prometheus deployment is paused, no actions except for deletion
+                  will be performed on the underlying objects.
+                type: boolean
+              persistentVolumeClaimRetentionPolicy:
+                description: |-
+                  persistentVolumeClaimRetentionPolicy defines the field controls if and how PVCs are deleted during the lifecycle of a StatefulSet.
+                  The default behavior is all PVCs are retained.
+                  This is an alpha field from kubernetes 1.23 until 1.26 and a beta field from 1.26.
+                  It requires enabling the StatefulSetAutoDeletePVC feature gate.
+                properties:
+                  whenDeleted:
+                    description: |-
+                      WhenDeleted specifies what happens to PVCs created from StatefulSet
+                      VolumeClaimTemplates when the StatefulSet is deleted. The default policy
+                      of `Retain` causes PVCs to not be affected by StatefulSet deletion. The
+                      `Delete` policy causes those PVCs to be deleted.
+                    type: string
+                  whenScaled:
+                    description: |-
+                      WhenScaled specifies what happens to PVCs created from StatefulSet
+                      VolumeClaimTemplates when the StatefulSet is scaled down. The default
+                      policy of `Retain` causes PVCs to not be affected by a scaledown. The
+                      `Delete` policy causes the associated PVCs for any excess pods above
+                      the replica count to be deleted.
+                    type: string
+                type: object
+              podMetadata:
+                description: |-
+                  podMetadata defines labels and annotations which are propagated to the Prometheus pods.
+
+                  The following items are reserved and cannot be overridden:
+                  * "prometheus" label, set to the name of the Prometheus object.
+                  * "app.kubernetes.io/instance" label, set to the name of the Prometheus object.
+                  * "app.kubernetes.io/managed-by" label, set to "prometheus-operator".
+                  * "app.kubernetes.io/name" label, set to "prometheus".
+                  * "app.kubernetes.io/version" label, set to the Prometheus version.
+                  * "operator.prometheus.io/name" label, set to the name of the Prometheus object.
+                  * "operator.prometheus.io/shard" label, set to the shard number of the Prometheus object.
+                  * "kubectl.kubernetes.io/default-container" annotation, set to "prometheus".
+                properties:
+                  annotations:
+                    additionalProperties:
+                      type: string
+                    description: |-
+                      annotations defines an unstructured key value map stored with a resource that may be
+                      set by external tools to store and retrieve arbitrary metadata. They are not
+                      queryable and should be preserved when modifying objects.
+                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
+                    type: object
+                  labels:
+                    additionalProperties:
+                      type: string
+                    description: |-
+                      labels define the map of string keys and values that can be used to organize and categorize
+                      (scope and select) objects. May match selectors of replication controllers
+                      and services.
+                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
+                    type: object
+                  name:
+                    description: |-
+                      name must be unique within a namespace. Is required when creating resources, although
+                      some resources may allow a client to request the generation of an appropriate name
+                      automatically. Name is primarily intended for creation idempotence and configuration
+                      definition.
+                      Cannot be updated.
+                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/
+                    type: string
+                type: object
+              podMonitorNamespaceSelector:
+                description: |-
+                  podMonitorNamespaceSelector defines the namespaces to match for PodMonitors discovery. An empty label selector
+                  matches all namespaces. A null label selector (default value) matches the current
+                  namespace only.
+                properties:
+                  matchExpressions:
+                    description: matchExpressions is a list of label selector requirements.
+                      The requirements are ANDed.
+                    items:
+                      description: |-
+                        A label selector requirement is a selector that contains values, a key, and an operator that
+                        relates the key and values.
+                      properties:
+                        key:
+                          description: key is the label key that the selector applies
+                            to.
+                          type: string
+                        operator:
+                          description: |-
+                            operator represents a key's relationship to a set of values.
+                            Valid operators are In, NotIn, Exists and DoesNotExist.
+                          type: string
+                        values:
+                          description: |-
+                            values is an array of string values. If the operator is In or NotIn,
+                            the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                            the values array must be empty. This array is replaced during a strategic
+                            merge patch.
+                          items:
+                            type: string
+                          type: array
+                          x-kubernetes-list-type: atomic
+                      required:
+                      - key
+                      - operator
+                      type: object
+                    type: array
+                    x-kubernetes-list-type: atomic
+                  matchLabels:
+                    additionalProperties:
+                      type: string
+                    description: |-
+                      matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                      map is equivalent to an element of matchExpressions, whose key field is "key", the
+                      operator is "In", and the values array contains only "value". The requirements are ANDed.
+                    type: object
+                type: object
+                x-kubernetes-map-type: atomic
+              podMonitorSelector:
+                description: |-
+                  podMonitorSelector defines the podMonitors to be selected for target discovery. An empty label selector
+                  matches all objects. A null label selector matches no objects.
+
+                  If `spec.serviceMonitorSelector`, `spec.podMonitorSelector`, `spec.probeSelector`
+                  and `spec.scrapeConfigSelector` are null, the Prometheus configuration is unmanaged.
+                  The Prometheus operator will ensure that the Prometheus configuration's
+                  Secret exists, but it is the responsibility of the user to provide the raw
+                  gzipped Prometheus configuration under the `prometheus.yaml.gz` key.
+                  This behavior is *deprecated* and will be removed in the next major version
+                  of the custom resource definition. It is recommended to use
+                  `spec.additionalScrapeConfigs` instead.
+                properties:
+                  matchExpressions:
+                    description: matchExpressions is a list of label selector requirements.
+                      The requirements are ANDed.
+                    items:
+                      description: |-
+                        A label selector requirement is a selector that contains values, a key, and an operator that
+                        relates the key and values.
+                      properties:
+                        key:
+                          description: key is the label key that the selector applies
+                            to.
+                          type: string
+                        operator:
+                          description: |-
+                            operator represents a key's relationship to a set of values.
+                            Valid operators are In, NotIn, Exists and DoesNotExist.
+                          type: string
+                        values:
+                          description: |-
+                            values is an array of string values. If the operator is In or NotIn,
+                            the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                            the values array must be empty. This array is replaced during a strategic
+                            merge patch.
+                          items:
+                            type: string
+                          type: array
+                          x-kubernetes-list-type: atomic
+                      required:
+                      - key
+                      - operator
+                      type: object
+                    type: array
+                    x-kubernetes-list-type: atomic
+                  matchLabels:
+                    additionalProperties:
+                      type: string
+                    description: |-
+                      matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                      map is equivalent to an element of matchExpressions, whose key field is "key", the
+                      operator is "In", and the values array contains only "value". The requirements are ANDed.
+                    type: object
+                type: object
+                x-kubernetes-map-type: atomic
+              podTargetLabels:
+                description: |-
+                  podTargetLabels are appended to the `spec.podTargetLabels` field of all
+                  PodMonitor and ServiceMonitor objects.
+                items:
+                  type: string
+                type: array
+              portName:
+                default: web
+                description: |-
+                  portName used for the pods and governing service.
+                  Default: "web"
+                type: string
+              priorityClassName:
+                description: priorityClassName assigned to the Pods.
+                type: string
+              probeNamespaceSelector:
+                description: |-
+                  probeNamespaceSelector defines the namespaces to match for Probe discovery. An empty label
+                  selector matches all namespaces. A null label selector matches the
+                  current namespace only.
+                properties:
+                  matchExpressions:
+                    description: matchExpressions is a list of label selector requirements.
+                      The requirements are ANDed.
+                    items:
+                      description: |-
+                        A label selector requirement is a selector that contains values, a key, and an operator that
+                        relates the key and values.
+                      properties:
+                        key:
+                          description: key is the label key that the selector applies
+                            to.
+                          type: string
+                        operator:
+                          description: |-
+                            operator represents a key's relationship to a set of values.
+                            Valid operators are In, NotIn, Exists and DoesNotExist.
+                          type: string
+                        values:
+                          description: |-
+                            values is an array of string values. If the operator is In or NotIn,
+                            the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                            the values array must be empty. This array is replaced during a strategic
+                            merge patch.
+                          items:
+                            type: string
+                          type: array
+                          x-kubernetes-list-type: atomic
+                      required:
+                      - key
+                      - operator
+                      type: object
+                    type: array
+                    x-kubernetes-list-type: atomic
+                  matchLabels:
+                    additionalProperties:
+                      type: string
+                    description: |-
+                      matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                      map is equivalent to an element of matchExpressions, whose key field is "key", the
+                      operator is "In", and the values array contains only "value". The requirements are ANDed.
+                    type: object
+                type: object
+                x-kubernetes-map-type: atomic
+              probeSelector:
+                description: |-
+                  probeSelector defines the probes to be selected for target discovery. An empty label selector
+                  matches all objects. A null label selector matches no objects.
+
+                  If `spec.serviceMonitorSelector`, `spec.podMonitorSelector`, `spec.probeSelector`
+                  and `spec.scrapeConfigSelector` are null, the Prometheus configuration is unmanaged.
+                  The Prometheus operator will ensure that the Prometheus configuration's
+                  Secret exists, but it is the responsibility of the user to provide the raw
+                  gzipped Prometheus configuration under the `prometheus.yaml.gz` key.
+                  This behavior is *deprecated* and will be removed in the next major version
+                  of the custom resource definition. It is recommended to use
+                  `spec.additionalScrapeConfigs` instead.
+                properties:
+                  matchExpressions:
+                    description: matchExpressions is a list of label selector requirements.
+                      The requirements are ANDed.
+                    items:
+                      description: |-
+                        A label selector requirement is a selector that contains values, a key, and an operator that
+                        relates the key and values.
+                      properties:
+                        key:
+                          description: key is the label key that the selector applies
+                            to.
+                          type: string
+                        operator:
+                          description: |-
+                            operator represents a key's relationship to a set of values.
+                            Valid operators are In, NotIn, Exists and DoesNotExist.
+                          type: string
+                        values:
+                          description: |-
+                            values is an array of string values. If the operator is In or NotIn,
+                            the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                            the values array must be empty. This array is replaced during a strategic
+                            merge patch.
+                          items:
+                            type: string
+                          type: array
+                          x-kubernetes-list-type: atomic
+                      required:
+                      - key
+                      - operator
+                      type: object
+                    type: array
+                    x-kubernetes-list-type: atomic
+                  matchLabels:
+                    additionalProperties:
+                      type: string
+                    description: |-
+                      matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                      map is equivalent to an element of matchExpressions, whose key field is "key", the
+                      operator is "In", and the values array contains only "value". The requirements are ANDed.
+                    type: object
+                type: object
+                x-kubernetes-map-type: atomic
+              prometheusExternalLabelName:
+                description: |-
+                  prometheusExternalLabelName defines the name of Prometheus external label used to denote the Prometheus instance
+                  name. The external label will _not_ be added when the field is set to
+                  the empty string (`""`).
+
+                  Default: "prometheus"
+                type: string
+              prometheusRulesExcludedFromEnforce:
+                description: |-
+                  prometheusRulesExcludedFromEnforce defines the list of PrometheusRule objects to which the namespace label
+                  enforcement doesn't apply.
+                  This is only relevant when `spec.enforcedNamespaceLabel` is set to true.
+                  Deprecated: use `spec.excludedFromEnforcement` instead.
+                items:
+                  description: |-
+                    PrometheusRuleExcludeConfig enables users to configure excluded
+                    PrometheusRule names and their namespaces to be ignored while enforcing
+                    namespace label for alerts and metrics.
+                  properties:
+                    ruleName:
+                      description: ruleName defines the name of the excluded PrometheusRule
+                        object.
+                      type: string
+                    ruleNamespace:
+                      description: ruleNamespace defines the namespace of the excluded
+                        PrometheusRule object.
+                      type: string
+                  required:
+                  - ruleName
+                  - ruleNamespace
+                  type: object
+                type: array
+              query:
+                description: query defines the configuration of the Prometheus query
+                  service.
+                properties:
+                  lookbackDelta:
+                    description: lookbackDelta defines the delta difference allowed
+                      for retrieving metrics during expression evaluations.
+                    type: string
+                  maxConcurrency:
+                    description: maxConcurrency defines the number of concurrent queries
+                      that can be run at once.
+                    format: int32
+                    minimum: 1
+                    type: integer
+                  maxSamples:
+                    description: |-
+                      maxSamples defines the maximum number of samples a single query can load into memory. Note that
+                      queries will fail if they would load more samples than this into memory,
+                      so this also limits the number of samples a query can return.
+                    format: int32
+                    type: integer
+                  timeout:
+                    description: timeout defines the maximum time a query may take
+                      before being aborted.
+                    pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
+                    type: string
+                type: object
+              queryLogFile:
+                description: |-
+                  queryLogFile specifies where the file to which PromQL queries are logged.
+
+                  If the filename has an empty path, e.g. 'query.log', The Prometheus Pods
+                  will mount the file into an emptyDir volume at `/var/log/prometheus`.
+                  If a full path is provided, e.g. '/var/log/prometheus/query.log', you
+                  must mount a volume in the specified directory and it must be writable.
+                  This is because the prometheus container runs with a read-only root
+                  filesystem for security reasons.
+                  Alternatively, the location can be set to a standard I/O stream, e.g.
+                  `/dev/stdout`, to log query information to the default Prometheus log
+                  stream.
+                type: string
+              reloadStrategy:
+                description: |-
+                  reloadStrategy defines the strategy used to reload the Prometheus configuration.
+                  If not specified, the configuration is reloaded using the /-/reload HTTP endpoint.
+                enum:
+                - HTTP
+                - ProcessSignal
+                type: string
+              remoteRead:
+                description: remoteRead defines the list of remote read configurations.
+                items:
+                  description: |-
+                    RemoteReadSpec defines the configuration for Prometheus to read back samples
+                    from a remote endpoint.
+                  properties:
+                    authorization:
+                      description: |-
+                        authorization section for the URL.
+
+                        It requires Prometheus >= v2.26.0.
+
+                        Cannot be set at the same time as `basicAuth`, or `oauth2`.
+                      properties:
+                        credentials:
+                          description: credentials defines a key of a Secret in the
+                            namespace that contains the credentials for authentication.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        credentialsFile:
+                          description: credentialsFile defines the file to read a
+                            secret from, mutually exclusive with `credentials`.
+                          type: string
+                        type:
+                          description: |-
+                            type defines the authentication type. The value is case-insensitive.
+
+                            "Basic" is not a supported value.
+
+                            Default: "Bearer"
+                          type: string
+                      type: object
+                    basicAuth:
+                      description: |-
+                        basicAuth configuration for the URL.
+
+                        Cannot be set at the same time as `authorization`, or `oauth2`.
+                      properties:
+                        password:
+                          description: |-
+                            password defines a key of a Secret containing the password for
+                            authentication.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        username:
+                          description: |-
+                            username defines a key of a Secret containing the username for
+                            authentication.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                      type: object
+                    bearerToken:
+                      description: |-
+                        bearerToken is deprecated: this will be removed in a future release.
+                        *Warning: this field shouldn't be used because the token value appears
+                        in clear-text. Prefer using `authorization`.*
+                      type: string
+                    bearerTokenFile:
+                      description: |-
+                        bearerTokenFile defines the file from which to read the bearer token for the URL.
+
+                        Deprecated: this will be removed in a future release. Prefer using `authorization`.
+                      type: string
+                    filterExternalLabels:
+                      description: |-
+                        filterExternalLabels defines whether to use the external labels as selectors for the remote read endpoint.
+
+                        It requires Prometheus >= v2.34.0.
+                      type: boolean
+                    followRedirects:
+                      description: |-
+                        followRedirects defines whether HTTP requests follow HTTP 3xx redirects.
+
+                        It requires Prometheus >= v2.26.0.
+                      type: boolean
+                    headers:
+                      additionalProperties:
+                        type: string
+                      description: |-
+                        headers defines the custom HTTP headers to be sent along with each remote read request.
+                        Be aware that headers that are set by Prometheus itself can't be overwritten.
+                        Only valid in Prometheus versions 2.26.0 and newer.
+                      type: object
+                    name:
+                      description: |-
+                        name of the remote read queue, it must be unique if specified. The
+                        name is used in metrics and logging in order to differentiate read
+                        configurations.
+
+                        It requires Prometheus >= v2.15.0.
+                      type: string
+                    noProxy:
+                      description: |-
+                        noProxy defines a comma-separated string that can contain IPs, CIDR notation, domain names
+                        that should be excluded from proxying. IP and domain names can
+                        contain port numbers.
+
+                        It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                      type: string
+                    oauth2:
+                      description: |-
+                        oauth2 configuration for the URL.
+
+                        It requires Prometheus >= v2.27.0.
+
+                        Cannot be set at the same time as `authorization`, or `basicAuth`.
+                      properties:
+                        clientId:
+                          description: |-
+                            clientId defines a key of a Secret or ConfigMap containing the
+                            OAuth2 client's ID.
+                          properties:
+                            configMap:
+                              description: configMap defines the ConfigMap containing
+                                data to use for the targets.
+                              properties:
+                                key:
+                                  description: The key to select.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the ConfigMap or its
+                                    key must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            secret:
+                              description: secret defines the Secret containing data
+                                to use for the targets.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                          type: object
+                        clientSecret:
+                          description: |-
+                            clientSecret defines a key of a Secret containing the OAuth2
+                            client's secret.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        endpointParams:
+                          additionalProperties:
+                            type: string
+                          description: |-
+                            endpointParams configures the HTTP parameters to append to the token
+                            URL.
+                          type: object
+                        noProxy:
+                          description: |-
+                            noProxy defines a comma-separated string that can contain IPs, CIDR notation, domain names
+                            that should be excluded from proxying. IP and domain names can
+                            contain port numbers.
+
+                            It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                          type: string
+                        proxyConnectHeader:
+                          additionalProperties:
+                            items:
+                              description: SecretKeySelector selects a key of a Secret.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            type: array
+                          description: |-
+                            proxyConnectHeader optionally specifies headers to send to
+                            proxies during CONNECT requests.
+
+                            It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        proxyFromEnvironment:
+                          description: |-
+                            proxyFromEnvironment defines whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+
+                            It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                          type: boolean
+                        proxyUrl:
+                          description: proxyUrl defines the HTTP proxy server to use.
+                          pattern: ^(http|https|socks5)://.+$
+                          type: string
+                        scopes:
+                          description: scopes defines the OAuth2 scopes used for the
+                            token request.
+                          items:
+                            type: string
+                          type: array
+                        tlsConfig:
+                          description: |-
+                            tlsConfig defines the TLS configuration to use when connecting to the OAuth2 server.
+                            It requires Prometheus >= v2.43.0.
+                          properties:
+                            ca:
+                              description: ca defines the Certificate authority used
+                                when verifying server certificates.
+                              properties:
+                                configMap:
+                                  description: configMap defines the ConfigMap containing
+                                    data to use for the targets.
+                                  properties:
+                                    key:
+                                      description: The key to select.
+                                      type: string
+                                    name:
+                                      default: ""
+                                      description: |-
+                                        Name of the referent.
+                                        This field is effectively required, but due to backwards compatibility is
+                                        allowed to be empty. Instances of this type with an empty value here are
+                                        almost certainly wrong.
+                                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                      type: string
+                                    optional:
+                                      description: Specify whether the ConfigMap or
+                                        its key must be defined
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                secret:
+                                  description: secret defines the Secret containing
+                                    data to use for the targets.
+                                  properties:
+                                    key:
+                                      description: The key of the secret to select
+                                        from.  Must be a valid secret key.
+                                      type: string
+                                    name:
+                                      default: ""
+                                      description: |-
+                                        Name of the referent.
+                                        This field is effectively required, but due to backwards compatibility is
+                                        allowed to be empty. Instances of this type with an empty value here are
+                                        almost certainly wrong.
+                                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                      type: string
+                                    optional:
+                                      description: Specify whether the Secret or its
+                                        key must be defined
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                              type: object
+                            cert:
+                              description: cert defines the Client certificate to
+                                present when doing client-authentication.
+                              properties:
+                                configMap:
+                                  description: configMap defines the ConfigMap containing
+                                    data to use for the targets.
+                                  properties:
+                                    key:
+                                      description: The key to select.
+                                      type: string
+                                    name:
+                                      default: ""
+                                      description: |-
+                                        Name of the referent.
+                                        This field is effectively required, but due to backwards compatibility is
+                                        allowed to be empty. Instances of this type with an empty value here are
+                                        almost certainly wrong.
+                                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                      type: string
+                                    optional:
+                                      description: Specify whether the ConfigMap or
+                                        its key must be defined
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                secret:
+                                  description: secret defines the Secret containing
+                                    data to use for the targets.
+                                  properties:
+                                    key:
+                                      description: The key of the secret to select
+                                        from.  Must be a valid secret key.
+                                      type: string
+                                    name:
+                                      default: ""
+                                      description: |-
+                                        Name of the referent.
+                                        This field is effectively required, but due to backwards compatibility is
+                                        allowed to be empty. Instances of this type with an empty value here are
+                                        almost certainly wrong.
+                                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                      type: string
+                                    optional:
+                                      description: Specify whether the Secret or its
+                                        key must be defined
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                              type: object
+                            insecureSkipVerify:
+                              description: insecureSkipVerify defines how to disable
+                                target certificate validation.
+                              type: boolean
+                            keySecret:
+                              description: keySecret defines the Secret containing
+                                the client key file for the targets.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            maxVersion:
+                              description: |-
+                                maxVersion defines the maximum acceptable TLS version.
+
+                                It requires Prometheus >= v2.41.0 or Thanos >= v0.31.0.
+                              enum:
+                              - TLS10
+                              - TLS11
+                              - TLS12
+                              - TLS13
+                              type: string
+                            minVersion:
+                              description: |-
+                                minVersion defines the minimum acceptable TLS version.
+
+                                It requires Prometheus >= v2.35.0 or Thanos >= v0.28.0.
+                              enum:
+                              - TLS10
+                              - TLS11
+                              - TLS12
+                              - TLS13
+                              type: string
+                            serverName:
+                              description: serverName is used to verify the hostname
+                                for the targets.
+                              type: string
+                          type: object
+                        tokenUrl:
+                          description: tokenUrl defines the URL to fetch the token
+                            from.
+                          minLength: 1
+                          type: string
+                      required:
+                      - clientId
+                      - clientSecret
+                      - tokenUrl
+                      type: object
+                    proxyConnectHeader:
+                      additionalProperties:
+                        items:
+                          description: SecretKeySelector selects a key of a Secret.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        type: array
+                      description: |-
+                        proxyConnectHeader optionally specifies headers to send to
+                        proxies during CONNECT requests.
+
+                        It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                      type: object
+                      x-kubernetes-map-type: atomic
+                    proxyFromEnvironment:
+                      description: |-
+                        proxyFromEnvironment defines whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+
+                        It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                      type: boolean
+                    proxyUrl:
+                      description: proxyUrl defines the HTTP proxy server to use.
+                      pattern: ^(http|https|socks5)://.+$
+                      type: string
+                    readRecent:
+                      description: |-
+                        readRecent defines whether reads should be made for queries for time ranges that
+                        the local storage should have complete data for.
+                      type: boolean
+                    remoteTimeout:
+                      description: remoteTimeout defines the timeout for requests
+                        to the remote read endpoint.
+                      pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
+                      type: string
+                    requiredMatchers:
+                      additionalProperties:
+                        type: string
+                      description: |-
+                        requiredMatchers defines an optional list of equality matchers which have to be present
+                        in a selector to query the remote read endpoint.
+                      type: object
+                    tlsConfig:
+                      description: tlsConfig to use for the URL.
+                      properties:
+                        ca:
+                          description: ca defines the Certificate authority used when
+                            verifying server certificates.
+                          properties:
+                            configMap:
+                              description: configMap defines the ConfigMap containing
+                                data to use for the targets.
+                              properties:
+                                key:
+                                  description: The key to select.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the ConfigMap or its
+                                    key must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            secret:
+                              description: secret defines the Secret containing data
+                                to use for the targets.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                          type: object
+                        caFile:
+                          description: caFile defines the path to the CA cert in the
+                            Prometheus container to use for the targets.
+                          type: string
+                        cert:
+                          description: cert defines the Client certificate to present
+                            when doing client-authentication.
+                          properties:
+                            configMap:
+                              description: configMap defines the ConfigMap containing
+                                data to use for the targets.
+                              properties:
+                                key:
+                                  description: The key to select.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the ConfigMap or its
+                                    key must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            secret:
+                              description: secret defines the Secret containing data
+                                to use for the targets.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                          type: object
+                        certFile:
+                          description: certFile defines the path to the client cert
+                            file in the Prometheus container for the targets.
+                          type: string
+                        insecureSkipVerify:
+                          description: insecureSkipVerify defines how to disable target
+                            certificate validation.
+                          type: boolean
+                        keyFile:
+                          description: keyFile defines the path to the client key
+                            file in the Prometheus container for the targets.
+                          type: string
+                        keySecret:
+                          description: keySecret defines the Secret containing the
+                            client key file for the targets.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        maxVersion:
+                          description: |-
+                            maxVersion defines the maximum acceptable TLS version.
+
+                            It requires Prometheus >= v2.41.0 or Thanos >= v0.31.0.
+                          enum:
+                          - TLS10
+                          - TLS11
+                          - TLS12
+                          - TLS13
+                          type: string
+                        minVersion:
+                          description: |-
+                            minVersion defines the minimum acceptable TLS version.
+
+                            It requires Prometheus >= v2.35.0 or Thanos >= v0.28.0.
+                          enum:
+                          - TLS10
+                          - TLS11
+                          - TLS12
+                          - TLS13
+                          type: string
+                        serverName:
+                          description: serverName is used to verify the hostname for
+                            the targets.
+                          type: string
+                      type: object
+                    url:
+                      description: url defines the URL of the endpoint to query from.
+                      type: string
+                  required:
+                  - url
+                  type: object
+                type: array
+              remoteWrite:
+                description: remoteWrite defines the list of remote write configurations.
+                items:
+                  description: |-
+                    RemoteWriteSpec defines the configuration to write samples from Prometheus
+                    to a remote endpoint.
+                  properties:
+                    authorization:
+                      description: |-
+                        authorization section for the URL.
+
+                        It requires Prometheus >= v2.26.0 or Thanos >= v0.24.0.
+
+                        Cannot be set at the same time as `sigv4`, `basicAuth`, `oauth2`, or `azureAd`.
+                      properties:
+                        credentials:
+                          description: credentials defines a key of a Secret in the
+                            namespace that contains the credentials for authentication.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        credentialsFile:
+                          description: credentialsFile defines the file to read a
+                            secret from, mutually exclusive with `credentials`.
+                          type: string
+                        type:
+                          description: |-
+                            type defines the authentication type. The value is case-insensitive.
+
+                            "Basic" is not a supported value.
+
+                            Default: "Bearer"
+                          type: string
+                      type: object
+                    azureAd:
+                      description: |-
+                        azureAd for the URL.
+
+                        It requires Prometheus >= v2.45.0 or Thanos >= v0.31.0.
+
+                        Cannot be set at the same time as `authorization`, `basicAuth`, `oauth2`, or `sigv4`.
+                      properties:
+                        cloud:
+                          description: cloud defines the Azure Cloud. Options are
+                            'AzurePublic', 'AzureChina', or 'AzureGovernment'.
+                          enum:
+                          - AzureChina
+                          - AzureGovernment
+                          - AzurePublic
+                          type: string
+                        managedIdentity:
+                          description: |-
+                            managedIdentity defines the Azure User-assigned Managed identity.
+                            Cannot be set at the same time as `oauth` or `sdk`.
+                          properties:
+                            clientId:
+                              description: |-
+                                clientId defines the Azure User-assigned Managed identity.
+
+                                For Prometheus >= 3.5.0 and Thanos >= 0.40.0, this field is allowed to be empty to support system-assigned managed identities.
+                              minLength: 1
+                              type: string
+                          type: object
+                        oauth:
+                          description: |-
+                            oauth defines the oauth config that is being used to authenticate.
+                            Cannot be set at the same time as `managedIdentity` or `sdk`.
+
+                            It requires Prometheus >= v2.48.0 or Thanos >= v0.31.0.
+                          properties:
+                            clientId:
+                              description: clientId defines the clientId of the Azure
+                                Active Directory application that is being used to
+                                authenticate.
+                              minLength: 1
+                              type: string
+                            clientSecret:
+                              description: clientSecret specifies a key of a Secret
+                                containing the client secret of the Azure Active Directory
+                                application that is being used to authenticate.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            tenantId:
+                              description: tenantId is the tenant ID of the Azure
+                                Active Directory application that is being used to
+                                authenticate.
+                              minLength: 1
+                              pattern: ^[0-9a-zA-Z-.]+$
+                              type: string
+                          required:
+                          - clientId
+                          - clientSecret
+                          - tenantId
+                          type: object
+                        sdk:
+                          description: |-
+                            sdk defines the Azure SDK config that is being used to authenticate.
+                            See https://learn.microsoft.com/en-us/azure/developer/go/azure-sdk-authentication
+                            Cannot be set at the same time as `oauth` or `managedIdentity`.
+
+                            It requires Prometheus >= v2.52.0 or Thanos >= v0.36.0.
+                          properties:
+                            tenantId:
+                              description: tenantId defines the tenant ID of the azure
+                                active directory application that is being used to
+                                authenticate.
+                              pattern: ^[0-9a-zA-Z-.]+$
+                              type: string
+                          type: object
+                      type: object
+                    basicAuth:
+                      description: |-
+                        basicAuth configuration for the URL.
+
+                        Cannot be set at the same time as `sigv4`, `authorization`, `oauth2`, or `azureAd`.
+                      properties:
+                        password:
+                          description: |-
+                            password defines a key of a Secret containing the password for
+                            authentication.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        username:
+                          description: |-
+                            username defines a key of a Secret containing the username for
+                            authentication.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                      type: object
+                    bearerToken:
+                      description: |-
+                        bearerToken is deprecated: this will be removed in a future release.
+                        *Warning: this field shouldn't be used because the token value appears
+                        in clear-text. Prefer using `authorization`.*
+                      type: string
+                    bearerTokenFile:
+                      description: |-
+                        bearerTokenFile defines the file from which to read bearer token for the URL.
+
+                        Deprecated: this will be removed in a future release. Prefer using `authorization`.
+                      type: string
+                    enableHTTP2:
+                      description: enableHTTP2 defines whether to enable HTTP2.
+                      type: boolean
+                    followRedirects:
+                      description: |-
+                        followRedirects defines whether HTTP requests follow HTTP 3xx redirects.
+
+                        It requires Prometheus >= v2.26.0 or Thanos >= v0.24.0.
+                      type: boolean
+                    headers:
+                      additionalProperties:
+                        type: string
+                      description: |-
+                        headers defines the custom HTTP headers to be sent along with each remote write request.
+                        Be aware that headers that are set by Prometheus itself can't be overwritten.
+
+                        It requires Prometheus >= v2.25.0 or Thanos >= v0.24.0.
+                      type: object
+                    messageVersion:
+                      description: |-
+                        messageVersion defines the Remote Write message's version to use when writing to the endpoint.
+
+                        `Version1.0` corresponds to the `prometheus.WriteRequest` protobuf message introduced in Remote Write 1.0.
+                        `Version2.0` corresponds to the `io.prometheus.write.v2.Request` protobuf message introduced in Remote Write 2.0.
+
+                        When `Version2.0` is selected, Prometheus will automatically be
+                        configured to append the metadata of scraped metrics to the WAL.
+
+                        Before setting this field, consult with your remote storage provider
+                        what message version it supports.
+
+                        It requires Prometheus >= v2.54.0 or Thanos >= v0.37.0.
+                      enum:
+                      - V1.0
+                      - V2.0
+                      type: string
+                    metadataConfig:
+                      description: |-
+                        metadataConfig defines how to send a series metadata to the remote storage.
+
+                        When the field is empty, **no metadata** is sent. But when the field is
+                        null, metadata is sent.
+                      properties:
+                        maxSamplesPerSend:
+                          description: |-
+                            maxSamplesPerSend defines the maximum number of metadata samples per send.
+
+                            It requires Prometheus >= v2.29.0.
+                          format: int32
+                          minimum: -1
+                          type: integer
+                        send:
+                          description: send defines whether metric metadata is sent
+                            to the remote storage or not.
+                          type: boolean
+                        sendInterval:
+                          description: sendInterval defines how frequently metric
+                            metadata is sent to the remote storage.
+                          pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
+                          type: string
+                      type: object
+                    name:
+                      description: |-
+                        name of the remote write queue, it must be unique if specified. The
+                        name is used in metrics and logging in order to differentiate queues.
+
+                        It requires Prometheus >= v2.15.0 or Thanos >= 0.24.0.
+                      type: string
+                    noProxy:
+                      description: |-
+                        noProxy defines a comma-separated string that can contain IPs, CIDR notation, domain names
+                        that should be excluded from proxying. IP and domain names can
+                        contain port numbers.
+
+                        It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                      type: string
+                    oauth2:
+                      description: |-
+                        oauth2 configuration for the URL.
+
+                        It requires Prometheus >= v2.27.0 or Thanos >= v0.24.0.
+
+                        Cannot be set at the same time as `sigv4`, `authorization`, `basicAuth`, or `azureAd`.
+                      properties:
+                        clientId:
+                          description: |-
+                            clientId defines a key of a Secret or ConfigMap containing the
+                            OAuth2 client's ID.
+                          properties:
+                            configMap:
+                              description: configMap defines the ConfigMap containing
+                                data to use for the targets.
+                              properties:
+                                key:
+                                  description: The key to select.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the ConfigMap or its
+                                    key must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            secret:
+                              description: secret defines the Secret containing data
+                                to use for the targets.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                          type: object
+                        clientSecret:
+                          description: |-
+                            clientSecret defines a key of a Secret containing the OAuth2
+                            client's secret.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        endpointParams:
+                          additionalProperties:
+                            type: string
+                          description: |-
+                            endpointParams configures the HTTP parameters to append to the token
+                            URL.
+                          type: object
+                        noProxy:
+                          description: |-
+                            noProxy defines a comma-separated string that can contain IPs, CIDR notation, domain names
+                            that should be excluded from proxying. IP and domain names can
+                            contain port numbers.
+
+                            It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                          type: string
+                        proxyConnectHeader:
+                          additionalProperties:
+                            items:
+                              description: SecretKeySelector selects a key of a Secret.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            type: array
+                          description: |-
+                            proxyConnectHeader optionally specifies headers to send to
+                            proxies during CONNECT requests.
+
+                            It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        proxyFromEnvironment:
+                          description: |-
+                            proxyFromEnvironment defines whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+
+                            It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                          type: boolean
+                        proxyUrl:
+                          description: proxyUrl defines the HTTP proxy server to use.
+                          pattern: ^(http|https|socks5)://.+$
+                          type: string
+                        scopes:
+                          description: scopes defines the OAuth2 scopes used for the
+                            token request.
+                          items:
+                            type: string
+                          type: array
+                        tlsConfig:
+                          description: |-
+                            tlsConfig defines the TLS configuration to use when connecting to the OAuth2 server.
+                            It requires Prometheus >= v2.43.0.
+                          properties:
+                            ca:
+                              description: ca defines the Certificate authority used
+                                when verifying server certificates.
+                              properties:
+                                configMap:
+                                  description: configMap defines the ConfigMap containing
+                                    data to use for the targets.
+                                  properties:
+                                    key:
+                                      description: The key to select.
+                                      type: string
+                                    name:
+                                      default: ""
+                                      description: |-
+                                        Name of the referent.
+                                        This field is effectively required, but due to backwards compatibility is
+                                        allowed to be empty. Instances of this type with an empty value here are
+                                        almost certainly wrong.
+                                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                      type: string
+                                    optional:
+                                      description: Specify whether the ConfigMap or
+                                        its key must be defined
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                secret:
+                                  description: secret defines the Secret containing
+                                    data to use for the targets.
+                                  properties:
+                                    key:
+                                      description: The key of the secret to select
+                                        from.  Must be a valid secret key.
+                                      type: string
+                                    name:
+                                      default: ""
+                                      description: |-
+                                        Name of the referent.
+                                        This field is effectively required, but due to backwards compatibility is
+                                        allowed to be empty. Instances of this type with an empty value here are
+                                        almost certainly wrong.
+                                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                      type: string
+                                    optional:
+                                      description: Specify whether the Secret or its
+                                        key must be defined
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                              type: object
+                            cert:
+                              description: cert defines the Client certificate to
+                                present when doing client-authentication.
+                              properties:
+                                configMap:
+                                  description: configMap defines the ConfigMap containing
+                                    data to use for the targets.
+                                  properties:
+                                    key:
+                                      description: The key to select.
+                                      type: string
+                                    name:
+                                      default: ""
+                                      description: |-
+                                        Name of the referent.
+                                        This field is effectively required, but due to backwards compatibility is
+                                        allowed to be empty. Instances of this type with an empty value here are
+                                        almost certainly wrong.
+                                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                      type: string
+                                    optional:
+                                      description: Specify whether the ConfigMap or
+                                        its key must be defined
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                secret:
+                                  description: secret defines the Secret containing
+                                    data to use for the targets.
+                                  properties:
+                                    key:
+                                      description: The key of the secret to select
+                                        from.  Must be a valid secret key.
+                                      type: string
+                                    name:
+                                      default: ""
+                                      description: |-
+                                        Name of the referent.
+                                        This field is effectively required, but due to backwards compatibility is
+                                        allowed to be empty. Instances of this type with an empty value here are
+                                        almost certainly wrong.
+                                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                      type: string
+                                    optional:
+                                      description: Specify whether the Secret or its
+                                        key must be defined
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                              type: object
+                            insecureSkipVerify:
+                              description: insecureSkipVerify defines how to disable
+                                target certificate validation.
+                              type: boolean
+                            keySecret:
+                              description: keySecret defines the Secret containing
+                                the client key file for the targets.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            maxVersion:
+                              description: |-
+                                maxVersion defines the maximum acceptable TLS version.
+
+                                It requires Prometheus >= v2.41.0 or Thanos >= v0.31.0.
+                              enum:
+                              - TLS10
+                              - TLS11
+                              - TLS12
+                              - TLS13
+                              type: string
+                            minVersion:
+                              description: |-
+                                minVersion defines the minimum acceptable TLS version.
+
+                                It requires Prometheus >= v2.35.0 or Thanos >= v0.28.0.
+                              enum:
+                              - TLS10
+                              - TLS11
+                              - TLS12
+                              - TLS13
+                              type: string
+                            serverName:
+                              description: serverName is used to verify the hostname
+                                for the targets.
+                              type: string
+                          type: object
+                        tokenUrl:
+                          description: tokenUrl defines the URL to fetch the token
+                            from.
+                          minLength: 1
+                          type: string
+                      required:
+                      - clientId
+                      - clientSecret
+                      - tokenUrl
+                      type: object
+                    proxyConnectHeader:
+                      additionalProperties:
+                        items:
+                          description: SecretKeySelector selects a key of a Secret.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        type: array
+                      description: |-
+                        proxyConnectHeader optionally specifies headers to send to
+                        proxies during CONNECT requests.
+
+                        It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                      type: object
+                      x-kubernetes-map-type: atomic
+                    proxyFromEnvironment:
+                      description: |-
+                        proxyFromEnvironment defines whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+
+                        It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                      type: boolean
+                    proxyUrl:
+                      description: proxyUrl defines the HTTP proxy server to use.
+                      pattern: ^(http|https|socks5)://.+$
+                      type: string
+                    queueConfig:
+                      description: queueConfig allows tuning of the remote write queue
+                        parameters.
+                      properties:
+                        batchSendDeadline:
+                          description: batchSendDeadline defines the maximum time
+                            a sample will wait in buffer.
+                          pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
+                          type: string
+                        capacity:
+                          description: |-
+                            capacity defines the number of samples to buffer per shard before we start
+                            dropping them.
+                          type: integer
+                        maxBackoff:
+                          description: maxBackoff defines the maximum retry delay.
+                          pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
+                          type: string
+                        maxRetries:
+                          description: maxRetries defines the maximum number of times
+                            to retry a batch on recoverable errors.
+                          type: integer
+                        maxSamplesPerSend:
+                          description: maxSamplesPerSend defines the maximum number
+                            of samples per send.
+                          type: integer
+                        maxShards:
+                          description: maxShards defines the maximum number of shards,
+                            i.e. amount of concurrency.
+                          type: integer
+                        minBackoff:
+                          description: minBackoff defines the initial retry delay.
+                            Gets doubled for every retry.
+                          pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
+                          type: string
+                        minShards:
+                          description: minShards defines the minimum number of shards,
+                            i.e. amount of concurrency.
+                          type: integer
+                        retryOnRateLimit:
+                          description: |-
+                            retryOnRateLimit defines the retry upon receiving a 429 status code from the remote-write storage.
+
+                            This is an *experimental feature*, it may change in any upcoming release
+                            in a breaking way.
+                          type: boolean
+                        sampleAgeLimit:
+                          description: |-
+                            sampleAgeLimit drops samples older than the limit.
+                            It requires Prometheus >= v2.50.0 or Thanos >= v0.32.0.
+                          pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
+                          type: string
+                      type: object
+                    remoteTimeout:
+                      description: remoteTimeout defines the timeout for requests
+                        to the remote write endpoint.
+                      pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
+                      type: string
+                    roundRobinDNS:
+                      description: "roundRobinDNS controls the DNS resolution behavior
+                        for remote-write connections.\nWhen enabled:\n  - The remote-write
+                        mechanism will resolve the hostname via DNS.\n  - It will
+                        randomly select one of the resolved IP addresses and connect
+                        to it.\n\nWhen disabled (default behavior):\n  - The Go standard
+                        library will handle hostname resolution.\n  - It will attempt
+                        connections to each resolved IP address sequentially.\n\nNote:
+                        The connection timeout applies to the entire resolution and
+                        connection process.\n\n\tIf disabled, the timeout is distributed
+                        across all connection attempts.\n\nIt requires Prometheus
+                        >= v3.1.0 or Thanos >= v0.38.0."
+                      type: boolean
+                    sendExemplars:
+                      description: |-
+                        sendExemplars enables sending of exemplars over remote write. Note that
+                        exemplar-storage itself must be enabled using the `spec.enableFeatures`
+                        option for exemplars to be scraped in the first place.
+
+                        It requires Prometheus >= v2.27.0 or Thanos >= v0.24.0.
+                      type: boolean
+                    sendNativeHistograms:
+                      description: |-
+                        sendNativeHistograms enables sending of native histograms, also known as sparse histograms
+                        over remote write.
+
+                        It requires Prometheus >= v2.40.0 or Thanos >= v0.30.0.
+                      type: boolean
+                    sigv4:
+                      description: |-
+                        sigv4 defines the AWS's Signature Verification 4 for the URL.
+
+                        It requires Prometheus >= v2.26.0 or Thanos >= v0.24.0.
+
+                        Cannot be set at the same time as `authorization`, `basicAuth`, `oauth2`, or `azureAd`.
+                      properties:
+                        accessKey:
+                          description: |-
+                            accessKey defines the AWS API key. If not specified, the environment variable
+                            `AWS_ACCESS_KEY_ID` is used.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        profile:
+                          description: profile defines the named AWS profile used
+                            to authenticate.
+                          type: string
+                        region:
+                          description: region defines the AWS region. If blank, the
+                            region from the default credentials chain used.
+                          type: string
+                        roleArn:
+                          description: roleArn defines the named AWS profile used
+                            to authenticate.
+                          type: string
+                        secretKey:
+                          description: |-
+                            secretKey defines the AWS API secret. If not specified, the environment
+                            variable `AWS_SECRET_ACCESS_KEY` is used.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        useFIPSSTSEndpoint:
+                          description: |-
+                            useFIPSSTSEndpoint defines the FIPS mode for the AWS STS endpoint.
+                            It requires Prometheus >= v2.54.0.
+                          type: boolean
+                      type: object
+                    tlsConfig:
+                      description: tlsConfig to use for the URL.
+                      properties:
+                        ca:
+                          description: ca defines the Certificate authority used when
+                            verifying server certificates.
+                          properties:
+                            configMap:
+                              description: configMap defines the ConfigMap containing
+                                data to use for the targets.
+                              properties:
+                                key:
+                                  description: The key to select.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the ConfigMap or its
+                                    key must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            secret:
+                              description: secret defines the Secret containing data
+                                to use for the targets.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                          type: object
+                        caFile:
+                          description: caFile defines the path to the CA cert in the
+                            Prometheus container to use for the targets.
+                          type: string
+                        cert:
+                          description: cert defines the Client certificate to present
+                            when doing client-authentication.
+                          properties:
+                            configMap:
+                              description: configMap defines the ConfigMap containing
+                                data to use for the targets.
+                              properties:
+                                key:
+                                  description: The key to select.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the ConfigMap or its
+                                    key must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            secret:
+                              description: secret defines the Secret containing data
+                                to use for the targets.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                          type: object
+                        certFile:
+                          description: certFile defines the path to the client cert
+                            file in the Prometheus container for the targets.
+                          type: string
+                        insecureSkipVerify:
+                          description: insecureSkipVerify defines how to disable target
+                            certificate validation.
+                          type: boolean
+                        keyFile:
+                          description: keyFile defines the path to the client key
+                            file in the Prometheus container for the targets.
+                          type: string
+                        keySecret:
+                          description: keySecret defines the Secret containing the
+                            client key file for the targets.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        maxVersion:
+                          description: |-
+                            maxVersion defines the maximum acceptable TLS version.
+
+                            It requires Prometheus >= v2.41.0 or Thanos >= v0.31.0.
+                          enum:
+                          - TLS10
+                          - TLS11
+                          - TLS12
+                          - TLS13
+                          type: string
+                        minVersion:
+                          description: |-
+                            minVersion defines the minimum acceptable TLS version.
+
+                            It requires Prometheus >= v2.35.0 or Thanos >= v0.28.0.
+                          enum:
+                          - TLS10
+                          - TLS11
+                          - TLS12
+                          - TLS13
+                          type: string
+                        serverName:
+                          description: serverName is used to verify the hostname for
+                            the targets.
+                          type: string
+                      type: object
+                    url:
+                      description: url defines the URL of the endpoint to send samples
+                        to.
+                      minLength: 1
+                      type: string
+                    writeRelabelConfigs:
+                      description: writeRelabelConfigs defines the list of remote
+                        write relabel configurations.
+                      items:
+                        description: |-
+                          RelabelConfig allows dynamic rewriting of the label set for targets, alerts,
+                          scraped samples and remote write samples.
+
+                          More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config
+                        properties:
+                          action:
+                            default: replace
+                            description: |-
+                              action to perform based on the regex matching.
+
+                              `Uppercase` and `Lowercase` actions require Prometheus >= v2.36.0.
+                              `DropEqual` and `KeepEqual` actions require Prometheus >= v2.41.0.
+
+                              Default: "Replace"
+                            enum:
+                            - replace
+                            - Replace
+                            - keep
+                            - Keep
+                            - drop
+                            - Drop
+                            - hashmod
+                            - HashMod
+                            - labelmap
+                            - LabelMap
+                            - labeldrop
+                            - LabelDrop
+                            - labelkeep
+                            - LabelKeep
+                            - lowercase
+                            - Lowercase
+                            - uppercase
+                            - Uppercase
+                            - keepequal
+                            - KeepEqual
+                            - dropequal
+                            - DropEqual
+                            type: string
+                          modulus:
+                            description: |-
+                              modulus to take of the hash of the source label values.
+
+                              Only applicable when the action is `HashMod`.
+                            format: int64
+                            type: integer
+                          regex:
+                            description: regex defines the regular expression against
+                              which the extracted value is matched.
+                            type: string
+                          replacement:
+                            description: |-
+                              replacement value against which a Replace action is performed if the
+                              regular expression matches.
+
+                              Regex capture groups are available.
+                            type: string
+                          separator:
+                            description: separator defines the string between concatenated
+                              SourceLabels.
+                            type: string
+                          sourceLabels:
+                            description: |-
+                              sourceLabels defines the source labels select values from existing labels. Their content is
+                              concatenated using the configured Separator and matched against the
+                              configured regular expression.
+                            items:
+                              description: |-
+                                LabelName is a valid Prometheus label name.
+                                For Prometheus 3.x, a label name is valid if it contains UTF-8 characters.
+                                For Prometheus 2.x, a label name is only valid if it contains ASCII characters, letters, numbers, as well as underscores.
+                              type: string
+                            type: array
+                          targetLabel:
+                            description: |-
+                              targetLabel defines the label to which the resulting string is written in a replacement.
+
+                              It is mandatory for `Replace`, `HashMod`, `Lowercase`, `Uppercase`,
+                              `KeepEqual` and `DropEqual` actions.
+
+                              Regex capture groups are available.
+                            type: string
+                        type: object
+                      type: array
+                  required:
+                  - url
+                  type: object
+                type: array
+              remoteWriteReceiverMessageVersions:
+                description: |-
+                  remoteWriteReceiverMessageVersions list of the protobuf message versions to accept when receiving the
+                  remote writes.
+
+                  It requires Prometheus >= v2.54.0.
+                items:
+                  enum:
+                  - V1.0
+                  - V2.0
+                  type: string
+                minItems: 1
+                type: array
+                x-kubernetes-list-type: set
+              replicaExternalLabelName:
+                description: |-
+                  replicaExternalLabelName defines the name of Prometheus external label used to denote the replica name.
+                  The external label will _not_ be added when the field is set to the
+                  empty string (`""`).
+
+                  Default: "prometheus_replica"
+                type: string
+              replicas:
+                description: |-
+                  replicas defines the number of replicas of each shard to deploy for a Prometheus deployment.
+                  `spec.replicas` multiplied by `spec.shards` is the total number of Pods
+                  created.
+
+                  Default: 1
+                format: int32
+                type: integer
+              resources:
+                description: resources defines the resources requests and limits of
+                  the 'prometheus' container.
+                properties:
+                  claims:
+                    description: |-
+                      Claims lists the names of resources, defined in spec.resourceClaims,
+                      that are used by this container.
+
+                      This field depends on the
+                      DynamicResourceAllocation feature gate.
+
+                      This field is immutable. It can only be set for containers.
+                    items:
+                      description: ResourceClaim references one entry in PodSpec.ResourceClaims.
+                      properties:
+                        name:
+                          description: |-
+                            Name must match the name of one entry in pod.spec.resourceClaims of
+                            the Pod where this field is used. It makes that resource available
+                            inside a container.
+                          type: string
+                        request:
+                          description: |-
+                            Request is the name chosen for a request in the referenced claim.
+                            If empty, everything from the claim is made available, otherwise
+                            only the result of this request.
+                          type: string
+                      required:
+                      - name
+                      type: object
+                    type: array
+                    x-kubernetes-list-map-keys:
+                    - name
+                    x-kubernetes-list-type: map
+                  limits:
+                    additionalProperties:
+                      anyOf:
+                      - type: integer
+                      - type: string
+                      pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                      x-kubernetes-int-or-string: true
+                    description: |-
+                      Limits describes the maximum amount of compute resources allowed.
+                      More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+                    type: object
+                  requests:
+                    additionalProperties:
+                      anyOf:
+                      - type: integer
+                      - type: string
+                      pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                      x-kubernetes-int-or-string: true
+                    description: |-
+                      Requests describes the minimum amount of compute resources required.
+                      If Requests is omitted for a container, it defaults to Limits if that is explicitly specified,
+                      otherwise to an implementation-defined value. Requests cannot exceed Limits.
+                      More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+                    type: object
+                type: object
+              retention:
+                description: |-
+                  retention defines how long to retain the Prometheus data.
+
+                  Default: "24h" if `spec.retention` and `spec.retentionSize` are empty.
+                pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
+                type: string
+              retentionSize:
+                description: retentionSize defines the maximum number of bytes used
+                  by the Prometheus data.
+                pattern: (^0|([0-9]*[.])?[0-9]+((K|M|G|T|E|P)i?)?B)$
+                type: string
+              routePrefix:
+                description: |-
+                  routePrefix defines the route prefix Prometheus registers HTTP handlers for.
+
+                  This is useful when using `spec.externalURL`, and a proxy is rewriting
+                  HTTP routes of a request, and the actual ExternalURL is still true, but
+                  the server serves requests under a different route prefix. For example
+                  for use with `kubectl proxy`.
+                type: string
+              ruleNamespaceSelector:
+                description: |-
+                  ruleNamespaceSelector defines the namespaces to match for PrometheusRule discovery. An empty label selector
+                  matches all namespaces. A null label selector matches the current
+                  namespace only.
+                properties:
+                  matchExpressions:
+                    description: matchExpressions is a list of label selector requirements.
+                      The requirements are ANDed.
+                    items:
+                      description: |-
+                        A label selector requirement is a selector that contains values, a key, and an operator that
+                        relates the key and values.
+                      properties:
+                        key:
+                          description: key is the label key that the selector applies
+                            to.
+                          type: string
+                        operator:
+                          description: |-
+                            operator represents a key's relationship to a set of values.
+                            Valid operators are In, NotIn, Exists and DoesNotExist.
+                          type: string
+                        values:
+                          description: |-
+                            values is an array of string values. If the operator is In or NotIn,
+                            the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                            the values array must be empty. This array is replaced during a strategic
+                            merge patch.
+                          items:
+                            type: string
+                          type: array
+                          x-kubernetes-list-type: atomic
+                      required:
+                      - key
+                      - operator
+                      type: object
+                    type: array
+                    x-kubernetes-list-type: atomic
+                  matchLabels:
+                    additionalProperties:
+                      type: string
+                    description: |-
+                      matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                      map is equivalent to an element of matchExpressions, whose key field is "key", the
+                      operator is "In", and the values array contains only "value". The requirements are ANDed.
+                    type: object
+                type: object
+                x-kubernetes-map-type: atomic
+              ruleQueryOffset:
+                description: |-
+                  ruleQueryOffset defines the offset the rule evaluation timestamp of this particular group by the specified duration into the past.
+                  It requires Prometheus >= v2.53.0.
+                pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
+                type: string
+              ruleSelector:
+                description: |-
+                  ruleSelector defines the prometheusRule objects to be selected for rule evaluation. An empty
+                  label selector matches all objects. A null label selector matches no
+                  objects.
+                properties:
+                  matchExpressions:
+                    description: matchExpressions is a list of label selector requirements.
+                      The requirements are ANDed.
+                    items:
+                      description: |-
+                        A label selector requirement is a selector that contains values, a key, and an operator that
+                        relates the key and values.
+                      properties:
+                        key:
+                          description: key is the label key that the selector applies
+                            to.
+                          type: string
+                        operator:
+                          description: |-
+                            operator represents a key's relationship to a set of values.
+                            Valid operators are In, NotIn, Exists and DoesNotExist.
+                          type: string
+                        values:
+                          description: |-
+                            values is an array of string values. If the operator is In or NotIn,
+                            the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                            the values array must be empty. This array is replaced during a strategic
+                            merge patch.
+                          items:
+                            type: string
+                          type: array
+                          x-kubernetes-list-type: atomic
+                      required:
+                      - key
+                      - operator
+                      type: object
+                    type: array
+                    x-kubernetes-list-type: atomic
+                  matchLabels:
+                    additionalProperties:
+                      type: string
+                    description: |-
+                      matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                      map is equivalent to an element of matchExpressions, whose key field is "key", the
+                      operator is "In", and the values array contains only "value". The requirements are ANDed.
+                    type: object
+                type: object
+                x-kubernetes-map-type: atomic
+              rules:
+                description: rules defines the configuration of the Prometheus rules'
+                  engine.
+                properties:
+                  alert:
+                    description: |-
+                      alert defines the parameters of the Prometheus rules' engine.
+
+                      Any update to these parameters trigger a restart of the pods.
+                    properties:
+                      forGracePeriod:
+                        description: |-
+                          forGracePeriod defines the minimum duration between alert and restored 'for' state.
+
+                          This is maintained only for alerts with a configured 'for' time greater
+                          than the grace period.
+                        type: string
+                      forOutageTolerance:
+                        description: |-
+                          forOutageTolerance defines the max time to tolerate prometheus outage for restoring 'for' state of
+                          alert.
+                        type: string
+                      resendDelay:
+                        description: |-
+                          resendDelay defines the minimum amount of time to wait before resending an alert to
+                          Alertmanager.
+                        type: string
+                    type: object
+                type: object
+              runtime:
+                description: runtime defines the values for the Prometheus process
+                  behavior
+                properties:
+                  goGC:
+                    description: |-
+                      goGC defines the Go garbage collection target percentage. Lowering this number may increase the CPU usage.
+                      See: https://tip.golang.org/doc/gc-guide#GOGC
+                    format: int32
+                    minimum: -1
+                    type: integer
+                type: object
+              sampleLimit:
+                description: |-
+                  sampleLimit defines per-scrape limit on number of scraped samples that will be accepted.
+                  Only valid in Prometheus versions 2.45.0 and newer.
+
+                  Note that the global limit only applies to scrape objects that don't specify an explicit limit value.
+                  If you want to enforce a maximum limit for all scrape objects, refer to enforcedSampleLimit.
+                format: int64
+                type: integer
+              scrapeClasses:
+                description: |-
+                  scrapeClasses defines the list of scrape classes to expose to scraping objects such as
+                  PodMonitors, ServiceMonitors, Probes and ScrapeConfigs.
+
+                  This is an *experimental feature*, it may change in any upcoming release
+                  in a breaking way.
+                items:
+                  properties:
+                    attachMetadata:
+                      description: |-
+                        attachMetadata defines additional metadata to the discovered targets.
+                        When the scrape object defines its own configuration, it takes
+                        precedence over the scrape class configuration.
+                      properties:
+                        node:
+                          description: |-
+                            node when set to true, Prometheus attaches node metadata to the discovered
+                            targets.
+
+                            The Prometheus service account must have the `list` and `watch`
+                            permissions on the `Nodes` objects.
+                          type: boolean
+                      type: object
+                    authorization:
+                      description: |-
+                        authorization section for the ScrapeClass.
+                        It will only apply if the scrape resource doesn't specify any Authorization.
+                      properties:
+                        credentials:
+                          description: credentials defines a key of a Secret in the
+                            namespace that contains the credentials for authentication.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        credentialsFile:
+                          description: credentialsFile defines the file to read a
+                            secret from, mutually exclusive with `credentials`.
+                          type: string
+                        type:
+                          description: |-
+                            type defines the authentication type. The value is case-insensitive.
+
+                            "Basic" is not a supported value.
+
+                            Default: "Bearer"
+                          type: string
+                      type: object
+                    default:
+                      description: |-
+                        default defines that the scrape applies to all scrape objects that
+                        don't configure an explicit scrape class name.
+
+                        Only one scrape class can be set as the default.
+                      type: boolean
+                    fallbackScrapeProtocol:
+                      description: |-
+                        fallbackScrapeProtocol defines the protocol to use if a scrape returns blank, unparseable, or otherwise invalid Content-Type.
+                        It will only apply if the scrape resource doesn't specify any FallbackScrapeProtocol
+
+                        It requires Prometheus >= v3.0.0.
+                      enum:
+                      - PrometheusProto
+                      - OpenMetricsText0.0.1
+                      - OpenMetricsText1.0.0
+                      - PrometheusText0.0.4
+                      - PrometheusText1.0.0
+                      type: string
+                    metricRelabelings:
+                      description: |-
+                        metricRelabelings defines the relabeling rules to apply to all samples before ingestion.
+
+                        The Operator adds the scrape class metric relabelings defined here.
+                        Then the Operator adds the target-specific metric relabelings defined in ServiceMonitors, PodMonitors, Probes and ScrapeConfigs.
+                        Then the Operator adds namespace enforcement relabeling rule, specified in '.spec.enforcedNamespaceLabel'.
+
+                        More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#metric_relabel_configs
+                      items:
+                        description: |-
+                          RelabelConfig allows dynamic rewriting of the label set for targets, alerts,
+                          scraped samples and remote write samples.
+
+                          More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config
+                        properties:
+                          action:
+                            default: replace
+                            description: |-
+                              action to perform based on the regex matching.
+
+                              `Uppercase` and `Lowercase` actions require Prometheus >= v2.36.0.
+                              `DropEqual` and `KeepEqual` actions require Prometheus >= v2.41.0.
+
+                              Default: "Replace"
+                            enum:
+                            - replace
+                            - Replace
+                            - keep
+                            - Keep
+                            - drop
+                            - Drop
+                            - hashmod
+                            - HashMod
+                            - labelmap
+                            - LabelMap
+                            - labeldrop
+                            - LabelDrop
+                            - labelkeep
+                            - LabelKeep
+                            - lowercase
+                            - Lowercase
+                            - uppercase
+                            - Uppercase
+                            - keepequal
+                            - KeepEqual
+                            - dropequal
+                            - DropEqual
+                            type: string
+                          modulus:
+                            description: |-
+                              modulus to take of the hash of the source label values.
+
+                              Only applicable when the action is `HashMod`.
+                            format: int64
+                            type: integer
+                          regex:
+                            description: regex defines the regular expression against
+                              which the extracted value is matched.
+                            type: string
+                          replacement:
+                            description: |-
+                              replacement value against which a Replace action is performed if the
+                              regular expression matches.
+
+                              Regex capture groups are available.
+                            type: string
+                          separator:
+                            description: separator defines the string between concatenated
+                              SourceLabels.
+                            type: string
+                          sourceLabels:
+                            description: |-
+                              sourceLabels defines the source labels select values from existing labels. Their content is
+                              concatenated using the configured Separator and matched against the
+                              configured regular expression.
+                            items:
+                              description: |-
+                                LabelName is a valid Prometheus label name.
+                                For Prometheus 3.x, a label name is valid if it contains UTF-8 characters.
+                                For Prometheus 2.x, a label name is only valid if it contains ASCII characters, letters, numbers, as well as underscores.
+                              type: string
+                            type: array
+                          targetLabel:
+                            description: |-
+                              targetLabel defines the label to which the resulting string is written in a replacement.
+
+                              It is mandatory for `Replace`, `HashMod`, `Lowercase`, `Uppercase`,
+                              `KeepEqual` and `DropEqual` actions.
+
+                              Regex capture groups are available.
+                            type: string
+                        type: object
+                      type: array
+                    name:
+                      description: name of the scrape class.
+                      minLength: 1
+                      type: string
+                    relabelings:
+                      description: |-
+                        relabelings defines the relabeling rules to apply to all scrape targets.
+
+                        The Operator automatically adds relabelings for a few standard Kubernetes fields
+                        like `__meta_kubernetes_namespace` and `__meta_kubernetes_service_name`.
+                        Then the Operator adds the scrape class relabelings defined here.
+                        Then the Operator adds the target-specific relabelings defined in the scrape object.
+
+                        More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config
+                      items:
+                        description: |-
+                          RelabelConfig allows dynamic rewriting of the label set for targets, alerts,
+                          scraped samples and remote write samples.
+
+                          More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config
+                        properties:
+                          action:
+                            default: replace
+                            description: |-
+                              action to perform based on the regex matching.
+
+                              `Uppercase` and `Lowercase` actions require Prometheus >= v2.36.0.
+                              `DropEqual` and `KeepEqual` actions require Prometheus >= v2.41.0.
+
+                              Default: "Replace"
+                            enum:
+                            - replace
+                            - Replace
+                            - keep
+                            - Keep
+                            - drop
+                            - Drop
+                            - hashmod
+                            - HashMod
+                            - labelmap
+                            - LabelMap
+                            - labeldrop
+                            - LabelDrop
+                            - labelkeep
+                            - LabelKeep
+                            - lowercase
+                            - Lowercase
+                            - uppercase
+                            - Uppercase
+                            - keepequal
+                            - KeepEqual
+                            - dropequal
+                            - DropEqual
+                            type: string
+                          modulus:
+                            description: |-
+                              modulus to take of the hash of the source label values.
+
+                              Only applicable when the action is `HashMod`.
+                            format: int64
+                            type: integer
+                          regex:
+                            description: regex defines the regular expression against
+                              which the extracted value is matched.
+                            type: string
+                          replacement:
+                            description: |-
+                              replacement value against which a Replace action is performed if the
+                              regular expression matches.
+
+                              Regex capture groups are available.
+                            type: string
+                          separator:
+                            description: separator defines the string between concatenated
+                              SourceLabels.
+                            type: string
+                          sourceLabels:
+                            description: |-
+                              sourceLabels defines the source labels select values from existing labels. Their content is
+                              concatenated using the configured Separator and matched against the
+                              configured regular expression.
+                            items:
+                              description: |-
+                                LabelName is a valid Prometheus label name.
+                                For Prometheus 3.x, a label name is valid if it contains UTF-8 characters.
+                                For Prometheus 2.x, a label name is only valid if it contains ASCII characters, letters, numbers, as well as underscores.
+                              type: string
+                            type: array
+                          targetLabel:
+                            description: |-
+                              targetLabel defines the label to which the resulting string is written in a replacement.
+
+                              It is mandatory for `Replace`, `HashMod`, `Lowercase`, `Uppercase`,
+                              `KeepEqual` and `DropEqual` actions.
+
+                              Regex capture groups are available.
+                            type: string
+                        type: object
+                      type: array
+                    tlsConfig:
+                      description: |-
+                        tlsConfig defines the TLS settings to use for the scrape. When the
+                        scrape objects define their own CA, certificate and/or key, they take
+                        precedence over the corresponding scrape class fields.
+
+                        For now only the `caFile`, `certFile` and `keyFile` fields are supported.
+                      properties:
+                        ca:
+                          description: ca defines the Certificate authority used when
+                            verifying server certificates.
+                          properties:
+                            configMap:
+                              description: configMap defines the ConfigMap containing
+                                data to use for the targets.
+                              properties:
+                                key:
+                                  description: The key to select.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the ConfigMap or its
+                                    key must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            secret:
+                              description: secret defines the Secret containing data
+                                to use for the targets.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                          type: object
+                        caFile:
+                          description: caFile defines the path to the CA cert in the
+                            Prometheus container to use for the targets.
+                          type: string
+                        cert:
+                          description: cert defines the Client certificate to present
+                            when doing client-authentication.
+                          properties:
+                            configMap:
+                              description: configMap defines the ConfigMap containing
+                                data to use for the targets.
+                              properties:
+                                key:
+                                  description: The key to select.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the ConfigMap or its
+                                    key must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            secret:
+                              description: secret defines the Secret containing data
+                                to use for the targets.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                          type: object
+                        certFile:
+                          description: certFile defines the path to the client cert
+                            file in the Prometheus container for the targets.
+                          type: string
+                        insecureSkipVerify:
+                          description: insecureSkipVerify defines how to disable target
+                            certificate validation.
+                          type: boolean
+                        keyFile:
+                          description: keyFile defines the path to the client key
+                            file in the Prometheus container for the targets.
+                          type: string
+                        keySecret:
+                          description: keySecret defines the Secret containing the
+                            client key file for the targets.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        maxVersion:
+                          description: |-
+                            maxVersion defines the maximum acceptable TLS version.
+
+                            It requires Prometheus >= v2.41.0 or Thanos >= v0.31.0.
+                          enum:
+                          - TLS10
+                          - TLS11
+                          - TLS12
+                          - TLS13
+                          type: string
+                        minVersion:
+                          description: |-
+                            minVersion defines the minimum acceptable TLS version.
+
+                            It requires Prometheus >= v2.35.0 or Thanos >= v0.28.0.
+                          enum:
+                          - TLS10
+                          - TLS11
+                          - TLS12
+                          - TLS13
+                          type: string
+                        serverName:
+                          description: serverName is used to verify the hostname for
+                            the targets.
+                          type: string
+                      type: object
+                  required:
+                  - name
+                  type: object
+                type: array
+                x-kubernetes-list-map-keys:
+                - name
+                x-kubernetes-list-type: map
+              scrapeClassicHistograms:
+                description: |-
+                  scrapeClassicHistograms defines whether to scrape a classic histogram that is also exposed as a native histogram.
+
+                  Notice: `scrapeClassicHistograms` corresponds to the `always_scrape_classic_histograms` field in the Prometheus configuration.
+
+                  It requires Prometheus >= v3.5.0.
+                type: boolean
+              scrapeConfigNamespaceSelector:
+                description: |-
+                  scrapeConfigNamespaceSelector defines the namespaces to match for ScrapeConfig discovery. An empty label selector
+                  matches all namespaces. A null label selector matches the current
+                  namespace only.
+
+                  Note that the ScrapeConfig custom resource definition is currently at Alpha level.
+                properties:
+                  matchExpressions:
+                    description: matchExpressions is a list of label selector requirements.
+                      The requirements are ANDed.
+                    items:
+                      description: |-
+                        A label selector requirement is a selector that contains values, a key, and an operator that
+                        relates the key and values.
+                      properties:
+                        key:
+                          description: key is the label key that the selector applies
+                            to.
+                          type: string
+                        operator:
+                          description: |-
+                            operator represents a key's relationship to a set of values.
+                            Valid operators are In, NotIn, Exists and DoesNotExist.
+                          type: string
+                        values:
+                          description: |-
+                            values is an array of string values. If the operator is In or NotIn,
+                            the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                            the values array must be empty. This array is replaced during a strategic
+                            merge patch.
+                          items:
+                            type: string
+                          type: array
+                          x-kubernetes-list-type: atomic
+                      required:
+                      - key
+                      - operator
+                      type: object
+                    type: array
+                    x-kubernetes-list-type: atomic
+                  matchLabels:
+                    additionalProperties:
+                      type: string
+                    description: |-
+                      matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                      map is equivalent to an element of matchExpressions, whose key field is "key", the
+                      operator is "In", and the values array contains only "value". The requirements are ANDed.
+                    type: object
+                type: object
+                x-kubernetes-map-type: atomic
+              scrapeConfigSelector:
+                description: |-
+                  scrapeConfigSelector defines the scrapeConfigs to be selected for target discovery. An empty label
+                  selector matches all objects. A null label selector matches no objects.
+
+                  If `spec.serviceMonitorSelector`, `spec.podMonitorSelector`, `spec.probeSelector`
+                  and `spec.scrapeConfigSelector` are null, the Prometheus configuration is unmanaged.
+                  The Prometheus operator will ensure that the Prometheus configuration's
+                  Secret exists, but it is the responsibility of the user to provide the raw
+                  gzipped Prometheus configuration under the `prometheus.yaml.gz` key.
+                  This behavior is *deprecated* and will be removed in the next major version
+                  of the custom resource definition. It is recommended to use
+                  `spec.additionalScrapeConfigs` instead.
+
+                  Note that the ScrapeConfig custom resource definition is currently at Alpha level.
+                properties:
+                  matchExpressions:
+                    description: matchExpressions is a list of label selector requirements.
+                      The requirements are ANDed.
+                    items:
+                      description: |-
+                        A label selector requirement is a selector that contains values, a key, and an operator that
+                        relates the key and values.
+                      properties:
+                        key:
+                          description: key is the label key that the selector applies
+                            to.
+                          type: string
+                        operator:
+                          description: |-
+                            operator represents a key's relationship to a set of values.
+                            Valid operators are In, NotIn, Exists and DoesNotExist.
+                          type: string
+                        values:
+                          description: |-
+                            values is an array of string values. If the operator is In or NotIn,
+                            the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                            the values array must be empty. This array is replaced during a strategic
+                            merge patch.
+                          items:
+                            type: string
+                          type: array
+                          x-kubernetes-list-type: atomic
+                      required:
+                      - key
+                      - operator
+                      type: object
+                    type: array
+                    x-kubernetes-list-type: atomic
+                  matchLabels:
+                    additionalProperties:
+                      type: string
+                    description: |-
+                      matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                      map is equivalent to an element of matchExpressions, whose key field is "key", the
+                      operator is "In", and the values array contains only "value". The requirements are ANDed.
+                    type: object
+                type: object
+                x-kubernetes-map-type: atomic
+              scrapeFailureLogFile:
+                description: |-
+                  scrapeFailureLogFile defines the file to which scrape failures are logged.
+                  Reloading the configuration will reopen the file.
+
+                  If the filename has an empty path, e.g. 'file.log', The Prometheus Pods
+                  will mount the file into an emptyDir volume at `/var/log/prometheus`.
+                  If a full path is provided, e.g. '/var/log/prometheus/file.log', you
+                  must mount a volume in the specified directory and it must be writable.
+                  It requires Prometheus >= v2.55.0.
+                minLength: 1
+                type: string
+              scrapeInterval:
+                default: 30s
+                description: |-
+                  scrapeInterval defines interval between consecutive scrapes.
+
+                  Default: "30s"
+                pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
+                type: string
+              scrapeProtocols:
+                description: |-
+                  scrapeProtocols defines the protocols to negotiate during a scrape. It tells clients the
+                  protocols supported by Prometheus in order of preference (from most to least preferred).
+
+                  If unset, Prometheus uses its default value.
+
+                  It requires Prometheus >= v2.49.0.
+
+                  `PrometheusText1.0.0` requires Prometheus >= v3.0.0.
+                items:
+                  description: |-
+                    ScrapeProtocol represents a protocol used by Prometheus for scraping metrics.
+                    Supported values are:
+                    * `OpenMetricsText0.0.1`
+                    * `OpenMetricsText1.0.0`
+                    * `PrometheusProto`
+                    * `PrometheusText0.0.4`
+                    * `PrometheusText1.0.0`
+                  enum:
+                  - PrometheusProto
+                  - OpenMetricsText0.0.1
+                  - OpenMetricsText1.0.0
+                  - PrometheusText0.0.4
+                  - PrometheusText1.0.0
+                  type: string
+                type: array
+                x-kubernetes-list-type: set
+              scrapeTimeout:
+                description: |-
+                  scrapeTimeout defines the number of seconds to wait until a scrape request times out.
+                  The value cannot be greater than the scrape interval otherwise the operator will reject the resource.
+                pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
+                type: string
+              secrets:
+                description: |-
+                  secrets defines a list of Secrets in the same namespace as the Prometheus
+                  object, which shall be mounted into the Prometheus Pods.
+                  Each Secret is added to the StatefulSet definition as a volume named `secret-<secret-name>`.
+                  The Secrets are mounted into /etc/prometheus/secrets/<secret-name> in the 'prometheus' container.
+                items:
+                  type: string
+                type: array
+                x-kubernetes-list-type: set
+              securityContext:
+                description: |-
+                  securityContext holds pod-level security attributes and common container settings.
+                  This defaults to the default PodSecurityContext.
+                properties:
+                  appArmorProfile:
+                    description: |-
+                      appArmorProfile is the AppArmor options to use by the containers in this pod.
+                      Note that this field cannot be set when spec.os.name is windows.
+                    properties:
+                      localhostProfile:
+                        description: |-
+                          localhostProfile indicates a profile loaded on the node that should be used.
+                          The profile must be preconfigured on the node to work.
+                          Must match the loaded name of the profile.
+                          Must be set if and only if type is "Localhost".
+                        type: string
+                      type:
+                        description: |-
+                          type indicates which kind of AppArmor profile will be applied.
+                          Valid options are:
+                            Localhost - a profile pre-loaded on the node.
+                            RuntimeDefault - the container runtime's default profile.
+                            Unconfined - no AppArmor enforcement.
+                        type: string
+                    required:
+                    - type
+                    type: object
+                  fsGroup:
+                    description: |-
+                      A special supplemental group that applies to all containers in a pod.
+                      Some volume types allow the Kubelet to change the ownership of that volume
+                      to be owned by the pod:
+
+                      1. The owning GID will be the FSGroup
+                      2. The setgid bit is set (new files created in the volume will be owned by FSGroup)
+                      3. The permission bits are OR'd with rw-rw----
+
+                      If unset, the Kubelet will not modify the ownership and permissions of any volume.
+                      Note that this field cannot be set when spec.os.name is windows.
+                    format: int64
+                    type: integer
+                  fsGroupChangePolicy:
+                    description: |-
+                      fsGroupChangePolicy defines behavior of changing ownership and permission of the volume
+                      before being exposed inside Pod. This field will only apply to
+                      volume types which support fsGroup based ownership(and permissions).
+                      It will have no effect on ephemeral volume types such as: secret, configmaps
+                      and emptydir.
+                      Valid values are "OnRootMismatch" and "Always". If not specified, "Always" is used.
+                      Note that this field cannot be set when spec.os.name is windows.
+                    type: string
+                  runAsGroup:
+                    description: |-
+                      The GID to run the entrypoint of the container process.
+                      Uses runtime default if unset.
+                      May also be set in SecurityContext.  If set in both SecurityContext and
+                      PodSecurityContext, the value specified in SecurityContext takes precedence
+                      for that container.
+                      Note that this field cannot be set when spec.os.name is windows.
+                    format: int64
+                    type: integer
+                  runAsNonRoot:
+                    description: |-
+                      Indicates that the container must run as a non-root user.
+                      If true, the Kubelet will validate the image at runtime to ensure that it
+                      does not run as UID 0 (root) and fail to start the container if it does.
+                      If unset or false, no such validation will be performed.
+                      May also be set in SecurityContext.  If set in both SecurityContext and
+                      PodSecurityContext, the value specified in SecurityContext takes precedence.
+                    type: boolean
+                  runAsUser:
+                    description: |-
+                      The UID to run the entrypoint of the container process.
+                      Defaults to user specified in image metadata if unspecified.
+                      May also be set in SecurityContext.  If set in both SecurityContext and
+                      PodSecurityContext, the value specified in SecurityContext takes precedence
+                      for that container.
+                      Note that this field cannot be set when spec.os.name is windows.
+                    format: int64
+                    type: integer
+                  seLinuxChangePolicy:
+                    description: |-
+                      seLinuxChangePolicy defines how the container's SELinux label is applied to all volumes used by the Pod.
+                      It has no effect on nodes that do not support SELinux or to volumes does not support SELinux.
+                      Valid values are "MountOption" and "Recursive".
+
+                      "Recursive" means relabeling of all files on all Pod volumes by the container runtime.
+                      This may be slow for large volumes, but allows mixing privileged and unprivileged Pods sharing the same volume on the same node.
+
+                      "MountOption" mounts all eligible Pod volumes with `-o context` mount option.
+                      This requires all Pods that share the same volume to use the same SELinux label.
+                      It is not possible to share the same volume among privileged and unprivileged Pods.
+                      Eligible volumes are in-tree FibreChannel and iSCSI volumes, and all CSI volumes
+                      whose CSI driver announces SELinux support by setting spec.seLinuxMount: true in their
+                      CSIDriver instance. Other volumes are always re-labelled recursively.
+                      "MountOption" value is allowed only when SELinuxMount feature gate is enabled.
+
+                      If not specified and SELinuxMount feature gate is enabled, "MountOption" is used.
+                      If not specified and SELinuxMount feature gate is disabled, "MountOption" is used for ReadWriteOncePod volumes
+                      and "Recursive" for all other volumes.
+
+                      This field affects only Pods that have SELinux label set, either in PodSecurityContext or in SecurityContext of all containers.
+
+                      All Pods that use the same volume should use the same seLinuxChangePolicy, otherwise some pods can get stuck in ContainerCreating state.
+                      Note that this field cannot be set when spec.os.name is windows.
+                    type: string
+                  seLinuxOptions:
+                    description: |-
+                      The SELinux context to be applied to all containers.
+                      If unspecified, the container runtime will allocate a random SELinux context for each
+                      container.  May also be set in SecurityContext.  If set in
+                      both SecurityContext and PodSecurityContext, the value specified in SecurityContext
+                      takes precedence for that container.
+                      Note that this field cannot be set when spec.os.name is windows.
+                    properties:
+                      level:
+                        description: Level is SELinux level label that applies to
+                          the container.
+                        type: string
+                      role:
+                        description: Role is a SELinux role label that applies to
+                          the container.
+                        type: string
+                      type:
+                        description: Type is a SELinux type label that applies to
+                          the container.
+                        type: string
+                      user:
+                        description: User is a SELinux user label that applies to
+                          the container.
+                        type: string
+                    type: object
+                  seccompProfile:
+                    description: |-
+                      The seccomp options to use by the containers in this pod.
+                      Note that this field cannot be set when spec.os.name is windows.
+                    properties:
+                      localhostProfile:
+                        description: |-
+                          localhostProfile indicates a profile defined in a file on the node should be used.
+                          The profile must be preconfigured on the node to work.
+                          Must be a descending path, relative to the kubelet's configured seccomp profile location.
+                          Must be set if type is "Localhost". Must NOT be set for any other type.
+                        type: string
+                      type:
+                        description: |-
+                          type indicates which kind of seccomp profile will be applied.
+                          Valid options are:
+
+                          Localhost - a profile defined in a file on the node should be used.
+                          RuntimeDefault - the container runtime default profile should be used.
+                          Unconfined - no profile should be applied.
+                        type: string
+                    required:
+                    - type
+                    type: object
+                  supplementalGroups:
+                    description: |-
+                      A list of groups applied to the first process run in each container, in
+                      addition to the container's primary GID and fsGroup (if specified).  If
+                      the SupplementalGroupsPolicy feature is enabled, the
+                      supplementalGroupsPolicy field determines whether these are in addition
+                      to or instead of any group memberships defined in the container image.
+                      If unspecified, no additional groups are added, though group memberships
+                      defined in the container image may still be used, depending on the
+                      supplementalGroupsPolicy field.
+                      Note that this field cannot be set when spec.os.name is windows.
+                    items:
+                      format: int64
+                      type: integer
+                    type: array
+                    x-kubernetes-list-type: atomic
+                  supplementalGroupsPolicy:
+                    description: |-
+                      Defines how supplemental groups of the first container processes are calculated.
+                      Valid values are "Merge" and "Strict". If not specified, "Merge" is used.
+                      (Alpha) Using the field requires the SupplementalGroupsPolicy feature gate to be enabled
+                      and the container runtime must implement support for this feature.
+                      Note that this field cannot be set when spec.os.name is windows.
+                    type: string
+                  sysctls:
+                    description: |-
+                      Sysctls hold a list of namespaced sysctls used for the pod. Pods with unsupported
+                      sysctls (by the container runtime) might fail to launch.
+                      Note that this field cannot be set when spec.os.name is windows.
+                    items:
+                      description: Sysctl defines a kernel parameter to be set
+                      properties:
+                        name:
+                          description: Name of a property to set
+                          type: string
+                        value:
+                          description: Value of a property to set
+                          type: string
+                      required:
+                      - name
+                      - value
+                      type: object
+                    type: array
+                    x-kubernetes-list-type: atomic
+                  windowsOptions:
+                    description: |-
+                      The Windows specific settings applied to all containers.
+                      If unspecified, the options within a container's SecurityContext will be used.
+                      If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence.
+                      Note that this field cannot be set when spec.os.name is linux.
+                    properties:
+                      gmsaCredentialSpec:
+                        description: |-
+                          GMSACredentialSpec is where the GMSA admission webhook
+                          (https://github.com/kubernetes-sigs/windows-gmsa) inlines the contents of the
+                          GMSA credential spec named by the GMSACredentialSpecName field.
+                        type: string
+                      gmsaCredentialSpecName:
+                        description: GMSACredentialSpecName is the name of the GMSA
+                          credential spec to use.
+                        type: string
+                      hostProcess:
+                        description: |-
+                          HostProcess determines if a container should be run as a 'Host Process' container.
+                          All of a Pod's containers must have the same effective HostProcess value
+                          (it is not allowed to have a mix of HostProcess containers and non-HostProcess containers).
+                          In addition, if HostProcess is true then HostNetwork must also be set to true.
+                        type: boolean
+                      runAsUserName:
+                        description: |-
+                          The UserName in Windows to run the entrypoint of the container process.
+                          Defaults to the user specified in image metadata if unspecified.
+                          May also be set in PodSecurityContext. If set in both SecurityContext and
+                          PodSecurityContext, the value specified in SecurityContext takes precedence.
+                        type: string
+                    type: object
+                type: object
+              serviceAccountName:
+                description: |-
+                  serviceAccountName is the name of the ServiceAccount to use to run the
+                  Prometheus Pods.
+                type: string
+              serviceDiscoveryRole:
+                description: |-
+                  serviceDiscoveryRole defines the service discovery role used to discover targets from
+                  `ServiceMonitor` objects and Alertmanager endpoints.
+
+                  If set, the value should be either "Endpoints" or "EndpointSlice".
+                  If unset, the operator assumes the "Endpoints" role.
+                enum:
+                - Endpoints
+                - EndpointSlice
+                type: string
+              serviceMonitorNamespaceSelector:
+                description: |-
+                  serviceMonitorNamespaceSelector defines the namespaces to match for ServicedMonitors discovery. An empty label selector
+                  matches all namespaces. A null label selector (default value) matches the current
+                  namespace only.
+                properties:
+                  matchExpressions:
+                    description: matchExpressions is a list of label selector requirements.
+                      The requirements are ANDed.
+                    items:
+                      description: |-
+                        A label selector requirement is a selector that contains values, a key, and an operator that
+                        relates the key and values.
+                      properties:
+                        key:
+                          description: key is the label key that the selector applies
+                            to.
+                          type: string
+                        operator:
+                          description: |-
+                            operator represents a key's relationship to a set of values.
+                            Valid operators are In, NotIn, Exists and DoesNotExist.
+                          type: string
+                        values:
+                          description: |-
+                            values is an array of string values. If the operator is In or NotIn,
+                            the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                            the values array must be empty. This array is replaced during a strategic
+                            merge patch.
+                          items:
+                            type: string
+                          type: array
+                          x-kubernetes-list-type: atomic
+                      required:
+                      - key
+                      - operator
+                      type: object
+                    type: array
+                    x-kubernetes-list-type: atomic
+                  matchLabels:
+                    additionalProperties:
+                      type: string
+                    description: |-
+                      matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                      map is equivalent to an element of matchExpressions, whose key field is "key", the
+                      operator is "In", and the values array contains only "value". The requirements are ANDed.
+                    type: object
+                type: object
+                x-kubernetes-map-type: atomic
+              serviceMonitorSelector:
+                description: |-
+                  serviceMonitorSelector defines the serviceMonitors to be selected for target discovery. An empty label
+                  selector matches all objects. A null label selector matches no objects.
+
+                  If `spec.serviceMonitorSelector`, `spec.podMonitorSelector`, `spec.probeSelector`
+                  and `spec.scrapeConfigSelector` are null, the Prometheus configuration is unmanaged.
+                  The Prometheus operator will ensure that the Prometheus configuration's
+                  Secret exists, but it is the responsibility of the user to provide the raw
+                  gzipped Prometheus configuration under the `prometheus.yaml.gz` key.
+                  This behavior is *deprecated* and will be removed in the next major version
+                  of the custom resource definition. It is recommended to use
+                  `spec.additionalScrapeConfigs` instead.
+                properties:
+                  matchExpressions:
+                    description: matchExpressions is a list of label selector requirements.
+                      The requirements are ANDed.
+                    items:
+                      description: |-
+                        A label selector requirement is a selector that contains values, a key, and an operator that
+                        relates the key and values.
+                      properties:
+                        key:
+                          description: key is the label key that the selector applies
+                            to.
+                          type: string
+                        operator:
+                          description: |-
+                            operator represents a key's relationship to a set of values.
+                            Valid operators are In, NotIn, Exists and DoesNotExist.
+                          type: string
+                        values:
+                          description: |-
+                            values is an array of string values. If the operator is In or NotIn,
+                            the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                            the values array must be empty. This array is replaced during a strategic
+                            merge patch.
+                          items:
+                            type: string
+                          type: array
+                          x-kubernetes-list-type: atomic
+                      required:
+                      - key
+                      - operator
+                      type: object
+                    type: array
+                    x-kubernetes-list-type: atomic
+                  matchLabels:
+                    additionalProperties:
+                      type: string
+                    description: |-
+                      matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                      map is equivalent to an element of matchExpressions, whose key field is "key", the
+                      operator is "In", and the values array contains only "value". The requirements are ANDed.
+                    type: object
+                type: object
+                x-kubernetes-map-type: atomic
+              serviceName:
+                description: |-
+                  serviceName defines the name of the service name used by the underlying StatefulSet(s) as the governing service.
+                  If defined, the Service  must be created before the Prometheus/PrometheusAgent resource in the same namespace and it must define a selector that matches the pod labels.
+                  If empty, the operator will create and manage a headless service named `prometheus-operated` for Prometheus resources,
+                  or `prometheus-agent-operated` for PrometheusAgent resources.
+                  When deploying multiple Prometheus/PrometheusAgent resources in the same namespace, it is recommended to specify a different value for each.
+                  See https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#stable-network-id for more details.
+                minLength: 1
+                type: string
+              sha:
+                description: 'sha is deprecated: use ''spec.image'' instead. The image''s
+                  digest can be specified as part of the image name.'
+                type: string
+              shardRetentionPolicy:
+                description: |-
+                  shardRetentionPolicy defines the retention policy for the Prometheus shards.
+                  (Alpha) Using this field requires the 'PrometheusShardRetentionPolicy' feature gate to be enabled.
+
+                  The final goals for this feature can be seen at https://github.com/prometheus-operator/prometheus-operator/blob/main/Documentation/proposals/202310-shard-autoscaling.md#graceful-scale-down-of-prometheus-servers,
+                  however, the feature is not yet fully implemented in this PR. The limitation being:
+                  * Retention duration is not settable, for now, shards are retained forever.
+                properties:
+                  retain:
+                    description: |-
+                      retain defines the config for retention when the retention policy is set to `Retain`.
+                      This field is ineffective as of now.
+                    properties:
+                      retentionPeriod:
+                        description: retentionPeriod defines the retentionPeriod for
+                          shard retention policy.
+                        pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
+                        type: string
+                    required:
+                    - retentionPeriod
+                    type: object
+                  whenScaled:
+                    description: |-
+                      whenScaled defines the retention policy when the Prometheus shards are scaled down.
+                      * `Delete`, the operator will delete the pods from the scaled-down shard(s).
+                      * `Retain`, the operator will keep the pods from the scaled-down shard(s), so the data can still be queried.
+
+                      If not defined, the operator assumes the `Delete` value.
+                    enum:
+                    - Retain
+                    - Delete
+                    type: string
+                type: object
+              shards:
+                description: |-
+                  shards defines the number of shards to distribute the scraped targets onto.
+
+                  `spec.replicas` multiplied by `spec.shards` is the total number of Pods
+                  being created.
+
+                  When not defined, the operator assumes only one shard.
+
+                  Note that scaling down shards will not reshard data onto the remaining
+                  instances, it must be manually moved. Increasing shards will not reshard
+                  data either but it will continue to be available from the same
+                  instances. To query globally, use either
+                  * Thanos sidecar + querier for query federation and Thanos Ruler for rules.
+                  * Remote-write to send metrics to a central location.
+
+                  By default, the sharding of targets is performed on:
+                  * The `__address__` target's metadata label for PodMonitor,
+                  ServiceMonitor and ScrapeConfig resources.
+                  * The `__param_target__` label for Probe resources.
+
+                  Users can define their own sharding implementation by setting the
+                  `__tmp_hash` label during the target discovery with relabeling
+                  configuration (either in the monitoring resources or via scrape class).
+
+                  You can also disable sharding on a specific target by setting the
+                  `__tmp_disable_sharding` label with relabeling configuration. When
+                  the label value isn't empty, all Prometheus shards will scrape the target.
+                format: int32
+                type: integer
+              storage:
+                description: storage defines the storage used by Prometheus.
+                properties:
+                  disableMountSubPath:
+                    description: 'disableMountSubPath deprecated: subPath usage will
+                      be removed in a future release.'
+                    type: boolean
+                  emptyDir:
+                    description: |-
+                      emptyDir to be used by the StatefulSet.
+                      If specified, it takes precedence over `ephemeral` and `volumeClaimTemplate`.
+                      More info: https://kubernetes.io/docs/concepts/storage/volumes/#emptydir
+                    properties:
+                      medium:
+                        description: |-
+                          medium represents what type of storage medium should back this directory.
+                          The default is "" which means to use the node's default medium.
+                          Must be an empty string (default) or Memory.
+                          More info: https://kubernetes.io/docs/concepts/storage/volumes#emptydir
+                        type: string
+                      sizeLimit:
+                        anyOf:
+                        - type: integer
+                        - type: string
+                        description: |-
+                          sizeLimit is the total amount of local storage required for this EmptyDir volume.
+                          The size limit is also applicable for memory medium.
+                          The maximum usage on memory medium EmptyDir would be the minimum value between
+                          the SizeLimit specified here and the sum of memory limits of all containers in a pod.
+                          The default is nil which means that the limit is undefined.
+                          More info: https://kubernetes.io/docs/concepts/storage/volumes#emptydir
+                        pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                        x-kubernetes-int-or-string: true
+                    type: object
+                  ephemeral:
+                    description: |-
+                      ephemeral to be used by the StatefulSet.
+                      This is a beta field in k8s 1.21 and GA in 1.15.
+                      For lower versions, starting with k8s 1.19, it requires enabling the GenericEphemeralVolume feature gate.
+                      More info: https://kubernetes.io/docs/concepts/storage/ephemeral-volumes/#generic-ephemeral-volumes
+                    properties:
+                      volumeClaimTemplate:
+                        description: |-
+                          Will be used to create a stand-alone PVC to provision the volume.
+                          The pod in which this EphemeralVolumeSource is embedded will be the
+                          owner of the PVC, i.e. the PVC will be deleted together with the
+                          pod.  The name of the PVC will be `<pod name>-<volume name>` where
+                          `<volume name>` is the name from the `PodSpec.Volumes` array
+                          entry. Pod validation will reject the pod if the concatenated name
+                          is not valid for a PVC (for example, too long).
+
+                          An existing PVC with that name that is not owned by the pod
+                          will *not* be used for the pod to avoid using an unrelated
+                          volume by mistake. Starting the pod is then blocked until
+                          the unrelated PVC is removed. If such a pre-created PVC is
+                          meant to be used by the pod, the PVC has to updated with an
+                          owner reference to the pod once the pod exists. Normally
+                          this should not be necessary, but it may be useful when
+                          manually reconstructing a broken cluster.
+
+                          This field is read-only and no changes will be made by Kubernetes
+                          to the PVC after it has been created.
+
+                          Required, must not be nil.
+                        properties:
+                          metadata:
+                            description: |-
+                              May contain labels and annotations that will be copied into the PVC
+                              when creating it. No other fields are allowed and will be rejected during
+                              validation.
+                            type: object
+                          spec:
+                            description: |-
+                              The specification for the PersistentVolumeClaim. The entire content is
+                              copied unchanged into the PVC that gets created from this
+                              template. The same fields as in a PersistentVolumeClaim
+                              are also valid here.
+                            properties:
+                              accessModes:
+                                description: |-
+                                  accessModes contains the desired access modes the volume should have.
+                                  More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#access-modes-1
+                                items:
+                                  type: string
+                                type: array
+                                x-kubernetes-list-type: atomic
+                              dataSource:
+                                description: |-
+                                  dataSource field can be used to specify either:
+                                  * An existing VolumeSnapshot object (snapshot.storage.k8s.io/VolumeSnapshot)
+                                  * An existing PVC (PersistentVolumeClaim)
+                                  If the provisioner or an external controller can support the specified data source,
+                                  it will create a new volume based on the contents of the specified data source.
+                                  When the AnyVolumeDataSource feature gate is enabled, dataSource contents will be copied to dataSourceRef,
+                                  and dataSourceRef contents will be copied to dataSource when dataSourceRef.namespace is not specified.
+                                  If the namespace is specified, then dataSourceRef will not be copied to dataSource.
+                                properties:
+                                  apiGroup:
+                                    description: |-
+                                      APIGroup is the group for the resource being referenced.
+                                      If APIGroup is not specified, the specified Kind must be in the core API group.
+                                      For any other third-party types, APIGroup is required.
+                                    type: string
+                                  kind:
+                                    description: Kind is the type of resource being
+                                      referenced
+                                    type: string
+                                  name:
+                                    description: Name is the name of resource being
+                                      referenced
+                                    type: string
+                                required:
+                                - kind
+                                - name
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              dataSourceRef:
+                                description: |-
+                                  dataSourceRef specifies the object from which to populate the volume with data, if a non-empty
+                                  volume is desired. This may be any object from a non-empty API group (non
+                                  core object) or a PersistentVolumeClaim object.
+                                  When this field is specified, volume binding will only succeed if the type of
+                                  the specified object matches some installed volume populator or dynamic
+                                  provisioner.
+                                  This field will replace the functionality of the dataSource field and as such
+                                  if both fields are non-empty, they must have the same value. For backwards
+                                  compatibility, when namespace isn't specified in dataSourceRef,
+                                  both fields (dataSource and dataSourceRef) will be set to the same
+                                  value automatically if one of them is empty and the other is non-empty.
+                                  When namespace is specified in dataSourceRef,
+                                  dataSource isn't set to the same value and must be empty.
+                                  There are three important differences between dataSource and dataSourceRef:
+                                  * While dataSource only allows two specific types of objects, dataSourceRef
+                                    allows any non-core object, as well as PersistentVolumeClaim objects.
+                                  * While dataSource ignores disallowed values (dropping them), dataSourceRef
+                                    preserves all values, and generates an error if a disallowed value is
+                                    specified.
+                                  * While dataSource only allows local objects, dataSourceRef allows objects
+                                    in any namespaces.
+                                  (Beta) Using this field requires the AnyVolumeDataSource feature gate to be enabled.
+                                  (Alpha) Using the namespace field of dataSourceRef requires the CrossNamespaceVolumeDataSource feature gate to be enabled.
+                                properties:
+                                  apiGroup:
+                                    description: |-
+                                      APIGroup is the group for the resource being referenced.
+                                      If APIGroup is not specified, the specified Kind must be in the core API group.
+                                      For any other third-party types, APIGroup is required.
+                                    type: string
+                                  kind:
+                                    description: Kind is the type of resource being
+                                      referenced
+                                    type: string
+                                  name:
+                                    description: Name is the name of resource being
+                                      referenced
+                                    type: string
+                                  namespace:
+                                    description: |-
+                                      Namespace is the namespace of resource being referenced
+                                      Note that when a namespace is specified, a gateway.networking.k8s.io/ReferenceGrant object is required in the referent namespace to allow that namespace's owner to accept the reference. See the ReferenceGrant documentation for details.
+                                      (Alpha) This field requires the CrossNamespaceVolumeDataSource feature gate to be enabled.
+                                    type: string
+                                required:
+                                - kind
+                                - name
+                                type: object
+                              resources:
+                                description: |-
+                                  resources represents the minimum resources the volume should have.
+                                  If RecoverVolumeExpansionFailure feature is enabled users are allowed to specify resource requirements
+                                  that are lower than previous value but must still be higher than capacity recorded in the
+                                  status field of the claim.
+                                  More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources
+                                properties:
+                                  limits:
+                                    additionalProperties:
+                                      anyOf:
+                                      - type: integer
+                                      - type: string
+                                      pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                      x-kubernetes-int-or-string: true
+                                    description: |-
+                                      Limits describes the maximum amount of compute resources allowed.
+                                      More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+                                    type: object
+                                  requests:
+                                    additionalProperties:
+                                      anyOf:
+                                      - type: integer
+                                      - type: string
+                                      pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                      x-kubernetes-int-or-string: true
+                                    description: |-
+                                      Requests describes the minimum amount of compute resources required.
+                                      If Requests is omitted for a container, it defaults to Limits if that is explicitly specified,
+                                      otherwise to an implementation-defined value. Requests cannot exceed Limits.
+                                      More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+                                    type: object
+                                type: object
+                              selector:
+                                description: selector is a label query over volumes
+                                  to consider for binding.
+                                properties:
+                                  matchExpressions:
+                                    description: matchExpressions is a list of label
+                                      selector requirements. The requirements are
+                                      ANDed.
+                                    items:
+                                      description: |-
+                                        A label selector requirement is a selector that contains values, a key, and an operator that
+                                        relates the key and values.
+                                      properties:
+                                        key:
+                                          description: key is the label key that the
+                                            selector applies to.
+                                          type: string
+                                        operator:
+                                          description: |-
+                                            operator represents a key's relationship to a set of values.
+                                            Valid operators are In, NotIn, Exists and DoesNotExist.
+                                          type: string
+                                        values:
+                                          description: |-
+                                            values is an array of string values. If the operator is In or NotIn,
+                                            the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                            the values array must be empty. This array is replaced during a strategic
+                                            merge patch.
+                                          items:
+                                            type: string
+                                          type: array
+                                          x-kubernetes-list-type: atomic
+                                      required:
+                                      - key
+                                      - operator
+                                      type: object
+                                    type: array
+                                    x-kubernetes-list-type: atomic
+                                  matchLabels:
+                                    additionalProperties:
+                                      type: string
+                                    description: |-
+                                      matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                      map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                      operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                    type: object
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              storageClassName:
+                                description: |-
+                                  storageClassName is the name of the StorageClass required by the claim.
+                                  More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#class-1
+                                type: string
+                              volumeAttributesClassName:
+                                description: |-
+                                  volumeAttributesClassName may be used to set the VolumeAttributesClass used by this claim.
+                                  If specified, the CSI driver will create or update the volume with the attributes defined
+                                  in the corresponding VolumeAttributesClass. This has a different purpose than storageClassName,
+                                  it can be changed after the claim is created. An empty string or nil value indicates that no
+                                  VolumeAttributesClass will be applied to the claim. If the claim enters an Infeasible error state,
+                                  this field can be reset to its previous value (including nil) to cancel the modification.
+                                  If the resource referred to by volumeAttributesClass does not exist, this PersistentVolumeClaim will be
+                                  set to a Pending state, as reflected by the modifyVolumeStatus field, until such as a resource
+                                  exists.
+                                  More info: https://kubernetes.io/docs/concepts/storage/volume-attributes-classes/
+                                type: string
+                              volumeMode:
+                                description: |-
+                                  volumeMode defines what type of volume is required by the claim.
+                                  Value of Filesystem is implied when not included in claim spec.
+                                type: string
+                              volumeName:
+                                description: volumeName is the binding reference to
+                                  the PersistentVolume backing this claim.
+                                type: string
+                            type: object
+                        required:
+                        - spec
+                        type: object
+                    type: object
+                  volumeClaimTemplate:
+                    description: |-
+                      volumeClaimTemplate defines the PVC spec to be used by the Prometheus StatefulSets.
+                      The easiest way to use a volume that cannot be automatically provisioned
+                      is to use a label selector alongside manually created PersistentVolumes.
+                    properties:
+                      apiVersion:
+                        description: |-
+                          APIVersion defines the versioned schema of this representation of an object.
+                          Servers should convert recognized schemas to the latest internal value, and
+                          may reject unrecognized values.
+                          More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+                        type: string
+                      kind:
+                        description: |-
+                          Kind is a string value representing the REST resource this object represents.
+                          Servers may infer this from the endpoint the client submits requests to.
+                          Cannot be updated.
+                          In CamelCase.
+                          More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+                        type: string
+                      metadata:
+                        description: metadata defines EmbeddedMetadata contains metadata
+                          relevant to an EmbeddedResource.
+                        properties:
+                          annotations:
+                            additionalProperties:
+                              type: string
+                            description: |-
+                              annotations defines an unstructured key value map stored with a resource that may be
+                              set by external tools to store and retrieve arbitrary metadata. They are not
+                              queryable and should be preserved when modifying objects.
+                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
+                            type: object
+                          labels:
+                            additionalProperties:
+                              type: string
+                            description: |-
+                              labels define the map of string keys and values that can be used to organize and categorize
+                              (scope and select) objects. May match selectors of replication controllers
+                              and services.
+                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
+                            type: object
+                          name:
+                            description: |-
+                              name must be unique within a namespace. Is required when creating resources, although
+                              some resources may allow a client to request the generation of an appropriate name
+                              automatically. Name is primarily intended for creation idempotence and configuration
+                              definition.
+                              Cannot be updated.
+                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/
+                            type: string
+                        type: object
+                      spec:
+                        description: |-
+                          spec defines the specification of the  characteristics of a volume requested by a pod author.
+                          More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#persistentvolumeclaims
+                        properties:
+                          accessModes:
+                            description: |-
+                              accessModes contains the desired access modes the volume should have.
+                              More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#access-modes-1
+                            items:
+                              type: string
+                            type: array
+                            x-kubernetes-list-type: atomic
+                          dataSource:
+                            description: |-
+                              dataSource field can be used to specify either:
+                              * An existing VolumeSnapshot object (snapshot.storage.k8s.io/VolumeSnapshot)
+                              * An existing PVC (PersistentVolumeClaim)
+                              If the provisioner or an external controller can support the specified data source,
+                              it will create a new volume based on the contents of the specified data source.
+                              When the AnyVolumeDataSource feature gate is enabled, dataSource contents will be copied to dataSourceRef,
+                              and dataSourceRef contents will be copied to dataSource when dataSourceRef.namespace is not specified.
+                              If the namespace is specified, then dataSourceRef will not be copied to dataSource.
+                            properties:
+                              apiGroup:
+                                description: |-
+                                  APIGroup is the group for the resource being referenced.
+                                  If APIGroup is not specified, the specified Kind must be in the core API group.
+                                  For any other third-party types, APIGroup is required.
+                                type: string
+                              kind:
+                                description: Kind is the type of resource being referenced
+                                type: string
+                              name:
+                                description: Name is the name of resource being referenced
+                                type: string
+                            required:
+                            - kind
+                            - name
+                            type: object
+                            x-kubernetes-map-type: atomic
+                          dataSourceRef:
+                            description: |-
+                              dataSourceRef specifies the object from which to populate the volume with data, if a non-empty
+                              volume is desired. This may be any object from a non-empty API group (non
+                              core object) or a PersistentVolumeClaim object.
+                              When this field is specified, volume binding will only succeed if the type of
+                              the specified object matches some installed volume populator or dynamic
+                              provisioner.
+                              This field will replace the functionality of the dataSource field and as such
+                              if both fields are non-empty, they must have the same value. For backwards
+                              compatibility, when namespace isn't specified in dataSourceRef,
+                              both fields (dataSource and dataSourceRef) will be set to the same
+                              value automatically if one of them is empty and the other is non-empty.
+                              When namespace is specified in dataSourceRef,
+                              dataSource isn't set to the same value and must be empty.
+                              There are three important differences between dataSource and dataSourceRef:
+                              * While dataSource only allows two specific types of objects, dataSourceRef
+                                allows any non-core object, as well as PersistentVolumeClaim objects.
+                              * While dataSource ignores disallowed values (dropping them), dataSourceRef
+                                preserves all values, and generates an error if a disallowed value is
+                                specified.
+                              * While dataSource only allows local objects, dataSourceRef allows objects
+                                in any namespaces.
+                              (Beta) Using this field requires the AnyVolumeDataSource feature gate to be enabled.
+                              (Alpha) Using the namespace field of dataSourceRef requires the CrossNamespaceVolumeDataSource feature gate to be enabled.
+                            properties:
+                              apiGroup:
+                                description: |-
+                                  APIGroup is the group for the resource being referenced.
+                                  If APIGroup is not specified, the specified Kind must be in the core API group.
+                                  For any other third-party types, APIGroup is required.
+                                type: string
+                              kind:
+                                description: Kind is the type of resource being referenced
+                                type: string
+                              name:
+                                description: Name is the name of resource being referenced
+                                type: string
+                              namespace:
+                                description: |-
+                                  Namespace is the namespace of resource being referenced
+                                  Note that when a namespace is specified, a gateway.networking.k8s.io/ReferenceGrant object is required in the referent namespace to allow that namespace's owner to accept the reference. See the ReferenceGrant documentation for details.
+                                  (Alpha) This field requires the CrossNamespaceVolumeDataSource feature gate to be enabled.
+                                type: string
+                            required:
+                            - kind
+                            - name
+                            type: object
+                          resources:
+                            description: |-
+                              resources represents the minimum resources the volume should have.
+                              If RecoverVolumeExpansionFailure feature is enabled users are allowed to specify resource requirements
+                              that are lower than previous value but must still be higher than capacity recorded in the
+                              status field of the claim.
+                              More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources
+                            properties:
+                              limits:
+                                additionalProperties:
+                                  anyOf:
+                                  - type: integer
+                                  - type: string
+                                  pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                  x-kubernetes-int-or-string: true
+                                description: |-
+                                  Limits describes the maximum amount of compute resources allowed.
+                                  More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+                                type: object
+                              requests:
+                                additionalProperties:
+                                  anyOf:
+                                  - type: integer
+                                  - type: string
+                                  pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                  x-kubernetes-int-or-string: true
+                                description: |-
+                                  Requests describes the minimum amount of compute resources required.
+                                  If Requests is omitted for a container, it defaults to Limits if that is explicitly specified,
+                                  otherwise to an implementation-defined value. Requests cannot exceed Limits.
+                                  More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+                                type: object
+                            type: object
+                          selector:
+                            description: selector is a label query over volumes to
+                              consider for binding.
+                            properties:
+                              matchExpressions:
+                                description: matchExpressions is a list of label selector
+                                  requirements. The requirements are ANDed.
+                                items:
+                                  description: |-
+                                    A label selector requirement is a selector that contains values, a key, and an operator that
+                                    relates the key and values.
+                                  properties:
+                                    key:
+                                      description: key is the label key that the selector
+                                        applies to.
+                                      type: string
+                                    operator:
+                                      description: |-
+                                        operator represents a key's relationship to a set of values.
+                                        Valid operators are In, NotIn, Exists and DoesNotExist.
+                                      type: string
+                                    values:
+                                      description: |-
+                                        values is an array of string values. If the operator is In or NotIn,
+                                        the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                        the values array must be empty. This array is replaced during a strategic
+                                        merge patch.
+                                      items:
+                                        type: string
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                  required:
+                                  - key
+                                  - operator
+                                  type: object
+                                type: array
+                                x-kubernetes-list-type: atomic
+                              matchLabels:
+                                additionalProperties:
+                                  type: string
+                                description: |-
+                                  matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                  map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                  operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                type: object
+                            type: object
+                            x-kubernetes-map-type: atomic
+                          storageClassName:
+                            description: |-
+                              storageClassName is the name of the StorageClass required by the claim.
+                              More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#class-1
+                            type: string
+                          volumeAttributesClassName:
+                            description: |-
+                              volumeAttributesClassName may be used to set the VolumeAttributesClass used by this claim.
+                              If specified, the CSI driver will create or update the volume with the attributes defined
+                              in the corresponding VolumeAttributesClass. This has a different purpose than storageClassName,
+                              it can be changed after the claim is created. An empty string or nil value indicates that no
+                              VolumeAttributesClass will be applied to the claim. If the claim enters an Infeasible error state,
+                              this field can be reset to its previous value (including nil) to cancel the modification.
+                              If the resource referred to by volumeAttributesClass does not exist, this PersistentVolumeClaim will be
+                              set to a Pending state, as reflected by the modifyVolumeStatus field, until such as a resource
+                              exists.
+                              More info: https://kubernetes.io/docs/concepts/storage/volume-attributes-classes/
+                            type: string
+                          volumeMode:
+                            description: |-
+                              volumeMode defines what type of volume is required by the claim.
+                              Value of Filesystem is implied when not included in claim spec.
+                            type: string
+                          volumeName:
+                            description: volumeName is the binding reference to the
+                              PersistentVolume backing this claim.
+                            type: string
+                        type: object
+                      status:
+                        description: 'status is deprecated: this field is never set.'
+                        properties:
+                          accessModes:
+                            description: |-
+                              accessModes contains the actual access modes the volume backing the PVC has.
+                              More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#access-modes-1
+                            items:
+                              type: string
+                            type: array
+                            x-kubernetes-list-type: atomic
+                          allocatedResourceStatuses:
+                            additionalProperties:
+                              description: |-
+                                When a controller receives persistentvolume claim update with ClaimResourceStatus for a resource
+                                that it does not recognizes, then it should ignore that update and let other controllers
+                                handle it.
+                              type: string
+                            description: "allocatedResourceStatuses stores status
+                              of resource being resized for the given PVC.\nKey names
+                              follow standard Kubernetes label syntax. Valid values
+                              are either:\n\t* Un-prefixed keys:\n\t\t- storage -
+                              the capacity of the volume.\n\t* Custom resources must
+                              use implementation-defined prefixed names such as \"example.com/my-custom-resource\"\nApart
+                              from above values - keys that are unprefixed or have
+                              kubernetes.io prefix are considered\nreserved and hence
+                              may not be used.\n\nClaimResourceStatus can be in any
+                              of following states:\n\t- ControllerResizeInProgress:\n\t\tState
+                              set when resize controller starts resizing the volume
+                              in control-plane.\n\t- ControllerResizeFailed:\n\t\tState
+                              set when resize has failed in resize controller with
+                              a terminal error.\n\t- NodeResizePending:\n\t\tState
+                              set when resize controller has finished resizing the
+                              volume but further resizing of\n\t\tvolume is needed
+                              on the node.\n\t- NodeResizeInProgress:\n\t\tState set
+                              when kubelet starts resizing the volume.\n\t- NodeResizeFailed:\n\t\tState
+                              set when resizing has failed in kubelet with a terminal
+                              error. Transient errors don't set\n\t\tNodeResizeFailed.\nFor
+                              example: if expanding a PVC for more capacity - this
+                              field can be one of the following states:\n\t- pvc.status.allocatedResourceStatus['storage']
+                              = \"ControllerResizeInProgress\"\n     - pvc.status.allocatedResourceStatus['storage']
+                              = \"ControllerResizeFailed\"\n     - pvc.status.allocatedResourceStatus['storage']
+                              = \"NodeResizePending\"\n     - pvc.status.allocatedResourceStatus['storage']
+                              = \"NodeResizeInProgress\"\n     - pvc.status.allocatedResourceStatus['storage']
+                              = \"NodeResizeFailed\"\nWhen this field is not set,
+                              it means that no resize operation is in progress for
+                              the given PVC.\n\nA controller that receives PVC update
+                              with previously unknown resourceName or ClaimResourceStatus\nshould
+                              ignore the update for the purpose it was designed. For
+                              example - a controller that\nonly is responsible for
+                              resizing capacity of the volume, should ignore PVC updates
+                              that change other valid\nresources associated with PVC.\n\nThis
+                              is an alpha field and requires enabling RecoverVolumeExpansionFailure
+                              feature."
+                            type: object
+                            x-kubernetes-map-type: granular
+                          allocatedResources:
+                            additionalProperties:
+                              anyOf:
+                              - type: integer
+                              - type: string
+                              pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                              x-kubernetes-int-or-string: true
+                            description: "allocatedResources tracks the resources
+                              allocated to a PVC including its capacity.\nKey names
+                              follow standard Kubernetes label syntax. Valid values
+                              are either:\n\t* Un-prefixed keys:\n\t\t- storage -
+                              the capacity of the volume.\n\t* Custom resources must
+                              use implementation-defined prefixed names such as \"example.com/my-custom-resource\"\nApart
+                              from above values - keys that are unprefixed or have
+                              kubernetes.io prefix are considered\nreserved and hence
+                              may not be used.\n\nCapacity reported here may be larger
+                              than the actual capacity when a volume expansion operation\nis
+                              requested.\nFor storage quota, the larger value from
+                              allocatedResources and PVC.spec.resources is used.\nIf
+                              allocatedResources is not set, PVC.spec.resources alone
+                              is used for quota calculation.\nIf a volume expansion
+                              capacity request is lowered, allocatedResources is only\nlowered
+                              if there are no expansion operations in progress and
+                              if the actual volume capacity\nis equal or lower than
+                              the requested capacity.\n\nA controller that receives
+                              PVC update with previously unknown resourceName\nshould
+                              ignore the update for the purpose it was designed. For
+                              example - a controller that\nonly is responsible for
+                              resizing capacity of the volume, should ignore PVC updates
+                              that change other valid\nresources associated with PVC.\n\nThis
+                              is an alpha field and requires enabling RecoverVolumeExpansionFailure
+                              feature."
+                            type: object
+                          capacity:
+                            additionalProperties:
+                              anyOf:
+                              - type: integer
+                              - type: string
+                              pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                              x-kubernetes-int-or-string: true
+                            description: capacity represents the actual resources
+                              of the underlying volume.
+                            type: object
+                          conditions:
+                            description: |-
+                              conditions is the current Condition of persistent volume claim. If underlying persistent volume is being
+                              resized then the Condition will be set to 'Resizing'.
+                            items:
+                              description: PersistentVolumeClaimCondition contains
+                                details about state of pvc
+                              properties:
+                                lastProbeTime:
+                                  description: lastProbeTime is the time we probed
+                                    the condition.
+                                  format: date-time
+                                  type: string
+                                lastTransitionTime:
+                                  description: lastTransitionTime is the time the
+                                    condition transitioned from one status to another.
+                                  format: date-time
+                                  type: string
+                                message:
+                                  description: message is the human-readable message
+                                    indicating details about last transition.
+                                  type: string
+                                reason:
+                                  description: |-
+                                    reason is a unique, this should be a short, machine understandable string that gives the reason
+                                    for condition's last transition. If it reports "Resizing" that means the underlying
+                                    persistent volume is being resized.
+                                  type: string
+                                status:
+                                  description: |-
+                                    Status is the status of the condition.
+                                    Can be True, False, Unknown.
+                                    More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=state%20of%20pvc-,conditions.status,-(string)%2C%20required
+                                  type: string
+                                type:
+                                  description: |-
+                                    Type is the type of the condition.
+                                    More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=set%20to%20%27ResizeStarted%27.-,PersistentVolumeClaimCondition,-contains%20details%20about
+                                  type: string
+                              required:
+                              - status
+                              - type
+                              type: object
+                            type: array
+                            x-kubernetes-list-map-keys:
+                            - type
+                            x-kubernetes-list-type: map
+                          currentVolumeAttributesClassName:
+                            description: |-
+                              currentVolumeAttributesClassName is the current name of the VolumeAttributesClass the PVC is using.
+                              When unset, there is no VolumeAttributeClass applied to this PersistentVolumeClaim
+                            type: string
+                          modifyVolumeStatus:
+                            description: |-
+                              ModifyVolumeStatus represents the status object of ControllerModifyVolume operation.
+                              When this is unset, there is no ModifyVolume operation being attempted.
+                            properties:
+                              status:
+                                description: "status is the status of the ControllerModifyVolume
+                                  operation. It can be in any of following states:\n
+                                  - Pending\n   Pending indicates that the PersistentVolumeClaim
+                                  cannot be modified due to unmet requirements, such
+                                  as\n   the specified VolumeAttributesClass not existing.\n
+                                  - InProgress\n   InProgress indicates that the volume
+                                  is being modified.\n - Infeasible\n  Infeasible
+                                  indicates that the request has been rejected as
+                                  invalid by the CSI driver. To\n\t  resolve the error,
+                                  a valid VolumeAttributesClass needs to be specified.\nNote:
+                                  New statuses can be added in the future. Consumers
+                                  should check for unknown statuses and fail appropriately."
+                                type: string
+                              targetVolumeAttributesClassName:
+                                description: targetVolumeAttributesClassName is the
+                                  name of the VolumeAttributesClass the PVC currently
+                                  being reconciled
+                                type: string
+                            required:
+                            - status
+                            type: object
+                          phase:
+                            description: phase represents the current phase of PersistentVolumeClaim.
+                            type: string
+                        type: object
+                    type: object
+                type: object
+              tag:
+                description: 'tag is deprecated: use ''spec.image'' instead. The image''s
+                  tag can be specified as part of the image name.'
+                type: string
+              targetLimit:
+                description: |-
+                  targetLimit defines a limit on the number of scraped targets that will be accepted.
+                  Only valid in Prometheus versions 2.45.0 and newer.
+
+                  Note that the global limit only applies to scrape objects that don't specify an explicit limit value.
+                  If you want to enforce a maximum limit for all scrape objects, refer to enforcedTargetLimit.
+                format: int64
+                type: integer
+              terminationGracePeriodSeconds:
+                description: |-
+                  terminationGracePeriodSeconds defines the optional duration in seconds the pod needs to terminate gracefully.
+                  Value must be non-negative integer. The value zero indicates stop immediately via
+                  the kill signal (no opportunity to shut down) which may lead to data corruption.
+
+                  Defaults to 600 seconds.
+                format: int64
+                minimum: 0
+                type: integer
+              thanos:
+                description: thanos defines the configuration of the optional Thanos
+                  sidecar.
+                properties:
+                  additionalArgs:
+                    description: |-
+                      additionalArgs allows setting additional arguments for the Thanos container.
+                      The arguments are passed as-is to the Thanos container which may cause issues
+                      if they are invalid or not supported the given Thanos version.
+                      In case of an argument conflict (e.g. an argument which is already set by the
+                      operator itself) or when providing an invalid argument, the reconciliation will
+                      fail and an error will be logged.
+                    items:
+                      description: Argument as part of the AdditionalArgs list.
+                      properties:
+                        name:
+                          description: name of the argument, e.g. "scrape.discovery-reload-interval".
+                          minLength: 1
+                          type: string
+                        value:
+                          description: value defines the argument value, e.g. 30s.
+                            Can be empty for name-only arguments (e.g. --storage.tsdb.no-lockfile)
+                          type: string
+                      required:
+                      - name
+                      type: object
+                    type: array
+                  baseImage:
+                    description: 'baseImage is deprecated: use ''image'' instead.'
+                    type: string
+                  blockSize:
+                    default: 2h
+                    description: |-
+                      blockSize controls the size of TSDB blocks produced by Prometheus.
+                      The default value is 2h to match the upstream Prometheus defaults.
+
+                      WARNING: Changing the block duration can impact the performance and
+                      efficiency of the entire Prometheus/Thanos stack due to how it interacts
+                      with memory and Thanos compactors. It is recommended to keep this value
+                      set to a multiple of 120 times your longest scrape or rule interval. For
+                      example, 30s * 120 = 1h.
+                    pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
+                    type: string
+                  getConfigInterval:
+                    description: getConfigInterval defines how often to retrieve the
+                      Prometheus configuration.
+                    pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
+                    type: string
+                  getConfigTimeout:
+                    description: getConfigTimeout defines the maximum time to wait
+                      when retrieving the Prometheus configuration.
+                    pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
+                    type: string
+                  grpcListenLocal:
+                    description: |-
+                      grpcListenLocal defines when true, the Thanos sidecar listens on the loopback interface instead
+                      of the Pod IP's address for the gRPC endpoints.
+
+                      It has no effect if `listenLocal` is true.
+                    type: boolean
+                  grpcServerTlsConfig:
+                    description: |-
+                      grpcServerTlsConfig defines the TLS parameters for the gRPC server providing the StoreAPI.
+
+                      Note: Currently only the `caFile`, `certFile`, and `keyFile` fields are supported.
+                    properties:
+                      ca:
+                        description: ca defines the Certificate authority used when
+                          verifying server certificates.
+                        properties:
+                          configMap:
+                            description: configMap defines the ConfigMap containing
+                              data to use for the targets.
+                            properties:
+                              key:
+                                description: The key to select.
+                                type: string
+                              name:
+                                default: ""
+                                description: |-
+                                  Name of the referent.
+                                  This field is effectively required, but due to backwards compatibility is
+                                  allowed to be empty. Instances of this type with an empty value here are
+                                  almost certainly wrong.
+                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                type: string
+                              optional:
+                                description: Specify whether the ConfigMap or its
+                                  key must be defined
+                                type: boolean
+                            required:
+                            - key
+                            type: object
+                            x-kubernetes-map-type: atomic
+                          secret:
+                            description: secret defines the Secret containing data
+                              to use for the targets.
+                            properties:
+                              key:
+                                description: The key of the secret to select from.  Must
+                                  be a valid secret key.
+                                type: string
+                              name:
+                                default: ""
+                                description: |-
+                                  Name of the referent.
+                                  This field is effectively required, but due to backwards compatibility is
+                                  allowed to be empty. Instances of this type with an empty value here are
+                                  almost certainly wrong.
+                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                type: string
+                              optional:
+                                description: Specify whether the Secret or its key
+                                  must be defined
+                                type: boolean
+                            required:
+                            - key
+                            type: object
+                            x-kubernetes-map-type: atomic
+                        type: object
+                      caFile:
+                        description: caFile defines the path to the CA cert in the
+                          Prometheus container to use for the targets.
+                        type: string
+                      cert:
+                        description: cert defines the Client certificate to present
+                          when doing client-authentication.
+                        properties:
+                          configMap:
+                            description: configMap defines the ConfigMap containing
+                              data to use for the targets.
+                            properties:
+                              key:
+                                description: The key to select.
+                                type: string
+                              name:
+                                default: ""
+                                description: |-
+                                  Name of the referent.
+                                  This field is effectively required, but due to backwards compatibility is
+                                  allowed to be empty. Instances of this type with an empty value here are
+                                  almost certainly wrong.
+                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                type: string
+                              optional:
+                                description: Specify whether the ConfigMap or its
+                                  key must be defined
+                                type: boolean
+                            required:
+                            - key
+                            type: object
+                            x-kubernetes-map-type: atomic
+                          secret:
+                            description: secret defines the Secret containing data
+                              to use for the targets.
+                            properties:
+                              key:
+                                description: The key of the secret to select from.  Must
+                                  be a valid secret key.
+                                type: string
+                              name:
+                                default: ""
+                                description: |-
+                                  Name of the referent.
+                                  This field is effectively required, but due to backwards compatibility is
+                                  allowed to be empty. Instances of this type with an empty value here are
+                                  almost certainly wrong.
+                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                type: string
+                              optional:
+                                description: Specify whether the Secret or its key
+                                  must be defined
+                                type: boolean
+                            required:
+                            - key
+                            type: object
+                            x-kubernetes-map-type: atomic
+                        type: object
+                      certFile:
+                        description: certFile defines the path to the client cert
+                          file in the Prometheus container for the targets.
+                        type: string
+                      insecureSkipVerify:
+                        description: insecureSkipVerify defines how to disable target
+                          certificate validation.
+                        type: boolean
+                      keyFile:
+                        description: keyFile defines the path to the client key file
+                          in the Prometheus container for the targets.
+                        type: string
+                      keySecret:
+                        description: keySecret defines the Secret containing the client
+                          key file for the targets.
+                        properties:
+                          key:
+                            description: The key of the secret to select from.  Must
+                              be a valid secret key.
+                            type: string
+                          name:
+                            default: ""
+                            description: |-
+                              Name of the referent.
+                              This field is effectively required, but due to backwards compatibility is
+                              allowed to be empty. Instances of this type with an empty value here are
+                              almost certainly wrong.
+                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                            type: string
+                          optional:
+                            description: Specify whether the Secret or its key must
+                              be defined
+                            type: boolean
+                        required:
+                        - key
+                        type: object
+                        x-kubernetes-map-type: atomic
+                      maxVersion:
+                        description: |-
+                          maxVersion defines the maximum acceptable TLS version.
+
+                          It requires Prometheus >= v2.41.0 or Thanos >= v0.31.0.
+                        enum:
+                        - TLS10
+                        - TLS11
+                        - TLS12
+                        - TLS13
+                        type: string
+                      minVersion:
+                        description: |-
+                          minVersion defines the minimum acceptable TLS version.
+
+                          It requires Prometheus >= v2.35.0 or Thanos >= v0.28.0.
+                        enum:
+                        - TLS10
+                        - TLS11
+                        - TLS12
+                        - TLS13
+                        type: string
+                      serverName:
+                        description: serverName is used to verify the hostname for
+                          the targets.
+                        type: string
+                    type: object
+                  httpListenLocal:
+                    description: |-
+                      httpListenLocal when true, the Thanos sidecar listens on the loopback interface instead
+                      of the Pod IP's address for the HTTP endpoints.
+
+                      It has no effect if `listenLocal` is true.
+                    type: boolean
+                  image:
+                    description: |-
+                      image defines the container image name for Thanos. If specified, it takes precedence over
+                      the `spec.thanos.baseImage`, `spec.thanos.tag` and `spec.thanos.sha`
+                      fields.
+
+                      Specifying `spec.thanos.version` is still necessary to ensure the
+                      Prometheus Operator knows which version of Thanos is being configured.
+
+                      If neither `spec.thanos.image` nor `spec.thanos.baseImage` are defined,
+                      the operator will use the latest upstream version of Thanos available at
+                      the time when the operator was released.
+                    type: string
+                  listenLocal:
+                    description: 'listenLocal is deprecated: use `grpcListenLocal`
+                      and `httpListenLocal` instead.'
+                    type: boolean
+                  logFormat:
+                    description: logFormat for the Thanos sidecar.
+                    enum:
+                    - ""
+                    - logfmt
+                    - json
+                    type: string
+                  logLevel:
+                    description: logLevel for the Thanos sidecar.
+                    enum:
+                    - ""
+                    - debug
+                    - info
+                    - warn
+                    - error
+                    type: string
+                  minTime:
+                    description: |-
+                      minTime defines the start of time range limit served by the Thanos sidecar's StoreAPI.
+                      The field's value should be a constant time in RFC3339 format or a time
+                      duration relative to current time, such as -1d or 2h45m. Valid duration
+                      units are ms, s, m, h, d, w, y.
+                    type: string
+                  objectStorageConfig:
+                    description: |-
+                      objectStorageConfig defines the Thanos sidecar's configuration to upload TSDB blocks to object storage.
+
+                      More info: https://thanos.io/tip/thanos/storage.md/
+
+                      objectStorageConfigFile takes precedence over this field.
+                    properties:
+                      key:
+                        description: The key of the secret to select from.  Must be
+                          a valid secret key.
+                        type: string
+                      name:
+                        default: ""
+                        description: |-
+                          Name of the referent.
+                          This field is effectively required, but due to backwards compatibility is
+                          allowed to be empty. Instances of this type with an empty value here are
+                          almost certainly wrong.
+                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                        type: string
+                      optional:
+                        description: Specify whether the Secret or its key must be
+                          defined
+                        type: boolean
+                    required:
+                    - key
+                    type: object
+                    x-kubernetes-map-type: atomic
+                  objectStorageConfigFile:
+                    description: |-
+                      objectStorageConfigFile defines the Thanos sidecar's configuration file to upload TSDB blocks to object storage.
+
+                      More info: https://thanos.io/tip/thanos/storage.md/
+
+                      This field takes precedence over objectStorageConfig.
+                    type: string
+                  readyTimeout:
+                    description: |-
+                      readyTimeout defines the maximum time that the Thanos sidecar will wait for
+                      Prometheus to start.
+                    pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
+                    type: string
+                  resources:
+                    description: resources defines the resources requests and limits
+                      of the Thanos sidecar.
+                    properties:
+                      claims:
+                        description: |-
+                          Claims lists the names of resources, defined in spec.resourceClaims,
+                          that are used by this container.
+
+                          This field depends on the
+                          DynamicResourceAllocation feature gate.
+
+                          This field is immutable. It can only be set for containers.
+                        items:
+                          description: ResourceClaim references one entry in PodSpec.ResourceClaims.
+                          properties:
+                            name:
+                              description: |-
+                                Name must match the name of one entry in pod.spec.resourceClaims of
+                                the Pod where this field is used. It makes that resource available
+                                inside a container.
+                              type: string
+                            request:
+                              description: |-
+                                Request is the name chosen for a request in the referenced claim.
+                                If empty, everything from the claim is made available, otherwise
+                                only the result of this request.
+                              type: string
+                          required:
+                          - name
+                          type: object
+                        type: array
+                        x-kubernetes-list-map-keys:
+                        - name
+                        x-kubernetes-list-type: map
+                      limits:
+                        additionalProperties:
+                          anyOf:
+                          - type: integer
+                          - type: string
+                          pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                          x-kubernetes-int-or-string: true
+                        description: |-
+                          Limits describes the maximum amount of compute resources allowed.
+                          More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+                        type: object
+                      requests:
+                        additionalProperties:
+                          anyOf:
+                          - type: integer
+                          - type: string
+                          pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                          x-kubernetes-int-or-string: true
+                        description: |-
+                          Requests describes the minimum amount of compute resources required.
+                          If Requests is omitted for a container, it defaults to Limits if that is explicitly specified,
+                          otherwise to an implementation-defined value. Requests cannot exceed Limits.
+                          More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+                        type: object
+                    type: object
+                  sha:
+                    description: 'sha is deprecated: use ''image'' instead.  The image
+                      digest can be specified as part of the image name.'
+                    type: string
+                  tag:
+                    description: 'tag is deprecated: use ''image'' instead. The image''s
+                      tag can be specified as as part of the image name.'
+                    type: string
+                  tracingConfig:
+                    description: |-
+                      tracingConfig defines the tracing configuration for the Thanos sidecar.
+
+                      `tracingConfigFile` takes precedence over this field.
+
+                      More info: https://thanos.io/tip/thanos/tracing.md/
+
+                      This is an *experimental feature*, it may change in any upcoming release
+                      in a breaking way.
+                    properties:
+                      key:
+                        description: The key of the secret to select from.  Must be
+                          a valid secret key.
+                        type: string
+                      name:
+                        default: ""
+                        description: |-
+                          Name of the referent.
+                          This field is effectively required, but due to backwards compatibility is
+                          allowed to be empty. Instances of this type with an empty value here are
+                          almost certainly wrong.
+                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                        type: string
+                      optional:
+                        description: Specify whether the Secret or its key must be
+                          defined
+                        type: boolean
+                    required:
+                    - key
+                    type: object
+                    x-kubernetes-map-type: atomic
+                  tracingConfigFile:
+                    description: |-
+                      tracingConfigFile defines the tracing configuration file for the Thanos sidecar.
+
+                      This field takes precedence over `tracingConfig`.
+
+                      More info: https://thanos.io/tip/thanos/tracing.md/
+
+                      This is an *experimental feature*, it may change in any upcoming release
+                      in a breaking way.
+                    type: string
+                  version:
+                    description: |-
+                      version of Thanos being deployed. The operator uses this information
+                      to generate the Prometheus StatefulSet + configuration files.
+
+                      If not specified, the operator assumes the latest upstream release of
+                      Thanos available at the time when the version of the operator was
+                      released.
+                    type: string
+                  volumeMounts:
+                    description: |-
+                      volumeMounts allows configuration of additional VolumeMounts for Thanos.
+                      VolumeMounts specified will be appended to other VolumeMounts in the
+                      'thanos-sidecar' container.
+                    items:
+                      description: VolumeMount describes a mounting of a Volume within
+                        a container.
+                      properties:
+                        mountPath:
+                          description: |-
+                            Path within the container at which the volume should be mounted.  Must
+                            not contain ':'.
+                          type: string
+                        mountPropagation:
+                          description: |-
+                            mountPropagation determines how mounts are propagated from the host
+                            to container and the other way around.
+                            When not set, MountPropagationNone is used.
+                            This field is beta in 1.10.
+                            When RecursiveReadOnly is set to IfPossible or to Enabled, MountPropagation must be None or unspecified
+                            (which defaults to None).
+                          type: string
+                        name:
+                          description: This must match the Name of a Volume.
+                          type: string
+                        readOnly:
+                          description: |-
+                            Mounted read-only if true, read-write otherwise (false or unspecified).
+                            Defaults to false.
+                          type: boolean
+                        recursiveReadOnly:
+                          description: |-
+                            RecursiveReadOnly specifies whether read-only mounts should be handled
+                            recursively.
+
+                            If ReadOnly is false, this field has no meaning and must be unspecified.
+
+                            If ReadOnly is true, and this field is set to Disabled, the mount is not made
+                            recursively read-only.  If this field is set to IfPossible, the mount is made
+                            recursively read-only, if it is supported by the container runtime.  If this
+                            field is set to Enabled, the mount is made recursively read-only if it is
+                            supported by the container runtime, otherwise the pod will not be started and
+                            an error will be generated to indicate the reason.
+
+                            If this field is set to IfPossible or Enabled, MountPropagation must be set to
+                            None (or be unspecified, which defaults to None).
+
+                            If this field is not specified, it is treated as an equivalent of Disabled.
+                          type: string
+                        subPath:
+                          description: |-
+                            Path within the volume from which the container's volume should be mounted.
+                            Defaults to "" (volume's root).
+                          type: string
+                        subPathExpr:
+                          description: |-
+                            Expanded path within the volume from which the container's volume should be mounted.
+                            Behaves similarly to SubPath but environment variable references $(VAR_NAME) are expanded using the container's environment.
+                            Defaults to "" (volume's root).
+                            SubPathExpr and SubPath are mutually exclusive.
+                          type: string
+                      required:
+                      - mountPath
+                      - name
+                      type: object
+                    type: array
+                type: object
+              tolerations:
+                description: tolerations defines the Pods' tolerations if specified.
+                items:
+                  description: |-
+                    The pod this Toleration is attached to tolerates any taint that matches
+                    the triple <key,value,effect> using the matching operator <operator>.
+                  properties:
+                    effect:
+                      description: |-
+                        Effect indicates the taint effect to match. Empty means match all taint effects.
+                        When specified, allowed values are NoSchedule, PreferNoSchedule and NoExecute.
+                      type: string
+                    key:
+                      description: |-
+                        Key is the taint key that the toleration applies to. Empty means match all taint keys.
+                        If the key is empty, operator must be Exists; this combination means to match all values and all keys.
+                      type: string
+                    operator:
+                      description: |-
+                        Operator represents a key's relationship to the value.
+                        Valid operators are Exists and Equal. Defaults to Equal.
+                        Exists is equivalent to wildcard for value, so that a pod can
+                        tolerate all taints of a particular category.
+                      type: string
+                    tolerationSeconds:
+                      description: |-
+                        TolerationSeconds represents the period of time the toleration (which must be
+                        of effect NoExecute, otherwise this field is ignored) tolerates the taint. By default,
+                        it is not set, which means tolerate the taint forever (do not evict). Zero and
+                        negative values will be treated as 0 (evict immediately) by the system.
+                      format: int64
+                      type: integer
+                    value:
+                      description: |-
+                        Value is the taint value the toleration matches to.
+                        If the operator is Exists, the value should be empty, otherwise just a regular string.
+                      type: string
+                  type: object
+                type: array
+              topologySpreadConstraints:
+                description: topologySpreadConstraints defines the pod's topology
+                  spread constraints if specified.
+                items:
+                  properties:
+                    additionalLabelSelectors:
+                      description: additionalLabelSelectors Defines what Prometheus
+                        Operator managed labels should be added to labelSelector on
+                        the topologySpreadConstraint.
+                      enum:
+                      - OnResource
+                      - OnShard
+                      type: string
+                    labelSelector:
+                      description: |-
+                        LabelSelector is used to find matching pods.
+                        Pods that match this label selector are counted to determine the number of pods
+                        in their corresponding topology domain.
+                      properties:
+                        matchExpressions:
+                          description: matchExpressions is a list of label selector
+                            requirements. The requirements are ANDed.
+                          items:
+                            description: |-
+                              A label selector requirement is a selector that contains values, a key, and an operator that
+                              relates the key and values.
+                            properties:
+                              key:
+                                description: key is the label key that the selector
+                                  applies to.
+                                type: string
+                              operator:
+                                description: |-
+                                  operator represents a key's relationship to a set of values.
+                                  Valid operators are In, NotIn, Exists and DoesNotExist.
+                                type: string
+                              values:
+                                description: |-
+                                  values is an array of string values. If the operator is In or NotIn,
+                                  the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                  the values array must be empty. This array is replaced during a strategic
+                                  merge patch.
+                                items:
+                                  type: string
+                                type: array
+                                x-kubernetes-list-type: atomic
+                            required:
+                            - key
+                            - operator
+                            type: object
+                          type: array
+                          x-kubernetes-list-type: atomic
+                        matchLabels:
+                          additionalProperties:
+                            type: string
+                          description: |-
+                            matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                            map is equivalent to an element of matchExpressions, whose key field is "key", the
+                            operator is "In", and the values array contains only "value". The requirements are ANDed.
+                          type: object
+                      type: object
+                      x-kubernetes-map-type: atomic
+                    matchLabelKeys:
+                      description: |-
+                        MatchLabelKeys is a set of pod label keys to select the pods over which
+                        spreading will be calculated. The keys are used to lookup values from the
+                        incoming pod labels, those key-value labels are ANDed with labelSelector
+                        to select the group of existing pods over which spreading will be calculated
+                        for the incoming pod. The same key is forbidden to exist in both MatchLabelKeys and LabelSelector.
+                        MatchLabelKeys cannot be set when LabelSelector isn't set.
+                        Keys that don't exist in the incoming pod labels will
+                        be ignored. A null or empty list means only match against labelSelector.
+
+                        This is a beta field and requires the MatchLabelKeysInPodTopologySpread feature gate to be enabled (enabled by default).
+                      items:
+                        type: string
+                      type: array
+                      x-kubernetes-list-type: atomic
+                    maxSkew:
+                      description: |-
+                        MaxSkew describes the degree to which pods may be unevenly distributed.
+                        When `whenUnsatisfiable=DoNotSchedule`, it is the maximum permitted difference
+                        between the number of matching pods in the target topology and the global minimum.
+                        The global minimum is the minimum number of matching pods in an eligible domain
+                        or zero if the number of eligible domains is less than MinDomains.
+                        For example, in a 3-zone cluster, MaxSkew is set to 1, and pods with the same
+                        labelSelector spread as 2/2/1:
+                        In this case, the global minimum is 1.
+                        | zone1 | zone2 | zone3 |
+                        |  P P  |  P P  |   P   |
+                        - if MaxSkew is 1, incoming pod can only be scheduled to zone3 to become 2/2/2;
+                        scheduling it onto zone1(zone2) would make the ActualSkew(3-1) on zone1(zone2)
+                        violate MaxSkew(1).
+                        - if MaxSkew is 2, incoming pod can be scheduled onto any zone.
+                        When `whenUnsatisfiable=ScheduleAnyway`, it is used to give higher precedence
+                        to topologies that satisfy it.
+                        It's a required field. Default value is 1 and 0 is not allowed.
+                      format: int32
+                      type: integer
+                    minDomains:
+                      description: |-
+                        MinDomains indicates a minimum number of eligible domains.
+                        When the number of eligible domains with matching topology keys is less than minDomains,
+                        Pod Topology Spread treats "global minimum" as 0, and then the calculation of Skew is performed.
+                        And when the number of eligible domains with matching topology keys equals or greater than minDomains,
+                        this value has no effect on scheduling.
+                        As a result, when the number of eligible domains is less than minDomains,
+                        scheduler won't schedule more than maxSkew Pods to those domains.
+                        If value is nil, the constraint behaves as if MinDomains is equal to 1.
+                        Valid values are integers greater than 0.
+                        When value is not nil, WhenUnsatisfiable must be DoNotSchedule.
+
+                        For example, in a 3-zone cluster, MaxSkew is set to 2, MinDomains is set to 5 and pods with the same
+                        labelSelector spread as 2/2/2:
+                        | zone1 | zone2 | zone3 |
+                        |  P P  |  P P  |  P P  |
+                        The number of domains is less than 5(MinDomains), so "global minimum" is treated as 0.
+                        In this situation, new pod with the same labelSelector cannot be scheduled,
+                        because computed skew will be 3(3 - 0) if new Pod is scheduled to any of the three zones,
+                        it will violate MaxSkew.
+                      format: int32
+                      type: integer
+                    nodeAffinityPolicy:
+                      description: |-
+                        NodeAffinityPolicy indicates how we will treat Pod's nodeAffinity/nodeSelector
+                        when calculating pod topology spread skew. Options are:
+                        - Honor: only nodes matching nodeAffinity/nodeSelector are included in the calculations.
+                        - Ignore: nodeAffinity/nodeSelector are ignored. All nodes are included in the calculations.
+
+                        If this value is nil, the behavior is equivalent to the Honor policy.
+                      type: string
+                    nodeTaintsPolicy:
+                      description: |-
+                        NodeTaintsPolicy indicates how we will treat node taints when calculating
+                        pod topology spread skew. Options are:
+                        - Honor: nodes without taints, along with tainted nodes for which the incoming pod
+                        has a toleration, are included.
+                        - Ignore: node taints are ignored. All nodes are included.
+
+                        If this value is nil, the behavior is equivalent to the Ignore policy.
+                      type: string
+                    topologyKey:
+                      description: |-
+                        TopologyKey is the key of node labels. Nodes that have a label with this key
+                        and identical values are considered to be in the same topology.
+                        We consider each <key, value> as a "bucket", and try to put balanced number
+                        of pods into each bucket.
+                        We define a domain as a particular instance of a topology.
+                        Also, we define an eligible domain as a domain whose nodes meet the requirements of
+                        nodeAffinityPolicy and nodeTaintsPolicy.
+                        e.g. If TopologyKey is "kubernetes.io/hostname", each Node is a domain of that topology.
+                        And, if TopologyKey is "topology.kubernetes.io/zone", each zone is a domain of that topology.
+                        It's a required field.
+                      type: string
+                    whenUnsatisfiable:
+                      description: |-
+                        WhenUnsatisfiable indicates how to deal with a pod if it doesn't satisfy
+                        the spread constraint.
+                        - DoNotSchedule (default) tells the scheduler not to schedule it.
+                        - ScheduleAnyway tells the scheduler to schedule the pod in any location,
+                          but giving higher precedence to topologies that would help reduce the
+                          skew.
+                        A constraint is considered "Unsatisfiable" for an incoming pod
+                        if and only if every possible node assignment for that pod would violate
+                        "MaxSkew" on some topology.
+                        For example, in a 3-zone cluster, MaxSkew is set to 1, and pods with the same
+                        labelSelector spread as 3/1/1:
+                        | zone1 | zone2 | zone3 |
+                        | P P P |   P   |   P   |
+                        If WhenUnsatisfiable is set to DoNotSchedule, incoming pod can only be scheduled
+                        to zone2(zone3) to become 3/2/1(3/1/2) as ActualSkew(2-1) on zone2(zone3) satisfies
+                        MaxSkew(1). In other words, the cluster can still be imbalanced, but scheduler
+                        won't make it *more* imbalanced.
+                        It's a required field.
+                      type: string
+                  required:
+                  - maxSkew
+                  - topologyKey
+                  - whenUnsatisfiable
+                  type: object
+                type: array
+              tracingConfig:
+                description: |-
+                  tracingConfig defines tracing in Prometheus.
+
+                  This is an *experimental feature*, it may change in any upcoming release
+                  in a breaking way.
+                properties:
+                  clientType:
+                    description: clientType defines the client used to export the
+                      traces. Supported values are `http` or `grpc`.
+                    enum:
+                    - http
+                    - grpc
+                    type: string
+                  compression:
+                    description: compression key for supported compression types.
+                      The only supported value is `gzip`.
+                    enum:
+                    - gzip
+                    type: string
+                  endpoint:
+                    description: endpoint to send the traces to. Should be provided
+                      in format <host>:<port>.
+                    minLength: 1
+                    type: string
+                  headers:
+                    additionalProperties:
+                      type: string
+                    description: headers defines the key-value pairs to be used as
+                      headers associated with gRPC or HTTP requests.
+                    type: object
+                  insecure:
+                    description: insecure if disabled, the client will use a secure
+                      connection.
+                    type: boolean
+                  samplingFraction:
+                    anyOf:
+                    - type: integer
+                    - type: string
+                    description: samplingFraction defines the probability a given
+                      trace will be sampled. Must be a float from 0 through 1.
+                    pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                    x-kubernetes-int-or-string: true
+                  timeout:
+                    description: timeout defines the maximum time the exporter will
+                      wait for each batch export.
+                    pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
+                    type: string
+                  tlsConfig:
+                    description: tlsConfig to use when sending traces.
+                    properties:
+                      ca:
+                        description: ca defines the Certificate authority used when
+                          verifying server certificates.
+                        properties:
+                          configMap:
+                            description: configMap defines the ConfigMap containing
+                              data to use for the targets.
+                            properties:
+                              key:
+                                description: The key to select.
+                                type: string
+                              name:
+                                default: ""
+                                description: |-
+                                  Name of the referent.
+                                  This field is effectively required, but due to backwards compatibility is
+                                  allowed to be empty. Instances of this type with an empty value here are
+                                  almost certainly wrong.
+                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                type: string
+                              optional:
+                                description: Specify whether the ConfigMap or its
+                                  key must be defined
+                                type: boolean
+                            required:
+                            - key
+                            type: object
+                            x-kubernetes-map-type: atomic
+                          secret:
+                            description: secret defines the Secret containing data
+                              to use for the targets.
+                            properties:
+                              key:
+                                description: The key of the secret to select from.  Must
+                                  be a valid secret key.
+                                type: string
+                              name:
+                                default: ""
+                                description: |-
+                                  Name of the referent.
+                                  This field is effectively required, but due to backwards compatibility is
+                                  allowed to be empty. Instances of this type with an empty value here are
+                                  almost certainly wrong.
+                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                type: string
+                              optional:
+                                description: Specify whether the Secret or its key
+                                  must be defined
+                                type: boolean
+                            required:
+                            - key
+                            type: object
+                            x-kubernetes-map-type: atomic
+                        type: object
+                      caFile:
+                        description: caFile defines the path to the CA cert in the
+                          Prometheus container to use for the targets.
+                        type: string
+                      cert:
+                        description: cert defines the Client certificate to present
+                          when doing client-authentication.
+                        properties:
+                          configMap:
+                            description: configMap defines the ConfigMap containing
+                              data to use for the targets.
+                            properties:
+                              key:
+                                description: The key to select.
+                                type: string
+                              name:
+                                default: ""
+                                description: |-
+                                  Name of the referent.
+                                  This field is effectively required, but due to backwards compatibility is
+                                  allowed to be empty. Instances of this type with an empty value here are
+                                  almost certainly wrong.
+                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                type: string
+                              optional:
+                                description: Specify whether the ConfigMap or its
+                                  key must be defined
+                                type: boolean
+                            required:
+                            - key
+                            type: object
+                            x-kubernetes-map-type: atomic
+                          secret:
+                            description: secret defines the Secret containing data
+                              to use for the targets.
+                            properties:
+                              key:
+                                description: The key of the secret to select from.  Must
+                                  be a valid secret key.
+                                type: string
+                              name:
+                                default: ""
+                                description: |-
+                                  Name of the referent.
+                                  This field is effectively required, but due to backwards compatibility is
+                                  allowed to be empty. Instances of this type with an empty value here are
+                                  almost certainly wrong.
+                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                type: string
+                              optional:
+                                description: Specify whether the Secret or its key
+                                  must be defined
+                                type: boolean
+                            required:
+                            - key
+                            type: object
+                            x-kubernetes-map-type: atomic
+                        type: object
+                      certFile:
+                        description: certFile defines the path to the client cert
+                          file in the Prometheus container for the targets.
+                        type: string
+                      insecureSkipVerify:
+                        description: insecureSkipVerify defines how to disable target
+                          certificate validation.
+                        type: boolean
+                      keyFile:
+                        description: keyFile defines the path to the client key file
+                          in the Prometheus container for the targets.
+                        type: string
+                      keySecret:
+                        description: keySecret defines the Secret containing the client
+                          key file for the targets.
+                        properties:
+                          key:
+                            description: The key of the secret to select from.  Must
+                              be a valid secret key.
+                            type: string
+                          name:
+                            default: ""
+                            description: |-
+                              Name of the referent.
+                              This field is effectively required, but due to backwards compatibility is
+                              allowed to be empty. Instances of this type with an empty value here are
+                              almost certainly wrong.
+                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                            type: string
+                          optional:
+                            description: Specify whether the Secret or its key must
+                              be defined
+                            type: boolean
+                        required:
+                        - key
+                        type: object
+                        x-kubernetes-map-type: atomic
+                      maxVersion:
+                        description: |-
+                          maxVersion defines the maximum acceptable TLS version.
+
+                          It requires Prometheus >= v2.41.0 or Thanos >= v0.31.0.
+                        enum:
+                        - TLS10
+                        - TLS11
+                        - TLS12
+                        - TLS13
+                        type: string
+                      minVersion:
+                        description: |-
+                          minVersion defines the minimum acceptable TLS version.
+
+                          It requires Prometheus >= v2.35.0 or Thanos >= v0.28.0.
+                        enum:
+                        - TLS10
+                        - TLS11
+                        - TLS12
+                        - TLS13
+                        type: string
+                      serverName:
+                        description: serverName is used to verify the hostname for
+                          the targets.
+                        type: string
+                    type: object
+                required:
+                - endpoint
+                type: object
+              tsdb:
+                description: |-
+                  tsdb defines the runtime reloadable configuration of the timeseries database(TSDB).
+                  It requires Prometheus >= v2.39.0 or PrometheusAgent >= v2.54.0.
+                properties:
+                  outOfOrderTimeWindow:
+                    description: |-
+                      outOfOrderTimeWindow defines how old an out-of-order/out-of-bounds sample can be with
+                      respect to the TSDB max time.
+
+                      An out-of-order/out-of-bounds sample is ingested into the TSDB as long as
+                      the timestamp of the sample is >= (TSDB.MaxTime - outOfOrderTimeWindow).
+
+                      This is an *experimental feature*, it may change in any upcoming release
+                      in a breaking way.
+
+                      It requires Prometheus >= v2.39.0 or PrometheusAgent >= v2.54.0.
+                    pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
+                    type: string
+                type: object
+              version:
+                description: |-
+                  version of Prometheus being deployed. The operator uses this information
+                  to generate the Prometheus StatefulSet + configuration files.
+
+                  If not specified, the operator assumes the latest upstream version of
+                  Prometheus available at the time when the version of the operator was
+                  released.
+                type: string
+              volumeMounts:
+                description: |-
+                  volumeMounts allows the configuration of additional VolumeMounts.
+
+                  VolumeMounts will be appended to other VolumeMounts in the 'prometheus'
+                  container, that are generated as a result of StorageSpec objects.
+                items:
+                  description: VolumeMount describes a mounting of a Volume within
+                    a container.
+                  properties:
+                    mountPath:
+                      description: |-
+                        Path within the container at which the volume should be mounted.  Must
+                        not contain ':'.
+                      type: string
+                    mountPropagation:
+                      description: |-
+                        mountPropagation determines how mounts are propagated from the host
+                        to container and the other way around.
+                        When not set, MountPropagationNone is used.
+                        This field is beta in 1.10.
+                        When RecursiveReadOnly is set to IfPossible or to Enabled, MountPropagation must be None or unspecified
+                        (which defaults to None).
+                      type: string
+                    name:
+                      description: This must match the Name of a Volume.
+                      type: string
+                    readOnly:
+                      description: |-
+                        Mounted read-only if true, read-write otherwise (false or unspecified).
+                        Defaults to false.
+                      type: boolean
+                    recursiveReadOnly:
+                      description: |-
+                        RecursiveReadOnly specifies whether read-only mounts should be handled
+                        recursively.
+
+                        If ReadOnly is false, this field has no meaning and must be unspecified.
+
+                        If ReadOnly is true, and this field is set to Disabled, the mount is not made
+                        recursively read-only.  If this field is set to IfPossible, the mount is made
+                        recursively read-only, if it is supported by the container runtime.  If this
+                        field is set to Enabled, the mount is made recursively read-only if it is
+                        supported by the container runtime, otherwise the pod will not be started and
+                        an error will be generated to indicate the reason.
+
+                        If this field is set to IfPossible or Enabled, MountPropagation must be set to
+                        None (or be unspecified, which defaults to None).
+
+                        If this field is not specified, it is treated as an equivalent of Disabled.
+                      type: string
+                    subPath:
+                      description: |-
+                        Path within the volume from which the container's volume should be mounted.
+                        Defaults to "" (volume's root).
+                      type: string
+                    subPathExpr:
+                      description: |-
+                        Expanded path within the volume from which the container's volume should be mounted.
+                        Behaves similarly to SubPath but environment variable references $(VAR_NAME) are expanded using the container's environment.
+                        Defaults to "" (volume's root).
+                        SubPathExpr and SubPath are mutually exclusive.
+                      type: string
+                  required:
+                  - mountPath
+                  - name
+                  type: object
+                type: array
+              volumes:
+                description: |-
+                  volumes allows the configuration of additional volumes on the output
+                  StatefulSet definition. Volumes specified will be appended to other
+                  volumes that are generated as a result of StorageSpec objects.
+                items:
+                  description: Volume represents a named volume in a pod that may
+                    be accessed by any container in the pod.
+                  properties:
+                    awsElasticBlockStore:
+                      description: |-
+                        awsElasticBlockStore represents an AWS Disk resource that is attached to a
+                        kubelet's host machine and then exposed to the pod.
+                        Deprecated: AWSElasticBlockStore is deprecated. All operations for the in-tree
+                        awsElasticBlockStore type are redirected to the ebs.csi.aws.com CSI driver.
+                        More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
+                      properties:
+                        fsType:
+                          description: |-
+                            fsType is the filesystem type of the volume that you want to mount.
+                            Tip: Ensure that the filesystem type is supported by the host operating system.
+                            Examples: "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
+                            More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
+                          type: string
+                        partition:
+                          description: |-
+                            partition is the partition in the volume that you want to mount.
+                            If omitted, the default is to mount by volume name.
+                            Examples: For volume /dev/sda1, you specify the partition as "1".
+                            Similarly, the volume partition for /dev/sda is "0" (or you can leave the property empty).
+                          format: int32
+                          type: integer
+                        readOnly:
+                          description: |-
+                            readOnly value true will force the readOnly setting in VolumeMounts.
+                            More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
+                          type: boolean
+                        volumeID:
+                          description: |-
+                            volumeID is unique ID of the persistent disk resource in AWS (Amazon EBS volume).
+                            More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
+                          type: string
+                      required:
+                      - volumeID
+                      type: object
+                    azureDisk:
+                      description: |-
+                        azureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.
+                        Deprecated: AzureDisk is deprecated. All operations for the in-tree azureDisk type
+                        are redirected to the disk.csi.azure.com CSI driver.
+                      properties:
+                        cachingMode:
+                          description: 'cachingMode is the Host Caching mode: None,
+                            Read Only, Read Write.'
+                          type: string
+                        diskName:
+                          description: diskName is the Name of the data disk in the
+                            blob storage
+                          type: string
+                        diskURI:
+                          description: diskURI is the URI of data disk in the blob
+                            storage
+                          type: string
+                        fsType:
+                          default: ext4
+                          description: |-
+                            fsType is Filesystem type to mount.
+                            Must be a filesystem type supported by the host operating system.
+                            Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
+                          type: string
+                        kind:
+                          description: 'kind expected values are Shared: multiple
+                            blob disks per storage account  Dedicated: single blob
+                            disk per storage account  Managed: azure managed data
+                            disk (only in managed availability set). defaults to shared'
+                          type: string
+                        readOnly:
+                          default: false
+                          description: |-
+                            readOnly Defaults to false (read/write). ReadOnly here will force
+                            the ReadOnly setting in VolumeMounts.
+                          type: boolean
+                      required:
+                      - diskName
+                      - diskURI
+                      type: object
+                    azureFile:
+                      description: |-
+                        azureFile represents an Azure File Service mount on the host and bind mount to the pod.
+                        Deprecated: AzureFile is deprecated. All operations for the in-tree azureFile type
+                        are redirected to the file.csi.azure.com CSI driver.
+                      properties:
+                        readOnly:
+                          description: |-
+                            readOnly defaults to false (read/write). ReadOnly here will force
+                            the ReadOnly setting in VolumeMounts.
+                          type: boolean
+                        secretName:
+                          description: secretName is the  name of secret that contains
+                            Azure Storage Account Name and Key
+                          type: string
+                        shareName:
+                          description: shareName is the azure share Name
+                          type: string
+                      required:
+                      - secretName
+                      - shareName
+                      type: object
+                    cephfs:
+                      description: |-
+                        cephFS represents a Ceph FS mount on the host that shares a pod's lifetime.
+                        Deprecated: CephFS is deprecated and the in-tree cephfs type is no longer supported.
+                      properties:
+                        monitors:
+                          description: |-
+                            monitors is Required: Monitors is a collection of Ceph monitors
+                            More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it
+                          items:
+                            type: string
+                          type: array
+                          x-kubernetes-list-type: atomic
+                        path:
+                          description: 'path is Optional: Used as the mounted root,
+                            rather than the full Ceph tree, default is /'
+                          type: string
+                        readOnly:
+                          description: |-
+                            readOnly is Optional: Defaults to false (read/write). ReadOnly here will force
+                            the ReadOnly setting in VolumeMounts.
+                            More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it
+                          type: boolean
+                        secretFile:
+                          description: |-
+                            secretFile is Optional: SecretFile is the path to key ring for User, default is /etc/ceph/user.secret
+                            More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it
+                          type: string
+                        secretRef:
+                          description: |-
+                            secretRef is Optional: SecretRef is reference to the authentication secret for User, default is empty.
+                            More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it
+                          properties:
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        user:
+                          description: |-
+                            user is optional: User is the rados user name, default is admin
+                            More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it
+                          type: string
+                      required:
+                      - monitors
+                      type: object
+                    cinder:
+                      description: |-
+                        cinder represents a cinder volume attached and mounted on kubelets host machine.
+                        Deprecated: Cinder is deprecated. All operations for the in-tree cinder type
+                        are redirected to the cinder.csi.openstack.org CSI driver.
+                        More info: https://examples.k8s.io/mysql-cinder-pd/README.md
+                      properties:
+                        fsType:
+                          description: |-
+                            fsType is the filesystem type to mount.
+                            Must be a filesystem type supported by the host operating system.
+                            Examples: "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
+                            More info: https://examples.k8s.io/mysql-cinder-pd/README.md
+                          type: string
+                        readOnly:
+                          description: |-
+                            readOnly defaults to false (read/write). ReadOnly here will force
+                            the ReadOnly setting in VolumeMounts.
+                            More info: https://examples.k8s.io/mysql-cinder-pd/README.md
+                          type: boolean
+                        secretRef:
+                          description: |-
+                            secretRef is optional: points to a secret object containing parameters used to connect
+                            to OpenStack.
+                          properties:
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        volumeID:
+                          description: |-
+                            volumeID used to identify the volume in cinder.
+                            More info: https://examples.k8s.io/mysql-cinder-pd/README.md
+                          type: string
+                      required:
+                      - volumeID
+                      type: object
+                    configMap:
+                      description: configMap represents a configMap that should populate
+                        this volume
+                      properties:
+                        defaultMode:
+                          description: |-
+                            defaultMode is optional: mode bits used to set permissions on created files by default.
+                            Must be an octal value between 0000 and 0777 or a decimal value between 0 and 511.
+                            YAML accepts both octal and decimal values, JSON requires decimal values for mode bits.
+                            Defaults to 0644.
+                            Directories within the path are not affected by this setting.
+                            This might be in conflict with other options that affect the file
+                            mode, like fsGroup, and the result can be other mode bits set.
+                          format: int32
+                          type: integer
+                        items:
+                          description: |-
+                            items if unspecified, each key-value pair in the Data field of the referenced
+                            ConfigMap will be projected into the volume as a file whose name is the
+                            key and content is the value. If specified, the listed keys will be
+                            projected into the specified paths, and unlisted keys will not be
+                            present. If a key is specified which is not present in the ConfigMap,
+                            the volume setup will error unless it is marked optional. Paths must be
+                            relative and may not contain the '..' path or start with '..'.
+                          items:
+                            description: Maps a string key to a path within a volume.
+                            properties:
+                              key:
+                                description: key is the key to project.
+                                type: string
+                              mode:
+                                description: |-
+                                  mode is Optional: mode bits used to set permissions on this file.
+                                  Must be an octal value between 0000 and 0777 or a decimal value between 0 and 511.
+                                  YAML accepts both octal and decimal values, JSON requires decimal values for mode bits.
+                                  If not specified, the volume defaultMode will be used.
+                                  This might be in conflict with other options that affect the file
+                                  mode, like fsGroup, and the result can be other mode bits set.
+                                format: int32
+                                type: integer
+                              path:
+                                description: |-
+                                  path is the relative path of the file to map the key to.
+                                  May not be an absolute path.
+                                  May not contain the path element '..'.
+                                  May not start with the string '..'.
+                                type: string
+                            required:
+                            - key
+                            - path
+                            type: object
+                          type: array
+                          x-kubernetes-list-type: atomic
+                        name:
+                          default: ""
+                          description: |-
+                            Name of the referent.
+                            This field is effectively required, but due to backwards compatibility is
+                            allowed to be empty. Instances of this type with an empty value here are
+                            almost certainly wrong.
+                            More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                          type: string
+                        optional:
+                          description: optional specify whether the ConfigMap or its
+                            keys must be defined
+                          type: boolean
+                      type: object
+                      x-kubernetes-map-type: atomic
+                    csi:
+                      description: csi (Container Storage Interface) represents ephemeral
+                        storage that is handled by certain external CSI drivers.
+                      properties:
+                        driver:
+                          description: |-
+                            driver is the name of the CSI driver that handles this volume.
+                            Consult with your admin for the correct name as registered in the cluster.
+                          type: string
+                        fsType:
+                          description: |-
+                            fsType to mount. Ex. "ext4", "xfs", "ntfs".
+                            If not provided, the empty value is passed to the associated CSI driver
+                            which will determine the default filesystem to apply.
+                          type: string
+                        nodePublishSecretRef:
+                          description: |-
+                            nodePublishSecretRef is a reference to the secret object containing
+                            sensitive information to pass to the CSI driver to complete the CSI
+                            NodePublishVolume and NodeUnpublishVolume calls.
+                            This field is optional, and  may be empty if no secret is required. If the
+                            secret object contains more than one secret, all secret references are passed.
+                          properties:
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        readOnly:
+                          description: |-
+                            readOnly specifies a read-only configuration for the volume.
+                            Defaults to false (read/write).
+                          type: boolean
+                        volumeAttributes:
+                          additionalProperties:
+                            type: string
+                          description: |-
+                            volumeAttributes stores driver-specific properties that are passed to the CSI
+                            driver. Consult your driver's documentation for supported values.
+                          type: object
+                      required:
+                      - driver
+                      type: object
+                    downwardAPI:
+                      description: downwardAPI represents downward API about the pod
+                        that should populate this volume
+                      properties:
+                        defaultMode:
+                          description: |-
+                            Optional: mode bits to use on created files by default. Must be a
+                            Optional: mode bits used to set permissions on created files by default.
+                            Must be an octal value between 0000 and 0777 or a decimal value between 0 and 511.
+                            YAML accepts both octal and decimal values, JSON requires decimal values for mode bits.
+                            Defaults to 0644.
+                            Directories within the path are not affected by this setting.
+                            This might be in conflict with other options that affect the file
+                            mode, like fsGroup, and the result can be other mode bits set.
+                          format: int32
+                          type: integer
+                        items:
+                          description: Items is a list of downward API volume file
+                          items:
+                            description: DownwardAPIVolumeFile represents information
+                              to create the file containing the pod field
+                            properties:
+                              fieldRef:
+                                description: 'Required: Selects a field of the pod:
+                                  only annotations, labels, name, namespace and uid
+                                  are supported.'
+                                properties:
+                                  apiVersion:
+                                    description: Version of the schema the FieldPath
+                                      is written in terms of, defaults to "v1".
+                                    type: string
+                                  fieldPath:
+                                    description: Path of the field to select in the
+                                      specified API version.
+                                    type: string
+                                required:
+                                - fieldPath
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              mode:
+                                description: |-
+                                  Optional: mode bits used to set permissions on this file, must be an octal value
+                                  between 0000 and 0777 or a decimal value between 0 and 511.
+                                  YAML accepts both octal and decimal values, JSON requires decimal values for mode bits.
+                                  If not specified, the volume defaultMode will be used.
+                                  This might be in conflict with other options that affect the file
+                                  mode, like fsGroup, and the result can be other mode bits set.
+                                format: int32
+                                type: integer
+                              path:
+                                description: 'Required: Path is  the relative path
+                                  name of the file to be created. Must not be absolute
+                                  or contain the ''..'' path. Must be utf-8 encoded.
+                                  The first item of the relative path must not start
+                                  with ''..'''
+                                type: string
+                              resourceFieldRef:
+                                description: |-
+                                  Selects a resource of the container: only resources limits and requests
+                                  (limits.cpu, limits.memory, requests.cpu and requests.memory) are currently supported.
+                                properties:
+                                  containerName:
+                                    description: 'Container name: required for volumes,
+                                      optional for env vars'
+                                    type: string
+                                  divisor:
+                                    anyOf:
+                                    - type: integer
+                                    - type: string
+                                    description: Specifies the output format of the
+                                      exposed resources, defaults to "1"
+                                    pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                    x-kubernetes-int-or-string: true
+                                  resource:
+                                    description: 'Required: resource to select'
+                                    type: string
+                                required:
+                                - resource
+                                type: object
+                                x-kubernetes-map-type: atomic
+                            required:
+                            - path
+                            type: object
+                          type: array
+                          x-kubernetes-list-type: atomic
+                      type: object
+                    emptyDir:
+                      description: |-
+                        emptyDir represents a temporary directory that shares a pod's lifetime.
+                        More info: https://kubernetes.io/docs/concepts/storage/volumes#emptydir
+                      properties:
+                        medium:
+                          description: |-
+                            medium represents what type of storage medium should back this directory.
+                            The default is "" which means to use the node's default medium.
+                            Must be an empty string (default) or Memory.
+                            More info: https://kubernetes.io/docs/concepts/storage/volumes#emptydir
+                          type: string
+                        sizeLimit:
+                          anyOf:
+                          - type: integer
+                          - type: string
+                          description: |-
+                            sizeLimit is the total amount of local storage required for this EmptyDir volume.
+                            The size limit is also applicable for memory medium.
+                            The maximum usage on memory medium EmptyDir would be the minimum value between
+                            the SizeLimit specified here and the sum of memory limits of all containers in a pod.
+                            The default is nil which means that the limit is undefined.
+                            More info: https://kubernetes.io/docs/concepts/storage/volumes#emptydir
+                          pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                          x-kubernetes-int-or-string: true
+                      type: object
+                    ephemeral:
+                      description: |-
+                        ephemeral represents a volume that is handled by a cluster storage driver.
+                        The volume's lifecycle is tied to the pod that defines it - it will be created before the pod starts,
+                        and deleted when the pod is removed.
+
+                        Use this if:
+                        a) the volume is only needed while the pod runs,
+                        b) features of normal volumes like restoring from snapshot or capacity
+                           tracking are needed,
+                        c) the storage driver is specified through a storage class, and
+                        d) the storage driver supports dynamic volume provisioning through
+                           a PersistentVolumeClaim (see EphemeralVolumeSource for more
+                           information on the connection between this volume type
+                           and PersistentVolumeClaim).
+
+                        Use PersistentVolumeClaim or one of the vendor-specific
+                        APIs for volumes that persist for longer than the lifecycle
+                        of an individual pod.
+
+                        Use CSI for light-weight local ephemeral volumes if the CSI driver is meant to
+                        be used that way - see the documentation of the driver for
+                        more information.
+
+                        A pod can use both types of ephemeral volumes and
+                        persistent volumes at the same time.
+                      properties:
+                        volumeClaimTemplate:
+                          description: |-
+                            Will be used to create a stand-alone PVC to provision the volume.
+                            The pod in which this EphemeralVolumeSource is embedded will be the
+                            owner of the PVC, i.e. the PVC will be deleted together with the
+                            pod.  The name of the PVC will be `<pod name>-<volume name>` where
+                            `<volume name>` is the name from the `PodSpec.Volumes` array
+                            entry. Pod validation will reject the pod if the concatenated name
+                            is not valid for a PVC (for example, too long).
+
+                            An existing PVC with that name that is not owned by the pod
+                            will *not* be used for the pod to avoid using an unrelated
+                            volume by mistake. Starting the pod is then blocked until
+                            the unrelated PVC is removed. If such a pre-created PVC is
+                            meant to be used by the pod, the PVC has to updated with an
+                            owner reference to the pod once the pod exists. Normally
+                            this should not be necessary, but it may be useful when
+                            manually reconstructing a broken cluster.
+
+                            This field is read-only and no changes will be made by Kubernetes
+                            to the PVC after it has been created.
+
+                            Required, must not be nil.
+                          properties:
+                            metadata:
+                              description: |-
+                                May contain labels and annotations that will be copied into the PVC
+                                when creating it. No other fields are allowed and will be rejected during
+                                validation.
+                              type: object
+                            spec:
+                              description: |-
+                                The specification for the PersistentVolumeClaim. The entire content is
+                                copied unchanged into the PVC that gets created from this
+                                template. The same fields as in a PersistentVolumeClaim
+                                are also valid here.
+                              properties:
+                                accessModes:
+                                  description: |-
+                                    accessModes contains the desired access modes the volume should have.
+                                    More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#access-modes-1
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                dataSource:
+                                  description: |-
+                                    dataSource field can be used to specify either:
+                                    * An existing VolumeSnapshot object (snapshot.storage.k8s.io/VolumeSnapshot)
+                                    * An existing PVC (PersistentVolumeClaim)
+                                    If the provisioner or an external controller can support the specified data source,
+                                    it will create a new volume based on the contents of the specified data source.
+                                    When the AnyVolumeDataSource feature gate is enabled, dataSource contents will be copied to dataSourceRef,
+                                    and dataSourceRef contents will be copied to dataSource when dataSourceRef.namespace is not specified.
+                                    If the namespace is specified, then dataSourceRef will not be copied to dataSource.
+                                  properties:
+                                    apiGroup:
+                                      description: |-
+                                        APIGroup is the group for the resource being referenced.
+                                        If APIGroup is not specified, the specified Kind must be in the core API group.
+                                        For any other third-party types, APIGroup is required.
+                                      type: string
+                                    kind:
+                                      description: Kind is the type of resource being
+                                        referenced
+                                      type: string
+                                    name:
+                                      description: Name is the name of resource being
+                                        referenced
+                                      type: string
+                                  required:
+                                  - kind
+                                  - name
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                dataSourceRef:
+                                  description: |-
+                                    dataSourceRef specifies the object from which to populate the volume with data, if a non-empty
+                                    volume is desired. This may be any object from a non-empty API group (non
+                                    core object) or a PersistentVolumeClaim object.
+                                    When this field is specified, volume binding will only succeed if the type of
+                                    the specified object matches some installed volume populator or dynamic
+                                    provisioner.
+                                    This field will replace the functionality of the dataSource field and as such
+                                    if both fields are non-empty, they must have the same value. For backwards
+                                    compatibility, when namespace isn't specified in dataSourceRef,
+                                    both fields (dataSource and dataSourceRef) will be set to the same
+                                    value automatically if one of them is empty and the other is non-empty.
+                                    When namespace is specified in dataSourceRef,
+                                    dataSource isn't set to the same value and must be empty.
+                                    There are three important differences between dataSource and dataSourceRef:
+                                    * While dataSource only allows two specific types of objects, dataSourceRef
+                                      allows any non-core object, as well as PersistentVolumeClaim objects.
+                                    * While dataSource ignores disallowed values (dropping them), dataSourceRef
+                                      preserves all values, and generates an error if a disallowed value is
+                                      specified.
+                                    * While dataSource only allows local objects, dataSourceRef allows objects
+                                      in any namespaces.
+                                    (Beta) Using this field requires the AnyVolumeDataSource feature gate to be enabled.
+                                    (Alpha) Using the namespace field of dataSourceRef requires the CrossNamespaceVolumeDataSource feature gate to be enabled.
+                                  properties:
+                                    apiGroup:
+                                      description: |-
+                                        APIGroup is the group for the resource being referenced.
+                                        If APIGroup is not specified, the specified Kind must be in the core API group.
+                                        For any other third-party types, APIGroup is required.
+                                      type: string
+                                    kind:
+                                      description: Kind is the type of resource being
+                                        referenced
+                                      type: string
+                                    name:
+                                      description: Name is the name of resource being
+                                        referenced
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        Namespace is the namespace of resource being referenced
+                                        Note that when a namespace is specified, a gateway.networking.k8s.io/ReferenceGrant object is required in the referent namespace to allow that namespace's owner to accept the reference. See the ReferenceGrant documentation for details.
+                                        (Alpha) This field requires the CrossNamespaceVolumeDataSource feature gate to be enabled.
+                                      type: string
+                                  required:
+                                  - kind
+                                  - name
+                                  type: object
+                                resources:
+                                  description: |-
+                                    resources represents the minimum resources the volume should have.
+                                    If RecoverVolumeExpansionFailure feature is enabled users are allowed to specify resource requirements
+                                    that are lower than previous value but must still be higher than capacity recorded in the
+                                    status field of the claim.
+                                    More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources
+                                  properties:
+                                    limits:
+                                      additionalProperties:
+                                        anyOf:
+                                        - type: integer
+                                        - type: string
+                                        pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                        x-kubernetes-int-or-string: true
+                                      description: |-
+                                        Limits describes the maximum amount of compute resources allowed.
+                                        More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+                                      type: object
+                                    requests:
+                                      additionalProperties:
+                                        anyOf:
+                                        - type: integer
+                                        - type: string
+                                        pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                        x-kubernetes-int-or-string: true
+                                      description: |-
+                                        Requests describes the minimum amount of compute resources required.
+                                        If Requests is omitted for a container, it defaults to Limits if that is explicitly specified,
+                                        otherwise to an implementation-defined value. Requests cannot exceed Limits.
+                                        More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+                                      type: object
+                                  type: object
+                                selector:
+                                  description: selector is a label query over volumes
+                                    to consider for binding.
+                                  properties:
+                                    matchExpressions:
+                                      description: matchExpressions is a list of label
+                                        selector requirements. The requirements are
+                                        ANDed.
+                                      items:
+                                        description: |-
+                                          A label selector requirement is a selector that contains values, a key, and an operator that
+                                          relates the key and values.
+                                        properties:
+                                          key:
+                                            description: key is the label key that
+                                              the selector applies to.
+                                            type: string
+                                          operator:
+                                            description: |-
+                                              operator represents a key's relationship to a set of values.
+                                              Valid operators are In, NotIn, Exists and DoesNotExist.
+                                            type: string
+                                          values:
+                                            description: |-
+                                              values is an array of string values. If the operator is In or NotIn,
+                                              the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                              the values array must be empty. This array is replaced during a strategic
+                                              merge patch.
+                                            items:
+                                              type: string
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                        required:
+                                        - key
+                                        - operator
+                                        type: object
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    matchLabels:
+                                      additionalProperties:
+                                        type: string
+                                      description: |-
+                                        matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                        map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                        operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                      type: object
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                storageClassName:
+                                  description: |-
+                                    storageClassName is the name of the StorageClass required by the claim.
+                                    More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#class-1
+                                  type: string
+                                volumeAttributesClassName:
+                                  description: |-
+                                    volumeAttributesClassName may be used to set the VolumeAttributesClass used by this claim.
+                                    If specified, the CSI driver will create or update the volume with the attributes defined
+                                    in the corresponding VolumeAttributesClass. This has a different purpose than storageClassName,
+                                    it can be changed after the claim is created. An empty string or nil value indicates that no
+                                    VolumeAttributesClass will be applied to the claim. If the claim enters an Infeasible error state,
+                                    this field can be reset to its previous value (including nil) to cancel the modification.
+                                    If the resource referred to by volumeAttributesClass does not exist, this PersistentVolumeClaim will be
+                                    set to a Pending state, as reflected by the modifyVolumeStatus field, until such as a resource
+                                    exists.
+                                    More info: https://kubernetes.io/docs/concepts/storage/volume-attributes-classes/
+                                  type: string
+                                volumeMode:
+                                  description: |-
+                                    volumeMode defines what type of volume is required by the claim.
+                                    Value of Filesystem is implied when not included in claim spec.
+                                  type: string
+                                volumeName:
+                                  description: volumeName is the binding reference
+                                    to the PersistentVolume backing this claim.
+                                  type: string
+                              type: object
+                          required:
+                          - spec
+                          type: object
+                      type: object
+                    fc:
+                      description: fc represents a Fibre Channel resource that is
+                        attached to a kubelet's host machine and then exposed to the
+                        pod.
+                      properties:
+                        fsType:
+                          description: |-
+                            fsType is the filesystem type to mount.
+                            Must be a filesystem type supported by the host operating system.
+                            Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
+                          type: string
+                        lun:
+                          description: 'lun is Optional: FC target lun number'
+                          format: int32
+                          type: integer
+                        readOnly:
+                          description: |-
+                            readOnly is Optional: Defaults to false (read/write). ReadOnly here will force
+                            the ReadOnly setting in VolumeMounts.
+                          type: boolean
+                        targetWWNs:
+                          description: 'targetWWNs is Optional: FC target worldwide
+                            names (WWNs)'
+                          items:
+                            type: string
+                          type: array
+                          x-kubernetes-list-type: atomic
+                        wwids:
+                          description: |-
+                            wwids Optional: FC volume world wide identifiers (wwids)
+                            Either wwids or combination of targetWWNs and lun must be set, but not both simultaneously.
+                          items:
+                            type: string
+                          type: array
+                          x-kubernetes-list-type: atomic
+                      type: object
+                    flexVolume:
+                      description: |-
+                        flexVolume represents a generic volume resource that is
+                        provisioned/attached using an exec based plugin.
+                        Deprecated: FlexVolume is deprecated. Consider using a CSIDriver instead.
+                      properties:
+                        driver:
+                          description: driver is the name of the driver to use for
+                            this volume.
+                          type: string
+                        fsType:
+                          description: |-
+                            fsType is the filesystem type to mount.
+                            Must be a filesystem type supported by the host operating system.
+                            Ex. "ext4", "xfs", "ntfs". The default filesystem depends on FlexVolume script.
+                          type: string
+                        options:
+                          additionalProperties:
+                            type: string
+                          description: 'options is Optional: this field holds extra
+                            command options if any.'
+                          type: object
+                        readOnly:
+                          description: |-
+                            readOnly is Optional: defaults to false (read/write). ReadOnly here will force
+                            the ReadOnly setting in VolumeMounts.
+                          type: boolean
+                        secretRef:
+                          description: |-
+                            secretRef is Optional: secretRef is reference to the secret object containing
+                            sensitive information to pass to the plugin scripts. This may be
+                            empty if no secret object is specified. If the secret object
+                            contains more than one secret, all secrets are passed to the plugin
+                            scripts.
+                          properties:
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                          type: object
+                          x-kubernetes-map-type: atomic
+                      required:
+                      - driver
+                      type: object
+                    flocker:
+                      description: |-
+                        flocker represents a Flocker volume attached to a kubelet's host machine. This depends on the Flocker control service being running.
+                        Deprecated: Flocker is deprecated and the in-tree flocker type is no longer supported.
+                      properties:
+                        datasetName:
+                          description: |-
+                            datasetName is Name of the dataset stored as metadata -> name on the dataset for Flocker
+                            should be considered as deprecated
+                          type: string
+                        datasetUUID:
+                          description: datasetUUID is the UUID of the dataset. This
+                            is unique identifier of a Flocker dataset
+                          type: string
+                      type: object
+                    gcePersistentDisk:
+                      description: |-
+                        gcePersistentDisk represents a GCE Disk resource that is attached to a
+                        kubelet's host machine and then exposed to the pod.
+                        Deprecated: GCEPersistentDisk is deprecated. All operations for the in-tree
+                        gcePersistentDisk type are redirected to the pd.csi.storage.gke.io CSI driver.
+                        More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
+                      properties:
+                        fsType:
+                          description: |-
+                            fsType is filesystem type of the volume that you want to mount.
+                            Tip: Ensure that the filesystem type is supported by the host operating system.
+                            Examples: "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
+                            More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
+                          type: string
+                        partition:
+                          description: |-
+                            partition is the partition in the volume that you want to mount.
+                            If omitted, the default is to mount by volume name.
+                            Examples: For volume /dev/sda1, you specify the partition as "1".
+                            Similarly, the volume partition for /dev/sda is "0" (or you can leave the property empty).
+                            More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
+                          format: int32
+                          type: integer
+                        pdName:
+                          description: |-
+                            pdName is unique name of the PD resource in GCE. Used to identify the disk in GCE.
+                            More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
+                          type: string
+                        readOnly:
+                          description: |-
+                            readOnly here will force the ReadOnly setting in VolumeMounts.
+                            Defaults to false.
+                            More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
+                          type: boolean
+                      required:
+                      - pdName
+                      type: object
+                    gitRepo:
+                      description: |-
+                        gitRepo represents a git repository at a particular revision.
+                        Deprecated: GitRepo is deprecated. To provision a container with a git repo, mount an
+                        EmptyDir into an InitContainer that clones the repo using git, then mount the EmptyDir
+                        into the Pod's container.
+                      properties:
+                        directory:
+                          description: |-
+                            directory is the target directory name.
+                            Must not contain or start with '..'.  If '.' is supplied, the volume directory will be the
+                            git repository.  Otherwise, if specified, the volume will contain the git repository in
+                            the subdirectory with the given name.
+                          type: string
+                        repository:
+                          description: repository is the URL
+                          type: string
+                        revision:
+                          description: revision is the commit hash for the specified
+                            revision.
+                          type: string
+                      required:
+                      - repository
+                      type: object
+                    glusterfs:
+                      description: |-
+                        glusterfs represents a Glusterfs mount on the host that shares a pod's lifetime.
+                        Deprecated: Glusterfs is deprecated and the in-tree glusterfs type is no longer supported.
+                      properties:
+                        endpoints:
+                          description: endpoints is the endpoint name that details
+                            Glusterfs topology.
+                          type: string
+                        path:
+                          description: |-
+                            path is the Glusterfs volume path.
+                            More info: https://examples.k8s.io/volumes/glusterfs/README.md#create-a-pod
+                          type: string
+                        readOnly:
+                          description: |-
+                            readOnly here will force the Glusterfs volume to be mounted with read-only permissions.
+                            Defaults to false.
+                            More info: https://examples.k8s.io/volumes/glusterfs/README.md#create-a-pod
+                          type: boolean
+                      required:
+                      - endpoints
+                      - path
+                      type: object
+                    hostPath:
+                      description: |-
+                        hostPath represents a pre-existing file or directory on the host
+                        machine that is directly exposed to the container. This is generally
+                        used for system agents or other privileged things that are allowed
+                        to see the host machine. Most containers will NOT need this.
+                        More info: https://kubernetes.io/docs/concepts/storage/volumes#hostpath
+                      properties:
+                        path:
+                          description: |-
+                            path of the directory on the host.
+                            If the path is a symlink, it will follow the link to the real path.
+                            More info: https://kubernetes.io/docs/concepts/storage/volumes#hostpath
+                          type: string
+                        type:
+                          description: |-
+                            type for HostPath Volume
+                            Defaults to ""
+                            More info: https://kubernetes.io/docs/concepts/storage/volumes#hostpath
+                          type: string
+                      required:
+                      - path
+                      type: object
+                    image:
+                      description: |-
+                        image represents an OCI object (a container image or artifact) pulled and mounted on the kubelet's host machine.
+                        The volume is resolved at pod startup depending on which PullPolicy value is provided:
+
+                        - Always: the kubelet always attempts to pull the reference. Container creation will fail If the pull fails.
+                        - Never: the kubelet never pulls the reference and only uses a local image or artifact. Container creation will fail if the reference isn't present.
+                        - IfNotPresent: the kubelet pulls if the reference isn't already present on disk. Container creation will fail if the reference isn't present and the pull fails.
+
+                        The volume gets re-resolved if the pod gets deleted and recreated, which means that new remote content will become available on pod recreation.
+                        A failure to resolve or pull the image during pod startup will block containers from starting and may add significant latency. Failures will be retried using normal volume backoff and will be reported on the pod reason and message.
+                        The types of objects that may be mounted by this volume are defined by the container runtime implementation on a host machine and at minimum must include all valid types supported by the container image field.
+                        The OCI object gets mounted in a single directory (spec.containers[*].volumeMounts.mountPath) by merging the manifest layers in the same way as for container images.
+                        The volume will be mounted read-only (ro) and non-executable files (noexec).
+                        Sub path mounts for containers are not supported (spec.containers[*].volumeMounts.subpath) before 1.33.
+                        The field spec.securityContext.fsGroupChangePolicy has no effect on this volume type.
+                      properties:
+                        pullPolicy:
+                          description: |-
+                            Policy for pulling OCI objects. Possible values are:
+                            Always: the kubelet always attempts to pull the reference. Container creation will fail If the pull fails.
+                            Never: the kubelet never pulls the reference and only uses a local image or artifact. Container creation will fail if the reference isn't present.
+                            IfNotPresent: the kubelet pulls if the reference isn't already present on disk. Container creation will fail if the reference isn't present and the pull fails.
+                            Defaults to Always if :latest tag is specified, or IfNotPresent otherwise.
+                          type: string
+                        reference:
+                          description: |-
+                            Required: Image or artifact reference to be used.
+                            Behaves in the same way as pod.spec.containers[*].image.
+                            Pull secrets will be assembled in the same way as for the container image by looking up node credentials, SA image pull secrets, and pod spec image pull secrets.
+                            More info: https://kubernetes.io/docs/concepts/containers/images
+                            This field is optional to allow higher level config management to default or override
+                            container images in workload controllers like Deployments and StatefulSets.
+                          type: string
+                      type: object
+                    iscsi:
+                      description: |-
+                        iscsi represents an ISCSI Disk resource that is attached to a
+                        kubelet's host machine and then exposed to the pod.
+                        More info: https://kubernetes.io/docs/concepts/storage/volumes/#iscsi
+                      properties:
+                        chapAuthDiscovery:
+                          description: chapAuthDiscovery defines whether support iSCSI
+                            Discovery CHAP authentication
+                          type: boolean
+                        chapAuthSession:
+                          description: chapAuthSession defines whether support iSCSI
+                            Session CHAP authentication
+                          type: boolean
+                        fsType:
+                          description: |-
+                            fsType is the filesystem type of the volume that you want to mount.
+                            Tip: Ensure that the filesystem type is supported by the host operating system.
+                            Examples: "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
+                            More info: https://kubernetes.io/docs/concepts/storage/volumes#iscsi
+                          type: string
+                        initiatorName:
+                          description: |-
+                            initiatorName is the custom iSCSI Initiator Name.
+                            If initiatorName is specified with iscsiInterface simultaneously, new iSCSI interface
+                            <target portal>:<volume name> will be created for the connection.
+                          type: string
+                        iqn:
+                          description: iqn is the target iSCSI Qualified Name.
+                          type: string
+                        iscsiInterface:
+                          default: default
+                          description: |-
+                            iscsiInterface is the interface Name that uses an iSCSI transport.
+                            Defaults to 'default' (tcp).
+                          type: string
+                        lun:
+                          description: lun represents iSCSI Target Lun number.
+                          format: int32
+                          type: integer
+                        portals:
+                          description: |-
+                            portals is the iSCSI Target Portal List. The portal is either an IP or ip_addr:port if the port
+                            is other than default (typically TCP ports 860 and 3260).
+                          items:
+                            type: string
+                          type: array
+                          x-kubernetes-list-type: atomic
+                        readOnly:
+                          description: |-
+                            readOnly here will force the ReadOnly setting in VolumeMounts.
+                            Defaults to false.
+                          type: boolean
+                        secretRef:
+                          description: secretRef is the CHAP Secret for iSCSI target
+                            and initiator authentication
+                          properties:
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        targetPortal:
+                          description: |-
+                            targetPortal is iSCSI Target Portal. The Portal is either an IP or ip_addr:port if the port
+                            is other than default (typically TCP ports 860 and 3260).
+                          type: string
+                      required:
+                      - iqn
+                      - lun
+                      - targetPortal
+                      type: object
+                    name:
+                      description: |-
+                        name of the volume.
+                        Must be a DNS_LABEL and unique within the pod.
+                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                      type: string
+                    nfs:
+                      description: |-
+                        nfs represents an NFS mount on the host that shares a pod's lifetime
+                        More info: https://kubernetes.io/docs/concepts/storage/volumes#nfs
+                      properties:
+                        path:
+                          description: |-
+                            path that is exported by the NFS server.
+                            More info: https://kubernetes.io/docs/concepts/storage/volumes#nfs
+                          type: string
+                        readOnly:
+                          description: |-
+                            readOnly here will force the NFS export to be mounted with read-only permissions.
+                            Defaults to false.
+                            More info: https://kubernetes.io/docs/concepts/storage/volumes#nfs
+                          type: boolean
+                        server:
+                          description: |-
+                            server is the hostname or IP address of the NFS server.
+                            More info: https://kubernetes.io/docs/concepts/storage/volumes#nfs
+                          type: string
+                      required:
+                      - path
+                      - server
+                      type: object
+                    persistentVolumeClaim:
+                      description: |-
+                        persistentVolumeClaimVolumeSource represents a reference to a
+                        PersistentVolumeClaim in the same namespace.
+                        More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#persistentvolumeclaims
+                      properties:
+                        claimName:
+                          description: |-
+                            claimName is the name of a PersistentVolumeClaim in the same namespace as the pod using this volume.
+                            More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#persistentvolumeclaims
+                          type: string
+                        readOnly:
+                          description: |-
+                            readOnly Will force the ReadOnly setting in VolumeMounts.
+                            Default false.
+                          type: boolean
+                      required:
+                      - claimName
+                      type: object
+                    photonPersistentDisk:
+                      description: |-
+                        photonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets host machine.
+                        Deprecated: PhotonPersistentDisk is deprecated and the in-tree photonPersistentDisk type is no longer supported.
+                      properties:
+                        fsType:
+                          description: |-
+                            fsType is the filesystem type to mount.
+                            Must be a filesystem type supported by the host operating system.
+                            Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
+                          type: string
+                        pdID:
+                          description: pdID is the ID that identifies Photon Controller
+                            persistent disk
+                          type: string
+                      required:
+                      - pdID
+                      type: object
+                    portworxVolume:
+                      description: |-
+                        portworxVolume represents a portworx volume attached and mounted on kubelets host machine.
+                        Deprecated: PortworxVolume is deprecated. All operations for the in-tree portworxVolume type
+                        are redirected to the pxd.portworx.com CSI driver when the CSIMigrationPortworx feature-gate
+                        is on.
+                      properties:
+                        fsType:
+                          description: |-
+                            fSType represents the filesystem type to mount
+                            Must be a filesystem type supported by the host operating system.
+                            Ex. "ext4", "xfs". Implicitly inferred to be "ext4" if unspecified.
+                          type: string
+                        readOnly:
+                          description: |-
+                            readOnly defaults to false (read/write). ReadOnly here will force
+                            the ReadOnly setting in VolumeMounts.
+                          type: boolean
+                        volumeID:
+                          description: volumeID uniquely identifies a Portworx volume
+                          type: string
+                      required:
+                      - volumeID
+                      type: object
+                    projected:
+                      description: projected items for all in one resources secrets,
+                        configmaps, and downward API
+                      properties:
+                        defaultMode:
+                          description: |-
+                            defaultMode are the mode bits used to set permissions on created files by default.
+                            Must be an octal value between 0000 and 0777 or a decimal value between 0 and 511.
+                            YAML accepts both octal and decimal values, JSON requires decimal values for mode bits.
+                            Directories within the path are not affected by this setting.
+                            This might be in conflict with other options that affect the file
+                            mode, like fsGroup, and the result can be other mode bits set.
+                          format: int32
+                          type: integer
+                        sources:
+                          description: |-
+                            sources is the list of volume projections. Each entry in this list
+                            handles one source.
+                          items:
+                            description: |-
+                              Projection that may be projected along with other supported volume types.
+                              Exactly one of these fields must be set.
+                            properties:
+                              clusterTrustBundle:
+                                description: |-
+                                  ClusterTrustBundle allows a pod to access the `.spec.trustBundle` field
+                                  of ClusterTrustBundle objects in an auto-updating file.
+
+                                  Alpha, gated by the ClusterTrustBundleProjection feature gate.
+
+                                  ClusterTrustBundle objects can either be selected by name, or by the
+                                  combination of signer name and a label selector.
+
+                                  Kubelet performs aggressive normalization of the PEM contents written
+                                  into the pod filesystem.  Esoteric PEM features such as inter-block
+                                  comments and block headers are stripped.  Certificates are deduplicated.
+                                  The ordering of certificates within the file is arbitrary, and Kubelet
+                                  may change the order over time.
+                                properties:
+                                  labelSelector:
+                                    description: |-
+                                      Select all ClusterTrustBundles that match this label selector.  Only has
+                                      effect if signerName is set.  Mutually-exclusive with name.  If unset,
+                                      interpreted as "match nothing".  If set but empty, interpreted as "match
+                                      everything".
+                                    properties:
+                                      matchExpressions:
+                                        description: matchExpressions is a list of
+                                          label selector requirements. The requirements
+                                          are ANDed.
+                                        items:
+                                          description: |-
+                                            A label selector requirement is a selector that contains values, a key, and an operator that
+                                            relates the key and values.
+                                          properties:
+                                            key:
+                                              description: key is the label key that
+                                                the selector applies to.
+                                              type: string
+                                            operator:
+                                              description: |-
+                                                operator represents a key's relationship to a set of values.
+                                                Valid operators are In, NotIn, Exists and DoesNotExist.
+                                              type: string
+                                            values:
+                                              description: |-
+                                                values is an array of string values. If the operator is In or NotIn,
+                                                the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                                the values array must be empty. This array is replaced during a strategic
+                                                merge patch.
+                                              items:
+                                                type: string
+                                              type: array
+                                              x-kubernetes-list-type: atomic
+                                          required:
+                                          - key
+                                          - operator
+                                          type: object
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                      matchLabels:
+                                        additionalProperties:
+                                          type: string
+                                        description: |-
+                                          matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                          map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                          operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                        type: object
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  name:
+                                    description: |-
+                                      Select a single ClusterTrustBundle by object name.  Mutually-exclusive
+                                      with signerName and labelSelector.
+                                    type: string
+                                  optional:
+                                    description: |-
+                                      If true, don't block pod startup if the referenced ClusterTrustBundle(s)
+                                      aren't available.  If using name, then the named ClusterTrustBundle is
+                                      allowed not to exist.  If using signerName, then the combination of
+                                      signerName and labelSelector is allowed to match zero
+                                      ClusterTrustBundles.
+                                    type: boolean
+                                  path:
+                                    description: Relative path from the volume root
+                                      to write the bundle.
+                                    type: string
+                                  signerName:
+                                    description: |-
+                                      Select all ClusterTrustBundles that match this signer name.
+                                      Mutually-exclusive with name.  The contents of all selected
+                                      ClusterTrustBundles will be unified and deduplicated.
+                                    type: string
+                                required:
+                                - path
+                                type: object
+                              configMap:
+                                description: configMap information about the configMap
+                                  data to project
+                                properties:
+                                  items:
+                                    description: |-
+                                      items if unspecified, each key-value pair in the Data field of the referenced
+                                      ConfigMap will be projected into the volume as a file whose name is the
+                                      key and content is the value. If specified, the listed keys will be
+                                      projected into the specified paths, and unlisted keys will not be
+                                      present. If a key is specified which is not present in the ConfigMap,
+                                      the volume setup will error unless it is marked optional. Paths must be
+                                      relative and may not contain the '..' path or start with '..'.
+                                    items:
+                                      description: Maps a string key to a path within
+                                        a volume.
+                                      properties:
+                                        key:
+                                          description: key is the key to project.
+                                          type: string
+                                        mode:
+                                          description: |-
+                                            mode is Optional: mode bits used to set permissions on this file.
+                                            Must be an octal value between 0000 and 0777 or a decimal value between 0 and 511.
+                                            YAML accepts both octal and decimal values, JSON requires decimal values for mode bits.
+                                            If not specified, the volume defaultMode will be used.
+                                            This might be in conflict with other options that affect the file
+                                            mode, like fsGroup, and the result can be other mode bits set.
+                                          format: int32
+                                          type: integer
+                                        path:
+                                          description: |-
+                                            path is the relative path of the file to map the key to.
+                                            May not be an absolute path.
+                                            May not contain the path element '..'.
+                                            May not start with the string '..'.
+                                          type: string
+                                      required:
+                                      - key
+                                      - path
+                                      type: object
+                                    type: array
+                                    x-kubernetes-list-type: atomic
+                                  name:
+                                    default: ""
+                                    description: |-
+                                      Name of the referent.
+                                      This field is effectively required, but due to backwards compatibility is
+                                      allowed to be empty. Instances of this type with an empty value here are
+                                      almost certainly wrong.
+                                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                    type: string
+                                  optional:
+                                    description: optional specify whether the ConfigMap
+                                      or its keys must be defined
+                                    type: boolean
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              downwardAPI:
+                                description: downwardAPI information about the downwardAPI
+                                  data to project
+                                properties:
+                                  items:
+                                    description: Items is a list of DownwardAPIVolume
+                                      file
+                                    items:
+                                      description: DownwardAPIVolumeFile represents
+                                        information to create the file containing
+                                        the pod field
+                                      properties:
+                                        fieldRef:
+                                          description: 'Required: Selects a field
+                                            of the pod: only annotations, labels,
+                                            name, namespace and uid are supported.'
+                                          properties:
+                                            apiVersion:
+                                              description: Version of the schema the
+                                                FieldPath is written in terms of,
+                                                defaults to "v1".
+                                              type: string
+                                            fieldPath:
+                                              description: Path of the field to select
+                                                in the specified API version.
+                                              type: string
+                                          required:
+                                          - fieldPath
+                                          type: object
+                                          x-kubernetes-map-type: atomic
+                                        mode:
+                                          description: |-
+                                            Optional: mode bits used to set permissions on this file, must be an octal value
+                                            between 0000 and 0777 or a decimal value between 0 and 511.
+                                            YAML accepts both octal and decimal values, JSON requires decimal values for mode bits.
+                                            If not specified, the volume defaultMode will be used.
+                                            This might be in conflict with other options that affect the file
+                                            mode, like fsGroup, and the result can be other mode bits set.
+                                          format: int32
+                                          type: integer
+                                        path:
+                                          description: 'Required: Path is  the relative
+                                            path name of the file to be created. Must
+                                            not be absolute or contain the ''..''
+                                            path. Must be utf-8 encoded. The first
+                                            item of the relative path must not start
+                                            with ''..'''
+                                          type: string
+                                        resourceFieldRef:
+                                          description: |-
+                                            Selects a resource of the container: only resources limits and requests
+                                            (limits.cpu, limits.memory, requests.cpu and requests.memory) are currently supported.
+                                          properties:
+                                            containerName:
+                                              description: 'Container name: required
+                                                for volumes, optional for env vars'
+                                              type: string
+                                            divisor:
+                                              anyOf:
+                                              - type: integer
+                                              - type: string
+                                              description: Specifies the output format
+                                                of the exposed resources, defaults
+                                                to "1"
+                                              pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                              x-kubernetes-int-or-string: true
+                                            resource:
+                                              description: 'Required: resource to
+                                                select'
+                                              type: string
+                                          required:
+                                          - resource
+                                          type: object
+                                          x-kubernetes-map-type: atomic
+                                      required:
+                                      - path
+                                      type: object
+                                    type: array
+                                    x-kubernetes-list-type: atomic
+                                type: object
+                              podCertificate:
+                                description: |-
+                                  Projects an auto-rotating credential bundle (private key and certificate
+                                  chain) that the pod can use either as a TLS client or server.
+
+                                  Kubelet generates a private key and uses it to send a
+                                  PodCertificateRequest to the named signer.  Once the signer approves the
+                                  request and issues a certificate chain, Kubelet writes the key and
+                                  certificate chain to the pod filesystem.  The pod does not start until
+                                  certificates have been issued for each podCertificate projected volume
+                                  source in its spec.
+
+                                  Kubelet will begin trying to rotate the certificate at the time indicated
+                                  by the signer using the PodCertificateRequest.Status.BeginRefreshAt
+                                  timestamp.
+
+                                  Kubelet can write a single file, indicated by the credentialBundlePath
+                                  field, or separate files, indicated by the keyPath and
+                                  certificateChainPath fields.
+
+                                  The credential bundle is a single file in PEM format.  The first PEM
+                                  entry is the private key (in PKCS#8 format), and the remaining PEM
+                                  entries are the certificate chain issued by the signer (typically,
+                                  signers will return their certificate chain in leaf-to-root order).
+
+                                  Prefer using the credential bundle format, since your application code
+                                  can read it atomically.  If you use keyPath and certificateChainPath,
+                                  your application must make two separate file reads. If these coincide
+                                  with a certificate rotation, it is possible that the private key and leaf
+                                  certificate you read may not correspond to each other.  Your application
+                                  will need to check for this condition, and re-read until they are
+                                  consistent.
+
+                                  The named signer controls chooses the format of the certificate it
+                                  issues; consult the signer implementation's documentation to learn how to
+                                  use the certificates it issues.
+                                properties:
+                                  certificateChainPath:
+                                    description: |-
+                                      Write the certificate chain at this path in the projected volume.
+
+                                      Most applications should use credentialBundlePath.  When using keyPath
+                                      and certificateChainPath, your application needs to check that the key
+                                      and leaf certificate are consistent, because it is possible to read the
+                                      files mid-rotation.
+                                    type: string
+                                  credentialBundlePath:
+                                    description: |-
+                                      Write the credential bundle at this path in the projected volume.
+
+                                      The credential bundle is a single file that contains multiple PEM blocks.
+                                      The first PEM block is a PRIVATE KEY block, containing a PKCS#8 private
+                                      key.
+
+                                      The remaining blocks are CERTIFICATE blocks, containing the issued
+                                      certificate chain from the signer (leaf and any intermediates).
+
+                                      Using credentialBundlePath lets your Pod's application code make a single
+                                      atomic read that retrieves a consistent key and certificate chain.  If you
+                                      project them to separate files, your application code will need to
+                                      additionally check that the leaf certificate was issued to the key.
+                                    type: string
+                                  keyPath:
+                                    description: |-
+                                      Write the key at this path in the projected volume.
+
+                                      Most applications should use credentialBundlePath.  When using keyPath
+                                      and certificateChainPath, your application needs to check that the key
+                                      and leaf certificate are consistent, because it is possible to read the
+                                      files mid-rotation.
+                                    type: string
+                                  keyType:
+                                    description: |-
+                                      The type of keypair Kubelet will generate for the pod.
+
+                                      Valid values are "RSA3072", "RSA4096", "ECDSAP256", "ECDSAP384",
+                                      "ECDSAP521", and "ED25519".
+                                    type: string
+                                  maxExpirationSeconds:
+                                    description: |-
+                                      maxExpirationSeconds is the maximum lifetime permitted for the
+                                      certificate.
+
+                                      Kubelet copies this value verbatim into the PodCertificateRequests it
+                                      generates for this projection.
+
+                                      If omitted, kube-apiserver will set it to 86400(24 hours). kube-apiserver
+                                      will reject values shorter than 3600 (1 hour).  The maximum allowable
+                                      value is 7862400 (91 days).
+
+                                      The signer implementation is then free to issue a certificate with any
+                                      lifetime *shorter* than MaxExpirationSeconds, but no shorter than 3600
+                                      seconds (1 hour).  This constraint is enforced by kube-apiserver.
+                                      `kubernetes.io` signers will never issue certificates with a lifetime
+                                      longer than 24 hours.
+                                    format: int32
+                                    type: integer
+                                  signerName:
+                                    description: Kubelet's generated CSRs will be
+                                      addressed to this signer.
+                                    type: string
+                                required:
+                                - keyType
+                                - signerName
+                                type: object
+                              secret:
+                                description: secret information about the secret data
+                                  to project
+                                properties:
+                                  items:
+                                    description: |-
+                                      items if unspecified, each key-value pair in the Data field of the referenced
+                                      Secret will be projected into the volume as a file whose name is the
+                                      key and content is the value. If specified, the listed keys will be
+                                      projected into the specified paths, and unlisted keys will not be
+                                      present. If a key is specified which is not present in the Secret,
+                                      the volume setup will error unless it is marked optional. Paths must be
+                                      relative and may not contain the '..' path or start with '..'.
+                                    items:
+                                      description: Maps a string key to a path within
+                                        a volume.
+                                      properties:
+                                        key:
+                                          description: key is the key to project.
+                                          type: string
+                                        mode:
+                                          description: |-
+                                            mode is Optional: mode bits used to set permissions on this file.
+                                            Must be an octal value between 0000 and 0777 or a decimal value between 0 and 511.
+                                            YAML accepts both octal and decimal values, JSON requires decimal values for mode bits.
+                                            If not specified, the volume defaultMode will be used.
+                                            This might be in conflict with other options that affect the file
+                                            mode, like fsGroup, and the result can be other mode bits set.
+                                          format: int32
+                                          type: integer
+                                        path:
+                                          description: |-
+                                            path is the relative path of the file to map the key to.
+                                            May not be an absolute path.
+                                            May not contain the path element '..'.
+                                            May not start with the string '..'.
+                                          type: string
+                                      required:
+                                      - key
+                                      - path
+                                      type: object
+                                    type: array
+                                    x-kubernetes-list-type: atomic
+                                  name:
+                                    default: ""
+                                    description: |-
+                                      Name of the referent.
+                                      This field is effectively required, but due to backwards compatibility is
+                                      allowed to be empty. Instances of this type with an empty value here are
+                                      almost certainly wrong.
+                                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                    type: string
+                                  optional:
+                                    description: optional field specify whether the
+                                      Secret or its key must be defined
+                                    type: boolean
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              serviceAccountToken:
+                                description: serviceAccountToken is information about
+                                  the serviceAccountToken data to project
+                                properties:
+                                  audience:
+                                    description: |-
+                                      audience is the intended audience of the token. A recipient of a token
+                                      must identify itself with an identifier specified in the audience of the
+                                      token, and otherwise should reject the token. The audience defaults to the
+                                      identifier of the apiserver.
+                                    type: string
+                                  expirationSeconds:
+                                    description: |-
+                                      expirationSeconds is the requested duration of validity of the service
+                                      account token. As the token approaches expiration, the kubelet volume
+                                      plugin will proactively rotate the service account token. The kubelet will
+                                      start trying to rotate the token if the token is older than 80 percent of
+                                      its time to live or if the token is older than 24 hours.Defaults to 1 hour
+                                      and must be at least 10 minutes.
+                                    format: int64
+                                    type: integer
+                                  path:
+                                    description: |-
+                                      path is the path relative to the mount point of the file to project the
+                                      token into.
+                                    type: string
+                                required:
+                                - path
+                                type: object
+                            type: object
+                          type: array
+                          x-kubernetes-list-type: atomic
+                      type: object
+                    quobyte:
+                      description: |-
+                        quobyte represents a Quobyte mount on the host that shares a pod's lifetime.
+                        Deprecated: Quobyte is deprecated and the in-tree quobyte type is no longer supported.
+                      properties:
+                        group:
+                          description: |-
+                            group to map volume access to
+                            Default is no group
+                          type: string
+                        readOnly:
+                          description: |-
+                            readOnly here will force the Quobyte volume to be mounted with read-only permissions.
+                            Defaults to false.
+                          type: boolean
+                        registry:
+                          description: |-
+                            registry represents a single or multiple Quobyte Registry services
+                            specified as a string as host:port pair (multiple entries are separated with commas)
+                            which acts as the central registry for volumes
+                          type: string
+                        tenant:
+                          description: |-
+                            tenant owning the given Quobyte volume in the Backend
+                            Used with dynamically provisioned Quobyte volumes, value is set by the plugin
+                          type: string
+                        user:
+                          description: |-
+                            user to map volume access to
+                            Defaults to serivceaccount user
+                          type: string
+                        volume:
+                          description: volume is a string that references an already
+                            created Quobyte volume by name.
+                          type: string
+                      required:
+                      - registry
+                      - volume
+                      type: object
+                    rbd:
+                      description: |-
+                        rbd represents a Rados Block Device mount on the host that shares a pod's lifetime.
+                        Deprecated: RBD is deprecated and the in-tree rbd type is no longer supported.
+                      properties:
+                        fsType:
+                          description: |-
+                            fsType is the filesystem type of the volume that you want to mount.
+                            Tip: Ensure that the filesystem type is supported by the host operating system.
+                            Examples: "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
+                            More info: https://kubernetes.io/docs/concepts/storage/volumes#rbd
+                          type: string
+                        image:
+                          description: |-
+                            image is the rados image name.
+                            More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it
+                          type: string
+                        keyring:
+                          default: /etc/ceph/keyring
+                          description: |-
+                            keyring is the path to key ring for RBDUser.
+                            Default is /etc/ceph/keyring.
+                            More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it
+                          type: string
+                        monitors:
+                          description: |-
+                            monitors is a collection of Ceph monitors.
+                            More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it
+                          items:
+                            type: string
+                          type: array
+                          x-kubernetes-list-type: atomic
+                        pool:
+                          default: rbd
+                          description: |-
+                            pool is the rados pool name.
+                            Default is rbd.
+                            More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it
+                          type: string
+                        readOnly:
+                          description: |-
+                            readOnly here will force the ReadOnly setting in VolumeMounts.
+                            Defaults to false.
+                            More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it
+                          type: boolean
+                        secretRef:
+                          description: |-
+                            secretRef is name of the authentication secret for RBDUser. If provided
+                            overrides keyring.
+                            Default is nil.
+                            More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it
+                          properties:
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        user:
+                          default: admin
+                          description: |-
+                            user is the rados user name.
+                            Default is admin.
+                            More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it
+                          type: string
+                      required:
+                      - image
+                      - monitors
+                      type: object
+                    scaleIO:
+                      description: |-
+                        scaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.
+                        Deprecated: ScaleIO is deprecated and the in-tree scaleIO type is no longer supported.
+                      properties:
+                        fsType:
+                          default: xfs
+                          description: |-
+                            fsType is the filesystem type to mount.
+                            Must be a filesystem type supported by the host operating system.
+                            Ex. "ext4", "xfs", "ntfs".
+                            Default is "xfs".
+                          type: string
+                        gateway:
+                          description: gateway is the host address of the ScaleIO
+                            API Gateway.
+                          type: string
+                        protectionDomain:
+                          description: protectionDomain is the name of the ScaleIO
+                            Protection Domain for the configured storage.
+                          type: string
+                        readOnly:
+                          description: |-
+                            readOnly Defaults to false (read/write). ReadOnly here will force
+                            the ReadOnly setting in VolumeMounts.
+                          type: boolean
+                        secretRef:
+                          description: |-
+                            secretRef references to the secret for ScaleIO user and other
+                            sensitive information. If this is not provided, Login operation will fail.
+                          properties:
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        sslEnabled:
+                          description: sslEnabled Flag enable/disable SSL communication
+                            with Gateway, default false
+                          type: boolean
+                        storageMode:
+                          default: ThinProvisioned
+                          description: |-
+                            storageMode indicates whether the storage for a volume should be ThickProvisioned or ThinProvisioned.
+                            Default is ThinProvisioned.
+                          type: string
+                        storagePool:
+                          description: storagePool is the ScaleIO Storage Pool associated
+                            with the protection domain.
+                          type: string
+                        system:
+                          description: system is the name of the storage system as
+                            configured in ScaleIO.
+                          type: string
+                        volumeName:
+                          description: |-
+                            volumeName is the name of a volume already created in the ScaleIO system
+                            that is associated with this volume source.
+                          type: string
+                      required:
+                      - gateway
+                      - secretRef
+                      - system
+                      type: object
+                    secret:
+                      description: |-
+                        secret represents a secret that should populate this volume.
+                        More info: https://kubernetes.io/docs/concepts/storage/volumes#secret
+                      properties:
+                        defaultMode:
+                          description: |-
+                            defaultMode is Optional: mode bits used to set permissions on created files by default.
+                            Must be an octal value between 0000 and 0777 or a decimal value between 0 and 511.
+                            YAML accepts both octal and decimal values, JSON requires decimal values
+                            for mode bits. Defaults to 0644.
+                            Directories within the path are not affected by this setting.
+                            This might be in conflict with other options that affect the file
+                            mode, like fsGroup, and the result can be other mode bits set.
+                          format: int32
+                          type: integer
+                        items:
+                          description: |-
+                            items If unspecified, each key-value pair in the Data field of the referenced
+                            Secret will be projected into the volume as a file whose name is the
+                            key and content is the value. If specified, the listed keys will be
+                            projected into the specified paths, and unlisted keys will not be
+                            present. If a key is specified which is not present in the Secret,
+                            the volume setup will error unless it is marked optional. Paths must be
+                            relative and may not contain the '..' path or start with '..'.
+                          items:
+                            description: Maps a string key to a path within a volume.
+                            properties:
+                              key:
+                                description: key is the key to project.
+                                type: string
+                              mode:
+                                description: |-
+                                  mode is Optional: mode bits used to set permissions on this file.
+                                  Must be an octal value between 0000 and 0777 or a decimal value between 0 and 511.
+                                  YAML accepts both octal and decimal values, JSON requires decimal values for mode bits.
+                                  If not specified, the volume defaultMode will be used.
+                                  This might be in conflict with other options that affect the file
+                                  mode, like fsGroup, and the result can be other mode bits set.
+                                format: int32
+                                type: integer
+                              path:
+                                description: |-
+                                  path is the relative path of the file to map the key to.
+                                  May not be an absolute path.
+                                  May not contain the path element '..'.
+                                  May not start with the string '..'.
+                                type: string
+                            required:
+                            - key
+                            - path
+                            type: object
+                          type: array
+                          x-kubernetes-list-type: atomic
+                        optional:
+                          description: optional field specify whether the Secret or
+                            its keys must be defined
+                          type: boolean
+                        secretName:
+                          description: |-
+                            secretName is the name of the secret in the pod's namespace to use.
+                            More info: https://kubernetes.io/docs/concepts/storage/volumes#secret
+                          type: string
+                      type: object
+                    storageos:
+                      description: |-
+                        storageOS represents a StorageOS volume attached and mounted on Kubernetes nodes.
+                        Deprecated: StorageOS is deprecated and the in-tree storageos type is no longer supported.
+                      properties:
+                        fsType:
+                          description: |-
+                            fsType is the filesystem type to mount.
+                            Must be a filesystem type supported by the host operating system.
+                            Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
+                          type: string
+                        readOnly:
+                          description: |-
+                            readOnly defaults to false (read/write). ReadOnly here will force
+                            the ReadOnly setting in VolumeMounts.
+                          type: boolean
+                        secretRef:
+                          description: |-
+                            secretRef specifies the secret to use for obtaining the StorageOS API
+                            credentials.  If not specified, default values will be attempted.
+                          properties:
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        volumeName:
+                          description: |-
+                            volumeName is the human-readable name of the StorageOS volume.  Volume
+                            names are only unique within a namespace.
+                          type: string
+                        volumeNamespace:
+                          description: |-
+                            volumeNamespace specifies the scope of the volume within StorageOS.  If no
+                            namespace is specified then the Pod's namespace will be used.  This allows the
+                            Kubernetes name scoping to be mirrored within StorageOS for tighter integration.
+                            Set VolumeName to any name to override the default behaviour.
+                            Set to "default" if you are not using namespaces within StorageOS.
+                            Namespaces that do not pre-exist within StorageOS will be created.
+                          type: string
+                      type: object
+                    vsphereVolume:
+                      description: |-
+                        vsphereVolume represents a vSphere volume attached and mounted on kubelets host machine.
+                        Deprecated: VsphereVolume is deprecated. All operations for the in-tree vsphereVolume type
+                        are redirected to the csi.vsphere.vmware.com CSI driver.
+                      properties:
+                        fsType:
+                          description: |-
+                            fsType is filesystem type to mount.
+                            Must be a filesystem type supported by the host operating system.
+                            Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
+                          type: string
+                        storagePolicyID:
+                          description: storagePolicyID is the storage Policy Based
+                            Management (SPBM) profile ID associated with the StoragePolicyName.
+                          type: string
+                        storagePolicyName:
+                          description: storagePolicyName is the storage Policy Based
+                            Management (SPBM) profile name.
+                          type: string
+                        volumePath:
+                          description: volumePath is the path that identifies vSphere
+                            volume vmdk
+                          type: string
+                      required:
+                      - volumePath
+                      type: object
+                  required:
+                  - name
+                  type: object
+                type: array
+              walCompression:
+                description: |-
+                  walCompression defines the compression of the write-ahead log (WAL) using Snappy.
+
+                  WAL compression is enabled by default for Prometheus >= 2.20.0
+
+                  Requires Prometheus v2.11.0 and above.
+                type: boolean
+              web:
+                description: web defines the configuration of the Prometheus web server.
+                properties:
+                  httpConfig:
+                    description: httpConfig defines HTTP parameters for web server.
+                    properties:
+                      headers:
+                        description: headers defines a list of headers that can be
+                          added to HTTP responses.
+                        properties:
+                          contentSecurityPolicy:
+                            description: |-
+                              contentSecurityPolicy defines the Content-Security-Policy header to HTTP responses.
+                              Unset if blank.
+                            type: string
+                          strictTransportSecurity:
+                            description: |-
+                              strictTransportSecurity defines the Strict-Transport-Security header to HTTP responses.
+                              Unset if blank.
+                              Please make sure that you use this with care as this header might force
+                              browsers to load Prometheus and the other applications hosted on the same
+                              domain and subdomains over HTTPS.
+                              https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Strict-Transport-Security
+                            type: string
+                          xContentTypeOptions:
+                            description: |-
+                              xContentTypeOptions defines the X-Content-Type-Options header to HTTP responses.
+                              Unset if blank. Accepted value is nosniff.
+                              https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-Content-Type-Options
+                            enum:
+                            - ""
+                            - NoSniff
+                            type: string
+                          xFrameOptions:
+                            description: |-
+                              xFrameOptions defines the X-Frame-Options header to HTTP responses.
+                              Unset if blank. Accepted values are deny and sameorigin.
+                              https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-Frame-Options
+                            enum:
+                            - ""
+                            - Deny
+                            - SameOrigin
+                            type: string
+                          xXSSProtection:
+                            description: |-
+                              xXSSProtection defines the X-XSS-Protection header to all responses.
+                              Unset if blank.
+                              https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-XSS-Protection
+                            type: string
+                        type: object
+                      http2:
+                        description: |-
+                          http2 enable HTTP/2 support. Note that HTTP/2 is only supported with TLS.
+                          When TLSConfig is not configured, HTTP/2 will be disabled.
+                          Whenever the value of the field changes, a rolling update will be triggered.
+                        type: boolean
+                    type: object
+                  maxConnections:
+                    description: |-
+                      maxConnections defines the maximum number of simultaneous connections
+                      A zero value means that Prometheus doesn't accept any incoming connection.
+                    format: int32
+                    minimum: 0
+                    type: integer
+                  pageTitle:
+                    description: pageTitle defines the prometheus web page title.
+                    type: string
+                  tlsConfig:
+                    description: tlsConfig defines the TLS parameters for HTTPS.
+                    properties:
+                      cert:
+                        description: |-
+                          cert defines the Secret or ConfigMap containing the TLS certificate for the web server.
+
+                          Either `keySecret` or `keyFile` must be defined.
+
+                          It is mutually exclusive with `certFile`.
+                        properties:
+                          configMap:
+                            description: configMap defines the ConfigMap containing
+                              data to use for the targets.
+                            properties:
+                              key:
+                                description: The key to select.
+                                type: string
+                              name:
+                                default: ""
+                                description: |-
+                                  Name of the referent.
+                                  This field is effectively required, but due to backwards compatibility is
+                                  allowed to be empty. Instances of this type with an empty value here are
+                                  almost certainly wrong.
+                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                type: string
+                              optional:
+                                description: Specify whether the ConfigMap or its
+                                  key must be defined
+                                type: boolean
+                            required:
+                            - key
+                            type: object
+                            x-kubernetes-map-type: atomic
+                          secret:
+                            description: secret defines the Secret containing data
+                              to use for the targets.
+                            properties:
+                              key:
+                                description: The key of the secret to select from.  Must
+                                  be a valid secret key.
+                                type: string
+                              name:
+                                default: ""
+                                description: |-
+                                  Name of the referent.
+                                  This field is effectively required, but due to backwards compatibility is
+                                  allowed to be empty. Instances of this type with an empty value here are
+                                  almost certainly wrong.
+                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                type: string
+                              optional:
+                                description: Specify whether the Secret or its key
+                                  must be defined
+                                type: boolean
+                            required:
+                            - key
+                            type: object
+                            x-kubernetes-map-type: atomic
+                        type: object
+                      certFile:
+                        description: |-
+                          certFile defines the path to the TLS certificate file in the container for the web server.
+
+                          Either `keySecret` or `keyFile` must be defined.
+
+                          It is mutually exclusive with `cert`.
+                        type: string
+                      cipherSuites:
+                        description: |-
+                          cipherSuites defines the list of supported cipher suites for TLS versions up to TLS 1.2.
+
+                          If not defined, the Go default cipher suites are used.
+                          Available cipher suites are documented in the Go documentation:
+                          https://golang.org/pkg/crypto/tls/#pkg-constants
+                        items:
+                          type: string
+                        type: array
+                      client_ca:
+                        description: |-
+                          client_ca defines the Secret or ConfigMap containing the CA certificate for client certificate
+                          authentication to the server.
+
+                          It is mutually exclusive with `clientCAFile`.
+                        properties:
+                          configMap:
+                            description: configMap defines the ConfigMap containing
+                              data to use for the targets.
+                            properties:
+                              key:
+                                description: The key to select.
+                                type: string
+                              name:
+                                default: ""
+                                description: |-
+                                  Name of the referent.
+                                  This field is effectively required, but due to backwards compatibility is
+                                  allowed to be empty. Instances of this type with an empty value here are
+                                  almost certainly wrong.
+                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                type: string
+                              optional:
+                                description: Specify whether the ConfigMap or its
+                                  key must be defined
+                                type: boolean
+                            required:
+                            - key
+                            type: object
+                            x-kubernetes-map-type: atomic
+                          secret:
+                            description: secret defines the Secret containing data
+                              to use for the targets.
+                            properties:
+                              key:
+                                description: The key of the secret to select from.  Must
+                                  be a valid secret key.
+                                type: string
+                              name:
+                                default: ""
+                                description: |-
+                                  Name of the referent.
+                                  This field is effectively required, but due to backwards compatibility is
+                                  allowed to be empty. Instances of this type with an empty value here are
+                                  almost certainly wrong.
+                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                type: string
+                              optional:
+                                description: Specify whether the Secret or its key
+                                  must be defined
+                                type: boolean
+                            required:
+                            - key
+                            type: object
+                            x-kubernetes-map-type: atomic
+                        type: object
+                      clientAuthType:
+                        description: |-
+                          clientAuthType defines the server policy for client TLS authentication.
+
+                          For more detail on clientAuth options:
+                          https://golang.org/pkg/crypto/tls/#ClientAuthType
+                        type: string
+                      clientCAFile:
+                        description: |-
+                          clientCAFile defines the path to the CA certificate file for client certificate authentication to
+                          the server.
+
+                          It is mutually exclusive with `client_ca`.
+                        type: string
+                      curvePreferences:
+                        description: |-
+                          curvePreferences defines elliptic curves that will be used in an ECDHE handshake, in preference
+                          order.
+
+                          Available curves are documented in the Go documentation:
+                          https://golang.org/pkg/crypto/tls/#CurveID
+                        items:
+                          type: string
+                        type: array
+                      keyFile:
+                        description: |-
+                          keyFile defines the path to the TLS private key file in the container for the web server.
+
+                          If defined, either `cert` or `certFile` must be defined.
+
+                          It is mutually exclusive with `keySecret`.
+                        type: string
+                      keySecret:
+                        description: |-
+                          keySecret defines the secret containing the TLS private key for the web server.
+
+                          Either `cert` or `certFile` must be defined.
+
+                          It is mutually exclusive with `keyFile`.
+                        properties:
+                          key:
+                            description: The key of the secret to select from.  Must
+                              be a valid secret key.
+                            type: string
+                          name:
+                            default: ""
+                            description: |-
+                              Name of the referent.
+                              This field is effectively required, but due to backwards compatibility is
+                              allowed to be empty. Instances of this type with an empty value here are
+                              almost certainly wrong.
+                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                            type: string
+                          optional:
+                            description: Specify whether the Secret or its key must
+                              be defined
+                            type: boolean
+                        required:
+                        - key
+                        type: object
+                        x-kubernetes-map-type: atomic
+                      maxVersion:
+                        description: maxVersion defines the Maximum TLS version that
+                          is acceptable.
+                        type: string
+                      minVersion:
+                        description: minVersion defines the minimum TLS version that
+                          is acceptable.
+                        type: string
+                      preferServerCipherSuites:
+                        description: |-
+                          preferServerCipherSuites defines whether the server selects the client's most preferred cipher
+                          suite, or the server's most preferred cipher suite.
+
+                          If true then the server's preference, as expressed in
+                          the order of elements in cipherSuites, is used.
+                        type: boolean
+                    type: object
+                type: object
+            type: object
+          status:
+            description: |-
+              status defines the most recent observed status of the Prometheus cluster. Read-only.
+              More info:
+              https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#spec-and-status
+            properties:
+              availableReplicas:
+                description: |-
+                  availableReplicas defines the total number of available pods (ready for at least minReadySeconds)
+                  targeted by this Prometheus deployment.
+                format: int32
+                type: integer
+              conditions:
+                description: conditions defines the current state of the Prometheus
+                  deployment.
+                items:
+                  description: |-
+                    Condition represents the state of the resources associated with the
+                    Prometheus, Alertmanager or ThanosRuler resource.
+                  properties:
+                    lastTransitionTime:
+                      description: lastTransitionTime is the time of the last update
+                        to the current status property.
+                      format: date-time
+                      type: string
+                    message:
+                      description: message defines human-readable message indicating
+                        details for the condition's last transition.
+                      type: string
+                    observedGeneration:
+                      description: |-
+                        observedGeneration defines the .metadata.generation that the
+                        condition was set based upon. For instance, if `.metadata.generation` is
+                        currently 12, but the `.status.conditions[].observedGeneration` is 9, the
+                        condition is out of date with respect to the current state of the
+                        instance.
+                      format: int64
+                      type: integer
+                    reason:
+                      description: reason for the condition's last transition.
+                      type: string
+                    status:
+                      description: status of the condition.
+                      minLength: 1
+                      type: string
+                    type:
+                      description: type of the condition being reported.
+                      minLength: 1
+                      type: string
+                  required:
+                  - lastTransitionTime
+                  - status
+                  - type
+                  type: object
+                type: array
+                x-kubernetes-list-map-keys:
+                - type
+                x-kubernetes-list-type: map
+              paused:
+                description: |-
+                  paused defines whether any actions on the underlying managed objects are
+                  being performed. Only delete actions will be performed.
+                type: boolean
+              replicas:
+                description: |-
+                  replicas defines the total number of non-terminated pods targeted by this Prometheus deployment
+                  (their labels match the selector).
+                format: int32
+                type: integer
+              selector:
+                description: selector used to match the pods targeted by this Prometheus
+                  resource.
+                type: string
+              shardStatuses:
+                description: shardStatuses defines the list has one entry per shard.
+                  Each entry provides a summary of the shard status.
+                items:
+                  properties:
+                    availableReplicas:
+                      description: |-
+                        availableReplicas defines the total number of available pods (ready for at least minReadySeconds)
+                        targeted by this shard.
+                      format: int32
+                      type: integer
+                    replicas:
+                      description: replicas defines the total number of pods targeted
+                        by this shard.
+                      format: int32
+                      type: integer
+                    shardID:
+                      description: shardID defines the identifier of the shard.
+                      type: string
+                    unavailableReplicas:
+                      description: unavailableReplicas defines the Total number of
+                        unavailable pods targeted by this shard.
+                      format: int32
+                      type: integer
+                    updatedReplicas:
+                      description: |-
+                        updatedReplicas defines the total number of non-terminated pods targeted by this shard
+                        that have the desired spec.
+                      format: int32
+                      type: integer
+                  required:
+                  - availableReplicas
+                  - replicas
+                  - shardID
+                  - unavailableReplicas
+                  - updatedReplicas
+                  type: object
+                type: array
+                x-kubernetes-list-map-keys:
+                - shardID
+                x-kubernetes-list-type: map
+              shards:
+                description: shards defines the most recently observed number of shards.
+                format: int32
+                type: integer
+              unavailableReplicas:
+                description: unavailableReplicas defines the total number of unavailable
+                  pods targeted by this Prometheus deployment.
+                format: int32
+                type: integer
+              updatedReplicas:
+                description: |-
+                  updatedReplicas defines the total number of non-terminated pods targeted by this Prometheus deployment
+                  that have the desired version spec.
+                format: int32
+                type: integer
+            type: object
+        required:
+        - spec
+        type: object
+    served: true
+    storage: true
+    subresources:
+      scale:
+        labelSelectorPath: .status.selector
+        specReplicasPath: .spec.shards
+        statusReplicasPath: .status.shards
+      status: {}
+{{- end -}}
diff --git a/packages/system/prometheus-operator-crds/charts/prometheus-operator-crds/charts/crds/templates/crd-scrapeconfigs.yaml b/packages/system/prometheus-operator-crds/charts/prometheus-operator-crds/charts/crds/templates/crd-scrapeconfigs.yaml
new file mode 100644
index 0000000000..383a6377d0
--- /dev/null
+++ b/packages/system/prometheus-operator-crds/charts/prometheus-operator-crds/charts/crds/templates/crd-scrapeconfigs.yaml
@@ -0,0 +1,12899 @@
+{{- if .Values.scrapeconfigs.enabled -}}
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.87.0/example/prometheus-operator-crd/monitoring.coreos.com_scrapeconfigs.yaml
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+{{- with .Values.annotations }}
+{{- toYaml . | nindent 4 }}
+{{- end }}
+    controller-gen.kubebuilder.io/version: v0.19.0
+    operator.prometheus.io/version: 0.87.0
+  name: scrapeconfigs.monitoring.coreos.com
+spec:
+  group: monitoring.coreos.com
+  names:
+    categories:
+    - prometheus-operator
+    kind: ScrapeConfig
+    listKind: ScrapeConfigList
+    plural: scrapeconfigs
+    shortNames:
+    - scfg
+    singular: scrapeconfig
+  scope: Namespaced
+  versions:
+  - name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        description: |-
+          ScrapeConfig defines a namespaced Prometheus scrape_config to be aggregated across
+          multiple namespaces into the Prometheus configuration.
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: spec defines the specification of ScrapeConfigSpec.
+            properties:
+              authorization:
+                description: authorization defines the header to use on every scrape
+                  request.
+                properties:
+                  credentials:
+                    description: credentials defines a key of a Secret in the namespace
+                      that contains the credentials for authentication.
+                    properties:
+                      key:
+                        description: The key of the secret to select from.  Must be
+                          a valid secret key.
+                        type: string
+                      name:
+                        default: ""
+                        description: |-
+                          Name of the referent.
+                          This field is effectively required, but due to backwards compatibility is
+                          allowed to be empty. Instances of this type with an empty value here are
+                          almost certainly wrong.
+                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                        type: string
+                      optional:
+                        description: Specify whether the Secret or its key must be
+                          defined
+                        type: boolean
+                    required:
+                    - key
+                    type: object
+                    x-kubernetes-map-type: atomic
+                  type:
+                    description: |-
+                      type defines the authentication type. The value is case-insensitive.
+
+                      "Basic" is not a supported value.
+
+                      Default: "Bearer"
+                    type: string
+                type: object
+              azureSDConfigs:
+                description: azureSDConfigs defines a list of Azure service discovery
+                  configurations.
+                items:
+                  description: |-
+                    AzureSDConfig allow retrieving scrape targets from Azure VMs.
+                    See https://prometheus.io/docs/prometheus/latest/configuration/configuration/#azure_sd_config
+                  properties:
+                    authenticationMethod:
+                      description: |-
+                        authenticationMethod defines the authentication method, either `OAuth` or `ManagedIdentity` or `SDK`.
+                        See https://docs.microsoft.com/en-us/azure/active-directory/managed-identities-azure-resources/overview
+                        SDK authentication method uses environment variables by default.
+                        See https://learn.microsoft.com/en-us/azure/developer/go/azure-sdk-authentication
+                      enum:
+                      - OAuth
+                      - ManagedIdentity
+                      - SDK
+                      type: string
+                    authorization:
+                      description: |-
+                        authorization defines the authorization header configuration to authenticate against the target HTTP endpoint.
+                        Cannot be set at the same time as `oAuth2`, or `basicAuth`.
+                      properties:
+                        credentials:
+                          description: credentials defines a key of a Secret in the
+                            namespace that contains the credentials for authentication.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        type:
+                          description: |-
+                            type defines the authentication type. The value is case-insensitive.
+
+                            "Basic" is not a supported value.
+
+                            Default: "Bearer"
+                          type: string
+                      type: object
+                    basicAuth:
+                      description: |-
+                        basicAuth defines the information to authenticate against the target HTTP endpoint.
+                        More info: https://prometheus.io/docs/operating/configuration/#endpoints
+                        Cannot be set at the same time as `authorization`, or `oAuth2`.
+                      properties:
+                        password:
+                          description: |-
+                            password defines a key of a Secret containing the password for
+                            authentication.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        username:
+                          description: |-
+                            username defines a key of a Secret containing the username for
+                            authentication.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                      type: object
+                    clientID:
+                      description: clientID defines client ID. Only required with
+                        the OAuth authentication method.
+                      minLength: 1
+                      type: string
+                    clientSecret:
+                      description: clientSecret defines client secret. Only required
+                        with the OAuth authentication method.
+                      properties:
+                        key:
+                          description: The key of the secret to select from.  Must
+                            be a valid secret key.
+                          type: string
+                        name:
+                          default: ""
+                          description: |-
+                            Name of the referent.
+                            This field is effectively required, but due to backwards compatibility is
+                            allowed to be empty. Instances of this type with an empty value here are
+                            almost certainly wrong.
+                            More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                          type: string
+                        optional:
+                          description: Specify whether the Secret or its key must
+                            be defined
+                          type: boolean
+                      required:
+                      - key
+                      type: object
+                      x-kubernetes-map-type: atomic
+                    enableHTTP2:
+                      description: enableHTTP2 defines whether to enable HTTP2.
+                      type: boolean
+                    environment:
+                      description: environment defines the Azure environment.
+                      minLength: 1
+                      type: string
+                    followRedirects:
+                      description: followRedirects defines whether HTTP requests follow
+                        HTTP 3xx redirects.
+                      type: boolean
+                    noProxy:
+                      description: |-
+                        noProxy defines a comma-separated string that can contain IPs, CIDR notation, domain names
+                        that should be excluded from proxying. IP and domain names can
+                        contain port numbers.
+
+                        It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                      type: string
+                    oauth2:
+                      description: oauth2 defines the configuration to use on every
+                        scrape request.
+                      properties:
+                        clientId:
+                          description: |-
+                            clientId defines a key of a Secret or ConfigMap containing the
+                            OAuth2 client's ID.
+                          properties:
+                            configMap:
+                              description: configMap defines the ConfigMap containing
+                                data to use for the targets.
+                              properties:
+                                key:
+                                  description: The key to select.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the ConfigMap or its
+                                    key must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            secret:
+                              description: secret defines the Secret containing data
+                                to use for the targets.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                          type: object
+                        clientSecret:
+                          description: |-
+                            clientSecret defines a key of a Secret containing the OAuth2
+                            client's secret.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        endpointParams:
+                          additionalProperties:
+                            type: string
+                          description: |-
+                            endpointParams configures the HTTP parameters to append to the token
+                            URL.
+                          type: object
+                        noProxy:
+                          description: |-
+                            noProxy defines a comma-separated string that can contain IPs, CIDR notation, domain names
+                            that should be excluded from proxying. IP and domain names can
+                            contain port numbers.
+
+                            It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                          type: string
+                        proxyConnectHeader:
+                          additionalProperties:
+                            items:
+                              description: SecretKeySelector selects a key of a Secret.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            type: array
+                          description: |-
+                            proxyConnectHeader optionally specifies headers to send to
+                            proxies during CONNECT requests.
+
+                            It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        proxyFromEnvironment:
+                          description: |-
+                            proxyFromEnvironment defines whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+
+                            It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                          type: boolean
+                        proxyUrl:
+                          description: proxyUrl defines the HTTP proxy server to use.
+                          pattern: ^(http|https|socks5)://.+$
+                          type: string
+                        scopes:
+                          description: scopes defines the OAuth2 scopes used for the
+                            token request.
+                          items:
+                            type: string
+                          type: array
+                        tlsConfig:
+                          description: |-
+                            tlsConfig defines the TLS configuration to use when connecting to the OAuth2 server.
+                            It requires Prometheus >= v2.43.0.
+                          properties:
+                            ca:
+                              description: ca defines the Certificate authority used
+                                when verifying server certificates.
+                              properties:
+                                configMap:
+                                  description: configMap defines the ConfigMap containing
+                                    data to use for the targets.
+                                  properties:
+                                    key:
+                                      description: The key to select.
+                                      type: string
+                                    name:
+                                      default: ""
+                                      description: |-
+                                        Name of the referent.
+                                        This field is effectively required, but due to backwards compatibility is
+                                        allowed to be empty. Instances of this type with an empty value here are
+                                        almost certainly wrong.
+                                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                      type: string
+                                    optional:
+                                      description: Specify whether the ConfigMap or
+                                        its key must be defined
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                secret:
+                                  description: secret defines the Secret containing
+                                    data to use for the targets.
+                                  properties:
+                                    key:
+                                      description: The key of the secret to select
+                                        from.  Must be a valid secret key.
+                                      type: string
+                                    name:
+                                      default: ""
+                                      description: |-
+                                        Name of the referent.
+                                        This field is effectively required, but due to backwards compatibility is
+                                        allowed to be empty. Instances of this type with an empty value here are
+                                        almost certainly wrong.
+                                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                      type: string
+                                    optional:
+                                      description: Specify whether the Secret or its
+                                        key must be defined
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                              type: object
+                            cert:
+                              description: cert defines the Client certificate to
+                                present when doing client-authentication.
+                              properties:
+                                configMap:
+                                  description: configMap defines the ConfigMap containing
+                                    data to use for the targets.
+                                  properties:
+                                    key:
+                                      description: The key to select.
+                                      type: string
+                                    name:
+                                      default: ""
+                                      description: |-
+                                        Name of the referent.
+                                        This field is effectively required, but due to backwards compatibility is
+                                        allowed to be empty. Instances of this type with an empty value here are
+                                        almost certainly wrong.
+                                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                      type: string
+                                    optional:
+                                      description: Specify whether the ConfigMap or
+                                        its key must be defined
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                secret:
+                                  description: secret defines the Secret containing
+                                    data to use for the targets.
+                                  properties:
+                                    key:
+                                      description: The key of the secret to select
+                                        from.  Must be a valid secret key.
+                                      type: string
+                                    name:
+                                      default: ""
+                                      description: |-
+                                        Name of the referent.
+                                        This field is effectively required, but due to backwards compatibility is
+                                        allowed to be empty. Instances of this type with an empty value here are
+                                        almost certainly wrong.
+                                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                      type: string
+                                    optional:
+                                      description: Specify whether the Secret or its
+                                        key must be defined
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                              type: object
+                            insecureSkipVerify:
+                              description: insecureSkipVerify defines how to disable
+                                target certificate validation.
+                              type: boolean
+                            keySecret:
+                              description: keySecret defines the Secret containing
+                                the client key file for the targets.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            maxVersion:
+                              description: |-
+                                maxVersion defines the maximum acceptable TLS version.
+
+                                It requires Prometheus >= v2.41.0 or Thanos >= v0.31.0.
+                              enum:
+                              - TLS10
+                              - TLS11
+                              - TLS12
+                              - TLS13
+                              type: string
+                            minVersion:
+                              description: |-
+                                minVersion defines the minimum acceptable TLS version.
+
+                                It requires Prometheus >= v2.35.0 or Thanos >= v0.28.0.
+                              enum:
+                              - TLS10
+                              - TLS11
+                              - TLS12
+                              - TLS13
+                              type: string
+                            serverName:
+                              description: serverName is used to verify the hostname
+                                for the targets.
+                              type: string
+                          type: object
+                        tokenUrl:
+                          description: tokenUrl defines the URL to fetch the token
+                            from.
+                          minLength: 1
+                          type: string
+                      required:
+                      - clientId
+                      - clientSecret
+                      - tokenUrl
+                      type: object
+                    port:
+                      description: |-
+                        port defines the port to scrape metrics from. If using the public IP address, this must
+                        instead be specified in the relabeling rule.
+                      format: int32
+                      maximum: 65535
+                      minimum: 0
+                      type: integer
+                    proxyConnectHeader:
+                      additionalProperties:
+                        items:
+                          description: SecretKeySelector selects a key of a Secret.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        type: array
+                      description: |-
+                        proxyConnectHeader optionally specifies headers to send to
+                        proxies during CONNECT requests.
+
+                        It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                      type: object
+                      x-kubernetes-map-type: atomic
+                    proxyFromEnvironment:
+                      description: |-
+                        proxyFromEnvironment defines whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+
+                        It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                      type: boolean
+                    proxyUrl:
+                      description: proxyUrl defines the HTTP proxy server to use.
+                      pattern: ^(http|https|socks5)://.+$
+                      type: string
+                    refreshInterval:
+                      description: |-
+                        refreshInterval defines the time after which the provided names are refreshed.
+                        If not set, Prometheus uses its default value.
+                      pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
+                      type: string
+                    resourceGroup:
+                      description: |-
+                        resourceGroup defines resource group name. Limits discovery to this resource group.
+                        Requires  Prometheus v2.35.0 and above
+                      minLength: 1
+                      type: string
+                    subscriptionID:
+                      description: subscriptionID defines subscription ID. Always
+                        required.
+                      minLength: 1
+                      type: string
+                    tenantID:
+                      description: tenantID defines tenant ID. Only required with
+                        the OAuth authentication method.
+                      minLength: 1
+                      type: string
+                    tlsConfig:
+                      description: tlsConfig defies the TLS configuration applying
+                        to the target HTTP endpoint.
+                      properties:
+                        ca:
+                          description: ca defines the Certificate authority used when
+                            verifying server certificates.
+                          properties:
+                            configMap:
+                              description: configMap defines the ConfigMap containing
+                                data to use for the targets.
+                              properties:
+                                key:
+                                  description: The key to select.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the ConfigMap or its
+                                    key must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            secret:
+                              description: secret defines the Secret containing data
+                                to use for the targets.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                          type: object
+                        cert:
+                          description: cert defines the Client certificate to present
+                            when doing client-authentication.
+                          properties:
+                            configMap:
+                              description: configMap defines the ConfigMap containing
+                                data to use for the targets.
+                              properties:
+                                key:
+                                  description: The key to select.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the ConfigMap or its
+                                    key must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            secret:
+                              description: secret defines the Secret containing data
+                                to use for the targets.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                          type: object
+                        insecureSkipVerify:
+                          description: insecureSkipVerify defines how to disable target
+                            certificate validation.
+                          type: boolean
+                        keySecret:
+                          description: keySecret defines the Secret containing the
+                            client key file for the targets.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        maxVersion:
+                          description: |-
+                            maxVersion defines the maximum acceptable TLS version.
+
+                            It requires Prometheus >= v2.41.0 or Thanos >= v0.31.0.
+                          enum:
+                          - TLS10
+                          - TLS11
+                          - TLS12
+                          - TLS13
+                          type: string
+                        minVersion:
+                          description: |-
+                            minVersion defines the minimum acceptable TLS version.
+
+                            It requires Prometheus >= v2.35.0 or Thanos >= v0.28.0.
+                          enum:
+                          - TLS10
+                          - TLS11
+                          - TLS12
+                          - TLS13
+                          type: string
+                        serverName:
+                          description: serverName is used to verify the hostname for
+                            the targets.
+                          type: string
+                      type: object
+                  required:
+                  - subscriptionID
+                  type: object
+                type: array
+              basicAuth:
+                description: basicAuth defines information to use on every scrape
+                  request.
+                properties:
+                  password:
+                    description: |-
+                      password defines a key of a Secret containing the password for
+                      authentication.
+                    properties:
+                      key:
+                        description: The key of the secret to select from.  Must be
+                          a valid secret key.
+                        type: string
+                      name:
+                        default: ""
+                        description: |-
+                          Name of the referent.
+                          This field is effectively required, but due to backwards compatibility is
+                          allowed to be empty. Instances of this type with an empty value here are
+                          almost certainly wrong.
+                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                        type: string
+                      optional:
+                        description: Specify whether the Secret or its key must be
+                          defined
+                        type: boolean
+                    required:
+                    - key
+                    type: object
+                    x-kubernetes-map-type: atomic
+                  username:
+                    description: |-
+                      username defines a key of a Secret containing the username for
+                      authentication.
+                    properties:
+                      key:
+                        description: The key of the secret to select from.  Must be
+                          a valid secret key.
+                        type: string
+                      name:
+                        default: ""
+                        description: |-
+                          Name of the referent.
+                          This field is effectively required, but due to backwards compatibility is
+                          allowed to be empty. Instances of this type with an empty value here are
+                          almost certainly wrong.
+                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                        type: string
+                      optional:
+                        description: Specify whether the Secret or its key must be
+                          defined
+                        type: boolean
+                    required:
+                    - key
+                    type: object
+                    x-kubernetes-map-type: atomic
+                type: object
+              consulSDConfigs:
+                description: consulSDConfigs defines a list of Consul service discovery
+                  configurations.
+                items:
+                  description: |-
+                    ConsulSDConfig defines a Consul service discovery configuration
+                    See https://prometheus.io/docs/prometheus/latest/configuration/configuration/#consul_sd_config
+                  properties:
+                    allowStale:
+                      description: |-
+                        allowStale Consul results (see https://www.consul.io/api/features/consistency.html). Will reduce load on Consul.
+                        If unset, Prometheus uses its default value.
+                      type: boolean
+                    authorization:
+                      description: |-
+                        authorization defines the header configuration to authenticate against the Consul Server.
+                        Cannot be set at the same time as `basicAuth`, or `oauth2`.
+                      properties:
+                        credentials:
+                          description: credentials defines a key of a Secret in the
+                            namespace that contains the credentials for authentication.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        type:
+                          description: |-
+                            type defines the authentication type. The value is case-insensitive.
+
+                            "Basic" is not a supported value.
+
+                            Default: "Bearer"
+                          type: string
+                      type: object
+                    basicAuth:
+                      description: |-
+                        basicAuth defines the information to authenticate against the Consul Server.
+                        More info: https://prometheus.io/docs/operating/configuration/#endpoints
+                        Cannot be set at the same time as `authorization`, or `oauth2`.
+                      properties:
+                        password:
+                          description: |-
+                            password defines a key of a Secret containing the password for
+                            authentication.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        username:
+                          description: |-
+                            username defines a key of a Secret containing the username for
+                            authentication.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                      type: object
+                    datacenter:
+                      description: datacenter defines the consul Datacenter name,
+                        if not provided it will use the local Consul Agent Datacenter.
+                      minLength: 1
+                      type: string
+                    enableHTTP2:
+                      description: enableHTTP2 defines whether to enable HTTP2.
+                      type: boolean
+                    filter:
+                      description: |-
+                        filter defines the filter expression used to filter the catalog results.
+                        See https://www.consul.io/api-docs/catalog#list-services
+                        It requires Prometheus >= 3.0.0.
+                      minLength: 1
+                      type: string
+                    followRedirects:
+                      description: followRedirects defines whether HTTP requests follow
+                        HTTP 3xx redirects.
+                      type: boolean
+                    namespace:
+                      description: |-
+                        namespace are only supported in Consul Enterprise.
+
+                        It requires Prometheus >= 2.28.0.
+                      minLength: 1
+                      type: string
+                    noProxy:
+                      description: |-
+                        noProxy defines a comma-separated string that can contain IPs, CIDR notation, domain names
+                        that should be excluded from proxying. IP and domain names can
+                        contain port numbers.
+
+                        It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                      type: string
+                    nodeMeta:
+                      additionalProperties:
+                        type: string
+                      description: |-
+                        nodeMeta defines the node metadata key/value pairs to filter nodes for a given service.
+                        Starting with Consul 1.14, it is recommended to use `filter` with the `NodeMeta` selector instead.
+                      type: object
+                      x-kubernetes-map-type: atomic
+                    oauth2:
+                      description: |-
+                        oauth2 defines the optional OAuth 2.0 configuration to authenticate against the target HTTP endpoint.
+                        Cannot be set at the same time as `authorization`, or `basicAuth`.
+                      properties:
+                        clientId:
+                          description: |-
+                            clientId defines a key of a Secret or ConfigMap containing the
+                            OAuth2 client's ID.
+                          properties:
+                            configMap:
+                              description: configMap defines the ConfigMap containing
+                                data to use for the targets.
+                              properties:
+                                key:
+                                  description: The key to select.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the ConfigMap or its
+                                    key must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            secret:
+                              description: secret defines the Secret containing data
+                                to use for the targets.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                          type: object
+                        clientSecret:
+                          description: |-
+                            clientSecret defines a key of a Secret containing the OAuth2
+                            client's secret.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        endpointParams:
+                          additionalProperties:
+                            type: string
+                          description: |-
+                            endpointParams configures the HTTP parameters to append to the token
+                            URL.
+                          type: object
+                        noProxy:
+                          description: |-
+                            noProxy defines a comma-separated string that can contain IPs, CIDR notation, domain names
+                            that should be excluded from proxying. IP and domain names can
+                            contain port numbers.
+
+                            It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                          type: string
+                        proxyConnectHeader:
+                          additionalProperties:
+                            items:
+                              description: SecretKeySelector selects a key of a Secret.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            type: array
+                          description: |-
+                            proxyConnectHeader optionally specifies headers to send to
+                            proxies during CONNECT requests.
+
+                            It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        proxyFromEnvironment:
+                          description: |-
+                            proxyFromEnvironment defines whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+
+                            It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                          type: boolean
+                        proxyUrl:
+                          description: proxyUrl defines the HTTP proxy server to use.
+                          pattern: ^(http|https|socks5)://.+$
+                          type: string
+                        scopes:
+                          description: scopes defines the OAuth2 scopes used for the
+                            token request.
+                          items:
+                            type: string
+                          type: array
+                        tlsConfig:
+                          description: |-
+                            tlsConfig defines the TLS configuration to use when connecting to the OAuth2 server.
+                            It requires Prometheus >= v2.43.0.
+                          properties:
+                            ca:
+                              description: ca defines the Certificate authority used
+                                when verifying server certificates.
+                              properties:
+                                configMap:
+                                  description: configMap defines the ConfigMap containing
+                                    data to use for the targets.
+                                  properties:
+                                    key:
+                                      description: The key to select.
+                                      type: string
+                                    name:
+                                      default: ""
+                                      description: |-
+                                        Name of the referent.
+                                        This field is effectively required, but due to backwards compatibility is
+                                        allowed to be empty. Instances of this type with an empty value here are
+                                        almost certainly wrong.
+                                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                      type: string
+                                    optional:
+                                      description: Specify whether the ConfigMap or
+                                        its key must be defined
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                secret:
+                                  description: secret defines the Secret containing
+                                    data to use for the targets.
+                                  properties:
+                                    key:
+                                      description: The key of the secret to select
+                                        from.  Must be a valid secret key.
+                                      type: string
+                                    name:
+                                      default: ""
+                                      description: |-
+                                        Name of the referent.
+                                        This field is effectively required, but due to backwards compatibility is
+                                        allowed to be empty. Instances of this type with an empty value here are
+                                        almost certainly wrong.
+                                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                      type: string
+                                    optional:
+                                      description: Specify whether the Secret or its
+                                        key must be defined
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                              type: object
+                            cert:
+                              description: cert defines the Client certificate to
+                                present when doing client-authentication.
+                              properties:
+                                configMap:
+                                  description: configMap defines the ConfigMap containing
+                                    data to use for the targets.
+                                  properties:
+                                    key:
+                                      description: The key to select.
+                                      type: string
+                                    name:
+                                      default: ""
+                                      description: |-
+                                        Name of the referent.
+                                        This field is effectively required, but due to backwards compatibility is
+                                        allowed to be empty. Instances of this type with an empty value here are
+                                        almost certainly wrong.
+                                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                      type: string
+                                    optional:
+                                      description: Specify whether the ConfigMap or
+                                        its key must be defined
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                secret:
+                                  description: secret defines the Secret containing
+                                    data to use for the targets.
+                                  properties:
+                                    key:
+                                      description: The key of the secret to select
+                                        from.  Must be a valid secret key.
+                                      type: string
+                                    name:
+                                      default: ""
+                                      description: |-
+                                        Name of the referent.
+                                        This field is effectively required, but due to backwards compatibility is
+                                        allowed to be empty. Instances of this type with an empty value here are
+                                        almost certainly wrong.
+                                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                      type: string
+                                    optional:
+                                      description: Specify whether the Secret or its
+                                        key must be defined
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                              type: object
+                            insecureSkipVerify:
+                              description: insecureSkipVerify defines how to disable
+                                target certificate validation.
+                              type: boolean
+                            keySecret:
+                              description: keySecret defines the Secret containing
+                                the client key file for the targets.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            maxVersion:
+                              description: |-
+                                maxVersion defines the maximum acceptable TLS version.
+
+                                It requires Prometheus >= v2.41.0 or Thanos >= v0.31.0.
+                              enum:
+                              - TLS10
+                              - TLS11
+                              - TLS12
+                              - TLS13
+                              type: string
+                            minVersion:
+                              description: |-
+                                minVersion defines the minimum acceptable TLS version.
+
+                                It requires Prometheus >= v2.35.0 or Thanos >= v0.28.0.
+                              enum:
+                              - TLS10
+                              - TLS11
+                              - TLS12
+                              - TLS13
+                              type: string
+                            serverName:
+                              description: serverName is used to verify the hostname
+                                for the targets.
+                              type: string
+                          type: object
+                        tokenUrl:
+                          description: tokenUrl defines the URL to fetch the token
+                            from.
+                          minLength: 1
+                          type: string
+                      required:
+                      - clientId
+                      - clientSecret
+                      - tokenUrl
+                      type: object
+                    partition:
+                      description: partition defines the admin Partitions are only
+                        supported in Consul Enterprise.
+                      minLength: 1
+                      type: string
+                    pathPrefix:
+                      description: |-
+                        pathPrefix defines the prefix for URIs for when consul is behind an API gateway (reverse proxy).
+
+                        It requires Prometheus >= 2.45.0.
+                      minLength: 1
+                      type: string
+                    proxyConnectHeader:
+                      additionalProperties:
+                        items:
+                          description: SecretKeySelector selects a key of a Secret.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        type: array
+                      description: |-
+                        proxyConnectHeader optionally specifies headers to send to
+                        proxies during CONNECT requests.
+
+                        It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                      type: object
+                      x-kubernetes-map-type: atomic
+                    proxyFromEnvironment:
+                      description: |-
+                        proxyFromEnvironment defines whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+
+                        It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                      type: boolean
+                    proxyUrl:
+                      description: proxyUrl defines the HTTP proxy server to use.
+                      pattern: ^(http|https|socks5)://.+$
+                      type: string
+                    refreshInterval:
+                      description: |-
+                        refreshInterval defines the time after which the provided names are refreshed.
+                        If not set, Prometheus uses its default value.
+                      pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
+                      type: string
+                    scheme:
+                      description: scheme defines the HTTP Scheme.
+                      enum:
+                      - http
+                      - https
+                      - HTTP
+                      - HTTPS
+                      type: string
+                    server:
+                      description: server defines the consul server address. A valid
+                        string consisting of a hostname or IP followed by an optional
+                        port number.
+                      minLength: 1
+                      type: string
+                    services:
+                      description: services defines a list of services for which targets
+                        are retrieved. If omitted, all services are scraped.
+                      items:
+                        type: string
+                      type: array
+                      x-kubernetes-list-type: set
+                    tagSeparator:
+                      description: |-
+                        tagSeparator defines the string by which Consul tags are joined into the tag label.
+                        If unset, Prometheus uses its default value.
+                      minLength: 1
+                      type: string
+                    tags:
+                      description: |-
+                        tags defines an optional list of tags used to filter nodes for a given service. Services must contain all tags in the list.
+                        Starting with Consul 1.14, it is recommended to use `filter` with the `ServiceTags` selector instead.
+                      items:
+                        type: string
+                      type: array
+                      x-kubernetes-list-type: set
+                    tlsConfig:
+                      description: tlsConfig defines the TLS configuration to connect
+                        to the Consul API.
+                      properties:
+                        ca:
+                          description: ca defines the Certificate authority used when
+                            verifying server certificates.
+                          properties:
+                            configMap:
+                              description: configMap defines the ConfigMap containing
+                                data to use for the targets.
+                              properties:
+                                key:
+                                  description: The key to select.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the ConfigMap or its
+                                    key must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            secret:
+                              description: secret defines the Secret containing data
+                                to use for the targets.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                          type: object
+                        cert:
+                          description: cert defines the Client certificate to present
+                            when doing client-authentication.
+                          properties:
+                            configMap:
+                              description: configMap defines the ConfigMap containing
+                                data to use for the targets.
+                              properties:
+                                key:
+                                  description: The key to select.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the ConfigMap or its
+                                    key must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            secret:
+                              description: secret defines the Secret containing data
+                                to use for the targets.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                          type: object
+                        insecureSkipVerify:
+                          description: insecureSkipVerify defines how to disable target
+                            certificate validation.
+                          type: boolean
+                        keySecret:
+                          description: keySecret defines the Secret containing the
+                            client key file for the targets.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        maxVersion:
+                          description: |-
+                            maxVersion defines the maximum acceptable TLS version.
+
+                            It requires Prometheus >= v2.41.0 or Thanos >= v0.31.0.
+                          enum:
+                          - TLS10
+                          - TLS11
+                          - TLS12
+                          - TLS13
+                          type: string
+                        minVersion:
+                          description: |-
+                            minVersion defines the minimum acceptable TLS version.
+
+                            It requires Prometheus >= v2.35.0 or Thanos >= v0.28.0.
+                          enum:
+                          - TLS10
+                          - TLS11
+                          - TLS12
+                          - TLS13
+                          type: string
+                        serverName:
+                          description: serverName is used to verify the hostname for
+                            the targets.
+                          type: string
+                      type: object
+                    tokenRef:
+                      description: tokenRef defines the consul ACL TokenRef, if not
+                        provided it will use the ACL from the local Consul Agent.
+                      properties:
+                        key:
+                          description: The key of the secret to select from.  Must
+                            be a valid secret key.
+                          type: string
+                        name:
+                          default: ""
+                          description: |-
+                            Name of the referent.
+                            This field is effectively required, but due to backwards compatibility is
+                            allowed to be empty. Instances of this type with an empty value here are
+                            almost certainly wrong.
+                            More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                          type: string
+                        optional:
+                          description: Specify whether the Secret or its key must
+                            be defined
+                          type: boolean
+                      required:
+                      - key
+                      type: object
+                      x-kubernetes-map-type: atomic
+                  required:
+                  - server
+                  type: object
+                type: array
+              convertClassicHistogramsToNHCB:
+                description: |-
+                  convertClassicHistogramsToNHCB defines whether to convert all scraped classic histograms into a native histogram with custom buckets.
+                  It requires Prometheus >= v3.0.0.
+                type: boolean
+              digitalOceanSDConfigs:
+                description: digitalOceanSDConfigs defines a list of DigitalOcean
+                  service discovery configurations.
+                items:
+                  description: |-
+                    DigitalOceanSDConfig allow retrieving scrape targets from DigitalOcean's Droplets API.
+                    This service discovery uses the public IPv4 address by default, by that can be changed with relabeling
+                    See https://prometheus.io/docs/prometheus/latest/configuration/configuration/#digitalocean_sd_config
+                  properties:
+                    authorization:
+                      description: |-
+                        authorization defines the  header configuration to authenticate against the DigitalOcean API.
+                        Cannot be set at the same time as `oauth2`.
+                      properties:
+                        credentials:
+                          description: credentials defines a key of a Secret in the
+                            namespace that contains the credentials for authentication.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        type:
+                          description: |-
+                            type defines the authentication type. The value is case-insensitive.
+
+                            "Basic" is not a supported value.
+
+                            Default: "Bearer"
+                          type: string
+                      type: object
+                    enableHTTP2:
+                      description: enableHTTP2 defines whether to enable HTTP2.
+                      type: boolean
+                    followRedirects:
+                      description: followRedirects defines whether HTTP requests follow
+                        HTTP 3xx redirects.
+                      type: boolean
+                    noProxy:
+                      description: |-
+                        noProxy defines a comma-separated string that can contain IPs, CIDR notation, domain names
+                        that should be excluded from proxying. IP and domain names can
+                        contain port numbers.
+
+                        It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                      type: string
+                    oauth2:
+                      description: oauth2 defines the configuration to use on every
+                        scrape request.
+                      properties:
+                        clientId:
+                          description: |-
+                            clientId defines a key of a Secret or ConfigMap containing the
+                            OAuth2 client's ID.
+                          properties:
+                            configMap:
+                              description: configMap defines the ConfigMap containing
+                                data to use for the targets.
+                              properties:
+                                key:
+                                  description: The key to select.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the ConfigMap or its
+                                    key must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            secret:
+                              description: secret defines the Secret containing data
+                                to use for the targets.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                          type: object
+                        clientSecret:
+                          description: |-
+                            clientSecret defines a key of a Secret containing the OAuth2
+                            client's secret.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        endpointParams:
+                          additionalProperties:
+                            type: string
+                          description: |-
+                            endpointParams configures the HTTP parameters to append to the token
+                            URL.
+                          type: object
+                        noProxy:
+                          description: |-
+                            noProxy defines a comma-separated string that can contain IPs, CIDR notation, domain names
+                            that should be excluded from proxying. IP and domain names can
+                            contain port numbers.
+
+                            It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                          type: string
+                        proxyConnectHeader:
+                          additionalProperties:
+                            items:
+                              description: SecretKeySelector selects a key of a Secret.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            type: array
+                          description: |-
+                            proxyConnectHeader optionally specifies headers to send to
+                            proxies during CONNECT requests.
+
+                            It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        proxyFromEnvironment:
+                          description: |-
+                            proxyFromEnvironment defines whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+
+                            It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                          type: boolean
+                        proxyUrl:
+                          description: proxyUrl defines the HTTP proxy server to use.
+                          pattern: ^(http|https|socks5)://.+$
+                          type: string
+                        scopes:
+                          description: scopes defines the OAuth2 scopes used for the
+                            token request.
+                          items:
+                            type: string
+                          type: array
+                        tlsConfig:
+                          description: |-
+                            tlsConfig defines the TLS configuration to use when connecting to the OAuth2 server.
+                            It requires Prometheus >= v2.43.0.
+                          properties:
+                            ca:
+                              description: ca defines the Certificate authority used
+                                when verifying server certificates.
+                              properties:
+                                configMap:
+                                  description: configMap defines the ConfigMap containing
+                                    data to use for the targets.
+                                  properties:
+                                    key:
+                                      description: The key to select.
+                                      type: string
+                                    name:
+                                      default: ""
+                                      description: |-
+                                        Name of the referent.
+                                        This field is effectively required, but due to backwards compatibility is
+                                        allowed to be empty. Instances of this type with an empty value here are
+                                        almost certainly wrong.
+                                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                      type: string
+                                    optional:
+                                      description: Specify whether the ConfigMap or
+                                        its key must be defined
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                secret:
+                                  description: secret defines the Secret containing
+                                    data to use for the targets.
+                                  properties:
+                                    key:
+                                      description: The key of the secret to select
+                                        from.  Must be a valid secret key.
+                                      type: string
+                                    name:
+                                      default: ""
+                                      description: |-
+                                        Name of the referent.
+                                        This field is effectively required, but due to backwards compatibility is
+                                        allowed to be empty. Instances of this type with an empty value here are
+                                        almost certainly wrong.
+                                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                      type: string
+                                    optional:
+                                      description: Specify whether the Secret or its
+                                        key must be defined
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                              type: object
+                            cert:
+                              description: cert defines the Client certificate to
+                                present when doing client-authentication.
+                              properties:
+                                configMap:
+                                  description: configMap defines the ConfigMap containing
+                                    data to use for the targets.
+                                  properties:
+                                    key:
+                                      description: The key to select.
+                                      type: string
+                                    name:
+                                      default: ""
+                                      description: |-
+                                        Name of the referent.
+                                        This field is effectively required, but due to backwards compatibility is
+                                        allowed to be empty. Instances of this type with an empty value here are
+                                        almost certainly wrong.
+                                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                      type: string
+                                    optional:
+                                      description: Specify whether the ConfigMap or
+                                        its key must be defined
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                secret:
+                                  description: secret defines the Secret containing
+                                    data to use for the targets.
+                                  properties:
+                                    key:
+                                      description: The key of the secret to select
+                                        from.  Must be a valid secret key.
+                                      type: string
+                                    name:
+                                      default: ""
+                                      description: |-
+                                        Name of the referent.
+                                        This field is effectively required, but due to backwards compatibility is
+                                        allowed to be empty. Instances of this type with an empty value here are
+                                        almost certainly wrong.
+                                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                      type: string
+                                    optional:
+                                      description: Specify whether the Secret or its
+                                        key must be defined
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                              type: object
+                            insecureSkipVerify:
+                              description: insecureSkipVerify defines how to disable
+                                target certificate validation.
+                              type: boolean
+                            keySecret:
+                              description: keySecret defines the Secret containing
+                                the client key file for the targets.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            maxVersion:
+                              description: |-
+                                maxVersion defines the maximum acceptable TLS version.
+
+                                It requires Prometheus >= v2.41.0 or Thanos >= v0.31.0.
+                              enum:
+                              - TLS10
+                              - TLS11
+                              - TLS12
+                              - TLS13
+                              type: string
+                            minVersion:
+                              description: |-
+                                minVersion defines the minimum acceptable TLS version.
+
+                                It requires Prometheus >= v2.35.0 or Thanos >= v0.28.0.
+                              enum:
+                              - TLS10
+                              - TLS11
+                              - TLS12
+                              - TLS13
+                              type: string
+                            serverName:
+                              description: serverName is used to verify the hostname
+                                for the targets.
+                              type: string
+                          type: object
+                        tokenUrl:
+                          description: tokenUrl defines the URL to fetch the token
+                            from.
+                          minLength: 1
+                          type: string
+                      required:
+                      - clientId
+                      - clientSecret
+                      - tokenUrl
+                      type: object
+                    port:
+                      description: port defines the port to scrape metrics from. If
+                        using the public IP address, this must
+                      format: int32
+                      maximum: 65535
+                      minimum: 0
+                      type: integer
+                    proxyConnectHeader:
+                      additionalProperties:
+                        items:
+                          description: SecretKeySelector selects a key of a Secret.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        type: array
+                      description: |-
+                        proxyConnectHeader optionally specifies headers to send to
+                        proxies during CONNECT requests.
+
+                        It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                      type: object
+                      x-kubernetes-map-type: atomic
+                    proxyFromEnvironment:
+                      description: |-
+                        proxyFromEnvironment defines whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+
+                        It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                      type: boolean
+                    proxyUrl:
+                      description: proxyUrl defines the HTTP proxy server to use.
+                      pattern: ^(http|https|socks5)://.+$
+                      type: string
+                    refreshInterval:
+                      description: |-
+                        refreshInterval defines the time after which the provided names are refreshed.
+                        If not set, Prometheus uses its default value.
+                      pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
+                      type: string
+                    tlsConfig:
+                      description: tlsConfig defines the TLS configuration to connect
+                        to the Consul API.
+                      properties:
+                        ca:
+                          description: ca defines the Certificate authority used when
+                            verifying server certificates.
+                          properties:
+                            configMap:
+                              description: configMap defines the ConfigMap containing
+                                data to use for the targets.
+                              properties:
+                                key:
+                                  description: The key to select.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the ConfigMap or its
+                                    key must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            secret:
+                              description: secret defines the Secret containing data
+                                to use for the targets.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                          type: object
+                        cert:
+                          description: cert defines the Client certificate to present
+                            when doing client-authentication.
+                          properties:
+                            configMap:
+                              description: configMap defines the ConfigMap containing
+                                data to use for the targets.
+                              properties:
+                                key:
+                                  description: The key to select.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the ConfigMap or its
+                                    key must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            secret:
+                              description: secret defines the Secret containing data
+                                to use for the targets.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                          type: object
+                        insecureSkipVerify:
+                          description: insecureSkipVerify defines how to disable target
+                            certificate validation.
+                          type: boolean
+                        keySecret:
+                          description: keySecret defines the Secret containing the
+                            client key file for the targets.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        maxVersion:
+                          description: |-
+                            maxVersion defines the maximum acceptable TLS version.
+
+                            It requires Prometheus >= v2.41.0 or Thanos >= v0.31.0.
+                          enum:
+                          - TLS10
+                          - TLS11
+                          - TLS12
+                          - TLS13
+                          type: string
+                        minVersion:
+                          description: |-
+                            minVersion defines the minimum acceptable TLS version.
+
+                            It requires Prometheus >= v2.35.0 or Thanos >= v0.28.0.
+                          enum:
+                          - TLS10
+                          - TLS11
+                          - TLS12
+                          - TLS13
+                          type: string
+                        serverName:
+                          description: serverName is used to verify the hostname for
+                            the targets.
+                          type: string
+                      type: object
+                  type: object
+                type: array
+              dnsSDConfigs:
+                description: dnsSDConfigs defines a list of DNS service discovery
+                  configurations.
+                items:
+                  description: |-
+                    DNSSDConfig allows specifying a set of DNS domain names which are periodically queried to discover a list of targets.
+                    The DNS servers to be contacted are read from /etc/resolv.conf.
+                    See https://prometheus.io/docs/prometheus/latest/configuration/configuration/#dns_sd_config
+                  properties:
+                    names:
+                      description: names defines a list of DNS domain names to be
+                        queried.
+                      items:
+                        minLength: 1
+                        type: string
+                      minItems: 1
+                      type: array
+                    port:
+                      description: |-
+                        port defines the port to scrape metrics from. If using the public IP address, this must
+                        Ignored for SRV records
+                      format: int32
+                      maximum: 65535
+                      minimum: 0
+                      type: integer
+                    refreshInterval:
+                      description: |-
+                        refreshInterval defines the time after which the provided names are refreshed.
+                        If not set, Prometheus uses its default value.
+                      pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
+                      type: string
+                    type:
+                      description: |-
+                        type defines the type of DNS query to perform. One of SRV, A, AAAA, MX or NS.
+                        If not set, Prometheus uses its default value.
+
+                        When set to NS, it requires Prometheus >= v2.49.0.
+                        When set to MX, it requires Prometheus >= v2.38.0
+                      enum:
+                      - A
+                      - AAAA
+                      - MX
+                      - NS
+                      - SRV
+                      type: string
+                  required:
+                  - names
+                  type: object
+                type: array
+              dockerSDConfigs:
+                description: dockerSDConfigs defines a list of Docker service discovery
+                  configurations.
+                items:
+                  description: |-
+                    Docker SD configurations allow retrieving scrape targets from Docker Engine hosts.
+                    This SD discovers "containers" and will create a target for each network IP and
+                    port the container is configured to expose.
+                    See https://prometheus.io/docs/prometheus/latest/configuration/configuration/#docker_sd_config
+                  properties:
+                    authorization:
+                      description: |-
+                        authorization defines the  header configuration to authenticate against the DigitalOcean API.
+                        Cannot be set at the same time as `oauth2`.
+                      properties:
+                        credentials:
+                          description: credentials defines a key of a Secret in the
+                            namespace that contains the credentials for authentication.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        type:
+                          description: |-
+                            type defines the authentication type. The value is case-insensitive.
+
+                            "Basic" is not a supported value.
+
+                            Default: "Bearer"
+                          type: string
+                      type: object
+                    basicAuth:
+                      description: basicAuth defines information to use on every scrape
+                        request.
+                      properties:
+                        password:
+                          description: |-
+                            password defines a key of a Secret containing the password for
+                            authentication.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        username:
+                          description: |-
+                            username defines a key of a Secret containing the username for
+                            authentication.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                      type: object
+                    enableHTTP2:
+                      description: enableHTTP2 defines whether to enable HTTP2.
+                      type: boolean
+                    filters:
+                      description: filters defines filters to limit the discovery
+                        process to a subset of the available resources.
+                      items:
+                        description: Filter name and value pairs to limit the discovery
+                          process to a subset of available resources.
+                        properties:
+                          name:
+                            description: name of the Filter.
+                            type: string
+                          values:
+                            description: values defines values to filter on.
+                            items:
+                              minLength: 1
+                              type: string
+                            minItems: 1
+                            type: array
+                            x-kubernetes-list-type: set
+                        required:
+                        - name
+                        - values
+                        type: object
+                      type: array
+                      x-kubernetes-list-map-keys:
+                      - name
+                      x-kubernetes-list-type: map
+                    followRedirects:
+                      description: followRedirects defines whether HTTP requests follow
+                        HTTP 3xx redirects.
+                      type: boolean
+                    host:
+                      description: host defines the address of the docker daemon
+                      minLength: 1
+                      type: string
+                    hostNetworkingHost:
+                      description: hostNetworkingHost defines the host to use if the
+                        container is in host networking mode.
+                      minLength: 1
+                      type: string
+                    matchFirstNetwork:
+                      description: |-
+                        matchFirstNetwork defines whether to match the first network if the container has multiple networks defined.
+                        If unset, Prometheus uses true by default.
+                        It requires Prometheus >= v2.54.1.
+                      type: boolean
+                    noProxy:
+                      description: |-
+                        noProxy defines a comma-separated string that can contain IPs, CIDR notation, domain names
+                        that should be excluded from proxying. IP and domain names can
+                        contain port numbers.
+
+                        It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                      type: string
+                    oauth2:
+                      description: oauth2 defines the configuration to use on every
+                        scrape request.
+                      properties:
+                        clientId:
+                          description: |-
+                            clientId defines a key of a Secret or ConfigMap containing the
+                            OAuth2 client's ID.
+                          properties:
+                            configMap:
+                              description: configMap defines the ConfigMap containing
+                                data to use for the targets.
+                              properties:
+                                key:
+                                  description: The key to select.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the ConfigMap or its
+                                    key must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            secret:
+                              description: secret defines the Secret containing data
+                                to use for the targets.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                          type: object
+                        clientSecret:
+                          description: |-
+                            clientSecret defines a key of a Secret containing the OAuth2
+                            client's secret.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        endpointParams:
+                          additionalProperties:
+                            type: string
+                          description: |-
+                            endpointParams configures the HTTP parameters to append to the token
+                            URL.
+                          type: object
+                        noProxy:
+                          description: |-
+                            noProxy defines a comma-separated string that can contain IPs, CIDR notation, domain names
+                            that should be excluded from proxying. IP and domain names can
+                            contain port numbers.
+
+                            It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                          type: string
+                        proxyConnectHeader:
+                          additionalProperties:
+                            items:
+                              description: SecretKeySelector selects a key of a Secret.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            type: array
+                          description: |-
+                            proxyConnectHeader optionally specifies headers to send to
+                            proxies during CONNECT requests.
+
+                            It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        proxyFromEnvironment:
+                          description: |-
+                            proxyFromEnvironment defines whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+
+                            It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                          type: boolean
+                        proxyUrl:
+                          description: proxyUrl defines the HTTP proxy server to use.
+                          pattern: ^(http|https|socks5)://.+$
+                          type: string
+                        scopes:
+                          description: scopes defines the OAuth2 scopes used for the
+                            token request.
+                          items:
+                            type: string
+                          type: array
+                        tlsConfig:
+                          description: |-
+                            tlsConfig defines the TLS configuration to use when connecting to the OAuth2 server.
+                            It requires Prometheus >= v2.43.0.
+                          properties:
+                            ca:
+                              description: ca defines the Certificate authority used
+                                when verifying server certificates.
+                              properties:
+                                configMap:
+                                  description: configMap defines the ConfigMap containing
+                                    data to use for the targets.
+                                  properties:
+                                    key:
+                                      description: The key to select.
+                                      type: string
+                                    name:
+                                      default: ""
+                                      description: |-
+                                        Name of the referent.
+                                        This field is effectively required, but due to backwards compatibility is
+                                        allowed to be empty. Instances of this type with an empty value here are
+                                        almost certainly wrong.
+                                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                      type: string
+                                    optional:
+                                      description: Specify whether the ConfigMap or
+                                        its key must be defined
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                secret:
+                                  description: secret defines the Secret containing
+                                    data to use for the targets.
+                                  properties:
+                                    key:
+                                      description: The key of the secret to select
+                                        from.  Must be a valid secret key.
+                                      type: string
+                                    name:
+                                      default: ""
+                                      description: |-
+                                        Name of the referent.
+                                        This field is effectively required, but due to backwards compatibility is
+                                        allowed to be empty. Instances of this type with an empty value here are
+                                        almost certainly wrong.
+                                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                      type: string
+                                    optional:
+                                      description: Specify whether the Secret or its
+                                        key must be defined
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                              type: object
+                            cert:
+                              description: cert defines the Client certificate to
+                                present when doing client-authentication.
+                              properties:
+                                configMap:
+                                  description: configMap defines the ConfigMap containing
+                                    data to use for the targets.
+                                  properties:
+                                    key:
+                                      description: The key to select.
+                                      type: string
+                                    name:
+                                      default: ""
+                                      description: |-
+                                        Name of the referent.
+                                        This field is effectively required, but due to backwards compatibility is
+                                        allowed to be empty. Instances of this type with an empty value here are
+                                        almost certainly wrong.
+                                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                      type: string
+                                    optional:
+                                      description: Specify whether the ConfigMap or
+                                        its key must be defined
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                secret:
+                                  description: secret defines the Secret containing
+                                    data to use for the targets.
+                                  properties:
+                                    key:
+                                      description: The key of the secret to select
+                                        from.  Must be a valid secret key.
+                                      type: string
+                                    name:
+                                      default: ""
+                                      description: |-
+                                        Name of the referent.
+                                        This field is effectively required, but due to backwards compatibility is
+                                        allowed to be empty. Instances of this type with an empty value here are
+                                        almost certainly wrong.
+                                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                      type: string
+                                    optional:
+                                      description: Specify whether the Secret or its
+                                        key must be defined
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                              type: object
+                            insecureSkipVerify:
+                              description: insecureSkipVerify defines how to disable
+                                target certificate validation.
+                              type: boolean
+                            keySecret:
+                              description: keySecret defines the Secret containing
+                                the client key file for the targets.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            maxVersion:
+                              description: |-
+                                maxVersion defines the maximum acceptable TLS version.
+
+                                It requires Prometheus >= v2.41.0 or Thanos >= v0.31.0.
+                              enum:
+                              - TLS10
+                              - TLS11
+                              - TLS12
+                              - TLS13
+                              type: string
+                            minVersion:
+                              description: |-
+                                minVersion defines the minimum acceptable TLS version.
+
+                                It requires Prometheus >= v2.35.0 or Thanos >= v0.28.0.
+                              enum:
+                              - TLS10
+                              - TLS11
+                              - TLS12
+                              - TLS13
+                              type: string
+                            serverName:
+                              description: serverName is used to verify the hostname
+                                for the targets.
+                              type: string
+                          type: object
+                        tokenUrl:
+                          description: tokenUrl defines the URL to fetch the token
+                            from.
+                          minLength: 1
+                          type: string
+                      required:
+                      - clientId
+                      - clientSecret
+                      - tokenUrl
+                      type: object
+                    port:
+                      description: port defines the port to scrape metrics from. If
+                        using the public IP address, this must
+                      format: int32
+                      maximum: 65535
+                      minimum: 0
+                      type: integer
+                    proxyConnectHeader:
+                      additionalProperties:
+                        items:
+                          description: SecretKeySelector selects a key of a Secret.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        type: array
+                      description: |-
+                        proxyConnectHeader optionally specifies headers to send to
+                        proxies during CONNECT requests.
+
+                        It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                      type: object
+                      x-kubernetes-map-type: atomic
+                    proxyFromEnvironment:
+                      description: |-
+                        proxyFromEnvironment defines whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+
+                        It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                      type: boolean
+                    proxyUrl:
+                      description: proxyUrl defines the HTTP proxy server to use.
+                      pattern: ^(http|https|socks5)://.+$
+                      type: string
+                    refreshInterval:
+                      description: |-
+                        refreshInterval defines the time after which the provided names are refreshed.
+                        If not set, Prometheus uses its default value.
+                      pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
+                      type: string
+                    tlsConfig:
+                      description: tlsConfig defines the TLS configuration to connect
+                        to the Consul API.
+                      properties:
+                        ca:
+                          description: ca defines the Certificate authority used when
+                            verifying server certificates.
+                          properties:
+                            configMap:
+                              description: configMap defines the ConfigMap containing
+                                data to use for the targets.
+                              properties:
+                                key:
+                                  description: The key to select.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the ConfigMap or its
+                                    key must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            secret:
+                              description: secret defines the Secret containing data
+                                to use for the targets.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                          type: object
+                        cert:
+                          description: cert defines the Client certificate to present
+                            when doing client-authentication.
+                          properties:
+                            configMap:
+                              description: configMap defines the ConfigMap containing
+                                data to use for the targets.
+                              properties:
+                                key:
+                                  description: The key to select.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the ConfigMap or its
+                                    key must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            secret:
+                              description: secret defines the Secret containing data
+                                to use for the targets.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                          type: object
+                        insecureSkipVerify:
+                          description: insecureSkipVerify defines how to disable target
+                            certificate validation.
+                          type: boolean
+                        keySecret:
+                          description: keySecret defines the Secret containing the
+                            client key file for the targets.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        maxVersion:
+                          description: |-
+                            maxVersion defines the maximum acceptable TLS version.
+
+                            It requires Prometheus >= v2.41.0 or Thanos >= v0.31.0.
+                          enum:
+                          - TLS10
+                          - TLS11
+                          - TLS12
+                          - TLS13
+                          type: string
+                        minVersion:
+                          description: |-
+                            minVersion defines the minimum acceptable TLS version.
+
+                            It requires Prometheus >= v2.35.0 or Thanos >= v0.28.0.
+                          enum:
+                          - TLS10
+                          - TLS11
+                          - TLS12
+                          - TLS13
+                          type: string
+                        serverName:
+                          description: serverName is used to verify the hostname for
+                            the targets.
+                          type: string
+                      type: object
+                  required:
+                  - host
+                  type: object
+                type: array
+              dockerSwarmSDConfigs:
+                description: dockerSwarmSDConfigs defines a list of Dockerswarm service
+                  discovery configurations.
+                items:
+                  description: |-
+                    DockerSwarmSDConfig configurations allow retrieving scrape targets from Docker Swarm engine.
+                    See https://prometheus.io/docs/prometheus/latest/configuration/configuration/#dockerswarm_sd_config
+                  properties:
+                    authorization:
+                      description: |-
+                        authorization defines the  header configuration to authenticate against the DigitalOcean API.
+                        Cannot be set at the same time as `oauth2`.
+                      properties:
+                        credentials:
+                          description: credentials defines a key of a Secret in the
+                            namespace that contains the credentials for authentication.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        type:
+                          description: |-
+                            type defines the authentication type. The value is case-insensitive.
+
+                            "Basic" is not a supported value.
+
+                            Default: "Bearer"
+                          type: string
+                      type: object
+                    basicAuth:
+                      description: basicAuth defines information to use on every scrape
+                        request.
+                      properties:
+                        password:
+                          description: |-
+                            password defines a key of a Secret containing the password for
+                            authentication.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        username:
+                          description: |-
+                            username defines a key of a Secret containing the username for
+                            authentication.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                      type: object
+                    enableHTTP2:
+                      description: enableHTTP2 defines whether to enable HTTP2.
+                      type: boolean
+                    filters:
+                      description: |-
+                        filters defines the filters to limit the discovery process to a subset of available
+                        resources.
+                        The available filters are listed in the upstream documentation:
+                        Services: https://docs.docker.com/engine/api/v1.40/#operation/ServiceList
+                        Tasks: https://docs.docker.com/engine/api/v1.40/#operation/TaskList
+                        Nodes: https://docs.docker.com/engine/api/v1.40/#operation/NodeList
+                      items:
+                        description: Filter name and value pairs to limit the discovery
+                          process to a subset of available resources.
+                        properties:
+                          name:
+                            description: name of the Filter.
+                            type: string
+                          values:
+                            description: values defines values to filter on.
+                            items:
+                              minLength: 1
+                              type: string
+                            minItems: 1
+                            type: array
+                            x-kubernetes-list-type: set
+                        required:
+                        - name
+                        - values
+                        type: object
+                      type: array
+                      x-kubernetes-list-map-keys:
+                      - name
+                      x-kubernetes-list-type: map
+                    followRedirects:
+                      description: followRedirects defines whether HTTP requests follow
+                        HTTP 3xx redirects.
+                      type: boolean
+                    host:
+                      description: host defines the address of the Docker daemon
+                      pattern: ^[a-zA-Z][a-zA-Z0-9+.-]*://.+$
+                      type: string
+                    noProxy:
+                      description: |-
+                        noProxy defines a comma-separated string that can contain IPs, CIDR notation, domain names
+                        that should be excluded from proxying. IP and domain names can
+                        contain port numbers.
+
+                        It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                      type: string
+                    oauth2:
+                      description: |-
+                        oauth2 defines the optional OAuth 2.0 configuration to authenticate against the target HTTP endpoint.
+                        Cannot be set at the same time as `authorization`, or `basicAuth`.
+                      properties:
+                        clientId:
+                          description: |-
+                            clientId defines a key of a Secret or ConfigMap containing the
+                            OAuth2 client's ID.
+                          properties:
+                            configMap:
+                              description: configMap defines the ConfigMap containing
+                                data to use for the targets.
+                              properties:
+                                key:
+                                  description: The key to select.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the ConfigMap or its
+                                    key must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            secret:
+                              description: secret defines the Secret containing data
+                                to use for the targets.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                          type: object
+                        clientSecret:
+                          description: |-
+                            clientSecret defines a key of a Secret containing the OAuth2
+                            client's secret.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        endpointParams:
+                          additionalProperties:
+                            type: string
+                          description: |-
+                            endpointParams configures the HTTP parameters to append to the token
+                            URL.
+                          type: object
+                        noProxy:
+                          description: |-
+                            noProxy defines a comma-separated string that can contain IPs, CIDR notation, domain names
+                            that should be excluded from proxying. IP and domain names can
+                            contain port numbers.
+
+                            It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                          type: string
+                        proxyConnectHeader:
+                          additionalProperties:
+                            items:
+                              description: SecretKeySelector selects a key of a Secret.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            type: array
+                          description: |-
+                            proxyConnectHeader optionally specifies headers to send to
+                            proxies during CONNECT requests.
+
+                            It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        proxyFromEnvironment:
+                          description: |-
+                            proxyFromEnvironment defines whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+
+                            It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                          type: boolean
+                        proxyUrl:
+                          description: proxyUrl defines the HTTP proxy server to use.
+                          pattern: ^(http|https|socks5)://.+$
+                          type: string
+                        scopes:
+                          description: scopes defines the OAuth2 scopes used for the
+                            token request.
+                          items:
+                            type: string
+                          type: array
+                        tlsConfig:
+                          description: |-
+                            tlsConfig defines the TLS configuration to use when connecting to the OAuth2 server.
+                            It requires Prometheus >= v2.43.0.
+                          properties:
+                            ca:
+                              description: ca defines the Certificate authority used
+                                when verifying server certificates.
+                              properties:
+                                configMap:
+                                  description: configMap defines the ConfigMap containing
+                                    data to use for the targets.
+                                  properties:
+                                    key:
+                                      description: The key to select.
+                                      type: string
+                                    name:
+                                      default: ""
+                                      description: |-
+                                        Name of the referent.
+                                        This field is effectively required, but due to backwards compatibility is
+                                        allowed to be empty. Instances of this type with an empty value here are
+                                        almost certainly wrong.
+                                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                      type: string
+                                    optional:
+                                      description: Specify whether the ConfigMap or
+                                        its key must be defined
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                secret:
+                                  description: secret defines the Secret containing
+                                    data to use for the targets.
+                                  properties:
+                                    key:
+                                      description: The key of the secret to select
+                                        from.  Must be a valid secret key.
+                                      type: string
+                                    name:
+                                      default: ""
+                                      description: |-
+                                        Name of the referent.
+                                        This field is effectively required, but due to backwards compatibility is
+                                        allowed to be empty. Instances of this type with an empty value here are
+                                        almost certainly wrong.
+                                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                      type: string
+                                    optional:
+                                      description: Specify whether the Secret or its
+                                        key must be defined
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                              type: object
+                            cert:
+                              description: cert defines the Client certificate to
+                                present when doing client-authentication.
+                              properties:
+                                configMap:
+                                  description: configMap defines the ConfigMap containing
+                                    data to use for the targets.
+                                  properties:
+                                    key:
+                                      description: The key to select.
+                                      type: string
+                                    name:
+                                      default: ""
+                                      description: |-
+                                        Name of the referent.
+                                        This field is effectively required, but due to backwards compatibility is
+                                        allowed to be empty. Instances of this type with an empty value here are
+                                        almost certainly wrong.
+                                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                      type: string
+                                    optional:
+                                      description: Specify whether the ConfigMap or
+                                        its key must be defined
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                secret:
+                                  description: secret defines the Secret containing
+                                    data to use for the targets.
+                                  properties:
+                                    key:
+                                      description: The key of the secret to select
+                                        from.  Must be a valid secret key.
+                                      type: string
+                                    name:
+                                      default: ""
+                                      description: |-
+                                        Name of the referent.
+                                        This field is effectively required, but due to backwards compatibility is
+                                        allowed to be empty. Instances of this type with an empty value here are
+                                        almost certainly wrong.
+                                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                      type: string
+                                    optional:
+                                      description: Specify whether the Secret or its
+                                        key must be defined
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                              type: object
+                            insecureSkipVerify:
+                              description: insecureSkipVerify defines how to disable
+                                target certificate validation.
+                              type: boolean
+                            keySecret:
+                              description: keySecret defines the Secret containing
+                                the client key file for the targets.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            maxVersion:
+                              description: |-
+                                maxVersion defines the maximum acceptable TLS version.
+
+                                It requires Prometheus >= v2.41.0 or Thanos >= v0.31.0.
+                              enum:
+                              - TLS10
+                              - TLS11
+                              - TLS12
+                              - TLS13
+                              type: string
+                            minVersion:
+                              description: |-
+                                minVersion defines the minimum acceptable TLS version.
+
+                                It requires Prometheus >= v2.35.0 or Thanos >= v0.28.0.
+                              enum:
+                              - TLS10
+                              - TLS11
+                              - TLS12
+                              - TLS13
+                              type: string
+                            serverName:
+                              description: serverName is used to verify the hostname
+                                for the targets.
+                              type: string
+                          type: object
+                        tokenUrl:
+                          description: tokenUrl defines the URL to fetch the token
+                            from.
+                          minLength: 1
+                          type: string
+                      required:
+                      - clientId
+                      - clientSecret
+                      - tokenUrl
+                      type: object
+                    port:
+                      description: |-
+                        port defines the port to scrape metrics from. If using the public IP address, this must
+                        tasks and services that don't have published ports.
+                      format: int32
+                      maximum: 65535
+                      minimum: 0
+                      type: integer
+                    proxyConnectHeader:
+                      additionalProperties:
+                        items:
+                          description: SecretKeySelector selects a key of a Secret.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        type: array
+                      description: |-
+                        proxyConnectHeader optionally specifies headers to send to
+                        proxies during CONNECT requests.
+
+                        It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                      type: object
+                      x-kubernetes-map-type: atomic
+                    proxyFromEnvironment:
+                      description: |-
+                        proxyFromEnvironment defines whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+
+                        It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                      type: boolean
+                    proxyUrl:
+                      description: proxyUrl defines the HTTP proxy server to use.
+                      pattern: ^(http|https|socks5)://.+$
+                      type: string
+                    refreshInterval:
+                      description: |-
+                        refreshInterval defines the time after which the provided names are refreshed.
+                        If not set, Prometheus uses its default value.
+                      pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
+                      type: string
+                    role:
+                      description: role of the targets to retrieve. Must be `Services`,
+                        `Tasks`, or `Nodes`.
+                      enum:
+                      - Services
+                      - Tasks
+                      - Nodes
+                      type: string
+                    tlsConfig:
+                      description: tlsConfig defines the TLS configuration to connect
+                        to the Consul API.
+                      properties:
+                        ca:
+                          description: ca defines the Certificate authority used when
+                            verifying server certificates.
+                          properties:
+                            configMap:
+                              description: configMap defines the ConfigMap containing
+                                data to use for the targets.
+                              properties:
+                                key:
+                                  description: The key to select.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the ConfigMap or its
+                                    key must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            secret:
+                              description: secret defines the Secret containing data
+                                to use for the targets.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                          type: object
+                        cert:
+                          description: cert defines the Client certificate to present
+                            when doing client-authentication.
+                          properties:
+                            configMap:
+                              description: configMap defines the ConfigMap containing
+                                data to use for the targets.
+                              properties:
+                                key:
+                                  description: The key to select.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the ConfigMap or its
+                                    key must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            secret:
+                              description: secret defines the Secret containing data
+                                to use for the targets.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                          type: object
+                        insecureSkipVerify:
+                          description: insecureSkipVerify defines how to disable target
+                            certificate validation.
+                          type: boolean
+                        keySecret:
+                          description: keySecret defines the Secret containing the
+                            client key file for the targets.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        maxVersion:
+                          description: |-
+                            maxVersion defines the maximum acceptable TLS version.
+
+                            It requires Prometheus >= v2.41.0 or Thanos >= v0.31.0.
+                          enum:
+                          - TLS10
+                          - TLS11
+                          - TLS12
+                          - TLS13
+                          type: string
+                        minVersion:
+                          description: |-
+                            minVersion defines the minimum acceptable TLS version.
+
+                            It requires Prometheus >= v2.35.0 or Thanos >= v0.28.0.
+                          enum:
+                          - TLS10
+                          - TLS11
+                          - TLS12
+                          - TLS13
+                          type: string
+                        serverName:
+                          description: serverName is used to verify the hostname for
+                            the targets.
+                          type: string
+                      type: object
+                  required:
+                  - host
+                  - role
+                  type: object
+                type: array
+              ec2SDConfigs:
+                description: ec2SDConfigs defines a list of EC2 service discovery
+                  configurations.
+                items:
+                  description: |-
+                    EC2SDConfig allow retrieving scrape targets from AWS EC2 instances.
+                    The private IP address is used by default, but may be changed to the public IP address with relabeling.
+                    The IAM credentials used must have the ec2:DescribeInstances permission to discover scrape targets
+                    See https://prometheus.io/docs/prometheus/latest/configuration/configuration/#ec2_sd_config
+
+                    The EC2 service discovery requires AWS API keys or role ARN for authentication.
+                    BasicAuth, Authorization and OAuth2 fields are not present on purpose.
+                  properties:
+                    accessKey:
+                      description: accessKey defines the AWS API key.
+                      properties:
+                        key:
+                          description: The key of the secret to select from.  Must
+                            be a valid secret key.
+                          type: string
+                        name:
+                          default: ""
+                          description: |-
+                            Name of the referent.
+                            This field is effectively required, but due to backwards compatibility is
+                            allowed to be empty. Instances of this type with an empty value here are
+                            almost certainly wrong.
+                            More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                          type: string
+                        optional:
+                          description: Specify whether the Secret or its key must
+                            be defined
+                          type: boolean
+                      required:
+                      - key
+                      type: object
+                      x-kubernetes-map-type: atomic
+                    enableHTTP2:
+                      description: |-
+                        enableHTTP2 defines whether to enable HTTP2.
+                        It requires Prometheus >= v2.41.0
+                      type: boolean
+                    filters:
+                      description: |-
+                        filters can be used optionally to filter the instance list by other criteria.
+                        Available filter criteria can be found here:
+                        https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_DescribeInstances.html
+                        Filter API documentation: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_Filter.html
+                        It requires Prometheus >= v2.3.0
+                      items:
+                        description: Filter name and value pairs to limit the discovery
+                          process to a subset of available resources.
+                        properties:
+                          name:
+                            description: name of the Filter.
+                            type: string
+                          values:
+                            description: values defines values to filter on.
+                            items:
+                              minLength: 1
+                              type: string
+                            minItems: 1
+                            type: array
+                            x-kubernetes-list-type: set
+                        required:
+                        - name
+                        - values
+                        type: object
+                      type: array
+                      x-kubernetes-list-map-keys:
+                      - name
+                      x-kubernetes-list-type: map
+                    followRedirects:
+                      description: |-
+                        followRedirects defines whether HTTP requests follow HTTP 3xx redirects.
+                        It requires Prometheus >= v2.41.0
+                      type: boolean
+                    noProxy:
+                      description: |-
+                        noProxy defines a comma-separated string that can contain IPs, CIDR notation, domain names
+                        that should be excluded from proxying. IP and domain names can
+                        contain port numbers.
+
+                        It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                      type: string
+                    port:
+                      description: |-
+                        port defines the port to scrape metrics from. If using the public IP address, this must
+                        instead be specified in the relabeling rule.
+                      format: int32
+                      maximum: 65535
+                      minimum: 0
+                      type: integer
+                    proxyConnectHeader:
+                      additionalProperties:
+                        items:
+                          description: SecretKeySelector selects a key of a Secret.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        type: array
+                      description: |-
+                        proxyConnectHeader optionally specifies headers to send to
+                        proxies during CONNECT requests.
+
+                        It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                      type: object
+                      x-kubernetes-map-type: atomic
+                    proxyFromEnvironment:
+                      description: |-
+                        proxyFromEnvironment defines whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+
+                        It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                      type: boolean
+                    proxyUrl:
+                      description: proxyUrl defines the HTTP proxy server to use.
+                      pattern: ^(http|https|socks5)://.+$
+                      type: string
+                    refreshInterval:
+                      description: |-
+                        refreshInterval defines the time after which the provided names are refreshed.
+                        If not set, Prometheus uses its default value.
+                      pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
+                      type: string
+                    region:
+                      description: region defines the AWS region.
+                      minLength: 1
+                      type: string
+                    roleARN:
+                      description: roleARN defines an alternative to using AWS API
+                        keys.
+                      minLength: 1
+                      type: string
+                    secretKey:
+                      description: secretKey defines the AWS API secret.
+                      properties:
+                        key:
+                          description: The key of the secret to select from.  Must
+                            be a valid secret key.
+                          type: string
+                        name:
+                          default: ""
+                          description: |-
+                            Name of the referent.
+                            This field is effectively required, but due to backwards compatibility is
+                            allowed to be empty. Instances of this type with an empty value here are
+                            almost certainly wrong.
+                            More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                          type: string
+                        optional:
+                          description: Specify whether the Secret or its key must
+                            be defined
+                          type: boolean
+                      required:
+                      - key
+                      type: object
+                      x-kubernetes-map-type: atomic
+                    tlsConfig:
+                      description: |-
+                        tlsConfig defines the TLS configuration to connect to the Consul API.
+                        It requires Prometheus >= v2.41.0
+                      properties:
+                        ca:
+                          description: ca defines the Certificate authority used when
+                            verifying server certificates.
+                          properties:
+                            configMap:
+                              description: configMap defines the ConfigMap containing
+                                data to use for the targets.
+                              properties:
+                                key:
+                                  description: The key to select.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the ConfigMap or its
+                                    key must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            secret:
+                              description: secret defines the Secret containing data
+                                to use for the targets.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                          type: object
+                        cert:
+                          description: cert defines the Client certificate to present
+                            when doing client-authentication.
+                          properties:
+                            configMap:
+                              description: configMap defines the ConfigMap containing
+                                data to use for the targets.
+                              properties:
+                                key:
+                                  description: The key to select.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the ConfigMap or its
+                                    key must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            secret:
+                              description: secret defines the Secret containing data
+                                to use for the targets.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                          type: object
+                        insecureSkipVerify:
+                          description: insecureSkipVerify defines how to disable target
+                            certificate validation.
+                          type: boolean
+                        keySecret:
+                          description: keySecret defines the Secret containing the
+                            client key file for the targets.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        maxVersion:
+                          description: |-
+                            maxVersion defines the maximum acceptable TLS version.
+
+                            It requires Prometheus >= v2.41.0 or Thanos >= v0.31.0.
+                          enum:
+                          - TLS10
+                          - TLS11
+                          - TLS12
+                          - TLS13
+                          type: string
+                        minVersion:
+                          description: |-
+                            minVersion defines the minimum acceptable TLS version.
+
+                            It requires Prometheus >= v2.35.0 or Thanos >= v0.28.0.
+                          enum:
+                          - TLS10
+                          - TLS11
+                          - TLS12
+                          - TLS13
+                          type: string
+                        serverName:
+                          description: serverName is used to verify the hostname for
+                            the targets.
+                          type: string
+                      type: object
+                  type: object
+                type: array
+              enableCompression:
+                description: |-
+                  enableCompression when false, Prometheus will request uncompressed response from the scraped target.
+
+                  It requires Prometheus >= v2.49.0.
+
+                  If unset, Prometheus uses true by default.
+                type: boolean
+              enableHTTP2:
+                description: enableHTTP2 defines whether to enable HTTP2.
+                type: boolean
+              eurekaSDConfigs:
+                description: eurekaSDConfigs defines a list of Eureka service discovery
+                  configurations.
+                items:
+                  description: |-
+                    Eureka SD configurations allow retrieving scrape targets using the Eureka REST API.
+                    Prometheus will periodically check the REST endpoint and create a target for every app instance.
+                    See https://prometheus.io/docs/prometheus/latest/configuration/configuration/#eureka_sd_config
+                  properties:
+                    authorization:
+                      description: |-
+                        authorization defines the  header configuration to authenticate against the DigitalOcean API.
+                        Cannot be set at the same time as `oauth2`.
+                      properties:
+                        credentials:
+                          description: credentials defines a key of a Secret in the
+                            namespace that contains the credentials for authentication.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        type:
+                          description: |-
+                            type defines the authentication type. The value is case-insensitive.
+
+                            "Basic" is not a supported value.
+
+                            Default: "Bearer"
+                          type: string
+                      type: object
+                    basicAuth:
+                      description: basicAuth defines the BasicAuth information to
+                        use on every scrape request.
+                      properties:
+                        password:
+                          description: |-
+                            password defines a key of a Secret containing the password for
+                            authentication.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        username:
+                          description: |-
+                            username defines a key of a Secret containing the username for
+                            authentication.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                      type: object
+                    enableHTTP2:
+                      description: enableHTTP2 defines whether to enable HTTP2.
+                      type: boolean
+                    followRedirects:
+                      description: followRedirects defines whether HTTP requests follow
+                        HTTP 3xx redirects.
+                      type: boolean
+                    noProxy:
+                      description: |-
+                        noProxy defines a comma-separated string that can contain IPs, CIDR notation, domain names
+                        that should be excluded from proxying. IP and domain names can
+                        contain port numbers.
+
+                        It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                      type: string
+                    oauth2:
+                      description: oauth2 defines the configuration to use on every
+                        scrape request.
+                      properties:
+                        clientId:
+                          description: |-
+                            clientId defines a key of a Secret or ConfigMap containing the
+                            OAuth2 client's ID.
+                          properties:
+                            configMap:
+                              description: configMap defines the ConfigMap containing
+                                data to use for the targets.
+                              properties:
+                                key:
+                                  description: The key to select.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the ConfigMap or its
+                                    key must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            secret:
+                              description: secret defines the Secret containing data
+                                to use for the targets.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                          type: object
+                        clientSecret:
+                          description: |-
+                            clientSecret defines a key of a Secret containing the OAuth2
+                            client's secret.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        endpointParams:
+                          additionalProperties:
+                            type: string
+                          description: |-
+                            endpointParams configures the HTTP parameters to append to the token
+                            URL.
+                          type: object
+                        noProxy:
+                          description: |-
+                            noProxy defines a comma-separated string that can contain IPs, CIDR notation, domain names
+                            that should be excluded from proxying. IP and domain names can
+                            contain port numbers.
+
+                            It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                          type: string
+                        proxyConnectHeader:
+                          additionalProperties:
+                            items:
+                              description: SecretKeySelector selects a key of a Secret.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            type: array
+                          description: |-
+                            proxyConnectHeader optionally specifies headers to send to
+                            proxies during CONNECT requests.
+
+                            It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        proxyFromEnvironment:
+                          description: |-
+                            proxyFromEnvironment defines whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+
+                            It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                          type: boolean
+                        proxyUrl:
+                          description: proxyUrl defines the HTTP proxy server to use.
+                          pattern: ^(http|https|socks5)://.+$
+                          type: string
+                        scopes:
+                          description: scopes defines the OAuth2 scopes used for the
+                            token request.
+                          items:
+                            type: string
+                          type: array
+                        tlsConfig:
+                          description: |-
+                            tlsConfig defines the TLS configuration to use when connecting to the OAuth2 server.
+                            It requires Prometheus >= v2.43.0.
+                          properties:
+                            ca:
+                              description: ca defines the Certificate authority used
+                                when verifying server certificates.
+                              properties:
+                                configMap:
+                                  description: configMap defines the ConfigMap containing
+                                    data to use for the targets.
+                                  properties:
+                                    key:
+                                      description: The key to select.
+                                      type: string
+                                    name:
+                                      default: ""
+                                      description: |-
+                                        Name of the referent.
+                                        This field is effectively required, but due to backwards compatibility is
+                                        allowed to be empty. Instances of this type with an empty value here are
+                                        almost certainly wrong.
+                                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                      type: string
+                                    optional:
+                                      description: Specify whether the ConfigMap or
+                                        its key must be defined
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                secret:
+                                  description: secret defines the Secret containing
+                                    data to use for the targets.
+                                  properties:
+                                    key:
+                                      description: The key of the secret to select
+                                        from.  Must be a valid secret key.
+                                      type: string
+                                    name:
+                                      default: ""
+                                      description: |-
+                                        Name of the referent.
+                                        This field is effectively required, but due to backwards compatibility is
+                                        allowed to be empty. Instances of this type with an empty value here are
+                                        almost certainly wrong.
+                                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                      type: string
+                                    optional:
+                                      description: Specify whether the Secret or its
+                                        key must be defined
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                              type: object
+                            cert:
+                              description: cert defines the Client certificate to
+                                present when doing client-authentication.
+                              properties:
+                                configMap:
+                                  description: configMap defines the ConfigMap containing
+                                    data to use for the targets.
+                                  properties:
+                                    key:
+                                      description: The key to select.
+                                      type: string
+                                    name:
+                                      default: ""
+                                      description: |-
+                                        Name of the referent.
+                                        This field is effectively required, but due to backwards compatibility is
+                                        allowed to be empty. Instances of this type with an empty value here are
+                                        almost certainly wrong.
+                                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                      type: string
+                                    optional:
+                                      description: Specify whether the ConfigMap or
+                                        its key must be defined
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                secret:
+                                  description: secret defines the Secret containing
+                                    data to use for the targets.
+                                  properties:
+                                    key:
+                                      description: The key of the secret to select
+                                        from.  Must be a valid secret key.
+                                      type: string
+                                    name:
+                                      default: ""
+                                      description: |-
+                                        Name of the referent.
+                                        This field is effectively required, but due to backwards compatibility is
+                                        allowed to be empty. Instances of this type with an empty value here are
+                                        almost certainly wrong.
+                                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                      type: string
+                                    optional:
+                                      description: Specify whether the Secret or its
+                                        key must be defined
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                              type: object
+                            insecureSkipVerify:
+                              description: insecureSkipVerify defines how to disable
+                                target certificate validation.
+                              type: boolean
+                            keySecret:
+                              description: keySecret defines the Secret containing
+                                the client key file for the targets.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            maxVersion:
+                              description: |-
+                                maxVersion defines the maximum acceptable TLS version.
+
+                                It requires Prometheus >= v2.41.0 or Thanos >= v0.31.0.
+                              enum:
+                              - TLS10
+                              - TLS11
+                              - TLS12
+                              - TLS13
+                              type: string
+                            minVersion:
+                              description: |-
+                                minVersion defines the minimum acceptable TLS version.
+
+                                It requires Prometheus >= v2.35.0 or Thanos >= v0.28.0.
+                              enum:
+                              - TLS10
+                              - TLS11
+                              - TLS12
+                              - TLS13
+                              type: string
+                            serverName:
+                              description: serverName is used to verify the hostname
+                                for the targets.
+                              type: string
+                          type: object
+                        tokenUrl:
+                          description: tokenUrl defines the URL to fetch the token
+                            from.
+                          minLength: 1
+                          type: string
+                      required:
+                      - clientId
+                      - clientSecret
+                      - tokenUrl
+                      type: object
+                    proxyConnectHeader:
+                      additionalProperties:
+                        items:
+                          description: SecretKeySelector selects a key of a Secret.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        type: array
+                      description: |-
+                        proxyConnectHeader optionally specifies headers to send to
+                        proxies during CONNECT requests.
+
+                        It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                      type: object
+                      x-kubernetes-map-type: atomic
+                    proxyFromEnvironment:
+                      description: |-
+                        proxyFromEnvironment defines whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+
+                        It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                      type: boolean
+                    proxyUrl:
+                      description: proxyUrl defines the HTTP proxy server to use.
+                      pattern: ^(http|https|socks5)://.+$
+                      type: string
+                    refreshInterval:
+                      description: |-
+                        refreshInterval defines the time after which the provided names are refreshed.
+                        If not set, Prometheus uses its default value.
+                      pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
+                      type: string
+                    server:
+                      description: server defines the URL to connect to the Eureka
+                        server.
+                      minLength: 1
+                      pattern: ^http(s)?://.+$
+                      type: string
+                    tlsConfig:
+                      description: tlsConfig defines the TLS configuration to connect
+                        to the Consul API.
+                      properties:
+                        ca:
+                          description: ca defines the Certificate authority used when
+                            verifying server certificates.
+                          properties:
+                            configMap:
+                              description: configMap defines the ConfigMap containing
+                                data to use for the targets.
+                              properties:
+                                key:
+                                  description: The key to select.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the ConfigMap or its
+                                    key must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            secret:
+                              description: secret defines the Secret containing data
+                                to use for the targets.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                          type: object
+                        cert:
+                          description: cert defines the Client certificate to present
+                            when doing client-authentication.
+                          properties:
+                            configMap:
+                              description: configMap defines the ConfigMap containing
+                                data to use for the targets.
+                              properties:
+                                key:
+                                  description: The key to select.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the ConfigMap or its
+                                    key must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            secret:
+                              description: secret defines the Secret containing data
+                                to use for the targets.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                          type: object
+                        insecureSkipVerify:
+                          description: insecureSkipVerify defines how to disable target
+                            certificate validation.
+                          type: boolean
+                        keySecret:
+                          description: keySecret defines the Secret containing the
+                            client key file for the targets.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        maxVersion:
+                          description: |-
+                            maxVersion defines the maximum acceptable TLS version.
+
+                            It requires Prometheus >= v2.41.0 or Thanos >= v0.31.0.
+                          enum:
+                          - TLS10
+                          - TLS11
+                          - TLS12
+                          - TLS13
+                          type: string
+                        minVersion:
+                          description: |-
+                            minVersion defines the minimum acceptable TLS version.
+
+                            It requires Prometheus >= v2.35.0 or Thanos >= v0.28.0.
+                          enum:
+                          - TLS10
+                          - TLS11
+                          - TLS12
+                          - TLS13
+                          type: string
+                        serverName:
+                          description: serverName is used to verify the hostname for
+                            the targets.
+                          type: string
+                      type: object
+                  required:
+                  - server
+                  type: object
+                type: array
+              fallbackScrapeProtocol:
+                description: |-
+                  fallbackScrapeProtocol defines the protocol to use if a scrape returns blank, unparseable, or otherwise invalid Content-Type.
+
+                  It requires Prometheus >= v3.0.0.
+                enum:
+                - PrometheusProto
+                - OpenMetricsText0.0.1
+                - OpenMetricsText1.0.0
+                - PrometheusText0.0.4
+                - PrometheusText1.0.0
+                type: string
+              fileSDConfigs:
+                description: fileSDConfigs defines a list of file service discovery
+                  configurations.
+                items:
+                  description: |-
+                    FileSDConfig defines a Prometheus file service discovery configuration
+                    See https://prometheus.io/docs/prometheus/latest/configuration/configuration/#file_sd_config
+                  properties:
+                    files:
+                      description: |-
+                        files defines the list of files to be used for file discovery. Recommendation: use absolute paths. While relative paths work, the
+                        prometheus-operator project makes no guarantees about the working directory where the configuration file is
+                        stored.
+                        Files must be mounted using Prometheus.ConfigMaps or Prometheus.Secrets.
+                      items:
+                        description: SDFile represents a file used for service discovery
+                        pattern: ^[^*]*(\*[^/]*)?\.(json|yml|yaml|JSON|YML|YAML)$
+                        type: string
+                      minItems: 1
+                      type: array
+                      x-kubernetes-list-type: set
+                    refreshInterval:
+                      description: |-
+                        refreshInterval defines the time after which the provided names are refreshed.
+                        If not set, Prometheus uses its default value.
+                      pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
+                      type: string
+                  required:
+                  - files
+                  type: object
+                type: array
+              gceSDConfigs:
+                description: gceSDConfigs defines a list of GCE service discovery
+                  configurations.
+                items:
+                  description: |-
+                    GCESDConfig configures scrape targets from GCP GCE instances.
+                    The private IP address is used by default, but may be changed to
+                    the public IP address with relabeling.
+                    See https://prometheus.io/docs/prometheus/latest/configuration/configuration/#gce_sd_config
+
+                    The GCE service discovery will load the Google Cloud credentials
+                    from the file specified by the GOOGLE_APPLICATION_CREDENTIALS environment variable.
+                    See https://cloud.google.com/kubernetes-engine/docs/tutorials/authenticating-to-cloud-platform
+
+                    A pre-requisite for using GCESDConfig is that a Secret containing valid
+                    Google Cloud credentials is mounted into the Prometheus or PrometheusAgent
+                    pod via the `.spec.secrets` field and that the GOOGLE_APPLICATION_CREDENTIALS
+                    environment variable is set to /etc/prometheus/secrets/<secret-name>/<credentials-filename.json>.
+                  properties:
+                    filter:
+                      description: |-
+                        filter defines the filter that can be used optionally to filter the instance list by other criteria
+                        Syntax of this filter is described in the filter query parameter section:
+                        https://cloud.google.com/compute/docs/reference/latest/instances/list
+                      minLength: 1
+                      type: string
+                    port:
+                      description: |-
+                        port defines the port to scrape metrics from. If using the public IP address, this must
+                        instead be specified in the relabeling rule.
+                      format: int32
+                      maximum: 65535
+                      minimum: 0
+                      type: integer
+                    project:
+                      description: project defines the Google Cloud Project ID
+                      minLength: 1
+                      type: string
+                    refreshInterval:
+                      description: |-
+                        refreshInterval defines the time after which the provided names are refreshed.
+                        If not set, Prometheus uses its default value.
+                      pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
+                      type: string
+                    tagSeparator:
+                      description: tagSeparator defines the tag separator is used
+                        to separate the tags on concatenation
+                      minLength: 1
+                      type: string
+                    zone:
+                      description: zone defines the zone of the scrape targets. If
+                        you need multiple zones use multiple GCESDConfigs.
+                      minLength: 1
+                      type: string
+                  required:
+                  - project
+                  - zone
+                  type: object
+                type: array
+              hetznerSDConfigs:
+                description: hetznerSDConfigs defines a list of Hetzner service discovery
+                  configurations.
+                items:
+                  description: |-
+                    HetznerSDConfig allow retrieving scrape targets from Hetzner Cloud API and Robot API.
+                    This service discovery uses the public IPv4 address by default, but that can be changed with relabeling
+                    See https://prometheus.io/docs/prometheus/latest/configuration/configuration/#hetzner_sd_config
+                  properties:
+                    authorization:
+                      description: |-
+                        authorization defines the  header configuration to authenticate against the DigitalOcean API.
+                        Cannot be set at the same time as `oauth2`.
+                      properties:
+                        credentials:
+                          description: credentials defines a key of a Secret in the
+                            namespace that contains the credentials for authentication.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        type:
+                          description: |-
+                            type defines the authentication type. The value is case-insensitive.
+
+                            "Basic" is not a supported value.
+
+                            Default: "Bearer"
+                          type: string
+                      type: object
+                    basicAuth:
+                      description: basicAuth defines information to use on every scrape
+                        request.
+                      properties:
+                        password:
+                          description: |-
+                            password defines a key of a Secret containing the password for
+                            authentication.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        username:
+                          description: |-
+                            username defines a key of a Secret containing the username for
+                            authentication.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                      type: object
+                    enableHTTP2:
+                      description: enableHTTP2 defines whether to enable HTTP2.
+                      type: boolean
+                    followRedirects:
+                      description: followRedirects defines whether HTTP requests follow
+                        HTTP 3xx redirects.
+                      type: boolean
+                    labelSelector:
+                      description: |-
+                        labelSelector defines the label selector used to filter the servers when fetching them from the API.
+                        It requires Prometheus >= v3.5.0.
+                      minLength: 1
+                      type: string
+                    noProxy:
+                      description: |-
+                        noProxy defines a comma-separated string that can contain IPs, CIDR notation, domain names
+                        that should be excluded from proxying. IP and domain names can
+                        contain port numbers.
+
+                        It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                      type: string
+                    oauth2:
+                      description: oauth2 defines the configuration to use on every
+                        scrape request.
+                      properties:
+                        clientId:
+                          description: |-
+                            clientId defines a key of a Secret or ConfigMap containing the
+                            OAuth2 client's ID.
+                          properties:
+                            configMap:
+                              description: configMap defines the ConfigMap containing
+                                data to use for the targets.
+                              properties:
+                                key:
+                                  description: The key to select.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the ConfigMap or its
+                                    key must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            secret:
+                              description: secret defines the Secret containing data
+                                to use for the targets.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                          type: object
+                        clientSecret:
+                          description: |-
+                            clientSecret defines a key of a Secret containing the OAuth2
+                            client's secret.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        endpointParams:
+                          additionalProperties:
+                            type: string
+                          description: |-
+                            endpointParams configures the HTTP parameters to append to the token
+                            URL.
+                          type: object
+                        noProxy:
+                          description: |-
+                            noProxy defines a comma-separated string that can contain IPs, CIDR notation, domain names
+                            that should be excluded from proxying. IP and domain names can
+                            contain port numbers.
+
+                            It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                          type: string
+                        proxyConnectHeader:
+                          additionalProperties:
+                            items:
+                              description: SecretKeySelector selects a key of a Secret.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            type: array
+                          description: |-
+                            proxyConnectHeader optionally specifies headers to send to
+                            proxies during CONNECT requests.
+
+                            It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        proxyFromEnvironment:
+                          description: |-
+                            proxyFromEnvironment defines whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+
+                            It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                          type: boolean
+                        proxyUrl:
+                          description: proxyUrl defines the HTTP proxy server to use.
+                          pattern: ^(http|https|socks5)://.+$
+                          type: string
+                        scopes:
+                          description: scopes defines the OAuth2 scopes used for the
+                            token request.
+                          items:
+                            type: string
+                          type: array
+                        tlsConfig:
+                          description: |-
+                            tlsConfig defines the TLS configuration to use when connecting to the OAuth2 server.
+                            It requires Prometheus >= v2.43.0.
+                          properties:
+                            ca:
+                              description: ca defines the Certificate authority used
+                                when verifying server certificates.
+                              properties:
+                                configMap:
+                                  description: configMap defines the ConfigMap containing
+                                    data to use for the targets.
+                                  properties:
+                                    key:
+                                      description: The key to select.
+                                      type: string
+                                    name:
+                                      default: ""
+                                      description: |-
+                                        Name of the referent.
+                                        This field is effectively required, but due to backwards compatibility is
+                                        allowed to be empty. Instances of this type with an empty value here are
+                                        almost certainly wrong.
+                                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                      type: string
+                                    optional:
+                                      description: Specify whether the ConfigMap or
+                                        its key must be defined
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                secret:
+                                  description: secret defines the Secret containing
+                                    data to use for the targets.
+                                  properties:
+                                    key:
+                                      description: The key of the secret to select
+                                        from.  Must be a valid secret key.
+                                      type: string
+                                    name:
+                                      default: ""
+                                      description: |-
+                                        Name of the referent.
+                                        This field is effectively required, but due to backwards compatibility is
+                                        allowed to be empty. Instances of this type with an empty value here are
+                                        almost certainly wrong.
+                                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                      type: string
+                                    optional:
+                                      description: Specify whether the Secret or its
+                                        key must be defined
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                              type: object
+                            cert:
+                              description: cert defines the Client certificate to
+                                present when doing client-authentication.
+                              properties:
+                                configMap:
+                                  description: configMap defines the ConfigMap containing
+                                    data to use for the targets.
+                                  properties:
+                                    key:
+                                      description: The key to select.
+                                      type: string
+                                    name:
+                                      default: ""
+                                      description: |-
+                                        Name of the referent.
+                                        This field is effectively required, but due to backwards compatibility is
+                                        allowed to be empty. Instances of this type with an empty value here are
+                                        almost certainly wrong.
+                                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                      type: string
+                                    optional:
+                                      description: Specify whether the ConfigMap or
+                                        its key must be defined
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                secret:
+                                  description: secret defines the Secret containing
+                                    data to use for the targets.
+                                  properties:
+                                    key:
+                                      description: The key of the secret to select
+                                        from.  Must be a valid secret key.
+                                      type: string
+                                    name:
+                                      default: ""
+                                      description: |-
+                                        Name of the referent.
+                                        This field is effectively required, but due to backwards compatibility is
+                                        allowed to be empty. Instances of this type with an empty value here are
+                                        almost certainly wrong.
+                                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                      type: string
+                                    optional:
+                                      description: Specify whether the Secret or its
+                                        key must be defined
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                              type: object
+                            insecureSkipVerify:
+                              description: insecureSkipVerify defines how to disable
+                                target certificate validation.
+                              type: boolean
+                            keySecret:
+                              description: keySecret defines the Secret containing
+                                the client key file for the targets.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            maxVersion:
+                              description: |-
+                                maxVersion defines the maximum acceptable TLS version.
+
+                                It requires Prometheus >= v2.41.0 or Thanos >= v0.31.0.
+                              enum:
+                              - TLS10
+                              - TLS11
+                              - TLS12
+                              - TLS13
+                              type: string
+                            minVersion:
+                              description: |-
+                                minVersion defines the minimum acceptable TLS version.
+
+                                It requires Prometheus >= v2.35.0 or Thanos >= v0.28.0.
+                              enum:
+                              - TLS10
+                              - TLS11
+                              - TLS12
+                              - TLS13
+                              type: string
+                            serverName:
+                              description: serverName is used to verify the hostname
+                                for the targets.
+                              type: string
+                          type: object
+                        tokenUrl:
+                          description: tokenUrl defines the URL to fetch the token
+                            from.
+                          minLength: 1
+                          type: string
+                      required:
+                      - clientId
+                      - clientSecret
+                      - tokenUrl
+                      type: object
+                    port:
+                      description: port defines the port to scrape metrics from. If
+                        using the public IP address, this must
+                      format: int32
+                      maximum: 65535
+                      minimum: 0
+                      type: integer
+                    proxyConnectHeader:
+                      additionalProperties:
+                        items:
+                          description: SecretKeySelector selects a key of a Secret.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        type: array
+                      description: |-
+                        proxyConnectHeader optionally specifies headers to send to
+                        proxies during CONNECT requests.
+
+                        It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                      type: object
+                      x-kubernetes-map-type: atomic
+                    proxyFromEnvironment:
+                      description: |-
+                        proxyFromEnvironment defines whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+
+                        It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                      type: boolean
+                    proxyUrl:
+                      description: proxyUrl defines the HTTP proxy server to use.
+                      pattern: ^(http|https|socks5)://.+$
+                      type: string
+                    refreshInterval:
+                      description: |-
+                        refreshInterval defines the time after which the provided names are refreshed.
+                        If not set, Prometheus uses its default value.
+                      pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
+                      type: string
+                    role:
+                      description: role defines the Hetzner role of entities that
+                        should be discovered.
+                      enum:
+                      - hcloud
+                      - Hcloud
+                      - robot
+                      - Robot
+                      type: string
+                    tlsConfig:
+                      description: tlsConfig defines the TLS configuration to connect
+                        to the Consul API.
+                      properties:
+                        ca:
+                          description: ca defines the Certificate authority used when
+                            verifying server certificates.
+                          properties:
+                            configMap:
+                              description: configMap defines the ConfigMap containing
+                                data to use for the targets.
+                              properties:
+                                key:
+                                  description: The key to select.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the ConfigMap or its
+                                    key must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            secret:
+                              description: secret defines the Secret containing data
+                                to use for the targets.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                          type: object
+                        cert:
+                          description: cert defines the Client certificate to present
+                            when doing client-authentication.
+                          properties:
+                            configMap:
+                              description: configMap defines the ConfigMap containing
+                                data to use for the targets.
+                              properties:
+                                key:
+                                  description: The key to select.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the ConfigMap or its
+                                    key must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            secret:
+                              description: secret defines the Secret containing data
+                                to use for the targets.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                          type: object
+                        insecureSkipVerify:
+                          description: insecureSkipVerify defines how to disable target
+                            certificate validation.
+                          type: boolean
+                        keySecret:
+                          description: keySecret defines the Secret containing the
+                            client key file for the targets.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        maxVersion:
+                          description: |-
+                            maxVersion defines the maximum acceptable TLS version.
+
+                            It requires Prometheus >= v2.41.0 or Thanos >= v0.31.0.
+                          enum:
+                          - TLS10
+                          - TLS11
+                          - TLS12
+                          - TLS13
+                          type: string
+                        minVersion:
+                          description: |-
+                            minVersion defines the minimum acceptable TLS version.
+
+                            It requires Prometheus >= v2.35.0 or Thanos >= v0.28.0.
+                          enum:
+                          - TLS10
+                          - TLS11
+                          - TLS12
+                          - TLS13
+                          type: string
+                        serverName:
+                          description: serverName is used to verify the hostname for
+                            the targets.
+                          type: string
+                      type: object
+                  required:
+                  - role
+                  type: object
+                type: array
+              honorLabels:
+                description: |-
+                  honorLabels defines when true the metric's labels when they collide
+                  with the target's labels.
+                type: boolean
+              honorTimestamps:
+                description: |-
+                  honorTimestamps defines whether Prometheus preserves the timestamps
+                  when exposed by the target.
+                type: boolean
+              httpSDConfigs:
+                description: httpSDConfigs defines a list of HTTP service discovery
+                  configurations.
+                items:
+                  description: |-
+                    HTTPSDConfig defines a prometheus HTTP service discovery configuration
+                    See https://prometheus.io/docs/prometheus/latest/configuration/configuration/#http_sd_config
+                  properties:
+                    authorization:
+                      description: |-
+                        authorization defines the authorization header configuration to authenticate against the target HTTP endpoint.
+                        Cannot be set at the same time as `oAuth2`, or `basicAuth`.
+                      properties:
+                        credentials:
+                          description: credentials defines a key of a Secret in the
+                            namespace that contains the credentials for authentication.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        type:
+                          description: |-
+                            type defines the authentication type. The value is case-insensitive.
+
+                            "Basic" is not a supported value.
+
+                            Default: "Bearer"
+                          type: string
+                      type: object
+                    basicAuth:
+                      description: |-
+                        basicAuth defines information to use on every scrape request.
+                        More info: https://prometheus.io/docs/operating/configuration/#endpoints
+                        Cannot be set at the same time as `authorization`, or `oAuth2`.
+                      properties:
+                        password:
+                          description: |-
+                            password defines a key of a Secret containing the password for
+                            authentication.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        username:
+                          description: |-
+                            username defines a key of a Secret containing the username for
+                            authentication.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                      type: object
+                    enableHTTP2:
+                      description: enableHTTP2 defines whether to enable HTTP2.
+                      type: boolean
+                    followRedirects:
+                      description: followRedirects defines whether HTTP requests follow
+                        HTTP 3xx redirects.
+                      type: boolean
+                    noProxy:
+                      description: |-
+                        noProxy defines a comma-separated string that can contain IPs, CIDR notation, domain names
+                        that should be excluded from proxying. IP and domain names can
+                        contain port numbers.
+
+                        It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                      type: string
+                    oauth2:
+                      description: |-
+                        oauth2 defines the optional OAuth 2.0 configuration to authenticate against the target HTTP endpoint.
+                        Cannot be set at the same time as `authorization`, or `basicAuth`.
+                      properties:
+                        clientId:
+                          description: |-
+                            clientId defines a key of a Secret or ConfigMap containing the
+                            OAuth2 client's ID.
+                          properties:
+                            configMap:
+                              description: configMap defines the ConfigMap containing
+                                data to use for the targets.
+                              properties:
+                                key:
+                                  description: The key to select.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the ConfigMap or its
+                                    key must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            secret:
+                              description: secret defines the Secret containing data
+                                to use for the targets.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                          type: object
+                        clientSecret:
+                          description: |-
+                            clientSecret defines a key of a Secret containing the OAuth2
+                            client's secret.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        endpointParams:
+                          additionalProperties:
+                            type: string
+                          description: |-
+                            endpointParams configures the HTTP parameters to append to the token
+                            URL.
+                          type: object
+                        noProxy:
+                          description: |-
+                            noProxy defines a comma-separated string that can contain IPs, CIDR notation, domain names
+                            that should be excluded from proxying. IP and domain names can
+                            contain port numbers.
+
+                            It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                          type: string
+                        proxyConnectHeader:
+                          additionalProperties:
+                            items:
+                              description: SecretKeySelector selects a key of a Secret.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            type: array
+                          description: |-
+                            proxyConnectHeader optionally specifies headers to send to
+                            proxies during CONNECT requests.
+
+                            It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        proxyFromEnvironment:
+                          description: |-
+                            proxyFromEnvironment defines whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+
+                            It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                          type: boolean
+                        proxyUrl:
+                          description: proxyUrl defines the HTTP proxy server to use.
+                          pattern: ^(http|https|socks5)://.+$
+                          type: string
+                        scopes:
+                          description: scopes defines the OAuth2 scopes used for the
+                            token request.
+                          items:
+                            type: string
+                          type: array
+                        tlsConfig:
+                          description: |-
+                            tlsConfig defines the TLS configuration to use when connecting to the OAuth2 server.
+                            It requires Prometheus >= v2.43.0.
+                          properties:
+                            ca:
+                              description: ca defines the Certificate authority used
+                                when verifying server certificates.
+                              properties:
+                                configMap:
+                                  description: configMap defines the ConfigMap containing
+                                    data to use for the targets.
+                                  properties:
+                                    key:
+                                      description: The key to select.
+                                      type: string
+                                    name:
+                                      default: ""
+                                      description: |-
+                                        Name of the referent.
+                                        This field is effectively required, but due to backwards compatibility is
+                                        allowed to be empty. Instances of this type with an empty value here are
+                                        almost certainly wrong.
+                                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                      type: string
+                                    optional:
+                                      description: Specify whether the ConfigMap or
+                                        its key must be defined
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                secret:
+                                  description: secret defines the Secret containing
+                                    data to use for the targets.
+                                  properties:
+                                    key:
+                                      description: The key of the secret to select
+                                        from.  Must be a valid secret key.
+                                      type: string
+                                    name:
+                                      default: ""
+                                      description: |-
+                                        Name of the referent.
+                                        This field is effectively required, but due to backwards compatibility is
+                                        allowed to be empty. Instances of this type with an empty value here are
+                                        almost certainly wrong.
+                                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                      type: string
+                                    optional:
+                                      description: Specify whether the Secret or its
+                                        key must be defined
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                              type: object
+                            cert:
+                              description: cert defines the Client certificate to
+                                present when doing client-authentication.
+                              properties:
+                                configMap:
+                                  description: configMap defines the ConfigMap containing
+                                    data to use for the targets.
+                                  properties:
+                                    key:
+                                      description: The key to select.
+                                      type: string
+                                    name:
+                                      default: ""
+                                      description: |-
+                                        Name of the referent.
+                                        This field is effectively required, but due to backwards compatibility is
+                                        allowed to be empty. Instances of this type with an empty value here are
+                                        almost certainly wrong.
+                                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                      type: string
+                                    optional:
+                                      description: Specify whether the ConfigMap or
+                                        its key must be defined
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                secret:
+                                  description: secret defines the Secret containing
+                                    data to use for the targets.
+                                  properties:
+                                    key:
+                                      description: The key of the secret to select
+                                        from.  Must be a valid secret key.
+                                      type: string
+                                    name:
+                                      default: ""
+                                      description: |-
+                                        Name of the referent.
+                                        This field is effectively required, but due to backwards compatibility is
+                                        allowed to be empty. Instances of this type with an empty value here are
+                                        almost certainly wrong.
+                                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                      type: string
+                                    optional:
+                                      description: Specify whether the Secret or its
+                                        key must be defined
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                              type: object
+                            insecureSkipVerify:
+                              description: insecureSkipVerify defines how to disable
+                                target certificate validation.
+                              type: boolean
+                            keySecret:
+                              description: keySecret defines the Secret containing
+                                the client key file for the targets.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            maxVersion:
+                              description: |-
+                                maxVersion defines the maximum acceptable TLS version.
+
+                                It requires Prometheus >= v2.41.0 or Thanos >= v0.31.0.
+                              enum:
+                              - TLS10
+                              - TLS11
+                              - TLS12
+                              - TLS13
+                              type: string
+                            minVersion:
+                              description: |-
+                                minVersion defines the minimum acceptable TLS version.
+
+                                It requires Prometheus >= v2.35.0 or Thanos >= v0.28.0.
+                              enum:
+                              - TLS10
+                              - TLS11
+                              - TLS12
+                              - TLS13
+                              type: string
+                            serverName:
+                              description: serverName is used to verify the hostname
+                                for the targets.
+                              type: string
+                          type: object
+                        tokenUrl:
+                          description: tokenUrl defines the URL to fetch the token
+                            from.
+                          minLength: 1
+                          type: string
+                      required:
+                      - clientId
+                      - clientSecret
+                      - tokenUrl
+                      type: object
+                    proxyConnectHeader:
+                      additionalProperties:
+                        items:
+                          description: SecretKeySelector selects a key of a Secret.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        type: array
+                      description: |-
+                        proxyConnectHeader optionally specifies headers to send to
+                        proxies during CONNECT requests.
+
+                        It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                      type: object
+                      x-kubernetes-map-type: atomic
+                    proxyFromEnvironment:
+                      description: |-
+                        proxyFromEnvironment defines whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+
+                        It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                      type: boolean
+                    proxyUrl:
+                      description: proxyUrl defines the HTTP proxy server to use.
+                      pattern: ^(http|https|socks5)://.+$
+                      type: string
+                    refreshInterval:
+                      description: |-
+                        refreshInterval defines the time after which the provided names are refreshed.
+                        If not set, Prometheus uses its default value.
+                      pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
+                      type: string
+                    tlsConfig:
+                      description: tlsConfig defines the TLS configuration applying
+                        to the target HTTP endpoint.
+                      properties:
+                        ca:
+                          description: ca defines the Certificate authority used when
+                            verifying server certificates.
+                          properties:
+                            configMap:
+                              description: configMap defines the ConfigMap containing
+                                data to use for the targets.
+                              properties:
+                                key:
+                                  description: The key to select.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the ConfigMap or its
+                                    key must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            secret:
+                              description: secret defines the Secret containing data
+                                to use for the targets.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                          type: object
+                        cert:
+                          description: cert defines the Client certificate to present
+                            when doing client-authentication.
+                          properties:
+                            configMap:
+                              description: configMap defines the ConfigMap containing
+                                data to use for the targets.
+                              properties:
+                                key:
+                                  description: The key to select.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the ConfigMap or its
+                                    key must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            secret:
+                              description: secret defines the Secret containing data
+                                to use for the targets.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                          type: object
+                        insecureSkipVerify:
+                          description: insecureSkipVerify defines how to disable target
+                            certificate validation.
+                          type: boolean
+                        keySecret:
+                          description: keySecret defines the Secret containing the
+                            client key file for the targets.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        maxVersion:
+                          description: |-
+                            maxVersion defines the maximum acceptable TLS version.
+
+                            It requires Prometheus >= v2.41.0 or Thanos >= v0.31.0.
+                          enum:
+                          - TLS10
+                          - TLS11
+                          - TLS12
+                          - TLS13
+                          type: string
+                        minVersion:
+                          description: |-
+                            minVersion defines the minimum acceptable TLS version.
+
+                            It requires Prometheus >= v2.35.0 or Thanos >= v0.28.0.
+                          enum:
+                          - TLS10
+                          - TLS11
+                          - TLS12
+                          - TLS13
+                          type: string
+                        serverName:
+                          description: serverName is used to verify the hostname for
+                            the targets.
+                          type: string
+                      type: object
+                    url:
+                      description: url defines the URL from which the targets are
+                        fetched.
+                      minLength: 1
+                      pattern: ^http(s)?://.+$
+                      type: string
+                  required:
+                  - url
+                  type: object
+                type: array
+              ionosSDConfigs:
+                description: ionosSDConfigs defines a list of IONOS service discovery
+                  configurations.
+                items:
+                  description: |-
+                    IonosSDConfig configurations allow retrieving scrape targets from IONOS resources.
+                    See https://prometheus.io/docs/prometheus/latest/configuration/configuration/#ionos_sd_config
+                  properties:
+                    authorization:
+                      description: |-
+                        authorization defines the  header configuration to authenticate against the IONOS.
+                        Cannot be set at the same time as `oauth2`.
+                      properties:
+                        credentials:
+                          description: credentials defines a key of a Secret in the
+                            namespace that contains the credentials for authentication.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        type:
+                          description: |-
+                            type defines the authentication type. The value is case-insensitive.
+
+                            "Basic" is not a supported value.
+
+                            Default: "Bearer"
+                          type: string
+                      type: object
+                    datacenterID:
+                      description: datacenterID defines the unique ID of the IONOS
+                        data center.
+                      minLength: 1
+                      type: string
+                    enableHTTP2:
+                      description: enableHTTP2 defines whether to enable HTTP2.
+                      type: boolean
+                    followRedirects:
+                      description: followRedirects defines whether HTTP requests follow
+                        HTTP 3xx redirects.
+                      type: boolean
+                    noProxy:
+                      description: |-
+                        noProxy defines a comma-separated string that can contain IPs, CIDR notation, domain names
+                        that should be excluded from proxying. IP and domain names can
+                        contain port numbers.
+
+                        It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                      type: string
+                    oauth2:
+                      description: oauth2 defines the configuration to use on every
+                        scrape request.
+                      properties:
+                        clientId:
+                          description: |-
+                            clientId defines a key of a Secret or ConfigMap containing the
+                            OAuth2 client's ID.
+                          properties:
+                            configMap:
+                              description: configMap defines the ConfigMap containing
+                                data to use for the targets.
+                              properties:
+                                key:
+                                  description: The key to select.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the ConfigMap or its
+                                    key must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            secret:
+                              description: secret defines the Secret containing data
+                                to use for the targets.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                          type: object
+                        clientSecret:
+                          description: |-
+                            clientSecret defines a key of a Secret containing the OAuth2
+                            client's secret.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        endpointParams:
+                          additionalProperties:
+                            type: string
+                          description: |-
+                            endpointParams configures the HTTP parameters to append to the token
+                            URL.
+                          type: object
+                        noProxy:
+                          description: |-
+                            noProxy defines a comma-separated string that can contain IPs, CIDR notation, domain names
+                            that should be excluded from proxying. IP and domain names can
+                            contain port numbers.
+
+                            It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                          type: string
+                        proxyConnectHeader:
+                          additionalProperties:
+                            items:
+                              description: SecretKeySelector selects a key of a Secret.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            type: array
+                          description: |-
+                            proxyConnectHeader optionally specifies headers to send to
+                            proxies during CONNECT requests.
+
+                            It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        proxyFromEnvironment:
+                          description: |-
+                            proxyFromEnvironment defines whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+
+                            It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                          type: boolean
+                        proxyUrl:
+                          description: proxyUrl defines the HTTP proxy server to use.
+                          pattern: ^(http|https|socks5)://.+$
+                          type: string
+                        scopes:
+                          description: scopes defines the OAuth2 scopes used for the
+                            token request.
+                          items:
+                            type: string
+                          type: array
+                        tlsConfig:
+                          description: |-
+                            tlsConfig defines the TLS configuration to use when connecting to the OAuth2 server.
+                            It requires Prometheus >= v2.43.0.
+                          properties:
+                            ca:
+                              description: ca defines the Certificate authority used
+                                when verifying server certificates.
+                              properties:
+                                configMap:
+                                  description: configMap defines the ConfigMap containing
+                                    data to use for the targets.
+                                  properties:
+                                    key:
+                                      description: The key to select.
+                                      type: string
+                                    name:
+                                      default: ""
+                                      description: |-
+                                        Name of the referent.
+                                        This field is effectively required, but due to backwards compatibility is
+                                        allowed to be empty. Instances of this type with an empty value here are
+                                        almost certainly wrong.
+                                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                      type: string
+                                    optional:
+                                      description: Specify whether the ConfigMap or
+                                        its key must be defined
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                secret:
+                                  description: secret defines the Secret containing
+                                    data to use for the targets.
+                                  properties:
+                                    key:
+                                      description: The key of the secret to select
+                                        from.  Must be a valid secret key.
+                                      type: string
+                                    name:
+                                      default: ""
+                                      description: |-
+                                        Name of the referent.
+                                        This field is effectively required, but due to backwards compatibility is
+                                        allowed to be empty. Instances of this type with an empty value here are
+                                        almost certainly wrong.
+                                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                      type: string
+                                    optional:
+                                      description: Specify whether the Secret or its
+                                        key must be defined
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                              type: object
+                            cert:
+                              description: cert defines the Client certificate to
+                                present when doing client-authentication.
+                              properties:
+                                configMap:
+                                  description: configMap defines the ConfigMap containing
+                                    data to use for the targets.
+                                  properties:
+                                    key:
+                                      description: The key to select.
+                                      type: string
+                                    name:
+                                      default: ""
+                                      description: |-
+                                        Name of the referent.
+                                        This field is effectively required, but due to backwards compatibility is
+                                        allowed to be empty. Instances of this type with an empty value here are
+                                        almost certainly wrong.
+                                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                      type: string
+                                    optional:
+                                      description: Specify whether the ConfigMap or
+                                        its key must be defined
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                secret:
+                                  description: secret defines the Secret containing
+                                    data to use for the targets.
+                                  properties:
+                                    key:
+                                      description: The key of the secret to select
+                                        from.  Must be a valid secret key.
+                                      type: string
+                                    name:
+                                      default: ""
+                                      description: |-
+                                        Name of the referent.
+                                        This field is effectively required, but due to backwards compatibility is
+                                        allowed to be empty. Instances of this type with an empty value here are
+                                        almost certainly wrong.
+                                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                      type: string
+                                    optional:
+                                      description: Specify whether the Secret or its
+                                        key must be defined
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                              type: object
+                            insecureSkipVerify:
+                              description: insecureSkipVerify defines how to disable
+                                target certificate validation.
+                              type: boolean
+                            keySecret:
+                              description: keySecret defines the Secret containing
+                                the client key file for the targets.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            maxVersion:
+                              description: |-
+                                maxVersion defines the maximum acceptable TLS version.
+
+                                It requires Prometheus >= v2.41.0 or Thanos >= v0.31.0.
+                              enum:
+                              - TLS10
+                              - TLS11
+                              - TLS12
+                              - TLS13
+                              type: string
+                            minVersion:
+                              description: |-
+                                minVersion defines the minimum acceptable TLS version.
+
+                                It requires Prometheus >= v2.35.0 or Thanos >= v0.28.0.
+                              enum:
+                              - TLS10
+                              - TLS11
+                              - TLS12
+                              - TLS13
+                              type: string
+                            serverName:
+                              description: serverName is used to verify the hostname
+                                for the targets.
+                              type: string
+                          type: object
+                        tokenUrl:
+                          description: tokenUrl defines the URL to fetch the token
+                            from.
+                          minLength: 1
+                          type: string
+                      required:
+                      - clientId
+                      - clientSecret
+                      - tokenUrl
+                      type: object
+                    port:
+                      description: port defines the port to scrape metrics from. If
+                        using the public IP address, this must
+                      format: int32
+                      maximum: 65535
+                      minimum: 0
+                      type: integer
+                    proxyConnectHeader:
+                      additionalProperties:
+                        items:
+                          description: SecretKeySelector selects a key of a Secret.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        type: array
+                      description: |-
+                        proxyConnectHeader optionally specifies headers to send to
+                        proxies during CONNECT requests.
+
+                        It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                      type: object
+                      x-kubernetes-map-type: atomic
+                    proxyFromEnvironment:
+                      description: |-
+                        proxyFromEnvironment defines whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+
+                        It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                      type: boolean
+                    proxyUrl:
+                      description: proxyUrl defines the HTTP proxy server to use.
+                      pattern: ^(http|https|socks5)://.+$
+                      type: string
+                    refreshInterval:
+                      description: |-
+                        refreshInterval defines the time after which the provided names are refreshed.
+                        If not set, Prometheus uses its default value.
+                      pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
+                      type: string
+                    tlsConfig:
+                      description: tlsConfig defines the TLS configuration to connect
+                        to the Consul API.
+                      properties:
+                        ca:
+                          description: ca defines the Certificate authority used when
+                            verifying server certificates.
+                          properties:
+                            configMap:
+                              description: configMap defines the ConfigMap containing
+                                data to use for the targets.
+                              properties:
+                                key:
+                                  description: The key to select.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the ConfigMap or its
+                                    key must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            secret:
+                              description: secret defines the Secret containing data
+                                to use for the targets.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                          type: object
+                        cert:
+                          description: cert defines the Client certificate to present
+                            when doing client-authentication.
+                          properties:
+                            configMap:
+                              description: configMap defines the ConfigMap containing
+                                data to use for the targets.
+                              properties:
+                                key:
+                                  description: The key to select.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the ConfigMap or its
+                                    key must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            secret:
+                              description: secret defines the Secret containing data
+                                to use for the targets.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                          type: object
+                        insecureSkipVerify:
+                          description: insecureSkipVerify defines how to disable target
+                            certificate validation.
+                          type: boolean
+                        keySecret:
+                          description: keySecret defines the Secret containing the
+                            client key file for the targets.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        maxVersion:
+                          description: |-
+                            maxVersion defines the maximum acceptable TLS version.
+
+                            It requires Prometheus >= v2.41.0 or Thanos >= v0.31.0.
+                          enum:
+                          - TLS10
+                          - TLS11
+                          - TLS12
+                          - TLS13
+                          type: string
+                        minVersion:
+                          description: |-
+                            minVersion defines the minimum acceptable TLS version.
+
+                            It requires Prometheus >= v2.35.0 or Thanos >= v0.28.0.
+                          enum:
+                          - TLS10
+                          - TLS11
+                          - TLS12
+                          - TLS13
+                          type: string
+                        serverName:
+                          description: serverName is used to verify the hostname for
+                            the targets.
+                          type: string
+                      type: object
+                  required:
+                  - authorization
+                  - datacenterID
+                  type: object
+                type: array
+              jobName:
+                description: |-
+                  jobName defines the value of the `job` label assigned to the scraped metrics by default.
+
+                  The `job_name` field in the rendered scrape configuration is always controlled by the
+                  operator to prevent duplicate job names, which Prometheus does not allow. Instead the
+                  `job` label is set by means of relabeling configs.
+                minLength: 1
+                type: string
+              keepDroppedTargets:
+                description: |-
+                  keepDroppedTargets defines the per-scrape limit on the number of targets dropped by relabeling
+                  that will be kept in memory. 0 means no limit.
+
+                  It requires Prometheus >= v2.47.0.
+                format: int64
+                type: integer
+              kubernetesSDConfigs:
+                description: kubernetesSDConfigs defines a list of Kubernetes service
+                  discovery configurations.
+                items:
+                  description: |-
+                    KubernetesSDConfig allows retrieving scrape targets from Kubernetes' REST API.
+                    See https://prometheus.io/docs/prometheus/latest/configuration/configuration/#kubernetes_sd_config
+                  properties:
+                    apiServer:
+                      description: |-
+                        apiServer defines the API server address consisting of a hostname or IP address followed
+                        by an optional port number.
+                        If left empty, Prometheus is assumed to run inside
+                        of the cluster. It will discover API servers automatically and use the pod's
+                        CA certificate and bearer token file at /var/run/secrets/kubernetes.io/serviceaccount/.
+                      minLength: 1
+                      type: string
+                    attachMetadata:
+                      description: |-
+                        attachMetadata defines the metadata to attach to discovered targets.
+                        It requires Prometheus >= v2.35.0 when using the `Pod` role and
+                        Prometheus >= v2.37.0 for `Endpoints` and `Endpointslice` roles.
+                      properties:
+                        node:
+                          description: |-
+                            node attaches node metadata to discovered targets.
+                            When set to true, Prometheus must have the `get` permission on the
+                            `Nodes` objects.
+                            Only valid for Pod, Endpoint and Endpointslice roles.
+                          type: boolean
+                      type: object
+                    authorization:
+                      description: |-
+                        authorization defines the authorization header to use on every scrape request.
+                        Cannot be set at the same time as `basicAuth`, or `oauth2`.
+                      properties:
+                        credentials:
+                          description: credentials defines a key of a Secret in the
+                            namespace that contains the credentials for authentication.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        type:
+                          description: |-
+                            type defines the authentication type. The value is case-insensitive.
+
+                            "Basic" is not a supported value.
+
+                            Default: "Bearer"
+                          type: string
+                      type: object
+                    basicAuth:
+                      description: |-
+                        basicAuth defines information to use on every scrape request.
+                        Cannot be set at the same time as `authorization`, or `oauth2`.
+                      properties:
+                        password:
+                          description: |-
+                            password defines a key of a Secret containing the password for
+                            authentication.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        username:
+                          description: |-
+                            username defines a key of a Secret containing the username for
+                            authentication.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                      type: object
+                    enableHTTP2:
+                      description: enableHTTP2 defines whether to enable HTTP2.
+                      type: boolean
+                    followRedirects:
+                      description: followRedirects defines whether HTTP requests follow
+                        HTTP 3xx redirects.
+                      type: boolean
+                    namespaces:
+                      description: namespaces defines the namespace discovery. If
+                        omitted, Prometheus discovers targets across all namespaces.
+                      properties:
+                        names:
+                          description: |-
+                            names defines a list of namespaces where to watch for resources.
+                            If empty and `ownNamespace` isn't true, Prometheus watches for resources in all namespaces.
+                          items:
+                            type: string
+                          type: array
+                          x-kubernetes-list-type: set
+                        ownNamespace:
+                          description: ownNamespace includes the namespace in which
+                            the Prometheus pod runs to the list of watched namespaces.
+                          type: boolean
+                      type: object
+                    noProxy:
+                      description: |-
+                        noProxy defines a comma-separated string that can contain IPs, CIDR notation, domain names
+                        that should be excluded from proxying. IP and domain names can
+                        contain port numbers.
+
+                        It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                      type: string
+                    oauth2:
+                      description: |-
+                        oauth2 defines the optional OAuth 2.0 configuration to authenticate against the target HTTP endpoint.
+                        Cannot be set at the same time as `authorization`, or `basicAuth`.
+                      properties:
+                        clientId:
+                          description: |-
+                            clientId defines a key of a Secret or ConfigMap containing the
+                            OAuth2 client's ID.
+                          properties:
+                            configMap:
+                              description: configMap defines the ConfigMap containing
+                                data to use for the targets.
+                              properties:
+                                key:
+                                  description: The key to select.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the ConfigMap or its
+                                    key must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            secret:
+                              description: secret defines the Secret containing data
+                                to use for the targets.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                          type: object
+                        clientSecret:
+                          description: |-
+                            clientSecret defines a key of a Secret containing the OAuth2
+                            client's secret.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        endpointParams:
+                          additionalProperties:
+                            type: string
+                          description: |-
+                            endpointParams configures the HTTP parameters to append to the token
+                            URL.
+                          type: object
+                        noProxy:
+                          description: |-
+                            noProxy defines a comma-separated string that can contain IPs, CIDR notation, domain names
+                            that should be excluded from proxying. IP and domain names can
+                            contain port numbers.
+
+                            It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                          type: string
+                        proxyConnectHeader:
+                          additionalProperties:
+                            items:
+                              description: SecretKeySelector selects a key of a Secret.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            type: array
+                          description: |-
+                            proxyConnectHeader optionally specifies headers to send to
+                            proxies during CONNECT requests.
+
+                            It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        proxyFromEnvironment:
+                          description: |-
+                            proxyFromEnvironment defines whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+
+                            It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                          type: boolean
+                        proxyUrl:
+                          description: proxyUrl defines the HTTP proxy server to use.
+                          pattern: ^(http|https|socks5)://.+$
+                          type: string
+                        scopes:
+                          description: scopes defines the OAuth2 scopes used for the
+                            token request.
+                          items:
+                            type: string
+                          type: array
+                        tlsConfig:
+                          description: |-
+                            tlsConfig defines the TLS configuration to use when connecting to the OAuth2 server.
+                            It requires Prometheus >= v2.43.0.
+                          properties:
+                            ca:
+                              description: ca defines the Certificate authority used
+                                when verifying server certificates.
+                              properties:
+                                configMap:
+                                  description: configMap defines the ConfigMap containing
+                                    data to use for the targets.
+                                  properties:
+                                    key:
+                                      description: The key to select.
+                                      type: string
+                                    name:
+                                      default: ""
+                                      description: |-
+                                        Name of the referent.
+                                        This field is effectively required, but due to backwards compatibility is
+                                        allowed to be empty. Instances of this type with an empty value here are
+                                        almost certainly wrong.
+                                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                      type: string
+                                    optional:
+                                      description: Specify whether the ConfigMap or
+                                        its key must be defined
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                secret:
+                                  description: secret defines the Secret containing
+                                    data to use for the targets.
+                                  properties:
+                                    key:
+                                      description: The key of the secret to select
+                                        from.  Must be a valid secret key.
+                                      type: string
+                                    name:
+                                      default: ""
+                                      description: |-
+                                        Name of the referent.
+                                        This field is effectively required, but due to backwards compatibility is
+                                        allowed to be empty. Instances of this type with an empty value here are
+                                        almost certainly wrong.
+                                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                      type: string
+                                    optional:
+                                      description: Specify whether the Secret or its
+                                        key must be defined
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                              type: object
+                            cert:
+                              description: cert defines the Client certificate to
+                                present when doing client-authentication.
+                              properties:
+                                configMap:
+                                  description: configMap defines the ConfigMap containing
+                                    data to use for the targets.
+                                  properties:
+                                    key:
+                                      description: The key to select.
+                                      type: string
+                                    name:
+                                      default: ""
+                                      description: |-
+                                        Name of the referent.
+                                        This field is effectively required, but due to backwards compatibility is
+                                        allowed to be empty. Instances of this type with an empty value here are
+                                        almost certainly wrong.
+                                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                      type: string
+                                    optional:
+                                      description: Specify whether the ConfigMap or
+                                        its key must be defined
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                secret:
+                                  description: secret defines the Secret containing
+                                    data to use for the targets.
+                                  properties:
+                                    key:
+                                      description: The key of the secret to select
+                                        from.  Must be a valid secret key.
+                                      type: string
+                                    name:
+                                      default: ""
+                                      description: |-
+                                        Name of the referent.
+                                        This field is effectively required, but due to backwards compatibility is
+                                        allowed to be empty. Instances of this type with an empty value here are
+                                        almost certainly wrong.
+                                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                      type: string
+                                    optional:
+                                      description: Specify whether the Secret or its
+                                        key must be defined
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                              type: object
+                            insecureSkipVerify:
+                              description: insecureSkipVerify defines how to disable
+                                target certificate validation.
+                              type: boolean
+                            keySecret:
+                              description: keySecret defines the Secret containing
+                                the client key file for the targets.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            maxVersion:
+                              description: |-
+                                maxVersion defines the maximum acceptable TLS version.
+
+                                It requires Prometheus >= v2.41.0 or Thanos >= v0.31.0.
+                              enum:
+                              - TLS10
+                              - TLS11
+                              - TLS12
+                              - TLS13
+                              type: string
+                            minVersion:
+                              description: |-
+                                minVersion defines the minimum acceptable TLS version.
+
+                                It requires Prometheus >= v2.35.0 or Thanos >= v0.28.0.
+                              enum:
+                              - TLS10
+                              - TLS11
+                              - TLS12
+                              - TLS13
+                              type: string
+                            serverName:
+                              description: serverName is used to verify the hostname
+                                for the targets.
+                              type: string
+                          type: object
+                        tokenUrl:
+                          description: tokenUrl defines the URL to fetch the token
+                            from.
+                          minLength: 1
+                          type: string
+                      required:
+                      - clientId
+                      - clientSecret
+                      - tokenUrl
+                      type: object
+                    proxyConnectHeader:
+                      additionalProperties:
+                        items:
+                          description: SecretKeySelector selects a key of a Secret.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        type: array
+                      description: |-
+                        proxyConnectHeader optionally specifies headers to send to
+                        proxies during CONNECT requests.
+
+                        It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                      type: object
+                      x-kubernetes-map-type: atomic
+                    proxyFromEnvironment:
+                      description: |-
+                        proxyFromEnvironment defines whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+
+                        It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                      type: boolean
+                    proxyUrl:
+                      description: proxyUrl defines the HTTP proxy server to use.
+                      pattern: ^(http|https|socks5)://.+$
+                      type: string
+                    role:
+                      description: |-
+                        role defines the Kubernetes role of the entities that should be discovered.
+                        Role `Endpointslice` requires Prometheus >= v2.21.0
+                      enum:
+                      - Pod
+                      - Endpoints
+                      - Ingress
+                      - Service
+                      - Node
+                      - EndpointSlice
+                      type: string
+                    selectors:
+                      description: |-
+                        selectors defines the selector to select objects.
+                        It requires Prometheus >= v2.17.0
+                      items:
+                        description: K8SSelectorConfig is Kubernetes Selector Config
+                        properties:
+                          field:
+                            description: |-
+                              field defines an optional field selector to limit the service discovery to resources which have fields with specific values.
+                              e.g: `metadata.name=foobar`
+                            minLength: 1
+                            type: string
+                          label:
+                            description: |-
+                              label defines an optional label selector to limit the service discovery to resources with specific labels and label values.
+                              e.g: `node.kubernetes.io/instance-type=master`
+                            minLength: 1
+                            type: string
+                          role:
+                            description: |-
+                              role defines the type of Kubernetes resource to limit the service discovery to.
+                              Accepted values are: Node, Pod, Endpoints, EndpointSlice, Service, Ingress.
+                            enum:
+                            - Pod
+                            - Endpoints
+                            - Ingress
+                            - Service
+                            - Node
+                            - EndpointSlice
+                            type: string
+                        required:
+                        - role
+                        type: object
+                      type: array
+                      x-kubernetes-list-map-keys:
+                      - role
+                      x-kubernetes-list-type: map
+                    tlsConfig:
+                      description: tlsConfig defines the TLS configuration to connect
+                        to the Kubernetes API.
+                      properties:
+                        ca:
+                          description: ca defines the Certificate authority used when
+                            verifying server certificates.
+                          properties:
+                            configMap:
+                              description: configMap defines the ConfigMap containing
+                                data to use for the targets.
+                              properties:
+                                key:
+                                  description: The key to select.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the ConfigMap or its
+                                    key must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            secret:
+                              description: secret defines the Secret containing data
+                                to use for the targets.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                          type: object
+                        cert:
+                          description: cert defines the Client certificate to present
+                            when doing client-authentication.
+                          properties:
+                            configMap:
+                              description: configMap defines the ConfigMap containing
+                                data to use for the targets.
+                              properties:
+                                key:
+                                  description: The key to select.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the ConfigMap or its
+                                    key must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            secret:
+                              description: secret defines the Secret containing data
+                                to use for the targets.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                          type: object
+                        insecureSkipVerify:
+                          description: insecureSkipVerify defines how to disable target
+                            certificate validation.
+                          type: boolean
+                        keySecret:
+                          description: keySecret defines the Secret containing the
+                            client key file for the targets.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        maxVersion:
+                          description: |-
+                            maxVersion defines the maximum acceptable TLS version.
+
+                            It requires Prometheus >= v2.41.0 or Thanos >= v0.31.0.
+                          enum:
+                          - TLS10
+                          - TLS11
+                          - TLS12
+                          - TLS13
+                          type: string
+                        minVersion:
+                          description: |-
+                            minVersion defines the minimum acceptable TLS version.
+
+                            It requires Prometheus >= v2.35.0 or Thanos >= v0.28.0.
+                          enum:
+                          - TLS10
+                          - TLS11
+                          - TLS12
+                          - TLS13
+                          type: string
+                        serverName:
+                          description: serverName is used to verify the hostname for
+                            the targets.
+                          type: string
+                      type: object
+                  required:
+                  - role
+                  type: object
+                type: array
+              kumaSDConfigs:
+                description: kumaSDConfigs defines a list of Kuma service discovery
+                  configurations.
+                items:
+                  description: |-
+                    KumaSDConfig allow retrieving scrape targets from Kuma's control plane.
+                    See https://prometheus.io/docs/prometheus/latest/configuration/configuration/#kuma_sd_config
+                  properties:
+                    authorization:
+                      description: |-
+                        authorization defines the  header configuration to authenticate against the DigitalOcean API.
+                        Cannot be set at the same time as `oauth2`.
+                      properties:
+                        credentials:
+                          description: credentials defines a key of a Secret in the
+                            namespace that contains the credentials for authentication.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        type:
+                          description: |-
+                            type defines the authentication type. The value is case-insensitive.
+
+                            "Basic" is not a supported value.
+
+                            Default: "Bearer"
+                          type: string
+                      type: object
+                    basicAuth:
+                      description: basicAuth defines information to use on every scrape
+                        request.
+                      properties:
+                        password:
+                          description: |-
+                            password defines a key of a Secret containing the password for
+                            authentication.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        username:
+                          description: |-
+                            username defines a key of a Secret containing the username for
+                            authentication.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                      type: object
+                    clientID:
+                      description: |-
+                        clientID is used by Kuma Control Plane to compute Monitoring Assignment for specific Prometheus backend.
+                        It requires Prometheus >= v2.50.0.
+                      minLength: 1
+                      type: string
+                    enableHTTP2:
+                      description: enableHTTP2 defines whether to enable HTTP2.
+                      type: boolean
+                    fetchTimeout:
+                      description: fetchTimeout defines the time after which the monitoring
+                        assignments are refreshed.
+                      pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
+                      type: string
+                    followRedirects:
+                      description: followRedirects defines whether HTTP requests follow
+                        HTTP 3xx redirects.
+                      type: boolean
+                    noProxy:
+                      description: |-
+                        noProxy defines a comma-separated string that can contain IPs, CIDR notation, domain names
+                        that should be excluded from proxying. IP and domain names can
+                        contain port numbers.
+
+                        It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                      type: string
+                    oauth2:
+                      description: oauth2 defines the configuration to use on every
+                        scrape request.
+                      properties:
+                        clientId:
+                          description: |-
+                            clientId defines a key of a Secret or ConfigMap containing the
+                            OAuth2 client's ID.
+                          properties:
+                            configMap:
+                              description: configMap defines the ConfigMap containing
+                                data to use for the targets.
+                              properties:
+                                key:
+                                  description: The key to select.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the ConfigMap or its
+                                    key must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            secret:
+                              description: secret defines the Secret containing data
+                                to use for the targets.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                          type: object
+                        clientSecret:
+                          description: |-
+                            clientSecret defines a key of a Secret containing the OAuth2
+                            client's secret.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        endpointParams:
+                          additionalProperties:
+                            type: string
+                          description: |-
+                            endpointParams configures the HTTP parameters to append to the token
+                            URL.
+                          type: object
+                        noProxy:
+                          description: |-
+                            noProxy defines a comma-separated string that can contain IPs, CIDR notation, domain names
+                            that should be excluded from proxying. IP and domain names can
+                            contain port numbers.
+
+                            It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                          type: string
+                        proxyConnectHeader:
+                          additionalProperties:
+                            items:
+                              description: SecretKeySelector selects a key of a Secret.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            type: array
+                          description: |-
+                            proxyConnectHeader optionally specifies headers to send to
+                            proxies during CONNECT requests.
+
+                            It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        proxyFromEnvironment:
+                          description: |-
+                            proxyFromEnvironment defines whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+
+                            It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                          type: boolean
+                        proxyUrl:
+                          description: proxyUrl defines the HTTP proxy server to use.
+                          pattern: ^(http|https|socks5)://.+$
+                          type: string
+                        scopes:
+                          description: scopes defines the OAuth2 scopes used for the
+                            token request.
+                          items:
+                            type: string
+                          type: array
+                        tlsConfig:
+                          description: |-
+                            tlsConfig defines the TLS configuration to use when connecting to the OAuth2 server.
+                            It requires Prometheus >= v2.43.0.
+                          properties:
+                            ca:
+                              description: ca defines the Certificate authority used
+                                when verifying server certificates.
+                              properties:
+                                configMap:
+                                  description: configMap defines the ConfigMap containing
+                                    data to use for the targets.
+                                  properties:
+                                    key:
+                                      description: The key to select.
+                                      type: string
+                                    name:
+                                      default: ""
+                                      description: |-
+                                        Name of the referent.
+                                        This field is effectively required, but due to backwards compatibility is
+                                        allowed to be empty. Instances of this type with an empty value here are
+                                        almost certainly wrong.
+                                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                      type: string
+                                    optional:
+                                      description: Specify whether the ConfigMap or
+                                        its key must be defined
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                secret:
+                                  description: secret defines the Secret containing
+                                    data to use for the targets.
+                                  properties:
+                                    key:
+                                      description: The key of the secret to select
+                                        from.  Must be a valid secret key.
+                                      type: string
+                                    name:
+                                      default: ""
+                                      description: |-
+                                        Name of the referent.
+                                        This field is effectively required, but due to backwards compatibility is
+                                        allowed to be empty. Instances of this type with an empty value here are
+                                        almost certainly wrong.
+                                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                      type: string
+                                    optional:
+                                      description: Specify whether the Secret or its
+                                        key must be defined
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                              type: object
+                            cert:
+                              description: cert defines the Client certificate to
+                                present when doing client-authentication.
+                              properties:
+                                configMap:
+                                  description: configMap defines the ConfigMap containing
+                                    data to use for the targets.
+                                  properties:
+                                    key:
+                                      description: The key to select.
+                                      type: string
+                                    name:
+                                      default: ""
+                                      description: |-
+                                        Name of the referent.
+                                        This field is effectively required, but due to backwards compatibility is
+                                        allowed to be empty. Instances of this type with an empty value here are
+                                        almost certainly wrong.
+                                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                      type: string
+                                    optional:
+                                      description: Specify whether the ConfigMap or
+                                        its key must be defined
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                secret:
+                                  description: secret defines the Secret containing
+                                    data to use for the targets.
+                                  properties:
+                                    key:
+                                      description: The key of the secret to select
+                                        from.  Must be a valid secret key.
+                                      type: string
+                                    name:
+                                      default: ""
+                                      description: |-
+                                        Name of the referent.
+                                        This field is effectively required, but due to backwards compatibility is
+                                        allowed to be empty. Instances of this type with an empty value here are
+                                        almost certainly wrong.
+                                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                      type: string
+                                    optional:
+                                      description: Specify whether the Secret or its
+                                        key must be defined
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                              type: object
+                            insecureSkipVerify:
+                              description: insecureSkipVerify defines how to disable
+                                target certificate validation.
+                              type: boolean
+                            keySecret:
+                              description: keySecret defines the Secret containing
+                                the client key file for the targets.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            maxVersion:
+                              description: |-
+                                maxVersion defines the maximum acceptable TLS version.
+
+                                It requires Prometheus >= v2.41.0 or Thanos >= v0.31.0.
+                              enum:
+                              - TLS10
+                              - TLS11
+                              - TLS12
+                              - TLS13
+                              type: string
+                            minVersion:
+                              description: |-
+                                minVersion defines the minimum acceptable TLS version.
+
+                                It requires Prometheus >= v2.35.0 or Thanos >= v0.28.0.
+                              enum:
+                              - TLS10
+                              - TLS11
+                              - TLS12
+                              - TLS13
+                              type: string
+                            serverName:
+                              description: serverName is used to verify the hostname
+                                for the targets.
+                              type: string
+                          type: object
+                        tokenUrl:
+                          description: tokenUrl defines the URL to fetch the token
+                            from.
+                          minLength: 1
+                          type: string
+                      required:
+                      - clientId
+                      - clientSecret
+                      - tokenUrl
+                      type: object
+                    proxyConnectHeader:
+                      additionalProperties:
+                        items:
+                          description: SecretKeySelector selects a key of a Secret.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        type: array
+                      description: |-
+                        proxyConnectHeader optionally specifies headers to send to
+                        proxies during CONNECT requests.
+
+                        It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                      type: object
+                      x-kubernetes-map-type: atomic
+                    proxyFromEnvironment:
+                      description: |-
+                        proxyFromEnvironment defines whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+
+                        It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                      type: boolean
+                    proxyUrl:
+                      description: proxyUrl defines the HTTP proxy server to use.
+                      pattern: ^(http|https|socks5)://.+$
+                      type: string
+                    refreshInterval:
+                      description: |-
+                        refreshInterval defines the time after which the provided names are refreshed.
+                        If not set, Prometheus uses its default value.
+                      pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
+                      type: string
+                    server:
+                      description: server defines the address of the Kuma Control
+                        Plane's MADS xDS server.
+                      pattern: ^https?://.+$
+                      type: string
+                    tlsConfig:
+                      description: tlsConfig defines the TLS configuration to connect
+                        to the Consul API.
+                      properties:
+                        ca:
+                          description: ca defines the Certificate authority used when
+                            verifying server certificates.
+                          properties:
+                            configMap:
+                              description: configMap defines the ConfigMap containing
+                                data to use for the targets.
+                              properties:
+                                key:
+                                  description: The key to select.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the ConfigMap or its
+                                    key must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            secret:
+                              description: secret defines the Secret containing data
+                                to use for the targets.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                          type: object
+                        cert:
+                          description: cert defines the Client certificate to present
+                            when doing client-authentication.
+                          properties:
+                            configMap:
+                              description: configMap defines the ConfigMap containing
+                                data to use for the targets.
+                              properties:
+                                key:
+                                  description: The key to select.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the ConfigMap or its
+                                    key must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            secret:
+                              description: secret defines the Secret containing data
+                                to use for the targets.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                          type: object
+                        insecureSkipVerify:
+                          description: insecureSkipVerify defines how to disable target
+                            certificate validation.
+                          type: boolean
+                        keySecret:
+                          description: keySecret defines the Secret containing the
+                            client key file for the targets.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        maxVersion:
+                          description: |-
+                            maxVersion defines the maximum acceptable TLS version.
+
+                            It requires Prometheus >= v2.41.0 or Thanos >= v0.31.0.
+                          enum:
+                          - TLS10
+                          - TLS11
+                          - TLS12
+                          - TLS13
+                          type: string
+                        minVersion:
+                          description: |-
+                            minVersion defines the minimum acceptable TLS version.
+
+                            It requires Prometheus >= v2.35.0 or Thanos >= v0.28.0.
+                          enum:
+                          - TLS10
+                          - TLS11
+                          - TLS12
+                          - TLS13
+                          type: string
+                        serverName:
+                          description: serverName is used to verify the hostname for
+                            the targets.
+                          type: string
+                      type: object
+                  required:
+                  - server
+                  type: object
+                type: array
+              labelLimit:
+                description: |-
+                  labelLimit defines the per-scrape limit on number of labels that will be accepted for a sample.
+                  Only valid in Prometheus versions 2.27.0 and newer.
+                format: int64
+                type: integer
+              labelNameLengthLimit:
+                description: |-
+                  labelNameLengthLimit defines the per-scrape limit on length of labels name that will be accepted for a sample.
+                  Only valid in Prometheus versions 2.27.0 and newer.
+                format: int64
+                type: integer
+              labelValueLengthLimit:
+                description: |-
+                  labelValueLengthLimit defines the per-scrape limit on length of labels value that will be accepted for a sample.
+                  Only valid in Prometheus versions 2.27.0 and newer.
+                format: int64
+                type: integer
+              lightSailSDConfigs:
+                description: lightSailSDConfigs defines a list of Lightsail service
+                  discovery configurations.
+                items:
+                  description: |-
+                    LightSailSDConfig configurations allow retrieving scrape targets from AWS Lightsail instances.
+                    See https://prometheus.io/docs/prometheus/latest/configuration/configuration/#lightsail_sd_config
+                  properties:
+                    accessKey:
+                      description: accessKey defines the AWS API key.
+                      properties:
+                        key:
+                          description: The key of the secret to select from.  Must
+                            be a valid secret key.
+                          type: string
+                        name:
+                          default: ""
+                          description: |-
+                            Name of the referent.
+                            This field is effectively required, but due to backwards compatibility is
+                            allowed to be empty. Instances of this type with an empty value here are
+                            almost certainly wrong.
+                            More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                          type: string
+                        optional:
+                          description: Specify whether the Secret or its key must
+                            be defined
+                          type: boolean
+                      required:
+                      - key
+                      type: object
+                      x-kubernetes-map-type: atomic
+                    authorization:
+                      description: |-
+                        authorization defines the  header configuration to authenticate against the DigitalOcean API.
+                        Cannot be set at the same time as `oauth2`.
+                      properties:
+                        credentials:
+                          description: credentials defines a key of a Secret in the
+                            namespace that contains the credentials for authentication.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        type:
+                          description: |-
+                            type defines the authentication type. The value is case-insensitive.
+
+                            "Basic" is not a supported value.
+
+                            Default: "Bearer"
+                          type: string
+                      type: object
+                    basicAuth:
+                      description: |-
+                        basicAuth defines information to use on every scrape request.
+                        Cannot be set at the same time as `authorization`, or `oauth2`.
+                      properties:
+                        password:
+                          description: |-
+                            password defines a key of a Secret containing the password for
+                            authentication.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        username:
+                          description: |-
+                            username defines a key of a Secret containing the username for
+                            authentication.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                      type: object
+                    enableHTTP2:
+                      description: enableHTTP2 defines whether to enable HTTP2.
+                      type: boolean
+                    endpoint:
+                      description: endpoint defines the custom endpoint to be used.
+                      minLength: 1
+                      type: string
+                    followRedirects:
+                      description: followRedirects defines whether HTTP requests follow
+                        HTTP 3xx redirects.
+                      type: boolean
+                    noProxy:
+                      description: |-
+                        noProxy defines a comma-separated string that can contain IPs, CIDR notation, domain names
+                        that should be excluded from proxying. IP and domain names can
+                        contain port numbers.
+
+                        It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                      type: string
+                    oauth2:
+                      description: |-
+                        oauth2 defines the optional OAuth 2.0 configuration to authenticate against the target HTTP endpoint.
+                        Cannot be set at the same time as `authorization`, or `basicAuth`.
+                      properties:
+                        clientId:
+                          description: |-
+                            clientId defines a key of a Secret or ConfigMap containing the
+                            OAuth2 client's ID.
+                          properties:
+                            configMap:
+                              description: configMap defines the ConfigMap containing
+                                data to use for the targets.
+                              properties:
+                                key:
+                                  description: The key to select.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the ConfigMap or its
+                                    key must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            secret:
+                              description: secret defines the Secret containing data
+                                to use for the targets.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                          type: object
+                        clientSecret:
+                          description: |-
+                            clientSecret defines a key of a Secret containing the OAuth2
+                            client's secret.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        endpointParams:
+                          additionalProperties:
+                            type: string
+                          description: |-
+                            endpointParams configures the HTTP parameters to append to the token
+                            URL.
+                          type: object
+                        noProxy:
+                          description: |-
+                            noProxy defines a comma-separated string that can contain IPs, CIDR notation, domain names
+                            that should be excluded from proxying. IP and domain names can
+                            contain port numbers.
+
+                            It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                          type: string
+                        proxyConnectHeader:
+                          additionalProperties:
+                            items:
+                              description: SecretKeySelector selects a key of a Secret.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            type: array
+                          description: |-
+                            proxyConnectHeader optionally specifies headers to send to
+                            proxies during CONNECT requests.
+
+                            It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        proxyFromEnvironment:
+                          description: |-
+                            proxyFromEnvironment defines whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+
+                            It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                          type: boolean
+                        proxyUrl:
+                          description: proxyUrl defines the HTTP proxy server to use.
+                          pattern: ^(http|https|socks5)://.+$
+                          type: string
+                        scopes:
+                          description: scopes defines the OAuth2 scopes used for the
+                            token request.
+                          items:
+                            type: string
+                          type: array
+                        tlsConfig:
+                          description: |-
+                            tlsConfig defines the TLS configuration to use when connecting to the OAuth2 server.
+                            It requires Prometheus >= v2.43.0.
+                          properties:
+                            ca:
+                              description: ca defines the Certificate authority used
+                                when verifying server certificates.
+                              properties:
+                                configMap:
+                                  description: configMap defines the ConfigMap containing
+                                    data to use for the targets.
+                                  properties:
+                                    key:
+                                      description: The key to select.
+                                      type: string
+                                    name:
+                                      default: ""
+                                      description: |-
+                                        Name of the referent.
+                                        This field is effectively required, but due to backwards compatibility is
+                                        allowed to be empty. Instances of this type with an empty value here are
+                                        almost certainly wrong.
+                                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                      type: string
+                                    optional:
+                                      description: Specify whether the ConfigMap or
+                                        its key must be defined
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                secret:
+                                  description: secret defines the Secret containing
+                                    data to use for the targets.
+                                  properties:
+                                    key:
+                                      description: The key of the secret to select
+                                        from.  Must be a valid secret key.
+                                      type: string
+                                    name:
+                                      default: ""
+                                      description: |-
+                                        Name of the referent.
+                                        This field is effectively required, but due to backwards compatibility is
+                                        allowed to be empty. Instances of this type with an empty value here are
+                                        almost certainly wrong.
+                                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                      type: string
+                                    optional:
+                                      description: Specify whether the Secret or its
+                                        key must be defined
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                              type: object
+                            cert:
+                              description: cert defines the Client certificate to
+                                present when doing client-authentication.
+                              properties:
+                                configMap:
+                                  description: configMap defines the ConfigMap containing
+                                    data to use for the targets.
+                                  properties:
+                                    key:
+                                      description: The key to select.
+                                      type: string
+                                    name:
+                                      default: ""
+                                      description: |-
+                                        Name of the referent.
+                                        This field is effectively required, but due to backwards compatibility is
+                                        allowed to be empty. Instances of this type with an empty value here are
+                                        almost certainly wrong.
+                                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                      type: string
+                                    optional:
+                                      description: Specify whether the ConfigMap or
+                                        its key must be defined
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                secret:
+                                  description: secret defines the Secret containing
+                                    data to use for the targets.
+                                  properties:
+                                    key:
+                                      description: The key of the secret to select
+                                        from.  Must be a valid secret key.
+                                      type: string
+                                    name:
+                                      default: ""
+                                      description: |-
+                                        Name of the referent.
+                                        This field is effectively required, but due to backwards compatibility is
+                                        allowed to be empty. Instances of this type with an empty value here are
+                                        almost certainly wrong.
+                                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                      type: string
+                                    optional:
+                                      description: Specify whether the Secret or its
+                                        key must be defined
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                              type: object
+                            insecureSkipVerify:
+                              description: insecureSkipVerify defines how to disable
+                                target certificate validation.
+                              type: boolean
+                            keySecret:
+                              description: keySecret defines the Secret containing
+                                the client key file for the targets.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            maxVersion:
+                              description: |-
+                                maxVersion defines the maximum acceptable TLS version.
+
+                                It requires Prometheus >= v2.41.0 or Thanos >= v0.31.0.
+                              enum:
+                              - TLS10
+                              - TLS11
+                              - TLS12
+                              - TLS13
+                              type: string
+                            minVersion:
+                              description: |-
+                                minVersion defines the minimum acceptable TLS version.
+
+                                It requires Prometheus >= v2.35.0 or Thanos >= v0.28.0.
+                              enum:
+                              - TLS10
+                              - TLS11
+                              - TLS12
+                              - TLS13
+                              type: string
+                            serverName:
+                              description: serverName is used to verify the hostname
+                                for the targets.
+                              type: string
+                          type: object
+                        tokenUrl:
+                          description: tokenUrl defines the URL to fetch the token
+                            from.
+                          minLength: 1
+                          type: string
+                      required:
+                      - clientId
+                      - clientSecret
+                      - tokenUrl
+                      type: object
+                    port:
+                      description: port defines the port to scrape metrics from. If
+                        using the public IP address, this must
+                      format: int32
+                      maximum: 65535
+                      minimum: 0
+                      type: integer
+                    proxyConnectHeader:
+                      additionalProperties:
+                        items:
+                          description: SecretKeySelector selects a key of a Secret.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        type: array
+                      description: |-
+                        proxyConnectHeader optionally specifies headers to send to
+                        proxies during CONNECT requests.
+
+                        It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                      type: object
+                      x-kubernetes-map-type: atomic
+                    proxyFromEnvironment:
+                      description: |-
+                        proxyFromEnvironment defines whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+
+                        It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                      type: boolean
+                    proxyUrl:
+                      description: proxyUrl defines the HTTP proxy server to use.
+                      pattern: ^(http|https|socks5)://.+$
+                      type: string
+                    refreshInterval:
+                      description: |-
+                        refreshInterval defines the time after which the provided names are refreshed.
+                        If not set, Prometheus uses its default value.
+                      pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
+                      type: string
+                    region:
+                      description: region defines the AWS region.
+                      minLength: 1
+                      type: string
+                    roleARN:
+                      description: roleARN defines the AWS Role ARN, an alternative
+                        to using AWS API keys.
+                      type: string
+                    secretKey:
+                      description: secretKey defines the AWS API secret.
+                      properties:
+                        key:
+                          description: The key of the secret to select from.  Must
+                            be a valid secret key.
+                          type: string
+                        name:
+                          default: ""
+                          description: |-
+                            Name of the referent.
+                            This field is effectively required, but due to backwards compatibility is
+                            allowed to be empty. Instances of this type with an empty value here are
+                            almost certainly wrong.
+                            More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                          type: string
+                        optional:
+                          description: Specify whether the Secret or its key must
+                            be defined
+                          type: boolean
+                      required:
+                      - key
+                      type: object
+                      x-kubernetes-map-type: atomic
+                    tlsConfig:
+                      description: tlsConfig defines the TLS configuration to connect
+                        to the Consul API.
+                      properties:
+                        ca:
+                          description: ca defines the Certificate authority used when
+                            verifying server certificates.
+                          properties:
+                            configMap:
+                              description: configMap defines the ConfigMap containing
+                                data to use for the targets.
+                              properties:
+                                key:
+                                  description: The key to select.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the ConfigMap or its
+                                    key must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            secret:
+                              description: secret defines the Secret containing data
+                                to use for the targets.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                          type: object
+                        cert:
+                          description: cert defines the Client certificate to present
+                            when doing client-authentication.
+                          properties:
+                            configMap:
+                              description: configMap defines the ConfigMap containing
+                                data to use for the targets.
+                              properties:
+                                key:
+                                  description: The key to select.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the ConfigMap or its
+                                    key must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            secret:
+                              description: secret defines the Secret containing data
+                                to use for the targets.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                          type: object
+                        insecureSkipVerify:
+                          description: insecureSkipVerify defines how to disable target
+                            certificate validation.
+                          type: boolean
+                        keySecret:
+                          description: keySecret defines the Secret containing the
+                            client key file for the targets.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        maxVersion:
+                          description: |-
+                            maxVersion defines the maximum acceptable TLS version.
+
+                            It requires Prometheus >= v2.41.0 or Thanos >= v0.31.0.
+                          enum:
+                          - TLS10
+                          - TLS11
+                          - TLS12
+                          - TLS13
+                          type: string
+                        minVersion:
+                          description: |-
+                            minVersion defines the minimum acceptable TLS version.
+
+                            It requires Prometheus >= v2.35.0 or Thanos >= v0.28.0.
+                          enum:
+                          - TLS10
+                          - TLS11
+                          - TLS12
+                          - TLS13
+                          type: string
+                        serverName:
+                          description: serverName is used to verify the hostname for
+                            the targets.
+                          type: string
+                      type: object
+                  type: object
+                type: array
+              linodeSDConfigs:
+                description: linodeSDConfigs defines a list of Linode service discovery
+                  configurations.
+                items:
+                  description: |-
+                    LinodeSDConfig configurations allow retrieving scrape targets from Linode's Linode APIv4.
+                    See https://prometheus.io/docs/prometheus/latest/configuration/configuration/#linode_sd_config
+                  properties:
+                    authorization:
+                      description: |-
+                        authorization defines the  header configuration to authenticate against the DigitalOcean API.
+                        Cannot be set at the same time as `oauth2`.
+                      properties:
+                        credentials:
+                          description: credentials defines a key of a Secret in the
+                            namespace that contains the credentials for authentication.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        type:
+                          description: |-
+                            type defines the authentication type. The value is case-insensitive.
+
+                            "Basic" is not a supported value.
+
+                            Default: "Bearer"
+                          type: string
+                      type: object
+                    enableHTTP2:
+                      description: enableHTTP2 defines whether to enable HTTP2.
+                      type: boolean
+                    followRedirects:
+                      description: followRedirects defines whether HTTP requests follow
+                        HTTP 3xx redirects.
+                      type: boolean
+                    noProxy:
+                      description: |-
+                        noProxy defines a comma-separated string that can contain IPs, CIDR notation, domain names
+                        that should be excluded from proxying. IP and domain names can
+                        contain port numbers.
+
+                        It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                      type: string
+                    oauth2:
+                      description: |-
+                        oauth2 defines the optional OAuth 2.0 configuration to authenticate against the target HTTP endpoint.
+                        Cannot be set at the same time as `authorization`, or `basicAuth`.
+                      properties:
+                        clientId:
+                          description: |-
+                            clientId defines a key of a Secret or ConfigMap containing the
+                            OAuth2 client's ID.
+                          properties:
+                            configMap:
+                              description: configMap defines the ConfigMap containing
+                                data to use for the targets.
+                              properties:
+                                key:
+                                  description: The key to select.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the ConfigMap or its
+                                    key must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            secret:
+                              description: secret defines the Secret containing data
+                                to use for the targets.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                          type: object
+                        clientSecret:
+                          description: |-
+                            clientSecret defines a key of a Secret containing the OAuth2
+                            client's secret.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        endpointParams:
+                          additionalProperties:
+                            type: string
+                          description: |-
+                            endpointParams configures the HTTP parameters to append to the token
+                            URL.
+                          type: object
+                        noProxy:
+                          description: |-
+                            noProxy defines a comma-separated string that can contain IPs, CIDR notation, domain names
+                            that should be excluded from proxying. IP and domain names can
+                            contain port numbers.
+
+                            It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                          type: string
+                        proxyConnectHeader:
+                          additionalProperties:
+                            items:
+                              description: SecretKeySelector selects a key of a Secret.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            type: array
+                          description: |-
+                            proxyConnectHeader optionally specifies headers to send to
+                            proxies during CONNECT requests.
+
+                            It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        proxyFromEnvironment:
+                          description: |-
+                            proxyFromEnvironment defines whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+
+                            It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                          type: boolean
+                        proxyUrl:
+                          description: proxyUrl defines the HTTP proxy server to use.
+                          pattern: ^(http|https|socks5)://.+$
+                          type: string
+                        scopes:
+                          description: scopes defines the OAuth2 scopes used for the
+                            token request.
+                          items:
+                            type: string
+                          type: array
+                        tlsConfig:
+                          description: |-
+                            tlsConfig defines the TLS configuration to use when connecting to the OAuth2 server.
+                            It requires Prometheus >= v2.43.0.
+                          properties:
+                            ca:
+                              description: ca defines the Certificate authority used
+                                when verifying server certificates.
+                              properties:
+                                configMap:
+                                  description: configMap defines the ConfigMap containing
+                                    data to use for the targets.
+                                  properties:
+                                    key:
+                                      description: The key to select.
+                                      type: string
+                                    name:
+                                      default: ""
+                                      description: |-
+                                        Name of the referent.
+                                        This field is effectively required, but due to backwards compatibility is
+                                        allowed to be empty. Instances of this type with an empty value here are
+                                        almost certainly wrong.
+                                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                      type: string
+                                    optional:
+                                      description: Specify whether the ConfigMap or
+                                        its key must be defined
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                secret:
+                                  description: secret defines the Secret containing
+                                    data to use for the targets.
+                                  properties:
+                                    key:
+                                      description: The key of the secret to select
+                                        from.  Must be a valid secret key.
+                                      type: string
+                                    name:
+                                      default: ""
+                                      description: |-
+                                        Name of the referent.
+                                        This field is effectively required, but due to backwards compatibility is
+                                        allowed to be empty. Instances of this type with an empty value here are
+                                        almost certainly wrong.
+                                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                      type: string
+                                    optional:
+                                      description: Specify whether the Secret or its
+                                        key must be defined
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                              type: object
+                            cert:
+                              description: cert defines the Client certificate to
+                                present when doing client-authentication.
+                              properties:
+                                configMap:
+                                  description: configMap defines the ConfigMap containing
+                                    data to use for the targets.
+                                  properties:
+                                    key:
+                                      description: The key to select.
+                                      type: string
+                                    name:
+                                      default: ""
+                                      description: |-
+                                        Name of the referent.
+                                        This field is effectively required, but due to backwards compatibility is
+                                        allowed to be empty. Instances of this type with an empty value here are
+                                        almost certainly wrong.
+                                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                      type: string
+                                    optional:
+                                      description: Specify whether the ConfigMap or
+                                        its key must be defined
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                secret:
+                                  description: secret defines the Secret containing
+                                    data to use for the targets.
+                                  properties:
+                                    key:
+                                      description: The key of the secret to select
+                                        from.  Must be a valid secret key.
+                                      type: string
+                                    name:
+                                      default: ""
+                                      description: |-
+                                        Name of the referent.
+                                        This field is effectively required, but due to backwards compatibility is
+                                        allowed to be empty. Instances of this type with an empty value here are
+                                        almost certainly wrong.
+                                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                      type: string
+                                    optional:
+                                      description: Specify whether the Secret or its
+                                        key must be defined
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                              type: object
+                            insecureSkipVerify:
+                              description: insecureSkipVerify defines how to disable
+                                target certificate validation.
+                              type: boolean
+                            keySecret:
+                              description: keySecret defines the Secret containing
+                                the client key file for the targets.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            maxVersion:
+                              description: |-
+                                maxVersion defines the maximum acceptable TLS version.
+
+                                It requires Prometheus >= v2.41.0 or Thanos >= v0.31.0.
+                              enum:
+                              - TLS10
+                              - TLS11
+                              - TLS12
+                              - TLS13
+                              type: string
+                            minVersion:
+                              description: |-
+                                minVersion defines the minimum acceptable TLS version.
+
+                                It requires Prometheus >= v2.35.0 or Thanos >= v0.28.0.
+                              enum:
+                              - TLS10
+                              - TLS11
+                              - TLS12
+                              - TLS13
+                              type: string
+                            serverName:
+                              description: serverName is used to verify the hostname
+                                for the targets.
+                              type: string
+                          type: object
+                        tokenUrl:
+                          description: tokenUrl defines the URL to fetch the token
+                            from.
+                          minLength: 1
+                          type: string
+                      required:
+                      - clientId
+                      - clientSecret
+                      - tokenUrl
+                      type: object
+                    port:
+                      description: port defines the port to scrape metrics from. If
+                        using the public IP address, this must
+                      format: int32
+                      maximum: 65535
+                      minimum: 0
+                      type: integer
+                    proxyConnectHeader:
+                      additionalProperties:
+                        items:
+                          description: SecretKeySelector selects a key of a Secret.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        type: array
+                      description: |-
+                        proxyConnectHeader optionally specifies headers to send to
+                        proxies during CONNECT requests.
+
+                        It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                      type: object
+                      x-kubernetes-map-type: atomic
+                    proxyFromEnvironment:
+                      description: |-
+                        proxyFromEnvironment defines whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+
+                        It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                      type: boolean
+                    proxyUrl:
+                      description: proxyUrl defines the HTTP proxy server to use.
+                      pattern: ^(http|https|socks5)://.+$
+                      type: string
+                    refreshInterval:
+                      description: |-
+                        refreshInterval defines the time after which the provided names are refreshed.
+                        If not set, Prometheus uses its default value.
+                      pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
+                      type: string
+                    region:
+                      description: region defines the region to filter on.
+                      minLength: 1
+                      type: string
+                    tagSeparator:
+                      description: tagSeparator defines the string by which Linode
+                        Instance tags are joined into the tag label.el.
+                      minLength: 1
+                      type: string
+                    tlsConfig:
+                      description: tlsConfig defines the TLS configuration to connect
+                        to the Consul API.
+                      properties:
+                        ca:
+                          description: ca defines the Certificate authority used when
+                            verifying server certificates.
+                          properties:
+                            configMap:
+                              description: configMap defines the ConfigMap containing
+                                data to use for the targets.
+                              properties:
+                                key:
+                                  description: The key to select.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the ConfigMap or its
+                                    key must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            secret:
+                              description: secret defines the Secret containing data
+                                to use for the targets.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                          type: object
+                        cert:
+                          description: cert defines the Client certificate to present
+                            when doing client-authentication.
+                          properties:
+                            configMap:
+                              description: configMap defines the ConfigMap containing
+                                data to use for the targets.
+                              properties:
+                                key:
+                                  description: The key to select.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the ConfigMap or its
+                                    key must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            secret:
+                              description: secret defines the Secret containing data
+                                to use for the targets.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                          type: object
+                        insecureSkipVerify:
+                          description: insecureSkipVerify defines how to disable target
+                            certificate validation.
+                          type: boolean
+                        keySecret:
+                          description: keySecret defines the Secret containing the
+                            client key file for the targets.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        maxVersion:
+                          description: |-
+                            maxVersion defines the maximum acceptable TLS version.
+
+                            It requires Prometheus >= v2.41.0 or Thanos >= v0.31.0.
+                          enum:
+                          - TLS10
+                          - TLS11
+                          - TLS12
+                          - TLS13
+                          type: string
+                        minVersion:
+                          description: |-
+                            minVersion defines the minimum acceptable TLS version.
+
+                            It requires Prometheus >= v2.35.0 or Thanos >= v0.28.0.
+                          enum:
+                          - TLS10
+                          - TLS11
+                          - TLS12
+                          - TLS13
+                          type: string
+                        serverName:
+                          description: serverName is used to verify the hostname for
+                            the targets.
+                          type: string
+                      type: object
+                  type: object
+                type: array
+              metricRelabelings:
+                description: metricRelabelings defines the metricRelabelings to apply
+                  to samples before ingestion.
+                items:
+                  description: |-
+                    RelabelConfig allows dynamic rewriting of the label set for targets, alerts,
+                    scraped samples and remote write samples.
+
+                    More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config
+                  properties:
+                    action:
+                      default: replace
+                      description: |-
+                        action to perform based on the regex matching.
+
+                        `Uppercase` and `Lowercase` actions require Prometheus >= v2.36.0.
+                        `DropEqual` and `KeepEqual` actions require Prometheus >= v2.41.0.
+
+                        Default: "Replace"
+                      enum:
+                      - replace
+                      - Replace
+                      - keep
+                      - Keep
+                      - drop
+                      - Drop
+                      - hashmod
+                      - HashMod
+                      - labelmap
+                      - LabelMap
+                      - labeldrop
+                      - LabelDrop
+                      - labelkeep
+                      - LabelKeep
+                      - lowercase
+                      - Lowercase
+                      - uppercase
+                      - Uppercase
+                      - keepequal
+                      - KeepEqual
+                      - dropequal
+                      - DropEqual
+                      type: string
+                    modulus:
+                      description: |-
+                        modulus to take of the hash of the source label values.
+
+                        Only applicable when the action is `HashMod`.
+                      format: int64
+                      type: integer
+                    regex:
+                      description: regex defines the regular expression against which
+                        the extracted value is matched.
+                      type: string
+                    replacement:
+                      description: |-
+                        replacement value against which a Replace action is performed if the
+                        regular expression matches.
+
+                        Regex capture groups are available.
+                      type: string
+                    separator:
+                      description: separator defines the string between concatenated
+                        SourceLabels.
+                      type: string
+                    sourceLabels:
+                      description: |-
+                        sourceLabels defines the source labels select values from existing labels. Their content is
+                        concatenated using the configured Separator and matched against the
+                        configured regular expression.
+                      items:
+                        description: |-
+                          LabelName is a valid Prometheus label name.
+                          For Prometheus 3.x, a label name is valid if it contains UTF-8 characters.
+                          For Prometheus 2.x, a label name is only valid if it contains ASCII characters, letters, numbers, as well as underscores.
+                        type: string
+                      type: array
+                    targetLabel:
+                      description: |-
+                        targetLabel defines the label to which the resulting string is written in a replacement.
+
+                        It is mandatory for `Replace`, `HashMod`, `Lowercase`, `Uppercase`,
+                        `KeepEqual` and `DropEqual` actions.
+
+                        Regex capture groups are available.
+                      type: string
+                  type: object
+                minItems: 1
+                type: array
+              metricsPath:
+                description: metricsPath defines the HTTP path to scrape for metrics.
+                  If empty, Prometheus uses the default value (e.g. /metrics).
+                minLength: 1
+                type: string
+              nameEscapingScheme:
+                description: |-
+                  nameEscapingScheme defines the metric name escaping mode to request through content negotiation.
+
+                  It requires Prometheus >= v3.4.0.
+                enum:
+                - AllowUTF8
+                - Underscores
+                - Dots
+                - Values
+                type: string
+              nameValidationScheme:
+                description: |-
+                  nameValidationScheme defines the validation scheme for metric and label names.
+
+                  It requires Prometheus >= v3.0.0.
+                enum:
+                - UTF8
+                - Legacy
+                type: string
+              nativeHistogramBucketLimit:
+                description: |-
+                  nativeHistogramBucketLimit defines ff there are more than this many buckets in a native histogram,
+                  buckets will be merged to stay within the limit.
+                  It requires Prometheus >= v2.45.0.
+                format: int64
+                type: integer
+              nativeHistogramMinBucketFactor:
+                anyOf:
+                - type: integer
+                - type: string
+                description: |-
+                  nativeHistogramMinBucketFactor defines if the growth factor of one bucket to the next is smaller than this,
+                  buckets will be merged to increase the factor sufficiently.
+                  It requires Prometheus >= v2.50.0.
+                pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                x-kubernetes-int-or-string: true
+              noProxy:
+                description: |-
+                  noProxy defines a comma-separated string that can contain IPs, CIDR notation, domain names
+                  that should be excluded from proxying. IP and domain names can
+                  contain port numbers.
+
+                  It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                type: string
+              nomadSDConfigs:
+                description: nomadSDConfigs defines a list of Nomad service discovery
+                  configurations.
+                items:
+                  description: |-
+                    NomadSDConfig configurations allow retrieving scrape targets from Nomad's Service API.
+                    See https://prometheus.io/docs/prometheus/latest/configuration/configuration/#nomad_sd_config
+                  properties:
+                    allowStale:
+                      description: |-
+                        allowStale defines the information to access the Nomad API. It is to be defined
+                        as the Nomad documentation requires.
+                      type: boolean
+                    authorization:
+                      description: |-
+                        authorization defines the  header configuration to authenticate against the DigitalOcean API.
+                        Cannot be set at the same time as `oauth2`.
+                      properties:
+                        credentials:
+                          description: credentials defines a key of a Secret in the
+                            namespace that contains the credentials for authentication.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        type:
+                          description: |-
+                            type defines the authentication type. The value is case-insensitive.
+
+                            "Basic" is not a supported value.
+
+                            Default: "Bearer"
+                          type: string
+                      type: object
+                    basicAuth:
+                      description: basicAuth defines information to use on every scrape
+                        request.
+                      properties:
+                        password:
+                          description: |-
+                            password defines a key of a Secret containing the password for
+                            authentication.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        username:
+                          description: |-
+                            username defines a key of a Secret containing the username for
+                            authentication.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                      type: object
+                    enableHTTP2:
+                      description: enableHTTP2 defines whether to enable HTTP2.
+                      type: boolean
+                    followRedirects:
+                      description: followRedirects defines whether HTTP requests follow
+                        HTTP 3xx redirects.
+                      type: boolean
+                    namespace:
+                      description: |-
+                        namespace defines the Nomad namespace to query for service discovery.
+                        When specified, only resources within this namespace will be discovered.
+                      type: string
+                    noProxy:
+                      description: |-
+                        noProxy defines a comma-separated string that can contain IPs, CIDR notation, domain names
+                        that should be excluded from proxying. IP and domain names can
+                        contain port numbers.
+
+                        It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                      type: string
+                    oauth2:
+                      description: oauth2 defines the configuration to use on every
+                        scrape request.
+                      properties:
+                        clientId:
+                          description: |-
+                            clientId defines a key of a Secret or ConfigMap containing the
+                            OAuth2 client's ID.
+                          properties:
+                            configMap:
+                              description: configMap defines the ConfigMap containing
+                                data to use for the targets.
+                              properties:
+                                key:
+                                  description: The key to select.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the ConfigMap or its
+                                    key must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            secret:
+                              description: secret defines the Secret containing data
+                                to use for the targets.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                          type: object
+                        clientSecret:
+                          description: |-
+                            clientSecret defines a key of a Secret containing the OAuth2
+                            client's secret.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        endpointParams:
+                          additionalProperties:
+                            type: string
+                          description: |-
+                            endpointParams configures the HTTP parameters to append to the token
+                            URL.
+                          type: object
+                        noProxy:
+                          description: |-
+                            noProxy defines a comma-separated string that can contain IPs, CIDR notation, domain names
+                            that should be excluded from proxying. IP and domain names can
+                            contain port numbers.
+
+                            It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                          type: string
+                        proxyConnectHeader:
+                          additionalProperties:
+                            items:
+                              description: SecretKeySelector selects a key of a Secret.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            type: array
+                          description: |-
+                            proxyConnectHeader optionally specifies headers to send to
+                            proxies during CONNECT requests.
+
+                            It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        proxyFromEnvironment:
+                          description: |-
+                            proxyFromEnvironment defines whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+
+                            It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                          type: boolean
+                        proxyUrl:
+                          description: proxyUrl defines the HTTP proxy server to use.
+                          pattern: ^(http|https|socks5)://.+$
+                          type: string
+                        scopes:
+                          description: scopes defines the OAuth2 scopes used for the
+                            token request.
+                          items:
+                            type: string
+                          type: array
+                        tlsConfig:
+                          description: |-
+                            tlsConfig defines the TLS configuration to use when connecting to the OAuth2 server.
+                            It requires Prometheus >= v2.43.0.
+                          properties:
+                            ca:
+                              description: ca defines the Certificate authority used
+                                when verifying server certificates.
+                              properties:
+                                configMap:
+                                  description: configMap defines the ConfigMap containing
+                                    data to use for the targets.
+                                  properties:
+                                    key:
+                                      description: The key to select.
+                                      type: string
+                                    name:
+                                      default: ""
+                                      description: |-
+                                        Name of the referent.
+                                        This field is effectively required, but due to backwards compatibility is
+                                        allowed to be empty. Instances of this type with an empty value here are
+                                        almost certainly wrong.
+                                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                      type: string
+                                    optional:
+                                      description: Specify whether the ConfigMap or
+                                        its key must be defined
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                secret:
+                                  description: secret defines the Secret containing
+                                    data to use for the targets.
+                                  properties:
+                                    key:
+                                      description: The key of the secret to select
+                                        from.  Must be a valid secret key.
+                                      type: string
+                                    name:
+                                      default: ""
+                                      description: |-
+                                        Name of the referent.
+                                        This field is effectively required, but due to backwards compatibility is
+                                        allowed to be empty. Instances of this type with an empty value here are
+                                        almost certainly wrong.
+                                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                      type: string
+                                    optional:
+                                      description: Specify whether the Secret or its
+                                        key must be defined
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                              type: object
+                            cert:
+                              description: cert defines the Client certificate to
+                                present when doing client-authentication.
+                              properties:
+                                configMap:
+                                  description: configMap defines the ConfigMap containing
+                                    data to use for the targets.
+                                  properties:
+                                    key:
+                                      description: The key to select.
+                                      type: string
+                                    name:
+                                      default: ""
+                                      description: |-
+                                        Name of the referent.
+                                        This field is effectively required, but due to backwards compatibility is
+                                        allowed to be empty. Instances of this type with an empty value here are
+                                        almost certainly wrong.
+                                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                      type: string
+                                    optional:
+                                      description: Specify whether the ConfigMap or
+                                        its key must be defined
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                secret:
+                                  description: secret defines the Secret containing
+                                    data to use for the targets.
+                                  properties:
+                                    key:
+                                      description: The key of the secret to select
+                                        from.  Must be a valid secret key.
+                                      type: string
+                                    name:
+                                      default: ""
+                                      description: |-
+                                        Name of the referent.
+                                        This field is effectively required, but due to backwards compatibility is
+                                        allowed to be empty. Instances of this type with an empty value here are
+                                        almost certainly wrong.
+                                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                      type: string
+                                    optional:
+                                      description: Specify whether the Secret or its
+                                        key must be defined
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                              type: object
+                            insecureSkipVerify:
+                              description: insecureSkipVerify defines how to disable
+                                target certificate validation.
+                              type: boolean
+                            keySecret:
+                              description: keySecret defines the Secret containing
+                                the client key file for the targets.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            maxVersion:
+                              description: |-
+                                maxVersion defines the maximum acceptable TLS version.
+
+                                It requires Prometheus >= v2.41.0 or Thanos >= v0.31.0.
+                              enum:
+                              - TLS10
+                              - TLS11
+                              - TLS12
+                              - TLS13
+                              type: string
+                            minVersion:
+                              description: |-
+                                minVersion defines the minimum acceptable TLS version.
+
+                                It requires Prometheus >= v2.35.0 or Thanos >= v0.28.0.
+                              enum:
+                              - TLS10
+                              - TLS11
+                              - TLS12
+                              - TLS13
+                              type: string
+                            serverName:
+                              description: serverName is used to verify the hostname
+                                for the targets.
+                              type: string
+                          type: object
+                        tokenUrl:
+                          description: tokenUrl defines the URL to fetch the token
+                            from.
+                          minLength: 1
+                          type: string
+                      required:
+                      - clientId
+                      - clientSecret
+                      - tokenUrl
+                      type: object
+                    proxyConnectHeader:
+                      additionalProperties:
+                        items:
+                          description: SecretKeySelector selects a key of a Secret.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        type: array
+                      description: |-
+                        proxyConnectHeader optionally specifies headers to send to
+                        proxies during CONNECT requests.
+
+                        It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                      type: object
+                      x-kubernetes-map-type: atomic
+                    proxyFromEnvironment:
+                      description: |-
+                        proxyFromEnvironment defines whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+
+                        It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                      type: boolean
+                    proxyUrl:
+                      description: proxyUrl defines the HTTP proxy server to use.
+                      pattern: ^(http|https|socks5)://.+$
+                      type: string
+                    refreshInterval:
+                      description: |-
+                        refreshInterval defines the time after which the provided names are refreshed.
+                        If not set, Prometheus uses its default value.
+                      pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
+                      type: string
+                    region:
+                      description: |-
+                        region defines the Nomad region to query for service discovery.
+                        When specified, only resources within this region will be discovered.
+                      type: string
+                    server:
+                      description: |-
+                        server defines the Nomad server address to connect to for service discovery.
+                        This should be the full URL including protocol (e.g., "https://nomad.example.com:4646").
+                      minLength: 1
+                      type: string
+                    tagSeparator:
+                      description: |-
+                        tagSeparator defines the separator used to join multiple tags.
+                        This determines how Nomad service tags are concatenated into Prometheus labels.
+                      type: string
+                    tlsConfig:
+                      description: tlsConfig defines the TLS configuration to connect
+                        to the Consul API.
+                      properties:
+                        ca:
+                          description: ca defines the Certificate authority used when
+                            verifying server certificates.
+                          properties:
+                            configMap:
+                              description: configMap defines the ConfigMap containing
+                                data to use for the targets.
+                              properties:
+                                key:
+                                  description: The key to select.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the ConfigMap or its
+                                    key must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            secret:
+                              description: secret defines the Secret containing data
+                                to use for the targets.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                          type: object
+                        cert:
+                          description: cert defines the Client certificate to present
+                            when doing client-authentication.
+                          properties:
+                            configMap:
+                              description: configMap defines the ConfigMap containing
+                                data to use for the targets.
+                              properties:
+                                key:
+                                  description: The key to select.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the ConfigMap or its
+                                    key must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            secret:
+                              description: secret defines the Secret containing data
+                                to use for the targets.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                          type: object
+                        insecureSkipVerify:
+                          description: insecureSkipVerify defines how to disable target
+                            certificate validation.
+                          type: boolean
+                        keySecret:
+                          description: keySecret defines the Secret containing the
+                            client key file for the targets.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        maxVersion:
+                          description: |-
+                            maxVersion defines the maximum acceptable TLS version.
+
+                            It requires Prometheus >= v2.41.0 or Thanos >= v0.31.0.
+                          enum:
+                          - TLS10
+                          - TLS11
+                          - TLS12
+                          - TLS13
+                          type: string
+                        minVersion:
+                          description: |-
+                            minVersion defines the minimum acceptable TLS version.
+
+                            It requires Prometheus >= v2.35.0 or Thanos >= v0.28.0.
+                          enum:
+                          - TLS10
+                          - TLS11
+                          - TLS12
+                          - TLS13
+                          type: string
+                        serverName:
+                          description: serverName is used to verify the hostname for
+                            the targets.
+                          type: string
+                      type: object
+                  required:
+                  - server
+                  type: object
+                type: array
+              oauth2:
+                description: oauth2 defines the configuration to use on every scrape
+                  request.
+                properties:
+                  clientId:
+                    description: |-
+                      clientId defines a key of a Secret or ConfigMap containing the
+                      OAuth2 client's ID.
+                    properties:
+                      configMap:
+                        description: configMap defines the ConfigMap containing data
+                          to use for the targets.
+                        properties:
+                          key:
+                            description: The key to select.
+                            type: string
+                          name:
+                            default: ""
+                            description: |-
+                              Name of the referent.
+                              This field is effectively required, but due to backwards compatibility is
+                              allowed to be empty. Instances of this type with an empty value here are
+                              almost certainly wrong.
+                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                            type: string
+                          optional:
+                            description: Specify whether the ConfigMap or its key
+                              must be defined
+                            type: boolean
+                        required:
+                        - key
+                        type: object
+                        x-kubernetes-map-type: atomic
+                      secret:
+                        description: secret defines the Secret containing data to
+                          use for the targets.
+                        properties:
+                          key:
+                            description: The key of the secret to select from.  Must
+                              be a valid secret key.
+                            type: string
+                          name:
+                            default: ""
+                            description: |-
+                              Name of the referent.
+                              This field is effectively required, but due to backwards compatibility is
+                              allowed to be empty. Instances of this type with an empty value here are
+                              almost certainly wrong.
+                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                            type: string
+                          optional:
+                            description: Specify whether the Secret or its key must
+                              be defined
+                            type: boolean
+                        required:
+                        - key
+                        type: object
+                        x-kubernetes-map-type: atomic
+                    type: object
+                  clientSecret:
+                    description: |-
+                      clientSecret defines a key of a Secret containing the OAuth2
+                      client's secret.
+                    properties:
+                      key:
+                        description: The key of the secret to select from.  Must be
+                          a valid secret key.
+                        type: string
+                      name:
+                        default: ""
+                        description: |-
+                          Name of the referent.
+                          This field is effectively required, but due to backwards compatibility is
+                          allowed to be empty. Instances of this type with an empty value here are
+                          almost certainly wrong.
+                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                        type: string
+                      optional:
+                        description: Specify whether the Secret or its key must be
+                          defined
+                        type: boolean
+                    required:
+                    - key
+                    type: object
+                    x-kubernetes-map-type: atomic
+                  endpointParams:
+                    additionalProperties:
+                      type: string
+                    description: |-
+                      endpointParams configures the HTTP parameters to append to the token
+                      URL.
+                    type: object
+                  noProxy:
+                    description: |-
+                      noProxy defines a comma-separated string that can contain IPs, CIDR notation, domain names
+                      that should be excluded from proxying. IP and domain names can
+                      contain port numbers.
+
+                      It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                    type: string
+                  proxyConnectHeader:
+                    additionalProperties:
+                      items:
+                        description: SecretKeySelector selects a key of a Secret.
+                        properties:
+                          key:
+                            description: The key of the secret to select from.  Must
+                              be a valid secret key.
+                            type: string
+                          name:
+                            default: ""
+                            description: |-
+                              Name of the referent.
+                              This field is effectively required, but due to backwards compatibility is
+                              allowed to be empty. Instances of this type with an empty value here are
+                              almost certainly wrong.
+                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                            type: string
+                          optional:
+                            description: Specify whether the Secret or its key must
+                              be defined
+                            type: boolean
+                        required:
+                        - key
+                        type: object
+                        x-kubernetes-map-type: atomic
+                      type: array
+                    description: |-
+                      proxyConnectHeader optionally specifies headers to send to
+                      proxies during CONNECT requests.
+
+                      It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                    type: object
+                    x-kubernetes-map-type: atomic
+                  proxyFromEnvironment:
+                    description: |-
+                      proxyFromEnvironment defines whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+
+                      It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                    type: boolean
+                  proxyUrl:
+                    description: proxyUrl defines the HTTP proxy server to use.
+                    pattern: ^(http|https|socks5)://.+$
+                    type: string
+                  scopes:
+                    description: scopes defines the OAuth2 scopes used for the token
+                      request.
+                    items:
+                      type: string
+                    type: array
+                  tlsConfig:
+                    description: |-
+                      tlsConfig defines the TLS configuration to use when connecting to the OAuth2 server.
+                      It requires Prometheus >= v2.43.0.
+                    properties:
+                      ca:
+                        description: ca defines the Certificate authority used when
+                          verifying server certificates.
+                        properties:
+                          configMap:
+                            description: configMap defines the ConfigMap containing
+                              data to use for the targets.
+                            properties:
+                              key:
+                                description: The key to select.
+                                type: string
+                              name:
+                                default: ""
+                                description: |-
+                                  Name of the referent.
+                                  This field is effectively required, but due to backwards compatibility is
+                                  allowed to be empty. Instances of this type with an empty value here are
+                                  almost certainly wrong.
+                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                type: string
+                              optional:
+                                description: Specify whether the ConfigMap or its
+                                  key must be defined
+                                type: boolean
+                            required:
+                            - key
+                            type: object
+                            x-kubernetes-map-type: atomic
+                          secret:
+                            description: secret defines the Secret containing data
+                              to use for the targets.
+                            properties:
+                              key:
+                                description: The key of the secret to select from.  Must
+                                  be a valid secret key.
+                                type: string
+                              name:
+                                default: ""
+                                description: |-
+                                  Name of the referent.
+                                  This field is effectively required, but due to backwards compatibility is
+                                  allowed to be empty. Instances of this type with an empty value here are
+                                  almost certainly wrong.
+                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                type: string
+                              optional:
+                                description: Specify whether the Secret or its key
+                                  must be defined
+                                type: boolean
+                            required:
+                            - key
+                            type: object
+                            x-kubernetes-map-type: atomic
+                        type: object
+                      cert:
+                        description: cert defines the Client certificate to present
+                          when doing client-authentication.
+                        properties:
+                          configMap:
+                            description: configMap defines the ConfigMap containing
+                              data to use for the targets.
+                            properties:
+                              key:
+                                description: The key to select.
+                                type: string
+                              name:
+                                default: ""
+                                description: |-
+                                  Name of the referent.
+                                  This field is effectively required, but due to backwards compatibility is
+                                  allowed to be empty. Instances of this type with an empty value here are
+                                  almost certainly wrong.
+                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                type: string
+                              optional:
+                                description: Specify whether the ConfigMap or its
+                                  key must be defined
+                                type: boolean
+                            required:
+                            - key
+                            type: object
+                            x-kubernetes-map-type: atomic
+                          secret:
+                            description: secret defines the Secret containing data
+                              to use for the targets.
+                            properties:
+                              key:
+                                description: The key of the secret to select from.  Must
+                                  be a valid secret key.
+                                type: string
+                              name:
+                                default: ""
+                                description: |-
+                                  Name of the referent.
+                                  This field is effectively required, but due to backwards compatibility is
+                                  allowed to be empty. Instances of this type with an empty value here are
+                                  almost certainly wrong.
+                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                type: string
+                              optional:
+                                description: Specify whether the Secret or its key
+                                  must be defined
+                                type: boolean
+                            required:
+                            - key
+                            type: object
+                            x-kubernetes-map-type: atomic
+                        type: object
+                      insecureSkipVerify:
+                        description: insecureSkipVerify defines how to disable target
+                          certificate validation.
+                        type: boolean
+                      keySecret:
+                        description: keySecret defines the Secret containing the client
+                          key file for the targets.
+                        properties:
+                          key:
+                            description: The key of the secret to select from.  Must
+                              be a valid secret key.
+                            type: string
+                          name:
+                            default: ""
+                            description: |-
+                              Name of the referent.
+                              This field is effectively required, but due to backwards compatibility is
+                              allowed to be empty. Instances of this type with an empty value here are
+                              almost certainly wrong.
+                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                            type: string
+                          optional:
+                            description: Specify whether the Secret or its key must
+                              be defined
+                            type: boolean
+                        required:
+                        - key
+                        type: object
+                        x-kubernetes-map-type: atomic
+                      maxVersion:
+                        description: |-
+                          maxVersion defines the maximum acceptable TLS version.
+
+                          It requires Prometheus >= v2.41.0 or Thanos >= v0.31.0.
+                        enum:
+                        - TLS10
+                        - TLS11
+                        - TLS12
+                        - TLS13
+                        type: string
+                      minVersion:
+                        description: |-
+                          minVersion defines the minimum acceptable TLS version.
+
+                          It requires Prometheus >= v2.35.0 or Thanos >= v0.28.0.
+                        enum:
+                        - TLS10
+                        - TLS11
+                        - TLS12
+                        - TLS13
+                        type: string
+                      serverName:
+                        description: serverName is used to verify the hostname for
+                          the targets.
+                        type: string
+                    type: object
+                  tokenUrl:
+                    description: tokenUrl defines the URL to fetch the token from.
+                    minLength: 1
+                    type: string
+                required:
+                - clientId
+                - clientSecret
+                - tokenUrl
+                type: object
+              openstackSDConfigs:
+                description: openstackSDConfigs defines a list of OpenStack service
+                  discovery configurations.
+                items:
+                  description: |-
+                    OpenStackSDConfig allow retrieving scrape targets from OpenStack Nova instances.
+                    See https://prometheus.io/docs/prometheus/latest/configuration/configuration/#openstack_sd_config
+                  properties:
+                    allTenants:
+                      description: |-
+                        allTenants defines whether the service discovery should list all instances for all projects.
+                        It is only relevant for the 'instance' role and usually requires admin permissions.
+                      type: boolean
+                    applicationCredentialId:
+                      description: applicationCredentialId defines the OpenStack applicationCredentialId.
+                      type: string
+                    applicationCredentialName:
+                      description: |-
+                        applicationCredentialName defines the ApplicationCredentialID or ApplicationCredentialName fields are
+                        required if using an application credential to authenticate. Some providers
+                        allow you to create an application credential to authenticate rather than a
+                        password.
+                      minLength: 1
+                      type: string
+                    applicationCredentialSecret:
+                      description: |-
+                        applicationCredentialSecret defines the required field if using an application
+                        credential to authenticate.
+                      properties:
+                        key:
+                          description: The key of the secret to select from.  Must
+                            be a valid secret key.
+                          type: string
+                        name:
+                          default: ""
+                          description: |-
+                            Name of the referent.
+                            This field is effectively required, but due to backwards compatibility is
+                            allowed to be empty. Instances of this type with an empty value here are
+                            almost certainly wrong.
+                            More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                          type: string
+                        optional:
+                          description: Specify whether the Secret or its key must
+                            be defined
+                          type: boolean
+                      required:
+                      - key
+                      type: object
+                      x-kubernetes-map-type: atomic
+                    availability:
+                      description: availability defines the availability of the endpoint
+                        to connect to.
+                      enum:
+                      - Public
+                      - public
+                      - Admin
+                      - admin
+                      - Internal
+                      - internal
+                      type: string
+                    domainID:
+                      description: domainID defines The OpenStack domainID.
+                      minLength: 1
+                      type: string
+                    domainName:
+                      description: |-
+                        domainName defines at most one of domainId and domainName that must be provided if using username
+                        with Identity V3. Otherwise, either are optional.
+                      minLength: 1
+                      type: string
+                    identityEndpoint:
+                      description: |-
+                        identityEndpoint defines the HTTP endpoint that is required to work with
+                        the Identity API of the appropriate version.
+                      pattern: ^http(s)?:\/\/.+$
+                      type: string
+                    password:
+                      description: |-
+                        password defines the password for the Identity V2 and V3 APIs. Consult with your provider's
+                        control panel to discover your account's preferred method of authentication.
+                      properties:
+                        key:
+                          description: The key of the secret to select from.  Must
+                            be a valid secret key.
+                          type: string
+                        name:
+                          default: ""
+                          description: |-
+                            Name of the referent.
+                            This field is effectively required, but due to backwards compatibility is
+                            allowed to be empty. Instances of this type with an empty value here are
+                            almost certainly wrong.
+                            More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                          type: string
+                        optional:
+                          description: Specify whether the Secret or its key must
+                            be defined
+                          type: boolean
+                      required:
+                      - key
+                      type: object
+                      x-kubernetes-map-type: atomic
+                    port:
+                      description: |-
+                        port defines the port to scrape metrics from. If using the public IP address, this must
+                        instead be specified in the relabeling rule.
+                      format: int32
+                      maximum: 65535
+                      minimum: 0
+                      type: integer
+                    projectID:
+                      description: projectID defines the OpenStack projectID.
+                      minLength: 1
+                      type: string
+                    projectName:
+                      description: |-
+                        projectName defines an optional field for the Identity V2 API.
+                        Some providers allow you to specify a ProjectName instead of the ProjectId.
+                        Some require both. Your provider's authentication policies will determine
+                        how these fields influence authentication.
+                      minLength: 1
+                      type: string
+                    refreshInterval:
+                      description: |-
+                        refreshInterval defines the time after which the provided names are refreshed.
+                        If not set, Prometheus uses its default value.
+                      pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
+                      type: string
+                    region:
+                      description: region defines the OpenStack Region.
+                      minLength: 1
+                      type: string
+                    role:
+                      description: |-
+                        role defines the OpenStack role of entities that should be discovered.
+
+                        Note: The `LoadBalancer` role requires Prometheus >= v3.2.0.
+                      enum:
+                      - Instance
+                      - Hypervisor
+                      - LoadBalancer
+                      type: string
+                    tlsConfig:
+                      description: tlsConfig defines the TLS configuration applying
+                        to the target HTTP endpoint.
+                      properties:
+                        ca:
+                          description: ca defines the Certificate authority used when
+                            verifying server certificates.
+                          properties:
+                            configMap:
+                              description: configMap defines the ConfigMap containing
+                                data to use for the targets.
+                              properties:
+                                key:
+                                  description: The key to select.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the ConfigMap or its
+                                    key must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            secret:
+                              description: secret defines the Secret containing data
+                                to use for the targets.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                          type: object
+                        cert:
+                          description: cert defines the Client certificate to present
+                            when doing client-authentication.
+                          properties:
+                            configMap:
+                              description: configMap defines the ConfigMap containing
+                                data to use for the targets.
+                              properties:
+                                key:
+                                  description: The key to select.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the ConfigMap or its
+                                    key must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            secret:
+                              description: secret defines the Secret containing data
+                                to use for the targets.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                          type: object
+                        insecureSkipVerify:
+                          description: insecureSkipVerify defines how to disable target
+                            certificate validation.
+                          type: boolean
+                        keySecret:
+                          description: keySecret defines the Secret containing the
+                            client key file for the targets.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        maxVersion:
+                          description: |-
+                            maxVersion defines the maximum acceptable TLS version.
+
+                            It requires Prometheus >= v2.41.0 or Thanos >= v0.31.0.
+                          enum:
+                          - TLS10
+                          - TLS11
+                          - TLS12
+                          - TLS13
+                          type: string
+                        minVersion:
+                          description: |-
+                            minVersion defines the minimum acceptable TLS version.
+
+                            It requires Prometheus >= v2.35.0 or Thanos >= v0.28.0.
+                          enum:
+                          - TLS10
+                          - TLS11
+                          - TLS12
+                          - TLS13
+                          type: string
+                        serverName:
+                          description: serverName is used to verify the hostname for
+                            the targets.
+                          type: string
+                      type: object
+                    userid:
+                      description: userid defines the OpenStack userid.
+                      minLength: 1
+                      type: string
+                    username:
+                      description: |-
+                        username defines the username required if using Identity V2 API. Consult with your provider's
+                        control panel to discover your account's username.
+                        In Identity V3, either userid or a combination of username
+                        and domainId or domainName are needed
+                      minLength: 1
+                      type: string
+                  required:
+                  - region
+                  - role
+                  type: object
+                type: array
+              ovhcloudSDConfigs:
+                description: ovhcloudSDConfigs defines a list of OVHcloud service
+                  discovery configurations.
+                items:
+                  description: |-
+                    OVHCloudSDConfig configurations allow retrieving scrape targets from OVHcloud's dedicated servers and VPS using their API.
+                    See https://prometheus.io/docs/prometheus/latest/configuration/configuration/#ovhcloud_sd_config
+                  properties:
+                    applicationKey:
+                      description: |-
+                        applicationKey defines the access key to use for OVHCloud API authentication.
+                        This is obtained from the OVHCloud API credentials at https://api.ovh.com.
+                      minLength: 1
+                      type: string
+                    applicationSecret:
+                      description: |-
+                        applicationSecret defines the secret key for OVHCloud API authentication.
+                        This contains the application secret obtained during OVHCloud API credential creation.
+                      properties:
+                        key:
+                          description: The key of the secret to select from.  Must
+                            be a valid secret key.
+                          type: string
+                        name:
+                          default: ""
+                          description: |-
+                            Name of the referent.
+                            This field is effectively required, but due to backwards compatibility is
+                            allowed to be empty. Instances of this type with an empty value here are
+                            almost certainly wrong.
+                            More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                          type: string
+                        optional:
+                          description: Specify whether the Secret or its key must
+                            be defined
+                          type: boolean
+                      required:
+                      - key
+                      type: object
+                      x-kubernetes-map-type: atomic
+                    consumerKey:
+                      description: |-
+                        consumerKey defines the consumer key for OVHCloud API authentication.
+                        This is the third component of OVHCloud's three-key authentication system.
+                      properties:
+                        key:
+                          description: The key of the secret to select from.  Must
+                            be a valid secret key.
+                          type: string
+                        name:
+                          default: ""
+                          description: |-
+                            Name of the referent.
+                            This field is effectively required, but due to backwards compatibility is
+                            allowed to be empty. Instances of this type with an empty value here are
+                            almost certainly wrong.
+                            More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                          type: string
+                        optional:
+                          description: Specify whether the Secret or its key must
+                            be defined
+                          type: boolean
+                      required:
+                      - key
+                      type: object
+                      x-kubernetes-map-type: atomic
+                    endpoint:
+                      description: |-
+                        endpoint defines a custom API endpoint to be used.
+                        When not specified, defaults to the standard OVHCloud API endpoint for the region.
+                      minLength: 1
+                      type: string
+                    refreshInterval:
+                      description: |-
+                        refreshInterval defines the time after which the provided names are refreshed.
+                        If not set, Prometheus uses its default value.
+                      pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
+                      type: string
+                    service:
+                      description: |-
+                        service defines the service type of the targets to retrieve.
+                        Must be either `VPS` or `DedicatedServer` to specify which OVHCloud resources to discover.
+                      enum:
+                      - VPS
+                      - DedicatedServer
+                      type: string
+                  required:
+                  - applicationKey
+                  - applicationSecret
+                  - consumerKey
+                  - service
+                  type: object
+                type: array
+              params:
+                additionalProperties:
+                  items:
+                    type: string
+                  type: array
+                description: params defines optional HTTP URL parameters
+                type: object
+                x-kubernetes-map-type: atomic
+              proxyConnectHeader:
+                additionalProperties:
+                  items:
+                    description: SecretKeySelector selects a key of a Secret.
+                    properties:
+                      key:
+                        description: The key of the secret to select from.  Must be
+                          a valid secret key.
+                        type: string
+                      name:
+                        default: ""
+                        description: |-
+                          Name of the referent.
+                          This field is effectively required, but due to backwards compatibility is
+                          allowed to be empty. Instances of this type with an empty value here are
+                          almost certainly wrong.
+                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                        type: string
+                      optional:
+                        description: Specify whether the Secret or its key must be
+                          defined
+                        type: boolean
+                    required:
+                    - key
+                    type: object
+                    x-kubernetes-map-type: atomic
+                  type: array
+                description: |-
+                  proxyConnectHeader optionally specifies headers to send to
+                  proxies during CONNECT requests.
+
+                  It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                type: object
+                x-kubernetes-map-type: atomic
+              proxyFromEnvironment:
+                description: |-
+                  proxyFromEnvironment defines whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+
+                  It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                type: boolean
+              proxyUrl:
+                description: proxyUrl defines the HTTP proxy server to use.
+                pattern: ^(http|https|socks5)://.+$
+                type: string
+              puppetDBSDConfigs:
+                description: puppetDBSDConfigs defines a list of PuppetDB service
+                  discovery configurations.
+                items:
+                  description: |-
+                    PuppetDBSDConfig configurations allow retrieving scrape targets from PuppetDB resources.
+                    See https://prometheus.io/docs/prometheus/latest/configuration/configuration/#puppetdb_sd_config
+                  properties:
+                    authorization:
+                      description: |-
+                        authorization defines the  header configuration to authenticate against the DigitalOcean API.
+                        Cannot be set at the same time as `oauth2`.
+                      properties:
+                        credentials:
+                          description: credentials defines a key of a Secret in the
+                            namespace that contains the credentials for authentication.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        type:
+                          description: |-
+                            type defines the authentication type. The value is case-insensitive.
+
+                            "Basic" is not a supported value.
+
+                            Default: "Bearer"
+                          type: string
+                      type: object
+                    basicAuth:
+                      description: |-
+                        basicAuth defines information to use on every scrape request.
+                        Cannot be set at the same time as `authorization`, or `oauth2`.
+                      properties:
+                        password:
+                          description: |-
+                            password defines a key of a Secret containing the password for
+                            authentication.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        username:
+                          description: |-
+                            username defines a key of a Secret containing the username for
+                            authentication.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                      type: object
+                    enableHTTP2:
+                      description: enableHTTP2 defines whether to enable HTTP2.
+                      type: boolean
+                    followRedirects:
+                      description: followRedirects defines whether HTTP requests follow
+                        HTTP 3xx redirects.
+                      type: boolean
+                    includeParameters:
+                      description: |-
+                        includeParameters defines whether to include the parameters as meta labels.
+                        Note: Enabling this exposes parameters in the Prometheus UI and API. Make sure
+                        that you don't have secrets exposed as parameters if you enable this.
+                      type: boolean
+                    noProxy:
+                      description: |-
+                        noProxy defines a comma-separated string that can contain IPs, CIDR notation, domain names
+                        that should be excluded from proxying. IP and domain names can
+                        contain port numbers.
+
+                        It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                      type: string
+                    oauth2:
+                      description: |-
+                        oauth2 defines the optional OAuth 2.0 configuration to authenticate against the target HTTP endpoint.
+                        Cannot be set at the same time as `authorization`, or `basicAuth`.
+                      properties:
+                        clientId:
+                          description: |-
+                            clientId defines a key of a Secret or ConfigMap containing the
+                            OAuth2 client's ID.
+                          properties:
+                            configMap:
+                              description: configMap defines the ConfigMap containing
+                                data to use for the targets.
+                              properties:
+                                key:
+                                  description: The key to select.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the ConfigMap or its
+                                    key must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            secret:
+                              description: secret defines the Secret containing data
+                                to use for the targets.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                          type: object
+                        clientSecret:
+                          description: |-
+                            clientSecret defines a key of a Secret containing the OAuth2
+                            client's secret.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        endpointParams:
+                          additionalProperties:
+                            type: string
+                          description: |-
+                            endpointParams configures the HTTP parameters to append to the token
+                            URL.
+                          type: object
+                        noProxy:
+                          description: |-
+                            noProxy defines a comma-separated string that can contain IPs, CIDR notation, domain names
+                            that should be excluded from proxying. IP and domain names can
+                            contain port numbers.
+
+                            It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                          type: string
+                        proxyConnectHeader:
+                          additionalProperties:
+                            items:
+                              description: SecretKeySelector selects a key of a Secret.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            type: array
+                          description: |-
+                            proxyConnectHeader optionally specifies headers to send to
+                            proxies during CONNECT requests.
+
+                            It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        proxyFromEnvironment:
+                          description: |-
+                            proxyFromEnvironment defines whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+
+                            It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                          type: boolean
+                        proxyUrl:
+                          description: proxyUrl defines the HTTP proxy server to use.
+                          pattern: ^(http|https|socks5)://.+$
+                          type: string
+                        scopes:
+                          description: scopes defines the OAuth2 scopes used for the
+                            token request.
+                          items:
+                            type: string
+                          type: array
+                        tlsConfig:
+                          description: |-
+                            tlsConfig defines the TLS configuration to use when connecting to the OAuth2 server.
+                            It requires Prometheus >= v2.43.0.
+                          properties:
+                            ca:
+                              description: ca defines the Certificate authority used
+                                when verifying server certificates.
+                              properties:
+                                configMap:
+                                  description: configMap defines the ConfigMap containing
+                                    data to use for the targets.
+                                  properties:
+                                    key:
+                                      description: The key to select.
+                                      type: string
+                                    name:
+                                      default: ""
+                                      description: |-
+                                        Name of the referent.
+                                        This field is effectively required, but due to backwards compatibility is
+                                        allowed to be empty. Instances of this type with an empty value here are
+                                        almost certainly wrong.
+                                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                      type: string
+                                    optional:
+                                      description: Specify whether the ConfigMap or
+                                        its key must be defined
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                secret:
+                                  description: secret defines the Secret containing
+                                    data to use for the targets.
+                                  properties:
+                                    key:
+                                      description: The key of the secret to select
+                                        from.  Must be a valid secret key.
+                                      type: string
+                                    name:
+                                      default: ""
+                                      description: |-
+                                        Name of the referent.
+                                        This field is effectively required, but due to backwards compatibility is
+                                        allowed to be empty. Instances of this type with an empty value here are
+                                        almost certainly wrong.
+                                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                      type: string
+                                    optional:
+                                      description: Specify whether the Secret or its
+                                        key must be defined
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                              type: object
+                            cert:
+                              description: cert defines the Client certificate to
+                                present when doing client-authentication.
+                              properties:
+                                configMap:
+                                  description: configMap defines the ConfigMap containing
+                                    data to use for the targets.
+                                  properties:
+                                    key:
+                                      description: The key to select.
+                                      type: string
+                                    name:
+                                      default: ""
+                                      description: |-
+                                        Name of the referent.
+                                        This field is effectively required, but due to backwards compatibility is
+                                        allowed to be empty. Instances of this type with an empty value here are
+                                        almost certainly wrong.
+                                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                      type: string
+                                    optional:
+                                      description: Specify whether the ConfigMap or
+                                        its key must be defined
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                secret:
+                                  description: secret defines the Secret containing
+                                    data to use for the targets.
+                                  properties:
+                                    key:
+                                      description: The key of the secret to select
+                                        from.  Must be a valid secret key.
+                                      type: string
+                                    name:
+                                      default: ""
+                                      description: |-
+                                        Name of the referent.
+                                        This field is effectively required, but due to backwards compatibility is
+                                        allowed to be empty. Instances of this type with an empty value here are
+                                        almost certainly wrong.
+                                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                      type: string
+                                    optional:
+                                      description: Specify whether the Secret or its
+                                        key must be defined
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                              type: object
+                            insecureSkipVerify:
+                              description: insecureSkipVerify defines how to disable
+                                target certificate validation.
+                              type: boolean
+                            keySecret:
+                              description: keySecret defines the Secret containing
+                                the client key file for the targets.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            maxVersion:
+                              description: |-
+                                maxVersion defines the maximum acceptable TLS version.
+
+                                It requires Prometheus >= v2.41.0 or Thanos >= v0.31.0.
+                              enum:
+                              - TLS10
+                              - TLS11
+                              - TLS12
+                              - TLS13
+                              type: string
+                            minVersion:
+                              description: |-
+                                minVersion defines the minimum acceptable TLS version.
+
+                                It requires Prometheus >= v2.35.0 or Thanos >= v0.28.0.
+                              enum:
+                              - TLS10
+                              - TLS11
+                              - TLS12
+                              - TLS13
+                              type: string
+                            serverName:
+                              description: serverName is used to verify the hostname
+                                for the targets.
+                              type: string
+                          type: object
+                        tokenUrl:
+                          description: tokenUrl defines the URL to fetch the token
+                            from.
+                          minLength: 1
+                          type: string
+                      required:
+                      - clientId
+                      - clientSecret
+                      - tokenUrl
+                      type: object
+                    port:
+                      description: port defines the port to scrape metrics from. If
+                        using the public IP address, this must
+                      format: int32
+                      maximum: 65535
+                      minimum: 0
+                      type: integer
+                    proxyConnectHeader:
+                      additionalProperties:
+                        items:
+                          description: SecretKeySelector selects a key of a Secret.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        type: array
+                      description: |-
+                        proxyConnectHeader optionally specifies headers to send to
+                        proxies during CONNECT requests.
+
+                        It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                      type: object
+                      x-kubernetes-map-type: atomic
+                    proxyFromEnvironment:
+                      description: |-
+                        proxyFromEnvironment defines whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+
+                        It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                      type: boolean
+                    proxyUrl:
+                      description: proxyUrl defines the HTTP proxy server to use.
+                      pattern: ^(http|https|socks5)://.+$
+                      type: string
+                    query:
+                      description: |-
+                        query defines the Puppet Query Language (PQL) query. Only resources are supported.
+                        https://puppet.com/docs/puppetdb/latest/api/query/v4/pql.html
+                      minLength: 1
+                      type: string
+                    refreshInterval:
+                      description: |-
+                        refreshInterval defines the time after which the provided names are refreshed.
+                        If not set, Prometheus uses its default value.
+                      pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
+                      type: string
+                    tlsConfig:
+                      description: tlsConfig defines the TLS configuration to connect
+                        to the Consul API.
+                      properties:
+                        ca:
+                          description: ca defines the Certificate authority used when
+                            verifying server certificates.
+                          properties:
+                            configMap:
+                              description: configMap defines the ConfigMap containing
+                                data to use for the targets.
+                              properties:
+                                key:
+                                  description: The key to select.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the ConfigMap or its
+                                    key must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            secret:
+                              description: secret defines the Secret containing data
+                                to use for the targets.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                          type: object
+                        cert:
+                          description: cert defines the Client certificate to present
+                            when doing client-authentication.
+                          properties:
+                            configMap:
+                              description: configMap defines the ConfigMap containing
+                                data to use for the targets.
+                              properties:
+                                key:
+                                  description: The key to select.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the ConfigMap or its
+                                    key must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            secret:
+                              description: secret defines the Secret containing data
+                                to use for the targets.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                          type: object
+                        insecureSkipVerify:
+                          description: insecureSkipVerify defines how to disable target
+                            certificate validation.
+                          type: boolean
+                        keySecret:
+                          description: keySecret defines the Secret containing the
+                            client key file for the targets.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        maxVersion:
+                          description: |-
+                            maxVersion defines the maximum acceptable TLS version.
+
+                            It requires Prometheus >= v2.41.0 or Thanos >= v0.31.0.
+                          enum:
+                          - TLS10
+                          - TLS11
+                          - TLS12
+                          - TLS13
+                          type: string
+                        minVersion:
+                          description: |-
+                            minVersion defines the minimum acceptable TLS version.
+
+                            It requires Prometheus >= v2.35.0 or Thanos >= v0.28.0.
+                          enum:
+                          - TLS10
+                          - TLS11
+                          - TLS12
+                          - TLS13
+                          type: string
+                        serverName:
+                          description: serverName is used to verify the hostname for
+                            the targets.
+                          type: string
+                      type: object
+                    url:
+                      description: url defines the URL of the PuppetDB root query
+                        endpoint.
+                      minLength: 1
+                      pattern: ^http(s)?://.+$
+                      type: string
+                  required:
+                  - query
+                  - url
+                  type: object
+                type: array
+              relabelings:
+                description: |-
+                  relabelings defines how to rewrite the target's labels before scraping.
+                  Prometheus Operator automatically adds relabelings for a few standard Kubernetes fields.
+                  The original scrape job's name is available via the `__tmp_prometheus_job_name` label.
+                  More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config
+                items:
+                  description: |-
+                    RelabelConfig allows dynamic rewriting of the label set for targets, alerts,
+                    scraped samples and remote write samples.
+
+                    More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config
+                  properties:
+                    action:
+                      default: replace
+                      description: |-
+                        action to perform based on the regex matching.
+
+                        `Uppercase` and `Lowercase` actions require Prometheus >= v2.36.0.
+                        `DropEqual` and `KeepEqual` actions require Prometheus >= v2.41.0.
+
+                        Default: "Replace"
+                      enum:
+                      - replace
+                      - Replace
+                      - keep
+                      - Keep
+                      - drop
+                      - Drop
+                      - hashmod
+                      - HashMod
+                      - labelmap
+                      - LabelMap
+                      - labeldrop
+                      - LabelDrop
+                      - labelkeep
+                      - LabelKeep
+                      - lowercase
+                      - Lowercase
+                      - uppercase
+                      - Uppercase
+                      - keepequal
+                      - KeepEqual
+                      - dropequal
+                      - DropEqual
+                      type: string
+                    modulus:
+                      description: |-
+                        modulus to take of the hash of the source label values.
+
+                        Only applicable when the action is `HashMod`.
+                      format: int64
+                      type: integer
+                    regex:
+                      description: regex defines the regular expression against which
+                        the extracted value is matched.
+                      type: string
+                    replacement:
+                      description: |-
+                        replacement value against which a Replace action is performed if the
+                        regular expression matches.
+
+                        Regex capture groups are available.
+                      type: string
+                    separator:
+                      description: separator defines the string between concatenated
+                        SourceLabels.
+                      type: string
+                    sourceLabels:
+                      description: |-
+                        sourceLabels defines the source labels select values from existing labels. Their content is
+                        concatenated using the configured Separator and matched against the
+                        configured regular expression.
+                      items:
+                        description: |-
+                          LabelName is a valid Prometheus label name.
+                          For Prometheus 3.x, a label name is valid if it contains UTF-8 characters.
+                          For Prometheus 2.x, a label name is only valid if it contains ASCII characters, letters, numbers, as well as underscores.
+                        type: string
+                      type: array
+                    targetLabel:
+                      description: |-
+                        targetLabel defines the label to which the resulting string is written in a replacement.
+
+                        It is mandatory for `Replace`, `HashMod`, `Lowercase`, `Uppercase`,
+                        `KeepEqual` and `DropEqual` actions.
+
+                        Regex capture groups are available.
+                      type: string
+                  type: object
+                minItems: 1
+                type: array
+              sampleLimit:
+                description: sampleLimit defines per-scrape limit on number of scraped
+                  samples that will be accepted.
+                format: int64
+                type: integer
+              scalewaySDConfigs:
+                description: scalewaySDConfigs defines a list of Scaleway instances
+                  and baremetal service discovery configurations.
+                items:
+                  description: |-
+                    ScalewaySDConfig configurations allow retrieving scrape targets from Scaleway instances and baremetal services.
+                    See https://prometheus.io/docs/prometheus/latest/configuration/configuration/#scaleway_sd_config
+                  properties:
+                    accessKey:
+                      description: accessKey defines the access key to use. https://console.scaleway.com/project/credentials
+                      minLength: 1
+                      type: string
+                    apiURL:
+                      description: apiURL defines the API URL to use when doing the
+                        server listing requests.
+                      pattern: ^http(s)?://.+$
+                      type: string
+                    enableHTTP2:
+                      description: enableHTTP2 defines whether to enable HTTP2.
+                      type: boolean
+                    followRedirects:
+                      description: followRedirects defines whether HTTP requests follow
+                        HTTP 3xx redirects.
+                      type: boolean
+                    nameFilter:
+                      description: nameFilter defines a name filter (works as a LIKE)
+                        to apply on the server listing request.
+                      minLength: 1
+                      type: string
+                    noProxy:
+                      description: |-
+                        noProxy defines a comma-separated string that can contain IPs, CIDR notation, domain names
+                        that should be excluded from proxying. IP and domain names can
+                        contain port numbers.
+
+                        It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                      type: string
+                    port:
+                      description: port defines the port to scrape metrics from. If
+                        using the public IP address, this must
+                      format: int32
+                      maximum: 65535
+                      minimum: 0
+                      type: integer
+                    projectID:
+                      description: projectID defines the Project ID of the targets.
+                      minLength: 1
+                      type: string
+                    proxyConnectHeader:
+                      additionalProperties:
+                        items:
+                          description: SecretKeySelector selects a key of a Secret.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        type: array
+                      description: |-
+                        proxyConnectHeader optionally specifies headers to send to
+                        proxies during CONNECT requests.
+
+                        It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                      type: object
+                      x-kubernetes-map-type: atomic
+                    proxyFromEnvironment:
+                      description: |-
+                        proxyFromEnvironment defines whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+
+                        It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                      type: boolean
+                    proxyUrl:
+                      description: proxyUrl defines the HTTP proxy server to use.
+                      pattern: ^(http|https|socks5)://.+$
+                      type: string
+                    refreshInterval:
+                      description: |-
+                        refreshInterval defines the time after which the provided names are refreshed.
+                        If not set, Prometheus uses its default value.
+                      pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
+                      type: string
+                    role:
+                      description: role defines the service of the targets to retrieve.
+                        Must be `Instance` or `Baremetal`.
+                      enum:
+                      - Instance
+                      - Baremetal
+                      type: string
+                    secretKey:
+                      description: secretKey defines the secret key to use when listing
+                        targets.
+                      properties:
+                        key:
+                          description: The key of the secret to select from.  Must
+                            be a valid secret key.
+                          type: string
+                        name:
+                          default: ""
+                          description: |-
+                            Name of the referent.
+                            This field is effectively required, but due to backwards compatibility is
+                            allowed to be empty. Instances of this type with an empty value here are
+                            almost certainly wrong.
+                            More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                          type: string
+                        optional:
+                          description: Specify whether the Secret or its key must
+                            be defined
+                          type: boolean
+                      required:
+                      - key
+                      type: object
+                      x-kubernetes-map-type: atomic
+                    tagsFilter:
+                      description: tagsFilter defines a tag filter (a server needs
+                        to have all defined tags to be listed) to apply on the server
+                        listing request.
+                      items:
+                        minLength: 1
+                        type: string
+                      minItems: 1
+                      type: array
+                      x-kubernetes-list-type: set
+                    tlsConfig:
+                      description: tlsConfig defines the TLS configuration to connect
+                        to the Consul API.
+                      properties:
+                        ca:
+                          description: ca defines the Certificate authority used when
+                            verifying server certificates.
+                          properties:
+                            configMap:
+                              description: configMap defines the ConfigMap containing
+                                data to use for the targets.
+                              properties:
+                                key:
+                                  description: The key to select.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the ConfigMap or its
+                                    key must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            secret:
+                              description: secret defines the Secret containing data
+                                to use for the targets.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                          type: object
+                        cert:
+                          description: cert defines the Client certificate to present
+                            when doing client-authentication.
+                          properties:
+                            configMap:
+                              description: configMap defines the ConfigMap containing
+                                data to use for the targets.
+                              properties:
+                                key:
+                                  description: The key to select.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the ConfigMap or its
+                                    key must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            secret:
+                              description: secret defines the Secret containing data
+                                to use for the targets.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                          type: object
+                        insecureSkipVerify:
+                          description: insecureSkipVerify defines how to disable target
+                            certificate validation.
+                          type: boolean
+                        keySecret:
+                          description: keySecret defines the Secret containing the
+                            client key file for the targets.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        maxVersion:
+                          description: |-
+                            maxVersion defines the maximum acceptable TLS version.
+
+                            It requires Prometheus >= v2.41.0 or Thanos >= v0.31.0.
+                          enum:
+                          - TLS10
+                          - TLS11
+                          - TLS12
+                          - TLS13
+                          type: string
+                        minVersion:
+                          description: |-
+                            minVersion defines the minimum acceptable TLS version.
+
+                            It requires Prometheus >= v2.35.0 or Thanos >= v0.28.0.
+                          enum:
+                          - TLS10
+                          - TLS11
+                          - TLS12
+                          - TLS13
+                          type: string
+                        serverName:
+                          description: serverName is used to verify the hostname for
+                            the targets.
+                          type: string
+                      type: object
+                    zone:
+                      description: zone defines the availability zone of your targets
+                        (e.g. fr-par-1).
+                      minLength: 1
+                      type: string
+                  required:
+                  - accessKey
+                  - projectID
+                  - role
+                  - secretKey
+                  type: object
+                type: array
+              scheme:
+                description: scheme defines the protocol scheme used for requests.
+                enum:
+                - http
+                - https
+                - HTTP
+                - HTTPS
+                type: string
+              scrapeClass:
+                description: scrapeClass defines the scrape class to apply.
+                minLength: 1
+                type: string
+              scrapeClassicHistograms:
+                description: |-
+                  scrapeClassicHistograms defines whether to scrape a classic histogram that is also exposed as a native histogram.
+                  It requires Prometheus >= v2.45.0.
+
+                  Notice: `scrapeClassicHistograms` corresponds to the `always_scrape_classic_histograms` field in the Prometheus configuration.
+                type: boolean
+              scrapeInterval:
+                description: scrapeInterval defines the interval between consecutive
+                  scrapes.
+                pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
+                type: string
+              scrapeProtocols:
+                description: |-
+                  scrapeProtocols defines the protocols to negotiate during a scrape. It tells clients the
+                  protocols supported by Prometheus in order of preference (from most to least preferred).
+
+                  If unset, Prometheus uses its default value.
+
+                  It requires Prometheus >= v2.49.0.
+                items:
+                  description: |-
+                    ScrapeProtocol represents a protocol used by Prometheus for scraping metrics.
+                    Supported values are:
+                    * `OpenMetricsText0.0.1`
+                    * `OpenMetricsText1.0.0`
+                    * `PrometheusProto`
+                    * `PrometheusText0.0.4`
+                    * `PrometheusText1.0.0`
+                  enum:
+                  - PrometheusProto
+                  - OpenMetricsText0.0.1
+                  - OpenMetricsText1.0.0
+                  - PrometheusText0.0.4
+                  - PrometheusText1.0.0
+                  type: string
+                minItems: 1
+                type: array
+                x-kubernetes-list-type: set
+              scrapeTimeout:
+                description: |-
+                  scrapeTimeout defines the number of seconds to wait until a scrape request times out.
+                  The value cannot be greater than the scrape interval otherwise the operator will reject the resource.
+                pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
+                type: string
+              staticConfigs:
+                description: staticConfigs defines a list of static targets with a
+                  common label set.
+                items:
+                  description: |-
+                    StaticConfig defines a Prometheus static configuration.
+                    See https://prometheus.io/docs/prometheus/latest/configuration/configuration/#scrape_config
+                  properties:
+                    labels:
+                      additionalProperties:
+                        type: string
+                      description: labels defines labels assigned to all metrics scraped
+                        from the targets.
+                      type: object
+                      x-kubernetes-map-type: atomic
+                    targets:
+                      description: targets defines the list of targets for this static
+                        configuration.
+                      items:
+                        description: |-
+                          Target represents a target for Prometheus to scrape
+                          kubebuilder:validation:MinLength:=1
+                        type: string
+                      minItems: 1
+                      type: array
+                      x-kubernetes-list-type: set
+                  required:
+                  - targets
+                  type: object
+                type: array
+              targetLimit:
+                description: targetLimit defines a limit on the number of scraped
+                  targets that will be accepted.
+                format: int64
+                type: integer
+              tlsConfig:
+                description: tlsConfig defines the TLS configuration to use on every
+                  scrape request
+                properties:
+                  ca:
+                    description: ca defines the Certificate authority used when verifying
+                      server certificates.
+                    properties:
+                      configMap:
+                        description: configMap defines the ConfigMap containing data
+                          to use for the targets.
+                        properties:
+                          key:
+                            description: The key to select.
+                            type: string
+                          name:
+                            default: ""
+                            description: |-
+                              Name of the referent.
+                              This field is effectively required, but due to backwards compatibility is
+                              allowed to be empty. Instances of this type with an empty value here are
+                              almost certainly wrong.
+                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                            type: string
+                          optional:
+                            description: Specify whether the ConfigMap or its key
+                              must be defined
+                            type: boolean
+                        required:
+                        - key
+                        type: object
+                        x-kubernetes-map-type: atomic
+                      secret:
+                        description: secret defines the Secret containing data to
+                          use for the targets.
+                        properties:
+                          key:
+                            description: The key of the secret to select from.  Must
+                              be a valid secret key.
+                            type: string
+                          name:
+                            default: ""
+                            description: |-
+                              Name of the referent.
+                              This field is effectively required, but due to backwards compatibility is
+                              allowed to be empty. Instances of this type with an empty value here are
+                              almost certainly wrong.
+                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                            type: string
+                          optional:
+                            description: Specify whether the Secret or its key must
+                              be defined
+                            type: boolean
+                        required:
+                        - key
+                        type: object
+                        x-kubernetes-map-type: atomic
+                    type: object
+                  cert:
+                    description: cert defines the Client certificate to present when
+                      doing client-authentication.
+                    properties:
+                      configMap:
+                        description: configMap defines the ConfigMap containing data
+                          to use for the targets.
+                        properties:
+                          key:
+                            description: The key to select.
+                            type: string
+                          name:
+                            default: ""
+                            description: |-
+                              Name of the referent.
+                              This field is effectively required, but due to backwards compatibility is
+                              allowed to be empty. Instances of this type with an empty value here are
+                              almost certainly wrong.
+                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                            type: string
+                          optional:
+                            description: Specify whether the ConfigMap or its key
+                              must be defined
+                            type: boolean
+                        required:
+                        - key
+                        type: object
+                        x-kubernetes-map-type: atomic
+                      secret:
+                        description: secret defines the Secret containing data to
+                          use for the targets.
+                        properties:
+                          key:
+                            description: The key of the secret to select from.  Must
+                              be a valid secret key.
+                            type: string
+                          name:
+                            default: ""
+                            description: |-
+                              Name of the referent.
+                              This field is effectively required, but due to backwards compatibility is
+                              allowed to be empty. Instances of this type with an empty value here are
+                              almost certainly wrong.
+                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                            type: string
+                          optional:
+                            description: Specify whether the Secret or its key must
+                              be defined
+                            type: boolean
+                        required:
+                        - key
+                        type: object
+                        x-kubernetes-map-type: atomic
+                    type: object
+                  insecureSkipVerify:
+                    description: insecureSkipVerify defines how to disable target
+                      certificate validation.
+                    type: boolean
+                  keySecret:
+                    description: keySecret defines the Secret containing the client
+                      key file for the targets.
+                    properties:
+                      key:
+                        description: The key of the secret to select from.  Must be
+                          a valid secret key.
+                        type: string
+                      name:
+                        default: ""
+                        description: |-
+                          Name of the referent.
+                          This field is effectively required, but due to backwards compatibility is
+                          allowed to be empty. Instances of this type with an empty value here are
+                          almost certainly wrong.
+                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                        type: string
+                      optional:
+                        description: Specify whether the Secret or its key must be
+                          defined
+                        type: boolean
+                    required:
+                    - key
+                    type: object
+                    x-kubernetes-map-type: atomic
+                  maxVersion:
+                    description: |-
+                      maxVersion defines the maximum acceptable TLS version.
+
+                      It requires Prometheus >= v2.41.0 or Thanos >= v0.31.0.
+                    enum:
+                    - TLS10
+                    - TLS11
+                    - TLS12
+                    - TLS13
+                    type: string
+                  minVersion:
+                    description: |-
+                      minVersion defines the minimum acceptable TLS version.
+
+                      It requires Prometheus >= v2.35.0 or Thanos >= v0.28.0.
+                    enum:
+                    - TLS10
+                    - TLS11
+                    - TLS12
+                    - TLS13
+                    type: string
+                  serverName:
+                    description: serverName is used to verify the hostname for the
+                      targets.
+                    type: string
+                type: object
+              trackTimestampsStaleness:
+                description: |-
+                  trackTimestampsStaleness defines whether Prometheus tracks staleness of
+                  the metrics that have an explicit timestamp present in scraped data.
+                  Has no effect if `honorTimestamps` is false.
+                  It requires Prometheus >= v2.48.0.
+                type: boolean
+            type: object
+          status:
+            description: |-
+              status defines the status subresource. It is under active development and is updated only when the
+              "StatusForConfigurationResources" feature gate is enabled.
+
+              Most recent observed status of the ScrapeConfig. Read-only.
+              More info:
+              https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#spec-and-status
+            properties:
+              bindings:
+                description: bindings defines the list of workload resources (Prometheus,
+                  PrometheusAgent, ThanosRuler or Alertmanager) which select the configuration
+                  resource.
+                items:
+                  description: WorkloadBinding is a link between a configuration resource
+                    and a workload resource.
+                  properties:
+                    conditions:
+                      description: conditions defines the current state of the configuration
+                        resource when bound to the referenced Workload object.
+                      items:
+                        description: ConfigResourceCondition describes the status
+                          of configuration resources linked to Prometheus, PrometheusAgent,
+                          Alertmanager or ThanosRuler.
+                        properties:
+                          lastTransitionTime:
+                            description: lastTransitionTime defines the time of the
+                              last update to the current status property.
+                            format: date-time
+                            type: string
+                          message:
+                            description: message defines the human-readable message
+                              indicating details for the condition's last transition.
+                            type: string
+                          observedGeneration:
+                            description: |-
+                              observedGeneration defines the .metadata.generation that the
+                              condition was set based upon. For instance, if `.metadata.generation` is
+                              currently 12, but the `.status.conditions[].observedGeneration` is 9, the
+                              condition is out of date with respect to the current state of the object.
+                            format: int64
+                            type: integer
+                          reason:
+                            description: reason for the condition's last transition.
+                            type: string
+                          status:
+                            description: status of the condition.
+                            minLength: 1
+                            type: string
+                          type:
+                            description: |-
+                              type of the condition being reported.
+                              Currently, only "Accepted" is supported.
+                            enum:
+                            - Accepted
+                            minLength: 1
+                            type: string
+                        required:
+                        - lastTransitionTime
+                        - status
+                        - type
+                        type: object
+                      type: array
+                      x-kubernetes-list-map-keys:
+                      - type
+                      x-kubernetes-list-type: map
+                    group:
+                      description: group defines the group of the referenced resource.
+                      enum:
+                      - monitoring.coreos.com
+                      type: string
+                    name:
+                      description: name defines the name of the referenced object.
+                      minLength: 1
+                      type: string
+                    namespace:
+                      description: namespace defines the namespace of the referenced
+                        object.
+                      minLength: 1
+                      type: string
+                    resource:
+                      description: resource defines the type of resource being referenced
+                        (e.g. Prometheus, PrometheusAgent, ThanosRuler or Alertmanager).
+                      enum:
+                      - prometheuses
+                      - prometheusagents
+                      - thanosrulers
+                      - alertmanagers
+                      type: string
+                  required:
+                  - group
+                  - name
+                  - namespace
+                  - resource
+                  type: object
+                type: array
+                x-kubernetes-list-map-keys:
+                - group
+                - resource
+                - name
+                - namespace
+                x-kubernetes-list-type: map
+            type: object
+        required:
+        - spec
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}
+{{- end -}}
diff --git a/packages/system/prometheus-operator-crds/charts/prometheus-operator-crds/charts/crds/templates/crd-thanosrulers.yaml b/packages/system/prometheus-operator-crds/charts/prometheus-operator-crds/charts/crds/templates/crd-thanosrulers.yaml
new file mode 100644
index 0000000000..946ac0f944
--- /dev/null
+++ b/packages/system/prometheus-operator-crds/charts/prometheus-operator-crds/charts/crds/templates/crd-thanosrulers.yaml
@@ -0,0 +1,9645 @@
+{{- if .Values.thanosrulers.enabled -}}
+# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.87.0/example/prometheus-operator-crd/monitoring.coreos.com_thanosrulers.yaml
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+{{- with .Values.annotations }}
+{{- toYaml . | nindent 4 }}
+{{- end }}
+    controller-gen.kubebuilder.io/version: v0.19.0
+    operator.prometheus.io/version: 0.87.0
+  name: thanosrulers.monitoring.coreos.com
+spec:
+  group: monitoring.coreos.com
+  names:
+    categories:
+    - prometheus-operator
+    kind: ThanosRuler
+    listKind: ThanosRulerList
+    plural: thanosrulers
+    shortNames:
+    - ruler
+    singular: thanosruler
+  scope: Namespaced
+  versions:
+  - additionalPrinterColumns:
+    - description: The version of Thanos Ruler
+      jsonPath: .spec.version
+      name: Version
+      type: string
+    - description: The number of desired replicas
+      jsonPath: .spec.replicas
+      name: Replicas
+      type: integer
+    - description: The number of ready replicas
+      jsonPath: .status.availableReplicas
+      name: Ready
+      type: integer
+    - jsonPath: .status.conditions[?(@.type == 'Reconciled')].status
+      name: Reconciled
+      type: string
+    - jsonPath: .status.conditions[?(@.type == 'Available')].status
+      name: Available
+      type: string
+    - jsonPath: .metadata.creationTimestamp
+      name: Age
+      type: date
+    - description: Whether the resource reconciliation is paused or not
+      jsonPath: .status.paused
+      name: Paused
+      priority: 1
+      type: boolean
+    name: v1
+    schema:
+      openAPIV3Schema:
+        description: |-
+          The `ThanosRuler` custom resource definition (CRD) defines a desired [Thanos Ruler](https://github.com/thanos-io/thanos/blob/main/docs/components/rule.md) setup to run in a Kubernetes cluster.
+
+          A `ThanosRuler` instance requires at least one compatible Prometheus API endpoint (either Thanos Querier or Prometheus services).
+
+          The resource defines via label and namespace selectors which `PrometheusRule` objects should be associated to the deployed Thanos Ruler instances.
+        properties:
+          apiVersion:
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+            type: string
+          kind:
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: |-
+              spec defines the specification of the desired behavior of the ThanosRuler cluster. More info:
+              https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#spec-and-status
+            properties:
+              additionalArgs:
+                description: |-
+                  additionalArgs defines how to add additional arguments for the ThanosRuler container.
+                  It is intended for e.g. activating hidden flags which are not supported by
+                  the dedicated configuration options yet. The arguments are passed as-is to the
+                  ThanosRuler container which may cause issues if they are invalid or not supported
+                  by the given ThanosRuler version.
+                  In case of an argument conflict (e.g. an argument which is already set by the
+                  operator itself) or when providing an invalid argument the reconciliation will
+                  fail and an error will be logged.
+                items:
+                  description: Argument as part of the AdditionalArgs list.
+                  properties:
+                    name:
+                      description: name of the argument, e.g. "scrape.discovery-reload-interval".
+                      minLength: 1
+                      type: string
+                    value:
+                      description: value defines the argument value, e.g. 30s. Can
+                        be empty for name-only arguments (e.g. --storage.tsdb.no-lockfile)
+                      type: string
+                  required:
+                  - name
+                  type: object
+                type: array
+              affinity:
+                description: affinity defines when specified, the pod's scheduling
+                  constraints.
+                properties:
+                  nodeAffinity:
+                    description: Describes node affinity scheduling rules for the
+                      pod.
+                    properties:
+                      preferredDuringSchedulingIgnoredDuringExecution:
+                        description: |-
+                          The scheduler will prefer to schedule pods to nodes that satisfy
+                          the affinity expressions specified by this field, but it may choose
+                          a node that violates one or more of the expressions. The node that is
+                          most preferred is the one with the greatest sum of weights, i.e.
+                          for each node that meets all of the scheduling requirements (resource
+                          request, requiredDuringScheduling affinity expressions, etc.),
+                          compute a sum by iterating through the elements of this field and adding
+                          "weight" to the sum if the node matches the corresponding matchExpressions; the
+                          node(s) with the highest sum are the most preferred.
+                        items:
+                          description: |-
+                            An empty preferred scheduling term matches all objects with implicit weight 0
+                            (i.e. it's a no-op). A null preferred scheduling term matches no objects (i.e. is also a no-op).
+                          properties:
+                            preference:
+                              description: A node selector term, associated with the
+                                corresponding weight.
+                              properties:
+                                matchExpressions:
+                                  description: A list of node selector requirements
+                                    by node's labels.
+                                  items:
+                                    description: |-
+                                      A node selector requirement is a selector that contains values, a key, and an operator
+                                      that relates the key and values.
+                                    properties:
+                                      key:
+                                        description: The label key that the selector
+                                          applies to.
+                                        type: string
+                                      operator:
+                                        description: |-
+                                          Represents a key's relationship to a set of values.
+                                          Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt.
+                                        type: string
+                                      values:
+                                        description: |-
+                                          An array of string values. If the operator is In or NotIn,
+                                          the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                          the values array must be empty. If the operator is Gt or Lt, the values
+                                          array must have a single element, which will be interpreted as an integer.
+                                          This array is replaced during a strategic merge patch.
+                                        items:
+                                          type: string
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                    required:
+                                    - key
+                                    - operator
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                matchFields:
+                                  description: A list of node selector requirements
+                                    by node's fields.
+                                  items:
+                                    description: |-
+                                      A node selector requirement is a selector that contains values, a key, and an operator
+                                      that relates the key and values.
+                                    properties:
+                                      key:
+                                        description: The label key that the selector
+                                          applies to.
+                                        type: string
+                                      operator:
+                                        description: |-
+                                          Represents a key's relationship to a set of values.
+                                          Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt.
+                                        type: string
+                                      values:
+                                        description: |-
+                                          An array of string values. If the operator is In or NotIn,
+                                          the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                          the values array must be empty. If the operator is Gt or Lt, the values
+                                          array must have a single element, which will be interpreted as an integer.
+                                          This array is replaced during a strategic merge patch.
+                                        items:
+                                          type: string
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                    required:
+                                    - key
+                                    - operator
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            weight:
+                              description: Weight associated with matching the corresponding
+                                nodeSelectorTerm, in the range 1-100.
+                              format: int32
+                              type: integer
+                          required:
+                          - preference
+                          - weight
+                          type: object
+                        type: array
+                        x-kubernetes-list-type: atomic
+                      requiredDuringSchedulingIgnoredDuringExecution:
+                        description: |-
+                          If the affinity requirements specified by this field are not met at
+                          scheduling time, the pod will not be scheduled onto the node.
+                          If the affinity requirements specified by this field cease to be met
+                          at some point during pod execution (e.g. due to an update), the system
+                          may or may not try to eventually evict the pod from its node.
+                        properties:
+                          nodeSelectorTerms:
+                            description: Required. A list of node selector terms.
+                              The terms are ORed.
+                            items:
+                              description: |-
+                                A null or empty node selector term matches no objects. The requirements of
+                                them are ANDed.
+                                The TopologySelectorTerm type implements a subset of the NodeSelectorTerm.
+                              properties:
+                                matchExpressions:
+                                  description: A list of node selector requirements
+                                    by node's labels.
+                                  items:
+                                    description: |-
+                                      A node selector requirement is a selector that contains values, a key, and an operator
+                                      that relates the key and values.
+                                    properties:
+                                      key:
+                                        description: The label key that the selector
+                                          applies to.
+                                        type: string
+                                      operator:
+                                        description: |-
+                                          Represents a key's relationship to a set of values.
+                                          Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt.
+                                        type: string
+                                      values:
+                                        description: |-
+                                          An array of string values. If the operator is In or NotIn,
+                                          the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                          the values array must be empty. If the operator is Gt or Lt, the values
+                                          array must have a single element, which will be interpreted as an integer.
+                                          This array is replaced during a strategic merge patch.
+                                        items:
+                                          type: string
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                    required:
+                                    - key
+                                    - operator
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                matchFields:
+                                  description: A list of node selector requirements
+                                    by node's fields.
+                                  items:
+                                    description: |-
+                                      A node selector requirement is a selector that contains values, a key, and an operator
+                                      that relates the key and values.
+                                    properties:
+                                      key:
+                                        description: The label key that the selector
+                                          applies to.
+                                        type: string
+                                      operator:
+                                        description: |-
+                                          Represents a key's relationship to a set of values.
+                                          Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt.
+                                        type: string
+                                      values:
+                                        description: |-
+                                          An array of string values. If the operator is In or NotIn,
+                                          the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                          the values array must be empty. If the operator is Gt or Lt, the values
+                                          array must have a single element, which will be interpreted as an integer.
+                                          This array is replaced during a strategic merge patch.
+                                        items:
+                                          type: string
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                    required:
+                                    - key
+                                    - operator
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            type: array
+                            x-kubernetes-list-type: atomic
+                        required:
+                        - nodeSelectorTerms
+                        type: object
+                        x-kubernetes-map-type: atomic
+                    type: object
+                  podAffinity:
+                    description: Describes pod affinity scheduling rules (e.g. co-locate
+                      this pod in the same node, zone, etc. as some other pod(s)).
+                    properties:
+                      preferredDuringSchedulingIgnoredDuringExecution:
+                        description: |-
+                          The scheduler will prefer to schedule pods to nodes that satisfy
+                          the affinity expressions specified by this field, but it may choose
+                          a node that violates one or more of the expressions. The node that is
+                          most preferred is the one with the greatest sum of weights, i.e.
+                          for each node that meets all of the scheduling requirements (resource
+                          request, requiredDuringScheduling affinity expressions, etc.),
+                          compute a sum by iterating through the elements of this field and adding
+                          "weight" to the sum if the node has pods which matches the corresponding podAffinityTerm; the
+                          node(s) with the highest sum are the most preferred.
+                        items:
+                          description: The weights of all of the matched WeightedPodAffinityTerm
+                            fields are added per-node to find the most preferred node(s)
+                          properties:
+                            podAffinityTerm:
+                              description: Required. A pod affinity term, associated
+                                with the corresponding weight.
+                              properties:
+                                labelSelector:
+                                  description: |-
+                                    A label query over a set of resources, in this case pods.
+                                    If it's null, this PodAffinityTerm matches with no Pods.
+                                  properties:
+                                    matchExpressions:
+                                      description: matchExpressions is a list of label
+                                        selector requirements. The requirements are
+                                        ANDed.
+                                      items:
+                                        description: |-
+                                          A label selector requirement is a selector that contains values, a key, and an operator that
+                                          relates the key and values.
+                                        properties:
+                                          key:
+                                            description: key is the label key that
+                                              the selector applies to.
+                                            type: string
+                                          operator:
+                                            description: |-
+                                              operator represents a key's relationship to a set of values.
+                                              Valid operators are In, NotIn, Exists and DoesNotExist.
+                                            type: string
+                                          values:
+                                            description: |-
+                                              values is an array of string values. If the operator is In or NotIn,
+                                              the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                              the values array must be empty. This array is replaced during a strategic
+                                              merge patch.
+                                            items:
+                                              type: string
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                        required:
+                                        - key
+                                        - operator
+                                        type: object
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    matchLabels:
+                                      additionalProperties:
+                                        type: string
+                                      description: |-
+                                        matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                        map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                        operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                      type: object
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                matchLabelKeys:
+                                  description: |-
+                                    MatchLabelKeys is a set of pod label keys to select which pods will
+                                    be taken into consideration. The keys are used to lookup values from the
+                                    incoming pod labels, those key-value labels are merged with `labelSelector` as `key in (value)`
+                                    to select the group of existing pods which pods will be taken into consideration
+                                    for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+                                    pod labels will be ignored. The default value is empty.
+                                    The same key is forbidden to exist in both matchLabelKeys and labelSelector.
+                                    Also, matchLabelKeys cannot be set when labelSelector isn't set.
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                mismatchLabelKeys:
+                                  description: |-
+                                    MismatchLabelKeys is a set of pod label keys to select which pods will
+                                    be taken into consideration. The keys are used to lookup values from the
+                                    incoming pod labels, those key-value labels are merged with `labelSelector` as `key notin (value)`
+                                    to select the group of existing pods which pods will be taken into consideration
+                                    for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+                                    pod labels will be ignored. The default value is empty.
+                                    The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
+                                    Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                namespaceSelector:
+                                  description: |-
+                                    A label query over the set of namespaces that the term applies to.
+                                    The term is applied to the union of the namespaces selected by this field
+                                    and the ones listed in the namespaces field.
+                                    null selector and null or empty namespaces list means "this pod's namespace".
+                                    An empty selector ({}) matches all namespaces.
+                                  properties:
+                                    matchExpressions:
+                                      description: matchExpressions is a list of label
+                                        selector requirements. The requirements are
+                                        ANDed.
+                                      items:
+                                        description: |-
+                                          A label selector requirement is a selector that contains values, a key, and an operator that
+                                          relates the key and values.
+                                        properties:
+                                          key:
+                                            description: key is the label key that
+                                              the selector applies to.
+                                            type: string
+                                          operator:
+                                            description: |-
+                                              operator represents a key's relationship to a set of values.
+                                              Valid operators are In, NotIn, Exists and DoesNotExist.
+                                            type: string
+                                          values:
+                                            description: |-
+                                              values is an array of string values. If the operator is In or NotIn,
+                                              the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                              the values array must be empty. This array is replaced during a strategic
+                                              merge patch.
+                                            items:
+                                              type: string
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                        required:
+                                        - key
+                                        - operator
+                                        type: object
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    matchLabels:
+                                      additionalProperties:
+                                        type: string
+                                      description: |-
+                                        matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                        map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                        operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                      type: object
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                namespaces:
+                                  description: |-
+                                    namespaces specifies a static list of namespace names that the term applies to.
+                                    The term is applied to the union of the namespaces listed in this field
+                                    and the ones selected by namespaceSelector.
+                                    null or empty namespaces list and null namespaceSelector means "this pod's namespace".
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                topologyKey:
+                                  description: |-
+                                    This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching
+                                    the labelSelector in the specified namespaces, where co-located is defined as running on a node
+                                    whose value of the label with key topologyKey matches that of any node on which any of the
+                                    selected pods is running.
+                                    Empty topologyKey is not allowed.
+                                  type: string
+                              required:
+                              - topologyKey
+                              type: object
+                            weight:
+                              description: |-
+                                weight associated with matching the corresponding podAffinityTerm,
+                                in the range 1-100.
+                              format: int32
+                              type: integer
+                          required:
+                          - podAffinityTerm
+                          - weight
+                          type: object
+                        type: array
+                        x-kubernetes-list-type: atomic
+                      requiredDuringSchedulingIgnoredDuringExecution:
+                        description: |-
+                          If the affinity requirements specified by this field are not met at
+                          scheduling time, the pod will not be scheduled onto the node.
+                          If the affinity requirements specified by this field cease to be met
+                          at some point during pod execution (e.g. due to a pod label update), the
+                          system may or may not try to eventually evict the pod from its node.
+                          When there are multiple elements, the lists of nodes corresponding to each
+                          podAffinityTerm are intersected, i.e. all terms must be satisfied.
+                        items:
+                          description: |-
+                            Defines a set of pods (namely those matching the labelSelector
+                            relative to the given namespace(s)) that this pod should be
+                            co-located (affinity) or not co-located (anti-affinity) with,
+                            where co-located is defined as running on a node whose value of
+                            the label with key <topologyKey> matches that of any node on which
+                            a pod of the set of pods is running
+                          properties:
+                            labelSelector:
+                              description: |-
+                                A label query over a set of resources, in this case pods.
+                                If it's null, this PodAffinityTerm matches with no Pods.
+                              properties:
+                                matchExpressions:
+                                  description: matchExpressions is a list of label
+                                    selector requirements. The requirements are ANDed.
+                                  items:
+                                    description: |-
+                                      A label selector requirement is a selector that contains values, a key, and an operator that
+                                      relates the key and values.
+                                    properties:
+                                      key:
+                                        description: key is the label key that the
+                                          selector applies to.
+                                        type: string
+                                      operator:
+                                        description: |-
+                                          operator represents a key's relationship to a set of values.
+                                          Valid operators are In, NotIn, Exists and DoesNotExist.
+                                        type: string
+                                      values:
+                                        description: |-
+                                          values is an array of string values. If the operator is In or NotIn,
+                                          the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                          the values array must be empty. This array is replaced during a strategic
+                                          merge patch.
+                                        items:
+                                          type: string
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                    required:
+                                    - key
+                                    - operator
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                matchLabels:
+                                  additionalProperties:
+                                    type: string
+                                  description: |-
+                                    matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                    map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                    operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                  type: object
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            matchLabelKeys:
+                              description: |-
+                                MatchLabelKeys is a set of pod label keys to select which pods will
+                                be taken into consideration. The keys are used to lookup values from the
+                                incoming pod labels, those key-value labels are merged with `labelSelector` as `key in (value)`
+                                to select the group of existing pods which pods will be taken into consideration
+                                for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+                                pod labels will be ignored. The default value is empty.
+                                The same key is forbidden to exist in both matchLabelKeys and labelSelector.
+                                Also, matchLabelKeys cannot be set when labelSelector isn't set.
+                              items:
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            mismatchLabelKeys:
+                              description: |-
+                                MismatchLabelKeys is a set of pod label keys to select which pods will
+                                be taken into consideration. The keys are used to lookup values from the
+                                incoming pod labels, those key-value labels are merged with `labelSelector` as `key notin (value)`
+                                to select the group of existing pods which pods will be taken into consideration
+                                for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+                                pod labels will be ignored. The default value is empty.
+                                The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
+                                Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
+                              items:
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            namespaceSelector:
+                              description: |-
+                                A label query over the set of namespaces that the term applies to.
+                                The term is applied to the union of the namespaces selected by this field
+                                and the ones listed in the namespaces field.
+                                null selector and null or empty namespaces list means "this pod's namespace".
+                                An empty selector ({}) matches all namespaces.
+                              properties:
+                                matchExpressions:
+                                  description: matchExpressions is a list of label
+                                    selector requirements. The requirements are ANDed.
+                                  items:
+                                    description: |-
+                                      A label selector requirement is a selector that contains values, a key, and an operator that
+                                      relates the key and values.
+                                    properties:
+                                      key:
+                                        description: key is the label key that the
+                                          selector applies to.
+                                        type: string
+                                      operator:
+                                        description: |-
+                                          operator represents a key's relationship to a set of values.
+                                          Valid operators are In, NotIn, Exists and DoesNotExist.
+                                        type: string
+                                      values:
+                                        description: |-
+                                          values is an array of string values. If the operator is In or NotIn,
+                                          the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                          the values array must be empty. This array is replaced during a strategic
+                                          merge patch.
+                                        items:
+                                          type: string
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                    required:
+                                    - key
+                                    - operator
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                matchLabels:
+                                  additionalProperties:
+                                    type: string
+                                  description: |-
+                                    matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                    map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                    operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                  type: object
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            namespaces:
+                              description: |-
+                                namespaces specifies a static list of namespace names that the term applies to.
+                                The term is applied to the union of the namespaces listed in this field
+                                and the ones selected by namespaceSelector.
+                                null or empty namespaces list and null namespaceSelector means "this pod's namespace".
+                              items:
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            topologyKey:
+                              description: |-
+                                This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching
+                                the labelSelector in the specified namespaces, where co-located is defined as running on a node
+                                whose value of the label with key topologyKey matches that of any node on which any of the
+                                selected pods is running.
+                                Empty topologyKey is not allowed.
+                              type: string
+                          required:
+                          - topologyKey
+                          type: object
+                        type: array
+                        x-kubernetes-list-type: atomic
+                    type: object
+                  podAntiAffinity:
+                    description: Describes pod anti-affinity scheduling rules (e.g.
+                      avoid putting this pod in the same node, zone, etc. as some
+                      other pod(s)).
+                    properties:
+                      preferredDuringSchedulingIgnoredDuringExecution:
+                        description: |-
+                          The scheduler will prefer to schedule pods to nodes that satisfy
+                          the anti-affinity expressions specified by this field, but it may choose
+                          a node that violates one or more of the expressions. The node that is
+                          most preferred is the one with the greatest sum of weights, i.e.
+                          for each node that meets all of the scheduling requirements (resource
+                          request, requiredDuringScheduling anti-affinity expressions, etc.),
+                          compute a sum by iterating through the elements of this field and subtracting
+                          "weight" from the sum if the node has pods which matches the corresponding podAffinityTerm; the
+                          node(s) with the highest sum are the most preferred.
+                        items:
+                          description: The weights of all of the matched WeightedPodAffinityTerm
+                            fields are added per-node to find the most preferred node(s)
+                          properties:
+                            podAffinityTerm:
+                              description: Required. A pod affinity term, associated
+                                with the corresponding weight.
+                              properties:
+                                labelSelector:
+                                  description: |-
+                                    A label query over a set of resources, in this case pods.
+                                    If it's null, this PodAffinityTerm matches with no Pods.
+                                  properties:
+                                    matchExpressions:
+                                      description: matchExpressions is a list of label
+                                        selector requirements. The requirements are
+                                        ANDed.
+                                      items:
+                                        description: |-
+                                          A label selector requirement is a selector that contains values, a key, and an operator that
+                                          relates the key and values.
+                                        properties:
+                                          key:
+                                            description: key is the label key that
+                                              the selector applies to.
+                                            type: string
+                                          operator:
+                                            description: |-
+                                              operator represents a key's relationship to a set of values.
+                                              Valid operators are In, NotIn, Exists and DoesNotExist.
+                                            type: string
+                                          values:
+                                            description: |-
+                                              values is an array of string values. If the operator is In or NotIn,
+                                              the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                              the values array must be empty. This array is replaced during a strategic
+                                              merge patch.
+                                            items:
+                                              type: string
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                        required:
+                                        - key
+                                        - operator
+                                        type: object
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    matchLabels:
+                                      additionalProperties:
+                                        type: string
+                                      description: |-
+                                        matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                        map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                        operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                      type: object
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                matchLabelKeys:
+                                  description: |-
+                                    MatchLabelKeys is a set of pod label keys to select which pods will
+                                    be taken into consideration. The keys are used to lookup values from the
+                                    incoming pod labels, those key-value labels are merged with `labelSelector` as `key in (value)`
+                                    to select the group of existing pods which pods will be taken into consideration
+                                    for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+                                    pod labels will be ignored. The default value is empty.
+                                    The same key is forbidden to exist in both matchLabelKeys and labelSelector.
+                                    Also, matchLabelKeys cannot be set when labelSelector isn't set.
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                mismatchLabelKeys:
+                                  description: |-
+                                    MismatchLabelKeys is a set of pod label keys to select which pods will
+                                    be taken into consideration. The keys are used to lookup values from the
+                                    incoming pod labels, those key-value labels are merged with `labelSelector` as `key notin (value)`
+                                    to select the group of existing pods which pods will be taken into consideration
+                                    for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+                                    pod labels will be ignored. The default value is empty.
+                                    The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
+                                    Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                namespaceSelector:
+                                  description: |-
+                                    A label query over the set of namespaces that the term applies to.
+                                    The term is applied to the union of the namespaces selected by this field
+                                    and the ones listed in the namespaces field.
+                                    null selector and null or empty namespaces list means "this pod's namespace".
+                                    An empty selector ({}) matches all namespaces.
+                                  properties:
+                                    matchExpressions:
+                                      description: matchExpressions is a list of label
+                                        selector requirements. The requirements are
+                                        ANDed.
+                                      items:
+                                        description: |-
+                                          A label selector requirement is a selector that contains values, a key, and an operator that
+                                          relates the key and values.
+                                        properties:
+                                          key:
+                                            description: key is the label key that
+                                              the selector applies to.
+                                            type: string
+                                          operator:
+                                            description: |-
+                                              operator represents a key's relationship to a set of values.
+                                              Valid operators are In, NotIn, Exists and DoesNotExist.
+                                            type: string
+                                          values:
+                                            description: |-
+                                              values is an array of string values. If the operator is In or NotIn,
+                                              the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                              the values array must be empty. This array is replaced during a strategic
+                                              merge patch.
+                                            items:
+                                              type: string
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                        required:
+                                        - key
+                                        - operator
+                                        type: object
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    matchLabels:
+                                      additionalProperties:
+                                        type: string
+                                      description: |-
+                                        matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                        map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                        operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                      type: object
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                namespaces:
+                                  description: |-
+                                    namespaces specifies a static list of namespace names that the term applies to.
+                                    The term is applied to the union of the namespaces listed in this field
+                                    and the ones selected by namespaceSelector.
+                                    null or empty namespaces list and null namespaceSelector means "this pod's namespace".
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                topologyKey:
+                                  description: |-
+                                    This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching
+                                    the labelSelector in the specified namespaces, where co-located is defined as running on a node
+                                    whose value of the label with key topologyKey matches that of any node on which any of the
+                                    selected pods is running.
+                                    Empty topologyKey is not allowed.
+                                  type: string
+                              required:
+                              - topologyKey
+                              type: object
+                            weight:
+                              description: |-
+                                weight associated with matching the corresponding podAffinityTerm,
+                                in the range 1-100.
+                              format: int32
+                              type: integer
+                          required:
+                          - podAffinityTerm
+                          - weight
+                          type: object
+                        type: array
+                        x-kubernetes-list-type: atomic
+                      requiredDuringSchedulingIgnoredDuringExecution:
+                        description: |-
+                          If the anti-affinity requirements specified by this field are not met at
+                          scheduling time, the pod will not be scheduled onto the node.
+                          If the anti-affinity requirements specified by this field cease to be met
+                          at some point during pod execution (e.g. due to a pod label update), the
+                          system may or may not try to eventually evict the pod from its node.
+                          When there are multiple elements, the lists of nodes corresponding to each
+                          podAffinityTerm are intersected, i.e. all terms must be satisfied.
+                        items:
+                          description: |-
+                            Defines a set of pods (namely those matching the labelSelector
+                            relative to the given namespace(s)) that this pod should be
+                            co-located (affinity) or not co-located (anti-affinity) with,
+                            where co-located is defined as running on a node whose value of
+                            the label with key <topologyKey> matches that of any node on which
+                            a pod of the set of pods is running
+                          properties:
+                            labelSelector:
+                              description: |-
+                                A label query over a set of resources, in this case pods.
+                                If it's null, this PodAffinityTerm matches with no Pods.
+                              properties:
+                                matchExpressions:
+                                  description: matchExpressions is a list of label
+                                    selector requirements. The requirements are ANDed.
+                                  items:
+                                    description: |-
+                                      A label selector requirement is a selector that contains values, a key, and an operator that
+                                      relates the key and values.
+                                    properties:
+                                      key:
+                                        description: key is the label key that the
+                                          selector applies to.
+                                        type: string
+                                      operator:
+                                        description: |-
+                                          operator represents a key's relationship to a set of values.
+                                          Valid operators are In, NotIn, Exists and DoesNotExist.
+                                        type: string
+                                      values:
+                                        description: |-
+                                          values is an array of string values. If the operator is In or NotIn,
+                                          the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                          the values array must be empty. This array is replaced during a strategic
+                                          merge patch.
+                                        items:
+                                          type: string
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                    required:
+                                    - key
+                                    - operator
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                matchLabels:
+                                  additionalProperties:
+                                    type: string
+                                  description: |-
+                                    matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                    map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                    operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                  type: object
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            matchLabelKeys:
+                              description: |-
+                                MatchLabelKeys is a set of pod label keys to select which pods will
+                                be taken into consideration. The keys are used to lookup values from the
+                                incoming pod labels, those key-value labels are merged with `labelSelector` as `key in (value)`
+                                to select the group of existing pods which pods will be taken into consideration
+                                for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+                                pod labels will be ignored. The default value is empty.
+                                The same key is forbidden to exist in both matchLabelKeys and labelSelector.
+                                Also, matchLabelKeys cannot be set when labelSelector isn't set.
+                              items:
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            mismatchLabelKeys:
+                              description: |-
+                                MismatchLabelKeys is a set of pod label keys to select which pods will
+                                be taken into consideration. The keys are used to lookup values from the
+                                incoming pod labels, those key-value labels are merged with `labelSelector` as `key notin (value)`
+                                to select the group of existing pods which pods will be taken into consideration
+                                for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+                                pod labels will be ignored. The default value is empty.
+                                The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
+                                Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
+                              items:
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            namespaceSelector:
+                              description: |-
+                                A label query over the set of namespaces that the term applies to.
+                                The term is applied to the union of the namespaces selected by this field
+                                and the ones listed in the namespaces field.
+                                null selector and null or empty namespaces list means "this pod's namespace".
+                                An empty selector ({}) matches all namespaces.
+                              properties:
+                                matchExpressions:
+                                  description: matchExpressions is a list of label
+                                    selector requirements. The requirements are ANDed.
+                                  items:
+                                    description: |-
+                                      A label selector requirement is a selector that contains values, a key, and an operator that
+                                      relates the key and values.
+                                    properties:
+                                      key:
+                                        description: key is the label key that the
+                                          selector applies to.
+                                        type: string
+                                      operator:
+                                        description: |-
+                                          operator represents a key's relationship to a set of values.
+                                          Valid operators are In, NotIn, Exists and DoesNotExist.
+                                        type: string
+                                      values:
+                                        description: |-
+                                          values is an array of string values. If the operator is In or NotIn,
+                                          the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                          the values array must be empty. This array is replaced during a strategic
+                                          merge patch.
+                                        items:
+                                          type: string
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                    required:
+                                    - key
+                                    - operator
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                matchLabels:
+                                  additionalProperties:
+                                    type: string
+                                  description: |-
+                                    matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                    map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                    operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                  type: object
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            namespaces:
+                              description: |-
+                                namespaces specifies a static list of namespace names that the term applies to.
+                                The term is applied to the union of the namespaces listed in this field
+                                and the ones selected by namespaceSelector.
+                                null or empty namespaces list and null namespaceSelector means "this pod's namespace".
+                              items:
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            topologyKey:
+                              description: |-
+                                This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching
+                                the labelSelector in the specified namespaces, where co-located is defined as running on a node
+                                whose value of the label with key topologyKey matches that of any node on which any of the
+                                selected pods is running.
+                                Empty topologyKey is not allowed.
+                              type: string
+                          required:
+                          - topologyKey
+                          type: object
+                        type: array
+                        x-kubernetes-list-type: atomic
+                    type: object
+                type: object
+              alertDropLabels:
+                description: |-
+                  alertDropLabels defines the label names which should be dropped in Thanos Ruler
+                  alerts.
+
+                  The replica label `thanos_ruler_replica` will always be dropped from the alerts.
+                items:
+                  type: string
+                type: array
+              alertQueryUrl:
+                description: |-
+                  alertQueryUrl defines how Thanos Ruler will set in the 'Source' field
+                  of all alerts.
+                  Maps to the '--alert.query-url' CLI arg.
+                type: string
+              alertRelabelConfigFile:
+                description: |-
+                  alertRelabelConfigFile defines the path to the alert relabeling configuration file.
+
+                  Alert relabel configuration must have the form as specified in the
+                  official Prometheus documentation:
+                  https://prometheus.io/docs/prometheus/latest/configuration/configuration/#alert_relabel_configs
+
+                  The operator performs no validation of the configuration file.
+
+                  This field takes precedence over `alertRelabelConfig`.
+                type: string
+              alertRelabelConfigs:
+                description: |-
+                  alertRelabelConfigs defines the alert relabeling in Thanos Ruler.
+
+                  Alert relabel configuration must have the form as specified in the
+                  official Prometheus documentation:
+                  https://prometheus.io/docs/prometheus/latest/configuration/configuration/#alert_relabel_configs
+
+                  The operator performs no validation of the configuration.
+
+                  `alertRelabelConfigFile` takes precedence over this field.
+                properties:
+                  key:
+                    description: The key of the secret to select from.  Must be a
+                      valid secret key.
+                    type: string
+                  name:
+                    default: ""
+                    description: |-
+                      Name of the referent.
+                      This field is effectively required, but due to backwards compatibility is
+                      allowed to be empty. Instances of this type with an empty value here are
+                      almost certainly wrong.
+                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                    type: string
+                  optional:
+                    description: Specify whether the Secret or its key must be defined
+                    type: boolean
+                required:
+                - key
+                type: object
+                x-kubernetes-map-type: atomic
+              alertmanagersConfig:
+                description: |-
+                  alertmanagersConfig defines the list of Alertmanager endpoints to send alerts to.
+
+                  The configuration format is defined at https://thanos.io/tip/components/rule.md/#alertmanager.
+
+                  It requires Thanos >= v0.10.0.
+
+                  The operator performs no validation of the configuration.
+
+                  This field takes precedence over `alertmanagersUrl`.
+                properties:
+                  key:
+                    description: The key of the secret to select from.  Must be a
+                      valid secret key.
+                    type: string
+                  name:
+                    default: ""
+                    description: |-
+                      Name of the referent.
+                      This field is effectively required, but due to backwards compatibility is
+                      allowed to be empty. Instances of this type with an empty value here are
+                      almost certainly wrong.
+                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                    type: string
+                  optional:
+                    description: Specify whether the Secret or its key must be defined
+                    type: boolean
+                required:
+                - key
+                type: object
+                x-kubernetes-map-type: atomic
+              alertmanagersUrl:
+                description: |-
+                  alertmanagersUrl defines the list of Alertmanager endpoints to send alerts to.
+
+                  For Thanos >= v0.10.0, it is recommended to use `alertmanagersConfig` instead.
+
+                  `alertmanagersConfig` takes precedence over this field.
+                items:
+                  type: string
+                type: array
+              containers:
+                description: |-
+                  containers allows injecting additional containers or modifying operator generated
+                  containers. This can be used to allow adding an authentication proxy to a ThanosRuler pod or
+                  to change the behavior of an operator generated container. Containers described here modify
+                  an operator generated container if they share the same name and modifications are done via a
+                  strategic merge patch. The current container names are: `thanos-ruler` and `config-reloader`.
+                  Overriding containers is entirely outside the scope of what the maintainers will support and by doing
+                  so, you accept that this behaviour may break at any time without notice.
+                items:
+                  description: A single application container that you want to run
+                    within a pod.
+                  properties:
+                    args:
+                      description: |-
+                        Arguments to the entrypoint.
+                        The container image's CMD is used if this is not provided.
+                        Variable references $(VAR_NAME) are expanded using the container's environment. If a variable
+                        cannot be resolved, the reference in the input string will be unchanged. Double $$ are reduced
+                        to a single $, which allows for escaping the $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)" will
+                        produce the string literal "$(VAR_NAME)". Escaped references will never be expanded, regardless
+                        of whether the variable exists or not. Cannot be updated.
+                        More info: https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell
+                      items:
+                        type: string
+                      type: array
+                      x-kubernetes-list-type: atomic
+                    command:
+                      description: |-
+                        Entrypoint array. Not executed within a shell.
+                        The container image's ENTRYPOINT is used if this is not provided.
+                        Variable references $(VAR_NAME) are expanded using the container's environment. If a variable
+                        cannot be resolved, the reference in the input string will be unchanged. Double $$ are reduced
+                        to a single $, which allows for escaping the $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)" will
+                        produce the string literal "$(VAR_NAME)". Escaped references will never be expanded, regardless
+                        of whether the variable exists or not. Cannot be updated.
+                        More info: https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell
+                      items:
+                        type: string
+                      type: array
+                      x-kubernetes-list-type: atomic
+                    env:
+                      description: |-
+                        List of environment variables to set in the container.
+                        Cannot be updated.
+                      items:
+                        description: EnvVar represents an environment variable present
+                          in a Container.
+                        properties:
+                          name:
+                            description: |-
+                              Name of the environment variable.
+                              May consist of any printable ASCII characters except '='.
+                            type: string
+                          value:
+                            description: |-
+                              Variable references $(VAR_NAME) are expanded
+                              using the previously defined environment variables in the container and
+                              any service environment variables. If a variable cannot be resolved,
+                              the reference in the input string will be unchanged. Double $$ are reduced
+                              to a single $, which allows for escaping the $(VAR_NAME) syntax: i.e.
+                              "$$(VAR_NAME)" will produce the string literal "$(VAR_NAME)".
+                              Escaped references will never be expanded, regardless of whether the variable
+                              exists or not.
+                              Defaults to "".
+                            type: string
+                          valueFrom:
+                            description: Source for the environment variable's value.
+                              Cannot be used if value is not empty.
+                            properties:
+                              configMapKeyRef:
+                                description: Selects a key of a ConfigMap.
+                                properties:
+                                  key:
+                                    description: The key to select.
+                                    type: string
+                                  name:
+                                    default: ""
+                                    description: |-
+                                      Name of the referent.
+                                      This field is effectively required, but due to backwards compatibility is
+                                      allowed to be empty. Instances of this type with an empty value here are
+                                      almost certainly wrong.
+                                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                    type: string
+                                  optional:
+                                    description: Specify whether the ConfigMap or
+                                      its key must be defined
+                                    type: boolean
+                                required:
+                                - key
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              fieldRef:
+                                description: |-
+                                  Selects a field of the pod: supports metadata.name, metadata.namespace, `metadata.labels['<KEY>']`, `metadata.annotations['<KEY>']`,
+                                  spec.nodeName, spec.serviceAccountName, status.hostIP, status.podIP, status.podIPs.
+                                properties:
+                                  apiVersion:
+                                    description: Version of the schema the FieldPath
+                                      is written in terms of, defaults to "v1".
+                                    type: string
+                                  fieldPath:
+                                    description: Path of the field to select in the
+                                      specified API version.
+                                    type: string
+                                required:
+                                - fieldPath
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              fileKeyRef:
+                                description: |-
+                                  FileKeyRef selects a key of the env file.
+                                  Requires the EnvFiles feature gate to be enabled.
+                                properties:
+                                  key:
+                                    description: |-
+                                      The key within the env file. An invalid key will prevent the pod from starting.
+                                      The keys defined within a source may consist of any printable ASCII characters except '='.
+                                      During Alpha stage of the EnvFiles feature gate, the key size is limited to 128 characters.
+                                    type: string
+                                  optional:
+                                    default: false
+                                    description: |-
+                                      Specify whether the file or its key must be defined. If the file or key
+                                      does not exist, then the env var is not published.
+                                      If optional is set to true and the specified key does not exist,
+                                      the environment variable will not be set in the Pod's containers.
+
+                                      If optional is set to false and the specified key does not exist,
+                                      an error will be returned during Pod creation.
+                                    type: boolean
+                                  path:
+                                    description: |-
+                                      The path within the volume from which to select the file.
+                                      Must be relative and may not contain the '..' path or start with '..'.
+                                    type: string
+                                  volumeName:
+                                    description: The name of the volume mount containing
+                                      the env file.
+                                    type: string
+                                required:
+                                - key
+                                - path
+                                - volumeName
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              resourceFieldRef:
+                                description: |-
+                                  Selects a resource of the container: only resources limits and requests
+                                  (limits.cpu, limits.memory, limits.ephemeral-storage, requests.cpu, requests.memory and requests.ephemeral-storage) are currently supported.
+                                properties:
+                                  containerName:
+                                    description: 'Container name: required for volumes,
+                                      optional for env vars'
+                                    type: string
+                                  divisor:
+                                    anyOf:
+                                    - type: integer
+                                    - type: string
+                                    description: Specifies the output format of the
+                                      exposed resources, defaults to "1"
+                                    pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                    x-kubernetes-int-or-string: true
+                                  resource:
+                                    description: 'Required: resource to select'
+                                    type: string
+                                required:
+                                - resource
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              secretKeyRef:
+                                description: Selects a key of a secret in the pod's
+                                  namespace
+                                properties:
+                                  key:
+                                    description: The key of the secret to select from.  Must
+                                      be a valid secret key.
+                                    type: string
+                                  name:
+                                    default: ""
+                                    description: |-
+                                      Name of the referent.
+                                      This field is effectively required, but due to backwards compatibility is
+                                      allowed to be empty. Instances of this type with an empty value here are
+                                      almost certainly wrong.
+                                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                    type: string
+                                  optional:
+                                    description: Specify whether the Secret or its
+                                      key must be defined
+                                    type: boolean
+                                required:
+                                - key
+                                type: object
+                                x-kubernetes-map-type: atomic
+                            type: object
+                        required:
+                        - name
+                        type: object
+                      type: array
+                      x-kubernetes-list-map-keys:
+                      - name
+                      x-kubernetes-list-type: map
+                    envFrom:
+                      description: |-
+                        List of sources to populate environment variables in the container.
+                        The keys defined within a source may consist of any printable ASCII characters except '='.
+                        When a key exists in multiple
+                        sources, the value associated with the last source will take precedence.
+                        Values defined by an Env with a duplicate key will take precedence.
+                        Cannot be updated.
+                      items:
+                        description: EnvFromSource represents the source of a set
+                          of ConfigMaps or Secrets
+                        properties:
+                          configMapRef:
+                            description: The ConfigMap to select from
+                            properties:
+                              name:
+                                default: ""
+                                description: |-
+                                  Name of the referent.
+                                  This field is effectively required, but due to backwards compatibility is
+                                  allowed to be empty. Instances of this type with an empty value here are
+                                  almost certainly wrong.
+                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                type: string
+                              optional:
+                                description: Specify whether the ConfigMap must be
+                                  defined
+                                type: boolean
+                            type: object
+                            x-kubernetes-map-type: atomic
+                          prefix:
+                            description: |-
+                              Optional text to prepend to the name of each environment variable.
+                              May consist of any printable ASCII characters except '='.
+                            type: string
+                          secretRef:
+                            description: The Secret to select from
+                            properties:
+                              name:
+                                default: ""
+                                description: |-
+                                  Name of the referent.
+                                  This field is effectively required, but due to backwards compatibility is
+                                  allowed to be empty. Instances of this type with an empty value here are
+                                  almost certainly wrong.
+                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                type: string
+                              optional:
+                                description: Specify whether the Secret must be defined
+                                type: boolean
+                            type: object
+                            x-kubernetes-map-type: atomic
+                        type: object
+                      type: array
+                      x-kubernetes-list-type: atomic
+                    image:
+                      description: |-
+                        Container image name.
+                        More info: https://kubernetes.io/docs/concepts/containers/images
+                        This field is optional to allow higher level config management to default or override
+                        container images in workload controllers like Deployments and StatefulSets.
+                      type: string
+                    imagePullPolicy:
+                      description: |-
+                        Image pull policy.
+                        One of Always, Never, IfNotPresent.
+                        Defaults to Always if :latest tag is specified, or IfNotPresent otherwise.
+                        Cannot be updated.
+                        More info: https://kubernetes.io/docs/concepts/containers/images#updating-images
+                      type: string
+                    lifecycle:
+                      description: |-
+                        Actions that the management system should take in response to container lifecycle events.
+                        Cannot be updated.
+                      properties:
+                        postStart:
+                          description: |-
+                            PostStart is called immediately after a container is created. If the handler fails,
+                            the container is terminated and restarted according to its restart policy.
+                            Other management of the container blocks until the hook completes.
+                            More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
+                          properties:
+                            exec:
+                              description: Exec specifies a command to execute in
+                                the container.
+                              properties:
+                                command:
+                                  description: |-
+                                    Command is the command line to execute inside the container, the working directory for the
+                                    command  is root ('/') in the container's filesystem. The command is simply exec'd, it is
+                                    not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use
+                                    a shell, you need to explicitly call out to that shell.
+                                    Exit status of 0 is treated as live/healthy and non-zero is unhealthy.
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                              type: object
+                            httpGet:
+                              description: HTTPGet specifies an HTTP GET request to
+                                perform.
+                              properties:
+                                host:
+                                  description: |-
+                                    Host name to connect to, defaults to the pod IP. You probably want to set
+                                    "Host" in httpHeaders instead.
+                                  type: string
+                                httpHeaders:
+                                  description: Custom headers to set in the request.
+                                    HTTP allows repeated headers.
+                                  items:
+                                    description: HTTPHeader describes a custom header
+                                      to be used in HTTP probes
+                                    properties:
+                                      name:
+                                        description: |-
+                                          The header field name.
+                                          This will be canonicalized upon output, so case-variant names will be understood as the same header.
+                                        type: string
+                                      value:
+                                        description: The header field value
+                                        type: string
+                                    required:
+                                    - name
+                                    - value
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                path:
+                                  description: Path to access on the HTTP server.
+                                  type: string
+                                port:
+                                  anyOf:
+                                  - type: integer
+                                  - type: string
+                                  description: |-
+                                    Name or number of the port to access on the container.
+                                    Number must be in the range 1 to 65535.
+                                    Name must be an IANA_SVC_NAME.
+                                  x-kubernetes-int-or-string: true
+                                scheme:
+                                  description: |-
+                                    Scheme to use for connecting to the host.
+                                    Defaults to HTTP.
+                                  type: string
+                              required:
+                              - port
+                              type: object
+                            sleep:
+                              description: Sleep represents a duration that the container
+                                should sleep.
+                              properties:
+                                seconds:
+                                  description: Seconds is the number of seconds to
+                                    sleep.
+                                  format: int64
+                                  type: integer
+                              required:
+                              - seconds
+                              type: object
+                            tcpSocket:
+                              description: |-
+                                Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
+                                for backward compatibility. There is no validation of this field and
+                                lifecycle hooks will fail at runtime when it is specified.
+                              properties:
+                                host:
+                                  description: 'Optional: Host name to connect to,
+                                    defaults to the pod IP.'
+                                  type: string
+                                port:
+                                  anyOf:
+                                  - type: integer
+                                  - type: string
+                                  description: |-
+                                    Number or name of the port to access on the container.
+                                    Number must be in the range 1 to 65535.
+                                    Name must be an IANA_SVC_NAME.
+                                  x-kubernetes-int-or-string: true
+                              required:
+                              - port
+                              type: object
+                          type: object
+                        preStop:
+                          description: |-
+                            PreStop is called immediately before a container is terminated due to an
+                            API request or management event such as liveness/startup probe failure,
+                            preemption, resource contention, etc. The handler is not called if the
+                            container crashes or exits. The Pod's termination grace period countdown begins before the
+                            PreStop hook is executed. Regardless of the outcome of the handler, the
+                            container will eventually terminate within the Pod's termination grace
+                            period (unless delayed by finalizers). Other management of the container blocks until the hook completes
+                            or until the termination grace period is reached.
+                            More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
+                          properties:
+                            exec:
+                              description: Exec specifies a command to execute in
+                                the container.
+                              properties:
+                                command:
+                                  description: |-
+                                    Command is the command line to execute inside the container, the working directory for the
+                                    command  is root ('/') in the container's filesystem. The command is simply exec'd, it is
+                                    not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use
+                                    a shell, you need to explicitly call out to that shell.
+                                    Exit status of 0 is treated as live/healthy and non-zero is unhealthy.
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                              type: object
+                            httpGet:
+                              description: HTTPGet specifies an HTTP GET request to
+                                perform.
+                              properties:
+                                host:
+                                  description: |-
+                                    Host name to connect to, defaults to the pod IP. You probably want to set
+                                    "Host" in httpHeaders instead.
+                                  type: string
+                                httpHeaders:
+                                  description: Custom headers to set in the request.
+                                    HTTP allows repeated headers.
+                                  items:
+                                    description: HTTPHeader describes a custom header
+                                      to be used in HTTP probes
+                                    properties:
+                                      name:
+                                        description: |-
+                                          The header field name.
+                                          This will be canonicalized upon output, so case-variant names will be understood as the same header.
+                                        type: string
+                                      value:
+                                        description: The header field value
+                                        type: string
+                                    required:
+                                    - name
+                                    - value
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                path:
+                                  description: Path to access on the HTTP server.
+                                  type: string
+                                port:
+                                  anyOf:
+                                  - type: integer
+                                  - type: string
+                                  description: |-
+                                    Name or number of the port to access on the container.
+                                    Number must be in the range 1 to 65535.
+                                    Name must be an IANA_SVC_NAME.
+                                  x-kubernetes-int-or-string: true
+                                scheme:
+                                  description: |-
+                                    Scheme to use for connecting to the host.
+                                    Defaults to HTTP.
+                                  type: string
+                              required:
+                              - port
+                              type: object
+                            sleep:
+                              description: Sleep represents a duration that the container
+                                should sleep.
+                              properties:
+                                seconds:
+                                  description: Seconds is the number of seconds to
+                                    sleep.
+                                  format: int64
+                                  type: integer
+                              required:
+                              - seconds
+                              type: object
+                            tcpSocket:
+                              description: |-
+                                Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
+                                for backward compatibility. There is no validation of this field and
+                                lifecycle hooks will fail at runtime when it is specified.
+                              properties:
+                                host:
+                                  description: 'Optional: Host name to connect to,
+                                    defaults to the pod IP.'
+                                  type: string
+                                port:
+                                  anyOf:
+                                  - type: integer
+                                  - type: string
+                                  description: |-
+                                    Number or name of the port to access on the container.
+                                    Number must be in the range 1 to 65535.
+                                    Name must be an IANA_SVC_NAME.
+                                  x-kubernetes-int-or-string: true
+                              required:
+                              - port
+                              type: object
+                          type: object
+                        stopSignal:
+                          description: |-
+                            StopSignal defines which signal will be sent to a container when it is being stopped.
+                            If not specified, the default is defined by the container runtime in use.
+                            StopSignal can only be set for Pods with a non-empty .spec.os.name
+                          type: string
+                      type: object
+                    livenessProbe:
+                      description: |-
+                        Periodic probe of container liveness.
+                        Container will be restarted if the probe fails.
+                        Cannot be updated.
+                        More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                      properties:
+                        exec:
+                          description: Exec specifies a command to execute in the
+                            container.
+                          properties:
+                            command:
+                              description: |-
+                                Command is the command line to execute inside the container, the working directory for the
+                                command  is root ('/') in the container's filesystem. The command is simply exec'd, it is
+                                not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use
+                                a shell, you need to explicitly call out to that shell.
+                                Exit status of 0 is treated as live/healthy and non-zero is unhealthy.
+                              items:
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                          type: object
+                        failureThreshold:
+                          description: |-
+                            Minimum consecutive failures for the probe to be considered failed after having succeeded.
+                            Defaults to 3. Minimum value is 1.
+                          format: int32
+                          type: integer
+                        grpc:
+                          description: GRPC specifies a GRPC HealthCheckRequest.
+                          properties:
+                            port:
+                              description: Port number of the gRPC service. Number
+                                must be in the range 1 to 65535.
+                              format: int32
+                              type: integer
+                            service:
+                              default: ""
+                              description: |-
+                                Service is the name of the service to place in the gRPC HealthCheckRequest
+                                (see https://github.com/grpc/grpc/blob/master/doc/health-checking.md).
+
+                                If this is not specified, the default behavior is defined by gRPC.
+                              type: string
+                          required:
+                          - port
+                          type: object
+                        httpGet:
+                          description: HTTPGet specifies an HTTP GET request to perform.
+                          properties:
+                            host:
+                              description: |-
+                                Host name to connect to, defaults to the pod IP. You probably want to set
+                                "Host" in httpHeaders instead.
+                              type: string
+                            httpHeaders:
+                              description: Custom headers to set in the request. HTTP
+                                allows repeated headers.
+                              items:
+                                description: HTTPHeader describes a custom header
+                                  to be used in HTTP probes
+                                properties:
+                                  name:
+                                    description: |-
+                                      The header field name.
+                                      This will be canonicalized upon output, so case-variant names will be understood as the same header.
+                                    type: string
+                                  value:
+                                    description: The header field value
+                                    type: string
+                                required:
+                                - name
+                                - value
+                                type: object
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            path:
+                              description: Path to access on the HTTP server.
+                              type: string
+                            port:
+                              anyOf:
+                              - type: integer
+                              - type: string
+                              description: |-
+                                Name or number of the port to access on the container.
+                                Number must be in the range 1 to 65535.
+                                Name must be an IANA_SVC_NAME.
+                              x-kubernetes-int-or-string: true
+                            scheme:
+                              description: |-
+                                Scheme to use for connecting to the host.
+                                Defaults to HTTP.
+                              type: string
+                          required:
+                          - port
+                          type: object
+                        initialDelaySeconds:
+                          description: |-
+                            Number of seconds after the container has started before liveness probes are initiated.
+                            More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                          format: int32
+                          type: integer
+                        periodSeconds:
+                          description: |-
+                            How often (in seconds) to perform the probe.
+                            Default to 10 seconds. Minimum value is 1.
+                          format: int32
+                          type: integer
+                        successThreshold:
+                          description: |-
+                            Minimum consecutive successes for the probe to be considered successful after having failed.
+                            Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
+                          format: int32
+                          type: integer
+                        tcpSocket:
+                          description: TCPSocket specifies a connection to a TCP port.
+                          properties:
+                            host:
+                              description: 'Optional: Host name to connect to, defaults
+                                to the pod IP.'
+                              type: string
+                            port:
+                              anyOf:
+                              - type: integer
+                              - type: string
+                              description: |-
+                                Number or name of the port to access on the container.
+                                Number must be in the range 1 to 65535.
+                                Name must be an IANA_SVC_NAME.
+                              x-kubernetes-int-or-string: true
+                          required:
+                          - port
+                          type: object
+                        terminationGracePeriodSeconds:
+                          description: |-
+                            Optional duration in seconds the pod needs to terminate gracefully upon probe failure.
+                            The grace period is the duration in seconds after the processes running in the pod are sent
+                            a termination signal and the time when the processes are forcibly halted with a kill signal.
+                            Set this value longer than the expected cleanup time for your process.
+                            If this value is nil, the pod's terminationGracePeriodSeconds will be used. Otherwise, this
+                            value overrides the value provided by the pod spec.
+                            Value must be non-negative integer. The value zero indicates stop immediately via
+                            the kill signal (no opportunity to shut down).
+                            This is a beta field and requires enabling ProbeTerminationGracePeriod feature gate.
+                            Minimum value is 1. spec.terminationGracePeriodSeconds is used if unset.
+                          format: int64
+                          type: integer
+                        timeoutSeconds:
+                          description: |-
+                            Number of seconds after which the probe times out.
+                            Defaults to 1 second. Minimum value is 1.
+                            More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                          format: int32
+                          type: integer
+                      type: object
+                    name:
+                      description: |-
+                        Name of the container specified as a DNS_LABEL.
+                        Each container in a pod must have a unique name (DNS_LABEL).
+                        Cannot be updated.
+                      type: string
+                    ports:
+                      description: |-
+                        List of ports to expose from the container. Not specifying a port here
+                        DOES NOT prevent that port from being exposed. Any port which is
+                        listening on the default "0.0.0.0" address inside a container will be
+                        accessible from the network.
+                        Modifying this array with strategic merge patch may corrupt the data.
+                        For more information See https://github.com/kubernetes/kubernetes/issues/108255.
+                        Cannot be updated.
+                      items:
+                        description: ContainerPort represents a network port in a
+                          single container.
+                        properties:
+                          containerPort:
+                            description: |-
+                              Number of port to expose on the pod's IP address.
+                              This must be a valid port number, 0 < x < 65536.
+                            format: int32
+                            type: integer
+                          hostIP:
+                            description: What host IP to bind the external port to.
+                            type: string
+                          hostPort:
+                            description: |-
+                              Number of port to expose on the host.
+                              If specified, this must be a valid port number, 0 < x < 65536.
+                              If HostNetwork is specified, this must match ContainerPort.
+                              Most containers do not need this.
+                            format: int32
+                            type: integer
+                          name:
+                            description: |-
+                              If specified, this must be an IANA_SVC_NAME and unique within the pod. Each
+                              named port in a pod must have a unique name. Name for the port that can be
+                              referred to by services.
+                            type: string
+                          protocol:
+                            default: TCP
+                            description: |-
+                              Protocol for port. Must be UDP, TCP, or SCTP.
+                              Defaults to "TCP".
+                            type: string
+                        required:
+                        - containerPort
+                        type: object
+                      type: array
+                      x-kubernetes-list-map-keys:
+                      - containerPort
+                      - protocol
+                      x-kubernetes-list-type: map
+                    readinessProbe:
+                      description: |-
+                        Periodic probe of container service readiness.
+                        Container will be removed from service endpoints if the probe fails.
+                        Cannot be updated.
+                        More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                      properties:
+                        exec:
+                          description: Exec specifies a command to execute in the
+                            container.
+                          properties:
+                            command:
+                              description: |-
+                                Command is the command line to execute inside the container, the working directory for the
+                                command  is root ('/') in the container's filesystem. The command is simply exec'd, it is
+                                not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use
+                                a shell, you need to explicitly call out to that shell.
+                                Exit status of 0 is treated as live/healthy and non-zero is unhealthy.
+                              items:
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                          type: object
+                        failureThreshold:
+                          description: |-
+                            Minimum consecutive failures for the probe to be considered failed after having succeeded.
+                            Defaults to 3. Minimum value is 1.
+                          format: int32
+                          type: integer
+                        grpc:
+                          description: GRPC specifies a GRPC HealthCheckRequest.
+                          properties:
+                            port:
+                              description: Port number of the gRPC service. Number
+                                must be in the range 1 to 65535.
+                              format: int32
+                              type: integer
+                            service:
+                              default: ""
+                              description: |-
+                                Service is the name of the service to place in the gRPC HealthCheckRequest
+                                (see https://github.com/grpc/grpc/blob/master/doc/health-checking.md).
+
+                                If this is not specified, the default behavior is defined by gRPC.
+                              type: string
+                          required:
+                          - port
+                          type: object
+                        httpGet:
+                          description: HTTPGet specifies an HTTP GET request to perform.
+                          properties:
+                            host:
+                              description: |-
+                                Host name to connect to, defaults to the pod IP. You probably want to set
+                                "Host" in httpHeaders instead.
+                              type: string
+                            httpHeaders:
+                              description: Custom headers to set in the request. HTTP
+                                allows repeated headers.
+                              items:
+                                description: HTTPHeader describes a custom header
+                                  to be used in HTTP probes
+                                properties:
+                                  name:
+                                    description: |-
+                                      The header field name.
+                                      This will be canonicalized upon output, so case-variant names will be understood as the same header.
+                                    type: string
+                                  value:
+                                    description: The header field value
+                                    type: string
+                                required:
+                                - name
+                                - value
+                                type: object
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            path:
+                              description: Path to access on the HTTP server.
+                              type: string
+                            port:
+                              anyOf:
+                              - type: integer
+                              - type: string
+                              description: |-
+                                Name or number of the port to access on the container.
+                                Number must be in the range 1 to 65535.
+                                Name must be an IANA_SVC_NAME.
+                              x-kubernetes-int-or-string: true
+                            scheme:
+                              description: |-
+                                Scheme to use for connecting to the host.
+                                Defaults to HTTP.
+                              type: string
+                          required:
+                          - port
+                          type: object
+                        initialDelaySeconds:
+                          description: |-
+                            Number of seconds after the container has started before liveness probes are initiated.
+                            More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                          format: int32
+                          type: integer
+                        periodSeconds:
+                          description: |-
+                            How often (in seconds) to perform the probe.
+                            Default to 10 seconds. Minimum value is 1.
+                          format: int32
+                          type: integer
+                        successThreshold:
+                          description: |-
+                            Minimum consecutive successes for the probe to be considered successful after having failed.
+                            Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
+                          format: int32
+                          type: integer
+                        tcpSocket:
+                          description: TCPSocket specifies a connection to a TCP port.
+                          properties:
+                            host:
+                              description: 'Optional: Host name to connect to, defaults
+                                to the pod IP.'
+                              type: string
+                            port:
+                              anyOf:
+                              - type: integer
+                              - type: string
+                              description: |-
+                                Number or name of the port to access on the container.
+                                Number must be in the range 1 to 65535.
+                                Name must be an IANA_SVC_NAME.
+                              x-kubernetes-int-or-string: true
+                          required:
+                          - port
+                          type: object
+                        terminationGracePeriodSeconds:
+                          description: |-
+                            Optional duration in seconds the pod needs to terminate gracefully upon probe failure.
+                            The grace period is the duration in seconds after the processes running in the pod are sent
+                            a termination signal and the time when the processes are forcibly halted with a kill signal.
+                            Set this value longer than the expected cleanup time for your process.
+                            If this value is nil, the pod's terminationGracePeriodSeconds will be used. Otherwise, this
+                            value overrides the value provided by the pod spec.
+                            Value must be non-negative integer. The value zero indicates stop immediately via
+                            the kill signal (no opportunity to shut down).
+                            This is a beta field and requires enabling ProbeTerminationGracePeriod feature gate.
+                            Minimum value is 1. spec.terminationGracePeriodSeconds is used if unset.
+                          format: int64
+                          type: integer
+                        timeoutSeconds:
+                          description: |-
+                            Number of seconds after which the probe times out.
+                            Defaults to 1 second. Minimum value is 1.
+                            More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                          format: int32
+                          type: integer
+                      type: object
+                    resizePolicy:
+                      description: Resources resize policy for the container.
+                      items:
+                        description: ContainerResizePolicy represents resource resize
+                          policy for the container.
+                        properties:
+                          resourceName:
+                            description: |-
+                              Name of the resource to which this resource resize policy applies.
+                              Supported values: cpu, memory.
+                            type: string
+                          restartPolicy:
+                            description: |-
+                              Restart policy to apply when specified resource is resized.
+                              If not specified, it defaults to NotRequired.
+                            type: string
+                        required:
+                        - resourceName
+                        - restartPolicy
+                        type: object
+                      type: array
+                      x-kubernetes-list-type: atomic
+                    resources:
+                      description: |-
+                        Compute Resources required by this container.
+                        Cannot be updated.
+                        More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+                      properties:
+                        claims:
+                          description: |-
+                            Claims lists the names of resources, defined in spec.resourceClaims,
+                            that are used by this container.
+
+                            This field depends on the
+                            DynamicResourceAllocation feature gate.
+
+                            This field is immutable. It can only be set for containers.
+                          items:
+                            description: ResourceClaim references one entry in PodSpec.ResourceClaims.
+                            properties:
+                              name:
+                                description: |-
+                                  Name must match the name of one entry in pod.spec.resourceClaims of
+                                  the Pod where this field is used. It makes that resource available
+                                  inside a container.
+                                type: string
+                              request:
+                                description: |-
+                                  Request is the name chosen for a request in the referenced claim.
+                                  If empty, everything from the claim is made available, otherwise
+                                  only the result of this request.
+                                type: string
+                            required:
+                            - name
+                            type: object
+                          type: array
+                          x-kubernetes-list-map-keys:
+                          - name
+                          x-kubernetes-list-type: map
+                        limits:
+                          additionalProperties:
+                            anyOf:
+                            - type: integer
+                            - type: string
+                            pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                            x-kubernetes-int-or-string: true
+                          description: |-
+                            Limits describes the maximum amount of compute resources allowed.
+                            More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+                          type: object
+                        requests:
+                          additionalProperties:
+                            anyOf:
+                            - type: integer
+                            - type: string
+                            pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                            x-kubernetes-int-or-string: true
+                          description: |-
+                            Requests describes the minimum amount of compute resources required.
+                            If Requests is omitted for a container, it defaults to Limits if that is explicitly specified,
+                            otherwise to an implementation-defined value. Requests cannot exceed Limits.
+                            More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+                          type: object
+                      type: object
+                    restartPolicy:
+                      description: |-
+                        RestartPolicy defines the restart behavior of individual containers in a pod.
+                        This overrides the pod-level restart policy. When this field is not specified,
+                        the restart behavior is defined by the Pod's restart policy and the container type.
+                        Additionally, setting the RestartPolicy as "Always" for the init container will
+                        have the following effect:
+                        this init container will be continually restarted on
+                        exit until all regular containers have terminated. Once all regular
+                        containers have completed, all init containers with restartPolicy "Always"
+                        will be shut down. This lifecycle differs from normal init containers and
+                        is often referred to as a "sidecar" container. Although this init
+                        container still starts in the init container sequence, it does not wait
+                        for the container to complete before proceeding to the next init
+                        container. Instead, the next init container starts immediately after this
+                        init container is started, or after any startupProbe has successfully
+                        completed.
+                      type: string
+                    restartPolicyRules:
+                      description: |-
+                        Represents a list of rules to be checked to determine if the
+                        container should be restarted on exit. The rules are evaluated in
+                        order. Once a rule matches a container exit condition, the remaining
+                        rules are ignored. If no rule matches the container exit condition,
+                        the Container-level restart policy determines the whether the container
+                        is restarted or not. Constraints on the rules:
+                        - At most 20 rules are allowed.
+                        - Rules can have the same action.
+                        - Identical rules are not forbidden in validations.
+                        When rules are specified, container MUST set RestartPolicy explicitly
+                        even it if matches the Pod's RestartPolicy.
+                      items:
+                        description: ContainerRestartRule describes how a container
+                          exit is handled.
+                        properties:
+                          action:
+                            description: |-
+                              Specifies the action taken on a container exit if the requirements
+                              are satisfied. The only possible value is "Restart" to restart the
+                              container.
+                            type: string
+                          exitCodes:
+                            description: Represents the exit codes to check on container
+                              exits.
+                            properties:
+                              operator:
+                                description: |-
+                                  Represents the relationship between the container exit code(s) and the
+                                  specified values. Possible values are:
+                                  - In: the requirement is satisfied if the container exit code is in the
+                                    set of specified values.
+                                  - NotIn: the requirement is satisfied if the container exit code is
+                                    not in the set of specified values.
+                                type: string
+                              values:
+                                description: |-
+                                  Specifies the set of values to check for container exit codes.
+                                  At most 255 elements are allowed.
+                                items:
+                                  format: int32
+                                  type: integer
+                                type: array
+                                x-kubernetes-list-type: set
+                            required:
+                            - operator
+                            type: object
+                        required:
+                        - action
+                        type: object
+                      type: array
+                      x-kubernetes-list-type: atomic
+                    securityContext:
+                      description: |-
+                        SecurityContext defines the security options the container should be run with.
+                        If set, the fields of SecurityContext override the equivalent fields of PodSecurityContext.
+                        More info: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/
+                      properties:
+                        allowPrivilegeEscalation:
+                          description: |-
+                            AllowPrivilegeEscalation controls whether a process can gain more
+                            privileges than its parent process. This bool directly controls if
+                            the no_new_privs flag will be set on the container process.
+                            AllowPrivilegeEscalation is true always when the container is:
+                            1) run as Privileged
+                            2) has CAP_SYS_ADMIN
+                            Note that this field cannot be set when spec.os.name is windows.
+                          type: boolean
+                        appArmorProfile:
+                          description: |-
+                            appArmorProfile is the AppArmor options to use by this container. If set, this profile
+                            overrides the pod's appArmorProfile.
+                            Note that this field cannot be set when spec.os.name is windows.
+                          properties:
+                            localhostProfile:
+                              description: |-
+                                localhostProfile indicates a profile loaded on the node that should be used.
+                                The profile must be preconfigured on the node to work.
+                                Must match the loaded name of the profile.
+                                Must be set if and only if type is "Localhost".
+                              type: string
+                            type:
+                              description: |-
+                                type indicates which kind of AppArmor profile will be applied.
+                                Valid options are:
+                                  Localhost - a profile pre-loaded on the node.
+                                  RuntimeDefault - the container runtime's default profile.
+                                  Unconfined - no AppArmor enforcement.
+                              type: string
+                          required:
+                          - type
+                          type: object
+                        capabilities:
+                          description: |-
+                            The capabilities to add/drop when running containers.
+                            Defaults to the default set of capabilities granted by the container runtime.
+                            Note that this field cannot be set when spec.os.name is windows.
+                          properties:
+                            add:
+                              description: Added capabilities
+                              items:
+                                description: Capability represent POSIX capabilities
+                                  type
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            drop:
+                              description: Removed capabilities
+                              items:
+                                description: Capability represent POSIX capabilities
+                                  type
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                          type: object
+                        privileged:
+                          description: |-
+                            Run container in privileged mode.
+                            Processes in privileged containers are essentially equivalent to root on the host.
+                            Defaults to false.
+                            Note that this field cannot be set when spec.os.name is windows.
+                          type: boolean
+                        procMount:
+                          description: |-
+                            procMount denotes the type of proc mount to use for the containers.
+                            The default value is Default which uses the container runtime defaults for
+                            readonly paths and masked paths.
+                            This requires the ProcMountType feature flag to be enabled.
+                            Note that this field cannot be set when spec.os.name is windows.
+                          type: string
+                        readOnlyRootFilesystem:
+                          description: |-
+                            Whether this container has a read-only root filesystem.
+                            Default is false.
+                            Note that this field cannot be set when spec.os.name is windows.
+                          type: boolean
+                        runAsGroup:
+                          description: |-
+                            The GID to run the entrypoint of the container process.
+                            Uses runtime default if unset.
+                            May also be set in PodSecurityContext.  If set in both SecurityContext and
+                            PodSecurityContext, the value specified in SecurityContext takes precedence.
+                            Note that this field cannot be set when spec.os.name is windows.
+                          format: int64
+                          type: integer
+                        runAsNonRoot:
+                          description: |-
+                            Indicates that the container must run as a non-root user.
+                            If true, the Kubelet will validate the image at runtime to ensure that it
+                            does not run as UID 0 (root) and fail to start the container if it does.
+                            If unset or false, no such validation will be performed.
+                            May also be set in PodSecurityContext.  If set in both SecurityContext and
+                            PodSecurityContext, the value specified in SecurityContext takes precedence.
+                          type: boolean
+                        runAsUser:
+                          description: |-
+                            The UID to run the entrypoint of the container process.
+                            Defaults to user specified in image metadata if unspecified.
+                            May also be set in PodSecurityContext.  If set in both SecurityContext and
+                            PodSecurityContext, the value specified in SecurityContext takes precedence.
+                            Note that this field cannot be set when spec.os.name is windows.
+                          format: int64
+                          type: integer
+                        seLinuxOptions:
+                          description: |-
+                            The SELinux context to be applied to the container.
+                            If unspecified, the container runtime will allocate a random SELinux context for each
+                            container.  May also be set in PodSecurityContext.  If set in both SecurityContext and
+                            PodSecurityContext, the value specified in SecurityContext takes precedence.
+                            Note that this field cannot be set when spec.os.name is windows.
+                          properties:
+                            level:
+                              description: Level is SELinux level label that applies
+                                to the container.
+                              type: string
+                            role:
+                              description: Role is a SELinux role label that applies
+                                to the container.
+                              type: string
+                            type:
+                              description: Type is a SELinux type label that applies
+                                to the container.
+                              type: string
+                            user:
+                              description: User is a SELinux user label that applies
+                                to the container.
+                              type: string
+                          type: object
+                        seccompProfile:
+                          description: |-
+                            The seccomp options to use by this container. If seccomp options are
+                            provided at both the pod & container level, the container options
+                            override the pod options.
+                            Note that this field cannot be set when spec.os.name is windows.
+                          properties:
+                            localhostProfile:
+                              description: |-
+                                localhostProfile indicates a profile defined in a file on the node should be used.
+                                The profile must be preconfigured on the node to work.
+                                Must be a descending path, relative to the kubelet's configured seccomp profile location.
+                                Must be set if type is "Localhost". Must NOT be set for any other type.
+                              type: string
+                            type:
+                              description: |-
+                                type indicates which kind of seccomp profile will be applied.
+                                Valid options are:
+
+                                Localhost - a profile defined in a file on the node should be used.
+                                RuntimeDefault - the container runtime default profile should be used.
+                                Unconfined - no profile should be applied.
+                              type: string
+                          required:
+                          - type
+                          type: object
+                        windowsOptions:
+                          description: |-
+                            The Windows specific settings applied to all containers.
+                            If unspecified, the options from the PodSecurityContext will be used.
+                            If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence.
+                            Note that this field cannot be set when spec.os.name is linux.
+                          properties:
+                            gmsaCredentialSpec:
+                              description: |-
+                                GMSACredentialSpec is where the GMSA admission webhook
+                                (https://github.com/kubernetes-sigs/windows-gmsa) inlines the contents of the
+                                GMSA credential spec named by the GMSACredentialSpecName field.
+                              type: string
+                            gmsaCredentialSpecName:
+                              description: GMSACredentialSpecName is the name of the
+                                GMSA credential spec to use.
+                              type: string
+                            hostProcess:
+                              description: |-
+                                HostProcess determines if a container should be run as a 'Host Process' container.
+                                All of a Pod's containers must have the same effective HostProcess value
+                                (it is not allowed to have a mix of HostProcess containers and non-HostProcess containers).
+                                In addition, if HostProcess is true then HostNetwork must also be set to true.
+                              type: boolean
+                            runAsUserName:
+                              description: |-
+                                The UserName in Windows to run the entrypoint of the container process.
+                                Defaults to the user specified in image metadata if unspecified.
+                                May also be set in PodSecurityContext. If set in both SecurityContext and
+                                PodSecurityContext, the value specified in SecurityContext takes precedence.
+                              type: string
+                          type: object
+                      type: object
+                    startupProbe:
+                      description: |-
+                        StartupProbe indicates that the Pod has successfully initialized.
+                        If specified, no other probes are executed until this completes successfully.
+                        If this probe fails, the Pod will be restarted, just as if the livenessProbe failed.
+                        This can be used to provide different probe parameters at the beginning of a Pod's lifecycle,
+                        when it might take a long time to load data or warm a cache, than during steady-state operation.
+                        This cannot be updated.
+                        More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                      properties:
+                        exec:
+                          description: Exec specifies a command to execute in the
+                            container.
+                          properties:
+                            command:
+                              description: |-
+                                Command is the command line to execute inside the container, the working directory for the
+                                command  is root ('/') in the container's filesystem. The command is simply exec'd, it is
+                                not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use
+                                a shell, you need to explicitly call out to that shell.
+                                Exit status of 0 is treated as live/healthy and non-zero is unhealthy.
+                              items:
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                          type: object
+                        failureThreshold:
+                          description: |-
+                            Minimum consecutive failures for the probe to be considered failed after having succeeded.
+                            Defaults to 3. Minimum value is 1.
+                          format: int32
+                          type: integer
+                        grpc:
+                          description: GRPC specifies a GRPC HealthCheckRequest.
+                          properties:
+                            port:
+                              description: Port number of the gRPC service. Number
+                                must be in the range 1 to 65535.
+                              format: int32
+                              type: integer
+                            service:
+                              default: ""
+                              description: |-
+                                Service is the name of the service to place in the gRPC HealthCheckRequest
+                                (see https://github.com/grpc/grpc/blob/master/doc/health-checking.md).
+
+                                If this is not specified, the default behavior is defined by gRPC.
+                              type: string
+                          required:
+                          - port
+                          type: object
+                        httpGet:
+                          description: HTTPGet specifies an HTTP GET request to perform.
+                          properties:
+                            host:
+                              description: |-
+                                Host name to connect to, defaults to the pod IP. You probably want to set
+                                "Host" in httpHeaders instead.
+                              type: string
+                            httpHeaders:
+                              description: Custom headers to set in the request. HTTP
+                                allows repeated headers.
+                              items:
+                                description: HTTPHeader describes a custom header
+                                  to be used in HTTP probes
+                                properties:
+                                  name:
+                                    description: |-
+                                      The header field name.
+                                      This will be canonicalized upon output, so case-variant names will be understood as the same header.
+                                    type: string
+                                  value:
+                                    description: The header field value
+                                    type: string
+                                required:
+                                - name
+                                - value
+                                type: object
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            path:
+                              description: Path to access on the HTTP server.
+                              type: string
+                            port:
+                              anyOf:
+                              - type: integer
+                              - type: string
+                              description: |-
+                                Name or number of the port to access on the container.
+                                Number must be in the range 1 to 65535.
+                                Name must be an IANA_SVC_NAME.
+                              x-kubernetes-int-or-string: true
+                            scheme:
+                              description: |-
+                                Scheme to use for connecting to the host.
+                                Defaults to HTTP.
+                              type: string
+                          required:
+                          - port
+                          type: object
+                        initialDelaySeconds:
+                          description: |-
+                            Number of seconds after the container has started before liveness probes are initiated.
+                            More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                          format: int32
+                          type: integer
+                        periodSeconds:
+                          description: |-
+                            How often (in seconds) to perform the probe.
+                            Default to 10 seconds. Minimum value is 1.
+                          format: int32
+                          type: integer
+                        successThreshold:
+                          description: |-
+                            Minimum consecutive successes for the probe to be considered successful after having failed.
+                            Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
+                          format: int32
+                          type: integer
+                        tcpSocket:
+                          description: TCPSocket specifies a connection to a TCP port.
+                          properties:
+                            host:
+                              description: 'Optional: Host name to connect to, defaults
+                                to the pod IP.'
+                              type: string
+                            port:
+                              anyOf:
+                              - type: integer
+                              - type: string
+                              description: |-
+                                Number or name of the port to access on the container.
+                                Number must be in the range 1 to 65535.
+                                Name must be an IANA_SVC_NAME.
+                              x-kubernetes-int-or-string: true
+                          required:
+                          - port
+                          type: object
+                        terminationGracePeriodSeconds:
+                          description: |-
+                            Optional duration in seconds the pod needs to terminate gracefully upon probe failure.
+                            The grace period is the duration in seconds after the processes running in the pod are sent
+                            a termination signal and the time when the processes are forcibly halted with a kill signal.
+                            Set this value longer than the expected cleanup time for your process.
+                            If this value is nil, the pod's terminationGracePeriodSeconds will be used. Otherwise, this
+                            value overrides the value provided by the pod spec.
+                            Value must be non-negative integer. The value zero indicates stop immediately via
+                            the kill signal (no opportunity to shut down).
+                            This is a beta field and requires enabling ProbeTerminationGracePeriod feature gate.
+                            Minimum value is 1. spec.terminationGracePeriodSeconds is used if unset.
+                          format: int64
+                          type: integer
+                        timeoutSeconds:
+                          description: |-
+                            Number of seconds after which the probe times out.
+                            Defaults to 1 second. Minimum value is 1.
+                            More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                          format: int32
+                          type: integer
+                      type: object
+                    stdin:
+                      description: |-
+                        Whether this container should allocate a buffer for stdin in the container runtime. If this
+                        is not set, reads from stdin in the container will always result in EOF.
+                        Default is false.
+                      type: boolean
+                    stdinOnce:
+                      description: |-
+                        Whether the container runtime should close the stdin channel after it has been opened by
+                        a single attach. When stdin is true the stdin stream will remain open across multiple attach
+                        sessions. If stdinOnce is set to true, stdin is opened on container start, is empty until the
+                        first client attaches to stdin, and then remains open and accepts data until the client disconnects,
+                        at which time stdin is closed and remains closed until the container is restarted. If this
+                        flag is false, a container processes that reads from stdin will never receive an EOF.
+                        Default is false
+                      type: boolean
+                    terminationMessagePath:
+                      description: |-
+                        Optional: Path at which the file to which the container's termination message
+                        will be written is mounted into the container's filesystem.
+                        Message written is intended to be brief final status, such as an assertion failure message.
+                        Will be truncated by the node if greater than 4096 bytes. The total message length across
+                        all containers will be limited to 12kb.
+                        Defaults to /dev/termination-log.
+                        Cannot be updated.
+                      type: string
+                    terminationMessagePolicy:
+                      description: |-
+                        Indicate how the termination message should be populated. File will use the contents of
+                        terminationMessagePath to populate the container status message on both success and failure.
+                        FallbackToLogsOnError will use the last chunk of container log output if the termination
+                        message file is empty and the container exited with an error.
+                        The log output is limited to 2048 bytes or 80 lines, whichever is smaller.
+                        Defaults to File.
+                        Cannot be updated.
+                      type: string
+                    tty:
+                      description: |-
+                        Whether this container should allocate a TTY for itself, also requires 'stdin' to be true.
+                        Default is false.
+                      type: boolean
+                    volumeDevices:
+                      description: volumeDevices is the list of block devices to be
+                        used by the container.
+                      items:
+                        description: volumeDevice describes a mapping of a raw block
+                          device within a container.
+                        properties:
+                          devicePath:
+                            description: devicePath is the path inside of the container
+                              that the device will be mapped to.
+                            type: string
+                          name:
+                            description: name must match the name of a persistentVolumeClaim
+                              in the pod
+                            type: string
+                        required:
+                        - devicePath
+                        - name
+                        type: object
+                      type: array
+                      x-kubernetes-list-map-keys:
+                      - devicePath
+                      x-kubernetes-list-type: map
+                    volumeMounts:
+                      description: |-
+                        Pod volumes to mount into the container's filesystem.
+                        Cannot be updated.
+                      items:
+                        description: VolumeMount describes a mounting of a Volume
+                          within a container.
+                        properties:
+                          mountPath:
+                            description: |-
+                              Path within the container at which the volume should be mounted.  Must
+                              not contain ':'.
+                            type: string
+                          mountPropagation:
+                            description: |-
+                              mountPropagation determines how mounts are propagated from the host
+                              to container and the other way around.
+                              When not set, MountPropagationNone is used.
+                              This field is beta in 1.10.
+                              When RecursiveReadOnly is set to IfPossible or to Enabled, MountPropagation must be None or unspecified
+                              (which defaults to None).
+                            type: string
+                          name:
+                            description: This must match the Name of a Volume.
+                            type: string
+                          readOnly:
+                            description: |-
+                              Mounted read-only if true, read-write otherwise (false or unspecified).
+                              Defaults to false.
+                            type: boolean
+                          recursiveReadOnly:
+                            description: |-
+                              RecursiveReadOnly specifies whether read-only mounts should be handled
+                              recursively.
+
+                              If ReadOnly is false, this field has no meaning and must be unspecified.
+
+                              If ReadOnly is true, and this field is set to Disabled, the mount is not made
+                              recursively read-only.  If this field is set to IfPossible, the mount is made
+                              recursively read-only, if it is supported by the container runtime.  If this
+                              field is set to Enabled, the mount is made recursively read-only if it is
+                              supported by the container runtime, otherwise the pod will not be started and
+                              an error will be generated to indicate the reason.
+
+                              If this field is set to IfPossible or Enabled, MountPropagation must be set to
+                              None (or be unspecified, which defaults to None).
+
+                              If this field is not specified, it is treated as an equivalent of Disabled.
+                            type: string
+                          subPath:
+                            description: |-
+                              Path within the volume from which the container's volume should be mounted.
+                              Defaults to "" (volume's root).
+                            type: string
+                          subPathExpr:
+                            description: |-
+                              Expanded path within the volume from which the container's volume should be mounted.
+                              Behaves similarly to SubPath but environment variable references $(VAR_NAME) are expanded using the container's environment.
+                              Defaults to "" (volume's root).
+                              SubPathExpr and SubPath are mutually exclusive.
+                            type: string
+                        required:
+                        - mountPath
+                        - name
+                        type: object
+                      type: array
+                      x-kubernetes-list-map-keys:
+                      - mountPath
+                      x-kubernetes-list-type: map
+                    workingDir:
+                      description: |-
+                        Container's working directory.
+                        If not specified, the container runtime's default will be used, which
+                        might be configured in the container image.
+                        Cannot be updated.
+                      type: string
+                  required:
+                  - name
+                  type: object
+                type: array
+              dnsConfig:
+                description: dnsConfig defines Defines the DNS configuration for the
+                  pods.
+                properties:
+                  nameservers:
+                    description: |-
+                      nameservers defines the list of DNS name server IP addresses.
+                      This will be appended to the base nameservers generated from DNSPolicy.
+                    items:
+                      minLength: 1
+                      type: string
+                    type: array
+                    x-kubernetes-list-type: set
+                  options:
+                    description: |-
+                      options defines the list of DNS resolver options.
+                      This will be merged with the base options generated from DNSPolicy.
+                      Resolution options given in Options
+                      will override those that appear in the base DNSPolicy.
+                    items:
+                      description: PodDNSConfigOption defines DNS resolver options
+                        of a pod.
+                      properties:
+                        name:
+                          description: name is required and must be unique.
+                          minLength: 1
+                          type: string
+                        value:
+                          description: value is optional.
+                          type: string
+                      required:
+                      - name
+                      type: object
+                    type: array
+                    x-kubernetes-list-map-keys:
+                    - name
+                    x-kubernetes-list-type: map
+                  searches:
+                    description: |-
+                      searches defines the list of DNS search domains for host-name lookup.
+                      This will be appended to the base search paths generated from DNSPolicy.
+                    items:
+                      minLength: 1
+                      type: string
+                    type: array
+                    x-kubernetes-list-type: set
+                type: object
+              dnsPolicy:
+                description: dnsPolicy defines the DNS policy for the pods.
+                enum:
+                - ClusterFirstWithHostNet
+                - ClusterFirst
+                - Default
+                - None
+                type: string
+              enableFeatures:
+                description: |-
+                  enableFeatures defines how to setup Thanos Ruler feature flags. By default, no features are enabled.
+
+                  Enabling features which are disabled by default is entirely outside the
+                  scope of what the maintainers will support and by doing so, you accept
+                  that this behaviour may break at any time without notice.
+
+                  For more information see https://thanos.io/tip/components/rule.md/
+
+                  It requires Thanos >= 0.39.0.
+                items:
+                  minLength: 1
+                  type: string
+                type: array
+                x-kubernetes-list-type: set
+              enableServiceLinks:
+                description: enableServiceLinks defines whether information about
+                  services should be injected into pod's environment variables
+                type: boolean
+              enforcedNamespaceLabel:
+                description: |-
+                  enforcedNamespaceLabel enforces adding a namespace label of origin for each alert
+                  and metric that is user created. The label value will always be the namespace of the object that is
+                  being created.
+                type: string
+              evaluationInterval:
+                default: 15s
+                description: evaluationInterval defines the interval between consecutive
+                  evaluations.
+                pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
+                type: string
+              excludedFromEnforcement:
+                description: |-
+                  excludedFromEnforcement defines the list of references to PrometheusRule objects
+                  to be excluded from enforcing a namespace label of origin.
+                  Applies only if enforcedNamespaceLabel set to true.
+                items:
+                  description: ObjectReference references a PodMonitor, ServiceMonitor,
+                    Probe or PrometheusRule object.
+                  properties:
+                    group:
+                      default: monitoring.coreos.com
+                      description: group of the referent. When not specified, it defaults
+                        to `monitoring.coreos.com`
+                      enum:
+                      - monitoring.coreos.com
+                      type: string
+                    name:
+                      description: name of the referent. When not set, all resources
+                        in the namespace are matched.
+                      type: string
+                    namespace:
+                      description: |-
+                        namespace of the referent.
+                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/
+                      minLength: 1
+                      type: string
+                    resource:
+                      description: resource of the referent.
+                      enum:
+                      - prometheusrules
+                      - servicemonitors
+                      - podmonitors
+                      - probes
+                      - scrapeconfigs
+                      type: string
+                  required:
+                  - namespace
+                  - resource
+                  type: object
+                type: array
+              externalPrefix:
+                description: |-
+                  externalPrefix defines the Thanos Ruler instances will be available under. This is
+                  necessary to generate correct URLs. This is necessary if Thanos Ruler is not
+                  served from root of a DNS name.
+                type: string
+              grpcServerTlsConfig:
+                description: |-
+                  grpcServerTlsConfig defines the gRPC server from which Thanos Querier reads
+                  recorded rule data.
+                  Note: Currently only the CAFile, CertFile, and KeyFile fields are supported.
+                  Maps to the '--grpc-server-tls-*' CLI args.
+                properties:
+                  ca:
+                    description: ca defines the Certificate authority used when verifying
+                      server certificates.
+                    properties:
+                      configMap:
+                        description: configMap defines the ConfigMap containing data
+                          to use for the targets.
+                        properties:
+                          key:
+                            description: The key to select.
+                            type: string
+                          name:
+                            default: ""
+                            description: |-
+                              Name of the referent.
+                              This field is effectively required, but due to backwards compatibility is
+                              allowed to be empty. Instances of this type with an empty value here are
+                              almost certainly wrong.
+                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                            type: string
+                          optional:
+                            description: Specify whether the ConfigMap or its key
+                              must be defined
+                            type: boolean
+                        required:
+                        - key
+                        type: object
+                        x-kubernetes-map-type: atomic
+                      secret:
+                        description: secret defines the Secret containing data to
+                          use for the targets.
+                        properties:
+                          key:
+                            description: The key of the secret to select from.  Must
+                              be a valid secret key.
+                            type: string
+                          name:
+                            default: ""
+                            description: |-
+                              Name of the referent.
+                              This field is effectively required, but due to backwards compatibility is
+                              allowed to be empty. Instances of this type with an empty value here are
+                              almost certainly wrong.
+                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                            type: string
+                          optional:
+                            description: Specify whether the Secret or its key must
+                              be defined
+                            type: boolean
+                        required:
+                        - key
+                        type: object
+                        x-kubernetes-map-type: atomic
+                    type: object
+                  caFile:
+                    description: caFile defines the path to the CA cert in the Prometheus
+                      container to use for the targets.
+                    type: string
+                  cert:
+                    description: cert defines the Client certificate to present when
+                      doing client-authentication.
+                    properties:
+                      configMap:
+                        description: configMap defines the ConfigMap containing data
+                          to use for the targets.
+                        properties:
+                          key:
+                            description: The key to select.
+                            type: string
+                          name:
+                            default: ""
+                            description: |-
+                              Name of the referent.
+                              This field is effectively required, but due to backwards compatibility is
+                              allowed to be empty. Instances of this type with an empty value here are
+                              almost certainly wrong.
+                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                            type: string
+                          optional:
+                            description: Specify whether the ConfigMap or its key
+                              must be defined
+                            type: boolean
+                        required:
+                        - key
+                        type: object
+                        x-kubernetes-map-type: atomic
+                      secret:
+                        description: secret defines the Secret containing data to
+                          use for the targets.
+                        properties:
+                          key:
+                            description: The key of the secret to select from.  Must
+                              be a valid secret key.
+                            type: string
+                          name:
+                            default: ""
+                            description: |-
+                              Name of the referent.
+                              This field is effectively required, but due to backwards compatibility is
+                              allowed to be empty. Instances of this type with an empty value here are
+                              almost certainly wrong.
+                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                            type: string
+                          optional:
+                            description: Specify whether the Secret or its key must
+                              be defined
+                            type: boolean
+                        required:
+                        - key
+                        type: object
+                        x-kubernetes-map-type: atomic
+                    type: object
+                  certFile:
+                    description: certFile defines the path to the client cert file
+                      in the Prometheus container for the targets.
+                    type: string
+                  insecureSkipVerify:
+                    description: insecureSkipVerify defines how to disable target
+                      certificate validation.
+                    type: boolean
+                  keyFile:
+                    description: keyFile defines the path to the client key file in
+                      the Prometheus container for the targets.
+                    type: string
+                  keySecret:
+                    description: keySecret defines the Secret containing the client
+                      key file for the targets.
+                    properties:
+                      key:
+                        description: The key of the secret to select from.  Must be
+                          a valid secret key.
+                        type: string
+                      name:
+                        default: ""
+                        description: |-
+                          Name of the referent.
+                          This field is effectively required, but due to backwards compatibility is
+                          allowed to be empty. Instances of this type with an empty value here are
+                          almost certainly wrong.
+                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                        type: string
+                      optional:
+                        description: Specify whether the Secret or its key must be
+                          defined
+                        type: boolean
+                    required:
+                    - key
+                    type: object
+                    x-kubernetes-map-type: atomic
+                  maxVersion:
+                    description: |-
+                      maxVersion defines the maximum acceptable TLS version.
+
+                      It requires Prometheus >= v2.41.0 or Thanos >= v0.31.0.
+                    enum:
+                    - TLS10
+                    - TLS11
+                    - TLS12
+                    - TLS13
+                    type: string
+                  minVersion:
+                    description: |-
+                      minVersion defines the minimum acceptable TLS version.
+
+                      It requires Prometheus >= v2.35.0 or Thanos >= v0.28.0.
+                    enum:
+                    - TLS10
+                    - TLS11
+                    - TLS12
+                    - TLS13
+                    type: string
+                  serverName:
+                    description: serverName is used to verify the hostname for the
+                      targets.
+                    type: string
+                type: object
+              hostAliases:
+                description: hostAliases defines pods' hostAliases configuration
+                items:
+                  description: |-
+                    HostAlias holds the mapping between IP and hostnames that will be injected as an entry in the
+                    pod's hosts file.
+                  properties:
+                    hostnames:
+                      description: hostnames defines hostnames for the above IP address.
+                      items:
+                        type: string
+                      type: array
+                    ip:
+                      description: ip defines the IP address of the host file entry.
+                      type: string
+                  required:
+                  - hostnames
+                  - ip
+                  type: object
+                type: array
+                x-kubernetes-list-map-keys:
+                - ip
+                x-kubernetes-list-type: map
+              hostUsers:
+                description: |-
+                  hostUsers supports the user space in Kubernetes.
+
+                  More info: https://kubernetes.io/docs/tasks/configure-pod-container/user-namespaces/
+
+                  The feature requires at least Kubernetes 1.28 with the `UserNamespacesSupport` feature gate enabled.
+                  Starting Kubernetes 1.33, the feature is enabled by default.
+                type: boolean
+              image:
+                description: image defines Thanos container image URL.
+                type: string
+              imagePullPolicy:
+                description: |-
+                  imagePullPolicy defines for the 'thanos', 'init-config-reloader' and 'config-reloader' containers.
+                  See https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy for more details.
+                enum:
+                - ""
+                - Always
+                - Never
+                - IfNotPresent
+                type: string
+              imagePullSecrets:
+                description: |-
+                  imagePullSecrets defines an optional list of references to secrets in the same namespace
+                  to use for pulling thanos images from registries
+                  see http://kubernetes.io/docs/user-guide/images#specifying-imagepullsecrets-on-a-pod
+                items:
+                  description: |-
+                    LocalObjectReference contains enough information to let you locate the
+                    referenced object inside the same namespace.
+                  properties:
+                    name:
+                      default: ""
+                      description: |-
+                        Name of the referent.
+                        This field is effectively required, but due to backwards compatibility is
+                        allowed to be empty. Instances of this type with an empty value here are
+                        almost certainly wrong.
+                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                      type: string
+                  type: object
+                  x-kubernetes-map-type: atomic
+                type: array
+              initContainers:
+                description: |-
+                  initContainers allows adding initContainers to the pod definition. Those can be used to e.g.
+                  fetch secrets for injection into the ThanosRuler configuration from external sources. Any
+                  errors during the execution of an initContainer will lead to a restart of the Pod.
+                  More info: https://kubernetes.io/docs/concepts/workloads/pods/init-containers/
+                  Using initContainers for any use case other then secret fetching is entirely outside the scope
+                  of what the maintainers will support and by doing so, you accept that this behaviour may break
+                  at any time without notice.
+                items:
+                  description: A single application container that you want to run
+                    within a pod.
+                  properties:
+                    args:
+                      description: |-
+                        Arguments to the entrypoint.
+                        The container image's CMD is used if this is not provided.
+                        Variable references $(VAR_NAME) are expanded using the container's environment. If a variable
+                        cannot be resolved, the reference in the input string will be unchanged. Double $$ are reduced
+                        to a single $, which allows for escaping the $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)" will
+                        produce the string literal "$(VAR_NAME)". Escaped references will never be expanded, regardless
+                        of whether the variable exists or not. Cannot be updated.
+                        More info: https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell
+                      items:
+                        type: string
+                      type: array
+                      x-kubernetes-list-type: atomic
+                    command:
+                      description: |-
+                        Entrypoint array. Not executed within a shell.
+                        The container image's ENTRYPOINT is used if this is not provided.
+                        Variable references $(VAR_NAME) are expanded using the container's environment. If a variable
+                        cannot be resolved, the reference in the input string will be unchanged. Double $$ are reduced
+                        to a single $, which allows for escaping the $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)" will
+                        produce the string literal "$(VAR_NAME)". Escaped references will never be expanded, regardless
+                        of whether the variable exists or not. Cannot be updated.
+                        More info: https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell
+                      items:
+                        type: string
+                      type: array
+                      x-kubernetes-list-type: atomic
+                    env:
+                      description: |-
+                        List of environment variables to set in the container.
+                        Cannot be updated.
+                      items:
+                        description: EnvVar represents an environment variable present
+                          in a Container.
+                        properties:
+                          name:
+                            description: |-
+                              Name of the environment variable.
+                              May consist of any printable ASCII characters except '='.
+                            type: string
+                          value:
+                            description: |-
+                              Variable references $(VAR_NAME) are expanded
+                              using the previously defined environment variables in the container and
+                              any service environment variables. If a variable cannot be resolved,
+                              the reference in the input string will be unchanged. Double $$ are reduced
+                              to a single $, which allows for escaping the $(VAR_NAME) syntax: i.e.
+                              "$$(VAR_NAME)" will produce the string literal "$(VAR_NAME)".
+                              Escaped references will never be expanded, regardless of whether the variable
+                              exists or not.
+                              Defaults to "".
+                            type: string
+                          valueFrom:
+                            description: Source for the environment variable's value.
+                              Cannot be used if value is not empty.
+                            properties:
+                              configMapKeyRef:
+                                description: Selects a key of a ConfigMap.
+                                properties:
+                                  key:
+                                    description: The key to select.
+                                    type: string
+                                  name:
+                                    default: ""
+                                    description: |-
+                                      Name of the referent.
+                                      This field is effectively required, but due to backwards compatibility is
+                                      allowed to be empty. Instances of this type with an empty value here are
+                                      almost certainly wrong.
+                                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                    type: string
+                                  optional:
+                                    description: Specify whether the ConfigMap or
+                                      its key must be defined
+                                    type: boolean
+                                required:
+                                - key
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              fieldRef:
+                                description: |-
+                                  Selects a field of the pod: supports metadata.name, metadata.namespace, `metadata.labels['<KEY>']`, `metadata.annotations['<KEY>']`,
+                                  spec.nodeName, spec.serviceAccountName, status.hostIP, status.podIP, status.podIPs.
+                                properties:
+                                  apiVersion:
+                                    description: Version of the schema the FieldPath
+                                      is written in terms of, defaults to "v1".
+                                    type: string
+                                  fieldPath:
+                                    description: Path of the field to select in the
+                                      specified API version.
+                                    type: string
+                                required:
+                                - fieldPath
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              fileKeyRef:
+                                description: |-
+                                  FileKeyRef selects a key of the env file.
+                                  Requires the EnvFiles feature gate to be enabled.
+                                properties:
+                                  key:
+                                    description: |-
+                                      The key within the env file. An invalid key will prevent the pod from starting.
+                                      The keys defined within a source may consist of any printable ASCII characters except '='.
+                                      During Alpha stage of the EnvFiles feature gate, the key size is limited to 128 characters.
+                                    type: string
+                                  optional:
+                                    default: false
+                                    description: |-
+                                      Specify whether the file or its key must be defined. If the file or key
+                                      does not exist, then the env var is not published.
+                                      If optional is set to true and the specified key does not exist,
+                                      the environment variable will not be set in the Pod's containers.
+
+                                      If optional is set to false and the specified key does not exist,
+                                      an error will be returned during Pod creation.
+                                    type: boolean
+                                  path:
+                                    description: |-
+                                      The path within the volume from which to select the file.
+                                      Must be relative and may not contain the '..' path or start with '..'.
+                                    type: string
+                                  volumeName:
+                                    description: The name of the volume mount containing
+                                      the env file.
+                                    type: string
+                                required:
+                                - key
+                                - path
+                                - volumeName
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              resourceFieldRef:
+                                description: |-
+                                  Selects a resource of the container: only resources limits and requests
+                                  (limits.cpu, limits.memory, limits.ephemeral-storage, requests.cpu, requests.memory and requests.ephemeral-storage) are currently supported.
+                                properties:
+                                  containerName:
+                                    description: 'Container name: required for volumes,
+                                      optional for env vars'
+                                    type: string
+                                  divisor:
+                                    anyOf:
+                                    - type: integer
+                                    - type: string
+                                    description: Specifies the output format of the
+                                      exposed resources, defaults to "1"
+                                    pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                    x-kubernetes-int-or-string: true
+                                  resource:
+                                    description: 'Required: resource to select'
+                                    type: string
+                                required:
+                                - resource
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              secretKeyRef:
+                                description: Selects a key of a secret in the pod's
+                                  namespace
+                                properties:
+                                  key:
+                                    description: The key of the secret to select from.  Must
+                                      be a valid secret key.
+                                    type: string
+                                  name:
+                                    default: ""
+                                    description: |-
+                                      Name of the referent.
+                                      This field is effectively required, but due to backwards compatibility is
+                                      allowed to be empty. Instances of this type with an empty value here are
+                                      almost certainly wrong.
+                                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                    type: string
+                                  optional:
+                                    description: Specify whether the Secret or its
+                                      key must be defined
+                                    type: boolean
+                                required:
+                                - key
+                                type: object
+                                x-kubernetes-map-type: atomic
+                            type: object
+                        required:
+                        - name
+                        type: object
+                      type: array
+                      x-kubernetes-list-map-keys:
+                      - name
+                      x-kubernetes-list-type: map
+                    envFrom:
+                      description: |-
+                        List of sources to populate environment variables in the container.
+                        The keys defined within a source may consist of any printable ASCII characters except '='.
+                        When a key exists in multiple
+                        sources, the value associated with the last source will take precedence.
+                        Values defined by an Env with a duplicate key will take precedence.
+                        Cannot be updated.
+                      items:
+                        description: EnvFromSource represents the source of a set
+                          of ConfigMaps or Secrets
+                        properties:
+                          configMapRef:
+                            description: The ConfigMap to select from
+                            properties:
+                              name:
+                                default: ""
+                                description: |-
+                                  Name of the referent.
+                                  This field is effectively required, but due to backwards compatibility is
+                                  allowed to be empty. Instances of this type with an empty value here are
+                                  almost certainly wrong.
+                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                type: string
+                              optional:
+                                description: Specify whether the ConfigMap must be
+                                  defined
+                                type: boolean
+                            type: object
+                            x-kubernetes-map-type: atomic
+                          prefix:
+                            description: |-
+                              Optional text to prepend to the name of each environment variable.
+                              May consist of any printable ASCII characters except '='.
+                            type: string
+                          secretRef:
+                            description: The Secret to select from
+                            properties:
+                              name:
+                                default: ""
+                                description: |-
+                                  Name of the referent.
+                                  This field is effectively required, but due to backwards compatibility is
+                                  allowed to be empty. Instances of this type with an empty value here are
+                                  almost certainly wrong.
+                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                type: string
+                              optional:
+                                description: Specify whether the Secret must be defined
+                                type: boolean
+                            type: object
+                            x-kubernetes-map-type: atomic
+                        type: object
+                      type: array
+                      x-kubernetes-list-type: atomic
+                    image:
+                      description: |-
+                        Container image name.
+                        More info: https://kubernetes.io/docs/concepts/containers/images
+                        This field is optional to allow higher level config management to default or override
+                        container images in workload controllers like Deployments and StatefulSets.
+                      type: string
+                    imagePullPolicy:
+                      description: |-
+                        Image pull policy.
+                        One of Always, Never, IfNotPresent.
+                        Defaults to Always if :latest tag is specified, or IfNotPresent otherwise.
+                        Cannot be updated.
+                        More info: https://kubernetes.io/docs/concepts/containers/images#updating-images
+                      type: string
+                    lifecycle:
+                      description: |-
+                        Actions that the management system should take in response to container lifecycle events.
+                        Cannot be updated.
+                      properties:
+                        postStart:
+                          description: |-
+                            PostStart is called immediately after a container is created. If the handler fails,
+                            the container is terminated and restarted according to its restart policy.
+                            Other management of the container blocks until the hook completes.
+                            More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
+                          properties:
+                            exec:
+                              description: Exec specifies a command to execute in
+                                the container.
+                              properties:
+                                command:
+                                  description: |-
+                                    Command is the command line to execute inside the container, the working directory for the
+                                    command  is root ('/') in the container's filesystem. The command is simply exec'd, it is
+                                    not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use
+                                    a shell, you need to explicitly call out to that shell.
+                                    Exit status of 0 is treated as live/healthy and non-zero is unhealthy.
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                              type: object
+                            httpGet:
+                              description: HTTPGet specifies an HTTP GET request to
+                                perform.
+                              properties:
+                                host:
+                                  description: |-
+                                    Host name to connect to, defaults to the pod IP. You probably want to set
+                                    "Host" in httpHeaders instead.
+                                  type: string
+                                httpHeaders:
+                                  description: Custom headers to set in the request.
+                                    HTTP allows repeated headers.
+                                  items:
+                                    description: HTTPHeader describes a custom header
+                                      to be used in HTTP probes
+                                    properties:
+                                      name:
+                                        description: |-
+                                          The header field name.
+                                          This will be canonicalized upon output, so case-variant names will be understood as the same header.
+                                        type: string
+                                      value:
+                                        description: The header field value
+                                        type: string
+                                    required:
+                                    - name
+                                    - value
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                path:
+                                  description: Path to access on the HTTP server.
+                                  type: string
+                                port:
+                                  anyOf:
+                                  - type: integer
+                                  - type: string
+                                  description: |-
+                                    Name or number of the port to access on the container.
+                                    Number must be in the range 1 to 65535.
+                                    Name must be an IANA_SVC_NAME.
+                                  x-kubernetes-int-or-string: true
+                                scheme:
+                                  description: |-
+                                    Scheme to use for connecting to the host.
+                                    Defaults to HTTP.
+                                  type: string
+                              required:
+                              - port
+                              type: object
+                            sleep:
+                              description: Sleep represents a duration that the container
+                                should sleep.
+                              properties:
+                                seconds:
+                                  description: Seconds is the number of seconds to
+                                    sleep.
+                                  format: int64
+                                  type: integer
+                              required:
+                              - seconds
+                              type: object
+                            tcpSocket:
+                              description: |-
+                                Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
+                                for backward compatibility. There is no validation of this field and
+                                lifecycle hooks will fail at runtime when it is specified.
+                              properties:
+                                host:
+                                  description: 'Optional: Host name to connect to,
+                                    defaults to the pod IP.'
+                                  type: string
+                                port:
+                                  anyOf:
+                                  - type: integer
+                                  - type: string
+                                  description: |-
+                                    Number or name of the port to access on the container.
+                                    Number must be in the range 1 to 65535.
+                                    Name must be an IANA_SVC_NAME.
+                                  x-kubernetes-int-or-string: true
+                              required:
+                              - port
+                              type: object
+                          type: object
+                        preStop:
+                          description: |-
+                            PreStop is called immediately before a container is terminated due to an
+                            API request or management event such as liveness/startup probe failure,
+                            preemption, resource contention, etc. The handler is not called if the
+                            container crashes or exits. The Pod's termination grace period countdown begins before the
+                            PreStop hook is executed. Regardless of the outcome of the handler, the
+                            container will eventually terminate within the Pod's termination grace
+                            period (unless delayed by finalizers). Other management of the container blocks until the hook completes
+                            or until the termination grace period is reached.
+                            More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
+                          properties:
+                            exec:
+                              description: Exec specifies a command to execute in
+                                the container.
+                              properties:
+                                command:
+                                  description: |-
+                                    Command is the command line to execute inside the container, the working directory for the
+                                    command  is root ('/') in the container's filesystem. The command is simply exec'd, it is
+                                    not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use
+                                    a shell, you need to explicitly call out to that shell.
+                                    Exit status of 0 is treated as live/healthy and non-zero is unhealthy.
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                              type: object
+                            httpGet:
+                              description: HTTPGet specifies an HTTP GET request to
+                                perform.
+                              properties:
+                                host:
+                                  description: |-
+                                    Host name to connect to, defaults to the pod IP. You probably want to set
+                                    "Host" in httpHeaders instead.
+                                  type: string
+                                httpHeaders:
+                                  description: Custom headers to set in the request.
+                                    HTTP allows repeated headers.
+                                  items:
+                                    description: HTTPHeader describes a custom header
+                                      to be used in HTTP probes
+                                    properties:
+                                      name:
+                                        description: |-
+                                          The header field name.
+                                          This will be canonicalized upon output, so case-variant names will be understood as the same header.
+                                        type: string
+                                      value:
+                                        description: The header field value
+                                        type: string
+                                    required:
+                                    - name
+                                    - value
+                                    type: object
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                path:
+                                  description: Path to access on the HTTP server.
+                                  type: string
+                                port:
+                                  anyOf:
+                                  - type: integer
+                                  - type: string
+                                  description: |-
+                                    Name or number of the port to access on the container.
+                                    Number must be in the range 1 to 65535.
+                                    Name must be an IANA_SVC_NAME.
+                                  x-kubernetes-int-or-string: true
+                                scheme:
+                                  description: |-
+                                    Scheme to use for connecting to the host.
+                                    Defaults to HTTP.
+                                  type: string
+                              required:
+                              - port
+                              type: object
+                            sleep:
+                              description: Sleep represents a duration that the container
+                                should sleep.
+                              properties:
+                                seconds:
+                                  description: Seconds is the number of seconds to
+                                    sleep.
+                                  format: int64
+                                  type: integer
+                              required:
+                              - seconds
+                              type: object
+                            tcpSocket:
+                              description: |-
+                                Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
+                                for backward compatibility. There is no validation of this field and
+                                lifecycle hooks will fail at runtime when it is specified.
+                              properties:
+                                host:
+                                  description: 'Optional: Host name to connect to,
+                                    defaults to the pod IP.'
+                                  type: string
+                                port:
+                                  anyOf:
+                                  - type: integer
+                                  - type: string
+                                  description: |-
+                                    Number or name of the port to access on the container.
+                                    Number must be in the range 1 to 65535.
+                                    Name must be an IANA_SVC_NAME.
+                                  x-kubernetes-int-or-string: true
+                              required:
+                              - port
+                              type: object
+                          type: object
+                        stopSignal:
+                          description: |-
+                            StopSignal defines which signal will be sent to a container when it is being stopped.
+                            If not specified, the default is defined by the container runtime in use.
+                            StopSignal can only be set for Pods with a non-empty .spec.os.name
+                          type: string
+                      type: object
+                    livenessProbe:
+                      description: |-
+                        Periodic probe of container liveness.
+                        Container will be restarted if the probe fails.
+                        Cannot be updated.
+                        More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                      properties:
+                        exec:
+                          description: Exec specifies a command to execute in the
+                            container.
+                          properties:
+                            command:
+                              description: |-
+                                Command is the command line to execute inside the container, the working directory for the
+                                command  is root ('/') in the container's filesystem. The command is simply exec'd, it is
+                                not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use
+                                a shell, you need to explicitly call out to that shell.
+                                Exit status of 0 is treated as live/healthy and non-zero is unhealthy.
+                              items:
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                          type: object
+                        failureThreshold:
+                          description: |-
+                            Minimum consecutive failures for the probe to be considered failed after having succeeded.
+                            Defaults to 3. Minimum value is 1.
+                          format: int32
+                          type: integer
+                        grpc:
+                          description: GRPC specifies a GRPC HealthCheckRequest.
+                          properties:
+                            port:
+                              description: Port number of the gRPC service. Number
+                                must be in the range 1 to 65535.
+                              format: int32
+                              type: integer
+                            service:
+                              default: ""
+                              description: |-
+                                Service is the name of the service to place in the gRPC HealthCheckRequest
+                                (see https://github.com/grpc/grpc/blob/master/doc/health-checking.md).
+
+                                If this is not specified, the default behavior is defined by gRPC.
+                              type: string
+                          required:
+                          - port
+                          type: object
+                        httpGet:
+                          description: HTTPGet specifies an HTTP GET request to perform.
+                          properties:
+                            host:
+                              description: |-
+                                Host name to connect to, defaults to the pod IP. You probably want to set
+                                "Host" in httpHeaders instead.
+                              type: string
+                            httpHeaders:
+                              description: Custom headers to set in the request. HTTP
+                                allows repeated headers.
+                              items:
+                                description: HTTPHeader describes a custom header
+                                  to be used in HTTP probes
+                                properties:
+                                  name:
+                                    description: |-
+                                      The header field name.
+                                      This will be canonicalized upon output, so case-variant names will be understood as the same header.
+                                    type: string
+                                  value:
+                                    description: The header field value
+                                    type: string
+                                required:
+                                - name
+                                - value
+                                type: object
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            path:
+                              description: Path to access on the HTTP server.
+                              type: string
+                            port:
+                              anyOf:
+                              - type: integer
+                              - type: string
+                              description: |-
+                                Name or number of the port to access on the container.
+                                Number must be in the range 1 to 65535.
+                                Name must be an IANA_SVC_NAME.
+                              x-kubernetes-int-or-string: true
+                            scheme:
+                              description: |-
+                                Scheme to use for connecting to the host.
+                                Defaults to HTTP.
+                              type: string
+                          required:
+                          - port
+                          type: object
+                        initialDelaySeconds:
+                          description: |-
+                            Number of seconds after the container has started before liveness probes are initiated.
+                            More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                          format: int32
+                          type: integer
+                        periodSeconds:
+                          description: |-
+                            How often (in seconds) to perform the probe.
+                            Default to 10 seconds. Minimum value is 1.
+                          format: int32
+                          type: integer
+                        successThreshold:
+                          description: |-
+                            Minimum consecutive successes for the probe to be considered successful after having failed.
+                            Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
+                          format: int32
+                          type: integer
+                        tcpSocket:
+                          description: TCPSocket specifies a connection to a TCP port.
+                          properties:
+                            host:
+                              description: 'Optional: Host name to connect to, defaults
+                                to the pod IP.'
+                              type: string
+                            port:
+                              anyOf:
+                              - type: integer
+                              - type: string
+                              description: |-
+                                Number or name of the port to access on the container.
+                                Number must be in the range 1 to 65535.
+                                Name must be an IANA_SVC_NAME.
+                              x-kubernetes-int-or-string: true
+                          required:
+                          - port
+                          type: object
+                        terminationGracePeriodSeconds:
+                          description: |-
+                            Optional duration in seconds the pod needs to terminate gracefully upon probe failure.
+                            The grace period is the duration in seconds after the processes running in the pod are sent
+                            a termination signal and the time when the processes are forcibly halted with a kill signal.
+                            Set this value longer than the expected cleanup time for your process.
+                            If this value is nil, the pod's terminationGracePeriodSeconds will be used. Otherwise, this
+                            value overrides the value provided by the pod spec.
+                            Value must be non-negative integer. The value zero indicates stop immediately via
+                            the kill signal (no opportunity to shut down).
+                            This is a beta field and requires enabling ProbeTerminationGracePeriod feature gate.
+                            Minimum value is 1. spec.terminationGracePeriodSeconds is used if unset.
+                          format: int64
+                          type: integer
+                        timeoutSeconds:
+                          description: |-
+                            Number of seconds after which the probe times out.
+                            Defaults to 1 second. Minimum value is 1.
+                            More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                          format: int32
+                          type: integer
+                      type: object
+                    name:
+                      description: |-
+                        Name of the container specified as a DNS_LABEL.
+                        Each container in a pod must have a unique name (DNS_LABEL).
+                        Cannot be updated.
+                      type: string
+                    ports:
+                      description: |-
+                        List of ports to expose from the container. Not specifying a port here
+                        DOES NOT prevent that port from being exposed. Any port which is
+                        listening on the default "0.0.0.0" address inside a container will be
+                        accessible from the network.
+                        Modifying this array with strategic merge patch may corrupt the data.
+                        For more information See https://github.com/kubernetes/kubernetes/issues/108255.
+                        Cannot be updated.
+                      items:
+                        description: ContainerPort represents a network port in a
+                          single container.
+                        properties:
+                          containerPort:
+                            description: |-
+                              Number of port to expose on the pod's IP address.
+                              This must be a valid port number, 0 < x < 65536.
+                            format: int32
+                            type: integer
+                          hostIP:
+                            description: What host IP to bind the external port to.
+                            type: string
+                          hostPort:
+                            description: |-
+                              Number of port to expose on the host.
+                              If specified, this must be a valid port number, 0 < x < 65536.
+                              If HostNetwork is specified, this must match ContainerPort.
+                              Most containers do not need this.
+                            format: int32
+                            type: integer
+                          name:
+                            description: |-
+                              If specified, this must be an IANA_SVC_NAME and unique within the pod. Each
+                              named port in a pod must have a unique name. Name for the port that can be
+                              referred to by services.
+                            type: string
+                          protocol:
+                            default: TCP
+                            description: |-
+                              Protocol for port. Must be UDP, TCP, or SCTP.
+                              Defaults to "TCP".
+                            type: string
+                        required:
+                        - containerPort
+                        type: object
+                      type: array
+                      x-kubernetes-list-map-keys:
+                      - containerPort
+                      - protocol
+                      x-kubernetes-list-type: map
+                    readinessProbe:
+                      description: |-
+                        Periodic probe of container service readiness.
+                        Container will be removed from service endpoints if the probe fails.
+                        Cannot be updated.
+                        More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                      properties:
+                        exec:
+                          description: Exec specifies a command to execute in the
+                            container.
+                          properties:
+                            command:
+                              description: |-
+                                Command is the command line to execute inside the container, the working directory for the
+                                command  is root ('/') in the container's filesystem. The command is simply exec'd, it is
+                                not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use
+                                a shell, you need to explicitly call out to that shell.
+                                Exit status of 0 is treated as live/healthy and non-zero is unhealthy.
+                              items:
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                          type: object
+                        failureThreshold:
+                          description: |-
+                            Minimum consecutive failures for the probe to be considered failed after having succeeded.
+                            Defaults to 3. Minimum value is 1.
+                          format: int32
+                          type: integer
+                        grpc:
+                          description: GRPC specifies a GRPC HealthCheckRequest.
+                          properties:
+                            port:
+                              description: Port number of the gRPC service. Number
+                                must be in the range 1 to 65535.
+                              format: int32
+                              type: integer
+                            service:
+                              default: ""
+                              description: |-
+                                Service is the name of the service to place in the gRPC HealthCheckRequest
+                                (see https://github.com/grpc/grpc/blob/master/doc/health-checking.md).
+
+                                If this is not specified, the default behavior is defined by gRPC.
+                              type: string
+                          required:
+                          - port
+                          type: object
+                        httpGet:
+                          description: HTTPGet specifies an HTTP GET request to perform.
+                          properties:
+                            host:
+                              description: |-
+                                Host name to connect to, defaults to the pod IP. You probably want to set
+                                "Host" in httpHeaders instead.
+                              type: string
+                            httpHeaders:
+                              description: Custom headers to set in the request. HTTP
+                                allows repeated headers.
+                              items:
+                                description: HTTPHeader describes a custom header
+                                  to be used in HTTP probes
+                                properties:
+                                  name:
+                                    description: |-
+                                      The header field name.
+                                      This will be canonicalized upon output, so case-variant names will be understood as the same header.
+                                    type: string
+                                  value:
+                                    description: The header field value
+                                    type: string
+                                required:
+                                - name
+                                - value
+                                type: object
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            path:
+                              description: Path to access on the HTTP server.
+                              type: string
+                            port:
+                              anyOf:
+                              - type: integer
+                              - type: string
+                              description: |-
+                                Name or number of the port to access on the container.
+                                Number must be in the range 1 to 65535.
+                                Name must be an IANA_SVC_NAME.
+                              x-kubernetes-int-or-string: true
+                            scheme:
+                              description: |-
+                                Scheme to use for connecting to the host.
+                                Defaults to HTTP.
+                              type: string
+                          required:
+                          - port
+                          type: object
+                        initialDelaySeconds:
+                          description: |-
+                            Number of seconds after the container has started before liveness probes are initiated.
+                            More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                          format: int32
+                          type: integer
+                        periodSeconds:
+                          description: |-
+                            How often (in seconds) to perform the probe.
+                            Default to 10 seconds. Minimum value is 1.
+                          format: int32
+                          type: integer
+                        successThreshold:
+                          description: |-
+                            Minimum consecutive successes for the probe to be considered successful after having failed.
+                            Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
+                          format: int32
+                          type: integer
+                        tcpSocket:
+                          description: TCPSocket specifies a connection to a TCP port.
+                          properties:
+                            host:
+                              description: 'Optional: Host name to connect to, defaults
+                                to the pod IP.'
+                              type: string
+                            port:
+                              anyOf:
+                              - type: integer
+                              - type: string
+                              description: |-
+                                Number or name of the port to access on the container.
+                                Number must be in the range 1 to 65535.
+                                Name must be an IANA_SVC_NAME.
+                              x-kubernetes-int-or-string: true
+                          required:
+                          - port
+                          type: object
+                        terminationGracePeriodSeconds:
+                          description: |-
+                            Optional duration in seconds the pod needs to terminate gracefully upon probe failure.
+                            The grace period is the duration in seconds after the processes running in the pod are sent
+                            a termination signal and the time when the processes are forcibly halted with a kill signal.
+                            Set this value longer than the expected cleanup time for your process.
+                            If this value is nil, the pod's terminationGracePeriodSeconds will be used. Otherwise, this
+                            value overrides the value provided by the pod spec.
+                            Value must be non-negative integer. The value zero indicates stop immediately via
+                            the kill signal (no opportunity to shut down).
+                            This is a beta field and requires enabling ProbeTerminationGracePeriod feature gate.
+                            Minimum value is 1. spec.terminationGracePeriodSeconds is used if unset.
+                          format: int64
+                          type: integer
+                        timeoutSeconds:
+                          description: |-
+                            Number of seconds after which the probe times out.
+                            Defaults to 1 second. Minimum value is 1.
+                            More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                          format: int32
+                          type: integer
+                      type: object
+                    resizePolicy:
+                      description: Resources resize policy for the container.
+                      items:
+                        description: ContainerResizePolicy represents resource resize
+                          policy for the container.
+                        properties:
+                          resourceName:
+                            description: |-
+                              Name of the resource to which this resource resize policy applies.
+                              Supported values: cpu, memory.
+                            type: string
+                          restartPolicy:
+                            description: |-
+                              Restart policy to apply when specified resource is resized.
+                              If not specified, it defaults to NotRequired.
+                            type: string
+                        required:
+                        - resourceName
+                        - restartPolicy
+                        type: object
+                      type: array
+                      x-kubernetes-list-type: atomic
+                    resources:
+                      description: |-
+                        Compute Resources required by this container.
+                        Cannot be updated.
+                        More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+                      properties:
+                        claims:
+                          description: |-
+                            Claims lists the names of resources, defined in spec.resourceClaims,
+                            that are used by this container.
+
+                            This field depends on the
+                            DynamicResourceAllocation feature gate.
+
+                            This field is immutable. It can only be set for containers.
+                          items:
+                            description: ResourceClaim references one entry in PodSpec.ResourceClaims.
+                            properties:
+                              name:
+                                description: |-
+                                  Name must match the name of one entry in pod.spec.resourceClaims of
+                                  the Pod where this field is used. It makes that resource available
+                                  inside a container.
+                                type: string
+                              request:
+                                description: |-
+                                  Request is the name chosen for a request in the referenced claim.
+                                  If empty, everything from the claim is made available, otherwise
+                                  only the result of this request.
+                                type: string
+                            required:
+                            - name
+                            type: object
+                          type: array
+                          x-kubernetes-list-map-keys:
+                          - name
+                          x-kubernetes-list-type: map
+                        limits:
+                          additionalProperties:
+                            anyOf:
+                            - type: integer
+                            - type: string
+                            pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                            x-kubernetes-int-or-string: true
+                          description: |-
+                            Limits describes the maximum amount of compute resources allowed.
+                            More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+                          type: object
+                        requests:
+                          additionalProperties:
+                            anyOf:
+                            - type: integer
+                            - type: string
+                            pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                            x-kubernetes-int-or-string: true
+                          description: |-
+                            Requests describes the minimum amount of compute resources required.
+                            If Requests is omitted for a container, it defaults to Limits if that is explicitly specified,
+                            otherwise to an implementation-defined value. Requests cannot exceed Limits.
+                            More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+                          type: object
+                      type: object
+                    restartPolicy:
+                      description: |-
+                        RestartPolicy defines the restart behavior of individual containers in a pod.
+                        This overrides the pod-level restart policy. When this field is not specified,
+                        the restart behavior is defined by the Pod's restart policy and the container type.
+                        Additionally, setting the RestartPolicy as "Always" for the init container will
+                        have the following effect:
+                        this init container will be continually restarted on
+                        exit until all regular containers have terminated. Once all regular
+                        containers have completed, all init containers with restartPolicy "Always"
+                        will be shut down. This lifecycle differs from normal init containers and
+                        is often referred to as a "sidecar" container. Although this init
+                        container still starts in the init container sequence, it does not wait
+                        for the container to complete before proceeding to the next init
+                        container. Instead, the next init container starts immediately after this
+                        init container is started, or after any startupProbe has successfully
+                        completed.
+                      type: string
+                    restartPolicyRules:
+                      description: |-
+                        Represents a list of rules to be checked to determine if the
+                        container should be restarted on exit. The rules are evaluated in
+                        order. Once a rule matches a container exit condition, the remaining
+                        rules are ignored. If no rule matches the container exit condition,
+                        the Container-level restart policy determines the whether the container
+                        is restarted or not. Constraints on the rules:
+                        - At most 20 rules are allowed.
+                        - Rules can have the same action.
+                        - Identical rules are not forbidden in validations.
+                        When rules are specified, container MUST set RestartPolicy explicitly
+                        even it if matches the Pod's RestartPolicy.
+                      items:
+                        description: ContainerRestartRule describes how a container
+                          exit is handled.
+                        properties:
+                          action:
+                            description: |-
+                              Specifies the action taken on a container exit if the requirements
+                              are satisfied. The only possible value is "Restart" to restart the
+                              container.
+                            type: string
+                          exitCodes:
+                            description: Represents the exit codes to check on container
+                              exits.
+                            properties:
+                              operator:
+                                description: |-
+                                  Represents the relationship between the container exit code(s) and the
+                                  specified values. Possible values are:
+                                  - In: the requirement is satisfied if the container exit code is in the
+                                    set of specified values.
+                                  - NotIn: the requirement is satisfied if the container exit code is
+                                    not in the set of specified values.
+                                type: string
+                              values:
+                                description: |-
+                                  Specifies the set of values to check for container exit codes.
+                                  At most 255 elements are allowed.
+                                items:
+                                  format: int32
+                                  type: integer
+                                type: array
+                                x-kubernetes-list-type: set
+                            required:
+                            - operator
+                            type: object
+                        required:
+                        - action
+                        type: object
+                      type: array
+                      x-kubernetes-list-type: atomic
+                    securityContext:
+                      description: |-
+                        SecurityContext defines the security options the container should be run with.
+                        If set, the fields of SecurityContext override the equivalent fields of PodSecurityContext.
+                        More info: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/
+                      properties:
+                        allowPrivilegeEscalation:
+                          description: |-
+                            AllowPrivilegeEscalation controls whether a process can gain more
+                            privileges than its parent process. This bool directly controls if
+                            the no_new_privs flag will be set on the container process.
+                            AllowPrivilegeEscalation is true always when the container is:
+                            1) run as Privileged
+                            2) has CAP_SYS_ADMIN
+                            Note that this field cannot be set when spec.os.name is windows.
+                          type: boolean
+                        appArmorProfile:
+                          description: |-
+                            appArmorProfile is the AppArmor options to use by this container. If set, this profile
+                            overrides the pod's appArmorProfile.
+                            Note that this field cannot be set when spec.os.name is windows.
+                          properties:
+                            localhostProfile:
+                              description: |-
+                                localhostProfile indicates a profile loaded on the node that should be used.
+                                The profile must be preconfigured on the node to work.
+                                Must match the loaded name of the profile.
+                                Must be set if and only if type is "Localhost".
+                              type: string
+                            type:
+                              description: |-
+                                type indicates which kind of AppArmor profile will be applied.
+                                Valid options are:
+                                  Localhost - a profile pre-loaded on the node.
+                                  RuntimeDefault - the container runtime's default profile.
+                                  Unconfined - no AppArmor enforcement.
+                              type: string
+                          required:
+                          - type
+                          type: object
+                        capabilities:
+                          description: |-
+                            The capabilities to add/drop when running containers.
+                            Defaults to the default set of capabilities granted by the container runtime.
+                            Note that this field cannot be set when spec.os.name is windows.
+                          properties:
+                            add:
+                              description: Added capabilities
+                              items:
+                                description: Capability represent POSIX capabilities
+                                  type
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            drop:
+                              description: Removed capabilities
+                              items:
+                                description: Capability represent POSIX capabilities
+                                  type
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                          type: object
+                        privileged:
+                          description: |-
+                            Run container in privileged mode.
+                            Processes in privileged containers are essentially equivalent to root on the host.
+                            Defaults to false.
+                            Note that this field cannot be set when spec.os.name is windows.
+                          type: boolean
+                        procMount:
+                          description: |-
+                            procMount denotes the type of proc mount to use for the containers.
+                            The default value is Default which uses the container runtime defaults for
+                            readonly paths and masked paths.
+                            This requires the ProcMountType feature flag to be enabled.
+                            Note that this field cannot be set when spec.os.name is windows.
+                          type: string
+                        readOnlyRootFilesystem:
+                          description: |-
+                            Whether this container has a read-only root filesystem.
+                            Default is false.
+                            Note that this field cannot be set when spec.os.name is windows.
+                          type: boolean
+                        runAsGroup:
+                          description: |-
+                            The GID to run the entrypoint of the container process.
+                            Uses runtime default if unset.
+                            May also be set in PodSecurityContext.  If set in both SecurityContext and
+                            PodSecurityContext, the value specified in SecurityContext takes precedence.
+                            Note that this field cannot be set when spec.os.name is windows.
+                          format: int64
+                          type: integer
+                        runAsNonRoot:
+                          description: |-
+                            Indicates that the container must run as a non-root user.
+                            If true, the Kubelet will validate the image at runtime to ensure that it
+                            does not run as UID 0 (root) and fail to start the container if it does.
+                            If unset or false, no such validation will be performed.
+                            May also be set in PodSecurityContext.  If set in both SecurityContext and
+                            PodSecurityContext, the value specified in SecurityContext takes precedence.
+                          type: boolean
+                        runAsUser:
+                          description: |-
+                            The UID to run the entrypoint of the container process.
+                            Defaults to user specified in image metadata if unspecified.
+                            May also be set in PodSecurityContext.  If set in both SecurityContext and
+                            PodSecurityContext, the value specified in SecurityContext takes precedence.
+                            Note that this field cannot be set when spec.os.name is windows.
+                          format: int64
+                          type: integer
+                        seLinuxOptions:
+                          description: |-
+                            The SELinux context to be applied to the container.
+                            If unspecified, the container runtime will allocate a random SELinux context for each
+                            container.  May also be set in PodSecurityContext.  If set in both SecurityContext and
+                            PodSecurityContext, the value specified in SecurityContext takes precedence.
+                            Note that this field cannot be set when spec.os.name is windows.
+                          properties:
+                            level:
+                              description: Level is SELinux level label that applies
+                                to the container.
+                              type: string
+                            role:
+                              description: Role is a SELinux role label that applies
+                                to the container.
+                              type: string
+                            type:
+                              description: Type is a SELinux type label that applies
+                                to the container.
+                              type: string
+                            user:
+                              description: User is a SELinux user label that applies
+                                to the container.
+                              type: string
+                          type: object
+                        seccompProfile:
+                          description: |-
+                            The seccomp options to use by this container. If seccomp options are
+                            provided at both the pod & container level, the container options
+                            override the pod options.
+                            Note that this field cannot be set when spec.os.name is windows.
+                          properties:
+                            localhostProfile:
+                              description: |-
+                                localhostProfile indicates a profile defined in a file on the node should be used.
+                                The profile must be preconfigured on the node to work.
+                                Must be a descending path, relative to the kubelet's configured seccomp profile location.
+                                Must be set if type is "Localhost". Must NOT be set for any other type.
+                              type: string
+                            type:
+                              description: |-
+                                type indicates which kind of seccomp profile will be applied.
+                                Valid options are:
+
+                                Localhost - a profile defined in a file on the node should be used.
+                                RuntimeDefault - the container runtime default profile should be used.
+                                Unconfined - no profile should be applied.
+                              type: string
+                          required:
+                          - type
+                          type: object
+                        windowsOptions:
+                          description: |-
+                            The Windows specific settings applied to all containers.
+                            If unspecified, the options from the PodSecurityContext will be used.
+                            If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence.
+                            Note that this field cannot be set when spec.os.name is linux.
+                          properties:
+                            gmsaCredentialSpec:
+                              description: |-
+                                GMSACredentialSpec is where the GMSA admission webhook
+                                (https://github.com/kubernetes-sigs/windows-gmsa) inlines the contents of the
+                                GMSA credential spec named by the GMSACredentialSpecName field.
+                              type: string
+                            gmsaCredentialSpecName:
+                              description: GMSACredentialSpecName is the name of the
+                                GMSA credential spec to use.
+                              type: string
+                            hostProcess:
+                              description: |-
+                                HostProcess determines if a container should be run as a 'Host Process' container.
+                                All of a Pod's containers must have the same effective HostProcess value
+                                (it is not allowed to have a mix of HostProcess containers and non-HostProcess containers).
+                                In addition, if HostProcess is true then HostNetwork must also be set to true.
+                              type: boolean
+                            runAsUserName:
+                              description: |-
+                                The UserName in Windows to run the entrypoint of the container process.
+                                Defaults to the user specified in image metadata if unspecified.
+                                May also be set in PodSecurityContext. If set in both SecurityContext and
+                                PodSecurityContext, the value specified in SecurityContext takes precedence.
+                              type: string
+                          type: object
+                      type: object
+                    startupProbe:
+                      description: |-
+                        StartupProbe indicates that the Pod has successfully initialized.
+                        If specified, no other probes are executed until this completes successfully.
+                        If this probe fails, the Pod will be restarted, just as if the livenessProbe failed.
+                        This can be used to provide different probe parameters at the beginning of a Pod's lifecycle,
+                        when it might take a long time to load data or warm a cache, than during steady-state operation.
+                        This cannot be updated.
+                        More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                      properties:
+                        exec:
+                          description: Exec specifies a command to execute in the
+                            container.
+                          properties:
+                            command:
+                              description: |-
+                                Command is the command line to execute inside the container, the working directory for the
+                                command  is root ('/') in the container's filesystem. The command is simply exec'd, it is
+                                not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use
+                                a shell, you need to explicitly call out to that shell.
+                                Exit status of 0 is treated as live/healthy and non-zero is unhealthy.
+                              items:
+                                type: string
+                              type: array
+                              x-kubernetes-list-type: atomic
+                          type: object
+                        failureThreshold:
+                          description: |-
+                            Minimum consecutive failures for the probe to be considered failed after having succeeded.
+                            Defaults to 3. Minimum value is 1.
+                          format: int32
+                          type: integer
+                        grpc:
+                          description: GRPC specifies a GRPC HealthCheckRequest.
+                          properties:
+                            port:
+                              description: Port number of the gRPC service. Number
+                                must be in the range 1 to 65535.
+                              format: int32
+                              type: integer
+                            service:
+                              default: ""
+                              description: |-
+                                Service is the name of the service to place in the gRPC HealthCheckRequest
+                                (see https://github.com/grpc/grpc/blob/master/doc/health-checking.md).
+
+                                If this is not specified, the default behavior is defined by gRPC.
+                              type: string
+                          required:
+                          - port
+                          type: object
+                        httpGet:
+                          description: HTTPGet specifies an HTTP GET request to perform.
+                          properties:
+                            host:
+                              description: |-
+                                Host name to connect to, defaults to the pod IP. You probably want to set
+                                "Host" in httpHeaders instead.
+                              type: string
+                            httpHeaders:
+                              description: Custom headers to set in the request. HTTP
+                                allows repeated headers.
+                              items:
+                                description: HTTPHeader describes a custom header
+                                  to be used in HTTP probes
+                                properties:
+                                  name:
+                                    description: |-
+                                      The header field name.
+                                      This will be canonicalized upon output, so case-variant names will be understood as the same header.
+                                    type: string
+                                  value:
+                                    description: The header field value
+                                    type: string
+                                required:
+                                - name
+                                - value
+                                type: object
+                              type: array
+                              x-kubernetes-list-type: atomic
+                            path:
+                              description: Path to access on the HTTP server.
+                              type: string
+                            port:
+                              anyOf:
+                              - type: integer
+                              - type: string
+                              description: |-
+                                Name or number of the port to access on the container.
+                                Number must be in the range 1 to 65535.
+                                Name must be an IANA_SVC_NAME.
+                              x-kubernetes-int-or-string: true
+                            scheme:
+                              description: |-
+                                Scheme to use for connecting to the host.
+                                Defaults to HTTP.
+                              type: string
+                          required:
+                          - port
+                          type: object
+                        initialDelaySeconds:
+                          description: |-
+                            Number of seconds after the container has started before liveness probes are initiated.
+                            More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                          format: int32
+                          type: integer
+                        periodSeconds:
+                          description: |-
+                            How often (in seconds) to perform the probe.
+                            Default to 10 seconds. Minimum value is 1.
+                          format: int32
+                          type: integer
+                        successThreshold:
+                          description: |-
+                            Minimum consecutive successes for the probe to be considered successful after having failed.
+                            Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
+                          format: int32
+                          type: integer
+                        tcpSocket:
+                          description: TCPSocket specifies a connection to a TCP port.
+                          properties:
+                            host:
+                              description: 'Optional: Host name to connect to, defaults
+                                to the pod IP.'
+                              type: string
+                            port:
+                              anyOf:
+                              - type: integer
+                              - type: string
+                              description: |-
+                                Number or name of the port to access on the container.
+                                Number must be in the range 1 to 65535.
+                                Name must be an IANA_SVC_NAME.
+                              x-kubernetes-int-or-string: true
+                          required:
+                          - port
+                          type: object
+                        terminationGracePeriodSeconds:
+                          description: |-
+                            Optional duration in seconds the pod needs to terminate gracefully upon probe failure.
+                            The grace period is the duration in seconds after the processes running in the pod are sent
+                            a termination signal and the time when the processes are forcibly halted with a kill signal.
+                            Set this value longer than the expected cleanup time for your process.
+                            If this value is nil, the pod's terminationGracePeriodSeconds will be used. Otherwise, this
+                            value overrides the value provided by the pod spec.
+                            Value must be non-negative integer. The value zero indicates stop immediately via
+                            the kill signal (no opportunity to shut down).
+                            This is a beta field and requires enabling ProbeTerminationGracePeriod feature gate.
+                            Minimum value is 1. spec.terminationGracePeriodSeconds is used if unset.
+                          format: int64
+                          type: integer
+                        timeoutSeconds:
+                          description: |-
+                            Number of seconds after which the probe times out.
+                            Defaults to 1 second. Minimum value is 1.
+                            More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                          format: int32
+                          type: integer
+                      type: object
+                    stdin:
+                      description: |-
+                        Whether this container should allocate a buffer for stdin in the container runtime. If this
+                        is not set, reads from stdin in the container will always result in EOF.
+                        Default is false.
+                      type: boolean
+                    stdinOnce:
+                      description: |-
+                        Whether the container runtime should close the stdin channel after it has been opened by
+                        a single attach. When stdin is true the stdin stream will remain open across multiple attach
+                        sessions. If stdinOnce is set to true, stdin is opened on container start, is empty until the
+                        first client attaches to stdin, and then remains open and accepts data until the client disconnects,
+                        at which time stdin is closed and remains closed until the container is restarted. If this
+                        flag is false, a container processes that reads from stdin will never receive an EOF.
+                        Default is false
+                      type: boolean
+                    terminationMessagePath:
+                      description: |-
+                        Optional: Path at which the file to which the container's termination message
+                        will be written is mounted into the container's filesystem.
+                        Message written is intended to be brief final status, such as an assertion failure message.
+                        Will be truncated by the node if greater than 4096 bytes. The total message length across
+                        all containers will be limited to 12kb.
+                        Defaults to /dev/termination-log.
+                        Cannot be updated.
+                      type: string
+                    terminationMessagePolicy:
+                      description: |-
+                        Indicate how the termination message should be populated. File will use the contents of
+                        terminationMessagePath to populate the container status message on both success and failure.
+                        FallbackToLogsOnError will use the last chunk of container log output if the termination
+                        message file is empty and the container exited with an error.
+                        The log output is limited to 2048 bytes or 80 lines, whichever is smaller.
+                        Defaults to File.
+                        Cannot be updated.
+                      type: string
+                    tty:
+                      description: |-
+                        Whether this container should allocate a TTY for itself, also requires 'stdin' to be true.
+                        Default is false.
+                      type: boolean
+                    volumeDevices:
+                      description: volumeDevices is the list of block devices to be
+                        used by the container.
+                      items:
+                        description: volumeDevice describes a mapping of a raw block
+                          device within a container.
+                        properties:
+                          devicePath:
+                            description: devicePath is the path inside of the container
+                              that the device will be mapped to.
+                            type: string
+                          name:
+                            description: name must match the name of a persistentVolumeClaim
+                              in the pod
+                            type: string
+                        required:
+                        - devicePath
+                        - name
+                        type: object
+                      type: array
+                      x-kubernetes-list-map-keys:
+                      - devicePath
+                      x-kubernetes-list-type: map
+                    volumeMounts:
+                      description: |-
+                        Pod volumes to mount into the container's filesystem.
+                        Cannot be updated.
+                      items:
+                        description: VolumeMount describes a mounting of a Volume
+                          within a container.
+                        properties:
+                          mountPath:
+                            description: |-
+                              Path within the container at which the volume should be mounted.  Must
+                              not contain ':'.
+                            type: string
+                          mountPropagation:
+                            description: |-
+                              mountPropagation determines how mounts are propagated from the host
+                              to container and the other way around.
+                              When not set, MountPropagationNone is used.
+                              This field is beta in 1.10.
+                              When RecursiveReadOnly is set to IfPossible or to Enabled, MountPropagation must be None or unspecified
+                              (which defaults to None).
+                            type: string
+                          name:
+                            description: This must match the Name of a Volume.
+                            type: string
+                          readOnly:
+                            description: |-
+                              Mounted read-only if true, read-write otherwise (false or unspecified).
+                              Defaults to false.
+                            type: boolean
+                          recursiveReadOnly:
+                            description: |-
+                              RecursiveReadOnly specifies whether read-only mounts should be handled
+                              recursively.
+
+                              If ReadOnly is false, this field has no meaning and must be unspecified.
+
+                              If ReadOnly is true, and this field is set to Disabled, the mount is not made
+                              recursively read-only.  If this field is set to IfPossible, the mount is made
+                              recursively read-only, if it is supported by the container runtime.  If this
+                              field is set to Enabled, the mount is made recursively read-only if it is
+                              supported by the container runtime, otherwise the pod will not be started and
+                              an error will be generated to indicate the reason.
+
+                              If this field is set to IfPossible or Enabled, MountPropagation must be set to
+                              None (or be unspecified, which defaults to None).
+
+                              If this field is not specified, it is treated as an equivalent of Disabled.
+                            type: string
+                          subPath:
+                            description: |-
+                              Path within the volume from which the container's volume should be mounted.
+                              Defaults to "" (volume's root).
+                            type: string
+                          subPathExpr:
+                            description: |-
+                              Expanded path within the volume from which the container's volume should be mounted.
+                              Behaves similarly to SubPath but environment variable references $(VAR_NAME) are expanded using the container's environment.
+                              Defaults to "" (volume's root).
+                              SubPathExpr and SubPath are mutually exclusive.
+                            type: string
+                        required:
+                        - mountPath
+                        - name
+                        type: object
+                      type: array
+                      x-kubernetes-list-map-keys:
+                      - mountPath
+                      x-kubernetes-list-type: map
+                    workingDir:
+                      description: |-
+                        Container's working directory.
+                        If not specified, the container runtime's default will be used, which
+                        might be configured in the container image.
+                        Cannot be updated.
+                      type: string
+                  required:
+                  - name
+                  type: object
+                type: array
+              labels:
+                additionalProperties:
+                  type: string
+                description: |-
+                  labels defines the external label pairs of the ThanosRuler resource.
+
+                  A default replica label `thanos_ruler_replica` will be always added as a
+                  label with the value of the pod's name.
+                type: object
+              listenLocal:
+                description: |-
+                  listenLocal defines the Thanos ruler listen on loopback, so that it
+                  does not bind against the Pod IP.
+                type: boolean
+              logFormat:
+                description: logFormat for ThanosRuler to be configured with.
+                enum:
+                - ""
+                - logfmt
+                - json
+                type: string
+              logLevel:
+                description: logLevel for ThanosRuler to be configured with.
+                enum:
+                - ""
+                - debug
+                - info
+                - warn
+                - error
+                type: string
+              minReadySeconds:
+                description: |-
+                  minReadySeconds defines the minimum number of seconds for which a newly created pod should be ready
+                  without any of its container crashing for it to be considered available.
+
+                  If unset, pods will be considered available as soon as they are ready.
+                format: int32
+                minimum: 0
+                type: integer
+              nodeSelector:
+                additionalProperties:
+                  type: string
+                description: nodeSelector defines which Nodes the Pods are scheduled
+                  on.
+                type: object
+              objectStorageConfig:
+                description: |-
+                  objectStorageConfig defines the configuration format is defined at https://thanos.io/tip/thanos/storage.md/#configuring-access-to-object-storage
+
+                  The operator performs no validation of the configuration.
+
+                  `objectStorageConfigFile` takes precedence over this field.
+                properties:
+                  key:
+                    description: The key of the secret to select from.  Must be a
+                      valid secret key.
+                    type: string
+                  name:
+                    default: ""
+                    description: |-
+                      Name of the referent.
+                      This field is effectively required, but due to backwards compatibility is
+                      allowed to be empty. Instances of this type with an empty value here are
+                      almost certainly wrong.
+                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                    type: string
+                  optional:
+                    description: Specify whether the Secret or its key must be defined
+                    type: boolean
+                required:
+                - key
+                type: object
+                x-kubernetes-map-type: atomic
+              objectStorageConfigFile:
+                description: |-
+                  objectStorageConfigFile defines the path of the object storage configuration file.
+
+                  The configuration format is defined at https://thanos.io/tip/thanos/storage.md/#configuring-access-to-object-storage
+
+                  The operator performs no validation of the configuration file.
+
+                  This field takes precedence over `objectStorageConfig`.
+                type: string
+              paused:
+                description: |-
+                  paused defines when a ThanosRuler deployment is paused, no actions except for deletion
+                  will be performed on the underlying objects.
+                type: boolean
+              podMetadata:
+                description: |-
+                  podMetadata defines labels and annotations which are propagated to the ThanosRuler pods.
+
+                  The following items are reserved and cannot be overridden:
+                  * "app.kubernetes.io/name" label, set to "thanos-ruler".
+                  * "app.kubernetes.io/managed-by" label, set to "prometheus-operator".
+                  * "app.kubernetes.io/instance" label, set to the name of the ThanosRuler instance.
+                  * "thanos-ruler" label, set to the name of the ThanosRuler instance.
+                  * "kubectl.kubernetes.io/default-container" annotation, set to "thanos-ruler".
+                properties:
+                  annotations:
+                    additionalProperties:
+                      type: string
+                    description: |-
+                      annotations defines an unstructured key value map stored with a resource that may be
+                      set by external tools to store and retrieve arbitrary metadata. They are not
+                      queryable and should be preserved when modifying objects.
+                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
+                    type: object
+                  labels:
+                    additionalProperties:
+                      type: string
+                    description: |-
+                      labels define the map of string keys and values that can be used to organize and categorize
+                      (scope and select) objects. May match selectors of replication controllers
+                      and services.
+                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
+                    type: object
+                  name:
+                    description: |-
+                      name must be unique within a namespace. Is required when creating resources, although
+                      some resources may allow a client to request the generation of an appropriate name
+                      automatically. Name is primarily intended for creation idempotence and configuration
+                      definition.
+                      Cannot be updated.
+                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/
+                    type: string
+                type: object
+              portName:
+                default: web
+                description: |-
+                  portName defines the port name used for the pods and governing service.
+                  Defaults to `web`.
+                type: string
+              priorityClassName:
+                description: priorityClassName defines the priority class assigned
+                  to the Pods
+                type: string
+              prometheusRulesExcludedFromEnforce:
+                description: |-
+                  prometheusRulesExcludedFromEnforce defines a list of Prometheus rules to be excluded from enforcing
+                  of adding namespace labels. Works only if enforcedNamespaceLabel set to true.
+                  Make sure both ruleNamespace and ruleName are set for each pair
+                  Deprecated: use excludedFromEnforcement instead.
+                items:
+                  description: |-
+                    PrometheusRuleExcludeConfig enables users to configure excluded
+                    PrometheusRule names and their namespaces to be ignored while enforcing
+                    namespace label for alerts and metrics.
+                  properties:
+                    ruleName:
+                      description: ruleName defines the name of the excluded PrometheusRule
+                        object.
+                      type: string
+                    ruleNamespace:
+                      description: ruleNamespace defines the namespace of the excluded
+                        PrometheusRule object.
+                      type: string
+                  required:
+                  - ruleName
+                  - ruleNamespace
+                  type: object
+                type: array
+              queryConfig:
+                description: |-
+                  queryConfig defines the list of Thanos Query endpoints from which to query metrics.
+
+                  The configuration format is defined at https://thanos.io/tip/components/rule.md/#query-api
+
+                  It requires Thanos >= v0.11.0.
+
+                  The operator performs no validation of the configuration.
+
+                  This field takes precedence over `queryEndpoints`.
+                properties:
+                  key:
+                    description: The key of the secret to select from.  Must be a
+                      valid secret key.
+                    type: string
+                  name:
+                    default: ""
+                    description: |-
+                      Name of the referent.
+                      This field is effectively required, but due to backwards compatibility is
+                      allowed to be empty. Instances of this type with an empty value here are
+                      almost certainly wrong.
+                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                    type: string
+                  optional:
+                    description: Specify whether the Secret or its key must be defined
+                    type: boolean
+                required:
+                - key
+                type: object
+                x-kubernetes-map-type: atomic
+              queryEndpoints:
+                description: |-
+                  queryEndpoints defines the list of Thanos Query endpoints from which to query metrics.
+
+                  For Thanos >= v0.11.0, it is recommended to use `queryConfig` instead.
+
+                  `queryConfig` takes precedence over this field.
+                items:
+                  type: string
+                type: array
+              remoteWrite:
+                description: |-
+                  remoteWrite defines the list of remote write configurations.
+
+                  When the list isn't empty, the ruler is configured with stateless mode.
+
+                  It requires Thanos >= 0.24.0.
+                items:
+                  description: |-
+                    RemoteWriteSpec defines the configuration to write samples from Prometheus
+                    to a remote endpoint.
+                  properties:
+                    authorization:
+                      description: |-
+                        authorization section for the URL.
+
+                        It requires Prometheus >= v2.26.0 or Thanos >= v0.24.0.
+
+                        Cannot be set at the same time as `sigv4`, `basicAuth`, `oauth2`, or `azureAd`.
+                      properties:
+                        credentials:
+                          description: credentials defines a key of a Secret in the
+                            namespace that contains the credentials for authentication.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        credentialsFile:
+                          description: credentialsFile defines the file to read a
+                            secret from, mutually exclusive with `credentials`.
+                          type: string
+                        type:
+                          description: |-
+                            type defines the authentication type. The value is case-insensitive.
+
+                            "Basic" is not a supported value.
+
+                            Default: "Bearer"
+                          type: string
+                      type: object
+                    azureAd:
+                      description: |-
+                        azureAd for the URL.
+
+                        It requires Prometheus >= v2.45.0 or Thanos >= v0.31.0.
+
+                        Cannot be set at the same time as `authorization`, `basicAuth`, `oauth2`, or `sigv4`.
+                      properties:
+                        cloud:
+                          description: cloud defines the Azure Cloud. Options are
+                            'AzurePublic', 'AzureChina', or 'AzureGovernment'.
+                          enum:
+                          - AzureChina
+                          - AzureGovernment
+                          - AzurePublic
+                          type: string
+                        managedIdentity:
+                          description: |-
+                            managedIdentity defines the Azure User-assigned Managed identity.
+                            Cannot be set at the same time as `oauth` or `sdk`.
+                          properties:
+                            clientId:
+                              description: |-
+                                clientId defines the Azure User-assigned Managed identity.
+
+                                For Prometheus >= 3.5.0 and Thanos >= 0.40.0, this field is allowed to be empty to support system-assigned managed identities.
+                              minLength: 1
+                              type: string
+                          type: object
+                        oauth:
+                          description: |-
+                            oauth defines the oauth config that is being used to authenticate.
+                            Cannot be set at the same time as `managedIdentity` or `sdk`.
+
+                            It requires Prometheus >= v2.48.0 or Thanos >= v0.31.0.
+                          properties:
+                            clientId:
+                              description: clientId defines the clientId of the Azure
+                                Active Directory application that is being used to
+                                authenticate.
+                              minLength: 1
+                              type: string
+                            clientSecret:
+                              description: clientSecret specifies a key of a Secret
+                                containing the client secret of the Azure Active Directory
+                                application that is being used to authenticate.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            tenantId:
+                              description: tenantId is the tenant ID of the Azure
+                                Active Directory application that is being used to
+                                authenticate.
+                              minLength: 1
+                              pattern: ^[0-9a-zA-Z-.]+$
+                              type: string
+                          required:
+                          - clientId
+                          - clientSecret
+                          - tenantId
+                          type: object
+                        sdk:
+                          description: |-
+                            sdk defines the Azure SDK config that is being used to authenticate.
+                            See https://learn.microsoft.com/en-us/azure/developer/go/azure-sdk-authentication
+                            Cannot be set at the same time as `oauth` or `managedIdentity`.
+
+                            It requires Prometheus >= v2.52.0 or Thanos >= v0.36.0.
+                          properties:
+                            tenantId:
+                              description: tenantId defines the tenant ID of the azure
+                                active directory application that is being used to
+                                authenticate.
+                              pattern: ^[0-9a-zA-Z-.]+$
+                              type: string
+                          type: object
+                      type: object
+                    basicAuth:
+                      description: |-
+                        basicAuth configuration for the URL.
+
+                        Cannot be set at the same time as `sigv4`, `authorization`, `oauth2`, or `azureAd`.
+                      properties:
+                        password:
+                          description: |-
+                            password defines a key of a Secret containing the password for
+                            authentication.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        username:
+                          description: |-
+                            username defines a key of a Secret containing the username for
+                            authentication.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                      type: object
+                    bearerToken:
+                      description: |-
+                        bearerToken is deprecated: this will be removed in a future release.
+                        *Warning: this field shouldn't be used because the token value appears
+                        in clear-text. Prefer using `authorization`.*
+                      type: string
+                    bearerTokenFile:
+                      description: |-
+                        bearerTokenFile defines the file from which to read bearer token for the URL.
+
+                        Deprecated: this will be removed in a future release. Prefer using `authorization`.
+                      type: string
+                    enableHTTP2:
+                      description: enableHTTP2 defines whether to enable HTTP2.
+                      type: boolean
+                    followRedirects:
+                      description: |-
+                        followRedirects defines whether HTTP requests follow HTTP 3xx redirects.
+
+                        It requires Prometheus >= v2.26.0 or Thanos >= v0.24.0.
+                      type: boolean
+                    headers:
+                      additionalProperties:
+                        type: string
+                      description: |-
+                        headers defines the custom HTTP headers to be sent along with each remote write request.
+                        Be aware that headers that are set by Prometheus itself can't be overwritten.
+
+                        It requires Prometheus >= v2.25.0 or Thanos >= v0.24.0.
+                      type: object
+                    messageVersion:
+                      description: |-
+                        messageVersion defines the Remote Write message's version to use when writing to the endpoint.
+
+                        `Version1.0` corresponds to the `prometheus.WriteRequest` protobuf message introduced in Remote Write 1.0.
+                        `Version2.0` corresponds to the `io.prometheus.write.v2.Request` protobuf message introduced in Remote Write 2.0.
+
+                        When `Version2.0` is selected, Prometheus will automatically be
+                        configured to append the metadata of scraped metrics to the WAL.
+
+                        Before setting this field, consult with your remote storage provider
+                        what message version it supports.
+
+                        It requires Prometheus >= v2.54.0 or Thanos >= v0.37.0.
+                      enum:
+                      - V1.0
+                      - V2.0
+                      type: string
+                    metadataConfig:
+                      description: |-
+                        metadataConfig defines how to send a series metadata to the remote storage.
+
+                        When the field is empty, **no metadata** is sent. But when the field is
+                        null, metadata is sent.
+                      properties:
+                        maxSamplesPerSend:
+                          description: |-
+                            maxSamplesPerSend defines the maximum number of metadata samples per send.
+
+                            It requires Prometheus >= v2.29.0.
+                          format: int32
+                          minimum: -1
+                          type: integer
+                        send:
+                          description: send defines whether metric metadata is sent
+                            to the remote storage or not.
+                          type: boolean
+                        sendInterval:
+                          description: sendInterval defines how frequently metric
+                            metadata is sent to the remote storage.
+                          pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
+                          type: string
+                      type: object
+                    name:
+                      description: |-
+                        name of the remote write queue, it must be unique if specified. The
+                        name is used in metrics and logging in order to differentiate queues.
+
+                        It requires Prometheus >= v2.15.0 or Thanos >= 0.24.0.
+                      type: string
+                    noProxy:
+                      description: |-
+                        noProxy defines a comma-separated string that can contain IPs, CIDR notation, domain names
+                        that should be excluded from proxying. IP and domain names can
+                        contain port numbers.
+
+                        It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                      type: string
+                    oauth2:
+                      description: |-
+                        oauth2 configuration for the URL.
+
+                        It requires Prometheus >= v2.27.0 or Thanos >= v0.24.0.
+
+                        Cannot be set at the same time as `sigv4`, `authorization`, `basicAuth`, or `azureAd`.
+                      properties:
+                        clientId:
+                          description: |-
+                            clientId defines a key of a Secret or ConfigMap containing the
+                            OAuth2 client's ID.
+                          properties:
+                            configMap:
+                              description: configMap defines the ConfigMap containing
+                                data to use for the targets.
+                              properties:
+                                key:
+                                  description: The key to select.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the ConfigMap or its
+                                    key must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            secret:
+                              description: secret defines the Secret containing data
+                                to use for the targets.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                          type: object
+                        clientSecret:
+                          description: |-
+                            clientSecret defines a key of a Secret containing the OAuth2
+                            client's secret.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        endpointParams:
+                          additionalProperties:
+                            type: string
+                          description: |-
+                            endpointParams configures the HTTP parameters to append to the token
+                            URL.
+                          type: object
+                        noProxy:
+                          description: |-
+                            noProxy defines a comma-separated string that can contain IPs, CIDR notation, domain names
+                            that should be excluded from proxying. IP and domain names can
+                            contain port numbers.
+
+                            It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                          type: string
+                        proxyConnectHeader:
+                          additionalProperties:
+                            items:
+                              description: SecretKeySelector selects a key of a Secret.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            type: array
+                          description: |-
+                            proxyConnectHeader optionally specifies headers to send to
+                            proxies during CONNECT requests.
+
+                            It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        proxyFromEnvironment:
+                          description: |-
+                            proxyFromEnvironment defines whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+
+                            It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                          type: boolean
+                        proxyUrl:
+                          description: proxyUrl defines the HTTP proxy server to use.
+                          pattern: ^(http|https|socks5)://.+$
+                          type: string
+                        scopes:
+                          description: scopes defines the OAuth2 scopes used for the
+                            token request.
+                          items:
+                            type: string
+                          type: array
+                        tlsConfig:
+                          description: |-
+                            tlsConfig defines the TLS configuration to use when connecting to the OAuth2 server.
+                            It requires Prometheus >= v2.43.0.
+                          properties:
+                            ca:
+                              description: ca defines the Certificate authority used
+                                when verifying server certificates.
+                              properties:
+                                configMap:
+                                  description: configMap defines the ConfigMap containing
+                                    data to use for the targets.
+                                  properties:
+                                    key:
+                                      description: The key to select.
+                                      type: string
+                                    name:
+                                      default: ""
+                                      description: |-
+                                        Name of the referent.
+                                        This field is effectively required, but due to backwards compatibility is
+                                        allowed to be empty. Instances of this type with an empty value here are
+                                        almost certainly wrong.
+                                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                      type: string
+                                    optional:
+                                      description: Specify whether the ConfigMap or
+                                        its key must be defined
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                secret:
+                                  description: secret defines the Secret containing
+                                    data to use for the targets.
+                                  properties:
+                                    key:
+                                      description: The key of the secret to select
+                                        from.  Must be a valid secret key.
+                                      type: string
+                                    name:
+                                      default: ""
+                                      description: |-
+                                        Name of the referent.
+                                        This field is effectively required, but due to backwards compatibility is
+                                        allowed to be empty. Instances of this type with an empty value here are
+                                        almost certainly wrong.
+                                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                      type: string
+                                    optional:
+                                      description: Specify whether the Secret or its
+                                        key must be defined
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                              type: object
+                            cert:
+                              description: cert defines the Client certificate to
+                                present when doing client-authentication.
+                              properties:
+                                configMap:
+                                  description: configMap defines the ConfigMap containing
+                                    data to use for the targets.
+                                  properties:
+                                    key:
+                                      description: The key to select.
+                                      type: string
+                                    name:
+                                      default: ""
+                                      description: |-
+                                        Name of the referent.
+                                        This field is effectively required, but due to backwards compatibility is
+                                        allowed to be empty. Instances of this type with an empty value here are
+                                        almost certainly wrong.
+                                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                      type: string
+                                    optional:
+                                      description: Specify whether the ConfigMap or
+                                        its key must be defined
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                secret:
+                                  description: secret defines the Secret containing
+                                    data to use for the targets.
+                                  properties:
+                                    key:
+                                      description: The key of the secret to select
+                                        from.  Must be a valid secret key.
+                                      type: string
+                                    name:
+                                      default: ""
+                                      description: |-
+                                        Name of the referent.
+                                        This field is effectively required, but due to backwards compatibility is
+                                        allowed to be empty. Instances of this type with an empty value here are
+                                        almost certainly wrong.
+                                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                      type: string
+                                    optional:
+                                      description: Specify whether the Secret or its
+                                        key must be defined
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                              type: object
+                            insecureSkipVerify:
+                              description: insecureSkipVerify defines how to disable
+                                target certificate validation.
+                              type: boolean
+                            keySecret:
+                              description: keySecret defines the Secret containing
+                                the client key file for the targets.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            maxVersion:
+                              description: |-
+                                maxVersion defines the maximum acceptable TLS version.
+
+                                It requires Prometheus >= v2.41.0 or Thanos >= v0.31.0.
+                              enum:
+                              - TLS10
+                              - TLS11
+                              - TLS12
+                              - TLS13
+                              type: string
+                            minVersion:
+                              description: |-
+                                minVersion defines the minimum acceptable TLS version.
+
+                                It requires Prometheus >= v2.35.0 or Thanos >= v0.28.0.
+                              enum:
+                              - TLS10
+                              - TLS11
+                              - TLS12
+                              - TLS13
+                              type: string
+                            serverName:
+                              description: serverName is used to verify the hostname
+                                for the targets.
+                              type: string
+                          type: object
+                        tokenUrl:
+                          description: tokenUrl defines the URL to fetch the token
+                            from.
+                          minLength: 1
+                          type: string
+                      required:
+                      - clientId
+                      - clientSecret
+                      - tokenUrl
+                      type: object
+                    proxyConnectHeader:
+                      additionalProperties:
+                        items:
+                          description: SecretKeySelector selects a key of a Secret.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        type: array
+                      description: |-
+                        proxyConnectHeader optionally specifies headers to send to
+                        proxies during CONNECT requests.
+
+                        It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                      type: object
+                      x-kubernetes-map-type: atomic
+                    proxyFromEnvironment:
+                      description: |-
+                        proxyFromEnvironment defines whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+
+                        It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+                      type: boolean
+                    proxyUrl:
+                      description: proxyUrl defines the HTTP proxy server to use.
+                      pattern: ^(http|https|socks5)://.+$
+                      type: string
+                    queueConfig:
+                      description: queueConfig allows tuning of the remote write queue
+                        parameters.
+                      properties:
+                        batchSendDeadline:
+                          description: batchSendDeadline defines the maximum time
+                            a sample will wait in buffer.
+                          pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
+                          type: string
+                        capacity:
+                          description: |-
+                            capacity defines the number of samples to buffer per shard before we start
+                            dropping them.
+                          type: integer
+                        maxBackoff:
+                          description: maxBackoff defines the maximum retry delay.
+                          pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
+                          type: string
+                        maxRetries:
+                          description: maxRetries defines the maximum number of times
+                            to retry a batch on recoverable errors.
+                          type: integer
+                        maxSamplesPerSend:
+                          description: maxSamplesPerSend defines the maximum number
+                            of samples per send.
+                          type: integer
+                        maxShards:
+                          description: maxShards defines the maximum number of shards,
+                            i.e. amount of concurrency.
+                          type: integer
+                        minBackoff:
+                          description: minBackoff defines the initial retry delay.
+                            Gets doubled for every retry.
+                          pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
+                          type: string
+                        minShards:
+                          description: minShards defines the minimum number of shards,
+                            i.e. amount of concurrency.
+                          type: integer
+                        retryOnRateLimit:
+                          description: |-
+                            retryOnRateLimit defines the retry upon receiving a 429 status code from the remote-write storage.
+
+                            This is an *experimental feature*, it may change in any upcoming release
+                            in a breaking way.
+                          type: boolean
+                        sampleAgeLimit:
+                          description: |-
+                            sampleAgeLimit drops samples older than the limit.
+                            It requires Prometheus >= v2.50.0 or Thanos >= v0.32.0.
+                          pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
+                          type: string
+                      type: object
+                    remoteTimeout:
+                      description: remoteTimeout defines the timeout for requests
+                        to the remote write endpoint.
+                      pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
+                      type: string
+                    roundRobinDNS:
+                      description: "roundRobinDNS controls the DNS resolution behavior
+                        for remote-write connections.\nWhen enabled:\n  - The remote-write
+                        mechanism will resolve the hostname via DNS.\n  - It will
+                        randomly select one of the resolved IP addresses and connect
+                        to it.\n\nWhen disabled (default behavior):\n  - The Go standard
+                        library will handle hostname resolution.\n  - It will attempt
+                        connections to each resolved IP address sequentially.\n\nNote:
+                        The connection timeout applies to the entire resolution and
+                        connection process.\n\n\tIf disabled, the timeout is distributed
+                        across all connection attempts.\n\nIt requires Prometheus
+                        >= v3.1.0 or Thanos >= v0.38.0."
+                      type: boolean
+                    sendExemplars:
+                      description: |-
+                        sendExemplars enables sending of exemplars over remote write. Note that
+                        exemplar-storage itself must be enabled using the `spec.enableFeatures`
+                        option for exemplars to be scraped in the first place.
+
+                        It requires Prometheus >= v2.27.0 or Thanos >= v0.24.0.
+                      type: boolean
+                    sendNativeHistograms:
+                      description: |-
+                        sendNativeHistograms enables sending of native histograms, also known as sparse histograms
+                        over remote write.
+
+                        It requires Prometheus >= v2.40.0 or Thanos >= v0.30.0.
+                      type: boolean
+                    sigv4:
+                      description: |-
+                        sigv4 defines the AWS's Signature Verification 4 for the URL.
+
+                        It requires Prometheus >= v2.26.0 or Thanos >= v0.24.0.
+
+                        Cannot be set at the same time as `authorization`, `basicAuth`, `oauth2`, or `azureAd`.
+                      properties:
+                        accessKey:
+                          description: |-
+                            accessKey defines the AWS API key. If not specified, the environment variable
+                            `AWS_ACCESS_KEY_ID` is used.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        profile:
+                          description: profile defines the named AWS profile used
+                            to authenticate.
+                          type: string
+                        region:
+                          description: region defines the AWS region. If blank, the
+                            region from the default credentials chain used.
+                          type: string
+                        roleArn:
+                          description: roleArn defines the named AWS profile used
+                            to authenticate.
+                          type: string
+                        secretKey:
+                          description: |-
+                            secretKey defines the AWS API secret. If not specified, the environment
+                            variable `AWS_SECRET_ACCESS_KEY` is used.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        useFIPSSTSEndpoint:
+                          description: |-
+                            useFIPSSTSEndpoint defines the FIPS mode for the AWS STS endpoint.
+                            It requires Prometheus >= v2.54.0.
+                          type: boolean
+                      type: object
+                    tlsConfig:
+                      description: tlsConfig to use for the URL.
+                      properties:
+                        ca:
+                          description: ca defines the Certificate authority used when
+                            verifying server certificates.
+                          properties:
+                            configMap:
+                              description: configMap defines the ConfigMap containing
+                                data to use for the targets.
+                              properties:
+                                key:
+                                  description: The key to select.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the ConfigMap or its
+                                    key must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            secret:
+                              description: secret defines the Secret containing data
+                                to use for the targets.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                          type: object
+                        caFile:
+                          description: caFile defines the path to the CA cert in the
+                            Prometheus container to use for the targets.
+                          type: string
+                        cert:
+                          description: cert defines the Client certificate to present
+                            when doing client-authentication.
+                          properties:
+                            configMap:
+                              description: configMap defines the ConfigMap containing
+                                data to use for the targets.
+                              properties:
+                                key:
+                                  description: The key to select.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the ConfigMap or its
+                                    key must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            secret:
+                              description: secret defines the Secret containing data
+                                to use for the targets.
+                              properties:
+                                key:
+                                  description: The key of the secret to select from.  Must
+                                    be a valid secret key.
+                                  type: string
+                                name:
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  type: string
+                                optional:
+                                  description: Specify whether the Secret or its key
+                                    must be defined
+                                  type: boolean
+                              required:
+                              - key
+                              type: object
+                              x-kubernetes-map-type: atomic
+                          type: object
+                        certFile:
+                          description: certFile defines the path to the client cert
+                            file in the Prometheus container for the targets.
+                          type: string
+                        insecureSkipVerify:
+                          description: insecureSkipVerify defines how to disable target
+                            certificate validation.
+                          type: boolean
+                        keyFile:
+                          description: keyFile defines the path to the client key
+                            file in the Prometheus container for the targets.
+                          type: string
+                        keySecret:
+                          description: keySecret defines the Secret containing the
+                            client key file for the targets.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        maxVersion:
+                          description: |-
+                            maxVersion defines the maximum acceptable TLS version.
+
+                            It requires Prometheus >= v2.41.0 or Thanos >= v0.31.0.
+                          enum:
+                          - TLS10
+                          - TLS11
+                          - TLS12
+                          - TLS13
+                          type: string
+                        minVersion:
+                          description: |-
+                            minVersion defines the minimum acceptable TLS version.
+
+                            It requires Prometheus >= v2.35.0 or Thanos >= v0.28.0.
+                          enum:
+                          - TLS10
+                          - TLS11
+                          - TLS12
+                          - TLS13
+                          type: string
+                        serverName:
+                          description: serverName is used to verify the hostname for
+                            the targets.
+                          type: string
+                      type: object
+                    url:
+                      description: url defines the URL of the endpoint to send samples
+                        to.
+                      minLength: 1
+                      type: string
+                    writeRelabelConfigs:
+                      description: writeRelabelConfigs defines the list of remote
+                        write relabel configurations.
+                      items:
+                        description: |-
+                          RelabelConfig allows dynamic rewriting of the label set for targets, alerts,
+                          scraped samples and remote write samples.
+
+                          More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config
+                        properties:
+                          action:
+                            default: replace
+                            description: |-
+                              action to perform based on the regex matching.
+
+                              `Uppercase` and `Lowercase` actions require Prometheus >= v2.36.0.
+                              `DropEqual` and `KeepEqual` actions require Prometheus >= v2.41.0.
+
+                              Default: "Replace"
+                            enum:
+                            - replace
+                            - Replace
+                            - keep
+                            - Keep
+                            - drop
+                            - Drop
+                            - hashmod
+                            - HashMod
+                            - labelmap
+                            - LabelMap
+                            - labeldrop
+                            - LabelDrop
+                            - labelkeep
+                            - LabelKeep
+                            - lowercase
+                            - Lowercase
+                            - uppercase
+                            - Uppercase
+                            - keepequal
+                            - KeepEqual
+                            - dropequal
+                            - DropEqual
+                            type: string
+                          modulus:
+                            description: |-
+                              modulus to take of the hash of the source label values.
+
+                              Only applicable when the action is `HashMod`.
+                            format: int64
+                            type: integer
+                          regex:
+                            description: regex defines the regular expression against
+                              which the extracted value is matched.
+                            type: string
+                          replacement:
+                            description: |-
+                              replacement value against which a Replace action is performed if the
+                              regular expression matches.
+
+                              Regex capture groups are available.
+                            type: string
+                          separator:
+                            description: separator defines the string between concatenated
+                              SourceLabels.
+                            type: string
+                          sourceLabels:
+                            description: |-
+                              sourceLabels defines the source labels select values from existing labels. Their content is
+                              concatenated using the configured Separator and matched against the
+                              configured regular expression.
+                            items:
+                              description: |-
+                                LabelName is a valid Prometheus label name.
+                                For Prometheus 3.x, a label name is valid if it contains UTF-8 characters.
+                                For Prometheus 2.x, a label name is only valid if it contains ASCII characters, letters, numbers, as well as underscores.
+                              type: string
+                            type: array
+                          targetLabel:
+                            description: |-
+                              targetLabel defines the label to which the resulting string is written in a replacement.
+
+                              It is mandatory for `Replace`, `HashMod`, `Lowercase`, `Uppercase`,
+                              `KeepEqual` and `DropEqual` actions.
+
+                              Regex capture groups are available.
+                            type: string
+                        type: object
+                      type: array
+                  required:
+                  - url
+                  type: object
+                type: array
+              replicas:
+                description: replicas defines the number of thanos ruler instances
+                  to deploy.
+                format: int32
+                type: integer
+              resendDelay:
+                description: resendDelay defines the minimum amount of time to wait
+                  before resending an alert to Alertmanager.
+                pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
+                type: string
+              resources:
+                description: |-
+                  resources defines the resource requirements for single Pods.
+                  If not provided, no requests/limits will be set
+                properties:
+                  claims:
+                    description: |-
+                      Claims lists the names of resources, defined in spec.resourceClaims,
+                      that are used by this container.
+
+                      This field depends on the
+                      DynamicResourceAllocation feature gate.
+
+                      This field is immutable. It can only be set for containers.
+                    items:
+                      description: ResourceClaim references one entry in PodSpec.ResourceClaims.
+                      properties:
+                        name:
+                          description: |-
+                            Name must match the name of one entry in pod.spec.resourceClaims of
+                            the Pod where this field is used. It makes that resource available
+                            inside a container.
+                          type: string
+                        request:
+                          description: |-
+                            Request is the name chosen for a request in the referenced claim.
+                            If empty, everything from the claim is made available, otherwise
+                            only the result of this request.
+                          type: string
+                      required:
+                      - name
+                      type: object
+                    type: array
+                    x-kubernetes-list-map-keys:
+                    - name
+                    x-kubernetes-list-type: map
+                  limits:
+                    additionalProperties:
+                      anyOf:
+                      - type: integer
+                      - type: string
+                      pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                      x-kubernetes-int-or-string: true
+                    description: |-
+                      Limits describes the maximum amount of compute resources allowed.
+                      More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+                    type: object
+                  requests:
+                    additionalProperties:
+                      anyOf:
+                      - type: integer
+                      - type: string
+                      pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                      x-kubernetes-int-or-string: true
+                    description: |-
+                      Requests describes the minimum amount of compute resources required.
+                      If Requests is omitted for a container, it defaults to Limits if that is explicitly specified,
+                      otherwise to an implementation-defined value. Requests cannot exceed Limits.
+                      More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+                    type: object
+                type: object
+              retention:
+                default: 24h
+                description: |-
+                  retention defines the time duration ThanosRuler shall retain data for. Default is '24h', and
+                  must match the regular expression `[0-9]+(ms|s|m|h|d|w|y)` (milliseconds
+                  seconds minutes hours days weeks years).
+
+                  The field has no effect when remote-write is configured since the Ruler
+                  operates in stateless mode.
+                pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
+                type: string
+              routePrefix:
+                description: routePrefix defines the route prefix ThanosRuler registers
+                  HTTP handlers for. This allows thanos UI to be served on a sub-path.
+                type: string
+              ruleConcurrentEval:
+                description: |-
+                  ruleConcurrentEval defines how many rules can be evaluated concurrently.
+                  It requires Thanos >= v0.37.0.
+                format: int32
+                minimum: 1
+                type: integer
+              ruleGracePeriod:
+                description: |-
+                  ruleGracePeriod defines the minimum duration between alert and restored "for" state.
+                  This is maintained only for alerts with configured "for" time greater than grace period.
+                  It requires Thanos >= v0.30.0.
+                pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
+                type: string
+              ruleNamespaceSelector:
+                description: |-
+                  ruleNamespaceSelector defines the namespaces to be selected for Rules discovery. If unspecified, only
+                  the same namespace as the ThanosRuler object is in is used.
+                properties:
+                  matchExpressions:
+                    description: matchExpressions is a list of label selector requirements.
+                      The requirements are ANDed.
+                    items:
+                      description: |-
+                        A label selector requirement is a selector that contains values, a key, and an operator that
+                        relates the key and values.
+                      properties:
+                        key:
+                          description: key is the label key that the selector applies
+                            to.
+                          type: string
+                        operator:
+                          description: |-
+                            operator represents a key's relationship to a set of values.
+                            Valid operators are In, NotIn, Exists and DoesNotExist.
+                          type: string
+                        values:
+                          description: |-
+                            values is an array of string values. If the operator is In or NotIn,
+                            the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                            the values array must be empty. This array is replaced during a strategic
+                            merge patch.
+                          items:
+                            type: string
+                          type: array
+                          x-kubernetes-list-type: atomic
+                      required:
+                      - key
+                      - operator
+                      type: object
+                    type: array
+                    x-kubernetes-list-type: atomic
+                  matchLabels:
+                    additionalProperties:
+                      type: string
+                    description: |-
+                      matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                      map is equivalent to an element of matchExpressions, whose key field is "key", the
+                      operator is "In", and the values array contains only "value". The requirements are ANDed.
+                    type: object
+                type: object
+                x-kubernetes-map-type: atomic
+              ruleOutageTolerance:
+                description: |-
+                  ruleOutageTolerance defines the max time to tolerate prometheus outage for restoring "for" state of alert.
+                  It requires Thanos >= v0.30.0.
+                pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
+                type: string
+              ruleQueryOffset:
+                description: |-
+                  ruleQueryOffset defines the default rule group's query offset duration to use.
+                  It requires Thanos >= v0.38.0.
+                pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
+                type: string
+              ruleSelector:
+                description: |-
+                  ruleSelector defines the PrometheusRule objects to be selected for rule evaluation. An empty
+                  label selector matches all objects. A null label selector matches no
+                  objects.
+                properties:
+                  matchExpressions:
+                    description: matchExpressions is a list of label selector requirements.
+                      The requirements are ANDed.
+                    items:
+                      description: |-
+                        A label selector requirement is a selector that contains values, a key, and an operator that
+                        relates the key and values.
+                      properties:
+                        key:
+                          description: key is the label key that the selector applies
+                            to.
+                          type: string
+                        operator:
+                          description: |-
+                            operator represents a key's relationship to a set of values.
+                            Valid operators are In, NotIn, Exists and DoesNotExist.
+                          type: string
+                        values:
+                          description: |-
+                            values is an array of string values. If the operator is In or NotIn,
+                            the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                            the values array must be empty. This array is replaced during a strategic
+                            merge patch.
+                          items:
+                            type: string
+                          type: array
+                          x-kubernetes-list-type: atomic
+                      required:
+                      - key
+                      - operator
+                      type: object
+                    type: array
+                    x-kubernetes-list-type: atomic
+                  matchLabels:
+                    additionalProperties:
+                      type: string
+                    description: |-
+                      matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                      map is equivalent to an element of matchExpressions, whose key field is "key", the
+                      operator is "In", and the values array contains only "value". The requirements are ANDed.
+                    type: object
+                type: object
+                x-kubernetes-map-type: atomic
+              securityContext:
+                description: |-
+                  securityContext defines the pod-level security attributes and common container settings.
+                  This defaults to the default PodSecurityContext.
+                properties:
+                  appArmorProfile:
+                    description: |-
+                      appArmorProfile is the AppArmor options to use by the containers in this pod.
+                      Note that this field cannot be set when spec.os.name is windows.
+                    properties:
+                      localhostProfile:
+                        description: |-
+                          localhostProfile indicates a profile loaded on the node that should be used.
+                          The profile must be preconfigured on the node to work.
+                          Must match the loaded name of the profile.
+                          Must be set if and only if type is "Localhost".
+                        type: string
+                      type:
+                        description: |-
+                          type indicates which kind of AppArmor profile will be applied.
+                          Valid options are:
+                            Localhost - a profile pre-loaded on the node.
+                            RuntimeDefault - the container runtime's default profile.
+                            Unconfined - no AppArmor enforcement.
+                        type: string
+                    required:
+                    - type
+                    type: object
+                  fsGroup:
+                    description: |-
+                      A special supplemental group that applies to all containers in a pod.
+                      Some volume types allow the Kubelet to change the ownership of that volume
+                      to be owned by the pod:
+
+                      1. The owning GID will be the FSGroup
+                      2. The setgid bit is set (new files created in the volume will be owned by FSGroup)
+                      3. The permission bits are OR'd with rw-rw----
+
+                      If unset, the Kubelet will not modify the ownership and permissions of any volume.
+                      Note that this field cannot be set when spec.os.name is windows.
+                    format: int64
+                    type: integer
+                  fsGroupChangePolicy:
+                    description: |-
+                      fsGroupChangePolicy defines behavior of changing ownership and permission of the volume
+                      before being exposed inside Pod. This field will only apply to
+                      volume types which support fsGroup based ownership(and permissions).
+                      It will have no effect on ephemeral volume types such as: secret, configmaps
+                      and emptydir.
+                      Valid values are "OnRootMismatch" and "Always". If not specified, "Always" is used.
+                      Note that this field cannot be set when spec.os.name is windows.
+                    type: string
+                  runAsGroup:
+                    description: |-
+                      The GID to run the entrypoint of the container process.
+                      Uses runtime default if unset.
+                      May also be set in SecurityContext.  If set in both SecurityContext and
+                      PodSecurityContext, the value specified in SecurityContext takes precedence
+                      for that container.
+                      Note that this field cannot be set when spec.os.name is windows.
+                    format: int64
+                    type: integer
+                  runAsNonRoot:
+                    description: |-
+                      Indicates that the container must run as a non-root user.
+                      If true, the Kubelet will validate the image at runtime to ensure that it
+                      does not run as UID 0 (root) and fail to start the container if it does.
+                      If unset or false, no such validation will be performed.
+                      May also be set in SecurityContext.  If set in both SecurityContext and
+                      PodSecurityContext, the value specified in SecurityContext takes precedence.
+                    type: boolean
+                  runAsUser:
+                    description: |-
+                      The UID to run the entrypoint of the container process.
+                      Defaults to user specified in image metadata if unspecified.
+                      May also be set in SecurityContext.  If set in both SecurityContext and
+                      PodSecurityContext, the value specified in SecurityContext takes precedence
+                      for that container.
+                      Note that this field cannot be set when spec.os.name is windows.
+                    format: int64
+                    type: integer
+                  seLinuxChangePolicy:
+                    description: |-
+                      seLinuxChangePolicy defines how the container's SELinux label is applied to all volumes used by the Pod.
+                      It has no effect on nodes that do not support SELinux or to volumes does not support SELinux.
+                      Valid values are "MountOption" and "Recursive".
+
+                      "Recursive" means relabeling of all files on all Pod volumes by the container runtime.
+                      This may be slow for large volumes, but allows mixing privileged and unprivileged Pods sharing the same volume on the same node.
+
+                      "MountOption" mounts all eligible Pod volumes with `-o context` mount option.
+                      This requires all Pods that share the same volume to use the same SELinux label.
+                      It is not possible to share the same volume among privileged and unprivileged Pods.
+                      Eligible volumes are in-tree FibreChannel and iSCSI volumes, and all CSI volumes
+                      whose CSI driver announces SELinux support by setting spec.seLinuxMount: true in their
+                      CSIDriver instance. Other volumes are always re-labelled recursively.
+                      "MountOption" value is allowed only when SELinuxMount feature gate is enabled.
+
+                      If not specified and SELinuxMount feature gate is enabled, "MountOption" is used.
+                      If not specified and SELinuxMount feature gate is disabled, "MountOption" is used for ReadWriteOncePod volumes
+                      and "Recursive" for all other volumes.
+
+                      This field affects only Pods that have SELinux label set, either in PodSecurityContext or in SecurityContext of all containers.
+
+                      All Pods that use the same volume should use the same seLinuxChangePolicy, otherwise some pods can get stuck in ContainerCreating state.
+                      Note that this field cannot be set when spec.os.name is windows.
+                    type: string
+                  seLinuxOptions:
+                    description: |-
+                      The SELinux context to be applied to all containers.
+                      If unspecified, the container runtime will allocate a random SELinux context for each
+                      container.  May also be set in SecurityContext.  If set in
+                      both SecurityContext and PodSecurityContext, the value specified in SecurityContext
+                      takes precedence for that container.
+                      Note that this field cannot be set when spec.os.name is windows.
+                    properties:
+                      level:
+                        description: Level is SELinux level label that applies to
+                          the container.
+                        type: string
+                      role:
+                        description: Role is a SELinux role label that applies to
+                          the container.
+                        type: string
+                      type:
+                        description: Type is a SELinux type label that applies to
+                          the container.
+                        type: string
+                      user:
+                        description: User is a SELinux user label that applies to
+                          the container.
+                        type: string
+                    type: object
+                  seccompProfile:
+                    description: |-
+                      The seccomp options to use by the containers in this pod.
+                      Note that this field cannot be set when spec.os.name is windows.
+                    properties:
+                      localhostProfile:
+                        description: |-
+                          localhostProfile indicates a profile defined in a file on the node should be used.
+                          The profile must be preconfigured on the node to work.
+                          Must be a descending path, relative to the kubelet's configured seccomp profile location.
+                          Must be set if type is "Localhost". Must NOT be set for any other type.
+                        type: string
+                      type:
+                        description: |-
+                          type indicates which kind of seccomp profile will be applied.
+                          Valid options are:
+
+                          Localhost - a profile defined in a file on the node should be used.
+                          RuntimeDefault - the container runtime default profile should be used.
+                          Unconfined - no profile should be applied.
+                        type: string
+                    required:
+                    - type
+                    type: object
+                  supplementalGroups:
+                    description: |-
+                      A list of groups applied to the first process run in each container, in
+                      addition to the container's primary GID and fsGroup (if specified).  If
+                      the SupplementalGroupsPolicy feature is enabled, the
+                      supplementalGroupsPolicy field determines whether these are in addition
+                      to or instead of any group memberships defined in the container image.
+                      If unspecified, no additional groups are added, though group memberships
+                      defined in the container image may still be used, depending on the
+                      supplementalGroupsPolicy field.
+                      Note that this field cannot be set when spec.os.name is windows.
+                    items:
+                      format: int64
+                      type: integer
+                    type: array
+                    x-kubernetes-list-type: atomic
+                  supplementalGroupsPolicy:
+                    description: |-
+                      Defines how supplemental groups of the first container processes are calculated.
+                      Valid values are "Merge" and "Strict". If not specified, "Merge" is used.
+                      (Alpha) Using the field requires the SupplementalGroupsPolicy feature gate to be enabled
+                      and the container runtime must implement support for this feature.
+                      Note that this field cannot be set when spec.os.name is windows.
+                    type: string
+                  sysctls:
+                    description: |-
+                      Sysctls hold a list of namespaced sysctls used for the pod. Pods with unsupported
+                      sysctls (by the container runtime) might fail to launch.
+                      Note that this field cannot be set when spec.os.name is windows.
+                    items:
+                      description: Sysctl defines a kernel parameter to be set
+                      properties:
+                        name:
+                          description: Name of a property to set
+                          type: string
+                        value:
+                          description: Value of a property to set
+                          type: string
+                      required:
+                      - name
+                      - value
+                      type: object
+                    type: array
+                    x-kubernetes-list-type: atomic
+                  windowsOptions:
+                    description: |-
+                      The Windows specific settings applied to all containers.
+                      If unspecified, the options within a container's SecurityContext will be used.
+                      If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence.
+                      Note that this field cannot be set when spec.os.name is linux.
+                    properties:
+                      gmsaCredentialSpec:
+                        description: |-
+                          GMSACredentialSpec is where the GMSA admission webhook
+                          (https://github.com/kubernetes-sigs/windows-gmsa) inlines the contents of the
+                          GMSA credential spec named by the GMSACredentialSpecName field.
+                        type: string
+                      gmsaCredentialSpecName:
+                        description: GMSACredentialSpecName is the name of the GMSA
+                          credential spec to use.
+                        type: string
+                      hostProcess:
+                        description: |-
+                          HostProcess determines if a container should be run as a 'Host Process' container.
+                          All of a Pod's containers must have the same effective HostProcess value
+                          (it is not allowed to have a mix of HostProcess containers and non-HostProcess containers).
+                          In addition, if HostProcess is true then HostNetwork must also be set to true.
+                        type: boolean
+                      runAsUserName:
+                        description: |-
+                          The UserName in Windows to run the entrypoint of the container process.
+                          Defaults to the user specified in image metadata if unspecified.
+                          May also be set in PodSecurityContext. If set in both SecurityContext and
+                          PodSecurityContext, the value specified in SecurityContext takes precedence.
+                        type: string
+                    type: object
+                type: object
+              serviceAccountName:
+                description: |-
+                  serviceAccountName defines the name of the ServiceAccount to use to run the
+                  Thanos Ruler Pods.
+                type: string
+              serviceName:
+                description: |-
+                  serviceName defines the name of the service name used by the underlying StatefulSet(s) as the governing service.
+                  If defined, the Service  must be created before the ThanosRuler resource in the same namespace and it must define a selector that matches the pod labels.
+                  If empty, the operator will create and manage a headless service named `thanos-ruler-operated` for ThanosRuler resources.
+                  When deploying multiple ThanosRuler resources in the same namespace, it is recommended to specify a different value for each.
+                  See https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#stable-network-id for more details.
+                minLength: 1
+                type: string
+              storage:
+                description: storage defines the specification of how storage shall
+                  be used.
+                properties:
+                  disableMountSubPath:
+                    description: 'disableMountSubPath deprecated: subPath usage will
+                      be removed in a future release.'
+                    type: boolean
+                  emptyDir:
+                    description: |-
+                      emptyDir to be used by the StatefulSet.
+                      If specified, it takes precedence over `ephemeral` and `volumeClaimTemplate`.
+                      More info: https://kubernetes.io/docs/concepts/storage/volumes/#emptydir
+                    properties:
+                      medium:
+                        description: |-
+                          medium represents what type of storage medium should back this directory.
+                          The default is "" which means to use the node's default medium.
+                          Must be an empty string (default) or Memory.
+                          More info: https://kubernetes.io/docs/concepts/storage/volumes#emptydir
+                        type: string
+                      sizeLimit:
+                        anyOf:
+                        - type: integer
+                        - type: string
+                        description: |-
+                          sizeLimit is the total amount of local storage required for this EmptyDir volume.
+                          The size limit is also applicable for memory medium.
+                          The maximum usage on memory medium EmptyDir would be the minimum value between
+                          the SizeLimit specified here and the sum of memory limits of all containers in a pod.
+                          The default is nil which means that the limit is undefined.
+                          More info: https://kubernetes.io/docs/concepts/storage/volumes#emptydir
+                        pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                        x-kubernetes-int-or-string: true
+                    type: object
+                  ephemeral:
+                    description: |-
+                      ephemeral to be used by the StatefulSet.
+                      This is a beta field in k8s 1.21 and GA in 1.15.
+                      For lower versions, starting with k8s 1.19, it requires enabling the GenericEphemeralVolume feature gate.
+                      More info: https://kubernetes.io/docs/concepts/storage/ephemeral-volumes/#generic-ephemeral-volumes
+                    properties:
+                      volumeClaimTemplate:
+                        description: |-
+                          Will be used to create a stand-alone PVC to provision the volume.
+                          The pod in which this EphemeralVolumeSource is embedded will be the
+                          owner of the PVC, i.e. the PVC will be deleted together with the
+                          pod.  The name of the PVC will be `<pod name>-<volume name>` where
+                          `<volume name>` is the name from the `PodSpec.Volumes` array
+                          entry. Pod validation will reject the pod if the concatenated name
+                          is not valid for a PVC (for example, too long).
+
+                          An existing PVC with that name that is not owned by the pod
+                          will *not* be used for the pod to avoid using an unrelated
+                          volume by mistake. Starting the pod is then blocked until
+                          the unrelated PVC is removed. If such a pre-created PVC is
+                          meant to be used by the pod, the PVC has to updated with an
+                          owner reference to the pod once the pod exists. Normally
+                          this should not be necessary, but it may be useful when
+                          manually reconstructing a broken cluster.
+
+                          This field is read-only and no changes will be made by Kubernetes
+                          to the PVC after it has been created.
+
+                          Required, must not be nil.
+                        properties:
+                          metadata:
+                            description: |-
+                              May contain labels and annotations that will be copied into the PVC
+                              when creating it. No other fields are allowed and will be rejected during
+                              validation.
+                            type: object
+                          spec:
+                            description: |-
+                              The specification for the PersistentVolumeClaim. The entire content is
+                              copied unchanged into the PVC that gets created from this
+                              template. The same fields as in a PersistentVolumeClaim
+                              are also valid here.
+                            properties:
+                              accessModes:
+                                description: |-
+                                  accessModes contains the desired access modes the volume should have.
+                                  More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#access-modes-1
+                                items:
+                                  type: string
+                                type: array
+                                x-kubernetes-list-type: atomic
+                              dataSource:
+                                description: |-
+                                  dataSource field can be used to specify either:
+                                  * An existing VolumeSnapshot object (snapshot.storage.k8s.io/VolumeSnapshot)
+                                  * An existing PVC (PersistentVolumeClaim)
+                                  If the provisioner or an external controller can support the specified data source,
+                                  it will create a new volume based on the contents of the specified data source.
+                                  When the AnyVolumeDataSource feature gate is enabled, dataSource contents will be copied to dataSourceRef,
+                                  and dataSourceRef contents will be copied to dataSource when dataSourceRef.namespace is not specified.
+                                  If the namespace is specified, then dataSourceRef will not be copied to dataSource.
+                                properties:
+                                  apiGroup:
+                                    description: |-
+                                      APIGroup is the group for the resource being referenced.
+                                      If APIGroup is not specified, the specified Kind must be in the core API group.
+                                      For any other third-party types, APIGroup is required.
+                                    type: string
+                                  kind:
+                                    description: Kind is the type of resource being
+                                      referenced
+                                    type: string
+                                  name:
+                                    description: Name is the name of resource being
+                                      referenced
+                                    type: string
+                                required:
+                                - kind
+                                - name
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              dataSourceRef:
+                                description: |-
+                                  dataSourceRef specifies the object from which to populate the volume with data, if a non-empty
+                                  volume is desired. This may be any object from a non-empty API group (non
+                                  core object) or a PersistentVolumeClaim object.
+                                  When this field is specified, volume binding will only succeed if the type of
+                                  the specified object matches some installed volume populator or dynamic
+                                  provisioner.
+                                  This field will replace the functionality of the dataSource field and as such
+                                  if both fields are non-empty, they must have the same value. For backwards
+                                  compatibility, when namespace isn't specified in dataSourceRef,
+                                  both fields (dataSource and dataSourceRef) will be set to the same
+                                  value automatically if one of them is empty and the other is non-empty.
+                                  When namespace is specified in dataSourceRef,
+                                  dataSource isn't set to the same value and must be empty.
+                                  There are three important differences between dataSource and dataSourceRef:
+                                  * While dataSource only allows two specific types of objects, dataSourceRef
+                                    allows any non-core object, as well as PersistentVolumeClaim objects.
+                                  * While dataSource ignores disallowed values (dropping them), dataSourceRef
+                                    preserves all values, and generates an error if a disallowed value is
+                                    specified.
+                                  * While dataSource only allows local objects, dataSourceRef allows objects
+                                    in any namespaces.
+                                  (Beta) Using this field requires the AnyVolumeDataSource feature gate to be enabled.
+                                  (Alpha) Using the namespace field of dataSourceRef requires the CrossNamespaceVolumeDataSource feature gate to be enabled.
+                                properties:
+                                  apiGroup:
+                                    description: |-
+                                      APIGroup is the group for the resource being referenced.
+                                      If APIGroup is not specified, the specified Kind must be in the core API group.
+                                      For any other third-party types, APIGroup is required.
+                                    type: string
+                                  kind:
+                                    description: Kind is the type of resource being
+                                      referenced
+                                    type: string
+                                  name:
+                                    description: Name is the name of resource being
+                                      referenced
+                                    type: string
+                                  namespace:
+                                    description: |-
+                                      Namespace is the namespace of resource being referenced
+                                      Note that when a namespace is specified, a gateway.networking.k8s.io/ReferenceGrant object is required in the referent namespace to allow that namespace's owner to accept the reference. See the ReferenceGrant documentation for details.
+                                      (Alpha) This field requires the CrossNamespaceVolumeDataSource feature gate to be enabled.
+                                    type: string
+                                required:
+                                - kind
+                                - name
+                                type: object
+                              resources:
+                                description: |-
+                                  resources represents the minimum resources the volume should have.
+                                  If RecoverVolumeExpansionFailure feature is enabled users are allowed to specify resource requirements
+                                  that are lower than previous value but must still be higher than capacity recorded in the
+                                  status field of the claim.
+                                  More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources
+                                properties:
+                                  limits:
+                                    additionalProperties:
+                                      anyOf:
+                                      - type: integer
+                                      - type: string
+                                      pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                      x-kubernetes-int-or-string: true
+                                    description: |-
+                                      Limits describes the maximum amount of compute resources allowed.
+                                      More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+                                    type: object
+                                  requests:
+                                    additionalProperties:
+                                      anyOf:
+                                      - type: integer
+                                      - type: string
+                                      pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                      x-kubernetes-int-or-string: true
+                                    description: |-
+                                      Requests describes the minimum amount of compute resources required.
+                                      If Requests is omitted for a container, it defaults to Limits if that is explicitly specified,
+                                      otherwise to an implementation-defined value. Requests cannot exceed Limits.
+                                      More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+                                    type: object
+                                type: object
+                              selector:
+                                description: selector is a label query over volumes
+                                  to consider for binding.
+                                properties:
+                                  matchExpressions:
+                                    description: matchExpressions is a list of label
+                                      selector requirements. The requirements are
+                                      ANDed.
+                                    items:
+                                      description: |-
+                                        A label selector requirement is a selector that contains values, a key, and an operator that
+                                        relates the key and values.
+                                      properties:
+                                        key:
+                                          description: key is the label key that the
+                                            selector applies to.
+                                          type: string
+                                        operator:
+                                          description: |-
+                                            operator represents a key's relationship to a set of values.
+                                            Valid operators are In, NotIn, Exists and DoesNotExist.
+                                          type: string
+                                        values:
+                                          description: |-
+                                            values is an array of string values. If the operator is In or NotIn,
+                                            the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                            the values array must be empty. This array is replaced during a strategic
+                                            merge patch.
+                                          items:
+                                            type: string
+                                          type: array
+                                          x-kubernetes-list-type: atomic
+                                      required:
+                                      - key
+                                      - operator
+                                      type: object
+                                    type: array
+                                    x-kubernetes-list-type: atomic
+                                  matchLabels:
+                                    additionalProperties:
+                                      type: string
+                                    description: |-
+                                      matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                      map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                      operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                    type: object
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              storageClassName:
+                                description: |-
+                                  storageClassName is the name of the StorageClass required by the claim.
+                                  More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#class-1
+                                type: string
+                              volumeAttributesClassName:
+                                description: |-
+                                  volumeAttributesClassName may be used to set the VolumeAttributesClass used by this claim.
+                                  If specified, the CSI driver will create or update the volume with the attributes defined
+                                  in the corresponding VolumeAttributesClass. This has a different purpose than storageClassName,
+                                  it can be changed after the claim is created. An empty string or nil value indicates that no
+                                  VolumeAttributesClass will be applied to the claim. If the claim enters an Infeasible error state,
+                                  this field can be reset to its previous value (including nil) to cancel the modification.
+                                  If the resource referred to by volumeAttributesClass does not exist, this PersistentVolumeClaim will be
+                                  set to a Pending state, as reflected by the modifyVolumeStatus field, until such as a resource
+                                  exists.
+                                  More info: https://kubernetes.io/docs/concepts/storage/volume-attributes-classes/
+                                type: string
+                              volumeMode:
+                                description: |-
+                                  volumeMode defines what type of volume is required by the claim.
+                                  Value of Filesystem is implied when not included in claim spec.
+                                type: string
+                              volumeName:
+                                description: volumeName is the binding reference to
+                                  the PersistentVolume backing this claim.
+                                type: string
+                            type: object
+                        required:
+                        - spec
+                        type: object
+                    type: object
+                  volumeClaimTemplate:
+                    description: |-
+                      volumeClaimTemplate defines the PVC spec to be used by the Prometheus StatefulSets.
+                      The easiest way to use a volume that cannot be automatically provisioned
+                      is to use a label selector alongside manually created PersistentVolumes.
+                    properties:
+                      apiVersion:
+                        description: |-
+                          APIVersion defines the versioned schema of this representation of an object.
+                          Servers should convert recognized schemas to the latest internal value, and
+                          may reject unrecognized values.
+                          More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
+                        type: string
+                      kind:
+                        description: |-
+                          Kind is a string value representing the REST resource this object represents.
+                          Servers may infer this from the endpoint the client submits requests to.
+                          Cannot be updated.
+                          In CamelCase.
+                          More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
+                        type: string
+                      metadata:
+                        description: metadata defines EmbeddedMetadata contains metadata
+                          relevant to an EmbeddedResource.
+                        properties:
+                          annotations:
+                            additionalProperties:
+                              type: string
+                            description: |-
+                              annotations defines an unstructured key value map stored with a resource that may be
+                              set by external tools to store and retrieve arbitrary metadata. They are not
+                              queryable and should be preserved when modifying objects.
+                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
+                            type: object
+                          labels:
+                            additionalProperties:
+                              type: string
+                            description: |-
+                              labels define the map of string keys and values that can be used to organize and categorize
+                              (scope and select) objects. May match selectors of replication controllers
+                              and services.
+                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
+                            type: object
+                          name:
+                            description: |-
+                              name must be unique within a namespace. Is required when creating resources, although
+                              some resources may allow a client to request the generation of an appropriate name
+                              automatically. Name is primarily intended for creation idempotence and configuration
+                              definition.
+                              Cannot be updated.
+                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/
+                            type: string
+                        type: object
+                      spec:
+                        description: |-
+                          spec defines the specification of the  characteristics of a volume requested by a pod author.
+                          More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#persistentvolumeclaims
+                        properties:
+                          accessModes:
+                            description: |-
+                              accessModes contains the desired access modes the volume should have.
+                              More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#access-modes-1
+                            items:
+                              type: string
+                            type: array
+                            x-kubernetes-list-type: atomic
+                          dataSource:
+                            description: |-
+                              dataSource field can be used to specify either:
+                              * An existing VolumeSnapshot object (snapshot.storage.k8s.io/VolumeSnapshot)
+                              * An existing PVC (PersistentVolumeClaim)
+                              If the provisioner or an external controller can support the specified data source,
+                              it will create a new volume based on the contents of the specified data source.
+                              When the AnyVolumeDataSource feature gate is enabled, dataSource contents will be copied to dataSourceRef,
+                              and dataSourceRef contents will be copied to dataSource when dataSourceRef.namespace is not specified.
+                              If the namespace is specified, then dataSourceRef will not be copied to dataSource.
+                            properties:
+                              apiGroup:
+                                description: |-
+                                  APIGroup is the group for the resource being referenced.
+                                  If APIGroup is not specified, the specified Kind must be in the core API group.
+                                  For any other third-party types, APIGroup is required.
+                                type: string
+                              kind:
+                                description: Kind is the type of resource being referenced
+                                type: string
+                              name:
+                                description: Name is the name of resource being referenced
+                                type: string
+                            required:
+                            - kind
+                            - name
+                            type: object
+                            x-kubernetes-map-type: atomic
+                          dataSourceRef:
+                            description: |-
+                              dataSourceRef specifies the object from which to populate the volume with data, if a non-empty
+                              volume is desired. This may be any object from a non-empty API group (non
+                              core object) or a PersistentVolumeClaim object.
+                              When this field is specified, volume binding will only succeed if the type of
+                              the specified object matches some installed volume populator or dynamic
+                              provisioner.
+                              This field will replace the functionality of the dataSource field and as such
+                              if both fields are non-empty, they must have the same value. For backwards
+                              compatibility, when namespace isn't specified in dataSourceRef,
+                              both fields (dataSource and dataSourceRef) will be set to the same
+                              value automatically if one of them is empty and the other is non-empty.
+                              When namespace is specified in dataSourceRef,
+                              dataSource isn't set to the same value and must be empty.
+                              There are three important differences between dataSource and dataSourceRef:
+                              * While dataSource only allows two specific types of objects, dataSourceRef
+                                allows any non-core object, as well as PersistentVolumeClaim objects.
+                              * While dataSource ignores disallowed values (dropping them), dataSourceRef
+                                preserves all values, and generates an error if a disallowed value is
+                                specified.
+                              * While dataSource only allows local objects, dataSourceRef allows objects
+                                in any namespaces.
+                              (Beta) Using this field requires the AnyVolumeDataSource feature gate to be enabled.
+                              (Alpha) Using the namespace field of dataSourceRef requires the CrossNamespaceVolumeDataSource feature gate to be enabled.
+                            properties:
+                              apiGroup:
+                                description: |-
+                                  APIGroup is the group for the resource being referenced.
+                                  If APIGroup is not specified, the specified Kind must be in the core API group.
+                                  For any other third-party types, APIGroup is required.
+                                type: string
+                              kind:
+                                description: Kind is the type of resource being referenced
+                                type: string
+                              name:
+                                description: Name is the name of resource being referenced
+                                type: string
+                              namespace:
+                                description: |-
+                                  Namespace is the namespace of resource being referenced
+                                  Note that when a namespace is specified, a gateway.networking.k8s.io/ReferenceGrant object is required in the referent namespace to allow that namespace's owner to accept the reference. See the ReferenceGrant documentation for details.
+                                  (Alpha) This field requires the CrossNamespaceVolumeDataSource feature gate to be enabled.
+                                type: string
+                            required:
+                            - kind
+                            - name
+                            type: object
+                          resources:
+                            description: |-
+                              resources represents the minimum resources the volume should have.
+                              If RecoverVolumeExpansionFailure feature is enabled users are allowed to specify resource requirements
+                              that are lower than previous value but must still be higher than capacity recorded in the
+                              status field of the claim.
+                              More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources
+                            properties:
+                              limits:
+                                additionalProperties:
+                                  anyOf:
+                                  - type: integer
+                                  - type: string
+                                  pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                  x-kubernetes-int-or-string: true
+                                description: |-
+                                  Limits describes the maximum amount of compute resources allowed.
+                                  More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+                                type: object
+                              requests:
+                                additionalProperties:
+                                  anyOf:
+                                  - type: integer
+                                  - type: string
+                                  pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                  x-kubernetes-int-or-string: true
+                                description: |-
+                                  Requests describes the minimum amount of compute resources required.
+                                  If Requests is omitted for a container, it defaults to Limits if that is explicitly specified,
+                                  otherwise to an implementation-defined value. Requests cannot exceed Limits.
+                                  More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+                                type: object
+                            type: object
+                          selector:
+                            description: selector is a label query over volumes to
+                              consider for binding.
+                            properties:
+                              matchExpressions:
+                                description: matchExpressions is a list of label selector
+                                  requirements. The requirements are ANDed.
+                                items:
+                                  description: |-
+                                    A label selector requirement is a selector that contains values, a key, and an operator that
+                                    relates the key and values.
+                                  properties:
+                                    key:
+                                      description: key is the label key that the selector
+                                        applies to.
+                                      type: string
+                                    operator:
+                                      description: |-
+                                        operator represents a key's relationship to a set of values.
+                                        Valid operators are In, NotIn, Exists and DoesNotExist.
+                                      type: string
+                                    values:
+                                      description: |-
+                                        values is an array of string values. If the operator is In or NotIn,
+                                        the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                        the values array must be empty. This array is replaced during a strategic
+                                        merge patch.
+                                      items:
+                                        type: string
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                  required:
+                                  - key
+                                  - operator
+                                  type: object
+                                type: array
+                                x-kubernetes-list-type: atomic
+                              matchLabels:
+                                additionalProperties:
+                                  type: string
+                                description: |-
+                                  matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                  map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                  operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                type: object
+                            type: object
+                            x-kubernetes-map-type: atomic
+                          storageClassName:
+                            description: |-
+                              storageClassName is the name of the StorageClass required by the claim.
+                              More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#class-1
+                            type: string
+                          volumeAttributesClassName:
+                            description: |-
+                              volumeAttributesClassName may be used to set the VolumeAttributesClass used by this claim.
+                              If specified, the CSI driver will create or update the volume with the attributes defined
+                              in the corresponding VolumeAttributesClass. This has a different purpose than storageClassName,
+                              it can be changed after the claim is created. An empty string or nil value indicates that no
+                              VolumeAttributesClass will be applied to the claim. If the claim enters an Infeasible error state,
+                              this field can be reset to its previous value (including nil) to cancel the modification.
+                              If the resource referred to by volumeAttributesClass does not exist, this PersistentVolumeClaim will be
+                              set to a Pending state, as reflected by the modifyVolumeStatus field, until such as a resource
+                              exists.
+                              More info: https://kubernetes.io/docs/concepts/storage/volume-attributes-classes/
+                            type: string
+                          volumeMode:
+                            description: |-
+                              volumeMode defines what type of volume is required by the claim.
+                              Value of Filesystem is implied when not included in claim spec.
+                            type: string
+                          volumeName:
+                            description: volumeName is the binding reference to the
+                              PersistentVolume backing this claim.
+                            type: string
+                        type: object
+                      status:
+                        description: 'status is deprecated: this field is never set.'
+                        properties:
+                          accessModes:
+                            description: |-
+                              accessModes contains the actual access modes the volume backing the PVC has.
+                              More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#access-modes-1
+                            items:
+                              type: string
+                            type: array
+                            x-kubernetes-list-type: atomic
+                          allocatedResourceStatuses:
+                            additionalProperties:
+                              description: |-
+                                When a controller receives persistentvolume claim update with ClaimResourceStatus for a resource
+                                that it does not recognizes, then it should ignore that update and let other controllers
+                                handle it.
+                              type: string
+                            description: "allocatedResourceStatuses stores status
+                              of resource being resized for the given PVC.\nKey names
+                              follow standard Kubernetes label syntax. Valid values
+                              are either:\n\t* Un-prefixed keys:\n\t\t- storage -
+                              the capacity of the volume.\n\t* Custom resources must
+                              use implementation-defined prefixed names such as \"example.com/my-custom-resource\"\nApart
+                              from above values - keys that are unprefixed or have
+                              kubernetes.io prefix are considered\nreserved and hence
+                              may not be used.\n\nClaimResourceStatus can be in any
+                              of following states:\n\t- ControllerResizeInProgress:\n\t\tState
+                              set when resize controller starts resizing the volume
+                              in control-plane.\n\t- ControllerResizeFailed:\n\t\tState
+                              set when resize has failed in resize controller with
+                              a terminal error.\n\t- NodeResizePending:\n\t\tState
+                              set when resize controller has finished resizing the
+                              volume but further resizing of\n\t\tvolume is needed
+                              on the node.\n\t- NodeResizeInProgress:\n\t\tState set
+                              when kubelet starts resizing the volume.\n\t- NodeResizeFailed:\n\t\tState
+                              set when resizing has failed in kubelet with a terminal
+                              error. Transient errors don't set\n\t\tNodeResizeFailed.\nFor
+                              example: if expanding a PVC for more capacity - this
+                              field can be one of the following states:\n\t- pvc.status.allocatedResourceStatus['storage']
+                              = \"ControllerResizeInProgress\"\n     - pvc.status.allocatedResourceStatus['storage']
+                              = \"ControllerResizeFailed\"\n     - pvc.status.allocatedResourceStatus['storage']
+                              = \"NodeResizePending\"\n     - pvc.status.allocatedResourceStatus['storage']
+                              = \"NodeResizeInProgress\"\n     - pvc.status.allocatedResourceStatus['storage']
+                              = \"NodeResizeFailed\"\nWhen this field is not set,
+                              it means that no resize operation is in progress for
+                              the given PVC.\n\nA controller that receives PVC update
+                              with previously unknown resourceName or ClaimResourceStatus\nshould
+                              ignore the update for the purpose it was designed. For
+                              example - a controller that\nonly is responsible for
+                              resizing capacity of the volume, should ignore PVC updates
+                              that change other valid\nresources associated with PVC.\n\nThis
+                              is an alpha field and requires enabling RecoverVolumeExpansionFailure
+                              feature."
+                            type: object
+                            x-kubernetes-map-type: granular
+                          allocatedResources:
+                            additionalProperties:
+                              anyOf:
+                              - type: integer
+                              - type: string
+                              pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                              x-kubernetes-int-or-string: true
+                            description: "allocatedResources tracks the resources
+                              allocated to a PVC including its capacity.\nKey names
+                              follow standard Kubernetes label syntax. Valid values
+                              are either:\n\t* Un-prefixed keys:\n\t\t- storage -
+                              the capacity of the volume.\n\t* Custom resources must
+                              use implementation-defined prefixed names such as \"example.com/my-custom-resource\"\nApart
+                              from above values - keys that are unprefixed or have
+                              kubernetes.io prefix are considered\nreserved and hence
+                              may not be used.\n\nCapacity reported here may be larger
+                              than the actual capacity when a volume expansion operation\nis
+                              requested.\nFor storage quota, the larger value from
+                              allocatedResources and PVC.spec.resources is used.\nIf
+                              allocatedResources is not set, PVC.spec.resources alone
+                              is used for quota calculation.\nIf a volume expansion
+                              capacity request is lowered, allocatedResources is only\nlowered
+                              if there are no expansion operations in progress and
+                              if the actual volume capacity\nis equal or lower than
+                              the requested capacity.\n\nA controller that receives
+                              PVC update with previously unknown resourceName\nshould
+                              ignore the update for the purpose it was designed. For
+                              example - a controller that\nonly is responsible for
+                              resizing capacity of the volume, should ignore PVC updates
+                              that change other valid\nresources associated with PVC.\n\nThis
+                              is an alpha field and requires enabling RecoverVolumeExpansionFailure
+                              feature."
+                            type: object
+                          capacity:
+                            additionalProperties:
+                              anyOf:
+                              - type: integer
+                              - type: string
+                              pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                              x-kubernetes-int-or-string: true
+                            description: capacity represents the actual resources
+                              of the underlying volume.
+                            type: object
+                          conditions:
+                            description: |-
+                              conditions is the current Condition of persistent volume claim. If underlying persistent volume is being
+                              resized then the Condition will be set to 'Resizing'.
+                            items:
+                              description: PersistentVolumeClaimCondition contains
+                                details about state of pvc
+                              properties:
+                                lastProbeTime:
+                                  description: lastProbeTime is the time we probed
+                                    the condition.
+                                  format: date-time
+                                  type: string
+                                lastTransitionTime:
+                                  description: lastTransitionTime is the time the
+                                    condition transitioned from one status to another.
+                                  format: date-time
+                                  type: string
+                                message:
+                                  description: message is the human-readable message
+                                    indicating details about last transition.
+                                  type: string
+                                reason:
+                                  description: |-
+                                    reason is a unique, this should be a short, machine understandable string that gives the reason
+                                    for condition's last transition. If it reports "Resizing" that means the underlying
+                                    persistent volume is being resized.
+                                  type: string
+                                status:
+                                  description: |-
+                                    Status is the status of the condition.
+                                    Can be True, False, Unknown.
+                                    More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=state%20of%20pvc-,conditions.status,-(string)%2C%20required
+                                  type: string
+                                type:
+                                  description: |-
+                                    Type is the type of the condition.
+                                    More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=set%20to%20%27ResizeStarted%27.-,PersistentVolumeClaimCondition,-contains%20details%20about
+                                  type: string
+                              required:
+                              - status
+                              - type
+                              type: object
+                            type: array
+                            x-kubernetes-list-map-keys:
+                            - type
+                            x-kubernetes-list-type: map
+                          currentVolumeAttributesClassName:
+                            description: |-
+                              currentVolumeAttributesClassName is the current name of the VolumeAttributesClass the PVC is using.
+                              When unset, there is no VolumeAttributeClass applied to this PersistentVolumeClaim
+                            type: string
+                          modifyVolumeStatus:
+                            description: |-
+                              ModifyVolumeStatus represents the status object of ControllerModifyVolume operation.
+                              When this is unset, there is no ModifyVolume operation being attempted.
+                            properties:
+                              status:
+                                description: "status is the status of the ControllerModifyVolume
+                                  operation. It can be in any of following states:\n
+                                  - Pending\n   Pending indicates that the PersistentVolumeClaim
+                                  cannot be modified due to unmet requirements, such
+                                  as\n   the specified VolumeAttributesClass not existing.\n
+                                  - InProgress\n   InProgress indicates that the volume
+                                  is being modified.\n - Infeasible\n  Infeasible
+                                  indicates that the request has been rejected as
+                                  invalid by the CSI driver. To\n\t  resolve the error,
+                                  a valid VolumeAttributesClass needs to be specified.\nNote:
+                                  New statuses can be added in the future. Consumers
+                                  should check for unknown statuses and fail appropriately."
+                                type: string
+                              targetVolumeAttributesClassName:
+                                description: targetVolumeAttributesClassName is the
+                                  name of the VolumeAttributesClass the PVC currently
+                                  being reconciled
+                                type: string
+                            required:
+                            - status
+                            type: object
+                          phase:
+                            description: phase represents the current phase of PersistentVolumeClaim.
+                            type: string
+                        type: object
+                    type: object
+                type: object
+              terminationGracePeriodSeconds:
+                description: |-
+                  terminationGracePeriodSeconds defines the optional duration in seconds the pod needs to terminate gracefully.
+                  Value must be non-negative integer. The value zero indicates stop immediately via
+                  the kill signal (no opportunity to shut down) which may lead to data corruption.
+
+                  Defaults to 120 seconds.
+                format: int64
+                minimum: 0
+                type: integer
+              tolerations:
+                description: tolerations defines when specified, the pod's tolerations.
+                items:
+                  description: |-
+                    The pod this Toleration is attached to tolerates any taint that matches
+                    the triple <key,value,effect> using the matching operator <operator>.
+                  properties:
+                    effect:
+                      description: |-
+                        Effect indicates the taint effect to match. Empty means match all taint effects.
+                        When specified, allowed values are NoSchedule, PreferNoSchedule and NoExecute.
+                      type: string
+                    key:
+                      description: |-
+                        Key is the taint key that the toleration applies to. Empty means match all taint keys.
+                        If the key is empty, operator must be Exists; this combination means to match all values and all keys.
+                      type: string
+                    operator:
+                      description: |-
+                        Operator represents a key's relationship to the value.
+                        Valid operators are Exists and Equal. Defaults to Equal.
+                        Exists is equivalent to wildcard for value, so that a pod can
+                        tolerate all taints of a particular category.
+                      type: string
+                    tolerationSeconds:
+                      description: |-
+                        TolerationSeconds represents the period of time the toleration (which must be
+                        of effect NoExecute, otherwise this field is ignored) tolerates the taint. By default,
+                        it is not set, which means tolerate the taint forever (do not evict). Zero and
+                        negative values will be treated as 0 (evict immediately) by the system.
+                      format: int64
+                      type: integer
+                    value:
+                      description: |-
+                        Value is the taint value the toleration matches to.
+                        If the operator is Exists, the value should be empty, otherwise just a regular string.
+                      type: string
+                  type: object
+                type: array
+              topologySpreadConstraints:
+                description: topologySpreadConstraints defines the pod's topology
+                  spread constraints.
+                items:
+                  description: TopologySpreadConstraint specifies how to spread matching
+                    pods among the given topology.
+                  properties:
+                    labelSelector:
+                      description: |-
+                        LabelSelector is used to find matching pods.
+                        Pods that match this label selector are counted to determine the number of pods
+                        in their corresponding topology domain.
+                      properties:
+                        matchExpressions:
+                          description: matchExpressions is a list of label selector
+                            requirements. The requirements are ANDed.
+                          items:
+                            description: |-
+                              A label selector requirement is a selector that contains values, a key, and an operator that
+                              relates the key and values.
+                            properties:
+                              key:
+                                description: key is the label key that the selector
+                                  applies to.
+                                type: string
+                              operator:
+                                description: |-
+                                  operator represents a key's relationship to a set of values.
+                                  Valid operators are In, NotIn, Exists and DoesNotExist.
+                                type: string
+                              values:
+                                description: |-
+                                  values is an array of string values. If the operator is In or NotIn,
+                                  the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                  the values array must be empty. This array is replaced during a strategic
+                                  merge patch.
+                                items:
+                                  type: string
+                                type: array
+                                x-kubernetes-list-type: atomic
+                            required:
+                            - key
+                            - operator
+                            type: object
+                          type: array
+                          x-kubernetes-list-type: atomic
+                        matchLabels:
+                          additionalProperties:
+                            type: string
+                          description: |-
+                            matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                            map is equivalent to an element of matchExpressions, whose key field is "key", the
+                            operator is "In", and the values array contains only "value". The requirements are ANDed.
+                          type: object
+                      type: object
+                      x-kubernetes-map-type: atomic
+                    matchLabelKeys:
+                      description: |-
+                        MatchLabelKeys is a set of pod label keys to select the pods over which
+                        spreading will be calculated. The keys are used to lookup values from the
+                        incoming pod labels, those key-value labels are ANDed with labelSelector
+                        to select the group of existing pods over which spreading will be calculated
+                        for the incoming pod. The same key is forbidden to exist in both MatchLabelKeys and LabelSelector.
+                        MatchLabelKeys cannot be set when LabelSelector isn't set.
+                        Keys that don't exist in the incoming pod labels will
+                        be ignored. A null or empty list means only match against labelSelector.
+
+                        This is a beta field and requires the MatchLabelKeysInPodTopologySpread feature gate to be enabled (enabled by default).
+                      items:
+                        type: string
+                      type: array
+                      x-kubernetes-list-type: atomic
+                    maxSkew:
+                      description: |-
+                        MaxSkew describes the degree to which pods may be unevenly distributed.
+                        When `whenUnsatisfiable=DoNotSchedule`, it is the maximum permitted difference
+                        between the number of matching pods in the target topology and the global minimum.
+                        The global minimum is the minimum number of matching pods in an eligible domain
+                        or zero if the number of eligible domains is less than MinDomains.
+                        For example, in a 3-zone cluster, MaxSkew is set to 1, and pods with the same
+                        labelSelector spread as 2/2/1:
+                        In this case, the global minimum is 1.
+                        | zone1 | zone2 | zone3 |
+                        |  P P  |  P P  |   P   |
+                        - if MaxSkew is 1, incoming pod can only be scheduled to zone3 to become 2/2/2;
+                        scheduling it onto zone1(zone2) would make the ActualSkew(3-1) on zone1(zone2)
+                        violate MaxSkew(1).
+                        - if MaxSkew is 2, incoming pod can be scheduled onto any zone.
+                        When `whenUnsatisfiable=ScheduleAnyway`, it is used to give higher precedence
+                        to topologies that satisfy it.
+                        It's a required field. Default value is 1 and 0 is not allowed.
+                      format: int32
+                      type: integer
+                    minDomains:
+                      description: |-
+                        MinDomains indicates a minimum number of eligible domains.
+                        When the number of eligible domains with matching topology keys is less than minDomains,
+                        Pod Topology Spread treats "global minimum" as 0, and then the calculation of Skew is performed.
+                        And when the number of eligible domains with matching topology keys equals or greater than minDomains,
+                        this value has no effect on scheduling.
+                        As a result, when the number of eligible domains is less than minDomains,
+                        scheduler won't schedule more than maxSkew Pods to those domains.
+                        If value is nil, the constraint behaves as if MinDomains is equal to 1.
+                        Valid values are integers greater than 0.
+                        When value is not nil, WhenUnsatisfiable must be DoNotSchedule.
+
+                        For example, in a 3-zone cluster, MaxSkew is set to 2, MinDomains is set to 5 and pods with the same
+                        labelSelector spread as 2/2/2:
+                        | zone1 | zone2 | zone3 |
+                        |  P P  |  P P  |  P P  |
+                        The number of domains is less than 5(MinDomains), so "global minimum" is treated as 0.
+                        In this situation, new pod with the same labelSelector cannot be scheduled,
+                        because computed skew will be 3(3 - 0) if new Pod is scheduled to any of the three zones,
+                        it will violate MaxSkew.
+                      format: int32
+                      type: integer
+                    nodeAffinityPolicy:
+                      description: |-
+                        NodeAffinityPolicy indicates how we will treat Pod's nodeAffinity/nodeSelector
+                        when calculating pod topology spread skew. Options are:
+                        - Honor: only nodes matching nodeAffinity/nodeSelector are included in the calculations.
+                        - Ignore: nodeAffinity/nodeSelector are ignored. All nodes are included in the calculations.
+
+                        If this value is nil, the behavior is equivalent to the Honor policy.
+                      type: string
+                    nodeTaintsPolicy:
+                      description: |-
+                        NodeTaintsPolicy indicates how we will treat node taints when calculating
+                        pod topology spread skew. Options are:
+                        - Honor: nodes without taints, along with tainted nodes for which the incoming pod
+                        has a toleration, are included.
+                        - Ignore: node taints are ignored. All nodes are included.
+
+                        If this value is nil, the behavior is equivalent to the Ignore policy.
+                      type: string
+                    topologyKey:
+                      description: |-
+                        TopologyKey is the key of node labels. Nodes that have a label with this key
+                        and identical values are considered to be in the same topology.
+                        We consider each <key, value> as a "bucket", and try to put balanced number
+                        of pods into each bucket.
+                        We define a domain as a particular instance of a topology.
+                        Also, we define an eligible domain as a domain whose nodes meet the requirements of
+                        nodeAffinityPolicy and nodeTaintsPolicy.
+                        e.g. If TopologyKey is "kubernetes.io/hostname", each Node is a domain of that topology.
+                        And, if TopologyKey is "topology.kubernetes.io/zone", each zone is a domain of that topology.
+                        It's a required field.
+                      type: string
+                    whenUnsatisfiable:
+                      description: |-
+                        WhenUnsatisfiable indicates how to deal with a pod if it doesn't satisfy
+                        the spread constraint.
+                        - DoNotSchedule (default) tells the scheduler not to schedule it.
+                        - ScheduleAnyway tells the scheduler to schedule the pod in any location,
+                          but giving higher precedence to topologies that would help reduce the
+                          skew.
+                        A constraint is considered "Unsatisfiable" for an incoming pod
+                        if and only if every possible node assignment for that pod would violate
+                        "MaxSkew" on some topology.
+                        For example, in a 3-zone cluster, MaxSkew is set to 1, and pods with the same
+                        labelSelector spread as 3/1/1:
+                        | zone1 | zone2 | zone3 |
+                        | P P P |   P   |   P   |
+                        If WhenUnsatisfiable is set to DoNotSchedule, incoming pod can only be scheduled
+                        to zone2(zone3) to become 3/2/1(3/1/2) as ActualSkew(2-1) on zone2(zone3) satisfies
+                        MaxSkew(1). In other words, the cluster can still be imbalanced, but scheduler
+                        won't make it *more* imbalanced.
+                        It's a required field.
+                      type: string
+                  required:
+                  - maxSkew
+                  - topologyKey
+                  - whenUnsatisfiable
+                  type: object
+                type: array
+              tracingConfig:
+                description: |-
+                  tracingConfig defines the tracing configuration.
+
+                  The configuration format is defined at https://thanos.io/tip/thanos/tracing.md/#configuration
+
+                  This is an *experimental feature*, it may change in any upcoming release
+                  in a breaking way.
+
+                  The operator performs no validation of the configuration.
+
+                  `tracingConfigFile` takes precedence over this field.
+                properties:
+                  key:
+                    description: The key of the secret to select from.  Must be a
+                      valid secret key.
+                    type: string
+                  name:
+                    default: ""
+                    description: |-
+                      Name of the referent.
+                      This field is effectively required, but due to backwards compatibility is
+                      allowed to be empty. Instances of this type with an empty value here are
+                      almost certainly wrong.
+                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                    type: string
+                  optional:
+                    description: Specify whether the Secret or its key must be defined
+                    type: boolean
+                required:
+                - key
+                type: object
+                x-kubernetes-map-type: atomic
+              tracingConfigFile:
+                description: |-
+                  tracingConfigFile defines the path of the tracing configuration file.
+
+                  The configuration format is defined at https://thanos.io/tip/thanos/tracing.md/#configuration
+
+                  This is an *experimental feature*, it may change in any upcoming release
+                  in a breaking way.
+
+                  The operator performs no validation of the configuration file.
+
+                  This field takes precedence over `tracingConfig`.
+                type: string
+              version:
+                description: version of Thanos to be deployed.
+                type: string
+              volumeMounts:
+                description: |-
+                  volumeMounts defines how the configuration of additional VolumeMounts on the output StatefulSet definition.
+                  VolumeMounts specified will be appended to other VolumeMounts in the ruler container,
+                  that are generated as a result of StorageSpec objects.
+                items:
+                  description: VolumeMount describes a mounting of a Volume within
+                    a container.
+                  properties:
+                    mountPath:
+                      description: |-
+                        Path within the container at which the volume should be mounted.  Must
+                        not contain ':'.
+                      type: string
+                    mountPropagation:
+                      description: |-
+                        mountPropagation determines how mounts are propagated from the host
+                        to container and the other way around.
+                        When not set, MountPropagationNone is used.
+                        This field is beta in 1.10.
+                        When RecursiveReadOnly is set to IfPossible or to Enabled, MountPropagation must be None or unspecified
+                        (which defaults to None).
+                      type: string
+                    name:
+                      description: This must match the Name of a Volume.
+                      type: string
+                    readOnly:
+                      description: |-
+                        Mounted read-only if true, read-write otherwise (false or unspecified).
+                        Defaults to false.
+                      type: boolean
+                    recursiveReadOnly:
+                      description: |-
+                        RecursiveReadOnly specifies whether read-only mounts should be handled
+                        recursively.
+
+                        If ReadOnly is false, this field has no meaning and must be unspecified.
+
+                        If ReadOnly is true, and this field is set to Disabled, the mount is not made
+                        recursively read-only.  If this field is set to IfPossible, the mount is made
+                        recursively read-only, if it is supported by the container runtime.  If this
+                        field is set to Enabled, the mount is made recursively read-only if it is
+                        supported by the container runtime, otherwise the pod will not be started and
+                        an error will be generated to indicate the reason.
+
+                        If this field is set to IfPossible or Enabled, MountPropagation must be set to
+                        None (or be unspecified, which defaults to None).
+
+                        If this field is not specified, it is treated as an equivalent of Disabled.
+                      type: string
+                    subPath:
+                      description: |-
+                        Path within the volume from which the container's volume should be mounted.
+                        Defaults to "" (volume's root).
+                      type: string
+                    subPathExpr:
+                      description: |-
+                        Expanded path within the volume from which the container's volume should be mounted.
+                        Behaves similarly to SubPath but environment variable references $(VAR_NAME) are expanded using the container's environment.
+                        Defaults to "" (volume's root).
+                        SubPathExpr and SubPath are mutually exclusive.
+                      type: string
+                  required:
+                  - mountPath
+                  - name
+                  type: object
+                type: array
+              volumes:
+                description: |-
+                  volumes defines how configuration of additional volumes on the output StatefulSet definition. Volumes specified will
+                  be appended to other volumes that are generated as a result of StorageSpec objects.
+                items:
+                  description: Volume represents a named volume in a pod that may
+                    be accessed by any container in the pod.
+                  properties:
+                    awsElasticBlockStore:
+                      description: |-
+                        awsElasticBlockStore represents an AWS Disk resource that is attached to a
+                        kubelet's host machine and then exposed to the pod.
+                        Deprecated: AWSElasticBlockStore is deprecated. All operations for the in-tree
+                        awsElasticBlockStore type are redirected to the ebs.csi.aws.com CSI driver.
+                        More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
+                      properties:
+                        fsType:
+                          description: |-
+                            fsType is the filesystem type of the volume that you want to mount.
+                            Tip: Ensure that the filesystem type is supported by the host operating system.
+                            Examples: "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
+                            More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
+                          type: string
+                        partition:
+                          description: |-
+                            partition is the partition in the volume that you want to mount.
+                            If omitted, the default is to mount by volume name.
+                            Examples: For volume /dev/sda1, you specify the partition as "1".
+                            Similarly, the volume partition for /dev/sda is "0" (or you can leave the property empty).
+                          format: int32
+                          type: integer
+                        readOnly:
+                          description: |-
+                            readOnly value true will force the readOnly setting in VolumeMounts.
+                            More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
+                          type: boolean
+                        volumeID:
+                          description: |-
+                            volumeID is unique ID of the persistent disk resource in AWS (Amazon EBS volume).
+                            More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
+                          type: string
+                      required:
+                      - volumeID
+                      type: object
+                    azureDisk:
+                      description: |-
+                        azureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.
+                        Deprecated: AzureDisk is deprecated. All operations for the in-tree azureDisk type
+                        are redirected to the disk.csi.azure.com CSI driver.
+                      properties:
+                        cachingMode:
+                          description: 'cachingMode is the Host Caching mode: None,
+                            Read Only, Read Write.'
+                          type: string
+                        diskName:
+                          description: diskName is the Name of the data disk in the
+                            blob storage
+                          type: string
+                        diskURI:
+                          description: diskURI is the URI of data disk in the blob
+                            storage
+                          type: string
+                        fsType:
+                          default: ext4
+                          description: |-
+                            fsType is Filesystem type to mount.
+                            Must be a filesystem type supported by the host operating system.
+                            Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
+                          type: string
+                        kind:
+                          description: 'kind expected values are Shared: multiple
+                            blob disks per storage account  Dedicated: single blob
+                            disk per storage account  Managed: azure managed data
+                            disk (only in managed availability set). defaults to shared'
+                          type: string
+                        readOnly:
+                          default: false
+                          description: |-
+                            readOnly Defaults to false (read/write). ReadOnly here will force
+                            the ReadOnly setting in VolumeMounts.
+                          type: boolean
+                      required:
+                      - diskName
+                      - diskURI
+                      type: object
+                    azureFile:
+                      description: |-
+                        azureFile represents an Azure File Service mount on the host and bind mount to the pod.
+                        Deprecated: AzureFile is deprecated. All operations for the in-tree azureFile type
+                        are redirected to the file.csi.azure.com CSI driver.
+                      properties:
+                        readOnly:
+                          description: |-
+                            readOnly defaults to false (read/write). ReadOnly here will force
+                            the ReadOnly setting in VolumeMounts.
+                          type: boolean
+                        secretName:
+                          description: secretName is the  name of secret that contains
+                            Azure Storage Account Name and Key
+                          type: string
+                        shareName:
+                          description: shareName is the azure share Name
+                          type: string
+                      required:
+                      - secretName
+                      - shareName
+                      type: object
+                    cephfs:
+                      description: |-
+                        cephFS represents a Ceph FS mount on the host that shares a pod's lifetime.
+                        Deprecated: CephFS is deprecated and the in-tree cephfs type is no longer supported.
+                      properties:
+                        monitors:
+                          description: |-
+                            monitors is Required: Monitors is a collection of Ceph monitors
+                            More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it
+                          items:
+                            type: string
+                          type: array
+                          x-kubernetes-list-type: atomic
+                        path:
+                          description: 'path is Optional: Used as the mounted root,
+                            rather than the full Ceph tree, default is /'
+                          type: string
+                        readOnly:
+                          description: |-
+                            readOnly is Optional: Defaults to false (read/write). ReadOnly here will force
+                            the ReadOnly setting in VolumeMounts.
+                            More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it
+                          type: boolean
+                        secretFile:
+                          description: |-
+                            secretFile is Optional: SecretFile is the path to key ring for User, default is /etc/ceph/user.secret
+                            More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it
+                          type: string
+                        secretRef:
+                          description: |-
+                            secretRef is Optional: SecretRef is reference to the authentication secret for User, default is empty.
+                            More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it
+                          properties:
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        user:
+                          description: |-
+                            user is optional: User is the rados user name, default is admin
+                            More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it
+                          type: string
+                      required:
+                      - monitors
+                      type: object
+                    cinder:
+                      description: |-
+                        cinder represents a cinder volume attached and mounted on kubelets host machine.
+                        Deprecated: Cinder is deprecated. All operations for the in-tree cinder type
+                        are redirected to the cinder.csi.openstack.org CSI driver.
+                        More info: https://examples.k8s.io/mysql-cinder-pd/README.md
+                      properties:
+                        fsType:
+                          description: |-
+                            fsType is the filesystem type to mount.
+                            Must be a filesystem type supported by the host operating system.
+                            Examples: "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
+                            More info: https://examples.k8s.io/mysql-cinder-pd/README.md
+                          type: string
+                        readOnly:
+                          description: |-
+                            readOnly defaults to false (read/write). ReadOnly here will force
+                            the ReadOnly setting in VolumeMounts.
+                            More info: https://examples.k8s.io/mysql-cinder-pd/README.md
+                          type: boolean
+                        secretRef:
+                          description: |-
+                            secretRef is optional: points to a secret object containing parameters used to connect
+                            to OpenStack.
+                          properties:
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        volumeID:
+                          description: |-
+                            volumeID used to identify the volume in cinder.
+                            More info: https://examples.k8s.io/mysql-cinder-pd/README.md
+                          type: string
+                      required:
+                      - volumeID
+                      type: object
+                    configMap:
+                      description: configMap represents a configMap that should populate
+                        this volume
+                      properties:
+                        defaultMode:
+                          description: |-
+                            defaultMode is optional: mode bits used to set permissions on created files by default.
+                            Must be an octal value between 0000 and 0777 or a decimal value between 0 and 511.
+                            YAML accepts both octal and decimal values, JSON requires decimal values for mode bits.
+                            Defaults to 0644.
+                            Directories within the path are not affected by this setting.
+                            This might be in conflict with other options that affect the file
+                            mode, like fsGroup, and the result can be other mode bits set.
+                          format: int32
+                          type: integer
+                        items:
+                          description: |-
+                            items if unspecified, each key-value pair in the Data field of the referenced
+                            ConfigMap will be projected into the volume as a file whose name is the
+                            key and content is the value. If specified, the listed keys will be
+                            projected into the specified paths, and unlisted keys will not be
+                            present. If a key is specified which is not present in the ConfigMap,
+                            the volume setup will error unless it is marked optional. Paths must be
+                            relative and may not contain the '..' path or start with '..'.
+                          items:
+                            description: Maps a string key to a path within a volume.
+                            properties:
+                              key:
+                                description: key is the key to project.
+                                type: string
+                              mode:
+                                description: |-
+                                  mode is Optional: mode bits used to set permissions on this file.
+                                  Must be an octal value between 0000 and 0777 or a decimal value between 0 and 511.
+                                  YAML accepts both octal and decimal values, JSON requires decimal values for mode bits.
+                                  If not specified, the volume defaultMode will be used.
+                                  This might be in conflict with other options that affect the file
+                                  mode, like fsGroup, and the result can be other mode bits set.
+                                format: int32
+                                type: integer
+                              path:
+                                description: |-
+                                  path is the relative path of the file to map the key to.
+                                  May not be an absolute path.
+                                  May not contain the path element '..'.
+                                  May not start with the string '..'.
+                                type: string
+                            required:
+                            - key
+                            - path
+                            type: object
+                          type: array
+                          x-kubernetes-list-type: atomic
+                        name:
+                          default: ""
+                          description: |-
+                            Name of the referent.
+                            This field is effectively required, but due to backwards compatibility is
+                            allowed to be empty. Instances of this type with an empty value here are
+                            almost certainly wrong.
+                            More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                          type: string
+                        optional:
+                          description: optional specify whether the ConfigMap or its
+                            keys must be defined
+                          type: boolean
+                      type: object
+                      x-kubernetes-map-type: atomic
+                    csi:
+                      description: csi (Container Storage Interface) represents ephemeral
+                        storage that is handled by certain external CSI drivers.
+                      properties:
+                        driver:
+                          description: |-
+                            driver is the name of the CSI driver that handles this volume.
+                            Consult with your admin for the correct name as registered in the cluster.
+                          type: string
+                        fsType:
+                          description: |-
+                            fsType to mount. Ex. "ext4", "xfs", "ntfs".
+                            If not provided, the empty value is passed to the associated CSI driver
+                            which will determine the default filesystem to apply.
+                          type: string
+                        nodePublishSecretRef:
+                          description: |-
+                            nodePublishSecretRef is a reference to the secret object containing
+                            sensitive information to pass to the CSI driver to complete the CSI
+                            NodePublishVolume and NodeUnpublishVolume calls.
+                            This field is optional, and  may be empty if no secret is required. If the
+                            secret object contains more than one secret, all secret references are passed.
+                          properties:
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        readOnly:
+                          description: |-
+                            readOnly specifies a read-only configuration for the volume.
+                            Defaults to false (read/write).
+                          type: boolean
+                        volumeAttributes:
+                          additionalProperties:
+                            type: string
+                          description: |-
+                            volumeAttributes stores driver-specific properties that are passed to the CSI
+                            driver. Consult your driver's documentation for supported values.
+                          type: object
+                      required:
+                      - driver
+                      type: object
+                    downwardAPI:
+                      description: downwardAPI represents downward API about the pod
+                        that should populate this volume
+                      properties:
+                        defaultMode:
+                          description: |-
+                            Optional: mode bits to use on created files by default. Must be a
+                            Optional: mode bits used to set permissions on created files by default.
+                            Must be an octal value between 0000 and 0777 or a decimal value between 0 and 511.
+                            YAML accepts both octal and decimal values, JSON requires decimal values for mode bits.
+                            Defaults to 0644.
+                            Directories within the path are not affected by this setting.
+                            This might be in conflict with other options that affect the file
+                            mode, like fsGroup, and the result can be other mode bits set.
+                          format: int32
+                          type: integer
+                        items:
+                          description: Items is a list of downward API volume file
+                          items:
+                            description: DownwardAPIVolumeFile represents information
+                              to create the file containing the pod field
+                            properties:
+                              fieldRef:
+                                description: 'Required: Selects a field of the pod:
+                                  only annotations, labels, name, namespace and uid
+                                  are supported.'
+                                properties:
+                                  apiVersion:
+                                    description: Version of the schema the FieldPath
+                                      is written in terms of, defaults to "v1".
+                                    type: string
+                                  fieldPath:
+                                    description: Path of the field to select in the
+                                      specified API version.
+                                    type: string
+                                required:
+                                - fieldPath
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              mode:
+                                description: |-
+                                  Optional: mode bits used to set permissions on this file, must be an octal value
+                                  between 0000 and 0777 or a decimal value between 0 and 511.
+                                  YAML accepts both octal and decimal values, JSON requires decimal values for mode bits.
+                                  If not specified, the volume defaultMode will be used.
+                                  This might be in conflict with other options that affect the file
+                                  mode, like fsGroup, and the result can be other mode bits set.
+                                format: int32
+                                type: integer
+                              path:
+                                description: 'Required: Path is  the relative path
+                                  name of the file to be created. Must not be absolute
+                                  or contain the ''..'' path. Must be utf-8 encoded.
+                                  The first item of the relative path must not start
+                                  with ''..'''
+                                type: string
+                              resourceFieldRef:
+                                description: |-
+                                  Selects a resource of the container: only resources limits and requests
+                                  (limits.cpu, limits.memory, requests.cpu and requests.memory) are currently supported.
+                                properties:
+                                  containerName:
+                                    description: 'Container name: required for volumes,
+                                      optional for env vars'
+                                    type: string
+                                  divisor:
+                                    anyOf:
+                                    - type: integer
+                                    - type: string
+                                    description: Specifies the output format of the
+                                      exposed resources, defaults to "1"
+                                    pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                    x-kubernetes-int-or-string: true
+                                  resource:
+                                    description: 'Required: resource to select'
+                                    type: string
+                                required:
+                                - resource
+                                type: object
+                                x-kubernetes-map-type: atomic
+                            required:
+                            - path
+                            type: object
+                          type: array
+                          x-kubernetes-list-type: atomic
+                      type: object
+                    emptyDir:
+                      description: |-
+                        emptyDir represents a temporary directory that shares a pod's lifetime.
+                        More info: https://kubernetes.io/docs/concepts/storage/volumes#emptydir
+                      properties:
+                        medium:
+                          description: |-
+                            medium represents what type of storage medium should back this directory.
+                            The default is "" which means to use the node's default medium.
+                            Must be an empty string (default) or Memory.
+                            More info: https://kubernetes.io/docs/concepts/storage/volumes#emptydir
+                          type: string
+                        sizeLimit:
+                          anyOf:
+                          - type: integer
+                          - type: string
+                          description: |-
+                            sizeLimit is the total amount of local storage required for this EmptyDir volume.
+                            The size limit is also applicable for memory medium.
+                            The maximum usage on memory medium EmptyDir would be the minimum value between
+                            the SizeLimit specified here and the sum of memory limits of all containers in a pod.
+                            The default is nil which means that the limit is undefined.
+                            More info: https://kubernetes.io/docs/concepts/storage/volumes#emptydir
+                          pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                          x-kubernetes-int-or-string: true
+                      type: object
+                    ephemeral:
+                      description: |-
+                        ephemeral represents a volume that is handled by a cluster storage driver.
+                        The volume's lifecycle is tied to the pod that defines it - it will be created before the pod starts,
+                        and deleted when the pod is removed.
+
+                        Use this if:
+                        a) the volume is only needed while the pod runs,
+                        b) features of normal volumes like restoring from snapshot or capacity
+                           tracking are needed,
+                        c) the storage driver is specified through a storage class, and
+                        d) the storage driver supports dynamic volume provisioning through
+                           a PersistentVolumeClaim (see EphemeralVolumeSource for more
+                           information on the connection between this volume type
+                           and PersistentVolumeClaim).
+
+                        Use PersistentVolumeClaim or one of the vendor-specific
+                        APIs for volumes that persist for longer than the lifecycle
+                        of an individual pod.
+
+                        Use CSI for light-weight local ephemeral volumes if the CSI driver is meant to
+                        be used that way - see the documentation of the driver for
+                        more information.
+
+                        A pod can use both types of ephemeral volumes and
+                        persistent volumes at the same time.
+                      properties:
+                        volumeClaimTemplate:
+                          description: |-
+                            Will be used to create a stand-alone PVC to provision the volume.
+                            The pod in which this EphemeralVolumeSource is embedded will be the
+                            owner of the PVC, i.e. the PVC will be deleted together with the
+                            pod.  The name of the PVC will be `<pod name>-<volume name>` where
+                            `<volume name>` is the name from the `PodSpec.Volumes` array
+                            entry. Pod validation will reject the pod if the concatenated name
+                            is not valid for a PVC (for example, too long).
+
+                            An existing PVC with that name that is not owned by the pod
+                            will *not* be used for the pod to avoid using an unrelated
+                            volume by mistake. Starting the pod is then blocked until
+                            the unrelated PVC is removed. If such a pre-created PVC is
+                            meant to be used by the pod, the PVC has to updated with an
+                            owner reference to the pod once the pod exists. Normally
+                            this should not be necessary, but it may be useful when
+                            manually reconstructing a broken cluster.
+
+                            This field is read-only and no changes will be made by Kubernetes
+                            to the PVC after it has been created.
+
+                            Required, must not be nil.
+                          properties:
+                            metadata:
+                              description: |-
+                                May contain labels and annotations that will be copied into the PVC
+                                when creating it. No other fields are allowed and will be rejected during
+                                validation.
+                              type: object
+                            spec:
+                              description: |-
+                                The specification for the PersistentVolumeClaim. The entire content is
+                                copied unchanged into the PVC that gets created from this
+                                template. The same fields as in a PersistentVolumeClaim
+                                are also valid here.
+                              properties:
+                                accessModes:
+                                  description: |-
+                                    accessModes contains the desired access modes the volume should have.
+                                    More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#access-modes-1
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                dataSource:
+                                  description: |-
+                                    dataSource field can be used to specify either:
+                                    * An existing VolumeSnapshot object (snapshot.storage.k8s.io/VolumeSnapshot)
+                                    * An existing PVC (PersistentVolumeClaim)
+                                    If the provisioner or an external controller can support the specified data source,
+                                    it will create a new volume based on the contents of the specified data source.
+                                    When the AnyVolumeDataSource feature gate is enabled, dataSource contents will be copied to dataSourceRef,
+                                    and dataSourceRef contents will be copied to dataSource when dataSourceRef.namespace is not specified.
+                                    If the namespace is specified, then dataSourceRef will not be copied to dataSource.
+                                  properties:
+                                    apiGroup:
+                                      description: |-
+                                        APIGroup is the group for the resource being referenced.
+                                        If APIGroup is not specified, the specified Kind must be in the core API group.
+                                        For any other third-party types, APIGroup is required.
+                                      type: string
+                                    kind:
+                                      description: Kind is the type of resource being
+                                        referenced
+                                      type: string
+                                    name:
+                                      description: Name is the name of resource being
+                                        referenced
+                                      type: string
+                                  required:
+                                  - kind
+                                  - name
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                dataSourceRef:
+                                  description: |-
+                                    dataSourceRef specifies the object from which to populate the volume with data, if a non-empty
+                                    volume is desired. This may be any object from a non-empty API group (non
+                                    core object) or a PersistentVolumeClaim object.
+                                    When this field is specified, volume binding will only succeed if the type of
+                                    the specified object matches some installed volume populator or dynamic
+                                    provisioner.
+                                    This field will replace the functionality of the dataSource field and as such
+                                    if both fields are non-empty, they must have the same value. For backwards
+                                    compatibility, when namespace isn't specified in dataSourceRef,
+                                    both fields (dataSource and dataSourceRef) will be set to the same
+                                    value automatically if one of them is empty and the other is non-empty.
+                                    When namespace is specified in dataSourceRef,
+                                    dataSource isn't set to the same value and must be empty.
+                                    There are three important differences between dataSource and dataSourceRef:
+                                    * While dataSource only allows two specific types of objects, dataSourceRef
+                                      allows any non-core object, as well as PersistentVolumeClaim objects.
+                                    * While dataSource ignores disallowed values (dropping them), dataSourceRef
+                                      preserves all values, and generates an error if a disallowed value is
+                                      specified.
+                                    * While dataSource only allows local objects, dataSourceRef allows objects
+                                      in any namespaces.
+                                    (Beta) Using this field requires the AnyVolumeDataSource feature gate to be enabled.
+                                    (Alpha) Using the namespace field of dataSourceRef requires the CrossNamespaceVolumeDataSource feature gate to be enabled.
+                                  properties:
+                                    apiGroup:
+                                      description: |-
+                                        APIGroup is the group for the resource being referenced.
+                                        If APIGroup is not specified, the specified Kind must be in the core API group.
+                                        For any other third-party types, APIGroup is required.
+                                      type: string
+                                    kind:
+                                      description: Kind is the type of resource being
+                                        referenced
+                                      type: string
+                                    name:
+                                      description: Name is the name of resource being
+                                        referenced
+                                      type: string
+                                    namespace:
+                                      description: |-
+                                        Namespace is the namespace of resource being referenced
+                                        Note that when a namespace is specified, a gateway.networking.k8s.io/ReferenceGrant object is required in the referent namespace to allow that namespace's owner to accept the reference. See the ReferenceGrant documentation for details.
+                                        (Alpha) This field requires the CrossNamespaceVolumeDataSource feature gate to be enabled.
+                                      type: string
+                                  required:
+                                  - kind
+                                  - name
+                                  type: object
+                                resources:
+                                  description: |-
+                                    resources represents the minimum resources the volume should have.
+                                    If RecoverVolumeExpansionFailure feature is enabled users are allowed to specify resource requirements
+                                    that are lower than previous value but must still be higher than capacity recorded in the
+                                    status field of the claim.
+                                    More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources
+                                  properties:
+                                    limits:
+                                      additionalProperties:
+                                        anyOf:
+                                        - type: integer
+                                        - type: string
+                                        pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                        x-kubernetes-int-or-string: true
+                                      description: |-
+                                        Limits describes the maximum amount of compute resources allowed.
+                                        More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+                                      type: object
+                                    requests:
+                                      additionalProperties:
+                                        anyOf:
+                                        - type: integer
+                                        - type: string
+                                        pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                        x-kubernetes-int-or-string: true
+                                      description: |-
+                                        Requests describes the minimum amount of compute resources required.
+                                        If Requests is omitted for a container, it defaults to Limits if that is explicitly specified,
+                                        otherwise to an implementation-defined value. Requests cannot exceed Limits.
+                                        More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+                                      type: object
+                                  type: object
+                                selector:
+                                  description: selector is a label query over volumes
+                                    to consider for binding.
+                                  properties:
+                                    matchExpressions:
+                                      description: matchExpressions is a list of label
+                                        selector requirements. The requirements are
+                                        ANDed.
+                                      items:
+                                        description: |-
+                                          A label selector requirement is a selector that contains values, a key, and an operator that
+                                          relates the key and values.
+                                        properties:
+                                          key:
+                                            description: key is the label key that
+                                              the selector applies to.
+                                            type: string
+                                          operator:
+                                            description: |-
+                                              operator represents a key's relationship to a set of values.
+                                              Valid operators are In, NotIn, Exists and DoesNotExist.
+                                            type: string
+                                          values:
+                                            description: |-
+                                              values is an array of string values. If the operator is In or NotIn,
+                                              the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                              the values array must be empty. This array is replaced during a strategic
+                                              merge patch.
+                                            items:
+                                              type: string
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                        required:
+                                        - key
+                                        - operator
+                                        type: object
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    matchLabels:
+                                      additionalProperties:
+                                        type: string
+                                      description: |-
+                                        matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                        map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                        operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                      type: object
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                                storageClassName:
+                                  description: |-
+                                    storageClassName is the name of the StorageClass required by the claim.
+                                    More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#class-1
+                                  type: string
+                                volumeAttributesClassName:
+                                  description: |-
+                                    volumeAttributesClassName may be used to set the VolumeAttributesClass used by this claim.
+                                    If specified, the CSI driver will create or update the volume with the attributes defined
+                                    in the corresponding VolumeAttributesClass. This has a different purpose than storageClassName,
+                                    it can be changed after the claim is created. An empty string or nil value indicates that no
+                                    VolumeAttributesClass will be applied to the claim. If the claim enters an Infeasible error state,
+                                    this field can be reset to its previous value (including nil) to cancel the modification.
+                                    If the resource referred to by volumeAttributesClass does not exist, this PersistentVolumeClaim will be
+                                    set to a Pending state, as reflected by the modifyVolumeStatus field, until such as a resource
+                                    exists.
+                                    More info: https://kubernetes.io/docs/concepts/storage/volume-attributes-classes/
+                                  type: string
+                                volumeMode:
+                                  description: |-
+                                    volumeMode defines what type of volume is required by the claim.
+                                    Value of Filesystem is implied when not included in claim spec.
+                                  type: string
+                                volumeName:
+                                  description: volumeName is the binding reference
+                                    to the PersistentVolume backing this claim.
+                                  type: string
+                              type: object
+                          required:
+                          - spec
+                          type: object
+                      type: object
+                    fc:
+                      description: fc represents a Fibre Channel resource that is
+                        attached to a kubelet's host machine and then exposed to the
+                        pod.
+                      properties:
+                        fsType:
+                          description: |-
+                            fsType is the filesystem type to mount.
+                            Must be a filesystem type supported by the host operating system.
+                            Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
+                          type: string
+                        lun:
+                          description: 'lun is Optional: FC target lun number'
+                          format: int32
+                          type: integer
+                        readOnly:
+                          description: |-
+                            readOnly is Optional: Defaults to false (read/write). ReadOnly here will force
+                            the ReadOnly setting in VolumeMounts.
+                          type: boolean
+                        targetWWNs:
+                          description: 'targetWWNs is Optional: FC target worldwide
+                            names (WWNs)'
+                          items:
+                            type: string
+                          type: array
+                          x-kubernetes-list-type: atomic
+                        wwids:
+                          description: |-
+                            wwids Optional: FC volume world wide identifiers (wwids)
+                            Either wwids or combination of targetWWNs and lun must be set, but not both simultaneously.
+                          items:
+                            type: string
+                          type: array
+                          x-kubernetes-list-type: atomic
+                      type: object
+                    flexVolume:
+                      description: |-
+                        flexVolume represents a generic volume resource that is
+                        provisioned/attached using an exec based plugin.
+                        Deprecated: FlexVolume is deprecated. Consider using a CSIDriver instead.
+                      properties:
+                        driver:
+                          description: driver is the name of the driver to use for
+                            this volume.
+                          type: string
+                        fsType:
+                          description: |-
+                            fsType is the filesystem type to mount.
+                            Must be a filesystem type supported by the host operating system.
+                            Ex. "ext4", "xfs", "ntfs". The default filesystem depends on FlexVolume script.
+                          type: string
+                        options:
+                          additionalProperties:
+                            type: string
+                          description: 'options is Optional: this field holds extra
+                            command options if any.'
+                          type: object
+                        readOnly:
+                          description: |-
+                            readOnly is Optional: defaults to false (read/write). ReadOnly here will force
+                            the ReadOnly setting in VolumeMounts.
+                          type: boolean
+                        secretRef:
+                          description: |-
+                            secretRef is Optional: secretRef is reference to the secret object containing
+                            sensitive information to pass to the plugin scripts. This may be
+                            empty if no secret object is specified. If the secret object
+                            contains more than one secret, all secrets are passed to the plugin
+                            scripts.
+                          properties:
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                          type: object
+                          x-kubernetes-map-type: atomic
+                      required:
+                      - driver
+                      type: object
+                    flocker:
+                      description: |-
+                        flocker represents a Flocker volume attached to a kubelet's host machine. This depends on the Flocker control service being running.
+                        Deprecated: Flocker is deprecated and the in-tree flocker type is no longer supported.
+                      properties:
+                        datasetName:
+                          description: |-
+                            datasetName is Name of the dataset stored as metadata -> name on the dataset for Flocker
+                            should be considered as deprecated
+                          type: string
+                        datasetUUID:
+                          description: datasetUUID is the UUID of the dataset. This
+                            is unique identifier of a Flocker dataset
+                          type: string
+                      type: object
+                    gcePersistentDisk:
+                      description: |-
+                        gcePersistentDisk represents a GCE Disk resource that is attached to a
+                        kubelet's host machine and then exposed to the pod.
+                        Deprecated: GCEPersistentDisk is deprecated. All operations for the in-tree
+                        gcePersistentDisk type are redirected to the pd.csi.storage.gke.io CSI driver.
+                        More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
+                      properties:
+                        fsType:
+                          description: |-
+                            fsType is filesystem type of the volume that you want to mount.
+                            Tip: Ensure that the filesystem type is supported by the host operating system.
+                            Examples: "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
+                            More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
+                          type: string
+                        partition:
+                          description: |-
+                            partition is the partition in the volume that you want to mount.
+                            If omitted, the default is to mount by volume name.
+                            Examples: For volume /dev/sda1, you specify the partition as "1".
+                            Similarly, the volume partition for /dev/sda is "0" (or you can leave the property empty).
+                            More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
+                          format: int32
+                          type: integer
+                        pdName:
+                          description: |-
+                            pdName is unique name of the PD resource in GCE. Used to identify the disk in GCE.
+                            More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
+                          type: string
+                        readOnly:
+                          description: |-
+                            readOnly here will force the ReadOnly setting in VolumeMounts.
+                            Defaults to false.
+                            More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
+                          type: boolean
+                      required:
+                      - pdName
+                      type: object
+                    gitRepo:
+                      description: |-
+                        gitRepo represents a git repository at a particular revision.
+                        Deprecated: GitRepo is deprecated. To provision a container with a git repo, mount an
+                        EmptyDir into an InitContainer that clones the repo using git, then mount the EmptyDir
+                        into the Pod's container.
+                      properties:
+                        directory:
+                          description: |-
+                            directory is the target directory name.
+                            Must not contain or start with '..'.  If '.' is supplied, the volume directory will be the
+                            git repository.  Otherwise, if specified, the volume will contain the git repository in
+                            the subdirectory with the given name.
+                          type: string
+                        repository:
+                          description: repository is the URL
+                          type: string
+                        revision:
+                          description: revision is the commit hash for the specified
+                            revision.
+                          type: string
+                      required:
+                      - repository
+                      type: object
+                    glusterfs:
+                      description: |-
+                        glusterfs represents a Glusterfs mount on the host that shares a pod's lifetime.
+                        Deprecated: Glusterfs is deprecated and the in-tree glusterfs type is no longer supported.
+                      properties:
+                        endpoints:
+                          description: endpoints is the endpoint name that details
+                            Glusterfs topology.
+                          type: string
+                        path:
+                          description: |-
+                            path is the Glusterfs volume path.
+                            More info: https://examples.k8s.io/volumes/glusterfs/README.md#create-a-pod
+                          type: string
+                        readOnly:
+                          description: |-
+                            readOnly here will force the Glusterfs volume to be mounted with read-only permissions.
+                            Defaults to false.
+                            More info: https://examples.k8s.io/volumes/glusterfs/README.md#create-a-pod
+                          type: boolean
+                      required:
+                      - endpoints
+                      - path
+                      type: object
+                    hostPath:
+                      description: |-
+                        hostPath represents a pre-existing file or directory on the host
+                        machine that is directly exposed to the container. This is generally
+                        used for system agents or other privileged things that are allowed
+                        to see the host machine. Most containers will NOT need this.
+                        More info: https://kubernetes.io/docs/concepts/storage/volumes#hostpath
+                      properties:
+                        path:
+                          description: |-
+                            path of the directory on the host.
+                            If the path is a symlink, it will follow the link to the real path.
+                            More info: https://kubernetes.io/docs/concepts/storage/volumes#hostpath
+                          type: string
+                        type:
+                          description: |-
+                            type for HostPath Volume
+                            Defaults to ""
+                            More info: https://kubernetes.io/docs/concepts/storage/volumes#hostpath
+                          type: string
+                      required:
+                      - path
+                      type: object
+                    image:
+                      description: |-
+                        image represents an OCI object (a container image or artifact) pulled and mounted on the kubelet's host machine.
+                        The volume is resolved at pod startup depending on which PullPolicy value is provided:
+
+                        - Always: the kubelet always attempts to pull the reference. Container creation will fail If the pull fails.
+                        - Never: the kubelet never pulls the reference and only uses a local image or artifact. Container creation will fail if the reference isn't present.
+                        - IfNotPresent: the kubelet pulls if the reference isn't already present on disk. Container creation will fail if the reference isn't present and the pull fails.
+
+                        The volume gets re-resolved if the pod gets deleted and recreated, which means that new remote content will become available on pod recreation.
+                        A failure to resolve or pull the image during pod startup will block containers from starting and may add significant latency. Failures will be retried using normal volume backoff and will be reported on the pod reason and message.
+                        The types of objects that may be mounted by this volume are defined by the container runtime implementation on a host machine and at minimum must include all valid types supported by the container image field.
+                        The OCI object gets mounted in a single directory (spec.containers[*].volumeMounts.mountPath) by merging the manifest layers in the same way as for container images.
+                        The volume will be mounted read-only (ro) and non-executable files (noexec).
+                        Sub path mounts for containers are not supported (spec.containers[*].volumeMounts.subpath) before 1.33.
+                        The field spec.securityContext.fsGroupChangePolicy has no effect on this volume type.
+                      properties:
+                        pullPolicy:
+                          description: |-
+                            Policy for pulling OCI objects. Possible values are:
+                            Always: the kubelet always attempts to pull the reference. Container creation will fail If the pull fails.
+                            Never: the kubelet never pulls the reference and only uses a local image or artifact. Container creation will fail if the reference isn't present.
+                            IfNotPresent: the kubelet pulls if the reference isn't already present on disk. Container creation will fail if the reference isn't present and the pull fails.
+                            Defaults to Always if :latest tag is specified, or IfNotPresent otherwise.
+                          type: string
+                        reference:
+                          description: |-
+                            Required: Image or artifact reference to be used.
+                            Behaves in the same way as pod.spec.containers[*].image.
+                            Pull secrets will be assembled in the same way as for the container image by looking up node credentials, SA image pull secrets, and pod spec image pull secrets.
+                            More info: https://kubernetes.io/docs/concepts/containers/images
+                            This field is optional to allow higher level config management to default or override
+                            container images in workload controllers like Deployments and StatefulSets.
+                          type: string
+                      type: object
+                    iscsi:
+                      description: |-
+                        iscsi represents an ISCSI Disk resource that is attached to a
+                        kubelet's host machine and then exposed to the pod.
+                        More info: https://kubernetes.io/docs/concepts/storage/volumes/#iscsi
+                      properties:
+                        chapAuthDiscovery:
+                          description: chapAuthDiscovery defines whether support iSCSI
+                            Discovery CHAP authentication
+                          type: boolean
+                        chapAuthSession:
+                          description: chapAuthSession defines whether support iSCSI
+                            Session CHAP authentication
+                          type: boolean
+                        fsType:
+                          description: |-
+                            fsType is the filesystem type of the volume that you want to mount.
+                            Tip: Ensure that the filesystem type is supported by the host operating system.
+                            Examples: "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
+                            More info: https://kubernetes.io/docs/concepts/storage/volumes#iscsi
+                          type: string
+                        initiatorName:
+                          description: |-
+                            initiatorName is the custom iSCSI Initiator Name.
+                            If initiatorName is specified with iscsiInterface simultaneously, new iSCSI interface
+                            <target portal>:<volume name> will be created for the connection.
+                          type: string
+                        iqn:
+                          description: iqn is the target iSCSI Qualified Name.
+                          type: string
+                        iscsiInterface:
+                          default: default
+                          description: |-
+                            iscsiInterface is the interface Name that uses an iSCSI transport.
+                            Defaults to 'default' (tcp).
+                          type: string
+                        lun:
+                          description: lun represents iSCSI Target Lun number.
+                          format: int32
+                          type: integer
+                        portals:
+                          description: |-
+                            portals is the iSCSI Target Portal List. The portal is either an IP or ip_addr:port if the port
+                            is other than default (typically TCP ports 860 and 3260).
+                          items:
+                            type: string
+                          type: array
+                          x-kubernetes-list-type: atomic
+                        readOnly:
+                          description: |-
+                            readOnly here will force the ReadOnly setting in VolumeMounts.
+                            Defaults to false.
+                          type: boolean
+                        secretRef:
+                          description: secretRef is the CHAP Secret for iSCSI target
+                            and initiator authentication
+                          properties:
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        targetPortal:
+                          description: |-
+                            targetPortal is iSCSI Target Portal. The Portal is either an IP or ip_addr:port if the port
+                            is other than default (typically TCP ports 860 and 3260).
+                          type: string
+                      required:
+                      - iqn
+                      - lun
+                      - targetPortal
+                      type: object
+                    name:
+                      description: |-
+                        name of the volume.
+                        Must be a DNS_LABEL and unique within the pod.
+                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                      type: string
+                    nfs:
+                      description: |-
+                        nfs represents an NFS mount on the host that shares a pod's lifetime
+                        More info: https://kubernetes.io/docs/concepts/storage/volumes#nfs
+                      properties:
+                        path:
+                          description: |-
+                            path that is exported by the NFS server.
+                            More info: https://kubernetes.io/docs/concepts/storage/volumes#nfs
+                          type: string
+                        readOnly:
+                          description: |-
+                            readOnly here will force the NFS export to be mounted with read-only permissions.
+                            Defaults to false.
+                            More info: https://kubernetes.io/docs/concepts/storage/volumes#nfs
+                          type: boolean
+                        server:
+                          description: |-
+                            server is the hostname or IP address of the NFS server.
+                            More info: https://kubernetes.io/docs/concepts/storage/volumes#nfs
+                          type: string
+                      required:
+                      - path
+                      - server
+                      type: object
+                    persistentVolumeClaim:
+                      description: |-
+                        persistentVolumeClaimVolumeSource represents a reference to a
+                        PersistentVolumeClaim in the same namespace.
+                        More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#persistentvolumeclaims
+                      properties:
+                        claimName:
+                          description: |-
+                            claimName is the name of a PersistentVolumeClaim in the same namespace as the pod using this volume.
+                            More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#persistentvolumeclaims
+                          type: string
+                        readOnly:
+                          description: |-
+                            readOnly Will force the ReadOnly setting in VolumeMounts.
+                            Default false.
+                          type: boolean
+                      required:
+                      - claimName
+                      type: object
+                    photonPersistentDisk:
+                      description: |-
+                        photonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets host machine.
+                        Deprecated: PhotonPersistentDisk is deprecated and the in-tree photonPersistentDisk type is no longer supported.
+                      properties:
+                        fsType:
+                          description: |-
+                            fsType is the filesystem type to mount.
+                            Must be a filesystem type supported by the host operating system.
+                            Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
+                          type: string
+                        pdID:
+                          description: pdID is the ID that identifies Photon Controller
+                            persistent disk
+                          type: string
+                      required:
+                      - pdID
+                      type: object
+                    portworxVolume:
+                      description: |-
+                        portworxVolume represents a portworx volume attached and mounted on kubelets host machine.
+                        Deprecated: PortworxVolume is deprecated. All operations for the in-tree portworxVolume type
+                        are redirected to the pxd.portworx.com CSI driver when the CSIMigrationPortworx feature-gate
+                        is on.
+                      properties:
+                        fsType:
+                          description: |-
+                            fSType represents the filesystem type to mount
+                            Must be a filesystem type supported by the host operating system.
+                            Ex. "ext4", "xfs". Implicitly inferred to be "ext4" if unspecified.
+                          type: string
+                        readOnly:
+                          description: |-
+                            readOnly defaults to false (read/write). ReadOnly here will force
+                            the ReadOnly setting in VolumeMounts.
+                          type: boolean
+                        volumeID:
+                          description: volumeID uniquely identifies a Portworx volume
+                          type: string
+                      required:
+                      - volumeID
+                      type: object
+                    projected:
+                      description: projected items for all in one resources secrets,
+                        configmaps, and downward API
+                      properties:
+                        defaultMode:
+                          description: |-
+                            defaultMode are the mode bits used to set permissions on created files by default.
+                            Must be an octal value between 0000 and 0777 or a decimal value between 0 and 511.
+                            YAML accepts both octal and decimal values, JSON requires decimal values for mode bits.
+                            Directories within the path are not affected by this setting.
+                            This might be in conflict with other options that affect the file
+                            mode, like fsGroup, and the result can be other mode bits set.
+                          format: int32
+                          type: integer
+                        sources:
+                          description: |-
+                            sources is the list of volume projections. Each entry in this list
+                            handles one source.
+                          items:
+                            description: |-
+                              Projection that may be projected along with other supported volume types.
+                              Exactly one of these fields must be set.
+                            properties:
+                              clusterTrustBundle:
+                                description: |-
+                                  ClusterTrustBundle allows a pod to access the `.spec.trustBundle` field
+                                  of ClusterTrustBundle objects in an auto-updating file.
+
+                                  Alpha, gated by the ClusterTrustBundleProjection feature gate.
+
+                                  ClusterTrustBundle objects can either be selected by name, or by the
+                                  combination of signer name and a label selector.
+
+                                  Kubelet performs aggressive normalization of the PEM contents written
+                                  into the pod filesystem.  Esoteric PEM features such as inter-block
+                                  comments and block headers are stripped.  Certificates are deduplicated.
+                                  The ordering of certificates within the file is arbitrary, and Kubelet
+                                  may change the order over time.
+                                properties:
+                                  labelSelector:
+                                    description: |-
+                                      Select all ClusterTrustBundles that match this label selector.  Only has
+                                      effect if signerName is set.  Mutually-exclusive with name.  If unset,
+                                      interpreted as "match nothing".  If set but empty, interpreted as "match
+                                      everything".
+                                    properties:
+                                      matchExpressions:
+                                        description: matchExpressions is a list of
+                                          label selector requirements. The requirements
+                                          are ANDed.
+                                        items:
+                                          description: |-
+                                            A label selector requirement is a selector that contains values, a key, and an operator that
+                                            relates the key and values.
+                                          properties:
+                                            key:
+                                              description: key is the label key that
+                                                the selector applies to.
+                                              type: string
+                                            operator:
+                                              description: |-
+                                                operator represents a key's relationship to a set of values.
+                                                Valid operators are In, NotIn, Exists and DoesNotExist.
+                                              type: string
+                                            values:
+                                              description: |-
+                                                values is an array of string values. If the operator is In or NotIn,
+                                                the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                                the values array must be empty. This array is replaced during a strategic
+                                                merge patch.
+                                              items:
+                                                type: string
+                                              type: array
+                                              x-kubernetes-list-type: atomic
+                                          required:
+                                          - key
+                                          - operator
+                                          type: object
+                                        type: array
+                                        x-kubernetes-list-type: atomic
+                                      matchLabels:
+                                        additionalProperties:
+                                          type: string
+                                        description: |-
+                                          matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                          map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                          operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                        type: object
+                                    type: object
+                                    x-kubernetes-map-type: atomic
+                                  name:
+                                    description: |-
+                                      Select a single ClusterTrustBundle by object name.  Mutually-exclusive
+                                      with signerName and labelSelector.
+                                    type: string
+                                  optional:
+                                    description: |-
+                                      If true, don't block pod startup if the referenced ClusterTrustBundle(s)
+                                      aren't available.  If using name, then the named ClusterTrustBundle is
+                                      allowed not to exist.  If using signerName, then the combination of
+                                      signerName and labelSelector is allowed to match zero
+                                      ClusterTrustBundles.
+                                    type: boolean
+                                  path:
+                                    description: Relative path from the volume root
+                                      to write the bundle.
+                                    type: string
+                                  signerName:
+                                    description: |-
+                                      Select all ClusterTrustBundles that match this signer name.
+                                      Mutually-exclusive with name.  The contents of all selected
+                                      ClusterTrustBundles will be unified and deduplicated.
+                                    type: string
+                                required:
+                                - path
+                                type: object
+                              configMap:
+                                description: configMap information about the configMap
+                                  data to project
+                                properties:
+                                  items:
+                                    description: |-
+                                      items if unspecified, each key-value pair in the Data field of the referenced
+                                      ConfigMap will be projected into the volume as a file whose name is the
+                                      key and content is the value. If specified, the listed keys will be
+                                      projected into the specified paths, and unlisted keys will not be
+                                      present. If a key is specified which is not present in the ConfigMap,
+                                      the volume setup will error unless it is marked optional. Paths must be
+                                      relative and may not contain the '..' path or start with '..'.
+                                    items:
+                                      description: Maps a string key to a path within
+                                        a volume.
+                                      properties:
+                                        key:
+                                          description: key is the key to project.
+                                          type: string
+                                        mode:
+                                          description: |-
+                                            mode is Optional: mode bits used to set permissions on this file.
+                                            Must be an octal value between 0000 and 0777 or a decimal value between 0 and 511.
+                                            YAML accepts both octal and decimal values, JSON requires decimal values for mode bits.
+                                            If not specified, the volume defaultMode will be used.
+                                            This might be in conflict with other options that affect the file
+                                            mode, like fsGroup, and the result can be other mode bits set.
+                                          format: int32
+                                          type: integer
+                                        path:
+                                          description: |-
+                                            path is the relative path of the file to map the key to.
+                                            May not be an absolute path.
+                                            May not contain the path element '..'.
+                                            May not start with the string '..'.
+                                          type: string
+                                      required:
+                                      - key
+                                      - path
+                                      type: object
+                                    type: array
+                                    x-kubernetes-list-type: atomic
+                                  name:
+                                    default: ""
+                                    description: |-
+                                      Name of the referent.
+                                      This field is effectively required, but due to backwards compatibility is
+                                      allowed to be empty. Instances of this type with an empty value here are
+                                      almost certainly wrong.
+                                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                    type: string
+                                  optional:
+                                    description: optional specify whether the ConfigMap
+                                      or its keys must be defined
+                                    type: boolean
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              downwardAPI:
+                                description: downwardAPI information about the downwardAPI
+                                  data to project
+                                properties:
+                                  items:
+                                    description: Items is a list of DownwardAPIVolume
+                                      file
+                                    items:
+                                      description: DownwardAPIVolumeFile represents
+                                        information to create the file containing
+                                        the pod field
+                                      properties:
+                                        fieldRef:
+                                          description: 'Required: Selects a field
+                                            of the pod: only annotations, labels,
+                                            name, namespace and uid are supported.'
+                                          properties:
+                                            apiVersion:
+                                              description: Version of the schema the
+                                                FieldPath is written in terms of,
+                                                defaults to "v1".
+                                              type: string
+                                            fieldPath:
+                                              description: Path of the field to select
+                                                in the specified API version.
+                                              type: string
+                                          required:
+                                          - fieldPath
+                                          type: object
+                                          x-kubernetes-map-type: atomic
+                                        mode:
+                                          description: |-
+                                            Optional: mode bits used to set permissions on this file, must be an octal value
+                                            between 0000 and 0777 or a decimal value between 0 and 511.
+                                            YAML accepts both octal and decimal values, JSON requires decimal values for mode bits.
+                                            If not specified, the volume defaultMode will be used.
+                                            This might be in conflict with other options that affect the file
+                                            mode, like fsGroup, and the result can be other mode bits set.
+                                          format: int32
+                                          type: integer
+                                        path:
+                                          description: 'Required: Path is  the relative
+                                            path name of the file to be created. Must
+                                            not be absolute or contain the ''..''
+                                            path. Must be utf-8 encoded. The first
+                                            item of the relative path must not start
+                                            with ''..'''
+                                          type: string
+                                        resourceFieldRef:
+                                          description: |-
+                                            Selects a resource of the container: only resources limits and requests
+                                            (limits.cpu, limits.memory, requests.cpu and requests.memory) are currently supported.
+                                          properties:
+                                            containerName:
+                                              description: 'Container name: required
+                                                for volumes, optional for env vars'
+                                              type: string
+                                            divisor:
+                                              anyOf:
+                                              - type: integer
+                                              - type: string
+                                              description: Specifies the output format
+                                                of the exposed resources, defaults
+                                                to "1"
+                                              pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                              x-kubernetes-int-or-string: true
+                                            resource:
+                                              description: 'Required: resource to
+                                                select'
+                                              type: string
+                                          required:
+                                          - resource
+                                          type: object
+                                          x-kubernetes-map-type: atomic
+                                      required:
+                                      - path
+                                      type: object
+                                    type: array
+                                    x-kubernetes-list-type: atomic
+                                type: object
+                              podCertificate:
+                                description: |-
+                                  Projects an auto-rotating credential bundle (private key and certificate
+                                  chain) that the pod can use either as a TLS client or server.
+
+                                  Kubelet generates a private key and uses it to send a
+                                  PodCertificateRequest to the named signer.  Once the signer approves the
+                                  request and issues a certificate chain, Kubelet writes the key and
+                                  certificate chain to the pod filesystem.  The pod does not start until
+                                  certificates have been issued for each podCertificate projected volume
+                                  source in its spec.
+
+                                  Kubelet will begin trying to rotate the certificate at the time indicated
+                                  by the signer using the PodCertificateRequest.Status.BeginRefreshAt
+                                  timestamp.
+
+                                  Kubelet can write a single file, indicated by the credentialBundlePath
+                                  field, or separate files, indicated by the keyPath and
+                                  certificateChainPath fields.
+
+                                  The credential bundle is a single file in PEM format.  The first PEM
+                                  entry is the private key (in PKCS#8 format), and the remaining PEM
+                                  entries are the certificate chain issued by the signer (typically,
+                                  signers will return their certificate chain in leaf-to-root order).
+
+                                  Prefer using the credential bundle format, since your application code
+                                  can read it atomically.  If you use keyPath and certificateChainPath,
+                                  your application must make two separate file reads. If these coincide
+                                  with a certificate rotation, it is possible that the private key and leaf
+                                  certificate you read may not correspond to each other.  Your application
+                                  will need to check for this condition, and re-read until they are
+                                  consistent.
+
+                                  The named signer controls chooses the format of the certificate it
+                                  issues; consult the signer implementation's documentation to learn how to
+                                  use the certificates it issues.
+                                properties:
+                                  certificateChainPath:
+                                    description: |-
+                                      Write the certificate chain at this path in the projected volume.
+
+                                      Most applications should use credentialBundlePath.  When using keyPath
+                                      and certificateChainPath, your application needs to check that the key
+                                      and leaf certificate are consistent, because it is possible to read the
+                                      files mid-rotation.
+                                    type: string
+                                  credentialBundlePath:
+                                    description: |-
+                                      Write the credential bundle at this path in the projected volume.
+
+                                      The credential bundle is a single file that contains multiple PEM blocks.
+                                      The first PEM block is a PRIVATE KEY block, containing a PKCS#8 private
+                                      key.
+
+                                      The remaining blocks are CERTIFICATE blocks, containing the issued
+                                      certificate chain from the signer (leaf and any intermediates).
+
+                                      Using credentialBundlePath lets your Pod's application code make a single
+                                      atomic read that retrieves a consistent key and certificate chain.  If you
+                                      project them to separate files, your application code will need to
+                                      additionally check that the leaf certificate was issued to the key.
+                                    type: string
+                                  keyPath:
+                                    description: |-
+                                      Write the key at this path in the projected volume.
+
+                                      Most applications should use credentialBundlePath.  When using keyPath
+                                      and certificateChainPath, your application needs to check that the key
+                                      and leaf certificate are consistent, because it is possible to read the
+                                      files mid-rotation.
+                                    type: string
+                                  keyType:
+                                    description: |-
+                                      The type of keypair Kubelet will generate for the pod.
+
+                                      Valid values are "RSA3072", "RSA4096", "ECDSAP256", "ECDSAP384",
+                                      "ECDSAP521", and "ED25519".
+                                    type: string
+                                  maxExpirationSeconds:
+                                    description: |-
+                                      maxExpirationSeconds is the maximum lifetime permitted for the
+                                      certificate.
+
+                                      Kubelet copies this value verbatim into the PodCertificateRequests it
+                                      generates for this projection.
+
+                                      If omitted, kube-apiserver will set it to 86400(24 hours). kube-apiserver
+                                      will reject values shorter than 3600 (1 hour).  The maximum allowable
+                                      value is 7862400 (91 days).
+
+                                      The signer implementation is then free to issue a certificate with any
+                                      lifetime *shorter* than MaxExpirationSeconds, but no shorter than 3600
+                                      seconds (1 hour).  This constraint is enforced by kube-apiserver.
+                                      `kubernetes.io` signers will never issue certificates with a lifetime
+                                      longer than 24 hours.
+                                    format: int32
+                                    type: integer
+                                  signerName:
+                                    description: Kubelet's generated CSRs will be
+                                      addressed to this signer.
+                                    type: string
+                                required:
+                                - keyType
+                                - signerName
+                                type: object
+                              secret:
+                                description: secret information about the secret data
+                                  to project
+                                properties:
+                                  items:
+                                    description: |-
+                                      items if unspecified, each key-value pair in the Data field of the referenced
+                                      Secret will be projected into the volume as a file whose name is the
+                                      key and content is the value. If specified, the listed keys will be
+                                      projected into the specified paths, and unlisted keys will not be
+                                      present. If a key is specified which is not present in the Secret,
+                                      the volume setup will error unless it is marked optional. Paths must be
+                                      relative and may not contain the '..' path or start with '..'.
+                                    items:
+                                      description: Maps a string key to a path within
+                                        a volume.
+                                      properties:
+                                        key:
+                                          description: key is the key to project.
+                                          type: string
+                                        mode:
+                                          description: |-
+                                            mode is Optional: mode bits used to set permissions on this file.
+                                            Must be an octal value between 0000 and 0777 or a decimal value between 0 and 511.
+                                            YAML accepts both octal and decimal values, JSON requires decimal values for mode bits.
+                                            If not specified, the volume defaultMode will be used.
+                                            This might be in conflict with other options that affect the file
+                                            mode, like fsGroup, and the result can be other mode bits set.
+                                          format: int32
+                                          type: integer
+                                        path:
+                                          description: |-
+                                            path is the relative path of the file to map the key to.
+                                            May not be an absolute path.
+                                            May not contain the path element '..'.
+                                            May not start with the string '..'.
+                                          type: string
+                                      required:
+                                      - key
+                                      - path
+                                      type: object
+                                    type: array
+                                    x-kubernetes-list-type: atomic
+                                  name:
+                                    default: ""
+                                    description: |-
+                                      Name of the referent.
+                                      This field is effectively required, but due to backwards compatibility is
+                                      allowed to be empty. Instances of this type with an empty value here are
+                                      almost certainly wrong.
+                                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                    type: string
+                                  optional:
+                                    description: optional field specify whether the
+                                      Secret or its key must be defined
+                                    type: boolean
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              serviceAccountToken:
+                                description: serviceAccountToken is information about
+                                  the serviceAccountToken data to project
+                                properties:
+                                  audience:
+                                    description: |-
+                                      audience is the intended audience of the token. A recipient of a token
+                                      must identify itself with an identifier specified in the audience of the
+                                      token, and otherwise should reject the token. The audience defaults to the
+                                      identifier of the apiserver.
+                                    type: string
+                                  expirationSeconds:
+                                    description: |-
+                                      expirationSeconds is the requested duration of validity of the service
+                                      account token. As the token approaches expiration, the kubelet volume
+                                      plugin will proactively rotate the service account token. The kubelet will
+                                      start trying to rotate the token if the token is older than 80 percent of
+                                      its time to live or if the token is older than 24 hours.Defaults to 1 hour
+                                      and must be at least 10 minutes.
+                                    format: int64
+                                    type: integer
+                                  path:
+                                    description: |-
+                                      path is the path relative to the mount point of the file to project the
+                                      token into.
+                                    type: string
+                                required:
+                                - path
+                                type: object
+                            type: object
+                          type: array
+                          x-kubernetes-list-type: atomic
+                      type: object
+                    quobyte:
+                      description: |-
+                        quobyte represents a Quobyte mount on the host that shares a pod's lifetime.
+                        Deprecated: Quobyte is deprecated and the in-tree quobyte type is no longer supported.
+                      properties:
+                        group:
+                          description: |-
+                            group to map volume access to
+                            Default is no group
+                          type: string
+                        readOnly:
+                          description: |-
+                            readOnly here will force the Quobyte volume to be mounted with read-only permissions.
+                            Defaults to false.
+                          type: boolean
+                        registry:
+                          description: |-
+                            registry represents a single or multiple Quobyte Registry services
+                            specified as a string as host:port pair (multiple entries are separated with commas)
+                            which acts as the central registry for volumes
+                          type: string
+                        tenant:
+                          description: |-
+                            tenant owning the given Quobyte volume in the Backend
+                            Used with dynamically provisioned Quobyte volumes, value is set by the plugin
+                          type: string
+                        user:
+                          description: |-
+                            user to map volume access to
+                            Defaults to serivceaccount user
+                          type: string
+                        volume:
+                          description: volume is a string that references an already
+                            created Quobyte volume by name.
+                          type: string
+                      required:
+                      - registry
+                      - volume
+                      type: object
+                    rbd:
+                      description: |-
+                        rbd represents a Rados Block Device mount on the host that shares a pod's lifetime.
+                        Deprecated: RBD is deprecated and the in-tree rbd type is no longer supported.
+                      properties:
+                        fsType:
+                          description: |-
+                            fsType is the filesystem type of the volume that you want to mount.
+                            Tip: Ensure that the filesystem type is supported by the host operating system.
+                            Examples: "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
+                            More info: https://kubernetes.io/docs/concepts/storage/volumes#rbd
+                          type: string
+                        image:
+                          description: |-
+                            image is the rados image name.
+                            More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it
+                          type: string
+                        keyring:
+                          default: /etc/ceph/keyring
+                          description: |-
+                            keyring is the path to key ring for RBDUser.
+                            Default is /etc/ceph/keyring.
+                            More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it
+                          type: string
+                        monitors:
+                          description: |-
+                            monitors is a collection of Ceph monitors.
+                            More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it
+                          items:
+                            type: string
+                          type: array
+                          x-kubernetes-list-type: atomic
+                        pool:
+                          default: rbd
+                          description: |-
+                            pool is the rados pool name.
+                            Default is rbd.
+                            More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it
+                          type: string
+                        readOnly:
+                          description: |-
+                            readOnly here will force the ReadOnly setting in VolumeMounts.
+                            Defaults to false.
+                            More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it
+                          type: boolean
+                        secretRef:
+                          description: |-
+                            secretRef is name of the authentication secret for RBDUser. If provided
+                            overrides keyring.
+                            Default is nil.
+                            More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it
+                          properties:
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        user:
+                          default: admin
+                          description: |-
+                            user is the rados user name.
+                            Default is admin.
+                            More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it
+                          type: string
+                      required:
+                      - image
+                      - monitors
+                      type: object
+                    scaleIO:
+                      description: |-
+                        scaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.
+                        Deprecated: ScaleIO is deprecated and the in-tree scaleIO type is no longer supported.
+                      properties:
+                        fsType:
+                          default: xfs
+                          description: |-
+                            fsType is the filesystem type to mount.
+                            Must be a filesystem type supported by the host operating system.
+                            Ex. "ext4", "xfs", "ntfs".
+                            Default is "xfs".
+                          type: string
+                        gateway:
+                          description: gateway is the host address of the ScaleIO
+                            API Gateway.
+                          type: string
+                        protectionDomain:
+                          description: protectionDomain is the name of the ScaleIO
+                            Protection Domain for the configured storage.
+                          type: string
+                        readOnly:
+                          description: |-
+                            readOnly Defaults to false (read/write). ReadOnly here will force
+                            the ReadOnly setting in VolumeMounts.
+                          type: boolean
+                        secretRef:
+                          description: |-
+                            secretRef references to the secret for ScaleIO user and other
+                            sensitive information. If this is not provided, Login operation will fail.
+                          properties:
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        sslEnabled:
+                          description: sslEnabled Flag enable/disable SSL communication
+                            with Gateway, default false
+                          type: boolean
+                        storageMode:
+                          default: ThinProvisioned
+                          description: |-
+                            storageMode indicates whether the storage for a volume should be ThickProvisioned or ThinProvisioned.
+                            Default is ThinProvisioned.
+                          type: string
+                        storagePool:
+                          description: storagePool is the ScaleIO Storage Pool associated
+                            with the protection domain.
+                          type: string
+                        system:
+                          description: system is the name of the storage system as
+                            configured in ScaleIO.
+                          type: string
+                        volumeName:
+                          description: |-
+                            volumeName is the name of a volume already created in the ScaleIO system
+                            that is associated with this volume source.
+                          type: string
+                      required:
+                      - gateway
+                      - secretRef
+                      - system
+                      type: object
+                    secret:
+                      description: |-
+                        secret represents a secret that should populate this volume.
+                        More info: https://kubernetes.io/docs/concepts/storage/volumes#secret
+                      properties:
+                        defaultMode:
+                          description: |-
+                            defaultMode is Optional: mode bits used to set permissions on created files by default.
+                            Must be an octal value between 0000 and 0777 or a decimal value between 0 and 511.
+                            YAML accepts both octal and decimal values, JSON requires decimal values
+                            for mode bits. Defaults to 0644.
+                            Directories within the path are not affected by this setting.
+                            This might be in conflict with other options that affect the file
+                            mode, like fsGroup, and the result can be other mode bits set.
+                          format: int32
+                          type: integer
+                        items:
+                          description: |-
+                            items If unspecified, each key-value pair in the Data field of the referenced
+                            Secret will be projected into the volume as a file whose name is the
+                            key and content is the value. If specified, the listed keys will be
+                            projected into the specified paths, and unlisted keys will not be
+                            present. If a key is specified which is not present in the Secret,
+                            the volume setup will error unless it is marked optional. Paths must be
+                            relative and may not contain the '..' path or start with '..'.
+                          items:
+                            description: Maps a string key to a path within a volume.
+                            properties:
+                              key:
+                                description: key is the key to project.
+                                type: string
+                              mode:
+                                description: |-
+                                  mode is Optional: mode bits used to set permissions on this file.
+                                  Must be an octal value between 0000 and 0777 or a decimal value between 0 and 511.
+                                  YAML accepts both octal and decimal values, JSON requires decimal values for mode bits.
+                                  If not specified, the volume defaultMode will be used.
+                                  This might be in conflict with other options that affect the file
+                                  mode, like fsGroup, and the result can be other mode bits set.
+                                format: int32
+                                type: integer
+                              path:
+                                description: |-
+                                  path is the relative path of the file to map the key to.
+                                  May not be an absolute path.
+                                  May not contain the path element '..'.
+                                  May not start with the string '..'.
+                                type: string
+                            required:
+                            - key
+                            - path
+                            type: object
+                          type: array
+                          x-kubernetes-list-type: atomic
+                        optional:
+                          description: optional field specify whether the Secret or
+                            its keys must be defined
+                          type: boolean
+                        secretName:
+                          description: |-
+                            secretName is the name of the secret in the pod's namespace to use.
+                            More info: https://kubernetes.io/docs/concepts/storage/volumes#secret
+                          type: string
+                      type: object
+                    storageos:
+                      description: |-
+                        storageOS represents a StorageOS volume attached and mounted on Kubernetes nodes.
+                        Deprecated: StorageOS is deprecated and the in-tree storageos type is no longer supported.
+                      properties:
+                        fsType:
+                          description: |-
+                            fsType is the filesystem type to mount.
+                            Must be a filesystem type supported by the host operating system.
+                            Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
+                          type: string
+                        readOnly:
+                          description: |-
+                            readOnly defaults to false (read/write). ReadOnly here will force
+                            the ReadOnly setting in VolumeMounts.
+                          type: boolean
+                        secretRef:
+                          description: |-
+                            secretRef specifies the secret to use for obtaining the StorageOS API
+                            credentials.  If not specified, default values will be attempted.
+                          properties:
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        volumeName:
+                          description: |-
+                            volumeName is the human-readable name of the StorageOS volume.  Volume
+                            names are only unique within a namespace.
+                          type: string
+                        volumeNamespace:
+                          description: |-
+                            volumeNamespace specifies the scope of the volume within StorageOS.  If no
+                            namespace is specified then the Pod's namespace will be used.  This allows the
+                            Kubernetes name scoping to be mirrored within StorageOS for tighter integration.
+                            Set VolumeName to any name to override the default behaviour.
+                            Set to "default" if you are not using namespaces within StorageOS.
+                            Namespaces that do not pre-exist within StorageOS will be created.
+                          type: string
+                      type: object
+                    vsphereVolume:
+                      description: |-
+                        vsphereVolume represents a vSphere volume attached and mounted on kubelets host machine.
+                        Deprecated: VsphereVolume is deprecated. All operations for the in-tree vsphereVolume type
+                        are redirected to the csi.vsphere.vmware.com CSI driver.
+                      properties:
+                        fsType:
+                          description: |-
+                            fsType is filesystem type to mount.
+                            Must be a filesystem type supported by the host operating system.
+                            Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
+                          type: string
+                        storagePolicyID:
+                          description: storagePolicyID is the storage Policy Based
+                            Management (SPBM) profile ID associated with the StoragePolicyName.
+                          type: string
+                        storagePolicyName:
+                          description: storagePolicyName is the storage Policy Based
+                            Management (SPBM) profile name.
+                          type: string
+                        volumePath:
+                          description: volumePath is the path that identifies vSphere
+                            volume vmdk
+                          type: string
+                      required:
+                      - volumePath
+                      type: object
+                  required:
+                  - name
+                  type: object
+                type: array
+              web:
+                description: web defines the configuration of the ThanosRuler web
+                  server.
+                properties:
+                  httpConfig:
+                    description: httpConfig defines HTTP parameters for web server.
+                    properties:
+                      headers:
+                        description: headers defines a list of headers that can be
+                          added to HTTP responses.
+                        properties:
+                          contentSecurityPolicy:
+                            description: |-
+                              contentSecurityPolicy defines the Content-Security-Policy header to HTTP responses.
+                              Unset if blank.
+                            type: string
+                          strictTransportSecurity:
+                            description: |-
+                              strictTransportSecurity defines the Strict-Transport-Security header to HTTP responses.
+                              Unset if blank.
+                              Please make sure that you use this with care as this header might force
+                              browsers to load Prometheus and the other applications hosted on the same
+                              domain and subdomains over HTTPS.
+                              https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Strict-Transport-Security
+                            type: string
+                          xContentTypeOptions:
+                            description: |-
+                              xContentTypeOptions defines the X-Content-Type-Options header to HTTP responses.
+                              Unset if blank. Accepted value is nosniff.
+                              https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-Content-Type-Options
+                            enum:
+                            - ""
+                            - NoSniff
+                            type: string
+                          xFrameOptions:
+                            description: |-
+                              xFrameOptions defines the X-Frame-Options header to HTTP responses.
+                              Unset if blank. Accepted values are deny and sameorigin.
+                              https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-Frame-Options
+                            enum:
+                            - ""
+                            - Deny
+                            - SameOrigin
+                            type: string
+                          xXSSProtection:
+                            description: |-
+                              xXSSProtection defines the X-XSS-Protection header to all responses.
+                              Unset if blank.
+                              https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-XSS-Protection
+                            type: string
+                        type: object
+                      http2:
+                        description: |-
+                          http2 enable HTTP/2 support. Note that HTTP/2 is only supported with TLS.
+                          When TLSConfig is not configured, HTTP/2 will be disabled.
+                          Whenever the value of the field changes, a rolling update will be triggered.
+                        type: boolean
+                    type: object
+                  tlsConfig:
+                    description: tlsConfig defines the TLS parameters for HTTPS.
+                    properties:
+                      cert:
+                        description: |-
+                          cert defines the Secret or ConfigMap containing the TLS certificate for the web server.
+
+                          Either `keySecret` or `keyFile` must be defined.
+
+                          It is mutually exclusive with `certFile`.
+                        properties:
+                          configMap:
+                            description: configMap defines the ConfigMap containing
+                              data to use for the targets.
+                            properties:
+                              key:
+                                description: The key to select.
+                                type: string
+                              name:
+                                default: ""
+                                description: |-
+                                  Name of the referent.
+                                  This field is effectively required, but due to backwards compatibility is
+                                  allowed to be empty. Instances of this type with an empty value here are
+                                  almost certainly wrong.
+                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                type: string
+                              optional:
+                                description: Specify whether the ConfigMap or its
+                                  key must be defined
+                                type: boolean
+                            required:
+                            - key
+                            type: object
+                            x-kubernetes-map-type: atomic
+                          secret:
+                            description: secret defines the Secret containing data
+                              to use for the targets.
+                            properties:
+                              key:
+                                description: The key of the secret to select from.  Must
+                                  be a valid secret key.
+                                type: string
+                              name:
+                                default: ""
+                                description: |-
+                                  Name of the referent.
+                                  This field is effectively required, but due to backwards compatibility is
+                                  allowed to be empty. Instances of this type with an empty value here are
+                                  almost certainly wrong.
+                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                type: string
+                              optional:
+                                description: Specify whether the Secret or its key
+                                  must be defined
+                                type: boolean
+                            required:
+                            - key
+                            type: object
+                            x-kubernetes-map-type: atomic
+                        type: object
+                      certFile:
+                        description: |-
+                          certFile defines the path to the TLS certificate file in the container for the web server.
+
+                          Either `keySecret` or `keyFile` must be defined.
+
+                          It is mutually exclusive with `cert`.
+                        type: string
+                      cipherSuites:
+                        description: |-
+                          cipherSuites defines the list of supported cipher suites for TLS versions up to TLS 1.2.
+
+                          If not defined, the Go default cipher suites are used.
+                          Available cipher suites are documented in the Go documentation:
+                          https://golang.org/pkg/crypto/tls/#pkg-constants
+                        items:
+                          type: string
+                        type: array
+                      client_ca:
+                        description: |-
+                          client_ca defines the Secret or ConfigMap containing the CA certificate for client certificate
+                          authentication to the server.
+
+                          It is mutually exclusive with `clientCAFile`.
+                        properties:
+                          configMap:
+                            description: configMap defines the ConfigMap containing
+                              data to use for the targets.
+                            properties:
+                              key:
+                                description: The key to select.
+                                type: string
+                              name:
+                                default: ""
+                                description: |-
+                                  Name of the referent.
+                                  This field is effectively required, but due to backwards compatibility is
+                                  allowed to be empty. Instances of this type with an empty value here are
+                                  almost certainly wrong.
+                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                type: string
+                              optional:
+                                description: Specify whether the ConfigMap or its
+                                  key must be defined
+                                type: boolean
+                            required:
+                            - key
+                            type: object
+                            x-kubernetes-map-type: atomic
+                          secret:
+                            description: secret defines the Secret containing data
+                              to use for the targets.
+                            properties:
+                              key:
+                                description: The key of the secret to select from.  Must
+                                  be a valid secret key.
+                                type: string
+                              name:
+                                default: ""
+                                description: |-
+                                  Name of the referent.
+                                  This field is effectively required, but due to backwards compatibility is
+                                  allowed to be empty. Instances of this type with an empty value here are
+                                  almost certainly wrong.
+                                  More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                type: string
+                              optional:
+                                description: Specify whether the Secret or its key
+                                  must be defined
+                                type: boolean
+                            required:
+                            - key
+                            type: object
+                            x-kubernetes-map-type: atomic
+                        type: object
+                      clientAuthType:
+                        description: |-
+                          clientAuthType defines the server policy for client TLS authentication.
+
+                          For more detail on clientAuth options:
+                          https://golang.org/pkg/crypto/tls/#ClientAuthType
+                        type: string
+                      clientCAFile:
+                        description: |-
+                          clientCAFile defines the path to the CA certificate file for client certificate authentication to
+                          the server.
+
+                          It is mutually exclusive with `client_ca`.
+                        type: string
+                      curvePreferences:
+                        description: |-
+                          curvePreferences defines elliptic curves that will be used in an ECDHE handshake, in preference
+                          order.
+
+                          Available curves are documented in the Go documentation:
+                          https://golang.org/pkg/crypto/tls/#CurveID
+                        items:
+                          type: string
+                        type: array
+                      keyFile:
+                        description: |-
+                          keyFile defines the path to the TLS private key file in the container for the web server.
+
+                          If defined, either `cert` or `certFile` must be defined.
+
+                          It is mutually exclusive with `keySecret`.
+                        type: string
+                      keySecret:
+                        description: |-
+                          keySecret defines the secret containing the TLS private key for the web server.
+
+                          Either `cert` or `certFile` must be defined.
+
+                          It is mutually exclusive with `keyFile`.
+                        properties:
+                          key:
+                            description: The key of the secret to select from.  Must
+                              be a valid secret key.
+                            type: string
+                          name:
+                            default: ""
+                            description: |-
+                              Name of the referent.
+                              This field is effectively required, but due to backwards compatibility is
+                              allowed to be empty. Instances of this type with an empty value here are
+                              almost certainly wrong.
+                              More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                            type: string
+                          optional:
+                            description: Specify whether the Secret or its key must
+                              be defined
+                            type: boolean
+                        required:
+                        - key
+                        type: object
+                        x-kubernetes-map-type: atomic
+                      maxVersion:
+                        description: maxVersion defines the Maximum TLS version that
+                          is acceptable.
+                        type: string
+                      minVersion:
+                        description: minVersion defines the minimum TLS version that
+                          is acceptable.
+                        type: string
+                      preferServerCipherSuites:
+                        description: |-
+                          preferServerCipherSuites defines whether the server selects the client's most preferred cipher
+                          suite, or the server's most preferred cipher suite.
+
+                          If true then the server's preference, as expressed in
+                          the order of elements in cipherSuites, is used.
+                        type: boolean
+                    type: object
+                type: object
+            type: object
+          status:
+            description: |-
+              status defines the most recent observed status of the ThanosRuler cluster. Read-only.
+              More info:
+              https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#spec-and-status
+            properties:
+              availableReplicas:
+                description: |-
+                  availableReplicas defines the total number of available pods (ready for at least minReadySeconds)
+                  targeted by this ThanosRuler deployment.
+                format: int32
+                type: integer
+              conditions:
+                description: conditions defines the current state of the ThanosRuler
+                  object.
+                items:
+                  description: |-
+                    Condition represents the state of the resources associated with the
+                    Prometheus, Alertmanager or ThanosRuler resource.
+                  properties:
+                    lastTransitionTime:
+                      description: lastTransitionTime is the time of the last update
+                        to the current status property.
+                      format: date-time
+                      type: string
+                    message:
+                      description: message defines human-readable message indicating
+                        details for the condition's last transition.
+                      type: string
+                    observedGeneration:
+                      description: |-
+                        observedGeneration defines the .metadata.generation that the
+                        condition was set based upon. For instance, if `.metadata.generation` is
+                        currently 12, but the `.status.conditions[].observedGeneration` is 9, the
+                        condition is out of date with respect to the current state of the
+                        instance.
+                      format: int64
+                      type: integer
+                    reason:
+                      description: reason for the condition's last transition.
+                      type: string
+                    status:
+                      description: status of the condition.
+                      minLength: 1
+                      type: string
+                    type:
+                      description: type of the condition being reported.
+                      minLength: 1
+                      type: string
+                  required:
+                  - lastTransitionTime
+                  - status
+                  - type
+                  type: object
+                type: array
+                x-kubernetes-list-map-keys:
+                - type
+                x-kubernetes-list-type: map
+              paused:
+                description: |-
+                  paused defines whether any actions on the underlying managed objects are
+                  being performed. Only delete actions will be performed.
+                type: boolean
+              replicas:
+                description: |-
+                  replicas defines the total number of non-terminated pods targeted by this ThanosRuler deployment
+                  (their labels match the selector).
+                format: int32
+                type: integer
+              unavailableReplicas:
+                description: unavailableReplicas defines the total number of unavailable
+                  pods targeted by this ThanosRuler deployment.
+                format: int32
+                type: integer
+              updatedReplicas:
+                description: |-
+                  updatedReplicas defines the total number of non-terminated pods targeted by this ThanosRuler deployment
+                  that have the desired version spec.
+                format: int32
+                type: integer
+            type: object
+        required:
+        - spec
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}
+{{- end -}}
diff --git a/packages/system/prometheus-operator-crds/tests/resource_policy_test.yaml b/packages/system/prometheus-operator-crds/tests/resource_policy_test.yaml
new file mode 100644
index 0000000000..8c2a2cb991
--- /dev/null
+++ b/packages/system/prometheus-operator-crds/tests/resource_policy_test.yaml
@@ -0,0 +1,142 @@
+# The tenant addon HelmRelease that ships this chart remediates a failed
+# install by uninstalling the release, and an uninstall deletes whatever the
+# chart rendered. Deleting a CRD makes the API server garbage-collect every
+# custom resource of that kind, so an unannotated CRD here costs the cluster
+# every ServiceMonitor, PodMonitor, PrometheusRule and ScrapeConfig it holds.
+#
+# The CRDs come from a vendored subchart that `make update` re-pulls, so the
+# annotation is set through values rather than by editing the templates. The
+# first case scopes to no template at all, so it holds every document the
+# chart renders, including a CRD the subchart starts shipping later. The named
+# cases pin the document count and the CRD name, so an assertion cannot pass
+# against a document it was not meant to inspect.
+suite: Prometheus Operator CRDs survive a release uninstall
+tests:
+  - it: annotates every CustomResourceDefinition the chart renders
+    asserts:
+      - equal:
+          path: kind
+          value: CustomResourceDefinition
+      - equal:
+          path: metadata.annotations["helm.sh/resource-policy"]
+          value: keep
+
+  - it: keeps the alertmanagerconfigs CRD
+    template: charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagerconfigs.yaml
+    asserts:
+      - hasDocuments:
+          count: 1
+      - equal:
+          path: metadata.name
+          value: alertmanagerconfigs.monitoring.coreos.com
+      - equal:
+          path: metadata.annotations["helm.sh/resource-policy"]
+          value: keep
+
+  - it: keeps the alertmanagers CRD
+    template: charts/prometheus-operator-crds/charts/crds/templates/crd-alertmanagers.yaml
+    asserts:
+      - hasDocuments:
+          count: 1
+      - equal:
+          path: metadata.name
+          value: alertmanagers.monitoring.coreos.com
+      - equal:
+          path: metadata.annotations["helm.sh/resource-policy"]
+          value: keep
+
+  - it: keeps the podmonitors CRD
+    template: charts/prometheus-operator-crds/charts/crds/templates/crd-podmonitors.yaml
+    asserts:
+      - hasDocuments:
+          count: 1
+      - equal:
+          path: metadata.name
+          value: podmonitors.monitoring.coreos.com
+      - equal:
+          path: metadata.annotations["helm.sh/resource-policy"]
+          value: keep
+
+  - it: keeps the probes CRD
+    template: charts/prometheus-operator-crds/charts/crds/templates/crd-probes.yaml
+    asserts:
+      - hasDocuments:
+          count: 1
+      - equal:
+          path: metadata.name
+          value: probes.monitoring.coreos.com
+      - equal:
+          path: metadata.annotations["helm.sh/resource-policy"]
+          value: keep
+
+  - it: keeps the prometheusagents CRD
+    template: charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusagents.yaml
+    asserts:
+      - hasDocuments:
+          count: 1
+      - equal:
+          path: metadata.name
+          value: prometheusagents.monitoring.coreos.com
+      - equal:
+          path: metadata.annotations["helm.sh/resource-policy"]
+          value: keep
+
+  - it: keeps the prometheuses CRD
+    template: charts/prometheus-operator-crds/charts/crds/templates/crd-prometheuses.yaml
+    asserts:
+      - hasDocuments:
+          count: 1
+      - equal:
+          path: metadata.name
+          value: prometheuses.monitoring.coreos.com
+      - equal:
+          path: metadata.annotations["helm.sh/resource-policy"]
+          value: keep
+
+  - it: keeps the prometheusrules CRD
+    template: charts/prometheus-operator-crds/charts/crds/templates/crd-prometheusrules.yaml
+    asserts:
+      - hasDocuments:
+          count: 1
+      - equal:
+          path: metadata.name
+          value: prometheusrules.monitoring.coreos.com
+      - equal:
+          path: metadata.annotations["helm.sh/resource-policy"]
+          value: keep
+
+  - it: keeps the scrapeconfigs CRD
+    template: charts/prometheus-operator-crds/charts/crds/templates/crd-scrapeconfigs.yaml
+    asserts:
+      - hasDocuments:
+          count: 1
+      - equal:
+          path: metadata.name
+          value: scrapeconfigs.monitoring.coreos.com
+      - equal:
+          path: metadata.annotations["helm.sh/resource-policy"]
+          value: keep
+
+  - it: keeps the servicemonitors CRD
+    template: charts/prometheus-operator-crds/charts/crds/templates/crd-servicemonitors.yaml
+    asserts:
+      - hasDocuments:
+          count: 1
+      - equal:
+          path: metadata.name
+          value: servicemonitors.monitoring.coreos.com
+      - equal:
+          path: metadata.annotations["helm.sh/resource-policy"]
+          value: keep
+
+  - it: keeps the thanosrulers CRD
+    template: charts/prometheus-operator-crds/charts/crds/templates/crd-thanosrulers.yaml
+    asserts:
+      - hasDocuments:
+          count: 1
+      - equal:
+          path: metadata.name
+          value: thanosrulers.monitoring.coreos.com
+      - equal:
+          path: metadata.annotations["helm.sh/resource-policy"]
+          value: keep
diff --git a/packages/system/prometheus-operator-crds/values.yaml b/packages/system/prometheus-operator-crds/values.yaml
index e69de29bb2..f06fc91c57 100644
--- a/packages/system/prometheus-operator-crds/values.yaml
+++ b/packages/system/prometheus-operator-crds/values.yaml
@@ -0,0 +1,9 @@
+prometheus-operator-crds:
+  crds:
+    # Keep the CRDs on a chart uninstall. Without this a failed install that
+    # remediates by uninstalling takes the definitions with it, and the API
+    # server then garbage-collects every ServiceMonitor, PodMonitor,
+    # PrometheusRule and ScrapeConfig in the cluster. Removing this release on
+    # purpose now leaves the definitions behind to be deleted by hand.
+    annotations:
+      helm.sh/resource-policy: keep
diff --git a/packages/system/proxmox-csi/Chart.yaml b/packages/system/proxmox-csi/Chart.yaml
new file mode 100644
index 0000000000..b2c2fe4016
--- /dev/null
+++ b/packages/system/proxmox-csi/Chart.yaml
@@ -0,0 +1,7 @@
+apiVersion: v2
+name: cozy-proxmox-csi
+version: 0.0.0 # Placeholder, the actual version will be automatically set during the build process
+dependencies:
+  - name: proxmox-csi-plugin
+    version: "*"
+    repository: ""
diff --git a/packages/system/proxmox-csi/Makefile b/packages/system/proxmox-csi/Makefile
new file mode 100644
index 0000000000..7a614532a0
--- /dev/null
+++ b/packages/system/proxmox-csi/Makefile
@@ -0,0 +1,15 @@
+export NAME=proxmox-csi
+export NAMESPACE=csi-proxmox
+
+# Pinned deliberately. The chart carries the CSI driver image, and a driver
+# newer than the Proxmox API it talks to fails at volume attach rather than at
+# install, so the pair is bumped together and tested, not tracked.
+CHART_VERSION=0.5.12
+
+include ../../../hack/package.mk
+
+update:
+	rm -rf charts
+	mkdir -p charts
+	helm pull oci://ghcr.io/sergelogvinov/charts/proxmox-csi-plugin \
+	  --version $(CHART_VERSION) --untar --untardir charts
diff --git a/packages/system/proxmox-csi/charts/proxmox-csi-plugin/.helmignore b/packages/system/proxmox-csi/charts/proxmox-csi-plugin/.helmignore
new file mode 100644
index 0000000000..84f7a8d72c
--- /dev/null
+++ b/packages/system/proxmox-csi/charts/proxmox-csi-plugin/.helmignore
@@ -0,0 +1,25 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/
+#
+README.md.gotmpl
diff --git a/packages/system/proxmox-csi/charts/proxmox-csi-plugin/Chart.yaml b/packages/system/proxmox-csi/charts/proxmox-csi-plugin/Chart.yaml
new file mode 100644
index 0000000000..e0cee4be0c
--- /dev/null
+++ b/packages/system/proxmox-csi/charts/proxmox-csi-plugin/Chart.yaml
@@ -0,0 +1,19 @@
+apiVersion: v2
+appVersion: v0.20.0
+description: Container Storage Interface plugin for Proxmox
+home: https://github.com/sergelogvinov/proxmox-csi-plugin
+icon: https://raw.githubusercontent.com/sergelogvinov/proxmox-csi-plugin/main/charts/proxmox-csi-plugin/icon.png
+keywords:
+- csi
+- storage
+- block-storage
+- volume
+- proxmox
+maintainers:
+- name: sergelogvinov
+  url: https://github.com/sergelogvinov
+name: proxmox-csi-plugin
+sources:
+- https://github.com/sergelogvinov/proxmox-csi-plugin
+type: application
+version: 0.5.12
diff --git a/packages/system/proxmox-csi/charts/proxmox-csi-plugin/README.md b/packages/system/proxmox-csi/charts/proxmox-csi-plugin/README.md
new file mode 100644
index 0000000000..e6ab7017da
--- /dev/null
+++ b/packages/system/proxmox-csi/charts/proxmox-csi-plugin/README.md
@@ -0,0 +1,164 @@
+# proxmox-csi-plugin
+
+![Version: 0.5.12](https://img.shields.io/badge/Version-0.5.12-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.20.0](https://img.shields.io/badge/AppVersion-v0.20.0-informational?style=flat-square)
+
+Container Storage Interface plugin for Proxmox
+
+The Container Storage Interface (CSI) plugin is a specification designed to standardize the way container orchestration systems like Kubernetes, interact with different storage systems. The CSI plugin abstracts the underlying storage, enabling the seamless integration of different storage solutions (such as local block devices, file systems, or cloud-based storage) with containerized applications.
+
+This plugin allows Kubernetes to use `Proxmox VE` storage as a persistent storage solution for stateful applications.
+Supported storage types:
+- Directory
+- LVM
+- LVM-thin
+- ZFS
+- NFS
+- Ceph
+
+**Homepage:** <https://github.com/sergelogvinov/proxmox-csi-plugin>
+
+## Maintainers
+
+| Name | Email | Url |
+| ---- | ------ | --- |
+| sergelogvinov |  | <https://github.com/sergelogvinov> |
+
+## Source Code
+
+* <https://github.com/sergelogvinov/proxmox-csi-plugin>
+
+## Proxmox permissions
+
+```shell
+# Create role CSI
+pveum role add CSI -privs "VM.Audit VM.Config.Disk Datastore.Allocate Datastore.AllocateSpace Datastore.Audit"
+# Or if you need to use Replication feature (zfs replication)
+pveum role add CSI -privs "VM.Audit VM.Allocate VM.Clone VM.Config.CPU VM.Config.Disk VM.Config.HWType VM.Config.Memory VM.Config.Options VM.Migrate VM.PowerMgmt Datastore.Allocate Datastore.AllocateSpace Datastore.Audit"
+
+# Create user and grant permissions
+pveum user add kubernetes-csi@pve
+pveum aclmod / -user kubernetes-csi@pve -role CSI
+pveum user token add kubernetes-csi@pve csi -privsep 0
+```
+
+## Helm values example
+
+```yaml
+# proxmox-csi.yaml
+
+config:
+  clusters:
+    - url: https://cluster-api-1.exmple.com:8006/api2/json
+      insecure: false
+      token_id: "kubernetes-csi@pve!csi"
+      token_secret: "key"
+      region: cluster-1
+
+# Deploy Node CSI driver only on proxmox nodes
+node:
+  nodeSelector:
+    # It will work only with Talos CCM, remove it overwise
+    node.cloudprovider.kubernetes.io/platform: nocloud
+  tolerations:
+    - operator: Exists
+
+# Deploy CSI controller only on control-plane nodes
+nodeSelector:
+  node-role.kubernetes.io/control-plane: ""
+tolerations:
+  - key: node-role.kubernetes.io/control-plane
+    effect: NoSchedule
+
+# Define storage classes
+# See https://pve.proxmox.com/wiki/Storage
+storageClass:
+  - name: proxmox-data-xfs
+    storage: data
+    reclaimPolicy: Delete
+    fstype: xfs
+  - name: proxmox-data
+    storage: data
+    reclaimPolicy: Delete
+    fstype: ext4
+    cache: writethrough
+```
+
+## Deploy
+
+```shell
+# Prepare namespace
+kubectl create ns csi-proxmox
+kubectl label ns csi-proxmox pod-security.kubernetes.io/enforce=privileged
+# Install Proxmox CSI plugin
+helm upgrade -i --namespace=csi-proxmox -f proxmox-csi.yaml \
+    proxmox-csi-plugin oci://ghcr.io/sergelogvinov/charts/proxmox-csi-plugin
+```
+
+## Values
+
+| Key | Type | Default | Description |
+|-----|------|---------|-------------|
+| replicaCount | int | `1` |  |
+| imagePullSecrets | list | `[]` |  |
+| nameOverride | string | `""` |  |
+| fullnameOverride | string | `""` |  |
+| createNamespace | bool | `false` | Create namespace. Very useful when using helm template. |
+| priorityClassName | string | `"system-cluster-critical"` | Controller pods priorityClassName. |
+| serviceAccount | object | `{"annotations":{},"create":true,"name":""}` | Pods Service Account. ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/ |
+| provisionerName | string | `"csi.proxmox.sinextra.dev"` | CSI Driver provisioner name. Currently, cannot be customized. |
+| clusterID | string | `"kubernetes"` | Cluster name. Currently, cannot be customized. |
+| logVerbosityLevel | int | `5` | Log verbosity level. See https://github.com/kubernetes/community/blob/master/contributors/devel/sig-instrumentation/logging.md for description of individual verbosity levels. |
+| timeout | string | `"3m"` | Connection timeout between sidecars. |
+| options.enableCapacity | bool | `true` | Enable or disable capacity feature. ref: https://github.com/kubernetes-csi/external-provisioner |
+| existingConfigSecret | string | `nil` | Proxmox cluster config stored in secrets. |
+| existingConfigSecretKey | string | `"config.yaml"` | Proxmox cluster config stored in secrets key. |
+| configFile | string | `"/etc/proxmox/config.yaml"` | Proxmox cluster config path. |
+| config | object | `{"clusters":[],"features":{"provider":"default"}}` | Proxmox cluster config. ref: https://github.com/sergelogvinov/proxmox-csi-plugin/blob/main/docs/install.md |
+| storageClass | list | `[]` | Storage class definition. |
+| controller.podAnnotations | object | `{}` | Annotations for controller pod. ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/ |
+| controller.podLabels | object | `{}` | Labels for controller pod. ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/ |
+| controller.plugin.image | object | `{"pullPolicy":"IfNotPresent","repository":"ghcr.io/sergelogvinov/proxmox-csi-controller","tag":""}` | Controller CSI Driver. |
+| controller.plugin.resources | object | `{"requests":{"cpu":"10m","memory":"16Mi"}}` | Controller resource requests and limits. ref: https://kubernetes.io/docs/user-guide/compute-resources/ |
+| controller.attacher.image | object | `{"pullPolicy":"IfNotPresent","repository":"registry.k8s.io/sig-storage/csi-attacher","tag":"v4.12.0"}` | CSI Attacher. ref: https://github.com/kubernetes-csi/external-attacher |
+| controller.attacher.args | list | `["--default-fstype=ext4"]` | Attacher arguments. example: --default-fstype=ext4 |
+| controller.attacher.resources | object | `{"requests":{"cpu":"10m","memory":"16Mi"}}` | Attacher resource requests and limits. ref: https://kubernetes.io/docs/user-guide/compute-resources/ |
+| controller.provisioner.image | object | `{"pullPolicy":"IfNotPresent","repository":"registry.k8s.io/sig-storage/csi-provisioner","tag":"v6.3.0"}` | CSI Provisioner. ref: https://github.com/kubernetes-csi/external-provisioner |
+| controller.provisioner.args | list | `["--default-fstype=ext4"]` | Provisioner arguments. example: --feature-gates=VolumeAttributesClass=true |
+| controller.provisioner.resources | object | `{"requests":{"cpu":"10m","memory":"16Mi"}}` | Provisioner resource requests and limits. ref: https://kubernetes.io/docs/user-guide/compute-resources/ |
+| controller.resizer.image | object | `{"pullPolicy":"IfNotPresent","repository":"registry.k8s.io/sig-storage/csi-resizer","tag":"v2.2.1"}` | CSI Resizer. refs: https://github.com/kubernetes-csi/external-resizer |
+| controller.resizer.args | list | `[]` | Resizer arguments. example: --feature-gates=VolumeAttributesClass=true |
+| controller.resizer.resources | object | `{"requests":{"cpu":"10m","memory":"16Mi"}}` | Resizer resource requests and limits. ref: https://kubernetes.io/docs/user-guide/compute-resources/ |
+| controller.snapshotter.enabled | bool | `false` |  |
+| controller.snapshotter.image | object | `{"pullPolicy":"IfNotPresent","repository":"registry.k8s.io/sig-storage/csi-snapshotter","tag":"v8.6.0"}` | CSI Snapshotter. refs: https://github.com/kubernetes-csi/external-snapshotter |
+| controller.snapshotter.args | list | `[]` | Snapshotter arguments. example: --feature-gates=CSIVolumeGroupSnapshot=true |
+| controller.snapshotter.resources | object | `{"requests":{"cpu":"10m","memory":"16Mi"}}` | Snapshotter resource requests and limits. ref: https://kubernetes.io/docs/user-guide/compute-resources/ |
+| node.plugin.image | object | `{"pullPolicy":"IfNotPresent","repository":"ghcr.io/sergelogvinov/proxmox-csi-node","tag":""}` | Node CSI Driver. |
+| node.plugin.resources | object | `{}` | Node CSI Driver resource requests and limits. ref: https://kubernetes.io/docs/user-guide/compute-resources/ |
+| node.driverRegistrar.image | object | `{"pullPolicy":"IfNotPresent","repository":"registry.k8s.io/sig-storage/csi-node-driver-registrar","tag":"v2.17.0"}` | Node CSI driver registrar. ref: https://github.com/kubernetes-csi/node-driver-registrar |
+| node.driverRegistrar.args | list | `[]` | Driver registrar arguments. example: --timeout=60s |
+| node.driverRegistrar.resources | object | `{"requests":{"cpu":"10m","memory":"16Mi"}}` | Node registrar resource requests and limits. ref: https://kubernetes.io/docs/user-guide/compute-resources/ |
+| node.kubeletDir | string | `"/var/lib/kubelet"` | Location of the /var/lib/kubelet directory as some k8s distribution differ from the standard. Standard: /var/lib/kubelet, k0s: /var/lib/k0s/kubelet, microk8s: /var/snap/microk8s/common/var/lib/kubelet |
+| node.nodeSelector | object | `{}` | Node labels for node-plugin assignment. ref: https://kubernetes.io/docs/user-guide/node-selection/ |
+| node.tolerations | list | `[{"effect":"NoSchedule","key":"karpenter.sh/disrupted","operator":"Exists"},{"effect":"NoSchedule","key":"node.kubernetes.io/unschedulable","operator":"Exists"},{"effect":"NoSchedule","key":"node.kubernetes.io/disk-pressure","operator":"Exists"}]` | Tolerations for node-plugin assignment. ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ |
+| node.affinity | object | `{}` | Affinity for node-plugin assignment. ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity |
+| livenessprobe.image | object | `{"pullPolicy":"IfNotPresent","repository":"registry.k8s.io/sig-storage/livenessprobe","tag":"v2.19.0"}` | Common livenessprobe sidecar. |
+| livenessprobe.failureThreshold | int | `5` | Failure threshold for livenessProbe |
+| livenessprobe.initialDelaySeconds | int | `10` | Initial delay seconds for livenessProbe |
+| livenessprobe.timeoutSeconds | int | `10` | Timeout seconds for livenessProbe |
+| livenessprobe.periodSeconds | int | `60` | Period seconds for livenessProbe |
+| livenessprobe.resources | object | `{"requests":{"cpu":"10m","memory":"16Mi"}}` | Liveness probe resource requests and limits. ref: https://kubernetes.io/docs/user-guide/compute-resources/ |
+| initContainers | list | `[]` | Add additional init containers for the CSI controller pods. ref: https://kubernetes.io/docs/concepts/workloads/pods/init-containers/ |
+| hostAliases | list | `[]` | hostAliases Deployment pod host aliases ref: https://kubernetes.io/docs/tasks/network/customize-hosts-file-for-pods/ |
+| podAnnotations | object | `{}` | Annotations for controller pod. ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/ |
+| podLabels | object | `{}` | Labels for controller pod. ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/ |
+| podSecurityContext | object | `{"fsGroup":65532,"fsGroupChangePolicy":"OnRootMismatch","runAsGroup":65532,"runAsNonRoot":true,"runAsUser":65532}` | Controller Security Context. ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod |
+| securityContext | object | `{"allowPrivilegeEscalation":false,"capabilities":{"drop":["ALL"]},"readOnlyRootFilesystem":true,"seccompProfile":{"type":"RuntimeDefault"}}` | Controller Container Security Context. ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod |
+| updateStrategy | object | `{"rollingUpdate":{"maxUnavailable":1},"type":"RollingUpdate"}` | Controller deployment update strategy type. ref: https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#updating-a-deployment |
+| metrics | object | `{"enabled":false,"port":8080,"type":"annotation"}` | Prometheus metrics |
+| metrics.enabled | bool | `false` | Enable Prometheus metrics. |
+| metrics.port | int | `8080` | Prometheus metrics port. |
+| nodeSelector | object | `{}` | Node labels for controller assignment. ref: https://kubernetes.io/docs/user-guide/node-selection/ |
+| tolerations | list | `[]` | Tolerations for controller assignment. ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ |
+| affinity | object | `{}` | Affinity for controller assignment. ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity |
+| extraVolumes | list | `[]` | Additional volumes for Pods |
+| extraVolumeMounts | list | `[]` |  |
diff --git a/packages/system/proxmox-csi/charts/proxmox-csi-plugin/ci/values.yaml b/packages/system/proxmox-csi/charts/proxmox-csi-plugin/ci/values.yaml
new file mode 100644
index 0000000000..7be53dc361
--- /dev/null
+++ b/packages/system/proxmox-csi/charts/proxmox-csi-plugin/ci/values.yaml
@@ -0,0 +1,25 @@
+
+options:
+  enableCapacity: false
+
+node:
+  nodeSelector:
+    node.cloudprovider.kubernetes.io/platform: nocloud
+  tolerations:
+    - operator: Exists
+
+nodeSelector:
+  node-role.kubernetes.io/control-plane: ""
+tolerations:
+  - key: node-role.kubernetes.io/control-plane
+    effect: NoSchedule
+
+storageClass:
+  - name: proxmox-data-xfs
+    storage: data
+    reclaimPolicy: Delete
+    fstype: xfs
+  - name: proxmox-data
+    storage: data
+    reclaimPolicy: Delete
+    ssd: true
diff --git a/packages/system/proxmox-csi/charts/proxmox-csi-plugin/icon.png b/packages/system/proxmox-csi/charts/proxmox-csi-plugin/icon.png
new file mode 100644
index 0000000000..abe9fdc678
Binary files /dev/null and b/packages/system/proxmox-csi/charts/proxmox-csi-plugin/icon.png differ
diff --git a/packages/system/proxmox-csi/charts/proxmox-csi-plugin/templates/NOTES.txt b/packages/system/proxmox-csi/charts/proxmox-csi-plugin/templates/NOTES.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/system/proxmox-csi/charts/proxmox-csi-plugin/templates/_helpers.tpl b/packages/system/proxmox-csi/charts/proxmox-csi-plugin/templates/_helpers.tpl
new file mode 100644
index 0000000000..2a7f802734
--- /dev/null
+++ b/packages/system/proxmox-csi/charts/proxmox-csi-plugin/templates/_helpers.tpl
@@ -0,0 +1,71 @@
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "proxmox-csi-plugin.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "proxmox-csi-plugin.fullname" -}}
+{{- if .Values.fullnameOverride }}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- $name := default .Chart.Name .Values.nameOverride }}
+{{- if contains $name .Release.Name }}
+{{- .Release.Name | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
+{{- end }}
+{{- end }}
+{{- end }}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "proxmox-csi-plugin.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Common labels
+*/}}
+{{- define "proxmox-csi-plugin.labels" -}}
+helm.sh/chart: {{ include "proxmox-csi-plugin.chart" . }}
+app.kubernetes.io/name: {{ include "proxmox-csi-plugin.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "proxmox-csi-plugin.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "proxmox-csi-plugin.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+app.kubernetes.io/component: controller
+{{- end }}
+
+{{- define "proxmox-csi-plugin-node.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "proxmox-csi-plugin.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+app.kubernetes.io/component: node
+{{- end }}
+
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "proxmox-csi-plugin.serviceAccountName" -}}
+{{- if .Values.serviceAccount.create }}
+{{- default (include "proxmox-csi-plugin.fullname" .) .Values.serviceAccount.name }}
+{{- else }}
+{{- default "default" .Values.serviceAccount.name }}
+{{- end }}
+{{- end }}
diff --git a/packages/system/proxmox-csi/charts/proxmox-csi-plugin/templates/_storage.tpl b/packages/system/proxmox-csi/charts/proxmox-csi-plugin/templates/_storage.tpl
new file mode 100644
index 0000000000..56d2d805a7
--- /dev/null
+++ b/packages/system/proxmox-csi/charts/proxmox-csi-plugin/templates/_storage.tpl
@@ -0,0 +1,13 @@
+{{/*
+storageClass parameters uses to merge the default parameters with the user provided parameters.
+*/}}
+{{- define "storageClass.parameters" -}}
+csi.storage.k8s.io/fstype: {{ default "ext4" .fstype }}
+storage: {{ .storage | required "Proxmox Storage name must be provided." }}
+{{- with .cache }}
+cache: {{ . }}
+{{- end }}
+{{- if .ssd }}
+ssd: {{ .ssd | quote }}
+{{- end }}
+{{- end }}
diff --git a/packages/system/proxmox-csi/charts/proxmox-csi-plugin/templates/controller-clusterrole.yaml b/packages/system/proxmox-csi/charts/proxmox-csi-plugin/templates/controller-clusterrole.yaml
new file mode 100644
index 0000000000..e64540be70
--- /dev/null
+++ b/packages/system/proxmox-csi/charts/proxmox-csi-plugin/templates/controller-clusterrole.yaml
@@ -0,0 +1,65 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: {{ include "proxmox-csi-plugin.fullname" . }}-controller
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "proxmox-csi-plugin.labels" . | nindent 4 }}
+rules:
+  - apiGroups: [""]
+    resources: ["persistentvolumes"]
+    verbs: ["get", "list", "watch", "create", "patch", "delete"]
+  - apiGroups: [""]
+    resources: ["persistentvolumeclaims"]
+    verbs: ["get", "list", "watch", "update"]
+  - apiGroups: [""]
+    resources: ["persistentvolumeclaims/status"]
+    verbs: ["patch"]
+  - apiGroups: [""]
+    resources: ["events"]
+    verbs: ["get","list", "watch", "create", "update", "patch"]
+
+  - apiGroups: ["storage.k8s.io"]
+    resources: ["storageclasses"]
+    verbs: ["get", "list", "watch"]
+  - apiGroups: ["storage.k8s.io"]
+    resources: ["csinodes"]
+    verbs: ["get", "list", "watch"]
+  - apiGroups: ["storage.k8s.io"]
+    resources: ["volumeattributesclasses"]
+    verbs: ["get", "list", "watch"]
+  - apiGroups: [""]
+    resources: ["nodes"]
+    verbs: ["get", "list", "watch"]
+
+  - apiGroups: ["storage.k8s.io"]
+    resources: ["volumeattachments"]
+    verbs: ["get", "list", "watch", "patch"]
+  - apiGroups: ["storage.k8s.io"]
+    resources: ["volumeattachments/status"]
+    verbs: ["patch"]
+
+  - apiGroups: ["snapshot.storage.k8s.io"]
+    resources: ["volumesnapshots"]
+    verbs: ["get", "list", "watch", "update"]
+
+{{- if .Values.controller.snapshotter.enabled }}
+  - apiGroups: ["snapshot.storage.k8s.io"]
+    resources: ["volumesnapshotclasses"]
+    verbs: ["get", "list", "watch"]
+  - apiGroups: ["snapshot.storage.k8s.io"]
+    resources: ["volumesnapshotcontents"]
+    verbs: ["get", "list", "watch", "update", "patch"]
+  - apiGroups: ["snapshot.storage.k8s.io"]
+    resources: ["volumesnapshotcontents/status"]
+    verbs: ["update", "patch"]
+  - apiGroups: ["groupsnapshot.storage.k8s.io"]
+    resources: ["volumegroupsnapshotclasses"]
+    verbs: ["get", "list", "watch"]
+  - apiGroups: ["groupsnapshot.storage.k8s.io"]
+    resources: ["volumegroupsnapshotcontents"]
+    verbs: ["get", "list", "watch", "update", "patch"]
+  - apiGroups: ["groupsnapshot.storage.k8s.io"]
+    resources: ["volumegroupsnapshotcontents/status"]
+    verbs: ["update", "patch"]
+{{- end }}
diff --git a/packages/system/proxmox-csi/charts/proxmox-csi-plugin/templates/controller-deployment.yaml b/packages/system/proxmox-csi/charts/proxmox-csi-plugin/templates/controller-deployment.yaml
new file mode 100644
index 0000000000..2120718d3b
--- /dev/null
+++ b/packages/system/proxmox-csi/charts/proxmox-csi-plugin/templates/controller-deployment.yaml
@@ -0,0 +1,208 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "proxmox-csi-plugin.fullname" . }}-controller
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "proxmox-csi-plugin.labels" . | nindent 4 }}
+spec:
+  replicas: {{ .Values.replicaCount }}
+  strategy:
+    type: {{ .Values.updateStrategy.type }}
+    rollingUpdate:
+      {{- toYaml .Values.updateStrategy.rollingUpdate | nindent 6 }}
+  selector:
+    matchLabels:
+      {{- include "proxmox-csi-plugin.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      annotations:
+        checksum/config: {{ toJson .Values.config | sha256sum }}
+      {{- with default .Values.podAnnotations .Values.controller.podAnnotations }}
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- if and .Values.metrics.enabled (eq .Values.metrics.type "annotation") }}
+        prometheus.io/scrape: "true"
+        prometheus.io/port: {{ .Values.metrics.port | quote }}
+      {{- end }}
+      labels:
+        {{- include "proxmox-csi-plugin.selectorLabels" . | nindent 8 }}
+        {{- with default .Values.podLabels .Values.controller.podLabels -}}
+          {{- toYaml . | nindent 8 }}
+        {{- end }}
+    spec:
+      {{- if .Values.priorityClassName }}
+      priorityClassName: {{ .Values.priorityClassName }}
+      {{- end }}
+      {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      enableServiceLinks: false
+      serviceAccountName: {{ include "proxmox-csi-plugin.serviceAccountName" . }}-controller
+      securityContext:
+        {{- toYaml .Values.podSecurityContext | nindent 8 }}
+      hostAliases: {{- toYaml .Values.hostAliases | nindent 8 }}
+      initContainers: {{- toYaml .Values.initContainers | nindent 8 }}
+      containers:
+        - name: {{ include "proxmox-csi-plugin.fullname" . }}-controller
+          securityContext:
+            {{- toYaml .Values.securityContext | nindent 12 }}
+          image: "{{ .Values.controller.plugin.image.repository }}:{{ .Values.controller.plugin.image.tag | default .Chart.AppVersion }}"
+          imagePullPolicy: {{ .Values.controller.plugin.image.pullPolicy }}
+          args:
+            - "-v={{ .Values.logVerbosityLevel }}"
+            - "--csi-address=unix:///csi/csi.sock"
+            - "--cloud-config={{ .Values.configFile }}"
+            {{- if .Values.metrics.enabled }}
+            - "--metrics-address=:{{ .Values.metrics.port }}"
+            {{- end }}
+          ports:
+            {{- if .Values.metrics.enabled }}
+            - name: metrics
+              containerPort: {{ .Values.metrics.port }}
+              protocol: TCP
+            {{- end }}
+          resources:
+            {{- toYaml .Values.controller.plugin.resources | nindent 12 }}
+          volumeMounts:
+            - name: socket-dir
+              mountPath: /csi
+            - name: cloud-config
+              mountPath: /etc/proxmox/
+            {{- with .Values.extraVolumeMounts }}
+            {{- toYaml . | nindent 12 }}
+            {{- end }}
+        - name: csi-attacher
+          securityContext:
+            {{- toYaml .Values.securityContext | nindent 12 }}
+          image: "{{ .Values.controller.attacher.image.repository }}:{{ .Values.controller.attacher.image.tag }}"
+          imagePullPolicy: {{ .Values.controller.attacher.image.pullPolicy }}
+          args:
+            - "-v={{ .Values.logVerbosityLevel }}"
+            - "--csi-address=unix:///csi/csi.sock"
+            - "--timeout={{ .Values.timeout }}"
+            - "--leader-election"
+            {{- range .Values.controller.attacher.args }}
+            - {{ . | quote }}
+            {{- end }}
+          volumeMounts:
+            - name: socket-dir
+              mountPath: /csi
+          resources: {{- toYaml .Values.controller.attacher.resources | nindent 12 }}
+        - name: csi-provisioner
+          securityContext:
+            {{- toYaml .Values.securityContext | nindent 12 }}
+          image: "{{ .Values.controller.provisioner.image.repository }}:{{ .Values.controller.provisioner.image.tag }}"
+          imagePullPolicy: {{ .Values.controller.provisioner.image.pullPolicy }}
+          args:
+            - "-v={{ .Values.logVerbosityLevel }}"
+            - "--csi-address=unix:///csi/csi.sock"
+            - "--timeout={{ .Values.timeout }}"
+            - "--leader-election"
+            {{- if .Values.options.enableCapacity }}
+            - "--enable-capacity"
+            - "--capacity-ownerref-level=2"
+            {{- end }}
+            {{- range .Values.controller.provisioner.args }}
+            - {{ . | quote }}
+            {{- end }}
+          env:
+            - name: NAMESPACE
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.namespace
+            - name: POD_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.name
+          volumeMounts:
+            - name: socket-dir
+              mountPath: /csi
+          resources: {{- toYaml .Values.controller.provisioner.resources | nindent 12 }}
+        - name: csi-resizer
+          securityContext:
+            {{- toYaml .Values.securityContext | nindent 12 }}
+          image: "{{ .Values.controller.resizer.image.repository }}:{{ .Values.controller.resizer.image.tag }}"
+          imagePullPolicy: {{ .Values.controller.resizer.image.pullPolicy }}
+          args:
+            - "-v={{ .Values.logVerbosityLevel }}"
+            - "--csi-address=unix:///csi/csi.sock"
+            - "--timeout={{ .Values.timeout }}"
+            - "--handle-volume-inuse-error=false"
+            - "--leader-election"
+            {{- range .Values.controller.resizer.args }}
+            - {{ . | quote }}
+            {{- end }}
+          volumeMounts:
+            - name: socket-dir
+              mountPath: /csi
+          resources: {{- toYaml .Values.controller.resizer.resources | nindent 12 }}
+        {{- if .Values.controller.snapshotter.enabled }}
+        - name: csi-snapshotter
+          securityContext:
+            {{- toYaml .Values.securityContext | nindent 12 }}
+          image: "{{ .Values.controller.snapshotter.image.repository }}:{{ .Values.controller.snapshotter.image.tag }}"
+          imagePullPolicy: {{ .Values.controller.snapshotter.image.pullPolicy }}
+          args:
+            - "-v={{ .Values.logVerbosityLevel }}"
+            - "--csi-address=unix:///csi/csi.sock"
+            - "--timeout={{ .Values.timeout }}"
+            - "--leader-election"
+            {{- range .Values.controller.snapshotter.args }}
+            - {{ . | quote }}
+            {{- end }}
+          volumeMounts:
+            - name: socket-dir
+              mountPath: /csi
+          resources: {{- toYaml .Values.controller.snapshotter.resources | nindent 12 }}
+        {{- end }}
+        - name: liveness-probe
+          securityContext:
+            {{- toYaml .Values.securityContext | nindent 12 }}
+          image: "{{ .Values.livenessprobe.image.repository }}:{{ .Values.livenessprobe.image.tag }}"
+          imagePullPolicy: {{ .Values.livenessprobe.image.pullPolicy }}
+          args:
+            - "-v={{ .Values.logVerbosityLevel }}"
+            - "--csi-address=unix:///csi/csi.sock"
+          volumeMounts:
+            - name: socket-dir
+              mountPath: /csi
+          resources: {{- toYaml .Values.livenessprobe.resources | nindent 12 }}
+      volumes:
+        - name: socket-dir
+          emptyDir: {}
+        {{- if .Values.existingConfigSecret }}
+        - name: cloud-config
+          secret:
+            secretName: {{ .Values.existingConfigSecret }}
+            items:
+              - key: {{ .Values.existingConfigSecretKey }}
+                path: config.yaml
+        {{- else }}
+        - name: cloud-config
+          secret:
+            secretName: {{ include "proxmox-csi-plugin.fullname" . }}
+        {{- end }}
+        {{- with .Values.extraVolumes }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+      {{- with .Values.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      topologySpreadConstraints:
+        - maxSkew: 1
+          topologyKey: kubernetes.io/hostname
+          whenUnsatisfiable: DoNotSchedule
+          labelSelector:
+            matchLabels:
+              {{- include "proxmox-csi-plugin.selectorLabels" . | nindent 14 }}
diff --git a/packages/system/proxmox-csi/charts/proxmox-csi-plugin/templates/controller-role.yaml b/packages/system/proxmox-csi/charts/proxmox-csi-plugin/templates/controller-role.yaml
new file mode 100644
index 0000000000..b69d223f9c
--- /dev/null
+++ b/packages/system/proxmox-csi/charts/proxmox-csi-plugin/templates/controller-role.yaml
@@ -0,0 +1,21 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: {{ include "proxmox-csi-plugin.fullname" . }}-controller
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "proxmox-csi-plugin.labels" . | nindent 4 }}
+rules:
+  - apiGroups: ["coordination.k8s.io"]
+    resources: ["leases"]
+    verbs: ["get", "watch", "list", "delete", "update", "create"]
+
+  - apiGroups: ["storage.k8s.io"]
+    resources: ["csistoragecapacities"]
+    verbs: ["get", "list", "watch", "create", "update", "patch", "delete"]
+  - apiGroups: [""]
+    resources: ["pods"]
+    verbs: ["get"]
+  - apiGroups: ["apps"]
+    resources: ["replicasets"]
+    verbs: ["get"]
diff --git a/packages/system/proxmox-csi/charts/proxmox-csi-plugin/templates/controller-rolebinding.yaml b/packages/system/proxmox-csi/charts/proxmox-csi-plugin/templates/controller-rolebinding.yaml
new file mode 100644
index 0000000000..2603cc6b7b
--- /dev/null
+++ b/packages/system/proxmox-csi/charts/proxmox-csi-plugin/templates/controller-rolebinding.yaml
@@ -0,0 +1,30 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: {{ include "proxmox-csi-plugin.fullname" . }}-controller
+  labels:
+    {{- include "proxmox-csi-plugin.labels" . | nindent 4 }}
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: {{ include "proxmox-csi-plugin.fullname" . }}-controller
+subjects:
+  - kind: ServiceAccount
+    name: {{ include "proxmox-csi-plugin.serviceAccountName" . }}-controller
+    namespace: {{ .Release.Namespace }}
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: {{ include "proxmox-csi-plugin.fullname" . }}-controller
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "proxmox-csi-plugin.labels" . | nindent 4 }}
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: {{ include "proxmox-csi-plugin.fullname" . }}-controller
+subjects:
+  - kind: ServiceAccount
+    name: {{ include "proxmox-csi-plugin.serviceAccountName" . }}-controller
+    namespace: {{ .Release.Namespace }}
diff --git a/packages/system/proxmox-csi/charts/proxmox-csi-plugin/templates/csidriver.yaml b/packages/system/proxmox-csi/charts/proxmox-csi-plugin/templates/csidriver.yaml
new file mode 100644
index 0000000000..5d0652e863
--- /dev/null
+++ b/packages/system/proxmox-csi/charts/proxmox-csi-plugin/templates/csidriver.yaml
@@ -0,0 +1,10 @@
+apiVersion: storage.k8s.io/v1
+kind: CSIDriver
+metadata:
+  name: {{ .Values.provisionerName }}
+spec:
+  attachRequired: true
+  podInfoOnMount: true
+  storageCapacity: true
+  volumeLifecycleModes:
+  - Persistent
diff --git a/packages/system/proxmox-csi/charts/proxmox-csi-plugin/templates/namespace.yaml b/packages/system/proxmox-csi/charts/proxmox-csi-plugin/templates/namespace.yaml
new file mode 100644
index 0000000000..8c4ba9c4ad
--- /dev/null
+++ b/packages/system/proxmox-csi/charts/proxmox-csi-plugin/templates/namespace.yaml
@@ -0,0 +1,10 @@
+{{- if and .Values.createNamespace (ne .Release.Namespace "kube-system") }}
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: {{ .Release.Namespace }}
+  labels:
+    pod-security.kubernetes.io/enforce: privileged
+    pod-security.kubernetes.io/audit: baseline
+    pod-security.kubernetes.io/warn: baseline
+{{- end }}
diff --git a/packages/system/proxmox-csi/charts/proxmox-csi-plugin/templates/node-clusterrole.yaml b/packages/system/proxmox-csi/charts/proxmox-csi-plugin/templates/node-clusterrole.yaml
new file mode 100644
index 0000000000..02af491f51
--- /dev/null
+++ b/packages/system/proxmox-csi/charts/proxmox-csi-plugin/templates/node-clusterrole.yaml
@@ -0,0 +1,14 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: {{ include "proxmox-csi-plugin.fullname" . }}-node
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "proxmox-csi-plugin.labels" . | nindent 4 }}
+rules:
+  - apiGroups:
+      - ""
+    resources:
+      - nodes
+    verbs:
+      - get
diff --git a/packages/system/proxmox-csi/charts/proxmox-csi-plugin/templates/node-deployment.yaml b/packages/system/proxmox-csi/charts/proxmox-csi-plugin/templates/node-deployment.yaml
new file mode 100644
index 0000000000..381e834fe8
--- /dev/null
+++ b/packages/system/proxmox-csi/charts/proxmox-csi-plugin/templates/node-deployment.yaml
@@ -0,0 +1,145 @@
+apiVersion: apps/v1
+kind: DaemonSet
+metadata:
+  name: {{ include "proxmox-csi-plugin.fullname" . }}-node
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "proxmox-csi-plugin.labels" . | nindent 4 }}
+spec:
+  updateStrategy:
+    type: {{ .Values.updateStrategy.type }}
+  selector:
+    matchLabels:
+      {{- include "proxmox-csi-plugin-node.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      {{- with .Values.podAnnotations }}
+      annotations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      labels:
+        {{- include "proxmox-csi-plugin-node.selectorLabels" . | nindent 8 }}
+        {{- with default .Values.podLabels -}}
+          {{- toYaml . | nindent 8 }}
+        {{- end }}
+    spec:
+      priorityClassName: system-node-critical
+      {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      enableServiceLinks: false
+      serviceAccountName: {{ include "proxmox-csi-plugin.serviceAccountName" . }}-node
+      securityContext:
+        runAsUser: 0
+        runAsGroup: 0
+      containers:
+        - name: {{ include "proxmox-csi-plugin.fullname" . }}-node
+          securityContext:
+            privileged: true
+            capabilities:
+              drop:
+              - ALL
+              add:
+              - SYS_ADMIN
+              - CHOWN
+              - DAC_OVERRIDE
+            seccompProfile:
+              type: RuntimeDefault
+          image: "{{ .Values.node.plugin.image.repository }}:{{ .Values.node.plugin.image.tag | default .Chart.AppVersion }}"
+          imagePullPolicy: {{ .Values.node.plugin.image.pullPolicy }}
+          args:
+            - "-v={{ .Values.logVerbosityLevel }}"
+            - "--csi-address=unix:///csi/csi.sock"
+            - "--node-id=$(NODE_NAME)"
+          env:
+            - name: NODE_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: spec.nodeName
+          resources: {{- toYaml .Values.node.plugin.resources | nindent 12 }}
+          volumeMounts:
+            - name: socket
+              mountPath: /csi
+            - name: kubelet
+              mountPath: {{ .Values.node.kubeletDir }}
+              mountPropagation: Bidirectional
+            - name: dev
+              mountPath: /dev
+            - name: sys
+              mountPath: /sys
+        - name: csi-node-driver-registrar
+          securityContext:
+            allowPrivilegeEscalation: false
+            capabilities:
+              drop:
+              - ALL
+            readOnlyRootFilesystem: true
+            seccompProfile:
+              type: RuntimeDefault
+          image: "{{ .Values.node.driverRegistrar.image.repository }}:{{ .Values.node.driverRegistrar.image.tag }}"
+          imagePullPolicy: {{ .Values.node.driverRegistrar.image.pullPolicy }}
+          args:
+            - "-v={{ .Values.logVerbosityLevel }}"
+            - "--csi-address=unix:///csi/csi.sock"
+            - "--kubelet-registration-path={{ .Values.node.kubeletDir }}/plugins/{{ .Values.provisionerName }}/csi.sock"
+            {{- range .Values.node.driverRegistrar.args }}
+            - {{ . | quote }}
+            {{- end }}
+          volumeMounts:
+            - name: socket
+              mountPath: /csi
+            - name: registration
+              mountPath: /registration
+          resources: {{- toYaml .Values.node.driverRegistrar.resources | nindent 12 }}
+        - name: liveness-probe
+          securityContext:
+            allowPrivilegeEscalation: false
+            capabilities:
+              drop:
+              - ALL
+            readOnlyRootFilesystem: true
+            seccompProfile:
+              type: RuntimeDefault
+          image: "{{ .Values.livenessprobe.image.repository }}:{{ .Values.livenessprobe.image.tag }}"
+          imagePullPolicy: {{ .Values.livenessprobe.image.pullPolicy }}
+          args:
+            - "-v={{ .Values.logVerbosityLevel }}"
+            - "--csi-address=unix:///csi/csi.sock"
+          volumeMounts:
+            - name: socket
+              mountPath: /csi
+          resources: {{- toYaml .Values.livenessprobe.resources | nindent 12 }}
+      volumes:
+        - name: socket
+          hostPath:
+            path: {{ .Values.node.kubeletDir }}/plugins/{{ .Values.provisionerName }}/
+            type: DirectoryOrCreate
+        - name: registration
+          hostPath:
+            path: {{ .Values.node.kubeletDir }}/plugins_registry/
+            type: Directory
+        - name: kubelet
+          hostPath:
+            path: {{ .Values.node.kubeletDir }}
+            type: Directory
+        - name: dev
+          hostPath:
+            path: /dev
+            type: Directory
+        - name: sys
+          hostPath:
+            path: /sys
+            type: Directory
+      {{- with .Values.node.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.node.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.node.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
diff --git a/packages/system/proxmox-csi/charts/proxmox-csi-plugin/templates/node-rolebinding.yaml b/packages/system/proxmox-csi/charts/proxmox-csi-plugin/templates/node-rolebinding.yaml
new file mode 100644
index 0000000000..4585dd66ac
--- /dev/null
+++ b/packages/system/proxmox-csi/charts/proxmox-csi-plugin/templates/node-rolebinding.yaml
@@ -0,0 +1,12 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: {{ include "proxmox-csi-plugin.fullname" . }}-node
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: {{ include "proxmox-csi-plugin.fullname" . }}-node
+subjects:
+  - kind: ServiceAccount
+    name: {{ include "proxmox-csi-plugin.serviceAccountName" . }}-node
+    namespace: {{ .Release.Namespace }}
diff --git a/packages/system/proxmox-csi/charts/proxmox-csi-plugin/templates/secrets.yaml b/packages/system/proxmox-csi/charts/proxmox-csi-plugin/templates/secrets.yaml
new file mode 100644
index 0000000000..f96f5d574c
--- /dev/null
+++ b/packages/system/proxmox-csi/charts/proxmox-csi-plugin/templates/secrets.yaml
@@ -0,0 +1,12 @@
+{{- if ne (len .Values.config.clusters) 0 }}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ include "proxmox-csi-plugin.fullname" . }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "proxmox-csi-plugin.labels" . | nindent 4 }}
+type: Opaque
+data:
+  config.yaml: {{ toYaml .Values.config | b64enc | quote }}
+{{- end }}
diff --git a/packages/system/proxmox-csi/charts/proxmox-csi-plugin/templates/serviceaccount.yaml b/packages/system/proxmox-csi/charts/proxmox-csi-plugin/templates/serviceaccount.yaml
new file mode 100644
index 0000000000..d6a4554848
--- /dev/null
+++ b/packages/system/proxmox-csi/charts/proxmox-csi-plugin/templates/serviceaccount.yaml
@@ -0,0 +1,25 @@
+{{- if .Values.serviceAccount.create -}}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ include "proxmox-csi-plugin.serviceAccountName" . }}-controller
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "proxmox-csi-plugin.labels" . | nindent 4 }}
+  {{- with .Values.serviceAccount.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ include "proxmox-csi-plugin.serviceAccountName" . }}-node
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "proxmox-csi-plugin.labels" . | nindent 4 }}
+  {{- with .Values.serviceAccount.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+{{- end }}
diff --git a/packages/system/proxmox-csi/charts/proxmox-csi-plugin/templates/storageclass.yaml b/packages/system/proxmox-csi/charts/proxmox-csi-plugin/templates/storageclass.yaml
new file mode 100644
index 0000000000..e396032051
--- /dev/null
+++ b/packages/system/proxmox-csi/charts/proxmox-csi-plugin/templates/storageclass.yaml
@@ -0,0 +1,29 @@
+{{- range $storage := .Values.storageClass }}
+apiVersion: storage.k8s.io/v1
+kind: StorageClass
+metadata:
+  name: {{ $storage.name | required "StorageClass name must be provided." }}
+  {{- with $storage.labels }}
+  labels:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- with $storage.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+provisioner: {{ $.Values.provisionerName }}
+allowVolumeExpansion: true
+volumeBindingMode: {{ default "WaitForFirstConsumer" $storage.volumeBindingMode }}
+reclaimPolicy: {{ default "Delete" $storage.reclaimPolicy }}
+parameters:
+  {{- mustMergeOverwrite (default (dict) $storage.extraParameters) (include "storageClass.parameters" . | fromYaml) | toYaml | nindent 2 -}}
+{{- with $storage.mountOptions }}
+mountOptions:
+  {{- . | toYaml | nindent 2 }}
+{{- end }}
+{{- with $storage.allowedTopologies }}
+allowedTopologies:
+  {{- . | toYaml | nindent 2 }}
+{{- end }}
+---
+{{- end }}
diff --git a/packages/system/proxmox-csi/charts/proxmox-csi-plugin/values.edge.yaml b/packages/system/proxmox-csi/charts/proxmox-csi-plugin/values.edge.yaml
new file mode 100644
index 0000000000..974c87e9da
--- /dev/null
+++ b/packages/system/proxmox-csi/charts/proxmox-csi-plugin/values.edge.yaml
@@ -0,0 +1,29 @@
+
+createNamespace: true
+
+controller:
+  plugin:
+    image:
+      pullPolicy: Always
+      tag: edge
+
+node:
+  plugin:
+    image:
+      pullPolicy: Always
+      tag: edge
+
+nodeSelector:
+  node-role.kubernetes.io/control-plane: ""
+tolerations:
+  - key: node-role.kubernetes.io/control-plane
+    effect: NoSchedule
+
+storageClass:
+  - name: proxmox-data-xfs
+    storage: data
+    reclaimPolicy: Delete
+    fstype: xfs
+  - name: proxmox-data
+    storage: data
+    ssd: true
diff --git a/packages/system/proxmox-csi/charts/proxmox-csi-plugin/values.talos.yaml b/packages/system/proxmox-csi/charts/proxmox-csi-plugin/values.talos.yaml
new file mode 100644
index 0000000000..d507b31e41
--- /dev/null
+++ b/packages/system/proxmox-csi/charts/proxmox-csi-plugin/values.talos.yaml
@@ -0,0 +1,23 @@
+
+createNamespace: true
+
+node:
+  nodeSelector:
+    node.cloudprovider.kubernetes.io/platform: nocloud
+  tolerations:
+    - operator: Exists
+
+nodeSelector:
+  node-role.kubernetes.io/control-plane: ""
+tolerations:
+  - key: node-role.kubernetes.io/control-plane
+    effect: NoSchedule
+
+storageClass:
+  - name: proxmox-data-xfs
+    storage: data
+    reclaimPolicy: Delete
+    fstype: xfs
+  - name: proxmox-data
+    storage: data
+    reclaimPolicy: Delete
diff --git a/packages/system/proxmox-csi/charts/proxmox-csi-plugin/values.yaml b/packages/system/proxmox-csi/charts/proxmox-csi-plugin/values.yaml
new file mode 100644
index 0000000000..f2e3bb7225
--- /dev/null
+++ b/packages/system/proxmox-csi/charts/proxmox-csi-plugin/values.yaml
@@ -0,0 +1,369 @@
+# Default values for proxmox-csi-plugin.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+replicaCount: 1
+
+imagePullSecrets: []
+nameOverride: ""
+fullnameOverride: ""
+
+# -- Create namespace.
+# Very useful when using helm template.
+createNamespace: false
+
+# -- Controller pods priorityClassName.
+priorityClassName: system-cluster-critical
+
+# -- Pods Service Account.
+# ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/
+serviceAccount:
+  # Specifies whether a service account should be created
+  create: true
+  # Annotations to add to the service account
+  annotations: {}
+  # The name of the service account to use.
+  # If not set and create is true, a name is generated using the fullname template
+  name: ""
+
+# -- CSI Driver provisioner name.
+# Currently, cannot be customized.
+provisionerName: csi.proxmox.sinextra.dev
+
+# -- Cluster name.
+# Currently, cannot be customized.
+clusterID: kubernetes
+
+# -- Log verbosity level. See https://github.com/kubernetes/community/blob/master/contributors/devel/sig-instrumentation/logging.md
+# for description of individual verbosity levels.
+logVerbosityLevel: 5
+
+# -- Connection timeout between sidecars.
+timeout: 3m
+
+options:
+  # -- Enable or disable capacity feature.
+  # ref: https://github.com/kubernetes-csi/external-provisioner
+  enableCapacity: true
+
+# -- Proxmox cluster config stored in secrets.
+existingConfigSecret: ~
+# -- Proxmox cluster config stored in secrets key.
+existingConfigSecretKey: config.yaml
+
+# -- Proxmox cluster config path.
+configFile: /etc/proxmox/config.yaml
+
+# -- Proxmox cluster config.
+# ref: https://github.com/sergelogvinov/proxmox-csi-plugin/blob/main/docs/install.md
+config:
+  features:
+    # specify provider: proxmox if you are using capmox (cluster api provider for proxmox)
+    provider: "default"
+  clusters: []
+  #   - url: https://cluster-api-1.exmple.com:8006/api2/json
+  #     insecure: false
+  #     token_id: "login!name"
+  #     token_secret: "secret"
+  #     region: cluster-1
+
+# -- Storage class definition.
+storageClass: []
+  # - name: proxmox-data-xfs
+  #   storage: data
+  #   For ceph storage you should use volumeBindingMode Immediate, defaults to WaitForFirstConsumer
+  #   volumeBindingMode: WaitForFirstConsumer|Immediate
+  #   reclaimPolicy: Delete
+  #   fstype: ext4|xfs
+  #
+  #   # https://pve.proxmox.com/wiki/Performance_Tweaks
+  #   cache: directsync|none|writeback|writethrough
+  #   ssd: true
+  #   extraParameters:
+  #     # https://kubernetes-csi.github.io/docs/secrets-and-credentials-storage-class.html
+  #     csi.storage.k8s.io/node-stage-secret-name: "proxmox-csi-secret"
+  #     csi.storage.k8s.io/node-stage-secret-namespace: "kube-system"
+  #     csi.storage.k8s.io/node-expand-secret-name: "proxmox-csi-secret"
+  #     csi.storage.k8s.io/node-expand-secret-namespace: "kube-system"
+  #
+  #   mountOptions:
+  #     - discard
+  #
+  #   # I am not recommending to use this option, but it is possible.
+  #   # You should use region and zone topology keys together.
+  #   allowedTopologies:
+  #   - matchLabelExpressions:
+  #     - key: topology.kubernetes.io/region
+  #       values:
+  #       - Region-1
+  #     - key: topology.kubernetes.io/zone
+  #       values:
+  #       - pve-1
+  #       - pve-3
+
+controller:
+  # -- Annotations for controller pod.
+  # ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
+  podAnnotations: {}
+    # prometheus.io/scrape: "true"
+    # prometheus.io/port: "8080"
+
+  # -- Labels for controller pod.
+  # ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
+  podLabels: {}
+
+  plugin:
+    # -- Controller CSI Driver.
+    image:
+      repository: ghcr.io/sergelogvinov/proxmox-csi-controller
+      pullPolicy: IfNotPresent
+      # Overrides the image tag whose default is the chart appVersion.
+      tag: ""
+    # -- Controller resource requests and limits.
+    # ref: https://kubernetes.io/docs/user-guide/compute-resources/
+    resources:
+      requests:
+        cpu: 10m
+        memory: 16Mi
+  attacher:
+    # -- CSI Attacher.
+    # ref: https://github.com/kubernetes-csi/external-attacher
+    image:
+      repository: registry.k8s.io/sig-storage/csi-attacher
+      pullPolicy: IfNotPresent
+      tag: v4.12.0
+    # -- Attacher arguments.
+    # example: --default-fstype=ext4
+    args:
+      - --default-fstype=ext4
+    # -- Attacher resource requests and limits.
+    # ref: https://kubernetes.io/docs/user-guide/compute-resources/
+    resources:
+      requests:
+        cpu: 10m
+        memory: 16Mi
+  provisioner:
+    # -- CSI Provisioner.
+    # ref: https://github.com/kubernetes-csi/external-provisioner
+    image:
+      repository: registry.k8s.io/sig-storage/csi-provisioner
+      pullPolicy: IfNotPresent
+      tag: v6.3.0
+    # -- Provisioner arguments.
+    # example: --feature-gates=VolumeAttributesClass=true
+    args:
+      - --default-fstype=ext4
+    # -- Provisioner resource requests and limits.
+    # ref: https://kubernetes.io/docs/user-guide/compute-resources/
+    resources:
+      requests:
+        cpu: 10m
+        memory: 16Mi
+  resizer:
+    # -- CSI Resizer.
+    # refs: https://github.com/kubernetes-csi/external-resizer
+    image:
+      repository: registry.k8s.io/sig-storage/csi-resizer
+      pullPolicy: IfNotPresent
+      tag: v2.2.1
+    # -- Resizer arguments.
+    # example: --feature-gates=VolumeAttributesClass=true
+    args: []
+    # -- Resizer resource requests and limits.
+    # ref: https://kubernetes.io/docs/user-guide/compute-resources/
+    resources:
+      requests:
+        cpu: 10m
+        memory: 16Mi
+  snapshotter:
+    enabled: false
+    # -- CSI Snapshotter.
+    # refs: https://github.com/kubernetes-csi/external-snapshotter
+    image:
+      repository: registry.k8s.io/sig-storage/csi-snapshotter
+      pullPolicy: IfNotPresent
+      tag: v8.6.0
+    # -- Snapshotter arguments.
+    # example: --feature-gates=CSIVolumeGroupSnapshot=true
+    args: []
+    # -- Snapshotter resource requests and limits.
+    # ref: https://kubernetes.io/docs/user-guide/compute-resources/
+    resources:
+      requests:
+        cpu: 10m
+        memory: 16Mi
+
+node:
+  plugin:
+    # -- Node CSI Driver.
+    image:
+      repository: ghcr.io/sergelogvinov/proxmox-csi-node
+      pullPolicy: IfNotPresent
+      # Overrides the image tag whose default is the chart appVersion.
+      tag: ""
+    # -- Node CSI Driver resource requests and limits.
+    # ref: https://kubernetes.io/docs/user-guide/compute-resources/
+    resources: {}
+  driverRegistrar:
+    # -- Node CSI driver registrar.
+    # ref: https://github.com/kubernetes-csi/node-driver-registrar
+    image:
+      repository: registry.k8s.io/sig-storage/csi-node-driver-registrar
+      pullPolicy: IfNotPresent
+      tag: v2.17.0
+    # -- Driver registrar arguments.
+    # example: --timeout=60s
+    args: []
+    # -- Node registrar resource requests and limits.
+    # ref: https://kubernetes.io/docs/user-guide/compute-resources/
+    resources:
+      requests:
+        cpu: 10m
+        memory: 16Mi
+
+  # -- Location of the /var/lib/kubelet directory as some k8s distribution differ from the standard.
+  # Standard: /var/lib/kubelet, k0s: /var/lib/k0s/kubelet, microk8s: /var/snap/microk8s/common/var/lib/kubelet
+  kubeletDir: /var/lib/kubelet
+
+  # -- Node labels for node-plugin assignment.
+  # ref: https://kubernetes.io/docs/user-guide/node-selection/
+  nodeSelector: {}
+
+  # -- Tolerations for node-plugin assignment.
+  # ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
+  tolerations:
+    - key: karpenter.sh/disrupted
+      operator: Exists
+      effect: NoSchedule
+    - key: node.kubernetes.io/unschedulable
+      operator: Exists
+      effect: NoSchedule
+    - key: node.kubernetes.io/disk-pressure
+      operator: Exists
+      effect: NoSchedule
+
+  # -- Affinity for node-plugin assignment.
+  # ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
+  affinity: {}
+
+livenessprobe:
+  # -- Common livenessprobe sidecar.
+  image:
+    repository: registry.k8s.io/sig-storage/livenessprobe
+    pullPolicy: IfNotPresent
+    tag: v2.19.0
+  # -- Failure threshold for livenessProbe
+  failureThreshold: 5
+  # -- Initial delay seconds for livenessProbe
+  initialDelaySeconds: 10
+  # -- Timeout seconds for livenessProbe
+  timeoutSeconds: 10
+  # -- Period seconds for livenessProbe
+  periodSeconds: 60
+  # -- Liveness probe resource requests and limits.
+  # ref: https://kubernetes.io/docs/user-guide/compute-resources/
+  resources:
+    requests:
+      cpu: 10m
+      memory: 16Mi
+
+# -- Add additional init containers for the CSI controller pods.
+# ref: https://kubernetes.io/docs/concepts/workloads/pods/init-containers/
+initContainers: []
+  # - name: loadbalancer
+  #   restartPolicy: Always
+  #   image: ghcr.io/sergelogvinov/haproxy:2.8.3-alpine3.18
+  #   imagePullPolicy: IfNotPresent
+  #   env:
+  #     - name: SVC
+  #       value: "proxmox.domain.com"
+  #     - name: PORT
+  #       value: "8006"
+  #   securityContext:
+  #     runAsUser: 99
+  #     runAsGroup: 99
+  #   resources:
+  #     limits:
+  #       cpu: 50m
+  #       memory: 64Mi
+  #     requests:
+  #       cpu: 50m
+  #       memory: 32Mi
+
+# -- hostAliases Deployment pod host aliases
+# ref: https://kubernetes.io/docs/tasks/network/customize-hosts-file-for-pods/
+hostAliases: []
+  # - ip: 127.0.0.1
+  #   hostnames:
+  #     - proxmox.domain.com
+
+# -- Annotations for controller pod.
+# ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
+podAnnotations: {}
+
+# -- Labels for controller pod.
+# ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
+podLabels: {}
+
+# -- Controller Security Context.
+# ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod
+podSecurityContext:
+  runAsNonRoot: true
+  runAsUser: 65532
+  runAsGroup: 65532
+  fsGroup: 65532
+  fsGroupChangePolicy: OnRootMismatch
+
+# -- Controller Container Security Context.
+# ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod
+securityContext:
+  allowPrivilegeEscalation: false
+  capabilities:
+    drop:
+      - ALL
+  seccompProfile:
+    type: RuntimeDefault
+  readOnlyRootFilesystem: true
+
+# -- Controller deployment update strategy type.
+# ref: https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#updating-a-deployment
+updateStrategy:
+  type: RollingUpdate
+  rollingUpdate:
+    maxUnavailable: 1
+
+# -- Prometheus metrics
+metrics:
+  # -- Enable Prometheus metrics.
+  enabled: false
+  # -- Prometheus metrics port.
+  port: 8080
+
+  type: annotation
+
+# -- Node labels for controller assignment.
+# ref: https://kubernetes.io/docs/user-guide/node-selection/
+nodeSelector: {}
+  # node-role.kubernetes.io/control-plane: ""
+
+# -- Tolerations for controller assignment.
+# ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
+tolerations: []
+  # - key: node-role.kubernetes.io/control-plane
+  #   effect: NoSchedule
+
+# -- Affinity for controller assignment.
+# ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
+affinity: {}
+
+# -- Additional volumes for Pods
+extraVolumes: []
+# - name: ca
+#   secret:
+#     secretName: my-ca
+# -- Additional volume mounts for Pods
+
+extraVolumeMounts: []
+# - mountPath: /etc/ssl/certs/ca-certificates.crt
+#   name: ca
+#   subPath: ca.crt
diff --git a/packages/system/proxmox-csi/values.yaml b/packages/system/proxmox-csi/values.yaml
new file mode 100644
index 0000000000..7895322fa1
--- /dev/null
+++ b/packages/system/proxmox-csi/values.yaml
@@ -0,0 +1,35 @@
+## @section Proxmox CSI
+##
+## The upstream chart ships a values.talos.yaml preset that does not fit a
+## Cozystack tenant, and the two differences are not cosmetic:
+##
+##   - it selects the controller onto `node-role.kubernetes.io/control-plane`.
+##     A Kamaji tenant has no control-plane nodes at all — the control plane is
+##     a Deployment in the management cluster — so that selector leaves the
+##     controller Pending forever.
+##   - it selects the node plugin onto
+##     `node.cloudprovider.kubernetes.io/platform: nocloud`, a label a
+##     cloud-controller-manager running inside the cluster applies. The CCM for
+##     this substrate runs in the management cluster and applies no such label,
+##     so that DaemonSet would schedule nowhere.
+##
+## Both are dropped here. This release is the tenant-side half only: the node
+## plugin, the CSIDriver object and the storage classes. The controller — the
+## half that authenticates to the hypervisor — runs in the management cluster,
+## in templates/csi-proxmox/controller.yaml of the kubernetes chart, and that
+## chart sets replicaCount to 0 for the controller Deployment this one still
+## renders. `config.clusters` stays empty on purpose: the chart's Secret
+## template renders only for a non-empty list, and an empty one is what keeps
+## every credential out of the tenant.
+
+proxmox-csi-plugin:
+  createNamespace: false
+
+  config:
+    clusters: []
+
+  storageClass: []
+
+  node:
+    tolerations:
+      - operator: Exists
diff --git a/packages/system/qdrant-rd/cozyrds/qdrant.yaml b/packages/system/qdrant-rd/cozyrds/qdrant.yaml
index 8bbae0fb07..620d8fe759 100644
--- a/packages/system/qdrant-rd/cozyrds/qdrant.yaml
+++ b/packages/system/qdrant-rd/cozyrds/qdrant.yaml
@@ -8,7 +8,7 @@ spec:
     plural: qdrants
     singular: qdrant
     openAPISchema: |-
-      {"title":"Chart Values","type":"object","properties":{"replicas":{"description":"Number of Qdrant replicas. Cluster mode is automatically enabled when replicas > 1.","type":"integer","default":1},"resources":{"description":"Explicit CPU and memory configuration for each Qdrant replica. When omitted, the preset defined in `resourcesPreset` is applied.","type":"object","default":{},"properties":{"cpu":{"description":"CPU available to each replica.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Memory (RAM) available to each replica.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}},"resourcesPreset":{"description":"Default sizing preset used when `resources` is omitted.","type":"string","default":"t1.small","enum":["t1.nano","t1.micro","t1.small","t1.medium","t1.large","t1.xlarge","t1.2xlarge","t1.4xlarge","c1.nano","c1.micro","c1.small","c1.medium","c1.large","c1.xlarge","c1.2xlarge","c1.4xlarge","s1.nano","s1.micro","s1.small","s1.medium","s1.large","s1.xlarge","s1.2xlarge","s1.4xlarge","u1.nano","u1.micro","u1.small","u1.medium","u1.large","u1.xlarge","u1.2xlarge","u1.4xlarge","m1.nano","m1.micro","m1.small","m1.medium","m1.large","m1.xlarge","m1.2xlarge","m1.4xlarge","nano","micro","small","medium","large","xlarge","2xlarge"]},"size":{"description":"Persistent Volume Claim size available for vector data storage.","default":"10Gi","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"storageClass":{"description":"StorageClass used to store the data.","type":"string","default":"","x-kubernetes-validations":[{"rule":"self == oldSelf","message":"storageClass is immutable"}]},"external":{"description":"Enable external access from outside the cluster.","type":"boolean","default":false},"tls":{"description":"TLS configuration. When omitted, the effective TLS state follows the value of `external`.","type":"object","default":{},"properties":{"enabled":{"description":"Enable TLS. When unset, inherits the value of `external` (TLS is on when external access is enabled). Set explicitly to `true` or `false` to override.","type":"boolean"}}}}}
+      {"title":"Chart Values","type":"object","properties":{"replicas":{"description":"Number of Qdrant replicas. Cluster mode is automatically enabled when replicas > 1.","type":"integer","default":1},"resources":{"description":"Explicit CPU and memory configuration for each Qdrant replica. When omitted, the preset defined in `resourcesPreset` is applied.","type":"object","default":{},"properties":{"cpu":{"description":"CPU available to each replica.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Memory (RAM) available to each replica.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}},"resourcesPreset":{"description":"Default sizing preset used when `resources` is omitted.","type":"string","default":"t1.small","enum":["t1.nano","t1.micro","t1.small","t1.medium","t1.large","t1.xlarge","t1.2xlarge","t1.4xlarge","c1.nano","c1.micro","c1.small","c1.medium","c1.large","c1.xlarge","c1.2xlarge","c1.4xlarge","s1.nano","s1.micro","s1.small","s1.medium","s1.large","s1.xlarge","s1.2xlarge","s1.4xlarge","u1.nano","u1.micro","u1.small","u1.medium","u1.large","u1.xlarge","u1.2xlarge","u1.4xlarge","m1.nano","m1.micro","m1.small","m1.medium","m1.large","m1.xlarge","m1.2xlarge","m1.4xlarge","nano","micro","small","medium","large","xlarge","2xlarge"]},"size":{"description":"Persistent Volume Claim size available for vector data storage.","default":"10Gi","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"storageClass":{"description":"StorageClass used to store the data.","type":"string","default":"","x-kubernetes-validations":[{"rule":"self == oldSelf","message":"storageClass is immutable"}],"x-cozystack-options":{"source":"storageclass"}},"external":{"description":"Enable external access from outside the cluster.","type":"boolean","default":false},"tls":{"description":"TLS configuration. When omitted, the effective TLS state follows the value of `external`.","type":"object","default":{},"properties":{"enabled":{"description":"Enable TLS. When unset, inherits the value of `external` (TLS is on when external access is enabled). Set explicitly to `true` or `false` to override.","type":"boolean"}}}}}
   release:
     prefix: qdrant-
     labels:
@@ -33,6 +33,11 @@ spec:
     include:
       - resourceNames:
           - qdrant-{{ .name }}-apikey
+      # The key-free trust anchor the CA-extraction controller publishes. This
+      # is the single, engine-agnostic selector every converged engine shares;
+      # it carries no per-release name templating.
+      - matchLabels:
+          internal.cozystack.io/tenant-ca: "true"
   services:
     exclude: []
     include:
diff --git a/packages/system/rabbitmq-operator/templates/messaging-topology-operator.yml b/packages/system/rabbitmq-operator/templates/messaging-topology-operator.yml
index 695b65c4e5..8a5fb40369 100644
--- a/packages/system/rabbitmq-operator/templates/messaging-topology-operator.yml
+++ b/packages/system/rabbitmq-operator/templates/messaging-topology-operator.yml
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.15.0
+    controller-gen.kubebuilder.io/version: v0.21.0
   name: bindings.rabbitmq.com
 spec:
   group: rabbitmq.com
@@ -71,9 +71,7 @@ spec:
                             This field is effectively required, but due to backwards compatibility is
                             allowed to be empty. Instances of this type with an empty value here are
                             almost certainly wrong.
-                            TODO: Add other useful fields. apiVersion, kind, uid?
                             More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                            TODO: Drop `kubebuilder:default` when controller-gen doesn't need it https://github.com/kubernetes-sigs/kubebuilder/issues/3896.
                           type: string
                       type: object
                       x-kubernetes-map-type: atomic
@@ -145,7 +143,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.15.0
+    controller-gen.kubebuilder.io/version: v0.21.0
   name: exchanges.rabbitmq.com
 spec:
   group: rabbitmq.com
@@ -213,9 +211,7 @@ spec:
                             This field is effectively required, but due to backwards compatibility is
                             allowed to be empty. Instances of this type with an empty value here are
                             almost certainly wrong.
-                            TODO: Add other useful fields. apiVersion, kind, uid?
                             More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                            TODO: Drop `kubebuilder:default` when controller-gen doesn't need it https://github.com/kubernetes-sigs/kubebuilder/issues/3896.
                           type: string
                       type: object
                       x-kubernetes-map-type: atomic
@@ -286,7 +282,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.15.0
+    controller-gen.kubebuilder.io/version: v0.21.0
   name: federations.rabbitmq.com
 spec:
   group: rabbitmq.com
@@ -332,6 +328,15 @@ spec:
                     - on-publish
                     - no-ack
                   type: string
+                deletionPolicy:
+                  default: delete
+                  description: |-
+                    DeletionPolicy defines the behavior of federation in the RabbitMQ cluster when the corresponding custom resource is deleted.
+                    Can be set to 'delete' or 'retain'. Default is 'delete'.
+                  enum:
+                    - delete
+                    - retain
+                  type: string
                 exchange:
                   type: string
                 expires:
@@ -347,6 +352,18 @@ spec:
                   type: integer
                 queue:
                   type: string
+                queueType:
+                  description: |-
+                    The queue type of the internal upstream queue used by exchange federation.
+                    Defaults to classic (a single replica queue type). Set to quorum to use a replicated queue type.
+                    Changing the queue type will delete and recreate the upstream queue by default.
+                    This may lead to messages getting lost or not routed anywhere during the re-declaration.
+                    To avoid that, set resource-cleanup-mode key to never.
+                    This requires manually deleting the old upstream queue so that it can be recreated with the new type.
+                  enum:
+                    - classic
+                    - quorum
+                  type: string
                 rabbitmqClusterReference:
                   description: |-
                     Reference to the RabbitmqCluster that this federation upstream will be created in.
@@ -365,9 +382,7 @@ spec:
                             This field is effectively required, but due to backwards compatibility is
                             allowed to be empty. Instances of this type with an empty value here are
                             almost certainly wrong.
-                            TODO: Add other useful fields. apiVersion, kind, uid?
                             More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                            TODO: Drop `kubebuilder:default` when controller-gen doesn't need it https://github.com/kubernetes-sigs/kubebuilder/issues/3896.
                           type: string
                       type: object
                       x-kubernetes-map-type: atomic
@@ -384,6 +399,15 @@ spec:
                   type: object
                 reconnectDelay:
                   type: integer
+                resourceCleanupMode:
+                  description: |-
+                    Whether to delete the internal upstream queue when federation links stop.
+                    By default, the internal upstream queue is deleted immediately when a federation link stops.
+                    Set to never to keep the upstream queue around and collect messages even when changing federation configuration.
+                  enum:
+                    - default
+                    - never
+                  type: string
                 trustUserId:
                   type: boolean
                 uriSecret:
@@ -400,9 +424,7 @@ spec:
                         This field is effectively required, but due to backwards compatibility is
                         allowed to be empty. Instances of this type with an empty value here are
                         almost certainly wrong.
-                        TODO: Add other useful fields. apiVersion, kind, uid?
                         More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                        TODO: Drop `kubebuilder:default` when controller-gen doesn't need it https://github.com/kubernetes-sigs/kubebuilder/issues/3896.
                       type: string
                   type: object
                   x-kubernetes-map-type: atomic
@@ -459,7 +481,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.15.0
+    controller-gen.kubebuilder.io/version: v0.21.0
   name: operatorpolicies.rabbitmq.com
 spec:
   group: rabbitmq.com
@@ -546,9 +568,7 @@ spec:
                             This field is effectively required, but due to backwards compatibility is
                             allowed to be empty. Instances of this type with an empty value here are
                             almost certainly wrong.
-                            TODO: Add other useful fields. apiVersion, kind, uid?
                             More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                            TODO: Drop `kubebuilder:default` when controller-gen doesn't need it https://github.com/kubernetes-sigs/kubebuilder/issues/3896.
                           type: string
                       type: object
                       x-kubernetes-map-type: atomic
@@ -617,7 +637,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.15.0
+    controller-gen.kubebuilder.io/version: v0.21.0
   name: permissions.rabbitmq.com
 spec:
   group: rabbitmq.com
@@ -685,9 +705,7 @@ spec:
                             This field is effectively required, but due to backwards compatibility is
                             allowed to be empty. Instances of this type with an empty value here are
                             almost certainly wrong.
-                            TODO: Add other useful fields. apiVersion, kind, uid?
                             More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                            TODO: Drop `kubebuilder:default` when controller-gen doesn't need it https://github.com/kubernetes-sigs/kubebuilder/issues/3896.
                           type: string
                       type: object
                       x-kubernetes-map-type: atomic
@@ -715,9 +733,7 @@ spec:
                         This field is effectively required, but due to backwards compatibility is
                         allowed to be empty. Instances of this type with an empty value here are
                         almost certainly wrong.
-                        TODO: Add other useful fields. apiVersion, kind, uid?
                         More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                        TODO: Drop `kubebuilder:default` when controller-gen doesn't need it https://github.com/kubernetes-sigs/kubebuilder/issues/3896.
                       type: string
                   type: object
                   x-kubernetes-map-type: atomic
@@ -773,7 +789,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.15.0
+    controller-gen.kubebuilder.io/version: v0.21.0
   name: policies.rabbitmq.com
 spec:
   group: rabbitmq.com
@@ -862,9 +878,7 @@ spec:
                             This field is effectively required, but due to backwards compatibility is
                             allowed to be empty. Instances of this type with an empty value here are
                             almost certainly wrong.
-                            TODO: Add other useful fields. apiVersion, kind, uid?
                             More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                            TODO: Drop `kubebuilder:default` when controller-gen doesn't need it https://github.com/kubernetes-sigs/kubebuilder/issues/3896.
                           type: string
                       type: object
                       x-kubernetes-map-type: atomic
@@ -933,7 +947,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.15.0
+    controller-gen.kubebuilder.io/version: v0.21.0
   name: queues.rabbitmq.com
 spec:
   group: rabbitmq.com
@@ -986,6 +1000,15 @@ spec:
                 deleteIfUnused:
                   description: when set to true, queues are delete only if they have no consumer.
                   type: boolean
+                deletionPolicy:
+                  default: delete
+                  description: |-
+                    DeletionPolicy defines the behavior of queue in the RabbitMQ cluster when the corresponding custom resource is deleted.
+                    Can be set to 'delete' or 'retain'. Default is 'delete'.
+                  enum:
+                    - delete
+                    - retain
+                  type: string
                 durable:
                   description: When set to false queues does not survive server restart.
                   type: boolean
@@ -1010,9 +1033,7 @@ spec:
                             This field is effectively required, but due to backwards compatibility is
                             allowed to be empty. Instances of this type with an empty value here are
                             almost certainly wrong.
-                            TODO: Add other useful fields. apiVersion, kind, uid?
                             More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                            TODO: Drop `kubebuilder:default` when controller-gen doesn't need it https://github.com/kubernetes-sigs/kubebuilder/issues/3896.
                           type: string
                       type: object
                       x-kubernetes-map-type: atomic
@@ -1081,7 +1102,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.15.0
+    controller-gen.kubebuilder.io/version: v0.21.0
   name: schemareplications.rabbitmq.com
 spec:
   group: rabbitmq.com
@@ -1143,9 +1164,7 @@ spec:
                             This field is effectively required, but due to backwards compatibility is
                             allowed to be empty. Instances of this type with an empty value here are
                             almost certainly wrong.
-                            TODO: Add other useful fields. apiVersion, kind, uid?
                             More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                            TODO: Drop `kubebuilder:default` when controller-gen doesn't need it https://github.com/kubernetes-sigs/kubebuilder/issues/3896.
                           type: string
                       type: object
                       x-kubernetes-map-type: atomic
@@ -1187,9 +1206,7 @@ spec:
                         This field is effectively required, but due to backwards compatibility is
                         allowed to be empty. Instances of this type with an empty value here are
                         almost certainly wrong.
-                        TODO: Add other useful fields. apiVersion, kind, uid?
                         More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                        TODO: Drop `kubebuilder:default` when controller-gen doesn't need it https://github.com/kubernetes-sigs/kubebuilder/issues/3896.
                       type: string
                   type: object
                   x-kubernetes-map-type: atomic
@@ -1240,7 +1257,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.15.0
+    controller-gen.kubebuilder.io/version: v0.21.0
   name: shovels.rabbitmq.com
 spec:
   group: rabbitmq.com
@@ -1290,6 +1307,15 @@ spec:
                   type: boolean
                 deleteAfter:
                   type: string
+                deletionPolicy:
+                  default: delete
+                  description: |-
+                    DeletionPolicy defines the behavior of shovel in the RabbitMQ cluster when the corresponding custom resource is deleted.
+                    Can be set to 'delete' or 'retain'. Default is 'delete'.
+                  enum:
+                    - delete
+                    - retain
+                  type: string
                 destAddForwardHeaders:
                   type: boolean
                 destAddTimestampHeader:
@@ -1327,6 +1353,9 @@ spec:
                 destQueue:
                   description: amqp091 configuration
                   type: string
+                destQueueArgs:
+                  type: object
+                  x-kubernetes-preserve-unknown-fields: true
                 name:
                   description: Required property; cannot be updated
                   type: string
@@ -1350,9 +1379,7 @@ spec:
                             This field is effectively required, but due to backwards compatibility is
                             allowed to be empty. Instances of this type with an empty value here are
                             almost certainly wrong.
-                            TODO: Add other useful fields. apiVersion, kind, uid?
                             More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                            TODO: Drop `kubebuilder:default` when controller-gen doesn't need it https://github.com/kubernetes-sigs/kubebuilder/issues/3896.
                           type: string
                       type: object
                       x-kubernetes-map-type: atomic
@@ -1394,6 +1421,9 @@ spec:
                 srcQueue:
                   description: amqp091 configuration
                   type: string
+                srcQueueArgs:
+                  type: object
+                  x-kubernetes-preserve-unknown-fields: true
                 uriSecret:
                   description: |-
                     Secret contains the AMQP URI(s) to configure Shovel destination and source.
@@ -1408,9 +1438,7 @@ spec:
                         This field is effectively required, but due to backwards compatibility is
                         allowed to be empty. Instances of this type with an empty value here are
                         almost certainly wrong.
-                        TODO: Add other useful fields. apiVersion, kind, uid?
                         More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                        TODO: Drop `kubebuilder:default` when controller-gen doesn't need it https://github.com/kubernetes-sigs/kubebuilder/issues/3896.
                       type: string
                   type: object
                   x-kubernetes-map-type: atomic
@@ -1467,7 +1495,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.15.0
+    controller-gen.kubebuilder.io/version: v0.21.0
   name: superstreams.rabbitmq.com
 spec:
   group: rabbitmq.com
@@ -1532,9 +1560,7 @@ spec:
                             This field is effectively required, but due to backwards compatibility is
                             allowed to be empty. Instances of this type with an empty value here are
                             almost certainly wrong.
-                            TODO: Add other useful fields. apiVersion, kind, uid?
                             More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                            TODO: Drop `kubebuilder:default` when controller-gen doesn't need it https://github.com/kubernetes-sigs/kubebuilder/issues/3896.
                           type: string
                       type: object
                       x-kubernetes-map-type: atomic
@@ -1613,7 +1639,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.15.0
+    controller-gen.kubebuilder.io/version: v0.21.0
   name: topicpermissions.rabbitmq.com
 spec:
   group: rabbitmq.com
@@ -1659,6 +1685,8 @@ spec:
                       type: string
                     write:
                       type: string
+                  required:
+                    - exchange
                   type: object
                 rabbitmqClusterReference:
                   description: |-
@@ -1678,9 +1706,7 @@ spec:
                             This field is effectively required, but due to backwards compatibility is
                             allowed to be empty. Instances of this type with an empty value here are
                             almost certainly wrong.
-                            TODO: Add other useful fields. apiVersion, kind, uid?
                             More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                            TODO: Drop `kubebuilder:default` when controller-gen doesn't need it https://github.com/kubernetes-sigs/kubebuilder/issues/3896.
                           type: string
                       type: object
                       x-kubernetes-map-type: atomic
@@ -1708,9 +1734,7 @@ spec:
                         This field is effectively required, but due to backwards compatibility is
                         allowed to be empty. Instances of this type with an empty value here are
                         almost certainly wrong.
-                        TODO: Add other useful fields. apiVersion, kind, uid?
                         More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                        TODO: Drop `kubebuilder:default` when controller-gen doesn't need it https://github.com/kubernetes-sigs/kubebuilder/issues/3896.
                       type: string
                   type: object
                   x-kubernetes-map-type: atomic
@@ -1766,7 +1790,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.15.0
+    controller-gen.kubebuilder.io/version: v0.21.0
   name: users.rabbitmq.com
 spec:
   group: rabbitmq.com
@@ -1806,12 +1830,16 @@ spec:
               properties:
                 importCredentialsSecret:
                   description: |-
-                    Defines a Secret used to pre-define the username and password set for this User. User objects created
-                    with this field set will not have randomly-generated credentials, and will instead import
-                    the username/password values from this Secret.
-                    The Secret must contain the keys `username` and `password` in its Data field, or the import will fail.
-                    Note that this import only occurs at creation time, and is ignored once a password has been set
-                    on a User.
+                    Defines a Secret containing the credentials for the User. If this field is omitted, random a username and
+                    password will be generated. The Secret must have the following keys in its Data field:
+
+                     * `username` – Must be present or the import will fail.
+                     * `passwordHash` – The SHA-512 hash of the password. If the hash is an empty string, a passwordless user
+                       will be created. For more information, see https://www.rabbitmq.com/docs/passwords.
+                     * `password` – Plain-text password. Will be used only if the `passwordHash` key is missing.
+
+                    The Operator watches this Secret and re-syncs the User's credentials to RabbitMQ whenever it changes,
+                    so updating the Secret's `password`/`passwordHash` rotates the User's password.
                   properties:
                     name:
                       default: ""
@@ -1820,12 +1848,26 @@ spec:
                         This field is effectively required, but due to backwards compatibility is
                         allowed to be empty. Instances of this type with an empty value here are
                         almost certainly wrong.
-                        TODO: Add other useful fields. apiVersion, kind, uid?
                         More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                        TODO: Drop `kubebuilder:default` when controller-gen doesn't need it https://github.com/kubernetes-sigs/kubebuilder/issues/3896.
                       type: string
                   type: object
                   x-kubernetes-map-type: atomic
+                limits:
+                  description: |-
+                    Limits to apply to a user to restrict the number of connections and channels
+                    the user can create. These limits can be used as guard rails in environments
+                    where applications cannot be trusted and monitored in detail, for example,
+                    when RabbitMQ clusters are offered as a service. See https://www.rabbitmq.com/docs/user-limits.
+                  properties:
+                    channels:
+                      description: Limits how many AMQP 0.9.1 channels the user can open.
+                      format: int32
+                      type: integer
+                    connections:
+                      description: Limits how many connections the user can open.
+                      format: int32
+                      type: integer
+                  type: object
                 rabbitmqClusterReference:
                   description: |-
                     Reference to the RabbitmqCluster that the user will be created for. This cluster must
@@ -1844,9 +1886,7 @@ spec:
                             This field is effectively required, but due to backwards compatibility is
                             allowed to be empty. Instances of this type with an empty value here are
                             almost certainly wrong.
-                            TODO: Add other useful fields. apiVersion, kind, uid?
                             More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                            TODO: Drop `kubebuilder:default` when controller-gen doesn't need it https://github.com/kubernetes-sigs/kubebuilder/issues/3896.
                           type: string
                       type: object
                       x-kubernetes-map-type: atomic
@@ -1919,9 +1959,7 @@ spec:
                         This field is effectively required, but due to backwards compatibility is
                         allowed to be empty. Instances of this type with an empty value here are
                         almost certainly wrong.
-                        TODO: Add other useful fields. apiVersion, kind, uid?
                         More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                        TODO: Drop `kubebuilder:default` when controller-gen doesn't need it https://github.com/kubernetes-sigs/kubebuilder/issues/3896.
                       type: string
                   type: object
                   x-kubernetes-map-type: atomic
@@ -1947,7 +1985,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.15.0
+    controller-gen.kubebuilder.io/version: v0.21.0
   name: vhosts.rabbitmq.com
 spec:
   group: rabbitmq.com
@@ -1994,6 +2032,28 @@ spec:
                     - classic
                     - stream
                   type: string
+                deletionPolicy:
+                  default: delete
+                  description: |-
+                    DeletionPolicy defines the behavior of vhost in the RabbitMQ cluster when the corresponding custom resource is deleted.
+                    Can be set to 'delete' or 'retain'. Default is 'delete'.
+                  enum:
+                    - delete
+                    - retain
+                  type: string
+                limits:
+                  description: |-
+                    Limits defines limits to be applied to the vhost.
+                    Supported limits include max-connections and max-queues.
+                    See https://www.rabbitmq.com/docs/vhosts#limits
+                  properties:
+                    connections:
+                      format: int32
+                      type: integer
+                    queues:
+                      format: int32
+                      type: integer
+                  type: object
                 name:
                   description: Name of the vhost; see https://www.rabbitmq.com/vhosts.html.
                   type: string
@@ -2015,9 +2075,7 @@ spec:
                             This field is effectively required, but due to backwards compatibility is
                             allowed to be empty. Instances of this type with an empty value here are
                             almost certainly wrong.
-                            TODO: Add other useful fields. apiVersion, kind, uid?
                             More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                            TODO: Drop `kubebuilder:default` when controller-gen doesn't need it https://github.com/kubernetes-sigs/kubebuilder/issues/3896.
                           type: string
                       type: object
                       x-kubernetes-map-type: atomic
@@ -2085,6 +2143,9 @@ spec:
 apiVersion: v1
 kind: ServiceAccount
 metadata:
+  labels:
+    app.kubernetes.io/managed-by: kustomize
+    app.kubernetes.io/name: messaging-topology-operator
   name: messaging-topology-operator
   namespace: cozy-rabbitmq-operator
 ---
@@ -2092,16 +2153,15 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   labels:
-    app.kubernetes.io/component: rabbitmq-operator
-    app.kubernetes.io/name: rabbitmq-cluster-operator
-    app.kubernetes.io/part-of: rabbitmq
+    app.kubernetes.io/managed-by: kustomize
+    app.kubernetes.io/name: messaging-topology-operator
   name: messaging-topology-leader-election-role
   namespace: cozy-rabbitmq-operator
 rules:
   - apiGroups:
-      - coordination.k8s.io
+      - ""
     resources:
-      - leases
+      - configmaps
     verbs:
       - get
       - list
@@ -2111,15 +2171,9 @@ rules:
       - patch
       - delete
   - apiGroups:
-      - ""
-    resources:
-      - events
-    verbs:
-      - create
-  - apiGroups:
-      - ""
+      - coordination.k8s.io
     resources:
-      - configmaps
+      - leases
     verbs:
       - get
       - list
@@ -2128,20 +2182,19 @@ rules:
       - update
       - patch
       - delete
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  name: messaging-topology-manager-role
-rules:
   - apiGroups:
       - ""
     resources:
       - events
     verbs:
       - create
-      - get
       - patch
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: messaging-topology-manager-role
+rules:
   - apiGroups:
       - ""
     resources:
@@ -2150,6 +2203,7 @@ rules:
       - create
       - get
       - list
+      - update
       - watch
   - apiGroups:
       - ""
@@ -2160,283 +2214,28 @@ rules:
       - list
       - watch
   - apiGroups:
-      - rabbitmq.com
+      - events.k8s.io
     resources:
-      - bindings
+      - events
     verbs:
       - create
-      - delete
-      - get
-      - list
       - patch
-      - update
-      - watch
-  - apiGroups:
-      - rabbitmq.com
-    resources:
-      - bindings/finalizers
-    verbs:
-      - update
-  - apiGroups:
-      - rabbitmq.com
-    resources:
-      - bindings/status
-    verbs:
-      - get
-      - patch
-      - update
   - apiGroups:
       - rabbitmq.com
     resources:
+      - bindings
       - exchanges
-    verbs:
-      - create
-      - delete
-      - get
-      - list
-      - patch
-      - update
-      - watch
-  - apiGroups:
-      - rabbitmq.com
-    resources:
-      - exchanges/finalizers
-    verbs:
-      - update
-  - apiGroups:
-      - rabbitmq.com
-    resources:
-      - exchanges/status
-    verbs:
-      - get
-      - patch
-      - update
-  - apiGroups:
-      - rabbitmq.com
-    resources:
       - federations
-    verbs:
-      - create
-      - delete
-      - get
-      - list
-      - patch
-      - update
-      - watch
-  - apiGroups:
-      - rabbitmq.com
-    resources:
-      - federations/finalizers
-    verbs:
-      - update
-  - apiGroups:
-      - rabbitmq.com
-    resources:
-      - federations/status
-    verbs:
-      - get
-      - patch
-      - update
-  - apiGroups:
-      - rabbitmq.com
-    resources:
       - operatorpolicies
-    verbs:
-      - create
-      - delete
-      - get
-      - list
-      - patch
-      - update
-      - watch
-  - apiGroups:
-      - rabbitmq.com
-    resources:
-      - operatorpolicies/finalizers
-    verbs:
-      - update
-  - apiGroups:
-      - rabbitmq.com
-    resources:
-      - operatorpolicies/status
-    verbs:
-      - get
-      - patch
-      - update
-  - apiGroups:
-      - rabbitmq.com
-    resources:
       - permissions
-    verbs:
-      - create
-      - delete
-      - get
-      - list
-      - patch
-      - update
-      - watch
-  - apiGroups:
-      - rabbitmq.com
-    resources:
-      - permissions/finalizers
-    verbs:
-      - update
-  - apiGroups:
-      - rabbitmq.com
-    resources:
-      - permissions/status
-    verbs:
-      - get
-      - patch
-      - update
-  - apiGroups:
-      - rabbitmq.com
-    resources:
       - policies
-    verbs:
-      - create
-      - delete
-      - get
-      - list
-      - patch
-      - update
-      - watch
-  - apiGroups:
-      - rabbitmq.com
-    resources:
-      - policies/finalizers
-    verbs:
-      - update
-  - apiGroups:
-      - rabbitmq.com
-    resources:
-      - policies/status
-    verbs:
-      - get
-      - patch
-      - update
-  - apiGroups:
-      - rabbitmq.com
-    resources:
       - queues
-    verbs:
-      - create
-      - delete
-      - get
-      - list
-      - patch
-      - update
-      - watch
-  - apiGroups:
-      - rabbitmq.com
-    resources:
-      - queues/finalizers
-    verbs:
-      - update
-  - apiGroups:
-      - rabbitmq.com
-    resources:
-      - queues/status
-    verbs:
-      - get
-      - patch
-      - update
-  - apiGroups:
-      - rabbitmq.com
-    resources:
-      - rabbitmqclusters
-    verbs:
-      - get
-      - list
-      - watch
-  - apiGroups:
-      - rabbitmq.com
-    resources:
-      - rabbitmqclusters/status
-    verbs:
-      - get
-  - apiGroups:
-      - rabbitmq.com
-    resources:
       - schemareplications
-    verbs:
-      - create
-      - delete
-      - get
-      - list
-      - patch
-      - update
-      - watch
-  - apiGroups:
-      - rabbitmq.com
-    resources:
-      - schemareplications/finalizers
-    verbs:
-      - update
-  - apiGroups:
-      - rabbitmq.com
-    resources:
-      - schemareplications/status
-    verbs:
-      - get
-      - patch
-      - update
-  - apiGroups:
-      - rabbitmq.com
-    resources:
       - shovels
-    verbs:
-      - create
-      - delete
-      - get
-      - list
-      - patch
-      - update
-      - watch
-  - apiGroups:
-      - rabbitmq.com
-    resources:
-      - shovels/finalizers
-    verbs:
-      - update
-  - apiGroups:
-      - rabbitmq.com
-    resources:
-      - shovels/status
-    verbs:
-      - get
-      - patch
-      - update
-  - apiGroups:
-      - rabbitmq.com
-    resources:
       - superstreams
-    verbs:
-      - create
-      - delete
-      - get
-      - list
-      - patch
-      - update
-      - watch
-  - apiGroups:
-      - rabbitmq.com
-    resources:
-      - superstreams/finalizers
-    verbs:
-      - update
-  - apiGroups:
-      - rabbitmq.com
-    resources:
-      - superstreams/status
-    verbs:
-      - get
-      - patch
-      - update
-  - apiGroups:
-      - rabbitmq.com
-    resources:
       - topicpermissions
+      - users
+      - vhosts
     verbs:
       - create
       - delete
@@ -2448,13 +2247,37 @@ rules:
   - apiGroups:
       - rabbitmq.com
     resources:
+      - bindings/finalizers
+      - exchanges/finalizers
+      - federations/finalizers
+      - operatorpolicies/finalizers
+      - permissions/finalizers
+      - policies/finalizers
+      - queues/finalizers
+      - schemareplications/finalizers
+      - shovels/finalizers
+      - superstreams/finalizers
       - topicpermissions/finalizers
+      - users/finalizers
+      - vhosts/finalizers
     verbs:
       - update
   - apiGroups:
       - rabbitmq.com
     resources:
+      - bindings/status
+      - exchanges/status
+      - federations/status
+      - operatorpolicies/status
+      - permissions/status
+      - policies/status
+      - queues/status
+      - schemareplications/status
+      - shovels/status
+      - superstreams/status
       - topicpermissions/status
+      - users/status
+      - vhosts/status
     verbs:
       - get
       - patch
@@ -2462,59 +2285,52 @@ rules:
   - apiGroups:
       - rabbitmq.com
     resources:
-      - users
+      - rabbitmqclusters
     verbs:
-      - create
-      - delete
       - get
       - list
-      - patch
-      - update
       - watch
   - apiGroups:
       - rabbitmq.com
     resources:
-      - users/finalizers
-    verbs:
-      - update
-  - apiGroups:
-      - rabbitmq.com
-    resources:
-      - users/status
+      - rabbitmqclusters/status
     verbs:
       - get
-      - patch
-      - update
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: messaging-topology-metrics-auth-role
+rules:
   - apiGroups:
-      - rabbitmq.com
+      - authentication.k8s.io
     resources:
-      - vhosts
+      - tokenreviews
     verbs:
       - create
-      - delete
-      - get
-      - list
-      - patch
-      - update
-      - watch
   - apiGroups:
-      - rabbitmq.com
+      - authorization.k8s.io
     resources:
-      - vhosts/finalizers
+      - subjectaccessreviews
     verbs:
-      - update
-  - apiGroups:
-      - rabbitmq.com
-    resources:
-      - vhosts/status
+      - create
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: messaging-topology-metrics-reader
+rules:
+  - nonResourceURLs:
+      - /metrics
     verbs:
       - get
-      - patch
-      - update
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
+  labels:
+    app.kubernetes.io/managed-by: kustomize
+    app.kubernetes.io/name: messaging-topology-operator
   name: messaging-topology-leader-election-rolebinding
   namespace: cozy-rabbitmq-operator
 roleRef:
@@ -2529,6 +2345,9 @@ subjects:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
+  labels:
+    app.kubernetes.io/managed-by: kustomize
+    app.kubernetes.io/name: messaging-topology-operator
   name: messaging-topology-manager-rolebinding
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -2539,25 +2358,64 @@ subjects:
     name: messaging-topology-operator
     namespace: cozy-rabbitmq-operator
 ---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: messaging-topology-metrics-auth-rolebinding
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: messaging-topology-metrics-auth-role
+subjects:
+  - kind: ServiceAccount
+    name: messaging-topology-operator
+    namespace: cozy-rabbitmq-operator
+---
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    app.kubernetes.io/managed-by: kustomize
+    app.kubernetes.io/name: messaging-topology-operator
+    control-plane: controller-manager
+  name: messaging-topology-controller-metrics-service
+  namespace: cozy-rabbitmq-operator
+spec:
+  ports:
+    - name: https
+      port: 8443
+      protocol: TCP
+      targetPort: 8443
+  selector:
+    app.kubernetes.io/name: messaging-topology-operator
+    control-plane: controller-manager
+---
 apiVersion: v1
 kind: Service
 metadata:
-  name: webhook-service
+  labels:
+    app.kubernetes.io/managed-by: kustomize
+    app.kubernetes.io/name: messaging-topology-operator
+  name: messaging-topology-webhook-service
   namespace: cozy-rabbitmq-operator
 spec:
   ports:
     - port: 443
+      protocol: TCP
       targetPort: 9443
   selector:
     app.kubernetes.io/name: messaging-topology-operator
+    control-plane: controller-manager
 ---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
     app.kubernetes.io/component: rabbitmq-operator
+    app.kubernetes.io/managed-by: kustomize
     app.kubernetes.io/name: messaging-topology-operator
     app.kubernetes.io/part-of: rabbitmq
+    control-plane: controller-manager
   name: messaging-topology-operator
   namespace: cozy-rabbitmq-operator
 spec:
@@ -2567,37 +2425,68 @@ spec:
       app.kubernetes.io/name: messaging-topology-operator
   template:
     metadata:
+      annotations:
+        kubectl.kubernetes.io/default-container: manager
       labels:
         app.kubernetes.io/component: rabbitmq-operator
         app.kubernetes.io/name: messaging-topology-operator
         app.kubernetes.io/part-of: rabbitmq
+        control-plane: controller-manager
     spec:
       containers:
-        - command:
+        - args:
+            - --metrics-bind-address=:8443
+            - --leader-elect
+            - --health-probe-bind-address=:8081
+            - --metrics-secure
+            - --metrics-cert-path=/tmp/k8s-metrics-server/metrics-certs
+          command:
             - /manager
-          env:
-            - name: OPERATOR_NAMESPACE
-              valueFrom:
-                fieldRef:
-                  fieldPath: metadata.namespace
-          image: rabbitmqoperator/messaging-topology-operator:1.14.2
-          imagePullPolicy: Always
+          image: ghcr.io/rabbitmq/messaging-topology-operator:1.20.2
+          livenessProbe:
+            httpGet:
+              path: /healthz
+              port: 8081
+            initialDelaySeconds: 15
+            periodSeconds: 20
           name: manager
           ports:
             - containerPort: 9443
               name: webhook-server
               protocol: TCP
+          readinessProbe:
+            httpGet:
+              path: /readyz
+              port: 8081
+            initialDelaySeconds: 5
+            periodSeconds: 10
           resources:
             limits:
-              cpu: 300m
-              memory: 500Mi
+              cpu: 500m
+              memory: 512Mi
             requests:
-              cpu: 100m
-              memory: 100Mi
+              cpu: 300m
+              memory: 128Mi
+          securityContext:
+            allowPrivilegeEscalation: false
+            capabilities:
+              drop:
+                - ALL
+            readOnlyRootFilesystem: true
+            runAsNonRoot: true
+            seccompProfile:
+              type: RuntimeDefault
           volumeMounts:
             - mountPath: /tmp/k8s-webhook-server/serving-certs
               name: cert
               readOnly: true
+            - mountPath: /tmp/k8s-metrics-server/metrics-certs
+              name: metrics-certs
+              readOnly: true
+      securityContext:
+        runAsNonRoot: true
+        seccompProfile:
+          type: RuntimeDefault
       serviceAccountName: messaging-topology-operator
       terminationGracePeriodSeconds: 10
       volumes:
@@ -2605,45 +2494,106 @@ spec:
           secret:
             defaultMode: 420
             secretName: webhook-server-cert
+        - name: metrics-certs
+          secret:
+            items:
+              - key: ca.crt
+                path: ca.crt
+              - key: tls.crt
+                path: tls.crt
+              - key: tls.key
+                path: tls.key
+            optional: false
+            secretName: metrics-server-cert
+---
+apiVersion: cert-manager.io/v1
+kind: Certificate
+metadata:
+  labels:
+    app.kubernetes.io/managed-by: kustomize
+    app.kubernetes.io/name: messaging-topology-operator
+  name: messaging-topology-metrics-certs
+  namespace: cozy-rabbitmq-operator
+spec:
+  dnsNames:
+    - messaging-topology-controller-metrics-service.cozy-rabbitmq-operator.svc
+    - messaging-topology-controller-metrics-service.cozy-rabbitmq-operator.svc.cluster.local
+  issuerRef:
+    kind: Issuer
+    name: messaging-topology-selfsigned-issuer
+  secretName: metrics-server-cert
 ---
 apiVersion: cert-manager.io/v1
 kind: Certificate
 metadata:
-  name: serving-cert
+  labels:
+    app.kubernetes.io/managed-by: kustomize
+    app.kubernetes.io/name: messaging-topology-operator
+  name: messaging-topology-serving-cert
   namespace: cozy-rabbitmq-operator
 spec:
   dnsNames:
-    - webhook-service.cozy-rabbitmq-operator.svc
-    - webhook-service.cozy-rabbitmq-operator.svc.cluster.local
+    - messaging-topology-webhook-service.cozy-rabbitmq-operator.svc
+    - messaging-topology-webhook-service.cozy-rabbitmq-operator.svc.cluster.local
   issuerRef:
     kind: Issuer
-    name: selfsigned-issuer
+    name: messaging-topology-selfsigned-issuer
   secretName: webhook-server-cert
 ---
 apiVersion: cert-manager.io/v1
 kind: Issuer
 metadata:
-  name: selfsigned-issuer
+  labels:
+    app.kubernetes.io/managed-by: kustomize
+    app.kubernetes.io/name: messaging-topology-operator
+  name: messaging-topology-selfsigned-issuer
   namespace: cozy-rabbitmq-operator
 spec:
   selfSigned: {}
 ---
 apiVersion: admissionregistration.k8s.io/v1
+kind: MutatingWebhookConfiguration
+metadata:
+  annotations:
+    cert-manager.io/inject-ca-from: cozy-rabbitmq-operator/messaging-topology-serving-cert
+  name: messaging-topology-mutating-webhook-configuration
+webhooks:
+  - admissionReviewVersions:
+      - v1
+    clientConfig:
+      service:
+        name: messaging-topology-webhook-service
+        namespace: cozy-rabbitmq-operator
+        path: /mutate-rabbitmq-com-v1beta1-queue
+    failurePolicy: Fail
+    name: mqueue.kb.io
+    rules:
+      - apiGroups:
+          - rabbitmq.com
+        apiVersions:
+          - v1beta1
+        operations:
+          - CREATE
+        resources:
+          - queues
+    sideEffects: None
+---
+apiVersion: admissionregistration.k8s.io/v1
 kind: ValidatingWebhookConfiguration
 metadata:
   annotations:
-    cert-manager.io/inject-ca-from: cozy-rabbitmq-operator/serving-cert
-  name: topology.rabbitmq.com
+    cert-manager.io/inject-ca-from: cozy-rabbitmq-operator/messaging-topology-serving-cert
+  name: messaging-topology-validating-webhook-configuration
 webhooks:
   - admissionReviewVersions:
       - v1
     clientConfig:
       service:
-        name: webhook-service
+        name: messaging-topology-webhook-service
         namespace: cozy-rabbitmq-operator
         path: /validate-rabbitmq-com-v1beta1-binding
     failurePolicy: Fail
-    name: vbinding.kb.io
+    name: vbinding-v1beta1.kb.io
     rules:
       - apiGroups:
           - rabbitmq.com
@@ -2659,7 +2609,7 @@ webhooks:
       - v1
     clientConfig:
       service:
-        name: webhook-service
+        name: messaging-topology-webhook-service
         namespace: cozy-rabbitmq-operator
         path: /validate-rabbitmq-com-v1beta1-exchange
     failurePolicy: Fail
@@ -2679,7 +2629,7 @@ webhooks:
       - v1
     clientConfig:
       service:
-        name: webhook-service
+        name: messaging-topology-webhook-service
         namespace: cozy-rabbitmq-operator
         path: /validate-rabbitmq-com-v1beta1-federation
     failurePolicy: Fail
@@ -2699,11 +2649,11 @@ webhooks:
       - v1
     clientConfig:
       service:
-        name: webhook-service
+        name: messaging-topology-webhook-service
         namespace: cozy-rabbitmq-operator
         path: /validate-rabbitmq-com-v1beta1-operatorpolicy
     failurePolicy: Fail
-    name: voperatorpolicy.kb.io
+    name: voperatorpolicy-v1beta1.kb.io
     rules:
       - apiGroups:
           - rabbitmq.com
@@ -2719,11 +2669,11 @@ webhooks:
       - v1
     clientConfig:
       service:
-        name: webhook-service
+        name: messaging-topology-webhook-service
         namespace: cozy-rabbitmq-operator
         path: /validate-rabbitmq-com-v1beta1-permission
     failurePolicy: Fail
-    name: vpermission.kb.io
+    name: vpermission-v1beta1.kb.io
     rules:
       - apiGroups:
           - rabbitmq.com
@@ -2739,7 +2689,7 @@ webhooks:
       - v1
     clientConfig:
       service:
-        name: webhook-service
+        name: messaging-topology-webhook-service
         namespace: cozy-rabbitmq-operator
         path: /validate-rabbitmq-com-v1beta1-policy
     failurePolicy: Fail
@@ -2759,7 +2709,7 @@ webhooks:
       - v1
     clientConfig:
       service:
-        name: webhook-service
+        name: messaging-topology-webhook-service
         namespace: cozy-rabbitmq-operator
         path: /validate-rabbitmq-com-v1beta1-queue
     failurePolicy: Fail
@@ -2779,11 +2729,11 @@ webhooks:
       - v1
     clientConfig:
       service:
-        name: webhook-service
+        name: messaging-topology-webhook-service
         namespace: cozy-rabbitmq-operator
         path: /validate-rabbitmq-com-v1beta1-schemareplication
     failurePolicy: Fail
-    name: vschemareplication.kb.io
+    name: vschemareplication-v1beta1.kb.io
     rules:
       - apiGroups:
           - rabbitmq.com
@@ -2799,11 +2749,11 @@ webhooks:
       - v1
     clientConfig:
       service:
-        name: webhook-service
+        name: messaging-topology-webhook-service
         namespace: cozy-rabbitmq-operator
         path: /validate-rabbitmq-com-v1beta1-shovel
     failurePolicy: Fail
-    name: vshovel.kb.io
+    name: vshovel-v1beta1.kb.io
     rules:
       - apiGroups:
           - rabbitmq.com
@@ -2817,34 +2767,33 @@ webhooks:
     sideEffects: None
   - admissionReviewVersions:
       - v1
-      - v1beta1
     clientConfig:
       service:
-        name: webhook-service
+        name: messaging-topology-webhook-service
         namespace: cozy-rabbitmq-operator
-        path: /validate-rabbitmq-com-v1beta1-topicpermission
+        path: /validate-rabbitmq-com-v1alpha1-superstream
     failurePolicy: Fail
-    name: vtopicpermission.kb.io
+    name: vsuperstream-v1alpha1.kb.io
     rules:
       - apiGroups:
           - rabbitmq.com
         apiVersions:
-          - v1beta1
+          - v1alpha1
         operations:
           - CREATE
           - UPDATE
         resources:
-          - topicpermissions
+          - superstreams
     sideEffects: None
   - admissionReviewVersions:
       - v1
     clientConfig:
       service:
-        name: webhook-service
+        name: messaging-topology-webhook-service
         namespace: cozy-rabbitmq-operator
-        path: /validate-rabbitmq-com-v1beta1-user
+        path: /validate-rabbitmq-com-v1beta1-topicpermission
     failurePolicy: Fail
-    name: vuser.kb.io
+    name: vtopicpermission-v1beta1.kb.io
     rules:
       - apiGroups:
           - rabbitmq.com
@@ -2854,17 +2803,17 @@ webhooks:
           - CREATE
           - UPDATE
         resources:
-          - users
+          - topicpermissions
     sideEffects: None
   - admissionReviewVersions:
       - v1
     clientConfig:
       service:
-        name: webhook-service
+        name: messaging-topology-webhook-service
         namespace: cozy-rabbitmq-operator
-        path: /validate-rabbitmq-com-v1beta1-vhost
+        path: /validate-rabbitmq-com-v1beta1-user
     failurePolicy: Fail
-    name: vvhost.kb.io
+    name: vuser.kb.io
     rules:
       - apiGroups:
           - rabbitmq.com
@@ -2874,25 +2823,25 @@ webhooks:
           - CREATE
           - UPDATE
         resources:
-          - vhosts
+          - users
     sideEffects: None
   - admissionReviewVersions:
       - v1
     clientConfig:
       service:
-        name: webhook-service
+        name: messaging-topology-webhook-service
         namespace: cozy-rabbitmq-operator
-        path: /validate-rabbitmq-com-v1alpha1-superstream
+        path: /validate-rabbitmq-com-v1beta1-vhost
     failurePolicy: Fail
-    name: vsuperstream.kb.io
+    name: vvhost.kb.io
     rules:
       - apiGroups:
           - rabbitmq.com
         apiVersions:
-          - v1alpha1
+          - v1beta1
         operations:
           - CREATE
           - UPDATE
         resources:
-          - superstreams
+          - vhosts
     sideEffects: None
diff --git a/packages/system/rabbitmq-rd/cozyrds/rabbitmq.yaml b/packages/system/rabbitmq-rd/cozyrds/rabbitmq.yaml
index ccccd18d66..97ab419607 100644
--- a/packages/system/rabbitmq-rd/cozyrds/rabbitmq.yaml
+++ b/packages/system/rabbitmq-rd/cozyrds/rabbitmq.yaml
@@ -8,7 +8,7 @@ spec:
     plural: rabbitmqs
     singular: rabbitmq
     openAPISchema: |-
-      {"title":"Chart Values","type":"object","properties":{"replicas":{"description":"Number of RabbitMQ replicas.","type":"integer","default":3},"resources":{"description":"Explicit CPU and memory configuration for each RabbitMQ replica. When omitted, the preset defined in `resourcesPreset` is applied.","type":"object","default":{},"properties":{"cpu":{"description":"CPU available to each replica.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Memory (RAM) available to each replica.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}},"resourcesPreset":{"description":"Default sizing preset used when `resources` is omitted.","type":"string","default":"t1.nano","enum":["t1.nano","t1.micro","t1.small","t1.medium","t1.large","t1.xlarge","t1.2xlarge","t1.4xlarge","c1.nano","c1.micro","c1.small","c1.medium","c1.large","c1.xlarge","c1.2xlarge","c1.4xlarge","s1.nano","s1.micro","s1.small","s1.medium","s1.large","s1.xlarge","s1.2xlarge","s1.4xlarge","u1.nano","u1.micro","u1.small","u1.medium","u1.large","u1.xlarge","u1.2xlarge","u1.4xlarge","m1.nano","m1.micro","m1.small","m1.medium","m1.large","m1.xlarge","m1.2xlarge","m1.4xlarge","nano","micro","small","medium","large","xlarge","2xlarge"]},"size":{"description":"Persistent Volume Claim size available for application data.","default":"10Gi","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"storageClass":{"description":"StorageClass used to store the data.","type":"string","default":"","x-kubernetes-validations":[{"rule":"self == oldSelf","message":"storageClass is immutable"}]},"external":{"description":"Enable external access from outside the cluster.","type":"boolean","default":false},"version":{"description":"RabbitMQ major.minor version to deploy","type":"string","default":"v4.2","enum":["v4.2","v4.1","v4.0","v3.13"]},"users":{"description":"Users configuration map.","type":"object","default":{},"additionalProperties":{"type":"object","properties":{"password":{"description":"Password for the user.","type":"string"}}}},"vhosts":{"description":"Virtual hosts configuration map.","type":"object","default":{},"additionalProperties":{"type":"object","required":["roles"],"properties":{"roles":{"description":"Virtual host roles list.","type":"object","properties":{"admin":{"description":"List of admin users.","type":"array","items":{"type":"string"}},"readonly":{"description":"List of readonly users.","type":"array","items":{"type":"string"}}}}}}}}}
+      {"title":"Chart Values","type":"object","properties":{"replicas":{"description":"Number of RabbitMQ replicas.","type":"integer","default":3},"resources":{"description":"Explicit CPU and memory configuration for each RabbitMQ replica. Every resource left unset here is taken from `resourcesPreset`.","type":"object","default":{},"properties":{"cpu":{"description":"CPU available to each replica.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Memory (RAM) available to each replica.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}},"resourcesPreset":{"description":"Default sizing preset. It supplies every resource `resources` does not set, not only a `resources` left empty entirely.","type":"string","default":"s1.nano","enum":["t1.nano","t1.micro","t1.small","t1.medium","t1.large","t1.xlarge","t1.2xlarge","t1.4xlarge","c1.nano","c1.micro","c1.small","c1.medium","c1.large","c1.xlarge","c1.2xlarge","c1.4xlarge","s1.nano","s1.micro","s1.small","s1.medium","s1.large","s1.xlarge","s1.2xlarge","s1.4xlarge","u1.nano","u1.micro","u1.small","u1.medium","u1.large","u1.xlarge","u1.2xlarge","u1.4xlarge","m1.nano","m1.micro","m1.small","m1.medium","m1.large","m1.xlarge","m1.2xlarge","m1.4xlarge","nano","micro","small","medium","large","xlarge","2xlarge"]},"size":{"description":"Persistent Volume Claim size available for application data.","default":"10Gi","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"storageClass":{"description":"StorageClass used to store the data.","type":"string","default":"","x-kubernetes-validations":[{"rule":"self == oldSelf","message":"storageClass is immutable"}],"x-cozystack-options":{"source":"storageclass"}},"external":{"description":"Enable external access from outside the cluster.","type":"boolean","default":false},"tls":{"description":"TLS configuration. TLS is off unless `tls.enabled` is set to true.","type":"object","default":{},"properties":{"disableNonTLSListeners":{"description":"Close the plaintext AMQP (5672) and management (15672) listeners. This is a broker-level switch: it drops in-cluster clients as well as external ones, and it cannot be combined with `users` or `vhosts`. Erlang distribution (25672) and epmd (4369) stay plaintext regardless. Defaults to false.","type":"boolean"},"enabled":{"description":"Enable TLS for AMQPS (5671) and Management HTTPS (15671). Applies whether or not `external` is set. Plaintext AMQP (5672) and management (15672) keep serving unless `disableNonTLSListeners` is set as well. Moves the `port` key of the `<release>-default-user` Secret from 5672 to 5671, and the metrics port from 15692 to 15691. Defaults to false.","type":"boolean"}}},"version":{"description":"RabbitMQ major.minor version to deploy","type":"string","default":"v4.2","enum":["v4.2","v4.1","v4.0","v3.13"]},"users":{"description":"Users configuration map.","type":"object","default":{},"additionalProperties":{"type":"object","properties":{"password":{"description":"Password for the user.","type":"string"}}}},"vhosts":{"description":"Virtual hosts configuration map.","type":"object","default":{},"additionalProperties":{"type":"object","required":["roles"],"properties":{"roles":{"description":"Virtual host roles list.","type":"object","properties":{"admin":{"description":"List of admin users.","type":"array","items":{"type":"string"}},"readonly":{"description":"List of readonly users.","type":"array","items":{"type":"string"}}}}}}}}}
   release:
     prefix: rabbitmq-
     labels:
@@ -25,12 +25,39 @@ spec:
     tags:
       - messaging
     icon: PHN2ZyB3aWR0aD0iMTQ0IiBoZWlnaHQ9IjE0NCIgdmlld0JveD0iMCAwIDE0NCAxNDQiIGZpbGw9Im5vbmUiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+CjxyZWN0IHg9Ii0wLjAwMTk1MzEyIiB3aWR0aD0iMTQ0IiBoZWlnaHQ9IjE0NCIgcng9IjI0IiBmaWxsPSJ1cmwoI3BhaW50MF9saW5lYXJfNjgzXzI5NzIpIi8+CjxwYXRoIGQ9Ik0xMTEuNDExIDYyLjhIODIuNDkzOUM4MS43OTY5IDYyLjc5OTcgODEuMTI4NSA2Mi41MjI4IDgwLjYzNTYgNjIuMDMwMUM4MC4xNDI3IDYxLjUzNzMgNzkuODY1NiA2MC44NjkxIDc5Ljg2NTMgNjAuMTcyMlYzMC4wNDEyQzc5Ljg2NTMgMjcuODEgNzguMDU1NiAyNiA3NS44MjQ5IDI2SDY1LjUwMjFDNjMuMjcgMjYgNjEuNDYxNCAyNy44MSA2MS40NjE0IDMwLjA0MTJWNTkuOTg5OEM2MS40NjE0IDYxLjU0MzUgNjAuMjA1IDYyLjgwNjUgNTguNjUwOCA2Mi44MTMzTDQ5LjE3NDMgNjIuODU4NEM0Ny42MDY5IDYyLjg2NjkgNDYuMzMzNiA2MS41OTU1IDQ2LjMzNjYgNjAuMDI5OEw0Ni4zOTU0IDMwLjA0OEM0Ni40MDA1IDI3LjgxMzQgNDQuNTkwMiAyNiA0Mi4zNTUgMjZIMzIuMDQwN0MyOS44MDgzIDI2IDI4IDI3LjgxIDI4IDMwLjA0MTJWMTE0LjQxMkMyOCAxMTYuMzk0IDI5LjYwNjEgMTE4IDMxLjU4NzEgMTE4SDExMS40MTFDMTEzLjM5NCAxMTggMTE1IDExNi4zOTQgMTE1IDExNC40MTJWNjYuMzg4QzExNSA2NC40MDU4IDExMy4zOTQgNjIuOCAxMTEuNDExIDYyLjhaTTk3Ljg1MDggOTQuNDc3OUM5Ny44NTA4IDk3LjA3NTUgOTUuNzQ0NSA5OS4xODE3IDkzLjE0NjQgOTkuMTgxN0g4NC45ODg0QzgyLjM5IDk5LjE4MTcgODAuMjgzNiA5Ny4wNzU1IDgwLjI4MzYgOTQuNDc3OVY4Ni4zMjE3QzgwLjI4MzYgODMuNzIzOCA4Mi4zOSA4MS42MTc5IDg0Ljk4ODQgODEuNjE3OUg5My4xNDY0Qzk1Ljc0NDUgODEuNjE3OSA5Ny44NTA4IDgzLjcyMzggOTcuODUwOCA4Ni4zMjE3Vjk0LjQ3NzlaIiBmaWxsPSJ3aGl0ZSIvPgo8ZGVmcz4KPGxpbmVhckdyYWRpZW50IGlkPSJwYWludDBfbGluZWFyXzY4M18yOTcyIiB4MT0iNSIgeTE9Ii03LjUiIHgyPSIxNDEiIHkyPSIxMjQuNSIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiPgo8c3RvcCBzdG9wLWNvbG9yPSIjRkY4MjJGIi8+CjxzdG9wIG9mZnNldD0iMSIgc3RvcC1jb2xvcj0iI0ZGNjYwMCIvPgo8L2xpbmVhckdyYWRpZW50Pgo8L2RlZnM+Cjwvc3ZnPgo=
-    keysOrder: [["apiVersion"], ["appVersion"], ["kind"], ["metadata"], ["metadata", "name"], ["spec", "replicas"], ["spec", "resources"], ["spec", "resourcesPreset"], ["spec", "size"], ["spec", "storageClass"], ["spec", "external"], ["spec", "version"], ["spec", "users"], ["spec", "vhosts"]]
+    keysOrder: [["apiVersion"], ["appVersion"], ["kind"], ["metadata"], ["metadata", "name"], ["spec", "replicas"], ["spec", "resources"], ["spec", "resourcesPreset"], ["spec", "size"], ["spec", "storageClass"], ["spec", "external"], ["spec", "tls"], ["spec", "version"], ["spec", "users"], ["spec", "vhosts"]]
   secrets:
-    exclude: []
+    # Evaluated before include, so this is the structural backstop against the
+    # label-only trust-anchor include below matching a key-bearing Secret: the
+    # projection API copies Secret data verbatim without filtering keys.
+    #
+    # Every name here holds a private key. -ca holds the CA key (issue a cert for
+    # anything, MITM undetected); -tls holds the server key next to the very
+    # ca.crt a tenant wants, which is why the anchor is published separately;
+    # -erlang-cookie is enough to join the cluster as a peer on 25672 and run
+    # arbitrary Erlang, and disableNonTLSListeners does not protect that port.
+    #
+    # Bounded, not absolute: matching is exact-name with no globs, so a Secret a
+    # future operator version introduces stays in scope of the label-only
+    # include. The primary defence is the lineage webhook stamping only what it
+    # can attribute; this closes the enumerable set. -default-user is excluded
+    # from the exclusion on purpose — it is included by name below.
+    exclude:
+      - resourceNames:
+          - rabbitmq-{{ .name }}-ca
+          - rabbitmq-{{ .name }}-tls
+          - rabbitmq-{{ .name }}-erlang-cookie
     include:
       - resourceNames:
           - rabbitmq-{{ .name }}-default-user
+      # The key-free trust anchor the CA-extraction controller publishes. The
+      # chart names its own CA Secret in a TenantProjection sentinel, and the
+      # controller stamps this label on the projection it writes from that
+      # source — never on the CA Secret, which the exclude list above keeps out
+      # of reach. This is the single, engine-agnostic selector every converged
+      # engine shares; it carries no per-release name templating.
+      - matchLabels:
+          internal.cozystack.io/tenant-ca: "true"
       - matchLabels:
           apps.cozystack.io/user-secret: "true"
   services:
diff --git a/packages/system/redis-operator/Makefile b/packages/system/redis-operator/Makefile
index 09554c39e5..277fad2954 100644
--- a/packages/system/redis-operator/Makefile
+++ b/packages/system/redis-operator/Makefile
@@ -7,16 +7,29 @@ include ../../../hack/package.mk
 
 update:
 	rm -rf charts
-	helm repo add redis-operator https://spotahome.github.io/redis-operator
-	helm repo update redis-operator
-	helm pull redis-operator/redis-operator --untar --untardir charts
-	sed -i '/{{/d' charts/redis-operator/crds/databases.spotahome.com_redisfailovers.yaml
+	helm pull oci://ghcr.io/freshworks-oss/charts/redis-operator --version $(patsubst v%,%,$(REDIS_OPERATOR_TAG)) --untar --untardir charts
+	# Re-apply the chart half of the downstream TLS support. The other half is a
+	# source patch on the image (images/redis-operator/patches/tls.diff) and the
+	# two only work together: the binary reads spec.tls, the CRD is what lets it
+	# through admission, and the ClusterRole is what lets it publish the CA-only
+	# Secret. Drop one and TLS fails silently rather than loudly.
+	#
+	# Both are carried as patches because rm -rf charts above discards any
+	# hand-edit, and the fix belongs upstream (freshworks-oss/redis-operator#85)
+	# rather than here. Retire these when a release carrying it lands.
+	#
+	# --forward guards a re-run by hand over a tree that already carries the
+	# change, where patch(1) defaults diverge by implementation: GNU 2.7.6
+	# refuses and exits 1, Apple 2.0-12u11 takes its "Assume -R? [y]" default and
+	# strips the hunk back out with exit 0, and GNU under --batch does the same.
+	# --forward refuses in all three, leaving a .rej and a non-zero exit.
+	patch --forward --no-backup-if-mismatch -p1 < patches/crd-tls.diff
+	patch --forward --no-backup-if-mismatch -p1 < patches/rbac-tls.diff
 
 image:
 	docker buildx build images/redis-operator \
 		$(call image-tags,redis-operator,$(REDIS_OPERATOR_TAG)) \
-		--cache-from type=registry,ref=$(REGISTRY)/redis-operator:latest \
-		--cache-to type=inline \
+		$(call cache-args,redis-operator) \
 		--metadata-file images/redis-operator.json \
 		$(BUILDX_ARGS)
 	REPOSITORY="$(REGISTRY)/redis-operator" \
diff --git a/packages/system/redis-operator/charts/redis-operator/Chart.yaml b/packages/system/redis-operator/charts/redis-operator/Chart.yaml
index 0d0322d7ba..6fe5d5b4b2 100644
--- a/packages/system/redis-operator/charts/redis-operator/Chart.yaml
+++ b/packages/system/redis-operator/charts/redis-operator/Chart.yaml
@@ -2,8 +2,8 @@ annotations:
   category: Redis Operator
 apiVersion: v1
 appVersion: 1.3.0
-description: A Helm chart for the Spotahome Redis Operator
-home: https://github.com/spotahome/redis-operator
+description: A Helm chart for the Redis Operator
+home: https://github.com/freshworks/redis-operator
 keywords:
 - golang
 - operator
@@ -11,5 +11,5 @@ keywords:
 kubeVersion: '>=1.21.0-0'
 name: redis-operator
 sources:
-- https://github.com/spotahome/redis-operator
-version: 3.3.0
+- https://github.com/freshworks/redis-operator
+version: 3.3.5
diff --git a/packages/system/redis-operator/charts/redis-operator/crds/databases.spotahome.com_redisfailovers.yaml b/packages/system/redis-operator/charts/redis-operator/crds/databases.spotahome.com_redisfailovers.yaml
index 4739b12659..eb7808d6f7 100644
--- a/packages/system/redis-operator/charts/redis-operator/crds/databases.spotahome.com_redisfailovers.yaml
+++ b/packages/system/redis-operator/charts/redis-operator/crds/databases.spotahome.com_redisfailovers.yaml
@@ -1,11 +1,9 @@
-
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: (devel)
-  creationTimestamp: null
   name: redisfailovers.databases.spotahome.com
 spec:
   group: databases.spotahome.com
@@ -37,14 +35,19 @@ spec:
         description: RedisFailover represents a Redis failover
         properties:
           apiVersion:
-            description: 'APIVersion defines the versioned schema of this representation
-              of an object. Servers should convert recognized schemas to the latest
-              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
             type: string
           kind:
-            description: 'Kind is a string value representing the REST resource this
-              object represents. Servers may infer this from the endpoint the client
-              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
             type: string
           metadata:
             type: object
@@ -68,6 +71,13 @@ spec:
                   port:
                     type: string
                 type: object
+              engine:
+                description: Engine selects Redis or Valkey. Omitted or empty means
+                  Redis (historical behavior).
+                enum:
+                - Redis
+                - Valkey
+                type: string
               labelWhitelist:
                 items:
                   type: string
@@ -84,22 +94,20 @@ spec:
                           the pod.
                         properties:
                           preferredDuringSchedulingIgnoredDuringExecution:
-                            description: The scheduler will prefer to schedule pods
-                              to nodes that satisfy the affinity expressions specified
-                              by this field, but it may choose a node that violates
-                              one or more of the expressions. The node that is most
-                              preferred is the one with the greatest sum of weights,
-                              i.e. for each node that meets all of the scheduling
-                              requirements (resource request, requiredDuringScheduling
-                              affinity expressions, etc.), compute a sum by iterating
-                              through the elements of this field and adding "weight"
-                              to the sum if the node matches the corresponding matchExpressions;
-                              the node(s) with the highest sum are the most preferred.
+                            description: |-
+                              The scheduler will prefer to schedule pods to nodes that satisfy
+                              the affinity expressions specified by this field, but it may choose
+                              a node that violates one or more of the expressions. The node that is
+                              most preferred is the one with the greatest sum of weights, i.e.
+                              for each node that meets all of the scheduling requirements (resource
+                              request, requiredDuringScheduling affinity expressions, etc.),
+                              compute a sum by iterating through the elements of this field and adding
+                              "weight" to the sum if the node matches the corresponding matchExpressions; the
+                              node(s) with the highest sum are the most preferred.
                             items:
-                              description: An empty preferred scheduling term matches
-                                all objects with implicit weight 0 (i.e. it's a no-op).
-                                A null preferred scheduling term matches no objects
-                                (i.e. is also a no-op).
+                              description: |-
+                                An empty preferred scheduling term matches all objects with implicit weight 0
+                                (i.e. it's a no-op). A null preferred scheduling term matches no objects (i.e. is also a no-op).
                               properties:
                                 preference:
                                   description: A node selector term, associated with
@@ -109,79 +117,72 @@ spec:
                                       description: A list of node selector requirements
                                         by node's labels.
                                       items:
-                                        description: A node selector requirement is
-                                          a selector that contains values, a key,
-                                          and an operator that relates the key and
-                                          values.
+                                        description: |-
+                                          A node selector requirement is a selector that contains values, a key, and an operator
+                                          that relates the key and values.
                                         properties:
                                           key:
                                             description: The label key that the selector
                                               applies to.
                                             type: string
                                           operator:
-                                            description: Represents a key's relationship
-                                              to a set of values. Valid operators
-                                              are In, NotIn, Exists, DoesNotExist.
-                                              Gt, and Lt.
+                                            description: |-
+                                              Represents a key's relationship to a set of values.
+                                              Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt.
                                             type: string
                                           values:
-                                            description: An array of string values.
-                                              If the operator is In or NotIn, the
-                                              values array must be non-empty. If the
-                                              operator is Exists or DoesNotExist,
-                                              the values array must be empty. If the
-                                              operator is Gt or Lt, the values array
-                                              must have a single element, which will
-                                              be interpreted as an integer. This array
-                                              is replaced during a strategic merge
-                                              patch.
+                                            description: |-
+                                              An array of string values. If the operator is In or NotIn,
+                                              the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                              the values array must be empty. If the operator is Gt or Lt, the values
+                                              array must have a single element, which will be interpreted as an integer.
+                                              This array is replaced during a strategic merge patch.
                                             items:
                                               type: string
                                             type: array
+                                            x-kubernetes-list-type: atomic
                                         required:
                                         - key
                                         - operator
                                         type: object
                                       type: array
+                                      x-kubernetes-list-type: atomic
                                     matchFields:
                                       description: A list of node selector requirements
                                         by node's fields.
                                       items:
-                                        description: A node selector requirement is
-                                          a selector that contains values, a key,
-                                          and an operator that relates the key and
-                                          values.
+                                        description: |-
+                                          A node selector requirement is a selector that contains values, a key, and an operator
+                                          that relates the key and values.
                                         properties:
                                           key:
                                             description: The label key that the selector
                                               applies to.
                                             type: string
                                           operator:
-                                            description: Represents a key's relationship
-                                              to a set of values. Valid operators
-                                              are In, NotIn, Exists, DoesNotExist.
-                                              Gt, and Lt.
+                                            description: |-
+                                              Represents a key's relationship to a set of values.
+                                              Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt.
                                             type: string
                                           values:
-                                            description: An array of string values.
-                                              If the operator is In or NotIn, the
-                                              values array must be non-empty. If the
-                                              operator is Exists or DoesNotExist,
-                                              the values array must be empty. If the
-                                              operator is Gt or Lt, the values array
-                                              must have a single element, which will
-                                              be interpreted as an integer. This array
-                                              is replaced during a strategic merge
-                                              patch.
+                                            description: |-
+                                              An array of string values. If the operator is In or NotIn,
+                                              the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                              the values array must be empty. If the operator is Gt or Lt, the values
+                                              array must have a single element, which will be interpreted as an integer.
+                                              This array is replaced during a strategic merge patch.
                                             items:
                                               type: string
                                             type: array
+                                            x-kubernetes-list-type: atomic
                                         required:
                                         - key
                                         - operator
                                         type: object
                                       type: array
+                                      x-kubernetes-list-type: atomic
                                   type: object
+                                  x-kubernetes-map-type: atomic
                                 weight:
                                   description: Weight associated with matching the
                                     corresponding nodeSelectorTerm, in the range 1-100.
@@ -192,105 +193,100 @@ spec:
                               - weight
                               type: object
                             type: array
+                            x-kubernetes-list-type: atomic
                           requiredDuringSchedulingIgnoredDuringExecution:
-                            description: If the affinity requirements specified by
-                              this field are not met at scheduling time, the pod will
-                              not be scheduled onto the node. If the affinity requirements
-                              specified by this field cease to be met at some point
-                              during pod execution (e.g. due to an update), the system
-                              may or may not try to eventually evict the pod from
-                              its node.
+                            description: |-
+                              If the affinity requirements specified by this field are not met at
+                              scheduling time, the pod will not be scheduled onto the node.
+                              If the affinity requirements specified by this field cease to be met
+                              at some point during pod execution (e.g. due to an update), the system
+                              may or may not try to eventually evict the pod from its node.
                             properties:
                               nodeSelectorTerms:
                                 description: Required. A list of node selector terms.
                                   The terms are ORed.
                                 items:
-                                  description: A null or empty node selector term
-                                    matches no objects. The requirements of them are
-                                    ANDed. The TopologySelectorTerm type implements
-                                    a subset of the NodeSelectorTerm.
+                                  description: |-
+                                    A null or empty node selector term matches no objects. The requirements of
+                                    them are ANDed.
+                                    The TopologySelectorTerm type implements a subset of the NodeSelectorTerm.
                                   properties:
                                     matchExpressions:
                                       description: A list of node selector requirements
                                         by node's labels.
                                       items:
-                                        description: A node selector requirement is
-                                          a selector that contains values, a key,
-                                          and an operator that relates the key and
-                                          values.
+                                        description: |-
+                                          A node selector requirement is a selector that contains values, a key, and an operator
+                                          that relates the key and values.
                                         properties:
                                           key:
                                             description: The label key that the selector
                                               applies to.
                                             type: string
                                           operator:
-                                            description: Represents a key's relationship
-                                              to a set of values. Valid operators
-                                              are In, NotIn, Exists, DoesNotExist.
-                                              Gt, and Lt.
+                                            description: |-
+                                              Represents a key's relationship to a set of values.
+                                              Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt.
                                             type: string
                                           values:
-                                            description: An array of string values.
-                                              If the operator is In or NotIn, the
-                                              values array must be non-empty. If the
-                                              operator is Exists or DoesNotExist,
-                                              the values array must be empty. If the
-                                              operator is Gt or Lt, the values array
-                                              must have a single element, which will
-                                              be interpreted as an integer. This array
-                                              is replaced during a strategic merge
-                                              patch.
+                                            description: |-
+                                              An array of string values. If the operator is In or NotIn,
+                                              the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                              the values array must be empty. If the operator is Gt or Lt, the values
+                                              array must have a single element, which will be interpreted as an integer.
+                                              This array is replaced during a strategic merge patch.
                                             items:
                                               type: string
                                             type: array
+                                            x-kubernetes-list-type: atomic
                                         required:
                                         - key
                                         - operator
                                         type: object
                                       type: array
+                                      x-kubernetes-list-type: atomic
                                     matchFields:
                                       description: A list of node selector requirements
                                         by node's fields.
                                       items:
-                                        description: A node selector requirement is
-                                          a selector that contains values, a key,
-                                          and an operator that relates the key and
-                                          values.
+                                        description: |-
+                                          A node selector requirement is a selector that contains values, a key, and an operator
+                                          that relates the key and values.
                                         properties:
                                           key:
                                             description: The label key that the selector
                                               applies to.
                                             type: string
                                           operator:
-                                            description: Represents a key's relationship
-                                              to a set of values. Valid operators
-                                              are In, NotIn, Exists, DoesNotExist.
-                                              Gt, and Lt.
+                                            description: |-
+                                              Represents a key's relationship to a set of values.
+                                              Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt.
                                             type: string
                                           values:
-                                            description: An array of string values.
-                                              If the operator is In or NotIn, the
-                                              values array must be non-empty. If the
-                                              operator is Exists or DoesNotExist,
-                                              the values array must be empty. If the
-                                              operator is Gt or Lt, the values array
-                                              must have a single element, which will
-                                              be interpreted as an integer. This array
-                                              is replaced during a strategic merge
-                                              patch.
+                                            description: |-
+                                              An array of string values. If the operator is In or NotIn,
+                                              the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                              the values array must be empty. If the operator is Gt or Lt, the values
+                                              array must have a single element, which will be interpreted as an integer.
+                                              This array is replaced during a strategic merge patch.
                                             items:
                                               type: string
                                             type: array
+                                            x-kubernetes-list-type: atomic
                                         required:
                                         - key
                                         - operator
                                         type: object
                                       type: array
+                                      x-kubernetes-list-type: atomic
                                   type: object
+                                  x-kubernetes-map-type: atomic
                                 type: array
+                                x-kubernetes-list-type: atomic
                             required:
                             - nodeSelectorTerms
                             type: object
+                            x-kubernetes-map-type: atomic
                         type: object
                       podAffinity:
                         description: Describes pod affinity scheduling rules (e.g.
@@ -298,18 +294,16 @@ spec:
                           other pod(s)).
                         properties:
                           preferredDuringSchedulingIgnoredDuringExecution:
-                            description: The scheduler will prefer to schedule pods
-                              to nodes that satisfy the affinity expressions specified
-                              by this field, but it may choose a node that violates
-                              one or more of the expressions. The node that is most
-                              preferred is the one with the greatest sum of weights,
-                              i.e. for each node that meets all of the scheduling
-                              requirements (resource request, requiredDuringScheduling
-                              affinity expressions, etc.), compute a sum by iterating
-                              through the elements of this field and adding "weight"
-                              to the sum if the node has pods which matches the corresponding
-                              podAffinityTerm; the node(s) with the highest sum are
-                              the most preferred.
+                            description: |-
+                              The scheduler will prefer to schedule pods to nodes that satisfy
+                              the affinity expressions specified by this field, but it may choose
+                              a node that violates one or more of the expressions. The node that is
+                              most preferred is the one with the greatest sum of weights, i.e.
+                              for each node that meets all of the scheduling requirements (resource
+                              request, requiredDuringScheduling affinity expressions, etc.),
+                              compute a sum by iterating through the elements of this field and adding
+                              "weight" to the sum if the node has pods which matches the corresponding podAffinityTerm; the
+                              node(s) with the highest sum are the most preferred.
                             items:
                               description: The weights of all of the matched WeightedPodAffinityTerm
                                 fields are added per-node to find the most preferred
@@ -320,141 +314,159 @@ spec:
                                     with the corresponding weight.
                                   properties:
                                     labelSelector:
-                                      description: A label query over a set of resources,
-                                        in this case pods.
+                                      description: |-
+                                        A label query over a set of resources, in this case pods.
+                                        If it's null, this PodAffinityTerm matches with no Pods.
                                       properties:
                                         matchExpressions:
                                           description: matchExpressions is a list
                                             of label selector requirements. The requirements
                                             are ANDed.
                                           items:
-                                            description: A label selector requirement
-                                              is a selector that contains values,
-                                              a key, and an operator that relates
-                                              the key and values.
+                                            description: |-
+                                              A label selector requirement is a selector that contains values, a key, and an operator that
+                                              relates the key and values.
                                             properties:
                                               key:
                                                 description: key is the label key
                                                   that the selector applies to.
                                                 type: string
                                               operator:
-                                                description: operator represents a
-                                                  key's relationship to a set of values.
-                                                  Valid operators are In, NotIn, Exists
-                                                  and DoesNotExist.
+                                                description: |-
+                                                  operator represents a key's relationship to a set of values.
+                                                  Valid operators are In, NotIn, Exists and DoesNotExist.
                                                 type: string
                                               values:
-                                                description: values is an array of
-                                                  string values. If the operator is
-                                                  In or NotIn, the values array must
-                                                  be non-empty. If the operator is
-                                                  Exists or DoesNotExist, the values
-                                                  array must be empty. This array
-                                                  is replaced during a strategic merge
-                                                  patch.
+                                                description: |-
+                                                  values is an array of string values. If the operator is In or NotIn,
+                                                  the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                                  the values array must be empty. This array is replaced during a strategic
+                                                  merge patch.
                                                 items:
                                                   type: string
                                                 type: array
+                                                x-kubernetes-list-type: atomic
                                             required:
                                             - key
                                             - operator
                                             type: object
                                           type: array
+                                          x-kubernetes-list-type: atomic
                                         matchLabels:
                                           additionalProperties:
                                             type: string
-                                          description: matchLabels is a map of {key,value}
-                                            pairs. A single {key,value} in the matchLabels
-                                            map is equivalent to an element of matchExpressions,
-                                            whose key field is "key", the operator
-                                            is "In", and the values array contains
-                                            only "value". The requirements are ANDed.
+                                          description: |-
+                                            matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                            map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                            operator is "In", and the values array contains only "value". The requirements are ANDed.
                                           type: object
                                       type: object
+                                      x-kubernetes-map-type: atomic
+                                    matchLabelKeys:
+                                      description: |-
+                                        MatchLabelKeys is a set of pod label keys to select which pods will
+                                        be taken into consideration. The keys are used to lookup values from the
+                                        incoming pod labels, those key-value labels are merged with `labelSelector` as `key in (value)`
+                                        to select the group of existing pods which pods will be taken into consideration
+                                        for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+                                        pod labels will be ignored. The default value is empty.
+                                        The same key is forbidden to exist in both matchLabelKeys and labelSelector.
+                                        Also, matchLabelKeys cannot be set when labelSelector isn't set.
+                                      items:
+                                        type: string
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    mismatchLabelKeys:
+                                      description: |-
+                                        MismatchLabelKeys is a set of pod label keys to select which pods will
+                                        be taken into consideration. The keys are used to lookup values from the
+                                        incoming pod labels, those key-value labels are merged with `labelSelector` as `key notin (value)`
+                                        to select the group of existing pods which pods will be taken into consideration
+                                        for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+                                        pod labels will be ignored. The default value is empty.
+                                        The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
+                                        Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
+                                      items:
+                                        type: string
+                                      type: array
+                                      x-kubernetes-list-type: atomic
                                     namespaceSelector:
-                                      description: A label query over the set of namespaces
-                                        that the term applies to. The term is applied
-                                        to the union of the namespaces selected by
-                                        this field and the ones listed in the namespaces
-                                        field. null selector and null or empty namespaces
-                                        list means "this pod's namespace". An empty
-                                        selector ({}) matches all namespaces.
+                                      description: |-
+                                        A label query over the set of namespaces that the term applies to.
+                                        The term is applied to the union of the namespaces selected by this field
+                                        and the ones listed in the namespaces field.
+                                        null selector and null or empty namespaces list means "this pod's namespace".
+                                        An empty selector ({}) matches all namespaces.
                                       properties:
                                         matchExpressions:
                                           description: matchExpressions is a list
                                             of label selector requirements. The requirements
                                             are ANDed.
                                           items:
-                                            description: A label selector requirement
-                                              is a selector that contains values,
-                                              a key, and an operator that relates
-                                              the key and values.
+                                            description: |-
+                                              A label selector requirement is a selector that contains values, a key, and an operator that
+                                              relates the key and values.
                                             properties:
                                               key:
                                                 description: key is the label key
                                                   that the selector applies to.
                                                 type: string
                                               operator:
-                                                description: operator represents a
-                                                  key's relationship to a set of values.
-                                                  Valid operators are In, NotIn, Exists
-                                                  and DoesNotExist.
+                                                description: |-
+                                                  operator represents a key's relationship to a set of values.
+                                                  Valid operators are In, NotIn, Exists and DoesNotExist.
                                                 type: string
                                               values:
-                                                description: values is an array of
-                                                  string values. If the operator is
-                                                  In or NotIn, the values array must
-                                                  be non-empty. If the operator is
-                                                  Exists or DoesNotExist, the values
-                                                  array must be empty. This array
-                                                  is replaced during a strategic merge
-                                                  patch.
+                                                description: |-
+                                                  values is an array of string values. If the operator is In or NotIn,
+                                                  the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                                  the values array must be empty. This array is replaced during a strategic
+                                                  merge patch.
                                                 items:
                                                   type: string
                                                 type: array
+                                                x-kubernetes-list-type: atomic
                                             required:
                                             - key
                                             - operator
                                             type: object
                                           type: array
+                                          x-kubernetes-list-type: atomic
                                         matchLabels:
                                           additionalProperties:
                                             type: string
-                                          description: matchLabels is a map of {key,value}
-                                            pairs. A single {key,value} in the matchLabels
-                                            map is equivalent to an element of matchExpressions,
-                                            whose key field is "key", the operator
-                                            is "In", and the values array contains
-                                            only "value". The requirements are ANDed.
+                                          description: |-
+                                            matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                            map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                            operator is "In", and the values array contains only "value". The requirements are ANDed.
                                           type: object
                                       type: object
+                                      x-kubernetes-map-type: atomic
                                     namespaces:
-                                      description: namespaces specifies a static list
-                                        of namespace names that the term applies to.
-                                        The term is applied to the union of the namespaces
-                                        listed in this field and the ones selected
-                                        by namespaceSelector. null or empty namespaces
-                                        list and null namespaceSelector means "this
-                                        pod's namespace".
+                                      description: |-
+                                        namespaces specifies a static list of namespace names that the term applies to.
+                                        The term is applied to the union of the namespaces listed in this field
+                                        and the ones selected by namespaceSelector.
+                                        null or empty namespaces list and null namespaceSelector means "this pod's namespace".
                                       items:
                                         type: string
                                       type: array
+                                      x-kubernetes-list-type: atomic
                                     topologyKey:
-                                      description: This pod should be co-located (affinity)
-                                        or not co-located (anti-affinity) with the
-                                        pods matching the labelSelector in the specified
-                                        namespaces, where co-located is defined as
-                                        running on a node whose value of the label
-                                        with key topologyKey matches that of any node
-                                        on which any of the selected pods is running.
+                                      description: |-
+                                        This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching
+                                        the labelSelector in the specified namespaces, where co-located is defined as running on a node
+                                        whose value of the label with key topologyKey matches that of any node on which any of the
+                                        selected pods is running.
                                         Empty topologyKey is not allowed.
                                       type: string
                                   required:
                                   - topologyKey
                                   type: object
                                 weight:
-                                  description: weight associated with matching the
-                                    corresponding podAffinityTerm, in the range 1-100.
+                                  description: |-
+                                    weight associated with matching the corresponding podAffinityTerm,
+                                    in the range 1-100.
                                   format: int32
                                   type: integer
                               required:
@@ -462,155 +474,177 @@ spec:
                               - weight
                               type: object
                             type: array
+                            x-kubernetes-list-type: atomic
                           requiredDuringSchedulingIgnoredDuringExecution:
-                            description: If the affinity requirements specified by
-                              this field are not met at scheduling time, the pod will
-                              not be scheduled onto the node. If the affinity requirements
-                              specified by this field cease to be met at some point
-                              during pod execution (e.g. due to a pod label update),
-                              the system may or may not try to eventually evict the
-                              pod from its node. When there are multiple elements,
-                              the lists of nodes corresponding to each podAffinityTerm
-                              are intersected, i.e. all terms must be satisfied.
+                            description: |-
+                              If the affinity requirements specified by this field are not met at
+                              scheduling time, the pod will not be scheduled onto the node.
+                              If the affinity requirements specified by this field cease to be met
+                              at some point during pod execution (e.g. due to a pod label update), the
+                              system may or may not try to eventually evict the pod from its node.
+                              When there are multiple elements, the lists of nodes corresponding to each
+                              podAffinityTerm are intersected, i.e. all terms must be satisfied.
                             items:
-                              description: Defines a set of pods (namely those matching
-                                the labelSelector relative to the given namespace(s))
-                                that this pod should be co-located (affinity) or not
-                                co-located (anti-affinity) with, where co-located
-                                is defined as running on a node whose value of the
-                                label with key <topologyKey> matches that of any node
-                                on which a pod of the set of pods is running
+                              description: |-
+                                Defines a set of pods (namely those matching the labelSelector
+                                relative to the given namespace(s)) that this pod should be
+                                co-located (affinity) or not co-located (anti-affinity) with,
+                                where co-located is defined as running on a node whose value of
+                                the label with key <topologyKey> matches that of any node on which
+                                a pod of the set of pods is running
                               properties:
                                 labelSelector:
-                                  description: A label query over a set of resources,
-                                    in this case pods.
+                                  description: |-
+                                    A label query over a set of resources, in this case pods.
+                                    If it's null, this PodAffinityTerm matches with no Pods.
                                   properties:
                                     matchExpressions:
                                       description: matchExpressions is a list of label
                                         selector requirements. The requirements are
                                         ANDed.
                                       items:
-                                        description: A label selector requirement
-                                          is a selector that contains values, a key,
-                                          and an operator that relates the key and
-                                          values.
+                                        description: |-
+                                          A label selector requirement is a selector that contains values, a key, and an operator that
+                                          relates the key and values.
                                         properties:
                                           key:
                                             description: key is the label key that
                                               the selector applies to.
                                             type: string
                                           operator:
-                                            description: operator represents a key's
-                                              relationship to a set of values. Valid
-                                              operators are In, NotIn, Exists and
-                                              DoesNotExist.
+                                            description: |-
+                                              operator represents a key's relationship to a set of values.
+                                              Valid operators are In, NotIn, Exists and DoesNotExist.
                                             type: string
                                           values:
-                                            description: values is an array of string
-                                              values. If the operator is In or NotIn,
-                                              the values array must be non-empty.
-                                              If the operator is Exists or DoesNotExist,
-                                              the values array must be empty. This
-                                              array is replaced during a strategic
+                                            description: |-
+                                              values is an array of string values. If the operator is In or NotIn,
+                                              the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                              the values array must be empty. This array is replaced during a strategic
                                               merge patch.
                                             items:
                                               type: string
                                             type: array
+                                            x-kubernetes-list-type: atomic
                                         required:
                                         - key
                                         - operator
                                         type: object
                                       type: array
+                                      x-kubernetes-list-type: atomic
                                     matchLabels:
                                       additionalProperties:
                                         type: string
-                                      description: matchLabels is a map of {key,value}
-                                        pairs. A single {key,value} in the matchLabels
-                                        map is equivalent to an element of matchExpressions,
-                                        whose key field is "key", the operator is
-                                        "In", and the values array contains only "value".
-                                        The requirements are ANDed.
+                                      description: |-
+                                        matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                        map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                        operator is "In", and the values array contains only "value". The requirements are ANDed.
                                       type: object
                                   type: object
+                                  x-kubernetes-map-type: atomic
+                                matchLabelKeys:
+                                  description: |-
+                                    MatchLabelKeys is a set of pod label keys to select which pods will
+                                    be taken into consideration. The keys are used to lookup values from the
+                                    incoming pod labels, those key-value labels are merged with `labelSelector` as `key in (value)`
+                                    to select the group of existing pods which pods will be taken into consideration
+                                    for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+                                    pod labels will be ignored. The default value is empty.
+                                    The same key is forbidden to exist in both matchLabelKeys and labelSelector.
+                                    Also, matchLabelKeys cannot be set when labelSelector isn't set.
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                mismatchLabelKeys:
+                                  description: |-
+                                    MismatchLabelKeys is a set of pod label keys to select which pods will
+                                    be taken into consideration. The keys are used to lookup values from the
+                                    incoming pod labels, those key-value labels are merged with `labelSelector` as `key notin (value)`
+                                    to select the group of existing pods which pods will be taken into consideration
+                                    for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+                                    pod labels will be ignored. The default value is empty.
+                                    The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
+                                    Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
                                 namespaceSelector:
-                                  description: A label query over the set of namespaces
-                                    that the term applies to. The term is applied
-                                    to the union of the namespaces selected by this
-                                    field and the ones listed in the namespaces field.
-                                    null selector and null or empty namespaces list
-                                    means "this pod's namespace". An empty selector
-                                    ({}) matches all namespaces.
+                                  description: |-
+                                    A label query over the set of namespaces that the term applies to.
+                                    The term is applied to the union of the namespaces selected by this field
+                                    and the ones listed in the namespaces field.
+                                    null selector and null or empty namespaces list means "this pod's namespace".
+                                    An empty selector ({}) matches all namespaces.
                                   properties:
                                     matchExpressions:
                                       description: matchExpressions is a list of label
                                         selector requirements. The requirements are
                                         ANDed.
                                       items:
-                                        description: A label selector requirement
-                                          is a selector that contains values, a key,
-                                          and an operator that relates the key and
-                                          values.
+                                        description: |-
+                                          A label selector requirement is a selector that contains values, a key, and an operator that
+                                          relates the key and values.
                                         properties:
                                           key:
                                             description: key is the label key that
                                               the selector applies to.
                                             type: string
                                           operator:
-                                            description: operator represents a key's
-                                              relationship to a set of values. Valid
-                                              operators are In, NotIn, Exists and
-                                              DoesNotExist.
+                                            description: |-
+                                              operator represents a key's relationship to a set of values.
+                                              Valid operators are In, NotIn, Exists and DoesNotExist.
                                             type: string
                                           values:
-                                            description: values is an array of string
-                                              values. If the operator is In or NotIn,
-                                              the values array must be non-empty.
-                                              If the operator is Exists or DoesNotExist,
-                                              the values array must be empty. This
-                                              array is replaced during a strategic
+                                            description: |-
+                                              values is an array of string values. If the operator is In or NotIn,
+                                              the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                              the values array must be empty. This array is replaced during a strategic
                                               merge patch.
                                             items:
                                               type: string
                                             type: array
+                                            x-kubernetes-list-type: atomic
                                         required:
                                         - key
                                         - operator
                                         type: object
                                       type: array
+                                      x-kubernetes-list-type: atomic
                                     matchLabels:
                                       additionalProperties:
                                         type: string
-                                      description: matchLabels is a map of {key,value}
-                                        pairs. A single {key,value} in the matchLabels
-                                        map is equivalent to an element of matchExpressions,
-                                        whose key field is "key", the operator is
-                                        "In", and the values array contains only "value".
-                                        The requirements are ANDed.
+                                      description: |-
+                                        matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                        map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                        operator is "In", and the values array contains only "value". The requirements are ANDed.
                                       type: object
                                   type: object
+                                  x-kubernetes-map-type: atomic
                                 namespaces:
-                                  description: namespaces specifies a static list
-                                    of namespace names that the term applies to. The
-                                    term is applied to the union of the namespaces
-                                    listed in this field and the ones selected by
-                                    namespaceSelector. null or empty namespaces list
-                                    and null namespaceSelector means "this pod's namespace".
+                                  description: |-
+                                    namespaces specifies a static list of namespace names that the term applies to.
+                                    The term is applied to the union of the namespaces listed in this field
+                                    and the ones selected by namespaceSelector.
+                                    null or empty namespaces list and null namespaceSelector means "this pod's namespace".
                                   items:
                                     type: string
                                   type: array
+                                  x-kubernetes-list-type: atomic
                                 topologyKey:
-                                  description: This pod should be co-located (affinity)
-                                    or not co-located (anti-affinity) with the pods
-                                    matching the labelSelector in the specified namespaces,
-                                    where co-located is defined as running on a node
-                                    whose value of the label with key topologyKey
-                                    matches that of any node on which any of the selected
-                                    pods is running. Empty topologyKey is not allowed.
+                                  description: |-
+                                    This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching
+                                    the labelSelector in the specified namespaces, where co-located is defined as running on a node
+                                    whose value of the label with key topologyKey matches that of any node on which any of the
+                                    selected pods is running.
+                                    Empty topologyKey is not allowed.
                                   type: string
                               required:
                               - topologyKey
                               type: object
                             type: array
+                            x-kubernetes-list-type: atomic
                         type: object
                       podAntiAffinity:
                         description: Describes pod anti-affinity scheduling rules
@@ -618,18 +652,16 @@ spec:
                           as some other pod(s)).
                         properties:
                           preferredDuringSchedulingIgnoredDuringExecution:
-                            description: The scheduler will prefer to schedule pods
-                              to nodes that satisfy the anti-affinity expressions
-                              specified by this field, but it may choose a node that
-                              violates one or more of the expressions. The node that
-                              is most preferred is the one with the greatest sum of
-                              weights, i.e. for each node that meets all of the scheduling
-                              requirements (resource request, requiredDuringScheduling
-                              anti-affinity expressions, etc.), compute a sum by iterating
-                              through the elements of this field and adding "weight"
-                              to the sum if the node has pods which matches the corresponding
-                              podAffinityTerm; the node(s) with the highest sum are
-                              the most preferred.
+                            description: |-
+                              The scheduler will prefer to schedule pods to nodes that satisfy
+                              the anti-affinity expressions specified by this field, but it may choose
+                              a node that violates one or more of the expressions. The node that is
+                              most preferred is the one with the greatest sum of weights, i.e.
+                              for each node that meets all of the scheduling requirements (resource
+                              request, requiredDuringScheduling anti-affinity expressions, etc.),
+                              compute a sum by iterating through the elements of this field and adding
+                              "weight" to the sum if the node has pods which matches the corresponding podAffinityTerm; the
+                              node(s) with the highest sum are the most preferred.
                             items:
                               description: The weights of all of the matched WeightedPodAffinityTerm
                                 fields are added per-node to find the most preferred
@@ -640,141 +672,159 @@ spec:
                                     with the corresponding weight.
                                   properties:
                                     labelSelector:
-                                      description: A label query over a set of resources,
-                                        in this case pods.
+                                      description: |-
+                                        A label query over a set of resources, in this case pods.
+                                        If it's null, this PodAffinityTerm matches with no Pods.
                                       properties:
                                         matchExpressions:
                                           description: matchExpressions is a list
                                             of label selector requirements. The requirements
                                             are ANDed.
                                           items:
-                                            description: A label selector requirement
-                                              is a selector that contains values,
-                                              a key, and an operator that relates
-                                              the key and values.
+                                            description: |-
+                                              A label selector requirement is a selector that contains values, a key, and an operator that
+                                              relates the key and values.
                                             properties:
                                               key:
                                                 description: key is the label key
                                                   that the selector applies to.
                                                 type: string
                                               operator:
-                                                description: operator represents a
-                                                  key's relationship to a set of values.
-                                                  Valid operators are In, NotIn, Exists
-                                                  and DoesNotExist.
+                                                description: |-
+                                                  operator represents a key's relationship to a set of values.
+                                                  Valid operators are In, NotIn, Exists and DoesNotExist.
                                                 type: string
                                               values:
-                                                description: values is an array of
-                                                  string values. If the operator is
-                                                  In or NotIn, the values array must
-                                                  be non-empty. If the operator is
-                                                  Exists or DoesNotExist, the values
-                                                  array must be empty. This array
-                                                  is replaced during a strategic merge
-                                                  patch.
+                                                description: |-
+                                                  values is an array of string values. If the operator is In or NotIn,
+                                                  the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                                  the values array must be empty. This array is replaced during a strategic
+                                                  merge patch.
                                                 items:
                                                   type: string
                                                 type: array
+                                                x-kubernetes-list-type: atomic
                                             required:
                                             - key
                                             - operator
                                             type: object
                                           type: array
+                                          x-kubernetes-list-type: atomic
                                         matchLabels:
                                           additionalProperties:
                                             type: string
-                                          description: matchLabels is a map of {key,value}
-                                            pairs. A single {key,value} in the matchLabels
-                                            map is equivalent to an element of matchExpressions,
-                                            whose key field is "key", the operator
-                                            is "In", and the values array contains
-                                            only "value". The requirements are ANDed.
+                                          description: |-
+                                            matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                            map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                            operator is "In", and the values array contains only "value". The requirements are ANDed.
                                           type: object
                                       type: object
+                                      x-kubernetes-map-type: atomic
+                                    matchLabelKeys:
+                                      description: |-
+                                        MatchLabelKeys is a set of pod label keys to select which pods will
+                                        be taken into consideration. The keys are used to lookup values from the
+                                        incoming pod labels, those key-value labels are merged with `labelSelector` as `key in (value)`
+                                        to select the group of existing pods which pods will be taken into consideration
+                                        for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+                                        pod labels will be ignored. The default value is empty.
+                                        The same key is forbidden to exist in both matchLabelKeys and labelSelector.
+                                        Also, matchLabelKeys cannot be set when labelSelector isn't set.
+                                      items:
+                                        type: string
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    mismatchLabelKeys:
+                                      description: |-
+                                        MismatchLabelKeys is a set of pod label keys to select which pods will
+                                        be taken into consideration. The keys are used to lookup values from the
+                                        incoming pod labels, those key-value labels are merged with `labelSelector` as `key notin (value)`
+                                        to select the group of existing pods which pods will be taken into consideration
+                                        for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+                                        pod labels will be ignored. The default value is empty.
+                                        The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
+                                        Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
+                                      items:
+                                        type: string
+                                      type: array
+                                      x-kubernetes-list-type: atomic
                                     namespaceSelector:
-                                      description: A label query over the set of namespaces
-                                        that the term applies to. The term is applied
-                                        to the union of the namespaces selected by
-                                        this field and the ones listed in the namespaces
-                                        field. null selector and null or empty namespaces
-                                        list means "this pod's namespace". An empty
-                                        selector ({}) matches all namespaces.
+                                      description: |-
+                                        A label query over the set of namespaces that the term applies to.
+                                        The term is applied to the union of the namespaces selected by this field
+                                        and the ones listed in the namespaces field.
+                                        null selector and null or empty namespaces list means "this pod's namespace".
+                                        An empty selector ({}) matches all namespaces.
                                       properties:
                                         matchExpressions:
                                           description: matchExpressions is a list
                                             of label selector requirements. The requirements
                                             are ANDed.
                                           items:
-                                            description: A label selector requirement
-                                              is a selector that contains values,
-                                              a key, and an operator that relates
-                                              the key and values.
+                                            description: |-
+                                              A label selector requirement is a selector that contains values, a key, and an operator that
+                                              relates the key and values.
                                             properties:
                                               key:
                                                 description: key is the label key
                                                   that the selector applies to.
                                                 type: string
                                               operator:
-                                                description: operator represents a
-                                                  key's relationship to a set of values.
-                                                  Valid operators are In, NotIn, Exists
-                                                  and DoesNotExist.
+                                                description: |-
+                                                  operator represents a key's relationship to a set of values.
+                                                  Valid operators are In, NotIn, Exists and DoesNotExist.
                                                 type: string
                                               values:
-                                                description: values is an array of
-                                                  string values. If the operator is
-                                                  In or NotIn, the values array must
-                                                  be non-empty. If the operator is
-                                                  Exists or DoesNotExist, the values
-                                                  array must be empty. This array
-                                                  is replaced during a strategic merge
-                                                  patch.
+                                                description: |-
+                                                  values is an array of string values. If the operator is In or NotIn,
+                                                  the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                                  the values array must be empty. This array is replaced during a strategic
+                                                  merge patch.
                                                 items:
                                                   type: string
                                                 type: array
+                                                x-kubernetes-list-type: atomic
                                             required:
                                             - key
                                             - operator
                                             type: object
                                           type: array
+                                          x-kubernetes-list-type: atomic
                                         matchLabels:
                                           additionalProperties:
                                             type: string
-                                          description: matchLabels is a map of {key,value}
-                                            pairs. A single {key,value} in the matchLabels
-                                            map is equivalent to an element of matchExpressions,
-                                            whose key field is "key", the operator
-                                            is "In", and the values array contains
-                                            only "value". The requirements are ANDed.
+                                          description: |-
+                                            matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                            map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                            operator is "In", and the values array contains only "value". The requirements are ANDed.
                                           type: object
                                       type: object
+                                      x-kubernetes-map-type: atomic
                                     namespaces:
-                                      description: namespaces specifies a static list
-                                        of namespace names that the term applies to.
-                                        The term is applied to the union of the namespaces
-                                        listed in this field and the ones selected
-                                        by namespaceSelector. null or empty namespaces
-                                        list and null namespaceSelector means "this
-                                        pod's namespace".
+                                      description: |-
+                                        namespaces specifies a static list of namespace names that the term applies to.
+                                        The term is applied to the union of the namespaces listed in this field
+                                        and the ones selected by namespaceSelector.
+                                        null or empty namespaces list and null namespaceSelector means "this pod's namespace".
                                       items:
                                         type: string
                                       type: array
+                                      x-kubernetes-list-type: atomic
                                     topologyKey:
-                                      description: This pod should be co-located (affinity)
-                                        or not co-located (anti-affinity) with the
-                                        pods matching the labelSelector in the specified
-                                        namespaces, where co-located is defined as
-                                        running on a node whose value of the label
-                                        with key topologyKey matches that of any node
-                                        on which any of the selected pods is running.
+                                      description: |-
+                                        This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching
+                                        the labelSelector in the specified namespaces, where co-located is defined as running on a node
+                                        whose value of the label with key topologyKey matches that of any node on which any of the
+                                        selected pods is running.
                                         Empty topologyKey is not allowed.
                                       type: string
                                   required:
                                   - topologyKey
                                   type: object
                                 weight:
-                                  description: weight associated with matching the
-                                    corresponding podAffinityTerm, in the range 1-100.
+                                  description: |-
+                                    weight associated with matching the corresponding podAffinityTerm,
+                                    in the range 1-100.
                                   format: int32
                                   type: integer
                               required:
@@ -782,155 +832,177 @@ spec:
                               - weight
                               type: object
                             type: array
+                            x-kubernetes-list-type: atomic
                           requiredDuringSchedulingIgnoredDuringExecution:
-                            description: If the anti-affinity requirements specified
-                              by this field are not met at scheduling time, the pod
-                              will not be scheduled onto the node. If the anti-affinity
-                              requirements specified by this field cease to be met
-                              at some point during pod execution (e.g. due to a pod
-                              label update), the system may or may not try to eventually
-                              evict the pod from its node. When there are multiple
-                              elements, the lists of nodes corresponding to each podAffinityTerm
-                              are intersected, i.e. all terms must be satisfied.
+                            description: |-
+                              If the anti-affinity requirements specified by this field are not met at
+                              scheduling time, the pod will not be scheduled onto the node.
+                              If the anti-affinity requirements specified by this field cease to be met
+                              at some point during pod execution (e.g. due to a pod label update), the
+                              system may or may not try to eventually evict the pod from its node.
+                              When there are multiple elements, the lists of nodes corresponding to each
+                              podAffinityTerm are intersected, i.e. all terms must be satisfied.
                             items:
-                              description: Defines a set of pods (namely those matching
-                                the labelSelector relative to the given namespace(s))
-                                that this pod should be co-located (affinity) or not
-                                co-located (anti-affinity) with, where co-located
-                                is defined as running on a node whose value of the
-                                label with key <topologyKey> matches that of any node
-                                on which a pod of the set of pods is running
+                              description: |-
+                                Defines a set of pods (namely those matching the labelSelector
+                                relative to the given namespace(s)) that this pod should be
+                                co-located (affinity) or not co-located (anti-affinity) with,
+                                where co-located is defined as running on a node whose value of
+                                the label with key <topologyKey> matches that of any node on which
+                                a pod of the set of pods is running
                               properties:
                                 labelSelector:
-                                  description: A label query over a set of resources,
-                                    in this case pods.
+                                  description: |-
+                                    A label query over a set of resources, in this case pods.
+                                    If it's null, this PodAffinityTerm matches with no Pods.
                                   properties:
                                     matchExpressions:
                                       description: matchExpressions is a list of label
                                         selector requirements. The requirements are
                                         ANDed.
                                       items:
-                                        description: A label selector requirement
-                                          is a selector that contains values, a key,
-                                          and an operator that relates the key and
-                                          values.
+                                        description: |-
+                                          A label selector requirement is a selector that contains values, a key, and an operator that
+                                          relates the key and values.
                                         properties:
                                           key:
                                             description: key is the label key that
                                               the selector applies to.
                                             type: string
                                           operator:
-                                            description: operator represents a key's
-                                              relationship to a set of values. Valid
-                                              operators are In, NotIn, Exists and
-                                              DoesNotExist.
+                                            description: |-
+                                              operator represents a key's relationship to a set of values.
+                                              Valid operators are In, NotIn, Exists and DoesNotExist.
                                             type: string
                                           values:
-                                            description: values is an array of string
-                                              values. If the operator is In or NotIn,
-                                              the values array must be non-empty.
-                                              If the operator is Exists or DoesNotExist,
-                                              the values array must be empty. This
-                                              array is replaced during a strategic
+                                            description: |-
+                                              values is an array of string values. If the operator is In or NotIn,
+                                              the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                              the values array must be empty. This array is replaced during a strategic
                                               merge patch.
                                             items:
                                               type: string
                                             type: array
+                                            x-kubernetes-list-type: atomic
                                         required:
                                         - key
                                         - operator
                                         type: object
                                       type: array
+                                      x-kubernetes-list-type: atomic
                                     matchLabels:
                                       additionalProperties:
                                         type: string
-                                      description: matchLabels is a map of {key,value}
-                                        pairs. A single {key,value} in the matchLabels
-                                        map is equivalent to an element of matchExpressions,
-                                        whose key field is "key", the operator is
-                                        "In", and the values array contains only "value".
-                                        The requirements are ANDed.
+                                      description: |-
+                                        matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                        map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                        operator is "In", and the values array contains only "value". The requirements are ANDed.
                                       type: object
                                   type: object
+                                  x-kubernetes-map-type: atomic
+                                matchLabelKeys:
+                                  description: |-
+                                    MatchLabelKeys is a set of pod label keys to select which pods will
+                                    be taken into consideration. The keys are used to lookup values from the
+                                    incoming pod labels, those key-value labels are merged with `labelSelector` as `key in (value)`
+                                    to select the group of existing pods which pods will be taken into consideration
+                                    for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+                                    pod labels will be ignored. The default value is empty.
+                                    The same key is forbidden to exist in both matchLabelKeys and labelSelector.
+                                    Also, matchLabelKeys cannot be set when labelSelector isn't set.
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                mismatchLabelKeys:
+                                  description: |-
+                                    MismatchLabelKeys is a set of pod label keys to select which pods will
+                                    be taken into consideration. The keys are used to lookup values from the
+                                    incoming pod labels, those key-value labels are merged with `labelSelector` as `key notin (value)`
+                                    to select the group of existing pods which pods will be taken into consideration
+                                    for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+                                    pod labels will be ignored. The default value is empty.
+                                    The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
+                                    Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
                                 namespaceSelector:
-                                  description: A label query over the set of namespaces
-                                    that the term applies to. The term is applied
-                                    to the union of the namespaces selected by this
-                                    field and the ones listed in the namespaces field.
-                                    null selector and null or empty namespaces list
-                                    means "this pod's namespace". An empty selector
-                                    ({}) matches all namespaces.
+                                  description: |-
+                                    A label query over the set of namespaces that the term applies to.
+                                    The term is applied to the union of the namespaces selected by this field
+                                    and the ones listed in the namespaces field.
+                                    null selector and null or empty namespaces list means "this pod's namespace".
+                                    An empty selector ({}) matches all namespaces.
                                   properties:
                                     matchExpressions:
                                       description: matchExpressions is a list of label
                                         selector requirements. The requirements are
                                         ANDed.
                                       items:
-                                        description: A label selector requirement
-                                          is a selector that contains values, a key,
-                                          and an operator that relates the key and
-                                          values.
+                                        description: |-
+                                          A label selector requirement is a selector that contains values, a key, and an operator that
+                                          relates the key and values.
                                         properties:
                                           key:
                                             description: key is the label key that
                                               the selector applies to.
                                             type: string
                                           operator:
-                                            description: operator represents a key's
-                                              relationship to a set of values. Valid
-                                              operators are In, NotIn, Exists and
-                                              DoesNotExist.
+                                            description: |-
+                                              operator represents a key's relationship to a set of values.
+                                              Valid operators are In, NotIn, Exists and DoesNotExist.
                                             type: string
                                           values:
-                                            description: values is an array of string
-                                              values. If the operator is In or NotIn,
-                                              the values array must be non-empty.
-                                              If the operator is Exists or DoesNotExist,
-                                              the values array must be empty. This
-                                              array is replaced during a strategic
+                                            description: |-
+                                              values is an array of string values. If the operator is In or NotIn,
+                                              the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                              the values array must be empty. This array is replaced during a strategic
                                               merge patch.
                                             items:
                                               type: string
                                             type: array
+                                            x-kubernetes-list-type: atomic
                                         required:
                                         - key
                                         - operator
                                         type: object
                                       type: array
+                                      x-kubernetes-list-type: atomic
                                     matchLabels:
                                       additionalProperties:
                                         type: string
-                                      description: matchLabels is a map of {key,value}
-                                        pairs. A single {key,value} in the matchLabels
-                                        map is equivalent to an element of matchExpressions,
-                                        whose key field is "key", the operator is
-                                        "In", and the values array contains only "value".
-                                        The requirements are ANDed.
+                                      description: |-
+                                        matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                        map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                        operator is "In", and the values array contains only "value". The requirements are ANDed.
                                       type: object
                                   type: object
+                                  x-kubernetes-map-type: atomic
                                 namespaces:
-                                  description: namespaces specifies a static list
-                                    of namespace names that the term applies to. The
-                                    term is applied to the union of the namespaces
-                                    listed in this field and the ones selected by
-                                    namespaceSelector. null or empty namespaces list
-                                    and null namespaceSelector means "this pod's namespace".
+                                  description: |-
+                                    namespaces specifies a static list of namespace names that the term applies to.
+                                    The term is applied to the union of the namespaces listed in this field
+                                    and the ones selected by namespaceSelector.
+                                    null or empty namespaces list and null namespaceSelector means "this pod's namespace".
                                   items:
                                     type: string
                                   type: array
+                                  x-kubernetes-list-type: atomic
                                 topologyKey:
-                                  description: This pod should be co-located (affinity)
-                                    or not co-located (anti-affinity) with the pods
-                                    matching the labelSelector in the specified namespaces,
-                                    where co-located is defined as running on a node
-                                    whose value of the label with key topologyKey
-                                    matches that of any node on which any of the selected
-                                    pods is running. Empty topologyKey is not allowed.
+                                  description: |-
+                                    This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching
+                                    the labelSelector in the specified namespaces, where co-located is defined as running on a node
+                                    whose value of the label with key topologyKey matches that of any node on which any of the
+                                    selected pods is running.
+                                    Empty topologyKey is not allowed.
                                   type: string
                               required:
                               - topologyKey
                               type: object
                             type: array
+                            x-kubernetes-list-type: atomic
                         type: object
                     type: object
                   command:
@@ -938,25 +1010,50 @@ spec:
                       type: string
                     type: array
                   containerSecurityContext:
-                    description: SecurityContext holds security configuration that
-                      will be applied to a container. Some fields are present in both
-                      SecurityContext and PodSecurityContext.  When both are set,
-                      the values in SecurityContext take precedence.
+                    description: |-
+                      SecurityContext holds security configuration that will be applied to a container.
+                      Some fields are present in both SecurityContext and PodSecurityContext.  When both
+                      are set, the values in SecurityContext take precedence.
                     properties:
                       allowPrivilegeEscalation:
-                        description: 'AllowPrivilegeEscalation controls whether a
-                          process can gain more privileges than its parent process.
-                          This bool directly controls if the no_new_privs flag will
-                          be set on the container process. AllowPrivilegeEscalation
-                          is true always when the container is: 1) run as Privileged
-                          2) has CAP_SYS_ADMIN Note that this field cannot be set
-                          when spec.os.name is windows.'
+                        description: |-
+                          AllowPrivilegeEscalation controls whether a process can gain more
+                          privileges than its parent process. This bool directly controls if
+                          the no_new_privs flag will be set on the container process.
+                          AllowPrivilegeEscalation is true always when the container is:
+                          1) run as Privileged
+                          2) has CAP_SYS_ADMIN
+                          Note that this field cannot be set when spec.os.name is windows.
                         type: boolean
+                      appArmorProfile:
+                        description: |-
+                          appArmorProfile is the AppArmor options to use by this container. If set, this profile
+                          overrides the pod's appArmorProfile.
+                          Note that this field cannot be set when spec.os.name is windows.
+                        properties:
+                          localhostProfile:
+                            description: |-
+                              localhostProfile indicates a profile loaded on the node that should be used.
+                              The profile must be preconfigured on the node to work.
+                              Must match the loaded name of the profile.
+                              Must be set if and only if type is "Localhost".
+                            type: string
+                          type:
+                            description: |-
+                              type indicates which kind of AppArmor profile will be applied.
+                              Valid options are:
+                                Localhost - a profile pre-loaded on the node.
+                                RuntimeDefault - the container runtime's default profile.
+                                Unconfined - no AppArmor enforcement.
+                            type: string
+                        required:
+                        - type
+                        type: object
                       capabilities:
-                        description: The capabilities to add/drop when running containers.
-                          Defaults to the default set of capabilities granted by the
-                          container runtime. Note that this field cannot be set when
-                          spec.os.name is windows.
+                        description: |-
+                          The capabilities to add/drop when running containers.
+                          Defaults to the default set of capabilities granted by the container runtime.
+                          Note that this field cannot be set when spec.os.name is windows.
                         properties:
                           add:
                             description: Added capabilities
@@ -965,6 +1062,7 @@ spec:
                                 type
                               type: string
                             type: array
+                            x-kubernetes-list-type: atomic
                           drop:
                             description: Removed capabilities
                             items:
@@ -972,61 +1070,63 @@ spec:
                                 type
                               type: string
                             type: array
+                            x-kubernetes-list-type: atomic
                         type: object
                       privileged:
-                        description: Run container in privileged mode. Processes in
-                          privileged containers are essentially equivalent to root
-                          on the host. Defaults to false. Note that this field cannot
-                          be set when spec.os.name is windows.
+                        description: |-
+                          Run container in privileged mode.
+                          Processes in privileged containers are essentially equivalent to root on the host.
+                          Defaults to false.
+                          Note that this field cannot be set when spec.os.name is windows.
                         type: boolean
                       procMount:
-                        description: procMount denotes the type of proc mount to use
-                          for the containers. The default is DefaultProcMount which
-                          uses the container runtime defaults for readonly paths and
-                          masked paths. This requires the ProcMountType feature flag
-                          to be enabled. Note that this field cannot be set when spec.os.name
-                          is windows.
+                        description: |-
+                          procMount denotes the type of proc mount to use for the containers.
+                          The default value is Default which uses the container runtime defaults for
+                          readonly paths and masked paths.
+                          This requires the ProcMountType feature flag to be enabled.
+                          Note that this field cannot be set when spec.os.name is windows.
                         type: string
                       readOnlyRootFilesystem:
-                        description: Whether this container has a read-only root filesystem.
-                          Default is false. Note that this field cannot be set when
-                          spec.os.name is windows.
+                        description: |-
+                          Whether this container has a read-only root filesystem.
+                          Default is false.
+                          Note that this field cannot be set when spec.os.name is windows.
                         type: boolean
                       runAsGroup:
-                        description: The GID to run the entrypoint of the container
-                          process. Uses runtime default if unset. May also be set
-                          in PodSecurityContext.  If set in both SecurityContext and
-                          PodSecurityContext, the value specified in SecurityContext
-                          takes precedence. Note that this field cannot be set when
-                          spec.os.name is windows.
+                        description: |-
+                          The GID to run the entrypoint of the container process.
+                          Uses runtime default if unset.
+                          May also be set in PodSecurityContext.  If set in both SecurityContext and
+                          PodSecurityContext, the value specified in SecurityContext takes precedence.
+                          Note that this field cannot be set when spec.os.name is windows.
                         format: int64
                         type: integer
                       runAsNonRoot:
-                        description: Indicates that the container must run as a non-root
-                          user. If true, the Kubelet will validate the image at runtime
-                          to ensure that it does not run as UID 0 (root) and fail
-                          to start the container if it does. If unset or false, no
-                          such validation will be performed. May also be set in PodSecurityContext.  If
-                          set in both SecurityContext and PodSecurityContext, the
-                          value specified in SecurityContext takes precedence.
+                        description: |-
+                          Indicates that the container must run as a non-root user.
+                          If true, the Kubelet will validate the image at runtime to ensure that it
+                          does not run as UID 0 (root) and fail to start the container if it does.
+                          If unset or false, no such validation will be performed.
+                          May also be set in PodSecurityContext.  If set in both SecurityContext and
+                          PodSecurityContext, the value specified in SecurityContext takes precedence.
                         type: boolean
                       runAsUser:
-                        description: The UID to run the entrypoint of the container
-                          process. Defaults to user specified in image metadata if
-                          unspecified. May also be set in PodSecurityContext.  If
-                          set in both SecurityContext and PodSecurityContext, the
-                          value specified in SecurityContext takes precedence. Note
-                          that this field cannot be set when spec.os.name is windows.
+                        description: |-
+                          The UID to run the entrypoint of the container process.
+                          Defaults to user specified in image metadata if unspecified.
+                          May also be set in PodSecurityContext.  If set in both SecurityContext and
+                          PodSecurityContext, the value specified in SecurityContext takes precedence.
+                          Note that this field cannot be set when spec.os.name is windows.
                         format: int64
                         type: integer
                       seLinuxOptions:
-                        description: The SELinux context to be applied to the container.
-                          If unspecified, the container runtime will allocate a random
-                          SELinux context for each container.  May also be set in
-                          PodSecurityContext.  If set in both SecurityContext and
-                          PodSecurityContext, the value specified in SecurityContext
-                          takes precedence. Note that this field cannot be set when
-                          spec.os.name is windows.
+                        description: |-
+                          The SELinux context to be applied to the container.
+                          If unspecified, the container runtime will allocate a random SELinux context for each
+                          container.  May also be set in PodSecurityContext.  If set in both SecurityContext and
+                          PodSecurityContext, the value specified in SecurityContext takes precedence.
+                          Note that this field cannot be set when spec.os.name is windows.
                         properties:
                           level:
                             description: Level is SELinux level label that applies
@@ -1046,65 +1146,61 @@ spec:
                             type: string
                         type: object
                       seccompProfile:
-                        description: The seccomp options to use by this container.
-                          If seccomp options are provided at both the pod & container
-                          level, the container options override the pod options. Note
-                          that this field cannot be set when spec.os.name is windows.
+                        description: |-
+                          The seccomp options to use by this container. If seccomp options are
+                          provided at both the pod & container level, the container options
+                          override the pod options.
+                          Note that this field cannot be set when spec.os.name is windows.
                         properties:
                           localhostProfile:
-                            description: localhostProfile indicates a profile defined
-                              in a file on the node should be used. The profile must
-                              be preconfigured on the node to work. Must be a descending
-                              path, relative to the kubelet's configured seccomp profile
-                              location. Must only be set if type is "Localhost".
+                            description: |-
+                              localhostProfile indicates a profile defined in a file on the node should be used.
+                              The profile must be preconfigured on the node to work.
+                              Must be a descending path, relative to the kubelet's configured seccomp profile location.
+                              Must be set if type is "Localhost". Must NOT be set for any other type.
                             type: string
                           type:
-                            description: "type indicates which kind of seccomp profile
-                              will be applied. Valid options are: \n Localhost - a
-                              profile defined in a file on the node should be used.
-                              RuntimeDefault - the container runtime default profile
-                              should be used. Unconfined - no profile should be applied."
+                            description: |-
+                              type indicates which kind of seccomp profile will be applied.
+                              Valid options are:
+
+                              Localhost - a profile defined in a file on the node should be used.
+                              RuntimeDefault - the container runtime default profile should be used.
+                              Unconfined - no profile should be applied.
                             type: string
                         required:
                         - type
                         type: object
                       windowsOptions:
-                        description: The Windows specific settings applied to all
-                          containers. If unspecified, the options from the PodSecurityContext
-                          will be used. If set in both SecurityContext and PodSecurityContext,
-                          the value specified in SecurityContext takes precedence.
-                          Note that this field cannot be set when spec.os.name is
-                          linux.
+                        description: |-
+                          The Windows specific settings applied to all containers.
+                          If unspecified, the options from the PodSecurityContext will be used.
+                          If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence.
+                          Note that this field cannot be set when spec.os.name is linux.
                         properties:
                           gmsaCredentialSpec:
-                            description: GMSACredentialSpec is where the GMSA admission
-                              webhook (https://github.com/kubernetes-sigs/windows-gmsa)
-                              inlines the contents of the GMSA credential spec named
-                              by the GMSACredentialSpecName field.
+                            description: |-
+                              GMSACredentialSpec is where the GMSA admission webhook
+                              (https://github.com/kubernetes-sigs/windows-gmsa) inlines the contents of the
+                              GMSA credential spec named by the GMSACredentialSpecName field.
                             type: string
                           gmsaCredentialSpecName:
                             description: GMSACredentialSpecName is the name of the
                               GMSA credential spec to use.
                             type: string
                           hostProcess:
-                            description: HostProcess determines if a container should
-                              be run as a 'Host Process' container. This field is
-                              alpha-level and will only be honored by components that
-                              enable the WindowsHostProcessContainers feature flag.
-                              Setting this field without the feature flag will result
-                              in errors when validating the Pod. All of a Pod's containers
-                              must have the same effective HostProcess value (it is
-                              not allowed to have a mix of HostProcess containers
-                              and non-HostProcess containers).  In addition, if HostProcess
-                              is true then HostNetwork must also be set to true.
+                            description: |-
+                              HostProcess determines if a container should be run as a 'Host Process' container.
+                              All of a Pod's containers must have the same effective HostProcess value
+                              (it is not allowed to have a mix of HostProcess containers and non-HostProcess containers).
+                              In addition, if HostProcess is true then HostNetwork must also be set to true.
                             type: boolean
                           runAsUserName:
-                            description: The UserName in Windows to run the entrypoint
-                              of the container process. Defaults to the user specified
-                              in image metadata if unspecified. May also be set in
-                              PodSecurityContext. If set in both SecurityContext and
-                              PodSecurityContext, the value specified in SecurityContext
-                              takes precedence.
+                            description: |-
+                              The UserName in Windows to run the entrypoint of the container process.
+                              Defaults to the user specified in image metadata if unspecified.
+                              May also be set in PodSecurityContext. If set in both SecurityContext and
+                              PodSecurityContext, the value specified in SecurityContext takes precedence.
                             type: string
                         type: object
                     type: object
@@ -1123,6 +1219,469 @@ spec:
                     items:
                       type: string
                     type: array
+                  customLivenessProbe:
+                    description: |-
+                      Probe describes a health check to be performed against a container to determine whether it is
+                      alive or ready to receive traffic.
+                    properties:
+                      exec:
+                        description: Exec specifies a command to execute in the container.
+                        properties:
+                          command:
+                            description: |-
+                              Command is the command line to execute inside the container, the working directory for the
+                              command  is root ('/') in the container's filesystem. The command is simply exec'd, it is
+                              not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use
+                              a shell, you need to explicitly call out to that shell.
+                              Exit status of 0 is treated as live/healthy and non-zero is unhealthy.
+                            items:
+                              type: string
+                            type: array
+                            x-kubernetes-list-type: atomic
+                        type: object
+                      failureThreshold:
+                        description: |-
+                          Minimum consecutive failures for the probe to be considered failed after having succeeded.
+                          Defaults to 3. Minimum value is 1.
+                        format: int32
+                        type: integer
+                      grpc:
+                        description: GRPC specifies a GRPC HealthCheckRequest.
+                        properties:
+                          port:
+                            description: Port number of the gRPC service. Number must
+                              be in the range 1 to 65535.
+                            format: int32
+                            type: integer
+                          service:
+                            default: ""
+                            description: |-
+                              Service is the name of the service to place in the gRPC HealthCheckRequest
+                              (see https://github.com/grpc/grpc/blob/master/doc/health-checking.md).
+
+                              If this is not specified, the default behavior is defined by gRPC.
+                            type: string
+                        required:
+                        - port
+                        type: object
+                      httpGet:
+                        description: HTTPGet specifies an HTTP GET request to perform.
+                        properties:
+                          host:
+                            description: |-
+                              Host name to connect to, defaults to the pod IP. You probably want to set
+                              "Host" in httpHeaders instead.
+                            type: string
+                          httpHeaders:
+                            description: Custom headers to set in the request. HTTP
+                              allows repeated headers.
+                            items:
+                              description: HTTPHeader describes a custom header to
+                                be used in HTTP probes
+                              properties:
+                                name:
+                                  description: |-
+                                    The header field name.
+                                    This will be canonicalized upon output, so case-variant names will be understood as the same header.
+                                  type: string
+                                value:
+                                  description: The header field value
+                                  type: string
+                              required:
+                              - name
+                              - value
+                              type: object
+                            type: array
+                            x-kubernetes-list-type: atomic
+                          path:
+                            description: Path to access on the HTTP server.
+                            type: string
+                          port:
+                            anyOf:
+                            - type: integer
+                            - type: string
+                            description: |-
+                              Name or number of the port to access on the container.
+                              Number must be in the range 1 to 65535.
+                              Name must be an IANA_SVC_NAME.
+                            x-kubernetes-int-or-string: true
+                          scheme:
+                            description: |-
+                              Scheme to use for connecting to the host.
+                              Defaults to HTTP.
+                            type: string
+                        required:
+                        - port
+                        type: object
+                      initialDelaySeconds:
+                        description: |-
+                          Number of seconds after the container has started before liveness probes are initiated.
+                          More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                        format: int32
+                        type: integer
+                      periodSeconds:
+                        description: |-
+                          How often (in seconds) to perform the probe.
+                          Default to 10 seconds. Minimum value is 1.
+                        format: int32
+                        type: integer
+                      successThreshold:
+                        description: |-
+                          Minimum consecutive successes for the probe to be considered successful after having failed.
+                          Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
+                        format: int32
+                        type: integer
+                      tcpSocket:
+                        description: TCPSocket specifies a connection to a TCP port.
+                        properties:
+                          host:
+                            description: 'Optional: Host name to connect to, defaults
+                              to the pod IP.'
+                            type: string
+                          port:
+                            anyOf:
+                            - type: integer
+                            - type: string
+                            description: |-
+                              Number or name of the port to access on the container.
+                              Number must be in the range 1 to 65535.
+                              Name must be an IANA_SVC_NAME.
+                            x-kubernetes-int-or-string: true
+                        required:
+                        - port
+                        type: object
+                      terminationGracePeriodSeconds:
+                        description: |-
+                          Optional duration in seconds the pod needs to terminate gracefully upon probe failure.
+                          The grace period is the duration in seconds after the processes running in the pod are sent
+                          a termination signal and the time when the processes are forcibly halted with a kill signal.
+                          Set this value longer than the expected cleanup time for your process.
+                          If this value is nil, the pod's terminationGracePeriodSeconds will be used. Otherwise, this
+                          value overrides the value provided by the pod spec.
+                          Value must be non-negative integer. The value zero indicates stop immediately via
+                          the kill signal (no opportunity to shut down).
+                          This is a beta field and requires enabling ProbeTerminationGracePeriod feature gate.
+                          Minimum value is 1. spec.terminationGracePeriodSeconds is used if unset.
+                        format: int64
+                        type: integer
+                      timeoutSeconds:
+                        description: |-
+                          Number of seconds after which the probe times out.
+                          Defaults to 1 second. Minimum value is 1.
+                          More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                        format: int32
+                        type: integer
+                    type: object
+                  customReadinessProbe:
+                    description: |-
+                      Probe describes a health check to be performed against a container to determine whether it is
+                      alive or ready to receive traffic.
+                    properties:
+                      exec:
+                        description: Exec specifies a command to execute in the container.
+                        properties:
+                          command:
+                            description: |-
+                              Command is the command line to execute inside the container, the working directory for the
+                              command  is root ('/') in the container's filesystem. The command is simply exec'd, it is
+                              not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use
+                              a shell, you need to explicitly call out to that shell.
+                              Exit status of 0 is treated as live/healthy and non-zero is unhealthy.
+                            items:
+                              type: string
+                            type: array
+                            x-kubernetes-list-type: atomic
+                        type: object
+                      failureThreshold:
+                        description: |-
+                          Minimum consecutive failures for the probe to be considered failed after having succeeded.
+                          Defaults to 3. Minimum value is 1.
+                        format: int32
+                        type: integer
+                      grpc:
+                        description: GRPC specifies a GRPC HealthCheckRequest.
+                        properties:
+                          port:
+                            description: Port number of the gRPC service. Number must
+                              be in the range 1 to 65535.
+                            format: int32
+                            type: integer
+                          service:
+                            default: ""
+                            description: |-
+                              Service is the name of the service to place in the gRPC HealthCheckRequest
+                              (see https://github.com/grpc/grpc/blob/master/doc/health-checking.md).
+
+                              If this is not specified, the default behavior is defined by gRPC.
+                            type: string
+                        required:
+                        - port
+                        type: object
+                      httpGet:
+                        description: HTTPGet specifies an HTTP GET request to perform.
+                        properties:
+                          host:
+                            description: |-
+                              Host name to connect to, defaults to the pod IP. You probably want to set
+                              "Host" in httpHeaders instead.
+                            type: string
+                          httpHeaders:
+                            description: Custom headers to set in the request. HTTP
+                              allows repeated headers.
+                            items:
+                              description: HTTPHeader describes a custom header to
+                                be used in HTTP probes
+                              properties:
+                                name:
+                                  description: |-
+                                    The header field name.
+                                    This will be canonicalized upon output, so case-variant names will be understood as the same header.
+                                  type: string
+                                value:
+                                  description: The header field value
+                                  type: string
+                              required:
+                              - name
+                              - value
+                              type: object
+                            type: array
+                            x-kubernetes-list-type: atomic
+                          path:
+                            description: Path to access on the HTTP server.
+                            type: string
+                          port:
+                            anyOf:
+                            - type: integer
+                            - type: string
+                            description: |-
+                              Name or number of the port to access on the container.
+                              Number must be in the range 1 to 65535.
+                              Name must be an IANA_SVC_NAME.
+                            x-kubernetes-int-or-string: true
+                          scheme:
+                            description: |-
+                              Scheme to use for connecting to the host.
+                              Defaults to HTTP.
+                            type: string
+                        required:
+                        - port
+                        type: object
+                      initialDelaySeconds:
+                        description: |-
+                          Number of seconds after the container has started before liveness probes are initiated.
+                          More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                        format: int32
+                        type: integer
+                      periodSeconds:
+                        description: |-
+                          How often (in seconds) to perform the probe.
+                          Default to 10 seconds. Minimum value is 1.
+                        format: int32
+                        type: integer
+                      successThreshold:
+                        description: |-
+                          Minimum consecutive successes for the probe to be considered successful after having failed.
+                          Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
+                        format: int32
+                        type: integer
+                      tcpSocket:
+                        description: TCPSocket specifies a connection to a TCP port.
+                        properties:
+                          host:
+                            description: 'Optional: Host name to connect to, defaults
+                              to the pod IP.'
+                            type: string
+                          port:
+                            anyOf:
+                            - type: integer
+                            - type: string
+                            description: |-
+                              Number or name of the port to access on the container.
+                              Number must be in the range 1 to 65535.
+                              Name must be an IANA_SVC_NAME.
+                            x-kubernetes-int-or-string: true
+                        required:
+                        - port
+                        type: object
+                      terminationGracePeriodSeconds:
+                        description: |-
+                          Optional duration in seconds the pod needs to terminate gracefully upon probe failure.
+                          The grace period is the duration in seconds after the processes running in the pod are sent
+                          a termination signal and the time when the processes are forcibly halted with a kill signal.
+                          Set this value longer than the expected cleanup time for your process.
+                          If this value is nil, the pod's terminationGracePeriodSeconds will be used. Otherwise, this
+                          value overrides the value provided by the pod spec.
+                          Value must be non-negative integer. The value zero indicates stop immediately via
+                          the kill signal (no opportunity to shut down).
+                          This is a beta field and requires enabling ProbeTerminationGracePeriod feature gate.
+                          Minimum value is 1. spec.terminationGracePeriodSeconds is used if unset.
+                        format: int64
+                        type: integer
+                      timeoutSeconds:
+                        description: |-
+                          Number of seconds after which the probe times out.
+                          Defaults to 1 second. Minimum value is 1.
+                          More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                        format: int32
+                        type: integer
+                    type: object
+                  customStartupProbe:
+                    description: |-
+                      Probe describes a health check to be performed against a container to determine whether it is
+                      alive or ready to receive traffic.
+                    properties:
+                      exec:
+                        description: Exec specifies a command to execute in the container.
+                        properties:
+                          command:
+                            description: |-
+                              Command is the command line to execute inside the container, the working directory for the
+                              command  is root ('/') in the container's filesystem. The command is simply exec'd, it is
+                              not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use
+                              a shell, you need to explicitly call out to that shell.
+                              Exit status of 0 is treated as live/healthy and non-zero is unhealthy.
+                            items:
+                              type: string
+                            type: array
+                            x-kubernetes-list-type: atomic
+                        type: object
+                      failureThreshold:
+                        description: |-
+                          Minimum consecutive failures for the probe to be considered failed after having succeeded.
+                          Defaults to 3. Minimum value is 1.
+                        format: int32
+                        type: integer
+                      grpc:
+                        description: GRPC specifies a GRPC HealthCheckRequest.
+                        properties:
+                          port:
+                            description: Port number of the gRPC service. Number must
+                              be in the range 1 to 65535.
+                            format: int32
+                            type: integer
+                          service:
+                            default: ""
+                            description: |-
+                              Service is the name of the service to place in the gRPC HealthCheckRequest
+                              (see https://github.com/grpc/grpc/blob/master/doc/health-checking.md).
+
+                              If this is not specified, the default behavior is defined by gRPC.
+                            type: string
+                        required:
+                        - port
+                        type: object
+                      httpGet:
+                        description: HTTPGet specifies an HTTP GET request to perform.
+                        properties:
+                          host:
+                            description: |-
+                              Host name to connect to, defaults to the pod IP. You probably want to set
+                              "Host" in httpHeaders instead.
+                            type: string
+                          httpHeaders:
+                            description: Custom headers to set in the request. HTTP
+                              allows repeated headers.
+                            items:
+                              description: HTTPHeader describes a custom header to
+                                be used in HTTP probes
+                              properties:
+                                name:
+                                  description: |-
+                                    The header field name.
+                                    This will be canonicalized upon output, so case-variant names will be understood as the same header.
+                                  type: string
+                                value:
+                                  description: The header field value
+                                  type: string
+                              required:
+                              - name
+                              - value
+                              type: object
+                            type: array
+                            x-kubernetes-list-type: atomic
+                          path:
+                            description: Path to access on the HTTP server.
+                            type: string
+                          port:
+                            anyOf:
+                            - type: integer
+                            - type: string
+                            description: |-
+                              Name or number of the port to access on the container.
+                              Number must be in the range 1 to 65535.
+                              Name must be an IANA_SVC_NAME.
+                            x-kubernetes-int-or-string: true
+                          scheme:
+                            description: |-
+                              Scheme to use for connecting to the host.
+                              Defaults to HTTP.
+                            type: string
+                        required:
+                        - port
+                        type: object
+                      initialDelaySeconds:
+                        description: |-
+                          Number of seconds after the container has started before liveness probes are initiated.
+                          More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                        format: int32
+                        type: integer
+                      periodSeconds:
+                        description: |-
+                          How often (in seconds) to perform the probe.
+                          Default to 10 seconds. Minimum value is 1.
+                        format: int32
+                        type: integer
+                      successThreshold:
+                        description: |-
+                          Minimum consecutive successes for the probe to be considered successful after having failed.
+                          Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
+                        format: int32
+                        type: integer
+                      tcpSocket:
+                        description: TCPSocket specifies a connection to a TCP port.
+                        properties:
+                          host:
+                            description: 'Optional: Host name to connect to, defaults
+                              to the pod IP.'
+                            type: string
+                          port:
+                            anyOf:
+                            - type: integer
+                            - type: string
+                            description: |-
+                              Number or name of the port to access on the container.
+                              Number must be in the range 1 to 65535.
+                              Name must be an IANA_SVC_NAME.
+                            x-kubernetes-int-or-string: true
+                        required:
+                        - port
+                        type: object
+                      terminationGracePeriodSeconds:
+                        description: |-
+                          Optional duration in seconds the pod needs to terminate gracefully upon probe failure.
+                          The grace period is the duration in seconds after the processes running in the pod are sent
+                          a termination signal and the time when the processes are forcibly halted with a kill signal.
+                          Set this value longer than the expected cleanup time for your process.
+                          If this value is nil, the pod's terminationGracePeriodSeconds will be used. Otherwise, this
+                          value overrides the value provided by the pod spec.
+                          Value must be non-negative integer. The value zero indicates stop immediately via
+                          the kill signal (no opportunity to shut down).
+                          This is a beta field and requires enabling ProbeTerminationGracePeriod feature gate.
+                          Minimum value is 1. spec.terminationGracePeriodSeconds is used if unset.
+                        format: int64
+                        type: integer
+                      timeoutSeconds:
+                        description: |-
+                          Number of seconds after which the probe times out.
+                          Defaults to 1 second. Minimum value is 1.
+                          More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                        format: int32
+                        type: integer
+                    type: object
+                  disableMasterRollout:
+                    type: boolean
+                  disablePodDisruptionBudget:
+                    type: boolean
                   dnsPolicy:
                     description: DNSPolicy defines how a pod's DNS will be configured.
                     type: string
@@ -1135,25 +1694,50 @@ spec:
                           type: string
                         type: array
                       containerSecurityContext:
-                        description: SecurityContext holds security configuration
-                          that will be applied to a container. Some fields are present
-                          in both SecurityContext and PodSecurityContext.  When both
+                        description: |-
+                          SecurityContext holds security configuration that will be applied to a container.
+                          Some fields are present in both SecurityContext and PodSecurityContext.  When both
                           are set, the values in SecurityContext take precedence.
                         properties:
                           allowPrivilegeEscalation:
-                            description: 'AllowPrivilegeEscalation controls whether
-                              a process can gain more privileges than its parent process.
-                              This bool directly controls if the no_new_privs flag
-                              will be set on the container process. AllowPrivilegeEscalation
-                              is true always when the container is: 1) run as Privileged
-                              2) has CAP_SYS_ADMIN Note that this field cannot be
-                              set when spec.os.name is windows.'
+                            description: |-
+                              AllowPrivilegeEscalation controls whether a process can gain more
+                              privileges than its parent process. This bool directly controls if
+                              the no_new_privs flag will be set on the container process.
+                              AllowPrivilegeEscalation is true always when the container is:
+                              1) run as Privileged
+                              2) has CAP_SYS_ADMIN
+                              Note that this field cannot be set when spec.os.name is windows.
                             type: boolean
+                          appArmorProfile:
+                            description: |-
+                              appArmorProfile is the AppArmor options to use by this container. If set, this profile
+                              overrides the pod's appArmorProfile.
+                              Note that this field cannot be set when spec.os.name is windows.
+                            properties:
+                              localhostProfile:
+                                description: |-
+                                  localhostProfile indicates a profile loaded on the node that should be used.
+                                  The profile must be preconfigured on the node to work.
+                                  Must match the loaded name of the profile.
+                                  Must be set if and only if type is "Localhost".
+                                type: string
+                              type:
+                                description: |-
+                                  type indicates which kind of AppArmor profile will be applied.
+                                  Valid options are:
+                                    Localhost - a profile pre-loaded on the node.
+                                    RuntimeDefault - the container runtime's default profile.
+                                    Unconfined - no AppArmor enforcement.
+                                type: string
+                            required:
+                            - type
+                            type: object
                           capabilities:
-                            description: The capabilities to add/drop when running
-                              containers. Defaults to the default set of capabilities
-                              granted by the container runtime. Note that this field
-                              cannot be set when spec.os.name is windows.
+                            description: |-
+                              The capabilities to add/drop when running containers.
+                              Defaults to the default set of capabilities granted by the container runtime.
+                              Note that this field cannot be set when spec.os.name is windows.
                             properties:
                               add:
                                 description: Added capabilities
@@ -1162,6 +1746,7 @@ spec:
                                     type
                                   type: string
                                 type: array
+                                x-kubernetes-list-type: atomic
                               drop:
                                 description: Removed capabilities
                                 items:
@@ -1169,63 +1754,63 @@ spec:
                                     type
                                   type: string
                                 type: array
+                                x-kubernetes-list-type: atomic
                             type: object
                           privileged:
-                            description: Run container in privileged mode. Processes
-                              in privileged containers are essentially equivalent
-                              to root on the host. Defaults to false. Note that this
-                              field cannot be set when spec.os.name is windows.
+                            description: |-
+                              Run container in privileged mode.
+                              Processes in privileged containers are essentially equivalent to root on the host.
+                              Defaults to false.
+                              Note that this field cannot be set when spec.os.name is windows.
                             type: boolean
                           procMount:
-                            description: procMount denotes the type of proc mount
-                              to use for the containers. The default is DefaultProcMount
-                              which uses the container runtime defaults for readonly
-                              paths and masked paths. This requires the ProcMountType
-                              feature flag to be enabled. Note that this field cannot
-                              be set when spec.os.name is windows.
+                            description: |-
+                              procMount denotes the type of proc mount to use for the containers.
+                              The default value is Default which uses the container runtime defaults for
+                              readonly paths and masked paths.
+                              This requires the ProcMountType feature flag to be enabled.
+                              Note that this field cannot be set when spec.os.name is windows.
                             type: string
                           readOnlyRootFilesystem:
-                            description: Whether this container has a read-only root
-                              filesystem. Default is false. Note that this field cannot
-                              be set when spec.os.name is windows.
+                            description: |-
+                              Whether this container has a read-only root filesystem.
+                              Default is false.
+                              Note that this field cannot be set when spec.os.name is windows.
                             type: boolean
                           runAsGroup:
-                            description: The GID to run the entrypoint of the container
-                              process. Uses runtime default if unset. May also be
-                              set in PodSecurityContext.  If set in both SecurityContext
-                              and PodSecurityContext, the value specified in SecurityContext
-                              takes precedence. Note that this field cannot be set
-                              when spec.os.name is windows.
+                            description: |-
+                              The GID to run the entrypoint of the container process.
+                              Uses runtime default if unset.
+                              May also be set in PodSecurityContext.  If set in both SecurityContext and
+                              PodSecurityContext, the value specified in SecurityContext takes precedence.
+                              Note that this field cannot be set when spec.os.name is windows.
                             format: int64
                             type: integer
                           runAsNonRoot:
-                            description: Indicates that the container must run as
-                              a non-root user. If true, the Kubelet will validate
-                              the image at runtime to ensure that it does not run
-                              as UID 0 (root) and fail to start the container if it
-                              does. If unset or false, no such validation will be
-                              performed. May also be set in PodSecurityContext.  If
-                              set in both SecurityContext and PodSecurityContext,
-                              the value specified in SecurityContext takes precedence.
+                            description: |-
+                              Indicates that the container must run as a non-root user.
+                              If true, the Kubelet will validate the image at runtime to ensure that it
+                              does not run as UID 0 (root) and fail to start the container if it does.
+                              If unset or false, no such validation will be performed.
+                              May also be set in PodSecurityContext.  If set in both SecurityContext and
+                              PodSecurityContext, the value specified in SecurityContext takes precedence.
                             type: boolean
                           runAsUser:
-                            description: The UID to run the entrypoint of the container
-                              process. Defaults to user specified in image metadata
-                              if unspecified. May also be set in PodSecurityContext.  If
-                              set in both SecurityContext and PodSecurityContext,
-                              the value specified in SecurityContext takes precedence.
-                              Note that this field cannot be set when spec.os.name
-                              is windows.
+                            description: |-
+                              The UID to run the entrypoint of the container process.
+                              Defaults to user specified in image metadata if unspecified.
+                              May also be set in PodSecurityContext.  If set in both SecurityContext and
+                              PodSecurityContext, the value specified in SecurityContext takes precedence.
+                              Note that this field cannot be set when spec.os.name is windows.
                             format: int64
                             type: integer
                           seLinuxOptions:
-                            description: The SELinux context to be applied to the
-                              container. If unspecified, the container runtime will
-                              allocate a random SELinux context for each container.  May
-                              also be set in PodSecurityContext.  If set in both SecurityContext
-                              and PodSecurityContext, the value specified in SecurityContext
-                              takes precedence. Note that this field cannot be set
-                              when spec.os.name is windows.
+                            description: |-
+                              The SELinux context to be applied to the container.
+                              If unspecified, the container runtime will allocate a random SELinux context for each
+                              container.  May also be set in PodSecurityContext.  If set in both SecurityContext and
+                              PodSecurityContext, the value specified in SecurityContext takes precedence.
+                              Note that this field cannot be set when spec.os.name is windows.
                             properties:
                               level:
                                 description: Level is SELinux level label that applies
@@ -1245,69 +1830,61 @@ spec:
                                 type: string
                             type: object
                           seccompProfile:
-                            description: The seccomp options to use by this container.
-                              If seccomp options are provided at both the pod & container
-                              level, the container options override the pod options.
-                              Note that this field cannot be set when spec.os.name
-                              is windows.
+                            description: |-
+                              The seccomp options to use by this container. If seccomp options are
+                              provided at both the pod & container level, the container options
+                              override the pod options.
+                              Note that this field cannot be set when spec.os.name is windows.
                             properties:
                               localhostProfile:
-                                description: localhostProfile indicates a profile
-                                  defined in a file on the node should be used. The
-                                  profile must be preconfigured on the node to work.
-                                  Must be a descending path, relative to the kubelet's
-                                  configured seccomp profile location. Must only be
-                                  set if type is "Localhost".
+                                description: |-
+                                  localhostProfile indicates a profile defined in a file on the node should be used.
+                                  The profile must be preconfigured on the node to work.
+                                  Must be a descending path, relative to the kubelet's configured seccomp profile location.
+                                  Must be set if type is "Localhost". Must NOT be set for any other type.
                                 type: string
                               type:
-                                description: "type indicates which kind of seccomp
-                                  profile will be applied. Valid options are: \n Localhost
-                                  - a profile defined in a file on the node should
-                                  be used. RuntimeDefault - the container runtime
-                                  default profile should be used. Unconfined - no
-                                  profile should be applied."
+                                description: |-
+                                  type indicates which kind of seccomp profile will be applied.
+                                  Valid options are:
+
+                                  Localhost - a profile defined in a file on the node should be used.
+                                  RuntimeDefault - the container runtime default profile should be used.
+                                  Unconfined - no profile should be applied.
                                 type: string
                             required:
                             - type
                             type: object
                           windowsOptions:
-                            description: The Windows specific settings applied to
-                              all containers. If unspecified, the options from the
-                              PodSecurityContext will be used. If set in both SecurityContext
-                              and PodSecurityContext, the value specified in SecurityContext
-                              takes precedence. Note that this field cannot be set
-                              when spec.os.name is linux.
+                            description: |-
+                              The Windows specific settings applied to all containers.
+                              If unspecified, the options from the PodSecurityContext will be used.
+                              If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence.
+                              Note that this field cannot be set when spec.os.name is linux.
                             properties:
                               gmsaCredentialSpec:
-                                description: GMSACredentialSpec is where the GMSA
-                                  admission webhook (https://github.com/kubernetes-sigs/windows-gmsa)
-                                  inlines the contents of the GMSA credential spec
-                                  named by the GMSACredentialSpecName field.
+                                description: |-
+                                  GMSACredentialSpec is where the GMSA admission webhook
+                                  (https://github.com/kubernetes-sigs/windows-gmsa) inlines the contents of the
+                                  GMSA credential spec named by the GMSACredentialSpecName field.
                                 type: string
                               gmsaCredentialSpecName:
                                 description: GMSACredentialSpecName is the name of
                                   the GMSA credential spec to use.
                                 type: string
                               hostProcess:
-                                description: HostProcess determines if a container
-                                  should be run as a 'Host Process' container. This
-                                  field is alpha-level and will only be honored by
-                                  components that enable the WindowsHostProcessContainers
-                                  feature flag. Setting this field without the feature
-                                  flag will result in errors when validating the Pod.
-                                  All of a Pod's containers must have the same effective
-                                  HostProcess value (it is not allowed to have a mix
-                                  of HostProcess containers and non-HostProcess containers).  In
-                                  addition, if HostProcess is true then HostNetwork
-                                  must also be set to true.
+                                description: |-
+                                  HostProcess determines if a container should be run as a 'Host Process' container.
+                                  All of a Pod's containers must have the same effective HostProcess value
+                                  (it is not allowed to have a mix of HostProcess containers and non-HostProcess containers).
+                                  In addition, if HostProcess is true then HostNetwork must also be set to true.
                                 type: boolean
                               runAsUserName:
-                                description: The UserName in Windows to run the entrypoint
-                                  of the container process. Defaults to the user specified
-                                  in image metadata if unspecified. May also be set
-                                  in PodSecurityContext. If set in both SecurityContext
-                                  and PodSecurityContext, the value specified in SecurityContext
-                                  takes precedence.
+                                description: |-
+                                  The UserName in Windows to run the entrypoint of the container process.
+                                  Defaults to the user specified in image metadata if unspecified.
+                                  May also be set in PodSecurityContext. If set in both SecurityContext and
+                                  PodSecurityContext, the value specified in SecurityContext takes precedence.
                                 type: string
                             type: object
                         type: object
@@ -1323,16 +1900,16 @@ spec:
                                 be a C_IDENTIFIER.
                               type: string
                             value:
-                              description: 'Variable references $(VAR_NAME) are expanded
-                                using the previously defined environment variables
-                                in the container and any service environment variables.
-                                If a variable cannot be resolved, the reference in
-                                the input string will be unchanged. Double $$ are
-                                reduced to a single $, which allows for escaping the
-                                $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)" will produce
-                                the string literal "$(VAR_NAME)". Escaped references
-                                will never be expanded, regardless of whether the
-                                variable exists or not. Defaults to "".'
+                              description: |-
+                                Variable references $(VAR_NAME) are expanded
+                                using the previously defined environment variables in the container and
+                                any service environment variables. If a variable cannot be resolved,
+                                the reference in the input string will be unchanged. Double $$ are reduced
+                                to a single $, which allows for escaping the $(VAR_NAME) syntax: i.e.
+                                "$$(VAR_NAME)" will produce the string literal "$(VAR_NAME)".
+                                Escaped references will never be expanded, regardless of whether the variable
+                                exists or not.
+                                Defaults to "".
                               type: string
                             valueFrom:
                               description: Source for the environment variable's value.
@@ -1345,10 +1922,13 @@ spec:
                                       description: The key to select.
                                       type: string
                                     name:
-                                      description: 'Name of the referent. More info:
-                                        https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                                        TODO: Add other useful fields. apiVersion,
-                                        kind, uid?'
+                                      default: ""
+                                      description: |-
+                                        Name of the referent.
+                                        This field is effectively required, but due to backwards compatibility is
+                                        allowed to be empty. Instances of this type with an empty value here are
+                                        almost certainly wrong.
+                                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
                                       type: string
                                     optional:
                                       description: Specify whether the ConfigMap or
@@ -1357,12 +1937,11 @@ spec:
                                   required:
                                   - key
                                   type: object
+                                  x-kubernetes-map-type: atomic
                                 fieldRef:
-                                  description: 'Selects a field of the pod: supports
-                                    metadata.name, metadata.namespace, `metadata.labels[''<KEY>'']`,
-                                    `metadata.annotations[''<KEY>'']`, spec.nodeName,
-                                    spec.serviceAccountName, status.hostIP, status.podIP,
-                                    status.podIPs.'
+                                  description: |-
+                                    Selects a field of the pod: supports metadata.name, metadata.namespace, `metadata.labels['<KEY>']`, `metadata.annotations['<KEY>']`,
+                                    spec.nodeName, spec.serviceAccountName, status.hostIP, status.podIP, status.podIPs.
                                   properties:
                                     apiVersion:
                                       description: Version of the schema the FieldPath
@@ -1375,12 +1954,11 @@ spec:
                                   required:
                                   - fieldPath
                                   type: object
+                                  x-kubernetes-map-type: atomic
                                 resourceFieldRef:
-                                  description: 'Selects a resource of the container:
-                                    only resources limits and requests (limits.cpu,
-                                    limits.memory, limits.ephemeral-storage, requests.cpu,
-                                    requests.memory and requests.ephemeral-storage)
-                                    are currently supported.'
+                                  description: |-
+                                    Selects a resource of the container: only resources limits and requests
+                                    (limits.cpu, limits.memory, limits.ephemeral-storage, requests.cpu, requests.memory and requests.ephemeral-storage) are currently supported.
                                   properties:
                                     containerName:
                                       description: 'Container name: required for volumes,
@@ -1400,6 +1978,7 @@ spec:
                                   required:
                                   - resource
                                   type: object
+                                  x-kubernetes-map-type: atomic
                                 secretKeyRef:
                                   description: Selects a key of a secret in the pod's
                                     namespace
@@ -1409,10 +1988,13 @@ spec:
                                         from.  Must be a valid secret key.
                                       type: string
                                     name:
-                                      description: 'Name of the referent. More info:
-                                        https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                                        TODO: Add other useful fields. apiVersion,
-                                        kind, uid?'
+                                      default: ""
+                                      description: |-
+                                        Name of the referent.
+                                        This field is effectively required, but due to backwards compatibility is
+                                        allowed to be empty. Instances of this type with an empty value here are
+                                        almost certainly wrong.
+                                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
                                       type: string
                                     optional:
                                       description: Specify whether the Secret or its
@@ -1421,6 +2003,7 @@ spec:
                                   required:
                                   - key
                                   type: object
+                                  x-kubernetes-map-type: atomic
                               type: object
                           required:
                           - name
@@ -1436,6 +2019,37 @@ spec:
                         description: ResourceRequirements describes the compute resource
                           requirements.
                         properties:
+                          claims:
+                            description: |-
+                              Claims lists the names of resources, defined in spec.resourceClaims,
+                              that are used by this container.
+
+                              This is an alpha field and requires enabling the
+                              DynamicResourceAllocation feature gate.
+
+                              This field is immutable. It can only be set for containers.
+                            items:
+                              description: ResourceClaim references one entry in PodSpec.ResourceClaims.
+                              properties:
+                                name:
+                                  description: |-
+                                    Name must match the name of one entry in pod.spec.resourceClaims of
+                                    the Pod where this field is used. It makes that resource available
+                                    inside a container.
+                                  type: string
+                                request:
+                                  description: |-
+                                    Request is the name chosen for a request in the referenced claim.
+                                    If empty, everything from the claim is made available, otherwise
+                                    only the result of this request.
+                                  type: string
+                              required:
+                              - name
+                              type: object
+                            type: array
+                            x-kubernetes-list-map-keys:
+                            - name
+                            x-kubernetes-list-type: map
                           limits:
                             additionalProperties:
                               anyOf:
@@ -1443,8 +2057,9 @@ spec:
                               - type: string
                               pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
                               x-kubernetes-int-or-string: true
-                            description: 'Limits describes the maximum amount of compute
-                              resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
+                            description: |-
+                              Limits describes the maximum amount of compute resources allowed.
+                              More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
                             type: object
                           requests:
                             additionalProperties:
@@ -1453,11 +2068,11 @@ spec:
                               - type: string
                               pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
                               x-kubernetes-int-or-string: true
-                            description: 'Requests describes the minimum amount of
-                              compute resources required. If Requests is omitted for
-                              a container, it defaults to Limits if that is explicitly
-                              specified, otherwise to an implementation-defined value.
-                              More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
+                            description: |-
+                              Requests describes the minimum amount of compute resources required.
+                              If Requests is omitted for a container, it defaults to Limits if that is explicitly specified,
+                              otherwise to an implementation-defined value. Requests cannot exceed Limits.
+                              More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
                             type: object
                         type: object
                     type: object
@@ -1467,37 +2082,37 @@ spec:
                         run within a pod.
                       properties:
                         args:
-                          description: 'Arguments to the entrypoint. The container
-                            image''s CMD is used if this is not provided. Variable
-                            references $(VAR_NAME) are expanded using the container''s
-                            environment. If a variable cannot be resolved, the reference
-                            in the input string will be unchanged. Double $$ are reduced
-                            to a single $, which allows for escaping the $(VAR_NAME)
-                            syntax: i.e. "$$(VAR_NAME)" will produce the string literal
-                            "$(VAR_NAME)". Escaped references will never be expanded,
-                            regardless of whether the variable exists or not. Cannot
-                            be updated. More info: https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell'
+                          description: |-
+                            Arguments to the entrypoint.
+                            The container image's CMD is used if this is not provided.
+                            Variable references $(VAR_NAME) are expanded using the container's environment. If a variable
+                            cannot be resolved, the reference in the input string will be unchanged. Double $$ are reduced
+                            to a single $, which allows for escaping the $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)" will
+                            produce the string literal "$(VAR_NAME)". Escaped references will never be expanded, regardless
+                            of whether the variable exists or not. Cannot be updated.
+                            More info: https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell
                           items:
                             type: string
                           type: array
+                          x-kubernetes-list-type: atomic
                         command:
-                          description: 'Entrypoint array. Not executed within a shell.
-                            The container image''s ENTRYPOINT is used if this is not
-                            provided. Variable references $(VAR_NAME) are expanded
-                            using the container''s environment. If a variable cannot
-                            be resolved, the reference in the input string will be
-                            unchanged. Double $$ are reduced to a single $, which
-                            allows for escaping the $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)"
-                            will produce the string literal "$(VAR_NAME)". Escaped
-                            references will never be expanded, regardless of whether
-                            the variable exists or not. Cannot be updated. More info:
-                            https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell'
+                          description: |-
+                            Entrypoint array. Not executed within a shell.
+                            The container image's ENTRYPOINT is used if this is not provided.
+                            Variable references $(VAR_NAME) are expanded using the container's environment. If a variable
+                            cannot be resolved, the reference in the input string will be unchanged. Double $$ are reduced
+                            to a single $, which allows for escaping the $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)" will
+                            produce the string literal "$(VAR_NAME)". Escaped references will never be expanded, regardless
+                            of whether the variable exists or not. Cannot be updated.
+                            More info: https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell
                           items:
                             type: string
                           type: array
+                          x-kubernetes-list-type: atomic
                         env:
-                          description: List of environment variables to set in the
-                            container. Cannot be updated.
+                          description: |-
+                            List of environment variables to set in the container.
+                            Cannot be updated.
                           items:
                             description: EnvVar represents an environment variable
                               present in a Container.
@@ -1507,17 +2122,16 @@ spec:
                                   be a C_IDENTIFIER.
                                 type: string
                               value:
-                                description: 'Variable references $(VAR_NAME) are
-                                  expanded using the previously defined environment
-                                  variables in the container and any service environment
-                                  variables. If a variable cannot be resolved, the
-                                  reference in the input string will be unchanged.
-                                  Double $$ are reduced to a single $, which allows
-                                  for escaping the $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)"
-                                  will produce the string literal "$(VAR_NAME)". Escaped
-                                  references will never be expanded, regardless of
-                                  whether the variable exists or not. Defaults to
-                                  "".'
+                                description: |-
+                                  Variable references $(VAR_NAME) are expanded
+                                  using the previously defined environment variables in the container and
+                                  any service environment variables. If a variable cannot be resolved,
+                                  the reference in the input string will be unchanged. Double $$ are reduced
+                                  to a single $, which allows for escaping the $(VAR_NAME) syntax: i.e.
+                                  "$$(VAR_NAME)" will produce the string literal "$(VAR_NAME)".
+                                  Escaped references will never be expanded, regardless of whether the variable
+                                  exists or not.
+                                  Defaults to "".
                                 type: string
                               valueFrom:
                                 description: Source for the environment variable's
@@ -1530,10 +2144,13 @@ spec:
                                         description: The key to select.
                                         type: string
                                       name:
-                                        description: 'Name of the referent. More info:
-                                          https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                                          TODO: Add other useful fields. apiVersion,
-                                          kind, uid?'
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
                                         type: string
                                       optional:
                                         description: Specify whether the ConfigMap
@@ -1542,12 +2159,11 @@ spec:
                                     required:
                                     - key
                                     type: object
+                                    x-kubernetes-map-type: atomic
                                   fieldRef:
-                                    description: 'Selects a field of the pod: supports
-                                      metadata.name, metadata.namespace, `metadata.labels[''<KEY>'']`,
-                                      `metadata.annotations[''<KEY>'']`, spec.nodeName,
-                                      spec.serviceAccountName, status.hostIP, status.podIP,
-                                      status.podIPs.'
+                                    description: |-
+                                      Selects a field of the pod: supports metadata.name, metadata.namespace, `metadata.labels['<KEY>']`, `metadata.annotations['<KEY>']`,
+                                      spec.nodeName, spec.serviceAccountName, status.hostIP, status.podIP, status.podIPs.
                                     properties:
                                       apiVersion:
                                         description: Version of the schema the FieldPath
@@ -1560,12 +2176,11 @@ spec:
                                     required:
                                     - fieldPath
                                     type: object
+                                    x-kubernetes-map-type: atomic
                                   resourceFieldRef:
-                                    description: 'Selects a resource of the container:
-                                      only resources limits and requests (limits.cpu,
-                                      limits.memory, limits.ephemeral-storage, requests.cpu,
-                                      requests.memory and requests.ephemeral-storage)
-                                      are currently supported.'
+                                    description: |-
+                                      Selects a resource of the container: only resources limits and requests
+                                      (limits.cpu, limits.memory, limits.ephemeral-storage, requests.cpu, requests.memory and requests.ephemeral-storage) are currently supported.
                                     properties:
                                       containerName:
                                         description: 'Container name: required for
@@ -1585,6 +2200,7 @@ spec:
                                     required:
                                     - resource
                                     type: object
+                                    x-kubernetes-map-type: atomic
                                   secretKeyRef:
                                     description: Selects a key of a secret in the
                                       pod's namespace
@@ -1594,10 +2210,13 @@ spec:
                                           from.  Must be a valid secret key.
                                         type: string
                                       name:
-                                        description: 'Name of the referent. More info:
-                                          https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                                          TODO: Add other useful fields. apiVersion,
-                                          kind, uid?'
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
                                         type: string
                                       optional:
                                         description: Specify whether the Secret or
@@ -1606,104 +2225,121 @@ spec:
                                     required:
                                     - key
                                     type: object
+                                    x-kubernetes-map-type: atomic
                                 type: object
                             required:
                             - name
                             type: object
                           type: array
+                          x-kubernetes-list-map-keys:
+                          - name
+                          x-kubernetes-list-type: map
                         envFrom:
-                          description: List of sources to populate environment variables
-                            in the container. The keys defined within a source must
-                            be a C_IDENTIFIER. All invalid keys will be reported as
-                            an event when the container is starting. When a key exists
-                            in multiple sources, the value associated with the last
-                            source will take precedence. Values defined by an Env
-                            with a duplicate key will take precedence. Cannot be updated.
+                          description: |-
+                            List of sources to populate environment variables in the container.
+                            The keys defined within a source must be a C_IDENTIFIER. All invalid keys
+                            will be reported as an event when the container is starting. When a key exists in multiple
+                            sources, the value associated with the last source will take precedence.
+                            Values defined by an Env with a duplicate key will take precedence.
+                            Cannot be updated.
                           items:
                             description: EnvFromSource represents the source of a
-                              set of ConfigMaps
+                              set of ConfigMaps or Secrets
                             properties:
                               configMapRef:
                                 description: The ConfigMap to select from
                                 properties:
                                   name:
-                                    description: 'Name of the referent. More info:
-                                      https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                                      TODO: Add other useful fields. apiVersion, kind,
-                                      uid?'
+                                    default: ""
+                                    description: |-
+                                      Name of the referent.
+                                      This field is effectively required, but due to backwards compatibility is
+                                      allowed to be empty. Instances of this type with an empty value here are
+                                      almost certainly wrong.
+                                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
                                     type: string
                                   optional:
                                     description: Specify whether the ConfigMap must
                                       be defined
                                     type: boolean
                                 type: object
+                                x-kubernetes-map-type: atomic
                               prefix:
-                                description: An optional identifier to prepend to
-                                  each key in the ConfigMap. Must be a C_IDENTIFIER.
+                                description: Optional text to prepend to the name
+                                  of each environment variable. Must be a C_IDENTIFIER.
                                 type: string
                               secretRef:
                                 description: The Secret to select from
                                 properties:
                                   name:
-                                    description: 'Name of the referent. More info:
-                                      https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                                      TODO: Add other useful fields. apiVersion, kind,
-                                      uid?'
+                                    default: ""
+                                    description: |-
+                                      Name of the referent.
+                                      This field is effectively required, but due to backwards compatibility is
+                                      allowed to be empty. Instances of this type with an empty value here are
+                                      almost certainly wrong.
+                                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
                                     type: string
                                   optional:
                                     description: Specify whether the Secret must be
                                       defined
                                     type: boolean
                                 type: object
+                                x-kubernetes-map-type: atomic
                             type: object
                           type: array
+                          x-kubernetes-list-type: atomic
                         image:
-                          description: 'Container image name. More info: https://kubernetes.io/docs/concepts/containers/images
-                            This field is optional to allow higher level config management
-                            to default or override container images in workload controllers
-                            like Deployments and StatefulSets.'
+                          description: |-
+                            Container image name.
+                            More info: https://kubernetes.io/docs/concepts/containers/images
+                            This field is optional to allow higher level config management to default or override
+                            container images in workload controllers like Deployments and StatefulSets.
                           type: string
                         imagePullPolicy:
-                          description: 'Image pull policy. One of Always, Never, IfNotPresent.
-                            Defaults to Always if :latest tag is specified, or IfNotPresent
-                            otherwise. Cannot be updated. More info: https://kubernetes.io/docs/concepts/containers/images#updating-images'
+                          description: |-
+                            Image pull policy.
+                            One of Always, Never, IfNotPresent.
+                            Defaults to Always if :latest tag is specified, or IfNotPresent otherwise.
+                            Cannot be updated.
+                            More info: https://kubernetes.io/docs/concepts/containers/images#updating-images
                           type: string
                         lifecycle:
-                          description: Actions that the management system should take
-                            in response to container lifecycle events. Cannot be updated.
+                          description: |-
+                            Actions that the management system should take in response to container lifecycle events.
+                            Cannot be updated.
                           properties:
                             postStart:
-                              description: 'PostStart is called immediately after
-                                a container is created. If the handler fails, the
-                                container is terminated and restarted according to
-                                its restart policy. Other management of the container
-                                blocks until the hook completes. More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks'
+                              description: |-
+                                PostStart is called immediately after a container is created. If the handler fails,
+                                the container is terminated and restarted according to its restart policy.
+                                Other management of the container blocks until the hook completes.
+                                More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
                               properties:
                                 exec:
-                                  description: Exec specifies the action to take.
+                                  description: Exec specifies a command to execute
+                                    in the container.
                                   properties:
                                     command:
-                                      description: Command is the command line to
-                                        execute inside the container, the working
-                                        directory for the command  is root ('/') in
-                                        the container's filesystem. The command is
-                                        simply exec'd, it is not run inside a shell,
-                                        so traditional shell instructions ('|', etc)
-                                        won't work. To use a shell, you need to explicitly
-                                        call out to that shell. Exit status of 0 is
-                                        treated as live/healthy and non-zero is unhealthy.
+                                      description: |-
+                                        Command is the command line to execute inside the container, the working directory for the
+                                        command  is root ('/') in the container's filesystem. The command is simply exec'd, it is
+                                        not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use
+                                        a shell, you need to explicitly call out to that shell.
+                                        Exit status of 0 is treated as live/healthy and non-zero is unhealthy.
                                       items:
                                         type: string
                                       type: array
+                                      x-kubernetes-list-type: atomic
                                   type: object
                                 httpGet:
-                                  description: HTTPGet specifies the http request
+                                  description: HTTPGet specifies an HTTP GET request
                                     to perform.
                                   properties:
                                     host:
-                                      description: Host name to connect to, defaults
-                                        to the pod IP. You probably want to set "Host"
-                                        in httpHeaders instead.
+                                      description: |-
+                                        Host name to connect to, defaults to the pod IP. You probably want to set
+                                        "Host" in httpHeaders instead.
                                       type: string
                                     httpHeaders:
                                       description: Custom headers to set in the request.
@@ -1713,7 +2349,9 @@ spec:
                                           header to be used in HTTP probes
                                         properties:
                                           name:
-                                            description: The header field name
+                                            description: |-
+                                              The header field name.
+                                              This will be canonicalized upon output, so case-variant names will be understood as the same header.
                                             type: string
                                           value:
                                             description: The header field value
@@ -1723,6 +2361,7 @@ spec:
                                         - value
                                         type: object
                                       type: array
+                                      x-kubernetes-list-type: atomic
                                     path:
                                       description: Path to access on the HTTP server.
                                       type: string
@@ -1730,23 +2369,36 @@ spec:
                                       anyOf:
                                       - type: integer
                                       - type: string
-                                      description: Name or number of the port to access
-                                        on the container. Number must be in the range
-                                        1 to 65535. Name must be an IANA_SVC_NAME.
+                                      description: |-
+                                        Name or number of the port to access on the container.
+                                        Number must be in the range 1 to 65535.
+                                        Name must be an IANA_SVC_NAME.
                                       x-kubernetes-int-or-string: true
                                     scheme:
-                                      description: Scheme to use for connecting to
-                                        the host. Defaults to HTTP.
+                                      description: |-
+                                        Scheme to use for connecting to the host.
+                                        Defaults to HTTP.
                                       type: string
                                   required:
                                   - port
                                   type: object
+                                sleep:
+                                  description: Sleep represents a duration that the
+                                    container should sleep.
+                                  properties:
+                                    seconds:
+                                      description: Seconds is the number of seconds
+                                        to sleep.
+                                      format: int64
+                                      type: integer
+                                  required:
+                                  - seconds
+                                  type: object
                                 tcpSocket:
-                                  description: Deprecated. TCPSocket is NOT supported
-                                    as a LifecycleHandler and kept for the backward
-                                    compatibility. There are no validation of this
-                                    field and lifecycle hooks will fail in runtime
-                                    when tcp handler is specified.
+                                  description: |-
+                                    Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
+                                    for backward compatibility. There is no validation of this field and
+                                    lifecycle hooks will fail at runtime when it is specified.
                                   properties:
                                     host:
                                       description: 'Optional: Host name to connect
@@ -1756,53 +2408,51 @@ spec:
                                       anyOf:
                                       - type: integer
                                       - type: string
-                                      description: Number or name of the port to access
-                                        on the container. Number must be in the range
-                                        1 to 65535. Name must be an IANA_SVC_NAME.
+                                      description: |-
+                                        Number or name of the port to access on the container.
+                                        Number must be in the range 1 to 65535.
+                                        Name must be an IANA_SVC_NAME.
                                       x-kubernetes-int-or-string: true
                                   required:
                                   - port
                                   type: object
                               type: object
                             preStop:
-                              description: 'PreStop is called immediately before a
-                                container is terminated due to an API request or management
-                                event such as liveness/startup probe failure, preemption,
-                                resource contention, etc. The handler is not called
-                                if the container crashes or exits. The Pod''s termination
-                                grace period countdown begins before the PreStop hook
-                                is executed. Regardless of the outcome of the handler,
-                                the container will eventually terminate within the
-                                Pod''s termination grace period (unless delayed by
-                                finalizers). Other management of the container blocks
-                                until the hook completes or until the termination
-                                grace period is reached. More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks'
+                              description: |-
+                                PreStop is called immediately before a container is terminated due to an
+                                API request or management event such as liveness/startup probe failure,
+                                preemption, resource contention, etc. The handler is not called if the
+                                container crashes or exits. The Pod's termination grace period countdown begins before the
+                                PreStop hook is executed. Regardless of the outcome of the handler, the
+                                container will eventually terminate within the Pod's termination grace
+                                period (unless delayed by finalizers). Other management of the container blocks until the hook completes
+                                or until the termination grace period is reached.
+                                More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
                               properties:
                                 exec:
-                                  description: Exec specifies the action to take.
+                                  description: Exec specifies a command to execute
+                                    in the container.
                                   properties:
                                     command:
-                                      description: Command is the command line to
-                                        execute inside the container, the working
-                                        directory for the command  is root ('/') in
-                                        the container's filesystem. The command is
-                                        simply exec'd, it is not run inside a shell,
-                                        so traditional shell instructions ('|', etc)
-                                        won't work. To use a shell, you need to explicitly
-                                        call out to that shell. Exit status of 0 is
-                                        treated as live/healthy and non-zero is unhealthy.
+                                      description: |-
+                                        Command is the command line to execute inside the container, the working directory for the
+                                        command  is root ('/') in the container's filesystem. The command is simply exec'd, it is
+                                        not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use
+                                        a shell, you need to explicitly call out to that shell.
+                                        Exit status of 0 is treated as live/healthy and non-zero is unhealthy.
                                       items:
                                         type: string
                                       type: array
+                                      x-kubernetes-list-type: atomic
                                   type: object
                                 httpGet:
-                                  description: HTTPGet specifies the http request
+                                  description: HTTPGet specifies an HTTP GET request
                                     to perform.
                                   properties:
                                     host:
-                                      description: Host name to connect to, defaults
-                                        to the pod IP. You probably want to set "Host"
-                                        in httpHeaders instead.
+                                      description: |-
+                                        Host name to connect to, defaults to the pod IP. You probably want to set
+                                        "Host" in httpHeaders instead.
                                       type: string
                                     httpHeaders:
                                       description: Custom headers to set in the request.
@@ -1812,7 +2462,9 @@ spec:
                                           header to be used in HTTP probes
                                         properties:
                                           name:
-                                            description: The header field name
+                                            description: |-
+                                              The header field name.
+                                              This will be canonicalized upon output, so case-variant names will be understood as the same header.
                                             type: string
                                           value:
                                             description: The header field value
@@ -1822,6 +2474,7 @@ spec:
                                         - value
                                         type: object
                                       type: array
+                                      x-kubernetes-list-type: atomic
                                     path:
                                       description: Path to access on the HTTP server.
                                       type: string
@@ -1829,23 +2482,36 @@ spec:
                                       anyOf:
                                       - type: integer
                                       - type: string
-                                      description: Name or number of the port to access
-                                        on the container. Number must be in the range
-                                        1 to 65535. Name must be an IANA_SVC_NAME.
+                                      description: |-
+                                        Name or number of the port to access on the container.
+                                        Number must be in the range 1 to 65535.
+                                        Name must be an IANA_SVC_NAME.
                                       x-kubernetes-int-or-string: true
                                     scheme:
-                                      description: Scheme to use for connecting to
-                                        the host. Defaults to HTTP.
+                                      description: |-
+                                        Scheme to use for connecting to the host.
+                                        Defaults to HTTP.
                                       type: string
                                   required:
                                   - port
                                   type: object
+                                sleep:
+                                  description: Sleep represents a duration that the
+                                    container should sleep.
+                                  properties:
+                                    seconds:
+                                      description: Seconds is the number of seconds
+                                        to sleep.
+                                      format: int64
+                                      type: integer
+                                  required:
+                                  - seconds
+                                  type: object
                                 tcpSocket:
-                                  description: Deprecated. TCPSocket is NOT supported
-                                    as a LifecycleHandler and kept for the backward
-                                    compatibility. There are no validation of this
-                                    field and lifecycle hooks will fail in runtime
-                                    when tcp handler is specified.
+                                  description: |-
+                                    Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
+                                    for backward compatibility. There is no validation of this field and
+                                    lifecycle hooks will fail at runtime when it is specified.
                                   properties:
                                     host:
                                       description: 'Optional: Host name to connect
@@ -1855,47 +2521,53 @@ spec:
                                       anyOf:
                                       - type: integer
                                       - type: string
-                                      description: Number or name of the port to access
-                                        on the container. Number must be in the range
-                                        1 to 65535. Name must be an IANA_SVC_NAME.
+                                      description: |-
+                                        Number or name of the port to access on the container.
+                                        Number must be in the range 1 to 65535.
+                                        Name must be an IANA_SVC_NAME.
                                       x-kubernetes-int-or-string: true
                                   required:
                                   - port
                                   type: object
                               type: object
+                            stopSignal:
+                              description: |-
+                                StopSignal defines which signal will be sent to a container when it is being stopped.
+                                If not specified, the default is defined by the container runtime in use.
+                                StopSignal can only be set for Pods with a non-empty .spec.os.name
+                              type: string
                           type: object
                         livenessProbe:
-                          description: 'Periodic probe of container liveness. Container
-                            will be restarted if the probe fails. Cannot be updated.
-                            More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
+                          description: |-
+                            Periodic probe of container liveness.
+                            Container will be restarted if the probe fails.
+                            Cannot be updated.
+                            More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
                           properties:
                             exec:
-                              description: Exec specifies the action to take.
+                              description: Exec specifies a command to execute in
+                                the container.
                               properties:
                                 command:
-                                  description: Command is the command line to execute
-                                    inside the container, the working directory for
-                                    the command  is root ('/') in the container's
-                                    filesystem. The command is simply exec'd, it is
-                                    not run inside a shell, so traditional shell instructions
-                                    ('|', etc) won't work. To use a shell, you need
-                                    to explicitly call out to that shell. Exit status
-                                    of 0 is treated as live/healthy and non-zero is
-                                    unhealthy.
+                                  description: |-
+                                    Command is the command line to execute inside the container, the working directory for the
+                                    command  is root ('/') in the container's filesystem. The command is simply exec'd, it is
+                                    not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use
+                                    a shell, you need to explicitly call out to that shell.
+                                    Exit status of 0 is treated as live/healthy and non-zero is unhealthy.
                                   items:
                                     type: string
                                   type: array
+                                  x-kubernetes-list-type: atomic
                               type: object
                             failureThreshold:
-                              description: Minimum consecutive failures for the probe
-                                to be considered failed after having succeeded. Defaults
-                                to 3. Minimum value is 1.
+                              description: |-
+                                Minimum consecutive failures for the probe to be considered failed after having succeeded.
+                                Defaults to 3. Minimum value is 1.
                               format: int32
                               type: integer
                             grpc:
-                              description: GRPC specifies an action involving a GRPC
-                                port. This is a beta field and requires enabling GRPCContainerProbe
-                                feature gate.
+                              description: GRPC specifies a GRPC HealthCheckRequest.
                               properties:
                                 port:
                                   description: Port number of the gRPC service. Number
@@ -1903,21 +2575,24 @@ spec:
                                   format: int32
                                   type: integer
                                 service:
-                                  description: "Service is the name of the service
-                                    to place in the gRPC HealthCheckRequest (see https://github.com/grpc/grpc/blob/master/doc/health-checking.md).
-                                    \n If this is not specified, the default behavior
-                                    is defined by gRPC."
+                                  default: ""
+                                  description: |-
+                                    Service is the name of the service to place in the gRPC HealthCheckRequest
+                                    (see https://github.com/grpc/grpc/blob/master/doc/health-checking.md).
+
+                                    If this is not specified, the default behavior is defined by gRPC.
                                   type: string
                               required:
                               - port
                               type: object
                             httpGet:
-                              description: HTTPGet specifies the http request to perform.
+                              description: HTTPGet specifies an HTTP GET request to
+                                perform.
                               properties:
                                 host:
-                                  description: Host name to connect to, defaults to
-                                    the pod IP. You probably want to set "Host" in
-                                    httpHeaders instead.
+                                  description: |-
+                                    Host name to connect to, defaults to the pod IP. You probably want to set
+                                    "Host" in httpHeaders instead.
                                   type: string
                                 httpHeaders:
                                   description: Custom headers to set in the request.
@@ -1927,7 +2602,9 @@ spec:
                                       to be used in HTTP probes
                                     properties:
                                       name:
-                                        description: The header field name
+                                        description: |-
+                                          The header field name.
+                                          This will be canonicalized upon output, so case-variant names will be understood as the same header.
                                         type: string
                                       value:
                                         description: The header field value
@@ -1937,6 +2614,7 @@ spec:
                                     - value
                                     type: object
                                   type: array
+                                  x-kubernetes-list-type: atomic
                                 path:
                                   description: Path to access on the HTTP server.
                                   type: string
@@ -1944,38 +2622,40 @@ spec:
                                   anyOf:
                                   - type: integer
                                   - type: string
-                                  description: Name or number of the port to access
-                                    on the container. Number must be in the range
-                                    1 to 65535. Name must be an IANA_SVC_NAME.
+                                  description: |-
+                                    Name or number of the port to access on the container.
+                                    Number must be in the range 1 to 65535.
+                                    Name must be an IANA_SVC_NAME.
                                   x-kubernetes-int-or-string: true
                                 scheme:
-                                  description: Scheme to use for connecting to the
-                                    host. Defaults to HTTP.
+                                  description: |-
+                                    Scheme to use for connecting to the host.
+                                    Defaults to HTTP.
                                   type: string
                               required:
                               - port
                               type: object
                             initialDelaySeconds:
-                              description: 'Number of seconds after the container
-                                has started before liveness probes are initiated.
-                                More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
+                              description: |-
+                                Number of seconds after the container has started before liveness probes are initiated.
+                                More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
                               format: int32
                               type: integer
                             periodSeconds:
-                              description: How often (in seconds) to perform the probe.
+                              description: |-
+                                How often (in seconds) to perform the probe.
                                 Default to 10 seconds. Minimum value is 1.
                               format: int32
                               type: integer
                             successThreshold:
-                              description: Minimum consecutive successes for the probe
-                                to be considered successful after having failed. Defaults
-                                to 1. Must be 1 for liveness and startup. Minimum
-                                value is 1.
+                              description: |-
+                                Minimum consecutive successes for the probe to be considered successful after having failed.
+                                Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
                               format: int32
                               type: integer
                             tcpSocket:
-                              description: TCPSocket specifies an action involving
-                                a TCP port.
+                              description: TCPSocket specifies a connection to a TCP
+                                port.
                               properties:
                                 host:
                                   description: 'Optional: Host name to connect to,
@@ -1985,60 +2665,59 @@ spec:
                                   anyOf:
                                   - type: integer
                                   - type: string
-                                  description: Number or name of the port to access
-                                    on the container. Number must be in the range
-                                    1 to 65535. Name must be an IANA_SVC_NAME.
+                                  description: |-
+                                    Number or name of the port to access on the container.
+                                    Number must be in the range 1 to 65535.
+                                    Name must be an IANA_SVC_NAME.
                                   x-kubernetes-int-or-string: true
                               required:
                               - port
                               type: object
                             terminationGracePeriodSeconds:
-                              description: Optional duration in seconds the pod needs
-                                to terminate gracefully upon probe failure. The grace
-                                period is the duration in seconds after the processes
-                                running in the pod are sent a termination signal and
-                                the time when the processes are forcibly halted with
-                                a kill signal. Set this value longer than the expected
-                                cleanup time for your process. If this value is nil,
-                                the pod's terminationGracePeriodSeconds will be used.
-                                Otherwise, this value overrides the value provided
-                                by the pod spec. Value must be non-negative integer.
-                                The value zero indicates stop immediately via the
-                                kill signal (no opportunity to shut down). This is
-                                a beta field and requires enabling ProbeTerminationGracePeriod
-                                feature gate. Minimum value is 1. spec.terminationGracePeriodSeconds
-                                is used if unset.
+                              description: |-
+                                Optional duration in seconds the pod needs to terminate gracefully upon probe failure.
+                                The grace period is the duration in seconds after the processes running in the pod are sent
+                                a termination signal and the time when the processes are forcibly halted with a kill signal.
+                                Set this value longer than the expected cleanup time for your process.
+                                If this value is nil, the pod's terminationGracePeriodSeconds will be used. Otherwise, this
+                                value overrides the value provided by the pod spec.
+                                Value must be non-negative integer. The value zero indicates stop immediately via
+                                the kill signal (no opportunity to shut down).
+                                This is a beta field and requires enabling ProbeTerminationGracePeriod feature gate.
+                                Minimum value is 1. spec.terminationGracePeriodSeconds is used if unset.
                               format: int64
                               type: integer
                             timeoutSeconds:
-                              description: 'Number of seconds after which the probe
-                                times out. Defaults to 1 second. Minimum value is
-                                1. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
+                              description: |-
+                                Number of seconds after which the probe times out.
+                                Defaults to 1 second. Minimum value is 1.
+                                More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
                               format: int32
                               type: integer
                           type: object
                         name:
-                          description: Name of the container specified as a DNS_LABEL.
+                          description: |-
+                            Name of the container specified as a DNS_LABEL.
                             Each container in a pod must have a unique name (DNS_LABEL).
                             Cannot be updated.
                           type: string
                         ports:
-                          description: List of ports to expose from the container.
-                            Exposing a port here gives the system additional information
-                            about the network connections a container uses, but is
-                            primarily informational. Not specifying a port here DOES
-                            NOT prevent that port from being exposed. Any port which
-                            is listening on the default "0.0.0.0" address inside a
-                            container will be accessible from the network. Cannot
-                            be updated.
+                          description: |-
+                            List of ports to expose from the container. Not specifying a port here
+                            DOES NOT prevent that port from being exposed. Any port which is
+                            listening on the default "0.0.0.0" address inside a container will be
+                            accessible from the network.
+                            Modifying this array with strategic merge patch may corrupt the data.
+                            For more information See https://github.com/kubernetes/kubernetes/issues/108255.
+                            Cannot be updated.
                           items:
                             description: ContainerPort represents a network port in
                               a single container.
                             properties:
                               containerPort:
-                                description: Number of port to expose on the pod's
-                                  IP address. This must be a valid port number, 0
-                                  < x < 65536.
+                                description: |-
+                                  Number of port to expose on the pod's IP address.
+                                  This must be a valid port number, 0 < x < 65536.
                                 format: int32
                                 type: integer
                               hostIP:
@@ -2046,23 +2725,24 @@ spec:
                                   to.
                                 type: string
                               hostPort:
-                                description: Number of port to expose on the host.
-                                  If specified, this must be a valid port number,
-                                  0 < x < 65536. If HostNetwork is specified, this
-                                  must match ContainerPort. Most containers do not
-                                  need this.
+                                description: |-
+                                  Number of port to expose on the host.
+                                  If specified, this must be a valid port number, 0 < x < 65536.
+                                  If HostNetwork is specified, this must match ContainerPort.
+                                  Most containers do not need this.
                                 format: int32
                                 type: integer
                               name:
-                                description: If specified, this must be an IANA_SVC_NAME
-                                  and unique within the pod. Each named port in a
-                                  pod must have a unique name. Name for the port that
-                                  can be referred to by services.
+                                description: |-
+                                  If specified, this must be an IANA_SVC_NAME and unique within the pod. Each
+                                  named port in a pod must have a unique name. Name for the port that can be
+                                  referred to by services.
                                 type: string
                               protocol:
                                 default: TCP
-                                description: Protocol for port. Must be UDP, TCP,
-                                  or SCTP. Defaults to "TCP".
+                                description: |-
+                                  Protocol for port. Must be UDP, TCP, or SCTP.
+                                  Defaults to "TCP".
                                 type: string
                             required:
                             - containerPort
@@ -2073,37 +2753,36 @@ spec:
                           - protocol
                           x-kubernetes-list-type: map
                         readinessProbe:
-                          description: 'Periodic probe of container service readiness.
-                            Container will be removed from service endpoints if the
-                            probe fails. Cannot be updated. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
+                          description: |-
+                            Periodic probe of container service readiness.
+                            Container will be removed from service endpoints if the probe fails.
+                            Cannot be updated.
+                            More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
                           properties:
                             exec:
-                              description: Exec specifies the action to take.
+                              description: Exec specifies a command to execute in
+                                the container.
                               properties:
                                 command:
-                                  description: Command is the command line to execute
-                                    inside the container, the working directory for
-                                    the command  is root ('/') in the container's
-                                    filesystem. The command is simply exec'd, it is
-                                    not run inside a shell, so traditional shell instructions
-                                    ('|', etc) won't work. To use a shell, you need
-                                    to explicitly call out to that shell. Exit status
-                                    of 0 is treated as live/healthy and non-zero is
-                                    unhealthy.
+                                  description: |-
+                                    Command is the command line to execute inside the container, the working directory for the
+                                    command  is root ('/') in the container's filesystem. The command is simply exec'd, it is
+                                    not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use
+                                    a shell, you need to explicitly call out to that shell.
+                                    Exit status of 0 is treated as live/healthy and non-zero is unhealthy.
                                   items:
                                     type: string
                                   type: array
+                                  x-kubernetes-list-type: atomic
                               type: object
                             failureThreshold:
-                              description: Minimum consecutive failures for the probe
-                                to be considered failed after having succeeded. Defaults
-                                to 3. Minimum value is 1.
+                              description: |-
+                                Minimum consecutive failures for the probe to be considered failed after having succeeded.
+                                Defaults to 3. Minimum value is 1.
                               format: int32
                               type: integer
                             grpc:
-                              description: GRPC specifies an action involving a GRPC
-                                port. This is a beta field and requires enabling GRPCContainerProbe
-                                feature gate.
+                              description: GRPC specifies a GRPC HealthCheckRequest.
                               properties:
                                 port:
                                   description: Port number of the gRPC service. Number
@@ -2111,21 +2790,24 @@ spec:
                                   format: int32
                                   type: integer
                                 service:
-                                  description: "Service is the name of the service
-                                    to place in the gRPC HealthCheckRequest (see https://github.com/grpc/grpc/blob/master/doc/health-checking.md).
-                                    \n If this is not specified, the default behavior
-                                    is defined by gRPC."
+                                  default: ""
+                                  description: |-
+                                    Service is the name of the service to place in the gRPC HealthCheckRequest
+                                    (see https://github.com/grpc/grpc/blob/master/doc/health-checking.md).
+
+                                    If this is not specified, the default behavior is defined by gRPC.
                                   type: string
                               required:
                               - port
                               type: object
                             httpGet:
-                              description: HTTPGet specifies the http request to perform.
+                              description: HTTPGet specifies an HTTP GET request to
+                                perform.
                               properties:
                                 host:
-                                  description: Host name to connect to, defaults to
-                                    the pod IP. You probably want to set "Host" in
-                                    httpHeaders instead.
+                                  description: |-
+                                    Host name to connect to, defaults to the pod IP. You probably want to set
+                                    "Host" in httpHeaders instead.
                                   type: string
                                 httpHeaders:
                                   description: Custom headers to set in the request.
@@ -2135,7 +2817,9 @@ spec:
                                       to be used in HTTP probes
                                     properties:
                                       name:
-                                        description: The header field name
+                                        description: |-
+                                          The header field name.
+                                          This will be canonicalized upon output, so case-variant names will be understood as the same header.
                                         type: string
                                       value:
                                         description: The header field value
@@ -2145,6 +2829,7 @@ spec:
                                     - value
                                     type: object
                                   type: array
+                                  x-kubernetes-list-type: atomic
                                 path:
                                   description: Path to access on the HTTP server.
                                   type: string
@@ -2152,38 +2837,40 @@ spec:
                                   anyOf:
                                   - type: integer
                                   - type: string
-                                  description: Name or number of the port to access
-                                    on the container. Number must be in the range
-                                    1 to 65535. Name must be an IANA_SVC_NAME.
+                                  description: |-
+                                    Name or number of the port to access on the container.
+                                    Number must be in the range 1 to 65535.
+                                    Name must be an IANA_SVC_NAME.
                                   x-kubernetes-int-or-string: true
                                 scheme:
-                                  description: Scheme to use for connecting to the
-                                    host. Defaults to HTTP.
+                                  description: |-
+                                    Scheme to use for connecting to the host.
+                                    Defaults to HTTP.
                                   type: string
                               required:
                               - port
                               type: object
                             initialDelaySeconds:
-                              description: 'Number of seconds after the container
-                                has started before liveness probes are initiated.
-                                More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
+                              description: |-
+                                Number of seconds after the container has started before liveness probes are initiated.
+                                More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
                               format: int32
                               type: integer
                             periodSeconds:
-                              description: How often (in seconds) to perform the probe.
+                              description: |-
+                                How often (in seconds) to perform the probe.
                                 Default to 10 seconds. Minimum value is 1.
                               format: int32
                               type: integer
                             successThreshold:
-                              description: Minimum consecutive successes for the probe
-                                to be considered successful after having failed. Defaults
-                                to 1. Must be 1 for liveness and startup. Minimum
-                                value is 1.
+                              description: |-
+                                Minimum consecutive successes for the probe to be considered successful after having failed.
+                                Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
                               format: int32
                               type: integer
                             tcpSocket:
-                              description: TCPSocket specifies an action involving
-                                a TCP port.
+                              description: TCPSocket specifies a connection to a TCP
+                                port.
                               properties:
                                 host:
                                   description: 'Optional: Host name to connect to,
@@ -2193,42 +2880,96 @@ spec:
                                   anyOf:
                                   - type: integer
                                   - type: string
-                                  description: Number or name of the port to access
-                                    on the container. Number must be in the range
-                                    1 to 65535. Name must be an IANA_SVC_NAME.
+                                  description: |-
+                                    Number or name of the port to access on the container.
+                                    Number must be in the range 1 to 65535.
+                                    Name must be an IANA_SVC_NAME.
                                   x-kubernetes-int-or-string: true
                               required:
                               - port
                               type: object
                             terminationGracePeriodSeconds:
-                              description: Optional duration in seconds the pod needs
-                                to terminate gracefully upon probe failure. The grace
-                                period is the duration in seconds after the processes
-                                running in the pod are sent a termination signal and
-                                the time when the processes are forcibly halted with
-                                a kill signal. Set this value longer than the expected
-                                cleanup time for your process. If this value is nil,
-                                the pod's terminationGracePeriodSeconds will be used.
-                                Otherwise, this value overrides the value provided
-                                by the pod spec. Value must be non-negative integer.
-                                The value zero indicates stop immediately via the
-                                kill signal (no opportunity to shut down). This is
-                                a beta field and requires enabling ProbeTerminationGracePeriod
-                                feature gate. Minimum value is 1. spec.terminationGracePeriodSeconds
-                                is used if unset.
+                              description: |-
+                                Optional duration in seconds the pod needs to terminate gracefully upon probe failure.
+                                The grace period is the duration in seconds after the processes running in the pod are sent
+                                a termination signal and the time when the processes are forcibly halted with a kill signal.
+                                Set this value longer than the expected cleanup time for your process.
+                                If this value is nil, the pod's terminationGracePeriodSeconds will be used. Otherwise, this
+                                value overrides the value provided by the pod spec.
+                                Value must be non-negative integer. The value zero indicates stop immediately via
+                                the kill signal (no opportunity to shut down).
+                                This is a beta field and requires enabling ProbeTerminationGracePeriod feature gate.
+                                Minimum value is 1. spec.terminationGracePeriodSeconds is used if unset.
                               format: int64
                               type: integer
                             timeoutSeconds:
-                              description: 'Number of seconds after which the probe
-                                times out. Defaults to 1 second. Minimum value is
-                                1. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
+                              description: |-
+                                Number of seconds after which the probe times out.
+                                Defaults to 1 second. Minimum value is 1.
+                                More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
                               format: int32
                               type: integer
                           type: object
+                        resizePolicy:
+                          description: Resources resize policy for the container.
+                          items:
+                            description: ContainerResizePolicy represents resource
+                              resize policy for the container.
+                            properties:
+                              resourceName:
+                                description: |-
+                                  Name of the resource to which this resource resize policy applies.
+                                  Supported values: cpu, memory.
+                                type: string
+                              restartPolicy:
+                                description: |-
+                                  Restart policy to apply when specified resource is resized.
+                                  If not specified, it defaults to NotRequired.
+                                type: string
+                            required:
+                            - resourceName
+                            - restartPolicy
+                            type: object
+                          type: array
+                          x-kubernetes-list-type: atomic
                         resources:
-                          description: 'Compute Resources required by this container.
-                            Cannot be updated. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
+                          description: |-
+                            Compute Resources required by this container.
+                            Cannot be updated.
+                            More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
                           properties:
+                            claims:
+                              description: |-
+                                Claims lists the names of resources, defined in spec.resourceClaims,
+                                that are used by this container.
+
+                                This is an alpha field and requires enabling the
+                                DynamicResourceAllocation feature gate.
+
+                                This field is immutable. It can only be set for containers.
+                              items:
+                                description: ResourceClaim references one entry in
+                                  PodSpec.ResourceClaims.
+                                properties:
+                                  name:
+                                    description: |-
+                                      Name must match the name of one entry in pod.spec.resourceClaims of
+                                      the Pod where this field is used. It makes that resource available
+                                      inside a container.
+                                    type: string
+                                  request:
+                                    description: |-
+                                      Request is the name chosen for a request in the referenced claim.
+                                      If empty, everything from the claim is made available, otherwise
+                                      only the result of this request.
+                                    type: string
+                                required:
+                                - name
+                                type: object
+                              type: array
+                              x-kubernetes-list-map-keys:
+                              - name
+                              x-kubernetes-list-type: map
                             limits:
                               additionalProperties:
                                 anyOf:
@@ -2236,8 +2977,9 @@ spec:
                                 - type: string
                                 pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
                                 x-kubernetes-int-or-string: true
-                              description: 'Limits describes the maximum amount of
-                                compute resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
+                              description: |-
+                                Limits describes the maximum amount of compute resources allowed.
+                                More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
                               type: object
                             requests:
                               additionalProperties:
@@ -2246,33 +2988,76 @@ spec:
                                 - type: string
                                 pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
                                 x-kubernetes-int-or-string: true
-                              description: 'Requests describes the minimum amount
-                                of compute resources required. If Requests is omitted
-                                for a container, it defaults to Limits if that is
-                                explicitly specified, otherwise to an implementation-defined
-                                value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
+                              description: |-
+                                Requests describes the minimum amount of compute resources required.
+                                If Requests is omitted for a container, it defaults to Limits if that is explicitly specified,
+                                otherwise to an implementation-defined value. Requests cannot exceed Limits.
+                                More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
                               type: object
                           type: object
+                        restartPolicy:
+                          description: |-
+                            RestartPolicy defines the restart behavior of individual containers in a pod.
+                            This field may only be set for init containers, and the only allowed value is "Always".
+                            For non-init containers or when this field is not specified,
+                            the restart behavior is defined by the Pod's restart policy and the container type.
+                            Setting the RestartPolicy as "Always" for the init container will have the following effect:
+                            this init container will be continually restarted on
+                            exit until all regular containers have terminated. Once all regular
+                            containers have completed, all init containers with restartPolicy "Always"
+                            will be shut down. This lifecycle differs from normal init containers and
+                            is often referred to as a "sidecar" container. Although this init
+                            container still starts in the init container sequence, it does not wait
+                            for the container to complete before proceeding to the next init
+                            container. Instead, the next init container starts immediately after this
+                            init container is started, or after any startupProbe has successfully
+                            completed.
+                          type: string
                         securityContext:
-                          description: 'SecurityContext defines the security options
-                            the container should be run with. If set, the fields of
-                            SecurityContext override the equivalent fields of PodSecurityContext.
-                            More info: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/'
+                          description: |-
+                            SecurityContext defines the security options the container should be run with.
+                            If set, the fields of SecurityContext override the equivalent fields of PodSecurityContext.
+                            More info: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/
                           properties:
                             allowPrivilegeEscalation:
-                              description: 'AllowPrivilegeEscalation controls whether
-                                a process can gain more privileges than its parent
-                                process. This bool directly controls if the no_new_privs
-                                flag will be set on the container process. AllowPrivilegeEscalation
-                                is true always when the container is: 1) run as Privileged
-                                2) has CAP_SYS_ADMIN Note that this field cannot be
-                                set when spec.os.name is windows.'
+                              description: |-
+                                AllowPrivilegeEscalation controls whether a process can gain more
+                                privileges than its parent process. This bool directly controls if
+                                the no_new_privs flag will be set on the container process.
+                                AllowPrivilegeEscalation is true always when the container is:
+                                1) run as Privileged
+                                2) has CAP_SYS_ADMIN
+                                Note that this field cannot be set when spec.os.name is windows.
                               type: boolean
+                            appArmorProfile:
+                              description: |-
+                                appArmorProfile is the AppArmor options to use by this container. If set, this profile
+                                overrides the pod's appArmorProfile.
+                                Note that this field cannot be set when spec.os.name is windows.
+                              properties:
+                                localhostProfile:
+                                  description: |-
+                                    localhostProfile indicates a profile loaded on the node that should be used.
+                                    The profile must be preconfigured on the node to work.
+                                    Must match the loaded name of the profile.
+                                    Must be set if and only if type is "Localhost".
+                                  type: string
+                                type:
+                                  description: |-
+                                    type indicates which kind of AppArmor profile will be applied.
+                                    Valid options are:
+                                      Localhost - a profile pre-loaded on the node.
+                                      RuntimeDefault - the container runtime's default profile.
+                                      Unconfined - no AppArmor enforcement.
+                                  type: string
+                              required:
+                              - type
+                              type: object
                             capabilities:
-                              description: The capabilities to add/drop when running
-                                containers. Defaults to the default set of capabilities
-                                granted by the container runtime. Note that this field
-                                cannot be set when spec.os.name is windows.
+                              description: |-
+                                The capabilities to add/drop when running containers.
+                                Defaults to the default set of capabilities granted by the container runtime.
+                                Note that this field cannot be set when spec.os.name is windows.
                               properties:
                                 add:
                                   description: Added capabilities
@@ -2281,6 +3066,7 @@ spec:
                                       type
                                     type: string
                                   type: array
+                                  x-kubernetes-list-type: atomic
                                 drop:
                                   description: Removed capabilities
                                   items:
@@ -2288,64 +3074,63 @@ spec:
                                       type
                                     type: string
                                   type: array
+                                  x-kubernetes-list-type: atomic
                               type: object
                             privileged:
-                              description: Run container in privileged mode. Processes
-                                in privileged containers are essentially equivalent
-                                to root on the host. Defaults to false. Note that
-                                this field cannot be set when spec.os.name is windows.
+                              description: |-
+                                Run container in privileged mode.
+                                Processes in privileged containers are essentially equivalent to root on the host.
+                                Defaults to false.
+                                Note that this field cannot be set when spec.os.name is windows.
                               type: boolean
                             procMount:
-                              description: procMount denotes the type of proc mount
-                                to use for the containers. The default is DefaultProcMount
-                                which uses the container runtime defaults for readonly
-                                paths and masked paths. This requires the ProcMountType
-                                feature flag to be enabled. Note that this field cannot
-                                be set when spec.os.name is windows.
+                              description: |-
+                                procMount denotes the type of proc mount to use for the containers.
+                                The default value is Default which uses the container runtime defaults for
+                                readonly paths and masked paths.
+                                This requires the ProcMountType feature flag to be enabled.
+                                Note that this field cannot be set when spec.os.name is windows.
                               type: string
                             readOnlyRootFilesystem:
-                              description: Whether this container has a read-only
-                                root filesystem. Default is false. Note that this
-                                field cannot be set when spec.os.name is windows.
+                              description: |-
+                                Whether this container has a read-only root filesystem.
+                                Default is false.
+                                Note that this field cannot be set when spec.os.name is windows.
                               type: boolean
                             runAsGroup:
-                              description: The GID to run the entrypoint of the container
-                                process. Uses runtime default if unset. May also be
-                                set in PodSecurityContext.  If set in both SecurityContext
-                                and PodSecurityContext, the value specified in SecurityContext
-                                takes precedence. Note that this field cannot be set
-                                when spec.os.name is windows.
+                              description: |-
+                                The GID to run the entrypoint of the container process.
+                                Uses runtime default if unset.
+                                May also be set in PodSecurityContext.  If set in both SecurityContext and
+                                PodSecurityContext, the value specified in SecurityContext takes precedence.
+                                Note that this field cannot be set when spec.os.name is windows.
                               format: int64
                               type: integer
                             runAsNonRoot:
-                              description: Indicates that the container must run as
-                                a non-root user. If true, the Kubelet will validate
-                                the image at runtime to ensure that it does not run
-                                as UID 0 (root) and fail to start the container if
-                                it does. If unset or false, no such validation will
-                                be performed. May also be set in PodSecurityContext.  If
-                                set in both SecurityContext and PodSecurityContext,
-                                the value specified in SecurityContext takes precedence.
+                              description: |-
+                                Indicates that the container must run as a non-root user.
+                                If true, the Kubelet will validate the image at runtime to ensure that it
+                                does not run as UID 0 (root) and fail to start the container if it does.
+                                If unset or false, no such validation will be performed.
+                                May also be set in PodSecurityContext.  If set in both SecurityContext and
+                                PodSecurityContext, the value specified in SecurityContext takes precedence.
                               type: boolean
                             runAsUser:
-                              description: The UID to run the entrypoint of the container
-                                process. Defaults to user specified in image metadata
-                                if unspecified. May also be set in PodSecurityContext.  If
-                                set in both SecurityContext and PodSecurityContext,
-                                the value specified in SecurityContext takes precedence.
-                                Note that this field cannot be set when spec.os.name
-                                is windows.
+                              description: |-
+                                The UID to run the entrypoint of the container process.
+                                Defaults to user specified in image metadata if unspecified.
+                                May also be set in PodSecurityContext.  If set in both SecurityContext and
+                                PodSecurityContext, the value specified in SecurityContext takes precedence.
+                                Note that this field cannot be set when spec.os.name is windows.
                               format: int64
                               type: integer
                             seLinuxOptions:
-                              description: The SELinux context to be applied to the
-                                container. If unspecified, the container runtime will
-                                allocate a random SELinux context for each container.  May
-                                also be set in PodSecurityContext.  If set in both
-                                SecurityContext and PodSecurityContext, the value
-                                specified in SecurityContext takes precedence. Note
-                                that this field cannot be set when spec.os.name is
-                                windows.
+                              description: |-
+                                The SELinux context to be applied to the container.
+                                If unspecified, the container runtime will allocate a random SELinux context for each
+                                container.  May also be set in PodSecurityContext.  If set in both SecurityContext and
+                                PodSecurityContext, the value specified in SecurityContext takes precedence.
+                                Note that this field cannot be set when spec.os.name is windows.
                               properties:
                                 level:
                                   description: Level is SELinux level label that applies
@@ -2365,110 +3150,98 @@ spec:
                                   type: string
                               type: object
                             seccompProfile:
-                              description: The seccomp options to use by this container.
-                                If seccomp options are provided at both the pod &
-                                container level, the container options override the
-                                pod options. Note that this field cannot be set when
-                                spec.os.name is windows.
+                              description: |-
+                                The seccomp options to use by this container. If seccomp options are
+                                provided at both the pod & container level, the container options
+                                override the pod options.
+                                Note that this field cannot be set when spec.os.name is windows.
                               properties:
                                 localhostProfile:
-                                  description: localhostProfile indicates a profile
-                                    defined in a file on the node should be used.
-                                    The profile must be preconfigured on the node
-                                    to work. Must be a descending path, relative to
-                                    the kubelet's configured seccomp profile location.
-                                    Must only be set if type is "Localhost".
+                                  description: |-
+                                    localhostProfile indicates a profile defined in a file on the node should be used.
+                                    The profile must be preconfigured on the node to work.
+                                    Must be a descending path, relative to the kubelet's configured seccomp profile location.
+                                    Must be set if type is "Localhost". Must NOT be set for any other type.
                                   type: string
                                 type:
-                                  description: "type indicates which kind of seccomp
-                                    profile will be applied. Valid options are: \n
-                                    Localhost - a profile defined in a file on the
-                                    node should be used. RuntimeDefault - the container
-                                    runtime default profile should be used. Unconfined
-                                    - no profile should be applied."
+                                  description: |-
+                                    type indicates which kind of seccomp profile will be applied.
+                                    Valid options are:
+
+                                    Localhost - a profile defined in a file on the node should be used.
+                                    RuntimeDefault - the container runtime default profile should be used.
+                                    Unconfined - no profile should be applied.
                                   type: string
                               required:
                               - type
                               type: object
                             windowsOptions:
-                              description: The Windows specific settings applied to
-                                all containers. If unspecified, the options from the
-                                PodSecurityContext will be used. If set in both SecurityContext
-                                and PodSecurityContext, the value specified in SecurityContext
-                                takes precedence. Note that this field cannot be set
-                                when spec.os.name is linux.
+                              description: |-
+                                The Windows specific settings applied to all containers.
+                                If unspecified, the options from the PodSecurityContext will be used.
+                                If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence.
+                                Note that this field cannot be set when spec.os.name is linux.
                               properties:
                                 gmsaCredentialSpec:
-                                  description: GMSACredentialSpec is where the GMSA
-                                    admission webhook (https://github.com/kubernetes-sigs/windows-gmsa)
-                                    inlines the contents of the GMSA credential spec
-                                    named by the GMSACredentialSpecName field.
+                                  description: |-
+                                    GMSACredentialSpec is where the GMSA admission webhook
+                                    (https://github.com/kubernetes-sigs/windows-gmsa) inlines the contents of the
+                                    GMSA credential spec named by the GMSACredentialSpecName field.
                                   type: string
                                 gmsaCredentialSpecName:
                                   description: GMSACredentialSpecName is the name
                                     of the GMSA credential spec to use.
                                   type: string
                                 hostProcess:
-                                  description: HostProcess determines if a container
-                                    should be run as a 'Host Process' container. This
-                                    field is alpha-level and will only be honored
-                                    by components that enable the WindowsHostProcessContainers
-                                    feature flag. Setting this field without the feature
-                                    flag will result in errors when validating the
-                                    Pod. All of a Pod's containers must have the same
-                                    effective HostProcess value (it is not allowed
-                                    to have a mix of HostProcess containers and non-HostProcess
-                                    containers).  In addition, if HostProcess is true
-                                    then HostNetwork must also be set to true.
+                                  description: |-
+                                    HostProcess determines if a container should be run as a 'Host Process' container.
+                                    All of a Pod's containers must have the same effective HostProcess value
+                                    (it is not allowed to have a mix of HostProcess containers and non-HostProcess containers).
+                                    In addition, if HostProcess is true then HostNetwork must also be set to true.
                                   type: boolean
                                 runAsUserName:
-                                  description: The UserName in Windows to run the
-                                    entrypoint of the container process. Defaults
-                                    to the user specified in image metadata if unspecified.
-                                    May also be set in PodSecurityContext. If set
-                                    in both SecurityContext and PodSecurityContext,
-                                    the value specified in SecurityContext takes precedence.
+                                  description: |-
+                                    The UserName in Windows to run the entrypoint of the container process.
+                                    Defaults to the user specified in image metadata if unspecified.
+                                    May also be set in PodSecurityContext. If set in both SecurityContext and
+                                    PodSecurityContext, the value specified in SecurityContext takes precedence.
                                   type: string
                               type: object
                           type: object
                         startupProbe:
-                          description: 'StartupProbe indicates that the Pod has successfully
-                            initialized. If specified, no other probes are executed
-                            until this completes successfully. If this probe fails,
-                            the Pod will be restarted, just as if the livenessProbe
-                            failed. This can be used to provide different probe parameters
-                            at the beginning of a Pod''s lifecycle, when it might
-                            take a long time to load data or warm a cache, than during
-                            steady-state operation. This cannot be updated. More info:
-                            https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
+                          description: |-
+                            StartupProbe indicates that the Pod has successfully initialized.
+                            If specified, no other probes are executed until this completes successfully.
+                            If this probe fails, the Pod will be restarted, just as if the livenessProbe failed.
+                            This can be used to provide different probe parameters at the beginning of a Pod's lifecycle,
+                            when it might take a long time to load data or warm a cache, than during steady-state operation.
+                            This cannot be updated.
+                            More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
                           properties:
                             exec:
-                              description: Exec specifies the action to take.
+                              description: Exec specifies a command to execute in
+                                the container.
                               properties:
                                 command:
-                                  description: Command is the command line to execute
-                                    inside the container, the working directory for
-                                    the command  is root ('/') in the container's
-                                    filesystem. The command is simply exec'd, it is
-                                    not run inside a shell, so traditional shell instructions
-                                    ('|', etc) won't work. To use a shell, you need
-                                    to explicitly call out to that shell. Exit status
-                                    of 0 is treated as live/healthy and non-zero is
-                                    unhealthy.
+                                  description: |-
+                                    Command is the command line to execute inside the container, the working directory for the
+                                    command  is root ('/') in the container's filesystem. The command is simply exec'd, it is
+                                    not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use
+                                    a shell, you need to explicitly call out to that shell.
+                                    Exit status of 0 is treated as live/healthy and non-zero is unhealthy.
                                   items:
                                     type: string
                                   type: array
+                                  x-kubernetes-list-type: atomic
                               type: object
                             failureThreshold:
-                              description: Minimum consecutive failures for the probe
-                                to be considered failed after having succeeded. Defaults
-                                to 3. Minimum value is 1.
+                              description: |-
+                                Minimum consecutive failures for the probe to be considered failed after having succeeded.
+                                Defaults to 3. Minimum value is 1.
                               format: int32
                               type: integer
                             grpc:
-                              description: GRPC specifies an action involving a GRPC
-                                port. This is a beta field and requires enabling GRPCContainerProbe
-                                feature gate.
+                              description: GRPC specifies a GRPC HealthCheckRequest.
                               properties:
                                 port:
                                   description: Port number of the gRPC service. Number
@@ -2476,21 +3249,24 @@ spec:
                                   format: int32
                                   type: integer
                                 service:
-                                  description: "Service is the name of the service
-                                    to place in the gRPC HealthCheckRequest (see https://github.com/grpc/grpc/blob/master/doc/health-checking.md).
-                                    \n If this is not specified, the default behavior
-                                    is defined by gRPC."
+                                  default: ""
+                                  description: |-
+                                    Service is the name of the service to place in the gRPC HealthCheckRequest
+                                    (see https://github.com/grpc/grpc/blob/master/doc/health-checking.md).
+
+                                    If this is not specified, the default behavior is defined by gRPC.
                                   type: string
                               required:
                               - port
                               type: object
                             httpGet:
-                              description: HTTPGet specifies the http request to perform.
+                              description: HTTPGet specifies an HTTP GET request to
+                                perform.
                               properties:
                                 host:
-                                  description: Host name to connect to, defaults to
-                                    the pod IP. You probably want to set "Host" in
-                                    httpHeaders instead.
+                                  description: |-
+                                    Host name to connect to, defaults to the pod IP. You probably want to set
+                                    "Host" in httpHeaders instead.
                                   type: string
                                 httpHeaders:
                                   description: Custom headers to set in the request.
@@ -2500,7 +3276,9 @@ spec:
                                       to be used in HTTP probes
                                     properties:
                                       name:
-                                        description: The header field name
+                                        description: |-
+                                          The header field name.
+                                          This will be canonicalized upon output, so case-variant names will be understood as the same header.
                                         type: string
                                       value:
                                         description: The header field value
@@ -2510,6 +3288,7 @@ spec:
                                     - value
                                     type: object
                                   type: array
+                                  x-kubernetes-list-type: atomic
                                 path:
                                   description: Path to access on the HTTP server.
                                   type: string
@@ -2517,38 +3296,40 @@ spec:
                                   anyOf:
                                   - type: integer
                                   - type: string
-                                  description: Name or number of the port to access
-                                    on the container. Number must be in the range
-                                    1 to 65535. Name must be an IANA_SVC_NAME.
+                                  description: |-
+                                    Name or number of the port to access on the container.
+                                    Number must be in the range 1 to 65535.
+                                    Name must be an IANA_SVC_NAME.
                                   x-kubernetes-int-or-string: true
                                 scheme:
-                                  description: Scheme to use for connecting to the
-                                    host. Defaults to HTTP.
+                                  description: |-
+                                    Scheme to use for connecting to the host.
+                                    Defaults to HTTP.
                                   type: string
                               required:
                               - port
                               type: object
                             initialDelaySeconds:
-                              description: 'Number of seconds after the container
-                                has started before liveness probes are initiated.
-                                More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
+                              description: |-
+                                Number of seconds after the container has started before liveness probes are initiated.
+                                More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
                               format: int32
                               type: integer
                             periodSeconds:
-                              description: How often (in seconds) to perform the probe.
+                              description: |-
+                                How often (in seconds) to perform the probe.
                                 Default to 10 seconds. Minimum value is 1.
                               format: int32
                               type: integer
                             successThreshold:
-                              description: Minimum consecutive successes for the probe
-                                to be considered successful after having failed. Defaults
-                                to 1. Must be 1 for liveness and startup. Minimum
-                                value is 1.
+                              description: |-
+                                Minimum consecutive successes for the probe to be considered successful after having failed.
+                                Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
                               format: int32
                               type: integer
                             tcpSocket:
-                              description: TCPSocket specifies an action involving
-                                a TCP port.
+                              description: TCPSocket specifies a connection to a TCP
+                                port.
                               properties:
                                 host:
                                   description: 'Optional: Host name to connect to,
@@ -2558,81 +3339,76 @@ spec:
                                   anyOf:
                                   - type: integer
                                   - type: string
-                                  description: Number or name of the port to access
-                                    on the container. Number must be in the range
-                                    1 to 65535. Name must be an IANA_SVC_NAME.
+                                  description: |-
+                                    Number or name of the port to access on the container.
+                                    Number must be in the range 1 to 65535.
+                                    Name must be an IANA_SVC_NAME.
                                   x-kubernetes-int-or-string: true
                               required:
                               - port
                               type: object
                             terminationGracePeriodSeconds:
-                              description: Optional duration in seconds the pod needs
-                                to terminate gracefully upon probe failure. The grace
-                                period is the duration in seconds after the processes
-                                running in the pod are sent a termination signal and
-                                the time when the processes are forcibly halted with
-                                a kill signal. Set this value longer than the expected
-                                cleanup time for your process. If this value is nil,
-                                the pod's terminationGracePeriodSeconds will be used.
-                                Otherwise, this value overrides the value provided
-                                by the pod spec. Value must be non-negative integer.
-                                The value zero indicates stop immediately via the
-                                kill signal (no opportunity to shut down). This is
-                                a beta field and requires enabling ProbeTerminationGracePeriod
-                                feature gate. Minimum value is 1. spec.terminationGracePeriodSeconds
-                                is used if unset.
+                              description: |-
+                                Optional duration in seconds the pod needs to terminate gracefully upon probe failure.
+                                The grace period is the duration in seconds after the processes running in the pod are sent
+                                a termination signal and the time when the processes are forcibly halted with a kill signal.
+                                Set this value longer than the expected cleanup time for your process.
+                                If this value is nil, the pod's terminationGracePeriodSeconds will be used. Otherwise, this
+                                value overrides the value provided by the pod spec.
+                                Value must be non-negative integer. The value zero indicates stop immediately via
+                                the kill signal (no opportunity to shut down).
+                                This is a beta field and requires enabling ProbeTerminationGracePeriod feature gate.
+                                Minimum value is 1. spec.terminationGracePeriodSeconds is used if unset.
                               format: int64
                               type: integer
                             timeoutSeconds:
-                              description: 'Number of seconds after which the probe
-                                times out. Defaults to 1 second. Minimum value is
-                                1. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
+                              description: |-
+                                Number of seconds after which the probe times out.
+                                Defaults to 1 second. Minimum value is 1.
+                                More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
                               format: int32
                               type: integer
                           type: object
                         stdin:
-                          description: Whether this container should allocate a buffer
-                            for stdin in the container runtime. If this is not set,
-                            reads from stdin in the container will always result in
-                            EOF. Default is false.
+                          description: |-
+                            Whether this container should allocate a buffer for stdin in the container runtime. If this
+                            is not set, reads from stdin in the container will always result in EOF.
+                            Default is false.
                           type: boolean
                         stdinOnce:
-                          description: Whether the container runtime should close
-                            the stdin channel after it has been opened by a single
-                            attach. When stdin is true the stdin stream will remain
-                            open across multiple attach sessions. If stdinOnce is
-                            set to true, stdin is opened on container start, is empty
-                            until the first client attaches to stdin, and then remains
-                            open and accepts data until the client disconnects, at
-                            which time stdin is closed and remains closed until the
-                            container is restarted. If this flag is false, a container
-                            processes that reads from stdin will never receive an
-                            EOF. Default is false
+                          description: |-
+                            Whether the container runtime should close the stdin channel after it has been opened by
+                            a single attach. When stdin is true the stdin stream will remain open across multiple attach
+                            sessions. If stdinOnce is set to true, stdin is opened on container start, is empty until the
+                            first client attaches to stdin, and then remains open and accepts data until the client disconnects,
+                            at which time stdin is closed and remains closed until the container is restarted. If this
+                            flag is false, a container processes that reads from stdin will never receive an EOF.
+                            Default is false
                           type: boolean
                         terminationMessagePath:
-                          description: 'Optional: Path at which the file to which
-                            the container''s termination message will be written is
-                            mounted into the container''s filesystem. Message written
-                            is intended to be brief final status, such as an assertion
-                            failure message. Will be truncated by the node if greater
-                            than 4096 bytes. The total message length across all containers
-                            will be limited to 12kb. Defaults to /dev/termination-log.
-                            Cannot be updated.'
+                          description: |-
+                            Optional: Path at which the file to which the container's termination message
+                            will be written is mounted into the container's filesystem.
+                            Message written is intended to be brief final status, such as an assertion failure message.
+                            Will be truncated by the node if greater than 4096 bytes. The total message length across
+                            all containers will be limited to 12kb.
+                            Defaults to /dev/termination-log.
+                            Cannot be updated.
                           type: string
                         terminationMessagePolicy:
-                          description: Indicate how the termination message should
-                            be populated. File will use the contents of terminationMessagePath
-                            to populate the container status message on both success
-                            and failure. FallbackToLogsOnError will use the last chunk
-                            of container log output if the termination message file
-                            is empty and the container exited with an error. The log
-                            output is limited to 2048 bytes or 80 lines, whichever
-                            is smaller. Defaults to File. Cannot be updated.
+                          description: |-
+                            Indicate how the termination message should be populated. File will use the contents of
+                            terminationMessagePath to populate the container status message on both success and failure.
+                            FallbackToLogsOnError will use the last chunk of container log output if the termination
+                            message file is empty and the container exited with an error.
+                            The log output is limited to 2048 bytes or 80 lines, whichever is smaller.
+                            Defaults to File.
+                            Cannot be updated.
                           type: string
                         tty:
-                          description: Whether this container should allocate a TTY
-                            for itself, also requires 'stdin' to be true. Default
-                            is false.
+                          description: |-
+                            Whether this container should allocate a TTY for itself, also requires 'stdin' to be true.
+                            Default is false.
                           type: boolean
                         volumeDevices:
                           description: volumeDevices is the list of block devices
@@ -2654,52 +3430,84 @@ spec:
                             - name
                             type: object
                           type: array
+                          x-kubernetes-list-map-keys:
+                          - devicePath
+                          x-kubernetes-list-type: map
                         volumeMounts:
-                          description: Pod volumes to mount into the container's filesystem.
+                          description: |-
+                            Pod volumes to mount into the container's filesystem.
                             Cannot be updated.
                           items:
                             description: VolumeMount describes a mounting of a Volume
                               within a container.
                             properties:
                               mountPath:
-                                description: Path within the container at which the
-                                  volume should be mounted.  Must not contain ':'.
+                                description: |-
+                                  Path within the container at which the volume should be mounted.  Must
+                                  not contain ':'.
                                 type: string
                               mountPropagation:
-                                description: mountPropagation determines how mounts
-                                  are propagated from the host to container and the
-                                  other way around. When not set, MountPropagationNone
-                                  is used. This field is beta in 1.10.
+                                description: |-
+                                  mountPropagation determines how mounts are propagated from the host
+                                  to container and the other way around.
+                                  When not set, MountPropagationNone is used.
+                                  This field is beta in 1.10.
+                                  When RecursiveReadOnly is set to IfPossible or to Enabled, MountPropagation must be None or unspecified
+                                  (which defaults to None).
                                 type: string
                               name:
                                 description: This must match the Name of a Volume.
                                 type: string
                               readOnly:
-                                description: Mounted read-only if true, read-write
-                                  otherwise (false or unspecified). Defaults to false.
+                                description: |-
+                                  Mounted read-only if true, read-write otherwise (false or unspecified).
+                                  Defaults to false.
                                 type: boolean
+                              recursiveReadOnly:
+                                description: |-
+                                  RecursiveReadOnly specifies whether read-only mounts should be handled
+                                  recursively.
+
+                                  If ReadOnly is false, this field has no meaning and must be unspecified.
+
+                                  If ReadOnly is true, and this field is set to Disabled, the mount is not made
+                                  recursively read-only.  If this field is set to IfPossible, the mount is made
+                                  recursively read-only, if it is supported by the container runtime.  If this
+                                  field is set to Enabled, the mount is made recursively read-only if it is
+                                  supported by the container runtime, otherwise the pod will not be started and
+                                  an error will be generated to indicate the reason.
+
+                                  If this field is set to IfPossible or Enabled, MountPropagation must be set to
+                                  None (or be unspecified, which defaults to None).
+
+                                  If this field is not specified, it is treated as an equivalent of Disabled.
+                                type: string
                               subPath:
-                                description: Path within the volume from which the
-                                  container's volume should be mounted. Defaults to
-                                  "" (volume's root).
+                                description: |-
+                                  Path within the volume from which the container's volume should be mounted.
+                                  Defaults to "" (volume's root).
                                 type: string
                               subPathExpr:
-                                description: Expanded path within the volume from
-                                  which the container's volume should be mounted.
-                                  Behaves similarly to SubPath but environment variable
-                                  references $(VAR_NAME) are expanded using the container's
-                                  environment. Defaults to "" (volume's root). SubPathExpr
-                                  and SubPath are mutually exclusive.
+                                description: |-
+                                  Expanded path within the volume from which the container's volume should be mounted.
+                                  Behaves similarly to SubPath but environment variable references $(VAR_NAME) are expanded using the container's environment.
+                                  Defaults to "" (volume's root).
+                                  SubPathExpr and SubPath are mutually exclusive.
                                 type: string
                             required:
                             - mountPath
                             - name
                             type: object
                           type: array
+                          x-kubernetes-list-map-keys:
+                          - mountPath
+                          x-kubernetes-list-type: map
                         workingDir:
-                          description: Container's working directory. If not specified,
-                            the container runtime's default will be used, which might
-                            be configured in the container image. Cannot be updated.
+                          description: |-
+                            Container's working directory.
+                            If not specified, the container runtime's default will be used, which
+                            might be configured in the container image.
+                            Cannot be updated.
                           type: string
                       required:
                       - name
@@ -2711,33 +3519,57 @@ spec:
                         a container.
                       properties:
                         mountPath:
-                          description: Path within the container at which the volume
-                            should be mounted.  Must not contain ':'.
+                          description: |-
+                            Path within the container at which the volume should be mounted.  Must
+                            not contain ':'.
                           type: string
                         mountPropagation:
-                          description: mountPropagation determines how mounts are
-                            propagated from the host to container and the other way
-                            around. When not set, MountPropagationNone is used. This
-                            field is beta in 1.10.
+                          description: |-
+                            mountPropagation determines how mounts are propagated from the host
+                            to container and the other way around.
+                            When not set, MountPropagationNone is used.
+                            This field is beta in 1.10.
+                            When RecursiveReadOnly is set to IfPossible or to Enabled, MountPropagation must be None or unspecified
+                            (which defaults to None).
                           type: string
                         name:
                           description: This must match the Name of a Volume.
                           type: string
                         readOnly:
-                          description: Mounted read-only if true, read-write otherwise
-                            (false or unspecified). Defaults to false.
+                          description: |-
+                            Mounted read-only if true, read-write otherwise (false or unspecified).
+                            Defaults to false.
                           type: boolean
-                        subPath:
-                          description: Path within the volume from which the container's
-                            volume should be mounted. Defaults to "" (volume's root).
+                        recursiveReadOnly:
+                          description: |-
+                            RecursiveReadOnly specifies whether read-only mounts should be handled
+                            recursively.
+
+                            If ReadOnly is false, this field has no meaning and must be unspecified.
+
+                            If ReadOnly is true, and this field is set to Disabled, the mount is not made
+                            recursively read-only.  If this field is set to IfPossible, the mount is made
+                            recursively read-only, if it is supported by the container runtime.  If this
+                            field is set to Enabled, the mount is made recursively read-only if it is
+                            supported by the container runtime, otherwise the pod will not be started and
+                            an error will be generated to indicate the reason.
+
+                            If this field is set to IfPossible or Enabled, MountPropagation must be set to
+                            None (or be unspecified, which defaults to None).
+
+                            If this field is not specified, it is treated as an equivalent of Disabled.
+                          type: string
+                        subPath:
+                          description: |-
+                            Path within the volume from which the container's volume should be mounted.
+                            Defaults to "" (volume's root).
                           type: string
                         subPathExpr:
-                          description: Expanded path within the volume from which
-                            the container's volume should be mounted. Behaves similarly
-                            to SubPath but environment variable references $(VAR_NAME)
-                            are expanded using the container's environment. Defaults
-                            to "" (volume's root). SubPathExpr and SubPath are mutually
-                            exclusive.
+                          description: |-
+                            Expanded path within the volume from which the container's volume should be mounted.
+                            Behaves similarly to SubPath but environment variable references $(VAR_NAME) are expanded using the container's environment.
+                            Defaults to "" (volume's root).
+                            SubPathExpr and SubPath are mutually exclusive.
                           type: string
                       required:
                       - mountPath
@@ -2750,43 +3582,46 @@ spec:
                         may be accessed by any container in the pod.
                       properties:
                         awsElasticBlockStore:
-                          description: 'awsElasticBlockStore represents an AWS Disk
-                            resource that is attached to a kubelet''s host machine
-                            and then exposed to the pod. More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore'
+                          description: |-
+                            awsElasticBlockStore represents an AWS Disk resource that is attached to a
+                            kubelet's host machine and then exposed to the pod.
+                            Deprecated: AWSElasticBlockStore is deprecated. All operations for the in-tree
+                            awsElasticBlockStore type are redirected to the ebs.csi.aws.com CSI driver.
+                            More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
                           properties:
                             fsType:
-                              description: 'fsType is the filesystem type of the volume
-                                that you want to mount. Tip: Ensure that the filesystem
-                                type is supported by the host operating system. Examples:
-                                "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4"
-                                if unspecified. More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
-                                TODO: how do we prevent errors in the filesystem from
-                                compromising the machine'
+                              description: |-
+                                fsType is the filesystem type of the volume that you want to mount.
+                                Tip: Ensure that the filesystem type is supported by the host operating system.
+                                Examples: "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
+                                More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
                               type: string
                             partition:
-                              description: 'partition is the partition in the volume
-                                that you want to mount. If omitted, the default is
-                                to mount by volume name. Examples: For volume /dev/sda1,
-                                you specify the partition as "1". Similarly, the volume
-                                partition for /dev/sda is "0" (or you can leave the
-                                property empty).'
+                              description: |-
+                                partition is the partition in the volume that you want to mount.
+                                If omitted, the default is to mount by volume name.
+                                Examples: For volume /dev/sda1, you specify the partition as "1".
+                                Similarly, the volume partition for /dev/sda is "0" (or you can leave the property empty).
                               format: int32
                               type: integer
                             readOnly:
-                              description: 'readOnly value true will force the readOnly
-                                setting in VolumeMounts. More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore'
+                              description: |-
+                                readOnly value true will force the readOnly setting in VolumeMounts.
+                                More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
                               type: boolean
                             volumeID:
-                              description: 'volumeID is unique ID of the persistent
-                                disk resource in AWS (Amazon EBS volume). More info:
-                                https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore'
+                              description: |-
+                                volumeID is unique ID of the persistent disk resource in AWS (Amazon EBS volume).
+                                More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
                               type: string
                           required:
                           - volumeID
                           type: object
                         azureDisk:
-                          description: azureDisk represents an Azure Data Disk mount
-                            on the host and bind mount to the pod.
+                          description: |-
+                            azureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.
+                            Deprecated: AzureDisk is deprecated. All operations for the in-tree azureDisk type
+                            are redirected to the disk.csi.azure.com CSI driver.
                           properties:
                             cachingMode:
                               description: 'cachingMode is the Host Caching mode:
@@ -2801,10 +3636,11 @@ spec:
                                 blob storage
                               type: string
                             fsType:
-                              description: fsType is Filesystem type to mount. Must
-                                be a filesystem type supported by the host operating
-                                system. Ex. "ext4", "xfs", "ntfs". Implicitly inferred
-                                to be "ext4" if unspecified.
+                              default: ext4
+                              description: |-
+                                fsType is Filesystem type to mount.
+                                Must be a filesystem type supported by the host operating system.
+                                Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
                               type: string
                             kind:
                               description: 'kind expected values are Shared: multiple
@@ -2814,20 +3650,25 @@ spec:
                                 to shared'
                               type: string
                             readOnly:
-                              description: readOnly Defaults to false (read/write).
-                                ReadOnly here will force the ReadOnly setting in VolumeMounts.
+                              default: false
+                              description: |-
+                                readOnly Defaults to false (read/write). ReadOnly here will force
+                                the ReadOnly setting in VolumeMounts.
                               type: boolean
                           required:
                           - diskName
                           - diskURI
                           type: object
                         azureFile:
-                          description: azureFile represents an Azure File Service
-                            mount on the host and bind mount to the pod.
+                          description: |-
+                            azureFile represents an Azure File Service mount on the host and bind mount to the pod.
+                            Deprecated: AzureFile is deprecated. All operations for the in-tree azureFile type
+                            are redirected to the file.csi.azure.com CSI driver.
                           properties:
                             readOnly:
-                              description: readOnly defaults to false (read/write).
-                                ReadOnly here will force the ReadOnly setting in VolumeMounts.
+                              description: |-
+                                readOnly defaults to false (read/write). ReadOnly here will force
+                                the ReadOnly setting in VolumeMounts.
                               type: boolean
                             secretName:
                               description: secretName is the  name of secret that
@@ -2841,75 +3682,97 @@ spec:
                           - shareName
                           type: object
                         cephfs:
-                          description: cephFS represents a Ceph FS mount on the host
-                            that shares a pod's lifetime
+                          description: |-
+                            cephFS represents a Ceph FS mount on the host that shares a pod's lifetime.
+                            Deprecated: CephFS is deprecated and the in-tree cephfs type is no longer supported.
                           properties:
                             monitors:
-                              description: 'monitors is Required: Monitors is a collection
-                                of Ceph monitors More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it'
+                              description: |-
+                                monitors is Required: Monitors is a collection of Ceph monitors
+                                More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it
                               items:
                                 type: string
                               type: array
+                              x-kubernetes-list-type: atomic
                             path:
                               description: 'path is Optional: Used as the mounted
                                 root, rather than the full Ceph tree, default is /'
                               type: string
                             readOnly:
-                              description: 'readOnly is Optional: Defaults to false
-                                (read/write). ReadOnly here will force the ReadOnly
-                                setting in VolumeMounts. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it'
+                              description: |-
+                                readOnly is Optional: Defaults to false (read/write). ReadOnly here will force
+                                the ReadOnly setting in VolumeMounts.
+                                More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it
                               type: boolean
                             secretFile:
-                              description: 'secretFile is Optional: SecretFile is
-                                the path to key ring for User, default is /etc/ceph/user.secret
-                                More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it'
+                              description: |-
+                                secretFile is Optional: SecretFile is the path to key ring for User, default is /etc/ceph/user.secret
+                                More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it
                               type: string
                             secretRef:
-                              description: 'secretRef is Optional: SecretRef is reference
-                                to the authentication secret for User, default is
-                                empty. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it'
+                              description: |-
+                                secretRef is Optional: SecretRef is reference to the authentication secret for User, default is empty.
+                                More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it
                               properties:
                                 name:
-                                  description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                                    TODO: Add other useful fields. apiVersion, kind,
-                                    uid?'
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
                                   type: string
                               type: object
+                              x-kubernetes-map-type: atomic
                             user:
-                              description: 'user is optional: User is the rados user
-                                name, default is admin More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it'
+                              description: |-
+                                user is optional: User is the rados user name, default is admin
+                                More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it
                               type: string
                           required:
                           - monitors
                           type: object
                         cinder:
-                          description: 'cinder represents a cinder volume attached
-                            and mounted on kubelets host machine. More info: https://examples.k8s.io/mysql-cinder-pd/README.md'
+                          description: |-
+                            cinder represents a cinder volume attached and mounted on kubelets host machine.
+                            Deprecated: Cinder is deprecated. All operations for the in-tree cinder type
+                            are redirected to the cinder.csi.openstack.org CSI driver.
+                            More info: https://examples.k8s.io/mysql-cinder-pd/README.md
                           properties:
                             fsType:
-                              description: 'fsType is the filesystem type to mount.
-                                Must be a filesystem type supported by the host operating
-                                system. Examples: "ext4", "xfs", "ntfs". Implicitly
-                                inferred to be "ext4" if unspecified. More info: https://examples.k8s.io/mysql-cinder-pd/README.md'
+                              description: |-
+                                fsType is the filesystem type to mount.
+                                Must be a filesystem type supported by the host operating system.
+                                Examples: "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
+                                More info: https://examples.k8s.io/mysql-cinder-pd/README.md
                               type: string
                             readOnly:
-                              description: 'readOnly defaults to false (read/write).
-                                ReadOnly here will force the ReadOnly setting in VolumeMounts.
-                                More info: https://examples.k8s.io/mysql-cinder-pd/README.md'
+                              description: |-
+                                readOnly defaults to false (read/write). ReadOnly here will force
+                                the ReadOnly setting in VolumeMounts.
+                                More info: https://examples.k8s.io/mysql-cinder-pd/README.md
                               type: boolean
                             secretRef:
-                              description: 'secretRef is optional: points to a secret
-                                object containing parameters used to connect to OpenStack.'
+                              description: |-
+                                secretRef is optional: points to a secret object containing parameters used to connect
+                                to OpenStack.
                               properties:
                                 name:
-                                  description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                                    TODO: Add other useful fields. apiVersion, kind,
-                                    uid?'
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
                                   type: string
                               type: object
+                              x-kubernetes-map-type: atomic
                             volumeID:
-                              description: 'volumeID used to identify the volume in
-                                cinder. More info: https://examples.k8s.io/mysql-cinder-pd/README.md'
+                              description: |-
+                                volumeID used to identify the volume in cinder.
+                                More info: https://examples.k8s.io/mysql-cinder-pd/README.md
                               type: string
                           required:
                           - volumeID
@@ -2919,29 +3782,25 @@ spec:
                             populate this volume
                           properties:
                             defaultMode:
-                              description: 'defaultMode is optional: mode bits used
-                                to set permissions on created files by default. Must
-                                be an octal value between 0000 and 0777 or a decimal
-                                value between 0 and 511. YAML accepts both octal and
-                                decimal values, JSON requires decimal values for mode
-                                bits. Defaults to 0644. Directories within the path
-                                are not affected by this setting. This might be in
-                                conflict with other options that affect the file mode,
-                                like fsGroup, and the result can be other mode bits
-                                set.'
+                              description: |-
+                                defaultMode is optional: mode bits used to set permissions on created files by default.
+                                Must be an octal value between 0000 and 0777 or a decimal value between 0 and 511.
+                                YAML accepts both octal and decimal values, JSON requires decimal values for mode bits.
+                                Defaults to 0644.
+                                Directories within the path are not affected by this setting.
+                                This might be in conflict with other options that affect the file
+                                mode, like fsGroup, and the result can be other mode bits set.
                               format: int32
                               type: integer
                             items:
-                              description: items if unspecified, each key-value pair
-                                in the Data field of the referenced ConfigMap will
-                                be projected into the volume as a file whose name
-                                is the key and content is the value. If specified,
-                                the listed keys will be projected into the specified
-                                paths, and unlisted keys will not be present. If a
-                                key is specified which is not present in the ConfigMap,
-                                the volume setup will error unless it is marked optional.
-                                Paths must be relative and may not contain the '..'
-                                path or start with '..'.
+                              description: |-
+                                items if unspecified, each key-value pair in the Data field of the referenced
+                                ConfigMap will be projected into the volume as a file whose name is the
+                                key and content is the value. If specified, the listed keys will be
+                                projected into the specified paths, and unlisted keys will not be
+                                present. If a key is specified which is not present in the ConfigMap,
+                                the volume setup will error unless it is marked optional. Paths must be
+                                relative and may not contain the '..' path or start with '..'.
                               items:
                                 description: Maps a string key to a path within a
                                   volume.
@@ -2950,22 +3809,20 @@ spec:
                                     description: key is the key to project.
                                     type: string
                                   mode:
-                                    description: 'mode is Optional: mode bits used
-                                      to set permissions on this file. Must be an
-                                      octal value between 0000 and 0777 or a decimal
-                                      value between 0 and 511. YAML accepts both octal
-                                      and decimal values, JSON requires decimal values
-                                      for mode bits. If not specified, the volume
-                                      defaultMode will be used. This might be in conflict
-                                      with other options that affect the file mode,
-                                      like fsGroup, and the result can be other mode
-                                      bits set.'
+                                    description: |-
+                                      mode is Optional: mode bits used to set permissions on this file.
+                                      Must be an octal value between 0000 and 0777 or a decimal value between 0 and 511.
+                                      YAML accepts both octal and decimal values, JSON requires decimal values for mode bits.
+                                      If not specified, the volume defaultMode will be used.
+                                      This might be in conflict with other options that affect the file
+                                      mode, like fsGroup, and the result can be other mode bits set.
                                     format: int32
                                     type: integer
                                   path:
-                                    description: path is the relative path of the
-                                      file to map the key to. May not be an absolute
-                                      path. May not contain the path element '..'.
+                                    description: |-
+                                      path is the relative path of the file to map the key to.
+                                      May not be an absolute path.
+                                      May not contain the path element '..'.
                                       May not start with the string '..'.
                                     type: string
                                 required:
@@ -2973,56 +3830,68 @@ spec:
                                 - path
                                 type: object
                               type: array
+                              x-kubernetes-list-type: atomic
                             name:
-                              description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                                TODO: Add other useful fields. apiVersion, kind, uid?'
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
                               type: string
                             optional:
                               description: optional specify whether the ConfigMap
                                 or its keys must be defined
                               type: boolean
                           type: object
+                          x-kubernetes-map-type: atomic
                         csi:
                           description: csi (Container Storage Interface) represents
                             ephemeral storage that is handled by certain external
-                            CSI drivers (Beta feature).
+                            CSI drivers.
                           properties:
                             driver:
-                              description: driver is the name of the CSI driver that
-                                handles this volume. Consult with your admin for the
-                                correct name as registered in the cluster.
+                              description: |-
+                                driver is the name of the CSI driver that handles this volume.
+                                Consult with your admin for the correct name as registered in the cluster.
                               type: string
                             fsType:
-                              description: fsType to mount. Ex. "ext4", "xfs", "ntfs".
-                                If not provided, the empty value is passed to the
-                                associated CSI driver which will determine the default
-                                filesystem to apply.
+                              description: |-
+                                fsType to mount. Ex. "ext4", "xfs", "ntfs".
+                                If not provided, the empty value is passed to the associated CSI driver
+                                which will determine the default filesystem to apply.
                               type: string
                             nodePublishSecretRef:
-                              description: nodePublishSecretRef is a reference to
-                                the secret object containing sensitive information
-                                to pass to the CSI driver to complete the CSI NodePublishVolume
-                                and NodeUnpublishVolume calls. This field is optional,
-                                and  may be empty if no secret is required. If the
-                                secret object contains more than one secret, all secret
-                                references are passed.
+                              description: |-
+                                nodePublishSecretRef is a reference to the secret object containing
+                                sensitive information to pass to the CSI driver to complete the CSI
+                                NodePublishVolume and NodeUnpublishVolume calls.
+                                This field is optional, and  may be empty if no secret is required. If the
+                                secret object contains more than one secret, all secret references are passed.
                               properties:
                                 name:
-                                  description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                                    TODO: Add other useful fields. apiVersion, kind,
-                                    uid?'
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
                                   type: string
                               type: object
+                              x-kubernetes-map-type: atomic
                             readOnly:
-                              description: readOnly specifies a read-only configuration
-                                for the volume. Defaults to false (read/write).
+                              description: |-
+                                readOnly specifies a read-only configuration for the volume.
+                                Defaults to false (read/write).
                               type: boolean
                             volumeAttributes:
                               additionalProperties:
                                 type: string
-                              description: volumeAttributes stores driver-specific
-                                properties that are passed to the CSI driver. Consult
-                                your driver's documentation for supported values.
+                              description: |-
+                                volumeAttributes stores driver-specific properties that are passed to the CSI
+                                driver. Consult your driver's documentation for supported values.
                               type: object
                           required:
                           - driver
@@ -3032,17 +3901,15 @@ spec:
                             pod that should populate this volume
                           properties:
                             defaultMode:
-                              description: 'Optional: mode bits to use on created
-                                files by default. Must be a Optional: mode bits used
-                                to set permissions on created files by default. Must
-                                be an octal value between 0000 and 0777 or a decimal
-                                value between 0 and 511. YAML accepts both octal and
-                                decimal values, JSON requires decimal values for mode
-                                bits. Defaults to 0644. Directories within the path
-                                are not affected by this setting. This might be in
-                                conflict with other options that affect the file mode,
-                                like fsGroup, and the result can be other mode bits
-                                set.'
+                              description: |-
+                                Optional: mode bits to use on created files by default. Must be a
+                                Optional: mode bits used to set permissions on created files by default.
+                                Must be an octal value between 0000 and 0777 or a decimal value between 0 and 511.
+                                YAML accepts both octal and decimal values, JSON requires decimal values for mode bits.
+                                Defaults to 0644.
+                                Directories within the path are not affected by this setting.
+                                This might be in conflict with other options that affect the file
+                                mode, like fsGroup, and the result can be other mode bits set.
                               format: int32
                               type: integer
                             items:
@@ -3054,8 +3921,8 @@ spec:
                                 properties:
                                   fieldRef:
                                     description: 'Required: Selects a field of the
-                                      pod: only annotations, labels, name and namespace
-                                      are supported.'
+                                      pod: only annotations, labels, name, namespace
+                                      and uid are supported.'
                                     properties:
                                       apiVersion:
                                         description: Version of the schema the FieldPath
@@ -3068,17 +3935,15 @@ spec:
                                     required:
                                     - fieldPath
                                     type: object
+                                    x-kubernetes-map-type: atomic
                                   mode:
-                                    description: 'Optional: mode bits used to set
-                                      permissions on this file, must be an octal value
-                                      between 0000 and 0777 or a decimal value between
-                                      0 and 511. YAML accepts both octal and decimal
-                                      values, JSON requires decimal values for mode
-                                      bits. If not specified, the volume defaultMode
-                                      will be used. This might be in conflict with
-                                      other options that affect the file mode, like
-                                      fsGroup, and the result can be other mode bits
-                                      set.'
+                                    description: |-
+                                      Optional: mode bits used to set permissions on this file, must be an octal value
+                                      between 0000 and 0777 or a decimal value between 0 and 511.
+                                      YAML accepts both octal and decimal values, JSON requires decimal values for mode bits.
+                                      If not specified, the volume defaultMode will be used.
+                                      This might be in conflict with other options that affect the file
+                                      mode, like fsGroup, and the result can be other mode bits set.
                                     format: int32
                                     type: integer
                                   path:
@@ -3089,10 +3954,9 @@ spec:
                                       path must not start with ''..'''
                                     type: string
                                   resourceFieldRef:
-                                    description: 'Selects a resource of the container:
-                                      only resources limits and requests (limits.cpu,
-                                      limits.memory, requests.cpu and requests.memory)
-                                      are currently supported.'
+                                    description: |-
+                                      Selects a resource of the container: only resources limits and requests
+                                      (limits.cpu, limits.memory, requests.cpu and requests.memory) are currently supported.
                                     properties:
                                       containerName:
                                         description: 'Container name: required for
@@ -3112,119 +3976,127 @@ spec:
                                     required:
                                     - resource
                                     type: object
+                                    x-kubernetes-map-type: atomic
                                 required:
                                 - path
                                 type: object
                               type: array
+                              x-kubernetes-list-type: atomic
                           type: object
                         emptyDir:
-                          description: 'emptyDir represents a temporary directory
-                            that shares a pod''s lifetime. More info: https://kubernetes.io/docs/concepts/storage/volumes#emptydir'
+                          description: |-
+                            emptyDir represents a temporary directory that shares a pod's lifetime.
+                            More info: https://kubernetes.io/docs/concepts/storage/volumes#emptydir
                           properties:
                             medium:
-                              description: 'medium represents what type of storage
-                                medium should back this directory. The default is
-                                "" which means to use the node''s default medium.
-                                Must be an empty string (default) or Memory. More
-                                info: https://kubernetes.io/docs/concepts/storage/volumes#emptydir'
+                              description: |-
+                                medium represents what type of storage medium should back this directory.
+                                The default is "" which means to use the node's default medium.
+                                Must be an empty string (default) or Memory.
+                                More info: https://kubernetes.io/docs/concepts/storage/volumes#emptydir
                               type: string
                             sizeLimit:
                               anyOf:
                               - type: integer
                               - type: string
-                              description: 'sizeLimit is the total amount of local
-                                storage required for this EmptyDir volume. The size
-                                limit is also applicable for memory medium. The maximum
-                                usage on memory medium EmptyDir would be the minimum
-                                value between the SizeLimit specified here and the
-                                sum of memory limits of all containers in a pod. The
-                                default is nil which means that the limit is undefined.
-                                More info: http://kubernetes.io/docs/user-guide/volumes#emptydir'
+                              description: |-
+                                sizeLimit is the total amount of local storage required for this EmptyDir volume.
+                                The size limit is also applicable for memory medium.
+                                The maximum usage on memory medium EmptyDir would be the minimum value between
+                                the SizeLimit specified here and the sum of memory limits of all containers in a pod.
+                                The default is nil which means that the limit is undefined.
+                                More info: https://kubernetes.io/docs/concepts/storage/volumes#emptydir
                               pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
                               x-kubernetes-int-or-string: true
                           type: object
                         ephemeral:
-                          description: "ephemeral represents a volume that is handled
-                            by a cluster storage driver. The volume's lifecycle is
-                            tied to the pod that defines it - it will be created before
-                            the pod starts, and deleted when the pod is removed. \n
-                            Use this if: a) the volume is only needed while the pod
-                            runs, b) features of normal volumes like restoring from
-                            snapshot or capacity    tracking are needed, c) the storage
-                            driver is specified through a storage class, and d) the
-                            storage driver supports dynamic volume provisioning through
-                            \   a PersistentVolumeClaim (see EphemeralVolumeSource
-                            for more    information on the connection between this
-                            volume type    and PersistentVolumeClaim). \n Use PersistentVolumeClaim
-                            or one of the vendor-specific APIs for volumes that persist
-                            for longer than the lifecycle of an individual pod. \n
-                            Use CSI for light-weight local ephemeral volumes if the
-                            CSI driver is meant to be used that way - see the documentation
-                            of the driver for more information. \n A pod can use both
-                            types of ephemeral volumes and persistent volumes at the
-                            same time."
+                          description: |-
+                            ephemeral represents a volume that is handled by a cluster storage driver.
+                            The volume's lifecycle is tied to the pod that defines it - it will be created before the pod starts,
+                            and deleted when the pod is removed.
+
+                            Use this if:
+                            a) the volume is only needed while the pod runs,
+                            b) features of normal volumes like restoring from snapshot or capacity
+                               tracking are needed,
+                            c) the storage driver is specified through a storage class, and
+                            d) the storage driver supports dynamic volume provisioning through
+                               a PersistentVolumeClaim (see EphemeralVolumeSource for more
+                               information on the connection between this volume type
+                               and PersistentVolumeClaim).
+
+                            Use PersistentVolumeClaim or one of the vendor-specific
+                            APIs for volumes that persist for longer than the lifecycle
+                            of an individual pod.
+
+                            Use CSI for light-weight local ephemeral volumes if the CSI driver is meant to
+                            be used that way - see the documentation of the driver for
+                            more information.
+
+                            A pod can use both types of ephemeral volumes and
+                            persistent volumes at the same time.
                           properties:
                             volumeClaimTemplate:
-                              description: "Will be used to create a stand-alone PVC
-                                to provision the volume. The pod in which this EphemeralVolumeSource
-                                is embedded will be the owner of the PVC, i.e. the
-                                PVC will be deleted together with the pod.  The name
-                                of the PVC will be `<pod name>-<volume name>` where
-                                `<volume name>` is the name from the `PodSpec.Volumes`
-                                array entry. Pod validation will reject the pod if
-                                the concatenated name is not valid for a PVC (for
-                                example, too long). \n An existing PVC with that name
-                                that is not owned by the pod will *not* be used for
-                                the pod to avoid using an unrelated volume by mistake.
-                                Starting the pod is then blocked until the unrelated
-                                PVC is removed. If such a pre-created PVC is meant
-                                to be used by the pod, the PVC has to updated with
-                                an owner reference to the pod once the pod exists.
-                                Normally this should not be necessary, but it may
-                                be useful when manually reconstructing a broken cluster.
-                                \n This field is read-only and no changes will be
-                                made by Kubernetes to the PVC after it has been created.
-                                \n Required, must not be nil."
+                              description: |-
+                                Will be used to create a stand-alone PVC to provision the volume.
+                                The pod in which this EphemeralVolumeSource is embedded will be the
+                                owner of the PVC, i.e. the PVC will be deleted together with the
+                                pod.  The name of the PVC will be `<pod name>-<volume name>` where
+                                `<volume name>` is the name from the `PodSpec.Volumes` array
+                                entry. Pod validation will reject the pod if the concatenated name
+                                is not valid for a PVC (for example, too long).
+
+                                An existing PVC with that name that is not owned by the pod
+                                will *not* be used for the pod to avoid using an unrelated
+                                volume by mistake. Starting the pod is then blocked until
+                                the unrelated PVC is removed. If such a pre-created PVC is
+                                meant to be used by the pod, the PVC has to updated with an
+                                owner reference to the pod once the pod exists. Normally
+                                this should not be necessary, but it may be useful when
+                                manually reconstructing a broken cluster.
+
+                                This field is read-only and no changes will be made by Kubernetes
+                                to the PVC after it has been created.
+
+                                Required, must not be nil.
                               properties:
                                 metadata:
-                                  description: May contain labels and annotations
-                                    that will be copied into the PVC when creating
-                                    it. No other fields are allowed and will be rejected
-                                    during validation.
+                                  description: |-
+                                    May contain labels and annotations that will be copied into the PVC
+                                    when creating it. No other fields are allowed and will be rejected during
+                                    validation.
                                   type: object
                                 spec:
-                                  description: The specification for the PersistentVolumeClaim.
-                                    The entire content is copied unchanged into the
-                                    PVC that gets created from this template. The
-                                    same fields as in a PersistentVolumeClaim are
-                                    also valid here.
+                                  description: |-
+                                    The specification for the PersistentVolumeClaim. The entire content is
+                                    copied unchanged into the PVC that gets created from this
+                                    template. The same fields as in a PersistentVolumeClaim
+                                    are also valid here.
                                   properties:
                                     accessModes:
-                                      description: 'accessModes contains the desired
-                                        access modes the volume should have. More
-                                        info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#access-modes-1'
+                                      description: |-
+                                        accessModes contains the desired access modes the volume should have.
+                                        More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#access-modes-1
                                       items:
                                         type: string
                                       type: array
+                                      x-kubernetes-list-type: atomic
                                     dataSource:
-                                      description: 'dataSource field can be used to
-                                        specify either: * An existing VolumeSnapshot
-                                        object (snapshot.storage.k8s.io/VolumeSnapshot)
+                                      description: |-
+                                        dataSource field can be used to specify either:
+                                        * An existing VolumeSnapshot object (snapshot.storage.k8s.io/VolumeSnapshot)
                                         * An existing PVC (PersistentVolumeClaim)
-                                        If the provisioner or an external controller
-                                        can support the specified data source, it
-                                        will create a new volume based on the contents
-                                        of the specified data source. If the AnyVolumeDataSource
-                                        feature gate is enabled, this field will always
-                                        have the same contents as the DataSourceRef
-                                        field.'
+                                        If the provisioner or an external controller can support the specified data source,
+                                        it will create a new volume based on the contents of the specified data source.
+                                        When the AnyVolumeDataSource feature gate is enabled, dataSource contents will be copied to dataSourceRef,
+                                        and dataSourceRef contents will be copied to dataSource when dataSourceRef.namespace is not specified.
+                                        If the namespace is specified, then dataSourceRef will not be copied to dataSource.
                                       properties:
                                         apiGroup:
-                                          description: APIGroup is the group for the
-                                            resource being referenced. If APIGroup
-                                            is not specified, the specified Kind must
-                                            be in the core API group. For any other
-                                            third-party types, APIGroup is required.
+                                          description: |-
+                                            APIGroup is the group for the resource being referenced.
+                                            If APIGroup is not specified, the specified Kind must be in the core API group.
+                                            For any other third-party types, APIGroup is required.
                                           type: string
                                         kind:
                                           description: Kind is the type of resource
@@ -3238,40 +4110,38 @@ spec:
                                       - kind
                                       - name
                                       type: object
+                                      x-kubernetes-map-type: atomic
                                     dataSourceRef:
-                                      description: 'dataSourceRef specifies the object
-                                        from which to populate the volume with data,
-                                        if a non-empty volume is desired. This may
-                                        be any local object from a non-empty API group
-                                        (non core object) or a PersistentVolumeClaim
-                                        object. When this field is specified, volume
-                                        binding will only succeed if the type of the
-                                        specified object matches some installed volume
-                                        populator or dynamic provisioner. This field
-                                        will replace the functionality of the DataSource
-                                        field and as such if both fields are non-empty,
-                                        they must have the same value. For backwards
-                                        compatibility, both fields (DataSource and
-                                        DataSourceRef) will be set to the same value
-                                        automatically if one of them is empty and
-                                        the other is non-empty. There are two important
-                                        differences between DataSource and DataSourceRef:
-                                        * While DataSource only allows two specific
-                                        types of objects, DataSourceRef   allows any
-                                        non-core object, as well as PersistentVolumeClaim
-                                        objects. * While DataSource ignores disallowed
-                                        values (dropping them), DataSourceRef   preserves
-                                        all values, and generates an error if a disallowed
-                                        value is   specified. (Beta) Using this field
-                                        requires the AnyVolumeDataSource feature gate
-                                        to be enabled.'
+                                      description: |-
+                                        dataSourceRef specifies the object from which to populate the volume with data, if a non-empty
+                                        volume is desired. This may be any object from a non-empty API group (non
+                                        core object) or a PersistentVolumeClaim object.
+                                        When this field is specified, volume binding will only succeed if the type of
+                                        the specified object matches some installed volume populator or dynamic
+                                        provisioner.
+                                        This field will replace the functionality of the dataSource field and as such
+                                        if both fields are non-empty, they must have the same value. For backwards
+                                        compatibility, when namespace isn't specified in dataSourceRef,
+                                        both fields (dataSource and dataSourceRef) will be set to the same
+                                        value automatically if one of them is empty and the other is non-empty.
+                                        When namespace is specified in dataSourceRef,
+                                        dataSource isn't set to the same value and must be empty.
+                                        There are three important differences between dataSource and dataSourceRef:
+                                        * While dataSource only allows two specific types of objects, dataSourceRef
+                                          allows any non-core object, as well as PersistentVolumeClaim objects.
+                                        * While dataSource ignores disallowed values (dropping them), dataSourceRef
+                                          preserves all values, and generates an error if a disallowed value is
+                                          specified.
+                                        * While dataSource only allows local objects, dataSourceRef allows objects
+                                          in any namespaces.
+                                        (Beta) Using this field requires the AnyVolumeDataSource feature gate to be enabled.
+                                        (Alpha) Using the namespace field of dataSourceRef requires the CrossNamespaceVolumeDataSource feature gate to be enabled.
                                       properties:
                                         apiGroup:
-                                          description: APIGroup is the group for the
-                                            resource being referenced. If APIGroup
-                                            is not specified, the specified Kind must
-                                            be in the core API group. For any other
-                                            third-party types, APIGroup is required.
+                                          description: |-
+                                            APIGroup is the group for the resource being referenced.
+                                            If APIGroup is not specified, the specified Kind must be in the core API group.
+                                            For any other third-party types, APIGroup is required.
                                           type: string
                                         kind:
                                           description: Kind is the type of resource
@@ -3281,18 +4151,23 @@ spec:
                                           description: Name is the name of resource
                                             being referenced
                                           type: string
+                                        namespace:
+                                          description: |-
+                                            Namespace is the namespace of resource being referenced
+                                            Note that when a namespace is specified, a gateway.networking.k8s.io/ReferenceGrant object is required in the referent namespace to allow that namespace's owner to accept the reference. See the ReferenceGrant documentation for details.
+                                            (Alpha) This field requires the CrossNamespaceVolumeDataSource feature gate to be enabled.
+                                          type: string
                                       required:
                                       - kind
                                       - name
                                       type: object
                                     resources:
-                                      description: 'resources represents the minimum
-                                        resources the volume should have. If RecoverVolumeExpansionFailure
-                                        feature is enabled users are allowed to specify
-                                        resource requirements that are lower than
-                                        previous value but must still be higher than
-                                        capacity recorded in the status field of the
-                                        claim. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources'
+                                      description: |-
+                                        resources represents the minimum resources the volume should have.
+                                        If RecoverVolumeExpansionFailure feature is enabled users are allowed to specify resource requirements
+                                        that are lower than previous value but must still be higher than capacity recorded in the
+                                        status field of the claim.
+                                        More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources
                                       properties:
                                         limits:
                                           additionalProperties:
@@ -3301,9 +4176,9 @@ spec:
                                             - type: string
                                             pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
                                             x-kubernetes-int-or-string: true
-                                          description: 'Limits describes the maximum
-                                            amount of compute resources allowed. More
-                                            info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
+                                          description: |-
+                                            Limits describes the maximum amount of compute resources allowed.
+                                            More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
                                           type: object
                                         requests:
                                           additionalProperties:
@@ -3312,12 +4187,11 @@ spec:
                                             - type: string
                                             pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
                                             x-kubernetes-int-or-string: true
-                                          description: 'Requests describes the minimum
-                                            amount of compute resources required.
-                                            If Requests is omitted for a container,
-                                            it defaults to Limits if that is explicitly
-                                            specified, otherwise to an implementation-defined
-                                            value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
+                                          description: |-
+                                            Requests describes the minimum amount of compute resources required.
+                                            If Requests is omitted for a container, it defaults to Limits if that is explicitly specified,
+                                            otherwise to an implementation-defined value. Requests cannot exceed Limits.
+                                            More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
                                           type: object
                                       type: object
                                     selector:
@@ -3329,59 +4203,69 @@ spec:
                                             of label selector requirements. The requirements
                                             are ANDed.
                                           items:
-                                            description: A label selector requirement
-                                              is a selector that contains values,
-                                              a key, and an operator that relates
-                                              the key and values.
+                                            description: |-
+                                              A label selector requirement is a selector that contains values, a key, and an operator that
+                                              relates the key and values.
                                             properties:
                                               key:
                                                 description: key is the label key
                                                   that the selector applies to.
                                                 type: string
                                               operator:
-                                                description: operator represents a
-                                                  key's relationship to a set of values.
-                                                  Valid operators are In, NotIn, Exists
-                                                  and DoesNotExist.
+                                                description: |-
+                                                  operator represents a key's relationship to a set of values.
+                                                  Valid operators are In, NotIn, Exists and DoesNotExist.
                                                 type: string
                                               values:
-                                                description: values is an array of
-                                                  string values. If the operator is
-                                                  In or NotIn, the values array must
-                                                  be non-empty. If the operator is
-                                                  Exists or DoesNotExist, the values
-                                                  array must be empty. This array
-                                                  is replaced during a strategic merge
-                                                  patch.
+                                                description: |-
+                                                  values is an array of string values. If the operator is In or NotIn,
+                                                  the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                                  the values array must be empty. This array is replaced during a strategic
+                                                  merge patch.
                                                 items:
                                                   type: string
                                                 type: array
+                                                x-kubernetes-list-type: atomic
                                             required:
                                             - key
                                             - operator
                                             type: object
                                           type: array
+                                          x-kubernetes-list-type: atomic
                                         matchLabels:
                                           additionalProperties:
                                             type: string
-                                          description: matchLabels is a map of {key,value}
-                                            pairs. A single {key,value} in the matchLabels
-                                            map is equivalent to an element of matchExpressions,
-                                            whose key field is "key", the operator
-                                            is "In", and the values array contains
-                                            only "value". The requirements are ANDed.
+                                          description: |-
+                                            matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                            map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                            operator is "In", and the values array contains only "value". The requirements are ANDed.
                                           type: object
                                       type: object
+                                      x-kubernetes-map-type: atomic
                                     storageClassName:
-                                      description: 'storageClassName is the name of
-                                        the StorageClass required by the claim. More
-                                        info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#class-1'
+                                      description: |-
+                                        storageClassName is the name of the StorageClass required by the claim.
+                                        More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#class-1
+                                      type: string
+                                    volumeAttributesClassName:
+                                      description: |-
+                                        volumeAttributesClassName may be used to set the VolumeAttributesClass used by this claim.
+                                        If specified, the CSI driver will create or update the volume with the attributes defined
+                                        in the corresponding VolumeAttributesClass. This has a different purpose than storageClassName,
+                                        it can be changed after the claim is created. An empty string value means that no VolumeAttributesClass
+                                        will be applied to the claim but it's not allowed to reset this field to empty string once it is set.
+                                        If unspecified and the PersistentVolumeClaim is unbound, the default VolumeAttributesClass
+                                        will be set by the persistentvolume controller if it exists.
+                                        If the resource referred to by volumeAttributesClass does not exist, this PersistentVolumeClaim will be
+                                        set to a Pending state, as reflected by the modifyVolumeStatus field, until such as a resource
+                                        exists.
+                                        More info: https://kubernetes.io/docs/concepts/storage/volume-attributes-classes/
+                                        (Beta) Using this field requires the VolumeAttributesClass feature gate to be enabled (off by default).
                                       type: string
                                     volumeMode:
-                                      description: volumeMode defines what type of
-                                        volume is required by the claim. Value of
-                                        Filesystem is implied when not included in
-                                        claim spec.
+                                      description: |-
+                                        volumeMode defines what type of volume is required by the claim.
+                                        Value of Filesystem is implied when not included in claim spec.
                                       type: string
                                     volumeName:
                                       description: volumeName is the binding reference
@@ -3398,20 +4282,19 @@ spec:
                             to the pod.
                           properties:
                             fsType:
-                              description: 'fsType is the filesystem type to mount.
-                                Must be a filesystem type supported by the host operating
-                                system. Ex. "ext4", "xfs", "ntfs". Implicitly inferred
-                                to be "ext4" if unspecified. TODO: how do we prevent
-                                errors in the filesystem from compromising the machine'
+                              description: |-
+                                fsType is the filesystem type to mount.
+                                Must be a filesystem type supported by the host operating system.
+                                Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
                               type: string
                             lun:
                               description: 'lun is Optional: FC target lun number'
                               format: int32
                               type: integer
                             readOnly:
-                              description: 'readOnly is Optional: Defaults to false
-                                (read/write). ReadOnly here will force the ReadOnly
-                                setting in VolumeMounts.'
+                              description: |-
+                                readOnly is Optional: Defaults to false (read/write). ReadOnly here will force
+                                the ReadOnly setting in VolumeMounts.
                               type: boolean
                             targetWWNs:
                               description: 'targetWWNs is Optional: FC target worldwide
@@ -3419,27 +4302,31 @@ spec:
                               items:
                                 type: string
                               type: array
+                              x-kubernetes-list-type: atomic
                             wwids:
-                              description: 'wwids Optional: FC volume world wide identifiers
-                                (wwids) Either wwids or combination of targetWWNs
-                                and lun must be set, but not both simultaneously.'
+                              description: |-
+                                wwids Optional: FC volume world wide identifiers (wwids)
+                                Either wwids or combination of targetWWNs and lun must be set, but not both simultaneously.
                               items:
                                 type: string
                               type: array
+                              x-kubernetes-list-type: atomic
                           type: object
                         flexVolume:
-                          description: flexVolume represents a generic volume resource
-                            that is provisioned/attached using an exec based plugin.
+                          description: |-
+                            flexVolume represents a generic volume resource that is
+                            provisioned/attached using an exec based plugin.
+                            Deprecated: FlexVolume is deprecated. Consider using a CSIDriver instead.
                           properties:
                             driver:
                               description: driver is the name of the driver to use
                                 for this volume.
                               type: string
                             fsType:
-                              description: fsType is the filesystem type to mount.
-                                Must be a filesystem type supported by the host operating
-                                system. Ex. "ext4", "xfs", "ntfs". The default filesystem
-                                depends on FlexVolume script.
+                              description: |-
+                                fsType is the filesystem type to mount.
+                                Must be a filesystem type supported by the host operating system.
+                                Ex. "ext4", "xfs", "ntfs". The default filesystem depends on FlexVolume script.
                               type: string
                             options:
                               additionalProperties:
@@ -3448,36 +4335,41 @@ spec:
                                 extra command options if any.'
                               type: object
                             readOnly:
-                              description: 'readOnly is Optional: defaults to false
-                                (read/write). ReadOnly here will force the ReadOnly
-                                setting in VolumeMounts.'
+                              description: |-
+                                readOnly is Optional: defaults to false (read/write). ReadOnly here will force
+                                the ReadOnly setting in VolumeMounts.
                               type: boolean
                             secretRef:
-                              description: 'secretRef is Optional: secretRef is reference
-                                to the secret object containing sensitive information
-                                to pass to the plugin scripts. This may be empty if
-                                no secret object is specified. If the secret object
-                                contains more than one secret, all secrets are passed
-                                to the plugin scripts.'
+                              description: |-
+                                secretRef is Optional: secretRef is reference to the secret object containing
+                                sensitive information to pass to the plugin scripts. This may be
+                                empty if no secret object is specified. If the secret object
+                                contains more than one secret, all secrets are passed to the plugin
+                                scripts.
                               properties:
                                 name:
-                                  description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                                    TODO: Add other useful fields. apiVersion, kind,
-                                    uid?'
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
                                   type: string
                               type: object
+                              x-kubernetes-map-type: atomic
                           required:
                           - driver
                           type: object
                         flocker:
-                          description: flocker represents a Flocker volume attached
-                            to a kubelet's host machine. This depends on the Flocker
-                            control service being running
+                          description: |-
+                            flocker represents a Flocker volume attached to a kubelet's host machine. This depends on the Flocker control service being running.
+                            Deprecated: Flocker is deprecated and the in-tree flocker type is no longer supported.
                           properties:
                             datasetName:
-                              description: datasetName is Name of the dataset stored
-                                as metadata -> name on the dataset for Flocker should
-                                be considered as deprecated
+                              description: |-
+                                datasetName is Name of the dataset stored as metadata -> name on the dataset for Flocker
+                                should be considered as deprecated
                               type: string
                             datasetUUID:
                               description: datasetUUID is the UUID of the dataset.
@@ -3485,54 +4377,56 @@ spec:
                               type: string
                           type: object
                         gcePersistentDisk:
-                          description: 'gcePersistentDisk represents a GCE Disk resource
-                            that is attached to a kubelet''s host machine and then
-                            exposed to the pod. More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk'
+                          description: |-
+                            gcePersistentDisk represents a GCE Disk resource that is attached to a
+                            kubelet's host machine and then exposed to the pod.
+                            Deprecated: GCEPersistentDisk is deprecated. All operations for the in-tree
+                            gcePersistentDisk type are redirected to the pd.csi.storage.gke.io CSI driver.
+                            More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
                           properties:
                             fsType:
-                              description: 'fsType is filesystem type of the volume
-                                that you want to mount. Tip: Ensure that the filesystem
-                                type is supported by the host operating system. Examples:
-                                "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4"
-                                if unspecified. More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
-                                TODO: how do we prevent errors in the filesystem from
-                                compromising the machine'
+                              description: |-
+                                fsType is filesystem type of the volume that you want to mount.
+                                Tip: Ensure that the filesystem type is supported by the host operating system.
+                                Examples: "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
+                                More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
                               type: string
                             partition:
-                              description: 'partition is the partition in the volume
-                                that you want to mount. If omitted, the default is
-                                to mount by volume name. Examples: For volume /dev/sda1,
-                                you specify the partition as "1". Similarly, the volume
-                                partition for /dev/sda is "0" (or you can leave the
-                                property empty). More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk'
+                              description: |-
+                                partition is the partition in the volume that you want to mount.
+                                If omitted, the default is to mount by volume name.
+                                Examples: For volume /dev/sda1, you specify the partition as "1".
+                                Similarly, the volume partition for /dev/sda is "0" (or you can leave the property empty).
+                                More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
                               format: int32
                               type: integer
                             pdName:
-                              description: 'pdName is unique name of the PD resource
-                                in GCE. Used to identify the disk in GCE. More info:
-                                https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk'
+                              description: |-
+                                pdName is unique name of the PD resource in GCE. Used to identify the disk in GCE.
+                                More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
                               type: string
                             readOnly:
-                              description: 'readOnly here will force the ReadOnly
-                                setting in VolumeMounts. Defaults to false. More info:
-                                https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk'
+                              description: |-
+                                readOnly here will force the ReadOnly setting in VolumeMounts.
+                                Defaults to false.
+                                More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
                               type: boolean
                           required:
                           - pdName
                           type: object
                         gitRepo:
-                          description: 'gitRepo represents a git repository at a particular
-                            revision. DEPRECATED: GitRepo is deprecated. To provision
-                            a container with a git repo, mount an EmptyDir into an
-                            InitContainer that clones the repo using git, then mount
-                            the EmptyDir into the Pod''s container.'
+                          description: |-
+                            gitRepo represents a git repository at a particular revision.
+                            Deprecated: GitRepo is deprecated. To provision a container with a git repo, mount an
+                            EmptyDir into an InitContainer that clones the repo using git, then mount the EmptyDir
+                            into the Pod's container.
                           properties:
                             directory:
-                              description: directory is the target directory name.
-                                Must not contain or start with '..'.  If '.' is supplied,
-                                the volume directory will be the git repository.  Otherwise,
-                                if specified, the volume will contain the git repository
-                                in the subdirectory with the given name.
+                              description: |-
+                                directory is the target directory name.
+                                Must not contain or start with '..'.  If '.' is supplied, the volume directory will be the
+                                git repository.  Otherwise, if specified, the volume will contain the git repository in
+                                the subdirectory with the given name.
                               type: string
                             repository:
                               description: repository is the URL
@@ -3545,53 +4439,94 @@ spec:
                           - repository
                           type: object
                         glusterfs:
-                          description: 'glusterfs represents a Glusterfs mount on
-                            the host that shares a pod''s lifetime. More info: https://examples.k8s.io/volumes/glusterfs/README.md'
+                          description: |-
+                            glusterfs represents a Glusterfs mount on the host that shares a pod's lifetime.
+                            Deprecated: Glusterfs is deprecated and the in-tree glusterfs type is no longer supported.
+                            More info: https://examples.k8s.io/volumes/glusterfs/README.md
                           properties:
                             endpoints:
-                              description: 'endpoints is the endpoint name that details
-                                Glusterfs topology. More info: https://examples.k8s.io/volumes/glusterfs/README.md#create-a-pod'
+                              description: |-
+                                endpoints is the endpoint name that details Glusterfs topology.
+                                More info: https://examples.k8s.io/volumes/glusterfs/README.md#create-a-pod
                               type: string
                             path:
-                              description: 'path is the Glusterfs volume path. More
-                                info: https://examples.k8s.io/volumes/glusterfs/README.md#create-a-pod'
+                              description: |-
+                                path is the Glusterfs volume path.
+                                More info: https://examples.k8s.io/volumes/glusterfs/README.md#create-a-pod
                               type: string
                             readOnly:
-                              description: 'readOnly here will force the Glusterfs
-                                volume to be mounted with read-only permissions. Defaults
-                                to false. More info: https://examples.k8s.io/volumes/glusterfs/README.md#create-a-pod'
+                              description: |-
+                                readOnly here will force the Glusterfs volume to be mounted with read-only permissions.
+                                Defaults to false.
+                                More info: https://examples.k8s.io/volumes/glusterfs/README.md#create-a-pod
                               type: boolean
                           required:
                           - endpoints
                           - path
                           type: object
                         hostPath:
-                          description: 'hostPath represents a pre-existing file or
-                            directory on the host machine that is directly exposed
-                            to the container. This is generally used for system agents
-                            or other privileged things that are allowed to see the
-                            host machine. Most containers will NOT need this. More
-                            info: https://kubernetes.io/docs/concepts/storage/volumes#hostpath
-                            --- TODO(jonesdl) We need to restrict who can use host
-                            directory mounts and who can/can not mount host directories
-                            as read/write.'
+                          description: |-
+                            hostPath represents a pre-existing file or directory on the host
+                            machine that is directly exposed to the container. This is generally
+                            used for system agents or other privileged things that are allowed
+                            to see the host machine. Most containers will NOT need this.
+                            More info: https://kubernetes.io/docs/concepts/storage/volumes#hostpath
                           properties:
                             path:
-                              description: 'path of the directory on the host. If
-                                the path is a symlink, it will follow the link to
-                                the real path. More info: https://kubernetes.io/docs/concepts/storage/volumes#hostpath'
+                              description: |-
+                                path of the directory on the host.
+                                If the path is a symlink, it will follow the link to the real path.
+                                More info: https://kubernetes.io/docs/concepts/storage/volumes#hostpath
                               type: string
                             type:
-                              description: 'type for HostPath Volume Defaults to ""
-                                More info: https://kubernetes.io/docs/concepts/storage/volumes#hostpath'
+                              description: |-
+                                type for HostPath Volume
+                                Defaults to ""
+                                More info: https://kubernetes.io/docs/concepts/storage/volumes#hostpath
                               type: string
                           required:
                           - path
                           type: object
+                        image:
+                          description: |-
+                            image represents an OCI object (a container image or artifact) pulled and mounted on the kubelet's host machine.
+                            The volume is resolved at pod startup depending on which PullPolicy value is provided:
+
+                            - Always: the kubelet always attempts to pull the reference. Container creation will fail If the pull fails.
+                            - Never: the kubelet never pulls the reference and only uses a local image or artifact. Container creation will fail if the reference isn't present.
+                            - IfNotPresent: the kubelet pulls if the reference isn't already present on disk. Container creation will fail if the reference isn't present and the pull fails.
+
+                            The volume gets re-resolved if the pod gets deleted and recreated, which means that new remote content will become available on pod recreation.
+                            A failure to resolve or pull the image during pod startup will block containers from starting and may add significant latency. Failures will be retried using normal volume backoff and will be reported on the pod reason and message.
+                            The types of objects that may be mounted by this volume are defined by the container runtime implementation on a host machine and at minimum must include all valid types supported by the container image field.
+                            The OCI object gets mounted in a single directory (spec.containers[*].volumeMounts.mountPath) by merging the manifest layers in the same way as for container images.
+                            The volume will be mounted read-only (ro) and non-executable files (noexec).
+                            Sub path mounts for containers are not supported (spec.containers[*].volumeMounts.subpath) before 1.33.
+                            The field spec.securityContext.fsGroupChangePolicy has no effect on this volume type.
+                          properties:
+                            pullPolicy:
+                              description: |-
+                                Policy for pulling OCI objects. Possible values are:
+                                Always: the kubelet always attempts to pull the reference. Container creation will fail If the pull fails.
+                                Never: the kubelet never pulls the reference and only uses a local image or artifact. Container creation will fail if the reference isn't present.
+                                IfNotPresent: the kubelet pulls if the reference isn't already present on disk. Container creation will fail if the reference isn't present and the pull fails.
+                                Defaults to Always if :latest tag is specified, or IfNotPresent otherwise.
+                              type: string
+                            reference:
+                              description: |-
+                                Required: Image or artifact reference to be used.
+                                Behaves in the same way as pod.spec.containers[*].image.
+                                Pull secrets will be assembled in the same way as for the container image by looking up node credentials, SA image pull secrets, and pod spec image pull secrets.
+                                More info: https://kubernetes.io/docs/concepts/containers/images
+                                This field is optional to allow higher level config management to default or override
+                                container images in workload controllers like Deployments and StatefulSets.
+                              type: string
+                          type: object
                         iscsi:
-                          description: 'iscsi represents an ISCSI Disk resource that
-                            is attached to a kubelet''s host machine and then exposed
-                            to the pod. More info: https://examples.k8s.io/volumes/iscsi/README.md'
+                          description: |-
+                            iscsi represents an ISCSI Disk resource that is attached to a
+                            kubelet's host machine and then exposed to the pod.
+                            More info: https://examples.k8s.io/volumes/iscsi/README.md
                           properties:
                             chapAuthDiscovery:
                               description: chapAuthDiscovery defines whether support
@@ -3602,58 +4537,63 @@ spec:
                                 iSCSI Session CHAP authentication
                               type: boolean
                             fsType:
-                              description: 'fsType is the filesystem type of the volume
-                                that you want to mount. Tip: Ensure that the filesystem
-                                type is supported by the host operating system. Examples:
-                                "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4"
-                                if unspecified. More info: https://kubernetes.io/docs/concepts/storage/volumes#iscsi
-                                TODO: how do we prevent errors in the filesystem from
-                                compromising the machine'
+                              description: |-
+                                fsType is the filesystem type of the volume that you want to mount.
+                                Tip: Ensure that the filesystem type is supported by the host operating system.
+                                Examples: "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
+                                More info: https://kubernetes.io/docs/concepts/storage/volumes#iscsi
                               type: string
                             initiatorName:
-                              description: initiatorName is the custom iSCSI Initiator
-                                Name. If initiatorName is specified with iscsiInterface
-                                simultaneously, new iSCSI interface <target portal>:<volume
-                                name> will be created for the connection.
+                              description: |-
+                                initiatorName is the custom iSCSI Initiator Name.
+                                If initiatorName is specified with iscsiInterface simultaneously, new iSCSI interface
+                                <target portal>:<volume name> will be created for the connection.
                               type: string
                             iqn:
                               description: iqn is the target iSCSI Qualified Name.
                               type: string
                             iscsiInterface:
-                              description: iscsiInterface is the interface Name that
-                                uses an iSCSI transport. Defaults to 'default' (tcp).
+                              default: default
+                              description: |-
+                                iscsiInterface is the interface Name that uses an iSCSI transport.
+                                Defaults to 'default' (tcp).
                               type: string
                             lun:
                               description: lun represents iSCSI Target Lun number.
                               format: int32
                               type: integer
                             portals:
-                              description: portals is the iSCSI Target Portal List.
-                                The portal is either an IP or ip_addr:port if the
-                                port is other than default (typically TCP ports 860
-                                and 3260).
+                              description: |-
+                                portals is the iSCSI Target Portal List. The portal is either an IP or ip_addr:port if the port
+                                is other than default (typically TCP ports 860 and 3260).
                               items:
                                 type: string
                               type: array
+                              x-kubernetes-list-type: atomic
                             readOnly:
-                              description: readOnly here will force the ReadOnly setting
-                                in VolumeMounts. Defaults to false.
+                              description: |-
+                                readOnly here will force the ReadOnly setting in VolumeMounts.
+                                Defaults to false.
                               type: boolean
                             secretRef:
                               description: secretRef is the CHAP Secret for iSCSI
                                 target and initiator authentication
                               properties:
                                 name:
-                                  description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                                    TODO: Add other useful fields. apiVersion, kind,
-                                    uid?'
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
                                   type: string
                               type: object
+                              x-kubernetes-map-type: atomic
                             targetPortal:
-                              description: targetPortal is iSCSI Target Portal. The
-                                Portal is either an IP or ip_addr:port if the port
-                                is other than default (typically TCP ports 860 and
-                                3260).
+                              description: |-
+                                targetPortal is iSCSI Target Portal. The Portal is either an IP or ip_addr:port if the port
+                                is other than default (typically TCP ports 860 and 3260).
                               type: string
                           required:
                           - iqn
@@ -3661,57 +4601,65 @@ spec:
                           - targetPortal
                           type: object
                         name:
-                          description: 'name of the volume. Must be a DNS_LABEL and
-                            unique within the pod. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+                          description: |-
+                            name of the volume.
+                            Must be a DNS_LABEL and unique within the pod.
+                            More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
                           type: string
                         nfs:
-                          description: 'nfs represents an NFS mount on the host that
-                            shares a pod''s lifetime More info: https://kubernetes.io/docs/concepts/storage/volumes#nfs'
+                          description: |-
+                            nfs represents an NFS mount on the host that shares a pod's lifetime
+                            More info: https://kubernetes.io/docs/concepts/storage/volumes#nfs
                           properties:
                             path:
-                              description: 'path that is exported by the NFS server.
-                                More info: https://kubernetes.io/docs/concepts/storage/volumes#nfs'
+                              description: |-
+                                path that is exported by the NFS server.
+                                More info: https://kubernetes.io/docs/concepts/storage/volumes#nfs
                               type: string
                             readOnly:
-                              description: 'readOnly here will force the NFS export
-                                to be mounted with read-only permissions. Defaults
-                                to false. More info: https://kubernetes.io/docs/concepts/storage/volumes#nfs'
+                              description: |-
+                                readOnly here will force the NFS export to be mounted with read-only permissions.
+                                Defaults to false.
+                                More info: https://kubernetes.io/docs/concepts/storage/volumes#nfs
                               type: boolean
                             server:
-                              description: 'server is the hostname or IP address of
-                                the NFS server. More info: https://kubernetes.io/docs/concepts/storage/volumes#nfs'
+                              description: |-
+                                server is the hostname or IP address of the NFS server.
+                                More info: https://kubernetes.io/docs/concepts/storage/volumes#nfs
                               type: string
                           required:
                           - path
                           - server
                           type: object
                         persistentVolumeClaim:
-                          description: 'persistentVolumeClaimVolumeSource represents
-                            a reference to a PersistentVolumeClaim in the same namespace.
-                            More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#persistentvolumeclaims'
+                          description: |-
+                            persistentVolumeClaimVolumeSource represents a reference to a
+                            PersistentVolumeClaim in the same namespace.
+                            More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#persistentvolumeclaims
                           properties:
                             claimName:
-                              description: 'claimName is the name of a PersistentVolumeClaim
-                                in the same namespace as the pod using this volume.
-                                More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#persistentvolumeclaims'
+                              description: |-
+                                claimName is the name of a PersistentVolumeClaim in the same namespace as the pod using this volume.
+                                More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#persistentvolumeclaims
                               type: string
                             readOnly:
-                              description: readOnly Will force the ReadOnly setting
-                                in VolumeMounts. Default false.
+                              description: |-
+                                readOnly Will force the ReadOnly setting in VolumeMounts.
+                                Default false.
                               type: boolean
                           required:
                           - claimName
                           type: object
                         photonPersistentDisk:
-                          description: photonPersistentDisk represents a PhotonController
-                            persistent disk attached and mounted on kubelets host
-                            machine
+                          description: |-
+                            photonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets host machine.
+                            Deprecated: PhotonPersistentDisk is deprecated and the in-tree photonPersistentDisk type is no longer supported.
                           properties:
                             fsType:
-                              description: fsType is the filesystem type to mount.
-                                Must be a filesystem type supported by the host operating
-                                system. Ex. "ext4", "xfs", "ntfs". Implicitly inferred
-                                to be "ext4" if unspecified.
+                              description: |-
+                                fsType is the filesystem type to mount.
+                                Must be a filesystem type supported by the host operating system.
+                                Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
                               type: string
                             pdID:
                               description: pdID is the ID that identifies Photon Controller
@@ -3721,18 +4669,22 @@ spec:
                           - pdID
                           type: object
                         portworxVolume:
-                          description: portworxVolume represents a portworx volume
-                            attached and mounted on kubelets host machine
+                          description: |-
+                            portworxVolume represents a portworx volume attached and mounted on kubelets host machine.
+                            Deprecated: PortworxVolume is deprecated. All operations for the in-tree portworxVolume type
+                            are redirected to the pxd.portworx.com CSI driver when the CSIMigrationPortworx feature-gate
+                            is on.
                           properties:
                             fsType:
-                              description: fSType represents the filesystem type to
-                                mount Must be a filesystem type supported by the host
-                                operating system. Ex. "ext4", "xfs". Implicitly inferred
-                                to be "ext4" if unspecified.
+                              description: |-
+                                fSType represents the filesystem type to mount
+                                Must be a filesystem type supported by the host operating system.
+                                Ex. "ext4", "xfs". Implicitly inferred to be "ext4" if unspecified.
                               type: string
                             readOnly:
-                              description: readOnly defaults to false (read/write).
-                                ReadOnly here will force the ReadOnly setting in VolumeMounts.
+                              description: |-
+                                readOnly defaults to false (read/write). ReadOnly here will force
+                                the ReadOnly setting in VolumeMounts.
                               type: boolean
                             volumeID:
                               description: volumeID uniquely identifies a Portworx
@@ -3746,40 +4698,130 @@ spec:
                             configmaps, and downward API
                           properties:
                             defaultMode:
-                              description: defaultMode are the mode bits used to set
-                                permissions on created files by default. Must be an
-                                octal value between 0000 and 0777 or a decimal value
-                                between 0 and 511. YAML accepts both octal and decimal
-                                values, JSON requires decimal values for mode bits.
-                                Directories within the path are not affected by this
-                                setting. This might be in conflict with other options
-                                that affect the file mode, like fsGroup, and the result
-                                can be other mode bits set.
+                              description: |-
+                                defaultMode are the mode bits used to set permissions on created files by default.
+                                Must be an octal value between 0000 and 0777 or a decimal value between 0 and 511.
+                                YAML accepts both octal and decimal values, JSON requires decimal values for mode bits.
+                                Directories within the path are not affected by this setting.
+                                This might be in conflict with other options that affect the file
+                                mode, like fsGroup, and the result can be other mode bits set.
                               format: int32
                               type: integer
                             sources:
-                              description: sources is the list of volume projections
+                              description: |-
+                                sources is the list of volume projections. Each entry in this list
+                                handles one source.
                               items:
-                                description: Projection that may be projected along
-                                  with other supported volume types
+                                description: |-
+                                  Projection that may be projected along with other supported volume types.
+                                  Exactly one of these fields must be set.
                                 properties:
+                                  clusterTrustBundle:
+                                    description: |-
+                                      ClusterTrustBundle allows a pod to access the `.spec.trustBundle` field
+                                      of ClusterTrustBundle objects in an auto-updating file.
+
+                                      Alpha, gated by the ClusterTrustBundleProjection feature gate.
+
+                                      ClusterTrustBundle objects can either be selected by name, or by the
+                                      combination of signer name and a label selector.
+
+                                      Kubelet performs aggressive normalization of the PEM contents written
+                                      into the pod filesystem.  Esoteric PEM features such as inter-block
+                                      comments and block headers are stripped.  Certificates are deduplicated.
+                                      The ordering of certificates within the file is arbitrary, and Kubelet
+                                      may change the order over time.
+                                    properties:
+                                      labelSelector:
+                                        description: |-
+                                          Select all ClusterTrustBundles that match this label selector.  Only has
+                                          effect if signerName is set.  Mutually-exclusive with name.  If unset,
+                                          interpreted as "match nothing".  If set but empty, interpreted as "match
+                                          everything".
+                                        properties:
+                                          matchExpressions:
+                                            description: matchExpressions is a list
+                                              of label selector requirements. The
+                                              requirements are ANDed.
+                                            items:
+                                              description: |-
+                                                A label selector requirement is a selector that contains values, a key, and an operator that
+                                                relates the key and values.
+                                              properties:
+                                                key:
+                                                  description: key is the label key
+                                                    that the selector applies to.
+                                                  type: string
+                                                operator:
+                                                  description: |-
+                                                    operator represents a key's relationship to a set of values.
+                                                    Valid operators are In, NotIn, Exists and DoesNotExist.
+                                                  type: string
+                                                values:
+                                                  description: |-
+                                                    values is an array of string values. If the operator is In or NotIn,
+                                                    the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                                    the values array must be empty. This array is replaced during a strategic
+                                                    merge patch.
+                                                  items:
+                                                    type: string
+                                                  type: array
+                                                  x-kubernetes-list-type: atomic
+                                              required:
+                                              - key
+                                              - operator
+                                              type: object
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                          matchLabels:
+                                            additionalProperties:
+                                              type: string
+                                            description: |-
+                                              matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                              map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                              operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                            type: object
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      name:
+                                        description: |-
+                                          Select a single ClusterTrustBundle by object name.  Mutually-exclusive
+                                          with signerName and labelSelector.
+                                        type: string
+                                      optional:
+                                        description: |-
+                                          If true, don't block pod startup if the referenced ClusterTrustBundle(s)
+                                          aren't available.  If using name, then the named ClusterTrustBundle is
+                                          allowed not to exist.  If using signerName, then the combination of
+                                          signerName and labelSelector is allowed to match zero
+                                          ClusterTrustBundles.
+                                        type: boolean
+                                      path:
+                                        description: Relative path from the volume
+                                          root to write the bundle.
+                                        type: string
+                                      signerName:
+                                        description: |-
+                                          Select all ClusterTrustBundles that match this signer name.
+                                          Mutually-exclusive with name.  The contents of all selected
+                                          ClusterTrustBundles will be unified and deduplicated.
+                                        type: string
+                                    required:
+                                    - path
+                                    type: object
                                   configMap:
                                     description: configMap information about the configMap
                                       data to project
                                     properties:
                                       items:
-                                        description: items if unspecified, each key-value
-                                          pair in the Data field of the referenced
-                                          ConfigMap will be projected into the volume
-                                          as a file whose name is the key and content
-                                          is the value. If specified, the listed keys
-                                          will be projected into the specified paths,
-                                          and unlisted keys will not be present. If
-                                          a key is specified which is not present
-                                          in the ConfigMap, the volume setup will
-                                          error unless it is marked optional. Paths
-                                          must be relative and may not contain the
-                                          '..' path or start with '..'.
+                                        description: |-
+                                          items if unspecified, each key-value pair in the Data field of the referenced
+                                          ConfigMap will be projected into the volume as a file whose name is the
+                                          key and content is the value. If specified, the listed keys will be
+                                          projected into the specified paths, and unlisted keys will not be
+                                          present. If a key is specified which is not present in the ConfigMap,
+                                          the volume setup will error unless it is marked optional. Paths must be
+                                          relative and may not contain the '..' path or start with '..'.
                                         items:
                                           description: Maps a string key to a path
                                             within a volume.
@@ -3788,43 +4830,43 @@ spec:
                                               description: key is the key to project.
                                               type: string
                                             mode:
-                                              description: 'mode is Optional: mode
-                                                bits used to set permissions on this
-                                                file. Must be an octal value between
-                                                0000 and 0777 or a decimal value between
-                                                0 and 511. YAML accepts both octal
-                                                and decimal values, JSON requires
-                                                decimal values for mode bits. If not
-                                                specified, the volume defaultMode
-                                                will be used. This might be in conflict
-                                                with other options that affect the
-                                                file mode, like fsGroup, and the result
-                                                can be other mode bits set.'
+                                              description: |-
+                                                mode is Optional: mode bits used to set permissions on this file.
+                                                Must be an octal value between 0000 and 0777 or a decimal value between 0 and 511.
+                                                YAML accepts both octal and decimal values, JSON requires decimal values for mode bits.
+                                                If not specified, the volume defaultMode will be used.
+                                                This might be in conflict with other options that affect the file
+                                                mode, like fsGroup, and the result can be other mode bits set.
                                               format: int32
                                               type: integer
                                             path:
-                                              description: path is the relative path
-                                                of the file to map the key to. May
-                                                not be an absolute path. May not contain
-                                                the path element '..'. May not start
-                                                with the string '..'.
+                                              description: |-
+                                                path is the relative path of the file to map the key to.
+                                                May not be an absolute path.
+                                                May not contain the path element '..'.
+                                                May not start with the string '..'.
                                               type: string
                                           required:
                                           - key
                                           - path
                                           type: object
                                         type: array
+                                        x-kubernetes-list-type: atomic
                                       name:
-                                        description: 'Name of the referent. More info:
-                                          https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                                          TODO: Add other useful fields. apiVersion,
-                                          kind, uid?'
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
                                         type: string
                                       optional:
                                         description: optional specify whether the
                                           ConfigMap or its keys must be defined
                                         type: boolean
                                     type: object
+                                    x-kubernetes-map-type: atomic
                                   downwardAPI:
                                     description: downwardAPI information about the
                                       downwardAPI data to project
@@ -3840,7 +4882,7 @@ spec:
                                             fieldRef:
                                               description: 'Required: Selects a field
                                                 of the pod: only annotations, labels,
-                                                name and namespace are supported.'
+                                                name, namespace and uid are supported.'
                                               properties:
                                                 apiVersion:
                                                   description: Version of the schema
@@ -3854,19 +4896,15 @@ spec:
                                               required:
                                               - fieldPath
                                               type: object
+                                              x-kubernetes-map-type: atomic
                                             mode:
-                                              description: 'Optional: mode bits used
-                                                to set permissions on this file, must
-                                                be an octal value between 0000 and
-                                                0777 or a decimal value between 0
-                                                and 511. YAML accepts both octal and
-                                                decimal values, JSON requires decimal
-                                                values for mode bits. If not specified,
-                                                the volume defaultMode will be used.
-                                                This might be in conflict with other
-                                                options that affect the file mode,
-                                                like fsGroup, and the result can be
-                                                other mode bits set.'
+                                              description: |-
+                                                Optional: mode bits used to set permissions on this file, must be an octal value
+                                                between 0000 and 0777 or a decimal value between 0 and 511.
+                                                YAML accepts both octal and decimal values, JSON requires decimal values for mode bits.
+                                                If not specified, the volume defaultMode will be used.
+                                                This might be in conflict with other options that affect the file
+                                                mode, like fsGroup, and the result can be other mode bits set.
                                               format: int32
                                               type: integer
                                             path:
@@ -3878,11 +4916,9 @@ spec:
                                                 path must not start with ''..'''
                                               type: string
                                             resourceFieldRef:
-                                              description: 'Selects a resource of
-                                                the container: only resources limits
-                                                and requests (limits.cpu, limits.memory,
-                                                requests.cpu and requests.memory)
-                                                are currently supported.'
+                                              description: |-
+                                                Selects a resource of the container: only resources limits and requests
+                                                (limits.cpu, limits.memory, requests.cpu and requests.memory) are currently supported.
                                               properties:
                                                 containerName:
                                                   description: 'Container name: required
@@ -3905,28 +4941,26 @@ spec:
                                               required:
                                               - resource
                                               type: object
+                                              x-kubernetes-map-type: atomic
                                           required:
                                           - path
                                           type: object
                                         type: array
+                                        x-kubernetes-list-type: atomic
                                     type: object
                                   secret:
                                     description: secret information about the secret
                                       data to project
                                     properties:
                                       items:
-                                        description: items if unspecified, each key-value
-                                          pair in the Data field of the referenced
-                                          Secret will be projected into the volume
-                                          as a file whose name is the key and content
-                                          is the value. If specified, the listed keys
-                                          will be projected into the specified paths,
-                                          and unlisted keys will not be present. If
-                                          a key is specified which is not present
-                                          in the Secret, the volume setup will error
-                                          unless it is marked optional. Paths must
-                                          be relative and may not contain the '..'
-                                          path or start with '..'.
+                                        description: |-
+                                          items if unspecified, each key-value pair in the Data field of the referenced
+                                          Secret will be projected into the volume as a file whose name is the
+                                          key and content is the value. If specified, the listed keys will be
+                                          projected into the specified paths, and unlisted keys will not be
+                                          present. If a key is specified which is not present in the Secret,
+                                          the volume setup will error unless it is marked optional. Paths must be
+                                          relative and may not contain the '..' path or start with '..'.
                                         items:
                                           description: Maps a string key to a path
                                             within a volume.
@@ -3935,71 +4969,67 @@ spec:
                                               description: key is the key to project.
                                               type: string
                                             mode:
-                                              description: 'mode is Optional: mode
-                                                bits used to set permissions on this
-                                                file. Must be an octal value between
-                                                0000 and 0777 or a decimal value between
-                                                0 and 511. YAML accepts both octal
-                                                and decimal values, JSON requires
-                                                decimal values for mode bits. If not
-                                                specified, the volume defaultMode
-                                                will be used. This might be in conflict
-                                                with other options that affect the
-                                                file mode, like fsGroup, and the result
-                                                can be other mode bits set.'
+                                              description: |-
+                                                mode is Optional: mode bits used to set permissions on this file.
+                                                Must be an octal value between 0000 and 0777 or a decimal value between 0 and 511.
+                                                YAML accepts both octal and decimal values, JSON requires decimal values for mode bits.
+                                                If not specified, the volume defaultMode will be used.
+                                                This might be in conflict with other options that affect the file
+                                                mode, like fsGroup, and the result can be other mode bits set.
                                               format: int32
                                               type: integer
                                             path:
-                                              description: path is the relative path
-                                                of the file to map the key to. May
-                                                not be an absolute path. May not contain
-                                                the path element '..'. May not start
-                                                with the string '..'.
+                                              description: |-
+                                                path is the relative path of the file to map the key to.
+                                                May not be an absolute path.
+                                                May not contain the path element '..'.
+                                                May not start with the string '..'.
                                               type: string
                                           required:
                                           - key
                                           - path
                                           type: object
                                         type: array
+                                        x-kubernetes-list-type: atomic
                                       name:
-                                        description: 'Name of the referent. More info:
-                                          https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                                          TODO: Add other useful fields. apiVersion,
-                                          kind, uid?'
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
                                         type: string
                                       optional:
                                         description: optional field specify whether
                                           the Secret or its key must be defined
                                         type: boolean
                                     type: object
+                                    x-kubernetes-map-type: atomic
                                   serviceAccountToken:
                                     description: serviceAccountToken is information
                                       about the serviceAccountToken data to project
                                     properties:
                                       audience:
-                                        description: audience is the intended audience
-                                          of the token. A recipient of a token must
-                                          identify itself with an identifier specified
-                                          in the audience of the token, and otherwise
-                                          should reject the token. The audience defaults
-                                          to the identifier of the apiserver.
+                                        description: |-
+                                          audience is the intended audience of the token. A recipient of a token
+                                          must identify itself with an identifier specified in the audience of the
+                                          token, and otherwise should reject the token. The audience defaults to the
+                                          identifier of the apiserver.
                                         type: string
                                       expirationSeconds:
-                                        description: expirationSeconds is the requested
-                                          duration of validity of the service account
-                                          token. As the token approaches expiration,
-                                          the kubelet volume plugin will proactively
-                                          rotate the service account token. The kubelet
-                                          will start trying to rotate the token if
-                                          the token is older than 80 percent of its
-                                          time to live or if the token is older than
-                                          24 hours.Defaults to 1 hour and must be
-                                          at least 10 minutes.
+                                        description: |-
+                                          expirationSeconds is the requested duration of validity of the service
+                                          account token. As the token approaches expiration, the kubelet volume
+                                          plugin will proactively rotate the service account token. The kubelet will
+                                          start trying to rotate the token if the token is older than 80 percent of
+                                          its time to live or if the token is older than 24 hours.Defaults to 1 hour
+                                          and must be at least 10 minutes.
                                         format: int64
                                         type: integer
                                       path:
-                                        description: path is the path relative to
-                                          the mount point of the file to project the
+                                        description: |-
+                                          path is the path relative to the mount point of the file to project the
                                           token into.
                                         type: string
                                     required:
@@ -4007,34 +5037,38 @@ spec:
                                     type: object
                                 type: object
                               type: array
+                              x-kubernetes-list-type: atomic
                           type: object
                         quobyte:
-                          description: quobyte represents a Quobyte mount on the host
-                            that shares a pod's lifetime
+                          description: |-
+                            quobyte represents a Quobyte mount on the host that shares a pod's lifetime.
+                            Deprecated: Quobyte is deprecated and the in-tree quobyte type is no longer supported.
                           properties:
                             group:
-                              description: group to map volume access to Default is
-                                no group
+                              description: |-
+                                group to map volume access to
+                                Default is no group
                               type: string
                             readOnly:
-                              description: readOnly here will force the Quobyte volume
-                                to be mounted with read-only permissions. Defaults
-                                to false.
+                              description: |-
+                                readOnly here will force the Quobyte volume to be mounted with read-only permissions.
+                                Defaults to false.
                               type: boolean
                             registry:
-                              description: registry represents a single or multiple
-                                Quobyte Registry services specified as a string as
-                                host:port pair (multiple entries are separated with
-                                commas) which acts as the central registry for volumes
+                              description: |-
+                                registry represents a single or multiple Quobyte Registry services
+                                specified as a string as host:port pair (multiple entries are separated with commas)
+                                which acts as the central registry for volumes
                               type: string
                             tenant:
-                              description: tenant owning the given Quobyte volume
-                                in the Backend Used with dynamically provisioned Quobyte
-                                volumes, value is set by the plugin
+                              description: |-
+                                tenant owning the given Quobyte volume in the Backend
+                                Used with dynamically provisioned Quobyte volumes, value is set by the plugin
                               type: string
                             user:
-                              description: user to map volume access to Defaults to
-                                serivceaccount user
+                              description: |-
+                                user to map volume access to
+                                Defaults to serivceaccount user
                               type: string
                             volume:
                               description: volume is a string that references an already
@@ -4045,69 +5079,92 @@ spec:
                           - volume
                           type: object
                         rbd:
-                          description: 'rbd represents a Rados Block Device mount
-                            on the host that shares a pod''s lifetime. More info:
-                            https://examples.k8s.io/volumes/rbd/README.md'
+                          description: |-
+                            rbd represents a Rados Block Device mount on the host that shares a pod's lifetime.
+                            Deprecated: RBD is deprecated and the in-tree rbd type is no longer supported.
+                            More info: https://examples.k8s.io/volumes/rbd/README.md
                           properties:
                             fsType:
-                              description: 'fsType is the filesystem type of the volume
-                                that you want to mount. Tip: Ensure that the filesystem
-                                type is supported by the host operating system. Examples:
-                                "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4"
-                                if unspecified. More info: https://kubernetes.io/docs/concepts/storage/volumes#rbd
-                                TODO: how do we prevent errors in the filesystem from
-                                compromising the machine'
+                              description: |-
+                                fsType is the filesystem type of the volume that you want to mount.
+                                Tip: Ensure that the filesystem type is supported by the host operating system.
+                                Examples: "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
+                                More info: https://kubernetes.io/docs/concepts/storage/volumes#rbd
                               type: string
                             image:
-                              description: 'image is the rados image name. More info:
-                                https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it'
+                              description: |-
+                                image is the rados image name.
+                                More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it
                               type: string
                             keyring:
-                              description: 'keyring is the path to key ring for RBDUser.
-                                Default is /etc/ceph/keyring. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it'
+                              default: /etc/ceph/keyring
+                              description: |-
+                                keyring is the path to key ring for RBDUser.
+                                Default is /etc/ceph/keyring.
+                                More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it
                               type: string
                             monitors:
-                              description: 'monitors is a collection of Ceph monitors.
-                                More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it'
+                              description: |-
+                                monitors is a collection of Ceph monitors.
+                                More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it
                               items:
                                 type: string
                               type: array
+                              x-kubernetes-list-type: atomic
                             pool:
-                              description: 'pool is the rados pool name. Default is
-                                rbd. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it'
+                              default: rbd
+                              description: |-
+                                pool is the rados pool name.
+                                Default is rbd.
+                                More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it
                               type: string
                             readOnly:
-                              description: 'readOnly here will force the ReadOnly
-                                setting in VolumeMounts. Defaults to false. More info:
-                                https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it'
+                              description: |-
+                                readOnly here will force the ReadOnly setting in VolumeMounts.
+                                Defaults to false.
+                                More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it
                               type: boolean
                             secretRef:
-                              description: 'secretRef is name of the authentication
-                                secret for RBDUser. If provided overrides keyring.
-                                Default is nil. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it'
+                              description: |-
+                                secretRef is name of the authentication secret for RBDUser. If provided
+                                overrides keyring.
+                                Default is nil.
+                                More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it
                               properties:
                                 name:
-                                  description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                                    TODO: Add other useful fields. apiVersion, kind,
-                                    uid?'
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
                                   type: string
                               type: object
+                              x-kubernetes-map-type: atomic
                             user:
-                              description: 'user is the rados user name. Default is
-                                admin. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it'
+                              default: admin
+                              description: |-
+                                user is the rados user name.
+                                Default is admin.
+                                More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it
                               type: string
                           required:
                           - image
                           - monitors
                           type: object
                         scaleIO:
-                          description: scaleIO represents a ScaleIO persistent volume
-                            attached and mounted on Kubernetes nodes.
+                          description: |-
+                            scaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.
+                            Deprecated: ScaleIO is deprecated and the in-tree scaleIO type is no longer supported.
                           properties:
                             fsType:
-                              description: fsType is the filesystem type to mount.
-                                Must be a filesystem type supported by the host operating
-                                system. Ex. "ext4", "xfs", "ntfs". Default is "xfs".
+                              default: xfs
+                              description: |-
+                                fsType is the filesystem type to mount.
+                                Must be a filesystem type supported by the host operating system.
+                                Ex. "ext4", "xfs", "ntfs".
+                                Default is "xfs".
                               type: string
                             gateway:
                               description: gateway is the host address of the ScaleIO
@@ -4118,27 +5175,34 @@ spec:
                                 Protection Domain for the configured storage.
                               type: string
                             readOnly:
-                              description: readOnly Defaults to false (read/write).
-                                ReadOnly here will force the ReadOnly setting in VolumeMounts.
+                              description: |-
+                                readOnly Defaults to false (read/write). ReadOnly here will force
+                                the ReadOnly setting in VolumeMounts.
                               type: boolean
                             secretRef:
-                              description: secretRef references to the secret for
-                                ScaleIO user and other sensitive information. If this
-                                is not provided, Login operation will fail.
+                              description: |-
+                                secretRef references to the secret for ScaleIO user and other
+                                sensitive information. If this is not provided, Login operation will fail.
                               properties:
                                 name:
-                                  description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                                    TODO: Add other useful fields. apiVersion, kind,
-                                    uid?'
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
                                   type: string
                               type: object
+                              x-kubernetes-map-type: atomic
                             sslEnabled:
                               description: sslEnabled Flag enable/disable SSL communication
                                 with Gateway, default false
                               type: boolean
                             storageMode:
-                              description: storageMode indicates whether the storage
-                                for a volume should be ThickProvisioned or ThinProvisioned.
+                              default: ThinProvisioned
+                              description: |-
+                                storageMode indicates whether the storage for a volume should be ThickProvisioned or ThinProvisioned.
                                 Default is ThinProvisioned.
                               type: string
                             storagePool:
@@ -4150,9 +5214,9 @@ spec:
                                 as configured in ScaleIO.
                               type: string
                             volumeName:
-                              description: volumeName is the name of a volume already
-                                created in the ScaleIO system that is associated with
-                                this volume source.
+                              description: |-
+                                volumeName is the name of a volume already created in the ScaleIO system
+                                that is associated with this volume source.
                               type: string
                           required:
                           - gateway
@@ -4160,33 +5224,30 @@ spec:
                           - system
                           type: object
                         secret:
-                          description: 'secret represents a secret that should populate
-                            this volume. More info: https://kubernetes.io/docs/concepts/storage/volumes#secret'
+                          description: |-
+                            secret represents a secret that should populate this volume.
+                            More info: https://kubernetes.io/docs/concepts/storage/volumes#secret
                           properties:
                             defaultMode:
-                              description: 'defaultMode is Optional: mode bits used
-                                to set permissions on created files by default. Must
-                                be an octal value between 0000 and 0777 or a decimal
-                                value between 0 and 511. YAML accepts both octal and
-                                decimal values, JSON requires decimal values for mode
-                                bits. Defaults to 0644. Directories within the path
-                                are not affected by this setting. This might be in
-                                conflict with other options that affect the file mode,
-                                like fsGroup, and the result can be other mode bits
-                                set.'
+                              description: |-
+                                defaultMode is Optional: mode bits used to set permissions on created files by default.
+                                Must be an octal value between 0000 and 0777 or a decimal value between 0 and 511.
+                                YAML accepts both octal and decimal values, JSON requires decimal values
+                                for mode bits. Defaults to 0644.
+                                Directories within the path are not affected by this setting.
+                                This might be in conflict with other options that affect the file
+                                mode, like fsGroup, and the result can be other mode bits set.
                               format: int32
                               type: integer
                             items:
-                              description: items If unspecified, each key-value pair
-                                in the Data field of the referenced Secret will be
-                                projected into the volume as a file whose name is
-                                the key and content is the value. If specified, the
-                                listed keys will be projected into the specified paths,
-                                and unlisted keys will not be present. If a key is
-                                specified which is not present in the Secret, the
-                                volume setup will error unless it is marked optional.
-                                Paths must be relative and may not contain the '..'
-                                path or start with '..'.
+                              description: |-
+                                items If unspecified, each key-value pair in the Data field of the referenced
+                                Secret will be projected into the volume as a file whose name is the
+                                key and content is the value. If specified, the listed keys will be
+                                projected into the specified paths, and unlisted keys will not be
+                                present. If a key is specified which is not present in the Secret,
+                                the volume setup will error unless it is marked optional. Paths must be
+                                relative and may not contain the '..' path or start with '..'.
                               items:
                                 description: Maps a string key to a path within a
                                   volume.
@@ -4195,22 +5256,20 @@ spec:
                                     description: key is the key to project.
                                     type: string
                                   mode:
-                                    description: 'mode is Optional: mode bits used
-                                      to set permissions on this file. Must be an
-                                      octal value between 0000 and 0777 or a decimal
-                                      value between 0 and 511. YAML accepts both octal
-                                      and decimal values, JSON requires decimal values
-                                      for mode bits. If not specified, the volume
-                                      defaultMode will be used. This might be in conflict
-                                      with other options that affect the file mode,
-                                      like fsGroup, and the result can be other mode
-                                      bits set.'
+                                    description: |-
+                                      mode is Optional: mode bits used to set permissions on this file.
+                                      Must be an octal value between 0000 and 0777 or a decimal value between 0 and 511.
+                                      YAML accepts both octal and decimal values, JSON requires decimal values for mode bits.
+                                      If not specified, the volume defaultMode will be used.
+                                      This might be in conflict with other options that affect the file
+                                      mode, like fsGroup, and the result can be other mode bits set.
                                     format: int32
                                     type: integer
                                   path:
-                                    description: path is the relative path of the
-                                      file to map the key to. May not be an absolute
-                                      path. May not contain the path element '..'.
+                                    description: |-
+                                      path is the relative path of the file to map the key to.
+                                      May not be an absolute path.
+                                      May not contain the path element '..'.
                                       May not start with the string '..'.
                                     type: string
                                 required:
@@ -4218,66 +5277,75 @@ spec:
                                 - path
                                 type: object
                               type: array
+                              x-kubernetes-list-type: atomic
                             optional:
                               description: optional field specify whether the Secret
                                 or its keys must be defined
                               type: boolean
                             secretName:
-                              description: 'secretName is the name of the secret in
-                                the pod''s namespace to use. More info: https://kubernetes.io/docs/concepts/storage/volumes#secret'
+                              description: |-
+                                secretName is the name of the secret in the pod's namespace to use.
+                                More info: https://kubernetes.io/docs/concepts/storage/volumes#secret
                               type: string
                           type: object
                         storageos:
-                          description: storageOS represents a StorageOS volume attached
-                            and mounted on Kubernetes nodes.
+                          description: |-
+                            storageOS represents a StorageOS volume attached and mounted on Kubernetes nodes.
+                            Deprecated: StorageOS is deprecated and the in-tree storageos type is no longer supported.
                           properties:
                             fsType:
-                              description: fsType is the filesystem type to mount.
-                                Must be a filesystem type supported by the host operating
-                                system. Ex. "ext4", "xfs", "ntfs". Implicitly inferred
-                                to be "ext4" if unspecified.
+                              description: |-
+                                fsType is the filesystem type to mount.
+                                Must be a filesystem type supported by the host operating system.
+                                Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
                               type: string
                             readOnly:
-                              description: readOnly defaults to false (read/write).
-                                ReadOnly here will force the ReadOnly setting in VolumeMounts.
+                              description: |-
+                                readOnly defaults to false (read/write). ReadOnly here will force
+                                the ReadOnly setting in VolumeMounts.
                               type: boolean
                             secretRef:
-                              description: secretRef specifies the secret to use for
-                                obtaining the StorageOS API credentials.  If not specified,
-                                default values will be attempted.
+                              description: |-
+                                secretRef specifies the secret to use for obtaining the StorageOS API
+                                credentials.  If not specified, default values will be attempted.
                               properties:
                                 name:
-                                  description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                                    TODO: Add other useful fields. apiVersion, kind,
-                                    uid?'
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
                                   type: string
                               type: object
+                              x-kubernetes-map-type: atomic
                             volumeName:
-                              description: volumeName is the human-readable name of
-                                the StorageOS volume.  Volume names are only unique
-                                within a namespace.
+                              description: |-
+                                volumeName is the human-readable name of the StorageOS volume.  Volume
+                                names are only unique within a namespace.
                               type: string
                             volumeNamespace:
-                              description: volumeNamespace specifies the scope of
-                                the volume within StorageOS.  If no namespace is specified
-                                then the Pod's namespace will be used.  This allows
-                                the Kubernetes name scoping to be mirrored within
-                                StorageOS for tighter integration. Set VolumeName
-                                to any name to override the default behaviour. Set
-                                to "default" if you are not using namespaces within
-                                StorageOS. Namespaces that do not pre-exist within
-                                StorageOS will be created.
+                              description: |-
+                                volumeNamespace specifies the scope of the volume within StorageOS.  If no
+                                namespace is specified then the Pod's namespace will be used.  This allows the
+                                Kubernetes name scoping to be mirrored within StorageOS for tighter integration.
+                                Set VolumeName to any name to override the default behaviour.
+                                Set to "default" if you are not using namespaces within StorageOS.
+                                Namespaces that do not pre-exist within StorageOS will be created.
                               type: string
                           type: object
                         vsphereVolume:
-                          description: vsphereVolume represents a vSphere volume attached
-                            and mounted on kubelets host machine
+                          description: |-
+                            vsphereVolume represents a vSphere volume attached and mounted on kubelets host machine.
+                            Deprecated: VsphereVolume is deprecated. All operations for the in-tree vsphereVolume type
+                            are redirected to the csi.vsphere.vmware.com CSI driver.
                           properties:
                             fsType:
-                              description: fsType is filesystem type to mount. Must
-                                be a filesystem type supported by the host operating
-                                system. Ex. "ext4", "xfs", "ntfs". Implicitly inferred
-                                to be "ext4" if unspecified.
+                              description: |-
+                                fsType is filesystem type to mount.
+                                Must be a filesystem type supported by the host operating system.
+                                Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
                               type: string
                             storagePolicyID:
                               description: storagePolicyID is the storage Policy Based
@@ -4308,14 +5376,21 @@ spec:
                     type: string
                   imagePullSecrets:
                     items:
-                      description: LocalObjectReference contains enough information
-                        to let you locate the referenced object inside the same namespace.
+                      description: |-
+                        LocalObjectReference contains enough information to let you locate the
+                        referenced object inside the same namespace.
                       properties:
                         name:
-                          description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                            TODO: Add other useful fields. apiVersion, kind, uid?'
+                          default: ""
+                          description: |-
+                            Name of the referent.
+                            This field is effectively required, but due to backwards compatibility is
+                            allowed to be empty. Instances of this type with an empty value here are
+                            almost certainly wrong.
+                            More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
                           type: string
                       type: object
+                      x-kubernetes-map-type: atomic
                     type: array
                   initContainers:
                     items:
@@ -4323,37 +5398,37 @@ spec:
                         run within a pod.
                       properties:
                         args:
-                          description: 'Arguments to the entrypoint. The container
-                            image''s CMD is used if this is not provided. Variable
-                            references $(VAR_NAME) are expanded using the container''s
-                            environment. If a variable cannot be resolved, the reference
-                            in the input string will be unchanged. Double $$ are reduced
-                            to a single $, which allows for escaping the $(VAR_NAME)
-                            syntax: i.e. "$$(VAR_NAME)" will produce the string literal
-                            "$(VAR_NAME)". Escaped references will never be expanded,
-                            regardless of whether the variable exists or not. Cannot
-                            be updated. More info: https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell'
+                          description: |-
+                            Arguments to the entrypoint.
+                            The container image's CMD is used if this is not provided.
+                            Variable references $(VAR_NAME) are expanded using the container's environment. If a variable
+                            cannot be resolved, the reference in the input string will be unchanged. Double $$ are reduced
+                            to a single $, which allows for escaping the $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)" will
+                            produce the string literal "$(VAR_NAME)". Escaped references will never be expanded, regardless
+                            of whether the variable exists or not. Cannot be updated.
+                            More info: https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell
                           items:
                             type: string
                           type: array
+                          x-kubernetes-list-type: atomic
                         command:
-                          description: 'Entrypoint array. Not executed within a shell.
-                            The container image''s ENTRYPOINT is used if this is not
-                            provided. Variable references $(VAR_NAME) are expanded
-                            using the container''s environment. If a variable cannot
-                            be resolved, the reference in the input string will be
-                            unchanged. Double $$ are reduced to a single $, which
-                            allows for escaping the $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)"
-                            will produce the string literal "$(VAR_NAME)". Escaped
-                            references will never be expanded, regardless of whether
-                            the variable exists or not. Cannot be updated. More info:
-                            https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell'
+                          description: |-
+                            Entrypoint array. Not executed within a shell.
+                            The container image's ENTRYPOINT is used if this is not provided.
+                            Variable references $(VAR_NAME) are expanded using the container's environment. If a variable
+                            cannot be resolved, the reference in the input string will be unchanged. Double $$ are reduced
+                            to a single $, which allows for escaping the $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)" will
+                            produce the string literal "$(VAR_NAME)". Escaped references will never be expanded, regardless
+                            of whether the variable exists or not. Cannot be updated.
+                            More info: https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell
                           items:
                             type: string
                           type: array
+                          x-kubernetes-list-type: atomic
                         env:
-                          description: List of environment variables to set in the
-                            container. Cannot be updated.
+                          description: |-
+                            List of environment variables to set in the container.
+                            Cannot be updated.
                           items:
                             description: EnvVar represents an environment variable
                               present in a Container.
@@ -4363,17 +5438,16 @@ spec:
                                   be a C_IDENTIFIER.
                                 type: string
                               value:
-                                description: 'Variable references $(VAR_NAME) are
-                                  expanded using the previously defined environment
-                                  variables in the container and any service environment
-                                  variables. If a variable cannot be resolved, the
-                                  reference in the input string will be unchanged.
-                                  Double $$ are reduced to a single $, which allows
-                                  for escaping the $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)"
-                                  will produce the string literal "$(VAR_NAME)". Escaped
-                                  references will never be expanded, regardless of
-                                  whether the variable exists or not. Defaults to
-                                  "".'
+                                description: |-
+                                  Variable references $(VAR_NAME) are expanded
+                                  using the previously defined environment variables in the container and
+                                  any service environment variables. If a variable cannot be resolved,
+                                  the reference in the input string will be unchanged. Double $$ are reduced
+                                  to a single $, which allows for escaping the $(VAR_NAME) syntax: i.e.
+                                  "$$(VAR_NAME)" will produce the string literal "$(VAR_NAME)".
+                                  Escaped references will never be expanded, regardless of whether the variable
+                                  exists or not.
+                                  Defaults to "".
                                 type: string
                               valueFrom:
                                 description: Source for the environment variable's
@@ -4386,10 +5460,13 @@ spec:
                                         description: The key to select.
                                         type: string
                                       name:
-                                        description: 'Name of the referent. More info:
-                                          https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                                          TODO: Add other useful fields. apiVersion,
-                                          kind, uid?'
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
                                         type: string
                                       optional:
                                         description: Specify whether the ConfigMap
@@ -4398,12 +5475,11 @@ spec:
                                     required:
                                     - key
                                     type: object
+                                    x-kubernetes-map-type: atomic
                                   fieldRef:
-                                    description: 'Selects a field of the pod: supports
-                                      metadata.name, metadata.namespace, `metadata.labels[''<KEY>'']`,
-                                      `metadata.annotations[''<KEY>'']`, spec.nodeName,
-                                      spec.serviceAccountName, status.hostIP, status.podIP,
-                                      status.podIPs.'
+                                    description: |-
+                                      Selects a field of the pod: supports metadata.name, metadata.namespace, `metadata.labels['<KEY>']`, `metadata.annotations['<KEY>']`,
+                                      spec.nodeName, spec.serviceAccountName, status.hostIP, status.podIP, status.podIPs.
                                     properties:
                                       apiVersion:
                                         description: Version of the schema the FieldPath
@@ -4416,12 +5492,11 @@ spec:
                                     required:
                                     - fieldPath
                                     type: object
+                                    x-kubernetes-map-type: atomic
                                   resourceFieldRef:
-                                    description: 'Selects a resource of the container:
-                                      only resources limits and requests (limits.cpu,
-                                      limits.memory, limits.ephemeral-storage, requests.cpu,
-                                      requests.memory and requests.ephemeral-storage)
-                                      are currently supported.'
+                                    description: |-
+                                      Selects a resource of the container: only resources limits and requests
+                                      (limits.cpu, limits.memory, limits.ephemeral-storage, requests.cpu, requests.memory and requests.ephemeral-storage) are currently supported.
                                     properties:
                                       containerName:
                                         description: 'Container name: required for
@@ -4441,6 +5516,7 @@ spec:
                                     required:
                                     - resource
                                     type: object
+                                    x-kubernetes-map-type: atomic
                                   secretKeyRef:
                                     description: Selects a key of a secret in the
                                       pod's namespace
@@ -4450,10 +5526,13 @@ spec:
                                           from.  Must be a valid secret key.
                                         type: string
                                       name:
-                                        description: 'Name of the referent. More info:
-                                          https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                                          TODO: Add other useful fields. apiVersion,
-                                          kind, uid?'
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
                                         type: string
                                       optional:
                                         description: Specify whether the Secret or
@@ -4462,104 +5541,121 @@ spec:
                                     required:
                                     - key
                                     type: object
+                                    x-kubernetes-map-type: atomic
                                 type: object
                             required:
                             - name
                             type: object
                           type: array
+                          x-kubernetes-list-map-keys:
+                          - name
+                          x-kubernetes-list-type: map
                         envFrom:
-                          description: List of sources to populate environment variables
-                            in the container. The keys defined within a source must
-                            be a C_IDENTIFIER. All invalid keys will be reported as
-                            an event when the container is starting. When a key exists
-                            in multiple sources, the value associated with the last
-                            source will take precedence. Values defined by an Env
-                            with a duplicate key will take precedence. Cannot be updated.
+                          description: |-
+                            List of sources to populate environment variables in the container.
+                            The keys defined within a source must be a C_IDENTIFIER. All invalid keys
+                            will be reported as an event when the container is starting. When a key exists in multiple
+                            sources, the value associated with the last source will take precedence.
+                            Values defined by an Env with a duplicate key will take precedence.
+                            Cannot be updated.
                           items:
                             description: EnvFromSource represents the source of a
-                              set of ConfigMaps
+                              set of ConfigMaps or Secrets
                             properties:
                               configMapRef:
                                 description: The ConfigMap to select from
                                 properties:
                                   name:
-                                    description: 'Name of the referent. More info:
-                                      https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                                      TODO: Add other useful fields. apiVersion, kind,
-                                      uid?'
+                                    default: ""
+                                    description: |-
+                                      Name of the referent.
+                                      This field is effectively required, but due to backwards compatibility is
+                                      allowed to be empty. Instances of this type with an empty value here are
+                                      almost certainly wrong.
+                                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
                                     type: string
                                   optional:
                                     description: Specify whether the ConfigMap must
                                       be defined
                                     type: boolean
                                 type: object
+                                x-kubernetes-map-type: atomic
                               prefix:
-                                description: An optional identifier to prepend to
-                                  each key in the ConfigMap. Must be a C_IDENTIFIER.
+                                description: Optional text to prepend to the name
+                                  of each environment variable. Must be a C_IDENTIFIER.
                                 type: string
                               secretRef:
                                 description: The Secret to select from
                                 properties:
                                   name:
-                                    description: 'Name of the referent. More info:
-                                      https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                                      TODO: Add other useful fields. apiVersion, kind,
-                                      uid?'
+                                    default: ""
+                                    description: |-
+                                      Name of the referent.
+                                      This field is effectively required, but due to backwards compatibility is
+                                      allowed to be empty. Instances of this type with an empty value here are
+                                      almost certainly wrong.
+                                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
                                     type: string
                                   optional:
                                     description: Specify whether the Secret must be
                                       defined
                                     type: boolean
                                 type: object
+                                x-kubernetes-map-type: atomic
                             type: object
                           type: array
+                          x-kubernetes-list-type: atomic
                         image:
-                          description: 'Container image name. More info: https://kubernetes.io/docs/concepts/containers/images
-                            This field is optional to allow higher level config management
-                            to default or override container images in workload controllers
-                            like Deployments and StatefulSets.'
+                          description: |-
+                            Container image name.
+                            More info: https://kubernetes.io/docs/concepts/containers/images
+                            This field is optional to allow higher level config management to default or override
+                            container images in workload controllers like Deployments and StatefulSets.
                           type: string
                         imagePullPolicy:
-                          description: 'Image pull policy. One of Always, Never, IfNotPresent.
-                            Defaults to Always if :latest tag is specified, or IfNotPresent
-                            otherwise. Cannot be updated. More info: https://kubernetes.io/docs/concepts/containers/images#updating-images'
+                          description: |-
+                            Image pull policy.
+                            One of Always, Never, IfNotPresent.
+                            Defaults to Always if :latest tag is specified, or IfNotPresent otherwise.
+                            Cannot be updated.
+                            More info: https://kubernetes.io/docs/concepts/containers/images#updating-images
                           type: string
                         lifecycle:
-                          description: Actions that the management system should take
-                            in response to container lifecycle events. Cannot be updated.
+                          description: |-
+                            Actions that the management system should take in response to container lifecycle events.
+                            Cannot be updated.
                           properties:
                             postStart:
-                              description: 'PostStart is called immediately after
-                                a container is created. If the handler fails, the
-                                container is terminated and restarted according to
-                                its restart policy. Other management of the container
-                                blocks until the hook completes. More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks'
+                              description: |-
+                                PostStart is called immediately after a container is created. If the handler fails,
+                                the container is terminated and restarted according to its restart policy.
+                                Other management of the container blocks until the hook completes.
+                                More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
                               properties:
                                 exec:
-                                  description: Exec specifies the action to take.
+                                  description: Exec specifies a command to execute
+                                    in the container.
                                   properties:
                                     command:
-                                      description: Command is the command line to
-                                        execute inside the container, the working
-                                        directory for the command  is root ('/') in
-                                        the container's filesystem. The command is
-                                        simply exec'd, it is not run inside a shell,
-                                        so traditional shell instructions ('|', etc)
-                                        won't work. To use a shell, you need to explicitly
-                                        call out to that shell. Exit status of 0 is
-                                        treated as live/healthy and non-zero is unhealthy.
+                                      description: |-
+                                        Command is the command line to execute inside the container, the working directory for the
+                                        command  is root ('/') in the container's filesystem. The command is simply exec'd, it is
+                                        not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use
+                                        a shell, you need to explicitly call out to that shell.
+                                        Exit status of 0 is treated as live/healthy and non-zero is unhealthy.
                                       items:
                                         type: string
                                       type: array
+                                      x-kubernetes-list-type: atomic
                                   type: object
                                 httpGet:
-                                  description: HTTPGet specifies the http request
+                                  description: HTTPGet specifies an HTTP GET request
                                     to perform.
                                   properties:
                                     host:
-                                      description: Host name to connect to, defaults
-                                        to the pod IP. You probably want to set "Host"
-                                        in httpHeaders instead.
+                                      description: |-
+                                        Host name to connect to, defaults to the pod IP. You probably want to set
+                                        "Host" in httpHeaders instead.
                                       type: string
                                     httpHeaders:
                                       description: Custom headers to set in the request.
@@ -4569,7 +5665,9 @@ spec:
                                           header to be used in HTTP probes
                                         properties:
                                           name:
-                                            description: The header field name
+                                            description: |-
+                                              The header field name.
+                                              This will be canonicalized upon output, so case-variant names will be understood as the same header.
                                             type: string
                                           value:
                                             description: The header field value
@@ -4579,6 +5677,7 @@ spec:
                                         - value
                                         type: object
                                       type: array
+                                      x-kubernetes-list-type: atomic
                                     path:
                                       description: Path to access on the HTTP server.
                                       type: string
@@ -4586,23 +5685,36 @@ spec:
                                       anyOf:
                                       - type: integer
                                       - type: string
-                                      description: Name or number of the port to access
-                                        on the container. Number must be in the range
-                                        1 to 65535. Name must be an IANA_SVC_NAME.
+                                      description: |-
+                                        Name or number of the port to access on the container.
+                                        Number must be in the range 1 to 65535.
+                                        Name must be an IANA_SVC_NAME.
                                       x-kubernetes-int-or-string: true
                                     scheme:
-                                      description: Scheme to use for connecting to
-                                        the host. Defaults to HTTP.
+                                      description: |-
+                                        Scheme to use for connecting to the host.
+                                        Defaults to HTTP.
                                       type: string
                                   required:
                                   - port
                                   type: object
+                                sleep:
+                                  description: Sleep represents a duration that the
+                                    container should sleep.
+                                  properties:
+                                    seconds:
+                                      description: Seconds is the number of seconds
+                                        to sleep.
+                                      format: int64
+                                      type: integer
+                                  required:
+                                  - seconds
+                                  type: object
                                 tcpSocket:
-                                  description: Deprecated. TCPSocket is NOT supported
-                                    as a LifecycleHandler and kept for the backward
-                                    compatibility. There are no validation of this
-                                    field and lifecycle hooks will fail in runtime
-                                    when tcp handler is specified.
+                                  description: |-
+                                    Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
+                                    for backward compatibility. There is no validation of this field and
+                                    lifecycle hooks will fail at runtime when it is specified.
                                   properties:
                                     host:
                                       description: 'Optional: Host name to connect
@@ -4612,53 +5724,51 @@ spec:
                                       anyOf:
                                       - type: integer
                                       - type: string
-                                      description: Number or name of the port to access
-                                        on the container. Number must be in the range
-                                        1 to 65535. Name must be an IANA_SVC_NAME.
+                                      description: |-
+                                        Number or name of the port to access on the container.
+                                        Number must be in the range 1 to 65535.
+                                        Name must be an IANA_SVC_NAME.
                                       x-kubernetes-int-or-string: true
                                   required:
                                   - port
                                   type: object
                               type: object
                             preStop:
-                              description: 'PreStop is called immediately before a
-                                container is terminated due to an API request or management
-                                event such as liveness/startup probe failure, preemption,
-                                resource contention, etc. The handler is not called
-                                if the container crashes or exits. The Pod''s termination
-                                grace period countdown begins before the PreStop hook
-                                is executed. Regardless of the outcome of the handler,
-                                the container will eventually terminate within the
-                                Pod''s termination grace period (unless delayed by
-                                finalizers). Other management of the container blocks
-                                until the hook completes or until the termination
-                                grace period is reached. More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks'
+                              description: |-
+                                PreStop is called immediately before a container is terminated due to an
+                                API request or management event such as liveness/startup probe failure,
+                                preemption, resource contention, etc. The handler is not called if the
+                                container crashes or exits. The Pod's termination grace period countdown begins before the
+                                PreStop hook is executed. Regardless of the outcome of the handler, the
+                                container will eventually terminate within the Pod's termination grace
+                                period (unless delayed by finalizers). Other management of the container blocks until the hook completes
+                                or until the termination grace period is reached.
+                                More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
                               properties:
                                 exec:
-                                  description: Exec specifies the action to take.
+                                  description: Exec specifies a command to execute
+                                    in the container.
                                   properties:
                                     command:
-                                      description: Command is the command line to
-                                        execute inside the container, the working
-                                        directory for the command  is root ('/') in
-                                        the container's filesystem. The command is
-                                        simply exec'd, it is not run inside a shell,
-                                        so traditional shell instructions ('|', etc)
-                                        won't work. To use a shell, you need to explicitly
-                                        call out to that shell. Exit status of 0 is
-                                        treated as live/healthy and non-zero is unhealthy.
+                                      description: |-
+                                        Command is the command line to execute inside the container, the working directory for the
+                                        command  is root ('/') in the container's filesystem. The command is simply exec'd, it is
+                                        not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use
+                                        a shell, you need to explicitly call out to that shell.
+                                        Exit status of 0 is treated as live/healthy and non-zero is unhealthy.
                                       items:
                                         type: string
                                       type: array
+                                      x-kubernetes-list-type: atomic
                                   type: object
                                 httpGet:
-                                  description: HTTPGet specifies the http request
+                                  description: HTTPGet specifies an HTTP GET request
                                     to perform.
                                   properties:
                                     host:
-                                      description: Host name to connect to, defaults
-                                        to the pod IP. You probably want to set "Host"
-                                        in httpHeaders instead.
+                                      description: |-
+                                        Host name to connect to, defaults to the pod IP. You probably want to set
+                                        "Host" in httpHeaders instead.
                                       type: string
                                     httpHeaders:
                                       description: Custom headers to set in the request.
@@ -4668,7 +5778,9 @@ spec:
                                           header to be used in HTTP probes
                                         properties:
                                           name:
-                                            description: The header field name
+                                            description: |-
+                                              The header field name.
+                                              This will be canonicalized upon output, so case-variant names will be understood as the same header.
                                             type: string
                                           value:
                                             description: The header field value
@@ -4678,6 +5790,7 @@ spec:
                                         - value
                                         type: object
                                       type: array
+                                      x-kubernetes-list-type: atomic
                                     path:
                                       description: Path to access on the HTTP server.
                                       type: string
@@ -4685,23 +5798,36 @@ spec:
                                       anyOf:
                                       - type: integer
                                       - type: string
-                                      description: Name or number of the port to access
-                                        on the container. Number must be in the range
-                                        1 to 65535. Name must be an IANA_SVC_NAME.
+                                      description: |-
+                                        Name or number of the port to access on the container.
+                                        Number must be in the range 1 to 65535.
+                                        Name must be an IANA_SVC_NAME.
                                       x-kubernetes-int-or-string: true
                                     scheme:
-                                      description: Scheme to use for connecting to
-                                        the host. Defaults to HTTP.
+                                      description: |-
+                                        Scheme to use for connecting to the host.
+                                        Defaults to HTTP.
                                       type: string
                                   required:
                                   - port
                                   type: object
+                                sleep:
+                                  description: Sleep represents a duration that the
+                                    container should sleep.
+                                  properties:
+                                    seconds:
+                                      description: Seconds is the number of seconds
+                                        to sleep.
+                                      format: int64
+                                      type: integer
+                                  required:
+                                  - seconds
+                                  type: object
                                 tcpSocket:
-                                  description: Deprecated. TCPSocket is NOT supported
-                                    as a LifecycleHandler and kept for the backward
-                                    compatibility. There are no validation of this
-                                    field and lifecycle hooks will fail in runtime
-                                    when tcp handler is specified.
+                                  description: |-
+                                    Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
+                                    for backward compatibility. There is no validation of this field and
+                                    lifecycle hooks will fail at runtime when it is specified.
                                   properties:
                                     host:
                                       description: 'Optional: Host name to connect
@@ -4711,47 +5837,53 @@ spec:
                                       anyOf:
                                       - type: integer
                                       - type: string
-                                      description: Number or name of the port to access
-                                        on the container. Number must be in the range
-                                        1 to 65535. Name must be an IANA_SVC_NAME.
+                                      description: |-
+                                        Number or name of the port to access on the container.
+                                        Number must be in the range 1 to 65535.
+                                        Name must be an IANA_SVC_NAME.
                                       x-kubernetes-int-or-string: true
                                   required:
                                   - port
                                   type: object
                               type: object
+                            stopSignal:
+                              description: |-
+                                StopSignal defines which signal will be sent to a container when it is being stopped.
+                                If not specified, the default is defined by the container runtime in use.
+                                StopSignal can only be set for Pods with a non-empty .spec.os.name
+                              type: string
                           type: object
                         livenessProbe:
-                          description: 'Periodic probe of container liveness. Container
-                            will be restarted if the probe fails. Cannot be updated.
-                            More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
+                          description: |-
+                            Periodic probe of container liveness.
+                            Container will be restarted if the probe fails.
+                            Cannot be updated.
+                            More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
                           properties:
                             exec:
-                              description: Exec specifies the action to take.
+                              description: Exec specifies a command to execute in
+                                the container.
                               properties:
                                 command:
-                                  description: Command is the command line to execute
-                                    inside the container, the working directory for
-                                    the command  is root ('/') in the container's
-                                    filesystem. The command is simply exec'd, it is
-                                    not run inside a shell, so traditional shell instructions
-                                    ('|', etc) won't work. To use a shell, you need
-                                    to explicitly call out to that shell. Exit status
-                                    of 0 is treated as live/healthy and non-zero is
-                                    unhealthy.
+                                  description: |-
+                                    Command is the command line to execute inside the container, the working directory for the
+                                    command  is root ('/') in the container's filesystem. The command is simply exec'd, it is
+                                    not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use
+                                    a shell, you need to explicitly call out to that shell.
+                                    Exit status of 0 is treated as live/healthy and non-zero is unhealthy.
                                   items:
                                     type: string
                                   type: array
+                                  x-kubernetes-list-type: atomic
                               type: object
                             failureThreshold:
-                              description: Minimum consecutive failures for the probe
-                                to be considered failed after having succeeded. Defaults
-                                to 3. Minimum value is 1.
+                              description: |-
+                                Minimum consecutive failures for the probe to be considered failed after having succeeded.
+                                Defaults to 3. Minimum value is 1.
                               format: int32
                               type: integer
                             grpc:
-                              description: GRPC specifies an action involving a GRPC
-                                port. This is a beta field and requires enabling GRPCContainerProbe
-                                feature gate.
+                              description: GRPC specifies a GRPC HealthCheckRequest.
                               properties:
                                 port:
                                   description: Port number of the gRPC service. Number
@@ -4759,21 +5891,24 @@ spec:
                                   format: int32
                                   type: integer
                                 service:
-                                  description: "Service is the name of the service
-                                    to place in the gRPC HealthCheckRequest (see https://github.com/grpc/grpc/blob/master/doc/health-checking.md).
-                                    \n If this is not specified, the default behavior
-                                    is defined by gRPC."
+                                  default: ""
+                                  description: |-
+                                    Service is the name of the service to place in the gRPC HealthCheckRequest
+                                    (see https://github.com/grpc/grpc/blob/master/doc/health-checking.md).
+
+                                    If this is not specified, the default behavior is defined by gRPC.
                                   type: string
                               required:
                               - port
                               type: object
                             httpGet:
-                              description: HTTPGet specifies the http request to perform.
+                              description: HTTPGet specifies an HTTP GET request to
+                                perform.
                               properties:
                                 host:
-                                  description: Host name to connect to, defaults to
-                                    the pod IP. You probably want to set "Host" in
-                                    httpHeaders instead.
+                                  description: |-
+                                    Host name to connect to, defaults to the pod IP. You probably want to set
+                                    "Host" in httpHeaders instead.
                                   type: string
                                 httpHeaders:
                                   description: Custom headers to set in the request.
@@ -4783,7 +5918,9 @@ spec:
                                       to be used in HTTP probes
                                     properties:
                                       name:
-                                        description: The header field name
+                                        description: |-
+                                          The header field name.
+                                          This will be canonicalized upon output, so case-variant names will be understood as the same header.
                                         type: string
                                       value:
                                         description: The header field value
@@ -4793,6 +5930,7 @@ spec:
                                     - value
                                     type: object
                                   type: array
+                                  x-kubernetes-list-type: atomic
                                 path:
                                   description: Path to access on the HTTP server.
                                   type: string
@@ -4800,38 +5938,40 @@ spec:
                                   anyOf:
                                   - type: integer
                                   - type: string
-                                  description: Name or number of the port to access
-                                    on the container. Number must be in the range
-                                    1 to 65535. Name must be an IANA_SVC_NAME.
+                                  description: |-
+                                    Name or number of the port to access on the container.
+                                    Number must be in the range 1 to 65535.
+                                    Name must be an IANA_SVC_NAME.
                                   x-kubernetes-int-or-string: true
                                 scheme:
-                                  description: Scheme to use for connecting to the
-                                    host. Defaults to HTTP.
+                                  description: |-
+                                    Scheme to use for connecting to the host.
+                                    Defaults to HTTP.
                                   type: string
                               required:
                               - port
                               type: object
                             initialDelaySeconds:
-                              description: 'Number of seconds after the container
-                                has started before liveness probes are initiated.
-                                More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
+                              description: |-
+                                Number of seconds after the container has started before liveness probes are initiated.
+                                More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
                               format: int32
                               type: integer
                             periodSeconds:
-                              description: How often (in seconds) to perform the probe.
+                              description: |-
+                                How often (in seconds) to perform the probe.
                                 Default to 10 seconds. Minimum value is 1.
                               format: int32
                               type: integer
                             successThreshold:
-                              description: Minimum consecutive successes for the probe
-                                to be considered successful after having failed. Defaults
-                                to 1. Must be 1 for liveness and startup. Minimum
-                                value is 1.
+                              description: |-
+                                Minimum consecutive successes for the probe to be considered successful after having failed.
+                                Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
                               format: int32
                               type: integer
                             tcpSocket:
-                              description: TCPSocket specifies an action involving
-                                a TCP port.
+                              description: TCPSocket specifies a connection to a TCP
+                                port.
                               properties:
                                 host:
                                   description: 'Optional: Host name to connect to,
@@ -4841,60 +5981,59 @@ spec:
                                   anyOf:
                                   - type: integer
                                   - type: string
-                                  description: Number or name of the port to access
-                                    on the container. Number must be in the range
-                                    1 to 65535. Name must be an IANA_SVC_NAME.
+                                  description: |-
+                                    Number or name of the port to access on the container.
+                                    Number must be in the range 1 to 65535.
+                                    Name must be an IANA_SVC_NAME.
                                   x-kubernetes-int-or-string: true
                               required:
                               - port
                               type: object
                             terminationGracePeriodSeconds:
-                              description: Optional duration in seconds the pod needs
-                                to terminate gracefully upon probe failure. The grace
-                                period is the duration in seconds after the processes
-                                running in the pod are sent a termination signal and
-                                the time when the processes are forcibly halted with
-                                a kill signal. Set this value longer than the expected
-                                cleanup time for your process. If this value is nil,
-                                the pod's terminationGracePeriodSeconds will be used.
-                                Otherwise, this value overrides the value provided
-                                by the pod spec. Value must be non-negative integer.
-                                The value zero indicates stop immediately via the
-                                kill signal (no opportunity to shut down). This is
-                                a beta field and requires enabling ProbeTerminationGracePeriod
-                                feature gate. Minimum value is 1. spec.terminationGracePeriodSeconds
-                                is used if unset.
+                              description: |-
+                                Optional duration in seconds the pod needs to terminate gracefully upon probe failure.
+                                The grace period is the duration in seconds after the processes running in the pod are sent
+                                a termination signal and the time when the processes are forcibly halted with a kill signal.
+                                Set this value longer than the expected cleanup time for your process.
+                                If this value is nil, the pod's terminationGracePeriodSeconds will be used. Otherwise, this
+                                value overrides the value provided by the pod spec.
+                                Value must be non-negative integer. The value zero indicates stop immediately via
+                                the kill signal (no opportunity to shut down).
+                                This is a beta field and requires enabling ProbeTerminationGracePeriod feature gate.
+                                Minimum value is 1. spec.terminationGracePeriodSeconds is used if unset.
                               format: int64
                               type: integer
                             timeoutSeconds:
-                              description: 'Number of seconds after which the probe
-                                times out. Defaults to 1 second. Minimum value is
-                                1. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
+                              description: |-
+                                Number of seconds after which the probe times out.
+                                Defaults to 1 second. Minimum value is 1.
+                                More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
                               format: int32
                               type: integer
                           type: object
                         name:
-                          description: Name of the container specified as a DNS_LABEL.
+                          description: |-
+                            Name of the container specified as a DNS_LABEL.
                             Each container in a pod must have a unique name (DNS_LABEL).
                             Cannot be updated.
                           type: string
                         ports:
-                          description: List of ports to expose from the container.
-                            Exposing a port here gives the system additional information
-                            about the network connections a container uses, but is
-                            primarily informational. Not specifying a port here DOES
-                            NOT prevent that port from being exposed. Any port which
-                            is listening on the default "0.0.0.0" address inside a
-                            container will be accessible from the network. Cannot
-                            be updated.
+                          description: |-
+                            List of ports to expose from the container. Not specifying a port here
+                            DOES NOT prevent that port from being exposed. Any port which is
+                            listening on the default "0.0.0.0" address inside a container will be
+                            accessible from the network.
+                            Modifying this array with strategic merge patch may corrupt the data.
+                            For more information See https://github.com/kubernetes/kubernetes/issues/108255.
+                            Cannot be updated.
                           items:
                             description: ContainerPort represents a network port in
                               a single container.
                             properties:
                               containerPort:
-                                description: Number of port to expose on the pod's
-                                  IP address. This must be a valid port number, 0
-                                  < x < 65536.
+                                description: |-
+                                  Number of port to expose on the pod's IP address.
+                                  This must be a valid port number, 0 < x < 65536.
                                 format: int32
                                 type: integer
                               hostIP:
@@ -4902,23 +6041,24 @@ spec:
                                   to.
                                 type: string
                               hostPort:
-                                description: Number of port to expose on the host.
-                                  If specified, this must be a valid port number,
-                                  0 < x < 65536. If HostNetwork is specified, this
-                                  must match ContainerPort. Most containers do not
-                                  need this.
+                                description: |-
+                                  Number of port to expose on the host.
+                                  If specified, this must be a valid port number, 0 < x < 65536.
+                                  If HostNetwork is specified, this must match ContainerPort.
+                                  Most containers do not need this.
                                 format: int32
                                 type: integer
                               name:
-                                description: If specified, this must be an IANA_SVC_NAME
-                                  and unique within the pod. Each named port in a
-                                  pod must have a unique name. Name for the port that
-                                  can be referred to by services.
+                                description: |-
+                                  If specified, this must be an IANA_SVC_NAME and unique within the pod. Each
+                                  named port in a pod must have a unique name. Name for the port that can be
+                                  referred to by services.
                                 type: string
                               protocol:
                                 default: TCP
-                                description: Protocol for port. Must be UDP, TCP,
-                                  or SCTP. Defaults to "TCP".
+                                description: |-
+                                  Protocol for port. Must be UDP, TCP, or SCTP.
+                                  Defaults to "TCP".
                                 type: string
                             required:
                             - containerPort
@@ -4929,37 +6069,36 @@ spec:
                           - protocol
                           x-kubernetes-list-type: map
                         readinessProbe:
-                          description: 'Periodic probe of container service readiness.
-                            Container will be removed from service endpoints if the
-                            probe fails. Cannot be updated. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
+                          description: |-
+                            Periodic probe of container service readiness.
+                            Container will be removed from service endpoints if the probe fails.
+                            Cannot be updated.
+                            More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
                           properties:
                             exec:
-                              description: Exec specifies the action to take.
+                              description: Exec specifies a command to execute in
+                                the container.
                               properties:
                                 command:
-                                  description: Command is the command line to execute
-                                    inside the container, the working directory for
-                                    the command  is root ('/') in the container's
-                                    filesystem. The command is simply exec'd, it is
-                                    not run inside a shell, so traditional shell instructions
-                                    ('|', etc) won't work. To use a shell, you need
-                                    to explicitly call out to that shell. Exit status
-                                    of 0 is treated as live/healthy and non-zero is
-                                    unhealthy.
+                                  description: |-
+                                    Command is the command line to execute inside the container, the working directory for the
+                                    command  is root ('/') in the container's filesystem. The command is simply exec'd, it is
+                                    not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use
+                                    a shell, you need to explicitly call out to that shell.
+                                    Exit status of 0 is treated as live/healthy and non-zero is unhealthy.
                                   items:
                                     type: string
                                   type: array
+                                  x-kubernetes-list-type: atomic
                               type: object
                             failureThreshold:
-                              description: Minimum consecutive failures for the probe
-                                to be considered failed after having succeeded. Defaults
-                                to 3. Minimum value is 1.
+                              description: |-
+                                Minimum consecutive failures for the probe to be considered failed after having succeeded.
+                                Defaults to 3. Minimum value is 1.
                               format: int32
                               type: integer
                             grpc:
-                              description: GRPC specifies an action involving a GRPC
-                                port. This is a beta field and requires enabling GRPCContainerProbe
-                                feature gate.
+                              description: GRPC specifies a GRPC HealthCheckRequest.
                               properties:
                                 port:
                                   description: Port number of the gRPC service. Number
@@ -4967,21 +6106,24 @@ spec:
                                   format: int32
                                   type: integer
                                 service:
-                                  description: "Service is the name of the service
-                                    to place in the gRPC HealthCheckRequest (see https://github.com/grpc/grpc/blob/master/doc/health-checking.md).
-                                    \n If this is not specified, the default behavior
-                                    is defined by gRPC."
+                                  default: ""
+                                  description: |-
+                                    Service is the name of the service to place in the gRPC HealthCheckRequest
+                                    (see https://github.com/grpc/grpc/blob/master/doc/health-checking.md).
+
+                                    If this is not specified, the default behavior is defined by gRPC.
                                   type: string
                               required:
                               - port
                               type: object
                             httpGet:
-                              description: HTTPGet specifies the http request to perform.
+                              description: HTTPGet specifies an HTTP GET request to
+                                perform.
                               properties:
                                 host:
-                                  description: Host name to connect to, defaults to
-                                    the pod IP. You probably want to set "Host" in
-                                    httpHeaders instead.
+                                  description: |-
+                                    Host name to connect to, defaults to the pod IP. You probably want to set
+                                    "Host" in httpHeaders instead.
                                   type: string
                                 httpHeaders:
                                   description: Custom headers to set in the request.
@@ -4991,7 +6133,9 @@ spec:
                                       to be used in HTTP probes
                                     properties:
                                       name:
-                                        description: The header field name
+                                        description: |-
+                                          The header field name.
+                                          This will be canonicalized upon output, so case-variant names will be understood as the same header.
                                         type: string
                                       value:
                                         description: The header field value
@@ -5001,6 +6145,7 @@ spec:
                                     - value
                                     type: object
                                   type: array
+                                  x-kubernetes-list-type: atomic
                                 path:
                                   description: Path to access on the HTTP server.
                                   type: string
@@ -5008,38 +6153,40 @@ spec:
                                   anyOf:
                                   - type: integer
                                   - type: string
-                                  description: Name or number of the port to access
-                                    on the container. Number must be in the range
-                                    1 to 65535. Name must be an IANA_SVC_NAME.
+                                  description: |-
+                                    Name or number of the port to access on the container.
+                                    Number must be in the range 1 to 65535.
+                                    Name must be an IANA_SVC_NAME.
                                   x-kubernetes-int-or-string: true
                                 scheme:
-                                  description: Scheme to use for connecting to the
-                                    host. Defaults to HTTP.
+                                  description: |-
+                                    Scheme to use for connecting to the host.
+                                    Defaults to HTTP.
                                   type: string
                               required:
                               - port
                               type: object
                             initialDelaySeconds:
-                              description: 'Number of seconds after the container
-                                has started before liveness probes are initiated.
-                                More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
+                              description: |-
+                                Number of seconds after the container has started before liveness probes are initiated.
+                                More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
                               format: int32
                               type: integer
                             periodSeconds:
-                              description: How often (in seconds) to perform the probe.
+                              description: |-
+                                How often (in seconds) to perform the probe.
                                 Default to 10 seconds. Minimum value is 1.
                               format: int32
                               type: integer
                             successThreshold:
-                              description: Minimum consecutive successes for the probe
-                                to be considered successful after having failed. Defaults
-                                to 1. Must be 1 for liveness and startup. Minimum
-                                value is 1.
+                              description: |-
+                                Minimum consecutive successes for the probe to be considered successful after having failed.
+                                Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
                               format: int32
                               type: integer
                             tcpSocket:
-                              description: TCPSocket specifies an action involving
-                                a TCP port.
+                              description: TCPSocket specifies a connection to a TCP
+                                port.
                               properties:
                                 host:
                                   description: 'Optional: Host name to connect to,
@@ -5049,42 +6196,96 @@ spec:
                                   anyOf:
                                   - type: integer
                                   - type: string
-                                  description: Number or name of the port to access
-                                    on the container. Number must be in the range
-                                    1 to 65535. Name must be an IANA_SVC_NAME.
+                                  description: |-
+                                    Number or name of the port to access on the container.
+                                    Number must be in the range 1 to 65535.
+                                    Name must be an IANA_SVC_NAME.
                                   x-kubernetes-int-or-string: true
                               required:
                               - port
                               type: object
                             terminationGracePeriodSeconds:
-                              description: Optional duration in seconds the pod needs
-                                to terminate gracefully upon probe failure. The grace
-                                period is the duration in seconds after the processes
-                                running in the pod are sent a termination signal and
-                                the time when the processes are forcibly halted with
-                                a kill signal. Set this value longer than the expected
-                                cleanup time for your process. If this value is nil,
-                                the pod's terminationGracePeriodSeconds will be used.
-                                Otherwise, this value overrides the value provided
-                                by the pod spec. Value must be non-negative integer.
-                                The value zero indicates stop immediately via the
-                                kill signal (no opportunity to shut down). This is
-                                a beta field and requires enabling ProbeTerminationGracePeriod
-                                feature gate. Minimum value is 1. spec.terminationGracePeriodSeconds
-                                is used if unset.
+                              description: |-
+                                Optional duration in seconds the pod needs to terminate gracefully upon probe failure.
+                                The grace period is the duration in seconds after the processes running in the pod are sent
+                                a termination signal and the time when the processes are forcibly halted with a kill signal.
+                                Set this value longer than the expected cleanup time for your process.
+                                If this value is nil, the pod's terminationGracePeriodSeconds will be used. Otherwise, this
+                                value overrides the value provided by the pod spec.
+                                Value must be non-negative integer. The value zero indicates stop immediately via
+                                the kill signal (no opportunity to shut down).
+                                This is a beta field and requires enabling ProbeTerminationGracePeriod feature gate.
+                                Minimum value is 1. spec.terminationGracePeriodSeconds is used if unset.
                               format: int64
                               type: integer
                             timeoutSeconds:
-                              description: 'Number of seconds after which the probe
-                                times out. Defaults to 1 second. Minimum value is
-                                1. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
+                              description: |-
+                                Number of seconds after which the probe times out.
+                                Defaults to 1 second. Minimum value is 1.
+                                More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
                               format: int32
                               type: integer
                           type: object
+                        resizePolicy:
+                          description: Resources resize policy for the container.
+                          items:
+                            description: ContainerResizePolicy represents resource
+                              resize policy for the container.
+                            properties:
+                              resourceName:
+                                description: |-
+                                  Name of the resource to which this resource resize policy applies.
+                                  Supported values: cpu, memory.
+                                type: string
+                              restartPolicy:
+                                description: |-
+                                  Restart policy to apply when specified resource is resized.
+                                  If not specified, it defaults to NotRequired.
+                                type: string
+                            required:
+                            - resourceName
+                            - restartPolicy
+                            type: object
+                          type: array
+                          x-kubernetes-list-type: atomic
                         resources:
-                          description: 'Compute Resources required by this container.
-                            Cannot be updated. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
+                          description: |-
+                            Compute Resources required by this container.
+                            Cannot be updated.
+                            More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
                           properties:
+                            claims:
+                              description: |-
+                                Claims lists the names of resources, defined in spec.resourceClaims,
+                                that are used by this container.
+
+                                This is an alpha field and requires enabling the
+                                DynamicResourceAllocation feature gate.
+
+                                This field is immutable. It can only be set for containers.
+                              items:
+                                description: ResourceClaim references one entry in
+                                  PodSpec.ResourceClaims.
+                                properties:
+                                  name:
+                                    description: |-
+                                      Name must match the name of one entry in pod.spec.resourceClaims of
+                                      the Pod where this field is used. It makes that resource available
+                                      inside a container.
+                                    type: string
+                                  request:
+                                    description: |-
+                                      Request is the name chosen for a request in the referenced claim.
+                                      If empty, everything from the claim is made available, otherwise
+                                      only the result of this request.
+                                    type: string
+                                required:
+                                - name
+                                type: object
+                              type: array
+                              x-kubernetes-list-map-keys:
+                              - name
+                              x-kubernetes-list-type: map
                             limits:
                               additionalProperties:
                                 anyOf:
@@ -5092,8 +6293,9 @@ spec:
                                 - type: string
                                 pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
                                 x-kubernetes-int-or-string: true
-                              description: 'Limits describes the maximum amount of
-                                compute resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
+                              description: |-
+                                Limits describes the maximum amount of compute resources allowed.
+                                More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
                               type: object
                             requests:
                               additionalProperties:
@@ -5102,33 +6304,76 @@ spec:
                                 - type: string
                                 pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
                                 x-kubernetes-int-or-string: true
-                              description: 'Requests describes the minimum amount
-                                of compute resources required. If Requests is omitted
-                                for a container, it defaults to Limits if that is
-                                explicitly specified, otherwise to an implementation-defined
-                                value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
+                              description: |-
+                                Requests describes the minimum amount of compute resources required.
+                                If Requests is omitted for a container, it defaults to Limits if that is explicitly specified,
+                                otherwise to an implementation-defined value. Requests cannot exceed Limits.
+                                More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
                               type: object
                           type: object
+                        restartPolicy:
+                          description: |-
+                            RestartPolicy defines the restart behavior of individual containers in a pod.
+                            This field may only be set for init containers, and the only allowed value is "Always".
+                            For non-init containers or when this field is not specified,
+                            the restart behavior is defined by the Pod's restart policy and the container type.
+                            Setting the RestartPolicy as "Always" for the init container will have the following effect:
+                            this init container will be continually restarted on
+                            exit until all regular containers have terminated. Once all regular
+                            containers have completed, all init containers with restartPolicy "Always"
+                            will be shut down. This lifecycle differs from normal init containers and
+                            is often referred to as a "sidecar" container. Although this init
+                            container still starts in the init container sequence, it does not wait
+                            for the container to complete before proceeding to the next init
+                            container. Instead, the next init container starts immediately after this
+                            init container is started, or after any startupProbe has successfully
+                            completed.
+                          type: string
                         securityContext:
-                          description: 'SecurityContext defines the security options
-                            the container should be run with. If set, the fields of
-                            SecurityContext override the equivalent fields of PodSecurityContext.
-                            More info: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/'
+                          description: |-
+                            SecurityContext defines the security options the container should be run with.
+                            If set, the fields of SecurityContext override the equivalent fields of PodSecurityContext.
+                            More info: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/
                           properties:
                             allowPrivilegeEscalation:
-                              description: 'AllowPrivilegeEscalation controls whether
-                                a process can gain more privileges than its parent
-                                process. This bool directly controls if the no_new_privs
-                                flag will be set on the container process. AllowPrivilegeEscalation
-                                is true always when the container is: 1) run as Privileged
-                                2) has CAP_SYS_ADMIN Note that this field cannot be
-                                set when spec.os.name is windows.'
+                              description: |-
+                                AllowPrivilegeEscalation controls whether a process can gain more
+                                privileges than its parent process. This bool directly controls if
+                                the no_new_privs flag will be set on the container process.
+                                AllowPrivilegeEscalation is true always when the container is:
+                                1) run as Privileged
+                                2) has CAP_SYS_ADMIN
+                                Note that this field cannot be set when spec.os.name is windows.
                               type: boolean
+                            appArmorProfile:
+                              description: |-
+                                appArmorProfile is the AppArmor options to use by this container. If set, this profile
+                                overrides the pod's appArmorProfile.
+                                Note that this field cannot be set when spec.os.name is windows.
+                              properties:
+                                localhostProfile:
+                                  description: |-
+                                    localhostProfile indicates a profile loaded on the node that should be used.
+                                    The profile must be preconfigured on the node to work.
+                                    Must match the loaded name of the profile.
+                                    Must be set if and only if type is "Localhost".
+                                  type: string
+                                type:
+                                  description: |-
+                                    type indicates which kind of AppArmor profile will be applied.
+                                    Valid options are:
+                                      Localhost - a profile pre-loaded on the node.
+                                      RuntimeDefault - the container runtime's default profile.
+                                      Unconfined - no AppArmor enforcement.
+                                  type: string
+                              required:
+                              - type
+                              type: object
                             capabilities:
-                              description: The capabilities to add/drop when running
-                                containers. Defaults to the default set of capabilities
-                                granted by the container runtime. Note that this field
-                                cannot be set when spec.os.name is windows.
+                              description: |-
+                                The capabilities to add/drop when running containers.
+                                Defaults to the default set of capabilities granted by the container runtime.
+                                Note that this field cannot be set when spec.os.name is windows.
                               properties:
                                 add:
                                   description: Added capabilities
@@ -5137,6 +6382,7 @@ spec:
                                       type
                                     type: string
                                   type: array
+                                  x-kubernetes-list-type: atomic
                                 drop:
                                   description: Removed capabilities
                                   items:
@@ -5144,64 +6390,63 @@ spec:
                                       type
                                     type: string
                                   type: array
+                                  x-kubernetes-list-type: atomic
                               type: object
                             privileged:
-                              description: Run container in privileged mode. Processes
-                                in privileged containers are essentially equivalent
-                                to root on the host. Defaults to false. Note that
-                                this field cannot be set when spec.os.name is windows.
+                              description: |-
+                                Run container in privileged mode.
+                                Processes in privileged containers are essentially equivalent to root on the host.
+                                Defaults to false.
+                                Note that this field cannot be set when spec.os.name is windows.
                               type: boolean
                             procMount:
-                              description: procMount denotes the type of proc mount
-                                to use for the containers. The default is DefaultProcMount
-                                which uses the container runtime defaults for readonly
-                                paths and masked paths. This requires the ProcMountType
-                                feature flag to be enabled. Note that this field cannot
-                                be set when spec.os.name is windows.
+                              description: |-
+                                procMount denotes the type of proc mount to use for the containers.
+                                The default value is Default which uses the container runtime defaults for
+                                readonly paths and masked paths.
+                                This requires the ProcMountType feature flag to be enabled.
+                                Note that this field cannot be set when spec.os.name is windows.
                               type: string
                             readOnlyRootFilesystem:
-                              description: Whether this container has a read-only
-                                root filesystem. Default is false. Note that this
-                                field cannot be set when spec.os.name is windows.
+                              description: |-
+                                Whether this container has a read-only root filesystem.
+                                Default is false.
+                                Note that this field cannot be set when spec.os.name is windows.
                               type: boolean
                             runAsGroup:
-                              description: The GID to run the entrypoint of the container
-                                process. Uses runtime default if unset. May also be
-                                set in PodSecurityContext.  If set in both SecurityContext
-                                and PodSecurityContext, the value specified in SecurityContext
-                                takes precedence. Note that this field cannot be set
-                                when spec.os.name is windows.
+                              description: |-
+                                The GID to run the entrypoint of the container process.
+                                Uses runtime default if unset.
+                                May also be set in PodSecurityContext.  If set in both SecurityContext and
+                                PodSecurityContext, the value specified in SecurityContext takes precedence.
+                                Note that this field cannot be set when spec.os.name is windows.
                               format: int64
                               type: integer
                             runAsNonRoot:
-                              description: Indicates that the container must run as
-                                a non-root user. If true, the Kubelet will validate
-                                the image at runtime to ensure that it does not run
-                                as UID 0 (root) and fail to start the container if
-                                it does. If unset or false, no such validation will
-                                be performed. May also be set in PodSecurityContext.  If
-                                set in both SecurityContext and PodSecurityContext,
-                                the value specified in SecurityContext takes precedence.
+                              description: |-
+                                Indicates that the container must run as a non-root user.
+                                If true, the Kubelet will validate the image at runtime to ensure that it
+                                does not run as UID 0 (root) and fail to start the container if it does.
+                                If unset or false, no such validation will be performed.
+                                May also be set in PodSecurityContext.  If set in both SecurityContext and
+                                PodSecurityContext, the value specified in SecurityContext takes precedence.
                               type: boolean
                             runAsUser:
-                              description: The UID to run the entrypoint of the container
-                                process. Defaults to user specified in image metadata
-                                if unspecified. May also be set in PodSecurityContext.  If
-                                set in both SecurityContext and PodSecurityContext,
-                                the value specified in SecurityContext takes precedence.
-                                Note that this field cannot be set when spec.os.name
-                                is windows.
+                              description: |-
+                                The UID to run the entrypoint of the container process.
+                                Defaults to user specified in image metadata if unspecified.
+                                May also be set in PodSecurityContext.  If set in both SecurityContext and
+                                PodSecurityContext, the value specified in SecurityContext takes precedence.
+                                Note that this field cannot be set when spec.os.name is windows.
                               format: int64
                               type: integer
                             seLinuxOptions:
-                              description: The SELinux context to be applied to the
-                                container. If unspecified, the container runtime will
-                                allocate a random SELinux context for each container.  May
-                                also be set in PodSecurityContext.  If set in both
-                                SecurityContext and PodSecurityContext, the value
-                                specified in SecurityContext takes precedence. Note
-                                that this field cannot be set when spec.os.name is
-                                windows.
+                              description: |-
+                                The SELinux context to be applied to the container.
+                                If unspecified, the container runtime will allocate a random SELinux context for each
+                                container.  May also be set in PodSecurityContext.  If set in both SecurityContext and
+                                PodSecurityContext, the value specified in SecurityContext takes precedence.
+                                Note that this field cannot be set when spec.os.name is windows.
                               properties:
                                 level:
                                   description: Level is SELinux level label that applies
@@ -5221,110 +6466,98 @@ spec:
                                   type: string
                               type: object
                             seccompProfile:
-                              description: The seccomp options to use by this container.
-                                If seccomp options are provided at both the pod &
-                                container level, the container options override the
-                                pod options. Note that this field cannot be set when
-                                spec.os.name is windows.
+                              description: |-
+                                The seccomp options to use by this container. If seccomp options are
+                                provided at both the pod & container level, the container options
+                                override the pod options.
+                                Note that this field cannot be set when spec.os.name is windows.
                               properties:
                                 localhostProfile:
-                                  description: localhostProfile indicates a profile
-                                    defined in a file on the node should be used.
-                                    The profile must be preconfigured on the node
-                                    to work. Must be a descending path, relative to
-                                    the kubelet's configured seccomp profile location.
-                                    Must only be set if type is "Localhost".
+                                  description: |-
+                                    localhostProfile indicates a profile defined in a file on the node should be used.
+                                    The profile must be preconfigured on the node to work.
+                                    Must be a descending path, relative to the kubelet's configured seccomp profile location.
+                                    Must be set if type is "Localhost". Must NOT be set for any other type.
                                   type: string
                                 type:
-                                  description: "type indicates which kind of seccomp
-                                    profile will be applied. Valid options are: \n
-                                    Localhost - a profile defined in a file on the
-                                    node should be used. RuntimeDefault - the container
-                                    runtime default profile should be used. Unconfined
-                                    - no profile should be applied."
+                                  description: |-
+                                    type indicates which kind of seccomp profile will be applied.
+                                    Valid options are:
+
+                                    Localhost - a profile defined in a file on the node should be used.
+                                    RuntimeDefault - the container runtime default profile should be used.
+                                    Unconfined - no profile should be applied.
                                   type: string
                               required:
                               - type
                               type: object
                             windowsOptions:
-                              description: The Windows specific settings applied to
-                                all containers. If unspecified, the options from the
-                                PodSecurityContext will be used. If set in both SecurityContext
-                                and PodSecurityContext, the value specified in SecurityContext
-                                takes precedence. Note that this field cannot be set
-                                when spec.os.name is linux.
+                              description: |-
+                                The Windows specific settings applied to all containers.
+                                If unspecified, the options from the PodSecurityContext will be used.
+                                If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence.
+                                Note that this field cannot be set when spec.os.name is linux.
                               properties:
                                 gmsaCredentialSpec:
-                                  description: GMSACredentialSpec is where the GMSA
-                                    admission webhook (https://github.com/kubernetes-sigs/windows-gmsa)
-                                    inlines the contents of the GMSA credential spec
-                                    named by the GMSACredentialSpecName field.
+                                  description: |-
+                                    GMSACredentialSpec is where the GMSA admission webhook
+                                    (https://github.com/kubernetes-sigs/windows-gmsa) inlines the contents of the
+                                    GMSA credential spec named by the GMSACredentialSpecName field.
                                   type: string
                                 gmsaCredentialSpecName:
                                   description: GMSACredentialSpecName is the name
                                     of the GMSA credential spec to use.
                                   type: string
                                 hostProcess:
-                                  description: HostProcess determines if a container
-                                    should be run as a 'Host Process' container. This
-                                    field is alpha-level and will only be honored
-                                    by components that enable the WindowsHostProcessContainers
-                                    feature flag. Setting this field without the feature
-                                    flag will result in errors when validating the
-                                    Pod. All of a Pod's containers must have the same
-                                    effective HostProcess value (it is not allowed
-                                    to have a mix of HostProcess containers and non-HostProcess
-                                    containers).  In addition, if HostProcess is true
-                                    then HostNetwork must also be set to true.
+                                  description: |-
+                                    HostProcess determines if a container should be run as a 'Host Process' container.
+                                    All of a Pod's containers must have the same effective HostProcess value
+                                    (it is not allowed to have a mix of HostProcess containers and non-HostProcess containers).
+                                    In addition, if HostProcess is true then HostNetwork must also be set to true.
                                   type: boolean
                                 runAsUserName:
-                                  description: The UserName in Windows to run the
-                                    entrypoint of the container process. Defaults
-                                    to the user specified in image metadata if unspecified.
-                                    May also be set in PodSecurityContext. If set
-                                    in both SecurityContext and PodSecurityContext,
-                                    the value specified in SecurityContext takes precedence.
+                                  description: |-
+                                    The UserName in Windows to run the entrypoint of the container process.
+                                    Defaults to the user specified in image metadata if unspecified.
+                                    May also be set in PodSecurityContext. If set in both SecurityContext and
+                                    PodSecurityContext, the value specified in SecurityContext takes precedence.
                                   type: string
                               type: object
                           type: object
                         startupProbe:
-                          description: 'StartupProbe indicates that the Pod has successfully
-                            initialized. If specified, no other probes are executed
-                            until this completes successfully. If this probe fails,
-                            the Pod will be restarted, just as if the livenessProbe
-                            failed. This can be used to provide different probe parameters
-                            at the beginning of a Pod''s lifecycle, when it might
-                            take a long time to load data or warm a cache, than during
-                            steady-state operation. This cannot be updated. More info:
-                            https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
+                          description: |-
+                            StartupProbe indicates that the Pod has successfully initialized.
+                            If specified, no other probes are executed until this completes successfully.
+                            If this probe fails, the Pod will be restarted, just as if the livenessProbe failed.
+                            This can be used to provide different probe parameters at the beginning of a Pod's lifecycle,
+                            when it might take a long time to load data or warm a cache, than during steady-state operation.
+                            This cannot be updated.
+                            More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
                           properties:
                             exec:
-                              description: Exec specifies the action to take.
+                              description: Exec specifies a command to execute in
+                                the container.
                               properties:
                                 command:
-                                  description: Command is the command line to execute
-                                    inside the container, the working directory for
-                                    the command  is root ('/') in the container's
-                                    filesystem. The command is simply exec'd, it is
-                                    not run inside a shell, so traditional shell instructions
-                                    ('|', etc) won't work. To use a shell, you need
-                                    to explicitly call out to that shell. Exit status
-                                    of 0 is treated as live/healthy and non-zero is
-                                    unhealthy.
+                                  description: |-
+                                    Command is the command line to execute inside the container, the working directory for the
+                                    command  is root ('/') in the container's filesystem. The command is simply exec'd, it is
+                                    not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use
+                                    a shell, you need to explicitly call out to that shell.
+                                    Exit status of 0 is treated as live/healthy and non-zero is unhealthy.
                                   items:
                                     type: string
                                   type: array
+                                  x-kubernetes-list-type: atomic
                               type: object
                             failureThreshold:
-                              description: Minimum consecutive failures for the probe
-                                to be considered failed after having succeeded. Defaults
-                                to 3. Minimum value is 1.
+                              description: |-
+                                Minimum consecutive failures for the probe to be considered failed after having succeeded.
+                                Defaults to 3. Minimum value is 1.
                               format: int32
                               type: integer
                             grpc:
-                              description: GRPC specifies an action involving a GRPC
-                                port. This is a beta field and requires enabling GRPCContainerProbe
-                                feature gate.
+                              description: GRPC specifies a GRPC HealthCheckRequest.
                               properties:
                                 port:
                                   description: Port number of the gRPC service. Number
@@ -5332,21 +6565,24 @@ spec:
                                   format: int32
                                   type: integer
                                 service:
-                                  description: "Service is the name of the service
-                                    to place in the gRPC HealthCheckRequest (see https://github.com/grpc/grpc/blob/master/doc/health-checking.md).
-                                    \n If this is not specified, the default behavior
-                                    is defined by gRPC."
+                                  default: ""
+                                  description: |-
+                                    Service is the name of the service to place in the gRPC HealthCheckRequest
+                                    (see https://github.com/grpc/grpc/blob/master/doc/health-checking.md).
+
+                                    If this is not specified, the default behavior is defined by gRPC.
                                   type: string
                               required:
                               - port
                               type: object
                             httpGet:
-                              description: HTTPGet specifies the http request to perform.
+                              description: HTTPGet specifies an HTTP GET request to
+                                perform.
                               properties:
                                 host:
-                                  description: Host name to connect to, defaults to
-                                    the pod IP. You probably want to set "Host" in
-                                    httpHeaders instead.
+                                  description: |-
+                                    Host name to connect to, defaults to the pod IP. You probably want to set
+                                    "Host" in httpHeaders instead.
                                   type: string
                                 httpHeaders:
                                   description: Custom headers to set in the request.
@@ -5356,7 +6592,9 @@ spec:
                                       to be used in HTTP probes
                                     properties:
                                       name:
-                                        description: The header field name
+                                        description: |-
+                                          The header field name.
+                                          This will be canonicalized upon output, so case-variant names will be understood as the same header.
                                         type: string
                                       value:
                                         description: The header field value
@@ -5366,6 +6604,7 @@ spec:
                                     - value
                                     type: object
                                   type: array
+                                  x-kubernetes-list-type: atomic
                                 path:
                                   description: Path to access on the HTTP server.
                                   type: string
@@ -5373,38 +6612,40 @@ spec:
                                   anyOf:
                                   - type: integer
                                   - type: string
-                                  description: Name or number of the port to access
-                                    on the container. Number must be in the range
-                                    1 to 65535. Name must be an IANA_SVC_NAME.
+                                  description: |-
+                                    Name or number of the port to access on the container.
+                                    Number must be in the range 1 to 65535.
+                                    Name must be an IANA_SVC_NAME.
                                   x-kubernetes-int-or-string: true
                                 scheme:
-                                  description: Scheme to use for connecting to the
-                                    host. Defaults to HTTP.
+                                  description: |-
+                                    Scheme to use for connecting to the host.
+                                    Defaults to HTTP.
                                   type: string
                               required:
                               - port
                               type: object
                             initialDelaySeconds:
-                              description: 'Number of seconds after the container
-                                has started before liveness probes are initiated.
-                                More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
+                              description: |-
+                                Number of seconds after the container has started before liveness probes are initiated.
+                                More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
                               format: int32
                               type: integer
                             periodSeconds:
-                              description: How often (in seconds) to perform the probe.
+                              description: |-
+                                How often (in seconds) to perform the probe.
                                 Default to 10 seconds. Minimum value is 1.
                               format: int32
                               type: integer
                             successThreshold:
-                              description: Minimum consecutive successes for the probe
-                                to be considered successful after having failed. Defaults
-                                to 1. Must be 1 for liveness and startup. Minimum
-                                value is 1.
+                              description: |-
+                                Minimum consecutive successes for the probe to be considered successful after having failed.
+                                Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
                               format: int32
                               type: integer
                             tcpSocket:
-                              description: TCPSocket specifies an action involving
-                                a TCP port.
+                              description: TCPSocket specifies a connection to a TCP
+                                port.
                               properties:
                                 host:
                                   description: 'Optional: Host name to connect to,
@@ -5414,81 +6655,76 @@ spec:
                                   anyOf:
                                   - type: integer
                                   - type: string
-                                  description: Number or name of the port to access
-                                    on the container. Number must be in the range
-                                    1 to 65535. Name must be an IANA_SVC_NAME.
+                                  description: |-
+                                    Number or name of the port to access on the container.
+                                    Number must be in the range 1 to 65535.
+                                    Name must be an IANA_SVC_NAME.
                                   x-kubernetes-int-or-string: true
                               required:
                               - port
                               type: object
                             terminationGracePeriodSeconds:
-                              description: Optional duration in seconds the pod needs
-                                to terminate gracefully upon probe failure. The grace
-                                period is the duration in seconds after the processes
-                                running in the pod are sent a termination signal and
-                                the time when the processes are forcibly halted with
-                                a kill signal. Set this value longer than the expected
-                                cleanup time for your process. If this value is nil,
-                                the pod's terminationGracePeriodSeconds will be used.
-                                Otherwise, this value overrides the value provided
-                                by the pod spec. Value must be non-negative integer.
-                                The value zero indicates stop immediately via the
-                                kill signal (no opportunity to shut down). This is
-                                a beta field and requires enabling ProbeTerminationGracePeriod
-                                feature gate. Minimum value is 1. spec.terminationGracePeriodSeconds
-                                is used if unset.
+                              description: |-
+                                Optional duration in seconds the pod needs to terminate gracefully upon probe failure.
+                                The grace period is the duration in seconds after the processes running in the pod are sent
+                                a termination signal and the time when the processes are forcibly halted with a kill signal.
+                                Set this value longer than the expected cleanup time for your process.
+                                If this value is nil, the pod's terminationGracePeriodSeconds will be used. Otherwise, this
+                                value overrides the value provided by the pod spec.
+                                Value must be non-negative integer. The value zero indicates stop immediately via
+                                the kill signal (no opportunity to shut down).
+                                This is a beta field and requires enabling ProbeTerminationGracePeriod feature gate.
+                                Minimum value is 1. spec.terminationGracePeriodSeconds is used if unset.
                               format: int64
                               type: integer
                             timeoutSeconds:
-                              description: 'Number of seconds after which the probe
-                                times out. Defaults to 1 second. Minimum value is
-                                1. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
+                              description: |-
+                                Number of seconds after which the probe times out.
+                                Defaults to 1 second. Minimum value is 1.
+                                More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
                               format: int32
                               type: integer
                           type: object
                         stdin:
-                          description: Whether this container should allocate a buffer
-                            for stdin in the container runtime. If this is not set,
-                            reads from stdin in the container will always result in
-                            EOF. Default is false.
+                          description: |-
+                            Whether this container should allocate a buffer for stdin in the container runtime. If this
+                            is not set, reads from stdin in the container will always result in EOF.
+                            Default is false.
                           type: boolean
                         stdinOnce:
-                          description: Whether the container runtime should close
-                            the stdin channel after it has been opened by a single
-                            attach. When stdin is true the stdin stream will remain
-                            open across multiple attach sessions. If stdinOnce is
-                            set to true, stdin is opened on container start, is empty
-                            until the first client attaches to stdin, and then remains
-                            open and accepts data until the client disconnects, at
-                            which time stdin is closed and remains closed until the
-                            container is restarted. If this flag is false, a container
-                            processes that reads from stdin will never receive an
-                            EOF. Default is false
+                          description: |-
+                            Whether the container runtime should close the stdin channel after it has been opened by
+                            a single attach. When stdin is true the stdin stream will remain open across multiple attach
+                            sessions. If stdinOnce is set to true, stdin is opened on container start, is empty until the
+                            first client attaches to stdin, and then remains open and accepts data until the client disconnects,
+                            at which time stdin is closed and remains closed until the container is restarted. If this
+                            flag is false, a container processes that reads from stdin will never receive an EOF.
+                            Default is false
                           type: boolean
                         terminationMessagePath:
-                          description: 'Optional: Path at which the file to which
-                            the container''s termination message will be written is
-                            mounted into the container''s filesystem. Message written
-                            is intended to be brief final status, such as an assertion
-                            failure message. Will be truncated by the node if greater
-                            than 4096 bytes. The total message length across all containers
-                            will be limited to 12kb. Defaults to /dev/termination-log.
-                            Cannot be updated.'
+                          description: |-
+                            Optional: Path at which the file to which the container's termination message
+                            will be written is mounted into the container's filesystem.
+                            Message written is intended to be brief final status, such as an assertion failure message.
+                            Will be truncated by the node if greater than 4096 bytes. The total message length across
+                            all containers will be limited to 12kb.
+                            Defaults to /dev/termination-log.
+                            Cannot be updated.
                           type: string
                         terminationMessagePolicy:
-                          description: Indicate how the termination message should
-                            be populated. File will use the contents of terminationMessagePath
-                            to populate the container status message on both success
-                            and failure. FallbackToLogsOnError will use the last chunk
-                            of container log output if the termination message file
-                            is empty and the container exited with an error. The log
-                            output is limited to 2048 bytes or 80 lines, whichever
-                            is smaller. Defaults to File. Cannot be updated.
+                          description: |-
+                            Indicate how the termination message should be populated. File will use the contents of
+                            terminationMessagePath to populate the container status message on both success and failure.
+                            FallbackToLogsOnError will use the last chunk of container log output if the termination
+                            message file is empty and the container exited with an error.
+                            The log output is limited to 2048 bytes or 80 lines, whichever is smaller.
+                            Defaults to File.
+                            Cannot be updated.
                           type: string
                         tty:
-                          description: Whether this container should allocate a TTY
-                            for itself, also requires 'stdin' to be true. Default
-                            is false.
+                          description: |-
+                            Whether this container should allocate a TTY for itself, also requires 'stdin' to be true.
+                            Default is false.
                           type: boolean
                         volumeDevices:
                           description: volumeDevices is the list of block devices
@@ -5510,52 +6746,84 @@ spec:
                             - name
                             type: object
                           type: array
+                          x-kubernetes-list-map-keys:
+                          - devicePath
+                          x-kubernetes-list-type: map
                         volumeMounts:
-                          description: Pod volumes to mount into the container's filesystem.
+                          description: |-
+                            Pod volumes to mount into the container's filesystem.
                             Cannot be updated.
                           items:
                             description: VolumeMount describes a mounting of a Volume
                               within a container.
                             properties:
                               mountPath:
-                                description: Path within the container at which the
-                                  volume should be mounted.  Must not contain ':'.
+                                description: |-
+                                  Path within the container at which the volume should be mounted.  Must
+                                  not contain ':'.
                                 type: string
                               mountPropagation:
-                                description: mountPropagation determines how mounts
-                                  are propagated from the host to container and the
-                                  other way around. When not set, MountPropagationNone
-                                  is used. This field is beta in 1.10.
+                                description: |-
+                                  mountPropagation determines how mounts are propagated from the host
+                                  to container and the other way around.
+                                  When not set, MountPropagationNone is used.
+                                  This field is beta in 1.10.
+                                  When RecursiveReadOnly is set to IfPossible or to Enabled, MountPropagation must be None or unspecified
+                                  (which defaults to None).
                                 type: string
                               name:
                                 description: This must match the Name of a Volume.
                                 type: string
                               readOnly:
-                                description: Mounted read-only if true, read-write
-                                  otherwise (false or unspecified). Defaults to false.
+                                description: |-
+                                  Mounted read-only if true, read-write otherwise (false or unspecified).
+                                  Defaults to false.
                                 type: boolean
+                              recursiveReadOnly:
+                                description: |-
+                                  RecursiveReadOnly specifies whether read-only mounts should be handled
+                                  recursively.
+
+                                  If ReadOnly is false, this field has no meaning and must be unspecified.
+
+                                  If ReadOnly is true, and this field is set to Disabled, the mount is not made
+                                  recursively read-only.  If this field is set to IfPossible, the mount is made
+                                  recursively read-only, if it is supported by the container runtime.  If this
+                                  field is set to Enabled, the mount is made recursively read-only if it is
+                                  supported by the container runtime, otherwise the pod will not be started and
+                                  an error will be generated to indicate the reason.
+
+                                  If this field is set to IfPossible or Enabled, MountPropagation must be set to
+                                  None (or be unspecified, which defaults to None).
+
+                                  If this field is not specified, it is treated as an equivalent of Disabled.
+                                type: string
                               subPath:
-                                description: Path within the volume from which the
-                                  container's volume should be mounted. Defaults to
-                                  "" (volume's root).
+                                description: |-
+                                  Path within the volume from which the container's volume should be mounted.
+                                  Defaults to "" (volume's root).
                                 type: string
                               subPathExpr:
-                                description: Expanded path within the volume from
-                                  which the container's volume should be mounted.
-                                  Behaves similarly to SubPath but environment variable
-                                  references $(VAR_NAME) are expanded using the container's
-                                  environment. Defaults to "" (volume's root). SubPathExpr
-                                  and SubPath are mutually exclusive.
+                                description: |-
+                                  Expanded path within the volume from which the container's volume should be mounted.
+                                  Behaves similarly to SubPath but environment variable references $(VAR_NAME) are expanded using the container's environment.
+                                  Defaults to "" (volume's root).
+                                  SubPathExpr and SubPath are mutually exclusive.
                                 type: string
                             required:
                             - mountPath
                             - name
                             type: object
                           type: array
+                          x-kubernetes-list-map-keys:
+                          - mountPath
+                          x-kubernetes-list-type: map
                         workingDir:
-                          description: Container's working directory. If not specified,
-                            the container runtime's default will be used, which might
-                            be configured in the container image. Cannot be updated.
+                          description: |-
+                            Container's working directory.
+                            If not specified, the container runtime's default will be used, which
+                            might be configured in the container image.
+                            Cannot be updated.
                           type: string
                       required:
                       - name
@@ -5572,15 +6840,51 @@ spec:
                   port:
                     format: int32
                     type: integer
+                  preventMasterEviction:
+                    type: boolean
                   priorityClassName:
                     type: string
                   replicas:
                     format: int32
                     type: integer
+                  reservedPodMemoryPercent:
+                    format: int32
+                    type: integer
                   resources:
                     description: ResourceRequirements describes the compute resource
                       requirements.
                     properties:
+                      claims:
+                        description: |-
+                          Claims lists the names of resources, defined in spec.resourceClaims,
+                          that are used by this container.
+
+                          This is an alpha field and requires enabling the
+                          DynamicResourceAllocation feature gate.
+
+                          This field is immutable. It can only be set for containers.
+                        items:
+                          description: ResourceClaim references one entry in PodSpec.ResourceClaims.
+                          properties:
+                            name:
+                              description: |-
+                                Name must match the name of one entry in pod.spec.resourceClaims of
+                                the Pod where this field is used. It makes that resource available
+                                inside a container.
+                              type: string
+                            request:
+                              description: |-
+                                Request is the name chosen for a request in the referenced claim.
+                                If empty, everything from the claim is made available, otherwise
+                                only the result of this request.
+                              type: string
+                          required:
+                          - name
+                          type: object
+                        type: array
+                        x-kubernetes-list-map-keys:
+                        - name
+                        x-kubernetes-list-type: map
                       limits:
                         additionalProperties:
                           anyOf:
@@ -5588,8 +6892,9 @@ spec:
                           - type: string
                           pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
                           x-kubernetes-int-or-string: true
-                        description: 'Limits describes the maximum amount of compute
-                          resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
+                        description: |-
+                          Limits describes the maximum amount of compute resources allowed.
+                          More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
                         type: object
                       requests:
                         additionalProperties:
@@ -5598,76 +6903,129 @@ spec:
                           - type: string
                           pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
                           x-kubernetes-int-or-string: true
-                        description: 'Requests describes the minimum amount of compute
-                          resources required. If Requests is omitted for a container,
-                          it defaults to Limits if that is explicitly specified, otherwise
-                          to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
+                        description: |-
+                          Requests describes the minimum amount of compute resources required.
+                          If Requests is omitted for a container, it defaults to Limits if that is explicitly specified,
+                          otherwise to an implementation-defined value. Requests cannot exceed Limits.
+                          More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
                         type: object
                     type: object
                   securityContext:
-                    description: PodSecurityContext holds pod-level security attributes
-                      and common container settings. Some fields are also present
-                      in container.securityContext.  Field values of container.securityContext
-                      take precedence over field values of PodSecurityContext.
+                    description: |-
+                      PodSecurityContext holds pod-level security attributes and common container settings.
+                      Some fields are also present in container.securityContext.  Field values of
+                      container.securityContext take precedence over field values of PodSecurityContext.
                     properties:
+                      appArmorProfile:
+                        description: |-
+                          appArmorProfile is the AppArmor options to use by the containers in this pod.
+                          Note that this field cannot be set when spec.os.name is windows.
+                        properties:
+                          localhostProfile:
+                            description: |-
+                              localhostProfile indicates a profile loaded on the node that should be used.
+                              The profile must be preconfigured on the node to work.
+                              Must match the loaded name of the profile.
+                              Must be set if and only if type is "Localhost".
+                            type: string
+                          type:
+                            description: |-
+                              type indicates which kind of AppArmor profile will be applied.
+                              Valid options are:
+                                Localhost - a profile pre-loaded on the node.
+                                RuntimeDefault - the container runtime's default profile.
+                                Unconfined - no AppArmor enforcement.
+                            type: string
+                        required:
+                        - type
+                        type: object
                       fsGroup:
-                        description: "A special supplemental group that applies to
-                          all containers in a pod. Some volume types allow the Kubelet
-                          to change the ownership of that volume to be owned by the
-                          pod: \n 1. The owning GID will be the FSGroup 2. The setgid
-                          bit is set (new files created in the volume will be owned
-                          by FSGroup) 3. The permission bits are OR'd with rw-rw----
-                          \n If unset, the Kubelet will not modify the ownership and
-                          permissions of any volume. Note that this field cannot be
-                          set when spec.os.name is windows."
+                        description: |-
+                          A special supplemental group that applies to all containers in a pod.
+                          Some volume types allow the Kubelet to change the ownership of that volume
+                          to be owned by the pod:
+
+                          1. The owning GID will be the FSGroup
+                          2. The setgid bit is set (new files created in the volume will be owned by FSGroup)
+                          3. The permission bits are OR'd with rw-rw----
+
+                          If unset, the Kubelet will not modify the ownership and permissions of any volume.
+                          Note that this field cannot be set when spec.os.name is windows.
                         format: int64
                         type: integer
                       fsGroupChangePolicy:
-                        description: 'fsGroupChangePolicy defines behavior of changing
-                          ownership and permission of the volume before being exposed
-                          inside Pod. This field will only apply to volume types which
-                          support fsGroup based ownership(and permissions). It will
-                          have no effect on ephemeral volume types such as: secret,
-                          configmaps and emptydir. Valid values are "OnRootMismatch"
-                          and "Always". If not specified, "Always" is used. Note that
-                          this field cannot be set when spec.os.name is windows.'
+                        description: |-
+                          fsGroupChangePolicy defines behavior of changing ownership and permission of the volume
+                          before being exposed inside Pod. This field will only apply to
+                          volume types which support fsGroup based ownership(and permissions).
+                          It will have no effect on ephemeral volume types such as: secret, configmaps
+                          and emptydir.
+                          Valid values are "OnRootMismatch" and "Always". If not specified, "Always" is used.
+                          Note that this field cannot be set when spec.os.name is windows.
                         type: string
                       runAsGroup:
-                        description: The GID to run the entrypoint of the container
-                          process. Uses runtime default if unset. May also be set
-                          in SecurityContext.  If set in both SecurityContext and
-                          PodSecurityContext, the value specified in SecurityContext
-                          takes precedence for that container. Note that this field
-                          cannot be set when spec.os.name is windows.
+                        description: |-
+                          The GID to run the entrypoint of the container process.
+                          Uses runtime default if unset.
+                          May also be set in SecurityContext.  If set in both SecurityContext and
+                          PodSecurityContext, the value specified in SecurityContext takes precedence
+                          for that container.
+                          Note that this field cannot be set when spec.os.name is windows.
                         format: int64
                         type: integer
                       runAsNonRoot:
-                        description: Indicates that the container must run as a non-root
-                          user. If true, the Kubelet will validate the image at runtime
-                          to ensure that it does not run as UID 0 (root) and fail
-                          to start the container if it does. If unset or false, no
-                          such validation will be performed. May also be set in SecurityContext.  If
-                          set in both SecurityContext and PodSecurityContext, the
-                          value specified in SecurityContext takes precedence.
+                        description: |-
+                          Indicates that the container must run as a non-root user.
+                          If true, the Kubelet will validate the image at runtime to ensure that it
+                          does not run as UID 0 (root) and fail to start the container if it does.
+                          If unset or false, no such validation will be performed.
+                          May also be set in SecurityContext.  If set in both SecurityContext and
+                          PodSecurityContext, the value specified in SecurityContext takes precedence.
                         type: boolean
                       runAsUser:
-                        description: The UID to run the entrypoint of the container
-                          process. Defaults to user specified in image metadata if
-                          unspecified. May also be set in SecurityContext.  If set
-                          in both SecurityContext and PodSecurityContext, the value
-                          specified in SecurityContext takes precedence for that container.
-                          Note that this field cannot be set when spec.os.name is
-                          windows.
+                        description: |-
+                          The UID to run the entrypoint of the container process.
+                          Defaults to user specified in image metadata if unspecified.
+                          May also be set in SecurityContext.  If set in both SecurityContext and
+                          PodSecurityContext, the value specified in SecurityContext takes precedence
+                          for that container.
+                          Note that this field cannot be set when spec.os.name is windows.
                         format: int64
                         type: integer
+                      seLinuxChangePolicy:
+                        description: |-
+                          seLinuxChangePolicy defines how the container's SELinux label is applied to all volumes used by the Pod.
+                          It has no effect on nodes that do not support SELinux or to volumes does not support SELinux.
+                          Valid values are "MountOption" and "Recursive".
+
+                          "Recursive" means relabeling of all files on all Pod volumes by the container runtime.
+                          This may be slow for large volumes, but allows mixing privileged and unprivileged Pods sharing the same volume on the same node.
+
+                          "MountOption" mounts all eligible Pod volumes with `-o context` mount option.
+                          This requires all Pods that share the same volume to use the same SELinux label.
+                          It is not possible to share the same volume among privileged and unprivileged Pods.
+                          Eligible volumes are in-tree FibreChannel and iSCSI volumes, and all CSI volumes
+                          whose CSI driver announces SELinux support by setting spec.seLinuxMount: true in their
+                          CSIDriver instance. Other volumes are always re-labelled recursively.
+                          "MountOption" value is allowed only when SELinuxMount feature gate is enabled.
+
+                          If not specified and SELinuxMount feature gate is enabled, "MountOption" is used.
+                          If not specified and SELinuxMount feature gate is disabled, "MountOption" is used for ReadWriteOncePod volumes
+                          and "Recursive" for all other volumes.
+
+                          This field affects only Pods that have SELinux label set, either in PodSecurityContext or in SecurityContext of all containers.
+
+                          All Pods that use the same volume should use the same seLinuxChangePolicy, otherwise some pods can get stuck in ContainerCreating state.
+                          Note that this field cannot be set when spec.os.name is windows.
+                        type: string
                       seLinuxOptions:
-                        description: The SELinux context to be applied to all containers.
-                          If unspecified, the container runtime will allocate a random
-                          SELinux context for each container.  May also be set in
-                          SecurityContext.  If set in both SecurityContext and PodSecurityContext,
-                          the value specified in SecurityContext takes precedence
-                          for that container. Note that this field cannot be set when
-                          spec.os.name is windows.
+                        description: |-
+                          The SELinux context to be applied to all containers.
+                          If unspecified, the container runtime will allocate a random SELinux context for each
+                          container.  May also be set in SecurityContext.  If set in
+                          both SecurityContext and PodSecurityContext, the value specified in SecurityContext
+                          takes precedence for that container.
+                          Note that this field cannot be set when spec.os.name is windows.
                         properties:
                           level:
                             description: Level is SELinux level label that applies
@@ -5687,42 +7045,58 @@ spec:
                             type: string
                         type: object
                       seccompProfile:
-                        description: The seccomp options to use by the containers
-                          in this pod. Note that this field cannot be set when spec.os.name
-                          is windows.
+                        description: |-
+                          The seccomp options to use by the containers in this pod.
+                          Note that this field cannot be set when spec.os.name is windows.
                         properties:
                           localhostProfile:
-                            description: localhostProfile indicates a profile defined
-                              in a file on the node should be used. The profile must
-                              be preconfigured on the node to work. Must be a descending
-                              path, relative to the kubelet's configured seccomp profile
-                              location. Must only be set if type is "Localhost".
+                            description: |-
+                              localhostProfile indicates a profile defined in a file on the node should be used.
+                              The profile must be preconfigured on the node to work.
+                              Must be a descending path, relative to the kubelet's configured seccomp profile location.
+                              Must be set if type is "Localhost". Must NOT be set for any other type.
                             type: string
                           type:
-                            description: "type indicates which kind of seccomp profile
-                              will be applied. Valid options are: \n Localhost - a
-                              profile defined in a file on the node should be used.
-                              RuntimeDefault - the container runtime default profile
-                              should be used. Unconfined - no profile should be applied."
+                            description: |-
+                              type indicates which kind of seccomp profile will be applied.
+                              Valid options are:
+
+                              Localhost - a profile defined in a file on the node should be used.
+                              RuntimeDefault - the container runtime default profile should be used.
+                              Unconfined - no profile should be applied.
                             type: string
                         required:
                         - type
                         type: object
                       supplementalGroups:
-                        description: A list of groups applied to the first process
-                          run in each container, in addition to the container's primary
-                          GID.  If unspecified, no groups will be added to any container.
-                          Note that this field cannot be set when spec.os.name is
-                          windows.
+                        description: |-
+                          A list of groups applied to the first process run in each container, in
+                          addition to the container's primary GID and fsGroup (if specified).  If
+                          the SupplementalGroupsPolicy feature is enabled, the
+                          supplementalGroupsPolicy field determines whether these are in addition
+                          to or instead of any group memberships defined in the container image.
+                          If unspecified, no additional groups are added, though group memberships
+                          defined in the container image may still be used, depending on the
+                          supplementalGroupsPolicy field.
+                          Note that this field cannot be set when spec.os.name is windows.
                         items:
                           format: int64
                           type: integer
                         type: array
+                        x-kubernetes-list-type: atomic
+                      supplementalGroupsPolicy:
+                        description: |-
+                          Defines how supplemental groups of the first container processes are calculated.
+                          Valid values are "Merge" and "Strict". If not specified, "Merge" is used.
+                          (Alpha) Using the field requires the SupplementalGroupsPolicy feature gate to be enabled
+                          and the container runtime must implement support for this feature.
+                          Note that this field cannot be set when spec.os.name is windows.
+                        type: string
                       sysctls:
-                        description: Sysctls hold a list of namespaced sysctls used
-                          for the pod. Pods with unsupported sysctls (by the container
-                          runtime) might fail to launch. Note that this field cannot
-                          be set when spec.os.name is windows.
+                        description: |-
+                          Sysctls hold a list of namespaced sysctls used for the pod. Pods with unsupported
+                          sysctls (by the container runtime) might fail to launch.
+                          Note that this field cannot be set when spec.os.name is windows.
                         items:
                           description: Sysctl defines a kernel parameter to be set
                           properties:
@@ -5737,43 +7111,37 @@ spec:
                           - value
                           type: object
                         type: array
+                        x-kubernetes-list-type: atomic
                       windowsOptions:
-                        description: The Windows specific settings applied to all
-                          containers. If unspecified, the options within a container's
-                          SecurityContext will be used. If set in both SecurityContext
-                          and PodSecurityContext, the value specified in SecurityContext
-                          takes precedence. Note that this field cannot be set when
-                          spec.os.name is linux.
+                        description: |-
+                          The Windows specific settings applied to all containers.
+                          If unspecified, the options within a container's SecurityContext will be used.
+                          If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence.
+                          Note that this field cannot be set when spec.os.name is linux.
                         properties:
                           gmsaCredentialSpec:
-                            description: GMSACredentialSpec is where the GMSA admission
-                              webhook (https://github.com/kubernetes-sigs/windows-gmsa)
-                              inlines the contents of the GMSA credential spec named
-                              by the GMSACredentialSpecName field.
+                            description: |-
+                              GMSACredentialSpec is where the GMSA admission webhook
+                              (https://github.com/kubernetes-sigs/windows-gmsa) inlines the contents of the
+                              GMSA credential spec named by the GMSACredentialSpecName field.
                             type: string
                           gmsaCredentialSpecName:
                             description: GMSACredentialSpecName is the name of the
                               GMSA credential spec to use.
                             type: string
                           hostProcess:
-                            description: HostProcess determines if a container should
-                              be run as a 'Host Process' container. This field is
-                              alpha-level and will only be honored by components that
-                              enable the WindowsHostProcessContainers feature flag.
-                              Setting this field without the feature flag will result
-                              in errors when validating the Pod. All of a Pod's containers
-                              must have the same effective HostProcess value (it is
-                              not allowed to have a mix of HostProcess containers
-                              and non-HostProcess containers).  In addition, if HostProcess
-                              is true then HostNetwork must also be set to true.
+                            description: |-
+                              HostProcess determines if a container should be run as a 'Host Process' container.
+                              All of a Pod's containers must have the same effective HostProcess value
+                              (it is not allowed to have a mix of HostProcess containers and non-HostProcess containers).
+                              In addition, if HostProcess is true then HostNetwork must also be set to true.
                             type: boolean
                           runAsUserName:
-                            description: The UserName in Windows to run the entrypoint
-                              of the container process. Defaults to the user specified
-                              in image metadata if unspecified. May also be set in
-                              PodSecurityContext. If set in both SecurityContext and
-                              PodSecurityContext, the value specified in SecurityContext
-                              takes precedence.
+                            description: |-
+                              The UserName in Windows to run the entrypoint of the container process.
+                              Defaults to the user specified in image metadata if unspecified.
+                              May also be set in PodSecurityContext. If set in both SecurityContext and
+                              PodSecurityContext, the value specified in SecurityContext takes precedence.
                             type: string
                         type: object
                     type: object
@@ -5785,54 +7153,59 @@ spec:
                     type: object
                   shutdownConfigMap:
                     type: string
+                  startupConfigMap:
+                    type: string
                   storage:
                     description: RedisStorage defines the structure used to store
                       the Redis Data
                     properties:
                       emptyDir:
-                        description: Represents an empty directory for a pod. Empty
-                          directory volumes support ownership management and SELinux
-                          relabeling.
+                        description: |-
+                          Represents an empty directory for a pod.
+                          Empty directory volumes support ownership management and SELinux relabeling.
                         properties:
                           medium:
-                            description: 'medium represents what type of storage medium
-                              should back this directory. The default is "" which
-                              means to use the node''s default medium. Must be an
-                              empty string (default) or Memory. More info: https://kubernetes.io/docs/concepts/storage/volumes#emptydir'
+                            description: |-
+                              medium represents what type of storage medium should back this directory.
+                              The default is "" which means to use the node's default medium.
+                              Must be an empty string (default) or Memory.
+                              More info: https://kubernetes.io/docs/concepts/storage/volumes#emptydir
                             type: string
                           sizeLimit:
                             anyOf:
                             - type: integer
                             - type: string
-                            description: 'sizeLimit is the total amount of local storage
-                              required for this EmptyDir volume. The size limit is
-                              also applicable for memory medium. The maximum usage
-                              on memory medium EmptyDir would be the minimum value
-                              between the SizeLimit specified here and the sum of
-                              memory limits of all containers in a pod. The default
-                              is nil which means that the limit is undefined. More
-                              info: http://kubernetes.io/docs/user-guide/volumes#emptydir'
+                            description: |-
+                              sizeLimit is the total amount of local storage required for this EmptyDir volume.
+                              The size limit is also applicable for memory medium.
+                              The maximum usage on memory medium EmptyDir would be the minimum value between
+                              the SizeLimit specified here and the sum of memory limits of all containers in a pod.
+                              The default is nil which means that the limit is undefined.
+                              More info: https://kubernetes.io/docs/concepts/storage/volumes#emptydir
                             pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
                             x-kubernetes-int-or-string: true
                         type: object
                       keepAfterDeletion:
                         type: boolean
                       persistentVolumeClaim:
-                        description: EmbeddedPersistentVolumeClaim is an embedded
-                          version of k8s.io/api/core/v1.PersistentVolumeClaim. It
-                          contains TypeMeta and a reduced ObjectMeta.
+                        description: |-
+                          EmbeddedPersistentVolumeClaim is an embedded version of k8s.io/api/core/v1.PersistentVolumeClaim.
+                          It contains TypeMeta and a reduced ObjectMeta.
                         properties:
                           apiVersion:
-                            description: 'APIVersion defines the versioned schema
-                              of this representation of an object. Servers should
-                              convert recognized schemas to the latest internal value,
-                              and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+                            description: |-
+                              APIVersion defines the versioned schema of this representation of an object.
+                              Servers should convert recognized schemas to the latest internal value, and
+                              may reject unrecognized values.
+                              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
                             type: string
                           kind:
-                            description: 'Kind is a string value representing the
-                              REST resource this object represents. Servers may infer
-                              this from the endpoint the client submits requests to.
-                              Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+                            description: |-
+                              Kind is a string value representing the REST resource this object represents.
+                              Servers may infer this from the endpoint the client submits requests to.
+                              Cannot be updated.
+                              In CamelCase.
+                              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
                             type: string
                           metadata:
                             description: EmbeddedMetadata contains metadata relevant
@@ -5841,56 +7214,60 @@ spec:
                               annotations:
                                 additionalProperties:
                                   type: string
-                                description: 'Annotations is an unstructured key value
-                                  map stored with a resource that may be set by external
-                                  tools to store and retrieve arbitrary metadata.
-                                  They are not queryable and should be preserved when
-                                  modifying objects. More info: http://kubernetes.io/docs/user-guide/annotations'
+                                description: |-
+                                  Annotations is an unstructured key value map stored with a resource that may be
+                                  set by external tools to store and retrieve arbitrary metadata. They are not
+                                  queryable and should be preserved when modifying objects.
+                                  More info: http://kubernetes.io/docs/user-guide/annotations
                                 type: object
                               labels:
                                 additionalProperties:
                                   type: string
-                                description: 'Map of string keys and values that can
-                                  be used to organize and categorize (scope and select)
-                                  objects. May match selectors of replication controllers
-                                  and services. More info: http://kubernetes.io/docs/user-guide/labels'
+                                description: |-
+                                  Map of string keys and values that can be used to organize and categorize
+                                  (scope and select) objects. May match selectors of replication controllers
+                                  and services.
+                                  More info: http://kubernetes.io/docs/user-guide/labels
                                 type: object
                               name:
-                                description: 'Name must be unique within a namespace.
-                                  Is required when creating resources, although some
-                                  resources may allow a client to request the generation
-                                  of an appropriate name automatically. Name is primarily
-                                  intended for creation idempotence and configuration
-                                  definition. Cannot be updated. More info: http://kubernetes.io/docs/user-guide/identifiers#names'
+                                description: |-
+                                  Name must be unique within a namespace. Is required when creating resources, although
+                                  some resources may allow a client to request the generation of an appropriate name
+                                  automatically. Name is primarily intended for creation idempotence and configuration
+                                  definition.
+                                  Cannot be updated.
+                                  More info: http://kubernetes.io/docs/user-guide/identifiers#names
                                 type: string
                             type: object
                           spec:
-                            description: 'Spec defines the desired characteristics
-                              of a volume requested by a pod author. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#persistentvolumeclaims'
+                            description: |-
+                              Spec defines the desired characteristics of a volume requested by a pod author.
+                              More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#persistentvolumeclaims
                             properties:
                               accessModes:
-                                description: 'accessModes contains the desired access
-                                  modes the volume should have. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#access-modes-1'
+                                description: |-
+                                  accessModes contains the desired access modes the volume should have.
+                                  More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#access-modes-1
                                 items:
                                   type: string
                                 type: array
+                                x-kubernetes-list-type: atomic
                               dataSource:
-                                description: 'dataSource field can be used to specify
-                                  either: * An existing VolumeSnapshot object (snapshot.storage.k8s.io/VolumeSnapshot)
-                                  * An existing PVC (PersistentVolumeClaim) If the
-                                  provisioner or an external controller can support
-                                  the specified data source, it will create a new
-                                  volume based on the contents of the specified data
-                                  source. If the AnyVolumeDataSource feature gate
-                                  is enabled, this field will always have the same
-                                  contents as the DataSourceRef field.'
+                                description: |-
+                                  dataSource field can be used to specify either:
+                                  * An existing VolumeSnapshot object (snapshot.storage.k8s.io/VolumeSnapshot)
+                                  * An existing PVC (PersistentVolumeClaim)
+                                  If the provisioner or an external controller can support the specified data source,
+                                  it will create a new volume based on the contents of the specified data source.
+                                  When the AnyVolumeDataSource feature gate is enabled, dataSource contents will be copied to dataSourceRef,
+                                  and dataSourceRef contents will be copied to dataSource when dataSourceRef.namespace is not specified.
+                                  If the namespace is specified, then dataSourceRef will not be copied to dataSource.
                                 properties:
                                   apiGroup:
-                                    description: APIGroup is the group for the resource
-                                      being referenced. If APIGroup is not specified,
-                                      the specified Kind must be in the core API group.
-                                      For any other third-party types, APIGroup is
-                                      required.
+                                    description: |-
+                                      APIGroup is the group for the resource being referenced.
+                                      If APIGroup is not specified, the specified Kind must be in the core API group.
+                                      For any other third-party types, APIGroup is required.
                                     type: string
                                   kind:
                                     description: Kind is the type of resource being
@@ -5904,37 +7281,38 @@ spec:
                                 - kind
                                 - name
                                 type: object
+                                x-kubernetes-map-type: atomic
                               dataSourceRef:
-                                description: 'dataSourceRef specifies the object from
-                                  which to populate the volume with data, if a non-empty
-                                  volume is desired. This may be any local object
-                                  from a non-empty API group (non core object) or
-                                  a PersistentVolumeClaim object. When this field
-                                  is specified, volume binding will only succeed if
-                                  the type of the specified object matches some installed
-                                  volume populator or dynamic provisioner. This field
-                                  will replace the functionality of the DataSource
-                                  field and as such if both fields are non-empty,
-                                  they must have the same value. For backwards compatibility,
-                                  both fields (DataSource and DataSourceRef) will
-                                  be set to the same value automatically if one of
-                                  them is empty and the other is non-empty. There
-                                  are two important differences between DataSource
-                                  and DataSourceRef: * While DataSource only allows
-                                  two specific types of objects, DataSourceRef   allows
-                                  any non-core object, as well as PersistentVolumeClaim
-                                  objects. * While DataSource ignores disallowed values
-                                  (dropping them), DataSourceRef   preserves all values,
-                                  and generates an error if a disallowed value is   specified.
-                                  (Beta) Using this field requires the AnyVolumeDataSource
-                                  feature gate to be enabled.'
+                                description: |-
+                                  dataSourceRef specifies the object from which to populate the volume with data, if a non-empty
+                                  volume is desired. This may be any object from a non-empty API group (non
+                                  core object) or a PersistentVolumeClaim object.
+                                  When this field is specified, volume binding will only succeed if the type of
+                                  the specified object matches some installed volume populator or dynamic
+                                  provisioner.
+                                  This field will replace the functionality of the dataSource field and as such
+                                  if both fields are non-empty, they must have the same value. For backwards
+                                  compatibility, when namespace isn't specified in dataSourceRef,
+                                  both fields (dataSource and dataSourceRef) will be set to the same
+                                  value automatically if one of them is empty and the other is non-empty.
+                                  When namespace is specified in dataSourceRef,
+                                  dataSource isn't set to the same value and must be empty.
+                                  There are three important differences between dataSource and dataSourceRef:
+                                  * While dataSource only allows two specific types of objects, dataSourceRef
+                                    allows any non-core object, as well as PersistentVolumeClaim objects.
+                                  * While dataSource ignores disallowed values (dropping them), dataSourceRef
+                                    preserves all values, and generates an error if a disallowed value is
+                                    specified.
+                                  * While dataSource only allows local objects, dataSourceRef allows objects
+                                    in any namespaces.
+                                  (Beta) Using this field requires the AnyVolumeDataSource feature gate to be enabled.
+                                  (Alpha) Using the namespace field of dataSourceRef requires the CrossNamespaceVolumeDataSource feature gate to be enabled.
                                 properties:
                                   apiGroup:
-                                    description: APIGroup is the group for the resource
-                                      being referenced. If APIGroup is not specified,
-                                      the specified Kind must be in the core API group.
-                                      For any other third-party types, APIGroup is
-                                      required.
+                                    description: |-
+                                      APIGroup is the group for the resource being referenced.
+                                      If APIGroup is not specified, the specified Kind must be in the core API group.
+                                      For any other third-party types, APIGroup is required.
                                     type: string
                                   kind:
                                     description: Kind is the type of resource being
@@ -5944,17 +7322,23 @@ spec:
                                     description: Name is the name of resource being
                                       referenced
                                     type: string
+                                  namespace:
+                                    description: |-
+                                      Namespace is the namespace of resource being referenced
+                                      Note that when a namespace is specified, a gateway.networking.k8s.io/ReferenceGrant object is required in the referent namespace to allow that namespace's owner to accept the reference. See the ReferenceGrant documentation for details.
+                                      (Alpha) This field requires the CrossNamespaceVolumeDataSource feature gate to be enabled.
+                                    type: string
                                 required:
                                 - kind
                                 - name
                                 type: object
                               resources:
-                                description: 'resources represents the minimum resources
-                                  the volume should have. If RecoverVolumeExpansionFailure
-                                  feature is enabled users are allowed to specify
-                                  resource requirements that are lower than previous
-                                  value but must still be higher than capacity recorded
-                                  in the status field of the claim. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources'
+                                description: |-
+                                  resources represents the minimum resources the volume should have.
+                                  If RecoverVolumeExpansionFailure feature is enabled users are allowed to specify resource requirements
+                                  that are lower than previous value but must still be higher than capacity recorded in the
+                                  status field of the claim.
+                                  More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources
                                 properties:
                                   limits:
                                     additionalProperties:
@@ -5963,8 +7347,9 @@ spec:
                                       - type: string
                                       pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
                                       x-kubernetes-int-or-string: true
-                                    description: 'Limits describes the maximum amount
-                                      of compute resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
+                                    description: |-
+                                      Limits describes the maximum amount of compute resources allowed.
+                                      More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
                                     type: object
                                   requests:
                                     additionalProperties:
@@ -5973,12 +7358,11 @@ spec:
                                       - type: string
                                       pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
                                       x-kubernetes-int-or-string: true
-                                    description: 'Requests describes the minimum amount
-                                      of compute resources required. If Requests is
-                                      omitted for a container, it defaults to Limits
-                                      if that is explicitly specified, otherwise to
-                                      an implementation-defined value. More info:
-                                      https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
+                                    description: |-
+                                      Requests describes the minimum amount of compute resources required.
+                                      If Requests is omitted for a container, it defaults to Limits if that is explicitly specified,
+                                      otherwise to an implementation-defined value. Requests cannot exceed Limits.
+                                      More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
                                     type: object
                                 type: object
                               selector:
@@ -5990,53 +7374,69 @@ spec:
                                       selector requirements. The requirements are
                                       ANDed.
                                     items:
-                                      description: A label selector requirement is
-                                        a selector that contains values, a key, and
-                                        an operator that relates the key and values.
+                                      description: |-
+                                        A label selector requirement is a selector that contains values, a key, and an operator that
+                                        relates the key and values.
                                       properties:
                                         key:
                                           description: key is the label key that the
                                             selector applies to.
                                           type: string
                                         operator:
-                                          description: operator represents a key's
-                                            relationship to a set of values. Valid
-                                            operators are In, NotIn, Exists and DoesNotExist.
+                                          description: |-
+                                            operator represents a key's relationship to a set of values.
+                                            Valid operators are In, NotIn, Exists and DoesNotExist.
                                           type: string
                                         values:
-                                          description: values is an array of string
-                                            values. If the operator is In or NotIn,
-                                            the values array must be non-empty. If
-                                            the operator is Exists or DoesNotExist,
-                                            the values array must be empty. This array
-                                            is replaced during a strategic merge patch.
+                                          description: |-
+                                            values is an array of string values. If the operator is In or NotIn,
+                                            the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                            the values array must be empty. This array is replaced during a strategic
+                                            merge patch.
                                           items:
                                             type: string
                                           type: array
+                                          x-kubernetes-list-type: atomic
                                       required:
                                       - key
                                       - operator
                                       type: object
                                     type: array
+                                    x-kubernetes-list-type: atomic
                                   matchLabels:
                                     additionalProperties:
                                       type: string
-                                    description: matchLabels is a map of {key,value}
-                                      pairs. A single {key,value} in the matchLabels
-                                      map is equivalent to an element of matchExpressions,
-                                      whose key field is "key", the operator is "In",
-                                      and the values array contains only "value".
-                                      The requirements are ANDed.
+                                    description: |-
+                                      matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                      map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                      operator is "In", and the values array contains only "value". The requirements are ANDed.
                                     type: object
                                 type: object
+                                x-kubernetes-map-type: atomic
                               storageClassName:
-                                description: 'storageClassName is the name of the
-                                  StorageClass required by the claim. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#class-1'
+                                description: |-
+                                  storageClassName is the name of the StorageClass required by the claim.
+                                  More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#class-1
+                                type: string
+                              volumeAttributesClassName:
+                                description: |-
+                                  volumeAttributesClassName may be used to set the VolumeAttributesClass used by this claim.
+                                  If specified, the CSI driver will create or update the volume with the attributes defined
+                                  in the corresponding VolumeAttributesClass. This has a different purpose than storageClassName,
+                                  it can be changed after the claim is created. An empty string value means that no VolumeAttributesClass
+                                  will be applied to the claim but it's not allowed to reset this field to empty string once it is set.
+                                  If unspecified and the PersistentVolumeClaim is unbound, the default VolumeAttributesClass
+                                  will be set by the persistentvolume controller if it exists.
+                                  If the resource referred to by volumeAttributesClass does not exist, this PersistentVolumeClaim will be
+                                  set to a Pending state, as reflected by the modifyVolumeStatus field, until such as a resource
+                                  exists.
+                                  More info: https://kubernetes.io/docs/concepts/storage/volume-attributes-classes/
+                                  (Beta) Using this field requires the VolumeAttributesClass feature gate to be enabled (off by default).
                                 type: string
                               volumeMode:
-                                description: volumeMode defines what type of volume
-                                  is required by the claim. Value of Filesystem is
-                                  implied when not included in claim spec.
+                                description: |-
+                                  volumeMode defines what type of volume is required by the claim.
+                                  Value of Filesystem is implied when not included in claim spec.
                                 type: string
                               volumeName:
                                 description: volumeName is the binding reference to
@@ -6044,17 +7444,67 @@ spec:
                                 type: string
                             type: object
                           status:
-                            description: 'Status represents the current information/status
-                              of a persistent volume claim. Read-only. More info:
-                              https://kubernetes.io/docs/concepts/storage/persistent-volumes#persistentvolumeclaims'
+                            description: |-
+                              Status represents the current information/status of a persistent volume claim.
+                              Read-only.
+                              More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#persistentvolumeclaims
                             properties:
                               accessModes:
-                                description: 'accessModes contains the actual access
-                                  modes the volume backing the PVC has. More info:
-                                  https://kubernetes.io/docs/concepts/storage/persistent-volumes#access-modes-1'
+                                description: |-
+                                  accessModes contains the actual access modes the volume backing the PVC has.
+                                  More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#access-modes-1
                                 items:
                                   type: string
                                 type: array
+                                x-kubernetes-list-type: atomic
+                              allocatedResourceStatuses:
+                                additionalProperties:
+                                  description: |-
+                                    When a controller receives persistentvolume claim update with ClaimResourceStatus for a resource
+                                    that it does not recognizes, then it should ignore that update and let other controllers
+                                    handle it.
+                                  type: string
+                                description: "allocatedResourceStatuses stores status
+                                  of resource being resized for the given PVC.\nKey
+                                  names follow standard Kubernetes label syntax. Valid
+                                  values are either:\n\t* Un-prefixed keys:\n\t\t-
+                                  storage - the capacity of the volume.\n\t* Custom
+                                  resources must use implementation-defined prefixed
+                                  names such as \"example.com/my-custom-resource\"\nApart
+                                  from above values - keys that are unprefixed or
+                                  have kubernetes.io prefix are considered\nreserved
+                                  and hence may not be used.\n\nClaimResourceStatus
+                                  can be in any of following states:\n\t- ControllerResizeInProgress:\n\t\tState
+                                  set when resize controller starts resizing the volume
+                                  in control-plane.\n\t- ControllerResizeFailed:\n\t\tState
+                                  set when resize has failed in resize controller
+                                  with a terminal error.\n\t- NodeResizePending:\n\t\tState
+                                  set when resize controller has finished resizing
+                                  the volume but further resizing of\n\t\tvolume is
+                                  needed on the node.\n\t- NodeResizeInProgress:\n\t\tState
+                                  set when kubelet starts resizing the volume.\n\t-
+                                  NodeResizeFailed:\n\t\tState set when resizing has
+                                  failed in kubelet with a terminal error. Transient
+                                  errors don't set\n\t\tNodeResizeFailed.\nFor example:
+                                  if expanding a PVC for more capacity - this field
+                                  can be one of the following states:\n\t- pvc.status.allocatedResourceStatus['storage']
+                                  = \"ControllerResizeInProgress\"\n     - pvc.status.allocatedResourceStatus['storage']
+                                  = \"ControllerResizeFailed\"\n     - pvc.status.allocatedResourceStatus['storage']
+                                  = \"NodeResizePending\"\n     - pvc.status.allocatedResourceStatus['storage']
+                                  = \"NodeResizeInProgress\"\n     - pvc.status.allocatedResourceStatus['storage']
+                                  = \"NodeResizeFailed\"\nWhen this field is not set,
+                                  it means that no resize operation is in progress
+                                  for the given PVC.\n\nA controller that receives
+                                  PVC update with previously unknown resourceName
+                                  or ClaimResourceStatus\nshould ignore the update
+                                  for the purpose it was designed. For example - a
+                                  controller that\nonly is responsible for resizing
+                                  capacity of the volume, should ignore PVC updates
+                                  that change other valid\nresources associated with
+                                  PVC.\n\nThis is an alpha field and requires enabling
+                                  RecoverVolumeExpansionFailure feature."
+                                type: object
+                                x-kubernetes-map-type: granular
                               allocatedResources:
                                 additionalProperties:
                                   anyOf:
@@ -6062,20 +7512,33 @@ spec:
                                   - type: string
                                   pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
                                   x-kubernetes-int-or-string: true
-                                description: allocatedResources is the storage resource
-                                  within AllocatedResources tracks the capacity allocated
-                                  to a PVC. It may be larger than the actual capacity
-                                  when a volume expansion operation is requested.
-                                  For storage quota, the larger value from allocatedResources
-                                  and PVC.spec.resources is used. If allocatedResources
+                                description: "allocatedResources tracks the resources
+                                  allocated to a PVC including its capacity.\nKey
+                                  names follow standard Kubernetes label syntax. Valid
+                                  values are either:\n\t* Un-prefixed keys:\n\t\t-
+                                  storage - the capacity of the volume.\n\t* Custom
+                                  resources must use implementation-defined prefixed
+                                  names such as \"example.com/my-custom-resource\"\nApart
+                                  from above values - keys that are unprefixed or
+                                  have kubernetes.io prefix are considered\nreserved
+                                  and hence may not be used.\n\nCapacity reported
+                                  here may be larger than the actual capacity when
+                                  a volume expansion operation\nis requested.\nFor
+                                  storage quota, the larger value from allocatedResources
+                                  and PVC.spec.resources is used.\nIf allocatedResources
                                   is not set, PVC.spec.resources alone is used for
-                                  quota calculation. If a volume expansion capacity
-                                  request is lowered, allocatedResources is only lowered
+                                  quota calculation.\nIf a volume expansion capacity
+                                  request is lowered, allocatedResources is only\nlowered
                                   if there are no expansion operations in progress
-                                  and if the actual volume capacity is equal or lower
-                                  than the requested capacity. This is an alpha field
-                                  and requires enabling RecoverVolumeExpansionFailure
-                                  feature.
+                                  and if the actual volume capacity\nis equal or lower
+                                  than the requested capacity.\n\nA controller that
+                                  receives PVC update with previously unknown resourceName\nshould
+                                  ignore the update for the purpose it was designed.
+                                  For example - a controller that\nonly is responsible
+                                  for resizing capacity of the volume, should ignore
+                                  PVC updates that change other valid\nresources associated
+                                  with PVC.\n\nThis is an alpha field and requires
+                                  enabling RecoverVolumeExpansionFailure feature."
                                 type: object
                               capacity:
                                 additionalProperties:
@@ -6088,12 +7551,11 @@ spec:
                                   of the underlying volume.
                                 type: object
                               conditions:
-                                description: conditions is the current Condition of
-                                  persistent volume claim. If underlying persistent
-                                  volume is being resized then the Condition will
-                                  be set to 'ResizeStarted'.
+                                description: |-
+                                  conditions is the current Condition of persistent volume claim. If underlying persistent volume is being
+                                  resized then the Condition will be set to 'Resizing'.
                                 items:
-                                  description: PersistentVolumeClaimCondition contails
+                                  description: PersistentVolumeClaimCondition contains
                                     details about state of pvc
                                   properties:
                                     lastProbeTime:
@@ -6112,36 +7574,69 @@ spec:
                                         indicating details about last transition.
                                       type: string
                                     reason:
-                                      description: reason is a unique, this should
-                                        be a short, machine understandable string
-                                        that gives the reason for condition's last
-                                        transition. If it reports "ResizeStarted"
-                                        that means the underlying persistent volume
-                                        is being resized.
+                                      description: |-
+                                        reason is a unique, this should be a short, machine understandable string that gives the reason
+                                        for condition's last transition. If it reports "Resizing" that means the underlying
+                                        persistent volume is being resized.
                                       type: string
                                     status:
+                                      description: |-
+                                        Status is the status of the condition.
+                                        Can be True, False, Unknown.
+                                        More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=state%20of%20pvc-,conditions.status,-(string)%2C%20required
                                       type: string
                                     type:
-                                      description: PersistentVolumeClaimConditionType
-                                        is a valid value of PersistentVolumeClaimCondition.Type
+                                      description: |-
+                                        Type is the type of the condition.
+                                        More info: https://kubernetes.io/docs/reference/kubernetes-api/config-and-storage-resources/persistent-volume-claim-v1/#:~:text=set%20to%20%27ResizeStarted%27.-,PersistentVolumeClaimCondition,-contains%20details%20about
                                       type: string
                                   required:
                                   - status
                                   - type
                                   type: object
                                 type: array
+                                x-kubernetes-list-map-keys:
+                                - type
+                                x-kubernetes-list-type: map
+                              currentVolumeAttributesClassName:
+                                description: |-
+                                  currentVolumeAttributesClassName is the current name of the VolumeAttributesClass the PVC is using.
+                                  When unset, there is no VolumeAttributeClass applied to this PersistentVolumeClaim
+                                  This is a beta field and requires enabling VolumeAttributesClass feature (off by default).
+                                type: string
+                              modifyVolumeStatus:
+                                description: |-
+                                  ModifyVolumeStatus represents the status object of ControllerModifyVolume operation.
+                                  When this is unset, there is no ModifyVolume operation being attempted.
+                                  This is a beta field and requires enabling VolumeAttributesClass feature (off by default).
+                                properties:
+                                  status:
+                                    description: "status is the status of the ControllerModifyVolume
+                                      operation. It can be in any of following states:\n
+                                      - Pending\n   Pending indicates that the PersistentVolumeClaim
+                                      cannot be modified due to unmet requirements,
+                                      such as\n   the specified VolumeAttributesClass
+                                      not existing.\n - InProgress\n   InProgress
+                                      indicates that the volume is being modified.\n
+                                      - Infeasible\n  Infeasible indicates that the
+                                      request has been rejected as invalid by the
+                                      CSI driver. To\n\t  resolve the error, a valid
+                                      VolumeAttributesClass needs to be specified.\nNote:
+                                      New statuses can be added in the future. Consumers
+                                      should check for unknown statuses and fail appropriately."
+                                    type: string
+                                  targetVolumeAttributesClassName:
+                                    description: targetVolumeAttributesClassName is
+                                      the name of the VolumeAttributesClass the PVC
+                                      currently being reconciled
+                                    type: string
+                                required:
+                                - status
+                                type: object
                               phase:
                                 description: phase represents the current phase of
                                   PersistentVolumeClaim.
                                 type: string
-                              resizeStatus:
-                                description: resizeStatus stores status of resize
-                                  operation. ResizeStatus is not set by default but
-                                  when expansion is complete resizeStatus is set to
-                                  empty string by resize controller or kubelet. This
-                                  is an alpha field and requires enabling RecoverVolumeExpansionFailure
-                                  feature.
-                                type: string
                             type: object
                         type: object
                     type: object
@@ -6150,41 +7645,39 @@ spec:
                     type: integer
                   tolerations:
                     items:
-                      description: The pod this Toleration is attached to tolerates
-                        any taint that matches the triple <key,value,effect> using
-                        the matching operator <operator>.
+                      description: |-
+                        The pod this Toleration is attached to tolerates any taint that matches
+                        the triple <key,value,effect> using the matching operator <operator>.
                       properties:
                         effect:
-                          description: Effect indicates the taint effect to match.
-                            Empty means match all taint effects. When specified, allowed
-                            values are NoSchedule, PreferNoSchedule and NoExecute.
+                          description: |-
+                            Effect indicates the taint effect to match. Empty means match all taint effects.
+                            When specified, allowed values are NoSchedule, PreferNoSchedule and NoExecute.
                           type: string
                         key:
-                          description: Key is the taint key that the toleration applies
-                            to. Empty means match all taint keys. If the key is empty,
-                            operator must be Exists; this combination means to match
-                            all values and all keys.
+                          description: |-
+                            Key is the taint key that the toleration applies to. Empty means match all taint keys.
+                            If the key is empty, operator must be Exists; this combination means to match all values and all keys.
                           type: string
                         operator:
-                          description: Operator represents a key's relationship to
-                            the value. Valid operators are Exists and Equal. Defaults
-                            to Equal. Exists is equivalent to wildcard for value,
-                            so that a pod can tolerate all taints of a particular
-                            category.
+                          description: |-
+                            Operator represents a key's relationship to the value.
+                            Valid operators are Exists and Equal. Defaults to Equal.
+                            Exists is equivalent to wildcard for value, so that a pod can
+                            tolerate all taints of a particular category.
                           type: string
                         tolerationSeconds:
-                          description: TolerationSeconds represents the period of
-                            time the toleration (which must be of effect NoExecute,
-                            otherwise this field is ignored) tolerates the taint.
-                            By default, it is not set, which means tolerate the taint
-                            forever (do not evict). Zero and negative values will
-                            be treated as 0 (evict immediately) by the system.
+                          description: |-
+                            TolerationSeconds represents the period of time the toleration (which must be
+                            of effect NoExecute, otherwise this field is ignored) tolerates the taint. By default,
+                            it is not set, which means tolerate the taint forever (do not evict). Zero and
+                            negative values will be treated as 0 (evict immediately) by the system.
                           format: int64
                           type: integer
                         value:
-                          description: Value is the taint value the toleration matches
-                            to. If the operator is Exists, the value should be empty,
-                            otherwise just a regular string.
+                          description: |-
+                            Value is the taint value the toleration matches to.
+                            If the operator is Exists, the value should be empty, otherwise just a regular string.
                           type: string
                       type: object
                     type: array
@@ -6194,16 +7687,17 @@ spec:
                         matching pods among the given topology.
                       properties:
                         labelSelector:
-                          description: LabelSelector is used to find matching pods.
-                            Pods that match this label selector are counted to determine
-                            the number of pods in their corresponding topology domain.
+                          description: |-
+                            LabelSelector is used to find matching pods.
+                            Pods that match this label selector are counted to determine the number of pods
+                            in their corresponding topology domain.
                           properties:
                             matchExpressions:
                               description: matchExpressions is a list of label selector
                                 requirements. The requirements are ANDed.
                               items:
-                                description: A label selector requirement is a selector
-                                  that contains values, a key, and an operator that
+                                description: |-
+                                  A label selector requirement is a selector that contains values, a key, and an operator that
                                   relates the key and values.
                                 properties:
                                   key:
@@ -6211,113 +7705,148 @@ spec:
                                       applies to.
                                     type: string
                                   operator:
-                                    description: operator represents a key's relationship
-                                      to a set of values. Valid operators are In,
-                                      NotIn, Exists and DoesNotExist.
+                                    description: |-
+                                      operator represents a key's relationship to a set of values.
+                                      Valid operators are In, NotIn, Exists and DoesNotExist.
                                     type: string
                                   values:
-                                    description: values is an array of string values.
-                                      If the operator is In or NotIn, the values array
-                                      must be non-empty. If the operator is Exists
-                                      or DoesNotExist, the values array must be empty.
-                                      This array is replaced during a strategic merge
-                                      patch.
+                                    description: |-
+                                      values is an array of string values. If the operator is In or NotIn,
+                                      the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                      the values array must be empty. This array is replaced during a strategic
+                                      merge patch.
                                     items:
                                       type: string
                                     type: array
+                                    x-kubernetes-list-type: atomic
                                 required:
                                 - key
                                 - operator
                                 type: object
                               type: array
+                              x-kubernetes-list-type: atomic
                             matchLabels:
                               additionalProperties:
                                 type: string
-                              description: matchLabels is a map of {key,value} pairs.
-                                A single {key,value} in the matchLabels map is equivalent
-                                to an element of matchExpressions, whose key field
-                                is "key", the operator is "In", and the values array
-                                contains only "value". The requirements are ANDed.
+                              description: |-
+                                matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                operator is "In", and the values array contains only "value". The requirements are ANDed.
                               type: object
                           type: object
+                          x-kubernetes-map-type: atomic
+                        matchLabelKeys:
+                          description: |-
+                            MatchLabelKeys is a set of pod label keys to select the pods over which
+                            spreading will be calculated. The keys are used to lookup values from the
+                            incoming pod labels, those key-value labels are ANDed with labelSelector
+                            to select the group of existing pods over which spreading will be calculated
+                            for the incoming pod. The same key is forbidden to exist in both MatchLabelKeys and LabelSelector.
+                            MatchLabelKeys cannot be set when LabelSelector isn't set.
+                            Keys that don't exist in the incoming pod labels will
+                            be ignored. A null or empty list means only match against labelSelector.
+
+                            This is a beta field and requires the MatchLabelKeysInPodTopologySpread feature gate to be enabled (enabled by default).
+                          items:
+                            type: string
+                          type: array
+                          x-kubernetes-list-type: atomic
                         maxSkew:
-                          description: 'MaxSkew describes the degree to which pods
-                            may be unevenly distributed. When `whenUnsatisfiable=DoNotSchedule`,
-                            it is the maximum permitted difference between the number
-                            of matching pods in the target topology and the global
-                            minimum. The global minimum is the minimum number of matching
-                            pods in an eligible domain or zero if the number of eligible
-                            domains is less than MinDomains. For example, in a 3-zone
-                            cluster, MaxSkew is set to 1, and pods with the same labelSelector
-                            spread as 2/2/1: In this case, the global minimum is 1.
-                            | zone1 | zone2 | zone3 | |  P P  |  P P  |   P   | -
-                            if MaxSkew is 1, incoming pod can only be scheduled to
-                            zone3 to become 2/2/2; scheduling it onto zone1(zone2)
-                            would make the ActualSkew(3-1) on zone1(zone2) violate
-                            MaxSkew(1). - if MaxSkew is 2, incoming pod can be scheduled
-                            onto any zone. When `whenUnsatisfiable=ScheduleAnyway`,
-                            it is used to give higher precedence to topologies that
-                            satisfy it. It''s a required field. Default value is 1
-                            and 0 is not allowed.'
+                          description: |-
+                            MaxSkew describes the degree to which pods may be unevenly distributed.
+                            When `whenUnsatisfiable=DoNotSchedule`, it is the maximum permitted difference
+                            between the number of matching pods in the target topology and the global minimum.
+                            The global minimum is the minimum number of matching pods in an eligible domain
+                            or zero if the number of eligible domains is less than MinDomains.
+                            For example, in a 3-zone cluster, MaxSkew is set to 1, and pods with the same
+                            labelSelector spread as 2/2/1:
+                            In this case, the global minimum is 1.
+                            | zone1 | zone2 | zone3 |
+                            |  P P  |  P P  |   P   |
+                            - if MaxSkew is 1, incoming pod can only be scheduled to zone3 to become 2/2/2;
+                            scheduling it onto zone1(zone2) would make the ActualSkew(3-1) on zone1(zone2)
+                            violate MaxSkew(1).
+                            - if MaxSkew is 2, incoming pod can be scheduled onto any zone.
+                            When `whenUnsatisfiable=ScheduleAnyway`, it is used to give higher precedence
+                            to topologies that satisfy it.
+                            It's a required field. Default value is 1 and 0 is not allowed.
                           format: int32
                           type: integer
                         minDomains:
-                          description: "MinDomains indicates a minimum number of eligible
-                            domains. When the number of eligible domains with matching
-                            topology keys is less than minDomains, Pod Topology Spread
-                            treats \"global minimum\" as 0, and then the calculation
-                            of Skew is performed. And when the number of eligible
-                            domains with matching topology keys equals or greater
-                            than minDomains, this value has no effect on scheduling.
-                            As a result, when the number of eligible domains is less
-                            than minDomains, scheduler won't schedule more than maxSkew
-                            Pods to those domains. If value is nil, the constraint
-                            behaves as if MinDomains is equal to 1. Valid values are
-                            integers greater than 0. When value is not nil, WhenUnsatisfiable
-                            must be DoNotSchedule. \n For example, in a 3-zone cluster,
-                            MaxSkew is set to 2, MinDomains is set to 5 and pods with
-                            the same labelSelector spread as 2/2/2: | zone1 | zone2
-                            | zone3 | |  P P  |  P P  |  P P  | The number of domains
-                            is less than 5(MinDomains), so \"global minimum\" is treated
-                            as 0. In this situation, new pod with the same labelSelector
-                            cannot be scheduled, because computed skew will be 3(3
-                            - 0) if new Pod is scheduled to any of the three zones,
-                            it will violate MaxSkew. \n This is an alpha field and
-                            requires enabling MinDomainsInPodTopologySpread feature
-                            gate."
+                          description: |-
+                            MinDomains indicates a minimum number of eligible domains.
+                            When the number of eligible domains with matching topology keys is less than minDomains,
+                            Pod Topology Spread treats "global minimum" as 0, and then the calculation of Skew is performed.
+                            And when the number of eligible domains with matching topology keys equals or greater than minDomains,
+                            this value has no effect on scheduling.
+                            As a result, when the number of eligible domains is less than minDomains,
+                            scheduler won't schedule more than maxSkew Pods to those domains.
+                            If value is nil, the constraint behaves as if MinDomains is equal to 1.
+                            Valid values are integers greater than 0.
+                            When value is not nil, WhenUnsatisfiable must be DoNotSchedule.
+
+                            For example, in a 3-zone cluster, MaxSkew is set to 2, MinDomains is set to 5 and pods with the same
+                            labelSelector spread as 2/2/2:
+                            | zone1 | zone2 | zone3 |
+                            |  P P  |  P P  |  P P  |
+                            The number of domains is less than 5(MinDomains), so "global minimum" is treated as 0.
+                            In this situation, new pod with the same labelSelector cannot be scheduled,
+                            because computed skew will be 3(3 - 0) if new Pod is scheduled to any of the three zones,
+                            it will violate MaxSkew.
                           format: int32
                           type: integer
+                        nodeAffinityPolicy:
+                          description: |-
+                            NodeAffinityPolicy indicates how we will treat Pod's nodeAffinity/nodeSelector
+                            when calculating pod topology spread skew. Options are:
+                            - Honor: only nodes matching nodeAffinity/nodeSelector are included in the calculations.
+                            - Ignore: nodeAffinity/nodeSelector are ignored. All nodes are included in the calculations.
+
+                            If this value is nil, the behavior is equivalent to the Honor policy.
+                          type: string
+                        nodeTaintsPolicy:
+                          description: |-
+                            NodeTaintsPolicy indicates how we will treat node taints when calculating
+                            pod topology spread skew. Options are:
+                            - Honor: nodes without taints, along with tainted nodes for which the incoming pod
+                            has a toleration, are included.
+                            - Ignore: node taints are ignored. All nodes are included.
+
+                            If this value is nil, the behavior is equivalent to the Ignore policy.
+                          type: string
                         topologyKey:
-                          description: TopologyKey is the key of node labels. Nodes
-                            that have a label with this key and identical values are
-                            considered to be in the same topology. We consider each
-                            <key, value> as a "bucket", and try to put balanced number
-                            of pods into each bucket. We define a domain as a particular
-                            instance of a topology. Also, we define an eligible domain
-                            as a domain whose nodes match the node selector. e.g.
-                            If TopologyKey is "kubernetes.io/hostname", each Node
-                            is a domain of that topology. And, if TopologyKey is "topology.kubernetes.io/zone",
-                            each zone is a domain of that topology. It's a required
-                            field.
+                          description: |-
+                            TopologyKey is the key of node labels. Nodes that have a label with this key
+                            and identical values are considered to be in the same topology.
+                            We consider each <key, value> as a "bucket", and try to put balanced number
+                            of pods into each bucket.
+                            We define a domain as a particular instance of a topology.
+                            Also, we define an eligible domain as a domain whose nodes meet the requirements of
+                            nodeAffinityPolicy and nodeTaintsPolicy.
+                            e.g. If TopologyKey is "kubernetes.io/hostname", each Node is a domain of that topology.
+                            And, if TopologyKey is "topology.kubernetes.io/zone", each zone is a domain of that topology.
+                            It's a required field.
                           type: string
                         whenUnsatisfiable:
-                          description: 'WhenUnsatisfiable indicates how to deal with
-                            a pod if it doesn''t satisfy the spread constraint. -
-                            DoNotSchedule (default) tells the scheduler not to schedule
-                            it. - ScheduleAnyway tells the scheduler to schedule the
-                            pod in any location,   but giving higher precedence to
-                            topologies that would help reduce the   skew. A constraint
-                            is considered "Unsatisfiable" for an incoming pod if and
-                            only if every possible node assignment for that pod would
-                            violate "MaxSkew" on some topology. For example, in a
-                            3-zone cluster, MaxSkew is set to 1, and pods with the
-                            same labelSelector spread as 3/1/1: | zone1 | zone2 |
-                            zone3 | | P P P |   P   |   P   | If WhenUnsatisfiable
-                            is set to DoNotSchedule, incoming pod can only be scheduled
-                            to zone2(zone3) to become 3/2/1(3/1/2) as ActualSkew(2-1)
-                            on zone2(zone3) satisfies MaxSkew(1). In other words,
-                            the cluster can still be imbalanced, but scheduler won''t
-                            make it *more* imbalanced. It''s a required field.'
+                          description: |-
+                            WhenUnsatisfiable indicates how to deal with a pod if it doesn't satisfy
+                            the spread constraint.
+                            - DoNotSchedule (default) tells the scheduler not to schedule it.
+                            - ScheduleAnyway tells the scheduler to schedule the pod in any location,
+                              but giving higher precedence to topologies that would help reduce the
+                              skew.
+                            A constraint is considered "Unsatisfiable" for an incoming pod
+                            if and only if every possible node assignment for that pod would violate
+                            "MaxSkew" on some topology.
+                            For example, in a 3-zone cluster, MaxSkew is set to 1, and pods with the same
+                            labelSelector spread as 3/1/1:
+                            | zone1 | zone2 | zone3 |
+                            | P P P |   P   |   P   |
+                            If WhenUnsatisfiable is set to DoNotSchedule, incoming pod can only be scheduled
+                            to zone2(zone3) to become 3/2/1(3/1/2) as ActualSkew(2-1) on zone2(zone3) satisfies
+                            MaxSkew(1). In other words, the cluster can still be imbalanced, but scheduler
+                            won't make it *more* imbalanced.
+                            It's a required field.
                           type: string
                       required:
                       - maxSkew
@@ -6338,22 +7867,20 @@ spec:
                           the pod.
                         properties:
                           preferredDuringSchedulingIgnoredDuringExecution:
-                            description: The scheduler will prefer to schedule pods
-                              to nodes that satisfy the affinity expressions specified
-                              by this field, but it may choose a node that violates
-                              one or more of the expressions. The node that is most
-                              preferred is the one with the greatest sum of weights,
-                              i.e. for each node that meets all of the scheduling
-                              requirements (resource request, requiredDuringScheduling
-                              affinity expressions, etc.), compute a sum by iterating
-                              through the elements of this field and adding "weight"
-                              to the sum if the node matches the corresponding matchExpressions;
-                              the node(s) with the highest sum are the most preferred.
+                            description: |-
+                              The scheduler will prefer to schedule pods to nodes that satisfy
+                              the affinity expressions specified by this field, but it may choose
+                              a node that violates one or more of the expressions. The node that is
+                              most preferred is the one with the greatest sum of weights, i.e.
+                              for each node that meets all of the scheduling requirements (resource
+                              request, requiredDuringScheduling affinity expressions, etc.),
+                              compute a sum by iterating through the elements of this field and adding
+                              "weight" to the sum if the node matches the corresponding matchExpressions; the
+                              node(s) with the highest sum are the most preferred.
                             items:
-                              description: An empty preferred scheduling term matches
-                                all objects with implicit weight 0 (i.e. it's a no-op).
-                                A null preferred scheduling term matches no objects
-                                (i.e. is also a no-op).
+                              description: |-
+                                An empty preferred scheduling term matches all objects with implicit weight 0
+                                (i.e. it's a no-op). A null preferred scheduling term matches no objects (i.e. is also a no-op).
                               properties:
                                 preference:
                                   description: A node selector term, associated with
@@ -6363,79 +7890,72 @@ spec:
                                       description: A list of node selector requirements
                                         by node's labels.
                                       items:
-                                        description: A node selector requirement is
-                                          a selector that contains values, a key,
-                                          and an operator that relates the key and
-                                          values.
+                                        description: |-
+                                          A node selector requirement is a selector that contains values, a key, and an operator
+                                          that relates the key and values.
                                         properties:
                                           key:
                                             description: The label key that the selector
                                               applies to.
                                             type: string
                                           operator:
-                                            description: Represents a key's relationship
-                                              to a set of values. Valid operators
-                                              are In, NotIn, Exists, DoesNotExist.
-                                              Gt, and Lt.
+                                            description: |-
+                                              Represents a key's relationship to a set of values.
+                                              Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt.
                                             type: string
                                           values:
-                                            description: An array of string values.
-                                              If the operator is In or NotIn, the
-                                              values array must be non-empty. If the
-                                              operator is Exists or DoesNotExist,
-                                              the values array must be empty. If the
-                                              operator is Gt or Lt, the values array
-                                              must have a single element, which will
-                                              be interpreted as an integer. This array
-                                              is replaced during a strategic merge
-                                              patch.
+                                            description: |-
+                                              An array of string values. If the operator is In or NotIn,
+                                              the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                              the values array must be empty. If the operator is Gt or Lt, the values
+                                              array must have a single element, which will be interpreted as an integer.
+                                              This array is replaced during a strategic merge patch.
                                             items:
                                               type: string
                                             type: array
+                                            x-kubernetes-list-type: atomic
                                         required:
                                         - key
                                         - operator
                                         type: object
                                       type: array
+                                      x-kubernetes-list-type: atomic
                                     matchFields:
                                       description: A list of node selector requirements
                                         by node's fields.
                                       items:
-                                        description: A node selector requirement is
-                                          a selector that contains values, a key,
-                                          and an operator that relates the key and
-                                          values.
+                                        description: |-
+                                          A node selector requirement is a selector that contains values, a key, and an operator
+                                          that relates the key and values.
                                         properties:
                                           key:
                                             description: The label key that the selector
                                               applies to.
                                             type: string
                                           operator:
-                                            description: Represents a key's relationship
-                                              to a set of values. Valid operators
-                                              are In, NotIn, Exists, DoesNotExist.
-                                              Gt, and Lt.
+                                            description: |-
+                                              Represents a key's relationship to a set of values.
+                                              Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt.
                                             type: string
                                           values:
-                                            description: An array of string values.
-                                              If the operator is In or NotIn, the
-                                              values array must be non-empty. If the
-                                              operator is Exists or DoesNotExist,
-                                              the values array must be empty. If the
-                                              operator is Gt or Lt, the values array
-                                              must have a single element, which will
-                                              be interpreted as an integer. This array
-                                              is replaced during a strategic merge
-                                              patch.
+                                            description: |-
+                                              An array of string values. If the operator is In or NotIn,
+                                              the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                              the values array must be empty. If the operator is Gt or Lt, the values
+                                              array must have a single element, which will be interpreted as an integer.
+                                              This array is replaced during a strategic merge patch.
                                             items:
                                               type: string
                                             type: array
+                                            x-kubernetes-list-type: atomic
                                         required:
                                         - key
                                         - operator
                                         type: object
                                       type: array
+                                      x-kubernetes-list-type: atomic
                                   type: object
+                                  x-kubernetes-map-type: atomic
                                 weight:
                                   description: Weight associated with matching the
                                     corresponding nodeSelectorTerm, in the range 1-100.
@@ -6446,105 +7966,100 @@ spec:
                               - weight
                               type: object
                             type: array
+                            x-kubernetes-list-type: atomic
                           requiredDuringSchedulingIgnoredDuringExecution:
-                            description: If the affinity requirements specified by
-                              this field are not met at scheduling time, the pod will
-                              not be scheduled onto the node. If the affinity requirements
-                              specified by this field cease to be met at some point
-                              during pod execution (e.g. due to an update), the system
-                              may or may not try to eventually evict the pod from
-                              its node.
+                            description: |-
+                              If the affinity requirements specified by this field are not met at
+                              scheduling time, the pod will not be scheduled onto the node.
+                              If the affinity requirements specified by this field cease to be met
+                              at some point during pod execution (e.g. due to an update), the system
+                              may or may not try to eventually evict the pod from its node.
                             properties:
                               nodeSelectorTerms:
                                 description: Required. A list of node selector terms.
                                   The terms are ORed.
                                 items:
-                                  description: A null or empty node selector term
-                                    matches no objects. The requirements of them are
-                                    ANDed. The TopologySelectorTerm type implements
-                                    a subset of the NodeSelectorTerm.
+                                  description: |-
+                                    A null or empty node selector term matches no objects. The requirements of
+                                    them are ANDed.
+                                    The TopologySelectorTerm type implements a subset of the NodeSelectorTerm.
                                   properties:
                                     matchExpressions:
                                       description: A list of node selector requirements
                                         by node's labels.
                                       items:
-                                        description: A node selector requirement is
-                                          a selector that contains values, a key,
-                                          and an operator that relates the key and
-                                          values.
+                                        description: |-
+                                          A node selector requirement is a selector that contains values, a key, and an operator
+                                          that relates the key and values.
                                         properties:
                                           key:
                                             description: The label key that the selector
                                               applies to.
                                             type: string
                                           operator:
-                                            description: Represents a key's relationship
-                                              to a set of values. Valid operators
-                                              are In, NotIn, Exists, DoesNotExist.
-                                              Gt, and Lt.
+                                            description: |-
+                                              Represents a key's relationship to a set of values.
+                                              Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt.
                                             type: string
                                           values:
-                                            description: An array of string values.
-                                              If the operator is In or NotIn, the
-                                              values array must be non-empty. If the
-                                              operator is Exists or DoesNotExist,
-                                              the values array must be empty. If the
-                                              operator is Gt or Lt, the values array
-                                              must have a single element, which will
-                                              be interpreted as an integer. This array
-                                              is replaced during a strategic merge
-                                              patch.
+                                            description: |-
+                                              An array of string values. If the operator is In or NotIn,
+                                              the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                              the values array must be empty. If the operator is Gt or Lt, the values
+                                              array must have a single element, which will be interpreted as an integer.
+                                              This array is replaced during a strategic merge patch.
                                             items:
                                               type: string
                                             type: array
+                                            x-kubernetes-list-type: atomic
                                         required:
                                         - key
                                         - operator
                                         type: object
                                       type: array
+                                      x-kubernetes-list-type: atomic
                                     matchFields:
                                       description: A list of node selector requirements
                                         by node's fields.
                                       items:
-                                        description: A node selector requirement is
-                                          a selector that contains values, a key,
-                                          and an operator that relates the key and
-                                          values.
+                                        description: |-
+                                          A node selector requirement is a selector that contains values, a key, and an operator
+                                          that relates the key and values.
                                         properties:
                                           key:
                                             description: The label key that the selector
                                               applies to.
                                             type: string
                                           operator:
-                                            description: Represents a key's relationship
-                                              to a set of values. Valid operators
-                                              are In, NotIn, Exists, DoesNotExist.
-                                              Gt, and Lt.
+                                            description: |-
+                                              Represents a key's relationship to a set of values.
+                                              Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt.
                                             type: string
                                           values:
-                                            description: An array of string values.
-                                              If the operator is In or NotIn, the
-                                              values array must be non-empty. If the
-                                              operator is Exists or DoesNotExist,
-                                              the values array must be empty. If the
-                                              operator is Gt or Lt, the values array
-                                              must have a single element, which will
-                                              be interpreted as an integer. This array
-                                              is replaced during a strategic merge
-                                              patch.
+                                            description: |-
+                                              An array of string values. If the operator is In or NotIn,
+                                              the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                              the values array must be empty. If the operator is Gt or Lt, the values
+                                              array must have a single element, which will be interpreted as an integer.
+                                              This array is replaced during a strategic merge patch.
                                             items:
                                               type: string
                                             type: array
+                                            x-kubernetes-list-type: atomic
                                         required:
                                         - key
                                         - operator
                                         type: object
                                       type: array
+                                      x-kubernetes-list-type: atomic
                                   type: object
+                                  x-kubernetes-map-type: atomic
                                 type: array
+                                x-kubernetes-list-type: atomic
                             required:
                             - nodeSelectorTerms
                             type: object
+                            x-kubernetes-map-type: atomic
                         type: object
                       podAffinity:
                         description: Describes pod affinity scheduling rules (e.g.
@@ -6552,18 +8067,16 @@ spec:
                           other pod(s)).
                         properties:
                           preferredDuringSchedulingIgnoredDuringExecution:
-                            description: The scheduler will prefer to schedule pods
-                              to nodes that satisfy the affinity expressions specified
-                              by this field, but it may choose a node that violates
-                              one or more of the expressions. The node that is most
-                              preferred is the one with the greatest sum of weights,
-                              i.e. for each node that meets all of the scheduling
-                              requirements (resource request, requiredDuringScheduling
-                              affinity expressions, etc.), compute a sum by iterating
-                              through the elements of this field and adding "weight"
-                              to the sum if the node has pods which matches the corresponding
-                              podAffinityTerm; the node(s) with the highest sum are
-                              the most preferred.
+                            description: |-
+                              The scheduler will prefer to schedule pods to nodes that satisfy
+                              the affinity expressions specified by this field, but it may choose
+                              a node that violates one or more of the expressions. The node that is
+                              most preferred is the one with the greatest sum of weights, i.e.
+                              for each node that meets all of the scheduling requirements (resource
+                              request, requiredDuringScheduling affinity expressions, etc.),
+                              compute a sum by iterating through the elements of this field and adding
+                              "weight" to the sum if the node has pods which matches the corresponding podAffinityTerm; the
+                              node(s) with the highest sum are the most preferred.
                             items:
                               description: The weights of all of the matched WeightedPodAffinityTerm
                                 fields are added per-node to find the most preferred
@@ -6574,141 +8087,159 @@ spec:
                                     with the corresponding weight.
                                   properties:
                                     labelSelector:
-                                      description: A label query over a set of resources,
-                                        in this case pods.
+                                      description: |-
+                                        A label query over a set of resources, in this case pods.
+                                        If it's null, this PodAffinityTerm matches with no Pods.
                                       properties:
                                         matchExpressions:
                                           description: matchExpressions is a list
                                             of label selector requirements. The requirements
                                             are ANDed.
                                           items:
-                                            description: A label selector requirement
-                                              is a selector that contains values,
-                                              a key, and an operator that relates
-                                              the key and values.
+                                            description: |-
+                                              A label selector requirement is a selector that contains values, a key, and an operator that
+                                              relates the key and values.
                                             properties:
                                               key:
                                                 description: key is the label key
                                                   that the selector applies to.
                                                 type: string
                                               operator:
-                                                description: operator represents a
-                                                  key's relationship to a set of values.
-                                                  Valid operators are In, NotIn, Exists
-                                                  and DoesNotExist.
+                                                description: |-
+                                                  operator represents a key's relationship to a set of values.
+                                                  Valid operators are In, NotIn, Exists and DoesNotExist.
                                                 type: string
                                               values:
-                                                description: values is an array of
-                                                  string values. If the operator is
-                                                  In or NotIn, the values array must
-                                                  be non-empty. If the operator is
-                                                  Exists or DoesNotExist, the values
-                                                  array must be empty. This array
-                                                  is replaced during a strategic merge
-                                                  patch.
+                                                description: |-
+                                                  values is an array of string values. If the operator is In or NotIn,
+                                                  the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                                  the values array must be empty. This array is replaced during a strategic
+                                                  merge patch.
                                                 items:
                                                   type: string
                                                 type: array
+                                                x-kubernetes-list-type: atomic
                                             required:
                                             - key
                                             - operator
                                             type: object
                                           type: array
+                                          x-kubernetes-list-type: atomic
                                         matchLabels:
                                           additionalProperties:
                                             type: string
-                                          description: matchLabels is a map of {key,value}
-                                            pairs. A single {key,value} in the matchLabels
-                                            map is equivalent to an element of matchExpressions,
-                                            whose key field is "key", the operator
-                                            is "In", and the values array contains
-                                            only "value". The requirements are ANDed.
+                                          description: |-
+                                            matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                            map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                            operator is "In", and the values array contains only "value". The requirements are ANDed.
                                           type: object
                                       type: object
+                                      x-kubernetes-map-type: atomic
+                                    matchLabelKeys:
+                                      description: |-
+                                        MatchLabelKeys is a set of pod label keys to select which pods will
+                                        be taken into consideration. The keys are used to lookup values from the
+                                        incoming pod labels, those key-value labels are merged with `labelSelector` as `key in (value)`
+                                        to select the group of existing pods which pods will be taken into consideration
+                                        for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+                                        pod labels will be ignored. The default value is empty.
+                                        The same key is forbidden to exist in both matchLabelKeys and labelSelector.
+                                        Also, matchLabelKeys cannot be set when labelSelector isn't set.
+                                      items:
+                                        type: string
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    mismatchLabelKeys:
+                                      description: |-
+                                        MismatchLabelKeys is a set of pod label keys to select which pods will
+                                        be taken into consideration. The keys are used to lookup values from the
+                                        incoming pod labels, those key-value labels are merged with `labelSelector` as `key notin (value)`
+                                        to select the group of existing pods which pods will be taken into consideration
+                                        for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+                                        pod labels will be ignored. The default value is empty.
+                                        The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
+                                        Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
+                                      items:
+                                        type: string
+                                      type: array
+                                      x-kubernetes-list-type: atomic
                                     namespaceSelector:
-                                      description: A label query over the set of namespaces
-                                        that the term applies to. The term is applied
-                                        to the union of the namespaces selected by
-                                        this field and the ones listed in the namespaces
-                                        field. null selector and null or empty namespaces
-                                        list means "this pod's namespace". An empty
-                                        selector ({}) matches all namespaces.
+                                      description: |-
+                                        A label query over the set of namespaces that the term applies to.
+                                        The term is applied to the union of the namespaces selected by this field
+                                        and the ones listed in the namespaces field.
+                                        null selector and null or empty namespaces list means "this pod's namespace".
+                                        An empty selector ({}) matches all namespaces.
                                       properties:
                                         matchExpressions:
                                           description: matchExpressions is a list
                                             of label selector requirements. The requirements
                                             are ANDed.
                                           items:
-                                            description: A label selector requirement
-                                              is a selector that contains values,
-                                              a key, and an operator that relates
-                                              the key and values.
+                                            description: |-
+                                              A label selector requirement is a selector that contains values, a key, and an operator that
+                                              relates the key and values.
                                             properties:
                                               key:
                                                 description: key is the label key
                                                   that the selector applies to.
                                                 type: string
                                               operator:
-                                                description: operator represents a
-                                                  key's relationship to a set of values.
-                                                  Valid operators are In, NotIn, Exists
-                                                  and DoesNotExist.
+                                                description: |-
+                                                  operator represents a key's relationship to a set of values.
+                                                  Valid operators are In, NotIn, Exists and DoesNotExist.
                                                 type: string
                                               values:
-                                                description: values is an array of
-                                                  string values. If the operator is
-                                                  In or NotIn, the values array must
-                                                  be non-empty. If the operator is
-                                                  Exists or DoesNotExist, the values
-                                                  array must be empty. This array
-                                                  is replaced during a strategic merge
-                                                  patch.
+                                                description: |-
+                                                  values is an array of string values. If the operator is In or NotIn,
+                                                  the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                                  the values array must be empty. This array is replaced during a strategic
+                                                  merge patch.
                                                 items:
                                                   type: string
                                                 type: array
+                                                x-kubernetes-list-type: atomic
                                             required:
                                             - key
                                             - operator
                                             type: object
                                           type: array
+                                          x-kubernetes-list-type: atomic
                                         matchLabels:
                                           additionalProperties:
                                             type: string
-                                          description: matchLabels is a map of {key,value}
-                                            pairs. A single {key,value} in the matchLabels
-                                            map is equivalent to an element of matchExpressions,
-                                            whose key field is "key", the operator
-                                            is "In", and the values array contains
-                                            only "value". The requirements are ANDed.
+                                          description: |-
+                                            matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                            map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                            operator is "In", and the values array contains only "value". The requirements are ANDed.
                                           type: object
                                       type: object
+                                      x-kubernetes-map-type: atomic
                                     namespaces:
-                                      description: namespaces specifies a static list
-                                        of namespace names that the term applies to.
-                                        The term is applied to the union of the namespaces
-                                        listed in this field and the ones selected
-                                        by namespaceSelector. null or empty namespaces
-                                        list and null namespaceSelector means "this
-                                        pod's namespace".
+                                      description: |-
+                                        namespaces specifies a static list of namespace names that the term applies to.
+                                        The term is applied to the union of the namespaces listed in this field
+                                        and the ones selected by namespaceSelector.
+                                        null or empty namespaces list and null namespaceSelector means "this pod's namespace".
                                       items:
                                         type: string
                                       type: array
+                                      x-kubernetes-list-type: atomic
                                     topologyKey:
-                                      description: This pod should be co-located (affinity)
-                                        or not co-located (anti-affinity) with the
-                                        pods matching the labelSelector in the specified
-                                        namespaces, where co-located is defined as
-                                        running on a node whose value of the label
-                                        with key topologyKey matches that of any node
-                                        on which any of the selected pods is running.
+                                      description: |-
+                                        This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching
+                                        the labelSelector in the specified namespaces, where co-located is defined as running on a node
+                                        whose value of the label with key topologyKey matches that of any node on which any of the
+                                        selected pods is running.
                                         Empty topologyKey is not allowed.
                                       type: string
                                   required:
                                   - topologyKey
                                   type: object
                                 weight:
-                                  description: weight associated with matching the
-                                    corresponding podAffinityTerm, in the range 1-100.
+                                  description: |-
+                                    weight associated with matching the corresponding podAffinityTerm,
+                                    in the range 1-100.
                                   format: int32
                                   type: integer
                               required:
@@ -6716,155 +8247,177 @@ spec:
                               - weight
                               type: object
                             type: array
+                            x-kubernetes-list-type: atomic
                           requiredDuringSchedulingIgnoredDuringExecution:
-                            description: If the affinity requirements specified by
-                              this field are not met at scheduling time, the pod will
-                              not be scheduled onto the node. If the affinity requirements
-                              specified by this field cease to be met at some point
-                              during pod execution (e.g. due to a pod label update),
-                              the system may or may not try to eventually evict the
-                              pod from its node. When there are multiple elements,
-                              the lists of nodes corresponding to each podAffinityTerm
-                              are intersected, i.e. all terms must be satisfied.
+                            description: |-
+                              If the affinity requirements specified by this field are not met at
+                              scheduling time, the pod will not be scheduled onto the node.
+                              If the affinity requirements specified by this field cease to be met
+                              at some point during pod execution (e.g. due to a pod label update), the
+                              system may or may not try to eventually evict the pod from its node.
+                              When there are multiple elements, the lists of nodes corresponding to each
+                              podAffinityTerm are intersected, i.e. all terms must be satisfied.
                             items:
-                              description: Defines a set of pods (namely those matching
-                                the labelSelector relative to the given namespace(s))
-                                that this pod should be co-located (affinity) or not
-                                co-located (anti-affinity) with, where co-located
-                                is defined as running on a node whose value of the
-                                label with key <topologyKey> matches that of any node
-                                on which a pod of the set of pods is running
+                              description: |-
+                                Defines a set of pods (namely those matching the labelSelector
+                                relative to the given namespace(s)) that this pod should be
+                                co-located (affinity) or not co-located (anti-affinity) with,
+                                where co-located is defined as running on a node whose value of
+                                the label with key <topologyKey> matches that of any node on which
+                                a pod of the set of pods is running
                               properties:
                                 labelSelector:
-                                  description: A label query over a set of resources,
-                                    in this case pods.
+                                  description: |-
+                                    A label query over a set of resources, in this case pods.
+                                    If it's null, this PodAffinityTerm matches with no Pods.
                                   properties:
                                     matchExpressions:
                                       description: matchExpressions is a list of label
                                         selector requirements. The requirements are
                                         ANDed.
                                       items:
-                                        description: A label selector requirement
-                                          is a selector that contains values, a key,
-                                          and an operator that relates the key and
-                                          values.
+                                        description: |-
+                                          A label selector requirement is a selector that contains values, a key, and an operator that
+                                          relates the key and values.
                                         properties:
                                           key:
                                             description: key is the label key that
                                               the selector applies to.
                                             type: string
                                           operator:
-                                            description: operator represents a key's
-                                              relationship to a set of values. Valid
-                                              operators are In, NotIn, Exists and
-                                              DoesNotExist.
+                                            description: |-
+                                              operator represents a key's relationship to a set of values.
+                                              Valid operators are In, NotIn, Exists and DoesNotExist.
                                             type: string
                                           values:
-                                            description: values is an array of string
-                                              values. If the operator is In or NotIn,
-                                              the values array must be non-empty.
-                                              If the operator is Exists or DoesNotExist,
-                                              the values array must be empty. This
-                                              array is replaced during a strategic
+                                            description: |-
+                                              values is an array of string values. If the operator is In or NotIn,
+                                              the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                              the values array must be empty. This array is replaced during a strategic
                                               merge patch.
                                             items:
                                               type: string
                                             type: array
+                                            x-kubernetes-list-type: atomic
                                         required:
                                         - key
                                         - operator
                                         type: object
                                       type: array
+                                      x-kubernetes-list-type: atomic
                                     matchLabels:
                                       additionalProperties:
                                         type: string
-                                      description: matchLabels is a map of {key,value}
-                                        pairs. A single {key,value} in the matchLabels
-                                        map is equivalent to an element of matchExpressions,
-                                        whose key field is "key", the operator is
-                                        "In", and the values array contains only "value".
-                                        The requirements are ANDed.
+                                      description: |-
+                                        matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                        map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                        operator is "In", and the values array contains only "value". The requirements are ANDed.
                                       type: object
                                   type: object
+                                  x-kubernetes-map-type: atomic
+                                matchLabelKeys:
+                                  description: |-
+                                    MatchLabelKeys is a set of pod label keys to select which pods will
+                                    be taken into consideration. The keys are used to lookup values from the
+                                    incoming pod labels, those key-value labels are merged with `labelSelector` as `key in (value)`
+                                    to select the group of existing pods which pods will be taken into consideration
+                                    for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+                                    pod labels will be ignored. The default value is empty.
+                                    The same key is forbidden to exist in both matchLabelKeys and labelSelector.
+                                    Also, matchLabelKeys cannot be set when labelSelector isn't set.
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                mismatchLabelKeys:
+                                  description: |-
+                                    MismatchLabelKeys is a set of pod label keys to select which pods will
+                                    be taken into consideration. The keys are used to lookup values from the
+                                    incoming pod labels, those key-value labels are merged with `labelSelector` as `key notin (value)`
+                                    to select the group of existing pods which pods will be taken into consideration
+                                    for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+                                    pod labels will be ignored. The default value is empty.
+                                    The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
+                                    Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
                                 namespaceSelector:
-                                  description: A label query over the set of namespaces
-                                    that the term applies to. The term is applied
-                                    to the union of the namespaces selected by this
-                                    field and the ones listed in the namespaces field.
-                                    null selector and null or empty namespaces list
-                                    means "this pod's namespace". An empty selector
-                                    ({}) matches all namespaces.
+                                  description: |-
+                                    A label query over the set of namespaces that the term applies to.
+                                    The term is applied to the union of the namespaces selected by this field
+                                    and the ones listed in the namespaces field.
+                                    null selector and null or empty namespaces list means "this pod's namespace".
+                                    An empty selector ({}) matches all namespaces.
                                   properties:
                                     matchExpressions:
                                       description: matchExpressions is a list of label
                                         selector requirements. The requirements are
                                         ANDed.
                                       items:
-                                        description: A label selector requirement
-                                          is a selector that contains values, a key,
-                                          and an operator that relates the key and
-                                          values.
+                                        description: |-
+                                          A label selector requirement is a selector that contains values, a key, and an operator that
+                                          relates the key and values.
                                         properties:
                                           key:
                                             description: key is the label key that
                                               the selector applies to.
                                             type: string
                                           operator:
-                                            description: operator represents a key's
-                                              relationship to a set of values. Valid
-                                              operators are In, NotIn, Exists and
-                                              DoesNotExist.
+                                            description: |-
+                                              operator represents a key's relationship to a set of values.
+                                              Valid operators are In, NotIn, Exists and DoesNotExist.
                                             type: string
                                           values:
-                                            description: values is an array of string
-                                              values. If the operator is In or NotIn,
-                                              the values array must be non-empty.
-                                              If the operator is Exists or DoesNotExist,
-                                              the values array must be empty. This
-                                              array is replaced during a strategic
+                                            description: |-
+                                              values is an array of string values. If the operator is In or NotIn,
+                                              the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                              the values array must be empty. This array is replaced during a strategic
                                               merge patch.
                                             items:
                                               type: string
                                             type: array
+                                            x-kubernetes-list-type: atomic
                                         required:
                                         - key
                                         - operator
                                         type: object
                                       type: array
+                                      x-kubernetes-list-type: atomic
                                     matchLabels:
                                       additionalProperties:
                                         type: string
-                                      description: matchLabels is a map of {key,value}
-                                        pairs. A single {key,value} in the matchLabels
-                                        map is equivalent to an element of matchExpressions,
-                                        whose key field is "key", the operator is
-                                        "In", and the values array contains only "value".
-                                        The requirements are ANDed.
+                                      description: |-
+                                        matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                        map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                        operator is "In", and the values array contains only "value". The requirements are ANDed.
                                       type: object
                                   type: object
+                                  x-kubernetes-map-type: atomic
                                 namespaces:
-                                  description: namespaces specifies a static list
-                                    of namespace names that the term applies to. The
-                                    term is applied to the union of the namespaces
-                                    listed in this field and the ones selected by
-                                    namespaceSelector. null or empty namespaces list
-                                    and null namespaceSelector means "this pod's namespace".
+                                  description: |-
+                                    namespaces specifies a static list of namespace names that the term applies to.
+                                    The term is applied to the union of the namespaces listed in this field
+                                    and the ones selected by namespaceSelector.
+                                    null or empty namespaces list and null namespaceSelector means "this pod's namespace".
                                   items:
                                     type: string
                                   type: array
+                                  x-kubernetes-list-type: atomic
                                 topologyKey:
-                                  description: This pod should be co-located (affinity)
-                                    or not co-located (anti-affinity) with the pods
-                                    matching the labelSelector in the specified namespaces,
-                                    where co-located is defined as running on a node
-                                    whose value of the label with key topologyKey
-                                    matches that of any node on which any of the selected
-                                    pods is running. Empty topologyKey is not allowed.
+                                  description: |-
+                                    This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching
+                                    the labelSelector in the specified namespaces, where co-located is defined as running on a node
+                                    whose value of the label with key topologyKey matches that of any node on which any of the
+                                    selected pods is running.
+                                    Empty topologyKey is not allowed.
                                   type: string
                               required:
                               - topologyKey
                               type: object
                             type: array
+                            x-kubernetes-list-type: atomic
                         type: object
                       podAntiAffinity:
                         description: Describes pod anti-affinity scheduling rules
@@ -6872,18 +8425,16 @@ spec:
                           as some other pod(s)).
                         properties:
                           preferredDuringSchedulingIgnoredDuringExecution:
-                            description: The scheduler will prefer to schedule pods
-                              to nodes that satisfy the anti-affinity expressions
-                              specified by this field, but it may choose a node that
-                              violates one or more of the expressions. The node that
-                              is most preferred is the one with the greatest sum of
-                              weights, i.e. for each node that meets all of the scheduling
-                              requirements (resource request, requiredDuringScheduling
-                              anti-affinity expressions, etc.), compute a sum by iterating
-                              through the elements of this field and adding "weight"
-                              to the sum if the node has pods which matches the corresponding
-                              podAffinityTerm; the node(s) with the highest sum are
-                              the most preferred.
+                            description: |-
+                              The scheduler will prefer to schedule pods to nodes that satisfy
+                              the anti-affinity expressions specified by this field, but it may choose
+                              a node that violates one or more of the expressions. The node that is
+                              most preferred is the one with the greatest sum of weights, i.e.
+                              for each node that meets all of the scheduling requirements (resource
+                              request, requiredDuringScheduling anti-affinity expressions, etc.),
+                              compute a sum by iterating through the elements of this field and adding
+                              "weight" to the sum if the node has pods which matches the corresponding podAffinityTerm; the
+                              node(s) with the highest sum are the most preferred.
                             items:
                               description: The weights of all of the matched WeightedPodAffinityTerm
                                 fields are added per-node to find the most preferred
@@ -6894,141 +8445,159 @@ spec:
                                     with the corresponding weight.
                                   properties:
                                     labelSelector:
-                                      description: A label query over a set of resources,
-                                        in this case pods.
+                                      description: |-
+                                        A label query over a set of resources, in this case pods.
+                                        If it's null, this PodAffinityTerm matches with no Pods.
                                       properties:
                                         matchExpressions:
                                           description: matchExpressions is a list
                                             of label selector requirements. The requirements
                                             are ANDed.
                                           items:
-                                            description: A label selector requirement
-                                              is a selector that contains values,
-                                              a key, and an operator that relates
-                                              the key and values.
+                                            description: |-
+                                              A label selector requirement is a selector that contains values, a key, and an operator that
+                                              relates the key and values.
                                             properties:
                                               key:
                                                 description: key is the label key
                                                   that the selector applies to.
                                                 type: string
                                               operator:
-                                                description: operator represents a
-                                                  key's relationship to a set of values.
-                                                  Valid operators are In, NotIn, Exists
-                                                  and DoesNotExist.
+                                                description: |-
+                                                  operator represents a key's relationship to a set of values.
+                                                  Valid operators are In, NotIn, Exists and DoesNotExist.
                                                 type: string
                                               values:
-                                                description: values is an array of
-                                                  string values. If the operator is
-                                                  In or NotIn, the values array must
-                                                  be non-empty. If the operator is
-                                                  Exists or DoesNotExist, the values
-                                                  array must be empty. This array
-                                                  is replaced during a strategic merge
-                                                  patch.
+                                                description: |-
+                                                  values is an array of string values. If the operator is In or NotIn,
+                                                  the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                                  the values array must be empty. This array is replaced during a strategic
+                                                  merge patch.
                                                 items:
                                                   type: string
                                                 type: array
+                                                x-kubernetes-list-type: atomic
                                             required:
                                             - key
                                             - operator
                                             type: object
                                           type: array
+                                          x-kubernetes-list-type: atomic
                                         matchLabels:
                                           additionalProperties:
                                             type: string
-                                          description: matchLabels is a map of {key,value}
-                                            pairs. A single {key,value} in the matchLabels
-                                            map is equivalent to an element of matchExpressions,
-                                            whose key field is "key", the operator
-                                            is "In", and the values array contains
-                                            only "value". The requirements are ANDed.
+                                          description: |-
+                                            matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                            map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                            operator is "In", and the values array contains only "value". The requirements are ANDed.
                                           type: object
                                       type: object
+                                      x-kubernetes-map-type: atomic
+                                    matchLabelKeys:
+                                      description: |-
+                                        MatchLabelKeys is a set of pod label keys to select which pods will
+                                        be taken into consideration. The keys are used to lookup values from the
+                                        incoming pod labels, those key-value labels are merged with `labelSelector` as `key in (value)`
+                                        to select the group of existing pods which pods will be taken into consideration
+                                        for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+                                        pod labels will be ignored. The default value is empty.
+                                        The same key is forbidden to exist in both matchLabelKeys and labelSelector.
+                                        Also, matchLabelKeys cannot be set when labelSelector isn't set.
+                                      items:
+                                        type: string
+                                      type: array
+                                      x-kubernetes-list-type: atomic
+                                    mismatchLabelKeys:
+                                      description: |-
+                                        MismatchLabelKeys is a set of pod label keys to select which pods will
+                                        be taken into consideration. The keys are used to lookup values from the
+                                        incoming pod labels, those key-value labels are merged with `labelSelector` as `key notin (value)`
+                                        to select the group of existing pods which pods will be taken into consideration
+                                        for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+                                        pod labels will be ignored. The default value is empty.
+                                        The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
+                                        Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
+                                      items:
+                                        type: string
+                                      type: array
+                                      x-kubernetes-list-type: atomic
                                     namespaceSelector:
-                                      description: A label query over the set of namespaces
-                                        that the term applies to. The term is applied
-                                        to the union of the namespaces selected by
-                                        this field and the ones listed in the namespaces
-                                        field. null selector and null or empty namespaces
-                                        list means "this pod's namespace". An empty
-                                        selector ({}) matches all namespaces.
+                                      description: |-
+                                        A label query over the set of namespaces that the term applies to.
+                                        The term is applied to the union of the namespaces selected by this field
+                                        and the ones listed in the namespaces field.
+                                        null selector and null or empty namespaces list means "this pod's namespace".
+                                        An empty selector ({}) matches all namespaces.
                                       properties:
                                         matchExpressions:
                                           description: matchExpressions is a list
                                             of label selector requirements. The requirements
                                             are ANDed.
                                           items:
-                                            description: A label selector requirement
-                                              is a selector that contains values,
-                                              a key, and an operator that relates
-                                              the key and values.
+                                            description: |-
+                                              A label selector requirement is a selector that contains values, a key, and an operator that
+                                              relates the key and values.
                                             properties:
                                               key:
                                                 description: key is the label key
                                                   that the selector applies to.
                                                 type: string
                                               operator:
-                                                description: operator represents a
-                                                  key's relationship to a set of values.
-                                                  Valid operators are In, NotIn, Exists
-                                                  and DoesNotExist.
+                                                description: |-
+                                                  operator represents a key's relationship to a set of values.
+                                                  Valid operators are In, NotIn, Exists and DoesNotExist.
                                                 type: string
                                               values:
-                                                description: values is an array of
-                                                  string values. If the operator is
-                                                  In or NotIn, the values array must
-                                                  be non-empty. If the operator is
-                                                  Exists or DoesNotExist, the values
-                                                  array must be empty. This array
-                                                  is replaced during a strategic merge
-                                                  patch.
+                                                description: |-
+                                                  values is an array of string values. If the operator is In or NotIn,
+                                                  the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                                  the values array must be empty. This array is replaced during a strategic
+                                                  merge patch.
                                                 items:
                                                   type: string
                                                 type: array
+                                                x-kubernetes-list-type: atomic
                                             required:
                                             - key
                                             - operator
                                             type: object
                                           type: array
+                                          x-kubernetes-list-type: atomic
                                         matchLabels:
                                           additionalProperties:
                                             type: string
-                                          description: matchLabels is a map of {key,value}
-                                            pairs. A single {key,value} in the matchLabels
-                                            map is equivalent to an element of matchExpressions,
-                                            whose key field is "key", the operator
-                                            is "In", and the values array contains
-                                            only "value". The requirements are ANDed.
+                                          description: |-
+                                            matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                            map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                            operator is "In", and the values array contains only "value". The requirements are ANDed.
                                           type: object
                                       type: object
+                                      x-kubernetes-map-type: atomic
                                     namespaces:
-                                      description: namespaces specifies a static list
-                                        of namespace names that the term applies to.
-                                        The term is applied to the union of the namespaces
-                                        listed in this field and the ones selected
-                                        by namespaceSelector. null or empty namespaces
-                                        list and null namespaceSelector means "this
-                                        pod's namespace".
+                                      description: |-
+                                        namespaces specifies a static list of namespace names that the term applies to.
+                                        The term is applied to the union of the namespaces listed in this field
+                                        and the ones selected by namespaceSelector.
+                                        null or empty namespaces list and null namespaceSelector means "this pod's namespace".
                                       items:
                                         type: string
                                       type: array
+                                      x-kubernetes-list-type: atomic
                                     topologyKey:
-                                      description: This pod should be co-located (affinity)
-                                        or not co-located (anti-affinity) with the
-                                        pods matching the labelSelector in the specified
-                                        namespaces, where co-located is defined as
-                                        running on a node whose value of the label
-                                        with key topologyKey matches that of any node
-                                        on which any of the selected pods is running.
+                                      description: |-
+                                        This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching
+                                        the labelSelector in the specified namespaces, where co-located is defined as running on a node
+                                        whose value of the label with key topologyKey matches that of any node on which any of the
+                                        selected pods is running.
                                         Empty topologyKey is not allowed.
                                       type: string
                                   required:
                                   - topologyKey
                                   type: object
                                 weight:
-                                  description: weight associated with matching the
-                                    corresponding podAffinityTerm, in the range 1-100.
+                                  description: |-
+                                    weight associated with matching the corresponding podAffinityTerm,
+                                    in the range 1-100.
                                   format: int32
                                   type: integer
                               required:
@@ -7036,155 +8605,177 @@ spec:
                               - weight
                               type: object
                             type: array
+                            x-kubernetes-list-type: atomic
                           requiredDuringSchedulingIgnoredDuringExecution:
-                            description: If the anti-affinity requirements specified
-                              by this field are not met at scheduling time, the pod
-                              will not be scheduled onto the node. If the anti-affinity
-                              requirements specified by this field cease to be met
-                              at some point during pod execution (e.g. due to a pod
-                              label update), the system may or may not try to eventually
-                              evict the pod from its node. When there are multiple
-                              elements, the lists of nodes corresponding to each podAffinityTerm
-                              are intersected, i.e. all terms must be satisfied.
+                            description: |-
+                              If the anti-affinity requirements specified by this field are not met at
+                              scheduling time, the pod will not be scheduled onto the node.
+                              If the anti-affinity requirements specified by this field cease to be met
+                              at some point during pod execution (e.g. due to a pod label update), the
+                              system may or may not try to eventually evict the pod from its node.
+                              When there are multiple elements, the lists of nodes corresponding to each
+                              podAffinityTerm are intersected, i.e. all terms must be satisfied.
                             items:
-                              description: Defines a set of pods (namely those matching
-                                the labelSelector relative to the given namespace(s))
-                                that this pod should be co-located (affinity) or not
-                                co-located (anti-affinity) with, where co-located
-                                is defined as running on a node whose value of the
-                                label with key <topologyKey> matches that of any node
-                                on which a pod of the set of pods is running
+                              description: |-
+                                Defines a set of pods (namely those matching the labelSelector
+                                relative to the given namespace(s)) that this pod should be
+                                co-located (affinity) or not co-located (anti-affinity) with,
+                                where co-located is defined as running on a node whose value of
+                                the label with key <topologyKey> matches that of any node on which
+                                a pod of the set of pods is running
                               properties:
                                 labelSelector:
-                                  description: A label query over a set of resources,
-                                    in this case pods.
+                                  description: |-
+                                    A label query over a set of resources, in this case pods.
+                                    If it's null, this PodAffinityTerm matches with no Pods.
                                   properties:
                                     matchExpressions:
                                       description: matchExpressions is a list of label
                                         selector requirements. The requirements are
                                         ANDed.
                                       items:
-                                        description: A label selector requirement
-                                          is a selector that contains values, a key,
-                                          and an operator that relates the key and
-                                          values.
+                                        description: |-
+                                          A label selector requirement is a selector that contains values, a key, and an operator that
+                                          relates the key and values.
                                         properties:
                                           key:
                                             description: key is the label key that
                                               the selector applies to.
                                             type: string
                                           operator:
-                                            description: operator represents a key's
-                                              relationship to a set of values. Valid
-                                              operators are In, NotIn, Exists and
-                                              DoesNotExist.
+                                            description: |-
+                                              operator represents a key's relationship to a set of values.
+                                              Valid operators are In, NotIn, Exists and DoesNotExist.
                                             type: string
                                           values:
-                                            description: values is an array of string
-                                              values. If the operator is In or NotIn,
-                                              the values array must be non-empty.
-                                              If the operator is Exists or DoesNotExist,
-                                              the values array must be empty. This
-                                              array is replaced during a strategic
+                                            description: |-
+                                              values is an array of string values. If the operator is In or NotIn,
+                                              the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                              the values array must be empty. This array is replaced during a strategic
                                               merge patch.
                                             items:
                                               type: string
                                             type: array
+                                            x-kubernetes-list-type: atomic
                                         required:
                                         - key
                                         - operator
                                         type: object
                                       type: array
+                                      x-kubernetes-list-type: atomic
                                     matchLabels:
                                       additionalProperties:
                                         type: string
-                                      description: matchLabels is a map of {key,value}
-                                        pairs. A single {key,value} in the matchLabels
-                                        map is equivalent to an element of matchExpressions,
-                                        whose key field is "key", the operator is
-                                        "In", and the values array contains only "value".
-                                        The requirements are ANDed.
+                                      description: |-
+                                        matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                        map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                        operator is "In", and the values array contains only "value". The requirements are ANDed.
                                       type: object
                                   type: object
+                                  x-kubernetes-map-type: atomic
+                                matchLabelKeys:
+                                  description: |-
+                                    MatchLabelKeys is a set of pod label keys to select which pods will
+                                    be taken into consideration. The keys are used to lookup values from the
+                                    incoming pod labels, those key-value labels are merged with `labelSelector` as `key in (value)`
+                                    to select the group of existing pods which pods will be taken into consideration
+                                    for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+                                    pod labels will be ignored. The default value is empty.
+                                    The same key is forbidden to exist in both matchLabelKeys and labelSelector.
+                                    Also, matchLabelKeys cannot be set when labelSelector isn't set.
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
+                                mismatchLabelKeys:
+                                  description: |-
+                                    MismatchLabelKeys is a set of pod label keys to select which pods will
+                                    be taken into consideration. The keys are used to lookup values from the
+                                    incoming pod labels, those key-value labels are merged with `labelSelector` as `key notin (value)`
+                                    to select the group of existing pods which pods will be taken into consideration
+                                    for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming
+                                    pod labels will be ignored. The default value is empty.
+                                    The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
+                                    Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
+                                  items:
+                                    type: string
+                                  type: array
+                                  x-kubernetes-list-type: atomic
                                 namespaceSelector:
-                                  description: A label query over the set of namespaces
-                                    that the term applies to. The term is applied
-                                    to the union of the namespaces selected by this
-                                    field and the ones listed in the namespaces field.
-                                    null selector and null or empty namespaces list
-                                    means "this pod's namespace". An empty selector
-                                    ({}) matches all namespaces.
+                                  description: |-
+                                    A label query over the set of namespaces that the term applies to.
+                                    The term is applied to the union of the namespaces selected by this field
+                                    and the ones listed in the namespaces field.
+                                    null selector and null or empty namespaces list means "this pod's namespace".
+                                    An empty selector ({}) matches all namespaces.
                                   properties:
                                     matchExpressions:
                                       description: matchExpressions is a list of label
                                         selector requirements. The requirements are
                                         ANDed.
                                       items:
-                                        description: A label selector requirement
-                                          is a selector that contains values, a key,
-                                          and an operator that relates the key and
-                                          values.
+                                        description: |-
+                                          A label selector requirement is a selector that contains values, a key, and an operator that
+                                          relates the key and values.
                                         properties:
                                           key:
                                             description: key is the label key that
                                               the selector applies to.
                                             type: string
                                           operator:
-                                            description: operator represents a key's
-                                              relationship to a set of values. Valid
-                                              operators are In, NotIn, Exists and
-                                              DoesNotExist.
+                                            description: |-
+                                              operator represents a key's relationship to a set of values.
+                                              Valid operators are In, NotIn, Exists and DoesNotExist.
                                             type: string
                                           values:
-                                            description: values is an array of string
-                                              values. If the operator is In or NotIn,
-                                              the values array must be non-empty.
-                                              If the operator is Exists or DoesNotExist,
-                                              the values array must be empty. This
-                                              array is replaced during a strategic
+                                            description: |-
+                                              values is an array of string values. If the operator is In or NotIn,
+                                              the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                              the values array must be empty. This array is replaced during a strategic
                                               merge patch.
                                             items:
                                               type: string
                                             type: array
+                                            x-kubernetes-list-type: atomic
                                         required:
                                         - key
                                         - operator
                                         type: object
                                       type: array
+                                      x-kubernetes-list-type: atomic
                                     matchLabels:
                                       additionalProperties:
                                         type: string
-                                      description: matchLabels is a map of {key,value}
-                                        pairs. A single {key,value} in the matchLabels
-                                        map is equivalent to an element of matchExpressions,
-                                        whose key field is "key", the operator is
-                                        "In", and the values array contains only "value".
-                                        The requirements are ANDed.
+                                      description: |-
+                                        matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                        map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                        operator is "In", and the values array contains only "value". The requirements are ANDed.
                                       type: object
                                   type: object
+                                  x-kubernetes-map-type: atomic
                                 namespaces:
-                                  description: namespaces specifies a static list
-                                    of namespace names that the term applies to. The
-                                    term is applied to the union of the namespaces
-                                    listed in this field and the ones selected by
-                                    namespaceSelector. null or empty namespaces list
-                                    and null namespaceSelector means "this pod's namespace".
+                                  description: |-
+                                    namespaces specifies a static list of namespace names that the term applies to.
+                                    The term is applied to the union of the namespaces listed in this field
+                                    and the ones selected by namespaceSelector.
+                                    null or empty namespaces list and null namespaceSelector means "this pod's namespace".
                                   items:
                                     type: string
                                   type: array
+                                  x-kubernetes-list-type: atomic
                                 topologyKey:
-                                  description: This pod should be co-located (affinity)
-                                    or not co-located (anti-affinity) with the pods
-                                    matching the labelSelector in the specified namespaces,
-                                    where co-located is defined as running on a node
-                                    whose value of the label with key topologyKey
-                                    matches that of any node on which any of the selected
-                                    pods is running. Empty topologyKey is not allowed.
+                                  description: |-
+                                    This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching
+                                    the labelSelector in the specified namespaces, where co-located is defined as running on a node
+                                    whose value of the label with key topologyKey matches that of any node on which any of the
+                                    selected pods is running.
+                                    Empty topologyKey is not allowed.
                                   type: string
                               required:
                               - topologyKey
                               type: object
                             type: array
+                            x-kubernetes-list-type: atomic
                         type: object
                     type: object
                   command:
@@ -7196,25 +8787,50 @@ spec:
                       the sentinel exporter
                     properties:
                       containerSecurityContext:
-                        description: SecurityContext holds security configuration
-                          that will be applied to a container. Some fields are present
-                          in both SecurityContext and PodSecurityContext.  When both
+                        description: |-
+                          SecurityContext holds security configuration that will be applied to a container.
+                          Some fields are present in both SecurityContext and PodSecurityContext.  When both
                           are set, the values in SecurityContext take precedence.
                         properties:
                           allowPrivilegeEscalation:
-                            description: 'AllowPrivilegeEscalation controls whether
-                              a process can gain more privileges than its parent process.
-                              This bool directly controls if the no_new_privs flag
-                              will be set on the container process. AllowPrivilegeEscalation
-                              is true always when the container is: 1) run as Privileged
-                              2) has CAP_SYS_ADMIN Note that this field cannot be
-                              set when spec.os.name is windows.'
+                            description: |-
+                              AllowPrivilegeEscalation controls whether a process can gain more
+                              privileges than its parent process. This bool directly controls if
+                              the no_new_privs flag will be set on the container process.
+                              AllowPrivilegeEscalation is true always when the container is:
+                              1) run as Privileged
+                              2) has CAP_SYS_ADMIN
+                              Note that this field cannot be set when spec.os.name is windows.
                             type: boolean
+                          appArmorProfile:
+                            description: |-
+                              appArmorProfile is the AppArmor options to use by this container. If set, this profile
+                              overrides the pod's appArmorProfile.
+                              Note that this field cannot be set when spec.os.name is windows.
+                            properties:
+                              localhostProfile:
+                                description: |-
+                                  localhostProfile indicates a profile loaded on the node that should be used.
+                                  The profile must be preconfigured on the node to work.
+                                  Must match the loaded name of the profile.
+                                  Must be set if and only if type is "Localhost".
+                                type: string
+                              type:
+                                description: |-
+                                  type indicates which kind of AppArmor profile will be applied.
+                                  Valid options are:
+                                    Localhost - a profile pre-loaded on the node.
+                                    RuntimeDefault - the container runtime's default profile.
+                                    Unconfined - no AppArmor enforcement.
+                                type: string
+                            required:
+                            - type
+                            type: object
                           capabilities:
-                            description: The capabilities to add/drop when running
-                              containers. Defaults to the default set of capabilities
-                              granted by the container runtime. Note that this field
-                              cannot be set when spec.os.name is windows.
+                            description: |-
+                              The capabilities to add/drop when running containers.
+                              Defaults to the default set of capabilities granted by the container runtime.
+                              Note that this field cannot be set when spec.os.name is windows.
                             properties:
                               add:
                                 description: Added capabilities
@@ -7223,6 +8839,7 @@ spec:
                                     type
                                   type: string
                                 type: array
+                                x-kubernetes-list-type: atomic
                               drop:
                                 description: Removed capabilities
                                 items:
@@ -7230,63 +8847,63 @@ spec:
                                     type
                                   type: string
                                 type: array
+                                x-kubernetes-list-type: atomic
                             type: object
                           privileged:
-                            description: Run container in privileged mode. Processes
-                              in privileged containers are essentially equivalent
-                              to root on the host. Defaults to false. Note that this
-                              field cannot be set when spec.os.name is windows.
+                            description: |-
+                              Run container in privileged mode.
+                              Processes in privileged containers are essentially equivalent to root on the host.
+                              Defaults to false.
+                              Note that this field cannot be set when spec.os.name is windows.
                             type: boolean
                           procMount:
-                            description: procMount denotes the type of proc mount
-                              to use for the containers. The default is DefaultProcMount
-                              which uses the container runtime defaults for readonly
-                              paths and masked paths. This requires the ProcMountType
-                              feature flag to be enabled. Note that this field cannot
-                              be set when spec.os.name is windows.
+                            description: |-
+                              procMount denotes the type of proc mount to use for the containers.
+                              The default value is Default which uses the container runtime defaults for
+                              readonly paths and masked paths.
+                              This requires the ProcMountType feature flag to be enabled.
+                              Note that this field cannot be set when spec.os.name is windows.
                             type: string
                           readOnlyRootFilesystem:
-                            description: Whether this container has a read-only root
-                              filesystem. Default is false. Note that this field cannot
-                              be set when spec.os.name is windows.
+                            description: |-
+                              Whether this container has a read-only root filesystem.
+                              Default is false.
+                              Note that this field cannot be set when spec.os.name is windows.
                             type: boolean
                           runAsGroup:
-                            description: The GID to run the entrypoint of the container
-                              process. Uses runtime default if unset. May also be
-                              set in PodSecurityContext.  If set in both SecurityContext
-                              and PodSecurityContext, the value specified in SecurityContext
-                              takes precedence. Note that this field cannot be set
-                              when spec.os.name is windows.
+                            description: |-
+                              The GID to run the entrypoint of the container process.
+                              Uses runtime default if unset.
+                              May also be set in PodSecurityContext.  If set in both SecurityContext and
+                              PodSecurityContext, the value specified in SecurityContext takes precedence.
+                              Note that this field cannot be set when spec.os.name is windows.
                             format: int64
                             type: integer
                           runAsNonRoot:
-                            description: Indicates that the container must run as
-                              a non-root user. If true, the Kubelet will validate
-                              the image at runtime to ensure that it does not run
-                              as UID 0 (root) and fail to start the container if it
-                              does. If unset or false, no such validation will be
-                              performed. May also be set in PodSecurityContext.  If
-                              set in both SecurityContext and PodSecurityContext,
-                              the value specified in SecurityContext takes precedence.
+                            description: |-
+                              Indicates that the container must run as a non-root user.
+                              If true, the Kubelet will validate the image at runtime to ensure that it
+                              does not run as UID 0 (root) and fail to start the container if it does.
+                              If unset or false, no such validation will be performed.
+                              May also be set in PodSecurityContext.  If set in both SecurityContext and
+                              PodSecurityContext, the value specified in SecurityContext takes precedence.
                             type: boolean
                           runAsUser:
-                            description: The UID to run the entrypoint of the container
-                              process. Defaults to user specified in image metadata
-                              if unspecified. May also be set in PodSecurityContext.  If
-                              set in both SecurityContext and PodSecurityContext,
-                              the value specified in SecurityContext takes precedence.
-                              Note that this field cannot be set when spec.os.name
-                              is windows.
+                            description: |-
+                              The UID to run the entrypoint of the container process.
+                              Defaults to user specified in image metadata if unspecified.
+                              May also be set in PodSecurityContext.  If set in both SecurityContext and
+                              PodSecurityContext, the value specified in SecurityContext takes precedence.
+                              Note that this field cannot be set when spec.os.name is windows.
                             format: int64
                             type: integer
                           seLinuxOptions:
-                            description: The SELinux context to be applied to the
-                              container. If unspecified, the container runtime will
-                              allocate a random SELinux context for each container.  May
-                              also be set in PodSecurityContext.  If set in both SecurityContext
-                              and PodSecurityContext, the value specified in SecurityContext
-                              takes precedence. Note that this field cannot be set
-                              when spec.os.name is windows.
+                            description: |-
+                              The SELinux context to be applied to the container.
+                              If unspecified, the container runtime will allocate a random SELinux context for each
+                              container.  May also be set in PodSecurityContext.  If set in both SecurityContext and
+                              PodSecurityContext, the value specified in SecurityContext takes precedence.
+                              Note that this field cannot be set when spec.os.name is windows.
                             properties:
                               level:
                                 description: Level is SELinux level label that applies
@@ -7306,93 +8923,110 @@ spec:
                                 type: string
                             type: object
                           seccompProfile:
-                            description: The seccomp options to use by this container.
-                              If seccomp options are provided at both the pod & container
-                              level, the container options override the pod options.
-                              Note that this field cannot be set when spec.os.name
-                              is windows.
+                            description: |-
+                              The seccomp options to use by this container. If seccomp options are
+                              provided at both the pod & container level, the container options
+                              override the pod options.
+                              Note that this field cannot be set when spec.os.name is windows.
                             properties:
                               localhostProfile:
-                                description: localhostProfile indicates a profile
-                                  defined in a file on the node should be used. The
-                                  profile must be preconfigured on the node to work.
-                                  Must be a descending path, relative to the kubelet's
-                                  configured seccomp profile location. Must only be
-                                  set if type is "Localhost".
+                                description: |-
+                                  localhostProfile indicates a profile defined in a file on the node should be used.
+                                  The profile must be preconfigured on the node to work.
+                                  Must be a descending path, relative to the kubelet's configured seccomp profile location.
+                                  Must be set if type is "Localhost". Must NOT be set for any other type.
                                 type: string
                               type:
-                                description: "type indicates which kind of seccomp
-                                  profile will be applied. Valid options are: \n Localhost
-                                  - a profile defined in a file on the node should
-                                  be used. RuntimeDefault - the container runtime
-                                  default profile should be used. Unconfined - no
-                                  profile should be applied."
+                                description: |-
+                                  type indicates which kind of seccomp profile will be applied.
+                                  Valid options are:
+
+                                  Localhost - a profile defined in a file on the node should be used.
+                                  RuntimeDefault - the container runtime default profile should be used.
+                                  Unconfined - no profile should be applied.
                                 type: string
                             required:
                             - type
                             type: object
                           windowsOptions:
-                            description: The Windows specific settings applied to
-                              all containers. If unspecified, the options from the
-                              PodSecurityContext will be used. If set in both SecurityContext
-                              and PodSecurityContext, the value specified in SecurityContext
-                              takes precedence. Note that this field cannot be set
-                              when spec.os.name is linux.
+                            description: |-
+                              The Windows specific settings applied to all containers.
+                              If unspecified, the options from the PodSecurityContext will be used.
+                              If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence.
+                              Note that this field cannot be set when spec.os.name is linux.
                             properties:
                               gmsaCredentialSpec:
-                                description: GMSACredentialSpec is where the GMSA
-                                  admission webhook (https://github.com/kubernetes-sigs/windows-gmsa)
-                                  inlines the contents of the GMSA credential spec
-                                  named by the GMSACredentialSpecName field.
+                                description: |-
+                                  GMSACredentialSpec is where the GMSA admission webhook
+                                  (https://github.com/kubernetes-sigs/windows-gmsa) inlines the contents of the
+                                  GMSA credential spec named by the GMSACredentialSpecName field.
                                 type: string
                               gmsaCredentialSpecName:
                                 description: GMSACredentialSpecName is the name of
                                   the GMSA credential spec to use.
                                 type: string
                               hostProcess:
-                                description: HostProcess determines if a container
-                                  should be run as a 'Host Process' container. This
-                                  field is alpha-level and will only be honored by
-                                  components that enable the WindowsHostProcessContainers
-                                  feature flag. Setting this field without the feature
-                                  flag will result in errors when validating the Pod.
-                                  All of a Pod's containers must have the same effective
-                                  HostProcess value (it is not allowed to have a mix
-                                  of HostProcess containers and non-HostProcess containers).  In
-                                  addition, if HostProcess is true then HostNetwork
-                                  must also be set to true.
+                                description: |-
+                                  HostProcess determines if a container should be run as a 'Host Process' container.
+                                  All of a Pod's containers must have the same effective HostProcess value
+                                  (it is not allowed to have a mix of HostProcess containers and non-HostProcess containers).
+                                  In addition, if HostProcess is true then HostNetwork must also be set to true.
                                 type: boolean
                               runAsUserName:
-                                description: The UserName in Windows to run the entrypoint
-                                  of the container process. Defaults to the user specified
-                                  in image metadata if unspecified. May also be set
-                                  in PodSecurityContext. If set in both SecurityContext
-                                  and PodSecurityContext, the value specified in SecurityContext
-                                  takes precedence.
+                                description: |-
+                                  The UserName in Windows to run the entrypoint of the container process.
+                                  Defaults to the user specified in image metadata if unspecified.
+                                  May also be set in PodSecurityContext. If set in both SecurityContext and
+                                  PodSecurityContext, the value specified in SecurityContext takes precedence.
                                 type: string
                             type: object
                         type: object
                     type: object
                   containerSecurityContext:
-                    description: SecurityContext holds security configuration that
-                      will be applied to a container. Some fields are present in both
-                      SecurityContext and PodSecurityContext.  When both are set,
-                      the values in SecurityContext take precedence.
+                    description: |-
+                      SecurityContext holds security configuration that will be applied to a container.
+                      Some fields are present in both SecurityContext and PodSecurityContext.  When both
+                      are set, the values in SecurityContext take precedence.
                     properties:
                       allowPrivilegeEscalation:
-                        description: 'AllowPrivilegeEscalation controls whether a
-                          process can gain more privileges than its parent process.
-                          This bool directly controls if the no_new_privs flag will
-                          be set on the container process. AllowPrivilegeEscalation
-                          is true always when the container is: 1) run as Privileged
-                          2) has CAP_SYS_ADMIN Note that this field cannot be set
-                          when spec.os.name is windows.'
+                        description: |-
+                          AllowPrivilegeEscalation controls whether a process can gain more
+                          privileges than its parent process. This bool directly controls if
+                          the no_new_privs flag will be set on the container process.
+                          AllowPrivilegeEscalation is true always when the container is:
+                          1) run as Privileged
+                          2) has CAP_SYS_ADMIN
+                          Note that this field cannot be set when spec.os.name is windows.
                         type: boolean
+                      appArmorProfile:
+                        description: |-
+                          appArmorProfile is the AppArmor options to use by this container. If set, this profile
+                          overrides the pod's appArmorProfile.
+                          Note that this field cannot be set when spec.os.name is windows.
+                        properties:
+                          localhostProfile:
+                            description: |-
+                              localhostProfile indicates a profile loaded on the node that should be used.
+                              The profile must be preconfigured on the node to work.
+                              Must match the loaded name of the profile.
+                              Must be set if and only if type is "Localhost".
+                            type: string
+                          type:
+                            description: |-
+                              type indicates which kind of AppArmor profile will be applied.
+                              Valid options are:
+                                Localhost - a profile pre-loaded on the node.
+                                RuntimeDefault - the container runtime's default profile.
+                                Unconfined - no AppArmor enforcement.
+                            type: string
+                        required:
+                        - type
+                        type: object
                       capabilities:
-                        description: The capabilities to add/drop when running containers.
-                          Defaults to the default set of capabilities granted by the
-                          container runtime. Note that this field cannot be set when
-                          spec.os.name is windows.
+                        description: |-
+                          The capabilities to add/drop when running containers.
+                          Defaults to the default set of capabilities granted by the container runtime.
+                          Note that this field cannot be set when spec.os.name is windows.
                         properties:
                           add:
                             description: Added capabilities
@@ -7401,6 +9035,7 @@ spec:
                                 type
                               type: string
                             type: array
+                            x-kubernetes-list-type: atomic
                           drop:
                             description: Removed capabilities
                             items:
@@ -7408,61 +9043,63 @@ spec:
                                 type
                               type: string
                             type: array
+                            x-kubernetes-list-type: atomic
                         type: object
                       privileged:
-                        description: Run container in privileged mode. Processes in
-                          privileged containers are essentially equivalent to root
-                          on the host. Defaults to false. Note that this field cannot
-                          be set when spec.os.name is windows.
+                        description: |-
+                          Run container in privileged mode.
+                          Processes in privileged containers are essentially equivalent to root on the host.
+                          Defaults to false.
+                          Note that this field cannot be set when spec.os.name is windows.
                         type: boolean
                       procMount:
-                        description: procMount denotes the type of proc mount to use
-                          for the containers. The default is DefaultProcMount which
-                          uses the container runtime defaults for readonly paths and
-                          masked paths. This requires the ProcMountType feature flag
-                          to be enabled. Note that this field cannot be set when spec.os.name
-                          is windows.
+                        description: |-
+                          procMount denotes the type of proc mount to use for the containers.
+                          The default value is Default which uses the container runtime defaults for
+                          readonly paths and masked paths.
+                          This requires the ProcMountType feature flag to be enabled.
+                          Note that this field cannot be set when spec.os.name is windows.
                         type: string
                       readOnlyRootFilesystem:
-                        description: Whether this container has a read-only root filesystem.
-                          Default is false. Note that this field cannot be set when
-                          spec.os.name is windows.
+                        description: |-
+                          Whether this container has a read-only root filesystem.
+                          Default is false.
+                          Note that this field cannot be set when spec.os.name is windows.
                         type: boolean
                       runAsGroup:
-                        description: The GID to run the entrypoint of the container
-                          process. Uses runtime default if unset. May also be set
-                          in PodSecurityContext.  If set in both SecurityContext and
-                          PodSecurityContext, the value specified in SecurityContext
-                          takes precedence. Note that this field cannot be set when
-                          spec.os.name is windows.
+                        description: |-
+                          The GID to run the entrypoint of the container process.
+                          Uses runtime default if unset.
+                          May also be set in PodSecurityContext.  If set in both SecurityContext and
+                          PodSecurityContext, the value specified in SecurityContext takes precedence.
+                          Note that this field cannot be set when spec.os.name is windows.
                         format: int64
                         type: integer
                       runAsNonRoot:
-                        description: Indicates that the container must run as a non-root
-                          user. If true, the Kubelet will validate the image at runtime
-                          to ensure that it does not run as UID 0 (root) and fail
-                          to start the container if it does. If unset or false, no
-                          such validation will be performed. May also be set in PodSecurityContext.  If
-                          set in both SecurityContext and PodSecurityContext, the
-                          value specified in SecurityContext takes precedence.
+                        description: |-
+                          Indicates that the container must run as a non-root user.
+                          If true, the Kubelet will validate the image at runtime to ensure that it
+                          does not run as UID 0 (root) and fail to start the container if it does.
+                          If unset or false, no such validation will be performed.
+                          May also be set in PodSecurityContext.  If set in both SecurityContext and
+                          PodSecurityContext, the value specified in SecurityContext takes precedence.
                         type: boolean
                       runAsUser:
-                        description: The UID to run the entrypoint of the container
-                          process. Defaults to user specified in image metadata if
-                          unspecified. May also be set in PodSecurityContext.  If
-                          set in both SecurityContext and PodSecurityContext, the
-                          value specified in SecurityContext takes precedence. Note
-                          that this field cannot be set when spec.os.name is windows.
+                        description: |-
+                          The UID to run the entrypoint of the container process.
+                          Defaults to user specified in image metadata if unspecified.
+                          May also be set in PodSecurityContext.  If set in both SecurityContext and
+                          PodSecurityContext, the value specified in SecurityContext takes precedence.
+                          Note that this field cannot be set when spec.os.name is windows.
                         format: int64
                         type: integer
                       seLinuxOptions:
-                        description: The SELinux context to be applied to the container.
-                          If unspecified, the container runtime will allocate a random
-                          SELinux context for each container.  May also be set in
-                          PodSecurityContext.  If set in both SecurityContext and
-                          PodSecurityContext, the value specified in SecurityContext
-                          takes precedence. Note that this field cannot be set when
-                          spec.os.name is windows.
+                        description: |-
+                          The SELinux context to be applied to the container.
+                          If unspecified, the container runtime will allocate a random SELinux context for each
+                          container.  May also be set in PodSecurityContext.  If set in both SecurityContext and
+                          PodSecurityContext, the value specified in SecurityContext takes precedence.
+                          Note that this field cannot be set when spec.os.name is windows.
                         properties:
                           level:
                             description: Level is SELinux level label that applies
@@ -7482,65 +9119,61 @@ spec:
                             type: string
                         type: object
                       seccompProfile:
-                        description: The seccomp options to use by this container.
-                          If seccomp options are provided at both the pod & container
-                          level, the container options override the pod options. Note
-                          that this field cannot be set when spec.os.name is windows.
+                        description: |-
+                          The seccomp options to use by this container. If seccomp options are
+                          provided at both the pod & container level, the container options
+                          override the pod options.
+                          Note that this field cannot be set when spec.os.name is windows.
                         properties:
                           localhostProfile:
-                            description: localhostProfile indicates a profile defined
-                              in a file on the node should be used. The profile must
-                              be preconfigured on the node to work. Must be a descending
-                              path, relative to the kubelet's configured seccomp profile
-                              location. Must only be set if type is "Localhost".
+                            description: |-
+                              localhostProfile indicates a profile defined in a file on the node should be used.
+                              The profile must be preconfigured on the node to work.
+                              Must be a descending path, relative to the kubelet's configured seccomp profile location.
+                              Must be set if type is "Localhost". Must NOT be set for any other type.
                             type: string
                           type:
-                            description: "type indicates which kind of seccomp profile
-                              will be applied. Valid options are: \n Localhost - a
-                              profile defined in a file on the node should be used.
-                              RuntimeDefault - the container runtime default profile
-                              should be used. Unconfined - no profile should be applied."
+                            description: |-
+                              type indicates which kind of seccomp profile will be applied.
+                              Valid options are:
+
+                              Localhost - a profile defined in a file on the node should be used.
+                              RuntimeDefault - the container runtime default profile should be used.
+                              Unconfined - no profile should be applied.
                             type: string
                         required:
                         - type
                         type: object
                       windowsOptions:
-                        description: The Windows specific settings applied to all
-                          containers. If unspecified, the options from the PodSecurityContext
-                          will be used. If set in both SecurityContext and PodSecurityContext,
-                          the value specified in SecurityContext takes precedence.
-                          Note that this field cannot be set when spec.os.name is
-                          linux.
+                        description: |-
+                          The Windows specific settings applied to all containers.
+                          If unspecified, the options from the PodSecurityContext will be used.
+                          If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence.
+                          Note that this field cannot be set when spec.os.name is linux.
                         properties:
                           gmsaCredentialSpec:
-                            description: GMSACredentialSpec is where the GMSA admission
-                              webhook (https://github.com/kubernetes-sigs/windows-gmsa)
-                              inlines the contents of the GMSA credential spec named
-                              by the GMSACredentialSpecName field.
+                            description: |-
+                              GMSACredentialSpec is where the GMSA admission webhook
+                              (https://github.com/kubernetes-sigs/windows-gmsa) inlines the contents of the
+                              GMSA credential spec named by the GMSACredentialSpecName field.
                             type: string
                           gmsaCredentialSpecName:
                             description: GMSACredentialSpecName is the name of the
                               GMSA credential spec to use.
                             type: string
                           hostProcess:
-                            description: HostProcess determines if a container should
-                              be run as a 'Host Process' container. This field is
-                              alpha-level and will only be honored by components that
-                              enable the WindowsHostProcessContainers feature flag.
-                              Setting this field without the feature flag will result
-                              in errors when validating the Pod. All of a Pod's containers
-                              must have the same effective HostProcess value (it is
-                              not allowed to have a mix of HostProcess containers
-                              and non-HostProcess containers).  In addition, if HostProcess
-                              is true then HostNetwork must also be set to true.
+                            description: |-
+                              HostProcess determines if a container should be run as a 'Host Process' container.
+                              All of a Pod's containers must have the same effective HostProcess value
+                              (it is not allowed to have a mix of HostProcess containers and non-HostProcess containers).
+                              In addition, if HostProcess is true then HostNetwork must also be set to true.
                             type: boolean
                           runAsUserName:
-                            description: The UserName in Windows to run the entrypoint
-                              of the container process. Defaults to the user specified
-                              in image metadata if unspecified. May also be set in
-                              PodSecurityContext. If set in both SecurityContext and
-                              PodSecurityContext, the value specified in SecurityContext
-                              takes precedence.
+                            description: |-
+                              The UserName in Windows to run the entrypoint of the container process.
+                              Defaults to the user specified in image metadata if unspecified.
+                              May also be set in PodSecurityContext. If set in both SecurityContext and
+                              PodSecurityContext, the value specified in SecurityContext takes precedence.
                             type: string
                         type: object
                     type: object
@@ -7548,6 +9181,469 @@ spec:
                     items:
                       type: string
                     type: array
+                  customLivenessProbe:
+                    description: |-
+                      Probe describes a health check to be performed against a container to determine whether it is
+                      alive or ready to receive traffic.
+                    properties:
+                      exec:
+                        description: Exec specifies a command to execute in the container.
+                        properties:
+                          command:
+                            description: |-
+                              Command is the command line to execute inside the container, the working directory for the
+                              command  is root ('/') in the container's filesystem. The command is simply exec'd, it is
+                              not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use
+                              a shell, you need to explicitly call out to that shell.
+                              Exit status of 0 is treated as live/healthy and non-zero is unhealthy.
+                            items:
+                              type: string
+                            type: array
+                            x-kubernetes-list-type: atomic
+                        type: object
+                      failureThreshold:
+                        description: |-
+                          Minimum consecutive failures for the probe to be considered failed after having succeeded.
+                          Defaults to 3. Minimum value is 1.
+                        format: int32
+                        type: integer
+                      grpc:
+                        description: GRPC specifies a GRPC HealthCheckRequest.
+                        properties:
+                          port:
+                            description: Port number of the gRPC service. Number must
+                              be in the range 1 to 65535.
+                            format: int32
+                            type: integer
+                          service:
+                            default: ""
+                            description: |-
+                              Service is the name of the service to place in the gRPC HealthCheckRequest
+                              (see https://github.com/grpc/grpc/blob/master/doc/health-checking.md).
+
+                              If this is not specified, the default behavior is defined by gRPC.
+                            type: string
+                        required:
+                        - port
+                        type: object
+                      httpGet:
+                        description: HTTPGet specifies an HTTP GET request to perform.
+                        properties:
+                          host:
+                            description: |-
+                              Host name to connect to, defaults to the pod IP. You probably want to set
+                              "Host" in httpHeaders instead.
+                            type: string
+                          httpHeaders:
+                            description: Custom headers to set in the request. HTTP
+                              allows repeated headers.
+                            items:
+                              description: HTTPHeader describes a custom header to
+                                be used in HTTP probes
+                              properties:
+                                name:
+                                  description: |-
+                                    The header field name.
+                                    This will be canonicalized upon output, so case-variant names will be understood as the same header.
+                                  type: string
+                                value:
+                                  description: The header field value
+                                  type: string
+                              required:
+                              - name
+                              - value
+                              type: object
+                            type: array
+                            x-kubernetes-list-type: atomic
+                          path:
+                            description: Path to access on the HTTP server.
+                            type: string
+                          port:
+                            anyOf:
+                            - type: integer
+                            - type: string
+                            description: |-
+                              Name or number of the port to access on the container.
+                              Number must be in the range 1 to 65535.
+                              Name must be an IANA_SVC_NAME.
+                            x-kubernetes-int-or-string: true
+                          scheme:
+                            description: |-
+                              Scheme to use for connecting to the host.
+                              Defaults to HTTP.
+                            type: string
+                        required:
+                        - port
+                        type: object
+                      initialDelaySeconds:
+                        description: |-
+                          Number of seconds after the container has started before liveness probes are initiated.
+                          More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                        format: int32
+                        type: integer
+                      periodSeconds:
+                        description: |-
+                          How often (in seconds) to perform the probe.
+                          Default to 10 seconds. Minimum value is 1.
+                        format: int32
+                        type: integer
+                      successThreshold:
+                        description: |-
+                          Minimum consecutive successes for the probe to be considered successful after having failed.
+                          Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
+                        format: int32
+                        type: integer
+                      tcpSocket:
+                        description: TCPSocket specifies a connection to a TCP port.
+                        properties:
+                          host:
+                            description: 'Optional: Host name to connect to, defaults
+                              to the pod IP.'
+                            type: string
+                          port:
+                            anyOf:
+                            - type: integer
+                            - type: string
+                            description: |-
+                              Number or name of the port to access on the container.
+                              Number must be in the range 1 to 65535.
+                              Name must be an IANA_SVC_NAME.
+                            x-kubernetes-int-or-string: true
+                        required:
+                        - port
+                        type: object
+                      terminationGracePeriodSeconds:
+                        description: |-
+                          Optional duration in seconds the pod needs to terminate gracefully upon probe failure.
+                          The grace period is the duration in seconds after the processes running in the pod are sent
+                          a termination signal and the time when the processes are forcibly halted with a kill signal.
+                          Set this value longer than the expected cleanup time for your process.
+                          If this value is nil, the pod's terminationGracePeriodSeconds will be used. Otherwise, this
+                          value overrides the value provided by the pod spec.
+                          Value must be non-negative integer. The value zero indicates stop immediately via
+                          the kill signal (no opportunity to shut down).
+                          This is a beta field and requires enabling ProbeTerminationGracePeriod feature gate.
+                          Minimum value is 1. spec.terminationGracePeriodSeconds is used if unset.
+                        format: int64
+                        type: integer
+                      timeoutSeconds:
+                        description: |-
+                          Number of seconds after which the probe times out.
+                          Defaults to 1 second. Minimum value is 1.
+                          More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                        format: int32
+                        type: integer
+                    type: object
+                  customReadinessProbe:
+                    description: |-
+                      Probe describes a health check to be performed against a container to determine whether it is
+                      alive or ready to receive traffic.
+                    properties:
+                      exec:
+                        description: Exec specifies a command to execute in the container.
+                        properties:
+                          command:
+                            description: |-
+                              Command is the command line to execute inside the container, the working directory for the
+                              command  is root ('/') in the container's filesystem. The command is simply exec'd, it is
+                              not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use
+                              a shell, you need to explicitly call out to that shell.
+                              Exit status of 0 is treated as live/healthy and non-zero is unhealthy.
+                            items:
+                              type: string
+                            type: array
+                            x-kubernetes-list-type: atomic
+                        type: object
+                      failureThreshold:
+                        description: |-
+                          Minimum consecutive failures for the probe to be considered failed after having succeeded.
+                          Defaults to 3. Minimum value is 1.
+                        format: int32
+                        type: integer
+                      grpc:
+                        description: GRPC specifies a GRPC HealthCheckRequest.
+                        properties:
+                          port:
+                            description: Port number of the gRPC service. Number must
+                              be in the range 1 to 65535.
+                            format: int32
+                            type: integer
+                          service:
+                            default: ""
+                            description: |-
+                              Service is the name of the service to place in the gRPC HealthCheckRequest
+                              (see https://github.com/grpc/grpc/blob/master/doc/health-checking.md).
+
+                              If this is not specified, the default behavior is defined by gRPC.
+                            type: string
+                        required:
+                        - port
+                        type: object
+                      httpGet:
+                        description: HTTPGet specifies an HTTP GET request to perform.
+                        properties:
+                          host:
+                            description: |-
+                              Host name to connect to, defaults to the pod IP. You probably want to set
+                              "Host" in httpHeaders instead.
+                            type: string
+                          httpHeaders:
+                            description: Custom headers to set in the request. HTTP
+                              allows repeated headers.
+                            items:
+                              description: HTTPHeader describes a custom header to
+                                be used in HTTP probes
+                              properties:
+                                name:
+                                  description: |-
+                                    The header field name.
+                                    This will be canonicalized upon output, so case-variant names will be understood as the same header.
+                                  type: string
+                                value:
+                                  description: The header field value
+                                  type: string
+                              required:
+                              - name
+                              - value
+                              type: object
+                            type: array
+                            x-kubernetes-list-type: atomic
+                          path:
+                            description: Path to access on the HTTP server.
+                            type: string
+                          port:
+                            anyOf:
+                            - type: integer
+                            - type: string
+                            description: |-
+                              Name or number of the port to access on the container.
+                              Number must be in the range 1 to 65535.
+                              Name must be an IANA_SVC_NAME.
+                            x-kubernetes-int-or-string: true
+                          scheme:
+                            description: |-
+                              Scheme to use for connecting to the host.
+                              Defaults to HTTP.
+                            type: string
+                        required:
+                        - port
+                        type: object
+                      initialDelaySeconds:
+                        description: |-
+                          Number of seconds after the container has started before liveness probes are initiated.
+                          More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                        format: int32
+                        type: integer
+                      periodSeconds:
+                        description: |-
+                          How often (in seconds) to perform the probe.
+                          Default to 10 seconds. Minimum value is 1.
+                        format: int32
+                        type: integer
+                      successThreshold:
+                        description: |-
+                          Minimum consecutive successes for the probe to be considered successful after having failed.
+                          Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
+                        format: int32
+                        type: integer
+                      tcpSocket:
+                        description: TCPSocket specifies a connection to a TCP port.
+                        properties:
+                          host:
+                            description: 'Optional: Host name to connect to, defaults
+                              to the pod IP.'
+                            type: string
+                          port:
+                            anyOf:
+                            - type: integer
+                            - type: string
+                            description: |-
+                              Number or name of the port to access on the container.
+                              Number must be in the range 1 to 65535.
+                              Name must be an IANA_SVC_NAME.
+                            x-kubernetes-int-or-string: true
+                        required:
+                        - port
+                        type: object
+                      terminationGracePeriodSeconds:
+                        description: |-
+                          Optional duration in seconds the pod needs to terminate gracefully upon probe failure.
+                          The grace period is the duration in seconds after the processes running in the pod are sent
+                          a termination signal and the time when the processes are forcibly halted with a kill signal.
+                          Set this value longer than the expected cleanup time for your process.
+                          If this value is nil, the pod's terminationGracePeriodSeconds will be used. Otherwise, this
+                          value overrides the value provided by the pod spec.
+                          Value must be non-negative integer. The value zero indicates stop immediately via
+                          the kill signal (no opportunity to shut down).
+                          This is a beta field and requires enabling ProbeTerminationGracePeriod feature gate.
+                          Minimum value is 1. spec.terminationGracePeriodSeconds is used if unset.
+                        format: int64
+                        type: integer
+                      timeoutSeconds:
+                        description: |-
+                          Number of seconds after which the probe times out.
+                          Defaults to 1 second. Minimum value is 1.
+                          More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                        format: int32
+                        type: integer
+                    type: object
+                  customStartupProbe:
+                    description: |-
+                      Probe describes a health check to be performed against a container to determine whether it is
+                      alive or ready to receive traffic.
+                    properties:
+                      exec:
+                        description: Exec specifies a command to execute in the container.
+                        properties:
+                          command:
+                            description: |-
+                              Command is the command line to execute inside the container, the working directory for the
+                              command  is root ('/') in the container's filesystem. The command is simply exec'd, it is
+                              not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use
+                              a shell, you need to explicitly call out to that shell.
+                              Exit status of 0 is treated as live/healthy and non-zero is unhealthy.
+                            items:
+                              type: string
+                            type: array
+                            x-kubernetes-list-type: atomic
+                        type: object
+                      failureThreshold:
+                        description: |-
+                          Minimum consecutive failures for the probe to be considered failed after having succeeded.
+                          Defaults to 3. Minimum value is 1.
+                        format: int32
+                        type: integer
+                      grpc:
+                        description: GRPC specifies a GRPC HealthCheckRequest.
+                        properties:
+                          port:
+                            description: Port number of the gRPC service. Number must
+                              be in the range 1 to 65535.
+                            format: int32
+                            type: integer
+                          service:
+                            default: ""
+                            description: |-
+                              Service is the name of the service to place in the gRPC HealthCheckRequest
+                              (see https://github.com/grpc/grpc/blob/master/doc/health-checking.md).
+
+                              If this is not specified, the default behavior is defined by gRPC.
+                            type: string
+                        required:
+                        - port
+                        type: object
+                      httpGet:
+                        description: HTTPGet specifies an HTTP GET request to perform.
+                        properties:
+                          host:
+                            description: |-
+                              Host name to connect to, defaults to the pod IP. You probably want to set
+                              "Host" in httpHeaders instead.
+                            type: string
+                          httpHeaders:
+                            description: Custom headers to set in the request. HTTP
+                              allows repeated headers.
+                            items:
+                              description: HTTPHeader describes a custom header to
+                                be used in HTTP probes
+                              properties:
+                                name:
+                                  description: |-
+                                    The header field name.
+                                    This will be canonicalized upon output, so case-variant names will be understood as the same header.
+                                  type: string
+                                value:
+                                  description: The header field value
+                                  type: string
+                              required:
+                              - name
+                              - value
+                              type: object
+                            type: array
+                            x-kubernetes-list-type: atomic
+                          path:
+                            description: Path to access on the HTTP server.
+                            type: string
+                          port:
+                            anyOf:
+                            - type: integer
+                            - type: string
+                            description: |-
+                              Name or number of the port to access on the container.
+                              Number must be in the range 1 to 65535.
+                              Name must be an IANA_SVC_NAME.
+                            x-kubernetes-int-or-string: true
+                          scheme:
+                            description: |-
+                              Scheme to use for connecting to the host.
+                              Defaults to HTTP.
+                            type: string
+                        required:
+                        - port
+                        type: object
+                      initialDelaySeconds:
+                        description: |-
+                          Number of seconds after the container has started before liveness probes are initiated.
+                          More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                        format: int32
+                        type: integer
+                      periodSeconds:
+                        description: |-
+                          How often (in seconds) to perform the probe.
+                          Default to 10 seconds. Minimum value is 1.
+                        format: int32
+                        type: integer
+                      successThreshold:
+                        description: |-
+                          Minimum consecutive successes for the probe to be considered successful after having failed.
+                          Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
+                        format: int32
+                        type: integer
+                      tcpSocket:
+                        description: TCPSocket specifies a connection to a TCP port.
+                        properties:
+                          host:
+                            description: 'Optional: Host name to connect to, defaults
+                              to the pod IP.'
+                            type: string
+                          port:
+                            anyOf:
+                            - type: integer
+                            - type: string
+                            description: |-
+                              Number or name of the port to access on the container.
+                              Number must be in the range 1 to 65535.
+                              Name must be an IANA_SVC_NAME.
+                            x-kubernetes-int-or-string: true
+                        required:
+                        - port
+                        type: object
+                      terminationGracePeriodSeconds:
+                        description: |-
+                          Optional duration in seconds the pod needs to terminate gracefully upon probe failure.
+                          The grace period is the duration in seconds after the processes running in the pod are sent
+                          a termination signal and the time when the processes are forcibly halted with a kill signal.
+                          Set this value longer than the expected cleanup time for your process.
+                          If this value is nil, the pod's terminationGracePeriodSeconds will be used. Otherwise, this
+                          value overrides the value provided by the pod spec.
+                          Value must be non-negative integer. The value zero indicates stop immediately via
+                          the kill signal (no opportunity to shut down).
+                          This is a beta field and requires enabling ProbeTerminationGracePeriod feature gate.
+                          Minimum value is 1. spec.terminationGracePeriodSeconds is used if unset.
+                        format: int64
+                        type: integer
+                      timeoutSeconds:
+                        description: |-
+                          Number of seconds after which the probe times out.
+                          Defaults to 1 second. Minimum value is 1.
+                          More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
+                        format: int32
+                        type: integer
+                    type: object
+                  disableMyMaster:
+                    type: boolean
+                  disablePodDisruptionBudget:
+                    type: boolean
                   dnsPolicy:
                     description: DNSPolicy defines how a pod's DNS will be configured.
                     type: string
@@ -7560,25 +9656,50 @@ spec:
                           type: string
                         type: array
                       containerSecurityContext:
-                        description: SecurityContext holds security configuration
-                          that will be applied to a container. Some fields are present
-                          in both SecurityContext and PodSecurityContext.  When both
+                        description: |-
+                          SecurityContext holds security configuration that will be applied to a container.
+                          Some fields are present in both SecurityContext and PodSecurityContext.  When both
                           are set, the values in SecurityContext take precedence.
                         properties:
                           allowPrivilegeEscalation:
-                            description: 'AllowPrivilegeEscalation controls whether
-                              a process can gain more privileges than its parent process.
-                              This bool directly controls if the no_new_privs flag
-                              will be set on the container process. AllowPrivilegeEscalation
-                              is true always when the container is: 1) run as Privileged
-                              2) has CAP_SYS_ADMIN Note that this field cannot be
-                              set when spec.os.name is windows.'
+                            description: |-
+                              AllowPrivilegeEscalation controls whether a process can gain more
+                              privileges than its parent process. This bool directly controls if
+                              the no_new_privs flag will be set on the container process.
+                              AllowPrivilegeEscalation is true always when the container is:
+                              1) run as Privileged
+                              2) has CAP_SYS_ADMIN
+                              Note that this field cannot be set when spec.os.name is windows.
                             type: boolean
+                          appArmorProfile:
+                            description: |-
+                              appArmorProfile is the AppArmor options to use by this container. If set, this profile
+                              overrides the pod's appArmorProfile.
+                              Note that this field cannot be set when spec.os.name is windows.
+                            properties:
+                              localhostProfile:
+                                description: |-
+                                  localhostProfile indicates a profile loaded on the node that should be used.
+                                  The profile must be preconfigured on the node to work.
+                                  Must match the loaded name of the profile.
+                                  Must be set if and only if type is "Localhost".
+                                type: string
+                              type:
+                                description: |-
+                                  type indicates which kind of AppArmor profile will be applied.
+                                  Valid options are:
+                                    Localhost - a profile pre-loaded on the node.
+                                    RuntimeDefault - the container runtime's default profile.
+                                    Unconfined - no AppArmor enforcement.
+                                type: string
+                            required:
+                            - type
+                            type: object
                           capabilities:
-                            description: The capabilities to add/drop when running
-                              containers. Defaults to the default set of capabilities
-                              granted by the container runtime. Note that this field
-                              cannot be set when spec.os.name is windows.
+                            description: |-
+                              The capabilities to add/drop when running containers.
+                              Defaults to the default set of capabilities granted by the container runtime.
+                              Note that this field cannot be set when spec.os.name is windows.
                             properties:
                               add:
                                 description: Added capabilities
@@ -7587,6 +9708,7 @@ spec:
                                     type
                                   type: string
                                 type: array
+                                x-kubernetes-list-type: atomic
                               drop:
                                 description: Removed capabilities
                                 items:
@@ -7594,63 +9716,63 @@ spec:
                                     type
                                   type: string
                                 type: array
+                                x-kubernetes-list-type: atomic
                             type: object
                           privileged:
-                            description: Run container in privileged mode. Processes
-                              in privileged containers are essentially equivalent
-                              to root on the host. Defaults to false. Note that this
-                              field cannot be set when spec.os.name is windows.
+                            description: |-
+                              Run container in privileged mode.
+                              Processes in privileged containers are essentially equivalent to root on the host.
+                              Defaults to false.
+                              Note that this field cannot be set when spec.os.name is windows.
                             type: boolean
                           procMount:
-                            description: procMount denotes the type of proc mount
-                              to use for the containers. The default is DefaultProcMount
-                              which uses the container runtime defaults for readonly
-                              paths and masked paths. This requires the ProcMountType
-                              feature flag to be enabled. Note that this field cannot
-                              be set when spec.os.name is windows.
+                            description: |-
+                              procMount denotes the type of proc mount to use for the containers.
+                              The default value is Default which uses the container runtime defaults for
+                              readonly paths and masked paths.
+                              This requires the ProcMountType feature flag to be enabled.
+                              Note that this field cannot be set when spec.os.name is windows.
                             type: string
                           readOnlyRootFilesystem:
-                            description: Whether this container has a read-only root
-                              filesystem. Default is false. Note that this field cannot
-                              be set when spec.os.name is windows.
+                            description: |-
+                              Whether this container has a read-only root filesystem.
+                              Default is false.
+                              Note that this field cannot be set when spec.os.name is windows.
                             type: boolean
                           runAsGroup:
-                            description: The GID to run the entrypoint of the container
-                              process. Uses runtime default if unset. May also be
-                              set in PodSecurityContext.  If set in both SecurityContext
-                              and PodSecurityContext, the value specified in SecurityContext
-                              takes precedence. Note that this field cannot be set
-                              when spec.os.name is windows.
+                            description: |-
+                              The GID to run the entrypoint of the container process.
+                              Uses runtime default if unset.
+                              May also be set in PodSecurityContext.  If set in both SecurityContext and
+                              PodSecurityContext, the value specified in SecurityContext takes precedence.
+                              Note that this field cannot be set when spec.os.name is windows.
                             format: int64
                             type: integer
                           runAsNonRoot:
-                            description: Indicates that the container must run as
-                              a non-root user. If true, the Kubelet will validate
-                              the image at runtime to ensure that it does not run
-                              as UID 0 (root) and fail to start the container if it
-                              does. If unset or false, no such validation will be
-                              performed. May also be set in PodSecurityContext.  If
-                              set in both SecurityContext and PodSecurityContext,
-                              the value specified in SecurityContext takes precedence.
+                            description: |-
+                              Indicates that the container must run as a non-root user.
+                              If true, the Kubelet will validate the image at runtime to ensure that it
+                              does not run as UID 0 (root) and fail to start the container if it does.
+                              If unset or false, no such validation will be performed.
+                              May also be set in PodSecurityContext.  If set in both SecurityContext and
+                              PodSecurityContext, the value specified in SecurityContext takes precedence.
                             type: boolean
                           runAsUser:
-                            description: The UID to run the entrypoint of the container
-                              process. Defaults to user specified in image metadata
-                              if unspecified. May also be set in PodSecurityContext.  If
-                              set in both SecurityContext and PodSecurityContext,
-                              the value specified in SecurityContext takes precedence.
-                              Note that this field cannot be set when spec.os.name
-                              is windows.
+                            description: |-
+                              The UID to run the entrypoint of the container process.
+                              Defaults to user specified in image metadata if unspecified.
+                              May also be set in PodSecurityContext.  If set in both SecurityContext and
+                              PodSecurityContext, the value specified in SecurityContext takes precedence.
+                              Note that this field cannot be set when spec.os.name is windows.
                             format: int64
                             type: integer
                           seLinuxOptions:
-                            description: The SELinux context to be applied to the
-                              container. If unspecified, the container runtime will
-                              allocate a random SELinux context for each container.  May
-                              also be set in PodSecurityContext.  If set in both SecurityContext
-                              and PodSecurityContext, the value specified in SecurityContext
-                              takes precedence. Note that this field cannot be set
-                              when spec.os.name is windows.
+                            description: |-
+                              The SELinux context to be applied to the container.
+                              If unspecified, the container runtime will allocate a random SELinux context for each
+                              container.  May also be set in PodSecurityContext.  If set in both SecurityContext and
+                              PodSecurityContext, the value specified in SecurityContext takes precedence.
+                              Note that this field cannot be set when spec.os.name is windows.
                             properties:
                               level:
                                 description: Level is SELinux level label that applies
@@ -7670,69 +9792,61 @@ spec:
                                 type: string
                             type: object
                           seccompProfile:
-                            description: The seccomp options to use by this container.
-                              If seccomp options are provided at both the pod & container
-                              level, the container options override the pod options.
-                              Note that this field cannot be set when spec.os.name
-                              is windows.
+                            description: |-
+                              The seccomp options to use by this container. If seccomp options are
+                              provided at both the pod & container level, the container options
+                              override the pod options.
+                              Note that this field cannot be set when spec.os.name is windows.
                             properties:
                               localhostProfile:
-                                description: localhostProfile indicates a profile
-                                  defined in a file on the node should be used. The
-                                  profile must be preconfigured on the node to work.
-                                  Must be a descending path, relative to the kubelet's
-                                  configured seccomp profile location. Must only be
-                                  set if type is "Localhost".
+                                description: |-
+                                  localhostProfile indicates a profile defined in a file on the node should be used.
+                                  The profile must be preconfigured on the node to work.
+                                  Must be a descending path, relative to the kubelet's configured seccomp profile location.
+                                  Must be set if type is "Localhost". Must NOT be set for any other type.
                                 type: string
                               type:
-                                description: "type indicates which kind of seccomp
-                                  profile will be applied. Valid options are: \n Localhost
-                                  - a profile defined in a file on the node should
-                                  be used. RuntimeDefault - the container runtime
-                                  default profile should be used. Unconfined - no
-                                  profile should be applied."
+                                description: |-
+                                  type indicates which kind of seccomp profile will be applied.
+                                  Valid options are:
+
+                                  Localhost - a profile defined in a file on the node should be used.
+                                  RuntimeDefault - the container runtime default profile should be used.
+                                  Unconfined - no profile should be applied.
                                 type: string
                             required:
                             - type
                             type: object
                           windowsOptions:
-                            description: The Windows specific settings applied to
-                              all containers. If unspecified, the options from the
-                              PodSecurityContext will be used. If set in both SecurityContext
-                              and PodSecurityContext, the value specified in SecurityContext
-                              takes precedence. Note that this field cannot be set
-                              when spec.os.name is linux.
+                            description: |-
+                              The Windows specific settings applied to all containers.
+                              If unspecified, the options from the PodSecurityContext will be used.
+                              If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence.
+                              Note that this field cannot be set when spec.os.name is linux.
                             properties:
                               gmsaCredentialSpec:
-                                description: GMSACredentialSpec is where the GMSA
-                                  admission webhook (https://github.com/kubernetes-sigs/windows-gmsa)
-                                  inlines the contents of the GMSA credential spec
-                                  named by the GMSACredentialSpecName field.
+                                description: |-
+                                  GMSACredentialSpec is where the GMSA admission webhook
+                                  (https://github.com/kubernetes-sigs/windows-gmsa) inlines the contents of the
+                                  GMSA credential spec named by the GMSACredentialSpecName field.
                                 type: string
                               gmsaCredentialSpecName:
                                 description: GMSACredentialSpecName is the name of
                                   the GMSA credential spec to use.
                                 type: string
                               hostProcess:
-                                description: HostProcess determines if a container
-                                  should be run as a 'Host Process' container. This
-                                  field is alpha-level and will only be honored by
-                                  components that enable the WindowsHostProcessContainers
-                                  feature flag. Setting this field without the feature
-                                  flag will result in errors when validating the Pod.
-                                  All of a Pod's containers must have the same effective
-                                  HostProcess value (it is not allowed to have a mix
-                                  of HostProcess containers and non-HostProcess containers).  In
-                                  addition, if HostProcess is true then HostNetwork
-                                  must also be set to true.
+                                description: |-
+                                  HostProcess determines if a container should be run as a 'Host Process' container.
+                                  All of a Pod's containers must have the same effective HostProcess value
+                                  (it is not allowed to have a mix of HostProcess containers and non-HostProcess containers).
+                                  In addition, if HostProcess is true then HostNetwork must also be set to true.
                                 type: boolean
                               runAsUserName:
-                                description: The UserName in Windows to run the entrypoint
-                                  of the container process. Defaults to the user specified
-                                  in image metadata if unspecified. May also be set
-                                  in PodSecurityContext. If set in both SecurityContext
-                                  and PodSecurityContext, the value specified in SecurityContext
-                                  takes precedence.
+                                description: |-
+                                  The UserName in Windows to run the entrypoint of the container process.
+                                  Defaults to the user specified in image metadata if unspecified.
+                                  May also be set in PodSecurityContext. If set in both SecurityContext and
+                                  PodSecurityContext, the value specified in SecurityContext takes precedence.
                                 type: string
                             type: object
                         type: object
@@ -7748,16 +9862,16 @@ spec:
                                 be a C_IDENTIFIER.
                               type: string
                             value:
-                              description: 'Variable references $(VAR_NAME) are expanded
-                                using the previously defined environment variables
-                                in the container and any service environment variables.
-                                If a variable cannot be resolved, the reference in
-                                the input string will be unchanged. Double $$ are
-                                reduced to a single $, which allows for escaping the
-                                $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)" will produce
-                                the string literal "$(VAR_NAME)". Escaped references
-                                will never be expanded, regardless of whether the
-                                variable exists or not. Defaults to "".'
+                              description: |-
+                                Variable references $(VAR_NAME) are expanded
+                                using the previously defined environment variables in the container and
+                                any service environment variables. If a variable cannot be resolved,
+                                the reference in the input string will be unchanged. Double $$ are reduced
+                                to a single $, which allows for escaping the $(VAR_NAME) syntax: i.e.
+                                "$$(VAR_NAME)" will produce the string literal "$(VAR_NAME)".
+                                Escaped references will never be expanded, regardless of whether the variable
+                                exists or not.
+                                Defaults to "".
                               type: string
                             valueFrom:
                               description: Source for the environment variable's value.
@@ -7770,10 +9884,13 @@ spec:
                                       description: The key to select.
                                       type: string
                                     name:
-                                      description: 'Name of the referent. More info:
-                                        https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                                        TODO: Add other useful fields. apiVersion,
-                                        kind, uid?'
+                                      default: ""
+                                      description: |-
+                                        Name of the referent.
+                                        This field is effectively required, but due to backwards compatibility is
+                                        allowed to be empty. Instances of this type with an empty value here are
+                                        almost certainly wrong.
+                                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
                                       type: string
                                     optional:
                                       description: Specify whether the ConfigMap or
@@ -7782,12 +9899,11 @@ spec:
                                   required:
                                   - key
                                   type: object
+                                  x-kubernetes-map-type: atomic
                                 fieldRef:
-                                  description: 'Selects a field of the pod: supports
-                                    metadata.name, metadata.namespace, `metadata.labels[''<KEY>'']`,
-                                    `metadata.annotations[''<KEY>'']`, spec.nodeName,
-                                    spec.serviceAccountName, status.hostIP, status.podIP,
-                                    status.podIPs.'
+                                  description: |-
+                                    Selects a field of the pod: supports metadata.name, metadata.namespace, `metadata.labels['<KEY>']`, `metadata.annotations['<KEY>']`,
+                                    spec.nodeName, spec.serviceAccountName, status.hostIP, status.podIP, status.podIPs.
                                   properties:
                                     apiVersion:
                                       description: Version of the schema the FieldPath
@@ -7800,12 +9916,11 @@ spec:
                                   required:
                                   - fieldPath
                                   type: object
+                                  x-kubernetes-map-type: atomic
                                 resourceFieldRef:
-                                  description: 'Selects a resource of the container:
-                                    only resources limits and requests (limits.cpu,
-                                    limits.memory, limits.ephemeral-storage, requests.cpu,
-                                    requests.memory and requests.ephemeral-storage)
-                                    are currently supported.'
+                                  description: |-
+                                    Selects a resource of the container: only resources limits and requests
+                                    (limits.cpu, limits.memory, limits.ephemeral-storage, requests.cpu, requests.memory and requests.ephemeral-storage) are currently supported.
                                   properties:
                                     containerName:
                                       description: 'Container name: required for volumes,
@@ -7825,6 +9940,7 @@ spec:
                                   required:
                                   - resource
                                   type: object
+                                  x-kubernetes-map-type: atomic
                                 secretKeyRef:
                                   description: Selects a key of a secret in the pod's
                                     namespace
@@ -7834,10 +9950,13 @@ spec:
                                         from.  Must be a valid secret key.
                                       type: string
                                     name:
-                                      description: 'Name of the referent. More info:
-                                        https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                                        TODO: Add other useful fields. apiVersion,
-                                        kind, uid?'
+                                      default: ""
+                                      description: |-
+                                        Name of the referent.
+                                        This field is effectively required, but due to backwards compatibility is
+                                        allowed to be empty. Instances of this type with an empty value here are
+                                        almost certainly wrong.
+                                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
                                       type: string
                                     optional:
                                       description: Specify whether the Secret or its
@@ -7846,6 +9965,7 @@ spec:
                                   required:
                                   - key
                                   type: object
+                                  x-kubernetes-map-type: atomic
                               type: object
                           required:
                           - name
@@ -7861,6 +9981,37 @@ spec:
                         description: ResourceRequirements describes the compute resource
                           requirements.
                         properties:
+                          claims:
+                            description: |-
+                              Claims lists the names of resources, defined in spec.resourceClaims,
+                              that are used by this container.
+
+                              This is an alpha field and requires enabling the
+                              DynamicResourceAllocation feature gate.
+
+                              This field is immutable. It can only be set for containers.
+                            items:
+                              description: ResourceClaim references one entry in PodSpec.ResourceClaims.
+                              properties:
+                                name:
+                                  description: |-
+                                    Name must match the name of one entry in pod.spec.resourceClaims of
+                                    the Pod where this field is used. It makes that resource available
+                                    inside a container.
+                                  type: string
+                                request:
+                                  description: |-
+                                    Request is the name chosen for a request in the referenced claim.
+                                    If empty, everything from the claim is made available, otherwise
+                                    only the result of this request.
+                                  type: string
+                              required:
+                              - name
+                              type: object
+                            type: array
+                            x-kubernetes-list-map-keys:
+                            - name
+                            x-kubernetes-list-type: map
                           limits:
                             additionalProperties:
                               anyOf:
@@ -7868,8 +10019,9 @@ spec:
                               - type: string
                               pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
                               x-kubernetes-int-or-string: true
-                            description: 'Limits describes the maximum amount of compute
-                              resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
+                            description: |-
+                              Limits describes the maximum amount of compute resources allowed.
+                              More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
                             type: object
                           requests:
                             additionalProperties:
@@ -7878,11 +10030,11 @@ spec:
                               - type: string
                               pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
                               x-kubernetes-int-or-string: true
-                            description: 'Requests describes the minimum amount of
-                              compute resources required. If Requests is omitted for
-                              a container, it defaults to Limits if that is explicitly
-                              specified, otherwise to an implementation-defined value.
-                              More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
+                            description: |-
+                              Requests describes the minimum amount of compute resources required.
+                              If Requests is omitted for a container, it defaults to Limits if that is explicitly specified,
+                              otherwise to an implementation-defined value. Requests cannot exceed Limits.
+                              More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
                             type: object
                         type: object
                     type: object
@@ -7892,37 +10044,37 @@ spec:
                         run within a pod.
                       properties:
                         args:
-                          description: 'Arguments to the entrypoint. The container
-                            image''s CMD is used if this is not provided. Variable
-                            references $(VAR_NAME) are expanded using the container''s
-                            environment. If a variable cannot be resolved, the reference
-                            in the input string will be unchanged. Double $$ are reduced
-                            to a single $, which allows for escaping the $(VAR_NAME)
-                            syntax: i.e. "$$(VAR_NAME)" will produce the string literal
-                            "$(VAR_NAME)". Escaped references will never be expanded,
-                            regardless of whether the variable exists or not. Cannot
-                            be updated. More info: https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell'
+                          description: |-
+                            Arguments to the entrypoint.
+                            The container image's CMD is used if this is not provided.
+                            Variable references $(VAR_NAME) are expanded using the container's environment. If a variable
+                            cannot be resolved, the reference in the input string will be unchanged. Double $$ are reduced
+                            to a single $, which allows for escaping the $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)" will
+                            produce the string literal "$(VAR_NAME)". Escaped references will never be expanded, regardless
+                            of whether the variable exists or not. Cannot be updated.
+                            More info: https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell
                           items:
                             type: string
                           type: array
+                          x-kubernetes-list-type: atomic
                         command:
-                          description: 'Entrypoint array. Not executed within a shell.
-                            The container image''s ENTRYPOINT is used if this is not
-                            provided. Variable references $(VAR_NAME) are expanded
-                            using the container''s environment. If a variable cannot
-                            be resolved, the reference in the input string will be
-                            unchanged. Double $$ are reduced to a single $, which
-                            allows for escaping the $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)"
-                            will produce the string literal "$(VAR_NAME)". Escaped
-                            references will never be expanded, regardless of whether
-                            the variable exists or not. Cannot be updated. More info:
-                            https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell'
+                          description: |-
+                            Entrypoint array. Not executed within a shell.
+                            The container image's ENTRYPOINT is used if this is not provided.
+                            Variable references $(VAR_NAME) are expanded using the container's environment. If a variable
+                            cannot be resolved, the reference in the input string will be unchanged. Double $$ are reduced
+                            to a single $, which allows for escaping the $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)" will
+                            produce the string literal "$(VAR_NAME)". Escaped references will never be expanded, regardless
+                            of whether the variable exists or not. Cannot be updated.
+                            More info: https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell
                           items:
                             type: string
                           type: array
+                          x-kubernetes-list-type: atomic
                         env:
-                          description: List of environment variables to set in the
-                            container. Cannot be updated.
+                          description: |-
+                            List of environment variables to set in the container.
+                            Cannot be updated.
                           items:
                             description: EnvVar represents an environment variable
                               present in a Container.
@@ -7932,17 +10084,16 @@ spec:
                                   be a C_IDENTIFIER.
                                 type: string
                               value:
-                                description: 'Variable references $(VAR_NAME) are
-                                  expanded using the previously defined environment
-                                  variables in the container and any service environment
-                                  variables. If a variable cannot be resolved, the
-                                  reference in the input string will be unchanged.
-                                  Double $$ are reduced to a single $, which allows
-                                  for escaping the $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)"
-                                  will produce the string literal "$(VAR_NAME)". Escaped
-                                  references will never be expanded, regardless of
-                                  whether the variable exists or not. Defaults to
-                                  "".'
+                                description: |-
+                                  Variable references $(VAR_NAME) are expanded
+                                  using the previously defined environment variables in the container and
+                                  any service environment variables. If a variable cannot be resolved,
+                                  the reference in the input string will be unchanged. Double $$ are reduced
+                                  to a single $, which allows for escaping the $(VAR_NAME) syntax: i.e.
+                                  "$$(VAR_NAME)" will produce the string literal "$(VAR_NAME)".
+                                  Escaped references will never be expanded, regardless of whether the variable
+                                  exists or not.
+                                  Defaults to "".
                                 type: string
                               valueFrom:
                                 description: Source for the environment variable's
@@ -7955,10 +10106,13 @@ spec:
                                         description: The key to select.
                                         type: string
                                       name:
-                                        description: 'Name of the referent. More info:
-                                          https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                                          TODO: Add other useful fields. apiVersion,
-                                          kind, uid?'
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
                                         type: string
                                       optional:
                                         description: Specify whether the ConfigMap
@@ -7967,12 +10121,11 @@ spec:
                                     required:
                                     - key
                                     type: object
+                                    x-kubernetes-map-type: atomic
                                   fieldRef:
-                                    description: 'Selects a field of the pod: supports
-                                      metadata.name, metadata.namespace, `metadata.labels[''<KEY>'']`,
-                                      `metadata.annotations[''<KEY>'']`, spec.nodeName,
-                                      spec.serviceAccountName, status.hostIP, status.podIP,
-                                      status.podIPs.'
+                                    description: |-
+                                      Selects a field of the pod: supports metadata.name, metadata.namespace, `metadata.labels['<KEY>']`, `metadata.annotations['<KEY>']`,
+                                      spec.nodeName, spec.serviceAccountName, status.hostIP, status.podIP, status.podIPs.
                                     properties:
                                       apiVersion:
                                         description: Version of the schema the FieldPath
@@ -7985,12 +10138,11 @@ spec:
                                     required:
                                     - fieldPath
                                     type: object
+                                    x-kubernetes-map-type: atomic
                                   resourceFieldRef:
-                                    description: 'Selects a resource of the container:
-                                      only resources limits and requests (limits.cpu,
-                                      limits.memory, limits.ephemeral-storage, requests.cpu,
-                                      requests.memory and requests.ephemeral-storage)
-                                      are currently supported.'
+                                    description: |-
+                                      Selects a resource of the container: only resources limits and requests
+                                      (limits.cpu, limits.memory, limits.ephemeral-storage, requests.cpu, requests.memory and requests.ephemeral-storage) are currently supported.
                                     properties:
                                       containerName:
                                         description: 'Container name: required for
@@ -8010,6 +10162,7 @@ spec:
                                     required:
                                     - resource
                                     type: object
+                                    x-kubernetes-map-type: atomic
                                   secretKeyRef:
                                     description: Selects a key of a secret in the
                                       pod's namespace
@@ -8019,10 +10172,13 @@ spec:
                                           from.  Must be a valid secret key.
                                         type: string
                                       name:
-                                        description: 'Name of the referent. More info:
-                                          https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                                          TODO: Add other useful fields. apiVersion,
-                                          kind, uid?'
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
                                         type: string
                                       optional:
                                         description: Specify whether the Secret or
@@ -8031,104 +10187,121 @@ spec:
                                     required:
                                     - key
                                     type: object
+                                    x-kubernetes-map-type: atomic
                                 type: object
                             required:
                             - name
                             type: object
                           type: array
+                          x-kubernetes-list-map-keys:
+                          - name
+                          x-kubernetes-list-type: map
                         envFrom:
-                          description: List of sources to populate environment variables
-                            in the container. The keys defined within a source must
-                            be a C_IDENTIFIER. All invalid keys will be reported as
-                            an event when the container is starting. When a key exists
-                            in multiple sources, the value associated with the last
-                            source will take precedence. Values defined by an Env
-                            with a duplicate key will take precedence. Cannot be updated.
+                          description: |-
+                            List of sources to populate environment variables in the container.
+                            The keys defined within a source must be a C_IDENTIFIER. All invalid keys
+                            will be reported as an event when the container is starting. When a key exists in multiple
+                            sources, the value associated with the last source will take precedence.
+                            Values defined by an Env with a duplicate key will take precedence.
+                            Cannot be updated.
                           items:
                             description: EnvFromSource represents the source of a
-                              set of ConfigMaps
+                              set of ConfigMaps or Secrets
                             properties:
                               configMapRef:
                                 description: The ConfigMap to select from
                                 properties:
                                   name:
-                                    description: 'Name of the referent. More info:
-                                      https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                                      TODO: Add other useful fields. apiVersion, kind,
-                                      uid?'
+                                    default: ""
+                                    description: |-
+                                      Name of the referent.
+                                      This field is effectively required, but due to backwards compatibility is
+                                      allowed to be empty. Instances of this type with an empty value here are
+                                      almost certainly wrong.
+                                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
                                     type: string
                                   optional:
                                     description: Specify whether the ConfigMap must
                                       be defined
                                     type: boolean
                                 type: object
+                                x-kubernetes-map-type: atomic
                               prefix:
-                                description: An optional identifier to prepend to
-                                  each key in the ConfigMap. Must be a C_IDENTIFIER.
+                                description: Optional text to prepend to the name
+                                  of each environment variable. Must be a C_IDENTIFIER.
                                 type: string
                               secretRef:
                                 description: The Secret to select from
                                 properties:
                                   name:
-                                    description: 'Name of the referent. More info:
-                                      https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                                      TODO: Add other useful fields. apiVersion, kind,
-                                      uid?'
+                                    default: ""
+                                    description: |-
+                                      Name of the referent.
+                                      This field is effectively required, but due to backwards compatibility is
+                                      allowed to be empty. Instances of this type with an empty value here are
+                                      almost certainly wrong.
+                                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
                                     type: string
                                   optional:
                                     description: Specify whether the Secret must be
                                       defined
                                     type: boolean
                                 type: object
+                                x-kubernetes-map-type: atomic
                             type: object
                           type: array
+                          x-kubernetes-list-type: atomic
                         image:
-                          description: 'Container image name. More info: https://kubernetes.io/docs/concepts/containers/images
-                            This field is optional to allow higher level config management
-                            to default or override container images in workload controllers
-                            like Deployments and StatefulSets.'
+                          description: |-
+                            Container image name.
+                            More info: https://kubernetes.io/docs/concepts/containers/images
+                            This field is optional to allow higher level config management to default or override
+                            container images in workload controllers like Deployments and StatefulSets.
                           type: string
                         imagePullPolicy:
-                          description: 'Image pull policy. One of Always, Never, IfNotPresent.
-                            Defaults to Always if :latest tag is specified, or IfNotPresent
-                            otherwise. Cannot be updated. More info: https://kubernetes.io/docs/concepts/containers/images#updating-images'
+                          description: |-
+                            Image pull policy.
+                            One of Always, Never, IfNotPresent.
+                            Defaults to Always if :latest tag is specified, or IfNotPresent otherwise.
+                            Cannot be updated.
+                            More info: https://kubernetes.io/docs/concepts/containers/images#updating-images
                           type: string
                         lifecycle:
-                          description: Actions that the management system should take
-                            in response to container lifecycle events. Cannot be updated.
+                          description: |-
+                            Actions that the management system should take in response to container lifecycle events.
+                            Cannot be updated.
                           properties:
                             postStart:
-                              description: 'PostStart is called immediately after
-                                a container is created. If the handler fails, the
-                                container is terminated and restarted according to
-                                its restart policy. Other management of the container
-                                blocks until the hook completes. More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks'
+                              description: |-
+                                PostStart is called immediately after a container is created. If the handler fails,
+                                the container is terminated and restarted according to its restart policy.
+                                Other management of the container blocks until the hook completes.
+                                More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
                               properties:
                                 exec:
-                                  description: Exec specifies the action to take.
+                                  description: Exec specifies a command to execute
+                                    in the container.
                                   properties:
                                     command:
-                                      description: Command is the command line to
-                                        execute inside the container, the working
-                                        directory for the command  is root ('/') in
-                                        the container's filesystem. The command is
-                                        simply exec'd, it is not run inside a shell,
-                                        so traditional shell instructions ('|', etc)
-                                        won't work. To use a shell, you need to explicitly
-                                        call out to that shell. Exit status of 0 is
-                                        treated as live/healthy and non-zero is unhealthy.
+                                      description: |-
+                                        Command is the command line to execute inside the container, the working directory for the
+                                        command  is root ('/') in the container's filesystem. The command is simply exec'd, it is
+                                        not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use
+                                        a shell, you need to explicitly call out to that shell.
+                                        Exit status of 0 is treated as live/healthy and non-zero is unhealthy.
                                       items:
                                         type: string
                                       type: array
+                                      x-kubernetes-list-type: atomic
                                   type: object
                                 httpGet:
-                                  description: HTTPGet specifies the http request
+                                  description: HTTPGet specifies an HTTP GET request
                                     to perform.
                                   properties:
                                     host:
-                                      description: Host name to connect to, defaults
-                                        to the pod IP. You probably want to set "Host"
-                                        in httpHeaders instead.
+                                      description: |-
+                                        Host name to connect to, defaults to the pod IP. You probably want to set
+                                        "Host" in httpHeaders instead.
                                       type: string
                                     httpHeaders:
                                       description: Custom headers to set in the request.
@@ -8138,7 +10311,9 @@ spec:
                                           header to be used in HTTP probes
                                         properties:
                                           name:
-                                            description: The header field name
+                                            description: |-
+                                              The header field name.
+                                              This will be canonicalized upon output, so case-variant names will be understood as the same header.
                                             type: string
                                           value:
                                             description: The header field value
@@ -8148,6 +10323,7 @@ spec:
                                         - value
                                         type: object
                                       type: array
+                                      x-kubernetes-list-type: atomic
                                     path:
                                       description: Path to access on the HTTP server.
                                       type: string
@@ -8155,23 +10331,36 @@ spec:
                                       anyOf:
                                       - type: integer
                                       - type: string
-                                      description: Name or number of the port to access
-                                        on the container. Number must be in the range
-                                        1 to 65535. Name must be an IANA_SVC_NAME.
+                                      description: |-
+                                        Name or number of the port to access on the container.
+                                        Number must be in the range 1 to 65535.
+                                        Name must be an IANA_SVC_NAME.
                                       x-kubernetes-int-or-string: true
                                     scheme:
-                                      description: Scheme to use for connecting to
-                                        the host. Defaults to HTTP.
+                                      description: |-
+                                        Scheme to use for connecting to the host.
+                                        Defaults to HTTP.
                                       type: string
                                   required:
                                   - port
                                   type: object
+                                sleep:
+                                  description: Sleep represents a duration that the
+                                    container should sleep.
+                                  properties:
+                                    seconds:
+                                      description: Seconds is the number of seconds
+                                        to sleep.
+                                      format: int64
+                                      type: integer
+                                  required:
+                                  - seconds
+                                  type: object
                                 tcpSocket:
-                                  description: Deprecated. TCPSocket is NOT supported
-                                    as a LifecycleHandler and kept for the backward
-                                    compatibility. There are no validation of this
-                                    field and lifecycle hooks will fail in runtime
-                                    when tcp handler is specified.
+                                  description: |-
+                                    Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
+                                    for backward compatibility. There is no validation of this field and
+                                    lifecycle hooks will fail at runtime when it is specified.
                                   properties:
                                     host:
                                       description: 'Optional: Host name to connect
@@ -8181,53 +10370,51 @@ spec:
                                       anyOf:
                                       - type: integer
                                       - type: string
-                                      description: Number or name of the port to access
-                                        on the container. Number must be in the range
-                                        1 to 65535. Name must be an IANA_SVC_NAME.
+                                      description: |-
+                                        Number or name of the port to access on the container.
+                                        Number must be in the range 1 to 65535.
+                                        Name must be an IANA_SVC_NAME.
                                       x-kubernetes-int-or-string: true
                                   required:
                                   - port
                                   type: object
                               type: object
                             preStop:
-                              description: 'PreStop is called immediately before a
-                                container is terminated due to an API request or management
-                                event such as liveness/startup probe failure, preemption,
-                                resource contention, etc. The handler is not called
-                                if the container crashes or exits. The Pod''s termination
-                                grace period countdown begins before the PreStop hook
-                                is executed. Regardless of the outcome of the handler,
-                                the container will eventually terminate within the
-                                Pod''s termination grace period (unless delayed by
-                                finalizers). Other management of the container blocks
-                                until the hook completes or until the termination
-                                grace period is reached. More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks'
+                              description: |-
+                                PreStop is called immediately before a container is terminated due to an
+                                API request or management event such as liveness/startup probe failure,
+                                preemption, resource contention, etc. The handler is not called if the
+                                container crashes or exits. The Pod's termination grace period countdown begins before the
+                                PreStop hook is executed. Regardless of the outcome of the handler, the
+                                container will eventually terminate within the Pod's termination grace
+                                period (unless delayed by finalizers). Other management of the container blocks until the hook completes
+                                or until the termination grace period is reached.
+                                More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
                               properties:
                                 exec:
-                                  description: Exec specifies the action to take.
+                                  description: Exec specifies a command to execute
+                                    in the container.
                                   properties:
                                     command:
-                                      description: Command is the command line to
-                                        execute inside the container, the working
-                                        directory for the command  is root ('/') in
-                                        the container's filesystem. The command is
-                                        simply exec'd, it is not run inside a shell,
-                                        so traditional shell instructions ('|', etc)
-                                        won't work. To use a shell, you need to explicitly
-                                        call out to that shell. Exit status of 0 is
-                                        treated as live/healthy and non-zero is unhealthy.
+                                      description: |-
+                                        Command is the command line to execute inside the container, the working directory for the
+                                        command  is root ('/') in the container's filesystem. The command is simply exec'd, it is
+                                        not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use
+                                        a shell, you need to explicitly call out to that shell.
+                                        Exit status of 0 is treated as live/healthy and non-zero is unhealthy.
                                       items:
                                         type: string
                                       type: array
+                                      x-kubernetes-list-type: atomic
                                   type: object
                                 httpGet:
-                                  description: HTTPGet specifies the http request
+                                  description: HTTPGet specifies an HTTP GET request
                                     to perform.
                                   properties:
                                     host:
-                                      description: Host name to connect to, defaults
-                                        to the pod IP. You probably want to set "Host"
-                                        in httpHeaders instead.
+                                      description: |-
+                                        Host name to connect to, defaults to the pod IP. You probably want to set
+                                        "Host" in httpHeaders instead.
                                       type: string
                                     httpHeaders:
                                       description: Custom headers to set in the request.
@@ -8237,7 +10424,9 @@ spec:
                                           header to be used in HTTP probes
                                         properties:
                                           name:
-                                            description: The header field name
+                                            description: |-
+                                              The header field name.
+                                              This will be canonicalized upon output, so case-variant names will be understood as the same header.
                                             type: string
                                           value:
                                             description: The header field value
@@ -8247,6 +10436,7 @@ spec:
                                         - value
                                         type: object
                                       type: array
+                                      x-kubernetes-list-type: atomic
                                     path:
                                       description: Path to access on the HTTP server.
                                       type: string
@@ -8254,23 +10444,36 @@ spec:
                                       anyOf:
                                       - type: integer
                                       - type: string
-                                      description: Name or number of the port to access
-                                        on the container. Number must be in the range
-                                        1 to 65535. Name must be an IANA_SVC_NAME.
+                                      description: |-
+                                        Name or number of the port to access on the container.
+                                        Number must be in the range 1 to 65535.
+                                        Name must be an IANA_SVC_NAME.
                                       x-kubernetes-int-or-string: true
                                     scheme:
-                                      description: Scheme to use for connecting to
-                                        the host. Defaults to HTTP.
+                                      description: |-
+                                        Scheme to use for connecting to the host.
+                                        Defaults to HTTP.
                                       type: string
                                   required:
                                   - port
                                   type: object
+                                sleep:
+                                  description: Sleep represents a duration that the
+                                    container should sleep.
+                                  properties:
+                                    seconds:
+                                      description: Seconds is the number of seconds
+                                        to sleep.
+                                      format: int64
+                                      type: integer
+                                  required:
+                                  - seconds
+                                  type: object
                                 tcpSocket:
-                                  description: Deprecated. TCPSocket is NOT supported
-                                    as a LifecycleHandler and kept for the backward
-                                    compatibility. There are no validation of this
-                                    field and lifecycle hooks will fail in runtime
-                                    when tcp handler is specified.
+                                  description: |-
+                                    Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
+                                    for backward compatibility. There is no validation of this field and
+                                    lifecycle hooks will fail at runtime when it is specified.
                                   properties:
                                     host:
                                       description: 'Optional: Host name to connect
@@ -8280,47 +10483,53 @@ spec:
                                       anyOf:
                                       - type: integer
                                       - type: string
-                                      description: Number or name of the port to access
-                                        on the container. Number must be in the range
-                                        1 to 65535. Name must be an IANA_SVC_NAME.
+                                      description: |-
+                                        Number or name of the port to access on the container.
+                                        Number must be in the range 1 to 65535.
+                                        Name must be an IANA_SVC_NAME.
                                       x-kubernetes-int-or-string: true
                                   required:
                                   - port
                                   type: object
                               type: object
+                            stopSignal:
+                              description: |-
+                                StopSignal defines which signal will be sent to a container when it is being stopped.
+                                If not specified, the default is defined by the container runtime in use.
+                                StopSignal can only be set for Pods with a non-empty .spec.os.name
+                              type: string
                           type: object
                         livenessProbe:
-                          description: 'Periodic probe of container liveness. Container
-                            will be restarted if the probe fails. Cannot be updated.
-                            More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
+                          description: |-
+                            Periodic probe of container liveness.
+                            Container will be restarted if the probe fails.
+                            Cannot be updated.
+                            More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
                           properties:
                             exec:
-                              description: Exec specifies the action to take.
+                              description: Exec specifies a command to execute in
+                                the container.
                               properties:
                                 command:
-                                  description: Command is the command line to execute
-                                    inside the container, the working directory for
-                                    the command  is root ('/') in the container's
-                                    filesystem. The command is simply exec'd, it is
-                                    not run inside a shell, so traditional shell instructions
-                                    ('|', etc) won't work. To use a shell, you need
-                                    to explicitly call out to that shell. Exit status
-                                    of 0 is treated as live/healthy and non-zero is
-                                    unhealthy.
+                                  description: |-
+                                    Command is the command line to execute inside the container, the working directory for the
+                                    command  is root ('/') in the container's filesystem. The command is simply exec'd, it is
+                                    not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use
+                                    a shell, you need to explicitly call out to that shell.
+                                    Exit status of 0 is treated as live/healthy and non-zero is unhealthy.
                                   items:
                                     type: string
                                   type: array
+                                  x-kubernetes-list-type: atomic
                               type: object
                             failureThreshold:
-                              description: Minimum consecutive failures for the probe
-                                to be considered failed after having succeeded. Defaults
-                                to 3. Minimum value is 1.
+                              description: |-
+                                Minimum consecutive failures for the probe to be considered failed after having succeeded.
+                                Defaults to 3. Minimum value is 1.
                               format: int32
                               type: integer
                             grpc:
-                              description: GRPC specifies an action involving a GRPC
-                                port. This is a beta field and requires enabling GRPCContainerProbe
-                                feature gate.
+                              description: GRPC specifies a GRPC HealthCheckRequest.
                               properties:
                                 port:
                                   description: Port number of the gRPC service. Number
@@ -8328,21 +10537,24 @@ spec:
                                   format: int32
                                   type: integer
                                 service:
-                                  description: "Service is the name of the service
-                                    to place in the gRPC HealthCheckRequest (see https://github.com/grpc/grpc/blob/master/doc/health-checking.md).
-                                    \n If this is not specified, the default behavior
-                                    is defined by gRPC."
+                                  default: ""
+                                  description: |-
+                                    Service is the name of the service to place in the gRPC HealthCheckRequest
+                                    (see https://github.com/grpc/grpc/blob/master/doc/health-checking.md).
+
+                                    If this is not specified, the default behavior is defined by gRPC.
                                   type: string
                               required:
                               - port
                               type: object
                             httpGet:
-                              description: HTTPGet specifies the http request to perform.
+                              description: HTTPGet specifies an HTTP GET request to
+                                perform.
                               properties:
                                 host:
-                                  description: Host name to connect to, defaults to
-                                    the pod IP. You probably want to set "Host" in
-                                    httpHeaders instead.
+                                  description: |-
+                                    Host name to connect to, defaults to the pod IP. You probably want to set
+                                    "Host" in httpHeaders instead.
                                   type: string
                                 httpHeaders:
                                   description: Custom headers to set in the request.
@@ -8352,7 +10564,9 @@ spec:
                                       to be used in HTTP probes
                                     properties:
                                       name:
-                                        description: The header field name
+                                        description: |-
+                                          The header field name.
+                                          This will be canonicalized upon output, so case-variant names will be understood as the same header.
                                         type: string
                                       value:
                                         description: The header field value
@@ -8362,6 +10576,7 @@ spec:
                                     - value
                                     type: object
                                   type: array
+                                  x-kubernetes-list-type: atomic
                                 path:
                                   description: Path to access on the HTTP server.
                                   type: string
@@ -8369,38 +10584,40 @@ spec:
                                   anyOf:
                                   - type: integer
                                   - type: string
-                                  description: Name or number of the port to access
-                                    on the container. Number must be in the range
-                                    1 to 65535. Name must be an IANA_SVC_NAME.
+                                  description: |-
+                                    Name or number of the port to access on the container.
+                                    Number must be in the range 1 to 65535.
+                                    Name must be an IANA_SVC_NAME.
                                   x-kubernetes-int-or-string: true
                                 scheme:
-                                  description: Scheme to use for connecting to the
-                                    host. Defaults to HTTP.
+                                  description: |-
+                                    Scheme to use for connecting to the host.
+                                    Defaults to HTTP.
                                   type: string
                               required:
                               - port
                               type: object
                             initialDelaySeconds:
-                              description: 'Number of seconds after the container
-                                has started before liveness probes are initiated.
-                                More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
+                              description: |-
+                                Number of seconds after the container has started before liveness probes are initiated.
+                                More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
                               format: int32
                               type: integer
                             periodSeconds:
-                              description: How often (in seconds) to perform the probe.
+                              description: |-
+                                How often (in seconds) to perform the probe.
                                 Default to 10 seconds. Minimum value is 1.
                               format: int32
                               type: integer
                             successThreshold:
-                              description: Minimum consecutive successes for the probe
-                                to be considered successful after having failed. Defaults
-                                to 1. Must be 1 for liveness and startup. Minimum
-                                value is 1.
+                              description: |-
+                                Minimum consecutive successes for the probe to be considered successful after having failed.
+                                Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
                               format: int32
                               type: integer
                             tcpSocket:
-                              description: TCPSocket specifies an action involving
-                                a TCP port.
+                              description: TCPSocket specifies a connection to a TCP
+                                port.
                               properties:
                                 host:
                                   description: 'Optional: Host name to connect to,
@@ -8410,60 +10627,59 @@ spec:
                                   anyOf:
                                   - type: integer
                                   - type: string
-                                  description: Number or name of the port to access
-                                    on the container. Number must be in the range
-                                    1 to 65535. Name must be an IANA_SVC_NAME.
+                                  description: |-
+                                    Number or name of the port to access on the container.
+                                    Number must be in the range 1 to 65535.
+                                    Name must be an IANA_SVC_NAME.
                                   x-kubernetes-int-or-string: true
                               required:
                               - port
                               type: object
                             terminationGracePeriodSeconds:
-                              description: Optional duration in seconds the pod needs
-                                to terminate gracefully upon probe failure. The grace
-                                period is the duration in seconds after the processes
-                                running in the pod are sent a termination signal and
-                                the time when the processes are forcibly halted with
-                                a kill signal. Set this value longer than the expected
-                                cleanup time for your process. If this value is nil,
-                                the pod's terminationGracePeriodSeconds will be used.
-                                Otherwise, this value overrides the value provided
-                                by the pod spec. Value must be non-negative integer.
-                                The value zero indicates stop immediately via the
-                                kill signal (no opportunity to shut down). This is
-                                a beta field and requires enabling ProbeTerminationGracePeriod
-                                feature gate. Minimum value is 1. spec.terminationGracePeriodSeconds
-                                is used if unset.
+                              description: |-
+                                Optional duration in seconds the pod needs to terminate gracefully upon probe failure.
+                                The grace period is the duration in seconds after the processes running in the pod are sent
+                                a termination signal and the time when the processes are forcibly halted with a kill signal.
+                                Set this value longer than the expected cleanup time for your process.
+                                If this value is nil, the pod's terminationGracePeriodSeconds will be used. Otherwise, this
+                                value overrides the value provided by the pod spec.
+                                Value must be non-negative integer. The value zero indicates stop immediately via
+                                the kill signal (no opportunity to shut down).
+                                This is a beta field and requires enabling ProbeTerminationGracePeriod feature gate.
+                                Minimum value is 1. spec.terminationGracePeriodSeconds is used if unset.
                               format: int64
                               type: integer
                             timeoutSeconds:
-                              description: 'Number of seconds after which the probe
-                                times out. Defaults to 1 second. Minimum value is
-                                1. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
+                              description: |-
+                                Number of seconds after which the probe times out.
+                                Defaults to 1 second. Minimum value is 1.
+                                More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
                               format: int32
                               type: integer
                           type: object
                         name:
-                          description: Name of the container specified as a DNS_LABEL.
+                          description: |-
+                            Name of the container specified as a DNS_LABEL.
                             Each container in a pod must have a unique name (DNS_LABEL).
                             Cannot be updated.
                           type: string
                         ports:
-                          description: List of ports to expose from the container.
-                            Exposing a port here gives the system additional information
-                            about the network connections a container uses, but is
-                            primarily informational. Not specifying a port here DOES
-                            NOT prevent that port from being exposed. Any port which
-                            is listening on the default "0.0.0.0" address inside a
-                            container will be accessible from the network. Cannot
-                            be updated.
+                          description: |-
+                            List of ports to expose from the container. Not specifying a port here
+                            DOES NOT prevent that port from being exposed. Any port which is
+                            listening on the default "0.0.0.0" address inside a container will be
+                            accessible from the network.
+                            Modifying this array with strategic merge patch may corrupt the data.
+                            For more information See https://github.com/kubernetes/kubernetes/issues/108255.
+                            Cannot be updated.
                           items:
                             description: ContainerPort represents a network port in
                               a single container.
                             properties:
                               containerPort:
-                                description: Number of port to expose on the pod's
-                                  IP address. This must be a valid port number, 0
-                                  < x < 65536.
+                                description: |-
+                                  Number of port to expose on the pod's IP address.
+                                  This must be a valid port number, 0 < x < 65536.
                                 format: int32
                                 type: integer
                               hostIP:
@@ -8471,23 +10687,24 @@ spec:
                                   to.
                                 type: string
                               hostPort:
-                                description: Number of port to expose on the host.
-                                  If specified, this must be a valid port number,
-                                  0 < x < 65536. If HostNetwork is specified, this
-                                  must match ContainerPort. Most containers do not
-                                  need this.
+                                description: |-
+                                  Number of port to expose on the host.
+                                  If specified, this must be a valid port number, 0 < x < 65536.
+                                  If HostNetwork is specified, this must match ContainerPort.
+                                  Most containers do not need this.
                                 format: int32
                                 type: integer
                               name:
-                                description: If specified, this must be an IANA_SVC_NAME
-                                  and unique within the pod. Each named port in a
-                                  pod must have a unique name. Name for the port that
-                                  can be referred to by services.
+                                description: |-
+                                  If specified, this must be an IANA_SVC_NAME and unique within the pod. Each
+                                  named port in a pod must have a unique name. Name for the port that can be
+                                  referred to by services.
                                 type: string
                               protocol:
                                 default: TCP
-                                description: Protocol for port. Must be UDP, TCP,
-                                  or SCTP. Defaults to "TCP".
+                                description: |-
+                                  Protocol for port. Must be UDP, TCP, or SCTP.
+                                  Defaults to "TCP".
                                 type: string
                             required:
                             - containerPort
@@ -8498,37 +10715,36 @@ spec:
                           - protocol
                           x-kubernetes-list-type: map
                         readinessProbe:
-                          description: 'Periodic probe of container service readiness.
-                            Container will be removed from service endpoints if the
-                            probe fails. Cannot be updated. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
+                          description: |-
+                            Periodic probe of container service readiness.
+                            Container will be removed from service endpoints if the probe fails.
+                            Cannot be updated.
+                            More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
                           properties:
                             exec:
-                              description: Exec specifies the action to take.
+                              description: Exec specifies a command to execute in
+                                the container.
                               properties:
                                 command:
-                                  description: Command is the command line to execute
-                                    inside the container, the working directory for
-                                    the command  is root ('/') in the container's
-                                    filesystem. The command is simply exec'd, it is
-                                    not run inside a shell, so traditional shell instructions
-                                    ('|', etc) won't work. To use a shell, you need
-                                    to explicitly call out to that shell. Exit status
-                                    of 0 is treated as live/healthy and non-zero is
-                                    unhealthy.
+                                  description: |-
+                                    Command is the command line to execute inside the container, the working directory for the
+                                    command  is root ('/') in the container's filesystem. The command is simply exec'd, it is
+                                    not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use
+                                    a shell, you need to explicitly call out to that shell.
+                                    Exit status of 0 is treated as live/healthy and non-zero is unhealthy.
                                   items:
                                     type: string
                                   type: array
+                                  x-kubernetes-list-type: atomic
                               type: object
                             failureThreshold:
-                              description: Minimum consecutive failures for the probe
-                                to be considered failed after having succeeded. Defaults
-                                to 3. Minimum value is 1.
+                              description: |-
+                                Minimum consecutive failures for the probe to be considered failed after having succeeded.
+                                Defaults to 3. Minimum value is 1.
                               format: int32
                               type: integer
                             grpc:
-                              description: GRPC specifies an action involving a GRPC
-                                port. This is a beta field and requires enabling GRPCContainerProbe
-                                feature gate.
+                              description: GRPC specifies a GRPC HealthCheckRequest.
                               properties:
                                 port:
                                   description: Port number of the gRPC service. Number
@@ -8536,21 +10752,24 @@ spec:
                                   format: int32
                                   type: integer
                                 service:
-                                  description: "Service is the name of the service
-                                    to place in the gRPC HealthCheckRequest (see https://github.com/grpc/grpc/blob/master/doc/health-checking.md).
-                                    \n If this is not specified, the default behavior
-                                    is defined by gRPC."
+                                  default: ""
+                                  description: |-
+                                    Service is the name of the service to place in the gRPC HealthCheckRequest
+                                    (see https://github.com/grpc/grpc/blob/master/doc/health-checking.md).
+
+                                    If this is not specified, the default behavior is defined by gRPC.
                                   type: string
                               required:
                               - port
                               type: object
                             httpGet:
-                              description: HTTPGet specifies the http request to perform.
+                              description: HTTPGet specifies an HTTP GET request to
+                                perform.
                               properties:
                                 host:
-                                  description: Host name to connect to, defaults to
-                                    the pod IP. You probably want to set "Host" in
-                                    httpHeaders instead.
+                                  description: |-
+                                    Host name to connect to, defaults to the pod IP. You probably want to set
+                                    "Host" in httpHeaders instead.
                                   type: string
                                 httpHeaders:
                                   description: Custom headers to set in the request.
@@ -8560,7 +10779,9 @@ spec:
                                       to be used in HTTP probes
                                     properties:
                                       name:
-                                        description: The header field name
+                                        description: |-
+                                          The header field name.
+                                          This will be canonicalized upon output, so case-variant names will be understood as the same header.
                                         type: string
                                       value:
                                         description: The header field value
@@ -8570,6 +10791,7 @@ spec:
                                     - value
                                     type: object
                                   type: array
+                                  x-kubernetes-list-type: atomic
                                 path:
                                   description: Path to access on the HTTP server.
                                   type: string
@@ -8577,38 +10799,40 @@ spec:
                                   anyOf:
                                   - type: integer
                                   - type: string
-                                  description: Name or number of the port to access
-                                    on the container. Number must be in the range
-                                    1 to 65535. Name must be an IANA_SVC_NAME.
+                                  description: |-
+                                    Name or number of the port to access on the container.
+                                    Number must be in the range 1 to 65535.
+                                    Name must be an IANA_SVC_NAME.
                                   x-kubernetes-int-or-string: true
                                 scheme:
-                                  description: Scheme to use for connecting to the
-                                    host. Defaults to HTTP.
+                                  description: |-
+                                    Scheme to use for connecting to the host.
+                                    Defaults to HTTP.
                                   type: string
                               required:
                               - port
                               type: object
                             initialDelaySeconds:
-                              description: 'Number of seconds after the container
-                                has started before liveness probes are initiated.
-                                More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
+                              description: |-
+                                Number of seconds after the container has started before liveness probes are initiated.
+                                More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
                               format: int32
                               type: integer
                             periodSeconds:
-                              description: How often (in seconds) to perform the probe.
+                              description: |-
+                                How often (in seconds) to perform the probe.
                                 Default to 10 seconds. Minimum value is 1.
                               format: int32
                               type: integer
                             successThreshold:
-                              description: Minimum consecutive successes for the probe
-                                to be considered successful after having failed. Defaults
-                                to 1. Must be 1 for liveness and startup. Minimum
-                                value is 1.
+                              description: |-
+                                Minimum consecutive successes for the probe to be considered successful after having failed.
+                                Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
                               format: int32
                               type: integer
                             tcpSocket:
-                              description: TCPSocket specifies an action involving
-                                a TCP port.
+                              description: TCPSocket specifies a connection to a TCP
+                                port.
                               properties:
                                 host:
                                   description: 'Optional: Host name to connect to,
@@ -8618,42 +10842,96 @@ spec:
                                   anyOf:
                                   - type: integer
                                   - type: string
-                                  description: Number or name of the port to access
-                                    on the container. Number must be in the range
-                                    1 to 65535. Name must be an IANA_SVC_NAME.
+                                  description: |-
+                                    Number or name of the port to access on the container.
+                                    Number must be in the range 1 to 65535.
+                                    Name must be an IANA_SVC_NAME.
                                   x-kubernetes-int-or-string: true
                               required:
                               - port
                               type: object
                             terminationGracePeriodSeconds:
-                              description: Optional duration in seconds the pod needs
-                                to terminate gracefully upon probe failure. The grace
-                                period is the duration in seconds after the processes
-                                running in the pod are sent a termination signal and
-                                the time when the processes are forcibly halted with
-                                a kill signal. Set this value longer than the expected
-                                cleanup time for your process. If this value is nil,
-                                the pod's terminationGracePeriodSeconds will be used.
-                                Otherwise, this value overrides the value provided
-                                by the pod spec. Value must be non-negative integer.
-                                The value zero indicates stop immediately via the
-                                kill signal (no opportunity to shut down). This is
-                                a beta field and requires enabling ProbeTerminationGracePeriod
-                                feature gate. Minimum value is 1. spec.terminationGracePeriodSeconds
-                                is used if unset.
+                              description: |-
+                                Optional duration in seconds the pod needs to terminate gracefully upon probe failure.
+                                The grace period is the duration in seconds after the processes running in the pod are sent
+                                a termination signal and the time when the processes are forcibly halted with a kill signal.
+                                Set this value longer than the expected cleanup time for your process.
+                                If this value is nil, the pod's terminationGracePeriodSeconds will be used. Otherwise, this
+                                value overrides the value provided by the pod spec.
+                                Value must be non-negative integer. The value zero indicates stop immediately via
+                                the kill signal (no opportunity to shut down).
+                                This is a beta field and requires enabling ProbeTerminationGracePeriod feature gate.
+                                Minimum value is 1. spec.terminationGracePeriodSeconds is used if unset.
                               format: int64
                               type: integer
                             timeoutSeconds:
-                              description: 'Number of seconds after which the probe
-                                times out. Defaults to 1 second. Minimum value is
-                                1. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
+                              description: |-
+                                Number of seconds after which the probe times out.
+                                Defaults to 1 second. Minimum value is 1.
+                                More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
                               format: int32
                               type: integer
                           type: object
+                        resizePolicy:
+                          description: Resources resize policy for the container.
+                          items:
+                            description: ContainerResizePolicy represents resource
+                              resize policy for the container.
+                            properties:
+                              resourceName:
+                                description: |-
+                                  Name of the resource to which this resource resize policy applies.
+                                  Supported values: cpu, memory.
+                                type: string
+                              restartPolicy:
+                                description: |-
+                                  Restart policy to apply when specified resource is resized.
+                                  If not specified, it defaults to NotRequired.
+                                type: string
+                            required:
+                            - resourceName
+                            - restartPolicy
+                            type: object
+                          type: array
+                          x-kubernetes-list-type: atomic
                         resources:
-                          description: 'Compute Resources required by this container.
-                            Cannot be updated. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
+                          description: |-
+                            Compute Resources required by this container.
+                            Cannot be updated.
+                            More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
                           properties:
+                            claims:
+                              description: |-
+                                Claims lists the names of resources, defined in spec.resourceClaims,
+                                that are used by this container.
+
+                                This is an alpha field and requires enabling the
+                                DynamicResourceAllocation feature gate.
+
+                                This field is immutable. It can only be set for containers.
+                              items:
+                                description: ResourceClaim references one entry in
+                                  PodSpec.ResourceClaims.
+                                properties:
+                                  name:
+                                    description: |-
+                                      Name must match the name of one entry in pod.spec.resourceClaims of
+                                      the Pod where this field is used. It makes that resource available
+                                      inside a container.
+                                    type: string
+                                  request:
+                                    description: |-
+                                      Request is the name chosen for a request in the referenced claim.
+                                      If empty, everything from the claim is made available, otherwise
+                                      only the result of this request.
+                                    type: string
+                                required:
+                                - name
+                                type: object
+                              type: array
+                              x-kubernetes-list-map-keys:
+                              - name
+                              x-kubernetes-list-type: map
                             limits:
                               additionalProperties:
                                 anyOf:
@@ -8661,8 +10939,9 @@ spec:
                                 - type: string
                                 pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
                                 x-kubernetes-int-or-string: true
-                              description: 'Limits describes the maximum amount of
-                                compute resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
+                              description: |-
+                                Limits describes the maximum amount of compute resources allowed.
+                                More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
                               type: object
                             requests:
                               additionalProperties:
@@ -8671,33 +10950,76 @@ spec:
                                 - type: string
                                 pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
                                 x-kubernetes-int-or-string: true
-                              description: 'Requests describes the minimum amount
-                                of compute resources required. If Requests is omitted
-                                for a container, it defaults to Limits if that is
-                                explicitly specified, otherwise to an implementation-defined
-                                value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
+                              description: |-
+                                Requests describes the minimum amount of compute resources required.
+                                If Requests is omitted for a container, it defaults to Limits if that is explicitly specified,
+                                otherwise to an implementation-defined value. Requests cannot exceed Limits.
+                                More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
                               type: object
                           type: object
+                        restartPolicy:
+                          description: |-
+                            RestartPolicy defines the restart behavior of individual containers in a pod.
+                            This field may only be set for init containers, and the only allowed value is "Always".
+                            For non-init containers or when this field is not specified,
+                            the restart behavior is defined by the Pod's restart policy and the container type.
+                            Setting the RestartPolicy as "Always" for the init container will have the following effect:
+                            this init container will be continually restarted on
+                            exit until all regular containers have terminated. Once all regular
+                            containers have completed, all init containers with restartPolicy "Always"
+                            will be shut down. This lifecycle differs from normal init containers and
+                            is often referred to as a "sidecar" container. Although this init
+                            container still starts in the init container sequence, it does not wait
+                            for the container to complete before proceeding to the next init
+                            container. Instead, the next init container starts immediately after this
+                            init container is started, or after any startupProbe has successfully
+                            completed.
+                          type: string
                         securityContext:
-                          description: 'SecurityContext defines the security options
-                            the container should be run with. If set, the fields of
-                            SecurityContext override the equivalent fields of PodSecurityContext.
-                            More info: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/'
+                          description: |-
+                            SecurityContext defines the security options the container should be run with.
+                            If set, the fields of SecurityContext override the equivalent fields of PodSecurityContext.
+                            More info: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/
                           properties:
                             allowPrivilegeEscalation:
-                              description: 'AllowPrivilegeEscalation controls whether
-                                a process can gain more privileges than its parent
-                                process. This bool directly controls if the no_new_privs
-                                flag will be set on the container process. AllowPrivilegeEscalation
-                                is true always when the container is: 1) run as Privileged
-                                2) has CAP_SYS_ADMIN Note that this field cannot be
-                                set when spec.os.name is windows.'
+                              description: |-
+                                AllowPrivilegeEscalation controls whether a process can gain more
+                                privileges than its parent process. This bool directly controls if
+                                the no_new_privs flag will be set on the container process.
+                                AllowPrivilegeEscalation is true always when the container is:
+                                1) run as Privileged
+                                2) has CAP_SYS_ADMIN
+                                Note that this field cannot be set when spec.os.name is windows.
                               type: boolean
+                            appArmorProfile:
+                              description: |-
+                                appArmorProfile is the AppArmor options to use by this container. If set, this profile
+                                overrides the pod's appArmorProfile.
+                                Note that this field cannot be set when spec.os.name is windows.
+                              properties:
+                                localhostProfile:
+                                  description: |-
+                                    localhostProfile indicates a profile loaded on the node that should be used.
+                                    The profile must be preconfigured on the node to work.
+                                    Must match the loaded name of the profile.
+                                    Must be set if and only if type is "Localhost".
+                                  type: string
+                                type:
+                                  description: |-
+                                    type indicates which kind of AppArmor profile will be applied.
+                                    Valid options are:
+                                      Localhost - a profile pre-loaded on the node.
+                                      RuntimeDefault - the container runtime's default profile.
+                                      Unconfined - no AppArmor enforcement.
+                                  type: string
+                              required:
+                              - type
+                              type: object
                             capabilities:
-                              description: The capabilities to add/drop when running
-                                containers. Defaults to the default set of capabilities
-                                granted by the container runtime. Note that this field
-                                cannot be set when spec.os.name is windows.
+                              description: |-
+                                The capabilities to add/drop when running containers.
+                                Defaults to the default set of capabilities granted by the container runtime.
+                                Note that this field cannot be set when spec.os.name is windows.
                               properties:
                                 add:
                                   description: Added capabilities
@@ -8706,6 +11028,7 @@ spec:
                                       type
                                     type: string
                                   type: array
+                                  x-kubernetes-list-type: atomic
                                 drop:
                                   description: Removed capabilities
                                   items:
@@ -8713,64 +11036,63 @@ spec:
                                       type
                                     type: string
                                   type: array
+                                  x-kubernetes-list-type: atomic
                               type: object
                             privileged:
-                              description: Run container in privileged mode. Processes
-                                in privileged containers are essentially equivalent
-                                to root on the host. Defaults to false. Note that
-                                this field cannot be set when spec.os.name is windows.
+                              description: |-
+                                Run container in privileged mode.
+                                Processes in privileged containers are essentially equivalent to root on the host.
+                                Defaults to false.
+                                Note that this field cannot be set when spec.os.name is windows.
                               type: boolean
                             procMount:
-                              description: procMount denotes the type of proc mount
-                                to use for the containers. The default is DefaultProcMount
-                                which uses the container runtime defaults for readonly
-                                paths and masked paths. This requires the ProcMountType
-                                feature flag to be enabled. Note that this field cannot
-                                be set when spec.os.name is windows.
+                              description: |-
+                                procMount denotes the type of proc mount to use for the containers.
+                                The default value is Default which uses the container runtime defaults for
+                                readonly paths and masked paths.
+                                This requires the ProcMountType feature flag to be enabled.
+                                Note that this field cannot be set when spec.os.name is windows.
                               type: string
                             readOnlyRootFilesystem:
-                              description: Whether this container has a read-only
-                                root filesystem. Default is false. Note that this
-                                field cannot be set when spec.os.name is windows.
+                              description: |-
+                                Whether this container has a read-only root filesystem.
+                                Default is false.
+                                Note that this field cannot be set when spec.os.name is windows.
                               type: boolean
                             runAsGroup:
-                              description: The GID to run the entrypoint of the container
-                                process. Uses runtime default if unset. May also be
-                                set in PodSecurityContext.  If set in both SecurityContext
-                                and PodSecurityContext, the value specified in SecurityContext
-                                takes precedence. Note that this field cannot be set
-                                when spec.os.name is windows.
+                              description: |-
+                                The GID to run the entrypoint of the container process.
+                                Uses runtime default if unset.
+                                May also be set in PodSecurityContext.  If set in both SecurityContext and
+                                PodSecurityContext, the value specified in SecurityContext takes precedence.
+                                Note that this field cannot be set when spec.os.name is windows.
                               format: int64
                               type: integer
                             runAsNonRoot:
-                              description: Indicates that the container must run as
-                                a non-root user. If true, the Kubelet will validate
-                                the image at runtime to ensure that it does not run
-                                as UID 0 (root) and fail to start the container if
-                                it does. If unset or false, no such validation will
-                                be performed. May also be set in PodSecurityContext.  If
-                                set in both SecurityContext and PodSecurityContext,
-                                the value specified in SecurityContext takes precedence.
+                              description: |-
+                                Indicates that the container must run as a non-root user.
+                                If true, the Kubelet will validate the image at runtime to ensure that it
+                                does not run as UID 0 (root) and fail to start the container if it does.
+                                If unset or false, no such validation will be performed.
+                                May also be set in PodSecurityContext.  If set in both SecurityContext and
+                                PodSecurityContext, the value specified in SecurityContext takes precedence.
                               type: boolean
                             runAsUser:
-                              description: The UID to run the entrypoint of the container
-                                process. Defaults to user specified in image metadata
-                                if unspecified. May also be set in PodSecurityContext.  If
-                                set in both SecurityContext and PodSecurityContext,
-                                the value specified in SecurityContext takes precedence.
-                                Note that this field cannot be set when spec.os.name
-                                is windows.
+                              description: |-
+                                The UID to run the entrypoint of the container process.
+                                Defaults to user specified in image metadata if unspecified.
+                                May also be set in PodSecurityContext.  If set in both SecurityContext and
+                                PodSecurityContext, the value specified in SecurityContext takes precedence.
+                                Note that this field cannot be set when spec.os.name is windows.
                               format: int64
                               type: integer
                             seLinuxOptions:
-                              description: The SELinux context to be applied to the
-                                container. If unspecified, the container runtime will
-                                allocate a random SELinux context for each container.  May
-                                also be set in PodSecurityContext.  If set in both
-                                SecurityContext and PodSecurityContext, the value
-                                specified in SecurityContext takes precedence. Note
-                                that this field cannot be set when spec.os.name is
-                                windows.
+                              description: |-
+                                The SELinux context to be applied to the container.
+                                If unspecified, the container runtime will allocate a random SELinux context for each
+                                container.  May also be set in PodSecurityContext.  If set in both SecurityContext and
+                                PodSecurityContext, the value specified in SecurityContext takes precedence.
+                                Note that this field cannot be set when spec.os.name is windows.
                               properties:
                                 level:
                                   description: Level is SELinux level label that applies
@@ -8790,110 +11112,98 @@ spec:
                                   type: string
                               type: object
                             seccompProfile:
-                              description: The seccomp options to use by this container.
-                                If seccomp options are provided at both the pod &
-                                container level, the container options override the
-                                pod options. Note that this field cannot be set when
-                                spec.os.name is windows.
+                              description: |-
+                                The seccomp options to use by this container. If seccomp options are
+                                provided at both the pod & container level, the container options
+                                override the pod options.
+                                Note that this field cannot be set when spec.os.name is windows.
                               properties:
                                 localhostProfile:
-                                  description: localhostProfile indicates a profile
-                                    defined in a file on the node should be used.
-                                    The profile must be preconfigured on the node
-                                    to work. Must be a descending path, relative to
-                                    the kubelet's configured seccomp profile location.
-                                    Must only be set if type is "Localhost".
+                                  description: |-
+                                    localhostProfile indicates a profile defined in a file on the node should be used.
+                                    The profile must be preconfigured on the node to work.
+                                    Must be a descending path, relative to the kubelet's configured seccomp profile location.
+                                    Must be set if type is "Localhost". Must NOT be set for any other type.
                                   type: string
                                 type:
-                                  description: "type indicates which kind of seccomp
-                                    profile will be applied. Valid options are: \n
-                                    Localhost - a profile defined in a file on the
-                                    node should be used. RuntimeDefault - the container
-                                    runtime default profile should be used. Unconfined
-                                    - no profile should be applied."
+                                  description: |-
+                                    type indicates which kind of seccomp profile will be applied.
+                                    Valid options are:
+
+                                    Localhost - a profile defined in a file on the node should be used.
+                                    RuntimeDefault - the container runtime default profile should be used.
+                                    Unconfined - no profile should be applied.
                                   type: string
                               required:
                               - type
                               type: object
                             windowsOptions:
-                              description: The Windows specific settings applied to
-                                all containers. If unspecified, the options from the
-                                PodSecurityContext will be used. If set in both SecurityContext
-                                and PodSecurityContext, the value specified in SecurityContext
-                                takes precedence. Note that this field cannot be set
-                                when spec.os.name is linux.
+                              description: |-
+                                The Windows specific settings applied to all containers.
+                                If unspecified, the options from the PodSecurityContext will be used.
+                                If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence.
+                                Note that this field cannot be set when spec.os.name is linux.
                               properties:
                                 gmsaCredentialSpec:
-                                  description: GMSACredentialSpec is where the GMSA
-                                    admission webhook (https://github.com/kubernetes-sigs/windows-gmsa)
-                                    inlines the contents of the GMSA credential spec
-                                    named by the GMSACredentialSpecName field.
+                                  description: |-
+                                    GMSACredentialSpec is where the GMSA admission webhook
+                                    (https://github.com/kubernetes-sigs/windows-gmsa) inlines the contents of the
+                                    GMSA credential spec named by the GMSACredentialSpecName field.
                                   type: string
                                 gmsaCredentialSpecName:
                                   description: GMSACredentialSpecName is the name
                                     of the GMSA credential spec to use.
                                   type: string
                                 hostProcess:
-                                  description: HostProcess determines if a container
-                                    should be run as a 'Host Process' container. This
-                                    field is alpha-level and will only be honored
-                                    by components that enable the WindowsHostProcessContainers
-                                    feature flag. Setting this field without the feature
-                                    flag will result in errors when validating the
-                                    Pod. All of a Pod's containers must have the same
-                                    effective HostProcess value (it is not allowed
-                                    to have a mix of HostProcess containers and non-HostProcess
-                                    containers).  In addition, if HostProcess is true
-                                    then HostNetwork must also be set to true.
+                                  description: |-
+                                    HostProcess determines if a container should be run as a 'Host Process' container.
+                                    All of a Pod's containers must have the same effective HostProcess value
+                                    (it is not allowed to have a mix of HostProcess containers and non-HostProcess containers).
+                                    In addition, if HostProcess is true then HostNetwork must also be set to true.
                                   type: boolean
                                 runAsUserName:
-                                  description: The UserName in Windows to run the
-                                    entrypoint of the container process. Defaults
-                                    to the user specified in image metadata if unspecified.
-                                    May also be set in PodSecurityContext. If set
-                                    in both SecurityContext and PodSecurityContext,
-                                    the value specified in SecurityContext takes precedence.
+                                  description: |-
+                                    The UserName in Windows to run the entrypoint of the container process.
+                                    Defaults to the user specified in image metadata if unspecified.
+                                    May also be set in PodSecurityContext. If set in both SecurityContext and
+                                    PodSecurityContext, the value specified in SecurityContext takes precedence.
                                   type: string
                               type: object
                           type: object
                         startupProbe:
-                          description: 'StartupProbe indicates that the Pod has successfully
-                            initialized. If specified, no other probes are executed
-                            until this completes successfully. If this probe fails,
-                            the Pod will be restarted, just as if the livenessProbe
-                            failed. This can be used to provide different probe parameters
-                            at the beginning of a Pod''s lifecycle, when it might
-                            take a long time to load data or warm a cache, than during
-                            steady-state operation. This cannot be updated. More info:
-                            https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
+                          description: |-
+                            StartupProbe indicates that the Pod has successfully initialized.
+                            If specified, no other probes are executed until this completes successfully.
+                            If this probe fails, the Pod will be restarted, just as if the livenessProbe failed.
+                            This can be used to provide different probe parameters at the beginning of a Pod's lifecycle,
+                            when it might take a long time to load data or warm a cache, than during steady-state operation.
+                            This cannot be updated.
+                            More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
                           properties:
                             exec:
-                              description: Exec specifies the action to take.
+                              description: Exec specifies a command to execute in
+                                the container.
                               properties:
                                 command:
-                                  description: Command is the command line to execute
-                                    inside the container, the working directory for
-                                    the command  is root ('/') in the container's
-                                    filesystem. The command is simply exec'd, it is
-                                    not run inside a shell, so traditional shell instructions
-                                    ('|', etc) won't work. To use a shell, you need
-                                    to explicitly call out to that shell. Exit status
-                                    of 0 is treated as live/healthy and non-zero is
-                                    unhealthy.
+                                  description: |-
+                                    Command is the command line to execute inside the container, the working directory for the
+                                    command  is root ('/') in the container's filesystem. The command is simply exec'd, it is
+                                    not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use
+                                    a shell, you need to explicitly call out to that shell.
+                                    Exit status of 0 is treated as live/healthy and non-zero is unhealthy.
                                   items:
                                     type: string
                                   type: array
+                                  x-kubernetes-list-type: atomic
                               type: object
                             failureThreshold:
-                              description: Minimum consecutive failures for the probe
-                                to be considered failed after having succeeded. Defaults
-                                to 3. Minimum value is 1.
+                              description: |-
+                                Minimum consecutive failures for the probe to be considered failed after having succeeded.
+                                Defaults to 3. Minimum value is 1.
                               format: int32
                               type: integer
                             grpc:
-                              description: GRPC specifies an action involving a GRPC
-                                port. This is a beta field and requires enabling GRPCContainerProbe
-                                feature gate.
+                              description: GRPC specifies a GRPC HealthCheckRequest.
                               properties:
                                 port:
                                   description: Port number of the gRPC service. Number
@@ -8901,21 +11211,24 @@ spec:
                                   format: int32
                                   type: integer
                                 service:
-                                  description: "Service is the name of the service
-                                    to place in the gRPC HealthCheckRequest (see https://github.com/grpc/grpc/blob/master/doc/health-checking.md).
-                                    \n If this is not specified, the default behavior
-                                    is defined by gRPC."
+                                  default: ""
+                                  description: |-
+                                    Service is the name of the service to place in the gRPC HealthCheckRequest
+                                    (see https://github.com/grpc/grpc/blob/master/doc/health-checking.md).
+
+                                    If this is not specified, the default behavior is defined by gRPC.
                                   type: string
                               required:
                               - port
                               type: object
                             httpGet:
-                              description: HTTPGet specifies the http request to perform.
+                              description: HTTPGet specifies an HTTP GET request to
+                                perform.
                               properties:
                                 host:
-                                  description: Host name to connect to, defaults to
-                                    the pod IP. You probably want to set "Host" in
-                                    httpHeaders instead.
+                                  description: |-
+                                    Host name to connect to, defaults to the pod IP. You probably want to set
+                                    "Host" in httpHeaders instead.
                                   type: string
                                 httpHeaders:
                                   description: Custom headers to set in the request.
@@ -8925,7 +11238,9 @@ spec:
                                       to be used in HTTP probes
                                     properties:
                                       name:
-                                        description: The header field name
+                                        description: |-
+                                          The header field name.
+                                          This will be canonicalized upon output, so case-variant names will be understood as the same header.
                                         type: string
                                       value:
                                         description: The header field value
@@ -8935,6 +11250,7 @@ spec:
                                     - value
                                     type: object
                                   type: array
+                                  x-kubernetes-list-type: atomic
                                 path:
                                   description: Path to access on the HTTP server.
                                   type: string
@@ -8942,38 +11258,40 @@ spec:
                                   anyOf:
                                   - type: integer
                                   - type: string
-                                  description: Name or number of the port to access
-                                    on the container. Number must be in the range
-                                    1 to 65535. Name must be an IANA_SVC_NAME.
+                                  description: |-
+                                    Name or number of the port to access on the container.
+                                    Number must be in the range 1 to 65535.
+                                    Name must be an IANA_SVC_NAME.
                                   x-kubernetes-int-or-string: true
                                 scheme:
-                                  description: Scheme to use for connecting to the
-                                    host. Defaults to HTTP.
+                                  description: |-
+                                    Scheme to use for connecting to the host.
+                                    Defaults to HTTP.
                                   type: string
                               required:
                               - port
                               type: object
                             initialDelaySeconds:
-                              description: 'Number of seconds after the container
-                                has started before liveness probes are initiated.
-                                More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
+                              description: |-
+                                Number of seconds after the container has started before liveness probes are initiated.
+                                More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
                               format: int32
                               type: integer
                             periodSeconds:
-                              description: How often (in seconds) to perform the probe.
+                              description: |-
+                                How often (in seconds) to perform the probe.
                                 Default to 10 seconds. Minimum value is 1.
                               format: int32
                               type: integer
                             successThreshold:
-                              description: Minimum consecutive successes for the probe
-                                to be considered successful after having failed. Defaults
-                                to 1. Must be 1 for liveness and startup. Minimum
-                                value is 1.
+                              description: |-
+                                Minimum consecutive successes for the probe to be considered successful after having failed.
+                                Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
                               format: int32
                               type: integer
                             tcpSocket:
-                              description: TCPSocket specifies an action involving
-                                a TCP port.
+                              description: TCPSocket specifies a connection to a TCP
+                                port.
                               properties:
                                 host:
                                   description: 'Optional: Host name to connect to,
@@ -8983,81 +11301,76 @@ spec:
                                   anyOf:
                                   - type: integer
                                   - type: string
-                                  description: Number or name of the port to access
-                                    on the container. Number must be in the range
-                                    1 to 65535. Name must be an IANA_SVC_NAME.
+                                  description: |-
+                                    Number or name of the port to access on the container.
+                                    Number must be in the range 1 to 65535.
+                                    Name must be an IANA_SVC_NAME.
                                   x-kubernetes-int-or-string: true
                               required:
                               - port
                               type: object
                             terminationGracePeriodSeconds:
-                              description: Optional duration in seconds the pod needs
-                                to terminate gracefully upon probe failure. The grace
-                                period is the duration in seconds after the processes
-                                running in the pod are sent a termination signal and
-                                the time when the processes are forcibly halted with
-                                a kill signal. Set this value longer than the expected
-                                cleanup time for your process. If this value is nil,
-                                the pod's terminationGracePeriodSeconds will be used.
-                                Otherwise, this value overrides the value provided
-                                by the pod spec. Value must be non-negative integer.
-                                The value zero indicates stop immediately via the
-                                kill signal (no opportunity to shut down). This is
-                                a beta field and requires enabling ProbeTerminationGracePeriod
-                                feature gate. Minimum value is 1. spec.terminationGracePeriodSeconds
-                                is used if unset.
+                              description: |-
+                                Optional duration in seconds the pod needs to terminate gracefully upon probe failure.
+                                The grace period is the duration in seconds after the processes running in the pod are sent
+                                a termination signal and the time when the processes are forcibly halted with a kill signal.
+                                Set this value longer than the expected cleanup time for your process.
+                                If this value is nil, the pod's terminationGracePeriodSeconds will be used. Otherwise, this
+                                value overrides the value provided by the pod spec.
+                                Value must be non-negative integer. The value zero indicates stop immediately via
+                                the kill signal (no opportunity to shut down).
+                                This is a beta field and requires enabling ProbeTerminationGracePeriod feature gate.
+                                Minimum value is 1. spec.terminationGracePeriodSeconds is used if unset.
                               format: int64
                               type: integer
                             timeoutSeconds:
-                              description: 'Number of seconds after which the probe
-                                times out. Defaults to 1 second. Minimum value is
-                                1. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
+                              description: |-
+                                Number of seconds after which the probe times out.
+                                Defaults to 1 second. Minimum value is 1.
+                                More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
                               format: int32
                               type: integer
                           type: object
                         stdin:
-                          description: Whether this container should allocate a buffer
-                            for stdin in the container runtime. If this is not set,
-                            reads from stdin in the container will always result in
-                            EOF. Default is false.
+                          description: |-
+                            Whether this container should allocate a buffer for stdin in the container runtime. If this
+                            is not set, reads from stdin in the container will always result in EOF.
+                            Default is false.
                           type: boolean
                         stdinOnce:
-                          description: Whether the container runtime should close
-                            the stdin channel after it has been opened by a single
-                            attach. When stdin is true the stdin stream will remain
-                            open across multiple attach sessions. If stdinOnce is
-                            set to true, stdin is opened on container start, is empty
-                            until the first client attaches to stdin, and then remains
-                            open and accepts data until the client disconnects, at
-                            which time stdin is closed and remains closed until the
-                            container is restarted. If this flag is false, a container
-                            processes that reads from stdin will never receive an
-                            EOF. Default is false
+                          description: |-
+                            Whether the container runtime should close the stdin channel after it has been opened by
+                            a single attach. When stdin is true the stdin stream will remain open across multiple attach
+                            sessions. If stdinOnce is set to true, stdin is opened on container start, is empty until the
+                            first client attaches to stdin, and then remains open and accepts data until the client disconnects,
+                            at which time stdin is closed and remains closed until the container is restarted. If this
+                            flag is false, a container processes that reads from stdin will never receive an EOF.
+                            Default is false
                           type: boolean
                         terminationMessagePath:
-                          description: 'Optional: Path at which the file to which
-                            the container''s termination message will be written is
-                            mounted into the container''s filesystem. Message written
-                            is intended to be brief final status, such as an assertion
-                            failure message. Will be truncated by the node if greater
-                            than 4096 bytes. The total message length across all containers
-                            will be limited to 12kb. Defaults to /dev/termination-log.
-                            Cannot be updated.'
+                          description: |-
+                            Optional: Path at which the file to which the container's termination message
+                            will be written is mounted into the container's filesystem.
+                            Message written is intended to be brief final status, such as an assertion failure message.
+                            Will be truncated by the node if greater than 4096 bytes. The total message length across
+                            all containers will be limited to 12kb.
+                            Defaults to /dev/termination-log.
+                            Cannot be updated.
                           type: string
                         terminationMessagePolicy:
-                          description: Indicate how the termination message should
-                            be populated. File will use the contents of terminationMessagePath
-                            to populate the container status message on both success
-                            and failure. FallbackToLogsOnError will use the last chunk
-                            of container log output if the termination message file
-                            is empty and the container exited with an error. The log
-                            output is limited to 2048 bytes or 80 lines, whichever
-                            is smaller. Defaults to File. Cannot be updated.
+                          description: |-
+                            Indicate how the termination message should be populated. File will use the contents of
+                            terminationMessagePath to populate the container status message on both success and failure.
+                            FallbackToLogsOnError will use the last chunk of container log output if the termination
+                            message file is empty and the container exited with an error.
+                            The log output is limited to 2048 bytes or 80 lines, whichever is smaller.
+                            Defaults to File.
+                            Cannot be updated.
                           type: string
                         tty:
-                          description: Whether this container should allocate a TTY
-                            for itself, also requires 'stdin' to be true. Default
-                            is false.
+                          description: |-
+                            Whether this container should allocate a TTY for itself, also requires 'stdin' to be true.
+                            Default is false.
                           type: boolean
                         volumeDevices:
                           description: volumeDevices is the list of block devices
@@ -9079,52 +11392,84 @@ spec:
                             - name
                             type: object
                           type: array
+                          x-kubernetes-list-map-keys:
+                          - devicePath
+                          x-kubernetes-list-type: map
                         volumeMounts:
-                          description: Pod volumes to mount into the container's filesystem.
+                          description: |-
+                            Pod volumes to mount into the container's filesystem.
                             Cannot be updated.
                           items:
                             description: VolumeMount describes a mounting of a Volume
                               within a container.
                             properties:
                               mountPath:
-                                description: Path within the container at which the
-                                  volume should be mounted.  Must not contain ':'.
+                                description: |-
+                                  Path within the container at which the volume should be mounted.  Must
+                                  not contain ':'.
                                 type: string
                               mountPropagation:
-                                description: mountPropagation determines how mounts
-                                  are propagated from the host to container and the
-                                  other way around. When not set, MountPropagationNone
-                                  is used. This field is beta in 1.10.
+                                description: |-
+                                  mountPropagation determines how mounts are propagated from the host
+                                  to container and the other way around.
+                                  When not set, MountPropagationNone is used.
+                                  This field is beta in 1.10.
+                                  When RecursiveReadOnly is set to IfPossible or to Enabled, MountPropagation must be None or unspecified
+                                  (which defaults to None).
                                 type: string
                               name:
                                 description: This must match the Name of a Volume.
                                 type: string
                               readOnly:
-                                description: Mounted read-only if true, read-write
-                                  otherwise (false or unspecified). Defaults to false.
+                                description: |-
+                                  Mounted read-only if true, read-write otherwise (false or unspecified).
+                                  Defaults to false.
                                 type: boolean
+                              recursiveReadOnly:
+                                description: |-
+                                  RecursiveReadOnly specifies whether read-only mounts should be handled
+                                  recursively.
+
+                                  If ReadOnly is false, this field has no meaning and must be unspecified.
+
+                                  If ReadOnly is true, and this field is set to Disabled, the mount is not made
+                                  recursively read-only.  If this field is set to IfPossible, the mount is made
+                                  recursively read-only, if it is supported by the container runtime.  If this
+                                  field is set to Enabled, the mount is made recursively read-only if it is
+                                  supported by the container runtime, otherwise the pod will not be started and
+                                  an error will be generated to indicate the reason.
+
+                                  If this field is set to IfPossible or Enabled, MountPropagation must be set to
+                                  None (or be unspecified, which defaults to None).
+
+                                  If this field is not specified, it is treated as an equivalent of Disabled.
+                                type: string
                               subPath:
-                                description: Path within the volume from which the
-                                  container's volume should be mounted. Defaults to
-                                  "" (volume's root).
+                                description: |-
+                                  Path within the volume from which the container's volume should be mounted.
+                                  Defaults to "" (volume's root).
                                 type: string
                               subPathExpr:
-                                description: Expanded path within the volume from
-                                  which the container's volume should be mounted.
-                                  Behaves similarly to SubPath but environment variable
-                                  references $(VAR_NAME) are expanded using the container's
-                                  environment. Defaults to "" (volume's root). SubPathExpr
-                                  and SubPath are mutually exclusive.
+                                description: |-
+                                  Expanded path within the volume from which the container's volume should be mounted.
+                                  Behaves similarly to SubPath but environment variable references $(VAR_NAME) are expanded using the container's environment.
+                                  Defaults to "" (volume's root).
+                                  SubPathExpr and SubPath are mutually exclusive.
                                 type: string
                             required:
                             - mountPath
                             - name
                             type: object
                           type: array
+                          x-kubernetes-list-map-keys:
+                          - mountPath
+                          x-kubernetes-list-type: map
                         workingDir:
-                          description: Container's working directory. If not specified,
-                            the container runtime's default will be used, which might
-                            be configured in the container image. Cannot be updated.
+                          description: |-
+                            Container's working directory.
+                            If not specified, the container runtime's default will be used, which
+                            might be configured in the container image.
+                            Cannot be updated.
                           type: string
                       required:
                       - name
@@ -9136,33 +11481,57 @@ spec:
                         a container.
                       properties:
                         mountPath:
-                          description: Path within the container at which the volume
-                            should be mounted.  Must not contain ':'.
+                          description: |-
+                            Path within the container at which the volume should be mounted.  Must
+                            not contain ':'.
                           type: string
                         mountPropagation:
-                          description: mountPropagation determines how mounts are
-                            propagated from the host to container and the other way
-                            around. When not set, MountPropagationNone is used. This
-                            field is beta in 1.10.
+                          description: |-
+                            mountPropagation determines how mounts are propagated from the host
+                            to container and the other way around.
+                            When not set, MountPropagationNone is used.
+                            This field is beta in 1.10.
+                            When RecursiveReadOnly is set to IfPossible or to Enabled, MountPropagation must be None or unspecified
+                            (which defaults to None).
                           type: string
                         name:
                           description: This must match the Name of a Volume.
                           type: string
                         readOnly:
-                          description: Mounted read-only if true, read-write otherwise
-                            (false or unspecified). Defaults to false.
+                          description: |-
+                            Mounted read-only if true, read-write otherwise (false or unspecified).
+                            Defaults to false.
                           type: boolean
+                        recursiveReadOnly:
+                          description: |-
+                            RecursiveReadOnly specifies whether read-only mounts should be handled
+                            recursively.
+
+                            If ReadOnly is false, this field has no meaning and must be unspecified.
+
+                            If ReadOnly is true, and this field is set to Disabled, the mount is not made
+                            recursively read-only.  If this field is set to IfPossible, the mount is made
+                            recursively read-only, if it is supported by the container runtime.  If this
+                            field is set to Enabled, the mount is made recursively read-only if it is
+                            supported by the container runtime, otherwise the pod will not be started and
+                            an error will be generated to indicate the reason.
+
+                            If this field is set to IfPossible or Enabled, MountPropagation must be set to
+                            None (or be unspecified, which defaults to None).
+
+                            If this field is not specified, it is treated as an equivalent of Disabled.
+                          type: string
                         subPath:
-                          description: Path within the volume from which the container's
-                            volume should be mounted. Defaults to "" (volume's root).
+                          description: |-
+                            Path within the volume from which the container's volume should be mounted.
+                            Defaults to "" (volume's root).
                           type: string
                         subPathExpr:
-                          description: Expanded path within the volume from which
-                            the container's volume should be mounted. Behaves similarly
-                            to SubPath but environment variable references $(VAR_NAME)
-                            are expanded using the container's environment. Defaults
-                            to "" (volume's root). SubPathExpr and SubPath are mutually
-                            exclusive.
+                          description: |-
+                            Expanded path within the volume from which the container's volume should be mounted.
+                            Behaves similarly to SubPath but environment variable references $(VAR_NAME) are expanded using the container's environment.
+                            Defaults to "" (volume's root).
+                            SubPathExpr and SubPath are mutually exclusive.
                           type: string
                       required:
                       - mountPath
@@ -9175,43 +11544,46 @@ spec:
                         may be accessed by any container in the pod.
                       properties:
                         awsElasticBlockStore:
-                          description: 'awsElasticBlockStore represents an AWS Disk
-                            resource that is attached to a kubelet''s host machine
-                            and then exposed to the pod. More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore'
+                          description: |-
+                            awsElasticBlockStore represents an AWS Disk resource that is attached to a
+                            kubelet's host machine and then exposed to the pod.
+                            Deprecated: AWSElasticBlockStore is deprecated. All operations for the in-tree
+                            awsElasticBlockStore type are redirected to the ebs.csi.aws.com CSI driver.
+                            More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
                           properties:
                             fsType:
-                              description: 'fsType is the filesystem type of the volume
-                                that you want to mount. Tip: Ensure that the filesystem
-                                type is supported by the host operating system. Examples:
-                                "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4"
-                                if unspecified. More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
-                                TODO: how do we prevent errors in the filesystem from
-                                compromising the machine'
+                              description: |-
+                                fsType is the filesystem type of the volume that you want to mount.
+                                Tip: Ensure that the filesystem type is supported by the host operating system.
+                                Examples: "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
+                                More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
                               type: string
                             partition:
-                              description: 'partition is the partition in the volume
-                                that you want to mount. If omitted, the default is
-                                to mount by volume name. Examples: For volume /dev/sda1,
-                                you specify the partition as "1". Similarly, the volume
-                                partition for /dev/sda is "0" (or you can leave the
-                                property empty).'
+                              description: |-
+                                partition is the partition in the volume that you want to mount.
+                                If omitted, the default is to mount by volume name.
+                                Examples: For volume /dev/sda1, you specify the partition as "1".
+                                Similarly, the volume partition for /dev/sda is "0" (or you can leave the property empty).
                               format: int32
                               type: integer
                             readOnly:
-                              description: 'readOnly value true will force the readOnly
-                                setting in VolumeMounts. More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore'
+                              description: |-
+                                readOnly value true will force the readOnly setting in VolumeMounts.
+                                More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
                               type: boolean
                             volumeID:
-                              description: 'volumeID is unique ID of the persistent
-                                disk resource in AWS (Amazon EBS volume). More info:
-                                https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore'
+                              description: |-
+                                volumeID is unique ID of the persistent disk resource in AWS (Amazon EBS volume).
+                                More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
                               type: string
                           required:
                           - volumeID
                           type: object
                         azureDisk:
-                          description: azureDisk represents an Azure Data Disk mount
-                            on the host and bind mount to the pod.
+                          description: |-
+                            azureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.
+                            Deprecated: AzureDisk is deprecated. All operations for the in-tree azureDisk type
+                            are redirected to the disk.csi.azure.com CSI driver.
                           properties:
                             cachingMode:
                               description: 'cachingMode is the Host Caching mode:
@@ -9226,10 +11598,11 @@ spec:
                                 blob storage
                               type: string
                             fsType:
-                              description: fsType is Filesystem type to mount. Must
-                                be a filesystem type supported by the host operating
-                                system. Ex. "ext4", "xfs", "ntfs". Implicitly inferred
-                                to be "ext4" if unspecified.
+                              default: ext4
+                              description: |-
+                                fsType is Filesystem type to mount.
+                                Must be a filesystem type supported by the host operating system.
+                                Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
                               type: string
                             kind:
                               description: 'kind expected values are Shared: multiple
@@ -9239,20 +11612,25 @@ spec:
                                 to shared'
                               type: string
                             readOnly:
-                              description: readOnly Defaults to false (read/write).
-                                ReadOnly here will force the ReadOnly setting in VolumeMounts.
+                              default: false
+                              description: |-
+                                readOnly Defaults to false (read/write). ReadOnly here will force
+                                the ReadOnly setting in VolumeMounts.
                               type: boolean
                           required:
                           - diskName
                           - diskURI
                           type: object
                         azureFile:
-                          description: azureFile represents an Azure File Service
-                            mount on the host and bind mount to the pod.
+                          description: |-
+                            azureFile represents an Azure File Service mount on the host and bind mount to the pod.
+                            Deprecated: AzureFile is deprecated. All operations for the in-tree azureFile type
+                            are redirected to the file.csi.azure.com CSI driver.
                           properties:
                             readOnly:
-                              description: readOnly defaults to false (read/write).
-                                ReadOnly here will force the ReadOnly setting in VolumeMounts.
+                              description: |-
+                                readOnly defaults to false (read/write). ReadOnly here will force
+                                the ReadOnly setting in VolumeMounts.
                               type: boolean
                             secretName:
                               description: secretName is the  name of secret that
@@ -9266,75 +11644,97 @@ spec:
                           - shareName
                           type: object
                         cephfs:
-                          description: cephFS represents a Ceph FS mount on the host
-                            that shares a pod's lifetime
+                          description: |-
+                            cephFS represents a Ceph FS mount on the host that shares a pod's lifetime.
+                            Deprecated: CephFS is deprecated and the in-tree cephfs type is no longer supported.
                           properties:
                             monitors:
-                              description: 'monitors is Required: Monitors is a collection
-                                of Ceph monitors More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it'
+                              description: |-
+                                monitors is Required: Monitors is a collection of Ceph monitors
+                                More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it
                               items:
                                 type: string
                               type: array
+                              x-kubernetes-list-type: atomic
                             path:
                               description: 'path is Optional: Used as the mounted
                                 root, rather than the full Ceph tree, default is /'
                               type: string
                             readOnly:
-                              description: 'readOnly is Optional: Defaults to false
-                                (read/write). ReadOnly here will force the ReadOnly
-                                setting in VolumeMounts. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it'
+                              description: |-
+                                readOnly is Optional: Defaults to false (read/write). ReadOnly here will force
+                                the ReadOnly setting in VolumeMounts.
+                                More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it
                               type: boolean
                             secretFile:
-                              description: 'secretFile is Optional: SecretFile is
-                                the path to key ring for User, default is /etc/ceph/user.secret
-                                More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it'
+                              description: |-
+                                secretFile is Optional: SecretFile is the path to key ring for User, default is /etc/ceph/user.secret
+                                More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it
                               type: string
                             secretRef:
-                              description: 'secretRef is Optional: SecretRef is reference
-                                to the authentication secret for User, default is
-                                empty. More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it'
+                              description: |-
+                                secretRef is Optional: SecretRef is reference to the authentication secret for User, default is empty.
+                                More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it
                               properties:
                                 name:
-                                  description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                                    TODO: Add other useful fields. apiVersion, kind,
-                                    uid?'
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
                                   type: string
                               type: object
+                              x-kubernetes-map-type: atomic
                             user:
-                              description: 'user is optional: User is the rados user
-                                name, default is admin More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it'
+                              description: |-
+                                user is optional: User is the rados user name, default is admin
+                                More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it
                               type: string
                           required:
                           - monitors
                           type: object
                         cinder:
-                          description: 'cinder represents a cinder volume attached
-                            and mounted on kubelets host machine. More info: https://examples.k8s.io/mysql-cinder-pd/README.md'
+                          description: |-
+                            cinder represents a cinder volume attached and mounted on kubelets host machine.
+                            Deprecated: Cinder is deprecated. All operations for the in-tree cinder type
+                            are redirected to the cinder.csi.openstack.org CSI driver.
+                            More info: https://examples.k8s.io/mysql-cinder-pd/README.md
                           properties:
                             fsType:
-                              description: 'fsType is the filesystem type to mount.
-                                Must be a filesystem type supported by the host operating
-                                system. Examples: "ext4", "xfs", "ntfs". Implicitly
-                                inferred to be "ext4" if unspecified. More info: https://examples.k8s.io/mysql-cinder-pd/README.md'
+                              description: |-
+                                fsType is the filesystem type to mount.
+                                Must be a filesystem type supported by the host operating system.
+                                Examples: "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
+                                More info: https://examples.k8s.io/mysql-cinder-pd/README.md
                               type: string
                             readOnly:
-                              description: 'readOnly defaults to false (read/write).
-                                ReadOnly here will force the ReadOnly setting in VolumeMounts.
-                                More info: https://examples.k8s.io/mysql-cinder-pd/README.md'
+                              description: |-
+                                readOnly defaults to false (read/write). ReadOnly here will force
+                                the ReadOnly setting in VolumeMounts.
+                                More info: https://examples.k8s.io/mysql-cinder-pd/README.md
                               type: boolean
                             secretRef:
-                              description: 'secretRef is optional: points to a secret
-                                object containing parameters used to connect to OpenStack.'
+                              description: |-
+                                secretRef is optional: points to a secret object containing parameters used to connect
+                                to OpenStack.
                               properties:
                                 name:
-                                  description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                                    TODO: Add other useful fields. apiVersion, kind,
-                                    uid?'
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
                                   type: string
                               type: object
+                              x-kubernetes-map-type: atomic
                             volumeID:
-                              description: 'volumeID used to identify the volume in
-                                cinder. More info: https://examples.k8s.io/mysql-cinder-pd/README.md'
+                              description: |-
+                                volumeID used to identify the volume in cinder.
+                                More info: https://examples.k8s.io/mysql-cinder-pd/README.md
                               type: string
                           required:
                           - volumeID
@@ -9344,29 +11744,25 @@ spec:
                             populate this volume
                           properties:
                             defaultMode:
-                              description: 'defaultMode is optional: mode bits used
-                                to set permissions on created files by default. Must
-                                be an octal value between 0000 and 0777 or a decimal
-                                value between 0 and 511. YAML accepts both octal and
-                                decimal values, JSON requires decimal values for mode
-                                bits. Defaults to 0644. Directories within the path
-                                are not affected by this setting. This might be in
-                                conflict with other options that affect the file mode,
-                                like fsGroup, and the result can be other mode bits
-                                set.'
+                              description: |-
+                                defaultMode is optional: mode bits used to set permissions on created files by default.
+                                Must be an octal value between 0000 and 0777 or a decimal value between 0 and 511.
+                                YAML accepts both octal and decimal values, JSON requires decimal values for mode bits.
+                                Defaults to 0644.
+                                Directories within the path are not affected by this setting.
+                                This might be in conflict with other options that affect the file
+                                mode, like fsGroup, and the result can be other mode bits set.
                               format: int32
                               type: integer
                             items:
-                              description: items if unspecified, each key-value pair
-                                in the Data field of the referenced ConfigMap will
-                                be projected into the volume as a file whose name
-                                is the key and content is the value. If specified,
-                                the listed keys will be projected into the specified
-                                paths, and unlisted keys will not be present. If a
-                                key is specified which is not present in the ConfigMap,
-                                the volume setup will error unless it is marked optional.
-                                Paths must be relative and may not contain the '..'
-                                path or start with '..'.
+                              description: |-
+                                items if unspecified, each key-value pair in the Data field of the referenced
+                                ConfigMap will be projected into the volume as a file whose name is the
+                                key and content is the value. If specified, the listed keys will be
+                                projected into the specified paths, and unlisted keys will not be
+                                present. If a key is specified which is not present in the ConfigMap,
+                                the volume setup will error unless it is marked optional. Paths must be
+                                relative and may not contain the '..' path or start with '..'.
                               items:
                                 description: Maps a string key to a path within a
                                   volume.
@@ -9375,22 +11771,20 @@ spec:
                                     description: key is the key to project.
                                     type: string
                                   mode:
-                                    description: 'mode is Optional: mode bits used
-                                      to set permissions on this file. Must be an
-                                      octal value between 0000 and 0777 or a decimal
-                                      value between 0 and 511. YAML accepts both octal
-                                      and decimal values, JSON requires decimal values
-                                      for mode bits. If not specified, the volume
-                                      defaultMode will be used. This might be in conflict
-                                      with other options that affect the file mode,
-                                      like fsGroup, and the result can be other mode
-                                      bits set.'
+                                    description: |-
+                                      mode is Optional: mode bits used to set permissions on this file.
+                                      Must be an octal value between 0000 and 0777 or a decimal value between 0 and 511.
+                                      YAML accepts both octal and decimal values, JSON requires decimal values for mode bits.
+                                      If not specified, the volume defaultMode will be used.
+                                      This might be in conflict with other options that affect the file
+                                      mode, like fsGroup, and the result can be other mode bits set.
                                     format: int32
                                     type: integer
                                   path:
-                                    description: path is the relative path of the
-                                      file to map the key to. May not be an absolute
-                                      path. May not contain the path element '..'.
+                                    description: |-
+                                      path is the relative path of the file to map the key to.
+                                      May not be an absolute path.
+                                      May not contain the path element '..'.
                                       May not start with the string '..'.
                                     type: string
                                 required:
@@ -9398,56 +11792,68 @@ spec:
                                 - path
                                 type: object
                               type: array
+                              x-kubernetes-list-type: atomic
                             name:
-                              description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                                TODO: Add other useful fields. apiVersion, kind, uid?'
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
                               type: string
                             optional:
                               description: optional specify whether the ConfigMap
                                 or its keys must be defined
                               type: boolean
                           type: object
+                          x-kubernetes-map-type: atomic
                         csi:
                           description: csi (Container Storage Interface) represents
                             ephemeral storage that is handled by certain external
-                            CSI drivers (Beta feature).
+                            CSI drivers.
                           properties:
                             driver:
-                              description: driver is the name of the CSI driver that
-                                handles this volume. Consult with your admin for the
-                                correct name as registered in the cluster.
+                              description: |-
+                                driver is the name of the CSI driver that handles this volume.
+                                Consult with your admin for the correct name as registered in the cluster.
                               type: string
                             fsType:
-                              description: fsType to mount. Ex. "ext4", "xfs", "ntfs".
-                                If not provided, the empty value is passed to the
-                                associated CSI driver which will determine the default
-                                filesystem to apply.
+                              description: |-
+                                fsType to mount. Ex. "ext4", "xfs", "ntfs".
+                                If not provided, the empty value is passed to the associated CSI driver
+                                which will determine the default filesystem to apply.
                               type: string
                             nodePublishSecretRef:
-                              description: nodePublishSecretRef is a reference to
-                                the secret object containing sensitive information
-                                to pass to the CSI driver to complete the CSI NodePublishVolume
-                                and NodeUnpublishVolume calls. This field is optional,
-                                and  may be empty if no secret is required. If the
-                                secret object contains more than one secret, all secret
-                                references are passed.
+                              description: |-
+                                nodePublishSecretRef is a reference to the secret object containing
+                                sensitive information to pass to the CSI driver to complete the CSI
+                                NodePublishVolume and NodeUnpublishVolume calls.
+                                This field is optional, and  may be empty if no secret is required. If the
+                                secret object contains more than one secret, all secret references are passed.
                               properties:
                                 name:
-                                  description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                                    TODO: Add other useful fields. apiVersion, kind,
-                                    uid?'
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
                                   type: string
                               type: object
+                              x-kubernetes-map-type: atomic
                             readOnly:
-                              description: readOnly specifies a read-only configuration
-                                for the volume. Defaults to false (read/write).
+                              description: |-
+                                readOnly specifies a read-only configuration for the volume.
+                                Defaults to false (read/write).
                               type: boolean
                             volumeAttributes:
                               additionalProperties:
                                 type: string
-                              description: volumeAttributes stores driver-specific
-                                properties that are passed to the CSI driver. Consult
-                                your driver's documentation for supported values.
+                              description: |-
+                                volumeAttributes stores driver-specific properties that are passed to the CSI
+                                driver. Consult your driver's documentation for supported values.
                               type: object
                           required:
                           - driver
@@ -9457,17 +11863,15 @@ spec:
                             pod that should populate this volume
                           properties:
                             defaultMode:
-                              description: 'Optional: mode bits to use on created
-                                files by default. Must be a Optional: mode bits used
-                                to set permissions on created files by default. Must
-                                be an octal value between 0000 and 0777 or a decimal
-                                value between 0 and 511. YAML accepts both octal and
-                                decimal values, JSON requires decimal values for mode
-                                bits. Defaults to 0644. Directories within the path
-                                are not affected by this setting. This might be in
-                                conflict with other options that affect the file mode,
-                                like fsGroup, and the result can be other mode bits
-                                set.'
+                              description: |-
+                                Optional: mode bits to use on created files by default. Must be a
+                                Optional: mode bits used to set permissions on created files by default.
+                                Must be an octal value between 0000 and 0777 or a decimal value between 0 and 511.
+                                YAML accepts both octal and decimal values, JSON requires decimal values for mode bits.
+                                Defaults to 0644.
+                                Directories within the path are not affected by this setting.
+                                This might be in conflict with other options that affect the file
+                                mode, like fsGroup, and the result can be other mode bits set.
                               format: int32
                               type: integer
                             items:
@@ -9479,8 +11883,8 @@ spec:
                                 properties:
                                   fieldRef:
                                     description: 'Required: Selects a field of the
-                                      pod: only annotations, labels, name and namespace
-                                      are supported.'
+                                      pod: only annotations, labels, name, namespace
+                                      and uid are supported.'
                                     properties:
                                       apiVersion:
                                         description: Version of the schema the FieldPath
@@ -9493,17 +11897,15 @@ spec:
                                     required:
                                     - fieldPath
                                     type: object
+                                    x-kubernetes-map-type: atomic
                                   mode:
-                                    description: 'Optional: mode bits used to set
-                                      permissions on this file, must be an octal value
-                                      between 0000 and 0777 or a decimal value between
-                                      0 and 511. YAML accepts both octal and decimal
-                                      values, JSON requires decimal values for mode
-                                      bits. If not specified, the volume defaultMode
-                                      will be used. This might be in conflict with
-                                      other options that affect the file mode, like
-                                      fsGroup, and the result can be other mode bits
-                                      set.'
+                                    description: |-
+                                      Optional: mode bits used to set permissions on this file, must be an octal value
+                                      between 0000 and 0777 or a decimal value between 0 and 511.
+                                      YAML accepts both octal and decimal values, JSON requires decimal values for mode bits.
+                                      If not specified, the volume defaultMode will be used.
+                                      This might be in conflict with other options that affect the file
+                                      mode, like fsGroup, and the result can be other mode bits set.
                                     format: int32
                                     type: integer
                                   path:
@@ -9514,10 +11916,9 @@ spec:
                                       path must not start with ''..'''
                                     type: string
                                   resourceFieldRef:
-                                    description: 'Selects a resource of the container:
-                                      only resources limits and requests (limits.cpu,
-                                      limits.memory, requests.cpu and requests.memory)
-                                      are currently supported.'
+                                    description: |-
+                                      Selects a resource of the container: only resources limits and requests
+                                      (limits.cpu, limits.memory, requests.cpu and requests.memory) are currently supported.
                                     properties:
                                       containerName:
                                         description: 'Container name: required for
@@ -9537,119 +11938,127 @@ spec:
                                     required:
                                     - resource
                                     type: object
+                                    x-kubernetes-map-type: atomic
                                 required:
                                 - path
                                 type: object
                               type: array
+                              x-kubernetes-list-type: atomic
                           type: object
                         emptyDir:
-                          description: 'emptyDir represents a temporary directory
-                            that shares a pod''s lifetime. More info: https://kubernetes.io/docs/concepts/storage/volumes#emptydir'
+                          description: |-
+                            emptyDir represents a temporary directory that shares a pod's lifetime.
+                            More info: https://kubernetes.io/docs/concepts/storage/volumes#emptydir
                           properties:
                             medium:
-                              description: 'medium represents what type of storage
-                                medium should back this directory. The default is
-                                "" which means to use the node''s default medium.
-                                Must be an empty string (default) or Memory. More
-                                info: https://kubernetes.io/docs/concepts/storage/volumes#emptydir'
+                              description: |-
+                                medium represents what type of storage medium should back this directory.
+                                The default is "" which means to use the node's default medium.
+                                Must be an empty string (default) or Memory.
+                                More info: https://kubernetes.io/docs/concepts/storage/volumes#emptydir
                               type: string
                             sizeLimit:
                               anyOf:
                               - type: integer
                               - type: string
-                              description: 'sizeLimit is the total amount of local
-                                storage required for this EmptyDir volume. The size
-                                limit is also applicable for memory medium. The maximum
-                                usage on memory medium EmptyDir would be the minimum
-                                value between the SizeLimit specified here and the
-                                sum of memory limits of all containers in a pod. The
-                                default is nil which means that the limit is undefined.
-                                More info: http://kubernetes.io/docs/user-guide/volumes#emptydir'
+                              description: |-
+                                sizeLimit is the total amount of local storage required for this EmptyDir volume.
+                                The size limit is also applicable for memory medium.
+                                The maximum usage on memory medium EmptyDir would be the minimum value between
+                                the SizeLimit specified here and the sum of memory limits of all containers in a pod.
+                                The default is nil which means that the limit is undefined.
+                                More info: https://kubernetes.io/docs/concepts/storage/volumes#emptydir
                               pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
                               x-kubernetes-int-or-string: true
                           type: object
                         ephemeral:
-                          description: "ephemeral represents a volume that is handled
-                            by a cluster storage driver. The volume's lifecycle is
-                            tied to the pod that defines it - it will be created before
-                            the pod starts, and deleted when the pod is removed. \n
-                            Use this if: a) the volume is only needed while the pod
-                            runs, b) features of normal volumes like restoring from
-                            snapshot or capacity    tracking are needed, c) the storage
-                            driver is specified through a storage class, and d) the
-                            storage driver supports dynamic volume provisioning through
-                            \   a PersistentVolumeClaim (see EphemeralVolumeSource
-                            for more    information on the connection between this
-                            volume type    and PersistentVolumeClaim). \n Use PersistentVolumeClaim
-                            or one of the vendor-specific APIs for volumes that persist
-                            for longer than the lifecycle of an individual pod. \n
-                            Use CSI for light-weight local ephemeral volumes if the
-                            CSI driver is meant to be used that way - see the documentation
-                            of the driver for more information. \n A pod can use both
-                            types of ephemeral volumes and persistent volumes at the
-                            same time."
+                          description: |-
+                            ephemeral represents a volume that is handled by a cluster storage driver.
+                            The volume's lifecycle is tied to the pod that defines it - it will be created before the pod starts,
+                            and deleted when the pod is removed.
+
+                            Use this if:
+                            a) the volume is only needed while the pod runs,
+                            b) features of normal volumes like restoring from snapshot or capacity
+                               tracking are needed,
+                            c) the storage driver is specified through a storage class, and
+                            d) the storage driver supports dynamic volume provisioning through
+                               a PersistentVolumeClaim (see EphemeralVolumeSource for more
+                               information on the connection between this volume type
+                               and PersistentVolumeClaim).
+
+                            Use PersistentVolumeClaim or one of the vendor-specific
+                            APIs for volumes that persist for longer than the lifecycle
+                            of an individual pod.
+
+                            Use CSI for light-weight local ephemeral volumes if the CSI driver is meant to
+                            be used that way - see the documentation of the driver for
+                            more information.
+
+                            A pod can use both types of ephemeral volumes and
+                            persistent volumes at the same time.
                           properties:
                             volumeClaimTemplate:
-                              description: "Will be used to create a stand-alone PVC
-                                to provision the volume. The pod in which this EphemeralVolumeSource
-                                is embedded will be the owner of the PVC, i.e. the
-                                PVC will be deleted together with the pod.  The name
-                                of the PVC will be `<pod name>-<volume name>` where
-                                `<volume name>` is the name from the `PodSpec.Volumes`
-                                array entry. Pod validation will reject the pod if
-                                the concatenated name is not valid for a PVC (for
-                                example, too long). \n An existing PVC with that name
-                                that is not owned by the pod will *not* be used for
-                                the pod to avoid using an unrelated volume by mistake.
-                                Starting the pod is then blocked until the unrelated
-                                PVC is removed. If such a pre-created PVC is meant
-                                to be used by the pod, the PVC has to updated with
-                                an owner reference to the pod once the pod exists.
-                                Normally this should not be necessary, but it may
-                                be useful when manually reconstructing a broken cluster.
-                                \n This field is read-only and no changes will be
-                                made by Kubernetes to the PVC after it has been created.
-                                \n Required, must not be nil."
+                              description: |-
+                                Will be used to create a stand-alone PVC to provision the volume.
+                                The pod in which this EphemeralVolumeSource is embedded will be the
+                                owner of the PVC, i.e. the PVC will be deleted together with the
+                                pod.  The name of the PVC will be `<pod name>-<volume name>` where
+                                `<volume name>` is the name from the `PodSpec.Volumes` array
+                                entry. Pod validation will reject the pod if the concatenated name
+                                is not valid for a PVC (for example, too long).
+
+                                An existing PVC with that name that is not owned by the pod
+                                will *not* be used for the pod to avoid using an unrelated
+                                volume by mistake. Starting the pod is then blocked until
+                                the unrelated PVC is removed. If such a pre-created PVC is
+                                meant to be used by the pod, the PVC has to updated with an
+                                owner reference to the pod once the pod exists. Normally
+                                this should not be necessary, but it may be useful when
+                                manually reconstructing a broken cluster.
+
+                                This field is read-only and no changes will be made by Kubernetes
+                                to the PVC after it has been created.
+
+                                Required, must not be nil.
                               properties:
                                 metadata:
-                                  description: May contain labels and annotations
-                                    that will be copied into the PVC when creating
-                                    it. No other fields are allowed and will be rejected
-                                    during validation.
+                                  description: |-
+                                    May contain labels and annotations that will be copied into the PVC
+                                    when creating it. No other fields are allowed and will be rejected during
+                                    validation.
                                   type: object
                                 spec:
-                                  description: The specification for the PersistentVolumeClaim.
-                                    The entire content is copied unchanged into the
-                                    PVC that gets created from this template. The
-                                    same fields as in a PersistentVolumeClaim are
-                                    also valid here.
+                                  description: |-
+                                    The specification for the PersistentVolumeClaim. The entire content is
+                                    copied unchanged into the PVC that gets created from this
+                                    template. The same fields as in a PersistentVolumeClaim
+                                    are also valid here.
                                   properties:
                                     accessModes:
-                                      description: 'accessModes contains the desired
-                                        access modes the volume should have. More
-                                        info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#access-modes-1'
+                                      description: |-
+                                        accessModes contains the desired access modes the volume should have.
+                                        More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#access-modes-1
                                       items:
                                         type: string
                                       type: array
+                                      x-kubernetes-list-type: atomic
                                     dataSource:
-                                      description: 'dataSource field can be used to
-                                        specify either: * An existing VolumeSnapshot
-                                        object (snapshot.storage.k8s.io/VolumeSnapshot)
+                                      description: |-
+                                        dataSource field can be used to specify either:
+                                        * An existing VolumeSnapshot object (snapshot.storage.k8s.io/VolumeSnapshot)
                                         * An existing PVC (PersistentVolumeClaim)
-                                        If the provisioner or an external controller
-                                        can support the specified data source, it
-                                        will create a new volume based on the contents
-                                        of the specified data source. If the AnyVolumeDataSource
-                                        feature gate is enabled, this field will always
-                                        have the same contents as the DataSourceRef
-                                        field.'
+                                        If the provisioner or an external controller can support the specified data source,
+                                        it will create a new volume based on the contents of the specified data source.
+                                        When the AnyVolumeDataSource feature gate is enabled, dataSource contents will be copied to dataSourceRef,
+                                        and dataSourceRef contents will be copied to dataSource when dataSourceRef.namespace is not specified.
+                                        If the namespace is specified, then dataSourceRef will not be copied to dataSource.
                                       properties:
                                         apiGroup:
-                                          description: APIGroup is the group for the
-                                            resource being referenced. If APIGroup
-                                            is not specified, the specified Kind must
-                                            be in the core API group. For any other
-                                            third-party types, APIGroup is required.
+                                          description: |-
+                                            APIGroup is the group for the resource being referenced.
+                                            If APIGroup is not specified, the specified Kind must be in the core API group.
+                                            For any other third-party types, APIGroup is required.
                                           type: string
                                         kind:
                                           description: Kind is the type of resource
@@ -9663,40 +12072,38 @@ spec:
                                       - kind
                                       - name
                                       type: object
+                                      x-kubernetes-map-type: atomic
                                     dataSourceRef:
-                                      description: 'dataSourceRef specifies the object
-                                        from which to populate the volume with data,
-                                        if a non-empty volume is desired. This may
-                                        be any local object from a non-empty API group
-                                        (non core object) or a PersistentVolumeClaim
-                                        object. When this field is specified, volume
-                                        binding will only succeed if the type of the
-                                        specified object matches some installed volume
-                                        populator or dynamic provisioner. This field
-                                        will replace the functionality of the DataSource
-                                        field and as such if both fields are non-empty,
-                                        they must have the same value. For backwards
-                                        compatibility, both fields (DataSource and
-                                        DataSourceRef) will be set to the same value
-                                        automatically if one of them is empty and
-                                        the other is non-empty. There are two important
-                                        differences between DataSource and DataSourceRef:
-                                        * While DataSource only allows two specific
-                                        types of objects, DataSourceRef   allows any
-                                        non-core object, as well as PersistentVolumeClaim
-                                        objects. * While DataSource ignores disallowed
-                                        values (dropping them), DataSourceRef   preserves
-                                        all values, and generates an error if a disallowed
-                                        value is   specified. (Beta) Using this field
-                                        requires the AnyVolumeDataSource feature gate
-                                        to be enabled.'
+                                      description: |-
+                                        dataSourceRef specifies the object from which to populate the volume with data, if a non-empty
+                                        volume is desired. This may be any object from a non-empty API group (non
+                                        core object) or a PersistentVolumeClaim object.
+                                        When this field is specified, volume binding will only succeed if the type of
+                                        the specified object matches some installed volume populator or dynamic
+                                        provisioner.
+                                        This field will replace the functionality of the dataSource field and as such
+                                        if both fields are non-empty, they must have the same value. For backwards
+                                        compatibility, when namespace isn't specified in dataSourceRef,
+                                        both fields (dataSource and dataSourceRef) will be set to the same
+                                        value automatically if one of them is empty and the other is non-empty.
+                                        When namespace is specified in dataSourceRef,
+                                        dataSource isn't set to the same value and must be empty.
+                                        There are three important differences between dataSource and dataSourceRef:
+                                        * While dataSource only allows two specific types of objects, dataSourceRef
+                                          allows any non-core object, as well as PersistentVolumeClaim objects.
+                                        * While dataSource ignores disallowed values (dropping them), dataSourceRef
+                                          preserves all values, and generates an error if a disallowed value is
+                                          specified.
+                                        * While dataSource only allows local objects, dataSourceRef allows objects
+                                          in any namespaces.
+                                        (Beta) Using this field requires the AnyVolumeDataSource feature gate to be enabled.
+                                        (Alpha) Using the namespace field of dataSourceRef requires the CrossNamespaceVolumeDataSource feature gate to be enabled.
                                       properties:
                                         apiGroup:
-                                          description: APIGroup is the group for the
-                                            resource being referenced. If APIGroup
-                                            is not specified, the specified Kind must
-                                            be in the core API group. For any other
-                                            third-party types, APIGroup is required.
+                                          description: |-
+                                            APIGroup is the group for the resource being referenced.
+                                            If APIGroup is not specified, the specified Kind must be in the core API group.
+                                            For any other third-party types, APIGroup is required.
                                           type: string
                                         kind:
                                           description: Kind is the type of resource
@@ -9706,18 +12113,23 @@ spec:
                                           description: Name is the name of resource
                                             being referenced
                                           type: string
+                                        namespace:
+                                          description: |-
+                                            Namespace is the namespace of resource being referenced
+                                            Note that when a namespace is specified, a gateway.networking.k8s.io/ReferenceGrant object is required in the referent namespace to allow that namespace's owner to accept the reference. See the ReferenceGrant documentation for details.
+                                            (Alpha) This field requires the CrossNamespaceVolumeDataSource feature gate to be enabled.
+                                          type: string
                                       required:
                                       - kind
                                       - name
                                       type: object
                                     resources:
-                                      description: 'resources represents the minimum
-                                        resources the volume should have. If RecoverVolumeExpansionFailure
-                                        feature is enabled users are allowed to specify
-                                        resource requirements that are lower than
-                                        previous value but must still be higher than
-                                        capacity recorded in the status field of the
-                                        claim. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources'
+                                      description: |-
+                                        resources represents the minimum resources the volume should have.
+                                        If RecoverVolumeExpansionFailure feature is enabled users are allowed to specify resource requirements
+                                        that are lower than previous value but must still be higher than capacity recorded in the
+                                        status field of the claim.
+                                        More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources
                                       properties:
                                         limits:
                                           additionalProperties:
@@ -9726,9 +12138,9 @@ spec:
                                             - type: string
                                             pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
                                             x-kubernetes-int-or-string: true
-                                          description: 'Limits describes the maximum
-                                            amount of compute resources allowed. More
-                                            info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
+                                          description: |-
+                                            Limits describes the maximum amount of compute resources allowed.
+                                            More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
                                           type: object
                                         requests:
                                           additionalProperties:
@@ -9737,12 +12149,11 @@ spec:
                                             - type: string
                                             pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
                                             x-kubernetes-int-or-string: true
-                                          description: 'Requests describes the minimum
-                                            amount of compute resources required.
-                                            If Requests is omitted for a container,
-                                            it defaults to Limits if that is explicitly
-                                            specified, otherwise to an implementation-defined
-                                            value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
+                                          description: |-
+                                            Requests describes the minimum amount of compute resources required.
+                                            If Requests is omitted for a container, it defaults to Limits if that is explicitly specified,
+                                            otherwise to an implementation-defined value. Requests cannot exceed Limits.
+                                            More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
                                           type: object
                                       type: object
                                     selector:
@@ -9754,59 +12165,69 @@ spec:
                                             of label selector requirements. The requirements
                                             are ANDed.
                                           items:
-                                            description: A label selector requirement
-                                              is a selector that contains values,
-                                              a key, and an operator that relates
-                                              the key and values.
+                                            description: |-
+                                              A label selector requirement is a selector that contains values, a key, and an operator that
+                                              relates the key and values.
                                             properties:
                                               key:
                                                 description: key is the label key
                                                   that the selector applies to.
                                                 type: string
                                               operator:
-                                                description: operator represents a
-                                                  key's relationship to a set of values.
-                                                  Valid operators are In, NotIn, Exists
-                                                  and DoesNotExist.
+                                                description: |-
+                                                  operator represents a key's relationship to a set of values.
+                                                  Valid operators are In, NotIn, Exists and DoesNotExist.
                                                 type: string
                                               values:
-                                                description: values is an array of
-                                                  string values. If the operator is
-                                                  In or NotIn, the values array must
-                                                  be non-empty. If the operator is
-                                                  Exists or DoesNotExist, the values
-                                                  array must be empty. This array
-                                                  is replaced during a strategic merge
-                                                  patch.
+                                                description: |-
+                                                  values is an array of string values. If the operator is In or NotIn,
+                                                  the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                                  the values array must be empty. This array is replaced during a strategic
+                                                  merge patch.
                                                 items:
                                                   type: string
                                                 type: array
+                                                x-kubernetes-list-type: atomic
                                             required:
                                             - key
                                             - operator
                                             type: object
                                           type: array
+                                          x-kubernetes-list-type: atomic
                                         matchLabels:
                                           additionalProperties:
                                             type: string
-                                          description: matchLabels is a map of {key,value}
-                                            pairs. A single {key,value} in the matchLabels
-                                            map is equivalent to an element of matchExpressions,
-                                            whose key field is "key", the operator
-                                            is "In", and the values array contains
-                                            only "value". The requirements are ANDed.
+                                          description: |-
+                                            matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                            map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                            operator is "In", and the values array contains only "value". The requirements are ANDed.
                                           type: object
                                       type: object
+                                      x-kubernetes-map-type: atomic
                                     storageClassName:
-                                      description: 'storageClassName is the name of
-                                        the StorageClass required by the claim. More
-                                        info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#class-1'
+                                      description: |-
+                                        storageClassName is the name of the StorageClass required by the claim.
+                                        More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#class-1
+                                      type: string
+                                    volumeAttributesClassName:
+                                      description: |-
+                                        volumeAttributesClassName may be used to set the VolumeAttributesClass used by this claim.
+                                        If specified, the CSI driver will create or update the volume with the attributes defined
+                                        in the corresponding VolumeAttributesClass. This has a different purpose than storageClassName,
+                                        it can be changed after the claim is created. An empty string value means that no VolumeAttributesClass
+                                        will be applied to the claim but it's not allowed to reset this field to empty string once it is set.
+                                        If unspecified and the PersistentVolumeClaim is unbound, the default VolumeAttributesClass
+                                        will be set by the persistentvolume controller if it exists.
+                                        If the resource referred to by volumeAttributesClass does not exist, this PersistentVolumeClaim will be
+                                        set to a Pending state, as reflected by the modifyVolumeStatus field, until such as a resource
+                                        exists.
+                                        More info: https://kubernetes.io/docs/concepts/storage/volume-attributes-classes/
+                                        (Beta) Using this field requires the VolumeAttributesClass feature gate to be enabled (off by default).
                                       type: string
                                     volumeMode:
-                                      description: volumeMode defines what type of
-                                        volume is required by the claim. Value of
-                                        Filesystem is implied when not included in
-                                        claim spec.
+                                      description: |-
+                                        volumeMode defines what type of volume is required by the claim.
+                                        Value of Filesystem is implied when not included in claim spec.
                                       type: string
                                     volumeName:
                                       description: volumeName is the binding reference
@@ -9823,20 +12244,19 @@ spec:
                             to the pod.
                           properties:
                             fsType:
-                              description: 'fsType is the filesystem type to mount.
-                                Must be a filesystem type supported by the host operating
-                                system. Ex. "ext4", "xfs", "ntfs". Implicitly inferred
-                                to be "ext4" if unspecified. TODO: how do we prevent
-                                errors in the filesystem from compromising the machine'
+                              description: |-
+                                fsType is the filesystem type to mount.
+                                Must be a filesystem type supported by the host operating system.
+                                Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
                               type: string
                             lun:
                               description: 'lun is Optional: FC target lun number'
                               format: int32
                               type: integer
                             readOnly:
-                              description: 'readOnly is Optional: Defaults to false
-                                (read/write). ReadOnly here will force the ReadOnly
-                                setting in VolumeMounts.'
+                              description: |-
+                                readOnly is Optional: Defaults to false (read/write). ReadOnly here will force
+                                the ReadOnly setting in VolumeMounts.
                               type: boolean
                             targetWWNs:
                               description: 'targetWWNs is Optional: FC target worldwide
@@ -9844,27 +12264,31 @@ spec:
                               items:
                                 type: string
                               type: array
+                              x-kubernetes-list-type: atomic
                             wwids:
-                              description: 'wwids Optional: FC volume world wide identifiers
-                                (wwids) Either wwids or combination of targetWWNs
-                                and lun must be set, but not both simultaneously.'
+                              description: |-
+                                wwids Optional: FC volume world wide identifiers (wwids)
+                                Either wwids or combination of targetWWNs and lun must be set, but not both simultaneously.
                               items:
                                 type: string
                               type: array
+                              x-kubernetes-list-type: atomic
                           type: object
                         flexVolume:
-                          description: flexVolume represents a generic volume resource
-                            that is provisioned/attached using an exec based plugin.
+                          description: |-
+                            flexVolume represents a generic volume resource that is
+                            provisioned/attached using an exec based plugin.
+                            Deprecated: FlexVolume is deprecated. Consider using a CSIDriver instead.
                           properties:
                             driver:
                               description: driver is the name of the driver to use
                                 for this volume.
                               type: string
                             fsType:
-                              description: fsType is the filesystem type to mount.
-                                Must be a filesystem type supported by the host operating
-                                system. Ex. "ext4", "xfs", "ntfs". The default filesystem
-                                depends on FlexVolume script.
+                              description: |-
+                                fsType is the filesystem type to mount.
+                                Must be a filesystem type supported by the host operating system.
+                                Ex. "ext4", "xfs", "ntfs". The default filesystem depends on FlexVolume script.
                               type: string
                             options:
                               additionalProperties:
@@ -9873,36 +12297,41 @@ spec:
                                 extra command options if any.'
                               type: object
                             readOnly:
-                              description: 'readOnly is Optional: defaults to false
-                                (read/write). ReadOnly here will force the ReadOnly
-                                setting in VolumeMounts.'
+                              description: |-
+                                readOnly is Optional: defaults to false (read/write). ReadOnly here will force
+                                the ReadOnly setting in VolumeMounts.
                               type: boolean
                             secretRef:
-                              description: 'secretRef is Optional: secretRef is reference
-                                to the secret object containing sensitive information
-                                to pass to the plugin scripts. This may be empty if
-                                no secret object is specified. If the secret object
-                                contains more than one secret, all secrets are passed
-                                to the plugin scripts.'
+                              description: |-
+                                secretRef is Optional: secretRef is reference to the secret object containing
+                                sensitive information to pass to the plugin scripts. This may be
+                                empty if no secret object is specified. If the secret object
+                                contains more than one secret, all secrets are passed to the plugin
+                                scripts.
                               properties:
                                 name:
-                                  description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                                    TODO: Add other useful fields. apiVersion, kind,
-                                    uid?'
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
                                   type: string
                               type: object
+                              x-kubernetes-map-type: atomic
                           required:
                           - driver
                           type: object
                         flocker:
-                          description: flocker represents a Flocker volume attached
-                            to a kubelet's host machine. This depends on the Flocker
-                            control service being running
+                          description: |-
+                            flocker represents a Flocker volume attached to a kubelet's host machine. This depends on the Flocker control service being running.
+                            Deprecated: Flocker is deprecated and the in-tree flocker type is no longer supported.
                           properties:
                             datasetName:
-                              description: datasetName is Name of the dataset stored
-                                as metadata -> name on the dataset for Flocker should
-                                be considered as deprecated
+                              description: |-
+                                datasetName is Name of the dataset stored as metadata -> name on the dataset for Flocker
+                                should be considered as deprecated
                               type: string
                             datasetUUID:
                               description: datasetUUID is the UUID of the dataset.
@@ -9910,54 +12339,56 @@ spec:
                               type: string
                           type: object
                         gcePersistentDisk:
-                          description: 'gcePersistentDisk represents a GCE Disk resource
-                            that is attached to a kubelet''s host machine and then
-                            exposed to the pod. More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk'
+                          description: |-
+                            gcePersistentDisk represents a GCE Disk resource that is attached to a
+                            kubelet's host machine and then exposed to the pod.
+                            Deprecated: GCEPersistentDisk is deprecated. All operations for the in-tree
+                            gcePersistentDisk type are redirected to the pd.csi.storage.gke.io CSI driver.
+                            More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
                           properties:
                             fsType:
-                              description: 'fsType is filesystem type of the volume
-                                that you want to mount. Tip: Ensure that the filesystem
-                                type is supported by the host operating system. Examples:
-                                "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4"
-                                if unspecified. More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
-                                TODO: how do we prevent errors in the filesystem from
-                                compromising the machine'
+                              description: |-
+                                fsType is filesystem type of the volume that you want to mount.
+                                Tip: Ensure that the filesystem type is supported by the host operating system.
+                                Examples: "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
+                                More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
                               type: string
                             partition:
-                              description: 'partition is the partition in the volume
-                                that you want to mount. If omitted, the default is
-                                to mount by volume name. Examples: For volume /dev/sda1,
-                                you specify the partition as "1". Similarly, the volume
-                                partition for /dev/sda is "0" (or you can leave the
-                                property empty). More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk'
+                              description: |-
+                                partition is the partition in the volume that you want to mount.
+                                If omitted, the default is to mount by volume name.
+                                Examples: For volume /dev/sda1, you specify the partition as "1".
+                                Similarly, the volume partition for /dev/sda is "0" (or you can leave the property empty).
+                                More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
                               format: int32
                               type: integer
                             pdName:
-                              description: 'pdName is unique name of the PD resource
-                                in GCE. Used to identify the disk in GCE. More info:
-                                https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk'
+                              description: |-
+                                pdName is unique name of the PD resource in GCE. Used to identify the disk in GCE.
+                                More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
                               type: string
                             readOnly:
-                              description: 'readOnly here will force the ReadOnly
-                                setting in VolumeMounts. Defaults to false. More info:
-                                https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk'
+                              description: |-
+                                readOnly here will force the ReadOnly setting in VolumeMounts.
+                                Defaults to false.
+                                More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
                               type: boolean
                           required:
                           - pdName
                           type: object
                         gitRepo:
-                          description: 'gitRepo represents a git repository at a particular
-                            revision. DEPRECATED: GitRepo is deprecated. To provision
-                            a container with a git repo, mount an EmptyDir into an
-                            InitContainer that clones the repo using git, then mount
-                            the EmptyDir into the Pod''s container.'
+                          description: |-
+                            gitRepo represents a git repository at a particular revision.
+                            Deprecated: GitRepo is deprecated. To provision a container with a git repo, mount an
+                            EmptyDir into an InitContainer that clones the repo using git, then mount the EmptyDir
+                            into the Pod's container.
                           properties:
                             directory:
-                              description: directory is the target directory name.
-                                Must not contain or start with '..'.  If '.' is supplied,
-                                the volume directory will be the git repository.  Otherwise,
-                                if specified, the volume will contain the git repository
-                                in the subdirectory with the given name.
+                              description: |-
+                                directory is the target directory name.
+                                Must not contain or start with '..'.  If '.' is supplied, the volume directory will be the
+                                git repository.  Otherwise, if specified, the volume will contain the git repository in
+                                the subdirectory with the given name.
                               type: string
                             repository:
                               description: repository is the URL
@@ -9970,53 +12401,94 @@ spec:
                           - repository
                           type: object
                         glusterfs:
-                          description: 'glusterfs represents a Glusterfs mount on
-                            the host that shares a pod''s lifetime. More info: https://examples.k8s.io/volumes/glusterfs/README.md'
+                          description: |-
+                            glusterfs represents a Glusterfs mount on the host that shares a pod's lifetime.
+                            Deprecated: Glusterfs is deprecated and the in-tree glusterfs type is no longer supported.
+                            More info: https://examples.k8s.io/volumes/glusterfs/README.md
                           properties:
                             endpoints:
-                              description: 'endpoints is the endpoint name that details
-                                Glusterfs topology. More info: https://examples.k8s.io/volumes/glusterfs/README.md#create-a-pod'
+                              description: |-
+                                endpoints is the endpoint name that details Glusterfs topology.
+                                More info: https://examples.k8s.io/volumes/glusterfs/README.md#create-a-pod
                               type: string
                             path:
-                              description: 'path is the Glusterfs volume path. More
-                                info: https://examples.k8s.io/volumes/glusterfs/README.md#create-a-pod'
+                              description: |-
+                                path is the Glusterfs volume path.
+                                More info: https://examples.k8s.io/volumes/glusterfs/README.md#create-a-pod
                               type: string
                             readOnly:
-                              description: 'readOnly here will force the Glusterfs
-                                volume to be mounted with read-only permissions. Defaults
-                                to false. More info: https://examples.k8s.io/volumes/glusterfs/README.md#create-a-pod'
+                              description: |-
+                                readOnly here will force the Glusterfs volume to be mounted with read-only permissions.
+                                Defaults to false.
+                                More info: https://examples.k8s.io/volumes/glusterfs/README.md#create-a-pod
                               type: boolean
                           required:
                           - endpoints
                           - path
                           type: object
                         hostPath:
-                          description: 'hostPath represents a pre-existing file or
-                            directory on the host machine that is directly exposed
-                            to the container. This is generally used for system agents
-                            or other privileged things that are allowed to see the
-                            host machine. Most containers will NOT need this. More
-                            info: https://kubernetes.io/docs/concepts/storage/volumes#hostpath
-                            --- TODO(jonesdl) We need to restrict who can use host
-                            directory mounts and who can/can not mount host directories
-                            as read/write.'
+                          description: |-
+                            hostPath represents a pre-existing file or directory on the host
+                            machine that is directly exposed to the container. This is generally
+                            used for system agents or other privileged things that are allowed
+                            to see the host machine. Most containers will NOT need this.
+                            More info: https://kubernetes.io/docs/concepts/storage/volumes#hostpath
                           properties:
                             path:
-                              description: 'path of the directory on the host. If
-                                the path is a symlink, it will follow the link to
-                                the real path. More info: https://kubernetes.io/docs/concepts/storage/volumes#hostpath'
+                              description: |-
+                                path of the directory on the host.
+                                If the path is a symlink, it will follow the link to the real path.
+                                More info: https://kubernetes.io/docs/concepts/storage/volumes#hostpath
                               type: string
                             type:
-                              description: 'type for HostPath Volume Defaults to ""
-                                More info: https://kubernetes.io/docs/concepts/storage/volumes#hostpath'
+                              description: |-
+                                type for HostPath Volume
+                                Defaults to ""
+                                More info: https://kubernetes.io/docs/concepts/storage/volumes#hostpath
                               type: string
                           required:
                           - path
                           type: object
+                        image:
+                          description: |-
+                            image represents an OCI object (a container image or artifact) pulled and mounted on the kubelet's host machine.
+                            The volume is resolved at pod startup depending on which PullPolicy value is provided:
+
+                            - Always: the kubelet always attempts to pull the reference. Container creation will fail If the pull fails.
+                            - Never: the kubelet never pulls the reference and only uses a local image or artifact. Container creation will fail if the reference isn't present.
+                            - IfNotPresent: the kubelet pulls if the reference isn't already present on disk. Container creation will fail if the reference isn't present and the pull fails.
+
+                            The volume gets re-resolved if the pod gets deleted and recreated, which means that new remote content will become available on pod recreation.
+                            A failure to resolve or pull the image during pod startup will block containers from starting and may add significant latency. Failures will be retried using normal volume backoff and will be reported on the pod reason and message.
+                            The types of objects that may be mounted by this volume are defined by the container runtime implementation on a host machine and at minimum must include all valid types supported by the container image field.
+                            The OCI object gets mounted in a single directory (spec.containers[*].volumeMounts.mountPath) by merging the manifest layers in the same way as for container images.
+                            The volume will be mounted read-only (ro) and non-executable files (noexec).
+                            Sub path mounts for containers are not supported (spec.containers[*].volumeMounts.subpath) before 1.33.
+                            The field spec.securityContext.fsGroupChangePolicy has no effect on this volume type.
+                          properties:
+                            pullPolicy:
+                              description: |-
+                                Policy for pulling OCI objects. Possible values are:
+                                Always: the kubelet always attempts to pull the reference. Container creation will fail If the pull fails.
+                                Never: the kubelet never pulls the reference and only uses a local image or artifact. Container creation will fail if the reference isn't present.
+                                IfNotPresent: the kubelet pulls if the reference isn't already present on disk. Container creation will fail if the reference isn't present and the pull fails.
+                                Defaults to Always if :latest tag is specified, or IfNotPresent otherwise.
+                              type: string
+                            reference:
+                              description: |-
+                                Required: Image or artifact reference to be used.
+                                Behaves in the same way as pod.spec.containers[*].image.
+                                Pull secrets will be assembled in the same way as for the container image by looking up node credentials, SA image pull secrets, and pod spec image pull secrets.
+                                More info: https://kubernetes.io/docs/concepts/containers/images
+                                This field is optional to allow higher level config management to default or override
+                                container images in workload controllers like Deployments and StatefulSets.
+                              type: string
+                          type: object
                         iscsi:
-                          description: 'iscsi represents an ISCSI Disk resource that
-                            is attached to a kubelet''s host machine and then exposed
-                            to the pod. More info: https://examples.k8s.io/volumes/iscsi/README.md'
+                          description: |-
+                            iscsi represents an ISCSI Disk resource that is attached to a
+                            kubelet's host machine and then exposed to the pod.
+                            More info: https://examples.k8s.io/volumes/iscsi/README.md
                           properties:
                             chapAuthDiscovery:
                               description: chapAuthDiscovery defines whether support
@@ -10027,58 +12499,63 @@ spec:
                                 iSCSI Session CHAP authentication
                               type: boolean
                             fsType:
-                              description: 'fsType is the filesystem type of the volume
-                                that you want to mount. Tip: Ensure that the filesystem
-                                type is supported by the host operating system. Examples:
-                                "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4"
-                                if unspecified. More info: https://kubernetes.io/docs/concepts/storage/volumes#iscsi
-                                TODO: how do we prevent errors in the filesystem from
-                                compromising the machine'
+                              description: |-
+                                fsType is the filesystem type of the volume that you want to mount.
+                                Tip: Ensure that the filesystem type is supported by the host operating system.
+                                Examples: "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
+                                More info: https://kubernetes.io/docs/concepts/storage/volumes#iscsi
                               type: string
                             initiatorName:
-                              description: initiatorName is the custom iSCSI Initiator
-                                Name. If initiatorName is specified with iscsiInterface
-                                simultaneously, new iSCSI interface <target portal>:<volume
-                                name> will be created for the connection.
+                              description: |-
+                                initiatorName is the custom iSCSI Initiator Name.
+                                If initiatorName is specified with iscsiInterface simultaneously, new iSCSI interface
+                                <target portal>:<volume name> will be created for the connection.
                               type: string
                             iqn:
                               description: iqn is the target iSCSI Qualified Name.
                               type: string
                             iscsiInterface:
-                              description: iscsiInterface is the interface Name that
-                                uses an iSCSI transport. Defaults to 'default' (tcp).
+                              default: default
+                              description: |-
+                                iscsiInterface is the interface Name that uses an iSCSI transport.
+                                Defaults to 'default' (tcp).
                               type: string
                             lun:
                               description: lun represents iSCSI Target Lun number.
                               format: int32
                               type: integer
                             portals:
-                              description: portals is the iSCSI Target Portal List.
-                                The portal is either an IP or ip_addr:port if the
-                                port is other than default (typically TCP ports 860
-                                and 3260).
+                              description: |-
+                                portals is the iSCSI Target Portal List. The portal is either an IP or ip_addr:port if the port
+                                is other than default (typically TCP ports 860 and 3260).
                               items:
                                 type: string
                               type: array
+                              x-kubernetes-list-type: atomic
                             readOnly:
-                              description: readOnly here will force the ReadOnly setting
-                                in VolumeMounts. Defaults to false.
+                              description: |-
+                                readOnly here will force the ReadOnly setting in VolumeMounts.
+                                Defaults to false.
                               type: boolean
                             secretRef:
                               description: secretRef is the CHAP Secret for iSCSI
                                 target and initiator authentication
                               properties:
                                 name:
-                                  description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                                    TODO: Add other useful fields. apiVersion, kind,
-                                    uid?'
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
                                   type: string
                               type: object
+                              x-kubernetes-map-type: atomic
                             targetPortal:
-                              description: targetPortal is iSCSI Target Portal. The
-                                Portal is either an IP or ip_addr:port if the port
-                                is other than default (typically TCP ports 860 and
-                                3260).
+                              description: |-
+                                targetPortal is iSCSI Target Portal. The Portal is either an IP or ip_addr:port if the port
+                                is other than default (typically TCP ports 860 and 3260).
                               type: string
                           required:
                           - iqn
@@ -10086,57 +12563,65 @@ spec:
                           - targetPortal
                           type: object
                         name:
-                          description: 'name of the volume. Must be a DNS_LABEL and
-                            unique within the pod. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+                          description: |-
+                            name of the volume.
+                            Must be a DNS_LABEL and unique within the pod.
+                            More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
                           type: string
                         nfs:
-                          description: 'nfs represents an NFS mount on the host that
-                            shares a pod''s lifetime More info: https://kubernetes.io/docs/concepts/storage/volumes#nfs'
+                          description: |-
+                            nfs represents an NFS mount on the host that shares a pod's lifetime
+                            More info: https://kubernetes.io/docs/concepts/storage/volumes#nfs
                           properties:
                             path:
-                              description: 'path that is exported by the NFS server.
-                                More info: https://kubernetes.io/docs/concepts/storage/volumes#nfs'
+                              description: |-
+                                path that is exported by the NFS server.
+                                More info: https://kubernetes.io/docs/concepts/storage/volumes#nfs
                               type: string
                             readOnly:
-                              description: 'readOnly here will force the NFS export
-                                to be mounted with read-only permissions. Defaults
-                                to false. More info: https://kubernetes.io/docs/concepts/storage/volumes#nfs'
+                              description: |-
+                                readOnly here will force the NFS export to be mounted with read-only permissions.
+                                Defaults to false.
+                                More info: https://kubernetes.io/docs/concepts/storage/volumes#nfs
                               type: boolean
                             server:
-                              description: 'server is the hostname or IP address of
-                                the NFS server. More info: https://kubernetes.io/docs/concepts/storage/volumes#nfs'
+                              description: |-
+                                server is the hostname or IP address of the NFS server.
+                                More info: https://kubernetes.io/docs/concepts/storage/volumes#nfs
                               type: string
                           required:
                           - path
                           - server
                           type: object
                         persistentVolumeClaim:
-                          description: 'persistentVolumeClaimVolumeSource represents
-                            a reference to a PersistentVolumeClaim in the same namespace.
-                            More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#persistentvolumeclaims'
+                          description: |-
+                            persistentVolumeClaimVolumeSource represents a reference to a
+                            PersistentVolumeClaim in the same namespace.
+                            More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#persistentvolumeclaims
                           properties:
                             claimName:
-                              description: 'claimName is the name of a PersistentVolumeClaim
-                                in the same namespace as the pod using this volume.
-                                More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#persistentvolumeclaims'
+                              description: |-
+                                claimName is the name of a PersistentVolumeClaim in the same namespace as the pod using this volume.
+                                More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#persistentvolumeclaims
                               type: string
                             readOnly:
-                              description: readOnly Will force the ReadOnly setting
-                                in VolumeMounts. Default false.
+                              description: |-
+                                readOnly Will force the ReadOnly setting in VolumeMounts.
+                                Default false.
                               type: boolean
                           required:
                           - claimName
                           type: object
                         photonPersistentDisk:
-                          description: photonPersistentDisk represents a PhotonController
-                            persistent disk attached and mounted on kubelets host
-                            machine
+                          description: |-
+                            photonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets host machine.
+                            Deprecated: PhotonPersistentDisk is deprecated and the in-tree photonPersistentDisk type is no longer supported.
                           properties:
                             fsType:
-                              description: fsType is the filesystem type to mount.
-                                Must be a filesystem type supported by the host operating
-                                system. Ex. "ext4", "xfs", "ntfs". Implicitly inferred
-                                to be "ext4" if unspecified.
+                              description: |-
+                                fsType is the filesystem type to mount.
+                                Must be a filesystem type supported by the host operating system.
+                                Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
                               type: string
                             pdID:
                               description: pdID is the ID that identifies Photon Controller
@@ -10146,18 +12631,22 @@ spec:
                           - pdID
                           type: object
                         portworxVolume:
-                          description: portworxVolume represents a portworx volume
-                            attached and mounted on kubelets host machine
+                          description: |-
+                            portworxVolume represents a portworx volume attached and mounted on kubelets host machine.
+                            Deprecated: PortworxVolume is deprecated. All operations for the in-tree portworxVolume type
+                            are redirected to the pxd.portworx.com CSI driver when the CSIMigrationPortworx feature-gate
+                            is on.
                           properties:
                             fsType:
-                              description: fSType represents the filesystem type to
-                                mount Must be a filesystem type supported by the host
-                                operating system. Ex. "ext4", "xfs". Implicitly inferred
-                                to be "ext4" if unspecified.
+                              description: |-
+                                fSType represents the filesystem type to mount
+                                Must be a filesystem type supported by the host operating system.
+                                Ex. "ext4", "xfs". Implicitly inferred to be "ext4" if unspecified.
                               type: string
                             readOnly:
-                              description: readOnly defaults to false (read/write).
-                                ReadOnly here will force the ReadOnly setting in VolumeMounts.
+                              description: |-
+                                readOnly defaults to false (read/write). ReadOnly here will force
+                                the ReadOnly setting in VolumeMounts.
                               type: boolean
                             volumeID:
                               description: volumeID uniquely identifies a Portworx
@@ -10171,40 +12660,130 @@ spec:
                             configmaps, and downward API
                           properties:
                             defaultMode:
-                              description: defaultMode are the mode bits used to set
-                                permissions on created files by default. Must be an
-                                octal value between 0000 and 0777 or a decimal value
-                                between 0 and 511. YAML accepts both octal and decimal
-                                values, JSON requires decimal values for mode bits.
-                                Directories within the path are not affected by this
-                                setting. This might be in conflict with other options
-                                that affect the file mode, like fsGroup, and the result
-                                can be other mode bits set.
+                              description: |-
+                                defaultMode are the mode bits used to set permissions on created files by default.
+                                Must be an octal value between 0000 and 0777 or a decimal value between 0 and 511.
+                                YAML accepts both octal and decimal values, JSON requires decimal values for mode bits.
+                                Directories within the path are not affected by this setting.
+                                This might be in conflict with other options that affect the file
+                                mode, like fsGroup, and the result can be other mode bits set.
                               format: int32
                               type: integer
                             sources:
-                              description: sources is the list of volume projections
+                              description: |-
+                                sources is the list of volume projections. Each entry in this list
+                                handles one source.
                               items:
-                                description: Projection that may be projected along
-                                  with other supported volume types
+                                description: |-
+                                  Projection that may be projected along with other supported volume types.
+                                  Exactly one of these fields must be set.
                                 properties:
+                                  clusterTrustBundle:
+                                    description: |-
+                                      ClusterTrustBundle allows a pod to access the `.spec.trustBundle` field
+                                      of ClusterTrustBundle objects in an auto-updating file.
+
+                                      Alpha, gated by the ClusterTrustBundleProjection feature gate.
+
+                                      ClusterTrustBundle objects can either be selected by name, or by the
+                                      combination of signer name and a label selector.
+
+                                      Kubelet performs aggressive normalization of the PEM contents written
+                                      into the pod filesystem.  Esoteric PEM features such as inter-block
+                                      comments and block headers are stripped.  Certificates are deduplicated.
+                                      The ordering of certificates within the file is arbitrary, and Kubelet
+                                      may change the order over time.
+                                    properties:
+                                      labelSelector:
+                                        description: |-
+                                          Select all ClusterTrustBundles that match this label selector.  Only has
+                                          effect if signerName is set.  Mutually-exclusive with name.  If unset,
+                                          interpreted as "match nothing".  If set but empty, interpreted as "match
+                                          everything".
+                                        properties:
+                                          matchExpressions:
+                                            description: matchExpressions is a list
+                                              of label selector requirements. The
+                                              requirements are ANDed.
+                                            items:
+                                              description: |-
+                                                A label selector requirement is a selector that contains values, a key, and an operator that
+                                                relates the key and values.
+                                              properties:
+                                                key:
+                                                  description: key is the label key
+                                                    that the selector applies to.
+                                                  type: string
+                                                operator:
+                                                  description: |-
+                                                    operator represents a key's relationship to a set of values.
+                                                    Valid operators are In, NotIn, Exists and DoesNotExist.
+                                                  type: string
+                                                values:
+                                                  description: |-
+                                                    values is an array of string values. If the operator is In or NotIn,
+                                                    the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                                    the values array must be empty. This array is replaced during a strategic
+                                                    merge patch.
+                                                  items:
+                                                    type: string
+                                                  type: array
+                                                  x-kubernetes-list-type: atomic
+                                              required:
+                                              - key
+                                              - operator
+                                              type: object
+                                            type: array
+                                            x-kubernetes-list-type: atomic
+                                          matchLabels:
+                                            additionalProperties:
+                                              type: string
+                                            description: |-
+                                              matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                              map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                              operator is "In", and the values array contains only "value". The requirements are ANDed.
+                                            type: object
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      name:
+                                        description: |-
+                                          Select a single ClusterTrustBundle by object name.  Mutually-exclusive
+                                          with signerName and labelSelector.
+                                        type: string
+                                      optional:
+                                        description: |-
+                                          If true, don't block pod startup if the referenced ClusterTrustBundle(s)
+                                          aren't available.  If using name, then the named ClusterTrustBundle is
+                                          allowed not to exist.  If using signerName, then the combination of
+                                          signerName and labelSelector is allowed to match zero
+                                          ClusterTrustBundles.
+                                        type: boolean
+                                      path:
+                                        description: Relative path from the volume
+                                          root to write the bundle.
+                                        type: string
+                                      signerName:
+                                        description: |-
+                                          Select all ClusterTrustBundles that match this signer name.
+                                          Mutually-exclusive with name.  The contents of all selected
+                                          ClusterTrustBundles will be unified and deduplicated.
+                                        type: string
+                                    required:
+                                    - path
+                                    type: object
                                   configMap:
                                     description: configMap information about the configMap
                                       data to project
                                     properties:
                                       items:
-                                        description: items if unspecified, each key-value
-                                          pair in the Data field of the referenced
-                                          ConfigMap will be projected into the volume
-                                          as a file whose name is the key and content
-                                          is the value. If specified, the listed keys
-                                          will be projected into the specified paths,
-                                          and unlisted keys will not be present. If
-                                          a key is specified which is not present
-                                          in the ConfigMap, the volume setup will
-                                          error unless it is marked optional. Paths
-                                          must be relative and may not contain the
-                                          '..' path or start with '..'.
+                                        description: |-
+                                          items if unspecified, each key-value pair in the Data field of the referenced
+                                          ConfigMap will be projected into the volume as a file whose name is the
+                                          key and content is the value. If specified, the listed keys will be
+                                          projected into the specified paths, and unlisted keys will not be
+                                          present. If a key is specified which is not present in the ConfigMap,
+                                          the volume setup will error unless it is marked optional. Paths must be
+                                          relative and may not contain the '..' path or start with '..'.
                                         items:
                                           description: Maps a string key to a path
                                             within a volume.
@@ -10213,43 +12792,43 @@ spec:
                                               description: key is the key to project.
                                               type: string
                                             mode:
-                                              description: 'mode is Optional: mode
-                                                bits used to set permissions on this
-                                                file. Must be an octal value between
-                                                0000 and 0777 or a decimal value between
-                                                0 and 511. YAML accepts both octal
-                                                and decimal values, JSON requires
-                                                decimal values for mode bits. If not
-                                                specified, the volume defaultMode
-                                                will be used. This might be in conflict
-                                                with other options that affect the
-                                                file mode, like fsGroup, and the result
-                                                can be other mode bits set.'
+                                              description: |-
+                                                mode is Optional: mode bits used to set permissions on this file.
+                                                Must be an octal value between 0000 and 0777 or a decimal value between 0 and 511.
+                                                YAML accepts both octal and decimal values, JSON requires decimal values for mode bits.
+                                                If not specified, the volume defaultMode will be used.
+                                                This might be in conflict with other options that affect the file
+                                                mode, like fsGroup, and the result can be other mode bits set.
                                               format: int32
                                               type: integer
                                             path:
-                                              description: path is the relative path
-                                                of the file to map the key to. May
-                                                not be an absolute path. May not contain
-                                                the path element '..'. May not start
-                                                with the string '..'.
+                                              description: |-
+                                                path is the relative path of the file to map the key to.
+                                                May not be an absolute path.
+                                                May not contain the path element '..'.
+                                                May not start with the string '..'.
                                               type: string
                                           required:
                                           - key
                                           - path
                                           type: object
                                         type: array
+                                        x-kubernetes-list-type: atomic
                                       name:
-                                        description: 'Name of the referent. More info:
-                                          https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                                          TODO: Add other useful fields. apiVersion,
-                                          kind, uid?'
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
                                         type: string
                                       optional:
                                         description: optional specify whether the
                                           ConfigMap or its keys must be defined
                                         type: boolean
                                     type: object
+                                    x-kubernetes-map-type: atomic
                                   downwardAPI:
                                     description: downwardAPI information about the
                                       downwardAPI data to project
@@ -10265,7 +12844,7 @@ spec:
                                             fieldRef:
                                               description: 'Required: Selects a field
                                                 of the pod: only annotations, labels,
-                                                name and namespace are supported.'
+                                                name, namespace and uid are supported.'
                                               properties:
                                                 apiVersion:
                                                   description: Version of the schema
@@ -10279,19 +12858,15 @@ spec:
                                               required:
                                               - fieldPath
                                               type: object
+                                              x-kubernetes-map-type: atomic
                                             mode:
-                                              description: 'Optional: mode bits used
-                                                to set permissions on this file, must
-                                                be an octal value between 0000 and
-                                                0777 or a decimal value between 0
-                                                and 511. YAML accepts both octal and
-                                                decimal values, JSON requires decimal
-                                                values for mode bits. If not specified,
-                                                the volume defaultMode will be used.
-                                                This might be in conflict with other
-                                                options that affect the file mode,
-                                                like fsGroup, and the result can be
-                                                other mode bits set.'
+                                              description: |-
+                                                Optional: mode bits used to set permissions on this file, must be an octal value
+                                                between 0000 and 0777 or a decimal value between 0 and 511.
+                                                YAML accepts both octal and decimal values, JSON requires decimal values for mode bits.
+                                                If not specified, the volume defaultMode will be used.
+                                                This might be in conflict with other options that affect the file
+                                                mode, like fsGroup, and the result can be other mode bits set.
                                               format: int32
                                               type: integer
                                             path:
@@ -10303,11 +12878,9 @@ spec:
                                                 path must not start with ''..'''
                                               type: string
                                             resourceFieldRef:
-                                              description: 'Selects a resource of
-                                                the container: only resources limits
-                                                and requests (limits.cpu, limits.memory,
-                                                requests.cpu and requests.memory)
-                                                are currently supported.'
+                                              description: |-
+                                                Selects a resource of the container: only resources limits and requests
+                                                (limits.cpu, limits.memory, requests.cpu and requests.memory) are currently supported.
                                               properties:
                                                 containerName:
                                                   description: 'Container name: required
@@ -10330,28 +12903,26 @@ spec:
                                               required:
                                               - resource
                                               type: object
+                                              x-kubernetes-map-type: atomic
                                           required:
                                           - path
                                           type: object
                                         type: array
+                                        x-kubernetes-list-type: atomic
                                     type: object
                                   secret:
                                     description: secret information about the secret
                                       data to project
                                     properties:
                                       items:
-                                        description: items if unspecified, each key-value
-                                          pair in the Data field of the referenced
-                                          Secret will be projected into the volume
-                                          as a file whose name is the key and content
-                                          is the value. If specified, the listed keys
-                                          will be projected into the specified paths,
-                                          and unlisted keys will not be present. If
-                                          a key is specified which is not present
-                                          in the Secret, the volume setup will error
-                                          unless it is marked optional. Paths must
-                                          be relative and may not contain the '..'
-                                          path or start with '..'.
+                                        description: |-
+                                          items if unspecified, each key-value pair in the Data field of the referenced
+                                          Secret will be projected into the volume as a file whose name is the
+                                          key and content is the value. If specified, the listed keys will be
+                                          projected into the specified paths, and unlisted keys will not be
+                                          present. If a key is specified which is not present in the Secret,
+                                          the volume setup will error unless it is marked optional. Paths must be
+                                          relative and may not contain the '..' path or start with '..'.
                                         items:
                                           description: Maps a string key to a path
                                             within a volume.
@@ -10360,71 +12931,67 @@ spec:
                                               description: key is the key to project.
                                               type: string
                                             mode:
-                                              description: 'mode is Optional: mode
-                                                bits used to set permissions on this
-                                                file. Must be an octal value between
-                                                0000 and 0777 or a decimal value between
-                                                0 and 511. YAML accepts both octal
-                                                and decimal values, JSON requires
-                                                decimal values for mode bits. If not
-                                                specified, the volume defaultMode
-                                                will be used. This might be in conflict
-                                                with other options that affect the
-                                                file mode, like fsGroup, and the result
-                                                can be other mode bits set.'
+                                              description: |-
+                                                mode is Optional: mode bits used to set permissions on this file.
+                                                Must be an octal value between 0000 and 0777 or a decimal value between 0 and 511.
+                                                YAML accepts both octal and decimal values, JSON requires decimal values for mode bits.
+                                                If not specified, the volume defaultMode will be used.
+                                                This might be in conflict with other options that affect the file
+                                                mode, like fsGroup, and the result can be other mode bits set.
                                               format: int32
                                               type: integer
                                             path:
-                                              description: path is the relative path
-                                                of the file to map the key to. May
-                                                not be an absolute path. May not contain
-                                                the path element '..'. May not start
-                                                with the string '..'.
+                                              description: |-
+                                                path is the relative path of the file to map the key to.
+                                                May not be an absolute path.
+                                                May not contain the path element '..'.
+                                                May not start with the string '..'.
                                               type: string
                                           required:
                                           - key
                                           - path
                                           type: object
                                         type: array
+                                        x-kubernetes-list-type: atomic
                                       name:
-                                        description: 'Name of the referent. More info:
-                                          https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                                          TODO: Add other useful fields. apiVersion,
-                                          kind, uid?'
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
                                         type: string
                                       optional:
                                         description: optional field specify whether
                                           the Secret or its key must be defined
                                         type: boolean
                                     type: object
+                                    x-kubernetes-map-type: atomic
                                   serviceAccountToken:
                                     description: serviceAccountToken is information
                                       about the serviceAccountToken data to project
                                     properties:
                                       audience:
-                                        description: audience is the intended audience
-                                          of the token. A recipient of a token must
-                                          identify itself with an identifier specified
-                                          in the audience of the token, and otherwise
-                                          should reject the token. The audience defaults
-                                          to the identifier of the apiserver.
+                                        description: |-
+                                          audience is the intended audience of the token. A recipient of a token
+                                          must identify itself with an identifier specified in the audience of the
+                                          token, and otherwise should reject the token. The audience defaults to the
+                                          identifier of the apiserver.
                                         type: string
                                       expirationSeconds:
-                                        description: expirationSeconds is the requested
-                                          duration of validity of the service account
-                                          token. As the token approaches expiration,
-                                          the kubelet volume plugin will proactively
-                                          rotate the service account token. The kubelet
-                                          will start trying to rotate the token if
-                                          the token is older than 80 percent of its
-                                          time to live or if the token is older than
-                                          24 hours.Defaults to 1 hour and must be
-                                          at least 10 minutes.
+                                        description: |-
+                                          expirationSeconds is the requested duration of validity of the service
+                                          account token. As the token approaches expiration, the kubelet volume
+                                          plugin will proactively rotate the service account token. The kubelet will
+                                          start trying to rotate the token if the token is older than 80 percent of
+                                          its time to live or if the token is older than 24 hours.Defaults to 1 hour
+                                          and must be at least 10 minutes.
                                         format: int64
                                         type: integer
                                       path:
-                                        description: path is the path relative to
-                                          the mount point of the file to project the
+                                        description: |-
+                                          path is the path relative to the mount point of the file to project the
                                           token into.
                                         type: string
                                     required:
@@ -10432,34 +12999,38 @@ spec:
                                     type: object
                                 type: object
                               type: array
+                              x-kubernetes-list-type: atomic
                           type: object
                         quobyte:
-                          description: quobyte represents a Quobyte mount on the host
-                            that shares a pod's lifetime
+                          description: |-
+                            quobyte represents a Quobyte mount on the host that shares a pod's lifetime.
+                            Deprecated: Quobyte is deprecated and the in-tree quobyte type is no longer supported.
                           properties:
                             group:
-                              description: group to map volume access to Default is
-                                no group
+                              description: |-
+                                group to map volume access to
+                                Default is no group
                               type: string
                             readOnly:
-                              description: readOnly here will force the Quobyte volume
-                                to be mounted with read-only permissions. Defaults
-                                to false.
+                              description: |-
+                                readOnly here will force the Quobyte volume to be mounted with read-only permissions.
+                                Defaults to false.
                               type: boolean
                             registry:
-                              description: registry represents a single or multiple
-                                Quobyte Registry services specified as a string as
-                                host:port pair (multiple entries are separated with
-                                commas) which acts as the central registry for volumes
+                              description: |-
+                                registry represents a single or multiple Quobyte Registry services
+                                specified as a string as host:port pair (multiple entries are separated with commas)
+                                which acts as the central registry for volumes
                               type: string
                             tenant:
-                              description: tenant owning the given Quobyte volume
-                                in the Backend Used with dynamically provisioned Quobyte
-                                volumes, value is set by the plugin
+                              description: |-
+                                tenant owning the given Quobyte volume in the Backend
+                                Used with dynamically provisioned Quobyte volumes, value is set by the plugin
                               type: string
                             user:
-                              description: user to map volume access to Defaults to
-                                serivceaccount user
+                              description: |-
+                                user to map volume access to
+                                Defaults to serivceaccount user
                               type: string
                             volume:
                               description: volume is a string that references an already
@@ -10470,69 +13041,92 @@ spec:
                           - volume
                           type: object
                         rbd:
-                          description: 'rbd represents a Rados Block Device mount
-                            on the host that shares a pod''s lifetime. More info:
-                            https://examples.k8s.io/volumes/rbd/README.md'
+                          description: |-
+                            rbd represents a Rados Block Device mount on the host that shares a pod's lifetime.
+                            Deprecated: RBD is deprecated and the in-tree rbd type is no longer supported.
+                            More info: https://examples.k8s.io/volumes/rbd/README.md
                           properties:
                             fsType:
-                              description: 'fsType is the filesystem type of the volume
-                                that you want to mount. Tip: Ensure that the filesystem
-                                type is supported by the host operating system. Examples:
-                                "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4"
-                                if unspecified. More info: https://kubernetes.io/docs/concepts/storage/volumes#rbd
-                                TODO: how do we prevent errors in the filesystem from
-                                compromising the machine'
+                              description: |-
+                                fsType is the filesystem type of the volume that you want to mount.
+                                Tip: Ensure that the filesystem type is supported by the host operating system.
+                                Examples: "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
+                                More info: https://kubernetes.io/docs/concepts/storage/volumes#rbd
                               type: string
                             image:
-                              description: 'image is the rados image name. More info:
-                                https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it'
+                              description: |-
+                                image is the rados image name.
+                                More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it
                               type: string
                             keyring:
-                              description: 'keyring is the path to key ring for RBDUser.
-                                Default is /etc/ceph/keyring. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it'
+                              default: /etc/ceph/keyring
+                              description: |-
+                                keyring is the path to key ring for RBDUser.
+                                Default is /etc/ceph/keyring.
+                                More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it
                               type: string
                             monitors:
-                              description: 'monitors is a collection of Ceph monitors.
-                                More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it'
+                              description: |-
+                                monitors is a collection of Ceph monitors.
+                                More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it
                               items:
                                 type: string
                               type: array
+                              x-kubernetes-list-type: atomic
                             pool:
-                              description: 'pool is the rados pool name. Default is
-                                rbd. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it'
+                              default: rbd
+                              description: |-
+                                pool is the rados pool name.
+                                Default is rbd.
+                                More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it
                               type: string
                             readOnly:
-                              description: 'readOnly here will force the ReadOnly
-                                setting in VolumeMounts. Defaults to false. More info:
-                                https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it'
+                              description: |-
+                                readOnly here will force the ReadOnly setting in VolumeMounts.
+                                Defaults to false.
+                                More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it
                               type: boolean
                             secretRef:
-                              description: 'secretRef is name of the authentication
-                                secret for RBDUser. If provided overrides keyring.
-                                Default is nil. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it'
+                              description: |-
+                                secretRef is name of the authentication secret for RBDUser. If provided
+                                overrides keyring.
+                                Default is nil.
+                                More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it
                               properties:
                                 name:
-                                  description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                                    TODO: Add other useful fields. apiVersion, kind,
-                                    uid?'
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
                                   type: string
                               type: object
+                              x-kubernetes-map-type: atomic
                             user:
-                              description: 'user is the rados user name. Default is
-                                admin. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it'
+                              default: admin
+                              description: |-
+                                user is the rados user name.
+                                Default is admin.
+                                More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it
                               type: string
                           required:
                           - image
                           - monitors
                           type: object
                         scaleIO:
-                          description: scaleIO represents a ScaleIO persistent volume
-                            attached and mounted on Kubernetes nodes.
+                          description: |-
+                            scaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.
+                            Deprecated: ScaleIO is deprecated and the in-tree scaleIO type is no longer supported.
                           properties:
                             fsType:
-                              description: fsType is the filesystem type to mount.
-                                Must be a filesystem type supported by the host operating
-                                system. Ex. "ext4", "xfs", "ntfs". Default is "xfs".
+                              default: xfs
+                              description: |-
+                                fsType is the filesystem type to mount.
+                                Must be a filesystem type supported by the host operating system.
+                                Ex. "ext4", "xfs", "ntfs".
+                                Default is "xfs".
                               type: string
                             gateway:
                               description: gateway is the host address of the ScaleIO
@@ -10543,27 +13137,34 @@ spec:
                                 Protection Domain for the configured storage.
                               type: string
                             readOnly:
-                              description: readOnly Defaults to false (read/write).
-                                ReadOnly here will force the ReadOnly setting in VolumeMounts.
+                              description: |-
+                                readOnly Defaults to false (read/write). ReadOnly here will force
+                                the ReadOnly setting in VolumeMounts.
                               type: boolean
                             secretRef:
-                              description: secretRef references to the secret for
-                                ScaleIO user and other sensitive information. If this
-                                is not provided, Login operation will fail.
+                              description: |-
+                                secretRef references to the secret for ScaleIO user and other
+                                sensitive information. If this is not provided, Login operation will fail.
                               properties:
                                 name:
-                                  description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                                    TODO: Add other useful fields. apiVersion, kind,
-                                    uid?'
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
                                   type: string
                               type: object
+                              x-kubernetes-map-type: atomic
                             sslEnabled:
                               description: sslEnabled Flag enable/disable SSL communication
                                 with Gateway, default false
                               type: boolean
                             storageMode:
-                              description: storageMode indicates whether the storage
-                                for a volume should be ThickProvisioned or ThinProvisioned.
+                              default: ThinProvisioned
+                              description: |-
+                                storageMode indicates whether the storage for a volume should be ThickProvisioned or ThinProvisioned.
                                 Default is ThinProvisioned.
                               type: string
                             storagePool:
@@ -10575,9 +13176,9 @@ spec:
                                 as configured in ScaleIO.
                               type: string
                             volumeName:
-                              description: volumeName is the name of a volume already
-                                created in the ScaleIO system that is associated with
-                                this volume source.
+                              description: |-
+                                volumeName is the name of a volume already created in the ScaleIO system
+                                that is associated with this volume source.
                               type: string
                           required:
                           - gateway
@@ -10585,33 +13186,30 @@ spec:
                           - system
                           type: object
                         secret:
-                          description: 'secret represents a secret that should populate
-                            this volume. More info: https://kubernetes.io/docs/concepts/storage/volumes#secret'
+                          description: |-
+                            secret represents a secret that should populate this volume.
+                            More info: https://kubernetes.io/docs/concepts/storage/volumes#secret
                           properties:
                             defaultMode:
-                              description: 'defaultMode is Optional: mode bits used
-                                to set permissions on created files by default. Must
-                                be an octal value between 0000 and 0777 or a decimal
-                                value between 0 and 511. YAML accepts both octal and
-                                decimal values, JSON requires decimal values for mode
-                                bits. Defaults to 0644. Directories within the path
-                                are not affected by this setting. This might be in
-                                conflict with other options that affect the file mode,
-                                like fsGroup, and the result can be other mode bits
-                                set.'
+                              description: |-
+                                defaultMode is Optional: mode bits used to set permissions on created files by default.
+                                Must be an octal value between 0000 and 0777 or a decimal value between 0 and 511.
+                                YAML accepts both octal and decimal values, JSON requires decimal values
+                                for mode bits. Defaults to 0644.
+                                Directories within the path are not affected by this setting.
+                                This might be in conflict with other options that affect the file
+                                mode, like fsGroup, and the result can be other mode bits set.
                               format: int32
                               type: integer
                             items:
-                              description: items If unspecified, each key-value pair
-                                in the Data field of the referenced Secret will be
-                                projected into the volume as a file whose name is
-                                the key and content is the value. If specified, the
-                                listed keys will be projected into the specified paths,
-                                and unlisted keys will not be present. If a key is
-                                specified which is not present in the Secret, the
-                                volume setup will error unless it is marked optional.
-                                Paths must be relative and may not contain the '..'
-                                path or start with '..'.
+                              description: |-
+                                items If unspecified, each key-value pair in the Data field of the referenced
+                                Secret will be projected into the volume as a file whose name is the
+                                key and content is the value. If specified, the listed keys will be
+                                projected into the specified paths, and unlisted keys will not be
+                                present. If a key is specified which is not present in the Secret,
+                                the volume setup will error unless it is marked optional. Paths must be
+                                relative and may not contain the '..' path or start with '..'.
                               items:
                                 description: Maps a string key to a path within a
                                   volume.
@@ -10620,22 +13218,20 @@ spec:
                                     description: key is the key to project.
                                     type: string
                                   mode:
-                                    description: 'mode is Optional: mode bits used
-                                      to set permissions on this file. Must be an
-                                      octal value between 0000 and 0777 or a decimal
-                                      value between 0 and 511. YAML accepts both octal
-                                      and decimal values, JSON requires decimal values
-                                      for mode bits. If not specified, the volume
-                                      defaultMode will be used. This might be in conflict
-                                      with other options that affect the file mode,
-                                      like fsGroup, and the result can be other mode
-                                      bits set.'
+                                    description: |-
+                                      mode is Optional: mode bits used to set permissions on this file.
+                                      Must be an octal value between 0000 and 0777 or a decimal value between 0 and 511.
+                                      YAML accepts both octal and decimal values, JSON requires decimal values for mode bits.
+                                      If not specified, the volume defaultMode will be used.
+                                      This might be in conflict with other options that affect the file
+                                      mode, like fsGroup, and the result can be other mode bits set.
                                     format: int32
                                     type: integer
                                   path:
-                                    description: path is the relative path of the
-                                      file to map the key to. May not be an absolute
-                                      path. May not contain the path element '..'.
+                                    description: |-
+                                      path is the relative path of the file to map the key to.
+                                      May not be an absolute path.
+                                      May not contain the path element '..'.
                                       May not start with the string '..'.
                                     type: string
                                 required:
@@ -10643,66 +13239,75 @@ spec:
                                 - path
                                 type: object
                               type: array
+                              x-kubernetes-list-type: atomic
                             optional:
                               description: optional field specify whether the Secret
                                 or its keys must be defined
                               type: boolean
                             secretName:
-                              description: 'secretName is the name of the secret in
-                                the pod''s namespace to use. More info: https://kubernetes.io/docs/concepts/storage/volumes#secret'
+                              description: |-
+                                secretName is the name of the secret in the pod's namespace to use.
+                                More info: https://kubernetes.io/docs/concepts/storage/volumes#secret
                               type: string
                           type: object
                         storageos:
-                          description: storageOS represents a StorageOS volume attached
-                            and mounted on Kubernetes nodes.
+                          description: |-
+                            storageOS represents a StorageOS volume attached and mounted on Kubernetes nodes.
+                            Deprecated: StorageOS is deprecated and the in-tree storageos type is no longer supported.
                           properties:
                             fsType:
-                              description: fsType is the filesystem type to mount.
-                                Must be a filesystem type supported by the host operating
-                                system. Ex. "ext4", "xfs", "ntfs". Implicitly inferred
-                                to be "ext4" if unspecified.
+                              description: |-
+                                fsType is the filesystem type to mount.
+                                Must be a filesystem type supported by the host operating system.
+                                Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
                               type: string
                             readOnly:
-                              description: readOnly defaults to false (read/write).
-                                ReadOnly here will force the ReadOnly setting in VolumeMounts.
+                              description: |-
+                                readOnly defaults to false (read/write). ReadOnly here will force
+                                the ReadOnly setting in VolumeMounts.
                               type: boolean
                             secretRef:
-                              description: secretRef specifies the secret to use for
-                                obtaining the StorageOS API credentials.  If not specified,
-                                default values will be attempted.
+                              description: |-
+                                secretRef specifies the secret to use for obtaining the StorageOS API
+                                credentials.  If not specified, default values will be attempted.
                               properties:
                                 name:
-                                  description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                                    TODO: Add other useful fields. apiVersion, kind,
-                                    uid?'
+                                  default: ""
+                                  description: |-
+                                    Name of the referent.
+                                    This field is effectively required, but due to backwards compatibility is
+                                    allowed to be empty. Instances of this type with an empty value here are
+                                    almost certainly wrong.
+                                    More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
                                   type: string
                               type: object
+                              x-kubernetes-map-type: atomic
                             volumeName:
-                              description: volumeName is the human-readable name of
-                                the StorageOS volume.  Volume names are only unique
-                                within a namespace.
+                              description: |-
+                                volumeName is the human-readable name of the StorageOS volume.  Volume
+                                names are only unique within a namespace.
                               type: string
                             volumeNamespace:
-                              description: volumeNamespace specifies the scope of
-                                the volume within StorageOS.  If no namespace is specified
-                                then the Pod's namespace will be used.  This allows
-                                the Kubernetes name scoping to be mirrored within
-                                StorageOS for tighter integration. Set VolumeName
-                                to any name to override the default behaviour. Set
-                                to "default" if you are not using namespaces within
-                                StorageOS. Namespaces that do not pre-exist within
-                                StorageOS will be created.
+                              description: |-
+                                volumeNamespace specifies the scope of the volume within StorageOS.  If no
+                                namespace is specified then the Pod's namespace will be used.  This allows the
+                                Kubernetes name scoping to be mirrored within StorageOS for tighter integration.
+                                Set VolumeName to any name to override the default behaviour.
+                                Set to "default" if you are not using namespaces within StorageOS.
+                                Namespaces that do not pre-exist within StorageOS will be created.
                               type: string
                           type: object
                         vsphereVolume:
-                          description: vsphereVolume represents a vSphere volume attached
-                            and mounted on kubelets host machine
+                          description: |-
+                            vsphereVolume represents a vSphere volume attached and mounted on kubelets host machine.
+                            Deprecated: VsphereVolume is deprecated. All operations for the in-tree vsphereVolume type
+                            are redirected to the csi.vsphere.vmware.com CSI driver.
                           properties:
                             fsType:
-                              description: fsType is filesystem type to mount. Must
-                                be a filesystem type supported by the host operating
-                                system. Ex. "ext4", "xfs", "ntfs". Implicitly inferred
-                                to be "ext4" if unspecified.
+                              description: |-
+                                fsType is filesystem type to mount.
+                                Must be a filesystem type supported by the host operating system.
+                                Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
                               type: string
                             storagePolicyID:
                               description: storagePolicyID is the storage Policy Based
@@ -10733,14 +13338,21 @@ spec:
                     type: string
                   imagePullSecrets:
                     items:
-                      description: LocalObjectReference contains enough information
-                        to let you locate the referenced object inside the same namespace.
+                      description: |-
+                        LocalObjectReference contains enough information to let you locate the
+                        referenced object inside the same namespace.
                       properties:
                         name:
-                          description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                            TODO: Add other useful fields. apiVersion, kind, uid?'
+                          default: ""
+                          description: |-
+                            Name of the referent.
+                            This field is effectively required, but due to backwards compatibility is
+                            allowed to be empty. Instances of this type with an empty value here are
+                            almost certainly wrong.
+                            More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
                           type: string
                       type: object
+                      x-kubernetes-map-type: atomic
                     type: array
                   initContainers:
                     items:
@@ -10748,37 +13360,37 @@ spec:
                         run within a pod.
                       properties:
                         args:
-                          description: 'Arguments to the entrypoint. The container
-                            image''s CMD is used if this is not provided. Variable
-                            references $(VAR_NAME) are expanded using the container''s
-                            environment. If a variable cannot be resolved, the reference
-                            in the input string will be unchanged. Double $$ are reduced
-                            to a single $, which allows for escaping the $(VAR_NAME)
-                            syntax: i.e. "$$(VAR_NAME)" will produce the string literal
-                            "$(VAR_NAME)". Escaped references will never be expanded,
-                            regardless of whether the variable exists or not. Cannot
-                            be updated. More info: https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell'
+                          description: |-
+                            Arguments to the entrypoint.
+                            The container image's CMD is used if this is not provided.
+                            Variable references $(VAR_NAME) are expanded using the container's environment. If a variable
+                            cannot be resolved, the reference in the input string will be unchanged. Double $$ are reduced
+                            to a single $, which allows for escaping the $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)" will
+                            produce the string literal "$(VAR_NAME)". Escaped references will never be expanded, regardless
+                            of whether the variable exists or not. Cannot be updated.
+                            More info: https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell
                           items:
                             type: string
                           type: array
+                          x-kubernetes-list-type: atomic
                         command:
-                          description: 'Entrypoint array. Not executed within a shell.
-                            The container image''s ENTRYPOINT is used if this is not
-                            provided. Variable references $(VAR_NAME) are expanded
-                            using the container''s environment. If a variable cannot
-                            be resolved, the reference in the input string will be
-                            unchanged. Double $$ are reduced to a single $, which
-                            allows for escaping the $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)"
-                            will produce the string literal "$(VAR_NAME)". Escaped
-                            references will never be expanded, regardless of whether
-                            the variable exists or not. Cannot be updated. More info:
-                            https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell'
+                          description: |-
+                            Entrypoint array. Not executed within a shell.
+                            The container image's ENTRYPOINT is used if this is not provided.
+                            Variable references $(VAR_NAME) are expanded using the container's environment. If a variable
+                            cannot be resolved, the reference in the input string will be unchanged. Double $$ are reduced
+                            to a single $, which allows for escaping the $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)" will
+                            produce the string literal "$(VAR_NAME)". Escaped references will never be expanded, regardless
+                            of whether the variable exists or not. Cannot be updated.
+                            More info: https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell
                           items:
                             type: string
                           type: array
+                          x-kubernetes-list-type: atomic
                         env:
-                          description: List of environment variables to set in the
-                            container. Cannot be updated.
+                          description: |-
+                            List of environment variables to set in the container.
+                            Cannot be updated.
                           items:
                             description: EnvVar represents an environment variable
                               present in a Container.
@@ -10788,17 +13400,16 @@ spec:
                                   be a C_IDENTIFIER.
                                 type: string
                               value:
-                                description: 'Variable references $(VAR_NAME) are
-                                  expanded using the previously defined environment
-                                  variables in the container and any service environment
-                                  variables. If a variable cannot be resolved, the
-                                  reference in the input string will be unchanged.
-                                  Double $$ are reduced to a single $, which allows
-                                  for escaping the $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)"
-                                  will produce the string literal "$(VAR_NAME)". Escaped
-                                  references will never be expanded, regardless of
-                                  whether the variable exists or not. Defaults to
-                                  "".'
+                                description: |-
+                                  Variable references $(VAR_NAME) are expanded
+                                  using the previously defined environment variables in the container and
+                                  any service environment variables. If a variable cannot be resolved,
+                                  the reference in the input string will be unchanged. Double $$ are reduced
+                                  to a single $, which allows for escaping the $(VAR_NAME) syntax: i.e.
+                                  "$$(VAR_NAME)" will produce the string literal "$(VAR_NAME)".
+                                  Escaped references will never be expanded, regardless of whether the variable
+                                  exists or not.
+                                  Defaults to "".
                                 type: string
                               valueFrom:
                                 description: Source for the environment variable's
@@ -10811,10 +13422,13 @@ spec:
                                         description: The key to select.
                                         type: string
                                       name:
-                                        description: 'Name of the referent. More info:
-                                          https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                                          TODO: Add other useful fields. apiVersion,
-                                          kind, uid?'
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
                                         type: string
                                       optional:
                                         description: Specify whether the ConfigMap
@@ -10823,12 +13437,11 @@ spec:
                                     required:
                                     - key
                                     type: object
+                                    x-kubernetes-map-type: atomic
                                   fieldRef:
-                                    description: 'Selects a field of the pod: supports
-                                      metadata.name, metadata.namespace, `metadata.labels[''<KEY>'']`,
-                                      `metadata.annotations[''<KEY>'']`, spec.nodeName,
-                                      spec.serviceAccountName, status.hostIP, status.podIP,
-                                      status.podIPs.'
+                                    description: |-
+                                      Selects a field of the pod: supports metadata.name, metadata.namespace, `metadata.labels['<KEY>']`, `metadata.annotations['<KEY>']`,
+                                      spec.nodeName, spec.serviceAccountName, status.hostIP, status.podIP, status.podIPs.
                                     properties:
                                       apiVersion:
                                         description: Version of the schema the FieldPath
@@ -10841,12 +13454,11 @@ spec:
                                     required:
                                     - fieldPath
                                     type: object
+                                    x-kubernetes-map-type: atomic
                                   resourceFieldRef:
-                                    description: 'Selects a resource of the container:
-                                      only resources limits and requests (limits.cpu,
-                                      limits.memory, limits.ephemeral-storage, requests.cpu,
-                                      requests.memory and requests.ephemeral-storage)
-                                      are currently supported.'
+                                    description: |-
+                                      Selects a resource of the container: only resources limits and requests
+                                      (limits.cpu, limits.memory, limits.ephemeral-storage, requests.cpu, requests.memory and requests.ephemeral-storage) are currently supported.
                                     properties:
                                       containerName:
                                         description: 'Container name: required for
@@ -10866,6 +13478,7 @@ spec:
                                     required:
                                     - resource
                                     type: object
+                                    x-kubernetes-map-type: atomic
                                   secretKeyRef:
                                     description: Selects a key of a secret in the
                                       pod's namespace
@@ -10875,10 +13488,13 @@ spec:
                                           from.  Must be a valid secret key.
                                         type: string
                                       name:
-                                        description: 'Name of the referent. More info:
-                                          https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                                          TODO: Add other useful fields. apiVersion,
-                                          kind, uid?'
+                                        default: ""
+                                        description: |-
+                                          Name of the referent.
+                                          This field is effectively required, but due to backwards compatibility is
+                                          allowed to be empty. Instances of this type with an empty value here are
+                                          almost certainly wrong.
+                                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
                                         type: string
                                       optional:
                                         description: Specify whether the Secret or
@@ -10887,104 +13503,121 @@ spec:
                                     required:
                                     - key
                                     type: object
+                                    x-kubernetes-map-type: atomic
                                 type: object
                             required:
                             - name
                             type: object
                           type: array
+                          x-kubernetes-list-map-keys:
+                          - name
+                          x-kubernetes-list-type: map
                         envFrom:
-                          description: List of sources to populate environment variables
-                            in the container. The keys defined within a source must
-                            be a C_IDENTIFIER. All invalid keys will be reported as
-                            an event when the container is starting. When a key exists
-                            in multiple sources, the value associated with the last
-                            source will take precedence. Values defined by an Env
-                            with a duplicate key will take precedence. Cannot be updated.
+                          description: |-
+                            List of sources to populate environment variables in the container.
+                            The keys defined within a source must be a C_IDENTIFIER. All invalid keys
+                            will be reported as an event when the container is starting. When a key exists in multiple
+                            sources, the value associated with the last source will take precedence.
+                            Values defined by an Env with a duplicate key will take precedence.
+                            Cannot be updated.
                           items:
                             description: EnvFromSource represents the source of a
-                              set of ConfigMaps
+                              set of ConfigMaps or Secrets
                             properties:
                               configMapRef:
                                 description: The ConfigMap to select from
                                 properties:
                                   name:
-                                    description: 'Name of the referent. More info:
-                                      https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                                      TODO: Add other useful fields. apiVersion, kind,
-                                      uid?'
+                                    default: ""
+                                    description: |-
+                                      Name of the referent.
+                                      This field is effectively required, but due to backwards compatibility is
+                                      allowed to be empty. Instances of this type with an empty value here are
+                                      almost certainly wrong.
+                                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
                                     type: string
                                   optional:
                                     description: Specify whether the ConfigMap must
                                       be defined
                                     type: boolean
                                 type: object
+                                x-kubernetes-map-type: atomic
                               prefix:
-                                description: An optional identifier to prepend to
-                                  each key in the ConfigMap. Must be a C_IDENTIFIER.
+                                description: Optional text to prepend to the name
+                                  of each environment variable. Must be a C_IDENTIFIER.
                                 type: string
                               secretRef:
                                 description: The Secret to select from
                                 properties:
                                   name:
-                                    description: 'Name of the referent. More info:
-                                      https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                                      TODO: Add other useful fields. apiVersion, kind,
-                                      uid?'
+                                    default: ""
+                                    description: |-
+                                      Name of the referent.
+                                      This field is effectively required, but due to backwards compatibility is
+                                      allowed to be empty. Instances of this type with an empty value here are
+                                      almost certainly wrong.
+                                      More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
                                     type: string
                                   optional:
                                     description: Specify whether the Secret must be
                                       defined
                                     type: boolean
                                 type: object
+                                x-kubernetes-map-type: atomic
                             type: object
                           type: array
+                          x-kubernetes-list-type: atomic
                         image:
-                          description: 'Container image name. More info: https://kubernetes.io/docs/concepts/containers/images
-                            This field is optional to allow higher level config management
-                            to default or override container images in workload controllers
-                            like Deployments and StatefulSets.'
+                          description: |-
+                            Container image name.
+                            More info: https://kubernetes.io/docs/concepts/containers/images
+                            This field is optional to allow higher level config management to default or override
+                            container images in workload controllers like Deployments and StatefulSets.
                           type: string
                         imagePullPolicy:
-                          description: 'Image pull policy. One of Always, Never, IfNotPresent.
-                            Defaults to Always if :latest tag is specified, or IfNotPresent
-                            otherwise. Cannot be updated. More info: https://kubernetes.io/docs/concepts/containers/images#updating-images'
+                          description: |-
+                            Image pull policy.
+                            One of Always, Never, IfNotPresent.
+                            Defaults to Always if :latest tag is specified, or IfNotPresent otherwise.
+                            Cannot be updated.
+                            More info: https://kubernetes.io/docs/concepts/containers/images#updating-images
                           type: string
                         lifecycle:
-                          description: Actions that the management system should take
-                            in response to container lifecycle events. Cannot be updated.
+                          description: |-
+                            Actions that the management system should take in response to container lifecycle events.
+                            Cannot be updated.
                           properties:
                             postStart:
-                              description: 'PostStart is called immediately after
-                                a container is created. If the handler fails, the
-                                container is terminated and restarted according to
-                                its restart policy. Other management of the container
-                                blocks until the hook completes. More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks'
+                              description: |-
+                                PostStart is called immediately after a container is created. If the handler fails,
+                                the container is terminated and restarted according to its restart policy.
+                                Other management of the container blocks until the hook completes.
+                                More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
                               properties:
                                 exec:
-                                  description: Exec specifies the action to take.
+                                  description: Exec specifies a command to execute
+                                    in the container.
                                   properties:
                                     command:
-                                      description: Command is the command line to
-                                        execute inside the container, the working
-                                        directory for the command  is root ('/') in
-                                        the container's filesystem. The command is
-                                        simply exec'd, it is not run inside a shell,
-                                        so traditional shell instructions ('|', etc)
-                                        won't work. To use a shell, you need to explicitly
-                                        call out to that shell. Exit status of 0 is
-                                        treated as live/healthy and non-zero is unhealthy.
+                                      description: |-
+                                        Command is the command line to execute inside the container, the working directory for the
+                                        command  is root ('/') in the container's filesystem. The command is simply exec'd, it is
+                                        not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use
+                                        a shell, you need to explicitly call out to that shell.
+                                        Exit status of 0 is treated as live/healthy and non-zero is unhealthy.
                                       items:
                                         type: string
                                       type: array
+                                      x-kubernetes-list-type: atomic
                                   type: object
                                 httpGet:
-                                  description: HTTPGet specifies the http request
+                                  description: HTTPGet specifies an HTTP GET request
                                     to perform.
                                   properties:
                                     host:
-                                      description: Host name to connect to, defaults
-                                        to the pod IP. You probably want to set "Host"
-                                        in httpHeaders instead.
+                                      description: |-
+                                        Host name to connect to, defaults to the pod IP. You probably want to set
+                                        "Host" in httpHeaders instead.
                                       type: string
                                     httpHeaders:
                                       description: Custom headers to set in the request.
@@ -10994,7 +13627,9 @@ spec:
                                           header to be used in HTTP probes
                                         properties:
                                           name:
-                                            description: The header field name
+                                            description: |-
+                                              The header field name.
+                                              This will be canonicalized upon output, so case-variant names will be understood as the same header.
                                             type: string
                                           value:
                                             description: The header field value
@@ -11004,6 +13639,7 @@ spec:
                                         - value
                                         type: object
                                       type: array
+                                      x-kubernetes-list-type: atomic
                                     path:
                                       description: Path to access on the HTTP server.
                                       type: string
@@ -11011,23 +13647,36 @@ spec:
                                       anyOf:
                                       - type: integer
                                       - type: string
-                                      description: Name or number of the port to access
-                                        on the container. Number must be in the range
-                                        1 to 65535. Name must be an IANA_SVC_NAME.
+                                      description: |-
+                                        Name or number of the port to access on the container.
+                                        Number must be in the range 1 to 65535.
+                                        Name must be an IANA_SVC_NAME.
                                       x-kubernetes-int-or-string: true
                                     scheme:
-                                      description: Scheme to use for connecting to
-                                        the host. Defaults to HTTP.
+                                      description: |-
+                                        Scheme to use for connecting to the host.
+                                        Defaults to HTTP.
                                       type: string
                                   required:
                                   - port
                                   type: object
+                                sleep:
+                                  description: Sleep represents a duration that the
+                                    container should sleep.
+                                  properties:
+                                    seconds:
+                                      description: Seconds is the number of seconds
+                                        to sleep.
+                                      format: int64
+                                      type: integer
+                                  required:
+                                  - seconds
+                                  type: object
                                 tcpSocket:
-                                  description: Deprecated. TCPSocket is NOT supported
-                                    as a LifecycleHandler and kept for the backward
-                                    compatibility. There are no validation of this
-                                    field and lifecycle hooks will fail in runtime
-                                    when tcp handler is specified.
+                                  description: |-
+                                    Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
+                                    for backward compatibility. There is no validation of this field and
+                                    lifecycle hooks will fail at runtime when it is specified.
                                   properties:
                                     host:
                                       description: 'Optional: Host name to connect
@@ -11037,53 +13686,51 @@ spec:
                                       anyOf:
                                       - type: integer
                                       - type: string
-                                      description: Number or name of the port to access
-                                        on the container. Number must be in the range
-                                        1 to 65535. Name must be an IANA_SVC_NAME.
+                                      description: |-
+                                        Number or name of the port to access on the container.
+                                        Number must be in the range 1 to 65535.
+                                        Name must be an IANA_SVC_NAME.
                                       x-kubernetes-int-or-string: true
                                   required:
                                   - port
                                   type: object
                               type: object
                             preStop:
-                              description: 'PreStop is called immediately before a
-                                container is terminated due to an API request or management
-                                event such as liveness/startup probe failure, preemption,
-                                resource contention, etc. The handler is not called
-                                if the container crashes or exits. The Pod''s termination
-                                grace period countdown begins before the PreStop hook
-                                is executed. Regardless of the outcome of the handler,
-                                the container will eventually terminate within the
-                                Pod''s termination grace period (unless delayed by
-                                finalizers). Other management of the container blocks
-                                until the hook completes or until the termination
-                                grace period is reached. More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks'
+                              description: |-
+                                PreStop is called immediately before a container is terminated due to an
+                                API request or management event such as liveness/startup probe failure,
+                                preemption, resource contention, etc. The handler is not called if the
+                                container crashes or exits. The Pod's termination grace period countdown begins before the
+                                PreStop hook is executed. Regardless of the outcome of the handler, the
+                                container will eventually terminate within the Pod's termination grace
+                                period (unless delayed by finalizers). Other management of the container blocks until the hook completes
+                                or until the termination grace period is reached.
+                                More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
                               properties:
                                 exec:
-                                  description: Exec specifies the action to take.
+                                  description: Exec specifies a command to execute
+                                    in the container.
                                   properties:
                                     command:
-                                      description: Command is the command line to
-                                        execute inside the container, the working
-                                        directory for the command  is root ('/') in
-                                        the container's filesystem. The command is
-                                        simply exec'd, it is not run inside a shell,
-                                        so traditional shell instructions ('|', etc)
-                                        won't work. To use a shell, you need to explicitly
-                                        call out to that shell. Exit status of 0 is
-                                        treated as live/healthy and non-zero is unhealthy.
+                                      description: |-
+                                        Command is the command line to execute inside the container, the working directory for the
+                                        command  is root ('/') in the container's filesystem. The command is simply exec'd, it is
+                                        not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use
+                                        a shell, you need to explicitly call out to that shell.
+                                        Exit status of 0 is treated as live/healthy and non-zero is unhealthy.
                                       items:
                                         type: string
                                       type: array
+                                      x-kubernetes-list-type: atomic
                                   type: object
                                 httpGet:
-                                  description: HTTPGet specifies the http request
+                                  description: HTTPGet specifies an HTTP GET request
                                     to perform.
                                   properties:
                                     host:
-                                      description: Host name to connect to, defaults
-                                        to the pod IP. You probably want to set "Host"
-                                        in httpHeaders instead.
+                                      description: |-
+                                        Host name to connect to, defaults to the pod IP. You probably want to set
+                                        "Host" in httpHeaders instead.
                                       type: string
                                     httpHeaders:
                                       description: Custom headers to set in the request.
@@ -11093,7 +13740,9 @@ spec:
                                           header to be used in HTTP probes
                                         properties:
                                           name:
-                                            description: The header field name
+                                            description: |-
+                                              The header field name.
+                                              This will be canonicalized upon output, so case-variant names will be understood as the same header.
                                             type: string
                                           value:
                                             description: The header field value
@@ -11103,6 +13752,7 @@ spec:
                                         - value
                                         type: object
                                       type: array
+                                      x-kubernetes-list-type: atomic
                                     path:
                                       description: Path to access on the HTTP server.
                                       type: string
@@ -11110,23 +13760,36 @@ spec:
                                       anyOf:
                                       - type: integer
                                       - type: string
-                                      description: Name or number of the port to access
-                                        on the container. Number must be in the range
-                                        1 to 65535. Name must be an IANA_SVC_NAME.
+                                      description: |-
+                                        Name or number of the port to access on the container.
+                                        Number must be in the range 1 to 65535.
+                                        Name must be an IANA_SVC_NAME.
                                       x-kubernetes-int-or-string: true
                                     scheme:
-                                      description: Scheme to use for connecting to
-                                        the host. Defaults to HTTP.
+                                      description: |-
+                                        Scheme to use for connecting to the host.
+                                        Defaults to HTTP.
                                       type: string
                                   required:
                                   - port
                                   type: object
+                                sleep:
+                                  description: Sleep represents a duration that the
+                                    container should sleep.
+                                  properties:
+                                    seconds:
+                                      description: Seconds is the number of seconds
+                                        to sleep.
+                                      format: int64
+                                      type: integer
+                                  required:
+                                  - seconds
+                                  type: object
                                 tcpSocket:
-                                  description: Deprecated. TCPSocket is NOT supported
-                                    as a LifecycleHandler and kept for the backward
-                                    compatibility. There are no validation of this
-                                    field and lifecycle hooks will fail in runtime
-                                    when tcp handler is specified.
+                                  description: |-
+                                    Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept
+                                    for backward compatibility. There is no validation of this field and
+                                    lifecycle hooks will fail at runtime when it is specified.
                                   properties:
                                     host:
                                       description: 'Optional: Host name to connect
@@ -11136,47 +13799,53 @@ spec:
                                       anyOf:
                                       - type: integer
                                       - type: string
-                                      description: Number or name of the port to access
-                                        on the container. Number must be in the range
-                                        1 to 65535. Name must be an IANA_SVC_NAME.
+                                      description: |-
+                                        Number or name of the port to access on the container.
+                                        Number must be in the range 1 to 65535.
+                                        Name must be an IANA_SVC_NAME.
                                       x-kubernetes-int-or-string: true
                                   required:
                                   - port
                                   type: object
                               type: object
+                            stopSignal:
+                              description: |-
+                                StopSignal defines which signal will be sent to a container when it is being stopped.
+                                If not specified, the default is defined by the container runtime in use.
+                                StopSignal can only be set for Pods with a non-empty .spec.os.name
+                              type: string
                           type: object
                         livenessProbe:
-                          description: 'Periodic probe of container liveness. Container
-                            will be restarted if the probe fails. Cannot be updated.
-                            More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
+                          description: |-
+                            Periodic probe of container liveness.
+                            Container will be restarted if the probe fails.
+                            Cannot be updated.
+                            More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
                           properties:
                             exec:
-                              description: Exec specifies the action to take.
+                              description: Exec specifies a command to execute in
+                                the container.
                               properties:
                                 command:
-                                  description: Command is the command line to execute
-                                    inside the container, the working directory for
-                                    the command  is root ('/') in the container's
-                                    filesystem. The command is simply exec'd, it is
-                                    not run inside a shell, so traditional shell instructions
-                                    ('|', etc) won't work. To use a shell, you need
-                                    to explicitly call out to that shell. Exit status
-                                    of 0 is treated as live/healthy and non-zero is
-                                    unhealthy.
+                                  description: |-
+                                    Command is the command line to execute inside the container, the working directory for the
+                                    command  is root ('/') in the container's filesystem. The command is simply exec'd, it is
+                                    not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use
+                                    a shell, you need to explicitly call out to that shell.
+                                    Exit status of 0 is treated as live/healthy and non-zero is unhealthy.
                                   items:
                                     type: string
                                   type: array
+                                  x-kubernetes-list-type: atomic
                               type: object
                             failureThreshold:
-                              description: Minimum consecutive failures for the probe
-                                to be considered failed after having succeeded. Defaults
-                                to 3. Minimum value is 1.
+                              description: |-
+                                Minimum consecutive failures for the probe to be considered failed after having succeeded.
+                                Defaults to 3. Minimum value is 1.
                               format: int32
                               type: integer
                             grpc:
-                              description: GRPC specifies an action involving a GRPC
-                                port. This is a beta field and requires enabling GRPCContainerProbe
-                                feature gate.
+                              description: GRPC specifies a GRPC HealthCheckRequest.
                               properties:
                                 port:
                                   description: Port number of the gRPC service. Number
@@ -11184,21 +13853,24 @@ spec:
                                   format: int32
                                   type: integer
                                 service:
-                                  description: "Service is the name of the service
-                                    to place in the gRPC HealthCheckRequest (see https://github.com/grpc/grpc/blob/master/doc/health-checking.md).
-                                    \n If this is not specified, the default behavior
-                                    is defined by gRPC."
+                                  default: ""
+                                  description: |-
+                                    Service is the name of the service to place in the gRPC HealthCheckRequest
+                                    (see https://github.com/grpc/grpc/blob/master/doc/health-checking.md).
+
+                                    If this is not specified, the default behavior is defined by gRPC.
                                   type: string
                               required:
                               - port
                               type: object
                             httpGet:
-                              description: HTTPGet specifies the http request to perform.
+                              description: HTTPGet specifies an HTTP GET request to
+                                perform.
                               properties:
                                 host:
-                                  description: Host name to connect to, defaults to
-                                    the pod IP. You probably want to set "Host" in
-                                    httpHeaders instead.
+                                  description: |-
+                                    Host name to connect to, defaults to the pod IP. You probably want to set
+                                    "Host" in httpHeaders instead.
                                   type: string
                                 httpHeaders:
                                   description: Custom headers to set in the request.
@@ -11208,7 +13880,9 @@ spec:
                                       to be used in HTTP probes
                                     properties:
                                       name:
-                                        description: The header field name
+                                        description: |-
+                                          The header field name.
+                                          This will be canonicalized upon output, so case-variant names will be understood as the same header.
                                         type: string
                                       value:
                                         description: The header field value
@@ -11218,6 +13892,7 @@ spec:
                                     - value
                                     type: object
                                   type: array
+                                  x-kubernetes-list-type: atomic
                                 path:
                                   description: Path to access on the HTTP server.
                                   type: string
@@ -11225,38 +13900,40 @@ spec:
                                   anyOf:
                                   - type: integer
                                   - type: string
-                                  description: Name or number of the port to access
-                                    on the container. Number must be in the range
-                                    1 to 65535. Name must be an IANA_SVC_NAME.
+                                  description: |-
+                                    Name or number of the port to access on the container.
+                                    Number must be in the range 1 to 65535.
+                                    Name must be an IANA_SVC_NAME.
                                   x-kubernetes-int-or-string: true
                                 scheme:
-                                  description: Scheme to use for connecting to the
-                                    host. Defaults to HTTP.
+                                  description: |-
+                                    Scheme to use for connecting to the host.
+                                    Defaults to HTTP.
                                   type: string
                               required:
                               - port
                               type: object
                             initialDelaySeconds:
-                              description: 'Number of seconds after the container
-                                has started before liveness probes are initiated.
-                                More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
+                              description: |-
+                                Number of seconds after the container has started before liveness probes are initiated.
+                                More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
                               format: int32
                               type: integer
                             periodSeconds:
-                              description: How often (in seconds) to perform the probe.
+                              description: |-
+                                How often (in seconds) to perform the probe.
                                 Default to 10 seconds. Minimum value is 1.
                               format: int32
                               type: integer
                             successThreshold:
-                              description: Minimum consecutive successes for the probe
-                                to be considered successful after having failed. Defaults
-                                to 1. Must be 1 for liveness and startup. Minimum
-                                value is 1.
+                              description: |-
+                                Minimum consecutive successes for the probe to be considered successful after having failed.
+                                Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
                               format: int32
                               type: integer
                             tcpSocket:
-                              description: TCPSocket specifies an action involving
-                                a TCP port.
+                              description: TCPSocket specifies a connection to a TCP
+                                port.
                               properties:
                                 host:
                                   description: 'Optional: Host name to connect to,
@@ -11266,60 +13943,59 @@ spec:
                                   anyOf:
                                   - type: integer
                                   - type: string
-                                  description: Number or name of the port to access
-                                    on the container. Number must be in the range
-                                    1 to 65535. Name must be an IANA_SVC_NAME.
+                                  description: |-
+                                    Number or name of the port to access on the container.
+                                    Number must be in the range 1 to 65535.
+                                    Name must be an IANA_SVC_NAME.
                                   x-kubernetes-int-or-string: true
                               required:
                               - port
                               type: object
                             terminationGracePeriodSeconds:
-                              description: Optional duration in seconds the pod needs
-                                to terminate gracefully upon probe failure. The grace
-                                period is the duration in seconds after the processes
-                                running in the pod are sent a termination signal and
-                                the time when the processes are forcibly halted with
-                                a kill signal. Set this value longer than the expected
-                                cleanup time for your process. If this value is nil,
-                                the pod's terminationGracePeriodSeconds will be used.
-                                Otherwise, this value overrides the value provided
-                                by the pod spec. Value must be non-negative integer.
-                                The value zero indicates stop immediately via the
-                                kill signal (no opportunity to shut down). This is
-                                a beta field and requires enabling ProbeTerminationGracePeriod
-                                feature gate. Minimum value is 1. spec.terminationGracePeriodSeconds
-                                is used if unset.
+                              description: |-
+                                Optional duration in seconds the pod needs to terminate gracefully upon probe failure.
+                                The grace period is the duration in seconds after the processes running in the pod are sent
+                                a termination signal and the time when the processes are forcibly halted with a kill signal.
+                                Set this value longer than the expected cleanup time for your process.
+                                If this value is nil, the pod's terminationGracePeriodSeconds will be used. Otherwise, this
+                                value overrides the value provided by the pod spec.
+                                Value must be non-negative integer. The value zero indicates stop immediately via
+                                the kill signal (no opportunity to shut down).
+                                This is a beta field and requires enabling ProbeTerminationGracePeriod feature gate.
+                                Minimum value is 1. spec.terminationGracePeriodSeconds is used if unset.
                               format: int64
                               type: integer
                             timeoutSeconds:
-                              description: 'Number of seconds after which the probe
-                                times out. Defaults to 1 second. Minimum value is
-                                1. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
+                              description: |-
+                                Number of seconds after which the probe times out.
+                                Defaults to 1 second. Minimum value is 1.
+                                More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
                               format: int32
                               type: integer
                           type: object
                         name:
-                          description: Name of the container specified as a DNS_LABEL.
+                          description: |-
+                            Name of the container specified as a DNS_LABEL.
                             Each container in a pod must have a unique name (DNS_LABEL).
                             Cannot be updated.
                           type: string
                         ports:
-                          description: List of ports to expose from the container.
-                            Exposing a port here gives the system additional information
-                            about the network connections a container uses, but is
-                            primarily informational. Not specifying a port here DOES
-                            NOT prevent that port from being exposed. Any port which
-                            is listening on the default "0.0.0.0" address inside a
-                            container will be accessible from the network. Cannot
-                            be updated.
+                          description: |-
+                            List of ports to expose from the container. Not specifying a port here
+                            DOES NOT prevent that port from being exposed. Any port which is
+                            listening on the default "0.0.0.0" address inside a container will be
+                            accessible from the network.
+                            Modifying this array with strategic merge patch may corrupt the data.
+                            For more information See https://github.com/kubernetes/kubernetes/issues/108255.
+                            Cannot be updated.
                           items:
                             description: ContainerPort represents a network port in
                               a single container.
                             properties:
                               containerPort:
-                                description: Number of port to expose on the pod's
-                                  IP address. This must be a valid port number, 0
-                                  < x < 65536.
+                                description: |-
+                                  Number of port to expose on the pod's IP address.
+                                  This must be a valid port number, 0 < x < 65536.
                                 format: int32
                                 type: integer
                               hostIP:
@@ -11327,23 +14003,24 @@ spec:
                                   to.
                                 type: string
                               hostPort:
-                                description: Number of port to expose on the host.
-                                  If specified, this must be a valid port number,
-                                  0 < x < 65536. If HostNetwork is specified, this
-                                  must match ContainerPort. Most containers do not
-                                  need this.
+                                description: |-
+                                  Number of port to expose on the host.
+                                  If specified, this must be a valid port number, 0 < x < 65536.
+                                  If HostNetwork is specified, this must match ContainerPort.
+                                  Most containers do not need this.
                                 format: int32
                                 type: integer
                               name:
-                                description: If specified, this must be an IANA_SVC_NAME
-                                  and unique within the pod. Each named port in a
-                                  pod must have a unique name. Name for the port that
-                                  can be referred to by services.
+                                description: |-
+                                  If specified, this must be an IANA_SVC_NAME and unique within the pod. Each
+                                  named port in a pod must have a unique name. Name for the port that can be
+                                  referred to by services.
                                 type: string
                               protocol:
                                 default: TCP
-                                description: Protocol for port. Must be UDP, TCP,
-                                  or SCTP. Defaults to "TCP".
+                                description: |-
+                                  Protocol for port. Must be UDP, TCP, or SCTP.
+                                  Defaults to "TCP".
                                 type: string
                             required:
                             - containerPort
@@ -11354,37 +14031,36 @@ spec:
                           - protocol
                           x-kubernetes-list-type: map
                         readinessProbe:
-                          description: 'Periodic probe of container service readiness.
-                            Container will be removed from service endpoints if the
-                            probe fails. Cannot be updated. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
+                          description: |-
+                            Periodic probe of container service readiness.
+                            Container will be removed from service endpoints if the probe fails.
+                            Cannot be updated.
+                            More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
                           properties:
                             exec:
-                              description: Exec specifies the action to take.
+                              description: Exec specifies a command to execute in
+                                the container.
                               properties:
                                 command:
-                                  description: Command is the command line to execute
-                                    inside the container, the working directory for
-                                    the command  is root ('/') in the container's
-                                    filesystem. The command is simply exec'd, it is
-                                    not run inside a shell, so traditional shell instructions
-                                    ('|', etc) won't work. To use a shell, you need
-                                    to explicitly call out to that shell. Exit status
-                                    of 0 is treated as live/healthy and non-zero is
-                                    unhealthy.
+                                  description: |-
+                                    Command is the command line to execute inside the container, the working directory for the
+                                    command  is root ('/') in the container's filesystem. The command is simply exec'd, it is
+                                    not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use
+                                    a shell, you need to explicitly call out to that shell.
+                                    Exit status of 0 is treated as live/healthy and non-zero is unhealthy.
                                   items:
                                     type: string
                                   type: array
+                                  x-kubernetes-list-type: atomic
                               type: object
                             failureThreshold:
-                              description: Minimum consecutive failures for the probe
-                                to be considered failed after having succeeded. Defaults
-                                to 3. Minimum value is 1.
+                              description: |-
+                                Minimum consecutive failures for the probe to be considered failed after having succeeded.
+                                Defaults to 3. Minimum value is 1.
                               format: int32
                               type: integer
                             grpc:
-                              description: GRPC specifies an action involving a GRPC
-                                port. This is a beta field and requires enabling GRPCContainerProbe
-                                feature gate.
+                              description: GRPC specifies a GRPC HealthCheckRequest.
                               properties:
                                 port:
                                   description: Port number of the gRPC service. Number
@@ -11392,21 +14068,24 @@ spec:
                                   format: int32
                                   type: integer
                                 service:
-                                  description: "Service is the name of the service
-                                    to place in the gRPC HealthCheckRequest (see https://github.com/grpc/grpc/blob/master/doc/health-checking.md).
-                                    \n If this is not specified, the default behavior
-                                    is defined by gRPC."
+                                  default: ""
+                                  description: |-
+                                    Service is the name of the service to place in the gRPC HealthCheckRequest
+                                    (see https://github.com/grpc/grpc/blob/master/doc/health-checking.md).
+
+                                    If this is not specified, the default behavior is defined by gRPC.
                                   type: string
                               required:
                               - port
                               type: object
                             httpGet:
-                              description: HTTPGet specifies the http request to perform.
+                              description: HTTPGet specifies an HTTP GET request to
+                                perform.
                               properties:
                                 host:
-                                  description: Host name to connect to, defaults to
-                                    the pod IP. You probably want to set "Host" in
-                                    httpHeaders instead.
+                                  description: |-
+                                    Host name to connect to, defaults to the pod IP. You probably want to set
+                                    "Host" in httpHeaders instead.
                                   type: string
                                 httpHeaders:
                                   description: Custom headers to set in the request.
@@ -11416,7 +14095,9 @@ spec:
                                       to be used in HTTP probes
                                     properties:
                                       name:
-                                        description: The header field name
+                                        description: |-
+                                          The header field name.
+                                          This will be canonicalized upon output, so case-variant names will be understood as the same header.
                                         type: string
                                       value:
                                         description: The header field value
@@ -11426,6 +14107,7 @@ spec:
                                     - value
                                     type: object
                                   type: array
+                                  x-kubernetes-list-type: atomic
                                 path:
                                   description: Path to access on the HTTP server.
                                   type: string
@@ -11433,38 +14115,40 @@ spec:
                                   anyOf:
                                   - type: integer
                                   - type: string
-                                  description: Name or number of the port to access
-                                    on the container. Number must be in the range
-                                    1 to 65535. Name must be an IANA_SVC_NAME.
+                                  description: |-
+                                    Name or number of the port to access on the container.
+                                    Number must be in the range 1 to 65535.
+                                    Name must be an IANA_SVC_NAME.
                                   x-kubernetes-int-or-string: true
                                 scheme:
-                                  description: Scheme to use for connecting to the
-                                    host. Defaults to HTTP.
+                                  description: |-
+                                    Scheme to use for connecting to the host.
+                                    Defaults to HTTP.
                                   type: string
                               required:
                               - port
                               type: object
                             initialDelaySeconds:
-                              description: 'Number of seconds after the container
-                                has started before liveness probes are initiated.
-                                More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
+                              description: |-
+                                Number of seconds after the container has started before liveness probes are initiated.
+                                More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
                               format: int32
                               type: integer
                             periodSeconds:
-                              description: How often (in seconds) to perform the probe.
+                              description: |-
+                                How often (in seconds) to perform the probe.
                                 Default to 10 seconds. Minimum value is 1.
                               format: int32
                               type: integer
                             successThreshold:
-                              description: Minimum consecutive successes for the probe
-                                to be considered successful after having failed. Defaults
-                                to 1. Must be 1 for liveness and startup. Minimum
-                                value is 1.
+                              description: |-
+                                Minimum consecutive successes for the probe to be considered successful after having failed.
+                                Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
                               format: int32
                               type: integer
                             tcpSocket:
-                              description: TCPSocket specifies an action involving
-                                a TCP port.
+                              description: TCPSocket specifies a connection to a TCP
+                                port.
                               properties:
                                 host:
                                   description: 'Optional: Host name to connect to,
@@ -11474,42 +14158,96 @@ spec:
                                   anyOf:
                                   - type: integer
                                   - type: string
-                                  description: Number or name of the port to access
-                                    on the container. Number must be in the range
-                                    1 to 65535. Name must be an IANA_SVC_NAME.
+                                  description: |-
+                                    Number or name of the port to access on the container.
+                                    Number must be in the range 1 to 65535.
+                                    Name must be an IANA_SVC_NAME.
                                   x-kubernetes-int-or-string: true
                               required:
                               - port
                               type: object
                             terminationGracePeriodSeconds:
-                              description: Optional duration in seconds the pod needs
-                                to terminate gracefully upon probe failure. The grace
-                                period is the duration in seconds after the processes
-                                running in the pod are sent a termination signal and
-                                the time when the processes are forcibly halted with
-                                a kill signal. Set this value longer than the expected
-                                cleanup time for your process. If this value is nil,
-                                the pod's terminationGracePeriodSeconds will be used.
-                                Otherwise, this value overrides the value provided
-                                by the pod spec. Value must be non-negative integer.
-                                The value zero indicates stop immediately via the
-                                kill signal (no opportunity to shut down). This is
-                                a beta field and requires enabling ProbeTerminationGracePeriod
-                                feature gate. Minimum value is 1. spec.terminationGracePeriodSeconds
-                                is used if unset.
+                              description: |-
+                                Optional duration in seconds the pod needs to terminate gracefully upon probe failure.
+                                The grace period is the duration in seconds after the processes running in the pod are sent
+                                a termination signal and the time when the processes are forcibly halted with a kill signal.
+                                Set this value longer than the expected cleanup time for your process.
+                                If this value is nil, the pod's terminationGracePeriodSeconds will be used. Otherwise, this
+                                value overrides the value provided by the pod spec.
+                                Value must be non-negative integer. The value zero indicates stop immediately via
+                                the kill signal (no opportunity to shut down).
+                                This is a beta field and requires enabling ProbeTerminationGracePeriod feature gate.
+                                Minimum value is 1. spec.terminationGracePeriodSeconds is used if unset.
                               format: int64
                               type: integer
                             timeoutSeconds:
-                              description: 'Number of seconds after which the probe
-                                times out. Defaults to 1 second. Minimum value is
-                                1. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
+                              description: |-
+                                Number of seconds after which the probe times out.
+                                Defaults to 1 second. Minimum value is 1.
+                                More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
                               format: int32
                               type: integer
                           type: object
+                        resizePolicy:
+                          description: Resources resize policy for the container.
+                          items:
+                            description: ContainerResizePolicy represents resource
+                              resize policy for the container.
+                            properties:
+                              resourceName:
+                                description: |-
+                                  Name of the resource to which this resource resize policy applies.
+                                  Supported values: cpu, memory.
+                                type: string
+                              restartPolicy:
+                                description: |-
+                                  Restart policy to apply when specified resource is resized.
+                                  If not specified, it defaults to NotRequired.
+                                type: string
+                            required:
+                            - resourceName
+                            - restartPolicy
+                            type: object
+                          type: array
+                          x-kubernetes-list-type: atomic
                         resources:
-                          description: 'Compute Resources required by this container.
-                            Cannot be updated. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
+                          description: |-
+                            Compute Resources required by this container.
+                            Cannot be updated.
+                            More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
                           properties:
+                            claims:
+                              description: |-
+                                Claims lists the names of resources, defined in spec.resourceClaims,
+                                that are used by this container.
+
+                                This is an alpha field and requires enabling the
+                                DynamicResourceAllocation feature gate.
+
+                                This field is immutable. It can only be set for containers.
+                              items:
+                                description: ResourceClaim references one entry in
+                                  PodSpec.ResourceClaims.
+                                properties:
+                                  name:
+                                    description: |-
+                                      Name must match the name of one entry in pod.spec.resourceClaims of
+                                      the Pod where this field is used. It makes that resource available
+                                      inside a container.
+                                    type: string
+                                  request:
+                                    description: |-
+                                      Request is the name chosen for a request in the referenced claim.
+                                      If empty, everything from the claim is made available, otherwise
+                                      only the result of this request.
+                                    type: string
+                                required:
+                                - name
+                                type: object
+                              type: array
+                              x-kubernetes-list-map-keys:
+                              - name
+                              x-kubernetes-list-type: map
                             limits:
                               additionalProperties:
                                 anyOf:
@@ -11517,8 +14255,9 @@ spec:
                                 - type: string
                                 pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
                                 x-kubernetes-int-or-string: true
-                              description: 'Limits describes the maximum amount of
-                                compute resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
+                              description: |-
+                                Limits describes the maximum amount of compute resources allowed.
+                                More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
                               type: object
                             requests:
                               additionalProperties:
@@ -11527,33 +14266,76 @@ spec:
                                 - type: string
                                 pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
                                 x-kubernetes-int-or-string: true
-                              description: 'Requests describes the minimum amount
-                                of compute resources required. If Requests is omitted
-                                for a container, it defaults to Limits if that is
-                                explicitly specified, otherwise to an implementation-defined
-                                value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
+                              description: |-
+                                Requests describes the minimum amount of compute resources required.
+                                If Requests is omitted for a container, it defaults to Limits if that is explicitly specified,
+                                otherwise to an implementation-defined value. Requests cannot exceed Limits.
+                                More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
                               type: object
                           type: object
+                        restartPolicy:
+                          description: |-
+                            RestartPolicy defines the restart behavior of individual containers in a pod.
+                            This field may only be set for init containers, and the only allowed value is "Always".
+                            For non-init containers or when this field is not specified,
+                            the restart behavior is defined by the Pod's restart policy and the container type.
+                            Setting the RestartPolicy as "Always" for the init container will have the following effect:
+                            this init container will be continually restarted on
+                            exit until all regular containers have terminated. Once all regular
+                            containers have completed, all init containers with restartPolicy "Always"
+                            will be shut down. This lifecycle differs from normal init containers and
+                            is often referred to as a "sidecar" container. Although this init
+                            container still starts in the init container sequence, it does not wait
+                            for the container to complete before proceeding to the next init
+                            container. Instead, the next init container starts immediately after this
+                            init container is started, or after any startupProbe has successfully
+                            completed.
+                          type: string
                         securityContext:
-                          description: 'SecurityContext defines the security options
-                            the container should be run with. If set, the fields of
-                            SecurityContext override the equivalent fields of PodSecurityContext.
-                            More info: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/'
+                          description: |-
+                            SecurityContext defines the security options the container should be run with.
+                            If set, the fields of SecurityContext override the equivalent fields of PodSecurityContext.
+                            More info: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/
                           properties:
                             allowPrivilegeEscalation:
-                              description: 'AllowPrivilegeEscalation controls whether
-                                a process can gain more privileges than its parent
-                                process. This bool directly controls if the no_new_privs
-                                flag will be set on the container process. AllowPrivilegeEscalation
-                                is true always when the container is: 1) run as Privileged
-                                2) has CAP_SYS_ADMIN Note that this field cannot be
-                                set when spec.os.name is windows.'
+                              description: |-
+                                AllowPrivilegeEscalation controls whether a process can gain more
+                                privileges than its parent process. This bool directly controls if
+                                the no_new_privs flag will be set on the container process.
+                                AllowPrivilegeEscalation is true always when the container is:
+                                1) run as Privileged
+                                2) has CAP_SYS_ADMIN
+                                Note that this field cannot be set when spec.os.name is windows.
                               type: boolean
+                            appArmorProfile:
+                              description: |-
+                                appArmorProfile is the AppArmor options to use by this container. If set, this profile
+                                overrides the pod's appArmorProfile.
+                                Note that this field cannot be set when spec.os.name is windows.
+                              properties:
+                                localhostProfile:
+                                  description: |-
+                                    localhostProfile indicates a profile loaded on the node that should be used.
+                                    The profile must be preconfigured on the node to work.
+                                    Must match the loaded name of the profile.
+                                    Must be set if and only if type is "Localhost".
+                                  type: string
+                                type:
+                                  description: |-
+                                    type indicates which kind of AppArmor profile will be applied.
+                                    Valid options are:
+                                      Localhost - a profile pre-loaded on the node.
+                                      RuntimeDefault - the container runtime's default profile.
+                                      Unconfined - no AppArmor enforcement.
+                                  type: string
+                              required:
+                              - type
+                              type: object
                             capabilities:
-                              description: The capabilities to add/drop when running
-                                containers. Defaults to the default set of capabilities
-                                granted by the container runtime. Note that this field
-                                cannot be set when spec.os.name is windows.
+                              description: |-
+                                The capabilities to add/drop when running containers.
+                                Defaults to the default set of capabilities granted by the container runtime.
+                                Note that this field cannot be set when spec.os.name is windows.
                               properties:
                                 add:
                                   description: Added capabilities
@@ -11562,6 +14344,7 @@ spec:
                                       type
                                     type: string
                                   type: array
+                                  x-kubernetes-list-type: atomic
                                 drop:
                                   description: Removed capabilities
                                   items:
@@ -11569,64 +14352,63 @@ spec:
                                       type
                                     type: string
                                   type: array
+                                  x-kubernetes-list-type: atomic
                               type: object
                             privileged:
-                              description: Run container in privileged mode. Processes
-                                in privileged containers are essentially equivalent
-                                to root on the host. Defaults to false. Note that
-                                this field cannot be set when spec.os.name is windows.
+                              description: |-
+                                Run container in privileged mode.
+                                Processes in privileged containers are essentially equivalent to root on the host.
+                                Defaults to false.
+                                Note that this field cannot be set when spec.os.name is windows.
                               type: boolean
                             procMount:
-                              description: procMount denotes the type of proc mount
-                                to use for the containers. The default is DefaultProcMount
-                                which uses the container runtime defaults for readonly
-                                paths and masked paths. This requires the ProcMountType
-                                feature flag to be enabled. Note that this field cannot
-                                be set when spec.os.name is windows.
+                              description: |-
+                                procMount denotes the type of proc mount to use for the containers.
+                                The default value is Default which uses the container runtime defaults for
+                                readonly paths and masked paths.
+                                This requires the ProcMountType feature flag to be enabled.
+                                Note that this field cannot be set when spec.os.name is windows.
                               type: string
                             readOnlyRootFilesystem:
-                              description: Whether this container has a read-only
-                                root filesystem. Default is false. Note that this
-                                field cannot be set when spec.os.name is windows.
+                              description: |-
+                                Whether this container has a read-only root filesystem.
+                                Default is false.
+                                Note that this field cannot be set when spec.os.name is windows.
                               type: boolean
                             runAsGroup:
-                              description: The GID to run the entrypoint of the container
-                                process. Uses runtime default if unset. May also be
-                                set in PodSecurityContext.  If set in both SecurityContext
-                                and PodSecurityContext, the value specified in SecurityContext
-                                takes precedence. Note that this field cannot be set
-                                when spec.os.name is windows.
+                              description: |-
+                                The GID to run the entrypoint of the container process.
+                                Uses runtime default if unset.
+                                May also be set in PodSecurityContext.  If set in both SecurityContext and
+                                PodSecurityContext, the value specified in SecurityContext takes precedence.
+                                Note that this field cannot be set when spec.os.name is windows.
                               format: int64
                               type: integer
                             runAsNonRoot:
-                              description: Indicates that the container must run as
-                                a non-root user. If true, the Kubelet will validate
-                                the image at runtime to ensure that it does not run
-                                as UID 0 (root) and fail to start the container if
-                                it does. If unset or false, no such validation will
-                                be performed. May also be set in PodSecurityContext.  If
-                                set in both SecurityContext and PodSecurityContext,
-                                the value specified in SecurityContext takes precedence.
+                              description: |-
+                                Indicates that the container must run as a non-root user.
+                                If true, the Kubelet will validate the image at runtime to ensure that it
+                                does not run as UID 0 (root) and fail to start the container if it does.
+                                If unset or false, no such validation will be performed.
+                                May also be set in PodSecurityContext.  If set in both SecurityContext and
+                                PodSecurityContext, the value specified in SecurityContext takes precedence.
                               type: boolean
                             runAsUser:
-                              description: The UID to run the entrypoint of the container
-                                process. Defaults to user specified in image metadata
-                                if unspecified. May also be set in PodSecurityContext.  If
-                                set in both SecurityContext and PodSecurityContext,
-                                the value specified in SecurityContext takes precedence.
-                                Note that this field cannot be set when spec.os.name
-                                is windows.
+                              description: |-
+                                The UID to run the entrypoint of the container process.
+                                Defaults to user specified in image metadata if unspecified.
+                                May also be set in PodSecurityContext.  If set in both SecurityContext and
+                                PodSecurityContext, the value specified in SecurityContext takes precedence.
+                                Note that this field cannot be set when spec.os.name is windows.
                               format: int64
                               type: integer
                             seLinuxOptions:
-                              description: The SELinux context to be applied to the
-                                container. If unspecified, the container runtime will
-                                allocate a random SELinux context for each container.  May
-                                also be set in PodSecurityContext.  If set in both
-                                SecurityContext and PodSecurityContext, the value
-                                specified in SecurityContext takes precedence. Note
-                                that this field cannot be set when spec.os.name is
-                                windows.
+                              description: |-
+                                The SELinux context to be applied to the container.
+                                If unspecified, the container runtime will allocate a random SELinux context for each
+                                container.  May also be set in PodSecurityContext.  If set in both SecurityContext and
+                                PodSecurityContext, the value specified in SecurityContext takes precedence.
+                                Note that this field cannot be set when spec.os.name is windows.
                               properties:
                                 level:
                                   description: Level is SELinux level label that applies
@@ -11646,110 +14428,98 @@ spec:
                                   type: string
                               type: object
                             seccompProfile:
-                              description: The seccomp options to use by this container.
-                                If seccomp options are provided at both the pod &
-                                container level, the container options override the
-                                pod options. Note that this field cannot be set when
-                                spec.os.name is windows.
+                              description: |-
+                                The seccomp options to use by this container. If seccomp options are
+                                provided at both the pod & container level, the container options
+                                override the pod options.
+                                Note that this field cannot be set when spec.os.name is windows.
                               properties:
                                 localhostProfile:
-                                  description: localhostProfile indicates a profile
-                                    defined in a file on the node should be used.
-                                    The profile must be preconfigured on the node
-                                    to work. Must be a descending path, relative to
-                                    the kubelet's configured seccomp profile location.
-                                    Must only be set if type is "Localhost".
+                                  description: |-
+                                    localhostProfile indicates a profile defined in a file on the node should be used.
+                                    The profile must be preconfigured on the node to work.
+                                    Must be a descending path, relative to the kubelet's configured seccomp profile location.
+                                    Must be set if type is "Localhost". Must NOT be set for any other type.
                                   type: string
                                 type:
-                                  description: "type indicates which kind of seccomp
-                                    profile will be applied. Valid options are: \n
-                                    Localhost - a profile defined in a file on the
-                                    node should be used. RuntimeDefault - the container
-                                    runtime default profile should be used. Unconfined
-                                    - no profile should be applied."
+                                  description: |-
+                                    type indicates which kind of seccomp profile will be applied.
+                                    Valid options are:
+
+                                    Localhost - a profile defined in a file on the node should be used.
+                                    RuntimeDefault - the container runtime default profile should be used.
+                                    Unconfined - no profile should be applied.
                                   type: string
                               required:
                               - type
                               type: object
                             windowsOptions:
-                              description: The Windows specific settings applied to
-                                all containers. If unspecified, the options from the
-                                PodSecurityContext will be used. If set in both SecurityContext
-                                and PodSecurityContext, the value specified in SecurityContext
-                                takes precedence. Note that this field cannot be set
-                                when spec.os.name is linux.
+                              description: |-
+                                The Windows specific settings applied to all containers.
+                                If unspecified, the options from the PodSecurityContext will be used.
+                                If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence.
+                                Note that this field cannot be set when spec.os.name is linux.
                               properties:
                                 gmsaCredentialSpec:
-                                  description: GMSACredentialSpec is where the GMSA
-                                    admission webhook (https://github.com/kubernetes-sigs/windows-gmsa)
-                                    inlines the contents of the GMSA credential spec
-                                    named by the GMSACredentialSpecName field.
+                                  description: |-
+                                    GMSACredentialSpec is where the GMSA admission webhook
+                                    (https://github.com/kubernetes-sigs/windows-gmsa) inlines the contents of the
+                                    GMSA credential spec named by the GMSACredentialSpecName field.
                                   type: string
                                 gmsaCredentialSpecName:
                                   description: GMSACredentialSpecName is the name
                                     of the GMSA credential spec to use.
                                   type: string
                                 hostProcess:
-                                  description: HostProcess determines if a container
-                                    should be run as a 'Host Process' container. This
-                                    field is alpha-level and will only be honored
-                                    by components that enable the WindowsHostProcessContainers
-                                    feature flag. Setting this field without the feature
-                                    flag will result in errors when validating the
-                                    Pod. All of a Pod's containers must have the same
-                                    effective HostProcess value (it is not allowed
-                                    to have a mix of HostProcess containers and non-HostProcess
-                                    containers).  In addition, if HostProcess is true
-                                    then HostNetwork must also be set to true.
+                                  description: |-
+                                    HostProcess determines if a container should be run as a 'Host Process' container.
+                                    All of a Pod's containers must have the same effective HostProcess value
+                                    (it is not allowed to have a mix of HostProcess containers and non-HostProcess containers).
+                                    In addition, if HostProcess is true then HostNetwork must also be set to true.
                                   type: boolean
                                 runAsUserName:
-                                  description: The UserName in Windows to run the
-                                    entrypoint of the container process. Defaults
-                                    to the user specified in image metadata if unspecified.
-                                    May also be set in PodSecurityContext. If set
-                                    in both SecurityContext and PodSecurityContext,
-                                    the value specified in SecurityContext takes precedence.
+                                  description: |-
+                                    The UserName in Windows to run the entrypoint of the container process.
+                                    Defaults to the user specified in image metadata if unspecified.
+                                    May also be set in PodSecurityContext. If set in both SecurityContext and
+                                    PodSecurityContext, the value specified in SecurityContext takes precedence.
                                   type: string
                               type: object
                           type: object
                         startupProbe:
-                          description: 'StartupProbe indicates that the Pod has successfully
-                            initialized. If specified, no other probes are executed
-                            until this completes successfully. If this probe fails,
-                            the Pod will be restarted, just as if the livenessProbe
-                            failed. This can be used to provide different probe parameters
-                            at the beginning of a Pod''s lifecycle, when it might
-                            take a long time to load data or warm a cache, than during
-                            steady-state operation. This cannot be updated. More info:
-                            https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
+                          description: |-
+                            StartupProbe indicates that the Pod has successfully initialized.
+                            If specified, no other probes are executed until this completes successfully.
+                            If this probe fails, the Pod will be restarted, just as if the livenessProbe failed.
+                            This can be used to provide different probe parameters at the beginning of a Pod's lifecycle,
+                            when it might take a long time to load data or warm a cache, than during steady-state operation.
+                            This cannot be updated.
+                            More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
                           properties:
                             exec:
-                              description: Exec specifies the action to take.
+                              description: Exec specifies a command to execute in
+                                the container.
                               properties:
                                 command:
-                                  description: Command is the command line to execute
-                                    inside the container, the working directory for
-                                    the command  is root ('/') in the container's
-                                    filesystem. The command is simply exec'd, it is
-                                    not run inside a shell, so traditional shell instructions
-                                    ('|', etc) won't work. To use a shell, you need
-                                    to explicitly call out to that shell. Exit status
-                                    of 0 is treated as live/healthy and non-zero is
-                                    unhealthy.
+                                  description: |-
+                                    Command is the command line to execute inside the container, the working directory for the
+                                    command  is root ('/') in the container's filesystem. The command is simply exec'd, it is
+                                    not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use
+                                    a shell, you need to explicitly call out to that shell.
+                                    Exit status of 0 is treated as live/healthy and non-zero is unhealthy.
                                   items:
                                     type: string
                                   type: array
+                                  x-kubernetes-list-type: atomic
                               type: object
                             failureThreshold:
-                              description: Minimum consecutive failures for the probe
-                                to be considered failed after having succeeded. Defaults
-                                to 3. Minimum value is 1.
+                              description: |-
+                                Minimum consecutive failures for the probe to be considered failed after having succeeded.
+                                Defaults to 3. Minimum value is 1.
                               format: int32
                               type: integer
                             grpc:
-                              description: GRPC specifies an action involving a GRPC
-                                port. This is a beta field and requires enabling GRPCContainerProbe
-                                feature gate.
+                              description: GRPC specifies a GRPC HealthCheckRequest.
                               properties:
                                 port:
                                   description: Port number of the gRPC service. Number
@@ -11757,21 +14527,24 @@ spec:
                                   format: int32
                                   type: integer
                                 service:
-                                  description: "Service is the name of the service
-                                    to place in the gRPC HealthCheckRequest (see https://github.com/grpc/grpc/blob/master/doc/health-checking.md).
-                                    \n If this is not specified, the default behavior
-                                    is defined by gRPC."
+                                  default: ""
+                                  description: |-
+                                    Service is the name of the service to place in the gRPC HealthCheckRequest
+                                    (see https://github.com/grpc/grpc/blob/master/doc/health-checking.md).
+
+                                    If this is not specified, the default behavior is defined by gRPC.
                                   type: string
                               required:
                               - port
                               type: object
                             httpGet:
-                              description: HTTPGet specifies the http request to perform.
+                              description: HTTPGet specifies an HTTP GET request to
+                                perform.
                               properties:
                                 host:
-                                  description: Host name to connect to, defaults to
-                                    the pod IP. You probably want to set "Host" in
-                                    httpHeaders instead.
+                                  description: |-
+                                    Host name to connect to, defaults to the pod IP. You probably want to set
+                                    "Host" in httpHeaders instead.
                                   type: string
                                 httpHeaders:
                                   description: Custom headers to set in the request.
@@ -11781,7 +14554,9 @@ spec:
                                       to be used in HTTP probes
                                     properties:
                                       name:
-                                        description: The header field name
+                                        description: |-
+                                          The header field name.
+                                          This will be canonicalized upon output, so case-variant names will be understood as the same header.
                                         type: string
                                       value:
                                         description: The header field value
@@ -11791,6 +14566,7 @@ spec:
                                     - value
                                     type: object
                                   type: array
+                                  x-kubernetes-list-type: atomic
                                 path:
                                   description: Path to access on the HTTP server.
                                   type: string
@@ -11798,38 +14574,40 @@ spec:
                                   anyOf:
                                   - type: integer
                                   - type: string
-                                  description: Name or number of the port to access
-                                    on the container. Number must be in the range
-                                    1 to 65535. Name must be an IANA_SVC_NAME.
+                                  description: |-
+                                    Name or number of the port to access on the container.
+                                    Number must be in the range 1 to 65535.
+                                    Name must be an IANA_SVC_NAME.
                                   x-kubernetes-int-or-string: true
                                 scheme:
-                                  description: Scheme to use for connecting to the
-                                    host. Defaults to HTTP.
+                                  description: |-
+                                    Scheme to use for connecting to the host.
+                                    Defaults to HTTP.
                                   type: string
                               required:
                               - port
                               type: object
                             initialDelaySeconds:
-                              description: 'Number of seconds after the container
-                                has started before liveness probes are initiated.
-                                More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
+                              description: |-
+                                Number of seconds after the container has started before liveness probes are initiated.
+                                More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
                               format: int32
                               type: integer
                             periodSeconds:
-                              description: How often (in seconds) to perform the probe.
+                              description: |-
+                                How often (in seconds) to perform the probe.
                                 Default to 10 seconds. Minimum value is 1.
                               format: int32
                               type: integer
                             successThreshold:
-                              description: Minimum consecutive successes for the probe
-                                to be considered successful after having failed. Defaults
-                                to 1. Must be 1 for liveness and startup. Minimum
-                                value is 1.
+                              description: |-
+                                Minimum consecutive successes for the probe to be considered successful after having failed.
+                                Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1.
                               format: int32
                               type: integer
                             tcpSocket:
-                              description: TCPSocket specifies an action involving
-                                a TCP port.
+                              description: TCPSocket specifies a connection to a TCP
+                                port.
                               properties:
                                 host:
                                   description: 'Optional: Host name to connect to,
@@ -11839,81 +14617,76 @@ spec:
                                   anyOf:
                                   - type: integer
                                   - type: string
-                                  description: Number or name of the port to access
-                                    on the container. Number must be in the range
-                                    1 to 65535. Name must be an IANA_SVC_NAME.
+                                  description: |-
+                                    Number or name of the port to access on the container.
+                                    Number must be in the range 1 to 65535.
+                                    Name must be an IANA_SVC_NAME.
                                   x-kubernetes-int-or-string: true
                               required:
                               - port
                               type: object
                             terminationGracePeriodSeconds:
-                              description: Optional duration in seconds the pod needs
-                                to terminate gracefully upon probe failure. The grace
-                                period is the duration in seconds after the processes
-                                running in the pod are sent a termination signal and
-                                the time when the processes are forcibly halted with
-                                a kill signal. Set this value longer than the expected
-                                cleanup time for your process. If this value is nil,
-                                the pod's terminationGracePeriodSeconds will be used.
-                                Otherwise, this value overrides the value provided
-                                by the pod spec. Value must be non-negative integer.
-                                The value zero indicates stop immediately via the
-                                kill signal (no opportunity to shut down). This is
-                                a beta field and requires enabling ProbeTerminationGracePeriod
-                                feature gate. Minimum value is 1. spec.terminationGracePeriodSeconds
-                                is used if unset.
+                              description: |-
+                                Optional duration in seconds the pod needs to terminate gracefully upon probe failure.
+                                The grace period is the duration in seconds after the processes running in the pod are sent
+                                a termination signal and the time when the processes are forcibly halted with a kill signal.
+                                Set this value longer than the expected cleanup time for your process.
+                                If this value is nil, the pod's terminationGracePeriodSeconds will be used. Otherwise, this
+                                value overrides the value provided by the pod spec.
+                                Value must be non-negative integer. The value zero indicates stop immediately via
+                                the kill signal (no opportunity to shut down).
+                                This is a beta field and requires enabling ProbeTerminationGracePeriod feature gate.
+                                Minimum value is 1. spec.terminationGracePeriodSeconds is used if unset.
                               format: int64
                               type: integer
                             timeoutSeconds:
-                              description: 'Number of seconds after which the probe
-                                times out. Defaults to 1 second. Minimum value is
-                                1. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
+                              description: |-
+                                Number of seconds after which the probe times out.
+                                Defaults to 1 second. Minimum value is 1.
+                                More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes
                               format: int32
                               type: integer
                           type: object
                         stdin:
-                          description: Whether this container should allocate a buffer
-                            for stdin in the container runtime. If this is not set,
-                            reads from stdin in the container will always result in
-                            EOF. Default is false.
+                          description: |-
+                            Whether this container should allocate a buffer for stdin in the container runtime. If this
+                            is not set, reads from stdin in the container will always result in EOF.
+                            Default is false.
                           type: boolean
                         stdinOnce:
-                          description: Whether the container runtime should close
-                            the stdin channel after it has been opened by a single
-                            attach. When stdin is true the stdin stream will remain
-                            open across multiple attach sessions. If stdinOnce is
-                            set to true, stdin is opened on container start, is empty
-                            until the first client attaches to stdin, and then remains
-                            open and accepts data until the client disconnects, at
-                            which time stdin is closed and remains closed until the
-                            container is restarted. If this flag is false, a container
-                            processes that reads from stdin will never receive an
-                            EOF. Default is false
+                          description: |-
+                            Whether the container runtime should close the stdin channel after it has been opened by
+                            a single attach. When stdin is true the stdin stream will remain open across multiple attach
+                            sessions. If stdinOnce is set to true, stdin is opened on container start, is empty until the
+                            first client attaches to stdin, and then remains open and accepts data until the client disconnects,
+                            at which time stdin is closed and remains closed until the container is restarted. If this
+                            flag is false, a container processes that reads from stdin will never receive an EOF.
+                            Default is false
                           type: boolean
                         terminationMessagePath:
-                          description: 'Optional: Path at which the file to which
-                            the container''s termination message will be written is
-                            mounted into the container''s filesystem. Message written
-                            is intended to be brief final status, such as an assertion
-                            failure message. Will be truncated by the node if greater
-                            than 4096 bytes. The total message length across all containers
-                            will be limited to 12kb. Defaults to /dev/termination-log.
-                            Cannot be updated.'
+                          description: |-
+                            Optional: Path at which the file to which the container's termination message
+                            will be written is mounted into the container's filesystem.
+                            Message written is intended to be brief final status, such as an assertion failure message.
+                            Will be truncated by the node if greater than 4096 bytes. The total message length across
+                            all containers will be limited to 12kb.
+                            Defaults to /dev/termination-log.
+                            Cannot be updated.
                           type: string
                         terminationMessagePolicy:
-                          description: Indicate how the termination message should
-                            be populated. File will use the contents of terminationMessagePath
-                            to populate the container status message on both success
-                            and failure. FallbackToLogsOnError will use the last chunk
-                            of container log output if the termination message file
-                            is empty and the container exited with an error. The log
-                            output is limited to 2048 bytes or 80 lines, whichever
-                            is smaller. Defaults to File. Cannot be updated.
+                          description: |-
+                            Indicate how the termination message should be populated. File will use the contents of
+                            terminationMessagePath to populate the container status message on both success and failure.
+                            FallbackToLogsOnError will use the last chunk of container log output if the termination
+                            message file is empty and the container exited with an error.
+                            The log output is limited to 2048 bytes or 80 lines, whichever is smaller.
+                            Defaults to File.
+                            Cannot be updated.
                           type: string
                         tty:
-                          description: Whether this container should allocate a TTY
-                            for itself, also requires 'stdin' to be true. Default
-                            is false.
+                          description: |-
+                            Whether this container should allocate a TTY for itself, also requires 'stdin' to be true.
+                            Default is false.
                           type: boolean
                         volumeDevices:
                           description: volumeDevices is the list of block devices
@@ -11935,52 +14708,84 @@ spec:
                             - name
                             type: object
                           type: array
+                          x-kubernetes-list-map-keys:
+                          - devicePath
+                          x-kubernetes-list-type: map
                         volumeMounts:
-                          description: Pod volumes to mount into the container's filesystem.
+                          description: |-
+                            Pod volumes to mount into the container's filesystem.
                             Cannot be updated.
                           items:
                             description: VolumeMount describes a mounting of a Volume
                               within a container.
                             properties:
                               mountPath:
-                                description: Path within the container at which the
-                                  volume should be mounted.  Must not contain ':'.
+                                description: |-
+                                  Path within the container at which the volume should be mounted.  Must
+                                  not contain ':'.
                                 type: string
                               mountPropagation:
-                                description: mountPropagation determines how mounts
-                                  are propagated from the host to container and the
-                                  other way around. When not set, MountPropagationNone
-                                  is used. This field is beta in 1.10.
+                                description: |-
+                                  mountPropagation determines how mounts are propagated from the host
+                                  to container and the other way around.
+                                  When not set, MountPropagationNone is used.
+                                  This field is beta in 1.10.
+                                  When RecursiveReadOnly is set to IfPossible or to Enabled, MountPropagation must be None or unspecified
+                                  (which defaults to None).
                                 type: string
                               name:
                                 description: This must match the Name of a Volume.
                                 type: string
                               readOnly:
-                                description: Mounted read-only if true, read-write
-                                  otherwise (false or unspecified). Defaults to false.
+                                description: |-
+                                  Mounted read-only if true, read-write otherwise (false or unspecified).
+                                  Defaults to false.
                                 type: boolean
+                              recursiveReadOnly:
+                                description: |-
+                                  RecursiveReadOnly specifies whether read-only mounts should be handled
+                                  recursively.
+
+                                  If ReadOnly is false, this field has no meaning and must be unspecified.
+
+                                  If ReadOnly is true, and this field is set to Disabled, the mount is not made
+                                  recursively read-only.  If this field is set to IfPossible, the mount is made
+                                  recursively read-only, if it is supported by the container runtime.  If this
+                                  field is set to Enabled, the mount is made recursively read-only if it is
+                                  supported by the container runtime, otherwise the pod will not be started and
+                                  an error will be generated to indicate the reason.
+
+                                  If this field is set to IfPossible or Enabled, MountPropagation must be set to
+                                  None (or be unspecified, which defaults to None).
+
+                                  If this field is not specified, it is treated as an equivalent of Disabled.
+                                type: string
                               subPath:
-                                description: Path within the volume from which the
-                                  container's volume should be mounted. Defaults to
-                                  "" (volume's root).
+                                description: |-
+                                  Path within the volume from which the container's volume should be mounted.
+                                  Defaults to "" (volume's root).
                                 type: string
                               subPathExpr:
-                                description: Expanded path within the volume from
-                                  which the container's volume should be mounted.
-                                  Behaves similarly to SubPath but environment variable
-                                  references $(VAR_NAME) are expanded using the container's
-                                  environment. Defaults to "" (volume's root). SubPathExpr
-                                  and SubPath are mutually exclusive.
+                                description: |-
+                                  Expanded path within the volume from which the container's volume should be mounted.
+                                  Behaves similarly to SubPath but environment variable references $(VAR_NAME) are expanded using the container's environment.
+                                  Defaults to "" (volume's root).
+                                  SubPathExpr and SubPath are mutually exclusive.
                                 type: string
                             required:
                             - mountPath
                             - name
                             type: object
                           type: array
+                          x-kubernetes-list-map-keys:
+                          - mountPath
+                          x-kubernetes-list-type: map
                         workingDir:
-                          description: Container's working directory. If not specified,
-                            the container runtime's default will be used, which might
-                            be configured in the container image. Cannot be updated.
+                          description: |-
+                            Container's working directory.
+                            If not specified, the container runtime's default will be used, which
+                            might be configured in the container image.
+                            Cannot be updated.
                           type: string
                       required:
                       - name
@@ -12003,6 +14808,37 @@ spec:
                     description: ResourceRequirements describes the compute resource
                       requirements.
                     properties:
+                      claims:
+                        description: |-
+                          Claims lists the names of resources, defined in spec.resourceClaims,
+                          that are used by this container.
+
+                          This is an alpha field and requires enabling the
+                          DynamicResourceAllocation feature gate.
+
+                          This field is immutable. It can only be set for containers.
+                        items:
+                          description: ResourceClaim references one entry in PodSpec.ResourceClaims.
+                          properties:
+                            name:
+                              description: |-
+                                Name must match the name of one entry in pod.spec.resourceClaims of
+                                the Pod where this field is used. It makes that resource available
+                                inside a container.
+                              type: string
+                            request:
+                              description: |-
+                                Request is the name chosen for a request in the referenced claim.
+                                If empty, everything from the claim is made available, otherwise
+                                only the result of this request.
+                              type: string
+                          required:
+                          - name
+                          type: object
+                        type: array
+                        x-kubernetes-list-map-keys:
+                        - name
+                        x-kubernetes-list-type: map
                       limits:
                         additionalProperties:
                           anyOf:
@@ -12010,8 +14846,9 @@ spec:
                           - type: string
                           pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
                           x-kubernetes-int-or-string: true
-                        description: 'Limits describes the maximum amount of compute
-                          resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
+                        description: |-
+                          Limits describes the maximum amount of compute resources allowed.
+                          More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
                         type: object
                       requests:
                         additionalProperties:
@@ -12020,76 +14857,129 @@ spec:
                           - type: string
                           pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
                           x-kubernetes-int-or-string: true
-                        description: 'Requests describes the minimum amount of compute
-                          resources required. If Requests is omitted for a container,
-                          it defaults to Limits if that is explicitly specified, otherwise
-                          to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
+                        description: |-
+                          Requests describes the minimum amount of compute resources required.
+                          If Requests is omitted for a container, it defaults to Limits if that is explicitly specified,
+                          otherwise to an implementation-defined value. Requests cannot exceed Limits.
+                          More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
                         type: object
                     type: object
                   securityContext:
-                    description: PodSecurityContext holds pod-level security attributes
-                      and common container settings. Some fields are also present
-                      in container.securityContext.  Field values of container.securityContext
-                      take precedence over field values of PodSecurityContext.
+                    description: |-
+                      PodSecurityContext holds pod-level security attributes and common container settings.
+                      Some fields are also present in container.securityContext.  Field values of
+                      container.securityContext take precedence over field values of PodSecurityContext.
                     properties:
+                      appArmorProfile:
+                        description: |-
+                          appArmorProfile is the AppArmor options to use by the containers in this pod.
+                          Note that this field cannot be set when spec.os.name is windows.
+                        properties:
+                          localhostProfile:
+                            description: |-
+                              localhostProfile indicates a profile loaded on the node that should be used.
+                              The profile must be preconfigured on the node to work.
+                              Must match the loaded name of the profile.
+                              Must be set if and only if type is "Localhost".
+                            type: string
+                          type:
+                            description: |-
+                              type indicates which kind of AppArmor profile will be applied.
+                              Valid options are:
+                                Localhost - a profile pre-loaded on the node.
+                                RuntimeDefault - the container runtime's default profile.
+                                Unconfined - no AppArmor enforcement.
+                            type: string
+                        required:
+                        - type
+                        type: object
                       fsGroup:
-                        description: "A special supplemental group that applies to
-                          all containers in a pod. Some volume types allow the Kubelet
-                          to change the ownership of that volume to be owned by the
-                          pod: \n 1. The owning GID will be the FSGroup 2. The setgid
-                          bit is set (new files created in the volume will be owned
-                          by FSGroup) 3. The permission bits are OR'd with rw-rw----
-                          \n If unset, the Kubelet will not modify the ownership and
-                          permissions of any volume. Note that this field cannot be
-                          set when spec.os.name is windows."
+                        description: |-
+                          A special supplemental group that applies to all containers in a pod.
+                          Some volume types allow the Kubelet to change the ownership of that volume
+                          to be owned by the pod:
+
+                          1. The owning GID will be the FSGroup
+                          2. The setgid bit is set (new files created in the volume will be owned by FSGroup)
+                          3. The permission bits are OR'd with rw-rw----
+
+                          If unset, the Kubelet will not modify the ownership and permissions of any volume.
+                          Note that this field cannot be set when spec.os.name is windows.
                         format: int64
                         type: integer
                       fsGroupChangePolicy:
-                        description: 'fsGroupChangePolicy defines behavior of changing
-                          ownership and permission of the volume before being exposed
-                          inside Pod. This field will only apply to volume types which
-                          support fsGroup based ownership(and permissions). It will
-                          have no effect on ephemeral volume types such as: secret,
-                          configmaps and emptydir. Valid values are "OnRootMismatch"
-                          and "Always". If not specified, "Always" is used. Note that
-                          this field cannot be set when spec.os.name is windows.'
+                        description: |-
+                          fsGroupChangePolicy defines behavior of changing ownership and permission of the volume
+                          before being exposed inside Pod. This field will only apply to
+                          volume types which support fsGroup based ownership(and permissions).
+                          It will have no effect on ephemeral volume types such as: secret, configmaps
+                          and emptydir.
+                          Valid values are "OnRootMismatch" and "Always". If not specified, "Always" is used.
+                          Note that this field cannot be set when spec.os.name is windows.
                         type: string
                       runAsGroup:
-                        description: The GID to run the entrypoint of the container
-                          process. Uses runtime default if unset. May also be set
-                          in SecurityContext.  If set in both SecurityContext and
-                          PodSecurityContext, the value specified in SecurityContext
-                          takes precedence for that container. Note that this field
-                          cannot be set when spec.os.name is windows.
+                        description: |-
+                          The GID to run the entrypoint of the container process.
+                          Uses runtime default if unset.
+                          May also be set in SecurityContext.  If set in both SecurityContext and
+                          PodSecurityContext, the value specified in SecurityContext takes precedence
+                          for that container.
+                          Note that this field cannot be set when spec.os.name is windows.
                         format: int64
                         type: integer
                       runAsNonRoot:
-                        description: Indicates that the container must run as a non-root
-                          user. If true, the Kubelet will validate the image at runtime
-                          to ensure that it does not run as UID 0 (root) and fail
-                          to start the container if it does. If unset or false, no
-                          such validation will be performed. May also be set in SecurityContext.  If
-                          set in both SecurityContext and PodSecurityContext, the
-                          value specified in SecurityContext takes precedence.
+                        description: |-
+                          Indicates that the container must run as a non-root user.
+                          If true, the Kubelet will validate the image at runtime to ensure that it
+                          does not run as UID 0 (root) and fail to start the container if it does.
+                          If unset or false, no such validation will be performed.
+                          May also be set in SecurityContext.  If set in both SecurityContext and
+                          PodSecurityContext, the value specified in SecurityContext takes precedence.
                         type: boolean
                       runAsUser:
-                        description: The UID to run the entrypoint of the container
-                          process. Defaults to user specified in image metadata if
-                          unspecified. May also be set in SecurityContext.  If set
-                          in both SecurityContext and PodSecurityContext, the value
-                          specified in SecurityContext takes precedence for that container.
-                          Note that this field cannot be set when spec.os.name is
-                          windows.
+                        description: |-
+                          The UID to run the entrypoint of the container process.
+                          Defaults to user specified in image metadata if unspecified.
+                          May also be set in SecurityContext.  If set in both SecurityContext and
+                          PodSecurityContext, the value specified in SecurityContext takes precedence
+                          for that container.
+                          Note that this field cannot be set when spec.os.name is windows.
                         format: int64
                         type: integer
+                      seLinuxChangePolicy:
+                        description: |-
+                          seLinuxChangePolicy defines how the container's SELinux label is applied to all volumes used by the Pod.
+                          It has no effect on nodes that do not support SELinux or to volumes does not support SELinux.
+                          Valid values are "MountOption" and "Recursive".
+
+                          "Recursive" means relabeling of all files on all Pod volumes by the container runtime.
+                          This may be slow for large volumes, but allows mixing privileged and unprivileged Pods sharing the same volume on the same node.
+
+                          "MountOption" mounts all eligible Pod volumes with `-o context` mount option.
+                          This requires all Pods that share the same volume to use the same SELinux label.
+                          It is not possible to share the same volume among privileged and unprivileged Pods.
+                          Eligible volumes are in-tree FibreChannel and iSCSI volumes, and all CSI volumes
+                          whose CSI driver announces SELinux support by setting spec.seLinuxMount: true in their
+                          CSIDriver instance. Other volumes are always re-labelled recursively.
+                          "MountOption" value is allowed only when SELinuxMount feature gate is enabled.
+
+                          If not specified and SELinuxMount feature gate is enabled, "MountOption" is used.
+                          If not specified and SELinuxMount feature gate is disabled, "MountOption" is used for ReadWriteOncePod volumes
+                          and "Recursive" for all other volumes.
+
+                          This field affects only Pods that have SELinux label set, either in PodSecurityContext or in SecurityContext of all containers.
+
+                          All Pods that use the same volume should use the same seLinuxChangePolicy, otherwise some pods can get stuck in ContainerCreating state.
+                          Note that this field cannot be set when spec.os.name is windows.
+                        type: string
                       seLinuxOptions:
-                        description: The SELinux context to be applied to all containers.
-                          If unspecified, the container runtime will allocate a random
-                          SELinux context for each container.  May also be set in
-                          SecurityContext.  If set in both SecurityContext and PodSecurityContext,
-                          the value specified in SecurityContext takes precedence
-                          for that container. Note that this field cannot be set when
-                          spec.os.name is windows.
+                        description: |-
+                          The SELinux context to be applied to all containers.
+                          If unspecified, the container runtime will allocate a random SELinux context for each
+                          container.  May also be set in SecurityContext.  If set in
+                          both SecurityContext and PodSecurityContext, the value specified in SecurityContext
+                          takes precedence for that container.
+                          Note that this field cannot be set when spec.os.name is windows.
                         properties:
                           level:
                             description: Level is SELinux level label that applies
@@ -12109,42 +14999,58 @@ spec:
                             type: string
                         type: object
                       seccompProfile:
-                        description: The seccomp options to use by the containers
-                          in this pod. Note that this field cannot be set when spec.os.name
-                          is windows.
+                        description: |-
+                          The seccomp options to use by the containers in this pod.
+                          Note that this field cannot be set when spec.os.name is windows.
                         properties:
                           localhostProfile:
-                            description: localhostProfile indicates a profile defined
-                              in a file on the node should be used. The profile must
-                              be preconfigured on the node to work. Must be a descending
-                              path, relative to the kubelet's configured seccomp profile
-                              location. Must only be set if type is "Localhost".
+                            description: |-
+                              localhostProfile indicates a profile defined in a file on the node should be used.
+                              The profile must be preconfigured on the node to work.
+                              Must be a descending path, relative to the kubelet's configured seccomp profile location.
+                              Must be set if type is "Localhost". Must NOT be set for any other type.
                             type: string
                           type:
-                            description: "type indicates which kind of seccomp profile
-                              will be applied. Valid options are: \n Localhost - a
-                              profile defined in a file on the node should be used.
-                              RuntimeDefault - the container runtime default profile
-                              should be used. Unconfined - no profile should be applied."
+                            description: |-
+                              type indicates which kind of seccomp profile will be applied.
+                              Valid options are:
+
+                              Localhost - a profile defined in a file on the node should be used.
+                              RuntimeDefault - the container runtime default profile should be used.
+                              Unconfined - no profile should be applied.
                             type: string
                         required:
                         - type
                         type: object
                       supplementalGroups:
-                        description: A list of groups applied to the first process
-                          run in each container, in addition to the container's primary
-                          GID.  If unspecified, no groups will be added to any container.
-                          Note that this field cannot be set when spec.os.name is
-                          windows.
+                        description: |-
+                          A list of groups applied to the first process run in each container, in
+                          addition to the container's primary GID and fsGroup (if specified).  If
+                          the SupplementalGroupsPolicy feature is enabled, the
+                          supplementalGroupsPolicy field determines whether these are in addition
+                          to or instead of any group memberships defined in the container image.
+                          If unspecified, no additional groups are added, though group memberships
+                          defined in the container image may still be used, depending on the
+                          supplementalGroupsPolicy field.
+                          Note that this field cannot be set when spec.os.name is windows.
                         items:
                           format: int64
                           type: integer
                         type: array
+                        x-kubernetes-list-type: atomic
+                      supplementalGroupsPolicy:
+                        description: |-
+                          Defines how supplemental groups of the first container processes are calculated.
+                          Valid values are "Merge" and "Strict". If not specified, "Merge" is used.
+                          (Alpha) Using the field requires the SupplementalGroupsPolicy feature gate to be enabled
+                          and the container runtime must implement support for this feature.
+                          Note that this field cannot be set when spec.os.name is windows.
+                        type: string
                       sysctls:
-                        description: Sysctls hold a list of namespaced sysctls used
-                          for the pod. Pods with unsupported sysctls (by the container
-                          runtime) might fail to launch. Note that this field cannot
-                          be set when spec.os.name is windows.
+                        description: |-
+                          Sysctls hold a list of namespaced sysctls used for the pod. Pods with unsupported
+                          sysctls (by the container runtime) might fail to launch.
+                          Note that this field cannot be set when spec.os.name is windows.
                         items:
                           description: Sysctl defines a kernel parameter to be set
                           properties:
@@ -12159,43 +15065,37 @@ spec:
                           - value
                           type: object
                         type: array
+                        x-kubernetes-list-type: atomic
                       windowsOptions:
-                        description: The Windows specific settings applied to all
-                          containers. If unspecified, the options within a container's
-                          SecurityContext will be used. If set in both SecurityContext
-                          and PodSecurityContext, the value specified in SecurityContext
-                          takes precedence. Note that this field cannot be set when
-                          spec.os.name is linux.
+                        description: |-
+                          The Windows specific settings applied to all containers.
+                          If unspecified, the options within a container's SecurityContext will be used.
+                          If set in both SecurityContext and PodSecurityContext, the value specified in SecurityContext takes precedence.
+                          Note that this field cannot be set when spec.os.name is linux.
                         properties:
                           gmsaCredentialSpec:
-                            description: GMSACredentialSpec is where the GMSA admission
-                              webhook (https://github.com/kubernetes-sigs/windows-gmsa)
-                              inlines the contents of the GMSA credential spec named
-                              by the GMSACredentialSpecName field.
+                            description: |-
+                              GMSACredentialSpec is where the GMSA admission webhook
+                              (https://github.com/kubernetes-sigs/windows-gmsa) inlines the contents of the
+                              GMSA credential spec named by the GMSACredentialSpecName field.
                             type: string
                           gmsaCredentialSpecName:
                             description: GMSACredentialSpecName is the name of the
                               GMSA credential spec to use.
                             type: string
                           hostProcess:
-                            description: HostProcess determines if a container should
-                              be run as a 'Host Process' container. This field is
-                              alpha-level and will only be honored by components that
-                              enable the WindowsHostProcessContainers feature flag.
-                              Setting this field without the feature flag will result
-                              in errors when validating the Pod. All of a Pod's containers
-                              must have the same effective HostProcess value (it is
-                              not allowed to have a mix of HostProcess containers
-                              and non-HostProcess containers).  In addition, if HostProcess
-                              is true then HostNetwork must also be set to true.
+                            description: |-
+                              HostProcess determines if a container should be run as a 'Host Process' container.
+                              All of a Pod's containers must have the same effective HostProcess value
+                              (it is not allowed to have a mix of HostProcess containers and non-HostProcess containers).
+                              In addition, if HostProcess is true then HostNetwork must also be set to true.
                             type: boolean
                           runAsUserName:
-                            description: The UserName in Windows to run the entrypoint
-                              of the container process. Defaults to the user specified
-                              in image metadata if unspecified. May also be set in
-                              PodSecurityContext. If set in both SecurityContext and
-                              PodSecurityContext, the value specified in SecurityContext
-                              takes precedence.
+                            description: |-
+                              The UserName in Windows to run the entrypoint of the container process.
+                              Defaults to the user specified in image metadata if unspecified.
+                              May also be set in PodSecurityContext. If set in both SecurityContext and
+                              PodSecurityContext, the value specified in SecurityContext takes precedence.
                             type: string
                         type: object
                     type: object
@@ -12205,43 +15105,43 @@ spec:
                     additionalProperties:
                       type: string
                     type: object
+                  startupConfigMap:
+                    type: string
                   tolerations:
                     items:
-                      description: The pod this Toleration is attached to tolerates
-                        any taint that matches the triple <key,value,effect> using
-                        the matching operator <operator>.
+                      description: |-
+                        The pod this Toleration is attached to tolerates any taint that matches
+                        the triple <key,value,effect> using the matching operator <operator>.
                       properties:
                         effect:
-                          description: Effect indicates the taint effect to match.
-                            Empty means match all taint effects. When specified, allowed
-                            values are NoSchedule, PreferNoSchedule and NoExecute.
+                          description: |-
+                            Effect indicates the taint effect to match. Empty means match all taint effects.
+                            When specified, allowed values are NoSchedule, PreferNoSchedule and NoExecute.
                           type: string
                         key:
-                          description: Key is the taint key that the toleration applies
-                            to. Empty means match all taint keys. If the key is empty,
-                            operator must be Exists; this combination means to match
-                            all values and all keys.
+                          description: |-
+                            Key is the taint key that the toleration applies to. Empty means match all taint keys.
+                            If the key is empty, operator must be Exists; this combination means to match all values and all keys.
                           type: string
                         operator:
-                          description: Operator represents a key's relationship to
-                            the value. Valid operators are Exists and Equal. Defaults
-                            to Equal. Exists is equivalent to wildcard for value,
-                            so that a pod can tolerate all taints of a particular
-                            category.
+                          description: |-
+                            Operator represents a key's relationship to the value.
+                            Valid operators are Exists and Equal. Defaults to Equal.
+                            Exists is equivalent to wildcard for value, so that a pod can
+                            tolerate all taints of a particular category.
                           type: string
                         tolerationSeconds:
-                          description: TolerationSeconds represents the period of
-                            time the toleration (which must be of effect NoExecute,
-                            otherwise this field is ignored) tolerates the taint.
-                            By default, it is not set, which means tolerate the taint
-                            forever (do not evict). Zero and negative values will
-                            be treated as 0 (evict immediately) by the system.
+                          description: |-
+                            TolerationSeconds represents the period of time the toleration (which must be
+                            of effect NoExecute, otherwise this field is ignored) tolerates the taint. By default,
+                            it is not set, which means tolerate the taint forever (do not evict). Zero and
+                            negative values will be treated as 0 (evict immediately) by the system.
                           format: int64
                           type: integer
                         value:
-                          description: Value is the taint value the toleration matches
-                            to. If the operator is Exists, the value should be empty,
-                            otherwise just a regular string.
+                          description: |-
+                            Value is the taint value the toleration matches to.
+                            If the operator is Exists, the value should be empty, otherwise just a regular string.
                           type: string
                       type: object
                     type: array
@@ -12251,16 +15151,17 @@ spec:
                         matching pods among the given topology.
                       properties:
                         labelSelector:
-                          description: LabelSelector is used to find matching pods.
-                            Pods that match this label selector are counted to determine
-                            the number of pods in their corresponding topology domain.
+                          description: |-
+                            LabelSelector is used to find matching pods.
+                            Pods that match this label selector are counted to determine the number of pods
+                            in their corresponding topology domain.
                           properties:
                             matchExpressions:
                               description: matchExpressions is a list of label selector
                                 requirements. The requirements are ANDed.
                               items:
-                                description: A label selector requirement is a selector
-                                  that contains values, a key, and an operator that
+                                description: |-
+                                  A label selector requirement is a selector that contains values, a key, and an operator that
                                   relates the key and values.
                                 properties:
                                   key:
@@ -12268,113 +15169,148 @@ spec:
                                       applies to.
                                     type: string
                                   operator:
-                                    description: operator represents a key's relationship
-                                      to a set of values. Valid operators are In,
-                                      NotIn, Exists and DoesNotExist.
+                                    description: |-
+                                      operator represents a key's relationship to a set of values.
+                                      Valid operators are In, NotIn, Exists and DoesNotExist.
                                     type: string
                                   values:
-                                    description: values is an array of string values.
-                                      If the operator is In or NotIn, the values array
-                                      must be non-empty. If the operator is Exists
-                                      or DoesNotExist, the values array must be empty.
-                                      This array is replaced during a strategic merge
-                                      patch.
+                                    description: |-
+                                      values is an array of string values. If the operator is In or NotIn,
+                                      the values array must be non-empty. If the operator is Exists or DoesNotExist,
+                                      the values array must be empty. This array is replaced during a strategic
+                                      merge patch.
                                     items:
                                       type: string
                                     type: array
+                                    x-kubernetes-list-type: atomic
                                 required:
                                 - key
                                 - operator
                                 type: object
                               type: array
+                              x-kubernetes-list-type: atomic
                             matchLabels:
                               additionalProperties:
                                 type: string
-                              description: matchLabels is a map of {key,value} pairs.
-                                A single {key,value} in the matchLabels map is equivalent
-                                to an element of matchExpressions, whose key field
-                                is "key", the operator is "In", and the values array
-                                contains only "value". The requirements are ANDed.
+                              description: |-
+                                matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
+                                map is equivalent to an element of matchExpressions, whose key field is "key", the
+                                operator is "In", and the values array contains only "value". The requirements are ANDed.
                               type: object
                           type: object
+                          x-kubernetes-map-type: atomic
+                        matchLabelKeys:
+                          description: |-
+                            MatchLabelKeys is a set of pod label keys to select the pods over which
+                            spreading will be calculated. The keys are used to lookup values from the
+                            incoming pod labels, those key-value labels are ANDed with labelSelector
+                            to select the group of existing pods over which spreading will be calculated
+                            for the incoming pod. The same key is forbidden to exist in both MatchLabelKeys and LabelSelector.
+                            MatchLabelKeys cannot be set when LabelSelector isn't set.
+                            Keys that don't exist in the incoming pod labels will
+                            be ignored. A null or empty list means only match against labelSelector.
+
+                            This is a beta field and requires the MatchLabelKeysInPodTopologySpread feature gate to be enabled (enabled by default).
+                          items:
+                            type: string
+                          type: array
+                          x-kubernetes-list-type: atomic
                         maxSkew:
-                          description: 'MaxSkew describes the degree to which pods
-                            may be unevenly distributed. When `whenUnsatisfiable=DoNotSchedule`,
-                            it is the maximum permitted difference between the number
-                            of matching pods in the target topology and the global
-                            minimum. The global minimum is the minimum number of matching
-                            pods in an eligible domain or zero if the number of eligible
-                            domains is less than MinDomains. For example, in a 3-zone
-                            cluster, MaxSkew is set to 1, and pods with the same labelSelector
-                            spread as 2/2/1: In this case, the global minimum is 1.
-                            | zone1 | zone2 | zone3 | |  P P  |  P P  |   P   | -
-                            if MaxSkew is 1, incoming pod can only be scheduled to
-                            zone3 to become 2/2/2; scheduling it onto zone1(zone2)
-                            would make the ActualSkew(3-1) on zone1(zone2) violate
-                            MaxSkew(1). - if MaxSkew is 2, incoming pod can be scheduled
-                            onto any zone. When `whenUnsatisfiable=ScheduleAnyway`,
-                            it is used to give higher precedence to topologies that
-                            satisfy it. It''s a required field. Default value is 1
-                            and 0 is not allowed.'
+                          description: |-
+                            MaxSkew describes the degree to which pods may be unevenly distributed.
+                            When `whenUnsatisfiable=DoNotSchedule`, it is the maximum permitted difference
+                            between the number of matching pods in the target topology and the global minimum.
+                            The global minimum is the minimum number of matching pods in an eligible domain
+                            or zero if the number of eligible domains is less than MinDomains.
+                            For example, in a 3-zone cluster, MaxSkew is set to 1, and pods with the same
+                            labelSelector spread as 2/2/1:
+                            In this case, the global minimum is 1.
+                            | zone1 | zone2 | zone3 |
+                            |  P P  |  P P  |   P   |
+                            - if MaxSkew is 1, incoming pod can only be scheduled to zone3 to become 2/2/2;
+                            scheduling it onto zone1(zone2) would make the ActualSkew(3-1) on zone1(zone2)
+                            violate MaxSkew(1).
+                            - if MaxSkew is 2, incoming pod can be scheduled onto any zone.
+                            When `whenUnsatisfiable=ScheduleAnyway`, it is used to give higher precedence
+                            to topologies that satisfy it.
+                            It's a required field. Default value is 1 and 0 is not allowed.
                           format: int32
                           type: integer
                         minDomains:
-                          description: "MinDomains indicates a minimum number of eligible
-                            domains. When the number of eligible domains with matching
-                            topology keys is less than minDomains, Pod Topology Spread
-                            treats \"global minimum\" as 0, and then the calculation
-                            of Skew is performed. And when the number of eligible
-                            domains with matching topology keys equals or greater
-                            than minDomains, this value has no effect on scheduling.
-                            As a result, when the number of eligible domains is less
-                            than minDomains, scheduler won't schedule more than maxSkew
-                            Pods to those domains. If value is nil, the constraint
-                            behaves as if MinDomains is equal to 1. Valid values are
-                            integers greater than 0. When value is not nil, WhenUnsatisfiable
-                            must be DoNotSchedule. \n For example, in a 3-zone cluster,
-                            MaxSkew is set to 2, MinDomains is set to 5 and pods with
-                            the same labelSelector spread as 2/2/2: | zone1 | zone2
-                            | zone3 | |  P P  |  P P  |  P P  | The number of domains
-                            is less than 5(MinDomains), so \"global minimum\" is treated
-                            as 0. In this situation, new pod with the same labelSelector
-                            cannot be scheduled, because computed skew will be 3(3
-                            - 0) if new Pod is scheduled to any of the three zones,
-                            it will violate MaxSkew. \n This is an alpha field and
-                            requires enabling MinDomainsInPodTopologySpread feature
-                            gate."
+                          description: |-
+                            MinDomains indicates a minimum number of eligible domains.
+                            When the number of eligible domains with matching topology keys is less than minDomains,
+                            Pod Topology Spread treats "global minimum" as 0, and then the calculation of Skew is performed.
+                            And when the number of eligible domains with matching topology keys equals or greater than minDomains,
+                            this value has no effect on scheduling.
+                            As a result, when the number of eligible domains is less than minDomains,
+                            scheduler won't schedule more than maxSkew Pods to those domains.
+                            If value is nil, the constraint behaves as if MinDomains is equal to 1.
+                            Valid values are integers greater than 0.
+                            When value is not nil, WhenUnsatisfiable must be DoNotSchedule.
+
+                            For example, in a 3-zone cluster, MaxSkew is set to 2, MinDomains is set to 5 and pods with the same
+                            labelSelector spread as 2/2/2:
+                            | zone1 | zone2 | zone3 |
+                            |  P P  |  P P  |  P P  |
+                            The number of domains is less than 5(MinDomains), so "global minimum" is treated as 0.
+                            In this situation, new pod with the same labelSelector cannot be scheduled,
+                            because computed skew will be 3(3 - 0) if new Pod is scheduled to any of the three zones,
+                            it will violate MaxSkew.
                           format: int32
                           type: integer
+                        nodeAffinityPolicy:
+                          description: |-
+                            NodeAffinityPolicy indicates how we will treat Pod's nodeAffinity/nodeSelector
+                            when calculating pod topology spread skew. Options are:
+                            - Honor: only nodes matching nodeAffinity/nodeSelector are included in the calculations.
+                            - Ignore: nodeAffinity/nodeSelector are ignored. All nodes are included in the calculations.
+
+                            If this value is nil, the behavior is equivalent to the Honor policy.
+                          type: string
+                        nodeTaintsPolicy:
+                          description: |-
+                            NodeTaintsPolicy indicates how we will treat node taints when calculating
+                            pod topology spread skew. Options are:
+                            - Honor: nodes without taints, along with tainted nodes for which the incoming pod
+                            has a toleration, are included.
+                            - Ignore: node taints are ignored. All nodes are included.
+
+                            If this value is nil, the behavior is equivalent to the Ignore policy.
+                          type: string
                         topologyKey:
-                          description: TopologyKey is the key of node labels. Nodes
-                            that have a label with this key and identical values are
-                            considered to be in the same topology. We consider each
-                            <key, value> as a "bucket", and try to put balanced number
-                            of pods into each bucket. We define a domain as a particular
-                            instance of a topology. Also, we define an eligible domain
-                            as a domain whose nodes match the node selector. e.g.
-                            If TopologyKey is "kubernetes.io/hostname", each Node
-                            is a domain of that topology. And, if TopologyKey is "topology.kubernetes.io/zone",
-                            each zone is a domain of that topology. It's a required
-                            field.
+                          description: |-
+                            TopologyKey is the key of node labels. Nodes that have a label with this key
+                            and identical values are considered to be in the same topology.
+                            We consider each <key, value> as a "bucket", and try to put balanced number
+                            of pods into each bucket.
+                            We define a domain as a particular instance of a topology.
+                            Also, we define an eligible domain as a domain whose nodes meet the requirements of
+                            nodeAffinityPolicy and nodeTaintsPolicy.
+                            e.g. If TopologyKey is "kubernetes.io/hostname", each Node is a domain of that topology.
+                            And, if TopologyKey is "topology.kubernetes.io/zone", each zone is a domain of that topology.
+                            It's a required field.
                           type: string
                         whenUnsatisfiable:
-                          description: 'WhenUnsatisfiable indicates how to deal with
-                            a pod if it doesn''t satisfy the spread constraint. -
-                            DoNotSchedule (default) tells the scheduler not to schedule
-                            it. - ScheduleAnyway tells the scheduler to schedule the
-                            pod in any location,   but giving higher precedence to
-                            topologies that would help reduce the   skew. A constraint
-                            is considered "Unsatisfiable" for an incoming pod if and
-                            only if every possible node assignment for that pod would
-                            violate "MaxSkew" on some topology. For example, in a
-                            3-zone cluster, MaxSkew is set to 1, and pods with the
-                            same labelSelector spread as 3/1/1: | zone1 | zone2 |
-                            zone3 | | P P P |   P   |   P   | If WhenUnsatisfiable
-                            is set to DoNotSchedule, incoming pod can only be scheduled
-                            to zone2(zone3) to become 3/2/1(3/1/2) as ActualSkew(2-1)
-                            on zone2(zone3) satisfies MaxSkew(1). In other words,
-                            the cluster can still be imbalanced, but scheduler won''t
-                            make it *more* imbalanced. It''s a required field.'
+                          description: |-
+                            WhenUnsatisfiable indicates how to deal with a pod if it doesn't satisfy
+                            the spread constraint.
+                            - DoNotSchedule (default) tells the scheduler not to schedule it.
+                            - ScheduleAnyway tells the scheduler to schedule the pod in any location,
+                              but giving higher precedence to topologies that would help reduce the
+                              skew.
+                            A constraint is considered "Unsatisfiable" for an incoming pod
+                            if and only if every possible node assignment for that pod would violate
+                            "MaxSkew" on some topology.
+                            For example, in a 3-zone cluster, MaxSkew is set to 1, and pods with the same
+                            labelSelector spread as 3/1/1:
+                            | zone1 | zone2 | zone3 |
+                            | P P P |   P   |   P   |
+                            If WhenUnsatisfiable is set to DoNotSchedule, incoming pod can only be scheduled
+                            to zone2(zone3) to become 3/2/1(3/1/2) as ActualSkew(2-1) on zone2(zone3) satisfies
+                            MaxSkew(1). In other words, the cluster can still be imbalanced, but scheduler
+                            won't make it *more* imbalanced.
+                            It's a required field.
                           type: string
                       required:
                       - maxSkew
@@ -12383,16 +15319,191 @@ spec:
                       type: object
                     type: array
                 type: object
+              tls:
+                description: |-
+                  TLSSettings configures TLS for the Redis failover cluster.
+                  When Enabled is true, exactly one of CertManager or CertificateSecret must
+                  be set. The resulting Kubernetes Secret must contain the standard cert-manager
+                  keys (tls.crt, tls.key, ca.crt) and is mounted read-only into both Redis and
+                  Sentinel pods at /tls.
+
+                  TLS is chosen when the RedisFailover is created and cannot be turned on or
+                  off afterwards. Redis replication and Sentinel cannot straddle two wire
+                  protocols: a replica restarted onto the other protocol cannot sync from the
+                  master, and Sentinels restarted onto it declare the master down and fail
+                  over to such a replica while the master still serves writes. The other
+                  fields stay mutable; a renewed certificate reaches the pods through a
+                  restart.
+                properties:
+                  authClients:
+                    description: |-
+                      AuthClients maps to the Redis tls-auth-clients directive.
+                      One of "no", "optional", "yes". Defaults to "no" — server certificate
+                      is presented but client certificates are not validated.
+                      Changing it rolls the Redis and Sentinel pods, because the directive
+                      is read from the config file once at startup.
+                    enum:
+                    - "no"
+                    - optional
+                    - "yes"
+                    type: string
+                  caCertSecretName:
+                    description: |-
+                      CACertSecretName names the Opaque Secret the operator publishes with
+                      only the CA certificate (ca.crt) extracted from the TLS material. It
+                      never contains tls.key, so RBAC can be scoped to it to let clients
+                      verify the server without exposing any private key. When TLS is
+                      enabled the operator always publishes this Secret; this field only
+                      overrides its name. Defaults to "<tls-secret-name>-ca" when empty.
+                    type: string
+                  certManager:
+                    description: |-
+                      CertManager provisions the server certificate by creating a
+                      cert-manager Certificate that references the given Issuer.
+                      Mutually exclusive with CertificateSecret.
+                    properties:
+                      duration:
+                        description: |-
+                          Duration is the requested certificate validity. Optional;
+                          cert-manager uses its own default (typically 90 days) when unset.
+                        type: string
+                      extraSANs:
+                        description: |-
+                          ExtraSANs is a list of additional Subject Alternative Names to add
+                          to the generated certificate. Entries are auto-classified: values
+                          that parse as IPv4 or IPv6 addresses become IP SANs, everything
+                          else becomes a DNS SAN. Extras are appended to — never replace —
+                          the service and per-pod SANs the operator computes, so in-cluster
+                          connectivity is preserved when extras are added.
+                        items:
+                          type: string
+                        type: array
+                      issuerRef:
+                        description: |-
+                          IssuerRef points at an Issuer or ClusterIssuer. The Name field is
+                          required. Kind defaults to "Issuer" and Group defaults to
+                          "cert-manager.io" when empty.
+                        properties:
+                          group:
+                            description: Group of the resource being referred to.
+                            type: string
+                          kind:
+                            description: Kind of the resource being referred to.
+                            type: string
+                          name:
+                            description: Name of the resource being referred to.
+                            type: string
+                        required:
+                        - name
+                        type: object
+                      privateKey:
+                        description: |-
+                          PrivateKey configures the private key algorithm, size and rotation
+                          policy. Optional; cert-manager uses RSA 2048 with rotation policy
+                          "Never" when unset.
+                        properties:
+                          algorithm:
+                            description: |-
+                              Algorithm is the private key algorithm of the corresponding private key
+                              for this certificate.
+
+                              If provided, allowed values are either `RSA`, `ECDSA` or `Ed25519`.
+                              If `algorithm` is specified and `size` is not provided,
+                              key size of 2048 will be used for `RSA` key algorithm and
+                              key size of 256 will be used for `ECDSA` key algorithm.
+                              key size is ignored when using the `Ed25519` key algorithm.
+                            enum:
+                            - RSA
+                            - ECDSA
+                            - Ed25519
+                            type: string
+                          encoding:
+                            description: |-
+                              The private key cryptography standards (PKCS) encoding for this
+                              certificate's private key to be encoded in.
+
+                              If provided, allowed values are `PKCS1` and `PKCS8` standing for PKCS#1
+                              and PKCS#8, respectively.
+                              Defaults to `PKCS1` if not specified.
+                            enum:
+                            - PKCS1
+                            - PKCS8
+                            type: string
+                          rotationPolicy:
+                            description: |-
+                              RotationPolicy controls how private keys should be regenerated when a
+                              re-issuance is being processed.
+
+                              If set to `Never`, a private key will only be generated if one does not
+                              already exist in the target `spec.secretName`. If one does exist but it
+                              does not have the correct algorithm or size, a warning will be raised
+                              to await user intervention.
+                              If set to `Always`, a private key matching the specified requirements
+                              will be generated whenever a re-issuance occurs.
+                              Default is `Always`.
+                              The default was changed from `Never` to `Always` in cert-manager >=v1.18.0.
+                              The new default can be disabled by setting the
+                              `--feature-gates=DefaultPrivateKeyRotationPolicyAlways=false` option on
+                              the controller component.
+                            enum:
+                            - Never
+                            - Always
+                            type: string
+                          size:
+                            description: |-
+                              Size is the key bit size of the corresponding private key for this certificate.
+
+                              If `algorithm` is set to `RSA`, valid values are `2048`, `4096` or `8192`,
+                              and will default to `2048` if not specified.
+                              If `algorithm` is set to `ECDSA`, valid values are `256`, `384` or `521`,
+                              and will default to `256` if not specified.
+                              If `algorithm` is set to `Ed25519`, Size is ignored.
+                              No other values are allowed.
+                            type: integer
+                        type: object
+                      renewBefore:
+                        description: |-
+                          RenewBefore is how long before expiry cert-manager should renew.
+                          Optional; cert-manager uses its own default (typically 2/3 of
+                          Duration) when unset.
+                        type: string
+                      secretName:
+                        description: |-
+                          SecretName overrides the default Secret name (rftls-<rfname>) into
+                          which cert-manager writes the issued certificate.
+                        type: string
+                    required:
+                    - issuerRef
+                    type: object
+                  certificateSecret:
+                    description: |-
+                      CertificateSecret uses an existing Secret managed outside the operator.
+                      Mutually exclusive with CertManager.
+                    properties:
+                      secretName:
+                        description: |-
+                          SecretName is the name of the Secret that contains the TLS material
+                          (tls.crt, tls.key, ca.crt).
+                        type: string
+                    required:
+                    - secretName
+                    type: object
+                  enabled:
+                    description: |-
+                      Enabled toggles TLS. Immutable after creation, together with the
+                      presence of this block: a missing block and Enabled=false are the same
+                      state. Leaving Enabled=false is the default.
+                    type: boolean
+                type: object
             type: object
+            x-kubernetes-validations:
+            - message: TLS cannot be enabled or disabled on an existing RedisFailover;
+                create a new one
+              rule: (has(self.tls) && has(self.tls.enabled) && self.tls.enabled) ==
+                (has(oldSelf.tls) && has(oldSelf.tls.enabled) && oldSelf.tls.enabled)
         required:
         - spec
         type: object
     served: true
     storage: true
     subresources: {}
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: []
-  storedVersions: []
diff --git a/packages/system/redis-operator/charts/redis-operator/templates/deployment.yaml b/packages/system/redis-operator/charts/redis-operator/templates/deployment.yaml
index 604a44e1ff..05de3847dd 100644
--- a/packages/system/redis-operator/charts/redis-operator/templates/deployment.yaml
+++ b/packages/system/redis-operator/charts/redis-operator/templates/deployment.yaml
@@ -46,6 +46,10 @@ spec:
         - {{ quote .Values.image.cli_args }}
         {{- end }}
         imagePullPolicy: {{ .Values.image.pullPolicy }}
+        {{- if .Values.extraEnvVars }}
+        env:
+          {{- toYaml .Values.extraEnvVars | nindent 10 }}
+        {{- end }}
         ports:
           - name: metrics
             containerPort: {{ .Values.container.port }}
diff --git a/packages/system/redis-operator/charts/redis-operator/templates/service-account.yaml b/packages/system/redis-operator/charts/redis-operator/templates/service-account.yaml
index fc9805b88b..8ede6b6e23 100644
--- a/packages/system/redis-operator/charts/redis-operator/templates/service-account.yaml
+++ b/packages/system/redis-operator/charts/redis-operator/templates/service-account.yaml
@@ -68,12 +68,29 @@ rules:
       - patch
       - update
       - watch
+  # Downstream TLS patch, carried as patches/rbac-tls.diff: charts/ is discarded
+  # by `make update`, so widen or narrow this through the patch, not here.
+  #
+  # Upstream v3.3.5 needs `get` alone, because the unpatched operator only reads
+  # a Secret someone else wrote. The patched operator also publishes the CA-only
+  # Secret named by spec.tls.caCertSecretName. Create, Get and Update are every
+  # Secret call the patched source makes (service/k8s/secret.go): it addresses
+  # the Secret by name, so nothing lists or watches, and nothing patches.
+  #
+  # cert-manager Certificates are deliberately not granted. The operator manages
+  # a Certificate only under spec.tls.certManager, and packages/apps/redis pins
+  # the other mode: it always sets spec.tls.certificateSecret and never
+  # certManager, so that code is unreachable as this platform ships it. Setting
+  # certManager on a RedisFailover therefore fails with a 403 until this rule
+  # gains cert-manager.io/certificates with create, get and update.
   - apiGroups:
       - ""
     resources:
       - secrets
     verbs:
-      - "get"
+      - create
+      - get
+      - update
   - apiGroups:
       - apps
     resources:
diff --git a/packages/system/redis-operator/charts/redis-operator/values.yaml b/packages/system/redis-operator/charts/redis-operator/values.yaml
index 0460a54e18..c21daa0b4a 100644
--- a/packages/system/redis-operator/charts/redis-operator/values.yaml
+++ b/packages/system/redis-operator/charts/redis-operator/values.yaml
@@ -4,7 +4,7 @@
 
 # Name of the image repository to pull the container image from.
 image:
-  repository: quay.io/spotahome/redis-operator
+  repository: ghcr.io/freshworks-oss/redis-operator
   pullPolicy: IfNotPresent
   tag: v1.3.0
   cli_args: ""
@@ -27,6 +27,9 @@ replicas: 1
 # A name in place of the chart name for `app:` labels.
 nameOverride: ""
 
+labels: {}
+  # app: redis
+
 # A name to substitute for the full names of resources.
 fullnameOverride: ""
 
@@ -50,6 +53,13 @@ service:
 container:
   port: 9710
 
+# Extra environment variables to add to the operator container, using the
+# native Kubernetes EnvVar schema, e.g.:
+# extraEnvVars:
+#   - name: FOO
+#     value: bar
+extraEnvVars: []
+
 # Container [security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container).
 # See the [API reference](https://kubernetes.io/docs/reference/kubernetes-api/workload-resources/pod-v1/#security-context-1) for details.
 securityContext:
@@ -87,12 +97,5 @@ tolerations: []
 
 affinity: {}
 
-# CRDs configuration
-crds:
-  # -- Additional CRDs annotations
-  annotations: {}
-    # argocd.argoproj.io/sync-options: Replace=true
-    # strategy.spinnaker.io/replace: 'true'
-
 priorityClassName: ""
 
diff --git a/packages/system/redis-operator/images/redis-operator/Dockerfile b/packages/system/redis-operator/images/redis-operator/Dockerfile
index d0d6b682c0..b063a6f0a7 100644
--- a/packages/system/redis-operator/images/redis-operator/Dockerfile
+++ b/packages/system/redis-operator/images/redis-operator/Dockerfile
@@ -1,20 +1,40 @@
-FROM golang:1.20 AS builder
+FROM --platform=$BUILDPLATFORM golang:1.27@sha256:3680233e3204827fbdc66088528ae6d4b3d034f51d03a99d454f6de034888244 AS builder
+ARG GOPROXY
 
-ARG VERSION=v1.3.0-rc1
+ARG VERSION=v3.3.5
 
 ARG TARGETOS
 ARG TARGETARCH
 
 WORKDIR /workspace
 
-RUN curl -sSL https://github.com/spotahome/redis-operator/archive/refs/tags/${VERSION}.tar.gz | tar -xzvf- --strip=1
+RUN curl -sSL https://github.com/freshworks-oss/redis-operator/archive/refs/tags/${VERSION}.tar.gz | tar -xzvf- --strip=1
+
+# The carried TLS patch is source only: its CRD half ships as the chart
+# patch, so the tarball's CRD and chart copies stay at v3.3.5 and the tests
+# that read them would fail instead of skipping.
+RUN rm -rf manifests charts example .github
 
 COPY patches /patches
 RUN git apply /patches/*.diff
 
+# go build never compiles a _test.go, so nothing else runs the tests of the
+# packages the patches touch. Each package is tested from its own directory:
+# that finds the module it belongs to, and an empty list runs nothing.
+# The list is read into a variable first: a for loop drops the exit status
+# of a command substitution, so a patch git cannot read would leave the list
+# empty and the step green.
+# Upstream's integration tests sit behind the integration build tag and need a
+# cluster, so go test compiles none of them; go vet with the tag type-checks
+# them in whichever of these directories they live.
+RUN files=$(git apply --numstat /patches/*.diff) || exit 1; \
+    for dir in $(printf '%s\n' "$files" | cut -f3 | grep '\.go$' | xargs -r -n1 dirname | sort -u); do \
+      (cd "$dir" && go test . && go vet -tags integration .) || exit 1; \
+    done
+
 RUN GOOS=$TARGETOS GOARCH=$TARGETARCH VERSION=$VERSION ./scripts/build.sh
 
-FROM alpine:latest
+FROM alpine:3.24@sha256:294b683cb724975bec92580e1e685676bd4b50bda910ddb8c51d4cabeaec77e6
 RUN apk --no-cache add \
   ca-certificates
 COPY --from=builder /workspace/bin/redis-operator /usr/local/bin
diff --git a/packages/system/redis-operator/images/redis-operator/patches/labels.diff b/packages/system/redis-operator/images/redis-operator/patches/labels.diff
index fe4c4254b2..fd698ba49f 100644
--- a/packages/system/redis-operator/images/redis-operator/patches/labels.diff
+++ b/packages/system/redis-operator/images/redis-operator/patches/labels.diff
@@ -4,9 +4,9 @@ index 712cc4c0..e84afc92 100644
 +++ b/service/k8s/service.go
 @@ -10,6 +10,7 @@ import (
  
- 	"github.com/spotahome/redis-operator/log"
- 	"github.com/spotahome/redis-operator/metrics"
-+	"github.com/spotahome/redis-operator/operator/redisfailover/util"
+ 	"github.com/freshworks/redis-operator/log"
+ 	"github.com/freshworks/redis-operator/metrics"
++	"github.com/freshworks/redis-operator/operator/redisfailover/util"
  )
  
  // Service the ServiceAccount service that knows how to interact with k8s to manage them
diff --git a/packages/system/redis-operator/images/redis-operator/patches/tls.diff b/packages/system/redis-operator/images/redis-operator/patches/tls.diff
new file mode 100644
index 0000000000..49bfda71c9
--- /dev/null
+++ b/packages/system/redis-operator/images/redis-operator/patches/tls.diff
@@ -0,0 +1,6500 @@
+# Downstream carry of freshworks-oss/redis-operator#85, TLS for RedisFailover
+# through cert-manager, cut from that PR's commit 2ad2ed8d1 rebased onto
+# v3.3.5. The Dockerfile applies it together with labels.diff; retire it when a
+# release carrying #85 lands.
+#
+# One change in here is not TLS and takes effect with TLS off as well:
+# MakeSlaveOfWithPort connects to the replica on its own port rather than on
+# the master's port (service/redis/client.go). It changes a dial, not a pod
+# template, so nothing rolls when this image ships.
+#
+# spec.tls.authClients is delivered rather than merely stored: its effective
+# value is folded into the content hashed for the tls-secret-hash pod
+# annotation, so a change moves the pod template and rolls Redis through the
+# operator's roller and Sentinel through its Deployment. The operator presents
+# its own client certificate whenever the TLS Secret carries both tls.crt and
+# tls.key, independent of authClients, so neither direction of that change can
+# lock it out of the instance it is reconciling.
+#
+# The cut carries source only. The Dockerfile strips the tarball's manifests/,
+# charts/, example/ and .github/ before applying the patches, so the two
+# api/redisfailover/v1 tests that read the CRD YAML skip instead of failing
+# against v3.3.5's stale copy; the CRD half is patches/crd-tls.diff.
+diff --git a/README.md b/README.md
+index 2347937d..c9c16ad9 100644
+--- a/README.md
++++ b/README.md
+@@ -442,6 +442,26 @@ To enable auth create a secret with a password field:
+ echo -n "pass" > password
+ kubectl create secret generic redis-auth --from-file=password
+ 
++### Enabling TLS
++
++TLS is configured through `spec.tls` and is chosen when the RedisFailover is created: the API rejects any later update that turns it on or off. Redis replication and Sentinel cannot straddle two wire protocols, so a rolling change would leave replicas unable to sync from the master and Sentinels failing over to a replica that stopped replicating while the master still serves writes. To move an existing failover to TLS, or back to plaintext, create a new RedisFailover and migrate the data.
++
++Set `spec.tls.enabled: true` and exactly one certificate source: `spec.tls.certManager`, which makes the operator create a cert-manager Certificate from `issuerRef`, or `spec.tls.certificateSecret`, an existing Secret with `tls.crt`, `tls.key` and `ca.crt`. The material is mounted read-only at `/tls` in the Redis and Sentinel pods, which then listen only with TLS on their usual ports, so clients must connect with TLS and trust the CA. The operator also publishes a CA-only Secret (`<tls-secret>-ca` by default, `spec.tls.caCertSecretName` overrides it) for clients that need the CA without the private key, and `spec.tls.authClients` maps to `tls-auth-clients`. A renewed certificate rolls the pods, since Redis reads the files only at startup. The remaining `spec.tls` fields stay mutable.
++
++```yaml
++apiVersion: databases.spotahome.com/v1
++kind: RedisFailover
++metadata:
++  name: redisfailover
++spec:
++  tls:
++    enabled: true
++    certManager:
++      issuerRef:
++        name: my-issuer
++        kind: ClusterIssuer
++```
++
+ ## example config
+ apiVersion: databases.spotahome.com/v1
+ kind: RedisFailover
+diff --git a/api/redisfailover/v1/crd_tls_immutable_test.go b/api/redisfailover/v1/crd_tls_immutable_test.go
+new file mode 100644
+index 00000000..3591b366
+--- /dev/null
++++ b/api/redisfailover/v1/crd_tls_immutable_test.go
+@@ -0,0 +1,209 @@
++package v1
++
++import (
++	"bytes"
++	"context"
++	"errors"
++	"os"
++	"strings"
++	"testing"
++
++	"github.com/stretchr/testify/assert"
++	apiextensions "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions"
++	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
++	structuralschema "k8s.io/apiextensions-apiserver/pkg/apiserver/schema"
++	schemacel "k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel"
++	"k8s.io/apimachinery/pkg/util/validation/field"
++	"sigs.k8s.io/yaml"
++)
++
++// The generated CRD is committed in three places; the operator's manifest is
++// the one the generator writes, the others are copies.
++var generatedCRDPaths = []string{
++	"../../../manifests/databases.spotahome.com_redisfailovers.yaml",
++	"../../../manifests/kustomize/base/databases.spotahome.com_redisfailovers.yaml",
++	"../../../charts/redisoperator/crds/databases.spotahome.com_redisfailovers.yaml",
++}
++
++// Limits the apiserver applies per CEL expression and per object; the
++// values of PerCallLimit and RuntimeCELCostBudget in
++// k8s.io/apiserver/pkg/apis/cel.
++const (
++	celPerCallLimit  = 1_000_000
++	celPerObjectCost = 10_000_000
++)
++
++const tlsImmutableMessage = "TLS cannot be enabled or disabled on an existing RedisFailover; create a new one"
++
++// requireGeneratedCRDs skips when the tree carries none of the generated CRD
++// copies. Consumers that vendor this operator as a source-only patch take the
++// Go tree and drop manifests/ and charts/, so the files these tests read are
++// not there at all and `go test ./...` would fail for want of a fixture rather
++// than for anything about the operator. A tree holding some of the copies but
++// not the others is a different matter: they are written together and are
++// expected to travel together, so a partial set stays a failure.
++func requireGeneratedCRDs(t *testing.T) {
++	t.Helper()
++	var missing []string
++	for _, path := range generatedCRDPaths {
++		if _, err := os.Stat(path); errors.Is(err, os.ErrNotExist) {
++			missing = append(missing, path)
++		}
++	}
++	if len(missing) == len(generatedCRDPaths) {
++		t.Skipf("no generated CRD in this tree (absent: %s); nothing to validate when the operator is vendored as source only",
++			strings.Join(missing, ", "))
++	}
++}
++
++// generatedCRDValidator compiles the x-kubernetes-validations of the
++// committed CRD, so the assertions below run against the schema the
++// apiserver enforces rather than against a copy of the rule.
++func generatedCRDValidator(t *testing.T) *schemacel.Validator {
++	t.Helper()
++	raw, err := os.ReadFile(generatedCRDPaths[0])
++	if err != nil {
++		t.Fatalf("reading the generated CRD: %v", err)
++	}
++	var crd apiextensionsv1.CustomResourceDefinition
++	if err := yaml.Unmarshal(raw, &crd); err != nil {
++		t.Fatalf("decoding the generated CRD: %v", err)
++	}
++	var openAPI *apiextensionsv1.JSONSchemaProps
++	for _, version := range crd.Spec.Versions {
++		if version.Name == "v1" && version.Schema != nil {
++			openAPI = version.Schema.OpenAPIV3Schema
++		}
++	}
++	if openAPI == nil {
++		t.Fatal("the generated CRD carries no v1 schema")
++	}
++	var internal apiextensions.JSONSchemaProps
++	if err := apiextensionsv1.Convert_v1_JSONSchemaProps_To_apiextensions_JSONSchemaProps(openAPI, &internal, nil); err != nil {
++		t.Fatalf("converting the schema: %v", err)
++	}
++	structural, err := structuralschema.NewStructural(&internal)
++	if err != nil {
++		t.Fatalf("building the structural schema: %v", err)
++	}
++	validator := schemacel.NewValidator(structural, true, celPerCallLimit)
++	if validator == nil {
++		t.Fatal("the generated CRD carries no x-kubernetes-validations rules")
++	}
++	return validator
++}
++
++// redisFailoverObject is a RedisFailover as the apiserver sees it. A nil
++// tls leaves spec.tls absent, which is how a plaintext failover is written.
++func redisFailoverObject(tls map[string]interface{}) map[string]interface{} {
++	spec := map[string]interface{}{
++		"redis":    map[string]interface{}{"replicas": int64(3)},
++		"sentinel": map[string]interface{}{"replicas": int64(3)},
++	}
++	if tls != nil {
++		spec["tls"] = tls
++	}
++	return map[string]interface{}{
++		"apiVersion": "databases.spotahome.com/v1",
++		"kind":       "RedisFailover",
++		"metadata":   map[string]interface{}{"name": "rf", "namespace": "default"},
++		"spec":       spec,
++	}
++}
++
++func tlsBlock(enabled bool, extraSANs ...string) map[string]interface{} {
++	certManager := map[string]interface{}{
++		"issuerRef": map[string]interface{}{"name": "issuer"},
++	}
++	if len(extraSANs) > 0 {
++		sans := make([]interface{}, 0, len(extraSANs))
++		for _, san := range extraSANs {
++			sans = append(sans, san)
++		}
++		certManager["extraSANs"] = sans
++	}
++	block := map[string]interface{}{"certManager": certManager}
++	if enabled {
++		block["enabled"] = true
++	}
++	return block
++}
++
++func validateTransition(t *testing.T, validator *schemacel.Validator, obj, oldObj map[string]interface{}) field.ErrorList {
++	t.Helper()
++	var old interface{}
++	if oldObj != nil {
++		old = oldObj
++	}
++	errs, _ := validator.Validate(context.Background(), nil, nil, obj, old, celPerObjectCost)
++	return errs
++}
++
++func assertTLSImmutableError(t *testing.T, errs field.ErrorList) {
++	t.Helper()
++	if !assert.Len(t, errs, 1) {
++		return
++	}
++	assert.Equal(t, "spec", errs[0].Field)
++	assert.Contains(t, errs[0].Detail, tlsImmutableMessage)
++}
++
++func TestGeneratedCRDRejectsTurningTLSOnOrOff(t *testing.T) {
++	requireGeneratedCRDs(t)
++	validator := generatedCRDValidator(t)
++
++	t.Run("create with tls is accepted", func(t *testing.T) {
++		assert.Empty(t, validateTransition(t, validator, redisFailoverObject(tlsBlock(true)), nil))
++	})
++
++	t.Run("create without tls is accepted", func(t *testing.T) {
++		assert.Empty(t, validateTransition(t, validator, redisFailoverObject(nil), nil))
++	})
++
++	t.Run("absent to enabled is rejected", func(t *testing.T) {
++		assertTLSImmutableError(t, validateTransition(t, validator, redisFailoverObject(tlsBlock(true)), redisFailoverObject(nil)))
++	})
++
++	t.Run("enabled to absent is rejected", func(t *testing.T) {
++		assertTLSImmutableError(t, validateTransition(t, validator, redisFailoverObject(nil), redisFailoverObject(tlsBlock(true))))
++	})
++
++	t.Run("enabled to disabled in place is rejected", func(t *testing.T) {
++		assertTLSImmutableError(t, validateTransition(t, validator, redisFailoverObject(tlsBlock(false)), redisFailoverObject(tlsBlock(true))))
++	})
++
++	t.Run("disabled to enabled in place is rejected", func(t *testing.T) {
++		assertTLSImmutableError(t, validateTransition(t, validator, redisFailoverObject(tlsBlock(true)), redisFailoverObject(tlsBlock(false))))
++	})
++
++	t.Run("adding a disabled block to a plaintext failover is accepted", func(t *testing.T) {
++		assert.Empty(t, validateTransition(t, validator, redisFailoverObject(tlsBlock(false)), redisFailoverObject(nil)))
++	})
++
++	t.Run("changing extraSANs with tls on is accepted", func(t *testing.T) {
++		assert.Empty(t, validateTransition(t, validator, redisFailoverObject(tlsBlock(true, "redis.example.com")), redisFailoverObject(tlsBlock(true))))
++	})
++
++	t.Run("changing authClients with tls on is accepted", func(t *testing.T) {
++		updated := tlsBlock(true)
++		updated["authClients"] = "yes"
++		assert.Empty(t, validateTransition(t, validator, redisFailoverObject(updated), redisFailoverObject(tlsBlock(true))))
++	})
++}
++
++// The generator writes one file and the other two are copies; a copy that
++// falls behind ships a different schema to chart and kustomize users.
++func TestGeneratedCRDCopiesAreIdentical(t *testing.T) {
++	requireGeneratedCRDs(t)
++	reference, err := os.ReadFile(generatedCRDPaths[0])
++	if err != nil {
++		t.Fatalf("reading %s: %v", generatedCRDPaths[0], err)
++	}
++	for _, path := range generatedCRDPaths[1:] {
++		copyContent, err := os.ReadFile(path)
++		if err != nil {
++			t.Fatalf("reading %s: %v", path, err)
++		}
++		assert.True(t, bytes.Equal(reference, copyContent), "%s differs from %s", path, generatedCRDPaths[0])
++	}
++}
+diff --git a/api/redisfailover/v1/defaults.go b/api/redisfailover/v1/defaults.go
+index d6729a6e..2634e51f 100644
+--- a/api/redisfailover/v1/defaults.go
++++ b/api/redisfailover/v1/defaults.go
+@@ -9,6 +9,10 @@ const (
+ 	defaultValkeyImage              = "valkey/valkey:7.2.11-alpine"
+ 	defaultRedisPort                = 6379
+ 	defaultReservedPodMemoryPercent = 10
++
++	defaultTLSAuthClients   = TLSAuthClientsNo
++	defaultCertManagerGroup = "cert-manager.io"
++	defaultCertManagerKind  = "Issuer"
+ )
+ 
+ var (
+diff --git a/api/redisfailover/v1/tls.go b/api/redisfailover/v1/tls.go
+new file mode 100644
+index 00000000..fd4dc10e
+--- /dev/null
++++ b/api/redisfailover/v1/tls.go
+@@ -0,0 +1,32 @@
++package v1
++
++import "fmt"
++
++// generatedTLSSecretNameFormat is the Secret name the operator generates for
++// cert-manager-managed TLS material when the spec pins no name of its own.
++// It must stay in sync with the operator's name helpers.
++const generatedTLSSecretNameFormat = "rftls-%s"
++
++// TLSSecretName returns the name of the Secret that holds the cluster's TLS
++// material (tls.crt, tls.key, ca.crt). It honors an explicit override when
++// set; otherwise it derives from the failover name.
++//
++// Precedence:
++//  1. spec.tls.certificateSecret.secretName (bring-your-own-secret mode)
++//  2. spec.tls.certManager.secretName       (cert-manager override)
++//  3. <generated default>                   (cert-manager managed)
++//
++// Returns the empty string when TLS is disabled or unconfigured.
++func (r *RedisFailover) TLSSecretName() string {
++	tls := r.Spec.TLS
++	if tls == nil || !tls.Enabled {
++		return ""
++	}
++	if tls.CertificateSecret != nil && tls.CertificateSecret.SecretName != "" {
++		return tls.CertificateSecret.SecretName
++	}
++	if tls.CertManager != nil && tls.CertManager.SecretName != "" {
++		return tls.CertManager.SecretName
++	}
++	return fmt.Sprintf(generatedTLSSecretNameFormat, r.Name)
++}
+diff --git a/api/redisfailover/v1/types.go b/api/redisfailover/v1/types.go
+index 45e9b72b..237b79ab 100644
+--- a/api/redisfailover/v1/types.go
++++ b/api/redisfailover/v1/types.go
+@@ -1,6 +1,8 @@
+ package v1
+ 
+ import (
++	cmapi "github.com/cert-manager/cert-manager/pkg/apis/certmanager/v1"
++	cmmeta "github.com/cert-manager/cert-manager/pkg/apis/meta/v1"
+ 	corev1 "k8s.io/api/core/v1"
+ 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+ )
+@@ -31,6 +33,7 @@ type RedisFailover struct {
+ }
+ 
+ // RedisFailoverSpec represents a Redis failover spec
++// +kubebuilder:validation:XValidation:rule="(has(self.tls) && has(self.tls.enabled) && self.tls.enabled) == (has(oldSelf.tls) && has(oldSelf.tls.enabled) && oldSelf.tls.enabled)",message="TLS cannot be enabled or disabled on an existing RedisFailover; create a new one"
+ type RedisFailoverSpec struct {
+ 	// Engine selects Redis or Valkey. Omitted or empty means Redis (historical behavior).
+ 	// +optional
+@@ -41,6 +44,105 @@ type RedisFailoverSpec struct {
+ 	Auth           AuthSettings       `json:"auth,omitempty"`
+ 	LabelWhitelist []string           `json:"labelWhitelist,omitempty"`
+ 	BootstrapNode  *BootstrapSettings `json:"bootstrapNode,omitempty"`
++	TLS            *TLSSettings       `json:"tls,omitempty"`
++}
++
++// TLS auth-clients values map directly to Redis tls-auth-clients directive.
++const (
++	TLSAuthClientsNo       = "no"
++	TLSAuthClientsOptional = "optional"
++	TLSAuthClientsYes      = "yes"
++)
++
++// TLSSettings configures TLS for the Redis failover cluster.
++// When Enabled is true, exactly one of CertManager or CertificateSecret must
++// be set. The resulting Kubernetes Secret must contain the standard cert-manager
++// keys (tls.crt, tls.key, ca.crt) and is mounted read-only into both Redis and
++// Sentinel pods at /tls.
++//
++// TLS is chosen when the RedisFailover is created and cannot be turned on or
++// off afterwards. Redis replication and Sentinel cannot straddle two wire
++// protocols: a replica restarted onto the other protocol cannot sync from the
++// master, and Sentinels restarted onto it declare the master down and fail
++// over to such a replica while the master still serves writes. The other
++// fields stay mutable; a renewed certificate reaches the pods through a
++// restart.
++type TLSSettings struct {
++	// Enabled toggles TLS. Immutable after creation, together with the
++	// presence of this block: a missing block and Enabled=false are the same
++	// state. Leaving Enabled=false is the default.
++	Enabled bool `json:"enabled,omitempty"`
++
++	// AuthClients maps to the Redis tls-auth-clients directive.
++	// One of "no", "optional", "yes". Defaults to "no" — server certificate
++	// is presented but client certificates are not validated.
++	// Changing it rolls the Redis and Sentinel pods, because the directive
++	// is read from the config file once at startup.
++	// +kubebuilder:validation:Enum=no;optional;yes
++	AuthClients string `json:"authClients,omitempty"`
++
++	// CertManager provisions the server certificate by creating a
++	// cert-manager Certificate that references the given Issuer.
++	// Mutually exclusive with CertificateSecret.
++	CertManager *CertManagerSettings `json:"certManager,omitempty"`
++
++	// CertificateSecret uses an existing Secret managed outside the operator.
++	// Mutually exclusive with CertManager.
++	CertificateSecret *LocalSecretReference `json:"certificateSecret,omitempty"`
++
++	// CACertSecretName names the Opaque Secret the operator publishes with
++	// only the CA certificate (ca.crt) extracted from the TLS material. It
++	// never contains tls.key, so RBAC can be scoped to it to let clients
++	// verify the server without exposing any private key. When TLS is
++	// enabled the operator always publishes this Secret; this field only
++	// overrides its name. Defaults to "<tls-secret-name>-ca" when empty.
++	CACertSecretName string `json:"caCertSecretName,omitempty"`
++}
++
++// CertManagerSettings drives creation of a cert-manager Certificate.
++// The operator generates DNS SANs for the headless redis service, the
++// per-pod headless DNS names, the redis master/slave services and the
++// sentinel service. IP SANs are not used because pod IPs are unstable.
++type CertManagerSettings struct {
++	// IssuerRef points at an Issuer or ClusterIssuer. The Name field is
++	// required. Kind defaults to "Issuer" and Group defaults to
++	// "cert-manager.io" when empty.
++	IssuerRef cmmeta.ObjectReference `json:"issuerRef"`
++
++	// SecretName overrides the default Secret name (rftls-<rfname>) into
++	// which cert-manager writes the issued certificate.
++	SecretName string `json:"secretName,omitempty"`
++
++	// Duration is the requested certificate validity. Optional;
++	// cert-manager uses its own default (typically 90 days) when unset.
++	Duration *metav1.Duration `json:"duration,omitempty"`
++
++	// RenewBefore is how long before expiry cert-manager should renew.
++	// Optional; cert-manager uses its own default (typically 2/3 of
++	// Duration) when unset.
++	RenewBefore *metav1.Duration `json:"renewBefore,omitempty"`
++
++	// PrivateKey configures the private key algorithm, size and rotation
++	// policy. Optional; cert-manager uses RSA 2048 with rotation policy
++	// "Never" when unset.
++	PrivateKey *cmapi.CertificatePrivateKey `json:"privateKey,omitempty"`
++
++	// ExtraSANs is a list of additional Subject Alternative Names to add
++	// to the generated certificate. Entries are auto-classified: values
++	// that parse as IPv4 or IPv6 addresses become IP SANs, everything
++	// else becomes a DNS SAN. Extras are appended to — never replace —
++	// the service and per-pod SANs the operator computes, so in-cluster
++	// connectivity is preserved when extras are added.
++	// +optional
++	ExtraSANs []string `json:"extraSANs,omitempty"`
++}
++
++// LocalSecretReference points at a Secret in the same namespace as the
++// owning RedisFailover.
++type LocalSecretReference struct {
++	// SecretName is the name of the Secret that contains the TLS material
++	// (tls.crt, tls.key, ca.crt).
++	SecretName string `json:"secretName"`
+ }
+ 
+ // RedisCommandRename defines the specification of a "rename-command" configuration option
+diff --git a/api/redisfailover/v1/validate.go b/api/redisfailover/v1/validate.go
+index d60285b0..cd913de9 100644
+--- a/api/redisfailover/v1/validate.go
++++ b/api/redisfailover/v1/validate.go
+@@ -76,6 +76,66 @@ func (r *RedisFailover) Validate() error {
+ 		r.Spec.Sentinel.CustomConfig = defaultSentinelCustomConfig
+ 	}
+ 
++	if err := r.validateTLS(); err != nil {
++		return err
++	}
++
++	return nil
++}
++
++// validateTLS enforces the TLSSettings invariants and applies defaults.
++// Returns nil when TLS is disabled or unset.
++func (r *RedisFailover) validateTLS() error {
++	tls := r.Spec.TLS
++	if tls == nil || !tls.Enabled {
++		return nil
++	}
++
++	switch tls.AuthClients {
++	case "":
++		tls.AuthClients = defaultTLSAuthClients
++	case TLSAuthClientsNo, TLSAuthClientsOptional, TLSAuthClientsYes:
++		// ok
++	default:
++		return fmt.Errorf("tls.authClients must be one of %q, %q, %q (got %q)",
++			TLSAuthClientsNo, TLSAuthClientsOptional, TLSAuthClientsYes, tls.AuthClients)
++	}
++
++	cmSet := tls.CertManager != nil
++	secretSet := tls.CertificateSecret != nil
++
++	switch {
++	case cmSet && secretSet:
++		return errors.New("tls.certManager and tls.certificateSecret are mutually exclusive")
++	case !cmSet && !secretSet:
++		return errors.New("tls.enabled is true but neither tls.certManager nor tls.certificateSecret is set")
++	}
++
++	if cmSet {
++		if tls.CertManager.IssuerRef.Name == "" {
++			return errors.New("tls.certManager.issuerRef.name is required")
++		}
++		if tls.CertManager.IssuerRef.Group == "" {
++			tls.CertManager.IssuerRef.Group = defaultCertManagerGroup
++		}
++		if tls.CertManager.IssuerRef.Kind == "" {
++			tls.CertManager.IssuerRef.Kind = defaultCertManagerKind
++		}
++	}
++
++	if secretSet && tls.CertificateSecret.SecretName == "" {
++		return errors.New("tls.certificateSecret.secretName is required")
++	}
++
++	// The operator writes the CA-only Secret unconditionally. Pointing it at
++	// the Secret that carries the certificate and key would replace that
++	// material with a Secret holding nothing but ca.crt, leaving the cluster
++	// without a serving certificate.
++	if tls.CACertSecretName != "" && tls.CACertSecretName == r.TLSSecretName() {
++		return fmt.Errorf("tls.caCertSecretName %q must differ from the Secret holding the certificate and key, "+
++			"otherwise the CA-only Secret the operator publishes overwrites it", tls.CACertSecretName)
++	}
++
+ 	return nil
+ }
+ 
+diff --git a/api/redisfailover/v1/validate_tls_test.go b/api/redisfailover/v1/validate_tls_test.go
+new file mode 100644
+index 00000000..6f865168
+--- /dev/null
++++ b/api/redisfailover/v1/validate_tls_test.go
+@@ -0,0 +1,181 @@
++package v1
++
++import (
++	"testing"
++
++	cmmeta "github.com/cert-manager/cert-manager/pkg/apis/meta/v1"
++	"github.com/stretchr/testify/assert"
++)
++
++func TestValidateTLS(t *testing.T) {
++	tests := []struct {
++		name              string
++		tls               *TLSSettings
++		expectedError     string
++		expectedAuth      string
++		expectedIssuerKnd string
++		expectedIssuerGrp string
++	}{
++		{
++			name: "nil TLS is allowed",
++			tls:  nil,
++		},
++		{
++			name: "disabled TLS skips validation even with garbage",
++			tls: &TLSSettings{
++				Enabled:     false,
++				AuthClients: "garbage",
++			},
++		},
++		{
++			name: "enabled without provider rejected",
++			tls: &TLSSettings{
++				Enabled: true,
++			},
++			expectedError: "neither tls.certManager nor tls.certificateSecret is set",
++		},
++		{
++			name: "both providers rejected",
++			tls: &TLSSettings{
++				Enabled: true,
++				CertManager: &CertManagerSettings{
++					IssuerRef: cmmeta.ObjectReference{Name: "ca"},
++				},
++				CertificateSecret: &LocalSecretReference{SecretName: "tls"},
++			},
++			expectedError: "mutually exclusive",
++		},
++		{
++			name: "certManager without issuerRef name rejected",
++			tls: &TLSSettings{
++				Enabled:     true,
++				CertManager: &CertManagerSettings{},
++			},
++			expectedError: "tls.certManager.issuerRef.name is required",
++		},
++		{
++			name: "certManager defaults kind and group",
++			tls: &TLSSettings{
++				Enabled: true,
++				CertManager: &CertManagerSettings{
++					IssuerRef: cmmeta.ObjectReference{Name: "my-ca"},
++				},
++			},
++			expectedAuth:      TLSAuthClientsNo,
++			expectedIssuerKnd: "Issuer",
++			expectedIssuerGrp: "cert-manager.io",
++		},
++		{
++			name: "certManager preserves explicit kind and group",
++			tls: &TLSSettings{
++				Enabled: true,
++				CertManager: &CertManagerSettings{
++					IssuerRef: cmmeta.ObjectReference{
++						Name:  "my-ca",
++						Kind:  "ClusterIssuer",
++						Group: "example.com",
++					},
++				},
++			},
++			expectedAuth:      TLSAuthClientsNo,
++			expectedIssuerKnd: "ClusterIssuer",
++			expectedIssuerGrp: "example.com",
++		},
++		{
++			name: "certificateSecret without secretName rejected",
++			tls: &TLSSettings{
++				Enabled:           true,
++				CertificateSecret: &LocalSecretReference{},
++			},
++			expectedError: "tls.certificateSecret.secretName is required",
++		},
++		{
++			name: "invalid authClients rejected",
++			tls: &TLSSettings{
++				Enabled:           true,
++				AuthClients:       "maybe",
++				CertificateSecret: &LocalSecretReference{SecretName: "tls"},
++			},
++			expectedError: "tls.authClients must be one of",
++		},
++		{
++			name: "authClients yes is accepted",
++			tls: &TLSSettings{
++				Enabled:           true,
++				AuthClients:       TLSAuthClientsYes,
++				CertificateSecret: &LocalSecretReference{SecretName: "tls"},
++			},
++			expectedAuth: TLSAuthClientsYes,
++		},
++		{
++			name: "caCertSecretName equal to the bring-your-own secret rejected",
++			tls: &TLSSettings{
++				Enabled:           true,
++				CertificateSecret: &LocalSecretReference{SecretName: "my-tls"},
++				CACertSecretName:  "my-tls",
++			},
++			expectedError: `tls.caCertSecretName "my-tls" must differ from the Secret holding the certificate and key`,
++		},
++		{
++			name: "caCertSecretName equal to the certManager secretName rejected",
++			tls: &TLSSettings{
++				Enabled: true,
++				CertManager: &CertManagerSettings{
++					IssuerRef:  cmmeta.ObjectReference{Name: "my-ca"},
++					SecretName: "cm-tls",
++				},
++				CACertSecretName: "cm-tls",
++			},
++			expectedError: `tls.caCertSecretName "cm-tls" must differ from the Secret holding the certificate and key`,
++		},
++		{
++			name: "caCertSecretName equal to the generated certManager secret rejected",
++			tls: &TLSSettings{
++				Enabled: true,
++				CertManager: &CertManagerSettings{
++					IssuerRef: cmmeta.ObjectReference{Name: "my-ca"},
++				},
++				CACertSecretName: "rftls-test-tls",
++			},
++			expectedError: `tls.caCertSecretName "rftls-test-tls" must differ from the Secret holding the certificate and key`,
++		},
++		{
++			name: "caCertSecretName distinct from the TLS secret is accepted",
++			tls: &TLSSettings{
++				Enabled:           true,
++				CertificateSecret: &LocalSecretReference{SecretName: "my-tls"},
++				CACertSecretName:  "my-tls-ca",
++			},
++			expectedAuth: TLSAuthClientsNo,
++		},
++	}
++
++	for _, test := range tests {
++		t.Run(test.name, func(t *testing.T) {
++			a := assert.New(t)
++			rf := generateRedisFailover("test-tls", nil)
++			rf.Spec.TLS = test.tls
++
++			err := rf.Validate()
++
++			if test.expectedError != "" {
++				if a.Error(err) {
++					a.Contains(err.Error(), test.expectedError)
++				}
++				return
++			}
++
++			if !a.NoError(err) {
++				return
++			}
++			if test.tls == nil || !test.tls.Enabled {
++				return
++			}
++			a.Equal(test.expectedAuth, rf.Spec.TLS.AuthClients)
++			if test.tls.CertManager != nil {
++				a.Equal(test.expectedIssuerKnd, rf.Spec.TLS.CertManager.IssuerRef.Kind)
++				a.Equal(test.expectedIssuerGrp, rf.Spec.TLS.CertManager.IssuerRef.Group)
++			}
++		})
++	}
++}
+diff --git a/api/redisfailover/v1/zz_generated.deepcopy.go b/api/redisfailover/v1/zz_generated.deepcopy.go
+index acc8b900..b7b75e33 100644
+--- a/api/redisfailover/v1/zz_generated.deepcopy.go
++++ b/api/redisfailover/v1/zz_generated.deepcopy.go
+@@ -6,7 +6,9 @@
+ package v1
+ 
+ import (
++	certmanagerv1 "github.com/cert-manager/cert-manager/pkg/apis/certmanager/v1"
+ 	corev1 "k8s.io/api/core/v1"
++	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+ 	runtime "k8s.io/apimachinery/pkg/runtime"
+ )
+ 
+@@ -42,6 +44,43 @@ func (in *BootstrapSettings) DeepCopy() *BootstrapSettings {
+ 	return out
+ }
+ 
++// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
++func (in *CertManagerSettings) DeepCopyInto(out *CertManagerSettings) {
++	*out = *in
++	out.IssuerRef = in.IssuerRef
++	if in.Duration != nil {
++		in, out := &in.Duration, &out.Duration
++		*out = new(metav1.Duration)
++		**out = **in
++	}
++	if in.RenewBefore != nil {
++		in, out := &in.RenewBefore, &out.RenewBefore
++		*out = new(metav1.Duration)
++		**out = **in
++	}
++	if in.PrivateKey != nil {
++		in, out := &in.PrivateKey, &out.PrivateKey
++		*out = new(certmanagerv1.CertificatePrivateKey)
++		**out = **in
++	}
++	if in.ExtraSANs != nil {
++		in, out := &in.ExtraSANs, &out.ExtraSANs
++		*out = make([]string, len(*in))
++		copy(*out, *in)
++	}
++	return
++}
++
++// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CertManagerSettings.
++func (in *CertManagerSettings) DeepCopy() *CertManagerSettings {
++	if in == nil {
++		return nil
++	}
++	out := new(CertManagerSettings)
++	in.DeepCopyInto(out)
++	return out
++}
++
+ // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+ func (in *EmbeddedObjectMetadata) DeepCopyInto(out *EmbeddedObjectMetadata) {
+ 	*out = *in
+@@ -130,6 +169,22 @@ func (in *Exporter) DeepCopy() *Exporter {
+ 	return out
+ }
+ 
++// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
++func (in *LocalSecretReference) DeepCopyInto(out *LocalSecretReference) {
++	*out = *in
++	return
++}
++
++// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new LocalSecretReference.
++func (in *LocalSecretReference) DeepCopy() *LocalSecretReference {
++	if in == nil {
++		return nil
++	}
++	out := new(LocalSecretReference)
++	in.DeepCopyInto(out)
++	return out
++}
++
+ // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+ func (in *RedisCommandRename) DeepCopyInto(out *RedisCommandRename) {
+ 	*out = *in
+@@ -222,6 +277,11 @@ func (in *RedisFailoverSpec) DeepCopyInto(out *RedisFailoverSpec) {
+ 		*out = new(BootstrapSettings)
+ 		**out = **in
+ 	}
++	if in.TLS != nil {
++		in, out := &in.TLS, &out.TLS
++		*out = new(TLSSettings)
++		(*in).DeepCopyInto(*out)
++	}
+ 	return
+ }
+ 
+@@ -540,3 +600,29 @@ func (in *SentinelSettings) DeepCopy() *SentinelSettings {
+ 	in.DeepCopyInto(out)
+ 	return out
+ }
++
++// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
++func (in *TLSSettings) DeepCopyInto(out *TLSSettings) {
++	*out = *in
++	if in.CertManager != nil {
++		in, out := &in.CertManager, &out.CertManager
++		*out = new(CertManagerSettings)
++		(*in).DeepCopyInto(*out)
++	}
++	if in.CertificateSecret != nil {
++		in, out := &in.CertificateSecret, &out.CertificateSecret
++		*out = new(LocalSecretReference)
++		**out = **in
++	}
++	return
++}
++
++// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new TLSSettings.
++func (in *TLSSettings) DeepCopy() *TLSSettings {
++	if in == nil {
++		return nil
++	}
++	out := new(TLSSettings)
++	in.DeepCopyInto(out)
++	return out
++}
+diff --git a/cmd/redisoperator/main.go b/cmd/redisoperator/main.go
+index c98d9071..c0d58cc8 100644
+--- a/cmd/redisoperator/main.go
++++ b/cmd/redisoperator/main.go
+@@ -73,13 +73,13 @@ func (m *Main) Run() error {
+ 	}()
+ 
+ 	// Kubernetes clients.
+-	k8sClient, customClient, aeClientset, err := utils.CreateKubernetesClients(m.flags)
++	k8sClient, customClient, aeClientset, cmClient, err := utils.CreateKubernetesClients(m.flags)
+ 	if err != nil {
+ 		return err
+ 	}
+ 
+ 	// Create kubernetes service.
+-	k8sservice := k8s.New(k8sClient, customClient, aeClientset, m.logger, metricsRecorder)
++	k8sservice := k8s.New(k8sClient, customClient, aeClientset, cmClient, m.logger, metricsRecorder)
+ 
+ 	// Create the redis clients
+ 	redisClient := redis.New(metricsRecorder)
+diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
+index b28e66b9..fb7f2647 100644
+--- a/cmd/utils/flags.go
++++ b/cmd/utils/flags.go
+@@ -22,6 +22,7 @@ type CMDFlags struct {
+ 	K8sQueriesBurstable      int
+ 	Concurrency              int
+ 	LogLevel                 string
++	ClusterDomain            string
+ }
+ 
+ // Init initializes and parse the flags
+@@ -39,6 +40,8 @@ func (c *CMDFlags) Init() {
+ 	// reference: https://github.com/spotahome/kooper/blob/master/controller/controller.go#L89
+ 	flag.IntVar(&c.Concurrency, "concurrency", 3, "Number of conccurent workers meant to process events")
+ 	flag.StringVar(&c.LogLevel, "log-level", "info", "set log level")
++	flag.StringVar(&c.ClusterDomain, "cluster-domain", "cluster.local",
++		"Kubernetes cluster DNS suffix used to template the cert-manager Certificate SAN list (e.g. cluster.local, cozy.local)")
+ 	// Parse flags
+ 	flag.Parse()
+ 
+@@ -54,5 +57,6 @@ func (c *CMDFlags) ToRedisOperatorConfig() redisfailover.Config {
+ 		MetricsPath:              c.MetricsPath,
+ 		Concurrency:              c.Concurrency,
+ 		SupportedNamespacesRegex: c.SupportedNamespacesRegex,
++		ClusterDomain:            c.ClusterDomain,
+ 	}
+ }
+diff --git a/cmd/utils/k8s.go b/cmd/utils/k8s.go
+index 42dda8a7..1da7743b 100644
+--- a/cmd/utils/k8s.go
++++ b/cmd/utils/k8s.go
+@@ -3,6 +3,7 @@ package utils
+ import (
+ 	"fmt"
+ 
++	cmclientset "github.com/cert-manager/cert-manager/pkg/client/clientset/versioned"
+ 	apiextensionsclientset "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
+ 	"k8s.io/client-go/kubernetes"
+ 	"k8s.io/client-go/rest"
+@@ -35,26 +36,39 @@ func LoadKubernetesConfig(flags *CMDFlags) (*rest.Config, error) {
+ 	return cfg, nil
+ }
+ 
+-// CreateKubernetesClients create the clients to connect to kubernetes
+-func CreateKubernetesClients(flags *CMDFlags) (kubernetes.Interface, redisfailoverclientset.Interface, apiextensionsclientset.Interface, error) {
++// CreateKubernetesClients creates the clients used by the operator:
++// core kubernetes, the RedisFailover CRD client, the apiextensions
++// client (for CRD installation/upgrade) and the cert-manager client
++// (used only when spec.tls.certManager is configured on a failover).
++//
++// Returning nil for the cert-manager client is not supported: cert-manager
++// types are always wired up. Cluster installations that do not have
++// cert-manager installed simply never trigger any Certificate API calls
++// because no RedisFailover opts into TLS.
++func CreateKubernetesClients(flags *CMDFlags) (kubernetes.Interface, redisfailoverclientset.Interface, apiextensionsclientset.Interface, cmclientset.Interface, error) {
+ 	config, err := LoadKubernetesConfig(flags)
+ 	if err != nil {
+-		return nil, nil, nil, err
++		return nil, nil, nil, nil, err
+ 	}
+ 
+ 	clientset, err := kubernetes.NewForConfig(config)
+ 	if err != nil {
+-		return nil, nil, nil, err
++		return nil, nil, nil, nil, err
+ 	}
+ 	customClientset, err := redisfailoverclientset.NewForConfig(config)
+ 	if err != nil {
+-		return nil, nil, nil, err
++		return nil, nil, nil, nil, err
+ 	}
+ 
+ 	aeClientset, err := apiextensionsclientset.NewForConfig(config)
+ 	if err != nil {
+-		return nil, nil, nil, err
++		return nil, nil, nil, nil, err
+ 	}
+ 
+-	return clientset, customClientset, aeClientset, nil
++	cmCli, err := cmclientset.NewForConfig(config)
++	if err != nil {
++		return nil, nil, nil, nil, err
++	}
++
++	return clientset, customClientset, aeClientset, cmCli, nil
+ }
+diff --git a/go.mod b/go.mod
+index 6c8ca0d0..33a644e2 100644
+--- a/go.mod
++++ b/go.mod
+@@ -3,62 +3,80 @@ module github.com/freshworks/redis-operator
+ go 1.26.3
+ 
+ require (
++	github.com/cert-manager/cert-manager v1.18.5
+ 	github.com/go-redis/redis/v8 v8.11.5
+ 	github.com/prometheus/client_golang v1.23.2
+ 	github.com/sirupsen/logrus v1.9.4
+ 	github.com/spotahome/kooper/v2 v2.5.0
+ 	github.com/stretchr/testify v1.11.1
+ 	k8s.io/api v0.33.2
+-	k8s.io/apiextensions-apiserver v0.28.4
++	k8s.io/apiextensions-apiserver v0.32.0
+ 	k8s.io/apimachinery v0.33.2
+ 	k8s.io/client-go v0.33.2
++	sigs.k8s.io/yaml v1.4.0
+ )
+ 
+ require (
++	cel.dev/expr v0.19.1 // indirect
++	github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
++	github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
+ 	github.com/beorn7/perks v1.0.1 // indirect
++	github.com/blang/semver/v4 v4.0.0 // indirect
+ 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
+-	github.com/davecgh/go-spew v1.1.1 // indirect
++	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
+ 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
+-	github.com/emicklei/go-restful/v3 v3.11.0 // indirect
++	github.com/emicklei/go-restful/v3 v3.12.1 // indirect
+ 	github.com/fxamacker/cbor/v2 v2.7.0 // indirect
+ 	github.com/go-logr/logr v1.4.2 // indirect
+ 	github.com/go-openapi/jsonpointer v0.21.0 // indirect
+-	github.com/go-openapi/jsonreference v0.20.2 // indirect
++	github.com/go-openapi/jsonreference v0.21.0 // indirect
+ 	github.com/go-openapi/swag v0.23.0 // indirect
+ 	github.com/gogo/protobuf v1.3.2 // indirect
++	github.com/google/cel-go v0.22.1 // indirect
+ 	github.com/google/gnostic-models v0.6.9 // indirect
+ 	github.com/google/go-cmp v0.7.0 // indirect
+ 	github.com/google/uuid v1.6.0 // indirect
++	github.com/inconshreveable/mousetrap v1.1.0 // indirect
+ 	github.com/josharian/intern v1.0.0 // indirect
+ 	github.com/json-iterator/go v1.1.12 // indirect
+-	github.com/mailru/easyjson v0.7.7 // indirect
++	github.com/mailru/easyjson v0.9.0 // indirect
+ 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+ 	github.com/modern-go/reflect2 v1.0.2 // indirect
+ 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
+ 	github.com/pkg/errors v0.9.1 // indirect
+-	github.com/pmezard/go-difflib v1.0.0 // indirect
++	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
+ 	github.com/prometheus/client_model v0.6.2 // indirect
+ 	github.com/prometheus/common v0.66.1 // indirect
+ 	github.com/prometheus/procfs v0.16.1 // indirect
++	github.com/spf13/cobra v1.8.1 // indirect
+ 	github.com/spf13/pflag v1.0.5 // indirect
++	github.com/stoewer/go-strcase v1.3.0 // indirect
+ 	github.com/stretchr/objx v0.5.2 // indirect
+ 	github.com/x448/float16 v0.8.4 // indirect
++	go.opentelemetry.io/otel v1.33.0 // indirect
++	go.opentelemetry.io/otel/trace v1.33.0 // indirect
+ 	go.yaml.in/yaml/v2 v2.4.2 // indirect
++	golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67 // indirect
+ 	golang.org/x/net v0.53.0 // indirect
+ 	golang.org/x/oauth2 v0.30.0 // indirect
++	golang.org/x/sync v0.21.0 // indirect
+ 	golang.org/x/sys v0.43.0 // indirect
+ 	golang.org/x/term v0.42.0 // indirect
+-	golang.org/x/text v0.36.0 // indirect
++	golang.org/x/text v0.39.0 // indirect
+ 	golang.org/x/time v0.9.0 // indirect
++	google.golang.org/genproto/googleapis/api v0.0.0-20241219192143-6b3ec007d9bb // indirect
++	google.golang.org/genproto/googleapis/rpc v0.0.0-20241219192143-6b3ec007d9bb // indirect
+ 	google.golang.org/protobuf v1.36.8 // indirect
+ 	gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
+ 	gopkg.in/inf.v0 v0.9.1 // indirect
+ 	gopkg.in/yaml.v3 v3.0.1 // indirect
++	k8s.io/apiserver v0.32.0 // indirect
++	k8s.io/component-base v0.32.0 // indirect
+ 	k8s.io/klog/v2 v2.130.1 // indirect
+ 	k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
+-	k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
+-	sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
++	k8s.io/utils v0.0.0-20241210054802-24370beab758 // indirect
++	sigs.k8s.io/gateway-api v1.1.0 // indirect
++	sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
+ 	sigs.k8s.io/randfill v1.0.0 // indirect
+ 	sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
+-	sigs.k8s.io/yaml v1.4.0 // indirect
+ )
+diff --git a/go.sum b/go.sum
+index 6088cfed..c3adc9e5 100644
+--- a/go.sum
++++ b/go.sum
+@@ -1,27 +1,36 @@
++cel.dev/expr v0.19.1 h1:NciYrtDRIR0lNCnH1LFJegdjspNx9fI59O7TWcua/W4=
++cel.dev/expr v0.19.1/go.mod h1:MrpN08Q+lEBs+bGYdLxxHkZoUSsCp0nSKTs0nTymJgw=
++github.com/antlr4-go/antlr/v4 v4.13.1 h1:SqQKkuVZ+zWkMMNkjy5FZe5mr5WURWnlpmOuzYWrPrQ=
++github.com/antlr4-go/antlr/v4 v4.13.1/go.mod h1:GKmUxMtwp6ZgGwZSva4eWPC5mS6vUAmOABFgjdkM7Nw=
++github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3dyBCFEj5IhUbnKptjxatkF07cF2ak3yi77so=
++github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw=
+ github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
+ github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
++github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM=
++github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ=
++github.com/cert-manager/cert-manager v1.18.5 h1:Gx4FSpSPYcSC4MQf43QjbxDfyTEbwZgfZQs5Lq9QlBs=
++github.com/cert-manager/cert-manager v1.18.5/go.mod h1:HbPSO5MW/44wu19t84eY/K4c4/WwyPB4bA3uffOH92s=
+ github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
+ github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+-github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
++github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
+ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+-github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
++github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
++github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+ github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
+ github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
+-github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxERmMY4rD+g=
+-github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
+-github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY=
+-github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw=
++github.com/emicklei/go-restful/v3 v3.12.1 h1:PJMDIM/ak7btuL8Ex0iYET9hxM3CI2sjZtzpL63nKAU=
++github.com/emicklei/go-restful/v3 v3.12.1/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
++github.com/fsnotify/fsnotify v1.8.0 h1:dAwr6QBTBZIkG8roQaJjGof0pp0EeF+tNV7YBP3F/8M=
++github.com/fsnotify/fsnotify v1.8.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
+ github.com/fxamacker/cbor/v2 v2.7.0 h1:iM5WgngdRBanHcxugY4JySA0nk1wZorNOpTgCMedv5E=
+ github.com/fxamacker/cbor/v2 v2.7.0/go.mod h1:pxXPTn3joSm21Gbwsv0w9OSA2y1HFR9qXEeXQVeNoDQ=
+ github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
+ github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
+-github.com/go-openapi/jsonpointer v0.19.6/go.mod h1:osyAmYz/mB/C3I+WsTTSgw1ONzaLJoLCyoi6/zppojs=
+ github.com/go-openapi/jsonpointer v0.21.0 h1:YgdVicSA9vH5RiHs9TZW5oyafXZFc6+2Vc1rr/O9oNQ=
+ github.com/go-openapi/jsonpointer v0.21.0/go.mod h1:IUyH9l/+uyhIYQ/PXVA41Rexl+kOkAPDdXEYns6fzUY=
+-github.com/go-openapi/jsonreference v0.20.2 h1:3sVjiK66+uXK/6oQ8xgcRKcFgQ5KXa2KvnJRumpMGbE=
+-github.com/go-openapi/jsonreference v0.20.2/go.mod h1:Bl1zwGIM8/wsvqjsOQLJ/SH+En5Ap4rVB5KVcIDZG2k=
+-github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14=
++github.com/go-openapi/jsonreference v0.21.0 h1:Rs+Y7hSXT83Jacb7kFyjn4ijOuVGSvOdF2+tg1TRrwQ=
++github.com/go-openapi/jsonreference v0.21.0/go.mod h1:LmZmgsrTkVg9LG4EaHeY8cBDslNPMo06cago5JNLkm4=
+ github.com/go-openapi/swag v0.23.0 h1:vsEVJDUo2hPJ2tu0/Xc+4noaxyEffXNIs3cOULZ+GrE=
+ github.com/go-openapi/swag v0.23.0/go.mod h1:esZ8ITTYEsH1V2trKHjAN8Ai7xHb8RV+YSZ577vPjgQ=
+ github.com/go-redis/redis/v8 v8.11.5 h1:AcZZR7igkdvfVmQTPnu9WE37LRrO/YrBH5zWyjDC0oI=
+@@ -30,16 +39,22 @@ github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1v
+ github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8=
+ github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
+ github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
++github.com/google/cel-go v0.22.1 h1:AfVXx3chM2qwoSbM7Da8g8hX8OVSkBFwX+rz2+PcK40=
++github.com/google/cel-go v0.22.1/go.mod h1:BuznPXXfQDpXKWQ9sPW3TzlAJN5zzFe+i9tIs0yC4s8=
+ github.com/google/gnostic-models v0.6.9 h1:MU/8wDLif2qCXZmzncUQ/BOfxWfthHi63KqpoNbWqVw=
+ github.com/google/gnostic-models v0.6.9/go.mod h1:CiWsm0s6BSQd1hRn8/QmxqB6BesYcbSZxsz9b0KuDBw=
+ github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+ github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
+ github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
+ github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
++github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
++github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+ github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db h1:097atOisP2aRj7vFgYQBbFN4U4JNXUNYpxael3UzMyo=
+ github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144=
+ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
+ github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
++github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
++github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
+ github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
+ github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
+ github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
+@@ -48,17 +63,14 @@ github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI
+ github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
+ github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo=
+ github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ=
+-github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
+ github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
+ github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
+-github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+-github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
+ github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
+ github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
+ github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
+-github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
+-github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
++github.com/mailru/easyjson v0.9.0 h1:PrnmzHw7262yW8sTBwxi1PdJA3Iw/EKBa8psRf7d9a4=
++github.com/mailru/easyjson v0.9.0/go.mod h1:1+xMtQp2MRNVL/V1bOzuP3aP8VNwRW55fQUto+XFtTU=
+ github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
+ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+@@ -76,8 +88,9 @@ github.com/onsi/gomega v1.35.1 h1:Cwbd75ZBPxFSuZ6T+rN/WCb/gOc6YgFBXLlZLhC7Ds4=
+ github.com/onsi/gomega v1.35.1/go.mod h1:PvZbdDc8J6XJEpDK4HCuRBm8a6Fzp9/DmhC9C7yFlog=
+ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
+ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
++github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
++github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+ github.com/prometheus/client_golang v1.23.2 h1:Je96obch5RDVy3FDMndoUsjAhG5Edi49h0RJWRi/o0o=
+ github.com/prometheus/client_golang v1.23.2/go.mod h1:Tb1a6LWHB3/SPIzCoaDXI4I8UHKeFTEQ1YCr+0Gyqmg=
+ github.com/prometheus/client_model v0.6.2 h1:oBsgwpGs7iVziMvrGhE53c/GrLUsZdHnqNwqPLxwZyk=
+@@ -88,12 +101,17 @@ github.com/prometheus/procfs v0.16.1 h1:hZ15bTNuirocR6u0JZ6BAHHmwS1p8B4P6MRqxtzM
+ github.com/prometheus/procfs v0.16.1/go.mod h1:teAbpZRB1iIAJYREa1LsoWUXykVXA1KlTmWl8x/U+Is=
+ github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
+ github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
++github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
+ github.com/sirupsen/logrus v1.9.4 h1:TsZE7l11zFCLZnZ+teH4Umoq5BhEIfIzfRDZ1Uzql2w=
+ github.com/sirupsen/logrus v1.9.4/go.mod h1:ftWc9WdOfJ0a92nsE2jF5u5ZwH8Bv2zdeOC42RjbV2g=
++github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM=
++github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y=
+ github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
+ github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+ github.com/spotahome/kooper/v2 v2.5.0 h1:7QjNhK9yscesJGFQ7LWCuypuHKLH3DubTsncHwCDV6M=
+ github.com/spotahome/kooper/v2 v2.5.0/go.mod h1:kOhD+HlG7j6t9VPGv/dOcwpG2pmkiOmx1dXQoKHuVns=
++github.com/stoewer/go-strcase v1.3.0 h1:g0eASXYtp+yvN9fK8sH94oCIk0fau9uV1/ZdJ0AVEzs=
++github.com/stoewer/go-strcase v1.3.0/go.mod h1:fAH5hQ5pehh+j3nZfvwdk2RgEgQjAoM8wodgtPmh1xo=
+ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+ github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
+ github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
+@@ -109,6 +127,10 @@ github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
+ github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
+ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
++go.opentelemetry.io/otel v1.33.0 h1:/FerN9bax5LoK51X/sI0SVYrjSE0/yUL7DpxW4K3FWw=
++go.opentelemetry.io/otel v1.33.0/go.mod h1:SUUkR6csvUQl+yjReHu5uM3EtVV7MBm5FHKRlNx4I8I=
++go.opentelemetry.io/otel/trace v1.33.0 h1:cCJuF7LRjUFso9LPnEAHJDB2pqzp+hbO8eu1qqW2d/s=
++go.opentelemetry.io/otel/trace v1.33.0/go.mod h1:uIcdVUZMpTAmz0tI1z04GoVSezK37CbGV4fr1f2nBck=
+ go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
+ go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
+ go.yaml.in/yaml/v2 v2.4.2 h1:DzmwEr2rDGHl7lsFgAHxmNz/1NlQ7xLIrlN2h5d1eGI=
+@@ -116,6 +138,8 @@ go.yaml.in/yaml/v2 v2.4.2/go.mod h1:081UH+NErpNdqlCXm3TtEran0rJZGxAYx9hb/ELlsPU=
+ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
++golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67 h1:1UoZQm6f0P/ZO0w1Ri+f+ifG/gXhegadRdwBIXEFWDo=
++golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67/go.mod h1:qj5a5QZpwLU2NLQudwIN5koi3beDhSAlJwa67PuM98c=
+ golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+ golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+@@ -129,6 +153,8 @@ golang.org/x/oauth2 v0.30.0/go.mod h1:B++QgG3ZKulg6sRPGD/mqlHQs5rB3Ml9erfeDY7xKl
+ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+ golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
++golang.org/x/sync v0.21.0 h1:HLII4xRRTtCRkxYp4HNFF0Js/Og6q2i++KXbg0gHCwM=
++golang.org/x/sync v0.21.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
+ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+ golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+@@ -138,20 +164,24 @@ golang.org/x/term v0.42.0 h1:UiKe+zDFmJobeJ5ggPwOshJIVt6/Ft0rcfrXZDLWAWY=
+ golang.org/x/term v0.42.0/go.mod h1:Dq/D+snpsbazcBG5+F9Q1n2rXV8Ma+71xEjTRufARgY=
+ golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+-golang.org/x/text v0.36.0 h1:JfKh3XmcRPqZPKevfXVpI1wXPTqbkE5f7JA92a55Yxg=
+-golang.org/x/text v0.36.0/go.mod h1:NIdBknypM8iqVmPiuco0Dh6P5Jcdk8lJL0CUebqK164=
++golang.org/x/text v0.39.0 h1:UbZz4pLOvn600D6Oh6GGEI6VAmndrEBLv8/6BEXzyus=
++golang.org/x/text v0.39.0/go.mod h1:3UwRclnC2g0TU9x8PZiyfOajCd1zaUNHF9cvqcQZ+ZM=
+ golang.org/x/time v0.9.0 h1:EsRrnYcQiGH+5FfbgvV4AP7qEZstoyrHB0DzarOQ4ZY=
+ golang.org/x/time v0.9.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
+ golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+ golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+ golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+ golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+-golang.org/x/tools v0.43.0 h1:12BdW9CeB3Z+J/I/wj34VMl8X+fEXBxVR90JeMX5E7s=
+-golang.org/x/tools v0.43.0/go.mod h1:uHkMso649BX2cZK6+RpuIPXS3ho2hZo4FVwfoy1vIk0=
++golang.org/x/tools v0.47.0 h1:7Kn5x/d1svx/PzryTsqeoZN4TZwqeH5pGWjefhLi/1Q=
++golang.org/x/tools v0.47.0/go.mod h1:dFHnyTvFWY212G+h7ZY4Vsp/K3U4/7W9TyVaAul8uCA=
+ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+ golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+ golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
++google.golang.org/genproto/googleapis/api v0.0.0-20241219192143-6b3ec007d9bb h1:B7GIB7sr443wZ/EAEl7VZjmh1V6qzkt5V+RYcUYtS1U=
++google.golang.org/genproto/googleapis/api v0.0.0-20241219192143-6b3ec007d9bb/go.mod h1:E5//3O5ZIG2l71Xnt+P/CYUY8Bxs8E7WMoZ9tlcMbAY=
++google.golang.org/genproto/googleapis/rpc v0.0.0-20241219192143-6b3ec007d9bb h1:3oy2tynMOP1QbTC0MsNNAV+Se8M2Bd0A5+x1QHyw+pI=
++google.golang.org/genproto/googleapis/rpc v0.0.0-20241219192143-6b3ec007d9bb/go.mod h1:lcTa1sDdWEIHMWlITnIczmw5w60CF9ffkb8Z+DVmmjA=
+ google.golang.org/protobuf v1.36.8 h1:xHScyCOEuuwZEc6UtSOvPbAT4zRh0xcNRYekJwfqyMc=
+ google.golang.org/protobuf v1.36.8/go.mod h1:fuxRtAxBytpl4zzqUh6/eyUujkJdNiuEkXntxiD/uRU=
+ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+@@ -168,20 +198,26 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+ gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+ k8s.io/api v0.33.2 h1:YgwIS5jKfA+BZg//OQhkJNIfie/kmRsO0BmNaVSimvY=
+ k8s.io/api v0.33.2/go.mod h1:fhrbphQJSM2cXzCWgqU29xLDuks4mu7ti9vveEnpSXs=
+-k8s.io/apiextensions-apiserver v0.28.4 h1:AZpKY/7wQ8n+ZYDtNHbAJBb+N4AXXJvyZx6ww6yAJvU=
+-k8s.io/apiextensions-apiserver v0.28.4/go.mod h1:pgQIZ1U8eJSMQcENew/0ShUTlePcSGFq6dxSxf2mwPM=
++k8s.io/apiextensions-apiserver v0.32.0 h1:S0Xlqt51qzzqjKPxfgX1xh4HBZE+p8KKBq+k2SWNOE0=
++k8s.io/apiextensions-apiserver v0.32.0/go.mod h1:86hblMvN5yxMvZrZFX2OhIHAuFIMJIZ19bTvzkP+Fmw=
+ k8s.io/apimachinery v0.33.2 h1:IHFVhqg59mb8PJWTLi8m1mAoepkUNYmptHsV+Z1m5jY=
+ k8s.io/apimachinery v0.33.2/go.mod h1:BHW0YOu7n22fFv/JkYOEfkUYNRN0fj0BlvMFWA7b+SM=
++k8s.io/apiserver v0.32.0 h1:VJ89ZvQZ8p1sLeiWdRJpRD6oLozNZD2+qVSLi+ft5Qs=
++k8s.io/apiserver v0.32.0/go.mod h1:HFh+dM1/BE/Hm4bS4nTXHVfN6Z6tFIZPi649n83b4Ag=
+ k8s.io/client-go v0.33.2 h1:z8CIcc0P581x/J1ZYf4CNzRKxRvQAwoAolYPbtQes+E=
+ k8s.io/client-go v0.33.2/go.mod h1:9mCgT4wROvL948w6f6ArJNb7yQd7QsvqavDeZHvNmHo=
++k8s.io/component-base v0.32.0 h1:d6cWHZkCiiep41ObYQS6IcgzOUQUNpywm39KVYaUqzU=
++k8s.io/component-base v0.32.0/go.mod h1:JLG2W5TUxUu5uDyKiH2R/7NnxJo1HlPoRIIbVLkK5eM=
+ k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
+ k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
+ k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff h1:/usPimJzUKKu+m+TE36gUyGcf03XZEP0ZIKgKj35LS4=
+ k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff/go.mod h1:5jIi+8yX4RIb8wk3XwBo5Pq2ccx4FP10ohkbSKCZoK8=
+-k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 h1:M3sRQVHv7vB20Xc2ybTt7ODCeFj6JSWYFzOFnYeS6Ro=
+-k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
+-sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1Ray9eB4DBr+K+/sCJ8=
+-sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3/go.mod h1:18nIHnGi6636UCz6m8i4DhaJ65T6EruyzmoQqI2BVDo=
++k8s.io/utils v0.0.0-20241210054802-24370beab758 h1:sdbE21q2nlQtFh65saZY+rRM6x6aJJI8IUa1AmH/qa0=
++k8s.io/utils v0.0.0-20241210054802-24370beab758/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
++sigs.k8s.io/gateway-api v1.1.0 h1:DsLDXCi6jR+Xz8/xd0Z1PYl2Pn0TyaFMOPPZIj4inDM=
++sigs.k8s.io/gateway-api v1.1.0/go.mod h1:ZH4lHrL2sDi0FHZ9jjneb8kKnGzFWyrTya35sWUTrRs=
++sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE=
++sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg=
+ sigs.k8s.io/randfill v0.0.0-20250304075658-069ef1bbf016/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=
+ sigs.k8s.io/randfill v1.0.0 h1:JfjMILfT8A6RbawdsK2JXGBR5AQVfd+9TbzrlneTyrU=
+ sigs.k8s.io/randfill v1.0.0/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=
+diff --git a/mocks/operator/redisfailover/service/RedisFailoverCheck.go b/mocks/operator/redisfailover/service/RedisFailoverCheck.go
+index b1b60a18..59a72119 100644
+--- a/mocks/operator/redisfailover/service/RedisFailoverCheck.go
++++ b/mocks/operator/redisfailover/service/RedisFailoverCheck.go
+@@ -135,14 +135,14 @@ func (_m *RedisFailoverCheck) GetRedisPodMemoryUsage(redisIP string, rFailover *
+ 	return r0, r1
+ }
+ 
+-// CheckSentinelMonitor provides a mock function with given fields: sentinel, masterName, monitor
+-func (_m *RedisFailoverCheck) CheckSentinelMonitor(sentinel string, masterName string, monitor ...string) error {
++// CheckSentinelMonitor provides a mock function with given fields: rFailover, sentinel, monitor
++func (_m *RedisFailoverCheck) CheckSentinelMonitor(rFailover *v1.RedisFailover, sentinel string, monitor ...string) error {
+ 	_va := make([]interface{}, len(monitor))
+ 	for _i := range monitor {
+ 		_va[_i] = monitor[_i]
+ 	}
+ 	var _ca []interface{}
+-	_ca = append(_ca, sentinel, masterName)
++	_ca = append(_ca, rFailover, sentinel)
+ 	_ca = append(_ca, _va...)
+ 	ret := _m.Called(_ca...)
+ 
+@@ -151,8 +151,8 @@ func (_m *RedisFailoverCheck) CheckSentinelMonitor(sentinel string, masterName s
+ 	}
+ 
+ 	var r0 error
+-	if rf, ok := ret.Get(0).(func(string, string, ...string) error); ok {
+-		r0 = rf(sentinel, masterName, monitor...)
++	if rf, ok := ret.Get(0).(func(*v1.RedisFailover, string, ...string) error); ok {
++		r0 = rf(rFailover, sentinel, monitor...)
+ 	} else {
+ 		r0 = ret.Error(0)
+ 	}
+diff --git a/mocks/operator/redisfailover/service/RedisFailoverClient.go b/mocks/operator/redisfailover/service/RedisFailoverClient.go
+index c05fe9d4..648dc90e 100644
+--- a/mocks/operator/redisfailover/service/RedisFailoverClient.go
++++ b/mocks/operator/redisfailover/service/RedisFailoverClient.go
+@@ -68,6 +68,29 @@ func (_m *RedisFailoverClient) EnsureRedisMasterService(rFailover *v1.RedisFailo
+ 	return r0
+ }
+ 
++// EnsureRedisCACertSecret provides a mock function with given fields: rFailover, labels, ownerRefs
++func (_m *RedisFailoverClient) EnsureRedisCACertSecret(rFailover *v1.RedisFailover, labels map[string]string, ownerRefs []metav1.OwnerReference) (string, error) {
++	ret := _m.Called(rFailover, labels, ownerRefs)
++
++	var r0 string
++	var r1 error
++	if rf, ok := ret.Get(0).(func(*v1.RedisFailover, map[string]string, []metav1.OwnerReference) (string, error)); ok {
++		return rf(rFailover, labels, ownerRefs)
++	}
++	if rf, ok := ret.Get(0).(func(*v1.RedisFailover, map[string]string, []metav1.OwnerReference) string); ok {
++		r0 = rf(rFailover, labels, ownerRefs)
++	} else {
++		r0 = ret.Get(0).(string)
++	}
++	if rf, ok := ret.Get(1).(func(*v1.RedisFailover, map[string]string, []metav1.OwnerReference) error); ok {
++		r1 = rf(rFailover, labels, ownerRefs)
++	} else {
++		r1 = ret.Error(1)
++	}
++
++	return r0, r1
++}
++
+ // EnsureRedisReadinessConfigMap provides a mock function with given fields: rFailover, labels, ownerRefs
+ func (_m *RedisFailoverClient) EnsureRedisReadinessConfigMap(rFailover *v1.RedisFailover, labels map[string]string, ownerRefs []metav1.OwnerReference) error {
+ 	ret := _m.Called(rFailover, labels, ownerRefs)
+@@ -140,17 +163,17 @@ func (_m *RedisFailoverClient) EnsureRedisSlaveService(rFailover *v1.RedisFailov
+ 	return r0
+ }
+ 
+-// EnsureRedisStatefulset provides a mock function with given fields: rFailover, labels, ownerRefs
+-func (_m *RedisFailoverClient) EnsureRedisStatefulset(rFailover *v1.RedisFailover, labels map[string]string, ownerRefs []metav1.OwnerReference) error {
+-	ret := _m.Called(rFailover, labels, ownerRefs)
++// EnsureRedisStatefulset provides a mock function with given fields: rFailover, labels, ownerRefs, tlsHash
++func (_m *RedisFailoverClient) EnsureRedisStatefulset(rFailover *v1.RedisFailover, labels map[string]string, ownerRefs []metav1.OwnerReference, tlsHash string) error {
++	ret := _m.Called(rFailover, labels, ownerRefs, tlsHash)
+ 
+ 	if len(ret) == 0 {
+ 		panic("no return value specified for EnsureRedisStatefulset")
+ 	}
+ 
+ 	var r0 error
+-	if rf, ok := ret.Get(0).(func(*v1.RedisFailover, map[string]string, []metav1.OwnerReference) error); ok {
+-		r0 = rf(rFailover, labels, ownerRefs)
++	if rf, ok := ret.Get(0).(func(*v1.RedisFailover, map[string]string, []metav1.OwnerReference, string) error); ok {
++		r0 = rf(rFailover, labels, ownerRefs, tlsHash)
+ 	} else {
+ 		r0 = ret.Error(0)
+ 	}
+@@ -176,17 +199,17 @@ func (_m *RedisFailoverClient) EnsureSentinelConfigMap(rFailover *v1.RedisFailov
+ 	return r0
+ }
+ 
+-// EnsureSentinelDeployment provides a mock function with given fields: rFailover, labels, ownerRefs
+-func (_m *RedisFailoverClient) EnsureSentinelDeployment(rFailover *v1.RedisFailover, labels map[string]string, ownerRefs []metav1.OwnerReference) error {
+-	ret := _m.Called(rFailover, labels, ownerRefs)
++// EnsureSentinelDeployment provides a mock function with given fields: rFailover, labels, ownerRefs, tlsHash
++func (_m *RedisFailoverClient) EnsureSentinelDeployment(rFailover *v1.RedisFailover, labels map[string]string, ownerRefs []metav1.OwnerReference, tlsHash string) error {
++	ret := _m.Called(rFailover, labels, ownerRefs, tlsHash)
+ 
+ 	if len(ret) == 0 {
+ 		panic("no return value specified for EnsureSentinelDeployment")
+ 	}
+ 
+ 	var r0 error
+-	if rf, ok := ret.Get(0).(func(*v1.RedisFailover, map[string]string, []metav1.OwnerReference) error); ok {
+-		r0 = rf(rFailover, labels, ownerRefs)
++	if rf, ok := ret.Get(0).(func(*v1.RedisFailover, map[string]string, []metav1.OwnerReference, string) error); ok {
++		r0 = rf(rFailover, labels, ownerRefs, tlsHash)
+ 	} else {
+ 		r0 = ret.Error(0)
+ 	}
+@@ -212,6 +235,20 @@ func (_m *RedisFailoverClient) EnsureSentinelService(rFailover *v1.RedisFailover
+ 	return r0
+ }
+ 
++// EnsureRedisCertificate provides a mock function with given fields: rFailover, labels, ownerRefs
++func (_m *RedisFailoverClient) EnsureRedisCertificate(rFailover *v1.RedisFailover, labels map[string]string, ownerRefs []metav1.OwnerReference) error {
++	ret := _m.Called(rFailover, labels, ownerRefs)
++
++	var r0 error
++	if rf, ok := ret.Get(0).(func(*v1.RedisFailover, map[string]string, []metav1.OwnerReference) error); ok {
++		r0 = rf(rFailover, labels, ownerRefs)
++	} else {
++		r0 = ret.Error(0)
++	}
++
++	return r0
++}
++
+ // NewRedisFailoverClient creates a new instance of RedisFailoverClient. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+ // The first argument is typically a *testing.T value.
+ func NewRedisFailoverClient(t interface {
+diff --git a/mocks/operator/redisfailover/service/RedisFailoverHeal.go b/mocks/operator/redisfailover/service/RedisFailoverHeal.go
+index 3c9d48d4..c54b8478 100644
+--- a/mocks/operator/redisfailover/service/RedisFailoverHeal.go
++++ b/mocks/operator/redisfailover/service/RedisFailoverHeal.go
+@@ -85,17 +85,17 @@ func (_m *RedisFailoverHeal) NewSentinelMonitorWithPort(ip string, monitor strin
+ 	return r0
+ }
+ 
+-// RestoreSentinel provides a mock function with given fields: ip
+-func (_m *RedisFailoverHeal) RestoreSentinel(ip string) error {
+-	ret := _m.Called(ip)
++// RestoreSentinel provides a mock function with given fields: ip, rFailover
++func (_m *RedisFailoverHeal) RestoreSentinel(ip string, rFailover *v1.RedisFailover) error {
++	ret := _m.Called(ip, rFailover)
+ 
+ 	if len(ret) == 0 {
+ 		panic("no return value specified for RestoreSentinel")
+ 	}
+ 
+ 	var r0 error
+-	if rf, ok := ret.Get(0).(func(string) error); ok {
+-		r0 = rf(ip)
++	if rf, ok := ret.Get(0).(func(string, *v1.RedisFailover) error); ok {
++		r0 = rf(ip, rFailover)
+ 	} else {
+ 		r0 = ret.Error(0)
+ 	}
+diff --git a/mocks/service/k8s/Services.go b/mocks/service/k8s/Services.go
+index 9654e126..142eaeef 100644
+--- a/mocks/service/k8s/Services.go
++++ b/mocks/service/k8s/Services.go
+@@ -20,6 +20,8 @@ import (
+ 	v1 "k8s.io/api/core/v1"
+ 
+ 	watch "k8s.io/apimachinery/pkg/watch"
++
++	cmapi "github.com/cert-manager/cert-manager/pkg/apis/certmanager/v1"
+ )
+ 
+ // Services is an autogenerated mock type for the Services type
+@@ -99,6 +101,48 @@ func (_m *Services) CreateOrUpdateConfigMap(namespace string, np *v1.ConfigMap)
+ 	return r0
+ }
+ 
++// CreateSecret provides a mock function with given fields: namespace, secret
++func (_m *Services) CreateSecret(namespace string, secret *v1.Secret) error {
++	ret := _m.Called(namespace, secret)
++
++	var r0 error
++	if rf, ok := ret.Get(0).(func(string, *v1.Secret) error); ok {
++		r0 = rf(namespace, secret)
++	} else {
++		r0 = ret.Error(0)
++	}
++
++	return r0
++}
++
++// UpdateSecret provides a mock function with given fields: namespace, secret
++func (_m *Services) UpdateSecret(namespace string, secret *v1.Secret) error {
++	ret := _m.Called(namespace, secret)
++
++	var r0 error
++	if rf, ok := ret.Get(0).(func(string, *v1.Secret) error); ok {
++		r0 = rf(namespace, secret)
++	} else {
++		r0 = ret.Error(0)
++	}
++
++	return r0
++}
++
++// CreateOrUpdateSecret provides a mock function with given fields: namespace, secret
++func (_m *Services) CreateOrUpdateSecret(namespace string, secret *v1.Secret) error {
++	ret := _m.Called(namespace, secret)
++
++	var r0 error
++	if rf, ok := ret.Get(0).(func(string, *v1.Secret) error); ok {
++		r0 = rf(namespace, secret)
++	} else {
++		r0 = ret.Error(0)
++	}
++
++	return r0
++}
++
+ // CreateOrUpdateDeployment provides a mock function with given fields: namespace, deployment
+ func (_m *Services) CreateOrUpdateDeployment(namespace string, deployment *appsv1.Deployment) error {
+ 	ret := _m.Called(namespace, deployment)
+@@ -1235,6 +1279,74 @@ func (_m *Services) WatchRedisFailovers(ctx context.Context, namespace string, o
+ 	return r0, r1
+ }
+ 
++// CreateCertificate provides a mock function with given fields: namespace, cert
++func (_m *Services) CreateCertificate(namespace string, cert *cmapi.Certificate) error {
++	ret := _m.Called(namespace, cert)
++
++	var r0 error
++	if rf, ok := ret.Get(0).(func(string, *cmapi.Certificate) error); ok {
++		r0 = rf(namespace, cert)
++	} else {
++		r0 = ret.Error(0)
++	}
++
++	return r0
++}
++
++// CreateOrUpdateCertificate provides a mock function with given fields: namespace, cert
++func (_m *Services) CreateOrUpdateCertificate(namespace string, cert *cmapi.Certificate) error {
++	ret := _m.Called(namespace, cert)
++
++	var r0 error
++	if rf, ok := ret.Get(0).(func(string, *cmapi.Certificate) error); ok {
++		r0 = rf(namespace, cert)
++	} else {
++		r0 = ret.Error(0)
++	}
++
++	return r0
++}
++
++// UpdateCertificate provides a mock function with given fields: namespace, cert
++func (_m *Services) UpdateCertificate(namespace string, cert *cmapi.Certificate) error {
++	ret := _m.Called(namespace, cert)
++
++	var r0 error
++	if rf, ok := ret.Get(0).(func(string, *cmapi.Certificate) error); ok {
++		r0 = rf(namespace, cert)
++	} else {
++		r0 = ret.Error(0)
++	}
++
++	return r0
++}
++
++// GetCertificate provides a mock function with given fields: namespace, name
++func (_m *Services) GetCertificate(namespace string, name string) (*cmapi.Certificate, error) {
++	ret := _m.Called(namespace, name)
++
++	var r0 *cmapi.Certificate
++	var r1 error
++	if rf, ok := ret.Get(0).(func(string, string) (*cmapi.Certificate, error)); ok {
++		return rf(namespace, name)
++	}
++	if rf, ok := ret.Get(0).(func(string, string) *cmapi.Certificate); ok {
++		r0 = rf(namespace, name)
++	} else {
++		if ret.Get(0) != nil {
++			r0 = ret.Get(0).(*cmapi.Certificate)
++		}
++	}
++
++	if rf, ok := ret.Get(1).(func(string, string) error); ok {
++		r1 = rf(namespace, name)
++	} else {
++		r1 = ret.Error(1)
++	}
++
++	return r0, r1
++}
++
+ // NewServices creates a new instance of Services. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+ // The first argument is typically a *testing.T value.
+ func NewServices(t interface {
+diff --git a/mocks/service/redis/Client.go b/mocks/service/redis/Client.go
+index 075093a6..1770e4b2 100644
+--- a/mocks/service/redis/Client.go
++++ b/mocks/service/redis/Client.go
+@@ -2,16 +2,20 @@
+ 
+ package mocks
+ 
+-import mock "github.com/stretchr/testify/mock"
++import (
++	mock "github.com/stretchr/testify/mock"
++
++	tls "crypto/tls"
++)
+ 
+ // Client is an autogenerated mock type for the Client type
+ type Client struct {
+ 	mock.Mock
+ }
+ 
+-// GetNumberSentinelSlavesInMemory provides a mock function with given fields: ip
+-func (_m *Client) GetNumberSentinelSlavesInMemory(ip string) (int32, error) {
+-	ret := _m.Called(ip)
++// GetNumberSentinelSlavesInMemory provides a mock function with given fields: ip, tlsConfig
++func (_m *Client) GetNumberSentinelSlavesInMemory(ip string, tlsConfig *tls.Config) (int32, error) {
++	ret := _m.Called(ip, tlsConfig)
+ 
+ 	if len(ret) == 0 {
+ 		panic("no return value specified for GetNumberSentinelSlavesInMemory")
+@@ -19,17 +23,17 @@ func (_m *Client) GetNumberSentinelSlavesInMemory(ip string) (int32, error) {
+ 
+ 	var r0 int32
+ 	var r1 error
+-	if rf, ok := ret.Get(0).(func(string) (int32, error)); ok {
+-		return rf(ip)
++	if rf, ok := ret.Get(0).(func(string, *tls.Config) (int32, error)); ok {
++		return rf(ip, tlsConfig)
+ 	}
+-	if rf, ok := ret.Get(0).(func(string) int32); ok {
+-		r0 = rf(ip)
++	if rf, ok := ret.Get(0).(func(string, *tls.Config) int32); ok {
++		r0 = rf(ip, tlsConfig)
+ 	} else {
+ 		r0 = ret.Get(0).(int32)
+ 	}
+ 
+-	if rf, ok := ret.Get(1).(func(string) error); ok {
+-		r1 = rf(ip)
++	if rf, ok := ret.Get(1).(func(string, *tls.Config) error); ok {
++		r1 = rf(ip, tlsConfig)
+ 	} else {
+ 		r1 = ret.Error(1)
+ 	}
+@@ -37,9 +41,9 @@ func (_m *Client) GetNumberSentinelSlavesInMemory(ip string) (int32, error) {
+ 	return r0, r1
+ }
+ 
+-// GetNumberSentinelsInMemory provides a mock function with given fields: ip
+-func (_m *Client) GetNumberSentinelsInMemory(ip string) (int32, error) {
+-	ret := _m.Called(ip)
++// GetNumberSentinelsInMemory provides a mock function with given fields: ip, tlsConfig
++func (_m *Client) GetNumberSentinelsInMemory(ip string, tlsConfig *tls.Config) (int32, error) {
++	ret := _m.Called(ip, tlsConfig)
+ 
+ 	if len(ret) == 0 {
+ 		panic("no return value specified for GetNumberSentinelsInMemory")
+@@ -47,17 +51,17 @@ func (_m *Client) GetNumberSentinelsInMemory(ip string) (int32, error) {
+ 
+ 	var r0 int32
+ 	var r1 error
+-	if rf, ok := ret.Get(0).(func(string) (int32, error)); ok {
+-		return rf(ip)
++	if rf, ok := ret.Get(0).(func(string, *tls.Config) (int32, error)); ok {
++		return rf(ip, tlsConfig)
+ 	}
+-	if rf, ok := ret.Get(0).(func(string) int32); ok {
+-		r0 = rf(ip)
++	if rf, ok := ret.Get(0).(func(string, *tls.Config) int32); ok {
++		r0 = rf(ip, tlsConfig)
+ 	} else {
+ 		r0 = ret.Get(0).(int32)
+ 	}
+ 
+-	if rf, ok := ret.Get(1).(func(string) error); ok {
+-		r1 = rf(ip)
++	if rf, ok := ret.Get(1).(func(string, *tls.Config) error); ok {
++		r1 = rf(ip, tlsConfig)
+ 	} else {
+ 		r1 = ret.Error(1)
+ 	}
+@@ -65,9 +69,9 @@ func (_m *Client) GetNumberSentinelsInMemory(ip string) (int32, error) {
+ 	return r0, r1
+ }
+ 
+-// GetSentinelMonitor provides a mock function with given fields: ip, masterName
+-func (_m *Client) GetSentinelMonitor(ip string, masterName string) (string, string, error) {
+-	ret := _m.Called(ip, masterName)
++// GetSentinelMonitor provides a mock function with given fields: ip, masterName, tlsConfig
++func (_m *Client) GetSentinelMonitor(ip string, masterName string, tlsConfig *tls.Config) (string, string, error) {
++	ret := _m.Called(ip, masterName, tlsConfig)
+ 
+ 	if len(ret) == 0 {
+ 		panic("no return value specified for GetSentinelMonitor")
+@@ -76,23 +80,23 @@ func (_m *Client) GetSentinelMonitor(ip string, masterName string) (string, stri
+ 	var r0 string
+ 	var r1 string
+ 	var r2 error
+-	if rf, ok := ret.Get(0).(func(string, string) (string, string, error)); ok {
+-		return rf(ip, masterName)
++	if rf, ok := ret.Get(0).(func(string, string, *tls.Config) (string, string, error)); ok {
++		return rf(ip, masterName, tlsConfig)
+ 	}
+-	if rf, ok := ret.Get(0).(func(string, string) string); ok {
+-		r0 = rf(ip, masterName)
++	if rf, ok := ret.Get(0).(func(string, string, *tls.Config) string); ok {
++		r0 = rf(ip, masterName, tlsConfig)
+ 	} else {
+ 		r0 = ret.Get(0).(string)
+ 	}
+ 
+-	if rf, ok := ret.Get(1).(func(string, string) string); ok {
+-		r1 = rf(ip, masterName)
++	if rf, ok := ret.Get(1).(func(string, string, *tls.Config) string); ok {
++		r1 = rf(ip, masterName, tlsConfig)
+ 	} else {
+ 		r1 = ret.Get(1).(string)
+ 	}
+ 
+-	if rf, ok := ret.Get(2).(func(string, string) error); ok {
+-		r2 = rf(ip, masterName)
++	if rf, ok := ret.Get(2).(func(string, string, *tls.Config) error); ok {
++		r2 = rf(ip, masterName, tlsConfig)
+ 	} else {
+ 		r2 = ret.Error(2)
+ 	}
+@@ -100,9 +104,9 @@ func (_m *Client) GetSentinelMonitor(ip string, masterName string) (string, stri
+ 	return r0, r1, r2
+ }
+ 
+-// GetSlaveOf provides a mock function with given fields: ip, port, password
+-func (_m *Client) GetSlaveOf(ip string, port string, password string) (string, error) {
+-	ret := _m.Called(ip, port, password)
++// GetSlaveOf provides a mock function with given fields: ip, port, password, tlsConfig
++func (_m *Client) GetSlaveOf(ip string, port string, password string, tlsConfig *tls.Config) (string, error) {
++	ret := _m.Called(ip, port, password, tlsConfig)
+ 
+ 	if len(ret) == 0 {
+ 		panic("no return value specified for GetSlaveOf")
+@@ -110,17 +114,17 @@ func (_m *Client) GetSlaveOf(ip string, port string, password string) (string, e
+ 
+ 	var r0 string
+ 	var r1 error
+-	if rf, ok := ret.Get(0).(func(string, string, string) (string, error)); ok {
+-		return rf(ip, port, password)
++	if rf, ok := ret.Get(0).(func(string, string, string, *tls.Config) (string, error)); ok {
++		return rf(ip, port, password, tlsConfig)
+ 	}
+-	if rf, ok := ret.Get(0).(func(string, string, string) string); ok {
+-		r0 = rf(ip, port, password)
++	if rf, ok := ret.Get(0).(func(string, string, string, *tls.Config) string); ok {
++		r0 = rf(ip, port, password, tlsConfig)
+ 	} else {
+ 		r0 = ret.Get(0).(string)
+ 	}
+ 
+-	if rf, ok := ret.Get(1).(func(string, string, string) error); ok {
+-		r1 = rf(ip, port, password)
++	if rf, ok := ret.Get(1).(func(string, string, string, *tls.Config) error); ok {
++		r1 = rf(ip, port, password, tlsConfig)
+ 	} else {
+ 		r1 = ret.Error(1)
+ 	}
+@@ -128,9 +132,9 @@ func (_m *Client) GetSlaveOf(ip string, port string, password string) (string, e
+ 	return r0, r1
+ }
+ 
+-// IsMaster provides a mock function with given fields: ip, port, password
+-func (_m *Client) IsMaster(ip string, port string, password string) (bool, error) {
+-	ret := _m.Called(ip, port, password)
++// IsMaster provides a mock function with given fields: ip, port, password, tlsConfig
++func (_m *Client) IsMaster(ip string, port string, password string, tlsConfig *tls.Config) (bool, error) {
++	ret := _m.Called(ip, port, password, tlsConfig)
+ 
+ 	if len(ret) == 0 {
+ 		panic("no return value specified for IsMaster")
+@@ -138,17 +142,17 @@ func (_m *Client) IsMaster(ip string, port string, password string) (bool, error
+ 
+ 	var r0 bool
+ 	var r1 error
+-	if rf, ok := ret.Get(0).(func(string, string, string) (bool, error)); ok {
+-		return rf(ip, port, password)
++	if rf, ok := ret.Get(0).(func(string, string, string, *tls.Config) (bool, error)); ok {
++		return rf(ip, port, password, tlsConfig)
+ 	}
+-	if rf, ok := ret.Get(0).(func(string, string, string) bool); ok {
+-		r0 = rf(ip, port, password)
++	if rf, ok := ret.Get(0).(func(string, string, string, *tls.Config) bool); ok {
++		r0 = rf(ip, port, password, tlsConfig)
+ 	} else {
+ 		r0 = ret.Get(0).(bool)
+ 	}
+ 
+-	if rf, ok := ret.Get(1).(func(string, string, string) error); ok {
+-		r1 = rf(ip, port, password)
++	if rf, ok := ret.Get(1).(func(string, string, string, *tls.Config) error); ok {
++		r1 = rf(ip, port, password, tlsConfig)
+ 	} else {
+ 		r1 = ret.Error(1)
+ 	}
+@@ -156,17 +160,17 @@ func (_m *Client) IsMaster(ip string, port string, password string) (bool, error
+ 	return r0, r1
+ }
+ 
+-// MakeMaster provides a mock function with given fields: ip, port, password
+-func (_m *Client) MakeMaster(ip string, port string, password string) error {
+-	ret := _m.Called(ip, port, password)
++// MakeMaster provides a mock function with given fields: ip, port, password, tlsConfig
++func (_m *Client) MakeMaster(ip string, port string, password string, tlsConfig *tls.Config) error {
++	ret := _m.Called(ip, port, password, tlsConfig)
+ 
+ 	if len(ret) == 0 {
+ 		panic("no return value specified for MakeMaster")
+ 	}
+ 
+ 	var r0 error
+-	if rf, ok := ret.Get(0).(func(string, string, string) error); ok {
+-		r0 = rf(ip, port, password)
++	if rf, ok := ret.Get(0).(func(string, string, string, *tls.Config) error); ok {
++		r0 = rf(ip, port, password, tlsConfig)
+ 	} else {
+ 		r0 = ret.Error(0)
+ 	}
+@@ -174,17 +178,17 @@ func (_m *Client) MakeMaster(ip string, port string, password string) error {
+ 	return r0
+ }
+ 
+-// MakeSlaveOf provides a mock function with given fields: ip, masterIP, password
+-func (_m *Client) MakeSlaveOf(ip string, masterIP string, password string) error {
+-	ret := _m.Called(ip, masterIP, password)
++// MakeSlaveOf provides a mock function with given fields: ip, masterIP, password, tlsConfig
++func (_m *Client) MakeSlaveOf(ip string, masterIP string, password string, tlsConfig *tls.Config) error {
++	ret := _m.Called(ip, masterIP, password, tlsConfig)
+ 
+ 	if len(ret) == 0 {
+ 		panic("no return value specified for MakeSlaveOf")
+ 	}
+ 
+ 	var r0 error
+-	if rf, ok := ret.Get(0).(func(string, string, string) error); ok {
+-		r0 = rf(ip, masterIP, password)
++	if rf, ok := ret.Get(0).(func(string, string, string, *tls.Config) error); ok {
++		r0 = rf(ip, masterIP, password, tlsConfig)
+ 	} else {
+ 		r0 = ret.Error(0)
+ 	}
+@@ -192,17 +196,17 @@ func (_m *Client) MakeSlaveOf(ip string, masterIP string, password string) error
+ 	return r0
+ }
+ 
+-// MakeSlaveOfWithPort provides a mock function with given fields: ip, masterIP, masterPort, password
+-func (_m *Client) MakeSlaveOfWithPort(ip string, masterIP string, masterPort string, password string) error {
+-	ret := _m.Called(ip, masterIP, masterPort, password)
++// MakeSlaveOfWithPort provides a mock function with given fields: ip, localPort, masterIP, masterPort, password, tlsConfig
++func (_m *Client) MakeSlaveOfWithPort(ip string, localPort string, masterIP string, masterPort string, password string, tlsConfig *tls.Config) error {
++	ret := _m.Called(ip, localPort, masterIP, masterPort, password, tlsConfig)
+ 
+ 	if len(ret) == 0 {
+ 		panic("no return value specified for MakeSlaveOfWithPort")
+ 	}
+ 
+ 	var r0 error
+-	if rf, ok := ret.Get(0).(func(string, string, string, string) error); ok {
+-		r0 = rf(ip, masterIP, masterPort, password)
++	if rf, ok := ret.Get(0).(func(string, string, string, string, string, *tls.Config) error); ok {
++		r0 = rf(ip, localPort, masterIP, masterPort, password, tlsConfig)
+ 	} else {
+ 		r0 = ret.Error(0)
+ 	}
+@@ -210,17 +214,17 @@ func (_m *Client) MakeSlaveOfWithPort(ip string, masterIP string, masterPort str
+ 	return r0
+ }
+ 
+-// MonitorRedis provides a mock function with given fields: ip, monitor, quorum, password, masterName
+-func (_m *Client) MonitorRedis(ip string, monitor string, quorum string, password string, masterName string) error {
+-	ret := _m.Called(ip, monitor, quorum, password, masterName)
++// MonitorRedis provides a mock function with given fields: ip, monitor, quorum, password, masterName, tlsConfig
++func (_m *Client) MonitorRedis(ip string, monitor string, quorum string, password string, masterName string, tlsConfig *tls.Config) error {
++	ret := _m.Called(ip, monitor, quorum, password, masterName, tlsConfig)
+ 
+ 	if len(ret) == 0 {
+ 		panic("no return value specified for MonitorRedis")
+ 	}
+ 
+ 	var r0 error
+-	if rf, ok := ret.Get(0).(func(string, string, string, string, string) error); ok {
+-		r0 = rf(ip, monitor, quorum, password, masterName)
++	if rf, ok := ret.Get(0).(func(string, string, string, string, string, *tls.Config) error); ok {
++		r0 = rf(ip, monitor, quorum, password, masterName, tlsConfig)
+ 	} else {
+ 		r0 = ret.Error(0)
+ 	}
+@@ -228,17 +232,17 @@ func (_m *Client) MonitorRedis(ip string, monitor string, quorum string, passwor
+ 	return r0
+ }
+ 
+-// MonitorRedisWithPort provides a mock function with given fields: ip, monitor, port, quorum, password, masterName
+-func (_m *Client) MonitorRedisWithPort(ip string, monitor string, port string, quorum string, password string, masterName string) error {
+-	ret := _m.Called(ip, monitor, port, quorum, password, masterName)
++// MonitorRedisWithPort provides a mock function with given fields: ip, monitor, port, quorum, password, masterName, tlsConfig
++func (_m *Client) MonitorRedisWithPort(ip string, monitor string, port string, quorum string, password string, masterName string, tlsConfig *tls.Config) error {
++	ret := _m.Called(ip, monitor, port, quorum, password, masterName, tlsConfig)
+ 
+ 	if len(ret) == 0 {
+ 		panic("no return value specified for MonitorRedisWithPort")
+ 	}
+ 
+ 	var r0 error
+-	if rf, ok := ret.Get(0).(func(string, string, string, string, string, string) error); ok {
+-		r0 = rf(ip, monitor, port, quorum, password, masterName)
++	if rf, ok := ret.Get(0).(func(string, string, string, string, string, string, *tls.Config) error); ok {
++		r0 = rf(ip, monitor, port, quorum, password, masterName, tlsConfig)
+ 	} else {
+ 		r0 = ret.Error(0)
+ 	}
+@@ -246,17 +250,17 @@ func (_m *Client) MonitorRedisWithPort(ip string, monitor string, port string, q
+ 	return r0
+ }
+ 
+-// ResetSentinel provides a mock function with given fields: ip
+-func (_m *Client) ResetSentinel(ip string) error {
+-	ret := _m.Called(ip)
++// ResetSentinel provides a mock function with given fields: ip, tlsConfig
++func (_m *Client) ResetSentinel(ip string, tlsConfig *tls.Config) error {
++	ret := _m.Called(ip, tlsConfig)
+ 
+ 	if len(ret) == 0 {
+ 		panic("no return value specified for ResetSentinel")
+ 	}
+ 
+ 	var r0 error
+-	if rf, ok := ret.Get(0).(func(string) error); ok {
+-		r0 = rf(ip)
++	if rf, ok := ret.Get(0).(func(string, *tls.Config) error); ok {
++		r0 = rf(ip, tlsConfig)
+ 	} else {
+ 		r0 = ret.Error(0)
+ 	}
+@@ -264,17 +268,17 @@ func (_m *Client) ResetSentinel(ip string) error {
+ 	return r0
+ }
+ 
+-// SentinelCheckQuorum provides a mock function with given fields: ip, masterName
+-func (_m *Client) SentinelCheckQuorum(ip string, masterName string) error {
+-	ret := _m.Called(ip, masterName)
++// SentinelCheckQuorum provides a mock function with given fields: ip, masterName, tlsConfig
++func (_m *Client) SentinelCheckQuorum(ip string, masterName string, tlsConfig *tls.Config) error {
++	ret := _m.Called(ip, masterName, tlsConfig)
+ 
+ 	if len(ret) == 0 {
+ 		panic("no return value specified for SentinelCheckQuorum")
+ 	}
+ 
+ 	var r0 error
+-	if rf, ok := ret.Get(0).(func(string, string) error); ok {
+-		r0 = rf(ip, masterName)
++	if rf, ok := ret.Get(0).(func(string, string, *tls.Config) error); ok {
++		r0 = rf(ip, masterName, tlsConfig)
+ 	} else {
+ 		r0 = ret.Error(0)
+ 	}
+@@ -282,17 +286,17 @@ func (_m *Client) SentinelCheckQuorum(ip string, masterName string) error {
+ 	return r0
+ }
+ 
+-// SetCustomRedisConfig provides a mock function with given fields: ip, port, configs, password
+-func (_m *Client) SetCustomRedisConfig(ip string, port string, configs []string, password string) error {
+-	ret := _m.Called(ip, port, configs, password)
++// SetCustomRedisConfig provides a mock function with given fields: ip, port, configs, password, tlsConfig
++func (_m *Client) SetCustomRedisConfig(ip string, port string, configs []string, password string, tlsConfig *tls.Config) error {
++	ret := _m.Called(ip, port, configs, password, tlsConfig)
+ 
+ 	if len(ret) == 0 {
+ 		panic("no return value specified for SetCustomRedisConfig")
+ 	}
+ 
+ 	var r0 error
+-	if rf, ok := ret.Get(0).(func(string, string, []string, string) error); ok {
+-		r0 = rf(ip, port, configs, password)
++	if rf, ok := ret.Get(0).(func(string, string, []string, string, *tls.Config) error); ok {
++		r0 = rf(ip, port, configs, password, tlsConfig)
+ 	} else {
+ 		r0 = ret.Error(0)
+ 	}
+@@ -300,17 +304,17 @@ func (_m *Client) SetCustomRedisConfig(ip string, port string, configs []string,
+ 	return r0
+ }
+ 
+-// SetCustomSentinelConfig provides a mock function with given fields: ip, masterName, configs
+-func (_m *Client) SetCustomSentinelConfig(ip string, masterName string, configs []string) error {
+-	ret := _m.Called(ip, masterName, configs)
++// SetCustomSentinelConfig provides a mock function with given fields: ip, masterName, configs, tlsConfig
++func (_m *Client) SetCustomSentinelConfig(ip string, masterName string, configs []string, tlsConfig *tls.Config) error {
++	ret := _m.Called(ip, masterName, configs, tlsConfig)
+ 
+ 	if len(ret) == 0 {
+ 		panic("no return value specified for SetCustomSentinelConfig")
+ 	}
+ 
+ 	var r0 error
+-	if rf, ok := ret.Get(0).(func(string, string, []string) error); ok {
+-		r0 = rf(ip, masterName, configs)
++	if rf, ok := ret.Get(0).(func(string, string, []string, *tls.Config) error); ok {
++		r0 = rf(ip, masterName, configs, tlsConfig)
+ 	} else {
+ 		r0 = ret.Error(0)
+ 	}
+@@ -318,9 +322,9 @@ func (_m *Client) SetCustomSentinelConfig(ip string, masterName string, configs
+ 	return r0
+ }
+ 
+-// SlaveIsReady provides a mock function with given fields: ip, port, password
+-func (_m *Client) SlaveIsReady(ip string, port string, password string) (bool, error) {
+-	ret := _m.Called(ip, port, password)
++// SlaveIsReady provides a mock function with given fields: ip, port, password, tlsConfig
++func (_m *Client) SlaveIsReady(ip string, port string, password string, tlsConfig *tls.Config) (bool, error) {
++	ret := _m.Called(ip, port, password, tlsConfig)
+ 
+ 	if len(ret) == 0 {
+ 		panic("no return value specified for SlaveIsReady")
+@@ -328,17 +332,17 @@ func (_m *Client) SlaveIsReady(ip string, port string, password string) (bool, e
+ 
+ 	var r0 bool
+ 	var r1 error
+-	if rf, ok := ret.Get(0).(func(string, string, string) (bool, error)); ok {
+-		return rf(ip, port, password)
++	if rf, ok := ret.Get(0).(func(string, string, string, *tls.Config) (bool, error)); ok {
++		return rf(ip, port, password, tlsConfig)
+ 	}
+-	if rf, ok := ret.Get(0).(func(string, string, string) bool); ok {
+-		r0 = rf(ip, port, password)
++	if rf, ok := ret.Get(0).(func(string, string, string, *tls.Config) bool); ok {
++		r0 = rf(ip, port, password, tlsConfig)
+ 	} else {
+ 		r0 = ret.Get(0).(bool)
+ 	}
+ 
+-	if rf, ok := ret.Get(1).(func(string, string, string) error); ok {
+-		r1 = rf(ip, port, password)
++	if rf, ok := ret.Get(1).(func(string, string, string, *tls.Config) error); ok {
++		r1 = rf(ip, port, password, tlsConfig)
+ 	} else {
+ 		r1 = ret.Error(1)
+ 	}
+diff --git a/operator/redisfailover/checker.go b/operator/redisfailover/checker.go
+index d6310087..261247bd 100644
+--- a/operator/redisfailover/checker.go
++++ b/operator/redisfailover/checker.go
+@@ -218,7 +218,7 @@ func (r *RedisFailoverHandler) CheckAndHeal(rf *redisfailoverv1.RedisFailover) e
+ 
+ 	port := getRedisPort(rf.Spec.Redis.Port)
+ 	for _, sip := range sentinels {
+-		err = r.rfChecker.CheckSentinelMonitor(sip, rf.MasterName(), master, port)
++		err = r.rfChecker.CheckSentinelMonitor(rf, sip, master, port)
+ 		setRedisCheckerMetrics(r.mClient, "sentinel", rf.Namespace, rf.Name, metrics.SENTINEL_WRONG_MASTER, sip, err)
+ 		if err != nil {
+ 			r.logger.WithField("redisfailover", rf.ObjectMeta.Name).WithField("namespace", rf.ObjectMeta.Namespace).Warningf("Fixing sentinel not monitoring expected master: %s", err.Error())
+@@ -267,7 +267,7 @@ func (r *RedisFailoverHandler) checkAndHealBootstrapMode(rf *redisfailoverv1.Red
+ 			return err
+ 		}
+ 		for _, sip := range sentinels {
+-			err = r.rfChecker.CheckSentinelMonitor(sip, rf.MasterName(), bootstrapSettings.Host, bootstrapSettings.Port)
++			err = r.rfChecker.CheckSentinelMonitor(rf, sip, bootstrapSettings.Host, bootstrapSettings.Port)
+ 			setRedisCheckerMetrics(r.mClient, "sentinel", rf.Namespace, rf.Name, metrics.SENTINEL_WRONG_MASTER, sip, err)
+ 			if err != nil {
+ 				r.logger.WithField("redisfailover", rf.ObjectMeta.Name).WithField("namespace", rf.ObjectMeta.Namespace).Warningf("Fixing sentinel not monitoring expected master: %s", err.Error())
+@@ -300,7 +300,7 @@ func (r *RedisFailoverHandler) checkAndHealSentinels(rf *redisfailoverv1.RedisFa
+ 		setRedisCheckerMetrics(r.mClient, "sentinel", rf.Namespace, rf.Name, metrics.SENTINEL_NUMBER_IN_MEMORY_MISMATCH, sip, err)
+ 		if err != nil {
+ 			r.logger.WithField("redisfailover", rf.ObjectMeta.Name).WithField("namespace", rf.ObjectMeta.Namespace).Warningf("Sentinel %s mismatch number of sentinels in memory. resetting", sip)
+-			if err := r.rfHealer.RestoreSentinel(sip); err != nil {
++			if err := r.rfHealer.RestoreSentinel(sip, rf); err != nil {
+ 				return err
+ 			}
+ 		}
+@@ -311,7 +311,7 @@ func (r *RedisFailoverHandler) checkAndHealSentinels(rf *redisfailoverv1.RedisFa
+ 		setRedisCheckerMetrics(r.mClient, "sentinel", rf.Namespace, rf.Name, metrics.REDIS_SLAVES_NUMBER_IN_MEMORY_MISMATCH, sip, err)
+ 		if err != nil {
+ 			r.logger.WithField("redisfailover", rf.ObjectMeta.Name).WithField("namespace", rf.ObjectMeta.Namespace).Warningf("Sentinel %s mismatch number of expected slaves in memory. resetting", sip)
+-			if err := r.rfHealer.RestoreSentinel(sip); err != nil {
++			if err := r.rfHealer.RestoreSentinel(sip, rf); err != nil {
+ 				return err
+ 			}
+ 		}
+diff --git a/operator/redisfailover/checker_test.go b/operator/redisfailover/checker_test.go
+index a6f6b35b..35b2e56f 100644
+--- a/operator/redisfailover/checker_test.go
++++ b/operator/redisfailover/checker_test.go
+@@ -637,16 +637,16 @@ func TestCheckAndHeal(t *testing.T) {
+ 				mrfc.On("GetSentinelsIPs", rf).Once().Return([]string{sentinel}, nil)
+ 				if test.sentinelMonitorOK {
+ 					if test.bootstrapping {
+-						mrfc.On("CheckSentinelMonitor", sentinel, rf.MasterName(), bootstrapMaster, bootstrapMasterPort).Once().Return(nil)
++						mrfc.On("CheckSentinelMonitor", rf, sentinel, bootstrapMaster, bootstrapMasterPort).Once().Return(nil)
+ 					} else {
+-						mrfc.On("CheckSentinelMonitor", sentinel, rf.MasterName(), master, "0").Once().Return(nil)
++						mrfc.On("CheckSentinelMonitor", rf, sentinel, master, "0").Once().Return(nil)
+ 					}
+ 				} else {
+ 					if test.bootstrapping {
+-						mrfc.On("CheckSentinelMonitor", sentinel, rf.MasterName(), bootstrapMaster, bootstrapMasterPort).Once().Return(errors.New(""))
++						mrfc.On("CheckSentinelMonitor", rf, sentinel, bootstrapMaster, bootstrapMasterPort).Once().Return(errors.New(""))
+ 						mrfh.On("NewSentinelMonitorWithPort", sentinel, bootstrapMaster, bootstrapMasterPort, rf).Once().Return(nil)
+ 					} else {
+-						mrfc.On("CheckSentinelMonitor", sentinel, rf.MasterName(), master, "0").Once().Return(errors.New(""))
++						mrfc.On("CheckSentinelMonitor", rf, sentinel, master, "0").Once().Return(errors.New(""))
+ 						mrfh.On("NewSentinelMonitor", sentinel, master, rf).Once().Return(nil)
+ 					}
+ 				}
+@@ -654,13 +654,13 @@ func TestCheckAndHeal(t *testing.T) {
+ 					mrfc.On("CheckSentinelNumberInMemory", sentinel, rf).Once().Return(nil)
+ 				} else {
+ 					mrfc.On("CheckSentinelNumberInMemory", sentinel, rf).Once().Return(errors.New(""))
+-					mrfh.On("RestoreSentinel", sentinel).Once().Return(nil)
++					mrfh.On("RestoreSentinel", sentinel, rf).Once().Return(nil)
+ 				}
+ 				if test.sentinelSlavesNumberInMemoryOK {
+ 					mrfc.On("CheckSentinelSlavesNumberInMemory", sentinel, rf).Once().Return(nil)
+ 				} else {
+ 					mrfc.On("CheckSentinelSlavesNumberInMemory", sentinel, rf).Once().Return(errors.New(""))
+-					mrfh.On("RestoreSentinel", sentinel).Once().Return(nil)
++					mrfh.On("RestoreSentinel", sentinel, rf).Once().Return(nil)
+ 				}
+ 				mrfh.On("SetSentinelCustomConfig", sentinel, rf).Once().Return(nil)
+ 			}
+diff --git a/operator/redisfailover/config.go b/operator/redisfailover/config.go
+index 792d7b3e..9054ea8d 100644
+--- a/operator/redisfailover/config.go
++++ b/operator/redisfailover/config.go
+@@ -1,5 +1,10 @@
+ package redisfailover
+ 
++// DefaultClusterDomain is the SAN suffix used when --cluster-domain is
++// not supplied. cluster.local is the upstream Kubernetes default and
++// keeps the operator's behaviour backwards-compatible.
++const DefaultClusterDomain = "cluster.local"
++
+ // Config is the configuration for the redis operator.
+ type Config struct {
+ 	ListenAddress            string
+@@ -10,4 +15,11 @@ type Config struct {
+ 	// Only RF CRs with label redis-failover.freshworks.com/operator-group=<OperatorGroupID>
+ 	// are reconciled by this instance.
+ 	OperatorGroupID string
++
++	// ClusterDomain is the cluster's DNS suffix (e.g. "cluster.local",
++	// "cozy.local"). It is used to template the `*.svc.<domain>` SAN
++	// entries on the cert-manager Certificate so that TLS verification
++	// succeeds on clusters running a non-default --cluster-domain.
++	// Empty falls back to DefaultClusterDomain.
++	ClusterDomain string
+ }
+diff --git a/operator/redisfailover/ensurer.go b/operator/redisfailover/ensurer.go
+index d5ffae53..b38d7b84 100644
+--- a/operator/redisfailover/ensurer.go
++++ b/operator/redisfailover/ensurer.go
+@@ -5,6 +5,7 @@ import (
+ 
+ 	redisfailoverv1 "github.com/freshworks/redis-operator/api/redisfailover/v1"
+ 	"github.com/freshworks/redis-operator/metrics"
++	rfservice "github.com/freshworks/redis-operator/operator/redisfailover/service"
+ )
+ 
+ // Ensure is called to ensure all of the resources associated with a RedisFailover are created
+@@ -24,9 +25,6 @@ func (w *RedisFailoverHandler) Ensure(rf *redisfailoverv1.RedisFailover, labels
+ 		if err := w.rfService.EnsureSentinelService(rf, labels, or); err != nil {
+ 			return err
+ 		}
+-		if err := w.rfService.EnsureSentinelConfigMap(rf, labels, or); err != nil {
+-			return err
+-		}
+ 	}
+ 
+ 	if err := w.rfService.EnsureRedisMasterService(rf, labels, or); err != nil {
+@@ -37,6 +35,41 @@ func (w *RedisFailoverHandler) Ensure(rf *redisfailoverv1.RedisFailover, labels
+ 		return err
+ 	}
+ 
++	// TLS Certificate must exist before the pods are created so the Secret
++	// the pods mount is populated. EnsureRedisCertificate is a no-op when
++	// TLS is disabled or the user supplied their own Secret.
++	if err := w.rfService.EnsureRedisCertificate(rf, labels, or); err != nil {
++		return err
++	}
++
++	// Publish a CA-only Secret (ca.crt without any private key) derived from
++	// the TLS Secret so clients can verify the server under tightly scoped
++	// RBAC. No-op when TLS is disabled; defers gracefully until the TLS
++	// Secret's ca.crt is available.
++	// The hash it returns pins the pod templates to the TLS material that
++	// was read here, so a renewed certificate rolls Redis and Sentinel.
++	tlsHash, err := w.rfService.EnsureRedisCACertSecret(rf, labels, or)
++	if err != nil {
++		return err
++	}
++
++	// Everything from here on shapes the pods: the ConfigMaps they read at
++	// startup and the templates they are created from. With TLS on and no
++	// certificate in the Secret yet there is nothing to pin them to, the
++	// pods could not start against the missing volume anyway, and writing
++	// them now would roll them again as soon as the hash appears on the
++	// next pass. Wait for the material; the objects written above do not
++	// depend on it.
++	if rfservice.TLSEnabled(rf) && tlsHash == "" {
++		w.logger.WithField("redisfailover", rf.ObjectMeta.Name).WithField("namespace", rf.ObjectMeta.Namespace).Infof("TLS secret %s has no certificate yet, waiting before writing the redis and sentinel config and workloads", rfservice.GetTLSSecretName(rf))
++		return nil
++	}
++
++	if sentinelsAllowed {
++		if err := w.rfService.EnsureSentinelConfigMap(rf, labels, or); err != nil {
++			return err
++		}
++	}
+ 	if err := w.rfService.EnsureRedisShutdownConfigMap(rf, labels, or); err != nil {
+ 		return err
+ 	}
+@@ -46,12 +79,12 @@ func (w *RedisFailoverHandler) Ensure(rf *redisfailoverv1.RedisFailover, labels
+ 	if err := w.rfService.EnsureRedisConfigMap(rf, labels, or); err != nil {
+ 		return err
+ 	}
+-	if err := w.rfService.EnsureRedisStatefulset(rf, labels, or); err != nil {
++	if err := w.rfService.EnsureRedisStatefulset(rf, labels, or, tlsHash); err != nil {
+ 		return err
+ 	}
+ 
+ 	if sentinelsAllowed {
+-		if err := w.rfService.EnsureSentinelDeployment(rf, labels, or); err != nil {
++		if err := w.rfService.EnsureSentinelDeployment(rf, labels, or, tlsHash); err != nil {
+ 			return err
+ 		}
+ 	}
+diff --git a/operator/redisfailover/ensurer_test.go b/operator/redisfailover/ensurer_test.go
+index b6c2e344..bd3f6956 100644
+--- a/operator/redisfailover/ensurer_test.go
++++ b/operator/redisfailover/ensurer_test.go
+@@ -115,15 +115,17 @@ func TestEnsure(t *testing.T) {
+ 			if !test.bootstrapping || test.bootstrappingAllowSentinels {
+ 				mrfs.On("EnsureSentinelService", rf, mock.Anything, mock.Anything).Once().Return(nil)
+ 				mrfs.On("EnsureSentinelConfigMap", rf, mock.Anything, mock.Anything).Once().Return(nil)
+-				mrfs.On("EnsureSentinelDeployment", rf, mock.Anything, mock.Anything).Once().Return(nil)
++				mrfs.On("EnsureSentinelDeployment", rf, mock.Anything, mock.Anything, mock.Anything).Once().Return(nil)
+ 			}
+ 
+ 			mrfs.On("EnsureRedisMasterService", rf, mock.Anything, mock.Anything).Once().Return(nil)
+ 			mrfs.On("EnsureRedisSlaveService", rf, mock.Anything, mock.Anything).Once().Return(nil)
++			mrfs.On("EnsureRedisCertificate", rf, mock.Anything, mock.Anything).Once().Return(nil)
++			mrfs.On("EnsureRedisCACertSecret", rf, mock.Anything, mock.Anything).Once().Return("", nil)
+ 			mrfs.On("EnsureRedisConfigMap", rf, mock.Anything, mock.Anything).Once().Return(nil)
+ 			mrfs.On("EnsureRedisShutdownConfigMap", rf, mock.Anything, mock.Anything).Once().Return(nil)
+ 			mrfs.On("EnsureRedisReadinessConfigMap", rf, mock.Anything, mock.Anything).Once().Return(nil)
+-			mrfs.On("EnsureRedisStatefulset", rf, mock.Anything, mock.Anything).Once().Return(nil)
++			mrfs.On("EnsureRedisStatefulset", rf, mock.Anything, mock.Anything, mock.Anything).Once().Return(nil)
+ 
+ 			// Create the Kops client and call the valid logic.
+ 			handler := rfOperator.NewRedisFailoverHandler(config, mrfs, mrfc, mrfh, mk, metrics.Dummy, log.Dummy)
+@@ -134,3 +136,82 @@ func TestEnsure(t *testing.T) {
+ 		})
+ 	}
+ }
++
++// The TLS Secret is read once per reconcile, by the CA-publish step. The hash
++// it returns has to reach both pod templates, or a renewed certificate never
++// rolls the pods.
++func TestEnsurePropagatesTLSHashToPodTemplates(t *testing.T) {
++	assert := assert.New(t)
++
++	const tlsHash = "0d9f1c2b3a"
++
++	rf := generateRF(false, false, false)
++	config := generateConfig()
++	mk := &mK8SService.Services{}
++	mrfc := &mRFService.RedisFailoverCheck{}
++	mrfh := &mRFService.RedisFailoverHeal{}
++	mrfs := &mRFService.RedisFailoverClient{}
++
++	mrfs.On("EnsureNotPresentRedisService", rf).Once().Return(nil)
++	mrfs.On("EnsureSentinelService", rf, mock.Anything, mock.Anything).Once().Return(nil)
++	mrfs.On("EnsureSentinelConfigMap", rf, mock.Anything, mock.Anything).Once().Return(nil)
++	mrfs.On("EnsureRedisMasterService", rf, mock.Anything, mock.Anything).Once().Return(nil)
++	mrfs.On("EnsureRedisSlaveService", rf, mock.Anything, mock.Anything).Once().Return(nil)
++	mrfs.On("EnsureRedisCertificate", rf, mock.Anything, mock.Anything).Once().Return(nil)
++	mrfs.On("EnsureRedisConfigMap", rf, mock.Anything, mock.Anything).Once().Return(nil)
++	mrfs.On("EnsureRedisShutdownConfigMap", rf, mock.Anything, mock.Anything).Once().Return(nil)
++	mrfs.On("EnsureRedisReadinessConfigMap", rf, mock.Anything, mock.Anything).Once().Return(nil)
++
++	mrfs.On("EnsureRedisCACertSecret", rf, mock.Anything, mock.Anything).Once().Return(tlsHash, nil)
++	mrfs.On("EnsureRedisStatefulset", rf, mock.Anything, mock.Anything, tlsHash).Once().Return(nil)
++	mrfs.On("EnsureSentinelDeployment", rf, mock.Anything, mock.Anything, tlsHash).Once().Return(nil)
++
++	handler := rfOperator.NewRedisFailoverHandler(config, mrfs, mrfc, mrfh, mk, metrics.Dummy, log.Dummy)
++	err := handler.Ensure(rf, map[string]string{}, []metav1.OwnerReference{}, metrics.Dummy)
++
++	assert.NoError(err)
++	mrfs.AssertExpectations(t)
++}
++
++// On a first install with TLS on, cert-manager writes the Secret after the
++// RedisFailover is created. Writing the pod-facing objects before it exists
++// leaves the pods on a missing volume and, once the Secret appears and its
++// hash lands on the templates, rolls them a second time. They wait instead.
++func TestEnsureWaitsForTLSMaterialBeforeWritingPodFacingObjects(t *testing.T) {
++	assert := assert.New(t)
++
++	rf := generateRF(false, false, false)
++	rf.Spec.TLS = &redisfailoverv1.TLSSettings{
++		Enabled:           true,
++		CertificateSecret: &redisfailoverv1.LocalSecretReference{SecretName: "test-tls"},
++	}
++	config := generateConfig()
++	mk := &mK8SService.Services{}
++	mrfc := &mRFService.RedisFailoverCheck{}
++	mrfh := &mRFService.RedisFailoverHeal{}
++	mrfs := &mRFService.RedisFailoverClient{}
++
++	mrfs.On("EnsureNotPresentRedisService", rf).Once().Return(nil)
++	mrfs.On("EnsureSentinelService", rf, mock.Anything, mock.Anything).Once().Return(nil)
++	mrfs.On("EnsureRedisMasterService", rf, mock.Anything, mock.Anything).Once().Return(nil)
++	mrfs.On("EnsureRedisSlaveService", rf, mock.Anything, mock.Anything).Once().Return(nil)
++	mrfs.On("EnsureRedisCertificate", rf, mock.Anything, mock.Anything).Once().Return(nil)
++	mrfs.On("EnsureRedisCACertSecret", rf, mock.Anything, mock.Anything).Once().Return("", nil)
++	podFacing := []string{"EnsureSentinelConfigMap", "EnsureRedisShutdownConfigMap", "EnsureRedisReadinessConfigMap", "EnsureRedisConfigMap"}
++	for _, method := range podFacing {
++		mrfs.On(method, rf, mock.Anything, mock.Anything).Return(nil).Maybe()
++	}
++	mrfs.On("EnsureRedisStatefulset", rf, mock.Anything, mock.Anything, mock.Anything).Return(nil).Maybe()
++	mrfs.On("EnsureSentinelDeployment", rf, mock.Anything, mock.Anything, mock.Anything).Return(nil).Maybe()
++
++	handler := rfOperator.NewRedisFailoverHandler(config, mrfs, mrfc, mrfh, mk, metrics.Dummy, log.Dummy)
++	err := handler.Ensure(rf, map[string]string{}, []metav1.OwnerReference{}, metrics.Dummy)
++
++	assert.NoError(err)
++	mrfs.AssertExpectations(t)
++	for _, method := range podFacing {
++		mrfs.AssertNotCalled(t, method, rf, mock.Anything, mock.Anything)
++	}
++	mrfs.AssertNotCalled(t, "EnsureRedisStatefulset", rf, mock.Anything, mock.Anything, mock.Anything)
++	mrfs.AssertNotCalled(t, "EnsureSentinelDeployment", rf, mock.Anything, mock.Anything, mock.Anything)
++}
+diff --git a/operator/redisfailover/factory.go b/operator/redisfailover/factory.go
+index 06fed56d..d5e3a6c2 100644
+--- a/operator/redisfailover/factory.go
++++ b/operator/redisfailover/factory.go
+@@ -34,7 +34,11 @@ const (
+ // to create redis failovers.
+ func New(cfg Config, k8sService k8s.Services, k8sClient kubernetes.Interface, lockNamespace string, redisClient redis.Client, kooperMetricsRecorder metrics.Recorder, logger log.Logger) (controller.Controller, error) {
+ 	// Create internal services.
+-	rfService := rfservice.NewRedisFailoverKubeClient(k8sService, logger, kooperMetricsRecorder)
++	clusterDomain := cfg.ClusterDomain
++	if clusterDomain == "" {
++		clusterDomain = DefaultClusterDomain
++	}
++	rfService := rfservice.NewRedisFailoverKubeClient(k8sService, logger, kooperMetricsRecorder, clusterDomain)
+ 	rfChecker := rfservice.NewRedisFailoverChecker(k8sService, redisClient, logger, kooperMetricsRecorder)
+ 	rfHealer := rfservice.NewRedisFailoverHealer(k8sService, redisClient, logger)
+ 
+diff --git a/operator/redisfailover/service/check.go b/operator/redisfailover/service/check.go
+index 3d91892c..f0585552 100644
+--- a/operator/redisfailover/service/check.go
++++ b/operator/redisfailover/service/check.go
+@@ -1,6 +1,7 @@
+ package service
+ 
+ import (
++	"crypto/tls"
+ 	"errors"
+ 	"fmt"
+ 	"strconv"
+@@ -17,6 +18,46 @@ import (
+ 	"github.com/freshworks/redis-operator/service/redis"
+ )
+ 
++// tlsConfigFor reads the cluster's TLS secret and builds the tls.Config
++// the operator uses to dial Redis and Sentinel pods. Returns (nil, nil)
++// when spec.tls.enabled is false, which is the signal callers feed to
++// the redis client to dial plaintext. ServerName is set to the redis
++// headless service name so the certificate's SAN list matches. The
++// operator's own client certificate is presented whenever the Secret
++// carries both tls.crt and tls.key, independently of spec.tls.authClients.
++func tlsConfigFor(s k8s.Services, rf *redisfailoverv1.RedisFailover) (*tls.Config, error) {
++	if !TLSEnabled(rf) {
++		return nil, nil
++	}
++	secretName := GetTLSSecretName(rf)
++	secret, err := s.GetSecret(rf.Namespace, secretName)
++	if err != nil {
++		return nil, fmt.Errorf("tls: reading secret %s/%s: %w", rf.Namespace, secretName, err)
++	}
++	caPEM, ok := secret.Data["ca.crt"]
++	if !ok {
++		return nil, fmt.Errorf("tls: secret %s/%s does not contain ca.crt", rf.Namespace, secretName)
++	}
++	if len(caPEM) == 0 {
++		return nil, fmt.Errorf("tls: secret %s/%s contains an empty ca.crt", rf.Namespace, secretName)
++	}
++	// Redis and Sentinel reject a client that presents no certificate
++	// while tls-auth-clients is yes. That directive is mutable and the
++	// pods keep enforcing the value they booted with until they roll, so
++	// a spec currently reading no is no evidence that the server will
++	// not ask. Present the pair whenever the Secret carries one:
++	// offering a certificate to a server that does not want it costs
++	// nothing, withholding it from a server that does locks the operator
++	// out of its own instance. A Secret without both halves yields no
++	// client certificate.
++	certPEM := secret.Data["tls.crt"]
++	keyPEM := secret.Data["tls.key"]
++	if len(certPEM) == 0 || len(keyPEM) == 0 {
++		certPEM, keyPEM = nil, nil
++	}
++	return redis.BuildTLSConfig(caPEM, certPEM, keyPEM, GetRedisName(rf))
++}
++
+ // RedisFailoverCheck defines the interface able to check the correct status of a redis failover
+ type RedisFailoverCheck interface {
+ 	CheckRedisNumber(rFailover *redisfailoverv1.RedisFailover) error
+@@ -26,7 +67,7 @@ type RedisFailoverCheck interface {
+ 	CheckSentinelSlavesNumberInMemory(sentinel string, rFailover *redisfailoverv1.RedisFailover) error
+ 	CheckSentinelQuorum(rFailover *redisfailoverv1.RedisFailover) (int, error)
+ 	CheckIfMasterLocalhost(rFailover *redisfailoverv1.RedisFailover) (bool, error)
+-	CheckSentinelMonitor(sentinel, masterName string, monitor ...string) error
++	CheckSentinelMonitor(rFailover *redisfailoverv1.RedisFailover, sentinel string, monitor ...string) error
+ 	GetMasterIP(rFailover *redisfailoverv1.RedisFailover) (string, error)
+ 	GetNumberMasters(rFailover *redisfailoverv1.RedisFailover) (int, error)
+ 	GetRedisesIPs(rFailover *redisfailoverv1.RedisFailover) ([]string, error)
+@@ -154,6 +195,11 @@ func (r *RedisFailoverChecker) CheckAllSlavesFromMaster(master string, rf *redis
+ 		return err
+ 	}
+ 
++	tlsConfig, err := tlsConfigFor(r.k8sService, rf)
++	if err != nil {
++		return err
++	}
++
+ 	rport := getRedisPort(rf.Spec.Redis.Port)
+ 	for _, rp := range rps.Items {
+ 		if rp.Status.PodIP == master {
+@@ -176,7 +222,7 @@ func (r *RedisFailoverChecker) CheckAllSlavesFromMaster(master string, rf *redis
+ 			}
+ 		}
+ 
+-		slave, err := r.redisClient.GetSlaveOf(rp.Status.PodIP, rport, password)
++		slave, err := r.redisClient.GetSlaveOf(rp.Status.PodIP, rport, password, tlsConfig)
+ 		if err != nil {
+ 			r.logger.Errorf("Get slave of master failed, maybe this node is not ready, pod ip: %s", rp.Status.PodIP)
+ 			return err
+@@ -190,7 +236,11 @@ func (r *RedisFailoverChecker) CheckAllSlavesFromMaster(master string, rf *redis
+ 
+ // CheckSentinelNumberInMemory controls that the provided sentinel has only the living sentinels on its memory.
+ func (r *RedisFailoverChecker) CheckSentinelNumberInMemory(sentinel string, rf *redisfailoverv1.RedisFailover) error {
+-	nSentinels, err := r.redisClient.GetNumberSentinelsInMemory(sentinel)
++	tlsConfig, err := tlsConfigFor(r.k8sService, rf)
++	if err != nil {
++		return err
++	}
++	nSentinels, err := r.redisClient.GetNumberSentinelsInMemory(sentinel, tlsConfig)
+ 	if err != nil {
+ 		return err
+ 	} else if nSentinels != rf.Spec.Sentinel.Replicas {
+@@ -217,9 +267,13 @@ func (r *RedisFailoverChecker) CheckIfMasterLocalhost(rFailover *redisfailoverv1
+ 		r.logger.Errorf("CheckIfMasterLocalhost -- GetRedisPassword Failed")
+ 		return false, err
+ 	}
++	tlsConfig, err := tlsConfigFor(r.k8sService, rFailover)
++	if err != nil {
++		return false, err
++	}
+ 	rport := getRedisPort(rFailover.Spec.Redis.Port)
+ 	for _, sip := range redisIps {
+-		master, err := r.redisClient.GetSlaveOf(sip, rport, password)
++		master, err := r.redisClient.GetSlaveOf(sip, rport, password, tlsConfig)
+ 		if err != nil {
+ 			r.logger.Warningf("CheckIfMasterLocalhost -- GetSlaveOf Failed")
+ 			return false, err
+@@ -257,9 +311,13 @@ func (r *RedisFailoverChecker) CheckSentinelQuorum(rFailover *redisfailoverv1.Re
+ 		return unhealthyCnt, errors.New("insufficnet sentinel to reach Quorum")
+ 	}
+ 
++	tlsConfig, err := tlsConfigFor(r.k8sService, rFailover)
++	if err != nil {
++		return unhealthyCnt, err
++	}
+ 	unhealthyCnt = 0
+ 	for _, sip := range sentinels {
+-		err = r.redisClient.SentinelCheckQuorum(sip, rFailover.MasterName())
++		err = r.redisClient.SentinelCheckQuorum(sip, rFailover.MasterName(), tlsConfig)
+ 		if err != nil {
+ 			unhealthyCnt += 1
+ 		} else {
+@@ -276,7 +334,11 @@ func (r *RedisFailoverChecker) CheckSentinelQuorum(rFailover *redisfailoverv1.Re
+ 
+ // CheckSentinelSlavesNumberInMemory controls that the provided sentinel has only the expected slaves number.
+ func (r *RedisFailoverChecker) CheckSentinelSlavesNumberInMemory(sentinel string, rf *redisfailoverv1.RedisFailover) error {
+-	nSlaves, err := r.redisClient.GetNumberSentinelSlavesInMemory(sentinel)
++	tlsConfig, err := tlsConfigFor(r.k8sService, rf)
++	if err != nil {
++		return err
++	}
++	nSlaves, err := r.redisClient.GetNumberSentinelSlavesInMemory(sentinel, tlsConfig)
+ 	if err != nil {
+ 		return err
+ 	} else {
+@@ -295,13 +357,17 @@ func (r *RedisFailoverChecker) CheckSentinelSlavesNumberInMemory(sentinel string
+ }
+ 
+ // CheckSentinelMonitor controls if the sentinels are monitoring the expected master
+-func (r *RedisFailoverChecker) CheckSentinelMonitor(sentinel, masterName string, monitor ...string) error {
++func (r *RedisFailoverChecker) CheckSentinelMonitor(rf *redisfailoverv1.RedisFailover, sentinel string, monitor ...string) error {
+ 	monitorIP := monitor[0]
+ 	monitorPort := ""
+ 	if len(monitor) > 1 {
+ 		monitorPort = monitor[1]
+ 	}
+-	actualMonitorIP, actualMonitorPort, err := r.redisClient.GetSentinelMonitor(sentinel, masterName)
++	tlsConfig, err := tlsConfigFor(r.k8sService, rf)
++	if err != nil {
++		return err
++	}
++	actualMonitorIP, actualMonitorPort, err := r.redisClient.GetSentinelMonitor(sentinel, rf.MasterName(), tlsConfig)
+ 	if err != nil {
+ 		return err
+ 	}
+@@ -323,10 +389,15 @@ func (r *RedisFailoverChecker) GetMasterIP(rf *redisfailoverv1.RedisFailover) (s
+ 		return "", err
+ 	}
+ 
++	tlsConfig, err := tlsConfigFor(r.k8sService, rf)
++	if err != nil {
++		return "", err
++	}
++
+ 	masters := []string{}
+ 	rport := getRedisPort(rf.Spec.Redis.Port)
+ 	for _, rip := range rips {
+-		master, err := r.redisClient.IsMaster(rip, rport, password)
++		master, err := r.redisClient.IsMaster(rip, rport, password, tlsConfig)
+ 		if err != nil {
+ 			r.logger.Errorf("Get redis info failed, maybe this node is not ready, pod ip: %s", rip)
+ 			continue
+@@ -357,9 +428,14 @@ func (r *RedisFailoverChecker) GetNumberMasters(rf *redisfailoverv1.RedisFailove
+ 		return nMasters, err
+ 	}
+ 
++	tlsConfig, err := tlsConfigFor(r.k8sService, rf)
++	if err != nil {
++		return nMasters, err
++	}
++
+ 	rport := getRedisPort(rf.Spec.Redis.Port)
+ 	for _, rip := range rips {
+-		master, err := r.redisClient.IsMaster(rip, rport, password)
++		master, err := r.redisClient.IsMaster(rip, rport, password, tlsConfig)
+ 		if err != nil {
+ 			r.logger.Errorf("Get redis info failed, maybe this node is not ready, pod ip: %s", rip)
+ 			continue
+@@ -435,10 +511,15 @@ func (r *RedisFailoverChecker) GetRedisesSlavesPods(rf *redisfailoverv1.RedisFai
+ 		return redises, err
+ 	}
+ 
++	tlsConfig, err := tlsConfigFor(r.k8sService, rf)
++	if err != nil {
++		return redises, err
++	}
++
+ 	rport := getRedisPort(rf.Spec.Redis.Port)
+ 	for _, rp := range rps.Items {
+ 		if rp.Status.Phase == corev1.PodRunning && rp.DeletionTimestamp == nil { // Only work with running
+-			master, err := r.redisClient.IsMaster(rp.Status.PodIP, rport, password)
++			master, err := r.redisClient.IsMaster(rp.Status.PodIP, rport, password, tlsConfig)
+ 			if err != nil {
+ 				return []string{}, err
+ 			}
+@@ -462,10 +543,15 @@ func (r *RedisFailoverChecker) GetRedisesMasterPod(rFailover *redisfailoverv1.Re
+ 		return "", err
+ 	}
+ 
++	tlsConfig, err := tlsConfigFor(r.k8sService, rFailover)
++	if err != nil {
++		return "", err
++	}
++
+ 	rport := getRedisPort(rFailover.Spec.Redis.Port)
+ 	for _, rp := range rps.Items {
+ 		if rp.Status.Phase == corev1.PodRunning && rp.DeletionTimestamp == nil { // Only work with running
+-			master, err := r.redisClient.IsMaster(rp.Status.PodIP, rport, password)
++			master, err := r.redisClient.IsMaster(rp.Status.PodIP, rport, password, tlsConfig)
+ 			if err != nil {
+ 				return "", err
+ 			}
+@@ -519,8 +605,13 @@ func (r *RedisFailoverChecker) CheckRedisSlavesReady(ip string, rFailover *redis
+ 		return false, err
+ 	}
+ 
++	tlsConfig, err := tlsConfigFor(r.k8sService, rFailover)
++	if err != nil {
++		return false, err
++	}
++
+ 	port := getRedisPort(rFailover.Spec.Redis.Port)
+-	return r.redisClient.SlaveIsReady(ip, port, password)
++	return r.redisClient.SlaveIsReady(ip, port, password, tlsConfig)
+ }
+ 
+ // IsRedisRunning returns true if all the pods are Running
+diff --git a/operator/redisfailover/service/check_test.go b/operator/redisfailover/service/check_test.go
+index 0aeae927..bfd55d99 100644
+--- a/operator/redisfailover/service/check_test.go
++++ b/operator/redisfailover/service/check_test.go
+@@ -210,7 +210,7 @@ func TestCheckAllSlavesFromMasterGetSlaveOfError(t *testing.T) {
+ 	ms.On("UpdatePodAnnotations", namespace, mock.AnythingOfType("string"), mock.Anything).Once().Return(nil)
+ 	ms.On("RemovePodAnnotation", namespace, mock.AnythingOfType("string"), mock.AnythingOfType("string")).Once().Return(nil)
+ 	mr := &mRedisService.Client{}
+-	mr.On("GetSlaveOf", "", "0", "").Once().Return("", errors.New(""))
++	mr.On("GetSlaveOf", "", "0", "", mock.Anything).Once().Return("", errors.New(""))
+ 
+ 	checker := rfservice.NewRedisFailoverChecker(ms, mr, log.DummyLogger{}, metrics.Dummy)
+ 
+@@ -240,7 +240,7 @@ func TestCheckAllSlavesFromMasterDifferentMaster(t *testing.T) {
+ 	ms.On("UpdatePodAnnotations", namespace, mock.AnythingOfType("string"), mock.Anything).Once().Return(nil)
+ 	ms.On("RemovePodAnnotation", namespace, mock.AnythingOfType("string"), mock.AnythingOfType("string")).Once().Return(nil)
+ 	mr := &mRedisService.Client{}
+-	mr.On("GetSlaveOf", "0.0.0.0", "0", "").Once().Return("1.1.1.1", nil)
++	mr.On("GetSlaveOf", "0.0.0.0", "0", "", mock.Anything).Once().Return("1.1.1.1", nil)
+ 
+ 	checker := rfservice.NewRedisFailoverChecker(ms, mr, log.DummyLogger{}, metrics.Dummy)
+ 
+@@ -270,7 +270,7 @@ func TestCheckAllSlavesFromMaster(t *testing.T) {
+ 	ms.On("UpdatePodAnnotations", namespace, mock.AnythingOfType("string"), mock.Anything).Once().Return(nil)
+ 	ms.On("RemovePodAnnotation", namespace, mock.AnythingOfType("string"), mock.AnythingOfType("string")).Once().Return(nil)
+ 	mr := &mRedisService.Client{}
+-	mr.On("GetSlaveOf", "0.0.0.0", "0", "").Once().Return("1.1.1.1", nil)
++	mr.On("GetSlaveOf", "0.0.0.0", "0", "", mock.Anything).Once().Return("1.1.1.1", nil)
+ 
+ 	checker := rfservice.NewRedisFailoverChecker(ms, mr, log.DummyLogger{}, metrics.Dummy)
+ 
+@@ -285,7 +285,7 @@ func TestCheckSentinelNumberInMemoryGetDeploymentPodsError(t *testing.T) {
+ 
+ 	ms := &mK8SService.Services{}
+ 	mr := &mRedisService.Client{}
+-	mr.On("GetNumberSentinelsInMemory", "1.1.1.1").Once().Return(int32(0), errors.New("expected error"))
++	mr.On("GetNumberSentinelsInMemory", "1.1.1.1", mock.Anything).Once().Return(int32(0), errors.New("expected error"))
+ 
+ 	checker := rfservice.NewRedisFailoverChecker(ms, mr, log.DummyLogger{}, metrics.Dummy)
+ 
+@@ -300,7 +300,7 @@ func TestCheckSentinelNumberInMemoryGetNumberSentinelInMemoryError(t *testing.T)
+ 
+ 	ms := &mK8SService.Services{}
+ 	mr := &mRedisService.Client{}
+-	mr.On("GetNumberSentinelsInMemory", "1.1.1.1").Once().Return(int32(0), errors.New(""))
++	mr.On("GetNumberSentinelsInMemory", "1.1.1.1", mock.Anything).Once().Return(int32(0), errors.New(""))
+ 
+ 	checker := rfservice.NewRedisFailoverChecker(ms, mr, log.DummyLogger{}, metrics.Dummy)
+ 
+@@ -315,7 +315,7 @@ func TestCheckSentinelNumberInMemoryNumberMismatch(t *testing.T) {
+ 
+ 	ms := &mK8SService.Services{}
+ 	mr := &mRedisService.Client{}
+-	mr.On("GetNumberSentinelsInMemory", "1.1.1.1").Once().Return(int32(4), nil)
++	mr.On("GetNumberSentinelsInMemory", "1.1.1.1", mock.Anything).Once().Return(int32(4), nil)
+ 
+ 	checker := rfservice.NewRedisFailoverChecker(ms, mr, log.DummyLogger{}, metrics.Dummy)
+ 
+@@ -330,7 +330,7 @@ func TestCheckSentinelNumberInMemory(t *testing.T) {
+ 
+ 	ms := &mK8SService.Services{}
+ 	mr := &mRedisService.Client{}
+-	mr.On("GetNumberSentinelsInMemory", "1.1.1.1").Once().Return(int32(3), nil)
++	mr.On("GetNumberSentinelsInMemory", "1.1.1.1", mock.Anything).Once().Return(int32(3), nil)
+ 
+ 	checker := rfservice.NewRedisFailoverChecker(ms, mr, log.DummyLogger{}, metrics.Dummy)
+ 
+@@ -345,7 +345,7 @@ func TestCheckSentinelSlavesNumberInMemoryGetNumberSentinelSlavesInMemoryError(t
+ 
+ 	ms := &mK8SService.Services{}
+ 	mr := &mRedisService.Client{}
+-	mr.On("GetNumberSentinelSlavesInMemory", "1.1.1.1").Once().Return(int32(0), errors.New(""))
++	mr.On("GetNumberSentinelSlavesInMemory", "1.1.1.1", mock.Anything).Once().Return(int32(0), errors.New(""))
+ 
+ 	checker := rfservice.NewRedisFailoverChecker(ms, mr, log.DummyLogger{}, metrics.Dummy)
+ 
+@@ -360,7 +360,7 @@ func TestCheckSentinelSlavesNumberInMemoryReplicasMismatch(t *testing.T) {
+ 
+ 	ms := &mK8SService.Services{}
+ 	mr := &mRedisService.Client{}
+-	mr.On("GetNumberSentinelSlavesInMemory", "1.1.1.1").Once().Return(int32(3), nil)
++	mr.On("GetNumberSentinelSlavesInMemory", "1.1.1.1", mock.Anything).Once().Return(int32(3), nil)
+ 
+ 	checker := rfservice.NewRedisFailoverChecker(ms, mr, log.DummyLogger{}, metrics.Dummy)
+ 
+@@ -376,7 +376,7 @@ func TestCheckSentinelSlavesNumberInMemory(t *testing.T) {
+ 
+ 	ms := &mK8SService.Services{}
+ 	mr := &mRedisService.Client{}
+-	mr.On("GetNumberSentinelSlavesInMemory", "1.1.1.1").Once().Return(int32(4), nil)
++	mr.On("GetNumberSentinelSlavesInMemory", "1.1.1.1", mock.Anything).Once().Return(int32(4), nil)
+ 
+ 	checker := rfservice.NewRedisFailoverChecker(ms, mr, log.DummyLogger{}, metrics.Dummy)
+ 
+@@ -389,11 +389,11 @@ func TestCheckSentinelMonitorGetSentinelMonitorError(t *testing.T) {
+ 
+ 	ms := &mK8SService.Services{}
+ 	mr := &mRedisService.Client{}
+-	mr.On("GetSentinelMonitor", "0.0.0.0", "mymaster").Once().Return("", "", errors.New(""))
++	mr.On("GetSentinelMonitor", "0.0.0.0", "mymaster", mock.Anything).Once().Return("", "", errors.New(""))
+ 
+ 	checker := rfservice.NewRedisFailoverChecker(ms, mr, log.DummyLogger{}, metrics.Dummy)
+ 
+-	err := checker.CheckSentinelMonitor("0.0.0.0", "mymaster", "1.1.1.1")
++	err := checker.CheckSentinelMonitor(generateRF(), "0.0.0.0", "1.1.1.1")
+ 	assert.Error(err)
+ }
+ 
+@@ -402,11 +402,11 @@ func TestCheckSentinelMonitorMismatch(t *testing.T) {
+ 
+ 	ms := &mK8SService.Services{}
+ 	mr := &mRedisService.Client{}
+-	mr.On("GetSentinelMonitor", "0.0.0.0", "mymaster").Once().Return("2.2.2.2", "6379", nil)
++	mr.On("GetSentinelMonitor", "0.0.0.0", "mymaster", mock.Anything).Once().Return("2.2.2.2", "6379", nil)
+ 
+ 	checker := rfservice.NewRedisFailoverChecker(ms, mr, log.DummyLogger{}, metrics.Dummy)
+ 
+-	err := checker.CheckSentinelMonitor("0.0.0.0", "mymaster", "1.1.1.1")
++	err := checker.CheckSentinelMonitor(generateRF(), "0.0.0.0", "1.1.1.1")
+ 	assert.Error(err)
+ }
+ 
+@@ -415,11 +415,11 @@ func TestCheckSentinelMonitor(t *testing.T) {
+ 
+ 	ms := &mK8SService.Services{}
+ 	mr := &mRedisService.Client{}
+-	mr.On("GetSentinelMonitor", "0.0.0.0", "mymaster").Once().Return("1.1.1.1", "6379", nil)
++	mr.On("GetSentinelMonitor", "0.0.0.0", "mymaster", mock.Anything).Once().Return("1.1.1.1", "6379", nil)
+ 
+ 	checker := rfservice.NewRedisFailoverChecker(ms, mr, log.DummyLogger{}, metrics.Dummy)
+ 
+-	err := checker.CheckSentinelMonitor("0.0.0.0", "mymaster", "1.1.1.1")
++	err := checker.CheckSentinelMonitor(generateRF(), "0.0.0.0", "1.1.1.1")
+ 	assert.NoError(err)
+ }
+ 
+@@ -428,11 +428,11 @@ func TestCheckSentinelMonitorWithPort(t *testing.T) {
+ 
+ 	ms := &mK8SService.Services{}
+ 	mr := &mRedisService.Client{}
+-	mr.On("GetSentinelMonitor", "0.0.0.0", "mymaster").Once().Return("1.1.1.1", "6379", nil)
++	mr.On("GetSentinelMonitor", "0.0.0.0", "mymaster", mock.Anything).Once().Return("1.1.1.1", "6379", nil)
+ 
+ 	checker := rfservice.NewRedisFailoverChecker(ms, mr, log.DummyLogger{}, metrics.Dummy)
+ 
+-	err := checker.CheckSentinelMonitor("0.0.0.0", "mymaster", "1.1.1.1", "6379")
++	err := checker.CheckSentinelMonitor(generateRF(), "0.0.0.0", "1.1.1.1", "6379")
+ 	assert.NoError(err)
+ }
+ 
+@@ -441,11 +441,11 @@ func TestCheckSentinelMonitorWithPortMismatch(t *testing.T) {
+ 
+ 	ms := &mK8SService.Services{}
+ 	mr := &mRedisService.Client{}
+-	mr.On("GetSentinelMonitor", "0.0.0.0", "mymaster").Once().Return("1.1.1.1", "6379", nil)
++	mr.On("GetSentinelMonitor", "0.0.0.0", "mymaster", mock.Anything).Once().Return("1.1.1.1", "6379", nil)
+ 
+ 	checker := rfservice.NewRedisFailoverChecker(ms, mr, log.DummyLogger{}, metrics.Dummy)
+ 
+-	err := checker.CheckSentinelMonitor("0.0.0.0", "mymaster", "0.0.0.0", "6379")
++	err := checker.CheckSentinelMonitor(generateRF(), "0.0.0.0", "0.0.0.0", "6379")
+ 	assert.Error(err)
+ }
+ 
+@@ -454,11 +454,11 @@ func TestCheckSentinelMonitorWithPortIPMismatch(t *testing.T) {
+ 
+ 	ms := &mK8SService.Services{}
+ 	mr := &mRedisService.Client{}
+-	mr.On("GetSentinelMonitor", "0.0.0.0", "mymaster").Once().Return("1.1.1.1", "6379", nil)
++	mr.On("GetSentinelMonitor", "0.0.0.0", "mymaster", mock.Anything).Once().Return("1.1.1.1", "6379", nil)
+ 
+ 	checker := rfservice.NewRedisFailoverChecker(ms, mr, log.DummyLogger{}, metrics.Dummy)
+ 
+-	err := checker.CheckSentinelMonitor("0.0.0.0", "mymaster", "1.1.1.1", "6380")
++	err := checker.CheckSentinelMonitor(generateRF(), "0.0.0.0", "1.1.1.1", "6380")
+ 	assert.Error(err)
+ }
+ 
+@@ -496,7 +496,7 @@ func TestGetMasterIPIsMasterError(t *testing.T) {
+ 	ms := &mK8SService.Services{}
+ 	ms.On("GetStatefulSetPods", namespace, rfservice.GetRedisName(rf)).Once().Return(pods, nil)
+ 	mr := &mRedisService.Client{}
+-	mr.On("IsMaster", "0.0.0.0", "0", "").Once().Return(false, errors.New(""))
++	mr.On("IsMaster", "0.0.0.0", "0", "", mock.Anything).Once().Return(false, errors.New(""))
+ 
+ 	checker := rfservice.NewRedisFailoverChecker(ms, mr, log.DummyLogger{}, metrics.Dummy)
+ 
+@@ -529,8 +529,8 @@ func TestGetMasterIPMultipleMastersError(t *testing.T) {
+ 	ms := &mK8SService.Services{}
+ 	ms.On("GetStatefulSetPods", namespace, rfservice.GetRedisName(rf)).Once().Return(pods, nil)
+ 	mr := &mRedisService.Client{}
+-	mr.On("IsMaster", "0.0.0.0", "0", "").Once().Return(true, nil)
+-	mr.On("IsMaster", "1.1.1.1", "0", "").Once().Return(true, nil)
++	mr.On("IsMaster", "0.0.0.0", "0", "", mock.Anything).Once().Return(true, nil)
++	mr.On("IsMaster", "1.1.1.1", "0", "", mock.Anything).Once().Return(true, nil)
+ 
+ 	checker := rfservice.NewRedisFailoverChecker(ms, mr, log.DummyLogger{}, metrics.Dummy)
+ 
+@@ -563,8 +563,8 @@ func TestGetMasterIP(t *testing.T) {
+ 	ms := &mK8SService.Services{}
+ 	ms.On("GetStatefulSetPods", namespace, rfservice.GetRedisName(rf)).Once().Return(pods, nil)
+ 	mr := &mRedisService.Client{}
+-	mr.On("IsMaster", "0.0.0.0", "0", "").Once().Return(true, nil)
+-	mr.On("IsMaster", "1.1.1.1", "0", "").Once().Return(false, nil)
++	mr.On("IsMaster", "0.0.0.0", "0", "", mock.Anything).Once().Return(true, nil)
++	mr.On("IsMaster", "1.1.1.1", "0", "", mock.Anything).Once().Return(false, nil)
+ 
+ 	checker := rfservice.NewRedisFailoverChecker(ms, mr, log.DummyLogger{}, metrics.Dummy)
+ 
+@@ -607,7 +607,7 @@ func TestGetNumberMastersIsMasterError(t *testing.T) {
+ 	ms := &mK8SService.Services{}
+ 	ms.On("GetStatefulSetPods", namespace, rfservice.GetRedisName(rf)).Once().Return(pods, nil)
+ 	mr := &mRedisService.Client{}
+-	mr.On("IsMaster", "0.0.0.0", "0", "").Once().Return(true, errors.New(""))
++	mr.On("IsMaster", "0.0.0.0", "0", "", mock.Anything).Once().Return(true, errors.New(""))
+ 
+ 	checker := rfservice.NewRedisFailoverChecker(ms, mr, log.DummyLogger{}, metrics.Dummy)
+ 
+@@ -640,8 +640,8 @@ func TestGetNumberMasters(t *testing.T) {
+ 	ms := &mK8SService.Services{}
+ 	ms.On("GetStatefulSetPods", namespace, rfservice.GetRedisName(rf)).Once().Return(pods, nil)
+ 	mr := &mRedisService.Client{}
+-	mr.On("IsMaster", "0.0.0.0", "0", "").Once().Return(true, nil)
+-	mr.On("IsMaster", "1.1.1.1", "0", "").Once().Return(false, nil)
++	mr.On("IsMaster", "0.0.0.0", "0", "", mock.Anything).Once().Return(true, nil)
++	mr.On("IsMaster", "1.1.1.1", "0", "", mock.Anything).Once().Return(false, nil)
+ 
+ 	checker := rfservice.NewRedisFailoverChecker(ms, mr, log.DummyLogger{}, metrics.Dummy)
+ 
+@@ -675,8 +675,8 @@ func TestGetNumberMastersTwo(t *testing.T) {
+ 	ms := &mK8SService.Services{}
+ 	ms.On("GetStatefulSetPods", namespace, rfservice.GetRedisName(rf)).Once().Return(pods, nil)
+ 	mr := &mRedisService.Client{}
+-	mr.On("IsMaster", "0.0.0.0", "0", "").Once().Return(true, nil)
+-	mr.On("IsMaster", "1.1.1.1", "0", "").Once().Return(true, nil)
++	mr.On("IsMaster", "0.0.0.0", "0", "", mock.Anything).Once().Return(true, nil)
++	mr.On("IsMaster", "1.1.1.1", "0", "", mock.Anything).Once().Return(true, nil)
+ 
+ 	checker := rfservice.NewRedisFailoverChecker(ms, mr, log.DummyLogger{}, metrics.Dummy)
+ 
+@@ -780,8 +780,8 @@ func TestGetRedisPodsNames(t *testing.T) {
+ 	ms := &mK8SService.Services{}
+ 	ms.On("GetStatefulSetPods", namespace, rfservice.GetRedisName(rf)).Once().Return(pods, nil)
+ 	mr := &mRedisService.Client{}
+-	mr.On("IsMaster", "0.0.0.0", "0", "").Twice().Return(false, nil)
+-	mr.On("IsMaster", "1.1.1.1", "0", "").Once().Return(true, nil)
++	mr.On("IsMaster", "0.0.0.0", "0", "", mock.Anything).Twice().Return(false, nil)
++	mr.On("IsMaster", "1.1.1.1", "0", "", mock.Anything).Once().Return(true, nil)
+ 
+ 	checker := rfservice.NewRedisFailoverChecker(ms, mr, log.DummyLogger{}, metrics.Dummy)
+ 	master, err := checker.GetRedisesMasterPod(rf)
+@@ -791,8 +791,8 @@ func TestGetRedisPodsNames(t *testing.T) {
+ 	assert.Equal(master, "master")
+ 
+ 	ms.On("GetStatefulSetPods", namespace, rfservice.GetRedisName(rf)).Once().Return(pods, nil)
+-	mr.On("IsMaster", "0.0.0.0", "0", "").Twice().Return(false, nil)
+-	mr.On("IsMaster", "1.1.1.1", "0", "").Once().Return(true, nil)
++	mr.On("IsMaster", "0.0.0.0", "0", "", mock.Anything).Twice().Return(false, nil)
++	mr.On("IsMaster", "1.1.1.1", "0", "", mock.Anything).Once().Return(true, nil)
+ 
+ 	namePods, err := checker.GetRedisesSlavesPods(rf)
+ 
+diff --git a/operator/redisfailover/service/check_tls_test.go b/operator/redisfailover/service/check_tls_test.go
+new file mode 100644
+index 00000000..a1f83127
+--- /dev/null
++++ b/operator/redisfailover/service/check_tls_test.go
+@@ -0,0 +1,212 @@
++package service
++
++import (
++	"crypto/rand"
++	"crypto/rsa"
++	"crypto/x509"
++	"crypto/x509/pkix"
++	"encoding/pem"
++	"math/big"
++	"testing"
++	"time"
++
++	"github.com/stretchr/testify/assert"
++	corev1 "k8s.io/api/core/v1"
++	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
++
++	redisfailoverv1 "github.com/freshworks/redis-operator/api/redisfailover/v1"
++	mK8SService "github.com/freshworks/redis-operator/mocks/service/k8s"
++)
++
++// tlsConfigRF returns a TLS-enabled RedisFailover with the given
++// tls-auth-clients value, bring-your-own-secret mode so the secret name is
++// predictable.
++func tlsConfigRF(authClients string) *redisfailoverv1.RedisFailover {
++	return &redisfailoverv1.RedisFailover{
++		ObjectMeta: metav1.ObjectMeta{Name: "test", Namespace: "testns"},
++		Spec: redisfailoverv1.RedisFailoverSpec{
++			TLS: &redisfailoverv1.TLSSettings{
++				Enabled:     true,
++				AuthClients: authClients,
++			},
++		},
++	}
++}
++
++// tlsSecretService returns a k8s service mock that hands back the cluster's
++// TLS secret with the given contents.
++func tlsSecretService(rf *redisfailoverv1.RedisFailover, data map[string][]byte) *mK8SService.Services {
++	name := GetTLSSecretName(rf)
++	ms := &mK8SService.Services{}
++	ms.On("GetSecret", rf.Namespace, name).Return(&corev1.Secret{
++		ObjectMeta: metav1.ObjectMeta{Name: name, Namespace: rf.Namespace},
++		Data:       data,
++	}, nil)
++	return ms
++}
++
++// TestTLSConfigForPresentsClientCertificate pins the operator's client
++// credentials to what the TLS secret carries rather than to
++// spec.tls.authClients. The directive is mutable, and the running pods keep
++// enforcing the value they booted with, so gating the certificate on the spec
++// leaves the operator unable to reach its own instance for as long as a flip
++// to "no" is pending on pods that still demand one.
++func TestTLSConfigForPresentsClientCertificate(t *testing.T) {
++	t.Parallel()
++	ca := tlsTestCA(t)
++	cert, key := tlsTestClientPair(t)
++
++	cases := []struct {
++		name        string
++		authClients string
++		data        map[string][]byte
++		wantCerts   int
++	}{
++		{
++			name:        "authClients no presents the pair the secret carries",
++			authClients: redisfailoverv1.TLSAuthClientsNo,
++			data:        map[string][]byte{"ca.crt": ca, "tls.crt": cert, "tls.key": key},
++			wantCerts:   1,
++		},
++		{
++			name:        "authClients optional presents the pair",
++			authClients: redisfailoverv1.TLSAuthClientsOptional,
++			data:        map[string][]byte{"ca.crt": ca, "tls.crt": cert, "tls.key": key},
++			wantCerts:   1,
++		},
++		{
++			name:        "authClients yes presents the pair",
++			authClients: redisfailoverv1.TLSAuthClientsYes,
++			data:        map[string][]byte{"ca.crt": ca, "tls.crt": cert, "tls.key": key},
++			wantCerts:   1,
++		},
++		{
++			name:        "an unset authClients presents the pair",
++			authClients: "",
++			data:        map[string][]byte{"ca.crt": ca, "tls.crt": cert, "tls.key": key},
++			wantCerts:   1,
++		},
++		{
++			name:        "a CA-only secret yields no client certificate",
++			authClients: redisfailoverv1.TLSAuthClientsNo,
++			data:        map[string][]byte{"ca.crt": ca},
++			wantCerts:   0,
++		},
++		{
++			name:        "a certificate without its key yields no client certificate",
++			authClients: redisfailoverv1.TLSAuthClientsYes,
++			data:        map[string][]byte{"ca.crt": ca, "tls.crt": cert},
++			wantCerts:   0,
++		},
++		{
++			name:        "a key without its certificate yields no client certificate",
++			authClients: redisfailoverv1.TLSAuthClientsYes,
++			data:        map[string][]byte{"ca.crt": ca, "tls.key": key},
++			wantCerts:   0,
++		},
++	}
++
++	for _, tc := range cases {
++		t.Run(tc.name, func(t *testing.T) {
++			t.Parallel()
++			a := assert.New(t)
++			rf := tlsConfigRF(tc.authClients)
++
++			cfg, err := tlsConfigFor(tlsSecretService(rf, tc.data), rf)
++			if !a.NoError(err) {
++				return
++			}
++			if !a.NotNil(cfg) {
++				return
++			}
++			a.Len(cfg.Certificates, tc.wantCerts)
++			a.NotNil(cfg.RootCAs, "the CA bundle must always be loaded")
++			a.Equal(GetRedisName(rf), cfg.ServerName)
++		})
++	}
++}
++
++func TestTLSConfigForDisabledDialsPlaintext(t *testing.T) {
++	t.Parallel()
++	a := assert.New(t)
++	rf := tlsConfigRF(redisfailoverv1.TLSAuthClientsYes)
++	rf.Spec.TLS.Enabled = false
++
++	cfg, err := tlsConfigFor(&mK8SService.Services{}, rf)
++	a.NoError(err)
++	a.Nil(cfg, "TLS off must yield the nil config that makes callers dial plaintext")
++}
++
++func TestTLSConfigForRejectsSecretWithoutCA(t *testing.T) {
++	t.Parallel()
++	cert, key := tlsTestClientPair(t)
++
++	cases := []struct {
++		name string
++		data map[string][]byte
++	}{
++		{"no ca.crt at all", map[string][]byte{"tls.crt": cert, "tls.key": key}},
++		{"an empty ca.crt", map[string][]byte{"ca.crt": {}, "tls.crt": cert, "tls.key": key}},
++	}
++
++	for _, tc := range cases {
++		t.Run(tc.name, func(t *testing.T) {
++			t.Parallel()
++			a := assert.New(t)
++			rf := tlsConfigRF(redisfailoverv1.TLSAuthClientsNo)
++
++			_, err := tlsConfigFor(tlsSecretService(rf, tc.data), rf)
++			if a.Error(err) {
++				a.Contains(err.Error(), "ca.crt")
++			}
++		})
++	}
++}
++
++// tlsTestCA mints a self-signed CA certificate in PEM form.
++func tlsTestCA(t *testing.T) []byte {
++	t.Helper()
++	priv, err := rsa.GenerateKey(rand.Reader, 2048)
++	if err != nil {
++		t.Fatalf("rsa.GenerateKey: %v", err)
++	}
++	tmpl := &x509.Certificate{
++		SerialNumber:          big.NewInt(1),
++		Subject:               pkix.Name{CommonName: "test-ca"},
++		NotBefore:             time.Now().Add(-time.Hour),
++		NotAfter:              time.Now().Add(time.Hour),
++		KeyUsage:              x509.KeyUsageCertSign,
++		BasicConstraintsValid: true,
++		IsCA:                  true,
++	}
++	der, err := x509.CreateCertificate(rand.Reader, tmpl, tmpl, &priv.PublicKey, priv)
++	if err != nil {
++		t.Fatalf("x509.CreateCertificate: %v", err)
++	}
++	return pem.EncodeToMemory(&pem.Block{Type: "CERTIFICATE", Bytes: der})
++}
++
++// tlsTestClientPair mints a self-signed leaf certificate and its key, both in
++// PEM form, standing in for the tls.crt/tls.key a cert-manager secret carries.
++func tlsTestClientPair(t *testing.T) (certPEM, keyPEM []byte) {
++	t.Helper()
++	priv, err := rsa.GenerateKey(rand.Reader, 2048)
++	if err != nil {
++		t.Fatalf("rsa.GenerateKey: %v", err)
++	}
++	tmpl := &x509.Certificate{
++		SerialNumber: big.NewInt(2),
++		Subject:      pkix.Name{CommonName: "test-client"},
++		NotBefore:    time.Now().Add(-time.Hour),
++		NotAfter:     time.Now().Add(time.Hour),
++		KeyUsage:     x509.KeyUsageDigitalSignature | x509.KeyUsageKeyEncipherment,
++		ExtKeyUsage:  []x509.ExtKeyUsage{x509.ExtKeyUsageClientAuth},
++	}
++	der, err := x509.CreateCertificate(rand.Reader, tmpl, tmpl, &priv.PublicKey, priv)
++	if err != nil {
++		t.Fatalf("x509.CreateCertificate: %v", err)
++	}
++	certPEM = pem.EncodeToMemory(&pem.Block{Type: "CERTIFICATE", Bytes: der})
++	keyPEM = pem.EncodeToMemory(&pem.Block{Type: "RSA PRIVATE KEY", Bytes: x509.MarshalPKCS1PrivateKey(priv)})
++	return certPEM, keyPEM
++}
+diff --git a/operator/redisfailover/service/client.go b/operator/redisfailover/service/client.go
+index b03b1fb6..b83ba64e 100644
+--- a/operator/redisfailover/service/client.go
++++ b/operator/redisfailover/service/client.go
+@@ -4,6 +4,7 @@ import (
+ 	"fmt"
+ 	"strings"
+ 
++	apierrors "k8s.io/apimachinery/pkg/api/errors"
+ 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+ 	"k8s.io/apimachinery/pkg/util/intstr"
+ 
+@@ -19,8 +20,8 @@ import (
+ type RedisFailoverClient interface {
+ 	EnsureSentinelService(rFailover *redisfailoverv1.RedisFailover, labels map[string]string, ownerRefs []metav1.OwnerReference) error
+ 	EnsureSentinelConfigMap(rFailover *redisfailoverv1.RedisFailover, labels map[string]string, ownerRefs []metav1.OwnerReference) error
+-	EnsureSentinelDeployment(rFailover *redisfailoverv1.RedisFailover, labels map[string]string, ownerRefs []metav1.OwnerReference) error
+-	EnsureRedisStatefulset(rFailover *redisfailoverv1.RedisFailover, labels map[string]string, ownerRefs []metav1.OwnerReference) error
++	EnsureSentinelDeployment(rFailover *redisfailoverv1.RedisFailover, labels map[string]string, ownerRefs []metav1.OwnerReference, tlsHash string) error
++	EnsureRedisStatefulset(rFailover *redisfailoverv1.RedisFailover, labels map[string]string, ownerRefs []metav1.OwnerReference, tlsHash string) error
+ 	EnsureRedisService(rFailover *redisfailoverv1.RedisFailover, labels map[string]string, ownerRefs []metav1.OwnerReference) error
+ 	EnsureRedisMasterService(rFailover *redisfailoverv1.RedisFailover, labels map[string]string, ownerRefs []metav1.OwnerReference) error
+ 	EnsureRedisSlaveService(rFailover *redisfailoverv1.RedisFailover, labels map[string]string, ownerRefs []metav1.OwnerReference) error
+@@ -28,6 +29,8 @@ type RedisFailoverClient interface {
+ 	EnsureRedisReadinessConfigMap(rFailover *redisfailoverv1.RedisFailover, labels map[string]string, ownerRefs []metav1.OwnerReference) error
+ 	EnsureRedisConfigMap(rFailover *redisfailoverv1.RedisFailover, labels map[string]string, ownerRefs []metav1.OwnerReference) error
+ 	EnsureNotPresentRedisService(rFailover *redisfailoverv1.RedisFailover) error
++	EnsureRedisCertificate(rFailover *redisfailoverv1.RedisFailover, labels map[string]string, ownerRefs []metav1.OwnerReference) error
++	EnsureRedisCACertSecret(rFailover *redisfailoverv1.RedisFailover, labels map[string]string, ownerRefs []metav1.OwnerReference) (string, error)
+ }
+ 
+ // RedisFailoverKubeClient implements the required methods to talk with kubernetes
+@@ -35,14 +38,26 @@ type RedisFailoverKubeClient struct {
+ 	K8SService    k8s.Services
+ 	logger        log.Logger
+ 	metricsClient metrics.Recorder
++	// clusterDomain is the cluster's DNS suffix (e.g. "cluster.local",
++	// "cozy.local") used to template the FQDN SANs on the cert-manager
++	// Certificate. Empty falls back to "cluster.local" so existing
++	// deployments that never set --cluster-domain keep working.
++	clusterDomain string
+ }
+ 
+-// NewRedisFailoverKubeClient creates a new RedisFailoverKubeClient
+-func NewRedisFailoverKubeClient(k8sService k8s.Services, logger log.Logger, metricsClient metrics.Recorder) *RedisFailoverKubeClient {
++// NewRedisFailoverKubeClient creates a new RedisFailoverKubeClient.
++// clusterDomain controls the *.svc.<domain> SAN entries on the
++// generated cert-manager Certificate; pass an empty string to fall
++// back to the upstream Kubernetes default ("cluster.local").
++func NewRedisFailoverKubeClient(k8sService k8s.Services, logger log.Logger, metricsClient metrics.Recorder, clusterDomain string) *RedisFailoverKubeClient {
++	if clusterDomain == "" {
++		clusterDomain = "cluster.local"
++	}
+ 	return &RedisFailoverKubeClient{
+ 		K8SService:    k8sService,
+ 		logger:        logger,
+ 		metricsClient: metricsClient,
++		clusterDomain: clusterDomain,
+ 	}
+ }
+ 
+@@ -98,22 +113,24 @@ func (r *RedisFailoverKubeClient) EnsureSentinelConfigMap(rf *redisfailoverv1.Re
+ 	return err
+ }
+ 
+-// EnsureSentinelDeployment makes sure the sentinel deployment exists in the desired state
+-func (r *RedisFailoverKubeClient) EnsureSentinelDeployment(rf *redisfailoverv1.RedisFailover, labels map[string]string, ownerRefs []metav1.OwnerReference) error {
++// EnsureSentinelDeployment makes sure the sentinel deployment exists in the desired state.
++// tlsHash is stamped on the pod template so a renewed TLS Secret rolls the pods.
++func (r *RedisFailoverKubeClient) EnsureSentinelDeployment(rf *redisfailoverv1.RedisFailover, labels map[string]string, ownerRefs []metav1.OwnerReference, tlsHash string) error {
+ 	if !rf.Spec.Sentinel.DisablePodDisruptionBudget {
+ 		if err := r.ensurePodDisruptionBudget(rf, sentinelName, sentinelRoleName, labels, ownerRefs); err != nil {
+ 			return err
+ 		}
+ 	}
+-	d := generateSentinelDeployment(rf, labels, ownerRefs)
++	d := generateSentinelDeployment(rf, labels, ownerRefs, tlsHash)
+ 	err := r.K8SService.CreateOrUpdateDeployment(rf.Namespace, d)
+ 
+ 	r.setEnsureOperationMetrics(d.Namespace, d.Name, "Deployment", rf.Name, err)
+ 	return err
+ }
+ 
+-// EnsureRedisStatefulset makes sure the redis statefulset exists in the desired state
+-func (r *RedisFailoverKubeClient) EnsureRedisStatefulset(rf *redisfailoverv1.RedisFailover, labels map[string]string, ownerRefs []metav1.OwnerReference) error {
++// EnsureRedisStatefulset makes sure the redis statefulset exists in the desired state.
++// tlsHash is stamped on the pod template so a renewed TLS Secret rolls the pods.
++func (r *RedisFailoverKubeClient) EnsureRedisStatefulset(rf *redisfailoverv1.RedisFailover, labels map[string]string, ownerRefs []metav1.OwnerReference, tlsHash string) error {
+ 	if !rf.Spec.Redis.DisablePodDisruptionBudget {
+ 		if err := r.ensurePodDisruptionBudget(rf, redisName, redisRoleName, labels, ownerRefs); err != nil {
+ 			return err
+@@ -126,7 +143,7 @@ func (r *RedisFailoverKubeClient) EnsureRedisStatefulset(rf *redisfailoverv1.Red
+ 	}
+ 
+ 	// Generate and create/update StatefulSet
+-	ss := generateRedisStatefulSet(rf, labels, ownerRefs)
++	ss := generateRedisStatefulSet(rf, labels, ownerRefs, tlsHash)
+ 	err := r.K8SService.CreateOrUpdateStatefulSet(rf.Namespace, ss)
+ 
+ 	r.setEnsureOperationMetrics(ss.Namespace, ss.Name, "StatefulSet", rf.Name, err)
+@@ -277,6 +294,68 @@ func (r *RedisFailoverKubeClient) EnsureRedisReadinessConfigMap(rf *redisfailove
+ 	return err
+ }
+ 
++// EnsureRedisCertificate ensures the cert-manager Certificate resource
++// exists when spec.tls.certManager is configured. It is a no-op for any
++// other TLS mode (disabled, or bring-your-own-secret).
++func (r *RedisFailoverKubeClient) EnsureRedisCertificate(rf *redisfailoverv1.RedisFailover, labels map[string]string, ownerRefs []metav1.OwnerReference) error {
++	if !TLSEnabled(rf) || rf.Spec.TLS.CertManager == nil {
++		return nil
++	}
++	cert := generateRedisCertificate(rf, labels, ownerRefs, r.clusterDomain)
++	err := r.K8SService.CreateOrUpdateCertificate(rf.Namespace, cert)
++	r.setEnsureOperationMetrics(cert.Namespace, cert.Name, "Certificate", rf.Name, err)
++	return err
++}
++
++// EnsureRedisCACertSecret publishes an Opaque Secret containing only ca.crt,
++// extracted from the cluster's TLS secret. The CA-only Secret never holds a
++// private key, so RBAC can be scoped to it to let clients verify the Redis
++// server without exposing tls.key. It is a no-op when TLS is disabled and
++// applies to both cert-manager and bring-your-own-secret modes.
++//
++// The source TLS secret is populated asynchronously by cert-manager, or
++// managed externally in bring-your-own mode, so a missing secret or a
++// missing/empty ca.crt is treated as "not ready yet": the method logs and
++// returns nil so the rest of the reconcile proceeds and a later pass
++// republishes the CA certificate once it becomes available.
++//
++// It also returns a content hash of the TLS secret it read, folded together
++// with the effective tls-auth-clients value, for the caller to stamp on the
++// Redis and Sentinel pod templates. This is the only read of
++// that secret in the Ensure phase, so the hash is derived here rather than
++// from a second GET there; the check-and-heal phase reads it again for every
++// Redis or Sentinel client it builds, see tlsConfigFor. The hash is empty
++// whenever there is nothing to pin yet: TLS disabled, secret absent, or no
++// tls.crt in it.
++func (r *RedisFailoverKubeClient) EnsureRedisCACertSecret(rf *redisfailoverv1.RedisFailover, labels map[string]string, ownerRefs []metav1.OwnerReference) (string, error) {
++	if !TLSEnabled(rf) {
++		return "", nil
++	}
++	srcName := GetTLSSecretName(rf)
++	src, err := r.K8SService.GetSecret(rf.Namespace, srcName)
++	if err != nil {
++		if apierrors.IsNotFound(err) {
++			r.logger.WithField("namespace", rf.Namespace).WithField("secret", srcName).
++				Debugf("TLS secret not present yet; deferring CA cert secret to a later reconcile")
++			return "", nil
++		}
++		return "", err
++	}
++	// Taken before the ca.crt check below, so that a secret carrying a
++	// serving certificate but no CA yet still pins the pods to it.
++	tlsHash := tlsSecretContentHash(rf, src)
++	caPEM := src.Data[tlsSecretCAKey]
++	if len(caPEM) == 0 {
++		r.logger.WithField("namespace", rf.Namespace).WithField("secret", srcName).
++			Debugf("TLS secret has no %q yet; deferring CA cert secret to a later reconcile", tlsSecretCAKey)
++		return tlsHash, nil
++	}
++	secret := generateRedisCACertSecret(rf, labels, ownerRefs, caPEM)
++	err = r.K8SService.CreateOrUpdateSecret(rf.Namespace, secret)
++	r.setEnsureOperationMetrics(secret.Namespace, secret.Name, "Secret", rf.Name, err)
++	return tlsHash, err
++}
++
+ // EnsureRedisService makes sure the redis statefulset exists
+ func (r *RedisFailoverKubeClient) EnsureRedisService(rf *redisfailoverv1.RedisFailover, labels map[string]string, ownerRefs []metav1.OwnerReference) error {
+ 	svc := generateRedisService(rf, labels, ownerRefs)
+diff --git a/operator/redisfailover/service/constants.go b/operator/redisfailover/service/constants.go
+index 557e4bba..9ff13c1a 100644
+--- a/operator/redisfailover/service/constants.go
++++ b/operator/redisfailover/service/constants.go
+@@ -25,10 +25,43 @@ const (
+ 	redisShutdownName      = "r-s"
+ 	redisReadinessName     = "r-readiness"
+ 	redisRoleName          = "redis"
++	tlsCertificateName     = "tls"
+ 	appLabel               = "redis-failover"
+ 	hostnameTopologyKey    = "kubernetes.io/hostname"
+ )
+ 
++// TLS volume / file layout.
++//
++// cert-manager produces a Secret with three well-known keys (tls.crt,
++// tls.key, ca.crt). The operator mounts that Secret read-only into every
++// Redis and Sentinel pod at tlsMountPath. The probe scripts, redis.conf
++// and sentinel.conf reference the same paths.
++const (
++	tlsVolumeName  = "redis-tls"
++	tlsMountPath   = "/tls"
++	tlsCertFile    = tlsMountPath + "/tls.crt"
++	tlsKeyFile     = tlsMountPath + "/tls.key"
++	tlsCAFile      = tlsMountPath + "/ca.crt"
++	tlsSecretKey   = "tls.crt"
++	tlsSecretCAKey = "ca.crt"
++
++	// tlsSecretHashAnnotation carries a content hash of the mounted TLS
++	// Secret and of the tls-auth-clients directive on the Redis and
++	// Sentinel pod templates. Redis loads the certificate files and its
++	// config once at startup and never re-reads them, so a renewed Secret
++	// or a changed directive reaches the running server only if its pod
++	// restarts.
++	// Changing this annotation changes the pod template, which is what
++	// makes the StatefulSet publish a new updateRevision and the Sentinel
++	// Deployment roll.
++	tlsSecretHashAnnotation = "redis-failover.freshworks.com/tls-secret-hash"
++
++	// tlsVolumeMode keeps the private key off the world-readable bits the
++	// kubelet would otherwise apply. It is only safe when the pod declares
++	// an fsGroup; see tlsVolume.
++	tlsVolumeMode = int32(0440)
++)
++
+ const (
+ 	redisRoleLabelKey    = "redisfailovers-role"
+ 	redisRoleLabelMaster = "master"
+diff --git a/operator/redisfailover/service/generator.go b/operator/redisfailover/service/generator.go
+index 66fe480a..a6635fab 100644
+--- a/operator/redisfailover/service/generator.go
++++ b/operator/redisfailover/service/generator.go
+@@ -2,10 +2,15 @@ package service
+ 
+ import (
+ 	"bytes"
++	"crypto/sha256"
++	"encoding/hex"
+ 	"fmt"
++	"net"
++	"strconv"
+ 	"strings"
+ 	"text/template"
+ 
++	cmapi "github.com/cert-manager/cert-manager/pkg/apis/certmanager/v1"
+ 	appsv1 "k8s.io/api/apps/v1"
+ 	corev1 "k8s.io/api/core/v1"
+ 	policyv1 "k8s.io/api/policy/v1"
+@@ -19,9 +24,24 @@ import (
+ 
+ const (
+ 	redisConfigurationVolumeName = "redis-config"
+-	// Template used to build the Redis configuration
++	// Template used to build the Redis configuration.
++	//
++	// When TLS is enabled the plain port is disabled (port 0) and the
++	// instance listens on tls-port using the same numeric value as
++	// Spec.Redis.Port — TLS replaces plaintext rather than running
++	// alongside it.
+ 	redisConfigTemplate = `slaveof 127.0.0.1 {{.Spec.Redis.Port}}
++{{- if tlsEnabled . }}
++port 0
++tls-port {{.Spec.Redis.Port}}
++tls-cert-file ` + tlsCertFile + `
++tls-key-file ` + tlsKeyFile + `
++tls-ca-cert-file ` + tlsCAFile + `
++tls-auth-clients {{ .Spec.TLS.AuthClients }}
++tls-replication yes
++{{- else }}
+ port {{.Spec.Redis.Port}}
++{{- end }}
+ tcp-keepalive 60
+ save 900 1
+ save 300 10
+@@ -32,6 +52,15 @@ rename-command "{{.From}}" "{{.To}}"
+ `
+ 
+ 	sentinelConfigTemplate = `
++{{- if tlsEnabled . }}
++port 0
++tls-port 26379
++tls-cert-file ` + tlsCertFile + `
++tls-key-file ` + tlsKeyFile + `
++tls-ca-cert-file ` + tlsCAFile + `
++tls-auth-clients {{ .Spec.TLS.AuthClients }}
++tls-replication yes
++{{ end }}
+ {{- if .Spec.Sentinel.DisableMyMaster -}}
+ sentinel monitor {{.Name}} 127.0.0.1 {{.Spec.Redis.Port}} 2
+ sentinel down-after-milliseconds {{.Name}} 1000
+@@ -54,6 +83,208 @@ sentinel parallel-syncs mymaster 2
+ 	graceTime = 30
+ )
+ 
++// redisTemplateFuncs is the FuncMap shared by the redis/sentinel config
++// templates. Only pure read-only helpers belong here.
++var redisTemplateFuncs = template.FuncMap{
++	"tlsEnabled": TLSEnabled,
++}
++
++// probeHost is the host the in-pod liveness and readiness probes dial.
++//
++// Plaintext keeps the "$(hostname)" form the operator has always emitted, so
++// that upgrading the operator does not rewrite the pod template of a failover
++// whose spec did not change. Under TLS the probes dial "localhost", which is
++// a SAN entry on the generated certificate along with the loopback addresses;
++// the bare pod hostname is not.
++func probeHost(rf *redisfailoverv1.RedisFailover) string {
++	if TLSEnabled(rf) {
++		return "localhost"
++	}
++	return "$(hostname)"
++}
++
++// redisCLITLSFlags returns the trailing space-suffixed flag block that
++// every redis-cli invocation in the pod scripts needs when TLS is on.
++// Returns an empty string when TLS is disabled so the scripts stay
++// untouched in the plaintext case.
++func redisCLITLSFlags(rf *redisfailoverv1.RedisFailover) string {
++	if !TLSEnabled(rf) {
++		return ""
++	}
++	return fmt.Sprintf("--tls --cert %s --key %s --cacert %s ", tlsCertFile, tlsKeyFile, tlsCAFile)
++}
++
++// generateRedisCertificate builds the cert-manager Certificate that
++// covers all Redis and Sentinel endpoints of the failover.
++//
++// SAN coverage:
++//   - the four Service DNS names (redis headless, redis master,
++//     redis slave, sentinel) in short, namespaced and FQDN form
++//   - the per-pod DNS records of the redis headless service so the
++//     operator can dial pods by stable name with TLS verification on
++//   - localhost (DNS) and 127.0.0.1 / ::1 (IP) so the in-pod TLS
++//     dials performed by liveness probes, the redis_exporter sidecar
++//     and the sentinel monitor target verify cleanly
++//
++// Pod IPs are still not added: they are unstable, and the operator
++// uses ServerName override in tls.Config to validate pod-IP-targeted
++// dials against the headless DNS SAN instead.
++func generateRedisCertificate(rf *redisfailoverv1.RedisFailover, labels map[string]string, ownerRefs []metav1.OwnerReference, clusterDomain string) *cmapi.Certificate {
++	name := GetTLSCertificateName(rf)
++	secretName := GetTLSSecretName(rf)
++	cm := rf.Spec.TLS.CertManager
++
++	dnsNames, ipAddresses := redisCertificateSANs(rf, clusterDomain)
++	for _, san := range cm.ExtraSANs {
++		if ip := net.ParseIP(san); ip != nil {
++			ipAddresses = append(ipAddresses, ip.String())
++			continue
++		}
++		dnsNames = append(dnsNames, san)
++	}
++
++	cert := &cmapi.Certificate{
++		ObjectMeta: metav1.ObjectMeta{
++			Name:            name,
++			Namespace:       rf.Namespace,
++			Labels:          labels,
++			OwnerReferences: ownerRefs,
++		},
++		Spec: cmapi.CertificateSpec{
++			SecretName:  secretName,
++			IssuerRef:   cm.IssuerRef,
++			DNSNames:    dnsNames,
++			IPAddresses: ipAddresses,
++			Usages: []cmapi.KeyUsage{
++				cmapi.UsageDigitalSignature,
++				cmapi.UsageKeyEncipherment,
++				cmapi.UsageServerAuth,
++				cmapi.UsageClientAuth,
++			},
++		},
++	}
++	if cm.Duration != nil {
++		cert.Spec.Duration = cm.Duration
++	}
++	if cm.RenewBefore != nil {
++		cert.Spec.RenewBefore = cm.RenewBefore
++	}
++	if cm.PrivateKey != nil {
++		cert.Spec.PrivateKey = cm.PrivateKey
++	}
++	return cert
++}
++
++// generateRedisCACertSecret builds the Opaque Secret that holds only the CA
++// certificate (ca.crt). It deliberately carries no tls.key, so RBAC can be
++// scoped to this Secret alone, letting clients verify the Redis server without
++// ever gaining access to a private key. caPEM is the ca.crt bytes read from the
++// cluster's TLS secret.
++func generateRedisCACertSecret(rf *redisfailoverv1.RedisFailover, labels map[string]string, ownerRefs []metav1.OwnerReference, caPEM []byte) *corev1.Secret {
++	return &corev1.Secret{
++		ObjectMeta: metav1.ObjectMeta{
++			Name:            GetTLSCACertSecretName(rf),
++			Namespace:       rf.Namespace,
++			Labels:          labels,
++			OwnerReferences: ownerRefs,
++		},
++		Type: corev1.SecretTypeOpaque,
++		Data: map[string][]byte{
++			tlsSecretCAKey: caPEM,
++		},
++	}
++}
++
++// tlsSecretContentHash returns a content hash of the TLS material the pods
++// mount and of the tls-auth-clients directive they run with, or the empty
++// string when there is no certificate to pin yet.
++//
++// Both tls.crt and ca.crt are covered. Redis loads the certificate and the CA
++// bundle at startup and re-reads neither, so a change to either one only
++// reaches the server by restarting the pod. tls.key is left out: cert-manager
++// rotates it together with tls.crt, and there is no reason to derive a
++// published annotation value from private key material.
++//
++// tls-auth-clients is covered for the same reason. It is a mutable spec field
++// whose only carrier is the generated config file, which Redis also reads once
++// at startup, so without it in the hash a change is admitted and then lands
++// pod by pod at whatever unrelated restart comes next.
++func tlsSecretContentHash(rf *redisfailoverv1.RedisFailover, secret *corev1.Secret) string {
++	if secret == nil || len(secret.Data[tlsSecretKey]) == 0 {
++		return ""
++	}
++	h := sha256.New()
++	for _, key := range []string{tlsSecretKey, tlsSecretCAKey} {
++		value := secret.Data[key]
++		// Length-prefixed so that two different splits of the same
++		// concatenated bytes cannot hash alike.
++		h.Write([]byte(key + ":" + strconv.Itoa(len(value)) + ":"))
++		h.Write(value)
++	}
++	authClients := tlsAuthClients(rf)
++	h.Write([]byte("authClients:" + strconv.Itoa(len(authClients)) + ":"))
++	h.Write([]byte(authClients))
++	return hex.EncodeToString(h.Sum(nil))
++}
++
++// podAnnotations returns the pod template annotations with the TLS content
++// hash stamped on top. The caller's map is left untouched, since it is the
++// live spec map from the RedisFailover.
++func podAnnotations(specAnnotations map[string]string, tlsHash string) map[string]string {
++	if tlsHash == "" {
++		return specAnnotations
++	}
++	return util.MergeAnnotations(specAnnotations, map[string]string{tlsSecretHashAnnotation: tlsHash})
++}
++
++// redisCertificateSANs returns the DNS and IP SANs the Certificate
++// must cover. Each Service appears in three forms (short, namespaced,
++// FQDN) so the same certificate validates regardless of how callers
++// resolve it. localhost and the loopback IPs are included so the
++// in-pod self-dials (liveness probes via -h localhost, the
++// redis_exporter sidecar via 127.0.0.1, the sentinel monitor target
++// 127.0.0.1) verify cleanly against the same cert.
++//
++// clusterDomain is the cluster's DNS suffix (e.g. "cluster.local",
++// "cozy.local"). An empty value falls back to "cluster.local" so
++// existing deployments that never set --cluster-domain keep working.
++func redisCertificateSANs(rf *redisfailoverv1.RedisFailover, clusterDomain string) (dnsNames, ipAddresses []string) {
++	if clusterDomain == "" {
++		clusterDomain = "cluster.local"
++	}
++	ns := rf.Namespace
++
++	for _, svc := range []string{
++		GetRedisName(rf),
++		GetRedisMasterName(rf),
++		GetRedisSlaveName(rf),
++		GetSentinelName(rf),
++	} {
++		dnsNames = append(dnsNames,
++			svc,
++			fmt.Sprintf("%s.%s", svc, ns),
++			fmt.Sprintf("%s.%s.svc", svc, ns),
++			fmt.Sprintf("%s.%s.svc.%s", svc, ns, clusterDomain),
++		)
++	}
++
++	// Headless service has per-pod DNS records:
++	// <pod>.<headless>.<ns>.svc.<cluster-domain>. We don't know pod
++	// count up front; cover the wildcard so any replica resolves
++	// correctly.
++	headless := GetRedisName(rf)
++	dnsNames = append(dnsNames,
++		fmt.Sprintf("*.%s", headless),
++		fmt.Sprintf("*.%s.%s", headless, ns),
++		fmt.Sprintf("*.%s.%s.svc", headless, ns),
++		fmt.Sprintf("*.%s.%s.svc.%s", headless, ns, clusterDomain),
++		"localhost",
++	)
++
++	ipAddresses = []string{"127.0.0.1", "::1"}
++	return dnsNames, ipAddresses
++}
++
+ func generateSentinelService(rf *redisfailoverv1.RedisFailover, labels map[string]string, ownerRefs []metav1.OwnerReference) *corev1.Service {
+ 	name := GetSentinelName(rf)
+ 	namespace := rf.Namespace
+@@ -192,7 +423,7 @@ func generateSentinelConfigMap(rf *redisfailoverv1.RedisFailover, labels map[str
+ 
+ 	labels = util.MergeLabels(labels, generateSelectorLabels(sentinelRoleName, rf.Name))
+ 
+-	tmpl, err := template.New("sentinel").Parse(sentinelConfigTemplate)
++	tmpl, err := template.New("sentinel").Funcs(redisTemplateFuncs).Parse(sentinelConfigTemplate)
+ 	if err != nil {
+ 		panic(err)
+ 	}
+@@ -221,7 +452,7 @@ func generateRedisConfigMap(rf *redisfailoverv1.RedisFailover, labels map[string
+ 	name := GetRedisName(rf)
+ 	labels = util.MergeLabels(labels, generateSelectorLabels(redisRoleName, rf.Name))
+ 
+-	tmpl, err := template.New("redis").Parse(redisConfigTemplate)
++	tmpl, err := template.New("redis").Funcs(redisTemplateFuncs).Parse(redisConfigTemplate)
+ 	if err != nil {
+ 		panic(err)
+ 	}
+@@ -255,22 +486,23 @@ func generateRedisShutdownConfigMap(rf *redisfailoverv1.RedisFailover, labels ma
+ 	port := rf.Spec.Redis.Port
+ 	namespace := rf.Namespace
+ 	rfName := strings.ReplaceAll(strings.ToUpper(rf.Name), "-", "_")
++	tlsFlags := redisCLITLSFlags(rf)
+ 
+ 	labels = util.MergeLabels(labels, generateSelectorLabels(redisRoleName, rf.Name))
+ 	eng := EngineFor(rf)
+ 	cli := eng.CLIBinary()
+ 	authEnv := eng.CLIAuthEnvName()
+-	shutdownContent := fmt.Sprintf(`master=$(%[4]s -h ${RFS_%[1]v_SERVICE_HOST} -p ${RFS_%[1]v_SERVICE_PORT_SENTINEL} --csv SENTINEL get-master-addr-by-name %[3]v | tr ',' ' ' | tr -d '\"' |cut -d' ' -f1)
++	shutdownContent := fmt.Sprintf(`master=$(%[4]s %[6]s-h ${RFS_%[1]v_SERVICE_HOST} -p ${RFS_%[1]v_SERVICE_PORT_SENTINEL} --csv SENTINEL get-master-addr-by-name %[3]v | tr ',' ' ' | tr -d '\"' |cut -d' ' -f1)
+ if [ "$master" = "$(hostname -i)" ]; then
+-%[4]s -h ${RFS_%[1]v_SERVICE_HOST} -p ${RFS_%[1]v_SERVICE_PORT_SENTINEL} SENTINEL failover %[3]v
++%[4]s %[6]s-h ${RFS_%[1]v_SERVICE_HOST} -p ${RFS_%[1]v_SERVICE_PORT_SENTINEL} SENTINEL failover %[3]v
+ sleep 31
+ fi
+-cmd="%[4]s -p %[2]v"
++cmd="%[4]s %[6]s-p %[2]v"
+ if [ ! -z "${REDIS_PASSWORD}" ]; then
+ 	export %[5]s=${REDIS_PASSWORD}
+ fi
+ save_command="${cmd} save"
+-eval $save_command`, rfName, port, rf.MasterName(), cli, authEnv)
++eval $save_command`, rfName, port, rf.MasterName(), cli, authEnv, tlsFlags)
+ 
+ 	return &corev1.ConfigMap{
+ 		ObjectMeta: metav1.ObjectMeta{
+@@ -289,6 +521,7 @@ func generateRedisReadinessConfigMap(rf *redisfailoverv1.RedisFailover, labels m
+ 	name := GetRedisReadinessName(rf)
+ 	port := rf.Spec.Redis.Port
+ 	namespace := rf.Namespace
++	tlsFlags := redisCLITLSFlags(rf)
+ 
+ 	labels = util.MergeLabels(labels, generateSelectorLabels(redisRoleName, rf.Name))
+ 	eng := EngineFor(rf)
+@@ -300,7 +533,7 @@ ROLE_SLAVE="role:slave"
+ IN_SYNC="master_sync_in_progress:1"
+ NO_MASTER="master_host:127.0.0.1"
+ 
+-cmd="%[2]s -p %[1]v"
++cmd="%[2]s %[4]s-p %[1]v"
+ if [ ! -z "${REDIS_PASSWORD}" ]; then
+ 	export %[3]s=${REDIS_PASSWORD}
+ fi
+@@ -333,7 +566,7 @@ case $role in
+ 		*)
+ 				echo "unexpected"
+ 				exit 1
+-esac`, port, cli, authEnv)
++esac`, port, cli, authEnv, tlsFlags)
+ 
+ 	return &corev1.ConfigMap{
+ 		ObjectMeta: metav1.ObjectMeta{
+@@ -348,7 +581,7 @@ esac`, port, cli, authEnv)
+ 	}
+ }
+ 
+-func generateRedisStatefulSet(rf *redisfailoverv1.RedisFailover, labels map[string]string, ownerRefs []metav1.OwnerReference) *appsv1.StatefulSet {
++func generateRedisStatefulSet(rf *redisfailoverv1.RedisFailover, labels map[string]string, ownerRefs []metav1.OwnerReference, tlsHash string) *appsv1.StatefulSet {
+ 	name := GetRedisName(rf)
+ 	namespace := rf.Namespace
+ 
+@@ -383,7 +616,7 @@ func generateRedisStatefulSet(rf *redisfailoverv1.RedisFailover, labels map[stri
+ 			Template: corev1.PodTemplateSpec{
+ 				ObjectMeta: metav1.ObjectMeta{
+ 					Labels:      labels,
+-					Annotations: rf.Spec.Redis.PodAnnotations,
++					Annotations: podAnnotations(rf.Spec.Redis.PodAnnotations, tlsHash),
+ 				},
+ 				Spec: corev1.PodSpec{
+ 					Affinity:                      getAffinity(rf.Spec.Redis.Affinity, labels),
+@@ -465,7 +698,7 @@ func generateRedisStatefulSet(rf *redisfailoverv1.RedisFailover, labels map[stri
+ 					Command: []string{
+ 						"sh",
+ 						"-c",
+-						fmt.Sprintf("%s -h $(hostname) -p %v --user pinger --pass pingpass --no-auth-warning ping | grep PONG", eng.CLIBinary(), rf.Spec.Redis.Port),
++						fmt.Sprintf("%s %s-h %s -p %v --user pinger --pass pingpass --no-auth-warning ping | grep PONG", eng.CLIBinary(), redisCLITLSFlags(rf), probeHost(rf), rf.Spec.Redis.Port),
+ 					},
+ 				},
+ 			},
+@@ -523,7 +756,7 @@ func generateRedisStatefulSet(rf *redisfailoverv1.RedisFailover, labels map[stri
+ 	return ss
+ }
+ 
+-func generateSentinelDeployment(rf *redisfailoverv1.RedisFailover, labels map[string]string, ownerRefs []metav1.OwnerReference) *appsv1.Deployment {
++func generateSentinelDeployment(rf *redisfailoverv1.RedisFailover, labels map[string]string, ownerRefs []metav1.OwnerReference, tlsHash string) *appsv1.Deployment {
+ 	name := GetSentinelName(rf)
+ 	configMapName := GetSentinelName(rf)
+ 	namespace := rf.Namespace
+@@ -551,7 +784,7 @@ func generateSentinelDeployment(rf *redisfailoverv1.RedisFailover, labels map[st
+ 			Template: corev1.PodTemplateSpec{
+ 				ObjectMeta: metav1.ObjectMeta{
+ 					Labels:      labels,
+-					Annotations: rf.Spec.Sentinel.PodAnnotations,
++					Annotations: podAnnotations(rf.Spec.Sentinel.PodAnnotations, tlsHash),
+ 				},
+ 				Spec: corev1.PodSpec{
+ 					Affinity:                  getAffinity(rf.Spec.Sentinel.Affinity, labels),
+@@ -632,7 +865,7 @@ func generateSentinelDeployment(rf *redisfailoverv1.RedisFailover, labels map[st
+ 					Command: []string{
+ 						"sh",
+ 						"-c",
+-						fmt.Sprintf("%s -h $(hostname) -p 26379 ping", eng.CLIBinary()),
++						fmt.Sprintf("%s %s-h %s -p 26379 ping", eng.CLIBinary(), redisCLITLSFlags(rf), probeHost(rf)),
+ 					},
+ 				},
+ 			},
+@@ -642,7 +875,7 @@ func generateSentinelDeployment(rf *redisfailoverv1.RedisFailover, labels map[st
+ 	if rf.Spec.Sentinel.CustomReadinessProbe != nil {
+ 		sd.Spec.Template.Spec.Containers[0].ReadinessProbe = rf.Spec.Sentinel.CustomReadinessProbe
+ 	} else {
+-		probeCommand := fmt.Sprintf("%s -h $(hostname) -p 26379 sentinel get-master-addr-by-name %s | head -n 1 | grep -vq '127.0.0.1'", eng.CLIBinary(), rf.MasterName())
++		probeCommand := fmt.Sprintf("%s %s-h %s -p 26379 sentinel get-master-addr-by-name %s | head -n 1 | grep -vq '127.0.0.1'", eng.CLIBinary(), redisCLITLSFlags(rf), probeHost(rf), rf.MasterName())
+ 		sd.Spec.Template.Spec.Containers[0].ReadinessProbe = &corev1.Probe{
+ 			InitialDelaySeconds: graceTime,
+ 			TimeoutSeconds:      5,
+@@ -750,6 +983,11 @@ func createRedisExporterContainer(rf *redisfailoverv1.RedisFailover) corev1.Cont
+ 	redisEnv := getRedisEnv(rf)
+ 	container.Env = append(container.Env, redisEnv...)
+ 
++	if TLSEnabled(rf) {
++		container.VolumeMounts = append(container.VolumeMounts, tlsVolumeMount())
++		container.Env = append(container.Env, redisExporterTLSEnv()...)
++	}
++
+ 	return container
+ }
+ 
+@@ -758,6 +996,12 @@ func createSentinelExporterContainer(rf *redisfailoverv1.RedisFailover) corev1.C
+ 	if rf.Spec.Sentinel.Exporter.Resources != nil {
+ 		resources = *rf.Spec.Sentinel.Exporter.Resources
+ 	}
++
++	addrScheme := "redis"
++	if TLSEnabled(rf) {
++		addrScheme = "rediss"
++	}
++
+ 	container := corev1.Container{
+ 		Name:            sentinelExporterContainerName,
+ 		Image:           rf.Spec.Sentinel.Exporter.Image,
+@@ -776,7 +1020,7 @@ func createSentinelExporterContainer(rf *redisfailoverv1.RedisFailover) corev1.C
+ 			Value: fmt.Sprintf("0.0.0.0:%[1]v", sentinelExporterPort),
+ 		}, corev1.EnvVar{
+ 			Name:  "REDIS_ADDR",
+-			Value: "redis://127.0.0.1:26379",
++			Value: fmt.Sprintf("%s://127.0.0.1:26379", addrScheme),
+ 		},
+ 		),
+ 		Ports: []corev1.ContainerPort{
+@@ -789,9 +1033,26 @@ func createSentinelExporterContainer(rf *redisfailoverv1.RedisFailover) corev1.C
+ 		Resources: resources,
+ 	}
+ 
++	if TLSEnabled(rf) {
++		container.VolumeMounts = append(container.VolumeMounts, tlsVolumeMount())
++		container.Env = append(container.Env, redisExporterTLSEnv()...)
++	}
++
+ 	return container
+ }
+ 
++// redisExporterTLSEnv returns the env vars that point oliver006/redis_exporter
++// at the mounted certificate. The exporter uses the certificate itself as
++// the client certificate (the same Secret holds the cluster cert/key/CA),
++// which is sufficient for read-only INFO/CONFIG GET queries.
++func redisExporterTLSEnv() []corev1.EnvVar {
++	return []corev1.EnvVar{
++		{Name: "REDIS_EXPORTER_TLS_CLIENT_CERT_FILE", Value: tlsCertFile},
++		{Name: "REDIS_EXPORTER_TLS_CLIENT_KEY_FILE", Value: tlsKeyFile},
++		{Name: "REDIS_EXPORTER_TLS_CA_CERT_FILE", Value: tlsCAFile},
++	}
++}
++
+ func getAffinity(affinity *corev1.Affinity, labels map[string]string) *corev1.Affinity {
+ 	if affinity != nil {
+ 		return affinity
+@@ -899,6 +1160,10 @@ func getRedisVolumeMounts(rf *redisfailoverv1.RedisFailover) []corev1.VolumeMoun
+ 		volumeMounts = append(volumeMounts, startupVolumeMount)
+ 	}
+ 
++	if TLSEnabled(rf) {
++		volumeMounts = append(volumeMounts, tlsVolumeMount())
++	}
++
+ 	if rf.Spec.Redis.ExtraVolumeMounts != nil {
+ 		volumeMounts = append(volumeMounts, rf.Spec.Redis.ExtraVolumeMounts...)
+ 	}
+@@ -921,6 +1186,9 @@ func getSentinelVolumeMounts(rf *redisfailoverv1.RedisFailover) []corev1.VolumeM
+ 		}
+ 		volumeMounts = append(volumeMounts, startupVolumeMount)
+ 	}
++	if TLSEnabled(rf) {
++		volumeMounts = append(volumeMounts, tlsVolumeMount())
++	}
+ 	if rf.Spec.Sentinel.ExtraVolumeMounts != nil {
+ 		volumeMounts = append(volumeMounts, rf.Spec.Sentinel.ExtraVolumeMounts...)
+ 	}
+@@ -928,6 +1196,41 @@ func getSentinelVolumeMounts(rf *redisfailoverv1.RedisFailover) []corev1.VolumeM
+ 	return volumeMounts
+ }
+ 
++func tlsVolumeMount() corev1.VolumeMount {
++	return corev1.VolumeMount{
++		Name:      tlsVolumeName,
++		MountPath: tlsMountPath,
++		ReadOnly:  true,
++	}
++}
++
++// tlsVolume builds the Secret volume carrying the certificate, its private
++// key and the CA bundle.
++//
++// The kubelet defaults secret files to 0644, which leaves the private key
++// readable by every uid in the pod — sidecars included, and those can be
++// given a securityContext of their own. Tightening the mode to 0440 relies
++// on the files being group-owned by a gid the containers run with, which is
++// what an fsGroup on the pod does; without one the kubelet leaves them owned
++// by root:root and 0440 would hide the key from any container running as
++// non-root. So the mode is only tightened when the pod declares an fsGroup,
++// and a caller-supplied securityContext without one keeps the default.
++func tlsVolume(secretName string, podSecurityContext *corev1.PodSecurityContext) corev1.Volume {
++	volume := corev1.Volume{
++		Name: tlsVolumeName,
++		VolumeSource: corev1.VolumeSource{
++			Secret: &corev1.SecretVolumeSource{
++				SecretName: secretName,
++			},
++		},
++	}
++	if podSecurityContext != nil && podSecurityContext.FSGroup != nil {
++		mode := tlsVolumeMode
++		volume.VolumeSource.Secret.DefaultMode = &mode
++	}
++	return volume
++}
++
+ func getRedisVolumes(rf *redisfailoverv1.RedisFailover) []corev1.Volume {
+ 	configMapName := GetRedisName(rf)
+ 	shutdownConfigMapName := GetRedisShutdownConfigMapName(rf)
+@@ -985,6 +1288,10 @@ func getRedisVolumes(rf *redisfailoverv1.RedisFailover) []corev1.Volume {
+ 		volumes = append(volumes, startupVolume)
+ 	}
+ 
++	if TLSEnabled(rf) {
++		volumes = append(volumes, tlsVolume(GetTLSSecretName(rf), getSecurityContext(rf.Spec.Redis.SecurityContext)))
++	}
++
+ 	if rf.Spec.Redis.ExtraVolumes != nil {
+ 		volumes = append(volumes, rf.Spec.Redis.ExtraVolumes...)
+ 	}
+@@ -1035,6 +1342,10 @@ func getSentinelVolumes(rf *redisfailoverv1.RedisFailover, configMapName string)
+ 		volumes = append(volumes, startupVolume)
+ 	}
+ 
++	if TLSEnabled(rf) {
++		volumes = append(volumes, tlsVolume(GetTLSSecretName(rf), getSecurityContext(rf.Spec.Sentinel.SecurityContext)))
++	}
++
+ 	if rf.Spec.Sentinel.ExtraVolumes != nil {
+ 		volumes = append(volumes, rf.Spec.Sentinel.ExtraVolumes...)
+ 	}
+@@ -1138,9 +1449,13 @@ func getContainersWithRedisEnv(cs []corev1.Container, e []corev1.EnvVar) []corev
+ func getRedisEnv(rf *redisfailoverv1.RedisFailover) []corev1.EnvVar {
+ 	var env []corev1.EnvVar
+ 
++	scheme := "redis"
++	if TLSEnabled(rf) {
++		scheme = "rediss"
++	}
+ 	env = append(env, corev1.EnvVar{
+ 		Name:  "REDIS_ADDR",
+-		Value: fmt.Sprintf("redis://127.0.0.1:%[1]v", rf.Spec.Redis.Port),
++		Value: fmt.Sprintf("%s://127.0.0.1:%[2]v", scheme, rf.Spec.Redis.Port),
+ 	})
+ 
+ 	env = append(env, corev1.EnvVar{
+diff --git a/operator/redisfailover/service/generator_test.go b/operator/redisfailover/service/generator_test.go
+index 97bfd936..39bbcfdd 100644
+--- a/operator/redisfailover/service/generator_test.go
++++ b/operator/redisfailover/service/generator_test.go
+@@ -538,8 +538,8 @@ func TestRedisStatefulSetStorageGeneration(t *testing.T) {
+ 			generatedStatefulSet = *ss
+ 		}).Return(nil)
+ 
+-		client := rfservice.NewRedisFailoverKubeClient(ms, log.Dummy, metrics.Dummy)
+-		err := client.EnsureRedisStatefulset(rf, nil, test.ownerRefs)
++		client := rfservice.NewRedisFailoverKubeClient(ms, log.Dummy, metrics.Dummy, "cluster.local")
++		err := client.EnsureRedisStatefulset(rf, nil, test.ownerRefs, "")
+ 
+ 		// Check that the storage-related fields are as expected
+ 		assert.Equal(test.expectedSS.Spec.Template.Spec.Volumes, generatedStatefulSet.Spec.Template.Spec.Volumes)
+@@ -593,8 +593,8 @@ func TestRedisStatefulSetCommands(t *testing.T) {
+ 			gotCommands = ss.Spec.Template.Spec.Containers[0].Command
+ 		}).Return(nil)
+ 
+-		client := rfservice.NewRedisFailoverKubeClient(ms, log.Dummy, metrics.Dummy)
+-		err := client.EnsureRedisStatefulset(rf, nil, []metav1.OwnerReference{})
++		client := rfservice.NewRedisFailoverKubeClient(ms, log.Dummy, metrics.Dummy, "cluster.local")
++		err := client.EnsureRedisStatefulset(rf, nil, []metav1.OwnerReference{}, "")
+ 
+ 		assert.Equal(test.expectedCommands, gotCommands)
+ 		assert.NoError(err)
+@@ -646,8 +646,8 @@ func TestSentinelDeploymentCommands(t *testing.T) {
+ 			gotCommands = d.Spec.Template.Spec.Containers[0].Command
+ 		}).Return(nil)
+ 
+-		client := rfservice.NewRedisFailoverKubeClient(ms, log.Dummy, metrics.Dummy)
+-		err := client.EnsureSentinelDeployment(rf, nil, []metav1.OwnerReference{})
++		client := rfservice.NewRedisFailoverKubeClient(ms, log.Dummy, metrics.Dummy, "cluster.local")
++		err := client.EnsureSentinelDeployment(rf, nil, []metav1.OwnerReference{}, "")
+ 
+ 		assert.Equal(test.expectedCommands, gotCommands)
+ 		assert.NoError(err)
+@@ -695,8 +695,8 @@ func TestRedisStatefulSetPodAnnotations(t *testing.T) {
+ 			gotPodAnnotations = ss.Spec.Template.ObjectMeta.Annotations
+ 		}).Return(nil)
+ 
+-		client := rfservice.NewRedisFailoverKubeClient(ms, log.Dummy, metrics.Dummy)
+-		err := client.EnsureRedisStatefulset(rf, nil, []metav1.OwnerReference{})
++		client := rfservice.NewRedisFailoverKubeClient(ms, log.Dummy, metrics.Dummy, "cluster.local")
++		err := client.EnsureRedisStatefulset(rf, nil, []metav1.OwnerReference{}, "")
+ 
+ 		assert.Equal(test.expectedPodAnnotations, gotPodAnnotations)
+ 		assert.NoError(err)
+@@ -744,8 +744,8 @@ func TestSentinelDeploymentPodAnnotations(t *testing.T) {
+ 			gotPodAnnotations = d.Spec.Template.ObjectMeta.Annotations
+ 		}).Return(nil)
+ 
+-		client := rfservice.NewRedisFailoverKubeClient(ms, log.Dummy, metrics.Dummy)
+-		err := client.EnsureSentinelDeployment(rf, nil, []metav1.OwnerReference{})
++		client := rfservice.NewRedisFailoverKubeClient(ms, log.Dummy, metrics.Dummy, "cluster.local")
++		err := client.EnsureSentinelDeployment(rf, nil, []metav1.OwnerReference{}, "")
+ 
+ 		assert.Equal(test.expectedPodAnnotations, gotPodAnnotations)
+ 		assert.NoError(err)
+@@ -787,8 +787,8 @@ func TestRedisStatefulSetServiceAccountName(t *testing.T) {
+ 			gotServiceAccountName = ss.Spec.Template.Spec.ServiceAccountName
+ 		}).Return(nil)
+ 
+-		client := rfservice.NewRedisFailoverKubeClient(ms, log.Dummy, metrics.Dummy)
+-		err := client.EnsureRedisStatefulset(rf, nil, []metav1.OwnerReference{})
++		client := rfservice.NewRedisFailoverKubeClient(ms, log.Dummy, metrics.Dummy, "cluster.local")
++		err := client.EnsureRedisStatefulset(rf, nil, []metav1.OwnerReference{}, "")
+ 
+ 		assert.Equal(test.expectedServiceAccountName, gotServiceAccountName)
+ 		assert.NoError(err)
+@@ -830,8 +830,8 @@ func TestSentinelDeploymentServiceAccountName(t *testing.T) {
+ 			gotServiceAccountName = d.Spec.Template.Spec.ServiceAccountName
+ 		}).Return(nil)
+ 
+-		client := rfservice.NewRedisFailoverKubeClient(ms, log.Dummy, metrics.Dummy)
+-		err := client.EnsureSentinelDeployment(rf, nil, []metav1.OwnerReference{})
++		client := rfservice.NewRedisFailoverKubeClient(ms, log.Dummy, metrics.Dummy, "cluster.local")
++		err := client.EnsureSentinelDeployment(rf, nil, []metav1.OwnerReference{}, "")
+ 
+ 		assert.Equal(test.expectedServiceAccountName, gotServiceAccountName)
+ 		assert.NoError(err)
+@@ -1047,7 +1047,7 @@ func TestSentinelService(t *testing.T) {
+ 				generatedService = *s
+ 			}).Return(nil)
+ 
+-			client := rfservice.NewRedisFailoverKubeClient(ms, log.Dummy, metrics.Dummy)
++			client := rfservice.NewRedisFailoverKubeClient(ms, log.Dummy, metrics.Dummy, "cluster.local")
+ 			err := client.EnsureSentinelService(rf, test.rfLabels, []metav1.OwnerReference{{Name: "testing"}})
+ 
+ 			assert.Equal(test.expectedService, generatedService)
+@@ -1295,7 +1295,7 @@ func TestRedisService(t *testing.T) {
+ 				generatedService = *s
+ 			}).Return(nil)
+ 
+-			client := rfservice.NewRedisFailoverKubeClient(ms, log.Dummy, metrics.Dummy)
++			client := rfservice.NewRedisFailoverKubeClient(ms, log.Dummy, metrics.Dummy, "cluster.local")
+ 			err := client.EnsureRedisService(rf, test.rfLabels, []metav1.OwnerReference{{Name: "testing"}})
+ 
+ 			assert.Equal(test.expectedService, generatedService)
+@@ -1535,7 +1535,7 @@ func TestRedisMasterService(t *testing.T) {
+ 				generatedMasterService = *s
+ 			}).Return(nil)
+ 
+-			client := rfservice.NewRedisFailoverKubeClient(ms, log.Dummy, metrics.Dummy)
++			client := rfservice.NewRedisFailoverKubeClient(ms, log.Dummy, metrics.Dummy, "cluster.local")
+ 			err := client.EnsureRedisMasterService(rf, test.rfLabels, []metav1.OwnerReference{{Name: "testing"}})
+ 
+ 			assert.Equal(test.expectedService, generatedMasterService)
+@@ -1775,7 +1775,7 @@ func TestRedisSlaveService(t *testing.T) {
+ 				generatedSlaveService = *s
+ 			}).Return(nil)
+ 
+-			client := rfservice.NewRedisFailoverKubeClient(ms, log.Dummy, metrics.Dummy)
++			client := rfservice.NewRedisFailoverKubeClient(ms, log.Dummy, metrics.Dummy, "cluster.local")
+ 			err := client.EnsureRedisSlaveService(rf, test.rfLabels, []metav1.OwnerReference{{Name: "testing"}})
+ 
+ 			assert.Equal(test.expectedService, generatedSlaveService)
+@@ -1825,8 +1825,8 @@ func TestRedisHostNetworkAndDnsPolicy(t *testing.T) {
+ 			actualDnsPolicy = ss.Spec.Template.Spec.DNSPolicy
+ 		}).Return(nil)
+ 
+-		client := rfservice.NewRedisFailoverKubeClient(ms, log.Dummy, metrics.Dummy)
+-		err := client.EnsureRedisStatefulset(rf, nil, []metav1.OwnerReference{})
++		client := rfservice.NewRedisFailoverKubeClient(ms, log.Dummy, metrics.Dummy, "cluster.local")
++		err := client.EnsureRedisStatefulset(rf, nil, []metav1.OwnerReference{}, "")
+ 		assert.NoError(err)
+ 
+ 		assert.Equal(test.expectedHostNetwork, actualHostNetwork)
+@@ -1875,8 +1875,8 @@ func TestSentinelHostNetworkAndDnsPolicy(t *testing.T) {
+ 			actualDnsPolicy = d.Spec.Template.Spec.DNSPolicy
+ 		}).Return(nil)
+ 
+-		client := rfservice.NewRedisFailoverKubeClient(ms, log.Dummy, metrics.Dummy)
+-		err := client.EnsureSentinelDeployment(rf, nil, []metav1.OwnerReference{})
++		client := rfservice.NewRedisFailoverKubeClient(ms, log.Dummy, metrics.Dummy, "cluster.local")
++		err := client.EnsureSentinelDeployment(rf, nil, []metav1.OwnerReference{}, "")
+ 		assert.NoError(err)
+ 
+ 		assert.Equal(test.expectedHostNetwork, actualHostNetwork)
+@@ -1926,8 +1926,8 @@ func TestRedisImagePullPolicy(t *testing.T) {
+ 			exporterPolicy = ss.Spec.Template.Spec.Containers[1].ImagePullPolicy
+ 		}).Return(nil)
+ 
+-		client := rfservice.NewRedisFailoverKubeClient(ms, log.Dummy, metrics.Dummy)
+-		err := client.EnsureRedisStatefulset(rf, nil, []metav1.OwnerReference{})
++		client := rfservice.NewRedisFailoverKubeClient(ms, log.Dummy, metrics.Dummy, "cluster.local")
++		err := client.EnsureRedisStatefulset(rf, nil, []metav1.OwnerReference{}, "")
+ 
+ 		assert.NoError(err)
+ 		assert.Equal(string(test.expectedPolicy), string(policy))
+@@ -1973,8 +1973,8 @@ func TestSentinelImagePullPolicy(t *testing.T) {
+ 			configPolicy = d.Spec.Template.Spec.InitContainers[0].ImagePullPolicy
+ 		}).Return(nil)
+ 
+-		client := rfservice.NewRedisFailoverKubeClient(ms, log.Dummy, metrics.Dummy)
+-		err := client.EnsureSentinelDeployment(rf, nil, []metav1.OwnerReference{})
++		client := rfservice.NewRedisFailoverKubeClient(ms, log.Dummy, metrics.Dummy, "cluster.local")
++		err := client.EnsureSentinelDeployment(rf, nil, []metav1.OwnerReference{}, "")
+ 
+ 		assert.NoError(err)
+ 		assert.Equal(string(test.expectedPolicy), string(policy))
+@@ -2049,8 +2049,8 @@ func TestRedisExtraVolumeMounts(t *testing.T) {
+ 			extraVolumeMount = s.Spec.Template.Spec.Containers[0].VolumeMounts[4]
+ 		}).Return(nil)
+ 
+-		client := rfservice.NewRedisFailoverKubeClient(ms, log.Dummy, metrics.Dummy)
+-		err := client.EnsureRedisStatefulset(rf, nil, []metav1.OwnerReference{})
++		client := rfservice.NewRedisFailoverKubeClient(ms, log.Dummy, metrics.Dummy, "cluster.local")
++		err := client.EnsureRedisStatefulset(rf, nil, []metav1.OwnerReference{}, "")
+ 
+ 		assert.NoError(err)
+ 		assert.Equal(test.expectedVolumes[0], extraVolume)
+@@ -2125,8 +2125,8 @@ func TestSentinelExtraVolumeMounts(t *testing.T) {
+ 			extraVolumeMount = d.Spec.Template.Spec.Containers[0].VolumeMounts[1]
+ 		}).Return(nil)
+ 
+-		client := rfservice.NewRedisFailoverKubeClient(ms, log.Dummy, metrics.Dummy)
+-		err := client.EnsureSentinelDeployment(rf, nil, []metav1.OwnerReference{})
++		client := rfservice.NewRedisFailoverKubeClient(ms, log.Dummy, metrics.Dummy, "cluster.local")
++		err := client.EnsureSentinelDeployment(rf, nil, []metav1.OwnerReference{}, "")
+ 
+ 		assert.NoError(err)
+ 		assert.Equal(test.expectedVolumes[0], extraVolume)
+@@ -2182,8 +2182,8 @@ func TestCustomPort(t *testing.T) {
+ 			port = s.Spec.Template.Spec.Containers[0].Ports[0]
+ 		}).Return(nil)
+ 
+-		client := rfservice.NewRedisFailoverKubeClient(ms, log.Dummy, metrics.Dummy)
+-		err := client.EnsureRedisStatefulset(rf, nil, []metav1.OwnerReference{})
++		client := rfservice.NewRedisFailoverKubeClient(ms, log.Dummy, metrics.Dummy, "cluster.local")
++		err := client.EnsureRedisStatefulset(rf, nil, []metav1.OwnerReference{}, "")
+ 
+ 		assert.NoError(err)
+ 		assert.Equal(test.expectedContainerPort[0], port)
+@@ -2265,8 +2265,8 @@ func TestRedisEnv(t *testing.T) {
+ 			env = s.Spec.Template.Spec.Containers[0].Env
+ 		}).Return(nil)
+ 
+-		client := rfservice.NewRedisFailoverKubeClient(ms, log.Dummy, metrics.Dummy)
+-		err := client.EnsureRedisStatefulset(rf, nil, []metav1.OwnerReference{})
++		client := rfservice.NewRedisFailoverKubeClient(ms, log.Dummy, metrics.Dummy, "cluster.local")
++		err := client.EnsureRedisStatefulset(rf, nil, []metav1.OwnerReference{}, "")
+ 
+ 		assert.NoError(err)
+ 		assert.Equal(test.expectedRedisEnv, env)
+@@ -2318,8 +2318,8 @@ func TestRedisStartupProbe(t *testing.T) {
+ 			startupVolumeMounts = s.Spec.Template.Spec.Containers[0].VolumeMounts
+ 		}).Return(nil)
+ 
+-		client := rfservice.NewRedisFailoverKubeClient(ms, log.Dummy, metrics.Dummy)
+-		err := client.EnsureRedisStatefulset(rf, nil, []metav1.OwnerReference{})
++		client := rfservice.NewRedisFailoverKubeClient(ms, log.Dummy, metrics.Dummy, "cluster.local")
++		err := client.EnsureRedisStatefulset(rf, nil, []metav1.OwnerReference{}, "")
+ 
+ 		assert.NoError(err)
+ 		assert.Contains(startupVolumes, test.expectedVolume)
+@@ -2372,8 +2372,8 @@ func TestSentinelStartupProbe(t *testing.T) {
+ 			startupVolumeMounts = d.Spec.Template.Spec.Containers[0].VolumeMounts
+ 		}).Return(nil)
+ 
+-		client := rfservice.NewRedisFailoverKubeClient(ms, log.Dummy, metrics.Dummy)
+-		err := client.EnsureSentinelDeployment(rf, nil, []metav1.OwnerReference{})
++		client := rfservice.NewRedisFailoverKubeClient(ms, log.Dummy, metrics.Dummy, "cluster.local")
++		err := client.EnsureSentinelDeployment(rf, nil, []metav1.OwnerReference{}, "")
+ 
+ 		assert.NoError(err)
+ 		assert.Contains(startupVolumes, test.expectedVolume)
+@@ -2456,8 +2456,8 @@ func TestRedisCustomLivenessProbe(t *testing.T) {
+ 			livenessProbe = s.Spec.Template.Spec.Containers[0].LivenessProbe
+ 		}).Return(nil)
+ 
+-		client := rfservice.NewRedisFailoverKubeClient(ms, log.Dummy, metrics.Dummy)
+-		err := client.EnsureRedisStatefulset(rf, nil, []metav1.OwnerReference{})
++		client := rfservice.NewRedisFailoverKubeClient(ms, log.Dummy, metrics.Dummy, "cluster.local")
++		err := client.EnsureRedisStatefulset(rf, nil, []metav1.OwnerReference{}, "")
+ 
+ 		assert.NoError(err)
+ 		assert.Equal(test.expectedLivenessProbe, livenessProbe)
+@@ -2536,8 +2536,8 @@ func TestSentinelCustomLivenessProbe(t *testing.T) {
+ 			livenessProbe = d.Spec.Template.Spec.Containers[0].LivenessProbe
+ 		}).Return(nil)
+ 
+-		client := rfservice.NewRedisFailoverKubeClient(ms, log.Dummy, metrics.Dummy)
+-		err := client.EnsureSentinelDeployment(rf, nil, []metav1.OwnerReference{})
++		client := rfservice.NewRedisFailoverKubeClient(ms, log.Dummy, metrics.Dummy, "cluster.local")
++		err := client.EnsureSentinelDeployment(rf, nil, []metav1.OwnerReference{}, "")
+ 
+ 		assert.NoError(err)
+ 		assert.Equal(test.expectedLivenessProbe, livenessProbe)
+@@ -2604,8 +2604,8 @@ func TestRedisCustomReadinessProbe(t *testing.T) {
+ 			readinessProbe = s.Spec.Template.Spec.Containers[0].ReadinessProbe
+ 		}).Return(nil)
+ 
+-		client := rfservice.NewRedisFailoverKubeClient(ms, log.Dummy, metrics.Dummy)
+-		err := client.EnsureRedisStatefulset(rf, nil, []metav1.OwnerReference{})
++		client := rfservice.NewRedisFailoverKubeClient(ms, log.Dummy, metrics.Dummy, "cluster.local")
++		err := client.EnsureRedisStatefulset(rf, nil, []metav1.OwnerReference{}, "")
+ 
+ 		assert.NoError(err)
+ 		assert.Equal(test.expectedReadinessProbe, readinessProbe)
+@@ -2684,8 +2684,8 @@ func TestSentinelCustomReadinessProbe(t *testing.T) {
+ 			readinessProbe = d.Spec.Template.Spec.Containers[0].ReadinessProbe
+ 		}).Return(nil)
+ 
+-		client := rfservice.NewRedisFailoverKubeClient(ms, log.Dummy, metrics.Dummy)
+-		err := client.EnsureSentinelDeployment(rf, nil, []metav1.OwnerReference{})
++		client := rfservice.NewRedisFailoverKubeClient(ms, log.Dummy, metrics.Dummy, "cluster.local")
++		err := client.EnsureSentinelDeployment(rf, nil, []metav1.OwnerReference{}, "")
+ 
+ 		assert.NoError(err)
+ 		assert.Equal(test.expectedReadinessProbe, readinessProbe)
+@@ -2744,8 +2744,8 @@ func TestRedisCustomStartupProbe(t *testing.T) {
+ 			startupProbe = s.Spec.Template.Spec.Containers[0].StartupProbe
+ 		}).Return(nil)
+ 
+-		client := rfservice.NewRedisFailoverKubeClient(ms, log.Dummy, metrics.Dummy)
+-		err := client.EnsureRedisStatefulset(rf, nil, []metav1.OwnerReference{})
++		client := rfservice.NewRedisFailoverKubeClient(ms, log.Dummy, metrics.Dummy, "cluster.local")
++		err := client.EnsureRedisStatefulset(rf, nil, []metav1.OwnerReference{}, "")
+ 
+ 		assert.NoError(err)
+ 		assert.Equal(test.expectedStartupProbe, startupProbe)
+@@ -2812,8 +2812,8 @@ func TestSentinelCustomStartupProbe(t *testing.T) {
+ 			startupProbe = d.Spec.Template.Spec.Containers[0].StartupProbe
+ 		}).Return(nil)
+ 
+-		client := rfservice.NewRedisFailoverKubeClient(ms, log.Dummy, metrics.Dummy)
+-		err := client.EnsureSentinelDeployment(rf, nil, []metav1.OwnerReference{})
++		client := rfservice.NewRedisFailoverKubeClient(ms, log.Dummy, metrics.Dummy, "cluster.local")
++		err := client.EnsureSentinelDeployment(rf, nil, []metav1.OwnerReference{}, "")
+ 
+ 		assert.NoError(err)
+ 		assert.Equal(test.expectedStartupProbe, startupProbe)
+@@ -2900,8 +2900,8 @@ func TestDisableMyMaster(t *testing.T) {
+ 			sentinelReadinessProbe = d.Spec.Template.Spec.Containers[0].ReadinessProbe
+ 		}).Return(nil)
+ 
+-		client := rfservice.NewRedisFailoverKubeClient(ms, log.Dummy, metrics.Dummy)
+-		err := client.EnsureSentinelDeployment(rf, nil, []metav1.OwnerReference{})
++		client := rfservice.NewRedisFailoverKubeClient(ms, log.Dummy, metrics.Dummy, "cluster.local")
++		err := client.EnsureSentinelDeployment(rf, nil, []metav1.OwnerReference{}, "")
+ 		assert.NoError(err)
+ 		assert.Equal(test.expectedSentinelReadinessProbe, sentinelReadinessProbe)
+ 
+diff --git a/operator/redisfailover/service/generator_tls_test.go b/operator/redisfailover/service/generator_tls_test.go
+new file mode 100644
+index 00000000..c721a9a0
+--- /dev/null
++++ b/operator/redisfailover/service/generator_tls_test.go
+@@ -0,0 +1,1109 @@
++package service_test
++
++import (
++	"errors"
++	"strings"
++	"testing"
++	"time"
++
++	cmapi "github.com/cert-manager/cert-manager/pkg/apis/certmanager/v1"
++	cmmeta "github.com/cert-manager/cert-manager/pkg/apis/meta/v1"
++	"github.com/stretchr/testify/assert"
++	"github.com/stretchr/testify/mock"
++	appsv1 "k8s.io/api/apps/v1"
++	corev1 "k8s.io/api/core/v1"
++	apierrors "k8s.io/apimachinery/pkg/api/errors"
++	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
++	"k8s.io/apimachinery/pkg/runtime/schema"
++
++	redisfailoverv1 "github.com/freshworks/redis-operator/api/redisfailover/v1"
++	"github.com/freshworks/redis-operator/log"
++	"github.com/freshworks/redis-operator/metrics"
++	mK8SService "github.com/freshworks/redis-operator/mocks/service/k8s"
++	rfservice "github.com/freshworks/redis-operator/operator/redisfailover/service"
++)
++
++// generateTLSRF returns a RedisFailover with TLS enabled via cert-manager.
++func generateTLSRF() *redisfailoverv1.RedisFailover {
++	rf := generateRF()
++	rf.Spec.Redis.Image = "redis:7.2"
++	rf.Spec.Sentinel.Image = "redis:7.2"
++	rf.Spec.Redis.Port = 6379
++	rf.Spec.Redis.Exporter.Enabled = true
++	rf.Spec.Sentinel.Exporter.Enabled = true
++	rf.Spec.TLS = &redisfailoverv1.TLSSettings{
++		Enabled:     true,
++		AuthClients: redisfailoverv1.TLSAuthClientsNo,
++		CertManager: &redisfailoverv1.CertManagerSettings{
++			IssuerRef: cmmeta.ObjectReference{
++				Name:  "test-ca",
++				Kind:  "Issuer",
++				Group: "cert-manager.io",
++			},
++		},
++	}
++	return rf
++}
++
++func ensureSucceeded(t *testing.T, err error) {
++	t.Helper()
++	if err != nil {
++		t.Fatalf("ensure call failed: %v", err)
++	}
++}
++
++func TestRedisConfigMapHasTLSDirectives(t *testing.T) {
++	a := assert.New(t)
++	rf := generateTLSRF()
++
++	var got *corev1.ConfigMap
++	ms := &mK8SService.Services{}
++	ms.On("CreateOrUpdateConfigMap", rf.Namespace, mock.MatchedBy(func(cm *corev1.ConfigMap) bool {
++		if cm.Name == rfservice.GetRedisName(rf) {
++			got = cm
++			return true
++		}
++		return false
++	})).Return(nil)
++
++	gen := rfservice.NewRedisFailoverKubeClient(ms, log.DummyLogger{}, metrics.Dummy, "cluster.local")
++	ensureSucceeded(t, gen.EnsureRedisConfigMap(rf, nil, nil))
++
++	if !a.NotNil(got) {
++		return
++	}
++	conf := got.Data["redis.conf"]
++	a.Contains(conf, "tls-port 6379")
++	a.Contains(conf, "port 0")
++	a.Contains(conf, "tls-cert-file /tls/tls.crt")
++	a.Contains(conf, "tls-key-file /tls/tls.key")
++	a.Contains(conf, "tls-ca-cert-file /tls/ca.crt")
++	a.Contains(conf, "tls-auth-clients no")
++	a.Contains(conf, "tls-replication yes")
++	// Plain "port 6379" must not appear when TLS is on.
++	a.NotContains(conf, "\nport 6379")
++}
++
++func TestSentinelConfigMapHasTLSDirectives(t *testing.T) {
++	a := assert.New(t)
++	rf := generateTLSRF()
++
++	var got *corev1.ConfigMap
++	ms := &mK8SService.Services{}
++	ms.On("CreateOrUpdateConfigMap", rf.Namespace, mock.MatchedBy(func(cm *corev1.ConfigMap) bool {
++		if cm.Name == rfservice.GetSentinelName(rf) {
++			got = cm
++			return true
++		}
++		return false
++	})).Return(nil)
++
++	gen := rfservice.NewRedisFailoverKubeClient(ms, log.DummyLogger{}, metrics.Dummy, "cluster.local")
++	ensureSucceeded(t, gen.EnsureSentinelConfigMap(rf, nil, nil))
++
++	if !a.NotNil(got) {
++		return
++	}
++	conf := got.Data["sentinel.conf"]
++	a.Contains(conf, "tls-port 26379")
++	a.Contains(conf, "port 0")
++	a.Contains(conf, "tls-cert-file /tls/tls.crt")
++	a.Contains(conf, "tls-auth-clients no")
++	a.Contains(conf, "tls-replication yes")
++}
++
++func TestRedisStatefulSetHasTLSVolume(t *testing.T) {
++	a := assert.New(t)
++	rf := generateTLSRF()
++
++	got := redisStatefulSetFor(t, rf, "")
++	if !a.NotNil(got) {
++		return
++	}
++	expectedSecret := rfservice.GetTLSSecretName(rf)
++
++	// Volume present and points at the right secret.
++	tlsVol := findVolume(got.Spec.Template.Spec.Volumes, "redis-tls")
++	if a.NotNil(tlsVol, "redis-tls volume must be present") {
++		a.NotNil(tlsVol.Secret)
++		if tlsVol.Secret != nil {
++			a.Equal(expectedSecret, tlsVol.Secret.SecretName)
++			if a.NotNil(tlsVol.Secret.DefaultMode, "TLS secret must not fall back to the world-readable default mode") {
++				a.Equal(int32(0440), *tlsVol.Secret.DefaultMode,
++					"TLS secret files must be readable only by the owner and the pod fsGroup")
++			}
++		}
++	}
++
++	// Mount present on the redis container.
++	redisContainer := got.Spec.Template.Spec.Containers[0]
++	a.True(hasTLSMount(redisContainer.VolumeMounts),
++		"redis container must mount the TLS secret read-only at /tls")
++}
++
++func TestSentinelDeploymentHasTLSVolume(t *testing.T) {
++	a := assert.New(t)
++	rf := generateTLSRF()
++
++	got := sentinelDeploymentFor(t, rf, "")
++	if !a.NotNil(got) {
++		return
++	}
++
++	tlsVol := findVolume(got.Spec.Template.Spec.Volumes, "redis-tls")
++	if a.NotNil(tlsVol, "redis-tls volume must be present on the sentinel pod") {
++		a.NotNil(tlsVol.Secret)
++		if tlsVol.Secret != nil {
++			a.Equal(rfservice.GetTLSSecretName(rf), tlsVol.Secret.SecretName)
++			if a.NotNil(tlsVol.Secret.DefaultMode, "TLS secret must not fall back to the world-readable default mode") {
++				a.Equal(int32(0440), *tlsVol.Secret.DefaultMode,
++					"TLS secret files must be readable only by the owner and the pod fsGroup")
++			}
++		}
++	}
++
++	sentinelContainer := got.Spec.Template.Spec.Containers[0]
++	a.True(hasTLSMount(sentinelContainer.VolumeMounts),
++		"sentinel container must mount the TLS secret read-only at /tls")
++}
++
++// A pod securityContext supplied by the user replaces the operator's default
++// wholesale, so it may carry no fsGroup. Secret files are then owned by
++// root:root and 0440 would be unreadable by a container running as non-root,
++// so the mode must stay at the kubelet default in that case.
++func TestTLSVolumeKeepsDefaultModeWithoutFSGroup(t *testing.T) {
++	a := assert.New(t)
++	runAsUser := int64(1000)
++	noFSGroup := &corev1.PodSecurityContext{RunAsUser: &runAsUser}
++
++	rf := generateTLSRF()
++	rf.Spec.Redis.SecurityContext = noFSGroup
++	rf.Spec.Sentinel.SecurityContext = noFSGroup
++
++	sts := redisStatefulSetFor(t, rf, "")
++	if a.NotNil(sts) {
++		tlsVol := findVolume(sts.Spec.Template.Spec.Volumes, "redis-tls")
++		if a.NotNil(tlsVol) && a.NotNil(tlsVol.Secret) {
++			a.Nil(tlsVol.Secret.DefaultMode,
++				"without an fsGroup the redis TLS volume must keep the kubelet default mode")
++		}
++	}
++
++	deploy := sentinelDeploymentFor(t, rf, "")
++	if a.NotNil(deploy) {
++		tlsVol := findVolume(deploy.Spec.Template.Spec.Volumes, "redis-tls")
++		if a.NotNil(tlsVol) && a.NotNil(tlsVol.Secret) {
++			a.Nil(tlsVol.Secret.DefaultMode,
++				"without an fsGroup the sentinel TLS volume must keep the kubelet default mode")
++		}
++	}
++}
++
++func findVolume(volumes []corev1.Volume, name string) *corev1.Volume {
++	for i := range volumes {
++		if volumes[i].Name == name {
++			return &volumes[i]
++		}
++	}
++	return nil
++}
++
++func hasTLSMount(mounts []corev1.VolumeMount) bool {
++	for _, m := range mounts {
++		if m.Name == "redis-tls" && m.MountPath == "/tls" && m.ReadOnly {
++			return true
++		}
++	}
++	return false
++}
++
++func redisStatefulSetFor(t *testing.T, rf *redisfailoverv1.RedisFailover, tlsHash string) *appsv1.StatefulSet {
++	t.Helper()
++
++	var got *appsv1.StatefulSet
++	ms := &mK8SService.Services{}
++	ms.On("CreateOrUpdateStatefulSet", rf.Namespace, mock.MatchedBy(func(ss *appsv1.StatefulSet) bool {
++		got = ss
++		return true
++	})).Return(nil)
++	ms.On("CreateOrUpdatePodDisruptionBudget", rf.Namespace, mock.Anything).Return(nil).Maybe()
++	ms.On("GetStatefulSet", rf.Namespace, mock.Anything).Return(nil, apierrors.NewNotFound(schema.GroupResource{}, "")).Maybe()
++
++	gen := rfservice.NewRedisFailoverKubeClient(ms, log.DummyLogger{}, metrics.Dummy, "cluster.local")
++	ensureSucceeded(t, gen.EnsureRedisStatefulset(rf, nil, nil, tlsHash))
++	return got
++}
++
++func sentinelDeploymentFor(t *testing.T, rf *redisfailoverv1.RedisFailover, tlsHash string) *appsv1.Deployment {
++	t.Helper()
++
++	var got *appsv1.Deployment
++	ms := &mK8SService.Services{}
++	ms.On("CreateOrUpdateDeployment", rf.Namespace, mock.MatchedBy(func(d *appsv1.Deployment) bool {
++		got = d
++		return true
++	})).Return(nil)
++	ms.On("CreateOrUpdatePodDisruptionBudget", rf.Namespace, mock.Anything).Return(nil).Maybe()
++
++	gen := rfservice.NewRedisFailoverKubeClient(ms, log.DummyLogger{}, metrics.Dummy, "cluster.local")
++	ensureSucceeded(t, gen.EnsureSentinelDeployment(rf, nil, nil, tlsHash))
++	return got
++}
++
++func TestRedisExporterHasTLSEnv(t *testing.T) {
++	a := assert.New(t)
++	rf := generateTLSRF()
++
++	var got *appsv1.StatefulSet
++	ms := &mK8SService.Services{}
++	ms.On("CreateOrUpdateStatefulSet", rf.Namespace, mock.MatchedBy(func(ss *appsv1.StatefulSet) bool {
++		got = ss
++		return true
++	})).Return(nil)
++	ms.On("CreateOrUpdatePodDisruptionBudget", rf.Namespace, mock.Anything).Return(nil).Maybe()
++	ms.On("GetStatefulSet", rf.Namespace, mock.Anything).Return(nil, apierrors.NewNotFound(schema.GroupResource{}, "")).Maybe()
++
++	gen := rfservice.NewRedisFailoverKubeClient(ms, log.DummyLogger{}, metrics.Dummy, "cluster.local")
++	ensureSucceeded(t, gen.EnsureRedisStatefulset(rf, nil, nil, ""))
++
++	if !a.NotNil(got) {
++		return
++	}
++	var exporter *corev1.Container
++	for i := range got.Spec.Template.Spec.Containers {
++		c := &got.Spec.Template.Spec.Containers[i]
++		if c.Name == "redis-exporter" {
++			exporter = c
++			break
++		}
++	}
++	if !a.NotNil(exporter, "redis exporter sidecar must be present") {
++		return
++	}
++	env := envToMap(exporter.Env)
++	a.Equal("/tls/tls.crt", env["REDIS_EXPORTER_TLS_CLIENT_CERT_FILE"])
++	a.Equal("/tls/tls.key", env["REDIS_EXPORTER_TLS_CLIENT_KEY_FILE"])
++	a.Equal("/tls/ca.crt", env["REDIS_EXPORTER_TLS_CA_CERT_FILE"])
++	a.Contains(env["REDIS_ADDR"], "rediss://")
++}
++
++func TestSentinelExporterTLSAddr(t *testing.T) {
++	a := assert.New(t)
++	rf := generateTLSRF()
++
++	var got *appsv1.Deployment
++	ms := &mK8SService.Services{}
++	ms.On("CreateOrUpdateDeployment", rf.Namespace, mock.MatchedBy(func(d *appsv1.Deployment) bool {
++		got = d
++		return true
++	})).Return(nil)
++	ms.On("CreateOrUpdatePodDisruptionBudget", rf.Namespace, mock.Anything).Return(nil).Maybe()
++	ms.On("GetStatefulSet", rf.Namespace, mock.Anything).Return(nil, apierrors.NewNotFound(schema.GroupResource{}, "")).Maybe()
++
++	gen := rfservice.NewRedisFailoverKubeClient(ms, log.DummyLogger{}, metrics.Dummy, "cluster.local")
++	ensureSucceeded(t, gen.EnsureSentinelDeployment(rf, nil, nil, ""))
++
++	if !a.NotNil(got) {
++		return
++	}
++	var exporter *corev1.Container
++	for i := range got.Spec.Template.Spec.Containers {
++		c := &got.Spec.Template.Spec.Containers[i]
++		if c.Name == "sentinel-exporter" {
++			exporter = c
++			break
++		}
++	}
++	if !a.NotNil(exporter, "sentinel exporter sidecar must be present") {
++		return
++	}
++	env := envToMap(exporter.Env)
++	a.Equal("rediss://127.0.0.1:26379", env["REDIS_ADDR"])
++	a.Equal("/tls/tls.crt", env["REDIS_EXPORTER_TLS_CLIENT_CERT_FILE"])
++}
++
++func TestRedisShutdownScriptUsesTLS(t *testing.T) {
++	a := assert.New(t)
++	rf := generateTLSRF()
++
++	var got *corev1.ConfigMap
++	ms := &mK8SService.Services{}
++	ms.On("CreateOrUpdateConfigMap", rf.Namespace, mock.MatchedBy(func(cm *corev1.ConfigMap) bool {
++		if cm.Name == rfservice.GetRedisShutdownConfigMapName(rf) {
++			got = cm
++			return true
++		}
++		return false
++	})).Return(nil)
++
++	gen := rfservice.NewRedisFailoverKubeClient(ms, log.DummyLogger{}, metrics.Dummy, "cluster.local")
++	ensureSucceeded(t, gen.EnsureRedisShutdownConfigMap(rf, nil, nil))
++
++	if !a.NotNil(got) {
++		return
++	}
++	script := got.Data["shutdown.sh"]
++	a.Contains(script, "--tls")
++	a.Contains(script, "--cacert /tls/ca.crt")
++	a.Contains(script, "--cert /tls/tls.crt")
++	a.Contains(script, "--key /tls/tls.key")
++}
++
++func TestRedisReadinessScriptUsesTLS(t *testing.T) {
++	a := assert.New(t)
++	rf := generateTLSRF()
++
++	var got *corev1.ConfigMap
++	ms := &mK8SService.Services{}
++	ms.On("CreateOrUpdateConfigMap", rf.Namespace, mock.MatchedBy(func(cm *corev1.ConfigMap) bool {
++		if cm.Name == rfservice.GetRedisReadinessName(rf) {
++			got = cm
++			return true
++		}
++		return false
++	})).Return(nil)
++
++	gen := rfservice.NewRedisFailoverKubeClient(ms, log.DummyLogger{}, metrics.Dummy, "cluster.local")
++	ensureSucceeded(t, gen.EnsureRedisReadinessConfigMap(rf, nil, nil))
++
++	if !a.NotNil(got) {
++		return
++	}
++	script := got.Data["ready.sh"]
++	a.Contains(script, "--tls")
++	a.Contains(script, "--cacert /tls/ca.crt")
++}
++
++func TestRedisLivenessProbeUsesTLS(t *testing.T) {
++	a := assert.New(t)
++	rf := generateTLSRF()
++
++	var got *appsv1.StatefulSet
++	ms := &mK8SService.Services{}
++	ms.On("CreateOrUpdateStatefulSet", rf.Namespace, mock.MatchedBy(func(ss *appsv1.StatefulSet) bool {
++		got = ss
++		return true
++	})).Return(nil)
++	ms.On("CreateOrUpdatePodDisruptionBudget", rf.Namespace, mock.Anything).Return(nil).Maybe()
++	ms.On("GetStatefulSet", rf.Namespace, mock.Anything).Return(nil, apierrors.NewNotFound(schema.GroupResource{}, "")).Maybe()
++
++	gen := rfservice.NewRedisFailoverKubeClient(ms, log.DummyLogger{}, metrics.Dummy, "cluster.local")
++	ensureSucceeded(t, gen.EnsureRedisStatefulset(rf, nil, nil, ""))
++
++	if !a.NotNil(got) {
++		return
++	}
++	probe := got.Spec.Template.Spec.Containers[0].LivenessProbe
++	if !a.NotNil(probe) || !a.NotNil(probe.Exec) {
++		return
++	}
++	cmd := strings.Join(probe.Exec.Command, " ")
++	a.Contains(cmd, "--tls")
++	a.Contains(cmd, "--cacert /tls/ca.crt")
++	a.Contains(cmd, "-h localhost",
++		"probe must dial -h localhost so the host matches a SAN entry of the in-pod TLS cert")
++	a.NotContains(cmd, "$(hostname)",
++		"$(hostname) returns the bare pod name and is not covered by the cert SAN list")
++}
++
++func TestSentinelProbeUsesTLS(t *testing.T) {
++	a := assert.New(t)
++	rf := generateTLSRF()
++
++	var got *appsv1.Deployment
++	ms := &mK8SService.Services{}
++	ms.On("CreateOrUpdateDeployment", rf.Namespace, mock.MatchedBy(func(d *appsv1.Deployment) bool {
++		got = d
++		return true
++	})).Return(nil)
++	ms.On("CreateOrUpdatePodDisruptionBudget", rf.Namespace, mock.Anything).Return(nil).Maybe()
++	ms.On("GetStatefulSet", rf.Namespace, mock.Anything).Return(nil, apierrors.NewNotFound(schema.GroupResource{}, "")).Maybe()
++
++	gen := rfservice.NewRedisFailoverKubeClient(ms, log.DummyLogger{}, metrics.Dummy, "cluster.local")
++	ensureSucceeded(t, gen.EnsureSentinelDeployment(rf, nil, nil, ""))
++
++	if !a.NotNil(got) {
++		return
++	}
++	probe := got.Spec.Template.Spec.Containers[0].LivenessProbe
++	if !a.NotNil(probe) || !a.NotNil(probe.Exec) {
++		return
++	}
++	cmd := strings.Join(probe.Exec.Command, " ")
++	a.Contains(cmd, "--tls")
++	a.Contains(cmd, "-h localhost",
++		"sentinel probe must dial -h localhost so the host matches a SAN entry of the in-pod TLS cert")
++	a.NotContains(cmd, "$(hostname)",
++		"$(hostname) returns the bare pod name and is not covered by the cert SAN list")
++}
++
++func TestTLSSecretNamePrecedence(t *testing.T) {
++	a := assert.New(t)
++
++	rfCM := generateTLSRF()
++	a.Equal("rftls-"+rfCM.Name, rfservice.GetTLSSecretName(rfCM),
++		"cert-manager managed mode should use generated default")
++
++	rfCMOverride := generateTLSRF()
++	rfCMOverride.Spec.TLS.CertManager.SecretName = "custom-secret"
++	a.Equal("custom-secret", rfservice.GetTLSSecretName(rfCMOverride),
++		"certManager.secretName should override the default")
++
++	rfBYO := generateTLSRF()
++	rfBYO.Spec.TLS.CertManager = nil
++	rfBYO.Spec.TLS.CertificateSecret = &redisfailoverv1.LocalSecretReference{SecretName: "byo-tls"}
++	a.Equal("byo-tls", rfservice.GetTLSSecretName(rfBYO),
++		"certificateSecret.secretName should take precedence")
++
++	rfOff := generateRF()
++	a.Equal("", rfservice.GetTLSSecretName(rfOff),
++		"with TLS disabled the helper must return an empty string")
++}
++
++func TestTLSCACertSecretName(t *testing.T) {
++	a := assert.New(t)
++
++	rfCM := generateTLSRF()
++	a.Equal("rftls-"+rfCM.Name+"-ca", rfservice.GetTLSCACertSecretName(rfCM),
++		"default CA secret name derives from the TLS secret name with a -ca suffix")
++
++	rfOverride := generateTLSRF()
++	rfOverride.Spec.TLS.CACertSecretName = "custom-ca"
++	a.Equal("custom-ca", rfservice.GetTLSCACertSecretName(rfOverride),
++		"caCertSecretName must override the derived default")
++
++	rfBYO := generateTLSRF()
++	rfBYO.Spec.TLS.CertManager = nil
++	rfBYO.Spec.TLS.CertificateSecret = &redisfailoverv1.LocalSecretReference{SecretName: "byo-tls"}
++	a.Equal("byo-tls-ca", rfservice.GetTLSCACertSecretName(rfBYO),
++		"default CA secret name tracks the bring-your-own TLS secret name")
++
++	rfOff := generateRF()
++	a.Equal("", rfservice.GetTLSCACertSecretName(rfOff),
++		"with TLS disabled the helper must return an empty string")
++}
++
++func envToMap(env []corev1.EnvVar) map[string]string {
++	out := make(map[string]string, len(env))
++	for _, e := range env {
++		out[e.Name] = e.Value
++	}
++	return out
++}
++
++func TestEnsureRedisCertificateCreatesCertManagerCert(t *testing.T) {
++	a := assert.New(t)
++	rf := generateTLSRF()
++	rf.Spec.TLS.CertManager.Duration = &metav1.Duration{Duration: 30 * 24 * time.Hour}
++	rf.Spec.TLS.CertManager.RenewBefore = &metav1.Duration{Duration: 10 * 24 * time.Hour}
++
++	var got *cmapi.Certificate
++	ms := &mK8SService.Services{}
++	ms.On("CreateOrUpdateCertificate", rf.Namespace, mock.MatchedBy(func(c *cmapi.Certificate) bool {
++		got = c
++		return true
++	})).Return(nil)
++
++	gen := rfservice.NewRedisFailoverKubeClient(ms, log.DummyLogger{}, metrics.Dummy, "cluster.local")
++	ensureSucceeded(t, gen.EnsureRedisCertificate(rf, nil, nil))
++
++	if !a.NotNil(got) {
++		return
++	}
++	a.Equal(rfservice.GetTLSCertificateName(rf), got.Name)
++	a.Equal(rf.Namespace, got.Namespace)
++	a.Equal(rfservice.GetTLSSecretName(rf), got.Spec.SecretName)
++	a.Equal("test-ca", got.Spec.IssuerRef.Name)
++	a.Equal("Issuer", got.Spec.IssuerRef.Kind)
++	a.Equal("cert-manager.io", got.Spec.IssuerRef.Group)
++	a.Equal(rf.Spec.TLS.CertManager.Duration, got.Spec.Duration)
++	a.Equal(rf.Spec.TLS.CertManager.RenewBefore, got.Spec.RenewBefore)
++
++	// DNS SAN coverage: each Service must appear in short and FQDN form, plus the
++	// per-pod wildcard for the headless service.
++	dnsSet := make(map[string]struct{}, len(got.Spec.DNSNames))
++	for _, d := range got.Spec.DNSNames {
++		dnsSet[d] = struct{}{}
++	}
++	for _, want := range []string{
++		rfservice.GetRedisName(rf),
++		rfservice.GetRedisMasterName(rf) + "." + rf.Namespace + ".svc.cluster.local",
++		rfservice.GetSentinelName(rf) + "." + rf.Namespace + ".svc",
++		"*." + rfservice.GetRedisName(rf) + "." + rf.Namespace + ".svc.cluster.local",
++	} {
++		_, ok := dnsSet[want]
++		a.Truef(ok, "expected DNS SAN %q to be present (got %v)", want, got.Spec.DNSNames)
++	}
++
++	// Usages must include both server and client auth so the cert works for
++	// the cluster pods AND the operator client.
++	usages := make(map[cmapi.KeyUsage]struct{}, len(got.Spec.Usages))
++	for _, u := range got.Spec.Usages {
++		usages[u] = struct{}{}
++	}
++	_, hasServer := usages[cmapi.UsageServerAuth]
++	_, hasClient := usages[cmapi.UsageClientAuth]
++	a.True(hasServer, "Certificate must declare server auth usage")
++	a.True(hasClient, "Certificate must declare client auth usage")
++}
++
++func TestEnsureRedisCertificateAppendsExtraSANs(t *testing.T) {
++	a := assert.New(t)
++	rf := generateTLSRF()
++	rf.Spec.TLS.CertManager.ExtraSANs = []string{
++		"redis.example.com",
++		"10.0.0.50",
++		"redis.internal.corp",
++		"2001:db8::1",
++	}
++
++	var got *cmapi.Certificate
++	ms := &mK8SService.Services{}
++	ms.On("CreateOrUpdateCertificate", rf.Namespace, mock.MatchedBy(func(c *cmapi.Certificate) bool {
++		got = c
++		return true
++	})).Return(nil)
++
++	gen := rfservice.NewRedisFailoverKubeClient(ms, log.DummyLogger{}, metrics.Dummy, "cluster.local")
++	ensureSucceeded(t, gen.EnsureRedisCertificate(rf, nil, nil))
++
++	if !a.NotNil(got) {
++		return
++	}
++
++	dnsSet := make(map[string]struct{}, len(got.Spec.DNSNames))
++	for _, d := range got.Spec.DNSNames {
++		dnsSet[d] = struct{}{}
++	}
++	ipSet := make(map[string]struct{}, len(got.Spec.IPAddresses))
++	for _, ip := range got.Spec.IPAddresses {
++		ipSet[ip] = struct{}{}
++	}
++
++	// Extra DNS SANs are added to DNSNames.
++	for _, want := range []string{"redis.example.com", "redis.internal.corp"} {
++		_, ok := dnsSet[want]
++		a.Truef(ok, "expected extra DNS SAN %q to be present (got %v)", want, got.Spec.DNSNames)
++	}
++
++	// Extra IP SANs are auto-classified into IPAddresses (IPv4 + IPv6).
++	for _, want := range []string{"10.0.0.50", "2001:db8::1"} {
++		_, ok := ipSet[want]
++		a.Truef(ok, "expected extra IP SAN %q to be present (got %v)", want, got.Spec.IPAddresses)
++	}
++
++	// IP-looking entries must not leak into DNSNames.
++	for _, ip := range []string{"10.0.0.50", "2001:db8::1"} {
++		_, leaked := dnsSet[ip]
++		a.Falsef(leaked, "IP %q must not appear in DNSNames", ip)
++	}
++
++	// Computed service SANs must still be present — extras are additive.
++	for _, want := range []string{
++		rfservice.GetRedisName(rf),
++		rfservice.GetRedisMasterName(rf) + "." + rf.Namespace + ".svc.cluster.local",
++		"*." + rfservice.GetRedisName(rf) + "." + rf.Namespace + ".svc.cluster.local",
++	} {
++		_, ok := dnsSet[want]
++		a.Truef(ok, "computed DNS SAN %q must remain after extras merge (got %v)", want, got.Spec.DNSNames)
++	}
++}
++
++func TestEnsureRedisCertificateCoversInPodDials(t *testing.T) {
++	a := assert.New(t)
++	rf := generateTLSRF()
++
++	var got *cmapi.Certificate
++	ms := &mK8SService.Services{}
++	ms.On("CreateOrUpdateCertificate", rf.Namespace, mock.MatchedBy(func(c *cmapi.Certificate) bool {
++		got = c
++		return true
++	})).Return(nil)
++
++	gen := rfservice.NewRedisFailoverKubeClient(ms, log.DummyLogger{}, metrics.Dummy, "cluster.local")
++	ensureSucceeded(t, gen.EnsureRedisCertificate(rf, nil, nil))
++
++	if !a.NotNil(got) {
++		return
++	}
++
++	dnsSet := make(map[string]struct{}, len(got.Spec.DNSNames))
++	for _, d := range got.Spec.DNSNames {
++		dnsSet[d] = struct{}{}
++	}
++	ipSet := make(map[string]struct{}, len(got.Spec.IPAddresses))
++	for _, ip := range got.Spec.IPAddresses {
++		ipSet[ip] = struct{}{}
++	}
++
++	// localhost must be a DNS SAN so the liveness probe (-h localhost)
++	// verifies against the same cert.
++	_, hasLocalhost := dnsSet["localhost"]
++	a.True(hasLocalhost, "localhost DNS SAN must be present (got %v)", got.Spec.DNSNames)
++
++	// 127.0.0.1 and ::1 must be IP SANs so the redis_exporter sidecar
++	// (REDIS_ADDR=rediss://127.0.0.1:...) and the sentinel monitor
++	// target (sentinel monitor mymaster 127.0.0.1 ...) verify against
++	// the same cert.
++	for _, ip := range []string{"127.0.0.1", "::1"} {
++		_, ok := ipSet[ip]
++		a.Truef(ok, "expected loopback IP SAN %q to be present (got %v)", ip, got.Spec.IPAddresses)
++	}
++}
++
++func TestEnsureRedisCertificateUsesConfiguredClusterDomain(t *testing.T) {
++	a := assert.New(t)
++	rf := generateTLSRF()
++
++	var got *cmapi.Certificate
++	ms := &mK8SService.Services{}
++	ms.On("CreateOrUpdateCertificate", rf.Namespace, mock.MatchedBy(func(c *cmapi.Certificate) bool {
++		got = c
++		return true
++	})).Return(nil)
++
++	// cozystack's default cluster domain
++	gen := rfservice.NewRedisFailoverKubeClient(ms, log.DummyLogger{}, metrics.Dummy, "cozy.local")
++	ensureSucceeded(t, gen.EnsureRedisCertificate(rf, nil, nil))
++
++	if !a.NotNil(got) {
++		return
++	}
++
++	dnsSet := make(map[string]struct{}, len(got.Spec.DNSNames))
++	for _, d := range got.Spec.DNSNames {
++		dnsSet[d] = struct{}{}
++	}
++
++	// FQDN SANs must use the configured cluster domain.
++	for _, want := range []string{
++		rfservice.GetRedisName(rf) + "." + rf.Namespace + ".svc.cozy.local",
++		rfservice.GetRedisMasterName(rf) + "." + rf.Namespace + ".svc.cozy.local",
++		rfservice.GetSentinelName(rf) + "." + rf.Namespace + ".svc.cozy.local",
++		"*." + rfservice.GetRedisName(rf) + "." + rf.Namespace + ".svc.cozy.local",
++	} {
++		_, ok := dnsSet[want]
++		a.Truef(ok, "expected DNS SAN %q for custom cluster domain (got %v)", want, got.Spec.DNSNames)
++	}
++
++	// The default cluster.local FQDN must NOT appear when a custom
++	// domain is configured — otherwise the cert would silently mask
++	// SAN-mismatch bugs on non-default clusters.
++	for _, unwanted := range []string{
++		rfservice.GetRedisName(rf) + "." + rf.Namespace + ".svc.cluster.local",
++		"*." + rfservice.GetRedisName(rf) + "." + rf.Namespace + ".svc.cluster.local",
++	} {
++		_, ok := dnsSet[unwanted]
++		a.Falsef(ok, "cluster.local SAN %q must not be present when --cluster-domain=cozy.local (got %v)", unwanted, got.Spec.DNSNames)
++	}
++}
++
++func TestEnsureRedisCertificateLoopbackSANsArePresentWithoutExtras(t *testing.T) {
++	a := assert.New(t)
++	rf := generateTLSRF()
++
++	var got *cmapi.Certificate
++	ms := &mK8SService.Services{}
++	ms.On("CreateOrUpdateCertificate", rf.Namespace, mock.MatchedBy(func(c *cmapi.Certificate) bool {
++		got = c
++		return true
++	})).Return(nil)
++
++	gen := rfservice.NewRedisFailoverKubeClient(ms, log.DummyLogger{}, metrics.Dummy, "cluster.local")
++	ensureSucceeded(t, gen.EnsureRedisCertificate(rf, nil, nil))
++
++	if !a.NotNil(got) {
++		return
++	}
++	// Loopback IPs are part of the default SAN set; this asserts the
++	// default does not silently regress to an empty IPAddresses slice
++	// (which would break the in-pod TLS self-dials).
++	a.ElementsMatch([]string{"127.0.0.1", "::1"}, got.Spec.IPAddresses,
++		"default IPAddresses must include only the loopback IPs when no extras are set")
++}
++
++func TestEnsureRedisCertificateSkipsForBYOSecret(t *testing.T) {
++	a := assert.New(t)
++	rf := generateTLSRF()
++	rf.Spec.TLS.CertManager = nil
++	rf.Spec.TLS.CertificateSecret = &redisfailoverv1.LocalSecretReference{SecretName: "byo-tls"}
++
++	ms := &mK8SService.Services{}
++	gen := rfservice.NewRedisFailoverKubeClient(ms, log.DummyLogger{}, metrics.Dummy, "cluster.local")
++
++	a.NoError(gen.EnsureRedisCertificate(rf, nil, nil))
++	ms.AssertNotCalled(t, "CreateOrUpdateCertificate", mock.Anything, mock.Anything)
++}
++
++func TestEnsureRedisCertificateSkipsWhenDisabled(t *testing.T) {
++	a := assert.New(t)
++	rf := generateRF() // TLS = nil
++
++	ms := &mK8SService.Services{}
++	gen := rfservice.NewRedisFailoverKubeClient(ms, log.DummyLogger{}, metrics.Dummy, "cluster.local")
++
++	a.NoError(gen.EnsureRedisCertificate(rf, nil, nil))
++	ms.AssertNotCalled(t, "CreateOrUpdateCertificate", mock.Anything, mock.Anything)
++}
++
++func TestEnsureRedisCACertSecretPublishesCAOnly(t *testing.T) {
++	a := assert.New(t)
++	rf := generateTLSRF()
++	srcName := rfservice.GetTLSSecretName(rf)
++
++	leaf := &corev1.Secret{
++		ObjectMeta: metav1.ObjectMeta{Name: srcName, Namespace: rf.Namespace},
++		Type:       corev1.SecretTypeTLS,
++		Data: map[string][]byte{
++			"tls.crt": []byte("LEAF-CERT"),
++			"tls.key": []byte("LEAF-KEY"),
++			"ca.crt":  []byte("CA-PEM"),
++		},
++	}
++
++	var got *corev1.Secret
++	ms := &mK8SService.Services{}
++	ms.On("GetSecret", rf.Namespace, srcName).Return(leaf, nil)
++	ms.On("CreateOrUpdateSecret", rf.Namespace, mock.MatchedBy(func(s *corev1.Secret) bool {
++		got = s
++		return true
++	})).Return(nil)
++
++	gen := rfservice.NewRedisFailoverKubeClient(ms, log.DummyLogger{}, metrics.Dummy, "cluster.local")
++	_, err := gen.EnsureRedisCACertSecret(rf, nil, nil)
++	ensureSucceeded(t, err)
++	ms.AssertExpectations(t)
++
++	if !a.NotNil(got) {
++		return
++	}
++	a.Equal(rfservice.GetTLSCACertSecretName(rf), got.Name)
++	a.Equal(rf.Namespace, got.Namespace)
++	a.Equal(corev1.SecretTypeOpaque, got.Type)
++	a.Equal([]byte("CA-PEM"), got.Data["ca.crt"])
++	// The whole point of the feature: the published Secret must carry the CA
++	// certificate and nothing else — no private key, no leaf cert.
++	a.Len(got.Data, 1, "CA-only Secret must hold exactly one key (ca.crt)")
++	_, hasKey := got.Data["tls.key"]
++	a.False(hasKey, "CA-only Secret must not contain tls.key")
++	_, hasCert := got.Data["tls.crt"]
++	a.False(hasCert, "CA-only Secret must not contain tls.crt")
++}
++
++func TestEnsureRedisCACertSecretDefersWhenTLSSecretMissing(t *testing.T) {
++	a := assert.New(t)
++	rf := generateTLSRF()
++	srcName := rfservice.GetTLSSecretName(rf)
++
++	ms := &mK8SService.Services{}
++	ms.On("GetSecret", rf.Namespace, srcName).
++		Return(nil, apierrors.NewNotFound(corev1.Resource("secrets"), srcName))
++
++	gen := rfservice.NewRedisFailoverKubeClient(ms, log.DummyLogger{}, metrics.Dummy, "cluster.local")
++	// Not-yet-populated TLS secret (cert-manager is asynchronous) must be a
++	// soft skip, not an error that blocks the rest of the reconcile.
++	_, err := gen.EnsureRedisCACertSecret(rf, nil, nil)
++	a.NoError(err)
++	ms.AssertNotCalled(t, "CreateOrUpdateSecret", mock.Anything, mock.Anything)
++	ms.AssertExpectations(t)
++}
++
++func TestEnsureRedisCACertSecretReturnsErrorOnGetFailure(t *testing.T) {
++	a := assert.New(t)
++	rf := generateTLSRF()
++	srcName := rfservice.GetTLSSecretName(rf)
++
++	ms := &mK8SService.Services{}
++	ms.On("GetSecret", rf.Namespace, srcName).Return(nil, errors.New("api server unavailable"))
++
++	gen := rfservice.NewRedisFailoverKubeClient(ms, log.DummyLogger{}, metrics.Dummy, "cluster.local")
++	// A non-NotFound error is a real failure and must propagate.
++	_, err := gen.EnsureRedisCACertSecret(rf, nil, nil)
++	a.Error(err)
++	ms.AssertNotCalled(t, "CreateOrUpdateSecret", mock.Anything, mock.Anything)
++	ms.AssertExpectations(t)
++}
++
++func TestEnsureRedisCACertSecretDefersWhenCACrtMissing(t *testing.T) {
++	a := assert.New(t)
++	rf := generateTLSRF()
++	srcName := rfservice.GetTLSSecretName(rf)
++
++	leaf := &corev1.Secret{
++		ObjectMeta: metav1.ObjectMeta{Name: srcName, Namespace: rf.Namespace},
++		Type:       corev1.SecretTypeTLS,
++		Data: map[string][]byte{
++			"tls.crt": []byte("LEAF-CERT"),
++			"tls.key": []byte("LEAF-KEY"),
++		},
++	}
++
++	ms := &mK8SService.Services{}
++	ms.On("GetSecret", rf.Namespace, srcName).Return(leaf, nil)
++
++	gen := rfservice.NewRedisFailoverKubeClient(ms, log.DummyLogger{}, metrics.Dummy, "cluster.local")
++	_, err := gen.EnsureRedisCACertSecret(rf, nil, nil)
++	a.NoError(err)
++	ms.AssertNotCalled(t, "CreateOrUpdateSecret", mock.Anything, mock.Anything)
++	ms.AssertExpectations(t)
++}
++
++func TestEnsureRedisCACertSecretSkipsWhenDisabled(t *testing.T) {
++	a := assert.New(t)
++	rf := generateRF() // TLS == nil
++
++	ms := &mK8SService.Services{}
++	gen := rfservice.NewRedisFailoverKubeClient(ms, log.DummyLogger{}, metrics.Dummy, "cluster.local")
++
++	_, err := gen.EnsureRedisCACertSecret(rf, nil, nil)
++	a.NoError(err)
++	ms.AssertNotCalled(t, "GetSecret", mock.Anything, mock.Anything)
++	ms.AssertNotCalled(t, "CreateOrUpdateSecret", mock.Anything, mock.Anything)
++}
++
++func TestEnsureRedisCACertSecretBYOWithOverrideName(t *testing.T) {
++	a := assert.New(t)
++	rf := generateTLSRF()
++	rf.Spec.TLS.CertManager = nil
++	rf.Spec.TLS.CertificateSecret = &redisfailoverv1.LocalSecretReference{SecretName: "byo-tls"}
++	rf.Spec.TLS.CACertSecretName = "my-ca-bundle"
++
++	leaf := &corev1.Secret{
++		ObjectMeta: metav1.ObjectMeta{Name: "byo-tls", Namespace: rf.Namespace},
++		Type:       corev1.SecretTypeTLS,
++		Data:       map[string][]byte{"ca.crt": []byte("BYO-CA")},
++	}
++
++	var got *corev1.Secret
++	ms := &mK8SService.Services{}
++	ms.On("GetSecret", rf.Namespace, "byo-tls").Return(leaf, nil)
++	ms.On("CreateOrUpdateSecret", rf.Namespace, mock.MatchedBy(func(s *corev1.Secret) bool {
++		got = s
++		return true
++	})).Return(nil)
++
++	gen := rfservice.NewRedisFailoverKubeClient(ms, log.DummyLogger{}, metrics.Dummy, "cluster.local")
++	_, err := gen.EnsureRedisCACertSecret(rf, nil, nil)
++	ensureSucceeded(t, err)
++	ms.AssertExpectations(t)
++
++	if !a.NotNil(got) {
++		return
++	}
++	a.Equal("my-ca-bundle", got.Name, "explicit caCertSecretName override must be honored in BYO mode")
++	a.Equal([]byte("BYO-CA"), got.Data["ca.crt"])
++}
++
++// tlsHashAnnotation pins the published annotation name; downstream tooling and
++// users read it, so a rename is a breaking change and must fail here.
++const tlsHashAnnotation = "redis-failover.freshworks.com/tls-secret-hash"
++
++// tlsHashFor drives the CA-publish path against a TLS secret with the given
++// contents and returns the hash it hands back for the pod templates.
++func tlsHashFor(t *testing.T, rf *redisfailoverv1.RedisFailover, data map[string][]byte) string {
++	t.Helper()
++
++	srcName := rfservice.GetTLSSecretName(rf)
++	ms := &mK8SService.Services{}
++	ms.On("GetSecret", rf.Namespace, srcName).Return(&corev1.Secret{
++		ObjectMeta: metav1.ObjectMeta{Name: srcName, Namespace: rf.Namespace},
++		Data:       data,
++	}, nil)
++	ms.On("CreateOrUpdateSecret", rf.Namespace, mock.Anything).Return(nil).Maybe()
++
++	gen := rfservice.NewRedisFailoverKubeClient(ms, log.DummyLogger{}, metrics.Dummy, "cluster.local")
++	hash, err := gen.EnsureRedisCACertSecret(rf, nil, nil)
++	ensureSucceeded(t, err)
++	return hash
++}
++
++func TestTLSSecretHashStampedOnPodTemplates(t *testing.T) {
++	a := assert.New(t)
++	rf := generateTLSRF()
++	rf.Spec.Redis.PodAnnotations = map[string]string{"team": "db"}
++	rf.Spec.Sentinel.PodAnnotations = map[string]string{"team": "db"}
++
++	hash := tlsHashFor(t, rf, map[string][]byte{"tls.crt": []byte("LEAF"), "ca.crt": []byte("CA")})
++	a.NotEmpty(hash, "a populated TLS secret must yield a hash to pin the pods to")
++
++	sts := redisStatefulSetFor(t, rf, hash)
++	if a.NotNil(sts) {
++		a.Equal(hash, sts.Spec.Template.Annotations[tlsHashAnnotation],
++			"redis pod template must carry the TLS content hash")
++		a.Equal("db", sts.Spec.Template.Annotations["team"],
++			"stamping the hash must not drop the user's pod annotations")
++	}
++
++	deploy := sentinelDeploymentFor(t, rf, hash)
++	if a.NotNil(deploy) {
++		a.Equal(hash, deploy.Spec.Template.Annotations[tlsHashAnnotation],
++			"sentinel pod template must carry the TLS content hash")
++		a.Equal("db", deploy.Spec.Template.Annotations["team"],
++			"stamping the hash must not drop the user's pod annotations")
++	}
++
++	// The spec maps are the live objects from the informer cache; stamping
++	// must not write through to them.
++	a.NotContains(rf.Spec.Redis.PodAnnotations, tlsHashAnnotation)
++	a.NotContains(rf.Spec.Sentinel.PodAnnotations, tlsHashAnnotation)
++}
++
++func TestTLSSecretHashTracksSecretContent(t *testing.T) {
++	a := assert.New(t)
++	rf := generateTLSRF()
++
++	first := tlsHashFor(t, rf, map[string][]byte{"tls.crt": []byte("LEAF-1"), "ca.crt": []byte("CA-1")})
++	again := tlsHashFor(t, rf, map[string][]byte{"tls.crt": []byte("LEAF-1"), "ca.crt": []byte("CA-1")})
++	renewed := tlsHashFor(t, rf, map[string][]byte{"tls.crt": []byte("LEAF-2"), "ca.crt": []byte("CA-1")})
++	rotatedCA := tlsHashFor(t, rf, map[string][]byte{"tls.crt": []byte("LEAF-1"), "ca.crt": []byte("CA-2")})
++
++	a.Equal(first, again, "unchanged TLS material must not roll the pods")
++	a.NotEqual(first, renewed, "a renewed certificate must change the hash")
++	a.NotEqual(first, rotatedCA,
++		"a rotated CA must change the hash: redis loads ca.crt once at startup")
++
++	empty := tlsHashFor(t, rf, map[string][]byte{"ca.crt": []byte("CA-1")})
++	a.Empty(empty, "with no tls.crt there is nothing to pin the pods to yet")
++}
++
++// TestTLSSecretHashTracksAuthClients pins the roll behaviour of
++// spec.tls.authClients. The directive reaches a running server only through
++// the generated config file, which Redis reads once at startup, and the Redis
++// StatefulSet rolls OnDelete. Left out of the pod template, a change to it is
++// admitted and then lands pod by pod at whatever unrelated restart comes next
++// — a node drain, an OOM, or the renewal roll months later.
++func TestTLSSecretHashTracksAuthClients(t *testing.T) {
++	a := assert.New(t)
++	data := map[string][]byte{"tls.crt": []byte("LEAF"), "ca.crt": []byte("CA")}
++
++	hashFor := func(authClients string) string {
++		rf := generateTLSRF()
++		rf.Spec.TLS.AuthClients = authClients
++		return tlsHashFor(t, rf, data)
++	}
++
++	no := hashFor(redisfailoverv1.TLSAuthClientsNo)
++	optional := hashFor(redisfailoverv1.TLSAuthClientsOptional)
++	yes := hashFor(redisfailoverv1.TLSAuthClientsYes)
++
++	a.Equal(no, hashFor(redisfailoverv1.TLSAuthClientsNo),
++		"an unchanged directive must not roll the pods")
++	a.Equal(no, hashFor(""),
++		"an unset directive defaults to no, so both spellings must hash alike")
++	a.NotEqual(no, yes,
++		"demanding client certificates must roll the pods that enforce it")
++	a.NotEqual(no, optional,
++		"accepting client certificates must roll the pods that enforce it")
++	a.NotEqual(optional, yes,
++		"optional and yes are different servers and must not hash alike")
++}
++
++func TestTLSSecretHashAbsentWhenTLSDisabled(t *testing.T) {
++	a := assert.New(t)
++	rf := generateRF()
++	rf.Spec.Redis.PodAnnotations = map[string]string{"team": "db"}
++	rf.Spec.Sentinel.PodAnnotations = map[string]string{"team": "db"}
++
++	sts := redisStatefulSetFor(t, rf, "")
++	if a.NotNil(sts) {
++		a.NotContains(sts.Spec.Template.Annotations, tlsHashAnnotation,
++			"no TLS means no hash annotation on the redis pod template")
++		a.Equal("db", sts.Spec.Template.Annotations["team"])
++	}
++
++	deploy := sentinelDeploymentFor(t, rf, "")
++	if a.NotNil(deploy) {
++		a.NotContains(deploy.Spec.Template.Annotations, tlsHashAnnotation,
++			"no TLS means no hash annotation on the sentinel pod template")
++		a.Equal("db", deploy.Spec.Template.Annotations["team"])
++	}
++}
++
++// TestPlaintextProbesKeepUpstreamCommands pins the probe commands rendered for
++// a failover without TLS to the exact strings v3.3.5 emits. Those strings are
++// part of the pod template, so any drift makes every running Redis StatefulSet
++// and Sentinel Deployment differ from its live spec and roll once on the first
++// reconcile after an operator upgrade — for users who never asked for TLS.
++func TestPlaintextProbesKeepUpstreamCommands(t *testing.T) {
++	tests := []struct {
++		name              string
++		mutate            func(*redisfailoverv1.RedisFailover)
++		redisLiveness     string
++		sentinelLiveness  string
++		sentinelReadiness string
++	}{
++		{
++			name:              "defaults",
++			mutate:            func(*redisfailoverv1.RedisFailover) {},
++			redisLiveness:     "redis-cli -h $(hostname) -p 6379 --user pinger --pass pingpass --no-auth-warning ping | grep PONG",
++			sentinelLiveness:  "redis-cli -h $(hostname) -p 26379 ping",
++			sentinelReadiness: "redis-cli -h $(hostname) -p 26379 sentinel get-master-addr-by-name mymaster | head -n 1 | grep -vq '127.0.0.1'",
++		},
++		{
++			name:              "custom redis port",
++			mutate:            func(rf *redisfailoverv1.RedisFailover) { rf.Spec.Redis.Port = 6380 },
++			redisLiveness:     "redis-cli -h $(hostname) -p 6380 --user pinger --pass pingpass --no-auth-warning ping | grep PONG",
++			sentinelLiveness:  "redis-cli -h $(hostname) -p 26379 ping",
++			sentinelReadiness: "redis-cli -h $(hostname) -p 26379 sentinel get-master-addr-by-name mymaster | head -n 1 | grep -vq '127.0.0.1'",
++		},
++		{
++			name:              "master name from the failover",
++			mutate:            func(rf *redisfailoverv1.RedisFailover) { rf.Spec.Sentinel.DisableMyMaster = true },
++			redisLiveness:     "redis-cli -h $(hostname) -p 6379 --user pinger --pass pingpass --no-auth-warning ping | grep PONG",
++			sentinelLiveness:  "redis-cli -h $(hostname) -p 26379 ping",
++			sentinelReadiness: "redis-cli -h $(hostname) -p 26379 sentinel get-master-addr-by-name test | head -n 1 | grep -vq '127.0.0.1'",
++		},
++		{
++			name:              "valkey engine",
++			mutate:            func(rf *redisfailoverv1.RedisFailover) { rf.Spec.Engine = redisfailoverv1.ValkeyEngine },
++			redisLiveness:     "valkey-cli -h $(hostname) -p 6379 --user pinger --pass pingpass --no-auth-warning ping | grep PONG",
++			sentinelLiveness:  "valkey-cli -h $(hostname) -p 26379 ping",
++			sentinelReadiness: "valkey-cli -h $(hostname) -p 26379 sentinel get-master-addr-by-name mymaster | head -n 1 | grep -vq '127.0.0.1'",
++		},
++	}
++
++	for _, test := range tests {
++		t.Run(test.name, func(t *testing.T) {
++			a := assert.New(t)
++			rf := generateRF()
++			rf.Spec.Redis.Port = 6379
++			test.mutate(rf)
++			a.Nil(rf.Spec.TLS, "this test covers the failover that never opted into TLS")
++
++			ss := redisStatefulSetFor(t, rf, "")
++			sd := sentinelDeploymentFor(t, rf, "")
++			if !a.NotNil(ss) || !a.NotNil(sd) {
++				return
++			}
++
++			got := map[string]string{
++				"redis liveness":     execCommand(t, ss.Spec.Template.Spec.Containers[0].LivenessProbe),
++				"sentinel liveness":  execCommand(t, sd.Spec.Template.Spec.Containers[0].LivenessProbe),
++				"sentinel readiness": execCommand(t, sd.Spec.Template.Spec.Containers[0].ReadinessProbe),
++			}
++			a.Equal(test.redisLiveness, got["redis liveness"])
++			a.Equal(test.sentinelLiveness, got["sentinel liveness"])
++			a.Equal(test.sentinelReadiness, got["sentinel readiness"])
++
++			for probe, cmd := range got {
++				a.NotContains(cmd, "localhost",
++					"%s dials $(hostname) without TLS; localhost is only needed to match a certificate SAN", probe)
++				a.NotContains(cmd, "--tls", "%s must not carry TLS flags when TLS is off", probe)
++			}
++		})
++	}
++}
++
++// execCommand returns the shell script of a probe, after checking it is still
++// wrapped in the "sh -c" form the expectations are written against.
++func execCommand(t *testing.T, probe *corev1.Probe) string {
++	t.Helper()
++	if probe == nil || probe.Exec == nil {
++		t.Fatal("probe has no exec command")
++	}
++	cmd := probe.Exec.Command
++	if len(cmd) != 3 || cmd[0] != "sh" || cmd[1] != "-c" {
++		t.Fatalf("probe command is not an sh -c script: %q", cmd)
++	}
++	return cmd[2]
++}
+diff --git a/operator/redisfailover/service/heal.go b/operator/redisfailover/service/heal.go
+index d964f1f5..9947d738 100644
+--- a/operator/redisfailover/service/heal.go
++++ b/operator/redisfailover/service/heal.go
+@@ -22,7 +22,7 @@ type RedisFailoverHeal interface {
+ 	SetExternalMasterOnAll(masterIP string, masterPort string, rFailover *redisfailoverv1.RedisFailover) error
+ 	NewSentinelMonitor(ip string, monitor string, rFailover *redisfailoverv1.RedisFailover) error
+ 	NewSentinelMonitorWithPort(ip string, monitor string, port string, rFailover *redisfailoverv1.RedisFailover) error
+-	RestoreSentinel(ip string) error
++	RestoreSentinel(ip string, rFailover *redisfailoverv1.RedisFailover) error
+ 	SetSentinelCustomConfig(ip string, rFailover *redisfailoverv1.RedisFailover) error
+ 	SetRedisCustomConfig(ip string, rFailover *redisfailoverv1.RedisFailover) error
+ 	DeletePod(podName string, rFailover *redisfailoverv1.RedisFailover) error
+@@ -109,8 +109,13 @@ func (r *RedisFailoverHealer) MakeMaster(ip string, rf *redisfailoverv1.RedisFai
+ 		return err
+ 	}
+ 
++	tlsConfig, err := tlsConfigFor(r.k8sService, rf)
++	if err != nil {
++		return err
++	}
++
+ 	port := getRedisPort(rf.Spec.Redis.Port)
+-	err = r.redisClient.MakeMaster(ip, port, password)
++	err = r.redisClient.MakeMaster(ip, port, password, tlsConfig)
+ 	if err != nil {
+ 		return err
+ 	}
+@@ -154,13 +159,18 @@ func (r *RedisFailoverHealer) SetOldestAsMaster(rf *redisfailoverv1.RedisFailove
+ 		return err
+ 	}
+ 
++	tlsConfig, err := tlsConfigFor(r.k8sService, rf)
++	if err != nil {
++		return err
++	}
++
+ 	port := getRedisPort(rf.Spec.Redis.Port)
+ 	newMasterIP := ""
+ 	for _, pod := range ssp.Items {
+ 		if newMasterIP == "" {
+ 			newMasterIP = pod.Status.PodIP
+ 			r.logger.WithField("redisfailover", rf.ObjectMeta.Name).WithField("namespace", rf.ObjectMeta.Namespace).Infof("New master is %s with ip %s", pod.Name, newMasterIP)
+-			if err := r.redisClient.MakeMaster(newMasterIP, port, password); err != nil {
++			if err := r.redisClient.MakeMaster(newMasterIP, port, password, tlsConfig); err != nil {
+ 				newMasterIP = ""
+ 				r.logger.WithField("redisfailover", rf.ObjectMeta.Name).WithField("namespace", rf.ObjectMeta.Namespace).Errorf("Make new master failed, master ip: %s, error: %v", pod.Status.PodIP, err)
+ 				continue
+@@ -178,7 +188,7 @@ func (r *RedisFailoverHealer) SetOldestAsMaster(rf *redisfailoverv1.RedisFailove
+ 			newMasterIP = pod.Status.PodIP
+ 		} else {
+ 			r.logger.Infof("Making pod %s slave of %s", pod.Name, newMasterIP)
+-			if err := r.redisClient.MakeSlaveOfWithPort(pod.Status.PodIP, newMasterIP, port, password); err != nil {
++			if err := r.redisClient.MakeSlaveOfWithPort(pod.Status.PodIP, port, newMasterIP, port, password, tlsConfig); err != nil {
+ 				r.logger.WithField("redisfailover", rf.ObjectMeta.Name).WithField("namespace", rf.ObjectMeta.Namespace).Errorf("Make slave failed, slave pod ip: %s, master ip: %s, error: %v", pod.Status.PodIP, newMasterIP, err)
+ 			}
+ 
+@@ -212,10 +222,15 @@ func (r *RedisFailoverHealer) SetMasterOnAll(masterIP string, rf *redisfailoverv
+ 		return err
+ 	}
+ 
++	tlsConfig, err := tlsConfigFor(r.k8sService, rf)
++	if err != nil {
++		return err
++	}
++
+ 	port := getRedisPort(rf.Spec.Redis.Port)
+ 	for _, pod := range ssp.Items {
+ 		//During this configuration process if there is a new master selected , bailout
+-		isMaster, err := r.redisClient.IsMaster(masterIP, port, password)
++		isMaster, err := r.redisClient.IsMaster(masterIP, port, password, tlsConfig)
+ 		if err != nil || !isMaster {
+ 			r.logger.WithField("redisfailover", rf.ObjectMeta.Name).WithField("namespace", rf.ObjectMeta.Namespace).Errorf("check master failed maybe this node is not ready(ip changed), or sentinel made a switch: %s", masterIP)
+ 			return err
+@@ -224,7 +239,7 @@ func (r *RedisFailoverHealer) SetMasterOnAll(masterIP string, rf *redisfailoverv
+ 				continue
+ 			}
+ 			r.logger.WithField("redisfailover", rf.ObjectMeta.Name).WithField("namespace", rf.ObjectMeta.Namespace).Infof("Making pod %s slave of %s", pod.Name, masterIP)
+-			if err := r.redisClient.MakeSlaveOfWithPort(pod.Status.PodIP, masterIP, port, password); err != nil {
++			if err := r.redisClient.MakeSlaveOfWithPort(pod.Status.PodIP, port, masterIP, port, password, tlsConfig); err != nil {
+ 				r.logger.WithField("redisfailover", rf.ObjectMeta.Name).WithField("namespace", rf.ObjectMeta.Namespace).Errorf("Make slave failed, slave ip: %s, master ip: %s, error: %v", pod.Status.PodIP, masterIP, err)
+ 				return err
+ 			}
+@@ -255,9 +270,15 @@ func (r *RedisFailoverHealer) SetExternalMasterOnAll(masterIP, masterPort string
+ 		return err
+ 	}
+ 
++	tlsConfig, err := tlsConfigFor(r.k8sService, rf)
++	if err != nil {
++		return err
++	}
++
++	localPort := getRedisPort(rf.Spec.Redis.Port)
+ 	for _, pod := range ssp.Items {
+ 		r.logger.WithField("redisfailover", rf.ObjectMeta.Name).WithField("namespace", rf.ObjectMeta.Namespace).Infof("Making pod %s slave of %s:%s", pod.Name, masterIP, masterPort)
+-		if err := r.redisClient.MakeSlaveOfWithPort(pod.Status.PodIP, masterIP, masterPort, password); err != nil {
++		if err := r.redisClient.MakeSlaveOfWithPort(pod.Status.PodIP, localPort, masterIP, masterPort, password, tlsConfig); err != nil {
+ 			return err
+ 		}
+ 
+@@ -278,8 +299,13 @@ func (r *RedisFailoverHealer) NewSentinelMonitor(ip string, monitor string, rf *
+ 		return err
+ 	}
+ 
++	tlsConfig, err := tlsConfigFor(r.k8sService, rf)
++	if err != nil {
++		return err
++	}
++
+ 	port := getRedisPort(rf.Spec.Redis.Port)
+-	return r.redisClient.MonitorRedisWithPort(ip, monitor, port, quorum, password, rf.MasterName())
++	return r.redisClient.MonitorRedisWithPort(ip, monitor, port, quorum, password, rf.MasterName(), tlsConfig)
+ }
+ 
+ // NewSentinelMonitorWithPort changes the master that Sentinel has to monitor by the provided IP and Port
+@@ -291,19 +317,32 @@ func (r *RedisFailoverHealer) NewSentinelMonitorWithPort(ip string, monitor stri
+ 		return err
+ 	}
+ 
+-	return r.redisClient.MonitorRedisWithPort(ip, monitor, monitorPort, quorum, password, rf.MasterName())
++	tlsConfig, err := tlsConfigFor(r.k8sService, rf)
++	if err != nil {
++		return err
++	}
++
++	return r.redisClient.MonitorRedisWithPort(ip, monitor, monitorPort, quorum, password, rf.MasterName(), tlsConfig)
+ }
+ 
+-// RestoreSentinel clear the number of sentinels on memory
+-func (r *RedisFailoverHealer) RestoreSentinel(ip string) error {
++// RestoreSentinel clears the number of sentinels on memory.
++func (r *RedisFailoverHealer) RestoreSentinel(ip string, rf *redisfailoverv1.RedisFailover) error {
+ 	r.logger.Debugf("Restoring sentinel %s", ip)
+-	return r.redisClient.ResetSentinel(ip)
++	tlsConfig, err := tlsConfigFor(r.k8sService, rf)
++	if err != nil {
++		return err
++	}
++	return r.redisClient.ResetSentinel(ip, tlsConfig)
+ }
+ 
+ // SetSentinelCustomConfig will call sentinel to set the configuration given in config
+ func (r *RedisFailoverHealer) SetSentinelCustomConfig(ip string, rf *redisfailoverv1.RedisFailover) error {
+ 	r.logger.WithField("redisfailover", rf.ObjectMeta.Name).WithField("namespace", rf.ObjectMeta.Namespace).Debugf("Setting the custom config on sentinel %s...", ip)
+-	return r.redisClient.SetCustomSentinelConfig(ip, rf.MasterName(), rf.Spec.Sentinel.CustomConfig)
++	tlsConfig, err := tlsConfigFor(r.k8sService, rf)
++	if err != nil {
++		return err
++	}
++	return r.redisClient.SetCustomSentinelConfig(ip, rf.MasterName(), rf.Spec.Sentinel.CustomConfig, tlsConfig)
+ }
+ 
+ // SetRedisCustomConfig will call redis to set the configuration given in config
+@@ -328,8 +367,13 @@ func (r *RedisFailoverHealer) SetRedisCustomConfig(ip string, rf *redisfailoverv
+ 		r.logger.WithField("redisfailover", rf.ObjectMeta.Name).WithField("namespace", rf.ObjectMeta.Namespace).Errorf("maxmemory validation failed for Redis IP %s: %v", ip, err)
+ 	}
+ 
++	tlsConfig, err := tlsConfigFor(r.k8sService, rf)
++	if err != nil {
++		return err
++	}
++
+ 	port := getRedisPort(rf.Spec.Redis.Port)
+-	return r.redisClient.SetCustomRedisConfig(ip, port, validatedConfig, password)
++	return r.redisClient.SetCustomRedisConfig(ip, port, validatedConfig, password, tlsConfig)
+ }
+ 
+ // getRedisPodMemoryUsage retrieves the memory limit or request for a Redis pod by its IP
+diff --git a/operator/redisfailover/service/heal_test.go b/operator/redisfailover/service/heal_test.go
+index d078ce00..eab037d5 100644
+--- a/operator/redisfailover/service/heal_test.go
++++ b/operator/redisfailover/service/heal_test.go
+@@ -38,7 +38,7 @@ func TestSetOldestAsMasterNewMasterError(t *testing.T) {
+ 	ms.On("UpdatePodAnnotations", namespace, mock.AnythingOfType("string"), mock.Anything).Return(nil)
+ 	ms.On("RemovePodAnnotation", namespace, mock.AnythingOfType("string"), mock.AnythingOfType("string")).Return(nil)
+ 	mr := &mRedisService.Client{}
+-	mr.On("MakeMaster", "0.0.0.0", "0", "").Once().Return(errors.New(""))
++	mr.On("MakeMaster", "0.0.0.0", "0", "", mock.Anything).Once().Return(errors.New(""))
+ 
+ 	healer := rfservice.NewRedisFailoverHealer(ms, mr, log.DummyLogger{})
+ 
+@@ -67,7 +67,7 @@ func TestSetOldestAsMaster(t *testing.T) {
+ 	ms.On("UpdatePodAnnotations", namespace, mock.AnythingOfType("string"), mock.Anything).Return(nil)
+ 	ms.On("RemovePodAnnotation", namespace, mock.AnythingOfType("string"), mock.AnythingOfType("string")).Return(nil)
+ 	mr := &mRedisService.Client{}
+-	mr.On("MakeMaster", "0.0.0.0", "0", "").Once().Return(nil)
++	mr.On("MakeMaster", "0.0.0.0", "0", "", mock.Anything).Once().Return(nil)
+ 
+ 	healer := rfservice.NewRedisFailoverHealer(ms, mr, log.DummyLogger{})
+ 
+@@ -101,8 +101,8 @@ func TestSetOldestAsMasterMultiplePodsMakeSlaveOfError(t *testing.T) {
+ 	ms.On("UpdatePodAnnotations", namespace, mock.AnythingOfType("string"), mock.Anything).Return(nil)
+ 	ms.On("RemovePodAnnotation", namespace, mock.AnythingOfType("string"), mock.AnythingOfType("string")).Return(nil)
+ 	mr := &mRedisService.Client{}
+-	mr.On("MakeMaster", "0.0.0.0", "0", "").Once().Return(nil)
+-	mr.On("MakeSlaveOfWithPort", "1.1.1.1", "0.0.0.0", "0", "").Once().Return(errors.New(""))
++	mr.On("MakeMaster", "0.0.0.0", "0", "", mock.Anything).Once().Return(nil)
++	mr.On("MakeSlaveOfWithPort", "1.1.1.1", "0", "0.0.0.0", "0", "", mock.Anything).Once().Return(errors.New(""))
+ 
+ 	healer := rfservice.NewRedisFailoverHealer(ms, mr, log.DummyLogger{})
+ 
+@@ -136,8 +136,8 @@ func TestSetOldestAsMasterMultiplePods(t *testing.T) {
+ 	ms.On("UpdatePodAnnotations", namespace, mock.AnythingOfType("string"), mock.Anything).Return(nil)
+ 	ms.On("RemovePodAnnotation", namespace, mock.AnythingOfType("string"), mock.AnythingOfType("string")).Return(nil)
+ 	mr := &mRedisService.Client{}
+-	mr.On("MakeMaster", "0.0.0.0", "0", "").Once().Return(nil)
+-	mr.On("MakeSlaveOfWithPort", "1.1.1.1", "0.0.0.0", "0", "").Once().Return(nil)
++	mr.On("MakeMaster", "0.0.0.0", "0", "", mock.Anything).Once().Return(nil)
++	mr.On("MakeSlaveOfWithPort", "1.1.1.1", "0", "0.0.0.0", "0", "", mock.Anything).Once().Return(nil)
+ 
+ 	healer := rfservice.NewRedisFailoverHealer(ms, mr, log.DummyLogger{})
+ 
+@@ -181,8 +181,8 @@ func TestSetOldestAsMasterOrdering(t *testing.T) {
+ 	ms.On("UpdatePodAnnotations", namespace, mock.AnythingOfType("string"), mock.Anything).Return(nil)
+ 	ms.On("RemovePodAnnotation", namespace, mock.AnythingOfType("string"), mock.AnythingOfType("string")).Return(nil)
+ 	mr := &mRedisService.Client{}
+-	mr.On("MakeMaster", "1.1.1.1", "0", "").Once().Return(nil)
+-	mr.On("MakeSlaveOfWithPort", "0.0.0.0", "1.1.1.1", "0", "").Once().Return(nil)
++	mr.On("MakeMaster", "1.1.1.1", "0", "", mock.Anything).Once().Return(nil)
++	mr.On("MakeSlaveOfWithPort", "0.0.0.0", "0", "1.1.1.1", "0", "", mock.Anything).Once().Return(nil)
+ 
+ 	healer := rfservice.NewRedisFailoverHealer(ms, mr, log.DummyLogger{})
+ 
+@@ -216,7 +216,7 @@ func TestSetMasterOnAllMakeMasterError(t *testing.T) {
+ 	ms.On("UpdatePodAnnotations", namespace, mock.AnythingOfType("string"), mock.Anything).Return(nil)
+ 	ms.On("RemovePodAnnotation", namespace, mock.AnythingOfType("string"), mock.AnythingOfType("string")).Return(nil)
+ 	mr := &mRedisService.Client{}
+-	mr.On("IsMaster", "0.0.0.0", "0", "").Return(false, errors.New(""))
++	mr.On("IsMaster", "0.0.0.0", "0", "", mock.Anything).Return(false, errors.New(""))
+ 	healer := rfservice.NewRedisFailoverHealer(ms, mr, log.DummyLogger{})
+ 
+ 	err := healer.SetMasterOnAll("0.0.0.0", rf)
+@@ -249,8 +249,8 @@ func TestSetMasterOnAllMakeSlaveOfError(t *testing.T) {
+ 	ms.On("UpdatePodAnnotations", namespace, mock.AnythingOfType("string"), mock.Anything).Return(nil)
+ 	ms.On("RemovePodAnnotation", namespace, mock.AnythingOfType("string"), mock.AnythingOfType("string")).Return(nil)
+ 	mr := &mRedisService.Client{}
+-	mr.On("IsMaster", "0.0.0.0", "0", "").Return(true, nil)
+-	mr.On("MakeSlaveOfWithPort", "1.1.1.1", "0.0.0.0", "0", "").Once().Return(errors.New(""))
++	mr.On("IsMaster", "0.0.0.0", "0", "", mock.Anything).Return(true, nil)
++	mr.On("MakeSlaveOfWithPort", "1.1.1.1", "0", "0.0.0.0", "0", "", mock.Anything).Once().Return(errors.New(""))
+ 
+ 	healer := rfservice.NewRedisFailoverHealer(ms, mr, log.DummyLogger{})
+ 
+@@ -284,8 +284,8 @@ func TestSetMasterOnAll(t *testing.T) {
+ 	ms.On("UpdatePodAnnotations", namespace, mock.AnythingOfType("string"), mock.Anything).Return(nil)
+ 	ms.On("RemovePodAnnotation", namespace, mock.AnythingOfType("string"), mock.AnythingOfType("string")).Return(nil)
+ 	mr := &mRedisService.Client{}
+-	mr.On("IsMaster", "0.0.0.0", "0", "").Return(true, nil)
+-	mr.On("MakeSlaveOfWithPort", "1.1.1.1", "0.0.0.0", "0", "").Once().Return(nil)
++	mr.On("IsMaster", "0.0.0.0", "0", "", mock.Anything).Return(true, nil)
++	mr.On("MakeSlaveOfWithPort", "1.1.1.1", "0", "0.0.0.0", "0", "", mock.Anything).Once().Return(nil)
+ 
+ 	healer := rfservice.NewRedisFailoverHealer(ms, mr, log.DummyLogger{})
+ 
+@@ -343,12 +343,12 @@ func TestSetExternalMasterOnAll(t *testing.T) {
+ 
+ 			mr := &mRedisService.Client{}
+ 			if !expectError {
+-				mr.On("MakeSlaveOfWithPort", "0.0.0.0", "5.5.5.5", "6379", "").Once().Return(nil)
++				mr.On("MakeSlaveOfWithPort", "0.0.0.0", "0", "5.5.5.5", "6379", "", mock.Anything).Once().Return(nil)
+ 				if test.errorOnMakeSlaveOf {
+ 					expectError = true
+-					mr.On("MakeSlaveOfWithPort", "1.1.1.1", "5.5.5.5", "6379", "").Once().Return(errors.New(""))
++					mr.On("MakeSlaveOfWithPort", "1.1.1.1", "0", "5.5.5.5", "6379", "", mock.Anything).Once().Return(errors.New(""))
+ 				} else {
+-					mr.On("MakeSlaveOfWithPort", "1.1.1.1", "5.5.5.5", "6379", "").Once().Return(nil)
++					mr.On("MakeSlaveOfWithPort", "1.1.1.1", "0", "5.5.5.5", "6379", "", mock.Anything).Once().Return(nil)
+ 				}
+ 			}
+ 
+@@ -391,9 +391,9 @@ func TestNewSentinelMonitor(t *testing.T) {
+ 
+ 			if test.errorOnMonitorRedis {
+ 				errorExpected = true
+-				mr.On("MonitorRedisWithPort", "0.0.0.0", "1.1.1.1", "0", "2", "", "mymaster").Once().Return(errors.New(""))
++				mr.On("MonitorRedisWithPort", "0.0.0.0", "1.1.1.1", "0", "2", "", "mymaster", mock.Anything).Once().Return(errors.New(""))
+ 			} else {
+-				mr.On("MonitorRedisWithPort", "0.0.0.0", "1.1.1.1", "0", "2", "", "mymaster").Once().Return(nil)
++				mr.On("MonitorRedisWithPort", "0.0.0.0", "1.1.1.1", "0", "2", "", "mymaster", mock.Anything).Once().Return(nil)
+ 			}
+ 
+ 			healer := rfservice.NewRedisFailoverHealer(ms, mr, log.DummyLogger{})
+@@ -435,9 +435,9 @@ func TestNewSentinelMonitorWithPort(t *testing.T) {
+ 
+ 			if test.errorOnMonitorRedis {
+ 				errorExpected = true
+-				mr.On("MonitorRedisWithPort", "0.0.0.0", "1.1.1.1", "6379", "2", "", "mymaster").Once().Return(errors.New(""))
++				mr.On("MonitorRedisWithPort", "0.0.0.0", "1.1.1.1", "6379", "2", "", "mymaster", mock.Anything).Once().Return(errors.New(""))
+ 			} else {
+-				mr.On("MonitorRedisWithPort", "0.0.0.0", "1.1.1.1", "6379", "2", "", "mymaster").Once().Return(nil)
++				mr.On("MonitorRedisWithPort", "0.0.0.0", "1.1.1.1", "6379", "2", "", "mymaster", mock.Anything).Once().Return(nil)
+ 			}
+ 
+ 			healer := rfservice.NewRedisFailoverHealer(ms, mr, log.DummyLogger{})
+diff --git a/operator/redisfailover/service/names.go b/operator/redisfailover/service/names.go
+index a70751e9..9b68e9e7 100644
+--- a/operator/redisfailover/service/names.go
++++ b/operator/redisfailover/service/names.go
+@@ -42,6 +42,49 @@ func GetRedisSlaveName(rf *redisfailoverv1.RedisFailover) string {
+ 	return generateName(redisSlaveName, rf.Name)
+ }
+ 
++// GetTLSCertificateName returns the name for the cert-manager Certificate
++// the operator creates when spec.tls.certManager is configured.
++func GetTLSCertificateName(rf *redisfailoverv1.RedisFailover) string {
++	return generateName(tlsCertificateName, rf.Name)
++}
++
++// GetTLSSecretName returns the Secret name that holds the TLS material for
++// the cluster. The derivation lives on the API type because validation needs
++// it too; see RedisFailover.TLSSecretName for the precedence rules.
++func GetTLSSecretName(rf *redisfailoverv1.RedisFailover) string {
++	return rf.TLSSecretName()
++}
++
++// GetTLSCACertSecretName returns the name of the Opaque Secret the operator
++// publishes with only ca.crt (no private key). It honors an explicit override
++// via spec.tls.caCertSecretName; otherwise it derives from the TLS secret name
++// as "<tls-secret-name>-ca". Returns the empty string when TLS is disabled.
++func GetTLSCACertSecretName(rf *redisfailoverv1.RedisFailover) string {
++	if !TLSEnabled(rf) {
++		return ""
++	}
++	if name := rf.Spec.TLS.CACertSecretName; name != "" {
++		return name
++	}
++	return GetTLSSecretName(rf) + "-ca"
++}
++
++// TLSEnabled is a small helper used pervasively in the generator.
++func TLSEnabled(rf *redisfailoverv1.RedisFailover) bool {
++	return rf.Spec.TLS != nil && rf.Spec.TLS.Enabled
++}
++
++// tlsAuthClients returns the effective tls-auth-clients value: the spec field,
++// or the "no" the API defaulting fills in for an empty one. The two spellings
++// describe the same server, so anything derived from this value must not tell
++// them apart.
++func tlsAuthClients(rf *redisfailoverv1.RedisFailover) string {
++	if !TLSEnabled(rf) || rf.Spec.TLS.AuthClients == "" {
++		return redisfailoverv1.TLSAuthClientsNo
++	}
++	return rf.Spec.TLS.AuthClients
++}
++
+ func generateName(typeName, metaName string) string {
+ 	return fmt.Sprintf("%s%s-%s", baseName, typeName, metaName)
+ }
+diff --git a/service/k8s/certificate.go b/service/k8s/certificate.go
+new file mode 100644
+index 00000000..54d3459a
+--- /dev/null
++++ b/service/k8s/certificate.go
+@@ -0,0 +1,83 @@
++package k8s
++
++import (
++	"context"
++
++	cmapi "github.com/cert-manager/cert-manager/pkg/apis/certmanager/v1"
++	cmclientset "github.com/cert-manager/cert-manager/pkg/client/clientset/versioned"
++	"k8s.io/apimachinery/pkg/api/errors"
++	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
++
++	"github.com/freshworks/redis-operator/log"
++	"github.com/freshworks/redis-operator/metrics"
++)
++
++// Certificate manages cert-manager Certificate resources.
++//
++// The interface mirrors the other service types in this package: a
++// GET, a CREATE, an UPDATE and the convenience CreateOrUpdate that
++// reads the live object first to forward its ResourceVersion.
++type Certificate interface {
++	GetCertificate(namespace string, name string) (*cmapi.Certificate, error)
++	CreateCertificate(namespace string, cert *cmapi.Certificate) error
++	UpdateCertificate(namespace string, cert *cmapi.Certificate) error
++	CreateOrUpdateCertificate(namespace string, cert *cmapi.Certificate) error
++}
++
++// CertificateService talks to the cert-manager API.
++type CertificateService struct {
++	cmClient        cmclientset.Interface
++	logger          log.Logger
++	metricsRecorder metrics.Recorder
++}
++
++// NewCertificateService returns a Certificate KubeService.
++func NewCertificateService(cmClient cmclientset.Interface, logger log.Logger, metricsRecorder metrics.Recorder) *CertificateService {
++	logger = logger.With("service", "k8s.certificate")
++	return &CertificateService{
++		cmClient:        cmClient,
++		logger:          logger,
++		metricsRecorder: metricsRecorder,
++	}
++}
++
++func (c *CertificateService) GetCertificate(namespace string, name string) (*cmapi.Certificate, error) {
++	cert, err := c.cmClient.CertmanagerV1().Certificates(namespace).Get(context.TODO(), name, metav1.GetOptions{})
++	recordMetrics(namespace, "Certificate", name, "GET", err, c.metricsRecorder)
++	if err != nil {
++		return nil, err
++	}
++	return cert, nil
++}
++
++func (c *CertificateService) CreateCertificate(namespace string, cert *cmapi.Certificate) error {
++	_, err := c.cmClient.CertmanagerV1().Certificates(namespace).Create(context.TODO(), cert, metav1.CreateOptions{})
++	recordMetrics(namespace, "Certificate", cert.GetName(), "CREATE", err, c.metricsRecorder)
++	if err != nil {
++		return err
++	}
++	c.logger.WithField("namespace", namespace).WithField("certificate", cert.Name).Debugf("certificate created")
++	return nil
++}
++
++func (c *CertificateService) UpdateCertificate(namespace string, cert *cmapi.Certificate) error {
++	_, err := c.cmClient.CertmanagerV1().Certificates(namespace).Update(context.TODO(), cert, metav1.UpdateOptions{})
++	recordMetrics(namespace, "Certificate", cert.GetName(), "UPDATE", err, c.metricsRecorder)
++	if err != nil {
++		return err
++	}
++	c.logger.WithField("namespace", namespace).WithField("certificate", cert.Name).Debugf("certificate updated")
++	return nil
++}
++
++func (c *CertificateService) CreateOrUpdateCertificate(namespace string, cert *cmapi.Certificate) error {
++	stored, err := c.GetCertificate(namespace, cert.Name)
++	if err != nil {
++		if errors.IsNotFound(err) {
++			return c.CreateCertificate(namespace, cert)
++		}
++		return err
++	}
++	cert.ResourceVersion = stored.ResourceVersion
++	return c.UpdateCertificate(namespace, cert)
++}
+diff --git a/service/k8s/k8s.go b/service/k8s/k8s.go
+index 5059808a..92152661 100644
+--- a/service/k8s/k8s.go
++++ b/service/k8s/k8s.go
+@@ -1,6 +1,7 @@
+ package k8s
+ 
+ import (
++	cmclientset "github.com/cert-manager/cert-manager/pkg/client/clientset/versioned"
+ 	apiextensionscli "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
+ 	"k8s.io/client-go/kubernetes"
+ 
+@@ -20,6 +21,7 @@ type Services interface {
+ 	RBAC
+ 	Deployment
+ 	StatefulSet
++	Certificate
+ }
+ 
+ type services struct {
+@@ -32,10 +34,11 @@ type services struct {
+ 	RBAC
+ 	Deployment
+ 	StatefulSet
++	Certificate
+ }
+ 
+ // New returns a new Kubernetes service.
+-func New(kubecli kubernetes.Interface, crdcli redisfailoverclientset.Interface, apiextcli apiextensionscli.Interface, logger log.Logger, metricsRecorder metrics.Recorder) Services {
++func New(kubecli kubernetes.Interface, crdcli redisfailoverclientset.Interface, apiextcli apiextensionscli.Interface, cmcli cmclientset.Interface, logger log.Logger, metricsRecorder metrics.Recorder) Services {
+ 	return &services{
+ 		ConfigMap:           NewConfigMapService(kubecli, logger, metricsRecorder),
+ 		Secret:              NewSecretService(kubecli, logger, metricsRecorder),
+@@ -46,5 +49,6 @@ func New(kubecli kubernetes.Interface, crdcli redisfailoverclientset.Interface,
+ 		RBAC:                NewRBACService(kubecli, logger, metricsRecorder),
+ 		Deployment:          NewDeploymentService(kubecli, logger, metricsRecorder),
+ 		StatefulSet:         NewStatefulSetService(kubecli, logger, metricsRecorder),
++		Certificate:         NewCertificateService(cmcli, logger, metricsRecorder),
+ 	}
+ }
+diff --git a/service/k8s/secret.go b/service/k8s/secret.go
+index c7cc4ab5..d56fd051 100644
+--- a/service/k8s/secret.go
++++ b/service/k8s/secret.go
+@@ -2,10 +2,12 @@ package k8s
+ 
+ import (
+ 	"context"
++	"reflect"
+ 
+ 	"github.com/freshworks/redis-operator/log"
+ 	"github.com/freshworks/redis-operator/metrics"
+ 	corev1 "k8s.io/api/core/v1"
++	"k8s.io/apimachinery/pkg/api/errors"
+ 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+ 	"k8s.io/client-go/kubernetes"
+ )
+@@ -13,6 +15,9 @@ import (
+ // Secret interacts with k8s to get secrets
+ type Secret interface {
+ 	GetSecret(namespace, name string) (*corev1.Secret, error)
++	CreateSecret(namespace string, secret *corev1.Secret) error
++	UpdateSecret(namespace string, secret *corev1.Secret) error
++	CreateOrUpdateSecret(namespace string, secret *corev1.Secret) error
+ }
+ 
+ // SecretService is the secret service implementation using API calls to kubernetes.
+@@ -42,3 +47,51 @@ func (s *SecretService) GetSecret(namespace, name string) (*corev1.Secret, error
+ 
+ 	return secret, err
+ }
++
++func (s *SecretService) CreateSecret(namespace string, secret *corev1.Secret) error {
++	_, err := s.kubeClient.CoreV1().Secrets(namespace).Create(context.TODO(), secret, metav1.CreateOptions{})
++	recordMetrics(namespace, "Secret", secret.GetName(), "CREATE", err, s.metricsRecorder)
++	if err != nil {
++		return err
++	}
++	s.logger.WithField("namespace", namespace).WithField("secret", secret.Name).Debugf("secret created")
++	return nil
++}
++
++func (s *SecretService) UpdateSecret(namespace string, secret *corev1.Secret) error {
++	_, err := s.kubeClient.CoreV1().Secrets(namespace).Update(context.TODO(), secret, metav1.UpdateOptions{})
++	recordMetrics(namespace, "Secret", secret.GetName(), "UPDATE", err, s.metricsRecorder)
++	if err != nil {
++		return err
++	}
++	s.logger.WithField("namespace", namespace).WithField("secret", secret.Name).Debugf("secret updated")
++	return nil
++}
++
++func (s *SecretService) CreateOrUpdateSecret(namespace string, secret *corev1.Secret) error {
++	storedSecret, err := s.GetSecret(namespace, secret.Name)
++	if err != nil {
++		// If no resource we need to create.
++		if errors.IsNotFound(err) {
++			return s.CreateSecret(namespace, secret)
++		}
++		return err
++	}
++
++	// Skip the write when the desired content already matches what is stored.
++	// The operator does not watch Secrets, so an unconditional update would not
++	// loop, but it would still issue a redundant API write (bumping
++	// resourceVersion) on every reconcile of the owning resource. Comparing the
++	// managed content keeps the published Secret quiet between actual changes
++	// (e.g. CA rotation).
++	if storedSecret.Type == secret.Type && reflect.DeepEqual(storedSecret.Data, secret.Data) {
++		return nil
++	}
++
++	// Already exists, need to Update.
++	// Set the correct resource version to ensure we are on the latest version. This way the only valid
++	// namespace is our spec(https://github.com/kubernetes/community/blob/master/contributors/devel/api-conventions.md#concurrency-control-and-consistency),
++	// we will replace the current namespace state.
++	secret.ResourceVersion = storedSecret.ResourceVersion
++	return s.UpdateSecret(namespace, secret)
++}
+diff --git a/service/k8s/secret_test.go b/service/k8s/secret_test.go
+index bc805536..7a85f605 100644
+--- a/service/k8s/secret_test.go
++++ b/service/k8s/secret_test.go
+@@ -58,3 +58,69 @@ func TestSecretServiceGet(t *testing.T) {
+ 		assert.True(errors.IsNotFound(err))
+ 	})
+ }
++
++func TestSecretServiceCreateOrUpdate(t *testing.T) {
++	t.Run("creates when absent then updates when present", func(t *testing.T) {
++		assert := assert.New(t)
++
++		secret := &corev1.Secret{
++			ObjectMeta: metav1.ObjectMeta{
++				Name:      "ca-secret",
++				Namespace: "test_namespace",
++			},
++			Type: corev1.SecretTypeOpaque,
++			Data: map[string][]byte{
++				"ca.crt": []byte("PEM-V1"),
++			},
++		}
++
++		mcli := kubernetes.NewSimpleClientset()
++		service := NewSecretService(mcli, log.Dummy, metrics.Dummy)
++
++		// Create branch: secret does not exist yet.
++		assert.NoError(service.CreateOrUpdateSecret(secret.Namespace, secret.DeepCopy()))
++		got, err := mcli.CoreV1().Secrets(secret.Namespace).Get(context.TODO(), secret.Name, metav1.GetOptions{})
++		assert.NoError(err)
++		assert.Equal([]byte("PEM-V1"), got.Data["ca.crt"])
++
++		// Update branch: same name, rotated CA content.
++		updated := secret.DeepCopy()
++		updated.Data["ca.crt"] = []byte("PEM-V2")
++		assert.NoError(service.CreateOrUpdateSecret(updated.Namespace, updated))
++		got, err = mcli.CoreV1().Secrets(secret.Namespace).Get(context.TODO(), secret.Name, metav1.GetOptions{})
++		assert.NoError(err)
++		assert.Equal([]byte("PEM-V2"), got.Data["ca.crt"])
++	})
++
++	t.Run("skips the update when stored content is identical", func(t *testing.T) {
++		assert := assert.New(t)
++
++		secret := &corev1.Secret{
++			ObjectMeta: metav1.ObjectMeta{
++				Name:      "ca-secret",
++				Namespace: "test_namespace",
++			},
++			Type: corev1.SecretTypeOpaque,
++			Data: map[string][]byte{
++				"ca.crt": []byte("PEM-V1"),
++			},
++		}
++
++		mcli := kubernetes.NewSimpleClientset()
++		service := NewSecretService(mcli, log.Dummy, metrics.Dummy)
++
++		// Seed the secret.
++		assert.NoError(service.CreateOrUpdateSecret(secret.Namespace, secret.DeepCopy()))
++
++		// Drop the create/get actions so the next call's actions can be inspected
++		// in isolation. Re-applying an unchanged desired state must not issue an
++		// update: the operator does not watch Secrets, so a redundant write on
++		// every reconcile is pure churn we want to avoid.
++		mcli.ClearActions()
++		assert.NoError(service.CreateOrUpdateSecret(secret.Namespace, secret.DeepCopy()))
++
++		for _, action := range mcli.Actions() {
++			assert.NotEqual("update", action.GetVerb(), "identical content must not trigger an update")
++		}
++	})
++}
+diff --git a/service/redis/client.go b/service/redis/client.go
+index 124d1888..d9025637 100644
+--- a/service/redis/client.go
++++ b/service/redis/client.go
+@@ -2,6 +2,7 @@ package redis
+ 
+ import (
+ 	"context"
++	"crypto/tls"
+ 	"errors"
+ 	"fmt"
+ 	"net"
+@@ -9,28 +10,28 @@ import (
+ 	"strconv"
+ 	"strings"
+ 
+-	rediscli "github.com/go-redis/redis/v8"
+ 	"github.com/freshworks/redis-operator/log"
+ 	"github.com/freshworks/redis-operator/metrics"
++	rediscli "github.com/go-redis/redis/v8"
+ )
+ 
+ // Client defines the functions neccesary to connect to redis and sentinel to get or set what we nned
+ type Client interface {
+-	GetNumberSentinelsInMemory(ip string) (int32, error)
+-	GetNumberSentinelSlavesInMemory(ip string) (int32, error)
+-	ResetSentinel(ip string) error
+-	GetSlaveOf(ip, port, password string) (string, error)
+-	IsMaster(ip, port, password string) (bool, error)
+-	MonitorRedis(ip, monitor, quorum, password, masterName string) error
+-	MonitorRedisWithPort(ip, monitor, port, quorum, password, masterName string) error
+-	MakeMaster(ip, port, password string) error
+-	MakeSlaveOf(ip, masterIP, password string) error
+-	MakeSlaveOfWithPort(ip, masterIP, masterPort, password string) error
+-	GetSentinelMonitor(ip, masterName string) (string, string, error)
+-	SetCustomSentinelConfig(ip, masterName string, configs []string) error
+-	SetCustomRedisConfig(ip string, port string, configs []string, password string) error
+-	SlaveIsReady(ip, port, password string) (bool, error)
+-	SentinelCheckQuorum(ip, masterName string) error
++	GetNumberSentinelsInMemory(ip string, tlsConfig *tls.Config) (int32, error)
++	GetNumberSentinelSlavesInMemory(ip string, tlsConfig *tls.Config) (int32, error)
++	ResetSentinel(ip string, tlsConfig *tls.Config) error
++	GetSlaveOf(ip, port, password string, tlsConfig *tls.Config) (string, error)
++	IsMaster(ip, port, password string, tlsConfig *tls.Config) (bool, error)
++	MonitorRedis(ip, monitor, quorum, password, masterName string, tlsConfig *tls.Config) error
++	MonitorRedisWithPort(ip, monitor, port, quorum, password, masterName string, tlsConfig *tls.Config) error
++	MakeMaster(ip, port, password string, tlsConfig *tls.Config) error
++	MakeSlaveOf(ip, masterIP, password string, tlsConfig *tls.Config) error
++	MakeSlaveOfWithPort(ip, localPort, masterIP, masterPort, password string, tlsConfig *tls.Config) error
++	GetSentinelMonitor(ip, masterName string, tlsConfig *tls.Config) (string, string, error)
++	SetCustomSentinelConfig(ip, masterName string, configs []string, tlsConfig *tls.Config) error
++	SetCustomRedisConfig(ip string, port string, configs []string, password string, tlsConfig *tls.Config) error
++	SlaveIsReady(ip, port, password string, tlsConfig *tls.Config) (bool, error)
++	SentinelCheckQuorum(ip, masterName string, tlsConfig *tls.Config) error
+ }
+ 
+ type client struct {
+@@ -65,11 +66,12 @@ var (
+ )
+ 
+ // GetNumberSentinelsInMemory return the number of sentinels that the requested sentinel has
+-func (c *client) GetNumberSentinelsInMemory(ip string) (int32, error) {
++func (c *client) GetNumberSentinelsInMemory(ip string, tlsConfig *tls.Config) (int32, error) {
+ 	options := &rediscli.Options{
+-		Addr:     net.JoinHostPort(ip, sentinelPort),
+-		Password: "",
+-		DB:       0,
++		Addr:      net.JoinHostPort(ip, sentinelPort),
++		Password:  "",
++		DB:        0,
++		TLSConfig: tlsConfig,
+ 	}
+ 	rClient := rediscli.NewClient(options)
+ 	defer func() { _ = rClient.Close() }()
+@@ -97,11 +99,12 @@ func (c *client) GetNumberSentinelsInMemory(ip string) (int32, error) {
+ }
+ 
+ // GetNumberSentinelsInMemory return the number of sentinels that the requested sentinel has
+-func (c *client) GetNumberSentinelSlavesInMemory(ip string) (int32, error) {
++func (c *client) GetNumberSentinelSlavesInMemory(ip string, tlsConfig *tls.Config) (int32, error) {
+ 	options := &rediscli.Options{
+-		Addr:     net.JoinHostPort(ip, sentinelPort),
+-		Password: "",
+-		DB:       0,
++		Addr:      net.JoinHostPort(ip, sentinelPort),
++		Password:  "",
++		DB:        0,
++		TLSConfig: tlsConfig,
+ 	}
+ 	rClient := rediscli.NewClient(options)
+ 	defer func() { _ = rClient.Close() }()
+@@ -137,11 +140,12 @@ func isSentinelReady(info string) error {
+ }
+ 
+ // ResetSentinel sends a sentinel reset * for the given sentinel
+-func (c *client) ResetSentinel(ip string) error {
++func (c *client) ResetSentinel(ip string, tlsConfig *tls.Config) error {
+ 	options := &rediscli.Options{
+-		Addr:     net.JoinHostPort(ip, sentinelPort),
+-		Password: "",
+-		DB:       0,
++		Addr:      net.JoinHostPort(ip, sentinelPort),
++		Password:  "",
++		DB:        0,
++		TLSConfig: tlsConfig,
+ 	}
+ 	rClient := rediscli.NewClient(options)
+ 	defer func() { _ = rClient.Close() }()
+@@ -161,12 +165,13 @@ func (c *client) ResetSentinel(ip string) error {
+ }
+ 
+ // GetSlaveOf returns the master of the given redis, or nil if it's master
+-func (c *client) GetSlaveOf(ip, port, password string) (string, error) {
++func (c *client) GetSlaveOf(ip, port, password string, tlsConfig *tls.Config) (string, error) {
+ 
+ 	options := &rediscli.Options{
+-		Addr:     net.JoinHostPort(ip, port),
+-		Password: password,
+-		DB:       0,
++		Addr:      net.JoinHostPort(ip, port),
++		Password:  password,
++		DB:        0,
++		TLSConfig: tlsConfig,
+ 	}
+ 	rClient := rediscli.NewClient(options)
+ 	defer func() { _ = rClient.Close() }()
+@@ -185,11 +190,12 @@ func (c *client) GetSlaveOf(ip, port, password string) (string, error) {
+ 	return match[1], nil
+ }
+ 
+-func (c *client) IsMaster(ip, port, password string) (bool, error) {
++func (c *client) IsMaster(ip, port, password string, tlsConfig *tls.Config) (bool, error) {
+ 	options := &rediscli.Options{
+-		Addr:     net.JoinHostPort(ip, port),
+-		Password: password,
+-		DB:       0,
++		Addr:      net.JoinHostPort(ip, port),
++		Password:  password,
++		DB:        0,
++		TLSConfig: tlsConfig,
+ 	}
+ 	rClient := rediscli.NewClient(options)
+ 	defer func() { _ = rClient.Close() }()
+@@ -202,15 +208,16 @@ func (c *client) IsMaster(ip, port, password string) (bool, error) {
+ 	return strings.Contains(info, redisRoleMaster), nil
+ }
+ 
+-func (c *client) MonitorRedis(ip, monitor, quorum, password, masterName string) error {
+-	return c.MonitorRedisWithPort(ip, monitor, redisPort, quorum, password, masterName)
++func (c *client) MonitorRedis(ip, monitor, quorum, password, masterName string, tlsConfig *tls.Config) error {
++	return c.MonitorRedisWithPort(ip, monitor, redisPort, quorum, password, masterName, tlsConfig)
+ }
+ 
+-func (c *client) MonitorRedisWithPort(ip, monitor, port, quorum, password, masterName string) error {
++func (c *client) MonitorRedisWithPort(ip, monitor, port, quorum, password, masterName string, tlsConfig *tls.Config) error {
+ 	options := &rediscli.Options{
+-		Addr:     net.JoinHostPort(ip, sentinelPort),
+-		Password: "",
+-		DB:       0,
++		Addr:      net.JoinHostPort(ip, sentinelPort),
++		Password:  "",
++		DB:        0,
++		TLSConfig: tlsConfig,
+ 	}
+ 	rClient := rediscli.NewClient(options)
+ 	defer func() { _ = rClient.Close() }()
+@@ -246,11 +253,12 @@ func (c *client) MonitorRedisWithPort(ip, monitor, port, quorum, password, maste
+ 	return nil
+ }
+ 
+-func (c *client) MakeMaster(ip string, port string, password string) error {
++func (c *client) MakeMaster(ip string, port string, password string, tlsConfig *tls.Config) error {
+ 	options := &rediscli.Options{
+-		Addr:     net.JoinHostPort(ip, port),
+-		Password: password,
+-		DB:       0,
++		Addr:      net.JoinHostPort(ip, port),
++		Password:  password,
++		DB:        0,
++		TLSConfig: tlsConfig,
+ 	}
+ 	rClient := rediscli.NewClient(options)
+ 	defer func() { _ = rClient.Close() }()
+@@ -262,15 +270,21 @@ func (c *client) MakeMaster(ip string, port string, password string) error {
+ 	return nil
+ }
+ 
+-func (c *client) MakeSlaveOf(ip, masterIP, password string) error {
+-	return c.MakeSlaveOfWithPort(ip, masterIP, redisPort, password)
++func (c *client) MakeSlaveOf(ip, masterIP, password string, tlsConfig *tls.Config) error {
++	return c.MakeSlaveOfWithPort(ip, redisPort, masterIP, redisPort, password, tlsConfig)
+ }
+ 
+-func (c *client) MakeSlaveOfWithPort(ip, masterIP, masterPort, password string) error {
++// MakeSlaveOfWithPort dials the local Redis instance at ip:localPort and
++// instructs it to replicate from masterIP:masterPort. The two ports must
++// be passed independently because external-master mode (where masterPort
++// belongs to a Redis outside the cluster) and same-cluster failover
++// (where masterPort equals localPort) both flow through this function.
++func (c *client) MakeSlaveOfWithPort(ip, localPort, masterIP, masterPort, password string, tlsConfig *tls.Config) error {
+ 	options := &rediscli.Options{
+-		Addr:     net.JoinHostPort(ip, masterPort), // this is IP and Port for the RedisFailover redis
+-		Password: password,
+-		DB:       0,
++		Addr:      net.JoinHostPort(ip, localPort),
++		Password:  password,
++		DB:        0,
++		TLSConfig: tlsConfig,
+ 	}
+ 	rClient := rediscli.NewClient(options)
+ 	defer func() { _ = rClient.Close() }()
+@@ -282,11 +296,12 @@ func (c *client) MakeSlaveOfWithPort(ip, masterIP, masterPort, password string)
+ 	return nil
+ }
+ 
+-func (c *client) GetSentinelMonitor(ip, masterName string) (string, string, error) {
++func (c *client) GetSentinelMonitor(ip, masterName string, tlsConfig *tls.Config) (string, string, error) {
+ 	options := &rediscli.Options{
+-		Addr:     net.JoinHostPort(ip, sentinelPort),
+-		Password: "",
+-		DB:       0,
++		Addr:      net.JoinHostPort(ip, sentinelPort),
++		Password:  "",
++		DB:        0,
++		TLSConfig: tlsConfig,
+ 	}
+ 	rClient := rediscli.NewClient(options)
+ 	defer func() { _ = rClient.Close() }()
+@@ -307,11 +322,12 @@ func (c *client) GetSentinelMonitor(ip, masterName string) (string, string, erro
+ 	return masterIP, masterPort, nil
+ }
+ 
+-func (c *client) SetCustomSentinelConfig(ip, masterName string, configs []string) error {
++func (c *client) SetCustomSentinelConfig(ip, masterName string, configs []string, tlsConfig *tls.Config) error {
+ 	options := &rediscli.Options{
+-		Addr:     net.JoinHostPort(ip, sentinelPort),
+-		Password: "",
+-		DB:       0,
++		Addr:      net.JoinHostPort(ip, sentinelPort),
++		Password:  "",
++		DB:        0,
++		TLSConfig: tlsConfig,
+ 	}
+ 	rClient := rediscli.NewClient(options)
+ 	defer func() { _ = rClient.Close() }()
+@@ -328,12 +344,13 @@ func (c *client) SetCustomSentinelConfig(ip, masterName string, configs []string
+ 	return nil
+ }
+ 
+-func (c *client) SentinelCheckQuorum(ip, masterName string) error {
++func (c *client) SentinelCheckQuorum(ip, masterName string, tlsConfig *tls.Config) error {
+ 
+ 	options := &rediscli.Options{
+-		Addr:     net.JoinHostPort(ip, sentinelPort),
+-		Password: "",
+-		DB:       0,
++		Addr:      net.JoinHostPort(ip, sentinelPort),
++		Password:  "",
++		DB:        0,
++		TLSConfig: tlsConfig,
+ 	}
+ 	rClient := rediscli.NewSentinelClient(options)
+ 	defer func() { _ = rClient.Close() }()
+@@ -369,11 +386,12 @@ func (c *client) SentinelCheckQuorum(ip, masterName string) error {
+ 	}
+ 
+ }
+-func (c *client) SetCustomRedisConfig(ip string, port string, configs []string, password string) error {
++func (c *client) SetCustomRedisConfig(ip string, port string, configs []string, password string, tlsConfig *tls.Config) error {
+ 	options := &rediscli.Options{
+-		Addr:     net.JoinHostPort(ip, port),
+-		Password: password,
+-		DB:       0,
++		Addr:      net.JoinHostPort(ip, port),
++		Password:  password,
++		DB:        0,
++		TLSConfig: tlsConfig,
+ 	}
+ 	rClient := rediscli.NewClient(options)
+ 	defer func() { _ = rClient.Close() }()
+@@ -427,11 +445,12 @@ func (c *client) getConfigParameters(config string) (parameter string, value str
+ 	return s[0], strings.Join(s[1:], " "), nil
+ }
+ 
+-func (c *client) SlaveIsReady(ip, port, password string) (bool, error) {
++func (c *client) SlaveIsReady(ip, port, password string, tlsConfig *tls.Config) (bool, error) {
+ 	options := &rediscli.Options{
+-		Addr:     net.JoinHostPort(ip, port),
+-		Password: password,
+-		DB:       0,
++		Addr:      net.JoinHostPort(ip, port),
++		Password:  password,
++		DB:        0,
++		TLSConfig: tlsConfig,
+ 	}
+ 	rClient := rediscli.NewClient(options)
+ 	defer func() { _ = rClient.Close() }()
+diff --git a/service/redis/tls.go b/service/redis/tls.go
+new file mode 100644
+index 00000000..4b7ccd51
+--- /dev/null
++++ b/service/redis/tls.go
+@@ -0,0 +1,60 @@
++package redis
++
++import (
++	"crypto/tls"
++	"crypto/x509"
++	"errors"
++	"fmt"
++)
++
++// BuildTLSConfig assembles the *tls.Config the operator uses to dial
++// Redis and Sentinel pods over TLS.
++//
++// The CA pool is loaded from the supplied caPEM, which the operator
++// reads from the same Secret that cert-manager (or the user) populated
++// for the cluster pods. The ServerName drives certificate validation:
++// the operator dials pods by their (unstable) IP but presents a stable
++// DNS name during the TLS handshake, which the certificate's DNS SANs
++// cover.
++//
++// certPEM and keyPEM are optional. When both are non-empty, the config
++// also presents them as a client certificate during the TLS handshake,
++// which is required when the Redis and Sentinel pods enforce mutual
++// TLS (spec.tls.authClients: yes). Supplying only one of the two is an
++// error.
++//
++// Returns (nil, nil) when caPEM is empty: callers treat a nil config as
++// "no TLS" and dial in plaintext.
++func BuildTLSConfig(caPEM, certPEM, keyPEM []byte, serverName string) (*tls.Config, error) {
++	if len(caPEM) == 0 {
++		if len(certPEM) > 0 || len(keyPEM) > 0 {
++			return nil, errors.New("tls: caPEM must be supplied when client certPEM or keyPEM are provided")
++		}
++		return nil, nil
++	}
++	if serverName == "" {
++		return nil, errors.New("tls: ServerName must not be empty when caPEM is provided")
++	}
++	pool := x509.NewCertPool()
++	if !pool.AppendCertsFromPEM(caPEM) {
++		return nil, fmt.Errorf("tls: failed to parse CA certificate (no usable certificates found)")
++	}
++	cfg := &tls.Config{
++		RootCAs:    pool,
++		ServerName: serverName,
++		MinVersion: tls.VersionTLS12,
++	}
++	hasCert := len(certPEM) > 0
++	hasKey := len(keyPEM) > 0
++	if hasCert != hasKey {
++		return nil, errors.New("tls: client certPEM and keyPEM must be supplied together")
++	}
++	if hasCert {
++		clientCert, err := tls.X509KeyPair(certPEM, keyPEM)
++		if err != nil {
++			return nil, fmt.Errorf("tls: loading client certificate: %w", err)
++		}
++		cfg.Certificates = []tls.Certificate{clientCert}
++	}
++	return cfg, nil
++}
+diff --git a/service/redis/tls_test.go b/service/redis/tls_test.go
+new file mode 100644
+index 00000000..cf44fe21
+--- /dev/null
++++ b/service/redis/tls_test.go
+@@ -0,0 +1,166 @@
++package redis
++
++import (
++	"crypto/rand"
++	"crypto/rsa"
++	"crypto/x509"
++	"crypto/x509/pkix"
++	"encoding/pem"
++	"math/big"
++	"testing"
++	"time"
++
++	"github.com/stretchr/testify/assert"
++)
++
++func TestBuildTLSConfigNilOnEmptyCA(t *testing.T) {
++	cfg, err := BuildTLSConfig(nil, nil, nil, "redis.example.com")
++	assert.NoError(t, err)
++	assert.Nil(t, cfg)
++
++	cfg, err = BuildTLSConfig([]byte{}, nil, nil, "redis.example.com")
++	assert.NoError(t, err)
++	assert.Nil(t, cfg)
++}
++
++func TestBuildTLSConfigRejectsEmptyServerName(t *testing.T) {
++	ca := selfSignedCAPEM(t)
++	_, err := BuildTLSConfig(ca, nil, nil, "")
++	if assert.Error(t, err) {
++		assert.Contains(t, err.Error(), "ServerName must not be empty")
++	}
++}
++
++func TestBuildTLSConfigRejectsInvalidCA(t *testing.T) {
++	_, err := BuildTLSConfig([]byte("not a pem"), nil, nil, "redis.example.com")
++	if assert.Error(t, err) {
++		assert.Contains(t, err.Error(), "no usable certificates")
++	}
++}
++
++func TestBuildTLSConfigSucceeds(t *testing.T) {
++	ca := selfSignedCAPEM(t)
++	cfg, err := BuildTLSConfig(ca, nil, nil, "redis.example.com")
++	if !assert.NoError(t, err) {
++		return
++	}
++	if !assert.NotNil(t, cfg) {
++		return
++	}
++	assert.Equal(t, "redis.example.com", cfg.ServerName)
++	assert.NotNil(t, cfg.RootCAs)
++	assert.Equal(t, uint16(0x0303), cfg.MinVersion, "MinVersion must be TLS 1.2 (0x0303)")
++	assert.Empty(t, cfg.Certificates, "no client cert expected when certPEM/keyPEM are nil")
++}
++
++func TestBuildTLSConfigLoadsClientCertificate(t *testing.T) {
++	ca := selfSignedCAPEM(t)
++	clientCert, clientKey := selfSignedClientPEM(t)
++
++	cfg, err := BuildTLSConfig(ca, clientCert, clientKey, "redis.example.com")
++	if !assert.NoError(t, err) {
++		return
++	}
++	if !assert.NotNil(t, cfg) {
++		return
++	}
++	if !assert.Len(t, cfg.Certificates, 1, "client certificate must be loaded into tls.Config") {
++		return
++	}
++	assert.NotNil(t, cfg.Certificates[0].PrivateKey)
++	assert.NotEmpty(t, cfg.Certificates[0].Certificate)
++}
++
++func TestBuildTLSConfigRejectsCertWithoutKey(t *testing.T) {
++	ca := selfSignedCAPEM(t)
++	clientCert, _ := selfSignedClientPEM(t)
++
++	_, err := BuildTLSConfig(ca, clientCert, nil, "redis.example.com")
++	if assert.Error(t, err) {
++		assert.Contains(t, err.Error(), "must be supplied together")
++	}
++}
++
++func TestBuildTLSConfigRejectsKeyWithoutCert(t *testing.T) {
++	ca := selfSignedCAPEM(t)
++	_, clientKey := selfSignedClientPEM(t)
++
++	_, err := BuildTLSConfig(ca, nil, clientKey, "redis.example.com")
++	if assert.Error(t, err) {
++		assert.Contains(t, err.Error(), "must be supplied together")
++	}
++}
++
++func TestBuildTLSConfigRejectsMalformedClientKeyPair(t *testing.T) {
++	ca := selfSignedCAPEM(t)
++
++	_, err := BuildTLSConfig(ca, []byte("not a cert"), []byte("not a key"), "redis.example.com")
++	if assert.Error(t, err) {
++		assert.Contains(t, err.Error(), "loading client certificate")
++	}
++}
++
++func TestBuildTLSConfigRejectsClientMaterialWithoutCA(t *testing.T) {
++	clientCert, clientKey := selfSignedClientPEM(t)
++
++	_, err := BuildTLSConfig(nil, clientCert, clientKey, "redis.example.com")
++	if assert.Error(t, err) {
++		assert.Contains(t, err.Error(), "caPEM must be supplied")
++	}
++
++	// Cert-only must also error, not silently fall back to plaintext.
++	_, err = BuildTLSConfig(nil, clientCert, nil, "redis.example.com")
++	if assert.Error(t, err) {
++		assert.Contains(t, err.Error(), "caPEM must be supplied")
++	}
++}
++
++// selfSignedCAPEM produces a freshly-minted self-signed CA certificate
++// in PEM form for use in BuildTLSConfig tests.
++func selfSignedCAPEM(t *testing.T) []byte {
++	t.Helper()
++	priv, err := rsa.GenerateKey(rand.Reader, 2048)
++	if err != nil {
++		t.Fatalf("rsa.GenerateKey: %v", err)
++	}
++	tmpl := &x509.Certificate{
++		SerialNumber:          big.NewInt(1),
++		Subject:               pkix.Name{CommonName: "test-ca"},
++		NotBefore:             time.Now().Add(-time.Hour),
++		NotAfter:              time.Now().Add(time.Hour),
++		KeyUsage:              x509.KeyUsageCertSign,
++		BasicConstraintsValid: true,
++		IsCA:                  true,
++	}
++	der, err := x509.CreateCertificate(rand.Reader, tmpl, tmpl, &priv.PublicKey, priv)
++	if err != nil {
++		t.Fatalf("x509.CreateCertificate: %v", err)
++	}
++	return pem.EncodeToMemory(&pem.Block{Type: "CERTIFICATE", Bytes: der})
++}
++
++// selfSignedClientPEM produces a freshly-minted self-signed leaf
++// certificate plus its PKCS#1 private key, both PEM-encoded, for use as
++// a client certificate in BuildTLSConfig tests.
++func selfSignedClientPEM(t *testing.T) (certPEM, keyPEM []byte) {
++	t.Helper()
++	priv, err := rsa.GenerateKey(rand.Reader, 2048)
++	if err != nil {
++		t.Fatalf("rsa.GenerateKey: %v", err)
++	}
++	tmpl := &x509.Certificate{
++		SerialNumber: big.NewInt(2),
++		Subject:      pkix.Name{CommonName: "test-client"},
++		NotBefore:    time.Now().Add(-time.Hour),
++		NotAfter:     time.Now().Add(time.Hour),
++		KeyUsage:     x509.KeyUsageDigitalSignature | x509.KeyUsageKeyEncipherment,
++		ExtKeyUsage:  []x509.ExtKeyUsage{x509.ExtKeyUsageClientAuth},
++	}
++	der, err := x509.CreateCertificate(rand.Reader, tmpl, tmpl, &priv.PublicKey, priv)
++	if err != nil {
++		t.Fatalf("x509.CreateCertificate: %v", err)
++	}
++	certPEM = pem.EncodeToMemory(&pem.Block{Type: "CERTIFICATE", Bytes: der})
++	keyPEM = pem.EncodeToMemory(&pem.Block{Type: "RSA PRIVATE KEY", Bytes: x509.MarshalPKCS1PrivateKey(priv)})
++	return certPEM, keyPEM
++}
+diff --git a/test/integration/redisfailover/creation_test.go b/test/integration/redisfailover/creation_test.go
+index 72e1cf80..4d43410a 100644
+--- a/test/integration/redisfailover/creation_test.go
++++ b/test/integration/redisfailover/creation_test.go
+@@ -45,7 +45,7 @@ const (
+ 	authSecretPath          = "redis-auth"
+ 	testPass                = "test-pass"
+ 	redisAddr               = "redis://127.0.0.1:6379"
+-	integrationTestGroupID   = "integration-test"
++	integrationTestGroupID  = "integration-test"
+ 	rfOperatorGroupLabelKey = "redis-failover.freshworks.com/operator-group"
+ )
+ 
+@@ -91,7 +91,7 @@ func TestRedisFailover(t *testing.T) {
+ 	}
+ 
+ 	// Kubernetes clients.
+-	k8sClient, customClient, aeClientset, err := utils.CreateKubernetesClients(flags)
++	k8sClient, customClient, aeClientset, cmClient, err := utils.CreateKubernetesClients(flags)
+ 	require.NoError(err)
+ 
+ 	// Create the redis clients
+@@ -105,7 +105,7 @@ func TestRedisFailover(t *testing.T) {
+ 	}
+ 
+ 	// Create kubernetes service.
+-	k8sservice := k8s.New(k8sClient, customClient, aeClientset, log.Dummy, metrics.Dummy)
++	k8sservice := k8s.New(k8sClient, customClient, aeClientset, cmClient, log.Dummy, metrics.Dummy)
+ 
+ 	// Prepare namespace
+ 	prepErr := clients.prepareNS(currentNamespace)
+@@ -224,7 +224,7 @@ func TestRedisFailoverMyMaster(t *testing.T) {
+ 	}
+ 
+ 	// Kubernetes clients.
+-	k8sClient, customClient, aeClientset, err := utils.CreateKubernetesClients(flags)
++	k8sClient, customClient, aeClientset, cmClient, err := utils.CreateKubernetesClients(flags)
+ 	require.NoError(err)
+ 
+ 	// Create the redis clients
+@@ -238,7 +238,7 @@ func TestRedisFailoverMyMaster(t *testing.T) {
+ 	}
+ 
+ 	// Create kubernetes service.
+-	k8sservice := k8s.New(k8sClient, customClient, aeClientset, log.Dummy, metrics.Dummy)
++	k8sservice := k8s.New(k8sClient, customClient, aeClientset, cmClient, log.Dummy, metrics.Dummy)
+ 
+ 	// Prepare namespace
+ 	prepErr := clients.prepareNS(currentNamespace)
+@@ -398,7 +398,7 @@ func (c *clients) testRedisMaster(t *testing.T, currentNamespace string, rfName
+ 
+ 	for _, pod := range redisPodList.Items {
+ 		ip := pod.Status.PodIP
+-		if ok, _ := c.redisClient.IsMaster(ip, "6379", testPass); ok {
++		if ok, _ := c.redisClient.IsMaster(ip, "6379", testPass, nil); ok {
+ 			masters = append(masters, ip)
+ 		}
+ 	}
+@@ -427,7 +427,7 @@ func (c *clients) testSentinelMonitoring(t *testing.T, currentNamespace string,
+ 
+ 	for _, pod := range sentinelPodList.Items {
+ 		ip := pod.Status.PodIP
+-		master, _, _ := c.redisClient.GetSentinelMonitor(ip, masterName)
++		master, _, _ := c.redisClient.GetSentinelMonitor(ip, masterName, nil)
+ 		masters = append(masters, master)
+ 	}
+ 
+@@ -435,7 +435,7 @@ func (c *clients) testSentinelMonitoring(t *testing.T, currentNamespace string,
+ 		assert.Equal(masters[0], masterIP, "all master ip monitoring should equal")
+ 	}
+ 
+-	isMaster, err := c.redisClient.IsMaster(masters[0], "6379", testPass)
++	isMaster, err := c.redisClient.IsMaster(masters[0], "6379", testPass, nil)
+ 	assert.NoError(err)
+ 	assert.True(isMaster, "Sentinel should monitor the Redis master")
+ }
+diff --git a/test/integration/redisfailover/database_engine_test.go b/test/integration/redisfailover/database_engine_test.go
+index dc6b10e2..9a75d90a 100644
+--- a/test/integration/redisfailover/database_engine_test.go
++++ b/test/integration/redisfailover/database_engine_test.go
+@@ -47,7 +47,7 @@ func TestRedisFailoverValkeyDatabaseEngine(t *testing.T) {
+ 		Development: true,
+ 	}
+ 
+-	k8sClient, customClient, aeClientset, err := utils.CreateKubernetesClients(flags)
++	k8sClient, customClient, aeClientset, cmClient, err := utils.CreateKubernetesClients(flags)
+ 	require.NoError(err)
+ 
+ 	redisClient := redis.New(metrics.Dummy)
+@@ -59,7 +59,7 @@ func TestRedisFailoverValkeyDatabaseEngine(t *testing.T) {
+ 		redisClient: redisClient,
+ 	}
+ 
+-	k8sservice := k8s.New(k8sClient, customClient, aeClientset, log.Dummy, metrics.Dummy)
++	k8sservice := k8s.New(k8sClient, customClient, aeClientset, cmClient, log.Dummy, metrics.Dummy)
+ 
+ 	prepErr := clients.prepareNS(currentNamespace)
+ 	require.NoError(prepErr)
diff --git a/packages/system/redis-operator/images/redis-operator/patches/unauthenticated-sentinel.diff b/packages/system/redis-operator/images/redis-operator/patches/unauthenticated-sentinel.diff
new file mode 100644
index 0000000000..9f8183c945
--- /dev/null
+++ b/packages/system/redis-operator/images/redis-operator/patches/unauthenticated-sentinel.diff
@@ -0,0 +1,183 @@
+diff --git a/mocks/service/redis/Client.go b/mocks/service/redis/Client.go
+index 1770e4b..dfb27c7 100644
+--- a/mocks/service/redis/Client.go
++++ b/mocks/service/redis/Client.go
+@@ -322,6 +322,24 @@ func (_m *Client) SetCustomSentinelConfig(ip string, masterName string, configs
+ 	return r0
+ }
+ 
++// SetSentinelAuthPass provides a mock function with given fields: ip, masterName, password, tlsConfig
++func (_m *Client) SetSentinelAuthPass(ip string, masterName string, password string, tlsConfig *tls.Config) error {
++	ret := _m.Called(ip, masterName, password, tlsConfig)
++
++	if len(ret) == 0 {
++		panic("no return value specified for SetSentinelAuthPass")
++	}
++
++	var r0 error
++	if rf, ok := ret.Get(0).(func(string, string, string, *tls.Config) error); ok {
++		r0 = rf(ip, masterName, password, tlsConfig)
++	} else {
++		r0 = ret.Error(0)
++	}
++
++	return r0
++}
++
+ // SlaveIsReady provides a mock function with given fields: ip, port, password, tlsConfig
+ func (_m *Client) SlaveIsReady(ip string, port string, password string, tlsConfig *tls.Config) (bool, error) {
+ 	ret := _m.Called(ip, port, password, tlsConfig)
+diff --git a/operator/redisfailover/service/heal.go b/operator/redisfailover/service/heal.go
+index 9947d73..36bbc6a 100644
+--- a/operator/redisfailover/service/heal.go
++++ b/operator/redisfailover/service/heal.go
+@@ -332,7 +332,25 @@ func (r *RedisFailoverHealer) RestoreSentinel(ip string, rf *redisfailoverv1.Red
+ 	if err != nil {
+ 		return err
+ 	}
+-	return r.redisClient.ResetSentinel(ip, tlsConfig)
++	if err := r.redisClient.ResetSentinel(ip, tlsConfig); err != nil {
++		return err
++	}
++
++	// SENTINEL RESET keeps the auth-pass the Sentinel already has, and
++	// NewSentinelMonitor, the only other place that sets it, runs only when
++	// the Sentinel monitors the wrong address. A Sentinel restarted with the
++	// initial config can take the current master address from a peer's hello
++	// message, so it monitors the right address without a password, gets
++	// NOAUTH from the master and keeps reporting it as down: the reset alone
++	// would then repeat on every check without converging.
++	password, err := k8s.GetRedisPassword(r.k8sService, rf)
++	if err != nil {
++		return err
++	}
++	if password == "" {
++		return nil
++	}
++	return r.redisClient.SetSentinelAuthPass(ip, rf.MasterName(), password, tlsConfig)
+ }
+ 
+ // SetSentinelCustomConfig will call sentinel to set the configuration given in config
+diff --git a/operator/redisfailover/service/heal_test.go b/operator/redisfailover/service/heal_test.go
+index eab037d..e8c316e 100644
+--- a/operator/redisfailover/service/heal_test.go
++++ b/operator/redisfailover/service/heal_test.go
+@@ -454,3 +454,79 @@ func TestNewSentinelMonitorWithPort(t *testing.T) {
+ 		})
+ 	}
+ }
++
++func TestRestoreSentinel(t *testing.T) {
++	tests := []struct {
++		name          string
++		authSecret    string
++		resetErr      error
++		secretErr     error
++		authPassErr   error
++		wantAuthPass  bool
++		errorExpected bool
++	}{
++		{
++			name: "auth disabled: reset only",
++		},
++		{
++			name:         "auth enabled: reset, then re-send auth-pass",
++			authSecret:   "redis-auth",
++			wantAuthPass: true,
++		},
++		{
++			name:          "reset fails: auth-pass is not sent",
++			authSecret:    "redis-auth",
++			resetErr:      errors.New("reset failed"),
++			errorExpected: true,
++		},
++		{
++			name:          "password secret unreadable",
++			authSecret:    "redis-auth",
++			secretErr:     errors.New("secret not found"),
++			errorExpected: true,
++		},
++		{
++			name:          "auth-pass fails",
++			authSecret:    "redis-auth",
++			authPassErr:   errors.New("set failed"),
++			wantAuthPass:  true,
++			errorExpected: true,
++		},
++	}
++
++	for _, test := range tests {
++		t.Run(test.name, func(t *testing.T) {
++			assert := assert.New(t)
++			rf := generateRF()
++			rf.Spec.Auth.SecretPath = test.authSecret
++			ms := &mK8SService.Services{}
++			mr := &mRedisService.Client{}
++
++			mr.On("ResetSentinel", "0.0.0.0", mock.Anything).Once().Return(test.resetErr)
++			if test.resetErr == nil && test.authSecret != "" {
++				secret := &corev1.Secret{Data: map[string][]byte{"password": []byte("s3cret")}}
++				if test.secretErr != nil {
++					secret = nil
++				}
++				ms.On("GetSecret", rf.Namespace, test.authSecret).Once().Return(secret, test.secretErr)
++			}
++			if test.wantAuthPass {
++				mr.On("SetSentinelAuthPass", "0.0.0.0", "mymaster", "s3cret", mock.Anything).Once().Return(test.authPassErr)
++			}
++
++			healer := rfservice.NewRedisFailoverHealer(ms, mr, log.DummyLogger{})
++			err := healer.RestoreSentinel("0.0.0.0", rf)
++
++			if test.errorExpected {
++				assert.Error(err)
++			} else {
++				assert.NoError(err)
++			}
++			ms.AssertExpectations(t)
++			mr.AssertExpectations(t)
++			if !test.wantAuthPass {
++				mr.AssertNotCalled(t, "SetSentinelAuthPass", mock.Anything, mock.Anything, mock.Anything, mock.Anything)
++			}
++		})
++	}
++}
+diff --git a/service/redis/client.go b/service/redis/client.go
+index d902563..0e4f8c6 100644
+--- a/service/redis/client.go
++++ b/service/redis/client.go
+@@ -29,6 +29,7 @@ type Client interface {
+ 	MakeSlaveOfWithPort(ip, localPort, masterIP, masterPort, password string, tlsConfig *tls.Config) error
+ 	GetSentinelMonitor(ip, masterName string, tlsConfig *tls.Config) (string, string, error)
+ 	SetCustomSentinelConfig(ip, masterName string, configs []string, tlsConfig *tls.Config) error
++	SetSentinelAuthPass(ip, masterName, password string, tlsConfig *tls.Config) error
+ 	SetCustomRedisConfig(ip string, port string, configs []string, password string, tlsConfig *tls.Config) error
+ 	SlaveIsReady(ip, port, password string, tlsConfig *tls.Config) (bool, error)
+ 	SentinelCheckQuorum(ip, masterName string, tlsConfig *tls.Config) error
+@@ -344,6 +345,26 @@ func (c *client) SetCustomSentinelConfig(ip, masterName string, configs []string
+ 	return nil
+ }
+ 
++// SetSentinelAuthPass sets the password the Sentinel authenticates with to
++// the master it monitors and to that master's replicas.
++func (c *client) SetSentinelAuthPass(ip, masterName, password string, tlsConfig *tls.Config) error {
++	options := &rediscli.Options{
++		Addr:      net.JoinHostPort(ip, sentinelPort),
++		Password:  "",
++		DB:        0,
++		TLSConfig: tlsConfig,
++	}
++	rClient := rediscli.NewClient(options)
++	defer func() { _ = rClient.Close() }()
++	cmd := rediscli.NewStatusCmd(context.TODO(), "SENTINEL", "SET", masterName, "auth-pass", password)
++	if err := rClient.Process(context.TODO(), cmd); err != nil {
++		c.metricsRecorder.RecordRedisOperation(metrics.KIND_SENTINEL, ip, metrics.APPLY_SENTINEL_CONFIG, metrics.FAIL, getRedisError(err))
++		return err
++	}
++	c.metricsRecorder.RecordRedisOperation(metrics.KIND_SENTINEL, ip, metrics.APPLY_SENTINEL_CONFIG, metrics.SUCCESS, metrics.NOT_APPLICABLE)
++	return nil
++}
++
+ func (c *client) SentinelCheckQuorum(ip, masterName string, tlsConfig *tls.Config) error {
+ 
+ 	options := &rediscli.Options{
diff --git a/packages/system/redis-operator/images/redis-operator/patches/valkey-cli-auth.diff b/packages/system/redis-operator/images/redis-operator/patches/valkey-cli-auth.diff
new file mode 100644
index 0000000000..a35bf5fd9f
--- /dev/null
+++ b/packages/system/redis-operator/images/redis-operator/patches/valkey-cli-auth.diff
@@ -0,0 +1,43 @@
+diff --git a/operator/redisfailover/service/engine.go b/operator/redisfailover/service/engine.go
+index 1601924..9c27ce9 100644
+--- a/operator/redisfailover/service/engine.go
++++ b/operator/redisfailover/service/engine.go
+@@ -22,7 +22,7 @@ type valkeyEngine struct{}
+ 
+ func (valkeyEngine) ServerBinary() string    { return "valkey-server" }
+ func (valkeyEngine) CLIBinary() string       { return "valkey-cli" }
+-func (valkeyEngine) CLIAuthEnvName() string { return "VALKEYCLI_AUTH" }
++func (valkeyEngine) CLIAuthEnvName() string { return "REDISCLI_AUTH" }
+ 
+ // EngineFor returns the engine implementation for pod generation. Empty or Redis uses Redis binaries; Valkey uses Valkey binaries.
+ func EngineFor(rf *redisfailoverv1.RedisFailover) DatabaseEngineProvider {
+diff --git a/operator/redisfailover/service/engine_test.go b/operator/redisfailover/service/engine_test.go
+index 9f95b09..3724e0a 100644
+--- a/operator/redisfailover/service/engine_test.go
++++ b/operator/redisfailover/service/engine_test.go
+@@ -19,7 +19,7 @@ func TestEngineFor(t *testing.T) {
+ 	}{
+ 		{"omitted is redis", "", "redis-server", "redis-cli", "REDISCLI_AUTH"},
+ 		{"redis", redisfailoverv1.RedisEngine, "redis-server", "redis-cli", "REDISCLI_AUTH"},
+-		{"valkey", redisfailoverv1.ValkeyEngine, "valkey-server", "valkey-cli", "VALKEYCLI_AUTH"},
++		{"valkey", redisfailoverv1.ValkeyEngine, "valkey-server", "valkey-cli", "REDISCLI_AUTH"},
+ 	}
+ 	for _, tc := range cases {
+ 		t.Run(tc.name, func(t *testing.T) {
+diff --git a/test/integration/redisfailover/database_engine_test.go b/test/integration/redisfailover/database_engine_test.go
+index dc6b10e..6cc4da9 100644
+--- a/test/integration/redisfailover/database_engine_test.go
++++ b/test/integration/redisfailover/database_engine_test.go
+@@ -185,10 +185,10 @@ func (c *clients) testValkeyWorkloadBinaries(t *testing.T, currentNamespace, rfN
+ 	shutdownCM, err := c.k8sClient.CoreV1().ConfigMaps(currentNamespace).Get(context.Background(), fmt.Sprintf("rfr-s-%s", rfName), metav1.GetOptions{})
+ 	require.NoError(err)
+ 	assert.Contains(shutdownCM.Data["shutdown.sh"], "valkey-cli")
+-	assert.Contains(shutdownCM.Data["shutdown.sh"], "VALKEYCLI_AUTH")
++	assert.Contains(shutdownCM.Data["shutdown.sh"], "REDISCLI_AUTH")
+ 
+ 	readinessCM, err := c.k8sClient.CoreV1().ConfigMaps(currentNamespace).Get(context.Background(), fmt.Sprintf("rfr-readiness-%s", rfName), metav1.GetOptions{})
+ 	require.NoError(err)
+ 	assert.Contains(readinessCM.Data["ready.sh"], "valkey-cli")
+-	assert.Contains(readinessCM.Data["ready.sh"], "VALKEYCLI_AUTH")
++	assert.Contains(readinessCM.Data["ready.sh"], "REDISCLI_AUTH")
+ }
diff --git a/packages/system/redis-operator/patches/crd-tls.diff b/packages/system/redis-operator/patches/crd-tls.diff
new file mode 100644
index 0000000000..7d10e45bee
--- /dev/null
+++ b/packages/system/redis-operator/patches/crd-tls.diff
@@ -0,0 +1,220 @@
+# The RedisFailover CRD gains spec.tls, matching the downstream TLS support the
+# operator image carries as images/redis-operator/patches/tls.diff. The two have
+# to move together: the schema is what the apiserver validates against, so
+# without this block every RedisFailover packages/apps/redis renders has its
+# spec.tls pruned on admission and TLS is silently off, while the patched binary
+# waits for a field it never sees.
+#
+# The x-kubernetes-validations rule on spec fixes tls.enabled at creation: an
+# absent block and enabled: false are one state, a change between that state
+# and enabled: true is refused with the message the rule carries. Redis
+# replication and Sentinel cannot straddle plaintext and TLS, so the operator
+# refuses the flip rather than half-performing it; on a running release the
+# refusal surfaces as a failed HelmRelease upgrade. The rule references
+# self.tls, so it and the schema block land together or not at all.
+#
+# Generated by running controller-gen 0.17.3 with crd:crdVersions=v1 over the
+# v3.3.5 ./api tree with tls.diff applied, and diffing against the same
+# generator run on the unpatched tree. Regenerate it that way rather than
+# hand-editing, and regenerate it whenever tls.diff touches
+# api/redisfailover/v1/types.go.
+#
+# The block sits after `sentinel` because controller-gen sorts properties
+# alphabetically; keeping that order is what makes the regenerated output match
+# this patch instead of reordering the whole map.
+#
+# controller-gen stamps its own version into the
+# controller-gen.kubebuilder.io/version annotation while the vendored chart
+# carries (devel); that one-line difference is not part of the change and is
+# left out of this patch.
+--- a/charts/redis-operator/crds/databases.spotahome.com_redisfailovers.yaml
++++ b/charts/redis-operator/crds/databases.spotahome.com_redisfailovers.yaml
+@@ -15319,7 +15319,188 @@
+                       type: object
+                     type: array
+                 type: object
++              tls:
++                description: |-
++                  TLSSettings configures TLS for the Redis failover cluster.
++                  When Enabled is true, exactly one of CertManager or CertificateSecret must
++                  be set. The resulting Kubernetes Secret must contain the standard cert-manager
++                  keys (tls.crt, tls.key, ca.crt) and is mounted read-only into both Redis and
++                  Sentinel pods at /tls.
++
++                  TLS is chosen when the RedisFailover is created and cannot be turned on or
++                  off afterwards. Redis replication and Sentinel cannot straddle two wire
++                  protocols: a replica restarted onto the other protocol cannot sync from the
++                  master, and Sentinels restarted onto it declare the master down and fail
++                  over to such a replica while the master still serves writes. The other
++                  fields stay mutable; a renewed certificate reaches the pods through a
++                  restart.
++                properties:
++                  authClients:
++                    description: |-
++                      AuthClients maps to the Redis tls-auth-clients directive.
++                      One of "no", "optional", "yes". Defaults to "no" — server certificate
++                      is presented but client certificates are not validated.
++                      Changing it rolls the Redis and Sentinel pods, because the directive
++                      is read from the config file once at startup.
++                    enum:
++                    - "no"
++                    - optional
++                    - "yes"
++                    type: string
++                  caCertSecretName:
++                    description: |-
++                      CACertSecretName names the Opaque Secret the operator publishes with
++                      only the CA certificate (ca.crt) extracted from the TLS material. It
++                      never contains tls.key, so RBAC can be scoped to it to let clients
++                      verify the server without exposing any private key. When TLS is
++                      enabled the operator always publishes this Secret; this field only
++                      overrides its name. Defaults to "<tls-secret-name>-ca" when empty.
++                    type: string
++                  certManager:
++                    description: |-
++                      CertManager provisions the server certificate by creating a
++                      cert-manager Certificate that references the given Issuer.
++                      Mutually exclusive with CertificateSecret.
++                    properties:
++                      duration:
++                        description: |-
++                          Duration is the requested certificate validity. Optional;
++                          cert-manager uses its own default (typically 90 days) when unset.
++                        type: string
++                      extraSANs:
++                        description: |-
++                          ExtraSANs is a list of additional Subject Alternative Names to add
++                          to the generated certificate. Entries are auto-classified: values
++                          that parse as IPv4 or IPv6 addresses become IP SANs, everything
++                          else becomes a DNS SAN. Extras are appended to — never replace —
++                          the service and per-pod SANs the operator computes, so in-cluster
++                          connectivity is preserved when extras are added.
++                        items:
++                          type: string
++                        type: array
++                      issuerRef:
++                        description: |-
++                          IssuerRef points at an Issuer or ClusterIssuer. The Name field is
++                          required. Kind defaults to "Issuer" and Group defaults to
++                          "cert-manager.io" when empty.
++                        properties:
++                          group:
++                            description: Group of the resource being referred to.
++                            type: string
++                          kind:
++                            description: Kind of the resource being referred to.
++                            type: string
++                          name:
++                            description: Name of the resource being referred to.
++                            type: string
++                        required:
++                        - name
++                        type: object
++                      privateKey:
++                        description: |-
++                          PrivateKey configures the private key algorithm, size and rotation
++                          policy. Optional; cert-manager uses RSA 2048 with rotation policy
++                          "Never" when unset.
++                        properties:
++                          algorithm:
++                            description: |-
++                              Algorithm is the private key algorithm of the corresponding private key
++                              for this certificate.
++
++                              If provided, allowed values are either `RSA`, `ECDSA` or `Ed25519`.
++                              If `algorithm` is specified and `size` is not provided,
++                              key size of 2048 will be used for `RSA` key algorithm and
++                              key size of 256 will be used for `ECDSA` key algorithm.
++                              key size is ignored when using the `Ed25519` key algorithm.
++                            enum:
++                            - RSA
++                            - ECDSA
++                            - Ed25519
++                            type: string
++                          encoding:
++                            description: |-
++                              The private key cryptography standards (PKCS) encoding for this
++                              certificate's private key to be encoded in.
++
++                              If provided, allowed values are `PKCS1` and `PKCS8` standing for PKCS#1
++                              and PKCS#8, respectively.
++                              Defaults to `PKCS1` if not specified.
++                            enum:
++                            - PKCS1
++                            - PKCS8
++                            type: string
++                          rotationPolicy:
++                            description: |-
++                              RotationPolicy controls how private keys should be regenerated when a
++                              re-issuance is being processed.
++
++                              If set to `Never`, a private key will only be generated if one does not
++                              already exist in the target `spec.secretName`. If one does exist but it
++                              does not have the correct algorithm or size, a warning will be raised
++                              to await user intervention.
++                              If set to `Always`, a private key matching the specified requirements
++                              will be generated whenever a re-issuance occurs.
++                              Default is `Always`.
++                              The default was changed from `Never` to `Always` in cert-manager >=v1.18.0.
++                              The new default can be disabled by setting the
++                              `--feature-gates=DefaultPrivateKeyRotationPolicyAlways=false` option on
++                              the controller component.
++                            enum:
++                            - Never
++                            - Always
++                            type: string
++                          size:
++                            description: |-
++                              Size is the key bit size of the corresponding private key for this certificate.
++
++                              If `algorithm` is set to `RSA`, valid values are `2048`, `4096` or `8192`,
++                              and will default to `2048` if not specified.
++                              If `algorithm` is set to `ECDSA`, valid values are `256`, `384` or `521`,
++                              and will default to `256` if not specified.
++                              If `algorithm` is set to `Ed25519`, Size is ignored.
++                              No other values are allowed.
++                            type: integer
++                        type: object
++                      renewBefore:
++                        description: |-
++                          RenewBefore is how long before expiry cert-manager should renew.
++                          Optional; cert-manager uses its own default (typically 2/3 of
++                          Duration) when unset.
++                        type: string
++                      secretName:
++                        description: |-
++                          SecretName overrides the default Secret name (rftls-<rfname>) into
++                          which cert-manager writes the issued certificate.
++                        type: string
++                    required:
++                    - issuerRef
++                    type: object
++                  certificateSecret:
++                    description: |-
++                      CertificateSecret uses an existing Secret managed outside the operator.
++                      Mutually exclusive with CertManager.
++                    properties:
++                      secretName:
++                        description: |-
++                          SecretName is the name of the Secret that contains the TLS material
++                          (tls.crt, tls.key, ca.crt).
++                        type: string
++                    required:
++                    - secretName
++                    type: object
++                  enabled:
++                    description: |-
++                      Enabled toggles TLS. Immutable after creation, together with the
++                      presence of this block: a missing block and Enabled=false are the same
++                      state. Leaving Enabled=false is the default.
++                    type: boolean
++                type: object
+             type: object
++            x-kubernetes-validations:
++            - message: TLS cannot be enabled or disabled on an existing RedisFailover;
++                create a new one
++              rule: (has(self.tls) && has(self.tls.enabled) && self.tls.enabled) ==
++                (has(oldSelf.tls) && has(oldSelf.tls.enabled) && oldSelf.tls.enabled)
+         required:
+         - spec
+         type: object
diff --git a/packages/system/redis-operator/patches/rbac-tls.diff b/packages/system/redis-operator/patches/rbac-tls.diff
new file mode 100644
index 0000000000..8e3950f9fb
--- /dev/null
+++ b/packages/system/redis-operator/patches/rbac-tls.diff
@@ -0,0 +1,47 @@
+# The operator ClusterRole gains what the downstream TLS support in
+# images/redis-operator/patches/tls.diff actually calls, and nothing else.
+#
+# Upstream v3.3.5 grants `get` on Secrets, because the unpatched operator only
+# reads a Secret someone else wrote. The patched operator also publishes the
+# CA-only Secret named by spec.tls.caCertSecretName, and Create, Get and Update
+# are every Secret call in the patched source (service/k8s/secret.go). It
+# addresses the Secret by name, so there is no list and no watch, and nothing
+# patches or deletes.
+#
+# cert-manager Certificates are deliberately not granted: the operator manages
+# one only under spec.tls.certManager, a mode packages/apps/redis never sets —
+# it always supplies spec.tls.certificateSecret. The rationale sits as a comment
+# at the rule site so a re-vendor review reads the absence as a decision.
+--- a/charts/redis-operator/templates/service-account.yaml
++++ b/charts/redis-operator/templates/service-account.yaml
+@@ -68,12 +68,29 @@
+       - patch
+       - update
+       - watch
++  # Downstream TLS patch, carried as patches/rbac-tls.diff: charts/ is discarded
++  # by `make update`, so widen or narrow this through the patch, not here.
++  #
++  # Upstream v3.3.5 needs `get` alone, because the unpatched operator only reads
++  # a Secret someone else wrote. The patched operator also publishes the CA-only
++  # Secret named by spec.tls.caCertSecretName. Create, Get and Update are every
++  # Secret call the patched source makes (service/k8s/secret.go): it addresses
++  # the Secret by name, so nothing lists or watches, and nothing patches.
++  #
++  # cert-manager Certificates are deliberately not granted. The operator manages
++  # a Certificate only under spec.tls.certManager, and packages/apps/redis pins
++  # the other mode: it always sets spec.tls.certificateSecret and never
++  # certManager, so that code is unreachable as this platform ships it. Setting
++  # certManager on a RedisFailover therefore fails with a 403 until this rule
++  # gains cert-manager.io/certificates with create, get and update.
+   - apiGroups:
+       - ""
+     resources:
+       - secrets
+     verbs:
+-      - "get"
++      - create
++      - get
++      - update
+   - apiGroups:
+       - apps
+     resources:
diff --git a/packages/system/redis-operator/values.yaml b/packages/system/redis-operator/values.yaml
index 77e910118c..8c01e9703e 100644
--- a/packages/system/redis-operator/values.yaml
+++ b/packages/system/redis-operator/values.yaml
@@ -1,4 +1,11 @@
 redis-operator:
   image:
     repository: ghcr.io/cozystack/cozystack/redis-operator
-    tag: v1.3.0-rc1@sha256:a4012e6a1b5daaedb57cc27edfdbff52124de4164b5ec0ee53c5ce5710ef4c25
+    tag: v3.3.5@sha256:551f39340bee3d6ea8e1da973cfc64092b769526c4a7aea0427070cbf6702ddd
+  # The freshworks-oss fork requires a non-empty operator group id at startup
+  # (fatal "operator_group_id environment variable is required" otherwise); the
+  # archived spotahome operator had no such knob. A single cluster-wide operator
+  # only needs a stable non-empty value, so pin it rather than leave it unset.
+  extraEnvVars:
+    - name: OPERATOR_GROUP_ID
+      value: "cozystack"
diff --git a/packages/system/redis-rd/cozyrds/redis.yaml b/packages/system/redis-rd/cozyrds/redis.yaml
index fdb8c5ba14..a1d619c34a 100644
--- a/packages/system/redis-rd/cozyrds/redis.yaml
+++ b/packages/system/redis-rd/cozyrds/redis.yaml
@@ -8,7 +8,7 @@ spec:
     plural: redises
     singular: redis
     openAPISchema: |-
-      {"title":"Chart Values","type":"object","properties":{"replicas":{"description":"Number of Redis replicas.","type":"integer","default":2},"resources":{"description":"Explicit CPU and memory configuration for each Redis replica. When omitted, the preset defined in `resourcesPreset` is applied.","type":"object","default":{},"properties":{"cpu":{"description":"CPU available to each replica.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Memory (RAM) available to each replica.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}},"resourcesPreset":{"description":"Default sizing preset used when `resources` is omitted.","type":"string","default":"t1.nano","enum":["t1.nano","t1.micro","t1.small","t1.medium","t1.large","t1.xlarge","t1.2xlarge","t1.4xlarge","c1.nano","c1.micro","c1.small","c1.medium","c1.large","c1.xlarge","c1.2xlarge","c1.4xlarge","s1.nano","s1.micro","s1.small","s1.medium","s1.large","s1.xlarge","s1.2xlarge","s1.4xlarge","u1.nano","u1.micro","u1.small","u1.medium","u1.large","u1.xlarge","u1.2xlarge","u1.4xlarge","m1.nano","m1.micro","m1.small","m1.medium","m1.large","m1.xlarge","m1.2xlarge","m1.4xlarge","nano","micro","small","medium","large","xlarge","2xlarge"]},"size":{"description":"Persistent Volume Claim size available for application data.","default":"1Gi","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"storageClass":{"description":"StorageClass used to store the data.","type":"string","default":"","x-kubernetes-validations":[{"rule":"self == oldSelf","message":"storageClass is immutable"}]},"external":{"description":"Enable external access from outside the cluster.","type":"boolean","default":false},"version":{"description":"Redis major version to deploy","type":"string","default":"v8","enum":["v8","v7"]},"authEnabled":{"description":"Enable password generation.","type":"boolean","default":true}}}
+      {"title":"Chart Values","type":"object","properties":{"replicas":{"description":"Number of Redis replicas.","type":"integer","default":2},"resources":{"description":"Explicit CPU and memory configuration for each Redis replica. When omitted, the preset defined in `resourcesPreset` is applied.","type":"object","default":{},"properties":{"cpu":{"description":"CPU available to each replica.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Memory (RAM) available to each replica.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}},"resourcesPreset":{"description":"Default sizing preset used when `resources` is omitted.","type":"string","default":"t1.nano","enum":["t1.nano","t1.micro","t1.small","t1.medium","t1.large","t1.xlarge","t1.2xlarge","t1.4xlarge","c1.nano","c1.micro","c1.small","c1.medium","c1.large","c1.xlarge","c1.2xlarge","c1.4xlarge","s1.nano","s1.micro","s1.small","s1.medium","s1.large","s1.xlarge","s1.2xlarge","s1.4xlarge","u1.nano","u1.micro","u1.small","u1.medium","u1.large","u1.xlarge","u1.2xlarge","u1.4xlarge","m1.nano","m1.micro","m1.small","m1.medium","m1.large","m1.xlarge","m1.2xlarge","m1.4xlarge","nano","micro","small","medium","large","xlarge","2xlarge"]},"size":{"description":"Persistent Volume Claim size available for application data.","default":"1Gi","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"storageClass":{"description":"StorageClass used to store the data.","type":"string","default":"","x-kubernetes-validations":[{"rule":"self == oldSelf","message":"storageClass is immutable"}],"x-cozystack-options":{"source":"storageclass"}},"external":{"description":"Enable external access from outside the cluster. Can be enabled only when the instance is created, together with `tls.enabled: true`; turning it on for an existing instance, or changing `tls.enabled` while it is on, is refused at admission.","type":"boolean","default":false},"version":{"description":"Redis major version to deploy. The Redis and Sentinel pods run the same image.","type":"string","default":"v8","enum":["v8","v7"]},"tls":{"description":"TLS configuration. TLS is opt-in and is not inferred from `external`.","type":"object","default":{},"properties":{"authClients":{"description":"Maps to the Redis `tls-auth-clients` directive. Defaults to `no` — the server certificate is presented but client certificates are not validated. `yes` requires a client certificate signed by this release's CA, which the platform does not issue. Changing it restarts the Redis and Sentinel pods, because the directive is read from the config file once at startup.","type":"string","enum":["no","optional","yes"]},"enabled":{"description":"Enable TLS for Redis and Sentinel connections. Disabled unless set. Enabling it moves Redis and Sentinel to a TLS-only listener, so existing plaintext clients must be migrated at the same time. Encryption is provided by the redis-operator fork that mounts the certificate Secret into both Redis and Sentinel pods at `/tls`.","type":"boolean"}}},"authEnabled":{"description":"Enable password generation.","type":"boolean","default":true},"minReplicasToWrite":{"description":"Redis `min-replicas-to-write`: the master refuses writes unless at least this many replicas are connected and within `minReplicasMaxLag`. Unset by default, which leaves the Redis default (disabled). With `replicas: 2` and a value of 1 the master rejects writes while its only replica is down, trading availability for a bound on the writes lost if an isolated master is failed over. Replication stays asynchronous, so this bounds the loss, it does not remove it. Must be 0 or more and below `replicas` (a master with `replicas` pods has `replicas - 1` replicas), otherwise every write is refused; the chart refuses such a value.","type":"integer","minimum":0},"minReplicasMaxLag":{"description":"Redis `min-replicas-max-lag`, in seconds: a replica whose last acknowledgement is older than this does not count towards `minReplicasToWrite`. Unset by default, which leaves the Redis default (10). Has no effect unless `minReplicasToWrite` is set. Must be at least 1 when `minReplicasToWrite` is set: Redis treats 0 as disabling the check, so the chart refuses it.","type":"integer","minimum":0},"sentinel":{"description":"Sentinel configuration. When `sentinel.resources` is empty and `sentinel.resourcesPreset` is unset, the three Sentinel pods are sized like the Redis pods (`resources` and `resourcesPreset`). An empty `sentinel.resources` map counts as unset, as an empty top-level `resources` does.","type":"object","default":{},"properties":{"resources":{"description":"Explicit CPU and memory configuration for each Sentinel pod. Keys left out are filled from the preset in `sentinel.resourcesPreset`.","type":"object","properties":{"cpu":{"description":"CPU available to each replica.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Memory (RAM) available to each replica.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}},"resourcesPreset":{"description":"Sizing preset for the Sentinel pods. Defaults to `resourcesPreset`.","type":"string","enum":["t1.nano","t1.micro","t1.small","t1.medium","t1.large","t1.xlarge","t1.2xlarge","t1.4xlarge","c1.nano","c1.micro","c1.small","c1.medium","c1.large","c1.xlarge","c1.2xlarge","c1.4xlarge","s1.nano","s1.micro","s1.small","s1.medium","s1.large","s1.xlarge","s1.2xlarge","s1.4xlarge","u1.nano","u1.micro","u1.small","u1.medium","u1.large","u1.xlarge","u1.2xlarge","u1.4xlarge","m1.nano","m1.micro","m1.small","m1.medium","m1.large","m1.xlarge","m1.2xlarge","m1.4xlarge","nano","micro","small","medium","large","xlarge","2xlarge"]}}}}}
   release:
     prefix: redis-
     labels:
@@ -25,12 +25,55 @@ spec:
     tags:
       - cache
     icon: PHN2ZyB3aWR0aD0iMTQ0IiBoZWlnaHQ9IjE0NCIgdmlld0JveD0iMCAwIDE0NCAxNDQiIGZpbGw9Im5vbmUiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+CjxyZWN0IHdpZHRoPSIxNDQiIGhlaWdodD0iMTQ0IiByeD0iMjQiIGZpbGw9InVybCgjcGFpbnQwX2xpbmVhcl82ODNfMzIxMykiLz4KPHBhdGggZD0iTTEyMC4xNDkgOTUuNTQ5MUMxMTQuNTg2IDk4LjQ0ODUgODUuNzcwOSAxMTAuMjk2IDc5LjYzNjMgMTEzLjQ5NUM3My41MDE2IDExNi42OTMgNzAuMDkzNyAxMTYuNjYyIDY1LjI0NzIgMTE0LjM0NkM2MC40MDEyIDExMi4wMjkgMjkuNzM2NCA5OS42NDIzIDI0LjIxMjUgOTcuMDAxOUMyMS40NTE5IDk1LjY4MjcgMjAgOTQuNTY4NyAyMCA5My41MTY2VjgyLjk4MDlDMjAgODIuOTgwOSA1OS45MjIgNzQuMjkwMSA2Ni4zNjY5IDcxLjk3NzhDNzIuODExNSA2OS42NjU2IDc1LjA0NzYgNjkuNTgyMSA4MC41MzIgNzEuNTkxQzg2LjAxNzMgNzMuNjAwOCAxMTguODEyIDc5LjUxNzYgMTI0LjIzMyA4MS41MDI5TDEyNC4yMyA5MS44ODk2QzEyNC4yMzEgOTIuOTMxMSAxMjIuOTggOTQuMDczNiAxMjAuMTQ5IDk1LjU0OTFaIiBmaWxsPSIjOTEyNjI2Ii8+CjxwYXRoIGQ9Ik0xMjAuMTQ3IDg1LjA3NTJDMTE0LjU4NSA4Ny45NzM0IDg1Ljc3IDk5LjgyMTggNzkuNjM1NCAxMDMuMDJDNzMuNTAxMSAxMDYuMjE5IDcwLjA5MzIgMTA2LjE4NyA2NS4yNDcyIDEwMy44NzFDNjAuNDAwNyAxMDEuNTU1IDI5LjczNzEgODkuMTY2OCAyNC4yMTM2IDg2LjUyOEMxOC42OTAxIDgzLjg4NzYgMTguNTc0NCA4Mi4wNzA0IDI0LjAwMDMgNzkuOTQ1OEMyOS40MjYxIDc3LjgyMDUgNTkuOTIxNSA2NS44NTYxIDY2LjM2NzIgNjMuNTQzOEM3Mi44MTE4IDYxLjIzMjQgNzUuMDQ3NSA2MS4xNDgxIDgwLjUzMTkgNjMuMTU3OEM4Ni4wMTY4IDY1LjE2NjggMTE0LjY2IDc2LjU2NzYgMTIwLjA3OSA3OC41NTI1QzEyNS41MDEgODAuNTM5OSAxMjUuNzA5IDgyLjE3NjMgMTIwLjE0NyA4NS4wNzUyWiIgZmlsbD0iI0M2MzAyQiIvPgo8cGF0aCBkPSJNMTIwLjE0OSA3OC41MDJDMTE0LjU4NiA4MS40MDE4IDg1Ljc3MDkgOTMuMjQ5MyA3OS42MzYzIDk2LjQ0ODhDNzMuNTAxNiA5OS42NDYyIDcwLjA5MzcgOTkuNjE1MiA2NS4yNDcyIDk3LjI5ODVDNjAuNDAwOCA5NC45ODMgMjkuNzM2NCA4Mi41OTUyIDI0LjIxMjUgNzkuOTU0N0MyMS40NTE5IDc4LjYzNTUgMjAgNzcuNTIzMiAyMCA3Ni40NzA3VjY1LjkzMzhDMjAgNjUuOTMzOCA1OS45MjIgNTcuMjQzNCA2Ni4zNjY5IDU0LjkzMTFDNzIuODExNSA1Mi42MTg5IDc1LjA0NzYgNTIuNTM1IDgwLjUzMiA1NC41NDQzQzg2LjAxNzcgNTYuNTUzNiAxMTguODEzIDYyLjQ2OTMgMTI0LjIzMyA2NC40NTVMMTI0LjIzIDc0Ljg0MjhDMTI0LjIzMSA3NS44ODQgMTIyLjk4IDc3LjAyNjQgMTIwLjE0OSA3OC41MDJaIiBmaWxsPSIjOTEyNjI2Ii8+CjxwYXRoIGQ9Ik0xMjAuMTQ3IDY4LjAyODJDMTE0LjU4NSA3MC45MjcxIDg1Ljc3IDgyLjc3NDcgNzkuNjM1NCA4NS45NzM3QzczLjUwMTEgODkuMTcxNiA3MC4wOTMyIDg5LjE0MDIgNjUuMjQ3MiA4Ni44MjM1QzYwLjQwMDcgODQuNTA4NCAyOS43MzcxIDcyLjEyMDEgMjQuMjEzNiA2OS40ODA5QzE4LjY5MDEgNjYuODQxMyAxOC41NzQ0IDY1LjAyMzcgMjQuMDAwMyA2Mi44OTg0QzI5LjQyNjEgNjAuNzc0MiA1OS45MjE5IDQ4LjgwOSA2Ni4zNjcyIDQ2LjQ5NzJDNzIuODExOCA0NC4xODUzIDc1LjA0NzUgNDQuMTAxNCA4MC41MzE5IDQ2LjExMDhDODYuMDE2OCA0OC4xMTk3IDExNC42NiA1OS41MTk3IDEyMC4wNzkgNjEuNTA1NUMxMjUuNTAxIDYzLjQ5MjQgMTI1LjcwOSA2NS4xMjkyIDEyMC4xNDcgNjguMDI4MloiIGZpbGw9IiNDNjMwMkIiLz4KPHBhdGggZD0iTTEyMC4xNDkgNjAuODIyNEMxMTQuNTg2IDYzLjcyMTQgODUuNzcwOSA3NS41Njk4IDc5LjYzNjMgNzguNzY5MkM3My41MDE2IDgxLjk2NzEgNzAuMDkzNyA4MS45MzU3IDY1LjI0NzIgNzkuNjE5QzYwLjQwMDggNzcuMzAzNSAyOS43MzY0IDY0LjkxNTIgMjQuMjEyNSA2Mi4yNzZDMjEuNDUxOSA2MC45NTU2IDIwIDU5Ljg0MjggMjAgNTguNzkxNVY0OC4yNTQyQzIwIDQ4LjI1NDIgNTkuOTIyIDM5LjU2NDIgNjYuMzY2OSAzNy4yNTI0QzcyLjgxMTUgMzQuOTM5NyA3NS4wNDc2IDM0Ljg1NjcgODAuNTMyIDM2Ljg2NTZDODYuMDE3NyAzOC44NzQ5IDExOC44MTMgNDQuNzkwNSAxMjQuMjMzIDQ2Ljc3NjNMMTI0LjIzIDU3LjE2MzdDMTI0LjIzMSA1OC4yMDQgMTIyLjk4IDU5LjM0NjUgMTIwLjE0OSA2MC44MjI0WiIgZmlsbD0iIzkxMjYyNiIvPgo8cGF0aCBkPSJNMTIwLjE0NyA1MC4zNDlDMTE0LjU4NSA1My4yNDc5IDg1Ljc2OTggNjUuMDk2MyA3OS42MzUyIDY4LjI5NDFDNzMuNTAwOSA3MS40OTIgNzAuMDkzIDcxLjQ2MDYgNjUuMjQ2OSA2OS4xNDUxQzYwLjQwMDkgNjYuODI4MyAyOS43MzY5IDU0LjQ0MDkgMjQuMjEzOCA1MS44MDEzQzE4LjY4OTkgNDkuMTYyMSAxOC41NzQ2IDQ3LjM0NDEgMjQgNDUuMjE5MkMyOS40MjU5IDQzLjA5NDYgNTkuOTIxNyAzMS4xMzEgNjYuMzY3IDI4LjgxODRDNzIuODExNiAyNi41MDYxIDc1LjA0NzMgMjYuNDIzIDgwLjUzMTcgMjguNDMyNEM4Ni4wMTY2IDMwLjQ0MTcgMTE0LjY1OSA0MS44NDE4IDEyMC4wNzkgNDMuODI3NUMxMjUuNTAxIDQ1LjgxMjggMTI1LjcwOSA0Ny40NSAxMjAuMTQ3IDUwLjM0OVoiIGZpbGw9IiNDNjMwMkIiLz4KPHBhdGggZD0iTTg0Ljg1NDEgNDAuMDk5NEw3NS44OTI2IDQxLjAyOThMNzMuODg2NSA0NS44NTdMNzAuNjQ2MyA0MC40NzAzTDYwLjI5ODMgMzkuNTQwNEw2OC4wMTk3IDM2Ljc1NThMNjUuNzAzIDMyLjQ4MTRMNzIuOTMyMSAzNS4zMDg4TDc5Ljc0NzEgMzMuMDc3NUw3Ny45MDUyIDM3LjQ5NzJMODQuODU0MSA0MC4wOTk0Wk03My4zNTE1IDYzLjUxODRMNTYuNjI2NiA1Ni41ODE2TDgwLjU5MiA1Mi45MDI5TDczLjM1MTUgNjMuNTE4NFpNNTAuMTYzNyA0Mi43ODI2QzU3LjIzODEgNDIuNzgyNiA2Mi45NzMgNDUuMDA1NyA2Mi45NzMgNDcuNzQ3NUM2Mi45NzMgNTAuNDkwMSA1Ny4yMzgxIDUyLjcxMjggNTAuMTYzNyA1Mi43MTI4QzQzLjA4OTMgNTIuNzEyOCAzNy4zNTQ1IDUwLjQ4OTcgMzcuMzU0NSA0Ny43NDc1QzM3LjM1NDUgNDUuMDA1NyA0My4wODkzIDQyLjc4MjYgNTAuMTYzNyA0Mi43ODI2WiIgZmlsbD0id2hpdGUiLz4KPHBhdGggZD0iTTk1LjQ0MzQgNDEuNDE3NEwxMDkuNjI3IDQ3LjAyMjRMOTUuNDU1NiA1Mi42MjJMOTUuNDQzNCA0MS40MTc0WiIgZmlsbD0iIzYyMUIxQyIvPgo8cGF0aCBkPSJNNzkuNzUyOSA0Ny42MjYxTDk1LjQ0NDkgNDEuNDE4OUw5NS40NTcxIDUyLjYyMzZMOTMuOTE4NCA1My4yMjU0TDc5Ljc1MjkgNDcuNjI2MVoiIGZpbGw9IiM5QTI5MjgiLz4KPGRlZnM+CjxsaW5lYXJHcmFkaWVudCBpZD0icGFpbnQwX2xpbmVhcl82ODNfMzIxMyIgeDE9IjE4OSIgeTE9IjIxMC41IiB4Mj0iMCIgeTI9IjAiIGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIj4KPHN0b3Agc3RvcC1jb2xvcj0iI0E4MDAwMCIvPgo8c3RvcCBvZmZzZXQ9IjEiIHN0b3AtY29sb3I9IiNGRkNGQ0YiLz4KPC9saW5lYXJHcmFkaWVudD4KPC9kZWZzPgo8L3N2Zz4K
-    keysOrder: [["apiVersion"], ["appVersion"], ["kind"], ["metadata"], ["metadata", "name"], ["spec", "replicas"], ["spec", "resources"], ["spec", "resourcesPreset"], ["spec", "size"], ["spec", "storageClass"], ["spec", "external"], ["spec", "version"], ["spec", "authEnabled"]]
+    keysOrder: [["apiVersion"], ["appVersion"], ["kind"], ["metadata"], ["metadata", "name"], ["spec", "replicas"], ["spec", "resources"], ["spec", "resourcesPreset"], ["spec", "size"], ["spec", "storageClass"], ["spec", "external"], ["spec", "version"], ["spec", "tls"], ["spec", "authEnabled"], ["spec", "sentinel"]]
   secrets:
-    exclude: []
+    # Backstop for the label-only include below, which matches on the label
+    # alone with no name constraint. These two Secrets are the ones whose
+    # promotion would hand the tenant private key material.
+    #
+    # Scope this honestly — it is narrower than it looks, in two ways.
+    # Selection is not namespace-wide: the lineage webhook drops out early for
+    # any object whose ownership does not resolve to this release's app CR
+    # (computeLabels returns nil when there is no owner), so unrelated Secrets
+    # in the namespace are never evaluated against these selectors at all.
+    # And these two specific Secrets do not reach the matcher today either,
+    # because the platform runs cert-manager with enableCertificateOwnerRef
+    # false, which leaves them with no ownerReference and therefore no
+    # resolvable owner.
+    #
+    # So the entries below are defence in depth against a future in which they
+    # do become reachable — ownerRefs enabled, or the operator adopting them —
+    # not a gate that fires today. Matching is by exact name with no globs, so
+    # a Secret a future operator version introduces, or a transient object an
+    # issuer creates mid-renewal, is not covered either. The primary defence
+    # remains that the controller stamps the tenant-ca label only on its own
+    # projection.
+    exclude:
+      - resourceNames:
+          # CA certificate and CA private key, issued by cert-manager.
+          - redis-{{ .name }}.ca-tls
+          # Server leaf and its private key, mounted into Redis and Sentinel.
+          - redis-{{ .name }}.tls
+          # The operator's CA-only copy. Key-free today, but unlike the two
+          # above it carries an ownerReference to the RedisFailover and a copy
+          # of its labels, so it is the one of the three a lineage walk can
+          # resolve at all.
+          - redis-{{ .name }}.ca-cert
     include:
       - resourceNames:
           - redis-{{ .name }}-auth
+      # The key-free trust anchor the CA-extraction controller publishes. This
+      # is the single, engine-agnostic selector every converged engine shares;
+      # it carries no per-release name templating.
+      #
+      # The operator also publishes a CA-only Secret of its own, at the name
+      # spec.tls.caCertSecretName gives it, and that one is deliberately not
+      # granted here. A name grant conveys whatever occupies the name, and the
+      # operator holds create and update on Secrets cluster-wide; the
+      # projection is written only by the platform controller, which copies one
+      # named key and refuses PEM private key material outright.
+      - matchLabels:
+          internal.cozystack.io/tenant-ca: "true"
   services:
     exclude: []
     include:
diff --git a/packages/system/reloader/Makefile b/packages/system/reloader/Makefile
index 6dc1f00437..5602db4b80 100644
--- a/packages/system/reloader/Makefile
+++ b/packages/system/reloader/Makefile
@@ -1,10 +1,39 @@
 export NAME=reloader
 export NAMESPACE=cozy-$(NAME)
+export REPO_NAME=stakater
+export REPO_URL=https://stakater.github.io/stakater-charts
+export CHART_NAME=reloader
+# Pin the vendored chart exactly. An unpinned pull takes whatever is latest,
+# which drags a Reloader upgrade into whatever change happens to run `update`
+# next and can move the deployment.yaml layout out from under
+# patches/deployment-startup-probe.diff. Raising this is a deliberate step:
+# regenerate the patch against the new upstream and re-run `make test`.
+#
+# Read this as "the version that is vendored", not "the current version":
+# upstream is at 2.2.14 / app v1.4.19 while this is 2.0.0 / app v1.3.0. The pin
+# is what makes the vendored tree reproducible, and it does not itself schedule
+# the catch-up bump, which is its own change.
+export CHART_VERSION=2.0.0
 
 include ../../../hack/package.mk
 
-update:
-	rm -rf charts
-	helm repo add stakater https://stakater.github.io/stakater-charts
-	helm repo update
-	helm pull stakater/reloader --untar --untardir charts
+test:
+	helm unittest .
+	# CHART_VERSION names the version that is vendored, and nothing else
+	# enforces that: bumping the pin without re-running `make update` leaves the
+	# committed tree on the old chart and the claim quietly false.
+	@actual_version=$$(awk '/^version:/ {print $$2}' charts/reloader/Chart.yaml | tr -d '"'); \
+	if [ "$$actual_version" != "$(CHART_VERSION)" ]; then \
+	  echo "ERROR: vendored charts/reloader/Chart.yaml version=$$actual_version but Makefile CHART_VERSION=$(CHART_VERSION). Re-run 'make update'."; \
+	  exit 1; \
+	fi
+
+update: clean reloader-update
+	# Re-apply local modifications carried as patches/*.diff. clean runs first,
+	# so this target always patches a freshly pulled tree; --forward guards the
+	# re-run by hand over a tree that already carries the change, where patch(1)
+	# defaults diverge by implementation: GNU 2.7.6 refuses and exits 1, Apple
+	# 2.0-12u11 takes its "Assume -R? [y]" default and strips the hunk back out
+	# with exit 0, and GNU under --batch does the same. --forward refuses in all
+	# three, leaving a .rej and a non-zero exit.
+	patch --forward --no-backup-if-mismatch -p1 < patches/deployment-startup-probe.diff
diff --git a/packages/system/reloader/charts/reloader/templates/deployment.yaml b/packages/system/reloader/charts/reloader/templates/deployment.yaml
index 851230e85a..e43a1b1a0a 100644
--- a/packages/system/reloader/charts/reloader/templates/deployment.yaml
+++ b/packages/system/reloader/charts/reloader/templates/deployment.yaml
@@ -161,6 +161,17 @@ spec:
         ports:
         - name: http
           containerPort: 9090
+        {{- /*
+        cozystack (patches/deployment-startup-probe.diff): the upstream chart
+        renders no startupProbe, which leaves a slow first start no grace period
+        of its own. Why that matters and how the budget was chosen is documented
+        next to the knob, in the package values.yaml. Rendered with `with`, so an
+        unset value emits nothing and the template stays upstream-compatible.
+        */}}
+        {{- with .Values.reloader.deployment.startupProbe }}
+        startupProbe:
+          {{- toYaml . | nindent 10 }}
+        {{- end }}
         livenessProbe:
           httpGet:
             path: /live
diff --git a/packages/system/reloader/patches/deployment-startup-probe.diff b/packages/system/reloader/patches/deployment-startup-probe.diff
new file mode 100644
index 0000000000..2504147b27
--- /dev/null
+++ b/packages/system/reloader/patches/deployment-startup-probe.diff
@@ -0,0 +1,36 @@
+# The upstream chart renders liveness and readiness from values but no
+# startupProbe at all, so a slow first start has no grace period of its own and
+# is killed by liveness inside ~60s. Reloader binds its :9090 listener as the
+# last statement of startReloader, after a package-level
+# `IsOpenshift = isOpenshift()` in pkg/kube issues a GET
+# /apis/project.openshift.io on a context with no deadline, before main() is
+# entered, so the probes are refused for as long as that takes. The budget and
+# the reasoning behind the numbers live in the package values.yaml.
+#
+# Chart source: https://github.com/stakater/stakater-charts (reloader)
+# This belongs upstream: the chart already renders the other two probes from
+# values, so a startupProbe block is the same shape of change. Not reported
+# upstream yet. Still absent as of chart 2.2.14 / app v1.4.19, where
+# isOpenshift() is also still eager, so the patch is needed on current upstream
+# and not only on the pinned 2.0.0. Drop this hunk once upstream renders one.
+diff --git a/charts/reloader/templates/deployment.yaml b/charts/reloader/templates/deployment.yaml
+--- a/charts/reloader/templates/deployment.yaml
++++ b/charts/reloader/templates/deployment.yaml
+@@ -161,6 +161,17 @@
+         ports:
+         - name: http
+           containerPort: 9090
++        {{- /*
++        cozystack (patches/deployment-startup-probe.diff): the upstream chart
++        renders no startupProbe, which leaves a slow first start no grace period
++        of its own. Why that matters and how the budget was chosen is documented
++        next to the knob, in the package values.yaml. Rendered with `with`, so an
++        unset value emits nothing and the template stays upstream-compatible.
++        */}}
++        {{- with .Values.reloader.deployment.startupProbe }}
++        startupProbe:
++          {{- toYaml . | nindent 10 }}
++        {{- end }}
+         livenessProbe:
+           httpGet:
+             path: /live
diff --git a/packages/system/reloader/tests/deployment_startup_probe_test.yaml b/packages/system/reloader/tests/deployment_startup_probe_test.yaml
new file mode 100644
index 0000000000..74b9c0e409
--- /dev/null
+++ b/packages/system/reloader/tests/deployment_startup_probe_test.yaml
@@ -0,0 +1,96 @@
+suite: cozy-reloader startup probe
+release:
+  name: reloader
+  namespace: cozy-reloader
+tests:
+  # The vendored Reloader chart renders no startupProbe. Reloader binds its
+  # :9090 listener as the last statement of startReloader, after a package-level
+  # GET /apis/project.openshift.io that carries no deadline, so a slow first
+  # start answers every probe with a connection refused and gets killed inside
+  # the ~60s liveness budget, restarting into a loop that never finishes the
+  # prologue. patches/deployment-startup-probe.diff adds the probe that gates
+  # liveness on that window. If a chart refresh drops the patch, or an upstream
+  # refactor renames the port or the endpoint, these asserts fail before the
+  # restart loop can come back.
+  - it: renders a startup probe covering the slow-start window
+    template: charts/reloader/templates/deployment.yaml
+    asserts:
+      - exists:
+          path: spec.template.spec.containers[0].startupProbe
+      - equal:
+          path: spec.template.spec.containers[0].startupProbe.httpGet.path
+          value: /live
+      - equal:
+          path: spec.template.spec.containers[0].startupProbe.httpGet.port
+          value: http
+      # Budget = periodSeconds * failureThreshold. Both values are pinned so a
+      # refresh that zeroed either one still falls out here; changing the budget
+      # on purpose means changing this test with it.
+      - equal:
+          path: spec.template.spec.containers[0].startupProbe.periodSeconds
+          value: 5
+      - equal:
+          path: spec.template.spec.containers[0].startupProbe.failureThreshold
+          value: 45
+      # Pinned because the kubelet default is 1s, and at this container's 100m
+      # CPU limit a throttled process can hold the socket open while still
+      # needing longer than a second to answer. Dropping this key would burn all
+      # 45 attempts on timeouts and kill the container anyway.
+      - equal:
+          path: spec.template.spec.containers[0].startupProbe.timeoutSeconds
+          value: 5
+
+  # The template renders the stanza under `with`, so an unset value has to emit
+  # nothing at all: the patch stays upstream-compatible only as long as that
+  # holds. A refactor to `if` plus `toYaml` without the guard would emit
+  # `startupProbe: null` and the happy-path case above would not notice.
+  - it: emits no startup probe when the value is unset
+    template: charts/reloader/templates/deployment.yaml
+    set:
+      reloader.reloader.deployment.startupProbe: null
+    asserts:
+      - notExists:
+          path: spec.template.spec.containers[0].startupProbe
+      # Unsetting the startup probe must not disturb what upstream renders.
+      - exists:
+          path: spec.template.spec.containers[0].livenessProbe
+
+  # The startup probe covers the pre-bind window and nothing else: once it
+  # succeeds the kubelet falls back on the upstream probes at their own cadence,
+  # so those have to survive the patch untouched.
+  #
+  # The liveness numbers are pinned, not just its endpoint, because they are the
+  # premise the startup probe is sized against: initialDelaySeconds 10 +
+  # periodSeconds 10 * failureThreshold 5 is the ~60s budget that the package
+  # values.yaml quotes as the window a slow start overruns. An upstream refresh
+  # that moved failureThreshold to 2 would tighten that window, and one that
+  # moved it to 30 would make this patch redundant; either way the documented
+  # arithmetic would silently stop describing the chart. Pin them so the
+  # rationale cannot rot without a red test.
+  - it: leaves the upstream liveness and readiness probes intact
+    template: charts/reloader/templates/deployment.yaml
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].livenessProbe.httpGet.path
+          value: /live
+      - equal:
+          path: spec.template.spec.containers[0].livenessProbe.httpGet.port
+          value: http
+      - equal:
+          path: spec.template.spec.containers[0].livenessProbe.initialDelaySeconds
+          value: 10
+      - equal:
+          path: spec.template.spec.containers[0].livenessProbe.periodSeconds
+          value: 10
+      - equal:
+          path: spec.template.spec.containers[0].livenessProbe.failureThreshold
+          value: 5
+      - equal:
+          path: spec.template.spec.containers[0].livenessProbe.timeoutSeconds
+          value: 5
+      - equal:
+          path: spec.template.spec.containers[0].readinessProbe.httpGet.path
+          value: /metrics
+      - equal:
+          path: spec.template.spec.containers[0].readinessProbe.httpGet.port
+          value: http
diff --git a/packages/system/reloader/values.yaml b/packages/system/reloader/values.yaml
index cbfae7cab9..c58d29e3db 100644
--- a/packages/system/reloader/values.yaml
+++ b/packages/system/reloader/values.yaml
@@ -1,3 +1,62 @@
 reloader:
   reloader:
     reloadStrategy: annotations
+    deployment:
+      resources:
+        limits:
+          cpu: 100m
+          memory: 512Mi
+        requests:
+          cpu: 10m
+          memory: 128Mi
+
+      # -- Startup probe for the `reloader` container. This is the canonical
+      # explanation for the cozystack `patches/deployment-startup-probe.diff`
+      # template patch, which is what makes the key render at all; the template
+      # itself only points back here.
+      #
+      # Reloader binds its :9090 listener as the last statement of
+      # `startReloader`, so /live and /metrics answer connection refused until
+      # everything before it has finished. The blocking part of that prologue is
+      # not the informer construction, which is lazy: it is the package-level
+      # `IsOpenshift = isOpenshift()` in pkg/kube, which issues a
+      # GET /apis/project.openshift.io against the API server, with a
+      # context.TODO() that carries no deadline of its own, before main() is
+      # even entered. Its latency is the API server's, and the container runs at
+      # a 100m CPU limit while it waits.
+      #
+      # Without a startup probe the only grace period is the liveness budget:
+      # initialDelaySeconds 10 + periodSeconds 10 * failureThreshold 5, about
+      # 60s. A first start that needs longer is killed mid-prologue, and the
+      # restart does not resume it, it runs it again from the beginning, so the
+      # loop sustains itself.
+      #
+      # Budget here = periodSeconds * failureThreshold = 5 * 45, about 225s.
+      # Several times the window that was not enough, still well inside the
+      # install timeout that applies (not Flux's own default: cozystack-operator
+      # stamps every generated HelmRelease with --helmrelease-install-timeout,
+      # 10m by default), and short enough that a container which is genuinely
+      # dead surfaces within a few minutes rather than hiding behind the probe.
+      #
+      # Why a startup probe rather than the liveness knobs the chart already
+      # exposes, neither of which would need a patch:
+      # - livenessProbe.failureThreshold buys the grace permanently, loosening
+      #   steady-state hang detection for the life of the container.
+      # - livenessProbe.initialDelaySeconds is start-up-only and would genuinely
+      #   do, but it is a fixed blind window on every start; a startup probe
+      #   returns liveness to its tight budget the moment the listener binds.
+      # Adaptive against fixed is the trade. It is narrower than it sounds while
+      # reloader.enableHA is unset, since /live is then a constant 200 and
+      # liveness can only catch the listener dying outright.
+      #
+      # timeoutSeconds matches the 5s the chart gives liveness and readiness,
+      # rather than the kubelet default of 1s, because at a 100m CPU limit the
+      # listener can be up while a throttled process still needs more than a
+      # second to answer.
+      startupProbe:
+        httpGet:
+          path: /live
+          port: http
+        periodSeconds: 5
+        failureThreshold: 45
+        timeoutSeconds: 5
diff --git a/packages/system/seaweedfs-rd/cozyrds/seaweedfs.yaml b/packages/system/seaweedfs-rd/cozyrds/seaweedfs.yaml
index 80ef77bea5..1fa5ad336d 100644
--- a/packages/system/seaweedfs-rd/cozyrds/seaweedfs.yaml
+++ b/packages/system/seaweedfs-rd/cozyrds/seaweedfs.yaml
@@ -8,7 +8,7 @@ spec:
     singular: seaweedfs
     plural: seaweedfses
     openAPISchema: |-
-      {"title":"Chart Values","type":"object","properties":{"host":{"description":"The hostname used to access SeaweedFS externally (defaults to 's3' subdomain for the tenant host).","type":"string","default":""},"topology":{"description":"The topology of the SeaweedFS cluster.","type":"string","default":"Simple","enum":["Simple","MultiZone","Client"]},"replicationFactor":{"description":"Replication factor: number of replicas for each volume in the SeaweedFS cluster.","type":"integer","default":2},"db":{"description":"Database configuration.","type":"object","default":{},"properties":{"replicas":{"description":"Number of database replicas.","type":"integer","default":2},"resources":{"description":"Explicit CPU and memory configuration. When omitted, the preset defined in `resourcesPreset` is applied.","type":"object","default":{},"properties":{"cpu":{"description":"Number of CPU cores allocated.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Amount of memory allocated.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}},"resourcesPreset":{"description":"Default sizing preset used when `resources` is omitted.","type":"string","default":"t1.small","enum":["t1.nano","t1.micro","t1.small","t1.medium","t1.large","t1.xlarge","t1.2xlarge","t1.4xlarge","c1.nano","c1.micro","c1.small","c1.medium","c1.large","c1.xlarge","c1.2xlarge","c1.4xlarge","s1.nano","s1.micro","s1.small","s1.medium","s1.large","s1.xlarge","s1.2xlarge","s1.4xlarge","u1.nano","u1.micro","u1.small","u1.medium","u1.large","u1.xlarge","u1.2xlarge","u1.4xlarge","m1.nano","m1.micro","m1.small","m1.medium","m1.large","m1.xlarge","m1.2xlarge","m1.4xlarge","nano","micro","small","medium","large","xlarge","2xlarge"]},"size":{"description":"Persistent Volume size.","default":"10Gi","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"storageClass":{"description":"StorageClass used to store the data.","type":"string","default":""}}},"master":{"description":"Master service configuration.","type":"object","default":{},"properties":{"replicas":{"description":"Number of master replicas.","type":"integer","default":3},"resources":{"description":"Explicit CPU and memory configuration. When omitted, the preset defined in `resourcesPreset` is applied.","type":"object","default":{},"properties":{"cpu":{"description":"Number of CPU cores allocated.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Amount of memory allocated.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}},"resourcesPreset":{"description":"Default sizing preset used when `resources` is omitted.","type":"string","default":"t1.small","enum":["t1.nano","t1.micro","t1.small","t1.medium","t1.large","t1.xlarge","t1.2xlarge","t1.4xlarge","c1.nano","c1.micro","c1.small","c1.medium","c1.large","c1.xlarge","c1.2xlarge","c1.4xlarge","s1.nano","s1.micro","s1.small","s1.medium","s1.large","s1.xlarge","s1.2xlarge","s1.4xlarge","u1.nano","u1.micro","u1.small","u1.medium","u1.large","u1.xlarge","u1.2xlarge","u1.4xlarge","m1.nano","m1.micro","m1.small","m1.medium","m1.large","m1.xlarge","m1.2xlarge","m1.4xlarge","nano","micro","small","medium","large","xlarge","2xlarge"]}}},"filer":{"description":"Filer service configuration.","type":"object","default":{},"properties":{"grpcHost":{"description":"The hostname used to expose or access the filer service externally.","type":"string","default":""},"grpcPort":{"description":"The port used to access the filer service externally.","type":"integer","default":443},"replicas":{"description":"Number of filer replicas.","type":"integer","default":2},"resources":{"description":"Explicit CPU and memory configuration. When omitted, the preset defined in `resourcesPreset` is applied.","type":"object","default":{},"properties":{"cpu":{"description":"Number of CPU cores allocated.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Amount of memory allocated.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}},"resourcesPreset":{"description":"Default sizing preset used when `resources` is omitted.","type":"string","default":"t1.small","enum":["t1.nano","t1.micro","t1.small","t1.medium","t1.large","t1.xlarge","t1.2xlarge","t1.4xlarge","c1.nano","c1.micro","c1.small","c1.medium","c1.large","c1.xlarge","c1.2xlarge","c1.4xlarge","s1.nano","s1.micro","s1.small","s1.medium","s1.large","s1.xlarge","s1.2xlarge","s1.4xlarge","u1.nano","u1.micro","u1.small","u1.medium","u1.large","u1.xlarge","u1.2xlarge","u1.4xlarge","m1.nano","m1.micro","m1.small","m1.medium","m1.large","m1.xlarge","m1.2xlarge","m1.4xlarge","nano","micro","small","medium","large","xlarge","2xlarge"]},"whitelist":{"description":"A list of IP addresses or CIDR ranges that are allowed to access the filer service.","type":"array","default":[],"items":{"type":"string"}}}},"volume":{"description":"Volume service configuration.","type":"object","default":{},"properties":{"diskType":{"description":"SeaweedFS disk type tag for the default volume servers (e.g., \"hdd\", \"ssd\").","type":"string","default":""},"pools":{"description":"A map of storage pools. Each pool creates a separate Volume StatefulSet with its own disk type.","type":"object","default":{},"additionalProperties":{"type":"object","required":["diskType"],"properties":{"diskType":{"description":"SeaweedFS disk type tag (e.g., \"ssd\", \"hdd\", \"nvme\").","type":"string"},"replicas":{"description":"Number of volume replicas. Defaults to volume.replicas (Simple) or zone.replicas/volume.replicas (MultiZone).","type":"integer"},"resources":{"description":"Explicit CPU and memory configuration. When omitted, the preset defined in `resourcesPreset` is applied.","type":"object","properties":{"cpu":{"description":"Number of CPU cores allocated.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Amount of memory allocated.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}},"resourcesPreset":{"description":"Default sizing preset used when `resources` is omitted. Defaults to volume.resourcesPreset.","type":"string","enum":["t1.nano","t1.micro","t1.small","t1.medium","t1.large","t1.xlarge","t1.2xlarge","t1.4xlarge","c1.nano","c1.micro","c1.small","c1.medium","c1.large","c1.xlarge","c1.2xlarge","c1.4xlarge","s1.nano","s1.micro","s1.small","s1.medium","s1.large","s1.xlarge","s1.2xlarge","s1.4xlarge","u1.nano","u1.micro","u1.small","u1.medium","u1.large","u1.xlarge","u1.2xlarge","u1.4xlarge","m1.nano","m1.micro","m1.small","m1.medium","m1.large","m1.xlarge","m1.2xlarge","m1.4xlarge","nano","micro","small","medium","large","xlarge","2xlarge"]},"size":{"description":"Persistent Volume size. Defaults to volume.size (Simple) or zone.size/volume.size (MultiZone).","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"storageClass":{"description":"Kubernetes StorageClass for the pool. Defaults to volume.storageClass.","type":"string"}}}},"replicas":{"description":"Number of volume replicas.","type":"integer","default":2},"resources":{"description":"Explicit CPU and memory configuration. When omitted, the preset defined in `resourcesPreset` is applied.","type":"object","default":{},"properties":{"cpu":{"description":"Number of CPU cores allocated.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Amount of memory allocated.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}},"resourcesPreset":{"description":"Default sizing preset used when `resources` is omitted.","type":"string","default":"t1.small","enum":["t1.nano","t1.micro","t1.small","t1.medium","t1.large","t1.xlarge","t1.2xlarge","t1.4xlarge","c1.nano","c1.micro","c1.small","c1.medium","c1.large","c1.xlarge","c1.2xlarge","c1.4xlarge","s1.nano","s1.micro","s1.small","s1.medium","s1.large","s1.xlarge","s1.2xlarge","s1.4xlarge","u1.nano","u1.micro","u1.small","u1.medium","u1.large","u1.xlarge","u1.2xlarge","u1.4xlarge","m1.nano","m1.micro","m1.small","m1.medium","m1.large","m1.xlarge","m1.2xlarge","m1.4xlarge","nano","micro","small","medium","large","xlarge","2xlarge"]},"size":{"description":"Persistent Volume size.","default":"10Gi","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"storageClass":{"description":"StorageClass used to store the data.","type":"string","default":""},"zones":{"description":"A map of zones for MultiZone topology. Each zone can have its own number of replicas and size.","type":"object","default":{},"additionalProperties":{"type":"object","properties":{"dataCenter":{"description":"SeaweedFS data center name for this zone. Defaults to the zone name.","type":"string"},"nodeSelector":{"description":"YAML nodeSelector for this zone (default: topology.kubernetes.io/zone: <zoneName>).","type":"string"},"pools":{"description":"A map of storage pools for this zone. Each pool creates a separate Volume StatefulSet per zone.","type":"object","additionalProperties":{"type":"object","required":["diskType"],"properties":{"diskType":{"description":"SeaweedFS disk type tag (e.g., \"ssd\", \"hdd\", \"nvme\").","type":"string"},"replicas":{"description":"Number of volume replicas. Defaults to volume.replicas (Simple) or zone.replicas/volume.replicas (MultiZone).","type":"integer"},"resources":{"description":"Explicit CPU and memory configuration. When omitted, the preset defined in `resourcesPreset` is applied.","type":"object","properties":{"cpu":{"description":"Number of CPU cores allocated.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Amount of memory allocated.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}},"resourcesPreset":{"description":"Default sizing preset used when `resources` is omitted. Defaults to volume.resourcesPreset.","type":"string","enum":["t1.nano","t1.micro","t1.small","t1.medium","t1.large","t1.xlarge","t1.2xlarge","t1.4xlarge","c1.nano","c1.micro","c1.small","c1.medium","c1.large","c1.xlarge","c1.2xlarge","c1.4xlarge","s1.nano","s1.micro","s1.small","s1.medium","s1.large","s1.xlarge","s1.2xlarge","s1.4xlarge","u1.nano","u1.micro","u1.small","u1.medium","u1.large","u1.xlarge","u1.2xlarge","u1.4xlarge","m1.nano","m1.micro","m1.small","m1.medium","m1.large","m1.xlarge","m1.2xlarge","m1.4xlarge","nano","micro","small","medium","large","xlarge","2xlarge"]},"size":{"description":"Persistent Volume size. Defaults to volume.size (Simple) or zone.size/volume.size (MultiZone).","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"storageClass":{"description":"Kubernetes StorageClass for the pool. Defaults to volume.storageClass.","type":"string"}}}},"replicas":{"description":"Number of replicas in the zone.","type":"integer"},"size":{"description":"Zone storage size.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"storageClass":{"description":"StorageClass used to store zone data. Defaults to volume.storageClass.","type":"string"}}}}}},"s3":{"description":"S3 service configuration.","type":"object","default":{},"properties":{"replicas":{"description":"Number of S3 replicas.","type":"integer","default":2},"resources":{"description":"Explicit CPU and memory configuration. When omitted, the preset defined in `resourcesPreset` is applied.","type":"object","default":{},"properties":{"cpu":{"description":"Number of CPU cores allocated.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Amount of memory allocated.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}},"resourcesPreset":{"description":"Default sizing preset used when `resources` is omitted.","type":"string","default":"t1.small","enum":["t1.nano","t1.micro","t1.small","t1.medium","t1.large","t1.xlarge","t1.2xlarge","t1.4xlarge","c1.nano","c1.micro","c1.small","c1.medium","c1.large","c1.xlarge","c1.2xlarge","c1.4xlarge","s1.nano","s1.micro","s1.small","s1.medium","s1.large","s1.xlarge","s1.2xlarge","s1.4xlarge","u1.nano","u1.micro","u1.small","u1.medium","u1.large","u1.xlarge","u1.2xlarge","u1.4xlarge","m1.nano","m1.micro","m1.small","m1.medium","m1.large","m1.xlarge","m1.2xlarge","m1.4xlarge","nano","micro","small","medium","large","xlarge","2xlarge"]}}}}}
+      {"title":"Chart Values","type":"object","properties":{"host":{"description":"The hostname used to access SeaweedFS externally (defaults to 's3' subdomain for the tenant host).","type":"string","default":""},"topology":{"description":"The topology of the SeaweedFS cluster.","type":"string","default":"Simple","enum":["Simple","MultiZone","Client"]},"replicationFactor":{"description":"Replication factor: number of replicas for each volume in the SeaweedFS cluster.","type":"integer","default":2},"db":{"description":"Database configuration.","type":"object","default":{},"properties":{"replicas":{"description":"Number of database replicas.","type":"integer","default":2},"resources":{"description":"Explicit CPU and memory configuration. When omitted, the preset defined in `resourcesPreset` is applied.","type":"object","default":{},"properties":{"cpu":{"description":"Number of CPU cores allocated.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Amount of memory allocated.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}},"resourcesPreset":{"description":"Default sizing preset used when `resources` is omitted.","type":"string","default":"t1.small","enum":["t1.nano","t1.micro","t1.small","t1.medium","t1.large","t1.xlarge","t1.2xlarge","t1.4xlarge","c1.nano","c1.micro","c1.small","c1.medium","c1.large","c1.xlarge","c1.2xlarge","c1.4xlarge","s1.nano","s1.micro","s1.small","s1.medium","s1.large","s1.xlarge","s1.2xlarge","s1.4xlarge","u1.nano","u1.micro","u1.small","u1.medium","u1.large","u1.xlarge","u1.2xlarge","u1.4xlarge","m1.nano","m1.micro","m1.small","m1.medium","m1.large","m1.xlarge","m1.2xlarge","m1.4xlarge","nano","micro","small","medium","large","xlarge","2xlarge"]},"size":{"description":"Persistent Volume size.","default":"10Gi","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"storageClass":{"description":"StorageClass used to store the data.","type":"string","default":""}}},"master":{"description":"Master service configuration.","type":"object","default":{},"properties":{"replicas":{"description":"Number of master replicas.","type":"integer","default":3},"resources":{"description":"Explicit CPU and memory configuration. When omitted, the preset defined in `resourcesPreset` is applied.","type":"object","default":{},"properties":{"cpu":{"description":"Number of CPU cores allocated.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Amount of memory allocated.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}},"resourcesPreset":{"description":"Default sizing preset used when `resources` is omitted.","type":"string","default":"t1.small","enum":["t1.nano","t1.micro","t1.small","t1.medium","t1.large","t1.xlarge","t1.2xlarge","t1.4xlarge","c1.nano","c1.micro","c1.small","c1.medium","c1.large","c1.xlarge","c1.2xlarge","c1.4xlarge","s1.nano","s1.micro","s1.small","s1.medium","s1.large","s1.xlarge","s1.2xlarge","s1.4xlarge","u1.nano","u1.micro","u1.small","u1.medium","u1.large","u1.xlarge","u1.2xlarge","u1.4xlarge","m1.nano","m1.micro","m1.small","m1.medium","m1.large","m1.xlarge","m1.2xlarge","m1.4xlarge","nano","micro","small","medium","large","xlarge","2xlarge"]},"volumeSizeLimitMB":{"description":"Size in MB at which a volume stops taking writes, and the divisor that sets how many buckets a volume server can serve. Lower it to fit more buckets on the same disk, at the cost of more volume files for the same stored data; on a large volume it is worth raising instead. Changing it on an instance that already holds data costs something either way: lowering it stops writes to every bucket whose volumes all reach the new value until that bucket can grow, and raising it takes the room new buckets grow into, so run the check in docs/operations/seaweedfs-lowering-the-volume-size-limit.md first. Must be between 1 and 30000. A value close to or above `volume.size` leaves each volume server a single slot rather than failing, since the server floors its slot count at one.","type":"integer","default":400,"maximum":30000,"minimum":1}}},"filer":{"description":"Filer service configuration.","type":"object","default":{},"properties":{"grpcHost":{"description":"The hostname used to expose or access the filer service externally.","type":"string","default":""},"grpcPort":{"description":"The port used to access the filer service externally.","type":"integer","default":443},"replicas":{"description":"Number of filer replicas.","type":"integer","default":2},"resources":{"description":"Explicit CPU and memory configuration. When omitted, the preset defined in `resourcesPreset` is applied.","type":"object","default":{},"properties":{"cpu":{"description":"Number of CPU cores allocated.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Amount of memory allocated.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}},"resourcesPreset":{"description":"Default sizing preset used when `resources` is omitted.","type":"string","default":"t1.small","enum":["t1.nano","t1.micro","t1.small","t1.medium","t1.large","t1.xlarge","t1.2xlarge","t1.4xlarge","c1.nano","c1.micro","c1.small","c1.medium","c1.large","c1.xlarge","c1.2xlarge","c1.4xlarge","s1.nano","s1.micro","s1.small","s1.medium","s1.large","s1.xlarge","s1.2xlarge","s1.4xlarge","u1.nano","u1.micro","u1.small","u1.medium","u1.large","u1.xlarge","u1.2xlarge","u1.4xlarge","m1.nano","m1.micro","m1.small","m1.medium","m1.large","m1.xlarge","m1.2xlarge","m1.4xlarge","nano","micro","small","medium","large","xlarge","2xlarge"]},"whitelist":{"description":"A list of IP addresses or CIDR ranges that are allowed to access the filer service.","type":"array","default":[],"items":{"type":"string"}}}},"volume":{"description":"Volume service configuration.","type":"object","default":{},"properties":{"diskType":{"description":"SeaweedFS disk type tag for the default volume servers (e.g., \"hdd\", \"ssd\").","type":"string","default":""},"pools":{"description":"A map of storage pools. Each pool creates a separate Volume StatefulSet with its own disk type.","type":"object","default":{},"additionalProperties":{"type":"object","required":["diskType"],"properties":{"diskType":{"description":"SeaweedFS disk type tag (e.g., \"ssd\", \"hdd\", \"nvme\").","type":"string"},"replicas":{"description":"Number of volume replicas. Defaults to volume.replicas (Simple) or zone.replicas/volume.replicas (MultiZone).","type":"integer"},"resources":{"description":"Explicit CPU and memory configuration. When omitted, the preset defined in `resourcesPreset` is applied.","type":"object","properties":{"cpu":{"description":"Number of CPU cores allocated.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Amount of memory allocated.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}},"resourcesPreset":{"description":"Default sizing preset used when `resources` is omitted. Defaults to volume.resourcesPreset.","type":"string","enum":["t1.nano","t1.micro","t1.small","t1.medium","t1.large","t1.xlarge","t1.2xlarge","t1.4xlarge","c1.nano","c1.micro","c1.small","c1.medium","c1.large","c1.xlarge","c1.2xlarge","c1.4xlarge","s1.nano","s1.micro","s1.small","s1.medium","s1.large","s1.xlarge","s1.2xlarge","s1.4xlarge","u1.nano","u1.micro","u1.small","u1.medium","u1.large","u1.xlarge","u1.2xlarge","u1.4xlarge","m1.nano","m1.micro","m1.small","m1.medium","m1.large","m1.xlarge","m1.2xlarge","m1.4xlarge","nano","micro","small","medium","large","xlarge","2xlarge"]},"size":{"description":"Persistent Volume size. Defaults to volume.size (Simple) or zone.size/volume.size (MultiZone).","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"storageClass":{"description":"Kubernetes StorageClass for the pool. Defaults to volume.storageClass.","type":"string"}}}},"replicas":{"description":"Number of volume replicas.","type":"integer","default":2},"resources":{"description":"Explicit CPU and memory configuration. When omitted, the preset defined in `resourcesPreset` is applied.","type":"object","default":{},"properties":{"cpu":{"description":"Number of CPU cores allocated.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Amount of memory allocated.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}},"resourcesPreset":{"description":"Default sizing preset used when `resources` is omitted.","type":"string","default":"t1.small","enum":["t1.nano","t1.micro","t1.small","t1.medium","t1.large","t1.xlarge","t1.2xlarge","t1.4xlarge","c1.nano","c1.micro","c1.small","c1.medium","c1.large","c1.xlarge","c1.2xlarge","c1.4xlarge","s1.nano","s1.micro","s1.small","s1.medium","s1.large","s1.xlarge","s1.2xlarge","s1.4xlarge","u1.nano","u1.micro","u1.small","u1.medium","u1.large","u1.xlarge","u1.2xlarge","u1.4xlarge","m1.nano","m1.micro","m1.small","m1.medium","m1.large","m1.xlarge","m1.2xlarge","m1.4xlarge","nano","micro","small","medium","large","xlarge","2xlarge"]},"size":{"description":"Persistent Volume size.","default":"10Gi","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"storageClass":{"description":"StorageClass used to store the data.","type":"string","default":""},"zones":{"description":"A map of zones for MultiZone topology. Each zone can have its own number of replicas and size.","type":"object","default":{},"additionalProperties":{"type":"object","properties":{"dataCenter":{"description":"SeaweedFS data center name for this zone. Defaults to the zone name.","type":"string"},"nodeSelector":{"description":"YAML nodeSelector for this zone (default: topology.kubernetes.io/zone: <zoneName>).","type":"string"},"pools":{"description":"A map of storage pools for this zone. Each pool creates a separate Volume StatefulSet per zone.","type":"object","additionalProperties":{"type":"object","required":["diskType"],"properties":{"diskType":{"description":"SeaweedFS disk type tag (e.g., \"ssd\", \"hdd\", \"nvme\").","type":"string"},"replicas":{"description":"Number of volume replicas. Defaults to volume.replicas (Simple) or zone.replicas/volume.replicas (MultiZone).","type":"integer"},"resources":{"description":"Explicit CPU and memory configuration. When omitted, the preset defined in `resourcesPreset` is applied.","type":"object","properties":{"cpu":{"description":"Number of CPU cores allocated.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Amount of memory allocated.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}},"resourcesPreset":{"description":"Default sizing preset used when `resources` is omitted. Defaults to volume.resourcesPreset.","type":"string","enum":["t1.nano","t1.micro","t1.small","t1.medium","t1.large","t1.xlarge","t1.2xlarge","t1.4xlarge","c1.nano","c1.micro","c1.small","c1.medium","c1.large","c1.xlarge","c1.2xlarge","c1.4xlarge","s1.nano","s1.micro","s1.small","s1.medium","s1.large","s1.xlarge","s1.2xlarge","s1.4xlarge","u1.nano","u1.micro","u1.small","u1.medium","u1.large","u1.xlarge","u1.2xlarge","u1.4xlarge","m1.nano","m1.micro","m1.small","m1.medium","m1.large","m1.xlarge","m1.2xlarge","m1.4xlarge","nano","micro","small","medium","large","xlarge","2xlarge"]},"size":{"description":"Persistent Volume size. Defaults to volume.size (Simple) or zone.size/volume.size (MultiZone).","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"storageClass":{"description":"Kubernetes StorageClass for the pool. Defaults to volume.storageClass.","type":"string"}}}},"replicas":{"description":"Number of replicas in the zone.","type":"integer"},"size":{"description":"Zone storage size.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"storageClass":{"description":"StorageClass used to store zone data. Defaults to volume.storageClass.","type":"string"}}}}}},"s3":{"description":"S3 service configuration.","type":"object","default":{},"properties":{"replicas":{"description":"Number of S3 replicas.","type":"integer","default":2},"resources":{"description":"Explicit CPU and memory configuration. When omitted, the preset defined in `resourcesPreset` is applied.","type":"object","default":{},"properties":{"cpu":{"description":"Number of CPU cores allocated.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Amount of memory allocated.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}},"resourcesPreset":{"description":"Default sizing preset used when `resources` is omitted.","type":"string","default":"t1.small","enum":["t1.nano","t1.micro","t1.small","t1.medium","t1.large","t1.xlarge","t1.2xlarge","t1.4xlarge","c1.nano","c1.micro","c1.small","c1.medium","c1.large","c1.xlarge","c1.2xlarge","c1.4xlarge","s1.nano","s1.micro","s1.small","s1.medium","s1.large","s1.xlarge","s1.2xlarge","s1.4xlarge","u1.nano","u1.micro","u1.small","u1.medium","u1.large","u1.xlarge","u1.2xlarge","u1.4xlarge","m1.nano","m1.micro","m1.small","m1.medium","m1.large","m1.xlarge","m1.2xlarge","m1.4xlarge","nano","micro","small","medium","large","xlarge","2xlarge"]}}}}}
   release:
     prefix: ""
     labels:
@@ -26,7 +26,7 @@ spec:
     description: Seaweedfs
     module: true
     icon: <svg width="144" height="144" viewBox="0 0 144 144" fill="none" xmlns="http://www.w3.org/2000/svg">
<rect width="144" height="144" rx="24" fill="url(#paint0_linear_679_1910)"/>
<path d="M138.685 121.057C138.685 126.652 136.462 132.017 132.504 135.973C128.547 139.929 123.179 142.151 117.582 142.151C111.985 142.151 106.618 139.929 102.66 135.973C98.7028 132.017 96.4795 126.652 96.4795 121.057C96.4795 118.287 97.0253 115.544 98.0858 112.985C99.1463 110.425 100.701 108.1 102.66 106.141C104.62 104.182 106.946 102.629 109.507 101.569C112.067 100.509 114.811 99.9629 117.582 99.9629C120.353 99.9629 123.098 100.509 125.658 101.569C128.218 102.629 130.544 104.182 132.504 106.141C134.464 108.1 136.018 110.425 137.079 112.985C138.139 115.544 138.685 118.287 138.685 121.057Z" fill="url(#paint1_radial_679_1910)"/>
<path d="M110.336 126.147H123.68V136.823H110.336V126.147Z" fill="#0F5E9C"/>
<path d="M119.27 112.294C119.27 112.714 119.178 113.131 119 113.519C118.821 113.908 118.56 114.261 118.23 114.558C117.901 114.855 117.509 115.091 117.079 115.252C116.648 115.413 116.186 115.496 115.72 115.496C114.778 115.496 113.875 115.158 113.21 114.558C112.544 113.957 112.17 113.143 112.17 112.294C112.17 111.445 112.544 110.63 113.21 110.03C113.875 109.429 114.778 109.092 115.72 109.092C116.186 109.092 116.648 109.175 117.079 109.336C117.509 109.496 117.901 109.732 118.23 110.03C118.56 110.327 118.821 110.68 119 111.068C119.178 111.457 119.27 111.873 119.27 112.294Z" fill="#59686F"/>
<path d="M128.11 114.103C128.11 114.953 127.736 115.767 127.07 116.368C126.404 116.968 125.501 117.305 124.56 117.305C124.094 117.305 123.632 117.223 123.201 117.062C122.771 116.901 122.379 116.665 122.05 116.368C121.72 116.07 121.458 115.717 121.28 115.329C121.102 114.94 121.01 114.524 121.01 114.103C121.01 113.683 121.102 113.266 121.28 112.878C121.458 112.49 121.72 112.137 122.05 111.839C122.379 111.542 122.771 111.306 123.201 111.145C123.632 110.984 124.094 110.901 124.56 110.901C125.501 110.901 126.404 111.239 127.07 111.839C127.736 112.44 128.11 113.254 128.11 114.103Z" fill="#59686F"/>
<path d="M122.333 118.976C122.333 119.826 121.958 120.64 121.293 121.241C120.627 121.841 119.724 122.178 118.782 122.178C118.316 122.178 117.855 122.096 117.424 121.935C116.993 121.774 116.602 121.538 116.272 121.241C115.943 120.943 115.681 120.59 115.503 120.202C115.324 119.813 115.232 119.397 115.232 118.976C115.232 118.556 115.324 118.14 115.503 117.751C115.681 117.363 115.943 117.01 116.272 116.712C116.602 116.415 116.993 116.179 117.424 116.018C117.855 115.857 118.316 115.774 118.782 115.774C119.724 115.774 120.627 116.112 121.293 116.712C121.958 117.313 122.333 118.127 122.333 118.976Z" fill="#59686F"/>
<path d="M115.308 121.905C113.735 121.426 115.707 120.68 115.429 120.573C114.653 120.276 115.73 119.333 116.74 118.539C117.628 117.841 117.659 117.839 117.892 118.468C118.024 118.823 118.371 119.206 118.665 119.319C119.289 119.558 120.951 119.269 120.951 118.835C120.951 118.223 121.415 118.699 121.794 119.531C122.457 120.987 122.437 122.472 121.45 122.472C120.859 122.472 120.31 122.691 120.19 123.147C115.046 124.6 116.471 123.284 115.308 121.905ZM123.094 118.054C121.609 117.466 120.547 114.838 120.547 113.309C120.547 111.323 122.541 109.095 124.317 109.095C128.315 109.095 130.684 112.261 128.838 118.409C128.385 119.919 123.933 118.387 123.094 118.054ZM125.866 115.649C127.544 114.474 125.857 111.755 123.981 112.61C122.479 113.294 123.119 116.115 124.77 116.164C124.961 116.169 125.454 115.938 125.866 115.649ZM124.339 114.579C123.771 114.381 123.803 113.256 124.383 113.034C124.902 112.835 125.604 113.398 125.604 114.014C125.604 114.489 124.936 114.787 124.339 114.579ZM112.319 116.98C109.96 115.67 110.286 111.006 112.417 108.965C114.396 107.069 118.778 107.103 119.764 109.462C120.415 111.021 120.228 112.6 119.398 114.077C118.194 116.219 114.242 118.049 112.319 116.98ZM116.56 113.593C117.325 112.901 117.297 112.06 116.572 111.259C115.777 110.379 114.692 110.345 114.035 111.347C113.524 112.127 113.431 112.528 113.943 113.309C114.58 114.28 115.67 114.399 116.56 113.593ZM114.374 112.34C114.128 111.698 114.985 110.981 115.68 111.247C115.974 111.36 116.164 111.718 116.102 112.044C115.961 112.785 114.632 113.012 114.374 112.34Z" fill="#D3D6DA"/>
<path d="M118.463 121.008L117.945 120.78C117.51 120.685 117.231 121.107 117.136 121.543L116.881 122.709C116.786 123.145 117.061 123.571 117.496 123.666L118.447 123.874C118.882 123.969 119.311 123.694 119.406 123.259L119.685 121.556C119.78 121.12 119.479 121.228 119.043 121.133L118.628 121.043C118.573 121.321 118.516 121.613 118.471 121.833C118.438 121.998 118.407 122.148 118.379 122.282C118.351 122.415 118.327 122.533 118.305 122.635C118.282 122.738 118.262 122.825 118.245 122.897C118.228 122.969 118.214 123.025 118.202 123.068C118.196 123.089 118.193 123.107 118.188 123.121C118.183 123.135 118.178 123.145 118.175 123.152C118.173 123.155 118.172 123.156 118.171 123.158C118.17 123.159 118.168 123.16 118.167 123.16L118.165 123.158C118.164 123.156 118.163 123.152 118.163 123.148C118.162 123.14 118.162 123.129 118.163 123.115C118.163 123.1 118.163 123.083 118.165 123.061C118.168 123.018 118.175 122.961 118.183 122.891C118.192 122.82 118.203 122.736 118.216 122.64C118.229 122.543 118.246 122.431 118.264 122.308C118.281 122.185 118.301 122.051 118.323 121.903C118.346 121.755 118.37 121.592 118.397 121.419C118.416 121.299 118.442 121.14 118.463 121.008Z" fill="#98C6D8"/>
<path d="M103.581 116.367C103.479 116.103 103.622 115.699 103.898 115.469C104.303 115.133 104.504 115.155 104.93 115.581C105.22 115.871 105.355 116.276 105.23 116.479C104.902 117.009 103.798 116.934 103.581 116.367Z" fill="#98C6D8"/>
<path d="M106.038 112.281C105.68 111.849 105.702 111.66 106.165 111.197C106.689 110.674 106.764 110.674 107.287 111.197C107.751 111.66 107.773 111.849 107.415 112.281C107.176 112.568 106.866 112.803 106.726 112.803C106.586 112.803 106.277 112.568 106.038 112.281Z" fill="#98C6D8"/>
<path d="M106.038 107.224C105.682 106.795 105.694 106.612 106.106 106.201C106.65 105.657 107.738 105.88 107.738 106.536C107.738 106.97 107.072 107.747 106.7 107.747C106.575 107.747 106.277 107.512 106.038 107.224Z" fill="#98C6D8"/>
<path d="M117.955 136.541C114.578 136.111 110.087 134.881 109.41 134.274C108.123 133.119 108.942 127.879 110.466 126.54C111.387 125.731 115.039 124.663 117.182 125.169C119.642 125.749 123.932 128.648 124.25 129.508C124.625 130.522 124.048 134.541 123.323 135.536C122.694 136.399 120.325 136.843 117.955 136.541ZM120.54 134.084C121.297 133.399 121.342 131.842 120.627 131.126C119.49 129.989 117.112 130.869 117.112 132.428C117.112 134.304 119.189 135.307 120.54 134.084ZM118.582 133.125C118.311 132.419 118.68 131.608 119.272 131.608C120 131.608 120.228 132.173 119.812 132.949C119.381 133.755 118.853 133.83 118.582 133.125ZM116.422 133.143C117.094 132.333 116.711 131.176 115.681 130.902C114.581 130.61 114.052 131.183 114.869 131.78C115.683 132.375 115.551 132.679 114.533 132.557C113.327 132.413 112.833 131.566 113.254 130.362C113.681 129.142 115.197 128.863 115.753 129.902C116.193 130.725 116.627 130.793 116.9 130.083C117.229 129.224 115.914 128.237 114.44 128.237C111.993 128.237 110.816 131.074 112.546 132.803C113.5 133.758 115.749 133.955 116.422 133.143Z" fill="#7BA9B9"/>
<path d="M120.118 138.592C118.751 137.297 121.916 136.096 123.606 138.283C124.469 139.322 122.853 139.976 120.118 138.592ZM106.12 135.658C104.751 134.289 106.963 133.904 108.581 135.23L109.941 135.92L108.059 136.061C107.215 136.062 106.343 135.881 106.12 135.658V135.658ZM125.363 127.866C125.082 127.41 128.333 126.267 128.688 126.486C128.846 126.584 128.975 127.337 128.975 128.161C128.975 129.239 128.84 129.658 128.49 129.658C128.222 129.658 125.476 128.047 125.363 127.866ZM118.641 121.095C114.871 120.753 115.378 119.327 116.361 118.499C116.928 118.021 117.34 117.779 117.913 117.667C117.913 117.667 117.872 119.046 118.666 119.319C119.297 119.536 120.278 119.064 120.471 118.675C122.188 115.201 121.415 118.699 121.794 119.532C123.238 124.007 120.188 121.73 118.641 121.095ZM104.912 121.23C104.242 120.487 103.693 119.729 103.693 119.544C103.693 119.116 104.746 119.112 105.863 119.537C106.593 119.814 110.347 120.006 110.347 121.153C110.347 121.899 108.89 123.762 108.726 123.762C108.563 123.762 105.583 121.972 104.912 121.23Z" fill="#A6B3C2"/>
<path d="M118.463 121.008C118.442 121.14 118.416 121.299 118.397 121.419C118.37 121.592 118.345 121.755 118.323 121.903C118.3 122.051 118.281 122.185 118.263 122.308C118.245 122.431 118.229 122.542 118.216 122.639C118.203 122.736 118.191 122.82 118.183 122.89C118.175 122.961 118.168 123.018 118.165 123.061C118.163 123.083 118.164 123.1 118.163 123.115C118.162 123.129 118.162 123.14 118.163 123.148C118.163 123.152 118.164 123.156 118.165 123.158L118.167 123.16C118.168 123.16 118.17 123.159 118.171 123.158C118.172 123.157 118.173 123.155 118.175 123.152C118.178 123.145 118.182 123.135 118.187 123.121C118.192 123.107 118.196 123.089 118.202 123.067C118.213 123.025 118.228 122.969 118.245 122.897C118.262 122.825 118.282 122.738 118.305 122.635C118.327 122.533 118.351 122.415 118.379 122.281C118.406 122.148 118.438 121.998 118.471 121.833C118.516 121.613 118.573 121.321 118.628 121.043L118.463 121.008Z" fill="#4C9CBB"/>
<path d="M30.9986 142.673C26.4489 140.916 21.4664 136.805 18.7921 132.603C15.4053 127.281 14.4052 123.419 15.0636 118.203C15.6806 113.315 17.3558 110.557 22.2232 106.413C29.0417 100.608 34.4846 97.9799 40.5947 97.5415C49.8212 96.8794 55.0978 99.8109 57.6465 107.015C58.5043 109.439 58.6856 115.57 58.0544 120.809C57.8311 122.663 57.4789 126.055 57.2718 128.348C56.5467 136.375 54.4147 140.417 49.6253 142.843C48.2979 143.516 47.7199 143.561 40.6924 143.539C33.5151 143.516 33.081 143.478 30.9986 142.673ZM0.0795765 104.965C0.0815723 103.853 0.144403 103.438 0.219427 104.044C0.294451 104.65 0.292899 105.56 0.215996 106.067C0.139079 106.573 0.0776838 106.078 0.0795765 104.965ZM0.00173351 102.24C0.0178992 101.848 0.0977897 101.768 0.205398 102.037C0.302772 102.28 0.290797 102.571 0.178787 102.683C0.0667748 102.795 -0.0129021 102.596 0.00173351 102.24ZM0.0283444 75.1326C0.0283444 74.6691 0.104857 74.4795 0.198369 74.7112C0.291884 74.943 0.291884 75.3222 0.198369 75.5539C0.104857 75.7857 0.0283444 75.5961 0.0283444 75.1326Z" fill="url(#paint2_radial_679_1910)"/>
<path d="M35.3133 112.544L37.9 111.091L39.3517 121.46L39.248 128.926L35.3703 130.851L32.9229 126.437L35.3133 112.544Z" fill="#3060AD"/>
<path d="M38.7295 116.69L39.3516 124.571L43.2919 125.919L43.3956 109.225L40.1812 110.054L38.7295 116.69Z" fill="#606368"/>
<path d="M35.3699 130.851C33.0324 129.73 29.7301 126.408 28.6621 124.103C28.0332 122.745 27.6397 122.31 26.8923 122.146C25.7879 121.903 25.8084 121.971 26.3218 120.258C26.5936 119.35 26.9032 118.954 27.3406 118.954C27.6862 118.954 29.1597 117.841 30.6149 116.48C32.0702 115.119 33.7226 113.677 34.2869 113.275L35.3129 112.544L35.6767 114.241C37.0443 120.618 37.027 124.266 35.6198 126.243C34.5521 127.744 34.8417 128.393 36.5791 128.393C37.397 128.393 37.8222 128.185 38.1305 127.634C38.6748 126.663 38.6315 120.968 38.0454 116.426C37.3446 110.995 37.3127 111.167 39.1578 110.398C40.036 110.031 40.818 109.797 40.8955 109.877C40.9731 109.956 40.8191 111.235 40.5534 112.718C39.6067 118.003 39.9315 123.238 41.2752 124.353C41.6851 124.693 41.7233 123.969 41.5452 119.232C41.3156 113.123 41.5174 110.919 42.4075 109.82C42.9198 109.188 43.213 109.116 44.4959 109.31C46.9566 109.682 46.9506 109.668 46.2099 113.254C45.8496 114.999 45.4483 117.224 45.318 118.2L45.0812 119.973L45.9446 119.645C46.4195 119.465 47.4413 118.994 48.2153 118.599L49.6226 117.881L49.3893 118.67C49.261 119.105 49.0672 120.701 48.9587 122.218L48.7614 124.976L47.1095 124.325C46.201 123.967 45.3116 123.674 45.1331 123.674C44.941 123.674 44.8085 125.532 44.8085 128.224C44.8085 131.891 44.7171 132.775 44.3386 132.775C41.0198 132.295 38.7842 132.458 35.3699 130.851Z" fill="#EEC23B"/>
<path d="M41.1639 132.418C41.1639 132.283 41.3408 130.515 41.6692 128.145C41.9977 125.775 42.3577 122.961 42.4692 121.893C42.5808 120.824 42.7969 120.027 42.9495 120.121C43.6443 120.551 44.2938 129.375 44.0474 131.42C43.8909 132.719 43.6595 132.737 43.3019 132.677C42.6602 132.57 41.9101 132.513 41.1639 132.418ZM32.5969 122.735C31.6813 122.583 30.8242 121.442 30.8242 120.374C30.8242 119.407 32.2381 117.937 33.1685 117.937C34.6666 117.937 35.8392 120.513 34.9484 121.847C34.5517 122.441 33.4147 122.87 32.5969 122.735Z" fill="white"/>
<path d="M114.021 137.498C107.318 135.74 106.273 134.104 106.609 125.891C106.716 123.281 106.885 120.539 106.986 119.797C107.545 115.664 108.342 112.173 109.086 110.599C109.744 109.206 109.842 108.712 109.535 108.342C108.45 107.035 110.371 104.995 111.91 105.819C112.457 106.111 112.918 106.077 113.945 105.665C117.062 104.419 123.117 105.571 126.814 108.115C128.149 109.033 128.485 109.136 129.038 108.791C130.523 107.863 132.451 110.573 131.25 111.9C130.787 112.412 130.755 112.705 131.065 113.596C131.85 115.846 131.794 116.104 128.006 127.719C125.58 135.16 124.543 137.365 123.264 137.811C121.653 138.373 116.723 138.206 114.021 137.498ZM122.541 135.229C123.003 134.541 123.359 133.313 123.513 131.878C123.794 129.25 123.819 129.283 120.317 127.601C117.685 126.338 113.833 125.972 111.855 126.798C110.829 127.227 110.595 127.556 110.059 129.327C109.116 132.443 109.703 134.308 111.832 134.958C113.139 135.357 120.09 136.43 120.98 136.37C121.504 136.335 122.082 135.912 122.541 135.229ZM119.451 122.42C119.63 122.081 119.685 121.556 119.685 121.556C120.156 121.654 120.48 121.683 120.726 121.719C121.105 121.774 121.564 121.587 121.745 121.303C122.149 120.671 120.474 117.701 119.548 117.408C118.668 117.128 115.935 118.827 115.935 119.653C115.935 120.022 116.553 120.411 116.831 120.518C116.982 120.576 117.252 120.738 117.576 120.938C117.38 121.351 117.346 121.478 117.312 121.724C117.204 122.498 117.435 122.686 118.416 122.912C119.151 122.991 119.25 122.845 119.451 122.42ZM127.265 116.836C130.933 113.475 127.074 107.41 122.705 109.67C121.626 110.228 120.654 112.019 120.654 113.449C120.654 115.664 122.831 117.937 124.957 117.941C125.733 117.943 126.414 117.617 127.265 116.836ZM117.141 115.622C119.035 114.468 119.804 111.795 118.802 109.857C118.082 108.464 117.008 107.83 115.366 107.83C111.508 107.83 109.485 113.234 112.465 115.578C113.57 116.448 115.754 116.468 117.141 115.622Z" fill="#0996D1"/>
<path opacity="0.9" d="M33.1757 26L32.381 27.219C31.9449 27.889 31.2836 29.3248 30.9091 30.4088C30.5347 31.4928 29.9922 32.9701 29.7043 33.6928C29.4163 34.4154 29.1733 36.115 29.1638 37.47C29.1436 40.353 28.7494 41.8888 27.6364 43.4225C26.9212 44.408 26.6751 44.5223 25.4532 44.441C23.8995 44.3377 22.8153 45.0815 21.217 47.3481C20.7165 48.058 20.1367 48.6393 19.9289 48.6393C19.7211 48.6393 19.1805 48.2319 18.7262 47.7351C18.2719 47.2382 17.9944 47.0115 18.111 47.2298C18.49 47.9396 17.5904 53.2615 16.8378 54.7642C15.967 56.5028 14.3872 57.7233 12.5354 58.0843C11.0059 58.3826 11.2283 58.09 8.71795 63.0946C6.66334 67.1907 5.96935 67.8264 2.65533 68.6542C1.49717 68.9434 0.458759 69.7142 0 70.5287V72.8263C0.356193 72.7473 0.828728 72.6203 1.61499 72.3873C2.99486 71.9782 4.82348 71.4806 5.6781 71.2806C7.72934 70.8006 9.39351 69.2195 9.92279 67.2467C10.2424 66.0554 10.7033 65.4241 11.9992 64.4058C13.284 63.3962 13.7565 62.7546 14.0671 61.5969C14.3739 60.4532 14.7011 60.004 15.4407 59.7063C17.0153 59.0724 20.6444 55.8655 21.2363 54.5858C21.5373 53.9349 22.1198 52.5399 22.5287 51.4862C23.2634 49.5932 25.0195 47.3261 25.7501 47.3261C25.9574 47.3261 27.109 46.7248 28.3093 45.9908C31.2376 44.2003 31.5991 43.4136 31.5991 38.8614C31.5991 35.6814 31.687 35.1557 32.3468 34.3684C33.0037 33.5847 33.0997 33.0249 33.1351 29.7391L33.1757 26ZM24.3338 63.5958C24.2037 63.6135 24.0738 63.6618 23.9258 63.7362C22.9397 64.2315 22.6136 64.9102 21.5973 68.586C21.0179 70.6815 20.4212 72.0819 19.8798 72.6178C19.4235 73.0695 18.9383 73.8823 18.801 74.4242C18.181 76.8715 16.7454 78.6073 14.4495 79.6871C12.4555 80.6249 10.6407 82.1179 9.11102 84.0798C8.32109 85.0929 7.48752 86.029 7.25678 86.1609C6.76164 86.444 5.70899 88.8941 4.60785 92.328C3.71092 95.125 1.71065 97.4682 0.478514 97.1658C0.254931 97.1109 0.106911 97.1137 0 97.2901V104.492C0.556411 103.664 1.2342 102.629 2.56347 100.54C4.34511 97.7397 6.46385 94.4867 7.27173 93.3124C8.0796 92.1381 9.35687 90.1488 10.1086 88.8916C11.2342 87.0092 12.1016 86.1243 15.0284 83.8833L18.5831 81.1627L20.4053 75.9881C23.1895 68.0817 23.9585 67.1997 27.7624 67.5515C29.4605 67.7085 30.6334 67.6196 32.0734 67.2267C34.1826 66.6512 34.4799 66.1872 33.3551 65.2318C32.6554 64.6376 31.3153 64.64 28.2388 65.2418C27.3397 65.4177 26.9343 65.2757 25.8932 64.4178C25.1051 63.7684 24.7241 63.5426 24.3338 63.5958ZM31.7166 83.2598C31.6605 83.2749 31.5921 83.3126 31.5115 83.3721C31.2709 83.55 30.6536 83.79 30.1379 83.9054C29.3876 84.0734 29.0498 84.4932 28.4482 86.0045C28.0347 87.0432 27.4915 88.1153 27.2412 88.3863C26.9909 88.6573 26.475 89.551 26.0941 90.3732C24.9422 92.8592 23.5282 94.0618 19.9011 95.6421C16.6107 97.0756 16.567 97.1086 15.6671 98.9802C15.1027 100.154 14.6792 101.757 14.5499 103.205C14.2731 106.302 13.5962 107.031 9.52118 108.616C5.91497 110.019 3.57702 111.745 3.41583 113.123C3.24041 114.623 2.59813 115.084 0.92926 114.907C0.539529 114.866 0.244332 114.851 0 114.881V121C1.02658 119.658 2.71922 118.361 6.22497 116.206C10.3604 113.665 12.7065 111.575 13.5779 109.654C13.926 108.887 14.6547 107.393 15.1971 106.334C15.7395 105.275 16.2845 103.901 16.4084 103.281C16.7324 101.66 18.3032 100.349 20.6659 99.726C25.177 98.5372 25.7461 98.0163 26.3525 94.5354C26.8561 91.6452 28.612 88.0661 30.5267 86.0246C31.3095 85.19 31.9495 84.18 31.9495 83.7791C31.9495 83.3766 31.8849 83.2146 31.7166 83.2598Z" fill="#359136"/>
<path d="M8.08177 74.4083C6.03419 73.8705 5.89443 73.7302 6.04271 72.3615C6.13025 71.5533 6.24017 70.8575 6.28696 70.8154C6.33376 70.7733 7.70443 71.0687 9.33292 71.4719C11.9768 72.1264 12.4866 72.1238 14.0947 71.4474C16.4041 70.476 17.2383 68.7753 16.4022 66.7431C15.9424 65.6257 14.9204 64.8281 12.2384 63.494C7.6417 61.2075 6.53062 59.999 6.27465 57.0076C5.89337 52.5519 8.84689 49.9836 14.3522 49.9836C15.9733 49.9836 17.8487 50.1937 18.5196 50.4505C19.6368 50.8781 19.6937 51.0399 19.1945 52.3712C18.7182 53.6416 18.5027 53.7688 17.4861 53.3796C15.5199 52.627 12.1948 52.8554 11.0058 53.8247C9.79058 54.8153 9.55736 56.9252 10.5324 58.1079C10.8727 58.5207 12.9087 59.779 15.0569 60.9041C18.4628 62.6881 19.082 63.2214 19.8951 65.0719C21.1152 67.8487 20.6788 70.3437 18.6078 72.4323C16.1607 74.9002 12.5413 75.5796 8.08177 74.4083ZM28.9328 74.3823C25.2365 72.9958 23.7138 70.5405 23.7138 65.9667C23.7138 62.5034 24.5588 60.4697 26.8333 58.4593C28.3964 57.0776 28.9867 56.8686 31.3268 56.8686C32.8168 56.8686 34.6821 57.2129 35.5005 57.6389C37.3169 58.5846 38.8319 61.7426 38.8466 64.6143L38.8573 66.7044H32.9423H27.0273L27.342 68.0569C27.515 68.8007 28.3354 70.0391 29.165 70.809C30.5773 72.1196 30.8949 72.1979 34.1547 72.0385C37.3938 71.8801 37.6463 71.9409 37.784 72.9122C37.9626 74.1725 37.1882 74.5236 33.5242 74.8434C31.8085 74.9932 30.1056 74.8222 28.9328 74.3823ZM35.0881 62.5242C34.9558 60.673 33.3644 59.3276 31.3072 59.3276C29.7086 59.3276 28.7281 60.0909 27.662 62.1655C26.7457 63.9486 27.412 64.2965 31.4488 64.1425L35.1936 63.9996L35.0881 62.5242ZM44.3914 74.3708C42.5711 73.5468 41.7059 72.1286 41.6421 69.8647C41.5416 66.2944 44.111 64.1468 49.2576 63.4994C51.8414 63.1744 52.0495 63.0577 51.7593 62.0969C50.965 59.4666 48.2423 58.5644 44.9276 59.8331C43.4303 60.4063 43.4868 60.4313 43.0514 59.0032C42.7801 58.1135 42.9982 57.8511 44.395 57.387C46.9364 56.5427 51.3745 56.6342 52.7779 57.56C54.9392 58.9857 55.3751 60.6019 55.5487 67.8328L55.7106 74.5745L54.123 74.574C53.0377 74.5733 52.5353 74.3396 52.5353 73.8354C52.5353 72.9066 52.0528 72.9024 50.752 73.8196C49.2013 74.913 46.1697 75.1757 44.3914 74.3708ZM50.9477 70.8175C51.7099 69.9735 52.0468 68.986 52.0468 67.5966V65.5929L49.8182 65.8458C45.719 66.311 43.8749 69.5118 46.5058 71.5953C48.0371 72.8079 49.3594 72.5763 50.9477 70.8175ZM92.002 74.5788C88.4024 73.4864 86.2419 70.2466 86.2419 65.941C86.2419 60.4042 89.5211 56.8325 94.641 56.7925C98.6989 56.7609 101.263 59.4679 101.503 64.0366L101.63 66.4585L96.2562 66.5885C93.3007 66.66 90.6158 66.816 90.2897 66.9351C89.3818 67.2668 90.4788 69.947 92.0306 71.1886C93.1599 72.0921 93.771 72.1912 96.8178 71.965C100.193 71.7144 100.318 71.7449 100.531 72.8684C100.73 73.9133 100.509 74.0835 98.3579 74.548C95.6103 75.1412 93.8829 75.1496 92.002 74.5788ZM97.9659 63.0823C97.9659 61.1231 96.1858 59.3276 94.2434 59.3276C92.2494 59.3276 90.1499 61.2562 90.1499 63.0878C90.1499 64.207 90.2797 64.2455 94.0579 64.2455C97.8414 64.2455 97.9659 64.2084 97.9659 63.0823ZM110.042 74.47C106.149 73.43 103.93 69.4029 104.54 64.4862C105.166 59.4442 107.951 56.8736 112.792 56.8705C115.374 56.869 115.805 57.0249 117.26 58.49C118.878 60.1185 119.941 62.8343 119.946 65.352L119.949 66.7044H114.087C108.488 66.7044 108.225 66.7501 108.225 67.7203C108.225 70.7122 110.952 72.3442 115.357 71.9882C118.136 71.7637 118.423 71.8315 118.667 72.7674C118.998 74.0443 118.968 74.072 116.69 74.6043C114.367 75.147 112.43 75.1078 110.042 74.47ZM116.119 62.7701C115.864 60.8787 114.159 59.3276 112.335 59.3276C110.566 59.3276 108.224 61.6014 108.224 63.3195C108.224 64.2128 108.527 64.2746 112.255 64.1424C116.241 64.0011 116.283 63.9862 116.119 62.7701ZM126.894 74.247C124.826 73.2208 123.532 71.3589 122.894 68.4889C121.975 64.3605 123.074 60.4914 125.83 58.1567C127.827 56.4657 131.838 56.3305 133.805 57.8879L135.092 58.9072V53.9536V49H137.046H139V61.7865V74.5731H137.29C135.762 74.5731 135.58 74.4331 135.58 73.2579V71.9427L134.481 72.9792C132.233 75.0998 129.525 75.5523 126.894 74.247ZM133.664 70.6766C134.976 69.3557 135.092 68.9537 135.092 65.7209C135.092 62.4572 134.985 62.0945 133.607 60.7076C132.365 59.4575 131.865 59.2622 130.554 59.5154C126.144 60.3672 124.835 68.1423 128.598 71.1229C130.348 72.5081 131.988 72.3635 133.664 70.6766ZM61.4107 66.0584C60.022 61.3754 58.8859 57.3919 58.8859 57.2062C58.8859 57.0206 59.7274 56.8686 60.7559 56.8686H62.6259L64.2551 63.8766C65.1512 67.731 65.956 70.6633 66.0437 70.3929C66.1313 70.1224 67.0557 67.0241 68.0978 63.5078L69.9926 57.1145H71.5969H73.2012L74.8865 63.2619C75.8134 66.643 76.6832 69.7412 76.8194 70.147C76.9557 70.5527 77.8419 67.731 78.789 63.8766L80.5109 56.8686H82.4517C83.9517 56.8686 84.3303 57.0316 84.119 57.586C83.9686 57.9806 82.6956 61.9641 81.2902 66.4382L78.7349 74.5731H76.9635H75.1921L73.5812 68.7945C72.6952 65.6163 71.8585 62.6841 71.7217 62.2783C71.4465 61.4616 71.5911 61.0733 69.1114 69.2863L67.5152 74.5731H65.7254H63.9356L61.4107 66.0584Z" fill="white"/>
<path d="M19.9746 119.274C19.0158 118.119 20.3381 116.166 21.5604 116.932C22.7632 117.686 22.3305 119.761 20.9704 119.761C20.645 119.761 20.1969 119.542 19.9746 119.274Z" fill="url(#paint3_radial_679_1910)"/>
<path d="M23.836 112.63C22.1152 111.689 21.8029 109.797 23.1465 108.453C24.0857 107.514 25.21 107.394 26.2507 108.123C27.8571 109.249 27.4655 112.013 25.6079 112.66C25.6079 112.66 24.4745 112.973 23.836 112.63Z" fill="url(#paint4_radial_679_1910)"/>
<path d="M33.7855 120.036C33.7855 120.188 33.7557 120.338 33.6976 120.479C33.6395 120.619 33.5544 120.746 33.4471 120.853C33.3398 120.961 33.2124 121.046 33.0723 121.104C32.9321 121.162 32.7818 121.192 32.6301 121.192C32.4783 121.192 32.3281 121.162 32.1879 121.104C32.0477 121.046 31.9203 120.961 31.813 120.853C31.7057 120.746 31.6206 120.619 31.5626 120.479C31.5045 120.338 31.4746 120.188 31.4746 120.036C31.4746 119.73 31.5963 119.436 31.813 119.219C32.0297 119.003 32.3236 118.881 32.6301 118.881C32.9365 118.881 33.2304 119.003 33.4471 119.219C33.6638 119.436 33.7855 119.73 33.7855 120.036Z" fill="black"/>
<path d="M120.721 118.276C120.721 118.623 120.565 118.956 120.287 119.201C120.009 119.446 119.632 119.584 119.239 119.584C118.846 119.584 118.469 119.446 118.191 119.201C117.913 118.956 117.757 118.623 117.757 118.276C117.757 118.105 117.795 117.935 117.87 117.776C117.944 117.617 118.053 117.473 118.191 117.352C118.329 117.23 118.492 117.134 118.672 117.068C118.851 117.003 119.044 116.969 119.239 116.969C119.433 116.969 119.626 117.003 119.806 117.068C119.986 117.134 120.149 117.23 120.287 117.352C120.424 117.473 120.533 117.617 120.608 117.776C120.682 117.935 120.721 118.105 120.721 118.276Z" fill="#59686F"/>
<defs>
<linearGradient id="paint0_linear_679_1910" x1="11" y1="-4.77768e-07" x2="164.5" y2="150.5" gradientUnits="userSpaceOnUse">
<stop stop-color="#64B7FF"/>
<stop offset="1" stop-color="#005DAD"/>
</linearGradient>
<radialGradient id="paint1_radial_679_1910" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(124.904 128.636) rotate(-0.048552) scale(36.2802 31.4032)">
<stop stop-color="#1177CE"/>
<stop offset="1" stop-color="#7EC7FF" stop-opacity="0"/>
</radialGradient>
<radialGradient id="paint2_radial_679_1910" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(39.3512 121.46) rotate(-0.0573) scale(50.2276 51.3091)">
<stop stop-color="#1177CE"/>
<stop offset="1" stop-color="#7EC7FF" stop-opacity="0"/>
</radialGradient>
<radialGradient id="paint3_radial_679_1910" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(20.9548 118.26) scale(1.30929 1.50127)">
<stop stop-color="#88A3D0"/>
<stop offset="1" stop-color="#5D83BF"/>
</radialGradient>
<radialGradient id="paint4_radial_679_1910" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(24.7843 110.221) scale(2.47277 2.56954)">
<stop stop-color="#88A3D0"/>
<stop offset="1" stop-color="#5D83BF"/>
</radialGradient>
</defs>
</svg>

-    keysOrder: [["apiVersion"], ["appVersion"], ["kind"], ["metadata"], ["metadata", "name"], ["spec", "host"], ["spec", "topology"], ["spec", "replicationFactor"], ["spec", "db"], ["spec", "db", "replicas"], ["spec", "db", "size"], ["spec", "db", "storageClass"], ["spec", "db", "resources"], ["spec", "db", "resourcesPreset"], ["spec", "master"], ["spec", "master", "replicas"], ["spec", "master", "resources"], ["spec", "master", "resourcesPreset"], ["spec", "filer"], ["spec", "filer", "replicas"], ["spec", "filer", "resources"], ["spec", "filer", "resourcesPreset"], ["spec", "filer", "grpcHost"], ["spec", "filer", "grpcPort"], ["spec", "filer", "whitelist"], ["spec", "volume"], ["spec", "volume", "replicas"], ["spec", "volume", "size"], ["spec", "volume", "storageClass"], ["spec", "volume", "diskType"], ["spec", "volume", "resources"], ["spec", "volume", "resourcesPreset"], ["spec", "volume", "zones"], ["spec", "volume", "pools"], ["spec", "s3"], ["spec", "s3", "replicas"], ["spec", "s3", "resources"], ["spec", "s3", "resourcesPreset"]]
+    keysOrder: [["apiVersion"], ["appVersion"], ["kind"], ["metadata"], ["metadata", "name"], ["spec", "host"], ["spec", "topology"], ["spec", "replicationFactor"], ["spec", "db"], ["spec", "db", "replicas"], ["spec", "db", "size"], ["spec", "db", "storageClass"], ["spec", "db", "resources"], ["spec", "db", "resourcesPreset"], ["spec", "master"], ["spec", "master", "replicas"], ["spec", "master", "resources"], ["spec", "master", "resourcesPreset"], ["spec", "master", "volumeSizeLimitMB"], ["spec", "filer"], ["spec", "filer", "replicas"], ["spec", "filer", "resources"], ["spec", "filer", "resourcesPreset"], ["spec", "filer", "grpcHost"], ["spec", "filer", "grpcPort"], ["spec", "filer", "whitelist"], ["spec", "volume"], ["spec", "volume", "replicas"], ["spec", "volume", "size"], ["spec", "volume", "storageClass"], ["spec", "volume", "diskType"], ["spec", "volume", "resources"], ["spec", "volume", "resourcesPreset"], ["spec", "volume", "zones"], ["spec", "volume", "pools"], ["spec", "s3"], ["spec", "s3", "replicas"], ["spec", "s3", "resources"], ["spec", "s3", "resourcesPreset"]]
   secrets:
     exclude: []
     include: []
diff --git a/packages/system/seaweedfs/Makefile b/packages/system/seaweedfs/Makefile
index cd938a4a55..3436e5f0fc 100644
--- a/packages/system/seaweedfs/Makefile
+++ b/packages/system/seaweedfs/Makefile
@@ -1,8 +1,50 @@
 export NAME=seaweedfs-system
+SEAWEEDFS_TAG=$(shell grep -F 'ARG VERSION=' images/seaweedfs/Dockerfile | cut -f2 -d=)
 
 include ../../../hack/common-envs.mk
 include ../../../hack/package.mk
 
+.PHONY: image
+image:
+	docker buildx build images/seaweedfs \
+		$(call image-tags,seaweedfs,$(SEAWEEDFS_TAG)) \
+		$(call cache-args,seaweedfs) \
+		--metadata-file images/seaweedfs.json \
+		$(BUILDX_ARGS)
+	REPOSITORY="$(REGISTRY)/seaweedfs" \
+		yq -i '.seaweedfs.image.repository = strenv(REPOSITORY)' values.yaml
+	TAG=$(IMAGE_TAG)@$$(yq e '."containerimage.digest"' images/seaweedfs.json -o json -r) \
+		yq -i '.seaweedfs.image.tag = strenv(TAG)' values.yaml
+	rm -f images/seaweedfs.json
+
+test:
+	helm unittest .
+	$(MAKE) test-guard-fail-closed
+	$(MAKE) test-image-version
+
+# The image replaces weed in the upstream image of ARG VERSION, so a chart moved
+# by `make update` without the Dockerfile would run the previous release's
+# binary under the new chart.
+.PHONY: test-image-version
+test-image-version:
+	@chart=$$(yq e '.appVersion' charts/seaweedfs/Chart.yaml); \
+	[ "$(SEAWEEDFS_TAG)" = "$$chart" ] \
+	  || { echo "FAIL: images/seaweedfs/Dockerfile builds $(SEAWEEDFS_TAG), the vendored chart is $$chart"; exit 1; }
+	@echo "ok: images/seaweedfs builds the chart's appVersion $(SEAWEEDFS_TAG)"
+
+# The naming guard refuses to render an UPGRADE that cannot see the cluster
+# (templates/naming-guard.yaml): a client-side lookup silently returns nothing,
+# which would classify a class-S tenant as net-new and rename its workloads away
+# from its data. helm-unittest 1.0.3 ignores release.isUpgrade, so .Release.IsUpgrade
+# always renders false there and the refusal branch gets NO unit coverage — the
+# suite passes with or without the canary. Verify with a real renderer instead.
+.PHONY: test-guard-fail-closed
+test-guard-fail-closed:
+	@out=$$(helm template seaweedfs-system . -n tenant-root --is-upgrade 2>&1); \
+	echo "$$out" | grep -q 'refusing to upgrade blind' \
+	  || { echo "FAIL: a blind upgrade rendered instead of refusing (naming-guard canary is not firing)"; echo "$$out" | head -5; exit 1; }
+	@echo "ok: naming guard refuses a blind upgrade"
+
 update:
 	rm -rf charts
 	mkdir -p charts
@@ -10,7 +52,44 @@ update:
 	curl -sSL https://github.com/seaweedfs/seaweedfs/archive/refs/tags/$${version}.tar.gz | \
 	tar xzvf - --strip 3 -C charts seaweedfs-$${version}/k8s/charts/seaweedfs
 	patch --no-backup-if-mismatch -p4 < patches/resize-api-server-annotation.diff
-	patch --no-backup-if-mismatch -p4 < patches/s3-traffic-distribution.patch
+	patch --no-backup-if-mismatch -p4 < patches/volume-resize-quantity.diff
 	patch --no-backup-if-mismatch -p4 < patches/disable-ca-key-rotation.patch
+	patch --no-backup-if-mismatch -p4 < patches/s3-tls-main-port.patch
+	patch --no-backup-if-mismatch -p4 < patches/s3-iceberg-port-explicit.patch
+	patch --no-backup-if-mismatch -p4 < patches/cosi-provisioner-sa-name.patch
+	patch --no-backup-if-mismatch -p4 < patches/cosi-bucket-class-lock-readonly.patch
+	patch --no-backup-if-mismatch -p4 < patches/s3-service-name.patch
+	patch --no-backup-if-mismatch -p4 < patches/s3-service-name-consumers.patch
+	patch --no-backup-if-mismatch -p4 < patches/cluster-scoped-names-per-namespace.patch
 	#patch --no-backup-if-mismatch -p4 < patches/retention-policy-delete.yaml
+	$(MAKE) update-image
+
+# Re-pins images/seaweedfs/Dockerfile to the vendored chart's appVersion: the
+# source archive checksum, the upstream image digest and upstream's builder
+# toolchain for that tag. The patches are Go, so they are checked against the
+# whole source tree of the tag; once a release carries a fix, its patch stops
+# applying here and is dropped.
+.PHONY: update-image
+update-image:
+	version=$$(yq e '.appVersion' charts/seaweedfs/Chart.yaml) && \
+	upstream=$$(docker buildx imagetools inspect "chrislusf/seaweedfs:$${version}" --format '{{json .Manifest}}' | yq e '.digest' -) && \
+	case "$$upstream" in sha256:*) ;; *) echo "ERROR: no digest for chrislusf/seaweedfs:$${version}" >&2; exit 1;; esac && \
+	$(SED_INPLACE) -e "s/^ARG VERSION=.*/ARG VERSION=$${version}/" -e "s/^ARG UPSTREAM_DIGEST=.*/ARG UPSTREAM_DIGEST=$${upstream}/" images/seaweedfs/Dockerfile && \
+	tmpdir=$$(mktemp -d) && \
+	{ curl --fail --silent --show-error --location -o "$$tmpdir/source.tar.gz" \
+		"https://github.com/seaweedfs/seaweedfs/archive/refs/tags/$${version}.tar.gz" && \
+		mkdir "$$tmpdir/src" && tar -xzf "$$tmpdir/source.tar.gz" --strip-components=1 -C "$$tmpdir/src" || { rm -rf "$$tmpdir"; exit 1; }; } && \
+	source=$$(sha256sum "$$tmpdir/source.tar.gz" | cut -d' ' -f1) && \
+	$(SED_INPLACE) "s/^ARG SOURCE_SHA256=.*/ARG SOURCE_SHA256=$${source}/" images/seaweedfs/Dockerfile && \
+	{ git -C "$$tmpdir/src" apply --check $(CURDIR)/images/seaweedfs/patches/*.diff || \
+		{ echo "ERROR: images/seaweedfs/patches/*.diff no longer apply to seaweedfs $${version}; regenerate them, or drop the ones the new tag already carries" >&2; \
+		rm -rf "$$tmpdir"; exit 1; }; } && \
+	golang=$$(sed -n 's/^FROM --platform=\$$BUILDPLATFORM \([^ ]*\) AS builder$$/\1/p' "$$tmpdir/src/docker/Dockerfile.go_build") && \
+	{ [ -n "$$golang" ] || { echo "ERROR: no builder FROM line in upstream docker/Dockerfile.go_build $${version}" >&2; rm -rf "$$tmpdir"; exit 1; }; } && \
+	builder=$$(docker buildx imagetools inspect "$$golang" --format '{{json .Manifest}}' | yq e '.digest' -) && \
+	{ case "$$builder" in sha256:*) ;; *) echo "ERROR: no digest for $${golang}" >&2; rm -rf "$$tmpdir"; exit 1;; esac; } && \
+	$(SED_INPLACE) "s|^FROM --platform=\$$BUILDPLATFORM [^ ]* AS builder$$|FROM --platform=\$$BUILDPLATFORM $${golang}@$${builder} AS builder|" images/seaweedfs/Dockerfile && \
+	{ grep -qF "FROM --platform=\$$BUILDPLATFORM $${golang}@$${builder} AS builder" images/seaweedfs/Dockerfile || \
+		{ echo "ERROR: the builder FROM line in images/seaweedfs/Dockerfile was not re-pinned; its shape no longer matches the update recipe" >&2; rm -rf "$$tmpdir"; exit 1; }; } && \
+	rm -rf "$$tmpdir"
 
diff --git a/packages/system/seaweedfs/charts/seaweedfs/Chart.yaml b/packages/system/seaweedfs/charts/seaweedfs/Chart.yaml
index 107149cfd1..bfb39d484a 100644
--- a/packages/system/seaweedfs/charts/seaweedfs/Chart.yaml
+++ b/packages/system/seaweedfs/charts/seaweedfs/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 description: SeaweedFS
 name: seaweedfs
-appVersion: "4.05"
+appVersion: "4.45"
 # Dev note: Trigger a helm chart release by `git tag -a helm-<version>`
-version: 4.0.405
+version: 4.45.0
diff --git a/packages/system/seaweedfs/charts/seaweedfs/README.md b/packages/system/seaweedfs/charts/seaweedfs/README.md
index 7f27cb22e1..f787f8bb42 100644
--- a/packages/system/seaweedfs/charts/seaweedfs/README.md
+++ b/packages/system/seaweedfs/charts/seaweedfs/README.md
@@ -1,6 +1,5 @@
 # SEAWEEDFS - helm chart (2.x+)
 
-## Getting Started
 
 ### Add the helm repo
 
@@ -23,8 +22,8 @@ helm install --values=values.yaml seaweedfs seaweedfs/seaweedfs
 ## Info:
 * master/filer/volume are stateful sets with anti-affinity on the hostname,
 so your deployment will be spread/HA.
-* chart is using memsql(mysql) as the filer backend to enable HA (multiple filer instances) and backup/HA memsql can provide.
-* mysql user/password are created in a k8s secret (secret-seaweedfs-db.yaml) and injected to the filer with ENV.
+* leveldb2 is the default filer backend; a mysql-compatible database (memsql, ...) enables HA (multiple filer instances) and the backup/HA it can provide.
+* with `filer.extraEnvironmentVars.WEED_MYSQL_ENABLED` set to `"true"`, mysql user/password are created in a k8s secret (default: `<release>-seaweedfs-db-secret`) and injected to the filer with ENV. On any other store neither the secret nor the `WEED_MYSQL_*` env, plain or secret-backed, is rendered.
 * cert config exists and can be enabled, but not been tested, requires cert-manager to be installed.
 
 ## Prerequisites
@@ -35,7 +34,9 @@ leveldb is the default database, this supports multiple filer replicas that will
 When the [limitations](https://github.com/seaweedfs/seaweedfs/wiki/Filer-Store-Replication#limitation) apply, or for a large number of filer replicas, an external datastore is recommended.
 
 Such as MySQL-compatible database, as specified in the `values.yaml` at `filer.extraEnvironmentVars`.
-This database should be pre-configured and initialized by running:
+This database should be pre-configured and initialized. If using the default `db-init-config`, the configmap name is now dynamic (e.g., `<release>-seaweedfs-db-init-config`). You can override this name via `filer.dbInitConfigName`.
+
+To initialize manually:
 ```sql
 CREATE TABLE IF NOT EXISTS `filemeta` (
   `dirhash`   BIGINT NOT NULL       COMMENT 'first 64 bits of MD5 hash value of directory field',
@@ -48,6 +49,35 @@ CREATE TABLE IF NOT EXISTS `filemeta` (
 
 Alternative database can also be configured (e.g. leveldb, postgres) following the instructions at `filer.extraEnvironmentVars`.
 
+#### RocksDB variant
+
+The `_large_disk_rocksdb` image tag ships with RocksDB pre-configured as the filer backend.
+To use this image with the Helm chart, override the image on all three components and disable
+the chart's default `WEED_LEVELDB2_ENABLED`, which would otherwise re-enable LevelDB2 and
+override the image's built-in RocksDB configuration:
+
+```yaml
+# Replace <VERSION> with the desired seaweedfs version, e.g. 3.80_large_disk_rocksdb.
+master:
+  imageOverride: chrislusf/seaweedfs:<VERSION>_large_disk_rocksdb
+
+volume:
+  imageOverride: chrislusf/seaweedfs:<VERSION>_large_disk_rocksdb
+
+filer:
+  enablePVC: true
+  imageOverride: chrislusf/seaweedfs:<VERSION>_large_disk_rocksdb
+  extraEnvironmentVars:
+    WEED_LEVELDB2_ENABLED: "false"
+```
+
+Notes:
+
+* `master` and `volume` use the same image tag so that all components share a consistent
+  SeaweedFS build; RocksDB itself is only used by the filer.
+* `filer.enablePVC: true` (or another form of persistent storage for the filer) is required
+  so that the RocksDB metadata store survives pod restarts — otherwise metadata will be lost.
+
 ### Node Labels
 Kubernetes nodes can have labels which help to define which node(Host) will run which pod:
 
@@ -77,6 +107,120 @@ https://github.com/rancher/local-path-provisioner
 you can use ANY storage class you like, just update the correct storage-class
 for your deployment.
 
+### Master data: hostPath vs a claim
+
+The master's `-mdir` holds its Raft log and snapshots, and with them the
+cluster's identity (its topology UUID). `master.data.type` defaults to
+`hostPath`, which does not follow a pod to another node: a master that is
+rescheduled comes back with an empty data directory and a brand new cluster
+UUID. With the chart's default of a single master replica there is no peer to
+recover the identity from either.
+
+Putting the master's data on a claim avoids that:
+
+```yaml
+master:
+  data:
+    type: "persistentVolumeClaim"
+    size: "1Gi"
+    storageClass: ""   # empty uses the cluster's default StorageClass
+```
+
+Raft state is small, so a modest claim is enough — sizing matters far more for
+volume and filer.
+
+The default is left at `hostPath` for backward compatibility:
+`volumeClaimTemplates` is immutable on a StatefulSet, so flipping the type on a
+release that already exists fails, whether the chart changes the default or you
+change it yourself:
+
+```text
+StatefulSet.apps "<release>-seaweedfs-master" is invalid: spec: Forbidden:
+updates to statefulset spec for fields other than 'replicas', ... are forbidden
+```
+
+New installs can set the claim from the start. To move an **existing** release
+onto a claim without losing the cluster UUID, use the migration below. The
+claim has to be seeded while the master is stopped: a running master rewrites
+its Raft state, so copying into a live pod is silently undone by the next
+restart.
+
+The steps below are for the chart's default of a single master
+(`master.replicas: 1`). With several master replicas, repeat steps 1, 3 and 4
+for every ordinal, or migrate one at a time and let the remaining quorum
+re-replicate.
+
+Take the names from the cluster rather than assembling them — the release
+name, `nameOverride` and `fullnameOverride` all feed the chart's fullname
+helper, so `<release>-seaweedfs` is not always right:
+
+```bash
+NS=<namespace>; REL=<release>
+# scope by instance as well as component: several releases can share a namespace
+STS=$(kubectl -n $NS get sts \
+        -l app.kubernetes.io/instance=$REL,app.kubernetes.io/component=master \
+        -o jsonpath='{.items[0].metadata.name}')
+POD=$STS-0
+# a StatefulSet names its claims <template>-<statefulset>-<ordinal>, and this
+# chart's template is data-<namespace>
+PVC=data-$NS-$STS-0
+
+# 1. back up the master data directory
+kubectl -n $NS cp $POD:/data ./master-backup
+
+# 2. stop the master, leaving the rest of the release running
+kubectl -n $NS delete sts $STS --cascade=orphan
+kubectl -n $NS delete pod $POD
+
+# 3. create the claim the new StatefulSet will adopt, and seed it through a
+#    pod that actually mounts it
+kubectl -n $NS apply -f - <<EOF
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: $PVC
+spec:
+  accessModes: ["ReadWriteOnce"]
+  resources:
+    requests:
+      storage: 1Gi
+---
+apiVersion: v1
+kind: Pod
+metadata:
+  name: seed
+spec:
+  containers:
+    - name: seed
+      image: alpine:3.20
+      command: ["sleep", "600"]
+      volumeMounts:
+        - name: d
+          mountPath: /data
+  volumes:
+    - name: d
+      persistentVolumeClaim:
+        claimName: $PVC
+EOF
+kubectl -n $NS wait --for=condition=Ready pod/seed --timeout=120s
+kubectl -n $NS cp ./master-backup/m9333 seed:/data/
+kubectl -n $NS exec seed -- ls /data/m9333    # conf, log, snapshot, state
+kubectl -n $NS delete pod seed
+
+# 4. upgrade; the StatefulSet adopts the claim you created
+helm upgrade $REL seaweedfs/seaweedfs -n $NS -f values.yaml
+```
+
+Confirm the UUID survived — it must match what the cluster reported before the
+migration:
+
+```bash
+kubectl -n $NS exec $POD -- curl -s localhost:9333/license/status
+```
+
+**Or accept a new cluster UUID** and, if you run the enterprise edition, have
+the license re-issued against it.
+
 ## current instances config (AIO):
 
 1 instance for each type (master/filer+s3/volume)
@@ -145,6 +289,32 @@ stringData:
   seaweedfs_s3_config: '{"identities":[{"name":"anvAdmin","credentials":[{"accessKey":"snu8yoP6QAlY0ne4","secretKey":"PNzBcmeLNEdR0oviwm04NQAicOrDH1Km"}],"actions":["Admin","Read","Write"]},{"name":"anvReadOnly","credentials":[{"accessKey":"SCigFee6c5lbi04A","secretKey":"kgFhbT38R8WUYVtiFQ1OiSVOrYr3NKku"}],"actions":["Read"]}]}'
 ```
 
+#### Source S3 credentials from an existing Secret
+
+To keep the keys out of `values.yaml` while still letting the chart generate the
+identities file, point an identity at an existing Secret:
+
+```yaml
+s3:
+  enabled: true
+  enableAuth: true
+  credentials:
+    admin:
+      existingSecret: minio-root
+      accessKeyKey: root-user
+      secretKeyKey: root-password
+```
+
+`accessKeyKey` and `secretKeyKey` default to the chart's own key names
+(`admin_access_key_id`, `admin_secret_access_key`, and the `read_` pair). The
+generated `seaweedfs_s3_config` references the keys as `${SEAWEEDFS_S3_ADMIN_ACCESS_KEY_ID}`
+and the gateway resolves them from the environment, which the chart wires up
+from the Secret. Nothing is read from the cluster at render time, so
+`helm template`, `--dry-run` and an Argo CD diff all render what an install
+applies. Rotating a key in the Secret takes effect on the next pod restart, as
+with any other environment variable. The COSI driver parses the config itself
+and does not resolve these references.
+
 ## Admin Component
 
 The admin component provides a modern web-based administration interface for managing SeaweedFS clusters. It includes:
@@ -164,8 +334,9 @@ admin:
   enabled: true
   port: 23646
   grpcPort: 33646  # For worker connections
-  adminUser: "admin"
-  adminPassword: "your-secure-password"  # Leave empty to disable auth
+  secret:
+    adminUser: "admin"
+    adminPassword: "your-secure-password"  # Leave empty to disable auth
   
   # Optional: persist admin data
   data:
@@ -190,6 +361,8 @@ If `adminPassword` is set, the admin interface requires authentication:
 
 If `adminPassword` is empty or not set, the admin interface runs without authentication (not recommended for production).
 
+As an alternative, a kubernetes Secret can be used (`admin.secret.existingSecret`).
+
 ### Admin Data Persistence
 
 The admin component can store configuration and maintenance data. You can configure storage in several ways:
@@ -211,8 +384,9 @@ To enable workers, add the following to your values.yaml:
 worker:
   enabled: true
   replicas: 2  # Scale based on workload
-  capabilities: "vacuum,balance,erasure_coding"  # Tasks this worker can handle
-  maxConcurrent: 3  # Maximum concurrent tasks per worker
+  jobType: "vacuum,volume_balance,erasure_coding"  # Job types this worker can handle
+  maxDetect: 1  # Maximum concurrent detection requests
+  maxExecute: 4  # Maximum concurrent execution jobs per worker
   
   # Working directory for task execution
   # Default: "/tmp/seaweedfs-worker"
@@ -247,14 +421,14 @@ worker:
       memory: "2Gi"
 ```
 
-### Worker Capabilities
+### Worker Job Types
 
-Workers can be configured with different capabilities:
+Workers can be configured with different job types:
 - **vacuum**: Reclaim deleted file space
-- **balance**: Balance volumes across volume servers
+- **volume_balance**: Balance volumes across volume servers
 - **erasure_coding**: Handle erasure coding operations
 
-You can configure workers with all capabilities or create specialized worker pools with specific capabilities.
+You can configure workers with all job types or create specialized worker pools with specific job types.
 
 ### Worker Deployment Strategy
 
@@ -263,11 +437,11 @@ For production deployments, consider:
 1. **Multiple Workers**: Deploy 2+ worker replicas for high availability
 2. **Resource Allocation**: Workers need sufficient CPU/memory for maintenance tasks
 3. **Storage**: Workers need temporary storage for vacuum and balance operations (size depends on volume size)
-4. **Specialized Workers**: Create separate worker deployments for different capabilities if needed
+4. **Specialized Workers**: Create separate worker deployments for different job types if needed
 
 Example specialized worker configuration:
 
-For specialized worker pools, deploy separate Helm releases with different capabilities:
+For specialized worker pools, deploy separate Helm releases with different job types:
 
 **values-worker-vacuum.yaml** (for vacuum operations):
 ```yaml
@@ -286,8 +460,8 @@ admin:
 worker:
   enabled: true
   replicas: 2
-  capabilities: "vacuum"
-  maxConcurrent: 2
+  jobType: "vacuum"
+  maxExecute: 2
   # REQUIRED: Point to the admin service of your main SeaweedFS release
   # Replace <namespace> with the namespace where your main seaweedfs is deployed
   # Example: If deploying in namespace "production":
@@ -312,8 +486,8 @@ admin:
 worker:
   enabled: true
   replicas: 1
-  capabilities: "balance"
-  maxConcurrent: 1
+  jobType: "volume_balance"
+  maxExecute: 1
   # REQUIRED: Point to the admin service of your main SeaweedFS release
   # Replace <namespace> with the namespace where your main seaweedfs is deployed
   # Example: If deploying in namespace "production":
@@ -322,6 +496,7 @@ worker:
 ```
 
 Deploy the specialized workers as separate releases:
+### Specialized Worker Deployment
 ```bash
 # Deploy vacuum workers
 helm install seaweedfs-worker-vacuum seaweedfs/seaweedfs -f values-worker-vacuum.yaml
@@ -330,7 +505,99 @@ helm install seaweedfs-worker-vacuum seaweedfs/seaweedfs -f values-worker-vacuum
 helm install seaweedfs-worker-balance seaweedfs/seaweedfs -f values-worker-balance.yaml
 ```
 
+## Network Policies
+
+In a namespace with a default-deny policy the install hangs: the components cannot resolve each other, and the post-install bucket hook waits on the master and filer until it gives up. `networkPolicy.enabled` renders one `NetworkPolicy` per component, selecting its pods by the standard `app.kubernetes.io/{name,instance,component}` labels and admitting traffic from the other pods of the release on the ports that component listens on.
+
+```bash
+helm install seaweedfs seaweedfs/seaweedfs --set networkPolicy.enabled=true
+```
+
+That alone leaves outbound traffic untouched, which is enough when the namespace's default-deny only restricts ingress. If it lists `Egress` in its `policyTypes` too - the usual baseline - the components still cannot resolve DNS, and you need the second opt-in below as well.
+
+Egress is separate because the chart knows where its own components live but not where your filer store, notification sink or remote tier does, and because in a namespace with no default-deny at all, adding egress rules would narrow the components from "may reach anything" to "may reach these peers":
+
+```yaml
+networkPolicy:
+  enabled: true
+  egress:
+    enabled: true
+    kubeApiServer:
+      # the endpoint behind the kubernetes service, not its ClusterIP
+      cidrs: ["172.18.0.2/32"]
+    extraEgress:
+      - to:
+          - podSelector:
+              matchLabels:
+                app.kubernetes.io/name: postgresql
+        ports:
+          - protocol: TCP
+            port: 5432
+```
+
+`kubeApiServer.cidrs` is only demanded when something in the release actually needs the API server, which is the COSI sidecar and, on an upgrade that grows a volume PVC, the resize hook. No seaweedfs component itself speaks to it.
+
+Anything reaching the release from outside - an ingress controller, a Prometheus in another namespace - goes into `networkPolicy.extraIngress`, or into `networkPolicy.components.<component>.extraIngress` for a single component. See the `networkPolicy` block in `values.yaml` for the full set.
+
+Two things worth knowing before you turn this on:
+
+- **Monitoring stops.** The metrics ports are admitted from release pods like every other port, so with `global.seaweedfs.monitoring.enabled` the ServiceMonitors keep scraping targets a Prometheus in another namespace can no longer reach. Nothing reports it; add the scraper's namespace to `extraIngress`.
+- **The resize hook's policy is a Helm hook.** Its Job runs before the release manifest is applied, so the policy has to be a `pre-install` hook too. Helm does not garbage-collect hook resources, so on an upgrade that grows a volume PVC the policy is created and then left behind on uninstall - delete `<release>-seaweedfs-volume-resize-hook` by hand if it bothers you.
+
+The DNS selectors default to CoreDNS as kubeadm, kind and the managed offerings from AWS, Google and Azure install it. On OpenShift, override `egress.dnsNamespaceSelector` and `egress.dnsPodSelector` to match `openshift-dns`; see the comment in `values.yaml`.
+
+## OpenShift Support
+
+SeaweedFS can be deployed on OpenShift or any cluster enforcing the Kubernetes "restricted" Pod Security Standard. By default, OpenShift blocks containers that run as root or use `hostPath` volumes.
+
+To deploy on OpenShift, use the provided `openshift-values.yaml` which overrides the default configuration to:
+1. Use `PersistentVolumeClaims` instead of `hostPath`.
+2. Enable `runAsNonRoot` and omit hardcoded UIDs to allow OpenShift to assign valid UIDs automatically.
+3. Apply appropriate `seccompProfile` and drop capabilities.
+
+Usage:
+```bash
+helm install seaweedfs seaweedfs/seaweedfs \
+  -n seaweedfs --create-namespace \
+  -f openshift-values.yaml
+```
+
 ## Enterprise
 
 For enterprise users, please visit [seaweedfs.com](https://seaweedfs.com) for the SeaweedFS Enterprise Edition, 
-which has a self-healing storage format with better data protection.
+which has advanced features, including data recovery, self-healing storage, customizable erasure coding, EC vacuum and repair, etc.
+
+To run it, set the image and point the chart at a Secret holding the license
+file:
+
+```bash
+kubectl create secret generic seaweedfs-license -n <namespace> \
+  --from-file=seaweed-license.json=/path/to/seaweed-license.json
+```
+
+```yaml
+global:
+  seaweedfs:
+    image:
+      name: chrislusf/seaweedfs-enterprise
+    license:
+      existingSecret: seaweedfs-license
+      # secretKey: seaweed-license.json     # key within the Secret
+      # mountPath: /etc/seaweedfs/license   # directory it is mounted at
+```
+
+Set the image globally rather than per component: a per-component
+`imageOverride` wins, and a cluster that mixes editions comes up looking
+healthy with enterprise features quietly off.
+
+Only the master reads the license, so the Secret is mounted read-only there
+and on all-in-one (which runs `weed server -master`). It is mounted as a
+directory, not a `subPath`, so a renewed Secret reaches the running master —
+which re-reads the file periodically — without a restart.
+
+The license is tied to the cluster UUID kept in the master's Raft state, so put
+`master.data` on a claim — a master that restarts onto an empty data directory
+generates a new UUID and the license stops matching. See
+[Master data](#master-data-hostpath-vs-a-claim). Check the binding with
+`kubectl exec <master-pod> -- curl -s localhost:9333/license/status`
+(`cluster_uuid` must equal `license_uuid`).
diff --git a/packages/system/seaweedfs/charts/seaweedfs/ci/default-values.yaml b/packages/system/seaweedfs/charts/seaweedfs/ci/default-values.yaml
new file mode 100644
index 0000000000..e964005fb6
--- /dev/null
+++ b/packages/system/seaweedfs/charts/seaweedfs/ci/default-values.yaml
@@ -0,0 +1 @@
+# Default configuration, kept so chart-testing still installs the chart as-is.
diff --git a/packages/system/seaweedfs/charts/seaweedfs/ci/sftp-values.yaml b/packages/system/seaweedfs/charts/seaweedfs/ci/sftp-values.yaml
new file mode 100644
index 0000000000..13a8b725b8
--- /dev/null
+++ b/packages/system/seaweedfs/charts/seaweedfs/ci/sftp-values.yaml
@@ -0,0 +1,5 @@
+# SFTP install: the pod only becomes ready if the server loads a host key
+# from the generated sftp-ssh-secret, so this exercises the whole path.
+sftp:
+  enabled: true
+  enableAuth: true
diff --git a/packages/system/seaweedfs/charts/seaweedfs/dashboards/seaweedfs-grafana-dashboard.json b/packages/system/seaweedfs/charts/seaweedfs/dashboards/seaweedfs-grafana-dashboard.json
index ca08b7d050..25fb8b2d57 100644
--- a/packages/system/seaweedfs/charts/seaweedfs/dashboards/seaweedfs-grafana-dashboard.json
+++ b/packages/system/seaweedfs/charts/seaweedfs/dashboards/seaweedfs-grafana-dashboard.json
@@ -1168,6 +1168,108 @@
       "title": "Filer QPS",
       "type": "timeseries"
     },
+    {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "${DS_PROMETHEUS}"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 0,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "insertNulls": false,
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "never",
+            "spanNulls": false,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "mappings": [],
+          "min": 0,
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "short",
+          "unitScale": true
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 7,
+        "w": 24,
+        "x": 0,
+        "y": 28
+      },
+      "id": 91,
+      "links": [],
+      "options": {
+        "legend": {
+          "calcs": [
+            "lastNotNull",
+            "max"
+          ],
+          "displayMode": "table",
+          "placement": "right",
+          "showLegend": true,
+          "width": 250
+        },
+        "tooltip": {
+          "mode": "multi",
+          "sort": "desc"
+        }
+      },
+      "pluginVersion": "10.3.1",
+      "targets": [
+        {
+          "exemplar": true,
+          "expr": "sum by (code) (rate(SeaweedFS_upload_error_total{namespace=\"$NAMESPACE\"}[$__rate_interval]))",
+          "format": "time_series",
+          "interval": "",
+          "intervalFactor": 2,
+          "legendFormat": "{{code}}",
+          "refId": "A",
+          "step": 30
+        }
+      ],
+      "title": "Upload Errors",
+      "type": "timeseries"
+    },
     {
       "collapsed": false,
       "datasource": {
@@ -1178,7 +1280,7 @@
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 28
+        "y": 35
       },
       "id": 61,
       "panels": [],
@@ -1251,7 +1353,7 @@
         "h": 7,
         "w": 8,
         "x": 0,
-        "y": 29
+        "y": 36
       },
       "id": 65,
       "links": [],
@@ -1357,7 +1459,7 @@
         "h": 7,
         "w": 8,
         "x": 8,
-        "y": 29
+        "y": 36
       },
       "id": 56,
       "links": [],
@@ -1463,7 +1565,7 @@
         "h": 7,
         "w": 8,
         "x": 16,
-        "y": 29
+        "y": 36
       },
       "id": 58,
       "links": [],
@@ -1520,7 +1622,7 @@
         "h": 7,
         "w": 12,
         "x": 0,
-        "y": 36
+        "y": 43
       },
       "id": 84,
       "links": [],
@@ -1539,7 +1641,7 @@
       "pluginVersion": "10.3.1",
       "targets": [
         {
-          "expr": "sum(rate(SeaweedFS_s3_bucket_traffic_received_bytes_total{namespace=\"$NAMESPACE\"}[$__interval])) by (bucket)",
+          "expr": "sum(rate(SeaweedFS_s3_bucket_traffic_received_bytes_total{namespace=\"$NAMESPACE\"}[$__rate_interval])) by (bucket)",
           "format": "time_series",
           "hide": false,
           "intervalFactor": 2,
@@ -1565,7 +1667,7 @@
         "h": 7,
         "w": 12,
         "x": 12,
-        "y": 36
+        "y": 43
       },
       "id": 85,
       "links": [],
@@ -1584,7 +1686,7 @@
       "pluginVersion": "10.3.1",
       "targets": [
         {
-          "expr": "sum(rate(SeaweedFS_s3_bucket_traffic_sent_bytes_total{namespace=\"$NAMESPACE\"}[$__interval])) by (bucket)",
+          "expr": "sum(rate(SeaweedFS_s3_bucket_traffic_sent_bytes_total{namespace=\"$NAMESPACE\"}[$__rate_interval])) by (bucket)",
           "format": "time_series",
           "hide": false,
           "intervalFactor": 2,
@@ -1661,7 +1763,7 @@
         "h": 7,
         "w": 12,
         "x": 0,
-        "y": 41
+        "y": 48
       },
       "id": 86,
       "options": {
@@ -1679,7 +1781,7 @@
       "pluginVersion": "10.3.1",
       "targets": [
         {
-          "expr": "sum(rate(SeaweedFS_s3_request_total{namespace=\"$NAMESPACE\"}[$__interval])) by (bucket)",
+          "expr": "sum(rate(SeaweedFS_s3_request_total{namespace=\"$NAMESPACE\"}[$__rate_interval])) by (bucket)",
           "format": "time_series",
           "hide": false,
           "intervalFactor": 2,
@@ -1756,7 +1858,7 @@
         "h": 7,
         "w": 12,
         "x": 12,
-        "y": 41
+        "y": 48
       },
       "id": 72,
       "links": [],
@@ -1874,7 +1976,7 @@
         "h": 7,
         "w": 24,
         "x": 0,
-        "y": 50
+        "y": 57
       },
       "id": 73,
       "links": [],
@@ -2030,7 +2132,7 @@
         "h": 7,
         "w": 24,
         "x": 0,
-        "y": 57
+        "y": 64
       },
       "id": 55,
       "links": [],
@@ -2187,7 +2289,7 @@
         "h": 7,
         "w": 24,
         "x": 0,
-        "y": 64
+        "y": 71
       },
       "hideTimeOverride": false,
       "id": 59,
@@ -2259,7 +2361,7 @@
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 71
+        "y": 78
       },
       "id": 62,
       "panels": [],
@@ -2331,7 +2433,7 @@
         "h": 7,
         "w": 12,
         "x": 0,
-        "y": 72
+        "y": 79
       },
       "id": 47,
       "links": [],
@@ -2474,7 +2576,7 @@
         "h": 7,
         "w": 12,
         "x": 12,
-        "y": 72
+        "y": 79
       },
       "id": 40,
       "links": [],
@@ -2571,7 +2673,7 @@
         "h": 7,
         "w": 24,
         "x": 0,
-        "y": 79
+        "y": 86
       },
       "id": 48,
       "links": [],
@@ -2681,7 +2783,7 @@
         "h": 7,
         "w": 24,
         "x": 0,
-        "y": 86
+        "y": 93
       },
       "id": 50,
       "links": [],
@@ -2783,7 +2885,7 @@
         "h": 7,
         "w": 24,
         "x": 0,
-        "y": 93
+        "y": 100
       },
       "id": 51,
       "links": [],
@@ -2823,7 +2925,7 @@
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 93
+        "y": 100
       },
       "id": 63,
       "panels": [],
@@ -2896,7 +2998,7 @@
         "h": 7,
         "w": 12,
         "x": 0,
-        "y": 101
+        "y": 108
       },
       "id": 12,
       "links": [],
@@ -2991,7 +3093,7 @@
         "h": 7,
         "w": 12,
         "x": 12,
-        "y": 101
+        "y": 108
       },
       "id": 14,
       "links": [],
@@ -3033,7 +3135,7 @@
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 108
+        "y": 115
       },
       "id": 64,
       "panels": [],
@@ -3106,7 +3208,7 @@
         "h": 7,
         "w": 12,
         "x": 0,
-        "y": 109
+        "y": 116
       },
       "id": 52,
       "links": [],
@@ -3234,7 +3336,7 @@
         "h": 7,
         "w": 12,
         "x": 12,
-        "y": 109
+        "y": 116
       },
       "id": 54,
       "links": [],
@@ -3331,7 +3433,7 @@
         "h": 7,
         "w": 24,
         "x": 0,
-        "y": 116
+        "y": 123
       },
       "id": 53,
       "links": [],
@@ -3426,7 +3528,7 @@
         "h": 7,
         "w": 12,
         "x": 0,
-        "y": 48
+        "y": 55
       },
       "id": 89,
       "options": {
@@ -3533,7 +3635,7 @@
         "h": 7,
         "w": 12,
         "x": 12,
-        "y": 48
+        "y": 55
       },
       "id": 90,
       "options": {
@@ -3564,6 +3666,291 @@
       ],
       "title": "S3 Bucket Object Count",
       "type": "timeseries"
+    },
+    {
+      "collapsed": false,
+      "datasource": {
+        "type": "prometheus",
+        "uid": "${DS_PROMETHEUS}"
+      },
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 130
+      },
+      "id": 92,
+      "panels": [],
+      "title": "Filer Object Size Distribution",
+      "type": "row"
+    },
+    {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "${DS_PROMETHEUS}"
+      },
+      "description": "Rate of new objects created, split by size range.",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "objects/s",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 25,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "insertNulls": false,
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 4,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "auto",
+            "spanNulls": false,
+            "stacking": {
+              "group": "A",
+              "mode": "normal"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              }
+            ]
+          },
+          "unit": "short",
+          "unitScale": true
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 0,
+        "y": 131
+      },
+      "id": 93,
+      "links": [],
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "pluginVersion": "8.1.2",
+      "targets": [
+        {
+          "exemplar": true,
+          "expr": "sum(rate(SeaweedFS_filer_object_size_bytes_bucket{le=\"1024\",namespace=\"$NAMESPACE\"}[$__rate_interval]))",
+          "format": "time_series",
+          "hide": false,
+          "instant": false,
+          "interval": "",
+          "intervalFactor": 2,
+          "legendFormat": "< 1KB",
+          "refId": "A",
+          "step": 60
+        },
+        {
+          "exemplar": true,
+          "expr": "clamp_min(sum(rate(SeaweedFS_filer_object_size_bytes_bucket{le=\"102400\",namespace=\"$NAMESPACE\"}[$__rate_interval])) - sum(rate(SeaweedFS_filer_object_size_bytes_bucket{le=\"1024\",namespace=\"$NAMESPACE\"}[$__rate_interval])), 0)",
+          "format": "time_series",
+          "hide": false,
+          "instant": false,
+          "interval": "",
+          "intervalFactor": 2,
+          "legendFormat": "1KB - 100KB",
+          "refId": "B",
+          "step": 60
+        },
+        {
+          "exemplar": true,
+          "expr": "clamp_min(sum(rate(SeaweedFS_filer_object_size_bytes_bucket{le=\"1.048576e+06\",namespace=\"$NAMESPACE\"}[$__rate_interval])) - sum(rate(SeaweedFS_filer_object_size_bytes_bucket{le=\"102400\",namespace=\"$NAMESPACE\"}[$__rate_interval])), 0)",
+          "format": "time_series",
+          "hide": false,
+          "instant": false,
+          "interval": "",
+          "intervalFactor": 2,
+          "legendFormat": "100KB - 1MB",
+          "refId": "C",
+          "step": 60
+        },
+        {
+          "exemplar": true,
+          "expr": "clamp_min(sum(rate(SeaweedFS_filer_object_size_bytes_bucket{le=\"1.048576e+08\",namespace=\"$NAMESPACE\"}[$__rate_interval])) - sum(rate(SeaweedFS_filer_object_size_bytes_bucket{le=\"1.048576e+06\",namespace=\"$NAMESPACE\"}[$__rate_interval])), 0)",
+          "format": "time_series",
+          "hide": false,
+          "instant": false,
+          "interval": "",
+          "intervalFactor": 2,
+          "legendFormat": "1MB - 100MB",
+          "refId": "D",
+          "step": 60
+        },
+        {
+          "exemplar": true,
+          "expr": "clamp_min(sum(rate(SeaweedFS_filer_object_size_bytes_bucket{le=\"1.073741824e+09\",namespace=\"$NAMESPACE\"}[$__rate_interval])) - sum(rate(SeaweedFS_filer_object_size_bytes_bucket{le=\"1.048576e+08\",namespace=\"$NAMESPACE\"}[$__rate_interval])), 0)",
+          "format": "time_series",
+          "hide": false,
+          "instant": false,
+          "interval": "",
+          "intervalFactor": 2,
+          "legendFormat": "100MB - 1GB",
+          "refId": "E",
+          "step": 60
+        },
+        {
+          "exemplar": true,
+          "expr": "clamp_min(sum(rate(SeaweedFS_filer_object_size_bytes_count{namespace=\"$NAMESPACE\"}[$__rate_interval])) - sum(rate(SeaweedFS_filer_object_size_bytes_bucket{le=\"1.073741824e+09\",namespace=\"$NAMESPACE\"}[$__rate_interval])), 0)",
+          "format": "time_series",
+          "hide": false,
+          "instant": false,
+          "interval": "",
+          "intervalFactor": 2,
+          "legendFormat": "> 1GB",
+          "refId": "F",
+          "step": 60
+        }
+      ],
+      "title": "Filer Object Write Rate by Size Range",
+      "type": "timeseries"
+    },
+    {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "${DS_PROMETHEUS}"
+      },
+      "description": "Objects created per size range over the selected time window.",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "mappings": [],
+          "min": 0,
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              }
+            ]
+          },
+          "unit": "short"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 12,
+        "y": 131
+      },
+      "id": 94,
+      "options": {
+        "displayMode": "gradient",
+        "orientation": "horizontal",
+        "reduceOptions": {
+          "calcs": [
+            "lastNotNull"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "showUnfilled": true,
+        "valueMode": "color"
+      },
+      "pluginVersion": "8.1.2",
+      "targets": [
+        {
+          "exemplar": true,
+          "expr": "sum(increase(SeaweedFS_filer_object_size_bytes_bucket{le=\"1024\",namespace=\"$NAMESPACE\"}[$__range]))",
+          "format": "time_series",
+          "instant": true,
+          "interval": "",
+          "intervalFactor": 2,
+          "legendFormat": "< 1KB",
+          "refId": "A"
+        },
+        {
+          "exemplar": true,
+          "expr": "clamp_min(sum(increase(SeaweedFS_filer_object_size_bytes_bucket{le=\"102400\",namespace=\"$NAMESPACE\"}[$__range])) - sum(increase(SeaweedFS_filer_object_size_bytes_bucket{le=\"1024\",namespace=\"$NAMESPACE\"}[$__range])), 0)",
+          "format": "time_series",
+          "instant": true,
+          "interval": "",
+          "intervalFactor": 2,
+          "legendFormat": "1KB - 100KB",
+          "refId": "B"
+        },
+        {
+          "exemplar": true,
+          "expr": "clamp_min(sum(increase(SeaweedFS_filer_object_size_bytes_bucket{le=\"1.048576e+06\",namespace=\"$NAMESPACE\"}[$__range])) - sum(increase(SeaweedFS_filer_object_size_bytes_bucket{le=\"102400\",namespace=\"$NAMESPACE\"}[$__range])), 0)",
+          "format": "time_series",
+          "instant": true,
+          "interval": "",
+          "intervalFactor": 2,
+          "legendFormat": "100KB - 1MB",
+          "refId": "C"
+        },
+        {
+          "exemplar": true,
+          "expr": "clamp_min(sum(increase(SeaweedFS_filer_object_size_bytes_bucket{le=\"1.048576e+08\",namespace=\"$NAMESPACE\"}[$__range])) - sum(increase(SeaweedFS_filer_object_size_bytes_bucket{le=\"1.048576e+06\",namespace=\"$NAMESPACE\"}[$__range])), 0)",
+          "format": "time_series",
+          "instant": true,
+          "interval": "",
+          "intervalFactor": 2,
+          "legendFormat": "1MB - 100MB",
+          "refId": "D"
+        },
+        {
+          "exemplar": true,
+          "expr": "clamp_min(sum(increase(SeaweedFS_filer_object_size_bytes_bucket{le=\"1.073741824e+09\",namespace=\"$NAMESPACE\"}[$__range])) - sum(increase(SeaweedFS_filer_object_size_bytes_bucket{le=\"1.048576e+08\",namespace=\"$NAMESPACE\"}[$__range])), 0)",
+          "format": "time_series",
+          "instant": true,
+          "interval": "",
+          "intervalFactor": 2,
+          "legendFormat": "100MB - 1GB",
+          "refId": "E"
+        },
+        {
+          "exemplar": true,
+          "expr": "clamp_min(sum(increase(SeaweedFS_filer_object_size_bytes_count{namespace=\"$NAMESPACE\"}[$__range])) - sum(increase(SeaweedFS_filer_object_size_bytes_bucket{le=\"1.073741824e+09\",namespace=\"$NAMESPACE\"}[$__range])), 0)",
+          "format": "time_series",
+          "instant": true,
+          "interval": "",
+          "intervalFactor": 2,
+          "legendFormat": "> 1GB",
+          "refId": "F"
+        }
+      ],
+      "title": "Filer Object Size Distribution",
+      "type": "bargauge"
     }
   ],
   "refresh": "",
@@ -3654,4 +4041,4 @@
   "uid": "a24009d7-cbda-4443-a132-1cc1c4677304",
   "version": 1,
   "weekStart": ""
-}
\ No newline at end of file
+}
diff --git a/packages/system/seaweedfs/charts/seaweedfs/openshift-values.yaml b/packages/system/seaweedfs/charts/seaweedfs/openshift-values.yaml
new file mode 100644
index 0000000000..3846f72979
--- /dev/null
+++ b/packages/system/seaweedfs/charts/seaweedfs/openshift-values.yaml
@@ -0,0 +1,132 @@
+# openshift-values.yaml
+#
+# Example overrides for deploying SeaweedFS on OpenShift (or any cluster
+# enforcing the Kubernetes "restricted" Pod Security Standard).
+#
+# OpenShift's default "restricted" SCC blocks containers that:
+#   - Run as UID 0 (root)
+#   - Request privilege escalation
+#   - Use hostPath volumes
+#   - Omit a seccompProfile
+#
+# These overrides satisfy all four requirements by:
+#   1. Replacing hostPath volumes with PersistentVolumeClaims (or emptyDir for logs)
+#   2. Enabling runAsNonRoot: true. By omitting runAsUser, OpenShift will
+#      automatically assign a valid UID from the namespace's allocated range.
+#   3. Dropping all Linux capabilities and setting allowPrivilegeEscalation: false
+#   4. Enabling RuntimeDefault seccompProfile
+#
+# Usage:
+#   helm install seaweedfs seaweedfs/seaweedfs \
+#     -n seaweedfs --create-namespace \
+#     -f openshift-values.yaml
+#
+# Adjust storageClass and sizes to match your cluster's available StorageClasses.
+# On OpenShift you can discover them with: oc get storageclass
+global:
+  enableReplication: true
+  #  replication type is XYZ:
+  # X number of replica in other data centers
+  # Y number of replica in other racks in the same data center
+  # Z number of replica in other servers in the same rack
+  replicationPlacement: "000" # no data replica
+master:
+  replicas: 1
+  data:
+    type: "persistentVolumeClaim"
+    size: "10Gi"
+    storageClass: ""        # leave empty to use the cluster default StorageClass
+
+  logs:
+    type: "emptyDir"        # avoids hostPath; use persistentVolumeClaim if you need log persistence
+
+  podSecurityContext:
+    enabled: true
+    # On OpenShift, we omit runAsUser/runAsGroup/fsGroup to let the admission
+    # controller assign them automatically based on the namespace's SCC.
+    runAsNonRoot: true
+
+  containerSecurityContext:
+    enabled: true
+    allowPrivilegeEscalation: false
+    capabilities:
+      drop: ["ALL"]
+    runAsNonRoot: true
+    seccompProfile:
+      type: RuntimeDefault
+
+volume:
+  replicas: 1
+  dataDirs:
+    - name: data1
+      type: "persistentVolumeClaim"
+      size: "100Gi"
+      storageClass: ""      # leave empty to use the cluster default StorageClass
+      maxVolumes: 0
+
+  logs:
+    type: "emptyDir"
+
+  podSecurityContext:
+    enabled: true
+    # On OpenShift, we omit runAsUser/runAsGroup/fsGroup to let the admission
+    # controller assign them automatically based on the namespace's SCC.
+    runAsNonRoot: true
+
+  containerSecurityContext:
+    enabled: true
+    allowPrivilegeEscalation: false
+    capabilities:
+      drop: ["ALL"]
+    runAsNonRoot: true
+    seccompProfile:
+      type: RuntimeDefault
+
+filer:
+  replicas: 1
+  data:
+    type: "persistentVolumeClaim"
+    size: "25Gi"
+    storageClass: ""        # leave empty to use the cluster default StorageClass
+
+  logs:
+    type: "emptyDir"
+
+  podSecurityContext:
+    enabled: true
+    # On OpenShift, we omit runAsUser/runAsGroup/fsGroup to let the admission
+    # controller assign them automatically based on the namespace's SCC.
+    runAsNonRoot: true
+
+  containerSecurityContext:
+    enabled: true
+    allowPrivilegeEscalation: false
+    capabilities:
+      drop: ["ALL"]
+    runAsNonRoot: true
+    seccompProfile:
+      type: RuntimeDefault
+
+# S3 gateway (if enabled)
+s3:
+  enabled: true
+  replicas: 1
+  port: 8333
+  enableAuth: true
+  podSecurityContext:
+    enabled: true
+    # On OpenShift, we omit runAsUser/runAsGroup/fsGroup to let the admission
+    # controller assign them automatically based on the namespace's SCC.
+    runAsNonRoot: true
+
+  logs:
+    type: "emptyDir"
+
+  containerSecurityContext:
+    enabled: true
+    allowPrivilegeEscalation: false
+    capabilities:
+      drop: ["ALL"]
+    runAsNonRoot: true
+    seccompProfile:
+      type: RuntimeDefault
diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/admin/admin-ingress.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/admin/admin-ingress.yaml
index 216ef8a86e..d5106d1635 100644
--- a/packages/system/seaweedfs/charts/seaweedfs/templates/admin/admin-ingress.yaml
+++ b/packages/system/seaweedfs/charts/seaweedfs/templates/admin/admin-ingress.yaml
@@ -8,7 +8,7 @@ apiVersion: extensions/v1beta1
 {{- end }}
 kind: Ingress
 metadata:
-  name: ingress-{{ template "seaweedfs.name" . }}-admin
+  name: ingress-{{ include "seaweedfs.fullname" . }}-admin
   namespace: {{ .Release.Namespace }}
   annotations:
   {{- if and (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) .Values.admin.ingress.className }}
@@ -42,11 +42,11 @@ spec:
         backend:
 {{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }}
           service:
-            name: {{ template "seaweedfs.name" . }}-admin
+            name: {{ include "seaweedfs.componentName" (list . "admin") }}
             port:
               number: {{ .Values.admin.port }}
 {{- else }}
-          serviceName: {{ template "seaweedfs.name" . }}-admin
+          serviceName: {{ include "seaweedfs.componentName" (list . "admin") }}
           servicePort: {{ .Values.admin.port }}
 {{- end }}
 {{- end }}
diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/admin/admin-secret.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/admin/admin-secret.yaml
index bc10445652..a04a3cc2c0 100644
--- a/packages/system/seaweedfs/charts/seaweedfs/templates/admin/admin-secret.yaml
+++ b/packages/system/seaweedfs/charts/seaweedfs/templates/admin/admin-secret.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
 kind: Secret
 type: Opaque
 metadata:
-  name: {{ template "seaweedfs.name" . }}-admin-secret
+  name: {{ include "seaweedfs.fullname" . }}-admin-secret
   namespace: {{ .Release.Namespace }}
   annotations:
     "helm.sh/resource-policy": keep
diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/admin/admin-service.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/admin/admin-service.yaml
index 825049a44f..baf79610c3 100644
--- a/packages/system/seaweedfs/charts/seaweedfs/templates/admin/admin-service.yaml
+++ b/packages/system/seaweedfs/charts/seaweedfs/templates/admin/admin-service.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ template "seaweedfs.name" . }}-admin
+  name: {{ include "seaweedfs.componentName" (list . "admin") }}
   namespace: {{ .Release.Namespace }}
   labels:
     app.kubernetes.io/name: {{ template "seaweedfs.name" . }}
@@ -15,22 +15,28 @@ metadata:
     {{- toYaml .Values.admin.service.annotations | nindent 4 }}
 {{- end }}
 spec:
-  type: {{ .Values.admin.service.type }}
+  {{- $serviceType := .Values.admin.service.type }}
+  {{- $nodePorts := dict }}
+  {{- if or (eq $serviceType "NodePort") (eq $serviceType "LoadBalancer") }}
+  {{- $nodePorts = .Values.admin.service.nodePorts | default dict }}
+  {{- end }}
+  type: {{ $serviceType }}
+  {{- include "seaweedfs.service.loadBalancerFields" .Values.admin.service }}
   ports:
   - name: "http"
     port: {{ .Values.admin.port }}
     targetPort: {{ .Values.admin.port }}
+    {{- if $nodePorts.http }}
+    nodePort: {{ $nodePorts.http }}
+    {{- end }}
     protocol: TCP
   - name: "grpc"
     port: {{ .Values.admin.grpcPort }}
     targetPort: {{ .Values.admin.grpcPort }}
+    {{- if $nodePorts.grpc }}
+    nodePort: {{ $nodePorts.grpc }}
+    {{- end }}
     protocol: TCP
-  {{- if .Values.admin.metricsPort }}
-  - name: "metrics"
-    port: {{ .Values.admin.metricsPort }}
-    targetPort: {{ .Values.admin.metricsPort }}
-    protocol: TCP
-  {{- end }}
   selector:
     app.kubernetes.io/name: {{ template "seaweedfs.name" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/admin/admin-servicemonitor.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/admin/admin-servicemonitor.yaml
index 271197a3a0..b73a15404d 100644
--- a/packages/system/seaweedfs/charts/seaweedfs/templates/admin/admin-servicemonitor.yaml
+++ b/packages/system/seaweedfs/charts/seaweedfs/templates/admin/admin-servicemonitor.yaml
@@ -1,10 +1,10 @@
+{{- include "seaweedfs.compat" . -}}
 {{- if .Values.admin.enabled }}
-{{- if .Values.admin.metricsPort }}
-{{- if .Values.global.monitoring.enabled }}
+{{- if .Values.global.seaweedfs.monitoring.enabled }}
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
-  name: {{ template "seaweedfs.name" . }}-admin
+  name: {{ include "seaweedfs.fullname" . }}-admin
   namespace: {{ .Release.Namespace }}
   labels:
     app.kubernetes.io/name: {{ template "seaweedfs.name" . }}
@@ -12,7 +12,7 @@ metadata:
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/component: admin
-    {{- with .Values.global.monitoring.additionalLabels }}
+    {{- with .Values.global.seaweedfs.monitoring.additionalLabels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
 {{- with .Values.admin.serviceMonitor.annotations }}
@@ -22,12 +22,12 @@ metadata:
 spec:
   endpoints:
     - interval: 30s
-      port: metrics
+      port: http
       scrapeTimeout: 5s
   selector:
     matchLabels:
       app.kubernetes.io/name: {{ template "seaweedfs.name" . }}
+      app.kubernetes.io/instance: {{ .Release.Name }}
       app.kubernetes.io/component: admin
 {{- end }}
 {{- end }}
-{{- end }}
diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/admin/admin-statefulset.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/admin/admin-statefulset.yaml
index 208f73d185..ad112981f3 100644
--- a/packages/system/seaweedfs/charts/seaweedfs/templates/admin/admin-statefulset.yaml
+++ b/packages/system/seaweedfs/charts/seaweedfs/templates/admin/admin-statefulset.yaml
@@ -1,11 +1,15 @@
+{{- include "seaweedfs.compat" . -}}
 {{- if .Values.admin.enabled }}
-{{- if and (not .Values.admin.masters) (not .Values.global.masterServer) (not .Values.master.enabled) }}
-{{- fail "admin.masters or global.masterServer must be set if master.enabled is false" -}}
+{{- if gt (.Values.admin.replicas | int) 1 }}
+{{- fail "admin.replicas must be 0 or 1" -}}
+{{- end }}
+{{- if and (not .Values.admin.masters) (not .Values.global.seaweedfs.masterServer) (not .Values.master.enabled) }}
+{{- fail "admin.masters or global.seaweedfs.masterServer must be set if master.enabled is false" -}}
 {{- end }}
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
-  name: {{ template "seaweedfs.name" . }}-admin
+  name: {{ include "seaweedfs.componentName" (list . "admin") }}
   namespace: {{ .Release.Namespace }}
   labels:
     app.kubernetes.io/name: {{ template "seaweedfs.name" . }}
@@ -18,7 +22,7 @@ metadata:
     {{- toYaml .Values.admin.annotations | nindent 4 }}
 {{- end }}
 spec:
-  serviceName: {{ template "seaweedfs.name" . }}-admin
+  serviceName: {{ include "seaweedfs.componentName" (list . "admin") }}
   podManagementPolicy: {{ .Values.admin.podManagementPolicy }}
   replicas: {{ .Values.admin.replicas }}
   selector:
@@ -47,7 +51,7 @@ spec:
       {{- toYaml . | nindent 8 }}
       {{- end }}
     spec:
-      restartPolicy: {{ default .Values.global.restartPolicy .Values.admin.restartPolicy }}
+      restartPolicy: {{ default .Values.global.seaweedfs.restartPolicy .Values.admin.restartPolicy }}
       {{- if .Values.admin.affinity }}
       affinity:
         {{ tpl .Values.admin.affinity . | nindent 8 | trim }}
@@ -65,6 +69,9 @@ spec:
       {{- if .Values.admin.priorityClassName }}
       priorityClassName: {{ .Values.admin.priorityClassName | quote }}
       {{- end }}
+      {{- if .Values.admin.schedulerName }}
+      schedulerName: {{ .Values.admin.schedulerName | quote }}
+      {{- end }}
       enableServiceLinks: false
       {{- if .Values.admin.serviceAccountName }}
       serviceAccountName: {{ .Values.admin.serviceAccountName | quote }}
@@ -78,24 +85,28 @@ spec:
       {{- end }}
       containers:
         - name: seaweedfs
-          image: {{ template "admin.image" . }}
-          imagePullPolicy: {{ default "IfNotPresent" .Values.global.imagePullPolicy }}
+          image: {{ template "seaweedfs.admin.image" . }}
+          imagePullPolicy: {{ default "IfNotPresent" .Values.global.seaweedfs.imagePullPolicy }}
           {{- $adminAuthEnabled := or .Values.admin.secret.existingSecret .Values.admin.secret.adminPassword }}
+          {{- $urlPrefix := .Values.admin.urlPrefix }}
+          {{- if and (not $urlPrefix) .Values.admin.ingress.enabled (ne .Values.admin.ingress.path "/") }}
+          {{- $urlPrefix = trimSuffix "/" .Values.admin.ingress.path }}
+          {{- end }}
           {{- if and .Values.admin.secret.existingSecret (not .Values.admin.secret.userKey) -}}
           {{-   fail "admin.secret.userKey must be set when admin.secret.existingSecret is provided" -}}
           {{- end -}}
           {{- if and .Values.admin.secret.existingSecret (not .Values.admin.secret.pwKey) -}}
           {{-   fail "admin.secret.pwKey must be set when admin.secret.existingSecret is provided" -}}
           {{- end -}}
-          {{- $adminSecretName := .Values.admin.secret.existingSecret | default (printf "%s-admin-secret" (include "seaweedfs.name" .)) }}
+          {{- $adminSecretName := .Values.admin.secret.existingSecret | default (printf "%s-admin-secret" (include "seaweedfs.fullname" .)) }}
           env:
             {{- if $adminAuthEnabled }}
-            - name: SEAWEEDFS_ADMIN_USER
+            - name: WEED_ADMIN_USER
               valueFrom:
                 secretKeyRef:
                   name: {{ $adminSecretName }}
                   key: {{ if .Values.admin.secret.existingSecret }}{{ .Values.admin.secret.userKey }}{{ else }}adminUser{{ end }}
-            - name: SEAWEEDFS_ADMIN_PASSWORD
+            - name: WEED_ADMIN_PASSWORD
               valueFrom:
                 secretKeyRef:
                   name: {{ $adminSecretName }}
@@ -114,27 +125,25 @@ spec:
                 fieldRef:
                   fieldPath: metadata.namespace
             - name: SEAWEEDFS_FULLNAME
-              value: "{{ template "seaweedfs.name" . }}"
-            {{- if .Values.admin.extraEnvironmentVars }}
-            {{- range $key, $value := .Values.admin.extraEnvironmentVars }}
+              value: "{{ include "seaweedfs.fullname" . }}"
+            {{- $mergedExtraEnvironmentVars := dict }}
+            {{- include "seaweedfs.mergeExtraEnvironmentVars" (dict "global" .Values.global.seaweedfs "component" .Values.admin "target" $mergedExtraEnvironmentVars) }}
+            {{- range $key := keys $mergedExtraEnvironmentVars | sortAlpha }}
+            {{- $value := index $mergedExtraEnvironmentVars $key }}
             - name: {{ $key }}
             {{- if kindIs "string" $value }}
-              value: {{ $value | quote }}
+              value: {{ tpl $value $ | quote }}
             {{- else }}
               valueFrom:
                 {{ toYaml $value | nindent 16 | trim }}
             {{- end -}}
             {{- end }}
-            {{- end }}
-            {{- if .Values.global.extraEnvironmentVars }}
-            {{- range $key, $value := .Values.global.extraEnvironmentVars }}
+            {{- $secretExtraEnvironmentVars := .Values.admin.secretExtraEnvironmentVars }}
+            {{- if $secretExtraEnvironmentVars }}
+            {{- range $key := keys $secretExtraEnvironmentVars | sortAlpha }}
+            {{- $value := index $secretExtraEnvironmentVars $key }}
             - name: {{ $key }}
-            {{- if kindIs "string" $value }}
-              value: {{ $value | quote }}
-            {{- else }}
-              valueFrom:
-                {{ toYaml $value | nindent 16 | trim }}
-            {{- end -}}
+              valueFrom: {{ toYaml $value | nindent 16 }}
             {{- end }}
             {{- end }}
           command:
@@ -150,7 +159,7 @@ spec:
               {{- if .Values.admin.loggingOverrideLevel }}
               -v={{ .Values.admin.loggingOverrideLevel }} \
               {{- else }}
-              -v={{ .Values.global.loggingLevel }} \
+              -v={{ .Values.global.seaweedfs.loggingLevel }} \
               {{- end }}
               admin \
               -port={{ .Values.admin.port }} \
@@ -160,16 +169,15 @@ spec:
               {{- else if .Values.admin.dataDir }}
               -dataDir={{ .Values.admin.dataDir }} \
               {{- end }}
-              {{- if $adminAuthEnabled }}
-              -adminUser="${SEAWEEDFS_ADMIN_USER}" \
-              -adminPassword="${SEAWEEDFS_ADMIN_PASSWORD}" \
-              {{- end }}
               {{- if .Values.admin.masters }}
-              -masters={{ .Values.admin.masters }}{{- if .Values.admin.extraArgs }} \{{ end }}
-              {{- else if .Values.global.masterServer }}
-              -masters={{ .Values.global.masterServer }}{{- if .Values.admin.extraArgs }} \{{ end }}
+              -masters={{ .Values.admin.masters }}{{- if or $urlPrefix .Values.admin.extraArgs }} \{{ end }}
+              {{- else if .Values.global.seaweedfs.masterServer }}
+              -masters={{ .Values.global.seaweedfs.masterServer }}{{- if or $urlPrefix .Values.admin.extraArgs }} \{{ end }}
               {{- else }}
-              -masters={{ range $index := until (.Values.master.replicas | int) }}${SEAWEEDFS_FULLNAME}-master-{{ $index }}.${SEAWEEDFS_FULLNAME}-master.{{ $.Release.Namespace }}:{{ $.Values.master.port }}{{ if lt $index (sub ($.Values.master.replicas | int) 1) }},{{ end }}{{ end }}{{- if .Values.admin.extraArgs }} \{{ end }}
+              -masters={{ range $index := until (.Values.master.replicas | int) }}${SEAWEEDFS_FULLNAME}-master-{{ $index }}.${SEAWEEDFS_FULLNAME}-master.{{ $.Release.Namespace }}:{{ $.Values.master.port }}{{ if lt $index (sub ($.Values.master.replicas | int) 1) }},{{ end }}{{ end }}{{- if or $urlPrefix .Values.admin.extraArgs }} \{{ end }}
+              {{- end }}
+              {{- if $urlPrefix }}
+              -urlPrefix={{ $urlPrefix }}{{- if .Values.admin.extraArgs }} \{{ end }}
               {{- end }}
               {{- range $index, $arg := .Values.admin.extraArgs }}
               {{ $arg }}{{- if lt $index (sub (len $.Values.admin.extraArgs) 1) }} \{{ end }}
@@ -183,11 +191,13 @@ spec:
             - name: admin-logs
               mountPath: /logs
             {{- end }}
-            {{- if .Values.global.enableSecurity }}
+            {{- if include "seaweedfs.securityConfigEnabled" . }}
             - name: security-config
               readOnly: true
               mountPath: /etc/seaweedfs/security.toml
               subPath: security.toml
+            {{- end }}
+            {{- if .Values.global.seaweedfs.enableSecurity }}
             - name: ca-cert
               readOnly: true
               mountPath: /usr/local/share/ca-certificates/ca/
@@ -213,14 +223,10 @@ spec:
               name: http
             - containerPort: {{ .Values.admin.grpcPort }}
               name: grpc
-            {{- if .Values.admin.metricsPort }}
-            - containerPort: {{ .Values.admin.metricsPort }}
-              name: metrics
-            {{- end }}
           {{- if .Values.admin.readinessProbe.enabled }}
           readinessProbe:
             httpGet:
-              path: {{ .Values.admin.readinessProbe.httpGet.path }}
+              path: {{ if $urlPrefix }}{{ $urlPrefix }}{{ end }}{{ .Values.admin.readinessProbe.httpGet.path }}
               port: http
               scheme: {{ .Values.admin.readinessProbe.httpGet.scheme }}
             initialDelaySeconds: {{ .Values.admin.readinessProbe.initialDelaySeconds }}
@@ -232,7 +238,7 @@ spec:
           {{- if .Values.admin.livenessProbe.enabled }}
           livenessProbe:
             httpGet:
-              path: {{ .Values.admin.livenessProbe.httpGet.path }}
+              path: {{ if $urlPrefix }}{{ $urlPrefix }}{{ end }}{{ .Values.admin.livenessProbe.httpGet.path }}
               port: http
               scheme: {{ .Values.admin.livenessProbe.httpGet.scheme }}
             initialDelaySeconds: {{ .Values.admin.livenessProbe.initialDelaySeconds }}
@@ -249,7 +255,7 @@ spec:
           securityContext: {{- omit .Values.admin.containerSecurityContext "enabled" | toYaml | nindent 12 }}
           {{- end }}
       {{- if .Values.admin.sidecars }}
-      {{- include "common.tplvalues.render" (dict "value" .Values.admin.sidecars "context" $) | nindent 8 }}
+      {{- include "seaweedfs.tplvalues.render" (dict "value" .Values.admin.sidecars "context" $) | nindent 8 }}
       {{- end }}
       volumes:
         {{- if eq .Values.admin.data.type "hostPath" }}
@@ -282,35 +288,37 @@ spec:
           persistentVolumeClaim:
             claimName: {{ .Values.admin.logs.claimName }}
         {{- end }}
-        {{- if .Values.global.enableSecurity }}
+        {{- if include "seaweedfs.securityConfigEnabled" . }}
         - name: security-config
           configMap:
-            name: {{ template "seaweedfs.name" . }}-security-config
+            name: {{ include "seaweedfs.fullname" . }}-security-config
+        {{- end }}
+        {{- if .Values.global.seaweedfs.enableSecurity }}
         - name: ca-cert
           secret:
-            secretName: {{ template "seaweedfs.name" . }}-ca-cert
+            secretName: {{ include "seaweedfs.fullname" . }}-ca-cert
         - name: master-cert
           secret:
-            secretName: {{ template "seaweedfs.name" . }}-master-cert
+            secretName: {{ include "seaweedfs.fullname" . }}-master-cert
         - name: volume-cert
           secret:
-            secretName: {{ template "seaweedfs.name" . }}-volume-cert
+            secretName: {{ include "seaweedfs.fullname" . }}-volume-cert
         - name: filer-cert
           secret:
-            secretName: {{ template "seaweedfs.name" . }}-filer-cert
+            secretName: {{ include "seaweedfs.fullname" . }}-filer-cert
         - name: client-cert
           secret:
-            secretName: {{ template "seaweedfs.name" . }}-client-cert
+            secretName: {{ include "seaweedfs.fullname" . }}-client-cert
         - name: admin-cert
           secret:
-            secretName: {{ template "seaweedfs.name" . }}-admin-cert
+            secretName: {{ include "seaweedfs.fullname" . }}-admin-cert
         {{- end }}
         {{ tpl .Values.admin.extraVolumes . | indent 8 | trim }}
       {{- if .Values.admin.nodeSelector }}
       nodeSelector:
         {{ tpl .Values.admin.nodeSelector . | indent 8 | trim }}
       {{- end }}
-  {{- $pvc_exists := include "admin.pvc_exists" . -}}
+  {{- $pvc_exists := include "seaweedfs.admin.pvc_exists" . -}}
   {{- if $pvc_exists }}
   volumeClaimTemplates:
     {{- if eq .Values.admin.data.type "persistentVolumeClaim" }}
diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/all-in-one/all-in-one-deployment.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/all-in-one/all-in-one-deployment.yaml
index f6237bb7e9..9202ae8cdc 100644
--- a/packages/system/seaweedfs/charts/seaweedfs/templates/all-in-one/all-in-one-deployment.yaml
+++ b/packages/system/seaweedfs/charts/seaweedfs/templates/all-in-one/all-in-one-deployment.yaml
@@ -1,8 +1,9 @@
+{{- include "seaweedfs.compat" . -}}
 {{- if .Values.allInOne.enabled }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ template "seaweedfs.name" . }}-all-in-one
+  name: {{ include "seaweedfs.fullname" . }}-all-in-one
   namespace: {{ .Release.Namespace }}
   labels:
     app.kubernetes.io/name: {{ template "seaweedfs.name" . }}
@@ -44,7 +45,7 @@ spec:
         {{- toYaml . | nindent 8 }}
         {{- end }}
     spec:
-      restartPolicy: {{ default .Values.global.restartPolicy .Values.allInOne.restartPolicy }}
+      restartPolicy: {{ default .Values.global.seaweedfs.restartPolicy .Values.allInOne.restartPolicy }}
       {{- if .Values.allInOne.affinity }}
       affinity:
         {{ tpl .Values.allInOne.affinity . | nindent 8 | trim }}
@@ -63,6 +64,9 @@ spec:
       {{- if .Values.allInOne.priorityClassName }}
       priorityClassName: {{ .Values.allInOne.priorityClassName | quote }}
       {{- end }}
+      {{- if .Values.allInOne.schedulerName }}
+      schedulerName: {{ .Values.allInOne.schedulerName | quote }}
+      {{- end }}
       {{- if .Values.allInOne.serviceAccountName }}
       serviceAccountName: {{ .Values.allInOne.serviceAccountName | quote }}
       {{- end }}
@@ -76,12 +80,17 @@ spec:
       {{- end }}
       containers:
         - name: seaweedfs
-          image: {{ template "master.image" . }}
-          imagePullPolicy: {{ default "IfNotPresent" .Values.global.imagePullPolicy }}
+          image: {{ template "seaweedfs.master.image" . }}
+          imagePullPolicy: {{ default "IfNotPresent" .Values.global.seaweedfs.imagePullPolicy }}
           env:
+            {{- include "seaweedfs.licenseEnv" . | nindent 12 }}
+            {{- if and .Values.allInOne.s3.enabled (or .Values.allInOne.s3.enableAuth .Values.s3.enableAuth .Values.filer.s3.enableAuth) }}
+            {{- include "seaweedfs.s3.credentialEnv" . | nindent 12 }}
+            {{- end }}
             {{- /* Determine default cluster alias and the corresponding env var keys to avoid conflicts */}}
-            {{- $envMerged := merge (.Values.global.extraEnvironmentVars | default dict) (.Values.allInOne.extraEnvironmentVars | default dict) }}
-            {{- $clusterDefault := default "sw" (index $envMerged "WEED_CLUSTER_DEFAULT") }}
+            {{- $mergedExtraEnvironmentVars := dict }}
+            {{- include "seaweedfs.mergeExtraEnvironmentVars" (dict "global" .Values.global.seaweedfs "component" .Values.allInOne "target" $mergedExtraEnvironmentVars) }}
+            {{- $clusterDefault := default "sw" (index $mergedExtraEnvironmentVars "WEED_CLUSTER_DEFAULT") }}
             {{- $clusterUpper := upper $clusterDefault }}
             {{- $clusterMasterKey := printf "WEED_CLUSTER_%s_MASTER" $clusterUpper }}
             {{- $clusterFilerKey := printf "WEED_CLUSTER_%s_FILER" $clusterUpper }}
@@ -98,33 +107,19 @@ spec:
                 fieldRef:
                   fieldPath: metadata.namespace
             - name: SEAWEEDFS_FULLNAME
-              value: "{{ template "seaweedfs.name" . }}"
-            {{- if .Values.allInOne.extraEnvironmentVars }}
-            {{- range $key, $value := .Values.allInOne.extraEnvironmentVars }}
+              value: "{{ include "seaweedfs.fullname" . }}"
+            {{- range $key := keys $mergedExtraEnvironmentVars | sortAlpha }}
+            {{- $value := index $mergedExtraEnvironmentVars $key }}
             {{- if and (ne $key $clusterMasterKey) (ne $key $clusterFilerKey) }}
             - name: {{ $key }}
               {{- if kindIs "string" $value }}
-              value: {{ $value | quote }}
+              value: {{ tpl $value $ | quote }}
               {{- else }}
               valueFrom:
                 {{ toYaml $value | nindent 16 }}
               {{- end }}
             {{- end }}
             {{- end }}
-            {{- end }}
-            {{- if .Values.global.extraEnvironmentVars }}
-            {{- range $key, $value := .Values.global.extraEnvironmentVars }}
-            {{- if and (ne $key $clusterMasterKey) (ne $key $clusterFilerKey) }}
-            - name: {{ $key }}
-              {{- if kindIs "string" $value }}
-              value: {{ $value | quote }}
-              {{- else }}
-              valueFrom:
-                {{ toYaml $value | nindent 16 }}
-              {{- end }}
-            {{- end }}
-            {{- end }}
-            {{- end }}
             # Inject computed cluster endpoints for the default cluster
             - name: {{ $clusterMasterKey }}
               value: {{ include "seaweedfs.cluster.masterAddress" . | quote }}
@@ -132,11 +127,13 @@ spec:
               value: {{ include "seaweedfs.cluster.filerAddress" . | quote }}
             {{- if .Values.allInOne.secretExtraEnvironmentVars }}
             {{- range $key, $value := .Values.allInOne.secretExtraEnvironmentVars }}
+            {{- if not (and $key (eq $key "SEAWEED_LICENSE") (include "seaweedfs.licenseEnabled" $)) }}
             - name: {{ $key }}
               valueFrom:
                 {{ toYaml $value | nindent 16 }}
             {{- end }}
             {{- end }}
+            {{- end }}
           command:
             - "/bin/sh"
             - "-ec"
@@ -145,7 +142,7 @@ spec:
               {{- if .Values.allInOne.loggingOverrideLevel }}
               -v={{ .Values.allInOne.loggingOverrideLevel }} \
               {{- else }}
-              -v={{ .Values.global.loggingLevel }} \
+              -v={{ .Values.global.seaweedfs.loggingLevel }} \
               {{- end }}
               server \
               -dir=/data \
@@ -168,12 +165,16 @@ spec:
               {{- if .Values.allInOne.disableHttp }}
               -disableHttp={{ .Values.allInOne.disableHttp }} \
               {{- end }}
-              {{- if and (.Values.volume.dataDirs) (index .Values.volume.dataDirs 0 "maxVolumes") }}
-              -volume.max={{ index .Values.volume.dataDirs 0 "maxVolumes" }} \
+              {{- if .Values.volume.dataDirs }}
+              {{- with (first .Values.volume.dataDirs) }}
+              {{- if and (hasKey . "maxVolumes") (ne .maxVolumes nil) }}
+              -volume.max={{ .maxVolumes }} \
+              {{- end }}
+              {{- end }}
               {{- end }}
               -master.port={{ .Values.master.port }} \
-              {{- if .Values.global.enableReplication }}
-              -master.defaultReplication={{ .Values.global.replicationPlacement }} \
+              {{- if .Values.global.seaweedfs.enableReplication }}
+              -master.defaultReplication={{ .Values.global.seaweedfs.replicationPlacement }} \
               {{- else }}
               -master.defaultReplication={{ .Values.master.defaultReplication }} \
               {{- end }}
@@ -211,8 +212,8 @@ spec:
               -filer.disableDirListing \
               {{- end }}
               -filer.dirListLimit={{ .Values.filer.dirListLimit }} \
-              {{- if .Values.global.enableReplication }}
-              -filer.defaultReplicaPlacement={{ .Values.global.replicationPlacement }} \
+              {{- if .Values.global.seaweedfs.enableReplication }}
+              -filer.defaultReplicaPlacement={{ .Values.global.seaweedfs.replicationPlacement }} \
               {{- else }}
               -filer.defaultReplicaPlacement={{ .Values.filer.defaultReplicaPlacement }} \
               {{- end }}
@@ -238,13 +239,12 @@ spec:
               {{- if $domainName }}
               -s3.domainName={{ $domainName }} \
               {{- end }}
-              {{- if .Values.global.enableSecurity }}
+              {{- if .Values.global.seaweedfs.enableSecurity }}
               {{- $httpsPort := .Values.allInOne.s3.httpsPort | default .Values.s3.httpsPort }}
               {{- if $httpsPort }}
               -s3.port.https={{ $httpsPort }} \
+              {{- include "seaweedfs.s3.tlsArgs" (dict "root" . "prefix" "s3.") | nindent 14 }}
               {{- end }}
-              -s3.cert.file=/usr/local/share/ca-certificates/client/tls.crt \
-              -s3.key.file=/usr/local/share/ca-certificates/client/tls.key \
               {{- end }}
               {{- if or .Values.allInOne.s3.enableAuth .Values.s3.enableAuth .Values.filer.s3.enableAuth }}
               -s3.config=/etc/sw/s3/seaweedfs_s3_config \
@@ -268,6 +268,9 @@ spec:
               {{- $authMethods := .Values.allInOne.sftp.authMethods | default .Values.sftp.authMethods }}
               {{- if $authMethods }}
               -sftp.authMethods={{ $authMethods }} \
+              {{- if contains "certificate" $authMethods }}
+              -sftp.trustedUserCAKeysFile=/etc/sw/sftp_ca/ca_user.pub \
+              {{- end }}
               {{- end }}
               {{- $maxAuthTries := .Values.allInOne.sftp.maxAuthTries | default .Values.sftp.maxAuthTries }}
               {{- if $maxAuthTries }}
@@ -308,13 +311,19 @@ spec:
             {{- end }}
             {{- if .Values.allInOne.sftp.enabled }}
             - name: config-ssh
-              mountPath: /etc/sw/ssh
+              mountPath: {{ .Values.allInOne.sftp.hostKeysFolder | default .Values.sftp.hostKeysFolder | default "/etc/sw/ssh" }}
               readOnly: true
             {{- if or .Values.allInOne.sftp.enableAuth .Values.sftp.enableAuth }}
             - mountPath: /etc/sw/sftp
               name: config-users
               readOnly: true
             {{- end }}
+            {{- $aioAuthMethods := .Values.allInOne.sftp.authMethods | default .Values.sftp.authMethods }}
+            {{- if and $aioAuthMethods (contains "certificate" $aioAuthMethods) }}
+            - mountPath: /etc/sw/sftp_ca
+              name: config-sftp-ca
+              readOnly: true
+            {{- end }}
             {{- end }}
             {{- if .Values.filer.notificationConfig }}
             - name: notification-config
@@ -326,11 +335,13 @@ spec:
               mountPath: /etc/seaweedfs/master.toml
               subPath: master.toml
               readOnly: true
-            {{- if .Values.global.enableSecurity }}
+            {{- if include "seaweedfs.securityConfigEnabled" . }}
             - name: security-config
               mountPath: /etc/seaweedfs/security.toml
               subPath: security.toml
               readOnly: true
+            {{- end }}
+            {{- if .Values.global.seaweedfs.enableSecurity }}
             - name: ca-cert
               mountPath: /usr/local/share/ca-certificates/ca/
               readOnly: true
@@ -346,7 +357,11 @@ spec:
             - name: client-cert
               mountPath: /usr/local/share/ca-certificates/client/
               readOnly: true
+            {{- if .Values.allInOne.s3.enabled }}
+            {{- include "seaweedfs.s3.tlsVolumeMount" . | nindent 12 }}
             {{- end }}
+            {{- end }}
+            {{- include "seaweedfs.licenseVolumeMount" . | nindent 12 }}
             {{ tpl .Values.allInOne.extraVolumeMounts . | nindent 12 }}
           ports:
             - containerPort: {{ .Values.master.port }}
@@ -411,9 +426,10 @@ spec:
             {{- omit .Values.allInOne.containerSecurityContext "enabled" | toYaml | nindent 12 }}
           {{- end }}
       {{- if .Values.allInOne.sidecars }}
-      {{- include "common.tplvalues.render" (dict "value" .Values.allInOne.sidecars "context" $) | nindent 8 }}
+      {{- include "seaweedfs.tplvalues.render" (dict "value" .Values.allInOne.sidecars "context" $) | nindent 8 }}
       {{- end }}
       volumes:
+        {{- include "seaweedfs.licenseVolume" . | nindent 8 }}
         - name: data
           {{- if eq .Values.allInOne.data.type "hostPath" }}
           hostPath:
@@ -421,7 +437,7 @@ spec:
             type: DirectoryOrCreate
           {{- else if eq .Values.allInOne.data.type "persistentVolumeClaim" }}
           persistentVolumeClaim:
-            claimName: {{ template "seaweedfs.name" . }}-all-in-one-data
+            claimName: {{ include "seaweedfs.fullname" . }}-all-in-one-data
           {{- else if eq .Values.allInOne.data.type "existingClaim" }}
           persistentVolumeClaim:
             claimName: {{ .Values.allInOne.data.claimName }}
@@ -432,47 +448,64 @@ spec:
         - name: config-s3-users
           secret:
             defaultMode: 420
-            secretName: {{ default (printf "%s-s3-secret" (include "seaweedfs.name" .)) (or .Values.allInOne.s3.existingConfigSecret .Values.s3.existingConfigSecret .Values.filer.s3.existingConfigSecret) }}
+            secretName: {{ default (printf "%s-s3-secret" (include "seaweedfs.fullname" .)) (or .Values.allInOne.s3.existingConfigSecret .Values.s3.existingConfigSecret .Values.filer.s3.existingConfigSecret) }}
         {{- end }}
         {{- if .Values.allInOne.sftp.enabled }}
         - name: config-ssh
           secret:
             defaultMode: 420
-            secretName: {{ default (printf "%s-sftp-ssh-secret" (include "seaweedfs.name" .)) (or .Values.allInOne.sftp.existingSshConfigSecret .Values.sftp.existingSshConfigSecret) }}
+            secretName: {{ default (printf "%s-sftp-ssh-secret" (include "seaweedfs.fullname" .)) (or .Values.allInOne.sftp.existingSshConfigSecret .Values.sftp.existingSshConfigSecret) }}
         {{- if or .Values.allInOne.sftp.enableAuth .Values.sftp.enableAuth }}
         - name: config-users
           secret:
             defaultMode: 420
-            secretName: {{ default (printf "%s-sftp-secret" (include "seaweedfs.name" .)) (or .Values.allInOne.sftp.existingConfigSecret .Values.sftp.existingConfigSecret) }}
+            secretName: {{ default (printf "%s-sftp-secret" (include "seaweedfs.fullname" .)) (or .Values.allInOne.sftp.existingConfigSecret .Values.sftp.existingConfigSecret) }}
+        {{- end }}
+        {{- $aioAuthMethodsVol := .Values.allInOne.sftp.authMethods | default .Values.sftp.authMethods }}
+        {{- if and $aioAuthMethodsVol (contains "certificate" $aioAuthMethodsVol) }}
+        {{- $aioCASecret := or .Values.allInOne.sftp.existingCAKeysSecret .Values.sftp.existingCAKeysSecret }}
+        {{- $aioCAKeys := or .Values.allInOne.sftp.trustedUserCAKeys .Values.sftp.trustedUserCAKeys }}
+        {{- if and (not $aioCASecret) (not $aioCAKeys) }}
+        {{- fail "allInOne.sftp.authMethods includes \"certificate\" but neither trustedUserCAKeys nor existingCAKeysSecret is set" }}
+        {{- end }}
+        - name: config-sftp-ca
+          secret:
+            defaultMode: 420
+            secretName: {{ default (printf "%s-sftp-ca-secret" (include "seaweedfs.fullname" .)) $aioCASecret }}
         {{- end }}
         {{- end }}
         {{- if .Values.filer.notificationConfig }}
         - name: notification-config
           configMap:
-            name: {{ template "seaweedfs.name" . }}-notification-config
+            name: {{ include "seaweedfs.fullname" . }}-notification-config
         {{- end }}
         - name: master-config
           configMap:
-            name: {{ template "seaweedfs.name" . }}-master-config
-        {{- if .Values.global.enableSecurity }}
+            name: {{ include "seaweedfs.fullname" . }}-master-config
+        {{- if include "seaweedfs.securityConfigEnabled" . }}
         - name: security-config
           configMap:
-            name: {{ template "seaweedfs.name" . }}-security-config
+            name: {{ include "seaweedfs.fullname" . }}-security-config
+        {{- end }}
+        {{- if .Values.global.seaweedfs.enableSecurity }}
         - name: ca-cert
           secret:
-            secretName: {{ template "seaweedfs.name" . }}-ca-cert
+            secretName: {{ include "seaweedfs.fullname" . }}-ca-cert
         - name: master-cert
           secret:
-            secretName: {{ template "seaweedfs.name" . }}-master-cert
+            secretName: {{ include "seaweedfs.fullname" . }}-master-cert
         - name: volume-cert
           secret:
-            secretName: {{ template "seaweedfs.name" . }}-volume-cert
+            secretName: {{ include "seaweedfs.fullname" . }}-volume-cert
         - name: filer-cert
           secret:
-            secretName: {{ template "seaweedfs.name" . }}-filer-cert
+            secretName: {{ include "seaweedfs.fullname" . }}-filer-cert
         - name: client-cert
           secret:
-            secretName: {{ template "seaweedfs.name" . }}-client-cert
+            secretName: {{ include "seaweedfs.fullname" . }}-client-cert
+        {{- if .Values.allInOne.s3.enabled }}
+        {{- include "seaweedfs.s3.tlsVolume" . | nindent 8 }}
+        {{- end }}
         {{- end }}
         {{ tpl .Values.allInOne.extraVolumes . | nindent 8 }}
       {{- if .Values.allInOne.nodeSelector }}
diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/all-in-one/all-in-one-pvc.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/all-in-one/all-in-one-pvc.yaml
index a62450c3d6..4a402f3187 100644
--- a/packages/system/seaweedfs/charts/seaweedfs/templates/all-in-one/all-in-one-pvc.yaml
+++ b/packages/system/seaweedfs/charts/seaweedfs/templates/all-in-one/all-in-one-pvc.yaml
@@ -3,7 +3,7 @@
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: {{ template "seaweedfs.name" . }}-all-in-one-data
+  name: {{ include "seaweedfs.fullname" . }}-all-in-one-data
   namespace: {{ .Release.Namespace }}
   labels:
     app.kubernetes.io/name: {{ template "seaweedfs.name" . }}
diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/all-in-one/all-in-one-service.yml b/packages/system/seaweedfs/charts/seaweedfs/templates/all-in-one/all-in-one-service.yml
index b13f578995..5201f607be 100644
--- a/packages/system/seaweedfs/charts/seaweedfs/templates/all-in-one/all-in-one-service.yml
+++ b/packages/system/seaweedfs/charts/seaweedfs/templates/all-in-one/all-in-one-service.yml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ template "seaweedfs.name" . }}-all-in-one
+  name: {{ include "seaweedfs.componentName" (list . "all-in-one") }}
   namespace: {{ .Release.Namespace }}
   labels:
     app.kubernetes.io/name: {{ template "seaweedfs.name" . }}
@@ -15,37 +15,64 @@ metadata:
     {{- toYaml .Values.allInOne.service.annotations | nindent 4 }}
   {{- end }}
 spec:
-  type: {{ .Values.allInOne.service.type | default "ClusterIP" }}
+  {{- $serviceType := .Values.allInOne.service.type | default "ClusterIP" }}
+  {{- $nodePorts := dict }}
+  {{- if or (eq $serviceType "NodePort") (eq $serviceType "LoadBalancer") }}
+  {{- $nodePorts = .Values.allInOne.service.nodePorts | default dict }}
+  {{- end }}
+  type: {{ $serviceType }}
+  {{- include "seaweedfs.service.loadBalancerFields" .Values.allInOne.service }}
   internalTrafficPolicy: {{ .Values.allInOne.service.internalTrafficPolicy | default "Cluster" }}
+  {{- if and (semverCompare ">=1.31-0" .Capabilities.KubeVersion.GitVersion) .Values.allInOne.s3.trafficDistribution }}
+  trafficDistribution: {{ include "seaweedfs.trafficDistribution" (dict "value" .Values.allInOne.s3.trafficDistribution "Capabilities" .Capabilities) }}
+  {{- end }}
   ports:
   # Master ports
   - name: "swfs-master"
     port: {{ .Values.master.port }}
     targetPort: {{ .Values.master.port }}
+    {{- if $nodePorts.master }}
+    nodePort: {{ $nodePorts.master }}
+    {{- end }}
     protocol: TCP
   - name: "swfs-master-grpc"
     port: {{ .Values.master.grpcPort }}
     targetPort: {{ .Values.master.grpcPort }}
+    {{- if $nodePorts.masterGrpc }}
+    nodePort: {{ $nodePorts.masterGrpc }}
+    {{- end }}
     protocol: TCP
-  
+
   # Volume ports
   - name: "swfs-volume"
     port: {{ .Values.volume.port }}
     targetPort: {{ .Values.volume.port }}
+    {{- if $nodePorts.volume }}
+    nodePort: {{ $nodePorts.volume }}
+    {{- end }}
     protocol: TCP
   - name: "swfs-volume-grpc"
     port: {{ .Values.volume.grpcPort }}
     targetPort: {{ .Values.volume.grpcPort }}
+    {{- if $nodePorts.volumeGrpc }}
+    nodePort: {{ $nodePorts.volumeGrpc }}
+    {{- end }}
     protocol: TCP
-  
+
   # Filer ports
   - name: "swfs-filer"
     port: {{ .Values.filer.port }}
     targetPort: {{ .Values.filer.port }}
+    {{- if $nodePorts.filer }}
+    nodePort: {{ $nodePorts.filer }}
+    {{- end }}
     protocol: TCP
   - name: "swfs-filer-grpc"
     port: {{ .Values.filer.grpcPort }}
     targetPort: {{ .Values.filer.grpcPort }}
+    {{- if $nodePorts.filerGrpc }}
+    nodePort: {{ $nodePorts.filerGrpc }}
+    {{- end }}
     protocol: TCP
   
   # S3 ports (if enabled)
@@ -53,33 +80,46 @@ spec:
   - name: "swfs-s3"
     port: {{ .Values.allInOne.s3.port | default .Values.s3.port }}
     targetPort: {{ .Values.allInOne.s3.port | default .Values.s3.port }}
+    {{- if $nodePorts.s3 }}
+    nodePort: {{ $nodePorts.s3 }}
+    {{- end }}
     protocol: TCP
   {{- $httpsPort := .Values.allInOne.s3.httpsPort | default .Values.s3.httpsPort }}
   {{- if $httpsPort }}
   - name: "swfs-s3-tls"
     port: {{ $httpsPort }}
     targetPort: {{ $httpsPort }}
+    {{- if $nodePorts.s3Https }}
+    nodePort: {{ $nodePorts.s3Https }}
+    {{- end }}
     protocol: TCP
   {{- end }}
   {{- end }}
-  
+
   # SFTP ports (if enabled)
   {{- if .Values.allInOne.sftp.enabled }}
   - name: "swfs-sftp"
     port: {{ .Values.allInOne.sftp.port | default .Values.sftp.port }}
     targetPort: {{ .Values.allInOne.sftp.port | default .Values.sftp.port }}
+    {{- if $nodePorts.sftp }}
+    nodePort: {{ $nodePorts.sftp }}
+    {{- end }}
     protocol: TCP
   {{- end }}
-  
+
   # Server metrics port (single metrics endpoint for all services)
   {{- if .Values.allInOne.metricsPort }}
   - name: "server-metrics"
     port: {{ .Values.allInOne.metricsPort }}
     targetPort: {{ .Values.allInOne.metricsPort }}
+    {{- if $nodePorts.metrics }}
+    nodePort: {{ $nodePorts.metrics }}
+    {{- end }}
     protocol: TCP
   {{- end }}
   
   selector:
     app.kubernetes.io/name: {{ template "seaweedfs.name" . }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/component: seaweedfs-all-in-one
 {{- end }}
diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/all-in-one/all-in-one-servicemonitor.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/all-in-one/all-in-one-servicemonitor.yaml
index 0f9ce392cd..512eca63b0 100644
--- a/packages/system/seaweedfs/charts/seaweedfs/templates/all-in-one/all-in-one-servicemonitor.yaml
+++ b/packages/system/seaweedfs/charts/seaweedfs/templates/all-in-one/all-in-one-servicemonitor.yaml
@@ -1,9 +1,10 @@
+{{- include "seaweedfs.compat" . -}}
 {{- if .Values.allInOne.enabled }}
-{{- if .Values.global.monitoring.enabled }}
+{{- if .Values.global.seaweedfs.monitoring.enabled }}
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
-  name: {{ template "seaweedfs.name" . }}-all-in-one
+  name: {{ include "seaweedfs.fullname" . }}-all-in-one
   namespace: {{ .Release.Namespace }}
   labels:
     app.kubernetes.io/name: {{ template "seaweedfs.name" . }}
@@ -11,7 +12,7 @@ metadata:
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/component: all-in-one
-    {{- with .Values.global.monitoring.additionalLabels }}
+    {{- with .Values.global.seaweedfs.monitoring.additionalLabels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
 spec:
@@ -24,6 +25,7 @@ spec:
   selector:
     matchLabels:
       app.kubernetes.io/name: {{ template "seaweedfs.name" . }}
+      app.kubernetes.io/instance: {{ .Release.Name }}
       app.kubernetes.io/component: seaweedfs-all-in-one
 {{- end }}
 {{- end }}
\ No newline at end of file
diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/cert/admin-cert.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/cert/admin-cert.yaml
index be52660197..defe448e6e 100644
--- a/packages/system/seaweedfs/charts/seaweedfs/templates/cert/admin-cert.yaml
+++ b/packages/system/seaweedfs/charts/seaweedfs/templates/cert/admin-cert.yaml
@@ -1,8 +1,9 @@
-{{- if and .Values.global.enableSecurity (not .Values.certificates.externalCertificates.enabled)}}
-apiVersion: cert-manager.io/v1{{ if .Values.global.certificates.alphacrds }}alpha1{{ end }}
+{{- include "seaweedfs.compat" . -}}
+{{- if and .Values.global.seaweedfs.enableSecurity (not .Values.certificates.externalCertificates.enabled)}}
+apiVersion: cert-manager.io/v1{{ if .Values.global.seaweedfs.certificates.alphacrds }}alpha1{{ end }}
 kind: Certificate
 metadata:
-  name: {{ template "seaweedfs.name" . }}-admin-cert
+  name: {{ include "seaweedfs.fullname" . }}-admin-cert
   namespace: {{ .Release.Namespace }}
   labels:
     app.kubernetes.io/name: {{ template "seaweedfs.name" . }}
@@ -15,19 +16,24 @@ metadata:
     {{- toYaml .Values.admin.annotations | nindent 4 }}
   {{- end }}
 spec:
-  secretName: {{ template "seaweedfs.name" . }}-admin-cert
+  secretName: {{ include "seaweedfs.fullname" . }}-admin-cert
   issuerRef:
-    name: {{ template "seaweedfs.name" . }}-ca-issuer
+    name: {{ include "seaweedfs.fullname" . }}-ca-issuer
     kind: Issuer
   commonName: {{ .Values.certificates.commonName }}
   subject:
     organizations:
     - "SeaweedFS CA"
   dnsNames:
-    - '*.{{ template "seaweedfs.name" . }}-admin'
-    - '*.{{ template "seaweedfs.name" . }}-admin.{{ .Release.Namespace }}'
-    - '*.{{ template "seaweedfs.name" . }}-admin.{{ .Release.Namespace }}.svc'
-    - '*.{{ template "seaweedfs.name" . }}-admin.{{ .Release.Namespace }}.svc.cluster.local'
+    - '*.{{ include "seaweedfs.fullname" . }}-admin'
+    - '*.{{ include "seaweedfs.fullname" . }}-admin.{{ .Release.Namespace }}'
+    - '*.{{ include "seaweedfs.fullname" . }}-admin.{{ .Release.Namespace }}.svc'
+    - '*.{{ include "seaweedfs.fullname" . }}-admin.{{ .Release.Namespace }}.svc.cluster.local'
+{{- if .Values.certificates.dnsNames }}
+{{- range .Values.certificates.dnsNames }}
+    - {{ . | quote }}
+{{- end }}
+{{- end }}
 {{- if .Values.certificates.ipAddresses }}
   ipAddresses:
     {{- range .Values.certificates.ipAddresses }}
diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/cert/ca-cert.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/cert/ca-cert.yaml
index a38287dea0..57010a44d3 100644
--- a/packages/system/seaweedfs/charts/seaweedfs/templates/cert/ca-cert.yaml
+++ b/packages/system/seaweedfs/charts/seaweedfs/templates/cert/ca-cert.yaml
@@ -1,8 +1,9 @@
-{{- if and .Values.global.enableSecurity (not .Values.certificates.externalCertificates.enabled)}}
-apiVersion: cert-manager.io/v1{{ if .Values.global.certificates.alphacrds }}alpha1{{ end }}
+{{- include "seaweedfs.compat" . -}}
+{{- if and .Values.global.seaweedfs.enableSecurity (not .Values.certificates.externalCertificates.enabled)}}
+apiVersion: cert-manager.io/v1{{ if .Values.global.seaweedfs.certificates.alphacrds }}alpha1{{ end }}
 kind: Certificate
 metadata:
-  name: {{ template "seaweedfs.name" . }}-ca-cert
+  name: {{ include "seaweedfs.fullname" . }}-ca-cert
   namespace: {{ .Release.Namespace }}
   labels:
     app.kubernetes.io/name: {{ template "seaweedfs.name" . }}
@@ -10,8 +11,8 @@ metadata:
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     app.kubernetes.io/instance: {{ .Release.Name }}
 spec:
-  secretName: {{ template "seaweedfs.name" . }}-ca-cert
-  commonName: "{{ template "seaweedfs.name" . }}-root-ca"
+  secretName: {{ include "seaweedfs.fullname" . }}-ca-cert
+  commonName: "{{ include "seaweedfs.fullname" . }}-root-ca"
   isCA: true
   privateKey:
     rotationPolicy: Never
@@ -22,6 +23,6 @@ spec:
   renewBefore: {{ .Values.certificates.ca.renewBefore }}
   {{- end }}
   issuerRef:
-    name: {{ template "seaweedfs.name" . }}-issuer
+    name: {{ include "seaweedfs.fullname" . }}-issuer
     kind: Issuer
 {{- end }}
diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/cert/cert-caissuer.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/cert/cert-caissuer.yaml
index 72de126e1c..35a04dffdb 100644
--- a/packages/system/seaweedfs/charts/seaweedfs/templates/cert/cert-caissuer.yaml
+++ b/packages/system/seaweedfs/charts/seaweedfs/templates/cert/cert-caissuer.yaml
@@ -1,8 +1,9 @@
-{{- if and .Values.global.enableSecurity (not .Values.certificates.externalCertificates.enabled)}}
-apiVersion: cert-manager.io/v1{{ if .Values.global.certificates.alphacrds }}alpha1{{ end }}
+{{- include "seaweedfs.compat" . -}}
+{{- if and .Values.global.seaweedfs.enableSecurity (not .Values.certificates.externalCertificates.enabled)}}
+apiVersion: cert-manager.io/v1{{ if .Values.global.seaweedfs.certificates.alphacrds }}alpha1{{ end }}
 kind: Issuer
 metadata:
-  name: {{ template "seaweedfs.name" . }}-ca-issuer
+  name: {{ include "seaweedfs.fullname" . }}-ca-issuer
   namespace: {{ .Release.Namespace }}
   labels:
     app.kubernetes.io/name: {{ template "seaweedfs.name" . }}
@@ -11,5 +12,5 @@ metadata:
     app.kubernetes.io/instance: {{ .Release.Name }}
 spec:
   ca:
-    secretName: {{ template "seaweedfs.name" . }}-ca-cert
+    secretName: {{ include "seaweedfs.fullname" . }}-ca-cert
 {{- end }}
diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/cert/cert-issuer.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/cert/cert-issuer.yaml
index 9f243d07c5..479d2f3340 100644
--- a/packages/system/seaweedfs/charts/seaweedfs/templates/cert/cert-issuer.yaml
+++ b/packages/system/seaweedfs/charts/seaweedfs/templates/cert/cert-issuer.yaml
@@ -1,8 +1,9 @@
-{{- if and .Values.global.enableSecurity (not .Values.certificates.externalCertificates.enabled)}}
-apiVersion: cert-manager.io/v1{{ if .Values.global.certificates.alphacrds }}alpha1{{ end }}
+{{- include "seaweedfs.compat" . -}}
+{{- if and .Values.global.seaweedfs.enableSecurity (not .Values.certificates.externalCertificates.enabled)}}
+apiVersion: cert-manager.io/v1{{ if .Values.global.seaweedfs.certificates.alphacrds }}alpha1{{ end }}
 kind: Issuer
 metadata:
-  name: {{ template "seaweedfs.name" . }}-issuer
+  name: {{ include "seaweedfs.fullname" . }}-issuer
   labels:
     app.kubernetes.io/name: {{ template "seaweedfs.name" . }}
     helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/cert/client-cert.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/cert/client-cert.yaml
index bda132a029..abfecbde83 100644
--- a/packages/system/seaweedfs/charts/seaweedfs/templates/cert/client-cert.yaml
+++ b/packages/system/seaweedfs/charts/seaweedfs/templates/cert/client-cert.yaml
@@ -1,8 +1,9 @@
-{{- if and .Values.global.enableSecurity (not .Values.certificates.externalCertificates.enabled)}}
-apiVersion: cert-manager.io/v1{{ if .Values.global.certificates.alphacrds }}alpha1{{ end }}
+{{- include "seaweedfs.compat" . -}}
+{{- if and .Values.global.seaweedfs.enableSecurity (not .Values.certificates.externalCertificates.enabled)}}
+apiVersion: cert-manager.io/v1{{ if .Values.global.seaweedfs.certificates.alphacrds }}alpha1{{ end }}
 kind: Certificate
 metadata:
-  name: {{ template "seaweedfs.name" . }}-client-cert
+  name: {{ include "seaweedfs.fullname" . }}-client-cert
   namespace: {{ .Release.Namespace }}
   labels:
     app.kubernetes.io/name: {{ template "seaweedfs.name" . }}
@@ -10,9 +11,9 @@ metadata:
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     app.kubernetes.io/instance: {{ .Release.Name }}
 spec:
-  secretName: {{ template "seaweedfs.name" . }}-client-cert
+  secretName: {{ include "seaweedfs.fullname" . }}-client-cert
   issuerRef:
-    name: {{ template "seaweedfs.name" . }}-ca-issuer
+    name: {{ include "seaweedfs.fullname" . }}-ca-issuer
     kind: Issuer
   commonName: {{ .Values.certificates.commonName }}
   subject:
@@ -22,10 +23,15 @@ spec:
     - '*.{{ .Release.Namespace }}'
     - '*.{{ .Release.Namespace }}.svc'
     - '*.{{ .Release.Namespace }}.svc.cluster.local'
-    - '*.{{ template "seaweedfs.name" . }}-master'
-    - '*.{{ template "seaweedfs.name" . }}-master.{{ .Release.Namespace }}'
-    - '*.{{ template "seaweedfs.name" . }}-master.{{ .Release.Namespace }}.svc'
-    - '*.{{ template "seaweedfs.name" . }}-master.{{ .Release.Namespace }}.svc.cluster.local'
+{{- if .Values.certificates.dnsNames }}
+{{- range .Values.certificates.dnsNames }}
+    - {{ . | quote }}
+{{- end }}
+{{- end }}
+    - '*.{{ include "seaweedfs.fullname" . }}-master'
+    - '*.{{ include "seaweedfs.fullname" . }}-master.{{ .Release.Namespace }}'
+    - '*.{{ include "seaweedfs.fullname" . }}-master.{{ .Release.Namespace }}.svc'
+    - '*.{{ include "seaweedfs.fullname" . }}-master.{{ .Release.Namespace }}.svc.cluster.local'
 {{- if .Values.certificates.ipAddresses }}
   ipAddresses:
     {{- range .Values.certificates.ipAddresses }}
diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/cert/filer-cert.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/cert/filer-cert.yaml
index 4cb117ae81..6a86756b97 100644
--- a/packages/system/seaweedfs/charts/seaweedfs/templates/cert/filer-cert.yaml
+++ b/packages/system/seaweedfs/charts/seaweedfs/templates/cert/filer-cert.yaml
@@ -1,8 +1,9 @@
-{{- if and .Values.global.enableSecurity (not .Values.certificates.externalCertificates.enabled)}}
-apiVersion: cert-manager.io/v1{{ if .Values.global.certificates.alphacrds }}alpha1{{ end }}
+{{- include "seaweedfs.compat" . -}}
+{{- if and .Values.global.seaweedfs.enableSecurity (not .Values.certificates.externalCertificates.enabled)}}
+apiVersion: cert-manager.io/v1{{ if .Values.global.seaweedfs.certificates.alphacrds }}alpha1{{ end }}
 kind: Certificate
 metadata:
-  name: {{ template "seaweedfs.name" . }}-filer-cert
+  name: {{ include "seaweedfs.fullname" . }}-filer-cert
   namespace: {{ .Release.Namespace }}
   labels:
     app.kubernetes.io/name: {{ template "seaweedfs.name" . }}
@@ -15,9 +16,9 @@ metadata:
     {{- toYaml .Values.filer.annotations | nindent 4 }}
   {{- end }}
 spec:
-  secretName: {{ template "seaweedfs.name" . }}-filer-cert
+  secretName: {{ include "seaweedfs.fullname" . }}-filer-cert
   issuerRef:
-    name: {{ template "seaweedfs.name" . }}-ca-issuer
+    name: {{ include "seaweedfs.fullname" . }}-ca-issuer
     kind: Issuer
   commonName: {{ .Values.certificates.commonName }}
   subject:
@@ -27,10 +28,15 @@ spec:
     - '*.{{ .Release.Namespace }}'
     - '*.{{ .Release.Namespace }}.svc'
     - '*.{{ .Release.Namespace }}.svc.cluster.local'
-    - '*.{{ template "seaweedfs.name" . }}-master'
-    - '*.{{ template "seaweedfs.name" . }}-master.{{ .Release.Namespace }}'
-    - '*.{{ template "seaweedfs.name" . }}-master.{{ .Release.Namespace }}.svc'
-    - '*.{{ template "seaweedfs.name" . }}-master.{{ .Release.Namespace }}.svc.cluster.local'
+{{- if .Values.certificates.dnsNames }}
+{{- range .Values.certificates.dnsNames }}
+    - {{ . | quote }}
+{{- end }}
+{{- end }}
+    - '*.{{ include "seaweedfs.fullname" . }}-master'
+    - '*.{{ include "seaweedfs.fullname" . }}-master.{{ .Release.Namespace }}'
+    - '*.{{ include "seaweedfs.fullname" . }}-master.{{ .Release.Namespace }}.svc'
+    - '*.{{ include "seaweedfs.fullname" . }}-master.{{ .Release.Namespace }}.svc.cluster.local'
 {{- if .Values.certificates.ipAddresses }}
   ipAddresses:
     {{- range .Values.certificates.ipAddresses }}
diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/cert/master-cert.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/cert/master-cert.yaml
index 2567852542..7c375bea45 100644
--- a/packages/system/seaweedfs/charts/seaweedfs/templates/cert/master-cert.yaml
+++ b/packages/system/seaweedfs/charts/seaweedfs/templates/cert/master-cert.yaml
@@ -1,8 +1,9 @@
-{{- if and .Values.global.enableSecurity (not .Values.certificates.externalCertificates.enabled)}}
-apiVersion: cert-manager.io/v1{{ if .Values.global.certificates.alphacrds }}alpha1{{ end }}
+{{- include "seaweedfs.compat" . -}}
+{{- if and .Values.global.seaweedfs.enableSecurity (not .Values.certificates.externalCertificates.enabled)}}
+apiVersion: cert-manager.io/v1{{ if .Values.global.seaweedfs.certificates.alphacrds }}alpha1{{ end }}
 kind: Certificate
 metadata:
-  name: {{ template "seaweedfs.name" . }}-master-cert
+  name: {{ include "seaweedfs.fullname" . }}-master-cert
   namespace: {{ .Release.Namespace }}
   labels:
     app.kubernetes.io/name: {{ template "seaweedfs.name" . }}
@@ -15,9 +16,9 @@ metadata:
     {{- toYaml .Values.master.annotations | nindent 4 }}
 {{- end }}
 spec:
-  secretName: {{ template "seaweedfs.name" . }}-master-cert
+  secretName: {{ include "seaweedfs.fullname" . }}-master-cert
   issuerRef:
-    name: {{ template "seaweedfs.name" . }}-ca-issuer
+    name: {{ include "seaweedfs.fullname" . }}-ca-issuer
     kind: Issuer
   commonName: {{ .Values.certificates.commonName }}
   subject:
@@ -27,10 +28,15 @@ spec:
     - '*.{{ .Release.Namespace }}'
     - '*.{{ .Release.Namespace }}.svc'
     - '*.{{ .Release.Namespace }}.svc.cluster.local'
-    - '*.{{ template "seaweedfs.name" . }}-master'
-    - '*.{{ template "seaweedfs.name" . }}-master.{{ .Release.Namespace }}'
-    - '*.{{ template "seaweedfs.name" . }}-master.{{ .Release.Namespace }}.svc'
-    - '*.{{ template "seaweedfs.name" . }}-master.{{ .Release.Namespace }}.svc.cluster.local'
+{{- if .Values.certificates.dnsNames }}
+{{- range .Values.certificates.dnsNames }}
+    - {{ . | quote }}
+{{- end }}
+{{- end }}
+    - '*.{{ include "seaweedfs.fullname" . }}-master'
+    - '*.{{ include "seaweedfs.fullname" . }}-master.{{ .Release.Namespace }}'
+    - '*.{{ include "seaweedfs.fullname" . }}-master.{{ .Release.Namespace }}.svc'
+    - '*.{{ include "seaweedfs.fullname" . }}-master.{{ .Release.Namespace }}.svc.cluster.local'
 {{- if .Values.certificates.ipAddresses }}
   ipAddresses:
     {{- range .Values.certificates.ipAddresses }}
diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/cert/volume-cert.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/cert/volume-cert.yaml
index bd59a676d2..23389be167 100644
--- a/packages/system/seaweedfs/charts/seaweedfs/templates/cert/volume-cert.yaml
+++ b/packages/system/seaweedfs/charts/seaweedfs/templates/cert/volume-cert.yaml
@@ -1,8 +1,9 @@
-{{- if and .Values.global.enableSecurity (not .Values.certificates.externalCertificates.enabled)}}
-apiVersion: cert-manager.io/v1{{ if .Values.global.certificates.alphacrds }}alpha1{{ end }}
+{{- include "seaweedfs.compat" . -}}
+{{- if and .Values.global.seaweedfs.enableSecurity (not .Values.certificates.externalCertificates.enabled)}}
+apiVersion: cert-manager.io/v1{{ if .Values.global.seaweedfs.certificates.alphacrds }}alpha1{{ end }}
 kind: Certificate
 metadata:
-  name: {{ template "seaweedfs.name" . }}-volume-cert
+  name: {{ include "seaweedfs.fullname" . }}-volume-cert
   namespace: {{ .Release.Namespace }}
   labels:
     app.kubernetes.io/name: {{ template "seaweedfs.name" . }}
@@ -15,9 +16,9 @@ metadata:
     {{- toYaml .Values.volume.annotations | nindent 4 }}
 {{- end }}
 spec:
-  secretName: {{ template "seaweedfs.name" . }}-volume-cert
+  secretName: {{ include "seaweedfs.fullname" . }}-volume-cert
   issuerRef:
-    name: {{ template "seaweedfs.name" . }}-ca-issuer
+    name: {{ include "seaweedfs.fullname" . }}-ca-issuer
     kind: Issuer
   commonName: {{ .Values.certificates.commonName }}
   subject:
@@ -27,10 +28,15 @@ spec:
     - '*.{{ .Release.Namespace }}'
     - '*.{{ .Release.Namespace }}.svc'
     - '*.{{ .Release.Namespace }}.svc.cluster.local'
-    - '*.{{ template "seaweedfs.name" . }}-master'
-    - '*.{{ template "seaweedfs.name" . }}-master.{{ .Release.Namespace }}'
-    - '*.{{ template "seaweedfs.name" . }}-master.{{ .Release.Namespace }}.svc'
-    - '*.{{ template "seaweedfs.name" . }}-master.{{ .Release.Namespace }}.svc.cluster.local'
+{{- if .Values.certificates.dnsNames }}
+{{- range .Values.certificates.dnsNames }}
+    - {{ . | quote }}
+{{- end }}
+{{- end }}
+    - '*.{{ include "seaweedfs.fullname" . }}-master'
+    - '*.{{ include "seaweedfs.fullname" . }}-master.{{ .Release.Namespace }}'
+    - '*.{{ include "seaweedfs.fullname" . }}-master.{{ .Release.Namespace }}.svc'
+    - '*.{{ include "seaweedfs.fullname" . }}-master.{{ .Release.Namespace }}.svc.cluster.local'
 {{- if .Values.certificates.ipAddresses }}
   ipAddresses:
     {{- range .Values.certificates.ipAddresses }}
diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/cert/worker-cert.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/cert/worker-cert.yaml
index 85edeb3366..df1aa682c7 100644
--- a/packages/system/seaweedfs/charts/seaweedfs/templates/cert/worker-cert.yaml
+++ b/packages/system/seaweedfs/charts/seaweedfs/templates/cert/worker-cert.yaml
@@ -1,8 +1,9 @@
-{{- if and .Values.global.enableSecurity (not .Values.certificates.externalCertificates.enabled)}}
-apiVersion: cert-manager.io/v1{{ if .Values.global.certificates.alphacrds }}alpha1{{ end }}
+{{- include "seaweedfs.compat" . -}}
+{{- if and .Values.global.seaweedfs.enableSecurity (not .Values.certificates.externalCertificates.enabled)}}
+apiVersion: cert-manager.io/v1{{ if .Values.global.seaweedfs.certificates.alphacrds }}alpha1{{ end }}
 kind: Certificate
 metadata:
-  name: {{ template "seaweedfs.name" . }}-worker-cert
+  name: {{ include "seaweedfs.fullname" . }}-worker-cert
   namespace: {{ .Release.Namespace }}
   labels:
     app.kubernetes.io/name: {{ template "seaweedfs.name" . }}
@@ -15,19 +16,24 @@ metadata:
     {{- toYaml .Values.worker.annotations | nindent 4 }}
   {{- end }}
 spec:
-  secretName: {{ template "seaweedfs.name" . }}-worker-cert
+  secretName: {{ include "seaweedfs.fullname" . }}-worker-cert
   issuerRef:
-    name: {{ template "seaweedfs.name" . }}-ca-issuer
+    name: {{ include "seaweedfs.fullname" . }}-ca-issuer
     kind: Issuer
   commonName: {{ .Values.certificates.commonName }}
   subject:
     organizations:
     - "SeaweedFS CA"
   dnsNames:
-    - '*.{{ template "seaweedfs.name" . }}-worker'
-    - '*.{{ template "seaweedfs.name" . }}-worker.{{ .Release.Namespace }}'
-    - '*.{{ template "seaweedfs.name" . }}-worker.{{ .Release.Namespace }}.svc'
-    - '*.{{ template "seaweedfs.name" . }}-worker.{{ .Release.Namespace }}.svc.cluster.local'
+    - '*.{{ include "seaweedfs.fullname" . }}-worker'
+    - '*.{{ include "seaweedfs.fullname" . }}-worker.{{ .Release.Namespace }}'
+    - '*.{{ include "seaweedfs.fullname" . }}-worker.{{ .Release.Namespace }}.svc'
+    - '*.{{ include "seaweedfs.fullname" . }}-worker.{{ .Release.Namespace }}.svc.cluster.local'
+{{- if .Values.certificates.dnsNames }}
+{{- range .Values.certificates.dnsNames }}
+    - {{ . | quote }}
+{{- end }}
+{{- end }}
 {{- if .Values.certificates.ipAddresses }}
   ipAddresses:
     {{- range .Values.certificates.ipAddresses }}
diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/cosi/cosi-bucket-class.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/cosi/cosi-bucket-class.yaml
index 25e00252f6..1ff0e77686 100644
--- a/packages/system/seaweedfs/charts/seaweedfs/templates/cosi/cosi-bucket-class.yaml
+++ b/packages/system/seaweedfs/charts/seaweedfs/templates/cosi/cosi-bucket-class.yaml
@@ -6,6 +6,10 @@ metadata:
   name: {{ .Values.cosi.bucketClassName }}
 driverName: {{ .Values.cosi.driverName }}
 deletionPolicy: Delete
+{{- with .Values.cosi.bucketClassParameters }}
+parameters:
+  {{- toYaml . | nindent 2 }}
+{{- end }}
 ---
 kind: BucketClass
 apiVersion: objectstorage.k8s.io/v1alpha1
diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/cosi/cosi-cluster-role.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/cosi/cosi-cluster-role.yaml
index 75d3ec32c3..a6e5b761ee 100644
--- a/packages/system/seaweedfs/charts/seaweedfs/templates/cosi/cosi-cluster-role.yaml
+++ b/packages/system/seaweedfs/charts/seaweedfs/templates/cosi/cosi-cluster-role.yaml
@@ -1,9 +1,10 @@
+{{- include "seaweedfs.compat" . -}}
 {{- if .Values.cosi.enabled }}
 ---
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: {{ .Values.global.serviceAccountName }}-objectstorage-provisioner
+  name: {{ include "seaweedfs.serviceAccountName" . }}-objectstorage-provisioner
   labels:
     app.kubernetes.io/name: {{ template "seaweedfs.name" . }}
     helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
@@ -52,7 +53,7 @@ rules:
 kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: {{ .Values.global.serviceAccountName }}-objectstorage-provisioner
+  name: {{ include "seaweedfs.serviceAccountName" . }}-objectstorage-provisioner
   labels:
     app.kubernetes.io/name: {{ template "seaweedfs.name" . }}
     helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
@@ -60,10 +61,10 @@ metadata:
     app.kubernetes.io/instance: {{ .Release.Name }}
 subjects:
   - kind: ServiceAccount
-    name: {{ .Values.global.serviceAccountName }}-objectstorage-provisioner
+    name: {{ .Values.global.seaweedfs.serviceAccountName }}-objectstorage-provisioner
     namespace: {{ .Release.Namespace }}
 roleRef:
   kind: ClusterRole
-  name: {{ .Values.global.serviceAccountName }}-objectstorage-provisioner
+  name: {{ include "seaweedfs.serviceAccountName" . }}-objectstorage-provisioner
   apiGroup: rbac.authorization.k8s.io
 {{- end }}
diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/cosi/cosi-deployment.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/cosi/cosi-deployment.yaml
index 813af850dc..43928036ac 100644
--- a/packages/system/seaweedfs/charts/seaweedfs/templates/cosi/cosi-deployment.yaml
+++ b/packages/system/seaweedfs/charts/seaweedfs/templates/cosi/cosi-deployment.yaml
@@ -1,8 +1,9 @@
+{{- include "seaweedfs.compat" . -}}
 {{- if .Values.cosi.enabled }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ template "seaweedfs.name" . }}-objectstorage-provisioner
+  name: {{ include "seaweedfs.fullname" . }}-objectstorage-provisioner
   namespace: {{ .Release.Namespace }}
   labels:
     app.kubernetes.io/name: {{ template "seaweedfs.name" . }}
@@ -38,7 +39,7 @@ spec:
       {{- toYaml . | nindent 8 }}
       {{- end }}
     spec:
-      restartPolicy: {{ default .Values.global.restartPolicy .Values.cosi.restartPolicy }}
+      restartPolicy: {{ default .Values.global.seaweedfs.restartPolicy .Values.cosi.restartPolicy }}
       {{- if .Values.cosi.affinity }}
       affinity:
         {{ tpl .Values.cosi.affinity . | nindent 8 | trim }}
@@ -56,8 +57,11 @@ spec:
       {{- if .Values.cosi.priorityClassName }}
       priorityClassName: {{ .Values.cosi.priorityClassName | quote }}
       {{- end }}
+      {{- if .Values.cosi.schedulerName }}
+      schedulerName: {{ .Values.cosi.schedulerName | quote }}
+      {{- end }}
       enableServiceLinks: false
-      serviceAccountName: {{ .Values.global.serviceAccountName }}-objectstorage-provisioner
+      serviceAccountName: {{ .Values.global.seaweedfs.serviceAccountName }}-objectstorage-provisioner
       {{- if .Values.cosi.initContainers }}
       initContainers:
         {{ tpl .Values.cosi.initContainers . | nindent 8 | trim }}
@@ -68,7 +72,7 @@ spec:
       containers:
         - name: seaweedfs-cosi-driver
           image: "{{ .Values.cosi.image }}"
-          imagePullPolicy: {{ default "IfNotPresent" .Values.global.imagePullPolicy }}
+          imagePullPolicy: {{ default "IfNotPresent" .Values.global.seaweedfs.imagePullPolicy }}
           env:
             - name: DRIVERNAME
               value: "{{ .Values.cosi.driverName }}"
@@ -78,17 +82,17 @@ spec:
               {{- else if .Values.s3.ingress.enabled }}
               value: "{{ printf "https://%s" .Values.s3.ingress.host }}"
               {{- else if .Values.s3.enabled }}
-              value: "{{ printf "https://%s-s3.%s.svc" (include "seaweedfs.name" .) .Release.Namespace }}"
+              value: "{{ printf "https://%s-s3.%s.svc:%v" (include "seaweedfs.name" .) .Release.Namespace .Values.s3.port }}"
               {{- else }}
-              value: "{{ printf "https://%s-filer.%s.svc" (include "seaweedfs.name" .) .Release.Namespace }}"
+              value: "{{ printf "https://%s-s3.%s.svc:%v" (include "seaweedfs.name" .) .Release.Namespace .Values.filer.s3.port }}"
               {{- end }}
             {{- with .Values.cosi.region }}
             - name: REGION
               value: "{{ . }}"
             {{- end }}
             - name: SEAWEEDFS_FILER
-              value: "{{ template "seaweedfs.name" . }}-filer:{{ .Values.filer.grpcPort }}"
-            {{- if .Values.global.enableSecurity }}
+              value: "{{ include "seaweedfs.componentName" (list . "filer") }}:{{ .Values.filer.grpcPort }}"
+            {{- if .Values.global.seaweedfs.enableSecurity }}
             - name: WEED_GRPC_CLIENT_KEY
               value: /usr/local/share/ca-certificates/client/tls.key
             - name: WEED_GRPC_CLIENT_CERT
@@ -96,28 +100,18 @@ spec:
             - name: WEED_GRPC_CA
               value: /usr/local/share/ca-certificates/client/ca.crt
             {{- end }}
-            {{- if .Values.cosi.extraEnvironmentVars }}
-            {{- range $key, $value := .Values.cosi.extraEnvironmentVars }}
-            - name: {{ $key }}
-            {{- if kindIs "string" $value }}
-              value: {{ $value | quote }}
-            {{- else }}
-              valueFrom:
-                {{ toYaml $value | nindent 16 | trim }}
-            {{- end -}}
-            {{- end }}
-            {{- end }}
-            {{- if .Values.global.extraEnvironmentVars }}
-            {{- range $key, $value := .Values.global.extraEnvironmentVars }}
+            {{- $mergedExtraEnvironmentVars := dict }}
+            {{- include "seaweedfs.mergeExtraEnvironmentVars" (dict "global" .Values.global.seaweedfs "component" .Values.cosi "target" $mergedExtraEnvironmentVars) }}
+            {{- range $key := keys $mergedExtraEnvironmentVars | sortAlpha }}
+            {{- $value := index $mergedExtraEnvironmentVars $key }}
             - name: {{ $key }}
             {{- if kindIs "string" $value }}
-              value: {{ $value | quote }}
+              value: {{ tpl $value $ | quote }}
             {{- else }}
               valueFrom:
                 {{ toYaml $value | nindent 16 | trim }}
             {{- end -}}
             {{- end }}
-            {{- end }}
           volumeMounts:
             - mountPath: /var/lib/cosi
               name: socket
@@ -126,11 +120,13 @@ spec:
               name: config-users
               readOnly: true
             {{- end }}
-            {{- if .Values.global.enableSecurity }}
+            {{- if include "seaweedfs.securityConfigEnabled" . }}
             - name: security-config
               readOnly: true
               mountPath: /etc/seaweedfs/security.toml
               subPath: security.toml
+            {{- end }}
+            {{- if .Values.global.seaweedfs.enableSecurity }}
             - name: ca-cert
               readOnly: true
               mountPath: /usr/local/share/ca-certificates/ca/
@@ -154,7 +150,7 @@ spec:
           {{- end }}
         - name: seaweedfs-cosi-sidecar
           image: "{{ .Values.cosi.sidecar.image }}"
-          imagePullPolicy: {{ default "IfNotPresent" .Values.global.imagePullPolicy }}
+          imagePullPolicy: {{ default "IfNotPresent" .Values.global.seaweedfs.imagePullPolicy }}
           args:
             - {{ printf "--v=%s" (default "5" .Values.cosi.sidecar.logLevel) }}
           env:
@@ -173,7 +169,7 @@ spec:
           securityContext: {{- omit .Values.cosi.containerSecurityContext "enabled" | toYaml | nindent 12 }}
           {{- end }}
       {{- if .Values.cosi.sidecars }}
-      {{- include "common.tplvalues.render" (dict "value" .Values.cosi.sidecars "context" $) | nindent 8 }}
+      {{- include "seaweedfs.tplvalues.render" (dict "value" .Values.cosi.sidecars "context" $) | nindent 8 }}
       {{- end }}
       volumes:
         - name: socket
@@ -185,28 +181,30 @@ spec:
             {{- if .Values.cosi.existingConfigSecret }}
             secretName: {{ .Values.cosi.existingConfigSecret }}
             {{- else }}
-            secretName: seaweedfs-s3-secret
+            secretName: {{ include "seaweedfs.fullname" . }}-s3-secret
             {{- end }}
         {{- end }}
-        {{- if .Values.global.enableSecurity }}
+        {{- if include "seaweedfs.securityConfigEnabled" . }}
         - name: security-config
           configMap:
-            name: {{ template "seaweedfs.name" . }}-security-config
+            name: {{ include "seaweedfs.fullname" . }}-security-config
+        {{- end }}
+        {{- if .Values.global.seaweedfs.enableSecurity }}
         - name: ca-cert
           secret:
-            secretName: {{ template "seaweedfs.name" . }}-ca-cert
+            secretName: {{ include "seaweedfs.fullname" . }}-ca-cert
         - name: master-cert
           secret:
-            secretName: {{ template "seaweedfs.name" . }}-master-cert
+            secretName: {{ include "seaweedfs.fullname" . }}-master-cert
         - name: volume-cert
           secret:
-            secretName: {{ template "seaweedfs.name" . }}-volume-cert
+            secretName: {{ include "seaweedfs.fullname" . }}-volume-cert
         - name: filer-cert
           secret:
-            secretName: {{ template "seaweedfs.name" . }}-filer-cert
+            secretName: {{ include "seaweedfs.fullname" . }}-filer-cert
         - name: client-cert
           secret:
-            secretName: {{ template "seaweedfs.name" . }}-client-cert
+            secretName: {{ include "seaweedfs.fullname" . }}-client-cert
         {{- end }}
         {{ tpl .Values.cosi.extraVolumes . | indent 8 | trim }}
       {{- if .Values.cosi.nodeSelector }}
diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/cosi/cosi-service-account.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/cosi/cosi-service-account.yaml
index 78227fdebe..6d0a4bc387 100644
--- a/packages/system/seaweedfs/charts/seaweedfs/templates/cosi/cosi-service-account.yaml
+++ b/packages/system/seaweedfs/charts/seaweedfs/templates/cosi/cosi-service-account.yaml
@@ -1,13 +1,14 @@
+{{- include "seaweedfs.compat" . -}}
 {{- if .Values.cosi.enabled }}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: {{ .Values.global.serviceAccountName }}-objectstorage-provisioner
+  name: {{ .Values.global.seaweedfs.serviceAccountName }}-objectstorage-provisioner
   namespace: {{ .Release.Namespace }}
   labels:
     app.kubernetes.io/name: {{ template "seaweedfs.name" . }}
     helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     app.kubernetes.io/instance: {{ .Release.Name }}
-automountServiceAccountToken: {{ .Values.global.automountServiceAccountToken }}
+automountServiceAccountToken: {{ .Values.global.seaweedfs.automountServiceAccountToken }}
 {{- end }}
diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/filer/filer-grpc-ingressroutetcp.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/filer/filer-grpc-ingressroutetcp.yaml
new file mode 100644
index 0000000000..c1c2f7d789
--- /dev/null
+++ b/packages/system/seaweedfs/charts/seaweedfs/templates/filer/filer-grpc-ingressroutetcp.yaml
@@ -0,0 +1,47 @@
+{{- /* Traefik IngressRouteTCP for the filer gRPC port. Rendered instead of the
+       standard Ingress when the gRPC ingress className starts with "traefik",
+       since a Kubernetes Ingress can't do raw TCP/gRPC passthrough.
+
+       global.seaweedfs.enableSecurity controls the mode:
+         false: plain TCP, Traefik forwards h2c to the pod. A non-TLS TCP
+                router can only match HostSNI(`*`) (SNI needs TLS).
+         true:  TLS passthrough, matched by SNI so it can route on the host. */}}
+
+{{- $filerEnabled := or .Values.filer.enabled .Values.allInOne.enabled }}
+{{- $isTraefik := hasPrefix "traefik" (default "" .Values.filer.ingresses.grpc.className) }}
+{{- $securityEnabled := .Values.global.seaweedfs.enableSecurity }}
+
+{{- if and $filerEnabled .Values.filer.ingresses.grpc.enabled $isTraefik }}
+{{- $serviceName := ternary (include "seaweedfs.componentName" (list . "all-in-one")) (include "seaweedfs.componentName" (list . "filer")) .Values.allInOne.enabled }}
+apiVersion: traefik.io/v1alpha1
+kind: IngressRouteTCP
+metadata:
+  name: {{ include "seaweedfs.fullname" . }}-filer-grpc
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: {{ template "seaweedfs.name" . }}
+    helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/component: filer
+spec:
+  {{- if $securityEnabled }}
+  tls:
+    passthrough: true
+  {{- end }}
+  entryPoints:
+    {{- with .Values.filer.ingresses.grpc.entryPoint }}
+    - {{ . | quote }}
+    {{- else }}
+    - filer-grpc
+    {{- end }}
+  routes:
+    {{- if $securityEnabled }}
+    - match: HostSNI(`{{ .Values.filer.ingresses.grpc.host }}`)
+    {{- else }}
+    - match: HostSNI(`*`)
+    {{- end }}
+      services:
+        - name: {{ $serviceName }}
+          port: {{ .Values.filer.grpcPort }}
+{{- end }}
diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/filer/filer-ingress.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/filer/filer-ingress.yaml
index b185a58bab..b747cd2d86 100644
--- a/packages/system/seaweedfs/charts/seaweedfs/templates/filer/filer-ingress.yaml
+++ b/packages/system/seaweedfs/charts/seaweedfs/templates/filer/filer-ingress.yaml
@@ -1,8 +1,10 @@
-{{- /* Filer ingress works for both normal mode (filer.enabled) and all-in-one mode (allInOne.enabled) */}}
+{{- /* Filer ingresses work for both normal mode (filer.enabled) and all-in-one mode (allInOne.enabled) */}}
 {{- $filerEnabled := or .Values.filer.enabled .Values.allInOne.enabled }}
-{{- if and $filerEnabled .Values.filer.ingress.enabled }}
+
+{{- /* HTTP Ingress */}}
+{{- if and $filerEnabled .Values.filer.ingresses.http.enabled }}
 {{- /* Determine service name based on deployment mode */}}
-{{- $serviceName := ternary (printf "%s-all-in-one" (include "seaweedfs.name" .)) (printf "%s-filer" (include "seaweedfs.name" .)) .Values.allInOne.enabled }}
+{{- $serviceName := ternary (include "seaweedfs.componentName" (list . "all-in-one")) (include "seaweedfs.componentName" (list . "filer")) .Values.allInOne.enabled }}
 {{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }}
 apiVersion: networking.k8s.io/v1
 {{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion }}
@@ -12,10 +14,13 @@ apiVersion: extensions/v1beta1
 {{- end }}
 kind: Ingress
 metadata:
-  name: ingress-{{ template "seaweedfs.name" . }}-filer
+  name: ingress-{{ include "seaweedfs.fullname" . }}-filer-http
   namespace: {{ .Release.Namespace }}
-  {{- with .Values.filer.ingress.annotations }}
   annotations:
+  {{- if and (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) .Values.filer.ingresses.http.className }}
+    kubernetes.io/ingress.class: {{ .Values.filer.ingresses.http.className }}
+  {{- end }}
+  {{- with .Values.filer.ingresses.http.annotations }}
     {{- toYaml . | nindent 4 }}
   {{- end }}
   labels:
@@ -25,14 +30,21 @@ metadata:
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/component: filer
 spec:
-  ingressClassName: {{ .Values.filer.ingress.className | quote }}
+  {{- if and (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) .Values.filer.ingresses.http.className }}
+  ingressClassName: {{ .Values.filer.ingresses.http.className | quote }}
+  {{- end }}
   tls:
-    {{ .Values.filer.ingress.tls | default list | toYaml | nindent 6}}
+    {{ .Values.filer.ingresses.http.tls | default list | toYaml | nindent 6}}
   rules:
-  - http:
+  - {{- if .Values.filer.ingresses.http.host }}
+    host: {{ .Values.filer.ingresses.http.host | quote }}
+    {{- end }}
+    http:
       paths:
-      - path: {{ .Values.filer.ingress.path | quote }}
-        pathType: {{ .Values.filer.ingress.pathType | quote }}
+      - path: {{ .Values.filer.ingresses.http.path | quote }}
+        {{- if semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion }}
+        pathType: {{ .Values.filer.ingresses.http.pathType | quote }}
+        {{- end }}
         backend:
 {{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }}
           service:
@@ -43,7 +55,62 @@ spec:
           serviceName: {{ $serviceName }}
           servicePort: {{ .Values.filer.port }}
 {{- end }}
-{{- if .Values.filer.ingress.host }}
-    host: {{ .Values.filer.ingress.host }}
+{{- end }}
+
+---
+
+{{- /* gRPC Ingress (standard Kubernetes Ingress, NOT for Traefik) */}}
+{{- if and $filerEnabled .Values.filer.ingresses.grpc.enabled (not (hasPrefix "traefik" (default "" .Values.filer.ingresses.grpc.className))) }}
+{{- /* Determine service name based on deployment mode */}}
+{{- $serviceName := ternary (include "seaweedfs.componentName" (list . "all-in-one")) (include "seaweedfs.componentName" (list . "filer")) .Values.allInOne.enabled }}
+{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }}
+apiVersion: networking.k8s.io/v1
+{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion }}
+apiVersion: networking.k8s.io/v1beta1
+{{- else }}
+apiVersion: extensions/v1beta1
+{{- end }}
+kind: Ingress
+metadata:
+  name: ingress-{{ include "seaweedfs.fullname" . }}-filer-grpc
+  namespace: {{ .Release.Namespace }}
+  annotations:
+  {{- if and (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) .Values.filer.ingresses.grpc.className }}
+    kubernetes.io/ingress.class: {{ .Values.filer.ingresses.grpc.className }}
+  {{- end }}
+  {{- with .Values.filer.ingresses.grpc.annotations }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  labels:
+    app.kubernetes.io/name: {{ template "seaweedfs.name" . }}
+    helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/component: filer
+spec:
+  {{- if and (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) .Values.filer.ingresses.grpc.className }}
+  ingressClassName: {{ .Values.filer.ingresses.grpc.className | quote }}
+  {{- end }}
+  tls:
+    {{ .Values.filer.ingresses.grpc.tls | default list | toYaml | nindent 6}}
+  rules:
+  - {{- if .Values.filer.ingresses.grpc.host }}
+    host: {{ .Values.filer.ingresses.grpc.host | quote }}
+    {{- end }}
+    http:
+      paths:
+      - path: {{ .Values.filer.ingresses.grpc.path | quote }}
+        {{- if semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion }}
+        pathType: {{ .Values.filer.ingresses.grpc.pathType | quote }}
+        {{- end }}
+        backend:
+{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }}
+          service:
+            name: {{ $serviceName }}
+            port:
+              number: {{ .Values.filer.grpcPort }}
+{{- else }}
+          serviceName: {{ $serviceName }}
+          servicePort: {{ .Values.filer.grpcPort }}
 {{- end }}
 {{- end }}
diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/filer/filer-service-client.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/filer/filer-service-client.yaml
index 1c32de0ba2..ae0a1a7408 100644
--- a/packages/system/seaweedfs/charts/seaweedfs/templates/filer/filer-service-client.yaml
+++ b/packages/system/seaweedfs/charts/seaweedfs/templates/filer/filer-service-client.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ template "seaweedfs.name" . }}-filer-client
+  name: {{ include "seaweedfs.componentName" (list . "filer-client") }}
   namespace: {{ .Release.Namespace }}
   labels:
     app.kubernetes.io/name: {{ template "seaweedfs.name" . }}
@@ -10,9 +10,6 @@ metadata:
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/component: filer
-{{- if .Values.filer.metricsPort }}
-    monitoring: "true"
-{{- end }}
 {{- if .Values.filer.annotations }}
   annotations:
     {{- toYaml .Values.filer.annotations | nindent 4 }}
@@ -36,5 +33,6 @@ spec:
 {{- end }}
   selector:
     app.kubernetes.io/name: {{ template "seaweedfs.name" . }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/component: filer
 {{- end }}
diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/filer/filer-service.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/filer/filer-service.yaml
index 67436972eb..1141927eb9 100644
--- a/packages/system/seaweedfs/charts/seaweedfs/templates/filer/filer-service.yaml
+++ b/packages/system/seaweedfs/charts/seaweedfs/templates/filer/filer-service.yaml
@@ -2,9 +2,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  annotations:
-    service.alpha.kubernetes.io/tolerate-unready-endpoints: "true"
-  name: {{ template "seaweedfs.name" . }}-filer
+  name: {{ include "seaweedfs.componentName" (list . "filer") }}
   namespace: {{ .Release.Namespace }}
   labels:
     app.kubernetes.io/name: {{ template "seaweedfs.name" . }}
@@ -12,8 +10,12 @@ metadata:
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/component: filer
-{{- if .Values.filer.annotations }}
+{{- if .Values.filer.metricsPort }}
+    monitoring: "true"
+{{- end }}
   annotations:
+    service.alpha.kubernetes.io/tolerate-unready-endpoints: "true"
+{{- if .Values.filer.annotations }}
     {{- toYaml .Values.filer.annotations | nindent 4 }}
 {{- end }}
 spec:
@@ -48,5 +50,6 @@ spec:
   {{- end }}
   selector:
     app.kubernetes.io/name: {{ template "seaweedfs.name" . }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/component: filer
 {{- end }}
diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/filer/filer-servicemonitor.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/filer/filer-servicemonitor.yaml
index e26c04b1fc..f2552ce68b 100644
--- a/packages/system/seaweedfs/charts/seaweedfs/templates/filer/filer-servicemonitor.yaml
+++ b/packages/system/seaweedfs/charts/seaweedfs/templates/filer/filer-servicemonitor.yaml
@@ -1,10 +1,11 @@
+{{- include "seaweedfs.compat" . -}}
 {{- if .Values.filer.enabled }}
 {{- if .Values.filer.metricsPort }}
-{{- if .Values.global.monitoring.enabled }}
+{{- if .Values.global.seaweedfs.monitoring.enabled }}
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
-  name: {{ template "seaweedfs.name" . }}-filer
+  name: {{ include "seaweedfs.fullname" . }}-filer
   namespace: {{ .Release.Namespace }}
   labels:
     app.kubernetes.io/name: {{ template "seaweedfs.name" . }}
@@ -12,7 +13,7 @@ metadata:
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/component: filer
-    {{- with .Values.global.monitoring.additionalLabels }}
+    {{- with .Values.global.seaweedfs.monitoring.additionalLabels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
 {{- if .Values.filer.annotations }}
@@ -27,7 +28,9 @@ spec:
   selector:
     matchLabels:
       app.kubernetes.io/name: {{ template "seaweedfs.name" . }}
+      app.kubernetes.io/instance: {{ .Release.Name }}
       app.kubernetes.io/component: filer
+      monitoring: "true"
 {{- end }}
 {{- end }}
 {{- end }}
diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/filer/filer-statefulset.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/filer/filer-statefulset.yaml
index e29239c329..e505faf1c6 100644
--- a/packages/system/seaweedfs/charts/seaweedfs/templates/filer/filer-statefulset.yaml
+++ b/packages/system/seaweedfs/charts/seaweedfs/templates/filer/filer-statefulset.yaml
@@ -1,8 +1,9 @@
+{{- include "seaweedfs.compat" . -}}
 {{- if .Values.filer.enabled }}
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
-  name: {{ template "seaweedfs.name" . }}-filer
+  name: {{ include "seaweedfs.componentName" (list . "filer") }}
   namespace: {{ .Release.Namespace }}
   labels:
     app.kubernetes.io/name: {{ template "seaweedfs.name" . }}
@@ -15,7 +16,7 @@ metadata:
     {{- toYaml .Values.filer.annotations | nindent 4 }}
 {{- end }}
 spec:
-  serviceName: {{ template "seaweedfs.name" . }}-filer
+  serviceName: {{ include "seaweedfs.componentName" (list . "filer") }}
   podManagementPolicy: {{ .Values.filer.podManagementPolicy }}
   replicas: {{ .Values.filer.replicas }}
   {{- if (gt (int .Values.filer.updatePartition) 0) }}
@@ -56,7 +57,7 @@ spec:
         checksum/s3config: {{ include (print .Template.BasePath "/s3/s3-secret.yaml") . | sha256sum }}
       {{- end }}
     spec:
-      restartPolicy: {{ default .Values.global.restartPolicy .Values.filer.restartPolicy }}
+      restartPolicy: {{ default .Values.global.seaweedfs.restartPolicy .Values.filer.restartPolicy }}
       {{- if .Values.filer.affinity }}
       affinity:
         {{ tpl .Values.filer.affinity . | nindent 8 | trim }}
@@ -70,11 +71,14 @@ spec:
         {{ tpl .Values.filer.tolerations . | nindent 8 | trim }}
       {{- end }}
       {{- include "seaweedfs.imagePullSecrets" . | nindent 6 }}
-      serviceAccountName: {{ .Values.filer.serviceAccountName | default .Values.global.serviceAccountName | quote }} # for deleting statefulset pods after migration
+      serviceAccountName: {{ .Values.filer.serviceAccountName | default (include "seaweedfs.serviceAccountName" .) | quote }} # for deleting statefulset pods after migration
       terminationGracePeriodSeconds: 60
       {{- if .Values.filer.priorityClassName }}
       priorityClassName: {{ .Values.filer.priorityClassName | quote }}
       {{- end }}
+      {{- if .Values.filer.schedulerName }}
+      schedulerName: {{ .Values.filer.schedulerName | quote }}
+      {{- end }}
       enableServiceLinks: false
       {{- if .Values.filer.initContainers }}
       initContainers:
@@ -85,9 +89,10 @@ spec:
       {{- end }}
       containers:
         - name: seaweedfs
-          image: {{ template "filer.image" . }}
-          imagePullPolicy: {{ default "IfNotPresent" .Values.global.imagePullPolicy }}
+          image: {{ template "seaweedfs.filer.image" . }}
+          imagePullPolicy: {{ default "IfNotPresent" .Values.global.seaweedfs.imagePullPolicy }}
           env:
+            {{- $mysqlEnabled := include "seaweedfs.filer.mysqlEnabled" . }}
             - name: POD_IP
               valueFrom:
                 fieldRef:
@@ -100,48 +105,52 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
+            {{- if $mysqlEnabled }}
             - name: WEED_MYSQL_USERNAME
               valueFrom:
                 secretKeyRef:
-                  name: secret-seaweedfs-db
+                  name: {{ include "seaweedfs.fullname" . }}-db-secret
                   key: user
                   optional: true
             - name: WEED_MYSQL_PASSWORD
               valueFrom:
                 secretKeyRef:
-                  name: secret-seaweedfs-db
+                  name: {{ include "seaweedfs.fullname" . }}-db-secret
                   key: password
                   optional: true
+            {{- end }}
             - name: SEAWEEDFS_FULLNAME
-              value: "{{ template "seaweedfs.name" . }}"
-            {{- if .Values.filer.extraEnvironmentVars }}
-            {{- range $key, $value := .Values.filer.extraEnvironmentVars }}
-            - name: {{ $key }}
-            {{- if kindIs "string" $value }}
-              value: {{ $value | quote }}
-            {{- else }}
-              valueFrom:
-                {{ toYaml $value | nindent 16 | trim }}
-            {{- end -}}
+              value: "{{ include "seaweedfs.fullname" . }}"
+            {{- if and .Values.filer.s3.enabled .Values.filer.s3.enableAuth }}
+            {{- include "seaweedfs.s3.credentialEnv" . | nindent 12 }}
+            {{- end }}
+            {{- $mergedExtraEnvironmentVars := dict }}
+            {{- include "seaweedfs.mergeExtraEnvironmentVars" (dict "global" .Values.global.seaweedfs "component" .Values.filer "target" $mergedExtraEnvironmentVars) }}
+            {{- if not $mysqlEnabled }}
+            {{- range $key := keys $mergedExtraEnvironmentVars }}
+            {{- if hasPrefix "WEED_MYSQL_" $key }}
+            {{- $_ := unset $mergedExtraEnvironmentVars $key }}
+            {{- end }}
             {{- end }}
             {{- end }}
-            {{- if .Values.global.extraEnvironmentVars }}
-            {{- range $key, $value := .Values.global.extraEnvironmentVars }}
+            {{- range $key := keys $mergedExtraEnvironmentVars | sortAlpha }}
+            {{- $value := index $mergedExtraEnvironmentVars $key }}
             - name: {{ $key }}
             {{- if kindIs "string" $value }}
-              value: {{ $value | quote }}
+              value: {{ tpl $value $ | quote }}
             {{- else }}
               valueFrom:
                 {{ toYaml $value | nindent 16 | trim }}
             {{- end -}}
             {{- end }}
-            {{- end }}
             {{- if .Values.filer.secretExtraEnvironmentVars }}
             {{- range $key, $value := .Values.filer.secretExtraEnvironmentVars }}
+            {{- if or $mysqlEnabled (not (hasPrefix "WEED_MYSQL_" $key)) }}
             - name: {{ $key }}
               valueFrom: {{ toYaml $value | nindent 16 }}
             {{- end }}
             {{- end }}
+            {{- end }}
           command:
             - "/bin/sh"
             - "-ec"
@@ -155,7 +164,7 @@ spec:
               {{- if .Values.filer.loggingOverrideLevel }}
               -v={{ .Values.filer.loggingOverrideLevel }} \
               {{- else }}
-              -v={{ .Values.global.loggingLevel }} \
+              -v={{ .Values.global.seaweedfs.loggingLevel }} \
               {{- end }}
               filer \
               -port={{ .Values.filer.port }} \
@@ -175,8 +184,8 @@ spec:
               -disableDirListing \
               {{- end }}
               -dirListLimit={{ .Values.filer.dirListLimit }} \
-              {{- if .Values.global.enableReplication }}
-              -defaultReplicaPlacement={{ .Values.global.replicationPlacement }} \
+              {{- if .Values.global.seaweedfs.enableReplication }}
+              -defaultReplicaPlacement={{ .Values.global.seaweedfs.replicationPlacement }} \
               {{- else }}
               -defaultReplicaPlacement={{ .Values.filer.defaultReplicaPlacement }} \
               {{- end }}
@@ -206,12 +215,11 @@ spec:
               {{- if .Values.filer.s3.domainName }}
               -s3.domainName={{ .Values.filer.s3.domainName }} \
               {{- end }}
-              {{- if .Values.global.enableSecurity }}
+              {{- if .Values.global.seaweedfs.enableSecurity }}
               {{- if .Values.filer.s3.httpsPort }}
               -s3.port.https={{ .Values.filer.s3.httpsPort }} \
+              {{- include "seaweedfs.s3.tlsArgs" (dict "root" . "prefix" "s3.") | nindent 14 }}
               {{- end }}
-              -s3.cert.file=/usr/local/share/ca-certificates/client/tls.crt \
-              -s3.key.file=/usr/local/share/ca-certificates/client/tls.key \
               {{- end }}
               {{- if .Values.filer.s3.enableAuth }}
               -s3.config=/etc/sw/seaweedfs_s3_config \
@@ -229,7 +237,7 @@ spec:
             - name: seaweedfs-filer-log-volume
               mountPath: "/logs/"
             {{- end }}
-            {{- if .Values.filer.s3.enableAuth }}
+            {{- if and .Values.filer.s3.enabled .Values.filer.s3.enableAuth }}
             - name: config-users
               mountPath: /etc/sw
               readOnly: true
@@ -244,11 +252,13 @@ spec:
               mountPath: /etc/seaweedfs/notification.toml
               subPath: notification.toml
             {{- end }}
-            {{- if .Values.global.enableSecurity }}
+            {{- if include "seaweedfs.securityConfigEnabled" . }}
             - name: security-config
               readOnly: true
               mountPath: /etc/seaweedfs/security.toml
               subPath: security.toml
+            {{- end }}
+            {{- if .Values.global.seaweedfs.enableSecurity }}
             - name: ca-cert
               readOnly: true
               mountPath: /usr/local/share/ca-certificates/ca/
@@ -263,7 +273,10 @@ spec:
               mountPath: /usr/local/share/ca-certificates/filer/
             - name: client-cert
               readOnly: true
-              mountPath: /usr/local/share/ca-certificates/client/
+              mountPath: /usr/local/share/ca-certificates/client
+            {{- if .Values.filer.s3.enabled }}
+            {{- include "seaweedfs.s3.tlsVolumeMount" . | nindent 12 }}
+            {{- end }}
             {{- end }}
             {{ tpl .Values.filer.extraVolumeMounts . | nindent 12 | trim }}
           ports:
@@ -281,12 +294,19 @@ spec:
               name: swfs-s3-tls
             {{- end }}
             {{- end }}
+          {{- $jwt := (.Values.global.seaweedfs.securityConfig).jwtSigning | default dict }}
+          {{- $isJwtEnabled := or $jwt.filerWrite $jwt.filerRead }}
           {{- if .Values.filer.readinessProbe.enabled }}
           readinessProbe:
+          {{- if or $isJwtEnabled .Values.filer.readinessProbe.tcpSocket }}
+            tcpSocket:
+              port: {{ if $isJwtEnabled }}{{ .Values.filer.port }}{{ else }}{{ .Values.filer.readinessProbe.tcpSocket.port }}{{ end }}
+          {{- else }}
             httpGet:
               path: {{ .Values.filer.readinessProbe.httpGet.path }}
               port: {{ .Values.filer.port }}
               scheme: {{ .Values.filer.readinessProbe.httpGet.scheme }}
+          {{- end }}
             initialDelaySeconds: {{ .Values.filer.readinessProbe.initialDelaySeconds }}
             periodSeconds: {{ .Values.filer.readinessProbe.periodSeconds }}
             successThreshold: {{ .Values.filer.readinessProbe.successThreshold }}
@@ -295,10 +315,15 @@ spec:
           {{- end }}
           {{- if .Values.filer.livenessProbe.enabled }}
           livenessProbe:
+          {{- if or $isJwtEnabled .Values.filer.livenessProbe.tcpSocket }}
+            tcpSocket:
+              port: {{ if $isJwtEnabled }}{{ .Values.filer.port }}{{ else }}{{ .Values.filer.livenessProbe.tcpSocket.port }}{{ end }}
+          {{- else }}
             httpGet:
               path: {{ .Values.filer.livenessProbe.httpGet.path }}
               port: {{ .Values.filer.port }}
               scheme: {{ .Values.filer.livenessProbe.httpGet.scheme }}
+          {{- end }}
             initialDelaySeconds: {{ .Values.filer.livenessProbe.initialDelaySeconds }}
             periodSeconds: {{ .Values.filer.livenessProbe.periodSeconds }}
             successThreshold: {{ .Values.filer.livenessProbe.successThreshold }}
@@ -313,7 +338,7 @@ spec:
           securityContext: {{- omit .Values.filer.containerSecurityContext "enabled" | toYaml | nindent 12 }}
           {{- end }}
         {{- if .Values.filer.sidecars }}
-        {{- include "common.tplvalues.render" (dict "value" .Values.filer.sidecars "context" $) | nindent 8 }}
+        {{- include "seaweedfs.tplvalues.render" (dict "value" .Values.filer.sidecars "context" $) | nindent 8 }}
         {{- end }}
       volumes:
         {{- if eq .Values.filer.logs.type "hostPath" }}
@@ -348,7 +373,8 @@ spec:
         {{- end }}
         - name: db-schema-config-volume
           configMap:
-            name: seaweedfs-db-init-config
+            name: {{ default (printf "%s-db-init-config" (include "seaweedfs.fullname" .)) .Values.filer.dbInitConfigName }}
+            optional: true
         {{- if and .Values.filer.s3.enabled .Values.filer.s3.enableAuth }}
         - name: config-users
           secret:
@@ -356,33 +382,38 @@ spec:
             {{- if .Values.filer.s3.existingConfigSecret }}
             secretName: {{ .Values.filer.s3.existingConfigSecret }}
             {{- else }}
-            secretName: seaweedfs-s3-secret
+            secretName: {{ include "seaweedfs.fullname" . }}-s3-secret
             {{- end }}
         {{- end }}
         {{- if .Values.filer.notificationConfig }}
         - name: notification-config
           configMap:
-            name: {{ template "seaweedfs.name" . }}-notification-config
+            name: {{ include "seaweedfs.fullname" . }}-notification-config
         {{- end }}
-        {{- if .Values.global.enableSecurity }}
+        {{- if include "seaweedfs.securityConfigEnabled" . }}
         - name: security-config
           configMap:
-            name: {{ template "seaweedfs.name" . }}-security-config
+            name: {{ include "seaweedfs.fullname" . }}-security-config
+        {{- end }}
+        {{- if .Values.global.seaweedfs.enableSecurity }}
         - name: ca-cert
           secret:
-            secretName: {{ template "seaweedfs.name" . }}-ca-cert
+            secretName: {{ include "seaweedfs.fullname" . }}-ca-cert
         - name: master-cert
           secret:
-            secretName: {{ template "seaweedfs.name" . }}-master-cert
+            secretName: {{ include "seaweedfs.fullname" . }}-master-cert
         - name: volume-cert
           secret:
-            secretName: {{ template "seaweedfs.name" . }}-volume-cert
+            secretName: {{ include "seaweedfs.fullname" . }}-volume-cert
         - name: filer-cert
           secret:
-            secretName: {{ template "seaweedfs.name" . }}-filer-cert
+            secretName: {{ include "seaweedfs.fullname" . }}-filer-cert
         - name: client-cert
           secret:
-            secretName: {{ template "seaweedfs.name" . }}-client-cert
+            secretName: {{ include "seaweedfs.fullname" . }}-client-cert
+        {{- if .Values.filer.s3.enabled }}
+        {{- include "seaweedfs.s3.tlsVolume" . | nindent 8 }}
+        {{- end }}
         {{- end }}
         {{ tpl .Values.filer.extraVolumes . | indent 8 | trim }}
       {{- if .Values.filer.nodeSelector }}
@@ -406,7 +437,7 @@ spec:
       storageClassName: {{ .Values.filer.storageClass }}
       {{- end }}
   {{- end }}
-  {{- $pvc_exists := include "filer.pvc_exists" . -}}
+  {{- $pvc_exists := include "seaweedfs.filer.pvc_exists" . -}}
   {{- if $pvc_exists }}
   volumeClaimTemplates:
     {{- if eq .Values.filer.data.type "persistentVolumeClaim" }}
diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/master/master-configmap.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/master/master-configmap.yaml
index b3d7fe7d94..b5475d5d75 100644
--- a/packages/system/seaweedfs/charts/seaweedfs/templates/master/master-configmap.yaml
+++ b/packages/system/seaweedfs/charts/seaweedfs/templates/master/master-configmap.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ template "seaweedfs.name" . }}-master-config
+  name: {{ include "seaweedfs.fullname" . }}-master-config
   namespace: {{ .Release.Namespace }}
   labels:
     app.kubernetes.io/name: {{ template "seaweedfs.name" . }}
diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/master/master-ingress.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/master/master-ingress.yaml
index ac1cb33925..75319709a7 100644
--- a/packages/system/seaweedfs/charts/seaweedfs/templates/master/master-ingress.yaml
+++ b/packages/system/seaweedfs/charts/seaweedfs/templates/master/master-ingress.yaml
@@ -9,7 +9,7 @@ apiVersion: extensions/v1beta1
 {{- end }}
 kind: Ingress
 metadata:
-  name: ingress-{{ template "seaweedfs.name" . }}-master
+  name: ingress-{{ include "seaweedfs.fullname" . }}-master
   namespace: {{ .Release.Namespace }}
   {{- with .Values.master.ingress.annotations }}
   annotations:
@@ -33,15 +33,15 @@ spec:
             backend:
 {{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }}
               service:
-                name: {{ template "seaweedfs.name" . }}-master
+                name: {{ include "seaweedfs.componentName" (list . "master") }}
                 port:
                   number: {{ .Values.master.port }}
                   #name:
 {{- else }}
-              serviceName: {{ template "seaweedfs.name" . }}-master
+              serviceName: {{ include "seaweedfs.componentName" (list . "master") }}
               servicePort: {{ .Values.master.port }}
 {{- end }}
-{{- if .Values.filer.ingress.host }}
+{{- if .Values.master.ingress.host }}
       host: {{ .Values.master.ingress.host }}
 {{- end }}
 {{- end }}
diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/master/master-service.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/master/master-service.yaml
index 0086b84c1a..7b2c5cfd13 100644
--- a/packages/system/seaweedfs/charts/seaweedfs/templates/master/master-service.yaml
+++ b/packages/system/seaweedfs/charts/seaweedfs/templates/master/master-service.yaml
@@ -2,13 +2,14 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ template "seaweedfs.name" . }}-master
+  name: {{ include "seaweedfs.componentName" (list . "master") }}
   namespace: {{ .Release.Namespace }}
   labels:
     app.kubernetes.io/name: {{ template "seaweedfs.name" . }}
     app.kubernetes.io/component: master
     helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
   annotations:
     service.alpha.kubernetes.io/tolerate-unready-endpoints: "true"
 {{- if .Values.master.annotations }}
@@ -34,5 +35,6 @@ spec:
   {{- end }}
   selector:
     app.kubernetes.io/name: {{ template "seaweedfs.name" . }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/component: master
 {{- end }}
diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/master/master-servicemonitor.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/master/master-servicemonitor.yaml
index 7804e84ae6..2ce626840a 100644
--- a/packages/system/seaweedfs/charts/seaweedfs/templates/master/master-servicemonitor.yaml
+++ b/packages/system/seaweedfs/charts/seaweedfs/templates/master/master-servicemonitor.yaml
@@ -1,10 +1,11 @@
+{{- include "seaweedfs.compat" . -}}
 {{- if .Values.master.enabled }}
 {{- if .Values.master.metricsPort }}
-{{- if .Values.global.monitoring.enabled }}
+{{- if .Values.global.seaweedfs.monitoring.enabled }}
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
-  name: {{ template "seaweedfs.name" . }}-master
+  name: {{ include "seaweedfs.fullname" . }}-master
   namespace: {{ .Release.Namespace }}
   labels:
     app.kubernetes.io/name: {{ template "seaweedfs.name" . }}
@@ -12,7 +13,7 @@ metadata:
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/component: master
-    {{- with .Values.global.monitoring.additionalLabels }}
+    {{- with .Values.global.seaweedfs.monitoring.additionalLabels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
 {{- if .Values.master.annotations }}
@@ -27,6 +28,7 @@ spec:
   selector:
     matchLabels:
       app.kubernetes.io/name: {{ template "seaweedfs.name" . }}
+      app.kubernetes.io/instance: {{ .Release.Name }}
       app.kubernetes.io/component: master
 {{- end }}
 {{- end }}
diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/master/master-statefulset.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/master/master-statefulset.yaml
index 50e0e97d4f..914f0dfd11 100644
--- a/packages/system/seaweedfs/charts/seaweedfs/templates/master/master-statefulset.yaml
+++ b/packages/system/seaweedfs/charts/seaweedfs/templates/master/master-statefulset.yaml
@@ -1,8 +1,9 @@
+{{- include "seaweedfs.compat" . -}}
 {{- if .Values.master.enabled }}
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
-  name: {{ template "seaweedfs.name" . }}-master
+  name: {{ include "seaweedfs.componentName" (list . "master") }}
   namespace: {{ .Release.Namespace }}
   labels:
     app.kubernetes.io/name: {{ template "seaweedfs.name" . }}
@@ -15,7 +16,7 @@ metadata:
     {{- toYaml .Values.master.annotations | nindent 4 }}
 {{- end }}
 spec:
-  serviceName: {{ template "seaweedfs.name" . }}-master
+  serviceName: {{ include "seaweedfs.componentName" (list . "master") }}
   podManagementPolicy: {{ .Values.master.podManagementPolicy }}
   replicas: {{ .Values.master.replicas }}
   {{- if (gt (int .Values.master.updatePartition) 0) }}
@@ -50,7 +51,7 @@ spec:
       {{- toYaml . | nindent 8 }}
       {{- end }}
     spec:
-      restartPolicy: {{ default .Values.global.restartPolicy .Values.master.restartPolicy }}
+      restartPolicy: {{ default .Values.global.seaweedfs.restartPolicy .Values.master.restartPolicy }}
       {{- if .Values.master.affinity }}
       affinity:
         {{ tpl .Values.master.affinity . | nindent 8 | trim }}
@@ -68,10 +69,11 @@ spec:
       {{- if .Values.master.priorityClassName }}
       priorityClassName: {{ .Values.master.priorityClassName | quote }}
       {{- end }}
-      enableServiceLinks: false
-      {{- if .Values.global.createClusterRole }}
-      serviceAccountName: {{ .Values.master.serviceAccountName | default .Values.global.serviceAccountName | quote }} # for deleting statefulset pods after migration
+      {{- if .Values.master.schedulerName }}
+      schedulerName: {{ .Values.master.schedulerName | quote }}
       {{- end }}
+      enableServiceLinks: false
+      serviceAccountName: {{ .Values.master.serviceAccountName | default (include "seaweedfs.serviceAccountName" .) | quote }} # for deleting statefulset pods after migration
       {{- if .Values.master.initContainers }}
       initContainers:
         {{ tpl .Values.master.initContainers . | nindent 8 | trim }}
@@ -81,9 +83,10 @@ spec:
       {{- end }}
       containers:
         - name: seaweedfs
-          image: {{ template "master.image" . }}
-          imagePullPolicy: {{ default "IfNotPresent" .Values.global.imagePullPolicy }}
+          image: {{ template "seaweedfs.master.image" . }}
+          imagePullPolicy: {{ default "IfNotPresent" .Values.global.seaweedfs.imagePullPolicy }}
           env:
+            {{- include "seaweedfs.licenseEnv" . | nindent 12 }}
             - name: POD_IP
               valueFrom:
                 fieldRef:
@@ -97,29 +100,19 @@ spec:
                 fieldRef:
                   fieldPath: metadata.namespace
             - name: SEAWEEDFS_FULLNAME
-              value: "{{ template "seaweedfs.name" . }}"
-            {{- if .Values.master.extraEnvironmentVars }}
-            {{- range $key, $value := .Values.master.extraEnvironmentVars }}
+              value: "{{ include "seaweedfs.fullname" . }}"
+            {{- $mergedExtraEnvironmentVars := dict }}
+            {{- include "seaweedfs.mergeExtraEnvironmentVars" (dict "global" .Values.global.seaweedfs "component" .Values.master "target" $mergedExtraEnvironmentVars) }}
+            {{- range $key := keys $mergedExtraEnvironmentVars | sortAlpha }}
+            {{- $value := index $mergedExtraEnvironmentVars $key }}
             - name: {{ $key }}
             {{- if kindIs "string" $value }}
-              value: {{ $value | quote }}
+              value: {{ tpl $value $ | quote }}
             {{- else }}
               valueFrom:
                 {{ toYaml $value | nindent 16 | trim }}
             {{- end -}}
             {{- end }}
-            {{- end }}
-            {{- if .Values.global.extraEnvironmentVars }}
-            {{- range $key, $value := .Values.global.extraEnvironmentVars }}
-            - name: {{ $key }}
-            {{- if kindIs "string" $value }}
-              value: {{ $value | quote }}
-            {{- else }}
-              valueFrom:
-                {{ toYaml $value | nindent 16 | trim }}
-            {{- end -}}
-            {{- end }}
-            {{- end }}
           command:
             - "/bin/sh"
             - "-ec"
@@ -133,23 +126,23 @@ spec:
               {{- if .Values.master.loggingOverrideLevel }}
               -v={{ .Values.master.loggingOverrideLevel }} \
               {{- else }}
-              -v={{ .Values.global.loggingLevel }} \
+              -v={{ .Values.global.seaweedfs.loggingLevel }} \
               {{- end }}
               master \
               -port={{ .Values.master.port }} \
               -mdir=/data \
               -ip.bind={{ .Values.master.ipBind }} \
-              {{- if .Values.global.enableReplication }}
-              -defaultReplication={{ .Values.global.replicationPlacement }} \
+              {{- if .Values.global.seaweedfs.enableReplication }}
+              -defaultReplication={{ .Values.global.seaweedfs.replicationPlacement }} \
               {{- else }}
               -defaultReplication={{ .Values.master.defaultReplication }} \
               {{- end }}
               {{- if .Values.master.volumePreallocate }}
               -volumePreallocate \
               {{- end }}
-              {{- if .Values.global.monitoring.enabled }}
-              {{- if and .Values.global.monitoring.gatewayHost .Values.global.monitoring.gatewayPort }}
-              -metrics.address="{{ .Values.global.monitoring.gatewayHost }}:{{ .Values.global.monitoring.gatewayPort }}" \
+              {{- if .Values.global.seaweedfs.monitoring.enabled }}
+              {{- if and .Values.global.seaweedfs.monitoring.gatewayHost .Values.global.seaweedfs.monitoring.gatewayPort }}
+              -metrics.address="{{ .Values.global.seaweedfs.monitoring.gatewayHost }}:{{ .Values.global.seaweedfs.monitoring.gatewayPort }}" \
               {{- if .Values.master.metricsIntervalSec }}
               -metrics.intervalSeconds={{ .Values.master.metricsIntervalSec }} \
               {{- end }}
@@ -183,7 +176,7 @@ spec:
               {{- if .Values.master.garbageThreshold }}
               -garbageThreshold={{ .Values.master.garbageThreshold }} \
               {{- end }}
-              -ip=${POD_NAME}.${SEAWEEDFS_FULLNAME}-master.{{ .Release.Namespace }} \
+              -ip=${POD_NAME}.{{ include "seaweedfs.componentName" (list . "master") }}.{{ .Release.Namespace }} \
               -peers={{ include "seaweedfs.masterServers" . }} \
               {{- range .Values.master.extraArgs }}
               {{ . }} \
@@ -199,11 +192,13 @@ spec:
               readOnly: true
               mountPath: /etc/seaweedfs/master.toml
               subPath: master.toml
-            {{- if .Values.global.enableSecurity }}
+            {{- if include "seaweedfs.securityConfigEnabled" . }}
             - name: security-config
               readOnly: true
               mountPath: /etc/seaweedfs/security.toml
               subPath: security.toml
+            {{- end }}
+            {{- if .Values.global.seaweedfs.enableSecurity }}
             - name: ca-cert
               readOnly: true
               mountPath: /usr/local/share/ca-certificates/ca/
@@ -220,11 +215,12 @@ spec:
               readOnly: true
               mountPath: /usr/local/share/ca-certificates/client/
             {{- end }}
+            {{- include "seaweedfs.licenseVolumeMount" . | nindent 12 }}
             {{ tpl .Values.master.extraVolumeMounts . | nindent 12 | trim }}
           ports:
             - containerPort: {{ .Values.master.port }}
               name: swfs-master
-            {{- if and .Values.global.monitoring.enabled .Values.master.metricsPort }}
+            {{- if and .Values.global.seaweedfs.monitoring.enabled .Values.master.metricsPort }}
             - containerPort: {{ .Values.master.metricsPort }}
               name: metrics
             {{- end }}
@@ -262,9 +258,10 @@ spec:
           securityContext: {{- omit .Values.master.containerSecurityContext "enabled" | toYaml | nindent 12 }}
           {{- end }}
         {{- if .Values.master.sidecars }}
-        {{- include "common.tplvalues.render" (dict "value" .Values.master.sidecars "context" $) | nindent 8 }}
+        {{- include "seaweedfs.tplvalues.render" (dict "value" .Values.master.sidecars "context" $) | nindent 8 }}
         {{- end }}
       volumes:
+        {{- include "seaweedfs.licenseVolume" . | nindent 8 }}
         {{- if eq .Values.master.logs.type "hostPath" }}
         - name: seaweedfs-master-log-volume
           hostPath:
@@ -297,33 +294,35 @@ spec:
         {{- end }}
         - name: master-config
           configMap:
-            name: {{ template "seaweedfs.name" . }}-master-config
-        {{- if .Values.global.enableSecurity }}
+            name: {{ include "seaweedfs.fullname" . }}-master-config
+        {{- if include "seaweedfs.securityConfigEnabled" . }}
         - name: security-config
           configMap:
-            name: {{ template "seaweedfs.name" . }}-security-config
+            name: {{ include "seaweedfs.fullname" . }}-security-config
+        {{- end }}
+        {{- if .Values.global.seaweedfs.enableSecurity }}
         - name: ca-cert
           secret:
-            secretName: {{ template "seaweedfs.name" . }}-ca-cert
+            secretName: {{ include "seaweedfs.fullname" . }}-ca-cert
         - name: master-cert
           secret:
-            secretName: {{ template "seaweedfs.name" . }}-master-cert
+            secretName: {{ include "seaweedfs.fullname" . }}-master-cert
         - name: volume-cert
           secret:
-            secretName: {{ template "seaweedfs.name" . }}-volume-cert
+            secretName: {{ include "seaweedfs.fullname" . }}-volume-cert
         - name: filer-cert
           secret:
-            secretName: {{ template "seaweedfs.name" . }}-filer-cert
+            secretName: {{ include "seaweedfs.fullname" . }}-filer-cert
         - name: client-cert
           secret:
-            secretName: {{ template "seaweedfs.name" . }}-client-cert
+            secretName: {{ include "seaweedfs.fullname" . }}-client-cert
         {{- end }}
         {{ tpl .Values.master.extraVolumes . | indent 8 | trim }}
       {{- if .Values.master.nodeSelector }}
       nodeSelector:
         {{ tpl .Values.master.nodeSelector . | indent 8 | trim }}
       {{- end }}
-  {{- $pvc_exists := include "master.pvc_exists" . -}}
+  {{- $pvc_exists := include "seaweedfs.master.pvc_exists" . -}}
   {{- if $pvc_exists }}
   volumeClaimTemplates:
     {{- if eq .Values.master.data.type "persistentVolumeClaim"}}
diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/s3/s3-deployment.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/s3/s3-deployment.yaml
index 29dd2d4349..cf5710ba0c 100644
--- a/packages/system/seaweedfs/charts/seaweedfs/templates/s3/s3-deployment.yaml
+++ b/packages/system/seaweedfs/charts/seaweedfs/templates/s3/s3-deployment.yaml
@@ -1,8 +1,9 @@
+{{- include "seaweedfs.compat" . -}}
 {{- if .Values.s3.enabled }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ template "seaweedfs.name" . }}-s3
+  name: {{ include "seaweedfs.fullname" . }}-s3
   namespace: {{ .Release.Namespace }}
   labels:
     app.kubernetes.io/name: {{ template "seaweedfs.name" . }}
@@ -42,7 +43,7 @@ spec:
       {{- toYaml . | nindent 8 }}
       {{- end }}
     spec:
-      restartPolicy: {{ default .Values.global.restartPolicy .Values.s3.restartPolicy }}
+      restartPolicy: {{ default .Values.global.seaweedfs.restartPolicy .Values.s3.restartPolicy }}
       {{- if .Values.s3.affinity }}
       affinity:
         {{ tpl .Values.s3.affinity . | nindent 8 | trim }}
@@ -60,6 +61,9 @@ spec:
       {{- if .Values.s3.priorityClassName }}
       priorityClassName: {{ .Values.s3.priorityClassName | quote }}
       {{- end }}
+      {{- if .Values.s3.schedulerName }}
+      schedulerName: {{ .Values.s3.schedulerName | quote }}
+      {{- end }}
       enableServiceLinks: false
       {{- if .Values.s3.serviceAccountName }}
       serviceAccountName: {{ .Values.s3.serviceAccountName | quote }}
@@ -73,8 +77,8 @@ spec:
       {{- end }}
       containers:
         - name: seaweedfs
-          image: {{ template "s3.image" . }}
-          imagePullPolicy: {{ default "IfNotPresent" .Values.global.imagePullPolicy }}
+          image: {{ template "seaweedfs.s3.image" . }}
+          imagePullPolicy: {{ default "IfNotPresent" .Values.global.seaweedfs.imagePullPolicy }}
           env:
             - name: POD_IP
               valueFrom:
@@ -89,29 +93,22 @@ spec:
                 fieldRef:
                   fieldPath: metadata.namespace
             - name: SEAWEEDFS_FULLNAME
-              value: "{{ template "seaweedfs.name" . }}"
-            {{- if .Values.s3.extraEnvironmentVars }}
-            {{- range $key, $value := .Values.s3.extraEnvironmentVars }}
-            - name: {{ $key }}
-            {{- if kindIs "string" $value }}
-              value: {{ $value | quote }}
-            {{- else }}
-              valueFrom:
-                {{ toYaml $value | nindent 16 | trim }}
-            {{- end -}}
-            {{- end }}
+              value: "{{ include "seaweedfs.fullname" . }}"
+            {{- if .Values.s3.enableAuth }}
+            {{- include "seaweedfs.s3.credentialEnv" . | nindent 12 }}
             {{- end }}
-            {{- if .Values.global.extraEnvironmentVars }}
-            {{- range $key, $value := .Values.global.extraEnvironmentVars }}
+            {{- $mergedExtraEnvironmentVars := dict }}
+            {{- include "seaweedfs.mergeExtraEnvironmentVars" (dict "global" .Values.global.seaweedfs "component" .Values.s3 "target" $mergedExtraEnvironmentVars) }}
+            {{- range $key := keys $mergedExtraEnvironmentVars | sortAlpha }}
+            {{- $value := index $mergedExtraEnvironmentVars $key }}
             - name: {{ $key }}
             {{- if kindIs "string" $value }}
-              value: {{ $value | quote }}
+              value: {{ tpl $value $ | quote }}
             {{- else }}
               valueFrom:
                 {{ toYaml $value | nindent 16 | trim }}
             {{- end -}}
             {{- end }}
-            {{- end }}
           command:
             - "/bin/sh"
             - "-ec"
@@ -125,7 +122,7 @@ spec:
               {{- if .Values.s3.loggingOverrideLevel }}
               -v={{ .Values.s3.loggingOverrideLevel }} \
               {{- else }}
-              -v={{ .Values.global.loggingLevel }} \
+              -v={{ .Values.global.seaweedfs.loggingLevel }} \
               {{- end }}
               s3 \
               -ip.bind={{ .Values.s3.bindAddress }} \
@@ -133,12 +130,11 @@ spec:
               {{- if .Values.s3.metricsPort }}
               -metricsPort {{ .Values.s3.metricsPort }} \
               {{- end }}
-              {{- if .Values.global.enableSecurity }}
+              {{- if .Values.global.seaweedfs.enableSecurity }}
               {{- if .Values.s3.httpsPort }}
               -port.https={{ .Values.s3.httpsPort }} \
               {{- end }}
-              -cert.file=/usr/local/share/ca-certificates/client/tls.crt \
-              -key.file=/usr/local/share/ca-certificates/client/tls.key \
+              {{- include "seaweedfs.s3.tlsArgs" (dict "root" . "prefix" "") | nindent 14 }}
               {{- end }}
               {{- if .Values.s3.domainName }}
               -domainName={{ .Values.s3.domainName }} \
@@ -149,7 +145,11 @@ spec:
               {{- if .Values.s3.auditLogConfig }}
               -auditLogConfig=/etc/sw/s3_auditLogConfig.json \
               {{- end }}
-              -filer={{ template "seaweedfs.name" . }}-filer-client.{{ .Release.Namespace }}:{{ .Values.filer.port }} \
+              -filer={{ include "seaweedfs.componentName" (list . "filer-client") }}.{{ .Release.Namespace }}:{{ .Values.filer.port }} \
+              {{- /* rendered even when 0: an if would drop the flag and weed would serve its 8181 default */}}
+              -port.iceberg={{ .Values.s3.icebergPort | default 0 }} \
+              {{- /* rendered even when 0: an if would drop the flag and weed would serve its default */}}
+              -port.lance={{ .Values.s3.lancePort | default 0 }} \
               {{- range .Values.s3.extraArgs }}
               {{ . }} \
               {{- end }}
@@ -163,11 +163,13 @@ spec:
               name: config-users
               readOnly: true
             {{- end }}
-            {{- if .Values.global.enableSecurity }}
+            {{- if include "seaweedfs.securityConfigEnabled" . }}
             - name: security-config
               readOnly: true
               mountPath: /etc/seaweedfs/security.toml
               subPath: security.toml
+            {{- end }}
+            {{- if .Values.global.seaweedfs.enableSecurity }}
             - name: ca-cert
               readOnly: true
               mountPath: /usr/local/share/ca-certificates/ca/
@@ -183,6 +185,7 @@ spec:
             - name: client-cert
               readOnly: true
               mountPath: /usr/local/share/ca-certificates/client/
+            {{- include "seaweedfs.s3.tlsVolumeMount" . | nindent 12 }}
             {{- end }}
             {{ tpl .Values.s3.extraVolumeMounts . | nindent 12 | trim }}
           ports:
@@ -192,6 +195,14 @@ spec:
             - containerPort: {{ .Values.s3.httpsPort }}
               name: swfs-s3-tls
             {{- end }}
+            {{- if .Values.s3.icebergPort }}
+            - containerPort: {{ .Values.s3.icebergPort }}
+              name: swfs-iceberg
+            {{- end }}
+            {{- if .Values.s3.lancePort }}
+            - containerPort: {{ .Values.s3.lancePort }}
+              name: swfs-lance
+            {{- end }}
             {{- if .Values.s3.metricsPort }}
             - containerPort: {{ .Values.s3.metricsPort }}
               name: metrics
@@ -228,7 +239,7 @@ spec:
           securityContext: {{- omit .Values.s3.containerSecurityContext "enabled" | toYaml | nindent 12 }}
           {{- end }}
       {{- if .Values.s3.sidecars }}
-      {{- include "common.tplvalues.render" (dict "value" .Values.s3.sidecars "context" $) | nindent 8 }}
+      {{- include "seaweedfs.tplvalues.render" (dict "value" .Values.s3.sidecars "context" $) | nindent 8 }}
       {{- end }}
       volumes:
         {{- if .Values.s3.enableAuth }}
@@ -238,7 +249,7 @@ spec:
             {{- if .Values.s3.existingConfigSecret }}
             secretName: {{ .Values.s3.existingConfigSecret }}
             {{- else }}
-            secretName: seaweedfs-s3-secret
+            secretName: {{ include "seaweedfs.fullname" . }}-s3-secret
             {{- end }}
         {{- end }}
         {{- if eq .Values.s3.logs.type "hostPath" }}
@@ -251,25 +262,28 @@ spec:
         - name: logs
           emptyDir: {}
         {{- end }}
-        {{- if .Values.global.enableSecurity }}
+        {{- if include "seaweedfs.securityConfigEnabled" . }}
         - name: security-config
           configMap:
-            name: {{ template "seaweedfs.name" . }}-security-config
+            name: {{ include "seaweedfs.fullname" . }}-security-config
+        {{- end }}
+        {{- if .Values.global.seaweedfs.enableSecurity }}
         - name: ca-cert
           secret:
-            secretName: {{ template "seaweedfs.name" . }}-ca-cert
+            secretName: {{ include "seaweedfs.fullname" . }}-ca-cert
         - name: master-cert
           secret:
-            secretName: {{ template "seaweedfs.name" . }}-master-cert
+            secretName: {{ include "seaweedfs.fullname" . }}-master-cert
         - name: volume-cert
           secret:
-            secretName: {{ template "seaweedfs.name" . }}-volume-cert
+            secretName: {{ include "seaweedfs.fullname" . }}-volume-cert
         - name: filer-cert
           secret:
-            secretName: {{ template "seaweedfs.name" . }}-filer-cert
+            secretName: {{ include "seaweedfs.fullname" . }}-filer-cert
         - name: client-cert
           secret:
-            secretName: {{ template "seaweedfs.name" . }}-client-cert
+            secretName: {{ include "seaweedfs.fullname" . }}-client-cert
+        {{- include "seaweedfs.s3.tlsVolume" . | nindent 8 }}
         {{- end }}
         {{ tpl .Values.s3.extraVolumes . | indent 8 | trim }}
       {{- if .Values.s3.nodeSelector }}
diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/s3/s3-iceberg-ingress.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/s3/s3-iceberg-ingress.yaml
new file mode 100644
index 0000000000..68db538dcf
--- /dev/null
+++ b/packages/system/seaweedfs/charts/seaweedfs/templates/s3/s3-iceberg-ingress.yaml
@@ -0,0 +1,61 @@
+{{- define "seaweedfs.s3.iceberg.ingress.paths" -}}
+paths:
+- path: {{ .Values.s3.icebergIngress.path | quote }}
+  pathType: {{ .Values.s3.icebergIngress.pathType | quote }}
+  backend:
+    {{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }}
+    service:
+      name: {{ template "seaweedfs.name" . }}-s3
+      port:
+        number: {{ .Values.s3.icebergPort }}
+    {{- else }}
+    serviceName: {{ template "seaweedfs.name" . }}-s3
+    servicePort: {{ .Values.s3.icebergPort }}
+    {{- end }}
+{{- end -}}
+{{- if and .Values.s3.enabled .Values.s3.icebergPort .Values.s3.icebergIngress.enabled }}
+{{- $hosts := list }}
+{{- if kindIs "slice" .Values.s3.icebergIngress.host }}
+  {{- $hosts = .Values.s3.icebergIngress.host }}
+{{- else if .Values.s3.icebergIngress.host }}
+  {{- $hosts = list .Values.s3.icebergIngress.host }}
+{{- end }}
+{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }}
+apiVersion: networking.k8s.io/v1
+{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion }}
+apiVersion: networking.k8s.io/v1beta1
+{{- else }}
+apiVersion: extensions/v1beta1
+{{- end }}
+kind: Ingress
+metadata:
+  name: ingress-{{ include "seaweedfs.fullname" . }}-s3-iceberg
+  namespace: {{ .Release.Namespace }}
+  {{- with .Values.s3.icebergIngress.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  labels:
+    app.kubernetes.io/name: {{ template "seaweedfs.name" . }}
+    helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/component: s3-iceberg
+spec:
+  {{- if .Values.s3.icebergIngress.className }}
+  ingressClassName: {{ .Values.s3.icebergIngress.className | quote }}
+  {{- end }}
+  tls:
+    {{ .Values.s3.icebergIngress.tls | default list | toYaml | nindent 6}}
+  rules:
+{{- if $hosts }}
+{{- range $host := $hosts }}
+  - host: {{ $host | quote }}
+    http:
+      {{- include "seaweedfs.s3.iceberg.ingress.paths" $ | nindent 6 }}
+{{- end }}
+{{- else }}
+  - http:
+      {{- include "seaweedfs.s3.iceberg.ingress.paths" . | nindent 4 }}
+{{- end }}
+{{- end }}
diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/s3/s3-ingress.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/s3/s3-ingress.yaml
index e884f4fcee..c92063f8c4 100644
--- a/packages/system/seaweedfs/charts/seaweedfs/templates/s3/s3-ingress.yaml
+++ b/packages/system/seaweedfs/charts/seaweedfs/templates/s3/s3-ingress.yaml
@@ -2,7 +2,7 @@
 {{- $s3Enabled := or .Values.s3.enabled (and .Values.filer.s3.enabled (not .Values.allInOne.enabled)) (and .Values.allInOne.enabled .Values.allInOne.s3.enabled) }}
 {{- if and $s3Enabled .Values.s3.ingress.enabled }}
 {{- /* Determine service name based on deployment mode */}}
-{{- $serviceName := ternary (printf "%s-all-in-one" (include "seaweedfs.name" .)) (printf "%s-s3" (include "seaweedfs.name" .)) .Values.allInOne.enabled }}
+{{- $serviceName := ternary (include "seaweedfs.componentName" (list . "all-in-one")) (printf "%s-s3" (include "seaweedfs.name" .)) .Values.allInOne.enabled }}
 {{- $s3Port := .Values.allInOne.s3.port | default .Values.s3.port }}
 {{- /* Build hosts list - support both legacy .host (string) and new .hosts (array) for backwards compatibility */}}
 {{- $hosts := list }}
@@ -20,7 +20,7 @@ apiVersion: extensions/v1beta1
 {{- end }}
 kind: Ingress
 metadata:
-  name: ingress-{{ template "seaweedfs.name" . }}-s3
+  name: ingress-{{ include "seaweedfs.fullname" . }}-s3
   namespace: {{ .Release.Namespace }}
   {{- with .Values.s3.ingress.annotations }}
   annotations:
diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/s3/s3-lance-ingress.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/s3/s3-lance-ingress.yaml
new file mode 100644
index 0000000000..32033a8f14
--- /dev/null
+++ b/packages/system/seaweedfs/charts/seaweedfs/templates/s3/s3-lance-ingress.yaml
@@ -0,0 +1,61 @@
+{{- define "seaweedfs.s3.lance.ingress.paths" -}}
+paths:
+- path: {{ .Values.s3.lanceIngress.path | quote }}
+  pathType: {{ .Values.s3.lanceIngress.pathType | quote }}
+  backend:
+    {{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }}
+    service:
+      name: {{ include "seaweedfs.componentName" (list . "s3") }}
+      port:
+        number: {{ .Values.s3.lancePort }}
+    {{- else }}
+    serviceName: {{ include "seaweedfs.componentName" (list . "s3") }}
+    servicePort: {{ .Values.s3.lancePort }}
+    {{- end }}
+{{- end -}}
+{{- if and .Values.s3.enabled .Values.s3.lancePort .Values.s3.lanceIngress.enabled }}
+{{- $hosts := list }}
+{{- if kindIs "slice" .Values.s3.lanceIngress.host }}
+  {{- $hosts = .Values.s3.lanceIngress.host }}
+{{- else if .Values.s3.lanceIngress.host }}
+  {{- $hosts = list .Values.s3.lanceIngress.host }}
+{{- end }}
+{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }}
+apiVersion: networking.k8s.io/v1
+{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion }}
+apiVersion: networking.k8s.io/v1beta1
+{{- else }}
+apiVersion: extensions/v1beta1
+{{- end }}
+kind: Ingress
+metadata:
+  name: ingress-{{ include "seaweedfs.fullname" . }}-s3-lance
+  namespace: {{ .Release.Namespace }}
+  {{- with .Values.s3.lanceIngress.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  labels:
+    app.kubernetes.io/name: {{ template "seaweedfs.name" . }}
+    helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/component: s3-lance
+spec:
+  {{- if .Values.s3.lanceIngress.className }}
+  ingressClassName: {{ .Values.s3.lanceIngress.className | quote }}
+  {{- end }}
+  tls:
+    {{ .Values.s3.lanceIngress.tls | default list | toYaml | nindent 6}}
+  rules:
+{{- if $hosts }}
+{{- range $host := $hosts }}
+  - host: {{ $host | quote }}
+    http:
+      {{- include "seaweedfs.s3.lance.ingress.paths" $ | nindent 6 }}
+{{- end }}
+{{- else }}
+  - http:
+      {{- include "seaweedfs.s3.lance.ingress.paths" . | nindent 4 }}
+{{- end }}
+{{- end }}
diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/s3/s3-secret.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/s3/s3-secret.yaml
index 587ea77c4b..2c1d87da51 100644
--- a/packages/system/seaweedfs/charts/seaweedfs/templates/s3/s3-secret.yaml
+++ b/packages/system/seaweedfs/charts/seaweedfs/templates/s3/s3-secret.yaml
@@ -1,13 +1,44 @@
-{{- if or (and (or .Values.s3.enabled .Values.allInOne.enabled) .Values.s3.enableAuth (not .Values.s3.existingConfigSecret)) (and .Values.filer.s3.enabled .Values.filer.s3.enableAuth (not .Values.filer.s3.existingConfigSecret)) }}
-{{- $access_key_admin := include "getOrGeneratePassword" (dict "namespace" .Release.Namespace "secretName" "seaweedfs-s3-secret" "key" "admin_access_key_id" "length" 20) -}}
-{{- $secret_key_admin := include "getOrGeneratePassword" (dict "namespace" .Release.Namespace "secretName" "seaweedfs-s3-secret" "key" "admin_secret_access_key" "length" 40) -}}
-{{- $access_key_read := include "getOrGeneratePassword" (dict "namespace" .Release.Namespace "secretName" "seaweedfs-s3-secret" "key" "read_access_key_id" "length" 20) -}}
-{{- $secret_key_read := include "getOrGeneratePassword" (dict "namespace" .Release.Namespace "secretName" "seaweedfs-s3-secret" "key" "read_secret_access_key" "length" 40) -}}
+{{- /* Mirrors the condition the all-in-one deployment mounts this secret under,
+       so the flags that make it mount are exactly the flags that create it. */}}
+{{- $allInOneAuth := and .Values.allInOne.enabled .Values.allInOne.s3.enabled (or .Values.allInOne.s3.enableAuth .Values.s3.enableAuth .Values.filer.s3.enableAuth) (not (or .Values.allInOne.s3.existingConfigSecret .Values.s3.existingConfigSecret .Values.filer.s3.existingConfigSecret)) }}
+{{- if or (and (or .Values.s3.enabled .Values.allInOne.enabled) .Values.s3.enableAuth (not .Values.s3.existingConfigSecret)) (and .Values.filer.s3.enabled .Values.filer.s3.enableAuth (not .Values.filer.s3.existingConfigSecret)) $allInOneAuth }}
+{{- $secretName := printf "%s-s3-secret" (include "seaweedfs.fullname" .) }}
+{{- $legacySecretName := "seaweedfs-s3-secret" }}
+{{- $lookupName := $secretName }}
+{{- if .Values.s3.reuseLegacySecret }}
+{{-   $lookupName = default $legacySecretName .Values.s3.legacySecretName }}
+{{- end }}
+{{- $existingSecret := lookup "v1" "Secret" .Release.Namespace $lookupName }}
+{{- $reuse := false }}
+{{- if and .Values.s3.reuseLegacySecret $existingSecret }}
+{{- $reuse = true }}
+{{- end }}
+{{- $creds := .Values.s3.credentials | default dict -}}
+{{- $adminCreds := $creds.admin | default dict -}}
+{{- $access_key_admin := $adminCreds.accessKey -}}
+{{- $secret_key_admin := $adminCreds.secretKey -}}
+{{- if $adminCreds.existingSecret -}}
+  {{- $access_key_admin = printf "${%s}" (include "seaweedfs.s3.credentialEnvName" (list "admin" "accessKey")) -}}
+  {{- $secret_key_admin = printf "${%s}" (include "seaweedfs.s3.credentialEnvName" (list "admin" "secretKey")) -}}
+{{- else if not (and $access_key_admin $secret_key_admin) -}}
+  {{- $access_key_admin = include "seaweedfs.getOrGeneratePassword" (dict "namespace" .Release.Namespace "secretName" $secretName "key" "admin_access_key_id" "length" 20 "existingSecret" (ternary $existingSecret nil $reuse)) -}}
+  {{- $secret_key_admin = include "seaweedfs.getOrGeneratePassword" (dict "namespace" .Release.Namespace "secretName" $secretName "key" "admin_secret_access_key" "length" 40 "existingSecret" (ternary $existingSecret nil $reuse)) -}}
+{{- end -}}
+{{- $readCreds := $creds.read | default dict -}}
+{{- $access_key_read := $readCreds.accessKey -}}
+{{- $secret_key_read := $readCreds.secretKey -}}
+{{- if $readCreds.existingSecret -}}
+  {{- $access_key_read = printf "${%s}" (include "seaweedfs.s3.credentialEnvName" (list "read" "accessKey")) -}}
+  {{- $secret_key_read = printf "${%s}" (include "seaweedfs.s3.credentialEnvName" (list "read" "secretKey")) -}}
+{{- else if not (and $access_key_read $secret_key_read) -}}
+  {{- $access_key_read = include "seaweedfs.getOrGeneratePassword" (dict "namespace" .Release.Namespace "secretName" $secretName "key" "read_access_key_id" "length" 20 "existingSecret" (ternary $existingSecret nil $reuse)) -}}
+  {{- $secret_key_read = include "seaweedfs.getOrGeneratePassword" (dict "namespace" .Release.Namespace "secretName" $secretName "key" "read_secret_access_key" "length" 40 "existingSecret" (ternary $existingSecret nil $reuse)) -}}
+{{- end -}}
 apiVersion: v1
 kind: Secret
 type: Opaque
 metadata:
-  name: seaweedfs-s3-secret
+  name: {{ $secretName }}
   namespace: {{ .Release.Namespace }}
   annotations:
     "helm.sh/resource-policy": keep
@@ -19,10 +50,16 @@ metadata:
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/component: s3
 stringData:
+  {{- /* An identity read from an existing Secret keeps its keys there; the
+         config below names the environment variables carrying them. */}}
+  {{- if not $adminCreds.existingSecret }}
   admin_access_key_id: {{ $access_key_admin }}
   admin_secret_access_key: {{ $secret_key_admin }}
+  {{- end }}
+  {{- if not $readCreds.existingSecret }}
   read_access_key_id: {{ $access_key_read }}
   read_secret_access_key: {{ $secret_key_read }}
+  {{- end }}
   seaweedfs_s3_config: '{"identities":[{"name":"anvAdmin","credentials":[{"accessKey":"{{ $access_key_admin }}","secretKey":"{{ $secret_key_admin }}"}],"actions":["Admin","Read","Write"]},{"name":"anvReadOnly","credentials":[{"accessKey":"{{ $access_key_read }}","secretKey":"{{ $secret_key_read }}"}],"actions":["Read"]}]}'
   {{- if .Values.filer.s3.auditLogConfig }}
   filer_s3_auditLogConfig.json: |
@@ -32,4 +69,4 @@ stringData:
   s3_auditLogConfig.json: |
     {{ toJson .Values.s3.auditLogConfig | nindent 4 }}
   {{- end }}
-{{- end }}
\ No newline at end of file
+{{- end }}
diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/s3/s3-service.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/s3/s3-service.yaml
index 86e0424e14..1398ddbc18 100644
--- a/packages/system/seaweedfs/charts/seaweedfs/templates/s3/s3-service.yaml
+++ b/packages/system/seaweedfs/charts/seaweedfs/templates/s3/s3-service.yaml
@@ -9,31 +9,70 @@ metadata:
     app.kubernetes.io/component: s3
     helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
 {{- if .Values.s3.annotations }}
   annotations:
     {{- toYaml .Values.s3.annotations | nindent 4 }}
 {{- end }}
 spec:
-  trafficDistribution: PreferClose
+  {{- $serviceType := .Values.s3.service.type }}
+  {{- $nodePorts := dict }}
+  {{- if or (eq $serviceType "NodePort") (eq $serviceType "LoadBalancer") }}
+  {{- $nodePorts = .Values.s3.service.nodePorts | default dict }}
+  {{- end }}
+  type: {{ $serviceType }}
+  {{- include "seaweedfs.service.loadBalancerFields" .Values.s3.service }}
   internalTrafficPolicy: {{ .Values.s3.internalTrafficPolicy | default "Cluster" }}
+  {{- $td := .Values.s3.trafficDistribution | default .Values.filer.s3.trafficDistribution }}
+  {{- if and (semverCompare ">=1.31-0" .Capabilities.KubeVersion.GitVersion) $td }}
+  trafficDistribution: {{ include "seaweedfs.trafficDistribution" (dict "value" $td "Capabilities" .Capabilities) }}
+  {{- end }}
   ports:
   - name: "swfs-s3"
     port: {{ if .Values.s3.enabled }}{{ .Values.s3.port }}{{ else }}{{ .Values.filer.s3.port }}{{ end }}
     targetPort: {{ if .Values.s3.enabled }}{{ .Values.s3.port }}{{ else }}{{ .Values.filer.s3.port }}{{ end }}
+{{- if $nodePorts.http }}
+    nodePort: {{ $nodePorts.http }}
+{{- end }}
+    protocol: TCP
+{{- if and .Values.s3.enabled .Values.s3.icebergPort }}
+  - name: "swfs-iceberg"
+    port: {{ .Values.s3.icebergPort }}
+    targetPort: {{ .Values.s3.icebergPort }}
+{{- if $nodePorts.iceberg }}
+    nodePort: {{ $nodePorts.iceberg }}
+{{- end }}
     protocol: TCP
+{{- end }}
+{{- if and .Values.s3.enabled .Values.s3.lancePort }}
+  - name: "swfs-lance"
+    port: {{ .Values.s3.lancePort }}
+    targetPort: {{ .Values.s3.lancePort }}
+{{- if $nodePorts.lance }}
+    nodePort: {{ $nodePorts.lance }}
+{{- end }}
+    protocol: TCP
+{{- end }}
 {{- if and .Values.s3.enabled .Values.s3.httpsPort }}
   - name: "swfs-s3-tls"
     port: {{ .Values.s3.httpsPort }}
     targetPort: {{ .Values.s3.httpsPort }}
+{{- if $nodePorts.https }}
+    nodePort: {{ $nodePorts.https }}
+{{- end }}
     protocol: TCP
 {{- end }}
 {{- if and .Values.s3.enabled .Values.s3.metricsPort }}
   - name: "metrics"
     port: {{ .Values.s3.metricsPort }}
     targetPort: {{ .Values.s3.metricsPort }}
+{{- if $nodePorts.metrics }}
+    nodePort: {{ $nodePorts.metrics }}
+{{- end }}
     protocol: TCP
 {{- end }}
   selector:
     app.kubernetes.io/name: {{ template "seaweedfs.name" . }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/component: {{ if .Values.s3.enabled }}s3{{ else }}filer{{ end }}
 {{- end }}
diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/s3/s3-servicemonitor.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/s3/s3-servicemonitor.yaml
index 3482559121..8ba8f687c1 100644
--- a/packages/system/seaweedfs/charts/seaweedfs/templates/s3/s3-servicemonitor.yaml
+++ b/packages/system/seaweedfs/charts/seaweedfs/templates/s3/s3-servicemonitor.yaml
@@ -1,10 +1,14 @@
-{{- if or .Values.s3.enabled .Values.filer.s3.enabled }}
-{{- if .Values.s3.metricsPort }}
-{{- if .Values.global.monitoring.enabled }}
+{{- include "seaweedfs.compat" . -}}
+{{- /*
+  The seaweedfs-s3 Service only gains a "metrics" port when the standalone S3
+  gateway is enabled. With only the embedded filer S3 gateway, metrics live on
+  the filer process and are already scraped by the filer ServiceMonitor.
+*/ -}}
+{{- if and .Values.s3.enabled .Values.s3.metricsPort .Values.global.seaweedfs.monitoring.enabled }}
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
-  name: {{ template "seaweedfs.name" . }}-s3
+  name: {{ include "seaweedfs.fullname" . }}-s3
   namespace: {{ .Release.Namespace }}
   labels:
     app.kubernetes.io/name: {{ template "seaweedfs.name" . }}
@@ -12,7 +16,7 @@ metadata:
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/component: s3
-    {{- with .Values.global.monitoring.additionalLabels }}
+    {{- with .Values.global.seaweedfs.monitoring.additionalLabels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
 {{- if .Values.s3.annotations }}
@@ -27,7 +31,6 @@ spec:
   selector:
     matchLabels:
       app.kubernetes.io/name: {{ template "seaweedfs.name" . }}
+      app.kubernetes.io/instance: {{ .Release.Name }}
       app.kubernetes.io/component: s3
 {{- end }}
-{{- end }}
-{{- end }}
diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/sftp/sftp-ca-secret.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/sftp/sftp-ca-secret.yaml
new file mode 100644
index 0000000000..2149256cf9
--- /dev/null
+++ b/packages/system/seaweedfs/charts/seaweedfs/templates/sftp/sftp-ca-secret.yaml
@@ -0,0 +1,40 @@
+{{- include "seaweedfs.compat" . -}}
+{{- /*
+Render a chart-managed Secret carrying the SSH user CA public key(s) for
+certificate-based SFTP authentication, but only when:
+  - SFTP (standalone or all-in-one) is enabled,
+  - "certificate" is in the relevant authMethods list,
+  - the user provided inline CA keys via sftp.trustedUserCAKeys, and
+  - no existingCAKeysSecret is set (which would supersede this Secret).
+*/}}
+{{- $sftpEnabled := or .Values.sftp.enabled (and .Values.allInOne.enabled .Values.allInOne.sftp.enabled) -}}
+{{- $authMethods := .Values.sftp.authMethods -}}
+{{- if and .Values.allInOne.enabled .Values.allInOne.sftp.authMethods -}}
+{{- $authMethods = .Values.allInOne.sftp.authMethods -}}
+{{- end -}}
+{{- $certInMethods := and $authMethods (contains "certificate" $authMethods) -}}
+{{- $inlineCAKeys := .Values.sftp.trustedUserCAKeys -}}
+{{- if and .Values.allInOne.enabled .Values.allInOne.sftp.trustedUserCAKeys -}}
+{{- $inlineCAKeys = .Values.allInOne.sftp.trustedUserCAKeys -}}
+{{- end -}}
+{{- $existingSecret := .Values.sftp.existingCAKeysSecret -}}
+{{- if and .Values.allInOne.enabled .Values.allInOne.sftp.existingCAKeysSecret -}}
+{{- $existingSecret = .Values.allInOne.sftp.existingCAKeysSecret -}}
+{{- end -}}
+{{- if and $sftpEnabled $certInMethods $inlineCAKeys (not $existingSecret) }}
+apiVersion: v1
+kind: Secret
+type: Opaque
+metadata:
+  name: {{ include "seaweedfs.fullname" . }}-sftp-ca-secret
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: {{ template "seaweedfs.name" . }}
+    helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/component: sftp
+stringData:
+  ca_user.pub: |
+{{ $inlineCAKeys | indent 4 }}
+{{- end }}
diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/sftp/sftp-deployment.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/sftp/sftp-deployment.yaml
index c0bcb2c4a7..17e29bdbed 100644
--- a/packages/system/seaweedfs/charts/seaweedfs/templates/sftp/sftp-deployment.yaml
+++ b/packages/system/seaweedfs/charts/seaweedfs/templates/sftp/sftp-deployment.yaml
@@ -1,8 +1,9 @@
+{{- include "seaweedfs.compat" . -}}
 {{- if .Values.sftp.enabled }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ template "seaweedfs.name" . }}-sftp
+  name: {{ include "seaweedfs.fullname" . }}-sftp
   namespace: {{ .Release.Namespace }}
   labels:
     app.kubernetes.io/name: {{ template "seaweedfs.name" . }}
@@ -42,14 +43,14 @@ spec:
       {{- toYaml . | nindent 8 }}
       {{- end }}
     spec:
-      restartPolicy: {{ default .Values.global.restartPolicy .Values.sftp.restartPolicy }}
+      restartPolicy: {{ default .Values.global.seaweedfs.restartPolicy .Values.sftp.restartPolicy }}
       {{- if .Values.sftp.affinity }}
       affinity:
         {{ tpl .Values.sftp.affinity . | nindent 8 | trim }}
       {{- end }}
       {{- if .Values.sftp.topologySpreadConstraints }}
       topologySpreadConstraints:
-        {{ tpl .Values.sftp.topologySpreadConstraint . | nindent 8 | trim }}
+        {{ tpl .Values.sftp.topologySpreadConstraints . | nindent 8 | trim }}
       {{- end }}
       {{- if .Values.sftp.tolerations }}
       tolerations:
@@ -60,6 +61,9 @@ spec:
       {{- if .Values.sftp.priorityClassName }}
       priorityClassName: {{ .Values.sftp.priorityClassName | quote }}
       {{- end }}
+      {{- if .Values.sftp.schedulerName }}
+      schedulerName: {{ .Values.sftp.schedulerName | quote }}
+      {{- end }}
       enableServiceLinks: false
       {{- if .Values.sftp.serviceAccountName }}
       serviceAccountName: {{ .Values.sftp.serviceAccountName | quote }}
@@ -73,8 +77,8 @@ spec:
       {{- end }}
       containers:
         - name: seaweedfs
-          image: {{ template "sftp.image" . }}
-          imagePullPolicy: {{ default "IfNotPresent" .Values.global.imagePullPolicy }}
+          image: {{ template "seaweedfs.sftp.image" . }}
+          imagePullPolicy: {{ default "IfNotPresent" .Values.global.seaweedfs.imagePullPolicy }}
           env:
             - name: POD_IP
               valueFrom:
@@ -89,29 +93,19 @@ spec:
                 fieldRef:
                   fieldPath: metadata.namespace
             - name: SEAWEEDFS_FULLNAME
-              value: "{{ template "seaweedfs.name" . }}"
-            {{- if .Values.sftp.extraEnvironmentVars }}
-            {{- range $key, $value := .Values.sftp.extraEnvironmentVars }}
+              value: "{{ include "seaweedfs.fullname" . }}"
+            {{- $mergedExtraEnvironmentVars := dict }}
+            {{- include "seaweedfs.mergeExtraEnvironmentVars" (dict "global" .Values.global.seaweedfs "component" .Values.sftp "target" $mergedExtraEnvironmentVars) }}
+            {{- range $key := keys $mergedExtraEnvironmentVars | sortAlpha }}
+            {{- $value := index $mergedExtraEnvironmentVars $key }}
             - name: {{ $key }}
             {{- if kindIs "string" $value }}
-              value: {{ $value | quote }}
+              value: {{ tpl $value $ | quote }}
             {{- else }}
               valueFrom:
                 {{ toYaml $value | nindent 16 | trim }}
             {{- end -}}
             {{- end }}
-            {{- end }}
-            {{- if .Values.global.extraEnvironmentVars }}
-            {{- range $key, $value := .Values.global.extraEnvironmentVars }}
-            - name: {{ $key }}
-            {{- if kindIs "string" $value }}
-              value: {{ $value | quote }}
-            {{- else }}
-              valueFrom:
-                {{ toYaml $value | nindent 16 | trim }}
-            {{- end -}}
-            {{- end }}
-            {{- end }}
           command:
             - "/bin/sh"
             - "-ec"
@@ -125,7 +119,7 @@ spec:
               {{- if .Values.sftp.loggingOverrideLevel }}
               -v={{ .Values.sftp.loggingOverrideLevel }} \
               {{- else }}
-              -v={{ .Values.global.loggingLevel }} \
+              -v={{ .Values.global.seaweedfs.loggingLevel }} \
               {{- end }}
               sftp \
               -ip.bind={{ .Values.sftp.bindAddress }} \
@@ -144,6 +138,9 @@ spec:
               {{- end }}
               {{- if .Values.sftp.authMethods }}
               -authMethods={{ .Values.sftp.authMethods }} \
+              {{- if contains "certificate" .Values.sftp.authMethods }}
+              -trustedUserCAKeysFile=/etc/sw/sftp_ca/ca_user.pub \
+              {{- end }}
               {{- end }}
               {{- if .Values.sftp.maxAuthTries }}
               -maxAuthTries={{ .Values.sftp.maxAuthTries }} \
@@ -166,12 +163,12 @@ spec:
               {{- if .Values.sftp.localSocket }}
               -localSocket={{ .Values.sftp.localSocket }} \
               {{- end }}
-              {{- if .Values.global.enableSecurity }}
+              {{- if .Values.global.seaweedfs.enableSecurity }}
               -cert.file=/usr/local/share/ca-certificates/client/tls.crt \
               -key.file=/usr/local/share/ca-certificates/client/tls.key \
               {{- end }}
               -userStoreFile=/etc/sw/seaweedfs_sftp_config \
-              -filer={{ template "seaweedfs.name" . }}-filer-client.{{ .Release.Namespace }}:{{ .Values.filer.port }}
+              -filer={{ include "seaweedfs.componentName" (list . "filer-client") }}.{{ .Release.Namespace }}:{{ .Values.filer.port }}
           volumeMounts:
             {{- if or (eq .Values.sftp.logs.type "hostPath") (eq .Values.sftp.logs.type "emptyDir") }}
             - name: logs
@@ -182,14 +179,21 @@ spec:
               name: config-users
               readOnly: true
             {{- end }}
-            - mountPath: /etc/sw/ssh
+            - mountPath: {{ .Values.sftp.hostKeysFolder | default "/etc/sw/ssh" }}
               name: config-ssh
               readOnly: true
-            {{- if .Values.global.enableSecurity }}
+            {{- if and .Values.sftp.authMethods (contains "certificate" .Values.sftp.authMethods) }}
+            - mountPath: /etc/sw/sftp_ca
+              name: config-sftp-ca
+              readOnly: true
+            {{- end }}
+            {{- if include "seaweedfs.securityConfigEnabled" . }}
             - name: security-config
               readOnly: true
               mountPath: /etc/seaweedfs/security.toml
               subPath: security.toml
+            {{- end }}
+            {{- if .Values.global.seaweedfs.enableSecurity }}
             - name: ca-cert
               readOnly: true
               mountPath: /usr/local/share/ca-certificates/ca/
@@ -242,7 +246,7 @@ spec:
           securityContext: {{- omit .Values.sftp.containerSecurityContext "enabled" | toYaml | nindent 12 }}
           {{- end }}
       {{- if .Values.sftp.sidecars }}
-      {{- include "common.tplvalues.render" (dict "value" .Values.sftp.sidecars "context" $) | nindent 8 }}
+      {{- include "seaweedfs.tplvalues.render" (dict "value" .Values.sftp.sidecars "context" $) | nindent 8 }}
       {{- end }}
       volumes:
         {{- if .Values.sftp.enableAuth }}
@@ -252,7 +256,7 @@ spec:
             {{- if .Values.sftp.existingConfigSecret }}
             secretName: {{ .Values.sftp.existingConfigSecret }}
             {{- else }}
-            secretName: seaweedfs-sftp-secret
+            secretName: {{ include "seaweedfs.fullname" . }}-sftp-secret
             {{- end }}
         {{- end }}
         - name: config-ssh
@@ -261,8 +265,21 @@ spec:
             {{- if .Values.sftp.existingSshConfigSecret }}
             secretName: {{ .Values.sftp.existingSshConfigSecret }}
             {{- else }}
-            secretName: seaweedfs-sftp-ssh-secret
+            secretName: {{ include "seaweedfs.fullname" . }}-sftp-ssh-secret
+            {{- end }}
+        {{- if and .Values.sftp.authMethods (contains "certificate" .Values.sftp.authMethods) }}
+        {{- if and (not .Values.sftp.existingCAKeysSecret) (not .Values.sftp.trustedUserCAKeys) }}
+        {{- fail "sftp.authMethods includes \"certificate\" but neither sftp.trustedUserCAKeys nor sftp.existingCAKeysSecret is set" }}
+        {{- end }}
+        - name: config-sftp-ca
+          secret:
+            defaultMode: 420
+            {{- if .Values.sftp.existingCAKeysSecret }}
+            secretName: {{ .Values.sftp.existingCAKeysSecret }}
+            {{- else }}
+            secretName: {{ include "seaweedfs.fullname" . }}-sftp-ca-secret
             {{- end }}
+        {{- end }}
         {{- if eq .Values.sftp.logs.type "hostPath" }}
         - name: logs
           hostPath:
@@ -273,25 +290,27 @@ spec:
         - name: logs
           emptyDir: {}
         {{- end }}
-        {{- if .Values.global.enableSecurity }}
+        {{- if include "seaweedfs.securityConfigEnabled" . }}
         - name: security-config
           configMap:
-            name: {{ template "seaweedfs.name" . }}-security-config
+            name: {{ include "seaweedfs.fullname" . }}-security-config
+        {{- end }}
+        {{- if .Values.global.seaweedfs.enableSecurity }}
         - name: ca-cert
           secret:
-            secretName: {{ template "seaweedfs.name" . }}-ca-cert
+            secretName: {{ include "seaweedfs.fullname" . }}-ca-cert
         - name: master-cert
           secret:
-            secretName: {{ template "seaweedfs.name" . }}-master-cert
+            secretName: {{ include "seaweedfs.fullname" . }}-master-cert
         - name: volume-cert
           secret:
-            secretName: {{ template "seaweedfs.name" . }}-volume-cert
+            secretName: {{ include "seaweedfs.fullname" . }}-volume-cert
         - name: filer-cert
           secret:
-            secretName: {{ template "seaweedfs.name" . }}-filer-cert
+            secretName: {{ include "seaweedfs.fullname" . }}-filer-cert
         - name: client-cert
           secret:
-            secretName: {{ template "seaweedfs.name" . }}-client-cert
+            secretName: {{ include "seaweedfs.fullname" . }}-client-cert
         {{- end }}
         {{ tpl .Values.sftp.extraVolumes . | indent 8 | trim }}
       {{- if .Values.sftp.nodeSelector }}
diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/sftp/sftp-secret.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/sftp/sftp-secret.yaml
index 2cec992a07..eca2492372 100644
--- a/packages/system/seaweedfs/charts/seaweedfs/templates/sftp/sftp-secret.yaml
+++ b/packages/system/seaweedfs/charts/seaweedfs/templates/sftp/sftp-secret.yaml
@@ -1,12 +1,22 @@
 {{- if or .Values.sftp.enabled .Values.allInOne.enabled }}
-{{- $admin_pwd := include "getOrGeneratePassword" (dict "namespace" .Release.Namespace "secretName" "seaweedfs-sftp-secret" "key" "admin_password" 20) -}}
-{{- $read_user_pwd := include "getOrGeneratePassword" (dict "namespace" .Release.Namespace "secretName" "seaweedfs-sftp-secret" "key" "readonly_password" 20) -}}
-{{- $public_user_pwd := include "getOrGeneratePassword" (dict "namespace" .Release.Namespace "secretName" "seaweedfs-sftp-secret" "key" "public_user_password" 20) -}}
+{{- $secretName := printf "%s-sftp-secret" (include "seaweedfs.fullname" .) }}
+{{- $admin_pwd := include "seaweedfs.getOrGeneratePassword" (dict "namespace" .Release.Namespace "secretName" $secretName "key" "admin_password" "length" 20) -}}
+{{- $read_user_pwd := include "seaweedfs.getOrGeneratePassword" (dict "namespace" .Release.Namespace "secretName" $secretName "key" "readonly_password" "length" 20) -}}
+{{- $public_user_pwd := include "seaweedfs.getOrGeneratePassword" (dict "namespace" .Release.Namespace "secretName" $secretName "key" "public_user_password" "length" 20) -}}
+{{- $ssh_private_key := "" -}}
+{{- $existingSecret := lookup "v1" "Secret" .Release.Namespace $secretName -}}
+{{- if and $existingSecret (index $existingSecret.data "seaweedfs_sftp_ssh_private_key") -}}
+{{- $ssh_private_key = index $existingSecret.data "seaweedfs_sftp_ssh_private_key" | b64dec | trim -}}
+{{- end -}}
+{{/* generate a fresh host key; also replace the key earlier chart versions bundled */}}
+{{- if or (not $ssh_private_key) (contains "H4McwcDphteXVullu6q7ephEN1N60z" $ssh_private_key) -}}
+{{- $ssh_private_key = genPrivateKey "ed25519" -}}
+{{- end -}}
 apiVersion: v1
 kind: Secret
 type: Opaque
 metadata:
-  name: seaweedfs-sftp-secret
+  name: {{ $secretName }}
   namespace: {{ .Release.Namespace }}
   annotations:
     "helm.sh/resource-policy": keep
@@ -23,11 +33,5 @@ stringData:
   public_user_password: {{ $public_user_pwd }}
   seaweedfs_sftp_config: '[{"Username":"admin","Password":"{{ $admin_pwd }}","PublicKeys":[],"HomeDir":"/","Permissions":{"/":["read","write","list"]},"Uid":0,"Gid":0},{"Username":"readonly_user","Password":"{{ $read_user_pwd }}","PublicKeys":[],"HomeDir":"/","Permissions":{"/":["read","list"]},"Uid":1112,"Gid":1112},{"Username":"public_user","Password":"{{ $public_user_pwd }}","PublicKeys":[],"HomeDir":"/public","Permissions":{"/public":["write","read","list"]},"Uid":1113,"Gid":1113}]'
   seaweedfs_sftp_ssh_private_key: |
-    -----BEGIN OPENSSH PRIVATE KEY-----
-    b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW
-    QyNTUxOQAAACDH4McwcDphteXVullu6q7ephEN1N60z+w0qZw0UVW8OwAAAJDjxkmk48ZJ
-    pAAAAAtzc2gtZWQyNTUxOQAAACDH4McwcDphteXVullu6q7ephEN1N60z+w0qZw0UVW8Ow
-    AAAEAeVy/4+gf6rjj2jla/AHqJpC1LcS5hn04IUs4q+iVq/MfgxzBwOmG15dW6WW7qrt6m
-    EQ3U3rTP7DSpnDRRVbw7AAAADHNla291ckAwMDY2NwE=
-    -----END OPENSSH PRIVATE KEY-----
+{{ $ssh_private_key | trim | indent 4 }}
 {{- end }}
\ No newline at end of file
diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/sftp/sftp-service.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/sftp/sftp-service.yaml
index 5e67570d64..aae3bdec12 100644
--- a/packages/system/seaweedfs/charts/seaweedfs/templates/sftp/sftp-service.yaml
+++ b/packages/system/seaweedfs/charts/seaweedfs/templates/sftp/sftp-service.yaml
@@ -2,10 +2,11 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ template "seaweedfs.name" . }}-sftp
+  name: {{ include "seaweedfs.componentName" (list . "sftp") }}
   namespace: {{ .Release.Namespace }}
   labels:
     app.kubernetes.io/name: {{ template "seaweedfs.name" . }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/component: sftp
     helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
@@ -14,19 +15,33 @@ metadata:
     {{- toYaml .Values.sftp.annotations | nindent 4 }}
 {{- end }}
 spec:
+  {{- $serviceType := .Values.sftp.service.type }}
+  {{- $nodePorts := dict }}
+  {{- if or (eq $serviceType "NodePort") (eq $serviceType "LoadBalancer") }}
+  {{- $nodePorts = .Values.sftp.service.nodePorts | default dict }}
+  {{- end }}
+  type: {{ $serviceType }}
+  {{- include "seaweedfs.service.loadBalancerFields" .Values.sftp.service }}
   internalTrafficPolicy: {{ .Values.sftp.internalTrafficPolicy | default "Cluster" }}
   ports:
   - name: "swfs-sftp"
     port: {{ .Values.sftp.port }}
     targetPort: {{ .Values.sftp.port }}
+{{- if $nodePorts.sftp }}
+    nodePort: {{ $nodePorts.sftp }}
+{{- end }}
     protocol: TCP
 {{- if .Values.sftp.metricsPort }}
   - name: "metrics"
     port: {{ .Values.sftp.metricsPort }}
     targetPort: {{ .Values.sftp.metricsPort }}
+{{- if $nodePorts.metrics }}
+    nodePort: {{ $nodePorts.metrics }}
+{{- end }}
     protocol: TCP
 {{- end }}
   selector:
     app.kubernetes.io/name: {{ template "seaweedfs.name" . }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/component: sftp
-{{- end }}
\ No newline at end of file
+{{- end }}
diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/sftp/sftp-servicemonitor.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/sftp/sftp-servicemonitor.yaml
index 4c71888665..1495373e70 100644
--- a/packages/system/seaweedfs/charts/seaweedfs/templates/sftp/sftp-servicemonitor.yaml
+++ b/packages/system/seaweedfs/charts/seaweedfs/templates/sftp/sftp-servicemonitor.yaml
@@ -1,10 +1,11 @@
+{{- include "seaweedfs.compat" . -}}
 {{- if .Values.sftp.enabled }}
 {{- if .Values.sftp.metricsPort }}
-{{- if .Values.global.monitoring.enabled }}
+{{- if .Values.global.seaweedfs.monitoring.enabled }}
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
-  name: {{ template "seaweedfs.name" . }}-sftp
+  name: {{ include "seaweedfs.fullname" . }}-sftp
   namespace: {{ .Release.Namespace }}
   labels:
     app.kubernetes.io/name: {{ template "seaweedfs.name" . }}
@@ -12,7 +13,7 @@ metadata:
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/component: sftp
-    {{- with .Values.global.monitoring.additionalLabels }}
+    {{- with .Values.global.seaweedfs.monitoring.additionalLabels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
 {{- if .Values.sftp.annotations }}
@@ -27,6 +28,7 @@ spec:
   selector:
     matchLabels:
       app.kubernetes.io/name: {{ template "seaweedfs.name" . }}
+      app.kubernetes.io/instance: {{ .Release.Name }}
       app.kubernetes.io/component: sftp
 {{- end }}
 {{- end }}
diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/sftp/sftp-ssh-secret.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/sftp/sftp-ssh-secret.yaml
new file mode 100644
index 0000000000..07722593c2
--- /dev/null
+++ b/packages/system/seaweedfs/charts/seaweedfs/templates/sftp/sftp-ssh-secret.yaml
@@ -0,0 +1,35 @@
+{{- if or (and .Values.sftp.enabled (not .Values.sftp.existingSshConfigSecret)) (and .Values.allInOne.enabled .Values.allInOne.sftp.enabled (not (or .Values.allInOne.sftp.existingSshConfigSecret .Values.sftp.existingSshConfigSecret))) }}
+{{/* Host keys mounted at sftp.hostKeysFolder; existing keys are kept across upgrades, except the key earlier chart versions bundled. */}}
+{{- $secretName := printf "%s-sftp-ssh-secret" (include "seaweedfs.fullname" .) }}
+{{- $hostKeys := dict }}
+{{- $existingSecret := lookup "v1" "Secret" .Release.Namespace $secretName }}
+{{- if $existingSecret }}
+{{- range $name, $value := $existingSecret.data }}
+{{- if not (contains "H4McwcDphteXVullu6q7ephEN1N60z" (b64dec $value)) }}
+{{- $_ := set $hostKeys $name $value }}
+{{- end }}
+{{- end }}
+{{- end }}
+{{- if eq (len $hostKeys) 0 }}
+{{- $_ := set $hostKeys "ssh_host_ed25519_key" (genPrivateKey "ed25519" | b64enc) }}
+{{- end }}
+apiVersion: v1
+kind: Secret
+type: Opaque
+metadata:
+  name: {{ $secretName }}
+  namespace: {{ .Release.Namespace }}
+  annotations:
+    "helm.sh/resource-policy": keep
+    "helm.sh/hook": "pre-install,pre-upgrade"
+  labels:
+    app.kubernetes.io/name: {{ template "seaweedfs.name" . }}
+    helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/component: sftp
+data:
+{{- range $name, $value := $hostKeys }}
+  {{ $name }}: {{ $value }}
+{{- end }}
+{{- end }}
diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/shared/_compat.tpl b/packages/system/seaweedfs/charts/seaweedfs/templates/shared/_compat.tpl
new file mode 100644
index 0000000000..0545ea975c
--- /dev/null
+++ b/packages/system/seaweedfs/charts/seaweedfs/templates/shared/_compat.tpl
@@ -0,0 +1,59 @@
+{{/*
+Backward-compatibility shim for the global.* → global.seaweedfs.* migration.
+
+When the chart is used as a subchart, .Values.global is shared with sibling
+charts.  To avoid namespace pollution, app-specific values were moved under
+global.seaweedfs.* (and global.registry was renamed to global.imageRegistry).
+
+If a user still passes the OLD key paths (e.g. --set global.enableSecurity=true),
+those keys will no longer have defaults in values.yaml, so their mere presence in
+.Values.global means the user explicitly provided them.  This helper merges them
+into global.seaweedfs.* so the rest of the templates see a single, canonical
+location.
+
+The helper mutates .Values.global.seaweedfs in-place via `set` and produces no
+output.  It is idempotent (safe to call more than once in the same render).
+
+Usage:  {{- include "seaweedfs.compat" . -}}
+*/}}
+{{- define "seaweedfs.compat" -}}
+{{- $g  := .Values.global -}}
+{{- $sw := $g.seaweedfs | default dict -}}
+
+{{/* --- image-related renames --- */}}
+{{- if hasKey $g "registry" -}}
+{{-   $_ := set $g "imageRegistry" (default $g.imageRegistry $g.registry) -}}
+{{- end -}}
+{{- if hasKey $g "repository" -}}
+{{-   $img := $sw.image | default dict -}}
+{{-   $_ := set $img "repository" (default $img.repository $g.repository) -}}
+{{-   $_ := set $sw "image" $img -}}
+{{- end -}}
+{{- if hasKey $g "imageName" -}}
+{{-   $img := $sw.image | default dict -}}
+{{-   $_ := set $img "name" (default $img.name $g.imageName) -}}
+{{-   $_ := set $sw "image" $img -}}
+{{- end -}}
+
+{{/* --- scalar keys that moved 1:1 under global.seaweedfs --- */}}
+{{- range $key := list "createClusterRole" "imagePullPolicy" "restartPolicy" "loggingLevel" "enableSecurity" "masterServer" "serviceAccountName" "automountServiceAccountToken" "enableReplication" "replicationPlacement" -}}
+{{-   if hasKey $g $key -}}
+{{-     $_ := set $sw $key (index $g $key) -}}
+{{-   end -}}
+{{- end -}}
+
+{{/* --- nested dict keys: deep-merge so partial overrides work --- */}}
+{{- range $key := list "securityConfig" "certificates" "monitoring" "serviceAccountAnnotations" "extraEnvironmentVars" -}}
+{{-   if hasKey $g $key -}}
+{{-     $old := index $g $key | default dict -}}
+{{-     $new := index $sw $key | default dict -}}
+{{-     if and (kindIs "map" $old) (kindIs "map" $new) -}}
+{{-       $_ := set $sw $key (merge $old $new) -}}
+{{-     else -}}
+{{-       $_ := set $sw $key $old -}}
+{{-     end -}}
+{{-   end -}}
+{{- end -}}
+
+{{- $_ := set $g "seaweedfs" $sw -}}
+{{- end -}}
diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/shared/_helpers.tpl b/packages/system/seaweedfs/charts/seaweedfs/templates/shared/_helpers.tpl
index 557bb9d43e..6fc10efe60 100644
--- a/packages/system/seaweedfs/charts/seaweedfs/templates/shared/_helpers.tpl
+++ b/packages/system/seaweedfs/charts/seaweedfs/templates/shared/_helpers.tpl
@@ -17,6 +17,22 @@ be used as a full name.
 {{- end -}}
 {{- end -}}
 
+{{/*
+Create a truncated component name.
+Usage: {{ include "seaweedfs.componentName" (list . "component-suffix") }}
+*/}}
+{{- define "seaweedfs.componentName" -}}
+{{- $context := index . 0 -}}
+{{- $suffix := index . 1 -}}
+{{- if gt (len $suffix) 61 -}}
+{{-   fail (printf "Suffix '%s' is too long for componentName helper. Max length is 61." $suffix) -}}
+{{- end -}}
+{{- $fullname := include "seaweedfs.fullname" $context -}}
+{{- $maxLen := sub 62 (len $suffix) | int -}}
+{{- $truncatedFullname := trunc $maxLen $fullname | trimSuffix "-" -}}
+{{- printf "%s-%s" $truncatedFullname $suffix -}}
+{{- end -}}
+
 {{/*
 Create chart name and version as used by the chart label.
 */}}
@@ -43,83 +59,123 @@ Inject extra environment vars in the format key:value, if populated
 {{- end -}}
 {{- end -}}
 
+{{- define "seaweedfs.mergeExtraEnvironmentVars" -}}
+{{- $global := ((.global | default dict).extraEnvironmentVars | default dict) -}}
+{{- $component := ((.component | default dict).extraEnvironmentVars | default dict) -}}
+{{- $target := .target -}}
+{{- range $key, $value := $global }}
+{{- $_ := set $target $key $value }}
+{{- end }}
+{{- range $key, $value := $component }}
+{{- $_ := set $target $key $value }}
+{{- end }}
+{{/* the license block owns SEAWEED_LICENSE; letting one through here too would
+     render the key twice in one container */}}
+{{- if ((.global | default dict).license | default dict).existingSecret }}
+{{- $_ := unset $target "SEAWEED_LICENSE" }}
+{{- end }}
+{{- end -}}
+
+{{/* Whether the mysql filer store is selected; a flag the chart cannot read counts as selected. */}}
+{{- define "seaweedfs.filer.mysqlEnabled" -}}
+{{- $merged := dict -}}
+{{- $_ := include "seaweedfs.mergeExtraEnvironmentVars" (dict "global" .Values.global.seaweedfs "component" .Values.filer "target" $merged) -}}
+{{- $enabled := index $merged "WEED_MYSQL_ENABLED" -}}
+{{- if or (kindIs "map" $enabled) (hasKey (.Values.filer.secretExtraEnvironmentVars | default dict) "WEED_MYSQL_ENABLED") -}}
+true
+{{- else if and $enabled (eq (lower (toString $enabled)) "true") -}}
+true
+{{- end -}}
+{{- end -}}
+
 {{/* Return the proper filer image */}}
-{{- define "filer.image" -}}
+{{- define "seaweedfs.filer.image" -}}
 {{- if .Values.filer.imageOverride -}}
 {{- $imageOverride := .Values.filer.imageOverride -}}
 {{- printf "%s" $imageOverride -}}
 {{- else -}}
-{{- include "common.image" . }}
+{{- include "seaweedfs.image" . }}
 {{- end -}}
 {{- end -}}
 
 {{/* Return the proper master image */}}
-{{- define "master.image" -}}
+{{- define "seaweedfs.master.image" -}}
 {{- if .Values.master.imageOverride -}}
 {{- $imageOverride := .Values.master.imageOverride -}}
 {{- printf "%s" $imageOverride -}}
 {{- else -}}
-{{- include "common.image" . }}
+{{- include "seaweedfs.image" . }}
 {{- end -}}
 {{- end -}}
 
 {{/* Return the proper s3 image */}}
-{{- define "s3.image" -}}
+{{- define "seaweedfs.s3.image" -}}
 {{- if .Values.s3.imageOverride -}}
 {{- $imageOverride := .Values.s3.imageOverride -}}
 {{- printf "%s" $imageOverride -}}
 {{- else -}}
-{{- include "common.image" . }}
+{{- include "seaweedfs.image" . }}
 {{- end -}}
 {{- end -}}
 
 {{/* Return the proper sftp image */}}
-{{- define "sftp.image" -}}
+{{- define "seaweedfs.sftp.image" -}}
 {{- if .Values.sftp.imageOverride -}}
 {{- $imageOverride := .Values.sftp.imageOverride -}}
 {{- printf "%s" $imageOverride -}}
 {{- else -}}
-{{- include "common.image" . }}
+{{- include "seaweedfs.image" . }}
 {{- end -}}
 {{- end -}}
 
 {{/* Return the proper admin image */}}
-{{- define "admin.image" -}}
+{{- define "seaweedfs.admin.image" -}}
 {{- if .Values.admin.imageOverride -}}
 {{- $imageOverride := .Values.admin.imageOverride -}}
 {{- printf "%s" $imageOverride -}}
 {{- else -}}
-{{- include "common.image" . }}
+{{- include "seaweedfs.image" . }}
 {{- end -}}
 {{- end -}}
 
 {{/* Return the proper worker image */}}
-{{- define "worker.image" -}}
+{{- define "seaweedfs.worker.image" -}}
 {{- if .Values.worker.imageOverride -}}
 {{- $imageOverride := .Values.worker.imageOverride -}}
 {{- printf "%s" $imageOverride -}}
 {{- else -}}
-{{- include "common.image" . }}
+{{- include "seaweedfs.image" . }}
+{{- end -}}
+{{- end -}}
+
+{{/* Lance namespace URL the worker's Lance container maintains; empty when unreachable */}}
+{{- define "seaweedfs.worker.lanceNamespaceUrl" -}}
+{{- if .Values.worker.namespaceUrl -}}
+{{- .Values.worker.namespaceUrl -}}
+{{- else if and .Values.s3.enabled .Values.s3.lancePort -}}
+{{- printf "http://%s.%s:%d" (include "seaweedfs.componentName" (list . "s3")) .Release.Namespace (int .Values.s3.lancePort) -}}
 {{- end -}}
 {{- end -}}
 
 {{/* Return the proper volume image */}}
-{{- define "volume.image" -}}
+{{- define "seaweedfs.volume.image" -}}
 {{- if .Values.volume.imageOverride -}}
 {{- $imageOverride := .Values.volume.imageOverride -}}
 {{- printf "%s" $imageOverride -}}
 {{- else -}}
-{{- include "common.image" . }}
+{{- include "seaweedfs.image" . }}
 {{- end -}}
 {{- end -}}
 
 {{/* Computes the container image name for all components (if they are not overridden) */}}
-{{- define "common.image" -}}
-{{- $registryName := default .Values.image.registry .Values.global.registry | toString -}}
-{{- $repositoryName := default .Values.image.repository .Values.global.repository | toString -}}
-{{- $name := .Values.global.imageName | toString -}}
+{{- define "seaweedfs.image" -}}
+{{- $registryName := default .Values.image.registry .Values.global.imageRegistry | toString -}}
+{{- $repositoryName := default .Values.image.repository .Values.global.seaweedfs.image.repository | toString -}}
+{{- $name := .Values.global.seaweedfs.image.name | toString -}}
 {{- $tag := default .Chart.AppVersion .Values.image.tag  | toString -}}
-{{- if $repositoryName -}}
+{{- if .Values.image.repository -}}
+{{-   $name = $repositoryName -}}
+{{- else if $repositoryName -}}
 {{-   $name = printf "%s/%s" (trimSuffix "/" $repositoryName) (base $name) -}}
 {{- end -}}
 {{- if $registryName -}}
@@ -130,7 +186,7 @@ Inject extra environment vars in the format key:value, if populated
 {{- end -}}
 
 {{/* check if any Volume PVC exists */}}
-{{- define "volume.pvc_exists" -}}
+{{- define "seaweedfs.volume.pvc_exists" -}}
 {{- if or (or (eq .Values.volume.data.type "persistentVolumeClaim") (and (eq .Values.volume.idx.type "persistentVolumeClaim") .Values.volume.dir_idx )) (eq .Values.volume.logs.type "persistentVolumeClaim") -}}
 {{- printf "true" -}}
 {{- else -}}
@@ -139,7 +195,7 @@ Inject extra environment vars in the format key:value, if populated
 {{- end -}}
 
 {{/* check if any Filer PVC exists */}}
-{{- define "filer.pvc_exists" -}}
+{{- define "seaweedfs.filer.pvc_exists" -}}
 {{- if or (eq .Values.filer.data.type "persistentVolumeClaim") (eq .Values.filer.logs.type "persistentVolumeClaim") -}}
 {{- printf "true" -}}
 {{- else -}}
@@ -148,7 +204,7 @@ Inject extra environment vars in the format key:value, if populated
 {{- end -}}
 
 {{/* check if any Master PVC exists */}}
-{{- define "master.pvc_exists" -}}
+{{- define "seaweedfs.master.pvc_exists" -}}
 {{- if or (eq .Values.master.data.type "persistentVolumeClaim") (eq .Values.master.logs.type "persistentVolumeClaim") -}}
 {{- printf "true" -}}
 {{- else -}}
@@ -157,7 +213,7 @@ Inject extra environment vars in the format key:value, if populated
 {{- end -}}
 
 {{/* check if any Admin PVC exists */}}
-{{- define "admin.pvc_exists" -}}
+{{- define "seaweedfs.admin.pvc_exists" -}}
 {{- if or (eq .Values.admin.data.type "persistentVolumeClaim") (eq .Values.admin.logs.type "persistentVolumeClaim") -}}
 {{- printf "true" -}}
 {{- else -}}
@@ -166,7 +222,7 @@ Inject extra environment vars in the format key:value, if populated
 {{- end -}}
 
 {{/* check if any InitContainers exist for Volumes */}}
-{{- define "volume.initContainers_exists" -}}
+{{- define "seaweedfs.volume.initContainers_exists" -}}
 {{- if or (not (empty .Values.volume.idx )) (not (empty .Values.volume.initContainers )) -}}
 {{- printf "true" -}}
 {{- else -}}
@@ -195,10 +251,10 @@ imagePullSecrets:
 {{/*
 Renders a value that contains template perhaps with scope if the scope is present.
 Usage:
-{{ include "common.tplvalues.render" ( dict "value" .Values.path.to.the.Value "context" $ ) }}
-{{ include "common.tplvalues.render" ( dict "value" .Values.path.to.the.Value "context" $ "scope" $app ) }}
+{{ include "seaweedfs.tplvalues.render" ( dict "value" .Values.path.to.the.Value "context" $ ) }}
+{{ include "seaweedfs.tplvalues.render" ( dict "value" .Values.path.to.the.Value "context" $ "scope" $app ) }}
 */}}
-{{- define "common.tplvalues.render" -}}
+{{- define "seaweedfs.tplvalues.render" -}}
 {{- $value := typeIs "string" .value | ternary .value (.value | toYaml) }}
 {{- if contains "{{" (toJson .value) }}
   {{- if .scope }}
@@ -215,9 +271,9 @@ Usage:
 Converts a Kubernetes quantity like "256Mi" or "2G" to a float64 in base units,
 handling both binary (Ki, Mi, Gi) and decimal (m, k, M) suffixes; numeric inputs
 Usage:
-{{ include "common.resource-quantity" "10Gi" }}
+{{ include "seaweedfs.resource-quantity" "10Gi" }}
 */}}
-{{- define "common.resource-quantity" -}}
+{{- define "seaweedfs.resource-quantity" -}}
     {{- $value := . -}}
     {{- $unit := 1.0 -}}
     {{- if typeIs "string" . -}}
@@ -237,14 +293,14 @@ Usage:
 getOrGeneratePassword will check if a password exists in a secret and return it,
 or generate a new random password if it doesn't exist.
 */}}
-{{- define "getOrGeneratePassword" -}}
+{{- define "seaweedfs.getOrGeneratePassword" -}}
 {{- $params := . -}}
 {{- $namespace := $params.namespace -}}
 {{- $secretName := $params.secretName -}}
 {{- $key := $params.key -}}
 {{- $length := default 16 $params.length -}}
 
-{{- $existingSecret := lookup "v1" "Secret" $namespace $secretName -}}
+{{- $existingSecret := default (lookup "v1" "Secret" $namespace $secretName) $params.existingSecret -}}
 {{- if and $existingSecret (index $existingSecret.data $key) -}}
   {{- index $existingSecret.data $key | b64dec -}}
 {{- else -}}
@@ -257,11 +313,8 @@ Compute the master service address to be used in cluster env vars.
 If allInOne is enabled, point to the all-in-one service; otherwise, point to the master service.
 */}}
 {{- define "seaweedfs.cluster.masterAddress" -}}
-{{- $serviceNameSuffix := "-master" -}}
-{{- if .Values.allInOne.enabled -}}
-{{-   $serviceNameSuffix = "-all-in-one" -}}
-{{- end -}}
-{{- printf "%s%s.%s:%d" (include "seaweedfs.name" .) $serviceNameSuffix .Release.Namespace (int .Values.master.port) -}}
+{{- $component := ternary "all-in-one" "master" .Values.allInOne.enabled -}}
+{{- printf "%s.%s:%d" (include "seaweedfs.componentName" (list . $component)) .Release.Namespace (int .Values.master.port) -}}
 {{- end -}}
 
 {{/*
@@ -269,23 +322,20 @@ Compute the filer service address to be used in cluster env vars.
 If allInOne is enabled, point to the all-in-one service; otherwise, point to the filer-client service.
 */}}
 {{- define "seaweedfs.cluster.filerAddress" -}}
-{{- $serviceNameSuffix := "-filer-client" -}}
-{{- if .Values.allInOne.enabled -}}
-{{-   $serviceNameSuffix = "-all-in-one" -}}
-{{- end -}}
-{{- printf "%s%s.%s:%d" (include "seaweedfs.name" .) $serviceNameSuffix .Release.Namespace (int .Values.filer.port) -}}
+{{- $component := ternary "all-in-one" "filer-client" .Values.allInOne.enabled -}}
+{{- printf "%s.%s:%d" (include "seaweedfs.componentName" (list . $component)) .Release.Namespace (int .Values.filer.port) -}}
 {{- end -}}
 
 {{/*
 Generate comma-separated list of master server addresses.
 Usage: {{ include "seaweedfs.masterServers" . }}
-Output example: ${SEAWEEDFS_FULLNAME}-master-0.${SEAWEEDFS_FULLNAME}-master.namespace:9333,${SEAWEEDFS_FULLNAME}-master-1...
+Output example: my-release-master-0.my-release-master.namespace:9333,my-release-master-1...
 */}}
 {{- define "seaweedfs.masterServers" -}}
-{{- $fullname := include "seaweedfs.name" . -}}
+{{- $masterName := include "seaweedfs.componentName" (list . "master") -}}
 {{- range $index := until (.Values.master.replicas | int) -}}
 {{- if $index }},{{ end -}}
-${SEAWEEDFS_FULLNAME}-master-{{ $index }}.${SEAWEEDFS_FULLNAME}-master.{{ $.Release.Namespace }}:{{ $.Values.master.port }}
+{{ $masterName }}-{{ $index }}.{{ $masterName }}.{{ $.Release.Namespace }}:{{ $.Values.master.port }}
 {{- end -}}
 {{- end -}}
 
@@ -294,9 +344,240 @@ Generate master server argument value, using global.masterServer if set, otherwi
 Usage: {{ include "seaweedfs.masterServerArg" . }}
 */}}
 {{- define "seaweedfs.masterServerArg" -}}
-{{- if .Values.global.masterServer -}}
-{{- .Values.global.masterServer -}}
+{{- if .Values.global.seaweedfs.masterServer -}}
+{{- .Values.global.seaweedfs.masterServer -}}
 {{- else -}}
 {{- include "seaweedfs.masterServers" . -}}
 {{- end -}}
 {{- end -}}
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "seaweedfs.serviceAccountName" -}}
+{{- .Values.global.seaweedfs.serviceAccountName | default "seaweedfs" -}}
+{{- end -}}
+
+{{/* True when security.toml should be rendered and mounted. volumeWrite is
+     excluded unless its non-default expiration is configured. */}}
+{{- define "seaweedfs.securityConfigEnabled" -}}
+{{- $sec := (.Values.global.seaweedfs).securityConfig | default dict -}}
+{{- $jwt := $sec.jwtSigning | default dict -}}
+{{- $expiresAfterSeconds := $jwt.expiresAfterSeconds | default dict -}}
+{{- $volumeWriteExpirationConfigured := and $jwt.volumeWrite (gt (int $expiresAfterSeconds.volumeWrite) 0) -}}
+{{- if or .Values.global.seaweedfs.enableSecurity $volumeWriteExpirationConfigured $jwt.volumeRead $jwt.filerWrite $jwt.filerRead -}}
+true
+{{- end -}}
+{{- end -}}
+
+{{/* True when the post-install bucket hook Job renders: an S3 endpoint, plus
+     buckets to create on it. Read by the Job itself and by its NetworkPolicy,
+     which has to appear exactly when the Job does - a Job without its policy
+     hangs in a default-deny namespace. */}}
+{{- define "seaweedfs.bucketHookEnabled" -}}
+{{- if .Values.allInOne.enabled -}}
+{{-   if and .Values.allInOne.s3.enabled .Values.allInOne.s3.createBuckets -}}
+true
+{{-   end -}}
+{{- else if .Values.master.enabled -}}
+{{-   if and (or .Values.filer.s3.enabled .Values.s3.enabled) (or .Values.s3.createBuckets .Values.filer.s3.createBuckets) -}}
+true
+{{-   end -}}
+{{- end -}}
+{{- end -}}
+
+{{/* The kubectl commands the volume resize hook has to run, one per line: a
+     cascade-orphan delete for every StatefulSet whose volumeClaimTemplates no
+     longer match the values, and a patch for every PVC the values grew.
+
+     Empty when there is nothing to resize, which is what gates the Job. Read by
+     its NetworkPolicy too, which has to appear exactly when the Job does - a Job
+     without its policy hangs in a default-deny namespace, and a policy without
+     its Job is an orphaned hook resource on every install.
+
+     Built on lookup, so it is always empty under helm template and on a fresh
+     install, where there is no StatefulSet to compare against yet. */}}
+{{- define "seaweedfs.volumeResizeHookCommands" -}}
+{{- $seaweedfsName := include "seaweedfs.fullname" $ }}
+{{- $volumes := deepCopy .Values.volumes | mergeOverwrite (dict "" .Values.volume) }}
+{{- $commands := list }}
+{{- if .Values.volume.resizeHook.enabled }}
+{{-   range $vname, $volume := $volumes }}
+{{-     $volumeName := trimSuffix "-" (printf "volume-%s" $vname) }}
+{{-     $volume := mergeOverwrite (deepCopy $.Values.volume) (dict "enabled" true) $volume }}
+{{-     if $volume.enabled }}
+{{-       $replicas := int $volume.replicas }}
+{{-       $statefulsetName := printf "%s-%s" $seaweedfsName $volumeName }}
+{{-       $statefulset := (lookup "apps/v1" "StatefulSet" $.Release.Namespace $statefulsetName) }}
+{{- /* Check for changes in volumeClaimTemplates */}}
+{{-       if $statefulset }}
+{{-         range $dir := $volume.dataDirs }}
+{{-           if eq .type "persistentVolumeClaim" }}
+{{-             $desiredSize := .size }}
+{{-             range $statefulset.spec.volumeClaimTemplates }}
+{{- /* normalise both sides: the API server canonicalises quantities, so a raw
+       compare fires on a respelling that changed nothing. */}}
+{{-               if and (eq .metadata.name $dir.name) (ne (include "seaweedfs.resource-quantity" .spec.resources.requests.storage) (include "seaweedfs.resource-quantity" $desiredSize)) }}
+{{-                 $commands = append $commands (printf "kubectl delete statefulset %s --cascade=orphan" $statefulsetName) }}
+{{-               end }}
+{{-             end }}
+{{-           end }}
+{{-         end }}
+{{-       end }}
+{{- /* Check for the need for patching existing PVCs */}}
+{{-       range $dir := $volume.dataDirs }}
+{{-         if eq .type "persistentVolumeClaim" }}
+{{-           $desiredSize := .size }}
+{{-           range $i, $e := until $replicas }}
+{{-             $pvcName := printf "%s-%s-%s-%d" $dir.name $seaweedfsName $volumeName $e }}
+{{-             $currentPVC := (lookup "v1" "PersistentVolumeClaim" $.Release.Namespace $pvcName) }}
+{{-             if $currentPVC }}
+{{-               $oldSize := include "seaweedfs.resource-quantity" $currentPVC.spec.resources.requests.storage }}
+{{-               $newSize := include "seaweedfs.resource-quantity" $desiredSize }}
+{{- /* both sides are strings from an include, so compare them as numbers: a
+       lexicographic gt reads 10Gi as smaller than 5Gi and skips the patch. */}}
+{{-               if gt (float64 $newSize) (float64 $oldSize) }}
+{{-                 $commands = append $commands (printf "kubectl patch pvc %s-%s-%s-%d -p '{\"spec\":{\"resources\":{\"requests\":{\"storage\":\"%v\"}}}}'" $dir.name $seaweedfsName $volumeName $e $desiredSize) }}
+{{-               end }}
+{{-             end }}
+{{-           end }}
+{{-         end }}
+{{-       end }}
+{{-     end }}
+{{-   end }}
+{{- end }}
+{{- join "\n" $commands }}
+{{- end -}}
+
+{{/* S3 TLS cert/key arguments, using custom secret if s3.tlsSecret is set */}}
+{{- define "seaweedfs.s3.tlsArgs" -}}
+{{- $prefix := .prefix -}}
+{{- $root := .root -}}
+{{- if $root.Values.s3.tlsSecret -}}
+-{{ $prefix }}cert.file=/usr/local/share/ca-certificates/s3/tls.crt \
+-{{ $prefix }}key.file=/usr/local/share/ca-certificates/s3/tls.key \
+{{- else -}}
+-{{ $prefix }}cert.file=/usr/local/share/ca-certificates/client/tls.crt \
+-{{ $prefix }}key.file=/usr/local/share/ca-certificates/client/tls.key \
+{{- end -}}
+{{- end -}}
+
+{{/* S3 custom TLS volume mount */}}
+{{- define "seaweedfs.s3.tlsVolumeMount" -}}
+{{- if .Values.s3.tlsSecret }}
+- name: s3-tls-cert
+  readOnly: true
+  mountPath: /usr/local/share/ca-certificates/s3/
+{{- end }}
+{{- end -}}
+
+{{/* S3 custom TLS volume */}}
+{{- define "seaweedfs.s3.tlsVolume" -}}
+{{- if .Values.s3.tlsSecret }}
+- name: s3-tls-cert
+  secret:
+    secretName: {{ .Values.s3.tlsSecret }}
+{{- end }}
+{{- end -}}
+
+{{/* True when an enterprise license Secret is configured. */}}
+{{- define "seaweedfs.licenseEnabled" -}}
+{{- if ((.Values.global.seaweedfs).license).existingSecret -}}
+true
+{{- end -}}
+{{- end -}}
+
+{{/* Enterprise license volume. Projects just the license key. */}}
+{{- define "seaweedfs.licenseVolume" -}}
+{{- if include "seaweedfs.licenseEnabled" . -}}
+- name: seaweedfs-license
+  secret:
+    secretName: {{ .Values.global.seaweedfs.license.existingSecret }}
+    defaultMode: 0444
+    items:
+      - key: {{ .Values.global.seaweedfs.license.secretKey | default "seaweed-license.json" | quote }}
+        path: {{ .Values.global.seaweedfs.license.secretKey | default "seaweed-license.json" | quote }}
+{{- end }}
+{{- end -}}
+
+{{/* Enterprise license volume mount. Never a subPath: that is resolved once at
+     container start, so a renewed Secret would not reach a running master. */}}
+{{- define "seaweedfs.licenseVolumeMount" -}}
+{{- if include "seaweedfs.licenseEnabled" . -}}
+- name: seaweedfs-license
+  readOnly: true
+  mountPath: {{ .Values.global.seaweedfs.license.mountPath | default "/etc/seaweedfs/license" | quote }}
+{{- end }}
+{{- end -}}
+
+{{/* SEAWEED_LICENSE, set explicitly rather than relying on the binary's search
+     paths, which depend on the working directory. */}}
+{{- define "seaweedfs.licenseEnv" -}}
+{{- if include "seaweedfs.licenseEnabled" . -}}
+- name: SEAWEED_LICENSE
+  value: {{ printf "%s/%s"
+      (.Values.global.seaweedfs.license.mountPath | default "/etc/seaweedfs/license")
+      (.Values.global.seaweedfs.license.secretKey | default "seaweed-license.json") | quote }}
+{{- end }}
+{{- end -}}
+
+{{/* Name of the environment variable carrying one generated S3 credential
+     field, e.g. SEAWEEDFS_S3_ADMIN_ACCESS_KEY_ID. The generated identities file
+     names it in place of the key when the key lives in an existing Secret.
+     Usage: include "seaweedfs.s3.credentialEnvName" (list "admin" "accessKey") */}}
+{{- define "seaweedfs.s3.credentialEnvName" -}}
+{{- $identity := index . 0 -}}
+{{- $field := index . 1 -}}
+{{- printf "SEAWEEDFS_S3_%s_%s" (upper $identity) (ternary "ACCESS_KEY_ID" "SECRET_ACCESS_KEY" (eq $field "accessKey")) -}}
+{{- end -}}
+
+{{/* Environment for the S3 identities the chart generates from an existing
+     Secret. The gateway resolves the ${VAR} references the identities file
+     carries, so the keys never enter the rendered manifests and a dry run
+     renders the same as an install. */}}
+{{- define "seaweedfs.s3.credentialEnv" -}}
+{{- $creds := $.Values.s3.credentials | default dict -}}
+{{- range $identity := list "admin" "read" -}}
+{{- $identityCreds := index $creds $identity | default dict -}}
+{{- if $identityCreds.existingSecret }}
+- name: {{ include "seaweedfs.s3.credentialEnvName" (list $identity "accessKey") }}
+  valueFrom:
+    secretKeyRef:
+      name: {{ $identityCreds.existingSecret | quote }}
+      key: {{ default (printf "%s_access_key_id" $identity) $identityCreds.accessKeyKey | quote }}
+- name: {{ include "seaweedfs.s3.credentialEnvName" (list $identity "secretKey") }}
+  valueFrom:
+    secretKeyRef:
+      name: {{ $identityCreds.existingSecret | quote }}
+      key: {{ default (printf "%s_secret_access_key" $identity) $identityCreds.secretKeyKey | quote }}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/* Generate a compatible trafficDistribution value due to "PreferClose" fast deprecation in k8s v1.35.
+     Accepts a dict with "value" (the trafficDistribution string) and "Capabilities". */}}
+{{- define "seaweedfs.trafficDistribution" -}}
+{{- if .value -}}
+{{- and (eq .value "PreferClose") (semverCompare ">=1.35-0" .Capabilities.KubeVersion.GitVersion) | ternary "PreferSameZone" .value -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Render LoadBalancer-specific service fields (loadBalancerClass, loadBalancerIP,
+loadBalancerSourceRanges), only when the service type is LoadBalancer.
+Usage: {{ include "seaweedfs.service.loadBalancerFields" .Values.s3.service }}
+*/}}
+{{- define "seaweedfs.service.loadBalancerFields" -}}
+{{- if eq (.type | default "ClusterIP") "LoadBalancer" }}
+{{- with .loadBalancerClass }}
+  loadBalancerClass: {{ . }}
+{{- end }}
+{{- with .loadBalancerIP }}
+  loadBalancerIP: {{ . }}
+{{- end }}
+{{- with .loadBalancerSourceRanges }}
+  loadBalancerSourceRanges:
+    {{- toYaml . | nindent 4 }}
+{{- end }}
+{{- end }}
+{{- end -}}
diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/shared/cluster-role.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/shared/cluster-role.yaml
index 154de06751..e31c2d5f2f 100644
--- a/packages/system/seaweedfs/charts/seaweedfs/templates/shared/cluster-role.yaml
+++ b/packages/system/seaweedfs/charts/seaweedfs/templates/shared/cluster-role.yaml
@@ -1,10 +1,11 @@
-{{- if .Values.global.createClusterRole }}
+{{- include "seaweedfs.compat" . -}}
+{{- if .Values.global.seaweedfs.createClusterRole }}
 #hack for delete pod master after migration
 ---
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: {{ .Values.global.serviceAccountName }}-rw-cr
+  name: {{ include "seaweedfs.serviceAccountName" . }}-rw-cr
   labels:
     app.kubernetes.io/name: {{ template "seaweedfs.name" . }}
     helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
@@ -18,7 +19,7 @@ rules:
 kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: system:serviceaccount:{{ .Values.global.serviceAccountName }}:default
+  name: {{ include "seaweedfs.serviceAccountName" . }}-rw-crb
   labels:
     app.kubernetes.io/name: {{ template "seaweedfs.name" . }}
     helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
@@ -26,10 +27,10 @@ metadata:
     app.kubernetes.io/instance: {{ .Release.Name }}
 subjects:
   - kind: ServiceAccount
-    name: {{ .Values.global.serviceAccountName }}
+    name: {{ include "seaweedfs.serviceAccountName" . }}
     namespace: {{ .Release.Namespace }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: {{ .Values.global.serviceAccountName }}-rw-cr
+  name: {{ include "seaweedfs.serviceAccountName" . }}-rw-cr
 {{- end }}
\ No newline at end of file
diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/shared/networkpolicy.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/shared/networkpolicy.yaml
new file mode 100644
index 0000000000..92404a7547
--- /dev/null
+++ b/packages/system/seaweedfs/charts/seaweedfs/templates/shared/networkpolicy.yaml
@@ -0,0 +1,267 @@
+{{- include "seaweedfs.compat" . -}}
+{{- if .Values.networkPolicy.enabled }}
+{{- $np := .Values.networkPolicy }}
+{{- $egressCfg := $np.egress | default dict }}
+{{- $overrides := $np.components | default dict }}
+
+{{- /* One entry per rendered workload, keyed by its app.kubernetes.io/component
+       label. "ports" is everything the workload listens on, taken from the same
+       values the containerPorts are taken from, so a changed port cannot drift
+       out of the policy. "apiserver" marks the workloads that talk to the
+       Kubernetes API. "name" overrides the object name where the component
+       label already reads as a full name. */}}
+{{- $targets := list }}
+
+{{- /* allInOne.enabled does not turn the individual components off - their
+       templates only look at their own enabled flag - so the all-in-one pod is
+       an addition here, not an alternative. */}}
+{{- if .Values.allInOne.enabled }}
+{{-   $ports := list .Values.master.port .Values.master.grpcPort .Values.volume.port .Values.volume.grpcPort .Values.filer.port .Values.filer.grpcPort }}
+{{-   if .Values.allInOne.metricsPort }}
+{{-     $ports = append $ports .Values.allInOne.metricsPort }}
+{{-   end }}
+{{-   if .Values.allInOne.s3.enabled }}
+{{-     $ports = append $ports (.Values.allInOne.s3.port | default .Values.s3.port) }}
+{{-     $https := .Values.allInOne.s3.httpsPort | default .Values.s3.httpsPort }}
+{{-     if and $https (gt (int $https) 0) }}
+{{-       $ports = append $ports $https }}
+{{-     end }}
+{{-   end }}
+{{-   if .Values.allInOne.sftp.enabled }}
+{{-     $ports = append $ports (.Values.allInOne.sftp.port | default .Values.sftp.port) }}
+{{-   end }}
+{{-   $targets = append $targets (dict "component" "seaweedfs-all-in-one" "name" "all-in-one" "ports" $ports) }}
+{{- end }}
+{{- if .Values.master.enabled }}
+{{-   $ports := list .Values.master.port .Values.master.grpcPort }}
+{{-   if .Values.master.metricsPort }}
+{{-     $ports = append $ports .Values.master.metricsPort }}
+{{-   end }}
+{{-   $targets = append $targets (dict "component" "master" "ports" $ports) }}
+{{- end }}
+{{- /* Every volume group carries its own component label and its own ports. */}}
+{{- $volumes := deepCopy .Values.volumes | mergeOverwrite (dict "" .Values.volume) }}
+{{- range $vname, $volume := $volumes }}
+{{-   $volumeName := trimSuffix "-" (printf "volume-%s" $vname) }}
+{{-   $volume := mergeOverwrite (deepCopy $.Values.volume) (dict "enabled" true) $volume }}
+{{-   if $volume.enabled }}
+{{-     $ports := list $volume.port $volume.grpcPort }}
+{{-     if $volume.metricsPort }}
+{{-       $ports = append $ports $volume.metricsPort }}
+{{-     end }}
+{{-     $targets = append $targets (dict "component" $volumeName "ports" $ports) }}
+{{-   end }}
+{{- end }}
+{{- if .Values.filer.enabled }}
+{{-   $ports := list .Values.filer.port .Values.filer.grpcPort }}
+{{-   if .Values.filer.metricsPort }}
+{{-     $ports = append $ports .Values.filer.metricsPort }}
+{{-   end }}
+{{-   if .Values.filer.s3.enabled }}
+{{-     $ports = append $ports .Values.filer.s3.port }}
+{{-     if and .Values.filer.s3.httpsPort (gt (int .Values.filer.s3.httpsPort) 0) }}
+{{-       $ports = append $ports .Values.filer.s3.httpsPort }}
+{{-     end }}
+{{-   end }}
+{{-   $targets = append $targets (dict "component" "filer" "ports" $ports) }}
+{{- end }}
+{{- if .Values.s3.enabled }}
+{{-   $ports := list .Values.s3.port }}
+{{-   if and .Values.s3.httpsPort (gt (int .Values.s3.httpsPort) 0) }}
+{{-     $ports = append $ports .Values.s3.httpsPort }}
+{{-   end }}
+{{-   if .Values.s3.icebergPort }}
+{{-     $ports = append $ports .Values.s3.icebergPort }}
+{{-   end }}
+{{-   if .Values.s3.lancePort }}
+{{-     $ports = append $ports .Values.s3.lancePort }}
+{{-   end }}
+{{-   if .Values.s3.metricsPort }}
+{{-     $ports = append $ports .Values.s3.metricsPort }}
+{{-   end }}
+{{-   $targets = append $targets (dict "component" "s3" "ports" $ports) }}
+{{- end }}
+{{- if .Values.sftp.enabled }}
+{{-   $ports := list .Values.sftp.port }}
+{{-   if .Values.sftp.metricsPort }}
+{{-     $ports = append $ports .Values.sftp.metricsPort }}
+{{-   end }}
+{{-   $targets = append $targets (dict "component" "sftp" "ports" $ports) }}
+{{- end }}
+{{- /* No seaweedfs binary speaks to the Kubernetes API - the repository has no
+       client-go dependency - so admin gets no apiserver rule. The pod-RW
+       ClusterRole under global.seaweedfs.createClusterRole is a leftover from a
+       migration and is not exercised by any component. */}}
+{{- if .Values.admin.enabled }}
+{{-   $targets = append $targets (dict "component" "admin" "ports" (list .Values.admin.port .Values.admin.grpcPort)) }}
+{{- end }}
+{{- if .Values.worker.enabled }}
+{{-   $ports := list }}
+{{-   if .Values.worker.metricsPort }}
+{{-     $ports = append $ports .Values.worker.metricsPort }}
+{{-   end }}
+{{-   if and .Values.worker.lanceMetricsPort (include "seaweedfs.worker.lanceNamespaceUrl" .) }}
+{{-     $ports = append $ports .Values.worker.lanceMetricsPort }}
+{{-   end }}
+{{-   $targets = append $targets (dict "component" "worker" "ports" $ports) }}
+{{- end }}
+
+{{- if .Values.cosi.enabled }}
+{{- /* The provisioner sidecar watches the COSI CRs, so it needs the API
+       server; nothing needs to reach the driver itself. */}}
+{{-   $targets = append $targets (dict "component" "objectstorage-provisioner" "ports" (list) "apiserver" true) }}
+{{- end }}
+
+{{- /* The hook Jobs. Nothing connects to either, but under a default-deny
+       namespace they need egress or they hang: the bucket hook waits on the
+       master and filer, the resize hook shells out to kubectl.
+
+       The bucket hook is post-install, and Helm applies the release manifest
+       before post-install hooks run, so a plain policy is already in place by
+       then. The resize hook is pre-install weight 0, which runs before the
+       manifest is applied at all, so its policy has to be a pre-install hook
+       itself, at a weight below the Job's. */}}
+{{- if include "seaweedfs.bucketHookEnabled" . }}
+{{-   $targets = append $targets (dict "component" "bucket-hook" "ports" (list)) }}
+{{- end }}
+{{- /* Same cluster lookup the Job is gated on, so the policy appears on exactly
+       the upgrades that grow a PVC and never on the ones that do not. Helm does
+       not garbage-collect hook resources, so a policy rendered unconditionally
+       would be left in the namespace by every install that uninstalls again -
+       and would make egress.kubeApiServer.cidrs mandatory for every release,
+       for a Job most of them never run. */}}
+{{- if include "seaweedfs.volumeResizeHookCommands" . | trim }}
+{{-   $targets = append $targets (dict "component" "volume-resize-hook" "ports" (list) "apiserver" true "hook" "pre-install,pre-upgrade" "hookWeight" "-10") }}
+{{- end }}
+
+{{- /* A key under networkPolicy.components that names no component would be
+       read as "these rules are applied" and silently do nothing. Check against
+       every component the chart can produce rather than the ones enabled here,
+       so one values file can still carry overrides for a component this release
+       leaves off. */}}
+{{- $known := list "master" "filer" "s3" "sftp" "admin" "worker" "volume" "bucket-hook" "volume-resize-hook" "objectstorage-provisioner" "seaweedfs-all-in-one" }}
+{{- range $vname, $_ := (.Values.volumes | default dict) }}
+{{-   $known = append $known (trimSuffix "-" (printf "volume-%s" $vname)) }}
+{{- end }}
+{{- range $name, $_ := $overrides }}
+{{-   if not (has $name $known) }}
+{{-     fail (printf "networkPolicy.components: %q is not a component of this chart, so its rules would never be applied. Known components: %s." $name (join ", " (sortAlpha $known))) }}
+{{-   end }}
+{{- end }}
+
+{{- range $target := $targets }}
+{{- $component := $target.component }}
+{{- $override := get $overrides $component | default dict }}
+---
+apiVersion: networking.k8s.io/v1
+kind: NetworkPolicy
+metadata:
+  name: {{ include "seaweedfs.componentName" (list $ ($target.name | default $component)) }}
+  namespace: {{ $.Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: {{ include "seaweedfs.name" $ | quote }}
+    helm.sh/chart: {{ $.Chart.Name }}-{{ $.Chart.Version | replace "+" "_" }}
+    app.kubernetes.io/managed-by: {{ $.Release.Service | quote }}
+    app.kubernetes.io/instance: {{ $.Release.Name | quote }}
+    app.kubernetes.io/component: {{ $component | quote }}
+{{- if $target.hook }}
+  annotations:
+    {{- /* Only before-hook-creation: the policy has to outlive the Job it
+           covers, so it must not be deleted when the Job succeeds. That does
+           leave it behind on uninstall, the usual trade-off for Helm hook
+           resources. */}}
+    "helm.sh/hook": {{ $target.hook }}
+    "helm.sh/hook-weight": {{ $target.hookWeight | quote }}
+    "helm.sh/hook-delete-policy": before-hook-creation
+{{- end }}
+spec:
+  podSelector:
+    matchLabels:
+      app.kubernetes.io/name: {{ include "seaweedfs.name" $ | quote }}
+      app.kubernetes.io/instance: {{ $.Release.Name | quote }}
+      app.kubernetes.io/component: {{ $component | quote }}
+  policyTypes:
+    - Ingress
+{{- if $egressCfg.enabled }}
+    - Egress
+{{- end }}
+  ingress:
+{{- $extraIngress := concat ($np.extraIngress | default list) ($override.extraIngress | default list) }}
+{{- if and (not $target.ports) (not $extraIngress) }}
+    []
+{{- end }}
+{{- if $target.ports }}
+    - from:
+        - podSelector:
+            matchLabels:
+              app.kubernetes.io/name: {{ include "seaweedfs.name" $ | quote }}
+              app.kubernetes.io/instance: {{ $.Release.Name | quote }}
+      ports:
+{{- range $port := $target.ports }}
+        - protocol: TCP
+          port: {{ $port }}
+{{- end }}
+{{- end }}
+{{- with $extraIngress }}
+{{- toYaml . | nindent 4 }}
+{{- end }}
+{{- if $egressCfg.enabled }}
+  egress:
+    - to:
+        - podSelector:
+            matchLabels:
+              app.kubernetes.io/name: {{ include "seaweedfs.name" $ | quote }}
+              app.kubernetes.io/instance: {{ $.Release.Name | quote }}
+{{- if $egressCfg.allowDNS }}
+{{- /* Emit only the selectors that are set. An empty one has to be left out
+       rather than rendered as null: a missing podSelector means every pod in
+       the namespace, and a missing namespaceSelector means this namespace
+       instead of the one DNS runs in. */}}
+{{- if not (or $egressCfg.dnsNamespaceSelector $egressCfg.dnsPodSelector) }}
+{{- fail "networkPolicy: egress.allowDNS is on but both egress.dnsNamespaceSelector and egress.dnsPodSelector are empty, which would open port 53 to every pod in the release namespace. Set at least one of them, or turn allowDNS off and name the resolver in egress.extraEgress." }}
+{{- end }}
+    - to:
+{{- if and $egressCfg.dnsNamespaceSelector $egressCfg.dnsPodSelector }}
+        - namespaceSelector:
+            {{- toYaml $egressCfg.dnsNamespaceSelector | nindent 12 }}
+          podSelector:
+            {{- toYaml $egressCfg.dnsPodSelector | nindent 12 }}
+{{- else if $egressCfg.dnsNamespaceSelector }}
+        - namespaceSelector:
+            {{- toYaml $egressCfg.dnsNamespaceSelector | nindent 12 }}
+{{- else }}
+        - podSelector:
+            {{- toYaml $egressCfg.dnsPodSelector | nindent 12 }}
+{{- end }}
+      ports:
+        - protocol: UDP
+          port: 53
+        - protocol: TCP
+          port: 53
+{{- end }}
+{{- if and $target.apiserver ($egressCfg.kubeApiServer).enabled }}
+{{- if not $egressCfg.kubeApiServer.cidrs }}
+{{- fail (printf "networkPolicy: %s needs the Kubernetes API server, but networkPolicy.egress.kubeApiServer.cidrs is empty. Set it to your API server address(es), or disable networkPolicy.egress.kubeApiServer and allow it through networkPolicy.egress.extraEgress." $component) }}
+{{- end }}
+{{- /* An empty port list is not "no ports" in a NetworkPolicy, it is every
+       port, so refuse it rather than quietly opening the CIDR up. */}}
+{{- if not $egressCfg.kubeApiServer.ports }}
+{{- fail "networkPolicy: egress.kubeApiServer.ports is empty, which allows every port on the API server CIDR(s) rather than none. Set it (the default is [443, 6443]), or turn egress.kubeApiServer off and describe the access in egress.extraEgress." }}
+{{- end }}
+{{- range $cidr := $egressCfg.kubeApiServer.cidrs }}
+    - to:
+        - ipBlock:
+            cidr: {{ $cidr }}
+      ports:
+{{- range $port := $egressCfg.kubeApiServer.ports }}
+        - protocol: TCP
+          port: {{ $port }}
+{{- end }}
+{{- end }}
+{{- end }}
+{{- with concat ($egressCfg.extraEgress | default list) ($override.extraEgress | default list) }}
+{{- toYaml . | nindent 4 }}
+{{- end }}
+{{- end }}
+{{- end }}
+{{- end }}
diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/shared/notification-configmap.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/shared/notification-configmap.yaml
index c638c87715..f5af694dfa 100644
--- a/packages/system/seaweedfs/charts/seaweedfs/templates/shared/notification-configmap.yaml
+++ b/packages/system/seaweedfs/charts/seaweedfs/templates/shared/notification-configmap.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ template "seaweedfs.name" . }}-notification-config
+  name: {{ include "seaweedfs.fullname" . }}-notification-config
   namespace: {{ .Release.Namespace }}
   labels:
     app.kubernetes.io/name: {{ template "seaweedfs.name" . }}
diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/shared/post-install-bucket-hook.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/shared/post-install-bucket-hook.yaml
index a0c56edc46..5868c1c54a 100644
--- a/packages/system/seaweedfs/charts/seaweedfs/templates/shared/post-install-bucket-hook.yaml
+++ b/packages/system/seaweedfs/charts/seaweedfs/templates/shared/post-install-bucket-hook.yaml
@@ -1,13 +1,25 @@
+{{- include "seaweedfs.compat" . -}}
 {{- /* Support bucket creation for both standalone filer.s3 and allInOne modes */}}
 {{- $createBuckets := list }}
-{{- $s3Enabled := false }}
 {{- $enableAuth := false }}
 {{- $existingConfigSecret := "" }}
+{{- $bucketsFolder := "/buckets" }}
+{{- $bucketEnvVars := merge (dict) (.Values.global.seaweedfs.extraEnvironmentVars | default dict) }}
+{{- if .Values.allInOne.enabled }}
+  {{- $bucketEnvVars = merge (.Values.allInOne.extraEnvironmentVars | default dict) $bucketEnvVars }}
+{{- else }}
+  {{- $bucketEnvVars = merge (.Values.filer.extraEnvironmentVars | default dict) $bucketEnvVars }}
+{{- end }}
+{{- $bucketsFolder = default $bucketsFolder (get $bucketEnvVars "WEED_FILER_BUCKETS_FOLDER") }}
+{{- $bucketsFolder = trimSuffix "/" $bucketsFolder }}
+{{- $clusterAlias := default "sw" (get $bucketEnvVars "WEED_CLUSTER_DEFAULT") }}
+{{- $clusterUpper := upper $clusterAlias }}
+{{- $clusterMasterKey := printf "WEED_CLUSTER_%s_MASTER" $clusterUpper }}
+{{- $clusterFilerKey := printf "WEED_CLUSTER_%s_FILER" $clusterUpper }}
 
 {{- /* Check allInOne mode first */}}
 {{- if .Values.allInOne.enabled }}
   {{- if .Values.allInOne.s3.enabled }}
-    {{- $s3Enabled = true }}
     {{- if .Values.allInOne.s3.createBuckets }}
       {{- $createBuckets = .Values.allInOne.s3.createBuckets }}
     {{- end }}
@@ -15,52 +27,59 @@
     {{- $existingConfigSecret = or .Values.allInOne.s3.existingConfigSecret .Values.s3.existingConfigSecret .Values.filer.s3.existingConfigSecret }}
   {{- end }}
 {{- else if .Values.master.enabled }}
-  {{- /* Check standalone filer.s3 mode */}}
-  {{- if .Values.filer.s3.enabled }}
-    {{- $s3Enabled = true }}
-    {{- if .Values.filer.s3.createBuckets }}
+  {{- /* Check if embedded (in filer) or standalone S3 gateway is enabled */}}
+  {{- if or .Values.filer.s3.enabled .Values.s3.enabled }}
+    {{- if .Values.s3.createBuckets }}
+      {{- $createBuckets = .Values.s3.createBuckets }}
+      {{- $enableAuth = .Values.s3.enableAuth }}
+      {{- $existingConfigSecret = .Values.s3.existingConfigSecret }}
+    {{- else if .Values.filer.s3.createBuckets }}
       {{- $createBuckets = .Values.filer.s3.createBuckets }}
+      {{- $enableAuth = .Values.filer.s3.enableAuth }}
+      {{- $existingConfigSecret = .Values.filer.s3.existingConfigSecret }}
     {{- end }}
-    {{- $enableAuth = .Values.filer.s3.enableAuth }}
-    {{- $existingConfigSecret = .Values.filer.s3.existingConfigSecret }}
   {{- end }}
 {{- end }}
 
-{{- if and $s3Enabled $createBuckets }}
+{{- /* Shared with networkpolicy.yaml, which renders this Job's policy exactly
+       when the Job itself renders. */}}
+{{- if include "seaweedfs.bucketHookEnabled" . }}
 ---
 apiVersion: batch/v1
 kind: Job
 metadata:
   name: "{{ $.Release.Name }}-bucket-hook"
   labels:
+    app.kubernetes.io/name: {{ template "seaweedfs.name" . }}
+    helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
     app.kubernetes.io/managed-by: {{ .Release.Service | quote }}
     app.kubernetes.io/instance: {{ .Release.Name | quote }}
+    app.kubernetes.io/component: bucket-hook
   annotations:
-    "helm.sh/hook": post-install
+    "helm.sh/hook": post-install,post-upgrade
     "helm.sh/hook-weight": "-5"
-    "helm.sh/hook-delete-policy": hook-succeeded
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
 spec:
   template:
     metadata:
       name: "{{ .Release.Name }}"
       labels:
+        app.kubernetes.io/name: {{ template "seaweedfs.name" . }}
+        helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
         app.kubernetes.io/managed-by: {{ .Release.Service | quote }}
         app.kubernetes.io/instance: {{ .Release.Name | quote }}
+        app.kubernetes.io/component: bucket-hook
     spec:
       restartPolicy: Never
       {{- if .Values.filer.podSecurityContext.enabled }}
       securityContext: {{- omit .Values.filer.podSecurityContext "enabled" | toYaml | nindent 8 }}
       {{- end }}
+      {{- include "seaweedfs.imagePullSecrets" $ | nindent 6 }}
       containers:
       - name: post-install-job
-        image: {{ template "master.image" . }}
+        image: {{ template "seaweedfs.master.image" . }}
+        imagePullPolicy: {{ $.Values.global.seaweedfs.imagePullPolicy | default "IfNotPresent" }}
         env:
-          - name: WEED_CLUSTER_DEFAULT
-            value: "sw"
-          - name: WEED_CLUSTER_SW_MASTER
-            value: {{ include "seaweedfs.cluster.masterAddress" . | quote }}
-          - name: WEED_CLUSTER_SW_FILER
-            value: {{ include "seaweedfs.cluster.filerAddress" . | quote }}
           - name: POD_IP
             valueFrom:
               fieldRef:
@@ -74,11 +93,34 @@ spec:
               fieldRef:
                 fieldPath: metadata.namespace
           - name: SEAWEEDFS_FULLNAME
-            value: "{{ template "seaweedfs.name" . }}"
+            value: "{{ include "seaweedfs.fullname" . }}"
+          {{- /* Carries the JWT signing keys when they are set as environment
+                 overrides rather than in security.toml. */}}
+          {{- range $key := keys $bucketEnvVars | sortAlpha }}
+          {{- $value := index $bucketEnvVars $key }}
+          {{- if not (has $key (list "WEED_CLUSTER_DEFAULT" $clusterMasterKey $clusterFilerKey)) }}
+          - name: {{ $key }}
+          {{- if kindIs "string" $value }}
+            value: {{ tpl $value $ | quote }}
+          {{- else }}
+            valueFrom:
+              {{ toYaml $value | nindent 14 | trim }}
+          {{- end }}
+          {{- end }}
+          {{- end }}
+          {{- /* Computed, as in all-in-one: the values pick the cluster alias,
+                 the chart still owns the endpoints the script waits on. */}}
+          - name: WEED_CLUSTER_DEFAULT
+            value: {{ $clusterAlias | quote }}
+          - name: {{ $clusterMasterKey }}
+            value: {{ include "seaweedfs.cluster.masterAddress" . | quote }}
+          - name: {{ $clusterFilerKey }}
+            value: {{ include "seaweedfs.cluster.filerAddress" . | quote }}
         command:
           - "/bin/sh"
           - "-ec"
           - |
+            set -o pipefail
             wait_for_service() {
               local url=$1
               local max_attempts=60  # 5 minutes total (5s * 60)
@@ -86,7 +128,7 @@ spec:
               
               echo "Waiting for service at $url..."
               while [ $attempt -le $max_attempts ]; do
-                if wget -q --spider "$url" >/dev/null 2>&1; then
+                if curl -sS -o /dev/null --max-time 5 "$url" >/dev/null 2>&1; then
                   echo "Service at $url is up!"
                   return 0
                 fi
@@ -98,16 +140,57 @@ spec:
               exit 1
             }
             {{- if .Values.allInOne.enabled }}
-            wait_for_service "http://$WEED_CLUSTER_SW_MASTER{{ .Values.allInOne.readinessProbe.httpGet.path }}"
-            wait_for_service "http://$WEED_CLUSTER_SW_FILER{{ .Values.filer.readinessProbe.httpGet.path }}"
+            wait_for_service "http://${{ $clusterMasterKey }}{{ .Values.allInOne.readinessProbe.httpGet.path }}"
+            wait_for_service "http://${{ $clusterFilerKey }}{{ .Values.filer.readinessProbe.httpGet.path }}"
             {{- else }}
-            wait_for_service "http://$WEED_CLUSTER_SW_MASTER{{ .Values.master.readinessProbe.httpGet.path }}"
-            wait_for_service "http://$WEED_CLUSTER_SW_FILER{{ .Values.filer.readinessProbe.httpGet.path }}"
+            wait_for_service "http://${{ $clusterMasterKey }}{{ .Values.master.readinessProbe.httpGet.path }}"
+            wait_for_service "http://${{ $clusterFilerKey }}{{ .Values.filer.readinessProbe.httpGet.path }}"
             {{- end }}
+            {{- range $createBuckets }}
+            {{- $bucketName := .name }}
+            {{- $bucketLock := or .lock .objectLock .withLock }}
+            bucket_list=$(/bin/echo 's3.bucket.list' | /usr/bin/weed shell) || { echo "Error listing s3 buckets"; exit 1; }
+            if echo "$bucket_list" | awk '{print $1}' | grep -Fxq "{{ $bucketName }}"; then
+              echo "Bucket '{{ $bucketName }}' already exists, skipping creation."
+            else
+              echo "Creating bucket '{{ $bucketName }}'..."
+              /bin/echo 's3.bucket.create --name {{ $bucketName }}{{- if $bucketLock }} --withLock{{- end }}' | /usr/bin/weed shell
+            fi
+          {{- end }}
           {{- range $createBuckets }}
-            /bin/echo \
-            "s3.bucket.create --name {{ .name }}" |\
-            /usr/bin/weed shell
+          {{- $bucketLock := or .lock .objectLock .withLock }}
+          {{- if $bucketLock }}
+            /bin/echo 's3.bucket.lock -name {{ .name }} -enable' | /usr/bin/weed shell
+          {{- end }}
+          {{- end }}
+          {{- range $createBuckets }}
+          {{- $bucketVersioning := "" }}
+          {{- if kindIs "bool" .versioning }}
+            {{- if .versioning }}
+              {{- $bucketVersioning = "Enabled" }}
+            {{- else }}
+              {{- $bucketVersioning = "Suspended" }}
+            {{- end }}
+          {{- else if kindIs "string" .versioning }}
+            {{- $versioningLower := lower .versioning }}
+            {{- if eq $versioningLower "enabled" "enable" "true" }}
+              {{- $bucketVersioning = "Enabled" }}
+            {{- else if eq $versioningLower "suspended" "disable" "false" }}
+              {{- $bucketVersioning = "Suspended" }}
+            {{- else if or (eq .versioning "Enabled") (eq .versioning "Suspended") }}
+              {{- $bucketVersioning = .versioning }}
+            {{- else }}
+              {{- fail (printf "Invalid versioning value for bucket %s: %s. Must be 'Enabled' or 'Suspended'" .name .versioning) }}
+            {{- end }}
+          {{- end }}
+          {{- if $bucketVersioning }}
+            /bin/echo 's3.bucket.versioning -name {{ .name }} -status {{ $bucketVersioning }}' | /usr/bin/weed shell
+          {{- end }}
+          {{- end }}
+          {{- range $createBuckets }}
+          {{- if .ttl }}
+            /bin/echo 'fs.configure -locationPrefix={{ $bucketsFolder }}/{{ .name }}/ -ttl={{ .ttl }} -apply' | /usr/bin/weed shell
+          {{- end }}
           {{- end }}
           {{- range $createBuckets }}
           {{- if .anonymousRead }}
@@ -119,33 +202,52 @@ spec:
                 /usr/bin/weed shell
           {{- end }}  
           {{- end }}
-        {{- if $enableAuth }}
+        {{- if or $enableAuth (include "seaweedfs.securityConfigEnabled" .) }}
         volumeMounts:
+          {{- if $enableAuth }}
           - name: config-users
             mountPath: /etc/sw
             readOnly: true
+          {{- end }}
+          {{- if include "seaweedfs.securityConfigEnabled" . }}
+          - name: security-config
+            readOnly: true
+            mountPath: /etc/seaweedfs/security.toml
+            subPath: security.toml
+          {{- end }}
         {{- end }}
         ports:
           - containerPort: {{ .Values.master.port }}
             name: swfs-master
-          {{- if and .Values.global.monitoring.enabled .Values.master.metricsPort }}
+          {{- if and .Values.global.seaweedfs.monitoring.enabled .Values.master.metricsPort }}
           - containerPort: {{ .Values.master.metricsPort }}
             name: metrics
           {{- end }}
           - containerPort: {{ .Values.master.grpcPort }}
             #name: swfs-master-grpc
+        {{- with coalesce .Values.allInOne.s3.createBucketsHook.resources .Values.s3.createBucketsHook.resources .Values.filer.s3.createBucketsHook.resources }}
+        resources:
+          {{- toYaml . | nindent 10 }}
+        {{- end }}
         {{- if .Values.filer.containerSecurityContext.enabled }}
         securityContext: {{- omit .Values.filer.containerSecurityContext "enabled" | toYaml | nindent 12 }}
         {{- end }}
-    {{- if $enableAuth }}
+    {{- if or $enableAuth (include "seaweedfs.securityConfigEnabled" .) }}
       volumes:
+        {{- if $enableAuth }}
         - name: config-users
           secret:
             defaultMode: 420
             {{- if $existingConfigSecret }}
             secretName: {{ $existingConfigSecret }}
             {{- else }}
-            secretName: {{ template "seaweedfs.name" . }}-s3-secret
+            secretName: {{ include "seaweedfs.fullname" . }}-s3-secret
             {{- end }}
+        {{- end }}
+        {{- if include "seaweedfs.securityConfigEnabled" . }}
+        - name: security-config
+          configMap:
+            name: {{ include "seaweedfs.fullname" . }}-security-config
+        {{- end }}
     {{- end }}
 {{- end }}
diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/shared/seaweedfs-grafana-dashboard.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/shared/seaweedfs-grafana-dashboard.yaml
index cf7801cce9..3d2f0fd610 100644
--- a/packages/system/seaweedfs/charts/seaweedfs/templates/shared/seaweedfs-grafana-dashboard.yaml
+++ b/packages/system/seaweedfs/charts/seaweedfs/templates/shared/seaweedfs-grafana-dashboard.yaml
@@ -1,4 +1,5 @@
-{{- if .Values.global.monitoring.enabled }}
+{{- include "seaweedfs.compat" . -}}
+{{- if .Values.global.seaweedfs.monitoring.enabled }}
 {{- $files := .Files.Glob "dashboards/*.json" }}
 {{- if $files }}
 {{- range $path, $file := $files }}
@@ -7,7 +8,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ printf "%s" $dashboardName | lower | replace "_" "-" }}
+  name: {{ include "seaweedfs.fullname" $ }}-{{ printf "%s" $dashboardName | lower | replace "_" "-" }}
   namespace: {{ $.Release.Namespace }}
   labels:
     grafana_dashboard: "1"
diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/shared/secret-seaweedfs-db.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/shared/secret-seaweedfs-db.yaml
index 5b7a810381..d72c26a078 100644
--- a/packages/system/seaweedfs/charts/seaweedfs/templates/shared/secret-seaweedfs-db.yaml
+++ b/packages/system/seaweedfs/charts/seaweedfs/templates/shared/secret-seaweedfs-db.yaml
@@ -1,9 +1,9 @@
-{{- if .Values.filer.enabled }}
+{{- if and .Values.filer.enabled (include "seaweedfs.filer.mysqlEnabled" .) }}
 apiVersion: v1
 kind: Secret
 type: Opaque
 metadata:
-  name: secret-seaweedfs-db
+  name: {{ include "seaweedfs.fullname" . }}-db-secret
   namespace: {{ .Release.Namespace }}
   annotations:
     "helm.sh/resource-policy": keep
@@ -15,7 +15,6 @@ metadata:
     app.kubernetes.io/instance: {{ .Release.Name }}
 stringData:
   user: "YourSWUser"
-  password: "HardCodedPassword"
-  # better to random generate and create in DB
-  # password: {{ randAlphaNum 10 | sha256sum | b64enc | trunc 32 }}
+  # auto-generated password
+  password: {{ randAlphaNum 10 | sha256sum | b64enc | trunc 32 }}
 {{- end }}
diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/shared/security-configmap.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/shared/security-configmap.yaml
index f7fb69ea4b..a067e1de9f 100644
--- a/packages/system/seaweedfs/charts/seaweedfs/templates/shared/security-configmap.yaml
+++ b/packages/system/seaweedfs/charts/seaweedfs/templates/shared/security-configmap.yaml
@@ -1,8 +1,9 @@
-{{- if .Values.global.enableSecurity }}
+{{- include "seaweedfs.compat" . -}}
+{{- if include "seaweedfs.securityConfigEnabled" . }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ template "seaweedfs.name" . }}-security-config
+  name: {{ include "seaweedfs.fullname" . }}-security-config
   namespace: {{ .Release.Namespace }}
   labels:
     app.kubernetes.io/name: {{ template "seaweedfs.name" . }}
@@ -10,44 +11,67 @@ metadata:
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     app.kubernetes.io/instance: {{ .Release.Name }}
 data:
-  {{- $existing := (lookup "v1" "ConfigMap" .Release.Namespace (printf "%s-security-config" (include "seaweedfs.name" .))) }}
+  {{- $fullname := include "seaweedfs.fullname" . }}
+  {{- $securityConfigName := printf "%s-security-config" $fullname }}
+  {{- $existing := lookup "v1" "ConfigMap" .Release.Namespace $securityConfigName }}
+  {{- if not $existing }}
+  {{- $legacyName := printf "%s-%s" (include "seaweedfs.name" .) "security-config" }}
+  {{- $existing = lookup "v1" "ConfigMap" .Release.Namespace $legacyName }}
+  {{- end }}
   {{- $securityConfig := fromToml (dig "data" "security.toml" "" $existing) }}
+  {{- $securityConfigValues := .Values.global.seaweedfs.securityConfig | default dict }}
+  {{- $jwtSigning := $securityConfigValues.jwtSigning | default dict }}
+  {{- $expiresAfterSeconds := $jwtSigning.expiresAfterSeconds | default dict }}
   security.toml: |-
     # this file is read by master, volume server, and filer
 
-    {{- if .Values.global.securityConfig.jwtSigning.volumeWrite }}
+    {{- if $jwtSigning.volumeWrite }}
     # the jwt signing key is read by master and volume server
-    # a jwt expires in 10 seconds
+    # the jwt defaults to expire after 10 seconds
     [jwt.signing]
     key = "{{ dig "jwt" "signing" "key" (randAlphaNum 10 | b64enc) $securityConfig }}"
+    {{- if gt (int $expiresAfterSeconds.volumeWrite) 0 }}
+    expires_after_seconds = {{ int $expiresAfterSeconds.volumeWrite }}
+    {{- end }}
     {{- end }}
 
-    {{- if .Values.global.securityConfig.jwtSigning.volumeRead }}
+    {{- if $jwtSigning.volumeRead }}
     # this jwt signing key is read by master and volume server, and it is used for read operations:
     # - the Master server generates the JWT, which can be used to read a certain file on a volume server
     # - the Volume server validates the JWT on reading
+    # the jwt defaults to expire after 60 seconds
     [jwt.signing.read]
     key = "{{ dig "jwt" "signing" "read" "key" (randAlphaNum 10 | b64enc) $securityConfig }}"
+    {{- if gt (int $expiresAfterSeconds.volumeRead) 0 }}
+    expires_after_seconds = {{ int $expiresAfterSeconds.volumeRead }}
+    {{- end }}
     {{- end }}
 
-    {{- if .Values.global.securityConfig.jwtSigning.filerWrite }}
+    {{- if $jwtSigning.filerWrite }}
     # If this JWT key is configured, Filer only accepts writes over HTTP if they are signed with this JWT:
     # - f.e. the S3 API Shim generates the JWT
     # - the Filer server validates the JWT on writing
-    # the jwt defaults to expire after 10 seconds.
+    # the jwt defaults to expire after 10 seconds
     [jwt.filer_signing]
     key = "{{ dig "jwt" "filer_signing" "key" (randAlphaNum 10 | b64enc) $securityConfig }}"
+    {{- if gt (int $expiresAfterSeconds.filerWrite) 0 }}
+    expires_after_seconds = {{ int $expiresAfterSeconds.filerWrite }}
+    {{- end }}
     {{- end }}
 
-    {{- if .Values.global.securityConfig.jwtSigning.filerRead }}
+    {{- if $jwtSigning.filerRead }}
     # If this JWT key is configured, Filer only accepts reads over HTTP if they are signed with this JWT:
     # - f.e. the S3 API Shim generates the JWT
-    # - the Filer server validates the JWT on writing
-    # the jwt defaults to expire after 10 seconds.
+    # - the Filer server validates the JWT on reading
+    # the jwt defaults to expire after 60 seconds
     [jwt.filer_signing.read]
     key = "{{ dig "jwt" "filer_signing" "read" "key" (randAlphaNum 10 | b64enc) $securityConfig }}"
+    {{- if gt (int $expiresAfterSeconds.filerRead) 0 }}
+    expires_after_seconds = {{ int $expiresAfterSeconds.filerRead }}
+    {{- end }}
     {{- end }}
 
+    {{- if .Values.global.seaweedfs.enableSecurity }}
     # all grpc tls authentications are mutual
     # the values for the following ca, cert, and key are paths to the PERM files.
     [grpc]
@@ -87,4 +111,5 @@ data:
     [https.volume]
     cert = ""
     key  = ""
+    {{- end }}
 {{- end }}
diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/shared/service-account.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/shared/service-account.yaml
index 429158a272..f9b67d4486 100644
--- a/packages/system/seaweedfs/charts/seaweedfs/templates/shared/service-account.yaml
+++ b/packages/system/seaweedfs/charts/seaweedfs/templates/shared/service-account.yaml
@@ -1,11 +1,16 @@
+{{- include "seaweedfs.compat" . -}}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: {{ .Values.global.serviceAccountName }}
+  name: {{ include "seaweedfs.serviceAccountName" . }}
   namespace: {{ .Release.Namespace }}
+  {{- with .Values.global.seaweedfs.serviceAccountAnnotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
   labels:
     app.kubernetes.io/name: {{ template "seaweedfs.name" . }}
     helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     app.kubernetes.io/instance: {{ .Release.Name }}
-automountServiceAccountToken: {{ .Values.global.automountServiceAccountToken }}
\ No newline at end of file
+automountServiceAccountToken: {{ .Values.global.seaweedfs.automountServiceAccountToken }}
\ No newline at end of file
diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/volume/volume-ingress.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/volume/volume-ingress.yaml
new file mode 100644
index 0000000000..b36c29867f
--- /dev/null
+++ b/packages/system/seaweedfs/charts/seaweedfs/templates/volume/volume-ingress.yaml
@@ -0,0 +1,56 @@
+{{- /* Volume ingress works for both normal mode (volume.enabled) and all-in-one mode (allInOne.enabled) */}}
+{{- $volumeEnabled := or .Values.volume.enabled .Values.allInOne.enabled }}
+{{- if and $volumeEnabled .Values.volume.ingress.enabled }}
+{{- /* Determine service name based on deployment mode */}}
+{{- $serviceName := ternary (include "seaweedfs.componentName" (list . "all-in-one")) (include "seaweedfs.componentName" (list . "volume")) .Values.allInOne.enabled }}
+{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }}
+apiVersion: networking.k8s.io/v1
+{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion }}
+apiVersion: networking.k8s.io/v1beta1
+{{- else }}
+apiVersion: extensions/v1beta1
+{{- end }}
+kind: Ingress
+metadata:
+  name: ingress-{{ include "seaweedfs.fullname" . }}-volume
+  namespace: {{ .Release.Namespace }}
+  annotations:
+  {{- if and (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) .Values.volume.ingress.className }}
+    kubernetes.io/ingress.class: {{ .Values.volume.ingress.className }}
+  {{- end }}
+  {{- with .Values.volume.ingress.annotations }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  labels:
+    app.kubernetes.io/name: {{ template "seaweedfs.name" . }}
+    helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/component: volume
+spec:
+  {{- if and (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) .Values.volume.ingress.className }}
+  ingressClassName: {{ .Values.volume.ingress.className | quote }}
+  {{- end }}
+  tls:
+    {{ .Values.volume.ingress.tls | default list | toYaml | nindent 6}}
+  rules:
+  - {{- if .Values.volume.ingress.host }}
+    host: {{ .Values.volume.ingress.host | quote }}
+    {{- end }}
+    http:
+      paths:
+      - path: {{ .Values.volume.ingress.path | quote }}
+        {{- if semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion }}
+        pathType: {{ .Values.volume.ingress.pathType | quote }}
+        {{- end }}
+        backend:
+{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }}
+          service:
+            name: {{ $serviceName }}
+            port:
+              number: {{ .Values.volume.port }}
+{{- else }}
+          serviceName: {{ $serviceName }}
+          servicePort: {{ .Values.volume.port }}
+{{- end }}
+{{- end }}
diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/volume/volume-resize-hook.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/volume/volume-resize-hook.yaml
index 8e3b5932cb..814d3d9848 100644
--- a/packages/system/seaweedfs/charts/seaweedfs/templates/volume/volume-resize-hook.yaml
+++ b/packages/system/seaweedfs/charts/seaweedfs/templates/volume/volume-resize-hook.yaml
@@ -1,80 +1,45 @@
-{{- $seaweedfsName := include "seaweedfs.name" $ }}
-{{- $volumes := deepCopy .Values.volumes | mergeOverwrite (dict "" .Values.volume)  }}
+{{- $seaweedfsName := include "seaweedfs.fullname" $ }}
+{{- /* Shared with networkpolicy.yaml, which renders this Job's policy exactly
+       when the Job itself renders. */}}
+{{- /* trim: include returns a string, and a whitespace-only one is truthy. */}}
+{{- $commands := include "seaweedfs.volumeResizeHookCommands" . | trim }}
 
-
-{{- if .Values.volume.resizeHook.enabled }}
-{{-   $commands := list }}
-{{-   range $vname, $volume := $volumes }}
-{{-     $volumeName := trimSuffix "-" (printf "volume-%s" $vname) }}
-{{-     $volume := mergeOverwrite (deepCopy $.Values.volume) (dict "enabled" true) $volume }}
-
-{{-     if $volume.enabled }}
-{{-       $replicas := int $volume.replicas -}}
-{{-       $statefulsetName := printf "%s-%s" $seaweedfsName $volumeName -}}
-{{-       $statefulset := (lookup "apps/v1" "StatefulSet" $.Release.Namespace $statefulsetName) -}}
-
-{{/*      Check for changes in volumeClaimTemplates */}}
-{{-       if $statefulset }}
-{{-         range $dir := $volume.dataDirs }}
-{{-           if eq .type "persistentVolumeClaim" }}
-{{-             $desiredSize := .size }}
-{{-             range $statefulset.spec.volumeClaimTemplates }}
-{{-               if and (eq .metadata.name $dir.name) (ne .spec.resources.requests.storage $desiredSize) }}
-{{-                 $commands = append $commands (printf "kubectl delete statefulset %s --cascade=orphan" $statefulsetName) }}
-{{-               end }}
-{{-             end }}
-{{-           end }}
-{{-         end }}
-{{-       end }}
-
-{{/*      Check for the need for patching existing PVCs */}}
-{{-       range $dir := $volume.dataDirs }}
-{{-         if eq .type "persistentVolumeClaim" }}
-{{-           $desiredSize := .size }}
-{{-           range $i, $e := until $replicas }}
-{{-             $pvcName := printf "%s-%s-%s-%d" $dir.name $seaweedfsName $volumeName $e }}
-{{-             $currentPVC := (lookup "v1" "PersistentVolumeClaim" $.Release.Namespace $pvcName) }}
-{{-             if and $currentPVC }}
-{{-             $oldSize := include "common.resource-quantity" $currentPVC.spec.resources.requests.storage }}
-{{-             $newSize := include "common.resource-quantity" $desiredSize }}
-{{-               if gt $newSize $oldSize }}
-{{-               $commands = append $commands (printf "kubectl patch pvc %s-%s-%s-%d -p '{\"spec\":{\"resources\":{\"requests\":{\"storage\":\"%s\"}}}}'" $dir.name $seaweedfsName $volumeName $e $desiredSize) }}
-{{-               end }}
-{{-             end }}
-{{-           end }}
-{{-         end }}
-{{-       end }}
-
-{{-     end }}
-{{-   end }}
-
-{{-   if $commands }}
+{{- if $commands }}
 apiVersion: batch/v1
 kind: Job
 metadata:
   name: "{{ $seaweedfsName }}-volume-resize-hook"
+  labels:
+    app.kubernetes.io/name: {{ template "seaweedfs.name" . }}
+    helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+    app.kubernetes.io/managed-by: {{ .Release.Service | quote }}
+    app.kubernetes.io/instance: {{ .Release.Name | quote }}
+    app.kubernetes.io/component: volume-resize-hook
   annotations:
     helm.sh/hook: pre-install,pre-upgrade
     helm.sh/hook-weight: "0"
     helm.sh/hook-delete-policy: hook-succeeded,before-hook-creation
 spec:
+  backoffLimit: 1
   template:
     metadata:
       labels:
+        app.kubernetes.io/name: {{ template "seaweedfs.name" . }}
+        helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+        app.kubernetes.io/managed-by: {{ .Release.Service | quote }}
+        app.kubernetes.io/instance: {{ .Release.Name | quote }}
+        app.kubernetes.io/component: volume-resize-hook
         policy.cozystack.io/allow-to-apiserver: "true"
     spec:
       serviceAccountName: {{ $seaweedfsName }}-volume-resize-hook
       restartPolicy: Never
-      backoffLimit: 1
       containers:
         - name: resize
           image: {{ .Values.volume.resizeHook.image }}
           command: ["sh", "-xec"]
           args:
             - |
-              {{- range $commands }}
-              {{ . }}
-              {{- end }}
+{{ $commands | indent 14 }}
 ---
 apiVersion: v1
 kind: ServiceAccount
@@ -116,5 +81,4 @@ roleRef:
   kind: Role
   name: {{ $seaweedfsName }}-volume-resize-hook
   apiGroup: rbac.authorization.k8s.io
-{{-   end }}
 {{- end }}
diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/volume/volume-service.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/volume/volume-service.yaml
index dfafc81637..53ca2c409c 100644
--- a/packages/system/seaweedfs/charts/seaweedfs/templates/volume/volume-service.yaml
+++ b/packages/system/seaweedfs/charts/seaweedfs/templates/volume/volume-service.yaml
@@ -8,10 +8,11 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ template "seaweedfs.name" $ }}-{{ $volumeName }}
+  name: {{ include "seaweedfs.componentName" (list $ $volumeName) }}
   namespace: {{ $.Release.Namespace }}
   labels:
     app.kubernetes.io/name: {{ template "seaweedfs.name" $ }}
+    app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/component: {{ $volumeName }}
     helm.sh/chart: {{ $.Chart.Name }}-{{ $.Chart.Version | replace "+" "_" }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
@@ -39,6 +40,7 @@ spec:
 {{- end }}
   selector:
     app.kubernetes.io/name: {{ template "seaweedfs.name" $ }}
+    app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/component: {{ $volumeName }}
 {{- end }}
 {{- end }}
diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/volume/volume-servicemonitor.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/volume/volume-servicemonitor.yaml
index ac82eb5734..b3ca54ebe0 100644
--- a/packages/system/seaweedfs/charts/seaweedfs/templates/volume/volume-servicemonitor.yaml
+++ b/packages/system/seaweedfs/charts/seaweedfs/templates/volume/volume-servicemonitor.yaml
@@ -1,3 +1,4 @@
+{{- include "seaweedfs.compat" . -}}
 {{ $volumes := deepCopy .Values.volumes | mergeOverwrite (dict "" .Values.volume)  }}
 {{- range $vname, $volume := $volumes }}
 {{- $volumeName := trimSuffix "-" (printf "volume-%s" $vname) }}
@@ -5,12 +6,12 @@
 
 {{- if $volume.enabled }}
 {{- if $volume.metricsPort }}
-{{- if $.Values.global.monitoring.enabled }}
+{{- if $.Values.global.seaweedfs.monitoring.enabled }}
 ---
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
-  name: {{ template "seaweedfs.name" $ }}-{{ $volumeName }}
+  name: {{ include "seaweedfs.fullname" $ }}-{{ $volumeName }}
   namespace: {{ $.Release.Namespace }}
   labels:
     app.kubernetes.io/name: {{ template "seaweedfs.name" $ }}
@@ -18,7 +19,7 @@ metadata:
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
     app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/component: {{ $volumeName }}
-    {{- with $.Values.global.monitoring.additionalLabels }}
+    {{- with $.Values.global.seaweedfs.monitoring.additionalLabels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
 {{- with $volume.annotations }}
@@ -33,6 +34,7 @@ spec:
   selector:
     matchLabels:
       app.kubernetes.io/name: {{ template "seaweedfs.name" $ }}
+      app.kubernetes.io/instance: {{ $.Release.Name }}
       app.kubernetes.io/component: {{ $volumeName }}
 {{- end }}
 {{- end }}
diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/volume/volume-statefulset.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/volume/volume-statefulset.yaml
index 045b95c2e6..04011d1d6f 100644
--- a/packages/system/seaweedfs/charts/seaweedfs/templates/volume/volume-statefulset.yaml
+++ b/packages/system/seaweedfs/charts/seaweedfs/templates/volume/volume-statefulset.yaml
@@ -1,14 +1,19 @@
+{{- include "seaweedfs.compat" . -}}
 {{ $volumes := deepCopy .Values.volumes | mergeOverwrite (dict "" .Values.volume)  }}
 {{- range $vname, $volume := $volumes }}
 {{- $volumeName := trimSuffix "-" (printf "volume-%s" $vname) }}
 {{- $volume := mergeOverwrite (deepCopy $.Values.volume) (dict "enabled" true) $volume }}
 
+{{- if and $volume.idx (eq ($volume.idx.type | toString) "emptyDir") }}
+{{- fail (printf "%s: idx.type \"emptyDir\" is not supported. An ephemeral index is wiped on every pod restart while the data persists, forcing a full index rebuild from the .dat on each start (a fatal crash on older versions). Use the default (idx: {}, kept next to the data) or a persistentVolumeClaim/hostPath/existingClaim for a separate persistent index." $volumeName) }}
+{{- end }}
+
 {{- if $volume.enabled }}
 ---
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
-  name: {{ template "seaweedfs.name" $ }}-{{ $volumeName }}
+  name: {{ include "seaweedfs.componentName" (list $ $volumeName) }}
   namespace: {{ $.Release.Namespace }}
   labels:
     app.kubernetes.io/name: {{ template "seaweedfs.name" $ }}
@@ -21,7 +26,7 @@ metadata:
     {{- toYaml $volume.annotations | nindent 4 }}
 {{- end }}
 spec:
-  serviceName: {{ template "seaweedfs.name" $ }}-{{ $volumeName }}
+  serviceName: {{ include "seaweedfs.componentName" (list $ $volumeName) }}
   replicas: {{ $volume.replicas }}
   podManagementPolicy: {{ $volume.podManagementPolicy }}
   selector:
@@ -58,7 +63,7 @@ spec:
       topologySpreadConstraints:
         {{ tpl (printf "{{ $volumeName := \"%s\" }}%s" $volumeName $volume.topologySpreadConstraints) $ | nindent 8 | trim }}
       {{- end }}
-      restartPolicy: {{ default $.Values.global.restartPolicy $volume.restartPolicy }}
+      restartPolicy: {{ default $.Values.global.seaweedfs.restartPolicy $volume.restartPolicy }}
       {{- if $volume.tolerations }}
       tolerations:
         {{ tpl (printf "{{ $volumeName := \"%s\" }}%s" $volumeName $volume.tolerations) $ | indent 8 | trim }}
@@ -68,19 +73,36 @@ spec:
       {{- if $volume.priorityClassName }}
       priorityClassName: {{ $volume.priorityClassName | quote }}
       {{- end }}
-      enableServiceLinks: false
-      {{- if $.Values.global.createClusterRole }}
-      serviceAccountName: {{ $volume.serviceAccountName | default $.Values.global.serviceAccountName | quote }} # for deleting statefulset pods after migration
+      {{- if $volume.schedulerName }}
+      schedulerName: {{ $volume.schedulerName | quote }}
       {{- end }}
-      {{- $initContainers_exists := include "volume.initContainers_exists" $ -}}
+      enableServiceLinks: false
+      serviceAccountName: {{ $volume.serviceAccountName | default (include "seaweedfs.serviceAccountName" $) | quote }} # for deleting statefulset pods after migration
+      {{- $initContainers_exists := include "seaweedfs.volume.initContainers_exists" $ -}}
       {{- if $initContainers_exists }}
       initContainers:
         {{- if $volume.idx }}
         - name: seaweedfs-vol-move-idx
-          image: {{ template "volume.image" $ }}
-          imagePullPolicy: {{ $.Values.global.imagePullPolicy | default "IfNotPresent" }}
+          image: {{ template "seaweedfs.volume.image" $ }}
+          imagePullPolicy: {{ $.Values.global.seaweedfs.imagePullPolicy | default "IfNotPresent" }}
           command: [ '/bin/sh', '-c' ]
-          args: [ '{{range $dir :=  $volume.dataDirs }}if ls /{{$dir.name}}/*.idx  >/dev/null 2>&1; then mv /{{$dir.name}}/*.idx /idx/ ; fi; {{end}}' ]
+          args:
+            - |
+              for dir in {{ range $index, $dir := $volume.dataDirs }}{{ if ne $index 0 }} {{ end }}/{{ $dir.name }}{{ end }}; do
+                # Rebuild a .idx missing from both dirs (e.g. an index volume that lost files) from the .dat, else the server fatally exits on its idx check.
+                for dat in "$dir"/*.dat; do
+                  [ -e "$dat" ] || continue
+                  base=${dat##*/}; base=${base%.dat}
+                  if [ ! -e "$dir/$base.idx" ] && [ ! -e "/idx/$base.idx" ]; then
+                    echo "rebuilding missing idx in $dir (trigger: volume $base)"
+                    weed fix "$dir"
+                    break
+                  fi
+                done
+                if ls "$dir"/*.idx >/dev/null 2>&1; then
+                  mv "$dir"/*.idx /idx/
+                fi
+              done
           volumeMounts:
             - name: idx
               mountPath: /idx
@@ -88,6 +110,10 @@ spec:
             - name: {{ $dir.name }}
               mountPath: /{{ $dir.name }}
           {{- end }}
+          {{- with $volume.idxVolMoveResources }}
+          resources:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
           {{- if $volume.containerSecurityContext.enabled }}
           securityContext: {{- omit $volume.containerSecurityContext "enabled" | toYaml | nindent 12 }}
           {{- end }}
@@ -101,8 +127,8 @@ spec:
       {{- end }}
       containers:
         - name: seaweedfs
-          image: {{ template "volume.image" $ }}
-          imagePullPolicy: {{ default "IfNotPresent" $.Values.global.imagePullPolicy }}
+          image: {{ template "seaweedfs.volume.image" $ }}
+          imagePullPolicy: {{ default "IfNotPresent" $.Values.global.seaweedfs.imagePullPolicy }}
           env:
             - name: POD_NAME
               valueFrom:
@@ -117,33 +143,26 @@ spec:
                 fieldRef:
                   fieldPath: status.hostIP
             - name: SEAWEEDFS_FULLNAME
-              value: "{{ template "seaweedfs.name" $ }}"
-            {{- if $volume.extraEnvironmentVars }}
-            {{- range $key, $value := $volume.extraEnvironmentVars }}
+              value: "{{ include "seaweedfs.fullname" $ }}"
+            {{- $mergedExtraEnvironmentVars := dict }}
+            {{- include "seaweedfs.mergeExtraEnvironmentVars" (dict "global" $.Values.global.seaweedfs "component" $volume "target" $mergedExtraEnvironmentVars) }}
+            {{- range $key := keys $mergedExtraEnvironmentVars | sortAlpha }}
+            {{- $value := index $mergedExtraEnvironmentVars $key }}
             - name: {{ $key }}
             {{- if kindIs "string" $value }}
-              value: {{ $value | quote }}
+              value: {{ tpl $value $ | quote }}
             {{- else }}
               valueFrom:
                 {{ toYaml $value | nindent 16 | trim }}
             {{- end -}}
             {{- end }}
-            {{- end }}
-            {{- if $.Values.global.extraEnvironmentVars }}
-            {{- range $key, $value := $.Values.global.extraEnvironmentVars }}
-            - name: {{ $key }}
-            {{- if kindIs "string" $value }}
-              value: {{ $value | quote }}
-            {{- else }}
-              valueFrom:
-                {{ toYaml $value | nindent 16 | trim }}
-            {{- end -}}
-            {{- end }}
-            {{- end }}
           command:
             - "/bin/sh"
             - "-ec"
             - |
+              {{- if $volume.rust }}
+              exec /usr/bin/weed-volume \
+              {{- else }}
               exec /usr/bin/weed \
                 {{- if $volume.logs }}
                 -logdir=/logs \
@@ -153,9 +172,10 @@ spec:
                 {{- if $volume.loggingOverrideLevel }}
                 -v={{ $volume.loggingOverrideLevel }} \
                 {{- else }}
-                -v={{ $.Values.global.loggingLevel }} \
+                -v={{ $.Values.global.seaweedfs.loggingLevel }} \
                 {{- end }}
                 volume \
+              {{- end }}
                 -port={{ $volume.port }} \
                 {{- if $volume.metricsPort }}
                 -metricsPort={{ $volume.metricsPort }} \
@@ -187,7 +207,7 @@ spec:
                 {{- if $volume.imagesFixOrientation }}
                 -images.fix.orientation \
                 {{- end }}
-                {{- if $volume.pulseSeconds }}
+                {{- if and $volume.pulseSeconds (not $volume.rust) }}
                 -pulseSeconds={{ $volume.pulseSeconds }} \
                 {{- end }}
                 {{- if $volume.index }}
@@ -197,7 +217,7 @@ spec:
                 -fileSizeLimitMB={{ $volume.fileSizeLimitMB }} \
                 {{- end }}
                 -minFreeSpacePercent={{ $volume.minFreeSpacePercent }} \
-                -ip=${POD_NAME}.${SEAWEEDFS_FULLNAME}-{{ $volumeName }}.{{ $.Release.Namespace }} \
+                -ip=${POD_NAME}.{{ include "seaweedfs.componentName" (list $ $volumeName) }}.{{ $.Release.Namespace }} \
                 -compactionMBps={{ $volume.compactionMBps }} \
                 -master={{ include "seaweedfs.masterServerArg" $ }} \
                 {{- range $volume.extraArgs }}
@@ -218,11 +238,13 @@ spec:
             - name: idx
               mountPath: "/idx/"
             {{- end }}
-            {{- if $.Values.global.enableSecurity }}
+            {{- if include "seaweedfs.securityConfigEnabled" $ }}
             - name: security-config
               readOnly: true
               mountPath: /etc/seaweedfs/security.toml
               subPath: security.toml
+            {{- end }}
+            {{- if $.Values.global.seaweedfs.enableSecurity }}
             - name: ca-cert
               readOnly: true
               mountPath: /usr/local/share/ca-certificates/ca/
@@ -281,7 +303,7 @@ spec:
           securityContext: {{- omit $volume.containerSecurityContext "enabled" | toYaml | nindent 12 }}
           {{- end }}
       {{- if $volume.sidecars }}
-      {{- include "common.tplvalues.render" (dict "value" (printf "{{ $volumeName := \"%s\" }}%s" $volumeName $volume.sidecars) "context" $) | nindent 8 }}
+      {{- include "seaweedfs.tplvalues.render" (dict "value" (printf "{{ $volumeName := \"%s\" }}%s" $volumeName $volume.sidecars) "context" $) | nindent 8 }}
       {{- end }}
       volumes:
 
@@ -340,25 +362,27 @@ spec:
           emptyDir: {}
        {{- end }}
      {{- end }}
-     {{- if $.Values.global.enableSecurity }}
+     {{- if include "seaweedfs.securityConfigEnabled" $ }}
         - name: security-config
           configMap:
-            name: {{ template "seaweedfs.name" $ }}-security-config
+            name: {{ include "seaweedfs.fullname" $ }}-security-config
+     {{- end }}
+     {{- if $.Values.global.seaweedfs.enableSecurity }}
         - name: ca-cert
           secret:
-            secretName: {{ template "seaweedfs.name" $ }}-ca-cert
+            secretName: {{ include "seaweedfs.fullname" $ }}-ca-cert
         - name: master-cert
           secret:
-            secretName: {{ template "seaweedfs.name" $ }}-master-cert
+            secretName: {{ include "seaweedfs.fullname" $ }}-master-cert
         - name: volume-cert
           secret:
-            secretName: {{ template "seaweedfs.name" $ }}-volume-cert
+            secretName: {{ include "seaweedfs.fullname" $ }}-volume-cert
         - name: filer-cert
           secret:
-            secretName: {{ template "seaweedfs.name" $ }}-filer-cert
+            secretName: {{ include "seaweedfs.fullname" $ }}-filer-cert
         - name: client-cert
           secret:
-            secretName: {{ template "seaweedfs.name" $ }}-client-cert
+            secretName: {{ include "seaweedfs.fullname" $ }}-client-cert
       {{- end }}
       {{- if $volume.extraVolumes }}
         {{ tpl $volume.extraVolumes $ | indent 8 | trim }}
diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/worker/worker-deployment.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/worker/worker-deployment.yaml
index 7a6e052438..f0cd124189 100644
--- a/packages/system/seaweedfs/charts/seaweedfs/templates/worker/worker-deployment.yaml
+++ b/packages/system/seaweedfs/charts/seaweedfs/templates/worker/worker-deployment.yaml
@@ -1,3 +1,4 @@
+{{- include "seaweedfs.compat" . -}}
 {{- if .Values.worker.enabled }}
 {{- if and (not .Values.worker.adminServer) (not .Values.admin.enabled) }}
 {{- fail "worker.adminServer must be set if admin.enabled is false within the same release" -}}
@@ -5,7 +6,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ template "seaweedfs.name" . }}-worker
+  name: {{ include "seaweedfs.fullname" . }}-worker
   namespace: {{ .Release.Namespace }}
   labels:
     app.kubernetes.io/name: {{ template "seaweedfs.name" . }}
@@ -45,7 +46,7 @@ spec:
       {{- toYaml . | nindent 8 }}
       {{- end }}
     spec:
-      restartPolicy: {{ default .Values.global.restartPolicy .Values.worker.restartPolicy }}
+      restartPolicy: {{ default .Values.global.seaweedfs.restartPolicy .Values.worker.restartPolicy }}
       {{- if .Values.worker.affinity }}
       affinity:
         {{ tpl .Values.worker.affinity . | nindent 8 | trim }}
@@ -63,6 +64,9 @@ spec:
       {{- if .Values.worker.priorityClassName }}
       priorityClassName: {{ .Values.worker.priorityClassName | quote }}
       {{- end }}
+      {{- if .Values.worker.schedulerName }}
+      schedulerName: {{ .Values.worker.schedulerName | quote }}
+      {{- end }}
       enableServiceLinks: false
       {{- if .Values.worker.serviceAccountName }}
       serviceAccountName: {{ .Values.worker.serviceAccountName | quote }}
@@ -76,8 +80,8 @@ spec:
       {{- end }}
       containers:
         - name: seaweedfs
-          image: {{ template "worker.image" . }}
-          imagePullPolicy: {{ default "IfNotPresent" .Values.global.imagePullPolicy }}
+          image: {{ template "seaweedfs.worker.image" . }}
+          imagePullPolicy: {{ default "IfNotPresent" .Values.global.seaweedfs.imagePullPolicy }}
           env:
             - name: POD_IP
               valueFrom:
@@ -92,29 +96,19 @@ spec:
                 fieldRef:
                   fieldPath: metadata.namespace
             - name: SEAWEEDFS_FULLNAME
-              value: "{{ template "seaweedfs.name" . }}"
-            {{- if .Values.worker.extraEnvironmentVars }}
-            {{- range $key, $value := .Values.worker.extraEnvironmentVars }}
-            - name: {{ $key }}
-            {{- if kindIs "string" $value }}
-              value: {{ $value | quote }}
-            {{- else }}
-              valueFrom:
-                {{ toYaml $value | nindent 16 | trim }}
-            {{- end -}}
-            {{- end }}
-            {{- end }}
-            {{- if .Values.global.extraEnvironmentVars }}
-            {{- range $key, $value := .Values.global.extraEnvironmentVars }}
+              value: "{{ include "seaweedfs.fullname" . }}"
+            {{- $mergedExtraEnvironmentVars := dict }}
+            {{- include "seaweedfs.mergeExtraEnvironmentVars" (dict "global" .Values.global.seaweedfs "component" .Values.worker "target" $mergedExtraEnvironmentVars) }}
+            {{- range $key := keys $mergedExtraEnvironmentVars | sortAlpha }}
+            {{- $value := index $mergedExtraEnvironmentVars $key }}
             - name: {{ $key }}
             {{- if kindIs "string" $value }}
-              value: {{ $value | quote }}
+              value: {{ tpl $value $ | quote }}
             {{- else }}
               valueFrom:
                 {{ toYaml $value | nindent 16 | trim }}
             {{- end -}}
             {{- end }}
-            {{- end }}
           command:
             - "/bin/sh"
             - "-ec"
@@ -128,19 +122,23 @@ spec:
               {{- if .Values.worker.loggingOverrideLevel }}
               -v={{ .Values.worker.loggingOverrideLevel }} \
               {{- else }}
-              -v={{ .Values.global.loggingLevel }} \
+              -v={{ .Values.global.seaweedfs.loggingLevel }} \
               {{- end }}
               worker \
               {{- if .Values.worker.adminServer }}
               -admin={{ .Values.worker.adminServer }} \
               {{- else }}
-              -admin={{ template "seaweedfs.name" . }}-admin.{{ .Release.Namespace }}:{{ .Values.admin.port }}{{ if .Values.admin.grpcPort }}.{{ .Values.admin.grpcPort }}{{ end }} \
+              -admin={{ template "seaweedfs.fullname" . }}-admin.{{ .Release.Namespace }}:{{ .Values.admin.port }}{{ if .Values.admin.grpcPort }}.{{ .Values.admin.grpcPort }}{{ end }} \
               {{- end }}
-              -capabilities={{ .Values.worker.capabilities }} \
-              -maxConcurrent={{ .Values.worker.maxConcurrent }} \
-              -workingDir={{ .Values.worker.workingDir }}{{- if or .Values.worker.metricsPort .Values.worker.extraArgs }} \{{ end }}
+              -jobType={{ .Values.worker.jobType }} \
+              -maxDetect={{ .Values.worker.maxDetect }} \
+              -maxExecute={{ .Values.worker.maxExecute }} \
+              -workingDir={{ .Values.worker.workingDir }}{{- if or .Values.worker.metricsPort .Values.worker.metricsIp .Values.worker.extraArgs }} \{{ end }}
               {{- if .Values.worker.metricsPort }}
-              -metricsPort={{ .Values.worker.metricsPort }}{{- if .Values.worker.extraArgs }} \{{ end }}
+              -metricsPort={{ .Values.worker.metricsPort }}{{- if or .Values.worker.metricsIp .Values.worker.extraArgs }} \{{ end }}
+              {{- end }}
+              {{- if .Values.worker.metricsIp }}
+              -metricsIp={{ .Values.worker.metricsIp }}{{- if .Values.worker.extraArgs }} \{{ end }}
               {{- end }}
               {{- range $index, $arg := .Values.worker.extraArgs }}
               {{ $arg }}{{- if lt $index (sub (len $.Values.worker.extraArgs) 1) }} \{{ end }}
@@ -154,11 +152,13 @@ spec:
             - name: worker-logs
               mountPath: /logs
             {{- end }}
-            {{- if .Values.global.enableSecurity }}
+            {{- if include "seaweedfs.securityConfigEnabled" . }}
             - name: security-config
               readOnly: true
               mountPath: /etc/seaweedfs/security.toml
               subPath: security.toml
+            {{- end }}
+            {{- if .Values.global.seaweedfs.enableSecurity }}
             - name: ca-cert
               readOnly: true
               mountPath: /usr/local/share/ca-certificates/ca/
@@ -223,8 +223,83 @@ spec:
           {{- if .Values.worker.containerSecurityContext.enabled }}
           securityContext: {{- omit .Values.worker.containerSecurityContext "enabled" | toYaml | nindent 12 }}
           {{- end }}
+        {{- if include "seaweedfs.worker.lanceNamespaceUrl" . }}
+        - name: worker-lance
+          image: {{ template "seaweedfs.worker.image" . }}
+          imagePullPolicy: {{ default "IfNotPresent" .Values.global.seaweedfs.imagePullPolicy }}
+          env:
+            - name: POD_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.name
+            {{- /* the URL crosses a shell line; metacharacters must arrive as data, not syntax */}}
+            - name: LANCE_NAMESPACE_URL
+              value: {{ include "seaweedfs.worker.lanceNamespaceUrl" . | quote }}
+          command:
+            - "/bin/sh"
+            - "-ec"
+            - |
+              {{- /* the armv7/386 placeholder is empty; exec of it becomes the shell and exits 0 */}}
+              if [ ! -s /usr/bin/weed-worker ]; then
+                echo "the Rust worker is not available on this platform ($(uname -m)); it ships for amd64 and arm64" >&2
+                exit 1
+              fi
+              exec /usr/bin/weed-worker \
+              --id="$POD_NAME" \
+              {{- if .Values.worker.adminServer }}
+              --admin={{ .Values.worker.adminServer }} \
+              {{- else }}
+              --admin={{ template "seaweedfs.fullname" . }}-admin.{{ .Release.Namespace }}:{{ .Values.admin.port }}{{ if .Values.admin.grpcPort }}.{{ .Values.admin.grpcPort }}{{ end }} \
+              {{- end }}
+              --namespace="$LANCE_NAMESPACE_URL" \
+              {{- if .Values.global.seaweedfs.enableSecurity }}
+              --tls-ca=/usr/local/share/ca-certificates/ca/tls.crt \
+              --tls-cert=/usr/local/share/ca-certificates/worker/tls.crt \
+              --tls-key=/usr/local/share/ca-certificates/worker/tls.key \
+              {{- end }}
+              {{- if .Values.worker.lanceMetricsPort }}
+              --metrics-port={{ .Values.worker.lanceMetricsPort }} \
+              --metrics-ip=0.0.0.0 \
+              {{- end }}
+              --max-concurrency={{ .Values.worker.maxExecute }}
+          {{- if .Values.global.seaweedfs.enableSecurity }}
+          volumeMounts:
+            - name: ca-cert
+              readOnly: true
+              mountPath: /usr/local/share/ca-certificates/ca/
+            - name: worker-cert
+              readOnly: true
+              mountPath: /usr/local/share/ca-certificates/worker/
+          {{- end }}
+          {{- if .Values.worker.lanceMetricsPort }}
+          ports:
+            - containerPort: {{ .Values.worker.lanceMetricsPort }}
+              name: lance-metrics
+          livenessProbe:
+            httpGet:
+              path: /health
+              port: lance-metrics
+            initialDelaySeconds: 30
+            periodSeconds: 60
+            successThreshold: 1
+            failureThreshold: 5
+            timeoutSeconds: 10
+          readinessProbe:
+            httpGet:
+              path: /ready
+              port: lance-metrics
+            initialDelaySeconds: 20
+            periodSeconds: 15
+            successThreshold: 1
+            failureThreshold: 3
+            timeoutSeconds: 10
+          {{- end }}
+          {{- if .Values.worker.containerSecurityContext.enabled }}
+          securityContext: {{- omit .Values.worker.containerSecurityContext "enabled" | toYaml | nindent 12 }}
+          {{- end }}
+        {{- end }}
       {{- if .Values.worker.sidecars }}
-      {{- include "common.tplvalues.render" (dict "value" .Values.worker.sidecars "context" $) | nindent 8 }}
+      {{- include "seaweedfs.tplvalues.render" (dict "value" .Values.worker.sidecars "context" $) | nindent 8 }}
       {{- end }}
       volumes:
         {{- if eq .Values.worker.data.type "hostPath" }}
@@ -257,28 +332,30 @@ spec:
           persistentVolumeClaim:
             claimName: {{ .Values.worker.logs.claimName }}
         {{- end }}
-        {{- if .Values.global.enableSecurity }}
+        {{- if include "seaweedfs.securityConfigEnabled" . }}
         - name: security-config
           configMap:
-            name: {{ template "seaweedfs.name" . }}-security-config
+            name: {{ include "seaweedfs.fullname" . }}-security-config
+        {{- end }}
+        {{- if .Values.global.seaweedfs.enableSecurity }}
         - name: ca-cert
           secret:
-            secretName: {{ template "seaweedfs.name" . }}-ca-cert
+            secretName: {{ include "seaweedfs.fullname" . }}-ca-cert
         - name: master-cert
           secret:
-            secretName: {{ template "seaweedfs.name" . }}-master-cert
+            secretName: {{ include "seaweedfs.fullname" . }}-master-cert
         - name: volume-cert
           secret:
-            secretName: {{ template "seaweedfs.name" . }}-volume-cert
+            secretName: {{ include "seaweedfs.fullname" . }}-volume-cert
         - name: filer-cert
           secret:
-            secretName: {{ template "seaweedfs.name" . }}-filer-cert
+            secretName: {{ include "seaweedfs.fullname" . }}-filer-cert
         - name: client-cert
           secret:
-            secretName: {{ template "seaweedfs.name" . }}-client-cert
+            secretName: {{ include "seaweedfs.fullname" . }}-client-cert
         - name: worker-cert
           secret:
-            secretName: {{ template "seaweedfs.name" . }}-worker-cert
+            secretName: {{ include "seaweedfs.fullname" . }}-worker-cert
         {{- end }}
         {{ tpl .Values.worker.extraVolumes . | indent 8 | trim }}
       {{- if .Values.worker.nodeSelector }}
diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/worker/worker-service.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/worker/worker-service.yaml
index cf9885e2f0..6c0ae8b701 100644
--- a/packages/system/seaweedfs/charts/seaweedfs/templates/worker/worker-service.yaml
+++ b/packages/system/seaweedfs/charts/seaweedfs/templates/worker/worker-service.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ template "seaweedfs.name" . }}-worker
+  name: {{ include "seaweedfs.componentName" (list . "worker") }}
   namespace: {{ .Release.Namespace }}
   labels:
     app.kubernetes.io/name: {{ template "seaweedfs.name" . }}
@@ -12,13 +12,22 @@ metadata:
     app.kubernetes.io/component: worker
 spec:
   clusterIP: None  # Headless service
-  {{- if .Values.worker.metricsPort }}
+  {{- $lanceMetrics := and .Values.worker.lanceMetricsPort (include "seaweedfs.worker.lanceNamespaceUrl" .) }}
+  {{- if or .Values.worker.metricsPort $lanceMetrics }}
   ports:
+  {{- if .Values.worker.metricsPort }}
   - name: "metrics"
     port: {{ .Values.worker.metricsPort }}
     targetPort: {{ .Values.worker.metricsPort }}
     protocol: TCP
   {{- end }}
+  {{- if $lanceMetrics }}
+  - name: "lance-metrics"
+    port: {{ .Values.worker.lanceMetricsPort }}
+    targetPort: {{ .Values.worker.lanceMetricsPort }}
+    protocol: TCP
+  {{- end }}
+  {{- end }}
   selector:
     app.kubernetes.io/name: {{ template "seaweedfs.name" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/worker/worker-servicemonitor.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/worker/worker-servicemonitor.yaml
index 7f9590dabe..50cb04f486 100644
--- a/packages/system/seaweedfs/charts/seaweedfs/templates/worker/worker-servicemonitor.yaml
+++ b/packages/system/seaweedfs/charts/seaweedfs/templates/worker/worker-servicemonitor.yaml
@@ -1,10 +1,12 @@
+{{- include "seaweedfs.compat" . -}}
 {{- if .Values.worker.enabled }}
-{{- if .Values.worker.metricsPort }}
-{{- if .Values.global.monitoring.enabled }}
+{{- $lanceMetrics := and .Values.worker.lanceMetricsPort (include "seaweedfs.worker.lanceNamespaceUrl" .) }}
+{{- if or .Values.worker.metricsPort $lanceMetrics }}
+{{- if .Values.global.seaweedfs.monitoring.enabled }}
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
-  name: {{ template "seaweedfs.name" . }}-worker
+  name: {{ include "seaweedfs.fullname" . }}-worker
   namespace: {{ .Release.Namespace }}
   labels:
     app.kubernetes.io/name: {{ template "seaweedfs.name" . }}
@@ -12,7 +14,7 @@ metadata:
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/component: worker
-    {{- with .Values.global.monitoring.additionalLabels }}
+    {{- with .Values.global.seaweedfs.monitoring.additionalLabels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
 {{- with .Values.worker.serviceMonitor.annotations }}
@@ -21,12 +23,20 @@ metadata:
 {{- end }}
 spec:
   endpoints:
+    {{- if .Values.worker.metricsPort }}
     - interval: 30s
       port: metrics
       scrapeTimeout: 5s
+    {{- end }}
+    {{- if $lanceMetrics }}
+    - interval: 30s
+      port: lance-metrics
+      scrapeTimeout: 5s
+    {{- end }}
   selector:
     matchLabels:
       app.kubernetes.io/name: {{ template "seaweedfs.name" . }}
+      app.kubernetes.io/instance: {{ .Release.Name }}
       app.kubernetes.io/component: worker
 {{- end }}
 {{- end }}
diff --git a/packages/system/seaweedfs/charts/seaweedfs/values.yaml b/packages/system/seaweedfs/charts/seaweedfs/values.yaml
index c51b86e637..6bae8df66b 100644
--- a/packages/system/seaweedfs/charts/seaweedfs/values.yaml
+++ b/packages/system/seaweedfs/charts/seaweedfs/values.yaml
@@ -1,50 +1,75 @@
 # Available parameters and their default values for the SeaweedFS chart.
 
 global:
-  createClusterRole: true
-  registry: ""
-  # if repository is set, it overrides the namespace part of imageName
-  repository: ""
-  imageName: chrislusf/seaweedfs
-  imagePullPolicy: IfNotPresent
+  # global.imageRegistry and global.imagePullSecrets are standard Helm conventions
+  # shared across subcharts. See https://helm.sh/docs/chart_template_guide/subcharts_and_globals/
+  imageRegistry: ""
   imagePullSecrets: ""
-  restartPolicy: Always
-  loggingLevel: 1
-  enableSecurity: false
-  masterServer: null
-  securityConfig:
-    jwtSigning:
-      volumeWrite: true
-      volumeRead: false
-      filerWrite: false
-      filerRead: false
-  # we will use this serviceAccountName for all ClusterRoles/ClusterRoleBindings
-  serviceAccountName: "seaweedfs"
-  automountServiceAccountToken: true
-  certificates:
-    duration: 87600h
-    renewBefore: 720h
-    alphacrds: false
-  monitoring:
-    enabled: false
-    gatewayHost: null
-    gatewayPort: null
-    additionalLabels: {}
-  # if enabled will use global.replicationPlacement and override master & filer defaultReplicaPlacement config
-  enableReplication: false
-  #  replication type is XYZ:
-  # X number of replica in other data centers
-  # Y number of replica in other racks in the same data center
-  # Z number of replica in other servers in the same rack
-  replicationPlacement: "001"
-  extraEnvironmentVars:
-    WEED_CLUSTER_DEFAULT: "sw"
-    WEED_CLUSTER_SW_MASTER: "seaweedfs-master.seaweedfs:9333"
-    WEED_CLUSTER_SW_FILER: "seaweedfs-filer-client.seaweedfs:8888"
-    # WEED_JWT_SIGNING_KEY:
-    #   secretKeyRef:
-    #     name: seaweedfs-signing-key
-    #     key: signingKey
+  # All app-specific global values are namespaced under global.seaweedfs
+  # to avoid polluting the shared global namespace when used as a subchart.
+  seaweedfs:
+    createClusterRole: true
+    image:
+      # if repository is set, it overrides the namespace part of image.name
+      repository: ""
+      # chrislusf/seaweedfs-enterprise for the enterprise edition
+      name: chrislusf/seaweedfs
+    # Enterprise license file, held in a Secret in the release namespace and
+    # mounted read-only on the components that run a master. A renewed Secret
+    # reaches the running master without a restart. SEAWEED_LICENSE is reserved
+    # while this is set: an extraEnvironmentVars entry of that name is dropped.
+    license:
+      existingSecret: ""
+      secretKey: seaweed-license.json
+      mountPath: /etc/seaweedfs/license
+    imagePullPolicy: IfNotPresent
+    restartPolicy: Always
+    loggingLevel: 1
+    enableSecurity: false
+    masterServer: null
+    # filerWrite: true mounts security.toml on filer + admin without needing
+    # enableSecurity (mTLS); required for the Admin UI Users tab.
+    securityConfig:
+      jwtSigning:
+        volumeWrite: true
+        volumeRead: false
+        filerWrite: false
+        filerRead: false
+        # Positive values override SeaweedFS token lifetime defaults.
+        # Zero keeps the runtime defaults: 10s for writes and 60s for reads.
+        expiresAfterSeconds:
+          volumeWrite: 0
+          volumeRead: 0
+          filerWrite: 0
+          filerRead: 0
+    # we will use this serviceAccountName for all ClusterRoles/ClusterRoleBindings
+    serviceAccountName: "seaweedfs"
+    serviceAccountAnnotations: {}
+    automountServiceAccountToken: true
+    certificates:
+      duration: 87600h
+      renewBefore: 720h
+      alphacrds: false
+    monitoring:
+      enabled: false
+      gatewayHost: null
+      gatewayPort: null
+      additionalLabels: {}
+    # if enabled will use global.seaweedfs.replicationPlacement and override master & filer defaultReplicaPlacement config
+    enableReplication: false
+    #  replication type is XYZ:
+    # X number of replica in other data centers
+    # Y number of replica in other racks in the same data center
+    # Z number of replica in other servers in the same rack
+    replicationPlacement: "001"
+    extraEnvironmentVars:
+      WEED_CLUSTER_DEFAULT: "sw"
+      WEED_CLUSTER_SW_MASTER: "{{ include \"seaweedfs.cluster.masterAddress\" . }}"
+      WEED_CLUSTER_SW_FILER: "{{ include \"seaweedfs.cluster.filerAddress\" . }}"
+      # WEED_JWT_SIGNING_KEY:
+      #   secretKeyRef:
+      #     name: seaweedfs-signing-key
+      #     key: signingKey
 
 image:
   registry: ""
@@ -109,7 +134,7 @@ master:
   #    annotations:
   #      "key": "value"
   #
-  # You may also spacify an existing claim:
+  # You may also specify an existing claim:
   #  data:
   #    type: "existingClaim"
   #    claimName: "my-pvc"
@@ -117,8 +142,13 @@ master:
   # You can also use emptyDir storage:
   #  data:
   #    type: "emptyDir"
+  # -mdir holds the Raft log and snapshots, and with them the cluster's
+  # identity (its topology UUID). A hostPath does not follow a rescheduled pod,
+  # so prefer type "persistentVolumeClaim" for new installs. The default stays
+  # hostPath so existing releases keep upgrading; see the README to switch one.
   data:
     type: "hostPath"
+    size: "1Gi"
     storageClass: ""
     hostPathPrefix: /ssd
 
@@ -212,6 +242,10 @@ master:
   # ref: https://kubernetes.io/docs/concepts/configuration/pod-priority-preemption/
   priorityClassName: ""
 
+  # used to specify a custom scheduler for master pods
+  # ref: https://kubernetes.io/docs/concepts/scheduling-eviction/kube-scheduler/
+  schedulerName: ""
+
   # used to assign a service account.
   # ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/
   serviceAccountName: ""
@@ -261,10 +295,10 @@ master:
     tls: []
 
   extraEnvironmentVars:
-    WEED_MASTER_VOLUME_GROWTH_COPY_1: '7'
-    WEED_MASTER_VOLUME_GROWTH_COPY_2: '6'
-    WEED_MASTER_VOLUME_GROWTH_COPY_3: '3'
-    WEED_MASTER_VOLUME_GROWTH_COPY_OTHER: '1'
+    WEED_MASTER_VOLUME_GROWTH_COPY_1: "7"
+    WEED_MASTER_VOLUME_GROWTH_COPY_2: "6"
+    WEED_MASTER_VOLUME_GROWTH_COPY_3: "3"
+    WEED_MASTER_VOLUME_GROWTH_COPY_OTHER: "1"
 
   # used to configure livenessProbe on master-server containers
   #
@@ -296,6 +330,11 @@ volume:
   enabled: true
   imageOverride: null
   restartPolicy: null
+  # Run the Rust volume server (/usr/bin/weed-volume) instead of the Go one.
+  # Requires an image that ships the Rust binary (amd64/arm64). The Go-only
+  # log flags (-logtostderr/-logdir/-v) and -pulseSeconds are dropped; set log
+  # level via the RUST_LOG env var in extraEnvironmentVars if needed.
+  rust: false
   port: 8080
   grpcPort: 18080
   metricsPort: 9327
@@ -330,7 +369,7 @@ volume:
   #      "key": "value"
   #     maxVolumes: 0  # If set to zero on non-windows OS, the limit will be auto configured. (default "7")
   #
-  # You may also spacify an existing claim:
+  # You may also specify an existing claim:
   #   - name: data
   #     type: "existingClaim"
   #     claimName: "my-pvc"
@@ -348,23 +387,23 @@ volume:
   #     maxVolumes: 0  # If set to zero on non-windows OS, the limit will be auto configured. (default "7")
 
   dataDirs:
-  - name: data1
-    type: "hostPath"
-    hostPathPrefix: /ssd
-    maxVolumes: 0
+    - name: data1
+      type: "hostPath"
+      hostPathPrefix: /ssd
+      maxVolumes: 0
 
-   # - name: data2
-   #   type: "persistentVolumeClaim"
-   #   storageClass: "yourClassNameOfChoice"
-   #   size: "800Gi"
-   #   maxVolumes: 0
+      # - name: data2
+      #   type: "persistentVolumeClaim"
+      #   storageClass: "yourClassNameOfChoice"
+      #   size: "800Gi"
+      #   maxVolumes: 0
 
   # This will automatically create a job for patching Kubernetes resources if the dataDirs type is 'persistentVolumeClaim' and the size has changed.
   resizeHook:
     enabled: true
     image: alpine/k8s:1.28.4
 
-  # idx can be defined by:
+  # idx (the volume index) may use a separate PERSISTENT volume:
   #
   # idx:
   #  type: "hostPath"
@@ -383,21 +422,27 @@ volume:
   #   type: "existingClaim"
   #   claimName: "myClaim"
   #
-  # or
+  # "emptyDir" is rejected for idx (the chart fails to render): an ephemeral
+  # index is wiped on every restart while the data persists, forcing a full
+  # rebuild each start (a fatal crash on older versions). "logs" may still use
+  # any of the above or emptyDir.
   #
-  # idx:
-  #  type: "emptyDir"
-
-  # same applies to "logs"
-
+  # Default {} keeps the index next to the data, so it persists with the data and
+  # needs no separate volume. Recommended unless you must split the index onto
+  # its own persistent storage.
   idx: {}
 
+  # Resource requests, limits, etc. for the vol-move-idx initContainer. This
+  # should map directly to the value of the resources field for a PodSpec,
+  # formatted as a multi-line string. By default no direct resource request
+  # is made.
+  idxVolMoveResources: {}
+
   logs: {}
 
   # limit background compaction or copying speed in mega bytes per second
   compactionMBps: "50"
 
-
   # Volume server's rack name
   rack: null
 
@@ -494,6 +539,10 @@ volume:
   # ref: https://kubernetes.io/docs/concepts/configuration/pod-priority-preemption/
   priorityClassName: ""
 
+  # used to specify a custom scheduler for volume pods
+  # ref: https://kubernetes.io/docs/concepts/scheduling-eviction/kube-scheduler/
+  schedulerName: ""
+
   # used to assign a service account.
   # ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/
   serviceAccountName: ""
@@ -545,6 +594,30 @@ volume:
     failureThreshold: 100
     timeoutSeconds: 30
 
+  ingress:
+    enabled: false
+    className: ""
+    host: "volume.seaweedfs.local"
+    path: "/"
+    pathType: Prefix
+    annotations:
+      nginx.ingress.kubernetes.io/app-root: /ui/index.html
+      # nginx.ingress.kubernetes.io/use-regex: "true"
+      # nginx.ingress.kubernetes.io/rewrite-target: /$1
+      # nginx.ingress.kubernetes.io/auth-type: "basic"
+      # nginx.ingress.kubernetes.io/auth-secret: "default/ingress-basic-auth-secret"
+      # nginx.ingress.kubernetes.io/auth-realm: 'Authentication Required - SW-Volume'
+      # nginx.ingress.kubernetes.io/service-upstream: "true"
+      # nginx.ingress.kubernetes.io/enable-rewrite-log: "true"
+      # nginx.ingress.kubernetes.io/ssl-redirect: "false"
+      # nginx.ingress.kubernetes.io/force-ssl-redirect: "false"
+      # nginx.ingress.kubernetes.io/configuration-snippet: |
+      #   sub_filter '<head>' '<head> <base href="/sw-volume/">'; #add base url
+      #   sub_filter '="/' '="./';                               #make absolute paths to relative
+      #   sub_filter '=/' '=./';
+      #   sub_filter '/seaweedfsstatic' './seaweedfsstatic';
+      #   sub_filter_once off;
+
 # Map of named volume groups for topology-aware deployments.
 # Each key inherits all fields from the `volume` section but can override
 # them locally—for example, replicas, nodeSelector, dataCenter, etc.
@@ -750,6 +823,10 @@ filer:
   # ref: https://kubernetes.io/docs/concepts/configuration/pod-priority-preemption/
   priorityClassName: ""
 
+  # used to specify a custom scheduler for filer pods
+  # ref: https://kubernetes.io/docs/concepts/scheduling-eviction/kube-scheduler/
+  schedulerName: ""
+
   # used to assign a service account.
   # ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/
   serviceAccountName: ""
@@ -773,33 +850,54 @@ filer:
   #   allowPrivilegeEscalation: false
   containerSecurityContext: {}
 
-  ingress:
-    enabled: false
-    className: ""
-    # host: false for "*" hostname
-    host: "seaweedfs.cluster.local"
-    path: "/sw-filer/?(.*)"
-    pathType: ImplementationSpecific
-    annotations: {}
-      # nginx.ingress.kubernetes.io/backend-protocol: GRPC
-      # nginx.ingress.kubernetes.io/auth-type: "basic"
-      # nginx.ingress.kubernetes.io/auth-secret: "default/ingress-basic-auth-secret"
-      # nginx.ingress.kubernetes.io/auth-realm: 'Authentication Required - SW-Filer'
-      # nginx.ingress.kubernetes.io/service-upstream: "true"
-      # nginx.ingress.kubernetes.io/rewrite-target: /$1
-      # nginx.ingress.kubernetes.io/use-regex: "true"
-      # nginx.ingress.kubernetes.io/enable-rewrite-log: "true"
-      # nginx.ingress.kubernetes.io/ssl-redirect: "false"
-      # nginx.ingress.kubernetes.io/force-ssl-redirect: "false"
-      # nginx.ingress.kubernetes.io/configuration-snippet: |
-      #   sub_filter '<head>' '<head> <base href="/sw-filer/">'; #add base url
-      #   sub_filter '="/' '="./';                               #make absolute paths to relative
-      #   sub_filter '=/' '=./';
-      #   sub_filter '/seaweedfsstatic' './seaweedfsstatic';
-      #   sub_filter_once off;
+  ingresses:
+    http:
+      enabled: false
+      className: ""
+      # host: false for "*" hostname
+      host: "seaweedfs.cluster.local"
+      path: "/sw-filer/?(.*)"
+      pathType: ImplementationSpecific
+      annotations: {}
+        # nginx.ingress.kubernetes.io/backend-protocol: GRPC
+        # nginx.ingress.kubernetes.io/auth-type: "basic"
+        # nginx.ingress.kubernetes.io/auth-secret: "default/ingress-basic-auth-secret"
+        # nginx.ingress.kubernetes.io/auth-realm: 'Authentication Required - SW-Filer'
+        # nginx.ingress.kubernetes.io/service-upstream: "true"
+        # nginx.ingress.kubernetes.io/rewrite-target: /$1
+        # nginx.ingress.kubernetes.io/use-regex: "true"
+        # nginx.ingress.kubernetes.io/enable-rewrite-log: "true"
+        # nginx.ingress.kubernetes.io/ssl-redirect: "false"
+        # nginx.ingress.kubernetes.io/force-ssl-redirect: "false"
+        # nginx.ingress.kubernetes.io/configuration-snippet: |
+        #   sub_filter '<head>' '<head> <base href="/sw-filer/">'; #add base url
+        #   sub_filter '="/' '="./';                               #make absolute paths to relative
+        #   sub_filter '=/' '=./';
+        #   sub_filter '/seaweedfsstatic' './seaweedfsstatic';
+        #   sub_filter_once off;
+      tls: []
+    grpc:
+      enabled: false
+      className: ""
+      host: "seaweedfs.cluster.local"
+      # gRPC methods are called at /<package>.<Service>/<Method>, so route the
+      # whole host, not the HTTP UI's regex path.
+      path: "/"
+      pathType: Prefix
+      annotations:
+        # Ingress terminates TLS and re-originates gRPC (HTTP/2) to the filer.
+        nginx.ingress.kubernetes.io/backend-protocol: "GRPC"
+        # For end-to-end mTLS (the filer's own TLS reaches the client, not
+        # terminated at the edge), drop backend-protocol above and use TLS
+        # passthrough instead:
+        #   nginx.ingress.kubernetes.io/ssl-passthrough: "true"
+        # Passthrough routes by SNI (set `host` above), ignores `path`, and
+        # requires ingress-nginx to run with --enable-ssl-passthrough.
+      tls: []
 
   # extraEnvVars is a list of extra environment variables to set with the stateful set.
   extraEnvironmentVars:
+    # the WEED_MYSQL_* keys and the db credential secret only render while this is "true"
     WEED_MYSQL_ENABLED: "false"
     WEED_MYSQL_HOSTNAME: "mysql-db-host"
     WEED_MYSQL_PORT: "3306"
@@ -846,14 +944,14 @@ filer:
 
   # secret env variables
   secretExtraEnvironmentVars: {}
-      # WEED_POSTGRES_USERNAME:
-      #   secretKeyRef:
-      #     name: postgres-credentials
-      #     key: username
-      # WEED_POSTGRES_PASSWORD:
-      #   secretKeyRef:
-      #     name: postgres-credentials
-      #     key: password
+    # WEED_POSTGRES_USERNAME:
+    #   secretKeyRef:
+    #     name: postgres-credentials
+    #     key: username
+    # WEED_POSTGRES_PASSWORD:
+    #   secretKeyRef:
+    #     name: postgres-credentials
+    #     key: password
 
   s3:
     enabled: false
@@ -867,14 +965,26 @@ filer:
     # set to the name of an existing kubernetes Secret with the s3 json config file
     # should have a secret key called seaweedfs_s3_config with an inline json configure
     existingConfigSecret: null
+    # To provide explicit credentials for the S3 gateway, set them under
+    # the top-level s3.credentials key (not filer.s3.credentials).
+    # The s3-secret.yaml template only reads from .Values.s3.credentials.
+    # See: s3.credentials.admin.accessKey, s3.credentials.read.accessKey
     auditLogConfig: {}
-    # You may specify buckets to be created during the install process.
+    # You may specify buckets to be created during the install or upgrade process.
     # Buckets may be exposed publicly by setting `anonymousRead` to `true`
+    # ttl format: [1-255][m|h|d|w|M|y] (e.g., 7d)
+    # objectLock enables S3 Object Lock (irreversible, forces versioning)
+    # versioning: Enabled or Suspended (or bool true/false)
     # createBuckets:
     #   - name: bucket-a
     #     anonymousRead: true
+    #     ttl: 7d
+    #     objectLock: true
+    #     versioning: Enabled
     #   - name: bucket-b
     #     anonymousRead: false
+    createBucketsHook:
+      resources: {}
 
 s3:
   enabled: false
@@ -885,14 +995,61 @@ s3:
   port: 8333
   # add additional https port
   httpsPort: 0
+  # Use a custom TLS certificate secret for the S3 HTTPS endpoint.
+  # When set, this Kubernetes Secret (must contain tls.crt and tls.key) is used
+  # instead of the internal self-signed client certificate generated by cert-manager.
+  # This allows using a publicly trusted certificate (e.g., from Let's Encrypt)
+  # so that S3 clients don't need to trust the internal CA.
+  # Requires global.seaweedfs.enableSecurity to be true.
+  tlsSecret: null
   metricsPort: 9327
+  # Iceberg catalog REST port (Apache Iceberg REST Catalog API)
+  # Set to a port number to enable, or 0/null to disable
+  icebergPort: null
+  # Lance Namespace port; weed serves 9101 by default, 0 disables it
+  # (and, unless worker.namespaceUrl points elsewhere, the worker's Lance container)
+  lancePort: 9101
   loggingOverrideLevel: null
   # enable user & permission to s3 (need to inject to all services)
   enableAuth: false
   # set to the name of an existing kubernetes Secret with the s3 json config file
   # should have a secret key called seaweedfs_s3_config with an inline json config
   existingConfigSecret: null
+  # Optionally provide explicit credentials for the S3 gateway.
+  # When set, these are used in the generated s3 secret instead of
+  # auto-generating random credentials.
+  # An identity may instead name an existing Secret to read its keys from. The
+  # generated config then references the keys through environment variables, so
+  # nothing is looked up at render time and a dry run renders what an install
+  # applies. Note the COSI driver parses the config itself and does not resolve
+  # those references.
+  # credentials:
+  #   admin:
+  #     accessKey: ""
+  #     secretKey: ""
+  #     existingSecret: ""
+  #     accessKeyKey: admin_access_key_id
+  #     secretKeyKey: admin_secret_access_key
+  #   read:
+  #     accessKey: ""
+  #     secretKey: ""
+  #     existingSecret: ""
+  #     accessKeyKey: read_access_key_id
+  #     secretKeyKey: read_secret_access_key
   auditLogConfig: {}
+  # You may specify buckets to be created during the install or upgrade process.
+  # Buckets may be exposed publicly by setting `anonymousRead` to `true`
+  # ttl format: [1-255][m|h|d|w|M|y] (e.g., 7d)
+  # objectLock enables S3 Object Lock (irreversible, forces versioning)
+  # versioning: Enabled or Suspended (or bool true/false)
+  # createBuckets:
+  #   - name: bucket-a
+  #     anonymousRead: true
+  #     ttl: 7d
+  #     objectLock: true
+  #     versioning: Enabled
+  #   - name: bucket-b
+  #     anonymousRead: false
 
   # Suffix of the host name, {bucket}.{domainName}
   domainName: ""
@@ -944,6 +1101,10 @@ s3:
   # ref: https://kubernetes.io/docs/concepts/configuration/pod-priority-preemption/
   priorityClassName: ""
 
+  # used to assign a custom scheduler to server pods
+  # ref: https://kubernetes.io/docs/tasks/extend-kubernetes/configure-multiple-schedulers/
+  schedulerName: ""
+
   # used to assign a service account.
   # ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/
   serviceAccountName: ""
@@ -1009,6 +1170,9 @@ s3:
     failureThreshold: 100
     timeoutSeconds: 10
 
+  createBucketsHook:
+    resources: {}
+
   ingress:
     enabled: false
     className: ""
@@ -1020,6 +1184,39 @@ s3:
     annotations: {}
     tls: []
 
+  # Service settings
+  service:
+    type: ClusterIP
+    # used only when type is LoadBalancer
+    loadBalancerClass: ""
+    loadBalancerIP: ""
+    loadBalancerSourceRanges: []
+    # fixed nodePorts, used only when type is NodePort or LoadBalancer
+    nodePorts:
+      http: null
+      https: null
+      iceberg: null
+      lance: null
+      metrics: null
+
+  icebergIngress:
+    enabled: false
+    className: ""
+    host: "seaweedfs-iceberg.cluster.local"
+    path: "/"
+    pathType: Prefix
+    annotations: {}
+    tls: []
+
+  lanceIngress:
+    enabled: false
+    className: ""
+    host: "seaweedfs-lance.cluster.local"
+    path: "/"
+    pathType: Prefix
+    annotations: {}
+    tls: []
+
 sftp:
   enabled: false
   imageOverride: null
@@ -1032,9 +1229,9 @@ sftp:
   loggingOverrideLevel: null
 
   # SSH server configuration
-  sshPrivateKey: "/etc/sw/seaweedfs_sftp_ssh_private_key"  # Path to the SSH private key file for host authentication
+  sshPrivateKey: ""  # Optional path to a single SSH host key file; the server fails to start if set but missing. Host keys come from hostKeysFolder by default.
   hostKeysFolder: "/etc/sw/ssh"  # path to folder containing SSH private key files for host authentication
-  authMethods: "password,publickey"  # Comma-separated list of allowed auth methods: password, publickey, keyboard-interactive
+  authMethods: "password,publickey"  # Comma-separated list of allowed auth methods: password, publickey, certificate
   maxAuthTries: 6  # Maximum number of authentication attempts per connection
   bannerMessage: "SeaweedFS SFTP Server"  # Message displayed before authentication
   loginGraceTime: "2m"  # Timeout for authentication
@@ -1051,6 +1248,18 @@ sftp:
   # Set to the name of an existing kubernetes Secret with the list of ssh private keys for sftp
   existingSshConfigSecret: null
 
+  # SSH user-certificate authentication (CA-signed user certs). Mirrors
+  # OpenSSH `TrustedUserCAKeys` and MinIO `--sftp=trusted-user-ca-key`.
+  # Add "certificate" to `authMethods` to activate; when active, plain
+  # public keys are rejected on the public-key channel.
+  #
+  # Inline CA public keys in OpenSSH authorized_keys format (one per
+  # line). Ignored when `existingCAKeysSecret` is set.
+  trustedUserCAKeys: ""
+  # Set to the name of an existing kubernetes Secret carrying the CA
+  # public keys under data key `ca_user.pub`.
+  existingCAKeysSecret: null
+
   # Additional resources
   sidecars: []
   initContainers: ""
@@ -1063,6 +1272,7 @@ sftp:
   tolerations: ""
   nodeSelector: ""
   priorityClassName: ""
+  schedulerName: ""
   serviceAccountName: ""
   podSecurityContext: {}
   containerSecurityContext: {}
@@ -1092,6 +1302,18 @@ sftp:
     failureThreshold: 100
     timeoutSeconds: 10
 
+  # Service settings
+  service:
+    type: ClusterIP
+    # used only when type is LoadBalancer
+    loadBalancerClass: ""
+    loadBalancerIP: ""
+    loadBalancerSourceRanges: []
+    # fixed nodePorts, used only when type is NodePort or LoadBalancer
+    nodePorts:
+      sftp: null
+      metrics: null
+
 admin:
   enabled: false
   imageOverride: null
@@ -1099,7 +1321,6 @@ admin:
   replicas: 1
   port: 23646  # Default admin port
   grpcPort: 33646  # Default gRPC port for worker connections
-  metricsPort: 9327
   loggingOverrideLevel: null
 
   # Admin authentication
@@ -1117,9 +1338,14 @@ admin:
   dataDir: ""  # If empty, configuration is kept in memory only
 
   # Master servers to connect to
-  # If empty, uses global.masterServer or auto-discovers from master statefulset
+  # If empty, uses global.seaweedfs.masterServer or auto-discovers from master statefulset
   masters: ""
 
+  # URL path prefix when running behind a reverse proxy under a subdirectory
+  # Example: "/seaweedfs-admin" makes the UI available at /seaweedfs-admin/
+  # If empty and ingress is enabled with a non-root path, the ingress path is used automatically
+  urlPrefix: ""
+
   # Custom command line arguments to add to the admin command
   # Example: ["-customFlag", "value", "-anotherFlag"]
   extraArgs: []
@@ -1175,12 +1401,20 @@ admin:
   tolerations: ""
   nodeSelector: ""
   priorityClassName: ""
+  schedulerName: ""
   serviceAccountName: ""
   podSecurityContext: {}
   containerSecurityContext: {}
 
   extraEnvironmentVars: {}
 
+  # secret env variables (e.g. for injecting OIDC client secret from a Kubernetes Secret)
+  secretExtraEnvironmentVars: {}
+    # WEED_ADMIN_OIDC_CLIENT_SECRET:
+    #   secretKeyRef:
+    #     name: seaweedfs-admin-oidc
+    #     key: client_secret
+
   # Health checks
   livenessProbe:
     enabled: true
@@ -1217,6 +1451,14 @@ admin:
   service:
     type: ClusterIP
     annotations: {}
+    # used only when type is LoadBalancer
+    loadBalancerClass: ""
+    loadBalancerIP: ""
+    loadBalancerSourceRanges: []
+    # fixed nodePorts, used only when type is NodePort or LoadBalancer
+    nodePorts:
+      http: null
+      grpc: null
 
   # ServiceMonitor annotations (separate from pod/deployment annotations)
   serviceMonitor:
@@ -1229,18 +1471,34 @@ worker:
   replicas: 1
   loggingOverrideLevel: null
   metricsPort: 9327
+  metricsIp: ""  # If empty, defaults to 0.0.0.0
+
+  # The lance_* jobs run in their own container, /usr/bin/weed-worker.
+  # amd64/arm64 only; pin mixed clusters with worker.affinity/nodeSelector.
+
+  # Lance namespace URL override; empty derives it from s3.lancePort.
+  namespaceUrl: ""
+
+  # Metrics port for the Lance worker container; the Go worker keeps metricsPort
+  lanceMetricsPort: 9328
 
   # Admin server to connect to
   adminServer: ""
 
+  # Worker job types - categories or comma-separated list of names/aliases
+  # Categories: all, default, heavy
+  #   default: vacuum, volume_balance, ec_balance, admin_script
+  #   heavy: erasure_coding, iceberg_maintenance
+  #   all: every registered job type
+  # Examples: "all", "default", "heavy", "default,iceberg" (default+iceberg), "vacuum,volume_balance"
+  # Refer: https://github.com/seaweedfs/seaweedfs/wiki/Worker
+  jobType: "all"
 
-  # Worker capabilities - comma-separated list
-  # Available: vacuum, balance, erasure_coding
-  # Default: "vacuum,balance,erasure_coding" (all capabilities)
-  capabilities: "vacuum,balance,erasure_coding"
+  # Maximum number of concurrent detection requests
+  maxDetect: 1
 
-  # Maximum number of concurrent tasks
-  maxConcurrent: 3
+  # Maximum number of concurrent execution jobs
+  maxExecute: 4
 
   # Working directory for task execution
   workingDir: "/tmp/seaweedfs-worker"
@@ -1299,6 +1557,7 @@ worker:
   tolerations: ""
   nodeSelector: ""
   priorityClassName: ""
+  schedulerName: ""
   serviceAccountName: ""
   podSecurityContext: {}
   containerSecurityContext: {}
@@ -1378,14 +1637,27 @@ allInOne:
     # Set to the name of an existing kubernetes Secret with the s3 json config file
     # should have a secret key called seaweedfs_s3_config with an inline json config
     existingConfigSecret: null
+    # To provide explicit credentials for the S3 gateway, set them under
+    # the top-level s3.credentials key (not allInOne.s3.credentials).
+    # The s3-secret.yaml template only reads from .Values.s3.credentials.
+    # See: s3.credentials.admin.accessKey, s3.credentials.read.accessKey
     auditLogConfig: null  # S3 audit log configuration (null inherits from s3.auditLogConfig)
+    trafficDistribution: null  # Service traffic distribution (e.g., "PreferClose"); auto-converts to "PreferSameZone" on k8s >=1.35
     # You may specify buckets to be created during the install process.
     # Buckets may be exposed publicly by setting `anonymousRead` to `true`
+    # ttl format: [1-255][m|h|d|w|M|y] (e.g., 7d)
+    # objectLock enables S3 Object Lock (irreversible, forces versioning)
+    # versioning: Enabled or Suspended (or bool true/false)
     # createBuckets:
     #   - name: bucket-a
     #     anonymousRead: true
+    #     ttl: 7d
+    #     objectLock: true
+    #     versioning: Enabled
     #   - name: bucket-b
     #     anonymousRead: false
+    createBucketsHook:
+      resources: {}
 
   # SFTP server configuration
   # Note: Most parameters below default to null, which means they inherit from
@@ -1406,12 +1678,32 @@ allInOne:
     existingConfigSecret: null
     # Set to the name of an existing kubernetes Secret with the SSH keys
     existingSshConfigSecret: null
+    # SSH user-certificate authentication. See sftp.trustedUserCAKeys above.
+    # (null on either field inherits from the top-level sftp.* setting.)
+    trustedUserCAKeys: null
+    existingCAKeysSecret: null
 
   # Service settings
   service:
     annotations: {}  # Annotations for the service
     type: ClusterIP  # Service type (ClusterIP, NodePort, LoadBalancer)
     internalTrafficPolicy: Cluster  # Internal traffic policy
+    # used only when type is LoadBalancer
+    loadBalancerClass: ""
+    loadBalancerIP: ""
+    loadBalancerSourceRanges: []
+    # fixed nodePorts, used only when type is NodePort or LoadBalancer
+    nodePorts:
+      master: null
+      masterGrpc: null
+      volume: null
+      volumeGrpc: null
+      filer: null
+      filerGrpc: null
+      s3: null
+      s3Https: null
+      sftp: null
+      metrics: null
 
   # Note: For ingress in all-in-one mode, use the standard s3.ingress and
   # filer.ingress settings. The templates automatically detect all-in-one mode
@@ -1509,6 +1801,10 @@ allInOne:
   # ref: https://kubernetes.io/docs/concepts/configuration/pod-priority-preemption/
   priorityClassName: ""
 
+  # Used to assign a custom scheduler to pods
+  # ref: https://kubernetes.io/docs/tasks/extend-kubernetes/configure-multiple-schedulers/
+  schedulerName: ""
+
   # Used to assign a service account.
   # ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/
   serviceAccountName: ""
@@ -1546,9 +1842,11 @@ allInOne:
 # For more information, visit: https://container-object-storage-interface.github.io/docs/deployment-guide
 cosi:
   enabled: false
-  image: "ghcr.io/seaweedfs/seaweedfs-cosi-driver:v0.3.0"
+  image: "ghcr.io/seaweedfs/seaweedfs-cosi-driver:v0.1.2"
   driverName: "seaweedfs.objectstorage.k8s.io"
   bucketClassName: "seaweedfs"
+  # Optional parameters to pass to the default BucketClass (e.g., diskType for tiered storage)
+  bucketClassParameters: {}
   endpoint: ""
   region: ""
 
@@ -1569,6 +1867,10 @@ cosi:
   podSecurityContext: {}
   containerSecurityContext: {}
 
+  # used to assign a custom scheduler to cosi pods
+  # ref: https://kubernetes.io/docs/tasks/extend-kubernetes/configure-multiple-schedulers/
+  schedulerName: ""
+
   extraVolumes: ""
   extraVolumeMounts: ""
 
@@ -1580,6 +1882,7 @@ cosi:
 
 certificates:
   commonName: "SeaweedFS CA"
+  dnsNames: []
   ipAddresses: []
   keyAlgorithm: RSA
   keySize: 2048
@@ -1598,3 +1901,140 @@ certificates:
 podLabels: {}
 # Annotations to be added to all the created pods
 podAnnotations: {}
+
+networkPolicy:
+  # Opt-in. While false the chart renders no NetworkPolicy objects at all and
+  # the cluster default (usually allow-all) applies. Turn this on for a
+  # namespace with a default-deny policy, where the components otherwise
+  # cannot reach each other and the install hangs.
+  #
+  # This alone covers a default-deny that only restricts ingress. If yours has
+  # Egress in its policyTypes as well - the usual baseline - the components
+  # still cannot resolve DNS or reach each other, and you need egress.enabled
+  # below too, together with an extraEgress entry for the filer store.
+  enabled: false
+
+  # One policy is rendered per component, selecting its pods by the standard
+  # app.kubernetes.io/{name,instance,component} labels. Each policy admits
+  # traffic from any pod of this release, on the ports that component listens
+  # on - the same values the containerPorts are taken from, so changing a port
+  # does not leave the policy behind. Everything else is denied.
+  #
+  # Traffic from outside the release has to be added here. Rules are plain
+  # NetworkPolicyIngressRule entries, appended to every component's policy.
+  #
+  # The metrics ports are covered by the same rule as everything else, so with
+  # global.seaweedfs.monitoring.enabled the ServiceMonitors keep pointing at
+  # ports a Prometheus outside the release can no longer reach. Nothing reports
+  # that - the targets just go down - so add the scraper here:
+  #
+  #   extraIngress:
+  #     # an ingress controller reaching filer/s3/admin
+  #     - from:
+  #         - namespaceSelector:
+  #             matchLabels:
+  #               kubernetes.io/metadata.name: ingress-nginx
+  #       ports:
+  #         - protocol: TCP
+  #           port: 8888
+  #         - protocol: TCP
+  #           port: 8333
+  #     # Prometheus scraping the metrics ports
+  #     - from:
+  #         - namespaceSelector:
+  #             matchLabels:
+  #               kubernetes.io/metadata.name: monitoring
+  #       ports:
+  #         - protocol: TCP
+  #           port: 9327
+  #
+  # An ingress controller running on the host network is not a pod as far as
+  # the policy is concerned; select it with an ipBlock of the node addresses
+  # instead of a namespaceSelector.
+  #
+  # Kubelet probes are not covered by these rules. Node-to-pod traffic is
+  # outside NetworkPolicy in the CNIs that come up without host endpoints
+  # (Calico, Cilium); if yours polices it, allow the node addresses here.
+  extraIngress: []
+
+  egress:
+    # Egress is a separate opt-in: the chart knows the addresses of its own
+    # components, but not where your filer store (MySQL, Postgres, Redis,
+    # ...), notification sink or remote tier lives. Enabling this without
+    # listing those under extraEgress will cut the filer off from its store.
+    #
+    # It cannot be on by default either. In a namespace with no default-deny,
+    # egress rules would take the components from "may reach anything" down to
+    # "may reach the peers listed here", which is the same breakage from the
+    # other direction. Required if your default-deny covers egress.
+    enabled: false
+
+    # Every component resolves its peers by DNS name, so this is required
+    # for the release to function at all.
+    #
+    # The defaults below are CoreDNS as kubeadm, kind and the managed offerings
+    # from AWS, Google and Azure install it. OpenShift runs its resolver
+    # elsewhere and needs both overridden:
+    #   dnsNamespaceSelector:
+    #     matchLabels:
+    #       kubernetes.io/metadata.name: openshift-dns
+    #   dnsPodSelector:
+    #     matchLabels:
+    #       dns.operator.openshift.io/daemonset-dns: default
+    # A node-local DNS cache is not a pod peer at all - the resolver address is
+    # a link-local IP - so name it with an ipBlock in extraEgress instead.
+    allowDNS: true
+    dnsNamespaceSelector:
+      matchLabels:
+        kubernetes.io/metadata.name: kube-system
+    dnsPodSelector:
+      matchLabels:
+        k8s-app: kube-dns
+
+    # The COSI sidecar watches the COSI custom resources and the volume resize
+    # hook shells out to kubectl. Only those two get this rule - no seaweedfs
+    # component itself speaks to the Kubernetes API. The resize hook's policy,
+    # and with it this requirement, only appears on an upgrade that actually
+    # grows a volume PVC.
+    kubeApiServer:
+      enabled: true
+      # The API server cannot be selected by label, so its address has to be
+      # given here - there is no sane default, and 0.0.0.0/0 would defeat the
+      # point. Rendering fails with a pointer to this value if a component
+      # needs the API server and this is empty.
+      #
+      # Use the endpoint behind the kubernetes service, not its ClusterIP:
+      # kube-proxy rewrites the destination before the packet is matched.
+      #   kubectl get endpointslice kubernetes -o jsonpath='{.endpoints[*].addresses[*]}'
+      cidrs: []
+      ports: [443, 6443]
+
+    # Plain NetworkPolicyEgressRule entries, appended to every component's
+    # policy. This is where the filer store and the notification sinks go:
+    #
+    #   extraEgress:
+    #     - to:
+    #         - podSelector:
+    #             matchLabels:
+    #               app.kubernetes.io/name: mysql
+    #       ports:
+    #         - protocol: TCP
+    #           port: 3306
+    extraEgress: []
+
+  # Per-component additions, keyed by the component's app.kubernetes.io/component
+  # label value, for rules that should not apply to the whole release. The keys
+  # are master, filer, s3, sftp, admin, worker, bucket-hook,
+  # volume-resize-hook, objectstorage-provisioner, seaweedfs-all-in-one, and
+  # volume (plus volume-<name> for every entry under `volumes`):
+  #
+  #   components:
+  #     filer:
+  #       extraEgress:
+  #         - to:
+  #             - ipBlock:
+  #                 cidr: 10.0.0.5/32
+  #           ports:
+  #             - protocol: TCP
+  #               port: 5432
+  components: {}
diff --git a/packages/system/seaweedfs/images/seaweedfs/Dockerfile b/packages/system/seaweedfs/images/seaweedfs/Dockerfile
new file mode 100644
index 0000000000..8f42f3ea2b
--- /dev/null
+++ b/packages/system/seaweedfs/images/seaweedfs/Dockerfile
@@ -0,0 +1,68 @@
+# Rebuild the weed binary from the upstream sources with the Cozystack patches
+# applied, and lay it over the upstream image of the same tag. Only the Go
+# binary changes: the Rust volume server and worker, the entrypoint and the
+# runtime packages are the upstream image's own, byte for byte.
+#
+# patches/reader-cache-prefetch-window.diff bounds the read-ahead of a
+# sequential chunk reader to the prefetch count it was given. Upstream counts
+# only the downloads it newly starts toward that window and runs the prefetch
+# after every ReadAt, so the S3 GET path, reading 256 KiB at a time out of
+# 4 MiB chunks, pushes the window four chunks further on each read until the
+# ReaderCache limit of 256 downloaders is reached. The gateway then holds up to
+# about a gigabyte of a single object in memory, is OOM-killed under the 512Mi
+# limit the S3 deployment gets from its resources preset, and the client sees
+# the response cut off tens of megabytes in:
+# https://github.com/cozystack/cozystack/issues/3782. Upstream fixed it in
+# seaweedfs/seaweedfs#11674 after 4.48; drop the patch on the first vendored
+# release that carries it.
+#
+# `make update` re-pins VERSION from the vendored chart, SOURCE_SHA256 from the
+# source archive of that tag, UPSTREAM_DIGEST from the upstream image of that
+# tag and the builder from upstream's docker/Dockerfile.go_build, and checks
+# that the patches still apply.
+ARG VERSION=4.45
+ARG SOURCE_SHA256=800a91693e2a4e974ef0e2a157b6a04eff9f4df507303b1cff31b0601081fc30
+ARG UPSTREAM_DIGEST=sha256:fc9f76fa993ad69966ffeb2f65d0318fcae39c6f8e20cf68ef7b3a5cb97769e5
+
+# The Go toolchain of upstream's builder (docker/Dockerfile.go_build), which
+# compiles the upstream weed.
+FROM --platform=$BUILDPLATFORM golang:1.26-alpine@sha256:3082400e369fa24d5fc60bca20edab3f6d604e0c5a690ec66b295eff4dd87ade AS builder
+ARG GOPROXY
+ARG VERSION
+ARG SOURCE_SHA256
+
+RUN apk add --no-cache git curl
+
+WORKDIR /go/src/github.com/seaweedfs/seaweedfs
+
+RUN curl -fsSL -o /tmp/source.tar.gz https://github.com/seaweedfs/seaweedfs/archive/refs/tags/${VERSION}.tar.gz && \
+    echo "${SOURCE_SHA256}  /tmp/source.tar.gz" | sha256sum -c - && \
+    tar -xzf /tmp/source.tar.gz --strip-components=1 && rm /tmp/source.tar.gz
+
+COPY patches /patches
+RUN git apply /patches/*.diff
+
+ENV CGO_ENABLED=0
+
+# go build never compiles a _test.go, so nothing else runs the tests the
+# patches carry. The list is read into a variable first: a for loop drops the
+# exit status of a command substitution, so a patch git cannot read would leave
+# the list empty and the step green.
+RUN files=$(git apply --numstat /patches/*.diff) || exit 1; \
+    for dir in $(printf '%s\n' "$files" | cut -f3 | grep '\.go$' | xargs -r -n1 dirname | sort -u); do \
+      go test "./$dir" || exit 1; \
+    done
+
+# Declared after the tests so they run once on the build platform rather than
+# once per target platform.
+ARG TARGETOS
+ARG TARGETARCH
+
+# The source archive carries no git history for upstream's `git rev-parse`, so
+# the commit field of `weed version` names this build instead.
+RUN cd weed && GOOS=$TARGETOS GOARCH=$TARGETARCH go build \
+    -ldflags "-X github.com/seaweedfs/seaweedfs/weed/util/version.COMMIT=cozystack-patched" \
+    -o /out/weed .
+
+FROM chrislusf/seaweedfs:${VERSION}@${UPSTREAM_DIGEST}
+COPY --from=builder /out/weed /usr/bin/weed
diff --git a/packages/system/seaweedfs/images/seaweedfs/patches/reader-cache-prefetch-window.diff b/packages/system/seaweedfs/images/seaweedfs/patches/reader-cache-prefetch-window.diff
new file mode 100644
index 0000000000..8999fd0f31
--- /dev/null
+++ b/packages/system/seaweedfs/images/seaweedfs/patches/reader-cache-prefetch-window.diff
@@ -0,0 +1,102 @@
+diff --git a/weed/filer/reader_cache.go b/weed/filer/reader_cache.go
+--- a/weed/filer/reader_cache.go
++++ b/weed/filer/reader_cache.go
+@@ -75,8 +75,10 @@
+ 		return
+ 	}
+ 
+-	cached := 0
+-	for x := chunkViews; x != nil && cached < count; x = x.Next {
++	// The window is the next count chunks, whether or not a download for them
++	// is already running: counting only newly started downloads would push the
++	// window count chunks further on every call.
++	for x, i := chunkViews, 0; x != nil && i < count; x, i = x.Next, i+1 {
+ 		chunkView := x.Value
+ 		if _, found := rc.downloaders[chunkView.FileId]; found {
+ 			continue
+@@ -98,7 +100,6 @@
+ 		go cacher.startCaching()
+ 		<-cacher.cacheStartedCh
+ 		rc.downloaders[chunkView.FileId] = cacher
+-		cached++
+ 	}
+ 
+ 	return
+diff --git a/weed/filer/reader_at_prefetch_window_test.go b/weed/filer/reader_at_prefetch_window_test.go
+new file mode 100644
+--- /dev/null
++++ b/weed/filer/reader_at_prefetch_window_test.go
+@@ -0,0 +1,73 @@
++package filer
++
++import (
++	"context"
++	"fmt"
++	"strconv"
++	"strings"
++	"sync/atomic"
++	"testing"
++
++	"github.com/seaweedfs/seaweedfs/weed/util/chunk_cache"
++	util_http "github.com/seaweedfs/seaweedfs/weed/util/http"
++)
++
++// A sequential reader that consumes a chunk in several small ReadAt calls, as
++// the S3 GET path does with its 256 KiB copy buffer over 4 MiB chunks, must
++// keep its read-ahead at prefetchCount chunks. Each ReadAt triggers a
++// prefetch; if chunks already being fetched are not counted toward the
++// window, every call starts prefetchCount more downloads and the read-ahead
++// runs to the ReaderCache downloader limit, buffering most of the object.
++func TestChunkReadAtSequentialPrefetchStaysWithinWindow(t *testing.T) {
++	const chunkSize = 64 << 10
++	const chunkCount = 64
++	const sliceSize = 16 << 10
++
++	var readerChunk atomic.Int64
++	var maxLead atomic.Int64
++	rc := NewReaderCache(256, (*chunk_cache.TieredChunkCache)(nil), func(context.Context, string) ([]string, error) {
++		return []string{"unused"}, nil
++	}, nil)
++	defer rc.destroy()
++	rc.fetchChunkDataFn = func(_ context.Context, buffer []byte, _ []string, _ []byte, _ bool, _ bool, _ int64, fileId string, _ util_http.RefreshUrlsFunc) (int, error) {
++		idx, err := strconv.Atoi(strings.TrimPrefix(fileId, "chunk"))
++		if err != nil {
++			return 0, err
++		}
++		lead := int64(idx) - readerChunk.Load()
++		for {
++			cur := maxLead.Load()
++			if lead <= cur || maxLead.CompareAndSwap(cur, lead) {
++				break
++			}
++		}
++		return len(buffer), nil
++	}
++
++	views := NewIntervalList[*ChunkView]()
++	for i := 0; i < chunkCount; i++ {
++		views.AppendInterval(&Interval[*ChunkView]{
++			StartOffset: int64(i * chunkSize),
++			StopOffset:  int64((i + 1) * chunkSize),
++			Value: &ChunkView{
++				FileId:     fmt.Sprintf("chunk%d", i),
++				ViewSize:   chunkSize,
++				ViewOffset: int64(i * chunkSize),
++				ChunkSize:  chunkSize,
++			},
++		})
++	}
++	reader := NewChunkReaderAtFromClient(context.Background(), rc, views, chunkSize*chunkCount, DefaultPrefetchCount)
++
++	buf := make([]byte, sliceSize)
++	for off := int64(0); off < chunkSize*chunkCount; off += sliceSize {
++		readerChunk.Store(off / chunkSize)
++		if _, err := reader.ReadAt(buf, off); err != nil && off+sliceSize < chunkSize*chunkCount {
++			t.Fatalf("ReadAt(%d): %v", off, err)
++		}
++	}
++
++	if got := maxLead.Load(); got > DefaultPrefetchCount {
++		t.Fatalf("read-ahead reached %d chunks past the reader, want at most %d", got, DefaultPrefetchCount)
++	}
++}
diff --git a/packages/system/seaweedfs/patches/cluster-scoped-names-per-namespace.patch b/packages/system/seaweedfs/patches/cluster-scoped-names-per-namespace.patch
new file mode 100644
index 0000000000..2091c6d5cf
--- /dev/null
+++ b/packages/system/seaweedfs/patches/cluster-scoped-names-per-namespace.patch
@@ -0,0 +1,60 @@
+diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/cosi/cosi-cluster-role.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/cosi/cosi-cluster-role.yaml
+index b5c103575..a6e5b761e 100644
+--- a/packages/system/seaweedfs/charts/seaweedfs/templates/cosi/cosi-cluster-role.yaml
++++ b/packages/system/seaweedfs/charts/seaweedfs/templates/cosi/cosi-cluster-role.yaml
+@@ -4,7 +4,7 @@
+ kind: ClusterRole
+ apiVersion: rbac.authorization.k8s.io/v1
+ metadata:
+-  name: {{ include "seaweedfs.fullname" . }}-objectstorage-provisioner
++  name: {{ include "seaweedfs.serviceAccountName" . }}-objectstorage-provisioner
+   labels:
+     app.kubernetes.io/name: {{ template "seaweedfs.name" . }}
+     helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+@@ -53,7 +53,7 @@ rules:
+ kind: ClusterRoleBinding
+ apiVersion: rbac.authorization.k8s.io/v1
+ metadata:
+-  name: {{ include "seaweedfs.fullname" . }}-objectstorage-provisioner
++  name: {{ include "seaweedfs.serviceAccountName" . }}-objectstorage-provisioner
+   labels:
+     app.kubernetes.io/name: {{ template "seaweedfs.name" . }}
+     helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+@@ -65,6 +65,6 @@ subjects:
+     namespace: {{ .Release.Namespace }}
+ roleRef:
+   kind: ClusterRole
+-  name: {{ include "seaweedfs.fullname" . }}-objectstorage-provisioner
++  name: {{ include "seaweedfs.serviceAccountName" . }}-objectstorage-provisioner
+   apiGroup: rbac.authorization.k8s.io
+ {{- end }}
+diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/shared/cluster-role.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/shared/cluster-role.yaml
+index 14d09f999..e31c2d5f2 100644
+--- a/packages/system/seaweedfs/charts/seaweedfs/templates/shared/cluster-role.yaml
++++ b/packages/system/seaweedfs/charts/seaweedfs/templates/shared/cluster-role.yaml
+@@ -5,7 +5,7 @@
+ kind: ClusterRole
+ apiVersion: rbac.authorization.k8s.io/v1
+ metadata:
+-  name: {{ include "seaweedfs.fullname" . }}-rw-cr
++  name: {{ include "seaweedfs.serviceAccountName" . }}-rw-cr
+   labels:
+     app.kubernetes.io/name: {{ template "seaweedfs.name" . }}
+     helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+@@ -19,7 +19,7 @@ rules:
+ kind: ClusterRoleBinding
+ apiVersion: rbac.authorization.k8s.io/v1
+ metadata:
+-  name: {{ include "seaweedfs.fullname" . }}-rw-crb
++  name: {{ include "seaweedfs.serviceAccountName" . }}-rw-crb
+   labels:
+     app.kubernetes.io/name: {{ template "seaweedfs.name" . }}
+     helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+@@ -32,5 +32,5 @@ subjects:
+ roleRef:
+   apiGroup: rbac.authorization.k8s.io
+   kind: ClusterRole
+-  name: {{ include "seaweedfs.fullname" . }}-rw-cr
++  name: {{ include "seaweedfs.serviceAccountName" . }}-rw-cr
+ {{- end }}
+\ No newline at end of file
diff --git a/packages/system/seaweedfs/patches/cosi-bucket-class-lock-readonly.patch b/packages/system/seaweedfs/patches/cosi-bucket-class-lock-readonly.patch
new file mode 100644
index 0000000000..ddca7873ee
--- /dev/null
+++ b/packages/system/seaweedfs/patches/cosi-bucket-class-lock-readonly.patch
@@ -0,0 +1,37 @@
+diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/cosi/cosi-bucket-class.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/cosi/cosi-bucket-class.yaml
+index 4d19cc128..1ff0e7768 100644
+--- a/packages/system/seaweedfs/charts/seaweedfs/templates/cosi/cosi-bucket-class.yaml
++++ b/packages/system/seaweedfs/charts/seaweedfs/templates/cosi/cosi-bucket-class.yaml
+@@ -11,10 +11,32 @@ parameters:
+   {{- toYaml . | nindent 2 }}
+ {{- end }}
+ ---
++kind: BucketClass
++apiVersion: objectstorage.k8s.io/v1alpha1
++metadata:
++  name: {{ .Values.cosi.bucketClassName }}-lock
++driverName: {{ .Values.cosi.driverName }}
++deletionPolicy: Retain
++parameters:
++  objectLockEnabled: "true"
++  objectLockRetentionMode: "COMPLIANCE"
++  objectLockRetentionDays: "365"
++---
+ kind: BucketAccessClass
+ apiVersion: objectstorage.k8s.io/v1alpha1
+ metadata:
+   name: {{ .Values.cosi.bucketClassName }}
+ driverName: {{ .Values.cosi.driverName }}
+ authenticationType: KEY
++parameters:
++  accessPolicy: readwrite
++---
++kind: BucketAccessClass
++apiVersion: objectstorage.k8s.io/v1alpha1
++metadata:
++  name: {{ .Values.cosi.bucketClassName }}-readonly
++driverName: {{ .Values.cosi.driverName }}
++authenticationType: KEY
++parameters:
++  accessPolicy: readonly
+ {{- end }}
diff --git a/packages/system/seaweedfs/patches/cosi-provisioner-sa-name.patch b/packages/system/seaweedfs/patches/cosi-provisioner-sa-name.patch
new file mode 100644
index 0000000000..0a48a27d5f
--- /dev/null
+++ b/packages/system/seaweedfs/patches/cosi-provisioner-sa-name.patch
@@ -0,0 +1,13 @@
+diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/cosi/cosi-deployment.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/cosi/cosi-deployment.yaml
+index aefc9d369..d485e0678 100644
+--- a/packages/system/seaweedfs/charts/seaweedfs/templates/cosi/cosi-deployment.yaml
++++ b/packages/system/seaweedfs/charts/seaweedfs/templates/cosi/cosi-deployment.yaml
+@@ -58,7 +58,7 @@ spec:
+       priorityClassName: {{ .Values.cosi.priorityClassName | quote }}
+       {{- end }}
+       enableServiceLinks: false
+-      serviceAccountName: {{ include "seaweedfs.componentName" (list . "objectstorage-provisioner") }}
++      serviceAccountName: {{ .Values.global.seaweedfs.serviceAccountName }}-objectstorage-provisioner
+       {{- if .Values.cosi.initContainers }}
+       initContainers:
+         {{ tpl .Values.cosi.initContainers . | nindent 8 | trim }}
diff --git a/packages/system/seaweedfs/patches/resize-api-server-annotation.diff b/packages/system/seaweedfs/patches/resize-api-server-annotation.diff
index 43af45793e..4128f8fd86 100644
--- a/packages/system/seaweedfs/patches/resize-api-server-annotation.diff
+++ b/packages/system/seaweedfs/patches/resize-api-server-annotation.diff
@@ -1,13 +1,10 @@
 diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/volume/volume-resize-hook.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/volume/volume-resize-hook.yaml
-index 436a785..9f186ea 100644
 --- a/packages/system/seaweedfs/charts/seaweedfs/templates/volume/volume-resize-hook.yaml
 +++ b/packages/system/seaweedfs/charts/seaweedfs/templates/volume/volume-resize-hook.yaml
-@@ -45,6 +45,9 @@ metadata:
-     helm.sh/hook-delete-policy: hook-succeeded,before-hook-creation
- spec:
-   template:
-+    metadata:
-+      labels:
+@@ -29,6 +29,7 @@
+         app.kubernetes.io/managed-by: {{ .Release.Service | quote }}
+         app.kubernetes.io/instance: {{ .Release.Name | quote }}
+         app.kubernetes.io/component: volume-resize-hook
 +        policy.cozystack.io/allow-to-apiserver: "true"
      spec:
        serviceAccountName: {{ $seaweedfsName }}-volume-resize-hook
diff --git a/packages/system/seaweedfs/patches/s3-iceberg-port-explicit.patch b/packages/system/seaweedfs/patches/s3-iceberg-port-explicit.patch
new file mode 100644
index 0000000000..5097d93b20
--- /dev/null
+++ b/packages/system/seaweedfs/patches/s3-iceberg-port-explicit.patch
@@ -0,0 +1,16 @@
+diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/s3/s3-deployment.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/s3/s3-deployment.yaml
+index 0849f8a28..cf5710ba0 100644
+--- a/packages/system/seaweedfs/charts/seaweedfs/templates/s3/s3-deployment.yaml
++++ b/packages/system/seaweedfs/charts/seaweedfs/templates/s3/s3-deployment.yaml
+@@ -146,9 +146,8 @@ spec:
+               -auditLogConfig=/etc/sw/s3_auditLogConfig.json \
+               {{- end }}
+               -filer={{ include "seaweedfs.componentName" (list . "filer-client") }}.{{ .Release.Namespace }}:{{ .Values.filer.port }} \
+-              {{- if .Values.s3.icebergPort }}
+-              -port.iceberg={{ .Values.s3.icebergPort }} \
+-              {{- end }}
++              {{- /* rendered even when 0: an if would drop the flag and weed would serve its 8181 default */}}
++              -port.iceberg={{ .Values.s3.icebergPort | default 0 }} \
+               {{- /* rendered even when 0: an if would drop the flag and weed would serve its default */}}
+               -port.lance={{ .Values.s3.lancePort | default 0 }} \
+               {{- range .Values.s3.extraArgs }}
diff --git a/packages/system/seaweedfs/patches/s3-service-name-consumers.patch b/packages/system/seaweedfs/patches/s3-service-name-consumers.patch
new file mode 100644
index 0000000000..73b09dc15f
--- /dev/null
+++ b/packages/system/seaweedfs/patches/s3-service-name-consumers.patch
@@ -0,0 +1,47 @@
+diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/cosi/cosi-deployment.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/cosi/cosi-deployment.yaml
+index d485e0678..d581b085d 100644
+--- a/packages/system/seaweedfs/charts/seaweedfs/templates/cosi/cosi-deployment.yaml
++++ b/packages/system/seaweedfs/charts/seaweedfs/templates/cosi/cosi-deployment.yaml
+@@ -79,9 +79,9 @@ spec:
+               {{- else if .Values.s3.ingress.enabled }}
+               value: "{{ printf "https://%s" .Values.s3.ingress.host }}"
+               {{- else if .Values.s3.enabled }}
+-              value: "{{ printf "https://%s.%s.svc" (include "seaweedfs.componentName" (list . "s3")) .Release.Namespace }}"
++              value: "{{ printf "https://%s-s3.%s.svc:%v" (include "seaweedfs.name" .) .Release.Namespace .Values.s3.port }}"
+               {{- else }}
+-              value: "{{ printf "https://%s.%s.svc" (include "seaweedfs.componentName" (list . "filer")) .Release.Namespace }}"
++              value: "{{ printf "https://%s-s3.%s.svc:%v" (include "seaweedfs.name" .) .Release.Namespace .Values.filer.s3.port }}"
+               {{- end }}
+             {{- with .Values.cosi.region }}
+             - name: REGION
+diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/s3/s3-iceberg-ingress.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/s3/s3-iceberg-ingress.yaml
+index 5a760d7e9..68db538dc 100644
+--- a/packages/system/seaweedfs/charts/seaweedfs/templates/s3/s3-iceberg-ingress.yaml
++++ b/packages/system/seaweedfs/charts/seaweedfs/templates/s3/s3-iceberg-ingress.yaml
+@@ -5,11 +5,11 @@ paths:
+   backend:
+     {{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }}
+     service:
+-      name: {{ include "seaweedfs.componentName" (list . "s3") }}
++      name: {{ template "seaweedfs.name" . }}-s3
+       port:
+         number: {{ .Values.s3.icebergPort }}
+     {{- else }}
+-    serviceName: {{ include "seaweedfs.componentName" (list . "s3") }}
++    serviceName: {{ template "seaweedfs.name" . }}-s3
+     servicePort: {{ .Values.s3.icebergPort }}
+     {{- end }}
+ {{- end -}}
+diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/s3/s3-ingress.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/s3/s3-ingress.yaml
+index bc4eee164..c92063f8c 100644
+--- a/packages/system/seaweedfs/charts/seaweedfs/templates/s3/s3-ingress.yaml
++++ b/packages/system/seaweedfs/charts/seaweedfs/templates/s3/s3-ingress.yaml
+@@ -2,7 +2,7 @@
+ {{- $s3Enabled := or .Values.s3.enabled (and .Values.filer.s3.enabled (not .Values.allInOne.enabled)) (and .Values.allInOne.enabled .Values.allInOne.s3.enabled) }}
+ {{- if and $s3Enabled .Values.s3.ingress.enabled }}
+ {{- /* Determine service name based on deployment mode */}}
+-{{- $serviceName := ternary (include "seaweedfs.componentName" (list . "all-in-one")) (include "seaweedfs.componentName" (list . "s3")) .Values.allInOne.enabled }}
++{{- $serviceName := ternary (include "seaweedfs.componentName" (list . "all-in-one")) (printf "%s-s3" (include "seaweedfs.name" .)) .Values.allInOne.enabled }}
+ {{- $s3Port := .Values.allInOne.s3.port | default .Values.s3.port }}
+ {{- /* Build hosts list - support both legacy .host (string) and new .hosts (array) for backwards compatibility */}}
+ {{- $hosts := list }}
diff --git a/packages/system/seaweedfs/patches/s3-service-name.patch b/packages/system/seaweedfs/patches/s3-service-name.patch
new file mode 100644
index 0000000000..4d3a418c35
--- /dev/null
+++ b/packages/system/seaweedfs/patches/s3-service-name.patch
@@ -0,0 +1,13 @@
+diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/s3/s3-service.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/s3/s3-service.yaml
+index 063b1c59f..6e852ba63 100644
+--- a/packages/system/seaweedfs/charts/seaweedfs/templates/s3/s3-service.yaml
++++ b/packages/system/seaweedfs/charts/seaweedfs/templates/s3/s3-service.yaml
+@@ -2,7 +2,7 @@
+ apiVersion: v1
+ kind: Service
+ metadata:
+-  name: {{ include "seaweedfs.componentName" (list . "s3") }}
++  name: {{ template "seaweedfs.name" . }}-s3
+   namespace: {{ .Release.Namespace }}
+   labels:
+     app.kubernetes.io/name: {{ template "seaweedfs.name" . }}
diff --git a/packages/system/seaweedfs/patches/s3-tls-main-port.patch b/packages/system/seaweedfs/patches/s3-tls-main-port.patch
new file mode 100644
index 0000000000..ca1f8166a0
--- /dev/null
+++ b/packages/system/seaweedfs/patches/s3-tls-main-port.patch
@@ -0,0 +1,14 @@
+diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/s3/s3-deployment.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/s3/s3-deployment.yaml
+index db231fc96..efb967bb2 100644
+--- a/packages/system/seaweedfs/charts/seaweedfs/templates/s3/s3-deployment.yaml
++++ b/packages/system/seaweedfs/charts/seaweedfs/templates/s3/s3-deployment.yaml
+@@ -127,8 +127,8 @@ spec:
+               {{- if .Values.global.seaweedfs.enableSecurity }}
+               {{- if .Values.s3.httpsPort }}
+               -port.https={{ .Values.s3.httpsPort }} \
+-              {{- include "seaweedfs.s3.tlsArgs" (dict "root" . "prefix" "") | nindent 14 }}
+               {{- end }}
++              {{- include "seaweedfs.s3.tlsArgs" (dict "root" . "prefix" "") | nindent 14 }}
+               {{- end }}
+               {{- if .Values.s3.domainName }}
+               -domainName={{ .Values.s3.domainName }} \
diff --git a/packages/system/seaweedfs/patches/s3-traffic-distribution.patch b/packages/system/seaweedfs/patches/s3-traffic-distribution.patch
deleted file mode 100644
index 93c7238443..0000000000
--- a/packages/system/seaweedfs/patches/s3-traffic-distribution.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/s3/s3-service.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/s3/s3-service.yaml
-index 8afd4865..86e0424e 100644
---- a/packages/system/seaweedfs/charts/seaweedfs/templates/s3/s3-service.yaml
-+++ b/packages/system/seaweedfs/charts/seaweedfs/templates/s3/s3-service.yaml
-@@ -14,6 +14,7 @@ metadata:
-     {{- toYaml .Values.s3.annotations | nindent 4 }}
- {{- end }}
- spec:
-+  trafficDistribution: PreferClose
-   internalTrafficPolicy: {{ .Values.s3.internalTrafficPolicy | default "Cluster" }}
-   ports:
-   - name: "swfs-s3"
diff --git a/packages/system/seaweedfs/patches/volume-resize-quantity.diff b/packages/system/seaweedfs/patches/volume-resize-quantity.diff
new file mode 100644
index 0000000000..5b03666b4b
--- /dev/null
+++ b/packages/system/seaweedfs/patches/volume-resize-quantity.diff
@@ -0,0 +1,27 @@
+diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/shared/_helpers.tpl b/packages/system/seaweedfs/charts/seaweedfs/templates/shared/_helpers.tpl
+--- a/packages/system/seaweedfs/charts/seaweedfs/templates/shared/_helpers.tpl
++++ b/packages/system/seaweedfs/charts/seaweedfs/templates/shared/_helpers.tpl
+@@ -415,7 +415,9 @@
+ {{-           if eq .type "persistentVolumeClaim" }}
+ {{-             $desiredSize := .size }}
+ {{-             range $statefulset.spec.volumeClaimTemplates }}
+-{{-               if and (eq .metadata.name $dir.name) (ne .spec.resources.requests.storage $desiredSize) }}
++{{- /* normalise both sides: the API server canonicalises quantities, so a raw
++       compare fires on a respelling that changed nothing. */}}
++{{-               if and (eq .metadata.name $dir.name) (ne (include "seaweedfs.resource-quantity" .spec.resources.requests.storage) (include "seaweedfs.resource-quantity" $desiredSize)) }}
+ {{-                 $commands = append $commands (printf "kubectl delete statefulset %s --cascade=orphan" $statefulsetName) }}
+ {{-               end }}
+ {{-             end }}
+@@ -432,8 +434,10 @@
+ {{-             if $currentPVC }}
+ {{-               $oldSize := include "seaweedfs.resource-quantity" $currentPVC.spec.resources.requests.storage }}
+ {{-               $newSize := include "seaweedfs.resource-quantity" $desiredSize }}
+-{{-               if gt $newSize $oldSize }}
+-{{-                 $commands = append $commands (printf "kubectl patch pvc %s-%s-%s-%d -p '{\"spec\":{\"resources\":{\"requests\":{\"storage\":\"%s\"}}}}'" $dir.name $seaweedfsName $volumeName $e $desiredSize) }}
++{{- /* both sides are strings from an include, so compare them as numbers: a
++       lexicographic gt reads 10Gi as smaller than 5Gi and skips the patch. */}}
++{{-               if gt (float64 $newSize) (float64 $oldSize) }}
++{{-                 $commands = append $commands (printf "kubectl patch pvc %s-%s-%s-%d -p '{\"spec\":{\"resources\":{\"requests\":{\"storage\":\"%v\"}}}}'" $dir.name $seaweedfsName $volumeName $e $desiredSize) }}
+ {{-               end }}
+ {{-             end }}
+ {{-           end }}
diff --git a/packages/system/seaweedfs/templates/_naming.tpl b/packages/system/seaweedfs/templates/_naming.tpl
new file mode 100644
index 0000000000..4f8935db89
--- /dev/null
+++ b/packages/system/seaweedfs/templates/_naming.tpl
@@ -0,0 +1,48 @@
+{{- /* seaweedfs.renamedVolumePrefix — reconstruct the name 4.31 gives the volume
+   component of the `<name>-system` release, i.e. the RELEASE-NAMED generation the
+   fullnameOverride pin exists to avoid.
+
+   Input: the `<name>-system` release name, as a bare string.
+     {{ include "seaweedfs.renamedVolumePrefix" "foo-system" }} -> foo-system-seaweedfs-volume
+
+   This replays two upstream helpers, so it must track them if the vendored chart
+   changes (hack/seaweedfs-guard-parity.bats pins the two copies of the guard
+   against each other; charts/seaweedfs/templates/shared/_helpers.tpl is the
+   source of truth for the rules below):
+
+     seaweedfs.fullname      — with no fullnameOverride, the release name, plus
+                               `-<chart name>` when the release name does not
+                               already contain it; truncated to 63.
+     seaweedfs.componentName — truncates the fullname to (62 - len(suffix)) before
+                               appending `-<suffix>`, so for `volume` the fullname
+                               is cut to 56. An instance name >= ~40 chars
+                               therefore loses `seaweedfs` from the tail, which is
+                               why a `contains "seaweedfs"` name filter cannot see
+                               its claims and this reconstruction can.
+
+   The guard deliberately does NOT call seaweedfs.fullname directly: that helper
+   reads .Values.fullnameOverride, which this chart PINS to `seaweedfs`, so it
+   returns the chart-named generation — the opposite of what is wanted here.
+
+   ACCEPTED LIMIT — zone/pool volume components. MultiZone (and Simple-with-
+   pools) tenants get per-group components with suffix `volume-<key>`, cut at
+   (62 - len(suffix)), i.e. SHORTER than the 56 this helper reconstructs. The
+   prefixes only diverge when the fullname exceeds that shorter cut: for the
+   supported instance (the tenant module hardcodes the name `seaweedfs`,
+   fullname 16 chars) that takes a zone/pool key of ~40+ characters, and for
+   the default `volume` group it can never happen (its suffix IS the 56 cut).
+   A guard prefix that diverges means a release-named zone component the guard
+   cannot see. Decided 2026-07-17 (1.6 triage): accepted and documented in
+   docs/operations/seaweedfs-431-rename-recovery.md (Scope) rather than
+   reconstructed per-key — instance names are fixed by the tenant module and
+   absurd keys are the only reachable trigger. Revisit if instance naming is
+   ever opened up or a key-length clamp lands in extra/seaweedfs. */}}
+{{- define "seaweedfs.renamedVolumePrefix" -}}
+{{- $release := . -}}
+{{- $full := $release -}}
+{{- if not (contains "seaweedfs" $release) -}}
+{{-   $full = printf "%s-seaweedfs" $release -}}
+{{- end -}}
+{{- $full = $full | trunc 63 | trimSuffix "-" -}}
+{{- printf "%s-volume" ($full | trunc 56 | trimSuffix "-") -}}
+{{- end -}}
diff --git a/packages/system/seaweedfs/templates/alerts.yaml b/packages/system/seaweedfs/templates/alerts.yaml
new file mode 100644
index 0000000000..701558a7b2
--- /dev/null
+++ b/packages/system/seaweedfs/templates/alerts.yaml
@@ -0,0 +1,54 @@
+{{- if .Values.global.seaweedfs.monitoring.enabled }}
+{{- /*
+Every SeaweedFS instance renders this chart into its own namespace, and the
+root vmalert evaluates every rule it finds against every namespace's metrics.
+The selectors pin each expression to this release's namespace so N instances
+yield one alert per affected instance rather than N copies of each.
+*/}}
+{{- $ns := .Release.Namespace }}
+apiVersion: monitoring.coreos.com/v1
+kind: PrometheusRule
+metadata:
+  name: {{ .Release.Name }}-alerts
+spec:
+  groups:
+  - name: seaweedfs
+    rules:
+    - alert: SeaweedFSVolumeServerDiskLow
+      annotations:
+        summary: A SeaweedFS volume server is close to its free-space reserve.
+        description: {{`Volume server {{ $labels.pod }} in Namespace {{ $labels.namespace }} has {{ $value | humanizePercentage }} of its disk left before the minFreeSpacePercent reserve, at which every volume on it turns read-only.`}}
+      expr: |-
+        (
+          SeaweedFS_volumeServer_resource{namespace="{{ $ns }}", type="avail"}
+            / ignoring (type)
+          SeaweedFS_volumeServer_resource{namespace="{{ $ns }}", type="all"}
+        ) < 0.10 > 0
+      for: 15m
+      labels:
+        severity: warning
+    - alert: SeaweedFSVolumeServerFull
+      annotations:
+        summary: A SeaweedFS volume server has no room for another volume.
+        description: {{`Volume server {{ $labels.pod }} in Namespace {{ $labels.namespace }} cannot host a new volume. Either it is at its free-space reserve and all its volumes are read-only, or it has no slot left and a bucket whose volumes on it are all full stops taking writes.`}}
+      expr: |-
+        max by (namespace, pod) (SeaweedFS_volumeServer_resource{namespace="{{ $ns }}", type="avail"} == 0)
+        or on (namespace, pod)
+        (
+          SeaweedFS_volumeServer_max_volumes{namespace="{{ $ns }}"}
+            - on (namespace, pod)
+          sum by (namespace, pod) (SeaweedFS_volumeServer_volumes{namespace="{{ $ns }}", type="volume"})
+        ) <= 0
+      for: 15m
+      labels:
+        severity: warning
+    - alert: SeaweedFSWritesFailing
+      annotations:
+        summary: SeaweedFS keeps failing to place writes.
+        description: {{`The SeaweedFS master in Namespace {{ $labels.namespace }} has failed to assign a volume for a write in every 5-minute window for 15 minutes. Writes may still land in between. The usual cause is a bucket with no writable volume left that the master cannot grow, whose uploads all fail; a steady stream of newly created buckets looks the same.`}}
+      expr: |-
+        sum by (namespace) (increase(SeaweedFS_master_pick_for_write_error{namespace="{{ $ns }}"}[5m])) > 0
+      for: 15m
+      labels:
+        severity: critical
+{{- end }}
diff --git a/packages/system/seaweedfs/templates/cluster-scoped-rbac-guard.yaml b/packages/system/seaweedfs/templates/cluster-scoped-rbac-guard.yaml
new file mode 100644
index 0000000000..d14d8d289a
--- /dev/null
+++ b/packages/system/seaweedfs/templates/cluster-scoped-rbac-guard.yaml
@@ -0,0 +1,69 @@
+{{- /* Cluster-scoped RBAC uniqueness guard.
+
+   ClusterRoles and ClusterRoleBindings are CLUSTER-scoped: exactly one object can
+   carry a given name, cluster-wide. This chart is installed once per tenant, so
+   every cluster-scoped name it renders must be unique per install.
+
+   That is in direct tension with the adoption pin. `seaweedfs.fullnameOverride`
+   is pinned to `seaweedfs` (see values.yaml and templates/naming-guard.yaml) so
+   the NAMESPACED workloads keep their pre-4.31 chart-based names and are adopted
+   in place across the bump — which means `seaweedfs.fullname` is, by
+   construction, the SAME string in every tenant. Naming a cluster-scoped object
+   after it makes every tenant fight over one object.
+
+   Upstream 4.31 did exactly that: it switched the four cluster-scoped names from
+   global.serviceAccountName to seaweedfs.fullname. Pre-4.31 they were
+   `<global.serviceAccountName>-{objectstorage-provisioner,rw-cr}`, and Cozystack
+   sets that value to `<namespace>-seaweedfs` (extra/seaweedfs), so they were
+   unique per tenant. patches/cluster-scoped-names-per-namespace.patch puts them
+   back on the service account name — restoring the pre-4.31 names byte-for-byte
+   and, with them, per-tenant uniqueness.
+
+   Uniqueness therefore rests on a VALUE, so assert it instead of trusting it:
+   the name must carry the release namespace. Without this, a tenant that stops
+   setting the value per namespace silently re-collides — no error, no ownership
+   conflict, just one ClusterRoleBinding whose subject flips to whichever tenant
+   reconciled last while every other tenant's COSI provisioner loses its RBAC.
+   That failure is invisible until a bucket operation fails, which is why the
+   collision survived two releases.
+
+   Checked only when the render can see the cluster (same namespace canary as
+   naming-guard.yaml): system/seaweedfs's own values.yaml carries a static
+   PLACEHOLDER serviceAccountName that only extra/seaweedfs overrides per
+   release, so a client-side render (CI lint, helm unittest) legitimately sees
+   the placeholder and touches no live RBAC.
+
+   The compat shim must run first. extra/seaweedfs sets the OLD flat key
+   global.serviceAccountName, and seaweedfs.compat is what folds it into the
+   canonical global.seaweedfs.serviceAccountName (the flat key wins when
+   present). Every subchart template includes the shim before reading, and this
+   guard has to read the same value the subchart will, or it compares against
+   this chart's placeholder default and refuses every real upgrade. Including
+   the shim rather than re-deriving the precedence here is deliberate: a second
+   copy of that rule would be free to drift from the one that actually names the
+   objects. It is idempotent and output-free, so calling it here is safe. */}}
+{{- include "seaweedfs.compat" . -}}
+
+{{- $canary := lookup "v1" "Namespace" "" .Release.Namespace }}
+{{- if $canary }}
+{{-   $sa := include "seaweedfs.serviceAccountName" . }}
+{{- /* Equality, not a prefix or substring test. extra/seaweedfs sets exactly
+   `<namespace>-seaweedfs`, so that is what to assert. Anything looser accepts a
+   value belonging to a DIFFERENT namespace: `contains` lets namespace `tenant-a`
+   through on `tenant-ab-seaweedfs`, and `hasPrefix "tenant-a-"` still lets it
+   through on `tenant-a-b-seaweedfs` — which is also the natural value for
+   namespace `tenant-a-b`, i.e. two namespaces would accept one string and
+   collide on the very object this guard exists to keep unique.
+
+   This asserts the VALUE the names are built from, not the rendered names — it
+   cannot catch the chart being reverted to name them after the pinned fullname.
+   tests/cluster_scoped_names_test.yaml covers that axis, by asserting that two
+   tenants render two different names.
+
+   (The comment marker must be exactly `{{- /*`: Go's lexer looks for `/*` at a
+   fixed offset past the trim marker, so `{{-   /*` lexes as a command and fails
+   with `unexpected "/" in command`.) */}}
+{{-   if ne $sa (printf "%s-seaweedfs" .Release.Namespace) }}
+{{-     fail (printf "SeaweedFS release %s in namespace %s would render cluster-scoped RBAC named %q, which is not this namespace's own <namespace>-seaweedfs and so is not unique per tenant. Every SeaweedFS instance pins the same fullname, so ClusterRole/ClusterRoleBinding names are taken from global.seaweedfs.serviceAccountName, which extra/seaweedfs must set per namespace. With a shared name only one tenant can own the object, and the ClusterRoleBinding's subject flips to whichever tenant reconciled last — silently revoking every other tenant's COSI provisioner." .Release.Name .Release.Namespace $sa) }}
+{{-   end }}
+{{- end }}
diff --git a/packages/system/seaweedfs/templates/hook.yaml b/packages/system/seaweedfs/templates/hook.yaml
index ef02f4ee6d..fcb5c9dbd1 100644
--- a/packages/system/seaweedfs/templates/hook.yaml
+++ b/packages/system/seaweedfs/templates/hook.yaml
@@ -24,9 +24,18 @@ spec:
         policy.cozystack.io/allow-to-apiserver: "true"
     spec:
       serviceAccountName: seaweedfs-hook
+      securityContext:
+        runAsNonRoot: true
+        runAsUser: 65534
+        seccompProfile:
+          type: RuntimeDefault
       containers:
         - name: kubectl
-          image: docker.io/alpine/k8s:1.33.4
+          image: docker.io/alpine/k8s:1.36.2
+          securityContext:
+            allowPrivilegeEscalation: false
+            capabilities:
+              drop: ["ALL"]
           command:
           - sh
           args:
diff --git a/packages/system/seaweedfs/templates/naming-guard.yaml b/packages/system/seaweedfs/templates/naming-guard.yaml
new file mode 100644
index 0000000000..a60541cb47
--- /dev/null
+++ b/packages/system/seaweedfs/templates/naming-guard.yaml
@@ -0,0 +1,154 @@
+{{- /* Naming-migration guard — the ENFORCING copy.
+
+   Before 4.31 the vendored chart named workloads after the CHART, ignoring the
+   release name, so every instance ran as `seaweedfs-*` with its data on
+   `data1-seaweedfs-volume-*`. 4.31 names them after the release; values.yaml pins
+   `fullnameOverride: seaweedfs` so an upgrade past the bump adopts the running
+   set and its volumes in place. This template stops the render instead of letting
+   Helm rename workloads away from live data, or adopt the wrong one of two sets:
+
+   - exactly the legacy generation (or nothing) — decidable, and adoption is
+     correct. Renders.
+   - exactly the release-named generation — a tenant installed fresh on 1.5.x,
+     whose data is on `data1-<release>[-seaweedfs]-volume-*`. Rendering the pinned
+     names would rename the workloads AWAY from that data. Refuses → runbook Step 2.
+   - BOTH generations — undecidable from inside a render, so it refuses rather
+     than guess. See the classification note below. → runbook Step 1, then 2/2a/3.
+
+   extra/seaweedfs carries the same classification for its own render, but that
+   render is NOT in the path of a platform upgrade: this chart reaches
+   helm-controller through an ExternalArtifact, so a platform bump upgrades the
+   `<name>-system` release directly from the new artifact without ever
+   re-rendering extra/seaweedfs. The only render guaranteed to sit between a
+   platform upgrade and the tenant's workloads is THIS one. (v1.6 regression:
+   the guard lived only in extra/seaweedfs, so upgrading a fresh-1.5.x tenant
+   created an empty chart-named set beside its live data.)
+
+   Fail-closed: `lookup` errors abort the render (Helm propagates API errors),
+   but a client-side render (`helm template`, --dry-run=client) silently returns
+   nothing. The release namespace itself is used as a canary: it always exists
+   for any real install/upgrade, so an empty canary means the render cannot see
+   the cluster — refuse on upgrade rather than misclassify, and skip the guard
+   for client-side installs (CI lint/unittest), which never touch live data. */}}
+
+{{- /* The classification below and the whole adoption scheme assume chart-based
+   workload names. Refuse to render at all if the pin is ever lifted. */}}
+{{- if ne (dig "fullnameOverride" "" (.Values.seaweedfs | default dict)) "seaweedfs" }}
+{{-   fail (printf "system/seaweedfs must pin seaweedfs.fullnameOverride=seaweedfs (got %q): workload adoption across the 4.31 rename and the naming-migration guard are both built on chart-based names. Do not lift the pin without a data-migration plan." (dig "fullnameOverride" "" (.Values.seaweedfs | default dict))) }}
+{{- end }}
+
+{{- $canary := lookup "v1" "Namespace" "" .Release.Namespace }}
+{{- if and (not $canary) .Release.IsUpgrade }}
+{{-   fail (printf "SeaweedFS naming-migration guard for release %s in namespace %s: cannot see the cluster (lookup returned nothing for the release namespace itself). This render decides whether workloads are renamed away from live data, so refusing to upgrade blind. Renders applied by helm-controller always see the cluster; if templating by hand, render server-side." .Release.Name .Release.Namespace) }}
+{{- end }}
+{{- if $canary }}
+
+{{- /* Two naming GENERATIONS can exist in a namespace:
+     legacy — the pre-4.31 chart-based names (`seaweedfs-volume[-<key>]`,
+              `data1-seaweedfs-volume[-<key>]-N`), which this chart pins and renders;
+     system — the 4.31 release-based names (`<release>[-seaweedfs]-volume`,
+              `data1-<release>[-seaweedfs]-volume-N`).
+
+   The release-named generation is matched by RECONSTRUCTING the name 4.31 would
+   give this release's volume component, and the chart-named one by the pinned
+   name — release-named checked FIRST, because the two prefixes can nest.
+   Overlapping prefixes alone are not safe: for an instance legitimately named
+   `seaweedfs-volume`, the release-named StatefulSet `seaweedfs-volume-system-volume`
+   and claim `data1-seaweedfs-volume-system-volume-0` BOTH satisfy the chart-named
+   prefixes, so a prefix-only guard reads live release-named storage as legacy and
+   renders onto the empty chart-named claims, stranding the real generation.
+
+   Reconstructing also removes the blind spot a name match alone has: 4.31's
+   componentName truncates the fullname to 56 chars before appending `-volume`, so
+   an instance name >= ~40 chars loses `seaweedfs` from its claim names and a
+   `contains "seaweedfs"` filter cannot see them. The reconstructed prefix carries
+   the same truncation, so it matches those claims exactly.
+
+   PVCs hold the data and outlive any workload but carry no chart labels, so they
+   are matched on name alone. StatefulSets DO carry the labels, and are the only
+   signal for a tenant whose PVCs are not provisioned yet. Either establishes a
+   generation's presence, so the two are OR-ed. */}}
+{{- /* This chart IS the `<name>-system` release, so its own release name is what
+   4.31 named the renamed generation after. extra/seaweedfs is the `<name>` release
+   and derives the child instead; that one line is the only difference between the
+   two copies of the block below. */}}
+{{- $sysRelease := .Release.Name }}
+{{- $renamedVol := include "seaweedfs.renamedVolumePrefix" $sysRelease }}
+{{- $legacyPVC := false }}
+{{- $systemPVC := false }}
+{{- $legacySTS := false }}
+{{- $systemSTS := false }}
+{{- range (lookup "v1" "PersistentVolumeClaim" .Release.Namespace "").items | default list }}
+{{-   if hasPrefix (printf "data1-%s" $renamedVol) .metadata.name }}
+{{-     $systemPVC = true }}
+{{-   else if hasPrefix "data1-seaweedfs-volume" .metadata.name }}
+{{-     $legacyPVC = true }}
+{{-   end }}
+{{- end }}
+{{- range (lookup "apps/v1" "StatefulSet" .Release.Namespace "").items | default list }}
+{{-   if eq (dig "app.kubernetes.io/name" "" (.metadata.labels | default dict)) "seaweedfs" }}
+{{-     if hasPrefix $renamedVol .metadata.name }}
+{{-       $systemSTS = true }}
+{{-     else if hasPrefix "seaweedfs-volume" .metadata.name }}
+{{-       $legacySTS = true }}
+{{-     end }}
+{{-   end }}
+{{- end }}
+{{- $legacyGen := or $legacyPVC $legacySTS }}
+{{- $systemGen := or $systemPVC $systemSTS }}
+
+{{- /* Exactly one generation is decidable; two is not.
+
+   This guard used to try to tell the cases apart by comparing PVC creation
+   timestamps — older generation wins, because "PVCs are never recreated in
+   place". That premise is false, and the runbook itself is the counter-example:
+   Step 2's re-bind DELETES each release-named claim and re-creates it under the
+   chart name against the same PV. A tenant interrupted part-way through that
+   loop has a chart-named claim created SECONDS ago holding real data, beside a
+   release-named claim with the original timestamp also holding real data — the
+   exact inversion of the rule. The guard then reported S-damaged and sent the
+   operator to a step that deletes the claim Step 2 had just re-bound.
+
+   A durable signal for BIRTH ORDER does exist, and it is worth naming so nobody
+   re-derives the broken one: the release history. `sh.helm.release.v1.<name>-
+   system.v1` records the naming scheme the tenant was installed under (its
+   manifest names either `seaweedfs-master` or `<release>-master`), and
+   `info.first_deployed` — present on every retained revision, so it survives
+   history pruning — anchors the PV creationTimestamps that Step 2's re-bind
+   preserves. On the upgrade stand that classifies every tenant correctly,
+   including reporting "no duplicate, mid-rebind" for the interrupted-Step-2 case,
+   because there BOTH generations sit at first_deployed.
+
+   This render still cannot read it — the release is base64(gzip(json)) in a
+   Secret and Go templates have no gunzip — but that is NOT the reason the guard
+   refuses. Birth order is the wrong question. It says which generation is
+   ORIGINAL; adoption needs to know whether the OTHER one is EMPTY, and those come
+   apart exactly where it matters:
+
+     D-wedged  — duplicate never scheduled, holds nothing  -> adopting is safe
+     D-split   — duplicate served writes, holds unique objects -> adopting strands them
+
+   Both are born pre-4.31, so the history signal is IDENTICAL for both (verified:
+   tenant-root and tenant-dsplit have the same rev-1 scheme and the same
+   first_deployed deltas — ~10s legacy vs ~35min release-named — yet one duplicate
+   served and the other did not). The only thing that separated them was
+   readyReplicas, which is a snapshot and not evidence: a duplicate that crashed,
+   was scaled down, or lost readiness after serving reads exactly like one that
+   never started.
+
+   So this render does not guess. Two generations => refuse, and let an operator
+   establish emptiness with context the template does not have (the duplicate's
+   volume files, the filer's volume list). Once the empty generation is gone
+   exactly one remains, which IS decidable, and the render proceeds on its own.
+
+   The cost is bounded: a duplicate only exists on a tenant that passed through
+   the broken 4.31 rename in 1.5.x, i.e. one that is already damaged and already
+   needs an operator. A 1.4.x tenant upgrading straight to 1.6 never renames, so
+   it only ever has the legacy generation and renders untouched. */}}
+{{- if and $legacyGen $systemGen }}
+{{-   fail (printf "SeaweedFS release %s in namespace %s has BOTH naming generations present: the chart-named set (seaweedfs-volume / data1-seaweedfs-volume-*) AND the release-named set this chart no longer uses. One of them is an empty duplicate and one holds the data, and which is which cannot be established from inside a Helm render — claim timestamps are mutable (the Step 2 re-bind recreates claims), StatefulSets are recreated by the adoption hook, and a duplicate with zero ready replicas may still have served writes. Rendering would adopt the chart-named set, so guessing wrong strands or destroys the data. Refusing instead. Classify the tenant and delete the EMPTY generation so exactly one remains — this render then adopts the survivor with no further action. See docs/operations/seaweedfs-431-rename-recovery.md (Step 1 classifies; Step 2/2a/3 recover). If you are part-way through Step 2's re-bind, finish it." .Release.Name .Release.Namespace) }}
+{{- else if $systemGen }}
+{{-   fail (printf "SeaweedFS release %s in namespace %s keeps its data on volumes named after the Helm release — a tenant installed fresh on Cozystack 1.5.x (or one whose instance name is long enough that the chart truncated the volume PVC names, leaving only its StatefulSets to match on). This chart pins the pre-4.31 chart-based names, so rendering would rename the workloads away from that data and stand up an empty cluster beside it. Helm cannot move data between PVCs. Re-bind the existing PVs onto the data1-seaweedfs-volume-* PVC names first — docs/operations/seaweedfs-431-rename-recovery.md (Step 2)." .Release.Name .Release.Namespace) }}
+{{- end }}
+
+{{- end }}
diff --git a/packages/system/seaweedfs/tests/alerts_test.yaml b/packages/system/seaweedfs/tests/alerts_test.yaml
new file mode 100644
index 0000000000..27d6d39e30
--- /dev/null
+++ b/packages/system/seaweedfs/tests/alerts_test.yaml
@@ -0,0 +1,58 @@
+suite: seaweedfs capacity alerts
+
+templates:
+  - templates/alerts.yaml
+
+release:
+  name: seaweedfs-system
+  namespace: tenant-foo
+
+tests:
+  # The root vmalert loads every instance's rules and evaluates each against
+  # every namespace, so a selector that loses its namespace turns one full
+  # instance into an alert from every instance. Each rule is pinned on its own.
+  - it: scopes every rule to the release namespace
+    asserts:
+      - matchRegex:
+          path: spec.groups[0].rules[0].expr
+          pattern: '(?s)^[^{]*\{namespace="tenant-foo", type="avail"\}.*\{namespace="tenant-foo", type="all"\}'
+      - matchRegex:
+          path: spec.groups[0].rules[1].expr
+          pattern: '(?s)\{namespace="tenant-foo", type="avail"\} == 0.*max_volumes\{namespace="tenant-foo"\}.*volumes\{namespace="tenant-foo", type="volume"\}'
+      - matchRegex:
+          path: spec.groups[0].rules[2].expr
+          pattern: 'pick_for_write_error\{namespace="tenant-foo"\}'
+
+  # A server can move from one arm of the "full" rule to the other while it
+  # stays full; if the arms carried different label sets, the alert would
+  # resolve and restart its hold at that moment.
+  - it: gives both arms of the full-server rule the same labels
+    asserts:
+      - matchRegex:
+          path: spec.groups[0].rules[1].expr
+          pattern: '(?s)^max by \(namespace, pod\) \(SeaweedFS_volumeServer_resource\{[^}]*\} == 0\)\s+or on \(namespace, pod\)\s+\(\s+SeaweedFS_volumeServer_max_volumes\{[^}]*\}\s+- on \(namespace, pod\)\s+sum by \(namespace, pod\)'
+
+  - it: pages only on writes that keep failing, not on a single failed pick
+    asserts:
+      - equal:
+          path: spec.groups[0].rules[2].alert
+          value: SeaweedFSWritesFailing
+      - equal:
+          path: spec.groups[0].rules[2].for
+          value: 15m
+      - equal:
+          path: spec.groups[0].rules[2].labels.severity
+          value: critical
+
+  - it: leaves alert templating to vmalert
+    asserts:
+      - matchRegex:
+          path: spec.groups[0].rules[1].annotations.description
+          pattern: '^Volume server \{\{ \$labels\.pod \}\} in Namespace \{\{ \$labels\.namespace \}\}'
+
+  - it: renders nothing when the instance is not monitored
+    set:
+      global.seaweedfs.monitoring.enabled: false
+    asserts:
+      - hasDocuments:
+          count: 0
diff --git a/packages/system/seaweedfs/tests/cluster_scoped_names_test.yaml b/packages/system/seaweedfs/tests/cluster_scoped_names_test.yaml
new file mode 100644
index 0000000000..1bc8650e14
--- /dev/null
+++ b/packages/system/seaweedfs/tests/cluster_scoped_names_test.yaml
@@ -0,0 +1,139 @@
+suite: seaweedfs cluster-scoped RBAC names stay unique per tenant
+
+# ClusterRoles and ClusterRoleBindings are CLUSTER-scoped: exactly one object can
+# carry a given name, cluster-wide. Every SeaweedFS instance pins the same
+# `fullnameOverride: seaweedfs` (#3282 — that pin is what adopts the running
+# NAMESPACED workloads across the 4.31 rename), so `seaweedfs.fullname` is
+# identical in every tenant and must never name a cluster-scoped object.
+#
+# Upstream 4.31 switched these four names from global.serviceAccountName (which
+# Cozystack sets per namespace) to seaweedfs.fullname, which is how five tenants
+# ended up fighting over ONE ClusterRole. patches/cluster-scoped-names-per-
+# namespace.patch puts them back on the service account name, restoring the
+# pre-4.31 names byte-for-byte.
+#
+# These assertions fail on unpatched code: it renders `seaweedfs-*` for every
+# namespace, so the two namespaces below produce the SAME name instead of two.
+
+templates:
+  - charts/seaweedfs/templates/cosi/cosi-cluster-role.yaml
+  - charts/seaweedfs/templates/shared/cluster-role.yaml
+
+release:
+  name: seaweedfs-system
+  namespace: tenant-root
+
+tests:
+  - it: names the COSI ClusterRole/Binding after the per-namespace service account
+    template: charts/seaweedfs/templates/cosi/cosi-cluster-role.yaml
+    set:
+      global.seaweedfs.serviceAccountName: tenant-root-seaweedfs
+    asserts:
+      # ClusterRole — pre-4.31 name, restored.
+      - equal:
+          path: metadata.name
+          value: tenant-root-seaweedfs-objectstorage-provisioner
+        documentIndex: 0
+      # ClusterRoleBinding — same name, and its roleRef must follow the rename or
+      # the binding would point at another tenant's ClusterRole.
+      - equal:
+          path: metadata.name
+          value: tenant-root-seaweedfs-objectstorage-provisioner
+        documentIndex: 1
+      - equal:
+          path: roleRef.name
+          value: tenant-root-seaweedfs-objectstorage-provisioner
+        documentIndex: 1
+      # The subject was ALREADY per-namespace (cosi-provisioner-sa-name.patch);
+      # it is what the cluster-scoped names are now aligned with.
+      - equal:
+          path: subjects[0].name
+          value: tenant-root-seaweedfs-objectstorage-provisioner
+        documentIndex: 1
+      - equal:
+          path: subjects[0].namespace
+          value: tenant-root
+        documentIndex: 1
+
+  - it: names the master-rw ClusterRole/Binding after the per-namespace service account
+    template: charts/seaweedfs/templates/shared/cluster-role.yaml
+    set:
+      global.seaweedfs.serviceAccountName: tenant-root-seaweedfs
+    asserts:
+      - equal:
+          path: metadata.name
+          value: tenant-root-seaweedfs-rw-cr
+        documentIndex: 0
+      - equal:
+          path: metadata.name
+          value: tenant-root-seaweedfs-rw-crb
+        documentIndex: 1
+      - equal:
+          path: roleRef.name
+          value: tenant-root-seaweedfs-rw-cr
+        documentIndex: 1
+      - equal:
+          path: subjects[0].name
+          value: tenant-root-seaweedfs
+        documentIndex: 1
+
+  # THE regression test. A second tenant, running an instance under a DIFFERENT
+  # name (`foo` -> release foo-system), must not collide with tenant-root above.
+  # Unpatched, both render `seaweedfs-objectstorage-provisioner` / `seaweedfs-rw-cr`
+  # — observed live as one ClusterRole annotated to a single owning tenant while
+  # four others silently lost their COSI RBAC.
+  - it: renders a different cluster-scoped name for a different tenant (collision regression)
+    template: charts/seaweedfs/templates/cosi/cosi-cluster-role.yaml
+    release:
+      name: foo-system
+      namespace: tenant-named
+    set:
+      global.seaweedfs.serviceAccountName: tenant-named-seaweedfs
+    asserts:
+      - equal:
+          path: metadata.name
+          value: tenant-named-seaweedfs-objectstorage-provisioner
+        documentIndex: 0
+      - equal:
+          path: metadata.name
+          value: tenant-named-seaweedfs-objectstorage-provisioner
+        documentIndex: 1
+      - equal:
+          path: roleRef.name
+          value: tenant-named-seaweedfs-objectstorage-provisioner
+        documentIndex: 1
+
+  - it: renders a different master-rw name for a different tenant (collision regression)
+    template: charts/seaweedfs/templates/shared/cluster-role.yaml
+    release:
+      name: foo-system
+      namespace: tenant-named
+    set:
+      global.seaweedfs.serviceAccountName: tenant-named-seaweedfs
+    asserts:
+      - equal:
+          path: metadata.name
+          value: tenant-named-seaweedfs-rw-cr
+        documentIndex: 0
+      - equal:
+          path: metadata.name
+          value: tenant-named-seaweedfs-rw-crb
+        documentIndex: 1
+
+  # The pin must NOT leak into cluster-scoped names, and must NOT be lifted from
+  # namespaced ones. Guards the two halves against each other.
+  - it: keeps the cluster-scoped name independent of the pinned fullname
+    template: charts/seaweedfs/templates/cosi/cosi-cluster-role.yaml
+    documentSelector:
+      path: kind
+      value: ClusterRole
+    set:
+      global.seaweedfs.serviceAccountName: tenant-root-seaweedfs
+      seaweedfs.fullnameOverride: seaweedfs
+    asserts:
+      - notMatchRegex:
+          path: metadata.name
+          pattern: "^seaweedfs-"
+      - notMatchRegex:
+          path: metadata.name
+          pattern: "^seaweedfs-system-"
diff --git a/packages/system/seaweedfs/tests/cluster_scoped_rbac_guard_test.yaml b/packages/system/seaweedfs/tests/cluster_scoped_rbac_guard_test.yaml
new file mode 100644
index 0000000000..dd8aeb29a7
--- /dev/null
+++ b/packages/system/seaweedfs/tests/cluster_scoped_rbac_guard_test.yaml
@@ -0,0 +1,177 @@
+suite: seaweedfs cluster-scoped RBAC uniqueness guard
+
+# Companion to cluster_scoped_names_test.yaml: that suite pins the NAMES the
+# chart renders, this one pins the guard that refuses when those names would not
+# be unique per tenant.
+#
+# The guard reads global.seaweedfs.serviceAccountName and requires it to carry
+# the release namespace, because the pinned fullname is identical in every tenant
+# and so cannot be what distinguishes a cluster-scoped object. It runs only when
+# the render can see the cluster (namespace canary, same as naming-guard.yaml) —
+# system/seaweedfs's values.yaml default is a placeholder that only
+# extra/seaweedfs overrides per release, so a client-side render must not trip.
+
+templates:
+  - templates/cluster-scoped-rbac-guard.yaml
+
+release:
+  name: seaweedfs-system
+  namespace: tenant-fresh
+
+tests:
+  - it: renders for a client-side install with no cluster view (CI lint, unittest)
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  - it: renders when the cluster-scoped RBAC name carries the namespace
+    set:
+      global:
+        seaweedfs:
+          serviceAccountName: tenant-fresh-seaweedfs
+    kubernetesProvider:
+      scheme: &scheme
+        "v1/Namespace":
+          gvr:
+            group: ""
+            version: "v1"
+            resource: "namespaces"
+          namespaced: false
+      objects:
+        - &ns
+          kind: Namespace
+          apiVersion: v1
+          metadata:
+            name: tenant-fresh
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  # M2 REGRESSION — the compat shim. Production does NOT set the canonical
+  # global.seaweedfs.serviceAccountName that the other cases here use:
+  # extra/seaweedfs sets the OLD FLAT key global.serviceAccountName, which only
+  # `include "seaweedfs.compat"` folds into the canonical path (and the flat key
+  # wins when present). Without that include the guard reads this chart's
+  # placeholder default and refuses EVERY real upgrade on EVERY cluster — a bug
+  # that only `helm upgrade --dry-run=server` caught, because every mock set the
+  # canonical key. This case sets the key production actually sets.
+  - it: accepts the flat global.serviceAccountName that extra/seaweedfs actually sets
+    set:
+      global:
+        serviceAccountName: tenant-fresh-seaweedfs
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - *ns
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  # The shim must not become a way to bypass the guard: a flat key that is not
+  # per-namespace is still refused.
+  - it: refuses a flat global.serviceAccountName that is not per-namespace
+    set:
+      global:
+        serviceAccountName: seaweedfs
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - *ns
+    asserts:
+      - failedTemplate:
+          errorPattern: "not unique per tenant"
+
+  # A substring match accepts `tenant-ab-seaweedfs` for namespace `tenant-a`; a
+  # prefix match still accepts `tenant-a-b-seaweedfs`, which is ALSO the natural
+  # value for namespace `tenant-a-b` — so two namespaces would accept one string
+  # and collide on the object this guard exists to keep unique. Only equality with
+  # `<namespace>-seaweedfs` — the value extra/seaweedfs actually sets — is safe.
+  - it: refuses a service account from a namespace that only shares a prefix
+    release:
+      name: seaweedfs-system
+      namespace: tenant-a
+    set:
+      global:
+        seaweedfs:
+          serviceAccountName: tenant-ab-seaweedfs
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - kind: Namespace
+          apiVersion: v1
+          metadata:
+            name: tenant-a
+    asserts:
+      - failedTemplate:
+          errorPattern: "not unique per tenant"
+
+  # The prefix variant: `tenant-a-b-seaweedfs` starts with `tenant-a-` but belongs
+  # to namespace tenant-a-b. hasPrefix passes this; equality does not.
+  - it: refuses a service account whose namespace merely extends this one
+    release:
+      name: seaweedfs-system
+      namespace: tenant-a
+    set:
+      global:
+        seaweedfs:
+          serviceAccountName: tenant-a-b-seaweedfs
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - kind: Namespace
+          apiVersion: v1
+          metadata:
+            name: tenant-a
+    asserts:
+      - failedTemplate:
+          errorPattern: "not unique per tenant"
+
+  # The regression this guard exists for: the bare chart default (or any value
+  # that is the same string in every tenant) collides cluster-wide.
+  - it: refuses when the RBAC name would be identical in every tenant
+    set:
+      global:
+        seaweedfs:
+          serviceAccountName: seaweedfs
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - *ns
+    asserts:
+      - failedTemplate:
+          errorPattern: "not unique per tenant"
+
+  # The placeholder shipped in system/seaweedfs/values.yaml is namespace-shaped
+  # but belongs to no real namespace — it must not be mistaken for a valid value
+  # once the render can see the cluster.
+  - it: refuses when the value is the shipped placeholder, not this namespace
+    set:
+      global:
+        seaweedfs:
+          serviceAccountName: tenant-foo-seaweedfs
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - *ns
+    asserts:
+      - failedTemplate:
+          errorPattern: "not unique per tenant"
+
+  - it: refuses for a non-default instance name whose SA is not per-namespace
+    release:
+      name: foo-system
+      namespace: tenant-named
+    set:
+      global:
+        seaweedfs:
+          serviceAccountName: seaweedfs
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - kind: Namespace
+          apiVersion: v1
+          metadata:
+            name: tenant-named
+    asserts:
+      - failedTemplate:
+          errorPattern: "not unique per tenant"
diff --git a/packages/system/seaweedfs/tests/cosi_image_test.yaml b/packages/system/seaweedfs/tests/cosi_image_test.yaml
new file mode 100644
index 0000000000..7840d200de
--- /dev/null
+++ b/packages/system/seaweedfs/tests/cosi_image_test.yaml
@@ -0,0 +1,38 @@
+suite: seaweedfs COSI driver image pin
+
+# Pins the COSI driver image to a release that enforces read-only bucket access.
+#
+# The vendored chart default is seaweedfs-cosi-driver v0.1.2 (see
+# charts/seaweedfs/values.yaml), which hardcodes read-write S3 actions for every
+# BucketAccess and ignores the accessPolicy parameter. The chart ships a
+# -readonly BucketAccessClass with parameters.accessPolicy: readonly, so on
+# v0.1.2 a credential meant to be read-only is silently granted read-write.
+# The package values.yaml overrides cosi.image to v0.3.1, which honours
+# accessPolicy: readonly.
+#
+# This test does not set the image itself; it relies on the package values.yaml
+# override, so it goes red if that override is removed and the image falls back
+# to the vulnerable v0.1.2 — turning a silent security regression into a build
+# failure. Note: `make update` re-vendors charts/ and resets the vendored
+# default to v0.1.2 but does not touch the package values.yaml, so the override
+# (and this guard) must be preserved across any re-vendor.
+
+templates:
+  - charts/seaweedfs/templates/cosi/cosi-deployment.yaml
+
+release:
+  name: seaweedfs
+  namespace: cozy-seaweedfs
+
+tests:
+  - it: pins the cosi-driver container to v0.3.1 (read-only access enforcement)
+    template: charts/seaweedfs/templates/cosi/cosi-deployment.yaml
+    set:
+      seaweedfs.cosi.enabled: true
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].name
+          value: seaweedfs-cosi-driver
+      - equal:
+          path: spec.template.spec.containers[0].image
+          value: ghcr.io/seaweedfs/seaweedfs-cosi-driver:v0.3.1
diff --git a/packages/system/seaweedfs/tests/fullname_override_test.yaml b/packages/system/seaweedfs/tests/fullname_override_test.yaml
new file mode 100644
index 0000000000..545e949b55
--- /dev/null
+++ b/packages/system/seaweedfs/tests/fullname_override_test.yaml
@@ -0,0 +1,62 @@
+suite: seaweedfs workload naming is pinned to the chart name
+
+# Upstream chart 4.31 names workloads after the Helm release (`seaweedfs.fullname`)
+# instead of after the chart (`seaweedfs.name`, pre-4.31). The shipped release is
+# `seaweedfs-system`, so the bump silently renamed every StatefulSet/Deployment to
+# `seaweedfs-system-*`. Those names are immutable, so an upgrade cannot rename in
+# place — Helm brings up a second, duplicate set beside the running one while the
+# data stays on the original `data1-seaweedfs-volume-*` PVCs.
+#
+# values.yaml pins `fullnameOverride: seaweedfs` so the rendered names stay
+# chart-based regardless of the release name, matching the convention already used
+# by other system packages (cozy-proxy, flux-operator, linstor-scheduler, ...).
+# These tests pin that contract: names must NOT follow the release name.
+
+release:
+  name: seaweedfs-system
+  namespace: tenant-root
+
+tests:
+  - it: names the master StatefulSet after the chart, not the release
+    template: charts/seaweedfs/templates/master/master-statefulset.yaml
+    asserts:
+      - equal:
+          path: metadata.name
+          value: seaweedfs-master
+      - equal:
+          path: spec.serviceName
+          value: seaweedfs-master
+
+  - it: names the volume StatefulSet after the chart, so its data PVCs keep the legacy names
+    template: charts/seaweedfs/templates/volume/volume-statefulset.yaml
+    asserts:
+      - equal:
+          path: metadata.name
+          value: seaweedfs-volume
+      # Together with the StatefulSet name this yields data1-seaweedfs-volume-N —
+      # the PVC names the running clusters already hold their data on.
+      - equal:
+          path: spec.volumeClaimTemplates[0].metadata.name
+          value: data1
+
+  - it: names the filer StatefulSet after the chart
+    template: charts/seaweedfs/templates/filer/filer-statefulset.yaml
+    asserts:
+      - equal:
+          path: metadata.name
+          value: seaweedfs-filer
+
+  - it: keeps the selector labels release-scoped so adopted pods keep matching
+    template: charts/seaweedfs/templates/master/master-statefulset.yaml
+    asserts:
+      # A StatefulSet selector is immutable: in-place adoption only works because
+      # 4.31 left these labels identical to 4.05.
+      - equal:
+          path: spec.selector.matchLabels["app.kubernetes.io/name"]
+          value: seaweedfs
+      - equal:
+          path: spec.selector.matchLabels["app.kubernetes.io/instance"]
+          value: seaweedfs-system
+      - equal:
+          path: spec.selector.matchLabels["app.kubernetes.io/component"]
+          value: master
diff --git a/packages/system/seaweedfs/tests/hook_securitycontext_test.yaml b/packages/system/seaweedfs/tests/hook_securitycontext_test.yaml
new file mode 100644
index 0000000000..f8aa4fb49a
--- /dev/null
+++ b/packages/system/seaweedfs/tests/hook_securitycontext_test.yaml
@@ -0,0 +1,30 @@
+suite: seaweedfs update-hook runs non-root
+
+# The update-hook Job runs kubectl from docker.io/alpine/k8s. kubectl needs no
+# root, so pin a restrictive non-root securityContext (mirroring the dashboard
+# adopt hook, uid 65534) and guard against it regressing back to running as root.
+release:
+  name: seaweedfs
+  namespace: cozy-seaweedfs
+tests:
+  - it: update-hook Job runs under a restrictive non-root securityContext
+    template: templates/hook.yaml
+    documentSelector:
+      path: kind
+      value: Job
+    asserts:
+      - equal:
+          path: spec.template.spec.securityContext.runAsNonRoot
+          value: true
+      - equal:
+          path: spec.template.spec.securityContext.runAsUser
+          value: 65534
+      - equal:
+          path: spec.template.spec.securityContext.seccompProfile.type
+          value: RuntimeDefault
+      - equal:
+          path: spec.template.spec.containers[0].securityContext.allowPrivilegeEscalation
+          value: false
+      - contains:
+          path: spec.template.spec.containers[0].securityContext.capabilities.drop
+          content: ALL
diff --git a/packages/system/seaweedfs/tests/image_test.yaml b/packages/system/seaweedfs/tests/image_test.yaml
new file mode 100644
index 0000000000..e9532497ac
--- /dev/null
+++ b/packages/system/seaweedfs/tests/image_test.yaml
@@ -0,0 +1,39 @@
+suite: seaweedfs image
+
+# Every SeaweedFS component must run the in-tree build from images/seaweedfs,
+# which carries the patches in images/seaweedfs/patches. The vendored chart
+# falls back to chrislusf/seaweedfs at its appVersion when the image keys are
+# unset, and that is the unpatched upstream binary. The reference must carry a
+# digest, as every first-party reference does (docs/agents/image-refs.md).
+
+templates:
+  - charts/seaweedfs/templates/master/master-statefulset.yaml
+  - charts/seaweedfs/templates/volume/volume-statefulset.yaml
+  - charts/seaweedfs/templates/filer/filer-statefulset.yaml
+  - charts/seaweedfs/templates/s3/s3-deployment.yaml
+  # filer-statefulset includes it for its checksum annotation.
+  - charts/seaweedfs/templates/s3/s3-secret.yaml
+
+release:
+  name: seaweedfs
+  namespace: cozy-seaweedfs
+
+tests:
+  - it: runs the in-tree image in the master
+    template: charts/seaweedfs/templates/master/master-statefulset.yaml
+    asserts: &inTreeImage
+      - matchRegex:
+          path: spec.template.spec.containers[0].image
+          pattern: ^ghcr\.io/cozystack/cozystack/seaweedfs:[^@]+@sha256:[0-9a-f]{64}$
+
+  - it: runs the in-tree image in the volume servers
+    template: charts/seaweedfs/templates/volume/volume-statefulset.yaml
+    asserts: *inTreeImage
+
+  - it: runs the in-tree image in the filer
+    template: charts/seaweedfs/templates/filer/filer-statefulset.yaml
+    asserts: *inTreeImage
+
+  - it: runs the in-tree image in the S3 gateway
+    template: charts/seaweedfs/templates/s3/s3-deployment.yaml
+    asserts: *inTreeImage
diff --git a/packages/system/seaweedfs/tests/master_affinity_test.yaml b/packages/system/seaweedfs/tests/master_affinity_test.yaml
new file mode 100644
index 0000000000..8fd4eaba5d
--- /dev/null
+++ b/packages/system/seaweedfs/tests/master_affinity_test.yaml
@@ -0,0 +1,33 @@
+suite: seaweedfs master anti-affinity
+
+# Pins the master anti-affinity override that keeps the 3-replica master
+# StatefulSet schedulable on clusters with fewer than three nodes. The upstream
+# subchart ships a HARD hostname anti-affinity
+# (requiredDuringSchedulingIgnoredDuringExecution); with three replicas that
+# leaves the surplus master Pods Pending forever on a single- or dual-node
+# cluster, so `helm install --wait` never returns. The overlay softens it to a
+# strong preference (weight 100) so the masters still spread across distinct
+# nodes when the cluster has them. This guards against a subchart bump silently
+# re-hardening the term back to required.
+
+templates:
+  - charts/seaweedfs/templates/master/master-statefulset.yaml
+
+release:
+  name: seaweedfs
+  namespace: cozy-seaweedfs
+
+tests:
+  - it: softens the master hostname anti-affinity to a preference
+    asserts:
+      - notExists:
+          path: spec.template.spec.affinity.podAntiAffinity.requiredDuringSchedulingIgnoredDuringExecution
+      - equal:
+          path: spec.template.spec.affinity.podAntiAffinity.preferredDuringSchedulingIgnoredDuringExecution[0].weight
+          value: 100
+      - equal:
+          path: spec.template.spec.affinity.podAntiAffinity.preferredDuringSchedulingIgnoredDuringExecution[0].podAffinityTerm.topologyKey
+          value: kubernetes.io/hostname
+      - equal:
+          path: spec.template.spec.affinity.podAntiAffinity.preferredDuringSchedulingIgnoredDuringExecution[0].podAffinityTerm.labelSelector.matchLabels["app.kubernetes.io/component"]
+          value: master
diff --git a/packages/system/seaweedfs/tests/master_probe_timeout_test.yaml b/packages/system/seaweedfs/tests/master_probe_timeout_test.yaml
new file mode 100644
index 0000000000..dabcfb9630
--- /dev/null
+++ b/packages/system/seaweedfs/tests/master_probe_timeout_test.yaml
@@ -0,0 +1,64 @@
+suite: seaweedfs master probe timeouts
+
+# Pins the master probe timeout overrides that keep master-0 alive during raft
+# bootstrap. The master's /cluster/status handler calls topo.Leader(), which
+# backs off up to ~20s (MaxElapsedTime=20s) while the node has no leader in
+# view — e.g. a master that was briefly the initial raft leader then was demoted.
+# The subchart default 10s probe timeout is shorter than that worst case, so such
+# a master is liveness-killed into a permanent CrashLoop and the master
+# StatefulSet never reaches full readiness. Both probes must allow more than the
+# 20s backoff. The overlay overrides only timeoutSeconds and relies on Helm's
+# deep-merge to keep every other subchart probe field, so this also guards that
+# the merge does not drop the surrounding probe configuration.
+
+templates:
+  - charts/seaweedfs/templates/master/master-statefulset.yaml
+
+release:
+  name: seaweedfs
+  namespace: cozy-seaweedfs
+
+tests:
+  - it: raises both master probe timeouts above the cluster-status backoff
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].livenessProbe.timeoutSeconds
+          value: 30
+      - equal:
+          path: spec.template.spec.containers[0].readinessProbe.timeoutSeconds
+          value: 30
+
+  - it: preserves the other master probe fields through the deep-merge
+    asserts:
+      # liveness: only timeoutSeconds is overridden, the rest survive
+      - equal:
+          path: spec.template.spec.containers[0].livenessProbe.httpGet.path
+          value: /cluster/status
+      - equal:
+          path: spec.template.spec.containers[0].livenessProbe.failureThreshold
+          value: 4
+      - equal:
+          path: spec.template.spec.containers[0].livenessProbe.successThreshold
+          value: 1
+      - equal:
+          path: spec.template.spec.containers[0].livenessProbe.initialDelaySeconds
+          value: 20
+      - equal:
+          path: spec.template.spec.containers[0].livenessProbe.periodSeconds
+          value: 30
+      # readiness: only timeoutSeconds is overridden, the rest survive
+      - equal:
+          path: spec.template.spec.containers[0].readinessProbe.httpGet.path
+          value: /cluster/status
+      - equal:
+          path: spec.template.spec.containers[0].readinessProbe.failureThreshold
+          value: 100
+      - equal:
+          path: spec.template.spec.containers[0].readinessProbe.successThreshold
+          value: 2
+      - equal:
+          path: spec.template.spec.containers[0].readinessProbe.initialDelaySeconds
+          value: 10
+      - equal:
+          path: spec.template.spec.containers[0].readinessProbe.periodSeconds
+          value: 45
diff --git a/packages/system/seaweedfs/tests/naming_guard_test.yaml b/packages/system/seaweedfs/tests/naming_guard_test.yaml
new file mode 100644
index 0000000000..293028aca5
--- /dev/null
+++ b/packages/system/seaweedfs/tests/naming_guard_test.yaml
@@ -0,0 +1,568 @@
+suite: seaweedfs naming-migration guard (enforcing copy)
+
+# This chart is what a platform upgrade actually re-renders: the <name>-system
+# HelmRelease pulls it from a platform-managed ExternalArtifact, so bumping the
+# platform upgrades the release directly — extra/seaweedfs (which carries a
+# sibling copy of this guard for operator visibility) is NOT in that path.
+#
+# The guard decides between exactly three outcomes:
+#   legacy generation only (or nothing) -> render (adoption is correct)
+#   release-named generation only       -> refuse, class S (runbook Step 2)
+#   BOTH generations                    -> refuse, undecidable (runbook Step 1)
+#
+# It used to tell the both-generations cases apart by comparing PVC
+# creationTimestamps ("PVCs are never recreated in place, so the older generation
+# is where the data was born"). That premise is false — the runbook's own Step 2
+# re-bind DELETES each release-named claim and recreates it under the chart name
+# against the same PV — and acting on the wrong answer deletes live data. The
+# guard no longer guesses; the tests below pin that.
+#
+# The guard reads the cluster through lookup with the release namespace as its
+# canary, so classification tests register v1/Namespace + v1/PersistentVolumeClaim
+# + apps/v1/StatefulSet and include the namespace object. readyReplicas is quoted
+# ("1"/"0") because the fake client cannot deep-copy a bare Go int.
+
+templates:
+  - templates/naming-guard.yaml
+
+release:
+  name: seaweedfs-system
+  namespace: tenant-fresh
+
+tests:
+  - it: renders for a client-side install with no cluster view (CI lint, unittest)
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  # NOTE: the fail-closed refusal (client-side UPGRADE with no cluster view)
+  # cannot be modelled here — helm-unittest 1.0.3 ignores release.isUpgrade, so
+  # .Release.IsUpgrade always renders false. The chart's `make test` target
+  # covers it with a real renderer (helm template --is-upgrade).
+
+  - it: refuses to render if the fullnameOverride pin is ever lifted
+    set:
+      seaweedfs:
+        fullnameOverride: something-else
+    asserts:
+      - failedTemplate:
+          errorPattern: "must pin seaweedfs.fullnameOverride=seaweedfs"
+
+  - it: renders for a net-new tenant (namespace visible, no SeaweedFS data)
+    kubernetesProvider:
+      scheme: &scheme
+        "v1/Namespace":
+          gvr:
+            group: ""
+            version: "v1"
+            resource: "namespaces"
+          namespaced: false
+        "v1/PersistentVolumeClaim":
+          gvr:
+            group: ""
+            version: "v1"
+            resource: "persistentvolumeclaims"
+          namespaced: true
+        "apps/v1/StatefulSet":
+          gvr:
+            group: "apps"
+            version: "v1"
+            resource: "statefulsets"
+          namespaced: true
+      objects:
+        - &ns
+          kind: Namespace
+          apiVersion: v1
+          metadata:
+            name: tenant-fresh
+        - kind: PersistentVolumeClaim
+          apiVersion: v1
+          metadata:
+            name: unrelated-app-data-0
+            namespace: tenant-fresh
+        - kind: StatefulSet
+          apiVersion: apps/v1
+          metadata:
+            name: unrelated-app
+            namespace: tenant-fresh
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  - it: renders for a legacy-only tenant (data on the chart-named PVCs, adopt in place)
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - *ns
+        - kind: PersistentVolumeClaim
+          apiVersion: v1
+          metadata:
+            name: data1-seaweedfs-volume-0
+            namespace: tenant-fresh
+        - kind: StatefulSet
+          apiVersion: apps/v1
+          metadata:
+            name: seaweedfs-volume
+            namespace: tenant-fresh
+            labels:
+              app.kubernetes.io/name: seaweedfs
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  - it: refuses class S — data only on release-named volumes (fresh 1.5.x install)
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - *ns
+        - kind: PersistentVolumeClaim
+          apiVersion: v1
+          metadata:
+            name: data1-seaweedfs-system-volume-0
+            namespace: tenant-fresh
+        - kind: StatefulSet
+          apiVersion: apps/v1
+          metadata:
+            name: seaweedfs-system-volume
+            namespace: tenant-fresh
+            labels:
+              app.kubernetes.io/name: seaweedfs
+    asserts:
+      - failedTemplate:
+          errorPattern: "keeps its data on volumes named after the Helm release.*Step 2"
+
+  - it: refuses class S for a non-default instance name (foo-system release)
+    release:
+      name: foo-system
+      namespace: tenant-fresh
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - *ns
+        # 4.31 appends the chart name when the release name does not contain it:
+        # a fresh 1.5.x `foo` wrote to data1-foo-system-seaweedfs-volume-*.
+        - kind: PersistentVolumeClaim
+          apiVersion: v1
+          metadata:
+            name: data1-foo-system-seaweedfs-volume-0
+            namespace: tenant-fresh
+        # The fake client builds its list kinds from the objects present, so a
+        # suite that LISTs StatefulSets must include at least one or the lookup
+        # errors instead of returning empty.
+        - &unrelated_sts
+          kind: StatefulSet
+          apiVersion: apps/v1
+          metadata:
+            name: unrelated-app
+            namespace: tenant-fresh
+    asserts:
+      - failedTemplate:
+          errorPattern: "keeps its data on volumes named after the Helm release"
+
+  # ---------------------------------------------------------------------------
+  # Both generations present => refuse. Four shapes the old timestamp classifier
+  # routed FOUR different ways; all four get the same answer now.
+  # ---------------------------------------------------------------------------
+
+  # Old code: legacy older + duplicate live -> "D-split" (Step 3). Now: refuse.
+  - it: refuses when both generations exist and the duplicate is live (was D-split)
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - *ns
+        - kind: PersistentVolumeClaim
+          apiVersion: v1
+          metadata:
+            name: data1-seaweedfs-volume-0
+            namespace: tenant-fresh
+            creationTimestamp: "2025-11-02T10:00:00Z"
+        - kind: PersistentVolumeClaim
+          apiVersion: v1
+          metadata:
+            name: data1-seaweedfs-system-volume-0
+            namespace: tenant-fresh
+            creationTimestamp: "2026-06-20T12:00:00Z"
+        - kind: StatefulSet
+          apiVersion: apps/v1
+          metadata:
+            name: seaweedfs-system-volume
+            namespace: tenant-fresh
+            labels:
+              app.kubernetes.io/name: seaweedfs
+          status:
+            readyReplicas: "1"
+    asserts:
+      - failedTemplate:
+          errorPattern: "has BOTH naming generations present"
+
+  # B5 REGRESSION. Old code: legacy older + zero ready replicas -> "D-wedged",
+  # which rendered THROUGH and adopted. readyReplicas is only a snapshot: a
+  # duplicate that crashed, was scaled down, or lost readiness AFTER serving
+  # writes reads identically to one that never served. Adoption would strand
+  # whatever it wrote.
+  - it: refuses when both generations exist and the duplicate reads zero ready (was D-wedged, adopted)
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - *ns
+        - kind: PersistentVolumeClaim
+          apiVersion: v1
+          metadata:
+            name: data1-seaweedfs-volume-0
+            namespace: tenant-fresh
+            creationTimestamp: "2025-11-02T10:00:00Z"
+        - kind: PersistentVolumeClaim
+          apiVersion: v1
+          metadata:
+            name: data1-seaweedfs-system-volume-0
+            namespace: tenant-fresh
+            creationTimestamp: "2026-06-20T12:00:00Z"
+        - kind: StatefulSet
+          apiVersion: apps/v1
+          metadata:
+            name: seaweedfs-system-volume
+            namespace: tenant-fresh
+            labels:
+              app.kubernetes.io/name: seaweedfs
+          status:
+            readyReplicas: "0"
+        - kind: StatefulSet
+          apiVersion: apps/v1
+          metadata:
+            name: seaweedfs-volume
+            namespace: tenant-fresh
+            labels:
+              app.kubernetes.io/name: seaweedfs
+          status:
+            readyReplicas: "1"
+    asserts:
+      - failedTemplate:
+          errorPattern: "has BOTH naming generations present"
+
+  # Old code: release-named older -> "S-damaged" (Step 2a). Now: refuse.
+  - it: refuses when both generations exist and the release-named claims are older (was S-damaged)
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - *ns
+        - kind: PersistentVolumeClaim
+          apiVersion: v1
+          metadata:
+            name: data1-seaweedfs-system-volume-0
+            namespace: tenant-fresh
+            creationTimestamp: "2026-06-20T07:01:59Z"
+        - kind: PersistentVolumeClaim
+          apiVersion: v1
+          metadata:
+            name: data1-seaweedfs-volume-0
+            namespace: tenant-fresh
+            creationTimestamp: "2026-06-20T08:28:58Z"
+        - *unrelated_sts
+    asserts:
+      - failedTemplate:
+          errorPattern: "has BOTH naming generations present"
+
+  # B1 REGRESSION — the data-loss path. A tenant interrupted part-way through the
+  # runbook's Step 2 re-bind: data1-seaweedfs-volume-0 was DELETED and RECREATED
+  # against its original PV seconds ago, so it is the NEWEST claim while holding
+  # real data; data1-seaweedfs-system-volume-1 has not been re-bound yet, so it
+  # keeps the ORIGINAL timestamp and also holds real data. The old timestamp rule
+  # read "release-named older" and reported S-damaged, sending the operator to
+  # Step 2a — which deletes data1-seaweedfs-volume-*, i.e. the claim Step 2 had
+  # just re-bound, with the PV's reclaim policy already restored to Delete.
+  - it: refuses a tenant interrupted mid Step-2 re-bind rather than calling it S-damaged
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - *ns
+        # Not yet re-bound: original claim, original timestamp, real data.
+        - kind: PersistentVolumeClaim
+          apiVersion: v1
+          metadata:
+            name: data1-seaweedfs-system-volume-1
+            namespace: tenant-fresh
+            creationTimestamp: "2026-06-20T07:01:59Z"
+        # Already re-bound by Step 2: brand-new claim, ORIGINAL PV, real data.
+        - kind: PersistentVolumeClaim
+          apiVersion: v1
+          metadata:
+            name: data1-seaweedfs-volume-0
+            namespace: tenant-fresh
+            creationTimestamp: "2026-07-17T09:30:00Z"
+        - *unrelated_sts
+    asserts:
+      - failedTemplate:
+          errorPattern: "has BOTH naming generations present"
+
+  # ---------------------------------------------------------------------------
+  # B2 REGRESSION — long instance name. seaweedfs.componentName truncates the
+  # fullname to 56 chars before appending -volume, so an instance name >= ~40
+  # chars drops `seaweedfs` off the PVC name and the name match cannot see it.
+  # The StatefulSet is label-matched and still can, which is why the generation
+  # flags OR the two signals instead of keying off the PVC evidence alone.
+  # ---------------------------------------------------------------------------
+
+  - it: refuses both-generations for a long instance name whose PVC names were truncated
+    release:
+      name: archive-of-quarterly-financial-statements-x1-system
+      namespace: tenant-fresh
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - *ns
+        # The renamed volume PVC, truncated past the chart name: unmatchable.
+        - kind: PersistentVolumeClaim
+          apiVersion: v1
+          metadata:
+            name: data1-archive-of-quarterly-financial-statements-x1-system-seaw-volume-0
+            namespace: tenant-fresh
+        - kind: PersistentVolumeClaim
+          apiVersion: v1
+          metadata:
+            name: data1-seaweedfs-volume-0
+            namespace: tenant-fresh
+        # Only the label-matched StatefulSet reveals the renamed generation. Old
+        # code fell through to the D-split branch here, sending the operator to
+        # quiesce the set holding the data — the exact misclassification the
+        # parent commit exists to remove.
+        - kind: StatefulSet
+          apiVersion: apps/v1
+          metadata:
+            name: archive-of-quarterly-financial-statements-x1-system-seaw-volume
+            namespace: tenant-fresh
+            labels:
+              app.kubernetes.io/name: seaweedfs
+          status:
+            readyReplicas: "1"
+    asserts:
+      - failedTemplate:
+          errorPattern: "has BOTH naming generations present"
+
+  - it: refuses a truncated long instance name whose duplicate reads zero ready (rendered unguarded before)
+    release:
+      name: archive-of-quarterly-financial-statements-x1-system
+      namespace: tenant-fresh
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - *ns
+        - kind: PersistentVolumeClaim
+          apiVersion: v1
+          metadata:
+            name: data1-archive-of-quarterly-financial-statements-x1-system-seaw-volume-0
+            namespace: tenant-fresh
+        - kind: PersistentVolumeClaim
+          apiVersion: v1
+          metadata:
+            name: data1-seaweedfs-volume-0
+            namespace: tenant-fresh
+        # Old code: no branch fired at all here — it rendered through and adopted
+        # the empty chart-named set. Blocker fully open.
+        - kind: StatefulSet
+          apiVersion: apps/v1
+          metadata:
+            name: archive-of-quarterly-financial-statements-x1-system-seaw-volume
+            namespace: tenant-fresh
+            labels:
+              app.kubernetes.io/name: seaweedfs
+          status:
+            readyReplicas: "0"
+    asserts:
+      - failedTemplate:
+          errorPattern: "has BOTH naming generations present"
+
+  - it: refuses class S for a truncated long instance name with no legacy generation
+    release:
+      name: archive-of-quarterly-financial-statements-x1-system
+      namespace: tenant-fresh
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - *ns
+        - kind: PersistentVolumeClaim
+          apiVersion: v1
+          metadata:
+            name: data1-archive-of-quarterly-financial-statements-x1-system-seaw-volume-0
+            namespace: tenant-fresh
+        - kind: StatefulSet
+          apiVersion: apps/v1
+          metadata:
+            name: archive-of-quarterly-financial-statements-x1-system-seaw-volume
+            namespace: tenant-fresh
+            labels:
+              app.kubernetes.io/name: seaweedfs
+    asserts:
+      - failedTemplate:
+          errorPattern: "keeps its data on volumes named after the Helm release"
+
+  # ---------------------------------------------------------------------------
+  # An instance legitimately named `seaweedfs-volume`. Its release is
+  # seaweedfs-volume-system, which CONTAINS "seaweedfs", so 4.31 names its volume
+  # workloads seaweedfs-volume-system-volume and its claims
+  # data1-seaweedfs-volume-system-volume-N. Both satisfy the chart-named prefixes
+  # ("seaweedfs-volume" / "data1-seaweedfs-volume"), so a prefix-only guard reads
+  # this tenant's LIVE release-named storage as legacy, sees no release-named
+  # generation, renders, and stands an empty cluster on data1-seaweedfs-volume-*
+  # while the real data is stranded. Reconstructing the renamed prefix and testing
+  # it FIRST is what separates them.
+  # ---------------------------------------------------------------------------
+
+  - it: refuses class S for an instance named seaweedfs-volume (release-named storage is not legacy)
+    release:
+      name: seaweedfs-volume-system
+      namespace: tenant-fresh
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - *ns
+        - kind: PersistentVolumeClaim
+          apiVersion: v1
+          metadata:
+            name: data1-seaweedfs-volume-system-volume-0
+            namespace: tenant-fresh
+        - kind: StatefulSet
+          apiVersion: apps/v1
+          metadata:
+            name: seaweedfs-volume-system-volume
+            namespace: tenant-fresh
+            labels:
+              app.kubernetes.io/name: seaweedfs
+    asserts:
+      - failedTemplate:
+          errorPattern: "keeps its data on volumes named after the Helm release"
+
+  - it: refuses both-generations for an instance named seaweedfs-volume
+    release:
+      name: seaweedfs-volume-system
+      namespace: tenant-fresh
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - *ns
+        # Live release-named storage...
+        - kind: PersistentVolumeClaim
+          apiVersion: v1
+          metadata:
+            name: data1-seaweedfs-volume-system-volume-0
+            namespace: tenant-fresh
+        # ...beside a genuine chart-named duplicate.
+        - kind: PersistentVolumeClaim
+          apiVersion: v1
+          metadata:
+            name: data1-seaweedfs-volume-0
+            namespace: tenant-fresh
+        - kind: StatefulSet
+          apiVersion: apps/v1
+          metadata:
+            name: seaweedfs-volume-system-volume
+            namespace: tenant-fresh
+            labels:
+              app.kubernetes.io/name: seaweedfs
+    asserts:
+      - failedTemplate:
+          errorPattern: "has BOTH naming generations present"
+
+  # ---------------------------------------------------------------------------
+  # MultiZone (and Simple-with-pools) tenants have NO plain `volume` component —
+  # extra/seaweedfs sets volume.enabled=false and renders one component per zone
+  # key, suffix `volume-<key>`. For the supported instance (the tenant module
+  # hardcodes the name `seaweedfs`, fullname 16 chars) nothing is truncated, so
+  # the reconstructed prefix `seaweedfs-system-volume` must prefix-match every
+  # zone component. These pin that. The reconstruction does NOT cover zone
+  # components of long-named instances or ~40+ char zone keys — an accepted,
+  # documented limit (_naming.tpl, runbook Scope), deliberately not tested.
+  # ---------------------------------------------------------------------------
+
+  - it: renders for a legacy-only MultiZone tenant (zone components adopt in place)
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - *ns
+        - kind: PersistentVolumeClaim
+          apiVersion: v1
+          metadata:
+            name: data1-seaweedfs-volume-md-0
+            namespace: tenant-fresh
+        - kind: StatefulSet
+          apiVersion: apps/v1
+          metadata:
+            name: seaweedfs-volume-md
+            namespace: tenant-fresh
+            labels:
+              app.kubernetes.io/name: seaweedfs
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  - it: refuses class S for a MultiZone tenant with only zone components (fresh 1.5.x)
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - *ns
+        # No plain `volume` component exists on a MultiZone tenant — the zone
+        # objects are the ONLY release-named evidence, so if the prefix match
+        # missed them this tenant would render and be renamed away from its data.
+        - kind: PersistentVolumeClaim
+          apiVersion: v1
+          metadata:
+            name: data1-seaweedfs-system-volume-md-0
+            namespace: tenant-fresh
+        - kind: StatefulSet
+          apiVersion: apps/v1
+          metadata:
+            name: seaweedfs-system-volume-md
+            namespace: tenant-fresh
+            labels:
+              app.kubernetes.io/name: seaweedfs
+    asserts:
+      - failedTemplate:
+          errorPattern: "keeps its data on volumes named after the Helm release"
+
+  - it: refuses both-generations for a MultiZone tenant
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - *ns
+        - kind: PersistentVolumeClaim
+          apiVersion: v1
+          metadata:
+            name: data1-seaweedfs-volume-md-0
+            namespace: tenant-fresh
+        - kind: PersistentVolumeClaim
+          apiVersion: v1
+          metadata:
+            name: data1-seaweedfs-system-volume-md-0
+            namespace: tenant-fresh
+        - kind: StatefulSet
+          apiVersion: apps/v1
+          metadata:
+            name: seaweedfs-system-volume-md
+            namespace: tenant-fresh
+            labels:
+              app.kubernetes.io/name: seaweedfs
+          status:
+            readyReplicas: "0"
+    asserts:
+      - failedTemplate:
+          errorPattern: "has BOTH naming generations present"
+
+  - it: ignores unrelated data1-*-volume-* claims of other apps
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - *ns
+        - kind: PersistentVolumeClaim
+          apiVersion: v1
+          metadata:
+            name: data1-clickhouse-volume-0
+            namespace: tenant-fresh
+        - kind: StatefulSet
+          apiVersion: apps/v1
+          metadata:
+            name: clickhouse-volume
+            namespace: tenant-fresh
+            labels:
+              app.kubernetes.io/name: clickhouse
+    asserts:
+      - hasDocuments:
+          count: 0
diff --git a/packages/system/seaweedfs/tests/s3_catalog_ports_test.yaml b/packages/system/seaweedfs/tests/s3_catalog_ports_test.yaml
new file mode 100644
index 0000000000..7752e535aa
--- /dev/null
+++ b/packages/system/seaweedfs/tests/s3_catalog_ports_test.yaml
@@ -0,0 +1,94 @@
+suite: seaweedfs s3 catalog listener ports
+
+# weed s3 ships two table-catalog listeners that default to on: Lance on 9101
+# and Iceberg on 8181. Both are served over plain HTTP with no certificate
+# option (weed/command/s3.go: newHttpServer with a nil TLS config) while every
+# other port on this gateway is TLS by way of patches/s3-tls-main-port.patch,
+# and both expose writable routes. Nothing in Cozystack consumes either, so
+# values.yaml pins lancePort off and s3-iceberg-port-explicit.patch renders
+# -port.iceberg unconditionally so the chart's null default reaches weed as 0
+# rather than being dropped into weed's own 8181. These cases fail if either
+# control is lost, and the last two pin that an operator who does want a
+# catalog can still turn one on.
+
+templates:
+  - charts/seaweedfs/templates/s3/s3-service.yaml
+  - charts/seaweedfs/templates/s3/s3-deployment.yaml
+
+release:
+  name: seaweedfs
+  namespace: cozy-seaweedfs
+
+tests:
+  - it: does not publish a Lance port on the s3 Service
+    template: charts/seaweedfs/templates/s3/s3-service.yaml
+    asserts:
+      - isKind:
+          of: Service
+      - notContains:
+          path: spec.ports
+          content:
+            name: swfs-lance
+          any: true
+
+  - it: keeps the s3 Service on the pre-4.45 port set
+    template: charts/seaweedfs/templates/s3/s3-service.yaml
+    asserts:
+      - contains:
+          path: spec.ports
+          content:
+            name: swfs-s3
+          any: true
+      - contains:
+          path: spec.ports
+          content:
+            name: metrics
+          any: true
+      - lengthEqual:
+          path: spec.ports
+          count: 2
+
+  - it: tells weed to skip the Lance server
+    template: charts/seaweedfs/templates/s3/s3-deployment.yaml
+    asserts:
+      - isKind:
+          of: Deployment
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: -port\.lance=0
+
+  - it: does not expose a Lance container port
+    template: charts/seaweedfs/templates/s3/s3-deployment.yaml
+    asserts:
+      - notContains:
+          path: spec.template.spec.containers[0].ports
+          content:
+            name: swfs-lance
+          any: true
+
+  - it: tells weed to skip the Iceberg catalog too
+    template: charts/seaweedfs/templates/s3/s3-deployment.yaml
+    asserts:
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: -port\.iceberg=0
+
+  - it: still honours an explicitly configured Iceberg port
+    template: charts/seaweedfs/templates/s3/s3-deployment.yaml
+    set:
+      seaweedfs.s3.icebergPort: 8334
+    asserts:
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: -port\.iceberg=8334
+
+  - it: still honours an explicitly configured Lance port
+    template: charts/seaweedfs/templates/s3/s3-service.yaml
+    set:
+      seaweedfs.s3.lancePort: 9101
+    asserts:
+      - contains:
+          path: spec.ports
+          content:
+            name: swfs-lance
+          any: true
diff --git a/packages/system/seaweedfs/tests/s3_service_name_consumers_test.yaml b/packages/system/seaweedfs/tests/s3_service_name_consumers_test.yaml
new file mode 100644
index 0000000000..b536b7c57d
--- /dev/null
+++ b/packages/system/seaweedfs/tests/s3_service_name_consumers_test.yaml
@@ -0,0 +1,109 @@
+suite: seaweedfs s3 consumers resolve the renamed s3 service
+
+# Pins the regression where consumers of the S3 service 503 / fail to connect
+# because they still resolve a service name that no longer exists.
+#
+# The s3-service-name.patch renamed the S3 Service to `<name>-s3` (seaweedfs-s3),
+# but several consumers still resolved it via componentName -> `<fullname>-s3`:
+#   - the S3 ingress backend,
+#   - the iceberg ingress backend,
+#   - the COSI provisioner ENDPOINT (in-cluster, s3.ingress.enabled=false path).
+# name and fullname only coincide when the release name equals the chart name;
+# the shipped release is `seaweedfs-system`, so those consumers pointed at
+# `seaweedfs-system-s3` while the real service is `seaweedfs-s3`. With no
+# matching endpoints, ingress-nginx returns 503 and COSI cannot reach S3.
+#
+# values.yaml now pins fullnameOverride: seaweedfs, which makes name == fullname
+# and would hide this bug by accident. So each test re-creates the original
+# condition explicitly (fullnameOverride: seaweedfs-system => name != fullname)
+# and keeps guarding the divergence itself, independent of what the shipped
+# default happens to be. The all-in-one case documents the other ternary branch,
+# which is unchanged and correct.
+
+templates:
+  - charts/seaweedfs/templates/s3/s3-service.yaml
+  - charts/seaweedfs/templates/s3/s3-ingress.yaml
+  - charts/seaweedfs/templates/s3/s3-iceberg-ingress.yaml
+  - charts/seaweedfs/templates/cosi/cosi-deployment.yaml
+
+release:
+  name: seaweedfs-system
+  namespace: cozy-seaweedfs
+
+tests:
+  - it: s3 service is named with the name helper, not componentName
+    template: charts/seaweedfs/templates/s3/s3-service.yaml
+    set:
+      seaweedfs.fullnameOverride: seaweedfs-system
+      seaweedfs.s3.enabled: true
+    asserts:
+      - equal:
+          path: metadata.name
+          value: seaweedfs-s3
+
+  - it: s3 ingress backend points at the s3 service, not a fullname-derived name
+    template: charts/seaweedfs/templates/s3/s3-ingress.yaml
+    set:
+      seaweedfs.fullnameOverride: seaweedfs-system
+      seaweedfs.s3.enabled: true
+      seaweedfs.s3.ingress.enabled: true
+      seaweedfs.s3.ingress.host: s3.example.com
+    asserts:
+      - equal:
+          path: spec.rules[0].http.paths[0].backend.service.name
+          value: seaweedfs-s3
+
+  - it: all-in-one ingress backend still resolves to the all-in-one service
+    template: charts/seaweedfs/templates/s3/s3-ingress.yaml
+    set:
+      seaweedfs.fullnameOverride: seaweedfs-system
+      seaweedfs.allInOne.enabled: true
+      seaweedfs.allInOne.s3.enabled: true
+      seaweedfs.s3.ingress.enabled: true
+      seaweedfs.s3.ingress.host: s3.example.com
+    asserts:
+      - equal:
+          path: spec.rules[0].http.paths[0].backend.service.name
+          value: seaweedfs-system-all-in-one
+
+  - it: iceberg ingress backend points at the s3 service too
+    template: charts/seaweedfs/templates/s3/s3-iceberg-ingress.yaml
+    set:
+      seaweedfs.fullnameOverride: seaweedfs-system
+      seaweedfs.s3.enabled: true
+      seaweedfs.s3.icebergPort: 8334
+      seaweedfs.s3.icebergIngress.enabled: true
+      seaweedfs.s3.icebergIngress.host: iceberg.example.com
+    asserts:
+      - equal:
+          path: spec.rules[0].http.paths[0].backend.service.name
+          value: seaweedfs-s3
+
+  - it: COSI in-cluster ENDPOINT resolves the s3 service when ingress is disabled
+    template: charts/seaweedfs/templates/cosi/cosi-deployment.yaml
+    set:
+      seaweedfs.fullnameOverride: seaweedfs-system
+      seaweedfs.cosi.enabled: true
+      seaweedfs.s3.enabled: true
+      seaweedfs.s3.ingress.enabled: false
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: ENDPOINT
+            value: https://seaweedfs-s3.cozy-seaweedfs.svc:8333
+
+  - it: COSI in-cluster ENDPOINT (filer S3 mode) targets the s3 service on the filer s3 port
+    template: charts/seaweedfs/templates/cosi/cosi-deployment.yaml
+    set:
+      seaweedfs.fullnameOverride: seaweedfs-system
+      seaweedfs.cosi.enabled: true
+      seaweedfs.s3.enabled: false
+      seaweedfs.filer.s3.enabled: true
+      seaweedfs.s3.ingress.enabled: false
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: ENDPOINT
+            value: https://seaweedfs-s3.cozy-seaweedfs.svc:8333
diff --git a/packages/system/seaweedfs/tests/s3_tls_cosi_sa_test.yaml b/packages/system/seaweedfs/tests/s3_tls_cosi_sa_test.yaml
new file mode 100644
index 0000000000..5dfff42942
--- /dev/null
+++ b/packages/system/seaweedfs/tests/s3_tls_cosi_sa_test.yaml
@@ -0,0 +1,78 @@
+suite: seaweedfs s3 TLS on main port + COSI provisioner SA name
+
+# Pins two regressions introduced by the 4.31 chart bump:
+#
+# 1. S3 TLS. Until 4.05 the `-cert.file`/`-key.file` args were rendered whenever
+#    enableSecurity was on, so `weed s3` served TLS on the main port (8333) and
+#    our HTTPS readiness/liveness probes (and the ingress backend-protocol=HTTPS
+#    and the COSI sidecar's https:// endpoint) worked. 4.31 nested those args
+#    inside `if .Values.s3.httpsPort`, and we ship httpsPort=0, so s3 served
+#    plaintext and every probe failed with "server gave HTTP response to HTTPS
+#    client". The s3-tls-main-port.patch restores the 4.05 behaviour.
+#
+# 2. COSI provisioner ServiceAccount. cosi-service-account.yaml and the
+#    ClusterRoleBinding both name the SA <serviceAccountName>-objectstorage-provisioner,
+#    but the Deployment referenced componentName (<release>-objectstorage-provisioner).
+#    Whenever serviceAccountName != release name the Deployment could not create
+#    pods ("serviceaccount not found"). The cosi-provisioner-sa-name.patch aligns
+#    the Deployment with the SA + binding.
+
+templates:
+  - charts/seaweedfs/templates/s3/s3-deployment.yaml
+  - charts/seaweedfs/templates/cosi/cosi-deployment.yaml
+
+release:
+  name: seaweedfs
+  namespace: cozy-seaweedfs
+
+tests:
+  - it: renders s3 TLS cert/key args under enableSecurity even when httpsPort is 0
+    template: charts/seaweedfs/templates/s3/s3-deployment.yaml
+    set:
+      global.seaweedfs.enableSecurity: true
+      seaweedfs.s3.enabled: true
+      seaweedfs.s3.httpsPort: 0
+    asserts:
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: "-cert\\.file=/usr/local/share/ca-certificates/client/tls\\.crt"
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: "-key\\.file=/usr/local/share/ca-certificates/client/tls\\.key"
+      - notMatchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: "-port\\.https"
+
+  - it: still gates the cert args on enableSecurity
+    template: charts/seaweedfs/templates/s3/s3-deployment.yaml
+    set:
+      global.seaweedfs.enableSecurity: false
+      seaweedfs.s3.enabled: true
+    asserts:
+      - notMatchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: "-cert\\.file"
+
+  - it: renders -port.https alongside the cert args when httpsPort is set
+    template: charts/seaweedfs/templates/s3/s3-deployment.yaml
+    set:
+      global.seaweedfs.enableSecurity: true
+      seaweedfs.s3.enabled: true
+      seaweedfs.s3.httpsPort: 8334
+    asserts:
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: "-port\\.https=8334"
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: "-cert\\.file=/usr/local/share/ca-certificates/client/tls\\.crt"
+
+  - it: COSI provisioner Deployment uses the serviceAccountName-based SA, not componentName
+    template: charts/seaweedfs/templates/cosi/cosi-deployment.yaml
+    set:
+      seaweedfs.cosi.enabled: true
+      global.seaweedfs.serviceAccountName: custom-sa
+    asserts:
+      - equal:
+          path: spec.template.spec.serviceAccountName
+          value: custom-sa-objectstorage-provisioner
diff --git a/packages/system/seaweedfs/tests/s3_traffic_distribution_test.yaml b/packages/system/seaweedfs/tests/s3_traffic_distribution_test.yaml
new file mode 100644
index 0000000000..25d2d930c6
--- /dev/null
+++ b/packages/system/seaweedfs/tests/s3_traffic_distribution_test.yaml
@@ -0,0 +1,46 @@
+suite: seaweedfs s3 trafficDistribution
+
+# Pins the s3.trafficDistribution behaviour that replaced the former
+# s3-traffic-distribution.patch (dropped in the 4.31 bump). The native chart
+# field gates on Kubernetes >=1.31 and auto-converts PreferClose to
+# PreferSameZone on >=1.35, so this guards both the value the package sets and
+# the version-gating now relied on instead of the hardcoded patch.
+
+templates:
+  - charts/seaweedfs/templates/s3/s3-service.yaml
+
+release:
+  name: seaweedfs
+  namespace: cozy-seaweedfs
+
+tests:
+  - it: keeps PreferClose on Kubernetes 1.33
+    capabilities:
+      majorVersion: 1
+      minorVersion: 33
+    asserts:
+      - isKind:
+          of: Service
+      - equal:
+          path: spec.trafficDistribution
+          value: PreferClose
+
+  - it: auto-converts to PreferSameZone on Kubernetes 1.35
+    capabilities:
+      majorVersion: 1
+      minorVersion: 35
+    asserts:
+      - equal:
+          path: spec.trafficDistribution
+          value: PreferSameZone
+
+  - it: omits the field on Kubernetes 1.30 (below the 1.31 gate)
+    documentSelector:
+      path: kind
+      value: Service
+    capabilities:
+      majorVersion: 1
+      minorVersion: 30
+    asserts:
+      - notExists:
+          path: spec.trafficDistribution
diff --git a/packages/system/seaweedfs/tests/volume_resize_hook_test.yaml b/packages/system/seaweedfs/tests/volume_resize_hook_test.yaml
new file mode 100644
index 0000000000..4027483123
--- /dev/null
+++ b/packages/system/seaweedfs/tests/volume_resize_hook_test.yaml
@@ -0,0 +1,241 @@
+suite: seaweedfs volume resize hook
+
+# The pre-upgrade hook deletes the volume StatefulSet with --cascade=orphan and
+# then patches each PVC. Both gates normalise their sizes through
+# seaweedfs.resource-quantity: a raw string compare fires the delete on a
+# respelling, and a lexicographic gt skips the patch across a decimal exponent.
+
+templates:
+  - charts/seaweedfs/templates/volume/volume-resize-hook.yaml
+
+release:
+  name: seaweedfs
+  namespace: tenant-test
+
+tests:
+  - it: patches the PVCs when the grow crosses a decimal exponent (5Gi to 10Gi)
+    kubernetesProvider:
+      scheme: &scheme
+        "apps/v1/StatefulSet":
+          gvr:
+            group: "apps"
+            version: "v1"
+            resource: "statefulsets"
+          namespaced: true
+        "v1/PersistentVolumeClaim":
+          gvr:
+            group: ""
+            version: "v1"
+            resource: "persistentvolumeclaims"
+          namespaced: true
+      objects:
+        - kind: StatefulSet
+          apiVersion: apps/v1
+          metadata:
+            name: seaweedfs-volume
+            namespace: tenant-test
+          spec:
+            volumeClaimTemplates:
+              - metadata:
+                  name: data1
+                spec:
+                  resources:
+                    requests:
+                      storage: 5Gi
+        - kind: PersistentVolumeClaim
+          apiVersion: v1
+          metadata:
+            name: data1-seaweedfs-volume-0
+            namespace: tenant-test
+          spec:
+            resources:
+              requests:
+                storage: 5Gi
+        - kind: PersistentVolumeClaim
+          apiVersion: v1
+          metadata:
+            name: data1-seaweedfs-volume-1
+            namespace: tenant-test
+          spec:
+            resources:
+              requests:
+                storage: 5Gi
+    asserts:
+      - documentIndex: 0
+        isKind:
+          of: Job
+      - documentIndex: 0
+        matchRegex:
+          path: spec.template.spec.containers[0].args[0]
+          pattern: kubectl delete statefulset seaweedfs-volume --cascade=orphan
+      - documentIndex: 0
+        matchRegex:
+          path: spec.template.spec.containers[0].args[0]
+          pattern: kubectl patch pvc data1-seaweedfs-volume-0 .*"storage":"10Gi"
+      - documentIndex: 0
+        matchRegex:
+          path: spec.template.spec.containers[0].args[0]
+          pattern: kubectl patch pvc data1-seaweedfs-volume-1 .*"storage":"10Gi"
+
+  - it: still patches a grow that stays inside one exponent (10Gi to 20Gi)
+    set:
+      seaweedfs.volume.dataDirs:
+        - name: data1
+          type: persistentVolumeClaim
+          size: 20Gi
+          maxVolumes: 0
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - kind: StatefulSet
+          apiVersion: apps/v1
+          metadata:
+            name: seaweedfs-volume
+            namespace: tenant-test
+          spec:
+            volumeClaimTemplates:
+              - metadata:
+                  name: data1
+                spec:
+                  resources:
+                    requests:
+                      storage: 10Gi
+        - kind: PersistentVolumeClaim
+          apiVersion: v1
+          metadata:
+            name: data1-seaweedfs-volume-0
+            namespace: tenant-test
+          spec:
+            resources:
+              requests:
+                storage: 10Gi
+        - kind: PersistentVolumeClaim
+          apiVersion: v1
+          metadata:
+            name: data1-seaweedfs-volume-1
+            namespace: tenant-test
+          spec:
+            resources:
+              requests:
+                storage: 10Gi
+    asserts:
+      - documentIndex: 0
+        matchRegex:
+          path: spec.template.spec.containers[0].args[0]
+          pattern: kubectl patch pvc data1-seaweedfs-volume-0 .*"storage":"20Gi"
+
+  - it: does not shrink a PVC when the desired size is smaller
+    set:
+      seaweedfs.volume.dataDirs:
+        - name: data1
+          type: persistentVolumeClaim
+          size: 5Gi
+          maxVolumes: 0
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - kind: StatefulSet
+          apiVersion: apps/v1
+          metadata:
+            name: seaweedfs-volume
+            namespace: tenant-test
+          spec:
+            volumeClaimTemplates:
+              - metadata:
+                  name: data1
+                spec:
+                  resources:
+                    requests:
+                      storage: 10Gi
+        - kind: PersistentVolumeClaim
+          apiVersion: v1
+          metadata:
+            name: data1-seaweedfs-volume-0
+            namespace: tenant-test
+          spec:
+            resources:
+              requests:
+                storage: 10Gi
+    asserts:
+      - documentIndex: 0
+        notMatchRegex:
+          path: spec.template.spec.containers[0].args[0]
+          pattern: kubectl patch pvc
+
+  - it: does nothing when the size is respelled but unchanged (10Gi as 10240Mi)
+    set:
+      seaweedfs.volume.dataDirs:
+        - name: data1
+          type: persistentVolumeClaim
+          size: 10240Mi
+          maxVolumes: 0
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - kind: StatefulSet
+          apiVersion: apps/v1
+          metadata:
+            name: seaweedfs-volume
+            namespace: tenant-test
+          spec:
+            volumeClaimTemplates:
+              - metadata:
+                  name: data1
+                spec:
+                  resources:
+                    requests:
+                      storage: 10Gi
+        - kind: PersistentVolumeClaim
+          apiVersion: v1
+          metadata:
+            name: data1-seaweedfs-volume-0
+            namespace: tenant-test
+          spec:
+            resources:
+              requests:
+                storage: 10Gi
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  - it: formats a size that was set as a number, not a quantity string
+    set:
+      seaweedfs.volume.dataDirs:
+        - name: data1
+          type: persistentVolumeClaim
+          size: 21474836480
+          maxVolumes: 0
+    kubernetesProvider:
+      scheme: *scheme
+      objects:
+        - kind: StatefulSet
+          apiVersion: apps/v1
+          metadata:
+            name: seaweedfs-volume
+            namespace: tenant-test
+          spec:
+            volumeClaimTemplates:
+              - metadata:
+                  name: data1
+                spec:
+                  resources:
+                    requests:
+                      storage: 10Gi
+        - kind: PersistentVolumeClaim
+          apiVersion: v1
+          metadata:
+            name: data1-seaweedfs-volume-0
+            namespace: tenant-test
+          spec:
+            resources:
+              requests:
+                storage: 10Gi
+    asserts:
+      - documentIndex: 0
+        matchRegex:
+          path: spec.template.spec.containers[0].args[0]
+          pattern: kubectl patch pvc data1-seaweedfs-volume-0 .*"storage":"2.147483648e\+10"
+      - documentIndex: 0
+        notMatchRegex:
+          path: spec.template.spec.containers[0].args[0]
+          pattern: '%!'
diff --git a/packages/system/seaweedfs/tests/volume_slot_ceiling_test.yaml b/packages/system/seaweedfs/tests/volume_slot_ceiling_test.yaml
new file mode 100644
index 0000000000..441a45d225
--- /dev/null
+++ b/packages/system/seaweedfs/tests/volume_slot_ceiling_test.yaml
@@ -0,0 +1,109 @@
+suite: seaweedfs volume slot ceiling
+
+# The bucket ceiling rests on two constants and on flags rendered beside them;
+# how they combine into it is worked out once, beside the values themselves, in
+# packages/system/seaweedfs/values.yaml. Each is pinned on its own below,
+# because losing one is a silent capacity regression rather than a render
+# error, and only an assertion that fails alone can catch it.
+#
+# What each assertion covers differs, and the difference matters when reading a
+# failure here. COPY_2 and the free-space reserve are sent by nothing else, so
+# those two pin the values every install runs. The size limit and the volume
+# server's own -max are both supplied per release by extra/seaweedfs, so the two
+# assertions for them pin this chart's defaults: the fallback a standalone
+# render gets, and the values that apply if the app chart ever stops sending
+# them. What an install actually runs with is pinned beside them, in
+# packages/extra/seaweedfs/tests/master_volume_budget_test.yaml.
+#
+# All of them are asserted on rendered output rather than on the values keys: a
+# subchart bump changes the rendering, not the overlay.
+#
+# The zero branch in the volume template is a workaround for Go template
+# truthiness — 0 is falsy, so `not $dir.maxVolumes` is true for zero and the
+# next branch would render 7. It therefore reads as a redundant special case
+# for a value the following branch already covers. `make update` refetches
+# charts/, so the edit to guard against is upstream dropping that branch and
+# this chart picking it up on a bump, which would leave the master flags
+# intact while the slot arithmetic stopped applying.
+
+templates:
+  - charts/seaweedfs/templates/master/master-statefulset.yaml
+  - charts/seaweedfs/templates/volume/volume-statefulset.yaml
+
+release:
+  name: seaweedfs
+  namespace: cozy-seaweedfs
+
+tests:
+  # This one is deliberately not the 400 installs run with. A platform upgrade
+  # can re-render this release before its parent sends the new value, and the
+  # fallback is what the master gets in that window; at upstream's 1000 the
+  # window changes nothing, and anything lower would drop the limit before an
+  # operator's override could arrive.
+  - it: falls back to upstream's volume size limit when none is sent
+    template: charts/seaweedfs/templates/master/master-statefulset.yaml
+    asserts:
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: '-volumeSizeLimitMB=1000\s'
+
+  - it: starts the master with the pinned two-copy growth count
+    template: charts/seaweedfs/templates/master/master-statefulset.yaml
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: WEED_MASTER_VOLUME_GROWTH_COPY_2
+            value: "3"
+
+  - it: keeps the sibling growth counts through the deep-merge
+    template: charts/seaweedfs/templates/master/master-statefulset.yaml
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: WEED_MASTER_VOLUME_GROWTH_COPY_1
+            value: "7"
+
+  - it: leaves the volume server slot count auto-derived
+    template: charts/seaweedfs/templates/volume/volume-statefulset.yaml
+    asserts:
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: '-max 0\s'
+
+  # The reserve is the share of a data directory the volume server will not
+  # write into. On a server whose volumes have all passed the limit, a reserve
+  # of at least one limit, five percent of 8000 MiB or more at 400, means a grow
+  # is refused only with the disk down to the reserve, and values.yaml and
+  # docs/operations/seaweedfs-lowering-the-volume-size-limit.md say so for this
+  # number. Move it and those sentences are wrong, with nothing else reading it
+  # to say so.
+  - it: holds back the free-space reserve the slot threshold is computed from
+    template: charts/seaweedfs/templates/volume/volume-statefulset.yaml
+    asserts:
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: '-minFreeSpacePercent=5\s'
+
+  # The shape the platform actually runs: the app chart sends a master block of
+  # its own, and Helm merges it over this chart's. The size limit is meant to be
+  # replaced and the growth count is meant to survive, since nothing sends one.
+  # Neither of the two suites covers the overlap on its own, so a merge that
+  # started dropping the sibling keys would take the growth count with it while
+  # both suites stayed green.
+  - it: keeps the growth count when the app chart overrides the size limit
+    template: charts/seaweedfs/templates/master/master-statefulset.yaml
+    set:
+      seaweedfs:
+        master:
+          volumeSizeLimitMB: 2000
+    asserts:
+      - matchRegex:
+          path: spec.template.spec.containers[0].command[2]
+          pattern: '-volumeSizeLimitMB=2000\s'
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: WEED_MASTER_VOLUME_GROWTH_COPY_2
+            value: "3"
diff --git a/packages/system/seaweedfs/values.yaml b/packages/system/seaweedfs/values.yaml
index f7a6ac7e73..bce78c47f6 100644
--- a/packages/system/seaweedfs/values.yaml
+++ b/packages/system/seaweedfs/values.yaml
@@ -1,14 +1,83 @@
 global:
-  enableSecurity: true
-  serviceAccountName: "tenant-foo-seaweedfs"
-  extraEnvironmentVars:
-    WEED_CLUSTER_SW_MASTER: "seaweedfs-master:9333"
-    WEED_CLUSTER_SW_FILER: "seaweedfs-filer-client:8888"
-  monitoring:
-    enabled: true
+  # App-specific globals were namespaced under global.seaweedfs in chart 4.18
+  # (upstream commit moving global.* -> global.seaweedfs.* to avoid polluting the
+  # shared global namespace when the chart is used as a subchart).
+  seaweedfs:
+    enableSecurity: true
+    serviceAccountName: "tenant-foo-seaweedfs"
+    extraEnvironmentVars:
+      WEED_CLUSTER_SW_MASTER: "seaweedfs-master:9333"
+      WEED_CLUSTER_SW_FILER: "seaweedfs-filer-client:8888"
+    monitoring:
+      enabled: true
 seaweedfs:
+  # Decouple the workload names from the Helm release name. Upstream 4.31 started
+  # naming resources after the release, and the data-plane release is
+  # `<name>-system`, so every StatefulSet was renamed to `<name>-system-*`. Those
+  # names are immutable, so Helm could not rename in place — it stood up a second,
+  # empty set beside the running one while the data stayed on `data1-seaweedfs-volume-*`.
+  # Pinning the chart name restores the pre-4.31 names, so the running workloads
+  # and their volumes are adopted across the bump. extra/seaweedfs does NOT override
+  # this per release — it relies on this pin. The cases the pin cannot serve (a
+  # tenant installed fresh on 1.5.x, whose data is on the renamed volumes, and a
+  # live D-split duplicate) refuse to render in templates/naming-guard.yaml — the
+  # guard MUST live in this chart, because a platform upgrade re-renders this
+  # chart directly from its ExternalArtifact without re-rendering extra/seaweedfs.
+  # The guard also refuses to render at all if this pin is ever lifted.
+  fullnameOverride: seaweedfs
+  # Built in-tree from images/seaweedfs, which carries the patches in
+  # images/seaweedfs/patches. Without this block the vendored chart falls back
+  # to chrislusf/seaweedfs at its appVersion, the unpatched upstream build.
+  # `make image` rewrites both keys on every build.
+  image:
+    repository: "ghcr.io/cozystack/cozystack/seaweedfs"
+    tag: "4.45@sha256:2a063deb9992ac0c06f8c09589ae063a30ac8c87af2c6aa1f4d4420cc544535c"
   master:
-    volumeSizeLimitMB: 30000
+    # At the shipped replicationFactor of 2 the size limit and
+    # extraEnvironmentVars.WEED_MASTER_VOLUME_GROWTH_COPY_2 below are one
+    # budget. A volume server runs with -max 0 and derives its slot count from
+    # free space divided by the limit, replication 001 spends a slot on each of
+    # two servers, and a collection claims COPY_2 volumes each time it grows,
+    # so the bucket ceiling is set by their product and moving either moves it.
+    # At 1 or 3 copies the master reads COPY_1 or COPY_3 instead, and COPY_2
+    # governs nothing. The sources are MaybeAdjustVolumeMax
+    # (weed/storage/store.go) and findVolumeCount
+    # (weed/topology/volume_growth.go) at the 4.31 the vendored chart pins;
+    # read them again once `make update` moves the tag.
+    #
+    # The pair installs run is 400 and 3, a budget of 1200 MB per collection
+    # against upstream's 1000 and 6, which is 6000; on the shipped 10Gi volume
+    # that takes an instance from two collections to about eight, and two is
+    # what the platform's own backup bucket and one tenant bucket already use.
+    # Both numbers come down rather than the limit alone because open
+    # descriptors, two per volume, follow stored bytes divided by the limit, so
+    # taking the whole reduction out of the limit would multiply them.
+    #
+    # The limit installs run with is set in packages/extra/seaweedfs/values.yaml
+    # and sent on every release. The value here is only the fallback for a
+    # render without it and stays at upstream's 1000: a platform upgrade can
+    # re-render this release before its parent sends anything, and a lower
+    # fallback would then drop the limit ahead of the parent's value. COPY_2 is
+    # sent by nothing, so the value below is the live one.
+    #
+    # The minFreeSpacePercent reserve only matters on a server whose writable
+    # volumes have all passed the limit, since nothing there is charged
+    # headroom. Where five percent of the filesystem is at least the limit, from
+    # 8000 MiB of filesystem at 400, such a server refuses a grow only with its
+    # disk down to the reserve; with a smaller reserve it can refuse one with up
+    # to a limit still free. Elsewhere the headroom charged to the volumes
+    # decides, whatever the reserve, and neither makes an instance safe. What
+    # lowering the limit costs an instance that holds data, and the check to run
+    # first, are in docs/operations/seaweedfs-lowering-the-volume-size-limit.md.
+    #
+    # Deriving the limit from volume.size was rejected: pools and zones carry
+    # their own PVC sizes while this setting is master-wide.
+    volumeSizeLimitMB: 1000
+    # The other half of the budget above. The subchart already declares all
+    # four COPY_* growth counts at their upstream defaults; Helm merges this
+    # key over that map and leaves the rest standing.
+    extraEnvironmentVars:
+      WEED_MASTER_VOLUME_GROWTH_COPY_2: "3"
     replicas: 3
     #  replication type is XYZ:
     # X number of replica in other data centers
@@ -19,10 +88,45 @@ seaweedfs:
       type: "emptyDir"
     logs:
       type: ""
+    # The master's /cluster/status handler calls topo.Leader(), which backs off
+    # up to ~20s (MaxElapsedTime=20s) while the node has no leader in view — e.g.
+    # a master that was briefly the initial raft leader then was demoted during
+    # bootstrap. The default 10s probe timeout is shorter than that worst case, so
+    # such a master is liveness-killed every ~137s into a permanent CrashLoop and
+    # the master StatefulSet never reaches full readiness, timing out the install.
+    # Both probes must allow more than the 20s backoff (the volume component in
+    # this chart already uses 30s). Override only timeoutSeconds; Helm deep-merges
+    # these onto the subchart defaults, keeping enabled/path/initialDelay/etc.
+    livenessProbe:
+      timeoutSeconds: 30
+    readinessProbe:
+      timeoutSeconds: 30
+    # The upstream subchart pins the master to a HARD hostname anti-affinity
+    # (requiredDuringSchedulingIgnoredDuringExecution). With the 3-replica
+    # StatefulSet above, that makes the master unschedulable on clusters with
+    # fewer than three nodes: the surplus master Pods stay Pending forever, so
+    # `helm install --wait` never returns and Flux loops install/uninstall —
+    # the whole S3 stack never comes up. Soften it to a strong preference
+    # (weight 100) so the masters still spread across distinct nodes whenever
+    # the cluster has them, while single- and dual-node clusters can still
+    # bring the master up. Same posture already used for the s3 component
+    # below. Selector and topologyKey are unchanged from the subchart default;
+    # only required -> preferred.
+    affinity: |
+      podAntiAffinity:
+        preferredDuringSchedulingIgnoredDuringExecution:
+          - weight: 100
+            podAffinityTerm:
+              labelSelector:
+                matchLabels:
+                  app.kubernetes.io/name: {{ template "seaweedfs.name" . }}
+                  app.kubernetes.io/instance: {{ .Release.Name }}
+                  app.kubernetes.io/component: master
+              topologyKey: kubernetes.io/hostname
   volume:
     replicas: 2
     resizeHook:
-      image: docker.io/alpine/k8s:1.33.4
+      image: docker.io/alpine/k8s:1.36.2
     # minimum free disk space(in percents). If free disk space lower this value - all volumes marks as ReadOnly
     minFreeSpacePercent: 5
     dataDirs:
@@ -44,6 +148,14 @@ seaweedfs:
     extraEnvironmentVars:
       WEED_LEVELDB2_ENABLED: "false"
       WEED_POSTGRES2_ENABLED: "true"
+      # Without explicit pool settings the Go sql pool keeps zero idle
+      # connections, so every filer metadata lookup opens a fresh PostgreSQL
+      # connection (TCP + TLS + SCRAM, ~300ms each), adding seconds of latency
+      # to every S3 operation. Keep max_open * filer.replicas below the
+      # database max_connections (CNPG default: 100).
+      WEED_POSTGRES2_CONNECTION_MAX_IDLE: "20"
+      WEED_POSTGRES2_CONNECTION_MAX_OPEN: "40"
+      WEED_POSTGRES2_CONNECTION_MAX_LIFETIME_SECONDS: "600"
       WEED_POSTGRES2_CREATETABLE: |
         CREATE TABLE IF NOT EXISTS "%s" (
           dirhash   BIGINT,
@@ -86,6 +198,19 @@ seaweedfs:
     enabled: true
     replicas: 2
     port: 8333
+    # Upstream 4.45 turns the Lance Namespace catalog on by default
+    # (charts/seaweedfs/values.yaml: lancePort: 9101) and the s3 Service
+    # publishes it. weed serves that catalog over plain HTTP and accepts no
+    # certificate for it, which is the posture patches/s3-tls-main-port.patch
+    # exists to avoid, and its namespace and table routes are writable. Nothing
+    # in Cozystack consumes the catalog, so keep the pre-4.45 surface: 0 makes
+    # weed skip startLanceServer and drops the container port and Service port
+    # with it.
+    lancePort: 0
+    # Keep S3 traffic on same-zone endpoints. Native chart support landed in 4.12
+    # (replaces the former s3-traffic-distribution.patch); the chart gates the
+    # field on Kubernetes >=1.31 and auto-converts to PreferSameZone on >=1.35.
+    trafficDistribution: PreferClose
     extraArgs:
       - -idleTimeout=60
     enableAuth: false
@@ -174,13 +299,18 @@ seaweedfs:
               topologyKey: kubernetes.io/hostname
   cosi:
     enabled: true
+    # Override the vendored chart default (v0.1.2), which hardcodes read-write
+    # S3 actions for every BucketAccess and ignores the accessPolicy parameter.
+    # v0.3.x honours accessPolicy: readonly, so a -readonly BucketAccessClass
+    # actually issues read-only (Read,List) credentials instead of read-write.
+    image: "ghcr.io/seaweedfs/seaweedfs-cosi-driver:v0.3.1"
     podLabels:
       policy.cozystack.io/allow-to-apiserver: "true"
     driverName: "seaweedfs.objectstorage.k8s.io"
     bucketClassName: "seaweedfs"
     region: ""
     sidecar:
-      image: "ghcr.io/cozystack/cozystack/objectstorage-sidecar:v1.4.0-rc.2@sha256:ad318fa6e365d2c1ef5559979104b62c34b4440d33ac2e554508f77cde1f1d3e"
+      image: "ghcr.io/cozystack/cozystack/objectstorage-sidecar:v1.6.0@sha256:4d665becd3399c2fe1e8a66e15d14d16e4a5a75395fb0ae65cff46679a8989f1"
   certificates:
     commonName: "SeaweedFS CA"
     ipAddresses: []
diff --git a/packages/system/securitygroup-controller/Chart.yaml b/packages/system/securitygroup-controller/Chart.yaml
new file mode 100644
index 0000000000..a8c43cf258
--- /dev/null
+++ b/packages/system/securitygroup-controller/Chart.yaml
@@ -0,0 +1,3 @@
+apiVersion: v2
+name: cozy-securitygroup-controller
+version: 0.0.0 # Placeholder, the actual version will be automatically set during the build process
diff --git a/packages/system/securitygroup-controller/Makefile b/packages/system/securitygroup-controller/Makefile
new file mode 100644
index 0000000000..751c8c602c
--- /dev/null
+++ b/packages/system/securitygroup-controller/Makefile
@@ -0,0 +1,20 @@
+NAME=securitygroup-controller
+NAMESPACE=cozy-securitygroup-controller
+
+include ../../../hack/common-envs.mk
+include ../../../hack/package.mk
+
+test:
+	helm unittest .
+
+image: image-securitygroup-controller
+
+image-securitygroup-controller:
+	docker buildx build -f images/securitygroup-controller/Dockerfile ../../.. \
+		$(call image-tags,securitygroup-controller,v$(COZYSTACK_VERSION)) \
+		$(call cache-args,securitygroup-controller) \
+		--metadata-file images/securitygroup-controller.json \
+		$(BUILDX_ARGS)
+	IMAGE="$(REGISTRY)/securitygroup-controller:$(IMAGE_TAG)@$$(yq e '."containerimage.digest"' images/securitygroup-controller.json -o json -r)" \
+		yq -i '.securityGroupController.image = strenv(IMAGE)' values.yaml
+	rm -f images/securitygroup-controller.json
diff --git a/packages/system/securitygroup-controller/images/securitygroup-controller/Dockerfile b/packages/system/securitygroup-controller/images/securitygroup-controller/Dockerfile
new file mode 100644
index 0000000000..02ebb92ffb
--- /dev/null
+++ b/packages/system/securitygroup-controller/images/securitygroup-controller/Dockerfile
@@ -0,0 +1,25 @@
+FROM --platform=$BUILDPLATFORM golang:1.27-alpine@sha256:8a5910f31396cd4d89662f56c68b3ae31d374308270a1c3bd96672ee5ed43414 AS builder
+ARG GOPROXY
+
+ARG TARGETOS
+ARG TARGETARCH
+
+WORKDIR /workspace
+
+COPY go.mod go.sum ./
+RUN for attempt in 1 2 3; do GOOS=$TARGETOS GOARCH=$TARGETARCH go mod download && break; [ "$attempt" = 3 ] && exit 1; sleep $((attempt * 10)); done
+
+COPY api api/
+COPY pkg pkg/
+COPY cmd cmd/
+COPY internal internal/
+
+RUN GOOS=$TARGETOS GOARCH=$TARGETARCH CGO_ENABLED=0 go build -ldflags="-extldflags=-static" -o /securitygroup-controller cmd/securitygroup-controller/main.go
+
+FROM scratch
+
+COPY --from=builder /securitygroup-controller /securitygroup-controller
+COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
+
+USER 65532:65532
+ENTRYPOINT ["/securitygroup-controller"]
diff --git a/packages/system/securitygroup-controller/templates/deployment.yaml b/packages/system/securitygroup-controller/templates/deployment.yaml
new file mode 100644
index 0000000000..3f0b67ad31
--- /dev/null
+++ b/packages/system/securitygroup-controller/templates/deployment.yaml
@@ -0,0 +1,70 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: securitygroup-controller
+  labels:
+    app: securitygroup-controller
+spec:
+  replicas: {{ .Values.securityGroupController.replicas }}
+  selector:
+    matchLabels:
+      app: securitygroup-controller
+  template:
+    metadata:
+      labels:
+        app: securitygroup-controller
+    spec:
+      tolerations:
+      - key: "node-role.kubernetes.io/control-plane"
+        operator: "Exists"
+        effect: "NoSchedule"
+      - key: "node-role.kubernetes.io/master"
+        operator: "Exists"
+        effect: "NoSchedule"
+      affinity:
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+          - weight: 100
+            podAffinityTerm:
+              labelSelector:
+                matchLabels:
+                  app: securitygroup-controller
+              topologyKey: kubernetes.io/hostname
+      serviceAccountName: securitygroup-controller
+      securityContext:
+        runAsNonRoot: true
+        seccompProfile:
+          type: RuntimeDefault
+      containers:
+      - name: securitygroup-controller
+        image: "{{ .Values.securityGroupController.image }}"
+        args:
+        - --leader-elect
+        {{- if .Values.securityGroupController.debug }}
+        - --zap-log-level=debug
+        {{- else }}
+        - --zap-log-level=info
+        {{- end }}
+        ports:
+        - name: health
+          containerPort: 8081
+        readinessProbe:
+          httpGet:
+            path: /readyz
+            port: health
+          initialDelaySeconds: 5
+          periodSeconds: 10
+        livenessProbe:
+          httpGet:
+            path: /healthz
+            port: health
+          initialDelaySeconds: 15
+          periodSeconds: 20
+        securityContext:
+          allowPrivilegeEscalation: false
+          readOnlyRootFilesystem: true
+          capabilities:
+            drop: ["ALL"]
+        {{- with .Values.securityGroupController.resources }}
+        resources: {{- . | toYaml | nindent 10 }}
+        {{- end }}
diff --git a/packages/system/securitygroup-controller/templates/rbac-bind.yaml b/packages/system/securitygroup-controller/templates/rbac-bind.yaml
new file mode 100644
index 0000000000..ff1ebf5c16
--- /dev/null
+++ b/packages/system/securitygroup-controller/templates/rbac-bind.yaml
@@ -0,0 +1,12 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: sdn.cozystack.io:securitygroup-controller
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: sdn.cozystack.io:securitygroup-controller
+subjects:
+- kind: ServiceAccount
+  name: securitygroup-controller
+  namespace: {{ .Release.Namespace }}
diff --git a/packages/system/securitygroup-controller/templates/rbac.yaml b/packages/system/securitygroup-controller/templates/rbac.yaml
new file mode 100644
index 0000000000..89ab8ed6a3
--- /dev/null
+++ b/packages/system/securitygroup-controller/templates/rbac.yaml
@@ -0,0 +1,25 @@
+kind: ClusterRole
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: sdn.cozystack.io:securitygroup-controller
+rules:
+# Stamp and clear the per-SecurityGroup membership label on managed-app pods.
+# Cluster-wide because tenant namespaces are created dynamically; the controller
+# only ever patches the single membership-label key (see internal/
+# securitygroupcontroller) and only on pods carrying the lineage identity.
+- apiGroups: [""]
+  resources: ["pods"]
+  verbs: ["get", "list", "watch", "patch"]
+# Watch the SecurityGroup-backing CiliumNetworkPolicies and manage the
+# membership finalizer on them (via merge patches, never an Update that would
+# drop the policy spec).
+- apiGroups: ["cilium.io"]
+  resources: ["ciliumnetworkpolicies"]
+  verbs: ["get", "list", "watch", "patch"]
+# Leader election (--leader-elect).
+- apiGroups: ["coordination.k8s.io"]
+  resources: ["leases"]
+  verbs: ["get", "list", "watch", "create", "update", "patch"]
+- apiGroups: [""]
+  resources: ["events"]
+  verbs: ["create", "patch"]
diff --git a/packages/system/securitygroup-controller/templates/sa.yaml b/packages/system/securitygroup-controller/templates/sa.yaml
new file mode 100644
index 0000000000..086a6a05f0
--- /dev/null
+++ b/packages/system/securitygroup-controller/templates/sa.yaml
@@ -0,0 +1,4 @@
+kind: ServiceAccount
+apiVersion: v1
+metadata:
+  name: securitygroup-controller
diff --git a/packages/system/securitygroup-controller/tests/deployment_test.yaml b/packages/system/securitygroup-controller/tests/deployment_test.yaml
new file mode 100644
index 0000000000..056965f4a7
--- /dev/null
+++ b/packages/system/securitygroup-controller/tests/deployment_test.yaml
@@ -0,0 +1,101 @@
+suite: securitygroup-controller deployment and RBAC
+
+release:
+  name: securitygroup-controller
+  namespace: cozy-securitygroup-controller
+
+tests:
+  - it: ClusterRole grants cluster-wide pod patch for membership labels, and no more
+    templates:
+      - templates/rbac.yaml
+    asserts:
+      - contains:
+          path: rules
+          content:
+            apiGroups: [""]
+            resources: ["pods"]
+            verbs: ["get", "list", "watch", "patch"]
+      # Pin the pod verbs exactly so a future widening (e.g. create/delete) fails
+      # the suite — the controller must never gain more than read + label patch.
+      - equal:
+          path: rules[0].verbs
+          value: ["get", "list", "watch", "patch"]
+
+  - it: ClusterRole grants ciliumnetworkpolicies read and finalizer patch, and no more
+    templates:
+      - templates/rbac.yaml
+    asserts:
+      - contains:
+          path: rules
+          content:
+            apiGroups: ["cilium.io"]
+            resources: ["ciliumnetworkpolicies"]
+            verbs: ["get", "list", "watch", "patch"]
+      # Pin the CNP verbs exactly: the controller never creates, updates or
+      # deletes CiliumNetworkPolicies (cozystack-api owns that) — only finalizer
+      # merge patches.
+      - equal:
+          path: rules[1].verbs
+          value: ["get", "list", "watch", "patch"]
+
+  - it: ClusterRole grants leader-election leases and events
+    templates:
+      - templates/rbac.yaml
+    asserts:
+      - contains:
+          path: rules
+          content:
+            apiGroups: ["coordination.k8s.io"]
+            resources: ["leases"]
+            verbs: ["get", "list", "watch", "create", "update", "patch"]
+      - contains:
+          path: rules
+          content:
+            apiGroups: [""]
+            resources: ["events"]
+            verbs: ["create", "patch"]
+
+  - it: Deployment runs as the controller SA with leader election and a health port
+    templates:
+      - templates/deployment.yaml
+    asserts:
+      - equal:
+          path: spec.template.spec.serviceAccountName
+          value: securitygroup-controller
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: --leader-elect
+      - equal:
+          path: spec.template.spec.containers[0].ports[0].containerPort
+          value: 8081
+
+  - it: Deployment hardens the pod and container security context
+    templates:
+      - templates/deployment.yaml
+    asserts:
+      - equal:
+          path: spec.template.spec.securityContext.runAsNonRoot
+          value: true
+      - equal:
+          path: spec.template.spec.securityContext.seccompProfile.type
+          value: RuntimeDefault
+      - equal:
+          path: spec.template.spec.containers[0].securityContext.allowPrivilegeEscalation
+          value: false
+      - equal:
+          path: spec.template.spec.containers[0].securityContext.readOnlyRootFilesystem
+          value: true
+      - contains:
+          path: spec.template.spec.containers[0].securityContext.capabilities.drop
+          content: ALL
+
+  - it: ClusterRoleBinding binds the controller service account
+    templates:
+      - templates/rbac-bind.yaml
+    asserts:
+      - equal:
+          path: subjects[0].name
+          value: securitygroup-controller
+      - equal:
+          path: subjects[0].namespace
+          value: cozy-securitygroup-controller
diff --git a/packages/system/securitygroup-controller/values.yaml b/packages/system/securitygroup-controller/values.yaml
new file mode 100644
index 0000000000..a57cef7881
--- /dev/null
+++ b/packages/system/securitygroup-controller/values.yaml
@@ -0,0 +1,11 @@
+securityGroupController:
+  image: "ghcr.io/cozystack/cozystack/securitygroup-controller:v1.6.0@sha256:09ee1d8fbfacc5b4ac24d0efbc8313bb0ad0e5507a149235894ac7d4b5539232"
+  replicas: 2
+  debug: false
+  resources:
+    requests:
+      cpu: 10m
+      memory: 64Mi
+    limits:
+      cpu: 500m
+      memory: 256Mi
diff --git a/packages/system/talos-log-collector/Chart.yaml b/packages/system/talos-log-collector/Chart.yaml
new file mode 100644
index 0000000000..4b54f0d06b
--- /dev/null
+++ b/packages/system/talos-log-collector/Chart.yaml
@@ -0,0 +1,6 @@
+apiVersion: v2
+name: cozy-talos-log-collector
+description: Node-local Vector DaemonSet that receives Talos machine and kernel logs over loopback and forwards them to the in-cluster VictoriaLogs
+type: application
+version: 0.0.0 # Placeholder, the actual version will be automatically set during the build process
+appVersion: "0.56.0"
diff --git a/packages/system/talos-log-collector/Makefile b/packages/system/talos-log-collector/Makefile
new file mode 100644
index 0000000000..8aad5bfee4
--- /dev/null
+++ b/packages/system/talos-log-collector/Makefile
@@ -0,0 +1,26 @@
+export NAME=talos-log-collector
+export NAMESPACE=cozy-$(NAME)
+
+include ../../../hack/common-envs.mk
+include ../../../hack/package.mk
+
+test:
+	helm unittest .
+
+update:
+	ver=$$(curl -sSL "https://api.github.com/repos/vectordotdev/vector/releases" | jq -r '[.[] | select(.prerelease == false) | .tag_name | select(startswith("v0."))][0]' | sed 's/^v//') && \
+	$(SED_INPLACE) "/ARG VERSION/ s|=.*|=$${ver}-alpine|g" images/vector/Dockerfile && \
+	VERSION="$${ver}" yq -i '.appVersion = strenv(VERSION)' Chart.yaml
+
+image:
+	docker buildx build images/vector \
+		$(call image-tags,vector,v$(COZYSTACK_VERSION)) \
+		$(call cache-args,vector) \
+		--metadata-file images/vector.json \
+		$(BUILDX_ARGS)
+	echo "$(REGISTRY)/vector:$(IMAGE_TAG)@$$(yq e '."containerimage.digest"' images/vector.json -o json -r)" \
+		> images/vector.tag
+	rm -f images/vector.json
+
+generate:
+	cozyvalues-gen -v values.yaml -s values.schema.json -r README.md
diff --git a/packages/system/talos-log-collector/README.md b/packages/system/talos-log-collector/README.md
new file mode 100644
index 0000000000..090d1b82de
--- /dev/null
+++ b/packages/system/talos-log-collector/README.md
@@ -0,0 +1,96 @@
+# Talos Log Collector
+
+A node-local Vector DaemonSet that receives Talos machine and kernel logs and
+forwards them to the in-cluster VictoriaLogs.
+
+Talos keeps its system and kernel (kmsg) logs inside the OS and does not write
+them to a host file that the default Fluent Bit `tail` input could read, so
+those logs are never picked up by `monitoring-agents`. Fluent Bit there is
+tail-only and the vendored chart offers no way to add a loopback TCP receiver,
+so extending it is not an option; this package runs a dedicated Vector receiver
+on every node instead. Talos pushes its logs into it over the node loopback,
+and Vector forwards them to the tenant VictoriaLogs
+(`vlinsert-generic.<target>.svc`) next to the container, audit and event logs
+already collected by `monitoring-agents`.
+
+## How it works
+
+Vector runs as a DaemonSet on the pod network, so cluster DNS resolves the
+vlinsert service. It listens on a TCP socket published on the node loopback via
+a `hostPort` bound to `hostIP: 127.0.0.1`. Because the pod is not on the host
+network, the outbound path to vlinsert keeps working; the inbound loopback
+socket is provided by the hostPort.
+
+Talos exposes its logs through two independent config paths, and both must
+point at this socket to collect everything:
+
+- `machine.logging.destinations` forwards the JSON-lines **service** logs
+  (kubelet, etcd, apid and the other machine services).
+- A `KmsgLogConfig` document forwards the **kernel** (kmsg) stream, including
+  driver messages such as DRBD. `machine.logging.destinations` does not carry
+  kmsg: Talos builds the kmsg destination list only from `KmsgLogConfig`
+  documents and the `talos.logging.kernel=` kernel argument, so without one the
+  kernel logs never leave the node. Both endpoints may point at the same
+  socket; `KmsgLogConfig` only supports the `json_lines` format.
+
+## Talos configuration (required)
+
+This package deploys only the receiver. Each Talos node must be told to push
+both its service logs and its kernel logs to the loopback socket. Add this to
+the machine config and apply it:
+
+```yaml
+machine:
+  logging:
+    destinations:
+      - endpoint: "tcp://127.0.0.1:5170/"
+        format: "json_lines"
+---
+apiVersion: v1alpha1
+kind: KmsgLogConfig
+name: talos-log-collector
+url: "tcp://127.0.0.1:5170/"
+```
+
+> Omitting the `KmsgLogConfig` document collects service logs only; kernel
+> (kmsg) logs, including the DRBD messages, will silently never arrive.
+
+> Kernel (kmsg) records carry no wall-clock timestamp (only a monotonic
+> clock), so VictoriaLogs stamps them with the ingest time rather than the
+> `talos-time` used for service logs.
+
+> Early-boot kernel panics, before the network is up, are not captured by any
+> in-cluster collector. Use the node BMC serial console for those.
+
+## Notes
+
+- The package is opt-in via `bundles.enabledPackages` and stays inert until the
+  Talos machine config above is applied on the nodes.
+- If the target tenant has no VictoriaLogs (vlinsert) yet, Vector's sink retries
+  and backpressures the source: the pod stays Running, but Talos logs are
+  dropped until vlinsert exists.
+- Teardown: removing the package from `bundles.enabledPackages` does not
+  uninstall it (Package CRs carry `helm.sh/resource-policy: keep`). Delete it
+  explicitly with
+  `kubectl delete package.cozystack.io cozystack.talos-log-collector`.
+
+## Parameters
+
+### Common parameters
+
+| Name               | Description                                                                              | Type       | Value   |
+| ------------------ | ---------------------------------------------------------------------------------------- | ---------- | ------- |
+| `logLevel`         | Vector log verbosity (trace, debug, info, warn, error).                                  | `string`   | `warn`  |
+| `listenPort`       | TCP port bound on the node loopback (127.0.0.1) where Talos machine.logging pushes logs. | `int`      | `5170`  |
+| `resources`        | Compute resources for the collector.                                                     | `object`   | `{}`    |
+| `resources.cpu`    | CPU request.                                                                             | `quantity` | `100m`  |
+| `resources.memory` | Memory request and limit.                                                                | `quantity` | `128Mi` |
+
+
+### VictoriaLogs destination
+
+| Name            | Description                                                                                                                       | Type     | Value         |
+| --------------- | --------------------------------------------------------------------------------------------------------------------------------- | -------- | ------------- |
+| `global`        | Global values block; `target` selects the destination tenant.                                                                     | `object` | `{}`          |
+| `global.target` | Tenant whose VictoriaLogs (vlinsert-generic.<target>.svc) receives the logs. Defaults to tenant-root; override via bundle values. | `string` | `tenant-root` |
+
diff --git a/packages/system/talos-log-collector/images/vector.tag b/packages/system/talos-log-collector/images/vector.tag
new file mode 100644
index 0000000000..7b6e159133
--- /dev/null
+++ b/packages/system/talos-log-collector/images/vector.tag
@@ -0,0 +1 @@
+ghcr.io/cozystack/cozystack/vector:0.56.0-alpine@sha256:0eb66216f5f9322264e2ba83f4606428ef77a2cd4dea619a5bea610ac80ccc43
diff --git a/packages/system/talos-log-collector/images/vector/Dockerfile b/packages/system/talos-log-collector/images/vector/Dockerfile
new file mode 100644
index 0000000000..db583abfb7
--- /dev/null
+++ b/packages/system/talos-log-collector/images/vector/Dockerfile
@@ -0,0 +1,7 @@
+# syntax=docker/dockerfile:1.2@sha256:e2a8561e419ab1ba6b2fe6cbdf49fd92b95912df1cf7d313c3e2230a333fdbcc
+#
+# Pure mirror of the upstream Vector image, re-hosted in the cozystack
+# registry and pinned by digest via `make image` (same pattern as metallb).
+ARG VERSION=0.56.0-alpine@sha256:8f2de273559680c4a6a03bb2bcf4a7636b08e0fb15269f546adc7b2cef2b6e8c
+
+FROM timberio/vector:${VERSION}
diff --git a/packages/system/talos-log-collector/templates/_helpers.tpl b/packages/system/talos-log-collector/templates/_helpers.tpl
new file mode 100644
index 0000000000..2c6b9ce628
--- /dev/null
+++ b/packages/system/talos-log-collector/templates/_helpers.tpl
@@ -0,0 +1,4 @@
+{{- define "talos-log-collector.labels" -}}
+app.kubernetes.io/name: talos-log-collector
+app.kubernetes.io/part-of: talos-log-collector
+{{- end }}
diff --git a/packages/system/talos-log-collector/templates/configmap.yaml b/packages/system/talos-log-collector/templates/configmap.yaml
new file mode 100644
index 0000000000..27ae34287b
--- /dev/null
+++ b/packages/system/talos-log-collector/templates/configmap.yaml
@@ -0,0 +1,42 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: talos-log-collector
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "talos-log-collector.labels" . | nindent 4 }}
+data:
+  vector.yaml: |
+    data_dir: /vector-data
+    sources:
+      talos:
+        type: socket
+        mode: tcp
+        address: 0.0.0.0:{{ .Values.listenPort }}
+        decoding:
+          codec: json
+    transforms:
+      tag:
+        type: remap
+        inputs: [talos]
+        source: |
+          .log_source = "talos_system"
+          .node = get_env_var("VECTOR_SELF_NODE_NAME") ?? "unknown"
+          .tenant = "{{ .Values.global.target | default "tenant-root" }}"
+          .cluster = "root-cluster"
+    sinks:
+      victorialogs:
+        type: http
+        inputs: [tag]
+        uri: "http://vlinsert-generic.{{ .Values.global.target | default "tenant-root" }}.svc:9481/insert/jsonline?_stream_fields=node,log_source,talos-service,facility,tenant,cluster&_msg_field=msg&_time_field=talos-time"
+        method: post
+        compression: gzip
+        encoding:
+          codec: json
+        framing:
+          method: newline_delimited
+        request:
+          headers:
+            Content-Type: application/x-ndjson
+            AccountID: "0"
+            ProjectID: "0"
diff --git a/packages/system/talos-log-collector/templates/daemonset.yaml b/packages/system/talos-log-collector/templates/daemonset.yaml
new file mode 100644
index 0000000000..ad76aa01b4
--- /dev/null
+++ b/packages/system/talos-log-collector/templates/daemonset.yaml
@@ -0,0 +1,90 @@
+apiVersion: apps/v1
+kind: DaemonSet
+metadata:
+  name: talos-log-collector
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "talos-log-collector.labels" . | nindent 4 }}
+spec:
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: talos-log-collector
+  template:
+    metadata:
+      labels:
+        {{- include "talos-log-collector.labels" . | nindent 8 }}
+      annotations:
+        checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
+    spec:
+      serviceAccountName: talos-log-collector
+      priorityClassName: system-node-critical
+      # No hostNetwork: the pod stays on the pod network, so the outbound sink
+      # resolves vlinsert-generic.<target>.svc through cluster DNS with no extra
+      # config. Talos machine.logging pushes to 127.0.0.1:<listenPort>; the
+      # hostPort below, bound to hostIP 127.0.0.1, publishes that loopback
+      # socket into the pod via portmap. This keeps the receiver off the host
+      # network (no node-wide pod exposure, no host-DNS handling) while still
+      # accepting node-loopback traffic.
+      # The loopback hostPort relies on the portmap CNI plugin (chained ahead of
+      # Cilium on the kubeovn-cilium* variants). Cilium's own eBPF hostPort
+      # implementation cannot bind a hostPort to 127.0.0.1, so on the plain
+      # cilium/cilium-generic/cilium-kilo variants (not selected by any bundle
+      # today) this receiver would silently stop receiving.
+      securityContext:
+        runAsNonRoot: true
+        runAsUser: 65534
+        runAsGroup: 65534
+        fsGroup: 65534
+        seccompProfile:
+          type: RuntimeDefault
+      containers:
+      - name: vector
+        image: "{{ $.Files.Get "images/vector.tag" | trim }}"
+        imagePullPolicy: IfNotPresent
+        args: ["--config", "/etc/vector/vector.yaml"]
+        livenessProbe:
+          tcpSocket:
+            port: talos
+          initialDelaySeconds: 10
+          periodSeconds: 30
+        env:
+        - name: VECTOR_SELF_NODE_NAME
+          valueFrom:
+            fieldRef:
+              fieldPath: spec.nodeName
+        - name: VECTOR_LOG
+          value: {{ .Values.logLevel | quote }}
+        ports:
+        - name: talos
+          containerPort: {{ .Values.listenPort }}
+          hostPort: {{ .Values.listenPort }}
+          hostIP: 127.0.0.1
+          protocol: TCP
+        resources:
+          requests:
+            cpu: {{ .Values.resources.cpu }}
+            memory: {{ .Values.resources.memory }}
+          limits:
+            memory: {{ .Values.resources.memory }}
+        securityContext:
+          allowPrivilegeEscalation: false
+          readOnlyRootFilesystem: true
+          capabilities:
+            drop:
+            - ALL
+        volumeMounts:
+        - name: config
+          mountPath: /etc/vector
+        - name: data
+          mountPath: /vector-data
+      tolerations:
+      - effect: NoSchedule
+        operator: Exists
+      - effect: NoExecute
+        operator: Exists
+      volumes:
+      - name: config
+        configMap:
+          name: talos-log-collector
+      - name: data
+        emptyDir: {}
diff --git a/packages/system/talos-log-collector/templates/networkpolicy.yaml b/packages/system/talos-log-collector/templates/networkpolicy.yaml
new file mode 100644
index 0000000000..ae531d4d48
--- /dev/null
+++ b/packages/system/talos-log-collector/templates/networkpolicy.yaml
@@ -0,0 +1,56 @@
+# Vector binds 0.0.0.0:<listenPort> inside the pod netns and exposes it as a
+# containerPort, so the pod IP is reachable from every pod in the cluster. Any
+# workload could open <podIP>:<listenPort> and inject forged JSON lines that the
+# pipeline stamps with log_source=talos_system and the real node name, straight
+# into VictoriaLogs. This policy is load-bearing, not defence-in-depth: it is
+# the only thing restricting the receiver to the node-local push path (Talos
+# reaches it on 127.0.0.1:<listenPort>; portmap DNATs to the pod and SNATs the
+# source to the node, so legitimate traffic arrives as the host). A CNI that
+# does not enforce NetworkPolicy (e.g. the noop networking variant, or a BYO CNI
+# without policy support) leaves the socket unprotected regardless.
+{{- if .Capabilities.APIVersions.Has "cilium.io/v2/CiliumNetworkPolicy" }}
+# Cilium is present: restrict ingress on the listen port to the host entity, so
+# only the node-local push path is allowed and other pods are denied.
+apiVersion: cilium.io/v2
+kind: CiliumNetworkPolicy
+metadata:
+  name: talos-log-collector
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "talos-log-collector.labels" . | nindent 4 }}
+spec:
+  endpointSelector:
+    matchLabels:
+      app.kubernetes.io/name: talos-log-collector
+  ingress:
+  - fromEntities:
+    - host
+    toPorts:
+    - ports:
+      - port: "{{ .Values.listenPort }}"
+        protocol: TCP
+{{- else }}
+# No Cilium CRD: fall back to a CNI-agnostic default-deny-ingress policy so the
+# socket is never offered without protection. This denies ingress from the pod
+# network (the injection path, whose source is a real pod IP). The node-local
+# push path (portmap SNATs the source to the node) keeps flowing on CNIs that
+# exempt node-local/health traffic from policy enforcement, as the mainstream
+# policy CNIs do; a CNI that instead enforces policy on node-local traffic would
+# also block this push path, so on such a CNI keep Cilium or open the port
+# explicitly. The only non-Cilium variant shipped today is noop, which does not
+# enforce NetworkPolicy at all, so this fallback is inert there.
+apiVersion: networking.k8s.io/v1
+kind: NetworkPolicy
+metadata:
+  name: talos-log-collector
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "talos-log-collector.labels" . | nindent 4 }}
+spec:
+  podSelector:
+    matchLabels:
+      app.kubernetes.io/name: talos-log-collector
+  policyTypes:
+  - Ingress
+  ingress: []
+{{- end }}
diff --git a/packages/system/talos-log-collector/templates/serviceaccount.yaml b/packages/system/talos-log-collector/templates/serviceaccount.yaml
new file mode 100644
index 0000000000..01aff56e69
--- /dev/null
+++ b/packages/system/talos-log-collector/templates/serviceaccount.yaml
@@ -0,0 +1,8 @@
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: talos-log-collector
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "talos-log-collector.labels" . | nindent 4 }}
+automountServiceAccountToken: false
diff --git a/packages/system/talos-log-collector/tests/talos-log-collector_test.yaml b/packages/system/talos-log-collector/tests/talos-log-collector_test.yaml
new file mode 100644
index 0000000000..f82d221591
--- /dev/null
+++ b/packages/system/talos-log-collector/tests/talos-log-collector_test.yaml
@@ -0,0 +1,200 @@
+suite: talos-log-collector receive/forward wiring
+
+# Pins the surface this package owns:
+#   - the DaemonSet pulls the first-party vector image from the cozystack
+#     registry (the load-bearing ref lives in images/vector.tag, re-pinned by
+#     `make image`);
+#   - Talos logs are received on the node loopback via hostPort+hostIP (the pod
+#     stays on the pod network for the sink; the loopback socket is published
+#     via portmap), NOT via hostNetwork;
+#   - the collector runs on every node (tolerate everything, node-critical);
+#   - logs are forwarded to the tenant VictoriaLogs vlinsert on port 9481, and
+#     the destination tenant (global.target) plumbs through verbatim.
+
+templates:
+  - templates/daemonset.yaml
+  - templates/configmap.yaml
+  - templates/serviceaccount.yaml
+  - templates/networkpolicy.yaml
+
+tests:
+  - it: "DaemonSet pulls the first-party vector image from the cozystack registry"
+    template: templates/daemonset.yaml
+    asserts:
+      - isKind:
+          of: DaemonSet
+      - matchRegex:
+          path: spec.template.spec.containers[0].image
+          pattern: "^ghcr\\.io/cozystack/cozystack/vector:"
+
+  - it: "receives Talos logs on node loopback via hostPort, not hostNetwork"
+    template: templates/daemonset.yaml
+    asserts:
+      - notExists:
+          path: spec.template.spec.hostNetwork
+      - equal:
+          path: spec.template.spec.containers[0].ports[0].hostIP
+          value: 127.0.0.1
+      - equal:
+          path: spec.template.spec.containers[0].ports[0].hostPort
+          value: 5170
+
+  - it: "runs on every node and is node-critical"
+    template: templates/daemonset.yaml
+    asserts:
+      - equal:
+          path: spec.template.spec.priorityClassName
+          value: system-node-critical
+      - contains:
+          path: spec.template.spec.tolerations
+          content:
+            effect: NoSchedule
+            operator: Exists
+      - contains:
+          path: spec.template.spec.tolerations
+          content:
+            effect: NoExecute
+            operator: Exists
+
+  - it: "forwards to the tenant VictoriaLogs vlinsert on 9481"
+    template: templates/configmap.yaml
+    asserts:
+      - matchRegex:
+          path: data["vector.yaml"]
+          pattern: "vlinsert-generic\\.tenant-root\\.svc:9481"
+
+  - it: "stamps tenant and cluster on records and streams them (parity with monitoring-agents)"
+    template: templates/configmap.yaml
+    asserts:
+      - matchRegex:
+          path: data["vector.yaml"]
+          pattern: '\.tenant = "tenant-root"'
+      - matchRegex:
+          path: data["vector.yaml"]
+          pattern: '\.cluster = "root-cluster"'
+      - matchRegex:
+          path: data["vector.yaml"]
+          pattern: "_stream_fields=node,log_source,talos-service,facility,tenant,cluster"
+
+  - it: "destination tenant is overridable via global.target"
+    template: templates/configmap.yaml
+    set:
+      global:
+        target: tenant-ktj
+    asserts:
+      - matchRegex:
+          path: data["vector.yaml"]
+          pattern: "vlinsert-generic\\.tenant-ktj\\.svc:9481"
+
+  - it: "listenPort drives the DaemonSet host/container ports"
+    template: templates/daemonset.yaml
+    set:
+      listenPort: 6000
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].ports[0].containerPort
+          value: 6000
+      - equal:
+          path: spec.template.spec.containers[0].ports[0].hostPort
+          value: 6000
+
+  - it: "listenPort drives the Vector socket address"
+    template: templates/configmap.yaml
+    set:
+      listenPort: 6000
+    asserts:
+      - matchRegex:
+          path: data["vector.yaml"]
+          pattern: "address: 0\\.0\\.0\\.0:6000"
+
+  - it: "container runs unprivileged and non-root"
+    template: templates/daemonset.yaml
+    asserts:
+      - equal:
+          path: spec.template.spec.securityContext.runAsNonRoot
+          value: true
+      - equal:
+          path: spec.template.spec.containers[0].securityContext.allowPrivilegeEscalation
+          value: false
+      - equal:
+          path: spec.template.spec.containers[0].securityContext.readOnlyRootFilesystem
+          value: true
+      - contains:
+          path: spec.template.spec.containers[0].securityContext.capabilities.drop
+          content: ALL
+
+  - it: "ServiceAccount disables token automount"
+    template: templates/serviceaccount.yaml
+    asserts:
+      - equal:
+          path: automountServiceAccountToken
+          value: false
+
+  - it: "NetworkPolicy restricts ingress to the host entity on the listen port"
+    template: templates/networkpolicy.yaml
+    capabilities:
+      apiVersions:
+        - cilium.io/v2/CiliumNetworkPolicy
+    asserts:
+      - hasDocuments:
+          count: 1
+      - isKind:
+          of: CiliumNetworkPolicy
+      - equal:
+          path: spec.ingress[0].fromEntities[0]
+          value: host
+      - equal:
+          path: spec.ingress[0].toPorts[0].ports[0].port
+          value: "5170"
+
+  - it: "Cilium NetworkPolicy ingress port follows the listenPort override"
+    template: templates/networkpolicy.yaml
+    capabilities:
+      apiVersions:
+        - cilium.io/v2/CiliumNetworkPolicy
+    set:
+      listenPort: 6000
+    asserts:
+      - equal:
+          path: spec.ingress[0].toPorts[0].ports[0].port
+          value: "6000"
+
+  - it: "falls back to a CNI-agnostic default-deny NetworkPolicy when the Cilium CRD is absent"
+    template: templates/networkpolicy.yaml
+    asserts:
+      - hasDocuments:
+          count: 1
+      - isKind:
+          of: NetworkPolicy
+      - isAPIVersion:
+          of: networking.k8s.io/v1
+      - equal:
+          path: spec.podSelector.matchLabels["app.kubernetes.io/name"]
+          value: talos-log-collector
+      - contains:
+          path: spec.policyTypes
+          content: Ingress
+      - isNullOrEmpty:
+          path: spec.ingress
+
+  - it: "cpu is a request only; memory is request and limit"
+    template: templates/daemonset.yaml
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].resources.requests.cpu
+          value: 100m
+      - equal:
+          path: spec.template.spec.containers[0].resources.requests.memory
+          value: 128Mi
+      - equal:
+          path: spec.template.spec.containers[0].resources.limits.memory
+          value: 128Mi
+      - notExists:
+          path: spec.template.spec.containers[0].resources.limits.cpu
+
+  - it: "has a tcpSocket liveness probe on the listen port"
+    template: templates/daemonset.yaml
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].livenessProbe.tcpSocket.port
+          value: talos
diff --git a/packages/system/talos-log-collector/values.schema.json b/packages/system/talos-log-collector/values.schema.json
new file mode 100644
index 0000000000..24c18b5254
--- /dev/null
+++ b/packages/system/talos-log-collector/values.schema.json
@@ -0,0 +1,72 @@
+{
+  "title": "Chart Values",
+  "type": "object",
+  "properties": {
+    "logLevel": {
+      "description": "Vector log verbosity (trace, debug, info, warn, error).",
+      "type": "string",
+      "default": "warn",
+      "enum": [
+        "trace",
+        "debug",
+        "info",
+        "warn",
+        "error"
+      ]
+    },
+    "listenPort": {
+      "description": "TCP port bound on the node loopback (127.0.0.1) where Talos machine.logging pushes logs.",
+      "type": "integer",
+      "default": 5170,
+      "maximum": 65535,
+      "minimum": 1
+    },
+    "resources": {
+      "description": "Compute resources for the collector.",
+      "type": "object",
+      "default": {},
+      "properties": {
+        "cpu": {
+          "description": "CPU request.",
+          "default": "100m",
+          "pattern": "^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$",
+          "anyOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "type": "string"
+            }
+          ],
+          "x-kubernetes-int-or-string": true
+        },
+        "memory": {
+          "description": "Memory request and limit.",
+          "default": "128Mi",
+          "pattern": "^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$",
+          "anyOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "type": "string"
+            }
+          ],
+          "x-kubernetes-int-or-string": true
+        }
+      }
+    },
+    "global": {
+      "description": "Global values block; `target` selects the destination tenant.",
+      "type": "object",
+      "default": {},
+      "properties": {
+        "target": {
+          "description": "Tenant whose VictoriaLogs (vlinsert-generic.\u003ctarget\u003e.svc) receives the logs. Defaults to tenant-root; override via bundle values.",
+          "type": "string",
+          "default": "tenant-root"
+        }
+      }
+    }
+  }
+}
diff --git a/packages/system/talos-log-collector/values.yaml b/packages/system/talos-log-collector/values.yaml
new file mode 100644
index 0000000000..3b45fb91b3
--- /dev/null
+++ b/packages/system/talos-log-collector/values.yaml
@@ -0,0 +1,38 @@
+##
+## @section Common parameters
+##
+
+## @enum {string} LogLevel - Vector log verbosity.
+## @value trace
+## @value debug
+## @value info
+## @value warn
+## @value error
+
+## @param {LogLevel} [logLevel] - Vector log verbosity (trace, debug, info, warn, error).
+logLevel: warn
+
+## @param {int} [listenPort] - TCP port bound on the node loopback (127.0.0.1) where Talos machine.logging pushes logs.
+## @minimum 1
+## @maximum 65535
+listenPort: 5170
+
+## @typedef {struct} Resources - Compute resources for the collector.
+## @field {quantity} [cpu] - CPU request.
+## @field {quantity} [memory] - Memory request and limit.
+
+## @param {Resources} [resources] - Compute resources for the collector.
+resources:
+  cpu: 100m
+  memory: 128Mi
+
+##
+## @section VictoriaLogs destination
+##
+
+## @typedef {struct} Global - Global values block; `target` selects the destination tenant.
+## @field {string} [target] - Tenant whose VictoriaLogs (vlinsert-generic.<target>.svc) receives the logs. Defaults to tenant-root; override via bundle values.
+
+## @param {Global} [global] - Global values block; `target` selects the destination tenant.
+global:
+  target: tenant-root
diff --git a/packages/system/tcp-balancer-rd/cozyrds/tcp-balancer.yaml b/packages/system/tcp-balancer-rd/cozyrds/tcp-balancer.yaml
index c61e98c2a0..a51215174f 100644
--- a/packages/system/tcp-balancer-rd/cozyrds/tcp-balancer.yaml
+++ b/packages/system/tcp-balancer-rd/cozyrds/tcp-balancer.yaml
@@ -8,7 +8,7 @@ spec:
     plural: tcpbalancers
     singular: tcpbalancer
     openAPISchema: |-
-      {"title":"Chart Values","type":"object","properties":{"replicas":{"description":"Number of HAProxy replicas.","type":"integer","default":2},"resources":{"description":"Explicit CPU and memory configuration for each TCP Balancer replica. When omitted, the preset defined in `resourcesPreset` is applied.","type":"object","default":{},"properties":{"cpu":{"description":"CPU available to each replica.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Memory (RAM) available to each replica.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}},"resourcesPreset":{"description":"Default sizing preset used when `resources` is omitted.","type":"string","default":"t1.nano","enum":["t1.nano","t1.micro","t1.small","t1.medium","t1.large","t1.xlarge","t1.2xlarge","t1.4xlarge","c1.nano","c1.micro","c1.small","c1.medium","c1.large","c1.xlarge","c1.2xlarge","c1.4xlarge","s1.nano","s1.micro","s1.small","s1.medium","s1.large","s1.xlarge","s1.2xlarge","s1.4xlarge","u1.nano","u1.micro","u1.small","u1.medium","u1.large","u1.xlarge","u1.2xlarge","u1.4xlarge","m1.nano","m1.micro","m1.small","m1.medium","m1.large","m1.xlarge","m1.2xlarge","m1.4xlarge","nano","micro","small","medium","large","xlarge","2xlarge"]},"external":{"description":"Enable external access from outside the cluster.","type":"boolean","default":false},"httpAndHttps":{"description":"HTTP and HTTPS configuration.","type":"object","default":{},"required":["mode","targetPorts"],"properties":{"endpoints":{"description":"Endpoint addresses list.","type":"array","default":[],"items":{"type":"string"}},"mode":{"description":"Mode for balancer.","type":"string","default":"tcp","enum":["tcp","tcp-with-proxy"]},"targetPorts":{"description":"Target ports configuration.","type":"object","default":{},"required":["http","https"],"properties":{"http":{"description":"HTTP port number.","type":"integer","default":80},"https":{"description":"HTTPS port number.","type":"integer","default":443}}}}},"whitelistHTTP":{"description":"Secure HTTP by whitelisting client networks (default: false).","type":"boolean","default":false},"whitelist":{"description":"List of allowed client networks.","type":"array","default":[],"items":{"type":"string"}}}}
+      {"title":"Chart Values","type":"object","properties":{"replicas":{"description":"Number of HAProxy replicas.","type":"integer","default":2},"resources":{"description":"Explicit CPU and memory configuration for each TCP Balancer replica. When omitted, the preset defined in `resourcesPreset` is applied.","type":"object","default":{},"properties":{"cpu":{"description":"CPU available to each replica.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Memory (RAM) available to each replica.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}},"resourcesPreset":{"description":"Default sizing preset used when `resources` is omitted.","type":"string","default":"t1.nano","enum":["t1.nano","t1.micro","t1.small","t1.medium","t1.large","t1.xlarge","t1.2xlarge","t1.4xlarge","c1.nano","c1.micro","c1.small","c1.medium","c1.large","c1.xlarge","c1.2xlarge","c1.4xlarge","s1.nano","s1.micro","s1.small","s1.medium","s1.large","s1.xlarge","s1.2xlarge","s1.4xlarge","u1.nano","u1.micro","u1.small","u1.medium","u1.large","u1.xlarge","u1.2xlarge","u1.4xlarge","m1.nano","m1.micro","m1.small","m1.medium","m1.large","m1.xlarge","m1.2xlarge","m1.4xlarge","nano","micro","small","medium","large","xlarge","2xlarge"]},"external":{"description":"Enable external access from outside the cluster.","type":"boolean","default":false},"httpAndHttps":{"description":"HTTP and HTTPS configuration.","type":"object","default":{},"required":["mode","targetPorts"],"properties":{"endpoints":{"description":"Endpoint addresses list.","type":"array","default":[],"items":{"type":"string"}},"mode":{"description":"Mode for balancer.","type":"string","default":"tcp","enum":["tcp","tcp-with-proxy"]},"targetPorts":{"description":"Target ports configuration.","type":"object","default":{},"required":["http","https"],"properties":{"http":{"description":"HTTP port number.","type":"integer","default":80},"https":{"description":"HTTPS port number.","type":"integer","default":443}}}}},"whitelistHTTP":{"description":"Secure HTTP and HTTPS by whitelisting client networks. Requires a non-empty `whitelist` (default: false).","type":"boolean","default":false},"whitelist":{"description":"List of allowed client networks.","type":"array","default":[],"items":{"type":"string"}}}}
   release:
     prefix: tcp-balancer-
     labels:
diff --git a/packages/system/tenant-rd/cozyrds/tenant.yaml b/packages/system/tenant-rd/cozyrds/tenant.yaml
index e6532ef79e..940624ef67 100644
--- a/packages/system/tenant-rd/cozyrds/tenant.yaml
+++ b/packages/system/tenant-rd/cozyrds/tenant.yaml
@@ -21,7 +21,7 @@ spec:
     singular: tenant
     plural: tenants
     openAPISchema: |-
-      {"title":"Chart Values","type":"object","properties":{"host":{"description":"The hostname used to access tenant services (defaults to using the tenant name as a subdomain for its parent tenant host).","type":"string","default":""},"etcd":{"description":"Deploy own Etcd cluster.","type":"boolean","default":false},"monitoring":{"description":"Deploy own Monitoring Stack.","type":"boolean","default":false},"ingress":{"description":"Deploy own Ingress Controller.","type":"boolean","default":false},"gateway":{"description":"Deploy own Gateway API Gateway (backed by Cilium Gateway API controller). When unset (the default), the chart auto-enables the Gateway for tenants whose apex is derived from the parent (i.e. `host` is empty), and leaves it off for tenants with a custom non-derived apex. Set to `true` or `false` explicitly to override that auto-behaviour. Note: leave the key absent (do not write `gateway: null`) — the chart distinguishes \"unset\" via missing-key, not via null value, to satisfy the JSON schema generated from this comment.","type":"boolean"},"seaweedfs":{"description":"Deploy own SeaweedFS.","type":"boolean","default":false},"schedulingClass":{"description":"The name of a SchedulingClass CR to apply scheduling constraints for this tenant's workloads.","type":"string","default":""},"resourceQuotas":{"description":"Define resource quotas for the tenant.","type":"object","default":{},"additionalProperties":{"pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}}}
+      {"title":"Chart Values","type":"object","properties":{"host":{"description":"The hostname used to access tenant services (defaults to using the tenant name as a subdomain for its parent tenant host).","type":"string","default":""},"etcd":{"description":"Deploy own Etcd cluster.","type":"boolean","default":false},"monitoring":{"description":"Deploy own Monitoring Stack.","type":"boolean","default":false},"tracingCentral":{"description":"Send this tenant's traces to the shared VictoriaTraces store in tenant-root instead of a per-tenant backend; its Grafana reads them through a vmauth there that pins the tenant's own account, so tenants sharing the store cannot read each other's traces. It needs the tenant's own Monitoring (`monitoring: true`) and tenant-root hosting the store (`tracingCentralHost: true` on its Monitoring, with a `cluster`-mode tracingStorages entry named `generic`); without that the tenant's monitoring render fails rather than dropping spans. tenant-root, and whoever it admits to its Grafana, are inside the store's trust boundary. Applications should export over OTLP/HTTP, in requests below 3 MiB: spans above the platform's per-tenant write rate are retried over HTTP but dropped over gRPC, and a larger request is refused and not retried.","type":"boolean","default":false},"ingress":{"description":"Deploy own Ingress Controller.","type":"boolean","default":false},"gateway":{"description":"Deploy own Gateway API Gateway (backed by Cilium Gateway API controller). When unset (the default) or set to `false`, the tenant does not own a Gateway and instead publishes through the nearest ancestor tenant that owns one, regardless of whether `host` is empty or custom (`false` currently behaves the same as unset and does not opt out of that inheritance). Set to `true` to give the tenant its own Gateway with its own LoadBalancer IP and Certificate. A tenant with a custom (non-derived) `host` that needs its apex publicly reachable must set `true` explicitly, because an ancestor's TLS certificate does not cover a custom apex. Note: leave the key absent (do not write `gateway: null`): the chart distinguishes \"unset\" via missing-key, not via null value, to satisfy the JSON schema generated from this comment.","type":"boolean"},"gatewayClass":{"description":"GatewayClass for this tenant's own Gateway. Empty uses the platform default (`gateway.className`). Only the classes the operator lists in the platform's `gateway.tenantSelectableClasses`, plus that default, may be named here — anything else fails this tenant's own gateway release and reaches no other tenant. Read only when this tenant owns a Gateway; an inheriting tenant uses its ancestor's. Whether a class terminates TLS itself or at its provider's edge is declared once per class on the platform, not here.","type":"string","default":""},"seaweedfs":{"description":"Deploy own SeaweedFS.","type":"boolean","default":false},"computeplane":{"description":"Deploy own ComputePlane — a single-tenant, Cozystack-managed cluster for untrusted-code applications. The tenant receives no admin kubeconfig for it. Automatic routing of catalog applications onto it (placement: ComputePlane) is a planned follow-up and is not available yet; until it lands, external catalogs target the cluster via its computeplane-cluster-admin-kubeconfig Secret. See design-proposals/compute-plane in cozystack/community.","type":"boolean","default":false},"schedulingClass":{"description":"The name of a SchedulingClass CR to apply scheduling constraints for this tenant's workloads.","type":"string","default":""},"resourceQuotas":{"description":"Define resource quotas for the tenant.","type":"object","default":{},"additionalProperties":{"pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}}}
   release:
     prefix: tenant-
     labels:
@@ -36,7 +36,7 @@ spec:
     plural: Tenants
     description: Separated tenant namespace
     icon: PHN2ZyB3aWR0aD0iMTQ0IiBoZWlnaHQ9IjE0NCIgdmlld0JveD0iMCAwIDE0NCAxNDQiIGZpbGw9Im5vbmUiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+CjxyZWN0IHdpZHRoPSIxNDQiIGhlaWdodD0iMTQ0IiByeD0iMjQiIGZpbGw9InVybCgjcGFpbnQwX2xpbmVhcl82ODdfMzQwMykiLz4KPGcgY2xpcC1wYXRoPSJ1cmwoI2NsaXAwXzY4N18zNDAzKSI+CjxwYXRoIGQ9Ik03MiAyOUM2Ni4zOTI2IDI5IDYxLjAxNDggMzEuMjM4OCA1Ny4wNDk3IDM1LjIyNEM1My4wODQ3IDM5LjIwOTEgNTAuODU3MSA0NC42MTQxIDUwLjg1NzEgNTAuMjVDNTAuODU3MSA1NS44ODU5IDUzLjA4NDcgNjEuMjkwOSA1Ny4wNDk3IDY1LjI3NkM2MS4wMTQ4IDY5LjI2MTIgNjYuMzkyNiA3MS41IDcyIDcxLjVDNzcuNjA3NCA3MS41IDgyLjk4NTIgNjkuMjYxMiA4Ni45NTAzIDY1LjI3NkM5MC45MTUzIDYxLjI5MDkgOTMuMTQyOSA1NS44ODU5IDkzLjE0MjkgNTAuMjVDOTMuMTQyOSA0NC42MTQxIDkwLjkxNTMgMzkuMjA5MSA4Ni45NTAzIDM1LjIyNEM4Mi45ODUyIDMxLjIzODggNzcuNjA3NCAyOSA3MiAyOVpNNjAuOTgyNiA4My4zMDM3QzYwLjQ1NCA4Mi41ODk4IDU5LjU5NTEgODIuMTkxNCA1OC43MTk2IDgyLjI3NDRDNDUuMzg5NyA4My43MzU0IDM1IDk1LjEwNzQgMzUgMTA4LjkwM0MzNSAxMTEuNzI2IDM3LjI3OTUgMTE0IDQwLjA3MSAxMTRIMTAzLjkyOUMxMDYuNzM3IDExNCAxMDkgMTExLjcwOSAxMDkgMTA4LjkwM0MxMDkgOTUuMTA3NCA5OC42MTAzIDgzLjc1MiA4NS4yNjM4IDgyLjI5MUM4NC4zODg0IDgyLjE5MTQgODMuNTI5NSA4Mi42MDY0IDgzLjAwMDkgODMuMzIwM0w3NC4wOTc4IDk1LjI0MDJDNzMuMDQwNiA5Ni42NTE0IDcwLjkyNjMgOTYuNjUxNCA2OS44NjkyIDk1LjI0MDJMNjAuOTY2MSA4My4zMjAzTDYwLjk4MjYgODMuMzAzN1oiIGZpbGw9ImJsYWNrIi8+CjwvZz4KPGRlZnM+CjxsaW5lYXJHcmFkaWVudCBpZD0icGFpbnQwX2xpbmVhcl82ODdfMzQwMyIgeDE9IjcyIiB5MT0iMTQ0IiB4Mj0iLTEuMjgxN2UtMDUiIHkyPSI0IiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+CjxzdG9wIHN0b3AtY29sb3I9IiNDMEQ2RkYiLz4KPHN0b3Agb2Zmc2V0PSIwLjMiIHN0b3AtY29sb3I9IiNDNERBRkYiLz4KPHN0b3Agb2Zmc2V0PSIwLjY1IiBzdG9wLWNvbG9yPSIjRDNFOUZGIi8+CjxzdG9wIG9mZnNldD0iMSIgc3RvcC1jb2xvcj0iI0U5RkZGRiIvPgo8L2xpbmVhckdyYWRpZW50Pgo8Y2xpcFBhdGggaWQ9ImNsaXAwXzY4N18zNDAzIj4KPHJlY3Qgd2lkdGg9Ijc0IiBoZWlnaHQ9Ijg1IiBmaWxsPSJ3aGl0ZSIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoMzUgMjkpIi8+CjwvY2xpcFBhdGg+CjwvZGVmcz4KPC9zdmc+Cg==
-    keysOrder: [["apiVersion"], ["appVersion"], ["kind"], ["metadata"], ["metadata", "name"], ["spec", "host"], ["spec", "etcd"], ["spec", "monitoring"], ["spec", "ingress"], ["spec", "seaweedfs"], ["spec", "schedulingClass"], ["spec", "resourceQuotas"]]
+    keysOrder: [["apiVersion"], ["appVersion"], ["kind"], ["metadata"], ["metadata", "name"], ["spec", "host"], ["spec", "etcd"], ["spec", "monitoring"], ["spec", "tracingCentral"], ["spec", "ingress"], ["spec", "gatewayClass"], ["spec", "seaweedfs"], ["spec", "computeplane"], ["spec", "schedulingClass"], ["spec", "resourceQuotas"]]
   secrets:
     exclude: []
     include: []
diff --git a/packages/system/valkey-rd/Chart.yaml b/packages/system/valkey-rd/Chart.yaml
new file mode 100644
index 0000000000..6485a560ec
--- /dev/null
+++ b/packages/system/valkey-rd/Chart.yaml
@@ -0,0 +1,3 @@
+apiVersion: v2
+name: valkey-rd
+version: 0.0.0 # Placeholder, the actual version will be automatically set during the build process
diff --git a/packages/system/valkey-rd/Makefile b/packages/system/valkey-rd/Makefile
new file mode 100644
index 0000000000..73a56ee0f0
--- /dev/null
+++ b/packages/system/valkey-rd/Makefile
@@ -0,0 +1,4 @@
+export NAME=valkey-rd
+export NAMESPACE=cozy-system
+
+include ../../../hack/package.mk
diff --git a/packages/system/valkey-rd/cozyrds/valkey.yaml b/packages/system/valkey-rd/cozyrds/valkey.yaml
new file mode 100644
index 0000000000..31f7b5000b
--- /dev/null
+++ b/packages/system/valkey-rd/cozyrds/valkey.yaml
@@ -0,0 +1,41 @@
+apiVersion: cozystack.io/v1alpha1
+kind: ApplicationDefinition
+metadata:
+  name: valkey
+spec:
+  application:
+    kind: Valkey
+    plural: valkeys
+    singular: valkey
+    openAPISchema: |-
+      {"title":"Chart Values","type":"object","properties":{"replicas":{"description":"Number of Valkey replicas.","type":"integer","default":2},"resources":{"description":"Explicit CPU and memory configuration for each Valkey replica. When omitted, the preset defined in `resourcesPreset` is applied.","type":"object","default":{},"properties":{"cpu":{"description":"CPU available to each replica.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Memory (RAM) available to each replica.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}},"resourcesPreset":{"description":"Default sizing preset used when `resources` is omitted.","type":"string","default":"t1.nano","enum":["t1.nano","t1.micro","t1.small","t1.medium","t1.large","t1.xlarge","t1.2xlarge","t1.4xlarge","c1.nano","c1.micro","c1.small","c1.medium","c1.large","c1.xlarge","c1.2xlarge","c1.4xlarge","s1.nano","s1.micro","s1.small","s1.medium","s1.large","s1.xlarge","s1.2xlarge","s1.4xlarge","u1.nano","u1.micro","u1.small","u1.medium","u1.large","u1.xlarge","u1.2xlarge","u1.4xlarge","m1.nano","m1.micro","m1.small","m1.medium","m1.large","m1.xlarge","m1.2xlarge","m1.4xlarge","nano","micro","small","medium","large","xlarge","2xlarge"]},"size":{"description":"Persistent Volume Claim size available for application data.","default":"1Gi","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"storageClass":{"description":"StorageClass used to store the data.","type":"string","default":"","x-kubernetes-validations":[{"rule":"self == oldSelf","message":"storageClass is immutable"}],"x-cozystack-options":{"source":"storageclass"}},"external":{"description":"Enable external access from outside the cluster.","type":"boolean","default":false},"version":{"description":"Valkey major version to deploy","type":"string","default":"v8","enum":["v8","v7"]},"authEnabled":{"description":"Enable password generation.","type":"boolean","default":true}}}
+  release:
+    prefix: valkey-
+    labels:
+      sharding.fluxcd.io/key: tenants
+    chartRef:
+      kind: ExternalArtifact
+      name: cozystack-valkey-application-default-valkey
+      namespace: cozy-system
+  dashboard:
+    category: PaaS
+    singular: Valkey
+    plural: Valkey
+    description: Managed Valkey service
+    tags:
+      - cache
+    icon: PHN2ZyB3aWR0aD0iMTQ0IiBoZWlnaHQ9IjE0NCIgdmlld0JveD0iMCAwIDE0NCAxNDQiIGZpbGw9Im5vbmUiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+CiAgPHJlY3Qgd2lkdGg9IjE0NCIgaGVpZ2h0PSIxNDQiIHJ4PSIyNCIgZmlsbD0idXJsKCN2YWxrZXlfYmcpIi8+CiAgPHBhdGggZD0iTTM2IDQwaDE4bDE4IDQ0IDE4LTQ0aDE4TDgwIDEwOGgtMTZMMzYgNDB6IiBmaWxsPSIjZmZmZmZmIi8+CiAgPGNpcmNsZSBjeD0iNzIiIGN5PSI1MiIgcj0iNyIgZmlsbD0iI2ZmZmZmZiIvPgogIDxkZWZzPgogICAgPGxpbmVhckdyYWRpZW50IGlkPSJ2YWxrZXlfYmciIHgxPSIwIiB5MT0iMCIgeDI9IjE0NCIgeTI9IjE0NCIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiPgogICAgICA8c3RvcCBzdG9wLWNvbG9yPSIjN0EzQkZGIi8+CiAgICAgIDxzdG9wIG9mZnNldD0iMSIgc3RvcC1jb2xvcj0iI0M2MjQ5QiIvPgogICAgPC9saW5lYXJHcmFkaWVudD4KICA8L2RlZnM+Cjwvc3ZnPgo=
+    keysOrder: [["apiVersion"], ["appVersion"], ["kind"], ["metadata"], ["metadata", "name"], ["spec", "replicas"], ["spec", "resources"], ["spec", "resourcesPreset"], ["spec", "size"], ["spec", "storageClass"], ["spec", "external"], ["spec", "version"], ["spec", "authEnabled"]]
+  secrets:
+    exclude: []
+    include:
+      - resourceNames:
+          - valkey-{{ .name }}-auth
+  services:
+    exclude: []
+    include:
+      - resourceNames:
+          - rfs-valkey-{{ .name }}
+          - rfrm-valkey-{{ .name }}
+          - rfrs-valkey-{{ .name }}
+          - valkey-{{ .name }}-external-lb
diff --git a/packages/system/valkey-rd/templates/cozyrd.yaml b/packages/system/valkey-rd/templates/cozyrd.yaml
new file mode 100644
index 0000000000..e079ddcf31
--- /dev/null
+++ b/packages/system/valkey-rd/templates/cozyrd.yaml
@@ -0,0 +1,4 @@
+{{- range $path, $_ := .Files.Glob "cozyrds/*" }}
+---
+{{ $.Files.Get $path }}
+{{- end }}
diff --git a/packages/system/valkey-rd/values.yaml b/packages/system/valkey-rd/values.yaml
new file mode 100644
index 0000000000..0967ef424b
--- /dev/null
+++ b/packages/system/valkey-rd/values.yaml
@@ -0,0 +1 @@
+{}
diff --git a/packages/system/velero/Makefile b/packages/system/velero/Makefile
index 44eba95114..9c172af3d7 100644
--- a/packages/system/velero/Makefile
+++ b/packages/system/velero/Makefile
@@ -1,11 +1,32 @@
+KUBEVIRT_VELERO_PLUGIN_TAG=$(shell grep -F 'ARG VERSION=' images/kubevirt-velero-plugin/Dockerfile | cut -f2 -d=)
 export NAME=velero
 export NAMESPACE=cozy-$(NAME)
 
+include ../../../hack/common-envs.mk
 include ../../../hack/package.mk
 
+image:
+	docker buildx build images/kubevirt-velero-plugin \
+		$(call image-tags,kubevirt-velero-plugin,$(KUBEVIRT_VELERO_PLUGIN_TAG)) \
+		$(call cache-args,kubevirt-velero-plugin) \
+		--metadata-file images/kubevirt-velero-plugin.json \
+		$(BUILDX_ARGS)
+	# sed rather than yq -i: yq re-indents the initContainers list and drops
+	# blank lines elsewhere in the file, so every stamp would reformat it.
+	IMAGE="$(REGISTRY)/kubevirt-velero-plugin:$(IMAGE_TAG)@$$(yq e '."containerimage.digest"' images/kubevirt-velero-plugin.json -o json -r)" && \
+		sed -i "s|image: [^ ]*/kubevirt-velero-plugin:[^ ]*$$|image: $$IMAGE|" values.yaml && \
+		grep -qF "image: $$IMAGE" values.yaml
+	rm -f images/kubevirt-velero-plugin.json
+
+test:
+	helm unittest .
+
 update:
 	rm -rf charts
 	# Velero
 	helm repo add tanzu https://vmware-tanzu.github.io/helm-charts
 	helm repo update tanzu
-	helm pull tanzu/velero --untar --untardir charts
+	helm pull tanzu/velero --untar --untardir charts --version 12.0.3
+	# Render a startupProbe from .Values.startupProbe (upstream chart omits it),
+	# so a slow server start under heavy parallel install does not trip liveness.
+	patch --no-backup-if-mismatch -p4 < patches/add-startup-probe.patch
diff --git a/packages/system/velero/charts/velero/Chart.yaml b/packages/system/velero/charts/velero/Chart.yaml
index 2f30300433..51b133a8ee 100644
--- a/packages/system/velero/charts/velero/Chart.yaml
+++ b/packages/system/velero/charts/velero/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 1.17.0
+appVersion: 1.18.1
 description: A Helm chart for velero
 home: https://github.com/vmware-tanzu/velero
 icon: https://cdn-images-1.medium.com/max/1600/1*-9mb3AKnKdcL_QD3CMnthQ.png
@@ -14,4 +14,4 @@ maintainers:
 name: velero
 sources:
 - https://github.com/vmware-tanzu/velero
-version: 11.0.0
+version: 12.0.3
diff --git a/packages/system/velero/charts/velero/ci/test-values.yaml b/packages/system/velero/charts/velero/ci/test-values.yaml
index 80d1fbfc4a..94607714f2 100644
--- a/packages/system/velero/charts/velero/ci/test-values.yaml
+++ b/packages/system/velero/charts/velero/ci/test-values.yaml
@@ -14,6 +14,7 @@ configuration:
   - name: backups-secondary
     bucket: velero-backups
     provider: aws
+    backupSyncPeriod: "3h"
     config:
       region: us-west-1
       profile: us-west-1-profile
diff --git a/packages/system/velero/charts/velero/crds/backuprepositories.yaml b/packages/system/velero/charts/velero/crds/backuprepositories.yaml
index 7714f73a13..f19f2cb116 100644
--- a/packages/system/velero/charts/velero/crds/backuprepositories.yaml
+++ b/packages/system/velero/charts/velero/crds/backuprepositories.yaml
@@ -116,8 +116,8 @@ spec:
                       nullable: true
                       type: string
                     message:
-                      description: Message is a message about the current status
-                        of the repo maintenance.
+                      description: Message is a message about the current status of
+                        the repo maintenance.
                       type: string
                     result:
                       description: Result is the result of the repo maintenance.
@@ -126,8 +126,7 @@ spec:
                       - Failed
                       type: string
                     startTimestamp:
-                      description: StartTimestamp is the start time of the repo
-                        maintenance.
+                      description: StartTimestamp is the start time of the repo maintenance.
                       format: date-time
                       nullable: true
                       type: string
diff --git a/packages/system/velero/charts/velero/crds/backups.yaml b/packages/system/velero/charts/velero/crds/backups.yaml
index a67680298c..bb5568849a 100644
--- a/packages/system/velero/charts/velero/crds/backups.yaml
+++ b/packages/system/velero/charts/velero/crds/backups.yaml
@@ -124,8 +124,8 @@ spec:
                           nullable: true
                           type: array
                         excludedResources:
-                          description: ExcludedResources specifies the resources
-                            to which this hook spec does not apply.
+                          description: ExcludedResources specifies the resources to
+                            which this hook spec does not apply.
                           items:
                             type: string
                           nullable: true
@@ -147,8 +147,8 @@ spec:
                           nullable: true
                           type: array
                         labelSelector:
-                          description: LabelSelector, if specified, filters the
-                            resources to which this hook spec applies.
+                          description: LabelSelector, if specified, filters the resources
+                            to which this hook spec applies.
                           nullable: true
                           properties:
                             matchExpressions:
@@ -202,8 +202,7 @@ spec:
                             PostHooks is a list of BackupResourceHooks to execute after storing the item in the backup.
                             These are executed after all "additional items" from item actions are processed.
                           items:
-                            description: BackupResourceHook defines a hook for a
-                              resource.
+                            description: BackupResourceHook defines a hook for a resource.
                             properties:
                               exec:
                                 description: Exec defines an exec hook.
@@ -222,8 +221,8 @@ spec:
                                     type: string
                                   onError:
                                     description: OnError specifies how Velero should
-                                      behave if it encounters an error executing
-                                      this hook.
+                                      behave if it encounters an error executing this
+                                      hook.
                                     enum:
                                     - Continue
                                     - Fail
@@ -245,8 +244,7 @@ spec:
                             PreHooks is a list of BackupResourceHooks to execute prior to storing the item in the backup.
                             These are executed before any "additional items" from item actions are processed.
                           items:
-                            description: BackupResourceHook defines a hook for a
-                              resource.
+                            description: BackupResourceHook defines a hook for a resource.
                             properties:
                               exec:
                                 description: Exec defines an exec hook.
@@ -265,8 +263,8 @@ spec:
                                     type: string
                                   onError:
                                     description: OnError specifies how Velero should
-                                      behave if it encounters an error executing
-                                      this hook.
+                                      behave if it encounters an error executing this
+                                      hook.
                                     enum:
                                     - Continue
                                     - Fail
@@ -407,16 +405,16 @@ spec:
                     label selector matches no objects.
                   properties:
                     matchExpressions:
-                      description: matchExpressions is a list of label selector
-                        requirements. The requirements are ANDed.
+                      description: matchExpressions is a list of label selector requirements.
+                        The requirements are ANDed.
                       items:
                         description: |-
                           A label selector requirement is a selector that contains values, a key, and an operator that
                           relates the key and values.
                         properties:
                           key:
-                            description: key is the label key that the selector
-                              applies to.
+                            description: key is the label key that the selector applies
+                              to.
                             type: string
                           operator:
                             description: |-
@@ -494,8 +492,8 @@ spec:
                 nullable: true
                 type: boolean
               storageLocation:
-                description: StorageLocation is a string containing the name of
-                  a BackupStorageLocation where the backup should be stored.
+                description: StorageLocation is a string containing the name of a
+                  BackupStorageLocation where the backup should be stored.
                 type: string
               ttl:
                 description: |-
@@ -503,8 +501,7 @@ spec:
                   the Backup should be retained for.
                 type: string
               uploaderConfig:
-                description: UploaderConfig specifies the configuration for the
-                  uploader.
+                description: UploaderConfig specifies the configuration for the uploader.
                 nullable: true
                 properties:
                   parallelFilesUpload:
@@ -513,12 +510,12 @@ spec:
                     type: integer
                 type: object
               volumeGroupSnapshotLabelKey:
-                description: VolumeGroupSnapshotLabelKey specifies the label key
-                  to group PVCs under a VGS.
+                description: VolumeGroupSnapshotLabelKey specifies the label key to
+                  group PVCs under a VGS.
                 type: string
               volumeSnapshotLocations:
-                description: VolumeSnapshotLocations is a list containing names
-                  of VolumeSnapshotLocations associated with this backup.
+                description: VolumeSnapshotLocations is a list containing names of
+                  VolumeSnapshotLocations associated with this backup.
                 items:
                   type: string
                 type: array
@@ -580,8 +577,8 @@ spec:
                   major, minor, and patch version.
                 type: string
               hookStatus:
-                description: HookStatus contains information about the status of
-                  the hooks.
+                description: HookStatus contains information about the status of the
+                  hooks.
                 nullable: true
                 properties:
                   hooksAttempted:
@@ -591,14 +588,16 @@ spec:
                       and the number of hooks that executed successfully.
                     type: integer
                   hooksFailed:
-                    description: HooksFailed is the total number of hooks which
-                      ended with an error
+                    description: HooksFailed is the total number of hooks which ended
+                      with an error
                     type: integer
                 type: object
               phase:
                 description: Phase is the current state of the Backup.
                 enum:
                 - New
+                - Queued
+                - ReadyToStart
                 - FailedValidation
                 - InProgress
                 - WaitingForPluginOperations
@@ -630,6 +629,11 @@ spec:
                       filters that happen as items are processed.
                     type: integer
                 type: object
+              queuePosition:
+                description: |-
+                  QueuePosition is the position of the backup in the queue.
+                  Only relevant when Phase is "Queued"
+                type: integer
               startTimestamp:
                 description: |-
                   StartTimestamp records the time a backup was started.
diff --git a/packages/system/velero/charts/velero/crds/backupstoragelocations.yaml b/packages/system/velero/charts/velero/crds/backupstoragelocations.yaml
index 5b59a074a1..1e5c2413f7 100644
--- a/packages/system/velero/charts/velero/crds/backupstoragelocations.yaml
+++ b/packages/system/velero/charts/velero/crds/backupstoragelocations.yaml
@@ -23,8 +23,8 @@ spec:
       jsonPath: .status.phase
       name: Phase
       type: string
-    - description: LastValidationTime is the last time the backup store location
-        was validated
+    - description: LastValidationTime is the last time the backup store location was
+        validated
       jsonPath: .status.lastValidationTime
       name: Last Validated
       type: date
@@ -59,8 +59,8 @@ spec:
           metadata:
             type: object
           spec:
-            description: BackupStorageLocationSpec defines the desired state of
-              a Velero BackupStorageLocation
+            description: BackupStorageLocationSpec defines the desired state of a
+              Velero BackupStorageLocation
             properties:
               accessMode:
                 description: AccessMode defines the permissions for the backup storage
@@ -84,8 +84,8 @@ spec:
                   to be used with this location
                 properties:
                   key:
-                    description: The key of the secret to select from.  Must be
-                      a valid secret key.
+                    description: The key of the secret to select from.  Must be a
+                      valid secret key.
                     type: string
                   name:
                     default: ""
@@ -115,10 +115,38 @@ spec:
                     description: Bucket is the bucket to use for object storage.
                     type: string
                   caCert:
-                    description: CACert defines a CA bundle to use when verifying
-                      TLS connections to the provider.
+                    description: |-
+                      CACert defines a CA bundle to use when verifying TLS connections to the provider.
+                      Deprecated: Use CACertRef instead.
                     format: byte
                     type: string
+                  caCertRef:
+                    description: |-
+                      CACertRef is a reference to a Secret containing the CA certificate bundle to use
+                      when verifying TLS connections to the provider. The Secret must be in the same
+                      namespace as the BackupStorageLocation.
+                    properties:
+                      key:
+                        description: The key of the secret to select from.  Must be
+                          a valid secret key.
+                        type: string
+                      name:
+                        default: ""
+                        description: |-
+                          Name of the referent.
+                          This field is effectively required, but due to backwards compatibility is
+                          allowed to be empty. Instances of this type with an empty value here are
+                          almost certainly wrong.
+                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                        type: string
+                      optional:
+                        description: Specify whether the Secret or its key must be
+                          defined
+                        type: boolean
+                    required:
+                    - key
+                    type: object
+                    x-kubernetes-map-type: atomic
                   prefix:
                     description: Prefix is the path inside a bucket to use for Velero
                       storage. Optional.
@@ -139,8 +167,8 @@ spec:
             - provider
             type: object
           status:
-            description: BackupStorageLocationStatus defines the observed state
-              of BackupStorageLocation
+            description: BackupStorageLocationStatus defines the observed state of
+              BackupStorageLocation
             properties:
               accessMode:
                 description: |-
diff --git a/packages/system/velero/charts/velero/crds/datadownloads.yaml b/packages/system/velero/charts/velero/crds/datadownloads.yaml
index 8000389d5a..33769c5d66 100644
--- a/packages/system/velero/charts/velero/crds/datadownloads.yaml
+++ b/packages/system/velero/charts/velero/crds/datadownloads.yaml
@@ -35,8 +35,7 @@ spec:
       jsonPath: .status.progress.totalBytes
       name: Total Bytes
       type: integer
-    - description: Name of the Backup Storage Location where the backup data is
-        stored
+    - description: Name of the Backup Storage Location where the backup data is stored
       jsonPath: .spec.backupStorageLocation
       name: Storage Location
       type: string
@@ -96,8 +95,7 @@ spec:
                   If DataMover is "" or "velero", the built-in data mover will be used.
                 type: string
               nodeOS:
-                description: NodeOS is OS of the node where the DataDownload is
-                  processed.
+                description: NodeOS is OS of the node where the DataDownload is processed.
                 enum:
                 - auto
                 - linux
@@ -109,9 +107,13 @@ spec:
                   before returning error as timeout.
                 type: string
               snapshotID:
-                description: SnapshotID is the ID of the Velero backup snapshot
-                  to be restored from.
+                description: SnapshotID is the ID of the Velero backup snapshot to
+                  be restored from.
                 type: string
+              snapshotSize:
+                description: SnapshotSize is the logical size in Bytes of the snapshot.
+                format: int64
+                type: integer
               sourceNamespace:
                 description: |-
                   SourceNamespace is the original namespace where the volume is backed up from.
@@ -125,8 +127,8 @@ spec:
                     description: Namespace is the target namespace
                     type: string
                   pv:
-                    description: PV is the name of the target PV that is created
-                      by Velero restore
+                    description: PV is the name of the target PV that is created by
+                      Velero restore
                     type: string
                   pvc:
                     description: PVC is the name of the target PVC that is created
@@ -169,8 +171,7 @@ spec:
                 description: Message is a message about the DataDownload's status.
                 type: string
               node:
-                description: Node is name of the node where the DataDownload is
-                  processed.
+                description: Node is name of the node where the DataDownload is processed.
                 type: string
               phase:
                 description: Phase is the current state of the DataDownload.
diff --git a/packages/system/velero/charts/velero/crds/datauploads.yaml b/packages/system/velero/charts/velero/crds/datauploads.yaml
index 5a9fc2a667..f2025d1550 100644
--- a/packages/system/velero/charts/velero/crds/datauploads.yaml
+++ b/packages/system/velero/charts/velero/crds/datauploads.yaml
@@ -35,8 +35,14 @@ spec:
       jsonPath: .status.progress.totalBytes
       name: Total Bytes
       type: integer
-    - description: Name of the Backup Storage Location where this backup should
-        be stored
+    - description: Incremental bytes
+      format: int64
+      jsonPath: .status.incrementalBytes
+      name: Incremental Bytes
+      priority: 10
+      type: integer
+    - description: Name of the Backup Storage Location where this backup should be
+        stored
       jsonPath: .spec.backupStorageLocation
       name: Storage Location
       type: string
@@ -51,8 +57,8 @@ spec:
     name: v2alpha1
     schema:
       openAPIV3Schema:
-        description: DataUpload acts as the protocol between data mover plugins
-          and data mover controller for the datamover backup operation
+        description: DataUpload acts as the protocol between data mover plugins and
+          data mover controller for the datamover backup operation
         properties:
           apiVersion:
             description: |-
@@ -93,8 +99,8 @@ spec:
                     description: Driver is the driver used by the VolumeSnapshotContent
                     type: string
                   snapshotClass:
-                    description: SnapshotClass is the name of the snapshot class
-                      that the volume snapshot is created with
+                    description: SnapshotClass is the name of the snapshot class that
+                      the volume snapshot is created with
                     type: string
                   storageClass:
                     description: StorageClass is the name of the storage class of
@@ -135,8 +141,8 @@ spec:
                   It is the same namespace for SourcePVC and CSI namespaced objects.
                 type: string
               sourcePVC:
-                description: SourcePVC is the name of the PVC which the snapshot
-                  is taken for.
+                description: SourcePVC is the name of the PVC which the snapshot is
+                  taken for.
                 type: string
             required:
             - backupStorageLocation
@@ -175,6 +181,11 @@ spec:
                   as a result of the DataUpload.
                 nullable: true
                 type: object
+              incrementalBytes:
+                description: IncrementalBytes holds the number of bytes new or changed
+                  since the last backup
+                format: int64
+                type: integer
               message:
                 description: Message is a message about the DataUpload's status.
                 type: string
@@ -189,8 +200,8 @@ spec:
                 - windows
                 type: string
               path:
-                description: Path is the full path of the snapshot volume being
-                  backed up.
+                description: Path is the full path of the snapshot volume being backed
+                  up.
                 type: string
               phase:
                 description: Phase is the current state of the DataUpload.
diff --git a/packages/system/velero/charts/velero/crds/deletebackuprequests.yaml b/packages/system/velero/charts/velero/crds/deletebackuprequests.yaml
index 11c6a9d488..d4c2ab9eed 100644
--- a/packages/system/velero/charts/velero/crds/deletebackuprequests.yaml
+++ b/packages/system/velero/charts/velero/crds/deletebackuprequests.yaml
@@ -48,8 +48,8 @@ spec:
           metadata:
             type: object
           spec:
-            description: DeleteBackupRequestSpec is the specification for which
-              backups to delete.
+            description: DeleteBackupRequestSpec is the specification for which backups
+              to delete.
             properties:
               backupName:
                 type: string
diff --git a/packages/system/velero/charts/velero/crds/downloadrequests.yaml b/packages/system/velero/charts/velero/crds/downloadrequests.yaml
index 37489af54e..b2f896616f 100644
--- a/packages/system/velero/charts/velero/crds/downloadrequests.yaml
+++ b/packages/system/velero/charts/velero/crds/downloadrequests.yaml
@@ -41,8 +41,7 @@ spec:
           metadata:
             type: object
           spec:
-            description: DownloadRequestSpec is the specification for a download
-              request.
+            description: DownloadRequestSpec is the specification for a download request.
             properties:
               target:
                 description: Target is what to download (e.g. logs for a backup).
@@ -84,8 +83,8 @@ spec:
                   file.
                 type: string
               expiration:
-                description: Expiration is when this DownloadRequest expires and
-                  can be deleted by the system.
+                description: Expiration is when this DownloadRequest expires and can
+                  be deleted by the system.
                 format: date-time
                 nullable: true
                 type: string
diff --git a/packages/system/velero/charts/velero/crds/podvolumebackups.yaml b/packages/system/velero/charts/velero/crds/podvolumebackups.yaml
index a232b94583..1adb91491a 100644
--- a/packages/system/velero/charts/velero/crds/podvolumebackups.yaml
+++ b/packages/system/velero/charts/velero/crds/podvolumebackups.yaml
@@ -35,8 +35,14 @@ spec:
       jsonPath: .status.progress.totalBytes
       name: Total Bytes
       type: integer
-    - description: Name of the Backup Storage Location where this backup should
-        be stored
+    - description: Incremental bytes
+      format: int64
+      jsonPath: .status.incrementalBytes
+      name: Incremental Bytes
+      priority: 10
+      type: integer
+    - description: Name of the Backup Storage Location where this backup should be
+        stored
       jsonPath: .spec.backupStorageLocation
       name: Storage Location
       type: string
@@ -91,8 +97,8 @@ spec:
                   on.
                 type: string
               pod:
-                description: Pod is a reference to the pod containing the volume
-                  to be backed up.
+                description: Pod is a reference to the pod containing the volume to
+                  be backed up.
                 properties:
                   apiVersion:
                     description: API version of the referent.
@@ -153,8 +159,8 @@ spec:
                 nullable: true
                 type: object
               uploaderType:
-                description: UploaderType is the type of the uploader to handle
-                  the data transfer.
+                description: UploaderType is the type of the uploader to handle the
+                  data transfer.
                 enum:
                 - kopia
                 - restic
@@ -191,9 +197,13 @@ spec:
                 format: date-time
                 nullable: true
                 type: string
+              incrementalBytes:
+                description: IncrementalBytes holds the number of bytes new or changed
+                  since the last backup
+                format: int64
+                type: integer
               message:
-                description: Message is a message about the pod volume backup's
-                  status.
+                description: Message is a message about the pod volume backup's status.
                 type: string
               path:
                 description: Path is the full path within the controller pod being
diff --git a/packages/system/velero/charts/velero/crds/podvolumerestores.yaml b/packages/system/velero/charts/velero/crds/podvolumerestores.yaml
index 1521ec961f..13e2ff61bb 100644
--- a/packages/system/velero/charts/velero/crds/podvolumerestores.yaml
+++ b/packages/system/velero/charts/velero/crds/podvolumerestores.yaml
@@ -35,8 +35,7 @@ spec:
       jsonPath: .status.progress.totalBytes
       name: Total Bytes
       type: integer
-    - description: Name of the Backup Storage Location where the backup data is
-        stored
+    - description: Name of the Backup Storage Location where the backup data is stored
       jsonPath: .spec.backupStorageLocation
       name: Storage Location
       type: string
@@ -87,8 +86,8 @@ spec:
                   when the PodVolumeRestore is in InProgress phase
                 type: boolean
               pod:
-                description: Pod is a reference to the pod containing the volume
-                  to be restored.
+                description: Pod is a reference to the pod containing the volume to
+                  be restored.
                 properties:
                   apiVersion:
                     description: API version of the referent.
@@ -136,6 +135,10 @@ spec:
               snapshotID:
                 description: SnapshotID is the ID of the volume snapshot to be restored.
                 type: string
+              snapshotSize:
+                description: SnapshotSize is the logical size in Bytes of the snapshot.
+                format: int64
+                type: integer
               sourceNamespace:
                 description: SourceNamespace is the original namespace for namaspace
                   mapping.
@@ -149,16 +152,16 @@ spec:
                 nullable: true
                 type: object
               uploaderType:
-                description: UploaderType is the type of the uploader to handle
-                  the data transfer.
+                description: UploaderType is the type of the uploader to handle the
+                  data transfer.
                 enum:
                 - kopia
                 - restic
                 - ""
                 type: string
               volume:
-                description: Volume is the name of the volume within the Pod to
-                  be restored.
+                description: Volume is the name of the volume within the Pod to be
+                  restored.
                 type: string
             required:
             - backupStorageLocation
@@ -187,8 +190,7 @@ spec:
                 nullable: true
                 type: string
               message:
-                description: Message is a message about the pod volume restore's
-                  status.
+                description: Message is a message about the pod volume restore's status.
                 type: string
               node:
                 description: Node is name of the node where the pod volume restore
diff --git a/packages/system/velero/charts/velero/crds/restores.yaml b/packages/system/velero/charts/velero/crds/restores.yaml
index df1c1617eb..4aedbc3dc0 100644
--- a/packages/system/velero/charts/velero/crds/restores.yaml
+++ b/packages/system/velero/charts/velero/crds/restores.yaml
@@ -87,8 +87,8 @@ spec:
                           nullable: true
                           type: array
                         excludedResources:
-                          description: ExcludedResources specifies the resources
-                            to which this hook spec does not apply.
+                          description: ExcludedResources specifies the resources to
+                            which this hook spec does not apply.
                           items:
                             type: string
                           nullable: true
@@ -110,8 +110,8 @@ spec:
                           nullable: true
                           type: array
                         labelSelector:
-                          description: LabelSelector, if specified, filters the
-                            resources to which this hook spec applies.
+                          description: LabelSelector, if specified, filters the resources
+                            to which this hook spec applies.
                           nullable: true
                           properties:
                             matchExpressions:
@@ -172,8 +172,8 @@ spec:
                                 properties:
                                   command:
                                     description: Command is the command and arguments
-                                      to execute from within a container after a
-                                      pod has been restored.
+                                      to execute from within a container after a pod
+                                      has been restored.
                                     items:
                                       type: string
                                     minItems: 1
@@ -190,8 +190,8 @@ spec:
                                     type: string
                                   onError:
                                     description: OnError specifies how Velero should
-                                      behave if it encounters an error executing
-                                      this hook.
+                                      behave if it encounters an error executing this
+                                      hook.
                                     enum:
                                     - Continue
                                     - Fail
@@ -214,9 +214,8 @@ spec:
                                 description: Init defines an init restore hook.
                                 properties:
                                   initContainers:
-                                    description: InitContainers is list of init
-                                      containers to be added to a pod during its
-                                      restore.
+                                    description: InitContainers is list of init containers
+                                      to be added to a pod during its restore.
                                     items:
                                       type: object
                                       x-kubernetes-preserve-unknown-fields: true
@@ -336,16 +335,16 @@ spec:
                     label selector matches no objects.
                   properties:
                     matchExpressions:
-                      description: matchExpressions is a list of label selector
-                        requirements. The requirements are ANDed.
+                      description: matchExpressions is a list of label selector requirements.
+                        The requirements are ANDed.
                       items:
                         description: |-
                           A label selector requirement is a selector that contains values, a key, and an operator that
                           relates the key and values.
                         properties:
                           key:
-                            description: key is the label key that the selector
-                              applies to.
+                            description: key is the label key that the selector applies
+                              to.
                             type: string
                           operator:
                             description: |-
@@ -381,8 +380,8 @@ spec:
                 nullable: true
                 type: array
               preserveNodePorts:
-                description: PreserveNodePorts specifies whether to restore old
-                  nodePorts from backup.
+                description: PreserveNodePorts specifies whether to restore old nodePorts
+                  from backup.
                 nullable: true
                 type: boolean
               resourceModifier:
@@ -442,17 +441,16 @@ spec:
                   from the most recent successful backup created from this schedule.
                 type: string
               uploaderConfig:
-                description: UploaderConfig specifies the configuration for the
-                  restore.
+                description: UploaderConfig specifies the configuration for the restore.
                 nullable: true
                 properties:
                   parallelFilesDownload:
-                    description: ParallelFilesDownload is the concurrency number
-                      setting for restore.
+                    description: ParallelFilesDownload is the concurrency number setting
+                      for restore.
                     type: integer
                   writeSparseFiles:
-                    description: WriteSparseFiles is a flag to indicate whether
-                      write files sparsely or not.
+                    description: WriteSparseFiles is a flag to indicate whether write
+                      files sparsely or not.
                     nullable: true
                     type: boolean
                 type: object
@@ -478,8 +476,8 @@ spec:
                   to fail.
                 type: string
               hookStatus:
-                description: HookStatus contains information about the status of
-                  the hooks.
+                description: HookStatus contains information about the status of the
+                  hooks.
                 nullable: true
                 properties:
                   hooksAttempted:
@@ -489,8 +487,8 @@ spec:
                       and the number of hooks that executed successfully.
                     type: integer
                   hooksFailed:
-                    description: HooksFailed is the total number of hooks which
-                      ended with an error
+                    description: HooksFailed is the total number of hooks which ended
+                      with an error
                     type: integer
                 type: object
               phase:
@@ -515,8 +513,8 @@ spec:
                 nullable: true
                 properties:
                   itemsRestored:
-                    description: ItemsRestored is the number of items that have
-                      actually been restored so far
+                    description: ItemsRestored is the number of items that have actually
+                      been restored so far
                     type: integer
                   totalItems:
                     description: |-
diff --git a/packages/system/velero/charts/velero/crds/schedules.yaml b/packages/system/velero/charts/velero/crds/schedules.yaml
index ed521799c9..bd61e4337f 100644
--- a/packages/system/velero/charts/velero/crds/schedules.yaml
+++ b/packages/system/velero/charts/velero/crds/schedules.yaml
@@ -63,8 +63,7 @@ spec:
             description: ScheduleSpec defines the specification for a Velero schedule
             properties:
               paused:
-                description: Paused specifies whether the schedule is paused or
-                  not
+                description: Paused specifies whether the schedule is paused or not
                 type: boolean
               schedule:
                 description: |-
@@ -145,12 +144,12 @@ spec:
                     nullable: true
                     type: array
                   hooks:
-                    description: Hooks represent custom behaviors that should be
-                      executed at different phases of the backup.
+                    description: Hooks represent custom behaviors that should be executed
+                      at different phases of the backup.
                     properties:
                       resources:
-                        description: Resources are hooks that should be executed
-                          when backing up individual instances of a resource.
+                        description: Resources are hooks that should be executed when
+                          backing up individual instances of a resource.
                         items:
                           description: |-
                             BackupResourceHookSpec defines one or more BackupResourceHooks that should be executed based on
@@ -187,14 +186,13 @@ spec:
                               nullable: true
                               type: array
                             labelSelector:
-                              description: LabelSelector, if specified, filters
-                                the resources to which this hook spec applies.
+                              description: LabelSelector, if specified, filters the
+                                resources to which this hook spec applies.
                               nullable: true
                               properties:
                                 matchExpressions:
                                   description: matchExpressions is a list of label
-                                    selector requirements. The requirements are
-                                    ANDed.
+                                    selector requirements. The requirements are ANDed.
                                   items:
                                     description: |-
                                       A label selector requirement is a selector that contains values, a key, and an operator that
@@ -250,8 +248,8 @@ spec:
                                     description: Exec defines an exec hook.
                                     properties:
                                       command:
-                                        description: Command is the command and
-                                          arguments to execute.
+                                        description: Command is the command and arguments
+                                          to execute.
                                         items:
                                           type: string
                                         minItems: 1
@@ -293,8 +291,8 @@ spec:
                                     description: Exec defines an exec hook.
                                     properties:
                                       command:
-                                        description: Command is the command and
-                                          arguments to execute.
+                                        description: Command is the command and arguments
+                                          to execute.
                                         items:
                                           type: string
                                         minItems: 1
@@ -535,8 +533,8 @@ spec:
                     nullable: true
                     type: boolean
                   storageLocation:
-                    description: StorageLocation is a string containing the name
-                      of a BackupStorageLocation where the backup should be stored.
+                    description: StorageLocation is a string containing the name of
+                      a BackupStorageLocation where the backup should be stored.
                     type: string
                   ttl:
                     description: |-
@@ -544,18 +542,18 @@ spec:
                       the Backup should be retained for.
                     type: string
                   uploaderConfig:
-                    description: UploaderConfig specifies the configuration for
-                      the uploader.
+                    description: UploaderConfig specifies the configuration for the
+                      uploader.
                     nullable: true
                     properties:
                       parallelFilesUpload:
-                        description: ParallelFilesUpload is the number of files
-                          parallel uploads to perform when using the uploader.
+                        description: ParallelFilesUpload is the number of files parallel
+                          uploads to perform when using the uploader.
                         type: integer
                     type: object
                   volumeGroupSnapshotLabelKey:
-                    description: VolumeGroupSnapshotLabelKey specifies the label
-                      key to group PVCs under a VGS.
+                    description: VolumeGroupSnapshotLabelKey specifies the label key
+                      to group PVCs under a VGS.
                     type: string
                   volumeSnapshotLocations:
                     description: VolumeSnapshotLocations is a list containing names
diff --git a/packages/system/velero/charts/velero/crds/serverstatusrequests.yaml b/packages/system/velero/charts/velero/crds/serverstatusrequests.yaml
index 979d5b95fa..37c6b1a880 100644
--- a/packages/system/velero/charts/velero/crds/serverstatusrequests.yaml
+++ b/packages/system/velero/charts/velero/crds/serverstatusrequests.yaml
@@ -55,8 +55,8 @@ spec:
                 - Processed
                 type: string
               plugins:
-                description: Plugins list information about the plugins running
-                  on the Velero server
+                description: Plugins list information about the plugins running on
+                  the Velero server
                 items:
                   description: PluginInfo contains attributes of a Velero plugin
                   properties:
diff --git a/packages/system/velero/charts/velero/crds/volumesnapshotlocations.yaml b/packages/system/velero/charts/velero/crds/volumesnapshotlocations.yaml
index 2735e3d69f..2c213e87a6 100644
--- a/packages/system/velero/charts/velero/crds/volumesnapshotlocations.yaml
+++ b/packages/system/velero/charts/velero/crds/volumesnapshotlocations.yaml
@@ -55,8 +55,8 @@ spec:
                   to be used with this location
                 properties:
                   key:
-                    description: The key of the secret to select from.  Must be
-                      a valid secret key.
+                    description: The key of the secret to select from.  Must be a
+                      valid secret key.
                     type: string
                   name:
                     default: ""
@@ -85,8 +85,8 @@ spec:
               of a Velero VolumeSnapshotLocation.
             properties:
               phase:
-                description: VolumeSnapshotLocationPhase is the lifecycle phase
-                  of a Velero VolumeSnapshotLocation.
+                description: VolumeSnapshotLocationPhase is the lifecycle phase of
+                  a Velero VolumeSnapshotLocation.
                 enum:
                 - Available
                 - Unavailable
diff --git a/packages/system/velero/charts/velero/templates/_helpers.tpl b/packages/system/velero/charts/velero/templates/_helpers.tpl
index e47cb1cc23..4d1f1ef9b7 100644
--- a/packages/system/velero/charts/velero/templates/_helpers.tpl
+++ b/packages/system/velero/charts/velero/templates/_helpers.tpl
@@ -99,17 +99,12 @@ Create the node-Agent runtime class name.
 
 {{/*
 Kubernetes version
-Built-in object .Capabilities.KubeVersion.Minor can provide non-number output
-For examples:
-- on GKE it returns "18+" instead of "18"
-- on EKS it returns "20+" instead of "20"
 */}}
 {{- define "chart.KubernetesVersion" -}}
-{{- $minorVersion := .Capabilities.KubeVersion.Minor | regexFind "[0-9]+" -}}
-{{- printf "%s.%s" .Capabilities.KubeVersion.Major $minorVersion -}}
+{{- $version := .Capabilities.KubeVersion.Version | regexFind "v[0-9]+\\.[0-9]+\\.[0-9]+" -}}
+{{- printf "%s" $version -}}
 {{- end -}}
 
-
 {{/*
 Calculate the checksum of the credentials secret.
 */}}
diff --git a/packages/system/velero/charts/velero/templates/backupstoragelocation.yaml b/packages/system/velero/charts/velero/templates/backupstoragelocation.yaml
index b86cf19c26..a91e389a5e 100644
--- a/packages/system/velero/charts/velero/templates/backupstoragelocation.yaml
+++ b/packages/system/velero/charts/velero/templates/backupstoragelocation.yaml
@@ -18,6 +18,7 @@ metadata:
     app.kubernetes.io/name: {{ include "velero.name" $ }}
     app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
+    app.kubernetes.io/version: {{ $.Chart.AppVersion }}
     helm.sh/chart: {{ include "velero.chart" $ }}
 spec:
   {{- if not (empty .credential) }}
@@ -37,6 +38,9 @@ spec:
   {{- with .validationFrequency }}
   validationFrequency: {{ . }}
   {{- end }}
+  {{- with .backupSyncPeriod }}
+  backupSyncPeriod: {{ . }}
+  {{- end }}
   objectStorage:
     bucket: {{ .bucket | quote }}
     {{- with .prefix }}
diff --git a/packages/system/velero/charts/velero/templates/cleanup-crds.yaml b/packages/system/velero/charts/velero/templates/cleanup-crds.yaml
index 4e86320d14..27fbd24ea0 100644
--- a/packages/system/velero/charts/velero/templates/cleanup-crds.yaml
+++ b/packages/system/velero/charts/velero/templates/cleanup-crds.yaml
@@ -3,6 +3,8 @@
 # Using this on production systems, especially those that have multiple releases of Velero, will be destructive.
 {{/* 'securityContext' got renamed to 'podSecurityContext', merge both dicts into one for backward compatibility */}}
 {{- $podSecurityContext := merge (.Values.podSecurityContext | default dict) (.Values.securityContext | default dict) -}}
+{{/* Define the list of resources to clean up */}}
+{{- $cleanupResources := list "restore" "backup" "backupstoragelocation" "volumesnapshotlocation" "podvolumerestore" -}}
 apiVersion: batch/v1
 kind: Job
 metadata:
@@ -37,6 +39,32 @@ spec:
       {{- end }}
     {{- end }}
       serviceAccountName: {{ include "velero.serverServiceAccount" . }}
+      initContainers:
+        {{- range $cleanupResources }}
+        - name: delete-{{ . }}
+          {{- if $.Values.kubectl.image.digest }}
+          image: "{{ $.Values.kubectl.image.repository }}@{{ $.Values.kubectl.image.digest }}"
+          {{- else if $.Values.kubectl.image.tag }}
+          image: "{{ $.Values.kubectl.image.repository }}:{{ $.Values.kubectl.image.tag }}"
+          {{- else }}
+          image: "{{ $.Values.kubectl.image.repository }}:{{ template "chart.KubernetesVersion" $ }}"
+          {{- end }}
+          imagePullPolicy: {{ $.Values.image.pullPolicy }}
+          command:
+            - /bin/kubectl
+          args:
+            - delete
+            - {{ . }}
+            - --all
+          {{- with $.Values.kubectl.containerSecurityContext }}
+          securityContext:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+          {{- with $.Values.kubectl.resources }}
+          resources:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+        {{- end }}
       containers:
         - name: kubectl
           {{- if .Values.kubectl.image.digest }}
@@ -48,15 +76,12 @@ spec:
           {{- end }}
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           command:
-            - /bin/sh
-            - -c
-            - >
-              kubectl delete restore --all;
-              kubectl delete backup --all;
-              kubectl delete backupstoragelocation --all;
-              kubectl delete volumesnapshotlocation --all;
-              kubectl delete podvolumerestore --all;
-              kubectl delete crd -l component=velero;
+            - /bin/kubectl
+          args:
+            - delete
+            - crd
+            - -l
+            - component=velero
           {{- with .Values.kubectl.containerSecurityContext }}
           securityContext:
             {{- toYaml . | nindent 12 }}
diff --git a/packages/system/velero/charts/velero/templates/configmaps.yaml b/packages/system/velero/charts/velero/templates/configmaps.yaml
index 5840681e09..1ae9315f07 100644
--- a/packages/system/velero/charts/velero/templates/configmaps.yaml
+++ b/packages/system/velero/charts/velero/templates/configmaps.yaml
@@ -8,6 +8,7 @@ metadata:
     app.kubernetes.io/name: {{ include "velero.name" $ }}
     app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
+    app.kubernetes.io/version: {{ $.Chart.AppVersion }}
     helm.sh/chart: {{ include "velero.chart" $ }}
   {{- with $configMap.labels }}
     {{- toYaml . | nindent 4 }}
diff --git a/packages/system/velero/charts/velero/templates/deployment.yaml b/packages/system/velero/charts/velero/templates/deployment.yaml
index d2a72639ad..a46d732006 100644
--- a/packages/system/velero/charts/velero/templates/deployment.yaml
+++ b/packages/system/velero/charts/velero/templates/deployment.yaml
@@ -199,6 +199,9 @@ spec:
             {{- toYaml . | nindent 12 }}
           {{- end }}
           {{- if .Values.metrics.enabled }}
+          {{- with .Values.startupProbe }}
+          startupProbe: {{- toYaml . | nindent 12 }}
+          {{- end }}
           {{- with .Values.livenessProbe }}
           livenessProbe: {{- toYaml . | nindent 12 }}
           {{- end }}
diff --git a/packages/system/velero/charts/velero/templates/label-namespace/labelnamespace.yaml b/packages/system/velero/charts/velero/templates/label-namespace/labelnamespace.yaml
index 2c78fa530b..7518783d5a 100644
--- a/packages/system/velero/charts/velero/templates/label-namespace/labelnamespace.yaml
+++ b/packages/system/velero/charts/velero/templates/label-namespace/labelnamespace.yaml
@@ -28,11 +28,13 @@ spec:
         image: "{{ .Values.kubectl.image.repository }}:{{ template "chart.KubernetesVersion" . }}"
         {{- end }}
         command:
-        - /bin/sh
-        - -c
-        - |
+          - /bin/kubectl
+        args:
+          - label
+          - namespace
+          - {{ .Release.Namespace }}
           {{- range $key, $value := .Values.namespace.labels }}
-          kubectl label namespace {{ $.Release.Namespace }} {{ $key }}={{ $value }}
+          - {{ $key }}={{ $value }}
           {{- end }}
         {{- if .Values.kubectl.extraVolumeMounts }}
         volumeMounts:
@@ -45,4 +47,4 @@ spec:
       {{- end }}
   backoffLimit: 3
 {{- end }}
-{{- end }}
\ No newline at end of file
+{{- end }}
diff --git a/packages/system/velero/charts/velero/templates/node-agent-daemonset.yaml b/packages/system/velero/charts/velero/templates/node-agent-daemonset.yaml
index 597ca4596d..aa54380d66 100644
--- a/packages/system/velero/charts/velero/templates/node-agent-daemonset.yaml
+++ b/packages/system/velero/charts/velero/templates/node-agent-daemonset.yaml
@@ -14,6 +14,7 @@ metadata:
     app.kubernetes.io/name: {{ include "velero.name" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
     helm.sh/chart: {{ include "velero.chart" . }}
     {{- with .Values.nodeAgent.labels }}
       {{- toYaml . | nindent 4 }}
@@ -30,6 +31,7 @@ spec:
         app.kubernetes.io/name: {{ include "velero.name" . }}
         app.kubernetes.io/instance: {{ .Release.Name }}
         app.kubernetes.io/managed-by: {{ .Release.Service }}
+        app.kubernetes.io/version: {{ .Chart.AppVersion }}
         helm.sh/chart: {{ include "velero.chart" . }}
       {{- if .Values.nodeAgent.podLabels }}
         {{- toYaml .Values.nodeAgent.podLabels | nindent 8 }}
@@ -78,12 +80,14 @@ spec:
           secret:
             secretName: {{ include "velero.secretName" . }}
         {{- end }}
+        {{- if not (.Values.nodeAgent.disableHostPath) }}
         - name: host-pods
           hostPath:
             path: {{ .Values.nodeAgent.podVolumePath }}
         - name: host-plugins
           hostPath:
             path: {{ .Values.nodeAgent.pluginVolumePath | default "/var/lib/kubelet/plugins" }}
+        {{- end }}
         {{- if .Values.nodeAgent.useScratchEmptyDir }}
         - name: scratch
           emptyDir: {}
@@ -132,12 +136,14 @@ spec:
             - name: cloud-credentials
               mountPath: /credentials
             {{- end }}
+            {{- if not (.Values.nodeAgent.disableHostPath) }}
             - name: host-pods
               mountPath: /host_pods
               mountPropagation: HostToContainer
             - name: host-plugins
               mountPath: /host_plugins
               mountPropagation: HostToContainer
+            {{- end }}
             {{- if .Values.nodeAgent.useScratchEmptyDir }}
             - name: scratch
               mountPath: /scratch
diff --git a/packages/system/velero/charts/velero/templates/podmonitor.yaml b/packages/system/velero/charts/velero/templates/podmonitor.yaml
index 4e4e304430..2b04bf6b55 100644
--- a/packages/system/velero/charts/velero/templates/podmonitor.yaml
+++ b/packages/system/velero/charts/velero/templates/podmonitor.yaml
@@ -32,13 +32,22 @@ spec:
     {{- end }}
   podMetricsEndpoints:
   - port: http-monitoring
-    interval: {{ .Values.metrics.scrapeInterval }}
-    scrapeTimeout: {{ .Values.metrics.scrapeTimeout }}
-    {{- if .Values.metrics.nodeAgentPodMonitor.scheme }}
-    scheme: {{ .Values.metrics.nodeAgentPodMonitor.scheme }}
+    {{- with .Values.metrics.scrapeInterval }}
+    interval: {{ . }}
     {{- end }}
-    {{- if .Values.metrics.nodeAgentPodMonitor.tlsConfig }}
-    tlsConfig:
-      {{- toYaml .Values.metrics.nodeAgentPodMonitor.tlsConfig | nindent 6 }}
+    {{- with .Values.metrics.scrapeTimeout }}
+    scrapeTimeout: {{ . }}
+    {{- end }}
+    {{- with .Values.metrics.nodeAgentPodMonitor.scheme }}
+    scheme: {{ . }}
+    {{- end }}
+    {{- with .Values.metrics.nodeAgentPodMonitor.metricRelabelings }}
+    metricRelabelings: {{ toYaml . | nindent 6 }}
+    {{- end }}
+    {{- with .Values.metrics.nodeAgentPodMonitor.relabelings }}
+    relabelings: {{ toYaml . | nindent 6 }}
+    {{- end }}
+    {{- with .Values.metrics.nodeAgentPodMonitor.tlsConfig }}
+    tlsConfig: {{ toYaml . | nindent 6 }}
     {{- end }}
 {{- end }}
diff --git a/packages/system/velero/charts/velero/templates/prometheusrule.yaml b/packages/system/velero/charts/velero/templates/prometheusrule.yaml
index 60bcfc3034..8668ed3f05 100644
--- a/packages/system/velero/charts/velero/templates/prometheusrule.yaml
+++ b/packages/system/velero/charts/velero/templates/prometheusrule.yaml
@@ -10,6 +10,8 @@ metadata:
     app.kubernetes.io/name: {{ include "velero.name" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
+    helm.sh/chart: {{ include "velero.chart" . }}
     {{- if .Values.metrics.prometheusRule.additionalLabels }}
     {{- toYaml .Values.metrics.prometheusRule.additionalLabels | nindent 4 }}
     {{- end }}
diff --git a/packages/system/velero/charts/velero/templates/schedule.yaml b/packages/system/velero/charts/velero/templates/schedule.yaml
index 323665823b..22681740c6 100644
--- a/packages/system/velero/charts/velero/templates/schedule.yaml
+++ b/packages/system/velero/charts/velero/templates/schedule.yaml
@@ -13,6 +13,7 @@ metadata:
     app.kubernetes.io/name: {{ include "velero.name" $ }}
     app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
+    app.kubernetes.io/version: {{ $.Chart.AppVersion }}
     helm.sh/chart: {{ include "velero.chart" $ }}
     {{- if $schedule.labels }}
       {{- toYaml $schedule.labels | nindent 4 }}
diff --git a/packages/system/velero/charts/velero/templates/service.yaml b/packages/system/velero/charts/velero/templates/service.yaml
index 662ca646ef..8d573546c6 100644
--- a/packages/system/velero/charts/velero/templates/service.yaml
+++ b/packages/system/velero/charts/velero/templates/service.yaml
@@ -12,6 +12,7 @@ metadata:
     app.kubernetes.io/name: {{ include "velero.name" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
     helm.sh/chart: {{ include "velero.chart" . }}
     {{- with .Values.metrics.service.labels }}
       {{- toYaml . | nindent 4 }}
diff --git a/packages/system/velero/charts/velero/templates/servicemonitor.yaml b/packages/system/velero/charts/velero/templates/servicemonitor.yaml
index 777ff9f144..43deef30e9 100644
--- a/packages/system/velero/charts/velero/templates/servicemonitor.yaml
+++ b/packages/system/velero/charts/velero/templates/servicemonitor.yaml
@@ -28,19 +28,22 @@ spec:
       app.kubernetes.io/instance: {{ .Release.Name }}
   endpoints:
   - port: http-monitoring
-    interval: {{ .Values.metrics.scrapeInterval }}
-    scrapeTimeout: {{ .Values.metrics.scrapeTimeout }}
-    {{- if .Values.metrics.serviceMonitor.scheme }}
-    scheme: {{ .Values.metrics.serviceMonitor.scheme }}
+    {{- with .Values.metrics.scrapeInterval }}
+    interval: {{ . }}
     {{- end }}
-    {{- if .Values.metrics.serviceMonitor.metricRelabelings }}
-    metricRelabelings: {{- toYaml .Values.metrics.serviceMonitor.metricRelabelings | nindent 6 }}
+    {{- with .Values.metrics.scrapeTimeout }}
+    scrapeTimeout: {{ . }}
     {{- end }}
-    {{- if .Values.metrics.serviceMonitor.relabelings }}
-    relabelings: {{ toYaml .Values.metrics.serviceMonitor.relabelings | nindent 6 }}
+    {{- with .Values.metrics.serviceMonitor.scheme }}
+    scheme: {{ . }}
     {{- end }}
-    {{- if .Values.metrics.serviceMonitor.tlsConfig }}
-    tlsConfig:
-      {{- toYaml .Values.metrics.serviceMonitor.tlsConfig | nindent 6 }}
+    {{- with .Values.metrics.serviceMonitor.metricRelabelings }}
+    metricRelabelings: {{ toYaml . | nindent 6 }}
+    {{- end }}
+    {{- with .Values.metrics.serviceMonitor.relabelings }}
+    relabelings: {{ toYaml . | nindent 6 }}
+    {{- end }}
+    {{- with .Values.metrics.serviceMonitor.tlsConfig }}
+    tlsConfig: {{ toYaml . | nindent 6 }}
     {{- end }}
 {{- end }}
diff --git a/packages/system/velero/charts/velero/templates/upgrade-crds/upgrade-crds.yaml b/packages/system/velero/charts/velero/templates/upgrade-crds/upgrade-crds.yaml
index f9cf03463c..fef7ce2258 100644
--- a/packages/system/velero/charts/velero/templates/upgrade-crds/upgrade-crds.yaml
+++ b/packages/system/velero/charts/velero/templates/upgrade-crds/upgrade-crds.yaml
@@ -40,32 +40,6 @@ spec:
     {{- end }}
       serviceAccountName: {{ include "velero.serverServiceAccount" . }}-upgrade-crds
       automountServiceAccountToken: {{ .Values.upgradeCRDsJob.automountServiceAccountToken }}
-      initContainers:
-        - name: kubectl
-          {{- if .Values.kubectl.image.digest }}
-          image: "{{ .Values.kubectl.image.repository }}@{{ .Values.kubectl.image.digest }}"
-          {{- else if .Values.kubectl.image.tag }}
-          image: "{{ .Values.kubectl.image.repository }}:{{ .Values.kubectl.image.tag }}"
-          {{- else }}
-          image: "{{ .Values.kubectl.image.repository }}:{{ template "chart.KubernetesVersion" . }}"
-          {{- end }}
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
-          command:
-            - /bin/sh
-          args:
-            - -c
-            - cp `which sh` /tmp && cp `which kubectl` /tmp
-          {{- with .Values.kubectl.resources }}
-          resources:
-            {{- toYaml . | nindent 12 }}
-          {{- end }}
-          {{- with .Values.kubectl.containerSecurityContext }}
-          securityContext:
-            {{- toYaml . | nindent 12 }}
-          {{- end }}
-          volumeMounts:
-            - mountPath: /tmp
-              name: crds
       containers:
         - name: velero
           {{- if .Values.image.digest }}
@@ -75,10 +49,11 @@ spec:
           {{- end }}
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           command:
-            - {{ .Values.upgradeCRDsJob.shellCmd | default "/tmp/sh" }}
+            - /velero
           args:
-            - -c
-            - {{ .Values.upgradeCRDsJob.updateCmd | default "/velero install --crds-only --dry-run -o yaml | /tmp/kubectl apply -f -" }}
+            - install
+            - --crds-only
+            - --apply
           {{- with .Values.upgradeJobResources }}
           resources:
             {{- toYaml . | nindent 12 }}
@@ -87,10 +62,8 @@ spec:
           securityContext:
             {{- toYaml . | nindent 12 }}
           {{- end }}
-          volumeMounts:
-            - mountPath: /tmp
-              name: crds
           {{- if (.Values.upgradeCRDsJob).extraVolumeMounts }}
+          volumeMounts:
           {{- toYaml .Values.upgradeCRDsJob.extraVolumeMounts | nindent 12 }}
           {{- end }}
           {{- if (.Values.upgradeCRDsJob).extraEnvVars }}
@@ -99,12 +72,10 @@ spec:
           {{- toYaml . | nindent 12 }}
           {{- end }}
           {{- end }}
+      {{- if (.Values.upgradeCRDsJob).extraVolumes }}
       volumes:
-        - name: crds
-          emptyDir: {}
-        {{- if (.Values.upgradeCRDsJob).extraVolumes }}
         {{- toYaml .Values.upgradeCRDsJob.extraVolumes | nindent 8 }}
-        {{- end }}
+      {{- end }}
       restartPolicy: OnFailure
       {{- with $podSecurityContext }}
       securityContext:
diff --git a/packages/system/velero/charts/velero/templates/volumesnapshotlocation.yaml b/packages/system/velero/charts/velero/templates/volumesnapshotlocation.yaml
index 831996865c..ea1941be43 100644
--- a/packages/system/velero/charts/velero/templates/volumesnapshotlocation.yaml
+++ b/packages/system/velero/charts/velero/templates/volumesnapshotlocation.yaml
@@ -18,6 +18,7 @@ metadata:
     app.kubernetes.io/name: {{ include "velero.name" $ }}
     app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}
+    app.kubernetes.io/version: {{ $.Chart.AppVersion }}
     helm.sh/chart: {{ include "velero.chart" $ }}
 spec:
   {{- if not (empty .credential) }}
diff --git a/packages/system/velero/charts/velero/values.schema.json b/packages/system/velero/charts/velero/values.schema.json
index 367e0d8c3d..f73d893dbe 100644
--- a/packages/system/velero/charts/velero/values.schema.json
+++ b/packages/system/velero/charts/velero/values.schema.json
@@ -293,8 +293,6 @@
             },
             "required": [
                 "enabled",
-                "scrapeInterval",
-                "scrapeTimeout",
                 "service",
                 "podAnnotations",
                 "serviceMonitor",
@@ -384,6 +382,9 @@
                             "validationFrequency": {
                                 "type": ["string", "null"]
                             },
+                            "backupSyncPeriod": {
+                                "type": ["string", "null"]
+                            },
                             "accessMode": {
                                 "type": ["string", "null"]
                             },
diff --git a/packages/system/velero/charts/velero/values.yaml b/packages/system/velero/charts/velero/values.yaml
index 00ec9380cc..ff27abb4ea 100644
--- a/packages/system/velero/charts/velero/values.yaml
+++ b/packages/system/velero/charts/velero/values.yaml
@@ -26,9 +26,9 @@ namespace:
 # Details of the container image to use in the Velero deployment & daemonset (if
 # enabling node-agent). Required.
 image:
-  repository: velero/velero
-  tag: v1.17.0
-  # Digest value example: sha256:d238835e151cec91c6a811fe3a89a66d3231d9f64d09e5f3c49552672d271f38.
+  repository: docker.io/velero/velero
+  tag: v1.18.1
+  # Digest value example: sha256:73266e6bd7e2fe3f65fb20677d36c4a8df76d417d9ba76bd9932e0d983a776ec.
   # If used, it will take precedence over the image.tag.
   # digest:
   pullPolicy: IfNotPresent
@@ -130,7 +130,7 @@ dnsPolicy: ClusterFirst
 # If the value is a string then it is evaluated as a template.
 initContainers:
   # - name: velero-plugin-for-aws
-  #   image: velero/velero-plugin-for-aws:v1.13.0
+  #   image: velero/velero-plugin-for-aws:v1.13.1
   #   imagePullPolicy: IfNotPresent
   #   volumeMounts:
   #     - mountPath: /target
@@ -282,11 +282,16 @@ metrics:
     enabled: false
     annotations: {}
     additionalLabels: {}
-    # ServiceMonitor namespace. Default to Velero namespace.
+    # metrics.nodeAgentPodMonitor.metricRelabelings Specify Metric Relabelings to add to the scrape endpoint
+    # ref: https://github.com/coreos/prometheus-operator/blob/master/Documentation/api.md#relabelconfig
+    # metricRelabelings: []
+    # metrics.nodeAgentPodMonitor.relabelings [array] Prometheus relabeling rules
+    # relabelings: []
+    # PodMonitor namespace. Default to Velero namespace.
     # namespace:
-    # ServiceMonitor connection scheme. Defaults to HTTP.
+    # PodMonitor connection scheme. Defaults to HTTP.
     # scheme: ""
-    # ServiceMonitor connection tlsConfig. Defaults to {}.
+    # PodMonitor connection tlsConfig. Defaults to {}.
     # tlsConfig: {}
 
   prometheusRule:
@@ -316,14 +321,14 @@ metrics:
     #     severity: critical
     # - alert: VeleroNoNewBackup
     #   annotations:
-    #     message: Velero backup {{ $labels.schedule }} has not run successfuly in the last 30h
+    #     message: Velero backup {{ $labels.schedule }} has not run successfully in the last 25h
     #   expr: |-
     #     (
-    #     rate(velero_backup_last_successful_timestamp{schedule!=""}[15m]) <=bool 0
+    #     (time() - velero_backup_last_successful_timestamp{schedule!=""}) >bool (25 * 3600)
     #     or
     #     absent(velero_backup_last_successful_timestamp{schedule!=""})
     #     ) == 1
-    #   for: 30h
+    #   for: 1h
     #   labels:
     #     severity: critical
     # - alert: VeleroBackupPartialFailures
@@ -338,12 +343,12 @@ metrics:
 
 kubectl:
   image:
-    repository: alpine/k8s
-    # Digest value example: sha256:d238835e151cec91c6a811fe3a89a66d3231d9f64d09e5f3c49552672d271f38.
+    repository: registry.k8s.io/kubectl
+    # Digest value example: sha256:c7bf8cf6e79f474fda2623a7b98572a1b909c4d912b05062b444ffe79883fdbe.
     # If used, it will take precedence over the kubectl.image.tag.
     # digest:
     # kubectl image tag. If used, it will take precedence over the cluster Kubernetes version.
-    tag: "1.35.0"
+    # tag: v1.34.5
   # Container Level Security Context for the 'kubectl' container of the crd jobs. Optional.
   # See: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container
   containerSecurityContext: {}
@@ -355,7 +360,7 @@ kubectl:
   labels: {}
   # Extra volumes for the upgrade/cleanup job. Optional.
   extraVolumes: []
-  # Extra volumeMounts for the upgrade/cleanup job.. Optional.
+  # Extra volumeMounts for the upgrade/cleanup job. Optional.
   extraVolumeMounts: []
 
 # This job upgrades the CRDs.
@@ -393,6 +398,8 @@ configuration:
     default: false
     # validationFrequency defines how frequently Velero should validate the object storage. Optional.
     validationFrequency:
+    # backupSyncPeriod defines how frequently Velero should synchronize backups in object storage. Optional.
+    backupSyncPeriod:
     # accessMode determines if velero can write to this backup storage location. Optional.
     # default to ReadWrite, ReadOnly is used during migrations and restores.
     accessMode: ReadWrite
@@ -649,6 +656,8 @@ snapshotsEnabled: true
 deployNodeAgent: false
 
 nodeAgent:
+  # Disables Host Path volumes for node-agent.
+  disableHostPath: false
   podVolumePath: /var/lib/kubelet/pods
   pluginVolumePath: /var/lib/kubelet/plugins
   # Pod priority class name to use for the node-agent daemonset. Optional.
@@ -784,7 +793,7 @@ schedules: {}
 #       velero.io/plugin-config: ""
 #       velero.io/pod-volume-restore: RestoreItemAction
 #     data:
-#       image: velero/velero:v1.17.0
+#       image: velero/velero:v1.17.1
 #       cpuRequest: 200m
 #       memRequest: 128Mi
 #       cpuLimit: 200m
diff --git a/packages/system/velero/images/kubevirt-velero-plugin/Dockerfile b/packages/system/velero/images/kubevirt-velero-plugin/Dockerfile
new file mode 100644
index 0000000000..ac9986eaf0
--- /dev/null
+++ b/packages/system/velero/images/kubevirt-velero-plugin/Dockerfile
@@ -0,0 +1,22 @@
+# Upstream publishes this image for amd64 only, so it is rebuilt here from the
+# release tag for every platform the velero server runs on.
+FROM --platform=$BUILDPLATFORM golang:1.27@sha256:3680233e3204827fbdc66088528ae6d4b3d034f51d03a99d454f6de034888244 AS builder
+ARG GOPROXY
+
+ARG VERSION=v0.9.0
+ARG TARGETOS
+ARG TARGETARCH
+
+WORKDIR /workspace
+
+RUN curl -sSfL https://github.com/kubevirt/kubevirt-velero-plugin/archive/refs/tags/${VERSION}.tar.gz | tar -xzf- --strip=1
+
+RUN GOOS=$TARGETOS GOARCH=$TARGETARCH CGO_ENABLED=0 go build -installsuffix static -o kubevirt-velero-plugin .
+
+# The velero server runs this as an init container whose entrypoint copies the
+# plugin into the plugins volume mounted at /target, so the image needs a shell
+# and cp, as upstream's alpine base provides.
+FROM alpine:3.24@sha256:294b683cb724975bec92580e1e685676bd4b50bda910ddb8c51d4cabeaec77e6
+COPY --from=builder /workspace/kubevirt-velero-plugin /plugins/
+USER nobody:nogroup
+ENTRYPOINT ["/bin/sh", "-c", "cp /plugins/* /target/."]
diff --git a/packages/system/velero/patches/add-startup-probe.patch b/packages/system/velero/patches/add-startup-probe.patch
new file mode 100644
index 0000000000..78c8945a8c
--- /dev/null
+++ b/packages/system/velero/patches/add-startup-probe.patch
@@ -0,0 +1,14 @@
+diff --git a/packages/system/velero/charts/velero/templates/deployment.yaml b/packages/system/velero/charts/velero/templates/deployment.yaml
+index d2a72639a..a46d73200 100644
+--- a/packages/system/velero/charts/velero/templates/deployment.yaml
++++ b/packages/system/velero/charts/velero/templates/deployment.yaml
+@@ -199,6 +199,9 @@ spec:
+             {{- toYaml . | nindent 12 }}
+           {{- end }}
+           {{- if .Values.metrics.enabled }}
++          {{- with .Values.startupProbe }}
++          startupProbe: {{- toYaml . | nindent 12 }}
++          {{- end }}
+           {{- with .Values.livenessProbe }}
+           livenessProbe: {{- toYaml . | nindent 12 }}
+           {{- end }}
diff --git a/packages/system/velero/tests/velero_test.yaml b/packages/system/velero/tests/velero_test.yaml
new file mode 100644
index 0000000000..75dc378dd9
--- /dev/null
+++ b/packages/system/velero/tests/velero_test.yaml
@@ -0,0 +1,143 @@
+suite: cozy-velero chart rendering invariants
+release:
+  name: velero
+  namespace: cozy-velero
+tests:
+  - it: renders the velero server Deployment on the pinned upstream image
+    template: charts/velero/templates/deployment.yaml
+    documentSelector:
+      path: metadata.name
+      value: velero
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].image
+          value: docker.io/velero/velero:v1.18.1
+
+  - it: pins the backup-plugin initContainers to velero-1.18-compatible releases
+    template: charts/velero/templates/deployment.yaml
+    documentSelector:
+      path: metadata.name
+      value: velero
+    asserts:
+      - equal:
+          path: spec.template.spec.initContainers[0].image
+          value: velero/velero-plugin-for-aws:v1.14.4
+
+  # The release build stamps its own rebuild over the upstream ref, so only the
+  # repository name is common to both.
+  - it: installs the KubeVirt plugin as an init container
+    template: charts/velero/templates/deployment.yaml
+    documentSelector:
+      path: metadata.name
+      value: velero
+    asserts:
+      - equal:
+          path: spec.template.spec.initContainers[1].name
+          value: kubevirt-kubevirt-velero-plugin
+      - matchRegex:
+          path: spec.template.spec.initContainers[1].image
+          pattern: "/kubevirt-velero-plugin:"
+
+  # Cozystack disables the upgrade-crds Job (upgradeCRDs: false): CRD lifecycle
+  # is owned by the generated HelmRelease (upgradeCRDs: CreateReplace on the
+  # velero PackageSource), making the Job redundant. Pin that invariant — it
+  # silently regressed once.
+  - it: does not emit the upgrade-crds Job when upgradeCRDs is disabled
+    template: charts/velero/templates/upgrade-crds/upgrade-crds.yaml
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  # Velero binds :8085 (http-monitoring) late under a heavy parallel install, so
+  # the upstream liveness probe (initialDelaySeconds 10, ~130s total budget) would
+  # kill it mid-startup and crashloop it out of the install-gate window. A
+  # startupProbe (patched into the upstream chart, which omits one) holds liveness
+  # and readiness off until the server is up, granting 30 * 10s = 300s of startup
+  # grace while leaving steady-state liveness at the tight upstream default. Pin
+  # the startupProbe budget AND that liveness was NOT loosened, so neither
+  # silently regresses.
+  - it: gates startup with a startupProbe and keeps liveness tight
+    template: charts/velero/templates/deployment.yaml
+    documentSelector:
+      path: metadata.name
+      value: velero
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].startupProbe.periodSeconds
+          value: 10
+      - equal:
+          path: spec.template.spec.containers[0].startupProbe.failureThreshold
+          value: 30
+      - equal:
+          path: spec.template.spec.containers[0].startupProbe.timeoutSeconds
+          value: 5
+      - equal:
+          path: spec.template.spec.containers[0].startupProbe.successThreshold
+          value: 1
+      - equal:
+          path: spec.template.spec.containers[0].startupProbe.httpGet.path
+          value: /metrics
+      - equal:
+          path: spec.template.spec.containers[0].startupProbe.httpGet.port
+          value: http-monitoring
+      # No initialDelaySeconds: the first startup check fires immediately, so the
+      # full 300s budget is spent probing. Pin its absence so a future change
+      # cannot silently re-introduce a delay that eats into the grace window.
+      - notExists:
+          path: spec.template.spec.containers[0].startupProbe.initialDelaySeconds
+      # Liveness stays at the tight upstream default — the startupProbe owns the
+      # grace, so loosening liveness would only weaken steady-state crash
+      # detection. Pin the full budget (initialDelay/period/failureThreshold) so a
+      # future change cannot silently re-delay or loosen liveness.
+      - equal:
+          path: spec.template.spec.containers[0].livenessProbe.initialDelaySeconds
+          value: 10
+      - equal:
+          path: spec.template.spec.containers[0].livenessProbe.periodSeconds
+          value: 30
+      - equal:
+          path: spec.template.spec.containers[0].livenessProbe.failureThreshold
+          value: 5
+
+  # All three probes live behind {{- if .Values.metrics.enabled }} — :8085 only
+  # exists when metrics are on. Pin that the startupProbe follows the same gate as
+  # liveness/readiness, so disabling metrics drops all probes together and never
+  # leaves a startupProbe pointed at an unbound port.
+  - it: omits all probes (including the startupProbe) when metrics are disabled
+    template: charts/velero/templates/deployment.yaml
+    documentSelector:
+      path: metadata.name
+      value: velero
+    set:
+      velero.metrics.enabled: false
+    asserts:
+      - notExists:
+          path: spec.template.spec.containers[0].startupProbe
+      - notExists:
+          path: spec.template.spec.containers[0].livenessProbe
+      - notExists:
+          path: spec.template.spec.containers[0].readinessProbe
+
+  # node-agent is a DaemonSet and ran BestEffort. A memory limit is what sets
+  # memory.max on the pod cgroup, and the Talos userspace OOM handler (v1.12+)
+  # only ever selects cgroups that lack it — so node-agent was an eviction
+  # candidate on every node whatever caused the pressure, and killing it
+  # mid-backup fails the backup.
+  #
+  # The limit is deliberately loose rather than fitted: measured usage is at
+  # idle, and the agent streams volume data during a backup, which is exactly
+  # when it must not be killed. Set from the umbrella values against the
+  # vendored subchart, so an upstream bump that moves the key would render
+  # nothing and leave no other trace; that is what this pins against.
+  - it: node-agent declares a memory limit and request
+    template: charts/velero/templates/node-agent-daemonset.yaml
+    documentSelector:
+      path: kind
+      value: DaemonSet
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[?(@.name=="node-agent")].resources.limits.memory
+          value: 2Gi
+      - equal:
+          path: spec.template.spec.containers[?(@.name=="node-agent")].resources.requests.memory
+          value: 128Mi
diff --git a/packages/system/velero/values.yaml b/packages/system/velero/values.yaml
index 7c94b768c4..fccb6e0aa3 100644
--- a/packages/system/velero/values.yaml
+++ b/packages/system/velero/values.yaml
@@ -1,15 +1,17 @@
 velero:
-  # Disable CRD upgrade job - CRDs are installed as part of helm chart
-  # The upgrade job has issues with kubectl image compatibility
+  # Disable the upgrade-crds Job: CRD lifecycle is owned by the generated
+  # HelmRelease instead (upgradeCRDs: CreateReplace on the velero PackageSource),
+  # which applies the chart's crds/ directory on install and on every upgrade,
+  # so the Job is redundant.
   upgradeCRDs: false
   initContainers:
     - name: velero-plugin-for-aws
-      image: velero/velero-plugin-for-aws:v1.12.1
+      image: velero/velero-plugin-for-aws:v1.14.4
       imagePullPolicy: IfNotPresent
       volumeMounts:
         - mountPath: /target
           name: plugins
-    - image: quay.io/kubevirt/kubevirt-velero-plugin:v0.8.0
+    - image: quay.io/kubevirt/kubevirt-velero-plugin:v0.9.0
       name: kubevirt-kubevirt-velero-plugin
       imagePullPolicy: IfNotPresent
       volumeMounts:
@@ -17,6 +19,20 @@ velero:
         name: plugins
 
   deployNodeAgent: true
+  nodeAgent:
+    # node-agent is a DaemonSet and ran BestEffort. A memory limit is what sets
+    # memory.max on the pod cgroup, and the Talos userspace OOM handler (v1.12+)
+    # only ever kills cgroups that lack one — so it was an eviction candidate on
+    # every node, independent of what caused the pressure. Killing it mid-backup
+    # fails the backup, so the limit is deliberately loose: 14d peak is 121Mi at
+    # idle on a dev cluster, but the agent streams volume data during a backup
+    # and that is exactly when it must not be killed.
+    resources:
+      requests:
+        cpu: 50m
+        memory: 128Mi
+      limits:
+        memory: 2Gi
   configuration:
     # defaultVolumesToFsBackup: true
     # cozy-default BackupStorageLocation lives in the
@@ -30,3 +46,27 @@ velero:
     # Increase timeout for item operations to 24 hours to prevent timeouts
     # during backups of very large volumes. The Velero default is 4 hours.
     defaultItemOperationTimeout: 24h
+
+  # Velero binds its metrics/health endpoint (:8085, http-monitoring) only after
+  # the server finishes loading plugins and connecting to the API server. Under a
+  # heavy parallel platform install that can take minutes, but the upstream
+  # liveness probe starts checking /metrics at initialDelaySeconds=10 and kills
+  # the container after failureThreshold=5 (~130s total) before :8085 is bound.
+  # The kubelet SIGTERMs velero (exitCode 0/Completed), it BackOff-restarts, and
+  # never escapes the loop inside the install-gate window, blocking the gate.
+  #
+  # Give the server an explicit startup budget. While the startupProbe is failing
+  # the kubelet holds off the liveness and readiness probes entirely, so steady-
+  # state liveness stays at the tight upstream default (10s / 30s / 5 failures)
+  # once startup completes. failureThreshold * periodSeconds = 30 * 10s = 300s of
+  # grace. The upstream chart does not render a startupProbe, so the velero
+  # package patches it in (patches/add-startup-probe.patch, re-applied on update).
+  startupProbe:
+    httpGet:
+      path: /metrics
+      port: http-monitoring
+      scheme: HTTP
+    periodSeconds: 10
+    timeoutSeconds: 5
+    successThreshold: 1
+    failureThreshold: 30
diff --git a/packages/system/vertical-pod-autoscaler-crds/Makefile b/packages/system/vertical-pod-autoscaler-crds/Makefile
index 52b8427870..87f8abaac8 100644
--- a/packages/system/vertical-pod-autoscaler-crds/Makefile
+++ b/packages/system/vertical-pod-autoscaler-crds/Makefile
@@ -3,5 +3,17 @@ export NAMESPACE=cozy-$(NAME)
 
 include ../../../hack/package.mk
 
+test:
+	helm unittest .
+
+# Stamp helm.sh/resource-policy: keep on every CustomResourceDefinition so a
+# chart uninstall never garbage-collects the CRDs and, with them, every
+# VerticalPodAutoscaler and VerticalPodAutoscalerCheckpoint in the cluster.
+# The stamp goes into the CRD's existing metadata.annotations block; a CRD that
+# arrives without one is skipped, and the chart's helm-unittest suite is what
+# catches that.
 update:
 	curl -o ./templates/vpa-v1-crd-gen.yaml https://raw.githubusercontent.com/kubernetes/autoscaler/refs/heads/master/vertical-pod-autoscaler/deploy/vpa-v1-crd-gen.yaml
+	@set -e; f=./templates/vpa-v1-crd-gen.yaml; tmp=$$(mktemp); \
+	  awk '/^    helm.sh\/resource-policy: keep$$/{next} /^kind: /{kind=$$2} /^  annotations:$$/ && kind=="CustomResourceDefinition"{print; print "    helm.sh/resource-policy: keep"; next} {print}' "$$f" > "$$tmp"; \
+	  cat "$$tmp" > "$$f"; rm -f "$$tmp"
diff --git a/packages/system/vertical-pod-autoscaler-crds/templates/vpa-v1-crd-gen.yaml b/packages/system/vertical-pod-autoscaler-crds/templates/vpa-v1-crd-gen.yaml
index 70345adccc..b1c03ed399 100644
--- a/packages/system/vertical-pod-autoscaler-crds/templates/vpa-v1-crd-gen.yaml
+++ b/packages/system/vertical-pod-autoscaler-crds/templates/vpa-v1-crd-gen.yaml
@@ -3,6 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
+    helm.sh/resource-policy: keep
     api-approved.kubernetes.io: https://github.com/kubernetes/kubernetes/pull/63797
     controller-gen.kubebuilder.io/version: v0.16.5
   name: verticalpodautoscalercheckpoints.autoscaling.k8s.io
@@ -224,6 +225,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
+    helm.sh/resource-policy: keep
     api-approved.kubernetes.io: https://github.com/kubernetes/kubernetes/pull/63797
     controller-gen.kubebuilder.io/version: v0.16.5
   name: verticalpodautoscalers.autoscaling.k8s.io
diff --git a/packages/system/vertical-pod-autoscaler-crds/tests/resource_policy_test.yaml b/packages/system/vertical-pod-autoscaler-crds/tests/resource_policy_test.yaml
new file mode 100644
index 0000000000..948b8654c5
--- /dev/null
+++ b/packages/system/vertical-pod-autoscaler-crds/tests/resource_policy_test.yaml
@@ -0,0 +1,47 @@
+# The tenant addon HelmRelease that ships this chart remediates a failed
+# install by uninstalling the release, and an uninstall deletes whatever the
+# chart rendered. Deleting a CRD makes the API server garbage-collect every
+# custom resource of that kind, so an unannotated CRD here costs the cluster
+# every VerticalPodAutoscaler it holds, along with the recommendation history
+# in the checkpoints.
+#
+# The first case scopes to no template at all, so it holds every document the
+# chart renders. The named cases pin each CRD by name: a selector that matches
+# nothing fails with "document not found" rather than passing on an empty
+# document set.
+suite: VerticalPodAutoscaler CRDs survive a release uninstall
+tests:
+  - it: annotates every CustomResourceDefinition the chart renders
+    asserts:
+      - equal:
+          path: kind
+          value: CustomResourceDefinition
+      - equal:
+          path: metadata.annotations["helm.sh/resource-policy"]
+          value: keep
+
+  # Pins the rendered document count so a CRD added upstream by `make update`
+  # turns this red instead of arriving untested.
+  - it: renders both CRDs
+    template: templates/vpa-v1-crd-gen.yaml
+    asserts:
+      - hasDocuments:
+          count: 2
+
+  - it: keeps the VerticalPodAutoscaler CRD
+    documentSelector:
+      path: metadata.name
+      value: verticalpodautoscalers.autoscaling.k8s.io
+    asserts:
+      - equal:
+          path: metadata.annotations["helm.sh/resource-policy"]
+          value: keep
+
+  - it: keeps the VerticalPodAutoscalerCheckpoint CRD
+    documentSelector:
+      path: metadata.name
+      value: verticalpodautoscalercheckpoints.autoscaling.k8s.io
+    asserts:
+      - equal:
+          path: metadata.annotations["helm.sh/resource-policy"]
+          value: keep
diff --git a/packages/system/vertical-pod-autoscaler/Makefile b/packages/system/vertical-pod-autoscaler/Makefile
index 1e5372e193..e7f49e6847 100644
--- a/packages/system/vertical-pod-autoscaler/Makefile
+++ b/packages/system/vertical-pod-autoscaler/Makefile
@@ -3,9 +3,20 @@ export NAMESPACE=cozy-$(NAME)
 
 include ../../../hack/package.mk
 
+test:
+	helm unittest .
+
 update:
 	rm -rf charts
 	# VirtualPodAutoscaler operator
 	helm repo add cowboysysop https://cowboysysop.github.io/charts/
 	helm repo update cowboysysop
-	helm pull cowboysysop/vertical-pod-autoscaler --untar --untardir charts
+	helm pull cowboysysop/vertical-pod-autoscaler --untar --untardir charts --version 11.1.1
+	# cozystack-specific: replace the upstream genCA-per-render TLS Secret
+	# with a cert-manager Issuer+Certificate; gate the legacy Secret and
+	# its checksum/tls-secret annotation behind admissionController.tls.
+	# certManagerEnabled=false; add a runtime-lookup-based checksum/tls-cert
+	# annotation so pods rotate on Secret content change (not on every
+	# reconcile). See patch header + certificate.yaml template comment
+	# for the full rationale.
+	patch --no-backup-if-mismatch -p1 < patches/cert-manager-admission-tls.diff
diff --git a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/Chart.lock b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/Chart.lock
index 995337f4f8..9a259e9673 100644
--- a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/Chart.lock
+++ b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: common
-  repository: https://charts.bitnami.com/bitnami/
-  version: 2.21.0
-digest: sha256:e25ca51f064e63a6b2d595f4bb318563de95e5e7ee2534b0457010be6acefc1e
-generated: "2025-01-28T22:38:50.721673297Z"
+  repository: oci://ghcr.io/cowboysysop/charts
+  version: 2.31.3
+digest: sha256:97c0702416bf7bd224e8a2fa1e13f01521c6fef4909fc387c28778dd5ceb5442
+generated: "2025-10-06T16:51:00.77929793Z"
diff --git a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/Chart.yaml b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/Chart.yaml
index 1087bc4b6d..351a1e134d 100644
--- a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/Chart.yaml
+++ b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/Chart.yaml
@@ -4,11 +4,11 @@ annotations:
     url: https://cowboysysop.github.io/charts/pgp-public-key-2022-02-19.asc
   kubeVersion: '>=1.24'
 apiVersion: v2
-appVersion: 1.3.0
+appVersion: 1.5.0
 dependencies:
 - name: common
-  repository: https://charts.bitnami.com/bitnami/
-  version: 2.21.0
+  repository: oci://ghcr.io/cowboysysop/charts
+  version: 2.31.3
 description: Set of components that automatically adjust the amount of CPU and memory
   requested by pods running in the Kubernetes Cluster
 home: https://github.com/kubernetes/autoscaler
@@ -20,4 +20,4 @@ name: vertical-pod-autoscaler
 sources:
 - https://github.com/kubernetes/autoscaler
 - https://github.com/cowboysysop/charts/tree/master/charts/vertical-pod-autoscaler
-version: 10.0.0
+version: 11.1.1
diff --git a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/README.md b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/README.md
index b8b4aff8ba..afb5f4c697 100644
--- a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/README.md
+++ b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/README.md
@@ -11,6 +11,12 @@ $ helm repo add cowboysysop https://cowboysysop.github.io/charts/
 $ helm install my-release cowboysysop/vertical-pod-autoscaler
 ```
 
+or for an OCI-based registry:
+
+```bash
+$ helm install my-release oci://ghcr.io/cowboysysop/charts/vertical-pod-autoscaler
+```
+
 ## Introduction
 
 This chart bootstraps a Vertical Pod Autoscaler deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager.
@@ -30,6 +36,12 @@ $ helm repo add cowboysysop https://cowboysysop.github.io/charts/
 $ helm install my-release cowboysysop/vertical-pod-autoscaler
 ```
 
+or for an OCI-based registry:
+
+```bash
+$ helm install my-release oci://ghcr.io/cowboysysop/charts/vertical-pod-autoscaler
+```
+
 These commands deploy Vertical Pod Autoscaler on the Kubernetes cluster in the default configuration and with the release name `my-release`. The deployment configuration can be customized by specifying the customization parameters with the `helm install` command using the `--values` or `--set` arguments. Find more information in the [configuration section](#configuration) of this document.
 
 ## Upgrading
@@ -40,9 +52,22 @@ Upgrade the chart deployment using:
 $ helm upgrade my-release cowboysysop/vertical-pod-autoscaler
 ```
 
+or for an OCI-based registry:
+
+```bash
+$ helm upgrade my-release oci://ghcr.io/cowboysysop/charts/vertical-pod-autoscaler
+```
+
 The command upgrades the existing `my-release` deployment with the most latest release of the chart.
 
-**TIP**: Use `helm repo update` to update information on available charts in the chart repositories.
+### Upgrading to version 11.0.0
+
+The chart now uses forked versions of the Bitnami charts to reference the Bitnami Legacy repository:
+
+- https://github.com/bitnami/containers/issues/83267
+
+Pod and container security contexts have been hardened and some values are now configured at
+the container level instead of the pod level.
 
 ### Upgrading to version 10.0.0
 
@@ -143,6 +168,7 @@ $ kubectl delete crd verticalpodautoscalercheckpoints.autoscaling.k8s.io
 | `kubeVersion`       | Override Kubernetes version                                                                                  | `""`    |
 | `nameOverride`      | Partially override `vertical-pod-autoscaler.fullname` template with a string (will prepend the release name) | `""`    |
 | `fullnameOverride`  | Fully override `vertical-pod-autoscaler.fullname` template with a string                                     | `""`    |
+| `namespaceOverride` | Fully override `common.names.namespace` template with a string                                               | `""`    |
 | `commonAnnotations` | Annotations to add to all deployed objects                                                                   | `{}`    |
 | `commonLabels`      | Labels to add to all deployed objects                                                                        | `{}`    |
 | `extraDeploy`       | Array of extra objects to deploy with the release                                                            | `[]`    |
@@ -153,9 +179,10 @@ $ kubectl delete crd verticalpodautoscalercheckpoints.autoscaling.k8s.io
 | -------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------- | -------------------------------------- |
 | `admissionController.enabled`                                  | Enable the component                                                                                                | `true`                                 |
 | `admissionController.replicaCount`                             | Number of replicas                                                                                                  | `1`                                    |
+| `admissionController.revisionHistoryLimit`                     | Number of old history to retain to allow rollback                                                                   | `10`                                   |
 | `admissionController.image.registry`                           | Image registry                                                                                                      | `registry.k8s.io`                      |
 | `admissionController.image.repository`                         | Image repository                                                                                                    | `autoscaling/vpa-admission-controller` |
-| `admissionController.image.tag`                                | Image tag                                                                                                           | `1.3.0`                                |
+| `admissionController.image.tag`                                | Image tag                                                                                                           | `1.5.0`                                |
 | `admissionController.image.digest`                             | Image digest                                                                                                        | `""`                                   |
 | `admissionController.image.pullPolicy`                         | Image pull policy                                                                                                   | `IfNotPresent`                         |
 | `admissionController.pdb.create`                               | Specifies whether a pod disruption budget should be created                                                         | `false`                                |
@@ -170,14 +197,18 @@ $ kubectl delete crd verticalpodautoscalercheckpoints.autoscaling.k8s.io
 | `admissionController.podAnnotations`                           | Additional pod annotations                                                                                          | `{}`                                   |
 | `admissionController.podLabels`                                | Additional pod labels                                                                                               | `{}`                                   |
 | `admissionController.podSecurityContext`                       | Pod security context                                                                                                |                                        |
-| `admissionController.podSecurityContext.runAsNonRoot`          | Whether the container must run as a non-root user                                                                   | `true`                                 |
-| `admissionController.podSecurityContext.runAsUser`             | The UID to run the entrypoint of the container process                                                              | `65534`                                |
-| `admissionController.podSecurityContext.runAsGroup`            | The GID to run the entrypoint of the container process                                                              | `65534`                                |
+| `admissionController.podSecurityContext.seccompProfile.type`   | Set pod's Security Context seccomp profile                                                                          | `RuntimeDefault`                       |
 | `admissionController.hostNetwork`                              | Use the host network                                                                                                | `false`                                |
 | `admissionController.priorityClassName`                        | Priority class name                                                                                                 | `nil`                                  |
 | `admissionController.runtimeClassName`                         | Runtime class name                                                                                                  | `""`                                   |
 | `admissionController.topologySpreadConstraints`                | Topology Spread Constraints for pod assignment                                                                      | `[]`                                   |
-| `admissionController.securityContext`                          | Container security context                                                                                          | `{}`                                   |
+| `admissionController.securityContext`                          | Container security context                                                                                          |                                        |
+| `admissionController.securityContext.allowPrivilegeEscalation` | Set container's Security Context allowPrivilegeEscalation                                                           | `false`                                |
+| `admissionController.securityContext.capabilities.drop`        | List of capabilities to be dropped                                                                                  | `["ALL"]`                              |
+| `admissionController.securityContext.readOnlyRootFilesystem`   | Set container's Security Context readOnlyRootFilesystem                                                             | `true`                                 |
+| `admissionController.securityContext.runAsNonRoot`             | Whether the container must run as a non-root user                                                                   | `true`                                 |
+| `admissionController.securityContext.runAsUser`                | The UID to run the entrypoint of the container process                                                              | `65534`                                |
+| `admissionController.securityContext.runAsGroup`               | The GID to run the entrypoint of the container process                                                              | `65534`                                |
 | `admissionController.containerPorts.https`                     | Container port for HTTPS                                                                                            | `8000`                                 |
 | `admissionController.containerPorts.metrics`                   | Container port for Metrics                                                                                          | `8944`                                 |
 | `admissionController.livenessProbe.enabled`                    | Enable liveness probe                                                                                               | `true`                                 |
@@ -243,9 +274,10 @@ $ kubectl delete crd verticalpodautoscalercheckpoints.autoscaling.k8s.io
 | Name                                                   | Description                                                                                                         | Default                       |
 | ------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------- | ----------------------------- |
 | `recommender.replicaCount`                             | Number of replicas                                                                                                  | `1`                           |
+| `recommender.revisionHistoryLimit`                     | Number of old history to retain to allow rollback                                                                   | `10`                          |
 | `recommender.image.registry`                           | Image registry                                                                                                      | `registry.k8s.io`             |
 | `recommender.image.repository`                         | Image repository                                                                                                    | `autoscaling/vpa-recommender` |
-| `recommender.image.tag`                                | Image tag                                                                                                           | `1.3.0`                       |
+| `recommender.image.tag`                                | Image tag                                                                                                           | `1.5.0`                       |
 | `recommender.image.digest`                             | Image digest                                                                                                        | `""`                          |
 | `recommender.image.pullPolicy`                         | Image pull policy                                                                                                   | `IfNotPresent`                |
 | `recommender.pdb.create`                               | Specifies whether a pod disruption budget should be created                                                         | `false`                       |
@@ -260,13 +292,17 @@ $ kubectl delete crd verticalpodautoscalercheckpoints.autoscaling.k8s.io
 | `recommender.podAnnotations`                           | Additional pod annotations                                                                                          | `{}`                          |
 | `recommender.podLabels`                                | Additional pod labels                                                                                               | `{}`                          |
 | `recommender.podSecurityContext`                       | Pod security context                                                                                                |                               |
-| `recommender.podSecurityContext.runAsNonRoot`          | Whether the container must run as a non-root user                                                                   | `true`                        |
-| `recommender.podSecurityContext.runAsUser`             | The UID to run the entrypoint of the container process                                                              | `65534`                       |
-| `recommender.podSecurityContext.runAsGroup`            | The GID to run the entrypoint of the container process                                                              | `65534`                       |
+| `recommender.podSecurityContext.seccompProfile.type`   | Set pod's Security Context seccomp profile                                                                          | `RuntimeDefault`              |
 | `recommender.priorityClassName`                        | Priority class name                                                                                                 | `nil`                         |
 | `recommender.runtimeClassName`                         | Runtime class name                                                                                                  | `""`                          |
 | `recommender.topologySpreadConstraints`                | Topology Spread Constraints for pod assignment                                                                      | `[]`                          |
-| `recommender.securityContext`                          | Container security context                                                                                          | `{}`                          |
+| `recommender.securityContext`                          | Container security context                                                                                          |                               |
+| `recommender.securityContext.allowPrivilegeEscalation` | Set container's Security Context allowPrivilegeEscalation                                                           | `false`                       |
+| `recommender.securityContext.capabilities.drop`        | List of capabilities to be dropped                                                                                  | `["ALL"]`                     |
+| `recommender.securityContext.readOnlyRootFilesystem`   | Set container's Security Context readOnlyRootFilesystem                                                             | `true`                        |
+| `recommender.securityContext.runAsNonRoot`             | Whether the container must run as a non-root user                                                                   | `true`                        |
+| `recommender.securityContext.runAsUser`                | The UID to run the entrypoint of the container process                                                              | `65534`                       |
+| `recommender.securityContext.runAsGroup`               | The GID to run the entrypoint of the container process                                                              | `65534`                       |
 | `recommender.containerPorts.metrics`                   | Container port for Metrics                                                                                          | `8942`                        |
 | `recommender.livenessProbe.enabled`                    | Enable liveness probe                                                                                               | `true`                        |
 | `recommender.livenessProbe.initialDelaySeconds`        | Delay before the liveness probe is initiated                                                                        | `0`                           |
@@ -320,9 +356,10 @@ $ kubectl delete crd verticalpodautoscalercheckpoints.autoscaling.k8s.io
 | -------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------- | ------------------------- |
 | `updater.enabled`                                  | Enable the component                                                                                                | `true`                    |
 | `updater.replicaCount`                             | Number of replicas                                                                                                  | `1`                       |
+| `updater.revisionHistoryLimit`                     | Number of old history to retain to allow rollback                                                                   | `10`                      |
 | `updater.image.registry`                           | Image registry                                                                                                      | `registry.k8s.io`         |
 | `updater.image.repository`                         | Image repository                                                                                                    | `autoscaling/vpa-updater` |
-| `updater.image.tag`                                | Image tag                                                                                                           | `1.3.0`                   |
+| `updater.image.tag`                                | Image tag                                                                                                           | `1.5.0`                   |
 | `updater.image.digest`                             | Image digest                                                                                                        | `""`                      |
 | `updater.image.pullPolicy`                         | Image pull policy                                                                                                   | `IfNotPresent`            |
 | `updater.pdb.create`                               | Specifies whether a pod disruption budget should be created                                                         | `false`                   |
@@ -337,13 +374,17 @@ $ kubectl delete crd verticalpodautoscalercheckpoints.autoscaling.k8s.io
 | `updater.podAnnotations`                           | Additional pod annotations                                                                                          | `{}`                      |
 | `updater.podLabels`                                | Additional pod labels                                                                                               | `{}`                      |
 | `updater.podSecurityContext`                       | Pod security context                                                                                                |                           |
-| `updater.podSecurityContext.runAsNonRoot`          | Whether the container must run as a non-root user                                                                   | `true`                    |
-| `updater.podSecurityContext.runAsUser`             | The UID to run the entrypoint of the container process                                                              | `65534`                   |
-| `updater.podSecurityContext.runAsGroup`            | The GID to run the entrypoint of the container process                                                              | `65534`                   |
+| `updater.podSecurityContext.seccompProfile.type`   | Set pod's Security Context seccomp profile                                                                          | `RuntimeDefault`          |
 | `updater.priorityClassName`                        | Priority class name                                                                                                 | `nil`                     |
 | `updater.runtimeClassName`                         | Runtime class name                                                                                                  | `""`                      |
 | `updater.topologySpreadConstraints`                | Topology Spread Constraints for pod assignment                                                                      | `[]`                      |
-| `updater.securityContext`                          | Container security context                                                                                          | `{}`                      |
+| `updater.securityContext`                          | Container security context                                                                                          |                           |
+| `updater.securityContext.allowPrivilegeEscalation` | Set container's Security Context allowPrivilegeEscalation                                                           | `false`                   |
+| `updater.securityContext.capabilities.drop`        | List of capabilities to be dropped                                                                                  | `["ALL"]`                 |
+| `updater.securityContext.readOnlyRootFilesystem`   | Set container's Security Context readOnlyRootFilesystem                                                             | `true`                    |
+| `updater.securityContext.runAsNonRoot`             | Whether the container must run as a non-root user                                                                   | `true`                    |
+| `updater.securityContext.runAsUser`                | The UID to run the entrypoint of the container process                                                              | `65534`                   |
+| `updater.securityContext.runAsGroup`               | The GID to run the entrypoint of the container process                                                              | `65534`                   |
 | `updater.containerPorts.metrics`                   | Container port for Metrics                                                                                          | `8943`                    |
 | `updater.livenessProbe.enabled`                    | Enable liveness probe                                                                                               | `true`                    |
 | `updater.livenessProbe.initialDelaySeconds`        | Delay before the liveness probe is initiated                                                                        | `0`                       |
@@ -393,25 +434,29 @@ $ kubectl delete crd verticalpodautoscalercheckpoints.autoscaling.k8s.io
 
 ### CRDs parameters
 
-| Name                                   | Description                                            | Default           |
-| -------------------------------------- | ------------------------------------------------------ | ----------------- |
-| `crds.enabled`                         | Enable CRDs                                            | `true`            |
-| `crds.image.registry`                  | Image registry                                         | `docker.io`       |
-| `crds.image.repository`                | Image repository                                       | `bitnami/kubectl` |
-| `crds.image.tag`                       | Image tag                                              | `1.29.3`          |
-| `crds.image.digest`                    | Image digest                                           | `""`              |
-| `crds.image.pullPolicy`                | Image pull policy                                      | `IfNotPresent`    |
-| `crds.podAnnotations`                  | Additional pod annotations                             | `{}`              |
-| `crds.podLabels`                       | Additional pod labels                                  | `{}`              |
-| `crds.podSecurityContext`              | Pod security context                                   |                   |
-| `crds.podSecurityContext.runAsNonRoot` | Whether the container must run as a non-root user      | `true`            |
-| `crds.podSecurityContext.runAsUser`    | The UID to run the entrypoint of the container process | `1001`            |
-| `crds.podSecurityContext.runAsGroup`   | The GID to run the entrypoint of the container process | `1001`            |
-| `crds.securityContext`                 | Container security context                             | `{}`              |
-| `crds.resources`                       | CPU/Memory resource requests/limits                    | `{}`              |
-| `crds.nodeSelector`                    | Node labels for pod assignment                         | `{}`              |
-| `crds.tolerations`                     | Tolerations for pod assignment                         | `[]`              |
-| `crds.affinity`                        | Map of node/pod affinities                             | `{}`              |
+| Name                                            | Description                                               | Default                 |
+| ----------------------------------------------- | --------------------------------------------------------- | ----------------------- |
+| `crds.enabled`                                  | Enable CRDs                                               | `true`                  |
+| `crds.image.registry`                           | Image registry                                            | `docker.io`             |
+| `crds.image.repository`                         | Image repository                                          | `bitnamilegacy/kubectl` |
+| `crds.image.tag`                                | Image tag                                                 | `1.29.3`                |
+| `crds.image.digest`                             | Image digest                                              | `""`                    |
+| `crds.image.pullPolicy`                         | Image pull policy                                         | `IfNotPresent`          |
+| `crds.podAnnotations`                           | Additional pod annotations                                | `{}`                    |
+| `crds.podLabels`                                | Additional pod labels                                     | `{}`                    |
+| `crds.podSecurityContext`                       | Pod security context                                      |                         |
+| `crds.podSecurityContext.seccompProfile.type`   | Set pod's Security Context seccomp profile                | `RuntimeDefault`        |
+| `crds.securityContext`                          | Container security context                                |                         |
+| `crds.securityContext.allowPrivilegeEscalation` | Set container's Security Context allowPrivilegeEscalation | `false`                 |
+| `crds.securityContext.capabilities.drop`        | List of capabilities to be dropped                        | `["ALL"]`               |
+| `crds.securityContext.readOnlyRootFilesystem`   | Set container's Security Context readOnlyRootFilesystem   | `true`                  |
+| `crds.securityContext.runAsNonRoot`             | Whether the container must run as a non-root user         | `true`                  |
+| `crds.securityContext.runAsUser`                | The UID to run the entrypoint of the container process    | `65534`                 |
+| `crds.securityContext.runAsGroup`               | The GID to run the entrypoint of the container process    | `65534`                 |
+| `crds.resources`                                | CPU/Memory resource requests/limits                       | `{}`                    |
+| `crds.nodeSelector`                             | Node labels for pod assignment                            | `{}`                    |
+| `crds.tolerations`                              | Tolerations for pod assignment                            | `[]`                    |
+| `crds.affinity`                                 | Map of node/pod affinities                                | `{}`                    |
 
 ### Tests parameters
 
@@ -419,7 +464,7 @@ $ kubectl delete crd verticalpodautoscalercheckpoints.autoscaling.k8s.io
 | ------------------------ | ----------------- | -------------------- |
 | `tests.image.registry`   | Image registry    | `ghcr.io`            |
 | `tests.image.repository` | Image repository  | `cowboysysop/pytest` |
-| `tests.image.tag`        | Image tag         | `1.0.41`             |
+| `tests.image.tag`        | Image tag         | `1.2.0`              |
 | `tests.image.digest`     | Image digest      | `""`                 |
 | `tests.image.pullPolicy` | Image pull policy | `IfNotPresent`       |
 
@@ -432,6 +477,13 @@ $ helm install my-release \
     --set nameOverride=my-name cowboysysop/vertical-pod-autoscaler
 ```
 
+or for an OCI-based registry:
+
+```bash
+$ helm install my-release \
+    --set nameOverride=my-name oci://ghcr.io/cowboysysop/charts/vertical-pod-autoscaler
+```
+
 The above command sets the `nameOverride` to `my-name`.
 
 Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the chart. For example,
@@ -441,6 +493,13 @@ $ helm install my-release \
     --values values.yaml cowboysysop/vertical-pod-autoscaler
 ```
 
+or for an OCI-based registry:
+
+```bash
+$ helm install my-release \
+    --values values.yaml oci://ghcr.io/cowboysysop/charts/vertical-pod-autoscaler
+```
+
 **TIP**: You can use the default [values.yaml](values.yaml).
 
 ## Limitations
diff --git a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/charts/common/Chart.yaml b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/charts/common/Chart.yaml
index 8af61a71c6..7c61528d96 100644
--- a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/charts/common/Chart.yaml
+++ b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/charts/common/Chart.yaml
@@ -2,11 +2,10 @@ annotations:
   category: Infrastructure
   licenses: Apache-2.0
 apiVersion: v2
-appVersion: 2.21.0
+appVersion: 2.31.3
 description: A Library Helm Chart for grouping common logic between bitnami charts.
   This chart is not deployable by itself.
-home: https://bitnami.com
-icon: https://bitnami.com/downloads/logos/bitnami-mark.png
+home: https://github.com/cowboysysop/charts/tree/master/charts/common
 keywords:
 - common
 - helper
@@ -14,10 +13,10 @@ keywords:
 - function
 - bitnami
 maintainers:
-- name: Broadcom, Inc. All Rights Reserved.
-  url: https://github.com/bitnami/charts
+- email: sebastien.prudhomme@gmail.com
+  name: sebastien-prudhomme
 name: common
 sources:
-- https://github.com/bitnami/charts/tree/main/bitnami/common
+- https://github.com/cowboysysop/charts/tree/master/charts/common
 type: library
-version: 2.21.0
+version: 2.31.3
diff --git a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/charts/common/README.md b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/charts/common/README.md
index fee26c9914..e6154a25b3 100644
--- a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/charts/common/README.md
+++ b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/charts/common/README.md
@@ -26,12 +26,21 @@ data:
 
 Looking to use our applications in production? Try [VMware Tanzu Application Catalog](https://bitnami.com/enterprise), the commercial edition of the Bitnami catalog.
 
+## ⚠️ Important Notice: Upcoming changes to the Bitnami Catalog
+
+Beginning August 28th, 2025, Bitnami will evolve its public catalog to offer a curated set of hardened, security-focused images under the new [Bitnami Secure Images initiative](https://news.broadcom.com/app-dev/broadcom-introduces-bitnami-secure-images-for-production-ready-containerized-applications). As part of this transition:
+
+- Granting community users access for the first time to security-optimized versions of popular container images.
+- Bitnami will begin deprecating support for non-hardened, Debian-based software images in its free tier and will gradually remove non-latest tags from the public catalog. As a result, community users will have access to a reduced number of hardened images. These images are published only under the “latest” tag and are intended for development purposes
+- Starting August 28th, over two weeks, all existing container images, including older or versioned tags (e.g., 2.50.0, 10.6), will be migrated from the public catalog (docker.io/bitnami) to the “Bitnami Legacy” repository (docker.io/bitnamilegacy), where they will no longer receive updates.
+- For production workloads and long-term support, users are encouraged to adopt Bitnami Secure Images, which include hardened containers, smaller attack surfaces, CVE transparency (via VEX/KEV), SBOMs, and enterprise support.
+
+These changes aim to improve the security posture of all Bitnami users by promoting best practices for software supply chain integrity and up-to-date deployments. For more details, visit the [Bitnami Secure Images announcement](https://github.com/bitnami/containers/issues/83267).
+
 ## Introduction
 
 This chart provides a common template helpers which can be used to develop new charts using [Helm](https://helm.sh) package manager.
 
-Bitnami charts can be used with [Kubeapps](https://kubeapps.dev/) for deployment and management of Helm Charts in clusters.
-
 ## Prerequisites
 
 - Kubernetes 1.23+
@@ -39,6 +48,152 @@ Bitnami charts can be used with [Kubeapps](https://kubeapps.dev/) for deployment
 
 ## Parameters
 
+The following table lists the helpers available in the library which are scoped in different sections.
+
+### Affinities
+
+| Helper identifier               | Description                                          | Expected Input                                               |
+| ------------------------------- | ---------------------------------------------------- | ------------------------------------------------------------ |
+| `common.affinities.nodes.soft`  | Return a soft nodeAffinity definition                | `dict "key" "FOO" "values" (list "BAR" "BAZ")`               |
+| `common.affinities.nodes.hard`  | Return a hard nodeAffinity definition                | `dict "key" "FOO" "values" (list "BAR" "BAZ")`               |
+| `common.affinities.nodes`       | Return a nodeAffinity definition                     | `dict "type" "soft" "key" "FOO" "values" (list "BAR" "BAZ")` |
+| `common.affinities.topologyKey` | Return a topologyKey definition                      | `dict "topologyKey" "FOO"`                                   |
+| `common.affinities.pods.soft`   | Return a soft podAffinity/podAntiAffinity definition | `dict "component" "FOO" "context" $`                         |
+| `common.affinities.pods.hard`   | Return a hard podAffinity/podAntiAffinity definition | `dict "component" "FOO" "context" $`                         |
+| `common.affinities.pods`        | Return a podAffinity/podAntiAffinity definition      | `dict "type" "soft" "key" "FOO" "values" (list "BAR" "BAZ")` |
+
+### Capabilities
+
+| Helper identifier                                         | Description                                                                                    | Expected Input                          |
+| --------------------------------------------------------- | ---------------------------------------------------------------------------------------------- | --------------------------------------- |
+| `common.capabilities.kubeVersion`                         | Return the target Kubernetes version (using client default if .Values.kubeVersion is not set). | `.` Chart context                       |
+| `common.capabilities.apiVersions.has`                     | Return true if the apiVersion is supported                                                     | `dict "version" "batch/v1" "context" $` |
+| `common.capabilities.job.apiVersion`                      | Return the appropriate apiVersion for job.                                                     | `.` Chart context                       |
+| `common.capabilities.cronjob.apiVersion`                  | Return the appropriate apiVersion for cronjob.                                                 | `.` Chart context                       |
+| `common.capabilities.daemonset.apiVersion`                | Return the appropriate apiVersion for daemonset.                                               | `.` Chart context                       |
+| `common.capabilities.cronjob.apiVersion`                  | Return the appropriate apiVersion for cronjob.                                                 | `.` Chart context                       |
+| `common.capabilities.deployment.apiVersion`               | Return the appropriate apiVersion for deployment.                                              | `.` Chart context                       |
+| `common.capabilities.statefulset.apiVersion`              | Return the appropriate apiVersion for statefulset.                                             | `.` Chart context                       |
+| `common.capabilities.ingress.apiVersion`                  | Return the appropriate apiVersion for ingress.                                                 | `.` Chart context                       |
+| `common.capabilities.rbac.apiVersion`                     | Return the appropriate apiVersion for RBAC resources.                                          | `.` Chart context                       |
+| `common.capabilities.crd.apiVersion`                      | Return the appropriate apiVersion for CRDs.                                                    | `.` Chart context                       |
+| `common.capabilities.policy.apiVersion`                   | Return the appropriate apiVersion for podsecuritypolicy.                                       | `.` Chart context                       |
+| `common.capabilities.networkPolicy.apiVersion`            | Return the appropriate apiVersion for networkpolicy.                                           | `.` Chart context                       |
+| `common.capabilities.apiService.apiVersion`               | Return the appropriate apiVersion for APIService.                                              | `.` Chart context                       |
+| `common.capabilities.hpa.apiVersion`                      | Return the appropriate apiVersion for Horizontal Pod Autoscaler                                | `.` Chart context                       |
+| `common.capabilities.vpa.apiVersion`                      | Return the appropriate apiVersion for Vertical Pod Autoscaler.                                 | `.` Chart context                       |
+| `common.capabilities.psp.supported`                       | Returns true if PodSecurityPolicy is supported                                                 | `.` Chart context                       |
+| `common.capabilities.supportsHelmVersion`                 | Returns true if the used Helm version is 3.3+                                                  | `.` Chart context                       |
+| `common.capabilities.admissionConfiguration.supported`    | Returns true if AdmissionConfiguration is supported                                            | `.` Chart context                       |
+| `common.capabilities.admissionConfiguration.apiVersion`   | Return the appropriate apiVersion for AdmissionConfiguration.                                  | `.` Chart context                       |
+| `common.capabilities.podSecurityConfiguration.apiVersion` | Return the appropriate apiVersion for PodSecurityConfiguration.                                | `.` Chart context                       |
+
+### Compatibility
+
+| Helper identifier                            | Description                                                                                                                                                                                                                           | Expected Input                                                   |
+| -------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------- |
+| `common.compatibility.isOpenshift`           | Return true if the detected platform is Openshift                                                                                                                                                                                     | `.` Chart context                                                |
+| `common.compatibility.renderSecurityContext` | Render a compatible securityContext depending on the platform. By default it is maintained as it is. In other platforms like Openshift we remove default user/group values that do not work out of the box with the restricted-v1 SCC | `dict "secContext" .Values.containerSecurityContext "context" $` |
+
+### Errors
+
+| Helper identifier                       | Description                                                                                                                                                            | Expected Input                                                                      |
+| --------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------- |
+| `common.errors.upgrade.passwords.empty` | It will ensure required passwords are given when we are upgrading a chart. If `validationErrors` is not empty it will throw an error and will stop the upgrade action. | `dict "validationErrors" (list $validationError00 $validationError01)  "context" $` |
+| `common.errors.insecureImages`          | Throw error when original container images are replaced. The error can be bypassed by setting the `global.security.allowInsecureImages` to true.                       | `dict "images" (list .Values.path.to.the.imageRoot) "context" $`                    |
+
+### Images
+
+| Helper identifier                 | Description                                                                                                    | Expected Input                                                                                               |
+| --------------------------------- | -------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------ |
+| `common.images.image`             | Return the proper and full image name                                                                          | `dict "imageRoot" .Values.path.to.the.image "global" $`, see [ImageRoot](#imageroot) for the structure.      |
+| `common.images.pullSecrets`       | Return the proper Docker Image Registry Secret Names (deprecated: use common.images.renderPullSecrets instead) | `dict "images" (list .Values.path.to.the.image1, .Values.path.to.the.image2) "global" .Values.global`        |
+| `common.images.renderPullSecrets` | Return the proper Docker Image Registry Secret Names (evaluates values as templates)                           | `dict "images" (list .Values.path.to.the.image1, .Values.path.to.the.image2) "context" $`                    |
+| `common.images.version`           | Return the proper image version                                                                                | `dict "imageRoot" .Values.path.to.the.image "chart" .Chart` , see [ImageRoot](#imageroot) for the structure. |
+
+### Ingress
+
+| Helper identifier                         | Description                                                                                                       | Expected Input                                                                                                                                                                   |
+| ----------------------------------------- | ----------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `common.ingress.backend`                  | Generate a proper Ingress backend entry depending on the API version                                              | `dict "serviceName" "foo" "servicePort" "bar"`, see the [Ingress deprecation notice](https://kubernetes.io/blog/2019/07/18/api-deprecations-in-1-16/) for the syntax differences |
+| `common.ingress.supportsPathType`         | Prints "true" if the pathType field is supported                                                                  | `.` Chart context                                                                                                                                                                |
+| `common.ingress.supportsIngressClassname` | Prints "true" if the ingressClassname field is supported                                                          | `.` Chart context                                                                                                                                                                |
+| `common.ingress.certManagerRequest`       | Prints "true" if required cert-manager annotations for TLS signed certificates are set in the Ingress annotations | `dict "annotations" .Values.path.to.the.ingress.annotations`                                                                                                                     |
+
+### Labels
+
+| Helper identifier           | Description                                                                 | Expected Input    |
+| --------------------------- | --------------------------------------------------------------------------- | ----------------- |
+| `common.labels.standard`    | Return Kubernetes standard labels                                           | `.` Chart context |
+| `common.labels.matchLabels` | Labels to use on `deploy.spec.selector.matchLabels` and `svc.spec.selector` | `.` Chart context |
+
+### Names
+
+| Helper identifier                  | Description                                                           | Expected Input                                                                                |
+| ---------------------------------- | --------------------------------------------------------------------- | --------------------------------------------------------------------------------------------- |
+| `common.names.name`                | Expand the name of the chart or use `.Values.nameOverride`            | `.` Chart context                                                                             |
+| `common.names.fullname`            | Create a default fully qualified app name.                            | `.` Chart context                                                                             |
+| `common.names.namespace`           | Allow the release namespace to be overridden                          | `.` Chart context                                                                             |
+| `common.names.fullname.namespace`  | Create a fully qualified app name adding the installation's namespace | `.` Chart context                                                                             |
+| `common.names.chart`               | Chart name plus version                                               | `.` Chart context                                                                             |
+| `common.names.dependency.fullname` | Create a default fully qualified dependency name.                     | `dict "chartName" "dependency-chart-name" "chartValues" .Values.dependency-chart "context" $` |
+
+### Resources
+
+| Helper identifier         | Description                                                                                                                                 | Expected Input       |
+| ------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------- | -------------------- |
+| `common.resources.preset` | Return a resource request/limit object based on a given preset. These presets are for basic testing and not meant to be used in production. | `dict "type" "nano"` |
+
+### Secrets
+
+| Helper identifier                 | Description                                                                            | Expected Input                                                                                                                                                                                                                                                                   |
+| --------------------------------- | -------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `common.secrets.name`             | Generate the name of the secret.                                                       | `dict "existingSecret" .Values.path.to.the.existingSecret "defaultNameSuffix" "mySuffix" "context" $` see [ExistingSecret](#existingsecret) for the structure.                                                                                                                   |
+| `common.secrets.key`              | Generate secret key.                                                                   | `dict "existingSecret" .Values.path.to.the.existingSecret "key" "keyName"` see [ExistingSecret](#existingsecret) for the structure.                                                                                                                                              |
+| `common.secrets.passwords.manage` | Generate secret password or retrieve one if already created.                           | `dict "secret" "secret-name" "key" "keyName" "providedValues" (list "path.to.password1" "path.to.password2") "length" 10 "strong" false "chartName" "chartName" "honorProvidedValues" false "context" $`, length, strong, honorProvidedValues and chartName fields are optional. |
+| `common.secrets.exists`           | Returns whether a previous generated secret already exists.                            | `dict "secret" "secret-name" "context" $`                                                                                                                                                                                                                                        |
+| `common.secrets.lookup`           | Reuses the value from an existing secret, otherwise sets its value to a default value. | `dict "secret" "secret-name" "key" "keyName" "defaultValue" .Values.myValue "context" $`                                                                                                                                                                                         |
+
+### Storage
+
+| Helper identifier      | Description                      | Expected Input                                                                                                      |
+| ---------------------- | -------------------------------- | ------------------------------------------------------------------------------------------------------------------- |
+| `common.storage.class` | Return  the proper Storage Class | `dict "persistence" .Values.path.to.the.persistence "global" $`, see [Persistence](#persistence) for the structure. |
+
+### TplValues
+
+| Helper identifier                  | Description                                                         | Expected Input                                                                                                                                           |
+| ---------------------------------- | ------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `common.tplvalues.render`          | Renders a value that contains template                              | `dict "value" .Values.path.to.the.Value "context" $`, value is the value should rendered as template, context frequently is the chart context `$` or `.` |
+| `common.tplvalues.merge`           | Merge a list of values that contains template after rendering them. | `dict "values" (list .Values.path.to.the.Value1 .Values.path.to.the.Value2) "context" $`                                                                 |
+| `common.tplvalues.merge-overwrite` | Merge a list of values that contains template after rendering them. | `dict "values" (list .Values.path.to.the.Value1 .Values.path.to.the.Value2) "context" $`                                                                 |
+
+### Utils
+
+| Helper identifier               | Description                                                                                                                                     | Expected Input                                                         |
+| ------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------- |
+| `common.utils.fieldToEnvVar`    | Build environment variable name given a field.                                                                                                  | `dict "field" "my-password"`                                           |
+| `common.utils.secret.getvalue`  | Print instructions to get a secret value.                                                                                                       | `dict "secret" "secret-name" "field" "secret-value-field" "context" $` |
+| `common.utils.getValueFromKey`  | Gets a value from `.Values` object given its key path                                                                                           | `dict "key" "path.to.key" "context" $`                                 |
+| `common.utils.getKeyFromList`   | Returns first `.Values` key with a defined value or first of the list if all non-defined                                                        | `dict "keys" (list "path.to.key1" "path.to.key2") "context" $`         |
+| `common.utils.checksumTemplate` | Checksum a template at "path" containing a *single* resource (ConfigMap,Secret) for use in pod annotations, excluding the metadata (see #18376) | `dict "path" "/configmap.yaml" "context" $`                            |
+
+### Validations
+
+| Helper identifier                             | Description                                                                                                        | Expected Input                                                                                                                                                                                                                                                           |
+| --------------------------------------------- | ------------------------------------------------------------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
+| `common.validations.values.single.empty`      | Validate a value must not be empty.                                                                                | `dict "valueKey" "path.to.value" "secret" "secret.name" "field" "my-password" "subchart" "subchart" "context" $` secret, field and subchart are optional. In case they are given, the helper will generate a how to get instruction. See [ValidateValue](#validatevalue) |
+| `common.validations.values.multiple.empty`    | Validate a multiple values must not be empty. It returns a shared error for all the values.                        | `dict "required" (list $validateValueConf00 $validateValueConf01) "context" $`. See [ValidateValue](#validatevalue)                                                                                                                                                      |
+| `common.validations.values.mariadb.passwords` | This helper will ensure required password for MariaDB are not empty. It returns a shared error for all the values. | `dict "secret" "mariadb-secret" "subchart" "true" "context" $` subchart field is optional and could be true or false it depends on where you will use mariadb chart and the helper.                                                                                      |
+
+### Warnings
+
+| Helper identifier                | Description                                                       | Expected Input                                             |
+| -------------------------------- | ----------------------------------------------------------------- | ---------------------------------------------------------- |
+| `common.warnings.rollingTag`     | Warning about using rolling tag.                                  | `ImageRoot` see [ImageRoot](#imageroot) for the structure. |
+| `common.warnings.modifiedImages` | Warning about replaced images from the original.                  | `ImageRoot` see [ImageRoot](#imageroot) for the structure. |
+| `common.warnings.resources`      | Warning about not setting the resource object in all deployments. | `dict "sections" (list "path1" "path2") context $`         |
+
 ## Special input schemas
 
 ### ImageRoot
@@ -61,7 +216,7 @@ tag:
 
 pullPolicy:
   type: string
-  description: Specify a imagePullPolicy. Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
+  description: Specify a imagePullPolicy.'
 
 pullSecrets:
   type: array
@@ -214,13 +369,13 @@ helm install test mychart --set path.to.value00="",path.to.value01=""
 
 #### Useful links
 
-- <https://docs.vmware.com/en/VMware-Tanzu-Application-Catalog/services/tutorials/GUID-resolve-helm2-helm3-post-migration-issues-index.html>
+- <https://techdocs.broadcom.com/us/en/vmware-tanzu/application-catalog/tanzu-application-catalog/services/tac-doc/apps-tutorials-resolve-helm2-helm3-post-migration-issues-index.html>
 - <https://helm.sh/docs/topics/v2_v3_migration/>
 - <https://helm.sh/blog/migrate-from-helm-v2-to-helm-v3/>
 
 ## License
 
-Copyright &copy; 2024 Broadcom. The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
+Copyright &copy; 2025 Broadcom. The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/charts/common/templates/_affinities.tpl b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/charts/common/templates/_affinities.tpl
index c2d290792e..c6ccc62e2f 100644
--- a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/charts/common/templates/_affinities.tpl
+++ b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/charts/common/templates/_affinities.tpl
@@ -60,13 +60,14 @@ Return a topologyKey definition
 
 {{/*
 Return a soft podAffinity/podAntiAffinity definition
-{{ include "common.affinities.pods.soft" (dict "component" "FOO" "customLabels" .Values.podLabels "extraMatchLabels" .Values.extraMatchLabels "topologyKey" "BAR" "extraPodAffinityTerms" .Values.extraPodAffinityTerms "context" $) -}}
+{{ include "common.affinities.pods.soft" (dict "component" "FOO" "customLabels" .Values.podLabels "extraMatchLabels" .Values.extraMatchLabels "topologyKey" "BAR" "extraPodAffinityTerms" .Values.extraPodAffinityTerms "extraNamespaces" (list "namespace1" "namespace2") "context" $) -}}
 */}}
 {{- define "common.affinities.pods.soft" -}}
 {{- $component := default "" .component -}}
 {{- $customLabels := default (dict) .customLabels -}}
 {{- $extraMatchLabels := default (dict) .extraMatchLabels -}}
 {{- $extraPodAffinityTerms := default (list) .extraPodAffinityTerms -}}
+{{- $extraNamespaces := default (list) .extraNamespaces -}}
 preferredDuringSchedulingIgnoredDuringExecution:
   - podAffinityTerm:
       labelSelector:
@@ -77,6 +78,13 @@ preferredDuringSchedulingIgnoredDuringExecution:
           {{- range $key, $value := $extraMatchLabels }}
           {{ $key }}: {{ $value | quote }}
           {{- end }}
+      {{- if $extraNamespaces }}
+      namespaces:
+        - {{ .context.Release.Namespace }}
+        {{- with $extraNamespaces }}
+        {{- include "common.tplvalues.render" (dict "value" . "context" $) | nindent 8 }}
+        {{- end }}
+      {{- end }}
       topologyKey: {{ include "common.affinities.topologyKey" (dict "topologyKey" .topologyKey) }}
     weight: 1
   {{- range $extraPodAffinityTerms }}
@@ -89,6 +97,13 @@ preferredDuringSchedulingIgnoredDuringExecution:
           {{- range $key, $value := .extraMatchLabels }}
           {{ $key }}: {{ $value | quote }}
           {{- end }}
+      {{- if .namespaces }}
+      namespaces:
+        - {{ $.context.Release.Namespace }}
+        {{- with .namespaces }}
+        {{- include "common.tplvalues.render" (dict "value" . "context" $) | nindent 8 }}
+        {{- end }}
+      {{- end }}
       topologyKey: {{ include "common.affinities.topologyKey" (dict "topologyKey" .topologyKey) }}
     weight: {{ .weight | default 1 -}}
   {{- end -}}
@@ -96,13 +111,14 @@ preferredDuringSchedulingIgnoredDuringExecution:
 
 {{/*
 Return a hard podAffinity/podAntiAffinity definition
-{{ include "common.affinities.pods.hard" (dict "component" "FOO" "customLabels" .Values.podLabels "extraMatchLabels" .Values.extraMatchLabels "topologyKey" "BAR" "extraPodAffinityTerms" .Values.extraPodAffinityTerms "context" $) -}}
+{{ include "common.affinities.pods.hard" (dict "component" "FOO" "customLabels" .Values.podLabels "extraMatchLabels" .Values.extraMatchLabels "topologyKey" "BAR" "extraPodAffinityTerms" .Values.extraPodAffinityTerms "extraNamespaces" (list "namespace1" "namespace2") "context" $) -}}
 */}}
 {{- define "common.affinities.pods.hard" -}}
 {{- $component := default "" .component -}}
 {{- $customLabels := default (dict) .customLabels -}}
 {{- $extraMatchLabels := default (dict) .extraMatchLabels -}}
 {{- $extraPodAffinityTerms := default (list) .extraPodAffinityTerms -}}
+{{- $extraNamespaces := default (list) .extraNamespaces -}}
 requiredDuringSchedulingIgnoredDuringExecution:
   - labelSelector:
       matchLabels: {{- (include "common.labels.matchLabels" ( dict "customLabels" $customLabels "context" .context )) | nindent 8 }}
@@ -112,6 +128,13 @@ requiredDuringSchedulingIgnoredDuringExecution:
         {{- range $key, $value := $extraMatchLabels }}
         {{ $key }}: {{ $value | quote }}
         {{- end }}
+    {{- if $extraNamespaces }}
+    namespaces:
+      - {{ .context.Release.Namespace }}
+      {{- with $extraNamespaces }}
+      {{- include "common.tplvalues.render" (dict "value" . "context" $) | nindent 6 }}
+      {{- end }}
+    {{- end }}
     topologyKey: {{ include "common.affinities.topologyKey" (dict "topologyKey" .topologyKey) }}
   {{- range $extraPodAffinityTerms }}
   - labelSelector:
@@ -122,6 +145,13 @@ requiredDuringSchedulingIgnoredDuringExecution:
         {{- range $key, $value := .extraMatchLabels }}
         {{ $key }}: {{ $value | quote }}
         {{- end }}
+    {{- if .namespaces }}
+    namespaces:
+      - {{ $.context.Release.Namespace }}
+      {{- with .namespaces }}
+      {{- include "common.tplvalues.render" (dict "value" . "context" $) | nindent 6 }}
+      {{- end }}
+    {{- end }}
     topologyKey: {{ include "common.affinities.topologyKey" (dict "topologyKey" .topologyKey) }}
   {{- end -}}
 {{- end -}}
diff --git a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/charts/common/templates/_capabilities.tpl b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/charts/common/templates/_capabilities.tpl
index 2fe81d32d1..58f58c1c10 100644
--- a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/charts/common/templates/_capabilities.tpl
+++ b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/charts/common/templates/_capabilities.tpl
@@ -12,159 +12,114 @@ Return the target Kubernetes version
 {{- default (default .Capabilities.KubeVersion.Version .Values.kubeVersion) ((.Values.global).kubeVersion) -}}
 {{- end -}}
 
+{{/*
+Return true if the apiVersion is supported
+Usage:
+{{ include "common.capabilities.apiVersions.has" (dict "version" "batch/v1" "context" $) }}
+*/}}
+{{- define "common.capabilities.apiVersions.has" -}}
+{{- $providedAPIVersions := default .context.Values.apiVersions ((.context.Values.global).apiVersions) -}}
+{{- if and (empty $providedAPIVersions) (.context.Capabilities.APIVersions.Has .version) -}}
+    {{- true -}}
+{{- else if has .version $providedAPIVersions -}}
+    {{- true -}}
+{{- end -}}
+{{- end -}}
+
 {{/*
 Return the appropriate apiVersion for poddisruptionbudget.
 */}}
 {{- define "common.capabilities.policy.apiVersion" -}}
-{{- $kubeVersion := include "common.capabilities.kubeVersion" . -}}
-{{- if and (not (empty $kubeVersion)) (semverCompare "<1.21-0" $kubeVersion) -}}
-{{- print "policy/v1beta1" -}}
-{{- else -}}
 {{- print "policy/v1" -}}
 {{- end -}}
-{{- end -}}
 
 {{/*
 Return the appropriate apiVersion for networkpolicy.
 */}}
 {{- define "common.capabilities.networkPolicy.apiVersion" -}}
-{{- $kubeVersion := include "common.capabilities.kubeVersion" . -}}
-{{- if and (not (empty $kubeVersion)) (semverCompare "<1.7-0" $kubeVersion) -}}
-{{- print "extensions/v1beta1" -}}
-{{- else -}}
 {{- print "networking.k8s.io/v1" -}}
 {{- end -}}
+
+{{/*
+Return the appropriate apiVersion for job.
+*/}}
+{{- define "common.capabilities.job.apiVersion" -}}
+{{- print "batch/v1" -}}
 {{- end -}}
 
 {{/*
 Return the appropriate apiVersion for cronjob.
 */}}
 {{- define "common.capabilities.cronjob.apiVersion" -}}
-{{- $kubeVersion := include "common.capabilities.kubeVersion" . -}}
-{{- if and (not (empty $kubeVersion)) (semverCompare "<1.21-0" $kubeVersion) -}}
-{{- print "batch/v1beta1" -}}
-{{- else -}}
 {{- print "batch/v1" -}}
 {{- end -}}
-{{- end -}}
 
 {{/*
 Return the appropriate apiVersion for daemonset.
 */}}
 {{- define "common.capabilities.daemonset.apiVersion" -}}
-{{- $kubeVersion := include "common.capabilities.kubeVersion" . -}}
-{{- if and (not (empty $kubeVersion)) (semverCompare "<1.14-0" $kubeVersion) -}}
-{{- print "extensions/v1beta1" -}}
-{{- else -}}
 {{- print "apps/v1" -}}
 {{- end -}}
-{{- end -}}
 
 {{/*
 Return the appropriate apiVersion for deployment.
 */}}
 {{- define "common.capabilities.deployment.apiVersion" -}}
-{{- $kubeVersion := include "common.capabilities.kubeVersion" . -}}
-{{- if and (not (empty $kubeVersion)) (semverCompare "<1.14-0" $kubeVersion) -}}
-{{- print "extensions/v1beta1" -}}
-{{- else -}}
 {{- print "apps/v1" -}}
 {{- end -}}
-{{- end -}}
 
 {{/*
 Return the appropriate apiVersion for statefulset.
 */}}
 {{- define "common.capabilities.statefulset.apiVersion" -}}
-{{- $kubeVersion := include "common.capabilities.kubeVersion" . -}}
-{{- if and (not (empty $kubeVersion)) (semverCompare "<1.14-0" $kubeVersion) -}}
-{{- print "apps/v1beta1" -}}
-{{- else -}}
 {{- print "apps/v1" -}}
 {{- end -}}
-{{- end -}}
 
 {{/*
 Return the appropriate apiVersion for ingress.
 */}}
 {{- define "common.capabilities.ingress.apiVersion" -}}
-{{- $kubeVersion := include "common.capabilities.kubeVersion" . -}}
-{{- if (.Values.ingress).apiVersion -}}
-{{- .Values.ingress.apiVersion -}}
-{{- else if and (not (empty $kubeVersion)) (semverCompare "<1.14-0" $kubeVersion) -}}
-{{- print "extensions/v1beta1" -}}
-{{- else if and (not (empty $kubeVersion)) (semverCompare "<1.19-0" $kubeVersion) -}}
-{{- print "networking.k8s.io/v1beta1" -}}
-{{- else -}}
 {{- print "networking.k8s.io/v1" -}}
-{{- end }}
 {{- end -}}
 
 {{/*
 Return the appropriate apiVersion for RBAC resources.
 */}}
 {{- define "common.capabilities.rbac.apiVersion" -}}
-{{- $kubeVersion := include "common.capabilities.kubeVersion" . -}}
-{{- if and (not (empty $kubeVersion)) (semverCompare "<1.17-0" $kubeVersion) -}}
-{{- print "rbac.authorization.k8s.io/v1beta1" -}}
-{{- else -}}
 {{- print "rbac.authorization.k8s.io/v1" -}}
 {{- end -}}
-{{- end -}}
 
 {{/*
 Return the appropriate apiVersion for CRDs.
 */}}
 {{- define "common.capabilities.crd.apiVersion" -}}
-{{- $kubeVersion := include "common.capabilities.kubeVersion" . -}}
-{{- if and (not (empty $kubeVersion)) (semverCompare "<1.19-0" $kubeVersion) -}}
-{{- print "apiextensions.k8s.io/v1beta1" -}}
-{{- else -}}
 {{- print "apiextensions.k8s.io/v1" -}}
 {{- end -}}
-{{- end -}}
 
 {{/*
 Return the appropriate apiVersion for APIService.
 */}}
 {{- define "common.capabilities.apiService.apiVersion" -}}
-{{- $kubeVersion := include "common.capabilities.kubeVersion" . -}}
-{{- if and (not (empty $kubeVersion)) (semverCompare "<1.10-0" $kubeVersion) -}}
-{{- print "apiregistration.k8s.io/v1beta1" -}}
-{{- else -}}
 {{- print "apiregistration.k8s.io/v1" -}}
 {{- end -}}
-{{- end -}}
 
 {{/*
 Return the appropriate apiVersion for Horizontal Pod Autoscaler.
 */}}
 {{- define "common.capabilities.hpa.apiVersion" -}}
 {{- $kubeVersion := include "common.capabilities.kubeVersion" .context -}}
-{{- if and (not (empty $kubeVersion)) (semverCompare "<1.23-0" $kubeVersion) -}}
-{{- if .beta2 -}}
-{{- print "autoscaling/v2beta2" -}}
-{{- else -}}
-{{- print "autoscaling/v2beta1" -}}
-{{- end -}}
-{{- else -}}
 {{- print "autoscaling/v2" -}}
 {{- end -}}
-{{- end -}}
 
 {{/*
 Return the appropriate apiVersion for Vertical Pod Autoscaler.
 */}}
 {{- define "common.capabilities.vpa.apiVersion" -}}
-{{- $kubeVersion := include "common.capabilities.kubeVersion" .context -}}
-{{- if and (not (empty $kubeVersion)) (semverCompare "<1.23-0" $kubeVersion) -}}
-{{- if .beta2 -}}
-{{- print "autoscaling/v2beta2" -}}
+{{- $kubeVersion := include "common.capabilities.kubeVersion" . -}}
+{{- if and (not (empty $kubeVersion)) (semverCompare "<1.25-0" $kubeVersion) -}}
+{{- print "autoscaling/v1beta2" -}}
 {{- else -}}
-{{- print "autoscaling/v2beta1" -}}
-{{- end -}}
-{{- else -}}
-{{- print "autoscaling/v2" -}}
+{{- print "autoscaling/v1" -}}
 {{- end -}}
 {{- end -}}
 
@@ -183,19 +138,15 @@ Returns true if AdmissionConfiguration is supported
 */}}
 {{- define "common.capabilities.admissionConfiguration.supported" -}}
 {{- $kubeVersion := include "common.capabilities.kubeVersion" . -}}
-{{- if or (empty $kubeVersion) (not (semverCompare "<1.23-0" $kubeVersion)) -}}
   {{- true -}}
 {{- end -}}
-{{- end -}}
 
 {{/*
 Return the appropriate apiVersion for AdmissionConfiguration.
 */}}
 {{- define "common.capabilities.admissionConfiguration.apiVersion" -}}
 {{- $kubeVersion := include "common.capabilities.kubeVersion" . -}}
-{{- if and (not (empty $kubeVersion)) (semverCompare "<1.23-0" $kubeVersion) -}}
-{{- print "apiserver.config.k8s.io/v1alpha1" -}}
-{{- else if and (not (empty $kubeVersion)) (semverCompare "<1.25-0" $kubeVersion) -}}
+{{- if and (not (empty $kubeVersion)) (semverCompare "<1.25-0" $kubeVersion) -}}
 {{- print "apiserver.config.k8s.io/v1beta1" -}}
 {{- else -}}
 {{- print "apiserver.config.k8s.io/v1" -}}
@@ -207,9 +158,7 @@ Return the appropriate apiVersion for PodSecurityConfiguration.
 */}}
 {{- define "common.capabilities.podSecurityConfiguration.apiVersion" -}}
 {{- $kubeVersion := include "common.capabilities.kubeVersion" . -}}
-{{- if and (not (empty $kubeVersion)) (semverCompare "<1.23-0" $kubeVersion) -}}
-{{- print "pod-security.admission.config.k8s.io/v1alpha1" -}}
-{{- else if and (not (empty $kubeVersion)) (semverCompare "<1.25-0" $kubeVersion) -}}
+{{- if and (not (empty $kubeVersion)) (semverCompare "<1.25-0" $kubeVersion) -}}
 {{- print "pod-security.admission.config.k8s.io/v1beta1" -}}
 {{- else -}}
 {{- print "pod-security.admission.config.k8s.io/v1" -}}
diff --git a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/charts/common/templates/_compatibility.tpl b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/charts/common/templates/_compatibility.tpl
index eb4061d7d0..19c26dbd5c 100644
--- a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/charts/common/templates/_compatibility.tpl
+++ b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/charts/common/templates/_compatibility.tpl
@@ -34,9 +34,13 @@ Usage:
     {{- end -}}
   {{- end -}}
 {{- end -}}
+{{/* Remove empty seLinuxOptions object if global.compatibility.omitEmptySeLinuxOptions is set to true */}}
+{{- if and (((.context.Values.global).compatibility).omitEmptySeLinuxOptions) (not .secContext.seLinuxOptions) -}}
+  {{- $adaptedContext = omit $adaptedContext "seLinuxOptions" -}}
+{{- end -}}
 {{/* Remove fields that are disregarded when running the container in privileged mode */}}
 {{- if $adaptedContext.privileged -}}
-  {{- $adaptedContext = omit $adaptedContext "capabilities" "seLinuxOptions" -}}
+  {{- $adaptedContext = omit $adaptedContext "capabilities" -}}
 {{- end -}}
 {{- omit $adaptedContext "enabled" | toYaml -}}
 {{- end -}}
diff --git a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/charts/common/templates/_errors.tpl b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/charts/common/templates/_errors.tpl
index e965365193..95b8b8e292 100644
--- a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/charts/common/templates/_errors.tpl
+++ b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/charts/common/templates/_errors.tpl
@@ -5,7 +5,7 @@ SPDX-License-Identifier: APACHE-2.0
 
 {{/* vim: set filetype=mustache: */}}
 {{/*
-Through error when upgrading using empty passwords values that must not be empty.
+Throw error when upgrading using empty passwords values that must not be empty.
 
 Usage:
 {{- $validationError00 := include "common.validations.values.single.empty" (dict "valueKey" "path.to.password00" "secret" "secretName" "field" "password-00") -}}
@@ -26,3 +26,60 @@ Required password params:
     {{- printf $errorString $validationErrors | fail -}}
   {{- end -}}
 {{- end -}}
+
+{{/*
+Throw error when original container images are replaced.
+The error can be bypassed by setting the "global.security.allowInsecureImages" to true. In this case,
+a warning message will be shown instead.
+
+Usage:
+{{ include "common.errors.insecureImages" (dict "images" (list .Values.path.to.the.imageRoot) "context" $) }}
+*/}}
+{{- define "common.errors.insecureImages" -}}
+{{- $relocatedImages := list -}}
+{{- $replacedImages := list -}}
+{{- $retaggedImages := list -}}
+{{- $globalRegistry := ((.context.Values.global).imageRegistry) -}}
+{{- $originalImages := .context.Chart.Annotations.images -}}
+{{- range .images -}}
+  {{- $registryName := default .registry $globalRegistry -}}
+  {{- $fullImageNameNoTag := printf "%s/%s" $registryName .repository -}}
+  {{- $fullImageName := printf "%s:%s" $fullImageNameNoTag .tag -}}
+  {{- if not (contains $fullImageNameNoTag $originalImages) -}}
+    {{- if not (contains $registryName $originalImages) -}}
+      {{- $relocatedImages = append $relocatedImages $fullImageName  -}}
+    {{- else if not (contains .repository $originalImages) -}}
+      {{- $replacedImages = append $replacedImages $fullImageName  -}}
+    {{- end -}}
+  {{- end -}}
+  {{- if not (contains (printf "%s:%s" .repository .tag) $originalImages) -}}
+    {{- $retaggedImages = append $retaggedImages $fullImageName  -}}
+  {{- end -}}
+{{- end -}}
+
+{{- if and (or (gt (len $relocatedImages) 0) (gt (len $replacedImages) 0)) (((.context.Values.global).security).allowInsecureImages) -}}
+  {{- print "\n\n⚠ SECURITY WARNING: Verifying original container images was skipped. Please note this Helm chart was designed, tested, and validated on multiple platforms using a specific set of Bitnami and Tanzu Application Catalog containers. Substituting other containers is likely to cause degraded security and performance, broken chart features, and missing environment variables.\n" -}}
+{{- else if (or (gt (len $relocatedImages) 0) (gt (len $replacedImages) 0)) -}}
+  {{- $errorString := "Original containers have been substituted for unrecognized ones. Deploying this chart with non-standard containers is likely to cause degraded security and performance, broken chart features, and missing environment variables." -}}
+  {{- $errorString = print $errorString "\n\nUnrecognized images:" -}}
+  {{- range (concat $relocatedImages $replacedImages) -}}
+    {{- $errorString = print $errorString "\n  - " . -}}
+  {{- end -}}
+  {{- if or (contains "docker.io/bitnami/" $originalImages) (contains "docker.io/bitnamiprem/" $originalImages) -}}
+    {{- $errorString = print "\n\n⚠ ERROR: " $errorString -}}
+    {{- $errorString = print $errorString "\n\nIf you are sure you want to proceed with non-standard containers, you can skip container image verification by setting the global parameter 'global.security.allowInsecureImages' to true." -}}
+    {{- $errorString = print $errorString "\nFurther information can be obtained at https://github.com/bitnami/charts/issues/30850" -}}
+    {{- print $errorString | fail -}}
+  {{- else if gt (len $replacedImages) 0 -}}
+    {{- $errorString = print "\n\n⚠ WARNING: " $errorString -}}
+    {{- print $errorString -}}
+  {{- end -}}
+{{- else if gt (len $retaggedImages) 0 -}}
+  {{- $warnString := "\n\n⚠ WARNING: Original containers have been retagged. Please note this Helm chart was tested, and validated on multiple platforms using a specific set of Tanzu Application Catalog containers. Substituting original image tags could cause unexpected behavior." -}}
+  {{- $warnString = print $warnString "\n\nRetagged images:" -}}
+  {{- range $retaggedImages -}}
+    {{- $warnString = print $warnString "\n  - " . -}}
+  {{- end -}}
+  {{- print $warnString -}}
+{{- end -}}
+{{- end -}}
diff --git a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/charts/common/templates/_images.tpl b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/charts/common/templates/_images.tpl
index 6821b1ce20..76bb7ce447 100644
--- a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/charts/common/templates/_images.tpl
+++ b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/charts/common/templates/_images.tpl
@@ -5,8 +5,9 @@ SPDX-License-Identifier: APACHE-2.0
 
 {{/* vim: set filetype=mustache: */}}
 {{/*
-Return the proper image name
-{{ include "common.images.image" ( dict "imageRoot" .Values.path.to.the.image "global" .Values.global ) }}
+Return the proper image name.
+If image tag and digest are not defined, termination fallbacks to chart appVersion.
+{{ include "common.images.image" ( dict "imageRoot" .Values.path.to.the.image "global" .Values.global "chart" .Chart ) }}
 */}}
 {{- define "common.images.image" -}}
 {{- $registryName := default .imageRoot.registry ((.global).imageRegistry) -}}
@@ -14,6 +15,11 @@ Return the proper image name
 {{- $separator := ":" -}}
 {{- $termination := .imageRoot.tag | toString -}}
 
+{{- if not .imageRoot.tag }}
+  {{- if .chart }}
+    {{- $termination = .chart.AppVersion | toString -}}
+  {{- end -}}
+{{- end -}}
 {{- if .imageRoot.digest }}
     {{- $separator = "@" -}}
     {{- $termination = .imageRoot.digest | toString -}}
diff --git a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/charts/common/templates/_ingress.tpl b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/charts/common/templates/_ingress.tpl
index 7d2b87985c..2d0dbf1e60 100644
--- a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/charts/common/templates/_ingress.tpl
+++ b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/charts/common/templates/_ingress.tpl
@@ -17,11 +17,6 @@ Params:
   - context - Dict - Required. The context for the template evaluation.
 */}}
 {{- define "common.ingress.backend" -}}
-{{- $apiVersion := (include "common.capabilities.ingress.apiVersion" .context) -}}
-{{- if or (eq $apiVersion "extensions/v1beta1") (eq $apiVersion "networking.k8s.io/v1beta1") -}}
-serviceName: {{ .serviceName }}
-servicePort: {{ .servicePort }}
-{{- else -}}
 service:
   name: {{ .serviceName }}
   port:
@@ -31,33 +26,6 @@ service:
     number: {{ .servicePort | int }}
     {{- end }}
 {{- end -}}
-{{- end -}}
-
-{{/*
-Print "true" if the API pathType field is supported
-Usage:
-{{ include "common.ingress.supportsPathType" . }}
-*/}}
-{{- define "common.ingress.supportsPathType" -}}
-{{- if (semverCompare "<1.18-0" (include "common.capabilities.kubeVersion" .)) -}}
-{{- print "false" -}}
-{{- else -}}
-{{- print "true" -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Returns true if the ingressClassname field is supported
-Usage:
-{{ include "common.ingress.supportsIngressClassname" . }}
-*/}}
-{{- define "common.ingress.supportsIngressClassname" -}}
-{{- if semverCompare "<1.18-0" (include "common.capabilities.kubeVersion" .) -}}
-{{- print "false" -}}
-{{- else -}}
-{{- print "true" -}}
-{{- end -}}
-{{- end -}}
 
 {{/*
 Return true if cert-manager required annotations for TLS signed
diff --git a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/charts/common/templates/_names.tpl b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/charts/common/templates/_names.tpl
index ba83956852..d5d0ae438e 100644
--- a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/charts/common/templates/_names.tpl
+++ b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/charts/common/templates/_names.tpl
@@ -28,10 +28,11 @@ If release name contains chart name it will be used as a full name.
 {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
 {{- else -}}
 {{- $name := default .Chart.Name .Values.nameOverride -}}
-{{- if contains $name .Release.Name -}}
-{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- $releaseName := regexReplaceAll "(-?[^a-z\\d\\-])+-?" (lower .Release.Name) "-" -}}
+{{- if contains $name $releaseName -}}
+{{- $releaseName | trunc 63 | trimSuffix "-" -}}
 {{- else -}}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- printf "%s-%s" $releaseName $name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 {{- end -}}
 {{- end -}}
diff --git a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/charts/common/templates/_secrets.tpl b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/charts/common/templates/_secrets.tpl
index 801918ce35..7868c00ac0 100644
--- a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/charts/common/templates/_secrets.tpl
+++ b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/charts/common/templates/_secrets.tpl
@@ -67,7 +67,7 @@ Params:
 Generate secret password or retrieve one if already created.
 
 Usage:
-{{ include "common.secrets.passwords.manage" (dict "secret" "secret-name" "key" "keyName" "providedValues" (list "path.to.password1" "path.to.password2") "length" 10 "strong" false "chartName" "chartName" "context" $) }}
+{{ include "common.secrets.passwords.manage" (dict "secret" "secret-name" "key" "keyName" "providedValues" (list "path.to.password1" "path.to.password2") "length" 10 "strong" false "chartName" "chartName" "honorProvidedValues" false "context" $) }}
 
 Params:
   - secret - String - Required - Name of the 'Secret' resource where the password is stored.
@@ -80,12 +80,15 @@ Params:
   - failOnNew - Boolean - Optional - Default to true. If set to false, skip errors adding new keys to existing secrets.
   - skipB64enc - Boolean - Optional - Default to false. If set to true, no the secret will not be base64 encrypted.
   - skipQuote - Boolean - Optional - Default to false. If set to true, no quotes will be added around the secret.
+  - honorProvidedValues - Boolean - Optional - Default to false. If set to true, the values in providedValues have higher priority than an existing secret
 The order in which this function returns a secret password:
-  1. Already existing 'Secret' resource
+  1. Password provided via the values.yaml if honorProvidedValues = true
+     (If one of the keys passed to the 'providedValues' parameter to this function is a valid path to a key in the values.yaml and has a value, the value of the first key with a value will be returned)
+  2. Already existing 'Secret' resource
      (If a 'Secret' resource is found under the name provided to the 'secret' parameter to this function and that 'Secret' resource contains a key with the name passed as the 'key' parameter to this function then the value of this existing secret password will be returned)
-  2. Password provided via the values.yaml
+  3. Password provided via the values.yaml if honorProvidedValues = false
      (If one of the keys passed to the 'providedValues' parameter to this function is a valid path to a key in the values.yaml and has a value, the value of the first key with a value will be returned)
-  3. Randomly generated secret password
+  4. Randomly generated secret password
      (A new random secret password with the length specified in the 'length' parameter will be generated and returned)
 
 */}}
@@ -106,9 +109,13 @@ The order in which this function returns a secret password:
   {{- end -}}
 {{- end }}
 
+{{- if and $providedPasswordValue .honorProvidedValues }}
+  {{- $password = tpl ($providedPasswordValue | toString) .context }}
+{{- end }}
+
 {{- if not $password }}
   {{- if $providedPasswordValue }}
-    {{- $password = $providedPasswordValue | toString }}
+    {{- $password = tpl ($providedPasswordValue | toString) .context }}
   {{- else }}
     {{- if .context.Values.enabled }}
       {{- $subchart = $chartName }}
diff --git a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/charts/common/templates/_tplvalues.tpl b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/charts/common/templates/_tplvalues.tpl
index c84d72c803..a04f4c1eb3 100644
--- a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/charts/common/templates/_tplvalues.tpl
+++ b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/charts/common/templates/_tplvalues.tpl
@@ -36,3 +36,17 @@ Usage:
 {{- end -}}
 {{ $dst | toYaml }}
 {{- end -}}
+
+{{/*
+Merge a list of values that contains template after rendering them.
+Merge precedence is consistent with https://masterminds.github.io/sprig/dicts.html#mergeoverwrite-mustmergeoverwrite
+Usage:
+{{ include "common.tplvalues.merge-overwrite" ( dict "values" (list .Values.path.to.the.Value1 .Values.path.to.the.Value2) "context" $ ) }}
+*/}}
+{{- define "common.tplvalues.merge-overwrite" -}}
+{{- $dst := dict -}}
+{{- range .values -}}
+{{- $dst = include "common.tplvalues.render" (dict "value" . "context" $.context "scope" $.scope) | fromYaml | mergeOverwrite $dst -}}
+{{- end -}}
+{{ $dst | toYaml }}
+{{- end -}}
diff --git a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/charts/common/templates/_warnings.tpl b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/charts/common/templates/_warnings.tpl
index e4dbecde25..62c44dfcaa 100644
--- a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/charts/common/templates/_warnings.tpl
+++ b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/charts/common/templates/_warnings.tpl
@@ -13,7 +13,7 @@ Usage:
 
 {{- if and (contains "bitnami/" .repository) (not (.tag | toString | regexFind "-r\\d+$|sha256:")) }}
 WARNING: Rolling tag detected ({{ .repository }}:{{ .tag }}), please note that it is strongly recommended to avoid using rolling tags in a production environment.
-+info https://docs.vmware.com/en/VMware-Tanzu-Application-Catalog/services/tutorials/GUID-understand-rolling-tags-containers-index.html
++info https://techdocs.broadcom.com/us/en/vmware-tanzu/application-catalog/tanzu-application-catalog/services/tac-doc/apps-tutorials-understand-rolling-tags-containers-index.html
 {{- end }}
 {{- end -}}
 
diff --git a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/charts/common/templates/validations/_cassandra.tpl b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/charts/common/templates/validations/_cassandra.tpl
index 3f41ff8fc3..f8fd213bcc 100644
--- a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/charts/common/templates/validations/_cassandra.tpl
+++ b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/charts/common/templates/validations/_cassandra.tpl
@@ -4,32 +4,6 @@ SPDX-License-Identifier: APACHE-2.0
 */}}
 
 {{/* vim: set filetype=mustache: */}}
-{{/*
-Validate Cassandra required passwords are not empty.
-
-Usage:
-{{ include "common.validations.values.cassandra.passwords" (dict "secret" "secretName" "subchart" false "context" $) }}
-Params:
-  - secret - String - Required. Name of the secret where Cassandra values are stored, e.g: "cassandra-passwords-secret"
-  - subchart - Boolean - Optional. Whether Cassandra is used as subchart or not. Default: false
-*/}}
-{{- define "common.validations.values.cassandra.passwords" -}}
-  {{- $existingSecret := include "common.cassandra.values.existingSecret" . -}}
-  {{- $enabled := include "common.cassandra.values.enabled" . -}}
-  {{- $dbUserPrefix := include "common.cassandra.values.key.dbUser" . -}}
-  {{- $valueKeyPassword := printf "%s.password" $dbUserPrefix -}}
-
-  {{- if and (or (not $existingSecret) (eq $existingSecret "\"\"")) (eq $enabled "true") -}}
-    {{- $requiredPasswords := list -}}
-
-    {{- $requiredPassword := dict "valueKey" $valueKeyPassword "secret" .secret "field" "cassandra-password" -}}
-    {{- $requiredPasswords = append $requiredPasswords $requiredPassword -}}
-
-    {{- include "common.validations.values.multiple.empty" (dict "required" $requiredPasswords "context" .context) -}}
-
-  {{- end -}}
-{{- end -}}
-
 {{/*
 Auxiliary function to get the right value for existingSecret.
 
diff --git a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/charts/common/templates/validations/_mongodb.tpl b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/charts/common/templates/validations/_mongodb.tpl
index d4cd38cbb3..e678a6de82 100644
--- a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/charts/common/templates/validations/_mongodb.tpl
+++ b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/charts/common/templates/validations/_mongodb.tpl
@@ -4,52 +4,6 @@ SPDX-License-Identifier: APACHE-2.0
 */}}
 
 {{/* vim: set filetype=mustache: */}}
-{{/*
-Validate MongoDB&reg; required passwords are not empty.
-
-Usage:
-{{ include "common.validations.values.mongodb.passwords" (dict "secret" "secretName" "subchart" false "context" $) }}
-Params:
-  - secret - String - Required. Name of the secret where MongoDB&reg; values are stored, e.g: "mongodb-passwords-secret"
-  - subchart - Boolean - Optional. Whether MongoDB&reg; is used as subchart or not. Default: false
-*/}}
-{{- define "common.validations.values.mongodb.passwords" -}}
-  {{- $existingSecret := include "common.mongodb.values.auth.existingSecret" . -}}
-  {{- $enabled := include "common.mongodb.values.enabled" . -}}
-  {{- $authPrefix := include "common.mongodb.values.key.auth" . -}}
-  {{- $architecture := include "common.mongodb.values.architecture" . -}}
-  {{- $valueKeyRootPassword := printf "%s.rootPassword" $authPrefix -}}
-  {{- $valueKeyUsername := printf "%s.username" $authPrefix -}}
-  {{- $valueKeyDatabase := printf "%s.database" $authPrefix -}}
-  {{- $valueKeyPassword := printf "%s.password" $authPrefix -}}
-  {{- $valueKeyReplicaSetKey := printf "%s.replicaSetKey" $authPrefix -}}
-  {{- $valueKeyAuthEnabled := printf "%s.enabled" $authPrefix -}}
-
-  {{- $authEnabled := include "common.utils.getValueFromKey" (dict "key" $valueKeyAuthEnabled "context" .context) -}}
-
-  {{- if and (or (not $existingSecret) (eq $existingSecret "\"\"")) (eq $enabled "true") (eq $authEnabled "true") -}}
-    {{- $requiredPasswords := list -}}
-
-    {{- $requiredRootPassword := dict "valueKey" $valueKeyRootPassword "secret" .secret "field" "mongodb-root-password" -}}
-    {{- $requiredPasswords = append $requiredPasswords $requiredRootPassword -}}
-
-    {{- $valueUsername := include "common.utils.getValueFromKey" (dict "key" $valueKeyUsername "context" .context) }}
-    {{- $valueDatabase := include "common.utils.getValueFromKey" (dict "key" $valueKeyDatabase "context" .context) }}
-    {{- if and $valueUsername $valueDatabase -}}
-        {{- $requiredPassword := dict "valueKey" $valueKeyPassword "secret" .secret "field" "mongodb-password" -}}
-        {{- $requiredPasswords = append $requiredPasswords $requiredPassword -}}
-    {{- end -}}
-
-    {{- if (eq $architecture "replicaset") -}}
-        {{- $requiredReplicaSetKey := dict "valueKey" $valueKeyReplicaSetKey "secret" .secret "field" "mongodb-replica-set-key" -}}
-        {{- $requiredPasswords = append $requiredPasswords $requiredReplicaSetKey -}}
-    {{- end -}}
-
-    {{- include "common.validations.values.multiple.empty" (dict "required" $requiredPasswords "context" .context) -}}
-
-  {{- end -}}
-{{- end -}}
-
 {{/*
 Auxiliary function to get the right value for existingSecret.
 
diff --git a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/charts/common/templates/validations/_mysql.tpl b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/charts/common/templates/validations/_mysql.tpl
index 924812a931..fbb65c338e 100644
--- a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/charts/common/templates/validations/_mysql.tpl
+++ b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/charts/common/templates/validations/_mysql.tpl
@@ -4,47 +4,6 @@ SPDX-License-Identifier: APACHE-2.0
 */}}
 
 {{/* vim: set filetype=mustache: */}}
-{{/*
-Validate MySQL required passwords are not empty.
-
-Usage:
-{{ include "common.validations.values.mysql.passwords" (dict "secret" "secretName" "subchart" false "context" $) }}
-Params:
-  - secret - String - Required. Name of the secret where MySQL values are stored, e.g: "mysql-passwords-secret"
-  - subchart - Boolean - Optional. Whether MySQL is used as subchart or not. Default: false
-*/}}
-{{- define "common.validations.values.mysql.passwords" -}}
-  {{- $existingSecret := include "common.mysql.values.auth.existingSecret" . -}}
-  {{- $enabled := include "common.mysql.values.enabled" . -}}
-  {{- $architecture := include "common.mysql.values.architecture" . -}}
-  {{- $authPrefix := include "common.mysql.values.key.auth" . -}}
-  {{- $valueKeyRootPassword := printf "%s.rootPassword" $authPrefix -}}
-  {{- $valueKeyUsername := printf "%s.username" $authPrefix -}}
-  {{- $valueKeyPassword := printf "%s.password" $authPrefix -}}
-  {{- $valueKeyReplicationPassword := printf "%s.replicationPassword" $authPrefix -}}
-
-  {{- if and (or (not $existingSecret) (eq $existingSecret "\"\"")) (eq $enabled "true") -}}
-    {{- $requiredPasswords := list -}}
-
-    {{- $requiredRootPassword := dict "valueKey" $valueKeyRootPassword "secret" .secret "field" "mysql-root-password" -}}
-    {{- $requiredPasswords = append $requiredPasswords $requiredRootPassword -}}
-
-    {{- $valueUsername := include "common.utils.getValueFromKey" (dict "key" $valueKeyUsername "context" .context) }}
-    {{- if not (empty $valueUsername) -}}
-        {{- $requiredPassword := dict "valueKey" $valueKeyPassword "secret" .secret "field" "mysql-password" -}}
-        {{- $requiredPasswords = append $requiredPasswords $requiredPassword -}}
-    {{- end -}}
-
-    {{- if (eq $architecture "replication") -}}
-        {{- $requiredReplicationPassword := dict "valueKey" $valueKeyReplicationPassword "secret" .secret "field" "mysql-replication-password" -}}
-        {{- $requiredPasswords = append $requiredPasswords $requiredReplicationPassword -}}
-    {{- end -}}
-
-    {{- include "common.validations.values.multiple.empty" (dict "required" $requiredPasswords "context" .context) -}}
-
-  {{- end -}}
-{{- end -}}
-
 {{/*
 Auxiliary function to get the right value for existingSecret.
 
diff --git a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/charts/common/templates/validations/_postgresql.tpl b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/charts/common/templates/validations/_postgresql.tpl
index 0fa0b1467a..51d47162e7 100644
--- a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/charts/common/templates/validations/_postgresql.tpl
+++ b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/charts/common/templates/validations/_postgresql.tpl
@@ -4,35 +4,6 @@ SPDX-License-Identifier: APACHE-2.0
 */}}
 
 {{/* vim: set filetype=mustache: */}}
-{{/*
-Validate PostgreSQL required passwords are not empty.
-
-Usage:
-{{ include "common.validations.values.postgresql.passwords" (dict "secret" "secretName" "subchart" false "context" $) }}
-Params:
-  - secret - String - Required. Name of the secret where postgresql values are stored, e.g: "postgresql-passwords-secret"
-  - subchart - Boolean - Optional. Whether postgresql is used as subchart or not. Default: false
-*/}}
-{{- define "common.validations.values.postgresql.passwords" -}}
-  {{- $existingSecret := include "common.postgresql.values.existingSecret" . -}}
-  {{- $enabled := include "common.postgresql.values.enabled" . -}}
-  {{- $valueKeyPostgresqlPassword := include "common.postgresql.values.key.postgressPassword" . -}}
-  {{- $valueKeyPostgresqlReplicationEnabled := include "common.postgresql.values.key.replicationPassword" . -}}
-  {{- if and (or (not $existingSecret) (eq $existingSecret "\"\"")) (eq $enabled "true") -}}
-    {{- $requiredPasswords := list -}}
-    {{- $requiredPostgresqlPassword := dict "valueKey" $valueKeyPostgresqlPassword "secret" .secret "field" "postgresql-password" -}}
-    {{- $requiredPasswords = append $requiredPasswords $requiredPostgresqlPassword -}}
-
-    {{- $enabledReplication := include "common.postgresql.values.enabled.replication" . -}}
-    {{- if (eq $enabledReplication "true") -}}
-        {{- $requiredPostgresqlReplicationPassword := dict "valueKey" $valueKeyPostgresqlReplicationEnabled "secret" .secret "field" "postgresql-replication-password" -}}
-        {{- $requiredPasswords = append $requiredPasswords $requiredPostgresqlReplicationPassword -}}
-    {{- end -}}
-
-    {{- include "common.validations.values.multiple.empty" (dict "required" $requiredPasswords "context" .context) -}}
-  {{- end -}}
-{{- end -}}
-
 {{/*
 Auxiliary function to decide whether evaluate global values.
 
diff --git a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/charts/common/templates/validations/_redis.tpl b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/charts/common/templates/validations/_redis.tpl
index f4778256d1..9fedfef9d1 100644
--- a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/charts/common/templates/validations/_redis.tpl
+++ b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/charts/common/templates/validations/_redis.tpl
@@ -5,39 +5,6 @@ SPDX-License-Identifier: APACHE-2.0
 
 
 {{/* vim: set filetype=mustache: */}}
-{{/*
-Validate Redis&reg; required passwords are not empty.
-
-Usage:
-{{ include "common.validations.values.redis.passwords" (dict "secret" "secretName" "subchart" false "context" $) }}
-Params:
-  - secret - String - Required. Name of the secret where redis values are stored, e.g: "redis-passwords-secret"
-  - subchart - Boolean - Optional. Whether redis is used as subchart or not. Default: false
-*/}}
-{{- define "common.validations.values.redis.passwords" -}}
-  {{- $enabled := include "common.redis.values.enabled" . -}}
-  {{- $valueKeyPrefix := include "common.redis.values.keys.prefix" . -}}
-  {{- $standarizedVersion := include "common.redis.values.standarized.version" . }}
-
-  {{- $existingSecret := ternary (printf "%s%s" $valueKeyPrefix "auth.existingSecret") (printf "%s%s" $valueKeyPrefix "existingSecret") (eq $standarizedVersion "true") }}
-  {{- $existingSecretValue := include "common.utils.getValueFromKey" (dict "key" $existingSecret "context" .context) }}
-
-  {{- $valueKeyRedisPassword := ternary (printf "%s%s" $valueKeyPrefix "auth.password") (printf "%s%s" $valueKeyPrefix "password") (eq $standarizedVersion "true") }}
-  {{- $valueKeyRedisUseAuth := ternary (printf "%s%s" $valueKeyPrefix "auth.enabled") (printf "%s%s" $valueKeyPrefix "usePassword") (eq $standarizedVersion "true") }}
-
-  {{- if and (or (not $existingSecret) (eq $existingSecret "\"\"")) (eq $enabled "true") -}}
-    {{- $requiredPasswords := list -}}
-
-    {{- $useAuth := include "common.utils.getValueFromKey" (dict "key" $valueKeyRedisUseAuth "context" .context) -}}
-    {{- if eq $useAuth "true" -}}
-      {{- $requiredRedisPassword := dict "valueKey" $valueKeyRedisPassword "secret" .secret "field" "redis-password" -}}
-      {{- $requiredPasswords = append $requiredPasswords $requiredRedisPassword -}}
-    {{- end -}}
-
-    {{- include "common.validations.values.multiple.empty" (dict "required" $requiredPasswords "context" .context) -}}
-  {{- end -}}
-{{- end -}}
-
 {{/*
 Auxiliary function to get the right value for enabled redis.
 
diff --git a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/files/crds/verticalpodautoscalercheckpoints.yaml b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/files/crds/verticalpodautoscalercheckpoints.yaml
index 89db4b15f7..928f5b3e8b 100644
--- a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/files/crds/verticalpodautoscalercheckpoints.yaml
+++ b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/files/crds/verticalpodautoscalercheckpoints.yaml
@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
 metadata:
   name: verticalpodautoscalercheckpoints.autoscaling.k8s.io
   labels:
-    {{- include "vertical-pod-autoscaler.labels" . | nindent 4 }}
+    {{- include "vertical-pod-autoscaler.commonLabels" . | nindent 4 }}
     {{- if .Values.commonLabels }}
     {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
     {{- end }}
diff --git a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/files/crds/verticalpodautoscalers.yaml b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/files/crds/verticalpodautoscalers.yaml
index bb858aa463..7ac15559cf 100644
--- a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/files/crds/verticalpodautoscalers.yaml
+++ b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/files/crds/verticalpodautoscalers.yaml
@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
 metadata:
   name: verticalpodautoscalers.autoscaling.k8s.io
   labels:
-    {{- include "vertical-pod-autoscaler.labels" . | nindent 4 }}
+    {{- include "vertical-pod-autoscaler.commonLabels" . | nindent 4 }}
     {{- if .Values.commonLabels }}
     {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
     {{- end }}
@@ -244,6 +244,7 @@ spec:
                     - "Off"
                     - Initial
                     - Recreate
+                    - InPlaceOrRecreate
                     - Auto
                     type: string
                 type: object
diff --git a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/_helpers.tpl b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/_helpers.tpl
index dd0850fe66..5805835739 100644
--- a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/_helpers.tpl
+++ b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/_helpers.tpl
@@ -34,9 +34,9 @@ Create chart name and version as used by the chart label.
 {{/*
 Common labels
 */}}
-{{- define "vertical-pod-autoscaler.labels" -}}
+{{- define "vertical-pod-autoscaler.commonLabels" -}}
 helm.sh/chart: {{ include "vertical-pod-autoscaler.chart" . }}
-{{ include "vertical-pod-autoscaler.selectorLabels" . }}
+{{ include "vertical-pod-autoscaler.commonSelectorLabels" . }}
 {{- if .Chart.AppVersion }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
@@ -44,9 +44,9 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{- end -}}
 
 {{/*
-Selector labels
+Common selector labels
 */}}
-{{- define "vertical-pod-autoscaler.selectorLabels" -}}
+{{- define "vertical-pod-autoscaler.commonSelectorLabels" -}}
 app.kubernetes.io/name: {{ include "vertical-pod-autoscaler.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end -}}
diff --git a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/admission-controller/_helpers.tpl b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/admission-controller/_helpers.tpl
index 3ffa7b6127..86421da1a1 100644
--- a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/admission-controller/_helpers.tpl
+++ b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/admission-controller/_helpers.tpl
@@ -21,10 +21,10 @@ app.kubernetes.io/component: admission-controller
 {{- end -}}
 
 {{/*
-Common labels
+Labels
 */}}
 {{- define "vertical-pod-autoscaler.admissionController.labels" -}}
-{{ include "vertical-pod-autoscaler.labels" . }}
+{{ include "vertical-pod-autoscaler.commonLabels" . }}
 {{ include "vertical-pod-autoscaler.admissionController.componentLabels" . }}
 {{- end -}}
 
@@ -32,7 +32,7 @@ Common labels
 Selector labels
 */}}
 {{- define "vertical-pod-autoscaler.admissionController.selectorLabels" -}}
-{{ include "vertical-pod-autoscaler.selectorLabels" . }}
+{{ include "vertical-pod-autoscaler.commonSelectorLabels" . }}
 {{ include "vertical-pod-autoscaler.admissionController.componentLabels" . }}
 {{- end -}}
 
diff --git a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/admission-controller/certificate.yaml b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/admission-controller/certificate.yaml
new file mode 100644
index 0000000000..ad99d6403f
--- /dev/null
+++ b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/admission-controller/certificate.yaml
@@ -0,0 +1,139 @@
+{{- /*
+  cert-manager-managed TLS for the VPA admission-controller webhook.
+
+  Replaces the legacy `tls-secret.yaml` genCA/genSignedCert Secret. That
+  approach re-generates a fresh CA on every `helm template` invocation and
+  therefore on every Flux HelmRelease reconcile — the reconcile-driven cert
+  churn cascades into a fresh Secret content, a new `checksum/tls-secret`
+  podAnnotation, a new ReplicaSet, and a rolling admission-controller pod
+  every retry. Under load (e.g. the E2E sandbox first-install phase where
+  cert-manager / CDI / LINSTOR races repeatedly re-fire the VPA
+  HelmRelease), the churn produces 10+ ReplicaSets in minutes and the
+  admission-controller pod livelocks in startup: it waits on its own
+  election lease which its previous replicaset is still holding, hits
+  livenessProbe timeout (periodSeconds=10, failureThreshold=3, no
+  initialDelaySeconds), and CrashLoopBackOffs — blocking the whole
+  cozystack-platform HR reconcile.
+
+  cert-manager only rotates when the certificate is close to expiring
+  (renewBefore), so the reconcile-driven churn stops.
+
+  The webhook itself (`vpa-webhook-config` MutatingWebhookConfiguration)
+  is registered by the admission-controller pod itself via
+  `--register-webhook=true`, so no `cert-manager.io/inject-ca-from`
+  annotation is needed on webhooks; each pod restart picks up the current
+  CA from the mounted Secret and re-registers.
+
+  Gated on `admissionController.tls.certManagerEnabled`, defaulting to
+  `true` in this chart. Existing users who supply an external cert via
+  `admissionController.tls.existingSecret` continue to bypass both this
+  and the legacy Secret template unchanged.
+*/}}
+{{- if and .Values.admissionController.enabled .Values.admissionController.tls.certManagerEnabled (not .Values.admissionController.tls.existingSecret) }}
+apiVersion: cert-manager.io/v1
+kind: Issuer
+metadata:
+  name: {{ include "vertical-pod-autoscaler.admissionController.fullname" . }}-tls-issuer
+  namespace: {{ include "common.names.namespace" . | quote }}
+  labels:
+    {{- include "vertical-pod-autoscaler.admissionController.labels" . | nindent 4 }}
+    {{- if .Values.commonLabels }}
+    {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
+    {{- end }}
+  {{- if .Values.commonAnnotations }}
+  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+  {{- end }}
+spec:
+  selfSigned: {}
+---
+apiVersion: cert-manager.io/v1
+kind: Certificate
+metadata:
+  name: {{ include "vertical-pod-autoscaler.admissionController.fullname" . }}-tls
+  namespace: {{ include "common.names.namespace" . | quote }}
+  labels:
+    {{- include "vertical-pod-autoscaler.admissionController.labels" . | nindent 4 }}
+    {{- if .Values.commonLabels }}
+    {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
+    {{- end }}
+  {{- if .Values.commonAnnotations }}
+  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+  {{- end }}
+spec:
+  {{- /*
+    secretName MUST match the volume mount name in
+    admission-controller/deployment.yaml, which is driven by
+    `vertical-pod-autoscaler.admissionController.tls.secretName`. In the
+    default path this resolves to `<release>-admission-controller-tls`
+    — the exact same name the legacy genCA Secret used. On upgrade from
+    a pre-cert-manager chart version the legacy Opaque Secret disappears
+    from the release manifest, Helm garbage-collects it, and cert-manager
+    immediately writes a fresh Secret of the same name via this
+    Certificate but with `type: kubernetes.io/tls`. In-place adoption is
+    NOT possible — `Secret.type` is immutable — so the delete/create
+    pass is the correct path.
+
+    The Deployment rolls in the SAME upgrade because the pod-template
+    itself carries a structural change: the pre-migration chart did not
+    render a `checksum/tls-cert` annotation at all, and the new chart
+    does. That new-annotation-present is what Helm sees as a
+    podTemplate diff and rolls the ReplicaSet. Note the annotation's
+    VALUE at first-upgrade render time is the sha of the LEGACY Opaque
+    Secret content (lookup fires before Helm deletes it), not the sha
+    of the yet-to-be-written cert-manager Secret; the value only
+    catches up on the next Helm action. The rollout is still correct
+    on first upgrade because the pod-template structural change alone
+    forces the ReplicaSet turnover, and the fresh pod re-registers
+    `vpa-webhook-config` with the new caBundle after cert-manager has
+    written the new Secret.
+
+    The seconds-long window between "old Opaque Secret deleted" and
+    "new tls Secret written" is benign because the
+    MutatingWebhookConfiguration ships with `failurePolicy: Ignore` —
+    webhook calls that hit the mismatch window are skipped, not
+    rejected.
+  */}}
+  secretName: {{ include "vertical-pod-autoscaler.admissionController.tls.secretName" . }}
+  {{- /*
+    Match the legacy genSignedCert shape exactly:
+      $cn := printf "%s.%s.svc" "vpa-webhook" (include "common.names.namespace" .)
+      $cert := genSignedCert $cn nil (list $cn) 365 $ca
+    That is: CN and single DNS SAN both `vpa-webhook.<ns>.svc`, validity
+    365 days. Keeping identical spec means an in-place upgrade rotates
+    the cert content once (issuer changes from ephemeral in-chart CA to
+    cert-manager selfSigned Issuer) and thereafter stays stable.
+  */}}
+  commonName: {{ printf "vpa-webhook.%s.svc" (include "common.names.namespace" .) }}
+  dnsNames:
+    - {{ printf "vpa-webhook.%s.svc" (include "common.names.namespace" .) }}
+  duration: 8760h
+  {{- /*
+    renewBefore is intentionally 90 days rather than the more common 15
+    days. cert-manager rotates the Secret at (duration - renewBefore), but
+    the running pod holds the old certificate in memory and only picks up
+    the new one when the ReplicaSet rolls. The ReplicaSet only rolls when a
+    Helm action fires: helm-controller does not re-render on reconcile
+    ticks after the release converges, only on install/upgrade/rollback.
+    With webhook `failurePolicy: Ignore`, an expired cert silently drops
+    admission traffic instead of failing loudly, so operators only notice
+    when VPA silently stops mutating pods.
+
+    Wider `renewBefore` shifts the "must have a Helm action land after
+    rotation" window from 15 days to ~90 days, decoupling admission-webhook
+    liveness from release cadence on clusters that go months without a
+    chart bump. This does not eliminate the rotate-and-restart requirement
+    — it just makes it survive realistic release schedules.
+  */}}
+  renewBefore: 2160h
+  issuerRef:
+    name: {{ include "vertical-pod-autoscaler.admissionController.fullname" . }}-tls-issuer
+    kind: Issuer
+{{- /*
+  Intentionally NO secretTemplate. Copying the chart's shared labels onto
+  the generated Secret (which includes `app.kubernetes.io/managed-by: Helm`
+  from the labels include) would mislead operators — Helm does not own
+  this Secret, cert-manager does. Let cert-manager own the metadata it
+  writes (`cert-manager.io/*`, `controller.cert-manager.io/*`) and leave
+  it at that.
+*/}}
+{{- end }}
diff --git a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/admission-controller/clusterrole.yaml b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/admission-controller/clusterrole.yaml
index 7ce7822c86..a127e1ea71 100644
--- a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/admission-controller/clusterrole.yaml
+++ b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/admission-controller/clusterrole.yaml
@@ -69,6 +69,7 @@ rules:
       - delete
       - get
       - list
+      - patch
   - apiGroups:
       - "poc.autoscaling.k8s.io"
     resources:
diff --git a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/admission-controller/clusterrolebinding.yaml b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/admission-controller/clusterrolebinding.yaml
index c0e012ea79..fe5bef3319 100644
--- a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/admission-controller/clusterrolebinding.yaml
+++ b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/admission-controller/clusterrolebinding.yaml
@@ -18,5 +18,5 @@ roleRef:
 subjects:
   - kind: ServiceAccount
     name: {{ include "vertical-pod-autoscaler.admissionController.serviceAccountName" . }}
-    namespace: {{ .Release.Namespace | quote }}
+    namespace: {{ include "common.names.namespace" . | quote }}
 {{- end }}
diff --git a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/admission-controller/deployment.yaml b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/admission-controller/deployment.yaml
index f9a6bdc051..b0671960c3 100644
--- a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/admission-controller/deployment.yaml
+++ b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/admission-controller/deployment.yaml
@@ -3,6 +3,7 @@ apiVersion: {{ include "common.capabilities.deployment.apiVersion" . }}
 kind: Deployment
 metadata:
   name: {{ include "vertical-pod-autoscaler.admissionController.fullname" . }}
+  namespace: {{ include "common.names.namespace" . | quote }}
   labels:
     {{- include "vertical-pod-autoscaler.admissionController.labels" . | nindent 4 }}
     {{- if .Values.commonLabels }}
@@ -14,6 +15,7 @@ metadata:
   {{- end }}
 spec:
   replicas: {{ .Values.admissionController.replicaCount }}
+  revisionHistoryLimit: {{ .Values.admissionController.revisionHistoryLimit }}
   selector:
     matchLabels:
       {{- include "vertical-pod-autoscaler.admissionController.selectorLabels" . | nindent 6 }}
@@ -28,9 +30,103 @@ spec:
         {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 8 }}
         {{- end }}
       annotations:
-        {{- if not .Values.admissionController.tls.existingSecret }}
+        {{- /*
+          checksum/tls-secret trips pod rotation whenever tls-secret.yaml
+          renders a different sha. Under the legacy path that Secret's
+          content depends on `genCA`/`genSignedCert` which produce a
+          fresh CA on every render — so this annotation was the amplifier
+          that turned a single-chart-race into a rolling-ReplicaSet
+          storm. When cert-manager owns the TLS Secret it's stable
+          across renders (only rotates near `renewBefore`), and the
+          `checksum` would either be misleading (secret content isn't
+          driven by this template anymore) or trigger a needless rollout
+          on every unrelated chart change. Gate on the same flag as the
+          legacy template so exactly one code path emits it.
+        */}}
+        {{- if and (not .Values.admissionController.tls.existingSecret) (not .Values.admissionController.tls.certManagerEnabled) }}
         checksum/tls-secret: {{ include (print $.Template.BasePath "/admission-controller/tls-secret.yaml") . | sha256sum }}
         {{- end }}
+        {{- /*
+          Under cert-manager we need pod rotation ONLY when the Secret
+          content actually changes. `checksum/tls-cert` hashes the runtime
+          Secret's `tls.crt` (via `lookup`), so:
+
+            * fresh install:       Secret does not exist yet at first
+                                   render; the annotation is absent, pod
+                                   comes up on whichever Secret cert-
+                                   manager writes next.
+            * cert-manager adopt:  cert-manager rewrites the Secret once
+                                   (issuer changed on upgrade) → sha
+                                   flips → pod restarts ONCE and picks up
+                                   the new CA + cert.
+            * steady state:        Secret content stable → sha stable
+                                   → no rotation.
+            * renewal (~275d):     cert-manager rotates Secret → sha
+                                   flips → pod restarts ONCE **only if a
+                                   Helm action fires**; see the trade-off
+                                   below.
+
+          `lookup` runs ONLY on Helm actions (install / upgrade /
+          rollback) — helm-controller does not re-render a deployed
+          release on interval ticks, so `lookup` does not fire on every
+          reconcile. Concrete trade-off:
+
+            - Any Helm action (chart bump, values change, dependency
+              re-apply, manual `flux reconcile hr`) re-templates the
+              chart, `lookup` sees the current Secret content, the
+              annotation is re-computed, and — if the Secret has been
+              rotated since the last render — Kubernetes rolls the pod
+              on the resulting podTemplate change.
+            - Between Helm actions the pod holds the certificate it
+              loaded at startup. With `duration: 8760h` (365d) and
+              `renewBefore: 2160h` (90d) in `certificate.yaml`,
+              cert-manager rotates the Secret at day ~275; if NO Helm
+              action fires in the following ~90 days, the pod keeps
+              serving with an expired in-memory cert past day 365
+              (--reload-cert alone would make this worse — the mounted
+              cert would rotate while the pod's self-registered
+              MutatingWebhookConfiguration caBundle went stale). At
+              cozystack's release cadence a Helm action realistically
+              lands well within that 90-day post-rotation window, so
+              we accept this. If ever it stops holding, a small
+              post-renewal Job that annotates the Deployment
+              podTemplate would close the gap without re-introducing
+              the ReplicaSet-churn amplifier.
+
+          `lookup` returns nil during `helm template --dry-run=client`
+          (offline CI renders / this chart's helm-unittest suite) — that
+          is intentional; the annotation is only meaningful against a
+          live cluster where cert-manager has actually written the
+          Secret. Tests assert the annotation is ABSENT under offline
+          render, exactly for that reason.
+
+          Crucially, this replaces the earlier `kubectl rollout restart`
+          post-upgrade hook. That hook itself was the amplifier of the
+          previous iteration: every Flux reconcile stamped a fresh
+          `kubectl.kubernetes.io/restartedAt` timestamp, which mutated
+          the Deployment podTemplate, which spawned a new ReplicaSet —
+          the same ReplicaSet-churn pattern in a different disguise.
+          Runtime-content-based checksum only mutates when the runtime
+          content actually mutates, so the loop cannot form.
+
+          Hashing only `tls.crt` is sufficient because the Issuer is
+          `selfSigned` (see `certificate.yaml`): the leaf is its own CA,
+          so `ca.crt == tls.crt` and every rotation re-issues `tls.crt`
+          regardless of key-rotation policy. If a future change ever
+          switches the Issuer to a CA-backed one (external CA, ACME,
+          Vault, etc.), the CA can rotate independently of the leaf and
+          this checksum MUST be extended to also cover `ca.crt` —
+          otherwise a CA-only rotation would leave the pod serving with
+          a stale caBundle in its self-registered
+          MutatingWebhookConfiguration until the next full leaf
+          rotation.
+        */}}
+        {{- if and .Values.admissionController.tls.certManagerEnabled (not .Values.admissionController.tls.existingSecret) }}
+        {{- $secret := lookup "v1" "Secret" (include "common.names.namespace" .) (include "vertical-pod-autoscaler.admissionController.tls.secretName" .) }}
+        {{- if and $secret $secret.data (index $secret.data "tls.crt") }}
+        checksum/tls-cert: {{ index $secret.data "tls.crt" | sha256sum }}
+        {{- end }}
+        {{- end }}
         {{- if .Values.admissionController.podAnnotations }}
         {{- include "common.tplvalues.render" ( dict "value" .Values.admissionController.podAnnotations "context" $ ) | nindent 8 }}
         {{- end }}
@@ -76,7 +172,7 @@ spec:
             {{- end }}
           env:
             - name: NAMESPACE
-              value: {{ .Release.Namespace }}
+              value: {{ include "common.names.namespace" . | quote }}
             {{- if .Values.admissionController.extraEnvVars }}
             {{- include "common.tplvalues.render" (dict "value" .Values.admissionController.extraEnvVars "context" $) | nindent 12 }}
             {{- end }}
diff --git a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/admission-controller/metrics-service.yaml b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/admission-controller/metrics-service.yaml
index 97897f527a..229f053774 100644
--- a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/admission-controller/metrics-service.yaml
+++ b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/admission-controller/metrics-service.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "vertical-pod-autoscaler.admissionController.metrics.fullname" . }}
+  namespace: {{ include "common.names.namespace" . | quote }}
   labels:
     {{- include "vertical-pod-autoscaler.admissionController.labels" . | nindent 4 }}
     {{- if .Values.commonLabels }}
diff --git a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/admission-controller/pdb.yaml b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/admission-controller/pdb.yaml
index 4c4813281d..6b68edfb3c 100644
--- a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/admission-controller/pdb.yaml
+++ b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/admission-controller/pdb.yaml
@@ -4,6 +4,7 @@ apiVersion: {{ include "common.capabilities.policy.apiVersion" . }}
 kind: PodDisruptionBudget
 metadata:
   name: {{ include "vertical-pod-autoscaler.admissionController.fullname" . }}
+  namespace: {{ include "common.names.namespace" . | quote }}
   labels:
     {{- include "vertical-pod-autoscaler.admissionController.labels" . | nindent 4 }}
     {{- if .Values.commonLabels }}
diff --git a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/admission-controller/service.yaml b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/admission-controller/service.yaml
index 042cd12cc9..e4f5827529 100644
--- a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/admission-controller/service.yaml
+++ b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/admission-controller/service.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: vpa-webhook
+  namespace: {{ include "common.names.namespace" . | quote }}
   labels:
     {{- include "vertical-pod-autoscaler.admissionController.labels" . | nindent 4 }}
     {{- if .Values.commonLabels }}
diff --git a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/admission-controller/serviceaccount.yaml b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/admission-controller/serviceaccount.yaml
index 1955635384..f0744fc98f 100644
--- a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/admission-controller/serviceaccount.yaml
+++ b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/admission-controller/serviceaccount.yaml
@@ -4,6 +4,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ include "vertical-pod-autoscaler.admissionController.serviceAccountName" . }}
+  namespace: {{ include "common.names.namespace" . | quote }}
   labels:
     {{- include "vertical-pod-autoscaler.admissionController.labels" . | nindent 4 }}
     {{- if .Values.commonLabels }}
diff --git a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/admission-controller/servicemonitor.yaml b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/admission-controller/servicemonitor.yaml
index 085461c434..02bf997c9d 100644
--- a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/admission-controller/servicemonitor.yaml
+++ b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/admission-controller/servicemonitor.yaml
@@ -4,7 +4,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   name: {{ include "vertical-pod-autoscaler.admissionController.fullname" . }}
-  namespace: {{ default .Release.Namespace .Values.admissionController.metrics.serviceMonitor.namespace | quote }}
+  namespace: {{ default (include "common.names.namespace" .) .Values.admissionController.metrics.serviceMonitor.namespace | quote }}
   labels:
     {{- include "vertical-pod-autoscaler.admissionController.labels" . | nindent 4 }}
     {{- if .Values.admissionController.metrics.serviceMonitor.labels }}
@@ -25,13 +25,13 @@ spec:
     - port: http-metrics
       {{- if .Values.admissionController.metrics.serviceMonitor.interval }}
       interval: {{ .Values.admissionController.metrics.serviceMonitor.interval }}
-      {{- end}}
+      {{- end }}
       {{- if .Values.admissionController.metrics.serviceMonitor.scrapeTimeout }}
       scrapeTimeout: {{ .Values.admissionController.metrics.serviceMonitor.scrapeTimeout }}
-      {{- end}}
+      {{- end }}
       {{- if .Values.admissionController.metrics.serviceMonitor.honorLabels }}
       honorLabels: {{ .Values.admissionController.metrics.serviceMonitor.honorLabels }}
-      {{- end}}
+      {{- end }}
       {{- if .Values.admissionController.metrics.serviceMonitor.metricRelabelings }}
       metricRelabelings: {{ toYaml .Values.admissionController.metrics.serviceMonitor.metricRelabelings | nindent 8 }}
       {{- end }}
@@ -41,7 +41,7 @@ spec:
       path: /metrics
   namespaceSelector:
     matchNames:
-      - {{ .Release.Namespace | quote }}
+      - {{ include "common.names.namespace" . | quote }}
   selector:
     matchLabels:
       {{- include "vertical-pod-autoscaler.admissionController.selectorLabels" . | nindent 6 }}
diff --git a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/admission-controller/tls-secret.yaml b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/admission-controller/tls-secret.yaml
index 690f747850..0bab86ed95 100644
--- a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/admission-controller/tls-secret.yaml
+++ b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/admission-controller/tls-secret.yaml
@@ -1,12 +1,24 @@
+{{- /*
+  Legacy in-chart genCA/genSignedCert path — kept for the escape hatch
+  `admissionController.tls.certManagerEnabled=false`. Superseded by
+  `certificate.yaml` (cert-manager Certificate + Issuer). See the
+  header comment in that file for the reconcile-driven cert churn this
+  path used to cause. The check on `.certManagerEnabled` intentionally
+  wraps the ENTIRE template rather than being folded into the earlier
+  `if`s so a single Helm render only emits ONE Secret owner (either
+  cert-manager via Certificate, or this chart directly).
+*/ -}}
 {{- if .Values.admissionController.enabled }}
 {{- if not .Values.admissionController.tls.existingSecret }}
+{{- if not .Values.admissionController.tls.certManagerEnabled }}
 {{- $ca := genCA (include "vertical-pod-autoscaler.admissionController.fullname" .) 365 }}
-{{- $cn := printf "%s.%s.svc" "vpa-webhook" .Release.Namespace }}
+{{- $cn := printf "%s.%s.svc" "vpa-webhook" (include "common.names.namespace" .) }}
 {{- $cert := genSignedCert $cn nil (list $cn) 365 $ca }}
 apiVersion: v1
 kind: Secret
 metadata:
   name: {{ include "vertical-pod-autoscaler.admissionController.tls.secretName" . }}
+  namespace: {{ include "common.names.namespace" . | quote }}
   labels:
     {{- include "vertical-pod-autoscaler.admissionController.labels" . | nindent 4 }}
     {{- if .Values.commonLabels }}
@@ -22,3 +34,4 @@ data:
   tls.key: {{ default $cert.Key .Values.admissionController.tls.key | b64enc | quote }}
 {{- end }}
 {{- end }}
+{{- end }}
diff --git a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/crds/_helpers.tpl b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/crds/_helpers.tpl
index c4419a51c8..e30838abec 100644
--- a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/crds/_helpers.tpl
+++ b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/crds/_helpers.tpl
@@ -14,10 +14,10 @@ app.kubernetes.io/component: crds
 {{- end -}}
 
 {{/*
-Common labels
+Labels
 */}}
 {{- define "vertical-pod-autoscaler.crds.labels" -}}
-{{ include "vertical-pod-autoscaler.labels" . }}
+{{ include "vertical-pod-autoscaler.commonLabels" . }}
 {{ include "vertical-pod-autoscaler.crds.componentLabels" . }}
 {{- end -}}
 
@@ -25,6 +25,6 @@ Common labels
 Selector labels
 */}}
 {{- define "vertical-pod-autoscaler.crds.selectorLabels" -}}
-{{ include "vertical-pod-autoscaler.selectorLabels" . }}
+{{ include "vertical-pod-autoscaler.commonSelectorLabels" . }}
 {{ include "vertical-pod-autoscaler.crds.componentLabels" . }}
 {{- end -}}
diff --git a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/crds/clusterrolebinding.yaml b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/crds/clusterrolebinding.yaml
index 16e80c6d5d..870494c9a5 100644
--- a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/crds/clusterrolebinding.yaml
+++ b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/crds/clusterrolebinding.yaml
@@ -21,5 +21,5 @@ roleRef:
 subjects:
   - kind: ServiceAccount
     name: {{ include "vertical-pod-autoscaler.crds.fullname" . }}
-    namespace: {{ .Release.Namespace | quote }}
+    namespace: {{ include "common.names.namespace" . | quote }}
 {{- end }}
diff --git a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/crds/configmap.yaml b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/crds/configmap.yaml
index 388ebd2e0b..26195db7f0 100644
--- a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/crds/configmap.yaml
+++ b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/crds/configmap.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ include "vertical-pod-autoscaler.crds.fullname" . }}
+  namespace: {{ include "common.names.namespace" . | quote }}
   labels:
     {{- include "vertical-pod-autoscaler.crds.labels" . | nindent 4 }}
     {{- if .Values.commonLabels }}
@@ -15,7 +16,7 @@ metadata:
     {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
     {{- end }}
 data:
-  {{- range $path, $_ := .Files.Glob  "files/crds/*" }}
+  {{- range $path, $_ := .Files.Glob  "files/crds/*.yaml" }}
   {{ base $path }}: |
     {{- tpl ($.Files.Get $path) $ | nindent 4 }}
   {{- end }}
diff --git a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/crds/job.yaml b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/crds/job.yaml
index ed83404a20..7a1a388105 100644
--- a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/crds/job.yaml
+++ b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/crds/job.yaml
@@ -1,8 +1,9 @@
 {{- if .Values.crds.enabled }}
-apiVersion: batch/v1
+apiVersion: {{ include "common.capabilities.job.apiVersion" . }}
 kind: Job
 metadata:
   name: {{ include "vertical-pod-autoscaler.crds.fullname" . }}
+  namespace: {{ include "common.names.namespace" . | quote }}
   labels:
     {{- include "vertical-pod-autoscaler.crds.labels" . | nindent 4 }}
     {{- if .Values.commonLabels }}
@@ -42,7 +43,7 @@ spec:
           imagePullPolicy: {{ .Values.crds.image.pullPolicy }}
           args:
             - apply
-            {{- range $path, $_ := .Files.Glob  "files/crds/*" }}
+            {{- range $path, $_ := .Files.Glob  "files/crds/*.yaml" }}
             - --filename=/config/{{ base $path }}
             {{- end }}
           resources:
diff --git a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/crds/serviceaccount.yaml b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/crds/serviceaccount.yaml
index c5de938903..70290533a2 100644
--- a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/crds/serviceaccount.yaml
+++ b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/crds/serviceaccount.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ include "vertical-pod-autoscaler.crds.fullname" . }}
+  namespace: {{ include "common.names.namespace" . | quote }}
   labels:
     {{- include "vertical-pod-autoscaler.crds.labels" . | nindent 4 }}
     {{- if .Values.commonLabels }}
diff --git a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/recommender/_helpers.tpl b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/recommender/_helpers.tpl
index 9a0a0e6096..16c7339b4a 100644
--- a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/recommender/_helpers.tpl
+++ b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/recommender/_helpers.tpl
@@ -21,10 +21,10 @@ app.kubernetes.io/component: recommender
 {{- end -}}
 
 {{/*
-Common labels
+Labels
 */}}
 {{- define "vertical-pod-autoscaler.recommender.labels" -}}
-{{ include "vertical-pod-autoscaler.labels" . }}
+{{ include "vertical-pod-autoscaler.commonLabels" . }}
 {{ include "vertical-pod-autoscaler.recommender.componentLabels" . }}
 {{- end -}}
 
@@ -32,7 +32,7 @@ Common labels
 Selector labels
 */}}
 {{- define "vertical-pod-autoscaler.recommender.selectorLabels" -}}
-{{ include "vertical-pod-autoscaler.selectorLabels" . }}
+{{ include "vertical-pod-autoscaler.commonSelectorLabels" . }}
 {{ include "vertical-pod-autoscaler.recommender.componentLabels" . }}
 {{- end -}}
 
diff --git a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/recommender/clusterrole.yaml b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/recommender/clusterrole.yaml
index 85b1a7eac5..208d1dbb68 100644
--- a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/recommender/clusterrole.yaml
+++ b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/recommender/clusterrole.yaml
@@ -32,13 +32,16 @@ rules:
       - watch
   - apiGroups:
       - ""
+      - events.k8s.io
     resources:
       - events
     verbs:
+      - create
       - get
       - list
       - watch
-      - create
+      - patch
+      - update
   - apiGroups:
       - "poc.autoscaling.k8s.io"
     resources:
diff --git a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/recommender/clusterrolebinding.yaml b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/recommender/clusterrolebinding.yaml
index 594a06c790..de8411609e 100644
--- a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/recommender/clusterrolebinding.yaml
+++ b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/recommender/clusterrolebinding.yaml
@@ -17,4 +17,4 @@ roleRef:
 subjects:
   - kind: ServiceAccount
     name: {{ include "vertical-pod-autoscaler.recommender.serviceAccountName" . }}
-    namespace: {{ .Release.Namespace | quote }}
+    namespace: {{ include "common.names.namespace" . | quote }}
diff --git a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/recommender/deployment.yaml b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/recommender/deployment.yaml
index 4aabfbd198..ee41908abd 100644
--- a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/recommender/deployment.yaml
+++ b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/recommender/deployment.yaml
@@ -2,6 +2,7 @@ apiVersion: {{ include "common.capabilities.deployment.apiVersion" . }}
 kind: Deployment
 metadata:
   name: {{ include "vertical-pod-autoscaler.recommender.fullname" . }}
+  namespace: {{ include "common.names.namespace" . | quote }}
   labels:
     {{- include "vertical-pod-autoscaler.recommender.labels" . | nindent 4 }}
     {{- if .Values.commonLabels }}
@@ -13,6 +14,7 @@ metadata:
   {{- end }}
 spec:
   replicas: {{ .Values.recommender.replicaCount }}
+  revisionHistoryLimit: {{ .Values.recommender.revisionHistoryLimit }}
   selector:
     matchLabels:
       {{- include "vertical-pod-autoscaler.recommender.selectorLabels" . | nindent 6 }}
diff --git a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/recommender/metrics-service.yaml b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/recommender/metrics-service.yaml
index 3023d51f61..47309c1c4a 100644
--- a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/recommender/metrics-service.yaml
+++ b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/recommender/metrics-service.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "vertical-pod-autoscaler.recommender.metrics.fullname" . }}
+  namespace: {{ include "common.names.namespace" . | quote }}
   labels:
     {{- include "vertical-pod-autoscaler.recommender.labels" . | nindent 4 }}
     {{- if .Values.commonLabels }}
diff --git a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/recommender/pdb.yaml b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/recommender/pdb.yaml
index aa0238fa25..19207fae13 100644
--- a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/recommender/pdb.yaml
+++ b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/recommender/pdb.yaml
@@ -3,6 +3,7 @@ apiVersion: {{ include "common.capabilities.policy.apiVersion" . }}
 kind: PodDisruptionBudget
 metadata:
   name: {{ include "vertical-pod-autoscaler.recommender.fullname" . }}
+  namespace: {{ include "common.names.namespace" . | quote }}
   labels:
     {{- include "vertical-pod-autoscaler.recommender.labels" . | nindent 4 }}
     {{- if .Values.commonLabels }}
diff --git a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/recommender/serviceaccount.yaml b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/recommender/serviceaccount.yaml
index 0fb40c7481..1896f86191 100644
--- a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/recommender/serviceaccount.yaml
+++ b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/recommender/serviceaccount.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ include "vertical-pod-autoscaler.recommender.serviceAccountName" . }}
+  namespace: {{ include "common.names.namespace" . | quote }}
   labels:
     {{- include "vertical-pod-autoscaler.recommender.labels" . | nindent 4 }}
     {{- if .Values.commonLabels }}
diff --git a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/recommender/servicemonitor.yaml b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/recommender/servicemonitor.yaml
index df70a78091..a17ecc35b2 100644
--- a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/recommender/servicemonitor.yaml
+++ b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/recommender/servicemonitor.yaml
@@ -3,7 +3,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   name: {{ include "vertical-pod-autoscaler.recommender.fullname" . }}
-  namespace: {{ default .Release.Namespace .Values.recommender.metrics.serviceMonitor.namespace | quote }}
+  namespace: {{ default (include "common.names.namespace" .) .Values.recommender.metrics.serviceMonitor.namespace | quote }}
   labels:
     {{- include "vertical-pod-autoscaler.recommender.labels" . | nindent 4 }}
     {{- if .Values.recommender.metrics.serviceMonitor.labels }}
@@ -24,13 +24,13 @@ spec:
     - port: http-metrics
       {{- if .Values.recommender.metrics.serviceMonitor.interval }}
       interval: {{ .Values.recommender.metrics.serviceMonitor.interval }}
-      {{- end}}
+      {{- end }}
       {{- if .Values.recommender.metrics.serviceMonitor.scrapeTimeout }}
       scrapeTimeout: {{ .Values.recommender.metrics.serviceMonitor.scrapeTimeout }}
-      {{- end}}
+      {{- end }}
       {{- if .Values.recommender.metrics.serviceMonitor.honorLabels }}
       honorLabels: {{ .Values.recommender.metrics.serviceMonitor.honorLabels }}
-      {{- end}}
+      {{- end }}
       {{- if .Values.recommender.metrics.serviceMonitor.metricRelabelings }}
       metricRelabelings: {{ toYaml .Values.recommender.metrics.serviceMonitor.metricRelabelings | nindent 8 }}
       {{- end }}
@@ -40,7 +40,7 @@ spec:
       path: /metrics
   namespaceSelector:
     matchNames:
-      - {{ .Release.Namespace | quote }}
+      - {{ include "common.names.namespace" . | quote }}
   selector:
     matchLabels:
       {{- include "vertical-pod-autoscaler.recommender.selectorLabels" . | nindent 6 }}
diff --git a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/tests/_helpers.tpl b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/tests/_helpers.tpl
index 600b606033..f9b8b503ed 100644
--- a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/tests/_helpers.tpl
+++ b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/tests/_helpers.tpl
@@ -14,9 +14,9 @@ app.kubernetes.io/component: tests
 {{- end -}}
 
 {{/*
-Common labels
+Labels
 */}}
 {{- define "vertical-pod-autoscaler.tests.labels" -}}
-{{ include "vertical-pod-autoscaler.labels" . }}
+{{ include "vertical-pod-autoscaler.commonLabels" . }}
 {{ include "vertical-pod-autoscaler.tests.componentLabels" . }}
 {{- end -}}
diff --git a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/tests/configmap.yaml b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/tests/configmap.yaml
index d3e345bf3a..fc7481c9bb 100644
--- a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/tests/configmap.yaml
+++ b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/tests/configmap.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ include "vertical-pod-autoscaler.tests.fullname" . }}
+  namespace: {{ include "common.names.namespace" . | quote }}
   labels:
     {{- include "vertical-pod-autoscaler.tests.labels" . | nindent 4 }}
     {{- if .Values.commonLabels }}
@@ -18,7 +19,7 @@ data:
 
 
     def test_admission_controller_service_connection():
-        url = "https://vpa-webhook.{{ .Release.Namespace }}.svc:{{ .Values.admissionController.service.ports.https }}/"
+        url = "https://vpa-webhook.{{ include "common.names.namespace" . }}.svc:{{ .Values.admissionController.service.ports.https }}/"
         verify = "/admission-controller-tls-secret/ca.crt"
 
         response = requests.get(url, verify=verify)
diff --git a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/tests/pod.yaml b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/tests/pod.yaml
index 268a101269..d7e7871f78 100644
--- a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/tests/pod.yaml
+++ b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/tests/pod.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: Pod
 metadata:
   name: {{ include "vertical-pod-autoscaler.tests.fullname" . }}
+  namespace: {{ include "common.names.namespace" . | quote }}
   labels:
     {{- include "vertical-pod-autoscaler.tests.labels" . | nindent 4 }}
     {{- if .Values.commonLabels }}
diff --git a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/updater/_helpers.tpl b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/updater/_helpers.tpl
index 1d6a2b5ffd..76e453112c 100644
--- a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/updater/_helpers.tpl
+++ b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/updater/_helpers.tpl
@@ -21,10 +21,10 @@ app.kubernetes.io/component: updater
 {{- end -}}
 
 {{/*
-Common labels
+Labels
 */}}
 {{- define "vertical-pod-autoscaler.updater.labels" -}}
-{{ include "vertical-pod-autoscaler.labels" . }}
+{{ include "vertical-pod-autoscaler.commonLabels" . }}
 {{ include "vertical-pod-autoscaler.updater.componentLabels" . }}
 {{- end -}}
 
@@ -32,7 +32,7 @@ Common labels
 Selector labels
 */}}
 {{- define "vertical-pod-autoscaler.updater.selectorLabels" -}}
-{{ include "vertical-pod-autoscaler.selectorLabels" . }}
+{{ include "vertical-pod-autoscaler.commonSelectorLabels" . }}
 {{ include "vertical-pod-autoscaler.updater.componentLabels" . }}
 {{- end -}}
 
diff --git a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/updater/clusterrole.yaml b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/updater/clusterrole.yaml
index b1fe0fd636..aa72e3290c 100644
--- a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/updater/clusterrole.yaml
+++ b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/updater/clusterrole.yaml
@@ -25,13 +25,16 @@ rules:
       - watch
   - apiGroups:
       - ""
+      - events.k8s.io
     resources:
       - events
     verbs:
+      - create
       - get
       - list
       - watch
-      - create
+      - patch
+      - update
   - apiGroups:
       - "poc.autoscaling.k8s.io"
     resources:
@@ -124,4 +127,12 @@ rules:
       - get
       - watch
       - update
+  # system:vpa-updater-in-place
+  - apiGroups:
+      - ""
+    resources:
+      - pods/resize
+      - pods
+    verbs:
+      - patch
 {{- end }}
diff --git a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/updater/clusterrolebinding.yaml b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/updater/clusterrolebinding.yaml
index c0d3f13b61..1042038ecb 100644
--- a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/updater/clusterrolebinding.yaml
+++ b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/updater/clusterrolebinding.yaml
@@ -18,5 +18,5 @@ roleRef:
 subjects:
   - kind: ServiceAccount
     name: {{ include "vertical-pod-autoscaler.updater.serviceAccountName" . }}
-    namespace: {{ .Release.Namespace | quote }}
+    namespace: {{ include "common.names.namespace" . | quote }}
 {{- end }}
diff --git a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/updater/deployment.yaml b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/updater/deployment.yaml
index 1515c396fe..2d157c83e7 100644
--- a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/updater/deployment.yaml
+++ b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/updater/deployment.yaml
@@ -3,6 +3,7 @@ apiVersion: {{ include "common.capabilities.deployment.apiVersion" . }}
 kind: Deployment
 metadata:
   name: {{ include "vertical-pod-autoscaler.updater.fullname" . }}
+  namespace: {{ include "common.names.namespace" . | quote }}
   labels:
     {{- include "vertical-pod-autoscaler.updater.labels" . | nindent 4 }}
     {{- if .Values.commonLabels }}
@@ -14,6 +15,7 @@ metadata:
   {{- end }}
 spec:
   replicas: {{ .Values.updater.replicaCount }}
+  revisionHistoryLimit: {{ .Values.updater.revisionHistoryLimit }}
   selector:
     matchLabels:
       {{- include "vertical-pod-autoscaler.updater.selectorLabels" . | nindent 6 }}
@@ -67,7 +69,7 @@ spec:
             {{- end }}
           env:
             - name: NAMESPACE
-              value: {{ .Release.Namespace }}
+              value: {{ include "common.names.namespace" . | quote }}
             {{- if .Values.updater.extraEnvVars }}
             {{- include "common.tplvalues.render" (dict "value" .Values.updater.extraEnvVars "context" $) | nindent 12 }}
             {{- end }}
diff --git a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/updater/metrics-service.yaml b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/updater/metrics-service.yaml
index e8555f938c..64f270550c 100644
--- a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/updater/metrics-service.yaml
+++ b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/updater/metrics-service.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "vertical-pod-autoscaler.updater.metrics.fullname" . }}
+  namespace: {{ include "common.names.namespace" . | quote }}
   labels:
     {{- include "vertical-pod-autoscaler.updater.labels" . | nindent 4 }}
     {{- if .Values.commonLabels }}
diff --git a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/updater/pdb.yaml b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/updater/pdb.yaml
index 723af070c5..04e0d59c8e 100644
--- a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/updater/pdb.yaml
+++ b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/updater/pdb.yaml
@@ -4,6 +4,7 @@ apiVersion: {{ include "common.capabilities.policy.apiVersion" . }}
 kind: PodDisruptionBudget
 metadata:
   name: {{ include "vertical-pod-autoscaler.updater.fullname" . }}
+  namespace: {{ include "common.names.namespace" . | quote }}
   labels:
     {{- include "vertical-pod-autoscaler.updater.labels" . | nindent 4 }}
     {{- if .Values.commonLabels }}
diff --git a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/updater/serviceaccount.yaml b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/updater/serviceaccount.yaml
index 050c9439b0..1e531e6a55 100644
--- a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/updater/serviceaccount.yaml
+++ b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/updater/serviceaccount.yaml
@@ -4,6 +4,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ include "vertical-pod-autoscaler.updater.serviceAccountName" . }}
+  namespace: {{ include "common.names.namespace" . | quote }}
   labels:
     {{- include "vertical-pod-autoscaler.updater.labels" . | nindent 4 }}
     {{- if .Values.commonLabels }}
diff --git a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/updater/servicemonitor.yaml b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/updater/servicemonitor.yaml
index 306a94bfd1..864fb5fd04 100644
--- a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/updater/servicemonitor.yaml
+++ b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/templates/updater/servicemonitor.yaml
@@ -4,7 +4,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   name: {{ include "vertical-pod-autoscaler.updater.fullname" . }}
-  namespace: {{ default .Release.Namespace .Values.updater.metrics.serviceMonitor.namespace | quote }}
+  namespace: {{ default (include "common.names.namespace" .) .Values.updater.metrics.serviceMonitor.namespace | quote }}
   labels:
     {{- include "vertical-pod-autoscaler.updater.labels" . | nindent 4 }}
     {{- if .Values.updater.metrics.serviceMonitor.labels }}
@@ -25,13 +25,13 @@ spec:
     - port: http-metrics
       {{- if .Values.updater.metrics.serviceMonitor.interval }}
       interval: {{ .Values.updater.metrics.serviceMonitor.interval }}
-      {{- end}}
+      {{- end }}
       {{- if .Values.updater.metrics.serviceMonitor.scrapeTimeout }}
       scrapeTimeout: {{ .Values.updater.metrics.serviceMonitor.scrapeTimeout }}
-      {{- end}}
+      {{- end }}
       {{- if .Values.updater.metrics.serviceMonitor.honorLabels }}
       honorLabels: {{ .Values.updater.metrics.serviceMonitor.honorLabels }}
-      {{- end}}
+      {{- end }}
       {{- if .Values.updater.metrics.serviceMonitor.metricRelabelings }}
       metricRelabelings: {{ toYaml .Values.updater.metrics.serviceMonitor.metricRelabelings | nindent 8 }}
       {{- end }}
@@ -41,7 +41,7 @@ spec:
       path: /metrics
   namespaceSelector:
     matchNames:
-      - {{ .Release.Namespace | quote }}
+      - {{ include "common.names.namespace" . | quote }}
   selector:
     matchLabels:
       {{- include "vertical-pod-autoscaler.updater.selectorLabels" . | nindent 6 }}
diff --git a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/values.yaml b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/values.yaml
index e029dd9f7e..3b731ceac1 100644
--- a/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/values.yaml
+++ b/packages/system/vertical-pod-autoscaler/charts/vertical-pod-autoscaler/values.yaml
@@ -22,6 +22,9 @@ nameOverride: ""
 ## @param fullnameOverride Fully override `vertical-pod-autoscaler.fullname` template with a string
 fullnameOverride: ""
 
+## @param namespaceOverride Fully override `common.names.namespace` template with a string
+namespaceOverride: ""
+
 ## @param commonAnnotations Annotations to add to all deployed objects
 commonAnnotations: {}
 
@@ -34,12 +37,15 @@ extraDeploy: []
 ## @section Admission controller parameters
 
 admissionController:
-## @param admissionController.enabled Enable the component
+  ## @param admissionController.enabled Enable the component
   enabled: true
 
   ## @param admissionController.replicaCount Number of replicas
   replicaCount: 1
 
+  ## @param admissionController.revisionHistoryLimit Number of old history to retain to allow rollback
+  revisionHistoryLimit: 10
+
   image:
     ## @param admissionController.image.registry Image registry
     registry: registry.k8s.io
@@ -48,7 +54,7 @@ admissionController:
     repository: autoscaling/vpa-admission-controller
 
     ## @param admissionController.image.tag Image tag
-    tag: 1.3.0
+    tag: 1.5.1
 
     ## @param admissionController.image.digest Image digest
     digest: ""
@@ -93,14 +99,10 @@ admissionController:
   podLabels: {}
 
   ## @extra admissionController.podSecurityContext Pod security context
-  ## @param admissionController.podSecurityContext.runAsNonRoot Whether the container must run as a non-root user
-  ## @param admissionController.podSecurityContext.runAsUser The UID to run the entrypoint of the container process
-  ## @param admissionController.podSecurityContext.runAsGroup The GID to run the entrypoint of the container process
+  ## @param admissionController.podSecurityContext.seccompProfile.type Set pod's Security Context seccomp profile
   podSecurityContext:
-    # fsGroup: 2000
-    runAsNonRoot: true
-    runAsUser: 65534
-    runAsGroup: 65534
+    seccompProfile:
+      type: RuntimeDefault
 
   ## @param admissionController.hostNetwork Use the host network
   hostNetwork: false
@@ -115,14 +117,22 @@ admissionController:
   ## @param admissionController.topologySpreadConstraints Topology Spread Constraints for pod assignment
   topologySpreadConstraints: []
 
-  ## @param admissionController.securityContext Container security context
-  securityContext: {}
-    # capabilities:
-    #   drop:
-    #   - ALL
-    # readOnlyRootFilesystem: true
-    # runAsNonRoot: true
-    # runAsUser: 1000
+  ## @extra admissionController.securityContext Container security context
+  ## @param admissionController.securityContext.allowPrivilegeEscalation Set container's Security Context allowPrivilegeEscalation
+  ## @param admissionController.securityContext.capabilities.drop List of capabilities to be dropped
+  ## @param admissionController.securityContext.readOnlyRootFilesystem Set container's Security Context readOnlyRootFilesystem
+  ## @param admissionController.securityContext.runAsNonRoot Whether the container must run as a non-root user
+  ## @param admissionController.securityContext.runAsUser The UID to run the entrypoint of the container process
+  ## @param admissionController.securityContext.runAsGroup The GID to run the entrypoint of the container process
+  securityContext:
+    allowPrivilegeEscalation: false
+    capabilities:
+      drop:
+        - ALL
+    readOnlyRootFilesystem: true
+    runAsNonRoot: true
+    runAsUser: 65534
+    runAsGroup: 65534
 
   containerPorts:
     ## @param admissionController.containerPorts.https Container port for HTTPS
@@ -217,12 +227,12 @@ admissionController:
 
   ## @param admissionController.resources CPU/Memory resource requests/limits
   resources: {}
-    # limits:
-    #   cpu: 200m
-    #   memory: 512Mi
     # requests:
     #   cpu: 50m
     #   memory: 256Mi
+    # limits:
+    #   cpu: 200m
+    #   memory: 512Mi
 
   ## @param admissionController.nodeSelector Node labels for pod assignment
   nodeSelector: {}
@@ -236,8 +246,8 @@ admissionController:
   ## @extra admissionController.extraArgs [object] Additional container arguments
   ## @param admissionController.extraArgs.v Number for the log level verbosity
   extraArgs:
-    # kube-api-burst: 10
-    # kube-api-qps: 5
+    # kube-api-burst: 100
+    # kube-api-qps: 50
     v: 2
     # vpa-object-namespace: ""
     # webhook-timeout-seconds: 30
@@ -313,6 +323,9 @@ admissionController:
       relabelings: []
 
   tls:
+    ## @param admissionController.tls.certManagerEnabled Provision the admission-controller webhook TLS via cert-manager Issuer + Certificate. When true, `caCert` / `cert` / `key` below are ignored, no in-chart `genCA` Secret is rendered, and the `checksum/tls-secret` podAnnotation that used to rotate the ReplicaSet on every reconcile is dropped. Requires cert-manager installed in the cluster. See `certificate.yaml` header for rationale. Note: switching this back to `false` after a cluster has migrated to cert-manager is effectively one-way — cert-manager writes the Secret with `type: kubernetes.io/tls`, and `Secret.type` is immutable, so the legacy Opaque Secret template cannot overwrite it in place. To roll back the operator must first `kubectl delete` the cert-manager-owned Secret.
+    certManagerEnabled: true
+
     ## @param admissionController.tls.caCert TLS CA certificate (Generated using the `genCA` function if not set)
     caCert: ""
 
@@ -328,9 +341,12 @@ admissionController:
 ## @section Recommender parameters
 
 recommender:
-## @param recommender.replicaCount Number of replicas
+  ## @param recommender.replicaCount Number of replicas
   replicaCount: 1
 
+  ## @param recommender.revisionHistoryLimit Number of old history to retain to allow rollback
+  revisionHistoryLimit: 10
+
   image:
     ## @param recommender.image.registry Image registry
     registry: registry.k8s.io
@@ -339,7 +355,7 @@ recommender:
     repository: autoscaling/vpa-recommender
 
     ## @param recommender.image.tag Image tag
-    tag: 1.3.0
+    tag: 1.5.1
 
     ## @param recommender.image.digest Image digest
     digest: ""
@@ -384,14 +400,10 @@ recommender:
   podLabels: {}
 
   ## @extra recommender.podSecurityContext Pod security context
-  ## @param recommender.podSecurityContext.runAsNonRoot Whether the container must run as a non-root user
-  ## @param recommender.podSecurityContext.runAsUser The UID to run the entrypoint of the container process
-  ## @param recommender.podSecurityContext.runAsGroup The GID to run the entrypoint of the container process
+  ## @param recommender.podSecurityContext.seccompProfile.type Set pod's Security Context seccomp profile
   podSecurityContext:
-    # fsGroup: 2000
-    runAsNonRoot: true
-    runAsUser: 65534
-    runAsGroup: 65534
+    seccompProfile:
+      type: RuntimeDefault
 
   ## @param recommender.priorityClassName Priority class name
   priorityClassName:
@@ -403,14 +415,22 @@ recommender:
   ## @param recommender.topologySpreadConstraints Topology Spread Constraints for pod assignment
   topologySpreadConstraints: []
 
-  ## @param recommender.securityContext Container security context
-  securityContext: {}
-    # capabilities:
-    #   drop:
-    #   - ALL
-    # readOnlyRootFilesystem: true
-    # runAsNonRoot: true
-    # runAsUser: 1000
+  ## @extra recommender.securityContext Container security context
+  ## @param recommender.securityContext.allowPrivilegeEscalation Set container's Security Context allowPrivilegeEscalation
+  ## @param recommender.securityContext.capabilities.drop List of capabilities to be dropped
+  ## @param recommender.securityContext.readOnlyRootFilesystem Set container's Security Context readOnlyRootFilesystem
+  ## @param recommender.securityContext.runAsNonRoot Whether the container must run as a non-root user
+  ## @param recommender.securityContext.runAsUser The UID to run the entrypoint of the container process
+  ## @param recommender.securityContext.runAsGroup The GID to run the entrypoint of the container process
+  securityContext:
+    allowPrivilegeEscalation: false
+    capabilities:
+      drop:
+        - ALL
+    readOnlyRootFilesystem: true
+    runAsNonRoot: true
+    runAsUser: 65534
+    runAsGroup: 65534
 
   containerPorts:
     ## @param recommender.containerPorts.metrics Container port for Metrics
@@ -475,12 +495,12 @@ recommender:
 
   ## @param recommender.resources CPU/Memory resource requests/limits
   resources: {}
-    # limits:
-    #   cpu: 200m
-    #   memory: 1024Mi
     # requests:
     #   cpu: 50m
     #   memory: 512Mi
+    # limits:
+    #   cpu: 200m
+    #   memory: 1024Mi
 
   ## @param recommender.nodeSelector Node labels for pod assignment
   nodeSelector: {}
@@ -506,8 +526,8 @@ recommender:
     # history-length: 8d
     # history-resolution: 1h
     # ignored-vpa-object-namespaces: ""
-    # kube-api-burst: 10
-    # kube-api-qps: 5
+    # kube-api-burst: 100
+    # kube-api-qps: 50
     # leader-elect: false
     # leader-elect-lease-duration: 15s
     # leader-elect-renew-deadline: 10s
@@ -520,7 +540,6 @@ recommender:
     # memory-histogram-decay-half-life: 24h0m0s
     # memory-saver: false
     # metric-for-pod-labels: up{job="kubernetes-pods"}
-    # min-checkpoints: 10
     # oom-bump-up-ratio: 1.2
     # oom-min-bump-up-bytes: 104857600
     # password: ""
@@ -542,6 +561,7 @@ recommender:
     # storage: checkpoint
     # target-cpu-percentile: 0.9
     # target-memory-percentile: 0.9
+    # update-worker-count: 10
     # use-external-metrics: false
     # username: ""
     v: 2
@@ -620,12 +640,15 @@ recommender:
 ## @section Updater parameters
 
 updater:
-## @param updater.enabled Enable the component
+  ## @param updater.enabled Enable the component
   enabled: true
 
   ## @param updater.replicaCount Number of replicas
   replicaCount: 1
 
+  ## @param updater.revisionHistoryLimit Number of old history to retain to allow rollback
+  revisionHistoryLimit: 10
+
   image:
     ## @param updater.image.registry Image registry
     registry: registry.k8s.io
@@ -634,7 +657,7 @@ updater:
     repository: autoscaling/vpa-updater
 
     ## @param updater.image.tag Image tag
-    tag: 1.3.0
+    tag: 1.5.1
 
     ## @param updater.image.digest Image digest
     digest: ""
@@ -679,14 +702,10 @@ updater:
   podLabels: {}
 
   ## @extra updater.podSecurityContext Pod security context
-  ## @param updater.podSecurityContext.runAsNonRoot Whether the container must run as a non-root user
-  ## @param updater.podSecurityContext.runAsUser The UID to run the entrypoint of the container process
-  ## @param updater.podSecurityContext.runAsGroup The GID to run the entrypoint of the container process
+  ## @param updater.podSecurityContext.seccompProfile.type Set pod's Security Context seccomp profile
   podSecurityContext:
-    # fsGroup: 2000
-    runAsNonRoot: true
-    runAsUser: 65534
-    runAsGroup: 65534
+    seccompProfile:
+      type: RuntimeDefault
 
   ## @param updater.priorityClassName Priority class name
   priorityClassName:
@@ -698,14 +717,22 @@ updater:
   ## @param updater.topologySpreadConstraints Topology Spread Constraints for pod assignment
   topologySpreadConstraints: []
 
-  ## @param updater.securityContext Container security context
-  securityContext: {}
-    # capabilities:
-    #   drop:
-    #   - ALL
-    # readOnlyRootFilesystem: true
-    # runAsNonRoot: true
-    # runAsUser: 1000
+  ## @extra updater.securityContext Container security context
+  ## @param updater.securityContext.allowPrivilegeEscalation Set container's Security Context allowPrivilegeEscalation
+  ## @param updater.securityContext.capabilities.drop List of capabilities to be dropped
+  ## @param updater.securityContext.readOnlyRootFilesystem Set container's Security Context readOnlyRootFilesystem
+  ## @param updater.securityContext.runAsNonRoot Whether the container must run as a non-root user
+  ## @param updater.securityContext.runAsUser The UID to run the entrypoint of the container process
+  ## @param updater.securityContext.runAsGroup The GID to run the entrypoint of the container process
+  securityContext:
+    allowPrivilegeEscalation: false
+    capabilities:
+      drop:
+        - ALL
+    readOnlyRootFilesystem: true
+    runAsNonRoot: true
+    runAsUser: 65534
+    runAsGroup: 65534
 
   containerPorts:
     ## @param updater.containerPorts.metrics Container port for Metrics
@@ -770,12 +797,12 @@ updater:
 
   ## @param updater.resources CPU/Memory resource requests/limits
   resources: {}
-    # limits:
-    #   cpu: 200m
-    #   memory: 1024Mi
     # requests:
     #   cpu: 50m
     #   memory: 512Mi
+    # limits:
+    #   cpu: 200m
+    #   memory: 1024Mi
 
   ## @param updater.nodeSelector Node labels for pod assignment
   nodeSelector: {}
@@ -795,8 +822,8 @@ updater:
     # eviction-tolerance: 0.5
     # ignored-vpa-object-namespaces: ""
     # in-recommendation-bounds-eviction-lifetime-threshold: 12h0m0s
-    # kube-api-burst: 10
-    # kube-api-qps: 5
+    # kube-api-burst: 100
+    # kube-api-qps: 50
     # leader-elect: false
     # leader-elect-lease-duration: 15s
     # leader-elect-renew-deadline: 10s
@@ -892,7 +919,7 @@ crds:
     registry: docker.io
 
     ## @param crds.image.repository Image repository
-    repository: bitnami/kubectl
+    repository: bitnamilegacy/kubectl
 
     ## @param crds.image.tag Image tag
     tag: 1.29.3
@@ -910,30 +937,34 @@ crds:
   podLabels: {}
 
   ## @extra crds.podSecurityContext Pod security context
-  ## @param crds.podSecurityContext.runAsNonRoot Whether the container must run as a non-root user
-  ## @param crds.podSecurityContext.runAsUser The UID to run the entrypoint of the container process
-  ## @param crds.podSecurityContext.runAsGroup The GID to run the entrypoint of the container process
+  ## @param crds.podSecurityContext.seccompProfile.type Set pod's Security Context seccomp profile
   podSecurityContext:
-    # fsGroup: 2000
+    seccompProfile:
+      type: RuntimeDefault
+
+  ## @extra crds.securityContext Container security context
+  ## @param crds.securityContext.allowPrivilegeEscalation Set container's Security Context allowPrivilegeEscalation
+  ## @param crds.securityContext.capabilities.drop List of capabilities to be dropped
+  ## @param crds.securityContext.readOnlyRootFilesystem Set container's Security Context readOnlyRootFilesystem
+  ## @param crds.securityContext.runAsNonRoot Whether the container must run as a non-root user
+  ## @param crds.securityContext.runAsUser The UID to run the entrypoint of the container process
+  ## @param crds.securityContext.runAsGroup The GID to run the entrypoint of the container process
+  securityContext:
+    allowPrivilegeEscalation: false
+    capabilities:
+      drop:
+        - ALL
+    readOnlyRootFilesystem: true
     runAsNonRoot: true
-    runAsUser: 1001
-    runAsGroup: 1001
-
-  ## @param crds.securityContext Container security context
-  securityContext: {}
-    # capabilities:
-    #   drop:
-    #   - ALL
-    # readOnlyRootFilesystem: true
-    # runAsNonRoot: true
-    # runAsUser: 1000
+    runAsUser: 65534
+    runAsGroup: 65534
 
   ## @param crds.resources CPU/Memory resource requests/limits
   resources: {}
-    # limits:
+    # requests:
     #   cpu: 100m
     #   memory: 128Mi
-    # requests:
+    # limits:
     #   cpu: 100m
     #   memory: 128Mi
 
@@ -957,7 +988,7 @@ tests:
     repository: cowboysysop/pytest
 
     ## @param tests.image.tag Image tag
-    tag: 1.0.41
+    tag: 1.2.0
 
     ## @param tests.image.digest Image digest
     digest: ""
diff --git a/packages/system/vertical-pod-autoscaler/patches/cert-manager-admission-tls.diff b/packages/system/vertical-pod-autoscaler/patches/cert-manager-admission-tls.diff
new file mode 100644
index 0000000000..5e22f97833
--- /dev/null
+++ b/packages/system/vertical-pod-autoscaler/patches/cert-manager-admission-tls.diff
@@ -0,0 +1,294 @@
+diff --git a/charts/vertical-pod-autoscaler/templates/admission-controller/certificate.yaml b/charts/vertical-pod-autoscaler/templates/admission-controller/certificate.yaml
+new file mode 100644
+index 0000000..ad99d64
+--- /dev/null
++++ b/charts/vertical-pod-autoscaler/templates/admission-controller/certificate.yaml
+@@ -0,0 +1,139 @@
++{{- /*
++  cert-manager-managed TLS for the VPA admission-controller webhook.
++
++  Replaces the legacy `tls-secret.yaml` genCA/genSignedCert Secret. That
++  approach re-generates a fresh CA on every `helm template` invocation and
++  therefore on every Flux HelmRelease reconcile — the reconcile-driven cert
++  churn cascades into a fresh Secret content, a new `checksum/tls-secret`
++  podAnnotation, a new ReplicaSet, and a rolling admission-controller pod
++  every retry. Under load (e.g. the E2E sandbox first-install phase where
++  cert-manager / CDI / LINSTOR races repeatedly re-fire the VPA
++  HelmRelease), the churn produces 10+ ReplicaSets in minutes and the
++  admission-controller pod livelocks in startup: it waits on its own
++  election lease which its previous replicaset is still holding, hits
++  livenessProbe timeout (periodSeconds=10, failureThreshold=3, no
++  initialDelaySeconds), and CrashLoopBackOffs — blocking the whole
++  cozystack-platform HR reconcile.
++
++  cert-manager only rotates when the certificate is close to expiring
++  (renewBefore), so the reconcile-driven churn stops.
++
++  The webhook itself (`vpa-webhook-config` MutatingWebhookConfiguration)
++  is registered by the admission-controller pod itself via
++  `--register-webhook=true`, so no `cert-manager.io/inject-ca-from`
++  annotation is needed on webhooks; each pod restart picks up the current
++  CA from the mounted Secret and re-registers.
++
++  Gated on `admissionController.tls.certManagerEnabled`, defaulting to
++  `true` in this chart. Existing users who supply an external cert via
++  `admissionController.tls.existingSecret` continue to bypass both this
++  and the legacy Secret template unchanged.
++*/}}
++{{- if and .Values.admissionController.enabled .Values.admissionController.tls.certManagerEnabled (not .Values.admissionController.tls.existingSecret) }}
++apiVersion: cert-manager.io/v1
++kind: Issuer
++metadata:
++  name: {{ include "vertical-pod-autoscaler.admissionController.fullname" . }}-tls-issuer
++  namespace: {{ include "common.names.namespace" . | quote }}
++  labels:
++    {{- include "vertical-pod-autoscaler.admissionController.labels" . | nindent 4 }}
++    {{- if .Values.commonLabels }}
++    {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
++    {{- end }}
++  {{- if .Values.commonAnnotations }}
++  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
++  {{- end }}
++spec:
++  selfSigned: {}
++---
++apiVersion: cert-manager.io/v1
++kind: Certificate
++metadata:
++  name: {{ include "vertical-pod-autoscaler.admissionController.fullname" . }}-tls
++  namespace: {{ include "common.names.namespace" . | quote }}
++  labels:
++    {{- include "vertical-pod-autoscaler.admissionController.labels" . | nindent 4 }}
++    {{- if .Values.commonLabels }}
++    {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
++    {{- end }}
++  {{- if .Values.commonAnnotations }}
++  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
++  {{- end }}
++spec:
++  {{- /*
++    secretName MUST match the volume mount name in
++    admission-controller/deployment.yaml, which is driven by
++    `vertical-pod-autoscaler.admissionController.tls.secretName`. In the
++    default path this resolves to `<release>-admission-controller-tls`
++    — the exact same name the legacy genCA Secret used. On upgrade from
++    a pre-cert-manager chart version the legacy Opaque Secret disappears
++    from the release manifest, Helm garbage-collects it, and cert-manager
++    immediately writes a fresh Secret of the same name via this
++    Certificate but with `type: kubernetes.io/tls`. In-place adoption is
++    NOT possible — `Secret.type` is immutable — so the delete/create
++    pass is the correct path.
++
++    The Deployment rolls in the SAME upgrade because the pod-template
++    itself carries a structural change: the pre-migration chart did not
++    render a `checksum/tls-cert` annotation at all, and the new chart
++    does. That new-annotation-present is what Helm sees as a
++    podTemplate diff and rolls the ReplicaSet. Note the annotation's
++    VALUE at first-upgrade render time is the sha of the LEGACY Opaque
++    Secret content (lookup fires before Helm deletes it), not the sha
++    of the yet-to-be-written cert-manager Secret; the value only
++    catches up on the next Helm action. The rollout is still correct
++    on first upgrade because the pod-template structural change alone
++    forces the ReplicaSet turnover, and the fresh pod re-registers
++    `vpa-webhook-config` with the new caBundle after cert-manager has
++    written the new Secret.
++
++    The seconds-long window between "old Opaque Secret deleted" and
++    "new tls Secret written" is benign because the
++    MutatingWebhookConfiguration ships with `failurePolicy: Ignore` —
++    webhook calls that hit the mismatch window are skipped, not
++    rejected.
++  */}}
++  secretName: {{ include "vertical-pod-autoscaler.admissionController.tls.secretName" . }}
++  {{- /*
++    Match the legacy genSignedCert shape exactly:
++      $cn := printf "%s.%s.svc" "vpa-webhook" (include "common.names.namespace" .)
++      $cert := genSignedCert $cn nil (list $cn) 365 $ca
++    That is: CN and single DNS SAN both `vpa-webhook.<ns>.svc`, validity
++    365 days. Keeping identical spec means an in-place upgrade rotates
++    the cert content once (issuer changes from ephemeral in-chart CA to
++    cert-manager selfSigned Issuer) and thereafter stays stable.
++  */}}
++  commonName: {{ printf "vpa-webhook.%s.svc" (include "common.names.namespace" .) }}
++  dnsNames:
++    - {{ printf "vpa-webhook.%s.svc" (include "common.names.namespace" .) }}
++  duration: 8760h
++  {{- /*
++    renewBefore is intentionally 90 days rather than the more common 15
++    days. cert-manager rotates the Secret at (duration - renewBefore), but
++    the running pod holds the old certificate in memory and only picks up
++    the new one when the ReplicaSet rolls. The ReplicaSet only rolls when a
++    Helm action fires: helm-controller does not re-render on reconcile
++    ticks after the release converges, only on install/upgrade/rollback.
++    With webhook `failurePolicy: Ignore`, an expired cert silently drops
++    admission traffic instead of failing loudly, so operators only notice
++    when VPA silently stops mutating pods.
++
++    Wider `renewBefore` shifts the "must have a Helm action land after
++    rotation" window from 15 days to ~90 days, decoupling admission-webhook
++    liveness from release cadence on clusters that go months without a
++    chart bump. This does not eliminate the rotate-and-restart requirement
++    — it just makes it survive realistic release schedules.
++  */}}
++  renewBefore: 2160h
++  issuerRef:
++    name: {{ include "vertical-pod-autoscaler.admissionController.fullname" . }}-tls-issuer
++    kind: Issuer
++{{- /*
++  Intentionally NO secretTemplate. Copying the chart's shared labels onto
++  the generated Secret (which includes `app.kubernetes.io/managed-by: Helm`
++  from the labels include) would mislead operators — Helm does not own
++  this Secret, cert-manager does. Let cert-manager own the metadata it
++  writes (`cert-manager.io/*`, `controller.cert-manager.io/*`) and leave
++  it at that.
++*/}}
++{{- end }}
+diff --git a/charts/vertical-pod-autoscaler/templates/admission-controller/deployment.yaml b/charts/vertical-pod-autoscaler/templates/admission-controller/deployment.yaml
+index b7a9237..b067196 100644
+--- a/charts/vertical-pod-autoscaler/templates/admission-controller/deployment.yaml
++++ b/charts/vertical-pod-autoscaler/templates/admission-controller/deployment.yaml
+@@ -30,9 +30,103 @@ spec:
+         {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 8 }}
+         {{- end }}
+       annotations:
+-        {{- if not .Values.admissionController.tls.existingSecret }}
++        {{- /*
++          checksum/tls-secret trips pod rotation whenever tls-secret.yaml
++          renders a different sha. Under the legacy path that Secret's
++          content depends on `genCA`/`genSignedCert` which produce a
++          fresh CA on every render — so this annotation was the amplifier
++          that turned a single-chart-race into a rolling-ReplicaSet
++          storm. When cert-manager owns the TLS Secret it's stable
++          across renders (only rotates near `renewBefore`), and the
++          `checksum` would either be misleading (secret content isn't
++          driven by this template anymore) or trigger a needless rollout
++          on every unrelated chart change. Gate on the same flag as the
++          legacy template so exactly one code path emits it.
++        */}}
++        {{- if and (not .Values.admissionController.tls.existingSecret) (not .Values.admissionController.tls.certManagerEnabled) }}
+         checksum/tls-secret: {{ include (print $.Template.BasePath "/admission-controller/tls-secret.yaml") . | sha256sum }}
+         {{- end }}
++        {{- /*
++          Under cert-manager we need pod rotation ONLY when the Secret
++          content actually changes. `checksum/tls-cert` hashes the runtime
++          Secret's `tls.crt` (via `lookup`), so:
++
++            * fresh install:       Secret does not exist yet at first
++                                   render; the annotation is absent, pod
++                                   comes up on whichever Secret cert-
++                                   manager writes next.
++            * cert-manager adopt:  cert-manager rewrites the Secret once
++                                   (issuer changed on upgrade) → sha
++                                   flips → pod restarts ONCE and picks up
++                                   the new CA + cert.
++            * steady state:        Secret content stable → sha stable
++                                   → no rotation.
++            * renewal (~275d):     cert-manager rotates Secret → sha
++                                   flips → pod restarts ONCE **only if a
++                                   Helm action fires**; see the trade-off
++                                   below.
++
++          `lookup` runs ONLY on Helm actions (install / upgrade /
++          rollback) — helm-controller does not re-render a deployed
++          release on interval ticks, so `lookup` does not fire on every
++          reconcile. Concrete trade-off:
++
++            - Any Helm action (chart bump, values change, dependency
++              re-apply, manual `flux reconcile hr`) re-templates the
++              chart, `lookup` sees the current Secret content, the
++              annotation is re-computed, and — if the Secret has been
++              rotated since the last render — Kubernetes rolls the pod
++              on the resulting podTemplate change.
++            - Between Helm actions the pod holds the certificate it
++              loaded at startup. With `duration: 8760h` (365d) and
++              `renewBefore: 2160h` (90d) in `certificate.yaml`,
++              cert-manager rotates the Secret at day ~275; if NO Helm
++              action fires in the following ~90 days, the pod keeps
++              serving with an expired in-memory cert past day 365
++              (--reload-cert alone would make this worse — the mounted
++              cert would rotate while the pod's self-registered
++              MutatingWebhookConfiguration caBundle went stale). At
++              cozystack's release cadence a Helm action realistically
++              lands well within that 90-day post-rotation window, so
++              we accept this. If ever it stops holding, a small
++              post-renewal Job that annotates the Deployment
++              podTemplate would close the gap without re-introducing
++              the ReplicaSet-churn amplifier.
++
++          `lookup` returns nil during `helm template --dry-run=client`
++          (offline CI renders / this chart's helm-unittest suite) — that
++          is intentional; the annotation is only meaningful against a
++          live cluster where cert-manager has actually written the
++          Secret. Tests assert the annotation is ABSENT under offline
++          render, exactly for that reason.
++
++          Crucially, this replaces the earlier `kubectl rollout restart`
++          post-upgrade hook. That hook itself was the amplifier of the
++          previous iteration: every Flux reconcile stamped a fresh
++          `kubectl.kubernetes.io/restartedAt` timestamp, which mutated
++          the Deployment podTemplate, which spawned a new ReplicaSet —
++          the same ReplicaSet-churn pattern in a different disguise.
++          Runtime-content-based checksum only mutates when the runtime
++          content actually mutates, so the loop cannot form.
++
++          Hashing only `tls.crt` is sufficient because the Issuer is
++          `selfSigned` (see `certificate.yaml`): the leaf is its own CA,
++          so `ca.crt == tls.crt` and every rotation re-issues `tls.crt`
++          regardless of key-rotation policy. If a future change ever
++          switches the Issuer to a CA-backed one (external CA, ACME,
++          Vault, etc.), the CA can rotate independently of the leaf and
++          this checksum MUST be extended to also cover `ca.crt` —
++          otherwise a CA-only rotation would leave the pod serving with
++          a stale caBundle in its self-registered
++          MutatingWebhookConfiguration until the next full leaf
++          rotation.
++        */}}
++        {{- if and .Values.admissionController.tls.certManagerEnabled (not .Values.admissionController.tls.existingSecret) }}
++        {{- $secret := lookup "v1" "Secret" (include "common.names.namespace" .) (include "vertical-pod-autoscaler.admissionController.tls.secretName" .) }}
++        {{- if and $secret $secret.data (index $secret.data "tls.crt") }}
++        checksum/tls-cert: {{ index $secret.data "tls.crt" | sha256sum }}
++        {{- end }}
++        {{- end }}
+         {{- if .Values.admissionController.podAnnotations }}
+         {{- include "common.tplvalues.render" ( dict "value" .Values.admissionController.podAnnotations "context" $ ) | nindent 8 }}
+         {{- end }}
+diff --git a/charts/vertical-pod-autoscaler/templates/admission-controller/tls-secret.yaml b/charts/vertical-pod-autoscaler/templates/admission-controller/tls-secret.yaml
+index f36b4d8..0bab86e 100644
+--- a/charts/vertical-pod-autoscaler/templates/admission-controller/tls-secret.yaml
++++ b/charts/vertical-pod-autoscaler/templates/admission-controller/tls-secret.yaml
+@@ -1,5 +1,16 @@
++{{- /*
++  Legacy in-chart genCA/genSignedCert path — kept for the escape hatch
++  `admissionController.tls.certManagerEnabled=false`. Superseded by
++  `certificate.yaml` (cert-manager Certificate + Issuer). See the
++  header comment in that file for the reconcile-driven cert churn this
++  path used to cause. The check on `.certManagerEnabled` intentionally
++  wraps the ENTIRE template rather than being folded into the earlier
++  `if`s so a single Helm render only emits ONE Secret owner (either
++  cert-manager via Certificate, or this chart directly).
++*/ -}}
+ {{- if .Values.admissionController.enabled }}
+ {{- if not .Values.admissionController.tls.existingSecret }}
++{{- if not .Values.admissionController.tls.certManagerEnabled }}
+ {{- $ca := genCA (include "vertical-pod-autoscaler.admissionController.fullname" .) 365 }}
+ {{- $cn := printf "%s.%s.svc" "vpa-webhook" (include "common.names.namespace" .) }}
+ {{- $cert := genSignedCert $cn nil (list $cn) 365 $ca }}
+@@ -23,3 +34,4 @@ data:
+   tls.key: {{ default $cert.Key .Values.admissionController.tls.key | b64enc | quote }}
+ {{- end }}
+ {{- end }}
++{{- end }}
+diff --git a/charts/vertical-pod-autoscaler/values.yaml b/charts/vertical-pod-autoscaler/values.yaml
+index 7d9ac33..3b731ce 100644
+--- a/charts/vertical-pod-autoscaler/values.yaml
++++ b/charts/vertical-pod-autoscaler/values.yaml
+@@ -323,6 +323,9 @@ admissionController:
+       relabelings: []
+ 
+   tls:
++    ## @param admissionController.tls.certManagerEnabled Provision the admission-controller webhook TLS via cert-manager Issuer + Certificate. When true, `caCert` / `cert` / `key` below are ignored, no in-chart `genCA` Secret is rendered, and the `checksum/tls-secret` podAnnotation that used to rotate the ReplicaSet on every reconcile is dropped. Requires cert-manager installed in the cluster. See `certificate.yaml` header for rationale. Note: switching this back to `false` after a cluster has migrated to cert-manager is effectively one-way — cert-manager writes the Secret with `type: kubernetes.io/tls`, and `Secret.type` is immutable, so the legacy Opaque Secret template cannot overwrite it in place. To roll back the operator must first `kubectl delete` the cert-manager-owned Secret.
++    certManagerEnabled: true
++
+     ## @param admissionController.tls.caCert TLS CA certificate (Generated using the `genCA` function if not set)
+     caCert: ""
+ 
diff --git a/packages/system/vertical-pod-autoscaler/templates/vpa-for-vpa.yaml b/packages/system/vertical-pod-autoscaler/templates/vpa-for-vpa.yaml
index 73df18b0d5..dc9a5ff9b1 100644
--- a/packages/system/vertical-pod-autoscaler/templates/vpa-for-vpa.yaml
+++ b/packages/system/vertical-pod-autoscaler/templates/vpa-for-vpa.yaml
@@ -51,7 +51,7 @@ spec:
           recommender-name: vpa-for-vpa
         resources:
           limits:
-            memory: 512Mi
+            memory: 1Gi
           requests:
             cpu: 100m
             memory: 512Mi
@@ -69,7 +69,10 @@ spec:
     kind: Deployment
     name: {{ dig "vertical-pod-autoscaler" "nameOverride" "" .Values.AsMap | default "vertical-pod-autoscaler" | trunc 63 | trimSuffix "-" }}-recommender
   updatePolicy:
-    updateMode: Auto
+    # Initial (not Recreate): size at pod creation without ever evicting.
+    # Recreate here evicts the VPA recommender during install, adding pod churn
+    # on an already busy cluster. Matches the monitoring/etcd VPA->Initial fixes.
+    updateMode: Initial
 ---
 apiVersion: autoscaling.k8s.io/v1
 kind: VerticalPodAutoscaler
@@ -82,5 +85,5 @@ spec:
     kind: Deployment
     name: vpa-for-vpa-recommender
   updatePolicy:
-    updateMode: Auto
+    updateMode: Initial
 {{- end }}
diff --git a/packages/system/vertical-pod-autoscaler/tests/vpa_test.yaml b/packages/system/vertical-pod-autoscaler/tests/vpa_test.yaml
new file mode 100644
index 0000000000..6b8c826756
--- /dev/null
+++ b/packages/system/vertical-pod-autoscaler/tests/vpa_test.yaml
@@ -0,0 +1,244 @@
+suite: cozy-vertical-pod-autoscaler chart rendering invariants
+release:
+  name: vpa
+  namespace: cozy-vertical-pod-autoscaler
+tests:
+  - it: drives the recommender off cluster prometheus (cozystack storage config)
+    template: charts/vertical-pod-autoscaler/templates/recommender/deployment.yaml
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: "--storage=prometheus"
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: "--prometheus-address=http://vmselect-shortterm.tenant-root.svc.cozy.local:8481/select/0/prometheus/"
+
+  - it: renders the recommender on the upstream registry.k8s.io image, not Bitnami
+    template: charts/vertical-pod-autoscaler/templates/recommender/deployment.yaml
+    asserts:
+      - matchRegex:
+          path: spec.template.spec.containers[0].image
+          pattern: '^registry\.k8s\.io/autoscaling/vpa-recommender:'
+
+  # Cozystack disables the bundled CRD-install Job (crds.enabled: false) — CRDs
+  # are managed out-of-band — so the upstream chart's Bitnami-based kubectl
+  # Job (and the Bitnami image override it would otherwise need) never renders.
+  - it: does not emit the CRD-install Job when crds.enabled is false
+    template: charts/vertical-pod-autoscaler/templates/crds/job.yaml
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  # The vpa-for-vpa VerticalPodAutoscalers use updateMode Initial: they size the
+  # VPA components at pod creation without ever evicting them. Recreate (and its
+  # deprecated Auto alias) would evict the recommender mid-install, adding pod
+  # churn on an already busy cluster. Pin Initial so a bump cannot regress it.
+  - it: pins the vpa-for-vpa VerticalPodAutoscalers to updateMode Initial
+    template: templates/vpa-for-vpa.yaml
+    documentSelector:
+      path: kind
+      value: VerticalPodAutoscaler
+      matchMany: true
+    asserts:
+      - equal:
+          path: spec.updatePolicy.updateMode
+          value: Initial
+
+  ###############################################################
+  # admission-controller TLS — cert-manager path (default)      #
+  ###############################################################
+
+  # certManagerEnabled defaults to true. Certificate must render with a spec
+  # that mirrors the legacy genSignedCert shape exactly (CN + single DNS SAN
+  # `vpa-webhook.<ns>.svc`, 365d validity) so cert-manager adoption of an
+  # existing Secret rotates content once and stabilises — not on every knob.
+  - it: certManagerEnabled=true renders the admission-controller Certificate with the legacy DNS shape
+    set:
+      vertical-pod-autoscaler.admissionController.tls.certManagerEnabled: true
+    template: charts/vertical-pod-autoscaler/templates/admission-controller/certificate.yaml
+    documentSelector:
+      path: kind
+      value: Certificate
+    asserts:
+      - equal:
+          path: apiVersion
+          value: cert-manager.io/v1
+      - equal:
+          path: spec.commonName
+          value: vpa-webhook.cozy-vertical-pod-autoscaler.svc
+      - equal:
+          path: spec.dnsNames[0]
+          value: vpa-webhook.cozy-vertical-pod-autoscaler.svc
+      - equal:
+          path: spec.duration
+          value: 8760h
+      - equal:
+          path: spec.secretName
+          value: vpa-vertical-pod-autoscaler-admission-controller-tls
+
+  # Namespace-scoped selfSigned Issuer — NOT ClusterIssuer, since we want the
+  # trust root scoped to the VPA namespace so an admin cannot accidentally use
+  # this issuer to mint certs against other namespaces.
+  - it: certManagerEnabled=true renders a namespace-scoped selfSigned Issuer
+    set:
+      vertical-pod-autoscaler.admissionController.tls.certManagerEnabled: true
+    template: charts/vertical-pod-autoscaler/templates/admission-controller/certificate.yaml
+    documentSelector:
+      path: kind
+      value: Issuer
+    asserts:
+      - equal:
+          path: apiVersion
+          value: cert-manager.io/v1
+      - exists:
+          path: spec.selfSigned
+
+  # certManagerEnabled=true must NOT emit the legacy genCA Secret. Two owners
+  # of the same secret name would race on first apply and rotate on every
+  # reconcile — exactly the problem this whole change targets.
+  - it: certManagerEnabled=true suppresses the legacy in-chart Secret
+    set:
+      vertical-pod-autoscaler.admissionController.tls.certManagerEnabled: true
+    template: charts/vertical-pod-autoscaler/templates/admission-controller/tls-secret.yaml
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  # The checksum/tls-secret podAnnotation was the ReplicaSet-churn amplifier
+  # under the legacy path; it must be gone under cert-manager. If a bump
+  # accidentally re-introduces this annotation on the cert-manager path, VPA
+  # will regress to the same infinite-rotation loop from a different angle
+  # (any change to Certificate metadata would flip the sha).
+  - it: certManagerEnabled=true does NOT set checksum/tls-secret on the admission-controller pod
+    documentSelector:
+      path: kind
+      value: Deployment
+    set:
+      vertical-pod-autoscaler.admissionController.tls.certManagerEnabled: true
+    template: charts/vertical-pod-autoscaler/templates/admission-controller/deployment.yaml
+    asserts:
+      - notExists:
+          path: spec.template.metadata.annotations["checksum/tls-secret"]
+
+  ###############################################################
+  # admission-controller TLS — legacy genCA path (opt-out)      #
+  ###############################################################
+
+  # certManagerEnabled=false is the escape hatch for operators who cannot run
+  # cert-manager. It must reactivate the legacy Secret AND the
+  # checksum/tls-secret annotation, otherwise the Secret would still be
+  # missing and admission-controller pods would fail to mount.
+  - it: certManagerEnabled=false reactivates the legacy in-chart Secret
+    set:
+      vertical-pod-autoscaler.admissionController.tls.certManagerEnabled: false
+    template: charts/vertical-pod-autoscaler/templates/admission-controller/tls-secret.yaml
+    asserts:
+      - hasDocuments:
+          count: 1
+      - equal:
+          path: kind
+          value: Secret
+      - equal:
+          path: metadata.name
+          value: vpa-vertical-pod-autoscaler-admission-controller-tls
+
+  - it: certManagerEnabled=false restores checksum/tls-secret podAnnotation
+    set:
+      vertical-pod-autoscaler.admissionController.tls.certManagerEnabled: false
+    template: charts/vertical-pod-autoscaler/templates/admission-controller/deployment.yaml
+    asserts:
+      - exists:
+          path: spec.template.metadata.annotations["checksum/tls-secret"]
+
+  - it: certManagerEnabled=false does NOT emit the Certificate
+    set:
+      vertical-pod-autoscaler.admissionController.tls.certManagerEnabled: false
+    template: charts/vertical-pod-autoscaler/templates/admission-controller/certificate.yaml
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  ###############################################################
+  # admission-controller TLS — existingSecret bypass            #
+  ###############################################################
+
+  # existingSecret has always meant "the operator supplies TLS out-of-band";
+  # the chart must never mint or manage a Secret in that mode. Adding
+  # cert-manager must not regress that contract — no Certificate, no Issuer,
+  # no legacy Secret, no migration/rollout hooks, regardless of
+  # certManagerEnabled.
+  - it: existingSecret bypasses cert-manager Certificate + Issuer entirely
+    set:
+      vertical-pod-autoscaler.admissionController.tls.existingSecret: my-external-tls
+      vertical-pod-autoscaler.admissionController.tls.certManagerEnabled: true
+    template: charts/vertical-pod-autoscaler/templates/admission-controller/certificate.yaml
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  - it: existingSecret bypasses the legacy in-chart Secret
+    set:
+      vertical-pod-autoscaler.admissionController.tls.existingSecret: my-external-tls
+    template: charts/vertical-pod-autoscaler/templates/admission-controller/tls-secret.yaml
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  # Belt-and-suspenders: the templates are structurally gated on
+  # `existingSecret`, but pinning that the pod-template carries NEITHER
+  # `checksum/tls-secret` (legacy amplifier) NOR `checksum/tls-cert`
+  # (cert-manager runtime lookup) locks the contract at the observable
+  # boundary. If a future refactor accidentally moves either checksum
+  # outside its `if` gate, this catches it before it hits a customer
+  # cluster and starts a fresh ReplicaSet-churn incident.
+  - it: existingSecret emits neither tls-secret nor tls-cert checksum on the admission-controller pod
+    documentSelector:
+      path: kind
+      value: Deployment
+    set:
+      vertical-pod-autoscaler.admissionController.tls.existingSecret: my-external-tls
+      vertical-pod-autoscaler.admissionController.tls.certManagerEnabled: true
+    template: charts/vertical-pod-autoscaler/templates/admission-controller/deployment.yaml
+    asserts:
+      - notExists:
+          path: spec.template.metadata.annotations["checksum/tls-secret"]
+      - notExists:
+          path: spec.template.metadata.annotations["checksum/tls-cert"]
+
+  # `checksum/tls-cert` uses a runtime `lookup` on the Secret content —
+  # `helm template` in a test suite has no cluster, so the Secret is never
+  # found and the annotation is absent. That's actually the correct
+  # rendering path in offline CI; the annotation only ever needs to exist
+  # once the cluster has issued a cert, and that path is verified by the
+  # `admissionController disabled` test group below (which confirms no
+  # unrelated annotation leaks).
+  - it: certManagerEnabled=true does NOT emit checksum/tls-cert during offline render (lookup returns nil)
+    documentSelector:
+      path: kind
+      value: Deployment
+    set:
+      vertical-pod-autoscaler.admissionController.tls.certManagerEnabled: true
+    template: charts/vertical-pod-autoscaler/templates/admission-controller/deployment.yaml
+    asserts:
+      - notExists:
+          path: spec.template.metadata.annotations["checksum/tls-cert"]
+
+  ###############################################################
+  # admission-controller disabled (nested vpa-for-vpa release)  #
+  ###############################################################
+
+  # The vpa-for-vpa release sets admissionController.enabled=false — it runs a
+  # recommender-only VPA to size the main VPA. No admission-controller means
+  # no TLS Secret needed and no cert-manager path either. All admission-
+  # controller templates must be empty in this configuration; otherwise the
+  # nested release would try to reconcile a stray Certificate/Issuer/Job in
+  # its own cozy-vpa-for-vpa namespace, adding failure surface for no reason.
+  - it: admissionController disabled renders no Certificate
+    set:
+      vertical-pod-autoscaler.admissionController.enabled: false
+    template: charts/vertical-pod-autoscaler/templates/admission-controller/certificate.yaml
+    asserts:
+      - hasDocuments:
+          count: 0
+
+
diff --git a/packages/system/vertical-pod-autoscaler/values.yaml b/packages/system/vertical-pod-autoscaler/values.yaml
index 513275315a..46678903e7 100644
--- a/packages/system/vertical-pod-autoscaler/values.yaml
+++ b/packages/system/vertical-pod-autoscaler/values.yaml
@@ -7,15 +7,20 @@ vertical-pod-autoscaler:
     image:
       registry: docker.io
       repository: alpine/k8s
-      tag: 1.33.4
+      tag: 1.36.2
 
   updater:
     resources:
+      # The updater watches every pod in the cluster; a 110Mi limit OOM-kills it
+      # on a full cozystack install, which trips ProgressDeadlineExceeded and
+      # makes Flux fail the HelmRelease (cascading to monitoring/velero/etc).
+      # Give it real headroom; the recommender (which holds more state) is
+      # already unlimited.
       limits:
-        memory: 110Mi
+        memory: 512Mi
       requests:
         cpu: 200m
-        memory: 110Mi
+        memory: 200Mi
 
   recommender:
     extraArgs:
diff --git a/packages/system/virtualprivatecloud-rd/cozyrds/virtualprivatecloud.yaml b/packages/system/virtualprivatecloud-rd/cozyrds/virtualprivatecloud.yaml
index e1397d2d84..e39933bd34 100644
--- a/packages/system/virtualprivatecloud-rd/cozyrds/virtualprivatecloud.yaml
+++ b/packages/system/virtualprivatecloud-rd/cozyrds/virtualprivatecloud.yaml
@@ -8,7 +8,7 @@ spec:
     plural: virtualprivateclouds
     singular: virtualprivatecloud
     openAPISchema: |-
-      {"title":"Chart Values","type":"object","properties":{"subnets":{"description":"Subnets of a VPC","type":"array","default":[],"items":{"type":"object","required":["name"],"properties":{"cidr":{"description":"IP address range","type":"string"},"name":{"description":"Subnet name","type":"string"}}}},"peers":{"description":"VPC peering connections (bidirectional declaration required)","type":"array","default":[],"items":{"type":"object","required":["tenantNamespace","vpcName"],"properties":{"tenantNamespace":{"description":"Namespace of the remote tenant","type":"string"},"vpcName":{"description":"Logical name of the remote VPC (without \"virtualprivatecloud-\" prefix)","type":"string"}}}},"routes":{"description":"Static routes for the VPC","type":"array","default":[],"items":{"type":"object","required":["cidr","nextHopIP"],"properties":{"cidr":{"description":"Destination CIDR","type":"string"},"nextHopIP":{"description":"Next hop IP address","type":"string"}}}}}}
+      {"title":"Chart Values","type":"object","properties":{"subnets":{"description":"Subnets of a VPC","type":"array","default":[],"items":{"type":"object","required":["name"],"properties":{"allowSubnets":{"description":"Additional source CIDRs admitted into this private subnet, such as remote networks routed in through a gateway VM","type":"array","items":{"type":"string"}},"cidr":{"description":"IP address range","type":"string"},"name":{"description":"Subnet name","type":"string"}}}},"peers":{"description":"VPC peering connections (bidirectional declaration required)","type":"array","default":[],"items":{"type":"object","required":["tenantNamespace","vpcName"],"properties":{"tenantNamespace":{"description":"Namespace of the remote tenant","type":"string"},"vpcName":{"description":"Logical name of the remote VPC (without \"virtualprivatecloud-\" prefix)","type":"string"}}}},"routes":{"description":"Static routes for the VPC","type":"array","default":[],"items":{"type":"object","required":["cidr","nextHopIP"],"properties":{"cidr":{"description":"Destination CIDR","type":"string"},"nextHopIP":{"description":"Next hop IP address","type":"string"}}}}}}
   release:
     prefix: "virtualprivatecloud-"
     labels:
diff --git a/packages/system/vm-default-images/values.yaml b/packages/system/vm-default-images/values.yaml
index 9d777f0b5d..a506ad1c05 100644
--- a/packages/system/vm-default-images/values.yaml
+++ b/packages/system/vm-default-images/values.yaml
@@ -1,6 +1,13 @@
 ##
 ## @section Global Golden Image Collection
 ##
+## The package reports Ready only once every image below has imported. One image
+## that cannot be fetched, such as a removed upstream URL, keeps the whole package
+## not Ready, retrying with no time limit, until that image imports or its entry
+## is removed from the list. An import that reached phase Failed does not start
+## again by itself: delete its DataVolume and the next retry recreates it. The
+## images that did import stay usable meanwhile.
+##
 
 ## @param {string} storageClass - Default StorageClass for all images. If empty, uses the cluster default StorageClass.
 ## NOTE: The default set of images requires approximately 320Gi of storage (16 images × 20Gi each).
@@ -141,7 +148,7 @@ images:
     architecture: amd64
     description: "openSUSE Leap 15.6 NoCloud image"
   - name: opensuse-leap-16.0
-    url: https://download.opensuse.org/repositories/openSUSE:/Leap:/16.0:/Images/images/Leap-16.0-Minimal-VM.x86_64-Cloud.qcow2
+    url: https://download.opensuse.org/distribution/leap/16.0/appliances/Leap-16.0-Minimal-VM.x86_64-Cloud.qcow2
     storage: 20Gi
     os:
       family: Linux
@@ -159,7 +166,7 @@ images:
     architecture: amd64
     description: "Ubuntu 20.04 LTS (Focal Fossa) cloud image"
   - name: alpine-3.21
-    url: https://dl-cdn.alpinelinux.org/alpine/v3.21/releases/cloud/nocloud_alpine-3.21.6-x86_64-bios-cloudinit-r0.qcow2
+    url: https://dl-cdn.alpinelinux.org/alpine/v3.21/releases/cloud/nocloud_alpine-3.21.7-x86_64-bios-cloudinit-r0.qcow2
     storage: 20Gi
     os:
       family: Linux
diff --git a/packages/system/vm-disk-rd/Makefile b/packages/system/vm-disk-rd/Makefile
index 5b73fd4cca..58a1f3e3cc 100644
--- a/packages/system/vm-disk-rd/Makefile
+++ b/packages/system/vm-disk-rd/Makefile
@@ -2,3 +2,6 @@ export NAME=vm-disk-rd
 export NAMESPACE=cozy-system
 
 include ../../../hack/package.mk
+
+test:
+	helm unittest .
diff --git a/packages/system/vm-disk-rd/cozyrds/vm-disk.yaml b/packages/system/vm-disk-rd/cozyrds/vm-disk.yaml
index a0a2f6e80d..d848122abd 100644
--- a/packages/system/vm-disk-rd/cozyrds/vm-disk.yaml
+++ b/packages/system/vm-disk-rd/cozyrds/vm-disk.yaml
@@ -8,7 +8,7 @@ spec:
     singular: vmdisk
     plural: vmdisks
     openAPISchema: |-
-      {"title":"Chart Values","type":"object","properties":{"source":{"description":"The source image location used to create a disk.","type":"object","default":{},"properties":{"disk":{"description":"Clone an existing vm-disk.","type":"object","required":["name"],"properties":{"name":{"description":"Name of the vm-disk to clone.","type":"string"}}},"http":{"description":"Download image from an HTTP source.","type":"object","required":["url"],"properties":{"url":{"description":"URL to download the image.","type":"string"}}},"image":{"description":"Use image by name from default collection.","type":"object","required":["name"],"properties":{"name":{"description":"Name of the image to use.","type":"string"}}},"upload":{"description":"Upload local image.","type":"object"}}},"optical":{"description":"Defines if disk should be considered optical.","type":"boolean","default":false},"storage":{"description":"The size of the disk allocated for the virtual machine.","default":"5Gi","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"storageClass":{"description":"StorageClass used to store the data.","type":"string","default":"replicated","x-kubernetes-validations":[{"rule":"self == oldSelf","message":"storageClass is immutable"}]}}}
+      {"title":"Chart Values","type":"object","properties":{"source":{"description":"The source image location used to create a disk.","type":"object","default":{},"properties":{"disk":{"description":"Clone an existing vm-disk.","type":"object","required":["name"],"properties":{"name":{"description":"Name of the vm-disk to clone.","type":"string"}}},"http":{"description":"Download image from an HTTP source.","type":"object","required":["url"],"properties":{"url":{"description":"URL to download the image.","type":"string"}}},"image":{"description":"Use image by name from default collection.","type":"object","required":["name"],"properties":{"name":{"description":"Name of the image to use.","type":"string","x-cozystack-options":{"source":"image"}}}},"upload":{"description":"Upload local image.","type":"object"}},"x-kubernetes-validations":[{"rule":"self == oldSelf","message":"source is immutable"}]},"optical":{"description":"Defines if disk should be considered optical.","type":"boolean","default":false},"storage":{"description":"The size of the disk allocated for the virtual machine.","default":"5Gi","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"storageClass":{"description":"StorageClass used to store the data.","type":"string","default":"replicated","x-kubernetes-validations":[{"rule":"self == oldSelf","message":"storageClass is immutable"}],"x-cozystack-options":{"source":"storageclass"}},"bindImmediately":{"description":"Provision the volume at disk creation instead of waiting for a consumer.","type":"boolean","default":true}}}
   release:
     prefix: vm-disk-
     labels:
@@ -17,6 +17,11 @@ spec:
       kind: ExternalArtifact
       name: cozystack-vm-disk-application-kubevirt-vm-disk
       namespace: cozy-system
+    # kstatus would otherwise wait on the DataVolume's Ready (checkReadyCondition); the WorkloadMonitor reports whether CDI populated it.
+    healthCheckExprs:
+      - apiVersion: cdi.kubevirt.io/v1beta1
+        kind: DataVolume
+        current: "true"
   dashboard:
     category: IaaS
     singular: VM Disk
@@ -26,7 +31,7 @@ spec:
     tags:
       - storage
     icon: PHN2ZyB3aWR0aD0iMTQ0IiBoZWlnaHQ9IjE0NCIgdmlld0JveD0iMCAwIDE0NCAxNDQiIGZpbGw9Im5vbmUiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+CjxyZWN0IHdpZHRoPSIxNDQiIGhlaWdodD0iMTQ0IiByeD0iMjQiIGZpbGw9InVybCgjcGFpbnQwX2xpbmVhcl8zMzBfNDg5NjMpIi8+CjxnIGZpbHRlcj0idXJsKCNmaWx0ZXIwX2lfMzMwXzQ4OTYzKSI+CjxwYXRoIGQ9Ik03Mi4wMDAxIDI2LjYzNjdDNDYuODc3MiAyNi42MzY3IDI2LjUxMTIgNDcuMDAyNyAyNi41MTEyIDcyLjEyNTZDMjYuNTExMiA5Ny4yNDg0IDQ2Ljg3NzIgMTE3LjYxNCA3Mi4wMDAxIDExNy42MTRDOTcuMTIyOSAxMTcuNjE0IDExNy40ODkgOTcuMjQ4MiAxMTcuNDg5IDcyLjEyNTRDMTE3LjQ4OSA0Ny4wMDI1IDk3LjEyMjkgMjYuNjM2NyA3Mi4wMDAxIDI2LjYzNjdaTTcyLjAwMDEgODEuNjIxMkM2Ni43NTU3IDgxLjYyMTIgNjIuNTA0NCA3Ny4zNjk5IDYyLjUwNDQgNzIuMTI1NkM2Mi41MDQ0IDY2Ljg4MTIgNjYuNzU1NyA2Mi42Mjk5IDcyLjAwMDEgNjIuNjI5OUM3Ny4yNDQ0IDYyLjYyOTkgODEuNDk1NyA2Ni44ODEyIDgxLjQ5NTcgNzIuMTI1NkM4MS40OTU3IDc3LjM2OTkgNzcuMjQ0NCA4MS42MjEyIDcyLjAwMDEgODEuNjIxMloiIGZpbGw9IiNCQUQ5RkYiLz4KPC9nPgo8cGF0aCBkPSJNNTIuMDA3NSA2NS43MjA5TDMyLjI5NzYgNTkuMDQ5OEMzNi4yODQyIDQ3LjI3MTEgNDUuMzI4NSAzNy42MzE1IDU2LjQ5MSAzMy4yNjRMNjQuMDcyOCA1Mi42NDE5QzU4LjY0MiA1NC43NjY3IDU0LjAxOSA1OS43NzgzIDUyLjAwNzUgNjUuNzIwOVpNOTEuOTkyNiA3OC41M0wxMTEuNzAzIDg1LjIwMTFDMTA3LjcxNiA5Ni45Nzk5IDk4LjY3MTggMTA2LjYxOSA4Ny41MDkzIDExMC45ODdMNzkuOTI3NSA5MS42MDlDODUuMzU4MSA4OS40ODQyIDg5Ljk4MTMgODQuNDcyNiA5MS45OTI2IDc4LjUzWiIgZmlsbD0iI0VERjZGRiIvPgo8cGF0aCBkPSJNNTUuOTMyNCA1OC43MDI4QzU3LjY1MTQgNTYuNjE0IDU5LjcxOTQgNTQuODYzMiA2MS45ODk0IDUzLjYxODNDNjMuMTQ5IDUyLjk4MjQgNjQuMjYzMyA1My4xMjk2IDYzLjc4MTQgNTEuODk3OUw1Ny4yMDk1IDM1LjEwMDlDNTYuMjkwOSAzMi43NTI5IDU1LjI4MTQgMzMuNzI4NSA1My45MDYgMzQuMzg2OEM0OC45NzM0IDM2Ljc0NzYgNDQuNTM0OSA0MC4xNTkgNDAuODYwMSA0NC4zMTU0TDU1LjkzMjQgNTguNzAyOFpNODguMDY3NiA4NS41NDgxQzg1LjgzNTIgODguMjYwNSA4My4wMTQ4IDkwLjQwMjkgNzkuOTI2OSA5MS42MDhMODcuNTA4OSAxMTAuOTg2QzkzLjQ3ODUgMTA4LjY1NCA5OC44MzM2IDEwNC44MDYgMTAzLjE0IDk5LjkzNTVMODguMDY3NiA4NS41NDgxWiIgZmlsbD0iI0NERTNGRiIvPgo8cGF0aCBkPSJNNzIgODkuNDM4OEM2Mi40NTM0IDg5LjQzODggNTQuNjg2NSA4MS42NzIxIDU0LjY4NjUgNzIuMTI1NEM1NC42ODY1IDYyLjU3ODYgNjIuNDUzNCA1NC44MTE5IDcyIDU0LjgxMTlDODEuNTQ2OCA1NC44MTE5IDg5LjMxMzQgNjIuNTc4OCA4OS4zMTM0IDcyLjEyNTRDODkuMzEzNCA4MS42NzIgODEuNTQ2OCA4OS40Mzg4IDcyIDg5LjQzODhaTTcyIDU5LjExMDVDNjQuODIzNCA1OS4xMTA1IDU4Ljk4NDkgNjQuOTQ5IDU4Ljk4NDkgNzIuMTI1NkM1OC45ODQ5IDc5LjMwMjIgNjQuODIzNCA4NS4xNDA2IDcyIDg1LjE0MDZDNzkuMTc2NiA4NS4xNDA2IDg1LjAxNSA3OS4zMDIyIDg1LjAxNSA3Mi4xMjU2Qzg1LjAxNSA2NC45NDkgNzkuMTc2NiA1OS4xMTA1IDcyIDU5LjExMDVaIiBmaWxsPSIjMDBCNEZGIi8+CjxkZWZzPgo8ZmlsdGVyIGlkPSJmaWx0ZXIwX2lfMzMwXzQ4OTYzIiB4PSIyNi41MTEyIiB5PSIyNi42MzY3IiB3aWR0aD0iOTIuOTc3OCIgaGVpZ2h0PSI5Mi45Nzc1IiBmaWx0ZXJVbml0cz0idXNlclNwYWNlT25Vc2UiIGNvbG9yLWludGVycG9sYXRpb24tZmlsdGVycz0ic1JHQiI+CjxmZUZsb29kIGZsb29kLW9wYWNpdHk9IjAiIHJlc3VsdD0iQmFja2dyb3VuZEltYWdlRml4Ii8+CjxmZUJsZW5kIG1vZGU9Im5vcm1hbCIgaW49IlNvdXJjZUdyYXBoaWMiIGluMj0iQmFja2dyb3VuZEltYWdlRml4IiByZXN1bHQ9InNoYXBlIi8+CjxmZUNvbG9yTWF0cml4IGluPSJTb3VyY2VBbHBoYSIgdHlwZT0ibWF0cml4IiB2YWx1ZXM9IjAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDEyNyAwIiByZXN1bHQ9ImhhcmRBbHBoYSIvPgo8ZmVPZmZzZXQgZHg9IjIiIGR5PSIyIi8+CjxmZUdhdXNzaWFuQmx1ciBzdGREZXZpYXRpb249IjIuNSIvPgo8ZmVDb21wb3NpdGUgaW4yPSJoYXJkQWxwaGEiIG9wZXJhdG9yPSJhcml0aG1ldGljIiBrMj0iLTEiIGszPSIxIi8+CjxmZUNvbG9yTWF0cml4IHR5cGU9Im1hdHJpeCIgdmFsdWVzPSIwIDAgMCAwIDEgMCAwIDAgMCAxIDAgMCAwIDAgMSAwIDAgMCAwLjIxIDAiLz4KPGZlQmxlbmQgbW9kZT0ibm9ybWFsIiBpbjI9InNoYXBlIiByZXN1bHQ9ImVmZmVjdDFfaW5uZXJTaGFkb3dfMzMwXzQ4OTYzIi8+CjwvZmlsdGVyPgo8bGluZWFyR3JhZGllbnQgaWQ9InBhaW50MF9saW5lYXJfMzMwXzQ4OTYzIiB4MT0iLTE1LjUiIHkxPSItMTIiIHgyPSIyMTYuNSIgeTI9IjE4NS41IiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+CjxzdG9wIHN0b3AtY29sb3I9IiM2NUNDRkYiLz4KPHN0b3Agb2Zmc2V0PSIxIiBzdG9wLWNvbG9yPSIjMDQ0Mzc0Ii8+CjwvbGluZWFyR3JhZGllbnQ+CjwvZGVmcz4KPC9zdmc+Cg==
-    keysOrder: [["apiVersion"], ["appVersion"], ["kind"], ["metadata"], ["metadata", "name"], ["spec", "source"], ["spec", "optical"], ["spec", "storage"], ["spec", "storageClass"]]
+    keysOrder: [["apiVersion"], ["appVersion"], ["kind"], ["metadata"], ["metadata", "name"], ["spec", "source"], ["spec", "optical"], ["spec", "storage"], ["spec", "storageClass"], ["spec", "bindImmediately"]]
   secrets:
     exclude: []
     include: []
diff --git a/packages/system/vm-disk-rd/tests/cozyrd_test.yaml b/packages/system/vm-disk-rd/tests/cozyrd_test.yaml
new file mode 100644
index 0000000000..2926e1ee4d
--- /dev/null
+++ b/packages/system/vm-disk-rd/tests/cozyrd_test.yaml
@@ -0,0 +1,24 @@
+suite: vm-disk-rd ApplicationDefinition
+release:
+  name: vm-disk-rd
+  namespace: cozy-system
+templates:
+  - templates/cozyrd.yaml
+tests:
+  # Without this entry kstatus reads the DataVolume's Ready condition, and an
+  # import that never completes holds the install, and a helm-controller
+  # worker, for the whole timeout. Whether CDI populated the disk is reported
+  # by the WorkloadMonitor instead, so the release must not wait on it.
+  - it: keeps the Helm install from waiting on the DataVolume
+    documentSelector:
+      path: metadata.name
+      value: vm-disk
+    asserts:
+      - isKind:
+          of: ApplicationDefinition
+      - equal:
+          path: spec.release.healthCheckExprs
+          value:
+            - apiVersion: cdi.kubevirt.io/v1beta1
+              kind: DataVolume
+              current: "true"
diff --git a/packages/system/vm-instance-rd/Makefile b/packages/system/vm-instance-rd/Makefile
index 621d74bd36..b7d7d62217 100644
--- a/packages/system/vm-instance-rd/Makefile
+++ b/packages/system/vm-instance-rd/Makefile
@@ -2,3 +2,7 @@ export NAME=vm-instance-rd
 export NAMESPACE=cozy-system
 
 include ../../../hack/package.mk
+
+.PHONY: test
+test:
+	helm unittest .
diff --git a/packages/system/vm-instance-rd/cozyrds/vm-instance.yaml b/packages/system/vm-instance-rd/cozyrds/vm-instance.yaml
index 0988be4119..e91a334a1d 100644
--- a/packages/system/vm-instance-rd/cozyrds/vm-instance.yaml
+++ b/packages/system/vm-instance-rd/cozyrds/vm-instance.yaml
@@ -2,13 +2,17 @@ apiVersion: cozystack.io/v1alpha1
 kind: ApplicationDefinition
 metadata:
   name: vm-instance
+  annotations:
+    # KubeVirt leaves a VirtualMachine's status.observedGeneration behind its
+    # generation, so kstatus never reports the VM Current and the wait never ends.
+    release.cozystack.io/helm-install-disable-wait: "true"
 spec:
   application:
     kind: VMInstance
     singular: vminstance
     plural: vminstances
     openAPISchema: |-
-      {"title":"Chart Values","type":"object","properties":{"external":{"description":"Enable external access from outside the cluster.","type":"boolean","default":false},"externalMethod":{"description":"Method to pass through traffic to the VM.","type":"string","default":"PortList","enum":["PortList","WholeIP"]},"externalPorts":{"description":"Ports to forward from outside the cluster.","type":"array","default":[22],"items":{"type":"integer"}},"externalAllowICMP":{"description":"Whether to accept ICMP traffic to the VM in PortList mode (preserves ping and PMTU discovery). No effect in WholeIP mode. Default true so ping behaves as users expect even when port filtering is in effect.","type":"boolean","default":true},"runStrategy":{"description":"Requested running state of the VirtualMachineInstance","type":"string","default":"Always","enum":["Always","Halted","Manual","RerunOnFailure","Once"]},"instanceType":{"description":"Virtual Machine instance type.","type":"string","default":"u1.medium"},"instanceProfile":{"description":"Virtual Machine preferences profile.","type":"string","default":"ubuntu","enum":["alpine","centos.7","centos.7.desktop","centos.stream10","centos.stream10.desktop","centos.stream8","centos.stream8.desktop","centos.stream8.dpdk","centos.stream9","centos.stream9.desktop","centos.stream9.dpdk","cirros","debian","fedora","fedora.arm64","fedora.s390x","legacy","linux","linux.efi","linux.virtiotransitional","opensuse.leap","opensuse.tumbleweed","oraclelinux","rhel.10","rhel.10.arm64","rhel.10.s390x","rhel.7","rhel.7.desktop","rhel.8","rhel.8.desktop","rhel.8.dpdk","rhel.9","rhel.9.arm64","rhel.9.desktop","rhel.9.dpdk","rhel.9.realtime","rhel.9.s390x","sles","ubuntu","windows.10","windows.10.virtio","windows.11","windows.11.virtio","windows.2k12","windows.2k12.virtio","windows.2k16","windows.2k16.virtio","windows.2k19","windows.2k19.virtio","windows.2k22","windows.2k22.virtio","windows.2k25","windows.2k25.virtio","windows.2k3","windows.2k8","windows.2k8.virtio","windows.7","windows.7.virtio","windows.xp",""]},"disks":{"description":"List of disks to attach.","type":"array","default":[],"items":{"type":"object","required":["name"],"properties":{"bus":{"description":"Disk bus type (e.g. \"sata\").","type":"string"},"name":{"description":"Disk name.","type":"string"}}}},"networks":{"description":"Networks to attach the VM to.","type":"array","default":[],"items":{"type":"object","properties":{"name":{"description":"Network attachment name.","type":"string"}}}},"subnets":{"description":"Deprecated: use networks instead.","type":"array","default":[],"items":{"type":"object","properties":{"name":{"description":"Network attachment name.","type":"string"}}}},"gpus":{"description":"List of GPUs to attach (NVIDIA driver requires at least 4 GiB RAM).","type":"array","default":[],"items":{"type":"object","required":["name"],"properties":{"name":{"description":"The name of the GPU resource to attach.","type":"string"}}}},"cpuModel":{"description":"Model specifies the CPU model inside the VMI. List of available models https://github.com/libvirt/libvirt/tree/master/src/cpu_map","type":"string","default":""},"resources":{"description":"Resource configuration for the virtual machine.","type":"object","default":{},"properties":{"cpu":{"description":"Number of CPU cores allocated.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Amount of memory allocated.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"sockets":{"description":"Number of CPU sockets (vCPU topology).","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}},"sshKeys":{"description":"List of SSH public keys for authentication.","type":"array","default":[],"items":{"type":"string"}},"cloudInit":{"description":"Cloud-init user data.","type":"string","default":""},"cloudInitSeed":{"description":"Seed string to generate SMBIOS UUID for the VM.","type":"string","default":""}}}
+      {"title":"Chart Values","type":"object","properties":{"external":{"description":"Enable external access from outside the cluster.","type":"boolean","default":false},"externalMethod":{"description":"Method to pass through traffic to the VM.","type":"string","default":"PortList","enum":["PortList","WholeIP"]},"externalPorts":{"description":"Ports to forward from outside the cluster.","type":"array","default":[22],"items":{"type":"integer"}},"externalAllowICMP":{"description":"Whether to accept ICMP traffic to the VM in PortList mode (preserves ping and PMTU discovery). No effect in WholeIP mode. Default true so ping behaves as users expect even when port filtering is in effect.","type":"boolean","default":true},"runStrategy":{"description":"Requested running state of the VirtualMachineInstance","type":"string","default":"Always","enum":["Always","Halted","Manual","RerunOnFailure","Once"]},"instanceType":{"description":"Virtual Machine instance type. Ignored when `resources` sizes the VM, which needs whole-number cpu and sockets plus memory; the whole type is dropped then, so any dedicated CPU placement, hugepages, NUMA or realtime settings it carries go with it. While this field is set, a `resources` block that sizes only part of the VM is rejected outright instead of ignored, so complete it or clear it.","type":"string","default":"u1.medium","x-cozystack-options":{"source":"instancetype"}},"instanceProfile":{"description":"Virtual Machine preferences profile.","type":"string","default":"ubuntu","x-cozystack-options":{"source":"instanceprofile"}},"disks":{"description":"List of disks to attach.","type":"array","default":[],"items":{"type":"object","required":["name"],"properties":{"bus":{"description":"Disk bus type (e.g. \"sata\").","type":"string"},"name":{"description":"Disk name.","type":"string","x-cozystack-options":{"source":"vmdisk"}}}}},"networks":{"description":"Networks to attach the VM to.","type":"array","default":[],"items":{"type":"object","properties":{"name":{"description":"Network attachment name.","type":"string","x-cozystack-options":{"source":"network"}}}}},"subnets":{"description":"Deprecated: use networks instead.","type":"array","default":[],"items":{"type":"object","properties":{"name":{"description":"Network attachment name.","type":"string","x-cozystack-options":{"source":"network"}}}}},"gpus":{"description":"List of GPUs to attach (NVIDIA driver requires at least 4 GiB RAM).","type":"array","default":[],"items":{"type":"object","required":["name"],"properties":{"name":{"description":"The name of the GPU resource to attach.","type":"string","x-cozystack-options":{"source":"gpu"}}}}},"cpuModel":{"description":"Model specifies the CPU model inside the VMI. List of available models https://github.com/libvirt/libvirt/tree/master/src/cpu_map","type":"string","default":""},"firmware":{"description":"Firmware and boot configuration (UEFI/BIOS selection, Secure Boot, persistent EFI NVRAM).","type":"object","default":{},"properties":{"bootloader":{"description":"Bootloader to boot the VM with: \"uefi\" (OVMF) or \"bios\" (SeaBIOS). Empty inherits the instanceProfile default.","type":"string"},"efiPersistent":{"description":"Persist EFI NVRAM (e.g. enrolled Secure Boot keys, such as an updated Microsoft UEFI CA) across reboots. Only applies when bootloader is \"uefi\".","type":"boolean"},"secureBoot":{"description":"Enable UEFI Secure Boot. Only applies when bootloader is \"uefi\".","type":"boolean"}}},"resources":{"description":"Resource configuration for the virtual machine. Set whole-number cpu and sockets together with memory to size the VM directly, which overrides `instanceType`. Alongside an `instanceType`, a block that sizes only part of the VM is rejected; a whole-number cpu or sockets on its own sizes nothing and is ignored.","type":"object","default":{},"properties":{"cpu":{"description":"Number of CPU cores allocated, as a positive whole number such as `2`. Millicore or other unit-suffixed, fractional, zero, negative, above 4294967295 and quoted leading-zero values are rejected at render time, because the value becomes the VM's unsigned integer `domain.cpu.cores`.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"memory":{"description":"Amount of memory allocated, as a quantity of at least `1M` such as `8Gi`. Less than 1M is rejected at render time, because KubeVirt refuses a non-zero amount below 1M and a zero or negative amount sizes nothing.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true},"sockets":{"description":"Number of CPU sockets (vCPU topology), as a positive whole number such as `1`. Millicore or other unit-suffixed, fractional, zero, negative, above 4294967295 and quoted leading-zero values are rejected at render time, because the value becomes the VM's unsigned integer `domain.cpu.sockets`.","pattern":"^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$","anyOf":[{"type":"integer"},{"type":"string"}],"x-kubernetes-int-or-string":true}}},"sshKeys":{"description":"List of SSH public keys for authentication.","type":"array","default":[],"items":{"type":"string"}},"cloudInit":{"description":"Cloud-init user data.","type":"string","default":""},"netplanDhcp":{"description":"Supply cloud-init network-data that requests DHCP on every `en*` and `eth*` interface and keeps the DNS search domains DHCP offers. Needed for a netplan guest (Ubuntu, Debian) to address a secondary network such as a VPC subnet. Leave it off for a guest rendered by anything other than netplan, which would lose DHCP on every interface, and for a guest that configures an interface statically through netplan, which this configuration would shadow. Turning it on for a VM that has neither `cloudInit` nor `sshKeys` adds a cloud-init disk, and the guest's next boot is then treated as a first boot.","type":"boolean","default":false},"cloudInitSeed":{"description":"Seed string to generate SMBIOS UUID for the VM.","type":"string","default":""}}}
   release:
     prefix: vm-instance-
     labels:
@@ -26,7 +30,7 @@ spec:
     tags:
       - compute
     icon: PHN2ZyB3aWR0aD0iMTQ0IiBoZWlnaHQ9IjE0NCIgdmlld0JveD0iMCAwIDE0NCAxNDQiIGZpbGw9Im5vbmUiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+CjxyZWN0IHdpZHRoPSIxNDQiIGhlaWdodD0iMTQ0IiByeD0iMjQiIGZpbGw9InVybCgjcGFpbnQwX2xpbmVhcl82ODdfMzQ1NCkiLz4KPGcgY2xpcC1wYXRoPSJ1cmwoI2NsaXAwXzY4N18zNDU0KSI+CjxwYXRoIGQ9Ik04OS41MDM5IDExMS43MDdINTQuNDk3QzU0LjE3MjcgMTExLjcwNyA1NC4wMTA4IDExMS4yMjEgNTQuMzM0OSAxMTEuMDU5TDU3LjI1MjIgMTA4Ljk1MkM2MC4zMzE0IDEwNi42ODMgNjEuOTUyMiAxMDIuNjMxIDYwLjk3OTcgOTguNzQxMkg4My4wMjFDODIuMDQ4NSAxMDIuNjMxIDgzLjY2OTMgMTA2LjY4MyA4Ni43NDg1IDEwOC45NTJMODkuNjY1OCAxMTEuMDU5Qzg5Ljk5IDExMS4yMjEgODkuODI3OSAxMTEuNzA3IDg5LjUwMzkgMTExLjcwN1oiIGZpbGw9IiNCMEI2QkIiLz4KPHBhdGggZD0iTTExMy4zMjggOTguNzQxSDMwLjY3MjVDMjcuNTkzMSA5OC43NDEgMjUgOTYuMTQ4IDI1IDkzLjA2ODdWMzMuMTAzMkMyNSAzMC4wMjM5IDI3LjU5MzEgMjcuNDMwNyAzMC42NzI1IDI3LjQzMDdIMTEzLjMyOEMxMTYuNDA3IDI3LjQzMDcgMTE5IDMwLjAyMzcgMTE5IDMzLjEwMzJWOTMuMDY4N0MxMTkgOTYuMTQ4IDExNi40MDcgOTguNzQxIDExMy4zMjggOTguNzQxWiIgZmlsbD0iI0U4RURFRSIvPgo8cGF0aCBkPSJNMTE5IDg0LjE1NDlIMjVWMzMuMTAzMkMyNSAzMC4wMjM5IDI3LjU5MzEgMjcuNDMwNyAzMC42NzI1IDI3LjQzMDdIMTEzLjMyOEMxMTYuNDA3IDI3LjQzMDcgMTE5IDMwLjAyMzcgMTE5IDMzLjEwMzJMMTE5IDg0LjE1NDlaIiBmaWxsPSIjMDBCM0ZGIi8+CjxwYXRoIGQ9Ik05MC42Mzc0IDExNi41NjlINTMuMzYxNkM1Mi4wNjUxIDExNi41NjkgNTAuOTMwNyAxMTUuNDM1IDUwLjkzMDcgMTE0LjEzOEM1MC45MzA3IDExMi44NDEgNTIuMDY1MSAxMTEuNzA3IDUzLjM2MTYgMTExLjcwN0g5MC42Mzc0QzkxLjkzMzkgMTExLjcwNyA5My4wNjg0IDExMi44NDEgOTMuMDY4NCAxMTQuMTM4QzkzLjA2ODQgMTE1LjQzNSA5MS45MzM5IDExNi41NjkgOTAuNjM3NCAxMTYuNTY5WiIgZmlsbD0iI0U4RURFRSIvPgo8L2c+CjxwYXRoIGQ9Ik03Mi41Mjc1IDUzLjgzNjdDNzIuNDQzMSA1My44MzUxIDcyLjM2MDUgNTMuODEyMiA3Mi4yODczIDUzLjc3MDFMNTYuNDY5OSA0NC43OTM0QzU2LjM5ODMgNDQuNzUxOSA1Ni4zMzg4IDQ0LjY5MjMgNTYuMjk3MyA0NC42MjA3QzU2LjI1NTkgNDQuNTQ5IDU2LjIzMzggNDQuNDY3OCA1Ni4yMzM0IDQ0LjM4NUM1Ni4yMzM0IDQ0LjIxNjkgNTYuMzI1OCA0NC4wNjE3IDU2LjQ2OTkgNDMuOTc4NUw3Mi4xOTEyIDM1LjA2MDlDNzIuMjYzNyAzNS4wMjEgNzIuMzQ1IDM1IDcyLjQyNzcgMzVDNzIuNTEwNSAzNSA3Mi41OTE4IDM1LjAyMSA3Mi42NjQzIDM1LjA2MDlMODguNDg3MiA0NC4wMzk1Qzg4LjU1OTEgNDQuMDgwMSA4OC42MTg4IDQ0LjEzOTIgODguNjYgNDQuMjEwN0M4OC43MDEzIDQ0LjI4MjIgODguNzIyNyA0NC4zNjM1IDg4LjcyMTkgNDQuNDQ2Qzg4LjcyMjUgNDQuNTI4NSA4OC43MDEgNDQuNjA5NyA4OC42NTk4IDQ0LjY4MTJDODguNjE4NSA0NC43NTI2IDg4LjU1ODkgNDQuODExOCA4OC40ODcyIDQ0Ljg1MjVMNzIuNzcxNCA1My43NjgzQzcyLjY5NzIgNTMuODExNCA3Mi42MTMzIDUzLjgzNDkgNzIuNTI3NSA1My44MzY3IiBmaWxsPSJ3aGl0ZSIvPgo8cGF0aCBvcGFjaXR5PSIwLjciIGQ9Ik03MC4yNTUzIDc1LjY1MTdDNzAuMTcxIDc1LjY1MzUgNzAuMDg3OCA3NS42MzE3IDcwLjAxNTEgNzUuNTg4OEw1NC4yNDU4IDY2LjY0MTdDNTQuMTcxNSA2Ni42MDI0IDU0LjEwOTUgNjYuNTQzNiA1NC4wNjYxIDY2LjQ3MTZDNTQuMDIyOCA2Ni4zOTk3IDU0IDY2LjMxNzMgNTQgNjYuMjMzM1Y0OC4yNzhDNTQgNDguMTA4IDU0LjA5MjQgNDcuOTU0NiA1NC4yNDM5IDQ3Ljg2OTZDNTQuMzE3MiA0Ny44MjcxIDU0LjQwMDQgNDcuODA0NyA1NC40ODUxIDQ3LjgwNDdDNTQuNTY5NyA0Ny44MDQ3IDU0LjY1MjkgNDcuODI3MSA1NC43MjYyIDQ3Ljg2OTZMNzAuNDkzNyA1Ni44MTMxQzcwLjU2NDIgNTYuODU2NSA3MC42MjI1IDU2LjkxNyA3MC42NjMyIDU2Ljk4OTFDNzAuNzAzOSA1Ny4wNjEyIDcwLjcyNTcgNTcuMTQyNCA3MC43MjY1IDU3LjIyNTFWNzUuMTgwNUM3MC43MjU5IDc1LjI2MjggNzAuNzA0MiA3NS4zNDM2IDcwLjY2MzUgNzUuNDE1MUM3MC42MjI3IDc1LjQ4NjYgNzAuNTY0MiA3NS41NDY0IDcwLjQ5MzcgNzUuNTg4OEM3MC40MjA2IDc1LjYyOTEgNzAuMzM4NyA3NS42NTA3IDcwLjI1NTMgNzUuNjUxNyIgZmlsbD0id2hpdGUiLz4KPHBhdGggb3BhY2l0eT0iMC40IiBkPSJNNzQuNzE5OCA3NS42NTExQzc0LjYzMzMgNzUuNjUxMiA3NC41NDgyIDc1LjYyOTYgNzQuNDcyMiA3NS41ODgzQzc0LjQwMTYgNzUuNTQ2MSA3NC4zNDMyIDc1LjQ4NjIgNzQuMzAyNyA3NS40MTQ3Qzc0LjI2MjMgNzUuMzQzMSA3NC4yNDExIDc1LjI2MjIgNzQuMjQxMiA3NS4xOFY1Ny4zMzczQzc0LjI0MTIgNTcuMTcxIDc0LjMzMzYgNTcuMDE1OCA3NC40NzIyIDU2LjkyOUw5MC4yMzk3IDQ3Ljk4NTVDOTAuMzExOSA0Ny45NDM4IDkwLjM5MzggNDcuOTIxOSA5MC40NzcxIDQ3LjkyMTlDOTAuNTYwNSA0Ny45MjE5IDkwLjY0MjQgNDcuOTQzOCA5MC43MTQ2IDQ3Ljk4NTVDOTAuNzg3NiA0OC4wMjU1IDkwLjg0ODUgNDguMDg0MiA5MC44OTExIDQ4LjE1NTdDOTAuOTMzNyA0OC4yMjcyIDkwLjk1NjMgNDguMzA4OCA5MC45NTY2IDQ4LjM5MlY2Ni4yMzI4QzkwLjk1NyA2Ni4zMTY0IDkwLjkzNDcgNjYuMzk4NSA5MC44OTIxIDY2LjQ3MDRDOTAuODQ5NSA2Ni41NDI0IDkwLjc4ODEgNjYuNjAxNCA5MC43MTQ2IDY2LjY0MTFMNzQuOTUyNiA3NS41ODgzQzc0Ljg4MjUgNzUuNjMwNyA3NC44MDE4IDc1LjY1MjUgNzQuNzE5OCA3NS42NTExIiBmaWxsPSJ3aGl0ZSIvPgo8ZGVmcz4KPGxpbmVhckdyYWRpZW50IGlkPSJwYWludDBfbGluZWFyXzY4N18zNDU0IiB4MT0iMTYxIiB5MT0iMTgwIiB4Mj0iMy41OTI4NGUtMDciIHkyPSI0Ljk5OTk4IiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+CjxzdG9wLz4KPHN0b3Agb2Zmc2V0PSIxIiBzdG9wLWNvbG9yPSIjNTk1NjU2Ii8+CjwvbGluZWFyR3JhZGllbnQ+CjxjbGlwUGF0aCBpZD0iY2xpcDBfNjg3XzM0NTQiPgo8cmVjdCB3aWR0aD0iOTQiIGhlaWdodD0iOTQiIGZpbGw9IndoaXRlIiB0cmFuc2Zvcm09InRyYW5zbGF0ZSgyNSAyNSkiLz4KPC9jbGlwUGF0aD4KPC9kZWZzPgo8L3N2Zz4K
-    keysOrder: [["apiVersion"], ["appVersion"], ["kind"], ["metadata"], ["metadata", "name"], ["spec", "external"], ["spec", "externalMethod"], ["spec", "externalPorts"], ["spec", "externalAllowICMP"], ["spec", "runStrategy"], ["spec", "instanceType"], ["spec", "instanceProfile"], ["spec", "disks"], ["spec", "networks"], ["spec", "subnets"], ["spec", "gpus"], ["spec", "cpuModel"], ["spec", "resources"], ["spec", "sshKeys"], ["spec", "cloudInit"], ["spec", "cloudInitSeed"]]
+    keysOrder: [["apiVersion"], ["appVersion"], ["kind"], ["metadata"], ["metadata", "name"], ["spec", "external"], ["spec", "externalMethod"], ["spec", "externalPorts"], ["spec", "externalAllowICMP"], ["spec", "runStrategy"], ["spec", "instanceType"], ["spec", "instanceProfile"], ["spec", "disks"], ["spec", "networks"], ["spec", "subnets"], ["spec", "gpus"], ["spec", "cpuModel"], ["spec", "firmware"], ["spec", "resources"], ["spec", "sshKeys"], ["spec", "cloudInit"], ["spec", "netplanDhcp"], ["spec", "cloudInitSeed"]]
   secrets:
     exclude: []
     include: []
diff --git a/packages/system/vm-instance-rd/tests/readiness_gate_test.yaml b/packages/system/vm-instance-rd/tests/readiness_gate_test.yaml
new file mode 100644
index 0000000000..ce5f39206f
--- /dev/null
+++ b/packages/system/vm-instance-rd/tests/readiness_gate_test.yaml
@@ -0,0 +1,33 @@
+suite: vm-instance ApplicationDefinition readiness gate
+templates:
+  - templates/cozyrd.yaml
+
+# A VMInstance is served as a Flux HelmRelease that renders a KubeVirt
+# VirtualMachine. From cozystack v1.5.0 (helm-controller v1.4.3 to v1.5.0) the
+# generated release is health-assessed by the kstatus poller, whose generation
+# check (checkGeneration in fluxcd/cli-utils pkg/kstatus/status/generic.go)
+# returns InProgress for any object whose status.observedGeneration trails
+# metadata.generation. vm-instance sets no healthCheckExprs, so that check is
+# what decides. KubeVirt legitimately runs a VirtualMachine with
+# observedGeneration behind generation (a template change pending a restart, a
+# stopped VM, or kubevirt/kubevirt#18700), so a healthy VM is read as
+# permanently InProgress and the release never converges. Disabling the wait
+# restores the pre-1.5.0 behaviour: the release settles once the manifests are
+# applied and VM health is observed on the VirtualMachine itself, not on the
+# HelmRelease.
+tests:
+  - it: renders the vm-instance ApplicationDefinition
+    asserts:
+      - containsDocument:
+          apiVersion: cozystack.io/v1alpha1
+          kind: ApplicationDefinition
+          name: vm-instance
+
+  - it: disables the helm-controller readiness wait for the VMInstance release
+    documentSelector:
+      path: metadata.name
+      value: vm-instance
+    asserts:
+      - equal:
+          path: metadata.annotations["release.cozystack.io/helm-install-disable-wait"]
+          value: "true"
diff --git a/packages/system/vsnap-crd/Makefile b/packages/system/vsnap-crd/Makefile
index 005eefbd00..51838b2063 100644
--- a/packages/system/vsnap-crd/Makefile
+++ b/packages/system/vsnap-crd/Makefile
@@ -3,9 +3,23 @@ export NAMESPACE=cozy-$(NAME)
 
 include ../../../hack/package.mk
 
+test:
+	helm unittest .
+
+# Stamp helm.sh/resource-policy: keep on every CustomResourceDefinition so a
+# chart uninstall never garbage-collects the CRDs and, with them, every
+# VolumeSnapshot and VolumeSnapshotContent in the cluster — the objects that
+# hold the only reference to a snapshot on the storage backend.
+# The stamp goes into the CRD's existing metadata.annotations block; a CRD that
+# arrives without one is skipped, and the chart's helm-unittest suite is what
+# catches that.
 update:
 	rm -rf templates
 	mkdir templates
 	wget -O ./templates/volumesnapshotclasses.yaml https://raw.githubusercontent.com/kubernetes-csi/external-snapshotter/refs/tags/v8.3.0/client/config/crd/snapshot.storage.k8s.io_volumesnapshotclasses.yaml
 	wget -O ./templates/volumesnapshotcontents.yaml https://raw.githubusercontent.com/kubernetes-csi/external-snapshotter/refs/tags/v8.3.0/client/config/crd/snapshot.storage.k8s.io_volumesnapshotcontents.yaml
 	wget -O ./templates/volumesnapshots.yaml https://raw.githubusercontent.com/kubernetes-csi/external-snapshotter/refs/tags/v8.3.0/client/config/crd/snapshot.storage.k8s.io_volumesnapshots.yaml
+	@set -e; tmp=$$(mktemp); for f in ./templates/*.yaml; do \
+	  awk '/^    helm.sh\/resource-policy: keep$$/{next} /^kind: /{kind=$$2} /^  annotations:$$/ && kind=="CustomResourceDefinition"{print; print "    helm.sh/resource-policy: keep"; next} {print}' "$$f" > "$$tmp"; \
+	  cat "$$tmp" > "$$f"; \
+	done; rm -f "$$tmp"
diff --git a/packages/system/vsnap-crd/templates/volumesnapshotclasses.yaml b/packages/system/vsnap-crd/templates/volumesnapshotclasses.yaml
index 8164952a42..9b33a1c65b 100644
--- a/packages/system/vsnap-crd/templates/volumesnapshotclasses.yaml
+++ b/packages/system/vsnap-crd/templates/volumesnapshotclasses.yaml
@@ -3,6 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
+    helm.sh/resource-policy: keep
     api-approved.kubernetes.io: "https://github.com/kubernetes-csi/external-snapshotter/pull/814"
     controller-gen.kubebuilder.io/version: v0.15.0
   name: volumesnapshotclasses.snapshot.storage.k8s.io
diff --git a/packages/system/vsnap-crd/templates/volumesnapshotcontents.yaml b/packages/system/vsnap-crd/templates/volumesnapshotcontents.yaml
index cd0c879fc4..f8ddcbe075 100644
--- a/packages/system/vsnap-crd/templates/volumesnapshotcontents.yaml
+++ b/packages/system/vsnap-crd/templates/volumesnapshotcontents.yaml
@@ -3,6 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
+    helm.sh/resource-policy: keep
     controller-gen.kubebuilder.io/version: v0.15.0
     api-approved.kubernetes.io: "https://github.com/kubernetes-csi/external-snapshotter/pull/955"
   name: volumesnapshotcontents.snapshot.storage.k8s.io
diff --git a/packages/system/vsnap-crd/templates/volumesnapshots.yaml b/packages/system/vsnap-crd/templates/volumesnapshots.yaml
index 6b96d7082f..2886b11899 100644
--- a/packages/system/vsnap-crd/templates/volumesnapshots.yaml
+++ b/packages/system/vsnap-crd/templates/volumesnapshots.yaml
@@ -3,6 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
+    helm.sh/resource-policy: keep
     controller-gen.kubebuilder.io/version: v0.15.0
     api-approved.kubernetes.io: "https://github.com/kubernetes-csi/external-snapshotter/pull/814"
   name: volumesnapshots.snapshot.storage.k8s.io
diff --git a/packages/system/vsnap-crd/tests/resource_policy_test.yaml b/packages/system/vsnap-crd/tests/resource_policy_test.yaml
new file mode 100644
index 0000000000..87c522c2a3
--- /dev/null
+++ b/packages/system/vsnap-crd/tests/resource_policy_test.yaml
@@ -0,0 +1,57 @@
+# The tenant addon HelmRelease that ships this chart remediates a failed
+# install by uninstalling the release, and an uninstall deletes whatever the
+# chart rendered. Deleting a CRD makes the API server garbage-collect every
+# custom resource of that kind, so an unannotated CRD here costs the cluster
+# every VolumeSnapshot it holds — the objects that carry the only reference to
+# a snapshot on the storage backend.
+#
+# The first case scopes to no template at all, so it holds every document the
+# chart renders, including a CRD that arrives in a file `make update` starts
+# fetching later. The named cases below pin which CRD each file carries, so an
+# assertion cannot pass against a document it was not meant to inspect.
+suite: volumesnapshot CRDs survive a release uninstall
+tests:
+  - it: annotates every CustomResourceDefinition the chart renders
+    asserts:
+      - equal:
+          path: kind
+          value: CustomResourceDefinition
+      - equal:
+          path: metadata.annotations["helm.sh/resource-policy"]
+          value: keep
+
+  - it: keeps the VolumeSnapshotClass CRD
+    template: templates/volumesnapshotclasses.yaml
+    asserts:
+      - hasDocuments:
+          count: 1
+      - equal:
+          path: metadata.name
+          value: volumesnapshotclasses.snapshot.storage.k8s.io
+      - equal:
+          path: metadata.annotations["helm.sh/resource-policy"]
+          value: keep
+
+  - it: keeps the VolumeSnapshotContent CRD
+    template: templates/volumesnapshotcontents.yaml
+    asserts:
+      - hasDocuments:
+          count: 1
+      - equal:
+          path: metadata.name
+          value: volumesnapshotcontents.snapshot.storage.k8s.io
+      - equal:
+          path: metadata.annotations["helm.sh/resource-policy"]
+          value: keep
+
+  - it: keeps the VolumeSnapshot CRD
+    template: templates/volumesnapshots.yaml
+    asserts:
+      - hasDocuments:
+          count: 1
+      - equal:
+          path: metadata.name
+          value: volumesnapshots.snapshot.storage.k8s.io
+      - equal:
+          path: metadata.annotations["helm.sh/resource-policy"]
+          value: keep
diff --git a/packages/tests/cozy-lib-tests/templates/tests/cozyconfig.yaml b/packages/tests/cozy-lib-tests/templates/tests/cozyconfig.yaml
new file mode 100644
index 0000000000..dbcbb0f071
--- /dev/null
+++ b/packages/tests/cozy-lib-tests/templates/tests/cozyconfig.yaml
@@ -0,0 +1,18 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ .Release.Name }}-cozyconfig
+data:
+  root-host: {{ include "cozy-lib.root-host" . | quote }}
+  bundle-name: {{ include "cozy-lib.bundle-name" . | quote }}
+  images-registry: {{ include "cozy-lib.images-registry" . | quote }}
+  ipv4-cluster-cidr: {{ include "cozy-lib.ipv4-cluster-cidr" . | quote }}
+  ipv4-service-cidr: {{ include "cozy-lib.ipv4-service-cidr" . | quote }}
+  ipv4-join-cidr: {{ include "cozy-lib.ipv4-join-cidr" . | quote }}
+  scheduling: {{ include "cozy-lib.scheduling" . | quote }}
+  branding: {{ include "cozy-lib.branding" . | quote }}
+  ns-host: {{ include "cozy-lib.ns-host" . | quote }}
+  ns-etcd: {{ include "cozy-lib.ns-etcd" . | quote }}
+  ns-ingress: {{ include "cozy-lib.ns-ingress" . | quote }}
+  ns-monitoring: {{ include "cozy-lib.ns-monitoring" . | quote }}
+  ns-seaweedfs: {{ include "cozy-lib.ns-seaweedfs" . | quote }}
diff --git a/packages/tests/cozy-lib-tests/templates/tests/keda-scaledobject-arg.yaml b/packages/tests/cozy-lib-tests/templates/tests/keda-scaledobject-arg.yaml
new file mode 100644
index 0000000000..f3edfde7b5
--- /dev/null
+++ b/packages/tests/cozy-lib-tests/templates/tests/keda-scaledobject-arg.yaml
@@ -0,0 +1,22 @@
+{{- if or .Values.omit .Values.badRef .Values.badMin .Values.negMin .Values.negFracMin .Values.wantAnnotations .Values.wantPausedMerge -}}
+{{- /* Build a fully-valid argument dict, then either drop exactly one required
+       field named by .Values.omit, replace scaleTargetRef with a non-map
+       (.Values.badRef), set a non-numeric minReplicaCount (.Values.badMin), set a
+       negative minReplicaCount, whole (.Values.negMin) or fractional
+       (.Values.negFracMin), attach an extra annotation
+       (.Values.wantAnnotations), or attach an annotation AND pause
+       (.Values.wantPausedMerge) so the caller annotation and the pause pair land in
+       one merge, to exercise each guard / merge path in isolation. */ -}}
+{{- $ref := dict "apiVersion" "postgresql.cnpg.io/v1" "kind" "Cluster" "name" "db" -}}
+{{- if eq .Values.omit "kind" }}{{- $_ := unset $ref "kind" }}{{- end -}}
+{{- if eq .Values.omit "apiVersion" }}{{- $_ := unset $ref "apiVersion" }}{{- end -}}
+{{- $arg := dict "name" "db" "scaleTargetRef" $ref "minReplicaCount" 2 "maxReplicaCount" 6 "serverAddress" "http://vmselect.example.svc:8481/select/0/prometheus" "query" "sum(x) + 150" "threshold" "150" -}}
+{{- if .Values.omit }}{{- $arg = unset $arg .Values.omit -}}{{- end -}}
+{{- if .Values.badRef }}{{- $arg = set $arg "scaleTargetRef" "not-a-map" -}}{{- end -}}
+{{- if .Values.badMin }}{{- $arg = set $arg "minReplicaCount" "two" -}}{{- end -}}
+{{- if .Values.negMin }}{{- $arg = set $arg "minReplicaCount" -1 -}}{{- end -}}
+{{- if .Values.negFracMin }}{{- $arg = set $arg "minReplicaCount" -0.5 -}}{{- end -}}
+{{- if .Values.wantAnnotations }}{{- $arg = set $arg "annotations" (dict "cozystack.io/example" "hi") -}}{{- end -}}
+{{- if .Values.wantPausedMerge }}{{- $arg = set $arg "annotations" (dict "cozystack.io/example" "hi" "autoscaling.keda.sh/paused-scale-in" "false") -}}{{- $arg = set $arg "paused" true -}}{{- end -}}
+{{ include "cozy-lib.keda.scaledObject" $arg }}
+{{- end -}}
diff --git a/packages/tests/cozy-lib-tests/templates/tests/keda-scaledobject-bounds.yaml b/packages/tests/cozy-lib-tests/templates/tests/keda-scaledobject-bounds.yaml
new file mode 100644
index 0000000000..df598544c7
--- /dev/null
+++ b/packages/tests/cozy-lib-tests/templates/tests/keda-scaledobject-bounds.yaml
@@ -0,0 +1,11 @@
+{{- if .Values.useBounds -}}
+{{ include "cozy-lib.keda.scaledObject" (dict
+     "name" .Release.Name
+     "scaleTargetRef" (dict "apiVersion" "postgresql.cnpg.io/v1" "kind" "Cluster" "name" .Release.Name)
+     "minReplicaCount" 6
+     "maxReplicaCount" 3
+     "serverAddress" "http://vmselect.example.svc:8481/select/0/prometheus"
+     "query" "sum(x) + 150"
+     "threshold" "150"
+) }}
+{{- end -}}
diff --git a/packages/tests/cozy-lib-tests/templates/tests/keda-scaledobject-nondict.yaml b/packages/tests/cozy-lib-tests/templates/tests/keda-scaledobject-nondict.yaml
new file mode 100644
index 0000000000..bbe5661d5f
--- /dev/null
+++ b/packages/tests/cozy-lib-tests/templates/tests/keda-scaledobject-nondict.yaml
@@ -0,0 +1,3 @@
+{{- if .Values.nonDict -}}
+{{ include "cozy-lib.keda.scaledObject" "not-a-dict" }}
+{{- end -}}
diff --git a/packages/tests/cozy-lib-tests/templates/tests/keda-scaledobject-params.yaml b/packages/tests/cozy-lib-tests/templates/tests/keda-scaledobject-params.yaml
new file mode 100644
index 0000000000..1445794173
--- /dev/null
+++ b/packages/tests/cozy-lib-tests/templates/tests/keda-scaledobject-params.yaml
@@ -0,0 +1,10 @@
+{{- if .Values.useParams -}}
+{{ include "cozy-lib.keda.scaledObject" (dict
+     "name" .Release.Name
+     "minReplicaCount" 3
+     "maxReplicaCount" 6
+     "serverAddress" "http://vmselect.example.svc:8481/select/0/prometheus"
+     "query" "sum(x) + 150"
+     "threshold" "150"
+) }}
+{{- end -}}
diff --git a/packages/tests/cozy-lib-tests/templates/tests/keda-scaledobject.yaml b/packages/tests/cozy-lib-tests/templates/tests/keda-scaledobject.yaml
new file mode 100644
index 0000000000..4dbc789bf2
--- /dev/null
+++ b/packages/tests/cozy-lib-tests/templates/tests/keda-scaledobject.yaml
@@ -0,0 +1,15 @@
+{{- if .Values.render -}}
+{{ include "cozy-lib.keda.scaledObject" (dict
+     "name" .Release.Name
+     "namespace" .Release.Namespace
+     "scaleTargetRef" (dict "apiVersion" "postgresql.cnpg.io/v1" "kind" "Cluster" "name" .Release.Name)
+     "minReplicaCount" .Values.minReplicaCount
+     "maxReplicaCount" .Values.maxReplicaCount
+     "serverAddress" .Values.serverAddress
+     "query" .Values.query
+     "threshold" .Values.threshold
+     "behavior" .Values.behavior
+     "paused" .Values.paused
+     "labels" (dict "app.kubernetes.io/instance" .Release.Name)
+) }}
+{{- end -}}
diff --git a/packages/tests/cozy-lib-tests/templates/tests/ns-host-required.yaml b/packages/tests/cozy-lib-tests/templates/tests/ns-host-required.yaml
new file mode 100644
index 0000000000..2b73048330
--- /dev/null
+++ b/packages/tests/cozy-lib-tests/templates/tests/ns-host-required.yaml
@@ -0,0 +1,6 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ .Release.Name }}-ns-host-required
+data:
+  host: {{ include "cozy-lib.ns-host-required" . | quote }}
diff --git a/packages/tests/cozy-lib-tests/templates/tests/resources-tofloat.yaml b/packages/tests/cozy-lib-tests/templates/tests/resources-tofloat.yaml
new file mode 100644
index 0000000000..e427f18f5e
--- /dev/null
+++ b/packages/tests/cozy-lib-tests/templates/tests/resources-tofloat.yaml
@@ -0,0 +1,8 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ .Release.Name }}-tofloat
+data:
+{{- range $name, $quantity := .Values.quantities }}
+  {{ $name }}: {{ include "cozy-lib.resources.toFloat" $quantity | quote }}
+{{- end }}
diff --git a/packages/tests/cozy-lib-tests/templates/tests/resources.yaml b/packages/tests/cozy-lib-tests/templates/tests/resources.yaml
new file mode 100644
index 0000000000..327a3a535a
--- /dev/null
+++ b/packages/tests/cozy-lib-tests/templates/tests/resources.yaml
@@ -0,0 +1,11 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: {{ .Release.Name }}-resources
+spec:
+  containers:
+  - name: main
+    image: busybox
+    {{- with .Values.resources }}
+    resources: {{- include "cozy-lib.resources.sanitize" (list . $) | nindent 6 }}
+    {{- end }}
diff --git a/packages/tests/cozy-lib-tests/templates/tests/tls-cacert-nondict.yaml b/packages/tests/cozy-lib-tests/templates/tests/tls-cacert-nondict.yaml
new file mode 100644
index 0000000000..42452fd5ea
--- /dev/null
+++ b/packages/tests/cozy-lib-tests/templates/tests/tls-cacert-nondict.yaml
@@ -0,0 +1,3 @@
+{{- if .Values.nonDict -}}
+{{ include "cozy-lib.tls.caCertSecret" "not-a-dict" }}
+{{- end -}}
diff --git a/packages/tests/cozy-lib-tests/templates/tests/tls-cacert-params.yaml b/packages/tests/cozy-lib-tests/templates/tests/tls-cacert-params.yaml
new file mode 100644
index 0000000000..4ba0a0ef31
--- /dev/null
+++ b/packages/tests/cozy-lib-tests/templates/tests/tls-cacert-params.yaml
@@ -0,0 +1,7 @@
+{{- if .Values.useParams -}}
+{{ include "cozy-lib.tls.caCertSecret" (dict
+     "name" .Values.name
+     "namespace" .Values.namespace
+     "caCert" .Values.caCert
+) }}
+{{- end -}}
diff --git a/packages/tests/cozy-lib-tests/templates/tests/tls-cacert.yaml b/packages/tests/cozy-lib-tests/templates/tests/tls-cacert.yaml
new file mode 100644
index 0000000000..114cb72275
--- /dev/null
+++ b/packages/tests/cozy-lib-tests/templates/tests/tls-cacert.yaml
@@ -0,0 +1,7 @@
+{{ include "cozy-lib.tls.caCertSecret" (dict
+     "name" (printf "%s.tenant-ca" .Release.Name)
+     "namespace" .Release.Namespace
+     "caCert" .Values.caCert
+     "labels" (merge (dict "app.kubernetes.io/instance" .Release.Name) (default (dict) .Values.callerLabels))
+     "annotations" (dict "cozystack.io/example" "yes")
+) }}
diff --git a/packages/tests/cozy-lib-tests/templates/tests/tls-validatecacert.yaml b/packages/tests/cozy-lib-tests/templates/tests/tls-validatecacert.yaml
new file mode 100644
index 0000000000..88e4040456
--- /dev/null
+++ b/packages/tests/cozy-lib-tests/templates/tests/tls-validatecacert.yaml
@@ -0,0 +1,13 @@
+{{- /* Probe for cozy-lib.tls.validateCACert: validates .Values.caCert under
+       the caller-supplied .Values.field, then renders a marker document so a
+       passing case has something to assert on — the helper itself emits
+       nothing. */ -}}
+{{- if .Values.nonDict -}}
+{{ include "cozy-lib.tls.validateCACert" "not-a-dict" }}
+{{- else -}}
+{{- include "cozy-lib.tls.validateCACert" (dict "caCert" .Values.caCert "field" .Values.field) -}}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: validatecacert-probe
+{{- end -}}
diff --git a/packages/tests/cozy-lib-tests/tests/cozyconfig_test.yaml b/packages/tests/cozy-lib-tests/tests/cozyconfig_test.yaml
new file mode 100644
index 0000000000..85dbb32177
--- /dev/null
+++ b/packages/tests/cozy-lib-tests/tests/cozyconfig_test.yaml
@@ -0,0 +1,81 @@
+# ./tests/cozyconfig_test.yaml
+suite: cozyconfig helpers survive an uninjected _cluster and _namespace
+
+templates:
+  - templates/tests/cozyconfig.yaml
+
+# `_cluster` and `_namespace` are injected by the platform through valuesFrom on
+# the cozystack-values Secret. A chart rendered on its own therefore has neither,
+# which is the state of `helm lint`, a plain `helm template`, and any suite that
+# does not set them. These helpers must degrade to their empty defaults there
+# rather than abort the render, because every consumer of this library inherits
+# whatever they do.
+
+tests:
+  - it: returns empty defaults when the platform injected nothing
+    # No `set:` at all: this is the uninjected state, and it needs no mocking.
+    asserts:
+      - equal: {path: 'data["root-host"]', value: ""}
+      - equal: {path: 'data["bundle-name"]', value: ""}
+      - equal: {path: 'data["images-registry"]', value: ""}
+      - equal: {path: 'data["ipv4-cluster-cidr"]', value: ""}
+      - equal: {path: 'data["ipv4-service-cidr"]', value: ""}
+      - equal: {path: 'data["ipv4-join-cidr"]', value: ""}
+      - equal: {path: 'data["scheduling"]', value: ""}
+      - equal: {path: 'data["branding"]', value: ""}
+      - equal: {path: 'data["ns-host"]', value: ""}
+      - equal: {path: 'data["ns-etcd"]', value: ""}
+      - equal: {path: 'data["ns-ingress"]', value: ""}
+      - equal: {path: 'data["ns-monitoring"]', value: ""}
+      - equal: {path: 'data["ns-seaweedfs"]', value: ""}
+
+  - it: returns the injected values unchanged when the platform did inject them
+    # The other half of the guard: making the helpers survive an absent map must
+    # not change what they return when the map is present.
+    set:
+      _cluster:
+        root-host: example.com
+        bundle-name: paas-full
+        images-registry: registry.example.com
+        ipv4-cluster-cidr: 10.244.0.0/16
+        ipv4-service-cidr: 10.96.0.0/16
+        ipv4-join-cidr: 100.64.0.0/16
+        scheduling:
+          nodeSelector:
+            node-role.kubernetes.io/worker: ""
+        branding:
+          logo:
+            light: /logos/light.svg
+      _namespace:
+        host: tenant.example.com
+        etcd: etcd-ns
+        ingress: ingress-ns
+        monitoring: monitoring-ns
+        seaweedfs: seaweedfs-ns
+    asserts:
+      - equal: {path: 'data["root-host"]', value: "example.com"}
+      - equal: {path: 'data["bundle-name"]', value: "paas-full"}
+      - equal: {path: 'data["images-registry"]', value: "registry.example.com"}
+      - equal: {path: 'data["ipv4-cluster-cidr"]', value: "10.244.0.0/16"}
+      - equal: {path: 'data["ipv4-service-cidr"]', value: "10.96.0.0/16"}
+      - equal: {path: 'data["ipv4-join-cidr"]', value: "100.64.0.0/16"}
+      - equal: {path: 'data["ns-host"]', value: "tenant.example.com"}
+      - equal: {path: 'data["ns-etcd"]', value: "etcd-ns"}
+      - equal: {path: 'data["ns-ingress"]', value: "ingress-ns"}
+      - equal: {path: 'data["ns-monitoring"]', value: "monitoring-ns"}
+      - equal: {path: 'data["ns-seaweedfs"]', value: "seaweedfs-ns"}
+      # scheduling and branding are the two helpers whose body was rewritten
+      # rather than wrapped, so they need the present-map half most. Their
+      # value is a whole YAML document, and it is pinned as one: a substring
+      # match here would survive the loss of the `toYaml` that produces it,
+      # because the key name also appears in Go's default map formatting.
+      - equal:
+          path: 'data["scheduling"]'
+          value: |-
+            nodeSelector:
+              node-role.kubernetes.io/worker: ""
+      - equal:
+          path: 'data["branding"]'
+          value: |-
+            logo:
+              light: /logos/light.svg
diff --git a/packages/tests/cozy-lib-tests/tests/keda_scaledobject_test.yaml b/packages/tests/cozy-lib-tests/tests/keda_scaledobject_test.yaml
new file mode 100644
index 0000000000..9a76c04b95
--- /dev/null
+++ b/packages/tests/cozy-lib-tests/tests/keda_scaledobject_test.yaml
@@ -0,0 +1,244 @@
+# ./tests/keda_scaledobject_test.yaml
+suite: keda scaledObject helper
+
+templates:
+  - templates/tests/keda-scaledobject.yaml
+  - templates/tests/keda-scaledobject-nondict.yaml
+  - templates/tests/keda-scaledobject-params.yaml
+  - templates/tests/keda-scaledobject-bounds.yaml
+  - templates/tests/keda-scaledobject-arg.yaml
+
+release:
+  name: postgres-db
+  namespace: tenant-acme
+  revision: 1
+  isUpgrade: false
+
+tests:
+  - it: renders a KEDA ScaledObject with the given target, bounds and prometheus trigger
+    templates:
+      - templates/tests/keda-scaledobject.yaml
+    values:
+      - keda_scaledobject_values.yaml
+    asserts:
+      - hasDocuments:
+          count: 1
+      - isKind:
+          of: ScaledObject
+      - equal:
+          path: apiVersion
+          value: keda.sh/v1alpha1
+      - equal:
+          path: metadata.name
+          value: postgres-db
+      - equal:
+          path: metadata.namespace
+          value: tenant-acme
+      - equal:
+          path: metadata.labels["app.kubernetes.io/instance"]
+          value: postgres-db
+      - equal:
+          path: spec.scaleTargetRef.apiVersion
+          value: postgresql.cnpg.io/v1
+      - equal:
+          path: spec.scaleTargetRef.kind
+          value: Cluster
+      - equal:
+          path: spec.scaleTargetRef.name
+          value: postgres-db
+      - equal:
+          path: spec.minReplicaCount
+          value: 3
+      - equal:
+          path: spec.maxReplicaCount
+          value: 6
+      - equal:
+          path: spec.triggers[0].type
+          value: prometheus
+      # AverageValue is load-bearing: desired = ceil(query / threshold) only holds
+      # for an AverageValue external metric. Pinned explicitly, not left to KEDA's default.
+      - equal:
+          path: spec.triggers[0].metricType
+          value: AverageValue
+      - equal:
+          path: spec.triggers[0].metadata.serverAddress
+          value: http://vmselect-shortterm.tenant-root.svc:8481/select/0/prometheus
+      - equal:
+          path: spec.triggers[0].metadata.query
+          value: 'sum(cnpg_backends_total{state="active"}) + 150'
+      - equal:
+          path: spec.triggers[0].metadata.threshold
+          value: "150"
+      # Fail-safe: ignoreNullValues MUST be "false" so an empty query errors (HPA holds)
+      # instead of KEDA's default of reading empty as 0 (which scales down to the floor).
+      - equal:
+          path: spec.triggers[0].metadata.ignoreNullValues
+          value: "false"
+      # scale-down pacing is carried through verbatim into the HPA behavior
+      - equal:
+          path: spec.advanced.horizontalPodAutoscalerConfig.behavior.scaleDown.policies[0].type
+          value: Pods
+      - equal:
+          path: spec.advanced.horizontalPodAutoscalerConfig.behavior.scaleDown.policies[0].value
+          value: 1
+      # not paused by default (neither the unidirectional pair nor the full pause)
+      - notExists:
+          path: metadata.annotations["autoscaling.keda.sh/paused-scale-in"]
+      - notExists:
+          path: metadata.annotations["autoscaling.keda.sh/paused-scale-out"]
+      - notExists:
+          path: metadata.annotations["autoscaling.keda.sh/paused"]
+
+  - it: stamps the unidirectional pause pair in dry-run / recommendation mode
+    templates:
+      - templates/tests/keda-scaledobject.yaml
+    values:
+      - keda_scaledobject_values.yaml
+    set:
+      paused: true
+    asserts:
+      # both directions paused → KEDA keeps the HPA and keeps serving the metric
+      # (desired frozen to current), actuates neither
+      - equal:
+          path: metadata.annotations["autoscaling.keda.sh/paused-scale-in"]
+          value: "true"
+      - equal:
+          path: metadata.annotations["autoscaling.keda.sh/paused-scale-out"]
+          value: "true"
+      # never the full paused annotation, which in KEDA 2.20.2 deletes the HPA
+      - notExists:
+          path: metadata.annotations["autoscaling.keda.sh/paused"]
+
+  - it: does not pause when paused is the string "false" (coerced, not truthiness-tested)
+    templates:
+      - templates/tests/keda-scaledobject.yaml
+    values:
+      - keda_scaledobject_values.yaml
+    set:
+      paused: "false"
+    asserts:
+      - notExists:
+          path: metadata.annotations["autoscaling.keda.sh/paused-scale-in"]
+      - notExists:
+          path: metadata.annotations["autoscaling.keda.sh/paused-scale-out"]
+
+  - it: fails closed when the argument is not a dict
+    templates:
+      - templates/tests/keda-scaledobject-nondict.yaml
+    set:
+      nonDict: true
+    asserts:
+      - failedTemplate:
+          errorMessage: "cozy-lib.keda.scaledObject: expected a single dict argument"
+
+  - it: fails closed when scaleTargetRef is missing
+    templates:
+      - templates/tests/keda-scaledobject-params.yaml
+    set:
+      useParams: true
+    asserts:
+      - failedTemplate:
+          errorMessage: "cozy-lib.keda.scaledObject: scaleTargetRef.name is required"
+
+  - it: fails closed when maxReplicaCount is below minReplicaCount
+    templates:
+      - templates/tests/keda-scaledobject-bounds.yaml
+    set:
+      useBounds: true
+    asserts:
+      - failedTemplate:
+          errorMessage: "cozy-lib.keda.scaledObject: maxReplicaCount must be >= minReplicaCount"
+
+
+  # Remaining fail-closed guards (one required field dropped per case via the
+  # keda-scaledobject-arg fixture) so the helper's full rejection contract is
+  # executable-documented, not just sampled.
+  - it: fails closed when name is missing
+    templates: [templates/tests/keda-scaledobject-arg.yaml]
+    set: {omit: name}
+    asserts:
+      - failedTemplate: {errorMessage: "cozy-lib.keda.scaledObject: name is required"}
+  - it: fails closed when scaleTargetRef.kind is missing
+    templates: [templates/tests/keda-scaledobject-arg.yaml]
+    set: {omit: kind}
+    asserts:
+      - failedTemplate: {errorMessage: "cozy-lib.keda.scaledObject: scaleTargetRef.kind is required"}
+  - it: fails closed when scaleTargetRef.apiVersion is missing
+    templates: [templates/tests/keda-scaledobject-arg.yaml]
+    set: {omit: apiVersion}
+    asserts:
+      - failedTemplate: {errorMessage: "cozy-lib.keda.scaledObject: scaleTargetRef.apiVersion is required"}
+  - it: fails closed when query is missing
+    templates: [templates/tests/keda-scaledobject-arg.yaml]
+    set: {omit: query}
+    asserts:
+      - failedTemplate: {errorMessage: "cozy-lib.keda.scaledObject: query is required"}
+  - it: fails closed when threshold is missing
+    templates: [templates/tests/keda-scaledobject-arg.yaml]
+    set: {omit: threshold}
+    asserts:
+      - failedTemplate: {errorMessage: "cozy-lib.keda.scaledObject: threshold is required"}
+  - it: fails closed when serverAddress is missing
+    templates: [templates/tests/keda-scaledobject-arg.yaml]
+    set: {omit: serverAddress}
+    asserts:
+      - failedTemplate: {errorMessage: "cozy-lib.keda.scaledObject: serverAddress is required"}
+  - it: fails closed when minReplicaCount is missing
+    templates: [templates/tests/keda-scaledobject-arg.yaml]
+    set: {omit: minReplicaCount}
+    asserts:
+      - failedTemplate: {errorMessage: "cozy-lib.keda.scaledObject: minReplicaCount is required and must be a number"}
+  - it: fails closed when maxReplicaCount is missing
+    templates: [templates/tests/keda-scaledobject-arg.yaml]
+    set: {omit: maxReplicaCount}
+    asserts:
+      - failedTemplate: {errorMessage: "cozy-lib.keda.scaledObject: maxReplicaCount is required and must be a number"}
+  - it: fails closed when scaleTargetRef is not a dict
+    templates: [templates/tests/keda-scaledobject-arg.yaml]
+    set: {badRef: true}
+    asserts:
+      - failedTemplate: {errorMessage: "cozy-lib.keda.scaledObject: scaleTargetRef must be a dict"}
+  - it: fails closed when a bound is a non-numeric string
+    templates: [templates/tests/keda-scaledobject-arg.yaml]
+    set: {badMin: true}
+    asserts:
+      - failedTemplate: {errorMessage: "cozy-lib.keda.scaledObject: minReplicaCount is required and must be a number"}
+
+  - it: fails closed when minReplicaCount is negative
+    templates: [templates/tests/keda-scaledobject-arg.yaml]
+    set: {negMin: true}
+    asserts:
+      - failedTemplate: {errorMessage: "cozy-lib.keda.scaledObject: minReplicaCount must be >= 0"}
+
+  # a fractional negative like -0.5 truncates toward zero through `int`, so the guard
+  # must test the untruncated value or it would render a scale-to-zero-capable object
+  - it: fails closed when minReplicaCount is a fractional negative
+    templates: [templates/tests/keda-scaledobject-arg.yaml]
+    set: {negFracMin: true}
+    asserts:
+      - failedTemplate: {errorMessage: "cozy-lib.keda.scaledObject: minReplicaCount must be >= 0"}
+
+  - it: merges a caller-supplied annotation onto the ScaledObject
+    templates: [templates/tests/keda-scaledobject-arg.yaml]
+    set: {wantAnnotations: true}
+    asserts:
+      - equal:
+          path: metadata.annotations["cozystack.io/example"]
+          value: hi
+
+  # the pause pair is the merge destination, so it wins a key collision: the caller
+  # passes paused-scale-in="false" and a distinct key, and on the paused render the
+  # distinct key survives while the pause value overrides the caller's "false"
+  - it: merges a caller annotation under the pause pair and wins the collision when paused
+    templates: [templates/tests/keda-scaledobject-arg.yaml]
+    set: {wantPausedMerge: true}
+    asserts:
+      - equal:
+          path: metadata.annotations["cozystack.io/example"]
+          value: hi
+      - equal:
+          path: metadata.annotations["autoscaling.keda.sh/paused-scale-in"]
+          value: "true"
+      - equal:
+          path: metadata.annotations["autoscaling.keda.sh/paused-scale-out"]
+          value: "true"
diff --git a/packages/tests/cozy-lib-tests/tests/keda_scaledobject_values.yaml b/packages/tests/cozy-lib-tests/tests/keda_scaledobject_values.yaml
new file mode 100644
index 0000000000..51774b1159
--- /dev/null
+++ b/packages/tests/cozy-lib-tests/tests/keda_scaledobject_values.yaml
@@ -0,0 +1,14 @@
+render: true
+minReplicaCount: 3
+maxReplicaCount: 6
+serverAddress: http://vmselect-shortterm.tenant-root.svc:8481/select/0/prometheus
+query: 'sum(cnpg_backends_total{state="active"}) + 150'
+threshold: "150"
+paused: false
+behavior:
+  scaleDown:
+    stabilizationWindowSeconds: 1800
+    policies:
+      - type: Pods
+        value: 1
+        periodSeconds: 600
diff --git a/packages/tests/cozy-lib-tests/tests/ns_host_required_test.yaml b/packages/tests/cozy-lib-tests/tests/ns_host_required_test.yaml
new file mode 100644
index 0000000000..1f8e705b79
--- /dev/null
+++ b/packages/tests/cozy-lib-tests/tests/ns_host_required_test.yaml
@@ -0,0 +1,67 @@
+# ./tests/ns_host_required_test.yaml
+suite: cozy-lib.ns-host-required fails only on an empty apex without a host override
+
+templates:
+  - templates/tests/ns-host-required.yaml
+
+# ns-host-required returns the same apex as ns-host, but turns the one case that
+# used to compose a malformed "<sub>." hostname silently — apex empty and no
+# per-app host override — into an explicit render failure. Every other case must
+# behave exactly like ns-host, so the helper stays a drop-in for the apex source
+# at a hostname-emitting site.
+
+tests:
+  - it: returns the apex when _namespace.host is set
+    set:
+      _namespace:
+        host: tenant.example.com
+    asserts:
+      - equal: {path: 'data["host"]', value: "tenant.example.com"}
+
+  - it: returns the apex unchanged even when a host override is also set
+    # The override does not alter what the helper returns; callers apply the
+    # override themselves via `.Values.host | default (...)`.
+    set:
+      host: custom.example.com
+      _namespace:
+        host: tenant.example.com
+    asserts:
+      - equal: {path: 'data["host"]', value: "tenant.example.com"}
+
+  - it: does not fail on an empty apex when a host override is set
+    # Override present means the caller will not use the apex, so an empty apex
+    # is not a malformed-hostname risk and must not fail. _namespace is injected
+    # (empty host) so this case actually reaches the override check rather than
+    # passing through the absent-_namespace branch.
+    set:
+      host: custom.example.com
+      _namespace:
+        etcd: etcd-ns
+    asserts:
+      - equal: {path: 'data["host"]', value: ""}
+
+  - it: stays silent for a standalone render with no _namespace injected
+    # helm lint / helm template with no platform values: _namespace is absent by
+    # design, so the guard must not fire and the helper returns the empty apex.
+    asserts:
+      - equal: {path: 'data["host"]', value: ""}
+
+  - it: stays silent for a standalone render with an empty _namespace map
+    # Charts that declare `_namespace: {}` in values.yaml (e.g. system/monitoring,
+    # system/bucket) render standalone with an empty map, not an absent key. An
+    # empty map is falsy, so the guard must not fire there either.
+    set:
+      _namespace: {}
+    asserts:
+      - equal: {path: 'data["host"]', value: ""}
+
+  - it: fails when _namespace is injected but its host is empty and no override
+    # The real in-cluster misconfig: the platform injected _namespace (here with
+    # a sibling key present, no host), which previously composed a trailing-dot
+    # hostname silently; now it must fail with a clear message.
+    set:
+      _namespace:
+        etcd: etcd-ns
+    asserts:
+      - failedTemplate:
+          errorMessage: "the tenant apex (_namespace.host) is empty and this app sets no host override, so its ingress hostname would be malformed. Set tenant.spec.host on this tenant, inherit it from a parent that has host set, or set this app's host value."
diff --git a/packages/tests/cozy-lib-tests/tests/resources_test.yaml b/packages/tests/cozy-lib-tests/tests/resources_test.yaml
new file mode 100644
index 0000000000..411e9edf65
--- /dev/null
+++ b/packages/tests/cozy-lib-tests/tests/resources_test.yaml
@@ -0,0 +1,144 @@
+# ./tests/resources_test.yaml
+suite: resources sanitize helper
+
+templates:
+  - templates/tests/resources.yaml
+
+release:
+  name: myrelease
+  namespace: default
+
+tests:
+  # Regression guard for the VPA admission webhook, which rejects a CPU
+  # quantity finer than 1m ("minAllowed: CPU [62500u] must be a whole number
+  # of milli CPUs"). Before the fix, 250m / 4 rendered as "0.0625" and any
+  # chart feeding a sanitized CPU request to a VerticalPodAutoscaler was stuck
+  # in an UpgradeFailed/RollbackFailed loop on such a ratio.
+  - it: rounds the CPU request up to a whole milli-CPU on an indivisible ratio
+    set:
+      _cluster:
+        cpu-allocation-ratio: 4
+      resources:
+        cpu: 250m
+        memory: 256Mi
+    asserts:
+      - equal:
+          path: spec.containers[0].resources.requests.cpu
+          value: 63m
+      - equal:
+          path: spec.containers[0].resources.limits.cpu
+          value: 250m
+
+  - it: rounds up rather than down so the request never drops below the fraction
+    set:
+      _cluster:
+        cpu-allocation-ratio: 3
+      resources:
+        cpu: 1000m
+        memory: 256Mi
+    asserts:
+      # 1000m / 3 = 333.33...m
+      - equal:
+          path: spec.containers[0].resources.requests.cpu
+          value: 334m
+
+  # Extreme end of the arbitrary-ratio contract: 1m / 10000000 is 0.0000001m,
+  # which the exact-value branch would render as the raw float "1e-10", not a
+  # valid quantity. ceil() carries any positive sub-milli request to 1m, the
+  # smallest request that is both valid and non-zero.
+  - it: renders a positive request below 1m as 1m at an extreme ratio
+    set:
+      _cluster:
+        cpu-allocation-ratio: 10000000
+      resources:
+        cpu: 1m
+        memory: 256Mi
+    asserts:
+      - equal:
+          path: spec.containers[0].resources.requests.cpu
+          value: 1m
+      - equal:
+          path: spec.containers[0].resources.limits.cpu
+          value: 1m
+
+  - it: leaves a genuinely zero CPU request at zero
+    set:
+      _cluster:
+        cpu-allocation-ratio: 4
+      resources:
+        cpu: 0
+        memory: 256Mi
+    asserts:
+      - equal:
+          path: spec.containers[0].resources.requests.cpu
+          value: "0"
+
+  - it: keeps the rendering unchanged on the default ratio
+    set:
+      resources:
+        cpu: 250m
+        memory: 256Mi
+    asserts:
+      - equal:
+          path: spec.containers[0].resources.requests.cpu
+          value: "0.025"
+      - equal:
+          path: spec.containers[0].resources.limits.cpu
+          value: 250m
+
+  - it: keeps the rendering unchanged when a non-default ratio divides evenly
+    set:
+      _cluster:
+        cpu-allocation-ratio: 4
+      resources:
+        cpu: 1000m
+        memory: 256Mi
+    asserts:
+      # 1000m / 4 = 250m exactly, so no rounding and no re-formatting
+      - equal:
+          path: spec.containers[0].resources.requests.cpu
+          value: "0.25"
+
+  # The helper must not smooth the value before deciding whether it is already
+  # whole-milli. A tolerance of 1e-6 milli-CPU (the %.6f round-trip this fix
+  # originally carried) reads 100.0000004m as exact and renders it verbatim as
+  # "0.1000000004", the very quantity the webhook rejects.
+  - it: rounds up a value that is whole-milli only to within a tolerance
+    set:
+      _cluster:
+        cpu-allocation-ratio: 1
+      resources:
+        cpu: 100.0000004m
+        memory: 256Mi
+    asserts:
+      - equal:
+          path: spec.containers[0].resources.requests.cpu
+          value: 101m
+
+  - it: never renders a sub-milli CPU request
+    set:
+      _cluster:
+        cpu-allocation-ratio: 10
+      resources:
+        cpu: 1m
+        memory: 256Mi
+    asserts:
+      # 1m / 10 = 0.1m, which is not a representable CPU quantity
+      - equal:
+          path: spec.containers[0].resources.requests.cpu
+          value: 1m
+
+  - it: leaves memory requests untouched
+    set:
+      _cluster:
+        cpu-allocation-ratio: 4
+      resources:
+        cpu: 250m
+        memory: 256Mi
+    asserts:
+      - equal:
+          path: spec.containers[0].resources.requests.memory
+          value: "268435456"
+      - equal:
+          path: spec.containers[0].resources.limits.memory
+          value: 256Mi
diff --git a/packages/tests/cozy-lib-tests/tests/resources_tofloat_test.yaml b/packages/tests/cozy-lib-tests/tests/resources_tofloat_test.yaml
new file mode 100644
index 0000000000..7974a31112
--- /dev/null
+++ b/packages/tests/cozy-lib-tests/tests/resources_tofloat_test.yaml
@@ -0,0 +1,100 @@
+# ./tests/resources_tofloat_test.yaml
+suite: resources toFloat helper
+
+# The helper turns a Kubernetes quantity into a number for arithmetic and for
+# comparison. A suffix it does not know is not an error: the unit letter stays
+# on the string, `float64` yields zero for it, and the caller divides or
+# compares that zero without noticing. So the pin here is the suffix grammar
+# itself, one value per form the quantity syntax admits.
+
+templates:
+  - templates/tests/resources-tofloat.yaml
+
+tests:
+  - it: converts every suffix the quantity grammar admits
+    values:
+      - resources_tofloat_values.yaml
+
+    release:
+      name: myrelease
+      namespace: default
+
+    asserts:
+      - equal:
+          path: data.bareInteger
+          value: "2"
+
+      - equal:
+          path: data.bareDecimal
+          value: "1.5"
+
+      - equal:
+          path: data.milli
+          value: "0.5"
+
+      # Micro and nano are the two the helper used to drop, which made every
+      # value in that range convert to zero.
+      - equal:
+          path: data.micro
+          value: "0.0001"
+
+      - equal:
+          path: data.nano
+          value: "2.5e-07"
+
+      - equal:
+          path: data.kilo
+          value: "2000"
+
+      - equal:
+          path: data.mega
+          value: "3e+06"
+
+      - equal:
+          path: data.giga
+          value: "3e+09"
+
+      - equal:
+          path: data.tera
+          value: "2e+12"
+
+      - equal:
+          path: data.peta
+          value: "1e+15"
+
+      - equal:
+          path: data.exa
+          value: "1e+18"
+
+      - equal:
+          path: data.kibi
+          value: "4096"
+
+      - equal:
+          path: data.mebi
+          value: "2.68435456e+08"
+
+      - equal:
+          path: data.gibi
+          value: "2.147483648e+09"
+
+      - equal:
+          path: data.tebi
+          value: "2.199023255552e+12"
+
+      - equal:
+          path: data.pebi
+          value: "1.125899906842624e+15"
+
+      # 2^60 exactly. The shortest decimal that round-trips to that float64 is
+      # what gets printed, which is why this one loses its trailing digits and
+      # the smaller binary suffixes above do not.
+      - equal:
+          path: data.exbi
+          value: "1.152921504606847e+18"
+
+      # No suffix at all: the exponent is part of the number and `float64`
+      # reads it directly.
+      - equal:
+          path: data.decimalExponent
+          value: "2000"
diff --git a/packages/tests/cozy-lib-tests/tests/resources_tofloat_values.yaml b/packages/tests/cozy-lib-tests/tests/resources_tofloat_values.yaml
new file mode 100644
index 0000000000..6cd8e12b3a
--- /dev/null
+++ b/packages/tests/cozy-lib-tests/tests/resources_tofloat_values.yaml
@@ -0,0 +1,19 @@
+quantities:
+  bareInteger: 2
+  bareDecimal: "1.5"
+  milli: "500m"
+  micro: "100u"
+  nano: "250n"
+  kilo: "2k"
+  mega: "3M"
+  giga: "3G"
+  tera: "2T"
+  peta: "1P"
+  exa: "1E"
+  kibi: "4Ki"
+  mebi: "256Mi"
+  gibi: "2Gi"
+  tebi: "2Ti"
+  pebi: "1Pi"
+  exbi: "1Ei"
+  decimalExponent: "2e3"
diff --git a/packages/tests/cozy-lib-tests/tests/tls_cacert_test.yaml b/packages/tests/cozy-lib-tests/tests/tls_cacert_test.yaml
new file mode 100644
index 0000000000..ff634044cc
--- /dev/null
+++ b/packages/tests/cozy-lib-tests/tests/tls_cacert_test.yaml
@@ -0,0 +1,431 @@
+# ./tests/tls_cacert_test.yaml
+suite: tls caCertSecret helper
+
+templates:
+  - templates/tests/tls-cacert.yaml
+  - templates/tests/tls-cacert-params.yaml
+  - templates/tests/tls-cacert-nondict.yaml
+
+release:
+  name: myrelease
+  namespace: tenant-acme
+  revision: 1
+  isUpgrade: false
+
+tests:
+  - it: renders an Opaque Secret carrying only ca.crt
+    templates:
+      - templates/tests/tls-cacert.yaml
+    values:
+      - tls_cacert_values.yaml
+    asserts:
+      - hasDocuments:
+          count: 1
+      - isKind:
+          of: Secret
+      - equal:
+          path: apiVersion
+          value: v1
+      - equal:
+          path: metadata.name
+          value: myrelease.tenant-ca
+      - equal:
+          path: metadata.namespace
+          value: tenant-acme
+      - equal:
+          path: type
+          value: Opaque
+      # tenant-ca is the selector an ApplicationDefinition matches and the
+      # CA-extraction controller stamps; a helper anchor must carry it to converge
+      # with a projected one on both name and label.
+      - equal:
+          path: metadata.labels["internal.cozystack.io/tenant-ca"]
+          value: "true"
+      - isNotNullOrEmpty:
+          path: stringData["ca.crt"]
+      # The trust anchor must never carry private key material. The helper
+      # only ever emits stringData, so these are the meaningful assertions.
+      - notExists:
+          path: stringData["tls.key"]
+      - notExists:
+          path: stringData["tls.crt"]
+
+  - it: carries the tenantresource label so it is delivered via core.cozystack.io/tenantsecrets
+    templates:
+      - templates/tests/tls-cacert.yaml
+    values:
+      - tls_cacert_values.yaml
+    asserts:
+      # This label is the entire RBAC delivery mechanism: the tenantsecret
+      # registry surfaces only Secrets bearing it, and the base tenant roles
+      # grant read on core.cozystack.io/tenantsecrets (not raw core secrets).
+      - equal:
+          path: metadata.labels["internal.cozystack.io/tenantresource"]
+          value: "true"
+
+  - it: merges caller-supplied labels and annotations
+    templates:
+      - templates/tests/tls-cacert.yaml
+    values:
+      - tls_cacert_values.yaml
+    asserts:
+      - equal:
+          path: metadata.labels["app.kubernetes.io/instance"]
+          value: myrelease
+      - equal:
+          path: metadata.annotations["cozystack.io/example"]
+          value: "yes"
+
+  - it: keeps the mandatory tenantresource label even when a caller tries to override it
+    templates:
+      - templates/tests/tls-cacert.yaml
+    values:
+      - tls_cacert_values.yaml
+    set:
+      # A caller (or a compromised values override) attempting to opt the object
+      # out of tenant delivery — or worse, flip the label onto a key-bearing
+      # Secret — must not win. The helper's mandatory label always overrides.
+      callerLabels:
+        internal.cozystack.io/tenantresource: "false"
+    asserts:
+      - equal:
+          path: metadata.labels["internal.cozystack.io/tenantresource"]
+          value: "true"
+
+  - it: fails closed when caCert is empty
+    templates:
+      - templates/tests/tls-cacert.yaml
+    set:
+      caCert: ""
+    asserts:
+      - failedTemplate:
+          errorMessage: "cozy-lib.tls.caCertSecret: caCert is required and must be a non-empty PEM"
+
+  - it: refuses to publish private key material to tenants
+    templates:
+      - templates/tests/tls-cacert.yaml
+    set:
+      caCert: |
+        -----BEGIN EC PRIVATE KEY-----
+        MHcCAQEEexampleprivatekeymaterialthatmustneverreachtenants00000000
+        -----END EC PRIVATE KEY-----
+    asserts:
+      - failedTemplate:
+          errorMessage: "cozy-lib.tls.validateCACert: caCert must not contain private key material"
+
+  - it: refuses private key material regardless of PEM header casing
+    templates:
+      - templates/tests/tls-cacert.yaml
+    set:
+      # RFC 7468 mandates uppercase headers, but the guard must also catch
+      # malformed / hand-pasted input where the casing differs.
+      caCert: |
+        -----begin private key-----
+        MIIExampleLowercaseHeaderPrivateKeyMustStillBeRejected0000000000
+        -----end private key-----
+    asserts:
+      - failedTemplate:
+          errorMessage: "cozy-lib.tls.validateCACert: caCert must not contain private key material"
+
+  - it: refuses a certificate bundle that also carries a private key block
+    templates:
+      - templates/tests/tls-cacert.yaml
+    set:
+      # The realistic accident: a full keypair pasted into the CA field. The
+      # guard must scan the entire blob, not merely reject key-only input — a
+      # valid leading certificate block must not let a trailing private key
+      # slip through to a tenant-readable trust anchor.
+      caCert: |
+        -----BEGIN CERTIFICATE-----
+        MIIBjTCCATOgAwIBAgIUEVKlZMojk6oxsIdEnHzgqNSB5EQwCgYIKoZIzj0EAwIw
+        GzEZMBcGA1UEAwwQY296eS1saWItdGVzdC1jYTAgFw0yNjA3MTYxNjM0NDZaGA8y
+        MTI2MDYyMjE2MzQ0NlowGzEZMBcGA1UEAwwQY296eS1saWItdGVzdC1jYTBZMBMG
+        ByqGSM49AgEGCCqGSM49AwEHA0IABHYaDAyL+v09MqV1Yp1T1AE7Y6LHqBnVF2kH
+        4mzq8ewzoqb7EF/IY/acC4G514Lsi212vky2z+yk61EIWlgzqmGjUzBRMB0GA1Ud
+        DgQWBBReFu/b3ZdMzmFjrOTD8A8bFPX6fDAfBgNVHSMEGDAWgBReFu/b3ZdMzmFj
+        rOTD8A8bFPX6fDAPBgNVHRMBAf8EBTADAQH/MAoGCCqGSM49BAMCA0gAMEUCIQCj
+        P8IEUi9H4YcxOyAtGt22n6WCP8dqxP4p2QfkcRl6LAIgSOIMy4oHa5IJWREYdFt9
+        L/I7Ek4FlYbzy9kZu/MXqlE=
+        -----END CERTIFICATE-----
+        -----BEGIN PRIVATE KEY-----
+        MIIExamplePrivateKeyThatMustNeverReachTenantsViaCABundle00000000
+        -----END PRIVATE KEY-----
+    asserts:
+      - failedTemplate:
+          errorMessage: "cozy-lib.tls.validateCACert: caCert must not contain private key material"
+
+  - it: rejects input that is not a PEM certificate
+    templates:
+      - templates/tests/tls-cacert.yaml
+    set:
+      caCert: |
+        this is not a certificate at all
+    asserts:
+      - failedTemplate:
+          errorMessage: "cozy-lib.tls.validateCACert: caCert must contain a complete PEM certificate block (BEGIN/END CERTIFICATE)"
+
+  # The three cases below carry a BEGIN CERTIFICATE line and no key header, so a
+  # header-only guard admitted them and rendered an anchor with nothing usable.
+  # The whole-value guard requires a COMPLETE, base64-bodied block instead.
+  - it: rejects certificate armour with no closing line
+    templates:
+      - templates/tests/tls-cacert.yaml
+    set:
+      caCert: |
+        -----BEGIN CERTIFICATE-----
+        MIIBExampleCertificateBodyWithNoClosingLine0000000000000000000000
+    asserts:
+      - failedTemplate:
+          errorMessage: "cozy-lib.tls.validateCACert: caCert must contain a complete PEM certificate block (BEGIN/END CERTIFICATE)"
+
+  - it: rejects empty certificate armour
+    templates:
+      - templates/tests/tls-cacert.yaml
+    set:
+      caCert: |
+        -----BEGIN CERTIFICATE-----
+        -----END CERTIFICATE-----
+    asserts:
+      - failedTemplate:
+          errorMessage: "cozy-lib.tls.validateCACert: caCert must contain a complete PEM certificate block (BEGIN/END CERTIFICATE)"
+
+  # The guard rejects a body only for characters outside the base64 alphabet — it
+  # cannot check base64 validity itself. The trailing "!" is what makes this body
+  # illegal; drop it and the body is all-base64 and would be accepted.
+  - it: rejects certificate armour whose body carries characters base64 never uses
+    templates:
+      - templates/tests/tls-cacert.yaml
+    set:
+      caCert: |
+        -----BEGIN CERTIFICATE-----
+        this is not base64 and never could be!
+        -----END CERTIFICATE-----
+    asserts:
+      - failedTemplate:
+          errorMessage: "cozy-lib.tls.validateCACert: caCert must contain a complete PEM certificate block (BEGIN/END CERTIFICATE)"
+
+  # Documented gap: a body spelled in base64 characters passes this guard however
+  # meaningless. Only the Go controller's x509.ParseCertificate can refuse it.
+  - it: accepts armour around a base64-alphabet body it cannot decode (documented limit)
+    templates:
+      - templates/tests/tls-cacert-params.yaml
+    set:
+      useParams: true
+      name: my.tenant-ca
+      caCert: |
+        -----BEGIN CERTIFICATE-----
+        this is not base64 and never could be
+        -----END CERTIFICATE-----
+    asserts:
+      - isKind:
+          of: Secret
+
+  # PGP's header puts BLOCK after "PRIVATE KEY", so a guard anchored on the closing
+  # dashes would miss it; the guard stops at "PRIVATE KEY" precisely to catch this.
+  - it: refuses a PGP private key block next to a valid certificate
+    templates:
+      - templates/tests/tls-cacert.yaml
+    set:
+      caCert: |
+        -----BEGIN CERTIFICATE-----
+        MIIBjTCCATOgAwIBAgIUEVKlZMojk6oxsIdEnHzgqNSB5EQwCgYIKoZIzj0EAwIw
+        -----END CERTIFICATE-----
+        -----BEGIN PGP PRIVATE KEY BLOCK-----
+        lQOYBGaaaaaaExamplePgpPrivateKeyMustNeverReachTenants0000000000
+        -----END PGP PRIVATE KEY BLOCK-----
+    asserts:
+      - failedTemplate:
+          errorMessage: "cozy-lib.tls.validateCACert: caCert must not contain private key material"
+
+  # An unquoted numeric scalar in values.yaml parses to a float64, and any string
+  # operation on it dies with a raw Go template error. The guard must fail closed
+  # AND say which field the author got wrong.
+  - it: fails closed with its own message on a numeric caCert
+    templates:
+      - templates/tests/tls-cacert.yaml
+    set:
+      caCert: 12345
+    asserts:
+      - failedTemplate:
+          errorMessage: "cozy-lib.tls.validateCACert: caCert must contain a complete PEM certificate block (BEGIN/END CERTIFICATE)"
+
+  # Coercion wart, pinned: `default ""` treats 0 as empty before printf runs, so a
+  # supplied zero reports "required". Fails closed either way — 0 is no certificate.
+  - it: reports a zero caCert as required, not as a bad certificate
+    templates:
+      - templates/tests/tls-cacert.yaml
+    set:
+      caCert: 0
+    asserts:
+      - failedTemplate:
+          errorMessage: "cozy-lib.tls.caCertSecret: caCert is required and must be a non-empty PEM"
+
+  - it: accepts a certificate chain of more than one block
+    templates:
+      - templates/tests/tls-cacert-params.yaml
+    set:
+      useParams: true
+      name: my.tenant-ca
+      # An intermediate chain is an ordinary trust anchor and must keep
+      # rendering: the tightened guard bounds the block SHAPE, not the count.
+      caCert: |
+        -----BEGIN CERTIFICATE-----
+        MIIBojCCAUegAwIBAgIUMUqqtF2pMghhaI9FEJwiX0S46MswCgYIKoZIzj0EAwIw
+        JTEjMCEGA1UEAwwaY296eS1saWItdGVzdC1pbnRlcm1lZGlhdGUwIBcNMjYwNzE2
+        MTYzNDQ2WhgPMjEyNjA2MjIxNjM0NDZaMCUxIzAhBgNVBAMMGmNvenktbGliLXRl
+        c3QtaW50ZXJtZWRpYXRlMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEePlhpS2d
+        Vaj6KcyvQfs96sNWDF+gGJDsNRXAEjPUUkBVZBdkQWVrch4f6ti7yxwrY8a9ZqJP
+        KIOB7HdvTJReeqNTMFEwHQYDVR0OBBYEFHbXOUxHp7KY7yfSQlLON+LKu68wMB8G
+        A1UdIwQYMBaAFHbXOUxHp7KY7yfSQlLON+LKu68wMA8GA1UdEwEB/wQFMAMBAf8w
+        CgYIKoZIzj0EAwIDSQAwRgIhAMgKiremKARWnyMIR4U8TXCs8nsJuYB1DjQcYYvP
+        KgyxAiEArfXXEHDpM1vBD4Nf58F98I+6RhN5yQHn7uokVrm88Cc=
+        -----END CERTIFICATE-----
+        -----BEGIN CERTIFICATE-----
+        MIIBjTCCATOgAwIBAgIUEVKlZMojk6oxsIdEnHzgqNSB5EQwCgYIKoZIzj0EAwIw
+        GzEZMBcGA1UEAwwQY296eS1saWItdGVzdC1jYTAgFw0yNjA3MTYxNjM0NDZaGA8y
+        MTI2MDYyMjE2MzQ0NlowGzEZMBcGA1UEAwwQY296eS1saWItdGVzdC1jYTBZMBMG
+        ByqGSM49AgEGCCqGSM49AwEHA0IABHYaDAyL+v09MqV1Yp1T1AE7Y6LHqBnVF2kH
+        4mzq8ewzoqb7EF/IY/acC4G514Lsi212vky2z+yk61EIWlgzqmGjUzBRMB0GA1Ud
+        DgQWBBReFu/b3ZdMzmFjrOTD8A8bFPX6fDAfBgNVHSMEGDAWgBReFu/b3ZdMzmFj
+        rOTD8A8bFPX6fDAPBgNVHRMBAf8EBTADAQH/MAoGCCqGSM49BAMCA0gAMEUCIQCj
+        P8IEUi9H4YcxOyAtGt22n6WCP8dqxP4p2QfkcRl6LAIgSOIMy4oHa5IJWREYdFt9
+        L/I7Ek4FlYbzy9kZu/MXqlE=
+        -----END CERTIFICATE-----
+    asserts:
+      - isKind:
+          of: Secret
+      - isNotNullOrEmpty:
+          path: stringData["ca.crt"]
+
+  - it: rejects a certificate wrapped in a friendlyName preamble as a structural failure
+    templates:
+      - templates/tests/tls-cacert.yaml
+    set:
+      # "PRIVATE KEY" sits in a friendlyName preamble line, not a PEM header, so
+      # the failure is the STRUCTURAL block error — proof the key guard, anchored
+      # to the header, does not false-positive on substring text.
+      caCert: |
+        Bag Attributes: friendlyName=acme PRIVATE KEY authority
+        -----BEGIN CERTIFICATE-----
+        MIIBjTCCATOgAwIBAgIUEVKlZMojk6oxsIdEnHzgqNSB5EQwCgYIKoZIzj0EAwIw
+        GzEZMBcGA1UEAwwQY296eS1saWItdGVzdC1jYTAgFw0yNjA3MTYxNjM0NDZaGA8y
+        MTI2MDYyMjE2MzQ0NlowGzEZMBcGA1UEAwwQY296eS1saWItdGVzdC1jYTBZMBMG
+        ByqGSM49AgEGCCqGSM49AwEHA0IABHYaDAyL+v09MqV1Yp1T1AE7Y6LHqBnVF2kH
+        4mzq8ewzoqb7EF/IY/acC4G514Lsi212vky2z+yk61EIWlgzqmGjUzBRMB0GA1Ud
+        DgQWBBReFu/b3ZdMzmFjrOTD8A8bFPX6fDAfBgNVHSMEGDAWgBReFu/b3ZdMzmFj
+        rOTD8A8bFPX6fDAPBgNVHRMBAf8EBTADAQH/MAoGCCqGSM49BAMCA0gAMEUCIQCj
+        P8IEUi9H4YcxOyAtGt22n6WCP8dqxP4p2QfkcRl6LAIgSOIMy4oHa5IJWREYdFt9
+        L/I7Ek4FlYbzy9kZu/MXqlE=
+        -----END CERTIFICATE-----
+    asserts:
+      - failedTemplate:
+          errorMessage: "cozy-lib.tls.validateCACert: caCert must contain a complete PEM certificate block (BEGIN/END CERTIFICATE)"
+
+  # The whole-value anchor rejects a valid block carrying bytes before or after it,
+  # since the value is emitted verbatim. The controller strips such bytes by
+  # re-encoding; a Helm template can only refuse them.
+  - it: rejects a certificate preceded by a human-readable preamble
+    templates:
+      - templates/tests/tls-cacert.yaml
+    set:
+      # What `openssl x509 -text` prints ahead of the PEM block.
+      caCert: |
+        Certificate:
+            Data:
+                Version: 3 (0x2)
+        -----BEGIN CERTIFICATE-----
+        MIIBjTCCATOgAwIBAgIUEVKlZMojk6oxsIdEnHzgqNSB5EQwCgYIKoZIzj0EAwIw
+        GzEZMBcGA1UEAwwQY296eS1saWItdGVzdC1jYTAgFw0yNjA3MTYxNjM0NDZaGA8y
+        MTI2MDYyMjE2MzQ0NlowGzEZMBcGA1UEAwwQY296eS1saWItdGVzdC1jYTBZMBMG
+        ByqGSM49AgEGCCqGSM49AwEHA0IABHYaDAyL+v09MqV1Yp1T1AE7Y6LHqBnVF2kH
+        4mzq8ewzoqb7EF/IY/acC4G514Lsi212vky2z+yk61EIWlgzqmGjUzBRMB0GA1Ud
+        DgQWBBReFu/b3ZdMzmFjrOTD8A8bFPX6fDAfBgNVHSMEGDAWgBReFu/b3ZdMzmFj
+        rOTD8A8bFPX6fDAPBgNVHRMBAf8EBTADAQH/MAoGCCqGSM49BAMCA0gAMEUCIQCj
+        P8IEUi9H4YcxOyAtGt22n6WCP8dqxP4p2QfkcRl6LAIgSOIMy4oHa5IJWREYdFt9
+        L/I7Ek4FlYbzy9kZu/MXqlE=
+        -----END CERTIFICATE-----
+    asserts:
+      - failedTemplate:
+          errorMessage: "cozy-lib.tls.validateCACert: caCert must contain a complete PEM certificate block (BEGIN/END CERTIFICATE)"
+
+  - it: rejects a certificate trailed by arbitrary bytes
+    templates:
+      - templates/tests/tls-cacert.yaml
+    set:
+      caCert: |
+        -----BEGIN CERTIFICATE-----
+        MIIBjTCCATOgAwIBAgIUEVKlZMojk6oxsIdEnHzgqNSB5EQwCgYIKoZIzj0EAwIw
+        GzEZMBcGA1UEAwwQY296eS1saWItdGVzdC1jYTAgFw0yNjA3MTYxNjM0NDZaGA8y
+        MTI2MDYyMjE2MzQ0NlowGzEZMBcGA1UEAwwQY296eS1saWItdGVzdC1jYTBZMBMG
+        ByqGSM49AgEGCCqGSM49AwEHA0IABHYaDAyL+v09MqV1Yp1T1AE7Y6LHqBnVF2kH
+        4mzq8ewzoqb7EF/IY/acC4G514Lsi212vky2z+yk61EIWlgzqmGjUzBRMB0GA1Ud
+        DgQWBBReFu/b3ZdMzmFjrOTD8A8bFPX6fDAfBgNVHSMEGDAWgBReFu/b3ZdMzmFj
+        rOTD8A8bFPX6fDAPBgNVHRMBAf8EBTADAQH/MAoGCCqGSM49BAMCA0gAMEUCIQCj
+        P8IEUi9H4YcxOyAtGt22n6WCP8dqxP4p2QfkcRl6LAIgSOIMy4oHa5IJWREYdFt9
+        L/I7Ek4FlYbzy9kZu/MXqlE=
+        -----END CERTIFICATE-----
+        and then some trailing bytes
+    asserts:
+      - failedTemplate:
+          errorMessage: "cozy-lib.tls.validateCACert: caCert must contain a complete PEM certificate block (BEGIN/END CERTIFICATE)"
+
+  - it: fails closed when name is empty
+    templates:
+      - templates/tests/tls-cacert-params.yaml
+    set:
+      useParams: true
+      name: ""
+      namespace: tenant-acme
+      caCert: |
+        -----BEGIN CERTIFICATE-----
+        MIIBjTCCATOgAwIBAgIUEVKlZMojk6oxsIdEnHzgqNSB5EQwCgYIKoZIzj0EAwIw
+        GzEZMBcGA1UEAwwQY296eS1saWItdGVzdC1jYTAgFw0yNjA3MTYxNjM0NDZaGA8y
+        MTI2MDYyMjE2MzQ0NlowGzEZMBcGA1UEAwwQY296eS1saWItdGVzdC1jYTBZMBMG
+        ByqGSM49AgEGCCqGSM49AwEHA0IABHYaDAyL+v09MqV1Yp1T1AE7Y6LHqBnVF2kH
+        4mzq8ewzoqb7EF/IY/acC4G514Lsi212vky2z+yk61EIWlgzqmGjUzBRMB0GA1Ud
+        DgQWBBReFu/b3ZdMzmFjrOTD8A8bFPX6fDAfBgNVHSMEGDAWgBReFu/b3ZdMzmFj
+        rOTD8A8bFPX6fDAPBgNVHRMBAf8EBTADAQH/MAoGCCqGSM49BAMCA0gAMEUCIQCj
+        P8IEUi9H4YcxOyAtGt22n6WCP8dqxP4p2QfkcRl6LAIgSOIMy4oHa5IJWREYdFt9
+        L/I7Ek4FlYbzy9kZu/MXqlE=
+        -----END CERTIFICATE-----
+    asserts:
+      - failedTemplate:
+          errorMessage: "cozy-lib.tls.caCertSecret: name is required"
+
+  - it: omits metadata.namespace when namespace is not supplied
+    templates:
+      - templates/tests/tls-cacert-params.yaml
+    set:
+      useParams: true
+      name: my.tenant-ca
+      caCert: |
+        -----BEGIN CERTIFICATE-----
+        MIIBjTCCATOgAwIBAgIUEVKlZMojk6oxsIdEnHzgqNSB5EQwCgYIKoZIzj0EAwIw
+        GzEZMBcGA1UEAwwQY296eS1saWItdGVzdC1jYTAgFw0yNjA3MTYxNjM0NDZaGA8y
+        MTI2MDYyMjE2MzQ0NlowGzEZMBcGA1UEAwwQY296eS1saWItdGVzdC1jYTBZMBMG
+        ByqGSM49AgEGCCqGSM49AwEHA0IABHYaDAyL+v09MqV1Yp1T1AE7Y6LHqBnVF2kH
+        4mzq8ewzoqb7EF/IY/acC4G514Lsi212vky2z+yk61EIWlgzqmGjUzBRMB0GA1Ud
+        DgQWBBReFu/b3ZdMzmFjrOTD8A8bFPX6fDAfBgNVHSMEGDAWgBReFu/b3ZdMzmFj
+        rOTD8A8bFPX6fDAPBgNVHRMBAf8EBTADAQH/MAoGCCqGSM49BAMCA0gAMEUCIQCj
+        P8IEUi9H4YcxOyAtGt22n6WCP8dqxP4p2QfkcRl6LAIgSOIMy4oHa5IJWREYdFt9
+        L/I7Ek4FlYbzy9kZu/MXqlE=
+        -----END CERTIFICATE-----
+    asserts:
+      - equal:
+          path: metadata.name
+          value: my.tenant-ca
+      - notExists:
+          path: metadata.namespace
+
+  - it: fails closed when invoked with a non-dict argument
+    templates:
+      - templates/tests/tls-cacert-nondict.yaml
+    # A valid caCert keeps the other fixtures rendering cleanly so the only
+    # failure is the non-dict guard on this fixture.
+    values:
+      - tls_cacert_values.yaml
+    set:
+      nonDict: true
+    asserts:
+      - failedTemplate:
+          errorMessage: "cozy-lib.tls.caCertSecret: expected a single dict argument"
diff --git a/packages/tests/cozy-lib-tests/tests/tls_cacert_values.yaml b/packages/tests/cozy-lib-tests/tests/tls_cacert_values.yaml
new file mode 100644
index 0000000000..5427904273
--- /dev/null
+++ b/packages/tests/cozy-lib-tests/tests/tls_cacert_values.yaml
@@ -0,0 +1,16 @@
+# A REAL, self-signed CA certificate (EC P-256, long-dated), not a
+# certificate-shaped string. The regex guard cannot parse x509, so a fake body
+# would pass identically — keeping this real is what makes the suite assert
+# against something a verifier would actually accept.
+caCert: |
+  -----BEGIN CERTIFICATE-----
+  MIIBjTCCATOgAwIBAgIUEVKlZMojk6oxsIdEnHzgqNSB5EQwCgYIKoZIzj0EAwIw
+  GzEZMBcGA1UEAwwQY296eS1saWItdGVzdC1jYTAgFw0yNjA3MTYxNjM0NDZaGA8y
+  MTI2MDYyMjE2MzQ0NlowGzEZMBcGA1UEAwwQY296eS1saWItdGVzdC1jYTBZMBMG
+  ByqGSM49AgEGCCqGSM49AwEHA0IABHYaDAyL+v09MqV1Yp1T1AE7Y6LHqBnVF2kH
+  4mzq8ewzoqb7EF/IY/acC4G514Lsi212vky2z+yk61EIWlgzqmGjUzBRMB0GA1Ud
+  DgQWBBReFu/b3ZdMzmFjrOTD8A8bFPX6fDAfBgNVHSMEGDAWgBReFu/b3ZdMzmFj
+  rOTD8A8bFPX6fDAPBgNVHRMBAf8EBTADAQH/MAoGCCqGSM49BAMCA0gAMEUCIQCj
+  P8IEUi9H4YcxOyAtGt22n6WCP8dqxP4p2QfkcRl6LAIgSOIMy4oHa5IJWREYdFt9
+  L/I7Ek4FlYbzy9kZu/MXqlE=
+  -----END CERTIFICATE-----
diff --git a/packages/tests/cozy-lib-tests/tests/tls_validatecacert_test.yaml b/packages/tests/cozy-lib-tests/tests/tls_validatecacert_test.yaml
new file mode 100644
index 0000000000..23a433b77d
--- /dev/null
+++ b/packages/tests/cozy-lib-tests/tests/tls_validatecacert_test.yaml
@@ -0,0 +1,99 @@
+# ./tests/tls_validatecacert_test.yaml
+suite: tls validateCACert helper
+
+# Direct coverage for the validate-only helper that caCertSecret (and any other
+# chart accepting a CA in PEM form) delegates to: the fail messages must carry
+# the caller-supplied field name, so an operator sees the value they actually
+# set rather than this helper's caCert parameter. The shared rules themselves
+# (private-key header anchoring, whole-value PEM, verbatim emission) are pinned
+# through caCertSecret in tls_cacert_test.yaml.
+#
+# The certificate below is the same real, self-signed CA as
+# tls_cacert_values.yaml — the regex guard cannot parse x509, so only a real
+# body proves the accepted shape is one a verifier would accept.
+
+templates:
+  - templates/tests/tls-validatecacert.yaml
+
+release:
+  name: myrelease
+  namespace: tenant-acme
+
+tests:
+  - it: renders nothing itself and lets the caller's document through on a valid bundle
+    set:
+      field: talos.imageFactoryCA
+      caCert: |
+        -----BEGIN CERTIFICATE-----
+        MIIBjTCCATOgAwIBAgIUEVKlZMojk6oxsIdEnHzgqNSB5EQwCgYIKoZIzj0EAwIw
+        GzEZMBcGA1UEAwwQY296eS1saWItdGVzdC1jYTAgFw0yNjA3MTYxNjM0NDZaGA8y
+        MTI2MDYyMjE2MzQ0NlowGzEZMBcGA1UEAwwQY296eS1saWItdGVzdC1jYTBZMBMG
+        ByqGSM49AgEGCCqGSM49AwEHA0IABHYaDAyL+v09MqV1Yp1T1AE7Y6LHqBnVF2kH
+        4mzq8ewzoqb7EF/IY/acC4G514Lsi212vky2z+yk61EIWlgzqmGjUzBRMB0GA1Ud
+        DgQWBBReFu/b3ZdMzmFjrOTD8A8bFPX6fDAfBgNVHSMEGDAWgBReFu/b3ZdMzmFj
+        rOTD8A8bFPX6fDAPBgNVHRMBAf8EBTADAQH/MAoGCCqGSM49BAMCA0gAMEUCIQCj
+        P8IEUi9H4YcxOyAtGt22n6WCP8dqxP4p2QfkcRl6LAIgSOIMy4oHa5IJWREYdFt9
+        L/I7Ek4FlYbzy9kZu/MXqlE=
+        -----END CERTIFICATE-----
+    asserts:
+      - hasDocuments:
+          count: 1
+      - isKind:
+          of: ConfigMap
+
+  - it: names the caller's field when refusing private key material
+    set:
+      field: talos.imageFactoryCA
+      caCert: |
+        -----BEGIN EC PRIVATE KEY-----
+        MHcCAQEEexampleprivatekeymaterialthatmustneverreachtenants00000000
+        -----END EC PRIVATE KEY-----
+    asserts:
+      - failedTemplate:
+          errorMessage: "cozy-lib.tls.validateCACert: talos.imageFactoryCA must not contain private key material"
+
+  - it: names the caller's field when the value is not a PEM certificate
+    set:
+      field: talos.imageFactoryCA
+      caCert: |
+        this is not a certificate at all
+    asserts:
+      - failedTemplate:
+          errorMessage: "cozy-lib.tls.validateCACert: talos.imageFactoryCA must contain a complete PEM certificate block (BEGIN/END CERTIFICATE)"
+
+  # An unquoted numeric scalar parses to float64; the coercion must turn it into
+  # the helper's own message, not a raw Go type error.
+  - it: fails closed on a numeric value with the caller's field named
+    set:
+      field: talos.imageFactoryCA
+      caCert: 12345
+    asserts:
+      - failedTemplate:
+          errorMessage: "cozy-lib.tls.validateCACert: talos.imageFactoryCA must contain a complete PEM certificate block (BEGIN/END CERTIFICATE)"
+
+  # A message that names no field sends the operator hunting through every
+  # CA-accepting value in the chart, so the parameter is mandatory.
+  - it: fails closed when field is not supplied
+    set:
+      caCert: |
+        -----BEGIN CERTIFICATE-----
+        MIIBjTCCATOgAwIBAgIUEVKlZMojk6oxsIdEnHzgqNSB5EQwCgYIKoZIzj0EAwIw
+        GzEZMBcGA1UEAwwQY296eS1saWItdGVzdC1jYTAgFw0yNjA3MTYxNjM0NDZaGA8y
+        MTI2MDYyMjE2MzQ0NlowGzEZMBcGA1UEAwwQY296eS1saWItdGVzdC1jYTBZMBMG
+        ByqGSM49AgEGCCqGSM49AwEHA0IABHYaDAyL+v09MqV1Yp1T1AE7Y6LHqBnVF2kH
+        4mzq8ewzoqb7EF/IY/acC4G514Lsi212vky2z+yk61EIWlgzqmGjUzBRMB0GA1Ud
+        DgQWBBReFu/b3ZdMzmFjrOTD8A8bFPX6fDAfBgNVHSMEGDAWgBReFu/b3ZdMzmFj
+        rOTD8A8bFPX6fDAPBgNVHRMBAf8EBTADAQH/MAoGCCqGSM49BAMCA0gAMEUCIQCj
+        P8IEUi9H4YcxOyAtGt22n6WCP8dqxP4p2QfkcRl6LAIgSOIMy4oHa5IJWREYdFt9
+        L/I7Ek4FlYbzy9kZu/MXqlE=
+        -----END CERTIFICATE-----
+    asserts:
+      - failedTemplate:
+          errorMessage: "cozy-lib.tls.validateCACert: field is required"
+
+  - it: fails closed when invoked with a non-dict argument
+    set:
+      nonDict: true
+    asserts:
+      - failedTemplate:
+          errorMessage: "cozy-lib.tls.validateCACert: expected a single dict argument"
diff --git a/pkg/apis/apps/fuzzer/fuzzer.go b/pkg/apis/apps/fuzzer/fuzzer.go
index c92c5799d9..25559ee91a 100644
--- a/pkg/apis/apps/fuzzer/fuzzer.go
+++ b/pkg/apis/apps/fuzzer/fuzzer.go
@@ -18,16 +18,16 @@ package fuzzer
 
 import (
 	"github.com/cozystack/cozystack/pkg/apis/apps/v1alpha1"
-	fuzz "github.com/google/gofuzz"
 
 	runtimeserializer "k8s.io/apimachinery/pkg/runtime/serializer"
+	"sigs.k8s.io/randfill"
 )
 
 // Funcs returns the fuzzer functions for the apps api group.
-var Funcs = func(codecs runtimeserializer.CodecFactory) []interface{} {
-	return []interface{}{
-		func(s *v1alpha1.Application, c fuzz.Continue) {
-			c.FuzzNoCustom(s) // fuzz self without calling this function again
+var Funcs = func(codecs runtimeserializer.CodecFactory) []any {
+	return []any{
+		func(s *v1alpha1.Application, c randfill.Continue) {
+			c.FillNoCustom(s) // fill self without calling this function again
 		},
 	}
 }
diff --git a/pkg/apis/apps/v1alpha1/doc.go b/pkg/apis/apps/v1alpha1/doc.go
index d162bb08d4..7cf2c2a935 100644
--- a/pkg/apis/apps/v1alpha1/doc.go
+++ b/pkg/apis/apps/v1alpha1/doc.go
@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 // +k8s:openapi-gen=true
+// +k8s:openapi-model-package=com.github.cozystack.cozystack.pkg.apis.apps.v1alpha1
 // +k8s:deepcopy-gen=package
 // +k8s:conversion-gen=github.com/cozystack/cozystack/pkg/apis/apps
 // +k8s:conversion-gen=k8s.io/apiextensions-apiserver/pkg/apis/apiextensions
diff --git a/pkg/apis/apps/v1alpha1/model_name.go b/pkg/apis/apps/v1alpha1/model_name.go
new file mode 100644
index 0000000000..07b61b931c
--- /dev/null
+++ b/pkg/apis/apps/v1alpha1/model_name.go
@@ -0,0 +1,55 @@
+/*
+Copyright 2025 The Cozystack Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package v1alpha1
+
+// OpenAPIModelName pins the OpenAPI model name for the apps.cozystack.io
+// types. This is hand-written (not generated) on purpose.
+//
+// The apps API multiplexes every catalog kind (Bucket, Postgres, …) onto the
+// single Application Go type via Scheme.AddKnownTypeWithName. Server-side-apply
+// field management resolves a kind by matching the model's OpenAPI name against
+// the name the apiserver's DefinitionNamer computed for it. Since Kubernetes
+// 0.35 the DefinitionNamer keys that lookup by Scheme.ToOpenAPIDefinitionName
+// (the "friendly" reversed-path form, e.g. com.github.cozystack…Application),
+// while the model builder still looks it up by the Go import-path form. When a
+// type has no OpenAPIModelName the two disagree, the group-version-kind
+// extension is never attached to the Application model, and the SSA type
+// converter ends up with no entry for any apps kind ("no corresponding type for
+// apps.cozystack.io/v1alpha1, Kind=Bucket"). Declaring OpenAPIModelName makes
+// GetCanonicalTypeName, ToOpenAPIDefinitionName and the generated openapi map
+// key all agree on the friendly form, so the extension attaches again.
+//
+// code-generator's openapi-gen could emit these via --output-model-name-file,
+// but that also rewrites zz_generated.model_name.go in the read-only apimachinery
+// / apiextensions module-cache packages the shared gen_openapi helper always
+// passes as inputs, which fails on any consumer (including CI) that vendors deps
+// from the module cache. Keeping the methods here sidesteps that; add one for
+// every new apps.cozystack.io type.
+//
+// The returned string must match apiPrefix in pkg/cmd/server/openapi.go.
+
+func (in Application) OpenAPIModelName() string {
+	return "com.github.cozystack.cozystack.pkg.apis.apps.v1alpha1.Application"
+}
+
+func (in ApplicationList) OpenAPIModelName() string {
+	return "com.github.cozystack.cozystack.pkg.apis.apps.v1alpha1.ApplicationList"
+}
+
+func (in ApplicationStatus) OpenAPIModelName() string {
+	return "com.github.cozystack.cozystack.pkg.apis.apps.v1alpha1.ApplicationStatus"
+}
diff --git a/pkg/apis/apps/v1alpha1/types.go b/pkg/apis/apps/v1alpha1/types.go
index 3332ce5547..15bab146fe 100644
--- a/pkg/apis/apps/v1alpha1/types.go
+++ b/pkg/apis/apps/v1alpha1/types.go
@@ -28,6 +28,11 @@ const (
 	ApplicationNameLabel  = "apps.cozystack.io/application.name"
 )
 
+// NameSchemaExtension is the root-level key of an ApplicationDefinition's
+// openAPISchema under which an application declares the constraints on its own
+// metadata.name. cozyvalues-gen emits it from a chart's `## @name` annotation.
+const NameSchemaExtension = "x-cozystack-name"
+
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
 // ApplicationList is a list of Application objects.
diff --git a/pkg/apis/apps/validation/nameschema.go b/pkg/apis/apps/validation/nameschema.go
new file mode 100644
index 0000000000..6aafb236cd
--- /dev/null
+++ b/pkg/apis/apps/validation/nameschema.go
@@ -0,0 +1,132 @@
+/*
+Copyright 2026 The Cozystack Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package validation
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+	"regexp"
+	"strings"
+
+	appsv1alpha1 "github.com/cozystack/cozystack/pkg/apis/apps/v1alpha1"
+)
+
+// NameSchema is an application's own declaration of what its name may look
+// like. A chart's naming budget follows from the sub-resources the chart
+// renders and the names they take — facts that live in the chart and nowhere
+// else — so the budget travels with the chart's schema instead of being a
+// branch on Kind in the API server.
+type NameSchema struct {
+	Type        string `json:"type,omitempty"`
+	Description string `json:"description,omitempty"`
+	MinLength   *int64 `json:"minLength,omitempty"`
+	MaxLength   *int64 `json:"maxLength,omitempty"`
+	Pattern     string `json:"pattern,omitempty"`
+
+	compiledPattern *regexp.Regexp
+}
+
+// MatchesPattern reports whether name satisfies the declared pattern, if any.
+// The pattern is unanchored, as JSON Schema specifies: a declaration that means
+// the whole name writes ^...$.
+func (s *NameSchema) MatchesPattern(name string) bool {
+	return s.compiledPattern == nil || s.compiledPattern.MatchString(name)
+}
+
+// nameSchemaKeywords are the keywords a declaration may carry that the API
+// server interprets.
+var nameSchemaKeywords = map[string]bool{
+	"type": true, "description": true, "minLength": true, "maxLength": true, "pattern": true,
+}
+
+// jsonSchemaAnnotations constrain nothing, so a declaration carrying one is
+// enforced as if it did not. Rejecting them would turn a generator adding a
+// title or an example into an outage for every kind it regenerates.
+var jsonSchemaAnnotations = map[string]bool{
+	"title": true, "default": true, "examples": true, "deprecated": true,
+	"readOnly": true, "writeOnly": true, "$comment": true,
+}
+
+// ParseNameSchema extracts the x-cozystack-name declaration from an
+// ApplicationDefinition's openAPISchema. Returns (nil, nil) when the schema
+// declares nothing about the name, which includes a schema that is not a JSON
+// object at all: there is no declaration in it to enforce, and the spec
+// schema's own loader is where that failure is reported.
+func ParseNameSchema(raw string) (*NameSchema, error) {
+	var doc map[string]json.RawMessage
+	if err := json.Unmarshal([]byte(raw), &doc); err != nil {
+		return nil, nil
+	}
+	declared, ok := doc[appsv1alpha1.NameSchemaExtension]
+	if !ok {
+		return nil, nil
+	}
+	return ParseNameDeclaration(declared)
+}
+
+// ParseNameDeclaration parses the value of an x-cozystack-name key. The
+// openAPISchema is untrusted input — definitions from other repositories are
+// written by hand — so a constraint keyword the server does not enforce, a
+// wrong type, a null, or lengths no name can satisfy are an error rather than
+// a constraint silently dropped. A pattern is only checked to compile as RE2;
+// whether it matches anything is the chart's to get right.
+func ParseNameDeclaration(declared []byte) (*NameSchema, error) {
+	// encoding/json decodes null as "leave unset", which would turn a null
+	// declaration into an empty one and a null keyword into a dropped
+	// constraint.
+	var keywords map[string]json.RawMessage
+	if err := json.Unmarshal(declared, &keywords); err != nil {
+		return nil, fmt.Errorf("decode: %w", err)
+	}
+	if keywords == nil {
+		return nil, fmt.Errorf("declaration is null")
+	}
+	for k, v := range keywords {
+		switch {
+		case jsonSchemaAnnotations[k], strings.HasPrefix(k, "x-"):
+			continue
+		case !nameSchemaKeywords[k]:
+			return nil, fmt.Errorf("unsupported keyword %q", k)
+		case string(bytes.TrimSpace(v)) == "null":
+			return nil, fmt.Errorf("%s is null", k)
+		}
+	}
+
+	var ns NameSchema
+	if err := json.Unmarshal(declared, &ns); err != nil {
+		return nil, fmt.Errorf("decode: %w", err)
+	}
+	switch {
+	case ns.Type != "" && ns.Type != "string":
+		return nil, fmt.Errorf("type %q: a name is a string", ns.Type)
+	case ns.MaxLength != nil && *ns.MaxLength < 1:
+		return nil, fmt.Errorf("maxLength %d admits no name", *ns.MaxLength)
+	case ns.MinLength != nil && *ns.MinLength < 0:
+		return nil, fmt.Errorf("minLength %d is negative", *ns.MinLength)
+	case ns.MinLength != nil && ns.MaxLength != nil && *ns.MinLength > *ns.MaxLength:
+		return nil, fmt.Errorf("minLength %d exceeds maxLength %d", *ns.MinLength, *ns.MaxLength)
+	}
+	if ns.Pattern != "" {
+		re, err := regexp.Compile(ns.Pattern)
+		if err != nil {
+			return nil, fmt.Errorf("pattern %q does not compile as RE2: %w", ns.Pattern, err)
+		}
+		ns.compiledPattern = re
+	}
+	return &ns, nil
+}
diff --git a/pkg/apis/core/fuzzer/fuzzer.go b/pkg/apis/core/fuzzer/fuzzer.go
index 82a1b5abe3..e5f5d63aa1 100644
--- a/pkg/apis/core/fuzzer/fuzzer.go
+++ b/pkg/apis/core/fuzzer/fuzzer.go
@@ -18,16 +18,22 @@ package fuzzer
 
 import (
 	"github.com/cozystack/cozystack/pkg/apis/core/v1alpha1"
-	fuzz "github.com/google/gofuzz"
 
 	runtimeserializer "k8s.io/apimachinery/pkg/runtime/serializer"
+	"sigs.k8s.io/randfill"
 )
 
 // Funcs returns the fuzzer functions for the core api group.
-var Funcs = func(codecs runtimeserializer.CodecFactory) []interface{} {
-	return []interface{}{
-		func(s *v1alpha1.TenantNamespace, c fuzz.Continue) {
-			c.FuzzNoCustom(s) // fuzz self without calling this function again
+var Funcs = func(codecs runtimeserializer.CodecFactory) []any {
+	return []any{
+		func(s *v1alpha1.TenantNamespace, c randfill.Continue) {
+			c.FillNoCustom(s) // fill self without calling this function again
+		},
+		func(s *v1alpha1.Option, c randfill.Continue) {
+			c.FillNoCustom(s) // fill self without calling this function again
+		},
+		func(s *v1alpha1.Tap, c randfill.Continue) {
+			c.FillNoCustom(s) // fill self without calling this function again
 		},
 	}
 }
diff --git a/pkg/apis/core/v1alpha1/doc.go b/pkg/apis/core/v1alpha1/doc.go
index 15b059bed7..c074ab0537 100644
--- a/pkg/apis/core/v1alpha1/doc.go
+++ b/pkg/apis/core/v1alpha1/doc.go
@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 // +k8s:openapi-gen=true
+// +k8s:openapi-model-package=com.github.cozystack.cozystack.pkg.apis.core.v1alpha1
 // +k8s:deepcopy-gen=package
 // +k8s:conversion-gen=github.com/cozystack/cozystack/pkg/apis/core
 // +k8s:conversion-gen=k8s.io/apiextensions-apiserver/pkg/apis/apiextensions
diff --git a/pkg/apis/core/v1alpha1/model_name.go b/pkg/apis/core/v1alpha1/model_name.go
new file mode 100644
index 0000000000..1fca4d7d61
--- /dev/null
+++ b/pkg/apis/core/v1alpha1/model_name.go
@@ -0,0 +1,120 @@
+/*
+Copyright 2026 The Cozystack Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package v1alpha1
+
+// OpenAPIModelName pins the OpenAPI model name for the core.cozystack.io types.
+// This is hand-written (not generated) on purpose.
+//
+// Without it, openapi-gen keys the generated definition map on the Go import
+// path ("github.com/cozystack/cozystack/pkg/apis/core/v1alpha1.Option"), and
+// since Kubernetes 0.35 the apiserver's DefinitionNamer.GetDefinitionName
+// returns whatever name it is given verbatim instead of converting it to the
+// "friendly" reversed-path form. The published document then keys the definition
+// on the raw path while every $ref to it is JSON pointer escaped
+// ("#/definitions/github.com~1cozystack~1…v1alpha1.OptionSpec", ~1 being a
+// slash), and clients resolve a $ref by trimming "#/definitions/" without
+// unescaping. The two spellings never meet, so the reference dangles and
+// client-side validation fails on every resource in the group, not only the one
+// named in the error:
+//
+//	error validating data: SchemaError(…core/v1alpha1.Option.spec):
+//	unknown model in reference: "github.com~1cozystack~1…v1alpha1.OptionSpec"
+//
+// Declaring the dotted name here makes GetCanonicalTypeName,
+// Scheme.ToOpenAPIDefinitionName and the generated openapi map key all agree on
+// a name with no slash in it, so nothing needs escaping and every $ref resolves.
+// The same agreement is what lets DefinitionNamer attach the
+// x-kubernetes-group-version-kind extension, which server-side apply needs to
+// resolve a kind (see the apps package, where its absence broke SSA instead).
+//
+// code-generator's openapi-gen could emit these via --output-model-name-file,
+// but that also rewrites zz_generated.model_name.go in the read-only apimachinery
+// / apiextensions module-cache packages the shared gen_openapi helper always
+// passes as inputs, which fails on any consumer (including CI) that vendors deps
+// from the module cache. Keeping the methods here sidesteps that.
+//
+// The +k8s:openapi-model-package marker in doc.go makes openapi-gen emit
+// Type{}.OpenAPIModelName() for every type in this package it generates a schema
+// or a reference for, so a new core.cozystack.io type without a method here
+// fails the build rather than silently reintroducing a Go-path name. The
+// returned string must be the dotted form Scheme.ToOpenAPIDefinitionName derives
+// from the type's Go package path, which is the marker's value plus the type
+// name. See https://github.com/cozystack/cozystack/issues/3806.
+
+func (in Option) OpenAPIModelName() string {
+	return "com.github.cozystack.cozystack.pkg.apis.core.v1alpha1.Option"
+}
+
+func (in OptionItem) OpenAPIModelName() string {
+	return "com.github.cozystack.cozystack.pkg.apis.core.v1alpha1.OptionItem"
+}
+
+func (in OptionList) OpenAPIModelName() string {
+	return "com.github.cozystack.cozystack.pkg.apis.core.v1alpha1.OptionList"
+}
+
+func (in OptionSpec) OpenAPIModelName() string {
+	return "com.github.cozystack.cozystack.pkg.apis.core.v1alpha1.OptionSpec"
+}
+
+func (in TenantModule) OpenAPIModelName() string {
+	return "com.github.cozystack.cozystack.pkg.apis.core.v1alpha1.TenantModule"
+}
+
+func (in TenantModuleList) OpenAPIModelName() string {
+	return "com.github.cozystack.cozystack.pkg.apis.core.v1alpha1.TenantModuleList"
+}
+
+func (in TenantModuleStatus) OpenAPIModelName() string {
+	return "com.github.cozystack.cozystack.pkg.apis.core.v1alpha1.TenantModuleStatus"
+}
+
+func (in TenantNamespace) OpenAPIModelName() string {
+	return "com.github.cozystack.cozystack.pkg.apis.core.v1alpha1.TenantNamespace"
+}
+
+func (in TenantNamespaceList) OpenAPIModelName() string {
+	return "com.github.cozystack.cozystack.pkg.apis.core.v1alpha1.TenantNamespaceList"
+}
+
+func (in TenantSecret) OpenAPIModelName() string {
+	return "com.github.cozystack.cozystack.pkg.apis.core.v1alpha1.TenantSecret"
+}
+
+func (in TenantSecretList) OpenAPIModelName() string {
+	return "com.github.cozystack.cozystack.pkg.apis.core.v1alpha1.TenantSecretList"
+}
+
+func (in Tap) OpenAPIModelName() string {
+	return "com.github.cozystack.cozystack.pkg.apis.core.v1alpha1.Tap"
+}
+
+func (in TapList) OpenAPIModelName() string {
+	return "com.github.cozystack.cozystack.pkg.apis.core.v1alpha1.TapList"
+}
+
+func (in TapSpec) OpenAPIModelName() string {
+	return "com.github.cozystack.cozystack.pkg.apis.core.v1alpha1.TapSpec"
+}
+
+func (in TapSource) OpenAPIModelName() string {
+	return "com.github.cozystack.cozystack.pkg.apis.core.v1alpha1.TapSource"
+}
+
+func (in TapPackage) OpenAPIModelName() string {
+	return "com.github.cozystack.cozystack.pkg.apis.core.v1alpha1.TapPackage"
+}
diff --git a/pkg/apis/core/v1alpha1/option_types.go b/pkg/apis/core/v1alpha1/option_types.go
new file mode 100644
index 0000000000..221f21aed4
--- /dev/null
+++ b/pkg/apis/core/v1alpha1/option_types.go
@@ -0,0 +1,44 @@
+// SPDX-License-Identifier: Apache-2.0
+package v1alpha1
+
+import metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+
+// Option is a read-only, virtual resource that serves a named list of
+// dropdown options for the dashboard. metadata.name is the source name
+// (e.g. "gpu", "instancetype"); the items are computed on read by the
+// apiserver from cluster state, so tenants need no direct access to the
+// underlying resources.
+type Option struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	Spec OptionSpec `json:"spec,omitempty"`
+}
+
+// OptionSpec holds the computed option items for a source.
+type OptionSpec struct {
+	Items []OptionItem `json:"items,omitempty"`
+}
+
+// OptionItem is a single selectable option.
+type OptionItem struct {
+	// Value is the string written into the target field.
+	Value string `json:"value"`
+	// Label is an optional human-friendly title; defaults to Value in the UI.
+	Label string `json:"label,omitempty"`
+	// Description is optional helper text (e.g. availability counts or disk size).
+	Description string `json:"description,omitempty"`
+	// Default marks the preselected option (e.g. the default StorageClass); the
+	// UI auto-selects it when the field has no value yet.
+	Default bool `json:"default,omitempty"`
+}
+
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+
+type OptionList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+	Items           []Option `json:"items"`
+}
diff --git a/pkg/apis/core/v1alpha1/register.go b/pkg/apis/core/v1alpha1/register.go
index 84923d2951..b1a8401588 100644
--- a/pkg/apis/core/v1alpha1/register.go
+++ b/pkg/apis/core/v1alpha1/register.go
@@ -61,7 +61,11 @@ func RegisterStaticTypes(scheme *runtime.Scheme) {
 		&TenantSecretList{},
 		&TenantModule{},
 		&TenantModuleList{},
+		&Option{},
+		&OptionList{},
+		&Tap{},
+		&TapList{},
 	)
 	metav1.AddToGroupVersion(scheme, SchemeGroupVersion)
-	klog.V(1).Info("Registered static kinds: TenantNamespace, TenantSecret, TenantModule")
+	klog.V(1).Info("Registered static kinds: TenantNamespace, TenantSecret, TenantModule, Option, Tap")
 }
diff --git a/pkg/apis/core/v1alpha1/tap_types.go b/pkg/apis/core/v1alpha1/tap_types.go
new file mode 100644
index 0000000000..573337bd98
--- /dev/null
+++ b/pkg/apis/core/v1alpha1/tap_types.go
@@ -0,0 +1,89 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright 2025 The Cozystack Authors.
+
+// Tap is a read-only, virtual resource that powers the dashboard marketplace
+// view. Each Tap is computed on read from a PackageSource on the cluster plus
+// the ApplicationDefinitions attributable to it, so the dashboard can list
+// connected repositories and the packages they expose without walking those
+// resources from the browser. Taps are cluster-scoped, mirroring PackageSource.
+//
+// A Tap carries catalog metadata only. It deliberately never exposes a pull
+// Secret name or credentials, so browsing the catalog cannot leak a private
+// tap's credentials across the tenant boundary.
+
+package v1alpha1
+
+import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+
+// Tap represents one connected External-Apps repository (a PackageSource) and
+// the packages it exposes.
+type Tap struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	Spec TapSpec `json:"spec,omitempty"`
+}
+
+// TapSpec is the computed state of a tap.
+type TapSpec struct {
+	// Source is where the tap's artifact comes from (no credentials).
+	Source TapSource `json:"source,omitempty"`
+	// Community is true for tapped sources (marked with the marketplace-tap
+	// label), false for official platform sources.
+	Community bool `json:"community,omitempty"`
+	// Ready reflects the PackageSource's Ready condition.
+	Ready bool `json:"ready,omitempty"`
+	// Message is the PackageSource's Ready condition message, if any.
+	Message string `json:"message,omitempty"`
+	// Packages are the packages this tap exposes, derived from the
+	// ApplicationDefinitions attributable to the PackageSource.
+	Packages []TapPackage `json:"packages,omitempty"`
+
+	// URL is a connect-time input only: the oci:// reference to tap. It is
+	// consumed when a Tap is created and is never populated on read.
+	URL string `json:"url,omitempty"`
+	// Tag is a connect-time input only: the OCI tag to tap (defaults to latest).
+	Tag string `json:"tag,omitempty"`
+	// SecretRef is a connect-time input only: the name of a pull-credential
+	// Secret in cozy-system for a private repository. It is consumed when a Tap
+	// is created and, being a credential reference, is never returned on read.
+	SecretRef string `json:"secretRef,omitempty"`
+}
+
+// TapSource identifies the Flux source backing a tap. It carries no credential.
+type TapSource struct {
+	// Kind is the Flux source kind (OCIRepository or GitRepository).
+	Kind string `json:"kind,omitempty"`
+	// Name is the Flux source name in cozy-system.
+	Name string `json:"name,omitempty"`
+}
+
+// TapPackage is one package exposed by a tap.
+type TapPackage struct {
+	// Name is the ApplicationDefinition name.
+	Name string `json:"name"`
+	// Kind is the application kind users create (spec.application.kind).
+	Kind string `json:"kind,omitempty"`
+	// Component is the PackageSource component this package maps to.
+	Component string `json:"component,omitempty"`
+	// Description, Category, Tags, Icon are dashboard catalog metadata.
+	Description string   `json:"description,omitempty"`
+	Category    string   `json:"category,omitempty"`
+	Tags        []string `json:"tags,omitempty"`
+	Icon        string   `json:"icon,omitempty"`
+	// Privileged is true when the backing component declares install.privileged.
+	Privileged bool `json:"privileged,omitempty"`
+}
+
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+
+// TapList is a list of Taps.
+type TapList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+	Items           []Tap `json:"items"`
+}
diff --git a/pkg/apis/core/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/core/v1alpha1/zz_generated.deepcopy.go
index a19b1d1a89..66219aaa87 100644
--- a/pkg/apis/core/v1alpha1/zz_generated.deepcopy.go
+++ b/pkg/apis/core/v1alpha1/zz_generated.deepcopy.go
@@ -26,6 +26,224 @@ import (
 	runtime "k8s.io/apimachinery/pkg/runtime"
 )
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *Option) DeepCopyInto(out *Option) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
+	in.Spec.DeepCopyInto(&out.Spec)
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Option.
+func (in *Option) DeepCopy() *Option {
+	if in == nil {
+		return nil
+	}
+	out := new(Option)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *Option) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *OptionItem) DeepCopyInto(out *OptionItem) {
+	*out = *in
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new OptionItem.
+func (in *OptionItem) DeepCopy() *OptionItem {
+	if in == nil {
+		return nil
+	}
+	out := new(OptionItem)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *OptionList) DeepCopyInto(out *OptionList) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ListMeta.DeepCopyInto(&out.ListMeta)
+	if in.Items != nil {
+		in, out := &in.Items, &out.Items
+		*out = make([]Option, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new OptionList.
+func (in *OptionList) DeepCopy() *OptionList {
+	if in == nil {
+		return nil
+	}
+	out := new(OptionList)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *OptionList) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *OptionSpec) DeepCopyInto(out *OptionSpec) {
+	*out = *in
+	if in.Items != nil {
+		in, out := &in.Items, &out.Items
+		*out = make([]OptionItem, len(*in))
+		copy(*out, *in)
+	}
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new OptionSpec.
+func (in *OptionSpec) DeepCopy() *OptionSpec {
+	if in == nil {
+		return nil
+	}
+	out := new(OptionSpec)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *Tap) DeepCopyInto(out *Tap) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
+	in.Spec.DeepCopyInto(&out.Spec)
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Tap.
+func (in *Tap) DeepCopy() *Tap {
+	if in == nil {
+		return nil
+	}
+	out := new(Tap)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *Tap) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *TapList) DeepCopyInto(out *TapList) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ListMeta.DeepCopyInto(&out.ListMeta)
+	if in.Items != nil {
+		in, out := &in.Items, &out.Items
+		*out = make([]Tap, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new TapList.
+func (in *TapList) DeepCopy() *TapList {
+	if in == nil {
+		return nil
+	}
+	out := new(TapList)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *TapList) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *TapPackage) DeepCopyInto(out *TapPackage) {
+	*out = *in
+	if in.Tags != nil {
+		in, out := &in.Tags, &out.Tags
+		*out = make([]string, len(*in))
+		copy(*out, *in)
+	}
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new TapPackage.
+func (in *TapPackage) DeepCopy() *TapPackage {
+	if in == nil {
+		return nil
+	}
+	out := new(TapPackage)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *TapSource) DeepCopyInto(out *TapSource) {
+	*out = *in
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new TapSource.
+func (in *TapSource) DeepCopy() *TapSource {
+	if in == nil {
+		return nil
+	}
+	out := new(TapSource)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *TapSpec) DeepCopyInto(out *TapSpec) {
+	*out = *in
+	out.Source = in.Source
+	if in.Packages != nil {
+		in, out := &in.Packages, &out.Packages
+		*out = make([]TapPackage, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new TapSpec.
+func (in *TapSpec) DeepCopy() *TapSpec {
+	if in == nil {
+		return nil
+	}
+	out := new(TapSpec)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *TenantModule) DeepCopyInto(out *TenantModule) {
 	*out = *in
diff --git a/pkg/apis/sdn/DESIGN.md b/pkg/apis/sdn/DESIGN.md
new file mode 100644
index 0000000000..e7fa62f958
--- /dev/null
+++ b/pkg/apis/sdn/DESIGN.md
@@ -0,0 +1,173 @@
+# Cozystack Security Groups — Design
+
+**Status:** Implemented (v1alpha1, aggregated-API projection + membership controller)
+
+## 1. Summary
+
+A **SecurityGroup** is a namespace-scoped, tenant-facing firewall object in the `sdn.cozystack.io/v1alpha1` API group. It is served by the Cozystack aggregated API server (`cozystack-api`) as a **1:1 projection of a single CiliumNetworkPolicy** in the same namespace: tenants manage SecurityGroups while the API server translates each one, synchronously, into a CiliumNetworkPolicy on write and back on read.
+
+A SecurityGroup is a **membership group**. It owns a stable identity label — `securitygroup.sdn.cozystack.io/<name>` — and the backing CiliumNetworkPolicy's `endpointSelector` matches that label rather than any one application's labels. A SecurityGroup **attaches to managed applications by reference** (`spec.attachments`, a list of `{apiGroup, kind, name}`); a dedicated controller stamps the membership label onto the attached applications' pods and removes it when they are detached. Because the selector is the group's own machine-assigned label and the attachments are resolved through the lineage labels the platform already stamps, a SecurityGroup can only ever apply to its attached applications' own pods in the tenant's namespace — never to arbitrary or platform-owned pods — and one SecurityGroup can attach to several applications at once.
+
+Rule peers are expressed in the same vocabulary: `fromApp`/`toApp` reference managed applications (resolved to their lineage labels) and `fromSG`/`toSG` reference other SecurityGroups (resolved to the *other* group's membership label). The `fromSG`/`toSG` reference is **live**: it projects to a label the Cilium dataplane resolves dynamically, so re-attaching a group to different applications updates every rule that references it without rewriting those rules.
+
+The product value is the **RBAC boundary plus a Cozystack-native surface**: tenants get self-service control over the network policy of their own applications without any access to the `cilium.io` API group, and without the platform exposing Cilium's full, version-coupled CRD surface to them.
+
+## 2. Goals / Non-Goals
+
+**Goals**
+
+- Let tenants declare allow-list ingress/egress for their own applications, scoped to their namespace, with one SecurityGroup able to cover several applications.
+- Derive the enforced pod set from authorized references (attachments and app/SG peers), never from free-form tenant input.
+- Support live group-to-group references (`fromSG`/`toSG`) that follow membership as attachments change.
+- Keep policy count equal to the number of SecurityGroups (1 SecurityGroup ↔ 1 CiliumNetworkPolicy).
+- Require no direct tenant access to `cilium.io` resources, and keep the membership label writable only by the platform.
+
+**Non-Goals**
+
+- **We do not flip the tenant baseline to default-deny in this change.** Today the per-tenant baseline (`packages/apps/tenant/templates/networkpolicy.yaml`) blanket-allows intra-namespace and outbound traffic, and Cilium allow-rules are additive, so a SecurityGroup can only *widen* — it cannot yet restrict (`ingress: []` does not deny). This API is designed to be the right one in the default-deny world, but actually shrinking the baseline touches every tenant and is its own change (§8).
+- **We do not add a membership admission webhook in this change.** The controller closes the membership labels asynchronously; a pod-admission webhook to make new pods members at creation time only matters under default-deny and is deferred with the baseline flip (§7, §8).
+- We do not redesign tenant isolation; existing platform isolation policies carry no SecurityGroup marker label, so they are invisible to this API and untouched.
+- We do not let a SecurityGroup target free-form label selectors or raw (non-application) pods, name reserved Cilium entities, or reference SecurityGroups in another namespace.
+
+## 3. Architecture
+
+The design has two cleanly-split halves.
+
+1. A tenant creates a **SecurityGroup** (`sdn.cozystack.io/v1alpha1`) with `spec.attachments` (managed applications) and `ingress`/`egress` rules.
+2. The `cozystack-api` REST storage translates it into a **CiliumNetworkPolicy** of the same name and namespace, carrying the marker label `sdn.cozystack.io/securitygroup: "true"`. The CiliumNetworkPolicy's `endpointSelector` is the SecurityGroup's own membership label `securitygroup.sdn.cozystack.io/<name>`. The attachments are stored in a storage-owned annotation (`sdn.cozystack.io/attachments`); peers project into endpoint selectors. This translation is synchronous and stateless.
+3. The **securitygroup-controller** watches the marked CiliumNetworkPolicies and managed-app pods. For each policy it stamps the membership label onto the pods of every attached application and removes it on detach or deletion. This is the only stateful piece, and the only writer of membership labels.
+4. Reads (`get`/`list`/`watch`) project marked CiliumNetworkPolicies back into SecurityGroups, rebuilding `attachments` from the annotation and `fromApp`/`fromSG` (and `toApp`/`toSG`) from the rule endpoint selectors. The marker label and the attachments annotation are hidden from the SecurityGroup view.
+
+### 3.1 Marker-label scoping
+
+Only CiliumNetworkPolicies labelled `sdn.cozystack.io/securitygroup: "true"` are visible through the SecurityGroup API. Policies created by other means (platform tenant-isolation policies, hand-written CiliumNetworkPolicies) are never surfaced and never mutated. `get`/`update`/`patch`/`delete` of an unmarked policy returns `NotFound`. The storage owns the marker label and always re-asserts it on every write after any tenant-supplied labels are merged, so a tenant cannot orphan an enforced policy by overwriting the marker through spec labels.
+
+### 3.2 Membership labels and attachments
+
+A SecurityGroup's membership label key is `securitygroup.sdn.cozystack.io/<name>` (value always empty). The backing policy's `endpointSelector` matches it. The membership relationship — which applications the group attaches to — is stored as a JSON array of `ApplicationReference` in the storage-owned annotation `sdn.cozystack.io/attachments` on the backing policy. The storage re-asserts that annotation from `spec.attachments` on every write (canonicalizing an empty `apiGroup` to `apps.cozystack.io`) and hides it from the SecurityGroup view, exactly as it does the marker label. There is no home for the attachment list in the CiliumNetworkPolicy spec — the spec's selector is the group's own identity, decoupled from any single application — so the annotation is where the controller reads it.
+
+### 3.3 The membership controller
+
+The `securitygroup-controller` (`internal/securitygroupcontroller`, `cmd/securitygroup-controller`) reconciles membership labels. For each marked policy it computes the desired member set — the union, over the policy's attachments, of pods in the policy's namespace carrying that application's lineage labels — and brings the actual set of pods labelled `securitygroup.sdn.cozystack.io/<name>` to match, adding and removing the label with single-key merge patches. It carries a finalizer on the backing policy so the membership labels are stripped before the policy is deleted. It watches managed-app pods so a freshly-created pod of an attached application is labelled promptly.
+
+The controller is cheap because the identity it needs already lands on every managed-app pod: the lineage mutating webhook (`internal/lineagecontrollerwebhook`) stamps `apps.cozystack.io/application.{group,kind,name}` and `internal.cozystack.io/managed-by-cozystack: "true"` at admission. The controller only consumes those labels; it adds no responsibility to the webhook.
+
+### 3.4 Why an in-tree CiliumNetworkPolicy mirror
+
+Neither `cozystack-api` nor the controller imports the `github.com/cilium/cilium` Go module: importing it would tie this project's `k8s.io` libraries to Cilium's. Go builds with the higher of the two required versions, so a Cilium release built on a newer Kubernetes would drag them forward, and one built on an older Kubernetes would have to compile against ours. The storage uses a minimal in-tree mirror (`CiliumNetworkPolicy` with a concrete `endpointSelector` and Cilium-shaped ingress/egress rules) registered at GroupVersion `cilium.io/v2`; the controller uses an even smaller metadata-only mirror (it never reads or writes the spec, so its mirror omits it and changes finalizers through merge patches that never carry a spec). Because the field names and JSON tags match the CiliumNetworkPolicy CRD exactly, marshalling produces wire-compatible objects.
+
+### 3.5 Liveness of `fromSG`/`toSG`
+
+`fromSG: other` projects to `fromEndpoints: [{matchLabels: {securitygroup.sdn.cozystack.io/other: ""}}]` — the *other* group's membership label. Cilium resolves that label against live pods at enforcement time, so when `other` re-attaches to different applications its membership label moves with it and every rule referencing `other` follows automatically. This is the payoff of the membership model over a frozen reference: a `targetRef`-style model would have to dereference `other` to its applications and freeze those labels into the rule at write time, going stale the moment `other` re-targeted.
+
+## 4. API
+
+```yaml
+apiVersion: sdn.cozystack.io/v1alpha1
+kind: SecurityGroup
+metadata:
+  name: db
+  namespace: tenant-a
+spec:
+  attachments:
+    - kind: Postgres        # apiGroup optional, defaults to apps.cozystack.io
+      name: db
+  ingress:
+    - fromApp:
+        - kind: Kubernetes
+          name: web
+      fromSG:
+        - frontend
+      toPorts:
+        - ports:
+            - port: "5432"
+              protocol: TCP
+  egress:
+    - toFQDNs:
+        - matchPattern: "*.apt.example.org"
+    - toCIDR:
+        - "10.0.0.0/8"
+```
+
+`SecurityGroupSpec` carries `attachments` plus `ingress[]` (`fromApp`, `fromSG`, `fromCIDR`, `toPorts`) and `egress[]` (`toApp`, `toSG`, `toCIDR`, `toFQDNs`, `toPorts`). Each `ApplicationReference` requires `kind` and `name`; `apiGroup` defaults to `apps.cozystack.io`. Every reference component must be a valid label value, and each `fromSG`/`toSG` name must project to a valid label key (`securitygroup.sdn.cozystack.io/<name>`); names that collide with reserved Cilium entities (`world`, `cluster`, `kube-apiserver`, `host`, …) are rejected, since external reach is expressed through CIDR/FQDN, not entities. An empty `attachments` list is valid — the group simply selects no pods until something is attached. An empty `ingress`/`egress` list adds no allow rules in that direction; because Cilium policies are additive over the tenant's blanket-allow baseline it does not isolate the member pods — see §7 for why the membership API is inert as a restriction until the baseline becomes default-deny.
+
+## 5. Backing CiliumNetworkPolicy
+
+The SecurityGroup above projects to:
+
+```yaml
+apiVersion: cilium.io/v2
+kind: CiliumNetworkPolicy
+metadata:
+  name: db
+  namespace: tenant-a
+  labels:
+    sdn.cozystack.io/securitygroup: "true"
+  annotations:
+    sdn.cozystack.io/attachments: '[{"apiGroup":"apps.cozystack.io","kind":"Postgres","name":"db"}]'
+spec:
+  endpointSelector:
+    matchLabels:                                         # the group's own membership label
+      securitygroup.sdn.cozystack.io/db: ""
+  ingress:
+    - fromEndpoints:
+        - matchLabels:                                   # fromApp -> lineage labels
+            apps.cozystack.io/application.group: apps.cozystack.io
+            apps.cozystack.io/application.kind: Kubernetes
+            apps.cozystack.io/application.name: web
+        - matchLabels:                                   # fromSG -> the other group's membership label
+            securitygroup.sdn.cozystack.io/frontend: ""
+      toPorts:
+        - ports:
+            - port: "5432"
+              protocol: TCP
+  egress:
+    - toFQDNs:
+        - matchPattern: "*.apt.example.org"
+    - toCIDR:
+        - "10.0.0.0/8"
+```
+
+The securitygroup-controller stamps `securitygroup.sdn.cozystack.io/db: ""` onto the pods of the attached `Postgres/db` application, which is what makes the policy's `endpointSelector` select them.
+
+A **membership-only SecurityGroup** — one with `attachments` but no `ingress`/`egress` rules — still projects to a backing CiliumNetworkPolicy, because the controller reconciles the policy (not the SecurityGroup) and the attachments live on it. The CiliumNetworkPolicy CRD requires at least one rule section to be present (its `spec` `anyOf` is `ingress | ingressDeny | egress | egressDeny`), so the projection always emits the `ingress` section, an empty list `ingress: []` when the group has no ingress rules. An empty list is the CRD's documented no-op ("if omitted or empty, this rule does not apply at ingress") and `enableDefaultDeny` defaults to `false` for a direction with no rules, so the policy is schema-valid yet datapath-inert: it neither allows nor denies anything, consistent with §7. The empty section is hidden from the SecurityGroup view on read, so a membership-only group round-trips with no `ingress`/`egress`.
+
+## 6. RBAC
+
+- **`cozystack-api` ServiceAccount** — full CRUD on `ciliumnetworkpolicies.cilium.io`, since the storage CRUDs these objects on behalf of tenants.
+- **`securitygroup-controller` ServiceAccount** — cluster-wide `get`/`list`/`watch`/`patch` on `pods` (it stamps the membership label across dynamically-created tenant namespaces) and `get`/`list`/`watch`/`patch` on `ciliumnetworkpolicies.cilium.io` (to watch the backing policies and manage its finalizer via merge patches). This is the platform's first tenant-driven, cluster-wide pod-label writer; §7 covers how the controller is constrained so the grant is safe.
+- **Tenants** — `securitygroups.sdn.cozystack.io` is granted across the tenant ClusterRole tiers exactly like `apps.cozystack.io`: the tenant ServiceAccount role gets full access, human `view` read-only, human `admin`/`super-admin` write. Tenants never receive any `cilium.io` permission, and never write the membership label.
+
+## 7. Safety & Interactions
+
+**The membership label is written exclusively by the platform.** Tenants address SecurityGroups, never the `cilium.io` objects or pod labels. The selector a policy enforces is the group's own membership label, and that label is placed on pods only by the securitygroup-controller.
+
+**The controller is a privileged pod-label writer, and is constrained to stay safe.** A cluster-wide `pods: patch` grant driven by tenant-authored objects is a real new surface (the rest of the tenant-facing platform is read-only or namespace-scoped). The controller upholds three invariants so it cannot reach pods a tenant could not otherwise address: it resolves each attachment through the lineage labels the webhook stamps (never the attachment list directly), it only ever labels pods in the SecurityGroup's own namespace, and it patches a single label key so it can neither clobber another group's label nor a pod's lineage labels. The membership label key is namespace-unique only (two tenants can each have a group named `db`), so the namespace-equality invariant — not the key — is what keeps one tenant's group off another tenant's pods; the namespaced backing policy independently scopes *enforcement* to its own namespace.
+
+**Eventual-consistency window.** The controller labels pods asynchronously, so a newly-created pod of an attached application is briefly unlabelled. Under the current allow-all baseline this is harmless: a SecurityGroup only adds allowances, so an unlabelled pod is simply "not yet additionally allowed," never wrongly denied. Under a future default-deny baseline this window would wrongly deny a fresh pod until the controller catches up, which is exactly why a pod-admission webhook is paired with the baseline flip (§8) rather than shipped now.
+
+**A tenant cannot deny platform-managed traffic — and, today, cannot deny anything.** Cilium policies are additive: when several policies select an endpoint the allowed set is the union of their allow rules, and SecurityGroup exposes only allow rules. The per-tenant baseline blanket-allows intra-namespace and outbound traffic, so a SecurityGroup can only *widen* it; `ingress: []` does not actually deny. The membership API is therefore inert as a restriction until the baseline becomes default-deny. It is shipped now to settle the contract (membership identity, live group references, no free-form selectors) before tenants depend on it.
+
+**The membership model does not, by itself, solve "a tenant firewalls its own managed application."** Once the baseline is default-deny, a tenant could attach a SecurityGroup with `ingress: []` to their own managed Postgres and starve its platform traffic (backups, metrics scrape, operator reconcile). The fix for that is platform-traffic carve-outs in the baseline, orthogonal to membership and out of scope here (§8).
+
+**Caveats.**
+
+- Attachments and app peers can only reference managed applications. Raw, tenant-created pods carry no lineage labels and cannot be members or peers — a deliberate trade for the structural boundary above.
+- A reference to a non-existent application or SecurityGroup is not rejected: it resolves to no pods, so it has no effect. The storage does not verify existence (a SubjectAccessReview/existence check is possible future UX, not a security requirement).
+- If the controller is uninstalled, membership labels it stamped remain on pods and the backing policies keep enforcing against them; pods created afterwards are not labelled. This is acceptable for an opt-in, additive feature and revisited with the default-deny work.
+
+**Other interactions.**
+
+- SecurityGroup requires the `ciliumnetworkpolicies.cilium.io` CRD (Cilium ships in the standard Cozystack networking stack). On a cluster without it, every SecurityGroup operation fails loudly rather than silently.
+
+## 8. Future Work
+
+The aggregated-API + controller model is intentionally minimal. The following can be layered on without changing the core projection:
+
+- **Default-deny tenant baseline.** Shrink the per-tenant baseline to the minimum the platform needs (DNS, apiserver, monitoring, each app's own flows) and let tenants open the rest with SecurityGroups. This is what gives the feature its restrictive power; it touches every tenant, needs the membership admission webhook below, and is its own change.
+- **Membership admission webhook.** Stamp the membership label at pod-create time to close the eventual-consistency window under default-deny. It must be a *separate* webhook: the lineage webhook is gated by `objectSelector: managed-by-cozystack DoesNotExist`, so it never re-fires on already-managed pods and cannot be extended to do this, nor can it retro-label running pods — a backfill controller (this one) is still required.
+- **Platform-traffic carve-outs** in the default-deny baseline so a tenant cannot starve their own managed application's management plane.
+- **Cluster-scope** SecurityGroups projecting to CiliumClusterwideNetworkPolicy.
+- Reusable **CIDR/FQDN groups**, and exposing more of the CiliumNetworkPolicy rule surface (ICMP, `toServices`, CIDR-set exceptions) as demand appears.
+- An optional **existence/authorization check** on attachments and SG peers (SubjectAccessReview) to fail fast on a typo instead of silently matching zero pods.
+- **Richer spec validation.** Create and update already validate the highest-risk fields synchronously — CIDR syntax, port range, the protocol enum, attachment/peer label validity, reserved-entity names — and reject a bad value with `Invalid` instead of writing a policy Cilium would silently discard. Still deferred: FQDN `matchName`/`matchPattern` syntax and cross-rule consistency, which pass through to Cilium.
diff --git a/pkg/apis/sdn/fuzzer/fuzzer.go b/pkg/apis/sdn/fuzzer/fuzzer.go
new file mode 100644
index 0000000000..ec73cb8798
--- /dev/null
+++ b/pkg/apis/sdn/fuzzer/fuzzer.go
@@ -0,0 +1,33 @@
+/*
+Copyright 2026 The Cozystack Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package fuzzer
+
+import (
+	"github.com/cozystack/cozystack/pkg/apis/sdn/v1alpha1"
+
+	runtimeserializer "k8s.io/apimachinery/pkg/runtime/serializer"
+	"sigs.k8s.io/randfill"
+)
+
+// Funcs returns the fuzzer functions for the sdn api group.
+var Funcs = func(codecs runtimeserializer.CodecFactory) []any {
+	return []any{
+		func(s *v1alpha1.SecurityGroup, c randfill.Continue) {
+			c.FillNoCustom(s) // fill self without calling this function again
+		},
+	}
+}
diff --git a/pkg/apis/sdn/install/install.go b/pkg/apis/sdn/install/install.go
new file mode 100644
index 0000000000..c6caa9c421
--- /dev/null
+++ b/pkg/apis/sdn/install/install.go
@@ -0,0 +1,29 @@
+/*
+Copyright 2026 The Cozystack Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package install
+
+import (
+	sdnv1alpha1 "github.com/cozystack/cozystack/pkg/apis/sdn/v1alpha1"
+	"k8s.io/apimachinery/pkg/runtime"
+	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
+)
+
+// Install registers the API group and adds types to a scheme
+func Install(scheme *runtime.Scheme) {
+	utilruntime.Must(sdnv1alpha1.AddToScheme(scheme))
+	utilruntime.Must(scheme.SetVersionPriority(sdnv1alpha1.SchemeGroupVersion))
+}
diff --git a/pkg/apis/sdn/install/roundtrip_test.go b/pkg/apis/sdn/install/roundtrip_test.go
new file mode 100644
index 0000000000..78c6367cc6
--- /dev/null
+++ b/pkg/apis/sdn/install/roundtrip_test.go
@@ -0,0 +1,28 @@
+/*
+Copyright 2026 The Cozystack Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package install
+
+import (
+	"testing"
+
+	sdnfuzzer "github.com/cozystack/cozystack/pkg/apis/sdn/fuzzer"
+	"k8s.io/apimachinery/pkg/api/apitesting/roundtrip"
+)
+
+func TestRoundTripTypes(t *testing.T) {
+	roundtrip.RoundTripTestForAPIGroup(t, Install, sdnfuzzer.Funcs)
+}
diff --git a/pkg/apis/sdn/register.go b/pkg/apis/sdn/register.go
new file mode 100644
index 0000000000..d53635d054
--- /dev/null
+++ b/pkg/apis/sdn/register.go
@@ -0,0 +1,22 @@
+/*
+Copyright 2026 The Cozystack Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package sdn
+
+// GroupName is the group name used in this package
+const (
+	GroupName = "sdn.cozystack.io"
+)
diff --git a/pkg/apis/sdn/v1alpha1/doc.go b/pkg/apis/sdn/v1alpha1/doc.go
new file mode 100644
index 0000000000..d4f632e15e
--- /dev/null
+++ b/pkg/apis/sdn/v1alpha1/doc.go
@@ -0,0 +1,26 @@
+/*
+Copyright 2026 The Cozystack Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// +k8s:openapi-gen=true
+// +k8s:openapi-model-package=com.github.cozystack.cozystack.pkg.apis.sdn.v1alpha1
+// +k8s:deepcopy-gen=package
+// +k8s:conversion-gen=github.com/cozystack/cozystack/pkg/apis/sdn
+// +k8s:conversion-gen=k8s.io/apiextensions-apiserver/pkg/apis/apiextensions
+// +k8s:defaulter-gen=TypeMeta
+// +groupName=sdn.cozystack.io
+
+// Package v1alpha1 is the v1alpha1 version of the API.
+package v1alpha1 // import "github.com/cozystack/cozystack/pkg/apis/sdn/v1alpha1"
diff --git a/pkg/apis/sdn/v1alpha1/model_name.go b/pkg/apis/sdn/v1alpha1/model_name.go
new file mode 100644
index 0000000000..8ed9eccc52
--- /dev/null
+++ b/pkg/apis/sdn/v1alpha1/model_name.go
@@ -0,0 +1,92 @@
+/*
+Copyright 2026 The Cozystack Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package v1alpha1
+
+// OpenAPIModelName pins the OpenAPI model name for the sdn.cozystack.io types.
+// This is hand-written (not generated) on purpose.
+//
+// Without it, openapi-gen keys the generated definition map on the Go import
+// path ("github.com/cozystack/cozystack/pkg/apis/sdn/v1alpha1.SecurityGroup"),
+// and since Kubernetes 0.35 the apiserver's DefinitionNamer.GetDefinitionName
+// returns whatever name it is given verbatim instead of converting it to the
+// "friendly" reversed-path form. The published document then keys the definition
+// on the raw path while every $ref to it is JSON pointer escaped
+// ("#/definitions/github.com~1cozystack~1…v1alpha1.SecurityGroupSpec", ~1 being
+// a slash), and clients resolve a $ref by trimming "#/definitions/" without
+// unescaping. The two spellings never meet, so the reference dangles and
+// client-side validation fails on every resource in the group, not only the one
+// named in the error:
+//
+//	error validating data: SchemaError(…sdn/v1alpha1.SecurityGroup.spec):
+//	unknown model in reference: "github.com~1cozystack~1…v1alpha1.SecurityGroupSpec"
+//
+// Declaring the dotted name here makes GetCanonicalTypeName,
+// Scheme.ToOpenAPIDefinitionName and the generated openapi map key all agree on
+// a name with no slash in it, so nothing needs escaping and every $ref resolves.
+// The same agreement is what lets DefinitionNamer attach the
+// x-kubernetes-group-version-kind extension, which server-side apply needs to
+// resolve a kind (see the apps package, where its absence broke SSA instead).
+//
+// code-generator's openapi-gen could emit these via --output-model-name-file,
+// but that also rewrites zz_generated.model_name.go in the read-only apimachinery
+// / apiextensions module-cache packages the shared gen_openapi helper always
+// passes as inputs, which fails on any consumer (including CI) that vendors deps
+// from the module cache. Keeping the methods here sidesteps that.
+//
+// The +k8s:openapi-model-package marker in doc.go makes openapi-gen emit
+// Type{}.OpenAPIModelName() for every type in this package it generates a schema
+// or a reference for, so a new sdn.cozystack.io type without a method here fails
+// the build rather than silently reintroducing a Go-path name. The returned
+// string must be the dotted form Scheme.ToOpenAPIDefinitionName derives from the
+// type's Go package path, which is the marker's value plus the type name. See
+// https://github.com/cozystack/cozystack/issues/3806.
+
+func (in ApplicationReference) OpenAPIModelName() string {
+	return "com.github.cozystack.cozystack.pkg.apis.sdn.v1alpha1.ApplicationReference"
+}
+
+func (in EgressRule) OpenAPIModelName() string {
+	return "com.github.cozystack.cozystack.pkg.apis.sdn.v1alpha1.EgressRule"
+}
+
+func (in FQDNSelector) OpenAPIModelName() string {
+	return "com.github.cozystack.cozystack.pkg.apis.sdn.v1alpha1.FQDNSelector"
+}
+
+func (in IngressRule) OpenAPIModelName() string {
+	return "com.github.cozystack.cozystack.pkg.apis.sdn.v1alpha1.IngressRule"
+}
+
+func (in PortProtocol) OpenAPIModelName() string {
+	return "com.github.cozystack.cozystack.pkg.apis.sdn.v1alpha1.PortProtocol"
+}
+
+func (in PortRule) OpenAPIModelName() string {
+	return "com.github.cozystack.cozystack.pkg.apis.sdn.v1alpha1.PortRule"
+}
+
+func (in SecurityGroup) OpenAPIModelName() string {
+	return "com.github.cozystack.cozystack.pkg.apis.sdn.v1alpha1.SecurityGroup"
+}
+
+func (in SecurityGroupList) OpenAPIModelName() string {
+	return "com.github.cozystack.cozystack.pkg.apis.sdn.v1alpha1.SecurityGroupList"
+}
+
+func (in SecurityGroupSpec) OpenAPIModelName() string {
+	return "com.github.cozystack.cozystack.pkg.apis.sdn.v1alpha1.SecurityGroupSpec"
+}
diff --git a/pkg/apis/sdn/v1alpha1/register.go b/pkg/apis/sdn/v1alpha1/register.go
new file mode 100644
index 0000000000..3739c8deba
--- /dev/null
+++ b/pkg/apis/sdn/v1alpha1/register.go
@@ -0,0 +1,55 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright 2026 The Cozystack Authors.
+
+package v1alpha1
+
+import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+)
+
+// -----------------------------------------------------------------------------
+// Group / version boiler-plate
+// -----------------------------------------------------------------------------
+
+// GroupName is the API group for every resource in this package.
+const GroupName = "sdn.cozystack.io"
+
+// SchemeGroupVersion is the canonical {group,version} for v1alpha1.
+var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1alpha1"}
+
+// -----------------------------------------------------------------------------
+// Scheme registration helpers
+// -----------------------------------------------------------------------------
+
+var (
+	// SchemeBuilder is used by generated deepcopy code.
+	SchemeBuilder      runtime.SchemeBuilder
+	localSchemeBuilder = &SchemeBuilder
+	AddToScheme        = localSchemeBuilder.AddToScheme
+)
+
+func init() {
+	// Manually-written types go here.  Generated deepcopy code is wired in
+	// via `zz_generated.deepcopy.go`.
+	localSchemeBuilder.Register(addKnownTypes)
+}
+
+// addKnownTypes registers the SecurityGroup kinds and group-version meta. It is
+// wired into AddToScheme via the SchemeBuilder, so any scheme built through
+// Install (the apiserver, the roundtrip tests) recognizes the concrete types —
+// not just the server-start path.
+func addKnownTypes(scheme *runtime.Scheme) error {
+	scheme.AddKnownTypes(SchemeGroupVersion,
+		&SecurityGroup{},
+		&SecurityGroupList{},
+	)
+	metav1.AddToGroupVersion(scheme, SchemeGroupVersion)
+	return nil
+}
+
+// Resource turns an unqualified resource name into a fully-qualified one.
+func Resource(resource string) schema.GroupResource {
+	return SchemeGroupVersion.WithResource(resource).GroupResource()
+}
diff --git a/pkg/apis/sdn/v1alpha1/securitygroup_types.go b/pkg/apis/sdn/v1alpha1/securitygroup_types.go
new file mode 100644
index 0000000000..9b6b15ad63
--- /dev/null
+++ b/pkg/apis/sdn/v1alpha1/securitygroup_types.go
@@ -0,0 +1,182 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright 2026 The Cozystack Authors.
+
+package v1alpha1
+
+import metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+const (
+	// SecurityGroupKind is the kind of the SecurityGroup resource.
+	SecurityGroupKind = "SecurityGroup"
+	// SecurityGroupListKind is the kind of the SecurityGroupList resource.
+	SecurityGroupListKind = "SecurityGroupList"
+	// SecurityGroupSingularName is the singular resource name.
+	SecurityGroupSingularName = "securitygroup"
+	// SecurityGroupPluralName is the plural resource name.
+	SecurityGroupPluralName = "securitygroups"
+
+	// MembershipLabelPrefix is the prefix of a SecurityGroup's membership label
+	// key. The full key is MembershipLabelPrefix + <securitygroup name>; the
+	// value is always the empty string. The securitygroup-controller stamps this
+	// label onto the pods of the applications a SecurityGroup is attached to, and
+	// the backing CiliumNetworkPolicy's endpointSelector matches it. fromSG/toSG
+	// peers resolve to this same key on the referenced group, which lets the
+	// Cilium dataplane resolve group-to-group references live.
+	MembershipLabelPrefix = "securitygroup.sdn.cozystack.io/"
+
+	// MembershipFinalizer guards a SecurityGroup's backing CiliumNetworkPolicy so
+	// the securitygroup-controller can strip the membership labels off member
+	// pods before the policy is removed. The REST storage re-asserts it on every
+	// write (a full-replace PUT would otherwise strip it and orphan the labels),
+	// and the controller adds and removes it — both must use this one definition.
+	MembershipFinalizer = "sdn.cozystack.io/securitygroup-membership"
+)
+
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+
+// SecurityGroup is a tenant-facing, namespace-scoped firewall object. It is a
+// projection of a single CiliumNetworkPolicy served by the Cozystack
+// aggregated API: tenants manage SecurityGroups while the platform translates
+// each one 1:1 into a CiliumNetworkPolicy in the same namespace, without
+// granting tenants direct access to the cilium.io API group.
+//
+// A SecurityGroup is a membership group: it owns a membership label
+// (MembershipLabelPrefix + its name) that the securitygroup-controller stamps
+// onto the pods of the applications listed in spec.attachments. The backing
+// CiliumNetworkPolicy selects that membership label, so one SecurityGroup can
+// apply to several applications at once.
+type SecurityGroup struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	// Spec describes the applications this SecurityGroup attaches to and the
+	// traffic it allows.
+	Spec SecurityGroupSpec `json:"spec,omitempty"`
+}
+
+// SecurityGroupSpec describes the managed applications a SecurityGroup attaches
+// to and the traffic it allows. The backing CiliumNetworkPolicy's
+// endpointSelector is the SecurityGroup's own membership label, which the
+// securitygroup-controller maintains on the attached applications' pods — so a
+// SecurityGroup can only ever apply to those applications' own pods in the same
+// namespace.
+type SecurityGroupSpec struct {
+	// Attachments lists the managed applications whose pods join this group. The
+	// securitygroup-controller stamps the SecurityGroup's membership label
+	// (MembershipLabelPrefix + name) onto the pods of each referenced
+	// application in the same namespace, and removes it when the attachment is
+	// dropped. An empty list means the group selects no pods.
+	Attachments []ApplicationReference `json:"attachments,omitempty"`
+
+	// Ingress is the list of rules describing allowed inbound traffic. Each rule
+	// only ADDS allowed sources. An empty list adds no allow rules and does NOT
+	// isolate the member pods: effective connectivity is the union of every
+	// policy selecting a pod, including the platform's blanket-allow baseline, so
+	// an empty list leaves ingress open rather than denying it. Actual deny /
+	// default-deny enforcement depends on the default-deny baseline, tracked
+	// separately as future work.
+	Ingress []IngressRule `json:"ingress,omitempty"`
+
+	// Egress is the list of rules describing allowed outbound traffic. Each rule
+	// only ADDS allowed destinations. An empty list adds no allow rules and does
+	// NOT isolate the member pods: effective connectivity is the union of every
+	// policy selecting a pod, including the platform's blanket-allow baseline, so
+	// an empty list leaves egress open rather than denying it. Actual deny /
+	// default-deny enforcement depends on the default-deny baseline, tracked
+	// separately as future work.
+	Egress []EgressRule `json:"egress,omitempty"`
+}
+
+// ApplicationReference identifies a managed Cozystack application by its
+// group, kind and name. It is used both for SecurityGroup attachments and for
+// fromApp/toApp peers, and resolves to the application's lineage labels
+// (apps.cozystack.io/application.{group,kind,name}).
+type ApplicationReference struct {
+	// APIGroup of the referenced application. Defaults to apps.cozystack.io when
+	// empty, the group under which Cozystack serves its managed applications.
+	APIGroup string `json:"apiGroup,omitempty"`
+
+	// Kind of the referenced application, e.g. "Postgres".
+	Kind string `json:"kind"`
+
+	// Name of the referenced application.
+	Name string `json:"name"`
+}
+
+// IngressRule describes one set of allowed inbound sources and ports.
+type IngressRule struct {
+	// FromApp selects source pods belonging to the referenced managed
+	// applications, by their lineage labels.
+	FromApp []ApplicationReference `json:"fromApp,omitempty"`
+
+	// FromSG selects source pods that are members of the named SecurityGroups in
+	// the same namespace, by their membership label. The reference is live: it
+	// follows the other group's membership as attachments change.
+	FromSG []string `json:"fromSG,omitempty"`
+
+	// FromCIDR is a list of CIDR ranges allowed as traffic sources.
+	FromCIDR []string `json:"fromCIDR,omitempty"`
+
+	// ToPorts restricts the rule to the listed destination ports. An empty list
+	// allows traffic on all ports.
+	ToPorts []PortRule `json:"toPorts,omitempty"`
+}
+
+// EgressRule describes one set of allowed outbound destinations and ports.
+type EgressRule struct {
+	// ToApp selects destination pods belonging to the referenced managed
+	// applications, by their lineage labels.
+	ToApp []ApplicationReference `json:"toApp,omitempty"`
+
+	// ToSG selects destination pods that are members of the named SecurityGroups
+	// in the same namespace, by their membership label. The reference is live: it
+	// follows the other group's membership as attachments change.
+	ToSG []string `json:"toSG,omitempty"`
+
+	// ToCIDR is a list of CIDR ranges allowed as traffic destinations.
+	ToCIDR []string `json:"toCIDR,omitempty"`
+
+	// ToFQDNs is a list of fully qualified domain name matchers allowed as
+	// traffic destinations.
+	ToFQDNs []FQDNSelector `json:"toFQDNs,omitempty"`
+
+	// ToPorts restricts the rule to the listed destination ports. An empty list
+	// allows traffic on all ports.
+	ToPorts []PortRule `json:"toPorts,omitempty"`
+}
+
+// PortRule is a set of ports a traffic rule applies to.
+type PortRule struct {
+	// Ports is the list of port/protocol pairs the rule applies to.
+	Ports []PortProtocol `json:"ports,omitempty"`
+}
+
+// PortProtocol is a single port and protocol pair.
+type PortProtocol struct {
+	// Port is the L4 port number as a string, or a named port. An empty value
+	// matches all ports.
+	Port string `json:"port,omitempty"`
+
+	// Protocol is the L4 protocol. One of TCP, UDP, SCTP or ANY. Defaults to ANY
+	// when empty.
+	Protocol string `json:"protocol,omitempty"`
+}
+
+// FQDNSelector matches destination traffic by domain name.
+type FQDNSelector struct {
+	// MatchName matches a fully qualified domain name exactly.
+	MatchName string `json:"matchName,omitempty"`
+
+	// MatchPattern matches fully qualified domain names against a pattern, where
+	// "*" matches a single domain label.
+	MatchPattern string `json:"matchPattern,omitempty"`
+}
+
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+
+// SecurityGroupList is a list of SecurityGroup objects.
+type SecurityGroupList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+	Items           []SecurityGroup `json:"items"`
+}
diff --git a/pkg/apis/sdn/v1alpha1/zz_generated.conversion.go b/pkg/apis/sdn/v1alpha1/zz_generated.conversion.go
new file mode 100644
index 0000000000..3b3b068a44
--- /dev/null
+++ b/pkg/apis/sdn/v1alpha1/zz_generated.conversion.go
@@ -0,0 +1,36 @@
+//go:build !ignore_autogenerated
+// +build !ignore_autogenerated
+
+/*
+Copyright 2025 The Cozystack Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// Code generated by conversion-gen. DO NOT EDIT.
+
+package v1alpha1
+
+import (
+	runtime "k8s.io/apimachinery/pkg/runtime"
+)
+
+func init() {
+	localSchemeBuilder.Register(RegisterConversions)
+}
+
+// RegisterConversions adds conversion functions to the given scheme.
+// Public to allow building arbitrary schemes.
+func RegisterConversions(s *runtime.Scheme) error {
+	return nil
+}
diff --git a/pkg/apis/sdn/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/sdn/v1alpha1/zz_generated.deepcopy.go
new file mode 100644
index 0000000000..35cd9d4f6f
--- /dev/null
+++ b/pkg/apis/sdn/v1alpha1/zz_generated.deepcopy.go
@@ -0,0 +1,271 @@
+//go:build !ignore_autogenerated
+// +build !ignore_autogenerated
+
+/*
+Copyright 2025 The Cozystack Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// Code generated by deepcopy-gen. DO NOT EDIT.
+
+package v1alpha1
+
+import (
+	runtime "k8s.io/apimachinery/pkg/runtime"
+)
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *ApplicationReference) DeepCopyInto(out *ApplicationReference) {
+	*out = *in
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ApplicationReference.
+func (in *ApplicationReference) DeepCopy() *ApplicationReference {
+	if in == nil {
+		return nil
+	}
+	out := new(ApplicationReference)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *EgressRule) DeepCopyInto(out *EgressRule) {
+	*out = *in
+	if in.ToApp != nil {
+		in, out := &in.ToApp, &out.ToApp
+		*out = make([]ApplicationReference, len(*in))
+		copy(*out, *in)
+	}
+	if in.ToSG != nil {
+		in, out := &in.ToSG, &out.ToSG
+		*out = make([]string, len(*in))
+		copy(*out, *in)
+	}
+	if in.ToCIDR != nil {
+		in, out := &in.ToCIDR, &out.ToCIDR
+		*out = make([]string, len(*in))
+		copy(*out, *in)
+	}
+	if in.ToFQDNs != nil {
+		in, out := &in.ToFQDNs, &out.ToFQDNs
+		*out = make([]FQDNSelector, len(*in))
+		copy(*out, *in)
+	}
+	if in.ToPorts != nil {
+		in, out := &in.ToPorts, &out.ToPorts
+		*out = make([]PortRule, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new EgressRule.
+func (in *EgressRule) DeepCopy() *EgressRule {
+	if in == nil {
+		return nil
+	}
+	out := new(EgressRule)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *FQDNSelector) DeepCopyInto(out *FQDNSelector) {
+	*out = *in
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new FQDNSelector.
+func (in *FQDNSelector) DeepCopy() *FQDNSelector {
+	if in == nil {
+		return nil
+	}
+	out := new(FQDNSelector)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *IngressRule) DeepCopyInto(out *IngressRule) {
+	*out = *in
+	if in.FromApp != nil {
+		in, out := &in.FromApp, &out.FromApp
+		*out = make([]ApplicationReference, len(*in))
+		copy(*out, *in)
+	}
+	if in.FromSG != nil {
+		in, out := &in.FromSG, &out.FromSG
+		*out = make([]string, len(*in))
+		copy(*out, *in)
+	}
+	if in.FromCIDR != nil {
+		in, out := &in.FromCIDR, &out.FromCIDR
+		*out = make([]string, len(*in))
+		copy(*out, *in)
+	}
+	if in.ToPorts != nil {
+		in, out := &in.ToPorts, &out.ToPorts
+		*out = make([]PortRule, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new IngressRule.
+func (in *IngressRule) DeepCopy() *IngressRule {
+	if in == nil {
+		return nil
+	}
+	out := new(IngressRule)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *PortProtocol) DeepCopyInto(out *PortProtocol) {
+	*out = *in
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PortProtocol.
+func (in *PortProtocol) DeepCopy() *PortProtocol {
+	if in == nil {
+		return nil
+	}
+	out := new(PortProtocol)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *PortRule) DeepCopyInto(out *PortRule) {
+	*out = *in
+	if in.Ports != nil {
+		in, out := &in.Ports, &out.Ports
+		*out = make([]PortProtocol, len(*in))
+		copy(*out, *in)
+	}
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PortRule.
+func (in *PortRule) DeepCopy() *PortRule {
+	if in == nil {
+		return nil
+	}
+	out := new(PortRule)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *SecurityGroup) DeepCopyInto(out *SecurityGroup) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
+	in.Spec.DeepCopyInto(&out.Spec)
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new SecurityGroup.
+func (in *SecurityGroup) DeepCopy() *SecurityGroup {
+	if in == nil {
+		return nil
+	}
+	out := new(SecurityGroup)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *SecurityGroup) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *SecurityGroupList) DeepCopyInto(out *SecurityGroupList) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ListMeta.DeepCopyInto(&out.ListMeta)
+	if in.Items != nil {
+		in, out := &in.Items, &out.Items
+		*out = make([]SecurityGroup, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new SecurityGroupList.
+func (in *SecurityGroupList) DeepCopy() *SecurityGroupList {
+	if in == nil {
+		return nil
+	}
+	out := new(SecurityGroupList)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *SecurityGroupList) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *SecurityGroupSpec) DeepCopyInto(out *SecurityGroupSpec) {
+	*out = *in
+	if in.Attachments != nil {
+		in, out := &in.Attachments, &out.Attachments
+		*out = make([]ApplicationReference, len(*in))
+		copy(*out, *in)
+	}
+	if in.Ingress != nil {
+		in, out := &in.Ingress, &out.Ingress
+		*out = make([]IngressRule, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+	if in.Egress != nil {
+		in, out := &in.Egress, &out.Egress
+		*out = make([]EgressRule, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new SecurityGroupSpec.
+func (in *SecurityGroupSpec) DeepCopy() *SecurityGroupSpec {
+	if in == nil {
+		return nil
+	}
+	out := new(SecurityGroupSpec)
+	in.DeepCopyInto(out)
+	return out
+}
diff --git a/pkg/apis/sdn/v1alpha1/zz_generated.defaults.go b/pkg/apis/sdn/v1alpha1/zz_generated.defaults.go
new file mode 100644
index 0000000000..4e70d879f5
--- /dev/null
+++ b/pkg/apis/sdn/v1alpha1/zz_generated.defaults.go
@@ -0,0 +1,33 @@
+//go:build !ignore_autogenerated
+// +build !ignore_autogenerated
+
+/*
+Copyright 2025 The Cozystack Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// Code generated by defaulter-gen. DO NOT EDIT.
+
+package v1alpha1
+
+import (
+	runtime "k8s.io/apimachinery/pkg/runtime"
+)
+
+// RegisterDefaults adds defaulters functions to the given scheme.
+// Public to allow building arbitrary schemes.
+// All generated defaulters are covering - they call all nested defaulters.
+func RegisterDefaults(scheme *runtime.Scheme) error {
+	return nil
+}
diff --git a/pkg/apiserver/apiserver.go b/pkg/apiserver/apiserver.go
index 005fc64067..c3555e46c8 100644
--- a/pkg/apiserver/apiserver.go
+++ b/pkg/apiserver/apiserver.go
@@ -31,6 +31,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/serializer"
 	"k8s.io/apiserver/pkg/registry/rest"
 	genericapiserver "k8s.io/apiserver/pkg/server"
+	"k8s.io/client-go/dynamic"
 	"k8s.io/klog/v2"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/cache"
@@ -41,12 +42,17 @@ import (
 	appsinstall "github.com/cozystack/cozystack/pkg/apis/apps/install"
 	"github.com/cozystack/cozystack/pkg/apis/core"
 	coreinstall "github.com/cozystack/cozystack/pkg/apis/core/install"
+	"github.com/cozystack/cozystack/pkg/apis/sdn"
+	sdninstall "github.com/cozystack/cozystack/pkg/apis/sdn/install"
 	"github.com/cozystack/cozystack/pkg/config"
 	cozyregistry "github.com/cozystack/cozystack/pkg/registry"
 	applicationstorage "github.com/cozystack/cozystack/pkg/registry/apps/application"
+	optionstorage "github.com/cozystack/cozystack/pkg/registry/core/option"
+	tapstorage "github.com/cozystack/cozystack/pkg/registry/core/tap"
 	tenantmodulestorage "github.com/cozystack/cozystack/pkg/registry/core/tenantmodule"
 	tenantnamespacestorage "github.com/cozystack/cozystack/pkg/registry/core/tenantnamespace"
 	tenantsecretstorage "github.com/cozystack/cozystack/pkg/registry/core/tenantsecret"
+	securitygroupstorage "github.com/cozystack/cozystack/pkg/registry/sdn/securitygroup"
 )
 
 var (
@@ -68,12 +74,18 @@ func init() {
 	klog.SetLogger(ctrl.Log.WithName("klog"))
 	appsinstall.Install(Scheme)
 	coreinstall.Install(Scheme)
+	sdninstall.Install(Scheme)
 
 	// Register HelmRelease types.
 	if err := helmv2.AddToScheme(mgrScheme); err != nil {
 		panic(fmt.Errorf("Failed to add HelmRelease types to scheme: %w", err))
 	}
 
+	// Register the in-tree CiliumNetworkPolicy mirror backing SecurityGroup.
+	if err := securitygroupstorage.AddToScheme(mgrScheme); err != nil {
+		panic(fmt.Errorf("failed to add CiliumNetworkPolicy mirror to scheme: %w", err))
+	}
+
 	if err := corev1.AddToScheme(mgrScheme); err != nil {
 		panic(fmt.Errorf("Failed to add core types to scheme: %w", err))
 	}
@@ -194,6 +206,13 @@ func (c completedConfig) New() (*CozyServer, error) {
 	if err != nil {
 		return nil, fmt.Errorf("failed to build watch client: %w", err)
 	}
+	// Dynamic client for the Option resource's providers — direct (uncached)
+	// reads of arbitrary kinds (Nodes, KubeVirt, instancetypes, …) without
+	// registering an informer for each.
+	dyn, err := dynamic.NewForConfig(cfg)
+	if err != nil {
+		return nil, fmt.Errorf("failed to build dynamic client: %w", err)
+	}
 	// --- static, cluster-scoped resource for core group ---
 	coreV1alpha1Storage := map[string]rest.Storage{}
 	coreV1alpha1Storage["tenantnamespaces"] = cozyregistry.RESTInPeace(
@@ -205,6 +224,15 @@ func (c completedConfig) New() (*CozyServer, error) {
 	coreV1alpha1Storage["tenantmodules"] = cozyregistry.RESTInPeace(
 		tenantmodulestorage.NewREST(cli, watchCli),
 	)
+	coreV1alpha1Storage["options"] = cozyregistry.RESTInPeace(
+		optionstorage.NewRESTWithParams(
+			optionstorage.DefaultProviders(dyn),
+			optionstorage.DefaultParamProviders(dyn),
+		),
+	)
+	coreV1alpha1Storage["taps"] = cozyregistry.RESTInPeace(
+		tapstorage.NewREST(dyn),
+	)
 
 	coreApiGroupInfo := genericapiserver.NewDefaultAPIGroupInfo(core.GroupName, Scheme, metav1.ParameterCodec, Codecs)
 	coreApiGroupInfo.VersionedResourcesStorageMap["v1alpha1"] = coreV1alpha1Storage
@@ -212,6 +240,18 @@ func (c completedConfig) New() (*CozyServer, error) {
 		return nil, err
 	}
 
+	// --- static, namespaced resource for sdn group ---
+	sdnV1alpha1Storage := map[string]rest.Storage{}
+	sdnV1alpha1Storage["securitygroups"] = cozyregistry.RESTInPeace(
+		securitygroupstorage.NewREST(cli, watchCli),
+	)
+
+	sdnApiGroupInfo := genericapiserver.NewDefaultAPIGroupInfo(sdn.GroupName, Scheme, metav1.ParameterCodec, Codecs)
+	sdnApiGroupInfo.VersionedResourcesStorageMap["v1alpha1"] = sdnV1alpha1Storage
+	if err := s.GenericAPIServer.InstallAPIGroup(&sdnApiGroupInfo); err != nil {
+		return nil, err
+	}
+
 	// --- dynamically-configured, per-tenant resources ---
 	appsV1alpha1Storage := map[string]rest.Storage{}
 	for _, resConfig := range c.ResourceConfig.Resources {
@@ -229,6 +269,7 @@ func (c completedConfig) New() (*CozyServer, error) {
 // server using the provided storage map (plural name → rest.Storage).
 func InstallAppsAPIGroup(server *genericapiserver.GenericAPIServer, storage map[string]rest.Storage) error {
 	info := genericapiserver.NewDefaultAPIGroupInfo(apps.GroupName, Scheme, metav1.ParameterCodec, Codecs)
+	info.NegotiatedSerializer = kindPreservingSerializer{Codecs}
 	info.VersionedResourcesStorageMap["v1alpha1"] = storage
 	return server.InstallAPIGroup(&info)
 }
diff --git a/pkg/apiserver/kind_serializer.go b/pkg/apiserver/kind_serializer.go
new file mode 100644
index 0000000000..4dc8e64c89
--- /dev/null
+++ b/pkg/apiserver/kind_serializer.go
@@ -0,0 +1,93 @@
+/*
+Copyright 2026 The Cozystack Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package apiserver
+
+import (
+	"io"
+
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+
+	appsv1alpha1 "github.com/cozystack/cozystack/pkg/apis/apps/v1alpha1"
+)
+
+// kindPreservingSerializer encodes apps objects under the kind they carry.
+// Every apps kind is registered on the one Application Go type, and the
+// stock versioning encoder converts through Scheme.ConvertToVersion, which
+// picks the first kind registered for a type rather than the object's own.
+// Only encoding goes through here. The row objects of a Table requested with
+// includeObject=Object are converted through the Scheme instead and still get
+// the first registered kind. Admission webhooks and ValidatingAdmissionPolicy
+// get the request kind set explicitly.
+type kindPreservingSerializer struct {
+	runtime.NegotiatedSerializer
+}
+
+func (s kindPreservingSerializer) EncoderForVersion(enc runtime.Encoder, gv runtime.GroupVersioner) runtime.Encoder {
+	return kindPreservingEncoder{
+		ns:      s.NegotiatedSerializer,
+		enc:     enc,
+		gv:      gv,
+		Encoder: s.NegotiatedSerializer.EncoderForVersion(enc, gv),
+	}
+}
+
+// kindPreservingEncoder must not implement runtime.EncoderWithAllocator: the
+// watch handler prefers that method when present, and it would bypass Encode.
+type kindPreservingEncoder struct {
+	runtime.Encoder
+	ns  runtime.NegotiatedSerializer
+	enc runtime.Encoder
+	gv  runtime.GroupVersioner
+}
+
+func (e kindPreservingEncoder) Encode(obj runtime.Object, w io.Writer) error {
+	switch obj.(type) {
+	case *appsv1alpha1.Application, *appsv1alpha1.ApplicationList:
+		if gvk := obj.GetObjectKind().GroupVersionKind(); gvk.Kind != "" {
+			return e.ns.EncoderForVersion(e.enc, exactKindVersioner{want: gvk, fallback: e.gv}).Encode(obj, w)
+		}
+	}
+	return e.Encoder.Encode(obj, w)
+}
+
+// Identifier differs from the wrapped encoder's because the output does.
+func (e kindPreservingEncoder) Identifier() runtime.Identifier {
+	return "kindPreserving:" + e.Encoder.Identifier()
+}
+
+// exactKindVersioner picks want when the target group version would accept
+// it, and otherwise defers to the versioner the request negotiated.
+type exactKindVersioner struct {
+	want     schema.GroupVersionKind
+	fallback runtime.GroupVersioner
+}
+
+func (v exactKindVersioner) KindForGroupVersionKinds(kinds []schema.GroupVersionKind) (schema.GroupVersionKind, bool) {
+	if target, ok := v.fallback.KindForGroupVersionKinds([]schema.GroupVersionKind{v.want}); ok && target == v.want {
+		for _, k := range kinds {
+			if k == v.want {
+				return k, true
+			}
+		}
+	}
+	return v.fallback.KindForGroupVersionKinds(kinds)
+}
+
+func (v exactKindVersioner) Identifier() string {
+	return "exactKind:" + v.want.String() + ":" + v.fallback.Identifier()
+}
diff --git a/pkg/apiserver/kind_serializer_test.go b/pkg/apiserver/kind_serializer_test.go
new file mode 100644
index 0000000000..53ebc7944a
--- /dev/null
+++ b/pkg/apiserver/kind_serializer_test.go
@@ -0,0 +1,127 @@
+/*
+Copyright 2026 The Cozystack Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package apiserver
+
+import (
+	"bytes"
+	"encoding/json"
+	"testing"
+
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apimachinery/pkg/runtime/serializer"
+
+	appsv1alpha1 "github.com/cozystack/cozystack/pkg/apis/apps/v1alpha1"
+	"github.com/cozystack/cozystack/pkg/config"
+)
+
+// newTwoKindCodecs registers Postgres before Redis on a fresh scheme, so
+// Postgres is the kind a stock conversion falls back to.
+func newTwoKindCodecs(t *testing.T) serializer.CodecFactory {
+	t.Helper()
+	s := runtime.NewScheme()
+	metav1.AddToGroupVersion(s, appsv1alpha1.SchemeGroupVersion)
+	if err := appsv1alpha1.RegisterDynamicTypes(s, &config.ResourceConfig{Resources: []config.Resource{
+		{Application: config.ApplicationConfig{Kind: "Postgres"}},
+		{Application: config.ApplicationConfig{Kind: "Redis"}},
+	}}); err != nil {
+		t.Fatal(err)
+	}
+	return serializer.NewCodecFactory(s)
+}
+
+func encodedKind(t *testing.T, enc runtime.Encoder, obj runtime.Object) string {
+	t.Helper()
+	var b bytes.Buffer
+	if err := enc.Encode(obj, &b); err != nil {
+		t.Fatal(err)
+	}
+	var m struct {
+		Kind string `json:"kind"`
+	}
+	if err := json.Unmarshal(b.Bytes(), &m); err != nil {
+		t.Fatal(err)
+	}
+	return m.Kind
+}
+
+func TestKindPreservingSerializer_Encode(t *testing.T) {
+	codecs := newTwoKindCodecs(t)
+	info, ok := runtime.SerializerInfoForMediaType(codecs.SupportedMediaTypes(), runtime.ContentTypeJSON)
+	if !ok {
+		t.Fatal("no JSON serializer")
+	}
+	enc := kindPreservingSerializer{codecs}.EncoderForVersion(info.Serializer, appsv1alpha1.SchemeGroupVersion)
+	gv := appsv1alpha1.SchemeGroupVersion.String()
+
+	for _, tc := range []struct {
+		name string
+		obj  runtime.Object
+		want string
+	}{
+		{"object keeps its kind", &appsv1alpha1.Application{TypeMeta: metav1.TypeMeta{APIVersion: gv, Kind: "Redis"}}, "Redis"},
+		{"list keeps its kind", &appsv1alpha1.ApplicationList{TypeMeta: metav1.TypeMeta{APIVersion: gv, Kind: "RedisList"}}, "RedisList"},
+		// Without a kind on the object there is nothing to keep, so the
+		// stock choice stands; the storages always stamp one.
+		{"object without a kind falls back to the stock choice", &appsv1alpha1.Application{}, "Postgres"},
+	} {
+		t.Run(tc.name, func(t *testing.T) {
+			if got := encodedKind(t, enc, tc.obj); got != tc.want {
+				t.Fatalf("kind = %q, want %q", got, tc.want)
+			}
+		})
+	}
+}
+
+// The output differs from the wrapped encoder's, so a serialization cache keyed
+// by encoder identifier must not share entries between them.
+func TestKindPreservingSerializer_IdentifierDiffersFromWrapped(t *testing.T) {
+	codecs := newTwoKindCodecs(t)
+	info, _ := runtime.SerializerInfoForMediaType(codecs.SupportedMediaTypes(), runtime.ContentTypeJSON)
+	gv := appsv1alpha1.SchemeGroupVersion
+	wrapped := codecs.EncoderForVersion(info.Serializer, gv).Identifier()
+	if got := (kindPreservingSerializer{codecs}).EncoderForVersion(info.Serializer, gv).Identifier(); got == wrapped {
+		t.Fatalf("identifier %q equals the wrapped encoder's", got)
+	}
+}
+
+func TestExactKindVersioner(t *testing.T) {
+	apps := appsv1alpha1.SchemeGroupVersion
+	postgres, redis := apps.WithKind("Postgres"), apps.WithKind("Redis")
+	kinds := []schema.GroupVersionKind{postgres, redis}
+	other := schema.GroupVersion{Group: "example.com", Version: "v1"}
+
+	for _, tc := range []struct {
+		name     string
+		want     schema.GroupVersionKind
+		fallback runtime.GroupVersioner
+		wantGVK  schema.GroupVersionKind
+		wantOK   bool
+	}{
+		{"picks the object's kind", redis, apps, redis, true},
+		{"defers when the target is another group version", redis, other, schema.GroupVersionKind{}, false},
+		{"defers when the kind is not registered for the type", apps.WithKind("Kafka"), apps, postgres, true},
+	} {
+		t.Run(tc.name, func(t *testing.T) {
+			got, ok := exactKindVersioner{want: tc.want, fallback: tc.fallback}.KindForGroupVersionKinds(kinds)
+			if got != tc.wantGVK || ok != tc.wantOK {
+				t.Fatalf("got %v, %v; want %v, %v", got, ok, tc.wantGVK, tc.wantOK)
+			}
+		})
+	}
+}
diff --git a/pkg/apiserver/scheme_test.go b/pkg/apiserver/scheme_test.go
index af4207911c..b7542cf9e8 100644
--- a/pkg/apiserver/scheme_test.go
+++ b/pkg/apiserver/scheme_test.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2024 The Cozystack Authors.
+Copyright 2026 The Cozystack Authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,10 +21,26 @@ import (
 
 	appsfuzzer "github.com/cozystack/cozystack/pkg/apis/apps/fuzzer"
 	corefuzzer "github.com/cozystack/cozystack/pkg/apis/core/fuzzer"
+	sdnfuzzer "github.com/cozystack/cozystack/pkg/apis/sdn/fuzzer"
+	sdnv1alpha1 "github.com/cozystack/cozystack/pkg/apis/sdn/v1alpha1"
 	"k8s.io/apimachinery/pkg/api/apitesting/roundtrip"
 )
 
 func TestRoundTripTypes(t *testing.T) {
 	roundtrip.RoundTripTestForScheme(t, Scheme, appsfuzzer.Funcs)
 	roundtrip.RoundTripTestForScheme(t, Scheme, corefuzzer.Funcs)
+	roundtrip.RoundTripTestForScheme(t, Scheme, sdnfuzzer.Funcs)
+}
+
+// TestSchemeRecognizesSDNTypes guards against the SecurityGroup roundtrip
+// silently going vacuous: the kinds must be registered through the AddToScheme
+// path that the apiserver Scheme and the roundtrip helper use, not only at
+// server start. If this fails, the roundtrip above is exercising nothing.
+func TestSchemeRecognizesSDNTypes(t *testing.T) {
+	for _, kind := range []string{"SecurityGroup", "SecurityGroupList"} {
+		gvk := sdnv1alpha1.SchemeGroupVersion.WithKind(kind)
+		if !Scheme.Recognizes(gvk) {
+			t.Errorf("Scheme does not recognize %s — SecurityGroup serialization is untested", gvk)
+		}
+	}
 }
diff --git a/pkg/cmd/server/multikind_test.go b/pkg/cmd/server/multikind_test.go
new file mode 100644
index 0000000000..e11bd32fcd
--- /dev/null
+++ b/pkg/cmd/server/multikind_test.go
@@ -0,0 +1,153 @@
+/*
+Copyright 2026 The Cozystack Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package server_test
+
+import (
+	"context"
+	"encoding/json"
+	"io"
+	"net/http"
+	"testing"
+	"time"
+
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apimachinery/pkg/watch"
+	"k8s.io/client-go/dynamic"
+	restclient "k8s.io/client-go/rest"
+
+	appsv1alpha1 "github.com/cozystack/cozystack/pkg/apis/apps/v1alpha1"
+	"github.com/cozystack/cozystack/pkg/config"
+)
+
+// Every apps kind is registered on the one Application Go type, and a stock
+// conversion picks the first kind registered for it. Each request path must
+// answer with the kind the client asked for. Every kind is exercised because
+// the kinds share the process-wide scheme with other tests, so which one is
+// registered first, and therefore invisible to this check, is not fixed.
+func TestAppsAPIKeepsKindAcrossSharedGoType(t *testing.T) {
+	rc := &config.ResourceConfig{Resources: []config.Resource{
+		{
+			Application: config.ApplicationConfig{Kind: "Postgres", Singular: "postgres", Plural: "postgreses"},
+			Release:     config.ReleaseConfig{Prefix: "postgres-"},
+		},
+		redisConfig,
+	}}
+	ts, _ := startAppsServer(t, rc)
+	dyn := dynamic.NewForConfigOrDie(&restclient.Config{Host: ts.URL})
+
+	for _, res := range rc.Resources {
+		kind, plural := res.Application.Kind, res.Application.Plural
+		t.Run(kind, func(t *testing.T) {
+			api := dyn.Resource(schema.GroupVersionResource{
+				Group: appsv1alpha1.GroupName, Version: "v1alpha1", Resource: plural,
+			}).Namespace("tenant-a")
+			ctx := context.Background()
+			wantKind := func(op, got, want string) {
+				t.Helper()
+				if got != want {
+					t.Errorf("%s: kind = %q, want %q", op, got, want)
+				}
+			}
+			obj := func(replicas int64) *unstructured.Unstructured {
+				return &unstructured.Unstructured{Object: map[string]any{
+					"apiVersion": appsv1alpha1.SchemeGroupVersion.String(),
+					"kind":       kind,
+					"metadata":   map[string]any{"name": "app", "namespace": "tenant-a"},
+					"spec":       map[string]any{"replicas": replicas},
+				}}
+			}
+
+			created, err := api.Create(ctx, obj(1), metav1.CreateOptions{})
+			if err != nil {
+				t.Fatalf("create: %v", err)
+			}
+			wantKind("create", created.GetKind(), kind)
+
+			got, err := api.Get(ctx, "app", metav1.GetOptions{})
+			if err != nil {
+				t.Fatalf("get: %v", err)
+			}
+			wantKind("get", got.GetKind(), kind)
+
+			list, err := api.List(ctx, metav1.ListOptions{})
+			if err != nil {
+				t.Fatalf("list: %v", err)
+			}
+			wantKind("list", list.GetKind(), kind+"List")
+
+			w, err := api.Watch(ctx, metav1.ListOptions{})
+			if err != nil {
+				t.Fatalf("watch: %v", err)
+			}
+			defer w.Stop()
+
+			if err := unstructured.SetNestedField(got.Object, int64(3), "spec", "replicas"); err != nil {
+				t.Fatal(err)
+			}
+			updated, err := api.Update(ctx, got, metav1.UpdateOptions{})
+			if err != nil {
+				t.Fatalf("update: %v", err)
+			}
+			wantKind("update", updated.GetKind(), kind)
+
+			deadline := time.After(10 * time.Second)
+			for sawModified := false; !sawModified; {
+				select {
+				case ev := <-w.ResultChan():
+					u, ok := ev.Object.(*unstructured.Unstructured)
+					if !ok {
+						t.Fatalf("watch: unexpected object %T", ev.Object)
+					}
+					wantKind("watch "+string(ev.Type), u.GetKind(), kind)
+					sawModified = ev.Type == watch.Modified
+				case <-deadline:
+					t.Fatal("watch: no MODIFIED event")
+				}
+			}
+
+			applied, err := api.Apply(ctx, "app", obj(5), metav1.ApplyOptions{FieldManager: "test", Force: true})
+			if err != nil {
+				t.Fatalf("apply: %v", err)
+			}
+			wantKind("apply", applied.GetKind(), kind)
+
+			req, err := http.NewRequest(http.MethodGet, ts.URL+"/apis/apps.cozystack.io/v1alpha1/namespaces/tenant-a/"+plural, nil)
+			if err != nil {
+				t.Fatal(err)
+			}
+			req.Header.Set("Accept", "application/json;as=Table;v=v1;g=meta.k8s.io")
+			resp, err := http.DefaultClient.Do(req)
+			if err != nil {
+				t.Fatalf("table: %v", err)
+			}
+			body, err := io.ReadAll(resp.Body)
+			_ = resp.Body.Close()
+			if err != nil {
+				t.Fatalf("table: read body: %v", err)
+			}
+			var table map[string]any
+			if err := json.Unmarshal(body, &table); err != nil {
+				t.Fatalf("table: decode %q: %v", body, err)
+			}
+			if resp.StatusCode != http.StatusOK || table["kind"] != "Table" {
+				t.Errorf("table: status %d kind %v", resp.StatusCode, table["kind"])
+			}
+		})
+	}
+}
diff --git a/pkg/cmd/server/openapi.go b/pkg/cmd/server/openapi.go
index a75fc1a585..90af89cd00 100644
--- a/pkg/cmd/server/openapi.go
+++ b/pkg/cmd/server/openapi.go
@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"strings"
 
+	appsv1alpha1 "github.com/cozystack/cozystack/pkg/apis/apps/v1alpha1"
 	"github.com/cozystack/cozystack/pkg/apiserver"
 	"github.com/cozystack/cozystack/pkg/config"
 	sampleopenapi "github.com/cozystack/cozystack/pkg/generated/openapi"
@@ -63,14 +64,90 @@ func findSpecContainer(s *spec.Schema) *spec.Schema {
 	return nil
 }
 
+// markOpenObject marks a schema as a free-form object that accepts arbitrary
+// properties, using the x-kubernetes-preserve-unknown-fields extension rather
+// than the boolean additionalProperties:true form.
+//
+// This distinction matters: a boolean additionalProperties node (the JSON
+// `true` or `false` form) carries a nil inner schema. The Kubernetes
+// ValidatingAdmissionPolicy status type-checker (run by kube-controller-manager)
+// dereferences that nil inner schema, crash-looping KCM cluster-wide as soon as
+// a VAP matches one of these aggregated resources (e.g.
+// cozystack-tenant-host-policy on tenants). The extension is semantically
+// equivalent ("arbitrary fields allowed") and the type-checker handles it
+// safely. See https://github.com/cozystack/cozystack/issues/2863.
+func markOpenObject(s *spec.Schema) {
+	if len(s.Type) == 0 {
+		s.Type = spec.StringOrArray{"object"}
+	}
+	s.AdditionalProperties = nil
+	if s.Extensions == nil {
+		s.Extensions = spec.Extensions{}
+	}
+	s.Extensions["x-kubernetes-preserve-unknown-fields"] = true
+}
+
+// sanitizeBooleanAdditionalProperties recursively rewrites every boolean-form
+// additionalProperties (one whose inner Schema is nil — both the JSON `true`
+// and `false` forms) anywhere in s, because both crash the VAP status
+// type-checker (#2863): additionalProperties:true becomes the equivalent
+// x-kubernetes-preserve-unknown-fields:true, and additionalProperties:false is
+// dropped (the published schema is consumed only for documentation and
+// type-checking, not for enforcement, so "declared properties only" is
+// preserved without the crash-prone node). Object-form additionalProperties (a
+// real map value schema) is safe; it is recursed into, never rewritten.
+//
+// ApplicationDefinition.openAPISchema is untrusted input — external-apps and
+// operator-authored definitions flow through here without validation — so this
+// closes the whole class of crash rather than only the schemas cozystack ships.
+func sanitizeBooleanAdditionalProperties(s *spec.Schema) {
+	if s == nil {
+		return
+	}
+	if ap := s.AdditionalProperties; ap != nil && ap.Schema == nil {
+		if ap.Allows {
+			markOpenObject(s) // additionalProperties:true -> preserve-unknown-fields
+		} else {
+			s.AdditionalProperties = nil // additionalProperties:false -> drop
+		}
+	} else if ap != nil && ap.Schema != nil {
+		sanitizeBooleanAdditionalProperties(ap.Schema)
+	}
+	for k := range s.Properties {
+		prop := s.Properties[k]
+		sanitizeBooleanAdditionalProperties(&prop)
+		s.Properties[k] = prop
+	}
+	if s.Items != nil {
+		sanitizeBooleanAdditionalProperties(s.Items.Schema)
+		for i := range s.Items.Schemas {
+			sanitizeBooleanAdditionalProperties(&s.Items.Schemas[i])
+		}
+	}
+	for i := range s.AllOf {
+		sanitizeBooleanAdditionalProperties(&s.AllOf[i])
+	}
+	for i := range s.AnyOf {
+		sanitizeBooleanAdditionalProperties(&s.AnyOf[i])
+	}
+	for i := range s.OneOf {
+		sanitizeBooleanAdditionalProperties(&s.OneOf[i])
+	}
+	sanitizeBooleanAdditionalProperties(s.Not)
+}
+
 // patchSpec injects/overrides ".spec" with user JSON (or schemaless object).
 func patchSpec(target *spec.Schema, raw string) error {
+	if target.Properties == nil {
+		target.Properties = map[string]spec.Schema{}
+	}
+
+	// Schemaless: publish a fresh, fully open object. Starting from a fresh
+	// schema (rather than mutating the cloned base) discards any inherited
+	// $ref or properties so the published spec is unambiguously open.
 	if strings.TrimSpace(raw) == "" {
-		if target.Properties == nil {
-			target.Properties = map[string]spec.Schema{}
-		}
-		prop := target.Properties["spec"]
-		prop.AdditionalProperties = &spec.SchemaOrBool{Allows: true}
+		prop := spec.Schema{}
+		markOpenObject(&prop)
 		target.Properties["spec"] = prop
 		return nil
 	}
@@ -79,12 +156,23 @@ func patchSpec(target *spec.Schema, raw string) error {
 	if err := json.Unmarshal([]byte(raw), &custom); err != nil {
 		return err
 	}
-	if custom.AdditionalProperties == nil {
-		custom.AdditionalProperties = &spec.SchemaOrBool{Allows: true}
-	}
-	if target.Properties == nil {
-		target.Properties = map[string]spec.Schema{}
+	// The name declaration describes metadata.name, not anything inside spec.
+	delete(custom.Extensions, appsv1alpha1.NameSchemaExtension)
+
+	// Neutralize any crash-prone boolean additionalProperties at any depth in
+	// the user-supplied schema before publishing it.
+	topLevelAPAbsent := custom.AdditionalProperties == nil
+	sanitizeBooleanAdditionalProperties(&custom)
+
+	// Preserve the historical "spec is a superset of the documented values"
+	// behavior: when the documented schema does not itself declare
+	// additionalProperties, mark the top level open so undocumented Helm
+	// values are accepted rather than rejected. A schema that explicitly
+	// declared additionalProperties (now sanitized) keeps its own intent.
+	if topLevelAPAbsent {
+		markOpenObject(&custom)
 	}
+
 	target.Properties["spec"] = custom
 	return nil
 }
@@ -299,7 +387,7 @@ func sanitizeForV2(s *spec.Schema) {
 		if hasIntAndStringAnyOf(s.AnyOf) {
 			s.Type = spec.StringOrArray{"string"}
 			if s.Extensions == nil {
-				s.Extensions = map[string]any{}
+				s.Extensions = spec.Extensions{}
 			}
 			s.Extensions["x-kubernetes-int-or-string"] = true
 		}
diff --git a/pkg/cmd/server/openapi_test.go b/pkg/cmd/server/openapi_test.go
new file mode 100644
index 0000000000..ca52818824
--- /dev/null
+++ b/pkg/cmd/server/openapi_test.go
@@ -0,0 +1,296 @@
+/*
+Copyright 2026 The Cozystack Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package server
+
+import (
+	"encoding/json"
+	"strings"
+	"testing"
+
+	appsv1alpha1 "github.com/cozystack/cozystack/pkg/apis/apps/v1alpha1"
+	celopenapi "k8s.io/apiserver/pkg/cel/openapi"
+	"k8s.io/kube-openapi/pkg/validation/spec"
+)
+
+// tenantOpenAPISchema mirrors the shape of the real Tenant "Chart Values"
+// schema (packages/system/tenant-rd/cozyrds/tenant.yaml): a typed object with
+// declared properties and no top-level additionalProperties, plus a nested
+// map that uses the safe object-form additionalProperties.
+const tenantOpenAPISchema = `{
+  "title": "Chart Values",
+  "type": "object",
+  "properties": {
+    "host": {"type": "string"},
+    "etcd": {"type": "boolean"},
+    "resourceQuotas": {
+      "type": "object",
+      "additionalProperties": {
+        "anyOf": [{"type": "integer"}, {"type": "string"}],
+        "x-kubernetes-int-or-string": true
+      }
+    }
+  }
+}`
+
+func newObjectContainer() *spec.Schema {
+	return &spec.Schema{SchemaProps: spec.SchemaProps{
+		Type:       spec.StringOrArray{"object"},
+		Properties: map[string]spec.Schema{},
+	}}
+}
+
+// TestPatchSpecOpenSpecPublishesPreserveUnknownFields asserts that the open
+// ".spec" cozystack-api injects is published as
+// x-kubernetes-preserve-unknown-fields:true and never as the boolean
+// additionalProperties:true form that crashes the VAP type-checker (#2863).
+// It covers both code paths: a schemaless resource and a custom schema that
+// declares properties but no top-level additionalProperties (like Tenant).
+func TestPatchSpecOpenSpecPublishesPreserveUnknownFields(t *testing.T) {
+	cases := map[string]string{
+		"schemaless":           "",
+		"custom-no-additional": tenantOpenAPISchema,
+	}
+
+	for name, raw := range cases {
+		t.Run(name, func(t *testing.T) {
+			target := newObjectContainer()
+			if err := patchSpec(target, raw); err != nil {
+				t.Fatalf("patchSpec: %v", err)
+			}
+			specSchema := target.Properties["spec"]
+
+			if specSchema.AdditionalProperties != nil {
+				t.Errorf("spec must not carry additionalProperties; got %#v", specSchema.AdditionalProperties)
+			}
+			if v, ok := specSchema.Extensions.GetBool("x-kubernetes-preserve-unknown-fields"); !ok || !v {
+				t.Errorf("spec must set x-kubernetes-preserve-unknown-fields:true; extensions=%v", specSchema.Extensions)
+			}
+			if !specSchema.Type.Contains("object") {
+				t.Errorf("spec must be type object; got %v", specSchema.Type)
+			}
+
+			// The published JSON is the actual contract KCM type-checks against.
+			out, err := json.Marshal(specSchema)
+			if err != nil {
+				t.Fatalf("marshal: %v", err)
+			}
+			if strings.Contains(string(out), `"additionalProperties":true`) {
+				t.Errorf("published spec still emits boolean additionalProperties:true (#2863): %s", out)
+			}
+			if !strings.Contains(string(out), `"x-kubernetes-preserve-unknown-fields":true`) {
+				t.Errorf("published spec missing x-kubernetes-preserve-unknown-fields:true: %s", out)
+			}
+		})
+	}
+}
+
+// TestPatchSpecKeepsObjectFormAdditionalProperties ensures we only rewrite the
+// open/free-form spec: a custom schema that already declares an object-form
+// additionalProperties (a real map type, which is safe for the type-checker)
+// must be left untouched rather than overwritten with the extension.
+func TestPatchSpecKeepsObjectFormAdditionalProperties(t *testing.T) {
+	raw := `{"type":"object","additionalProperties":{"type":"string"}}`
+	target := newObjectContainer()
+	if err := patchSpec(target, raw); err != nil {
+		t.Fatalf("patchSpec: %v", err)
+	}
+	specSchema := target.Properties["spec"]
+	if specSchema.AdditionalProperties == nil || specSchema.AdditionalProperties.Schema == nil {
+		t.Fatalf("object-form additionalProperties must be preserved; got %#v", specSchema.AdditionalProperties)
+	}
+	if v, ok := specSchema.Extensions.GetBool("x-kubernetes-preserve-unknown-fields"); ok && v {
+		t.Errorf("must not add preserve-unknown-fields when a real map schema is declared")
+	}
+}
+
+// TestPatchSpecLeavesNameDeclarationOffSpec keeps the published spec from
+// carrying a declaration about metadata.name.
+func TestPatchSpecLeavesNameDeclarationOffSpec(t *testing.T) {
+	raw := `{"type":"object","x-cozystack-name":{"type":"string","maxLength":32},"x-other":true,"properties":{}}`
+	target := newObjectContainer()
+	if err := patchSpec(target, raw); err != nil {
+		t.Fatalf("patchSpec: %v", err)
+	}
+	specSchema := target.Properties["spec"]
+	if _, ok := specSchema.Extensions[appsv1alpha1.NameSchemaExtension]; ok {
+		t.Errorf("published spec carries %s", appsv1alpha1.NameSchemaExtension)
+	}
+	if _, ok := specSchema.Extensions["x-other"]; !ok {
+		t.Errorf("unrelated vendor extension dropped from spec")
+	}
+}
+
+// TestPatchedSpecDoesNotPanicVAPTypeChecker is the behavioral regression test
+// for #2863. SchemaDeclType is the exact entry point kube-controller-manager's
+// ValidatingAdmissionPolicy status controller uses to type-check a VAP against
+// the published resource schema. Before the fix, the boolean
+// additionalProperties:true on ".spec" made it nil-dereference
+// (k8s.io/apiserver/pkg/cel/openapi.isExtension), crash-looping KCM. With the
+// preserve-unknown-fields form it returns a valid type.
+//
+// This test panics (fails) on the pre-fix code and passes after it.
+func TestPatchedSpecDoesNotPanicVAPTypeChecker(t *testing.T) {
+	cases := map[string]string{
+		"schemaless":  "",
+		"tenant-like": tenantOpenAPISchema,
+	}
+
+	for name, raw := range cases {
+		t.Run(name, func(t *testing.T) {
+			// Resource-shaped object, as published per kind by cozystack-api.
+			obj := &spec.Schema{SchemaProps: spec.SchemaProps{
+				Type: spec.StringOrArray{"object"},
+				Properties: map[string]spec.Schema{
+					"apiVersion": {SchemaProps: spec.SchemaProps{Type: spec.StringOrArray{"string"}}},
+					"kind":       {SchemaProps: spec.SchemaProps{Type: spec.StringOrArray{"string"}}},
+					"spec":       {},
+				},
+			}}
+			if err := patchSpec(obj, raw); err != nil {
+				t.Fatalf("patchSpec: %v", err)
+			}
+
+			// Round-trip through JSON so we type-check the serialized form that
+			// is actually served on /openapi/v3 and read by KCM.
+			rawJSON, err := json.Marshal(obj)
+			if err != nil {
+				t.Fatalf("marshal: %v", err)
+			}
+			var published spec.Schema
+			if err := json.Unmarshal(rawJSON, &published); err != nil {
+				t.Fatalf("unmarshal: %v", err)
+			}
+
+			// isResourceRoot=true matches how the type-checker treats a matched
+			// top-level resource.
+			declType := celopenapi.SchemaDeclType(&published, true)
+			if declType == nil {
+				t.Fatalf("SchemaDeclType returned nil for %s", name)
+			}
+		})
+	}
+}
+
+// hasBooleanAdditionalProperties walks the schema and reports whether any node
+// carries a boolean-form additionalProperties (inner Schema == nil) — the
+// construct that crashes the VAP type-checker, in either its true or false JSON
+// form.
+func hasBooleanAdditionalProperties(s *spec.Schema) bool {
+	if s == nil {
+		return false
+	}
+	if ap := s.AdditionalProperties; ap != nil {
+		if ap.Schema == nil {
+			return true
+		}
+		if hasBooleanAdditionalProperties(ap.Schema) {
+			return true
+		}
+	}
+	for k := range s.Properties {
+		p := s.Properties[k]
+		if hasBooleanAdditionalProperties(&p) {
+			return true
+		}
+	}
+	if s.Items != nil {
+		if hasBooleanAdditionalProperties(s.Items.Schema) {
+			return true
+		}
+		for i := range s.Items.Schemas {
+			if hasBooleanAdditionalProperties(&s.Items.Schemas[i]) {
+				return true
+			}
+		}
+	}
+	for _, branch := range [][]spec.Schema{s.AllOf, s.AnyOf, s.OneOf} {
+		for i := range branch {
+			if hasBooleanAdditionalProperties(&branch[i]) {
+				return true
+			}
+		}
+	}
+	return hasBooleanAdditionalProperties(s.Not)
+}
+
+// TestPatchSpecSanitizesUserSuppliedBooleanAdditionalProperties is the
+// regression test for the review finding on #2867: ApplicationDefinition
+// schemas are untrusted input, and a user-supplied boolean additionalProperties
+// — declared explicitly at the top level, or nested anywhere under
+// properties/items/additionalProperties/allOf/anyOf/oneOf/not — reintroduces the
+// exact #2863 KCM crash. patchSpec must neutralize every such node (both the true
+// and false forms, since both carry a nil inner schema), at any depth, so the
+// published schema can never crash the VAP type-checker.
+//
+// Two assertions guard each case. SchemaDeclType only descends into properties,
+// items, and additionalProperties.Schema, so the top-level / nested-under-
+// properties / nested-under-items / nested-under-additionalproperties cases are
+// type-checker-reachable: they nil-deref (panic) SchemaDeclType on the
+// pre-sanitizer code. The allOf/anyOf/oneOf/not cases are defense-in-depth —
+// SchemaDeclType never traverses those branches, so it is the
+// hasBooleanAdditionalProperties assertion, not the SchemaDeclType check, that
+// keeps their recursion lines from regressing silently.
+func TestPatchSpecSanitizesUserSuppliedBooleanAdditionalProperties(t *testing.T) {
+	cases := map[string]string{
+		"top-level-boolean-true":            `{"type":"object","additionalProperties":true}`,
+		"top-level-boolean-false":           `{"type":"object","additionalProperties":false}`,
+		"nested-under-properties":           `{"type":"object","properties":{"foo":{"type":"object","additionalProperties":true}}}`,
+		"nested-under-items":                `{"type":"object","properties":{"list":{"type":"array","items":{"type":"object","additionalProperties":true}}}}`,
+		"nested-under-additionalproperties": `{"type":"object","additionalProperties":{"type":"object","additionalProperties":true}}`,
+		"nested-under-allof":                `{"type":"object","allOf":[{"type":"object","additionalProperties":false}]}`,
+		"nested-under-anyof":                `{"type":"object","anyOf":[{"type":"object","additionalProperties":true}]}`,
+		"nested-under-oneof":                `{"type":"object","oneOf":[{"type":"object","additionalProperties":false}]}`,
+		"nested-under-not":                  `{"type":"object","not":{"type":"object","additionalProperties":true}}`,
+	}
+
+	for name, raw := range cases {
+		t.Run(name, func(t *testing.T) {
+			obj := &spec.Schema{SchemaProps: spec.SchemaProps{
+				Type: spec.StringOrArray{"object"},
+				Properties: map[string]spec.Schema{
+					"apiVersion": {SchemaProps: spec.SchemaProps{Type: spec.StringOrArray{"string"}}},
+					"kind":       {SchemaProps: spec.SchemaProps{Type: spec.StringOrArray{"string"}}},
+					"spec":       {},
+				},
+			}}
+			if err := patchSpec(obj, raw); err != nil {
+				t.Fatalf("patchSpec: %v", err)
+			}
+
+			// Round-trip through JSON: this is what is actually served and what
+			// KCM type-checks.
+			rawJSON, err := json.Marshal(obj)
+			if err != nil {
+				t.Fatalf("marshal: %v", err)
+			}
+			var published spec.Schema
+			if err := json.Unmarshal(rawJSON, &published); err != nil {
+				t.Fatalf("unmarshal: %v", err)
+			}
+
+			// (1) no boolean-form additionalProperties survives anywhere
+			if hasBooleanAdditionalProperties(&published) {
+				t.Errorf("published schema still contains a boolean additionalProperties node (#2863): %s", rawJSON)
+			}
+			// (2) the published schema does not crash the VAP type-checker
+			declType := celopenapi.SchemaDeclType(&published, true)
+			if declType == nil {
+				t.Fatalf("SchemaDeclType returned nil for %s", name)
+			}
+		})
+	}
+}
diff --git a/pkg/cmd/server/start.go b/pkg/cmd/server/start.go
index 7ebbbc899b..2a4d34e057 100644
--- a/pkg/cmd/server/start.go
+++ b/pkg/cmd/server/start.go
@@ -24,17 +24,21 @@ import (
 	"fmt"
 	"io"
 	"net"
+	"slices"
 	"time"
 
 	v1alpha1 "github.com/cozystack/cozystack/api/v1alpha1"
+	"github.com/cozystack/cozystack/internal/shared/appdefowner"
 	appsv1alpha1 "github.com/cozystack/cozystack/pkg/apis/apps/v1alpha1"
 	corev1alpha1 "github.com/cozystack/cozystack/pkg/apis/core/v1alpha1"
+	sdnv1alpha1 "github.com/cozystack/cozystack/pkg/apis/sdn/v1alpha1"
 	"github.com/cozystack/cozystack/pkg/apiserver"
 	"github.com/cozystack/cozystack/pkg/config"
 	"github.com/spf13/cobra"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	utilerrors "k8s.io/apimachinery/pkg/util/errors"
+	mutatingadmissionpolicy "k8s.io/apiserver/pkg/admission/plugin/policy/mutating"
 	genericapiserver "k8s.io/apiserver/pkg/server"
 	genericoptions "k8s.io/apiserver/pkg/server/options"
 	utilfeature "k8s.io/apiserver/pkg/util/feature"
@@ -57,6 +61,17 @@ type CozyServerOptions struct {
 
 	// Add a field to store the configuration
 	ResourceConfig *config.ResourceConfig
+
+	// Raw HelmRelease generation flag values; parsed and validated in
+	// Complete() with config.ParsePositiveDuration so a misconfigured flag
+	// fails fast at startup. Kept in sync with the cozystack-operator
+	// flags of the same name so both HelmRelease-generating paths share
+	// the same retry strategy and cadence.
+	HelmReleaseInterval       string
+	HelmReleaseRetryInterval  string
+	HelmReleaseInstallTimeout string
+	HelmReleaseUpgradeTimeout string
+	HelmReleaseMaxHistory     int
 }
 
 // NewCozyServerOptions returns a new instance of CozyServerOptions
@@ -67,15 +82,43 @@ func NewCozyServerOptions(out, errOut io.Writer) *CozyServerOptions {
 			apiserver.Codecs.LegacyCodec(
 				corev1alpha1.SchemeGroupVersion,
 				appsv1alpha1.SchemeGroupVersion,
+				sdnv1alpha1.SchemeGroupVersion,
 			),
 		),
 		StdOut: out,
 		StdErr: errOut,
+		// Defaults match cozystack-operator: production semantics are
+		// identical between the two HelmRelease-generating paths.
+		HelmReleaseInterval:       "5m",
+		HelmReleaseRetryInterval:  "30s",
+		HelmReleaseInstallTimeout: "10m",
+		HelmReleaseUpgradeTimeout: "10m",
+		HelmReleaseMaxHistory:     5,
 	}
 	o.RecommendedOptions.Etcd = nil
+	disableUnsyncableAdmissionPlugins(o.RecommendedOptions.Admission)
 	return o
 }
 
+// disableUnsyncableAdmissionPlugins keeps MutatingAdmissionPolicy out of the
+// chain. It is on by default from k8s.io/apiserver v0.36 and refuses every
+// write until it has synced mutatingadmissionpolicies, which this server has
+// no RBAC to list and which clusters older than 1.36 do not serve. It runs
+// again in Complete because --disable-admission-plugins replaces the list.
+// Naming the plugin in --enable-admission-plugins wins: the operator has
+// granted it what it needs, and both lists at once fail validation.
+func disableUnsyncableAdmissionPlugins(a *genericoptions.AdmissionOptions) {
+	if slices.Contains(a.EnablePlugins, mutatingadmissionpolicy.PluginName) {
+		a.DisablePlugins = slices.DeleteFunc(a.DisablePlugins, func(p string) bool {
+			return p == mutatingadmissionpolicy.PluginName
+		})
+		return
+	}
+	if !slices.Contains(a.DisablePlugins, mutatingadmissionpolicy.PluginName) {
+		a.DisablePlugins = append(a.DisablePlugins, mutatingadmissionpolicy.PluginName)
+	}
+}
+
 // NewCommandStartCozyServer provides a CLI handler for the 'start apps-server' command
 func NewCommandStartCozyServer(ctx context.Context, defaults *CozyServerOptions) *cobra.Command {
 	o := *defaults
@@ -100,14 +143,85 @@ func NewCommandStartCozyServer(ctx context.Context, defaults *CozyServerOptions)
 	flags := cmd.Flags()
 	o.RecommendedOptions.AddFlags(flags)
 
+	// HelmRelease generation knobs. Names, defaults, and validation match
+	// the cozystack-operator flags of the same name so both
+	// HelmRelease-generating paths can be tuned together.
+	flags.StringVar(&o.HelmReleaseInterval, "helmrelease-interval", o.HelmReleaseInterval,
+		"Reconcile interval applied to HelmReleases generated from Application resources "+
+			"(Spec.Interval). Mirrors the cozystack-operator flag of the same name.")
+	flags.StringVar(&o.HelmReleaseRetryInterval, "helmrelease-retry-interval", o.HelmReleaseRetryInterval,
+		"Retry interval applied to Install.Strategy and Upgrade.Strategy of HelmReleases generated "+
+			"from Application resources. With Strategy.Name=RetryOnFailure, this controls how long "+
+			"the controller waits between failed install/upgrade attempts. Decoupled from "+
+			"--helmrelease-interval so failures recover fast without polling healthy releases at the "+
+			"same cadence.")
+	flags.StringVar(&o.HelmReleaseInstallTimeout, "helmrelease-install-timeout", o.HelmReleaseInstallTimeout,
+		"Default timeout for the Helm install action of HelmReleases generated from Application "+
+			"resources (Spec.Install.Timeout). Overridden for an Application kind by the "+
+			"release.cozystack.io/helm-install-timeout annotation on its ApplicationDefinition; the "+
+			"same annotation also overrides --helmrelease-upgrade-timeout.")
+	flags.StringVar(&o.HelmReleaseUpgradeTimeout, "helmrelease-upgrade-timeout", o.HelmReleaseUpgradeTimeout,
+		"Default timeout for the Helm upgrade action of HelmReleases generated from Application "+
+			"resources (Spec.Upgrade.Timeout). Overridden for an Application kind by the "+
+			"release.cozystack.io/helm-install-timeout annotation on its ApplicationDefinition (which "+
+			"sets both install and upgrade), or with higher precedence by "+
+			"release.cozystack.io/helm-upgrade-timeout to override only the upgrade side.")
+	flags.IntVar(&o.HelmReleaseMaxHistory, "helmrelease-max-history", o.HelmReleaseMaxHistory,
+		"Number of release revisions Helm keeps for HelmReleases generated from Application "+
+			"resources (Spec.MaxHistory). 0 means unlimited; 5 matches Helm's default.")
+
 	// Note: KEP-4330 component versioning functionality (k8s.io/apiserver/pkg/util/version)
 	// is not available in Kubernetes v0.34.1. The component versioning code has been removed.
 
 	return cmd
 }
 
+// helmReleaseFlagValues holds the parsed, validated HelmRelease generation
+// flags. Populated by parseAndValidateHelmReleaseFlags before any kubernetes
+// I/O so a misconfigured server restarts loudly instead of waiting until the
+// first Application is created.
+type helmReleaseFlagValues struct {
+	interval       time.Duration
+	retryInterval  time.Duration
+	installTimeout time.Duration
+	upgradeTimeout time.Duration
+	maxHistory     int
+}
+
+// parseAndValidateHelmReleaseFlags parses the five HelmRelease generation
+// flags and rejects malformed or non-positive durations and negative
+// MaxHistory. Same shape as cozystack-operator's main.
+func (o *CozyServerOptions) parseAndValidateHelmReleaseFlags() (helmReleaseFlagValues, error) {
+	var v helmReleaseFlagValues
+	var err error
+	if v.interval, err = config.ParsePositiveDuration("--helmrelease-interval", o.HelmReleaseInterval); err != nil {
+		return v, err
+	}
+	if v.retryInterval, err = config.ParsePositiveDuration("--helmrelease-retry-interval", o.HelmReleaseRetryInterval); err != nil {
+		return v, err
+	}
+	if v.installTimeout, err = config.ParsePositiveDuration("--helmrelease-install-timeout", o.HelmReleaseInstallTimeout); err != nil {
+		return v, err
+	}
+	if v.upgradeTimeout, err = config.ParsePositiveDuration("--helmrelease-upgrade-timeout", o.HelmReleaseUpgradeTimeout); err != nil {
+		return v, err
+	}
+	if o.HelmReleaseMaxHistory < 0 {
+		return v, fmt.Errorf("--helmrelease-max-history must be >= 0 (got %d)", o.HelmReleaseMaxHistory)
+	}
+	v.maxHistory = o.HelmReleaseMaxHistory
+	return v, nil
+}
+
 // Complete fills in the fields that are not set
 func (o *CozyServerOptions) Complete() error {
+	disableUnsyncableAdmissionPlugins(o.RecommendedOptions.Admission)
+
+	hrFlags, err := o.parseAndValidateHelmReleaseFlags()
+	if err != nil {
+		return err
+	}
+
 	scheme := runtime.NewScheme()
 	if err := v1alpha1.AddToScheme(scheme); err != nil {
 		return fmt.Errorf("failed to register types: %w", err)
@@ -151,57 +265,151 @@ func (o *CozyServerOptions) Complete() error {
 		fmt.Printf("Failed to list ApplicationDefinitions (retrying in %v): %v\n", delay, err)
 		time.Sleep(delay)
 
-		delay = time.Duration(float64(delay) * 1.5)
-		if delay > maxDelay {
-			delay = maxDelay
-		}
+		delay = min(time.Duration(float64(delay)*1.5), maxDelay)
 	}
 
-	// Convert to ResourceConfig
-	o.ResourceConfig = &config.ResourceConfig{}
-	for _, crd := range crdList.Items {
-		release := config.ReleaseConfig{
-			Prefix: crd.Spec.Release.Prefix,
-			Labels: crd.Spec.Release.Labels,
-			ChartRef: config.ChartRefConfig{
-				Kind:      crd.Spec.Release.ChartRef.Kind,
-				Name:      crd.Spec.Release.ChartRef.Name,
-				Namespace: crd.Spec.Release.ChartRef.Namespace,
-			},
-		}
-		// Per-Application HelmRelease Install/Upgrade timeout. Applications
-		// whose parent chart contains asynchronously-provisioned resources
-		// the chart itself depends on (for example, the Kamaji-provisioned
-		// admin-kubeconfig Secret for Kubernetes tenants) need a longer
-		// wait budget than the Flux default. Consumed by the REST storage
-		// layer when building the HelmRelease Spec. The parser rejects
-		// units Flux would reject at webhook time, so a bad annotation
-		// surfaces as a loud startup failure instead of a silent drop to
-		// defaults.
-		d, err := config.ParseHelmInstallTimeoutAnnotation(
-			crd.Annotations[config.HelmInstallTimeoutAnnotation],
-		)
+	resourceConfig, err := resourceConfigFrom(crdList.Items, hrFlags)
+	if err != nil {
+		return err
+	}
+	o.ResourceConfig = resourceConfig
+
+	return nil
+}
+
+// resourceConfigFrom converts the ApplicationDefinitions to the resource config
+// cozystack-api serves. A kind declared by more than one definition is
+// registered once, for the definition that owns it, rather than as two
+// resources for one GVK; the definitions left out are logged.
+func resourceConfigFrom(defs []v1alpha1.ApplicationDefinition, hrFlags helmReleaseFlagValues) (*config.ResourceConfig, error) {
+	owned, skipped := ownedDefinitions(defs)
+	for _, msg := range skipped {
+		fmt.Printf("Skipping %s\n", msg)
+	}
+	resourceConfig := &config.ResourceConfig{}
+	for _, crd := range owned {
+		resource, err := buildResourceFromCRD(crd, hrFlags)
 		if err != nil {
-			return fmt.Errorf(
-				"ApplicationDefinition %q has invalid %s annotation: %w",
-				crd.Name, config.HelmInstallTimeoutAnnotation, err,
-			)
+			return nil, err
 		}
-		release.HelmInstallTimeout = d
-		resource := config.Resource{
-			Application: config.ApplicationConfig{
-				Kind:          crd.Spec.Application.Kind,
-				Singular:      crd.Spec.Application.Singular,
-				Plural:        crd.Spec.Application.Plural,
-				ShortNames:    []string{}, // TODO: implement shortnames
-				OpenAPISchema: crd.Spec.Application.OpenAPISchema,
-			},
-			Release: release,
+		resourceConfig.Resources = append(resourceConfig.Resources, resource)
+	}
+	return resourceConfig, nil
+}
+
+// ownedDefinitions returns the definitions that own their application kind
+// under the shared rule in appdefowner, and a message for each one left out
+// because an older definition already owns its kind. The same rule decides which
+// definition the chartRef reconciler and the lineage webhook treat as the owner.
+func ownedDefinitions(defs []v1alpha1.ApplicationDefinition) ([]v1alpha1.ApplicationDefinition, []string) {
+	owners := appdefowner.Owners(defs)
+	var kept []v1alpha1.ApplicationDefinition
+	var skipped []string
+	for _, d := range defs {
+		kind := d.Spec.Application.Kind
+		if kind != "" && owners[kind] != d.Name {
+			skipped = append(skipped, fmt.Sprintf("ApplicationDefinition %q declares kind %s already owned by %q", d.Name, kind, owners[kind]))
+			continue
 		}
-		o.ResourceConfig.Resources = append(o.ResourceConfig.Resources, resource)
+		kept = append(kept, d)
 	}
+	return kept, skipped
+}
 
-	return nil
+// buildResourceFromCRD assembles the config.Resource (typed release fields plus
+// the four parsed release.cozystack.io/* annotations) for one ApplicationDefinition.
+// Extracted from Complete's loop so the annotation-to-config wiring is unit-testable
+// without a live discovery client: a mutation that drops any of the four assignments
+// below (e.g. release.HelmServerSideApply = serverSideApply) turns TestBuildResourceFromCRD
+// red instead of shipping a silent nil that reverts the field's effect on every release.
+func buildResourceFromCRD(crd v1alpha1.ApplicationDefinition, hrFlags helmReleaseFlagValues) (config.Resource, error) {
+	release := config.ReleaseConfig{
+		Prefix: crd.Spec.Release.Prefix,
+		Labels: crd.Spec.Release.Labels,
+		ChartRef: config.ChartRefConfig{
+			Kind:      crd.Spec.Release.ChartRef.Kind,
+			Name:      crd.Spec.Release.ChartRef.Name,
+			Namespace: crd.Spec.Release.ChartRef.Namespace,
+		},
+		// HelmRelease generation defaults from server flags. The same five
+		// values are applied to every Resource, matching cozystack-operator's
+		// PackageReconciler. The kind-wide HelmInstallTimeout and
+		// HelmUpgradeTimeout overrides from the ApplicationDefinition
+		// populated below still take precedence over these defaults.
+		HelmReleaseInterval:       hrFlags.interval,
+		HelmReleaseRetryInterval:  hrFlags.retryInterval,
+		HelmReleaseInstallTimeout: hrFlags.installTimeout,
+		HelmReleaseUpgradeTimeout: hrFlags.upgradeTimeout,
+		HelmReleaseMaxHistory:     hrFlags.maxHistory,
+		// kstatus readiness (issue #2642): typed spec.release fields, read
+		// directly (no annotation parsing). WaitStrategy/HealthCheckExprs
+		// are threaded into the generated HelmRelease by the REST storage
+		// layer; see config.ResolveWaitStrategy for the poller default.
+		WaitStrategy:     crd.Spec.Release.WaitStrategy,
+		HealthCheckExprs: crd.Spec.Release.HealthCheckExprs,
+	}
+	// Kind-wide HelmRelease Install/Upgrade timeout from this
+	// ApplicationDefinition. Kinds whose parent chart contains asynchronously-
+	// provisioned resources the chart itself depends on (for example, the
+	// Kamaji-provisioned admin-kubeconfig Secret for Kubernetes tenants) need a
+	// longer wait budget than the Flux default. Consumed by the REST storage
+	// layer when building the HelmRelease Spec. The parser rejects
+	// units Flux would reject at webhook time, so a bad annotation
+	// surfaces as a loud startup failure instead of a silent drop to
+	// defaults. helm-install-timeout covers both install and upgrade;
+	// helm-upgrade-timeout overrides only the upgrade side for kinds
+	// that need an asymmetric budget.
+	installTimeout, err := config.ParseHelmTimeoutAnnotation(
+		crd.Annotations[config.HelmInstallTimeoutAnnotation],
+	)
+	if err != nil {
+		return config.Resource{}, fmt.Errorf(
+			"ApplicationDefinition %q has invalid %s annotation: %w",
+			crd.Name, config.HelmInstallTimeoutAnnotation, err,
+		)
+	}
+	release.HelmInstallTimeout = installTimeout
+	upgradeTimeout, err := config.ParseHelmTimeoutAnnotation(
+		crd.Annotations[config.HelmUpgradeTimeoutAnnotation],
+	)
+	if err != nil {
+		return config.Resource{}, fmt.Errorf(
+			"ApplicationDefinition %q has invalid %s annotation: %w",
+			crd.Name, config.HelmUpgradeTimeoutAnnotation, err,
+		)
+	}
+	release.HelmUpgradeTimeout = upgradeTimeout
+	disableWait, err := config.ParseHelmInstallDisableWaitAnnotation(
+		crd.Annotations[config.HelmInstallDisableWaitAnnotation],
+	)
+	if err != nil {
+		return config.Resource{}, fmt.Errorf(
+			"ApplicationDefinition %q has invalid %s annotation: %w",
+			crd.Name, config.HelmInstallDisableWaitAnnotation, err,
+		)
+	}
+	release.HelmInstallDisableWait = disableWait
+
+	serverSideApply, err := config.ParseHelmServerSideApplyAnnotation(
+		crd.Annotations[config.HelmServerSideApplyAnnotation],
+	)
+	if err != nil {
+		return config.Resource{}, fmt.Errorf(
+			"ApplicationDefinition %q has invalid %s annotation: %w",
+			crd.Name, config.HelmServerSideApplyAnnotation, err,
+		)
+	}
+	release.HelmServerSideApply = serverSideApply
+	return config.Resource{
+		Application: config.ApplicationConfig{
+			Kind:          crd.Spec.Application.Kind,
+			Singular:      crd.Spec.Application.Singular,
+			Plural:        crd.Spec.Application.Plural,
+			ShortNames:    []string{}, // TODO: implement shortnames
+			OpenAPISchema: crd.Spec.Application.OpenAPISchema,
+		},
+		Release: release,
+	}, nil
 }
 
 // Validate checks the correctness of the options
diff --git a/pkg/cmd/server/start_owner_test.go b/pkg/cmd/server/start_owner_test.go
new file mode 100644
index 0000000000..c1f62bd6b8
--- /dev/null
+++ b/pkg/cmd/server/start_owner_test.go
@@ -0,0 +1,64 @@
+package server
+
+import (
+	"testing"
+	"time"
+
+	helmv2 "github.com/fluxcd/helm-controller/api/v2"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	"github.com/cozystack/cozystack/api/v1alpha1"
+)
+
+// TestOwnedDefinitionsDropsKindDuplicate pins that cozystack-api registers one
+// resource per kind: a definition declaring a kind an older definition already
+// owns is left out rather than registered as a second resource for one GVK, and
+// is reported so the operator can see why its kind is missing.
+func TestOwnedDefinitionsDropsKindDuplicate(t *testing.T) {
+	base := time.Date(2026, 1, 1, 0, 0, 0, 0, time.UTC)
+	mk := func(name, kind string, at time.Time) v1alpha1.ApplicationDefinition {
+		d := v1alpha1.ApplicationDefinition{ObjectMeta: metav1.ObjectMeta{Name: name, CreationTimestamp: metav1.NewTime(at)}}
+		d.Spec.Application.Kind = kind
+		return d
+	}
+	kept, skipped := ownedDefinitions([]v1alpha1.ApplicationDefinition{
+		mk("a-redis-shadow", "Redis", base.Add(time.Hour)),
+		mk("redis", "Redis", base),
+		mk("postgres", "Postgres", base),
+		mk("no-kind", "", base),
+	})
+	names := map[string]bool{}
+	for _, d := range kept {
+		names[d.Name] = true
+	}
+	// A definition with no kind claims nothing, so it is not anyone's duplicate.
+	if len(kept) != 3 || !names["redis"] || !names["postgres"] || !names["no-kind"] {
+		t.Fatalf("kept = %v, want redis, postgres and no-kind", names)
+	}
+	if len(skipped) != 1 || skipped[0] != `ApplicationDefinition "a-redis-shadow" declares kind Redis already owned by "redis"` {
+		t.Fatalf("skipped = %q", skipped)
+	}
+}
+
+// TestResourceConfigFromRegistersOwnerOnly pins that the resource config
+// cozystack-api serves is built from the owners only: one resource per kind,
+// carrying the owner's chart.
+func TestResourceConfigFromRegistersOwnerOnly(t *testing.T) {
+	base := time.Date(2026, 1, 1, 0, 0, 0, 0, time.UTC)
+	mk := func(name, artifact string, at time.Time) v1alpha1.ApplicationDefinition {
+		d := v1alpha1.ApplicationDefinition{ObjectMeta: metav1.ObjectMeta{Name: name, CreationTimestamp: metav1.NewTime(at)}}
+		d.Spec.Application.Kind = "Redis"
+		d.Spec.Release.ChartRef = &helmv2.CrossNamespaceSourceReference{Kind: "ExternalArtifact", Name: artifact, Namespace: "cozy-system"}
+		return d
+	}
+	rc, err := resourceConfigFrom([]v1alpha1.ApplicationDefinition{
+		mk("a-redis-shadow", "shadow-artifact", base.Add(time.Hour)),
+		mk("redis", "redis-artifact", base),
+	}, helmReleaseFlagValues{})
+	if err != nil {
+		t.Fatal(err)
+	}
+	if len(rc.Resources) != 1 || rc.Resources[0].Release.ChartRef.Name != "redis-artifact" {
+		t.Fatalf("resources = %+v, want the owner's redis-artifact only", rc.Resources)
+	}
+}
diff --git a/pkg/cmd/server/start_release_test.go b/pkg/cmd/server/start_release_test.go
new file mode 100644
index 0000000000..f9a332e5ac
--- /dev/null
+++ b/pkg/cmd/server/start_release_test.go
@@ -0,0 +1,120 @@
+/*
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package server
+
+import (
+	"testing"
+
+	helmv2 "github.com/fluxcd/helm-controller/api/v2"
+	"github.com/fluxcd/pkg/apis/kustomize"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	v1alpha1 "github.com/cozystack/cozystack/api/v1alpha1"
+	"github.com/cozystack/cozystack/pkg/config"
+)
+
+// TestBuildResourceFromCRD_AnnotationAndReleaseWiring pins the assignments that
+// join an ApplicationDefinition's annotations / typed release fields to the
+// ReleaseConfig the REST layer reads. This is the step Complete() runs per CRD;
+// nothing exercised it before, so a mutation dropping any of these lines
+// (release.HelmServerSideApply = serverSideApply -> _ = serverSideApply) shipped
+// a silent nil that reverts the field's effect on every emitted HelmRelease with
+// a green suite. Highest blast radius here is HelmServerSideApply: nil restores
+// helm-controller's server-side default, which force-owns the rendered
+// spec.instances seed and reverts KEDA's live /scale count.
+func TestBuildResourceFromCRD_AnnotationAndReleaseWiring(t *testing.T) {
+	crd := v1alpha1.ApplicationDefinition{
+		ObjectMeta: metav1.ObjectMeta{
+			Name: "postgres",
+			Annotations: map[string]string{
+				config.HelmServerSideApplyAnnotation:    "false",
+				config.HelmInstallDisableWaitAnnotation: "true",
+			},
+		},
+		Spec: v1alpha1.ApplicationDefinitionSpec{
+			Application: v1alpha1.ApplicationDefinitionApplication{
+				Kind:     "Postgres",
+				Plural:   "postgreses",
+				Singular: "postgres",
+			},
+			Release: v1alpha1.ApplicationDefinitionRelease{
+				Prefix:   "postgres-",
+				ChartRef: &helmv2.CrossNamespaceSourceReference{Kind: "ExternalArtifact", Name: "x", Namespace: "cozy-system"},
+				HealthCheckExprs: []kustomize.CustomHealthCheck{
+					{
+						APIVersion:             "keda.sh/v1alpha1",
+						Kind:                   "ScaledObject",
+						HealthCheckExpressions: kustomize.HealthCheckExpressions{Current: "true"},
+					},
+				},
+			},
+		},
+	}
+
+	res, err := buildResourceFromCRD(crd, helmReleaseFlagValues{})
+	if err != nil {
+		t.Fatalf("buildResourceFromCRD returned error: %v", err)
+	}
+
+	// helm-server-side-apply: "false" must thread through as a non-nil false so
+	// the REST layer forces client-side apply for the kind. A dropped assignment
+	// leaves this nil (helm-controller default = server-side).
+	if res.Release.HelmServerSideApply == nil {
+		t.Fatalf("HelmServerSideApply is nil; the annotation-to-config assignment was dropped")
+	}
+	if *res.Release.HelmServerSideApply != false {
+		t.Errorf("HelmServerSideApply = %v, want false", *res.Release.HelmServerSideApply)
+	}
+
+	// helm-install-disable-wait: "true" (sibling wiring on the same loop).
+	if !res.Release.HelmInstallDisableWait {
+		t.Errorf("HelmInstallDisableWait = false, want true")
+	}
+
+	// Typed healthCheckExprs must carry through verbatim: this is what neutralises
+	// a TriggerError ScaledObject's readiness so it cannot wedge the Postgres release.
+	if got := len(res.Release.HealthCheckExprs); got != 1 {
+		t.Fatalf("HealthCheckExprs length = %d, want 1", got)
+	}
+	if hc := res.Release.HealthCheckExprs[0]; hc.Kind != "ScaledObject" || hc.APIVersion != "keda.sh/v1alpha1" || hc.Current != "true" {
+		t.Errorf("HealthCheckExprs[0] = %+v, want ScaledObject/keda.sh/v1alpha1 current=true", hc)
+	}
+}
+
+// TestBuildResourceFromCRD_AnnotationAbsentLeavesDefault confirms an
+// ApplicationDefinition without the apply-strategy annotation leaves
+// HelmServerSideApply nil (helm-controller default), so the client-side flip is
+// opt-in per kind and does not silently move every other Application to
+// client-side apply.
+func TestBuildResourceFromCRD_AnnotationAbsentLeavesDefault(t *testing.T) {
+	crd := v1alpha1.ApplicationDefinition{
+		ObjectMeta: metav1.ObjectMeta{Name: "redis"},
+		Spec: v1alpha1.ApplicationDefinitionSpec{
+			Application: v1alpha1.ApplicationDefinitionApplication{Kind: "Redis"},
+			Release:     v1alpha1.ApplicationDefinitionRelease{Prefix: "redis-", ChartRef: &helmv2.CrossNamespaceSourceReference{Kind: "ExternalArtifact", Name: "x", Namespace: "cozy-system"}},
+		},
+	}
+
+	res, err := buildResourceFromCRD(crd, helmReleaseFlagValues{})
+	if err != nil {
+		t.Fatalf("buildResourceFromCRD returned error: %v", err)
+	}
+	if res.Release.HelmServerSideApply != nil {
+		t.Errorf("HelmServerSideApply = %v, want nil (helm-controller default)", *res.Release.HelmServerSideApply)
+	}
+	if len(res.Release.HealthCheckExprs) != 0 {
+		t.Errorf("HealthCheckExprs = %v, want empty", res.Release.HealthCheckExprs)
+	}
+}
diff --git a/pkg/cmd/server/start_test.go b/pkg/cmd/server/start_test.go
index 9dc2000c61..90165b9e2e 100644
--- a/pkg/cmd/server/start_test.go
+++ b/pkg/cmd/server/start_test.go
@@ -15,3 +15,231 @@ limitations under the License.
 */
 
 package server
+
+import (
+	"path/filepath"
+	"slices"
+	"strings"
+	"testing"
+	"time"
+
+	"github.com/spf13/pflag"
+	mutatingadmissionpolicy "k8s.io/apiserver/pkg/admission/plugin/policy/mutating"
+)
+
+// validHelmReleaseFlags returns a CozyServerOptions populated with the same
+// defaults NewCozyServerOptions sets, so each test case mutates a single
+// flag and asserts the resulting validation behaviour in isolation.
+func validHelmReleaseFlags() *CozyServerOptions {
+	return &CozyServerOptions{
+		HelmReleaseInterval:       "5m",
+		HelmReleaseRetryInterval:  "30s",
+		HelmReleaseInstallTimeout: "10m",
+		HelmReleaseUpgradeTimeout: "10m",
+		HelmReleaseMaxHistory:     5,
+	}
+}
+
+// Pins that each malformed/non-positive duration and a negative MaxHistory
+// is rejected at startup. Without this, a regression that swaps `<` for
+// `<=` on the MaxHistory branch — breaking the documented "0 means
+// unlimited" contract — or that drops a `return err` line on any of the
+// four duration branches would ship green.
+func TestCozyServerOptions_ParseAndValidateHelmReleaseFlags_Rejects(t *testing.T) {
+	cases := []struct {
+		name     string
+		mutate   func(o *CozyServerOptions)
+		wantSubs string
+	}{
+		{
+			name:     "interval zero",
+			mutate:   func(o *CozyServerOptions) { o.HelmReleaseInterval = "0s" },
+			wantSubs: "--helmrelease-interval",
+		},
+		{
+			name:     "interval negative",
+			mutate:   func(o *CozyServerOptions) { o.HelmReleaseInterval = "-5m" },
+			wantSubs: "--helmrelease-interval",
+		},
+		{
+			name:     "interval malformed",
+			mutate:   func(o *CozyServerOptions) { o.HelmReleaseInterval = "5x" },
+			wantSubs: "--helmrelease-interval",
+		},
+		{
+			name:     "retry-interval empty",
+			mutate:   func(o *CozyServerOptions) { o.HelmReleaseRetryInterval = "" },
+			wantSubs: "--helmrelease-retry-interval",
+		},
+		{
+			name:     "install-timeout zero",
+			mutate:   func(o *CozyServerOptions) { o.HelmReleaseInstallTimeout = "0s" },
+			wantSubs: "--helmrelease-install-timeout",
+		},
+		{
+			name:     "upgrade-timeout malformed",
+			mutate:   func(o *CozyServerOptions) { o.HelmReleaseUpgradeTimeout = "tenminutes" },
+			wantSubs: "--helmrelease-upgrade-timeout",
+		},
+		{
+			name:     "max-history negative",
+			mutate:   func(o *CozyServerOptions) { o.HelmReleaseMaxHistory = -1 },
+			wantSubs: "--helmrelease-max-history must be >= 0",
+		},
+	}
+
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			o := validHelmReleaseFlags()
+			tc.mutate(o)
+			_, err := o.parseAndValidateHelmReleaseFlags()
+			if err == nil {
+				t.Fatalf("expected error, got nil")
+			}
+			if !strings.Contains(err.Error(), tc.wantSubs) {
+				t.Errorf("error %q does not contain %q", err.Error(), tc.wantSubs)
+			}
+		})
+	}
+}
+
+// Pins the happy path: valid flag strings parse to the expected
+// time.Duration values and MaxHistory=0 is accepted (the documented
+// "unlimited per Helm semantics" branch).
+func TestCozyServerOptions_ParseAndValidateHelmReleaseFlags_Accepts(t *testing.T) {
+	cases := []struct {
+		name           string
+		o              *CozyServerOptions
+		wantInterval   time.Duration
+		wantRetry      time.Duration
+		wantInstall    time.Duration
+		wantUpgrade    time.Duration
+		wantMaxHistory int
+	}{
+		{
+			name:           "production defaults",
+			o:              validHelmReleaseFlags(),
+			wantInterval:   5 * time.Minute,
+			wantRetry:      30 * time.Second,
+			wantInstall:    10 * time.Minute,
+			wantUpgrade:    10 * time.Minute,
+			wantMaxHistory: 5,
+		},
+		{
+			name: "max-history zero accepted as unlimited",
+			o: func() *CozyServerOptions {
+				o := validHelmReleaseFlags()
+				o.HelmReleaseMaxHistory = 0
+				return o
+			}(),
+			wantInterval:   5 * time.Minute,
+			wantRetry:      30 * time.Second,
+			wantInstall:    10 * time.Minute,
+			wantUpgrade:    10 * time.Minute,
+			wantMaxHistory: 0,
+		},
+		{
+			name: "asymmetric install/upgrade timeouts both honored",
+			o: func() *CozyServerOptions {
+				o := validHelmReleaseFlags()
+				o.HelmReleaseInstallTimeout = "8m"
+				o.HelmReleaseUpgradeTimeout = "12m"
+				return o
+			}(),
+			wantInterval:   5 * time.Minute,
+			wantRetry:      30 * time.Second,
+			wantInstall:    8 * time.Minute,
+			wantUpgrade:    12 * time.Minute,
+			wantMaxHistory: 5,
+		},
+	}
+
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			v, err := tc.o.parseAndValidateHelmReleaseFlags()
+			if err != nil {
+				t.Fatalf("unexpected error: %v", err)
+			}
+			if v.interval != tc.wantInterval {
+				t.Errorf("interval = %v, want %v", v.interval, tc.wantInterval)
+			}
+			if v.retryInterval != tc.wantRetry {
+				t.Errorf("retryInterval = %v, want %v", v.retryInterval, tc.wantRetry)
+			}
+			if v.installTimeout != tc.wantInstall {
+				t.Errorf("installTimeout = %v, want %v", v.installTimeout, tc.wantInstall)
+			}
+			if v.upgradeTimeout != tc.wantUpgrade {
+				t.Errorf("upgradeTimeout = %v, want %v", v.upgradeTimeout, tc.wantUpgrade)
+			}
+			if v.maxHistory != tc.wantMaxHistory {
+				t.Errorf("maxHistory = %d, want %d", v.maxHistory, tc.wantMaxHistory)
+			}
+		})
+	}
+}
+
+// Pins that NewCozyServerOptions seeds defaults that pass validation, so
+// `cozystack-api ...` with no HelmRelease flags overridden does not fail
+// at startup. Guards against a future change to defaults that accidentally
+// violates the validator.
+func TestNewCozyServerOptions_DefaultsValidate(t *testing.T) {
+	o := NewCozyServerOptions(nil, nil)
+	if _, err := o.parseAndValidateHelmReleaseFlags(); err != nil {
+		t.Fatalf("default options must validate, got: %v", err)
+	}
+}
+
+func TestNewCozyServerOptions_DisablesMutatingAdmissionPolicy(t *testing.T) {
+	o := NewCozyServerOptions(nil, nil)
+	if !slices.Contains(o.RecommendedOptions.Admission.DisablePlugins, mutatingadmissionpolicy.PluginName) {
+		t.Fatalf("%s is not disabled, disabled plugins: %v",
+			mutatingadmissionpolicy.PluginName, o.RecommendedOptions.Admission.DisablePlugins)
+	}
+}
+
+// --disable-admission-plugins replaces the default list rather than adding
+// to it; Complete must put the plugin back before anything is built.
+func TestComplete_KeepsMutatingAdmissionPolicyDisabledAfterFlagOverride(t *testing.T) {
+	t.Setenv("KUBECONFIG", filepath.Join(t.TempDir(), "missing"))
+	t.Setenv("HOME", t.TempDir())
+	t.Setenv("KUBERNETES_SERVICE_HOST", "")
+
+	o := NewCozyServerOptions(nil, nil)
+	fs := pflag.NewFlagSet("test", pflag.ContinueOnError)
+	o.RecommendedOptions.AddFlags(fs)
+	if err := fs.Parse([]string{"--disable-admission-plugins=NamespaceLifecycle"}); err != nil {
+		t.Fatal(err)
+	}
+	// Complete stops at the missing kubeconfig; the admission list is
+	// settled before that.
+	_ = o.Complete()
+
+	got := o.RecommendedOptions.Admission.DisablePlugins
+	if !slices.Contains(got, mutatingadmissionpolicy.PluginName) || !slices.Contains(got, "NamespaceLifecycle") {
+		t.Fatalf("disabled plugins = %v, want both NamespaceLifecycle and %s", got, mutatingadmissionpolicy.PluginName)
+	}
+}
+
+// An operator who enables the plugin by name has given it what it needs;
+// keeping it on the disable list too would fail validation as a conflict.
+func TestComplete_ExplicitEnableOfMutatingAdmissionPolicyWins(t *testing.T) {
+	t.Setenv("KUBECONFIG", filepath.Join(t.TempDir(), "missing"))
+	t.Setenv("HOME", t.TempDir())
+	t.Setenv("KUBERNETES_SERVICE_HOST", "")
+
+	o := NewCozyServerOptions(nil, nil)
+	fs := pflag.NewFlagSet("test", pflag.ContinueOnError)
+	o.RecommendedOptions.AddFlags(fs)
+	if err := fs.Parse([]string{"--enable-admission-plugins=" + mutatingadmissionpolicy.PluginName}); err != nil {
+		t.Fatal(err)
+	}
+	_ = o.Complete()
+
+	if got := o.RecommendedOptions.Admission.DisablePlugins; slices.Contains(got, mutatingadmissionpolicy.PluginName) {
+		t.Fatalf("disabled plugins = %v, want %s left enabled", got, mutatingadmissionpolicy.PluginName)
+	}
+	if errs := o.RecommendedOptions.Admission.Validate(); len(errs) > 0 {
+		t.Fatalf("admission options do not validate: %v", errs)
+	}
+}
diff --git a/pkg/cmd/server/watch_initial_events_test.go b/pkg/cmd/server/watch_initial_events_test.go
new file mode 100644
index 0000000000..331417545b
--- /dev/null
+++ b/pkg/cmd/server/watch_initial_events_test.go
@@ -0,0 +1,173 @@
+/*
+Copyright 2026 The Cozystack Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package server_test
+
+import (
+	"bufio"
+	"context"
+	"net/http"
+	"net/http/httptest"
+	"strings"
+	"testing"
+	"time"
+
+	helmv2 "github.com/fluxcd/helm-controller/api/v2"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apiserver/pkg/registry/rest"
+	genericapiserver "k8s.io/apiserver/pkg/server"
+	utilfeature "k8s.io/apiserver/pkg/util/feature"
+	restclient "k8s.io/client-go/rest"
+	basecompatibility "k8s.io/component-base/compatibility"
+	baseversion "k8s.io/component-base/version"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/client/fake"
+
+	appsv1alpha1 "github.com/cozystack/cozystack/pkg/apis/apps/v1alpha1"
+	"github.com/cozystack/cozystack/pkg/apiserver"
+	cozyserver "github.com/cozystack/cozystack/pkg/cmd/server"
+	"github.com/cozystack/cozystack/pkg/config"
+	applicationstorage "github.com/cozystack/cozystack/pkg/registry/apps/application"
+)
+
+var redisConfig = config.Resource{
+	Application: config.ApplicationConfig{Kind: "Redis", Singular: "redis", Plural: "redises"},
+	Release:     config.ReleaseConfig{Prefix: "redis-"},
+}
+
+// startAppsServer serves the apps group through the real apiserver handler
+// chain, with the application storage backed by a fake client. The kinds are
+// registered on the process-wide apiserver.Scheme.
+func startAppsServer(t *testing.T, rc *config.ResourceConfig) (*httptest.Server, client.Client) {
+	t.Helper()
+	if err := appsv1alpha1.RegisterDynamicTypes(apiserver.Scheme, rc); err != nil {
+		t.Fatal(err)
+	}
+
+	backing := runtime.NewScheme()
+	if err := helmv2.AddToScheme(backing); err != nil {
+		t.Fatal(err)
+	}
+	cli := fake.NewClientBuilder().WithScheme(backing).Build()
+
+	cfg := genericapiserver.NewConfig(apiserver.Codecs)
+	cfg.ExternalAddress = "localhost:443"
+	cfg.LoopbackClientConfig = &restclient.Config{}
+	cfg.FeatureGate = utilfeature.DefaultMutableFeatureGate
+	if baseversion.DefaultKubeBinaryVersion != "" {
+		cfg.EffectiveVersion = basecompatibility.NewEffectiveVersionFromString(baseversion.DefaultKubeBinaryVersion, "", "")
+	}
+	cozyserver.ConfigureOpenAPI(cfg, cozyserver.KindSchemasFromConfig(rc), "test", "test")
+	srv, err := cfg.Complete(nil).New("watch-initial-events-test", genericapiserver.NewEmptyDelegate())
+	if err != nil {
+		t.Fatal(err)
+	}
+	storage := map[string]rest.Storage{}
+	for i := range rc.Resources {
+		storage[rc.Resources[i].Application.Plural] = applicationstorage.NewREST(cli, cli, &rc.Resources[i])
+	}
+	if err := apiserver.InstallAppsAPIGroup(srv, storage); err != nil {
+		t.Fatal(err)
+	}
+	srv.PrepareRun()
+	ts := httptest.NewServer(srv.Handler)
+	t.Cleanup(ts.Close)
+	return ts, cli
+}
+
+// watchStream opens a watch with the given query, then creates and updates a
+// release behind it, and returns the stream lines received within the timeout.
+func watchStream(t *testing.T, ts *httptest.Server, cli client.Client, query string) []string {
+	t.Helper()
+	ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
+	defer cancel()
+	req, err := http.NewRequestWithContext(ctx, http.MethodGet,
+		ts.URL+"/apis/apps.cozystack.io/v1alpha1/namespaces/tenant-a/redises?"+query, nil)
+	if err != nil {
+		t.Fatal(err)
+	}
+	resp, err := http.DefaultClient.Do(req)
+	if err != nil {
+		t.Fatalf("watch: %v", err)
+	}
+	defer resp.Body.Close()
+	if resp.StatusCode != http.StatusOK {
+		t.Fatalf("watch: status %d", resp.StatusCode)
+	}
+
+	lines := make(chan string)
+	go func() {
+		defer close(lines)
+		sc := bufio.NewScanner(resp.Body)
+		for sc.Scan() {
+			lines <- sc.Text()
+		}
+	}()
+
+	hr := &helmv2.HelmRelease{ObjectMeta: metav1.ObjectMeta{
+		Name:      "redis-cache",
+		Namespace: "tenant-a",
+		Labels: map[string]string{
+			applicationstorage.ApplicationKindLabel:  "Redis",
+			applicationstorage.ApplicationGroupLabel: appsv1alpha1.GroupName,
+		},
+	}}
+	if err := cli.Create(context.Background(), hr); err != nil {
+		t.Fatalf("create HelmRelease: %v", err)
+	}
+	// The storage sends a pending initial-events-end bookmark ahead of the
+	// first live event, so drive one.
+	hr.Annotations = map[string]string{"touched": "1"}
+	if err := cli.Update(context.Background(), hr); err != nil {
+		t.Fatalf("update HelmRelease: %v", err)
+	}
+
+	var out []string
+	for line := range lines {
+		out = append(out, line)
+	}
+	return out
+}
+
+// A plain watch has SendInitialEvents defaulted on by the handler but no
+// bookmarks; from k8s.io/apiserver v0.36 the handler panics if the storage
+// answers it with the initial-events-end bookmark, so none may appear.
+func TestWatchHandler_PlainWatchGetsNoInitialEventsEndBookmark(t *testing.T) {
+	ts, cli := startAppsServer(t, &config.ResourceConfig{Resources: []config.Resource{redisConfig}})
+	lines := watchStream(t, ts, cli, "watch=true")
+	sawModified := false
+	for _, l := range lines {
+		if strings.Contains(l, metav1.InitialEventsAnnotationKey) {
+			t.Fatalf("plain watch received the initial-events-end bookmark: %s", l)
+		}
+		sawModified = sawModified || strings.Contains(l, `"type":"MODIFIED"`)
+	}
+	if !sawModified {
+		t.Fatalf("plain watch saw no MODIFIED event, stream: %v", lines)
+	}
+}
+
+func TestWatchHandler_WatchListGetsInitialEventsEndBookmark(t *testing.T) {
+	ts, cli := startAppsServer(t, &config.ResourceConfig{Resources: []config.Resource{redisConfig}})
+	lines := watchStream(t, ts, cli, "watch=true&sendInitialEvents=true&allowWatchBookmarks=true&resourceVersionMatch=NotOlderThan")
+	for _, l := range lines {
+		if strings.Contains(l, `"type":"BOOKMARK"`) && strings.Contains(l, metav1.InitialEventsAnnotationKey) {
+			return
+		}
+	}
+	t.Fatalf("watch list received no initial-events-end bookmark, stream: %v", lines)
+}
diff --git a/pkg/config/config.go b/pkg/config/config.go
index 21de27b20b..0223fe4075 100644
--- a/pkg/config/config.go
+++ b/pkg/config/config.go
@@ -19,14 +19,85 @@ package config
 import (
 	"fmt"
 	"regexp"
+	"strings"
 	"time"
+
+	helmv2 "github.com/fluxcd/helm-controller/api/v2"
+	"github.com/fluxcd/pkg/apis/kustomize"
 )
 
+// ReleaseAnnotationPrefix is the prefix shared by every ApplicationDefinition
+// metadata annotation that changes how cozystack-api builds the generated
+// HelmRelease (the four constants below). cozystack-api reads them once, at
+// start-up, so cozystack-controller has to roll the api Deployment when one of
+// them changes; it selects them by this prefix when hashing the definitions.
+const ReleaseAnnotationPrefix = "release.cozystack.io/"
+
 // HelmInstallTimeoutAnnotation is the ApplicationDefinition metadata
 // annotation key that overrides the Flux HelmRelease Install.Timeout and
 // Upgrade.Timeout for a given Application kind.
 const HelmInstallTimeoutAnnotation = "release.cozystack.io/helm-install-timeout"
 
+// HelmUpgradeTimeoutAnnotation is the ApplicationDefinition metadata
+// annotation key that overrides only the Flux HelmRelease Upgrade.Timeout
+// for a given Application kind. When set it takes precedence over the
+// Upgrade.Timeout value HelmInstallTimeoutAnnotation would otherwise apply,
+// letting a kind keep a short install budget but a longer upgrade budget
+// (or vice versa).
+const HelmUpgradeTimeoutAnnotation = "release.cozystack.io/helm-upgrade-timeout"
+
+// HelmInstallDisableWaitAnnotation is the ApplicationDefinition metadata
+// annotation key that sets HelmReleaseSpec.Install.DisableWait and
+// Upgrade.DisableWait to true for a given Application kind. Use when the
+// parent chart emits child HelmReleases that cannot become Ready during
+// the parent's own install (e.g. the Kubernetes Application emits
+// in-tenant addon HelmReleases that have no worker nodes to schedule on
+// until the worker MachineSets come up, plus a main-phase talos-reconcile
+// Job that produces the TalosConfigTemplate those MachineSets clone from).
+// Without DisableWait the helm-controller blocks on the addon HelmReleases
+// becoming Ready, which cannot happen during install, so the release never
+// settles. DisableWait lets it settle while the addon HelmReleases and the
+// reconcile Job converge asynchronously.
+//
+// This takes precedence over spec.release.healthCheckExprs: upstream evaluates
+// CEL health expressions only when the Helm action has wait enabled, so a kind
+// setting both gets no health gating at all, silently. Prefer dropping this
+// annotation over adding expressions that will never run.
+const HelmInstallDisableWaitAnnotation = "release.cozystack.io/helm-install-disable-wait"
+
+// HelmServerSideApplyAnnotation is the ApplicationDefinition metadata annotation
+// that overrides the Helm apply strategy for every HelmRelease the kind emits.
+// The platform's helm-controller (v1.5.0) defaults to server-side apply, under
+// which Helm force-owns every field it renders and reverts any value a runtime
+// writer (e.g. an HPA writing the engine CR's /scale subresource) later sets.
+// Setting this to "false" forces client-side apply, under which helm-controller
+// patches a CRD from the previous-vs-new rendered manifest and does not consult
+// live state (it leaves Helm's threeWayMergeForUnstructured at the default), so a
+// field rendered as an unchanged constant yields no patch and the co-writer's
+// live value survives.
+// Required by the postgres read-replica autoscaler, whose seeded spec.instances
+// must not be reverted from KEDA's live /scale value. Accepts "true"/"enabled" or
+// "false"/"disabled" (case-insensitive); empty leaves the helm-controller default.
+//
+// The switch is deliberately kind-wide, not per-instance: it applies to EVERY
+// HelmRelease the kind emits, including the ones that never enable the co-writing
+// feature. That is a considered trade-off, not an oversight:
+//   - Lifecycle stability. helm-controller resolves an unset Upgrade.ServerSideApply
+//     through "auto" from the last release's apply method, so gating client-side on
+//     "autoscaling active" would force an SSA->client-side ownership handoff on the
+//     live spec.instances the moment a tenant enables autoscaling - the exact live
+//     field handoff this design was chosen to avoid. Keeping the method stable for
+//     the kind's whole lifecycle makes enable/dry-run/transition/disable clean
+//     two-way merges with no apply-method transition.
+//   - Cost, acknowledged. A release that never autoscales is client-side too, so
+//     helm-controller no longer re-asserts a chart-rendered field that has drifted
+//     on the live CR (client-side diffs previous-vs-new render only, never live
+//     state) and driftDetection is not configured. The platform relies on GitOps
+//     re-render for correctness rather than SSA drift-correction; a per-instance
+//     apply strategy is a follow-up if drift-correction on non-feature releases of
+//     the kind is ever required.
+const HelmServerSideApplyAnnotation = "release.cozystack.io/helm-server-side-apply"
+
 // helmTimeoutPattern mirrors the CRD validation pattern used by Flux
 // helm-controller on HelmReleaseSpec.Install.Timeout (ms/s/m/h units only).
 // time.ParseDuration accepts ns/us/µs, but Flux rejects them - parsing here
@@ -36,14 +107,15 @@ const HelmInstallTimeoutAnnotation = "release.cozystack.io/helm-install-timeout"
 // in the go module cache.
 var helmTimeoutPattern = regexp.MustCompile(`^([0-9]+(\.[0-9]+)?(ms|s|m|h))+$`)
 
-// ParseHelmInstallTimeoutAnnotation parses the value of the
-// release.cozystack.io/helm-install-timeout annotation. The empty string is
-// treated as "unset" and returns (0, nil) so callers can leave
-// HelmInstallTimeout zeroed and let flux defaults apply. Values accepted by
+// ParseHelmTimeoutAnnotation parses the value of a Flux HelmRelease timeout
+// annotation (release.cozystack.io/helm-install-timeout or
+// release.cozystack.io/helm-upgrade-timeout). The empty string is treated as
+// "unset" and returns (0, nil) so callers can leave the corresponding
+// ReleaseConfig field zeroed and let flux defaults apply. Values accepted by
 // time.ParseDuration but rejected by Flux (ns/us/µs) return a helpful
 // error instead of silently parsing and failing later at HelmRelease
 // admission.
-func ParseHelmInstallTimeoutAnnotation(raw string) (time.Duration, error) {
+func ParseHelmTimeoutAnnotation(raw string) (time.Duration, error) {
 	if raw == "" {
 		return 0, nil
 	}
@@ -58,6 +130,62 @@ func ParseHelmInstallTimeoutAnnotation(raw string) (time.Duration, error) {
 	return d, nil
 }
 
+// ParsePositiveDuration parses raw as a time.Duration and rejects malformed
+// or non-positive values. Flux HelmRelease fields (Interval, Timeout,
+// RetryInterval) require strictly positive durations, so a misconfigured
+// flag must fail fast at startup rather than propagating into every HR.
+// Shared between cozystack-operator and cozystack-api so both paths reject
+// the same set of inputs at startup.
+func ParsePositiveDuration(flagName, raw string) (time.Duration, error) {
+	d, err := time.ParseDuration(raw)
+	if err != nil {
+		return 0, fmt.Errorf("invalid duration for %s=%q: %w", flagName, raw, err)
+	}
+	if d <= 0 {
+		return 0, fmt.Errorf("%s must be > 0 (got %q)", flagName, raw)
+	}
+	return d, nil
+}
+
+// ParseHelmInstallDisableWaitAnnotation parses the value of the
+// release.cozystack.io/helm-install-disable-wait annotation. Accepts
+// "true" or "false" (case-insensitive); empty returns (false, nil) so
+// callers can leave HelmInstallDisableWait zero and let flux defaults
+// apply.
+func ParseHelmInstallDisableWaitAnnotation(raw string) (bool, error) {
+	raw = strings.TrimSpace(raw)
+	switch {
+	case raw == "":
+		return false, nil
+	case strings.EqualFold(raw, "true"):
+		return true, nil
+	case strings.EqualFold(raw, "false"):
+		return false, nil
+	default:
+		return false, fmt.Errorf("must be \"true\" or \"false\", got %q", raw)
+	}
+}
+
+// ParseHelmServerSideApplyAnnotation parses the value of the
+// release.cozystack.io/helm-server-side-apply annotation. Returns a pointer to the
+// desired serverSideApply state, or nil for an empty value (leave the helm-controller
+// default). Accepts "true"/"enabled" and "false"/"disabled" (case-insensitive).
+func ParseHelmServerSideApplyAnnotation(raw string) (*bool, error) {
+	raw = strings.TrimSpace(raw)
+	switch {
+	case raw == "":
+		return nil, nil
+	case strings.EqualFold(raw, "true"), strings.EqualFold(raw, "enabled"):
+		v := true
+		return &v, nil
+	case strings.EqualFold(raw, "false"), strings.EqualFold(raw, "disabled"):
+		v := false
+		return &v, nil
+	default:
+		return nil, fmt.Errorf("must be \"true\"/\"enabled\" or \"false\"/\"disabled\", got %q", raw)
+	}
+}
+
 // ResourceConfig represents the structure of the configuration file.
 type ResourceConfig struct {
 	Resources []Resource `yaml:"resources"`
@@ -83,12 +211,88 @@ type ReleaseConfig struct {
 	Prefix   string            `yaml:"prefix"`
 	Labels   map[string]string `yaml:"labels"`
 	ChartRef ChartRefConfig    `yaml:"chartRef"`
-	// HelmInstallTimeout overrides the Flux HelmRelease Install.Timeout and
-	// Upgrade.Timeout for this Application kind. When zero, flux defaults
-	// apply. Populated from the
-	// release.cozystack.io/helm-install-timeout annotation on the
-	// ApplicationDefinition at start-up.
+	// HelmInstallTimeout is a per-kind override of Install.Timeout and
+	// Upgrade.Timeout. When non-zero, it wins over
+	// HelmReleaseInstallTimeout / HelmReleaseUpgradeTimeout below.
+	// Populated from the release.cozystack.io/helm-install-timeout
+	// annotation on the ApplicationDefinition at start-up.
 	HelmInstallTimeout time.Duration `yaml:"helmInstallTimeout,omitempty"`
+	// HelmUpgradeTimeout is a per-kind override of Upgrade.Timeout only.
+	// When non-zero, it wins over both HelmReleaseUpgradeTimeout and
+	// the Upgrade.Timeout value HelmInstallTimeout would otherwise apply,
+	// so a kind can carry an asymmetric install/upgrade budget. Populated
+	// from the release.cozystack.io/helm-upgrade-timeout annotation on the
+	// ApplicationDefinition at start-up.
+	HelmUpgradeTimeout time.Duration `yaml:"helmUpgradeTimeout,omitempty"`
+	// HelmReleaseInterval is the global default for Spec.Interval on
+	// HelmReleases generated by cozystack-api. Set from the api server
+	// --helmrelease-interval flag; mirrors the cozystack-operator flag of
+	// the same name so both HelmRelease-generating paths use the same
+	// reconcile cadence.
+	HelmReleaseInterval time.Duration `yaml:"helmReleaseInterval,omitempty"`
+	// HelmReleaseRetryInterval is the global default for
+	// Install/Upgrade.Strategy.RetryInterval. Decoupled from
+	// HelmReleaseInterval so failed install/upgrade retries recover fast
+	// without polling healthy releases at the same cadence.
+	HelmReleaseRetryInterval time.Duration `yaml:"helmReleaseRetryInterval,omitempty"`
+	// HelmReleaseInstallTimeout is the global default for
+	// Spec.Install.Timeout. Overridden for this Application kind by
+	// HelmInstallTimeout from its ApplicationDefinition.
+	HelmReleaseInstallTimeout time.Duration `yaml:"helmReleaseInstallTimeout,omitempty"`
+	// HelmReleaseUpgradeTimeout is the global default for
+	// Spec.Upgrade.Timeout. Overridden for this Application kind by
+	// HelmInstallTimeout, or by HelmUpgradeTimeout with higher precedence,
+	// from its ApplicationDefinition.
+	HelmReleaseUpgradeTimeout time.Duration `yaml:"helmReleaseUpgradeTimeout,omitempty"`
+	// HelmReleaseMaxHistory is the global default for Spec.MaxHistory.
+	// 0 means unlimited per Helm semantics; matches the cozystack-operator
+	// flag of the same name. No omitempty: 0 ("unlimited") must survive a
+	// round-trip distinct from an unset field if ReleaseConfig is ever
+	// marshalled.
+	HelmReleaseMaxHistory int `yaml:"helmReleaseMaxHistory"`
+	// HelmInstallDisableWait sets HelmReleaseSpec.Install.DisableWait and
+	// Upgrade.DisableWait to true for this Application kind. Populated
+	// from the release.cozystack.io/helm-install-disable-wait
+	// annotation on the ApplicationDefinition at start-up.
+	HelmInstallDisableWait bool `yaml:"helmInstallDisableWait,omitempty"`
+	// HelmServerSideApply overrides the Helm apply strategy for this Application
+	// kind: nil leaves the helm-controller default (server-side apply on v1.5.0),
+	// false forces client-side apply. Populated from the
+	// release.cozystack.io/helm-server-side-apply annotation on the
+	// ApplicationDefinition at start-up. See HelmServerSideApplyAnnotation.
+	HelmServerSideApply *bool `yaml:"helmServerSideApply,omitempty"`
+	// WaitStrategy sets HelmReleaseSpec.WaitStrategy.Name (poller|legacy) for
+	// this Application kind. Populated from spec.release.waitStrategy on the
+	// ApplicationDefinition at start-up. Empty leaves the flux default, unless
+	// HealthCheckExprs is set (see ResolveWaitStrategy).
+	WaitStrategy string `yaml:"waitStrategy,omitempty"`
+	// HealthCheckExprs sets HelmReleaseSpec.HealthCheckExprs — CEL health
+	// expressions evaluated (under the poller strategy) against the custom
+	// resource(s) this Application renders. Populated from
+	// spec.release.healthCheckExprs on the ApplicationDefinition at start-up.
+	// json-tagged via kustomize.CustomHealthCheck; ReleaseConfig is
+	// json.Marshalled (never yaml round-tripped), so the json tags are honored.
+	HealthCheckExprs []kustomize.CustomHealthCheck `yaml:"healthCheckExprs,omitempty"`
+}
+
+// ResolveWaitStrategy builds the HelmReleaseSpec.WaitStrategy value shared by
+// both HelmRelease-generating paths (cozystack-api and cozystack-operator).
+// It maps the scalar waitStrategy string onto the upstream {name} object and
+// couples the default: healthCheckExprs are only evaluated under the poller
+// strategy, so when expressions are present and no strategy was set we default
+// to poller. This makes a package that sets only healthCheckExprs
+// self-contained and removes the "must also set waitStrategy: poller" footgun,
+// independent of the controller's global default. Returns nil (leave unset,
+// flux default applies) when neither a strategy nor expressions are given.
+func ResolveWaitStrategy(waitStrategy string, hasHealthCheckExprs bool) *helmv2.WaitStrategy {
+	name := waitStrategy
+	if name == "" {
+		if !hasHealthCheckExprs {
+			return nil
+		}
+		name = string(helmv2.WaitStrategyPoller)
+	}
+	return &helmv2.WaitStrategy{Name: helmv2.WaitStrategyName(name)}
 }
 
 // ChartRefConfig references a Flux source artifact for the Helm chart.
diff --git a/pkg/config/config_test.go b/pkg/config/config_test.go
index eb6990afd5..5a2acafa9e 100644
--- a/pkg/config/config_test.go
+++ b/pkg/config/config_test.go
@@ -15,7 +15,7 @@ import (
 // - compound forms (the CRD pattern accepts repeats),
 // - units time.ParseDuration accepts but Flux rejects (ns, us, µs),
 // - outright garbage.
-func TestParseHelmInstallTimeoutAnnotation(t *testing.T) {
+func TestParseHelmTimeoutAnnotation(t *testing.T) {
 	cases := []struct {
 		name     string
 		input    string
@@ -98,7 +98,7 @@ func TestParseHelmInstallTimeoutAnnotation(t *testing.T) {
 
 	for _, tc := range cases {
 		t.Run(tc.name, func(t *testing.T) {
-			got, err := ParseHelmInstallTimeoutAnnotation(tc.input)
+			got, err := ParseHelmTimeoutAnnotation(tc.input)
 			if tc.wantErr {
 				if err == nil {
 					t.Fatalf("expected error, got duration=%v", got)
@@ -117,3 +117,225 @@ func TestParseHelmInstallTimeoutAnnotation(t *testing.T) {
 		})
 	}
 }
+
+// ParsePositiveDuration is the startup validator shared by cozystack-operator
+// and cozystack-api. Both binaries reject zero/negative/malformed values so a
+// misconfigured flag fails fast instead of propagating into every generated
+// HelmRelease and being rejected by helm-controller's CRD validation later.
+func TestParsePositiveDuration(t *testing.T) {
+	tests := []struct {
+		name string
+		raw  string
+		want time.Duration
+		// errMatch pins which of the two error branches fired: a
+		// time.ParseDuration failure ("invalid duration") versus a
+		// non-positive value ("must be > 0"). Keeps the two diagnostics
+		// from drifting and operators seeing the wrong message.
+		errMatch string
+		wantErr  bool
+	}{
+		{name: "valid seconds", raw: "30s", want: 30 * time.Second},
+		{name: "valid minutes", raw: "5m", want: 5 * time.Minute},
+		{name: "valid compound", raw: "1h30m", want: 90 * time.Minute},
+		{name: "zero rejected", raw: "0s", wantErr: true, errMatch: "must be > 0"},
+		{name: "negative rejected", raw: "-5m", wantErr: true, errMatch: "must be > 0"},
+		{name: "malformed rejected", raw: "5x", wantErr: true, errMatch: "invalid duration"},
+		{name: "empty rejected", raw: "", wantErr: true, errMatch: "invalid duration"},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got, err := ParsePositiveDuration("--test-flag", tt.raw)
+			if tt.wantErr {
+				if err == nil {
+					t.Fatalf("expected error for %q, got nil", tt.raw)
+				}
+				if tt.errMatch != "" && !strings.Contains(err.Error(), tt.errMatch) {
+					t.Errorf("error %q does not contain %q", err.Error(), tt.errMatch)
+				}
+				return
+			}
+			if err != nil {
+				t.Fatalf("unexpected error for %q: %v", tt.raw, err)
+			}
+			if got != tt.want {
+				t.Errorf("got %v, want %v", got, tt.want)
+			}
+		})
+	}
+}
+
+// Cover the disable-wait annotation parser. cozystack-api consumes it on
+// every ApplicationDefinition at startup (see pkg/cmd/server/start.go);
+// a typo in the parsed value silently drops back to false and the
+// chicken-and-egg deadlock between the kubernetes chart and its emitted
+// in-tenant addon HelmReleases reappears (parent chart waits for child
+// HRs Ready before running post-install hooks, child HRs cannot be Ready
+// without the TalosConfigTemplate the parent's hook produces, deadlock).
+// Mirrors the sibling timeout parser table.
+func TestParseHelmInstallDisableWaitAnnotation(t *testing.T) {
+	cases := []struct {
+		name     string
+		input    string
+		want     bool
+		wantErr  bool
+		errMatch string
+	}{
+		{
+			name:  "empty string leaves flux defaults in place",
+			input: "",
+			want:  false,
+		},
+		{
+			name:  "lower-case true",
+			input: "true",
+			want:  true,
+		},
+		{
+			name:  "title-case True",
+			input: "True",
+			want:  true,
+		},
+		{
+			name:  "upper-case TRUE",
+			input: "TRUE",
+			want:  true,
+		},
+		{
+			name:  "lower-case false",
+			input: "false",
+			want:  false,
+		},
+		{
+			name:  "title-case False",
+			input: "False",
+			want:  false,
+		},
+		{
+			name:  "upper-case FALSE",
+			input: "FALSE",
+			want:  false,
+		},
+		{
+			name:  "mixed-case true accepted (case-insensitive)",
+			input: "tRue",
+			want:  true,
+		},
+		{
+			name:  "mixed-case false accepted (case-insensitive)",
+			input: "fAlSe",
+			want:  false,
+		},
+		{
+			name:  "surrounding whitespace trimmed",
+			input: "  true  ",
+			want:  true,
+		},
+		{
+			name:     "integer rejected",
+			input:    "1",
+			wantErr:  true,
+			errMatch: `must be "true" or "false"`,
+		},
+		{
+			name:     "yes/no idiom rejected",
+			input:    "yes",
+			wantErr:  true,
+			errMatch: `must be "true" or "false"`,
+		},
+		{
+			name:     "garbage rejected",
+			input:    "abc",
+			wantErr:  true,
+			errMatch: `must be "true" or "false"`,
+		},
+	}
+
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			got, err := ParseHelmInstallDisableWaitAnnotation(tc.input)
+			if tc.wantErr {
+				if err == nil {
+					t.Fatalf("expected error, got %v", got)
+				}
+				if tc.errMatch != "" && !strings.Contains(err.Error(), tc.errMatch) {
+					t.Errorf("error %q does not contain %q", err.Error(), tc.errMatch)
+				}
+				return
+			}
+			if err != nil {
+				t.Fatalf("unexpected error: %v", err)
+			}
+			if got != tc.want {
+				t.Errorf("got %v, want %v", got, tc.want)
+			}
+		})
+	}
+}
+
+func TestParseHelmServerSideApplyAnnotation(t *testing.T) {
+	tru := true
+	fls := false
+	cases := []struct {
+		name     string
+		input    string
+		want     *bool
+		wantErr  bool
+		errMatch string
+	}{
+		{name: "empty leaves helm-controller default", input: "", want: nil},
+		{name: "false forces client-side", input: "false", want: &fls},
+		{name: "disabled forces client-side", input: "disabled", want: &fls},
+		{name: "true forces server-side", input: "true", want: &tru},
+		{name: "enabled forces server-side", input: "enabled", want: &tru},
+		{name: "mixed-case accepted", input: "  Disabled  ", want: &fls},
+		{name: "auto rejected (only true/false accepted here)", input: "auto", wantErr: true, errMatch: `must be`},
+		{name: "garbage rejected", input: "abc", wantErr: true, errMatch: `must be`},
+	}
+
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			got, err := ParseHelmServerSideApplyAnnotation(tc.input)
+			if tc.wantErr {
+				if err == nil {
+					t.Fatalf("expected error, got %v", got)
+				}
+				if tc.errMatch != "" && !strings.Contains(err.Error(), tc.errMatch) {
+					t.Errorf("error %q does not contain %q", err.Error(), tc.errMatch)
+				}
+				return
+			}
+			if err != nil {
+				t.Fatalf("unexpected error: %v", err)
+			}
+			switch {
+			case tc.want == nil && got != nil:
+				t.Errorf("got %v, want nil", *got)
+			case tc.want != nil && got == nil:
+				t.Errorf("got nil, want %v", *tc.want)
+			case tc.want != nil && got != nil && *got != *tc.want:
+				t.Errorf("got %v, want %v", *got, *tc.want)
+			}
+		})
+	}
+}
+
+// TestReleaseAnnotationsShareThePrefix pins that every annotation cozystack-api
+// reads off an ApplicationDefinition lives under ReleaseAnnotationPrefix.
+// cozystack-operator selects them by that prefix when it hashes the definitions
+// to decide whether to roll the api Deployment, so an annotation introduced
+// outside the prefix would be read at start-up but never trigger the restart
+// that delivers it.
+func TestReleaseAnnotationsShareThePrefix(t *testing.T) {
+	for _, annotation := range []string{
+		HelmInstallTimeoutAnnotation,
+		HelmUpgradeTimeoutAnnotation,
+		HelmInstallDisableWaitAnnotation,
+		HelmServerSideApplyAnnotation,
+	} {
+		if !strings.HasPrefix(annotation, ReleaseAnnotationPrefix) {
+			t.Errorf("annotation %q is outside %q, so a change to it never rolls cozystack-api",
+				annotation, ReleaseAnnotationPrefix)
+		}
+	}
+}
diff --git a/pkg/config/waitstrategy_test.go b/pkg/config/waitstrategy_test.go
new file mode 100644
index 0000000000..1f2cd18da1
--- /dev/null
+++ b/pkg/config/waitstrategy_test.go
@@ -0,0 +1,86 @@
+/*
+Copyright 2026 The Cozystack Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package config
+
+import (
+	"testing"
+
+	helmv2 "github.com/fluxcd/helm-controller/api/v2"
+)
+
+// ResolveWaitStrategy is the single source of truth for the wait-strategy value
+// on both HelmRelease-generating paths (cozystack-api and cozystack-operator).
+// The couple-the-default behavior (expressions imply poller) is what makes a
+// package that sets only healthCheckExprs self-contained, so it is the part
+// worth pinning against regression.
+func TestResolveWaitStrategy(t *testing.T) {
+	tests := []struct {
+		name         string
+		waitStrategy string
+		hasExprs     bool
+		want         *helmv2.WaitStrategyName // nil => expect nil *WaitStrategy
+	}{
+		{
+			name:         "unset, no exprs -> nil (leave flux default)",
+			waitStrategy: "",
+			hasExprs:     false,
+			want:         nil,
+		},
+		{
+			name:         "unset, with exprs -> poller (coupled default)",
+			waitStrategy: "",
+			hasExprs:     true,
+			want:         new(helmv2.WaitStrategyPoller),
+		},
+		{
+			name:         "explicit poller is honored",
+			waitStrategy: "poller",
+			hasExprs:     true,
+			want:         new(helmv2.WaitStrategyPoller),
+		},
+		{
+			name:         "explicit legacy is honored even with exprs",
+			waitStrategy: "legacy",
+			hasExprs:     true,
+			want:         new(helmv2.WaitStrategyLegacy),
+		},
+		{
+			name:         "explicit legacy without exprs is honored",
+			waitStrategy: "legacy",
+			hasExprs:     false,
+			want:         new(helmv2.WaitStrategyLegacy),
+		},
+	}
+
+	for _, tc := range tests {
+		t.Run(tc.name, func(t *testing.T) {
+			got := ResolveWaitStrategy(tc.waitStrategy, tc.hasExprs)
+			if tc.want == nil {
+				if got != nil {
+					t.Fatalf("ResolveWaitStrategy(%q, %v) = %+v, want nil", tc.waitStrategy, tc.hasExprs, got)
+				}
+				return
+			}
+			if got == nil {
+				t.Fatalf("ResolveWaitStrategy(%q, %v) = nil, want %q", tc.waitStrategy, tc.hasExprs, *tc.want)
+			}
+			if got.Name != *tc.want {
+				t.Errorf("ResolveWaitStrategy(%q, %v).Name = %q, want %q", tc.waitStrategy, tc.hasExprs, got.Name, *tc.want)
+			}
+		})
+	}
+}
diff --git a/pkg/generated/applyconfiguration/apps/v1alpha1/application.go b/pkg/generated/applyconfiguration/apps/v1alpha1/application.go
index 9c5e2ab5b5..703eb840aa 100644
--- a/pkg/generated/applyconfiguration/apps/v1alpha1/application.go
+++ b/pkg/generated/applyconfiguration/apps/v1alpha1/application.go
@@ -27,8 +27,10 @@ import (
 
 // ApplicationApplyConfiguration represents a declarative configuration of the Application type for use
 // with apply.
+//
+// Application is an example type with a spec and a status.
 type ApplicationApplyConfiguration struct {
-	v1.TypeMetaApplyConfiguration    `json:",inline"`
+	v1.TypeMetaApplyConfiguration    `json:""`
 	*v1.ObjectMetaApplyConfiguration `json:"metadata,omitempty"`
 	AppVersion                       *string                              `json:"appVersion,omitempty"`
 	Spec                             *apiextensionsv1.JSON                `json:"spec,omitempty"`
@@ -45,6 +47,7 @@ func Application(name, namespace string) *ApplicationApplyConfiguration {
 	b.WithAPIVersion("apps.cozystack.io/v1alpha1")
 	return b
 }
+
 func (b ApplicationApplyConfiguration) IsApplyConfiguration() {}
 
 // WithKind sets the Kind field in the declarative configuration to the given value
diff --git a/pkg/generated/applyconfiguration/apps/v1alpha1/applicationstatus.go b/pkg/generated/applyconfiguration/apps/v1alpha1/applicationstatus.go
index 2a990861bb..e20e08a51e 100644
--- a/pkg/generated/applyconfiguration/apps/v1alpha1/applicationstatus.go
+++ b/pkg/generated/applyconfiguration/apps/v1alpha1/applicationstatus.go
@@ -24,11 +24,16 @@ import (
 
 // ApplicationStatusApplyConfiguration represents a declarative configuration of the ApplicationStatus type for use
 // with apply.
+//
+// ApplicationStatus is the status of a Application.
 type ApplicationStatusApplyConfiguration struct {
-	Version          *string                          `json:"version,omitempty"`
-	Conditions       []v1.ConditionApplyConfiguration `json:"conditions,omitempty"`
-	Namespace        *string                          `json:"namespace,omitempty"`
-	ExternalIPsCount *int32                           `json:"externalIPsCount,omitempty"`
+	// Conditions holds the conditions for the Application.
+	Version    *string                          `json:"version,omitempty"`
+	Conditions []v1.ConditionApplyConfiguration `json:"conditions,omitempty"`
+	// Namespace holds the computed namespace for Tenant applications.
+	Namespace *string `json:"namespace,omitempty"`
+	// ExternalIPsCount holds the number of LoadBalancer services with assigned external IPs for Tenant applications.
+	ExternalIPsCount *int32 `json:"externalIPsCount,omitempty"`
 }
 
 // ApplicationStatusApplyConfiguration constructs a declarative configuration of the ApplicationStatus type for use with
diff --git a/pkg/generated/clientset/versioned/clientset.go b/pkg/generated/clientset/versioned/clientset.go
index 127a0032a4..82121a5ecc 100644
--- a/pkg/generated/clientset/versioned/clientset.go
+++ b/pkg/generated/clientset/versioned/clientset.go
@@ -29,7 +29,7 @@ import (
 )
 
 type Interface interface {
-	Discovery() discovery.DiscoveryInterface
+	Discovery() discovery.DiscoveryInterfaces
 	AppsV1alpha1() appsv1alpha1.AppsV1alpha1Interface
 }
 
@@ -45,7 +45,7 @@ func (c *Clientset) AppsV1alpha1() appsv1alpha1.AppsV1alpha1Interface {
 }
 
 // Discovery retrieves the DiscoveryClient
-func (c *Clientset) Discovery() discovery.DiscoveryInterface {
+func (c *Clientset) Discovery() discovery.DiscoveryInterfaces {
 	if c == nil {
 		return nil
 	}
diff --git a/pkg/generated/clientset/versioned/fake/clientset_generated.go b/pkg/generated/clientset/versioned/fake/clientset_generated.go
index 3ceb93c75e..bf75e046d8 100644
--- a/pkg/generated/clientset/versioned/fake/clientset_generated.go
+++ b/pkg/generated/clientset/versioned/fake/clientset_generated.go
@@ -35,10 +35,6 @@ import (
 // It's backed by a very simple object tracker that processes creates, updates and deletions as-is,
 // without applying any field management, validations and/or defaults. It shouldn't be considered a replacement
 // for a real clientset and is mostly useful in simple unit tests.
-//
-// DEPRECATED: NewClientset replaces this with support for field management, which significantly improves
-// server side apply testing. NewClientset is only available when apply configurations are generated (e.g.
-// via --with-applyconfig).
 func NewSimpleClientset(objects ...runtime.Object) *Clientset {
 	o := testing.NewObjectTracker(scheme, codecs.UniversalDecoder())
 	for _, obj := range objects {
@@ -52,8 +48,8 @@ func NewSimpleClientset(objects ...runtime.Object) *Clientset {
 	cs.AddReactor("*", "*", testing.ObjectReaction(o))
 	cs.AddWatchReactor("*", func(action testing.Action) (handled bool, ret watch.Interface, err error) {
 		var opts metav1.ListOptions
-		if watchActcion, ok := action.(testing.WatchActionImpl); ok {
-			opts = watchActcion.ListOptions
+		if watchAction, ok := action.(testing.WatchActionImpl); ok {
+			opts = watchAction.ListOptions
 		}
 		gvr := action.GetResource()
 		ns := action.GetNamespace()
@@ -76,7 +72,7 @@ type Clientset struct {
 	tracker   testing.ObjectTracker
 }
 
-func (c *Clientset) Discovery() discovery.DiscoveryInterface {
+func (c *Clientset) Discovery() discovery.DiscoveryInterfaces {
 	return c.discovery
 }
 
@@ -84,10 +80,25 @@ func (c *Clientset) Tracker() testing.ObjectTracker {
 	return c.tracker
 }
 
+// IsWatchListSemanticsUnSupported informs the reflector that this client
+// doesn't support WatchList semantics.
+//
+// This is a synthetic method whose sole purpose is to satisfy the optional
+// interface check performed by the reflector.
+// Returning true signals that WatchList can NOT be used.
+// No additional logic is implemented here.
+func (c *Clientset) IsWatchListSemanticsUnSupported() bool {
+	return true
+}
+
 // NewClientset returns a clientset that will respond with the provided objects.
 // It's backed by a very simple object tracker that processes creates, updates and deletions as-is,
 // without applying any validations and/or defaults. It shouldn't be considered a replacement
 // for a real clientset and is mostly useful in simple unit tests.
+//
+// Compared to NewSimpleClientset, the Clientset returned here supports field tracking and thus
+// server-side apply. Beware though that support in that for CRDs is missing
+// (https://github.com/kubernetes/kubernetes/issues/126850).
 func NewClientset(objects ...runtime.Object) *Clientset {
 	o := testing.NewFieldManagedObjectTracker(
 		scheme,
diff --git a/pkg/generated/openapi/definitions_test.go b/pkg/generated/openapi/definitions_test.go
new file mode 100644
index 0000000000..9440a7283a
--- /dev/null
+++ b/pkg/generated/openapi/definitions_test.go
@@ -0,0 +1,157 @@
+/*
+Copyright 2026 The Cozystack Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package openapi
+
+import (
+	"sort"
+	"strings"
+	"testing"
+
+	"k8s.io/kube-openapi/pkg/common"
+	"k8s.io/kube-openapi/pkg/validation/spec"
+)
+
+// The two tests below guard the published OpenAPI document against the class of
+// defect in https://github.com/cozystack/cozystack/issues/3806: a definition
+// name that is a Go import path rather than a dotted Kubernetes model name.
+//
+// Since Kubernetes 0.35 the apiserver's DefinitionNamer.GetDefinitionName
+// returns the model name it was given verbatim — it no longer converts the Go
+// import-path form into the "friendly" reversed-path form — so whatever name
+// this generated map uses becomes both the published definition key and, JSON
+// pointer escaped, the $ref that points at it. A name containing "/" therefore
+// ships as a definition keyed on the raw path while every reference to it is
+// spelled with "~1" in place of each slash, and clients resolve a $ref by
+// trimming "#/definitions/" without unescaping (kube-openapi
+// pkg/util/proto/document.go). The two spellings never meet, so the reference
+// dangles and client-side validation fails on every resource of the group:
+//
+//	error validating data: SchemaError(…core/v1alpha1.Option.spec):
+//	unknown model in reference: "github.com~1cozystack~1…v1alpha1.OptionSpec"
+//
+// The fix for a group is the +k8s:openapi-model-package marker in its doc.go
+// plus an OpenAPIModelName method per type (see each package's model_name.go).
+// Nothing asserted that, which is why the core and sdn groups shipped broken in
+// v1.6.0 and v1.6.1. These tests assert the invariant rather than today's set of
+// names, so a future group that omits the marker fails here instead of in a
+// cluster.
+
+// buildDefinitions builds the generated definition map, recording every model
+// name the generated code passes to the reference callback. Refs are built
+// exactly as kube-openapi's builder builds them, so the recorded name and the
+// emitted $ref differ in the same way they do in the served document.
+func buildDefinitions() (defs map[string]common.OpenAPIDefinition, refNames []string) {
+	defs = GetOpenAPIDefinitions(func(path string) spec.Ref {
+		refNames = append(refNames, path)
+		return spec.MustCreateRef("#/definitions/" + common.EscapeJsonPointer(path))
+	})
+	return defs, refNames
+}
+
+// sortedKeys returns the definition names in a stable order so failures are
+// reproducible rather than map-iteration ordered.
+func sortedKeys(defs map[string]common.OpenAPIDefinition) []string {
+	out := make([]string, 0, len(defs))
+	for name := range defs {
+		out = append(out, name)
+	}
+	sort.Strings(out)
+	return out
+}
+
+// TestDefinitionNamesAreDottedModelNames asserts that no published definition
+// name contains a slash. A slash-bearing name is a Go import path that escaped
+// as-is, which means the group it belongs to is missing its
+// +k8s:openapi-model-package marker and its OpenAPIModelName methods.
+func TestDefinitionNamesAreDottedModelNames(t *testing.T) {
+	defs, _ := buildDefinitions()
+
+	// Guard against the assertion going vacuous: the map must be populated and
+	// must actually cover cozystack's own types, not only the vendored
+	// apimachinery and apiextensions models that already declare their names.
+	if len(defs) == 0 {
+		t.Fatal("GetOpenAPIDefinitions returned no definitions; this test is asserting nothing")
+	}
+	own := 0
+	for _, name := range sortedKeys(defs) {
+		if strings.Contains(name, "cozystack") {
+			own++
+		}
+	}
+	if own == 0 {
+		t.Fatal("no cozystack-owned definitions found; this test is asserting nothing")
+	}
+
+	for _, name := range sortedKeys(defs) {
+		if strings.Contains(name, "/") {
+			t.Errorf("definition %q is a Go import path, not a dotted model name: "+
+				"every $ref to it is escaped with ~1 and will not resolve. Add "+
+				"+k8s:openapi-model-package=<dotted package> to that package's doc.go and an "+
+				"OpenAPIModelName method for the type in its model_name.go, then re-run make generate",
+				name)
+		}
+	}
+}
+
+// TestDefinitionRefsResolve asserts that every $ref the generated document
+// emits resolves to a published definition, resolving it the way a client does:
+// trim "#/definitions/" and look the remainder up verbatim, with no
+// unescaping. This is the failure the user sees, so it is checked directly
+// rather than only through the slash-freedom proxy above; it also catches a
+// group whose types disagree with each other (some named, some not) and a ref
+// to a model that is not published at all.
+func TestDefinitionRefsResolve(t *testing.T) {
+	defs, refNames := buildDefinitions()
+
+	if len(refNames) == 0 {
+		t.Fatal("generated definitions emitted no $ref; this test is asserting nothing")
+	}
+
+	// Index the published definitions under the key a client sees, which is the
+	// definition name exactly as published.
+	published := make(map[string]struct{}, len(defs))
+	for name := range defs {
+		published[name] = struct{}{}
+	}
+
+	seen := make(map[string]struct{}, len(refNames))
+	for _, modelName := range refNames {
+		// The served $ref, built the way kube-openapi's builder builds it.
+		ref := "#/definitions/" + common.EscapeJsonPointer(modelName)
+		// The lookup a client performs on it.
+		resolved := strings.TrimPrefix(ref, "#/definitions/")
+		if _, ok := published[resolved]; ok {
+			continue
+		}
+		if _, dup := seen[resolved]; dup {
+			continue
+		}
+		seen[resolved] = struct{}{}
+		t.Errorf("$ref %q does not resolve: no definition is published under %q (model name %q)",
+			ref, resolved, modelName)
+	}
+
+	// Dependencies must agree with the refs: the generated code lists them from
+	// the same set, and consumers walk them to build the transitive closure.
+	for _, name := range sortedKeys(defs) {
+		for _, dep := range defs[name].Dependencies {
+			if _, ok := published[dep]; !ok {
+				t.Errorf("definition %q declares dependency %q, which is not published", name, dep)
+			}
+		}
+	}
+}
diff --git a/pkg/generated/openapi/zz_generated.openapi.go b/pkg/generated/openapi/zz_generated.openapi.go
index 3ad288272f..1edff52305 100644
--- a/pkg/generated/openapi/zz_generated.openapi.go
+++ b/pkg/generated/openapi/zz_generated.openapi.go
@@ -22,104 +22,130 @@ limitations under the License.
 package openapi
 
 import (
+	v1alpha1 "github.com/cozystack/cozystack/pkg/apis/apps/v1alpha1"
+	corev1alpha1 "github.com/cozystack/cozystack/pkg/apis/core/v1alpha1"
+	sdnv1alpha1 "github.com/cozystack/cozystack/pkg/apis/sdn/v1alpha1"
 	v1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
+	resource "k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	runtime "k8s.io/apimachinery/pkg/runtime"
+	version "k8s.io/apimachinery/pkg/version"
 	common "k8s.io/kube-openapi/pkg/common"
 	spec "k8s.io/kube-openapi/pkg/validation/spec"
 )
 
 func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenAPIDefinition {
 	return map[string]common.OpenAPIDefinition{
-		"github.com/cozystack/cozystack/pkg/apis/apps/v1alpha1.Application":                          schema_pkg_apis_apps_v1alpha1_Application(ref),
-		"github.com/cozystack/cozystack/pkg/apis/apps/v1alpha1.ApplicationList":                      schema_pkg_apis_apps_v1alpha1_ApplicationList(ref),
-		"github.com/cozystack/cozystack/pkg/apis/apps/v1alpha1.ApplicationStatus":                    schema_pkg_apis_apps_v1alpha1_ApplicationStatus(ref),
-		"github.com/cozystack/cozystack/pkg/apis/core/v1alpha1.TenantModule":                         schema_pkg_apis_core_v1alpha1_TenantModule(ref),
-		"github.com/cozystack/cozystack/pkg/apis/core/v1alpha1.TenantModuleList":                     schema_pkg_apis_core_v1alpha1_TenantModuleList(ref),
-		"github.com/cozystack/cozystack/pkg/apis/core/v1alpha1.TenantModuleStatus":                   schema_pkg_apis_core_v1alpha1_TenantModuleStatus(ref),
-		"github.com/cozystack/cozystack/pkg/apis/core/v1alpha1.TenantNamespace":                      schema_pkg_apis_core_v1alpha1_TenantNamespace(ref),
-		"github.com/cozystack/cozystack/pkg/apis/core/v1alpha1.TenantNamespaceList":                  schema_pkg_apis_core_v1alpha1_TenantNamespaceList(ref),
-		"github.com/cozystack/cozystack/pkg/apis/core/v1alpha1.TenantSecret":                         schema_pkg_apis_core_v1alpha1_TenantSecret(ref),
-		"github.com/cozystack/cozystack/pkg/apis/core/v1alpha1.TenantSecretList":                     schema_pkg_apis_core_v1alpha1_TenantSecretList(ref),
-		"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.ConversionRequest":                 schema_pkg_apis_apiextensions_v1_ConversionRequest(ref),
-		"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.ConversionResponse":                schema_pkg_apis_apiextensions_v1_ConversionResponse(ref),
-		"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.ConversionReview":                  schema_pkg_apis_apiextensions_v1_ConversionReview(ref),
-		"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.CustomResourceColumnDefinition":    schema_pkg_apis_apiextensions_v1_CustomResourceColumnDefinition(ref),
-		"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.CustomResourceConversion":          schema_pkg_apis_apiextensions_v1_CustomResourceConversion(ref),
-		"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.CustomResourceDefinition":          schema_pkg_apis_apiextensions_v1_CustomResourceDefinition(ref),
-		"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.CustomResourceDefinitionCondition": schema_pkg_apis_apiextensions_v1_CustomResourceDefinitionCondition(ref),
-		"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.CustomResourceDefinitionList":      schema_pkg_apis_apiextensions_v1_CustomResourceDefinitionList(ref),
-		"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.CustomResourceDefinitionNames":     schema_pkg_apis_apiextensions_v1_CustomResourceDefinitionNames(ref),
-		"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.CustomResourceDefinitionSpec":      schema_pkg_apis_apiextensions_v1_CustomResourceDefinitionSpec(ref),
-		"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.CustomResourceDefinitionStatus":    schema_pkg_apis_apiextensions_v1_CustomResourceDefinitionStatus(ref),
-		"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.CustomResourceDefinitionVersion":   schema_pkg_apis_apiextensions_v1_CustomResourceDefinitionVersion(ref),
-		"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.CustomResourceSubresourceScale":    schema_pkg_apis_apiextensions_v1_CustomResourceSubresourceScale(ref),
-		"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.CustomResourceSubresourceStatus":   schema_pkg_apis_apiextensions_v1_CustomResourceSubresourceStatus(ref),
-		"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.CustomResourceSubresources":        schema_pkg_apis_apiextensions_v1_CustomResourceSubresources(ref),
-		"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.CustomResourceValidation":          schema_pkg_apis_apiextensions_v1_CustomResourceValidation(ref),
-		"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.ExternalDocumentation":             schema_pkg_apis_apiextensions_v1_ExternalDocumentation(ref),
-		"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.JSON":                              schema_pkg_apis_apiextensions_v1_JSON(ref),
-		"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.JSONSchemaProps":                   schema_pkg_apis_apiextensions_v1_JSONSchemaProps(ref),
-		"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.JSONSchemaPropsOrArray":            schema_pkg_apis_apiextensions_v1_JSONSchemaPropsOrArray(ref),
-		"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.JSONSchemaPropsOrBool":             schema_pkg_apis_apiextensions_v1_JSONSchemaPropsOrBool(ref),
-		"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.JSONSchemaPropsOrStringArray":      schema_pkg_apis_apiextensions_v1_JSONSchemaPropsOrStringArray(ref),
-		"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.SelectableField":                   schema_pkg_apis_apiextensions_v1_SelectableField(ref),
-		"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.ServiceReference":                  schema_pkg_apis_apiextensions_v1_ServiceReference(ref),
-		"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.ValidationRule":                    schema_pkg_apis_apiextensions_v1_ValidationRule(ref),
-		"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.WebhookClientConfig":               schema_pkg_apis_apiextensions_v1_WebhookClientConfig(ref),
-		"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.WebhookConversion":                 schema_pkg_apis_apiextensions_v1_WebhookConversion(ref),
-		"k8s.io/apimachinery/pkg/apis/meta/v1.APIGroup":                                              schema_pkg_apis_meta_v1_APIGroup(ref),
-		"k8s.io/apimachinery/pkg/apis/meta/v1.APIGroupList":                                          schema_pkg_apis_meta_v1_APIGroupList(ref),
-		"k8s.io/apimachinery/pkg/apis/meta/v1.APIResource":                                           schema_pkg_apis_meta_v1_APIResource(ref),
-		"k8s.io/apimachinery/pkg/apis/meta/v1.APIResourceList":                                       schema_pkg_apis_meta_v1_APIResourceList(ref),
-		"k8s.io/apimachinery/pkg/apis/meta/v1.APIVersions":                                           schema_pkg_apis_meta_v1_APIVersions(ref),
-		"k8s.io/apimachinery/pkg/apis/meta/v1.ApplyOptions":                                          schema_pkg_apis_meta_v1_ApplyOptions(ref),
-		"k8s.io/apimachinery/pkg/apis/meta/v1.Condition":                                             schema_pkg_apis_meta_v1_Condition(ref),
-		"k8s.io/apimachinery/pkg/apis/meta/v1.CreateOptions":                                         schema_pkg_apis_meta_v1_CreateOptions(ref),
-		"k8s.io/apimachinery/pkg/apis/meta/v1.DeleteOptions":                                         schema_pkg_apis_meta_v1_DeleteOptions(ref),
-		"k8s.io/apimachinery/pkg/apis/meta/v1.Duration":                                              schema_pkg_apis_meta_v1_Duration(ref),
-		"k8s.io/apimachinery/pkg/apis/meta/v1.FieldSelectorRequirement":                              schema_pkg_apis_meta_v1_FieldSelectorRequirement(ref),
-		"k8s.io/apimachinery/pkg/apis/meta/v1.FieldsV1":                                              schema_pkg_apis_meta_v1_FieldsV1(ref),
-		"k8s.io/apimachinery/pkg/apis/meta/v1.GetOptions":                                            schema_pkg_apis_meta_v1_GetOptions(ref),
-		"k8s.io/apimachinery/pkg/apis/meta/v1.GroupKind":                                             schema_pkg_apis_meta_v1_GroupKind(ref),
-		"k8s.io/apimachinery/pkg/apis/meta/v1.GroupResource":                                         schema_pkg_apis_meta_v1_GroupResource(ref),
-		"k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersion":                                          schema_pkg_apis_meta_v1_GroupVersion(ref),
-		"k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersionForDiscovery":                              schema_pkg_apis_meta_v1_GroupVersionForDiscovery(ref),
-		"k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersionKind":                                      schema_pkg_apis_meta_v1_GroupVersionKind(ref),
-		"k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersionResource":                                  schema_pkg_apis_meta_v1_GroupVersionResource(ref),
-		"k8s.io/apimachinery/pkg/apis/meta/v1.InternalEvent":                                         schema_pkg_apis_meta_v1_InternalEvent(ref),
-		"k8s.io/apimachinery/pkg/apis/meta/v1.LabelSelector":                                         schema_pkg_apis_meta_v1_LabelSelector(ref),
-		"k8s.io/apimachinery/pkg/apis/meta/v1.LabelSelectorRequirement":                              schema_pkg_apis_meta_v1_LabelSelectorRequirement(ref),
-		"k8s.io/apimachinery/pkg/apis/meta/v1.List":                                                  schema_pkg_apis_meta_v1_List(ref),
-		"k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta":                                              schema_pkg_apis_meta_v1_ListMeta(ref),
-		"k8s.io/apimachinery/pkg/apis/meta/v1.ListOptions":                                           schema_pkg_apis_meta_v1_ListOptions(ref),
-		"k8s.io/apimachinery/pkg/apis/meta/v1.ManagedFieldsEntry":                                    schema_pkg_apis_meta_v1_ManagedFieldsEntry(ref),
-		"k8s.io/apimachinery/pkg/apis/meta/v1.MicroTime":                                             schema_pkg_apis_meta_v1_MicroTime(ref),
-		"k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta":                                            schema_pkg_apis_meta_v1_ObjectMeta(ref),
-		"k8s.io/apimachinery/pkg/apis/meta/v1.OwnerReference":                                        schema_pkg_apis_meta_v1_OwnerReference(ref),
-		"k8s.io/apimachinery/pkg/apis/meta/v1.PartialObjectMetadata":                                 schema_pkg_apis_meta_v1_PartialObjectMetadata(ref),
-		"k8s.io/apimachinery/pkg/apis/meta/v1.PartialObjectMetadataList":                             schema_pkg_apis_meta_v1_PartialObjectMetadataList(ref),
-		"k8s.io/apimachinery/pkg/apis/meta/v1.Patch":                                                 schema_pkg_apis_meta_v1_Patch(ref),
-		"k8s.io/apimachinery/pkg/apis/meta/v1.PatchOptions":                                          schema_pkg_apis_meta_v1_PatchOptions(ref),
-		"k8s.io/apimachinery/pkg/apis/meta/v1.Preconditions":                                         schema_pkg_apis_meta_v1_Preconditions(ref),
-		"k8s.io/apimachinery/pkg/apis/meta/v1.RootPaths":                                             schema_pkg_apis_meta_v1_RootPaths(ref),
-		"k8s.io/apimachinery/pkg/apis/meta/v1.ServerAddressByClientCIDR":                             schema_pkg_apis_meta_v1_ServerAddressByClientCIDR(ref),
-		"k8s.io/apimachinery/pkg/apis/meta/v1.Status":                                                schema_pkg_apis_meta_v1_Status(ref),
-		"k8s.io/apimachinery/pkg/apis/meta/v1.StatusCause":                                           schema_pkg_apis_meta_v1_StatusCause(ref),
-		"k8s.io/apimachinery/pkg/apis/meta/v1.StatusDetails":                                         schema_pkg_apis_meta_v1_StatusDetails(ref),
-		"k8s.io/apimachinery/pkg/apis/meta/v1.Table":                                                 schema_pkg_apis_meta_v1_Table(ref),
-		"k8s.io/apimachinery/pkg/apis/meta/v1.TableColumnDefinition":                                 schema_pkg_apis_meta_v1_TableColumnDefinition(ref),
-		"k8s.io/apimachinery/pkg/apis/meta/v1.TableOptions":                                          schema_pkg_apis_meta_v1_TableOptions(ref),
-		"k8s.io/apimachinery/pkg/apis/meta/v1.TableRow":                                              schema_pkg_apis_meta_v1_TableRow(ref),
-		"k8s.io/apimachinery/pkg/apis/meta/v1.TableRowCondition":                                     schema_pkg_apis_meta_v1_TableRowCondition(ref),
-		"k8s.io/apimachinery/pkg/apis/meta/v1.Time":                                                  schema_pkg_apis_meta_v1_Time(ref),
-		"k8s.io/apimachinery/pkg/apis/meta/v1.Timestamp":                                             schema_pkg_apis_meta_v1_Timestamp(ref),
-		"k8s.io/apimachinery/pkg/apis/meta/v1.TypeMeta":                                              schema_pkg_apis_meta_v1_TypeMeta(ref),
-		"k8s.io/apimachinery/pkg/apis/meta/v1.UpdateOptions":                                         schema_pkg_apis_meta_v1_UpdateOptions(ref),
-		"k8s.io/apimachinery/pkg/apis/meta/v1.WatchEvent":                                            schema_pkg_apis_meta_v1_WatchEvent(ref),
-		"k8s.io/apimachinery/pkg/runtime.RawExtension":                                               schema_k8sio_apimachinery_pkg_runtime_RawExtension(ref),
-		"k8s.io/apimachinery/pkg/runtime.TypeMeta":                                                   schema_k8sio_apimachinery_pkg_runtime_TypeMeta(ref),
-		"k8s.io/apimachinery/pkg/runtime.Unknown":                                                    schema_k8sio_apimachinery_pkg_runtime_Unknown(ref),
-		"k8s.io/apimachinery/pkg/version.Info":                                                       schema_k8sio_apimachinery_pkg_version_Info(ref),
+		v1alpha1.Application{}.OpenAPIModelName():                 schema_pkg_apis_apps_v1alpha1_Application(ref),
+		v1alpha1.ApplicationList{}.OpenAPIModelName():             schema_pkg_apis_apps_v1alpha1_ApplicationList(ref),
+		v1alpha1.ApplicationStatus{}.OpenAPIModelName():           schema_pkg_apis_apps_v1alpha1_ApplicationStatus(ref),
+		corev1alpha1.Option{}.OpenAPIModelName():                  schema_pkg_apis_core_v1alpha1_Option(ref),
+		corev1alpha1.OptionItem{}.OpenAPIModelName():              schema_pkg_apis_core_v1alpha1_OptionItem(ref),
+		corev1alpha1.OptionList{}.OpenAPIModelName():              schema_pkg_apis_core_v1alpha1_OptionList(ref),
+		corev1alpha1.OptionSpec{}.OpenAPIModelName():              schema_pkg_apis_core_v1alpha1_OptionSpec(ref),
+		corev1alpha1.Tap{}.OpenAPIModelName():                     schema_pkg_apis_core_v1alpha1_Tap(ref),
+		corev1alpha1.TapList{}.OpenAPIModelName():                 schema_pkg_apis_core_v1alpha1_TapList(ref),
+		corev1alpha1.TapPackage{}.OpenAPIModelName():              schema_pkg_apis_core_v1alpha1_TapPackage(ref),
+		corev1alpha1.TapSource{}.OpenAPIModelName():               schema_pkg_apis_core_v1alpha1_TapSource(ref),
+		corev1alpha1.TapSpec{}.OpenAPIModelName():                 schema_pkg_apis_core_v1alpha1_TapSpec(ref),
+		corev1alpha1.TenantModule{}.OpenAPIModelName():            schema_pkg_apis_core_v1alpha1_TenantModule(ref),
+		corev1alpha1.TenantModuleList{}.OpenAPIModelName():        schema_pkg_apis_core_v1alpha1_TenantModuleList(ref),
+		corev1alpha1.TenantModuleStatus{}.OpenAPIModelName():      schema_pkg_apis_core_v1alpha1_TenantModuleStatus(ref),
+		corev1alpha1.TenantNamespace{}.OpenAPIModelName():         schema_pkg_apis_core_v1alpha1_TenantNamespace(ref),
+		corev1alpha1.TenantNamespaceList{}.OpenAPIModelName():     schema_pkg_apis_core_v1alpha1_TenantNamespaceList(ref),
+		corev1alpha1.TenantSecret{}.OpenAPIModelName():            schema_pkg_apis_core_v1alpha1_TenantSecret(ref),
+		corev1alpha1.TenantSecretList{}.OpenAPIModelName():        schema_pkg_apis_core_v1alpha1_TenantSecretList(ref),
+		sdnv1alpha1.ApplicationReference{}.OpenAPIModelName():     schema_pkg_apis_sdn_v1alpha1_ApplicationReference(ref),
+		sdnv1alpha1.EgressRule{}.OpenAPIModelName():               schema_pkg_apis_sdn_v1alpha1_EgressRule(ref),
+		sdnv1alpha1.FQDNSelector{}.OpenAPIModelName():             schema_pkg_apis_sdn_v1alpha1_FQDNSelector(ref),
+		sdnv1alpha1.IngressRule{}.OpenAPIModelName():              schema_pkg_apis_sdn_v1alpha1_IngressRule(ref),
+		sdnv1alpha1.PortProtocol{}.OpenAPIModelName():             schema_pkg_apis_sdn_v1alpha1_PortProtocol(ref),
+		sdnv1alpha1.PortRule{}.OpenAPIModelName():                 schema_pkg_apis_sdn_v1alpha1_PortRule(ref),
+		sdnv1alpha1.SecurityGroup{}.OpenAPIModelName():            schema_pkg_apis_sdn_v1alpha1_SecurityGroup(ref),
+		sdnv1alpha1.SecurityGroupList{}.OpenAPIModelName():        schema_pkg_apis_sdn_v1alpha1_SecurityGroupList(ref),
+		sdnv1alpha1.SecurityGroupSpec{}.OpenAPIModelName():        schema_pkg_apis_sdn_v1alpha1_SecurityGroupSpec(ref),
+		v1.ConversionRequest{}.OpenAPIModelName():                 schema_pkg_apis_apiextensions_v1_ConversionRequest(ref),
+		v1.ConversionResponse{}.OpenAPIModelName():                schema_pkg_apis_apiextensions_v1_ConversionResponse(ref),
+		v1.ConversionReview{}.OpenAPIModelName():                  schema_pkg_apis_apiextensions_v1_ConversionReview(ref),
+		v1.CustomResourceColumnDefinition{}.OpenAPIModelName():    schema_pkg_apis_apiextensions_v1_CustomResourceColumnDefinition(ref),
+		v1.CustomResourceConversion{}.OpenAPIModelName():          schema_pkg_apis_apiextensions_v1_CustomResourceConversion(ref),
+		v1.CustomResourceDefinition{}.OpenAPIModelName():          schema_pkg_apis_apiextensions_v1_CustomResourceDefinition(ref),
+		v1.CustomResourceDefinitionCondition{}.OpenAPIModelName(): schema_pkg_apis_apiextensions_v1_CustomResourceDefinitionCondition(ref),
+		v1.CustomResourceDefinitionList{}.OpenAPIModelName():      schema_pkg_apis_apiextensions_v1_CustomResourceDefinitionList(ref),
+		v1.CustomResourceDefinitionNames{}.OpenAPIModelName():     schema_pkg_apis_apiextensions_v1_CustomResourceDefinitionNames(ref),
+		v1.CustomResourceDefinitionSpec{}.OpenAPIModelName():      schema_pkg_apis_apiextensions_v1_CustomResourceDefinitionSpec(ref),
+		v1.CustomResourceDefinitionStatus{}.OpenAPIModelName():    schema_pkg_apis_apiextensions_v1_CustomResourceDefinitionStatus(ref),
+		v1.CustomResourceDefinitionVersion{}.OpenAPIModelName():   schema_pkg_apis_apiextensions_v1_CustomResourceDefinitionVersion(ref),
+		v1.CustomResourceSubresourceScale{}.OpenAPIModelName():    schema_pkg_apis_apiextensions_v1_CustomResourceSubresourceScale(ref),
+		v1.CustomResourceSubresourceStatus{}.OpenAPIModelName():   schema_pkg_apis_apiextensions_v1_CustomResourceSubresourceStatus(ref),
+		v1.CustomResourceSubresources{}.OpenAPIModelName():        schema_pkg_apis_apiextensions_v1_CustomResourceSubresources(ref),
+		v1.CustomResourceValidation{}.OpenAPIModelName():          schema_pkg_apis_apiextensions_v1_CustomResourceValidation(ref),
+		v1.ExternalDocumentation{}.OpenAPIModelName():             schema_pkg_apis_apiextensions_v1_ExternalDocumentation(ref),
+		v1.JSON{}.OpenAPIModelName():                              schema_pkg_apis_apiextensions_v1_JSON(ref),
+		v1.JSONSchemaProps{}.OpenAPIModelName():                   schema_pkg_apis_apiextensions_v1_JSONSchemaProps(ref),
+		v1.JSONSchemaPropsOrArray{}.OpenAPIModelName():            schema_pkg_apis_apiextensions_v1_JSONSchemaPropsOrArray(ref),
+		v1.JSONSchemaPropsOrBool{}.OpenAPIModelName():             schema_pkg_apis_apiextensions_v1_JSONSchemaPropsOrBool(ref),
+		v1.JSONSchemaPropsOrStringArray{}.OpenAPIModelName():      schema_pkg_apis_apiextensions_v1_JSONSchemaPropsOrStringArray(ref),
+		v1.SelectableField{}.OpenAPIModelName():                   schema_pkg_apis_apiextensions_v1_SelectableField(ref),
+		v1.ServiceReference{}.OpenAPIModelName():                  schema_pkg_apis_apiextensions_v1_ServiceReference(ref),
+		v1.ValidationRule{}.OpenAPIModelName():                    schema_pkg_apis_apiextensions_v1_ValidationRule(ref),
+		v1.WebhookClientConfig{}.OpenAPIModelName():               schema_pkg_apis_apiextensions_v1_WebhookClientConfig(ref),
+		v1.WebhookConversion{}.OpenAPIModelName():                 schema_pkg_apis_apiextensions_v1_WebhookConversion(ref),
+		resource.Quantity{}.OpenAPIModelName():                    schema_apimachinery_pkg_api_resource_Quantity(ref),
+		metav1.APIGroup{}.OpenAPIModelName():                      schema_pkg_apis_meta_v1_APIGroup(ref),
+		metav1.APIGroupList{}.OpenAPIModelName():                  schema_pkg_apis_meta_v1_APIGroupList(ref),
+		metav1.APIResource{}.OpenAPIModelName():                   schema_pkg_apis_meta_v1_APIResource(ref),
+		metav1.APIResourceList{}.OpenAPIModelName():               schema_pkg_apis_meta_v1_APIResourceList(ref),
+		metav1.APIVersions{}.OpenAPIModelName():                   schema_pkg_apis_meta_v1_APIVersions(ref),
+		metav1.ApplyOptions{}.OpenAPIModelName():                  schema_pkg_apis_meta_v1_ApplyOptions(ref),
+		metav1.Condition{}.OpenAPIModelName():                     schema_pkg_apis_meta_v1_Condition(ref),
+		metav1.CreateOptions{}.OpenAPIModelName():                 schema_pkg_apis_meta_v1_CreateOptions(ref),
+		metav1.DeleteOptions{}.OpenAPIModelName():                 schema_pkg_apis_meta_v1_DeleteOptions(ref),
+		metav1.Duration{}.OpenAPIModelName():                      schema_pkg_apis_meta_v1_Duration(ref),
+		metav1.FieldSelectorRequirement{}.OpenAPIModelName():      schema_pkg_apis_meta_v1_FieldSelectorRequirement(ref),
+		metav1.FieldsV1{}.OpenAPIModelName():                      schema_pkg_apis_meta_v1_FieldsV1(ref),
+		metav1.GetOptions{}.OpenAPIModelName():                    schema_pkg_apis_meta_v1_GetOptions(ref),
+		metav1.GroupKind{}.OpenAPIModelName():                     schema_pkg_apis_meta_v1_GroupKind(ref),
+		metav1.GroupResource{}.OpenAPIModelName():                 schema_pkg_apis_meta_v1_GroupResource(ref),
+		metav1.GroupVersion{}.OpenAPIModelName():                  schema_pkg_apis_meta_v1_GroupVersion(ref),
+		metav1.GroupVersionForDiscovery{}.OpenAPIModelName():      schema_pkg_apis_meta_v1_GroupVersionForDiscovery(ref),
+		metav1.GroupVersionKind{}.OpenAPIModelName():              schema_pkg_apis_meta_v1_GroupVersionKind(ref),
+		metav1.GroupVersionResource{}.OpenAPIModelName():          schema_pkg_apis_meta_v1_GroupVersionResource(ref),
+		metav1.InternalEvent{}.OpenAPIModelName():                 schema_pkg_apis_meta_v1_InternalEvent(ref),
+		metav1.LabelSelector{}.OpenAPIModelName():                 schema_pkg_apis_meta_v1_LabelSelector(ref),
+		metav1.LabelSelectorRequirement{}.OpenAPIModelName():      schema_pkg_apis_meta_v1_LabelSelectorRequirement(ref),
+		metav1.List{}.OpenAPIModelName():                          schema_pkg_apis_meta_v1_List(ref),
+		metav1.ListMeta{}.OpenAPIModelName():                      schema_pkg_apis_meta_v1_ListMeta(ref),
+		metav1.ListOptions{}.OpenAPIModelName():                   schema_pkg_apis_meta_v1_ListOptions(ref),
+		metav1.ManagedFieldsEntry{}.OpenAPIModelName():            schema_pkg_apis_meta_v1_ManagedFieldsEntry(ref),
+		metav1.MicroTime{}.OpenAPIModelName():                     schema_pkg_apis_meta_v1_MicroTime(ref),
+		metav1.ObjectMeta{}.OpenAPIModelName():                    schema_pkg_apis_meta_v1_ObjectMeta(ref),
+		metav1.OwnerReference{}.OpenAPIModelName():                schema_pkg_apis_meta_v1_OwnerReference(ref),
+		metav1.PartialObjectMetadata{}.OpenAPIModelName():         schema_pkg_apis_meta_v1_PartialObjectMetadata(ref),
+		metav1.PartialObjectMetadataList{}.OpenAPIModelName():     schema_pkg_apis_meta_v1_PartialObjectMetadataList(ref),
+		metav1.Patch{}.OpenAPIModelName():                         schema_pkg_apis_meta_v1_Patch(ref),
+		metav1.PatchOptions{}.OpenAPIModelName():                  schema_pkg_apis_meta_v1_PatchOptions(ref),
+		metav1.Preconditions{}.OpenAPIModelName():                 schema_pkg_apis_meta_v1_Preconditions(ref),
+		metav1.RootPaths{}.OpenAPIModelName():                     schema_pkg_apis_meta_v1_RootPaths(ref),
+		metav1.ServerAddressByClientCIDR{}.OpenAPIModelName():     schema_pkg_apis_meta_v1_ServerAddressByClientCIDR(ref),
+		metav1.ShardInfo{}.OpenAPIModelName():                     schema_pkg_apis_meta_v1_ShardInfo(ref),
+		metav1.Status{}.OpenAPIModelName():                        schema_pkg_apis_meta_v1_Status(ref),
+		metav1.StatusCause{}.OpenAPIModelName():                   schema_pkg_apis_meta_v1_StatusCause(ref),
+		metav1.StatusDetails{}.OpenAPIModelName():                 schema_pkg_apis_meta_v1_StatusDetails(ref),
+		metav1.Table{}.OpenAPIModelName():                         schema_pkg_apis_meta_v1_Table(ref),
+		metav1.TableColumnDefinition{}.OpenAPIModelName():         schema_pkg_apis_meta_v1_TableColumnDefinition(ref),
+		metav1.TableOptions{}.OpenAPIModelName():                  schema_pkg_apis_meta_v1_TableOptions(ref),
+		metav1.TableRow{}.OpenAPIModelName():                      schema_pkg_apis_meta_v1_TableRow(ref),
+		metav1.TableRowCondition{}.OpenAPIModelName():             schema_pkg_apis_meta_v1_TableRowCondition(ref),
+		metav1.Time{}.OpenAPIModelName():                          schema_pkg_apis_meta_v1_Time(ref),
+		metav1.Timestamp{}.OpenAPIModelName():                     schema_pkg_apis_meta_v1_Timestamp(ref),
+		metav1.TypeMeta{}.OpenAPIModelName():                      schema_pkg_apis_meta_v1_TypeMeta(ref),
+		metav1.UpdateOptions{}.OpenAPIModelName():                 schema_pkg_apis_meta_v1_UpdateOptions(ref),
+		metav1.WatchEvent{}.OpenAPIModelName():                    schema_pkg_apis_meta_v1_WatchEvent(ref),
+		runtime.RawExtension{}.OpenAPIModelName():                 schema_k8sio_apimachinery_pkg_runtime_RawExtension(ref),
+		runtime.TypeMeta{}.OpenAPIModelName():                     schema_k8sio_apimachinery_pkg_runtime_TypeMeta(ref),
+		runtime.Unknown{}.OpenAPIModelName():                      schema_k8sio_apimachinery_pkg_runtime_Unknown(ref),
+		version.Info{}.OpenAPIModelName():                         schema_k8sio_apimachinery_pkg_version_Info(ref),
 	}
 }
 
@@ -147,7 +173,7 @@ func schema_pkg_apis_apps_v1alpha1_Application(ref common.ReferenceCallback) com
 					"metadata": {
 						SchemaProps: spec.SchemaProps{
 							Default: map[string]interface{}{},
-							Ref:     ref("k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"),
+							Ref:     ref(metav1.ObjectMeta{}.OpenAPIModelName()),
 						},
 					},
 					"appVersion": {
@@ -158,20 +184,20 @@ func schema_pkg_apis_apps_v1alpha1_Application(ref common.ReferenceCallback) com
 					},
 					"spec": {
 						SchemaProps: spec.SchemaProps{
-							Ref: ref("k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.JSON"),
+							Ref: ref(v1.JSON{}.OpenAPIModelName()),
 						},
 					},
 					"status": {
 						SchemaProps: spec.SchemaProps{
 							Default: map[string]interface{}{},
-							Ref:     ref("github.com/cozystack/cozystack/pkg/apis/apps/v1alpha1.ApplicationStatus"),
+							Ref:     ref(v1alpha1.ApplicationStatus{}.OpenAPIModelName()),
 						},
 					},
 				},
 			},
 		},
 		Dependencies: []string{
-			"github.com/cozystack/cozystack/pkg/apis/apps/v1alpha1.ApplicationStatus", "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.JSON", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"},
+			v1alpha1.ApplicationStatus{}.OpenAPIModelName(), v1.JSON{}.OpenAPIModelName(), metav1.ObjectMeta{}.OpenAPIModelName()},
 	}
 }
 
@@ -199,7 +225,7 @@ func schema_pkg_apis_apps_v1alpha1_ApplicationList(ref common.ReferenceCallback)
 					"metadata": {
 						SchemaProps: spec.SchemaProps{
 							Default: map[string]interface{}{},
-							Ref:     ref("k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"),
+							Ref:     ref(metav1.ListMeta{}.OpenAPIModelName()),
 						},
 					},
 					"items": {
@@ -208,8 +234,7 @@ func schema_pkg_apis_apps_v1alpha1_ApplicationList(ref common.ReferenceCallback)
 							Items: &spec.SchemaOrArray{
 								Schema: &spec.Schema{
 									SchemaProps: spec.SchemaProps{
-										Default: map[string]interface{}{},
-										Ref:     ref("github.com/cozystack/cozystack/pkg/apis/apps/v1alpha1.Application"),
+										Ref: ref(v1alpha1.Application{}.OpenAPIModelName()),
 									},
 								},
 							},
@@ -220,7 +245,7 @@ func schema_pkg_apis_apps_v1alpha1_ApplicationList(ref common.ReferenceCallback)
 			},
 		},
 		Dependencies: []string{
-			"github.com/cozystack/cozystack/pkg/apis/apps/v1alpha1.Application", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"},
+			v1alpha1.Application{}.OpenAPIModelName(), metav1.ListMeta{}.OpenAPIModelName()},
 	}
 }
 
@@ -244,8 +269,7 @@ func schema_pkg_apis_apps_v1alpha1_ApplicationStatus(ref common.ReferenceCallbac
 							Items: &spec.SchemaOrArray{
 								Schema: &spec.Schema{
 									SchemaProps: spec.SchemaProps{
-										Default: map[string]interface{}{},
-										Ref:     ref("k8s.io/apimachinery/pkg/apis/meta/v1.Condition"),
+										Ref: ref(metav1.Condition{}.OpenAPIModelName()),
 									},
 								},
 							},
@@ -269,15 +293,15 @@ func schema_pkg_apis_apps_v1alpha1_ApplicationStatus(ref common.ReferenceCallbac
 			},
 		},
 		Dependencies: []string{
-			"k8s.io/apimachinery/pkg/apis/meta/v1.Condition"},
+			metav1.Condition{}.OpenAPIModelName()},
 	}
 }
 
-func schema_pkg_apis_core_v1alpha1_TenantModule(ref common.ReferenceCallback) common.OpenAPIDefinition {
+func schema_pkg_apis_core_v1alpha1_Option(ref common.ReferenceCallback) common.OpenAPIDefinition {
 	return common.OpenAPIDefinition{
 		Schema: spec.Schema{
 			SchemaProps: spec.SchemaProps{
-				Description: "TenantModule represents a HelmRelease with the label internal.cozystack.io/tenantmodule=true",
+				Description: "Option is a read-only, virtual resource that serves a named list of dropdown options for the dashboard. metadata.name is the source name (e.g. \"gpu\", \"instancetype\"); the items are computed on read by the apiserver from cluster state, so tenants need no direct access to the underlying resources.",
 				Type:        []string{"object"},
 				Properties: map[string]spec.Schema{
 					"kind": {
@@ -297,103 +321,996 @@ func schema_pkg_apis_core_v1alpha1_TenantModule(ref common.ReferenceCallback) co
 					"metadata": {
 						SchemaProps: spec.SchemaProps{
 							Default: map[string]interface{}{},
-							Ref:     ref("k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"),
+							Ref:     ref(metav1.ObjectMeta{}.OpenAPIModelName()),
 						},
 					},
-					"appVersion": {
+					"spec": {
 						SchemaProps: spec.SchemaProps{
-							Description: "AppVersion represents the version of the Helm chart",
+							Default: map[string]interface{}{},
+							Ref:     ref(corev1alpha1.OptionSpec{}.OpenAPIModelName()),
+						},
+					},
+				},
+			},
+		},
+		Dependencies: []string{
+			corev1alpha1.OptionSpec{}.OpenAPIModelName(), metav1.ObjectMeta{}.OpenAPIModelName()},
+	}
+}
+
+func schema_pkg_apis_core_v1alpha1_OptionItem(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "OptionItem is a single selectable option.",
+				Type:        []string{"object"},
+				Properties: map[string]spec.Schema{
+					"value": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Value is the string written into the target field.",
+							Default:     "",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"label": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Label is an optional human-friendly title; defaults to Value in the UI.",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"description": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Description is optional helper text (e.g. availability counts or disk size).",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"default": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Default marks the preselected option (e.g. the default StorageClass); the UI auto-selects it when the field has no value yet.",
+							Type:        []string{"boolean"},
+							Format:      "",
+						},
+					},
+				},
+				Required: []string{"value"},
+			},
+		},
+	}
+}
+
+func schema_pkg_apis_core_v1alpha1_OptionList(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Type: []string{"object"},
+				Properties: map[string]spec.Schema{
+					"kind": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"apiVersion": {
+						SchemaProps: spec.SchemaProps{
+							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"metadata": {
+						SchemaProps: spec.SchemaProps{
+							Default: map[string]interface{}{},
+							Ref:     ref(metav1.ListMeta{}.OpenAPIModelName()),
+						},
+					},
+					"items": {
+						SchemaProps: spec.SchemaProps{
+							Type: []string{"array"},
+							Items: &spec.SchemaOrArray{
+								Schema: &spec.Schema{
+									SchemaProps: spec.SchemaProps{
+										Ref: ref(corev1alpha1.Option{}.OpenAPIModelName()),
+									},
+								},
+							},
+						},
+					},
+				},
+				Required: []string{"items"},
+			},
+		},
+		Dependencies: []string{
+			corev1alpha1.Option{}.OpenAPIModelName(), metav1.ListMeta{}.OpenAPIModelName()},
+	}
+}
+
+func schema_pkg_apis_core_v1alpha1_OptionSpec(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "OptionSpec holds the computed option items for a source.",
+				Type:        []string{"object"},
+				Properties: map[string]spec.Schema{
+					"items": {
+						SchemaProps: spec.SchemaProps{
+							Type: []string{"array"},
+							Items: &spec.SchemaOrArray{
+								Schema: &spec.Schema{
+									SchemaProps: spec.SchemaProps{
+										Ref: ref(corev1alpha1.OptionItem{}.OpenAPIModelName()),
+									},
+								},
+							},
+						},
+					},
+				},
+			},
+		},
+		Dependencies: []string{
+			corev1alpha1.OptionItem{}.OpenAPIModelName()},
+	}
+}
+
+func schema_pkg_apis_core_v1alpha1_Tap(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "Tap represents one connected External-Apps repository (a PackageSource) and the packages it exposes.",
+				Type:        []string{"object"},
+				Properties: map[string]spec.Schema{
+					"kind": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"apiVersion": {
+						SchemaProps: spec.SchemaProps{
+							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"metadata": {
+						SchemaProps: spec.SchemaProps{
+							Default: map[string]interface{}{},
+							Ref:     ref(metav1.ObjectMeta{}.OpenAPIModelName()),
+						},
+					},
+					"spec": {
+						SchemaProps: spec.SchemaProps{
+							Default: map[string]interface{}{},
+							Ref:     ref(corev1alpha1.TapSpec{}.OpenAPIModelName()),
+						},
+					},
+				},
+			},
+		},
+		Dependencies: []string{
+			corev1alpha1.TapSpec{}.OpenAPIModelName(), metav1.ObjectMeta{}.OpenAPIModelName()},
+	}
+}
+
+func schema_pkg_apis_core_v1alpha1_TapList(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "TapList is a list of Taps.",
+				Type:        []string{"object"},
+				Properties: map[string]spec.Schema{
+					"kind": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"apiVersion": {
+						SchemaProps: spec.SchemaProps{
+							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"metadata": {
+						SchemaProps: spec.SchemaProps{
+							Default: map[string]interface{}{},
+							Ref:     ref(metav1.ListMeta{}.OpenAPIModelName()),
+						},
+					},
+					"items": {
+						SchemaProps: spec.SchemaProps{
+							Type: []string{"array"},
+							Items: &spec.SchemaOrArray{
+								Schema: &spec.Schema{
+									SchemaProps: spec.SchemaProps{
+										Ref: ref(corev1alpha1.Tap{}.OpenAPIModelName()),
+									},
+								},
+							},
+						},
+					},
+				},
+				Required: []string{"items"},
+			},
+		},
+		Dependencies: []string{
+			corev1alpha1.Tap{}.OpenAPIModelName(), metav1.ListMeta{}.OpenAPIModelName()},
+	}
+}
+
+func schema_pkg_apis_core_v1alpha1_TapPackage(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "TapPackage is one package exposed by a tap.",
+				Type:        []string{"object"},
+				Properties: map[string]spec.Schema{
+					"name": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Name is the ApplicationDefinition name.",
+							Default:     "",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"kind": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Kind is the application kind users create (spec.application.kind).",
 							Type:        []string{"string"},
 							Format:      "",
 						},
 					},
-					"status": {
+					"component": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Component is the PackageSource component this package maps to.",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"description": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Description, Category, Tags, Icon are dashboard catalog metadata.",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"category": {
+						SchemaProps: spec.SchemaProps{
+							Type:   []string{"string"},
+							Format: "",
+						},
+					},
+					"tags": {
+						SchemaProps: spec.SchemaProps{
+							Type: []string{"array"},
+							Items: &spec.SchemaOrArray{
+								Schema: &spec.Schema{
+									SchemaProps: spec.SchemaProps{
+										Type:   []string{"string"},
+										Format: "",
+									},
+								},
+							},
+						},
+					},
+					"icon": {
+						SchemaProps: spec.SchemaProps{
+							Type:   []string{"string"},
+							Format: "",
+						},
+					},
+					"privileged": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Privileged is true when the backing component declares install.privileged.",
+							Type:        []string{"boolean"},
+							Format:      "",
+						},
+					},
+				},
+				Required: []string{"name"},
+			},
+		},
+	}
+}
+
+func schema_pkg_apis_core_v1alpha1_TapSource(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "TapSource identifies the Flux source backing a tap. It carries no credential.",
+				Type:        []string{"object"},
+				Properties: map[string]spec.Schema{
+					"kind": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Kind is the Flux source kind (OCIRepository or GitRepository).",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"name": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Name is the Flux source name in cozy-system.",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+				},
+			},
+		},
+	}
+}
+
+func schema_pkg_apis_core_v1alpha1_TapSpec(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "TapSpec is the computed state of a tap.",
+				Type:        []string{"object"},
+				Properties: map[string]spec.Schema{
+					"source": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Source is where the tap's artifact comes from (no credentials).",
+							Default:     map[string]interface{}{},
+							Ref:         ref(corev1alpha1.TapSource{}.OpenAPIModelName()),
+						},
+					},
+					"community": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Community is true for tapped sources (marked with the marketplace-tap label), false for official platform sources.",
+							Type:        []string{"boolean"},
+							Format:      "",
+						},
+					},
+					"ready": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Ready reflects the PackageSource's Ready condition.",
+							Type:        []string{"boolean"},
+							Format:      "",
+						},
+					},
+					"message": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Message is the PackageSource's Ready condition message, if any.",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"packages": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Packages are the packages this tap exposes, derived from the ApplicationDefinitions attributable to the PackageSource.",
+							Type:        []string{"array"},
+							Items: &spec.SchemaOrArray{
+								Schema: &spec.Schema{
+									SchemaProps: spec.SchemaProps{
+										Ref: ref(corev1alpha1.TapPackage{}.OpenAPIModelName()),
+									},
+								},
+							},
+						},
+					},
+					"url": {
+						SchemaProps: spec.SchemaProps{
+							Description: "URL is a connect-time input only: the oci:// reference to tap. It is consumed when a Tap is created and is never populated on read.",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"tag": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Tag is a connect-time input only: the OCI tag to tap (defaults to latest).",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"secretRef": {
+						SchemaProps: spec.SchemaProps{
+							Description: "SecretRef is a connect-time input only: the name of a pull-credential Secret in cozy-system for a private repository. It is consumed when a Tap is created and, being a credential reference, is never returned on read.",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+				},
+			},
+		},
+		Dependencies: []string{
+			corev1alpha1.TapPackage{}.OpenAPIModelName(), corev1alpha1.TapSource{}.OpenAPIModelName()},
+	}
+}
+
+func schema_pkg_apis_core_v1alpha1_TenantModule(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "TenantModule represents a HelmRelease with the label internal.cozystack.io/tenantmodule=true",
+				Type:        []string{"object"},
+				Properties: map[string]spec.Schema{
+					"kind": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"apiVersion": {
+						SchemaProps: spec.SchemaProps{
+							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"metadata": {
+						SchemaProps: spec.SchemaProps{
+							Default: map[string]interface{}{},
+							Ref:     ref(metav1.ObjectMeta{}.OpenAPIModelName()),
+						},
+					},
+					"appVersion": {
+						SchemaProps: spec.SchemaProps{
+							Description: "AppVersion represents the version of the Helm chart",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"status": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Status contains the module status",
+							Default:     map[string]interface{}{},
+							Ref:         ref(corev1alpha1.TenantModuleStatus{}.OpenAPIModelName()),
+						},
+					},
+				},
+			},
+		},
+		Dependencies: []string{
+			corev1alpha1.TenantModuleStatus{}.OpenAPIModelName(), metav1.ObjectMeta{}.OpenAPIModelName()},
+	}
+}
+
+func schema_pkg_apis_core_v1alpha1_TenantModuleList(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "TenantModuleList contains a list of TenantModule",
+				Type:        []string{"object"},
+				Properties: map[string]spec.Schema{
+					"kind": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"apiVersion": {
+						SchemaProps: spec.SchemaProps{
+							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"metadata": {
+						SchemaProps: spec.SchemaProps{
+							Default: map[string]interface{}{},
+							Ref:     ref(metav1.ListMeta{}.OpenAPIModelName()),
+						},
+					},
+					"items": {
+						SchemaProps: spec.SchemaProps{
+							Type: []string{"array"},
+							Items: &spec.SchemaOrArray{
+								Schema: &spec.Schema{
+									SchemaProps: spec.SchemaProps{
+										Ref: ref(corev1alpha1.TenantModule{}.OpenAPIModelName()),
+									},
+								},
+							},
+						},
+					},
+				},
+				Required: []string{"items"},
+			},
+		},
+		Dependencies: []string{
+			corev1alpha1.TenantModule{}.OpenAPIModelName(), metav1.ListMeta{}.OpenAPIModelName()},
+	}
+}
+
+func schema_pkg_apis_core_v1alpha1_TenantModuleStatus(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "TenantModuleStatus represents the status of a TenantModule",
+				Type:        []string{"object"},
+				Properties: map[string]spec.Schema{
+					"version": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Version represents the last attempted revision",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"conditions": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Conditions represent the latest available observations of the module's state",
+							Type:        []string{"array"},
+							Items: &spec.SchemaOrArray{
+								Schema: &spec.Schema{
+									SchemaProps: spec.SchemaProps{
+										Ref: ref(metav1.Condition{}.OpenAPIModelName()),
+									},
+								},
+							},
+						},
+					},
+				},
+			},
+		},
+		Dependencies: []string{
+			metav1.Condition{}.OpenAPIModelName()},
+	}
+}
+
+func schema_pkg_apis_core_v1alpha1_TenantNamespace(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "TenantNamespace is a thin wrapper around ObjectMeta.  It has no spec/status because it merely reflects an existing Namespace object.",
+				Type:        []string{"object"},
+				Properties: map[string]spec.Schema{
+					"kind": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"apiVersion": {
+						SchemaProps: spec.SchemaProps{
+							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"metadata": {
+						SchemaProps: spec.SchemaProps{
+							Default: map[string]interface{}{},
+							Ref:     ref(metav1.ObjectMeta{}.OpenAPIModelName()),
+						},
+					},
+				},
+			},
+		},
+		Dependencies: []string{
+			metav1.ObjectMeta{}.OpenAPIModelName()},
+	}
+}
+
+func schema_pkg_apis_core_v1alpha1_TenantNamespaceList(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "TenantNamespaceList is the list variant for TenantNamespace.",
+				Type:        []string{"object"},
+				Properties: map[string]spec.Schema{
+					"kind": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"apiVersion": {
+						SchemaProps: spec.SchemaProps{
+							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"metadata": {
+						SchemaProps: spec.SchemaProps{
+							Default: map[string]interface{}{},
+							Ref:     ref(metav1.ListMeta{}.OpenAPIModelName()),
+						},
+					},
+					"items": {
+						SchemaProps: spec.SchemaProps{
+							Type: []string{"array"},
+							Items: &spec.SchemaOrArray{
+								Schema: &spec.Schema{
+									SchemaProps: spec.SchemaProps{
+										Ref: ref(corev1alpha1.TenantNamespace{}.OpenAPIModelName()),
+									},
+								},
+							},
+						},
+					},
+				},
+				Required: []string{"items"},
+			},
+		},
+		Dependencies: []string{
+			corev1alpha1.TenantNamespace{}.OpenAPIModelName(), metav1.ListMeta{}.OpenAPIModelName()},
+	}
+}
+
+func schema_pkg_apis_core_v1alpha1_TenantSecret(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Type: []string{"object"},
+				Properties: map[string]spec.Schema{
+					"kind": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"apiVersion": {
+						SchemaProps: spec.SchemaProps{
+							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"metadata": {
+						SchemaProps: spec.SchemaProps{
+							Default: map[string]interface{}{},
+							Ref:     ref(metav1.ObjectMeta{}.OpenAPIModelName()),
+						},
+					},
+					"type": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Same semantics as core/v1 Secret.",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"data": {
+						SchemaProps: spec.SchemaProps{
+							Type: []string{"object"},
+							AdditionalProperties: &spec.SchemaOrBool{
+								Allows: true,
+								Schema: &spec.Schema{
+									SchemaProps: spec.SchemaProps{
+										Type:   []string{"string"},
+										Format: "byte",
+									},
+								},
+							},
+						},
+					},
+					"stringData": {
+						SchemaProps: spec.SchemaProps{
+							Type: []string{"object"},
+							AdditionalProperties: &spec.SchemaOrBool{
+								Allows: true,
+								Schema: &spec.Schema{
+									SchemaProps: spec.SchemaProps{
+										Type:   []string{"string"},
+										Format: "",
+									},
+								},
+							},
+						},
+					},
+				},
+			},
+		},
+		Dependencies: []string{
+			metav1.ObjectMeta{}.OpenAPIModelName()},
+	}
+}
+
+func schema_pkg_apis_core_v1alpha1_TenantSecretList(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Type: []string{"object"},
+				Properties: map[string]spec.Schema{
+					"kind": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"apiVersion": {
+						SchemaProps: spec.SchemaProps{
+							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"metadata": {
+						SchemaProps: spec.SchemaProps{
+							Default: map[string]interface{}{},
+							Ref:     ref(metav1.ListMeta{}.OpenAPIModelName()),
+						},
+					},
+					"items": {
+						SchemaProps: spec.SchemaProps{
+							Type: []string{"array"},
+							Items: &spec.SchemaOrArray{
+								Schema: &spec.Schema{
+									SchemaProps: spec.SchemaProps{
+										Ref: ref(corev1alpha1.TenantSecret{}.OpenAPIModelName()),
+									},
+								},
+							},
+						},
+					},
+				},
+				Required: []string{"items"},
+			},
+		},
+		Dependencies: []string{
+			corev1alpha1.TenantSecret{}.OpenAPIModelName(), metav1.ListMeta{}.OpenAPIModelName()},
+	}
+}
+
+func schema_pkg_apis_sdn_v1alpha1_ApplicationReference(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "ApplicationReference identifies a managed Cozystack application by its group, kind and name. It is used both for SecurityGroup attachments and for fromApp/toApp peers, and resolves to the application's lineage labels (apps.cozystack.io/application.{group,kind,name}).",
+				Type:        []string{"object"},
+				Properties: map[string]spec.Schema{
+					"apiGroup": {
+						SchemaProps: spec.SchemaProps{
+							Description: "APIGroup of the referenced application. Defaults to apps.cozystack.io when empty, the group under which Cozystack serves its managed applications.",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"kind": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Kind of the referenced application, e.g. \"Postgres\".",
+							Default:     "",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"name": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Name of the referenced application.",
+							Default:     "",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+				},
+				Required: []string{"kind", "name"},
+			},
+		},
+	}
+}
+
+func schema_pkg_apis_sdn_v1alpha1_EgressRule(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "EgressRule describes one set of allowed outbound destinations and ports.",
+				Type:        []string{"object"},
+				Properties: map[string]spec.Schema{
+					"toApp": {
+						SchemaProps: spec.SchemaProps{
+							Description: "ToApp selects destination pods belonging to the referenced managed applications, by their lineage labels.",
+							Type:        []string{"array"},
+							Items: &spec.SchemaOrArray{
+								Schema: &spec.Schema{
+									SchemaProps: spec.SchemaProps{
+										Ref: ref(sdnv1alpha1.ApplicationReference{}.OpenAPIModelName()),
+									},
+								},
+							},
+						},
+					},
+					"toSG": {
+						SchemaProps: spec.SchemaProps{
+							Description: "ToSG selects destination pods that are members of the named SecurityGroups in the same namespace, by their membership label. The reference is live: it follows the other group's membership as attachments change.",
+							Type:        []string{"array"},
+							Items: &spec.SchemaOrArray{
+								Schema: &spec.Schema{
+									SchemaProps: spec.SchemaProps{
+										Type:   []string{"string"},
+										Format: "",
+									},
+								},
+							},
+						},
+					},
+					"toCIDR": {
+						SchemaProps: spec.SchemaProps{
+							Description: "ToCIDR is a list of CIDR ranges allowed as traffic destinations.",
+							Type:        []string{"array"},
+							Items: &spec.SchemaOrArray{
+								Schema: &spec.Schema{
+									SchemaProps: spec.SchemaProps{
+										Type:   []string{"string"},
+										Format: "",
+									},
+								},
+							},
+						},
+					},
+					"toFQDNs": {
+						SchemaProps: spec.SchemaProps{
+							Description: "ToFQDNs is a list of fully qualified domain name matchers allowed as traffic destinations.",
+							Type:        []string{"array"},
+							Items: &spec.SchemaOrArray{
+								Schema: &spec.Schema{
+									SchemaProps: spec.SchemaProps{
+										Ref: ref(sdnv1alpha1.FQDNSelector{}.OpenAPIModelName()),
+									},
+								},
+							},
+						},
+					},
+					"toPorts": {
+						SchemaProps: spec.SchemaProps{
+							Description: "ToPorts restricts the rule to the listed destination ports. An empty list allows traffic on all ports.",
+							Type:        []string{"array"},
+							Items: &spec.SchemaOrArray{
+								Schema: &spec.Schema{
+									SchemaProps: spec.SchemaProps{
+										Ref: ref(sdnv1alpha1.PortRule{}.OpenAPIModelName()),
+									},
+								},
+							},
+						},
+					},
+				},
+			},
+		},
+		Dependencies: []string{
+			sdnv1alpha1.ApplicationReference{}.OpenAPIModelName(), sdnv1alpha1.FQDNSelector{}.OpenAPIModelName(), sdnv1alpha1.PortRule{}.OpenAPIModelName()},
+	}
+}
+
+func schema_pkg_apis_sdn_v1alpha1_FQDNSelector(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "FQDNSelector matches destination traffic by domain name.",
+				Type:        []string{"object"},
+				Properties: map[string]spec.Schema{
+					"matchName": {
+						SchemaProps: spec.SchemaProps{
+							Description: "MatchName matches a fully qualified domain name exactly.",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+					"matchPattern": {
+						SchemaProps: spec.SchemaProps{
+							Description: "MatchPattern matches fully qualified domain names against a pattern, where \"*\" matches a single domain label.",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+				},
+			},
+		},
+	}
+}
+
+func schema_pkg_apis_sdn_v1alpha1_IngressRule(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "IngressRule describes one set of allowed inbound sources and ports.",
+				Type:        []string{"object"},
+				Properties: map[string]spec.Schema{
+					"fromApp": {
+						SchemaProps: spec.SchemaProps{
+							Description: "FromApp selects source pods belonging to the referenced managed applications, by their lineage labels.",
+							Type:        []string{"array"},
+							Items: &spec.SchemaOrArray{
+								Schema: &spec.Schema{
+									SchemaProps: spec.SchemaProps{
+										Ref: ref(sdnv1alpha1.ApplicationReference{}.OpenAPIModelName()),
+									},
+								},
+							},
+						},
+					},
+					"fromSG": {
+						SchemaProps: spec.SchemaProps{
+							Description: "FromSG selects source pods that are members of the named SecurityGroups in the same namespace, by their membership label. The reference is live: it follows the other group's membership as attachments change.",
+							Type:        []string{"array"},
+							Items: &spec.SchemaOrArray{
+								Schema: &spec.Schema{
+									SchemaProps: spec.SchemaProps{
+										Type:   []string{"string"},
+										Format: "",
+									},
+								},
+							},
+						},
+					},
+					"fromCIDR": {
+						SchemaProps: spec.SchemaProps{
+							Description: "FromCIDR is a list of CIDR ranges allowed as traffic sources.",
+							Type:        []string{"array"},
+							Items: &spec.SchemaOrArray{
+								Schema: &spec.Schema{
+									SchemaProps: spec.SchemaProps{
+										Type:   []string{"string"},
+										Format: "",
+									},
+								},
+							},
+						},
+					},
+					"toPorts": {
 						SchemaProps: spec.SchemaProps{
-							Description: "Status contains the module status",
-							Default:     map[string]interface{}{},
-							Ref:         ref("github.com/cozystack/cozystack/pkg/apis/core/v1alpha1.TenantModuleStatus"),
+							Description: "ToPorts restricts the rule to the listed destination ports. An empty list allows traffic on all ports.",
+							Type:        []string{"array"},
+							Items: &spec.SchemaOrArray{
+								Schema: &spec.Schema{
+									SchemaProps: spec.SchemaProps{
+										Ref: ref(sdnv1alpha1.PortRule{}.OpenAPIModelName()),
+									},
+								},
+							},
 						},
 					},
 				},
 			},
 		},
 		Dependencies: []string{
-			"github.com/cozystack/cozystack/pkg/apis/core/v1alpha1.TenantModuleStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"},
+			sdnv1alpha1.ApplicationReference{}.OpenAPIModelName(), sdnv1alpha1.PortRule{}.OpenAPIModelName()},
 	}
 }
 
-func schema_pkg_apis_core_v1alpha1_TenantModuleList(ref common.ReferenceCallback) common.OpenAPIDefinition {
+func schema_pkg_apis_sdn_v1alpha1_PortProtocol(ref common.ReferenceCallback) common.OpenAPIDefinition {
 	return common.OpenAPIDefinition{
 		Schema: spec.Schema{
 			SchemaProps: spec.SchemaProps{
-				Description: "TenantModuleList contains a list of TenantModule",
+				Description: "PortProtocol is a single port and protocol pair.",
 				Type:        []string{"object"},
 				Properties: map[string]spec.Schema{
-					"kind": {
+					"port": {
 						SchemaProps: spec.SchemaProps{
-							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
+							Description: "Port is the L4 port number as a string, or a named port. An empty value matches all ports.",
 							Type:        []string{"string"},
 							Format:      "",
 						},
 					},
-					"apiVersion": {
+					"protocol": {
 						SchemaProps: spec.SchemaProps{
-							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
+							Description: "Protocol is the L4 protocol. One of TCP, UDP, SCTP or ANY. Defaults to ANY when empty.",
 							Type:        []string{"string"},
 							Format:      "",
 						},
 					},
-					"metadata": {
-						SchemaProps: spec.SchemaProps{
-							Default: map[string]interface{}{},
-							Ref:     ref("k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"),
-						},
-					},
-					"items": {
-						SchemaProps: spec.SchemaProps{
-							Type: []string{"array"},
-							Items: &spec.SchemaOrArray{
-								Schema: &spec.Schema{
-									SchemaProps: spec.SchemaProps{
-										Default: map[string]interface{}{},
-										Ref:     ref("github.com/cozystack/cozystack/pkg/apis/core/v1alpha1.TenantModule"),
-									},
-								},
-							},
-						},
-					},
 				},
-				Required: []string{"items"},
 			},
 		},
-		Dependencies: []string{
-			"github.com/cozystack/cozystack/pkg/apis/core/v1alpha1.TenantModule", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"},
 	}
 }
 
-func schema_pkg_apis_core_v1alpha1_TenantModuleStatus(ref common.ReferenceCallback) common.OpenAPIDefinition {
+func schema_pkg_apis_sdn_v1alpha1_PortRule(ref common.ReferenceCallback) common.OpenAPIDefinition {
 	return common.OpenAPIDefinition{
 		Schema: spec.Schema{
 			SchemaProps: spec.SchemaProps{
-				Description: "TenantModuleStatus represents the status of a TenantModule",
+				Description: "PortRule is a set of ports a traffic rule applies to.",
 				Type:        []string{"object"},
 				Properties: map[string]spec.Schema{
-					"version": {
-						SchemaProps: spec.SchemaProps{
-							Description: "Version represents the last attempted revision",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"conditions": {
+					"ports": {
 						SchemaProps: spec.SchemaProps{
-							Description: "Conditions represent the latest available observations of the module's state",
+							Description: "Ports is the list of port/protocol pairs the rule applies to.",
 							Type:        []string{"array"},
 							Items: &spec.SchemaOrArray{
 								Schema: &spec.Schema{
 									SchemaProps: spec.SchemaProps{
-										Default: map[string]interface{}{},
-										Ref:     ref("k8s.io/apimachinery/pkg/apis/meta/v1.Condition"),
+										Ref: ref(sdnv1alpha1.PortProtocol{}.OpenAPIModelName()),
 									},
 								},
 							},
@@ -403,15 +1320,15 @@ func schema_pkg_apis_core_v1alpha1_TenantModuleStatus(ref common.ReferenceCallba
 			},
 		},
 		Dependencies: []string{
-			"k8s.io/apimachinery/pkg/apis/meta/v1.Condition"},
+			sdnv1alpha1.PortProtocol{}.OpenAPIModelName()},
 	}
 }
 
-func schema_pkg_apis_core_v1alpha1_TenantNamespace(ref common.ReferenceCallback) common.OpenAPIDefinition {
+func schema_pkg_apis_sdn_v1alpha1_SecurityGroup(ref common.ReferenceCallback) common.OpenAPIDefinition {
 	return common.OpenAPIDefinition{
 		Schema: spec.Schema{
 			SchemaProps: spec.SchemaProps{
-				Description: "TenantNamespace is a thin wrapper around ObjectMeta.  It has no spec/status because it merely reflects an existing Namespace object.",
+				Description: "SecurityGroup is a tenant-facing, namespace-scoped firewall object. It is a projection of a single CiliumNetworkPolicy served by the Cozystack aggregated API: tenants manage SecurityGroups while the platform translates each one 1:1 into a CiliumNetworkPolicy in the same namespace, without granting tenants direct access to the cilium.io API group.\n\nA SecurityGroup is a membership group: it owns a membership label (MembershipLabelPrefix + its name) that the securitygroup-controller stamps onto the pods of the applications listed in spec.attachments. The backing CiliumNetworkPolicy selects that membership label, so one SecurityGroup can apply to several applications at once.",
 				Type:        []string{"object"},
 				Properties: map[string]spec.Schema{
 					"kind": {
@@ -431,22 +1348,29 @@ func schema_pkg_apis_core_v1alpha1_TenantNamespace(ref common.ReferenceCallback)
 					"metadata": {
 						SchemaProps: spec.SchemaProps{
 							Default: map[string]interface{}{},
-							Ref:     ref("k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"),
+							Ref:     ref(metav1.ObjectMeta{}.OpenAPIModelName()),
+						},
+					},
+					"spec": {
+						SchemaProps: spec.SchemaProps{
+							Description: "Spec describes the applications this SecurityGroup attaches to and the traffic it allows.",
+							Default:     map[string]interface{}{},
+							Ref:         ref(sdnv1alpha1.SecurityGroupSpec{}.OpenAPIModelName()),
 						},
 					},
 				},
 			},
 		},
 		Dependencies: []string{
-			"k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"},
+			sdnv1alpha1.SecurityGroupSpec{}.OpenAPIModelName(), metav1.ObjectMeta{}.OpenAPIModelName()},
 	}
 }
 
-func schema_pkg_apis_core_v1alpha1_TenantNamespaceList(ref common.ReferenceCallback) common.OpenAPIDefinition {
+func schema_pkg_apis_sdn_v1alpha1_SecurityGroupList(ref common.ReferenceCallback) common.OpenAPIDefinition {
 	return common.OpenAPIDefinition{
 		Schema: spec.Schema{
 			SchemaProps: spec.SchemaProps{
-				Description: "TenantNamespaceList is the list variant for TenantNamespace.",
+				Description: "SecurityGroupList is a list of SecurityGroup objects.",
 				Type:        []string{"object"},
 				Properties: map[string]spec.Schema{
 					"kind": {
@@ -466,7 +1390,7 @@ func schema_pkg_apis_core_v1alpha1_TenantNamespaceList(ref common.ReferenceCallb
 					"metadata": {
 						SchemaProps: spec.SchemaProps{
 							Default: map[string]interface{}{},
-							Ref:     ref("k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"),
+							Ref:     ref(metav1.ListMeta{}.OpenAPIModelName()),
 						},
 					},
 					"items": {
@@ -475,8 +1399,7 @@ func schema_pkg_apis_core_v1alpha1_TenantNamespaceList(ref common.ReferenceCallb
 							Items: &spec.SchemaOrArray{
 								Schema: &spec.Schema{
 									SchemaProps: spec.SchemaProps{
-										Default: map[string]interface{}{},
-										Ref:     ref("github.com/cozystack/cozystack/pkg/apis/core/v1alpha1.TenantNamespace"),
+										Ref: ref(sdnv1alpha1.SecurityGroup{}.OpenAPIModelName()),
 									},
 								},
 							},
@@ -487,125 +1410,61 @@ func schema_pkg_apis_core_v1alpha1_TenantNamespaceList(ref common.ReferenceCallb
 			},
 		},
 		Dependencies: []string{
-			"github.com/cozystack/cozystack/pkg/apis/core/v1alpha1.TenantNamespace", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"},
+			sdnv1alpha1.SecurityGroup{}.OpenAPIModelName(), metav1.ListMeta{}.OpenAPIModelName()},
 	}
 }
 
-func schema_pkg_apis_core_v1alpha1_TenantSecret(ref common.ReferenceCallback) common.OpenAPIDefinition {
+func schema_pkg_apis_sdn_v1alpha1_SecurityGroupSpec(ref common.ReferenceCallback) common.OpenAPIDefinition {
 	return common.OpenAPIDefinition{
 		Schema: spec.Schema{
 			SchemaProps: spec.SchemaProps{
-				Type: []string{"object"},
+				Description: "SecurityGroupSpec describes the managed applications a SecurityGroup attaches to and the traffic it allows. The backing CiliumNetworkPolicy's endpointSelector is the SecurityGroup's own membership label, which the securitygroup-controller maintains on the attached applications' pods — so a SecurityGroup can only ever apply to those applications' own pods in the same namespace.",
+				Type:        []string{"object"},
 				Properties: map[string]spec.Schema{
-					"kind": {
+					"attachments": {
 						SchemaProps: spec.SchemaProps{
-							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"apiVersion": {
-						SchemaProps: spec.SchemaProps{
-							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"metadata": {
-						SchemaProps: spec.SchemaProps{
-							Default: map[string]interface{}{},
-							Ref:     ref("k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"),
-						},
-					},
-					"type": {
-						SchemaProps: spec.SchemaProps{
-							Description: "Same semantics as core/v1 Secret.",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"data": {
-						SchemaProps: spec.SchemaProps{
-							Type: []string{"object"},
-							AdditionalProperties: &spec.SchemaOrBool{
-								Allows: true,
+							Description: "Attachments lists the managed applications whose pods join this group. The securitygroup-controller stamps the SecurityGroup's membership label (MembershipLabelPrefix + name) onto the pods of each referenced application in the same namespace, and removes it when the attachment is dropped. An empty list means the group selects no pods.",
+							Type:        []string{"array"},
+							Items: &spec.SchemaOrArray{
 								Schema: &spec.Schema{
 									SchemaProps: spec.SchemaProps{
-										Type:   []string{"string"},
-										Format: "byte",
+										Ref: ref(sdnv1alpha1.ApplicationReference{}.OpenAPIModelName()),
 									},
 								},
 							},
 						},
 					},
-					"stringData": {
+					"ingress": {
 						SchemaProps: spec.SchemaProps{
-							Type: []string{"object"},
-							AdditionalProperties: &spec.SchemaOrBool{
-								Allows: true,
+							Description: "Ingress is the list of rules describing allowed inbound traffic. Each rule only ADDS allowed sources. An empty list adds no allow rules and does NOT isolate the member pods: effective connectivity is the union of every policy selecting a pod, including the platform's blanket-allow baseline, so an empty list leaves ingress open rather than denying it. Actual deny / default-deny enforcement depends on the default-deny baseline, tracked separately as future work.",
+							Type:        []string{"array"},
+							Items: &spec.SchemaOrArray{
 								Schema: &spec.Schema{
 									SchemaProps: spec.SchemaProps{
-										Default: "",
-										Type:    []string{"string"},
-										Format:  "",
+										Ref: ref(sdnv1alpha1.IngressRule{}.OpenAPIModelName()),
 									},
 								},
 							},
 						},
 					},
-				},
-			},
-		},
-		Dependencies: []string{
-			"k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"},
-	}
-}
-
-func schema_pkg_apis_core_v1alpha1_TenantSecretList(ref common.ReferenceCallback) common.OpenAPIDefinition {
-	return common.OpenAPIDefinition{
-		Schema: spec.Schema{
-			SchemaProps: spec.SchemaProps{
-				Type: []string{"object"},
-				Properties: map[string]spec.Schema{
-					"kind": {
-						SchemaProps: spec.SchemaProps{
-							Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"apiVersion": {
-						SchemaProps: spec.SchemaProps{
-							Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-					"metadata": {
-						SchemaProps: spec.SchemaProps{
-							Default: map[string]interface{}{},
-							Ref:     ref("k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"),
-						},
-					},
-					"items": {
+					"egress": {
 						SchemaProps: spec.SchemaProps{
-							Type: []string{"array"},
+							Description: "Egress is the list of rules describing allowed outbound traffic. Each rule only ADDS allowed destinations. An empty list adds no allow rules and does NOT isolate the member pods: effective connectivity is the union of every policy selecting a pod, including the platform's blanket-allow baseline, so an empty list leaves egress open rather than denying it. Actual deny / default-deny enforcement depends on the default-deny baseline, tracked separately as future work.",
+							Type:        []string{"array"},
 							Items: &spec.SchemaOrArray{
 								Schema: &spec.Schema{
 									SchemaProps: spec.SchemaProps{
-										Default: map[string]interface{}{},
-										Ref:     ref("github.com/cozystack/cozystack/pkg/apis/core/v1alpha1.TenantSecret"),
+										Ref: ref(sdnv1alpha1.EgressRule{}.OpenAPIModelName()),
 									},
 								},
 							},
 						},
 					},
 				},
-				Required: []string{"items"},
 			},
 		},
 		Dependencies: []string{
-			"github.com/cozystack/cozystack/pkg/apis/core/v1alpha1.TenantSecret", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"},
+			sdnv1alpha1.ApplicationReference{}.OpenAPIModelName(), sdnv1alpha1.EgressRule{}.OpenAPIModelName(), sdnv1alpha1.IngressRule{}.OpenAPIModelName()},
 	}
 }
 
@@ -644,7 +1503,7 @@ func schema_pkg_apis_apiextensions_v1_ConversionRequest(ref common.ReferenceCall
 							Items: &spec.SchemaOrArray{
 								Schema: &spec.Schema{
 									SchemaProps: spec.SchemaProps{
-										Ref: ref("k8s.io/apimachinery/pkg/runtime.RawExtension"),
+										Ref: ref(runtime.RawExtension{}.OpenAPIModelName()),
 									},
 								},
 							},
@@ -655,7 +1514,7 @@ func schema_pkg_apis_apiextensions_v1_ConversionRequest(ref common.ReferenceCall
 			},
 		},
 		Dependencies: []string{
-			"k8s.io/apimachinery/pkg/runtime.RawExtension"},
+			runtime.RawExtension{}.OpenAPIModelName()},
 	}
 }
 
@@ -686,7 +1545,7 @@ func schema_pkg_apis_apiextensions_v1_ConversionResponse(ref common.ReferenceCal
 							Items: &spec.SchemaOrArray{
 								Schema: &spec.Schema{
 									SchemaProps: spec.SchemaProps{
-										Ref: ref("k8s.io/apimachinery/pkg/runtime.RawExtension"),
+										Ref: ref(runtime.RawExtension{}.OpenAPIModelName()),
 									},
 								},
 							},
@@ -696,7 +1555,7 @@ func schema_pkg_apis_apiextensions_v1_ConversionResponse(ref common.ReferenceCal
 						SchemaProps: spec.SchemaProps{
 							Description: "result contains the result of conversion with extra details if the conversion failed. `result.status` determines if the conversion failed or succeeded. The `result.status` field is required and represents the success or failure of the conversion. A successful conversion must set `result.status` to `Success`. A failed conversion must set `result.status` to `Failure` and provide more details in `result.message` and return http status 200. The `result.message` will be used to construct an error message for the end user.",
 							Default:     map[string]interface{}{},
-							Ref:         ref("k8s.io/apimachinery/pkg/apis/meta/v1.Status"),
+							Ref:         ref(metav1.Status{}.OpenAPIModelName()),
 						},
 					},
 				},
@@ -704,7 +1563,7 @@ func schema_pkg_apis_apiextensions_v1_ConversionResponse(ref common.ReferenceCal
 			},
 		},
 		Dependencies: []string{
-			"k8s.io/apimachinery/pkg/apis/meta/v1.Status", "k8s.io/apimachinery/pkg/runtime.RawExtension"},
+			metav1.Status{}.OpenAPIModelName(), runtime.RawExtension{}.OpenAPIModelName()},
 	}
 }
 
@@ -732,20 +1591,20 @@ func schema_pkg_apis_apiextensions_v1_ConversionReview(ref common.ReferenceCallb
 					"request": {
 						SchemaProps: spec.SchemaProps{
 							Description: "request describes the attributes for the conversion request.",
-							Ref:         ref("k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.ConversionRequest"),
+							Ref:         ref(v1.ConversionRequest{}.OpenAPIModelName()),
 						},
 					},
 					"response": {
 						SchemaProps: spec.SchemaProps{
 							Description: "response describes the attributes for the conversion response.",
-							Ref:         ref("k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.ConversionResponse"),
+							Ref:         ref(v1.ConversionResponse{}.OpenAPIModelName()),
 						},
 					},
 				},
 			},
 		},
 		Dependencies: []string{
-			"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.ConversionRequest", "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.ConversionResponse"},
+			v1.ConversionRequest{}.OpenAPIModelName(), v1.ConversionResponse{}.OpenAPIModelName()},
 	}
 }
 
@@ -826,7 +1685,7 @@ func schema_pkg_apis_apiextensions_v1_CustomResourceConversion(ref common.Refere
 					"webhook": {
 						SchemaProps: spec.SchemaProps{
 							Description: "webhook describes how to call the conversion webhook. Required when `strategy` is set to `\"Webhook\"`.",
-							Ref:         ref("k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.WebhookConversion"),
+							Ref:         ref(v1.WebhookConversion{}.OpenAPIModelName()),
 						},
 					},
 				},
@@ -834,7 +1693,7 @@ func schema_pkg_apis_apiextensions_v1_CustomResourceConversion(ref common.Refere
 			},
 		},
 		Dependencies: []string{
-			"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.WebhookConversion"},
+			v1.WebhookConversion{}.OpenAPIModelName()},
 	}
 }
 
@@ -863,21 +1722,21 @@ func schema_pkg_apis_apiextensions_v1_CustomResourceDefinition(ref common.Refere
 						SchemaProps: spec.SchemaProps{
 							Description: "Standard object's metadata More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata",
 							Default:     map[string]interface{}{},
-							Ref:         ref("k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"),
+							Ref:         ref(metav1.ObjectMeta{}.OpenAPIModelName()),
 						},
 					},
 					"spec": {
 						SchemaProps: spec.SchemaProps{
 							Description: "spec describes how the user wants the resources to appear",
 							Default:     map[string]interface{}{},
-							Ref:         ref("k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.CustomResourceDefinitionSpec"),
+							Ref:         ref(v1.CustomResourceDefinitionSpec{}.OpenAPIModelName()),
 						},
 					},
 					"status": {
 						SchemaProps: spec.SchemaProps{
 							Description: "status indicates the actual state of the CustomResourceDefinition",
 							Default:     map[string]interface{}{},
-							Ref:         ref("k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.CustomResourceDefinitionStatus"),
+							Ref:         ref(v1.CustomResourceDefinitionStatus{}.OpenAPIModelName()),
 						},
 					},
 				},
@@ -885,7 +1744,7 @@ func schema_pkg_apis_apiextensions_v1_CustomResourceDefinition(ref common.Refere
 			},
 		},
 		Dependencies: []string{
-			"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.CustomResourceDefinitionSpec", "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.CustomResourceDefinitionStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"},
+			v1.CustomResourceDefinitionSpec{}.OpenAPIModelName(), v1.CustomResourceDefinitionStatus{}.OpenAPIModelName(), metav1.ObjectMeta{}.OpenAPIModelName()},
 	}
 }
 
@@ -915,7 +1774,7 @@ func schema_pkg_apis_apiextensions_v1_CustomResourceDefinitionCondition(ref comm
 					"lastTransitionTime": {
 						SchemaProps: spec.SchemaProps{
 							Description: "lastTransitionTime last time the condition transitioned from one status to another.",
-							Ref:         ref("k8s.io/apimachinery/pkg/apis/meta/v1.Time"),
+							Ref:         ref(metav1.Time{}.OpenAPIModelName()),
 						},
 					},
 					"reason": {
@@ -932,12 +1791,19 @@ func schema_pkg_apis_apiextensions_v1_CustomResourceDefinitionCondition(ref comm
 							Format:      "",
 						},
 					},
+					"observedGeneration": {
+						SchemaProps: spec.SchemaProps{
+							Description: "observedGeneration represents the .metadata.generation that the condition was set based upon. For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date with respect to the current state of the instance.",
+							Type:        []string{"integer"},
+							Format:      "int64",
+						},
+					},
 				},
 				Required: []string{"type", "status"},
 			},
 		},
 		Dependencies: []string{
-			"k8s.io/apimachinery/pkg/apis/meta/v1.Time"},
+			metav1.Time{}.OpenAPIModelName()},
 	}
 }
 
@@ -966,7 +1832,7 @@ func schema_pkg_apis_apiextensions_v1_CustomResourceDefinitionList(ref common.Re
 						SchemaProps: spec.SchemaProps{
 							Description: "Standard object's metadata More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata",
 							Default:     map[string]interface{}{},
-							Ref:         ref("k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"),
+							Ref:         ref(metav1.ListMeta{}.OpenAPIModelName()),
 						},
 					},
 					"items": {
@@ -976,8 +1842,7 @@ func schema_pkg_apis_apiextensions_v1_CustomResourceDefinitionList(ref common.Re
 							Items: &spec.SchemaOrArray{
 								Schema: &spec.Schema{
 									SchemaProps: spec.SchemaProps{
-										Default: map[string]interface{}{},
-										Ref:     ref("k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.CustomResourceDefinition"),
+										Ref: ref(v1.CustomResourceDefinition{}.OpenAPIModelName()),
 									},
 								},
 							},
@@ -988,7 +1853,7 @@ func schema_pkg_apis_apiextensions_v1_CustomResourceDefinitionList(ref common.Re
 			},
 		},
 		Dependencies: []string{
-			"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.CustomResourceDefinition", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"},
+			v1.CustomResourceDefinition{}.OpenAPIModelName(), metav1.ListMeta{}.OpenAPIModelName()},
 	}
 }
 
@@ -1026,9 +1891,8 @@ func schema_pkg_apis_apiextensions_v1_CustomResourceDefinitionNames(ref common.R
 							Items: &spec.SchemaOrArray{
 								Schema: &spec.Schema{
 									SchemaProps: spec.SchemaProps{
-										Default: "",
-										Type:    []string{"string"},
-										Format:  "",
+										Type:   []string{"string"},
+										Format: "",
 									},
 								},
 							},
@@ -1061,9 +1925,8 @@ func schema_pkg_apis_apiextensions_v1_CustomResourceDefinitionNames(ref common.R
 							Items: &spec.SchemaOrArray{
 								Schema: &spec.Schema{
 									SchemaProps: spec.SchemaProps{
-										Default: "",
-										Type:    []string{"string"},
-										Format:  "",
+										Type:   []string{"string"},
+										Format: "",
 									},
 								},
 							},
@@ -1095,7 +1958,7 @@ func schema_pkg_apis_apiextensions_v1_CustomResourceDefinitionSpec(ref common.Re
 						SchemaProps: spec.SchemaProps{
 							Description: "names specify the resource and kind names for the custom resource.",
 							Default:     map[string]interface{}{},
-							Ref:         ref("k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.CustomResourceDefinitionNames"),
+							Ref:         ref(v1.CustomResourceDefinitionNames{}.OpenAPIModelName()),
 						},
 					},
 					"scope": {
@@ -1118,8 +1981,7 @@ func schema_pkg_apis_apiextensions_v1_CustomResourceDefinitionSpec(ref common.Re
 							Items: &spec.SchemaOrArray{
 								Schema: &spec.Schema{
 									SchemaProps: spec.SchemaProps{
-										Default: map[string]interface{}{},
-										Ref:     ref("k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.CustomResourceDefinitionVersion"),
+										Ref: ref(v1.CustomResourceDefinitionVersion{}.OpenAPIModelName()),
 									},
 								},
 							},
@@ -1128,7 +1990,7 @@ func schema_pkg_apis_apiextensions_v1_CustomResourceDefinitionSpec(ref common.Re
 					"conversion": {
 						SchemaProps: spec.SchemaProps{
 							Description: "conversion defines conversion settings for the CRD.",
-							Ref:         ref("k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.CustomResourceConversion"),
+							Ref:         ref(v1.CustomResourceConversion{}.OpenAPIModelName()),
 						},
 					},
 					"preserveUnknownFields": {
@@ -1143,7 +2005,7 @@ func schema_pkg_apis_apiextensions_v1_CustomResourceDefinitionSpec(ref common.Re
 			},
 		},
 		Dependencies: []string{
-			"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.CustomResourceConversion", "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.CustomResourceDefinitionNames", "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.CustomResourceDefinitionVersion"},
+			v1.CustomResourceConversion{}.OpenAPIModelName(), v1.CustomResourceDefinitionNames{}.OpenAPIModelName(), v1.CustomResourceDefinitionVersion{}.OpenAPIModelName()},
 	}
 }
 
@@ -1169,8 +2031,7 @@ func schema_pkg_apis_apiextensions_v1_CustomResourceDefinitionStatus(ref common.
 							Items: &spec.SchemaOrArray{
 								Schema: &spec.Schema{
 									SchemaProps: spec.SchemaProps{
-										Default: map[string]interface{}{},
-										Ref:     ref("k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.CustomResourceDefinitionCondition"),
+										Ref: ref(v1.CustomResourceDefinitionCondition{}.OpenAPIModelName()),
 									},
 								},
 							},
@@ -1180,7 +2041,7 @@ func schema_pkg_apis_apiextensions_v1_CustomResourceDefinitionStatus(ref common.
 						SchemaProps: spec.SchemaProps{
 							Description: "acceptedNames are the names that are actually being used to serve discovery. They may be different than the names in spec.",
 							Default:     map[string]interface{}{},
-							Ref:         ref("k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.CustomResourceDefinitionNames"),
+							Ref:         ref(v1.CustomResourceDefinitionNames{}.OpenAPIModelName()),
 						},
 					},
 					"storedVersions": {
@@ -1195,19 +2056,25 @@ func schema_pkg_apis_apiextensions_v1_CustomResourceDefinitionStatus(ref common.
 							Items: &spec.SchemaOrArray{
 								Schema: &spec.Schema{
 									SchemaProps: spec.SchemaProps{
-										Default: "",
-										Type:    []string{"string"},
-										Format:  "",
+										Type:   []string{"string"},
+										Format: "",
 									},
 								},
 							},
 						},
 					},
+					"observedGeneration": {
+						SchemaProps: spec.SchemaProps{
+							Description: "The generation observed by the CRD controller.",
+							Type:        []string{"integer"},
+							Format:      "int64",
+						},
+					},
 				},
 			},
 		},
 		Dependencies: []string{
-			"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.CustomResourceDefinitionCondition", "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.CustomResourceDefinitionNames"},
+			v1.CustomResourceDefinitionCondition{}.OpenAPIModelName(), v1.CustomResourceDefinitionNames{}.OpenAPIModelName()},
 	}
 }
 
@@ -1259,13 +2126,13 @@ func schema_pkg_apis_apiextensions_v1_CustomResourceDefinitionVersion(ref common
 					"schema": {
 						SchemaProps: spec.SchemaProps{
 							Description: "schema describes the schema used for validation, pruning, and defaulting of this version of the custom resource.",
-							Ref:         ref("k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.CustomResourceValidation"),
+							Ref:         ref(v1.CustomResourceValidation{}.OpenAPIModelName()),
 						},
 					},
 					"subresources": {
 						SchemaProps: spec.SchemaProps{
 							Description: "subresources specify what subresources this version of the defined custom resource have.",
-							Ref:         ref("k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.CustomResourceSubresources"),
+							Ref:         ref(v1.CustomResourceSubresources{}.OpenAPIModelName()),
 						},
 					},
 					"additionalPrinterColumns": {
@@ -1280,8 +2147,7 @@ func schema_pkg_apis_apiextensions_v1_CustomResourceDefinitionVersion(ref common
 							Items: &spec.SchemaOrArray{
 								Schema: &spec.Schema{
 									SchemaProps: spec.SchemaProps{
-										Default: map[string]interface{}{},
-										Ref:     ref("k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.CustomResourceColumnDefinition"),
+										Ref: ref(v1.CustomResourceColumnDefinition{}.OpenAPIModelName()),
 									},
 								},
 							},
@@ -1299,8 +2165,7 @@ func schema_pkg_apis_apiextensions_v1_CustomResourceDefinitionVersion(ref common
 							Items: &spec.SchemaOrArray{
 								Schema: &spec.Schema{
 									SchemaProps: spec.SchemaProps{
-										Default: map[string]interface{}{},
-										Ref:     ref("k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.SelectableField"),
+										Ref: ref(v1.SelectableField{}.OpenAPIModelName()),
 									},
 								},
 							},
@@ -1311,7 +2176,7 @@ func schema_pkg_apis_apiextensions_v1_CustomResourceDefinitionVersion(ref common
 			},
 		},
 		Dependencies: []string{
-			"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.CustomResourceColumnDefinition", "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.CustomResourceSubresources", "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.CustomResourceValidation", "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.SelectableField"},
+			v1.CustomResourceColumnDefinition{}.OpenAPIModelName(), v1.CustomResourceSubresources{}.OpenAPIModelName(), v1.CustomResourceValidation{}.OpenAPIModelName(), v1.SelectableField{}.OpenAPIModelName()},
 	}
 }
 
@@ -1373,20 +2238,20 @@ func schema_pkg_apis_apiextensions_v1_CustomResourceSubresources(ref common.Refe
 					"status": {
 						SchemaProps: spec.SchemaProps{
 							Description: "status indicates the custom resource should serve a `/status` subresource. When enabled: 1. requests to the custom resource primary endpoint ignore changes to the `status` stanza of the object. 2. requests to the custom resource `/status` subresource ignore changes to anything other than the `status` stanza of the object.",
-							Ref:         ref("k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.CustomResourceSubresourceStatus"),
+							Ref:         ref(v1.CustomResourceSubresourceStatus{}.OpenAPIModelName()),
 						},
 					},
 					"scale": {
 						SchemaProps: spec.SchemaProps{
 							Description: "scale indicates the custom resource should serve a `/scale` subresource that returns an `autoscaling/v1` Scale object.",
-							Ref:         ref("k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.CustomResourceSubresourceScale"),
+							Ref:         ref(v1.CustomResourceSubresourceScale{}.OpenAPIModelName()),
 						},
 					},
 				},
 			},
 		},
 		Dependencies: []string{
-			"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.CustomResourceSubresourceScale", "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.CustomResourceSubresourceStatus"},
+			v1.CustomResourceSubresourceScale{}.OpenAPIModelName(), v1.CustomResourceSubresourceStatus{}.OpenAPIModelName()},
 	}
 }
 
@@ -1400,14 +2265,14 @@ func schema_pkg_apis_apiextensions_v1_CustomResourceValidation(ref common.Refere
 					"openAPIV3Schema": {
 						SchemaProps: spec.SchemaProps{
 							Description: "openAPIV3Schema is the OpenAPI v3 schema to use for validation and pruning.",
-							Ref:         ref("k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.JSONSchemaProps"),
+							Ref:         ref(v1.JSONSchemaProps{}.OpenAPIModelName()),
 						},
 					},
 				},
 			},
 		},
 		Dependencies: []string{
-			"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.JSONSchemaProps"},
+			v1.JSONSchemaProps{}.OpenAPIModelName()},
 	}
 }
 
@@ -1501,7 +2366,7 @@ func schema_pkg_apis_apiextensions_v1_JSONSchemaProps(ref common.ReferenceCallba
 					"default": {
 						SchemaProps: spec.SchemaProps{
 							Description: "default is a default value for undefined object fields. Defaulting is a beta feature under the CustomResourceDefaulting feature gate. Defaulting requires spec.preserveUnknownFields to be false.",
-							Ref:         ref("k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.JSON"),
+							Ref:         ref(v1.JSON{}.OpenAPIModelName()),
 						},
 					},
 					"maximum": {
@@ -1581,7 +2446,7 @@ func schema_pkg_apis_apiextensions_v1_JSONSchemaProps(ref common.ReferenceCallba
 							Items: &spec.SchemaOrArray{
 								Schema: &spec.Schema{
 									SchemaProps: spec.SchemaProps{
-										Ref: ref("k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.JSON"),
+										Ref: ref(v1.JSON{}.OpenAPIModelName()),
 									},
 								},
 							},
@@ -1610,9 +2475,8 @@ func schema_pkg_apis_apiextensions_v1_JSONSchemaProps(ref common.ReferenceCallba
 							Items: &spec.SchemaOrArray{
 								Schema: &spec.Schema{
 									SchemaProps: spec.SchemaProps{
-										Default: "",
-										Type:    []string{"string"},
-										Format:  "",
+										Type:   []string{"string"},
+										Format: "",
 									},
 								},
 							},
@@ -1620,7 +2484,7 @@ func schema_pkg_apis_apiextensions_v1_JSONSchemaProps(ref common.ReferenceCallba
 					},
 					"items": {
 						SchemaProps: spec.SchemaProps{
-							Ref: ref("k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.JSONSchemaPropsOrArray"),
+							Ref: ref(v1.JSONSchemaPropsOrArray{}.OpenAPIModelName()),
 						},
 					},
 					"allOf": {
@@ -1634,8 +2498,7 @@ func schema_pkg_apis_apiextensions_v1_JSONSchemaProps(ref common.ReferenceCallba
 							Items: &spec.SchemaOrArray{
 								Schema: &spec.Schema{
 									SchemaProps: spec.SchemaProps{
-										Default: map[string]interface{}{},
-										Ref:     ref("k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.JSONSchemaProps"),
+										Ref: ref(v1.JSONSchemaProps{}.OpenAPIModelName()),
 									},
 								},
 							},
@@ -1652,8 +2515,7 @@ func schema_pkg_apis_apiextensions_v1_JSONSchemaProps(ref common.ReferenceCallba
 							Items: &spec.SchemaOrArray{
 								Schema: &spec.Schema{
 									SchemaProps: spec.SchemaProps{
-										Default: map[string]interface{}{},
-										Ref:     ref("k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.JSONSchemaProps"),
+										Ref: ref(v1.JSONSchemaProps{}.OpenAPIModelName()),
 									},
 								},
 							},
@@ -1670,8 +2532,7 @@ func schema_pkg_apis_apiextensions_v1_JSONSchemaProps(ref common.ReferenceCallba
 							Items: &spec.SchemaOrArray{
 								Schema: &spec.Schema{
 									SchemaProps: spec.SchemaProps{
-										Default: map[string]interface{}{},
-										Ref:     ref("k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.JSONSchemaProps"),
+										Ref: ref(v1.JSONSchemaProps{}.OpenAPIModelName()),
 									},
 								},
 							},
@@ -1679,7 +2540,7 @@ func schema_pkg_apis_apiextensions_v1_JSONSchemaProps(ref common.ReferenceCallba
 					},
 					"not": {
 						SchemaProps: spec.SchemaProps{
-							Ref: ref("k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.JSONSchemaProps"),
+							Ref: ref(v1.JSONSchemaProps{}.OpenAPIModelName()),
 						},
 					},
 					"properties": {
@@ -1689,8 +2550,7 @@ func schema_pkg_apis_apiextensions_v1_JSONSchemaProps(ref common.ReferenceCallba
 								Allows: true,
 								Schema: &spec.Schema{
 									SchemaProps: spec.SchemaProps{
-										Default: map[string]interface{}{},
-										Ref:     ref("k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.JSONSchemaProps"),
+										Ref: ref(v1.JSONSchemaProps{}.OpenAPIModelName()),
 									},
 								},
 							},
@@ -1698,7 +2558,7 @@ func schema_pkg_apis_apiextensions_v1_JSONSchemaProps(ref common.ReferenceCallba
 					},
 					"additionalProperties": {
 						SchemaProps: spec.SchemaProps{
-							Ref: ref("k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.JSONSchemaPropsOrBool"),
+							Ref: ref(v1.JSONSchemaPropsOrBool{}.OpenAPIModelName()),
 						},
 					},
 					"patternProperties": {
@@ -1708,8 +2568,7 @@ func schema_pkg_apis_apiextensions_v1_JSONSchemaProps(ref common.ReferenceCallba
 								Allows: true,
 								Schema: &spec.Schema{
 									SchemaProps: spec.SchemaProps{
-										Default: map[string]interface{}{},
-										Ref:     ref("k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.JSONSchemaProps"),
+										Ref: ref(v1.JSONSchemaProps{}.OpenAPIModelName()),
 									},
 								},
 							},
@@ -1722,7 +2581,7 @@ func schema_pkg_apis_apiextensions_v1_JSONSchemaProps(ref common.ReferenceCallba
 								Allows: true,
 								Schema: &spec.Schema{
 									SchemaProps: spec.SchemaProps{
-										Ref: ref("k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.JSONSchemaPropsOrStringArray"),
+										Ref: ref(v1.JSONSchemaPropsOrStringArray{}.OpenAPIModelName()),
 									},
 								},
 							},
@@ -1730,7 +2589,7 @@ func schema_pkg_apis_apiextensions_v1_JSONSchemaProps(ref common.ReferenceCallba
 					},
 					"additionalItems": {
 						SchemaProps: spec.SchemaProps{
-							Ref: ref("k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.JSONSchemaPropsOrBool"),
+							Ref: ref(v1.JSONSchemaPropsOrBool{}.OpenAPIModelName()),
 						},
 					},
 					"definitions": {
@@ -1740,8 +2599,7 @@ func schema_pkg_apis_apiextensions_v1_JSONSchemaProps(ref common.ReferenceCallba
 								Allows: true,
 								Schema: &spec.Schema{
 									SchemaProps: spec.SchemaProps{
-										Default: map[string]interface{}{},
-										Ref:     ref("k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.JSONSchemaProps"),
+										Ref: ref(v1.JSONSchemaProps{}.OpenAPIModelName()),
 									},
 								},
 							},
@@ -1749,12 +2607,12 @@ func schema_pkg_apis_apiextensions_v1_JSONSchemaProps(ref common.ReferenceCallba
 					},
 					"externalDocs": {
 						SchemaProps: spec.SchemaProps{
-							Ref: ref("k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.ExternalDocumentation"),
+							Ref: ref(v1.ExternalDocumentation{}.OpenAPIModelName()),
 						},
 					},
 					"example": {
 						SchemaProps: spec.SchemaProps{
-							Ref: ref("k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.JSON"),
+							Ref: ref(v1.JSON{}.OpenAPIModelName()),
 						},
 					},
 					"nullable": {
@@ -1796,9 +2654,8 @@ func schema_pkg_apis_apiextensions_v1_JSONSchemaProps(ref common.ReferenceCallba
 							Items: &spec.SchemaOrArray{
 								Schema: &spec.Schema{
 									SchemaProps: spec.SchemaProps{
-										Default: "",
-										Type:    []string{"string"},
-										Format:  "",
+										Type:   []string{"string"},
+										Format: "",
 									},
 								},
 							},
@@ -1835,8 +2692,7 @@ func schema_pkg_apis_apiextensions_v1_JSONSchemaProps(ref common.ReferenceCallba
 							Items: &spec.SchemaOrArray{
 								Schema: &spec.Schema{
 									SchemaProps: spec.SchemaProps{
-										Default: map[string]interface{}{},
-										Ref:     ref("k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.ValidationRule"),
+										Ref: ref(v1.ValidationRule{}.OpenAPIModelName()),
 									},
 								},
 							},
@@ -1846,7 +2702,7 @@ func schema_pkg_apis_apiextensions_v1_JSONSchemaProps(ref common.ReferenceCallba
 			},
 		},
 		Dependencies: []string{
-			"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.ExternalDocumentation", "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.JSON", "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.JSONSchemaProps", "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.JSONSchemaPropsOrArray", "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.JSONSchemaPropsOrBool", "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.JSONSchemaPropsOrStringArray", "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.ValidationRule"},
+			v1.ExternalDocumentation{}.OpenAPIModelName(), v1.JSON{}.OpenAPIModelName(), v1.JSONSchemaProps{}.OpenAPIModelName(), v1.JSONSchemaPropsOrArray{}.OpenAPIModelName(), v1.JSONSchemaPropsOrBool{}.OpenAPIModelName(), v1.JSONSchemaPropsOrStringArray{}.OpenAPIModelName(), v1.ValidationRule{}.OpenAPIModelName()},
 	}
 }
 
@@ -2027,7 +2883,7 @@ func schema_pkg_apis_apiextensions_v1_WebhookClientConfig(ref common.ReferenceCa
 					"service": {
 						SchemaProps: spec.SchemaProps{
 							Description: "service is a reference to the service for this webhook. Either service or url must be specified.\n\nIf the webhook is running within the cluster, then you should use `service`.",
-							Ref:         ref("k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.ServiceReference"),
+							Ref:         ref(v1.ServiceReference{}.OpenAPIModelName()),
 						},
 					},
 					"caBundle": {
@@ -2041,7 +2897,7 @@ func schema_pkg_apis_apiextensions_v1_WebhookClientConfig(ref common.ReferenceCa
 			},
 		},
 		Dependencies: []string{
-			"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.ServiceReference"},
+			v1.ServiceReference{}.OpenAPIModelName()},
 	}
 }
 
@@ -2055,7 +2911,7 @@ func schema_pkg_apis_apiextensions_v1_WebhookConversion(ref common.ReferenceCall
 					"clientConfig": {
 						SchemaProps: spec.SchemaProps{
 							Description: "clientConfig is the instructions for how to call the webhook if strategy is `Webhook`.",
-							Ref:         ref("k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.WebhookClientConfig"),
+							Ref:         ref(v1.WebhookClientConfig{}.OpenAPIModelName()),
 						},
 					},
 					"conversionReviewVersions": {
@@ -2070,9 +2926,8 @@ func schema_pkg_apis_apiextensions_v1_WebhookConversion(ref common.ReferenceCall
 							Items: &spec.SchemaOrArray{
 								Schema: &spec.Schema{
 									SchemaProps: spec.SchemaProps{
-										Default: "",
-										Type:    []string{"string"},
-										Format:  "",
+										Type:   []string{"string"},
+										Format: "",
 									},
 								},
 							},
@@ -2083,7 +2938,55 @@ func schema_pkg_apis_apiextensions_v1_WebhookConversion(ref common.ReferenceCall
 			},
 		},
 		Dependencies: []string{
-			"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.WebhookClientConfig"},
+			v1.WebhookClientConfig{}.OpenAPIModelName()},
+	}
+}
+
+func schema_apimachinery_pkg_api_resource_Quantity(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.EmbedOpenAPIDefinitionIntoV2Extension(common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "Quantity is a fixed-point representation of a number. It provides convenient marshaling/unmarshaling in JSON and YAML, in addition to String() and AsInt64() accessors.\n\nThe serialization format is:\n\n``` <quantity>        ::= <signedNumber><suffix>\n\n\t(Note that <suffix> may be empty, from the \"\" case in <decimalSI>.)\n\n<digit>           ::= 0 | 1 | ... | 9 <digits>          ::= <digit> | <digit><digits> <number>          ::= <digits> | <digits>.<digits> | <digits>. | .<digits> <sign>            ::= \"+\" | \"-\" <signedNumber>    ::= <number> | <sign><number> <suffix>          ::= <binarySI> | <decimalExponent> | <decimalSI> <binarySI>        ::= Ki | Mi | Gi | Ti | Pi | Ei\n\n\t(International System of units; See: http://physics.nist.gov/cuu/Units/binary.html)\n\n<decimalSI>       ::= m | \"\" | k | M | G | T | P | E\n\n\t(Note that 1024 = 1Ki but 1000 = 1k; I didn't choose the capitalization.)\n\n<decimalExponent> ::= \"e\" <signedNumber> | \"E\" <signedNumber> ```\n\nNo matter which of the three exponent forms is used, no quantity may represent a number greater than 2^63-1 in magnitude, nor may it have more than 3 decimal places. Numbers larger or more precise will be capped or rounded up. (E.g.: 0.1m will rounded up to 1m.) This may be extended in the future if we require larger or smaller quantities.\n\nWhen a Quantity is parsed from a string, it will remember the type of suffix it had, and will use the same type again when it is serialized.\n\nBefore serializing, Quantity will be put in \"canonical form\". This means that Exponent/suffix will be adjusted up or down (with a corresponding increase or decrease in Mantissa) such that:\n\n- No precision is lost - No fractional digits will be emitted - The exponent (or suffix) is as large as possible.\n\nThe sign will be omitted unless the number is negative.\n\nExamples:\n\n- 1.5 will be serialized as \"1500m\" - 1.5Gi will be serialized as \"1536Mi\"\n\nNote that the quantity will NEVER be internally represented by a floating point number. That is the whole point of this exercise.\n\nNon-canonical values will still parse as long as they are well formed, but will be re-emitted in their canonical form. (So always use canonical form, or don't diff.)\n\nThis format is intended to make it difficult to use these numbers without writing some sort of special handling code in the hopes that that will cause implementors to also use a fixed point implementation.",
+				OneOf:       common.GenerateOpenAPIV3OneOfSchema(resource.Quantity{}.OpenAPIV3OneOfTypes()),
+				Format:      resource.Quantity{}.OpenAPISchemaFormat(),
+			},
+		},
+	}, common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "Quantity is a fixed-point representation of a number. It provides convenient marshaling/unmarshaling in JSON and YAML, in addition to String() and AsInt64() accessors.\n\nThe serialization format is:\n\n``` <quantity>        ::= <signedNumber><suffix>\n\n\t(Note that <suffix> may be empty, from the \"\" case in <decimalSI>.)\n\n<digit>           ::= 0 | 1 | ... | 9 <digits>          ::= <digit> | <digit><digits> <number>          ::= <digits> | <digits>.<digits> | <digits>. | .<digits> <sign>            ::= \"+\" | \"-\" <signedNumber>    ::= <number> | <sign><number> <suffix>          ::= <binarySI> | <decimalExponent> | <decimalSI> <binarySI>        ::= Ki | Mi | Gi | Ti | Pi | Ei\n\n\t(International System of units; See: http://physics.nist.gov/cuu/Units/binary.html)\n\n<decimalSI>       ::= m | \"\" | k | M | G | T | P | E\n\n\t(Note that 1024 = 1Ki but 1000 = 1k; I didn't choose the capitalization.)\n\n<decimalExponent> ::= \"e\" <signedNumber> | \"E\" <signedNumber> ```\n\nNo matter which of the three exponent forms is used, no quantity may represent a number greater than 2^63-1 in magnitude, nor may it have more than 3 decimal places. Numbers larger or more precise will be capped or rounded up. (E.g.: 0.1m will rounded up to 1m.) This may be extended in the future if we require larger or smaller quantities.\n\nWhen a Quantity is parsed from a string, it will remember the type of suffix it had, and will use the same type again when it is serialized.\n\nBefore serializing, Quantity will be put in \"canonical form\". This means that Exponent/suffix will be adjusted up or down (with a corresponding increase or decrease in Mantissa) such that:\n\n- No precision is lost - No fractional digits will be emitted - The exponent (or suffix) is as large as possible.\n\nThe sign will be omitted unless the number is negative.\n\nExamples:\n\n- 1.5 will be serialized as \"1500m\" - 1.5Gi will be serialized as \"1536Mi\"\n\nNote that the quantity will NEVER be internally represented by a floating point number. That is the whole point of this exercise.\n\nNon-canonical values will still parse as long as they are well formed, but will be re-emitted in their canonical form. (So always use canonical form, or don't diff.)\n\nThis format is intended to make it difficult to use these numbers without writing some sort of special handling code in the hopes that that will cause implementors to also use a fixed point implementation.",
+				Type:        resource.Quantity{}.OpenAPISchemaType(),
+				Format:      resource.Quantity{}.OpenAPISchemaFormat(),
+			},
+		},
+	})
+}
+
+func schema_apimachinery_pkg_api_resource_int64Amount(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "int64Amount represents a fixed precision numerator and arbitrary scale exponent. It is faster than operations on inf.Dec for values that can be represented as int64.",
+				Type:        []string{"object"},
+				Properties: map[string]spec.Schema{
+					"value": {
+						SchemaProps: spec.SchemaProps{
+							Default: 0,
+							Type:    []string{"integer"},
+							Format:  "int64",
+						},
+					},
+					"scale": {
+						SchemaProps: spec.SchemaProps{
+							Default: 0,
+							Type:    []string{"integer"},
+							Format:  "int32",
+						},
+					},
+				},
+				Required: []string{"value", "scale"},
+			},
+		},
 	}
 }
 
@@ -2128,8 +3031,7 @@ func schema_pkg_apis_meta_v1_APIGroup(ref common.ReferenceCallback) common.OpenA
 							Items: &spec.SchemaOrArray{
 								Schema: &spec.Schema{
 									SchemaProps: spec.SchemaProps{
-										Default: map[string]interface{}{},
-										Ref:     ref("k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersionForDiscovery"),
+										Ref: ref(metav1.GroupVersionForDiscovery{}.OpenAPIModelName()),
 									},
 								},
 							},
@@ -2139,7 +3041,7 @@ func schema_pkg_apis_meta_v1_APIGroup(ref common.ReferenceCallback) common.OpenA
 						SchemaProps: spec.SchemaProps{
 							Description: "preferredVersion is the version preferred by the API server, which probably is the storage version.",
 							Default:     map[string]interface{}{},
-							Ref:         ref("k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersionForDiscovery"),
+							Ref:         ref(metav1.GroupVersionForDiscovery{}.OpenAPIModelName()),
 						},
 					},
 					"serverAddressByClientCIDRs": {
@@ -2154,8 +3056,7 @@ func schema_pkg_apis_meta_v1_APIGroup(ref common.ReferenceCallback) common.OpenA
 							Items: &spec.SchemaOrArray{
 								Schema: &spec.Schema{
 									SchemaProps: spec.SchemaProps{
-										Default: map[string]interface{}{},
-										Ref:     ref("k8s.io/apimachinery/pkg/apis/meta/v1.ServerAddressByClientCIDR"),
+										Ref: ref(metav1.ServerAddressByClientCIDR{}.OpenAPIModelName()),
 									},
 								},
 							},
@@ -2166,7 +3067,7 @@ func schema_pkg_apis_meta_v1_APIGroup(ref common.ReferenceCallback) common.OpenA
 			},
 		},
 		Dependencies: []string{
-			"k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersionForDiscovery", "k8s.io/apimachinery/pkg/apis/meta/v1.ServerAddressByClientCIDR"},
+			metav1.GroupVersionForDiscovery{}.OpenAPIModelName(), metav1.ServerAddressByClientCIDR{}.OpenAPIModelName()},
 	}
 }
 
@@ -2203,8 +3104,7 @@ func schema_pkg_apis_meta_v1_APIGroupList(ref common.ReferenceCallback) common.O
 							Items: &spec.SchemaOrArray{
 								Schema: &spec.Schema{
 									SchemaProps: spec.SchemaProps{
-										Default: map[string]interface{}{},
-										Ref:     ref("k8s.io/apimachinery/pkg/apis/meta/v1.APIGroup"),
+										Ref: ref(metav1.APIGroup{}.OpenAPIModelName()),
 									},
 								},
 							},
@@ -2215,7 +3115,7 @@ func schema_pkg_apis_meta_v1_APIGroupList(ref common.ReferenceCallback) common.O
 			},
 		},
 		Dependencies: []string{
-			"k8s.io/apimachinery/pkg/apis/meta/v1.APIGroup"},
+			metav1.APIGroup{}.OpenAPIModelName()},
 	}
 }
 
@@ -2279,9 +3179,8 @@ func schema_pkg_apis_meta_v1_APIResource(ref common.ReferenceCallback) common.Op
 							Items: &spec.SchemaOrArray{
 								Schema: &spec.Schema{
 									SchemaProps: spec.SchemaProps{
-										Default: "",
-										Type:    []string{"string"},
-										Format:  "",
+										Type:   []string{"string"},
+										Format: "",
 									},
 								},
 							},
@@ -2299,9 +3198,8 @@ func schema_pkg_apis_meta_v1_APIResource(ref common.ReferenceCallback) common.Op
 							Items: &spec.SchemaOrArray{
 								Schema: &spec.Schema{
 									SchemaProps: spec.SchemaProps{
-										Default: "",
-										Type:    []string{"string"},
-										Format:  "",
+										Type:   []string{"string"},
+										Format: "",
 									},
 								},
 							},
@@ -2319,9 +3217,8 @@ func schema_pkg_apis_meta_v1_APIResource(ref common.ReferenceCallback) common.Op
 							Items: &spec.SchemaOrArray{
 								Schema: &spec.Schema{
 									SchemaProps: spec.SchemaProps{
-										Default: "",
-										Type:    []string{"string"},
-										Format:  "",
+										Type:   []string{"string"},
+										Format: "",
 									},
 								},
 							},
@@ -2382,8 +3279,7 @@ func schema_pkg_apis_meta_v1_APIResourceList(ref common.ReferenceCallback) commo
 							Items: &spec.SchemaOrArray{
 								Schema: &spec.Schema{
 									SchemaProps: spec.SchemaProps{
-										Default: map[string]interface{}{},
-										Ref:     ref("k8s.io/apimachinery/pkg/apis/meta/v1.APIResource"),
+										Ref: ref(metav1.APIResource{}.OpenAPIModelName()),
 									},
 								},
 							},
@@ -2394,7 +3290,7 @@ func schema_pkg_apis_meta_v1_APIResourceList(ref common.ReferenceCallback) commo
 			},
 		},
 		Dependencies: []string{
-			"k8s.io/apimachinery/pkg/apis/meta/v1.APIResource"},
+			metav1.APIResource{}.OpenAPIModelName()},
 	}
 }
 
@@ -2431,9 +3327,8 @@ func schema_pkg_apis_meta_v1_APIVersions(ref common.ReferenceCallback) common.Op
 							Items: &spec.SchemaOrArray{
 								Schema: &spec.Schema{
 									SchemaProps: spec.SchemaProps{
-										Default: "",
-										Type:    []string{"string"},
-										Format:  "",
+										Type:   []string{"string"},
+										Format: "",
 									},
 								},
 							},
@@ -2451,8 +3346,7 @@ func schema_pkg_apis_meta_v1_APIVersions(ref common.ReferenceCallback) common.Op
 							Items: &spec.SchemaOrArray{
 								Schema: &spec.Schema{
 									SchemaProps: spec.SchemaProps{
-										Default: map[string]interface{}{},
-										Ref:     ref("k8s.io/apimachinery/pkg/apis/meta/v1.ServerAddressByClientCIDR"),
+										Ref: ref(metav1.ServerAddressByClientCIDR{}.OpenAPIModelName()),
 									},
 								},
 							},
@@ -2463,7 +3357,7 @@ func schema_pkg_apis_meta_v1_APIVersions(ref common.ReferenceCallback) common.Op
 			},
 		},
 		Dependencies: []string{
-			"k8s.io/apimachinery/pkg/apis/meta/v1.ServerAddressByClientCIDR"},
+			metav1.ServerAddressByClientCIDR{}.OpenAPIModelName()},
 	}
 }
 
@@ -2500,9 +3394,8 @@ func schema_pkg_apis_meta_v1_ApplyOptions(ref common.ReferenceCallback) common.O
 							Items: &spec.SchemaOrArray{
 								Schema: &spec.Schema{
 									SchemaProps: spec.SchemaProps{
-										Default: "",
-										Type:    []string{"string"},
-										Format:  "",
+										Type:   []string{"string"},
+										Format: "",
 									},
 								},
 							},
@@ -2564,7 +3457,7 @@ func schema_pkg_apis_meta_v1_Condition(ref common.ReferenceCallback) common.Open
 					"lastTransitionTime": {
 						SchemaProps: spec.SchemaProps{
 							Description: "lastTransitionTime is the last time the condition transitioned from one status to another. This should be when the underlying condition changed.  If that is not known, then using the time when the API field changed is acceptable.",
-							Ref:         ref("k8s.io/apimachinery/pkg/apis/meta/v1.Time"),
+							Ref:         ref(metav1.Time{}.OpenAPIModelName()),
 						},
 					},
 					"reason": {
@@ -2588,7 +3481,7 @@ func schema_pkg_apis_meta_v1_Condition(ref common.ReferenceCallback) common.Open
 			},
 		},
 		Dependencies: []string{
-			"k8s.io/apimachinery/pkg/apis/meta/v1.Time"},
+			metav1.Time{}.OpenAPIModelName()},
 	}
 }
 
@@ -2625,9 +3518,8 @@ func schema_pkg_apis_meta_v1_CreateOptions(ref common.ReferenceCallback) common.
 							Items: &spec.SchemaOrArray{
 								Schema: &spec.Schema{
 									SchemaProps: spec.SchemaProps{
-										Default: "",
-										Type:    []string{"string"},
-										Format:  "",
+										Type:   []string{"string"},
+										Format: "",
 									},
 								},
 							},
@@ -2684,7 +3576,7 @@ func schema_pkg_apis_meta_v1_DeleteOptions(ref common.ReferenceCallback) common.
 					"preconditions": {
 						SchemaProps: spec.SchemaProps{
 							Description: "Must be fulfilled before a deletion is carried out. If not possible, a 409 Conflict status will be returned.",
-							Ref:         ref("k8s.io/apimachinery/pkg/apis/meta/v1.Preconditions"),
+							Ref:         ref(metav1.Preconditions{}.OpenAPIModelName()),
 						},
 					},
 					"orphanDependents": {
@@ -2713,9 +3605,8 @@ func schema_pkg_apis_meta_v1_DeleteOptions(ref common.ReferenceCallback) common.
 							Items: &spec.SchemaOrArray{
 								Schema: &spec.Schema{
 									SchemaProps: spec.SchemaProps{
-										Default: "",
-										Type:    []string{"string"},
-										Format:  "",
+										Type:   []string{"string"},
+										Format: "",
 									},
 								},
 							},
@@ -2732,7 +3623,7 @@ func schema_pkg_apis_meta_v1_DeleteOptions(ref common.ReferenceCallback) common.
 			},
 		},
 		Dependencies: []string{
-			"k8s.io/apimachinery/pkg/apis/meta/v1.Preconditions"},
+			metav1.Preconditions{}.OpenAPIModelName()},
 	}
 }
 
@@ -2783,9 +3674,8 @@ func schema_pkg_apis_meta_v1_FieldSelectorRequirement(ref common.ReferenceCallba
 							Items: &spec.SchemaOrArray{
 								Schema: &spec.Schema{
 									SchemaProps: spec.SchemaProps{
-										Default: "",
-										Type:    []string{"string"},
-										Format:  "",
+										Type:   []string{"string"},
+										Format: "",
 									},
 								},
 							},
@@ -3044,15 +3934,12 @@ func schema_pkg_apis_meta_v1_InternalEvent(ref common.ReferenceCallback) common.
 					"Object": {
 						SchemaProps: spec.SchemaProps{
 							Description: "Object is:\n * If Type is Added or Modified: the new state of the object.\n * If Type is Deleted: the state of the object immediately before deletion.\n * If Type is Bookmark: the object (instance of a type being watched) where\n   only ResourceVersion field is set. On successful restart of watch from a\n   bookmark resourceVersion, client is guaranteed to not get repeat event\n   nor miss any events.\n * If Type is Error: *api.Status is recommended; other types may make sense\n   depending on context.",
-							Ref:         ref("k8s.io/apimachinery/pkg/runtime.Object"),
 						},
 					},
 				},
 				Required: []string{"Type", "Object"},
 			},
 		},
-		Dependencies: []string{
-			"k8s.io/apimachinery/pkg/runtime.Object"},
 	}
 }
 
@@ -3071,9 +3958,8 @@ func schema_pkg_apis_meta_v1_LabelSelector(ref common.ReferenceCallback) common.
 								Allows: true,
 								Schema: &spec.Schema{
 									SchemaProps: spec.SchemaProps{
-										Default: "",
-										Type:    []string{"string"},
-										Format:  "",
+										Type:   []string{"string"},
+										Format: "",
 									},
 								},
 							},
@@ -3091,8 +3977,7 @@ func schema_pkg_apis_meta_v1_LabelSelector(ref common.ReferenceCallback) common.
 							Items: &spec.SchemaOrArray{
 								Schema: &spec.Schema{
 									SchemaProps: spec.SchemaProps{
-										Default: map[string]interface{}{},
-										Ref:     ref("k8s.io/apimachinery/pkg/apis/meta/v1.LabelSelectorRequirement"),
+										Ref: ref(metav1.LabelSelectorRequirement{}.OpenAPIModelName()),
 									},
 								},
 							},
@@ -3107,7 +3992,7 @@ func schema_pkg_apis_meta_v1_LabelSelector(ref common.ReferenceCallback) common.
 			},
 		},
 		Dependencies: []string{
-			"k8s.io/apimachinery/pkg/apis/meta/v1.LabelSelectorRequirement"},
+			metav1.LabelSelectorRequirement{}.OpenAPIModelName()},
 	}
 }
 
@@ -3146,9 +4031,8 @@ func schema_pkg_apis_meta_v1_LabelSelectorRequirement(ref common.ReferenceCallba
 							Items: &spec.SchemaOrArray{
 								Schema: &spec.Schema{
 									SchemaProps: spec.SchemaProps{
-										Default: "",
-										Type:    []string{"string"},
-										Format:  "",
+										Type:   []string{"string"},
+										Format: "",
 									},
 								},
 							},
@@ -3186,7 +4070,7 @@ func schema_pkg_apis_meta_v1_List(ref common.ReferenceCallback) common.OpenAPIDe
 						SchemaProps: spec.SchemaProps{
 							Description: "Standard list metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
 							Default:     map[string]interface{}{},
-							Ref:         ref("k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"),
+							Ref:         ref(metav1.ListMeta{}.OpenAPIModelName()),
 						},
 					},
 					"items": {
@@ -3196,7 +4080,7 @@ func schema_pkg_apis_meta_v1_List(ref common.ReferenceCallback) common.OpenAPIDe
 							Items: &spec.SchemaOrArray{
 								Schema: &spec.Schema{
 									SchemaProps: spec.SchemaProps{
-										Ref: ref("k8s.io/apimachinery/pkg/runtime.RawExtension"),
+										Ref: ref(runtime.RawExtension{}.OpenAPIModelName()),
 									},
 								},
 							},
@@ -3207,7 +4091,7 @@ func schema_pkg_apis_meta_v1_List(ref common.ReferenceCallback) common.OpenAPIDe
 			},
 		},
 		Dependencies: []string{
-			"k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta", "k8s.io/apimachinery/pkg/runtime.RawExtension"},
+			metav1.ListMeta{}.OpenAPIModelName(), runtime.RawExtension{}.OpenAPIModelName()},
 	}
 }
 
@@ -3246,9 +4130,17 @@ func schema_pkg_apis_meta_v1_ListMeta(ref common.ReferenceCallback) common.OpenA
 							Format:      "int64",
 						},
 					},
+					"shardInfo": {
+						SchemaProps: spec.SchemaProps{
+							Description: "shardInfo is set when the list is a filtered subset of the full collection, as selected by a shard selector on the request. It echoes back the selector so clients can verify which shard they received and merge sharded responses. Clients should not cache sharded list responses as a full representation of the collection.\n\nThis is an alpha field and requires enabling the ShardedListAndWatch feature gate.",
+							Ref:         ref(metav1.ShardInfo{}.OpenAPIModelName()),
+						},
+					},
 				},
 			},
 		},
+		Dependencies: []string{
+			metav1.ShardInfo{}.OpenAPIModelName()},
 	}
 }
 
@@ -3343,6 +4235,13 @@ func schema_pkg_apis_meta_v1_ListOptions(ref common.ReferenceCallback) common.Op
 							Format:      "",
 						},
 					},
+					"shardSelector": {
+						SchemaProps: spec.SchemaProps{
+							Description: "shardSelector restricts the list of returned objects using a CEL-based shard selector expression. The format uses the shardRange() function combined with || (logical OR) to specify one or more hash ranges:\n\n  shardRange(object.metadata.uid, '0x0', '0x8000000000000000')\n  shardRange(object.metadata.uid, '0x0', '0x8000000000000000') || shardRange(object.metadata.uid, '0x8000000000000000', '0x10000000000000000')\n\nField paths use CEL-style object-rooted syntax (e.g. \"object.metadata.uid\"), NOT the fieldSelector format (\"metadata.uid\"). Currently supported paths:\n  - object.metadata.uid\n  - object.metadata.namespace\n\nhexStart and hexEnd are single-quoted CEL string literals with a '0x' prefix, defining the inclusive lower and exclusive upper bounds over the 64-bit FNV-1a hash space. The full range is [0x0, 0x10000000000000000), where the exclusive upper bound equals 2^64.\n\nExamples:\n  2-shard split:\n    shard 0: shardRange(object.metadata.uid, '0x0000000000000000', '0x8000000000000000')\n    shard 1: shardRange(object.metadata.uid, '0x8000000000000000', '0x10000000000000000')\n  4-shard split:\n    shard 0: shardRange(object.metadata.uid, '0x0000000000000000', '0x4000000000000000')\n    shard 1: shardRange(object.metadata.uid, '0x4000000000000000', '0x8000000000000000')\n    shard 2: shardRange(object.metadata.uid, '0x8000000000000000', '0xc000000000000000')\n    shard 3: shardRange(object.metadata.uid, '0xc000000000000000', '0x10000000000000000')\n\nThis is an alpha field and requires enabling the ShardedListAndWatch feature gate.",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
 				},
 			},
 		},
@@ -3380,7 +4279,7 @@ func schema_pkg_apis_meta_v1_ManagedFieldsEntry(ref common.ReferenceCallback) co
 					"time": {
 						SchemaProps: spec.SchemaProps{
 							Description: "Time is the timestamp of when the ManagedFields entry was added. The timestamp will also be updated if a field is added, the manager changes any of the owned fields value or removes a field. The timestamp does not update when a field is removed from the entry because another manager took it over.",
-							Ref:         ref("k8s.io/apimachinery/pkg/apis/meta/v1.Time"),
+							Ref:         ref(metav1.Time{}.OpenAPIModelName()),
 						},
 					},
 					"fieldsType": {
@@ -3393,7 +4292,7 @@ func schema_pkg_apis_meta_v1_ManagedFieldsEntry(ref common.ReferenceCallback) co
 					"fieldsV1": {
 						SchemaProps: spec.SchemaProps{
 							Description: "FieldsV1 holds the first JSON version format as described in the \"FieldsV1\" type.",
-							Ref:         ref("k8s.io/apimachinery/pkg/apis/meta/v1.FieldsV1"),
+							Ref:         ref(metav1.FieldsV1{}.OpenAPIModelName()),
 						},
 					},
 					"subresource": {
@@ -3407,7 +4306,7 @@ func schema_pkg_apis_meta_v1_ManagedFieldsEntry(ref common.ReferenceCallback) co
 			},
 		},
 		Dependencies: []string{
-			"k8s.io/apimachinery/pkg/apis/meta/v1.FieldsV1", "k8s.io/apimachinery/pkg/apis/meta/v1.Time"},
+			metav1.FieldsV1{}.OpenAPIModelName(), metav1.Time{}.OpenAPIModelName()},
 	}
 }
 
@@ -3482,13 +4381,13 @@ func schema_pkg_apis_meta_v1_ObjectMeta(ref common.ReferenceCallback) common.Ope
 					"creationTimestamp": {
 						SchemaProps: spec.SchemaProps{
 							Description: "CreationTimestamp is a timestamp representing the server time when this object was created. It is not guaranteed to be set in happens-before order across separate operations. Clients may not set this value. It is represented in RFC3339 form and is in UTC.\n\nPopulated by the system. Read-only. Null for lists. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata",
-							Ref:         ref("k8s.io/apimachinery/pkg/apis/meta/v1.Time"),
+							Ref:         ref(metav1.Time{}.OpenAPIModelName()),
 						},
 					},
 					"deletionTimestamp": {
 						SchemaProps: spec.SchemaProps{
 							Description: "DeletionTimestamp is RFC 3339 date and time at which this resource will be deleted. This field is set by the server when a graceful deletion is requested by the user, and is not directly settable by a client. The resource is expected to be deleted (no longer visible from resource lists, and not reachable by name) after the time in this field, once the finalizers list is empty. As long as the finalizers list contains items, deletion is blocked. Once the deletionTimestamp is set, this value may not be unset or be set further into the future, although it may be shortened or the resource may be deleted prior to this time. For example, a user may request that a pod is deleted in 30 seconds. The Kubelet will react by sending a graceful termination signal to the containers in the pod. After that 30 seconds, the Kubelet will send a hard termination signal (SIGKILL) to the container and after cleanup, remove the pod from the API. In the presence of network partitions, this object may still exist after this timestamp, until an administrator or automated process can determine the resource is fully terminated. If not set, graceful deletion of the object has not been requested.\n\nPopulated by the system when a graceful deletion is requested. Read-only. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata",
-							Ref:         ref("k8s.io/apimachinery/pkg/apis/meta/v1.Time"),
+							Ref:         ref(metav1.Time{}.OpenAPIModelName()),
 						},
 					},
 					"deletionGracePeriodSeconds": {
@@ -3506,9 +4405,8 @@ func schema_pkg_apis_meta_v1_ObjectMeta(ref common.ReferenceCallback) common.Ope
 								Allows: true,
 								Schema: &spec.Schema{
 									SchemaProps: spec.SchemaProps{
-										Default: "",
-										Type:    []string{"string"},
-										Format:  "",
+										Type:   []string{"string"},
+										Format: "",
 									},
 								},
 							},
@@ -3522,9 +4420,8 @@ func schema_pkg_apis_meta_v1_ObjectMeta(ref common.ReferenceCallback) common.Ope
 								Allows: true,
 								Schema: &spec.Schema{
 									SchemaProps: spec.SchemaProps{
-										Default: "",
-										Type:    []string{"string"},
-										Format:  "",
+										Type:   []string{"string"},
+										Format: "",
 									},
 								},
 							},
@@ -3547,8 +4444,7 @@ func schema_pkg_apis_meta_v1_ObjectMeta(ref common.ReferenceCallback) common.Ope
 							Items: &spec.SchemaOrArray{
 								Schema: &spec.Schema{
 									SchemaProps: spec.SchemaProps{
-										Default: map[string]interface{}{},
-										Ref:     ref("k8s.io/apimachinery/pkg/apis/meta/v1.OwnerReference"),
+										Ref: ref(metav1.OwnerReference{}.OpenAPIModelName()),
 									},
 								},
 							},
@@ -3567,9 +4463,8 @@ func schema_pkg_apis_meta_v1_ObjectMeta(ref common.ReferenceCallback) common.Ope
 							Items: &spec.SchemaOrArray{
 								Schema: &spec.Schema{
 									SchemaProps: spec.SchemaProps{
-										Default: "",
-										Type:    []string{"string"},
-										Format:  "",
+										Type:   []string{"string"},
+										Format: "",
 									},
 								},
 							},
@@ -3587,8 +4482,7 @@ func schema_pkg_apis_meta_v1_ObjectMeta(ref common.ReferenceCallback) common.Ope
 							Items: &spec.SchemaOrArray{
 								Schema: &spec.Schema{
 									SchemaProps: spec.SchemaProps{
-										Default: map[string]interface{}{},
-										Ref:     ref("k8s.io/apimachinery/pkg/apis/meta/v1.ManagedFieldsEntry"),
+										Ref: ref(metav1.ManagedFieldsEntry{}.OpenAPIModelName()),
 									},
 								},
 							},
@@ -3598,7 +4492,7 @@ func schema_pkg_apis_meta_v1_ObjectMeta(ref common.ReferenceCallback) common.Ope
 			},
 		},
 		Dependencies: []string{
-			"k8s.io/apimachinery/pkg/apis/meta/v1.ManagedFieldsEntry", "k8s.io/apimachinery/pkg/apis/meta/v1.OwnerReference", "k8s.io/apimachinery/pkg/apis/meta/v1.Time"},
+			metav1.ManagedFieldsEntry{}.OpenAPIModelName(), metav1.OwnerReference{}.OpenAPIModelName(), metav1.Time{}.OpenAPIModelName()},
 	}
 }
 
@@ -3692,14 +4586,14 @@ func schema_pkg_apis_meta_v1_PartialObjectMetadata(ref common.ReferenceCallback)
 						SchemaProps: spec.SchemaProps{
 							Description: "Standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata",
 							Default:     map[string]interface{}{},
-							Ref:         ref("k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"),
+							Ref:         ref(metav1.ObjectMeta{}.OpenAPIModelName()),
 						},
 					},
 				},
 			},
 		},
 		Dependencies: []string{
-			"k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"},
+			metav1.ObjectMeta{}.OpenAPIModelName()},
 	}
 }
 
@@ -3728,7 +4622,7 @@ func schema_pkg_apis_meta_v1_PartialObjectMetadataList(ref common.ReferenceCallb
 						SchemaProps: spec.SchemaProps{
 							Description: "Standard list metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
 							Default:     map[string]interface{}{},
-							Ref:         ref("k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"),
+							Ref:         ref(metav1.ListMeta{}.OpenAPIModelName()),
 						},
 					},
 					"items": {
@@ -3738,8 +4632,7 @@ func schema_pkg_apis_meta_v1_PartialObjectMetadataList(ref common.ReferenceCallb
 							Items: &spec.SchemaOrArray{
 								Schema: &spec.Schema{
 									SchemaProps: spec.SchemaProps{
-										Default: map[string]interface{}{},
-										Ref:     ref("k8s.io/apimachinery/pkg/apis/meta/v1.PartialObjectMetadata"),
+										Ref: ref(metav1.PartialObjectMetadata{}.OpenAPIModelName()),
 									},
 								},
 							},
@@ -3750,7 +4643,7 @@ func schema_pkg_apis_meta_v1_PartialObjectMetadataList(ref common.ReferenceCallb
 			},
 		},
 		Dependencies: []string{
-			"k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta", "k8s.io/apimachinery/pkg/apis/meta/v1.PartialObjectMetadata"},
+			metav1.ListMeta{}.OpenAPIModelName(), metav1.PartialObjectMetadata{}.OpenAPIModelName()},
 	}
 }
 
@@ -3798,9 +4691,8 @@ func schema_pkg_apis_meta_v1_PatchOptions(ref common.ReferenceCallback) common.O
 							Items: &spec.SchemaOrArray{
 								Schema: &spec.Schema{
 									SchemaProps: spec.SchemaProps{
-										Default: "",
-										Type:    []string{"string"},
-										Format:  "",
+										Type:   []string{"string"},
+										Format: "",
 									},
 								},
 							},
@@ -3879,9 +4771,8 @@ func schema_pkg_apis_meta_v1_RootPaths(ref common.ReferenceCallback) common.Open
 							Items: &spec.SchemaOrArray{
 								Schema: &spec.Schema{
 									SchemaProps: spec.SchemaProps{
-										Default: "",
-										Type:    []string{"string"},
-										Format:  "",
+										Type:   []string{"string"},
+										Format: "",
 									},
 								},
 							},
@@ -3924,6 +4815,28 @@ func schema_pkg_apis_meta_v1_ServerAddressByClientCIDR(ref common.ReferenceCallb
 	}
 }
 
+func schema_pkg_apis_meta_v1_ShardInfo(ref common.ReferenceCallback) common.OpenAPIDefinition {
+	return common.OpenAPIDefinition{
+		Schema: spec.Schema{
+			SchemaProps: spec.SchemaProps{
+				Description: "ShardInfo describes the shard selector that was applied to produce a list response. Its presence on a list response indicates the list is a filtered subset.",
+				Type:        []string{"object"},
+				Properties: map[string]spec.Schema{
+					"selector": {
+						SchemaProps: spec.SchemaProps{
+							Description: "selector is the shard selector string from the request, echoed back so clients can verify which shard they received and merge responses from multiple shards.",
+							Default:     "",
+							Type:        []string{"string"},
+							Format:      "",
+						},
+					},
+				},
+				Required: []string{"selector"},
+			},
+		},
+	}
+}
+
 func schema_pkg_apis_meta_v1_Status(ref common.ReferenceCallback) common.OpenAPIDefinition {
 	return common.OpenAPIDefinition{
 		Schema: spec.Schema{
@@ -3949,7 +4862,7 @@ func schema_pkg_apis_meta_v1_Status(ref common.ReferenceCallback) common.OpenAPI
 						SchemaProps: spec.SchemaProps{
 							Description: "Standard list metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
 							Default:     map[string]interface{}{},
-							Ref:         ref("k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"),
+							Ref:         ref(metav1.ListMeta{}.OpenAPIModelName()),
 						},
 					},
 					"status": {
@@ -3974,14 +4887,9 @@ func schema_pkg_apis_meta_v1_Status(ref common.ReferenceCallback) common.OpenAPI
 						},
 					},
 					"details": {
-						VendorExtensible: spec.VendorExtensible{
-							Extensions: spec.Extensions{
-								"x-kubernetes-list-type": "atomic",
-							},
-						},
 						SchemaProps: spec.SchemaProps{
 							Description: "Extended data associated with the reason.  Each reason may define its own extended details. This field is optional and the data returned is not guaranteed to conform to any schema except that defined by the reason type.",
-							Ref:         ref("k8s.io/apimachinery/pkg/apis/meta/v1.StatusDetails"),
+							Ref:         ref(metav1.StatusDetails{}.OpenAPIModelName()),
 						},
 					},
 					"code": {
@@ -3995,7 +4903,7 @@ func schema_pkg_apis_meta_v1_Status(ref common.ReferenceCallback) common.OpenAPI
 			},
 		},
 		Dependencies: []string{
-			"k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta", "k8s.io/apimachinery/pkg/apis/meta/v1.StatusDetails"},
+			metav1.ListMeta{}.OpenAPIModelName(), metav1.StatusDetails{}.OpenAPIModelName()},
 	}
 }
 
@@ -4080,8 +4988,7 @@ func schema_pkg_apis_meta_v1_StatusDetails(ref common.ReferenceCallback) common.
 							Items: &spec.SchemaOrArray{
 								Schema: &spec.Schema{
 									SchemaProps: spec.SchemaProps{
-										Default: map[string]interface{}{},
-										Ref:     ref("k8s.io/apimachinery/pkg/apis/meta/v1.StatusCause"),
+										Ref: ref(metav1.StatusCause{}.OpenAPIModelName()),
 									},
 								},
 							},
@@ -4098,7 +5005,7 @@ func schema_pkg_apis_meta_v1_StatusDetails(ref common.ReferenceCallback) common.
 			},
 		},
 		Dependencies: []string{
-			"k8s.io/apimachinery/pkg/apis/meta/v1.StatusCause"},
+			metav1.StatusCause{}.OpenAPIModelName()},
 	}
 }
 
@@ -4127,7 +5034,7 @@ func schema_pkg_apis_meta_v1_Table(ref common.ReferenceCallback) common.OpenAPID
 						SchemaProps: spec.SchemaProps{
 							Description: "Standard list metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
 							Default:     map[string]interface{}{},
-							Ref:         ref("k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"),
+							Ref:         ref(metav1.ListMeta{}.OpenAPIModelName()),
 						},
 					},
 					"columnDefinitions": {
@@ -4142,8 +5049,7 @@ func schema_pkg_apis_meta_v1_Table(ref common.ReferenceCallback) common.OpenAPID
 							Items: &spec.SchemaOrArray{
 								Schema: &spec.Schema{
 									SchemaProps: spec.SchemaProps{
-										Default: map[string]interface{}{},
-										Ref:     ref("k8s.io/apimachinery/pkg/apis/meta/v1.TableColumnDefinition"),
+										Ref: ref(metav1.TableColumnDefinition{}.OpenAPIModelName()),
 									},
 								},
 							},
@@ -4161,8 +5067,7 @@ func schema_pkg_apis_meta_v1_Table(ref common.ReferenceCallback) common.OpenAPID
 							Items: &spec.SchemaOrArray{
 								Schema: &spec.Schema{
 									SchemaProps: spec.SchemaProps{
-										Default: map[string]interface{}{},
-										Ref:     ref("k8s.io/apimachinery/pkg/apis/meta/v1.TableRow"),
+										Ref: ref(metav1.TableRow{}.OpenAPIModelName()),
 									},
 								},
 							},
@@ -4173,7 +5078,7 @@ func schema_pkg_apis_meta_v1_Table(ref common.ReferenceCallback) common.OpenAPID
 			},
 		},
 		Dependencies: []string{
-			"k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta", "k8s.io/apimachinery/pkg/apis/meta/v1.TableColumnDefinition", "k8s.io/apimachinery/pkg/apis/meta/v1.TableRow"},
+			metav1.ListMeta{}.OpenAPIModelName(), metav1.TableColumnDefinition{}.OpenAPIModelName(), metav1.TableRow{}.OpenAPIModelName()},
 	}
 }
 
@@ -4303,8 +5208,7 @@ func schema_pkg_apis_meta_v1_TableRow(ref common.ReferenceCallback) common.OpenA
 							Items: &spec.SchemaOrArray{
 								Schema: &spec.Schema{
 									SchemaProps: spec.SchemaProps{
-										Default: map[string]interface{}{},
-										Ref:     ref("k8s.io/apimachinery/pkg/apis/meta/v1.TableRowCondition"),
+										Ref: ref(metav1.TableRowCondition{}.OpenAPIModelName()),
 									},
 								},
 							},
@@ -4313,7 +5217,7 @@ func schema_pkg_apis_meta_v1_TableRow(ref common.ReferenceCallback) common.OpenA
 					"object": {
 						SchemaProps: spec.SchemaProps{
 							Description: "This field contains the requested additional information about each object based on the includeObject policy when requesting the Table. If \"None\", this field is empty, if \"Object\" this will be the default serialization of the object for the current API version, and if \"Metadata\" (the default) will contain the object metadata. Check the returned kind and apiVersion of the object before parsing. The media type of the object will always match the enclosing list - if this as a JSON table, these will be JSON encoded objects.",
-							Ref:         ref("k8s.io/apimachinery/pkg/runtime.RawExtension"),
+							Ref:         ref(runtime.RawExtension{}.OpenAPIModelName()),
 						},
 					},
 				},
@@ -4321,7 +5225,7 @@ func schema_pkg_apis_meta_v1_TableRow(ref common.ReferenceCallback) common.OpenA
 			},
 		},
 		Dependencies: []string{
-			"k8s.io/apimachinery/pkg/apis/meta/v1.TableRowCondition", "k8s.io/apimachinery/pkg/runtime.RawExtension"},
+			metav1.TableRowCondition{}.OpenAPIModelName(), runtime.RawExtension{}.OpenAPIModelName()},
 	}
 }
 
@@ -4471,9 +5375,8 @@ func schema_pkg_apis_meta_v1_UpdateOptions(ref common.ReferenceCallback) common.
 							Items: &spec.SchemaOrArray{
 								Schema: &spec.Schema{
 									SchemaProps: spec.SchemaProps{
-										Default: "",
-										Type:    []string{"string"},
-										Format:  "",
+										Type:   []string{"string"},
+										Format: "",
 									},
 								},
 							},
@@ -4516,7 +5419,7 @@ func schema_pkg_apis_meta_v1_WatchEvent(ref common.ReferenceCallback) common.Ope
 					"object": {
 						SchemaProps: spec.SchemaProps{
 							Description: "Object is:\n * If Type is Added or Modified: the new state of the object.\n * If Type is Deleted: the state of the object immediately before deletion.\n * If Type is Error: *Status is recommended; other types may make sense\n   depending on context.",
-							Ref:         ref("k8s.io/apimachinery/pkg/runtime.RawExtension"),
+							Ref:         ref(runtime.RawExtension{}.OpenAPIModelName()),
 						},
 					},
 				},
@@ -4524,7 +5427,7 @@ func schema_pkg_apis_meta_v1_WatchEvent(ref common.ReferenceCallback) common.Ope
 			},
 		},
 		Dependencies: []string{
-			"k8s.io/apimachinery/pkg/runtime.RawExtension"},
+			runtime.RawExtension{}.OpenAPIModelName()},
 	}
 }
 
@@ -4532,7 +5435,7 @@ func schema_k8sio_apimachinery_pkg_runtime_RawExtension(ref common.ReferenceCall
 	return common.OpenAPIDefinition{
 		Schema: spec.Schema{
 			SchemaProps: spec.SchemaProps{
-				Description: "RawExtension is used to hold extensions in external versions.\n\nTo use this, make a field which has RawExtension as its type in your external, versioned struct, and Object in your internal struct. You also need to register your various plugin types.\n\n// Internal package:\n\n\ttype MyAPIObject struct {\n\t\truntime.TypeMeta `json:\",inline\"`\n\t\tMyPlugin runtime.Object `json:\"myPlugin\"`\n\t}\n\n\ttype PluginA struct {\n\t\tAOption string `json:\"aOption\"`\n\t}\n\n// External package:\n\n\ttype MyAPIObject struct {\n\t\truntime.TypeMeta `json:\",inline\"`\n\t\tMyPlugin runtime.RawExtension `json:\"myPlugin\"`\n\t}\n\n\ttype PluginA struct {\n\t\tAOption string `json:\"aOption\"`\n\t}\n\n// On the wire, the JSON will look something like this:\n\n\t{\n\t\t\"kind\":\"MyAPIObject\",\n\t\t\"apiVersion\":\"v1\",\n\t\t\"myPlugin\": {\n\t\t\t\"kind\":\"PluginA\",\n\t\t\t\"aOption\":\"foo\",\n\t\t},\n\t}\n\nSo what happens? Decode first uses json or yaml to unmarshal the serialized data into your external MyAPIObject. That causes the raw JSON to be stored, but not unpacked. The next step is to copy (using pkg/conversion) into the internal struct. The runtime package's DefaultScheme has conversion functions installed which will unpack the JSON stored in RawExtension, turning it into the correct object type, and storing it in the Object. (TODO: In the case where the object is of an unknown type, a runtime.Unknown object will be created and stored.)",
+				Description: "RawExtension is used to hold extensions in external versions.\n\nTo use this, make a field which has RawExtension as its type in your external, versioned struct, and Object in your internal struct. You also need to register your various plugin types.\n\n// Internal package:\n\n\ttype MyAPIObject struct {\n\t\truntime.TypeMeta `json:\"\"`\n\t\tMyPlugin runtime.Object `json:\"myPlugin\"`\n\t}\n\n\ttype PluginA struct {\n\t\tAOption string `json:\"aOption\"`\n\t}\n\n// External package:\n\n\ttype MyAPIObject struct {\n\t\truntime.TypeMeta `json:\"\"`\n\t\tMyPlugin runtime.RawExtension `json:\"myPlugin\"`\n\t}\n\n\ttype PluginA struct {\n\t\tAOption string `json:\"aOption\"`\n\t}\n\n// On the wire, the JSON will look something like this:\n\n\t{\n\t\t\"kind\":\"MyAPIObject\",\n\t\t\"apiVersion\":\"v1\",\n\t\t\"myPlugin\": {\n\t\t\t\"kind\":\"PluginA\",\n\t\t\t\"aOption\":\"foo\",\n\t\t},\n\t}\n\nSo what happens? Decode first uses json or yaml to unmarshal the serialized data into your external MyAPIObject. That causes the raw JSON to be stored, but not unpacked. The next step is to copy (using pkg/conversion) into the internal struct. The runtime package's DefaultScheme has conversion functions installed which will unpack the JSON stored in RawExtension, turning it into the correct object type, and storing it in the Object. (TODO: In the case where the object is of an unknown type, a runtime.Unknown object will be created and stored.)",
 				Type:        []string{"object"},
 			},
 		},
@@ -4543,7 +5446,7 @@ func schema_k8sio_apimachinery_pkg_runtime_TypeMeta(ref common.ReferenceCallback
 	return common.OpenAPIDefinition{
 		Schema: spec.Schema{
 			SchemaProps: spec.SchemaProps{
-				Description: "TypeMeta is shared by all top level objects. The proper way to use it is to inline it in your type, like this:\n\n\ttype MyAwesomeAPIObject struct {\n\t     runtime.TypeMeta    `json:\",inline\"`\n\t     ... // other fields\n\t}\n\nfunc (obj *MyAwesomeAPIObject) SetGroupVersionKind(gvk *metav1.GroupVersionKind) { metav1.UpdateTypeMeta(obj,gvk) }; GroupVersionKind() *GroupVersionKind\n\nTypeMeta is provided here for convenience. You may use it directly from this package or define your own with the same fields.",
+				Description: "TypeMeta is shared by all top level objects. The proper way to use it is to inline it in your type, like this:\n\n\ttype MyAwesomeAPIObject struct {\n\t     runtime.TypeMeta    `json:\"\"`\n\t     ... // other fields\n\t}\n\nfunc (obj *MyAwesomeAPIObject) SetGroupVersionKind(gvk *metav1.GroupVersionKind) { metav1.UpdateTypeMeta(obj,gvk) }; GroupVersionKind() *GroupVersionKind\n\nTypeMeta is provided here for convenience. You may use it directly from this package or define your own with the same fields.",
 				Type:        []string{"object"},
 				Properties: map[string]spec.Schema{
 					"apiVersion": {
diff --git a/pkg/lineage/cache.go b/pkg/lineage/cache.go
new file mode 100644
index 0000000000..1110c71d0c
--- /dev/null
+++ b/pkg/lineage/cache.go
@@ -0,0 +1,110 @@
+package lineage
+
+import (
+	"sync"
+	"time"
+
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+)
+
+// ObjectCache holds owner objects fetched during ownership walks, so sibling
+// admissions under the same owner chain share one GET per TTL window.
+//
+// Only successful lookups are stored. A failed lookup leaves the walk without
+// an owner, so the webhook admits the object with no lineage labels, and the
+// object stays unlabeled until its next UPDATE runs the walk again. Secrets,
+// Services and PVCs can go a long time between updates, so a cached failure
+// would outlive the TTL on every object admitted meanwhile.
+//
+// A nil ObjectCache is valid: Get always misses and Set does nothing.
+type ObjectCache struct {
+	ttl   time.Duration
+	mu    sync.RWMutex
+	items map[cacheKey]cacheEntry
+}
+
+type cacheKey struct {
+	apiVersion string
+	kind       string
+	namespace  string
+	name       string
+}
+
+type cacheEntry struct {
+	obj       *unstructured.Unstructured
+	expiresAt time.Time
+}
+
+// NewObjectCache returns nil, a disabled cache, when ttl is not positive.
+func NewObjectCache(ttl time.Duration) *ObjectCache {
+	if ttl <= 0 {
+		return nil
+	}
+	return &ObjectCache{
+		ttl:   ttl,
+		items: make(map[cacheKey]cacheEntry),
+	}
+}
+
+// Get returns the stored pointer, shared with concurrent admissions: callers
+// must DeepCopy before mutating it.
+func (c *ObjectCache) Get(apiVersion, kind, namespace, name string) (*unstructured.Unstructured, bool) {
+	if c == nil {
+		return nil, false
+	}
+	k := cacheKey{apiVersion, kind, namespace, name}
+	c.mu.RLock()
+	entry, ok := c.items[k]
+	c.mu.RUnlock()
+	if !ok || time.Now().After(entry.expiresAt) {
+		return nil, false
+	}
+	return entry.obj, true
+}
+
+func (c *ObjectCache) Set(apiVersion, kind, namespace, name string, obj *unstructured.Unstructured) {
+	if c == nil {
+		return
+	}
+	k := cacheKey{apiVersion, kind, namespace, name}
+	entry := cacheEntry{
+		obj:       obj,
+		expiresAt: time.Now().Add(c.ttl),
+	}
+	c.mu.Lock()
+	c.items[k] = entry
+	if len(c.items) > evictionThreshold {
+		c.evictExpiredSampleLocked(time.Now(), evictionSampleSize)
+	}
+	c.mu.Unlock()
+}
+
+// evictExpiredSampleLocked removes the expired entries among the first n that
+// map iteration yields. Go randomises that order, so repeated calls cover the
+// whole map without a full scan under the write lock. The caller holds c.mu.
+func (c *ObjectCache) evictExpiredSampleLocked(now time.Time, n int) {
+	if n <= 0 {
+		return
+	}
+	i := 0
+	for key, e := range c.items {
+		if now.After(e.expiresAt) {
+			delete(c.items, key)
+		}
+		i++
+		if i >= n {
+			return
+		}
+	}
+}
+
+const (
+	// Nothing is evicted below evictionThreshold entries, and Get does not
+	// drop expired ones, so up to this many owner objects (HelmReleases and
+	// application CRs, values included) stay in memory for the life of the
+	// process, expired or not.
+	evictionThreshold = 4096
+	// evictionSampleSize caps the entries one Set inspects above the
+	// threshold, which bounds the write-lock hold time.
+	evictionSampleSize = 64
+)
diff --git a/pkg/lineage/cache_test.go b/pkg/lineage/cache_test.go
new file mode 100644
index 0000000000..2aea5d10f6
--- /dev/null
+++ b/pkg/lineage/cache_test.go
@@ -0,0 +1,162 @@
+package lineage
+
+import (
+	"strconv"
+	"testing"
+	"time"
+
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+)
+
+func TestObjectCache_NilSafe(t *testing.T) {
+	var c *ObjectCache
+
+	if obj, ok := c.Get("v1", "Pod", "ns", "n"); ok || obj != nil {
+		t.Fatalf("nil cache must always miss, got ok=%v obj=%v", ok, obj)
+	}
+	c.Set("v1", "Pod", "ns", "n", &unstructured.Unstructured{}) // must not panic
+}
+
+func TestObjectCache_DisabledByZeroTTL(t *testing.T) {
+	if got := NewObjectCache(0); got != nil {
+		t.Fatalf("NewObjectCache(0) should return nil to disable caching, got %v", got)
+	}
+	if got := NewObjectCache(-time.Second); got != nil {
+		t.Fatalf("NewObjectCache(<0) should return nil to disable caching, got %v", got)
+	}
+}
+
+func TestObjectCache_HitMiss(t *testing.T) {
+	c := NewObjectCache(time.Minute)
+
+	if _, ok := c.Get("v1", "Pod", "ns", "n"); ok {
+		t.Fatal("expected miss before Set")
+	}
+
+	obj := &unstructured.Unstructured{}
+	obj.SetName("foo")
+	c.Set("v1", "Pod", "ns", "n", obj)
+
+	got, ok := c.Get("v1", "Pod", "ns", "n")
+	if !ok {
+		t.Fatal("expected hit after Set")
+	}
+	if got != obj {
+		t.Fatalf("expected cached object pointer to match, got %v", got)
+	}
+}
+
+func TestObjectCache_Expires(t *testing.T) {
+	c := NewObjectCache(20 * time.Millisecond)
+	c.Set("v1", "Pod", "ns", "n", &unstructured.Unstructured{})
+
+	if _, ok := c.Get("v1", "Pod", "ns", "n"); !ok {
+		t.Fatal("expected hit immediately after Set")
+	}
+
+	time.Sleep(40 * time.Millisecond)
+
+	if _, ok := c.Get("v1", "Pod", "ns", "n"); ok {
+		t.Fatal("expected miss after TTL elapsed")
+	}
+}
+
+func TestObjectCache_DistinctKeys(t *testing.T) {
+	c := NewObjectCache(time.Minute)
+	c.Set("v1", "Pod", "ns", "n", mustU("a"))
+	c.Set("v1", "Pod", "ns-other", "n", mustU("b"))
+	c.Set("v1", "Service", "ns", "n", mustU("c"))
+	c.Set("apps/v1", "Pod", "ns", "n", mustU("d"))
+
+	cases := []struct {
+		apiVersion, kind, namespace, name string
+		wantName                          string
+	}{
+		{"v1", "Pod", "ns", "n", "a"},
+		{"v1", "Pod", "ns-other", "n", "b"},
+		{"v1", "Service", "ns", "n", "c"},
+		{"apps/v1", "Pod", "ns", "n", "d"},
+	}
+	for _, tc := range cases {
+		got, ok := c.Get(tc.apiVersion, tc.kind, tc.namespace, tc.name)
+		if !ok {
+			t.Fatalf("expected hit for %s/%s in %s/%s", tc.apiVersion, tc.kind, tc.namespace, tc.name)
+		}
+		if got.GetName() != tc.wantName {
+			t.Fatalf("expected obj.name=%s, got %s for %s/%s in %s/%s", tc.wantName, got.GetName(), tc.apiVersion, tc.kind, tc.namespace, tc.name)
+		}
+	}
+}
+
+func TestParseWalkMemory(t *testing.T) {
+	st, err := parseWalkMemory(nil)
+	if err != nil || st == nil || st.visited == nil {
+		t.Fatalf("expected fresh state, got st=%v err=%v", st, err)
+	}
+
+	legacy := map[ObjectID]bool{{Name: "x"}: true}
+	st, err = parseWalkMemory([]interface{}{legacy})
+	if err != nil {
+		t.Fatalf("legacy form should accept map[ObjectID]bool, got err=%v", err)
+	}
+	if !st.visited[ObjectID{Name: "x"}] {
+		t.Fatal("legacy visited map should be reused as-is")
+	}
+
+	var nilLegacy map[ObjectID]bool
+	st, err = parseWalkMemory([]interface{}{nilLegacy})
+	if err != nil {
+		t.Fatalf("nil legacy map should be tolerated, got err=%v", err)
+	}
+	if st.visited == nil {
+		t.Fatal("nil legacy map should be replaced with a usable, non-nil map")
+	}
+	st.visited[ObjectID{Name: "z"}] = true // must not panic
+
+	cache := NewObjectCache(time.Minute)
+	original := &walkState{visited: map[ObjectID]bool{{Name: "y"}: true}, cache: cache}
+	st, err = parseWalkMemory([]interface{}{original})
+	if err != nil {
+		t.Fatalf("walkState form should be accepted, got err=%v", err)
+	}
+	if st != original {
+		t.Fatal("walkState should be reused by reference so recursion shares cache")
+	}
+
+	st, err = parseWalkMemory([]interface{}{"oops"})
+	if err == nil {
+		t.Fatal("expected error for unsupported memory type")
+	}
+	if st == nil || st.visited == nil {
+		t.Fatal("even on error, returned state must be usable to avoid nil-map panic in callers")
+	}
+}
+
+func TestObjectCache_EvictionSampleIsBounded(t *testing.T) {
+	c := NewObjectCache(time.Hour)
+
+	for i := 0; i < evictionThreshold+1000; i++ {
+		key := cacheKey{apiVersion: "v1", kind: "Pod", namespace: "ns", name: strconv.Itoa(i)}
+		c.items[key] = cacheEntry{
+			obj:       nil,
+			expiresAt: time.Now().Add(-time.Minute),
+		}
+	}
+	beforeLen := len(c.items)
+
+	c.Set("v1", "Pod", "ns", "trigger", mustU("t"))
+
+	delta := beforeLen + 1 - len(c.items)
+	if delta < 0 {
+		t.Fatalf("expected map to shrink or stay equal after eviction, got delta=%d", delta)
+	}
+	if delta > evictionSampleSize {
+		t.Fatalf("eviction sample is unbounded: removed %d entries in one Set, expected at most %d", delta, evictionSampleSize)
+	}
+}
+
+func mustU(name string) *unstructured.Unstructured {
+	u := &unstructured.Unstructured{}
+	u.SetName(name)
+	return u
+}
diff --git a/pkg/lineage/getobject_test.go b/pkg/lineage/getobject_test.go
new file mode 100644
index 0000000000..9aff0c8615
--- /dev/null
+++ b/pkg/lineage/getobject_test.go
@@ -0,0 +1,117 @@
+package lineage
+
+import (
+	"context"
+	"testing"
+	"time"
+
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	"k8s.io/apimachinery/pkg/api/meta"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	dynamicfake "k8s.io/client-go/dynamic/fake"
+	k8stesting "k8s.io/client-go/testing"
+)
+
+var testHRGVK = schema.GroupVersionKind{Group: "helm.toolkit.fluxcd.io", Version: "v2", Kind: "HelmRelease"}
+
+// flakyMapper fails the first `failures` RESTMapping calls, as discovery does
+// while the aggregated cozystack-api is rolling.
+type flakyMapper struct {
+	meta.RESTMapper
+	failures int
+}
+
+func (m *flakyMapper) RESTMapping(gk schema.GroupKind, versions ...string) (*meta.RESTMapping, error) {
+	if m.failures > 0 {
+		m.failures--
+		return nil, &meta.NoKindMatchError{GroupKind: gk, SearchedVersions: versions}
+	}
+	return m.RESTMapper.RESTMapping(gk, versions...)
+}
+
+// newGetFixture returns a dynamic client holding one HelmRelease, a mapper that
+// knows its kind, and a counter of the GETs that reached the client. A non-nil
+// firstErr is returned by the first GET instead of the object.
+func newGetFixture(t *testing.T, firstErr error) (*dynamicfake.FakeDynamicClient, *meta.DefaultRESTMapper, *int) {
+	t.Helper()
+	hr := &unstructured.Unstructured{}
+	hr.SetGroupVersionKind(testHRGVK)
+	hr.SetNamespace("tenant-demo")
+	hr.SetName("harbor-demo")
+
+	dyn := dynamicfake.NewSimpleDynamicClient(runtime.NewScheme(), hr)
+	gets := 0
+	dyn.PrependReactor("get", "helmreleases", func(k8stesting.Action) (bool, runtime.Object, error) {
+		gets++
+		if gets == 1 && firstErr != nil {
+			return true, nil, firstErr
+		}
+		return false, nil, nil
+	})
+
+	mapper := meta.NewDefaultRESTMapper(nil)
+	mapper.Add(testHRGVK, meta.RESTScopeNamespace)
+	return dyn, mapper, &gets
+}
+
+func getTestHR(dyn *dynamicfake.FakeDynamicClient, mapper meta.RESTMapper, cache *ObjectCache, name string) (*unstructured.Unstructured, error) {
+	return getUnstructuredObject(context.Background(), dyn, mapper, cache, HRAPIVersion, HRKind, "tenant-demo", name)
+}
+
+func TestGetUnstructuredObject_CachesSuccess(t *testing.T) {
+	dyn, mapper, gets := newGetFixture(t, nil)
+	cache := NewObjectCache(time.Minute)
+
+	for i := 0; i < 2; i++ {
+		if _, err := getTestHR(dyn, mapper, cache, "harbor-demo"); err != nil {
+			t.Fatalf("call %d: %v", i, err)
+		}
+	}
+	if *gets != 1 {
+		t.Fatalf("expected the second call to be served from the cache, got %d GETs", *gets)
+	}
+}
+
+func TestGetUnstructuredObject_RetriesAfterMappingFailure(t *testing.T) {
+	dyn, base, gets := newGetFixture(t, nil)
+	mapper := &flakyMapper{RESTMapper: base, failures: 1}
+	cache := NewObjectCache(time.Minute)
+
+	if _, err := getTestHR(dyn, mapper, cache, "harbor-demo"); err == nil {
+		t.Fatal("expected the first call to fail on RESTMapping")
+	}
+	obj, err := getTestHR(dyn, mapper, cache, "harbor-demo")
+	if err != nil {
+		t.Fatalf("a mapping failure must not be cached: %v", err)
+	}
+	if obj.GetName() != "harbor-demo" || *gets != 1 {
+		t.Fatalf("expected the second call to reach the client, got obj=%v GETs=%d", obj, *gets)
+	}
+}
+
+func TestGetUnstructuredObject_RetriesAfterGetError(t *testing.T) {
+	gr := schema.GroupResource{Group: testHRGVK.Group, Resource: "helmreleases"}
+	cases := map[string]error{
+		"timeout":   apierrors.NewTimeoutError("apiserver overloaded", 1),
+		"not found": apierrors.NewNotFound(gr, "harbor-demo"),
+	}
+	for name, first := range cases {
+		t.Run(name, func(t *testing.T) {
+			dyn, mapper, gets := newGetFixture(t, first)
+			cache := NewObjectCache(time.Minute)
+
+			if _, err := getTestHR(dyn, mapper, cache, "harbor-demo"); err == nil {
+				t.Fatal("expected the first GET to fail")
+			}
+			obj, err := getTestHR(dyn, mapper, cache, "harbor-demo")
+			if err != nil {
+				t.Fatalf("a failed GET must not be cached: %v", err)
+			}
+			if obj.GetName() != "harbor-demo" || *gets != 2 {
+				t.Fatalf("expected the second call to reach the client, got obj=%v GETs=%d", obj, *gets)
+			}
+		})
+	}
+}
diff --git a/pkg/lineage/lineage.go b/pkg/lineage/lineage.go
index 94be77b758..e1f050052e 100644
--- a/pkg/lineage/lineage.go
+++ b/pkg/lineage/lineage.go
@@ -35,11 +35,18 @@ type ObjectID struct {
 }
 
 func (o ObjectID) GetUnstructured(ctx context.Context, client dynamic.Interface, mapper meta.RESTMapper) (*unstructured.Unstructured, error) {
-	u, err := getUnstructuredObject(ctx, client, mapper, o.APIVersion, o.Kind, o.Namespace, o.Name)
-	if err != nil {
-		return nil, err
-	}
-	return u, nil
+	return o.GetUnstructuredCached(ctx, client, mapper, nil)
+}
+
+func (o ObjectID) GetUnstructuredCached(ctx context.Context, client dynamic.Interface, mapper meta.RESTMapper, cache *ObjectCache) (*unstructured.Unstructured, error) {
+	return getUnstructuredObject(ctx, client, mapper, cache, o.APIVersion, o.Kind, o.Namespace, o.Name)
+}
+
+// walkState is what WalkOwnershipGraph passes to itself through its variadic
+// memory argument, which also still accepts a bare visited map.
+type walkState struct {
+	visited map[ObjectID]bool
+	cache   *ObjectCache
 }
 
 func WalkOwnershipGraph(
@@ -48,54 +55,35 @@ func WalkOwnershipGraph(
 	mapper meta.RESTMapper,
 	appMapper AppMapper,
 	obj *unstructured.Unstructured,
-	memory ...interface{},
+	memory ...any,
 ) (out []ObjectID) {
 
 	id := ObjectID{APIVersion: obj.GetAPIVersion(), Kind: obj.GetKind(), Namespace: obj.GetNamespace(), Name: obj.GetName()}
 	out = []ObjectID{}
 	l := log.FromContext(ctx)
 
-	l.Info("processing object", "apiVersion", obj.GetAPIVersion(), "kind", obj.GetKind(), "name", obj.GetName())
-	var visited map[ObjectID]bool
-	var ok bool
-	if len(memory) == 1 {
-		visited, ok = memory[0].(map[ObjectID]bool)
-		if !ok {
-			l.Error(
-				fmt.Errorf("invalid argument"), "could not parse visited map in WalkOwnershipGraph call",
-				"received", memory[0], "expected", "map[ObjectID]bool",
-			)
-			return out
-		}
-	}
-
-	if len(memory) == 0 {
-		visited = make(map[ObjectID]bool)
-	}
-
-	if len(memory) != 0 && len(memory) != 1 {
-		l.Error(
-			fmt.Errorf("invalid argument count"), "could not parse variadic arguments to WalkOwnershipGraph",
-			"args passed", len(memory)+5, "expected args", "4|5",
-		)
+	l.V(1).Info("processing object", "apiVersion", obj.GetAPIVersion(), "kind", obj.GetKind(), "name", obj.GetName())
+	state, err := parseWalkMemory(memory)
+	if err != nil {
+		l.Error(err, "invalid WalkOwnershipGraph variadic arguments", "variadic_args_passed", len(memory), "expected", "0 or 1 (map[ObjectID]bool | *walkState)")
 		return out
 	}
 
-	if visited[id] {
+	if state.visited[id] {
 		return out
 	}
 
-	visited[id] = true
+	state.visited[id] = true
 
 	ownerRefs := obj.GetOwnerReferences()
 	for _, owner := range ownerRefs {
-		ownerObj, err := getUnstructuredObject(ctx, client, mapper, owner.APIVersion, owner.Kind, obj.GetNamespace(), owner.Name)
+		ownerObj, err := getUnstructuredObject(ctx, client, mapper, state.cache, owner.APIVersion, owner.Kind, obj.GetNamespace(), owner.Name)
 		if err != nil {
 			fmt.Fprintf(os.Stderr, "Could not fetch owner %s/%s (%s): %v\n", obj.GetNamespace(), owner.Name, owner.Kind, err)
 			continue
 		}
 
-		out = append(out, WalkOwnershipGraph(ctx, client, mapper, appMapper, ownerObj, visited)...)
+		out = append(out, WalkOwnershipGraph(ctx, client, mapper, appMapper, ownerObj, state)...)
 	}
 
 	// if object has owners, it couldn't be owned directly by the custom app
@@ -119,7 +107,7 @@ func WalkOwnershipGraph(
 			l.Error(err, "failed to map HelmRelease to app")
 			break
 		}
-		ownerObj, err := getUnstructuredObject(ctx, client, mapper, a, k, obj.GetNamespace(), strings.TrimPrefix(obj.GetName(), p))
+		ownerObj, err := getUnstructuredObject(ctx, client, mapper, state.cache, a, k, obj.GetNamespace(), strings.TrimPrefix(obj.GetName(), p))
 		if err != nil {
 			l.Error(err, "couldn't get unstructured object", "APIVersion", a, "Kind", k, "Name", strings.TrimPrefix(obj.GetName(), p))
 			break
@@ -141,21 +129,70 @@ func WalkOwnershipGraph(
 	if !ok {
 		return
 	}
-	ownerObj, err := getUnstructuredObject(ctx, client, mapper, HRAPIVersion, HRKind, obj.GetNamespace(), name)
+	ownerObj, err := getUnstructuredObject(ctx, client, mapper, state.cache, HRAPIVersion, HRKind, obj.GetNamespace(), name)
 	if err != nil {
 		return
 	}
-	out = append(out, WalkOwnershipGraph(ctx, client, mapper, appMapper, ownerObj, visited)...)
+	out = append(out, WalkOwnershipGraph(ctx, client, mapper, appMapper, ownerObj, state)...)
 
 	return
 }
 
+func parseWalkMemory(memory []interface{}) (*walkState, error) {
+	switch len(memory) {
+	case 0:
+		return &walkState{visited: make(map[ObjectID]bool)}, nil
+	case 1:
+		switch m := memory[0].(type) {
+		case *walkState:
+			if m == nil {
+				return &walkState{visited: make(map[ObjectID]bool)}, nil
+			}
+			if m.visited == nil {
+				m.visited = make(map[ObjectID]bool)
+			}
+			return m, nil
+		case map[ObjectID]bool:
+			if m == nil {
+				m = make(map[ObjectID]bool)
+			}
+			return &walkState{visited: m}, nil
+		default:
+			return &walkState{visited: make(map[ObjectID]bool)}, fmt.Errorf("invalid argument: received %T, expected map[ObjectID]bool or *walkState", memory[0])
+		}
+	default:
+		return &walkState{visited: make(map[ObjectID]bool)}, fmt.Errorf("invalid argument count: %d", len(memory))
+	}
+}
+
+// WalkOwnershipGraphWithCache is WalkOwnershipGraph with every owner GET going
+// through cache, which may be nil.
+func WalkOwnershipGraphWithCache(
+	ctx context.Context,
+	client dynamic.Interface,
+	mapper meta.RESTMapper,
+	appMapper AppMapper,
+	cache *ObjectCache,
+	obj *unstructured.Unstructured,
+) []ObjectID {
+	state := &walkState{
+		visited: make(map[ObjectID]bool),
+		cache:   cache,
+	}
+	return WalkOwnershipGraph(ctx, client, mapper, appMapper, obj, state)
+}
+
 func getUnstructuredObject(
 	ctx context.Context,
 	client dynamic.Interface,
 	mapper meta.RESTMapper,
+	cache *ObjectCache,
 	apiVersion, kind, namespace, name string,
 ) (*unstructured.Unstructured, error) {
+	if cached, ok := cache.Get(apiVersion, kind, namespace, name); ok {
+		return cached, nil
+	}
+
 	l := log.FromContext(ctx)
 	gv, err := schema.ParseGroupVersion(apiVersion)
 	if err != nil {
@@ -186,6 +223,7 @@ func getUnstructuredObject(
 	if err != nil {
 		return nil, err
 	}
+	cache.Set(apiVersion, kind, namespace, name, ownerObj)
 	return ownerObj, nil
 }
 
diff --git a/pkg/ovnstatus/ovncluster.go b/pkg/ovnstatus/ovncluster.go
index 9cab7d826c..2f8a476e59 100644
--- a/pkg/ovnstatus/ovncluster.go
+++ b/pkg/ovnstatus/ovncluster.go
@@ -2,6 +2,7 @@ package ovnstatus
 
 import (
 	"fmt"
+	"slices"
 	"sort"
 	"strings"
 )
@@ -143,13 +144,7 @@ func AnalyzeConsensus(views []MemberView) ConsensusResult {
 			cr.MajorityMembers = append(cr.MajorityMembers, v.FromSID)
 		}
 		for _, v := range views {
-			found := false
-			for _, m := range cr.MajorityMembers {
-				if m == v.FromSID {
-					found = true
-					break
-				}
-			}
+			found := slices.Contains(cr.MajorityMembers, v.FromSID)
 			if !found {
 				cr.MinorityMembers = append(cr.MinorityMembers, v.FromSID)
 			}
@@ -510,13 +505,6 @@ func AnalyzeConsensusWithIPHints(views []MemberView, hints *Hints) ExtendedConse
 	}
 }
 
-func min(a, b int) int {
-	if a < b {
-		return a
-	}
-	return b
-}
-
 // PrettyString renders a human-friendly multi-line summary of ExtendedConsensusResult.
 // It combines consensus status with IP/SID hints.
 func (res ExtendedConsensusResult) PrettyString() string {
diff --git a/pkg/ovnstatus/ovnstatus.go b/pkg/ovnstatus/ovnstatus.go
index b5fdf0e096..e6d682e51e 100644
--- a/pkg/ovnstatus/ovnstatus.go
+++ b/pkg/ovnstatus/ovnstatus.go
@@ -334,7 +334,7 @@ func parseServersFromTextWithThreshold(text string, freshThreshold time.Duration
 
 	cs := ClusterStatus{}
 	section := extractServersBlock(text)
-	for _, ln := range strings.Split(section, "\n") {
+	for ln := range strings.SplitSeq(section, "\n") {
 		ln = strings.TrimRight(ln, "\r")
 		if ln == "" {
 			continue
diff --git a/pkg/registry/apps/application/external_tls_policy_test.go b/pkg/registry/apps/application/external_tls_policy_test.go
new file mode 100644
index 0000000000..1cbc808fcb
--- /dev/null
+++ b/pkg/registry/apps/application/external_tls_policy_test.go
@@ -0,0 +1,290 @@
+/*
+Copyright 2026 The Cozystack Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package application
+
+import (
+	"context"
+	"os"
+	"slices"
+	"strings"
+	"testing"
+
+	admissionregistrationv1 "k8s.io/api/admissionregistration/v1"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apiserver/pkg/admission"
+	plugincel "k8s.io/apiserver/pkg/admission/plugin/cel"
+	"k8s.io/apiserver/pkg/admission/plugin/policy/validating"
+	"k8s.io/apiserver/pkg/admission/plugin/webhook/matchconditions"
+	celconfig "k8s.io/apiserver/pkg/apis/cel"
+	"k8s.io/apiserver/pkg/authentication/user"
+	"k8s.io/apiserver/pkg/cel/environment"
+	"sigs.k8s.io/yaml"
+)
+
+// The policy is read from the chart that ships it, so the test exercises the
+// expressions a cluster actually receives rather than a copy of them.
+const externalTLSPolicyPath = "../../../../packages/system/cozystack-basics/templates/database-external-tls-policy.yaml"
+
+// loadExternalTLSPolicy returns the policy and its binding from the chart
+// template. The template's only directives are the capability guard lines
+// around the manifests; any other directive would mean the test is no longer
+// looking at what renders, so it fails instead of guessing.
+func loadExternalTLSPolicy(t *testing.T) (*admissionregistrationv1.ValidatingAdmissionPolicy, *admissionregistrationv1.ValidatingAdmissionPolicyBinding) {
+	t.Helper()
+
+	raw, err := os.ReadFile(externalTLSPolicyPath)
+	if err != nil {
+		t.Fatalf("read policy template: %v", err)
+	}
+	var kept []string
+	for line := range strings.SplitSeq(string(raw), "\n") {
+		trimmed := strings.TrimSpace(line)
+		if strings.HasPrefix(trimmed, "{{") && strings.HasSuffix(trimmed, "}}") {
+			continue
+		}
+		if strings.Contains(line, "{{") {
+			t.Fatalf("policy template carries an inline directive the test cannot render: %q", line)
+		}
+		kept = append(kept, line)
+	}
+
+	var policy *admissionregistrationv1.ValidatingAdmissionPolicy
+	var binding *admissionregistrationv1.ValidatingAdmissionPolicyBinding
+	for doc := range strings.SplitSeq(strings.Join(kept, "\n"), "\n---\n") {
+		var meta struct {
+			Kind string `json:"kind"`
+		}
+		if err := yaml.Unmarshal([]byte(doc), &meta); err != nil {
+			t.Fatalf("parse document: %v", err)
+		}
+		switch meta.Kind {
+		case "ValidatingAdmissionPolicy":
+			policy = &admissionregistrationv1.ValidatingAdmissionPolicy{}
+			if err := yaml.UnmarshalStrict([]byte(doc), policy); err != nil {
+				t.Fatalf("parse policy: %v", err)
+			}
+		case "ValidatingAdmissionPolicyBinding":
+			binding = &admissionregistrationv1.ValidatingAdmissionPolicyBinding{}
+			if err := yaml.UnmarshalStrict([]byte(doc), binding); err != nil {
+				t.Fatalf("parse binding: %v", err)
+			}
+		}
+	}
+	if policy == nil || binding == nil {
+		t.Fatal("policy template must carry one ValidatingAdmissionPolicy and one binding")
+	}
+	return policy, binding
+}
+
+// compileExternalTLSPolicy mirrors compilePolicy in
+// k8s.io/apiserver/pkg/admission/plugin/policy/validating, which is
+// unexported: the same composition environment, the same variable, match
+// condition, validation and message compilers.
+func compileExternalTLSPolicy(t *testing.T, policy *admissionregistrationv1.ValidatingAdmissionPolicy) validating.Validator {
+	t.Helper()
+
+	compiler, err := plugincel.NewCompositedCompiler(environment.MustBaseEnvSet(environment.DefaultCompatibilityVersion()))
+	if err != nil {
+		t.Fatalf("composited compiler: %v", err)
+	}
+	vars := plugincel.OptionalVariableDeclarations{HasAuthorizer: true}
+
+	var named []plugincel.NamedExpressionAccessor
+	for _, v := range policy.Spec.Variables {
+		named = append(named, &validating.Variable{Name: v.Name, Expression: v.Expression})
+	}
+	compiler.CompileAndStoreVariables(named, vars, environment.StoredExpressions)
+
+	var matcher matchconditions.Matcher
+	if len(policy.Spec.MatchConditions) > 0 {
+		var conds []plugincel.ExpressionAccessor
+		for i := range policy.Spec.MatchConditions {
+			conds = append(conds, (*matchconditions.MatchCondition)(&policy.Spec.MatchConditions[i]))
+		}
+		matcher = matchconditions.NewMatcher(compiler.CompileCondition(conds, vars, environment.StoredExpressions), policy.Spec.FailurePolicy, "policy", "validate", policy.Name)
+	}
+
+	validations := make([]plugincel.ExpressionAccessor, len(policy.Spec.Validations))
+	messages := make([]plugincel.ExpressionAccessor, len(policy.Spec.Validations))
+	for i, v := range policy.Spec.Validations {
+		validations[i] = &validating.ValidationCondition{Expression: v.Expression, Message: v.Message, Reason: v.Reason}
+		if v.MessageExpression != "" {
+			messages[i] = &validating.MessageExpressionCondition{MessageExpression: v.MessageExpression}
+		}
+	}
+	validationFilter := compiler.CompileCondition(validations, vars, environment.StoredExpressions)
+	messageFilter := compiler.CompileCondition(messages, plugincel.OptionalVariableDeclarations{}, environment.StoredExpressions)
+	for _, errs := range [][]error{validationFilter.CompilationErrors(), messageFilter.CompilationErrors()} {
+		for _, err := range errs {
+			t.Errorf("policy expression does not compile: %v", err)
+		}
+	}
+	return validating.NewValidator(validationFilter, matcher, compiler.CompileCondition(nil, vars, environment.StoredExpressions), messageFilter, policy.Spec.FailurePolicy, nil)
+}
+
+func TestDatabaseExternalTLSPolicy_Binding(t *testing.T) {
+	policy, binding := loadExternalTLSPolicy(t)
+
+	if binding.Spec.PolicyName != policy.Name {
+		t.Errorf("binding names policy %q, want %q", binding.Spec.PolicyName, policy.Name)
+	}
+	if !slices.Equal(binding.Spec.ValidationActions, []admissionregistrationv1.ValidationAction{admissionregistrationv1.Deny}) {
+		t.Errorf("binding validationActions = %v, want [Deny]", binding.Spec.ValidationActions)
+	}
+	if policy.Spec.FailurePolicy == nil || *policy.Spec.FailurePolicy != admissionregistrationv1.Fail {
+		t.Errorf("failurePolicy must be Fail")
+	}
+
+	rules := policy.Spec.MatchConstraints.ResourceRules
+	if len(rules) != 1 {
+		t.Fatalf("want one resource rule, got %d", len(rules))
+	}
+	rule := rules[0]
+	if !slices.Equal(rule.APIGroups, []string{"apps.cozystack.io"}) {
+		t.Errorf("apiGroups = %v", rule.APIGroups)
+	}
+	// Both operations matter: without UPDATE an existing release could be
+	// edited into a plaintext external endpoint after a compliant create.
+	ops := []admissionregistrationv1.OperationType{admissionregistrationv1.Create, admissionregistrationv1.Update}
+	if !slices.Equal(rule.Operations, ops) {
+		t.Errorf("operations = %v, want %v", rule.Operations, ops)
+	}
+	if !slices.Equal(rule.Resources, []string{"redises"}) {
+		t.Errorf("resources = %v, want [redises]", rule.Resources)
+	}
+}
+
+func TestDatabaseExternalTLSPolicy_Decisions(t *testing.T) {
+	policy, _ := loadExternalTLSPolicy(t)
+	validator := compileExternalTLSPolicy(t, policy)
+
+	tlsOn := map[string]any{"enabled": true}
+	tlsOff := map[string]any{"enabled": false}
+
+	type spec = map[string]any
+	cases := []struct {
+		name   string
+		old    spec     // nil means CREATE
+		new    spec     // nil omits spec from the object
+		groups []string // of the requesting user; none means a tenant user
+		denied bool
+		// turnsTLSOn marks a denied edit that switches TLS on: withdrawing
+		// external access does not help there, because the operator refuses
+		// the change on a running instance regardless.
+		turnsTLSOn bool
+	}{
+		{name: "redis external with TLS on", new: spec{"external": true, "tls": tlsOn}},
+		{name: "redis with no spec fields", new: spec{}},
+		{name: "redis with no spec at all", new: nil},
+		{name: "redis internal without TLS", new: spec{"external": false}},
+		{name: "redis internal with TLS off", new: spec{"tls": tlsOff}},
+		{name: "redis external with tls unset", new: spec{"external": true}, denied: true},
+		{name: "redis external with an empty tls map", new: spec{"external": true, "tls": map[string]any{}}, denied: true},
+		{name: "redis external with a null tls map", new: spec{"external": true, "tls": nil}, denied: true},
+		{name: "redis external with TLS explicitly off", new: spec{"external": true, "tls": tlsOff}, denied: true},
+		// A spec's tls.enabled is a request, not the instance's state: the API
+		// accepts a flip that the operator's RedisFailover schema refuses. So an
+		// update may never turn external access on, whatever tls.enabled says.
+		{name: "redis update exposing a release without TLS", old: spec{}, new: spec{"external": true}, denied: true},
+		{name: "redis update exposing a release while turning TLS on", old: spec{}, new: spec{"external": true, "tls": tlsOn}, denied: true},
+		// The second step of: flip tls.enabled on an internal plaintext
+		// instance (accepted, refused by the operator), expose it, then remove
+		// tls.enabled again. Refusing this step is what closes the sequence.
+		{name: "redis update exposing a release whose spec claims TLS", old: spec{"tls": tlsOn}, new: spec{"external": true, "tls": tlsOn}, denied: true},
+		{name: "redis update restoring external access after withdrawing it", old: spec{"external": false, "tls": tlsOn}, new: spec{"external": true, "tls": tlsOn}, denied: true},
+		// Releases created before the policy keep working: an edit to an
+		// instance that is already external is not a new exposure.
+		{name: "redis update of a release already plaintext and external", old: spec{"external": true}, new: spec{"external": true, "replicas": int64(3)}},
+		{name: "redis update of an external release with TLS on", old: spec{"external": true, "tls": tlsOn}, new: spec{"external": true, "tls": tlsOn, "replicas": int64(3)}},
+		// Until the first reconcile creates the RedisFailover, nothing but this
+		// policy stops TLS from being dropped from a release admitted as
+		// external with TLS, so tls.enabled is frozen while external stays on.
+		{name: "redis update dropping TLS from an external release", old: spec{"external": true, "tls": tlsOn}, new: spec{"external": true}, denied: true},
+		{name: "redis update turning TLS off on an external release", old: spec{"external": true, "tls": tlsOn}, new: spec{"external": true, "tls": tlsOff}, denied: true},
+		{name: "redis update turning TLS on for a plaintext external release", old: spec{"external": true}, new: spec{"external": true, "tls": tlsOn}, denied: true, turnsTLSOn: true},
+		{name: "redis update spelling out TLS off on a plaintext external release", old: spec{"external": true}, new: spec{"external": true, "tls": tlsOff}},
+		// Withdrawing external access releases the freeze, which is how a tenant
+		// unblocks an instance whose tls.enabled was flipped before the policy.
+		{name: "redis update withdrawing external access", old: spec{"external": true}, new: spec{"external": false}},
+		{name: "redis update withdrawing external access and dropping TLS", old: spec{"external": true, "tls": tlsOn}, new: spec{"external": false}},
+		{name: "cluster admin dropping TLS from an external release", old: spec{"external": true, "tls": tlsOn}, new: spec{"external": true}, groups: []string{"system:masters"}},
+		{name: "cozy-system service account dropping TLS from an external release", old: spec{"external": true, "tls": tlsOn}, new: spec{"external": true}, groups: []string{"system:serviceaccounts:cozy-system"}},
+		// The trusted-caller exemption belongs to the freeze alone: an
+		// administrator cannot create or expose a plaintext Redis either.
+		{name: "cluster admin creating an external release without TLS", new: spec{"external": true}, groups: []string{"system:masters"}, denied: true},
+		{name: "cluster admin exposing an existing release", old: spec{"tls": tlsOn}, new: spec{"external": true, "tls": tlsOn}, groups: []string{"system:masters"}, denied: true},
+		{name: "tenant namespace service account dropping TLS from an external release", old: spec{"external": true, "tls": tlsOn}, new: spec{"external": true}, groups: []string{"system:serviceaccounts:tenant-test"}, denied: true},
+	}
+
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			gvk := schema.GroupVersionKind{Group: "apps.cozystack.io", Version: "v1alpha1", Kind: "Redis"}
+			gvr := schema.GroupVersionResource{Group: "apps.cozystack.io", Version: "v1alpha1", Resource: "redises"}
+			obj := func(s spec) *unstructured.Unstructured {
+				u := &unstructured.Unstructured{Object: map[string]any{
+					"apiVersion": gvk.GroupVersion().String(),
+					"kind":       gvk.Kind,
+					"metadata":   map[string]any{"name": "db", "namespace": "tenant-test"},
+				}}
+				if s != nil {
+					u.Object["spec"] = runtime.DeepCopyJSON(s)
+				}
+				return u
+			}
+
+			var oldObj runtime.Object
+			op := admission.Create
+			if tc.old != nil {
+				oldObj = obj(tc.old)
+				op = admission.Update
+			}
+			newObj := obj(tc.new)
+			attrs := admission.NewAttributesRecord(newObj, oldObj, gvk, "tenant-test", "db", gvr, "", op, nil, false, &user.DefaultInfo{Name: "tenant-user", Groups: tc.groups})
+			versioned := &admission.VersionedAttributes{Attributes: attrs, VersionedObject: admission.NewLazyObject(newObj), VersionedOldObject: admission.NewLazyObject(oldObj), VersionedKind: gvk}
+
+			result := validator.Validate(context.Background(), gvr, versioned, nil, nil, celconfig.RuntimeCELCostBudget, nil)
+			var denials []validating.PolicyDecision
+			for _, d := range result.Decisions {
+				if d.Evaluation == validating.EvalError {
+					t.Fatalf("evaluation error: %s", d.Message)
+				}
+				if d.Action == validating.ActionDeny {
+					denials = append(denials, d)
+				}
+			}
+			if got := len(denials) > 0; got != tc.denied {
+				t.Fatalf("denied = %v, want %v (decisions %+v)", got, tc.denied, result.Decisions)
+			}
+			// On an existing instance TLS cannot change, so the UPDATE messages
+			// must not offer turning it on.
+			for _, d := range denials {
+				want := "Set tls.enabled: true"
+				if op == admission.Update {
+					want = "create a new instance with tls.enabled: true"
+				}
+				if !strings.Contains(d.Message, "Redis db") || !strings.Contains(d.Message, want) {
+					t.Errorf("denial message must name the release and a remedy that works (%q), got %q", want, d.Message)
+				}
+				if tc.turnsTLSOn && strings.Contains(d.Message, "Set external: false") {
+					t.Errorf("turning TLS on must not be offered the external: false remedy, got %q", d.Message)
+				}
+			}
+		})
+	}
+}
diff --git a/pkg/registry/apps/application/quota.go b/pkg/registry/apps/application/quota.go
new file mode 100644
index 0000000000..eb6f206224
--- /dev/null
+++ b/pkg/registry/apps/application/quota.go
@@ -0,0 +1,432 @@
+/*
+Copyright 2026 The Cozystack Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package application
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"sort"
+	"strings"
+
+	helmv2 "github.com/fluxcd/helm-controller/api/v2"
+	corev1 "k8s.io/api/core/v1"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	"k8s.io/apimachinery/pkg/api/resource"
+	"k8s.io/apimachinery/pkg/labels"
+	"k8s.io/apimachinery/pkg/util/validation/field"
+	"k8s.io/klog/v2"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+
+	appsv1alpha1 "github.com/cozystack/cozystack/pkg/apis/apps/v1alpha1"
+	"github.com/cozystack/cozystack/pkg/apis/apps/validation"
+)
+
+// rootTenantNamespace is the namespace of the cluster's root tenant. The root
+// tenant is special-cased throughout the tenant hierarchy: it is its own parent
+// and its HelmRelease lives in its own namespace.
+const rootTenantNamespace = "tenant-root"
+
+// resourceQuotasField is the tenant values key holding the declared quota, kept
+// in sync with packages/apps/tenant/values.yaml (`resourceQuotas`).
+const resourceQuotasField = "resourceQuotas"
+
+// tenantValues is the minimal projection of a tenant's Helm values needed to
+// reason about hierarchical quotas. Only resourceQuotas is decoded; everything
+// else in the values blob is ignored.
+type tenantValues struct {
+	ResourceQuotas map[string]resource.Quantity `json:"resourceQuotas"`
+}
+
+// parseDeclaredQuotas extracts spec.resourceQuotas from a tenant values JSON
+// blob. The quota keys are kept verbatim as the operator writes them (e.g.
+// "cpu", "memory", "requests.storage", "count/services") — the same vocabulary
+// the parent and every child use — so they can be compared directly. The
+// `cozy-lib.resources.flatten` expansion into limits.*/requests.* is a
+// downstream rendering concern of the tenant chart and is intentionally not
+// applied here.
+func parseDeclaredQuotas(raw []byte) (map[string]resource.Quantity, error) {
+	if len(raw) == 0 {
+		return nil, nil
+	}
+	var values tenantValues
+	if err := json.Unmarshal(raw, &values); err != nil {
+		return nil, fmt.Errorf("decode tenant values: %w", err)
+	}
+	return values.ResourceQuotas, nil
+}
+
+// declaredQuotasFromHelmRelease reads resourceQuotas from a tenant HelmRelease's
+// values. A tenant Application is stored as a HelmRelease whose Spec.Values is
+// the verbatim Application spec (see ConvertApplicationToHelmRelease).
+func declaredQuotasFromHelmRelease(hr *helmv2.HelmRelease) (map[string]resource.Quantity, error) {
+	if hr.Spec.Values == nil {
+		return nil, nil
+	}
+	return parseDeclaredQuotas(hr.Spec.Values.Raw)
+}
+
+// parentTenantHelmReleaseRef maps the namespace owned by a tenant to the
+// name/namespace of that tenant's own HelmRelease. It is the inverse of
+// REST.computeTenantNamespace: a tenant created as Application "<name>" in
+// namespace C owns the workload namespace computeTenantNamespace(C, name), so
+// given the owned namespace we recover (release name, release namespace).
+//
+// Examples (prefix "tenant-"):
+//
+//	"tenant-root"        -> ("tenant-root", "tenant-root")  // root is its own parent
+//	"tenant-foo"         -> ("tenant-foo",  "tenant-root")  // foo lives in root
+//	"tenant-foo-bar"     -> ("tenant-bar",  "tenant-foo")   // bar lives in foo
+//	"tenant-foo-bar-baz" -> ("tenant-baz",  "tenant-foo-bar")
+func parentTenantHelmReleaseRef(ownedNamespace, prefix string) (name, namespace string, ok bool) {
+	if ownedNamespace == rootTenantNamespace {
+		return prefix + "root", rootTenantNamespace, true
+	}
+	if !strings.HasPrefix(ownedNamespace, prefix) {
+		return "", "", false
+	}
+	segments := strings.Split(ownedNamespace, "-")
+	last := segments[len(segments)-1]
+	// Exactly "tenant-<name>" (two segments) is a direct child of root, so its
+	// HelmRelease lives in the root namespace. Deeper names live in the
+	// namespace formed by stripping the trailing "-<name>".
+	if len(segments) == 2 {
+		return prefix + last, rootTenantNamespace, true
+	}
+	return prefix + last, strings.Join(segments[:len(segments)-1], "-"), true
+}
+
+// parentTenantDeclaredQuotas returns the declared resourceQuotas of the tenant
+// that owns childNamespace (the namespace a child Tenant CR is created in). An
+// empty result means the parent declares no quota and therefore does not
+// directly constrain the child at declaration time.
+func (r *REST) parentTenantDeclaredQuotas(ctx context.Context, childNamespace string) (map[string]resource.Quantity, error) {
+	hrName, hrNamespace, ok := parentTenantHelmReleaseRef(childNamespace, r.releaseConfig.Prefix)
+	if !ok {
+		return nil, nil
+	}
+	hr := &helmv2.HelmRelease{}
+	if err := r.c.Get(ctx, client.ObjectKey{Namespace: hrNamespace, Name: hrName}, hr); err != nil {
+		if apierrors.IsNotFound(err) {
+			return nil, nil
+		}
+		return nil, err
+	}
+	return declaredQuotasFromHelmRelease(hr)
+}
+
+// siblingDeclaredQuotas sums, per resource, the declared quotas of every tenant
+// in namespace that already carved a slice out of the shared parent budget,
+// excluding the tenant named excludeName (so updates do not count against
+// themselves). These are the direct children of the same parent.
+func (r *REST) siblingDeclaredQuotas(ctx context.Context, namespace, excludeName string) (map[string]resource.Quantity, error) {
+	list := &helmv2.HelmReleaseList{}
+	selector := labels.SelectorFromSet(labels.Set{
+		ApplicationKindLabel:  r.kindName,
+		ApplicationGroupLabel: r.gvk.Group,
+	})
+	if err := r.c.List(ctx, list, &client.ListOptions{Namespace: namespace, LabelSelector: selector}); err != nil {
+		return nil, err
+	}
+
+	sum := map[string]resource.Quantity{}
+	for i := range list.Items {
+		hr := &list.Items[i]
+		name := strings.TrimPrefix(hr.Name, r.releaseConfig.Prefix)
+		if name == excludeName {
+			continue
+		}
+		quotas, err := declaredQuotasFromHelmRelease(hr)
+		if err != nil {
+			// A malformed sibling must not block an unrelated tenant write; skip
+			// it (the controller surfaces such tenants separately).
+			klog.Warningf("skipping sibling tenant %s/%s with unparseable quotas: %v", hr.Namespace, hr.Name, err)
+			continue
+		}
+		addQuotas(sum, quotas)
+	}
+	return sum, nil
+}
+
+// validateTenantResourceQuotas enforces hierarchical quota allocation for Tenant
+// Applications at declaration time. A child tenant's declared quota is "carved
+// out" of its parent's remaining quota and may not exceed it: for every resource
+// the parent bounds,
+//
+//	child[r] <= parent[r] - sum(other children already carved out)[r]
+//
+// A child that declares no quota of its own is always allowed here — it shares
+// the parent's pool rather than reserving a fixed slice (runtime enforcement of
+// that shared pool is the tenant quota controller's job). A parent that declares
+// no quota does not constrain its children at this layer.
+//
+// This is the deterministic, declaration-time gate against quota escalation
+// ("a tenant must not, via quota, claim more space than it was allocated"). It
+// runs inside the aggregated apiserver where Tenant writes are served, with full
+// client access to the parent and sibling HelmReleases.
+func (r *REST) validateTenantResourceQuotas(ctx context.Context, app *appsv1alpha1.Application) field.ErrorList {
+	allErrs := field.ErrorList{}
+	if r.kindName != validation.TenantKind {
+		return allErrs
+	}
+	fldPath := field.NewPath("spec").Child(resourceQuotasField)
+
+	var raw []byte
+	if app.Spec != nil {
+		raw = app.Spec.Raw
+	}
+	childQuota, err := parseDeclaredQuotas(raw)
+	if err != nil {
+		return append(allErrs, field.Invalid(fldPath, "", err.Error()))
+	}
+	if len(childQuota) == 0 {
+		// Unbounded child: shares the parent pool, allowed at declaration time.
+		return allErrs
+	}
+
+	parentQuota, err := r.parentTenantDeclaredQuotas(ctx, app.Namespace)
+	if err != nil {
+		return append(allErrs, field.InternalError(fldPath, err))
+	}
+	if len(parentQuota) == 0 {
+		// Parent declares no quota: it does not directly constrain the child.
+		return allErrs
+	}
+
+	siblings, err := r.siblingDeclaredQuotas(ctx, app.Namespace, app.Name)
+	if err != nil {
+		return append(allErrs, field.InternalError(fldPath, err))
+	}
+
+	// Current usage of the parent's pool (its own namespace plus its unbounded
+	// descendants). Counting it keeps the invariant — a sub-tree may never, via
+	// quota, be promised more than its root owns — holding at declaration time:
+	// without it a parent already using most of its budget could still carve a
+	// full-budget child and the two would collectively exceed the root. This is
+	// best-effort (a snapshot; concurrent writes can briefly overshoot and
+	// already-running pods are never evicted) — the tenant-quota controller is
+	// the runtime backstop.
+	childNamespace := r.computeTenantNamespace(app.Namespace, app.Name)
+	poolUsed, err := r.parentPoolUsage(ctx, app.Namespace, childNamespace)
+	if err != nil {
+		return append(allErrs, field.InternalError(fldPath, err))
+	}
+
+	for _, res := range sortedQuotaKeys(parentQuota) {
+		want, requested := childQuota[res]
+		if !requested {
+			continue
+		}
+		parentLimit := parentQuota[res]
+		allocated := siblings[res] // zero value when no sibling bounds this resource
+		used := poolUsed[renderedLimitKey(res)]
+		remaining := parentLimit.DeepCopy()
+		remaining.Sub(allocated)
+		remaining.Sub(used)
+		if want.Cmp(remaining) > 0 {
+			allErrs = append(allErrs, field.Forbidden(fldPath.Key(res),
+				fmt.Sprintf("requested %s exceeds the parent tenant's remaining %q quota of %s (parent allows %s, %s already allocated to sibling tenants, %s currently in use by the parent pool); a child tenant may not be granted more quota than its parent has left",
+					want.String(), res, remaining.String(), parentLimit.String(), allocated.String(), used.String())))
+		}
+	}
+	return allErrs
+}
+
+// addQuotas adds src into dst in place, per resource key.
+func addQuotas(dst, src map[string]resource.Quantity) {
+	for k, v := range src {
+		if cur, ok := dst[k]; ok {
+			cur.Add(v)
+			dst[k] = cur
+		} else {
+			dst[k] = v.DeepCopy()
+		}
+	}
+}
+
+// sortedQuotaKeys returns the resource keys of a quota map in a deterministic
+// order so that admission error messages are stable.
+func sortedQuotaKeys(q map[string]resource.Quantity) []string {
+	keys := make([]string, 0, len(q))
+	for k := range q {
+		keys = append(keys, k)
+	}
+	sort.Strings(keys)
+	return keys
+}
+
+// rawQuotaKeys are the shorthand resourceQuotas keys that the tenant chart emits
+// verbatim as ResourceQuota hard keys (no limits./requests. prefix). Kept in
+// sync with cozy-lib.resources.flattenResource ($rawQuotaKeys).
+var rawQuotaKeys = map[string]struct{}{
+	"pods":                   {},
+	"services":               {},
+	"services.loadbalancers": {},
+	"services.nodeports":     {},
+	"services.clusterip":     {},
+	"configmaps":             {},
+	"secrets":                {},
+	"persistentvolumeclaims": {},
+	"replicationcontrollers": {},
+	"resourcequotas":         {},
+}
+
+// renderedLimitKey maps a shorthand resourceQuotas key (the vocabulary admission
+// works in) to the rendered ResourceQuota key that carries its limit-side
+// budget, mirroring cozy-lib.resources.flatten. The mapping is allocation-ratio
+// independent: ratios only scale the requests.* side that flatten derives from
+// the same shorthand value, so the limit-side key always holds the operator's
+// declared amount. This lets admission read a tenant's current usage from its
+// rendered ResourceQuota.status.used without replicating the chart's ratio math.
+//
+//	cpu, memory, ephemeral-storage, custom resources -> "limits.<key>"
+//	storage                                          -> "requests.storage" (no hard limits.storage)
+//	pods, services, services.loadbalancers, ...      -> "<key>" (verbatim)
+func renderedLimitKey(raw string) string {
+	if raw == "storage" {
+		return "requests.storage"
+	}
+	if _, ok := rawQuotaKeys[raw]; ok {
+		return raw
+	}
+	return "limits." + raw
+}
+
+// parentNamespaceOf returns the namespace owned by the parent of the tenant that
+// owns ns, or "" for the root tenant and non-tenant namespaces. It mirrors
+// tenantquota.parentNamespace / the inverse of computeTenantNamespace: the
+// hierarchy is encoded in the namespace name, so the parent is recovered by
+// stripping the trailing "-<name>" segment.
+func (r *REST) parentNamespaceOf(ns string) string {
+	if ns == rootTenantNamespace || !strings.HasPrefix(ns, r.releaseConfig.Prefix) {
+		return ""
+	}
+	segments := strings.Split(ns, "-")
+	if len(segments) == 2 {
+		return rootTenantNamespace
+	}
+	return strings.Join(segments[:len(segments)-1], "-")
+}
+
+// poolRootOf returns the nearest ancestor namespace (inclusive of ns) that is
+// bounded — declares its own quota — or "" when none is. That ancestor is the
+// pool root governing ns.
+func (r *REST) poolRootOf(ns string, bounded map[string]bool) string {
+	for cur := ns; cur != ""; cur = r.parentNamespaceOf(cur) {
+		if bounded[cur] {
+			return cur
+		}
+	}
+	return ""
+}
+
+// parentPoolUsage sums the current usage of the pool rooted at parentNS: the
+// parent's own namespace plus every unbounded descendant whose nearest bounded
+// ancestor is parentNS. Bounded sub-tenants are excluded — their reservations
+// are already charged as sibling carve-outs — as is excludeNS (the tenant being
+// created/updated). Usage is read from each member's ResourceQuota.status.used,
+// taking a per-resource max within a namespace to avoid double-counting the
+// chart-rendered and controller-allocated quotas, and is keyed in the rendered
+// quota key space (see renderedLimitKey). Boundedness is decided by declared
+// resourceQuotas so the result does not depend on whether Flux has rendered a
+// freshly-created tenant's quota yet.
+func (r *REST) parentPoolUsage(ctx context.Context, parentNS, excludeNS string) (map[string]resource.Quantity, error) {
+	releases := &helmv2.HelmReleaseList{}
+	selector := labels.SelectorFromSet(labels.Set{
+		ApplicationKindLabel:  r.kindName,
+		ApplicationGroupLabel: r.gvk.Group,
+	})
+	if err := r.c.List(ctx, releases, &client.ListOptions{LabelSelector: selector}); err != nil {
+		return nil, err
+	}
+
+	bounded := map[string]bool{}
+	owned := make([]string, 0, len(releases.Items))
+	for i := range releases.Items {
+		hr := &releases.Items[i]
+		name := strings.TrimPrefix(hr.Name, r.releaseConfig.Prefix)
+		ns := r.computeTenantNamespace(hr.Namespace, name)
+		owned = append(owned, ns)
+		quotas, err := declaredQuotasFromHelmRelease(hr)
+		if err != nil {
+			klog.Warningf("skipping tenant %s/%s with unparseable quotas while summing pool usage: %v", hr.Namespace, hr.Name, err)
+			continue
+		}
+		if len(quotas) > 0 {
+			bounded[ns] = true
+		}
+	}
+
+	members := map[string]bool{parentNS: true}
+	for _, ns := range owned {
+		if ns == excludeNS {
+			continue
+		}
+		if r.poolRootOf(ns, bounded) == parentNS {
+			members[ns] = true
+		}
+	}
+	delete(members, excludeNS)
+
+	perNamespace := map[string]map[string]resource.Quantity{}
+	for ns := range members {
+		quotas := &corev1.ResourceQuotaList{}
+		// Direct (uncached), namespace-scoped read: the aggregated apiserver
+		// must not spin up a cluster-wide ResourceQuota informer just for
+		// admission, so this goes through the watch client (r.w) rather than the
+		// cached r.c, and is scoped to the handful of pool-member namespaces.
+		if err := r.w.List(ctx, quotas, client.InNamespace(ns)); err != nil {
+			return nil, err
+		}
+		for i := range quotas.Items {
+			rq := &quotas.Items[i]
+			perNamespace[ns] = maxQuotas(perNamespace[ns], resourceListToQuotas(rq.Status.Used))
+		}
+	}
+
+	total := map[string]resource.Quantity{}
+	for _, used := range perNamespace {
+		addQuotas(total, used)
+	}
+	return total, nil
+}
+
+// resourceListToQuotas converts a corev1.ResourceList to the string-keyed quota
+// map the admission arithmetic uses.
+func resourceListToQuotas(rl corev1.ResourceList) map[string]resource.Quantity {
+	out := make(map[string]resource.Quantity, len(rl))
+	for k, v := range rl {
+		out[string(k)] = v
+	}
+	return out
+}
+
+// maxQuotas returns the per-resource maximum of dst and src as a new map.
+// Multiple ResourceQuotas in one namespace each report the same usage, so usage
+// is merged with a max (not a sum) to avoid double counting.
+func maxQuotas(dst, src map[string]resource.Quantity) map[string]resource.Quantity {
+	out := map[string]resource.Quantity{}
+	for k, v := range dst {
+		out[k] = v.DeepCopy()
+	}
+	for k, v := range src {
+		if cur, ok := out[k]; !ok || v.Cmp(cur) > 0 {
+			out[k] = v.DeepCopy()
+		}
+	}
+	return out
+}
diff --git a/pkg/registry/apps/application/quota_test.go b/pkg/registry/apps/application/quota_test.go
new file mode 100644
index 0000000000..f6e5d3054b
--- /dev/null
+++ b/pkg/registry/apps/application/quota_test.go
@@ -0,0 +1,375 @@
+/*
+Copyright 2026 The Cozystack Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package application
+
+import (
+	"context"
+	"encoding/json"
+	"testing"
+
+	helmv2 "github.com/fluxcd/helm-controller/api/v2"
+	corev1 "k8s.io/api/core/v1"
+	apiextv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
+	"k8s.io/apimachinery/pkg/api/resource"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/client/fake"
+
+	appsv1alpha1 "github.com/cozystack/cozystack/pkg/apis/apps/v1alpha1"
+	"github.com/cozystack/cozystack/pkg/config"
+)
+
+const testTenantPrefix = "tenant-"
+
+// tenantValuesJSON renders a tenant values blob carrying the given declared
+// resourceQuotas. A nil/empty map yields a blob with no quota (unbounded).
+func tenantValuesJSON(t *testing.T, quotas map[string]string) *apiextv1.JSON {
+	t.Helper()
+	values := map[string]any{}
+	if len(quotas) > 0 {
+		values["resourceQuotas"] = quotas
+	}
+	raw, err := json.Marshal(values)
+	if err != nil {
+		t.Fatalf("marshal tenant values: %v", err)
+	}
+	return &apiextv1.JSON{Raw: raw}
+}
+
+// tenantHelmRelease builds a tenant HelmRelease (as stored by the aggregated
+// apiserver) named "<prefix><name>" in namespace, with the given declared
+// quotas.
+func tenantHelmRelease(t *testing.T, name, namespace string, quotas map[string]string) *helmv2.HelmRelease {
+	t.Helper()
+	return &helmv2.HelmRelease{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      testTenantPrefix + name,
+			Namespace: namespace,
+			Labels: map[string]string{
+				ApplicationKindLabel:  "Tenant",
+				ApplicationGroupLabel: appsv1alpha1.GroupName,
+				ApplicationNameLabel:  name,
+			},
+		},
+		Spec: helmv2.HelmReleaseSpec{
+			Values: tenantValuesJSON(t, quotas),
+		},
+	}
+}
+
+// newTenantREST wires a tenant REST handler over a fake client seeded with the
+// given HelmReleases.
+func newTenantREST(t *testing.T, objects ...client.Object) *REST {
+	t.Helper()
+	scheme := runtime.NewScheme()
+	if err := helmv2.AddToScheme(scheme); err != nil {
+		t.Fatalf("register helmv2 scheme: %v", err)
+	}
+	if err := corev1.AddToScheme(scheme); err != nil {
+		t.Fatalf("register corev1 scheme: %v", err)
+	}
+	fakeClient := fake.NewClientBuilder().WithScheme(scheme).WithObjects(objects...).Build()
+	return &REST{
+		c: fakeClient,
+		w: fakeClient,
+		gvk: schema.GroupVersionKind{
+			Group:   appsv1alpha1.GroupName,
+			Version: "v1alpha1",
+			Kind:    "Tenant",
+		},
+		gvr: schema.GroupVersionResource{
+			Group:    appsv1alpha1.GroupName,
+			Version:  "v1alpha1",
+			Resource: "tenants",
+		},
+		kindName: "Tenant",
+		releaseConfig: config.ReleaseConfig{
+			Prefix: testTenantPrefix,
+		},
+	}
+}
+
+// childApplication builds a Tenant Application named name in namespace with the
+// given declared quotas.
+func childApplication(t *testing.T, name, namespace string, quotas map[string]string) *appsv1alpha1.Application {
+	t.Helper()
+	return &appsv1alpha1.Application{
+		TypeMeta: metav1.TypeMeta{
+			APIVersion: "apps.cozystack.io/v1alpha1",
+			Kind:       "Tenant",
+		},
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      name,
+			Namespace: namespace,
+		},
+		Spec: tenantValuesJSON(t, quotas),
+	}
+}
+
+// usageQuota builds a ResourceQuota reporting current usage (status.used) in a
+// namespace, keyed in the rendered quota key space (e.g. "limits.cpu").
+func usageQuota(t *testing.T, namespace, name string, used map[string]string) *corev1.ResourceQuota {
+	t.Helper()
+	rl := corev1.ResourceList{}
+	for k, v := range used {
+		rl[corev1.ResourceName(k)] = resource.MustParse(v)
+	}
+	return &corev1.ResourceQuota{
+		ObjectMeta: metav1.ObjectMeta{Name: name, Namespace: namespace},
+		Status:     corev1.ResourceQuotaStatus{Used: rl},
+	}
+}
+
+func TestRenderedLimitKey(t *testing.T) {
+	cases := map[string]string{
+		"cpu":                    "limits.cpu",
+		"memory":                 "limits.memory",
+		"ephemeral-storage":      "limits.ephemeral-storage",
+		"devices.com/nvidia":     "limits.devices.com/nvidia",
+		"storage":                "requests.storage",
+		"pods":                   "pods",
+		"services.loadbalancers": "services.loadbalancers",
+	}
+	for raw, want := range cases {
+		if got := renderedLimitKey(raw); got != want {
+			t.Errorf("renderedLimitKey(%q) = %q, want %q", raw, got, want)
+		}
+	}
+}
+
+func TestValidateTenantResourceQuotas(t *testing.T) {
+	tests := []struct {
+		name string
+		// parent owns the namespace the child is created in; its HelmRelease
+		// lives one level up.
+		parent *helmv2.HelmRelease
+		// siblings already exist in the child's namespace.
+		siblings []*helmv2.HelmRelease
+		// child being created/updated.
+		childName   string
+		childNS     string
+		childQuotas map[string]string
+		wantDenied  bool
+	}{
+		{
+			name:        "child within parent budget is allowed",
+			parent:      tenantHelmRelease(t, "foo", "tenant-root", map[string]string{"cpu": "10"}),
+			childName:   "bar",
+			childNS:     "tenant-foo",
+			childQuotas: map[string]string{"cpu": "4"},
+			wantDenied:  false,
+		},
+		{
+			name:        "child exactly at remaining is allowed",
+			parent:      tenantHelmRelease(t, "foo", "tenant-root", map[string]string{"cpu": "10"}),
+			siblings:    []*helmv2.HelmRelease{tenantHelmRelease(t, "bar", "tenant-foo", map[string]string{"cpu": "4"})},
+			childName:   "baz",
+			childNS:     "tenant-foo",
+			childQuotas: map[string]string{"cpu": "6"},
+			wantDenied:  false,
+		},
+		{
+			name:        "child exceeding remaining after sibling carve-out is denied",
+			parent:      tenantHelmRelease(t, "foo", "tenant-root", map[string]string{"cpu": "10"}),
+			siblings:    []*helmv2.HelmRelease{tenantHelmRelease(t, "bar", "tenant-foo", map[string]string{"cpu": "4"})},
+			childName:   "baz",
+			childNS:     "tenant-foo",
+			childQuotas: map[string]string{"cpu": "7"},
+			wantDenied:  true,
+		},
+		{
+			name:        "child exceeding parent total is denied",
+			parent:      tenantHelmRelease(t, "foo", "tenant-root", map[string]string{"cpu": "10"}),
+			childName:   "bar",
+			childNS:     "tenant-foo",
+			childQuotas: map[string]string{"cpu": "11"},
+			wantDenied:  true,
+		},
+		{
+			name:        "child without quota shares parent pool (allowed)",
+			parent:      tenantHelmRelease(t, "foo", "tenant-root", map[string]string{"cpu": "10"}),
+			childName:   "bar",
+			childNS:     "tenant-foo",
+			childQuotas: nil,
+			wantDenied:  false,
+		},
+		{
+			name:        "unbounded parent does not constrain child",
+			parent:      tenantHelmRelease(t, "foo", "tenant-root", nil),
+			childName:   "bar",
+			childNS:     "tenant-foo",
+			childQuotas: map[string]string{"cpu": "1000"},
+			wantDenied:  false,
+		},
+		{
+			name:        "missing parent HelmRelease does not constrain child",
+			parent:      nil,
+			childName:   "bar",
+			childNS:     "tenant-foo",
+			childQuotas: map[string]string{"cpu": "1000"},
+			wantDenied:  false,
+		},
+		{
+			name:        "per-resource enforcement denies only the over-budget resource",
+			parent:      tenantHelmRelease(t, "foo", "tenant-root", map[string]string{"cpu": "10", "memory": "20Gi"}),
+			childName:   "bar",
+			childNS:     "tenant-foo",
+			childQuotas: map[string]string{"cpu": "5", "memory": "25Gi"},
+			wantDenied:  true,
+		},
+		{
+			name:        "child bounding a resource the parent does not bound is allowed",
+			parent:      tenantHelmRelease(t, "foo", "tenant-root", map[string]string{"cpu": "10"}),
+			childName:   "bar",
+			childNS:     "tenant-foo",
+			childQuotas: map[string]string{"memory": "999Gi"},
+			wantDenied:  false,
+		},
+		{
+			name:        "deep nesting: grandchild within child budget allowed",
+			parent:      tenantHelmRelease(t, "bar", "tenant-foo", map[string]string{"cpu": "6"}),
+			childName:   "baz",
+			childNS:     "tenant-foo-bar",
+			childQuotas: map[string]string{"cpu": "5"},
+			wantDenied:  false,
+		},
+		{
+			name:        "deep nesting: grandchild exceeding child budget denied",
+			parent:      tenantHelmRelease(t, "bar", "tenant-foo", map[string]string{"cpu": "6"}),
+			childName:   "baz",
+			childNS:     "tenant-foo-bar",
+			childQuotas: map[string]string{"cpu": "7"},
+			wantDenied:  true,
+		},
+	}
+
+	for _, tc := range tests {
+		t.Run(tc.name, func(t *testing.T) {
+			var objects []client.Object
+			if tc.parent != nil {
+				objects = append(objects, tc.parent)
+			}
+			for _, s := range tc.siblings {
+				objects = append(objects, s)
+			}
+			r := newTenantREST(t, objects...)
+
+			app := childApplication(t, tc.childName, tc.childNS, tc.childQuotas)
+			errs := r.validateTenantResourceQuotas(context.Background(), app)
+			gotDenied := len(errs) > 0
+			if gotDenied != tc.wantDenied {
+				t.Fatalf("validateTenantResourceQuotas denied=%v, want %v (errors: %v)", gotDenied, tc.wantDenied, errs)
+			}
+		})
+	}
+}
+
+// TestValidateTenantResourceQuotas_UpdateExcludesSelf verifies that raising a
+// tenant's own quota does not double-count its existing carve-out as a sibling.
+func TestValidateTenantResourceQuotas_UpdateExcludesSelf(t *testing.T) {
+	parent := tenantHelmRelease(t, "foo", "tenant-root", map[string]string{"cpu": "10"})
+	// "bar" already exists in tenant-foo with cpu=4. Raising it to cpu=9 must
+	// be allowed (only sibling carve-outs other than bar count, and there are
+	// none), not rejected as 4+9 > 10.
+	self := tenantHelmRelease(t, "bar", "tenant-foo", map[string]string{"cpu": "4"})
+	r := newTenantREST(t, parent, self)
+
+	app := childApplication(t, "bar", "tenant-foo", map[string]string{"cpu": "9"})
+	if errs := r.validateTenantResourceQuotas(context.Background(), app); len(errs) > 0 {
+		t.Fatalf("update of own quota within parent budget should be allowed, got: %v", errs)
+	}
+
+	// Raising bar above the full parent budget is still rejected.
+	appOver := childApplication(t, "bar", "tenant-foo", map[string]string{"cpu": "11"})
+	if errs := r.validateTenantResourceQuotas(context.Background(), appOver); len(errs) == 0 {
+		t.Fatalf("update of own quota above parent budget should be denied")
+	}
+}
+
+// TestValidateTenantResourceQuotas_PoolUsage verifies that the parent pool's
+// current usage is carved out of the budget available to a new child, so the
+// sub-tree invariant holds at declaration time.
+func TestValidateTenantResourceQuotas_PoolUsage(t *testing.T) {
+	// foo budget cpu=10, already using 8 in its own namespace. A child asking
+	// for 10 must be denied (only 2 left); a child asking for 2 is allowed.
+	t.Run("parent usage shrinks remaining", func(t *testing.T) {
+		parent := tenantHelmRelease(t, "foo", "tenant-root", map[string]string{"cpu": "10"})
+		used := usageQuota(t, "tenant-foo", "tenant-quota", map[string]string{"limits.cpu": "8"})
+		r := newTenantREST(t, parent, used)
+
+		denied := r.validateTenantResourceQuotas(context.Background(), childApplication(t, "bar", "tenant-foo", map[string]string{"cpu": "10"}))
+		if len(denied) == 0 {
+			t.Fatalf("child cpu=10 should be denied when parent pool already uses 8 of 10")
+		}
+		allowed := r.validateTenantResourceQuotas(context.Background(), childApplication(t, "bar", "tenant-foo", map[string]string{"cpu": "2"}))
+		if len(allowed) > 0 {
+			t.Fatalf("child cpu=2 should be allowed (2 left), got: %v", allowed)
+		}
+	})
+
+	// Usage in a bounded child's own namespace (its own pool) must not count
+	// against the parent pool's remaining budget.
+	t.Run("bounded child usage excluded from parent pool", func(t *testing.T) {
+		parent := tenantHelmRelease(t, "foo", "tenant-root", map[string]string{"cpu": "10"})
+		child := tenantHelmRelease(t, "bar", "tenant-foo", map[string]string{"cpu": "4"})
+		// bar uses its full 4 in its own namespace.
+		childUsed := usageQuota(t, "tenant-foo-bar", "tenant-quota", map[string]string{"limits.cpu": "4"})
+		r := newTenantREST(t, parent, child, childUsed)
+
+		// Raising bar to 9 must still be allowed: bar's own usage is in its own
+		// pool, and as the tenant being updated it is excluded anyway.
+		if errs := r.validateTenantResourceQuotas(context.Background(), childApplication(t, "bar", "tenant-foo", map[string]string{"cpu": "9"})); len(errs) > 0 {
+			t.Fatalf("raising own quota within budget must be allowed, got: %v", errs)
+		}
+	})
+
+	// No rendered usage yet (freshly-created parent, Flux has not rendered the
+	// quota): usage degrades to zero and behaviour matches the pre-usage gate.
+	t.Run("absent usage degrades to budget-only check", func(t *testing.T) {
+		parent := tenantHelmRelease(t, "foo", "tenant-root", map[string]string{"cpu": "10"})
+		r := newTenantREST(t, parent)
+		if errs := r.validateTenantResourceQuotas(context.Background(), childApplication(t, "bar", "tenant-foo", map[string]string{"cpu": "10"})); len(errs) > 0 {
+			t.Fatalf("with no recorded usage a full-budget child must be allowed, got: %v", errs)
+		}
+	})
+}
+
+func TestParentTenantHelmReleaseRef(t *testing.T) {
+	tests := []struct {
+		owned    string
+		wantName string
+		wantNS   string
+		wantOK   bool
+	}{
+		{"tenant-root", "tenant-root", "tenant-root", true},
+		{"tenant-foo", "tenant-foo", "tenant-root", true},
+		{"tenant-foo-bar", "tenant-bar", "tenant-foo", true},
+		{"tenant-foo-bar-baz", "tenant-baz", "tenant-foo-bar", true},
+		{"not-a-tenant", "", "", false},
+	}
+	for _, tc := range tests {
+		t.Run(tc.owned, func(t *testing.T) {
+			name, ns, ok := parentTenantHelmReleaseRef(tc.owned, testTenantPrefix)
+			if name != tc.wantName || ns != tc.wantNS || ok != tc.wantOK {
+				t.Fatalf("parentTenantHelmReleaseRef(%q) = (%q, %q, %v), want (%q, %q, %v)",
+					tc.owned, name, ns, ok, tc.wantName, tc.wantNS, tc.wantOK)
+			}
+		})
+	}
+}
diff --git a/pkg/registry/apps/application/rest.go b/pkg/registry/apps/application/rest.go
index 9770ef0fa6..322ef6c6d4 100644
--- a/pkg/registry/apps/application/rest.go
+++ b/pkg/registry/apps/application/rest.go
@@ -20,7 +20,10 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"maps"
 	"net/http"
+	"slices"
+	"sort"
 	"strconv"
 	"strings"
 	"sync"
@@ -41,9 +44,12 @@ import (
 	"k8s.io/apimachinery/pkg/watch"
 	"k8s.io/apiserver/pkg/endpoints/request"
 	"k8s.io/apiserver/pkg/registry/rest"
+	"k8s.io/apiserver/pkg/warning"
+	"k8s.io/client-go/util/retry"
 	"k8s.io/klog/v2"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
+	fluxshard "github.com/cozystack/cozystack/internal/fluxshardoperator"
 	"github.com/cozystack/cozystack/pkg/apis/apps/presets"
 	appsv1alpha1 "github.com/cozystack/cozystack/pkg/apis/apps/v1alpha1"
 	"github.com/cozystack/cozystack/pkg/apis/apps/validation"
@@ -93,6 +99,8 @@ type REST struct {
 	singularName  string
 	releaseConfig config.ReleaseConfig
 	specSchema    *structuralschema.Structural
+	nameSchema    *validation.NameSchema
+	nameSchemaErr error
 }
 
 // buildSpecSchema parses an OpenAPI-v3 JSON schema string and returns the
@@ -131,6 +139,12 @@ func NewREST(c client.Client, w client.WithWatch, config *config.Resource) *REST
 		klog.Errorf("Failed to build spec schema: %v", err)
 	}
 
+	nameSchema, nameSchemaErr := resolveNameSchema(config)
+	if nameSchemaErr != nil {
+		klog.Errorf("ApplicationDefinition for %s declares an invalid %s, refusing to create %s objects until it is fixed: %v",
+			config.Application.Kind, appsv1alpha1.NameSchemaExtension, config.Application.Kind, nameSchemaErr)
+	}
+
 	return &REST{
 		c: c,
 		w: w,
@@ -147,6 +161,8 @@ func NewREST(c client.Client, w client.WithWatch, config *config.Resource) *REST
 		singularName:  config.Application.Singular,
 		releaseConfig: config.Release,
 		specSchema:    specSchema,
+		nameSchema:    nameSchema,
+		nameSchemaErr: nameSchemaErr,
 	}
 }
 
@@ -168,6 +184,8 @@ func (r *REST) Create(ctx context.Context, obj runtime.Object, createValidation
 		return nil, fmt.Errorf("expected *appsv1alpha1.Application object, got %T", obj)
 	}
 
+	app = app.DeepCopy()
+
 	// Validate Application name format (DNS-1035 plus any kind-specific rules)
 	if errs := r.validateNameFormat(app.Name); len(errs) > 0 {
 		return nil, apierrors.NewInvalid(r.gvk.GroupKind(), app.Name, errs)
@@ -187,6 +205,11 @@ func (r *REST) Create(ctx context.Context, obj runtime.Object, createValidation
 		if nsErrs := r.validateTenantNamespaceLength(app.Namespace, app.Name); len(nsErrs) > 0 {
 			return nil, apierrors.NewInvalid(r.gvk.GroupKind(), app.Name, nsErrs)
 		}
+		// Enforce hierarchical quota allocation: a child tenant's declared
+		// quota may not exceed its parent's remaining (un-carved) quota.
+		if qErrs := r.validateTenantResourceQuotas(ctx, app); len(qErrs) > 0 {
+			return nil, apierrors.NewInvalid(r.gvk.GroupKind(), app.Name, qErrs)
+		}
 	}
 
 	// Validate that values don't contain reserved keys (starting with "_")
@@ -194,7 +217,19 @@ func (r *REST) Create(ctx context.Context, obj runtime.Object, createValidation
 		return nil, apierrors.NewBadRequest(err.Error())
 	}
 
+	// Omission permits a chart default; explicit null suppresses it in Helm.
+	// Normalize only repairable fields before admission and persistence.
+	emptied, err := r.normalizeSpecNulls(app)
+	if err != nil {
+		return nil, apierrors.NewBadRequest(fmt.Sprintf("failed to normalize spec: %v", err))
+	}
+	if len(emptied) > 0 {
+		warning.AddWarning(ctx, "", emptyFieldsWarning(emptied))
+	}
+
 	r.warnLegacyPresets(app)
+	r.warnRemovedKubernetesFields(ctx, app)
+	r.warnRemovedUserPasswords(ctx, app)
 
 	// Run the genericapiserver-supplied validating admission chain
 	// (validating webhooks + ValidatingAdmissionPolicies) before
@@ -205,7 +240,7 @@ func (r *REST) Create(ctx context.Context, obj runtime.Object, createValidation
 	// this hook explicitly — unlike genericregistry.Store, which
 	// wires it automatically.
 	if createValidation != nil {
-		if err := createValidation(ctx, obj); err != nil {
+		if err := createValidation(ctx, app); err != nil {
 			return nil, err
 		}
 	}
@@ -233,10 +268,10 @@ func (r *REST) Create(ctx context.Context, obj runtime.Object, createValidation
 	klog.V(6).Infof("Creating HelmRelease %s in namespace %s", helmRelease.Name, app.Namespace)
 
 	// Create HelmRelease in Kubernetes
-	err = r.c.Create(ctx, helmRelease, &client.CreateOptions{Raw: options})
+	err = r.c.Create(ctx, helmRelease, registry.ClientCreateOptions(options))
 	if err != nil {
 		klog.Errorf("Failed to create HelmRelease %s: %v", helmRelease.Name, err)
-		return nil, fmt.Errorf("failed to create HelmRelease: %v", err)
+		return nil, registry.WrapPreservingStatus("failed to create HelmRelease", err, r.gvr.GroupResource(), app.Name)
 	}
 
 	// Convert the created HelmRelease back to Application
@@ -490,7 +525,7 @@ func (r *REST) Update(ctx context.Context, name string, objInfo rest.UpdatedObje
 				klog.Errorf("Failed to get updated object: %v", err)
 				return nil, false, err
 			}
-			createdObj, err := r.Create(ctx, obj, createValidation, &metav1.CreateOptions{})
+			createdObj, err := r.Create(ctx, obj, createValidation, registry.CreateOptionsFromUpdate(options))
 			if err != nil {
 				klog.Errorf("Failed to create new Application: %v", err)
 				return nil, false, err
@@ -501,6 +536,8 @@ func (r *REST) Update(ctx context.Context, name string, objInfo rest.UpdatedObje
 		return nil, false, err
 	}
 
+	previousFinalizers := slices.Clone(oldObj.(*appsv1alpha1.Application).Finalizers)
+
 	// Update the Application object
 	newObj, err := objInfo.UpdatedObject(ctx, oldObj)
 	if err != nil {
@@ -508,14 +545,6 @@ func (r *REST) Update(ctx context.Context, name string, objInfo rest.UpdatedObje
 		return nil, false, err
 	}
 
-	// Validate the update if a validation function is provided
-	if updateValidation != nil {
-		if err := updateValidation(ctx, newObj, oldObj); err != nil {
-			klog.Errorf("Update validation failed for Application %s: %v", name, err)
-			return nil, false, err
-		}
-	}
-
 	// Assert the new object is of type Application
 	app, ok := newObj.(*appsv1alpha1.Application)
 	if !ok {
@@ -523,6 +552,8 @@ func (r *REST) Update(ctx context.Context, name string, objInfo rest.UpdatedObje
 		return nil, false, fmt.Errorf("expected *appsv1alpha1.Application object, got %T", newObj)
 	}
 
+	app = app.DeepCopy()
+
 	// Note: name validation (DNS-1035 format + length) is intentionally skipped on
 	// Update because Kubernetes names are immutable. Validating here would block
 	// updates to pre-existing resources whose names don't conform to the new rules.
@@ -532,7 +563,36 @@ func (r *REST) Update(ctx context.Context, name string, objInfo rest.UpdatedObje
 		return nil, false, apierrors.NewBadRequest(err.Error())
 	}
 
+	// Admission must validate the same normalized values that will be stored.
+	emptied, err := r.normalizeSpecNulls(app)
+	if err != nil {
+		return nil, false, apierrors.NewBadRequest(fmt.Sprintf("failed to normalize spec: %v", err))
+	}
+	if len(emptied) > 0 {
+		warning.AddWarning(ctx, "", emptyFieldsWarning(emptied))
+	}
+
+	// Validate the update if a validation function is provided
+	if updateValidation != nil {
+		if err := updateValidation(ctx, app, oldObj); err != nil {
+			klog.Errorf("Update validation failed for Application %s: %v", name, err)
+			return nil, false, err
+		}
+	}
+
+	// Enforce hierarchical quota allocation on quota changes too: raising a
+	// child tenant's declared quota above its parent's remaining budget is
+	// rejected the same way as on create.
+	if r.kindName == "Tenant" {
+		if qErrs := r.validateTenantResourceQuotas(ctx, app); len(qErrs) > 0 {
+			return nil, false, apierrors.NewInvalid(r.gvk.GroupKind(), app.Name, qErrs)
+		}
+	}
+
 	r.warnLegacyPresets(app)
+	r.warnRemovedKubernetesFields(ctx, app)
+	r.warnRemovedUserPasswords(ctx, app)
+	r.warnUpgradeIntroducedCollisions(ctx, oldObj, app)
 
 	// Convert Application to HelmRelease
 	helmRelease, err := r.ConvertApplicationToHelmRelease(app)
@@ -541,36 +601,68 @@ func (r *REST) Update(ctx context.Context, name string, objInfo rest.UpdatedObje
 		return nil, false, fmt.Errorf("conversion error: %v", err)
 	}
 
-	// Ensure ResourceVersion
+	// Keep the conversion output pristine: the metadata assembly below reads the
+	// live object, so a conflict retry has to redo it from this copy rather than
+	// re-apply it on top of its own previous result.
+	converted := helmRelease.DeepCopy()
+
+	cur := &helmv2.HelmRelease{}
+	if err := r.c.Get(ctx, client.ObjectKey{Namespace: helmRelease.Namespace, Name: helmRelease.Name}, cur, &client.GetOptions{Raw: &metav1.GetOptions{}}); err != nil {
+		return nil, false, registry.WrapPreservingStatus("failed to fetch current HelmRelease", err, r.gvr.GroupResource(), name)
+	}
 	if helmRelease.ResourceVersion == "" {
-		cur := &helmv2.HelmRelease{}
-		err := r.c.Get(ctx, client.ObjectKey{Namespace: helmRelease.Namespace, Name: helmRelease.Name}, cur, &client.GetOptions{Raw: &metav1.GetOptions{}})
-		if err != nil {
-			return nil, false, fmt.Errorf("failed to fetch current HelmRelease: %w", err)
-		}
 		helmRelease.SetResourceVersion(cur.GetResourceVersion())
 	}
+	r.applyLiveMetadata(helmRelease, cur, app, previousFinalizers)
 
-	// Merge system labels (from config) directly
-	helmRelease.Labels = mergeMaps(r.releaseConfig.Labels, helmRelease.Labels)
-	// Merge user labels with prefix
-	helmRelease.Labels = mergeMaps(helmRelease.Labels, addPrefixedMap(app.Labels, LabelPrefix))
-	// Add application metadata labels
-	if helmRelease.Labels == nil {
-		helmRelease.Labels = make(map[string]string)
-	}
-	helmRelease.Labels[ApplicationKindLabel] = r.kindName
-	helmRelease.Labels[ApplicationGroupLabel] = r.gvk.Group
-	helmRelease.Labels[ApplicationNameLabel] = app.Name
-	// Note: Annotations from config are not handled as r.releaseConfig.Annotations is undefined
+	// Suspension is not part of the Application, so the rebuilt object always
+	// says suspend=false, and sending it as is resumes a release that an
+	// operator or a controller suspended. The CNPG restore driver relies on the
+	// suspension holding across its own patch of the Postgres app through this
+	// API: it purges the Cluster while the release is suspended and resumes it
+	// only once the purge is done, so the chart's next render lands
+	// bootstrap.recovery on an empty namespace. Resumed early, the release
+	// renders while the purge is still running, and the purge then deletes
+	// what it rendered.
+	helmRelease.Spec.Suspend = cur.Spec.Suspend
 
 	klog.V(6).Infof("Updating HelmRelease %s in namespace %s", helmRelease.Name, helmRelease.Namespace)
 
-	// Update the HelmRelease in Kubernetes
-	err = r.c.Update(ctx, helmRelease, &client.UpdateOptions{Raw: &metav1.UpdateOptions{}})
+	// Update the HelmRelease in Kubernetes.
+	//
+	// Flux's helm-controller (and other controllers) continuously write the
+	// HelmRelease's status, which shares the object's resourceVersion. When a
+	// caller updates an app CR while a prior reconcile is still in flight, the
+	// resourceVersion read above goes stale and the Update is rejected with a
+	// 409 Conflict. Apart from suspend, the HelmRelease spec is derived from the
+	// Application the caller just applied, so a stale-resourceVersion conflict
+	// is never a real spec conflict here: refresh the resourceVersion from the
+	// live object and retry. Suspend is refreshed with it, because the write
+	// that caused the conflict may be the one that suspended the release.
+	//
+	// The carried-over metadata is not derived from the Application, though, and
+	// the writer that caused the conflict is usually the controller that owns it
+	// — helm-controller re-adding finalizers.fluxcd.io is the case this whole
+	// carry-over exists for. Keeping the copy read before the conflict would put
+	// the stale metadata back and undo that write, so rebuild from the
+	// conversion output against the object just read.
+	err = retry.RetryOnConflict(retry.DefaultBackoff, func() error {
+		updateErr := r.c.Update(ctx, helmRelease, registry.ClientUpdateOptions(options))
+		if apierrors.IsConflict(updateErr) {
+			cur := &helmv2.HelmRelease{}
+			if getErr := r.c.Get(ctx, client.ObjectKey{Namespace: helmRelease.Namespace, Name: helmRelease.Name}, cur, &client.GetOptions{Raw: &metav1.GetOptions{}}); getErr != nil {
+				return getErr
+			}
+			helmRelease = converted.DeepCopy()
+			r.applyLiveMetadata(helmRelease, cur, app, previousFinalizers)
+			helmRelease.SetResourceVersion(cur.GetResourceVersion())
+			helmRelease.Spec.Suspend = cur.Spec.Suspend
+		}
+		return updateErr
+	})
 	if err != nil {
 		klog.Errorf("Failed to update HelmRelease %s: %v", helmRelease.Name, err)
-		return nil, false, fmt.Errorf("failed to update HelmRelease: %v", err)
+		return nil, false, registry.WrapPreservingStatus("failed to update HelmRelease", err, r.gvr.GroupResource(), name)
 	}
 
 	// Convert the updated HelmRelease back to Application
@@ -640,10 +732,10 @@ func (r *REST) Delete(ctx context.Context, name string, deleteValidation rest.Va
 	klog.V(6).Infof("Deleting HelmRelease %s in namespace %s", helmReleaseName, namespace)
 
 	// Delete the HelmRelease corresponding to the Application
-	err = r.c.Delete(ctx, helmRelease, &client.DeleteOptions{Raw: options})
+	err = r.c.Delete(ctx, helmRelease, registry.ClientDeleteOptions(options))
 	if err != nil {
 		klog.Errorf("Failed to delete HelmRelease %s: %v", helmReleaseName, err)
-		return nil, false, fmt.Errorf("failed to delete HelmRelease: %v", err)
+		return nil, false, registry.WrapPreservingStatus("failed to delete HelmRelease", err, r.gvr.GroupResource(), name)
 	}
 
 	klog.V(6).Infof("Successfully deleted HelmRelease %s", helmReleaseName)
@@ -723,13 +815,19 @@ func (r *REST) Watch(ctx context.Context, options *metainternalversion.ListOptio
 	}
 	helmLabelSelector = labels.NewSelector().Add(labelRequirements...)
 
-	// Handle SendInitialEvents for WatchList feature (Kubernetes 1.27+)
-	// When sendInitialEvents=true, the client expects:
-	// 1. All existing resources as ADDED events
-	// 2. A Bookmark event with "k8s.io/initial-events-end": "true" annotation
-	// controller-runtime cache already sends ADDED events for all cached objects,
-	// so we just need to send the bookmark after those initial events
-	sendInitialEvents := options.SendInitialEvents != nil && *options.SendInitialEvents
+	// Honor a WatchList request: the client expects all existing
+	// objects as ADDED events, then a Bookmark annotated with
+	// metav1.InitialEventsAnnotationKey. controller-runtime's cache already
+	// replays the ADDED events, so we just emit the terminating bookmark.
+	initialEventsEnd := registry.InitialEventsEndBookmarkRequested(options)
+	bookmarker := registry.NewInitialEventsBookmarker(initialEventsEnd, options.ResourceVersion, func() runtime.Object {
+		app := &appsv1alpha1.Application{}
+		app.TypeMeta = metav1.TypeMeta{
+			APIVersion: appsv1alpha1.SchemeGroupVersion.String(),
+			Kind:       r.kindName,
+		}
+		return app
+	})
 
 	// Create a custom watcher to transform events
 	customW := &customWatcher{
@@ -744,6 +842,10 @@ func (r *REST) Watch(ctx context.Context, options *metainternalversion.ListOptio
 	helmWatcher, err := r.w.Watch(ctx, hrList, &client.ListOptions{
 		Namespace:     namespace,
 		LabelSelector: helmLabelSelector,
+		// Backing bookmarks are forwarded to the client, so ask for them only
+		// when the client did; a WatchList client always does, which keeps
+		// the terminating bookmark's trigger.
+		Raw: &metav1.ListOptions{AllowWatchBookmarks: options.AllowWatchBookmarks},
 	})
 	if err != nil {
 		klog.Errorf("Error setting up watch for HelmReleases: %v", err)
@@ -780,10 +882,6 @@ func (r *REST) Watch(ctx context.Context, options *metainternalversion.ListOptio
 			defer wmWatcherForCleanup.Stop()
 		}
 
-		// Track whether we've sent the initial-events-end bookmark
-		initialEventsEndSent := !sendInitialEvents // If not sendInitialEvents, consider it already sent
-		var lastResourceVersion string
-
 		// Buffer of WorkloadMonitor events that arrived before the initial
 		// snapshot finished. The watch-list contract requires the stream to
 		// deliver all ADDED events followed by the initial-events-end bookmark
@@ -804,48 +902,26 @@ func (r *REST) Watch(ctx context.Context, options *metainternalversion.ListOptio
 			}
 		}
 
-		drainPendingWMEvents := func() {
-			for _, ev := range pendingWMEvents {
-				select {
-				case customW.resultChan <- ev:
-				case <-customW.stopChan:
-					return
-				case <-ctx.Done():
-					return
-				}
-			}
-			pendingWMEvents = nil
-		}
-
-		// Helper function to send initial-events-end bookmark
-		sendInitialEventsEndBookmark := func() {
-			if initialEventsEndSent {
-				return
-			}
-			initialEventsEndSent = true
-
-			bookmarkApp := &appsv1alpha1.Application{}
-			bookmarkApp.SetResourceVersion(lastResourceVersion)
-			bookmarkApp.TypeMeta = metav1.TypeMeta{
-				APIVersion: appsv1alpha1.SchemeGroupVersion.String(),
-				Kind:       r.kindName,
-			}
-			bookmarkApp.SetAnnotations(map[string]string{
-				"k8s.io/initial-events-end": "true",
-			})
-			bookmarkEvent := watch.Event{
-				Type:   watch.Bookmark,
-				Object: bookmarkApp,
-			}
-			klog.V(6).Infof("Sending initial-events-end bookmark with RV=%s", lastResourceVersion)
+		// send forwards an event, returning false if the watch or context ended.
+		send := func(ev watch.Event) bool {
 			select {
-			case customW.resultChan <- bookmarkEvent:
+			case customW.resultChan <- ev:
+				return true
 			case <-customW.stopChan:
-				return
+				return false
 			case <-ctx.Done():
-				return
+				return false
 			}
-			drainPendingWMEvents()
+		}
+
+		drainPendingWMEvents := func() bool {
+			for _, ev := range pendingWMEvents {
+				if !send(ev) {
+					return false
+				}
+			}
+			pendingWMEvents = nil
+			return true
 		}
 
 		// Process watch events
@@ -856,45 +932,25 @@ func (r *REST) Watch(ctx context.Context, options *metainternalversion.ListOptio
 					// The watcher has been closed
 					klog.Warning("HelmRelease watcher closed")
 					// Send initial-events-end bookmark before closing if not yet sent
-					sendInitialEventsEndBookmark()
+					if bookmark, ok := bookmarker.OnClose(); ok {
+						if send(bookmark) {
+							drainPendingWMEvents()
+						}
+					}
 					return
 				}
 
 				// Handle bookmark events - these are critical for informer sync
 				if event.Type == watch.Bookmark {
 					if hr, ok := event.Object.(*helmv2.HelmRelease); ok {
-						lastResourceVersion = hr.GetResourceVersion()
-
-						// If sendInitialEvents and we haven't sent initial-events-end yet,
-						// add the annotation to this bookmark
-						bookmarkApp := &appsv1alpha1.Application{}
-						bookmarkApp.SetResourceVersion(lastResourceVersion)
-						bookmarkApp.TypeMeta = metav1.TypeMeta{
-							APIVersion: appsv1alpha1.SchemeGroupVersion.String(),
-							Kind:       r.kindName,
-						}
-						justFlipped := false
-						if !initialEventsEndSent {
-							initialEventsEndSent = true
-							justFlipped = true
-							bookmarkApp.SetAnnotations(map[string]string{
-								"k8s.io/initial-events-end": "true",
-							})
-							klog.V(6).Infof("Sending initial-events-end bookmark with RV=%s", lastResourceVersion)
-						}
-						bookmarkEvent := watch.Event{
-							Type:   watch.Bookmark,
-							Object: bookmarkApp,
-						}
-						select {
-						case customW.resultChan <- bookmarkEvent:
-						case <-customW.stopChan:
-							return
-						case <-ctx.Done():
+						// controller-runtime bookmarks after the initial list
+						// replay; the first one becomes the terminating marker.
+						bookmark, initialEventsEnd := bookmarker.OnBackingBookmark(hr.GetResourceVersion())
+						if !send(bookmark) {
 							return
 						}
-						if justFlipped {
-							drainPendingWMEvents()
+						if initialEventsEnd && !drainPendingWMEvents() {
+							return
 						}
 					}
 					continue
@@ -913,8 +969,8 @@ func (r *REST) Watch(ctx context.Context, options *metainternalversion.ListOptio
 					continue
 				}
 
-				// Update lastResourceVersion for bookmark
-				lastResourceVersion = hr.GetResourceVersion()
+				// Track resourceVersion for the eventual bookmark
+				bookmarker.Observe(hr.GetResourceVersion())
 
 				// Apply manual field selector filtering (metadata.name and metadata.namespace)
 				// controller-runtime cache doesn't support field selectors
@@ -951,9 +1007,15 @@ func (r *REST) Watch(ctx context.Context, options *metainternalversion.ListOptio
 					}
 				}
 
-				// If this is not an ADDED event and we haven't sent initial-events-end, send it now
-				if event.Type != watch.Added && !initialEventsEndSent {
-					sendInitialEventsEndBookmark()
+				// Emit the terminating bookmark before the first live event, then
+				// replay any buffered WorkloadMonitor events.
+				if bookmark, ok := bookmarker.BeforeLiveEvent(event.Type); ok {
+					if !send(bookmark) {
+						return
+					}
+					if !drainPendingWMEvents() {
+						return
+					}
 				}
 
 				// Skip ADDED events based on resourceVersion comparison
@@ -968,18 +1030,8 @@ func (r *REST) Watch(ctx context.Context, options *metainternalversion.ListOptio
 				}
 				// When startingRV == 0, always send ADDED events (client wants full state)
 
-				// Create watch event with Application object
-				appEvent := watch.Event{
-					Type:   event.Type,
-					Object: &app,
-				}
-
 				// Send event to custom watcher
-				select {
-				case customW.resultChan <- appEvent:
-				case <-customW.stopChan:
-					return
-				case <-ctx.Done():
+				if !send(watch.Event{Type: event.Type, Object: &app}) {
 					return
 				}
 
@@ -1068,16 +1120,12 @@ func (r *REST) Watch(ctx context.Context, options *metainternalversion.ListOptio
 				// Buffer WM-triggered events that arrive before the
 				// initial-events-end bookmark. They will be replayed in order
 				// immediately after the bookmark is emitted.
-				if !initialEventsEndSent {
+				if !bookmarker.Sent() {
 					pendingWMEvents = append(pendingWMEvents, outEvent)
 					continue
 				}
-				lastResourceVersion = wm.GetResourceVersion()
-				select {
-				case customW.resultChan <- outEvent:
-				case <-customW.stopChan:
-					return
-				case <-ctx.Done():
+				bookmarker.Observe(wm.GetResourceVersion())
+				if !send(outEvent) {
 					return
 				}
 
@@ -1158,23 +1206,17 @@ func (r *REST) hasRequiredApplicationLabelsWithName(hr *helmv2.HelmRelease, appN
 }
 
 // mergeMaps combines two maps of labels or annotations
+// mergeMaps merges b over a into a freshly allocated map. It never returns
+// either input: callers mutate the result in place, and a may be a long-lived
+// shared map (e.g. r.releaseConfig.Labels) that concurrent requests must not
+// write to.
 func mergeMaps(a, b map[string]string) map[string]string {
 	if a == nil && b == nil {
 		return nil
 	}
-	if a == nil {
-		return b
-	}
-	if b == nil {
-		return a
-	}
 	merged := make(map[string]string, len(a)+len(b))
-	for k, v := range a {
-		merged[k] = v
-	}
-	for k, v := range b {
-		merged[k] = v
-	}
+	maps.Copy(merged, a)
+	maps.Copy(merged, b)
 	return merged
 }
 
@@ -1197,9 +1239,97 @@ func filterPrefixedMap(original map[string]string, prefix string) map[string]str
 	}
 	processed := make(map[string]string)
 	for k, v := range original {
-		if strings.HasPrefix(k, prefix) {
-			newKey := strings.TrimPrefix(k, prefix)
-			processed[newKey] = v
+		if key, ok := strings.CutPrefix(k, prefix); ok {
+			processed[key] = v
+		}
+	}
+	return processed
+}
+
+func garbageCollectionFinalizers(finalizers []string) []string {
+	var result []string
+	for _, finalizer := range finalizers {
+		if finalizer == metav1.FinalizerDeleteDependents || finalizer == metav1.FinalizerOrphanDependents {
+			result = append(result, finalizer)
+		}
+	}
+	return result
+}
+
+func mergeGarbageCollectionFinalizers(current, previous, desired []string) []string {
+	result := slices.Clone(current)
+	for _, finalizer := range []string{metav1.FinalizerDeleteDependents, metav1.FinalizerOrphanDependents} {
+		before, after := slices.Contains(previous, finalizer), slices.Contains(desired, finalizer)
+		if before == after {
+			continue
+		}
+		if !after {
+			result = slices.DeleteFunc(result, func(f string) bool { return f == finalizer })
+		} else if !slices.Contains(result, finalizer) {
+			result = append(result, finalizer)
+		}
+	}
+	return result
+}
+
+// applyLiveMetadata assembles the metadata of a HelmRelease rebuilt from an
+// Application, given the live object it is about to replace. The PUT is a full
+// replace, so anything not restated here is dropped:
+//   - controller finalizers: helm-controller's finalizers.fluxcd.io guarantees
+//     `helm uninstall` runs on deletion. Stripping it lets a subsequent delete
+//     remove the HelmRelease instantly, orphaning every resource of the release.
+//   - ownerReferences: garbage collection and lineage.
+//   - labels/annotations outside the apps.cozystack.io- prefix: set directly on
+//     the HelmRelease by Flux or other controllers. Keys under the prefix are
+//     owned by this API and recomputed from the Application, so stale ones are
+//     dropped and a deletion on the Application propagates.
+//
+// hr must be a fresh conversion output: the function overlays the live metadata
+// and is not idempotent against its own result.
+func (r *REST) applyLiveMetadata(hr, cur *helmv2.HelmRelease, app *appsv1alpha1.Application, previousFinalizers []string) {
+	hr.Finalizers = mergeGarbageCollectionFinalizers(cur.Finalizers, previousFinalizers, app.Finalizers)
+	hr.DeletionTimestamp = cur.DeletionTimestamp.DeepCopy()
+	hr.DeletionGracePeriodSeconds = cur.DeletionGracePeriodSeconds
+	hr.OwnerReferences = cur.OwnerReferences
+	hr.Labels = mergeMaps(omitPrefixedMap(cur.Labels, LabelPrefix), hr.Labels)
+	hr.Annotations = mergeMaps(omitPrefixedMap(cur.Annotations, AnnotationPrefix), hr.Annotations)
+
+	// Merge system labels (from config) directly
+	hr.Labels = mergeMaps(r.releaseConfig.Labels, hr.Labels)
+	// Merge user labels with prefix
+	hr.Labels = mergeMaps(hr.Labels, addPrefixedMap(app.Labels, LabelPrefix))
+	// Add application metadata labels
+	if hr.Labels == nil {
+		hr.Labels = make(map[string]string)
+	}
+	hr.Labels[ApplicationKindLabel] = r.kindName
+	hr.Labels[ApplicationGroupLabel] = r.gvk.Group
+	hr.Labels[ApplicationNameLabel] = app.Name
+	// Note: Annotations from config are not handled as r.releaseConfig.Annotations is undefined
+
+	// The flux-shard-operator assigns each tenant HelmRelease to a
+	// helm-controller shard by rewriting this label at runtime. Rebuilding
+	// the object from the Application reverts it to the ApplicationDefinition
+	// default, which would bounce the HelmRelease off its shard on every
+	// update, so the live value wins.
+	if shard, ok := cur.Labels[fluxshard.ShardKeyLabel]; ok {
+		hr.Labels[fluxshard.ShardKeyLabel] = shard
+	}
+}
+
+// omitPrefixedMap returns the entries of a map whose keys do NOT carry the
+// predefined prefix, keeping the keys as-is. It is the complement of
+// filterPrefixedMap: prefixed keys are owned by this API and recomputed from
+// the Application on every write, while the remaining keys belong to other
+// controllers and must be preserved.
+func omitPrefixedMap(original map[string]string, prefix string) map[string]string {
+	if original == nil {
+		return nil
+	}
+	processed := make(map[string]string)
+	for k, v := range original {
+		if !strings.HasPrefix(k, prefix) {
+			processed[k] = v
 		}
 	}
 	return processed
@@ -1286,15 +1416,89 @@ const maxHelmReleaseName = 53
 // must fit inside a single 63-char DNS-1123 label.
 const maxNamespaceName = 63
 
-// validateNameFormat checks an Application name against DNS-1035 and any
+// legacyNameCaps are the caps this server enforced in code before applications
+// declared their own. An upgrade brings cozystack-api up before the
+// application definitions it serves are re-rendered, so for that window a
+// definition can predate its chart's declaration, and without these a name
+// admitted then renders sub-resources that cannot exist. They apply only to a
+// definition that declares nothing, and go once no supported upgrade starts
+// from a definition without the declaration.
+var legacyNameCaps = map[string]validation.NameSchema{
+	"Kubernetes": {
+		MaxLength:   new(int64(32)),
+		Description: "worker pools are KubernetesNodes releases named `kubernetes-nodes-<name>-<pool>`, which must fit the 53-character Helm release name limit",
+	},
+	"Kafka": {
+		MaxLength:   new(int64(44)),
+		Description: "the KRaft controller pod hostname `kafka-<name>-c-<hash>-<id>` must fit the 63-character DNS-1123 label limit",
+	},
+}
+
+// resolveNameSchema returns the name constraints for the kind cfg describes.
+// An error means the declaration exists but cannot be enforced as written;
+// the caller refuses creates for that kind rather than guess, since guessing
+// either admits names the chart cannot render or rejects names it can.
+func resolveNameSchema(cfg *config.Resource) (*validation.NameSchema, error) {
+	declared, err := validation.ParseNameSchema(cfg.Application.OpenAPISchema)
+	if err != nil {
+		return nil, err
+	}
+	if declared == nil {
+		if legacy, ok := legacyNameCaps[cfg.Application.Kind]; ok {
+			return &legacy, nil
+		}
+		return nil, nil
+	}
+	if budget := maxHelmReleaseName - len(cfg.Release.Prefix); declared.MinLength != nil && *declared.MinLength > int64(budget) {
+		return nil, fmt.Errorf("minLength %d exceeds the %d characters the release prefix %q leaves, so no name fits",
+			*declared.MinLength, budget, cfg.Release.Prefix)
+	}
+	return declared, nil
+}
+
+// validateNameFormat checks an Application name against DNS-1035, any
 // kind-specific format rules (e.g. Tenant names must be alphanumeric — see
-// validation.ValidateApplicationName for the reasoning).
+// validation.ValidateApplicationName for the reasoning), and the format the
+// application declares for itself in its schema.
 func (r *REST) validateNameFormat(name string) field.ErrorList {
-	return validation.ValidateApplicationName(name, r.kindName, field.NewPath("metadata").Child("name"))
+	allErrs := validation.ValidateApplicationName(name, r.kindName, field.NewPath("metadata").Child("name"))
+	return append(allErrs, r.validateNameAgainstSchema(name)...)
 }
 
-// validateNameLength checks that the application name won't exceed Kubernetes limits.
-// prefix + name must fit within the Helm release name limit (53 chars).
+// validateNameAgainstSchema applies the minLength and pattern the application
+// declares for its name; maxLength is applied in validateNameLength, together
+// with the Helm budget it shares.
+func (r *REST) validateNameAgainstSchema(name string) field.ErrorList {
+	if r.nameSchema == nil {
+		return nil
+	}
+	fldPath := field.NewPath("metadata").Child("name")
+	allErrs := field.ErrorList{}
+
+	if minLen := r.nameSchema.MinLength; minLen != nil && int64(len(name)) < *minLen {
+		allErrs = append(allErrs, field.Invalid(fldPath, name,
+			fmt.Sprintf("must be at least %d characters (%s)", *minLen, r.declaredReason())))
+	}
+	if !r.nameSchema.MatchesPattern(name) {
+		allErrs = append(allErrs, field.Invalid(fldPath, name,
+			fmt.Sprintf("must match %q (%s)", r.nameSchema.Pattern, r.declaredReason())))
+	}
+	return allErrs
+}
+
+// declaredReason is what a name rejected by the application's own
+// declaration is told: the chart's explanation when it gives one.
+func (r *REST) declaredReason() string {
+	if r.nameSchema.Description != "" {
+		return r.nameSchema.Description
+	}
+	return fmt.Sprintf("limit declared by the %s application", r.kindName)
+}
+
+// validateNameLength checks that the application name fits both the Helm
+// release name limit (prefix + name <= 53) and any stricter budget the
+// application declares for itself. The tighter one wins and reports itself; a
+// declaration can never widen the Helm budget.
 func (r *REST) validateNameLength(name string) field.ErrorList {
 	fldPath := field.NewPath("metadata").Child("name")
 	allErrs := field.ErrorList{}
@@ -1306,10 +1510,21 @@ func (r *REST) validateNameLength(name string) field.ErrorList {
 			fmt.Sprintf("configuration error: no valid name length possible (release prefix %q)", r.releaseConfig.Prefix)))
 		return allErrs
 	}
+	if r.nameSchemaErr != nil {
+		allErrs = append(allErrs, field.Invalid(fldPath, name,
+			fmt.Sprintf("configuration error: the %s ApplicationDefinition declares an invalid %s: %v", r.kindName, appsv1alpha1.NameSchemaExtension, r.nameSchemaErr)))
+		return allErrs
+	}
+
+	reason := fmt.Sprintf("release prefix %q", r.releaseConfig.Prefix)
+	if declared := r.nameSchema; declared != nil && declared.MaxLength != nil && *declared.MaxLength < int64(maxLen) {
+		maxLen = int(*declared.MaxLength)
+		reason = r.declaredReason()
+	}
 
 	if len(name) > maxLen {
 		allErrs = append(allErrs, field.Invalid(fldPath, name,
-			fmt.Sprintf("must be no more than %d characters (release prefix %q)", maxLen, r.releaseConfig.Prefix)))
+			fmt.Sprintf("must be no more than %d characters (%s)", maxLen, reason)))
 	}
 	return allErrs
 }
@@ -1352,6 +1567,7 @@ func (r *REST) convertHelmReleaseToApplication(ctx context.Context, hr *helmv2.H
 			ResourceVersion:   hr.GetResourceVersion(),
 			CreationTimestamp: hr.CreationTimestamp,
 			DeletionTimestamp: hr.DeletionTimestamp,
+			Finalizers:        garbageCollectionFinalizers(hr.Finalizers),
 			Labels:            filterPrefixedMap(hr.Labels, LabelPrefix),
 			Annotations:       filterPrefixedMap(hr.Annotations, AnnotationPrefix),
 		},
@@ -1423,6 +1639,12 @@ func (r *REST) convertHelmReleaseToApplication(ctx context.Context, hr *helmv2.H
 			// Concrete failure takes priority over unknown/pending state
 			workloadsCondition.Status = metav1.ConditionFalse
 			workloadsCondition.Message = "One or more workloads are not operational"
+			if len(ws.messages) > 0 {
+				workloadsCondition.Message = strings.Join(ws.messages, "; ")
+			}
+			if ws.reason != "" {
+				workloadsCondition.Reason = ws.reason
+			}
 		case ws.unknown:
 			workloadsCondition.Status = metav1.ConditionUnknown
 			workloadsCondition.Reason = "Pending"
@@ -1465,6 +1687,12 @@ type workloadsStatus struct {
 	operational bool
 	found       bool
 	unknown     bool // true when at least one monitor has nil Operational (not yet reconciled)
+	// messages are the non-empty status messages of the monitors that are not
+	// operational, sorted so repeated conversions produce identical content.
+	messages []string
+	// reason is the status Reason of a monitor that is not operational and
+	// names its cause, such as DataVolumeNotReady; empty when none does.
+	reason string
 	// transitionTime is the most recent metadata update time across the
 	// matching monitors. Used as WorkloadsReady.LastTransitionTime so that
 	// repeated conversions for the same underlying state produce stable
@@ -1511,19 +1739,32 @@ func (r *REST) getWorkloadsOperational(ctx context.Context, namespace, appName s
 	}
 	operational := true
 	unknown := false
+	var messages, reasons []string
 	var latest metav1.Time
 	for _, m := range monitors.Items {
 		if m.Status.Operational == nil {
 			unknown = true
 		} else if !*m.Status.Operational {
 			operational = false
+			if m.Status.Message != "" {
+				messages = append(messages, m.Status.Message)
+			}
+			if m.Status.Reason != "" {
+				reasons = append(reasons, m.Status.Reason)
+			}
 		}
 		// Pick the most recent monitor mtime as a stable transition time.
 		if t := latestMonitorTime(&m); t.After(latest.Time) {
 			latest = t
 		}
 	}
-	return workloadsStatus{operational: operational, found: true, unknown: unknown, transitionTime: latest}, nil
+	sort.Strings(messages)
+	sort.Strings(reasons)
+	var reason string
+	if len(reasons) > 0 {
+		reason = reasons[0]
+	}
+	return workloadsStatus{operational: operational, found: true, unknown: unknown, messages: messages, reason: reason, transitionTime: latest}, nil
 }
 
 // latestMonitorTime returns the most recent timestamp associated with a
@@ -1533,8 +1774,45 @@ func latestMonitorTime(m *cozyv1alpha1.WorkloadMonitor) metav1.Time {
 	return m.CreationTimestamp
 }
 
-// convertApplicationToHelmRelease implements the actual conversion logic
+// convertApplicationToHelmRelease implements the actual conversion logic.
+//
+// Spec.Interval, Install/Upgrade.Strategy{Name=RetryOnFailure,RetryInterval},
+// Install/Upgrade.Timeout, and Spec.MaxHistory are populated from
+// ReleaseConfig fields fed by the cozystack-api server flags
+// (--helmrelease-{interval,retry-interval,install-timeout,upgrade-timeout,
+// max-history}). This mirrors cozystack-operator's
+// PackageReconciler.buildHelmReleaseSpec so both HelmRelease-generating paths
+// share the same retry strategy, history retention, and reconcile cadence.
+//
+// Strategy.Name=RetryOnFailure with an explicit RetryInterval (rather than
+// Remediation{Retries:-1}) decouples failed install/upgrade retry timing
+// from Spec.Interval — the previous coupling caused failed installs to
+// retry only every 5m, exceeding E2E budgets.
 func (r *REST) convertApplicationToHelmRelease(app *appsv1alpha1.Application) (*helmv2.HelmRelease, error) {
+	// Kind-wide annotation overrides from this kind's ApplicationDefinition
+	// win over the global defaults (HelmReleaseInstallTimeout /
+	// HelmReleaseUpgradeTimeout):
+	//   - HelmInstallTimeout (release.cozystack.io/helm-install-timeout)
+	//     sets both Install.Timeout and Upgrade.Timeout;
+	//   - HelmUpgradeTimeout (release.cozystack.io/helm-upgrade-timeout)
+	//     then overrides only Upgrade.Timeout, so a kind can carry an
+	//     asymmetric budget (short install, long upgrade or vice versa).
+	// Both annotations live on the kind's ApplicationDefinition (for a
+	// kind shipped in this repo, the cozyrds manifest of its -rd
+	// package), so a kind whose chart can legitimately outlast the
+	// global wait budget opts in there rather than raising the default
+	// for every kind.
+	installTimeout := r.releaseConfig.HelmReleaseInstallTimeout
+	upgradeTimeout := r.releaseConfig.HelmReleaseUpgradeTimeout
+	if r.releaseConfig.HelmInstallTimeout > 0 {
+		installTimeout = r.releaseConfig.HelmInstallTimeout
+		upgradeTimeout = r.releaseConfig.HelmInstallTimeout
+	}
+	if r.releaseConfig.HelmUpgradeTimeout > 0 {
+		upgradeTimeout = r.releaseConfig.HelmUpgradeTimeout
+	}
+
+	maxHistory := r.releaseConfig.HelmReleaseMaxHistory
 	helmRelease := &helmv2.HelmRelease{
 		TypeMeta: metav1.TypeMeta{
 			APIVersion: "helm.toolkit.fluxcd.io/v2",
@@ -1547,6 +1825,7 @@ func (r *REST) convertApplicationToHelmRelease(app *appsv1alpha1.Application) (*
 			Annotations:     addPrefixedMap(app.Annotations, AnnotationPrefix),
 			ResourceVersion: app.ResourceVersion,
 			UID:             app.UID,
+			Finalizers:      garbageCollectionFinalizers(app.Finalizers),
 		},
 		Spec: helmv2.HelmReleaseSpec{
 			ChartRef: &helmv2.CrossNamespaceSourceReference{
@@ -1554,15 +1833,20 @@ func (r *REST) convertApplicationToHelmRelease(app *appsv1alpha1.Application) (*
 				Name:      r.releaseConfig.ChartRef.Name,
 				Namespace: r.releaseConfig.ChartRef.Namespace,
 			},
-			Interval: metav1.Duration{Duration: 5 * time.Minute},
+			Interval:   metav1.Duration{Duration: r.releaseConfig.HelmReleaseInterval},
+			MaxHistory: &maxHistory,
 			Install: &helmv2.Install{
-				Remediation: &helmv2.InstallRemediation{
-					Retries: -1,
+				Timeout: &metav1.Duration{Duration: installTimeout},
+				Strategy: &helmv2.InstallStrategy{
+					Name:          string(helmv2.ActionStrategyRetryOnFailure),
+					RetryInterval: &metav1.Duration{Duration: r.releaseConfig.HelmReleaseRetryInterval},
 				},
 			},
 			Upgrade: &helmv2.Upgrade{
-				Remediation: &helmv2.UpgradeRemediation{
-					Retries: -1,
+				Timeout: &metav1.Duration{Duration: upgradeTimeout},
+				Strategy: &helmv2.UpgradeStrategy{
+					Name:          string(helmv2.ActionStrategyRetryOnFailure),
+					RetryInterval: &metav1.Duration{Duration: r.releaseConfig.HelmReleaseRetryInterval},
 				},
 			},
 			ValuesFrom: []helmv2.ValuesReference{
@@ -1575,26 +1859,53 @@ func (r *REST) convertApplicationToHelmRelease(app *appsv1alpha1.Application) (*
 		},
 	}
 
-	// Per-Application HelmRelease wait budget. The mechanism is generic:
-	// an ApplicationDefinition that sets
-	// release.cozystack.io/helm-install-timeout gets Install.Timeout and
-	// Upgrade.Timeout populated from ReleaseConfig.HelmInstallTimeout
-	// (parsed at startup). Applications that leave it unset keep flux
-	// defaults so their failed installs remediate on the normal cadence.
-	// kubernetes-rd and tenant-rd carry the annotation today: the
-	// Kubernetes Application's parent chart contains CAPI/Kamaji
-	// resources whose admin-kubeconfig Secret is provisioned
-	// asynchronously and Kamaji cold-start routinely exceeds flux's
-	// default wait budget, and the Tenant parent chart bootstraps the
-	// seaweedfs-db CNPG cluster whose first reconcile exceeds it too.
-	// Any future kind with the same shape can opt in by setting the
-	// same annotation.
-	if r.releaseConfig.HelmInstallTimeout > 0 {
-		timeout := metav1.Duration{Duration: r.releaseConfig.HelmInstallTimeout}
-		helmRelease.Spec.Install.Timeout = &timeout
-		helmRelease.Spec.Upgrade.Timeout = &timeout
+	// Per-Application HelmRelease wait disablement. An
+	// ApplicationDefinition that sets
+	// release.cozystack.io/helm-install-disable-wait: "true" gets
+	// Install.DisableWait and Upgrade.DisableWait set on the emitted
+	// HelmRelease. Required for parent charts that emit in-tenant child
+	// HelmReleases which cannot become Ready during the parent's own
+	// install (e.g. the Kubernetes Application emits cilium/coredns/csi/etc.
+	// HelmReleases that can never become Ready until worker nodes exist,
+	// plus a main-phase talos-reconcile Job that generates the
+	// TalosConfigTemplate the worker MachineSet clones from; without
+	// DisableWait the helm-controller blocks the release on those addon
+	// HelmReleases, which cannot happen during install).
+	if r.releaseConfig.HelmInstallDisableWait {
+		helmRelease.Spec.Install.DisableWait = true
+		helmRelease.Spec.Upgrade.DisableWait = true
+	}
+
+	// Helm apply-strategy override (release.cozystack.io/helm-server-side-apply).
+	// helm-controller v1.5.0 defaults to server-side apply, which force-owns every
+	// field the chart renders and reverts a value a runtime co-writer later sets. A
+	// kind that has such a co-writer — the postgres read-replica autoscaler, where
+	// KEDA's HPA writes the CNPG Cluster's /scale subresource (spec.instances) while
+	// the chart renders a constant seed — sets this false to get client-side apply,
+	// under which helm-controller patches the Cluster (a CRD) from the previous-vs-new
+	// rendered manifest and does not consult live state, so the unchanged constant
+	// render yields no patch and KEDA's live value survives. Left unset, the
+	// helm-controller default applies.
+	if r.releaseConfig.HelmServerSideApply != nil {
+		// Copy into a fresh local rather than aliasing the shared ReleaseConfig pointer
+		// across every emitted HelmRelease (defense-in-depth; matches the maxHistory pattern).
+		ssa := *r.releaseConfig.HelmServerSideApply
+		helmRelease.Spec.Install.ServerSideApply = &ssa
+		if ssa {
+			helmRelease.Spec.Upgrade.ServerSideApply = helmv2.ServerSideApplyEnabled
+		} else {
+			helmRelease.Spec.Upgrade.ServerSideApply = helmv2.ServerSideApplyDisabled
+		}
 	}
 
+	// kstatus readiness (issue #2642): set the wait strategy + CEL health
+	// expressions so the release reports Ready only when the rendered CR is
+	// actually healthy instead of as soon as helm applies it. ResolveWaitStrategy
+	// couples the default — expressions imply the poller strategy when none is
+	// set, since healthCheckExprs are only evaluated under poller.
+	helmRelease.Spec.HealthCheckExprs = r.releaseConfig.HealthCheckExprs
+	helmRelease.Spec.WaitStrategy = config.ResolveWaitStrategy(r.releaseConfig.WaitStrategy, len(r.releaseConfig.HealthCheckExprs) > 0)
+
 	return helmRelease, nil
 }
 
@@ -1642,6 +1953,7 @@ func (r *REST) buildTableFromApplications(apps []appsv1alpha1.Application) metav
 		ColumnDefinitions: []metav1.TableColumnDefinition{
 			{Name: "NAME", Type: "string", Description: "Name of the Application", Priority: 0},
 			{Name: "READY", Type: "string", Description: "Ready status of the Application", Priority: 0},
+			{Name: "WORKLOADS", Type: "string", Description: "Status of the WorkloadsReady condition, <none> when the Application has no WorkloadMonitor", Priority: 0},
 			{Name: "AGE", Type: "string", Description: "Age of the Application", Priority: 0},
 			{Name: "VERSION", Type: "string", Description: "Version of the Application", Priority: 0},
 		},
@@ -1652,7 +1964,7 @@ func (r *REST) buildTableFromApplications(apps []appsv1alpha1.Application) metav
 	for i := range apps {
 		app := &apps[i]
 		row := metav1.TableRow{
-			Cells:  []any{app.GetName(), getReadyStatus(app.Status.Conditions), computeAge(app.GetCreationTimestamp().Time, now), getVersion(app.Status.Version)},
+			Cells:  []any{app.GetName(), conditionStatus(app.Status.Conditions, "Ready", "Unknown"), conditionStatus(app.Status.Conditions, "WorkloadsReady", "<none>"), computeAge(app.GetCreationTimestamp().Time, now), getVersion(app.Status.Version)},
 			Object: runtime.RawExtension{Object: app},
 		}
 		table.Rows = append(table.Rows, row)
@@ -1667,6 +1979,7 @@ func (r *REST) buildTableFromApplication(app appsv1alpha1.Application) metav1.Ta
 		ColumnDefinitions: []metav1.TableColumnDefinition{
 			{Name: "NAME", Type: "string", Description: "Name of the Application", Priority: 0},
 			{Name: "READY", Type: "string", Description: "Ready status of the Application", Priority: 0},
+			{Name: "WORKLOADS", Type: "string", Description: "Status of the WorkloadsReady condition, <none> when the Application has no WorkloadMonitor", Priority: 0},
 			{Name: "AGE", Type: "string", Description: "Age of the Application", Priority: 0},
 			{Name: "VERSION", Type: "string", Description: "Version of the Application", Priority: 0},
 		},
@@ -1676,7 +1989,7 @@ func (r *REST) buildTableFromApplication(app appsv1alpha1.Application) metav1.Ta
 
 	a := app
 	row := metav1.TableRow{
-		Cells:  []any{app.GetName(), getReadyStatus(app.Status.Conditions), computeAge(app.GetCreationTimestamp().Time, now), getVersion(app.Status.Version)},
+		Cells:  []any{app.GetName(), conditionStatus(app.Status.Conditions, "Ready", "Unknown"), conditionStatus(app.Status.Conditions, "WorkloadsReady", "<none>"), computeAge(app.GetCreationTimestamp().Time, now), getVersion(app.Status.Version)},
 		Object: runtime.RawExtension{Object: &a},
 	}
 	table.Rows = append(table.Rows, row)
@@ -1706,10 +2019,11 @@ func computeAge(creationTime, currentTime time.Time) string {
 	return duration.HumanDuration(ageDuration)
 }
 
-// getReadyStatus returns the ready status based on conditions
-func getReadyStatus(conditions []metav1.Condition) string {
+// conditionStatus returns the status of the condition of the given type, or
+// absent when there is none.
+func conditionStatus(conditions []metav1.Condition, conditionType, absent string) string {
 	for _, condition := range conditions {
-		if condition.Type == "Ready" {
+		if condition.Type == conditionType {
 			switch condition.Status {
 			case metav1.ConditionTrue:
 				return "True"
@@ -1720,7 +2034,7 @@ func getReadyStatus(conditions []metav1.Condition) string {
 			}
 		}
 	}
-	return "Unknown"
+	return absent
 }
 
 // computeTenantNamespace computes the namespace for a Tenant application based on the specified logic
@@ -1841,6 +2155,230 @@ func (r *REST) warnLegacyPresets(app *appsv1alpha1.Application) {
 	}
 }
 
+// kubernetesKind is the Application.Kind of the Kubernetes cluster CR whose
+// Phase 2-removed value keys the warning below reports on.
+const kubernetesKind = "Kubernetes"
+
+// removedKubernetesFields are Kubernetes CR value keys that Phase 2 moved to the
+// separate KubernetesNodes resource. They are still accepted and stored -- an
+// upgraded cluster keeps them in its values until re-edited, and the adoption
+// migration deliberately leaves them in place rather than rewriting parent
+// values mid-upgrade -- but they no longer render anything on the Kubernetes CR.
+var removedKubernetesFields = []string{"nodeGroups", "nodeHealthCheck", "maxNodeProvisionTime"}
+
+// warnRemovedKubernetesFields emits a client-facing admission warning for each
+// Phase 2-removed field still present in a Kubernetes CR's values, so an
+// operator editing one (e.g. bumping spec.nodeGroups.<x>.minReplicas) is told it
+// has no effect instead of silently getting nothing. Non-blocking: the field is
+// preserved as-is; worker pools are managed as KubernetesNodes resources.
+func (r *REST) warnRemovedKubernetesFields(ctx context.Context, app *appsv1alpha1.Application) {
+	if r.kindName != kubernetesKind || app == nil || app.Spec == nil || len(app.Spec.Raw) == 0 {
+		return
+	}
+	var values map[string]any
+	if err := json.Unmarshal(app.Spec.Raw, &values); err != nil {
+		return
+	}
+	for _, key := range removedKubernetesFields {
+		if _, present := values[key]; present {
+			warning.AddWarning(ctx, "", fmt.Sprintf(
+				"spec.%s is ignored on the Kubernetes resource since Phase 2: worker pools are managed as separate KubernetesNodes resources (see the kubernetes-nodes chart). The field is stored but has no effect.", key))
+		}
+	}
+}
+
+// removedUserPasswordKinds are the Application kinds whose per-user `password`
+// field was removed from the chart render -- passwords are chart-generated into
+// the <release>-credentials Secret. Like the Kubernetes fields above the key is
+// still accepted and stored (the user object's schema keeps additionalProperties
+// open, and the render preserves an existing password through lookup), so a value
+// left from before the upgrade stays the LIVE credential and there is no longer a
+// values knob to change it. Warn so an operator editing it is told it has no
+// effect instead of getting a silent 200.
+var removedUserPasswordKinds = map[string]bool{
+	postgresKind: true,
+	mariadbKind:  true,
+}
+
+const (
+	postgresKind = "Postgres"
+	mariadbKind  = "MariaDB"
+)
+
+// warnRemovedUserPasswords emits a client-facing admission warning for every
+// spec.users[<name>].password still present on a Postgres or MariaDB resource.
+func (r *REST) warnRemovedUserPasswords(ctx context.Context, app *appsv1alpha1.Application) {
+	if !removedUserPasswordKinds[r.kindName] || app == nil || app.Spec == nil || len(app.Spec.Raw) == 0 {
+		return
+	}
+	// Decode the users map leniently, then each user on its own, so one malformed
+	// entry cannot suppress the warning for another: a single json.Unmarshal into a
+	// typed struct returns the first type error and discards every field it already
+	// decoded, so one user sent with a non-object value would mute the warning for a
+	// sibling user that does carry a removed password.
+	var top map[string]json.RawMessage
+	if err := json.Unmarshal(app.Spec.Raw, &top); err != nil {
+		return
+	}
+	var users map[string]json.RawMessage
+	if raw, ok := top["users"]; ok {
+		// A malformed users shape (not a map) carries no per-user password we
+		// recognise; ignore it rather than fail the whole decode.
+		_ = json.Unmarshal(raw, &users)
+	}
+	for user, raw := range users {
+		// Each chart hard-manages one reserved superuser (MariaDB root, Postgres
+		// "postgres"); it is warned about as a whole below, so skip it here to avoid
+		// a second, partial "password is ignored" warning on the same key that reads
+		// as if the rest of the entry were fine.
+		if (r.kindName == mariadbKind && user == "root") || (r.kindName == postgresKind && user == "postgres") {
+			continue
+		}
+		var u map[string]json.RawMessage
+		// A non-object user value is not one this warning is about; skip it
+		// rather than letting one malformed entry mute the rest.
+		if json.Unmarshal(raw, &u) != nil {
+			continue
+		}
+		if _, present := u["password"]; present {
+			warning.AddWarning(ctx, "", fmt.Sprintf(
+				"spec.users[%q].password is ignored: passwords are auto-generated into the <release>-credentials Secret and cannot be set from values. Read the current password from that Secret; editing this field has no effect.", user))
+		}
+	}
+	// MariaDB force-generates root's password (root is chart-managed), silently
+	// discarding any value-supplied users.root. Postgres hard-rejects users.postgres
+	// at render, but MariaDB accepts-and-ignores it — a hard reject would wedge an
+	// existing release that already lists it on upgrade — so warn that it has no
+	// effect rather than reject.
+	if r.kindName == mariadbKind {
+		if _, ok := users["root"]; ok {
+			warning.AddWarning(ctx, "",
+				"spec.users.root is ignored: root is chart-managed and its password is always auto-generated. Editing it has no effect.")
+		}
+	}
+	// Postgres hard-rejects users.postgres at render (the chart fails the release),
+	// so warn about the KEY at admission rather than letting only the generic
+	// "password is ignored" warning fire, which reads as if the entry were otherwise
+	// accepted and hides that the whole release will not reconcile until it is removed.
+	if r.kindName == postgresKind {
+		if _, ok := users["postgres"]; ok {
+			warning.AddWarning(ctx, "",
+				"spec.users.postgres is not allowed: postgres is the CNPG-managed superuser and cannot be redefined as an app user; the release will fail to render until it is removed.")
+		}
+	}
+}
+
+func dnsName(s string) string { return strings.ReplaceAll(s, "_", "-") }
+
+// collisionSpec buckets the three "_"/"-" collision namespaces the mariadb chart
+// guards — usernames, database names, and (database,user) Grant pairs — as maps
+// from a rendered DNS name to the human-readable sources that produce it. A key
+// with >=2 sources is a collision. The chart renders each name as
+// <release>-<replace "_" "-">, so the constant release prefix is dropped here; it
+// does not change which names collide.
+type collisionSpec struct {
+	users     map[string][]string
+	databases map[string][]string
+	grants    map[string][]string
+}
+
+// parseCollisionSpec decodes an Application's raw spec leniently (a malformed
+// shape contributes nothing rather than erroring), mirroring the chart's Grant
+// derivation: admin members plus readonly members not already in admin.
+func parseCollisionSpec(raw []byte) collisionSpec {
+	cs := collisionSpec{users: map[string][]string{}, databases: map[string][]string{}, grants: map[string][]string{}}
+	if len(raw) == 0 {
+		return cs
+	}
+	var top map[string]json.RawMessage
+	if json.Unmarshal(raw, &top) != nil {
+		return cs
+	}
+	var users map[string]json.RawMessage
+	if u, ok := top["users"]; ok {
+		_ = json.Unmarshal(u, &users)
+	}
+	for name := range users {
+		d := dnsName(name)
+		cs.users[d] = append(cs.users[d], name)
+	}
+	var dbs map[string]json.RawMessage
+	if d, ok := top["databases"]; ok {
+		_ = json.Unmarshal(d, &dbs)
+	}
+	for db, rawDB := range dbs {
+		cs.databases[dnsName(db)] = append(cs.databases[dnsName(db)], db)
+		var body struct {
+			Roles struct {
+				Admin    []string `json:"admin"`
+				Readonly []string `json:"readonly"`
+			} `json:"roles"`
+		}
+		if json.Unmarshal(rawDB, &body) != nil {
+			continue
+		}
+		seen := map[string]bool{}
+		for _, u := range append(append([]string{}, body.Roles.Admin...), body.Roles.Readonly...) {
+			if seen[u] {
+				continue // a user in both roles renders one Grant (admin ALL wins)
+			}
+			seen[u] = true
+			g := dnsName(db) + "-" + dnsName(u)
+			cs.grants[g] = append(cs.grants[g], fmt.Sprintf("(database %q, user %q)", db, u))
+		}
+	}
+	return cs
+}
+
+// introducedCollisions returns, per DNS name, the sorted new sources that collide
+// on it — but only when the old spec did not already carry that collision (an
+// inherited one is left alone, exactly as the install-gated render guard does).
+func introducedCollisions(oldByDNS, newByDNS map[string][]string) map[string][]string {
+	out := map[string][]string{}
+	for dns, names := range newByDNS {
+		if len(names) < 2 || len(oldByDNS[dns]) >= 2 {
+			continue
+		}
+		s := append([]string(nil), names...)
+		sort.Strings(s)
+		out[dns] = s
+	}
+	return out
+}
+
+// warnUpgradeIntroducedCollisions warns when an UPDATE introduces a "_"/"-"
+// collision the old object did not carry, in any of the three namespaces MariaDB
+// renders as <release>-<replace "_" "-">: usernames (one User CR), database names
+// (one Database CR), and (database,user) Grant pairs (one Grant CR). In each the
+// colliding names produce one resource and one silently overwrites the other. The
+// chart's render guards for all three are gated to install — blocking on upgrade
+// would wedge a release that already inherited the pair — so an upgrade that
+// INTRODUCES one renders silently. The aggregated apiserver holds both specs here
+// and can tell an introduced collision from an inherited one, closing the gap for
+// all three without touching the inherited case. Warns rather than rejects,
+// matching the removed-password warning and keeping an already-broken release
+// editable. MariaDB-only; Postgres has no "_"→"-" resource mapping.
+func (r *REST) warnUpgradeIntroducedCollisions(ctx context.Context, oldObj runtime.Object, newApp *appsv1alpha1.Application) {
+	if r.kindName != mariadbKind || newApp == nil || newApp.Spec == nil {
+		return
+	}
+	newCS := parseCollisionSpec(newApp.Spec.Raw)
+	oldCS := parseCollisionSpec(nil)
+	if oldApp, ok := oldObj.(*appsv1alpha1.Application); ok && oldApp.Spec != nil {
+		oldCS = parseCollisionSpec(oldApp.Spec.Raw)
+	}
+	warn := func(kind, resource string, oldG, newG map[string][]string) {
+		for dns, names := range introducedCollisions(oldG, newG) {
+			warning.AddWarning(ctx, "", fmt.Sprintf(
+				"%s %v map to the same mariadb-operator %s name %q (\"_\" renders as \"-\"); one silently overwrites the other. Rename one before applying.",
+				kind, names, resource, dns))
+		}
+	}
+	warn("spec.users", "User", oldCS.users, newCS.users)
+	warn("spec.databases", "Database", oldCS.databases, newCS.databases)
+	warn("Grant pairs", "Grant", oldCS.grants, newCS.grants)
+}
+
 // errNotAcceptable indicates that the resource does not support conversion to Table
 type errNotAcceptable struct {
 	resource schema.GroupResource
diff --git a/pkg/registry/apps/application/rest_conditions_test.go b/pkg/registry/apps/application/rest_conditions_test.go
index 185f59b236..bcb5a565a6 100644
--- a/pkg/registry/apps/application/rest_conditions_test.go
+++ b/pkg/registry/apps/application/rest_conditions_test.go
@@ -5,12 +5,11 @@ import (
 	"testing"
 
 	cozyv1alpha1 "github.com/cozystack/cozystack/api/v1alpha1"
-	helmv2 "github.com/fluxcd/helm-controller/api/v2"
 	appsv1alpha1 "github.com/cozystack/cozystack/pkg/apis/apps/v1alpha1"
 	"github.com/cozystack/cozystack/pkg/config"
+	helmv2 "github.com/fluxcd/helm-controller/api/v2"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/utils/ptr"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
 )
 
@@ -50,7 +49,7 @@ func TestConvertConditions_WorkloadsReadyAdded(t *testing.T) {
 			},
 		},
 		Status: cozyv1alpha1.WorkloadMonitorStatus{
-			Operational: ptr.To(true),
+			Operational: new(true),
 		},
 	}
 
@@ -97,7 +96,7 @@ func TestConvertConditions_ReadyNotOverriddenWhenWorkloadsNotReady(t *testing.T)
 			},
 		},
 		Status: cozyv1alpha1.WorkloadMonitorStatus{
-			Operational: ptr.To(false),
+			Operational: new(false),
 		},
 	}
 
@@ -170,7 +169,7 @@ func TestConvertConditions_ReadyStaysTrue_WhenAllOperational(t *testing.T) {
 			},
 		},
 		Status: cozyv1alpha1.WorkloadMonitorStatus{
-			Operational: ptr.To(true),
+			Operational: new(true),
 		},
 	}
 
@@ -210,7 +209,7 @@ func TestConvertConditions_WorkloadsReadyTimestampIsNonZero(t *testing.T) {
 			},
 		},
 		Status: cozyv1alpha1.WorkloadMonitorStatus{
-			Operational: ptr.To(true),
+			Operational: new(true),
 		},
 	}
 
@@ -327,5 +326,3 @@ func TestConvertConditions_WorkloadsReadyUnknownOnError(t *testing.T) {
 		t.Errorf("expected Ready=True (fail-open on error), got %s", rc.Status)
 	}
 }
-
-
diff --git a/pkg/registry/apps/application/rest_conflict_test.go b/pkg/registry/apps/application/rest_conflict_test.go
new file mode 100644
index 0000000000..a8de05492d
--- /dev/null
+++ b/pkg/registry/apps/application/rest_conflict_test.go
@@ -0,0 +1,150 @@
+/*
+Copyright 2026 The Cozystack Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package application
+
+import (
+	"context"
+	"errors"
+	"testing"
+
+	helmv2 "github.com/fluxcd/helm-controller/api/v2"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apiserver/pkg/endpoints/request"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/client/fake"
+	"sigs.k8s.io/controller-runtime/pkg/client/interceptor"
+
+	appsv1alpha1 "github.com/cozystack/cozystack/pkg/apis/apps/v1alpha1"
+	"github.com/cozystack/cozystack/pkg/config"
+)
+
+// TestUpdate_RetriesOnResourceVersionConflict pins the retry.RetryOnConflict
+// wrapper around the HelmRelease write in REST.Update.
+//
+// Flux's helm-controller continuously rewrites a HelmRelease's status, which
+// shares the object's resourceVersion. When a caller updates an Application CR
+// while a prior reconcile is still in flight, the resourceVersion read by
+// Update goes stale and the write is rejected with a 409 Conflict. Apart from
+// suspend, which TestUpdate_RefreshesSuspendOnConflictRetry covers, the
+// HelmRelease spec is derived from the Application the caller just applied, so
+// a stale-resourceVersion conflict is never a real spec conflict: Update must
+// refresh the resourceVersion and retry rather than surface the 409.
+//
+// The fake client returns one Conflict on the first HelmRelease Update, then
+// lets the second through. A regression that drops the retry makes the first
+// 409 fatal and this test fails.
+func TestUpdate_RetriesOnResourceVersionConflict(t *testing.T) {
+	scheme := runtime.NewScheme()
+	if err := helmv2.AddToScheme(scheme); err != nil {
+		t.Fatalf("register helmv2 scheme: %v", err)
+	}
+	resourceCfg := &config.ResourceConfig{
+		Resources: []config.Resource{
+			{Application: config.ApplicationConfig{Kind: "MySQL"}},
+		},
+	}
+	if err := appsv1alpha1.RegisterDynamicTypes(scheme, resourceCfg); err != nil {
+		t.Fatalf("register dynamic types: %v", err)
+	}
+
+	// Pre-populate the HelmRelease so Update takes the update path (not the
+	// forceAllowCreate upsert path).
+	existing := &helmv2.HelmRelease{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "mysql-good-name",
+			Namespace: "tenant-foo",
+			Labels: map[string]string{
+				ApplicationKindLabel:  "MySQL",
+				ApplicationGroupLabel: appsv1alpha1.GroupName,
+				ApplicationNameLabel:  "good-name",
+			},
+		},
+	}
+
+	var updateCalls int
+	fakeClient := fake.NewClientBuilder().
+		WithScheme(scheme).
+		WithObjects(existing).
+		WithInterceptorFuncs(interceptor.Funcs{
+			Update: func(ctx context.Context, c client.WithWatch, obj client.Object, opts ...client.UpdateOption) error {
+				if _, ok := obj.(*helmv2.HelmRelease); ok {
+					updateCalls++
+					if updateCalls == 1 {
+						// Mimic the helm-controller racing the write: a 409 on
+						// the stale resourceVersion. IsConflict only keys on the
+						// status reason, so the GroupResource here is cosmetic.
+						return apierrors.NewConflict(
+							schema.GroupResource{Group: "helm.toolkit.fluxcd.io", Resource: "helmreleases"},
+							obj.GetName(),
+							errors.New("simulated stale resourceVersion"),
+						)
+					}
+				}
+				return c.Update(ctx, obj, opts...)
+			},
+		}).
+		Build()
+
+	r := &REST{
+		c: fakeClient,
+		gvr: schema.GroupVersionResource{
+			Group:    appsv1alpha1.GroupName,
+			Version:  "v1alpha1",
+			Resource: "mysqls",
+		},
+		gvk: schema.GroupVersionKind{
+			Group:   appsv1alpha1.GroupName,
+			Version: "v1alpha1",
+			Kind:    "MySQL",
+		},
+		kindName: "MySQL",
+		releaseConfig: config.ReleaseConfig{
+			Prefix: "mysql-",
+		},
+	}
+
+	app := &appsv1alpha1.Application{
+		TypeMeta: metav1.TypeMeta{
+			APIVersion: "apps.cozystack.io/v1alpha1",
+			Kind:       "MySQL",
+		},
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "good-name",
+			Namespace: "tenant-foo",
+		},
+	}
+
+	ctx := request.WithNamespace(context.Background(), "tenant-foo")
+	_, _, err := r.Update(
+		ctx,
+		"good-name",
+		newDefaultUpdatedObjectInfo(app),
+		nil,   // createValidation
+		nil,   // updateValidation
+		false, // forceAllowCreate=false: stay on the Update path
+		&metav1.UpdateOptions{},
+	)
+	if err != nil {
+		t.Fatalf("expected Update to succeed after retrying the conflict, got %v", err)
+	}
+	if updateCalls != 2 {
+		t.Errorf("expected exactly 2 HelmRelease Update attempts (1 conflict + 1 success), got %d", updateCalls)
+	}
+}
diff --git a/pkg/registry/apps/application/rest_garbage_collection_test.go b/pkg/registry/apps/application/rest_garbage_collection_test.go
new file mode 100644
index 0000000000..556a3fd389
--- /dev/null
+++ b/pkg/registry/apps/application/rest_garbage_collection_test.go
@@ -0,0 +1,196 @@
+package application
+
+import (
+	"context"
+	"errors"
+	"slices"
+	"testing"
+
+	helmv2 "github.com/fluxcd/helm-controller/api/v2"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apiserver/pkg/endpoints/request"
+	"k8s.io/apiserver/pkg/registry/rest"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/client/interceptor"
+
+	appsv1alpha1 "github.com/cozystack/cozystack/pkg/apis/apps/v1alpha1"
+)
+
+func TestApplicationGarbageCollection(t *testing.T) {
+	for _, finalizer := range []string{metav1.FinalizerDeleteDependents, metav1.FinalizerOrphanDependents} {
+		for _, helmFirst := range []bool{true, false} {
+			order := "gc-first"
+			if helmFirst {
+				order = "helm-first"
+			}
+			t.Run(finalizer+"/"+order, func(t *testing.T) {
+				hr := optionsTestHelmRelease()
+				hr.UID = "release-uid"
+				now := metav1.Now()
+				hr.DeletionTimestamp = &now
+				hr.Finalizers = []string{finalizer}
+				if !helmFirst {
+					hr.Finalizers = append(hr.Finalizers, "finalizers.fluxcd.io")
+				}
+				r := newOptionsTestREST(t, interceptor.Funcs{}, hr)
+				ctx := request.WithNamespace(context.Background(), optionsTestNamespace)
+				obj, err := r.Get(ctx, "example", &metav1.GetOptions{})
+				if err != nil {
+					t.Fatal(err)
+				}
+				app := obj.(*appsv1alpha1.Application)
+				if app.UID != hr.UID || app.DeletionTimestamp == nil {
+					t.Fatalf("deletion identity lost: %v", app.ObjectMeta)
+				}
+				if !slices.Contains(app.Finalizers, finalizer) {
+					t.Fatalf("garbage collector cannot see %q: %v", finalizer, app.Finalizers)
+				}
+				app.Finalizers = slices.DeleteFunc(app.Finalizers, func(f string) bool { return f == finalizer })
+				if _, _, err := r.Update(ctx, app.Name, rest.DefaultUpdatedObjectInfo(app), nil, nil, false, &metav1.UpdateOptions{}); err != nil {
+					t.Fatal(err)
+				}
+				live := &helmv2.HelmRelease{}
+				err = r.c.Get(ctx, client.ObjectKeyFromObject(hr), live)
+				if helmFirst {
+					if !apierrors.IsNotFound(err) {
+						t.Fatalf("release still exists after cleanup: err=%v, finalizers=%v", err, live.Finalizers)
+					}
+					return
+				}
+				if err != nil {
+					t.Fatal(err)
+				}
+				if !slices.Equal(live.Finalizers, []string{"finalizers.fluxcd.io"}) {
+					t.Fatalf("Helm cleanup protection changed: %v", live.Finalizers)
+				}
+				live.Finalizers = nil
+				if err := r.c.Update(ctx, live); err != nil {
+					t.Fatal(err)
+				}
+				if err := r.c.Get(ctx, client.ObjectKeyFromObject(hr), live); !apierrors.IsNotFound(err) {
+					t.Fatalf("release still exists after Helm cleanup: %v", err)
+				}
+			})
+		}
+	}
+}
+
+func TestApplicationGarbageCollectionConflict(t *testing.T) {
+	for _, concurrent := range []struct {
+		name      string
+		initial   []string
+		requested []string
+		updated   []string
+		expected  []string
+	}{
+		{"helm-completes", []string{metav1.FinalizerDeleteDependents, "finalizers.fluxcd.io", "test.example/hold"}, nil, []string{metav1.FinalizerDeleteDependents, "test.example/hold"}, []string{"test.example/hold"}},
+		{"controller-adds-finalizer", []string{metav1.FinalizerDeleteDependents}, nil, []string{metav1.FinalizerDeleteDependents, "finalizers.fluxcd.io"}, []string{"finalizers.fluxcd.io"}},
+		{"gc-starts-during-update", []string{"finalizers.fluxcd.io"}, nil, []string{"finalizers.fluxcd.io", metav1.FinalizerDeleteDependents}, []string{"finalizers.fluxcd.io", metav1.FinalizerDeleteDependents}},
+		{"gc-finishes-during-update", []string{"finalizers.fluxcd.io", metav1.FinalizerDeleteDependents}, []string{metav1.FinalizerDeleteDependents}, []string{"finalizers.fluxcd.io"}, []string{"finalizers.fluxcd.io"}},
+	} {
+		t.Run(concurrent.name, func(t *testing.T) {
+			hr := optionsTestHelmRelease()
+			hr.Finalizers = concurrent.initial
+			updates := 0
+			r := newOptionsTestREST(t, interceptor.Funcs{
+				Update: func(ctx context.Context, c client.WithWatch, obj client.Object, opts ...client.UpdateOption) error {
+					updates++
+					if updates > 1 {
+						return c.Update(ctx, obj, opts...)
+					}
+					live := &helmv2.HelmRelease{}
+					if err := c.Get(ctx, client.ObjectKeyFromObject(hr), live); err != nil {
+						return err
+					}
+					live.Finalizers = slices.Clone(concurrent.updated)
+					if err := c.Update(ctx, live); err != nil {
+						return err
+					}
+					return apierrors.NewConflict(helmv2.GroupVersion.WithResource("helmreleases").GroupResource(), hr.Name, errors.New("concurrent controller update"))
+				},
+			}, hr)
+			ctx := request.WithNamespace(context.Background(), optionsTestNamespace)
+			obj, err := r.Get(ctx, "example", &metav1.GetOptions{})
+			if err != nil {
+				t.Fatal(err)
+			}
+			app := obj.(*appsv1alpha1.Application)
+			app.Finalizers = concurrent.requested
+			if _, _, err := r.Update(ctx, app.Name, rest.DefaultUpdatedObjectInfo(app), nil, nil, false, &metav1.UpdateOptions{}); err != nil {
+				t.Fatal(err)
+			}
+			live := &helmv2.HelmRelease{}
+			if err := r.c.Get(ctx, client.ObjectKeyFromObject(hr), live); err != nil {
+				t.Fatal(err)
+			}
+			if updates != 2 {
+				t.Fatalf("update calls = %d, want 2", updates)
+			}
+			if !slices.Equal(live.Finalizers, concurrent.expected) {
+				t.Fatalf("finalizers = %v, want %v", live.Finalizers, concurrent.expected)
+			}
+		})
+	}
+}
+
+func TestApplicationFinalizersKeepControllerProtection(t *testing.T) {
+	hr := optionsTestHelmRelease()
+	hr.Finalizers = []string{"finalizers.fluxcd.io", metav1.FinalizerDeleteDependents}
+	r := newOptionsTestREST(t, interceptor.Funcs{}, hr)
+	ctx := request.WithNamespace(context.Background(), optionsTestNamespace)
+	obj, err := r.Get(ctx, "example", &metav1.GetOptions{})
+	if err != nil {
+		t.Fatal(err)
+	}
+	app := obj.(*appsv1alpha1.Application)
+	if !slices.Equal(app.Finalizers, []string{metav1.FinalizerDeleteDependents}) {
+		t.Fatalf("unexpected application finalizers: %v", app.Finalizers)
+	}
+	app.Finalizers = []string{"other.example/ignored"}
+	if _, _, err := r.Update(ctx, app.Name, rest.DefaultUpdatedObjectInfo(app), nil, nil, false, &metav1.UpdateOptions{}); err != nil {
+		t.Fatal(err)
+	}
+	live := &helmv2.HelmRelease{}
+	if err := r.c.Get(ctx, client.ObjectKeyFromObject(hr), live); err != nil {
+		t.Fatal(err)
+	}
+	if !slices.Equal(live.Finalizers, []string{"finalizers.fluxcd.io"}) {
+		t.Fatalf("controller finalizers changed: %v", live.Finalizers)
+	}
+}
+
+func TestApplicationFinalizersDoNotMutateCachedHelmRelease(t *testing.T) {
+	hr := optionsTestHelmRelease()
+	hr.Finalizers = []string{metav1.FinalizerDeleteDependents, "finalizers.fluxcd.io"}
+	r := newOptionsTestREST(t, interceptor.Funcs{})
+	app, err := r.ConvertHelmReleaseToApplication(context.Background(), hr)
+	if err != nil {
+		t.Fatal(err)
+	}
+	app.Finalizers[0] = metav1.FinalizerOrphanDependents
+	if !slices.Equal(hr.Finalizers, []string{metav1.FinalizerDeleteDependents, "finalizers.fluxcd.io"}) {
+		t.Fatalf("conversion changed cached finalizers: %v", hr.Finalizers)
+	}
+}
+
+func TestApplicationGarbageCollectionWithInPlaceUpdate(t *testing.T) {
+	hr := optionsTestHelmRelease()
+	hr.Finalizers = []string{metav1.FinalizerDeleteDependents}
+	now := metav1.Now()
+	hr.DeletionTimestamp = &now
+	r := newOptionsTestREST(t, interceptor.Funcs{}, hr)
+	ctx := request.WithNamespace(context.Background(), optionsTestNamespace)
+	update := rest.DefaultUpdatedObjectInfo(nil, func(_ context.Context, _, old runtime.Object) (runtime.Object, error) {
+		app := old.(*appsv1alpha1.Application)
+		app.Finalizers = nil
+		return app, nil
+	})
+	if _, _, err := r.Update(ctx, "example", update, nil, nil, false, &metav1.UpdateOptions{}); err != nil {
+		t.Fatal(err)
+	}
+	if err := r.c.Get(ctx, client.ObjectKeyFromObject(hr), &helmv2.HelmRelease{}); !apierrors.IsNotFound(err) {
+		t.Fatalf("release still exists after in-place finalizer removal: %v", err)
+	}
+}
diff --git a/pkg/registry/apps/application/rest_helmrelease_spec_test.go b/pkg/registry/apps/application/rest_helmrelease_spec_test.go
new file mode 100644
index 0000000000..2dd1ff32c3
--- /dev/null
+++ b/pkg/registry/apps/application/rest_helmrelease_spec_test.go
@@ -0,0 +1,282 @@
+/*
+Copyright 2026 The Cozystack Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package application
+
+import (
+	"testing"
+	"time"
+
+	helmv2 "github.com/fluxcd/helm-controller/api/v2"
+	"github.com/fluxcd/pkg/apis/kustomize"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	appsv1alpha1 "github.com/cozystack/cozystack/pkg/apis/apps/v1alpha1"
+	"github.com/cozystack/cozystack/pkg/config"
+)
+
+// Mirrors the operator-side TestBuildHelmReleaseSpec
+// (internal/operator/package_reconciler_test.go) so the api-side
+// HelmRelease shape stays in lockstep with cozystack-operator. The two
+// HelmRelease-generating paths must populate Interval, MaxHistory,
+// Strategy, RetryInterval, and Install/Upgrade.Timeout identically; drift
+// between them is the failure mode this test guards against.
+func TestConvertApplicationToHelmRelease_BuildsSpecFromConfig(t *testing.T) {
+	r := &REST{
+		kindName: "Postgres",
+		releaseConfig: config.ReleaseConfig{
+			Prefix: "postgres-",
+			ChartRef: config.ChartRefConfig{
+				Kind:      "HelmChart",
+				Name:      "postgres",
+				Namespace: "cozy-system",
+			},
+			HelmReleaseInterval:       42 * time.Second,
+			HelmReleaseRetryInterval:  17 * time.Second,
+			HelmReleaseInstallTimeout: 11 * time.Minute,
+			HelmReleaseUpgradeTimeout: 13 * time.Minute,
+			HelmReleaseMaxHistory:     7,
+		},
+	}
+	app := &appsv1alpha1.Application{
+		ObjectMeta: metav1.ObjectMeta{Name: "example", Namespace: "tenant-root"},
+	}
+
+	hr, err := r.convertApplicationToHelmRelease(app)
+	if err != nil {
+		t.Fatalf("convertApplicationToHelmRelease returned error: %v", err)
+	}
+
+	if hr.Spec.Interval.Duration != 42*time.Second {
+		t.Errorf("Interval = %v, want 42s", hr.Spec.Interval.Duration)
+	}
+	if hr.Spec.MaxHistory == nil {
+		t.Fatal("MaxHistory is nil, want pointer to 7")
+	}
+	if *hr.Spec.MaxHistory != 7 {
+		t.Errorf("MaxHistory = %d, want 7", *hr.Spec.MaxHistory)
+	}
+
+	if hr.Spec.ChartRef == nil {
+		t.Fatal("ChartRef is nil")
+	}
+	if hr.Spec.ChartRef.Kind != "HelmChart" {
+		t.Errorf("ChartRef.Kind = %q, want HelmChart", hr.Spec.ChartRef.Kind)
+	}
+	if hr.Spec.ChartRef.Name != "postgres" {
+		t.Errorf("ChartRef.Name = %q, want postgres", hr.Spec.ChartRef.Name)
+	}
+	if hr.Spec.ChartRef.Namespace != "cozy-system" {
+		t.Errorf("ChartRef.Namespace = %q, want cozy-system", hr.Spec.ChartRef.Namespace)
+	}
+
+	if hr.Spec.Install == nil {
+		t.Fatal("Install is nil")
+	}
+	if hr.Spec.Install.Timeout == nil || hr.Spec.Install.Timeout.Duration != 11*time.Minute {
+		t.Errorf("Install.Timeout = %v, want 11m", hr.Spec.Install.Timeout)
+	}
+	if hr.Spec.Install.Strategy == nil {
+		t.Fatal("Install.Strategy is nil")
+	}
+	if hr.Spec.Install.Strategy.Name != string(helmv2.ActionStrategyRetryOnFailure) {
+		t.Errorf("Install.Strategy.Name = %q, want %q", hr.Spec.Install.Strategy.Name, helmv2.ActionStrategyRetryOnFailure)
+	}
+	if hr.Spec.Install.Strategy.RetryInterval == nil || hr.Spec.Install.Strategy.RetryInterval.Duration != 17*time.Second {
+		t.Errorf("Install.Strategy.RetryInterval = %v, want 17s", hr.Spec.Install.Strategy.RetryInterval)
+	}
+	// Remediation must remain nil: retries are driven solely by
+	// Strategy.Name=RetryOnFailure with an explicit RetryInterval, the
+	// same single retry path cozystack-operator's PackageReconciler
+	// uses. Re-introducing Remediation{Retries: -1} "for safety" would
+	// add a second, conflicting retry mechanism and break parity with
+	// the operator path.
+	if hr.Spec.Install.Remediation != nil {
+		t.Errorf("Install.Remediation = %+v, want nil", hr.Spec.Install.Remediation)
+	}
+
+	if hr.Spec.Upgrade == nil {
+		t.Fatal("Upgrade is nil")
+	}
+	if hr.Spec.Upgrade.Timeout == nil || hr.Spec.Upgrade.Timeout.Duration != 13*time.Minute {
+		t.Errorf("Upgrade.Timeout = %v, want 13m", hr.Spec.Upgrade.Timeout)
+	}
+	if hr.Spec.Upgrade.Strategy == nil {
+		t.Fatal("Upgrade.Strategy is nil")
+	}
+	if hr.Spec.Upgrade.Strategy.Name != string(helmv2.ActionStrategyRetryOnFailure) {
+		t.Errorf("Upgrade.Strategy.Name = %q, want %q", hr.Spec.Upgrade.Strategy.Name, helmv2.ActionStrategyRetryOnFailure)
+	}
+	if hr.Spec.Upgrade.Strategy.RetryInterval == nil || hr.Spec.Upgrade.Strategy.RetryInterval.Duration != 17*time.Second {
+		t.Errorf("Upgrade.Strategy.RetryInterval = %v, want 17s", hr.Spec.Upgrade.Strategy.RetryInterval)
+	}
+	if hr.Spec.Upgrade.Remediation != nil {
+		t.Errorf("Upgrade.Remediation = %+v, want nil", hr.Spec.Upgrade.Remediation)
+	}
+}
+
+// Pins that MaxHistory=0 (unlimited history per Helm semantics) survives the
+// conversion — i.e. is set as a non-nil pointer to 0 rather than dropped or
+// replaced with a default. Mirrors the operator-side
+// TestBuildHelmReleaseSpecZeroMaxHistory.
+// convertApplicationToHelmRelease threads the kstatus readiness knobs from the
+// per-kind ReleaseConfig (populated from ApplicationDefinition spec.release) onto
+// the generated HelmRelease (issue #2642), coupling the poller default when
+// healthCheckExprs are present but no wait strategy was set — the api-side mirror
+// of the operator's TestBuildHelmReleaseSpecHealthCheckExprs.
+func TestConvertApplicationToHelmRelease_HealthCheckExprs(t *testing.T) {
+	exprs := []kustomize.CustomHealthCheck{{
+		APIVersion: "postgresql.cnpg.io/v1",
+		Kind:       "Cluster",
+	}}
+	r := &REST{
+		kindName: "Postgres",
+		releaseConfig: config.ReleaseConfig{
+			Prefix:           "postgres-",
+			ChartRef:         config.ChartRefConfig{Kind: "HelmChart", Name: "postgres", Namespace: "cozy-system"},
+			HealthCheckExprs: exprs,
+			// WaitStrategy intentionally unset: healthCheckExprs must couple poller.
+		},
+	}
+	app := &appsv1alpha1.Application{ObjectMeta: metav1.ObjectMeta{Name: "example", Namespace: "tenant-root"}}
+
+	hr, err := r.convertApplicationToHelmRelease(app)
+	if err != nil {
+		t.Fatalf("convertApplicationToHelmRelease returned error: %v", err)
+	}
+	if len(hr.Spec.HealthCheckExprs) != 1 || hr.Spec.HealthCheckExprs[0].Kind != "Cluster" {
+		t.Fatalf("HealthCheckExprs not threaded: %+v", hr.Spec.HealthCheckExprs)
+	}
+	if hr.Spec.WaitStrategy == nil || hr.Spec.WaitStrategy.Name != helmv2.WaitStrategyPoller {
+		t.Errorf("WaitStrategy = %+v, want poller (coupled default)", hr.Spec.WaitStrategy)
+	}
+
+	// No exprs and no strategy -> unset (flux default).
+	rNone := &REST{
+		kindName:      "Postgres",
+		releaseConfig: config.ReleaseConfig{Prefix: "postgres-", ChartRef: r.releaseConfig.ChartRef},
+	}
+	hrNone, err := rNone.convertApplicationToHelmRelease(app)
+	if err != nil {
+		t.Fatalf("convertApplicationToHelmRelease returned error: %v", err)
+	}
+	if hrNone.Spec.WaitStrategy != nil {
+		t.Errorf("WaitStrategy = %+v, want nil", hrNone.Spec.WaitStrategy)
+	}
+}
+
+func TestConvertApplicationToHelmRelease_ZeroMaxHistory(t *testing.T) {
+	r := &REST{
+		kindName: "Postgres",
+		releaseConfig: config.ReleaseConfig{
+			Prefix:                   "postgres-",
+			HelmReleaseInterval:      30 * time.Second,
+			HelmReleaseRetryInterval: 30 * time.Second,
+			HelmReleaseMaxHistory:    0,
+		},
+	}
+	app := &appsv1alpha1.Application{
+		ObjectMeta: metav1.ObjectMeta{Name: "x", Namespace: "tenant-root"},
+	}
+
+	hr, err := r.convertApplicationToHelmRelease(app)
+	if err != nil {
+		t.Fatalf("convertApplicationToHelmRelease returned error: %v", err)
+	}
+	if hr.Spec.MaxHistory == nil {
+		t.Fatal("MaxHistory is nil for HelmReleaseMaxHistory=0; want pointer to 0")
+	}
+	if *hr.Spec.MaxHistory != 0 {
+		t.Errorf("MaxHistory = %d, want 0", *hr.Spec.MaxHistory)
+	}
+}
+
+// HelmInstallTimeout (the kind-wide ApplicationDefinition annotation override)
+// wins over the global HelmReleaseInstallTimeout / HelmReleaseUpgradeTimeout
+// defaults. This is the contract that lets ApplicationDefinitions like
+// Kubernetes (with its long Kamaji bootstrap) opt out of the global default
+// without operators having to widen the global flag for every kind.
+//
+// The asymmetric-globals case pins that the override wipes both install and
+// upgrade timeouts to the same value, even when the globals differ — a
+// regression that only assigned one would slip through if the test only
+// checked symmetric globals.
+func TestConvertApplicationToHelmRelease_PerAppTimeoutOverridesGlobal(t *testing.T) {
+	cases := []struct {
+		name          string
+		globalInstall time.Duration
+		globalUpgrade time.Duration
+		override      time.Duration
+		wantInstall   time.Duration
+		wantUpgrade   time.Duration
+	}{
+		{
+			name:          "symmetric globals, override wins",
+			globalInstall: 10 * time.Minute,
+			globalUpgrade: 10 * time.Minute,
+			override:      30 * time.Minute,
+			wantInstall:   30 * time.Minute,
+			wantUpgrade:   30 * time.Minute,
+		},
+		{
+			name:          "asymmetric globals, override wipes both to same value",
+			globalInstall: 8 * time.Minute,
+			globalUpgrade: 12 * time.Minute,
+			override:      30 * time.Minute,
+			wantInstall:   30 * time.Minute,
+			wantUpgrade:   30 * time.Minute,
+		},
+		{
+			name:          "asymmetric globals, no override keeps each side independent",
+			globalInstall: 8 * time.Minute,
+			globalUpgrade: 12 * time.Minute,
+			override:      0,
+			wantInstall:   8 * time.Minute,
+			wantUpgrade:   12 * time.Minute,
+		},
+	}
+
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			r := &REST{
+				kindName: "Kubernetes",
+				releaseConfig: config.ReleaseConfig{
+					Prefix:                    "kubernetes-",
+					HelmReleaseInterval:       5 * time.Minute,
+					HelmReleaseRetryInterval:  30 * time.Second,
+					HelmReleaseInstallTimeout: tc.globalInstall,
+					HelmReleaseUpgradeTimeout: tc.globalUpgrade,
+					HelmReleaseMaxHistory:     5,
+					HelmInstallTimeout:        tc.override,
+				},
+			}
+			app := &appsv1alpha1.Application{
+				ObjectMeta: metav1.ObjectMeta{Name: "cluster", Namespace: "tenant-root"},
+			}
+
+			hr, err := r.convertApplicationToHelmRelease(app)
+			if err != nil {
+				t.Fatalf("convertApplicationToHelmRelease returned error: %v", err)
+			}
+			if hr.Spec.Install.Timeout == nil || hr.Spec.Install.Timeout.Duration != tc.wantInstall {
+				t.Errorf("Install.Timeout = %v, want %v", hr.Spec.Install.Timeout, tc.wantInstall)
+			}
+			if hr.Spec.Upgrade.Timeout == nil || hr.Spec.Upgrade.Timeout.Duration != tc.wantUpgrade {
+				t.Errorf("Upgrade.Timeout = %v, want %v", hr.Spec.Upgrade.Timeout, tc.wantUpgrade)
+			}
+		})
+	}
+}
diff --git a/pkg/registry/apps/application/rest_name_schema_test.go b/pkg/registry/apps/application/rest_name_schema_test.go
new file mode 100644
index 0000000000..a4bc67ec2b
--- /dev/null
+++ b/pkg/registry/apps/application/rest_name_schema_test.go
@@ -0,0 +1,248 @@
+/*
+Copyright 2026 The Cozystack Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package application
+
+import (
+	"encoding/json"
+	"strings"
+	"testing"
+
+	appsv1alpha1 "github.com/cozystack/cozystack/pkg/apis/apps/v1alpha1"
+	"github.com/cozystack/cozystack/pkg/config"
+)
+
+// TestNameCapComesFromTheShippedSchema walks the path a cap travels: the
+// chart's `## @name` annotation, through cozyvalues-gen into
+// values.schema.json, into the ApplicationDefinition read here off disk, and
+// into the name check. Rewriting the cap inside the shipped schema moves the
+// limit with it, which a cap held in code would not.
+func TestNameCapComesFromTheShippedSchema(t *testing.T) {
+	for _, tc := range []struct {
+		kind, prefix, definition string
+		cap                      int
+		explains                 string
+	}{
+		{"Kubernetes", "kubernetes-", "../../../../packages/system/kubernetes-rd/cozyrds/kubernetes.yaml", 32, "md0"},
+		{"Kafka", "kafka-", "../../../../packages/system/kafka-rd/cozyrds/kafka.yaml", 44, "KRaft"},
+	} {
+		t.Run(tc.kind, func(t *testing.T) {
+			raw := readEmbeddedOpenAPISchema(t, tc.definition)
+			r := newTestREST(t, tc.kind, tc.prefix, raw)
+
+			if errs := r.validateNameLength(strings.Repeat("a", tc.cap)); len(errs) > 0 {
+				t.Errorf("name at the declared cap rejected: %v", errs)
+			}
+			errs := r.validateNameLength(strings.Repeat("a", tc.cap+1))
+			if len(errs) != 1 {
+				t.Fatalf("expected the declared cap to reject a %d-character name, got %v", tc.cap+1, errs)
+			}
+			if !strings.Contains(errs[0].Error(), tc.explains) {
+				t.Errorf("rejection does not carry the chart's explanation of the limit: %v", errs[0])
+			}
+
+			moved := newTestREST(t, tc.kind, tc.prefix, withDeclaredMaxLength(t, raw, 20))
+			if errs := moved.validateNameLength(strings.Repeat("a", 20)); len(errs) > 0 {
+				t.Errorf("name at the rewritten cap rejected: %v", errs)
+			}
+			if errs := moved.validateNameLength(strings.Repeat("a", 21)); len(errs) != 1 {
+				t.Errorf("rewriting maxLength in the schema did not move the limit: %v", errs)
+			}
+		})
+	}
+}
+
+// TestLegacyNameCapsCoverUndeclaredDefinitions pins the upgrade-window floor:
+// it holds only while a definition declares nothing, and a declaration replaces
+// it outright.
+func TestLegacyNameCapsCoverUndeclaredDefinitions(t *testing.T) {
+	const undeclared = `{"title":"Chart Values","type":"object","properties":{}}`
+
+	if errs := newTestREST(t, "Kubernetes", "kubernetes-", undeclared).validateNameLength(strings.Repeat("a", 33)); len(errs) != 1 {
+		t.Errorf("Kubernetes definition without a declaration lost the 32-character floor: %v", errs)
+	}
+	if errs := newTestREST(t, "Kafka", "kafka-", undeclared).validateNameLength(strings.Repeat("a", 45)); len(errs) != 1 {
+		t.Errorf("Kafka definition without a declaration lost the 44-character floor: %v", errs)
+	}
+
+	declared := `{"type":"object","x-cozystack-name":{"type":"string","maxLength":40},"properties":{}}`
+	if errs := newTestREST(t, "Kubernetes", "kubernetes-", declared).validateNameLength(strings.Repeat("a", 40)); len(errs) > 0 {
+		t.Errorf("a declaration did not replace the floor: %v", errs)
+	}
+
+	if errs := newTestREST(t, "Widget", "widget-", undeclared).validateNameLength(strings.Repeat("a", 46)); len(errs) > 0 {
+		t.Errorf("a kind with no floor is capped below its Helm budget: %v", errs)
+	}
+}
+
+// TestInvalidNameSchemaFailsClosed covers every way a declaration can be
+// unenforceable as written. Each one refuses creates of that kind with a
+// configuration error, instead of dropping the declaration (admitting names
+// the chart cannot render) or applying it (rejecting every name and blaming
+// the user).
+func TestInvalidNameSchemaFailsClosed(t *testing.T) {
+	for _, tc := range []struct {
+		name, declaration, want string
+	}{
+		{"null declaration", `null`, "declaration is null"},
+		{"null maxLength", `{"maxLength":null}`, "maxLength is null"},
+		{"null pattern", `{"maxLength":32,"pattern":null}`, "pattern is null"},
+		{"not an object", `"32"`, "decode"},
+		{"array", `[32]`, "decode"},
+		{"maxLength as string", `{"maxLength":"32"}`, "decode"},
+		{"fractional maxLength", `{"maxLength":32.5}`, "decode"},
+		{"overflowing maxLength", `{"maxLength":1e20}`, "decode"},
+		{"misspelled keyword", `{"maxLenght":32}`, `unsupported keyword "maxLenght"`},
+		{"constraint the server does not enforce", `{"maxLength":32,"format":"hostname"}`, `unsupported keyword "format"`},
+		{"one bad field beside a good one", `{"minLength":"3","maxLength":32}`, "decode"},
+		{"non-string type", `{"type":"integer","maxLength":32}`, `type "integer"`},
+		{"zero maxLength", `{"maxLength":0}`, "maxLength 0 admits no name"},
+		{"negative maxLength", `{"maxLength":-1}`, "maxLength -1 admits no name"},
+		{"negative minLength", `{"minLength":-1}`, "minLength -1 is negative"},
+		{"minLength above maxLength", `{"minLength":40,"maxLength":32}`, "minLength 40 exceeds maxLength 32"},
+		{"minLength above the Helm budget", `{"minLength":47}`, "no name fits"},
+		{"non-RE2 pattern", `{"pattern":"^(?!kube)[a-z]+$"}`, "does not compile as RE2"},
+	} {
+		t.Run(tc.name, func(t *testing.T) {
+			schema := `{"type":"object","x-cozystack-name":` + tc.declaration + `,"properties":{}}`
+			r := newTestREST(t, "Widget", "widget-", schema)
+
+			if r.nameSchemaErr == nil || !strings.Contains(r.nameSchemaErr.Error(), tc.want) {
+				t.Fatalf("expected a declaration error containing %q, got %v", tc.want, r.nameSchemaErr)
+			}
+			errs := r.validateNameLength("ok")
+			if len(errs) != 1 || !strings.Contains(errs[0].Error(), "configuration error") || !strings.Contains(errs[0].Error(), "Widget") {
+				t.Errorf("expected a configuration error naming the kind for a valid name, got %v", errs)
+			}
+		})
+	}
+}
+
+// TestNameSchemaEnforcesMinLengthAndPattern covers the other constraints a
+// chart can declare, so a declaration is never silently a no-op.
+func TestNameSchemaEnforcesMinLengthAndPattern(t *testing.T) {
+	const schema = `{
+	  "title": "Chart Values",
+	  "type": "object",
+	  "x-cozystack-name": {
+	    "type": "string",
+	    "description": "the chart splits the release name on dashes",
+	    "minLength": 3,
+	    "pattern": "^[a-z][a-z0-9]*$"
+	  },
+	  "properties": {}
+	}`
+	r := newTestREST(t, "Widget", "widget-", schema)
+
+	if errs := r.validateNameFormat("widget"); len(errs) > 0 {
+		t.Errorf("conforming name rejected: %v", errs)
+	}
+	if errs := r.validateNameFormat("ab"); len(errs) != 1 {
+		t.Errorf("expected minLength to reject a 2-character name, got %v", errs)
+	}
+	if errs := r.validateNameFormat("has-dash"); len(errs) != 1 {
+		t.Errorf("expected pattern to reject %q, got %v", "has-dash", errs)
+	}
+
+	exact := newTestREST(t, "Widget", "widget-", `{"type":"object","x-cozystack-name":{"minLength":8,"maxLength":8},"properties":{}}`)
+	if exact.nameSchemaErr != nil {
+		t.Fatalf("minLength equal to maxLength is a valid declaration, got %v", exact.nameSchemaErr)
+	}
+	if errs := append(exact.validateNameFormat("abcdefgh"), exact.validateNameLength("abcdefgh")...); len(errs) > 0 {
+		t.Errorf("name of exactly the declared length rejected: %v", errs)
+	}
+}
+
+// TestUndescribedDeclarationStillExplainsItself keeps a rejection pointing at
+// its source when the chart declares a limit without saying why.
+func TestUndescribedDeclarationStillExplainsItself(t *testing.T) {
+	r := newTestREST(t, "Widget", "widget-", `{"type":"object","x-cozystack-name":{"maxLength":10,"minLength":3},"properties":{}}`)
+
+	errs := append(r.validateNameLength(strings.Repeat("a", 11)), r.validateNameFormat("ab")...)
+	if len(errs) != 2 {
+		t.Fatalf("expected both limits to reject, got %v", errs)
+	}
+	for _, err := range errs {
+		if !strings.Contains(err.Error(), "limit declared by the Widget application") {
+			t.Errorf("rejection does not say where the limit comes from: %v", err)
+		}
+	}
+}
+
+// TestUnparseableSchemaDeclaresNothing keeps a schema that is not a JSON object
+// from being blamed on a declaration it cannot contain: creates keep working,
+// and a kind with a legacy cap keeps it.
+func TestUnparseableSchemaDeclaresNothing(t *testing.T) {
+	for _, raw := range []string{"{not json", `["not", "an", "object"]`, `"x-cozystack-name"`} {
+		widget := newTestREST(t, "Widget", "widget-", raw)
+		if widget.nameSchemaErr != nil {
+			t.Errorf("schema %q reported as a bad name declaration: %v", raw, widget.nameSchemaErr)
+		}
+		if errs := widget.validateNameLength(strings.Repeat("a", 46)); len(errs) > 0 {
+			t.Errorf("schema %q refused a name within the Helm budget: %v", raw, errs)
+		}
+		if errs := newTestREST(t, "Kubernetes", "kubernetes-", raw).validateNameLength(strings.Repeat("a", 33)); len(errs) != 1 {
+			t.Errorf("schema %q dropped the Kubernetes legacy cap: %v", raw, errs)
+		}
+	}
+}
+
+// TestNameDeclarationIgnoresAnnotations covers keywords that constrain nothing:
+// a generator adding one must not take the kind offline.
+func TestNameDeclarationIgnoresAnnotations(t *testing.T) {
+	r := newTestREST(t, "Widget", "widget-", `{"type":"object","x-cozystack-name":{"type":"string","title":"Name","examples":["abc"],"$comment":"c","x-hint":{"a":1},"maxLength":10},"properties":{}}`)
+	if r.nameSchemaErr != nil {
+		t.Fatalf("annotation keywords refused: %v", r.nameSchemaErr)
+	}
+	if errs := r.validateNameLength(strings.Repeat("a", 11)); len(errs) != 1 {
+		t.Errorf("maxLength beside annotations not enforced: %v", errs)
+	}
+}
+
+// withDeclaredMaxLength returns the schema with its name declaration's
+// maxLength replaced.
+func withDeclaredMaxLength(t *testing.T, raw string, maxLen int) string {
+	t.Helper()
+	var doc map[string]any
+	if err := json.Unmarshal([]byte(raw), &doc); err != nil {
+		t.Fatalf("unmarshal schema: %v", err)
+	}
+	declared, ok := doc[appsv1alpha1.NameSchemaExtension].(map[string]any)
+	if !ok {
+		t.Fatalf("schema carries no %s", appsv1alpha1.NameSchemaExtension)
+	}
+	declared["maxLength"] = maxLen
+	out, err := json.Marshal(doc)
+	if err != nil {
+		t.Fatalf("marshal schema: %v", err)
+	}
+	return string(out)
+}
+
+// newTestREST builds a REST the way the server does at start-up, so the tests
+// exercise the wiring in NewREST rather than a hand-set field.
+func newTestREST(t *testing.T, kind, prefix, openAPISchema string) *REST {
+	t.Helper()
+	return NewREST(nil, nil, &config.Resource{
+		Application: config.ApplicationConfig{
+			Kind:          kind,
+			Singular:      strings.ToLower(kind),
+			Plural:        strings.ToLower(kind) + "s",
+			OpenAPISchema: openAPISchema,
+		},
+		Release: config.ReleaseConfig{Prefix: prefix},
+	})
+}
diff --git a/pkg/registry/apps/application/rest_nullstrip.go b/pkg/registry/apps/application/rest_nullstrip.go
new file mode 100644
index 0000000000..e10feccb27
--- /dev/null
+++ b/pkg/registry/apps/application/rest_nullstrip.go
@@ -0,0 +1,146 @@
+/*
+Copyright 2026 The Cozystack Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package application
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+	"io"
+	"sort"
+	"strings"
+
+	appsv1alpha1 "github.com/cozystack/cozystack/pkg/apis/apps/v1alpha1"
+	apiextv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
+	structuralschema "k8s.io/apiextensions-apiserver/pkg/apiserver/schema"
+)
+
+// maxWarnedNullPaths bounds the number of field paths named in the warning
+// handed back to the client, so a spec that nulls out dozens of fields does not
+// turn into a multi-kilobyte response header.
+const maxWarnedNullPaths = 8
+
+// normalizeSpecNulls removes required null properties whose schema supplies a
+// non-null default. Helm deletes explicit nulls before validating values, whereas
+// omission lets the chart default apply without persisting its current value.
+// Optional/nullable properties retain their explicit-null meaning. User-keyed
+// maps and array elements do not imply a matching Helm values-default path,
+// so defaults in their item schemas alone cannot justify a repair.
+func (r *REST) normalizeSpecNulls(app *appsv1alpha1.Application) ([]string, error) {
+	if r.specSchema == nil || app == nil || app.Spec == nil || len(app.Spec.Raw) == 0 {
+		return nil, nil
+	}
+	var spec map[string]any
+	decoder := json.NewDecoder(bytes.NewReader(app.Spec.Raw))
+	decoder.UseNumber()
+	if err := decoder.Decode(&spec); err != nil {
+		return nil, err
+	}
+	if decoder.Decode(new(any)) != io.EOF {
+		return nil, fmt.Errorf("spec must contain a single JSON object")
+	}
+	if spec == nil {
+		return nil, nil
+	}
+
+	var stripped []string
+	stripDeclaredNulls(spec, r.specSchema, "", &stripped)
+	if len(stripped) == 0 {
+		return nil, nil
+	}
+
+	raw, err := json.Marshal(spec)
+	if err != nil {
+		return nil, err
+	}
+	app.Spec = &apiextv1.JSON{Raw: raw}
+	sort.Strings(stripped)
+	return stripped, nil
+}
+
+// Only declared property paths identify defaults independently of user keys.
+// In particular, a schema default inside an array item is not a
+// default for an element of a user-supplied replacement array.
+func stripDeclaredNulls(v any, s *structuralschema.Structural, path string, stripped *[]string) {
+	if s == nil || v == nil {
+		return
+	}
+
+	switch value := v.(type) {
+	case map[string]any:
+		required := requiredNames(s)
+		// Keys are collected up front: the loop deletes from the map it walks,
+		// and a sorted walk keeps the reported paths stable across calls.
+		for _, name := range sortedKeys(value) {
+			child := value[name]
+			if prop, declared := s.Properties[name]; declared {
+				if child == nil {
+					if _, mustBeSet := required[name]; mustBeSet && prop.Default.Object != nil && !prop.Nullable {
+						delete(value, name)
+						*stripped = append(*stripped, joinFieldPath(path, name))
+					}
+					continue
+				}
+				stripDeclaredNulls(child, &prop, joinFieldPath(path, name), stripped)
+				continue
+			}
+		}
+	}
+}
+
+// requiredNames returns the property names the schema marks required. The
+// validation half of a structural schema is an optional pointer, absent for
+// every schema that constrains nothing.
+func requiredNames(s *structuralschema.Structural) map[string]struct{} {
+	if s.ValueValidation == nil || len(s.ValueValidation.Required) == 0 {
+		return nil
+	}
+	names := make(map[string]struct{}, len(s.ValueValidation.Required))
+	for _, name := range s.ValueValidation.Required {
+		names[name] = struct{}{}
+	}
+	return names
+}
+
+func sortedKeys(m map[string]any) []string {
+	keys := make([]string, 0, len(m))
+	for k := range m {
+		keys = append(keys, k)
+	}
+	sort.Strings(keys)
+	return keys
+}
+
+func joinFieldPath(path, name string) string {
+	if path == "" {
+		return name
+	}
+	return path + "." + name
+}
+
+// emptyFieldsWarning renders the client-facing warning for stripped nulls. The
+// normalization is deliberately visible: an empty key is a typo often enough
+// that silently resolving it would trade one confusing outcome for another.
+func emptyFieldsWarning(paths []string) string {
+	shown := paths
+	suffix := ""
+	if len(shown) > maxWarnedNullPaths {
+		shown = shown[:maxWarnedNullPaths]
+		suffix = fmt.Sprintf(" (and %d more)", len(paths)-maxWarnedNullPaths)
+	}
+	return fmt.Sprintf("spec: %s left empty%s; treated as unset, the chart default applies", strings.Join(shown, ", "), suffix)
+}
diff --git a/pkg/registry/apps/application/rest_nullstrip_admission_test.go b/pkg/registry/apps/application/rest_nullstrip_admission_test.go
new file mode 100644
index 0000000000..46b150fa1e
--- /dev/null
+++ b/pkg/registry/apps/application/rest_nullstrip_admission_test.go
@@ -0,0 +1,201 @@
+/*
+Copyright 2026 The Cozystack Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package application
+
+import (
+	"context"
+	"encoding/json"
+	"errors"
+	"reflect"
+	"strings"
+	"testing"
+
+	appsv1alpha1 "github.com/cozystack/cozystack/pkg/apis/apps/v1alpha1"
+	helmv2 "github.com/fluxcd/helm-controller/api/v2"
+	apiextv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
+	structuralschema "k8s.io/apiextensions-apiserver/pkg/apiserver/schema"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apiserver/pkg/endpoints/request"
+	"k8s.io/apiserver/pkg/warning"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+)
+
+type nullChartCase struct {
+	name, chart, rd, input, want string
+	schema, values               string
+	paths                        []string
+}
+
+var nullChartCases = []nullChartCase{
+	{name: "nullable schema default", schema: `{"type":"object","required":["name"],"properties":{"name":{"type":"string","nullable":true,"default":"example"}}}`, values: `{"name":"example"}`, input: `{"name":null}`},
+	{name: "item schema defaults", schema: `{"type":"object","properties":{"entries":{"type":"object","additionalProperties":{"type":"object","required":["name"],"properties":{"name":{"type":"string","default":"example"}}}},"items":{"type":"array","items":{"type":"object","required":["name"],"properties":{"name":{"type":"string","default":"example"}}}}}}`, values: `{"entries":{},"items":[{"name":"chart-default"}]}`, input: `{"entries":{"mine":{"name":null}},"items":[{"name":null}]}`},
+
+	{name: "nested defaults", chart: "apps/kubernetes", rd: "kubernetes", input: `{"talos":{"registryMirrors":null,"version":null},"controlPlane":{"replicas":null,"apiServer":{"resourcesPreset":null}},"nodeGroups":{"legacy":{"instanceType":null}}}`, want: `{"talos":{},"controlPlane":{"apiServer":{}},"nodeGroups":{"legacy":{"instanceType":null}}}`, paths: []string{"controlPlane.apiServer.resourcesPreset", "controlPlane.replicas", "talos.registryMirrors", "talos.version"}},
+	{name: "mariadb users", chart: "apps/mariadb", rd: "mariadb", input: `{"users":{"alice":{"password":null,"maxUserConnections":null},"blank":null}}`},
+	{name: "rabbitmq vhosts", chart: "apps/rabbitmq", rd: "rabbitmq", input: `{"vhosts":{"vh1":{"roles":null},"blank":null}}`},
+	{name: "seaweedfs pools", chart: "extra/seaweedfs", rd: "seaweedfs", input: `{"volume":{"pools":{"ssd":{"diskType":null},"blank":null}}}`},
+	{name: "vm source http", chart: "apps/vm-disk", rd: "vm-disk", input: `{"source":{"http":{"url":null}}}`},
+	{name: "vm source disk", chart: "apps/vm-disk", rd: "vm-disk", input: `{"source":{"disk":{"name":null}}}`},
+	{name: "vm source image", chart: "apps/vm-disk", rd: "vm-disk", input: `{"source":{"image":{"name":null}}}`},
+	{name: "optional section", chart: "apps/kubernetes", rd: "kubernetes", input: `{"talos":null,"storageClass":null}`},
+}
+
+func chartSpecSchema(t *testing.T, rd string) *structuralschema.Structural {
+	t.Helper()
+	raw := readEmbeddedOpenAPISchema(t, "../../../../packages/system/"+rd+"-rd/cozyrds/"+rd+".yaml")
+	s, err := buildSpecSchema(raw)
+	if err != nil || s == nil {
+		t.Fatalf("build %s schema: %v", rd, err)
+	}
+	return s
+}
+
+func nullCaseSchema(t *testing.T, tt nullChartCase) *structuralschema.Structural {
+	t.Helper()
+	if tt.schema == "" {
+		return chartSpecSchema(t, tt.rd)
+	}
+	schema, err := buildSpecSchema(tt.schema)
+	if err != nil {
+		t.Fatal(err)
+	}
+	return schema
+}
+
+func jsonValue(t *testing.T, raw []byte) any {
+	t.Helper()
+	var v any
+	decoder := json.NewDecoder(strings.NewReader(string(raw)))
+	decoder.UseNumber()
+	if err := decoder.Decode(&v); err != nil {
+		t.Fatal(err)
+	}
+	return v
+}
+
+func TestNullNormalizationAdmissionAndStorage(t *testing.T) {
+	for _, tt := range nullChartCases {
+		for _, verb := range []string{"create", "update", "upsert"} {
+			for _, reject := range []bool{false, true} {
+				t.Run(tt.name+"/"+verb+"/reject="+map[bool]string{true: "true", false: "false"}[reject], func(t *testing.T) {
+					existing := &helmv2.HelmRelease{ObjectMeta: metav1.ObjectMeta{Name: "kubernetes-good-name", Namespace: "tenant-foo", Labels: map[string]string{
+						ApplicationKindLabel: kubernetesKind, ApplicationGroupLabel: appsv1alpha1.GroupName, ApplicationNameLabel: "good-name",
+					}}, Spec: helmv2.HelmReleaseSpec{Values: &apiextv1.JSON{Raw: []byte(`{"unchanged":"old"}`)}}}
+					r := newKubernetesWarnREST(t)
+					if verb == "update" {
+						r = newKubernetesWarnREST(t, existing)
+					}
+					r.specSchema = nullCaseSchema(t, tt)
+					app := &appsv1alpha1.Application{TypeMeta: metav1.TypeMeta{Kind: kubernetesKind, APIVersion: "apps.cozystack.io/v1alpha1"}, ObjectMeta: metav1.ObjectMeta{Name: "good-name", Namespace: "tenant-foo"}, Spec: &apiextv1.JSON{Raw: []byte(tt.input)}}
+					original := app.DeepCopy()
+					want := tt.want
+					if want == "" {
+						want = tt.input
+					}
+					expected := jsonValue(t, []byte(want))
+					rec := &fakeWarningRecorder{}
+					ctx := warning.WithWarningRecorder(request.WithNamespace(context.Background(), app.Namespace), rec)
+					called := 0
+					sentinel := errors.New("admission rejected the normalized object")
+					validate := func(_ context.Context, obj runtime.Object) error {
+						called++
+						got, ok := obj.(*appsv1alpha1.Application)
+						if !ok {
+							t.Fatalf("admission got %T", obj)
+						}
+						if !reflect.DeepEqual(jsonValue(t, got.Spec.Raw), expected) {
+							t.Errorf("admission saw %s; want %s", got.Spec.Raw, want)
+						}
+						if reject {
+							return sentinel
+						}
+						return nil
+					}
+					updateValidate := func(ctx context.Context, obj, old runtime.Object) error {
+						oldApp, ok := old.(*appsv1alpha1.Application)
+						if !ok {
+							t.Fatalf("old object %T", old)
+						}
+						if !strings.Contains(string(oldApp.Spec.Raw), `"unchanged":"old"`) {
+							t.Errorf("old object changed: %s", oldApp.Spec.Raw)
+						}
+						return validate(ctx, obj)
+					}
+					var err error
+					if verb == "create" {
+						_, err = r.Create(ctx, app, validate, &metav1.CreateOptions{})
+					} else {
+						_, created, e := r.Update(ctx, app.Name, newDefaultUpdatedObjectInfo(app), validate, updateValidate, verb == "upsert", &metav1.UpdateOptions{})
+						err = e
+						if err == nil && created != (verb == "upsert") {
+							t.Errorf("created=%t for %s", created, verb)
+						}
+					}
+					if called != 1 {
+						t.Errorf("admission calls=%d; want 1", called)
+					}
+					if reject {
+						if !errors.Is(err, sentinel) {
+							t.Errorf("rejection lost: %v", err)
+						}
+					} else if err != nil {
+						t.Fatal(err)
+					}
+					if !reflect.DeepEqual(app, original) {
+						t.Error("caller input was mutated")
+					}
+					got := &helmv2.HelmRelease{}
+					getErr := r.c.Get(ctx, client.ObjectKeyFromObject(existing), got)
+					if reject && verb != "update" {
+						all := &helmv2.HelmReleaseList{}
+						if err := r.c.List(ctx, all); err != nil {
+							t.Fatal(err)
+						}
+						if len(all.Items) != 0 {
+							t.Error("rejected admission wrote a HelmRelease")
+						}
+					} else {
+						if getErr != nil {
+							t.Fatal(getErr)
+						}
+						storedWant := expected
+						if reject {
+							storedWant = jsonValue(t, existing.Spec.Values.Raw)
+						}
+						if !reflect.DeepEqual(jsonValue(t, got.Spec.Values.Raw), storedWant) {
+							t.Errorf("stored values=%s; want %v", got.Spec.Values.Raw, storedWant)
+						}
+					}
+					var nullWarnings []string
+					for _, w := range rec.warnings {
+						if strings.HasPrefix(w, "spec:") {
+							nullWarnings = append(nullWarnings, w)
+						}
+					}
+					if len(tt.paths) == 0 {
+						if len(nullWarnings) != 0 {
+							t.Errorf("false repair warning: %v", nullWarnings)
+						}
+					} else if !reflect.DeepEqual(nullWarnings, []string{emptyFieldsWarning(tt.paths)}) {
+						t.Errorf("warnings=%v for removed paths=%v", nullWarnings, tt.paths)
+					}
+				})
+			}
+		}
+	}
+}
diff --git a/pkg/registry/apps/application/rest_nullstrip_helm_test.go b/pkg/registry/apps/application/rest_nullstrip_helm_test.go
new file mode 100644
index 0000000000..750aa63712
--- /dev/null
+++ b/pkg/registry/apps/application/rest_nullstrip_helm_test.go
@@ -0,0 +1,187 @@
+/*
+Copyright 2026 The Cozystack Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package application
+
+import (
+	"context"
+	"encoding/json"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"reflect"
+	"strings"
+	"testing"
+	"time"
+
+	appsv1alpha1 "github.com/cozystack/cozystack/pkg/apis/apps/v1alpha1"
+	apiextv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
+	structuralschema "k8s.io/apiextensions-apiserver/pkg/apiserver/schema"
+	"sigs.k8s.io/yaml"
+)
+
+// Schema defaults describe API reads; Helm coalesces values.yaml instead. Check
+// their effective values independently so drift cannot turn repair into omission.
+func TestRequiredNullDefaultsMatchChartValues(t *testing.T) {
+	for _, tt := range nullChartCases {
+		t.Run(tt.name, func(t *testing.T) {
+			if tt.chart == "" {
+				return
+			}
+			s := chartSpecSchema(t, tt.rd)
+			raw, err := os.ReadFile("../../../../packages/" + tt.chart + "/values.yaml")
+			if err != nil {
+				t.Fatal(err)
+			}
+			var values map[string]any
+			if err := yaml.Unmarshal(raw, &values); err != nil {
+				t.Fatal(err)
+			}
+			var visit func(*structuralschema.Structural, map[string]any, string)
+			visit = func(schema *structuralschema.Structural, defaults map[string]any, path string) {
+				for key, prop := range schema.Properties {
+					value, present := defaults[key]
+					if _, required := requiredNames(schema)[key]; required && prop.Default.Object != nil && !prop.Nullable {
+						if !present {
+							t.Errorf("%s%s schema default has no chart value", path, key)
+							continue
+						}
+						// Expand nested defaults using the existing API read path, without the
+						// null normalizer, then compare semantically to the shipped chart value.
+						raw, err := json.Marshal(map[string]any{key: prop.Default.Object})
+						if err != nil {
+							t.Fatal(err)
+						}
+						app := &appsv1alpha1.Application{Spec: &apiextv1.JSON{Raw: raw}}
+						if err := (&REST{specSchema: schema}).applySpecDefaults(app); err != nil {
+							t.Fatal(err)
+						}
+						expanded := jsonValue(t, app.Spec.Raw).(map[string]any)[key]
+						rawValue, err := json.Marshal(value)
+						if err != nil {
+							t.Fatal(err)
+						}
+						if !reflect.DeepEqual(expanded, jsonValue(t, rawValue)) {
+							t.Errorf("%s%s effective schema default differs from chart: %v != %v", path, key, expanded, value)
+						}
+					}
+					if child, ok := value.(map[string]any); ok {
+						visit(&prop, child, path+key+".")
+					}
+				}
+			}
+			visit(s, values, "")
+		})
+	}
+}
+
+// A minimal rendering template exposes Helm's real coalesced values while the
+// values and validation schema remain the shipped files, without chart-specific
+// cluster lookups or templates obscuring defaulting failures.
+func TestRequiredNullHelmCoalescing(t *testing.T) {
+	helm, err := exec.LookPath("helm")
+	if err != nil {
+		t.Skip("Helm executable required for the coalescing integration test")
+	}
+	for _, tt := range nullChartCases {
+		t.Run(tt.name, func(t *testing.T) {
+			dir := t.TempDir()
+			if err := os.Mkdir(filepath.Join(dir, "templates"), 0755); err != nil {
+				t.Fatal(err)
+			}
+			for _, file := range []string{"values.yaml", "values.schema.json"} {
+				var data []byte
+				if tt.chart != "" {
+					var err error
+					data, err = os.ReadFile("../../../../packages/" + tt.chart + "/" + file)
+					if err != nil {
+						t.Fatal(err)
+					}
+				} else if file == "values.yaml" {
+					data = []byte(tt.values)
+				} else {
+					data = []byte(tt.schema)
+				}
+				if err := os.WriteFile(filepath.Join(dir, file), data, 0600); err != nil {
+					t.Fatal(err)
+				}
+			}
+			for file, body := range map[string]string{"Chart.yaml": "apiVersion: v2\nname: null-contract\nversion: 0.0.0\n", "templates/values.yaml": "{{ .Values | toJson }}\n"} {
+				if err := os.WriteFile(filepath.Join(dir, file), []byte(body), 0600); err != nil {
+					t.Fatal(err)
+				}
+			}
+			render := func(input []byte) ([]byte, error) {
+				values := filepath.Join(dir, "input.json")
+				if err := os.WriteFile(values, input, 0600); err != nil {
+					t.Fatal(err)
+				}
+				ctx, cancel := context.WithTimeout(t.Context(), 20*time.Second)
+				defer cancel()
+				return exec.CommandContext(ctx, helm, "template", "null-contract", dir, "-f", values).CombinedOutput()
+			}
+			app := &appsv1alpha1.Application{Spec: &apiextv1.JSON{Raw: []byte(tt.input)}}
+			paths, err := (&REST{specSchema: nullCaseSchema(t, tt)}).normalizeSpecNulls(app)
+			if err != nil {
+				t.Fatal(err)
+			}
+			before, beforeErr := render([]byte(tt.input))
+			after, afterErr := render(app.Spec.Raw)
+			if len(tt.paths) == 0 {
+				if len(paths) != 0 || string(app.Spec.Raw) != tt.input {
+					t.Fatalf("nonrepairable input changed: %s", app.Spec.Raw)
+				}
+				if (beforeErr == nil) != (afterErr == nil) {
+					t.Fatalf("normalization changed validation outcome: %s / %s", before, after)
+				}
+				if tt.name != "optional section" && beforeErr == nil {
+					t.Fatalf("required null unexpectedly accepted: %s", before)
+				}
+				return
+			}
+			if beforeErr == nil {
+				t.Fatalf("required-null input unexpectedly accepted by Helm: %s", before)
+			}
+			if afterErr != nil {
+				t.Fatalf("normalized input failed Helm: %v\n%s", afterErr, after)
+			}
+			var rendered map[string]any
+			if err := yaml.Unmarshal(after, &rendered); err != nil {
+				t.Fatal(err)
+			}
+			chartValues, err := os.ReadFile(filepath.Join(dir, "values.yaml"))
+			if err != nil {
+				t.Fatal(err)
+			}
+			var defaults map[string]any
+			if err := yaml.Unmarshal(chartValues, &defaults); err != nil {
+				t.Fatal(err)
+			}
+			at := func(v map[string]any, path string) any {
+				var value any = v
+				for _, key := range strings.Split(path, ".") {
+					value = value.(map[string]any)[key]
+				}
+				return value
+			}
+			for _, path := range tt.paths {
+				if !reflect.DeepEqual(at(rendered, path), at(defaults, path)) {
+					t.Errorf("Helm failed to restore %s", path)
+				}
+			}
+		})
+	}
+}
diff --git a/pkg/registry/apps/application/rest_nullstrip_test.go b/pkg/registry/apps/application/rest_nullstrip_test.go
new file mode 100644
index 0000000000..7d62844a42
--- /dev/null
+++ b/pkg/registry/apps/application/rest_nullstrip_test.go
@@ -0,0 +1,199 @@
+/*
+Copyright 2026 The Cozystack Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package application
+
+import (
+	"encoding/json"
+	"reflect"
+	"strings"
+	"testing"
+
+	appsv1alpha1 "github.com/cozystack/cozystack/pkg/apis/apps/v1alpha1"
+	apiextv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
+	structuralschema "k8s.io/apiextensions-apiserver/pkg/apiserver/schema"
+)
+
+// kubernetesSpecSchema builds the REST spec schema from the Kubernetes
+// Application's shipped cozyrd. The real schema is the fixture on purpose: the
+// bug this file pins came from the interaction between a declared-and-defaulted
+// field, a free-form passthrough field and a user-keyed map, and a synthetic
+// schema can be made to agree with any behaviour.
+func kubernetesSpecSchema(t *testing.T) *structuralschema.Structural {
+	t.Helper()
+	raw := readEmbeddedOpenAPISchema(t,
+		"../../../../packages/system/kubernetes-rd/cozyrds/kubernetes.yaml")
+	s, err := buildSpecSchema(raw)
+	if err != nil {
+		t.Fatalf("buildSpecSchema: %v", err)
+	}
+	if s == nil {
+		t.Fatal("buildSpecSchema returned nil for the shipped Kubernetes schema")
+	}
+	return s
+}
+
+func normalize(t *testing.T, s *structuralschema.Structural, spec string) ([]string, map[string]any) {
+	t.Helper()
+	r := &REST{specSchema: s}
+	app := &appsv1alpha1.Application{Spec: &apiextv1.JSON{Raw: []byte(spec)}}
+	paths, err := r.normalizeSpecNulls(app)
+	if err != nil {
+		t.Fatalf("normalizeSpecNulls(%s): %v", spec, err)
+	}
+	var got map[string]any
+	if err := json.Unmarshal(app.Spec.Raw, &got); err != nil {
+		t.Fatalf("unmarshal normalized spec: %v", err)
+	}
+	return paths, got
+}
+
+func TestNormalizeSpecNulls_RequiredFields(t *testing.T) {
+	s := kubernetesSpecSchema(t)
+
+	paths, got := normalize(t, s, `{"host":"k8s","talos":{"registryMirrors":null,"version":null,"imageFactoryURL":"https://factory.example.invalid"}}`)
+
+	want := []string{"talos.registryMirrors", "talos.version"}
+	if !reflect.DeepEqual(paths, want) {
+		t.Errorf("stripped paths = %v, want %v", paths, want)
+	}
+	wantSpec := map[string]any{
+		"host":  "k8s",
+		"talos": map[string]any{"imageFactoryURL": "https://factory.example.invalid"},
+	}
+	if !reflect.DeepEqual(got, wantSpec) {
+		t.Errorf("normalized spec = %v, want %v", got, wantSpec)
+	}
+}
+
+func TestNormalizeSpecNulls_OptionalFieldsUntouched(t *testing.T) {
+	s := kubernetesSpecSchema(t)
+
+	paths, got := normalize(t, s, `{"talos":null,"storageClass":null,"nodeGroups":null,"version":null}`)
+
+	if len(paths) != 0 {
+		t.Errorf("stripped paths = %v, want none: the Kubernetes schema requires none of these at the root", paths)
+	}
+	for _, key := range []string{"talos", "storageClass", "nodeGroups", "version"} {
+		v, ok := got[key]
+		if !ok || v != nil {
+			t.Errorf("%s = %v (present=%v), want a preserved null", key, v, ok)
+		}
+	}
+}
+
+// TestNormalizeSpecNulls_FreeFormSubtreeUntouched pins the boundary: inside
+// registryMirrors the keys are registry hostnames the user invents, and the
+// schema declares nothing there. A null in that position may be the payload, so
+// it is left exactly as written rather than guessed at.
+func TestNormalizeSpecNulls_FreeFormSubtreeUntouched(t *testing.T) {
+	s := kubernetesSpecSchema(t)
+
+	paths, got := normalize(t, s, `{"talos":{"registryMirrors":{"ghcr.io":null}}}`)
+
+	if len(paths) != 0 {
+		t.Errorf("stripped paths = %v, want none", paths)
+	}
+	mirrors := got["talos"].(map[string]any)["registryMirrors"].(map[string]any)
+	if _, ok := mirrors["ghcr.io"]; !ok {
+		t.Errorf("free-form key ghcr.io was dropped: %v", mirrors)
+	}
+}
+
+func TestNormalizeSpecNulls_NoDefaultOrUserCollection(t *testing.T) {
+	// Even an item schema default is not a Helm default for a user-created entry.
+	s, err := buildSpecSchema(`{"type":"object","required":["missing","nullDefault","nullable","zero","false","empty"],"properties":{
+  "missing":{"type":"string"},"nullDefault":{"type":"string","default":null},
+  "nullable":{"type":"string","nullable":true,"default":"keep-null"},
+  "zero":{"type":"integer","default":0},"false":{"type":"boolean","default":false},"empty":{"type":"string","default":""},
+  "entries":{"type":"object","additionalProperties":{"type":"object","required":["name"],"properties":{"name":{"type":"string","default":"example"}}}},
+  "items":{"type":"array","items":{"type":"object","required":["name"],"properties":{"name":{"type":"string","default":"example"}}}}
+ }}`)
+	if err != nil {
+		t.Fatal(err)
+	}
+	paths, got := normalize(t, s, `{"missing":null,"nullDefault":null,"nullable":null,"zero":null,"false":null,"empty":null,"entries":{"mine":{"name":null},"blank":null},"items":[{"name":null},null]}`)
+	if !reflect.DeepEqual(paths, []string{"empty", "false", "zero"}) {
+		t.Fatalf("removed paths=%v", paths)
+	}
+	for _, key := range []string{"missing", "nullDefault", "nullable"} {
+		if value, ok := got[key]; !ok || value != nil {
+			t.Errorf("%s null changed", key)
+		}
+	}
+	if !reflect.DeepEqual(got["entries"], map[string]any{"mine": map[string]any{"name": nil}, "blank": nil}) {
+		t.Error("user map entries changed")
+	}
+	if !reflect.DeepEqual(got["items"], []any{map[string]any{"name": nil}, nil}) {
+		t.Error("user array changed")
+	}
+}
+
+func TestNormalizeSpecNulls_PreservesOtherValuesExactly(t *testing.T) {
+	app := &appsv1alpha1.Application{Spec: &apiextv1.JSON{Raw: []byte(`{"talos":{"registryMirrors":null},"large":9007199254740993,"negative":-9007199254740993,"text":"null","bool":false,"empty":[],"object":{}}`)}}
+	r := &REST{specSchema: kubernetesSpecSchema(t)}
+	if _, err := r.normalizeSpecNulls(app); err != nil {
+		t.Fatal(err)
+	}
+	if string(app.Spec.Raw) != `{"bool":false,"empty":[],"large":9007199254740993,"negative":-9007199254740993,"object":{},"talos":{},"text":"null"}` {
+		t.Fatalf("unrelated values changed: %s", app.Spec.Raw)
+	}
+}
+
+// TestNormalizeSpecNulls_NoSchemaOrNoNulls pins the no-op paths: a kind whose
+// ApplicationDefinition ships no schema must pass its spec through untouched,
+// and a spec without nulls must not be re-serialized (re-marshalling reorders
+// keys, which would show up as spurious HelmRelease churn).
+func TestNormalizeSpecNulls_NoSchemaOrNoNulls(t *testing.T) {
+	const spec = `{"b":1,"a":{"c":2}}`
+
+	noSchema := &REST{}
+	app := &appsv1alpha1.Application{Spec: &apiextv1.JSON{Raw: []byte(spec)}}
+	paths, err := noSchema.normalizeSpecNulls(app)
+	if err != nil || paths != nil {
+		t.Errorf("no schema: paths=%v err=%v, want no-op", paths, err)
+	}
+	if string(app.Spec.Raw) != spec {
+		t.Errorf("no schema: spec rewritten to %s", app.Spec.Raw)
+	}
+
+	withSchema := &REST{specSchema: kubernetesSpecSchema(t)}
+	clean := &appsv1alpha1.Application{Spec: &apiextv1.JSON{Raw: []byte(`{"host":"k8s"}`)}}
+	paths, err = withSchema.normalizeSpecNulls(clean)
+	if err != nil || paths != nil {
+		t.Errorf("clean spec: paths=%v err=%v, want no-op", paths, err)
+	}
+	if string(clean.Spec.Raw) != `{"host":"k8s"}` {
+		t.Errorf("clean spec rewritten to %s", clean.Spec.Raw)
+	}
+}
+
+func TestEmptyFieldsWarning(t *testing.T) {
+	short := emptyFieldsWarning([]string{"talos.version", "talos.registryMirrors"})
+	if !strings.Contains(short, "talos.version, talos.registryMirrors") ||
+		!strings.Contains(short, "the chart default applies") {
+		t.Errorf("unexpected warning: %q", short)
+	}
+
+	many := make([]string, maxWarnedNullPaths+3)
+	for i := range many {
+		many[i] = "f"
+	}
+	long := emptyFieldsWarning(many)
+	if !strings.Contains(long, "(and 3 more)") {
+		t.Errorf("long warning not truncated: %q", long)
+	}
+}
diff --git a/pkg/registry/apps/application/rest_serversideapply_test.go b/pkg/registry/apps/application/rest_serversideapply_test.go
new file mode 100644
index 0000000000..798e7bafe8
--- /dev/null
+++ b/pkg/registry/apps/application/rest_serversideapply_test.go
@@ -0,0 +1,109 @@
+package application
+
+import (
+	"testing"
+	"time"
+
+	helmv2 "github.com/fluxcd/helm-controller/api/v2"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	appsv1alpha1 "github.com/cozystack/cozystack/pkg/apis/apps/v1alpha1"
+	"github.com/cozystack/cozystack/pkg/config"
+)
+
+// newRESTForServerSideApply builds a REST focused on the per-Application
+// HelmServerSideApply override (release.cozystack.io/helm-server-side-apply).
+// ssa==nil leaves the field unset (flux/helm-controller default applies).
+func newRESTForServerSideApply(ssa *bool) *REST {
+	return &REST{
+		kindName: "Postgres",
+		releaseConfig: config.ReleaseConfig{
+			Prefix: "postgres-",
+			ChartRef: config.ChartRefConfig{
+				Kind:      "HelmChart",
+				Name:      "x",
+				Namespace: "cozy-system",
+			},
+			HelmReleaseInterval:       5 * time.Minute,
+			HelmReleaseRetryInterval:  30 * time.Second,
+			HelmReleaseInstallTimeout: 10 * time.Minute,
+			HelmReleaseUpgradeTimeout: 10 * time.Minute,
+			HelmReleaseMaxHistory:     5,
+			HelmServerSideApply:       ssa,
+		},
+	}
+}
+
+// This is the codified guard for the postgres read-replica autoscaler's core
+// invariant: the tenant Postgres HelmRelease must apply CLIENT-SIDE, under which
+// helm-controller patches the CNPG Cluster (a CRD) from the previous-vs-new
+// rendered manifest without consulting live state, so the chart's constant
+// spec.instances seed yields no patch and KEDA's live /scale value is never
+// reverted. The platform's helm-controller v1.5.0
+// defaults to server-side apply (which force-owns rendered fields), so the
+// postgres ApplicationDefinition carries
+// release.cozystack.io/helm-server-side-apply: "false"; this test asserts that
+// annotation actually threads into Install.ServerSideApply=false and
+// Upgrade.ServerSideApply="disabled" on the emitted HelmRelease — on the SAME
+// builder (convertApplicationToHelmRelease) that produces the tenant release,
+// not the platform Package builder. If the plumbing is removed, this goes red.
+func TestConvertApplicationToHelmRelease_ServerSideApplyOverride(t *testing.T) {
+	tru := true
+	fls := false
+	cases := []struct {
+		name        string
+		ssa         *bool
+		wantInstall *bool                     // Install.ServerSideApply
+		wantUpgrade helmv2.ServerSideApplyMode // Upgrade.ServerSideApply
+	}{
+		{
+			name:        "unset leaves the helm-controller default (SSA)",
+			ssa:         nil,
+			wantInstall: nil,
+			wantUpgrade: "",
+		},
+		{
+			name:        "false forces client-side apply (autoscaler requirement)",
+			ssa:         &fls,
+			wantInstall: &fls,
+			wantUpgrade: helmv2.ServerSideApplyDisabled,
+		},
+		{
+			name:        "true forces server-side apply",
+			ssa:         &tru,
+			wantInstall: &tru,
+			wantUpgrade: helmv2.ServerSideApplyEnabled,
+		},
+	}
+
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			r := newRESTForServerSideApply(tc.ssa)
+			app := &appsv1alpha1.Application{
+				ObjectMeta: metav1.ObjectMeta{Name: "example", Namespace: "tenant-root"},
+			}
+
+			hr, err := r.convertApplicationToHelmRelease(app)
+			if err != nil {
+				t.Fatalf("convertApplicationToHelmRelease returned error: %v", err)
+			}
+			if hr.Spec.Install == nil || hr.Spec.Upgrade == nil {
+				t.Fatalf("Spec.Install/Upgrade must be non-nil")
+			}
+
+			gotInstall := hr.Spec.Install.ServerSideApply
+			switch {
+			case tc.wantInstall == nil && gotInstall != nil:
+				t.Errorf("Install.ServerSideApply = %v, want nil (unset)", *gotInstall)
+			case tc.wantInstall != nil && gotInstall == nil:
+				t.Errorf("Install.ServerSideApply = nil, want %v", *tc.wantInstall)
+			case tc.wantInstall != nil && gotInstall != nil && *gotInstall != *tc.wantInstall:
+				t.Errorf("Install.ServerSideApply = %v, want %v", *gotInstall, *tc.wantInstall)
+			}
+
+			if hr.Spec.Upgrade.ServerSideApply != tc.wantUpgrade {
+				t.Errorf("Upgrade.ServerSideApply = %q, want %q", hr.Spec.Upgrade.ServerSideApply, tc.wantUpgrade)
+			}
+		})
+	}
+}
diff --git a/pkg/registry/apps/application/rest_shard_label_test.go b/pkg/registry/apps/application/rest_shard_label_test.go
new file mode 100644
index 0000000000..9e1b45d0a0
--- /dev/null
+++ b/pkg/registry/apps/application/rest_shard_label_test.go
@@ -0,0 +1,115 @@
+/*
+Copyright 2026 The Cozystack Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package application
+
+import (
+	"context"
+	"testing"
+
+	helmv2 "github.com/fluxcd/helm-controller/api/v2"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apiserver/pkg/endpoints/request"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/client/fake"
+
+	fluxshard "github.com/cozystack/cozystack/internal/fluxshardoperator"
+	appsv1alpha1 "github.com/cozystack/cozystack/pkg/apis/apps/v1alpha1"
+	"github.com/cozystack/cozystack/pkg/config"
+)
+
+// TestUpdate_PreservesShardKeyLabel pins the flux-shard-operator contract on
+// the Update path: the operator owns sharding.fluxcd.io/key at runtime, and
+// rebuilding the HelmRelease from the Application must not revert the live
+// value to the ApplicationDefinition default. A regression here bounces every
+// updated HelmRelease off its shard back to the legacy "tenants" bucket — the
+// orphaning class the operator's drain guard exists to prevent.
+func TestUpdate_PreservesShardKeyLabel(t *testing.T) {
+	scheme := runtime.NewScheme()
+	if err := helmv2.AddToScheme(scheme); err != nil {
+		t.Fatalf("register helmv2 scheme: %v", err)
+	}
+	resourceCfg := &config.ResourceConfig{
+		Resources: []config.Resource{
+			{Application: config.ApplicationConfig{Kind: "MySQL"}},
+		},
+	}
+	if err := appsv1alpha1.RegisterDynamicTypes(scheme, resourceCfg); err != nil {
+		t.Fatalf("register dynamic types: %v", err)
+	}
+
+	// The live HelmRelease has been assigned to shard3 by the operator.
+	existing := &helmv2.HelmRelease{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "mysql-good-name",
+			Namespace: "tenant-foo",
+			Labels: map[string]string{
+				ApplicationKindLabel:    "MySQL",
+				ApplicationGroupLabel:   appsv1alpha1.GroupName,
+				ApplicationNameLabel:    "good-name",
+				fluxshard.ShardKeyLabel: "shard3",
+			},
+		},
+	}
+	fakeClient := fake.NewClientBuilder().WithScheme(scheme).WithObjects(existing).Build()
+	r := &REST{
+		c: fakeClient,
+		gvr: schema.GroupVersionResource{
+			Group:    appsv1alpha1.GroupName,
+			Version:  "v1alpha1",
+			Resource: "mysqls",
+		},
+		gvk: schema.GroupVersionKind{
+			Group:   appsv1alpha1.GroupName,
+			Version: "v1alpha1",
+			Kind:    "MySQL",
+		},
+		kindName: "MySQL",
+		releaseConfig: config.ReleaseConfig{
+			Prefix: "mysql-",
+			// The ApplicationDefinition default every HelmRelease is born
+			// with; without preservation this would overwrite shard3.
+			Labels: map[string]string{fluxshard.ShardKeyLabel: fluxshard.LegacyShardKey},
+		},
+	}
+
+	app := &appsv1alpha1.Application{
+		TypeMeta: metav1.TypeMeta{
+			APIVersion: "apps.cozystack.io/v1alpha1",
+			Kind:       "MySQL",
+		},
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "good-name",
+			Namespace: "tenant-foo",
+		},
+	}
+
+	ctx := request.WithNamespace(context.Background(), "tenant-foo")
+	if _, _, err := r.Update(ctx, "good-name", newDefaultUpdatedObjectInfo(app),
+		nil, nil, false, &metav1.UpdateOptions{}); err != nil {
+		t.Fatalf("Update failed: %v", err)
+	}
+
+	got := &helmv2.HelmRelease{}
+	if err := fakeClient.Get(ctx, client.ObjectKey{Namespace: "tenant-foo", Name: "mysql-good-name"}, got); err != nil {
+		t.Fatalf("fetch updated HelmRelease: %v", err)
+	}
+	if v := got.Labels[fluxshard.ShardKeyLabel]; v != "shard3" {
+		t.Errorf("expected live shard label to be preserved on Update, got %s=%q", fluxshard.ShardKeyLabel, v)
+	}
+}
diff --git a/pkg/registry/apps/application/rest_suspend_test.go b/pkg/registry/apps/application/rest_suspend_test.go
new file mode 100644
index 0000000000..dcd80dc502
--- /dev/null
+++ b/pkg/registry/apps/application/rest_suspend_test.go
@@ -0,0 +1,195 @@
+/*
+Copyright 2026 The Cozystack Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package application
+
+import (
+	"context"
+	"errors"
+	"testing"
+
+	helmv2 "github.com/fluxcd/helm-controller/api/v2"
+	apiextv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apiserver/pkg/endpoints/request"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/client/fake"
+	"sigs.k8s.io/controller-runtime/pkg/client/interceptor"
+
+	appsv1alpha1 "github.com/cozystack/cozystack/pkg/apis/apps/v1alpha1"
+	"github.com/cozystack/cozystack/pkg/config"
+)
+
+func newSuspendTestREST(t *testing.T, existing *helmv2.HelmRelease, funcs *interceptor.Funcs) (*REST, client.Client) {
+	t.Helper()
+	scheme := runtime.NewScheme()
+	if err := helmv2.AddToScheme(scheme); err != nil {
+		t.Fatalf("register helmv2 scheme: %v", err)
+	}
+	resourceCfg := &config.ResourceConfig{
+		Resources: []config.Resource{
+			{Application: config.ApplicationConfig{Kind: "Postgres"}},
+		},
+	}
+	if err := appsv1alpha1.RegisterDynamicTypes(scheme, resourceCfg); err != nil {
+		t.Fatalf("register dynamic types: %v", err)
+	}
+	builder := fake.NewClientBuilder().WithScheme(scheme).WithObjects(existing)
+	if funcs != nil {
+		builder = builder.WithInterceptorFuncs(*funcs)
+	}
+	c := builder.Build()
+	return &REST{
+		c: c,
+		gvr: schema.GroupVersionResource{
+			Group:    appsv1alpha1.GroupName,
+			Version:  "v1alpha1",
+			Resource: "postgreses",
+		},
+		gvk: schema.GroupVersionKind{
+			Group:   appsv1alpha1.GroupName,
+			Version: "v1alpha1",
+			Kind:    "Postgres",
+		},
+		kindName:      "Postgres",
+		releaseConfig: config.ReleaseConfig{Prefix: "postgres-"},
+	}, c
+}
+
+func suspendTestHelmRelease(suspend bool) *helmv2.HelmRelease {
+	return &helmv2.HelmRelease{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "postgres-pg",
+			Namespace: "tenant-foo",
+			Labels: map[string]string{
+				ApplicationKindLabel:  "Postgres",
+				ApplicationGroupLabel: appsv1alpha1.GroupName,
+				ApplicationNameLabel:  "pg",
+			},
+		},
+		Spec: helmv2.HelmReleaseSpec{
+			Suspend: suspend,
+			// Differs from the Application below, so a carry-over that took
+			// more than suspension off the live object shows up as stale values.
+			Values: &apiextv1.JSON{Raw: []byte(`{"replicas":5}`)},
+		},
+	}
+}
+
+func suspendTestApplication() *appsv1alpha1.Application {
+	return &appsv1alpha1.Application{
+		TypeMeta: metav1.TypeMeta{
+			APIVersion: "apps.cozystack.io/v1alpha1",
+			Kind:       "Postgres",
+		},
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "pg",
+			Namespace: "tenant-foo",
+		},
+		Spec: &apiextv1.JSON{Raw: []byte(`{"replicas":2}`)},
+	}
+}
+
+// TestUpdate_PreservesSuspend pins that an Application edit leaves the
+// release's suspension exactly as it found it. The rebuilt HelmRelease carries
+// no suspension of its own, so a regression resumes a release someone
+// suspended: the CNPG restore driver suspends the target release, patches the
+// Postgres app through this API and purges the Cluster, and a release resumed
+// by that patch renders the recovery Cluster before the purge, which then
+// deletes it. The unsuspended case guards the other direction, a fix that
+// suspends every release it touches.
+func TestUpdate_PreservesSuspend(t *testing.T) {
+	for _, suspend := range []bool{true, false} {
+		r, c := newSuspendTestREST(t, suspendTestHelmRelease(suspend), nil)
+
+		ctx := request.WithNamespace(context.Background(), "tenant-foo")
+		if _, _, err := r.Update(ctx, "pg", newDefaultUpdatedObjectInfo(suspendTestApplication()),
+			nil, nil, false, &metav1.UpdateOptions{}); err != nil {
+			t.Fatalf("suspend=%v: Update failed: %v", suspend, err)
+		}
+
+		got := &helmv2.HelmRelease{}
+		if err := c.Get(ctx, client.ObjectKey{Namespace: "tenant-foo", Name: "postgres-pg"}, got); err != nil {
+			t.Fatalf("suspend=%v: fetch updated HelmRelease: %v", suspend, err)
+		}
+		if got.Spec.Suspend != suspend {
+			t.Errorf("an Application update changed spec.suspend from %v to %v", suspend, got.Spec.Suspend)
+		}
+		if got.Spec.Values == nil || string(got.Spec.Values.Raw) != `{"replicas":2}` {
+			var raw string
+			if got.Spec.Values != nil {
+				raw = string(got.Spec.Values.Raw)
+			}
+			t.Errorf("suspend=%v: values must come from the Application, not the live object, got %s", suspend, raw)
+		}
+	}
+}
+
+// TestUpdate_RefreshesSuspendOnConflictRetry covers the window between Update's
+// read of the live HelmRelease and its write. A 409 there means something wrote
+// the release in between, and that write can be the one that suspended it: the
+// restore driver suspends immediately before it patches the app. Re-sending the
+// suspension from the stale read would resume the release on the retry.
+//
+// The interceptor suspends the stored release and then fails the first write
+// with a Conflict, which is the order a real racing suspend produces.
+func TestUpdate_RefreshesSuspendOnConflictRetry(t *testing.T) {
+	var updateCalls int
+	funcs := &interceptor.Funcs{
+		Update: func(ctx context.Context, c client.WithWatch, obj client.Object, opts ...client.UpdateOption) error {
+			if _, ok := obj.(*helmv2.HelmRelease); ok {
+				updateCalls++
+				if updateCalls == 1 {
+					live := &helmv2.HelmRelease{}
+					if err := c.Get(ctx, client.ObjectKeyFromObject(obj), live); err != nil {
+						return err
+					}
+					live.Spec.Suspend = true
+					if err := c.Update(ctx, live); err != nil {
+						return err
+					}
+					return apierrors.NewConflict(
+						schema.GroupResource{Group: "helm.toolkit.fluxcd.io", Resource: "helmreleases"},
+						obj.GetName(),
+						errors.New("simulated suspend between read and write"),
+					)
+				}
+			}
+			return c.Update(ctx, obj, opts...)
+		},
+	}
+	r, c := newSuspendTestREST(t, suspendTestHelmRelease(false), funcs)
+
+	ctx := request.WithNamespace(context.Background(), "tenant-foo")
+	if _, _, err := r.Update(ctx, "pg", newDefaultUpdatedObjectInfo(suspendTestApplication()),
+		nil, nil, false, &metav1.UpdateOptions{}); err != nil {
+		t.Fatalf("Update failed: %v", err)
+	}
+	if updateCalls != 2 {
+		t.Fatalf("expected one conflicting write and one retry, got %d HelmRelease writes", updateCalls)
+	}
+
+	got := &helmv2.HelmRelease{}
+	if err := c.Get(ctx, client.ObjectKey{Namespace: "tenant-foo", Name: "postgres-pg"}, got); err != nil {
+		t.Fatalf("fetch updated HelmRelease: %v", err)
+	}
+	if !got.Spec.Suspend {
+		t.Errorf("the retry resumed a release that was suspended between Update's read and its write")
+	}
+}
diff --git a/pkg/registry/apps/application/rest_table_test.go b/pkg/registry/apps/application/rest_table_test.go
new file mode 100644
index 0000000000..fab620b76c
--- /dev/null
+++ b/pkg/registry/apps/application/rest_table_test.go
@@ -0,0 +1,54 @@
+package application
+
+import (
+	"testing"
+
+	appsv1alpha1 "github.com/cozystack/cozystack/pkg/apis/apps/v1alpha1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+func TestTableShowsWorkloadsReadyNextToReady(t *testing.T) {
+	appWith := func(name string, conditions ...metav1.Condition) appsv1alpha1.Application {
+		app := appsv1alpha1.Application{ObjectMeta: metav1.ObjectMeta{Name: name}}
+		app.SetConditions(conditions)
+		return app
+	}
+	ready := metav1.Condition{Type: "Ready", Status: metav1.ConditionTrue}
+	cases := []struct {
+		name string
+		app  appsv1alpha1.Application
+		want string
+	}{
+		{"workloads not ready", appWith("a", ready, metav1.Condition{Type: "WorkloadsReady", Status: metav1.ConditionFalse}), "False"},
+		{"workloads ready", appWith("b", ready, metav1.Condition{Type: "WorkloadsReady", Status: metav1.ConditionTrue}), "True"},
+		{"workloads unknown", appWith("c", ready, metav1.Condition{Type: "WorkloadsReady", Status: metav1.ConditionUnknown}), "Unknown"},
+		{"no workload monitor", appWith("d", ready), "<none>"},
+	}
+	r := &REST{}
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			for _, table := range []metav1.Table{
+				r.buildTableFromApplications([]appsv1alpha1.Application{tc.app}),
+				r.buildTableFromApplication(tc.app),
+			} {
+				var names []string
+				for _, c := range table.ColumnDefinitions {
+					names = append(names, c.Name)
+				}
+				if len(names) < 3 || names[1] != "READY" || names[2] != "WORKLOADS" {
+					t.Fatalf("columns = %v, want WORKLOADS right after READY", names)
+				}
+				if table.ColumnDefinitions[2].Priority != 0 {
+					t.Errorf("WORKLOADS priority = %d, want 0 so kubectl shows it by default", table.ColumnDefinitions[2].Priority)
+				}
+				row := table.Rows[0].Cells
+				if len(row) != len(names) {
+					t.Fatalf("row has %d cells for %d columns", len(row), len(names))
+				}
+				if row[1] != "True" || row[2] != tc.want {
+					t.Errorf("READY=%v WORKLOADS=%v, want True and %s", row[1], row[2], tc.want)
+				}
+			}
+		})
+	}
+}
diff --git a/pkg/registry/apps/application/rest_timeout_test.go b/pkg/registry/apps/application/rest_timeout_test.go
index 85ac0b9743..2f51712bfa 100644
--- a/pkg/registry/apps/application/rest_timeout_test.go
+++ b/pkg/registry/apps/application/rest_timeout_test.go
@@ -4,12 +4,26 @@ import (
 	"testing"
 	"time"
 
+	helmv2 "github.com/fluxcd/helm-controller/api/v2"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	appsv1alpha1 "github.com/cozystack/cozystack/pkg/apis/apps/v1alpha1"
 	"github.com/cozystack/cozystack/pkg/config"
 )
 
+// Default HelmRelease global durations the api server applies after flag
+// parsing. Tests use these so the fixture exercises the same code path the
+// production binary takes — i.e. global timeouts are always non-zero.
+const (
+	testGlobalInstallTimeout = 10 * time.Minute
+	testGlobalUpgradeTimeout = 10 * time.Minute
+)
+
+// newRESTForTimeout builds a REST struct focused on the kind-wide
+// ApplicationDefinition HelmInstallTimeout override path. Global HelmRelease*
+// defaults are populated with production-shaped values so the unset-annotation
+// case exercises "global default applies". The full spec contract is covered
+// by rest_helmrelease_spec_test.go.
 func newRESTForTimeout(kind, prefix string, helmInstallTimeout time.Duration) *REST {
 	return &REST{
 		kindName: kind,
@@ -20,7 +34,12 @@ func newRESTForTimeout(kind, prefix string, helmInstallTimeout time.Duration) *R
 				Name:      "x",
 				Namespace: "cozy-system",
 			},
-			HelmInstallTimeout: helmInstallTimeout,
+			HelmReleaseInterval:       5 * time.Minute,
+			HelmReleaseRetryInterval:  30 * time.Second,
+			HelmReleaseInstallTimeout: testGlobalInstallTimeout,
+			HelmReleaseUpgradeTimeout: testGlobalUpgradeTimeout,
+			HelmReleaseMaxHistory:     5,
+			HelmInstallTimeout:        helmInstallTimeout,
 		},
 	}
 }
@@ -29,41 +48,45 @@ func newRESTForTimeout(kind, prefix string, helmInstallTimeout time.Duration) *R
 // budget. The Kubernetes kind's parent chart contains CAPI/Kamaji resources
 // whose admin-kubeconfig Secret is provisioned asynchronously, so its
 // ApplicationDefinition sets release.cozystack.io/helm-install-timeout=15m
-// (or longer). Other kinds leave the annotation unset and keep flux defaults
-// so their failed installs remediate on the normal cadence. The test must
-// cover both paths: a kind with the timeout set and one without.
+// (or longer). Other kinds leave the annotation unset and inherit the
+// global default. The test must cover both paths: a kind with the override
+// set and one without.
 func TestConvertApplicationToHelmRelease_AppliesReleaseConfigTimeout(t *testing.T) {
 	cases := []struct {
-		name       string
-		kind       string
-		prefix     string
-		configured time.Duration
-		wantSet    bool
+		name        string
+		kind        string
+		prefix      string
+		configured  time.Duration
+		wantInstall time.Duration
+		wantUpgrade time.Duration
 	}{
 		{
-			name:       "Kubernetes kind with 15m configured gets Install and Upgrade Timeout",
-			kind:       "Kubernetes",
-			prefix:     "kubernetes-",
-			configured: 15 * time.Minute,
-			wantSet:    true,
+			name:        "Kubernetes kind with 15m override beats global defaults",
+			kind:        "Kubernetes",
+			prefix:      "kubernetes-",
+			configured:  15 * time.Minute,
+			wantInstall: 15 * time.Minute,
+			wantUpgrade: 15 * time.Minute,
 		},
 		{
 			// Fictional kind on purpose: the test is about the unset path
 			// regardless of which real Application kind ends up needing a
 			// timeout override. Using a real kind name would create false
 			// coupling to that Application's ApplicationDefinition.
-			name:       "unrelated kind without configured timeout keeps flux defaults",
-			kind:       "PlaceholderKindForDefaults",
-			prefix:     "placeholder-",
-			configured: 0,
-			wantSet:    false,
+			name:        "unrelated kind without override inherits global defaults",
+			kind:        "PlaceholderKindForDefaults",
+			prefix:      "placeholder-",
+			configured:  0,
+			wantInstall: testGlobalInstallTimeout,
+			wantUpgrade: testGlobalUpgradeTimeout,
 		},
 		{
-			name:       "arbitrary future kind with 20m configured gets 20m",
-			kind:       "TalosCluster",
-			prefix:     "talos-",
-			configured: 20 * time.Minute,
-			wantSet:    true,
+			name:        "arbitrary future kind with 20m override gets 20m",
+			kind:        "TalosCluster",
+			prefix:      "talos-",
+			configured:  20 * time.Minute,
+			wantInstall: 20 * time.Minute,
+			wantUpgrade: 20 * time.Minute,
 		},
 	}
 
@@ -83,33 +106,93 @@ func TestConvertApplicationToHelmRelease_AppliesReleaseConfigTimeout(t *testing.
 				t.Fatalf("Spec.Install/Upgrade must be non-nil")
 			}
 
-			if tc.wantSet {
-				if hr.Spec.Install.Timeout == nil {
-					t.Fatalf("Spec.Install.Timeout must be set when HelmInstallTimeout=%v", tc.configured)
-				}
-				if hr.Spec.Install.Timeout.Duration != tc.configured {
-					t.Errorf("Spec.Install.Timeout = %v, want %v", hr.Spec.Install.Timeout.Duration, tc.configured)
-				}
-				if hr.Spec.Upgrade.Timeout == nil {
-					t.Fatalf("Spec.Upgrade.Timeout must be set when HelmInstallTimeout=%v", tc.configured)
-				}
-				if hr.Spec.Upgrade.Timeout.Duration != tc.configured {
-					t.Errorf("Spec.Upgrade.Timeout = %v, want %v", hr.Spec.Upgrade.Timeout.Duration, tc.configured)
-				}
-			} else {
-				if hr.Spec.Install.Timeout != nil {
-					t.Errorf("Spec.Install.Timeout must be nil when HelmInstallTimeout=0, got %v", hr.Spec.Install.Timeout.Duration)
-				}
-				if hr.Spec.Upgrade.Timeout != nil {
-					t.Errorf("Spec.Upgrade.Timeout must be nil when HelmInstallTimeout=0, got %v", hr.Spec.Upgrade.Timeout.Duration)
-				}
+			if hr.Spec.Install.Timeout == nil || hr.Spec.Install.Timeout.Duration != tc.wantInstall {
+				t.Errorf("Spec.Install.Timeout = %v, want %v", hr.Spec.Install.Timeout, tc.wantInstall)
+			}
+			if hr.Spec.Upgrade.Timeout == nil || hr.Spec.Upgrade.Timeout.Duration != tc.wantUpgrade {
+				t.Errorf("Spec.Upgrade.Timeout = %v, want %v", hr.Spec.Upgrade.Timeout, tc.wantUpgrade)
+			}
+
+			// Strategy must be RetryOnFailure with Remediation kept nil:
+			// retries are driven solely by Strategy.RetryInterval, the
+			// same single retry path cozystack-operator's
+			// PackageReconciler uses. Re-introducing
+			// Remediation{Retries: -1} "for safety" would add a second,
+			// conflicting retry mechanism and break operator parity.
+			if hr.Spec.Install.Strategy == nil ||
+				hr.Spec.Install.Strategy.Name != string(helmv2.ActionStrategyRetryOnFailure) {
+				t.Errorf("Spec.Install.Strategy must be RetryOnFailure, got %+v", hr.Spec.Install.Strategy)
+			}
+			if hr.Spec.Install.Remediation != nil {
+				t.Errorf("Spec.Install.Remediation must be nil, got %+v", hr.Spec.Install.Remediation)
+			}
+			if hr.Spec.Upgrade.Strategy == nil ||
+				hr.Spec.Upgrade.Strategy.Name != string(helmv2.ActionStrategyRetryOnFailure) {
+				t.Errorf("Spec.Upgrade.Strategy must be RetryOnFailure, got %+v", hr.Spec.Upgrade.Strategy)
+			}
+			if hr.Spec.Upgrade.Remediation != nil {
+				t.Errorf("Spec.Upgrade.Remediation must be nil, got %+v", hr.Spec.Upgrade.Remediation)
+			}
+		})
+	}
+}
+
+// HelmUpgradeTimeout (the kind-wide ApplicationDefinition
+// release.cozystack.io/helm-upgrade-timeout override) changes only
+// Upgrade.Timeout and wins over the value HelmInstallTimeout would otherwise
+// apply. This lets a kind carry an asymmetric budget — e.g. a short install but
+// a long upgrade.
+func TestConvertApplicationToHelmRelease_UpgradeTimeoutAnnotation(t *testing.T) {
+	cases := []struct {
+		name           string
+		installTimeout time.Duration // helm-install-timeout annotation
+		upgradeTimeout time.Duration // helm-upgrade-timeout annotation
+		wantInstall    time.Duration
+		wantUpgrade    time.Duration
+	}{
+		{
+			name:           "upgrade override alone leaves install on the global default",
+			installTimeout: 0,
+			upgradeTimeout: 20 * time.Minute,
+			wantInstall:    testGlobalInstallTimeout,
+			wantUpgrade:    20 * time.Minute,
+		},
+		{
+			name:           "upgrade override wins over the install-annotation copy",
+			installTimeout: 15 * time.Minute,
+			upgradeTimeout: 25 * time.Minute,
+			wantInstall:    15 * time.Minute,
+			wantUpgrade:    25 * time.Minute,
+		},
+		{
+			name:           "install override alone still sets both (regression guard)",
+			installTimeout: 15 * time.Minute,
+			upgradeTimeout: 0,
+			wantInstall:    15 * time.Minute,
+			wantUpgrade:    15 * time.Minute,
+		},
+	}
+
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			r := newRESTForTimeout("Example", "example-", tc.installTimeout)
+			r.releaseConfig.HelmUpgradeTimeout = tc.upgradeTimeout
+			app := &appsv1alpha1.Application{
+				ObjectMeta: metav1.ObjectMeta{Name: "example", Namespace: "tenant-root"},
 			}
 
-			if hr.Spec.Install.Remediation == nil || hr.Spec.Install.Remediation.Retries != -1 {
-				t.Errorf("Spec.Install.Remediation.Retries must remain -1, got %+v", hr.Spec.Install.Remediation)
+			hr, err := r.convertApplicationToHelmRelease(app)
+			if err != nil {
+				t.Fatalf("convertApplicationToHelmRelease returned error: %v", err)
+			}
+			if hr.Spec.Install == nil || hr.Spec.Upgrade == nil {
+				t.Fatalf("Spec.Install/Upgrade must be non-nil")
+			}
+			if hr.Spec.Install.Timeout == nil || hr.Spec.Install.Timeout.Duration != tc.wantInstall {
+				t.Errorf("Spec.Install.Timeout = %v, want %v", hr.Spec.Install.Timeout, tc.wantInstall)
 			}
-			if hr.Spec.Upgrade.Remediation == nil || hr.Spec.Upgrade.Remediation.Retries != -1 {
-				t.Errorf("Spec.Upgrade.Remediation.Retries must remain -1, got %+v", hr.Spec.Upgrade.Remediation)
+			if hr.Spec.Upgrade.Timeout == nil || hr.Spec.Upgrade.Timeout.Duration != tc.wantUpgrade {
+				t.Errorf("Spec.Upgrade.Timeout = %v, want %v", hr.Spec.Upgrade.Timeout, tc.wantUpgrade)
 			}
 		})
 	}
diff --git a/pkg/registry/apps/application/rest_update_metadata_test.go b/pkg/registry/apps/application/rest_update_metadata_test.go
new file mode 100644
index 0000000000..fc9f61c55d
--- /dev/null
+++ b/pkg/registry/apps/application/rest_update_metadata_test.go
@@ -0,0 +1,212 @@
+package application
+
+import (
+	"context"
+	"errors"
+	"testing"
+
+	helmv2 "github.com/fluxcd/helm-controller/api/v2"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apimachinery/pkg/types"
+	"k8s.io/apiserver/pkg/endpoints/request"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/client/interceptor"
+
+	appsv1alpha1 "github.com/cozystack/cozystack/pkg/apis/apps/v1alpha1"
+)
+
+// TestUpdate_PreservesForeignHelmReleaseMetadata pins the metadata
+// carry-over contract on the Update path. Update rebuilds the
+// HelmRelease from the Application and issues a full-replace PUT, so
+// without an explicit carry-over every update strips metadata owned by
+// other controllers. The most harmful instance is helm-controller's
+// finalizers.fluxcd.io finalizer: once stripped, a delete that lands
+// before helm-controller re-adds it removes the HelmRelease without
+// running `helm uninstall`, orphaning every resource of the release
+// (VMs, databases, PVCs). A label patch immediately followed by a
+// delete — a common client pattern — hits that window almost every
+// time.
+func TestUpdate_PreservesForeignHelmReleaseMetadata(t *testing.T) {
+	existing := &helmv2.HelmRelease{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:       "postgresql-mydb",
+			Namespace:  "default",
+			Finalizers: []string{"finalizers.fluxcd.io"},
+			OwnerReferences: []metav1.OwnerReference{{
+				APIVersion: "apps.cozystack.io/v1alpha1",
+				Kind:       "Tenant",
+				Name:       "root",
+				UID:        types.UID("owner-uid"),
+			}},
+			Labels: map[string]string{
+				ApplicationKindLabel:               "PostgreSQL",
+				ApplicationGroupLabel:              "apps.cozystack.io",
+				ApplicationNameLabel:               "mydb",
+				"kustomize.toolkit.fluxcd.io/name": "core",
+				LabelPrefix + "stale":              "removed-by-this-update",
+			},
+			Annotations: map[string]string{
+				"reconcile.fluxcd.io/requestedAt": "2026-06-12T00:00:00Z",
+				AnnotationPrefix + "stale":        "removed-by-this-update",
+			},
+		},
+	}
+	r := newTestRESTWithSchemes(existing)
+
+	app := &appsv1alpha1.Application{
+		TypeMeta: metav1.TypeMeta{
+			APIVersion: "apps.cozystack.io/v1alpha1",
+			Kind:       "PostgreSQL",
+		},
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "mydb",
+			Namespace: "default",
+			Labels:    map[string]string{"fresh": "yes"},
+		},
+	}
+
+	ctx := request.WithNamespace(context.Background(), "default")
+	if _, _, err := r.Update(
+		ctx,
+		"mydb",
+		newDefaultUpdatedObjectInfo(app),
+		nil,
+		nil,
+		false,
+		&metav1.UpdateOptions{},
+	); err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+
+	got := &helmv2.HelmRelease{}
+	if err := r.c.Get(ctx, client.ObjectKey{Namespace: "default", Name: "postgresql-mydb"}, got); err != nil {
+		t.Fatalf("failed to fetch updated HelmRelease: %v", err)
+	}
+
+	if len(got.Finalizers) != 1 || got.Finalizers[0] != "finalizers.fluxcd.io" {
+		t.Errorf("expected finalizers.fluxcd.io to be preserved, got %v", got.Finalizers)
+	}
+	if len(got.OwnerReferences) != 1 || got.OwnerReferences[0].UID != types.UID("owner-uid") {
+		t.Errorf("expected ownerReferences to be preserved, got %v", got.OwnerReferences)
+	}
+	if got.Labels["kustomize.toolkit.fluxcd.io/name"] != "core" {
+		t.Errorf("expected foreign label to be preserved, got labels %v", got.Labels)
+	}
+	if got.Annotations["reconcile.fluxcd.io/requestedAt"] != "2026-06-12T00:00:00Z" {
+		t.Errorf("expected foreign annotation to be preserved, got annotations %v", got.Annotations)
+	}
+	if got.Labels[LabelPrefix+"fresh"] != "yes" {
+		t.Errorf("expected new prefixed user label to be set, got labels %v", got.Labels)
+	}
+	if _, ok := got.Labels[LabelPrefix+"stale"]; ok {
+		t.Errorf("expected stale prefixed label to be dropped, got labels %v", got.Labels)
+	}
+	if _, ok := got.Annotations[AnnotationPrefix+"stale"]; ok {
+		t.Errorf("expected stale prefixed annotation to be dropped, got annotations %v", got.Annotations)
+	}
+	if got.Labels[ApplicationNameLabel] != "mydb" {
+		t.Errorf("expected application metadata labels to remain, got labels %v", got.Labels)
+	}
+}
+
+// TestCreate_DoesNotMutateSharedConfigLabels pins mergeMaps' allocation
+// contract. Create and Update build the HelmRelease label set starting
+// from r.releaseConfig.Labels, a long-lived map shared by every request
+// for the kind, and then write the application metadata labels into the
+// result in place. If mergeMaps returns one of its inputs instead of a
+// fresh map — which the old implementation did whenever the other input
+// was nil, e.g. for an Application with no labels — those in-place
+// writes land on the shared config map: requests cross-contaminate
+// (application.name varies per request) and concurrent map writes crash
+// the apiserver.
+func TestCreate_DoesNotMutateSharedConfigLabels(t *testing.T) {
+	configLabels := map[string]string{"cozystack.io/ui": "true"}
+	r := newTestRESTWithSchemes()
+	r.releaseConfig.Labels = configLabels
+
+	app := &appsv1alpha1.Application{
+		TypeMeta: metav1.TypeMeta{
+			APIVersion: "apps.cozystack.io/v1alpha1",
+			Kind:       "PostgreSQL",
+		},
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "nolabels",
+			Namespace: "default",
+			// No labels: the conversion yields a nil label map, the
+			// trigger for mergeMaps returning the config map itself.
+		},
+	}
+
+	ctx := request.WithNamespace(context.Background(), "default")
+	if _, err := r.Create(ctx, app, nil, &metav1.CreateOptions{}); err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+
+	if len(configLabels) != 1 || configLabels["cozystack.io/ui"] != "true" {
+		t.Errorf("expected shared config labels to be untouched, got %v", configLabels)
+	}
+}
+
+// TestUpdate_ReappliesForeignMetadataAfterConflict covers the metadata
+// carry-over on the conflict-retry path. A 409 on the PUT means the live
+// HelmRelease changed after the read the carry-over was built from, and
+// the writer behind it is normally helm-controller — which is exactly
+// the controller whose finalizer the carry-over exists to protect, and
+// which re-adds it on the reconcile following a metadata-only update.
+// Retrying with the metadata read before the conflict writes the stale
+// copy back and drops the finalizer that write had just restored.
+func TestUpdate_ReappliesForeignMetadataAfterConflict(t *testing.T) {
+	var updates int
+	r := newOptionsTestREST(t, interceptor.Funcs{
+		Update: func(ctx context.Context, c client.WithWatch, obj client.Object, opts ...client.UpdateOption) error {
+			updates++
+			if updates > 1 {
+				return c.Update(ctx, obj, opts...)
+			}
+			live := &helmv2.HelmRelease{}
+			if err := c.Get(ctx, client.ObjectKey{Namespace: optionsTestNamespace, Name: "postgresql-example"}, live); err != nil {
+				return err
+			}
+			live.Finalizers = append(live.Finalizers, "finalizers.fluxcd.io")
+			live.Labels["kustomize.toolkit.fluxcd.io/name"] = "core"
+			if err := c.Update(ctx, live); err != nil {
+				return err
+			}
+			return apierrors.NewConflict(
+				schema.GroupResource{Group: "helm.toolkit.fluxcd.io", Resource: "helmreleases"},
+				"postgresql-example", errors.New("object was modified"))
+		},
+	}, optionsTestHelmRelease())
+
+	ctx := request.WithNamespace(context.Background(), optionsTestNamespace)
+	if _, _, err := r.Update(
+		ctx,
+		"example",
+		newDefaultUpdatedObjectInfo(optionsTestApplication()),
+		nil,
+		nil,
+		false,
+		&metav1.UpdateOptions{},
+	); err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+	if updates < 2 {
+		t.Fatalf("expected the conflict to be retried, got %d update calls", updates)
+	}
+
+	got := &helmv2.HelmRelease{}
+	if err := r.c.Get(ctx, client.ObjectKey{Namespace: optionsTestNamespace, Name: "postgresql-example"}, got); err != nil {
+		t.Fatalf("failed to fetch updated HelmRelease: %v", err)
+	}
+	if len(got.Finalizers) != 1 || got.Finalizers[0] != "finalizers.fluxcd.io" {
+		t.Errorf("expected the finalizer added during the conflict to survive, got %v", got.Finalizers)
+	}
+	if got.Labels["kustomize.toolkit.fluxcd.io/name"] != "core" {
+		t.Errorf("expected the foreign label added during the conflict to survive, got labels %v", got.Labels)
+	}
+	if got.Labels[ApplicationNameLabel] != "example" {
+		t.Errorf("expected application metadata labels to remain, got labels %v", got.Labels)
+	}
+}
diff --git a/pkg/registry/apps/application/rest_validation_test.go b/pkg/registry/apps/application/rest_validation_test.go
index b806161c69..f48f40d263 100644
--- a/pkg/registry/apps/application/rest_validation_test.go
+++ b/pkg/registry/apps/application/rest_validation_test.go
@@ -30,11 +30,13 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apiserver/pkg/endpoints/request"
 	"k8s.io/apiserver/pkg/registry/rest"
+	"k8s.io/apiserver/pkg/warning"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
 
 	appsv1alpha1 "github.com/cozystack/cozystack/pkg/apis/apps/v1alpha1"
 	"github.com/cozystack/cozystack/pkg/apis/apps/validation"
 	"github.com/cozystack/cozystack/pkg/config"
+	apiextv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 )
 
 func TestValidateNameFormat(t *testing.T) {
@@ -141,9 +143,9 @@ func TestUpdate_ForceAllowCreate_RejectsTenantDashName(t *testing.T) {
 		ctx,
 		"foo-bar",
 		rest.DefaultUpdatedObjectInfo(newApp),
-		nil,                      // createValidation
-		nil,                      // updateValidation
-		true,                     // forceAllowCreate → routes through Create on NotFound
+		nil,  // createValidation
+		nil,  // updateValidation
+		true, // forceAllowCreate → routes through Create on NotFound
 		&metav1.UpdateOptions{},
 	)
 	if err == nil {
@@ -219,12 +221,17 @@ func TestConvertHelmReleaseToApplication_TenantNamespaceKindGate(t *testing.T) {
 }
 
 func TestValidateNameLength(t *testing.T) {
+	declaredCap := func(maxLen int64, description string) *validation.NameSchema {
+		return &validation.NameSchema{MaxLength: &maxLen, Description: description}
+	}
+
 	tests := []struct {
-		name      string
-		kindName  string
-		prefix    string
-		appName   string
-		wantError bool
+		name       string
+		kindName   string
+		prefix     string
+		nameSchema *validation.NameSchema
+		appName    string
+		wantError  bool
 	}{
 		{
 			name:      "short name passes",
@@ -261,6 +268,40 @@ func TestValidateNameLength(t *testing.T) {
 			appName:   strings.Repeat("a", 53-len("tenant-")+1), // 47 chars
 			wantError: true,
 		},
+		// An application may declare a cap stricter than its own Helm prefix
+		// budget allows. The declaration wins, whatever the kind is.
+		{
+			name:       "declared cap leaves short names alone",
+			kindName:   "Kubernetes",
+			prefix:     "kubernetes-",
+			nameSchema: declaredCap(32, "worker pools need the room"),
+			appName:    "prod",
+			wantError:  false,
+		},
+		{
+			name:       "at declared cap passes",
+			kindName:   "Kubernetes",
+			prefix:     "kubernetes-",
+			nameSchema: declaredCap(32, "worker pools need the room"),
+			appName:    strings.Repeat("a", 32),
+			wantError:  false,
+		},
+		{
+			name:       "exceeding declared cap fails even though it fits the prefix budget",
+			kindName:   "Kubernetes",
+			prefix:     "kubernetes-",
+			nameSchema: declaredCap(32, "worker pools need the room"),
+			appName:    strings.Repeat("a", 33), // still <= 42, the prefix budget
+			wantError:  true,
+		},
+		{
+			name:       "declaration looser than the Helm budget does not widen it",
+			kindName:   "MySQL",
+			prefix:     "mysql-",
+			nameSchema: declaredCap(60, "a chart cannot buy itself more room"),
+			appName:    strings.Repeat("a", 53-len("mysql-")+1), // 48 chars
+			wantError:  true,
+		},
 		{
 			name:      "prefix consuming all helm capacity returns config error",
 			kindName:  "MySQL",
@@ -284,6 +325,7 @@ func TestValidateNameLength(t *testing.T) {
 				releaseConfig: config.ReleaseConfig{
 					Prefix: tt.prefix,
 				},
+				nameSchema: tt.nameSchema,
 			}
 
 			errs := r.validateNameLength(tt.appName)
@@ -395,3 +437,73 @@ func TestValidateTenantNamespaceLength(t *testing.T) {
 		})
 	}
 }
+
+// fakeWarningRecorder captures client-facing admission warnings for assertions.
+type fakeWarningRecorder struct{ warnings []string }
+
+func (f *fakeWarningRecorder) AddWarning(_, text string) { f.warnings = append(f.warnings, text) }
+
+// TestWarnRemovedKubernetesFields covers the Phase 2 inert-field warning: a
+// Kubernetes CR that still carries nodeGroups / nodeHealthCheck /
+// maxNodeProvisionTime is accepted (the migration leaves them in place) but the
+// operator is warned that they no longer take effect. Other kinds never warn.
+func TestWarnRemovedKubernetesFields(t *testing.T) {
+	tests := []struct {
+		name     string
+		kindName string
+		specJSON string
+		wantKeys []string
+	}{
+		{
+			name:     "kubernetes with nodeGroups warns once",
+			kindName: "Kubernetes",
+			specJSON: `{"version":"v1.35","nodeGroups":{"md0":{"minReplicas":1}}}`,
+			wantKeys: []string{"nodeGroups"},
+		},
+		{
+			name:     "kubernetes with all three removed fields warns for each",
+			kindName: "Kubernetes",
+			specJSON: `{"nodeGroups":{},"nodeHealthCheck":{"maxUnhealthy":"50%"},"maxNodeProvisionTime":"10m"}`,
+			wantKeys: []string{"nodeGroups", "nodeHealthCheck", "maxNodeProvisionTime"},
+		},
+		{
+			name:     "kubernetes without removed fields does not warn",
+			kindName: "Kubernetes",
+			specJSON: `{"version":"v1.35","host":"example.com"}`,
+			wantKeys: nil,
+		},
+		{
+			name:     "non-kubernetes kind never warns even with nodeGroups",
+			kindName: "MySQL",
+			specJSON: `{"nodeGroups":{"md0":{}}}`,
+			wantKeys: nil,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			rec := &fakeWarningRecorder{}
+			ctx := warning.WithWarningRecorder(context.Background(), rec)
+			r := &REST{kindName: tt.kindName}
+			app := &appsv1alpha1.Application{Spec: &apiextv1.JSON{Raw: []byte(tt.specJSON)}}
+
+			r.warnRemovedKubernetesFields(ctx, app)
+
+			if len(rec.warnings) != len(tt.wantKeys) {
+				t.Fatalf("expected %d warnings, got %d: %v", len(tt.wantKeys), len(rec.warnings), rec.warnings)
+			}
+			for _, key := range tt.wantKeys {
+				found := false
+				for _, w := range rec.warnings {
+					if strings.Contains(w, "spec."+key+" is ignored") {
+						found = true
+						break
+					}
+				}
+				if !found {
+					t.Errorf("expected a warning mentioning spec.%s, got %v", key, rec.warnings)
+				}
+			}
+		})
+	}
+}
diff --git a/pkg/registry/apps/application/rest_warn_removed_fields_callsite_test.go b/pkg/registry/apps/application/rest_warn_removed_fields_callsite_test.go
new file mode 100644
index 0000000000..b836661026
--- /dev/null
+++ b/pkg/registry/apps/application/rest_warn_removed_fields_callsite_test.go
@@ -0,0 +1,156 @@
+/*
+Copyright 2024 The Cozystack Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package application
+
+import (
+	"context"
+	"errors"
+	"strings"
+	"testing"
+
+	helmv2 "github.com/fluxcd/helm-controller/api/v2"
+	apiextv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apiserver/pkg/endpoints/request"
+	"k8s.io/apiserver/pkg/warning"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/client/fake"
+
+	appsv1alpha1 "github.com/cozystack/cozystack/pkg/apis/apps/v1alpha1"
+	"github.com/cozystack/cozystack/pkg/config"
+)
+
+// The Phase 2 inert-field warning is only useful if it is actually wired into
+// the write path. TestWarnRemovedKubernetesFields (rest_validation_test.go)
+// pins the helper in isolation, but deleting either call site
+// (rest.go Create / Update) leaves that test green while an operator editing a
+// removed field silently gets no warning. These two tests drive Create and
+// Update end to end and assert the warning surfaces, so removing a call site
+// fails loudly.
+
+func newKubernetesWarnREST(t *testing.T, objects ...client.Object) *REST {
+	t.Helper()
+	scheme := runtime.NewScheme()
+	if err := helmv2.AddToScheme(scheme); err != nil {
+		t.Fatalf("register helmv2 scheme: %v", err)
+	}
+	resourceCfg := &config.ResourceConfig{
+		Resources: []config.Resource{
+			{Application: config.ApplicationConfig{Kind: kubernetesKind}},
+		},
+	}
+	if err := appsv1alpha1.RegisterDynamicTypes(scheme, resourceCfg); err != nil {
+		t.Fatalf("register dynamic types: %v", err)
+	}
+	fakeClient := fake.NewClientBuilder().WithScheme(scheme).WithObjects(objects...).Build()
+	return &REST{
+		c: fakeClient,
+		w: fakeClient,
+		gvr: schema.GroupVersionResource{
+			Group:    appsv1alpha1.GroupName,
+			Version:  "v1alpha1",
+			Resource: "kuberneteses",
+		},
+		gvk: schema.GroupVersionKind{
+			Group:   appsv1alpha1.GroupName,
+			Version: "v1alpha1",
+			Kind:    kubernetesKind,
+		},
+		kindName:      kubernetesKind,
+		releaseConfig: config.ReleaseConfig{Prefix: "kubernetes-"},
+	}
+}
+
+func kubernetesAppWithNodeGroups() *appsv1alpha1.Application {
+	return &appsv1alpha1.Application{
+		TypeMeta: metav1.TypeMeta{
+			APIVersion: "apps.cozystack.io/v1alpha1",
+			Kind:       kubernetesKind,
+		},
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "good-name",
+			Namespace: "tenant-foo",
+		},
+		Spec: &apiextv1.JSON{Raw: []byte(`{"version":"v1.35","nodeGroups":{"md0":{"minReplicas":1}}}`)},
+	}
+}
+
+func TestCreate_WarnsOnRemovedKubernetesFields(t *testing.T) {
+	r := newKubernetesWarnREST(t)
+	app := kubernetesAppWithNodeGroups()
+
+	rec := &fakeWarningRecorder{}
+	ctx := warning.WithWarningRecorder(request.WithNamespace(context.Background(), "tenant-foo"), rec)
+
+	// Short-circuit right after the warning (createValidation runs immediately
+	// after warnRemovedKubernetesFields), so the test does not depend on
+	// conversion or the fake client's write path.
+	sentinel := errors.New("stop after warning")
+	createValidation := func(_ context.Context, _ runtime.Object) error { return sentinel }
+
+	if _, err := r.Create(ctx, app, createValidation, &metav1.CreateOptions{}); !errors.Is(err, sentinel) {
+		t.Fatalf("expected sentinel error after warning, got %v", err)
+	}
+	assertNodeGroupsWarning(t, rec)
+}
+
+func TestUpdate_WarnsOnRemovedKubernetesFields(t *testing.T) {
+	existing := &helmv2.HelmRelease{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "kubernetes-good-name",
+			Namespace: "tenant-foo",
+			Labels: map[string]string{
+				ApplicationKindLabel:  kubernetesKind,
+				ApplicationGroupLabel: appsv1alpha1.GroupName,
+				ApplicationNameLabel:  "good-name",
+			},
+		},
+	}
+	r := newKubernetesWarnREST(t, existing)
+	app := kubernetesAppWithNodeGroups()
+
+	rec := &fakeWarningRecorder{}
+	ctx := warning.WithWarningRecorder(request.WithNamespace(context.Background(), "tenant-foo"), rec)
+
+	// updateValidation runs BEFORE warnRemovedKubernetesFields, so it must pass
+	// (return nil) for the warning to be reached. The final Update result is
+	// irrelevant — the warning is recorded before any conversion/write — so any
+	// downstream error is ignored; only the recorded warning is asserted.
+	updateValidation := func(_ context.Context, _, _ runtime.Object) error { return nil }
+	_, _, _ = r.Update(
+		ctx,
+		"good-name",
+		newDefaultUpdatedObjectInfo(app),
+		nil,
+		updateValidation,
+		false,
+		&metav1.UpdateOptions{},
+	)
+	assertNodeGroupsWarning(t, rec)
+}
+
+func assertNodeGroupsWarning(t *testing.T, rec *fakeWarningRecorder) {
+	t.Helper()
+	for _, w := range rec.warnings {
+		if strings.Contains(w, "spec.nodeGroups is ignored") {
+			return
+		}
+	}
+	t.Fatalf("expected a spec.nodeGroups admission warning, got %v", rec.warnings)
+}
diff --git a/pkg/registry/apps/application/rest_warn_removed_password_callsite_test.go b/pkg/registry/apps/application/rest_warn_removed_password_callsite_test.go
new file mode 100644
index 0000000000..e281181b7d
--- /dev/null
+++ b/pkg/registry/apps/application/rest_warn_removed_password_callsite_test.go
@@ -0,0 +1,331 @@
+/*
+Copyright 2024 The Cozystack Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package application
+
+import (
+	"context"
+	"errors"
+	"strings"
+	"testing"
+
+	helmv2 "github.com/fluxcd/helm-controller/api/v2"
+	apiextv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apiserver/pkg/endpoints/request"
+	"k8s.io/apiserver/pkg/warning"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/client/fake"
+
+	appsv1alpha1 "github.com/cozystack/cozystack/pkg/apis/apps/v1alpha1"
+	"github.com/cozystack/cozystack/pkg/config"
+)
+
+// Postgres and MariaDB dropped users[].password from the chart render but the
+// key is still accepted and stored, and a leftover value stays the live
+// credential. The warning telling an operator that editing it has no effect is
+// only useful if wired into the write path; deleting either call site
+// (rest.go Create / Update) must fail loudly. These tests drive Create and
+// Update end to end and assert the warning surfaces; TestWarnRemovedUserPasswords
+// below pins the helper in isolation (which kinds warn, and that a missing
+// password stays quiet).
+
+func newPostgresWarnREST(t *testing.T, objects ...client.Object) *REST {
+	t.Helper()
+	scheme := runtime.NewScheme()
+	if err := helmv2.AddToScheme(scheme); err != nil {
+		t.Fatalf("register helmv2 scheme: %v", err)
+	}
+	resourceCfg := &config.ResourceConfig{
+		Resources: []config.Resource{
+			{Application: config.ApplicationConfig{Kind: postgresKind}},
+		},
+	}
+	if err := appsv1alpha1.RegisterDynamicTypes(scheme, resourceCfg); err != nil {
+		t.Fatalf("register dynamic types: %v", err)
+	}
+	fakeClient := fake.NewClientBuilder().WithScheme(scheme).WithObjects(objects...).Build()
+	return &REST{
+		c: fakeClient,
+		w: fakeClient,
+		gvr: schema.GroupVersionResource{
+			Group:    appsv1alpha1.GroupName,
+			Version:  "v1alpha1",
+			Resource: "postgreses",
+		},
+		gvk: schema.GroupVersionKind{
+			Group:   appsv1alpha1.GroupName,
+			Version: "v1alpha1",
+			Kind:    postgresKind,
+		},
+		kindName:      postgresKind,
+		releaseConfig: config.ReleaseConfig{Prefix: "postgres-"},
+	}
+}
+
+func postgresAppWithUserPassword() *appsv1alpha1.Application {
+	return &appsv1alpha1.Application{
+		TypeMeta: metav1.TypeMeta{
+			APIVersion: "apps.cozystack.io/v1alpha1",
+			Kind:       postgresKind,
+		},
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "good-name",
+			Namespace: "tenant-foo",
+		},
+		Spec: &apiextv1.JSON{Raw: []byte(`{"users":{"app":{"password":"hackme"}}}`)},
+	}
+}
+
+func TestCreate_WarnsOnRemovedUserPassword(t *testing.T) {
+	r := newPostgresWarnREST(t)
+	app := postgresAppWithUserPassword()
+
+	rec := &fakeWarningRecorder{}
+	ctx := warning.WithWarningRecorder(request.WithNamespace(context.Background(), "tenant-foo"), rec)
+
+	// Short-circuit right after the warning (createValidation runs immediately
+	// after warnRemovedUserPasswords), so the test does not depend on conversion
+	// or the fake client's write path.
+	sentinel := errors.New("stop after warning")
+	createValidation := func(_ context.Context, _ runtime.Object) error { return sentinel }
+
+	if _, err := r.Create(ctx, app, createValidation, &metav1.CreateOptions{}); !errors.Is(err, sentinel) {
+		t.Fatalf("expected sentinel error after warning, got %v", err)
+	}
+	assertUserPasswordWarning(t, rec)
+}
+
+func TestUpdate_WarnsOnRemovedUserPassword(t *testing.T) {
+	existing := &helmv2.HelmRelease{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "postgres-good-name",
+			Namespace: "tenant-foo",
+			Labels: map[string]string{
+				ApplicationKindLabel:  postgresKind,
+				ApplicationGroupLabel: appsv1alpha1.GroupName,
+				ApplicationNameLabel:  "good-name",
+			},
+		},
+	}
+	r := newPostgresWarnREST(t, existing)
+	app := postgresAppWithUserPassword()
+
+	rec := &fakeWarningRecorder{}
+	ctx := warning.WithWarningRecorder(request.WithNamespace(context.Background(), "tenant-foo"), rec)
+
+	// updateValidation runs BEFORE warnRemovedUserPasswords, so it must pass for
+	// the warning to be reached; the final Update result is irrelevant.
+	updateValidation := func(_ context.Context, _, _ runtime.Object) error { return nil }
+	_, _, _ = r.Update(
+		ctx,
+		"good-name",
+		newDefaultUpdatedObjectInfo(app),
+		nil,
+		updateValidation,
+		false,
+		&metav1.UpdateOptions{},
+	)
+	assertUserPasswordWarning(t, rec)
+}
+
+func assertUserPasswordWarning(t *testing.T, rec *fakeWarningRecorder) {
+	t.Helper()
+	for _, w := range rec.warnings {
+		if strings.Contains(w, `spec.users["app"].password is ignored`) {
+			return
+		}
+	}
+	t.Fatalf("expected a spec.users[].password admission warning, got %v", rec.warnings)
+}
+
+func TestWarnRemovedUserPasswords(t *testing.T) {
+	const rawWithPassword = `{"users":{"app":{"password":"hackme"}}}`
+	cases := []struct {
+		name     string
+		kind     string
+		raw      string
+		wantWarn bool
+	}{
+		{"postgres warns", postgresKind, rawWithPassword, true},
+		{"mariadb warns", mariadbKind, rawWithPassword, true},
+		{"other kind stays quiet", "Redis", rawWithPassword, false},
+		{"no password stays quiet", postgresKind, `{"users":{"app":{}}}`, false},
+		{"warns on a good user despite a non-object user", postgresKind, `{"users":{"good":{"password":"x"},"bad":"str"}}`, true},
+		// A malformed users SHAPE (an array, not a map) carries no per-user password
+		// we recognise and must not fail the decode into a spurious warning.
+		{"malformed users shape stays quiet", postgresKind, `{"users":["oops"]}`, false},
+		// MariaDB force-generates root; a value-supplied users.root is ignored and
+		// must warn. Postgres hard-rejects users.postgres at render, so this warning
+		// is MariaDB-only.
+		{"mariadb warns on users.root", mariadbKind, `{"users":{"root":{"maxUserConnections":5}}}`, true},
+		{"postgres does not warn on users.root here", postgresKind, `{"users":{"root":{}}}`, false},
+	}
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			r := &REST{kindName: tc.kind}
+			app := &appsv1alpha1.Application{Spec: &apiextv1.JSON{Raw: []byte(tc.raw)}}
+			rec := &fakeWarningRecorder{}
+			ctx := warning.WithWarningRecorder(context.Background(), rec)
+			r.warnRemovedUserPasswords(ctx, app)
+			got := len(rec.warnings) > 0
+			if got != tc.wantWarn {
+				t.Fatalf("kind %s: warned=%v, want %v (warnings: %v)", tc.kind, got, tc.wantWarn, rec.warnings)
+			}
+		})
+	}
+}
+
+// A "_"/"-" collision that an UPDATE INTRODUCES (present in the new spec, absent
+// from the old) must draw an admission warning in each namespace MariaDB renders
+// with a "_"→"-" mapping — usernames, database names, and (database,user) Grant
+// pairs — because the render guard for each is install-gated (so it does not wedge
+// a release that already inherited the pair), leaving the upgrade-introduced case
+// to catch here where both specs are available. An inherited collision, or a
+// non-MariaDB kind, stays quiet.
+func TestWarnUpgradeIntroducedCollisions(t *testing.T) {
+	app := func(raw string) *appsv1alpha1.Application {
+		return &appsv1alpha1.Application{Spec: &apiextv1.JSON{Raw: []byte(raw)}}
+	}
+	cases := []struct {
+		name     string
+		kind     string
+		old      string
+		new      string
+		wantWarn bool
+	}{
+		{"introduced user pair warns", mariadbKind, `{"users":{"a_b":{}}}`, `{"users":{"a_b":{},"a-b":{}}}`, true},
+		{"introduced user from empty warns", mariadbKind, `{}`, `{"users":{"a_b":{},"a-b":{}}}`, true},
+		{"inherited user pair stays quiet", mariadbKind, `{"users":{"a_b":{},"a-b":{}}}`, `{"users":{"a_b":{},"a-b":{},"c":{}}}`, false},
+		{"no user collision stays quiet", mariadbKind, `{"users":{"a":{}}}`, `{"users":{"a":{},"b":{}}}`, false},
+		{"introduced database pair warns", mariadbKind, `{"databases":{"a_b":{}}}`, `{"databases":{"a_b":{},"a-b":{}}}`, true},
+		{"inherited database pair stays quiet", mariadbKind, `{"databases":{"a_b":{},"a-b":{}}}`, `{"databases":{"a_b":{},"a-b":{},"c":{}}}`, false},
+		// (database "a", user "b-c") and (database "a-b", user "c") both render Grant
+		// name a-b-c.
+		{"introduced grant pair warns", mariadbKind, `{}`, `{"databases":{"a":{"roles":{"admin":["b-c"]}},"a-b":{"roles":{"admin":["c"]}}}}`, true},
+		{"a user in both roles of one db is no self-collision", mariadbKind, `{}`, `{"databases":{"d":{"roles":{"admin":["u"],"readonly":["u"]}}}}`, false},
+		{"postgres never warns (no _/- resource mapping)", postgresKind, `{"users":{"a_b":{}}}`, `{"users":{"a_b":{},"a-b":{}}}`, false},
+		{"malformed new users stays quiet", mariadbKind, `{}`, `{"users":["oops"]}`, false},
+	}
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			r := &REST{kindName: tc.kind}
+			rec := &fakeWarningRecorder{}
+			ctx := warning.WithWarningRecorder(context.Background(), rec)
+			r.warnUpgradeIntroducedCollisions(ctx, app(tc.old), app(tc.new))
+			got := len(rec.warnings) > 0
+			if got != tc.wantWarn {
+				t.Fatalf("kind %s: warned=%v, want %v (warnings: %v)", tc.kind, got, tc.wantWarn, rec.warnings)
+			}
+		})
+	}
+}
+
+func newMariadbWarnREST(t *testing.T, objects ...client.Object) *REST {
+	t.Helper()
+	scheme := runtime.NewScheme()
+	if err := helmv2.AddToScheme(scheme); err != nil {
+		t.Fatalf("register helmv2 scheme: %v", err)
+	}
+	resourceCfg := &config.ResourceConfig{
+		Resources: []config.Resource{{Application: config.ApplicationConfig{Kind: mariadbKind}}},
+	}
+	if err := appsv1alpha1.RegisterDynamicTypes(scheme, resourceCfg); err != nil {
+		t.Fatalf("register dynamic types: %v", err)
+	}
+	fakeClient := fake.NewClientBuilder().WithScheme(scheme).WithObjects(objects...).Build()
+	return &REST{
+		c:             fakeClient,
+		w:             fakeClient,
+		gvr:           schema.GroupVersionResource{Group: appsv1alpha1.GroupName, Version: "v1alpha1", Resource: "mariadbs"},
+		gvk:           schema.GroupVersionKind{Group: appsv1alpha1.GroupName, Version: "v1alpha1", Kind: mariadbKind},
+		kindName:      mariadbKind,
+		releaseConfig: config.ReleaseConfig{Prefix: "mariadb-"},
+	}
+}
+
+// The collision warning is held to the same call-site contract as the removed-
+// password one: a test that drives Update end to end, so removing the call from
+// rest.go fails loudly. The existing release carries no users, so the new pair is
+// introduced-from-empty and must warn.
+func TestUpdate_WarnsOnUpgradeIntroducedCollision(t *testing.T) {
+	existing := &helmv2.HelmRelease{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "mariadb-good-name",
+			Namespace: "tenant-foo",
+			Labels: map[string]string{
+				ApplicationKindLabel:  mariadbKind,
+				ApplicationGroupLabel: appsv1alpha1.GroupName,
+				ApplicationNameLabel:  "good-name",
+			},
+		},
+	}
+	r := newMariadbWarnREST(t, existing)
+	app := &appsv1alpha1.Application{
+		TypeMeta:   metav1.TypeMeta{APIVersion: "apps.cozystack.io/v1alpha1", Kind: mariadbKind},
+		ObjectMeta: metav1.ObjectMeta{Name: "good-name", Namespace: "tenant-foo"},
+		Spec:       &apiextv1.JSON{Raw: []byte(`{"users":{"a_b":{},"a-b":{}}}`)},
+	}
+	rec := &fakeWarningRecorder{}
+	ctx := warning.WithWarningRecorder(request.WithNamespace(context.Background(), "tenant-foo"), rec)
+	updateValidation := func(_ context.Context, _, _ runtime.Object) error { return nil }
+	_, _, _ = r.Update(ctx, "good-name", newDefaultUpdatedObjectInfo(app), nil, updateValidation, false, &metav1.UpdateOptions{})
+	for _, w := range rec.warnings {
+		if strings.Contains(w, "map to the same mariadb-operator User name") {
+			return
+		}
+	}
+	t.Fatalf("expected an upgrade-introduced collision warning from Update, got %v", rec.warnings)
+}
+
+// A MariaDB users.root.password must draw exactly ONE warning (the whole-field
+// "users.root is ignored" one), not also the per-user password warning — one field,
+// one warning. Removing the root skip in the per-user loop makes this two.
+func TestWarnRemovedUserPasswords_MariadbRootSingleWarning(t *testing.T) {
+	r := &REST{kindName: mariadbKind}
+	app := &appsv1alpha1.Application{Spec: &apiextv1.JSON{Raw: []byte(`{"users":{"root":{"password":"x"}}}`)}}
+	rec := &fakeWarningRecorder{}
+	ctx := warning.WithWarningRecorder(context.Background(), rec)
+	r.warnRemovedUserPasswords(ctx, app)
+	if len(rec.warnings) != 1 {
+		t.Fatalf("expected exactly one warning for users.root.password, got %d: %v", len(rec.warnings), rec.warnings)
+	}
+	if !strings.Contains(rec.warnings[0], "spec.users.root is ignored") {
+		t.Fatalf("expected the whole-field root warning, got %q", rec.warnings[0])
+	}
+}
+
+// Postgres hard-rejects users.postgres at render, so a value-supplied
+// users.postgres.password must draw ONE clear key-forbidden warning at admission,
+// not the generic (and, on its own, misleading) "password is ignored" one.
+func TestWarnRemovedUserPasswords_PostgresPostgresKeyWarnsAboutKey(t *testing.T) {
+	r := &REST{kindName: postgresKind}
+	app := &appsv1alpha1.Application{Spec: &apiextv1.JSON{Raw: []byte(`{"users":{"postgres":{"password":"x"}}}`)}}
+	rec := &fakeWarningRecorder{}
+	ctx := warning.WithWarningRecorder(context.Background(), rec)
+	r.warnRemovedUserPasswords(ctx, app)
+	if len(rec.warnings) != 1 {
+		t.Fatalf("expected exactly one warning for users.postgres.password, got %d: %v", len(rec.warnings), rec.warnings)
+	}
+	if !strings.Contains(rec.warnings[0], "spec.users.postgres is not allowed") {
+		t.Fatalf("expected the forbidden-key warning, got %q", rec.warnings[0])
+	}
+	if strings.Contains(rec.warnings[0], "password is ignored") {
+		t.Fatalf("must not emit the misleading password-ignored warning for the forbidden key, got %q", rec.warnings[0])
+	}
+}
diff --git a/pkg/registry/apps/application/rest_watch_initial_events_test.go b/pkg/registry/apps/application/rest_watch_initial_events_test.go
new file mode 100644
index 0000000000..00f88cfde6
--- /dev/null
+++ b/pkg/registry/apps/application/rest_watch_initial_events_test.go
@@ -0,0 +1,194 @@
+/*
+Copyright 2026 The Cozystack Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package application
+
+import (
+	"context"
+	"testing"
+	"time"
+
+	helmv2 "github.com/fluxcd/helm-controller/api/v2"
+	metainternalversion "k8s.io/apimachinery/pkg/apis/meta/internalversion"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/watch"
+	"k8s.io/apiserver/pkg/endpoints/request"
+	"sigs.k8s.io/controller-runtime/pkg/client/fake"
+
+	appsv1alpha1 "github.com/cozystack/cozystack/pkg/apis/apps/v1alpha1"
+	"github.com/cozystack/cozystack/pkg/config"
+	"github.com/cozystack/cozystack/pkg/registry/registrytest"
+)
+
+func newWatchTestREST(t *testing.T) *REST {
+	t.Helper()
+	scheme := runtime.NewScheme()
+	if err := helmv2.AddToScheme(scheme); err != nil {
+		t.Fatalf("register helmv2 scheme: %v", err)
+	}
+	fc := fake.NewClientBuilder().WithScheme(scheme).Build()
+	return NewREST(fc, fc, &config.Resource{
+		Application: config.ApplicationConfig{Kind: "Redis", Singular: "redis", Plural: "redises"},
+		Release:     config.ReleaseConfig{Prefix: "redis-"},
+	})
+}
+
+func redisRelease(name string) *helmv2.HelmRelease {
+	return &helmv2.HelmRelease{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "redis-" + name,
+			Namespace: "tenant-a",
+			Labels: map[string]string{
+				ApplicationKindLabel:  "Redis",
+				ApplicationGroupLabel: appsv1alpha1.GroupName,
+			},
+		},
+	}
+}
+
+func collectWatchEvents(w watch.Interface, n int, timeout time.Duration) []watch.Event {
+	var out []watch.Event
+	deadline := time.After(timeout)
+	for len(out) < n {
+		select {
+		case ev, ok := <-w.ResultChan():
+			if !ok {
+				return out
+			}
+			out = append(out, ev)
+		case <-deadline:
+			return out
+		}
+	}
+	return out
+}
+
+// driveCreateAndUpdate creates a release behind the watch and then touches it,
+// because fake.Client.Watch doesn't replay existing objects as ADDED.
+func driveCreateAndUpdate(ctx context.Context, t *testing.T, r *REST) {
+	t.Helper()
+	hr := redisRelease("cache")
+	if err := r.c.Create(ctx, hr); err != nil {
+		t.Fatalf("create HelmRelease: %v", err)
+	}
+	hr.Annotations = map[string]string{"touched": "1"}
+	if err := r.c.Update(ctx, hr); err != nil {
+		t.Fatalf("update HelmRelease: %v", err)
+	}
+}
+
+func TestWatch_SendInitialEvents_EmitsInitialEventsEndBookmark(t *testing.T) {
+	r := newWatchTestREST(t)
+	ctx, cancel := context.WithCancel(request.WithNamespace(context.Background(), "tenant-a"))
+	defer cancel()
+
+	sendInitialEvents := true
+	w, err := r.Watch(ctx, &metainternalversion.ListOptions{SendInitialEvents: &sendInitialEvents, AllowWatchBookmarks: true})
+	if err != nil {
+		t.Fatalf("Watch returned error: %v", err)
+	}
+	defer w.Stop()
+	driveCreateAndUpdate(ctx, t, r)
+
+	evs := collectWatchEvents(w, 3, 2*time.Second)
+	if len(evs) < 3 {
+		t.Fatalf("expected at least 3 events (Added, Bookmark, Modified), got %d: %+v", len(evs), evs)
+	}
+	if evs[0].Type != watch.Added {
+		t.Fatalf("event[0]: expected Added, got %s", evs[0].Type)
+	}
+	if evs[1].Type != watch.Bookmark {
+		t.Fatalf("event[1]: expected Bookmark, got %s", evs[1].Type)
+	}
+	bookmark, ok := evs[1].Object.(*appsv1alpha1.Application)
+	if !ok {
+		t.Fatalf("event[1]: expected *Application, got %T", evs[1].Object)
+	}
+	if got := bookmark.Annotations[metav1.InitialEventsAnnotationKey]; got != "true" {
+		t.Fatalf("event[1]: expected annotation %s=true, got %q", metav1.InitialEventsAnnotationKey, got)
+	}
+	if evs[2].Type != watch.Modified {
+		t.Fatalf("event[2]: expected Modified after bookmark, got %s", evs[2].Type)
+	}
+}
+
+// TestWatch_BackingBookmarksFollowTheClient pins that the backing watch asks for
+// bookmarks only when the client did: every backing bookmark is forwarded, and
+// the fake client never sends one, so the event stream alone cannot show it.
+func TestWatch_BackingBookmarksFollowTheClient(t *testing.T) {
+	yes := true
+	for _, tc := range []struct {
+		name string
+		opts metainternalversion.ListOptions
+		want bool
+	}{
+		{"plain watch defaulted by the apiserver", metainternalversion.ListOptions{SendInitialEvents: &yes}, false},
+		{"watch list", metainternalversion.ListOptions{SendInitialEvents: &yes, AllowWatchBookmarks: true}, true},
+		{"bookmarks only", metainternalversion.ListOptions{AllowWatchBookmarks: true}, true},
+	} {
+		t.Run(tc.name, func(t *testing.T) {
+			r := newWatchTestREST(t)
+			spy := &registrytest.RawRecordingWatch{WithWatch: r.w}
+			r.w = spy
+			ctx, cancel := context.WithCancel(request.WithNamespace(context.Background(), "tenant-a"))
+			defer cancel()
+
+			w, err := r.Watch(ctx, &tc.opts)
+			if err != nil {
+				t.Fatalf("Watch returned error: %v", err)
+			}
+			defer w.Stop()
+
+			raw := spy.RawFor(&helmv2.HelmReleaseList{})
+			if raw == nil {
+				t.Fatal("backing watch was called without raw options")
+			}
+			if raw.AllowWatchBookmarks != tc.want {
+				t.Fatalf("backing AllowWatchBookmarks = %v, want %v", raw.AllowWatchBookmarks, tc.want)
+			}
+		})
+	}
+}
+
+// TestWatch_PlainWatch_EmitsNoInitialEventsEndBookmark covers a watch with no
+// resourceVersion: the apiserver defaults SendInitialEvents on for it but leaves
+// bookmarks off, so the client never asked for the terminating bookmark.
+func TestWatch_PlainWatch_EmitsNoInitialEventsEndBookmark(t *testing.T) {
+	r := newWatchTestREST(t)
+	ctx, cancel := context.WithCancel(request.WithNamespace(context.Background(), "tenant-a"))
+	defer cancel()
+
+	sendInitialEvents := true
+	w, err := r.Watch(ctx, &metainternalversion.ListOptions{SendInitialEvents: &sendInitialEvents})
+	if err != nil {
+		t.Fatalf("Watch returned error: %v", err)
+	}
+	defer w.Stop()
+	driveCreateAndUpdate(ctx, t, r)
+
+	evs := collectWatchEvents(w, 3, 2*time.Second)
+	var types []watch.EventType
+	for _, ev := range evs {
+		types = append(types, ev.Type)
+		if ev.Type == watch.Bookmark {
+			t.Fatalf("unrequested bookmark on a plain watch: %+v", ev.Object)
+		}
+	}
+	if len(types) != 2 || types[0] != watch.Added || types[1] != watch.Modified {
+		t.Fatalf("expected [ADDED MODIFIED], got %v", types)
+	}
+}
diff --git a/pkg/registry/apps/application/rest_watch_test.go b/pkg/registry/apps/application/rest_watch_test.go
index 93a51f3c3a..d5f9cebe23 100644
--- a/pkg/registry/apps/application/rest_watch_test.go
+++ b/pkg/registry/apps/application/rest_watch_test.go
@@ -13,7 +13,6 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/watch"
-	"k8s.io/utils/ptr"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
 )
@@ -67,7 +66,7 @@ func TestWatchIntegration_WorkloadMonitorTriggersModifiedEvent(t *testing.T) {
 			},
 		},
 		Status: cozyv1alpha1.WorkloadMonitorStatus{
-			Operational: ptr.To(false),
+			Operational: new(false),
 		},
 	}
 
@@ -136,7 +135,7 @@ func TestWatchIntegration_MonitorDeletionDropsWorkloadsReady(t *testing.T) {
 			},
 		},
 		Status: cozyv1alpha1.WorkloadMonitorStatus{
-			Operational: ptr.To(false),
+			Operational: new(false),
 		},
 	}
 
diff --git a/pkg/registry/apps/application/rest_workloads_test.go b/pkg/registry/apps/application/rest_workloads_test.go
index b706c323e0..1143e9c1d4 100644
--- a/pkg/registry/apps/application/rest_workloads_test.go
+++ b/pkg/registry/apps/application/rest_workloads_test.go
@@ -9,7 +9,6 @@ import (
 	"github.com/cozystack/cozystack/pkg/config"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/utils/ptr"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
 
 	helmv2 "github.com/fluxcd/helm-controller/api/v2"
@@ -64,7 +63,7 @@ func TestGetWorkloadsOperational_AllOperational(t *testing.T) {
 			},
 		},
 		Status: cozyv1alpha1.WorkloadMonitorStatus{
-			Operational: ptr.To(true),
+			Operational: new(true),
 		},
 	}
 	m2 := &cozyv1alpha1.WorkloadMonitor{
@@ -78,7 +77,7 @@ func TestGetWorkloadsOperational_AllOperational(t *testing.T) {
 			},
 		},
 		Status: cozyv1alpha1.WorkloadMonitorStatus{
-			Operational: ptr.To(true),
+			Operational: new(true),
 		},
 	}
 
@@ -107,7 +106,7 @@ func TestGetWorkloadsOperational_SomeNotOperational(t *testing.T) {
 			},
 		},
 		Status: cozyv1alpha1.WorkloadMonitorStatus{
-			Operational: ptr.To(true),
+			Operational: new(true),
 		},
 	}
 	m2 := &cozyv1alpha1.WorkloadMonitor{
@@ -121,7 +120,7 @@ func TestGetWorkloadsOperational_SomeNotOperational(t *testing.T) {
 			},
 		},
 		Status: cozyv1alpha1.WorkloadMonitorStatus{
-			Operational: ptr.To(false),
+			Operational: new(false),
 		},
 	}
 
@@ -179,7 +178,7 @@ func TestGetWorkloadsOperational_MixedNilAndOperational(t *testing.T) {
 			},
 		},
 		Status: cozyv1alpha1.WorkloadMonitorStatus{
-			Operational: ptr.To(true),
+			Operational: new(true),
 		},
 	}
 	m2 := &cozyv1alpha1.WorkloadMonitor{
@@ -219,7 +218,7 @@ func TestGetWorkloadsOperational_MixedFailedAndPending(t *testing.T) {
 			},
 		},
 		Status: cozyv1alpha1.WorkloadMonitorStatus{
-			Operational: ptr.To(false), // Confirmed failure
+			Operational: new(false), // Confirmed failure
 		},
 	}
 	m2 := &cozyv1alpha1.WorkloadMonitor{
@@ -262,7 +261,7 @@ func TestConvertConditions_MixedFailedAndPendingShowsFalse(t *testing.T) {
 			},
 		},
 		Status: cozyv1alpha1.WorkloadMonitorStatus{
-			Operational: ptr.To(false),
+			Operational: new(false),
 		},
 	}
 	mPending := &cozyv1alpha1.WorkloadMonitor{
@@ -323,7 +322,7 @@ func TestGetWorkloadsOperational_DifferentApp_NotFound(t *testing.T) {
 			},
 		},
 		Status: cozyv1alpha1.WorkloadMonitorStatus{
-			Operational: ptr.To(false),
+			Operational: new(false),
 		},
 	}
 
@@ -340,3 +339,85 @@ func TestGetWorkloadsOperational_DifferentApp_NotFound(t *testing.T) {
 	}
 }
 
+func TestConvertConditions_WorkloadsReadyCarriesMonitorMessages(t *testing.T) {
+	monitor := func(name string, operational bool, message, reason string) *cozyv1alpha1.WorkloadMonitor {
+		return &cozyv1alpha1.WorkloadMonitor{
+			ObjectMeta: metav1.ObjectMeta{
+				Name:      name,
+				Namespace: "default",
+				Labels: map[string]string{
+					appsv1alpha1.ApplicationKindLabel:  "PostgreSQL",
+					appsv1alpha1.ApplicationGroupLabel: "apps.cozystack.io",
+					appsv1alpha1.ApplicationNameLabel:  "mydb",
+				},
+			},
+			Status: cozyv1alpha1.WorkloadMonitorStatus{Operational: new(operational), Message: message, Reason: reason},
+		}
+	}
+	hr := &helmv2.HelmRelease{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "postgresql-mydb",
+			Namespace: "default",
+			Labels: map[string]string{
+				ApplicationKindLabel:  "PostgreSQL",
+				ApplicationGroupLabel: "apps.cozystack.io",
+				ApplicationNameLabel:  "mydb",
+			},
+		},
+	}
+	hr.Status.Conditions = []metav1.Condition{
+		{Type: "Ready", Status: metav1.ConditionTrue, Reason: "Succeeded", Message: "ok"},
+	}
+
+	cases := []struct {
+		name     string
+		monitors []runtime.Object
+		want     string
+		reason   string
+	}{
+		{
+			"messages of the monitors that are not operational, sorted",
+			[]runtime.Object{
+				monitor("mon-b", false, "DataVolume b is ImportInProgress", cozyv1alpha1.WorkloadMonitorReasonDataVolumeNotReady),
+				monitor("mon-a", false, "DataVolume a is Failed", cozyv1alpha1.WorkloadMonitorReasonDataVolumeNotReady),
+				monitor("mon-c", true, "", ""),
+			},
+			"DataVolume a is Failed; DataVolume b is ImportInProgress",
+			cozyv1alpha1.WorkloadMonitorReasonDataVolumeNotReady,
+		},
+		{
+			"a named cause beside a monitor that names none",
+			[]runtime.Object{
+				monitor("mon-a", false, "", ""),
+				monitor("mon-b", false, "DataVolume b is Failed", cozyv1alpha1.WorkloadMonitorReasonDataVolumeNotReady),
+			},
+			"DataVolume b is Failed",
+			cozyv1alpha1.WorkloadMonitorReasonDataVolumeNotReady,
+		},
+		{
+			"generic message when no monitor names a cause",
+			[]runtime.Object{monitor("mon-a", false, "", "")},
+			"One or more workloads are not operational",
+			"WorkloadMonitorCheck",
+		},
+	}
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			r := newTestRESTWithSchemes(tc.monitors...)
+			app, err := r.convertHelmReleaseToApplication(context.TODO(), hr, nil)
+			if err != nil {
+				t.Fatalf("unexpected error: %v", err)
+			}
+			wc := findCondition(app.GetConditions(), "WorkloadsReady")
+			if wc == nil || wc.Status != metav1.ConditionFalse {
+				t.Fatalf("WorkloadsReady = %+v, want False", wc)
+			}
+			if wc.Message != tc.want {
+				t.Errorf("message = %q, want %q", wc.Message, tc.want)
+			}
+			if wc.Reason != tc.reason {
+				t.Errorf("reason = %q, want %q", wc.Reason, tc.reason)
+			}
+		})
+	}
+}
diff --git a/pkg/registry/apps/application/rest_write_options_test.go b/pkg/registry/apps/application/rest_write_options_test.go
new file mode 100644
index 0000000000..823a7327c4
--- /dev/null
+++ b/pkg/registry/apps/application/rest_write_options_test.go
@@ -0,0 +1,315 @@
+/*
+Copyright 2026 The Cozystack Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package application
+
+import (
+	"context"
+	"fmt"
+	"net/http"
+	"reflect"
+	"strings"
+	"testing"
+
+	cozyv1alpha1 "github.com/cozystack/cozystack/api/v1alpha1"
+	helmv2 "github.com/fluxcd/helm-controller/api/v2"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apimachinery/pkg/types"
+	"k8s.io/apiserver/pkg/endpoints/handlers/responsewriters"
+	"k8s.io/apiserver/pkg/endpoints/request"
+	"k8s.io/apiserver/pkg/registry/rest"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/client/fake"
+	"sigs.k8s.io/controller-runtime/pkg/client/interceptor"
+
+	appsv1alpha1 "github.com/cozystack/cozystack/pkg/apis/apps/v1alpha1"
+	"github.com/cozystack/cozystack/pkg/config"
+)
+
+const optionsTestNamespace = "tenant-options"
+
+func newOptionsTestREST(t *testing.T, funcs interceptor.Funcs, objects ...client.Object) *REST {
+	t.Helper()
+	scheme := runtime.NewScheme()
+	if err := cozyv1alpha1.AddToScheme(scheme); err != nil {
+		t.Fatalf("register Cozystack API scheme: %v", err)
+	}
+	if err := helmv2.AddToScheme(scheme); err != nil {
+		t.Fatalf("register HelmRelease scheme: %v", err)
+	}
+	c := fake.NewClientBuilder().
+		WithScheme(scheme).
+		WithObjects(objects...).
+		WithInterceptorFuncs(funcs).
+		Build()
+	return NewREST(c, nil, &config.Resource{
+		Application: config.ApplicationConfig{
+			Kind:     "PostgreSQL",
+			Plural:   "postgresqls",
+			Singular: "postgresql",
+		},
+		Release: config.ReleaseConfig{Prefix: "postgresql-"},
+	})
+}
+
+func optionsTestApplication() *appsv1alpha1.Application {
+	return &appsv1alpha1.Application{
+		TypeMeta: metav1.TypeMeta{APIVersion: "apps.cozystack.io/v1alpha1", Kind: "PostgreSQL"},
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "example",
+			Namespace: optionsTestNamespace,
+		},
+	}
+}
+
+func optionsTestHelmRelease() *helmv2.HelmRelease {
+	return &helmv2.HelmRelease{ObjectMeta: metav1.ObjectMeta{
+		Name:      "postgresql-example",
+		Namespace: optionsTestNamespace,
+		Labels: map[string]string{
+			ApplicationKindLabel:  "PostgreSQL",
+			ApplicationGroupLabel: appsv1alpha1.GroupName,
+			ApplicationNameLabel:  "example",
+		},
+	}}
+}
+
+func captureCreateOptions(opts ...client.CreateOption) *metav1.CreateOptions {
+	converted := (&client.CreateOptions{}).ApplyOptions(opts)
+	return converted.AsCreateOptions().DeepCopy()
+}
+
+func captureUpdateOptions(opts ...client.UpdateOption) *metav1.UpdateOptions {
+	converted := (&client.UpdateOptions{}).ApplyOptions(opts)
+	return converted.AsUpdateOptions().DeepCopy()
+}
+
+func captureDeleteOptions(opts ...client.DeleteOption) *metav1.DeleteOptions {
+	converted := &client.DeleteOptions{}
+	for _, option := range opts {
+		option.ApplyToDelete(converted)
+	}
+	return converted.AsDeleteOptions().DeepCopy()
+}
+
+func TestCreatePropagatesWriteOptions(t *testing.T) {
+	want := &metav1.CreateOptions{
+		DryRun:          []string{metav1.DryRunAll},
+		FieldManager:    "create-manager",
+		FieldValidation: "Strict",
+	}
+	expected := want.DeepCopy()
+	var got *metav1.CreateOptions
+	r := newOptionsTestREST(t, interceptor.Funcs{
+		Create: func(_ context.Context, _ client.WithWatch, _ client.Object, opts ...client.CreateOption) error {
+			got = captureCreateOptions(opts...)
+			return nil
+		},
+	})
+	ctx := request.WithNamespace(context.Background(), optionsTestNamespace)
+	if _, err := r.Create(ctx, optionsTestApplication(), nil, want); err != nil {
+		t.Fatalf("Create returned error: %v", err)
+	}
+	if !reflect.DeepEqual(got, expected) {
+		t.Fatalf("Create options lost in controller-runtime conversion:\n got: %#v\nwant: %#v", got, expected)
+	}
+}
+
+func TestUpdatePropagatesWriteOptions(t *testing.T) {
+	want := &metav1.UpdateOptions{
+		DryRun:          []string{metav1.DryRunAll},
+		FieldManager:    "update-manager",
+		FieldValidation: "Warn",
+	}
+	expected := want.DeepCopy()
+	var got *metav1.UpdateOptions
+	r := newOptionsTestREST(t, interceptor.Funcs{
+		Update: func(_ context.Context, _ client.WithWatch, _ client.Object, opts ...client.UpdateOption) error {
+			got = captureUpdateOptions(opts...)
+			return nil
+		},
+	}, optionsTestHelmRelease())
+	ctx := request.WithNamespace(context.Background(), optionsTestNamespace)
+	if _, _, err := r.Update(ctx, "example", rest.DefaultUpdatedObjectInfo(optionsTestApplication()), nil, nil, false, want); err != nil {
+		t.Fatalf("Update returned error: %v", err)
+	}
+	if !reflect.DeepEqual(got, expected) {
+		t.Fatalf("Update options lost in controller-runtime conversion:\n got: %#v\nwant: %#v", got, expected)
+	}
+}
+
+func TestUpdateForceCreatePropagatesWriteOptions(t *testing.T) {
+	update := &metav1.UpdateOptions{
+		DryRun:          []string{metav1.DryRunAll},
+		FieldManager:    "apply-manager",
+		FieldValidation: "Strict",
+	}
+	want := &metav1.CreateOptions{
+		DryRun:          update.DryRun,
+		FieldManager:    update.FieldManager,
+		FieldValidation: update.FieldValidation,
+	}
+	var got *metav1.CreateOptions
+	r := newOptionsTestREST(t, interceptor.Funcs{
+		Create: func(_ context.Context, _ client.WithWatch, _ client.Object, opts ...client.CreateOption) error {
+			got = captureCreateOptions(opts...)
+			return nil
+		},
+	})
+	ctx := request.WithNamespace(context.Background(), optionsTestNamespace)
+	if _, _, err := r.Update(ctx, "example", rest.DefaultUpdatedObjectInfo(optionsTestApplication()), nil, nil, true, update); err != nil {
+		t.Fatalf("force-create Update returned error: %v", err)
+	}
+	if !reflect.DeepEqual(got, want) {
+		t.Fatalf("force-create options lost in controller-runtime conversion:\n got: %#v\nwant: %#v", got, want)
+	}
+}
+
+func TestDeletePropagatesWriteOptions(t *testing.T) {
+	grace := int64(3)
+	propagation := metav1.DeletePropagationForeground
+	uid := types.UID("expected-uid")
+	rv := "17"
+	want := &metav1.DeleteOptions{
+		GracePeriodSeconds: &grace,
+		Preconditions:      &metav1.Preconditions{UID: &uid, ResourceVersion: &rv},
+		PropagationPolicy:  &propagation,
+		DryRun:             []string{metav1.DryRunAll},
+	}
+	expected := want.DeepCopy()
+	var got *metav1.DeleteOptions
+	r := newOptionsTestREST(t, interceptor.Funcs{
+		Delete: func(_ context.Context, _ client.WithWatch, _ client.Object, opts ...client.DeleteOption) error {
+			got = captureDeleteOptions(opts...)
+			return nil
+		},
+	}, optionsTestHelmRelease())
+	ctx := request.WithNamespace(context.Background(), optionsTestNamespace)
+	if _, _, err := r.Delete(ctx, "example", nil, want); err != nil {
+		t.Fatalf("Delete returned error: %v", err)
+	}
+	if !reflect.DeepEqual(got, expected) {
+		t.Fatalf("Delete options lost in controller-runtime conversion:\n got: %#v\nwant: %#v", got, expected)
+	}
+}
+
+// assertWireStatus checks the answer the aggregated endpoint would put on the
+// wire: ErrorToAPIStatus type-switches on the APIStatus interface and never
+// unwraps, so a merely fmt.Errorf-wrapped backend rejection collapses to a
+// generic 500 with an empty reason even while errors.Is/As still succeed.
+func assertWireStatus(t *testing.T, err error, wantCode int32, wantReason metav1.StatusReason, wantContext string) {
+	t.Helper()
+	status := responsewriters.ErrorToAPIStatus(err)
+	if status.Code != wantCode || status.Reason != wantReason {
+		t.Fatalf("wire status = %d %q, want %d %q (err: %v)", status.Code, status.Reason, wantCode, wantReason, err)
+	}
+	if !strings.Contains(status.Message, wantContext) {
+		t.Fatalf("wire message %q lost the %q context", status.Message, wantContext)
+	}
+	if status.Details == nil || status.Details.Group != appsv1alpha1.GroupName || status.Details.Kind != "postgresqls" || status.Details.Name != "example" {
+		t.Fatalf("wire details = %#v, want apps.cozystack.io/postgresqls example", status.Details)
+	}
+	if !strings.HasPrefix(status.Message, `postgresqls.apps.cozystack.io "example": `) {
+		t.Fatalf("wire message %q does not identify the requested Application", status.Message)
+	}
+}
+
+func TestCreatePreservesBackendStatus(t *testing.T) {
+	alreadyExists := apierrors.NewAlreadyExists(
+		schema.GroupResource{Group: helmv2.GroupVersion.Group, Resource: "helmreleases"},
+		"postgresql-example",
+	)
+	r := newOptionsTestREST(t, interceptor.Funcs{
+		Create: func(_ context.Context, _ client.WithWatch, _ client.Object, _ ...client.CreateOption) error {
+			return alreadyExists
+		},
+	})
+	ctx := request.WithNamespace(context.Background(), optionsTestNamespace)
+	_, err := r.Create(ctx, optionsTestApplication(), nil, &metav1.CreateOptions{})
+	if !apierrors.IsAlreadyExists(err) {
+		t.Fatalf("Create returned %v, want a preserved AlreadyExists", err)
+	}
+	assertWireStatus(t, err, http.StatusConflict, metav1.StatusReasonAlreadyExists, "failed to create HelmRelease")
+}
+
+func TestUpdatePreservesBackendStatus(t *testing.T) {
+	forbidden := apierrors.NewForbidden(
+		schema.GroupResource{Group: helmv2.GroupVersion.Group, Resource: "helmreleases"},
+		"postgresql-example",
+		fmt.Errorf("rejected by admission policy"),
+	)
+	r := newOptionsTestREST(t, interceptor.Funcs{
+		Update: func(_ context.Context, _ client.WithWatch, _ client.Object, _ ...client.UpdateOption) error {
+			return forbidden
+		},
+	}, optionsTestHelmRelease())
+	ctx := request.WithNamespace(context.Background(), optionsTestNamespace)
+	_, _, err := r.Update(ctx, "example", rest.DefaultUpdatedObjectInfo(optionsTestApplication()), nil, nil, false, &metav1.UpdateOptions{})
+	if !apierrors.IsForbidden(err) {
+		t.Fatalf("Update returned %v, want a preserved Forbidden", err)
+	}
+	assertWireStatus(t, err, http.StatusForbidden, metav1.StatusReasonForbidden, "failed to update HelmRelease")
+}
+
+func TestUpdatePreservesStatusWhenCurrentHelmReleaseDisappears(t *testing.T) {
+	getCalls := 0
+	r := newOptionsTestREST(t, interceptor.Funcs{
+		Get: func(ctx context.Context, c client.WithWatch, key client.ObjectKey, obj client.Object, opts ...client.GetOption) error {
+			if _, ok := obj.(*helmv2.HelmRelease); ok {
+				getCalls++
+				if getCalls == 2 {
+					return apierrors.NewNotFound(helmv2.GroupVersion.WithResource("helmreleases").GroupResource(), key.Name)
+				}
+			}
+			return c.Get(ctx, key, obj, opts...)
+		},
+		Update: func(_ context.Context, _ client.WithWatch, _ client.Object, _ ...client.UpdateOption) error {
+			t.Fatal("Update wrote a HelmRelease after its current state could not be read")
+			return nil
+		},
+	}, optionsTestHelmRelease())
+	ctx := request.WithNamespace(context.Background(), optionsTestNamespace)
+	_, _, err := r.Update(ctx, "example", rest.DefaultUpdatedObjectInfo(optionsTestApplication()), nil, nil, false, &metav1.UpdateOptions{})
+	if getCalls != 2 {
+		t.Fatalf("HelmRelease reads = %d, want the initial read and the current-state read", getCalls)
+	}
+	if !apierrors.IsNotFound(err) {
+		t.Fatalf("Update returned %v, want a preserved NotFound", err)
+	}
+	assertWireStatus(t, err, http.StatusNotFound, metav1.StatusReasonNotFound, "failed to fetch current HelmRelease")
+}
+
+func TestDeletePreservesConflictError(t *testing.T) {
+	conflict := apierrors.NewConflict(
+		schema.GroupResource{Group: helmv2.GroupVersion.Group, Resource: "helmreleases"},
+		"postgresql-example",
+		fmt.Errorf("precondition failed"),
+	)
+	r := newOptionsTestREST(t, interceptor.Funcs{
+		Delete: func(_ context.Context, _ client.WithWatch, _ client.Object, _ ...client.DeleteOption) error {
+			return conflict
+		},
+	}, optionsTestHelmRelease())
+	ctx := request.WithNamespace(context.Background(), optionsTestNamespace)
+	_, _, err := r.Delete(ctx, "example", nil, &metav1.DeleteOptions{})
+	if !apierrors.IsConflict(err) {
+		t.Fatalf("Delete returned %v, want a preserved Conflict", err)
+	}
+	assertWireStatus(t, err, http.StatusConflict, metav1.StatusReasonConflict, "failed to delete HelmRelease")
+}
diff --git a/pkg/registry/core/option/providers.go b/pkg/registry/core/option/providers.go
new file mode 100644
index 0000000000..7a9ab6e1c8
--- /dev/null
+++ b/pkg/registry/core/option/providers.go
@@ -0,0 +1,441 @@
+// SPDX-License-Identifier: Apache-2.0
+// Providers compute the option items for each named dropdown source. They run
+// with the apiserver's privileged client (dynamic.Interface), so tenants need
+// no direct access to Nodes, the KubeVirt CR, cluster instancetypes, etc.
+
+package option
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"sort"
+	"strings"
+
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	"k8s.io/apimachinery/pkg/api/resource"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/client-go/dynamic"
+	"k8s.io/klog/v2"
+
+	migrationv1alpha1 "github.com/cozystack/cozystack/api/migration/v1alpha1"
+	corev1alpha1 "github.com/cozystack/cozystack/pkg/apis/core/v1alpha1"
+)
+
+// kubevirtNamespace is where the singleton KubeVirt CR lives.
+const kubevirtNamespace = "cozy-kubevirt"
+
+// publicImagesNamespace and imagePVCPrefix locate the default VM image catalog.
+const (
+	publicImagesNamespace = "cozy-public"
+	imagePVCPrefix        = "vm-default-images-"
+)
+
+// providerFunc computes the items for one source. namespace is the request
+// namespace (empty for cluster-scoped callers); cluster-global providers ignore
+// it.
+type providerFunc func(ctx context.Context, namespace string) ([]corev1alpha1.OptionItem, error)
+
+// paramProviderFunc computes the items for a source whose contents depend on a
+// choice already made elsewhere in the form — the machines of one import
+// source, say, which are meaningless until that source is picked.
+type paramProviderFunc func(ctx context.Context, namespace, arg string) ([]corev1alpha1.OptionItem, error)
+
+var (
+	gvrNodes        = schema.GroupVersionResource{Group: "", Version: "v1", Resource: "nodes"}
+	gvrPVCs         = schema.GroupVersionResource{Group: "", Version: "v1", Resource: "persistentvolumeclaims"}
+	gvrDataVolumes  = schema.GroupVersionResource{Group: "cdi.kubevirt.io", Version: "v1beta1", Resource: "datavolumes"}
+	gvrKubevirts    = schema.GroupVersionResource{Group: "kubevirt.io", Version: "v1", Resource: "kubevirts"}
+	gvrInstancetype = schema.GroupVersionResource{Group: "instancetype.kubevirt.io", Version: "v1beta1", Resource: "virtualmachineclusterinstancetypes"}
+	gvrPreference   = schema.GroupVersionResource{Group: "instancetype.kubevirt.io", Version: "v1beta1", Resource: "virtualmachineclusterpreferences"}
+	gvrNADs         = schema.GroupVersionResource{Group: "k8s.cni.cncf.io", Version: "v1", Resource: "network-attachment-definitions"}
+	gvrHelmReleases = schema.GroupVersionResource{Group: "helm.toolkit.fluxcd.io", Version: "v2", Resource: "helmreleases"}
+	gvrStorageClass = schema.GroupVersionResource{Group: "storage.k8s.io", Version: "v1", Resource: "storageclasses"}
+	gvrBackupClass  = schema.GroupVersionResource{Group: "backups.cozystack.io", Version: "v1alpha1", Resource: "backupclasses"}
+	gvrVMDisks      = schema.GroupVersionResource{Group: "apps.cozystack.io", Version: "v1alpha1", Resource: "vmdisks"}
+	gvrPlans        = schema.GroupVersionResource{Group: "backups.cozystack.io", Version: "v1alpha1", Resource: "plans"}
+	gvrBackups      = schema.GroupVersionResource{Group: "backups.cozystack.io", Version: "v1alpha1", Resource: "backups"}
+	gvrImportSource = schema.GroupVersionResource{Group: "forklift.cozystack.io", Version: "v1alpha1", Resource: "vmimportsources"}
+	gvrConfigMaps   = schema.GroupVersionResource{Group: "", Version: "v1", Resource: "configmaps"}
+	gvrAppDefs      = schema.GroupVersionResource{Group: "cozystack.io", Version: "v1alpha1", Resource: "applicationdefinitions"}
+)
+
+const defaultStorageClassAnnotation = "storageclass.kubernetes.io/is-default-class"
+
+// DefaultProviders returns the registry of dropdown sources.
+func DefaultProviders(dyn dynamic.Interface) map[string]providerFunc {
+	return map[string]providerFunc{
+		"gpu":             gpuProvider(dyn),
+		"instancetype":    nameListProvider(dyn, gvrInstancetype),
+		"instanceprofile": nameListProvider(dyn, gvrPreference),
+		"network":         nameListNamespacedProvider(dyn, gvrNADs),
+		"image":           imageProvider(dyn),
+		"storagepool":     storagePoolProvider(dyn),
+		"storageclass":    storageClassProvider(dyn),
+		"backupclass":     nameListProvider(dyn, gvrBackupClass),
+		"vmdisk":          vmDiskProvider(dyn),
+		"plan":            nameListNamespacedProvider(dyn, gvrPlans),
+		"backup":          nameListNamespacedProvider(dyn, gvrBackups),
+		"appkind":         appKindProvider(dyn),
+		// Source connections a VMImportTask can reference. Namespaced, so a
+		// tenant only ever sees their own.
+		"vmimportsource": nameListNamespacedProvider(dyn, gvrImportSource),
+	}
+}
+
+// DefaultParamProviders returns the sources that need an argument. They are
+// addressed as `<name>.<argument>` and never appear in a List, because without
+// the argument they describe nothing.
+func DefaultParamProviders(dyn dynamic.Interface) map[string]paramProviderFunc {
+	return map[string]paramProviderFunc{
+		"vmimportvm": importVMProvider(dyn),
+	}
+}
+
+// importVMProvider offers the machines of one import source.
+//
+// The list is not read from vCenter here. This process has no route to a
+// provider's inventory and should not grow one — that would put the source's
+// credentials in a second component. Instead the migration controller, which
+// already holds an inventory client, publishes what it found into a ConfigMap
+// owned by the source, and this reads it back as an ordinary object.
+//
+// An absent or empty ConfigMap yields no items rather than an error: a source
+// that was just created has not published yet, and an empty dropdown says that
+// more usefully than a failure does.
+func importVMProvider(dyn dynamic.Interface) paramProviderFunc {
+	return func(ctx context.Context, namespace, source string) ([]corev1alpha1.OptionItem, error) {
+		if namespace == "" || source == "" {
+			return nil, nil
+		}
+		cm, err := dyn.Resource(gvrConfigMaps).Namespace(namespace).
+			Get(ctx, migrationv1alpha1.InventoryConfigMapName(source), metav1.GetOptions{})
+		if err != nil {
+			if apierrors.IsNotFound(err) {
+				return nil, nil
+			}
+			return nil, err
+		}
+
+		raw, found, err := unstructured.NestedString(cm.Object, "data", migrationv1alpha1.InventoryVMsKey)
+		if err != nil || !found || raw == "" {
+			return nil, nil
+		}
+		var vms []migrationv1alpha1.PublishedVM
+		if err := json.Unmarshal([]byte(raw), &vms); err != nil {
+			return nil, fmt.Errorf("decoding the published VM list for source %q: %w", source, err)
+		}
+
+		items := make([]corev1alpha1.OptionItem, 0, len(vms))
+		for _, vm := range vms {
+			if vm.ID == "" {
+				continue
+			}
+			// The name is what a person recognises and the reference is what the
+			// task records, so the label carries both. Two machines can share a
+			// name in different folders, and the reference is also the only
+			// thing a saved task shows afterwards -- a list of bare names would
+			// be ambiguous to pick from and impossible to check against.
+			label := vm.Name
+			if label != "" {
+				label = fmt.Sprintf("%s (%s)", vm.Name, vm.ID)
+			}
+			items = append(items, corev1alpha1.OptionItem{
+				Value:       vm.ID,
+				Label:       label,
+				Description: vm.Path,
+			})
+		}
+		sort.Slice(items, func(i, j int) bool { return items[i].Label < items[j].Label })
+		return items, nil
+	}
+}
+
+// appKindProvider lists the application kinds known to the cluster from
+// ApplicationDefinitions (apps.cozystack.io). These are the kinds selectable
+// in the backup forms' applicationRef.kind / targetApplicationRef.kind fields.
+func appKindProvider(dyn dynamic.Interface) providerFunc {
+	return func(ctx context.Context, _ string) ([]corev1alpha1.OptionItem, error) {
+		list, err := dyn.Resource(gvrAppDefs).List(ctx, listOpts())
+		if err != nil {
+			return nil, err
+		}
+		items := make([]corev1alpha1.OptionItem, 0, len(list.Items))
+		seen := map[string]struct{}{}
+		for i := range list.Items {
+			kind, ok, _ := unstructured.NestedString(list.Items[i].Object, "spec", "application", "kind")
+			if !ok || kind == "" {
+				continue
+			}
+			if _, dup := seen[kind]; dup {
+				continue
+			}
+			seen[kind] = struct{}{}
+			items = append(items, corev1alpha1.OptionItem{Value: kind})
+		}
+		sortItems(items)
+		return items, nil
+	}
+}
+
+// storageClassProvider lists StorageClasses and marks the cluster-default one
+// (annotated storageclass.kubernetes.io/is-default-class) so the UI can
+// preselect it.
+func storageClassProvider(dyn dynamic.Interface) providerFunc {
+	return func(ctx context.Context, _ string) ([]corev1alpha1.OptionItem, error) {
+		list, err := dyn.Resource(gvrStorageClass).List(ctx, listOpts())
+		if err != nil {
+			return nil, err
+		}
+		items := make([]corev1alpha1.OptionItem, 0, len(list.Items))
+		for i := range list.Items {
+			name := list.Items[i].GetName()
+			isDefault := list.Items[i].GetAnnotations()[defaultStorageClassAnnotation] == "true"
+			item := corev1alpha1.OptionItem{Value: name, Default: isDefault}
+			if isDefault {
+				item.Label = name + " (default)"
+			}
+			items = append(items, item)
+		}
+		sortItems(items)
+		return items, nil
+	}
+}
+
+// vmDiskProvider lists VMDisk apps in the request namespace and shows the disk
+// size in the label (mirrors the old VMDiskWidget).
+func vmDiskProvider(dyn dynamic.Interface) providerFunc {
+	return func(ctx context.Context, namespace string) ([]corev1alpha1.OptionItem, error) {
+		if namespace == "" {
+			return nil, nil
+		}
+		list, err := dyn.Resource(gvrVMDisks).Namespace(namespace).List(ctx, listOpts())
+		if err != nil {
+			return nil, err
+		}
+		items := make([]corev1alpha1.OptionItem, 0, len(list.Items))
+		for i := range list.Items {
+			name := list.Items[i].GetName()
+			item := corev1alpha1.OptionItem{Value: name}
+			if storage, ok, _ := unstructured.NestedString(list.Items[i].Object, "spec", "storage"); ok && storage != "" {
+				item.Label = fmt.Sprintf("%s (%s)", name, storage)
+			}
+			items = append(items, item)
+		}
+		sortItems(items)
+		return items, nil
+	}
+}
+
+// nameListProvider lists a cluster-scoped resource and emits one option per
+// object name.
+func nameListProvider(dyn dynamic.Interface, gvr schema.GroupVersionResource) providerFunc {
+	return func(ctx context.Context, _ string) ([]corev1alpha1.OptionItem, error) {
+		list, err := dyn.Resource(gvr).List(ctx, listOpts())
+		if err != nil {
+			return nil, err
+		}
+		return itemsFromNames(list), nil
+	}
+}
+
+// nameListNamespacedProvider lists a namespaced resource in the request
+// namespace and emits one option per object name.
+func nameListNamespacedProvider(dyn dynamic.Interface, gvr schema.GroupVersionResource) providerFunc {
+	return func(ctx context.Context, namespace string) ([]corev1alpha1.OptionItem, error) {
+		if namespace == "" {
+			return nil, nil
+		}
+		list, err := dyn.Resource(gvr).Namespace(namespace).List(ctx, listOpts())
+		if err != nil {
+			return nil, err
+		}
+		return itemsFromNames(list), nil
+	}
+}
+
+// gpuProvider intersects the KubeVirt permittedHostDevices whitelist with what
+// the nodes actually advertise as allocatable.
+func gpuProvider(dyn dynamic.Interface) providerFunc {
+	return func(ctx context.Context, _ string) ([]corev1alpha1.OptionItem, error) {
+		kvList, err := dyn.Resource(gvrKubevirts).Namespace(kubevirtNamespace).List(ctx, listOpts())
+		if err != nil {
+			return nil, fmt.Errorf("list kubevirts: %w", err)
+		}
+		if len(kvList.Items) == 0 {
+			return nil, nil
+		}
+		whitelist := permittedResourceNames(&kvList.Items[0])
+		if len(whitelist) == 0 {
+			return nil, nil
+		}
+
+		nodeList, err := dyn.Resource(gvrNodes).List(ctx, listOpts())
+		if err != nil {
+			return nil, fmt.Errorf("list nodes: %w", err)
+		}
+
+		// resourceName -> total count, and -> nodes that have it.
+		total := map[string]int64{}
+		nodesByRes := map[string][]string{}
+		for i := range nodeList.Items {
+			node := &nodeList.Items[i]
+			alloc, _, _ := unstructured.NestedMap(node.Object, "status", "allocatable")
+			for res := range whitelist {
+				raw, ok := alloc[res]
+				if !ok {
+					continue
+				}
+				qty, err := resource.ParseQuantity(fmt.Sprintf("%v", raw))
+				if err != nil {
+					continue
+				}
+				if n := qty.Value(); n > 0 {
+					total[res] += n
+					nodesByRes[res] = append(nodesByRes[res], node.GetName())
+				}
+			}
+		}
+
+		items := make([]corev1alpha1.OptionItem, 0, len(whitelist))
+		for res := range whitelist {
+			desc := "not currently available on any node"
+			if n := total[res]; n > 0 {
+				sort.Strings(nodesByRes[res])
+				desc = fmt.Sprintf("%d available on %s", n, strings.Join(nodesByRes[res], ", "))
+			}
+			items = append(items, corev1alpha1.OptionItem{Value: res, Description: desc})
+		}
+		sortItems(items)
+		return items, nil
+	}
+}
+
+// permittedResourceNames pulls resourceNames from pciHostDevices and
+// mediatedDevices of a KubeVirt CR.
+func permittedResourceNames(kv *unstructured.Unstructured) map[string]struct{} {
+	out := map[string]struct{}{}
+	for _, group := range []string{"pciHostDevices", "mediatedDevices"} {
+		devices, _, _ := unstructured.NestedSlice(kv.Object, "spec", "configuration", "permittedHostDevices", group)
+		for _, d := range devices {
+			dm, ok := d.(map[string]any)
+			if !ok {
+				continue
+			}
+			if name, ok := dm["resourceName"].(string); ok && name != "" {
+				out[name] = struct{}{}
+			}
+		}
+	}
+	return out
+}
+
+// imageProvider lists the default image PVCs in cozy-public and strips the
+// vm-default-images- prefix to get the catalog name used by the vm-disk chart.
+//
+// A golden whose DataVolume is in phase Failed is left out: CDI never
+// populates it, so a disk cloned from it never becomes usable. One still
+// importing stays, because CDI holds a clone until the source is populated.
+func imageProvider(dyn dynamic.Interface) providerFunc {
+	return func(ctx context.Context, _ string) ([]corev1alpha1.OptionItem, error) {
+		list, err := dyn.Resource(gvrPVCs).Namespace(publicImagesNamespace).List(ctx, listOpts())
+		if err != nil {
+			return nil, err
+		}
+		// The filter is advisory: when the DataVolumes cannot be read the
+		// goldens go out unfiltered, because the Option list drops a source
+		// whose provider errors and an empty picker is the worse outcome.
+		failed := map[string]bool{}
+		dvs, err := dyn.Resource(gvrDataVolumes).Namespace(publicImagesNamespace).List(ctx, listOpts())
+		if err != nil {
+			logProviderError("image", err)
+		} else {
+			for i := range dvs.Items {
+				if phase, _, _ := unstructured.NestedString(dvs.Items[i].Object, "status", "phase"); phase == "Failed" {
+					failed[dvs.Items[i].GetName()] = true
+				}
+			}
+		}
+		items := make([]corev1alpha1.OptionItem, 0, len(list.Items))
+		for i := range list.Items {
+			name := list.Items[i].GetName()
+			if !strings.HasPrefix(name, imagePVCPrefix) || failed[name] {
+				continue
+			}
+			items = append(items, corev1alpha1.OptionItem{Value: strings.TrimPrefix(name, imagePVCPrefix)})
+		}
+		sortItems(items)
+		return items, nil
+	}
+}
+
+// storagePoolProvider derives selectable pool names from the seaweedfs
+// HelmRelease(s) in the request namespace (volume.pools and
+// volume.zones.<zone>.pools map keys). Best-effort: returns nil when no
+// seaweedfs release is present, and the UI falls back to free text.
+func storagePoolProvider(dyn dynamic.Interface) providerFunc {
+	return func(ctx context.Context, namespace string) ([]corev1alpha1.OptionItem, error) {
+		if namespace == "" {
+			return nil, nil
+		}
+		list, err := dyn.Resource(gvrHelmReleases).Namespace(namespace).List(ctx, listOpts())
+		if err != nil {
+			return nil, err
+		}
+		pools := map[string]struct{}{}
+		for i := range list.Items {
+			values, ok, _ := unstructured.NestedMap(list.Items[i].Object, "spec", "values")
+			if !ok {
+				continue
+			}
+			volume, ok := values["volume"].(map[string]any)
+			if !ok {
+				continue
+			}
+			collectPoolKeys(volume["pools"], pools)
+			if zones, ok := volume["zones"].(map[string]any); ok {
+				for _, z := range zones {
+					if zm, ok := z.(map[string]any); ok {
+						collectPoolKeys(zm["pools"], pools)
+					}
+				}
+			}
+		}
+		items := make([]corev1alpha1.OptionItem, 0, len(pools))
+		for p := range pools {
+			items = append(items, corev1alpha1.OptionItem{Value: p})
+		}
+		sortItems(items)
+		return items, nil
+	}
+}
+
+func collectPoolKeys(v any, out map[string]struct{}) {
+	m, ok := v.(map[string]any)
+	if !ok {
+		return
+	}
+	for k := range m {
+		out[k] = struct{}{}
+	}
+}
+
+// itemsFromNames builds a sorted option list from object names.
+func itemsFromNames(list *unstructured.UnstructuredList) []corev1alpha1.OptionItem {
+	items := make([]corev1alpha1.OptionItem, 0, len(list.Items))
+	for i := range list.Items {
+		items = append(items, corev1alpha1.OptionItem{Value: list.Items[i].GetName()})
+	}
+	sortItems(items)
+	return items
+}
+
+func sortItems(items []corev1alpha1.OptionItem) {
+	sort.Slice(items, func(i, j int) bool { return items[i].Value < items[j].Value })
+}
+
+func logProviderError(source string, err error) {
+	klog.V(2).InfoS("option provider failed", "source", source, "err", err)
+}
diff --git a/pkg/registry/core/option/providers_test.go b/pkg/registry/core/option/providers_test.go
new file mode 100644
index 0000000000..43f91a26b1
--- /dev/null
+++ b/pkg/registry/core/option/providers_test.go
@@ -0,0 +1,433 @@
+// SPDX-License-Identifier: Apache-2.0
+
+package option
+
+import (
+	"context"
+	"errors"
+	"testing"
+
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	dynamicfake "k8s.io/client-go/dynamic/fake"
+	clienttesting "k8s.io/client-go/testing"
+
+	corev1alpha1 "github.com/cozystack/cozystack/pkg/apis/core/v1alpha1"
+)
+
+// listKinds maps the GVRs the providers query to the synthetic List kinds the
+// fake dynamic client needs in order to serve List() calls for unstructured
+// resources.
+func listKinds() map[schema.GroupVersionResource]string {
+	return map[schema.GroupVersionResource]string{
+		gvrBackupClass:  "BackupClassList",
+		gvrPlans:        "PlanList",
+		gvrBackups:      "BackupList",
+		gvrAppDefs:      "ApplicationDefinitionList",
+		gvrNodes:        "NodeList",
+		gvrPVCs:         "PersistentVolumeClaimList",
+		gvrKubevirts:    "KubeVirtList",
+		gvrInstancetype: "VirtualMachineClusterInstancetypeList",
+		gvrPreference:   "VirtualMachineClusterPreferenceList",
+		gvrNADs:         "NetworkAttachmentDefinitionList",
+		gvrHelmReleases: "HelmReleaseList",
+		gvrStorageClass: "StorageClassList",
+		gvrVMDisks:      "VMDiskList",
+		gvrImportSource: "VMImportSourceList",
+		gvrConfigMaps:   "ConfigMapList",
+		gvrDataVolumes:  "DataVolumeList",
+	}
+}
+
+func newObj(gvk schema.GroupVersionKind, namespace, name string, spec map[string]any) *unstructured.Unstructured {
+	o := &unstructured.Unstructured{}
+	o.SetGroupVersionKind(gvk)
+	o.SetName(name)
+	if namespace != "" {
+		o.SetNamespace(namespace)
+	}
+	if spec != nil {
+		_ = unstructured.SetNestedMap(o.Object, spec, "spec")
+	}
+	return o
+}
+
+func values(items []corev1alpha1.OptionItem) []string {
+	out := make([]string, 0, len(items))
+	for _, it := range items {
+		out = append(out, it.Value)
+	}
+	return out
+}
+
+func TestBackupClassProviderIsClusterScoped(t *testing.T) {
+	gvk := gvrBackupClass.GroupVersion().WithKind("BackupClass")
+	dyn := dynamicfake.NewSimpleDynamicClientWithCustomListKinds(runtime.NewScheme(), listKinds(),
+		newObj(gvk, "", "s3-default", nil),
+		newObj(gvk, "", "minio", nil),
+	)
+
+	providers := DefaultProviders(dyn)
+	items, err := providers["backupclass"](context.Background(), "tenant-foo")
+	if err != nil {
+		t.Fatalf("backupclass provider: %v", err)
+	}
+	got := values(items)
+	want := []string{"minio", "s3-default"} // sorted
+	if len(got) != len(want) || got[0] != want[0] || got[1] != want[1] {
+		t.Fatalf("backupclass: got %v want %v", got, want)
+	}
+}
+
+func TestPlanProviderIsNamespaced(t *testing.T) {
+	gvk := gvrPlans.GroupVersion().WithKind("Plan")
+	dyn := dynamicfake.NewSimpleDynamicClientWithCustomListKinds(runtime.NewScheme(), listKinds(),
+		newObj(gvk, "tenant-a", "daily", nil),
+		newObj(gvk, "tenant-a", "weekly", nil),
+		newObj(gvk, "tenant-b", "other", nil),
+	)
+	providers := DefaultProviders(dyn)
+
+	items, err := providers["plan"](context.Background(), "tenant-a")
+	if err != nil {
+		t.Fatalf("plan provider: %v", err)
+	}
+	got := values(items)
+	if len(got) != 2 || got[0] != "daily" || got[1] != "weekly" {
+		t.Fatalf("plan (tenant-a): got %v", got)
+	}
+
+	// Empty namespace yields no options (namespaced provider opts out).
+	empty, err := providers["plan"](context.Background(), "")
+	if err != nil {
+		t.Fatalf("plan provider empty ns: %v", err)
+	}
+	if len(empty) != 0 {
+		t.Fatalf("plan (no ns): expected no items, got %v", values(empty))
+	}
+}
+
+func TestBackupProviderIsNamespaced(t *testing.T) {
+	gvk := gvrBackups.GroupVersion().WithKind("Backup")
+	dyn := dynamicfake.NewSimpleDynamicClientWithCustomListKinds(runtime.NewScheme(), listKinds(),
+		newObj(gvk, "tenant-a", "backup-2", nil),
+		newObj(gvk, "tenant-a", "backup-1", nil),
+	)
+	providers := DefaultProviders(dyn)
+	items, err := providers["backup"](context.Background(), "tenant-a")
+	if err != nil {
+		t.Fatalf("backup provider: %v", err)
+	}
+	got := values(items)
+	if len(got) != 2 || got[0] != "backup-1" || got[1] != "backup-2" {
+		t.Fatalf("backup: got %v", got)
+	}
+}
+
+func TestAppKindProviderDedupesAndSorts(t *testing.T) {
+	gvk := gvrAppDefs.GroupVersion().WithKind("ApplicationDefinition")
+	dyn := dynamicfake.NewSimpleDynamicClientWithCustomListKinds(runtime.NewScheme(), listKinds(),
+		newObj(gvk, "", "postgres", map[string]any{"application": map[string]any{"kind": "Postgres"}}),
+		newObj(gvk, "", "redis", map[string]any{"application": map[string]any{"kind": "Redis"}}),
+		newObj(gvk, "", "postgres-dup", map[string]any{"application": map[string]any{"kind": "Postgres"}}),
+		newObj(gvk, "", "broken", map[string]any{"application": map[string]any{}}),
+	)
+	providers := DefaultProviders(dyn)
+	items, err := providers["appkind"](context.Background(), "")
+	if err != nil {
+		t.Fatalf("appkind provider: %v", err)
+	}
+	got := values(items)
+	if len(got) != 2 || got[0] != "Postgres" || got[1] != "Redis" {
+		t.Fatalf("appkind: got %v", got)
+	}
+}
+
+func TestAppKindProviderUsesApplicationDefinitionCRDGroup(t *testing.T) {
+	// ApplicationDefinition is served from the cozystack.io group (Cluster-scoped) —
+	// see packages/system/application-definition-crd. Querying any other group makes
+	// the appkind dropdown silently empty in every cluster. The fake dynamic client
+	// in the other appkind test cannot catch a wrong group: it is built from
+	// gvrAppDefs itself, so it stays self-consistent with whatever group is set.
+	if gvrAppDefs.Group != "cozystack.io" || gvrAppDefs.Resource != "applicationdefinitions" {
+		t.Fatalf("appkind must list cozystack.io/applicationdefinitions, got %s/%s",
+			gvrAppDefs.Group, gvrAppDefs.Resource)
+	}
+}
+
+func TestInstanceProviderGVRsMatchKubevirtInstancetypeAPI(t *testing.T) {
+	// instancetype/instanceprofile replaced the static vm-instance enum with
+	// live dropdowns; a wrong group/version here makes the dropdown silently
+	// empty in every cluster (List tolerates the error), the same failure mode
+	// the appkind guard above catches. Pin both GVRs to the served API.
+	if gvrInstancetype.Group != "instancetype.kubevirt.io" || gvrInstancetype.Version != "v1beta1" ||
+		gvrInstancetype.Resource != "virtualmachineclusterinstancetypes" {
+		t.Errorf("instancetype provider GVR = %v, want instancetype.kubevirt.io/v1beta1 virtualmachineclusterinstancetypes", gvrInstancetype)
+	}
+	if gvrPreference.Group != "instancetype.kubevirt.io" || gvrPreference.Version != "v1beta1" ||
+		gvrPreference.Resource != "virtualmachineclusterpreferences" {
+		t.Errorf("instanceprofile provider GVR = %v, want instancetype.kubevirt.io/v1beta1 virtualmachineclusterpreferences", gvrPreference)
+	}
+}
+
+func TestRESTListExposesNewSources(t *testing.T) {
+	dyn := dynamicfake.NewSimpleDynamicClientWithCustomListKinds(runtime.NewScheme(), listKinds())
+	r := NewREST(DefaultProviders(dyn))
+
+	obj, err := r.List(context.Background(), nil)
+	if err != nil {
+		t.Fatalf("List: %v", err)
+	}
+	list, ok := obj.(*corev1alpha1.OptionList)
+	if !ok {
+		t.Fatalf("List returned %T", obj)
+	}
+	have := map[string]bool{}
+	for i := range list.Items {
+		have[list.Items[i].Name] = true
+	}
+	for _, src := range []string{"backupclass", "plan", "backup", "appkind"} {
+		if !have[src] {
+			t.Errorf("List missing source %q", src)
+		}
+	}
+}
+
+func TestRESTGetUnknownSourceNotFound(t *testing.T) {
+	dyn := dynamicfake.NewSimpleDynamicClientWithCustomListKinds(runtime.NewScheme(), listKinds())
+	r := NewREST(DefaultProviders(dyn))
+	if _, err := r.Get(context.Background(), "does-not-exist", &metav1.GetOptions{}); err == nil {
+		t.Fatal("expected NotFound for unknown source")
+	}
+}
+
+// A failing provider must not take down the whole list: List logs and skips it
+// (so a partial RBAC config silently drops one dropdown rather than breaking the
+// rest), while Get on that source surfaces the error as a 500.
+func okProvider(items ...string) providerFunc {
+	return func(context.Context, string) ([]corev1alpha1.OptionItem, error) {
+		out := make([]corev1alpha1.OptionItem, 0, len(items))
+		for _, v := range items {
+			out = append(out, corev1alpha1.OptionItem{Value: v})
+		}
+		return out, nil
+	}
+}
+
+func failingProvider() providerFunc {
+	return func(context.Context, string) ([]corev1alpha1.OptionItem, error) {
+		return nil, errors.New("forbidden: provider has no RBAC")
+	}
+}
+
+func TestRESTListToleratesFailingProvider(t *testing.T) {
+	r := NewREST(map[string]providerFunc{
+		"good": okProvider("a"),
+		"bad":  failingProvider(),
+	})
+	obj, err := r.List(context.Background(), nil)
+	if err != nil {
+		t.Fatalf("List must not fail when a single provider errors: %v", err)
+	}
+	have := map[string]bool{}
+	for _, it := range obj.(*corev1alpha1.OptionList).Items {
+		have[it.Name] = true
+	}
+	if !have["good"] {
+		t.Error("List dropped the healthy source")
+	}
+	if have["bad"] {
+		t.Error("List included the failing source; it must be skipped")
+	}
+}
+
+func TestRESTGetSurfacesProviderError(t *testing.T) {
+	r := NewREST(map[string]providerFunc{"bad": failingProvider()})
+	_, err := r.Get(context.Background(), "bad", &metav1.GetOptions{})
+	if err == nil {
+		t.Fatal("Get must surface the provider error, not swallow it")
+	}
+	if !apierrors.IsInternalError(err) {
+		t.Errorf("Get should return an InternalError (500), got %v", err)
+	}
+}
+
+// The parsing-heavy providers below feed dropdowns that List drops silently on
+// any provider error, so a logic regression ships as an empty/wrong dropdown
+// rather than a failure. These exercise that logic against the fake client.
+
+func itemByValue(items []corev1alpha1.OptionItem, value string) (corev1alpha1.OptionItem, bool) {
+	for _, it := range items {
+		if it.Value == value {
+			return it, true
+		}
+	}
+	return corev1alpha1.OptionItem{}, false
+}
+
+func TestGPUProviderIntersectsWhitelistWithNodeAllocatable(t *testing.T) {
+	kv := newObj(gvrKubevirts.GroupVersion().WithKind("KubeVirt"), kubevirtNamespace, "kubevirt", map[string]any{
+		"configuration": map[string]any{
+			"permittedHostDevices": map[string]any{
+				"pciHostDevices": []any{
+					map[string]any{"resourceName": "nvidia.com/GP100"},
+					map[string]any{"resourceName": "nvidia.com/A100"},
+				},
+			},
+		},
+	})
+	node := &unstructured.Unstructured{}
+	node.SetGroupVersionKind(gvrNodes.GroupVersion().WithKind("Node"))
+	node.SetName("node-a")
+	_ = unstructured.SetNestedStringMap(node.Object, map[string]string{"nvidia.com/GP100": "2"}, "status", "allocatable")
+
+	dyn := dynamicfake.NewSimpleDynamicClientWithCustomListKinds(runtime.NewScheme(), listKinds(), kv, node)
+	items, err := DefaultProviders(dyn)["gpu"](context.Background(), "")
+	if err != nil {
+		t.Fatalf("gpu provider: %v", err)
+	}
+	if got := values(items); len(got) != 2 || got[0] != "nvidia.com/A100" || got[1] != "nvidia.com/GP100" {
+		t.Fatalf("gpu: got %v, want sorted [A100 GP100]", got)
+	}
+	if it, _ := itemByValue(items, "nvidia.com/GP100"); it.Description != "2 available on node-a" {
+		t.Errorf("GP100 description = %q, want availability count", it.Description)
+	}
+	if it, _ := itemByValue(items, "nvidia.com/A100"); it.Description != "not currently available on any node" {
+		t.Errorf("A100 description = %q, want not-available", it.Description)
+	}
+}
+
+func TestImageProviderStripsPrefixAndFilters(t *testing.T) {
+	pvcGVK := gvrPVCs.GroupVersion().WithKind("PersistentVolumeClaim")
+	dyn := dynamicfake.NewSimpleDynamicClientWithCustomListKinds(runtime.NewScheme(), listKinds(),
+		newObj(pvcGVK, publicImagesNamespace, "vm-default-images-ubuntu", nil),
+		newObj(pvcGVK, publicImagesNamespace, "vm-default-images-fedora", nil),
+		newObj(pvcGVK, publicImagesNamespace, "some-other-pvc", nil),
+	)
+	items, err := DefaultProviders(dyn)["image"](context.Background(), "")
+	if err != nil {
+		t.Fatalf("image provider: %v", err)
+	}
+	if got := values(items); len(got) != 2 || got[0] != "fedora" || got[1] != "ubuntu" {
+		t.Fatalf("image: got %v, want [fedora ubuntu] (prefix stripped, non-prefixed dropped)", got)
+	}
+}
+
+func TestImageProviderSkipsGoldensWhoseImportFailed(t *testing.T) {
+	pvcGVK := gvrPVCs.GroupVersion().WithKind("PersistentVolumeClaim")
+	dvGVK := gvrDataVolumes.GroupVersion().WithKind("DataVolume")
+	dv := func(name, phase string) *unstructured.Unstructured {
+		o := newObj(dvGVK, publicImagesNamespace, name, nil)
+		_ = unstructured.SetNestedField(o.Object, phase, "status", "phase")
+		return o
+	}
+	dyn := dynamicfake.NewSimpleDynamicClientWithCustomListKinds(runtime.NewScheme(), listKinds(),
+		newObj(pvcGVK, publicImagesNamespace, "vm-default-images-ubuntu", nil),
+		newObj(pvcGVK, publicImagesNamespace, "vm-default-images-fedora", nil),
+		newObj(pvcGVK, publicImagesNamespace, "vm-default-images-alpine", nil),
+		newObj(pvcGVK, publicImagesNamespace, "vm-default-images-debian", nil),
+		dv("vm-default-images-ubuntu", "Failed"),
+		dv("vm-default-images-fedora", "Succeeded"),
+		dv("vm-default-images-alpine", "ImportInProgress"),
+		dv("vm-default-images-centos", "Failed"),
+	)
+	items, err := DefaultProviders(dyn)["image"](context.Background(), "")
+	if err != nil {
+		t.Fatalf("image provider: %v", err)
+	}
+	// debian has a PVC and no DataVolume, which is not a failed import.
+	if got := values(items); len(got) != 3 || got[0] != "alpine" || got[1] != "debian" || got[2] != "fedora" {
+		t.Fatalf("image: got %v, want [alpine debian fedora] (Failed golden dropped)", got)
+	}
+}
+
+func TestImageProviderListsGoldensWhenDataVolumesCannotBeRead(t *testing.T) {
+	for name, listErr := range map[string]error{
+		"no CDI":    apierrors.NewNotFound(gvrDataVolumes.GroupResource(), ""),
+		"forbidden": apierrors.NewForbidden(gvrDataVolumes.GroupResource(), "", errors.New("denied")),
+	} {
+		t.Run(name, func(t *testing.T) {
+			pvcGVK := gvrPVCs.GroupVersion().WithKind("PersistentVolumeClaim")
+			dyn := dynamicfake.NewSimpleDynamicClientWithCustomListKinds(runtime.NewScheme(), listKinds(),
+				newObj(pvcGVK, publicImagesNamespace, "vm-default-images-ubuntu", nil),
+			)
+			dyn.PrependReactor("list", "datavolumes", func(clienttesting.Action) (bool, runtime.Object, error) {
+				return true, nil, listErr
+			})
+			items, err := DefaultProviders(dyn)["image"](context.Background(), "")
+			if err != nil {
+				t.Fatalf("image provider: %v", err)
+			}
+			if got := values(items); len(got) != 1 || got[0] != "ubuntu" {
+				t.Fatalf("image: got %v, want [ubuntu]", got)
+			}
+		})
+	}
+}
+
+func TestStorageClassProviderMarksDefault(t *testing.T) {
+	scGVK := gvrStorageClass.GroupVersion().WithKind("StorageClass")
+	def := newObj(scGVK, "", "fast", nil)
+	def.SetAnnotations(map[string]string{defaultStorageClassAnnotation: "true"})
+	dyn := dynamicfake.NewSimpleDynamicClientWithCustomListKinds(runtime.NewScheme(), listKinds(),
+		def, newObj(scGVK, "", "slow", nil),
+	)
+	items, err := DefaultProviders(dyn)["storageclass"](context.Background(), "")
+	if err != nil {
+		t.Fatalf("storageclass provider: %v", err)
+	}
+	fast, ok := itemByValue(items, "fast")
+	if !ok || !fast.Default || fast.Label != "fast (default)" {
+		t.Errorf("fast = %+v, want Default=true Label=\"fast (default)\"", fast)
+	}
+	slow, ok := itemByValue(items, "slow")
+	if !ok || slow.Default || slow.Label != "" {
+		t.Errorf("slow = %+v, want no default mark", slow)
+	}
+}
+
+func TestStoragePoolProviderWalksPoolsAndZones(t *testing.T) {
+	hr := newObj(gvrHelmReleases.GroupVersion().WithKind("HelmRelease"), "tenant-x", "seaweedfs", map[string]any{
+		"values": map[string]any{
+			"volume": map[string]any{
+				"pools": map[string]any{"default": map[string]any{}, "ssd": map[string]any{}},
+				"zones": map[string]any{
+					"zoneA": map[string]any{"pools": map[string]any{"archive": map[string]any{}}},
+				},
+			},
+		},
+	})
+	dyn := dynamicfake.NewSimpleDynamicClientWithCustomListKinds(runtime.NewScheme(), listKinds(), hr)
+	items, err := DefaultProviders(dyn)["storagepool"](context.Background(), "tenant-x")
+	if err != nil {
+		t.Fatalf("storagepool provider: %v", err)
+	}
+	if got := values(items); len(got) != 3 || got[0] != "archive" || got[1] != "default" || got[2] != "ssd" {
+		t.Fatalf("storagepool: got %v, want [archive default ssd] (pools + zone pools)", got)
+	}
+	// Namespaced provider opts out without a namespace.
+	if empty, _ := DefaultProviders(dyn)["storagepool"](context.Background(), ""); len(empty) != 0 {
+		t.Fatalf("storagepool: expected no items without a namespace")
+	}
+}
+
+func TestVMDiskProviderShowsSizeInLabel(t *testing.T) {
+	vdGVK := gvrVMDisks.GroupVersion().WithKind("VMDisk")
+	dyn := dynamicfake.NewSimpleDynamicClientWithCustomListKinds(runtime.NewScheme(), listKinds(),
+		newObj(vdGVK, "tenant-x", "data", map[string]any{"storage": "10Gi"}),
+		newObj(vdGVK, "tenant-x", "blank", nil),
+	)
+	items, err := DefaultProviders(dyn)["vmdisk"](context.Background(), "tenant-x")
+	if err != nil {
+		t.Fatalf("vmdisk provider: %v", err)
+	}
+	if data, _ := itemByValue(items, "data"); data.Label != "data (10Gi)" {
+		t.Errorf("data label = %q, want \"data (10Gi)\"", data.Label)
+	}
+	if blank, ok := itemByValue(items, "blank"); !ok || blank.Label != "" {
+		t.Errorf("blank = %+v, want bare value with no size label", blank)
+	}
+}
diff --git a/pkg/registry/core/option/rest.go b/pkg/registry/core/option/rest.go
new file mode 100644
index 0000000000..37cee8b341
--- /dev/null
+++ b/pkg/registry/core/option/rest.go
@@ -0,0 +1,254 @@
+// SPDX-License-Identifier: Apache-2.0
+// Option registry: a read-only, virtual resource that serves named lists of
+// dropdown options for the dashboard. Each object (one per source name) is
+// computed on read by a provider using the apiserver's privileged client, so
+// tenants need no direct access to the underlying cluster resources.
+
+package option
+
+import (
+	"context"
+	"fmt"
+	"net/http"
+	"sort"
+	"strings"
+
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	metainternal "k8s.io/apimachinery/pkg/apis/meta/internalversion"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apimachinery/pkg/watch"
+	"k8s.io/apiserver/pkg/endpoints/request"
+	"k8s.io/apiserver/pkg/registry/rest"
+
+	corev1alpha1 "github.com/cozystack/cozystack/pkg/apis/core/v1alpha1"
+)
+
+const singularName = "option"
+
+var (
+	_ rest.Lister               = &REST{}
+	_ rest.Getter               = &REST{}
+	_ rest.Watcher              = &REST{}
+	_ rest.TableConvertor       = &REST{}
+	_ rest.Scoper               = &REST{}
+	_ rest.SingularNameProvider = &REST{}
+)
+
+// paramSeparator divides a parameterised source name from its argument, as in
+// `vmimportvm.my-source`. A dot is legal in a resource name, so the whole thing
+// still addresses as an ordinary object.
+const paramSeparator = "."
+
+// REST implements the read-only Option resource.
+type REST struct {
+	providers map[string]providerFunc
+	// paramProviders answer sources whose contents depend on a value the caller
+	// already chose — the VMs of one import source, say. They are addressed as
+	// `<source><paramSeparator><argument>` and are deliberately absent from
+	// List: without an argument they name nothing.
+	paramProviders map[string]paramProviderFunc
+	gvr            schema.GroupVersionResource
+}
+
+// NewREST builds the Option REST storage from a provider registry.
+func NewREST(providers map[string]providerFunc) *REST {
+	return NewRESTWithParams(providers, nil)
+}
+
+// NewRESTWithParams builds the storage from both registries.
+func NewRESTWithParams(providers map[string]providerFunc, params map[string]paramProviderFunc) *REST {
+	return &REST{
+		providers:      providers,
+		paramProviders: params,
+		gvr: schema.GroupVersionResource{
+			Group:    corev1alpha1.GroupName,
+			Version:  "v1alpha1",
+			Resource: "options",
+		},
+	}
+}
+
+// -----------------------------------------------------------------------------
+// Basic meta
+// -----------------------------------------------------------------------------
+
+func (*REST) NamespaceScoped() bool   { return true }
+func (*REST) New() runtime.Object     { return &corev1alpha1.Option{} }
+func (*REST) NewList() runtime.Object { return &corev1alpha1.OptionList{} }
+func (*REST) Kind() string            { return "Option" }
+func (r *REST) GroupVersionKind(_ schema.GroupVersion) schema.GroupVersionKind {
+	return r.gvr.GroupVersion().WithKind("Option")
+}
+func (*REST) GetSingularName() string { return singularName }
+func (*REST) Destroy()                {}
+
+// -----------------------------------------------------------------------------
+// Lister / Getter
+// -----------------------------------------------------------------------------
+
+func (r *REST) List(ctx context.Context, _ *metainternal.ListOptions) (runtime.Object, error) {
+	ns, _ := request.NamespaceFrom(ctx)
+
+	out := &corev1alpha1.OptionList{
+		TypeMeta: metav1.TypeMeta{
+			APIVersion: corev1alpha1.SchemeGroupVersion.String(),
+			Kind:       "OptionList",
+		},
+		ListMeta: metav1.ListMeta{ResourceVersion: "0"},
+	}
+
+	names := make([]string, 0, len(r.providers))
+	for name := range r.providers {
+		names = append(names, name)
+	}
+	sort.Strings(names)
+
+	for _, name := range names {
+		items, err := r.providers[name](ctx, ns)
+		if err != nil {
+			// Tolerate a single failing source (e.g. an optional CRD that is
+			// not installed) so the rest of the dropdowns keep working.
+			logProviderError(name, err)
+			continue
+		}
+		out.Items = append(out.Items, r.makeOption(name, ns, items))
+	}
+	return out, nil
+}
+
+func (r *REST) Get(ctx context.Context, name string, _ *metav1.GetOptions) (runtime.Object, error) {
+	ns, _ := request.NamespaceFrom(ctx)
+
+	provider, ok := r.providers[name]
+	if !ok {
+		// A parameterised source: everything up to the first separator names
+		// the provider, the rest is its argument.
+		base, arg, found := strings.Cut(name, paramSeparator)
+		param, known := r.paramProviders[base]
+		if !found || arg == "" || !known {
+			return nil, apierrors.NewNotFound(r.gvr.GroupResource(), name)
+		}
+		items, err := param(ctx, ns, arg)
+		if err != nil {
+			return nil, apierrors.NewInternalError(fmt.Errorf("compute options for %q: %w", name, err))
+		}
+		opt := r.makeOption(name, ns, items)
+		return &opt, nil
+	}
+
+	items, err := provider(ctx, ns)
+	if err != nil {
+		return nil, apierrors.NewInternalError(fmt.Errorf("compute options for %q: %w", name, err))
+	}
+	opt := r.makeOption(name, ns, items)
+	return &opt, nil
+}
+
+func (r *REST) makeOption(name, namespace string, items []corev1alpha1.OptionItem) corev1alpha1.Option {
+	return corev1alpha1.Option{
+		TypeMeta: metav1.TypeMeta{
+			APIVersion: corev1alpha1.SchemeGroupVersion.String(),
+			Kind:       "Option",
+		},
+		ObjectMeta: metav1.ObjectMeta{
+			Name:            name,
+			Namespace:       namespace,
+			ResourceVersion: "0",
+		},
+		Spec: corev1alpha1.OptionSpec{Items: items},
+	}
+}
+
+// -----------------------------------------------------------------------------
+// Watcher (one-shot): emit the current state once, then block until the client
+// or server cancels. There is no upstream object to relay; closing the channel
+// early would make the apiserver treat the watch as ended and trigger a
+// reconnect storm.
+// -----------------------------------------------------------------------------
+
+func (r *REST) Watch(ctx context.Context, opts *metainternal.ListOptions) (watch.Interface, error) {
+	events := make(chan watch.Event)
+	pw := watch.NewProxyWatcher(events)
+
+	go func() {
+		defer pw.Stop()
+		listObj, err := r.List(ctx, opts)
+		if err == nil {
+			list := listObj.(*corev1alpha1.OptionList)
+			for i := range list.Items {
+				select {
+				case events <- watch.Event{Type: watch.Added, Object: &list.Items[i]}:
+				case <-ctx.Done():
+					return
+				}
+			}
+		} else {
+			// One-shot watch: log so an operator can tell "no options" apart
+			// from "every provider failed" (e.g. broken RBAC) instead of seeing
+			// a silently empty stream.
+			logProviderError("watch", err)
+		}
+		<-ctx.Done()
+	}()
+
+	return pw, nil
+}
+
+// -----------------------------------------------------------------------------
+// TableConvertor
+// -----------------------------------------------------------------------------
+
+func (r *REST) ConvertToTable(_ context.Context, obj runtime.Object, _ runtime.Object) (*metav1.Table, error) {
+	row := func(o *corev1alpha1.Option) metav1.TableRow {
+		return metav1.TableRow{
+			Cells:  []any{o.Name, len(o.Spec.Items)},
+			Object: runtime.RawExtension{Object: o},
+		}
+	}
+	tbl := &metav1.Table{
+		TypeMeta: metav1.TypeMeta{APIVersion: "meta.k8s.io/v1", Kind: "Table"},
+		ColumnDefinitions: []metav1.TableColumnDefinition{
+			{Name: "NAME", Type: "string"},
+			{Name: "ITEMS", Type: "integer"},
+		},
+	}
+	switch v := obj.(type) {
+	case *corev1alpha1.OptionList:
+		for i := range v.Items {
+			tbl.Rows = append(tbl.Rows, row(&v.Items[i]))
+		}
+		tbl.ResourceVersion = v.ResourceVersion
+	case *corev1alpha1.Option:
+		tbl.Rows = append(tbl.Rows, row(v))
+		tbl.ResourceVersion = v.ResourceVersion
+	default:
+		return nil, notAcceptable{r.gvr.GroupResource(), fmt.Sprintf("unexpected %T", obj)}
+	}
+	return tbl, nil
+}
+
+// -----------------------------------------------------------------------------
+// Helpers / boiler-plate
+// -----------------------------------------------------------------------------
+
+// listOpts returns the standard list options used by providers.
+func listOpts() metav1.ListOptions {
+	return metav1.ListOptions{}
+}
+
+type notAcceptable struct {
+	resource schema.GroupResource
+	message  string
+}
+
+func (e notAcceptable) Error() string { return e.message }
+func (e notAcceptable) Status() metav1.Status {
+	return metav1.Status{
+		Status:  metav1.StatusFailure,
+		Code:    http.StatusNotAcceptable,
+		Reason:  metav1.StatusReason("NotAcceptable"),
+		Message: e.message,
+	}
+}
diff --git a/pkg/registry/core/option/vmimport_test.go b/pkg/registry/core/option/vmimport_test.go
new file mode 100644
index 0000000000..536b910c76
--- /dev/null
+++ b/pkg/registry/core/option/vmimport_test.go
@@ -0,0 +1,169 @@
+// SPDX-License-Identifier: Apache-2.0
+
+package option
+
+import (
+	"context"
+	"testing"
+
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apiserver/pkg/endpoints/request"
+	dynamicfake "k8s.io/client-go/dynamic/fake"
+
+	migrationv1alpha1 "github.com/cozystack/cozystack/api/migration/v1alpha1"
+	corev1alpha1 "github.com/cozystack/cozystack/pkg/apis/core/v1alpha1"
+)
+
+func inventoryConfigMap(namespace, source, payload string) *unstructured.Unstructured {
+	o := &unstructured.Unstructured{}
+	o.SetGroupVersionKind(schema.GroupVersionKind{Version: "v1", Kind: "ConfigMap"})
+	o.SetNamespace(namespace)
+	o.SetName(migrationv1alpha1.InventoryConfigMapName(source))
+	_ = unstructured.SetNestedStringMap(o.Object,
+		map[string]string{migrationv1alpha1.InventoryVMsKey: payload}, "data")
+	return o
+}
+
+func fakeDynWithConfigMaps(objs ...runtime.Object) *dynamicfake.FakeDynamicClient {
+	return dynamicfake.NewSimpleDynamicClientWithCustomListKinds(runtime.NewScheme(), listKinds(), objs...)
+}
+
+// The picker has to show a name and write a managed-object reference; getting
+// that pairing backwards produces a form that looks right and imports nothing.
+func TestImportVMProviderShowsNamesAndWritesRefs(t *testing.T) {
+	dyn := fakeDynWithConfigMaps(inventoryConfigMap("tenant-a", "vcenter",
+		`[{"id":"vm-52","name":"web-01","path":"/dc/vm/web-01"},{"id":"vm-7","name":"db-01"}]`))
+
+	items, err := DefaultParamProviders(dyn)["vmimportvm"](context.Background(), "tenant-a", "vcenter")
+	if err != nil {
+		t.Fatalf("provider returned %v", err)
+	}
+	if len(items) != 2 {
+		t.Fatalf("got %d items, want 2", len(items))
+	}
+	// Sorted by the label a person reads, not by the reference. The label shows
+	// both, because the reference is all a saved task displays afterwards.
+	if items[0].Label != "db-01 (vm-7)" || items[0].Value != "vm-7" {
+		t.Errorf("first item = %+v, want db-01 (vm-7)/vm-7", items[0])
+	}
+	if items[1].Label != "web-01 (vm-52)" || items[1].Value != "vm-52" {
+		t.Errorf("second item = %+v, want web-01 (vm-52)/vm-52", items[1])
+	}
+	if items[1].Description != "/dc/vm/web-01" {
+		t.Errorf("path not carried: %q", items[1].Description)
+	}
+}
+
+// A machine the inventory gave no name for still has to be pickable: an empty
+// label makes the widget fall back to showing the reference itself, where
+// composing one would render a stray "(vm-9)" with nothing in front of it.
+func TestImportVMProviderLeavesANamelessMachineToTheWidget(t *testing.T) {
+	dyn := fakeDynWithConfigMaps(inventoryConfigMap("tenant-a", "vcenter",
+		`[{"id":"vm-9","name":""}]`))
+
+	items, err := DefaultParamProviders(dyn)["vmimportvm"](context.Background(), "tenant-a", "vcenter")
+	if err != nil {
+		t.Fatalf("provider returned %v", err)
+	}
+	if len(items) != 1 || items[0].Label != "" || items[0].Value != "vm-9" {
+		t.Errorf("items = %+v", items)
+	}
+}
+
+// A source that has not published yet is a normal state, not a failure: the
+// dropdown is empty and the form still renders.
+func TestImportVMProviderToleratesAnUnpublishedSource(t *testing.T) {
+	dyn := fakeDynWithConfigMaps()
+
+	items, err := DefaultParamProviders(dyn)["vmimportvm"](context.Background(), "tenant-a", "vcenter")
+	if err != nil {
+		t.Fatalf("provider returned %v", err)
+	}
+	if len(items) != 0 {
+		t.Errorf("got %d items, want none", len(items))
+	}
+}
+
+// Each source answers with its own machines. Serving one tenant's list for
+// another source is the failure this addressing scheme exists to prevent.
+func TestImportVMProviderIsScopedToItsArgument(t *testing.T) {
+	dyn := fakeDynWithConfigMaps(
+		inventoryConfigMap("tenant-a", "vcenter-one", `[{"id":"vm-1","name":"one"}]`),
+		inventoryConfigMap("tenant-a", "vcenter-two", `[{"id":"vm-2","name":"two"}]`),
+	)
+	provider := DefaultParamProviders(dyn)["vmimportvm"]
+
+	for _, tc := range []struct{ source, want string }{
+		{"vcenter-one", "vm-1"},
+		{"vcenter-two", "vm-2"},
+	} {
+		items, err := provider(context.Background(), "tenant-a", tc.source)
+		if err != nil {
+			t.Fatalf("%s: %v", tc.source, err)
+		}
+		if len(items) != 1 || items[0].Value != tc.want {
+			t.Errorf("%s: got %v, want [%s]", tc.source, values(items), tc.want)
+		}
+	}
+}
+
+// The whole point of the parameterised name: `<source>.<argument>` reaches the
+// provider with the argument intact.
+func TestGetRoutesAParameterisedName(t *testing.T) {
+	dyn := fakeDynWithConfigMaps(inventoryConfigMap("tenant-a", "vcenter",
+		`[{"id":"vm-52","name":"web-01"}]`))
+	r := NewRESTWithParams(DefaultProviders(dyn), DefaultParamProviders(dyn))
+	ctx := request.WithNamespace(context.Background(), "tenant-a")
+
+	obj, err := r.Get(ctx, "vmimportvm.vcenter", &metav1.GetOptions{})
+	if err != nil {
+		t.Fatalf("Get returned %v", err)
+	}
+	opt, ok := obj.(*corev1alpha1.Option)
+	if !ok {
+		t.Fatalf("Get returned %T", obj)
+	}
+	if len(opt.Spec.Items) != 1 || opt.Spec.Items[0].Value != "vm-52" {
+		t.Errorf("items = %v", values(opt.Spec.Items))
+	}
+}
+
+// Without an argument the name describes nothing, and answering it with an
+// empty list would look like a source with no machines.
+func TestGetRejectsAParameterisedNameWithoutAnArgument(t *testing.T) {
+	dyn := fakeDynWithConfigMaps()
+	r := NewRESTWithParams(DefaultProviders(dyn), DefaultParamProviders(dyn))
+	ctx := request.WithNamespace(context.Background(), "tenant-a")
+
+	for _, name := range []string{"vmimportvm", "vmimportvm.", "nosuch.arg"} {
+		if _, err := r.Get(ctx, name, &metav1.GetOptions{}); err == nil {
+			t.Errorf("Get(%q) succeeded, want NotFound", name)
+		}
+	}
+}
+
+// A parameterised source must stay out of List: the console iterates it to fill
+// every static dropdown, and an entry that needs an argument has no contents
+// there.
+func TestListOmitsParameterisedSources(t *testing.T) {
+	dyn := fakeDynWithConfigMaps()
+	r := NewRESTWithParams(DefaultProviders(dyn), DefaultParamProviders(dyn))
+	ctx := request.WithNamespace(context.Background(), "tenant-a")
+
+	obj, err := r.List(ctx, nil)
+	if err != nil {
+		t.Fatalf("List returned %v", err)
+	}
+	list, ok := obj.(*corev1alpha1.OptionList)
+	if !ok {
+		t.Fatalf("List returned %T", obj)
+	}
+	for _, o := range list.Items {
+		if o.Name == "vmimportvm" {
+			t.Fatalf("parameterised source appeared in List")
+		}
+	}
+}
diff --git a/pkg/registry/core/tap/compute.go b/pkg/registry/core/tap/compute.go
new file mode 100644
index 0000000000..b4e17f4e0e
--- /dev/null
+++ b/pkg/registry/core/tap/compute.go
@@ -0,0 +1,208 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright 2025 The Cozystack Authors.
+
+package tap
+
+import (
+	"fmt"
+	"regexp"
+	"sort"
+	"strings"
+
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+
+	cozyv1alpha1 "github.com/cozystack/cozystack/api/v1alpha1"
+	"github.com/cozystack/cozystack/internal/marketplace/naming"
+	"github.com/cozystack/cozystack/internal/marketplace/tapconst"
+	corev1alpha1 "github.com/cozystack/cozystack/pkg/apis/core/v1alpha1"
+)
+
+var sanitizeDNSRe = regexp.MustCompile(`[^a-z0-9-]+`)
+
+// connectTarget is the parsed form of a connect request's oci:// URL.
+type connectTarget struct {
+	URL  string // reference without a tag
+	Org  string
+	Repo string
+	Tag  string
+	// FluxSourceName is the RFC-1123 name of the tap's OCIRepository. The tapped
+	// repository keeps its own declared PackageSource name(s), which are not
+	// known until the artifact is materialized, so the source (this name) is the
+	// tap's stable identity, not a name derived from the artifact.
+	FluxSourceName string
+}
+
+// parseConnectURL parses an oci:// URL (and an optional tag override) into the
+// tap's Flux source name. It mirrors the CLI's fluxSourceName so the API and
+// CLI agree on the source object's identity.
+func parseConnectURL(url, tagOverride string) (connectTarget, error) {
+	if !strings.HasPrefix(url, "oci://") {
+		return connectTarget{}, fmt.Errorf("url %q must start with oci://", url)
+	}
+	body := strings.TrimPrefix(url, "oci://")
+	if strings.Contains(body, "@") {
+		return connectTarget{}, fmt.Errorf("digest references are not supported; use a tag")
+	}
+	tag := tagOverride
+	if colon := strings.LastIndex(body, ":"); colon >= 0 && !strings.Contains(body[colon:], "/") {
+		if tag == "" {
+			tag = body[colon+1:]
+		}
+		body = body[:colon]
+	}
+	segs := strings.Split(strings.Trim(body, "/"), "/")
+	if len(segs) < 2 {
+		return connectTarget{}, fmt.Errorf("url %q must include a host and a repository path", url)
+	}
+	t := connectTarget{URL: "oci://" + body, Repo: segs[len(segs)-1], Tag: tag}
+	if len(segs) >= 3 {
+		t.Org = segs[len(segs)-2]
+	}
+	if t.Tag == "" {
+		t.Tag = "latest"
+	}
+	fluxBase := t.Repo
+	if t.Org != "" {
+		fluxBase = t.Org + "-" + t.Repo
+	}
+	t.FluxSourceName = "tap-" + sanitizeDNSRe.ReplaceAllString(strings.ToLower(fluxBase), "-")
+	return t, nil
+}
+
+var (
+	gvrPackageSources = schema.GroupVersionResource{Group: "cozystack.io", Version: "v1alpha1", Resource: "packagesources"}
+	gvrPackages       = schema.GroupVersionResource{Group: "cozystack.io", Version: "v1alpha1", Resource: "packages"}
+	gvrAppDefs        = schema.GroupVersionResource{Group: "cozystack.io", Version: "v1alpha1", Resource: "applicationdefinitions"}
+	gvrOCIRepos       = schema.GroupVersionResource{Group: "source.toolkit.fluxcd.io", Version: "v1", Resource: "ocirepositories"}
+)
+
+// anyOtherReferences reports whether a PackageSource other than excludeName
+// still points at the given Flux source, so a tap's source is only deleted when
+// nothing else uses it.
+func anyOtherReferences(pss []cozyv1alpha1.PackageSource, srcName, excludeName string) bool {
+	for i := range pss {
+		if pss[i].Name == excludeName {
+			continue
+		}
+		if ref := pss[i].Spec.SourceRef; ref != nil && ref.Name == srcName {
+			return true
+		}
+	}
+	return false
+}
+
+// artifactName links a component to the ApplicationDefinition whose
+// release.chartRef.name references its assembled artifact. It delegates to the
+// shared naming helper so the API, the validator, and the materializer cannot
+// drift on this convention.
+func artifactName(psName, variant, component string) string {
+	return naming.ArtifactName(psName, variant, component)
+}
+
+// indexAppDefsByChartRef indexes ApplicationDefinitions by their ExternalArtifact
+// chartRef name, the value artifactName produces for the component they back.
+func indexAppDefsByChartRef(ads []cozyv1alpha1.ApplicationDefinition) map[string]cozyv1alpha1.ApplicationDefinition {
+	idx := make(map[string]cozyv1alpha1.ApplicationDefinition, len(ads))
+	for _, ad := range ads {
+		ref := ad.Spec.Release.ChartRef
+		if ref == nil || ref.Name == "" {
+			continue
+		}
+		idx[ref.Name] = ad
+	}
+	return idx
+}
+
+// buildTap computes a Tap from a PackageSource and the ApplicationDefinition
+// index. A package is emitted for each component whose assembled-artifact name
+// matches an ApplicationDefinition, deduplicated by application name across
+// variants (privileged is ORed over occurrences).
+func buildTap(ps cozyv1alpha1.PackageSource, idx map[string]cozyv1alpha1.ApplicationDefinition) corev1alpha1.Tap {
+	tap := corev1alpha1.Tap{
+		TypeMeta: metav1.TypeMeta{
+			APIVersion: corev1alpha1.SchemeGroupVersion.String(),
+			Kind:       "Tap",
+		},
+		ObjectMeta: metav1.ObjectMeta{
+			Name:            ps.Name,
+			ResourceVersion: "0",
+		},
+		Spec: corev1alpha1.TapSpec{
+			// Tap-ness is marked by the marketplace-tap label, not a name prefix:
+			// a tapped repository keeps its own declared name.
+			Community: ps.GetLabels()[tapconst.Label] == "true",
+		},
+	}
+	if ps.Spec.SourceRef != nil {
+		tap.Spec.Source = corev1alpha1.TapSource{
+			Kind: ps.Spec.SourceRef.Kind,
+			Name: ps.Spec.SourceRef.Name,
+		}
+	}
+	for _, cond := range ps.Status.Conditions {
+		if cond.Type == "Ready" {
+			tap.Spec.Ready = cond.Status == metav1.ConditionTrue
+			tap.Spec.Message = cond.Message
+		}
+	}
+
+	// Each ApplicationDefinition's chartRef names exactly one component's
+	// assembled artifact (the artifact name embeds the variant), so a package
+	// maps to a single (variant, component). The seen guard is only a defensive
+	// backstop against an index that somehow yields the same app twice.
+	seen := map[string]bool{}
+	for _, v := range ps.Spec.Variants {
+		for _, c := range v.Components {
+			ad, ok := idx[artifactName(ps.Name, v.Name, c.Name)]
+			if !ok || seen[ad.Name] {
+				continue
+			}
+			seen[ad.Name] = true
+			pkg := corev1alpha1.TapPackage{
+				Name:       ad.Name,
+				Kind:       ad.Spec.Application.Kind,
+				Component:  c.Name,
+				Privileged: c.Install != nil && c.Install.Privileged,
+			}
+			if d := ad.Spec.Dashboard; d != nil {
+				pkg.Description = d.Description
+				pkg.Category = d.Category
+				pkg.Tags = d.Tags
+				pkg.Icon = d.Icon
+			}
+			tap.Spec.Packages = append(tap.Spec.Packages, pkg)
+		}
+	}
+	sort.Slice(tap.Spec.Packages, func(i, j int) bool {
+		return tap.Spec.Packages[i].Name < tap.Spec.Packages[j].Name
+	})
+	return tap
+}
+
+// buildPendingTap represents a tap whose OCIRepository exists but whose
+// PackageSource has not been materialized yet: a connect in progress, or one
+// blocked by a materialization error (e.g. a name collision with a core
+// component). Its identity is the source object's own name, which is stable
+// from connect onward, and it surfaces the block reason so the dashboard shows
+// it rather than the tap silently never appearing.
+func buildPendingTap(sourceName, errMessage string) corev1alpha1.Tap {
+	tap := corev1alpha1.Tap{
+		TypeMeta: metav1.TypeMeta{
+			APIVersion: corev1alpha1.SchemeGroupVersion.String(),
+			Kind:       "Tap",
+		},
+		ObjectMeta: metav1.ObjectMeta{Name: sourceName, ResourceVersion: "0"},
+		Spec: corev1alpha1.TapSpec{
+			Community: true,
+			Source:    corev1alpha1.TapSource{Kind: "OCIRepository", Name: sourceName},
+			Ready:     false,
+		},
+	}
+	if errMessage != "" {
+		tap.Spec.Message = errMessage
+	} else {
+		tap.Spec.Message = "connecting: waiting for the artifact to be pulled and materialized"
+	}
+	return tap
+}
diff --git a/pkg/registry/core/tap/compute_test.go b/pkg/registry/core/tap/compute_test.go
new file mode 100644
index 0000000000..674acd0d6d
--- /dev/null
+++ b/pkg/registry/core/tap/compute_test.go
@@ -0,0 +1,143 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright 2025 The Cozystack Authors.
+
+package tap
+
+import (
+	"testing"
+
+	helmv2 "github.com/fluxcd/helm-controller/api/v2"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	cozyv1alpha1 "github.com/cozystack/cozystack/api/v1alpha1"
+	"github.com/cozystack/cozystack/internal/marketplace/tapconst"
+)
+
+func TestArtifactName(t *testing.T) {
+	if got := artifactName("cozystack.postgres-application", "default", "postgres"); got != "cozystack-postgres-application-default-postgres" {
+		t.Fatalf("artifactName = %q", got)
+	}
+}
+
+func appDef(name, kind, chartRef string, dash *cozyv1alpha1.ApplicationDefinitionDashboard) cozyv1alpha1.ApplicationDefinition {
+	return cozyv1alpha1.ApplicationDefinition{
+		ObjectMeta: metav1.ObjectMeta{Name: name},
+		Spec: cozyv1alpha1.ApplicationDefinitionSpec{
+			Application: cozyv1alpha1.ApplicationDefinitionApplication{Kind: kind},
+			Release:     cozyv1alpha1.ApplicationDefinitionRelease{ChartRef: &helmv2.CrossNamespaceSourceReference{Kind: "ExternalArtifact", Name: chartRef}},
+			Dashboard:   dash,
+		},
+	}
+}
+
+func TestIndexAppDefsByChartRef(t *testing.T) {
+	ads := []cozyv1alpha1.ApplicationDefinition{
+		appDef("foo", "Foo", "community-org-repo-default-foo", nil),
+		appDef("noref", "NoRef", "", nil),
+	}
+	idx := indexAppDefsByChartRef(ads)
+	if len(idx) != 1 {
+		t.Fatalf("expected 1 indexed entry (empty chartRef skipped), got %d", len(idx))
+	}
+	if _, ok := idx["community-org-repo-default-foo"]; !ok {
+		t.Fatalf("expected foo indexed by its chartRef name")
+	}
+}
+
+func TestBuildTap(t *testing.T) {
+	ps := cozyv1alpha1.PackageSource{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:   "acme.repo",
+			Labels: map[string]string{tapconst.Label: "true"},
+		},
+		Spec: cozyv1alpha1.PackageSourceSpec{
+			SourceRef: &cozyv1alpha1.PackageSourceRef{Kind: "OCIRepository", Name: "tap-acme-repo", Namespace: "cozy-system"},
+			Variants: []cozyv1alpha1.Variant{
+				{
+					Name: "default",
+					Components: []cozyv1alpha1.Component{
+						{Name: "foo", Path: "apps/foo", Install: &cozyv1alpha1.ComponentInstall{Privileged: true}},
+						{Name: "foo-rd", Path: "system/foo-rd"},
+					},
+				},
+				{
+					Name: "big",
+					// A second variant whose foo has no matching ApplicationDefinition
+					// (its artifact name embeds "big"); it must not add a package.
+					Components: []cozyv1alpha1.Component{
+						{Name: "foo", Path: "apps/foo"},
+					},
+				},
+			},
+		},
+		Status: cozyv1alpha1.PackageSourceStatus{
+			Conditions: []metav1.Condition{{Type: "Ready", Status: metav1.ConditionTrue, Message: "all good"}},
+		},
+	}
+	// Only the app component "foo" (default variant) has a matching ApplicationDefinition.
+	idx := indexAppDefsByChartRef([]cozyv1alpha1.ApplicationDefinition{
+		appDef("foo", "Foo", artifactName("acme.repo", "default", "foo"),
+			&cozyv1alpha1.ApplicationDefinitionDashboard{Description: "A foo", Category: "Storage", Tags: []string{"x"}, Icon: "data:svg"}),
+	})
+
+	tap := buildTap(ps, idx)
+
+	if !tap.Spec.Community {
+		t.Errorf("expected Community=true for a labeled tap source")
+	}
+	if !tap.Spec.Ready || tap.Spec.Message != "all good" {
+		t.Errorf("ready/message not read from status: %+v", tap.Spec)
+	}
+	if tap.Spec.Source.Kind != "OCIRepository" || tap.Spec.Source.Name != "tap-acme-repo" {
+		t.Errorf("source not set: %+v", tap.Spec.Source)
+	}
+	if len(tap.Spec.Packages) != 1 {
+		t.Fatalf("expected exactly 1 package (only default/foo has an ApplicationDefinition; -rd and big/foo excluded), got %d: %+v", len(tap.Spec.Packages), tap.Spec.Packages)
+	}
+	p := tap.Spec.Packages[0]
+	if p.Name != "foo" || p.Kind != "Foo" || p.Component != "foo" {
+		t.Errorf("package identity wrong: %+v", p)
+	}
+	if p.Description != "A foo" || p.Category != "Storage" || p.Icon != "data:svg" || len(p.Tags) != 1 {
+		t.Errorf("dashboard metadata not carried: %+v", p)
+	}
+	// default/foo declares install.privileged; the matched package must surface it.
+	if !p.Privileged {
+		t.Errorf("privileged must be taken from the matched component: %+v", p)
+	}
+}
+
+func TestBuildTapNoMatchingAppDef(t *testing.T) {
+	ps := cozyv1alpha1.PackageSource{
+		ObjectMeta: metav1.ObjectMeta{Name: "cozystack.core"},
+		Spec: cozyv1alpha1.PackageSourceSpec{
+			Variants: []cozyv1alpha1.Variant{{Name: "default", Components: []cozyv1alpha1.Component{{Name: "x", Path: "apps/x"}}}},
+		},
+	}
+	tap := buildTap(ps, map[string]cozyv1alpha1.ApplicationDefinition{})
+	if tap.Spec.Community {
+		t.Errorf("a source without the tap label must not be flagged community")
+	}
+	if len(tap.Spec.Packages) != 0 {
+		t.Errorf("expected no packages without matching ApplicationDefinitions, got %+v", tap.Spec.Packages)
+	}
+}
+
+func TestBuildPendingTap(t *testing.T) {
+	// No error: a connecting message, not ready, community, identified by source.
+	p := buildPendingTap("tap-acme-repo", "")
+	if p.Name != "tap-acme-repo" || !p.Spec.Community || p.Spec.Ready {
+		t.Errorf("unexpected pending tap: %+v", p)
+	}
+	if p.Spec.Source.Kind != "OCIRepository" || p.Spec.Source.Name != "tap-acme-repo" {
+		t.Errorf("pending tap source not set: %+v", p.Spec.Source)
+	}
+	if p.Spec.Message == "" {
+		t.Error("pending tap must carry a connecting message")
+	}
+	// A materialization error surfaces as the message.
+	e := buildPendingTap("tap-acme-repo", `a PackageSource named "acme.repo" already exists`)
+	if e.Spec.Ready || e.Spec.Message != `a PackageSource named "acme.repo" already exists` {
+		t.Errorf("expected the error surfaced as the message, got %+v", e.Spec)
+	}
+}
diff --git a/pkg/registry/core/tap/rest.go b/pkg/registry/core/tap/rest.go
new file mode 100644
index 0000000000..3bb6f74cef
--- /dev/null
+++ b/pkg/registry/core/tap/rest.go
@@ -0,0 +1,542 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright 2025 The Cozystack Authors.
+
+// Package tap serves the read-only, cluster-scoped Tap resource that powers the
+// dashboard marketplace view. Each Tap is computed on read from a PackageSource
+// and the ApplicationDefinitions attributable to it, using the apiserver's
+// privileged dynamic client, so a tenant browsing the catalog needs no direct
+// access to those resources and never sees a pull credential.
+package tap
+
+import (
+	"context"
+	"fmt"
+	"net/http"
+	"sort"
+
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	metainternal "k8s.io/apimachinery/pkg/apis/meta/internalversion"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apimachinery/pkg/watch"
+	"k8s.io/apiserver/pkg/registry/rest"
+	"k8s.io/client-go/dynamic"
+	"k8s.io/klog/v2"
+
+	cozyv1alpha1 "github.com/cozystack/cozystack/api/v1alpha1"
+	"github.com/cozystack/cozystack/internal/marketplace/collision"
+	"github.com/cozystack/cozystack/internal/marketplace/tapconst"
+	corev1alpha1 "github.com/cozystack/cozystack/pkg/apis/core/v1alpha1"
+)
+
+const singularName = "tap"
+
+var (
+	_ rest.Lister               = &REST{}
+	_ rest.Getter               = &REST{}
+	_ rest.Watcher              = &REST{}
+	_ rest.TableConvertor       = &REST{}
+	_ rest.Scoper               = &REST{}
+	_ rest.SingularNameProvider = &REST{}
+	_ rest.GracefulDeleter      = &REST{}
+	_ rest.Creater              = &REST{}
+)
+
+// REST implements the read-only Tap resource.
+type REST struct {
+	dyn dynamic.Interface
+	gvr schema.GroupVersionResource
+}
+
+// NewREST builds the Tap REST storage from the apiserver's privileged dynamic
+// client.
+func NewREST(dyn dynamic.Interface) *REST {
+	return &REST{
+		dyn: dyn,
+		gvr: schema.GroupVersionResource{
+			Group:    corev1alpha1.GroupName,
+			Version:  "v1alpha1",
+			Resource: "taps",
+		},
+	}
+}
+
+func (*REST) NamespaceScoped() bool { return false }
+func (*REST) New() runtime.Object   { return &corev1alpha1.Tap{} }
+func (*REST) NewList() runtime.Object {
+	return &corev1alpha1.TapList{}
+}
+func (*REST) Kind() string { return "Tap" }
+func (r *REST) GroupVersionKind(_ schema.GroupVersion) schema.GroupVersionKind {
+	return r.gvr.GroupVersion().WithKind("Tap")
+}
+func (*REST) GetSingularName() string { return singularName }
+func (*REST) Destroy()                {}
+
+// -----------------------------------------------------------------------------
+// Lister / Getter
+// -----------------------------------------------------------------------------
+
+func (r *REST) List(ctx context.Context, _ *metainternal.ListOptions) (runtime.Object, error) {
+	pss, err := r.fetchPackageSources(ctx)
+	if err != nil {
+		return nil, apierrors.NewInternalError(fmt.Errorf("list PackageSources: %w", err))
+	}
+	idx := r.appDefIndex(ctx)
+
+	out := &corev1alpha1.TapList{
+		TypeMeta: metav1.TypeMeta{
+			APIVersion: corev1alpha1.SchemeGroupVersion.String(),
+			Kind:       "TapList",
+		},
+		ListMeta: metav1.ListMeta{ResourceVersion: "0"},
+	}
+	materializedSources := map[string]bool{}
+	for _, ps := range pss {
+		out.Items = append(out.Items, buildTap(ps, idx))
+		if ref := ps.Spec.SourceRef; ref != nil && ref.Kind == "OCIRepository" && ref.Name != "" {
+			materializedSources[ref.Name] = true
+		}
+	}
+	// Surface tap sources with no materialized PackageSource yet (a connect in
+	// progress, or one blocked by a collision) so the pending or errored state
+	// shows in the dashboard instead of the tap silently never appearing.
+	if repos, err := r.listTapSources(ctx); err == nil {
+		for i := range repos {
+			name := repos[i].GetName()
+			if materializedSources[name] {
+				continue
+			}
+			out.Items = append(out.Items, buildPendingTap(name, repos[i].GetAnnotations()[tapconst.MaterializeErrorAnnotation]))
+		}
+	}
+	sort.Slice(out.Items, func(i, j int) bool { return out.Items[i].Name < out.Items[j].Name })
+	return out, nil
+}
+
+// listTapSources lists the labeled tap OCIRepositories in cozy-system.
+func (r *REST) listTapSources(ctx context.Context) ([]unstructured.Unstructured, error) {
+	ul, err := r.dyn.Resource(gvrOCIRepos).Namespace("cozy-system").List(ctx, metav1.ListOptions{
+		LabelSelector: tapconst.Label + "=true",
+	})
+	if err != nil {
+		return nil, err
+	}
+	return ul.Items, nil
+}
+
+func (r *REST) Get(ctx context.Context, name string, _ *metav1.GetOptions) (runtime.Object, error) {
+	u, err := r.dyn.Resource(gvrPackageSources).Get(ctx, name, metav1.GetOptions{})
+	if err != nil {
+		if apierrors.IsNotFound(err) {
+			// A tap connected but not yet materialized (a connect in progress, or
+			// one blocked by a collision) has an OCIRepository but no
+			// PackageSource. Surface it as a pending Tap so a detail view mirrors
+			// what List shows, instead of a 404 that hides the block reason.
+			if pending, ok := r.pendingTapByName(ctx, name); ok {
+				return pending, nil
+			}
+			return nil, apierrors.NewNotFound(r.gvr.GroupResource(), name)
+		}
+		return nil, apierrors.NewInternalError(fmt.Errorf("get PackageSource %q: %w", name, err))
+	}
+	var ps cozyv1alpha1.PackageSource
+	if err := runtime.DefaultUnstructuredConverter.FromUnstructured(u.Object, &ps); err != nil {
+		return nil, apierrors.NewInternalError(fmt.Errorf("decode PackageSource %q: %w", name, err))
+	}
+	idx := r.appDefIndex(ctx)
+	tap := buildTap(ps, idx)
+	return &tap, nil
+}
+
+// pendingTapByName finds a tap source (a labeled OCIRepository) whose own name
+// is name and which has not materialized a PackageSource yet, returning it as a
+// pending Tap. It mirrors the pending entries List emits and the orphan lookup
+// Delete uses, so Get, List, and Delete agree on what a pending tap is.
+func (r *REST) pendingTapByName(ctx context.Context, name string) (*corev1alpha1.Tap, bool) {
+	repos, err := r.listTapSources(ctx)
+	if err != nil {
+		return nil, false
+	}
+	for i := range repos {
+		if repos[i].GetName() != name {
+			continue
+		}
+		tap := buildPendingTap(name, repos[i].GetAnnotations()[tapconst.MaterializeErrorAnnotation])
+		return &tap, true
+	}
+	return nil, false
+}
+
+// -----------------------------------------------------------------------------
+// Creater — connect a community tap (mirrors `cozypkg tap`)
+//
+// Create records the intent only: it creates the labeled Flux OCIRepository
+// (with an optional pull-credential secretRef). The operator's tap materializer
+// then pulls the artifact and creates the PackageSource(s), so the API never
+// blocks a request on a registry pull. The returned Tap reflects that
+// materialization is pending.
+// -----------------------------------------------------------------------------
+
+// createDryRun and deleteDryRun carry the caller's dry-run directive down to
+// the backing write. The dynamic client takes the directive by value, so a
+// request that reaches it without one performs the write for real: a
+// --dry-run=server connect would create the Flux source and a dry-run
+// disconnect would delete the PackageSource.
+func createDryRun(opts *metav1.CreateOptions) []string {
+	if opts == nil {
+		return nil
+	}
+	return opts.DryRun
+}
+
+func deleteDryRun(opts *metav1.DeleteOptions) []string {
+	if opts == nil {
+		return nil
+	}
+	return opts.DryRun
+}
+
+func (r *REST) Create(ctx context.Context, obj runtime.Object, createValidation rest.ValidateObjectFunc, opts *metav1.CreateOptions) (runtime.Object, error) {
+	in, ok := obj.(*corev1alpha1.Tap)
+	if !ok {
+		return nil, apierrors.NewBadRequest(fmt.Sprintf("expected a Tap object, got %T", obj))
+	}
+	if in.Spec.URL == "" {
+		return nil, apierrors.NewBadRequest("spec.url is required to connect a tap")
+	}
+	target, err := parseConnectURL(in.Spec.URL, in.Spec.Tag)
+	if err != nil {
+		return nil, apierrors.NewBadRequest(err.Error())
+	}
+	if createValidation != nil {
+		if err := createValidation(ctx, obj); err != nil {
+			return nil, err
+		}
+	}
+
+	repo := &unstructured.Unstructured{Object: map[string]any{
+		"apiVersion": "source.toolkit.fluxcd.io/v1",
+		"kind":       "OCIRepository",
+		"metadata": map[string]any{
+			"name":        target.FluxSourceName,
+			"namespace":   "cozy-system",
+			"labels":      map[string]any{tapconst.Label: "true"},
+			"annotations": map[string]any{tapconst.NameAnnotation: target.FluxSourceName},
+		},
+		"spec": map[string]any{
+			"url":      target.URL,
+			"interval": "5m0s",
+			"ref":      map[string]any{"tag": target.Tag},
+		},
+	}}
+	if in.Spec.SecretRef != "" {
+		_ = unstructured.SetNestedMap(repo.Object, map[string]any{"name": in.Spec.SecretRef}, "spec", "secretRef")
+	}
+
+	// Create the Flux source, idempotently: a repeat connect updates the
+	// existing source (new tag/secret) rather than erroring.
+	src := r.dyn.Resource(gvrOCIRepos).Namespace("cozy-system")
+	if _, err := src.Create(ctx, repo, metav1.CreateOptions{FieldManager: "cozystack-api", DryRun: createDryRun(opts)}); err != nil {
+		if !apierrors.IsAlreadyExists(err) {
+			return nil, apierrors.NewInternalError(fmt.Errorf("create Flux source for tap %s: %w", target.FluxSourceName, err))
+		}
+		cur, gerr := src.Get(ctx, target.FluxSourceName, metav1.GetOptions{})
+		if gerr != nil {
+			return nil, apierrors.NewInternalError(fmt.Errorf("update Flux source for tap %s: %w", target.FluxSourceName, gerr))
+		}
+		// Refuse to silently retarget: two repositories that share an org/repo
+		// path on different registry hosts derive the same name, so a blind
+		// update would repoint the first at the second. Require a disconnect
+		// first when the existing source points at a different URL.
+		if curURL, _, _ := unstructured.NestedString(cur.Object, "spec", "url"); curURL != "" && curURL != target.URL {
+			return nil, apierrors.NewConflict(r.gvr.GroupResource(), target.FluxSourceName,
+				fmt.Errorf("a different repository (%s) is already connected as %q; disconnect it before connecting %s", curURL, target.FluxSourceName, target.URL))
+		}
+		// Update only the fields this API owns (spec, the tap label and name
+		// annotation) on the FETCHED object, so the operator's finalizer survives.
+		// Clear the materialized-revision annotation so a re-connect re-materializes
+		// and recovers a registration Package (or PackageSource) removed out-of-band
+		// since the last materialization, the same recovery `cozypkg tap` performs.
+		cur.Object["spec"] = repo.Object["spec"]
+		labels := cur.GetLabels()
+		if labels == nil {
+			labels = map[string]string{}
+		}
+		labels[tapconst.Label] = "true"
+		cur.SetLabels(labels)
+		ann := cur.GetAnnotations()
+		if ann == nil {
+			ann = map[string]string{}
+		}
+		ann[tapconst.NameAnnotation] = target.FluxSourceName
+		delete(ann, tapconst.MaterializedRevisionAnnotation)
+		cur.SetAnnotations(ann)
+		if _, err := src.Update(ctx, cur, metav1.UpdateOptions{FieldManager: "cozystack-api", DryRun: createDryRun(opts)}); err != nil {
+			return nil, apierrors.NewInternalError(fmt.Errorf("update Flux source for tap %s: %w", target.FluxSourceName, err))
+		}
+	}
+
+	// Return catalog metadata only: never the url or the secret reference.
+	return &corev1alpha1.Tap{
+		TypeMeta:   metav1.TypeMeta{APIVersion: corev1alpha1.SchemeGroupVersion.String(), Kind: "Tap"},
+		ObjectMeta: metav1.ObjectMeta{Name: target.FluxSourceName, ResourceVersion: "0"},
+		Spec: corev1alpha1.TapSpec{
+			Source:    corev1alpha1.TapSource{Kind: "OCIRepository", Name: target.FluxSourceName},
+			Community: true,
+			Ready:     false,
+			Message:   "connecting: waiting for the artifact to be pulled and materialized",
+		},
+	}, nil
+}
+
+// -----------------------------------------------------------------------------
+// GracefulDeleter — disconnect a community tap (mirrors `cozypkg untap`)
+// -----------------------------------------------------------------------------
+
+func (r *REST) Delete(ctx context.Context, name string, deleteValidation rest.ValidateObjectFunc, opts *metav1.DeleteOptions) (runtime.Object, bool, error) {
+	u, err := r.dyn.Resource(gvrPackageSources).Get(ctx, name, metav1.GetOptions{})
+	if err != nil {
+		if apierrors.IsNotFound(err) {
+			// A tap connected but not yet (or never) materialized has an
+			// OCIRepository but no PackageSource (name is then the source's own
+			// name). Fall back to removing that source so a pending or
+			// collision-blocked connect is still recoverable from the dashboard
+			// rather than orphaning a finalized OCIRepository.
+			return r.deleteOrphanTapSource(ctx, name, deleteDryRun(opts))
+		}
+		return nil, false, apierrors.NewInternalError(fmt.Errorf("get PackageSource %q: %w", name, err))
+	}
+	var ps cozyv1alpha1.PackageSource
+	if err := fromUnstructured(u, &ps); err != nil {
+		return nil, false, apierrors.NewInternalError(fmt.Errorf("decode PackageSource %q: %w", name, err))
+	}
+	// A tap is identified by its marker label, not a name prefix; official
+	// PackageSources (no label) are protected from disconnect.
+	if ps.GetLabels()[tapconst.Label] != "true" {
+		return nil, false, apierrors.NewForbidden(r.gvr.GroupResource(), name,
+			fmt.Errorf("%q is not a tapped repository; official sources are protected", name))
+	}
+
+	idx := r.appDefIndex(ctx)
+	tap := buildTap(ps, idx)
+	if deleteValidation != nil {
+		if err := deleteValidation(ctx, &tap); err != nil {
+			return nil, false, err
+		}
+	}
+
+	// Remove the tap-managed registration Package FIRST, so the repository's apps
+	// de-register from the catalog (deleting it garbage-collects the registration
+	// HelmReleases and their ApplicationDefinitions). It is deleted only when it
+	// belongs to THIS source (label AND source annotation): a Package a later tap
+	// created under a reused name, or a foreign Package, is left in place.
+	//
+	// Package before PackageSource is deliberate: if the Package delete fails, the
+	// PackageSource is still present, so a repeat disconnect re-enters this path
+	// and retries; deleting the PackageSource first would drop a repeat disconnect
+	// into deleteOrphanTapSource, which never revisits the Package, stranding it.
+	srcName := ""
+	if ps.Spec.SourceRef != nil {
+		srcName = ps.Spec.SourceRef.Name
+	}
+	if pu, err := r.dyn.Resource(gvrPackages).Get(ctx, name, metav1.GetOptions{}); err == nil {
+		// Delete only a managed registration Package (owned AND still at the auto
+		// default variant), the same predicate the materializer and untap use, so
+		// a user's pinned install is never removed by disconnect.
+		variant, _, _ := unstructured.NestedString(pu.Object, "spec", "variant")
+		if collision.ManagedRegistration(pu, srcName, variant) {
+			// UID + ResourceVersion preconditions: delete only this exact object,
+			// not one the user replaced or pinned in-place between Get and Delete.
+			uid := pu.GetUID()
+			rv := pu.GetResourceVersion()
+			delOpts := metav1.DeleteOptions{DryRun: deleteDryRun(opts), Preconditions: &metav1.Preconditions{UID: &uid, ResourceVersion: &rv}}
+			// A conflict is tolerated here (unlike the operator's retry loop): the
+			// managed registration Package carries an ownerReference TO its
+			// PackageSource, and disconnect deletes that PackageSource next, so
+			// garbage collection reaps a Package this delete missed; a Package the
+			// user pinned in the gap has shed that ownerRef (pinRegistrationToUser)
+			// and is correctly spared.
+			if err := r.dyn.Resource(gvrPackages).Delete(ctx, name, delOpts); err != nil && !apierrors.IsNotFound(err) && !apierrors.IsConflict(err) {
+				return nil, false, apierrors.NewInternalError(fmt.Errorf("delete registration Package %q: %w", name, err))
+			}
+		}
+	} else if !apierrors.IsNotFound(err) {
+		return nil, false, apierrors.NewInternalError(fmt.Errorf("check registration Package %q: %w", name, err))
+	}
+
+	if err := r.dyn.Resource(gvrPackageSources).Delete(ctx, name, metav1.DeleteOptions{DryRun: deleteDryRun(opts)}); err != nil {
+		return nil, false, apierrors.NewInternalError(fmt.Errorf("delete PackageSource %q: %w", name, err))
+	}
+
+	// Remove the Flux source too, but only when no other PackageSource still
+	// references it. Installed Packages are intentionally left untouched.
+	if ref := ps.Spec.SourceRef; ref != nil && ref.Kind == "OCIRepository" && ref.Name != "" {
+		others, err := r.fetchPackageSources(ctx)
+		if err == nil && !anyOtherReferences(others, ref.Name, name) {
+			ns := ref.Namespace
+			if ns == "" {
+				ns = "cozy-system"
+			}
+			if err := r.dyn.Resource(gvrOCIRepos).Namespace(ns).Delete(ctx, ref.Name, metav1.DeleteOptions{DryRun: deleteDryRun(opts)}); err != nil && !apierrors.IsNotFound(err) {
+				klog.V(2).InfoS("tap disconnected but its OCIRepository could not be deleted", "source", ref.Name, "err", err)
+			}
+		}
+	}
+
+	return &tap, true, nil
+}
+
+// deleteOrphanTapSource removes a tap whose OCIRepository exists but whose
+// PackageSource has not been materialized. It matches the labeled OCIRepository
+// carrying the tap-name annotation and deletes it.
+func (r *REST) deleteOrphanTapSource(ctx context.Context, name string, dryRun []string) (runtime.Object, bool, error) {
+	list, err := r.dyn.Resource(gvrOCIRepos).Namespace("cozy-system").List(ctx, metav1.ListOptions{
+		LabelSelector: tapconst.Label + "=true",
+	})
+	if err != nil {
+		return nil, false, apierrors.NewNotFound(r.gvr.GroupResource(), name)
+	}
+	for i := range list.Items {
+		item := &list.Items[i]
+		if item.GetAnnotations()[tapconst.NameAnnotation] != name {
+			continue
+		}
+		if err := r.dyn.Resource(gvrOCIRepos).Namespace("cozy-system").Delete(ctx, item.GetName(), metav1.DeleteOptions{DryRun: dryRun}); err != nil && !apierrors.IsNotFound(err) {
+			return nil, false, apierrors.NewInternalError(fmt.Errorf("delete tap source %q: %w", item.GetName(), err))
+		}
+		tap := &corev1alpha1.Tap{
+			TypeMeta:   metav1.TypeMeta{APIVersion: corev1alpha1.SchemeGroupVersion.String(), Kind: "Tap"},
+			ObjectMeta: metav1.ObjectMeta{Name: name, ResourceVersion: "0"},
+			Spec:       corev1alpha1.TapSpec{Community: true},
+		}
+		return tap, true, nil
+	}
+	return nil, false, apierrors.NewNotFound(r.gvr.GroupResource(), name)
+}
+
+// fetchPackageSources lists the cluster-scoped PackageSources as typed objects.
+func (r *REST) fetchPackageSources(ctx context.Context) ([]cozyv1alpha1.PackageSource, error) {
+	ul, err := r.dyn.Resource(gvrPackageSources).List(ctx, metav1.ListOptions{})
+	if err != nil {
+		return nil, err
+	}
+	out := make([]cozyv1alpha1.PackageSource, 0, len(ul.Items))
+	for i := range ul.Items {
+		var ps cozyv1alpha1.PackageSource
+		if err := fromUnstructured(&ul.Items[i], &ps); err != nil {
+			klog.V(2).InfoS("skipping undecodable PackageSource", "name", ul.Items[i].GetName(), "err", err)
+			continue
+		}
+		out = append(out, ps)
+	}
+	return out, nil
+}
+
+// appDefIndex lists ApplicationDefinitions and indexes them by chartRef name. A
+// list failure is tolerated (the catalog degrades to taps with no packages)
+// rather than failing the whole marketplace view.
+func (r *REST) appDefIndex(ctx context.Context) map[string]cozyv1alpha1.ApplicationDefinition {
+	ul, err := r.dyn.Resource(gvrAppDefs).List(ctx, metav1.ListOptions{})
+	if err != nil {
+		klog.V(2).InfoS("could not list ApplicationDefinitions for tap catalog", "err", err)
+		return map[string]cozyv1alpha1.ApplicationDefinition{}
+	}
+	ads := make([]cozyv1alpha1.ApplicationDefinition, 0, len(ul.Items))
+	for i := range ul.Items {
+		var ad cozyv1alpha1.ApplicationDefinition
+		if err := fromUnstructured(&ul.Items[i], &ad); err != nil {
+			klog.V(2).InfoS("skipping undecodable ApplicationDefinition", "name", ul.Items[i].GetName(), "err", err)
+			continue
+		}
+		ads = append(ads, ad)
+	}
+	return indexAppDefsByChartRef(ads)
+}
+
+func fromUnstructured(u *unstructured.Unstructured, target any) error {
+	return runtime.DefaultUnstructuredConverter.FromUnstructured(u.Object, target)
+}
+
+// -----------------------------------------------------------------------------
+// Watcher (one-shot): emit the current state once, then block until the client
+// or server cancels, mirroring the Option resource. Closing the channel early
+// makes the apiserver treat the watch as ended and reconnect in a tight loop.
+// -----------------------------------------------------------------------------
+
+func (r *REST) Watch(ctx context.Context, opts *metainternal.ListOptions) (watch.Interface, error) {
+	events := make(chan watch.Event)
+	pw := watch.NewProxyWatcher(events)
+
+	go func() {
+		defer pw.Stop()
+		listObj, err := r.List(ctx, opts)
+		if err == nil {
+			list := listObj.(*corev1alpha1.TapList)
+			for i := range list.Items {
+				select {
+				case events <- watch.Event{Type: watch.Added, Object: &list.Items[i]}:
+				case <-ctx.Done():
+					return
+				}
+			}
+		} else {
+			klog.V(2).InfoS("tap watch: initial list failed", "err", err)
+		}
+		<-ctx.Done()
+	}()
+
+	return pw, nil
+}
+
+// -----------------------------------------------------------------------------
+// TableConvertor
+// -----------------------------------------------------------------------------
+
+func (r *REST) ConvertToTable(_ context.Context, obj runtime.Object, _ runtime.Object) (*metav1.Table, error) {
+	row := func(t *corev1alpha1.Tap) metav1.TableRow {
+		return metav1.TableRow{
+			Cells:  []any{t.Name, t.Spec.Source.Kind, t.Spec.Ready, len(t.Spec.Packages)},
+			Object: runtime.RawExtension{Object: t},
+		}
+	}
+	tbl := &metav1.Table{
+		TypeMeta: metav1.TypeMeta{APIVersion: "meta.k8s.io/v1", Kind: "Table"},
+		ColumnDefinitions: []metav1.TableColumnDefinition{
+			{Name: "NAME", Type: "string"},
+			{Name: "SOURCE", Type: "string"},
+			{Name: "READY", Type: "boolean"},
+			{Name: "PACKAGES", Type: "integer"},
+		},
+	}
+	switch v := obj.(type) {
+	case *corev1alpha1.TapList:
+		for i := range v.Items {
+			tbl.Rows = append(tbl.Rows, row(&v.Items[i]))
+		}
+		tbl.ResourceVersion = v.ResourceVersion
+	case *corev1alpha1.Tap:
+		tbl.Rows = append(tbl.Rows, row(v))
+		tbl.ResourceVersion = v.ResourceVersion
+	default:
+		return nil, notAcceptable{r.gvr.GroupResource(), fmt.Sprintf("unexpected %T", obj)}
+	}
+	return tbl, nil
+}
+
+type notAcceptable struct {
+	resource schema.GroupResource
+	message  string
+}
+
+func (e notAcceptable) Error() string { return e.message }
+func (e notAcceptable) Status() metav1.Status {
+	return metav1.Status{
+		Status:  metav1.StatusFailure,
+		Code:    http.StatusNotAcceptable,
+		Reason:  metav1.StatusReason("NotAcceptable"),
+		Message: e.message,
+	}
+}
diff --git a/pkg/registry/core/tap/rest_test.go b/pkg/registry/core/tap/rest_test.go
new file mode 100644
index 0000000000..e0ef889628
--- /dev/null
+++ b/pkg/registry/core/tap/rest_test.go
@@ -0,0 +1,341 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright 2025 The Cozystack Authors.
+
+package tap
+
+import (
+	"context"
+	"testing"
+
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	dynamicfake "k8s.io/client-go/dynamic/fake"
+
+	cozyv1alpha1 "github.com/cozystack/cozystack/api/v1alpha1"
+	corev1alpha1 "github.com/cozystack/cozystack/pkg/apis/core/v1alpha1"
+)
+
+func TestAnyOtherReferences(t *testing.T) {
+	pss := []cozyv1alpha1.PackageSource{
+		{ObjectMeta: metav1.ObjectMeta{Name: "community.a.b"}, Spec: cozyv1alpha1.PackageSourceSpec{SourceRef: &cozyv1alpha1.PackageSourceRef{Name: "src1"}}},
+		{ObjectMeta: metav1.ObjectMeta{Name: "community.c.d"}, Spec: cozyv1alpha1.PackageSourceSpec{SourceRef: &cozyv1alpha1.PackageSourceRef{Name: "src2"}}},
+	}
+	if anyOtherReferences(pss, "src1", "community.a.b") {
+		t.Error("src1 is referenced only by the excluded PS; expected false")
+	}
+	if !anyOtherReferences(pss, "src2", "community.a.b") {
+		t.Error("src2 is referenced by another PS; expected true")
+	}
+}
+
+func psObj(name, srcName string) *unstructured.Unstructured {
+	return &unstructured.Unstructured{Object: map[string]any{
+		"apiVersion": "cozystack.io/v1alpha1",
+		"kind":       "PackageSource",
+		"metadata":   map[string]any{"name": name},
+		"spec": map[string]any{
+			"sourceRef": map[string]any{"kind": "OCIRepository", "name": srcName, "namespace": "cozy-system"},
+		},
+	}}
+}
+
+// tapPsObj is a materialized tap's PackageSource: like psObj but stamped with
+// the marketplace-tap marker label, so the label-based disconnect guard permits
+// it.
+func tapPsObj(name, srcName string) *unstructured.Unstructured {
+	u := psObj(name, srcName)
+	u.SetLabels(map[string]string{"apps.cozystack.io/marketplace-tap": "true"})
+	return u
+}
+
+func ociRepoObj(name string) *unstructured.Unstructured {
+	return &unstructured.Unstructured{Object: map[string]any{
+		"apiVersion": "source.toolkit.fluxcd.io/v1",
+		"kind":       "OCIRepository",
+		"metadata":   map[string]any{"name": name, "namespace": "cozy-system"},
+		"spec":       map[string]any{"url": "oci://ghcr.io/a/b"},
+	}}
+}
+
+// tapPkgObj is a tap-managed registration Package, owned by sourceName (the
+// marketplace-tap label plus the tap-source annotation).
+func tapPkgObj(name, sourceName string) *unstructured.Unstructured {
+	return &unstructured.Unstructured{Object: map[string]any{
+		"apiVersion": "cozystack.io/v1alpha1",
+		"kind":       "Package",
+		"metadata": map[string]any{
+			"name":        name,
+			"labels":      map[string]any{"apps.cozystack.io/marketplace-tap": "true"},
+			"annotations": map[string]any{"apps.cozystack.io/tap-source": sourceName},
+		},
+	}}
+}
+
+func fakeREST(objs ...runtime.Object) *REST {
+	scheme := runtime.NewScheme()
+	gvrToKind := map[schema.GroupVersionResource]string{
+		gvrPackageSources: "PackageSourceList",
+		gvrPackages:       "PackageList",
+		gvrAppDefs:        "ApplicationDefinitionList",
+		gvrOCIRepos:       "OCIRepositoryList",
+	}
+	dyn := dynamicfake.NewSimpleDynamicClientWithCustomListKinds(scheme, gvrToKind, objs...)
+	return NewREST(dyn)
+}
+
+func TestDeleteRefusesOfficialTap(t *testing.T) {
+	// An existing PackageSource without the tap marker label is official and
+	// protected from disconnect.
+	r := fakeREST(psObj("cozystack.postgres-application", "cozystack-source"))
+	_, _, err := r.Delete(context.Background(), "cozystack.postgres-application", nil, nil)
+	if err == nil || !apierrors.IsForbidden(err) {
+		t.Fatalf("expected Forbidden deleting an official (unlabeled) source, got %v", err)
+	}
+}
+
+func TestDeleteCommunityTapRemovesSource(t *testing.T) {
+	r := fakeREST(tapPsObj("a.b", "tap-a-b"), ociRepoObj("tap-a-b"))
+	obj, ok, err := r.Delete(context.Background(), "a.b", nil, nil)
+	if err != nil || !ok || obj == nil {
+		t.Fatalf("delete failed: ok=%v err=%v", ok, err)
+	}
+	// PackageSource is gone.
+	if _, err := r.dyn.Resource(gvrPackageSources).Get(context.Background(), "a.b", metav1.GetOptions{}); !apierrors.IsNotFound(err) {
+		t.Errorf("expected PackageSource deleted, got err=%v", err)
+	}
+	// The unreferenced OCIRepository is gone too.
+	if _, err := r.dyn.Resource(gvrOCIRepos).Namespace("cozy-system").Get(context.Background(), "tap-a-b", metav1.GetOptions{}); !apierrors.IsNotFound(err) {
+		t.Errorf("expected OCIRepository deleted, got err=%v", err)
+	}
+}
+
+func TestDeleteRemovesRegistrationPackage(t *testing.T) {
+	// Disconnect must also remove the tap-managed registration Package so the
+	// repository's apps de-register from the catalog.
+	r := fakeREST(tapPsObj("a.b", "tap-a-b"), ociRepoObj("tap-a-b"), tapPkgObj("a.b", "tap-a-b"))
+	if _, ok, err := r.Delete(context.Background(), "a.b", nil, nil); err != nil || !ok {
+		t.Fatalf("delete failed: ok=%v err=%v", ok, err)
+	}
+	if _, err := r.dyn.Resource(gvrPackages).Get(context.Background(), "a.b", metav1.GetOptions{}); !apierrors.IsNotFound(err) {
+		t.Errorf("expected the tap-managed registration Package deleted, got err=%v", err)
+	}
+}
+
+func TestDeleteKeepsForeignPackage(t *testing.T) {
+	// A Package owned by a DIFFERENT tap source (label present, but the
+	// tap-source annotation names another source) must be left in place: a name
+	// reused by a later tap must not have its Package deleted by this teardown.
+	other := tapPkgObj("a.b", "tap-other-source")
+	r := fakeREST(tapPsObj("a.b", "tap-a-b"), ociRepoObj("tap-a-b"), other)
+	if _, ok, err := r.Delete(context.Background(), "a.b", nil, nil); err != nil || !ok {
+		t.Fatalf("delete failed: ok=%v err=%v", ok, err)
+	}
+	if _, err := r.dyn.Resource(gvrPackages).Get(context.Background(), "a.b", metav1.GetOptions{}); err != nil {
+		t.Errorf("a Package owned by another source must be left in place, got err=%v", err)
+	}
+}
+
+func TestDeleteKeepsSharedSource(t *testing.T) {
+	// Two PackageSources reference the same Flux source; deleting one must keep it.
+	r := fakeREST(
+		tapPsObj("a.b", "shared-src"),
+		tapPsObj("c.d", "shared-src"),
+		ociRepoObj("shared-src"),
+	)
+	if _, ok, err := r.Delete(context.Background(), "a.b", nil, nil); err != nil || !ok {
+		t.Fatalf("delete failed: ok=%v err=%v", ok, err)
+	}
+	if _, err := r.dyn.Resource(gvrOCIRepos).Namespace("cozy-system").Get(context.Background(), "shared-src", metav1.GetOptions{}); err != nil {
+		t.Errorf("shared OCIRepository must be kept, got err=%v", err)
+	}
+}
+
+func TestDeleteNotFound(t *testing.T) {
+	r := fakeREST()
+	_, _, err := r.Delete(context.Background(), "missing.x", nil, nil)
+	if !apierrors.IsNotFound(err) {
+		t.Fatalf("expected NotFound, got %v", err)
+	}
+}
+
+// orphanOciRepo is a tap OCIRepository with no materialized PackageSource yet
+// (a pending or failed connect). Its tap-name annotation records its own object
+// name, which is the tap's identity before materialization.
+func orphanOciRepo(fluxName string) *unstructured.Unstructured {
+	u := ociRepoObj(fluxName)
+	u.SetLabels(map[string]string{"apps.cozystack.io/marketplace-tap": "true"})
+	u.SetAnnotations(map[string]string{"apps.cozystack.io/tap-name": fluxName})
+	return u
+}
+
+func TestDeleteOrphanTapSource(t *testing.T) {
+	// No PackageSource exists, only the labeled OCIRepository from a pending connect.
+	r := fakeREST(orphanOciRepo("tap-a-b"))
+	obj, ok, err := r.Delete(context.Background(), "tap-a-b", nil, nil)
+	if err != nil || !ok || obj == nil {
+		t.Fatalf("expected orphan tap source removed: ok=%v err=%v", ok, err)
+	}
+	if _, err := r.dyn.Resource(gvrOCIRepos).Namespace("cozy-system").Get(context.Background(), "tap-a-b", metav1.GetOptions{}); !apierrors.IsNotFound(err) {
+		t.Errorf("expected orphan OCIRepository deleted, got %v", err)
+	}
+}
+
+func TestDeleteOrphanNoMatch(t *testing.T) {
+	// A labeled source exists but for a different tap name -> still NotFound.
+	r := fakeREST(orphanOciRepo("tap-a-b"))
+	if _, _, err := r.Delete(context.Background(), "tap-other-x", nil, nil); !apierrors.IsNotFound(err) {
+		t.Fatalf("expected NotFound for a non-matching orphan, got %v", err)
+	}
+}
+
+// TestGetPendingTap covers a collision-blocked or connecting tap: its
+// OCIRepository exists but no PackageSource does. Get must surface it as a
+// pending Tap (mirroring List), not 404, so a dashboard detail view can show the
+// block reason.
+func TestGetPendingTap(t *testing.T) {
+	repo := orphanOciRepo("tap-a-b")
+	repo.SetAnnotations(map[string]string{
+		"apps.cozystack.io/tap-name":  "tap-a-b",
+		"apps.cozystack.io/tap-error": `a PackageSource named "acme.demo" already exists`,
+	})
+	r := fakeREST(repo)
+
+	obj, err := r.Get(context.Background(), "tap-a-b", &metav1.GetOptions{})
+	if err != nil {
+		t.Fatalf("Get on a pending tap must not 404: %v", err)
+	}
+	tap := obj.(*corev1alpha1.Tap)
+	if tap.Name != "tap-a-b" || tap.Spec.Ready || !tap.Spec.Community {
+		t.Errorf("unexpected pending tap from Get: %+v", tap.Spec)
+	}
+	if tap.Spec.Message != `a PackageSource named "acme.demo" already exists` {
+		t.Errorf("Get did not surface the collision message: %q", tap.Spec.Message)
+	}
+
+	// A name with neither a PackageSource nor a matching tap source is NotFound.
+	if _, err := r.Get(context.Background(), "tap-missing", &metav1.GetOptions{}); !apierrors.IsNotFound(err) {
+		t.Fatalf("expected NotFound for an unknown name, got %v", err)
+	}
+}
+
+func TestParseConnectURL(t *testing.T) {
+	got, err := parseConnectURL("oci://ghcr.io/foo/bar:v2", "")
+	if err != nil {
+		t.Fatalf("err: %v", err)
+	}
+	if got.URL != "oci://ghcr.io/foo/bar" || got.Tag != "v2" || got.FluxSourceName != "tap-foo-bar" {
+		t.Fatalf("unexpected parse: %+v", got)
+	}
+	// tag override wins over the URL tag.
+	if o, _ := parseConnectURL("oci://ghcr.io/foo/bar:v2", "v9"); o.Tag != "v9" {
+		t.Errorf("tag override = %q", o.Tag)
+	}
+	// no tag defaults to latest.
+	if o, _ := parseConnectURL("oci://ghcr.io/foo/bar", ""); o.Tag != "latest" {
+		t.Errorf("default tag = %q", o.Tag)
+	}
+	if _, err := parseConnectURL("ghcr.io/foo/bar", ""); err == nil {
+		t.Error("expected error for non-oci url")
+	}
+	if _, err := parseConnectURL("oci://ghcr.io/foo/bar@sha256:abc", ""); err == nil {
+		t.Error("expected error for digest ref")
+	}
+}
+
+func TestCreateGuards(t *testing.T) {
+	r := fakeREST()
+	if _, err := r.Create(context.Background(), &corev1alpha1.Tap{}, nil, nil); !apierrors.IsBadRequest(err) {
+		t.Errorf("missing url should be BadRequest, got %v", err)
+	}
+	if _, err := r.Create(context.Background(), &corev1alpha1.Tap{Spec: corev1alpha1.TapSpec{URL: "ghcr.io/x/y"}}, nil, nil); !apierrors.IsBadRequest(err) {
+		t.Errorf("non-oci url should be BadRequest, got %v", err)
+	}
+}
+
+func TestCreateRepeatPreservesFinalizerAndForcesRematerialize(t *testing.T) {
+	// A source already connected and materialized carries the operator's
+	// finalizer and materialized-revision annotation; a repeat connect must
+	// update the tag and preserve the finalizer, but CLEAR the
+	// materialized-revision annotation so the operator re-materializes and
+	// recovers a registration removed out-of-band.
+	existing := ociRepoObj("tap-foo-bar")
+	// Same repository, connected earlier at a different tag.
+	_ = unstructured.SetNestedField(existing.Object, "oci://ghcr.io/foo/bar", "spec", "url")
+	existing.SetFinalizers([]string{"apps.cozystack.io/tap-materializer"})
+	existing.SetAnnotations(map[string]string{"apps.cozystack.io/materialized-revision": "rev-1"})
+	r := fakeREST(existing)
+
+	in := &corev1alpha1.Tap{Spec: corev1alpha1.TapSpec{URL: "oci://ghcr.io/foo/bar:v2"}}
+	if _, err := r.Create(context.Background(), in, nil, nil); err != nil {
+		t.Fatalf("repeat create: %v", err)
+	}
+	u, err := r.dyn.Resource(gvrOCIRepos).Namespace("cozy-system").Get(context.Background(), "tap-foo-bar", metav1.GetOptions{})
+	if err != nil {
+		t.Fatal(err)
+	}
+	if len(u.GetFinalizers()) == 0 {
+		t.Error("repeat connect stripped the operator finalizer")
+	}
+	if _, ok := u.GetAnnotations()["apps.cozystack.io/materialized-revision"]; ok {
+		t.Error("repeat connect must clear the materialized-revision annotation to force re-materialization")
+	}
+	if tag, _, _ := unstructured.NestedString(u.Object, "spec", "ref", "tag"); tag != "v2" {
+		t.Errorf("repeat connect did not update the tag, got %q", tag)
+	}
+	if u.GetAnnotations()["apps.cozystack.io/tap-name"] != "tap-foo-bar" {
+		t.Error("repeat connect did not set the tap-name annotation")
+	}
+}
+
+func TestCreateRefusesConflictingURL(t *testing.T) {
+	// A source with the same derived name but a different registry host must not
+	// be silently retargeted.
+	existing := ociRepoObj("tap-foo-bar")
+	_ = unstructured.SetNestedField(existing.Object, "oci://other.host/foo/bar", "spec", "url")
+	r := fakeREST(existing)
+
+	in := &corev1alpha1.Tap{Spec: corev1alpha1.TapSpec{URL: "oci://ghcr.io/foo/bar:v1"}}
+	_, err := r.Create(context.Background(), in, nil, nil)
+	if !apierrors.IsConflict(err) {
+		t.Fatalf("expected Conflict for a different repository at the same name, got %v", err)
+	}
+	// The existing source keeps its original URL.
+	u, _ := r.dyn.Resource(gvrOCIRepos).Namespace("cozy-system").Get(context.Background(), "tap-foo-bar", metav1.GetOptions{})
+	if url, _, _ := unstructured.NestedString(u.Object, "spec", "url"); url != "oci://other.host/foo/bar" {
+		t.Errorf("existing source URL was overwritten: %q", url)
+	}
+}
+
+func TestCreateMakesLabeledSource(t *testing.T) {
+	r := fakeREST()
+	in := &corev1alpha1.Tap{Spec: corev1alpha1.TapSpec{URL: "oci://ghcr.io/foo/bar:v1", SecretRef: "pull-creds"}}
+	out, err := r.Create(context.Background(), in, nil, nil)
+	if err != nil {
+		t.Fatalf("create: %v", err)
+	}
+	tap := out.(*corev1alpha1.Tap)
+	if tap.Name != "tap-foo-bar" || tap.Spec.Ready || !tap.Spec.Community {
+		t.Fatalf("unexpected returned tap: %+v", tap.Spec)
+	}
+	// The returned object must never echo the url or secret back.
+	if tap.Spec.URL != "" || tap.Spec.SecretRef != "" {
+		t.Errorf("create response leaked connect inputs: %+v", tap.Spec)
+	}
+	u, err := r.dyn.Resource(gvrOCIRepos).Namespace("cozy-system").Get(context.Background(), "tap-foo-bar", metav1.GetOptions{})
+	if err != nil {
+		t.Fatalf("OCIRepository not created: %v", err)
+	}
+	if u.GetLabels()["apps.cozystack.io/marketplace-tap"] != "true" {
+		t.Errorf("OCIRepository missing tap label: %v", u.GetLabels())
+	}
+	if u.GetAnnotations()["apps.cozystack.io/tap-name"] != "tap-foo-bar" {
+		t.Errorf("OCIRepository missing tap-name annotation: %v", u.GetAnnotations())
+	}
+	secretName, _, _ := unstructured.NestedString(u.Object, "spec", "secretRef", "name")
+	if secretName != "pull-creds" {
+		t.Errorf("secretRef not set on OCIRepository: got %q", secretName)
+	}
+}
diff --git a/pkg/registry/core/tap/rest_write_options_test.go b/pkg/registry/core/tap/rest_write_options_test.go
new file mode 100644
index 0000000000..acd2b24dc1
--- /dev/null
+++ b/pkg/registry/core/tap/rest_write_options_test.go
@@ -0,0 +1,141 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright 2025 The Cozystack Authors.
+
+package tap
+
+import (
+	"context"
+	"testing"
+
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	dynamicfake "k8s.io/client-go/dynamic/fake"
+	k8stesting "k8s.io/client-go/testing"
+
+	"github.com/cozystack/cozystack/internal/marketplace/tapconst"
+	corev1alpha1 "github.com/cozystack/cozystack/pkg/apis/core/v1alpha1"
+)
+
+// The fake dynamic client's tracker ignores DryRun and persists regardless, so
+// asserting that an object is absent afterwards would pass with or without the
+// fix. What distinguishes them is the options the storage hands to the backing
+// client, which the fake records on the action.
+
+func recordedActions(t *testing.T, r *REST) []k8stesting.Action {
+	t.Helper()
+	f, ok := r.dyn.(*dynamicfake.FakeDynamicClient)
+	if !ok {
+		t.Fatalf("expected a fake dynamic client, got %T", r.dyn)
+	}
+	return f.Actions()
+}
+
+func createDryRunFor(t *testing.T, r *REST, gvr schema.GroupVersionResource) []string {
+	t.Helper()
+	for _, a := range recordedActions(t, r) {
+		c, ok := a.(k8stesting.CreateActionImpl)
+		if ok && a.GetVerb() == "create" && a.GetResource() == gvr {
+			return c.CreateOptions.DryRun
+		}
+	}
+	t.Fatalf("no create action recorded for %q", gvr.Resource)
+	return nil
+}
+
+func updateDryRunFor(t *testing.T, r *REST, gvr schema.GroupVersionResource) []string {
+	t.Helper()
+	for _, a := range recordedActions(t, r) {
+		u, ok := a.(k8stesting.UpdateActionImpl)
+		if ok && a.GetVerb() == "update" && a.GetResource() == gvr {
+			return u.UpdateOptions.DryRun
+		}
+	}
+	t.Fatalf("no update action recorded for %q", gvr.Resource)
+	return nil
+}
+
+func deleteDryRunFor(t *testing.T, r *REST, gvr schema.GroupVersionResource) []string {
+	t.Helper()
+	for _, a := range recordedActions(t, r) {
+		d, ok := a.(k8stesting.DeleteActionImpl)
+		if ok && a.GetVerb() == "delete" && a.GetResource() == gvr {
+			return d.DeleteOptions.DryRun
+		}
+	}
+	t.Fatalf("no delete action recorded for %q", gvr.Resource)
+	return nil
+}
+
+func wantDryRunAll(t *testing.T, what string, got []string) {
+	t.Helper()
+	if len(got) != 1 || got[0] != metav1.DryRunAll {
+		t.Errorf("%s dropped the caller's dry-run: got %v, want [%s]", what, got, metav1.DryRunAll)
+	}
+}
+
+func connectTap() *corev1alpha1.Tap {
+	return &corev1alpha1.Tap{
+		ObjectMeta: metav1.ObjectMeta{Name: "a.b"},
+		Spec:       corev1alpha1.TapSpec{URL: "oci://ghcr.io/a/b", Tag: "v1"},
+	}
+}
+
+// orphanOciRepoObj is a tap whose OCIRepository exists but whose PackageSource
+// was never materialized, which is the fallback branch of Delete.
+func orphanOciRepoObj(srcName, tapName string) *unstructured.Unstructured {
+	u := ociRepoObj(srcName)
+	u.SetLabels(map[string]string{tapconst.Label: "true"})
+	u.SetAnnotations(map[string]string{tapconst.NameAnnotation: tapName})
+	return u
+}
+
+func TestCreateForwardsDryRunToBackingSource(t *testing.T) {
+	r := fakeREST()
+	opts := &metav1.CreateOptions{DryRun: []string{metav1.DryRunAll}}
+	if _, err := r.Create(context.Background(), connectTap(), nil, opts); err != nil {
+		t.Fatalf("create: %v", err)
+	}
+	wantDryRunAll(t, "the backing OCIRepository create", createDryRunFor(t, r, gvrOCIRepos))
+}
+
+func TestCreateForwardsDryRunWhenSourceAlreadyExists(t *testing.T) {
+	// A repeat connect at the same URL takes the update branch.
+	r := fakeREST(ociRepoObj("tap-a-b"))
+	opts := &metav1.CreateOptions{DryRun: []string{metav1.DryRunAll}}
+	if _, err := r.Create(context.Background(), connectTap(), nil, opts); err != nil {
+		t.Fatalf("create: %v", err)
+	}
+	wantDryRunAll(t, "the backing OCIRepository update", updateDryRunFor(t, r, gvrOCIRepos))
+}
+
+func TestDeleteForwardsDryRunToBackingDeletes(t *testing.T) {
+	r := fakeREST(tapPsObj("a.b", "tap-a-b"), ociRepoObj("tap-a-b"), tapPkgObj("a.b", "tap-a-b"))
+	opts := &metav1.DeleteOptions{DryRun: []string{metav1.DryRunAll}}
+	if _, _, err := r.Delete(context.Background(), "a.b", nil, opts); err != nil {
+		t.Fatalf("delete: %v", err)
+	}
+	wantDryRunAll(t, "the backing PackageSource delete", deleteDryRunFor(t, r, gvrPackageSources))
+	wantDryRunAll(t, "the backing Package delete", deleteDryRunFor(t, r, gvrPackages))
+	wantDryRunAll(t, "the backing OCIRepository delete", deleteDryRunFor(t, r, gvrOCIRepos))
+}
+
+func TestDeleteOrphanTapSourceForwardsDryRun(t *testing.T) {
+	r := fakeREST(orphanOciRepoObj("tap-a-b", "a.b"))
+	opts := &metav1.DeleteOptions{DryRun: []string{metav1.DryRunAll}}
+	if _, _, err := r.Delete(context.Background(), "a.b", nil, opts); err != nil {
+		t.Fatalf("delete: %v", err)
+	}
+	wantDryRunAll(t, "the orphan OCIRepository delete", deleteDryRunFor(t, r, gvrOCIRepos))
+}
+
+func TestWritesWithoutOptionsDoNotSynthesiseDryRun(t *testing.T) {
+	// Callers that pass no options at all must keep writing for real.
+	r := fakeREST(tapPsObj("a.b", "tap-a-b"), ociRepoObj("tap-a-b"))
+	if _, _, err := r.Delete(context.Background(), "a.b", nil, nil); err != nil {
+		t.Fatalf("delete with nil options: %v", err)
+	}
+	if got := deleteDryRunFor(t, r, gvrPackageSources); len(got) != 0 {
+		t.Errorf("nil options must not produce a dry-run: got %v", got)
+	}
+}
diff --git a/pkg/registry/core/tenantmodule/rest.go b/pkg/registry/core/tenantmodule/rest.go
index 888d441446..5f3d96f8d5 100644
--- a/pkg/registry/core/tenantmodule/rest.go
+++ b/pkg/registry/core/tenantmodule/rest.go
@@ -366,6 +366,8 @@ func (r *REST) Watch(ctx context.Context, options *metainternalversion.ListOptio
 		}
 	}
 
+	initialEventsEnd := registry.InitialEventsEndBookmarkRequested(options)
+
 	// Start watch on HelmRelease with label selector only
 	// Field selectors are not supported by controller-runtime cache
 	// See: https://github.com/kubernetes-sigs/controller-runtime/issues/612
@@ -373,12 +375,27 @@ func (r *REST) Watch(ctx context.Context, options *metainternalversion.ListOptio
 	helmWatcher, err := r.w.Watch(ctx, hrList, &client.ListOptions{
 		Namespace:     namespace,
 		LabelSelector: helmLabelSelector,
+		// Backing bookmarks are forwarded to the client, so ask for them only
+		// when the client did; a WatchList client always does, which keeps
+		// the terminating bookmark's trigger.
+		Raw: &metav1.ListOptions{AllowWatchBookmarks: options.AllowWatchBookmarks},
 	})
 	if err != nil {
 		klog.Errorf("Error setting up watch for HelmReleases: %v", err)
 		return nil, err
 	}
 
+	// Emit the initial-events-end bookmark after the initial ADDED events so
+	// client-go reflectors reach HasSynced.
+	bookmarker := registry.NewInitialEventsBookmarker(initialEventsEnd, options.ResourceVersion, func() runtime.Object {
+		module := &corev1alpha1.TenantModule{}
+		module.TypeMeta = metav1.TypeMeta{
+			APIVersion: corev1alpha1.SchemeGroupVersion.String(),
+			Kind:       r.kindName,
+		}
+		return module
+	})
+
 	// Create a custom watcher to transform events
 	customW := &customWatcher{
 		resultChan: make(chan watch.Event),
@@ -390,32 +407,35 @@ func (r *REST) Watch(ctx context.Context, options *metainternalversion.ListOptio
 		defer close(customW.resultChan)
 		defer customW.underlying.Stop()
 
+		// send forwards an event, returning false if the watch or context ended.
+		send := func(ev watch.Event) bool {
+			select {
+			case customW.resultChan <- ev:
+				return true
+			case <-customW.stopChan:
+				return false
+			case <-ctx.Done():
+				return false
+			}
+		}
+
 		for {
 			select {
 			case event, ok := <-customW.underlying.ResultChan():
 				if !ok {
 					klog.Warning("HelmRelease watcher closed")
+					// Flush the terminating bookmark if still pending.
+					if bookmark, ok := bookmarker.OnClose(); ok {
+						send(bookmark)
+					}
 					return
 				}
 
 				// Handle bookmark events
 				if event.Type == watch.Bookmark {
 					if hr, ok := event.Object.(*helmv2.HelmRelease); ok {
-						bookmarkModule := &corev1alpha1.TenantModule{}
-						bookmarkModule.SetResourceVersion(hr.GetResourceVersion())
-						bookmarkModule.TypeMeta = metav1.TypeMeta{
-							APIVersion: corev1alpha1.SchemeGroupVersion.String(),
-							Kind:       r.kindName,
-						}
-						bookmarkEvent := watch.Event{
-							Type:   watch.Bookmark,
-							Object: bookmarkModule,
-						}
-						select {
-						case customW.resultChan <- bookmarkEvent:
-						case <-customW.stopChan:
-							return
-						case <-ctx.Done():
+						bookmark, _ := bookmarker.OnBackingBookmark(hr.GetResourceVersion())
+						if !send(bookmark) {
 							return
 						}
 					}
@@ -434,6 +454,7 @@ func (r *REST) Watch(ctx context.Context, options *metainternalversion.ListOptio
 					klog.V(4).Infof("Expected HelmRelease object, got %T", event.Object)
 					continue
 				}
+				bookmarker.Observe(hr.GetResourceVersion())
 
 				// Apply manual field selector filtering
 				if !fieldFilter.MatchesName(hr.Name) {
@@ -482,18 +503,15 @@ func (r *REST) Watch(ctx context.Context, options *metainternalversion.ListOptio
 					}
 				}
 
-				// Create watch event with TenantModule object
-				moduleEvent := watch.Event{
-					Type:   event.Type,
-					Object: &module,
+				// Emit the initial-events-end bookmark before the first live event.
+				if bookmark, ok := bookmarker.BeforeLiveEvent(event.Type); ok {
+					if !send(bookmark) {
+						return
+					}
 				}
 
-				// Send event to custom watcher
-				select {
-				case customW.resultChan <- moduleEvent:
-				case <-customW.stopChan:
-					return
-				case <-ctx.Done():
+				// Send the translated TenantModule event.
+				if !send(watch.Event{Type: event.Type, Object: &module}) {
 					return
 				}
 
@@ -687,7 +705,7 @@ func (r *REST) buildTableFromTenantModules(modules []corev1alpha1.TenantModule)
 	for i := range modules {
 		module := &modules[i]
 		row := metav1.TableRow{
-			Cells:  []interface{}{module.GetName(), getReadyStatus(module.Status.Conditions), computeAge(module.GetCreationTimestamp().Time, now), getVersion(module.Status.Version)},
+			Cells:  []any{module.GetName(), getReadyStatus(module.Status.Conditions), computeAge(module.GetCreationTimestamp().Time, now), getVersion(module.Status.Version)},
 			Object: runtime.RawExtension{Object: module},
 		}
 		table.Rows = append(table.Rows, row)
@@ -711,7 +729,7 @@ func (r *REST) buildTableFromTenantModule(module corev1alpha1.TenantModule) meta
 
 	m := module
 	row := metav1.TableRow{
-		Cells:  []interface{}{module.GetName(), getReadyStatus(module.Status.Conditions), computeAge(module.GetCreationTimestamp().Time, now), getVersion(module.Status.Version)},
+		Cells:  []any{module.GetName(), getReadyStatus(module.Status.Conditions), computeAge(module.GetCreationTimestamp().Time, now), getVersion(module.Status.Version)},
 		Object: runtime.RawExtension{Object: &m},
 	}
 	table.Rows = append(table.Rows, row)
diff --git a/pkg/registry/core/tenantmodule/rest_watch_test.go b/pkg/registry/core/tenantmodule/rest_watch_test.go
new file mode 100644
index 0000000000..e035f5c505
--- /dev/null
+++ b/pkg/registry/core/tenantmodule/rest_watch_test.go
@@ -0,0 +1,212 @@
+// SPDX-License-Identifier: Apache-2.0
+
+package tenantmodule
+
+import (
+	"context"
+	"testing"
+	"time"
+
+	helmv2 "github.com/fluxcd/helm-controller/api/v2"
+	metainternalversion "k8s.io/apimachinery/pkg/apis/meta/internalversion"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/watch"
+	"k8s.io/apiserver/pkg/endpoints/request"
+	"sigs.k8s.io/controller-runtime/pkg/client/fake"
+
+	corev1alpha1 "github.com/cozystack/cozystack/pkg/apis/core/v1alpha1"
+	"github.com/cozystack/cozystack/pkg/registry/registrytest"
+)
+
+const testNamespace = "tenant-foo"
+
+// collectEvents drains up to n events from the watch, or returns early if the
+// channel closes or the timeout fires.
+func collectEvents(t *testing.T, w watch.Interface, n int, timeout time.Duration) []watch.Event {
+	t.Helper()
+	out := make([]watch.Event, 0, n)
+	deadline := time.NewTimer(timeout)
+	defer deadline.Stop()
+	for len(out) < n {
+		select {
+		case ev, ok := <-w.ResultChan():
+			if !ok {
+				return out
+			}
+			out = append(out, ev)
+		case <-deadline.C:
+			return out
+		}
+	}
+	return out
+}
+
+// TestWatch_SendInitialEvents_EmitsInitialEventsEndBookmark asserts the
+// WatchList contract for TenantModule: ADDED events, then a bookmark annotated
+// with k8s.io/initial-events-end, then live events.
+//
+// fake.Client.Watch doesn't replay existing objects as ADDED, so the HelmRelease
+// is created after the watch starts and then mutated to drive a live event.
+func TestWatch_SendInitialEvents_EmitsInitialEventsEndBookmark(t *testing.T) {
+	scheme := runtime.NewScheme()
+	if err := helmv2.AddToScheme(scheme); err != nil {
+		t.Fatalf("add helmv2 to scheme: %v", err)
+	}
+	fc := fake.NewClientBuilder().WithScheme(scheme).Build()
+	r := NewREST(fc, fc)
+
+	ctx, cancel := context.WithCancel(request.WithNamespace(context.Background(), testNamespace))
+	defer cancel()
+
+	sendInitialEvents := true
+	w, err := r.Watch(ctx, &metainternalversion.ListOptions{SendInitialEvents: &sendInitialEvents, AllowWatchBookmarks: true})
+	if err != nil {
+		t.Fatalf("Watch returned error: %v", err)
+	}
+	defer w.Stop()
+
+	hr := &helmv2.HelmRelease{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "module-a",
+			Namespace: testNamespace,
+			Labels: map[string]string{
+				TenantModuleLabelKey: TenantModuleLabelValue,
+			},
+		},
+	}
+	if err := r.c.Create(ctx, hr); err != nil {
+		t.Fatalf("create HelmRelease: %v", err)
+	}
+	hr.Annotations = map[string]string{"touched": "1"}
+	if err := r.c.Update(ctx, hr); err != nil {
+		t.Fatalf("update HelmRelease: %v", err)
+	}
+
+	evs := collectEvents(t, w, 3, 2*time.Second)
+	if len(evs) < 3 {
+		t.Fatalf("expected at least 3 events (Added, Bookmark, Modified), got %d: %+v", len(evs), evs)
+	}
+
+	if evs[0].Type != watch.Added {
+		t.Fatalf("event[0]: expected Added, got %s", evs[0].Type)
+	}
+	added, ok := evs[0].Object.(*corev1alpha1.TenantModule)
+	if !ok {
+		t.Fatalf("event[0]: expected *TenantModule, got %T", evs[0].Object)
+	}
+	if added.Name != "module-a" {
+		t.Fatalf("event[0]: expected name module-a, got %q", added.Name)
+	}
+
+	if evs[1].Type != watch.Bookmark {
+		t.Fatalf("event[1]: expected Bookmark, got %s", evs[1].Type)
+	}
+	bookmark, ok := evs[1].Object.(*corev1alpha1.TenantModule)
+	if !ok {
+		t.Fatalf("event[1]: expected *TenantModule, got %T", evs[1].Object)
+	}
+	if got := bookmark.Annotations[metav1.InitialEventsAnnotationKey]; got != "true" {
+		t.Fatalf("event[1]: expected annotation %s=true, got %q", metav1.InitialEventsAnnotationKey, got)
+	}
+	if bookmark.ResourceVersion == "" {
+		t.Fatal("event[1]: expected non-empty resourceVersion on bookmark")
+	}
+
+	if evs[2].Type != watch.Modified {
+		t.Fatalf("event[2]: expected Modified after bookmark, got %s", evs[2].Type)
+	}
+}
+
+// TestWatch_BackingBookmarksFollowTheClient pins that the backing watch asks for
+// bookmarks only when the client did: every backing bookmark is forwarded, and
+// the fake client never sends one, so the event stream alone cannot show it.
+func TestWatch_BackingBookmarksFollowTheClient(t *testing.T) {
+	yes := true
+	for _, tc := range []struct {
+		name string
+		opts metainternalversion.ListOptions
+		want bool
+	}{
+		{"plain watch defaulted by the apiserver", metainternalversion.ListOptions{SendInitialEvents: &yes}, false},
+		{"watch list", metainternalversion.ListOptions{SendInitialEvents: &yes, AllowWatchBookmarks: true}, true},
+		{"bookmarks only", metainternalversion.ListOptions{AllowWatchBookmarks: true}, true},
+	} {
+		t.Run(tc.name, func(t *testing.T) {
+			scheme := runtime.NewScheme()
+			if err := helmv2.AddToScheme(scheme); err != nil {
+				t.Fatalf("add helmv2 to scheme: %v", err)
+			}
+			fc := fake.NewClientBuilder().WithScheme(scheme).Build()
+			spy := &registrytest.RawRecordingWatch{WithWatch: fc}
+			r := NewREST(fc, spy)
+			ctx, cancel := context.WithCancel(request.WithNamespace(context.Background(), testNamespace))
+			defer cancel()
+
+			w, err := r.Watch(ctx, &tc.opts)
+			if err != nil {
+				t.Fatalf("Watch returned error: %v", err)
+			}
+			defer w.Stop()
+
+			raw := spy.RawFor(&helmv2.HelmReleaseList{})
+			if raw == nil {
+				t.Fatal("backing watch was called without raw options")
+			}
+			if raw.AllowWatchBookmarks != tc.want {
+				t.Fatalf("backing AllowWatchBookmarks = %v, want %v", raw.AllowWatchBookmarks, tc.want)
+			}
+		})
+	}
+}
+
+// TestWatch_PlainWatch_EmitsNoInitialEventsEndBookmark covers a watch with no
+// resourceVersion: the apiserver defaults SendInitialEvents on for it but leaves
+// bookmarks off, so the client never asked for the terminating bookmark.
+func TestWatch_PlainWatch_EmitsNoInitialEventsEndBookmark(t *testing.T) {
+	scheme := runtime.NewScheme()
+	if err := helmv2.AddToScheme(scheme); err != nil {
+		t.Fatalf("add helmv2 to scheme: %v", err)
+	}
+	fc := fake.NewClientBuilder().WithScheme(scheme).Build()
+	r := NewREST(fc, fc)
+
+	ctx, cancel := context.WithCancel(request.WithNamespace(context.Background(), testNamespace))
+	defer cancel()
+
+	sendInitialEvents := true
+	w, err := r.Watch(ctx, &metainternalversion.ListOptions{SendInitialEvents: &sendInitialEvents})
+	if err != nil {
+		t.Fatalf("Watch returned error: %v", err)
+	}
+	defer w.Stop()
+
+	hr := &helmv2.HelmRelease{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "module-a",
+			Namespace: testNamespace,
+			Labels: map[string]string{
+				TenantModuleLabelKey: TenantModuleLabelValue,
+			},
+		},
+	}
+	if err := r.c.Create(ctx, hr); err != nil {
+		t.Fatalf("create HelmRelease: %v", err)
+	}
+	hr.Annotations = map[string]string{"touched": "1"}
+	if err := r.c.Update(ctx, hr); err != nil {
+		t.Fatalf("update HelmRelease: %v", err)
+	}
+
+	evs := collectEvents(t, w, 3, 2*time.Second)
+	var types []watch.EventType
+	for _, ev := range evs {
+		types = append(types, ev.Type)
+		if ev.Type == watch.Bookmark {
+			t.Fatalf("unrequested bookmark on a plain watch: %+v", ev.Object)
+		}
+	}
+	if len(types) != 2 || types[0] != watch.Added || types[1] != watch.Modified {
+		t.Fatalf("expected [ADDED MODIFIED], got %v", types)
+	}
+}
diff --git a/pkg/registry/core/tenantnamespace/rest.go b/pkg/registry/core/tenantnamespace/rest.go
index 4ee97eb084..cd49c17c81 100644
--- a/pkg/registry/core/tenantnamespace/rest.go
+++ b/pkg/registry/core/tenantnamespace/rest.go
@@ -139,6 +139,11 @@ func (r *REST) Get(
 	ns := &corev1.Namespace{}
 	err = r.c.Get(ctx, types.NamespacedName{Namespace: "", Name: name}, ns, &client.GetOptions{Raw: opts})
 	if err != nil {
+		// Repackage NotFound so the Status reports this resource, not the
+		// backing Namespace one.
+		if apierrors.IsNotFound(err) {
+			return nil, apierrors.NewNotFound(r.gvr.GroupResource(), name)
+		}
 		return nil, err
 	}
 
@@ -170,10 +175,16 @@ func (r *REST) Watch(ctx context.Context, opts *metainternal.ListOptions) (watch
 
 	nsList := &corev1.NamespaceList{}
 
+	initialEventsEnd := registry.InitialEventsEndBookmarkRequested(opts)
+
 	// Build upstream watch options with field and label selectors
 	rawOpts := &metav1.ListOptions{
 		Watch:           true,
 		ResourceVersion: opts.ResourceVersion,
+		// Backing bookmarks are forwarded to the client, so ask for them only
+		// when the client did; a WatchList client always does, which keeps
+		// the terminating bookmark's trigger.
+		AllowWatchBookmarks: opts.AllowWatchBookmarks,
 	}
 	if opts.FieldSelector != nil {
 		rawOpts.FieldSelector = opts.FieldSelector.String()
@@ -195,26 +206,48 @@ func (r *REST) Watch(ctx context.Context, opts *metainternal.ListOptions) (watch
 		}
 	}
 
+	// Emit the initial-events-end bookmark after the initial ADDED events so
+	// client-go reflectors reach HasSynced.
+	bookmarker := registry.NewInitialEventsBookmarker(initialEventsEnd, opts.ResourceVersion, func() runtime.Object {
+		return &corev1alpha1.TenantNamespace{
+			TypeMeta: metav1.TypeMeta{
+				APIVersion: corev1alpha1.SchemeGroupVersion.String(),
+				Kind:       "TenantNamespace",
+			},
+		}
+	})
+
 	events := make(chan watch.Event)
 	pw := watch.NewProxyWatcher(events)
 
 	go func() {
+		// This goroutine is the sole writer to events; closing it on exit
+		// signals end-of-stream to the consumer (ProxyWatcher.Stop does not
+		// close the channel it proxies).
+		defer close(events)
 		defer pw.Stop()
+		defer nsWatch.Stop()
+
+		// send forwards an event, returning false if the watch or context ended.
+		send := func(ev watch.Event) bool {
+			select {
+			case events <- ev:
+				return true
+			case <-pw.StopChan():
+				return false
+			case <-ctx.Done():
+				return false
+			}
+		}
 
 		for ev := range nsWatch.ResultChan() {
 			// Handle bookmark events
 			if ev.Type == watch.Bookmark {
 				if ns, ok := ev.Object.(*corev1.Namespace); ok {
-					out := &corev1alpha1.TenantNamespace{
-						TypeMeta: metav1.TypeMeta{
-							APIVersion: corev1alpha1.SchemeGroupVersion.String(),
-							Kind:       "TenantNamespace",
-						},
-						ObjectMeta: metav1.ObjectMeta{
-							ResourceVersion: ns.ResourceVersion,
-						},
+					bookmark, _ := bookmarker.OnBackingBookmark(ns.ResourceVersion)
+					if !send(bookmark) {
+						return
 					}
-					events <- watch.Event{Type: watch.Bookmark, Object: out}
 				}
 				continue
 			}
@@ -223,6 +256,7 @@ func (r *REST) Watch(ctx context.Context, opts *metainternal.ListOptions) (watch
 			if !ok || !strings.HasPrefix(ns.Name, prefix) {
 				continue
 			}
+			bookmarker.Observe(ns.ResourceVersion)
 
 			// Apply defensive filtering for field and label selectors
 			if opts.FieldSelector != nil {
@@ -274,7 +308,21 @@ func (r *REST) Watch(ctx context.Context, opts *metainternal.ListOptions) (watch
 			}
 			// When startingRV == 0, always send ADDED events (client wants full state)
 
-			events <- watch.Event{Type: ev.Type, Object: out}
+			// Emit the initial-events-end bookmark before the first live event.
+			if bookmark, ok := bookmarker.BeforeLiveEvent(ev.Type); ok {
+				if !send(bookmark) {
+					return
+				}
+			}
+
+			if !send(watch.Event{Type: ev.Type, Object: out}) {
+				return
+			}
+		}
+
+		// Backing watcher closed: flush the terminating bookmark if still pending.
+		if bookmark, ok := bookmarker.OnClose(); ok {
+			send(bookmark)
 		}
 	}()
 
@@ -289,7 +337,7 @@ func (r *REST) ConvertToTable(_ context.Context, obj runtime.Object, _ runtime.O
 	now := time.Now()
 	row := func(o *corev1alpha1.TenantNamespace) metav1.TableRow {
 		return metav1.TableRow{
-			Cells:  []interface{}{o.Name, duration.HumanDuration(now.Sub(o.CreationTimestamp.Time))},
+			Cells:  []any{o.Name, duration.HumanDuration(now.Sub(o.CreationTimestamp.Time))},
 			Object: runtime.RawExtension{Object: o},
 		}
 	}
@@ -394,7 +442,7 @@ func (r *REST) filterAccessible(
 ) ([]string, error) {
 	u, ok := request.UserFrom(ctx)
 	if !ok {
-		return []string{}, fmt.Errorf("user missing in context")
+		return nil, apierrors.NewUnauthorized("user missing in context")
 	}
 	groups := make(map[string]struct{})
 	for _, group := range u.GetGroups() {
@@ -413,7 +461,7 @@ func (r *REST) filterAccessible(
 	rbs := &rbacv1.RoleBindingList{}
 	err := r.c.List(ctx, rbs)
 	if err != nil {
-		return []string{}, fmt.Errorf("failed to list rolebindings: %w", err)
+		return nil, apierrors.NewInternalError(fmt.Errorf("failed to list rolebindings: %w", err))
 	}
 	allowedNameSet := make(map[string]struct{})
 	for i := range rbs.Items {
@@ -448,7 +496,7 @@ func (r *REST) hasAccessToNamespace(
 ) (bool, error) {
 	u, ok := request.UserFrom(ctx)
 	if !ok {
-		return false, fmt.Errorf("user missing in context")
+		return false, apierrors.NewUnauthorized("user missing in context")
 	}
 	groups := make(map[string]struct{})
 	for _, group := range u.GetGroups() {
@@ -477,7 +525,7 @@ func (r *REST) hasAccessToNamespaceForUser(
 	rbs := &rbacv1.RoleBindingList{}
 	err := r.c.List(ctx, rbs, client.InNamespace(namespace))
 	if err != nil {
-		return false, fmt.Errorf("failed to list rolebindings in %s: %w", namespace, err)
+		return false, apierrors.NewInternalError(fmt.Errorf("failed to list rolebindings in %s: %w", namespace, err))
 	}
 
 	// Check if user is in any RoleBinding subjects
diff --git a/pkg/registry/core/tenantnamespace/rest_test.go b/pkg/registry/core/tenantnamespace/rest_test.go
index 52d2a075d0..199edabf26 100644
--- a/pkg/registry/core/tenantnamespace/rest_test.go
+++ b/pkg/registry/core/tenantnamespace/rest_test.go
@@ -4,6 +4,7 @@ package tenantnamespace
 
 import (
 	"context"
+	"errors"
 	"testing"
 
 	corev1 "k8s.io/api/core/v1"
@@ -14,7 +15,9 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apiserver/pkg/authentication/user"
 	"k8s.io/apiserver/pkg/endpoints/request"
+	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
+	"sigs.k8s.io/controller-runtime/pkg/client/interceptor"
 
 	corev1alpha1 "github.com/cozystack/cozystack/pkg/apis/core/v1alpha1"
 )
@@ -267,6 +270,295 @@ func TestHasAccessToNamespace_CozyAdminGroup(t *testing.T) {
 	}
 }
 
+// TestList_FiltersUnauthorizedNamespaces asserts the List path returns only
+// tenant namespaces the user can access: RoleBindings for other users don't
+// grant anything, and multiple matching RoleBindings in one namespace don't
+// duplicate it in the result.
+func TestList_FiltersUnauthorizedNamespaces(t *testing.T) {
+	roleRef := rbacv1.RoleRef{APIGroup: "rbac.authorization.k8s.io", Kind: "Role", Name: "test-role"}
+	client := fake.NewClientBuilder().
+		WithScheme(newTestScheme(t)).
+		WithObjects(
+			&corev1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: "tenant-allowed"}},
+			&corev1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: "tenant-denied"}},
+			&corev1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: "kube-system"}},
+			&rbacv1.RoleBinding{
+				ObjectMeta: metav1.ObjectMeta{Name: "user-binding", Namespace: "tenant-allowed"},
+				Subjects:   []rbacv1.Subject{{Kind: "User", Name: "test-user", APIGroup: "rbac.authorization.k8s.io"}},
+				RoleRef:    roleRef,
+			},
+			&rbacv1.RoleBinding{
+				ObjectMeta: metav1.ObjectMeta{Name: "group-binding", Namespace: "tenant-allowed"},
+				Subjects:   []rbacv1.Subject{{Kind: "Group", Name: "system:authenticated", APIGroup: "rbac.authorization.k8s.io"}},
+				RoleRef:    roleRef,
+			},
+			&rbacv1.RoleBinding{
+				ObjectMeta: metav1.ObjectMeta{Name: "other-binding", Namespace: "tenant-denied"},
+				Subjects:   []rbacv1.Subject{{Kind: "User", Name: "other-user", APIGroup: "rbac.authorization.k8s.io"}},
+				RoleRef:    roleRef,
+			},
+		).
+		Build()
+
+	r := &REST{
+		c:   client,
+		gvr: schema.GroupVersionResource{Group: "core.cozystack.io", Version: "v1alpha1", Resource: "tenantnamespaces"},
+	}
+
+	u := &user.DefaultInfo{Name: "test-user", Groups: []string{"system:authenticated"}}
+	ctx := request.WithUser(context.Background(), u)
+
+	obj, err := r.List(ctx, nil)
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+	list, ok := obj.(*corev1alpha1.TenantNamespaceList)
+	if !ok {
+		t.Fatalf("expected *TenantNamespaceList, got %T", obj)
+	}
+	if len(list.Items) != 1 {
+		t.Fatalf("expected 1 item, got %d: %+v", len(list.Items), list.Items)
+	}
+	if list.Items[0].Name != "tenant-allowed" {
+		t.Errorf("expected tenant-allowed, got %q", list.Items[0].Name)
+	}
+}
+
+// TestList_PrivilegedGroups_SeeAllTenantNamespaces asserts privileged groups
+// get every tenant namespace (and only tenant namespaces) without any
+// RoleBindings, sorted by name.
+func TestList_PrivilegedGroups_SeeAllTenantNamespaces(t *testing.T) {
+	for _, group := range []string{"system:masters", "cozystack-cluster-admin"} {
+		t.Run(group, func(t *testing.T) {
+			client := fake.NewClientBuilder().
+				WithScheme(newTestScheme(t)).
+				WithObjects(
+					&corev1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: "tenant-zebra"}},
+					&corev1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: "tenant-alpha"}},
+					&corev1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: "default"}},
+				).
+				Build()
+
+			r := &REST{
+				c:   client,
+				gvr: schema.GroupVersionResource{Group: "core.cozystack.io", Version: "v1alpha1", Resource: "tenantnamespaces"},
+			}
+
+			u := &user.DefaultInfo{Name: "admin", Groups: []string{group}}
+			ctx := request.WithUser(context.Background(), u)
+
+			obj, err := r.List(ctx, nil)
+			if err != nil {
+				t.Fatalf("unexpected error: %v", err)
+			}
+			list, ok := obj.(*corev1alpha1.TenantNamespaceList)
+			if !ok {
+				t.Fatalf("expected *TenantNamespaceList, got %T", obj)
+			}
+			if len(list.Items) != 2 {
+				t.Fatalf("expected 2 items, got %d: %+v", len(list.Items), list.Items)
+			}
+			for i, want := range []string{"tenant-alpha", "tenant-zebra"} {
+				if list.Items[i].Name != want {
+					t.Errorf("item %d: expected %q, got %q", i, want, list.Items[i].Name)
+				}
+			}
+		})
+	}
+}
+
+// TestList_MissingUser_ReturnsError asserts List fails when no user is in the
+// context instead of returning an unfiltered list.
+func TestList_MissingUser_ReturnsError(t *testing.T) {
+	client := fake.NewClientBuilder().
+		WithScheme(newTestScheme(t)).
+		WithObjects(&corev1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: "tenant-test"}}).
+		Build()
+
+	r := &REST{
+		c:   client,
+		gvr: schema.GroupVersionResource{Group: "core.cozystack.io", Version: "v1alpha1", Resource: "tenantnamespaces"},
+	}
+
+	obj, err := r.List(context.Background(), nil)
+	if err == nil {
+		t.Fatal("expected error for missing user in context, got nil")
+	}
+	if obj != nil {
+		t.Errorf("expected nil list on error, got %+v", obj)
+	}
+}
+
+// TestList_RoleBindingInNonTenantNamespace_Ignored asserts a RoleBinding
+// outside the tenant namespace set grants nothing: filterAccessible
+// intersects RoleBinding namespaces with the tenant name-set.
+func TestList_RoleBindingInNonTenantNamespace_Ignored(t *testing.T) {
+	client := fake.NewClientBuilder().
+		WithScheme(newTestScheme(t)).
+		WithObjects(
+			&corev1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: "tenant-test"}},
+			&corev1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: "default"}},
+			&rbacv1.RoleBinding{
+				ObjectMeta: metav1.ObjectMeta{Name: "default-binding", Namespace: "default"},
+				Subjects:   []rbacv1.Subject{{Kind: "User", Name: "test-user", APIGroup: "rbac.authorization.k8s.io"}},
+				RoleRef:    rbacv1.RoleRef{APIGroup: "rbac.authorization.k8s.io", Kind: "Role", Name: "test-role"},
+			},
+		).
+		Build()
+
+	r := &REST{
+		c:   client,
+		gvr: schema.GroupVersionResource{Group: "core.cozystack.io", Version: "v1alpha1", Resource: "tenantnamespaces"},
+	}
+
+	u := &user.DefaultInfo{Name: "test-user", Groups: []string{"system:authenticated"}}
+	ctx := request.WithUser(context.Background(), u)
+
+	obj, err := r.List(ctx, nil)
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+	list, ok := obj.(*corev1alpha1.TenantNamespaceList)
+	if !ok {
+		t.Fatalf("expected *TenantNamespaceList, got %T", obj)
+	}
+	if len(list.Items) != 0 {
+		t.Errorf("expected empty list, got %+v", list.Items)
+	}
+}
+
+// TestList_NamespaceListError_Propagates asserts a failure to list namespaces
+// is returned to the caller.
+func TestList_NamespaceListError_Propagates(t *testing.T) {
+	wantErr := errors.New("namespace list failed")
+	fc := fake.NewClientBuilder().
+		WithScheme(newTestScheme(t)).
+		WithInterceptorFuncs(interceptor.Funcs{
+			List: func(ctx context.Context, c client.WithWatch, list client.ObjectList, opts ...client.ListOption) error {
+				if _, ok := list.(*corev1.NamespaceList); ok {
+					return wantErr
+				}
+				return c.List(ctx, list, opts...)
+			},
+		}).
+		Build()
+
+	r := &REST{
+		c:   fc,
+		gvr: schema.GroupVersionResource{Group: "core.cozystack.io", Version: "v1alpha1", Resource: "tenantnamespaces"},
+	}
+
+	u := &user.DefaultInfo{Name: "test-user", Groups: []string{"system:authenticated"}}
+	ctx := request.WithUser(context.Background(), u)
+
+	if _, err := r.List(ctx, nil); !errors.Is(err, wantErr) {
+		t.Fatalf("expected %v, got %v", wantErr, err)
+	}
+}
+
+// TestList_RoleBindingListError_Propagates asserts a failure to list
+// RoleBindings during access filtering fails the List with a typed
+// InternalError instead of returning an unfiltered or silently truncated
+// result.
+func TestList_RoleBindingListError_Propagates(t *testing.T) {
+	wantErr := errors.New("rolebinding list failed")
+	fc := fake.NewClientBuilder().
+		WithScheme(newTestScheme(t)).
+		WithObjects(&corev1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: "tenant-test"}}).
+		WithInterceptorFuncs(interceptor.Funcs{
+			List: func(ctx context.Context, c client.WithWatch, list client.ObjectList, opts ...client.ListOption) error {
+				if _, ok := list.(*rbacv1.RoleBindingList); ok {
+					return wantErr
+				}
+				return c.List(ctx, list, opts...)
+			},
+		}).
+		Build()
+
+	r := &REST{
+		c:   fc,
+		gvr: schema.GroupVersionResource{Group: "core.cozystack.io", Version: "v1alpha1", Resource: "tenantnamespaces"},
+	}
+
+	u := &user.DefaultInfo{Name: "test-user", Groups: []string{"system:authenticated"}}
+	ctx := request.WithUser(context.Background(), u)
+
+	_, err := r.List(ctx, nil)
+	if err == nil {
+		t.Fatal("expected error, got nil")
+	}
+	if !apierrors.IsInternalError(err) {
+		t.Fatalf("expected InternalError, got %v", err)
+	}
+}
+
+// TestGet_MissingUser_ReturnsError asserts Get fails when no user is in the
+// context.
+func TestGet_MissingUser_ReturnsError(t *testing.T) {
+	client := fake.NewClientBuilder().
+		WithScheme(newTestScheme(t)).
+		WithObjects(&corev1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: "tenant-test"}}).
+		Build()
+
+	r := &REST{
+		c:   client,
+		gvr: schema.GroupVersionResource{Group: "core.cozystack.io", Version: "v1alpha1", Resource: "tenantnamespaces"},
+	}
+
+	if _, err := r.Get(context.Background(), "tenant-test", &metav1.GetOptions{}); err == nil {
+		t.Fatal("expected error for missing user in context, got nil")
+	}
+}
+
+// TestGet_NamespaceNotFound asserts the backing Get error surfaces when the
+// namespace disappears after the access check passes.
+func TestGet_NamespaceNotFound(t *testing.T) {
+	client := fake.NewClientBuilder().WithScheme(newTestScheme(t)).Build()
+
+	r := &REST{
+		c:   client,
+		gvr: schema.GroupVersionResource{Group: "core.cozystack.io", Version: "v1alpha1", Resource: "tenantnamespaces"},
+	}
+
+	u := &user.DefaultInfo{Name: "admin", Groups: []string{"system:masters"}}
+	ctx := request.WithUser(context.Background(), u)
+
+	_, err := r.Get(ctx, "tenant-missing", &metav1.GetOptions{})
+	if err == nil {
+		t.Fatal("expected error, got nil")
+	}
+	if !apierrors.IsNotFound(err) {
+		t.Fatalf("expected NotFound, got %v", err)
+	}
+}
+
+// TestMatchesSubject_UnknownKind asserts unknown subject kinds never match.
+func TestMatchesSubject_UnknownKind(t *testing.T) {
+	subj := rbacv1.Subject{Kind: "UnknownKind", Name: "test-user"}
+	if matchesSubject(subj, "tenant-test", "test-user", map[string]struct{}{}) {
+		t.Error("expected unknown subject kind not to match")
+	}
+}
+
+func TestHasAccessToNamespace_MissingUser(t *testing.T) {
+	client := fake.NewClientBuilder().
+		WithScheme(newTestScheme(t)).
+		Build()
+
+	r := &REST{
+		c:   client,
+		gvr: schema.GroupVersionResource{Group: "core.cozystack.io", Version: "v1alpha1", Resource: "tenantnamespaces"},
+	}
+
+	hasAccess, err := r.hasAccessToNamespace(context.Background(), "tenant-test")
+	if err == nil {
+		t.Fatal("expected error for missing user in context, got nil")
+	}
+	if hasAccess {
+		t.Error("expected no access when user is missing in context")
+	}
+}
+
 func TestHasAccessToNamespace_ServiceAccount(t *testing.T) {
 	scheme := runtime.NewScheme()
 	_ = corev1.AddToScheme(scheme)
@@ -511,3 +803,263 @@ func TestGet_NonTenantNamespace(t *testing.T) {
 		t.Errorf("expected NotFound error, got %v", err)
 	}
 }
+
+// Typed-error tests: helpers must return apierrors so the apiserver maps
+// failures to accurate status codes instead of coercing everything to 500.
+
+// newRoleBindingListErrorClient returns a fake client whose List fails for
+// RoleBindingList only, simulating an RBAC listing outage.
+func newRoleBindingListErrorClient(scheme *runtime.Scheme, listErr error, objs ...client.Object) client.Client {
+	return fake.NewClientBuilder().
+		WithScheme(scheme).
+		WithObjects(objs...).
+		WithInterceptorFuncs(interceptor.Funcs{
+			List: func(ctx context.Context, c client.WithWatch, list client.ObjectList, opts ...client.ListOption) error {
+				if _, ok := list.(*rbacv1.RoleBindingList); ok {
+					return listErr
+				}
+				return c.List(ctx, list, opts...)
+			},
+		}).
+		Build()
+}
+
+func TestHasAccessToNamespace_NoUserInContext(t *testing.T) {
+	scheme := runtime.NewScheme()
+	_ = corev1.AddToScheme(scheme)
+	_ = rbacv1.AddToScheme(scheme)
+
+	c := fake.NewClientBuilder().WithScheme(scheme).Build()
+
+	r := &REST{
+		c:   c,
+		gvr: schema.GroupVersionResource{Group: "core.cozystack.io", Version: "v1alpha1", Resource: "tenantnamespaces"},
+	}
+
+	_, err := r.hasAccessToNamespace(context.Background(), "tenant-test")
+	if err == nil {
+		t.Fatal("expected error, got nil")
+	}
+	if !apierrors.IsUnauthorized(err) {
+		t.Errorf("expected Unauthorized error, got %v", err)
+	}
+}
+
+func TestHasAccessToNamespace_RoleBindingListError(t *testing.T) {
+	scheme := runtime.NewScheme()
+	_ = corev1.AddToScheme(scheme)
+	_ = rbacv1.AddToScheme(scheme)
+
+	c := newRoleBindingListErrorClient(scheme, errors.New("etcd is on fire"))
+
+	r := &REST{
+		c:   c,
+		gvr: schema.GroupVersionResource{Group: "core.cozystack.io", Version: "v1alpha1", Resource: "tenantnamespaces"},
+	}
+
+	u := &user.DefaultInfo{
+		Name:   "test-user",
+		Groups: []string{"system:authenticated"},
+	}
+	ctx := request.WithUser(context.Background(), u)
+
+	_, err := r.hasAccessToNamespace(ctx, "tenant-test")
+	if err == nil {
+		t.Fatal("expected error, got nil")
+	}
+	if !apierrors.IsInternalError(err) {
+		t.Errorf("expected InternalError, got %v", err)
+	}
+	var statusErr *apierrors.StatusError
+	if !errors.As(err, &statusErr) {
+		t.Fatalf("expected *apierrors.StatusError, got %T", err)
+	}
+	if statusErr.Status().Code != 500 {
+		t.Errorf("expected status code 500, got %d", statusErr.Status().Code)
+	}
+}
+
+func TestFilterAccessible_NoUserInContext(t *testing.T) {
+	scheme := runtime.NewScheme()
+	_ = corev1.AddToScheme(scheme)
+	_ = rbacv1.AddToScheme(scheme)
+
+	c := fake.NewClientBuilder().WithScheme(scheme).Build()
+
+	r := &REST{
+		c:   c,
+		gvr: schema.GroupVersionResource{Group: "core.cozystack.io", Version: "v1alpha1", Resource: "tenantnamespaces"},
+	}
+
+	_, err := r.filterAccessible(context.Background(), []string{"tenant-test"})
+	if err == nil {
+		t.Fatal("expected error, got nil")
+	}
+	if !apierrors.IsUnauthorized(err) {
+		t.Errorf("expected Unauthorized error, got %v", err)
+	}
+}
+
+func TestFilterAccessible_RoleBindingListError(t *testing.T) {
+	scheme := runtime.NewScheme()
+	_ = corev1.AddToScheme(scheme)
+	_ = rbacv1.AddToScheme(scheme)
+
+	c := newRoleBindingListErrorClient(scheme, errors.New("etcd is on fire"))
+
+	r := &REST{
+		c:   c,
+		gvr: schema.GroupVersionResource{Group: "core.cozystack.io", Version: "v1alpha1", Resource: "tenantnamespaces"},
+	}
+
+	u := &user.DefaultInfo{
+		Name:   "test-user",
+		Groups: []string{"system:authenticated"},
+	}
+	ctx := request.WithUser(context.Background(), u)
+
+	_, err := r.filterAccessible(ctx, []string{"tenant-test"})
+	if err == nil {
+		t.Fatal("expected error, got nil")
+	}
+	if !apierrors.IsInternalError(err) {
+		t.Errorf("expected InternalError, got %v", err)
+	}
+}
+
+func TestGet_NotFoundReportsTenantNamespaceResource(t *testing.T) {
+	scheme := runtime.NewScheme()
+	_ = corev1.AddToScheme(scheme)
+	_ = rbacv1.AddToScheme(scheme)
+
+	c := fake.NewClientBuilder().WithScheme(scheme).Build()
+
+	r := &REST{
+		c:   c,
+		gvr: schema.GroupVersionResource{Group: "core.cozystack.io", Version: "v1alpha1", Resource: "tenantnamespaces"},
+	}
+
+	u := &user.DefaultInfo{
+		Name:   "admin-user",
+		Groups: []string{"system:masters"},
+	}
+	ctx := request.WithUser(context.Background(), u)
+
+	_, err := r.Get(ctx, "tenant-missing", &metav1.GetOptions{})
+	if err == nil {
+		t.Fatal("expected error, got nil")
+	}
+	if !apierrors.IsNotFound(err) {
+		t.Fatalf("expected NotFound error, got %v", err)
+	}
+	var statusErr *apierrors.StatusError
+	if !errors.As(err, &statusErr) {
+		t.Fatalf("expected *apierrors.StatusError, got %T", err)
+	}
+	details := statusErr.Status().Details
+	if details == nil {
+		t.Fatal("expected status details, got nil")
+	}
+	if details.Group != "core.cozystack.io" || details.Kind != "tenantnamespaces" {
+		t.Errorf("expected NotFound for core.cozystack.io/tenantnamespaces, got %s/%s", details.Group, details.Kind)
+	}
+}
+
+func TestList_RoleBindingListError(t *testing.T) {
+	scheme := runtime.NewScheme()
+	_ = corev1.AddToScheme(scheme)
+	_ = rbacv1.AddToScheme(scheme)
+
+	ns := &corev1.Namespace{
+		ObjectMeta: metav1.ObjectMeta{Name: "tenant-test"},
+	}
+
+	c := newRoleBindingListErrorClient(scheme, errors.New("etcd is on fire"), ns)
+
+	r := &REST{
+		c:   c,
+		gvr: schema.GroupVersionResource{Group: "core.cozystack.io", Version: "v1alpha1", Resource: "tenantnamespaces"},
+	}
+
+	u := &user.DefaultInfo{
+		Name:   "test-user",
+		Groups: []string{"system:authenticated"},
+	}
+	ctx := request.WithUser(context.Background(), u)
+
+	obj, err := r.List(ctx, nil)
+	if err == nil {
+		t.Fatal("expected error, got nil")
+	}
+	if obj != nil {
+		t.Errorf("expected nil object, got %v", obj)
+	}
+	if !apierrors.IsInternalError(err) {
+		t.Errorf("expected InternalError, got %v", err)
+	}
+}
+
+func TestGet_NoUserInContext(t *testing.T) {
+	scheme := runtime.NewScheme()
+	_ = corev1.AddToScheme(scheme)
+	_ = rbacv1.AddToScheme(scheme)
+
+	ns := &corev1.Namespace{
+		ObjectMeta: metav1.ObjectMeta{Name: "tenant-test"},
+	}
+
+	c := fake.NewClientBuilder().
+		WithScheme(scheme).
+		WithObjects(ns).
+		Build()
+
+	r := &REST{
+		c:   c,
+		gvr: schema.GroupVersionResource{Group: "core.cozystack.io", Version: "v1alpha1", Resource: "tenantnamespaces"},
+	}
+
+	obj, err := r.Get(context.Background(), "tenant-test", &metav1.GetOptions{})
+	if err == nil {
+		t.Fatal("expected error, got nil")
+	}
+	if obj != nil {
+		t.Errorf("expected nil object, got %v", obj)
+	}
+	if !apierrors.IsUnauthorized(err) {
+		t.Errorf("expected Unauthorized error, got %v", err)
+	}
+}
+
+func TestGet_RoleBindingListError(t *testing.T) {
+	scheme := runtime.NewScheme()
+	_ = corev1.AddToScheme(scheme)
+	_ = rbacv1.AddToScheme(scheme)
+
+	ns := &corev1.Namespace{
+		ObjectMeta: metav1.ObjectMeta{Name: "tenant-test"},
+	}
+
+	c := newRoleBindingListErrorClient(scheme, errors.New("etcd is on fire"), ns)
+
+	r := &REST{
+		c:   c,
+		gvr: schema.GroupVersionResource{Group: "core.cozystack.io", Version: "v1alpha1", Resource: "tenantnamespaces"},
+	}
+
+	u := &user.DefaultInfo{
+		Name:   "test-user",
+		Groups: []string{"system:authenticated"},
+	}
+	ctx := request.WithUser(context.Background(), u)
+
+	obj, err := r.Get(ctx, "tenant-test", &metav1.GetOptions{})
+	if err == nil {
+		t.Fatal("expected error, got nil")
+	}
+	if obj != nil {
+		t.Errorf("expected nil object, got %v", obj)
+	}
+	if !apierrors.IsInternalError(err) {
+		t.Errorf("expected InternalError, got %v", err)
+	}
+}
diff --git a/pkg/registry/core/tenantnamespace/rest_watch_test.go b/pkg/registry/core/tenantnamespace/rest_watch_test.go
new file mode 100644
index 0000000000..b4e24ceed9
--- /dev/null
+++ b/pkg/registry/core/tenantnamespace/rest_watch_test.go
@@ -0,0 +1,821 @@
+// SPDX-License-Identifier: Apache-2.0
+
+package tenantnamespace
+
+import (
+	"context"
+	"errors"
+	"testing"
+	"time"
+
+	corev1 "k8s.io/api/core/v1"
+	rbacv1 "k8s.io/api/rbac/v1"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	metainternal "k8s.io/apimachinery/pkg/apis/meta/internalversion"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/fields"
+	"k8s.io/apimachinery/pkg/labels"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apimachinery/pkg/watch"
+	"k8s.io/apiserver/pkg/authentication/user"
+	"k8s.io/apiserver/pkg/endpoints/request"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/client/fake"
+	"sigs.k8s.io/controller-runtime/pkg/client/interceptor"
+
+	corev1alpha1 "github.com/cozystack/cozystack/pkg/apis/core/v1alpha1"
+	"github.com/cozystack/cozystack/pkg/registry/registrytest"
+)
+
+// newTestScheme returns a scheme with the types Watch tests need: core
+// (namespaces drive the watch) and rbac (RoleBindings drive the access check).
+func newTestScheme(t *testing.T) *runtime.Scheme {
+	t.Helper()
+	scheme := runtime.NewScheme()
+	if err := corev1.AddToScheme(scheme); err != nil {
+		t.Fatalf("add corev1 to scheme: %v", err)
+	}
+	if err := rbacv1.AddToScheme(scheme); err != nil {
+		t.Fatalf("add rbacv1 to scheme: %v", err)
+	}
+	return scheme
+}
+
+func newTestREST(c client.Client, w client.WithWatch) *REST {
+	return &REST{
+		c: c,
+		w: w,
+		gvr: schema.GroupVersionResource{
+			Group:    corev1alpha1.GroupName,
+			Version:  "v1alpha1",
+			Resource: "tenantnamespaces",
+		},
+	}
+}
+
+// stubWithWatch backs REST.Watch with a test-owned FakeWatcher so tests can
+// inject arbitrary backing events (bookmarks, foreign object types, chosen
+// resourceVersions) that the controller-runtime fake client never produces.
+// All other client calls fall through to the embedded fake client.
+type stubWithWatch struct {
+	client.WithWatch
+	fw  *watch.FakeWatcher
+	err error
+}
+
+// Watch ignores ListOptions entirely: selector propagation cannot be asserted
+// through this stub, only through the real fake client.
+func (s *stubWithWatch) Watch(_ context.Context, _ client.ObjectList, _ ...client.ListOption) (watch.Interface, error) {
+	if s.err != nil {
+		return nil, s.err
+	}
+	return s.fw, nil
+}
+
+func userRoleBinding(namespace, username string) *rbacv1.RoleBinding {
+	return &rbacv1.RoleBinding{
+		ObjectMeta: metav1.ObjectMeta{Name: "test-binding", Namespace: namespace},
+		Subjects: []rbacv1.Subject{
+			{Kind: "User", Name: username, APIGroup: "rbac.authorization.k8s.io"},
+		},
+		RoleRef: rbacv1.RoleRef{
+			APIGroup: "rbac.authorization.k8s.io",
+			Kind:     "Role",
+			Name:     "test-role",
+		},
+	}
+}
+
+// requireTenantNamespaceEvent asserts the event has the given type and carries
+// a *TenantNamespace with the given name.
+func requireTenantNamespaceEvent(t *testing.T, ev watch.Event, evType watch.EventType, name string) *corev1alpha1.TenantNamespace {
+	t.Helper()
+	if ev.Type != evType {
+		t.Fatalf("expected event type %s, got %s (%+v)", evType, ev.Type, ev)
+	}
+	tn, ok := ev.Object.(*corev1alpha1.TenantNamespace)
+	if !ok {
+		t.Fatalf("expected *TenantNamespace, got %T", ev.Object)
+	}
+	if tn.Name != name {
+		t.Fatalf("expected namespace %q, got %q", name, tn.Name)
+	}
+	return tn
+}
+
+// waitForFakeWatcherStop polls until the filtering goroutine stops the
+// backing watcher (via its deferred Stop) or the timeout fires.
+func waitForFakeWatcherStop(t *testing.T, fw *watch.FakeWatcher, timeout time.Duration) {
+	t.Helper()
+	deadline := time.Now().Add(timeout)
+	for !fw.IsStopped() {
+		if time.Now().After(deadline) {
+			t.Fatal("timed out waiting for the goroutine to stop the backing watcher")
+		}
+		time.Sleep(10 * time.Millisecond)
+	}
+}
+
+// requireResultChanClosed asserts the watch result channel closes within the
+// timeout without delivering any further events.
+func requireResultChanClosed(t *testing.T, w watch.Interface, timeout time.Duration) {
+	t.Helper()
+	deadline := time.NewTimer(timeout)
+	defer deadline.Stop()
+	select {
+	case ev, open := <-w.ResultChan():
+		if open {
+			t.Fatalf("expected result channel to close, got event %+v", ev)
+		}
+	case <-deadline.C:
+		t.Fatal("timed out waiting for the result channel to close")
+	}
+}
+
+// collectEvents drains up to n events from the watch, or returns early if the
+// channel closes or the timeout fires.
+func collectEvents(t *testing.T, w watch.Interface, n int, timeout time.Duration) []watch.Event {
+	t.Helper()
+	out := make([]watch.Event, 0, n)
+	deadline := time.NewTimer(timeout)
+	defer deadline.Stop()
+	for len(out) < n {
+		select {
+		case ev, ok := <-w.ResultChan():
+			if !ok {
+				return out
+			}
+			out = append(out, ev)
+		case <-deadline.C:
+			return out
+		}
+	}
+	return out
+}
+
+// TestWatch_SendInitialEvents_EmitsInitialEventsEndBookmark asserts the
+// WatchList contract for TenantNamespace: ADDED events, then a bookmark
+// annotated with k8s.io/initial-events-end, then live events.
+//
+// The user is in system:masters so the access check passes without RBAC
+// fixtures. fake.Client.Watch doesn't replay existing objects as ADDED, so the
+// namespace is created after the watch starts and then mutated to drive a live
+// event.
+func TestWatch_SendInitialEvents_EmitsInitialEventsEndBookmark(t *testing.T) {
+	fc := fake.NewClientBuilder().WithScheme(newTestScheme(t)).Build()
+	r := newTestREST(fc, fc)
+
+	u := &user.DefaultInfo{Name: "admin", Groups: []string{"system:masters"}}
+	ctx, cancel := context.WithCancel(request.WithUser(context.Background(), u))
+	defer cancel()
+
+	sendInitialEvents := true
+	w, err := r.Watch(ctx, &metainternal.ListOptions{SendInitialEvents: &sendInitialEvents, AllowWatchBookmarks: true})
+	if err != nil {
+		t.Fatalf("Watch returned error: %v", err)
+	}
+	defer w.Stop()
+
+	ns := &corev1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: "tenant-foo"}}
+	if err := r.c.Create(ctx, ns); err != nil {
+		t.Fatalf("create namespace: %v", err)
+	}
+	ns.Labels = map[string]string{"touched": "1"}
+	if err := r.c.Update(ctx, ns); err != nil {
+		t.Fatalf("update namespace: %v", err)
+	}
+
+	evs := collectEvents(t, w, 3, 2*time.Second)
+	if len(evs) < 3 {
+		t.Fatalf("expected at least 3 events (Added, Bookmark, Modified), got %d: %+v", len(evs), evs)
+	}
+
+	if evs[0].Type != watch.Added {
+		t.Fatalf("event[0]: expected Added, got %s", evs[0].Type)
+	}
+	added, ok := evs[0].Object.(*corev1alpha1.TenantNamespace)
+	if !ok {
+		t.Fatalf("event[0]: expected *TenantNamespace, got %T", evs[0].Object)
+	}
+	if added.Name != "tenant-foo" {
+		t.Fatalf("event[0]: expected name tenant-foo, got %q", added.Name)
+	}
+
+	if evs[1].Type != watch.Bookmark {
+		t.Fatalf("event[1]: expected Bookmark, got %s", evs[1].Type)
+	}
+	bookmark, ok := evs[1].Object.(*corev1alpha1.TenantNamespace)
+	if !ok {
+		t.Fatalf("event[1]: expected *TenantNamespace, got %T", evs[1].Object)
+	}
+	if got := bookmark.Annotations[metav1.InitialEventsAnnotationKey]; got != "true" {
+		t.Fatalf("event[1]: expected annotation %s=true, got %q", metav1.InitialEventsAnnotationKey, got)
+	}
+	if bookmark.ResourceVersion == "" {
+		t.Fatal("event[1]: expected non-empty resourceVersion on bookmark")
+	}
+
+	if evs[2].Type != watch.Modified {
+		t.Fatalf("event[2]: expected Modified after bookmark, got %s", evs[2].Type)
+	}
+}
+
+// TestWatch_BackingBookmarksFollowTheClient pins that the backing watch asks for
+// bookmarks only when the client did: every backing bookmark is forwarded, and
+// the fake client never sends one, so the event stream alone cannot show it.
+func TestWatch_BackingBookmarksFollowTheClient(t *testing.T) {
+	yes := true
+	for _, tc := range []struct {
+		name string
+		opts metainternal.ListOptions
+		want bool
+	}{
+		{"plain watch defaulted by the apiserver", metainternal.ListOptions{SendInitialEvents: &yes}, false},
+		{"watch list", metainternal.ListOptions{SendInitialEvents: &yes, AllowWatchBookmarks: true}, true},
+		{"bookmarks only", metainternal.ListOptions{AllowWatchBookmarks: true}, true},
+	} {
+		t.Run(tc.name, func(t *testing.T) {
+			fc := fake.NewClientBuilder().WithScheme(newTestScheme(t)).Build()
+			spy := &registrytest.RawRecordingWatch{WithWatch: fc}
+			r := newTestREST(fc, spy)
+
+			u := &user.DefaultInfo{Name: "admin", Groups: []string{"system:masters"}}
+			ctx, cancel := context.WithCancel(request.WithUser(context.Background(), u))
+			defer cancel()
+
+			w, err := r.Watch(ctx, &tc.opts)
+			if err != nil {
+				t.Fatalf("Watch returned error: %v", err)
+			}
+			defer w.Stop()
+
+			raw := spy.RawFor(&corev1.NamespaceList{})
+			if raw == nil {
+				t.Fatal("backing watch was called without raw options")
+			}
+			if raw.AllowWatchBookmarks != tc.want {
+				t.Fatalf("backing AllowWatchBookmarks = %v, want %v", raw.AllowWatchBookmarks, tc.want)
+			}
+		})
+	}
+}
+
+// TestWatch_PlainWatch_EmitsNoInitialEventsEndBookmark covers a watch with no
+// resourceVersion: the apiserver defaults SendInitialEvents on for it but leaves
+// bookmarks off, so the client never asked for the terminating bookmark.
+func TestWatch_PlainWatch_EmitsNoInitialEventsEndBookmark(t *testing.T) {
+	fc := fake.NewClientBuilder().WithScheme(newTestScheme(t)).Build()
+	r := newTestREST(fc, fc)
+
+	u := &user.DefaultInfo{Name: "admin", Groups: []string{"system:masters"}}
+	ctx, cancel := context.WithCancel(request.WithUser(context.Background(), u))
+	defer cancel()
+
+	sendInitialEvents := true
+	w, err := r.Watch(ctx, &metainternal.ListOptions{SendInitialEvents: &sendInitialEvents})
+	if err != nil {
+		t.Fatalf("Watch returned error: %v", err)
+	}
+	defer w.Stop()
+
+	ns := &corev1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: "tenant-foo"}}
+	if err := r.c.Create(ctx, ns); err != nil {
+		t.Fatalf("create namespace: %v", err)
+	}
+	ns.Labels = map[string]string{"touched": "1"}
+	if err := r.c.Update(ctx, ns); err != nil {
+		t.Fatalf("update namespace: %v", err)
+	}
+
+	evs := collectEvents(t, w, 3, 2*time.Second)
+	var types []watch.EventType
+	for _, ev := range evs {
+		types = append(types, ev.Type)
+		if ev.Type == watch.Bookmark {
+			t.Fatalf("unrequested bookmark on a plain watch: %+v", ev.Object)
+		}
+	}
+	if len(types) != 2 || types[0] != watch.Added || types[1] != watch.Modified {
+		t.Fatalf("expected [ADDED MODIFIED], got %v", types)
+	}
+}
+
+// The dropped-event assertions below rely on the watch pipeline being FIFO: a
+// dropped backing event always precedes the next delivered one, so when the
+// first event a test receives is the later fixture, the earlier one was
+// provably filtered rather than still in flight.
+
+// TestWatch_FiltersUnauthorizedNamespaceEvents asserts the per-event access
+// check: with a RoleBinding in only one of two tenant namespaces, ADD/MODIFY/
+// DELETE events for the other never reach the client.
+func TestWatch_FiltersUnauthorizedNamespaceEvents(t *testing.T) {
+	scheme := newTestScheme(t)
+	fc := fake.NewClientBuilder().
+		WithScheme(scheme).
+		WithObjects(userRoleBinding("tenant-allowed", "test-user")).
+		Build()
+	r := newTestREST(fc, fc)
+
+	u := &user.DefaultInfo{Name: "test-user", Groups: []string{"system:authenticated"}}
+	ctx, cancel := context.WithCancel(request.WithUser(context.Background(), u))
+	defer cancel()
+
+	w, err := r.Watch(ctx, &metainternal.ListOptions{})
+	if err != nil {
+		t.Fatalf("Watch returned error: %v", err)
+	}
+	defer w.Stop()
+
+	denied := &corev1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: "tenant-denied"}}
+	allowed := &corev1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: "tenant-allowed"}}
+	// Interleave so every authorized event is preceded by an unauthorized one.
+	for _, ns := range []*corev1.Namespace{denied, allowed} {
+		if err := fc.Create(ctx, ns); err != nil {
+			t.Fatalf("create %s: %v", ns.Name, err)
+		}
+	}
+	for _, ns := range []*corev1.Namespace{denied, allowed} {
+		ns.Labels = map[string]string{"touched": "1"}
+		if err := fc.Update(ctx, ns); err != nil {
+			t.Fatalf("update %s: %v", ns.Name, err)
+		}
+	}
+	for _, ns := range []*corev1.Namespace{denied, allowed} {
+		if err := fc.Delete(ctx, ns); err != nil {
+			t.Fatalf("delete %s: %v", ns.Name, err)
+		}
+	}
+
+	evs := collectEvents(t, w, 3, 2*time.Second)
+	if len(evs) != 3 {
+		t.Fatalf("expected 3 events for tenant-allowed, got %d: %+v", len(evs), evs)
+	}
+	requireTenantNamespaceEvent(t, evs[0], watch.Added, "tenant-allowed")
+	requireTenantNamespaceEvent(t, evs[1], watch.Modified, "tenant-allowed")
+	requireTenantNamespaceEvent(t, evs[2], watch.Deleted, "tenant-allowed")
+}
+
+// TestWatch_PrivilegedGroups_SeeEverything asserts that members of the
+// privileged groups receive events for every tenant namespace without any
+// RoleBinding fixtures.
+func TestWatch_PrivilegedGroups_SeeEverything(t *testing.T) {
+	for _, group := range []string{"system:masters", "cozystack-cluster-admin"} {
+		t.Run(group, func(t *testing.T) {
+			fc := fake.NewClientBuilder().WithScheme(newTestScheme(t)).Build()
+			r := newTestREST(fc, fc)
+
+			u := &user.DefaultInfo{Name: "admin", Groups: []string{group}}
+			ctx, cancel := context.WithCancel(request.WithUser(context.Background(), u))
+			defer cancel()
+
+			w, err := r.Watch(ctx, &metainternal.ListOptions{})
+			if err != nil {
+				t.Fatalf("Watch returned error: %v", err)
+			}
+			defer w.Stop()
+
+			for _, name := range []string{"tenant-a", "tenant-b"} {
+				ns := &corev1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: name}}
+				if err := fc.Create(ctx, ns); err != nil {
+					t.Fatalf("create %s: %v", name, err)
+				}
+			}
+
+			evs := collectEvents(t, w, 2, 2*time.Second)
+			if len(evs) != 2 {
+				t.Fatalf("expected 2 events, got %d: %+v", len(evs), evs)
+			}
+			requireTenantNamespaceEvent(t, evs[0], watch.Added, "tenant-a")
+			requireTenantNamespaceEvent(t, evs[1], watch.Added, "tenant-b")
+		})
+	}
+}
+
+// TestWatch_DropsNonTenantNamespaces asserts that events for namespaces
+// without the tenant- prefix are dropped even for privileged users.
+func TestWatch_DropsNonTenantNamespaces(t *testing.T) {
+	fc := fake.NewClientBuilder().WithScheme(newTestScheme(t)).Build()
+	r := newTestREST(fc, fc)
+
+	u := &user.DefaultInfo{Name: "admin", Groups: []string{"system:masters"}}
+	ctx, cancel := context.WithCancel(request.WithUser(context.Background(), u))
+	defer cancel()
+
+	w, err := r.Watch(ctx, &metainternal.ListOptions{})
+	if err != nil {
+		t.Fatalf("Watch returned error: %v", err)
+	}
+	defer w.Stop()
+
+	for _, name := range []string{"kube-whatever", "tenant-foo"} {
+		ns := &corev1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: name}}
+		if err := fc.Create(ctx, ns); err != nil {
+			t.Fatalf("create %s: %v", name, err)
+		}
+	}
+
+	evs := collectEvents(t, w, 1, 2*time.Second)
+	if len(evs) != 1 {
+		t.Fatalf("expected 1 event, got %d: %+v", len(evs), evs)
+	}
+	requireTenantNamespaceEvent(t, evs[0], watch.Added, "tenant-foo")
+}
+
+// TestWatch_DropsNonNamespaceObjects asserts that backing events carrying an
+// object that is not a *corev1.Namespace are dropped.
+func TestWatch_DropsNonNamespaceObjects(t *testing.T) {
+	fc := fake.NewClientBuilder().WithScheme(newTestScheme(t)).Build()
+	fw := watch.NewFake()
+	r := newTestREST(fc, &stubWithWatch{WithWatch: fc, fw: fw})
+
+	u := &user.DefaultInfo{Name: "admin", Groups: []string{"system:masters"}}
+	ctx, cancel := context.WithCancel(request.WithUser(context.Background(), u))
+	defer cancel()
+
+	w, err := r.Watch(ctx, &metainternal.ListOptions{})
+	if err != nil {
+		t.Fatalf("Watch returned error: %v", err)
+	}
+	defer w.Stop()
+
+	fw.Action(watch.Added, &corev1.ConfigMap{ObjectMeta: metav1.ObjectMeta{Name: "not-a-namespace"}})
+	fw.Add(&corev1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: "tenant-foo"}})
+
+	evs := collectEvents(t, w, 1, 2*time.Second)
+	if len(evs) != 1 {
+		t.Fatalf("expected 1 event, got %d: %+v", len(evs), evs)
+	}
+	requireTenantNamespaceEvent(t, evs[0], watch.Added, "tenant-foo")
+}
+
+// TestWatch_ForwardsBackingBookmarks asserts that a bookmark from the backing
+// watch is forwarded as a TenantNamespace bookmark carrying the backing
+// resourceVersion. Without SendInitialEvents it must not be annotated as the
+// initial-events-end marker.
+func TestWatch_ForwardsBackingBookmarks(t *testing.T) {
+	fc := fake.NewClientBuilder().WithScheme(newTestScheme(t)).Build()
+	fw := watch.NewFake()
+	r := newTestREST(fc, &stubWithWatch{WithWatch: fc, fw: fw})
+
+	u := &user.DefaultInfo{Name: "admin", Groups: []string{"system:masters"}}
+	ctx, cancel := context.WithCancel(request.WithUser(context.Background(), u))
+	defer cancel()
+
+	w, err := r.Watch(ctx, &metainternal.ListOptions{})
+	if err != nil {
+		t.Fatalf("Watch returned error: %v", err)
+	}
+	defer w.Stop()
+
+	// A bookmark carrying a non-Namespace object must be dropped, not forwarded.
+	fw.Action(watch.Bookmark, &corev1.ConfigMap{ObjectMeta: metav1.ObjectMeta{ResourceVersion: "41"}})
+	fw.Action(watch.Bookmark, &corev1.Namespace{ObjectMeta: metav1.ObjectMeta{ResourceVersion: "42"}})
+
+	evs := collectEvents(t, w, 1, 2*time.Second)
+	if len(evs) != 1 {
+		t.Fatalf("expected 1 event, got %d: %+v", len(evs), evs)
+	}
+	if evs[0].Type != watch.Bookmark {
+		t.Fatalf("expected Bookmark, got %s", evs[0].Type)
+	}
+	bookmark, ok := evs[0].Object.(*corev1alpha1.TenantNamespace)
+	if !ok {
+		t.Fatalf("expected *TenantNamespace, got %T", evs[0].Object)
+	}
+	if bookmark.Kind != "TenantNamespace" {
+		t.Errorf("expected kind TenantNamespace, got %q", bookmark.Kind)
+	}
+	if bookmark.ResourceVersion != "42" {
+		t.Errorf("expected resourceVersion 42, got %q", bookmark.ResourceVersion)
+	}
+	if _, ok := bookmark.Annotations[metav1.InitialEventsAnnotationKey]; ok {
+		t.Errorf("bookmark must not carry %s without SendInitialEvents", metav1.InitialEventsAnnotationKey)
+	}
+}
+
+// TestWatch_FieldSelectorFiltersEvents asserts metadata.name field selector
+// filtering at the watch level.
+func TestWatch_FieldSelectorFiltersEvents(t *testing.T) {
+	fc := fake.NewClientBuilder().WithScheme(newTestScheme(t)).Build()
+	r := newTestREST(fc, fc)
+
+	u := &user.DefaultInfo{Name: "admin", Groups: []string{"system:masters"}}
+	ctx, cancel := context.WithCancel(request.WithUser(context.Background(), u))
+	defer cancel()
+
+	w, err := r.Watch(ctx, &metainternal.ListOptions{
+		FieldSelector: fields.OneTermEqualSelector("metadata.name", "tenant-foo"),
+	})
+	if err != nil {
+		t.Fatalf("Watch returned error: %v", err)
+	}
+	defer w.Stop()
+
+	for _, name := range []string{"tenant-bar", "tenant-foo"} {
+		ns := &corev1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: name}}
+		if err := fc.Create(ctx, ns); err != nil {
+			t.Fatalf("create %s: %v", name, err)
+		}
+	}
+
+	evs := collectEvents(t, w, 1, 2*time.Second)
+	if len(evs) != 1 {
+		t.Fatalf("expected 1 event, got %d: %+v", len(evs), evs)
+	}
+	requireTenantNamespaceEvent(t, evs[0], watch.Added, "tenant-foo")
+}
+
+// TestWatch_LabelSelectorFiltersEvents asserts label selector filtering at the
+// watch level.
+func TestWatch_LabelSelectorFiltersEvents(t *testing.T) {
+	fc := fake.NewClientBuilder().WithScheme(newTestScheme(t)).Build()
+	r := newTestREST(fc, fc)
+
+	u := &user.DefaultInfo{Name: "admin", Groups: []string{"system:masters"}}
+	ctx, cancel := context.WithCancel(request.WithUser(context.Background(), u))
+	defer cancel()
+
+	w, err := r.Watch(ctx, &metainternal.ListOptions{
+		LabelSelector: labels.SelectorFromSet(labels.Set{"team": "a"}),
+	})
+	if err != nil {
+		t.Fatalf("Watch returned error: %v", err)
+	}
+	defer w.Stop()
+
+	unlabeled := &corev1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: "tenant-bar"}}
+	if err := fc.Create(ctx, unlabeled); err != nil {
+		t.Fatalf("create tenant-bar: %v", err)
+	}
+	labeled := &corev1.Namespace{ObjectMeta: metav1.ObjectMeta{
+		Name:   "tenant-foo",
+		Labels: map[string]string{"team": "a"},
+	}}
+	if err := fc.Create(ctx, labeled); err != nil {
+		t.Fatalf("create tenant-foo: %v", err)
+	}
+
+	evs := collectEvents(t, w, 1, 2*time.Second)
+	if len(evs) != 1 {
+		t.Fatalf("expected 1 event, got %d: %+v", len(evs), evs)
+	}
+	requireTenantNamespaceEvent(t, evs[0], watch.Added, "tenant-foo")
+}
+
+// TestWatch_MissingUser_ReturnsUnauthorized asserts Watch rejects a context
+// without user info up front instead of failing per event.
+func TestWatch_MissingUser_ReturnsUnauthorized(t *testing.T) {
+	fc := fake.NewClientBuilder().WithScheme(newTestScheme(t)).Build()
+	r := newTestREST(fc, fc)
+
+	w, err := r.Watch(context.Background(), &metainternal.ListOptions{})
+	if err == nil {
+		t.Fatal("expected error, got nil")
+	}
+	if !apierrors.IsUnauthorized(err) {
+		t.Fatalf("expected Unauthorized error, got %v", err)
+	}
+	if w != nil {
+		t.Fatalf("expected nil watch on error, got %v", w)
+	}
+}
+
+// TestWatch_AccessCheckError_SkipsEvent asserts that an error from the
+// RoleBinding lookup drops the affected event without killing the watch.
+func TestWatch_AccessCheckError_SkipsEvent(t *testing.T) {
+	scheme := newTestScheme(t)
+	fc := fake.NewClientBuilder().
+		WithScheme(scheme).
+		WithObjects(userRoleBinding("tenant-ok", "test-user")).
+		WithInterceptorFuncs(interceptor.Funcs{
+			List: func(ctx context.Context, c client.WithWatch, list client.ObjectList, opts ...client.ListOption) error {
+				lo := (&client.ListOptions{}).ApplyOptions(opts)
+				if lo.Namespace == "tenant-broken" {
+					return errors.New("rolebinding list failed")
+				}
+				return c.List(ctx, list, opts...)
+			},
+		}).
+		Build()
+	r := newTestREST(fc, fc)
+
+	u := &user.DefaultInfo{Name: "test-user", Groups: []string{"system:authenticated"}}
+	ctx, cancel := context.WithCancel(request.WithUser(context.Background(), u))
+	defer cancel()
+
+	w, err := r.Watch(ctx, &metainternal.ListOptions{})
+	if err != nil {
+		t.Fatalf("Watch returned error: %v", err)
+	}
+	defer w.Stop()
+
+	for _, name := range []string{"tenant-broken", "tenant-ok"} {
+		ns := &corev1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: name}}
+		if err := fc.Create(ctx, ns); err != nil {
+			t.Fatalf("create %s: %v", name, err)
+		}
+	}
+
+	evs := collectEvents(t, w, 1, 2*time.Second)
+	if len(evs) != 1 {
+		t.Fatalf("expected 1 event, got %d: %+v", len(evs), evs)
+	}
+	requireTenantNamespaceEvent(t, evs[0], watch.Added, "tenant-ok")
+}
+
+// TestWatch_SkipsAddedAtOrBelowStartingRV asserts that when the client
+// supplies a resourceVersion, ADDED events at or below it are skipped as
+// already known from the preceding List.
+func TestWatch_SkipsAddedAtOrBelowStartingRV(t *testing.T) {
+	fc := fake.NewClientBuilder().WithScheme(newTestScheme(t)).Build()
+	fw := watch.NewFake()
+	r := newTestREST(fc, &stubWithWatch{WithWatch: fc, fw: fw})
+
+	u := &user.DefaultInfo{Name: "admin", Groups: []string{"system:masters"}}
+	ctx, cancel := context.WithCancel(request.WithUser(context.Background(), u))
+	defer cancel()
+
+	w, err := r.Watch(ctx, &metainternal.ListOptions{ResourceVersion: "100"})
+	if err != nil {
+		t.Fatalf("Watch returned error: %v", err)
+	}
+	defer w.Stop()
+
+	fw.Add(&corev1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: "tenant-old", ResourceVersion: "100"}})
+	fw.Add(&corev1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: "tenant-new", ResourceVersion: "101"}})
+
+	evs := collectEvents(t, w, 1, 2*time.Second)
+	if len(evs) != 1 {
+		t.Fatalf("expected 1 event, got %d: %+v", len(evs), evs)
+	}
+	requireTenantNamespaceEvent(t, evs[0], watch.Added, "tenant-new")
+}
+
+// TestWatch_OnClose_FlushesTerminatingBookmark asserts that when the backing
+// watcher closes before any event was observed, a SendInitialEvents watch
+// still emits the terminating bookmark at the starting resourceVersion.
+func TestWatch_OnClose_FlushesTerminatingBookmark(t *testing.T) {
+	fc := fake.NewClientBuilder().WithScheme(newTestScheme(t)).Build()
+	fw := watch.NewFake()
+	r := newTestREST(fc, &stubWithWatch{WithWatch: fc, fw: fw})
+
+	u := &user.DefaultInfo{Name: "admin", Groups: []string{"system:masters"}}
+	ctx, cancel := context.WithCancel(request.WithUser(context.Background(), u))
+	defer cancel()
+
+	sendInitialEvents := true
+	w, err := r.Watch(ctx, &metainternal.ListOptions{
+		ResourceVersion:     "5",
+		SendInitialEvents:   &sendInitialEvents,
+		AllowWatchBookmarks: true,
+	})
+	if err != nil {
+		t.Fatalf("Watch returned error: %v", err)
+	}
+	defer w.Stop()
+
+	fw.Stop()
+
+	evs := collectEvents(t, w, 1, 2*time.Second)
+	if len(evs) != 1 {
+		t.Fatalf("expected 1 bookmark event, got %d: %+v", len(evs), evs)
+	}
+	// The terminating bookmark is the last event: the goroutine closes the
+	// result channel on exit, signalling end-of-stream to the consumer.
+	requireResultChanClosed(t, w, 2*time.Second)
+	if evs[0].Type != watch.Bookmark {
+		t.Fatalf("expected Bookmark, got %s", evs[0].Type)
+	}
+	bookmark, ok := evs[0].Object.(*corev1alpha1.TenantNamespace)
+	if !ok {
+		t.Fatalf("expected *TenantNamespace, got %T", evs[0].Object)
+	}
+	if got := bookmark.Annotations[metav1.InitialEventsAnnotationKey]; got != "true" {
+		t.Errorf("expected annotation %s=true, got %q", metav1.InitialEventsAnnotationKey, got)
+	}
+	if bookmark.ResourceVersion != "5" {
+		t.Errorf("expected resourceVersion 5, got %q", bookmark.ResourceVersion)
+	}
+}
+
+// TestWatch_StopTerminatesGoroutine asserts that stopping the returned watch
+// makes the filtering goroutine exit and stop the backing watcher. The result
+// channel is intentionally never read, so the goroutine's send can only
+// observe the stop signal.
+func TestWatch_StopTerminatesGoroutine(t *testing.T) {
+	fc := fake.NewClientBuilder().WithScheme(newTestScheme(t)).Build()
+	fw := watch.NewFake()
+	r := newTestREST(fc, &stubWithWatch{WithWatch: fc, fw: fw})
+
+	u := &user.DefaultInfo{Name: "admin", Groups: []string{"system:masters"}}
+	ctx, cancel := context.WithCancel(request.WithUser(context.Background(), u))
+	defer cancel()
+
+	w, err := r.Watch(ctx, &metainternal.ListOptions{})
+	if err != nil {
+		t.Fatalf("Watch returned error: %v", err)
+	}
+
+	w.Stop()
+	// Push an event the goroutine must try (and fail) to deliver.
+	fw.Add(&corev1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: "tenant-foo"}})
+
+	waitForFakeWatcherStop(t, fw, 2*time.Second)
+	requireResultChanClosed(t, w, 2*time.Second)
+}
+
+// TestWatch_ContextCancelTerminatesGoroutine asserts that cancelling the
+// request context makes the filtering goroutine exit and stop the backing
+// watcher. As above, the result channel is never read.
+func TestWatch_ContextCancelTerminatesGoroutine(t *testing.T) {
+	fc := fake.NewClientBuilder().WithScheme(newTestScheme(t)).Build()
+	fw := watch.NewFake()
+	r := newTestREST(fc, &stubWithWatch{WithWatch: fc, fw: fw})
+
+	u := &user.DefaultInfo{Name: "admin", Groups: []string{"system:masters"}}
+	ctx, cancel := context.WithCancel(request.WithUser(context.Background(), u))
+
+	w, err := r.Watch(ctx, &metainternal.ListOptions{})
+	if err != nil {
+		t.Fatalf("Watch returned error: %v", err)
+	}
+	defer w.Stop()
+
+	cancel()
+	fw.Add(&corev1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: "tenant-foo"}})
+
+	waitForFakeWatcherStop(t, fw, 2*time.Second)
+	requireResultChanClosed(t, w, 2*time.Second)
+}
+
+// TestWatch_StoppedDuringBookmarkSend_TerminatesGoroutine asserts the early
+// return when forwarding a backing bookmark fails because the watch was
+// stopped: the result channel is never read, so the bookmark send can only
+// observe the stop signal and the goroutine must exit.
+func TestWatch_StoppedDuringBookmarkSend_TerminatesGoroutine(t *testing.T) {
+	fc := fake.NewClientBuilder().WithScheme(newTestScheme(t)).Build()
+	fw := watch.NewFake()
+	r := newTestREST(fc, &stubWithWatch{WithWatch: fc, fw: fw})
+
+	u := &user.DefaultInfo{Name: "admin", Groups: []string{"system:masters"}}
+	ctx, cancel := context.WithCancel(request.WithUser(context.Background(), u))
+	defer cancel()
+
+	w, err := r.Watch(ctx, &metainternal.ListOptions{})
+	if err != nil {
+		t.Fatalf("Watch returned error: %v", err)
+	}
+
+	w.Stop()
+	fw.Action(watch.Bookmark, &corev1.Namespace{ObjectMeta: metav1.ObjectMeta{ResourceVersion: "7"}})
+
+	waitForFakeWatcherStop(t, fw, 2*time.Second)
+	requireResultChanClosed(t, w, 2*time.Second)
+}
+
+// TestWatch_StoppedDuringInitialEventsEndBookmarkSend_TerminatesGoroutine
+// asserts the early return when delivering the initial-events-end bookmark
+// ahead of the first live event fails because the watch was stopped.
+func TestWatch_StoppedDuringInitialEventsEndBookmarkSend_TerminatesGoroutine(t *testing.T) {
+	fc := fake.NewClientBuilder().WithScheme(newTestScheme(t)).Build()
+	fw := watch.NewFake()
+	r := newTestREST(fc, &stubWithWatch{WithWatch: fc, fw: fw})
+
+	u := &user.DefaultInfo{Name: "admin", Groups: []string{"system:masters"}}
+	ctx, cancel := context.WithCancel(request.WithUser(context.Background(), u))
+	defer cancel()
+
+	sendInitialEvents := true
+	w, err := r.Watch(ctx, &metainternal.ListOptions{SendInitialEvents: &sendInitialEvents, AllowWatchBookmarks: true})
+	if err != nil {
+		t.Fatalf("Watch returned error: %v", err)
+	}
+
+	w.Stop()
+	// A live (non-ADDED) event makes the bookmarker emit the pending
+	// initial-events-end bookmark first; its send must fail and exit.
+	fw.Modify(&corev1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: "tenant-foo", ResourceVersion: "8"}})
+
+	waitForFakeWatcherStop(t, fw, 2*time.Second)
+	requireResultChanClosed(t, w, 2*time.Second)
+}
+
+// TestWatch_BackingWatchError_Propagates asserts that a failure to start the
+// backing watch is returned to the caller.
+func TestWatch_BackingWatchError_Propagates(t *testing.T) {
+	fc := fake.NewClientBuilder().WithScheme(newTestScheme(t)).Build()
+	wantErr := errors.New("backing watch failed")
+	r := newTestREST(fc, &stubWithWatch{WithWatch: fc, err: wantErr})
+
+	u := &user.DefaultInfo{Name: "admin", Groups: []string{"system:masters"}}
+	ctx := request.WithUser(context.Background(), u)
+
+	w, err := r.Watch(ctx, &metainternal.ListOptions{})
+	if !errors.Is(err, wantErr) {
+		t.Fatalf("expected %v, got %v", wantErr, err)
+	}
+	if w != nil {
+		t.Fatalf("expected nil watch on error, got %v", w)
+	}
+}
diff --git a/pkg/registry/core/tenantsecret/rest.go b/pkg/registry/core/tenantsecret/rest.go
index c75255ed82..e9bd409d1c 100644
--- a/pkg/registry/core/tenantsecret/rest.go
+++ b/pkg/registry/core/tenantsecret/rest.go
@@ -10,6 +10,7 @@ import (
 	"fmt"
 	"net/http"
 	"strconv"
+	"strings"
 	"time"
 
 	corev1 "k8s.io/api/core/v1"
@@ -43,9 +44,25 @@ const (
 	singularName         = "tenantsecret"
 	kindTenantSecret     = "TenantSecret"
 	kindTenantSecretList = "TenantSecretList"
+
+	// internalPrefix namespaces the labels and annotations the platform owns:
+	// the lineage webhook's tenantresource verdict, the cacert controller's
+	// tenant-ca selector and its ownership markers. They are the platform's
+	// answer to "may this tenant see this Secret", and an ApplicationDefinition
+	// selects on them, so a caller writing through this API must not be able to
+	// plant or strip one on the backing Secret. The guard is on the prefix
+	// rather than on a list of keys so a platform key added later is protected
+	// without anyone remembering to come back here.
+	internalPrefix = "internal.cozystack.io/"
 )
 
-func stripInternal(m map[string]string) map[string]string {
+// isInternalKey reports whether a metadata key belongs to the platform.
+func isInternalKey(k string) bool { return strings.HasPrefix(k, internalPrefix) }
+
+// stripTenantMarker hides the tenant-resource marker, and only that key. The
+// read side is deliberately narrower than the write side: a tenant may see the
+// platform's other verdicts, tenant-ca among them, it just cannot write them.
+func stripTenantMarker(m map[string]string) map[string]string {
 	if m == nil {
 		return nil
 	}
@@ -93,7 +110,7 @@ func secretToTenant(sec *corev1.Secret) *corev1alpha1.TenantSecret {
 			UID:               sec.UID,
 			ResourceVersion:   sec.ResourceVersion,
 			CreationTimestamp: sec.CreationTimestamp,
-			Labels:            stripInternal(sec.Labels),
+			Labels:            stripTenantMarker(sec.Labels),
 			Annotations:       sec.Annotations,
 		},
 		Type:       string(sec.Type),
@@ -115,6 +132,14 @@ func tenantToSecret(ts *corev1alpha1.TenantSecret, cur *corev1.Secret) *corev1.S
 	}
 	out.Labels[tsLabelKey] = tsLabelValue
 	for k, v := range ts.Labels {
+		// Platform keys are dropped rather than rejected: a caller that GETs an
+		// object, edits it and PUTs it back sends them straight back at us, and
+		// failing that round-trip would break `kubectl edit` for no gain. On an
+		// update out starts as a copy of the stored Secret, so ignoring the
+		// caller here also means a platform key cannot be stripped.
+		if isInternalKey(k) {
+			continue
+		}
 		out.Labels[k] = v
 	}
 
@@ -122,6 +147,9 @@ func tenantToSecret(ts *corev1alpha1.TenantSecret, cur *corev1.Secret) *corev1.S
 		out.Annotations = map[string]string{}
 	}
 	for k, v := range ts.Annotations {
+		if isInternalKey(k) {
+			continue
+		}
 		out.Annotations[k] = v
 	}
 
@@ -147,10 +175,13 @@ func nsFrom(ctx context.Context) (string, error) {
 // -----------------------------------------------------------------------------
 
 var (
-	_ rest.Creater              = &REST{}
-	_ rest.Getter               = &REST{}
-	_ rest.Lister               = &REST{}
-	_ rest.Updater              = &REST{}
+	_ rest.Creater = &REST{}
+	_ rest.Getter  = &REST{}
+	_ rest.Lister  = &REST{}
+	_ rest.Updater = &REST{}
+	// rest.Patcher is Getter+Updater: a PATCH request is decoded against the
+	// object Get returns and applied through Update, so there is no separate
+	// patch entry point and the guard in tenantToSecret covers PATCH too.
 	_ rest.Patcher              = &REST{}
 	_ rest.GracefulDeleter      = &REST{}
 	_ rest.Watcher              = &REST{}
@@ -219,7 +250,7 @@ func buildTenantSelector(opts *metainternal.ListOptions) (labels.Selector, bool)
 func (r *REST) Create(
 	ctx context.Context,
 	obj runtime.Object,
-	_ rest.ValidateObjectFunc,
+	createValidation rest.ValidateObjectFunc,
 	opts *metav1.CreateOptions,
 ) (runtime.Object, error) {
 	in, ok := obj.(*corev1alpha1.TenantSecret)
@@ -227,8 +258,14 @@ func (r *REST) Create(
 		return nil, fmt.Errorf("expected TenantSecret, got %T", obj)
 	}
 
+	if createValidation != nil {
+		if err := createValidation(ctx, obj); err != nil {
+			return nil, err
+		}
+	}
+
 	sec := tenantToSecret(in, nil)
-	err := r.c.Create(ctx, sec, &client.CreateOptions{Raw: opts})
+	err := r.c.Create(ctx, sec, registry.ClientCreateOptions(opts))
 	if err != nil {
 		return nil, err
 	}
@@ -335,8 +372,8 @@ func (r *REST) Update(
 	ctx context.Context,
 	name string,
 	objInfo rest.UpdatedObjectInfo,
-	_ rest.ValidateObjectFunc,
-	_ rest.ValidateObjectUpdateFunc,
+	createValidation rest.ValidateObjectFunc,
+	updateValidation rest.ValidateObjectUpdateFunc,
 	forceCreate bool,
 	opts *metav1.UpdateOptions,
 ) (runtime.Object, bool, error) {
@@ -358,7 +395,13 @@ func (r *REST) Update(
 		cur = previous
 	}
 
-	newObj, err := objInfo.UpdatedObject(ctx, nil)
+	// The apiserver's patch handler builds the patched object from the old
+	// object alone; a nil old object makes it answer 404 (and admit as CREATE).
+	var oldObj runtime.Object
+	if cur != nil {
+		oldObj = secretToTenant(cur)
+	}
+	newObj, err := objInfo.UpdatedObject(ctx, oldObj)
 	if err != nil {
 		return nil, false, err
 	}
@@ -370,19 +413,30 @@ func (r *REST) Update(
 		if !forceCreate {
 			return nil, false, apierrors.NewNotFound(r.gvr.GroupResource(), name)
 		}
-		err := r.c.Create(ctx, newSec, &client.CreateOptions{Raw: &metav1.CreateOptions{}})
+		if createValidation != nil {
+			if err := createValidation(ctx, newObj); err != nil {
+				return nil, false, err
+			}
+		}
+		err := r.c.Create(ctx, newSec, registry.ClientCreateOptionsFromUpdate(opts))
 		return secretToTenant(newSec), true, err
 	}
 
+	if updateValidation != nil {
+		if err := updateValidation(ctx, newObj, secretToTenant(cur)); err != nil {
+			return nil, false, err
+		}
+	}
+
 	newSec.ResourceVersion = cur.ResourceVersion
-	err = r.c.Update(ctx, newSec, &client.UpdateOptions{Raw: opts})
+	err = r.c.Update(ctx, newSec, registry.ClientUpdateOptions(opts))
 	return secretToTenant(newSec), false, err
 }
 
 func (r *REST) Delete(
 	ctx context.Context,
 	name string,
-	_ rest.ValidateObjectFunc,
+	deleteValidation rest.ValidateObjectFunc,
 	opts *metav1.DeleteOptions,
 ) (runtime.Object, bool, error) {
 	ns, err := nsFrom(ctx)
@@ -396,55 +450,14 @@ func (r *REST) Delete(
 	if current.Labels == nil || current.Labels[tsLabelKey] != tsLabelValue {
 		return nil, false, apierrors.NewNotFound(r.gvr.GroupResource(), name)
 	}
-	err = r.c.Delete(ctx, &corev1.Secret{ObjectMeta: metav1.ObjectMeta{Namespace: ns, Name: name}}, &client.DeleteOptions{Raw: opts})
-	return nil, err == nil, err
-}
-
-func (r *REST) Patch(
-	ctx context.Context,
-	name string,
-	pt types.PatchType,
-	data []byte,
-	opts *metav1.PatchOptions,
-	subresources ...string,
-) (runtime.Object, error) {
-	if len(subresources) > 0 {
-		return nil, fmt.Errorf("TenantSecret does not have subresources")
-	}
-	ns, err := nsFrom(ctx)
-	if err != nil {
-		return nil, err
-	}
-	current := &corev1.Secret{}
-	if err := r.c.Get(ctx, types.NamespacedName{Namespace: ns, Name: name}, current, &client.GetOptions{Raw: &metav1.GetOptions{}}); err != nil {
-		return nil, err
-	}
-	if current.Labels == nil || current.Labels[tsLabelKey] != tsLabelValue {
-		return nil, apierrors.NewNotFound(r.gvr.GroupResource(), name)
-	}
-	out := &corev1.Secret{
-		ObjectMeta: metav1.ObjectMeta{
-			Namespace: ns,
-			Name:      name,
-		},
-	}
-	patch := client.RawPatch(pt, data)
-	err = r.c.Patch(ctx, out, patch, &client.PatchOptions{Raw: opts})
-	if err != nil {
-		return nil, err
-	}
-
-	// Ensure tenant secret label is preserved
-	if out.Labels == nil {
-		out.Labels = make(map[string]string)
-	}
-
-	if out.Labels[tsLabelKey] != tsLabelValue {
-		out.Labels[tsLabelKey] = tsLabelValue
-		_ = r.c.Update(ctx, out, &client.UpdateOptions{Raw: &metav1.UpdateOptions{}})
+	if deleteValidation != nil {
+		if err := deleteValidation(ctx, secretToTenant(current)); err != nil {
+			return nil, false, err
+		}
 	}
 
-	return secretToTenant(out), nil
+	err = r.c.Delete(ctx, &corev1.Secret{ObjectMeta: metav1.ObjectMeta{Namespace: ns, Name: name}}, registry.ClientDeleteOptions(opts))
+	return nil, err == nil, err
 }
 
 // -----------------------------------------------------------------------------
@@ -465,6 +478,8 @@ func (r *REST) Watch(ctx context.Context, opts *metainternal.ListOptions) (watch
 		return watch.NewProxyWatcher(ch), nil
 	}
 
+	initialEventsEnd := registry.InitialEventsEndBookmarkRequested(opts)
+
 	secList := &corev1.SecretList{}
 	base, err := r.w.Watch(ctx, secList, &client.ListOptions{
 		Namespace:     ns,
@@ -472,6 +487,10 @@ func (r *REST) Watch(ctx context.Context, opts *metainternal.ListOptions) (watch
 		Raw: &metav1.ListOptions{
 			Watch:           true,
 			ResourceVersion: opts.ResourceVersion,
+			// Backing bookmarks are forwarded to the client, so ask for them only
+			// when the client did; a WatchList client always does, which keeps
+			// the terminating bookmark's trigger.
+			AllowWatchBookmarks: opts.AllowWatchBookmarks,
 		},
 	})
 	if err != nil {
@@ -486,26 +505,44 @@ func (r *REST) Watch(ctx context.Context, opts *metainternal.ListOptions) (watch
 		}
 	}
 
+	// Emit the initial-events-end bookmark after the initial ADDED events so
+	// client-go reflectors reach HasSynced.
+	bookmarker := registry.NewInitialEventsBookmarker(initialEventsEnd, opts.ResourceVersion, func() runtime.Object {
+		return &corev1alpha1.TenantSecret{
+			TypeMeta: metav1.TypeMeta{
+				APIVersion: corev1alpha1.SchemeGroupVersion.String(),
+				Kind:       kindTenantSecret,
+			},
+		}
+	})
+
 	ch := make(chan watch.Event)
 	proxy := watch.NewProxyWatcher(ch)
 
 	go func() {
 		defer proxy.Stop()
+		defer base.Stop()
+
+		// send forwards an event, returning false if the watch or context ended.
+		send := func(ev watch.Event) bool {
+			select {
+			case ch <- ev:
+				return true
+			case <-proxy.StopChan():
+				return false
+			case <-ctx.Done():
+				return false
+			}
+		}
 
 		for ev := range base.ResultChan() {
 			// Handle bookmark events
 			if ev.Type == watch.Bookmark {
 				if sec, ok := ev.Object.(*corev1.Secret); ok {
-					out := &corev1alpha1.TenantSecret{
-						TypeMeta: metav1.TypeMeta{
-							APIVersion: corev1alpha1.SchemeGroupVersion.String(),
-							Kind:       kindTenantSecret,
-						},
-						ObjectMeta: metav1.ObjectMeta{
-							ResourceVersion: sec.ResourceVersion,
-						},
+					bookmark, _ := bookmarker.OnBackingBookmark(sec.ResourceVersion)
+					if !send(bookmark) {
+						return
 					}
-					ch <- watch.Event{Type: watch.Bookmark, Object: out}
 				}
 				continue
 			}
@@ -514,6 +551,7 @@ func (r *REST) Watch(ctx context.Context, opts *metainternal.ListOptions) (watch
 			if !ok || sec == nil {
 				continue
 			}
+			bookmarker.Observe(sec.ResourceVersion)
 
 			// Defensive: post-filter against the merged selector. The underlying
 			// watch already filters by label, but this guards against any client
@@ -539,10 +577,21 @@ func (r *REST) Watch(ctx context.Context, opts *metainternal.ListOptions) (watch
 			}
 			// When startingRV == 0, always send ADDED events (client wants full state)
 
-			ch <- watch.Event{
-				Type:   ev.Type,
-				Object: tenant,
+			// Emit the initial-events-end bookmark before the first live event.
+			if bookmark, ok := bookmarker.BeforeLiveEvent(ev.Type); ok {
+				if !send(bookmark) {
+					return
+				}
 			}
+
+			if !send(watch.Event{Type: ev.Type, Object: tenant}) {
+				return
+			}
+		}
+
+		// Backing watcher closed: flush the terminating bookmark if still pending.
+		if bookmark, ok := bookmarker.OnClose(); ok {
+			send(bookmark)
 		}
 	}()
 
@@ -557,7 +606,7 @@ func (r *REST) ConvertToTable(_ context.Context, obj runtime.Object, _ runtime.O
 	now := time.Now()
 	row := func(o *corev1alpha1.TenantSecret) metav1.TableRow {
 		return metav1.TableRow{
-			Cells:  []interface{}{o.Name, o.Type, duration.HumanDuration(now.Sub(o.CreationTimestamp.Time))},
+			Cells:  []any{o.Name, o.Type, duration.HumanDuration(now.Sub(o.CreationTimestamp.Time))},
 			Object: runtime.RawExtension{Object: o},
 		}
 	}
diff --git a/pkg/registry/core/tenantsecret/rest_admission_test.go b/pkg/registry/core/tenantsecret/rest_admission_test.go
new file mode 100644
index 0000000000..2c7862058c
--- /dev/null
+++ b/pkg/registry/core/tenantsecret/rest_admission_test.go
@@ -0,0 +1,144 @@
+// SPDX-License-Identifier: Apache-2.0
+
+package tenantsecret
+
+import (
+	"context"
+	"errors"
+	"testing"
+
+	corev1 "k8s.io/api/core/v1"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/types"
+	"k8s.io/apiserver/pkg/registry/rest"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+
+	corev1alpha1 "github.com/cozystack/cozystack/pkg/apis/core/v1alpha1"
+)
+
+// The apiserver delivers validating admission to a storage as the
+// ValidateObjectFunc it passes into Create, Update and Delete: mutating
+// admission runs in the handler, but validating webhooks and
+// ValidatingAdmissionPolicies run only when the storage calls that callback.
+// A storage that drops it answers every write as if no policy existed.
+
+var errDenied = errors.New("denied by test admission")
+
+func denyCreate(called *bool) rest.ValidateObjectFunc {
+	return func(_ context.Context, _ runtime.Object) error {
+		*called = true
+		return errDenied
+	}
+}
+
+func denyUpdate(called *bool) rest.ValidateObjectUpdateFunc {
+	return func(_ context.Context, _, _ runtime.Object) error {
+		*called = true
+		return errDenied
+	}
+}
+
+func tenantSecretIn(name string) *corev1alpha1.TenantSecret {
+	return &corev1alpha1.TenantSecret{
+		ObjectMeta: metav1.ObjectMeta{Name: name, Namespace: testNamespace},
+		Type:       string(corev1.SecretTypeOpaque),
+	}
+}
+
+func secretExists(t *testing.T, r *REST, name string) bool {
+	t.Helper()
+	err := r.c.Get(testCtx(), types.NamespacedName{Namespace: testNamespace, Name: name}, &corev1.Secret{}, &client.GetOptions{})
+	if err != nil && !apierrors.IsNotFound(err) {
+		t.Fatalf("get backing Secret %q: %v", name, err)
+	}
+	return err == nil
+}
+
+func TestCreateRunsValidatingAdmission(t *testing.T) {
+	r := newTestREST(t)
+	called := false
+
+	_, err := r.Create(testCtx(), tenantSecretIn("creds"), denyCreate(&called), &metav1.CreateOptions{})
+	if !called {
+		t.Fatal("Create never invoked validating admission")
+	}
+	if !errors.Is(err, errDenied) {
+		t.Fatalf("Create swallowed the admission denial: got %v", err)
+	}
+	if secretExists(t, r, "creds") {
+		t.Error("Create wrote the backing Secret despite the denial")
+	}
+}
+
+func TestUpdateRunsValidatingAdmission(t *testing.T) {
+	r := newTestREST(t, makeTenantSecret("creds", nil))
+	called := false
+
+	in := tenantSecretIn("creds")
+	in.Data = map[string][]byte{"k": []byte("v")}
+	_, _, err := r.Update(testCtx(), "creds", rest.DefaultUpdatedObjectInfo(in), nil, denyUpdate(&called), false, &metav1.UpdateOptions{})
+	if !called {
+		t.Fatal("Update never invoked validating admission")
+	}
+	if !errors.Is(err, errDenied) {
+		t.Fatalf("Update swallowed the admission denial: got %v", err)
+	}
+	if got := backingSecret(t, r, "creds").Data["k"]; got != nil {
+		t.Errorf("Update wrote the backing Secret despite the denial: got %q", got)
+	}
+}
+
+func TestUpdateForceCreateRunsValidatingAdmission(t *testing.T) {
+	// The create-on-update path is a create, so it is createValidation that
+	// carries admission for it.
+	r := newTestREST(t)
+	called := false
+
+	_, _, err := r.Update(testCtx(), "creds", rest.DefaultUpdatedObjectInfo(tenantSecretIn("creds")), denyCreate(&called), nil, true, &metav1.UpdateOptions{})
+	if !called {
+		t.Fatal("force-create Update never invoked validating admission")
+	}
+	if !errors.Is(err, errDenied) {
+		t.Fatalf("force-create Update swallowed the admission denial: got %v", err)
+	}
+	if secretExists(t, r, "creds") {
+		t.Error("force-create Update wrote the backing Secret despite the denial")
+	}
+}
+
+func TestDeleteRunsValidatingAdmission(t *testing.T) {
+	// This is the path the cluster-wide no-delete guardrail runs on.
+	r := newTestREST(t, makeTenantSecret("creds", nil))
+	called := false
+
+	_, deleted, err := r.Delete(testCtx(), "creds", denyCreate(&called), &metav1.DeleteOptions{})
+	if !called {
+		t.Fatal("Delete never invoked validating admission")
+	}
+	if !errors.Is(err, errDenied) {
+		t.Fatalf("Delete swallowed the admission denial: got %v", err)
+	}
+	if deleted {
+		t.Error("Delete reported the object as deleted despite the denial")
+	}
+	if !secretExists(t, r, "creds") {
+		t.Error("Delete removed the backing Secret despite the denial")
+	}
+}
+
+func TestWritesAcceptNilValidation(t *testing.T) {
+	// The apiserver passes a nil callback when no admission plugin handles the
+	// operation, so every write path must stay usable without one.
+	r := newTestREST(t)
+	if _, err := r.Create(testCtx(), tenantSecretIn("creds"), nil, &metav1.CreateOptions{}); err != nil {
+		t.Fatalf("Create with nil validation: %v", err)
+	}
+	if _, _, err := r.Update(testCtx(), "creds", rest.DefaultUpdatedObjectInfo(tenantSecretIn("creds")), nil, nil, false, &metav1.UpdateOptions{}); err != nil {
+		t.Fatalf("Update with nil validation: %v", err)
+	}
+	if _, _, err := r.Delete(testCtx(), "creds", nil, &metav1.DeleteOptions{}); err != nil {
+		t.Fatalf("Delete with nil validation: %v", err)
+	}
+}
diff --git a/pkg/registry/core/tenantsecret/rest_test.go b/pkg/registry/core/tenantsecret/rest_test.go
index 3e53071f62..555ed620f8 100644
--- a/pkg/registry/core/tenantsecret/rest_test.go
+++ b/pkg/registry/core/tenantsecret/rest_test.go
@@ -4,6 +4,7 @@ package tenantsecret
 
 import (
 	"context"
+	"maps"
 	"sort"
 	"testing"
 	"time"
@@ -57,9 +58,7 @@ func makeTenantSecret(name string, extra map[string]string) *corev1.Secret {
 	lbls := map[string]string{
 		corev1alpha1.TenantResourceLabelKey: corev1alpha1.TenantResourceLabelValue,
 	}
-	for k, v := range extra {
-		lbls[k] = v
-	}
+	maps.Copy(lbls, extra)
 	return &corev1.Secret{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      name,
diff --git a/pkg/registry/core/tenantsecret/rest_watch_test.go b/pkg/registry/core/tenantsecret/rest_watch_test.go
new file mode 100644
index 0000000000..b39b50ac56
--- /dev/null
+++ b/pkg/registry/core/tenantsecret/rest_watch_test.go
@@ -0,0 +1,178 @@
+// SPDX-License-Identifier: Apache-2.0
+
+package tenantsecret
+
+import (
+	"context"
+	"testing"
+	"time"
+
+	corev1 "k8s.io/api/core/v1"
+	metainternal "k8s.io/apimachinery/pkg/apis/meta/internalversion"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/watch"
+	"k8s.io/apiserver/pkg/endpoints/request"
+
+	corev1alpha1 "github.com/cozystack/cozystack/pkg/apis/core/v1alpha1"
+	"github.com/cozystack/cozystack/pkg/registry/registrytest"
+)
+
+// collectEvents drains up to n events from the watch, or returns early if the
+// channel closes or the timeout fires.
+func collectEvents(t *testing.T, w watch.Interface, n int, timeout time.Duration) []watch.Event {
+	t.Helper()
+	out := make([]watch.Event, 0, n)
+	deadline := time.NewTimer(timeout)
+	defer deadline.Stop()
+	for len(out) < n {
+		select {
+		case ev, ok := <-w.ResultChan():
+			if !ok {
+				return out
+			}
+			out = append(out, ev)
+		case <-deadline.C:
+			return out
+		}
+	}
+	return out
+}
+
+// TestWatch_SendInitialEvents_EmitsInitialEventsEndBookmark asserts the
+// WatchList contract for TenantSecret: ADDED events, then a bookmark annotated
+// with k8s.io/initial-events-end, then live events.
+//
+// fake.Client.Watch doesn't replay existing objects as ADDED, so the secret is
+// created after the watch starts and then mutated to drive a live event.
+func TestWatch_SendInitialEvents_EmitsInitialEventsEndBookmark(t *testing.T) {
+	r := newTestREST(t)
+
+	ctx, cancel := context.WithCancel(request.WithNamespace(context.Background(), testNamespace))
+	defer cancel()
+
+	sendInitialEvents := true
+	w, err := r.Watch(ctx, &metainternal.ListOptions{SendInitialEvents: &sendInitialEvents, AllowWatchBookmarks: true})
+	if err != nil {
+		t.Fatalf("Watch returned error: %v", err)
+	}
+	defer w.Stop()
+
+	sec := makeTenantSecret("harbor-test-credentials", nil)
+	if err := r.c.Create(ctx, sec); err != nil {
+		t.Fatalf("create secret: %v", err)
+	}
+	sec.Annotations = map[string]string{"touched": "1"}
+	if err := r.c.Update(ctx, sec); err != nil {
+		t.Fatalf("update secret: %v", err)
+	}
+
+	evs := collectEvents(t, w, 3, 2*time.Second)
+	if len(evs) < 3 {
+		t.Fatalf("expected at least 3 events (Added, Bookmark, Modified), got %d: %+v", len(evs), evs)
+	}
+
+	if evs[0].Type != watch.Added {
+		t.Fatalf("event[0]: expected Added, got %s", evs[0].Type)
+	}
+	added, ok := evs[0].Object.(*corev1alpha1.TenantSecret)
+	if !ok {
+		t.Fatalf("event[0]: expected *TenantSecret, got %T", evs[0].Object)
+	}
+	if added.Name != "harbor-test-credentials" {
+		t.Fatalf("event[0]: expected name harbor-test-credentials, got %q", added.Name)
+	}
+
+	if evs[1].Type != watch.Bookmark {
+		t.Fatalf("event[1]: expected Bookmark, got %s", evs[1].Type)
+	}
+	bookmark, ok := evs[1].Object.(*corev1alpha1.TenantSecret)
+	if !ok {
+		t.Fatalf("event[1]: expected *TenantSecret, got %T", evs[1].Object)
+	}
+	if got := bookmark.Annotations[metav1.InitialEventsAnnotationKey]; got != "true" {
+		t.Fatalf("event[1]: expected annotation %s=true, got %q", metav1.InitialEventsAnnotationKey, got)
+	}
+	if bookmark.ResourceVersion == "" {
+		t.Fatal("event[1]: expected non-empty resourceVersion on bookmark")
+	}
+
+	if evs[2].Type != watch.Modified {
+		t.Fatalf("event[2]: expected Modified after bookmark, got %s", evs[2].Type)
+	}
+}
+
+// TestWatch_BackingBookmarksFollowTheClient pins that the backing watch asks for
+// bookmarks only when the client did: every backing bookmark is forwarded, and
+// the fake client never sends one, so the event stream alone cannot show it.
+func TestWatch_BackingBookmarksFollowTheClient(t *testing.T) {
+	yes := true
+	for _, tc := range []struct {
+		name string
+		opts metainternal.ListOptions
+		want bool
+	}{
+		{"plain watch defaulted by the apiserver", metainternal.ListOptions{SendInitialEvents: &yes}, false},
+		{"watch list", metainternal.ListOptions{SendInitialEvents: &yes, AllowWatchBookmarks: true}, true},
+		{"bookmarks only", metainternal.ListOptions{AllowWatchBookmarks: true}, true},
+	} {
+		t.Run(tc.name, func(t *testing.T) {
+			r := newTestREST(t)
+			spy := &registrytest.RawRecordingWatch{WithWatch: r.w}
+			r.w = spy
+			ctx, cancel := context.WithCancel(request.WithNamespace(context.Background(), testNamespace))
+			defer cancel()
+
+			w, err := r.Watch(ctx, &tc.opts)
+			if err != nil {
+				t.Fatalf("Watch returned error: %v", err)
+			}
+			defer w.Stop()
+
+			raw := spy.RawFor(&corev1.SecretList{})
+			if raw == nil {
+				t.Fatal("backing watch was called without raw options")
+			}
+			if raw.AllowWatchBookmarks != tc.want {
+				t.Fatalf("backing AllowWatchBookmarks = %v, want %v", raw.AllowWatchBookmarks, tc.want)
+			}
+		})
+	}
+}
+
+// TestWatch_PlainWatch_EmitsNoInitialEventsEndBookmark covers a watch with no
+// resourceVersion: the apiserver defaults SendInitialEvents on for it but leaves
+// bookmarks off, so the client never asked for the terminating bookmark.
+func TestWatch_PlainWatch_EmitsNoInitialEventsEndBookmark(t *testing.T) {
+	r := newTestREST(t)
+
+	ctx, cancel := context.WithCancel(request.WithNamespace(context.Background(), testNamespace))
+	defer cancel()
+
+	sendInitialEvents := true
+	w, err := r.Watch(ctx, &metainternal.ListOptions{SendInitialEvents: &sendInitialEvents})
+	if err != nil {
+		t.Fatalf("Watch returned error: %v", err)
+	}
+	defer w.Stop()
+
+	sec := makeTenantSecret("harbor-test-credentials", nil)
+	if err := r.c.Create(ctx, sec); err != nil {
+		t.Fatalf("create secret: %v", err)
+	}
+	sec.Annotations = map[string]string{"touched": "1"}
+	if err := r.c.Update(ctx, sec); err != nil {
+		t.Fatalf("update secret: %v", err)
+	}
+
+	evs := collectEvents(t, w, 3, 2*time.Second)
+	var types []watch.EventType
+	for _, ev := range evs {
+		types = append(types, ev.Type)
+		if ev.Type == watch.Bookmark {
+			t.Fatalf("unrequested bookmark on a plain watch: %+v", ev.Object)
+		}
+	}
+	if len(types) != 2 || types[0] != watch.Added || types[1] != watch.Modified {
+		t.Fatalf("expected [ADDED MODIFIED], got %v", types)
+	}
+}
diff --git a/pkg/registry/core/tenantsecret/rest_write_options_test.go b/pkg/registry/core/tenantsecret/rest_write_options_test.go
new file mode 100644
index 0000000000..41eadf8606
--- /dev/null
+++ b/pkg/registry/core/tenantsecret/rest_write_options_test.go
@@ -0,0 +1,136 @@
+// SPDX-License-Identifier: Apache-2.0
+
+package tenantsecret
+
+import (
+	"context"
+	"reflect"
+	"testing"
+
+	corev1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apiserver/pkg/endpoints/request"
+	"k8s.io/apiserver/pkg/registry/rest"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/client/fake"
+	"sigs.k8s.io/controller-runtime/pkg/client/interceptor"
+
+	corev1alpha1 "github.com/cozystack/cozystack/pkg/apis/core/v1alpha1"
+)
+
+func newWriteOptionsREST(t *testing.T, funcs interceptor.Funcs, secrets ...*corev1.Secret) *REST {
+	t.Helper()
+	scheme := runtime.NewScheme()
+	if err := corev1.AddToScheme(scheme); err != nil {
+		t.Fatalf("register core scheme: %v", err)
+	}
+	objects := make([]client.Object, 0, len(secrets))
+	for _, secret := range secrets {
+		objects = append(objects, secret)
+	}
+	c := fake.NewClientBuilder().
+		WithScheme(scheme).
+		WithObjects(objects...).
+		WithInterceptorFuncs(funcs).
+		Build()
+	return &REST{c: c, w: c, gvr: schema.GroupVersionResource{
+		Group: corev1alpha1.GroupName, Version: "v1alpha1", Resource: "tenantsecrets",
+	}}
+}
+
+func tenantSecretInput(name string) *corev1alpha1.TenantSecret {
+	return &corev1alpha1.TenantSecret{ObjectMeta: metav1.ObjectMeta{Name: name, Namespace: testNamespace}}
+}
+
+func captureTenantCreateOptions(opts ...client.CreateOption) *metav1.CreateOptions {
+	converted := (&client.CreateOptions{}).ApplyOptions(opts)
+	return converted.AsCreateOptions().DeepCopy()
+}
+
+func captureTenantUpdateOptions(opts ...client.UpdateOption) *metav1.UpdateOptions {
+	converted := (&client.UpdateOptions{}).ApplyOptions(opts)
+	return converted.AsUpdateOptions().DeepCopy()
+}
+
+func captureTenantDeleteOptions(opts ...client.DeleteOption) *metav1.DeleteOptions {
+	converted := (&client.DeleteOptions{}).ApplyOptions(opts)
+	return converted.AsDeleteOptions().DeepCopy()
+}
+
+func TestTenantSecretCreatePropagatesWriteOptions(t *testing.T) {
+	want := &metav1.CreateOptions{DryRun: []string{metav1.DryRunAll}, FieldManager: "creator", FieldValidation: "Strict"}
+	expected := want.DeepCopy()
+	var got *metav1.CreateOptions
+	r := newWriteOptionsREST(t, interceptor.Funcs{
+		Create: func(_ context.Context, _ client.WithWatch, _ client.Object, opts ...client.CreateOption) error {
+			got = captureTenantCreateOptions(opts...)
+			return nil
+		},
+	})
+	if _, err := r.Create(request.WithNamespace(context.Background(), testNamespace), tenantSecretInput("new"), nil, want); err != nil {
+		t.Fatalf("Create returned error: %v", err)
+	}
+	if !reflect.DeepEqual(got, expected) {
+		t.Fatalf("Create options lost: got %#v, want %#v", got, expected)
+	}
+}
+
+func TestTenantSecretUpdatePropagatesWriteOptions(t *testing.T) {
+	want := &metav1.UpdateOptions{DryRun: []string{metav1.DryRunAll}, FieldManager: "updater", FieldValidation: "Warn"}
+	expected := want.DeepCopy()
+	var got *metav1.UpdateOptions
+	r := newWriteOptionsREST(t, interceptor.Funcs{
+		Update: func(_ context.Context, _ client.WithWatch, _ client.Object, opts ...client.UpdateOption) error {
+			got = captureTenantUpdateOptions(opts...)
+			return nil
+		},
+	}, makeTenantSecret("existing", nil))
+	ctx := request.WithNamespace(context.Background(), testNamespace)
+	if _, _, err := r.Update(ctx, "existing", rest.DefaultUpdatedObjectInfo(tenantSecretInput("existing")), nil, nil, false, want); err != nil {
+		t.Fatalf("Update returned error: %v", err)
+	}
+	if !reflect.DeepEqual(got, expected) {
+		t.Fatalf("Update options lost: got %#v, want %#v", got, expected)
+	}
+}
+
+func TestTenantSecretForceCreatePropagatesWriteOptions(t *testing.T) {
+	update := &metav1.UpdateOptions{DryRun: []string{metav1.DryRunAll}, FieldManager: "apply", FieldValidation: "Strict"}
+	want := &metav1.CreateOptions{DryRun: update.DryRun, FieldManager: update.FieldManager, FieldValidation: update.FieldValidation}
+	var got *metav1.CreateOptions
+	r := newWriteOptionsREST(t, interceptor.Funcs{
+		Create: func(_ context.Context, _ client.WithWatch, _ client.Object, opts ...client.CreateOption) error {
+			got = captureTenantCreateOptions(opts...)
+			return nil
+		},
+	})
+	ctx := request.WithNamespace(context.Background(), testNamespace)
+	if _, _, err := r.Update(ctx, "new", rest.DefaultUpdatedObjectInfo(tenantSecretInput("new")), nil, nil, true, update); err != nil {
+		t.Fatalf("force-create Update returned error: %v", err)
+	}
+	if !reflect.DeepEqual(got, want) {
+		t.Fatalf("force-create options lost: got %#v, want %#v", got, want)
+	}
+}
+
+func TestTenantSecretDeletePropagatesWriteOptions(t *testing.T) {
+	propagation := metav1.DeletePropagationForeground
+	want := &metav1.DeleteOptions{PropagationPolicy: &propagation, DryRun: []string{metav1.DryRunAll}}
+	expected := want.DeepCopy()
+	var got *metav1.DeleteOptions
+	r := newWriteOptionsREST(t, interceptor.Funcs{
+		Delete: func(_ context.Context, _ client.WithWatch, _ client.Object, opts ...client.DeleteOption) error {
+			got = captureTenantDeleteOptions(opts...)
+			return nil
+		},
+	}, makeTenantSecret("existing", nil))
+	ctx := request.WithNamespace(context.Background(), testNamespace)
+	if _, _, err := r.Delete(ctx, "existing", nil, want); err != nil {
+		t.Fatalf("Delete returned error: %v", err)
+	}
+	if !reflect.DeepEqual(got, expected) {
+		t.Fatalf("Delete options lost: got %#v, want %#v", got, expected)
+	}
+}
diff --git a/pkg/registry/core/tenantsecret/rest_write_test.go b/pkg/registry/core/tenantsecret/rest_write_test.go
new file mode 100644
index 0000000000..8c25eab54e
--- /dev/null
+++ b/pkg/registry/core/tenantsecret/rest_write_test.go
@@ -0,0 +1,469 @@
+// SPDX-License-Identifier: Apache-2.0
+
+package tenantsecret
+
+import (
+	"context"
+	"errors"
+	"reflect"
+	"testing"
+
+	corev1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apimachinery/pkg/types"
+	"k8s.io/apiserver/pkg/endpoints/request"
+	"k8s.io/apiserver/pkg/registry/rest"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/client/fake"
+	"sigs.k8s.io/controller-runtime/pkg/client/interceptor"
+
+	corev1alpha1 "github.com/cozystack/cozystack/pkg/apis/core/v1alpha1"
+)
+
+// Platform-owned keys, spelled out here rather than imported so the test pins
+// the literal strings the controllers and the admission webhook agree on.
+const (
+	tenantCALabel      = "internal.cozystack.io/tenant-ca"
+	caCopyLabel        = "internal.cozystack.io/ca-cert-copy"
+	caSourceAnnotation = "internal.cozystack.io/ca-cert-source"
+)
+
+func testCtx() context.Context {
+	return request.WithNamespace(context.Background(), testNamespace)
+}
+
+// backingSecret reads the Secret the registry actually wrote.
+func backingSecret(t *testing.T, r *REST, name string) *corev1.Secret {
+	t.Helper()
+	sec := &corev1.Secret{}
+	if err := r.c.Get(context.Background(), types.NamespacedName{Namespace: testNamespace, Name: name}, sec); err != nil {
+		t.Fatalf("get backing Secret %q: %v", name, err)
+	}
+	return sec
+}
+
+func TestCreate_DropsCallerSuppliedInternalLabels(t *testing.T) {
+	tests := []struct {
+		name   string
+		labels map[string]string
+		want   map[string]string
+	}{
+		{
+			name:   "no labels keeps only the tenant-resource marker",
+			labels: nil,
+			want:   map[string]string{tsLabelKey: tsLabelValue},
+		},
+		{
+			name:   "ordinary labels are preserved",
+			labels: map[string]string{"apps.cozystack.io/application.kind": "Bucket", "team": "blue"},
+			want: map[string]string{
+				tsLabelKey:                           tsLabelValue,
+				"apps.cozystack.io/application.kind": "Bucket",
+				"team":                               "blue",
+			},
+		},
+		{
+			name:   "spoofed tenant-ca selector is dropped",
+			labels: map[string]string{tenantCALabel: "true", "team": "blue"},
+			want:   map[string]string{tsLabelKey: tsLabelValue, "team": "blue"},
+		},
+		{
+			name:   "spoofed ca-cert-copy ownership marker is dropped",
+			labels: map[string]string{caCopyLabel: "true"},
+			want:   map[string]string{tsLabelKey: tsLabelValue},
+		},
+		{
+			name:   "tenant-resource verdict cannot be forged",
+			labels: map[string]string{tsLabelKey: "false"},
+			want:   map[string]string{tsLabelKey: tsLabelValue},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			r := newTestREST(t)
+			in := &corev1alpha1.TenantSecret{
+				ObjectMeta: metav1.ObjectMeta{
+					Name:      "creds",
+					Namespace: testNamespace,
+					Labels:    tt.labels,
+				},
+				Type: string(corev1.SecretTypeOpaque),
+			}
+
+			if _, err := r.Create(testCtx(), in, nil, &metav1.CreateOptions{}); err != nil {
+				t.Fatalf("Create returned error: %v", err)
+			}
+
+			if got := backingSecret(t, r, "creds").Labels; !reflect.DeepEqual(got, tt.want) {
+				t.Fatalf("backing Secret labels: got %v, want %v", got, tt.want)
+			}
+		})
+	}
+}
+
+func TestCreate_DropsCallerSuppliedInternalAnnotations(t *testing.T) {
+	r := newTestREST(t)
+	in := &corev1alpha1.TenantSecret{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "creds",
+			Namespace: testNamespace,
+			Annotations: map[string]string{
+				caSourceAnnotation: "tenant-root/forged",
+				"team.io/owner":    "blue",
+			},
+		},
+		Type: string(corev1.SecretTypeOpaque),
+	}
+
+	if _, err := r.Create(testCtx(), in, nil, &metav1.CreateOptions{}); err != nil {
+		t.Fatalf("Create returned error: %v", err)
+	}
+
+	want := map[string]string{"team.io/owner": "blue"}
+	if got := backingSecret(t, r, "creds").Annotations; !reflect.DeepEqual(got, want) {
+		t.Fatalf("backing Secret annotations: got %v, want %v", got, want)
+	}
+}
+
+func TestUpdate_KeepsPlatformLabelsCallerCannotSee(t *testing.T) {
+	existing := makeTenantSecret("creds", map[string]string{
+		tenantCALabel: "true",
+		"team":        "blue",
+	})
+	existing.Annotations = map[string]string{caSourceAnnotation: "cozy-system/root-ca"}
+
+	tests := []struct {
+		name            string
+		labels          map[string]string
+		annotations     map[string]string
+		wantLabels      map[string]string
+		wantAnnotations map[string]string
+	}{
+		{
+			name:   "omitting a platform label does not strip it",
+			labels: map[string]string{"team": "blue"},
+			wantLabels: map[string]string{
+				tsLabelKey:    tsLabelValue,
+				tenantCALabel: "true",
+				"team":        "blue",
+			},
+			wantAnnotations: map[string]string{caSourceAnnotation: "cozy-system/root-ca"},
+		},
+		{
+			name:   "overwriting the tenant-ca selector is ignored",
+			labels: map[string]string{tenantCALabel: "false"},
+			wantLabels: map[string]string{
+				tsLabelKey:    tsLabelValue,
+				tenantCALabel: "true",
+				"team":        "blue",
+			},
+			wantAnnotations: map[string]string{caSourceAnnotation: "cozy-system/root-ca"},
+		},
+		{
+			name:   "overwriting the tenant-resource verdict is ignored",
+			labels: map[string]string{tsLabelKey: "false"},
+			wantLabels: map[string]string{
+				tsLabelKey:    tsLabelValue,
+				tenantCALabel: "true",
+				"team":        "blue",
+			},
+			wantAnnotations: map[string]string{caSourceAnnotation: "cozy-system/root-ca"},
+		},
+		{
+			name:   "planting a new platform label is ignored, ordinary labels land",
+			labels: map[string]string{caCopyLabel: "true", "tier": "gold"},
+			wantLabels: map[string]string{
+				tsLabelKey:    tsLabelValue,
+				tenantCALabel: "true",
+				"team":        "blue",
+				"tier":        "gold",
+			},
+			wantAnnotations: map[string]string{caSourceAnnotation: "cozy-system/root-ca"},
+		},
+		{
+			name:            "overwriting a platform annotation is ignored",
+			annotations:     map[string]string{caSourceAnnotation: "tenant-root/forged", "team.io/owner": "blue"},
+			wantLabels:      map[string]string{tsLabelKey: tsLabelValue, tenantCALabel: "true", "team": "blue"},
+			wantAnnotations: map[string]string{caSourceAnnotation: "cozy-system/root-ca", "team.io/owner": "blue"},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			r := newTestREST(t, existing.DeepCopy())
+			in := &corev1alpha1.TenantSecret{
+				ObjectMeta: metav1.ObjectMeta{
+					Name:        "creds",
+					Namespace:   testNamespace,
+					Labels:      tt.labels,
+					Annotations: tt.annotations,
+				},
+				Type: string(corev1.SecretTypeOpaque),
+			}
+
+			_, _, err := r.Update(testCtx(), "creds", rest.DefaultUpdatedObjectInfo(in), nil, nil, false, &metav1.UpdateOptions{})
+			if err != nil {
+				t.Fatalf("Update returned error: %v", err)
+			}
+
+			sec := backingSecret(t, r, "creds")
+			if !reflect.DeepEqual(sec.Labels, tt.wantLabels) {
+				t.Fatalf("backing Secret labels: got %v, want %v", sec.Labels, tt.wantLabels)
+			}
+			if !reflect.DeepEqual(sec.Annotations, tt.wantAnnotations) {
+				t.Fatalf("backing Secret annotations: got %v, want %v", sec.Annotations, tt.wantAnnotations)
+			}
+		})
+	}
+}
+
+// PATCH is served out of Update — rest.Patcher is Getter+Updater — so the guard
+// that covers it is the one in tenantToSecret. This pins Update against a caller
+// sending only the keys it wants set, which is the shape a patched object takes
+// by the time it reaches the merge inside tenantToSecret.
+func TestUpdate_PatchShapedObjectCannotPlantPlatformLabels(t *testing.T) {
+	r := newTestREST(t, makeTenantSecret("creds", map[string]string{tenantCALabel: "true"}))
+	patched := &corev1alpha1.TenantSecret{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "creds",
+			Namespace: testNamespace,
+			Labels:    map[string]string{caCopyLabel: "true"},
+		},
+	}
+
+	_, _, err := r.Update(testCtx(), "creds", rest.DefaultUpdatedObjectInfo(patched), nil, nil, false, &metav1.UpdateOptions{})
+	if err != nil {
+		t.Fatalf("Update returned error: %v", err)
+	}
+
+	want := map[string]string{tsLabelKey: tsLabelValue, tenantCALabel: "true"}
+	if got := backingSecret(t, r, "creds").Labels; !reflect.DeepEqual(got, want) {
+		t.Fatalf("backing Secret labels: got %v, want %v", got, want)
+	}
+}
+
+// A write reaches the backing Secret exactly once, so a write that fails leaves
+// the stored object as it was and the caller's keys never become visible to a
+// controller or a List. A path that committed the caller's object first and
+// repaired it afterwards would open that window, and leave it open for good
+// when the repair failed.
+func TestUpdate_FailedWriteLeavesTheBackingSecretIntact(t *testing.T) {
+	scheme := runtime.NewScheme()
+	if err := corev1.AddToScheme(scheme); err != nil {
+		t.Fatalf("add corev1 to scheme: %v", err)
+	}
+	fc := fake.NewClientBuilder().
+		WithScheme(scheme).
+		WithObjects(makeTenantSecret("creds", map[string]string{tenantCALabel: "true"})).
+		WithInterceptorFuncs(interceptor.Funcs{
+			Update: func(context.Context, client.WithWatch, client.Object, ...client.UpdateOption) error {
+				return errors.New("boom")
+			},
+		}).
+		Build()
+	r := &REST{c: fc, w: fc, gvr: schema.GroupVersionResource{
+		Group: corev1alpha1.GroupName, Version: "v1alpha1", Resource: "tenantsecrets",
+	}}
+
+	in := &corev1alpha1.TenantSecret{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "creds",
+			Namespace: testNamespace,
+			Labels:    map[string]string{tsLabelKey: "false", tenantCALabel: "false", "team": "blue"},
+		},
+	}
+	if _, _, err := r.Update(testCtx(), "creds", rest.DefaultUpdatedObjectInfo(in), nil, nil, false, &metav1.UpdateOptions{}); err == nil {
+		t.Fatal("Update reported success although the write to the backing Secret failed")
+	}
+
+	want := map[string]string{tsLabelKey: tsLabelValue, tenantCALabel: "true"}
+	if got := backingSecret(t, r, "creds").Labels; !reflect.DeepEqual(got, want) {
+		t.Fatalf("backing Secret labels after a failed write: got %v, want %v", got, want)
+	}
+}
+
+// The drop-rather-than-reject decision rests on this round trip: a tenant sees
+// the platform's keys on read, so `kubectl edit` sends them straight back, and
+// that write has to be accepted with the stored values, and the payload, intact.
+func TestUpdate_UnchangedRoundTripKeepsPlatformKeys(t *testing.T) {
+	existing := makeTenantSecret("creds", map[string]string{
+		tenantCALabel: "true",
+		"team":        "blue",
+	})
+	existing.Annotations = map[string]string{
+		caSourceAnnotation: "cozy-system/root-ca",
+		"team.io/owner":    "blue",
+	}
+	existing.Data = map[string][]byte{"password": []byte("s3cr3t")}
+	r := newTestREST(t, existing)
+
+	obj, err := r.Get(testCtx(), "creds", &metav1.GetOptions{})
+	if err != nil {
+		t.Fatalf("Get returned error: %v", err)
+	}
+	got, ok := obj.(*corev1alpha1.TenantSecret)
+	if !ok {
+		t.Fatalf("expected *TenantSecret, got %T", obj)
+	}
+
+	_, _, err = r.Update(testCtx(), "creds", rest.DefaultUpdatedObjectInfo(got), nil, nil, false, &metav1.UpdateOptions{})
+	if err != nil {
+		t.Fatalf("Update of an unmodified object returned error: %v", err)
+	}
+
+	sec := backingSecret(t, r, "creds")
+	wantLabels := map[string]string{
+		tsLabelKey:    tsLabelValue,
+		tenantCALabel: "true",
+		"team":        "blue",
+	}
+	wantAnnotations := map[string]string{
+		caSourceAnnotation: "cozy-system/root-ca",
+		"team.io/owner":    "blue",
+	}
+	if !reflect.DeepEqual(sec.Labels, wantLabels) {
+		t.Fatalf("backing Secret labels after a round trip: got %v, want %v", sec.Labels, wantLabels)
+	}
+	if !reflect.DeepEqual(sec.Annotations, wantAnnotations) {
+		t.Fatalf("backing Secret annotations after a round trip: got %v, want %v", sec.Annotations, wantAnnotations)
+	}
+	// The read hands back both Data and its base64 rendering in StringData; a
+	// round trip that took the StringData branch would re-encode the payload.
+	if got := string(sec.Data["password"]); got != "s3cr3t" {
+		t.Fatalf("backing Secret payload after a round trip: got %q, want %q", got, "s3cr3t")
+	}
+}
+
+// Every case above names a key some controller writes today, and an
+// implementation that filtered that list instead of the prefix would pass all
+// of them. Only a key nobody has claimed yet tells the two apart, so each write
+// path gets one.
+func TestWrites_DropUnclaimedInternalKeys(t *testing.T) {
+	const (
+		futureLabel      = "internal.cozystack.io/some-future-marker"
+		futureAnnotation = "internal.cozystack.io/some-future-source"
+	)
+
+	forged := func(labels map[string]string) *corev1alpha1.TenantSecret {
+		return &corev1alpha1.TenantSecret{
+			ObjectMeta: metav1.ObjectMeta{
+				Name:        "creds",
+				Namespace:   testNamespace,
+				Labels:      labels,
+				Annotations: map[string]string{futureAnnotation: "forged", "team.io/owner": "blue"},
+			},
+			Type: string(corev1.SecretTypeOpaque),
+		}
+	}
+
+	tests := []struct {
+		name       string
+		seed       bool
+		write      func(t *testing.T, r *REST)
+		wantLabels map[string]string
+	}{
+		{
+			name: "create",
+			write: func(t *testing.T, r *REST) {
+				t.Helper()
+				in := forged(map[string]string{futureLabel: "true", "team": "blue"})
+				if _, err := r.Create(testCtx(), in, nil, &metav1.CreateOptions{}); err != nil {
+					t.Fatalf("Create returned error: %v", err)
+				}
+			},
+			wantLabels: map[string]string{tsLabelKey: tsLabelValue, "team": "blue"},
+		},
+		{
+			name: "update",
+			seed: true,
+			write: func(t *testing.T, r *REST) {
+				t.Helper()
+				in := forged(map[string]string{futureLabel: "true", "team": "blue"})
+				_, _, err := r.Update(testCtx(), "creds", rest.DefaultUpdatedObjectInfo(in), nil, nil, false, &metav1.UpdateOptions{})
+				if err != nil {
+					t.Fatalf("Update returned error: %v", err)
+				}
+			},
+			wantLabels: map[string]string{tsLabelKey: tsLabelValue, tenantCALabel: "true", "team": "blue"},
+		},
+		{
+			name: "patch-shaped update carrying nothing but the forged keys",
+			seed: true,
+			write: func(t *testing.T, r *REST) {
+				t.Helper()
+				in := forged(map[string]string{futureLabel: "true"})
+				in.Annotations = map[string]string{futureAnnotation: "forged"}
+				_, _, err := r.Update(testCtx(), "creds", rest.DefaultUpdatedObjectInfo(in), nil, nil, false, &metav1.UpdateOptions{})
+				if err != nil {
+					t.Fatalf("Update returned error: %v", err)
+				}
+			},
+			wantLabels: map[string]string{tsLabelKey: tsLabelValue, tenantCALabel: "true"},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			var r *REST
+			if tt.seed {
+				r = newTestREST(t, makeTenantSecret("creds", map[string]string{tenantCALabel: "true"}))
+			} else {
+				r = newTestREST(t)
+			}
+
+			tt.write(t, r)
+
+			sec := backingSecret(t, r, "creds")
+			if !reflect.DeepEqual(sec.Labels, tt.wantLabels) {
+				t.Fatalf("backing Secret labels: got %v, want %v", sec.Labels, tt.wantLabels)
+			}
+			if _, ok := sec.Annotations[futureAnnotation]; ok {
+				t.Fatalf("unclaimed platform annotation survived the write: %v", sec.Annotations)
+			}
+		})
+	}
+}
+
+// Reads are not filtered beyond the tenant-resource marker: a tenant is allowed
+// to see the platform's verdicts, it just cannot write them.
+func TestGet_KeepsPlatformLabelsVisible(t *testing.T) {
+	r := newTestREST(t, makeTenantSecret("creds", map[string]string{tenantCALabel: "true"}))
+
+	obj, err := r.Get(testCtx(), "creds", &metav1.GetOptions{})
+	if err != nil {
+		t.Fatalf("Get returned error: %v", err)
+	}
+	ts, ok := obj.(*corev1alpha1.TenantSecret)
+	if !ok {
+		t.Fatalf("expected *TenantSecret, got %T", obj)
+	}
+	if ts.Labels[tenantCALabel] != "true" {
+		t.Fatalf("tenant-ca label hidden from the tenant: got %v", ts.Labels)
+	}
+}
+
+// The apiserver's patch handler builds the patched object from the old object
+// handed to UpdatedObject and answers 404 when it is nil, so Update has to pass
+// the stored TenantSecret rather than nil.
+func TestUpdate_PassesStoredObjectToUpdatedObjectInfo(t *testing.T) {
+	r := newTestREST(t, makeTenantSecret("creds", nil))
+
+	patch := func(_ context.Context, newObj, oldObj runtime.Object) (runtime.Object, error) {
+		if oldObj == nil {
+			return nil, errors.New("UpdatedObject received a nil old object")
+		}
+		out := oldObj.DeepCopyObject().(*corev1alpha1.TenantSecret)
+		out.Labels = map[string]string{"probe": "x"}
+		return out, nil
+	}
+
+	if _, _, err := r.Update(testCtx(), "creds", rest.DefaultUpdatedObjectInfo(nil, patch), nil, nil, false, &metav1.UpdateOptions{}); err != nil {
+		t.Fatalf("Update returned error: %v", err)
+	}
+	if got := backingSecret(t, r, "creds").Labels["probe"]; got != "x" {
+		t.Fatalf("patched label not stored: got %q", got)
+	}
+}
diff --git a/pkg/registry/errors.go b/pkg/registry/errors.go
new file mode 100644
index 0000000000..9cfab4261e
--- /dev/null
+++ b/pkg/registry/errors.go
@@ -0,0 +1,48 @@
+/*
+Copyright 2026 The Cozystack Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package registry
+
+import (
+	"errors"
+	"fmt"
+
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+)
+
+// WrapPreservingStatus maps a backing API error to the requested resource.
+// ErrorToAPIStatus does not unwrap errors, so the result must implement
+// APIStatus directly to retain the backend's HTTP code and reason.
+func WrapPreservingStatus(msg string, err error, resource schema.GroupResource, name string) error {
+	msg = fmt.Sprintf("%s %q: %s", resource.String(), name, msg)
+	var status apierrors.APIStatus
+	if errors.As(err, &status) {
+		backendStatus := status.Status()
+		st := backendStatus.DeepCopy()
+		if st.Details == nil {
+			st.Details = &metav1.StatusDetails{}
+		}
+		st.Details.Group = resource.Group
+		st.Details.Kind = resource.Resource
+		st.Details.Name = name
+		st.Details.UID = ""
+		st.Message = fmt.Sprintf("%s: %s", msg, st.Message)
+		return &apierrors.StatusError{ErrStatus: *st}
+	}
+	return fmt.Errorf("%s: %w", msg, err)
+}
diff --git a/pkg/registry/errors_test.go b/pkg/registry/errors_test.go
new file mode 100644
index 0000000000..1309bd22cc
--- /dev/null
+++ b/pkg/registry/errors_test.go
@@ -0,0 +1,79 @@
+/*
+Copyright 2026 The Cozystack Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package registry
+
+import (
+	"errors"
+	"fmt"
+	"reflect"
+	"testing"
+
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apimachinery/pkg/util/validation/field"
+	"k8s.io/apiserver/pkg/endpoints/handlers/responsewriters"
+)
+
+func TestWrapPreservingStatusKeepsBackendErrorUnchanged(t *testing.T) {
+	invalid := apierrors.NewInvalid(schema.GroupKind{Group: "helm.toolkit.fluxcd.io", Kind: "HelmRelease"}, "postgresql-example", field.ErrorList{
+		field.Required(field.NewPath("spec", "chartRef"), "chart reference is required"),
+	})
+	for _, backend := range []*apierrors.StatusError{invalid, apierrors.NewTooManyRequests("try again later", 5), apierrors.NewBadRequest("invalid request")} {
+		t.Run(string(backend.ErrStatus.Reason), func(t *testing.T) {
+			before := backend.ErrStatus.DeepCopy()
+			resource := schema.GroupResource{Group: "apps.cozystack.io", Resource: "postgresqls"}
+			err := WrapPreservingStatus("failed to update HelmRelease", fmt.Errorf("backend: %w", backend), resource, "example")
+			status := responsewriters.ErrorToAPIStatus(err)
+			if status.Code != before.Code || status.Reason != before.Reason || status.Status != before.Status {
+				t.Fatalf("wire status = %#v, lost backend status %#v", status, before)
+			}
+			if status.Details == nil || status.Details.Group != resource.Group || status.Details.Kind != resource.Resource || status.Details.Name != "example" {
+				t.Fatalf("wire details = %#v, want the requested Application", status.Details)
+			}
+			if before.Details != nil && (!reflect.DeepEqual(status.Details.Causes, before.Details.Causes) || status.Details.RetryAfterSeconds != before.Details.RetryAfterSeconds) {
+				t.Fatalf("wire details = %#v, lost backend causes or retry delay %#v", status.Details, before.Details)
+			}
+			if !reflect.DeepEqual(&backend.ErrStatus, before) {
+				t.Fatalf("backend error was mutated: got %#v, want %#v", backend.ErrStatus, *before)
+			}
+		})
+	}
+}
+
+func TestWrapPreservingStatusDropsBackendUID(t *testing.T) {
+	backend := apierrors.NewConflict(schema.GroupResource{Group: "helm.toolkit.fluxcd.io", Resource: "helmreleases"}, "postgresql-example", errors.New("the object has been modified"))
+	backend.ErrStatus.Details.UID = "0f4b6a9e-6c5c-4c1c-9d1e-2b1d0c7a5f11"
+	resource := schema.GroupResource{Group: "apps.cozystack.io", Resource: "postgresqls"}
+	status := responsewriters.ErrorToAPIStatus(WrapPreservingStatus("failed to update HelmRelease", backend, resource, "example"))
+	if status.Details == nil || status.Details.UID != "" {
+		t.Fatalf("wire details = %#v, carry the backing HelmRelease UID into the aggregated status", status.Details)
+	}
+	if status.Details.Group != resource.Group || status.Details.Kind != resource.Resource || status.Details.Name != "example" {
+		t.Fatalf("wire details = %#v, want the requested Application", status.Details)
+	}
+	if status.Code != backend.ErrStatus.Code || status.Reason != backend.ErrStatus.Reason {
+		t.Fatalf("wire status = %#v, lost backend status %#v", status, backend.ErrStatus)
+	}
+}
+
+func TestWrapPreservingStatusKeepsNonStatusCause(t *testing.T) {
+	backend := errors.New("connection lost")
+	err := WrapPreservingStatus("failed to update HelmRelease", backend, schema.GroupResource{Group: "apps.cozystack.io", Resource: "postgresqls"}, "example")
+	if !errors.Is(err, backend) {
+		t.Fatalf("wrapped error %v lost its cause", err)
+	}
+}
diff --git a/pkg/registry/registrytest/watch.go b/pkg/registry/registrytest/watch.go
new file mode 100644
index 0000000000..15d168a440
--- /dev/null
+++ b/pkg/registry/registrytest/watch.go
@@ -0,0 +1,57 @@
+/*
+Copyright 2026 The Cozystack Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// Package registrytest holds test helpers shared by the aggregated storages.
+package registrytest
+
+import (
+	"context"
+	"reflect"
+	"sync"
+
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/watch"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+)
+
+// RawRecordingWatch records the raw options of each backing watch request, per
+// list type, and passes the call through. The controller-runtime fake client
+// ignores most raw options, so their effect cannot be read off the event stream.
+type RawRecordingWatch struct {
+	client.WithWatch
+
+	mu  sync.Mutex
+	raw map[reflect.Type]*metav1.ListOptions
+}
+
+func (s *RawRecordingWatch) Watch(ctx context.Context, list client.ObjectList, opts ...client.ListOption) (watch.Interface, error) {
+	lo := &client.ListOptions{}
+	lo.ApplyOptions(opts)
+	s.mu.Lock()
+	if s.raw == nil {
+		s.raw = map[reflect.Type]*metav1.ListOptions{}
+	}
+	s.raw[reflect.TypeOf(list)] = lo.Raw
+	s.mu.Unlock()
+	return s.WithWatch.Watch(ctx, list, opts...)
+}
+
+// RawFor returns the raw options of the last watch on list's type, or nil.
+func (s *RawRecordingWatch) RawFor(list client.ObjectList) *metav1.ListOptions {
+	s.mu.Lock()
+	defer s.mu.Unlock()
+	return s.raw[reflect.TypeOf(list)]
+}
diff --git a/pkg/registry/sdn/securitygroup/cilium.go b/pkg/registry/sdn/securitygroup/cilium.go
new file mode 100644
index 0000000000..fa0ddb65a7
--- /dev/null
+++ b/pkg/registry/sdn/securitygroup/cilium.go
@@ -0,0 +1,260 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright 2026 The Cozystack Authors.
+
+// Package securitygroup implements the REST storage for the SecurityGroup
+// resource. SecurityGroup is a namespace-scoped projection of a single
+// CiliumNetworkPolicy: the storage translates each SecurityGroup into a
+// CiliumNetworkPolicy in the same namespace and back.
+package securitygroup
+
+import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+
+	sdnv1alpha1 "github.com/cozystack/cozystack/pkg/apis/sdn/v1alpha1"
+)
+
+// CiliumNetworkPolicy is a minimal, in-tree mirror of the cilium.io/v2
+// CiliumNetworkPolicy resource. It carries only the metadata and the subset of
+// the policy spec that SecurityGroup exposes, so the Cozystack API server can
+// read and write CiliumNetworkPolicy objects through a controller-runtime
+// client without importing the full Cilium module. Importing it would tie this
+// project's k8s.io libraries to Cilium's: Go builds with the higher of the two
+// required versions, so a Cilium release built on a newer Kubernetes would drag
+// them forward, and one built on an older Kubernetes would have to compile
+// against ours.
+type CiliumNetworkPolicy struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	// Spec is the policy enforced by the CiliumNetworkPolicy.
+	Spec *CiliumNetworkPolicySpec `json:"spec,omitempty"`
+}
+
+// CiliumNetworkPolicySpec is the subset of the cilium.io/v2 CiliumNetworkPolicy
+// spec that the SecurityGroup projection writes. Unlike SecurityGroupSpec it
+// carries a concrete endpointSelector (set by the storage to the SecurityGroup's
+// own membership label, never copied from tenant input) and Cilium-shaped
+// ingress/egress rules with endpoint selectors. The JSON tags match the
+// CiliumNetworkPolicy CRD exactly, so marshalling produces a wire-compatible
+// object.
+type CiliumNetworkPolicySpec struct {
+	// EndpointSelector selects the pods the policy applies to. The storage sets
+	// it to the SecurityGroup's own membership label.
+	EndpointSelector metav1.LabelSelector `json:"endpointSelector,omitempty"`
+
+	// Ingress is the list of allowed inbound traffic rules. It is always
+	// serialized (an empty list, not omitted) and the projection guarantees it is
+	// non-nil. The backing CiliumNetworkPolicy CRD requires at least one rule
+	// section to be present (spec anyOf: ingress|ingressDeny|egress|egressDeny),
+	// so a rules-less (membership-only) SecurityGroup would otherwise project to a
+	// selector-only spec the cilium.io/v2 API rejects synchronously. An empty
+	// ingress list is the CRD's documented no-op ("if omitted or empty, this rule
+	// does not apply at ingress"), and enableDefaultDeny defaults to false for a
+	// direction with no rules, so the always-present list keeps the policy
+	// schema-valid while leaving the member pods' connectivity untouched. The
+	// non-nil guarantee matters because the CRD has no nullable fields: a nil
+	// slice without omitempty would marshal to null and be rejected.
+	Ingress []CiliumIngressRule `json:"ingress"`
+
+	// Egress is the list of allowed outbound traffic rules. Unlike Ingress it
+	// keeps omitempty: ingress is the guaranteed-present carrier that satisfies the
+	// CRD anyOf in every case, so egress is emitted only when there are egress
+	// rules.
+	Egress []CiliumEgressRule `json:"egress,omitempty"`
+}
+
+// CiliumIngressRule mirrors a single cilium.io/v2 ingress rule. fromApp/fromSG
+// peers project into fromEndpoints label selectors; fromCIDR and toPorts carry
+// over 1:1. PortRule/FQDNSelector are reused from the SecurityGroup types
+// because their wire shape already matches Cilium.
+type CiliumIngressRule struct {
+	// FromEndpoints selects allowed source pods by label.
+	FromEndpoints []metav1.LabelSelector `json:"fromEndpoints,omitempty"`
+
+	// FromCIDR is a list of CIDR ranges allowed as traffic sources.
+	FromCIDR []string `json:"fromCIDR,omitempty"`
+
+	// ToPorts restricts the rule to the listed destination ports.
+	ToPorts []sdnv1alpha1.PortRule `json:"toPorts,omitempty"`
+}
+
+// CiliumEgressRule mirrors a single cilium.io/v2 egress rule. toApp/toSG peers
+// project into toEndpoints label selectors; toCIDR, toFQDNs and toPorts carry
+// over 1:1.
+type CiliumEgressRule struct {
+	// ToEndpoints selects allowed destination pods by label.
+	ToEndpoints []metav1.LabelSelector `json:"toEndpoints,omitempty"`
+
+	// ToCIDR is a list of CIDR ranges allowed as traffic destinations.
+	ToCIDR []string `json:"toCIDR,omitempty"`
+
+	// ToFQDNs is a list of FQDN matchers allowed as traffic destinations.
+	ToFQDNs []sdnv1alpha1.FQDNSelector `json:"toFQDNs,omitempty"`
+
+	// ToPorts restricts the rule to the listed destination ports.
+	ToPorts []sdnv1alpha1.PortRule `json:"toPorts,omitempty"`
+}
+
+// CiliumNetworkPolicyList is a list of CiliumNetworkPolicy objects.
+type CiliumNetworkPolicyList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+	Items           []CiliumNetworkPolicy `json:"items"`
+}
+
+const (
+	ciliumGroup       = "cilium.io"
+	ciliumVersion     = "v2"
+	cnpKind           = "CiliumNetworkPolicy"
+	cnpAPIVersionFull = ciliumGroup + "/" + ciliumVersion
+)
+
+// ciliumGroupVersion is the {group,version} of the backing CiliumNetworkPolicy.
+var ciliumGroupVersion = schema.GroupVersion{Group: ciliumGroup, Version: ciliumVersion}
+
+// AddToScheme registers the in-tree CiliumNetworkPolicy mirror with the given
+// scheme so the controller-runtime client can serialize the backing objects.
+func AddToScheme(scheme *runtime.Scheme) error {
+	scheme.AddKnownTypes(ciliumGroupVersion,
+		&CiliumNetworkPolicy{},
+		&CiliumNetworkPolicyList{},
+	)
+	metav1.AddToGroupVersion(scheme, ciliumGroupVersion)
+	return nil
+}
+
+// DeepCopyInto copies the receiver into out.
+func (in *CiliumNetworkPolicy) DeepCopyInto(out *CiliumNetworkPolicy) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
+	if in.Spec != nil {
+		out.Spec = in.Spec.DeepCopy()
+	}
+}
+
+// DeepCopy returns a deep copy of the receiver.
+func (in *CiliumNetworkPolicy) DeepCopy() *CiliumNetworkPolicy {
+	if in == nil {
+		return nil
+	}
+	out := new(CiliumNetworkPolicy)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject returns a deep copy of the receiver as a runtime.Object.
+func (in *CiliumNetworkPolicy) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto copies the receiver into out. Hand-written because cilium.go is
+// not run through deepcopy-gen.
+func (in *CiliumNetworkPolicySpec) DeepCopyInto(out *CiliumNetworkPolicySpec) {
+	*out = *in
+	in.EndpointSelector.DeepCopyInto(&out.EndpointSelector)
+	if in.Ingress != nil {
+		out.Ingress = make([]CiliumIngressRule, len(in.Ingress))
+		for i := range in.Ingress {
+			in.Ingress[i].DeepCopyInto(&out.Ingress[i])
+		}
+	}
+	if in.Egress != nil {
+		out.Egress = make([]CiliumEgressRule, len(in.Egress))
+		for i := range in.Egress {
+			in.Egress[i].DeepCopyInto(&out.Egress[i])
+		}
+	}
+}
+
+// DeepCopy returns a deep copy of the receiver.
+func (in *CiliumNetworkPolicySpec) DeepCopy() *CiliumNetworkPolicySpec {
+	if in == nil {
+		return nil
+	}
+	out := new(CiliumNetworkPolicySpec)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto copies the receiver into out.
+func (in *CiliumIngressRule) DeepCopyInto(out *CiliumIngressRule) {
+	*out = *in
+	if in.FromEndpoints != nil {
+		out.FromEndpoints = make([]metav1.LabelSelector, len(in.FromEndpoints))
+		for i := range in.FromEndpoints {
+			in.FromEndpoints[i].DeepCopyInto(&out.FromEndpoints[i])
+		}
+	}
+	if in.FromCIDR != nil {
+		out.FromCIDR = make([]string, len(in.FromCIDR))
+		copy(out.FromCIDR, in.FromCIDR)
+	}
+	if in.ToPorts != nil {
+		out.ToPorts = make([]sdnv1alpha1.PortRule, len(in.ToPorts))
+		for i := range in.ToPorts {
+			in.ToPorts[i].DeepCopyInto(&out.ToPorts[i])
+		}
+	}
+}
+
+// DeepCopyInto copies the receiver into out.
+func (in *CiliumEgressRule) DeepCopyInto(out *CiliumEgressRule) {
+	*out = *in
+	if in.ToEndpoints != nil {
+		out.ToEndpoints = make([]metav1.LabelSelector, len(in.ToEndpoints))
+		for i := range in.ToEndpoints {
+			in.ToEndpoints[i].DeepCopyInto(&out.ToEndpoints[i])
+		}
+	}
+	if in.ToCIDR != nil {
+		out.ToCIDR = make([]string, len(in.ToCIDR))
+		copy(out.ToCIDR, in.ToCIDR)
+	}
+	if in.ToFQDNs != nil {
+		out.ToFQDNs = make([]sdnv1alpha1.FQDNSelector, len(in.ToFQDNs))
+		copy(out.ToFQDNs, in.ToFQDNs)
+	}
+	if in.ToPorts != nil {
+		out.ToPorts = make([]sdnv1alpha1.PortRule, len(in.ToPorts))
+		for i := range in.ToPorts {
+			in.ToPorts[i].DeepCopyInto(&out.ToPorts[i])
+		}
+	}
+}
+
+// DeepCopyInto copies the receiver into out.
+func (in *CiliumNetworkPolicyList) DeepCopyInto(out *CiliumNetworkPolicyList) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ListMeta.DeepCopyInto(&out.ListMeta)
+	if in.Items != nil {
+		out.Items = make([]CiliumNetworkPolicy, len(in.Items))
+		for i := range in.Items {
+			in.Items[i].DeepCopyInto(&out.Items[i])
+		}
+	}
+}
+
+// DeepCopy returns a deep copy of the receiver.
+func (in *CiliumNetworkPolicyList) DeepCopy() *CiliumNetworkPolicyList {
+	if in == nil {
+		return nil
+	}
+	out := new(CiliumNetworkPolicyList)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject returns a deep copy of the receiver as a runtime.Object.
+func (in *CiliumNetworkPolicyList) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
diff --git a/pkg/registry/sdn/securitygroup/rest.go b/pkg/registry/sdn/securitygroup/rest.go
new file mode 100644
index 0000000000..a06439a75e
--- /dev/null
+++ b/pkg/registry/sdn/securitygroup/rest.go
@@ -0,0 +1,1145 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright 2026 The Cozystack Authors.
+
+// SecurityGroup registry – namespaced projection over CiliumNetworkPolicy
+// objects labelled "sdn.cozystack.io/securitygroup=true". The marker label is
+// hidden from the SecurityGroup view.
+
+package securitygroup
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"maps"
+	"net/http"
+	"slices"
+	"strconv"
+	"strings"
+	"time"
+
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	metainternal "k8s.io/apimachinery/pkg/apis/meta/internalversion"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/labels"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apimachinery/pkg/selection"
+	"k8s.io/apimachinery/pkg/types"
+	"k8s.io/apimachinery/pkg/util/duration"
+	"k8s.io/apimachinery/pkg/watch"
+	"k8s.io/apiserver/pkg/endpoints/request"
+	"k8s.io/apiserver/pkg/registry/rest"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+
+	sdnv1alpha1 "github.com/cozystack/cozystack/pkg/apis/sdn/v1alpha1"
+	"github.com/cozystack/cozystack/pkg/registry"
+	fieldfilter "github.com/cozystack/cozystack/pkg/registry/fields"
+	"github.com/cozystack/cozystack/pkg/registry/sorting"
+)
+
+// -----------------------------------------------------------------------------
+// Constants & helpers
+// -----------------------------------------------------------------------------
+
+const (
+	// sgLabelKey marks the CiliumNetworkPolicy objects owned by the SecurityGroup
+	// API. Only marked policies are visible through this storage; unmarked
+	// policies (e.g. platform tenant-isolation policies) are left untouched.
+	sgLabelKey   = "sdn.cozystack.io/securitygroup"
+	sgLabelValue = "true"
+
+	// attachmentsAnnotation stores the SecurityGroup's spec.attachments on the
+	// backing CiliumNetworkPolicy as a JSON array of ApplicationReference. The
+	// attachment list has no home in the CiliumNetworkPolicy spec (the backing
+	// endpointSelector is the SecurityGroup's own membership label, not the
+	// attached apps' labels), so the storage owns this annotation: it is
+	// re-asserted from spec.attachments on every write and hidden from the
+	// SecurityGroup view on read, exactly like the marker label. The
+	// securitygroup-controller reads it to know which apps' pods to label.
+	attachmentsAnnotation = "sdn.cozystack.io/attachments"
+
+	// appGroupLabelKey, appKindLabelKey and appNameLabelKey are the lineage
+	// labels the lineage mutating webhook stamps on every managed-app pod
+	// (see internal/lineagecontrollerwebhook/webhook.go ManagerGroupKey/
+	// ManagerKindKey/ManagerNameKey). fromApp/toApp peers project into
+	// endpointSelectors on these keys, and the securitygroup-controller resolves
+	// attachments to pods by them. Mirrored here to keep this registry package
+	// from depending on internal/.
+	appGroupLabelKey = "apps.cozystack.io/application.group"
+	appKindLabelKey  = "apps.cozystack.io/application.kind"
+	appNameLabelKey  = "apps.cozystack.io/application.name"
+
+	// defaultAppGroup is the API group an ApplicationReference defaults to when
+	// APIGroup is empty — the group under which Cozystack serves managed apps.
+	defaultAppGroup = "apps.cozystack.io"
+
+	singularName = sdnv1alpha1.SecurityGroupSingularName
+	kindSG       = sdnv1alpha1.SecurityGroupKind
+	kindSGList   = sdnv1alpha1.SecurityGroupListKind
+)
+
+// membershipLabelKey returns the SecurityGroup's own membership label key, the
+// backing CiliumNetworkPolicy's endpointSelector match key and the key a
+// fromSG/toSG peer resolves to on the referenced group.
+func membershipLabelKey(name string) string {
+	return sdnv1alpha1.MembershipLabelPrefix + name
+}
+
+// buildEndpointSelector returns the backing endpointSelector — the
+// SecurityGroup's own membership label — so the policy applies to exactly the
+// pods the securitygroup-controller has stamped as members.
+func buildEndpointSelector(name string) metav1.LabelSelector {
+	return metav1.LabelSelector{MatchLabels: map[string]string{membershipLabelKey(name): ""}}
+}
+
+// appLabels projects an ApplicationReference into the lineage labels that select
+// the referenced application's pods. An empty APIGroup defaults to
+// apps.cozystack.io.
+func appLabels(ref sdnv1alpha1.ApplicationReference) map[string]string {
+	group := ref.APIGroup
+	if group == "" {
+		group = defaultAppGroup
+	}
+	return map[string]string{
+		appGroupLabelKey: group,
+		appKindLabelKey:  ref.Kind,
+		appNameLabelKey:  ref.Name,
+	}
+}
+
+// appFromSelector reads an endpointSelector built from appLabels back into an
+// ApplicationReference. It matches only a selector carrying exactly the three
+// lineage keys, so a fromSG selector (a single membership key) is not mistaken
+// for an app peer.
+func appFromSelector(sel metav1.LabelSelector) (sdnv1alpha1.ApplicationReference, bool) {
+	if len(sel.MatchLabels) != 3 {
+		return sdnv1alpha1.ApplicationReference{}, false
+	}
+	g, gok := sel.MatchLabels[appGroupLabelKey]
+	k, kok := sel.MatchLabels[appKindLabelKey]
+	n, nok := sel.MatchLabels[appNameLabelKey]
+	if !gok || !kok || !nok {
+		return sdnv1alpha1.ApplicationReference{}, false
+	}
+	return sdnv1alpha1.ApplicationReference{APIGroup: g, Kind: k, Name: n}, true
+}
+
+// sgFromSelector reads a membership-label endpointSelector back into the name of
+// the referenced SecurityGroup. It matches only a selector carrying exactly one
+// membership key.
+func sgFromSelector(sel metav1.LabelSelector) (string, bool) {
+	if len(sel.MatchLabels) != 1 {
+		return "", false
+	}
+	for k := range sel.MatchLabels {
+		if after, ok := strings.CutPrefix(k, sdnv1alpha1.MembershipLabelPrefix); ok {
+			return after, true
+		}
+	}
+	return "", false
+}
+
+// projectIngress turns the SecurityGroup ingress rules into Cilium ingress
+// rules: fromApp peers become lineage-label endpointSelectors, fromSG peers
+// become membership-label endpointSelectors, and fromCIDR/toPorts carry over.
+// It always returns a non-nil slice (empty when there are no rules): the backing
+// CiliumNetworkPolicy's ingress section must be present on the wire to satisfy
+// the CRD anyOf, and a non-nil empty slice serializes to an empty list rather
+// than null (which the CRD, having no nullable fields, would reject).
+func projectIngress(rules []sdnv1alpha1.IngressRule) []CiliumIngressRule {
+	out := make([]CiliumIngressRule, len(rules))
+	for i := range rules {
+		var eps []metav1.LabelSelector
+		for _, app := range rules[i].FromApp {
+			eps = append(eps, metav1.LabelSelector{MatchLabels: appLabels(app)})
+		}
+		for _, name := range rules[i].FromSG {
+			eps = append(eps, metav1.LabelSelector{MatchLabels: map[string]string{membershipLabelKey(name): ""}})
+		}
+		out[i] = CiliumIngressRule{
+			FromEndpoints: eps,
+			FromCIDR:      append([]string(nil), rules[i].FromCIDR...),
+			ToPorts:       rules[i].ToPorts,
+		}
+	}
+	return out
+}
+
+// projectEgress is the egress counterpart of projectIngress.
+func projectEgress(rules []sdnv1alpha1.EgressRule) []CiliumEgressRule {
+	if rules == nil {
+		return nil
+	}
+	out := make([]CiliumEgressRule, len(rules))
+	for i := range rules {
+		var eps []metav1.LabelSelector
+		for _, app := range rules[i].ToApp {
+			eps = append(eps, metav1.LabelSelector{MatchLabels: appLabels(app)})
+		}
+		for _, name := range rules[i].ToSG {
+			eps = append(eps, metav1.LabelSelector{MatchLabels: map[string]string{membershipLabelKey(name): ""}})
+		}
+		out[i] = CiliumEgressRule{
+			ToEndpoints: eps,
+			ToCIDR:      append([]string(nil), rules[i].ToCIDR...),
+			ToFQDNs:     rules[i].ToFQDNs,
+			ToPorts:     rules[i].ToPorts,
+		}
+	}
+	return out
+}
+
+// reconstructIngress is the inverse of projectIngress, reading Cilium ingress
+// rules back into the SecurityGroup view. Endpoint selectors that match neither
+// the lineage-label nor the membership-label shape are ignored, so a
+// hand-edited backing policy degrades gracefully rather than erroring.
+func reconstructIngress(rules []CiliumIngressRule) []sdnv1alpha1.IngressRule {
+	// Collapse an empty list to nil so the always-present empty ingress section the
+	// projection emits for a rules-less group (to satisfy the CRD anyOf) is
+	// invisible in the SecurityGroup view, keeping the rules-less round-trip exact.
+	if len(rules) == 0 {
+		return nil
+	}
+	out := make([]sdnv1alpha1.IngressRule, len(rules))
+	for i := range rules {
+		var apps []sdnv1alpha1.ApplicationReference
+		var sgs []string
+		for _, ep := range rules[i].FromEndpoints {
+			if app, ok := appFromSelector(ep); ok {
+				apps = append(apps, app)
+			} else if name, ok := sgFromSelector(ep); ok {
+				sgs = append(sgs, name)
+			}
+		}
+		out[i] = sdnv1alpha1.IngressRule{
+			FromApp:  apps,
+			FromSG:   sgs,
+			FromCIDR: append([]string(nil), rules[i].FromCIDR...),
+			ToPorts:  rules[i].ToPorts,
+		}
+	}
+	return out
+}
+
+// reconstructEgress is the egress counterpart of reconstructIngress.
+func reconstructEgress(rules []CiliumEgressRule) []sdnv1alpha1.EgressRule {
+	// Collapse an empty list to nil for the same reason as reconstructIngress, so a
+	// SecurityGroup that carries no egress rules round-trips with egress unset.
+	if len(rules) == 0 {
+		return nil
+	}
+	out := make([]sdnv1alpha1.EgressRule, len(rules))
+	for i := range rules {
+		var apps []sdnv1alpha1.ApplicationReference
+		var sgs []string
+		for _, ep := range rules[i].ToEndpoints {
+			if app, ok := appFromSelector(ep); ok {
+				apps = append(apps, app)
+			} else if name, ok := sgFromSelector(ep); ok {
+				sgs = append(sgs, name)
+			}
+		}
+		out[i] = sdnv1alpha1.EgressRule{
+			ToApp:   apps,
+			ToSG:    sgs,
+			ToCIDR:  append([]string(nil), rules[i].ToCIDR...),
+			ToFQDNs: rules[i].ToFQDNs,
+			ToPorts: rules[i].ToPorts,
+		}
+	}
+	return out
+}
+
+// encodeAttachments serializes spec.attachments for the backing-policy
+// annotation. An empty APIGroup is canonicalized to apps.cozystack.io so the
+// stored value is unambiguous for the securitygroup-controller (and surfaced
+// that way on read). An empty list yields the empty string so the caller omits
+// the annotation entirely.
+func encodeAttachments(refs []sdnv1alpha1.ApplicationReference) string {
+	if len(refs) == 0 {
+		return ""
+	}
+	canon := make([]sdnv1alpha1.ApplicationReference, len(refs))
+	for i, r := range refs {
+		if r.APIGroup == "" {
+			r.APIGroup = defaultAppGroup
+		}
+		canon[i] = r
+	}
+	b, err := json.Marshal(canon)
+	if err != nil {
+		return ""
+	}
+	return string(b)
+}
+
+// decodeAttachments parses the backing-policy annotation back into
+// spec.attachments. A missing or malformed value yields nil, so a hand-edited
+// backing policy degrades gracefully rather than erroring.
+func decodeAttachments(s string) []sdnv1alpha1.ApplicationReference {
+	if s == "" {
+		return nil
+	}
+	var refs []sdnv1alpha1.ApplicationReference
+	if err := json.Unmarshal([]byte(s), &refs); err != nil {
+		return nil
+	}
+	return refs
+}
+
+// stripMarkerLabel returns a copy of m without the SecurityGroup marker label.
+func stripMarkerLabel(m map[string]string) map[string]string {
+	if m == nil {
+		return nil
+	}
+	out := make(map[string]string, len(m))
+	for k, v := range m {
+		if k == sgLabelKey {
+			continue
+		}
+		out[k] = v
+	}
+	return out
+}
+
+// stripInternalAnnotations returns a copy of m without the storage-owned
+// attachments annotation, which is surfaced as spec.attachments instead. A
+// result with no entries is returned as nil so the SecurityGroup view carries no
+// empty annotations map.
+func stripInternalAnnotations(m map[string]string) map[string]string {
+	if m == nil {
+		return nil
+	}
+	out := make(map[string]string, len(m))
+	for k, v := range m {
+		if k == attachmentsAnnotation {
+			continue
+		}
+		out[k] = v
+	}
+	if len(out) == 0 {
+		return nil
+	}
+	return out
+}
+
+// hasFinalizer reports whether list contains the named finalizer.
+func hasFinalizer(list []string, name string) bool {
+	return slices.Contains(list, name)
+}
+
+// dryRunDeleteResult derives the object and synchronous-delete result that the
+// backing API would return without re-reading storage. A dry-run leaves the
+// stored object untouched, so a post-delete Get cannot distinguish an
+// immediate delete from one held by existing or garbage-collection finalizers.
+func dryRunDeleteResult(current *CiliumNetworkPolicy, opts *metav1.DeleteOptions) (*CiliumNetworkPolicy, bool) {
+	out := current.DeepCopy()
+	finalizers := make([]string, 0, len(current.Finalizers)+1)
+	for _, finalizer := range current.Finalizers {
+		if finalizer != metav1.FinalizerOrphanDependents && finalizer != metav1.FinalizerDeleteDependents {
+			finalizers = append(finalizers, finalizer)
+		}
+	}
+
+	var orphanDependents *bool
+	if opts != nil {
+		orphanDependents = opts.OrphanDependents //nolint:staticcheck // SA1019: the apiserver still honours the deprecated field (shouldOrphanDependents), so the dry-run mirror reads it too.
+	}
+	if orphanDependents != nil {
+		if *orphanDependents {
+			finalizers = append(finalizers, metav1.FinalizerOrphanDependents)
+		}
+	} else if opts != nil && opts.PropagationPolicy != nil {
+		switch *opts.PropagationPolicy {
+		case metav1.DeletePropagationOrphan:
+			finalizers = append(finalizers, metav1.FinalizerOrphanDependents)
+		case metav1.DeletePropagationForeground:
+			finalizers = append(finalizers, metav1.FinalizerDeleteDependents)
+		}
+	} else {
+		// With no explicit policy, the backing API preserves an existing GC
+		// finalizer. CiliumNetworkPolicy uses background propagation by default,
+		// so it does not synthesize one when neither is already present.
+		if hasFinalizer(current.Finalizers, metav1.FinalizerOrphanDependents) {
+			finalizers = append(finalizers, metav1.FinalizerOrphanDependents)
+		} else if hasFinalizer(current.Finalizers, metav1.FinalizerDeleteDependents) {
+			finalizers = append(finalizers, metav1.FinalizerDeleteDependents)
+		}
+	}
+
+	out.Finalizers = finalizers
+	if len(finalizers) == 0 && out.DeletionTimestamp == nil {
+		return out, true
+	}
+	if out.DeletionTimestamp == nil {
+		now := metav1.Now()
+		out.DeletionTimestamp = &now
+	}
+	zero := int64(0)
+	out.DeletionGracePeriodSeconds = &zero
+	return out, false
+}
+
+func policyToSecurityGroup(np *CiliumNetworkPolicy) *sdnv1alpha1.SecurityGroup {
+	sg := &sdnv1alpha1.SecurityGroup{
+		TypeMeta: metav1.TypeMeta{
+			APIVersion: sdnv1alpha1.SchemeGroupVersion.String(),
+			Kind:       kindSG,
+		},
+		ObjectMeta: metav1.ObjectMeta{
+			Name:              np.Name,
+			Namespace:         np.Namespace,
+			UID:               np.UID,
+			ResourceVersion:   np.ResourceVersion,
+			CreationTimestamp: np.CreationTimestamp,
+			// Surface the deletion timestamp so a SecurityGroup whose backing
+			// policy is terminating (finalizer still pending) shows as Terminating
+			// to kubectl, instead of looking live.
+			DeletionTimestamp: np.DeletionTimestamp,
+			Labels:            stripMarkerLabel(np.Labels),
+			Annotations:       stripInternalAnnotations(np.Annotations),
+			OwnerReferences:   np.OwnerReferences,
+			Finalizers:        np.Finalizers,
+		},
+	}
+	if np.Spec != nil {
+		spec := np.Spec.DeepCopy()
+		sg.Spec = sdnv1alpha1.SecurityGroupSpec{
+			// Attachments live in a storage-owned annotation, not the
+			// endpointSelector (which is the SecurityGroup's own membership label).
+			Attachments: decodeAttachments(np.Annotations[attachmentsAnnotation]),
+			Ingress:     reconstructIngress(spec.Ingress),
+			Egress:      reconstructEgress(spec.Egress),
+		}
+	}
+	return sg
+}
+
+func securityGroupToPolicy(sg *sdnv1alpha1.SecurityGroup, cur *CiliumNetworkPolicy) *CiliumNetworkPolicy {
+	var out CiliumNetworkPolicy
+	if cur != nil {
+		// Preserve system metadata the SecurityGroup view does not model
+		// (resourceVersion, uid, managedFields, …); user-facing labels,
+		// annotations, ownerReferences, finalizers and spec are replaced
+		// wholesale below.
+		out = *cur.DeepCopy()
+	}
+	out.TypeMeta = metav1.TypeMeta{APIVersion: cnpAPIVersionFull, Kind: cnpKind}
+	out.Name, out.Namespace = sg.Name, sg.Namespace
+	// Carry the client-supplied resourceVersion so optimistic concurrency is
+	// preserved; the update path falls back to the current one only when empty.
+	out.ResourceVersion = sg.ResourceVersion
+
+	// Replace labels/annotations with exactly what the request carries, matching
+	// Kubernetes PUT semantics — a label or annotation the caller drops must
+	// disappear, not linger from the previous object.
+	out.Labels = make(map[string]string, len(sg.Labels)+1)
+	maps.Copy(out.Labels, sg.Labels)
+	// The marker label is owned by the storage and must always win, so it is set
+	// last. Otherwise a tenant could submit spec labels that overwrite it and
+	// orphan an enforced policy — created and applied by Cilium, but invisible
+	// to (and so uncleanable through) the SecurityGroup API.
+	out.Labels[sgLabelKey] = sgLabelValue
+
+	// Rebuild annotations from exactly what the request carries, then re-assert
+	// the storage-owned attachments annotation last (like the marker label) from
+	// spec.attachments — so the tenant cannot set or clobber it directly, and a
+	// cleared attachments list drops the annotation rather than leaving it stale.
+	out.Annotations = make(map[string]string, len(sg.Annotations)+1)
+	maps.Copy(out.Annotations, sg.Annotations)
+	if enc := encodeAttachments(sg.Spec.Attachments); enc != "" {
+		out.Annotations[attachmentsAnnotation] = enc
+	} else {
+		delete(out.Annotations, attachmentsAnnotation)
+	}
+	if len(out.Annotations) == 0 {
+		out.Annotations = nil
+	}
+
+	// Project ownerReferences and finalizers 1:1 so Kubernetes garbage
+	// collection and finalizers work on SecurityGroup objects. Like labels and
+	// annotations these follow replace semantics — they reflect the request.
+	out.OwnerReferences = sg.DeepCopy().OwnerReferences
+	out.Finalizers = append([]string(nil), sg.Finalizers...)
+
+	// Re-assert the platform-owned membership finalizer the way the marker label
+	// and attachments annotation are re-asserted. The securitygroup-controller
+	// adds it via merge patch, so it is not in the tenant-facing request body; any
+	// tenant write that omits it (a full-replace PUT) would otherwise strip it.
+	// Removing this finalizer is exclusively the controller's job — it does so via
+	// its own merge patch during the deletion-cleanup reconcile, never through
+	// this projection — so re-assert it from cur unconditionally, INCLUDING while
+	// the object is terminating. Otherwise a tenant could delete then PUT the
+	// still-terminating object to drop the finalizer, hard-deleting the backing
+	// policy before the controller strips the membership labels off member pods
+	// and orphaning them.
+	if cur != nil &&
+		hasFinalizer(cur.Finalizers, sdnv1alpha1.MembershipFinalizer) &&
+		!hasFinalizer(out.Finalizers, sdnv1alpha1.MembershipFinalizer) {
+		out.Finalizers = append(out.Finalizers, sdnv1alpha1.MembershipFinalizer)
+	}
+
+	// The backing endpointSelector is the SecurityGroup's own membership label,
+	// not a tenant-authored selector: the securitygroup-controller stamps that
+	// label onto the attached applications' pods. Rules project app/SG peers into
+	// endpoint selectors.
+	spec := sg.Spec.DeepCopy()
+	out.Spec = &CiliumNetworkPolicySpec{
+		EndpointSelector: buildEndpointSelector(sg.Name),
+		Ingress:          projectIngress(spec.Ingress),
+		Egress:           projectEgress(spec.Egress),
+	}
+	// Normalize the protocol to upper case: validation accepts it case
+	// insensitively, but the backing CiliumNetworkPolicy CRD enforces a strict
+	// upper-case enum, so a raw "tcp" would be rejected on the backing write.
+	normalizePortProtocols(out.Spec)
+	return &out
+}
+
+// normalizePortProtocols upper-cases every port protocol in place so the value
+// written to the backing CiliumNetworkPolicy matches its case-sensitive enum.
+func normalizePortProtocols(spec *CiliumNetworkPolicySpec) {
+	if spec == nil {
+		return
+	}
+	norm := func(rules []sdnv1alpha1.PortRule) {
+		for i := range rules {
+			for j := range rules[i].Ports {
+				if p := &rules[i].Ports[j]; p.Protocol != "" {
+					p.Protocol = strings.ToUpper(p.Protocol)
+				}
+			}
+		}
+	}
+	for i := range spec.Ingress {
+		norm(spec.Ingress[i].ToPorts)
+	}
+	for i := range spec.Egress {
+		norm(spec.Egress[i].ToPorts)
+	}
+}
+
+func nsFrom(ctx context.Context) (string, error) {
+	ns, ok := request.NamespaceFrom(ctx)
+	if !ok {
+		return "", apierrors.NewBadRequest("namespace required")
+	}
+	return ns, nil
+}
+
+func isSecurityGroup(np *CiliumNetworkPolicy) bool {
+	return np.Labels != nil && np.Labels[sgLabelKey] == sgLabelValue
+}
+
+// -----------------------------------------------------------------------------
+// REST storage
+// -----------------------------------------------------------------------------
+
+var (
+	_ rest.Creater                    = &REST{}
+	_ rest.Getter                     = &REST{}
+	_ rest.Lister                     = &REST{}
+	_ rest.Updater                    = &REST{}
+	_ rest.Patcher                    = &REST{}
+	_ rest.GracefulDeleter            = &REST{}
+	_ rest.MayReturnFullObjectDeleter = &REST{}
+	_ rest.Watcher                    = &REST{}
+	_ rest.TableConvertor             = &REST{}
+	_ rest.Scoper                     = &REST{}
+	_ rest.SingularNameProvider       = &REST{}
+)
+
+// REST is the storage backend translating SecurityGroup to CiliumNetworkPolicy.
+type REST struct {
+	c   client.Client
+	w   client.WithWatch
+	gvr schema.GroupVersionResource
+}
+
+// NewREST returns a SecurityGroup REST storage backed by the given clients.
+func NewREST(c client.Client, w client.WithWatch) *REST {
+	return &REST{
+		c: c,
+		w: w,
+		gvr: schema.GroupVersionResource{
+			Group:    sdnv1alpha1.GroupName,
+			Version:  "v1alpha1",
+			Resource: sdnv1alpha1.SecurityGroupPluralName,
+		},
+	}
+}
+
+// -----------------------------------------------------------------------------
+// Basic meta
+// -----------------------------------------------------------------------------
+
+// NamespaceScoped reports that SecurityGroup is a namespaced resource.
+func (*REST) NamespaceScoped() bool { return true }
+
+// New returns an empty SecurityGroup.
+func (*REST) New() runtime.Object { return &sdnv1alpha1.SecurityGroup{} }
+
+// NewList returns an empty SecurityGroupList.
+func (*REST) NewList() runtime.Object { return &sdnv1alpha1.SecurityGroupList{} }
+
+// Kind returns the resource kind.
+func (*REST) Kind() string { return kindSG }
+
+// GroupVersionKind returns the GVK served by this storage.
+func (r *REST) GroupVersionKind(_ schema.GroupVersion) schema.GroupVersionKind {
+	return r.gvr.GroupVersion().WithKind(kindSG)
+}
+
+// GetSingularName returns the singular resource name.
+func (*REST) GetSingularName() string { return singularName }
+
+// buildSelector merges the required marker label with any user-provided
+// requirements from opts.LabelSelector. Returns (selector, true) on success;
+// (nil, false) when the user selector matches nothing.
+func buildSelector(opts *metainternal.ListOptions) (labels.Selector, bool) {
+	ls := labels.NewSelector()
+	req, _ := labels.NewRequirement(sgLabelKey, selection.Equals, []string{sgLabelValue})
+	ls = ls.Add(*req)
+	if opts.LabelSelector != nil {
+		reqs, selectable := opts.LabelSelector.Requirements()
+		if !selectable {
+			return nil, false
+		}
+		if len(reqs) > 0 {
+			ls = ls.Add(reqs...)
+		}
+	}
+	return ls, true
+}
+
+// -----------------------------------------------------------------------------
+// CRUD
+// -----------------------------------------------------------------------------
+
+// Create translates a SecurityGroup into a CiliumNetworkPolicy and creates it.
+func (r *REST) Create(
+	ctx context.Context,
+	obj runtime.Object,
+	createValidation rest.ValidateObjectFunc,
+	opts *metav1.CreateOptions,
+) (runtime.Object, error) {
+	in, ok := obj.(*sdnv1alpha1.SecurityGroup)
+	if !ok {
+		return nil, fmt.Errorf("expected SecurityGroup, got %T", obj)
+	}
+
+	// Bind the object to the request namespace. The aggregated apiserver already
+	// rejects a conflicting body namespace before reaching the storage, but
+	// enforcing it here keeps the storage self-defending against a cross-namespace
+	// write regardless of the calling path.
+	ns, err := nsFrom(ctx)
+	if err != nil {
+		return nil, err
+	}
+	if in.Namespace != "" && in.Namespace != ns {
+		return nil, apierrors.NewBadRequest("metadata.namespace must match request namespace")
+	}
+	in = in.DeepCopy()
+	in.Namespace = ns
+
+	if err := validateSecurityGroup(in); err != nil {
+		return nil, err
+	}
+
+	// Run the admission chain (validating webhooks + ValidatingAdmissionPolicies)
+	// before persisting. Custom REST handlers must invoke this explicitly —
+	// unlike genericregistry.Store, which wires it automatically.
+	if createValidation != nil {
+		if err := createValidation(ctx, in); err != nil {
+			return nil, err
+		}
+	}
+
+	np := securityGroupToPolicy(in, nil)
+	if err := r.c.Create(ctx, np, registry.ClientCreateOptions(opts)); err != nil {
+		return nil, err
+	}
+	return policyToSecurityGroup(np), nil
+}
+
+// Get returns the SecurityGroup with the given name.
+func (r *REST) Get(
+	ctx context.Context,
+	name string,
+	opts *metav1.GetOptions,
+) (runtime.Object, error) {
+	ns, err := nsFrom(ctx)
+	if err != nil {
+		return nil, err
+	}
+	np := &CiliumNetworkPolicy{}
+	if err := r.c.Get(ctx, types.NamespacedName{Namespace: ns, Name: name}, np, &client.GetOptions{Raw: opts}); err != nil {
+		return nil, err
+	}
+	if !isSecurityGroup(np) {
+		return nil, apierrors.NewNotFound(r.gvr.GroupResource(), name)
+	}
+	return policyToSecurityGroup(np), nil
+}
+
+// List returns all SecurityGroups in the request namespace.
+func (r *REST) List(ctx context.Context, opts *metainternal.ListOptions) (runtime.Object, error) {
+	// A cluster-wide list (kubectl get securitygroups -A) carries an empty
+	// namespace in the context; NamespaceValue returns "" for it and the client
+	// then lists across all namespaces, so this must not require a namespace.
+	ns := request.NamespaceValue(ctx)
+
+	ls, selectable := buildSelector(opts)
+
+	emptyList := func() *sdnv1alpha1.SecurityGroupList {
+		return &sdnv1alpha1.SecurityGroupList{
+			TypeMeta: metav1.TypeMeta{
+				APIVersion: sdnv1alpha1.SchemeGroupVersion.String(),
+				Kind:       kindSGList,
+			},
+		}
+	}
+
+	if !selectable {
+		return emptyList(), nil
+	}
+
+	// controller-runtime cache doesn't support field selectors, so parse and
+	// apply metadata.name / metadata.namespace filters manually.
+	// See: https://github.com/kubernetes-sigs/controller-runtime/issues/612
+	fieldFilter, err := fieldfilter.ParseFieldSelector(opts.FieldSelector)
+	if err != nil {
+		return nil, err
+	}
+	if fieldFilter.Namespace != "" && ns != "" && ns != fieldFilter.Namespace {
+		return emptyList(), nil
+	}
+
+	list := &CiliumNetworkPolicyList{}
+	if err := r.c.List(ctx, list,
+		&client.ListOptions{
+			Namespace:     ns,
+			LabelSelector: ls,
+		}); err != nil {
+		return nil, err
+	}
+
+	listRV := list.ResourceVersion
+	if listRV == "" {
+		listRV, _ = registry.MaxResourceVersion(list)
+	}
+
+	out := &sdnv1alpha1.SecurityGroupList{
+		TypeMeta: metav1.TypeMeta{
+			APIVersion: sdnv1alpha1.SchemeGroupVersion.String(),
+			Kind:       kindSGList,
+		},
+		ListMeta: metav1.ListMeta{ResourceVersion: listRV},
+	}
+
+	for i := range list.Items {
+		if !fieldFilter.MatchesName(list.Items[i].Name) {
+			continue
+		}
+		if !fieldFilter.MatchesNamespace(list.Items[i].Namespace) {
+			continue
+		}
+		out.Items = append(out.Items, *policyToSecurityGroup(&list.Items[i]))
+	}
+	sorting.ByNamespacedName[sdnv1alpha1.SecurityGroup, *sdnv1alpha1.SecurityGroup](out.Items)
+	return out, nil
+}
+
+// Update creates or updates the CiliumNetworkPolicy backing the SecurityGroup.
+func (r *REST) Update(
+	ctx context.Context,
+	name string,
+	objInfo rest.UpdatedObjectInfo,
+	createValidation rest.ValidateObjectFunc,
+	updateValidation rest.ValidateObjectUpdateFunc,
+	forceCreate bool,
+	opts *metav1.UpdateOptions,
+) (runtime.Object, bool, error) {
+	ns, err := nsFrom(ctx)
+	if err != nil {
+		return nil, false, err
+	}
+
+	var cur *CiliumNetworkPolicy
+	previous := &CiliumNetworkPolicy{}
+	if err := r.c.Get(ctx, types.NamespacedName{Namespace: ns, Name: name}, previous, &client.GetOptions{Raw: &metav1.GetOptions{}}); err != nil {
+		if !apierrors.IsNotFound(err) {
+			return nil, false, err
+		}
+	} else {
+		if !isSecurityGroup(previous) {
+			return nil, false, apierrors.NewNotFound(r.gvr.GroupResource(), name)
+		}
+		cur = previous
+	}
+
+	oldObj := oldOrNil(cur)
+	newObj, err := objInfo.UpdatedObject(ctx, oldObj)
+	if err != nil {
+		return nil, false, err
+	}
+	in, ok := newObj.(*sdnv1alpha1.SecurityGroup)
+	if !ok {
+		return nil, false, fmt.Errorf("expected SecurityGroup, got %T", newObj)
+	}
+
+	// Enforce name identity and bind the namespace to the request target. The
+	// aggregated apiserver already rejects a mismatched name/namespace before the
+	// storage, but enforcing it here stops a force-create/update from writing a
+	// different object than the request addressed, independent of the caller.
+	if in.Name != "" && in.Name != name {
+		return nil, false, apierrors.NewBadRequest("metadata.name must match request name")
+	}
+	in = in.DeepCopy()
+	in.Name = name
+	in.Namespace = ns
+
+	if err := validateSecurityGroup(in); err != nil {
+		return nil, false, err
+	}
+
+	newNp := securityGroupToPolicy(in, cur)
+	newNp.Namespace = ns
+	if cur == nil {
+		if !forceCreate {
+			return nil, false, apierrors.NewNotFound(r.gvr.GroupResource(), name)
+		}
+		// Force-create path: run the create admission chain, mirroring Create.
+		if createValidation != nil {
+			if err := createValidation(ctx, in); err != nil {
+				return nil, false, err
+			}
+		}
+		err := r.c.Create(ctx, newNp, registry.ClientCreateOptionsFromUpdate(opts))
+		return policyToSecurityGroup(newNp), true, err
+	}
+
+	// Update path: run the update admission chain before persisting.
+	if updateValidation != nil {
+		if err := updateValidation(ctx, in, oldObj); err != nil {
+			return nil, false, err
+		}
+	}
+
+	// Honor the client-supplied resourceVersion for optimistic concurrency,
+	// falling back to the current one only when the client sent none. Without
+	// this a stale update would silently win instead of getting a 409 Conflict.
+	if newNp.ResourceVersion == "" {
+		newNp.ResourceVersion = cur.ResourceVersion
+	}
+	err = r.c.Update(ctx, newNp, registry.ClientUpdateOptions(opts))
+	return policyToSecurityGroup(newNp), false, err
+}
+
+// oldOrNil returns the SecurityGroup projection of cur, or nil when cur is nil,
+// so UpdatedObject receives a typed nil interface for creates.
+func oldOrNil(cur *CiliumNetworkPolicy) runtime.Object {
+	if cur == nil {
+		return nil
+	}
+	return policyToSecurityGroup(cur)
+}
+
+// Delete removes the CiliumNetworkPolicy backing the SecurityGroup.
+func (r *REST) Delete(
+	ctx context.Context,
+	name string,
+	deleteValidation rest.ValidateObjectFunc,
+	opts *metav1.DeleteOptions,
+) (runtime.Object, bool, error) {
+	ns, err := nsFrom(ctx)
+	if err != nil {
+		return nil, false, err
+	}
+	current := &CiliumNetworkPolicy{}
+	// Read through the direct (uncached) client: the dry-run branch derives its
+	// prospective result from this object, and a stale cache copy could
+	// misreport the finalizer set - the same skew the post-delete read below
+	// guards against.
+	if err := r.w.Get(ctx, types.NamespacedName{Namespace: ns, Name: name}, current, &client.GetOptions{Raw: &metav1.GetOptions{}}); err != nil {
+		return nil, false, err
+	}
+	if !isSecurityGroup(current) {
+		return nil, false, apierrors.NewNotFound(r.gvr.GroupResource(), name)
+	}
+	// There is a benign get-then-delete window: if the marker were flipped off
+	// between the Get and the Delete, an unmarked policy could be removed. Only
+	// an actor with direct cilium.io write (platform/admin, outside the tenant
+	// threat model) can flip the marker, so this is acceptable.
+	// Run the delete admission chain on the resolved SecurityGroup before
+	// removing the backing policy.
+	if deleteValidation != nil {
+		if err := deleteValidation(ctx, policyToSecurityGroup(current)); err != nil {
+			return nil, false, err
+		}
+	}
+	if err = r.c.Delete(ctx, &CiliumNetworkPolicy{ObjectMeta: metav1.ObjectMeta{Namespace: ns, Name: name}}, registry.ClientDeleteOptions(opts)); err != nil {
+		return nil, false, err
+	}
+	if opts != nil && len(opts.DryRun) > 0 {
+		prospective, deleted := dryRunDeleteResult(current, opts)
+		return policyToSecurityGroup(prospective), deleted, nil
+	}
+	// Report whether the delete completed synchronously, per the
+	// rest.GracefulDeleter contract whose bool means "instantly deleted". Read the
+	// post-delete state through the direct (uncached) client: the storage's
+	// cache-backed client could return a stale pre-delete object and misreport an
+	// async, finalizer-deferred delete as instant. The backing policy carries the
+	// membership finalizer (the controller adds it and the storage re-asserts it on
+	// every write), so a real delete normally lingers as Terminating until the
+	// securitygroup-controller strips the member-pod labels and clears it.
+	after := &CiliumNetworkPolicy{}
+	getErr := r.w.Get(ctx, types.NamespacedName{Namespace: ns, Name: name}, after)
+	if apierrors.IsNotFound(getErr) {
+		return policyToSecurityGroup(current), true, nil
+	}
+	if getErr != nil {
+		return nil, false, getErr
+	}
+	// A non-dry-run delete that left the object means a finalizer is holding it
+	// as Terminating, so it is asynchronous.
+	return policyToSecurityGroup(after), false, nil
+}
+
+// DeleteReturnsDeletedObject implements rest.MayReturnFullObjectDeleter: Delete
+// returns the SecurityGroup object (the deleted object on a synchronous delete,
+// the terminating object on an asynchronous one) rather than only a Status, so
+// the DELETE endpoint is advertised and serialized accordingly — matching the
+// generic registry's behavior.
+func (*REST) DeleteReturnsDeletedObject() bool { return true }
+
+// PATCH is served by the generic apiserver handler via Get + Update (the storage
+// only needs to satisfy rest.Patcher = Getter + Updater); there is no storage
+// Patch method to implement. The Update path re-asserts the marker label, so a
+// patch that drops it cannot orphan the backing policy.
+
+// -----------------------------------------------------------------------------
+// Watcher
+// -----------------------------------------------------------------------------
+
+// Watch streams SecurityGroup events translated from CiliumNetworkPolicy.
+func (r *REST) Watch(ctx context.Context, opts *metainternal.ListOptions) (watch.Interface, error) {
+	// Cluster-wide watch carries an empty namespace; NamespaceValue returns ""
+	// and the client watches across all namespaces.
+	ns := request.NamespaceValue(ctx)
+
+	ls, selectable := buildSelector(opts)
+	if !selectable {
+		ch := make(chan watch.Event)
+		close(ch)
+		return watch.NewProxyWatcher(ch), nil
+	}
+
+	// Mirror List: a watch scoped by fieldSelector=metadata.name=… must not
+	// stream every object.
+	fieldFilter, err := fieldfilter.ParseFieldSelector(opts.FieldSelector)
+	if err != nil {
+		return nil, err
+	}
+	if fieldFilter.Namespace != "" && ns != "" && ns != fieldFilter.Namespace {
+		ch := make(chan watch.Event)
+		close(ch)
+		return watch.NewProxyWatcher(ch), nil
+	}
+
+	sendInitialEvents := opts.SendInitialEvents != nil && *opts.SendInitialEvents
+
+	npList := &CiliumNetworkPolicyList{}
+	base, err := r.w.Watch(ctx, npList, &client.ListOptions{
+		Namespace:     ns,
+		LabelSelector: ls,
+		Raw: &metav1.ListOptions{
+			Watch:           true,
+			ResourceVersion: opts.ResourceVersion,
+			// Forward the WatchList request so the backing API server replays
+			// existing objects as initial ADDED events and emits the terminating
+			// bookmark; the InitialEventsBookmarker is built to consume that
+			// backing bookmark (OnBackingBookmark) and only synthesizes one as a
+			// fallback. ResourceVersionMatch must accompany SendInitialEvents.
+			SendInitialEvents:    opts.SendInitialEvents,
+			ResourceVersionMatch: opts.ResourceVersionMatch,
+			// Backing bookmarks are forwarded to the client, so ask for them only
+			// when the client did; a WatchList client always does, which keeps
+			// the terminating bookmark's trigger.
+			AllowWatchBookmarks: opts.AllowWatchBookmarks,
+		},
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	var startingRV uint64
+	if opts.ResourceVersion != "" {
+		if rv, err := strconv.ParseUint(opts.ResourceVersion, 10, 64); err == nil {
+			startingRV = rv
+		}
+	}
+
+	bookmarker := registry.NewInitialEventsBookmarker(registry.InitialEventsEndBookmarkRequested(opts), opts.ResourceVersion, func() runtime.Object {
+		return &sdnv1alpha1.SecurityGroup{
+			TypeMeta: metav1.TypeMeta{
+				APIVersion: sdnv1alpha1.SchemeGroupVersion.String(),
+				Kind:       kindSG,
+			},
+		}
+	})
+
+	ch := make(chan watch.Event)
+	proxy := watch.NewProxyWatcher(ch)
+
+	go func() {
+		defer proxy.Stop()
+		defer base.Stop()
+
+		send := func(ev watch.Event) bool {
+			select {
+			case ch <- ev:
+				return true
+			case <-proxy.StopChan():
+				return false
+			case <-ctx.Done():
+				return false
+			}
+		}
+
+		for ev := range base.ResultChan() {
+			if ev.Type == watch.Bookmark {
+				if np, ok := ev.Object.(*CiliumNetworkPolicy); ok {
+					bookmark, _ := bookmarker.OnBackingBookmark(np.ResourceVersion)
+					if !send(bookmark) {
+						return
+					}
+				}
+				continue
+			}
+
+			// watch.Error carries a *metav1.Status, not a CiliumNetworkPolicy, so
+			// the type assertion below would silently drop it and leave the client
+			// with a cleanly closed stream. Forward it verbatim so the client sees
+			// the error (e.g. a 410 Gone for an expired resourceVersion) and
+			// performs the required relist.
+			if ev.Type == watch.Error {
+				if !send(ev) {
+					return
+				}
+				continue
+			}
+
+			np, ok := ev.Object.(*CiliumNetworkPolicy)
+			if !ok || np == nil {
+				continue
+			}
+			bookmarker.Observe(np.ResourceVersion)
+
+			// DELETED events must always pass through: when a policy's labels
+			// mutate out of the selector, the apiserver synthesizes a DELETED with
+			// the new (non-matching) labels — dropping it would leave cached
+			// clients with stale entries.
+			if ev.Type != watch.Deleted && !ls.Matches(labels.Set(np.Labels)) {
+				continue
+			}
+			// Unlike labels, a policy's name and namespace are immutable, so the
+			// DELETED bypass that the label selector needs does not apply here: a
+			// field-selected watch (e.g. metadata.name=sg-a) must not receive
+			// sg-b's deletion. Apply the field filter to every event type.
+			if !fieldFilter.MatchesName(np.Name) || !fieldFilter.MatchesNamespace(np.Namespace) {
+				continue
+			}
+
+			sg := policyToSecurityGroup(np)
+
+			// De-dup ADDED events the client has already seen when resuming a plain
+			// watch from a resourceVersion. This must NOT run during a
+			// sendInitialEvents replay: there the backing API intentionally re-emits
+			// existing objects as initial ADDED events with RV <= startingRV, and
+			// dropping them would break the initial-state replay.
+			if !sendInitialEvents && ev.Type == watch.Added && startingRV > 0 {
+				objRV, parseErr := strconv.ParseUint(sg.ResourceVersion, 10, 64)
+				if parseErr == nil && objRV <= startingRV {
+					continue
+				}
+			}
+
+			if bookmark, ok := bookmarker.BeforeLiveEvent(ev.Type); ok {
+				if !send(bookmark) {
+					return
+				}
+			}
+
+			if !send(watch.Event{Type: ev.Type, Object: sg}) {
+				return
+			}
+		}
+
+		if bookmark, ok := bookmarker.OnClose(); ok {
+			send(bookmark)
+		}
+	}()
+
+	return proxy, nil
+}
+
+// -----------------------------------------------------------------------------
+// TableConvertor
+// -----------------------------------------------------------------------------
+
+// ConvertToTable renders SecurityGroups for kubectl's table output.
+func (r *REST) ConvertToTable(_ context.Context, obj runtime.Object, _ runtime.Object) (*metav1.Table, error) {
+	now := time.Now()
+	row := func(o *sdnv1alpha1.SecurityGroup) metav1.TableRow {
+		return metav1.TableRow{
+			Cells:  []any{o.Name, duration.HumanDuration(now.Sub(o.CreationTimestamp.Time))},
+			Object: runtime.RawExtension{Object: o},
+		}
+	}
+
+	tbl := &metav1.Table{
+		TypeMeta: metav1.TypeMeta{APIVersion: "meta.k8s.io/v1", Kind: "Table"},
+		ColumnDefinitions: []metav1.TableColumnDefinition{
+			{Name: "NAME", Type: "string"},
+			{Name: "AGE", Type: "string"},
+		},
+	}
+
+	switch v := obj.(type) {
+	case *sdnv1alpha1.SecurityGroupList:
+		for i := range v.Items {
+			tbl.Rows = append(tbl.Rows, row(&v.Items[i]))
+		}
+		tbl.ResourceVersion = v.ResourceVersion
+	case *sdnv1alpha1.SecurityGroup:
+		tbl.Rows = append(tbl.Rows, row(v))
+		tbl.ResourceVersion = v.ResourceVersion
+	default:
+		return nil, notAcceptable{r.gvr.GroupResource(), fmt.Sprintf("unexpected %T", obj)}
+	}
+	return tbl, nil
+}
+
+// -----------------------------------------------------------------------------
+// Boiler-plate
+// -----------------------------------------------------------------------------
+
+// Destroy releases resources held by the storage. There are none.
+func (*REST) Destroy() {}
+
+type notAcceptable struct {
+	resource schema.GroupResource
+	message  string
+}
+
+func (e notAcceptable) Error() string { return e.message }
+func (e notAcceptable) Status() metav1.Status {
+	return metav1.Status{
+		Status:  metav1.StatusFailure,
+		Code:    http.StatusNotAcceptable,
+		Reason:  metav1.StatusReason("NotAcceptable"),
+		Message: e.message,
+	}
+}
diff --git a/pkg/registry/sdn/securitygroup/rest_test.go b/pkg/registry/sdn/securitygroup/rest_test.go
new file mode 100644
index 0000000000..5473dfd56c
--- /dev/null
+++ b/pkg/registry/sdn/securitygroup/rest_test.go
@@ -0,0 +1,1521 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright 2026 The Cozystack Authors.
+
+package securitygroup
+
+import (
+	"context"
+	"encoding/json"
+	"errors"
+	"reflect"
+	"sort"
+	"strings"
+	"testing"
+
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	metainternal "k8s.io/apimachinery/pkg/apis/meta/internalversion"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/fields"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apimachinery/pkg/types"
+	"k8s.io/apimachinery/pkg/watch"
+	"k8s.io/apiserver/pkg/endpoints/request"
+	"k8s.io/apiserver/pkg/registry/rest"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/client/fake"
+	"sigs.k8s.io/controller-runtime/pkg/client/interceptor"
+
+	sdnv1alpha1 "github.com/cozystack/cozystack/pkg/apis/sdn/v1alpha1"
+)
+
+const testNamespace = "tenant-root"
+
+func newTestREST(t *testing.T, policies ...*CiliumNetworkPolicy) *REST {
+	t.Helper()
+
+	scheme := runtime.NewScheme()
+	if err := AddToScheme(scheme); err != nil {
+		t.Fatalf("add cilium mirror to scheme: %v", err)
+	}
+
+	objs := make([]client.Object, 0, len(policies))
+	for _, p := range policies {
+		objs = append(objs, p)
+	}
+	fc := fake.NewClientBuilder().
+		WithScheme(scheme).
+		WithObjects(objs...).
+		Build()
+
+	return &REST{
+		c: fc,
+		w: fc,
+		gvr: schema.GroupVersionResource{
+			Group:    sdnv1alpha1.GroupName,
+			Version:  "v1alpha1",
+			Resource: sdnv1alpha1.SecurityGroupPluralName,
+		},
+	}
+}
+
+// markedPolicy is a CiliumNetworkPolicy carrying the SecurityGroup marker label.
+func markedPolicy(name string) *CiliumNetworkPolicy {
+	return &CiliumNetworkPolicy{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      name,
+			Namespace: testNamespace,
+			Labels:    map[string]string{sgLabelKey: sgLabelValue},
+		},
+	}
+}
+
+// unmarkedPolicy is a CiliumNetworkPolicy without the marker label (e.g. a
+// platform tenant-isolation policy) that SecurityGroup must not surface.
+func unmarkedPolicy(name string) *CiliumNetworkPolicy {
+	return &CiliumNetworkPolicy{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      name,
+			Namespace: testNamespace,
+		},
+	}
+}
+
+func sampleSpec() sdnv1alpha1.SecurityGroupSpec {
+	return sdnv1alpha1.SecurityGroupSpec{
+		Attachments: []sdnv1alpha1.ApplicationReference{
+			{APIGroup: "apps.cozystack.io", Kind: "Postgres", Name: "db"},
+		},
+		Ingress: []sdnv1alpha1.IngressRule{
+			{
+				// Explicit APIGroup keeps the round-trip exact (an empty group is
+				// surfaced as the defaulted apps.cozystack.io on read).
+				FromApp:  []sdnv1alpha1.ApplicationReference{{APIGroup: "apps.cozystack.io", Kind: "Kubernetes", Name: "web"}},
+				FromSG:   []string{"frontend"},
+				FromCIDR: []string{"10.0.0.0/8"},
+				ToPorts: []sdnv1alpha1.PortRule{
+					{Ports: []sdnv1alpha1.PortProtocol{{Port: "5432", Protocol: "TCP"}}},
+				},
+			},
+		},
+		Egress: []sdnv1alpha1.EgressRule{
+			{
+				ToFQDNs: []sdnv1alpha1.FQDNSelector{{MatchPattern: "*.apt.example.org"}},
+				ToCIDR:  []string{"192.0.2.0/24"},
+			},
+		},
+	}
+}
+
+func ctxNS() context.Context {
+	return request.WithNamespace(context.Background(), testNamespace)
+}
+
+func createSG(t *testing.T, r *REST, sg *sdnv1alpha1.SecurityGroup) *sdnv1alpha1.SecurityGroup {
+	t.Helper()
+	out, err := r.Create(ctxNS(), sg, nil, &metav1.CreateOptions{})
+	if err != nil {
+		t.Fatalf("Create returned error: %v", err)
+	}
+	got, ok := out.(*sdnv1alpha1.SecurityGroup)
+	if !ok {
+		t.Fatalf("Create returned %T, want *SecurityGroup", out)
+	}
+	return got
+}
+
+func TestCreateTranslatesSpecAndMarksPolicy(t *testing.T) {
+	r := newTestREST(t)
+
+	in := &sdnv1alpha1.SecurityGroup{
+		ObjectMeta: metav1.ObjectMeta{Name: "sg-db", Namespace: testNamespace},
+		Spec:       sampleSpec(),
+	}
+	got := createSG(t, r, in)
+
+	// The returned SecurityGroup must not leak the internal marker label.
+	if _, ok := got.Labels[sgLabelKey]; ok {
+		t.Fatalf("Create leaked marker label into SecurityGroup view: %v", got.Labels)
+	}
+
+	// The backing CiliumNetworkPolicy must carry the marker label and the spec.
+	np := &CiliumNetworkPolicy{}
+	if err := r.c.Get(context.Background(), types.NamespacedName{Namespace: testNamespace, Name: "sg-db"}, np); err != nil {
+		t.Fatalf("backing policy not found: %v", err)
+	}
+	if np.Labels[sgLabelKey] != sgLabelValue {
+		t.Fatalf("backing policy missing marker label: %v", np.Labels)
+	}
+	if np.Spec == nil {
+		t.Fatalf("backing policy has no spec")
+	}
+	// The endpointSelector must be the SecurityGroup's own membership label, not
+	// any attached app's labels.
+	wantSel := map[string]string{"securitygroup.sdn.cozystack.io/sg-db": ""}
+	if !reflect.DeepEqual(np.Spec.EndpointSelector.MatchLabels, wantSel) {
+		t.Fatalf("membership endpointSelector mismatch:\n got: %+v\nwant: %+v", np.Spec.EndpointSelector.MatchLabels, wantSel)
+	}
+	// The attachments are persisted as a storage-owned annotation on the backing
+	// policy and hidden from the SecurityGroup view.
+	if np.Annotations[attachmentsAnnotation] == "" {
+		t.Fatalf("backing policy missing attachments annotation: %v", np.Annotations)
+	}
+	if _, ok := got.Annotations[attachmentsAnnotation]; ok {
+		t.Fatalf("Create leaked attachments annotation into SecurityGroup view: %v", got.Annotations)
+	}
+	// fromApp projects to a lineage-label endpointSelector; fromSG to a
+	// membership-label endpointSelector; fromCIDR carries over.
+	ing := np.Spec.Ingress
+	if len(ing) != 1 || len(ing[0].FromEndpoints) != 2 {
+		t.Fatalf("ingress projection mismatch: %+v", ing)
+	}
+	wantApp := map[string]string{
+		"apps.cozystack.io/application.group": "apps.cozystack.io",
+		"apps.cozystack.io/application.kind":  "Kubernetes",
+		"apps.cozystack.io/application.name":  "web",
+	}
+	if !reflect.DeepEqual(ing[0].FromEndpoints[0].MatchLabels, wantApp) {
+		t.Fatalf("fromApp not projected to lineage labels: %+v", ing[0].FromEndpoints[0].MatchLabels)
+	}
+	wantSG := map[string]string{"securitygroup.sdn.cozystack.io/frontend": ""}
+	if !reflect.DeepEqual(ing[0].FromEndpoints[1].MatchLabels, wantSG) {
+		t.Fatalf("fromSG not projected to membership label: %+v", ing[0].FromEndpoints[1].MatchLabels)
+	}
+	if len(ing[0].FromCIDR) != 1 || ing[0].FromCIDR[0] != "10.0.0.0/8" {
+		t.Fatalf("fromCIDR not carried over: %+v", ing[0].FromCIDR)
+	}
+}
+
+func TestCreateGetSpecRoundTrip(t *testing.T) {
+	r := newTestREST(t)
+	in := &sdnv1alpha1.SecurityGroup{
+		ObjectMeta: metav1.ObjectMeta{Name: "sg-db", Namespace: testNamespace},
+		Spec:       sampleSpec(),
+	}
+	createSG(t, r, in)
+
+	out, err := r.Get(ctxNS(), "sg-db", &metav1.GetOptions{})
+	if err != nil {
+		t.Fatalf("Get returned error: %v", err)
+	}
+	got := out.(*sdnv1alpha1.SecurityGroup)
+	if !reflect.DeepEqual(got.Spec, sampleSpec()) {
+		t.Fatalf("spec round-trip mismatch:\n got: %+v\nwant: %+v", got.Spec, sampleSpec())
+	}
+}
+
+func TestEgressPeerProjectionRoundTrip(t *testing.T) {
+	// Egress toApp/toSG peers mirror the ingress fromApp/fromSG path: toApp
+	// projects to a lineage-label endpointSelector and toSG to the referenced
+	// group's membership-label endpointSelector, and both reconstruct on read. A
+	// mistake here would point an egress allow at the wrong endpoints — a real
+	// network-policy consequence — so the path is pinned end to end, symmetric to
+	// the ingress coverage.
+	r := newTestREST(t)
+	in := &sdnv1alpha1.SecurityGroup{
+		ObjectMeta: metav1.ObjectMeta{Name: "sg-egress", Namespace: testNamespace},
+		Spec: sdnv1alpha1.SecurityGroupSpec{
+			Attachments: []sdnv1alpha1.ApplicationReference{{APIGroup: "apps.cozystack.io", Kind: "Postgres", Name: "db"}},
+			Egress: []sdnv1alpha1.EgressRule{
+				{
+					ToApp: []sdnv1alpha1.ApplicationReference{{APIGroup: "apps.cozystack.io", Kind: "Kubernetes", Name: "web"}},
+					ToSG:  []string{"frontend"},
+					ToPorts: []sdnv1alpha1.PortRule{
+						{Ports: []sdnv1alpha1.PortProtocol{{Port: "5432", Protocol: "TCP"}}},
+					},
+				},
+			},
+		},
+	}
+	createSG(t, r, in)
+
+	np := &CiliumNetworkPolicy{}
+	if err := r.c.Get(context.Background(), types.NamespacedName{Namespace: testNamespace, Name: "sg-egress"}, np); err != nil {
+		t.Fatalf("backing policy not found: %v", err)
+	}
+	eg := np.Spec.Egress
+	if len(eg) != 1 || len(eg[0].ToEndpoints) != 2 {
+		t.Fatalf("egress projection mismatch: %+v", eg)
+	}
+	wantApp := map[string]string{
+		"apps.cozystack.io/application.group": "apps.cozystack.io",
+		"apps.cozystack.io/application.kind":  "Kubernetes",
+		"apps.cozystack.io/application.name":  "web",
+	}
+	if !reflect.DeepEqual(eg[0].ToEndpoints[0].MatchLabels, wantApp) {
+		t.Fatalf("toApp not projected to lineage labels: %+v", eg[0].ToEndpoints[0].MatchLabels)
+	}
+	wantSG := map[string]string{"securitygroup.sdn.cozystack.io/frontend": ""}
+	if !reflect.DeepEqual(eg[0].ToEndpoints[1].MatchLabels, wantSG) {
+		t.Fatalf("toSG not projected to membership label: %+v", eg[0].ToEndpoints[1].MatchLabels)
+	}
+
+	// The SecurityGroup view reconstructs toApp/toSG (and the carried port) from
+	// the backing endpoint selectors, round-tripping exactly.
+	out, err := r.Get(ctxNS(), "sg-egress", &metav1.GetOptions{})
+	if err != nil {
+		t.Fatalf("Get returned error: %v", err)
+	}
+	got := out.(*sdnv1alpha1.SecurityGroup)
+	if !reflect.DeepEqual(got.Spec.Egress, in.Spec.Egress) {
+		t.Fatalf("egress peer round-trip mismatch:\n got: %+v\nwant: %+v", got.Spec.Egress, in.Spec.Egress)
+	}
+}
+
+func TestCreateDefaultsAttachmentAPIGroup(t *testing.T) {
+	r := newTestREST(t)
+	in := &sdnv1alpha1.SecurityGroup{
+		ObjectMeta: metav1.ObjectMeta{Name: "sg-db", Namespace: testNamespace},
+		Spec: sdnv1alpha1.SecurityGroupSpec{
+			Attachments: []sdnv1alpha1.ApplicationReference{{Kind: "Postgres", Name: "db"}},
+		},
+	}
+	createSG(t, r, in)
+
+	// The backing policy's attachments annotation defaults the empty APIGroup to
+	// apps.cozystack.io so the controller resolves the right lineage labels.
+	np := &CiliumNetworkPolicy{}
+	if err := r.c.Get(context.Background(), types.NamespacedName{Namespace: testNamespace, Name: "sg-db"}, np); err != nil {
+		t.Fatalf("backing policy not found: %v", err)
+	}
+	att := decodeAttachments(np.Annotations[attachmentsAnnotation])
+	if len(att) != 1 || att[0].APIGroup != "apps.cozystack.io" {
+		t.Fatalf("attachment APIGroup not defaulted: %+v", att)
+	}
+}
+
+func TestEndpointSelectorIsMembershipLabel(t *testing.T) {
+	r := newTestREST(t)
+	createSG(t, r, &sdnv1alpha1.SecurityGroup{
+		ObjectMeta: metav1.ObjectMeta{Name: "sg-db", Namespace: testNamespace},
+		Spec: sdnv1alpha1.SecurityGroupSpec{
+			Attachments: []sdnv1alpha1.ApplicationReference{{Kind: "Postgres", Name: "db"}},
+		},
+	})
+
+	np := &CiliumNetworkPolicy{}
+	if err := r.c.Get(context.Background(), types.NamespacedName{Namespace: testNamespace, Name: "sg-db"}, np); err != nil {
+		t.Fatalf("backing policy not found: %v", err)
+	}
+	want := map[string]string{"securitygroup.sdn.cozystack.io/sg-db": ""}
+	if np.Spec == nil || !reflect.DeepEqual(np.Spec.EndpointSelector.MatchLabels, want) {
+		t.Fatalf("membership endpointSelector = %+v, want matchLabels %+v", np.Spec, want)
+	}
+	if len(np.Spec.EndpointSelector.MatchExpressions) != 0 {
+		t.Fatalf("membership endpointSelector must carry no matchExpressions: %+v", np.Spec.EndpointSelector.MatchExpressions)
+	}
+}
+
+func TestGetUnmarkedPolicyIsNotFound(t *testing.T) {
+	r := newTestREST(t, unmarkedPolicy("tenant-isolation"))
+	_, err := r.Get(ctxNS(), "tenant-isolation", &metav1.GetOptions{})
+	if !apierrors.IsNotFound(err) {
+		t.Fatalf("Get of unmarked policy: got err %v, want NotFound", err)
+	}
+}
+
+func TestListReturnsOnlyMarkedPolicies(t *testing.T) {
+	r := newTestREST(t,
+		markedPolicy("sg-b"),
+		markedPolicy("sg-a"),
+		unmarkedPolicy("tenant-isolation"),
+	)
+
+	out, err := r.List(ctxNS(), &metainternal.ListOptions{})
+	if err != nil {
+		t.Fatalf("List returned error: %v", err)
+	}
+	list := out.(*sdnv1alpha1.SecurityGroupList)
+
+	names := make([]string, len(list.Items))
+	for i, it := range list.Items {
+		names[i] = it.Name
+		if _, ok := it.Labels[sgLabelKey]; ok {
+			t.Fatalf("List leaked marker label for %q", it.Name)
+		}
+	}
+	// List must exclude the unmarked policy and be sorted by name.
+	want := []string{"sg-a", "sg-b"}
+	if !sort.StringsAreSorted(names) || !reflect.DeepEqual(names, want) {
+		t.Fatalf("List names = %v, want sorted %v", names, want)
+	}
+}
+
+func TestUpdateModifiesSpec(t *testing.T) {
+	r := newTestREST(t)
+	createSG(t, r, &sdnv1alpha1.SecurityGroup{
+		ObjectMeta: metav1.ObjectMeta{Name: "sg-db", Namespace: testNamespace},
+		Spec:       sampleSpec(),
+	})
+
+	updated := &sdnv1alpha1.SecurityGroup{
+		ObjectMeta: metav1.ObjectMeta{Name: "sg-db", Namespace: testNamespace},
+		Spec: sdnv1alpha1.SecurityGroupSpec{
+			Attachments: []sdnv1alpha1.ApplicationReference{{APIGroup: "apps.cozystack.io", Kind: "Postgres", Name: "db"}},
+			Ingress: []sdnv1alpha1.IngressRule{
+				{ToPorts: []sdnv1alpha1.PortRule{{Ports: []sdnv1alpha1.PortProtocol{{Port: "6379", Protocol: "TCP"}}}}},
+			},
+		},
+	}
+	out, created, err := r.Update(ctxNS(), "sg-db",
+		rest.DefaultUpdatedObjectInfo(updated), nil, nil, false, &metav1.UpdateOptions{})
+	if err != nil {
+		t.Fatalf("Update returned error: %v", err)
+	}
+	if created {
+		t.Fatalf("Update reported created=true for an existing object")
+	}
+	got := out.(*sdnv1alpha1.SecurityGroup)
+	if !reflect.DeepEqual(got.Spec, updated.Spec) {
+		t.Fatalf("Update spec mismatch:\n got: %+v\nwant: %+v", got.Spec, updated.Spec)
+	}
+}
+
+func TestDeleteUnmarkedPolicyIsNotFound(t *testing.T) {
+	r := newTestREST(t, unmarkedPolicy("tenant-isolation"))
+	_, _, err := r.Delete(ctxNS(), "tenant-isolation", nil, &metav1.DeleteOptions{})
+	if !apierrors.IsNotFound(err) {
+		t.Fatalf("Delete of unmarked policy: got err %v, want NotFound", err)
+	}
+}
+
+func TestDeleteRemovesBackingPolicy(t *testing.T) {
+	r := newTestREST(t, markedPolicy("sg-db"))
+	_, deleted, err := r.Delete(ctxNS(), "sg-db", nil, &metav1.DeleteOptions{})
+	if err != nil {
+		t.Fatalf("Delete returned error: %v", err)
+	}
+	if !deleted {
+		t.Fatalf("Delete reported deleted=false")
+	}
+	np := &CiliumNetworkPolicy{}
+	err = r.c.Get(context.Background(), types.NamespacedName{Namespace: testNamespace, Name: "sg-db"}, np)
+	if !apierrors.IsNotFound(err) {
+		t.Fatalf("backing policy still present after delete: err=%v", err)
+	}
+}
+
+func TestDeleteWithFinalizerReportsAsync(t *testing.T) {
+	// The backing policy carries the membership finalizer, so deleting it is
+	// asynchronous: it gets a deletionTimestamp and survives until the controller
+	// strips the member-pod labels and clears the finalizer. The storage must
+	// report this per the rest.GracefulDeleter contract — deleted=false plus the
+	// terminating object — so the endpoint emits 202 Accepted, not a 200 that
+	// claims the object is already gone.
+	cnp := markedPolicy("sg-db")
+	cnp.Finalizers = []string{sdnv1alpha1.MembershipFinalizer}
+	r := newTestREST(t, cnp)
+
+	obj, deleted, err := r.Delete(ctxNS(), "sg-db", nil, &metav1.DeleteOptions{})
+	if err != nil {
+		t.Fatalf("Delete returned error: %v", err)
+	}
+	if deleted {
+		t.Fatalf("Delete of a finalizer-guarded policy reported deleted=true; want false (async)")
+	}
+	sg, ok := obj.(*sdnv1alpha1.SecurityGroup)
+	if !ok {
+		t.Fatalf("Delete returned %T, want *SecurityGroup", obj)
+	}
+	if sg.DeletionTimestamp == nil {
+		t.Fatalf("async delete must surface the terminating object with a deletionTimestamp: %+v", sg)
+	}
+
+	// The backing policy must still be retrievable while the finalizer holds it.
+	np := &CiliumNetworkPolicy{}
+	if err := r.c.Get(context.Background(), types.NamespacedName{Namespace: testNamespace, Name: "sg-db"}, np); err != nil {
+		t.Fatalf("policy hard-deleted despite a pending finalizer: %v", err)
+	}
+}
+
+func TestDeleteDryRunReportsPolicyWithoutFinalizerAsInstant(t *testing.T) {
+	// A dry-run delete must report what a real delete would do without re-reading
+	// the object: for a finalizer-less policy the real delete is instant, so the
+	// dry-run reports deleted=true. (Re-reading after the delete would see the
+	// dry-run-preserved object and wrongly report it as still present / async.)
+	r := newTestREST(t, markedPolicy("sg-db"))
+	_, deleted, err := r.Delete(ctxNS(), "sg-db", nil, &metav1.DeleteOptions{DryRun: []string{metav1.DryRunAll}})
+	if err != nil {
+		t.Fatalf("dry-run Delete returned error: %v", err)
+	}
+	if !deleted {
+		t.Fatalf("dry-run Delete of a finalizer-less policy reported deleted=false; want true (instant)")
+	}
+
+	// Explicitly disabled orphaning must not synthesize a finalizer either; the
+	// dry-run object survives, so the same storage serves the second call.
+	orphanDisabled := false
+	//nolint:staticcheck // SA1019: the apiserver still honours the deprecated OrphanDependents, so the dry-run mirror is exercised with it.
+	_, deleted, err = r.Delete(ctxNS(), "sg-db", nil, &metav1.DeleteOptions{DryRun: []string{metav1.DryRunAll}, OrphanDependents: &orphanDisabled})
+	if err != nil {
+		t.Fatalf("dry-run Delete with orphanDependents=false returned error: %v", err)
+	}
+	if !deleted {
+		t.Fatalf("dry-run Delete with orphanDependents=false reported deleted=false; want true (instant)")
+	}
+}
+
+func TestDeleteDryRunReportsProspectiveAsyncState(t *testing.T) {
+	foreground := metav1.DeletePropagationForeground
+	orphan := metav1.DeletePropagationOrphan
+	orphanDependents := true
+	tests := []struct {
+		name              string
+		initialFinalizers []string
+		options           *metav1.DeleteOptions
+		wantFinalizer     string
+		absentFinalizer   string
+	}{
+		{
+			name:              "existing membership finalizer",
+			initialFinalizers: []string{sdnv1alpha1.MembershipFinalizer},
+			options:           &metav1.DeleteOptions{DryRun: []string{metav1.DryRunAll}},
+			wantFinalizer:     sdnv1alpha1.MembershipFinalizer,
+		},
+		{
+			name:          "foreground propagation",
+			options:       &metav1.DeleteOptions{DryRun: []string{metav1.DryRunAll}, PropagationPolicy: &foreground},
+			wantFinalizer: metav1.FinalizerDeleteDependents,
+		},
+		{
+			name:          "orphan propagation",
+			options:       &metav1.DeleteOptions{DryRun: []string{metav1.DryRunAll}, PropagationPolicy: &orphan},
+			wantFinalizer: metav1.FinalizerOrphanDependents,
+		},
+		{
+			name: "explicit orphanDependents",
+			//nolint:staticcheck // SA1019: the apiserver still honours the deprecated OrphanDependents, so the dry-run mirror is exercised with it.
+			options:       &metav1.DeleteOptions{DryRun: []string{metav1.DryRunAll}, OrphanDependents: &orphanDependents},
+			wantFinalizer: metav1.FinalizerOrphanDependents,
+		},
+		{
+			name:              "pre-existing orphan finalizer preserved without explicit policy",
+			initialFinalizers: []string{metav1.FinalizerOrphanDependents},
+			options:           &metav1.DeleteOptions{DryRun: []string{metav1.DryRunAll}},
+			wantFinalizer:     metav1.FinalizerOrphanDependents,
+		},
+		{
+			name:              "pre-existing foregroundDeletion finalizer preserved without explicit policy",
+			initialFinalizers: []string{metav1.FinalizerDeleteDependents},
+			options:           &metav1.DeleteOptions{DryRun: []string{metav1.DryRunAll}},
+			wantFinalizer:     metav1.FinalizerDeleteDependents,
+		},
+		{
+			name:              "conflicting explicit policy replaces the pre-existing GC finalizer",
+			initialFinalizers: []string{metav1.FinalizerOrphanDependents},
+			options:           &metav1.DeleteOptions{DryRun: []string{metav1.DryRunAll}, PropagationPolicy: &foreground},
+			wantFinalizer:     metav1.FinalizerDeleteDependents,
+			absentFinalizer:   metav1.FinalizerOrphanDependents,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			cnp := markedPolicy("sg-db")
+			cnp.Finalizers = append([]string(nil), tt.initialFinalizers...)
+			r := newTestREST(t, cnp)
+
+			obj, deleted, err := r.Delete(ctxNS(), "sg-db", nil, tt.options)
+			if err != nil {
+				t.Fatalf("dry-run Delete returned error: %v", err)
+			}
+			if deleted {
+				t.Fatal("dry-run Delete reported deleted=true for a prospective finalizer-held delete")
+			}
+			sg, ok := obj.(*sdnv1alpha1.SecurityGroup)
+			if !ok {
+				t.Fatalf("dry-run Delete returned %T, want *SecurityGroup", obj)
+			}
+			if sg.DeletionTimestamp == nil || !hasFinalizer(sg.Finalizers, tt.wantFinalizer) {
+				t.Fatalf("prospective result missing deletion state: timestamp=%v finalizers=%v", sg.DeletionTimestamp, sg.Finalizers)
+			}
+			if tt.absentFinalizer != "" && hasFinalizer(sg.Finalizers, tt.absentFinalizer) {
+				t.Fatalf("prospective result kept the finalizer the explicit policy replaces: finalizers=%v", sg.Finalizers)
+			}
+
+			stored := &CiliumNetworkPolicy{}
+			if err := r.c.Get(context.Background(), types.NamespacedName{Namespace: testNamespace, Name: "sg-db"}, stored); err != nil {
+				t.Fatalf("dry-run changed object existence: %v", err)
+			}
+			if stored.DeletionTimestamp != nil || !reflect.DeepEqual(stored.Finalizers, tt.initialFinalizers) {
+				t.Fatalf("dry-run persisted prospective state: timestamp=%v finalizers=%v", stored.DeletionTimestamp, stored.Finalizers)
+			}
+		})
+	}
+}
+
+func TestCreateOverExistingUnmarkedPolicyFails(t *testing.T) {
+	r := newTestREST(t, unmarkedPolicy("tenant-isolation"))
+
+	in := &sdnv1alpha1.SecurityGroup{
+		ObjectMeta: metav1.ObjectMeta{Name: "tenant-isolation", Namespace: testNamespace},
+		Spec:       sampleSpec(),
+	}
+	_, err := r.Create(ctxNS(), in, nil, &metav1.CreateOptions{})
+	if !apierrors.IsAlreadyExists(err) {
+		t.Fatalf("Create over unmarked policy: got err %v, want AlreadyExists", err)
+	}
+
+	// The platform policy must be left untouched (no marker, no spec).
+	np := &CiliumNetworkPolicy{}
+	if err := r.c.Get(context.Background(), types.NamespacedName{Namespace: testNamespace, Name: "tenant-isolation"}, np); err != nil {
+		t.Fatalf("unmarked policy disappeared: %v", err)
+	}
+	if _, ok := np.Labels[sgLabelKey]; ok {
+		t.Fatalf("Create hijacked the unmarked platform policy with the marker label: %v", np.Labels)
+	}
+	if np.Spec != nil {
+		t.Fatalf("Create clobbered the unmarked platform policy spec: %+v", np.Spec)
+	}
+}
+
+func TestUpdateForceCreateOverUnmarkedPolicyDoesNotClobber(t *testing.T) {
+	r := newTestREST(t, unmarkedPolicy("tenant-isolation"))
+
+	in := &sdnv1alpha1.SecurityGroup{
+		ObjectMeta: metav1.ObjectMeta{Name: "tenant-isolation", Namespace: testNamespace},
+		Spec:       sampleSpec(),
+	}
+	_, _, err := r.Update(ctxNS(), "tenant-isolation",
+		rest.DefaultUpdatedObjectInfo(in), nil, nil, true, &metav1.UpdateOptions{})
+	if !apierrors.IsNotFound(err) {
+		t.Fatalf("Update force-create over unmarked policy: got err %v, want NotFound", err)
+	}
+
+	np := &CiliumNetworkPolicy{}
+	if err := r.c.Get(context.Background(), types.NamespacedName{Namespace: testNamespace, Name: "tenant-isolation"}, np); err != nil {
+		t.Fatalf("unmarked policy disappeared: %v", err)
+	}
+	if _, ok := np.Labels[sgLabelKey]; ok {
+		t.Fatalf("Update hijacked the unmarked platform policy with the marker label: %v", np.Labels)
+	}
+	if np.Spec != nil {
+		t.Fatalf("Update clobbered the unmarked platform policy spec: %+v", np.Spec)
+	}
+}
+
+func TestUpdateForceCreateOnAbsentObjectCreates(t *testing.T) {
+	r := newTestREST(t)
+	in := &sdnv1alpha1.SecurityGroup{
+		ObjectMeta: metav1.ObjectMeta{Name: "sg-db", Namespace: testNamespace},
+		Spec:       sampleSpec(),
+	}
+	out, created, err := r.Update(ctxNS(), "sg-db",
+		rest.DefaultUpdatedObjectInfo(in), nil, nil, true, &metav1.UpdateOptions{})
+	if err != nil {
+		t.Fatalf("Update force-create returned error: %v", err)
+	}
+	if !created {
+		t.Fatalf("Update force-create on absent object reported created=false")
+	}
+	got := out.(*sdnv1alpha1.SecurityGroup)
+	if !reflect.DeepEqual(got.Spec, sampleSpec()) {
+		t.Fatalf("force-create spec mismatch:\n got: %+v\nwant: %+v", got.Spec, sampleSpec())
+	}
+	np := &CiliumNetworkPolicy{}
+	if err := r.c.Get(context.Background(), types.NamespacedName{Namespace: testNamespace, Name: "sg-db"}, np); err != nil {
+		t.Fatalf("backing policy not created: %v", err)
+	}
+	if np.Labels[sgLabelKey] != sgLabelValue {
+		t.Fatalf("force-created policy missing marker label: %v", np.Labels)
+	}
+}
+
+func TestListFieldSelectorByName(t *testing.T) {
+	r := newTestREST(t, markedPolicy("sg-a"), markedPolicy("sg-b"))
+
+	out, err := r.List(ctxNS(), &metainternal.ListOptions{
+		FieldSelector: fields.SelectorFromSet(fields.Set{"metadata.name": "sg-a"}),
+	})
+	if err != nil {
+		t.Fatalf("List returned error: %v", err)
+	}
+	list := out.(*sdnv1alpha1.SecurityGroupList)
+	if len(list.Items) != 1 || list.Items[0].Name != "sg-a" {
+		names := make([]string, len(list.Items))
+		for i, it := range list.Items {
+			names[i] = it.Name
+		}
+		t.Fatalf("field-selector metadata.name=sg-a: got %v, want [sg-a]", names)
+	}
+}
+
+func TestConvertToTable(t *testing.T) {
+	r := newTestREST(t)
+
+	list := &sdnv1alpha1.SecurityGroupList{Items: []sdnv1alpha1.SecurityGroup{
+		{ObjectMeta: metav1.ObjectMeta{Name: "sg-a"}},
+		{ObjectMeta: metav1.ObjectMeta{Name: "sg-b"}},
+	}}
+	tbl, err := r.ConvertToTable(context.Background(), list, nil)
+	if err != nil {
+		t.Fatalf("ConvertToTable(list) error: %v", err)
+	}
+	if len(tbl.Rows) != 2 || len(tbl.ColumnDefinitions) != 2 {
+		t.Fatalf("ConvertToTable(list): rows=%d cols=%d, want 2/2", len(tbl.Rows), len(tbl.ColumnDefinitions))
+	}
+
+	single := &sdnv1alpha1.SecurityGroup{ObjectMeta: metav1.ObjectMeta{Name: "sg-a"}}
+	tbl, err = r.ConvertToTable(context.Background(), single, nil)
+	if err != nil {
+		t.Fatalf("ConvertToTable(single) error: %v", err)
+	}
+	if len(tbl.Rows) != 1 {
+		t.Fatalf("ConvertToTable(single): rows=%d, want 1", len(tbl.Rows))
+	}
+
+	if _, err := r.ConvertToTable(context.Background(), &metav1.Status{}, nil); err == nil {
+		t.Fatalf("ConvertToTable(unexpected type): expected an error, got nil")
+	}
+}
+
+func TestCreateValidationRejected(t *testing.T) {
+	r := newTestREST(t)
+	denied := func(_ context.Context, _ runtime.Object) error { return errors.New("denied by admission") }
+
+	in := &sdnv1alpha1.SecurityGroup{
+		ObjectMeta: metav1.ObjectMeta{Name: "sg-db", Namespace: testNamespace},
+		Spec:       sampleSpec(),
+	}
+	if _, err := r.Create(ctxNS(), in, denied, &metav1.CreateOptions{}); err == nil {
+		t.Fatalf("Create: expected admission rejection, got nil")
+	}
+	// Nothing must have been persisted.
+	np := &CiliumNetworkPolicy{}
+	err := r.c.Get(context.Background(), types.NamespacedName{Namespace: testNamespace, Name: "sg-db"}, np)
+	if !apierrors.IsNotFound(err) {
+		t.Fatalf("Create persisted a policy despite admission rejection: err=%v", err)
+	}
+}
+
+func TestUpdateValidationRejected(t *testing.T) {
+	r := newTestREST(t, markedPolicy("sg-db"))
+	denied := func(_ context.Context, _, _ runtime.Object) error { return errors.New("denied by admission") }
+
+	in := &sdnv1alpha1.SecurityGroup{
+		ObjectMeta: metav1.ObjectMeta{Name: "sg-db", Namespace: testNamespace},
+		Spec:       sampleSpec(),
+	}
+	if _, _, err := r.Update(ctxNS(), "sg-db",
+		rest.DefaultUpdatedObjectInfo(in), nil, denied, false, &metav1.UpdateOptions{}); err == nil {
+		t.Fatalf("Update: expected admission rejection, got nil")
+	}
+}
+
+func TestDeleteValidationRejected(t *testing.T) {
+	r := newTestREST(t, markedPolicy("sg-db"))
+	denied := func(_ context.Context, _ runtime.Object) error { return errors.New("denied by admission") }
+
+	if _, _, err := r.Delete(ctxNS(), "sg-db", denied, &metav1.DeleteOptions{}); err == nil {
+		t.Fatalf("Delete: expected admission rejection, got nil")
+	}
+	// The policy must still exist.
+	np := &CiliumNetworkPolicy{}
+	if err := r.c.Get(context.Background(), types.NamespacedName{Namespace: testNamespace, Name: "sg-db"}, np); err != nil {
+		t.Fatalf("Delete removed the policy despite admission rejection: %v", err)
+	}
+}
+
+// assertVisibleAndMarked verifies the named SecurityGroup is retrievable through
+// the API (not orphaned) and that its backing policy carries the marker.
+func assertVisibleAndMarked(t *testing.T, r *REST, name string) {
+	t.Helper()
+	if _, err := r.Get(ctxNS(), name, &metav1.GetOptions{}); err != nil {
+		t.Fatalf("Get(%q): policy was orphaned from the SecurityGroup view: %v", name, err)
+	}
+	np := &CiliumNetworkPolicy{}
+	if err := r.c.Get(context.Background(), types.NamespacedName{Namespace: testNamespace, Name: name}, np); err != nil {
+		t.Fatalf("backing policy %q not found: %v", name, err)
+	}
+	if np.Labels[sgLabelKey] != sgLabelValue {
+		t.Fatalf("marker label was overwritten on %q: %v", name, np.Labels)
+	}
+}
+
+func TestCreateCannotOverrideMarkerLabel(t *testing.T) {
+	// A tenant has full write on securitygroups, so they could try to overwrite
+	// the storage-owned marker via spec labels and orphan an enforced policy.
+	for _, badValue := range []string{"false", "anything"} {
+		r := newTestREST(t)
+		in := &sdnv1alpha1.SecurityGroup{
+			ObjectMeta: metav1.ObjectMeta{
+				Name:      "sg-db",
+				Namespace: testNamespace,
+				Labels:    map[string]string{sgLabelKey: badValue},
+			},
+			Spec: sampleSpec(),
+		}
+		if _, err := r.Create(ctxNS(), in, nil, &metav1.CreateOptions{}); err != nil {
+			t.Fatalf("Create with marker=%q returned error: %v", badValue, err)
+		}
+		assertVisibleAndMarked(t, r, "sg-db")
+	}
+}
+
+func TestUpdateCannotOverrideMarkerLabel(t *testing.T) {
+	r := newTestREST(t, markedPolicy("sg-db"))
+	in := &sdnv1alpha1.SecurityGroup{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "sg-db",
+			Namespace: testNamespace,
+			Labels:    map[string]string{sgLabelKey: "false"},
+		},
+		Spec: sampleSpec(),
+	}
+	if _, _, err := r.Update(ctxNS(), "sg-db",
+		rest.DefaultUpdatedObjectInfo(in), nil, nil, false, &metav1.UpdateOptions{}); err != nil {
+		t.Fatalf("Update returned error: %v", err)
+	}
+	assertVisibleAndMarked(t, r, "sg-db")
+}
+
+func TestUpdateReplacesLabelsAndAnnotations(t *testing.T) {
+	r := newTestREST(t)
+
+	// Seed via Create so the backing policy carries a user label and annotation.
+	createSG(t, r, &sdnv1alpha1.SecurityGroup{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:        "sg-db",
+			Namespace:   testNamespace,
+			Labels:      map[string]string{"team": "data"},
+			Annotations: map[string]string{"note": "keep-me-not"},
+		},
+		Spec: sampleSpec(),
+	})
+
+	// Update with the label and annotation removed — Kubernetes replace semantics
+	// require them to disappear, not linger from the previous object.
+	updated := &sdnv1alpha1.SecurityGroup{
+		ObjectMeta: metav1.ObjectMeta{Name: "sg-db", Namespace: testNamespace},
+		Spec:       sampleSpec(),
+	}
+	out, _, err := r.Update(ctxNS(), "sg-db",
+		rest.DefaultUpdatedObjectInfo(updated), nil, nil, false, &metav1.UpdateOptions{})
+	if err != nil {
+		t.Fatalf("Update returned error: %v", err)
+	}
+	got := out.(*sdnv1alpha1.SecurityGroup)
+	if _, ok := got.Labels["team"]; ok {
+		t.Fatalf("Update kept a removed label in the view: %v", got.Labels)
+	}
+	if _, ok := got.Annotations["note"]; ok {
+		t.Fatalf("Update kept a removed annotation in the view: %v", got.Annotations)
+	}
+
+	// The backing policy must also drop them while keeping the marker.
+	np := &CiliumNetworkPolicy{}
+	if err := r.c.Get(context.Background(), types.NamespacedName{Namespace: testNamespace, Name: "sg-db"}, np); err != nil {
+		t.Fatalf("backing policy not found: %v", err)
+	}
+	if _, ok := np.Labels["team"]; ok {
+		t.Fatalf("backing policy kept a removed label: %v", np.Labels)
+	}
+	if _, ok := np.Annotations["note"]; ok {
+		t.Fatalf("backing policy kept a removed annotation: %v", np.Annotations)
+	}
+	if np.Labels[sgLabelKey] != sgLabelValue {
+		t.Fatalf("backing policy lost the marker label: %v", np.Labels)
+	}
+}
+
+// ctxAllNS mimics a cluster-wide request (kubectl get/watch -A): the namespace
+// in context is empty.
+func ctxAllNS() context.Context {
+	return request.WithNamespace(context.Background(), metav1.NamespaceAll)
+}
+
+func markedPolicyIn(name, namespace string) *CiliumNetworkPolicy {
+	return &CiliumNetworkPolicy{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      name,
+			Namespace: namespace,
+			Labels:    map[string]string{sgLabelKey: sgLabelValue},
+		},
+	}
+}
+
+func TestListClusterWide(t *testing.T) {
+	r := newTestREST(t,
+		markedPolicyIn("sg-a", "tenant-a"),
+		markedPolicyIn("sg-b", "tenant-b"),
+	)
+	out, err := r.List(ctxAllNS(), &metainternal.ListOptions{})
+	if err != nil {
+		t.Fatalf("cluster-wide List returned error: %v", err)
+	}
+	list := out.(*sdnv1alpha1.SecurityGroupList)
+	if len(list.Items) != 2 {
+		names := make([]string, len(list.Items))
+		for i, it := range list.Items {
+			names[i] = it.Namespace + "/" + it.Name
+		}
+		t.Fatalf("cluster-wide List returned %v, want 2 items across namespaces", names)
+	}
+}
+
+func TestUpdateForceCreatePropagatesDryRun(t *testing.T) {
+	var captured []string
+	scheme := runtime.NewScheme()
+	if err := AddToScheme(scheme); err != nil {
+		t.Fatalf("add cilium mirror to scheme: %v", err)
+	}
+	fc := fake.NewClientBuilder().
+		WithScheme(scheme).
+		WithInterceptorFuncs(interceptor.Funcs{
+			// Capture the create options the force-create path passes through.
+			Create: func(_ context.Context, _ client.WithWatch, _ client.Object, opts ...client.CreateOption) error {
+				converted := (&client.CreateOptions{}).ApplyOptions(opts)
+				captured = converted.AsCreateOptions().DryRun
+				return nil
+			},
+		}).
+		Build()
+	r := &REST{c: fc, w: fc, gvr: schema.GroupVersionResource{
+		Group: sdnv1alpha1.GroupName, Version: "v1alpha1", Resource: sdnv1alpha1.SecurityGroupPluralName,
+	}}
+
+	in := &sdnv1alpha1.SecurityGroup{
+		ObjectMeta: metav1.ObjectMeta{Name: "sg-db", Namespace: testNamespace},
+		Spec:       sampleSpec(),
+	}
+	if _, _, err := r.Update(ctxNS(), "sg-db",
+		rest.DefaultUpdatedObjectInfo(in), nil, nil, true,
+		&metav1.UpdateOptions{DryRun: []string{metav1.DryRunAll}}); err != nil {
+		t.Fatalf("Update force-create returned error: %v", err)
+	}
+	if len(captured) != 1 || captured[0] != metav1.DryRunAll {
+		t.Fatalf("force-create dropped the dry-run intent: got %v, want [%s]", captured, metav1.DryRunAll)
+	}
+}
+
+func TestOwnerReferencesAndFinalizersRoundTrip(t *testing.T) {
+	r := newTestREST(t)
+	in := &sdnv1alpha1.SecurityGroup{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:            "sg-db",
+			Namespace:       testNamespace,
+			OwnerReferences: []metav1.OwnerReference{{APIVersion: "v1", Kind: "ConfigMap", Name: "owner", UID: "owner-uid"}},
+			Finalizers:      []string{"sdn.cozystack.io/test"},
+		},
+		Spec: sampleSpec(),
+	}
+	createSG(t, r, in)
+
+	out, err := r.Get(ctxNS(), "sg-db", &metav1.GetOptions{})
+	if err != nil {
+		t.Fatalf("Get: %v", err)
+	}
+	got := out.(*sdnv1alpha1.SecurityGroup)
+	if len(got.OwnerReferences) != 1 || got.OwnerReferences[0].Name != "owner" {
+		t.Fatalf("ownerReferences not projected to the view: %+v", got.OwnerReferences)
+	}
+	if len(got.Finalizers) != 1 || got.Finalizers[0] != "sdn.cozystack.io/test" {
+		t.Fatalf("finalizers not projected to the view: %+v", got.Finalizers)
+	}
+
+	np := &CiliumNetworkPolicy{}
+	if err := r.c.Get(context.Background(), types.NamespacedName{Namespace: testNamespace, Name: "sg-db"}, np); err != nil {
+		t.Fatalf("backing policy not found: %v", err)
+	}
+	if len(np.OwnerReferences) != 1 || len(np.Finalizers) != 1 {
+		t.Fatalf("backing policy missing ownerReferences/finalizers: %+v / %+v", np.OwnerReferences, np.Finalizers)
+	}
+}
+
+func TestUpdatePreservesMembershipFinalizer(t *testing.T) {
+	// The securitygroup-controller adds the membership finalizer to the backing
+	// policy via a merge patch, so it is not in the tenant-facing request body. A
+	// full-replace update (kubectl replace) whose body omits finalizers must not
+	// strip it — otherwise a delete-before-reconcile would hard-delete the policy
+	// and orphan the membership labels on member pods.
+	cnp := markedPolicy("sg-db")
+	cnp.Finalizers = []string{sdnv1alpha1.MembershipFinalizer}
+	r := newTestREST(t, cnp)
+
+	updated := &sdnv1alpha1.SecurityGroup{
+		ObjectMeta: metav1.ObjectMeta{Name: "sg-db", Namespace: testNamespace},
+		Spec:       sampleSpec(),
+	}
+	if _, _, err := r.Update(ctxNS(), "sg-db",
+		rest.DefaultUpdatedObjectInfo(updated), nil, nil, false, &metav1.UpdateOptions{}); err != nil {
+		t.Fatalf("Update returned error: %v", err)
+	}
+
+	np := &CiliumNetworkPolicy{}
+	if err := r.c.Get(context.Background(), types.NamespacedName{Namespace: testNamespace, Name: "sg-db"}, np); err != nil {
+		t.Fatalf("backing policy not found: %v", err)
+	}
+	found := false
+	for _, f := range np.Finalizers {
+		if f == sdnv1alpha1.MembershipFinalizer {
+			found = true
+		}
+	}
+	if !found {
+		t.Fatalf("a full-replace update stripped the membership finalizer: %+v", np.Finalizers)
+	}
+}
+
+func TestUpdateDuringDeletionPreservesMembershipFinalizer(t *testing.T) {
+	// A tenant has full verbs on securitygroups, so they can delete then PUT the
+	// still-terminating object with a finalizer-less body. Removing the membership
+	// finalizer is exclusively the controller's job; a tenant write must never
+	// strip it, even while the object is terminating — otherwise the backing
+	// policy is hard-deleted before member-pod labels are cleaned up.
+	cnp := markedPolicy("sg-db")
+	cnp.Finalizers = []string{sdnv1alpha1.MembershipFinalizer}
+	r := newTestREST(t, cnp)
+
+	// Transition the backing policy to terminating (the finalizer keeps it).
+	live := &CiliumNetworkPolicy{}
+	if err := r.c.Get(context.Background(), types.NamespacedName{Namespace: testNamespace, Name: "sg-db"}, live); err != nil {
+		t.Fatalf("Get: %v", err)
+	}
+	if err := r.c.Delete(context.Background(), live); err != nil {
+		t.Fatalf("Delete: %v", err)
+	}
+
+	updated := &sdnv1alpha1.SecurityGroup{
+		ObjectMeta: metav1.ObjectMeta{Name: "sg-db", Namespace: testNamespace},
+		Spec:       sampleSpec(),
+	}
+	if _, _, err := r.Update(ctxNS(), "sg-db",
+		rest.DefaultUpdatedObjectInfo(updated), nil, nil, false, &metav1.UpdateOptions{}); err != nil {
+		t.Fatalf("Update returned error: %v", err)
+	}
+
+	np := &CiliumNetworkPolicy{}
+	if err := r.c.Get(context.Background(), types.NamespacedName{Namespace: testNamespace, Name: "sg-db"}, np); err != nil {
+		t.Fatalf("backing policy not found — was it hard-deleted? %v", err)
+	}
+	if !hasFinalizer(np.Finalizers, sdnv1alpha1.MembershipFinalizer) {
+		t.Fatalf("a tenant update during deletion stripped the membership finalizer: %+v", np.Finalizers)
+	}
+}
+
+func TestWatchForwardsSendInitialEvents(t *testing.T) {
+	var captured *metav1.ListOptions
+	scheme := runtime.NewScheme()
+	if err := AddToScheme(scheme); err != nil {
+		t.Fatalf("add cilium mirror to scheme: %v", err)
+	}
+	fc := fake.NewClientBuilder().
+		WithScheme(scheme).
+		WithInterceptorFuncs(interceptor.Funcs{
+			// Capture the options forwarded to the backing watch; the backing API
+			// server (not the fake client) does the initial-events replay, so the
+			// unit test only verifies the request is propagated.
+			Watch: func(_ context.Context, _ client.WithWatch, _ client.ObjectList, opts ...client.ListOption) (watch.Interface, error) {
+				for _, o := range opts {
+					if lo, ok := o.(*client.ListOptions); ok && lo.Raw != nil {
+						captured = lo.Raw
+					}
+				}
+				return watch.NewEmptyWatch(), nil
+			},
+		}).
+		Build()
+	r := &REST{c: fc, w: fc, gvr: schema.GroupVersionResource{
+		Group: sdnv1alpha1.GroupName, Version: "v1alpha1", Resource: sdnv1alpha1.SecurityGroupPluralName,
+	}}
+
+	sendInitialEvents := true
+	w, err := r.Watch(ctxNS(), &metainternal.ListOptions{
+		SendInitialEvents:    &sendInitialEvents,
+		ResourceVersionMatch: metav1.ResourceVersionMatchNotOlderThan,
+	})
+	if err != nil {
+		t.Fatalf("Watch returned error: %v", err)
+	}
+	defer w.Stop()
+
+	if captured == nil || captured.SendInitialEvents == nil || !*captured.SendInitialEvents {
+		t.Fatalf("Watch did not forward SendInitialEvents to the backing watch: %+v", captured)
+	}
+	if captured.ResourceVersionMatch != metav1.ResourceVersionMatchNotOlderThan {
+		t.Fatalf("Watch did not forward ResourceVersionMatch: got %q", captured.ResourceVersionMatch)
+	}
+}
+
+// newBackingWatchREST builds a REST whose backing watch is the supplied fake
+// watcher, so a test can drive raw backing-watch events (including watch.Error)
+// through the SecurityGroup watch proxy.
+func newBackingWatchREST(t *testing.T, fw watch.Interface) *REST {
+	t.Helper()
+	scheme := runtime.NewScheme()
+	if err := AddToScheme(scheme); err != nil {
+		t.Fatalf("add cilium mirror to scheme: %v", err)
+	}
+	fc := fake.NewClientBuilder().
+		WithScheme(scheme).
+		WithInterceptorFuncs(interceptor.Funcs{
+			Watch: func(_ context.Context, _ client.WithWatch, _ client.ObjectList, _ ...client.ListOption) (watch.Interface, error) {
+				return fw, nil
+			},
+		}).
+		Build()
+	return &REST{c: fc, w: fc, gvr: schema.GroupVersionResource{
+		Group: sdnv1alpha1.GroupName, Version: "v1alpha1", Resource: sdnv1alpha1.SecurityGroupPluralName,
+	}}
+}
+
+func TestWatchForwardsBackingErrorEvents(t *testing.T) {
+	fw := watch.NewFakeWithChanSize(1, false)
+	r := newBackingWatchREST(t, fw)
+
+	w, err := r.Watch(ctxNS(), &metainternal.ListOptions{})
+	if err != nil {
+		t.Fatalf("Watch returned error: %v", err)
+	}
+	defer w.Stop()
+
+	// A backing watch.Error (e.g. a 410 Gone for an expired resourceVersion)
+	// carries a *metav1.Status, not a CiliumNetworkPolicy. It must reach the
+	// client so it relists, instead of being silently dropped by the
+	// CiliumNetworkPolicy type assertion (which would leave the client seeing a
+	// cleanly closed stream).
+	fw.Error(&metav1.Status{Status: metav1.StatusFailure, Reason: metav1.StatusReasonExpired, Code: 410})
+
+	ev, ok := <-w.ResultChan()
+	if !ok {
+		t.Fatal("watch channel closed without forwarding the error event")
+	}
+	if ev.Type != watch.Error {
+		t.Fatalf("forwarded event type = %q, want %q", ev.Type, watch.Error)
+	}
+	if _, ok := ev.Object.(*metav1.Status); !ok {
+		t.Fatalf("forwarded error object type = %T, want *metav1.Status", ev.Object)
+	}
+}
+
+func TestWatchFieldSelectorFiltersDeletedEvents(t *testing.T) {
+	fw := watch.NewFakeWithChanSize(2, false)
+	r := newBackingWatchREST(t, fw)
+
+	w, err := r.Watch(ctxNS(), &metainternal.ListOptions{
+		FieldSelector: fields.SelectorFromSet(fields.Set{"metadata.name": "sg-a"}),
+	})
+	if err != nil {
+		t.Fatalf("Watch returned error: %v", err)
+	}
+	defer w.Stop()
+
+	// Push sg-b's deletion FIRST. A policy's name and namespace are immutable
+	// (unlike labels), so a field-selected watch must drop sg-b's deletion; only
+	// sg-a's deletion may pass. Because sg-b is pushed first, receiving sg-a as
+	// the first event proves sg-b was filtered out rather than merely reordered.
+	fw.Delete(markedPolicy("sg-b"))
+	fw.Delete(markedPolicy("sg-a"))
+
+	ev, ok := <-w.ResultChan()
+	if !ok {
+		t.Fatal("watch channel closed without forwarding any event")
+	}
+	if ev.Type != watch.Deleted {
+		t.Fatalf("event type = %q, want %q", ev.Type, watch.Deleted)
+	}
+	sg, ok := ev.Object.(*sdnv1alpha1.SecurityGroup)
+	if !ok {
+		t.Fatalf("event object type = %T, want *SecurityGroup", ev.Object)
+	}
+	if sg.Name != "sg-a" {
+		t.Fatalf("field-selected (metadata.name=sg-a) watch received deletion of %q; sg-b must be filtered out", sg.Name)
+	}
+}
+
+func TestUpdateHonorsResourceVersion(t *testing.T) {
+	r := newTestREST(t, markedPolicy("sg-db"))
+
+	cur, err := r.Get(ctxNS(), "sg-db", &metav1.GetOptions{})
+	if err != nil {
+		t.Fatalf("Get: %v", err)
+	}
+	curRV := cur.(*sdnv1alpha1.SecurityGroup).ResourceVersion
+	if curRV == "" {
+		t.Fatalf("backing policy has no resourceVersion to test against")
+	}
+
+	// A stale (non-matching) resourceVersion must surface as a Conflict, not a
+	// silent last-write-wins.
+	stale := &sdnv1alpha1.SecurityGroup{
+		ObjectMeta: metav1.ObjectMeta{Name: "sg-db", Namespace: testNamespace, ResourceVersion: curRV + "0"},
+		Spec:       sampleSpec(),
+	}
+	if _, _, err := r.Update(ctxNS(), "sg-db",
+		rest.DefaultUpdatedObjectInfo(stale), nil, nil, false, &metav1.UpdateOptions{}); !apierrors.IsConflict(err) {
+		t.Fatalf("stale-resourceVersion update: got err %v, want Conflict", err)
+	}
+
+	// An empty resourceVersion must fall back to the current one and succeed.
+	fresh := &sdnv1alpha1.SecurityGroup{
+		ObjectMeta: metav1.ObjectMeta{Name: "sg-db", Namespace: testNamespace},
+		Spec:       sampleSpec(),
+	}
+	if _, _, err := r.Update(ctxNS(), "sg-db",
+		rest.DefaultUpdatedObjectInfo(fresh), nil, nil, false, &metav1.UpdateOptions{}); err != nil {
+		t.Fatalf("empty-resourceVersion update should fall back and succeed, got: %v", err)
+	}
+}
+
+func sgWithIngress(name string, in sdnv1alpha1.IngressRule) *sdnv1alpha1.SecurityGroup {
+	return &sdnv1alpha1.SecurityGroup{
+		ObjectMeta: metav1.ObjectMeta{Name: name, Namespace: testNamespace},
+		Spec: sdnv1alpha1.SecurityGroupSpec{
+			Attachments: []sdnv1alpha1.ApplicationReference{{Kind: "Postgres", Name: "x"}},
+			Ingress:     []sdnv1alpha1.IngressRule{in},
+		},
+	}
+}
+
+func TestCreateAcceptsEmptyAttachments(t *testing.T) {
+	r := newTestREST(t)
+	// A group with no attachments selects no pods yet (members get added once it
+	// is attached); it is a valid resource, not an error.
+	in := &sdnv1alpha1.SecurityGroup{
+		ObjectMeta: metav1.ObjectMeta{Name: "sg-empty", Namespace: testNamespace},
+		Spec: sdnv1alpha1.SecurityGroupSpec{
+			Ingress: []sdnv1alpha1.IngressRule{{ToPorts: []sdnv1alpha1.PortRule{{Ports: []sdnv1alpha1.PortProtocol{{Port: "443", Protocol: "TCP"}}}}}},
+		},
+	}
+	got := createSG(t, r, in)
+	if len(got.Spec.Attachments) != 0 {
+		t.Fatalf("empty attachments should round-trip empty: %+v", got.Spec.Attachments)
+	}
+	// The backing policy still carries the membership endpointSelector and omits
+	// the attachments annotation entirely.
+	np := &CiliumNetworkPolicy{}
+	if err := r.c.Get(context.Background(), types.NamespacedName{Namespace: testNamespace, Name: "sg-empty"}, np); err != nil {
+		t.Fatalf("backing policy not found: %v", err)
+	}
+	if _, ok := np.Annotations[attachmentsAnnotation]; ok {
+		t.Fatalf("empty attachments should not write an annotation: %v", np.Annotations)
+	}
+	if np.Spec.EndpointSelector.MatchLabels["securitygroup.sdn.cozystack.io/sg-empty"] != "" {
+		t.Fatalf("membership selector missing for empty-attachment group: %+v", np.Spec.EndpointSelector)
+	}
+}
+
+func TestRulesLessSecurityGroupProjectsValidPolicy(t *testing.T) {
+	r := newTestREST(t)
+	// A membership-only SecurityGroup attaches to an application to stamp the
+	// membership label but carries no ingress or egress rules. The backing
+	// CiliumNetworkPolicy CRD still requires at least one rule section to be
+	// present (spec anyOf: ingress|ingressDeny|egress|egressDeny), so a
+	// selector-only spec is rejected synchronously by the cilium.io/v2 API. The
+	// projection must emit an explicit empty ingress list — the CRD's documented
+	// no-op ("if omitted or empty, this rule does not apply at ingress") — so the
+	// policy is schema-valid yet leaves the member pods' connectivity untouched.
+	createSG(t, r, &sdnv1alpha1.SecurityGroup{
+		ObjectMeta: metav1.ObjectMeta{Name: "sg-membership", Namespace: testNamespace},
+		Spec: sdnv1alpha1.SecurityGroupSpec{
+			Attachments: []sdnv1alpha1.ApplicationReference{{Kind: "Postgres", Name: "db"}},
+		},
+	})
+
+	np := &CiliumNetworkPolicy{}
+	if err := r.c.Get(context.Background(), types.NamespacedName{Namespace: testNamespace, Name: "sg-membership"}, np); err != nil {
+		t.Fatalf("backing policy not found: %v", err)
+	}
+
+	// The CRD validates the wire form, not the Go struct, so assert on the
+	// marshaled bytes: spec.ingress must be present (an empty list satisfies the
+	// anyOf), and spec.egress must be absent (ingress is the guaranteed-present
+	// carrier; egress is emitted only when there are egress rules).
+	raw, err := json.Marshal(np)
+	if err != nil {
+		t.Fatalf("marshal backing policy: %v", err)
+	}
+	var decoded struct {
+		Spec map[string]json.RawMessage `json:"spec"`
+	}
+	if err := json.Unmarshal(raw, &decoded); err != nil {
+		t.Fatalf("unmarshal backing policy: %v", err)
+	}
+	ing, ok := decoded.Spec["ingress"]
+	if !ok {
+		t.Fatalf("backing policy spec has no ingress key; the CRD anyOf would reject it: %s", raw)
+	}
+	if string(ing) != "[]" {
+		t.Fatalf("rules-less policy ingress = %s, want []", ing)
+	}
+	if _, ok := decoded.Spec["egress"]; ok {
+		t.Fatalf("rules-less policy must not carry an egress key: %s", raw)
+	}
+
+	// The same key must survive the unstructured conversion path (which honors
+	// omitempty independently of json.Marshal), so the empty list cannot be
+	// silently dropped there either.
+	u, err := runtime.DefaultUnstructuredConverter.ToUnstructured(np)
+	if err != nil {
+		t.Fatalf("to unstructured: %v", err)
+	}
+	spec, _ := u["spec"].(map[string]any)
+	if _, ok := spec["ingress"]; !ok {
+		t.Fatalf("unstructured backing policy spec has no ingress key: %v", spec)
+	}
+
+	// On read, the synthetic empty ingress list collapses back to no rules, so a
+	// rules-less SecurityGroup round-trips with neither ingress nor egress.
+	out, err := r.Get(ctxNS(), "sg-membership", &metav1.GetOptions{})
+	if err != nil {
+		t.Fatalf("Get returned error: %v", err)
+	}
+	got := out.(*sdnv1alpha1.SecurityGroup)
+	if got.Spec.Ingress != nil || got.Spec.Egress != nil {
+		t.Fatalf("rules-less round-trip should carry no ingress/egress, got: %+v", got.Spec)
+	}
+}
+
+func TestCreateRejectsInvalidAttachmentLabelValue(t *testing.T) {
+	cases := map[string]sdnv1alpha1.ApplicationReference{
+		"name too long":     {Kind: "Postgres", Name: strings.Repeat("a", 64)},
+		"kind too long":     {Kind: strings.Repeat("a", 64), Name: "db"},
+		"name bad chars":    {Kind: "Postgres", Name: "db/inst"},
+		"apiGroup too long": {APIGroup: strings.Repeat("a", 64), Kind: "Postgres", Name: "db"},
+		"missing kind":      {Name: "db"},
+		"missing name":      {Kind: "Postgres"},
+		"reserved entity":   {Kind: "Postgres", Name: "world"},
+	}
+	for name, ref := range cases {
+		t.Run(name, func(t *testing.T) {
+			r := newTestREST(t)
+			in := &sdnv1alpha1.SecurityGroup{
+				ObjectMeta: metav1.ObjectMeta{Name: "sg-bad-ref", Namespace: testNamespace},
+				Spec:       sdnv1alpha1.SecurityGroupSpec{Attachments: []sdnv1alpha1.ApplicationReference{ref}},
+			}
+			if _, err := r.Create(ctxNS(), in, nil, &metav1.CreateOptions{}); !apierrors.IsInvalid(err) {
+				t.Fatalf("Create with %s: got err %v, want Invalid", name, err)
+			}
+			np := &CiliumNetworkPolicy{}
+			if err := r.c.Get(context.Background(), types.NamespacedName{Namespace: testNamespace, Name: "sg-bad-ref"}, np); !apierrors.IsNotFound(err) {
+				t.Fatalf("invalid SecurityGroup was persisted: err=%v", err)
+			}
+		})
+	}
+}
+
+func TestCreateRejectsInvalidOwnName(t *testing.T) {
+	// The SecurityGroup name is projected into the backing policy's membership
+	// label key, so a name that is a valid resource name but an invalid label key
+	// (e.g. > 63 chars) must be rejected with a clean Invalid on metadata.name,
+	// not a confusing failure on the backing CiliumNetworkPolicy write.
+	r := newTestREST(t)
+	longName := strings.Repeat("a", 64)
+	in := &sdnv1alpha1.SecurityGroup{
+		ObjectMeta: metav1.ObjectMeta{Name: longName, Namespace: testNamespace},
+		Spec:       sdnv1alpha1.SecurityGroupSpec{Attachments: []sdnv1alpha1.ApplicationReference{{Kind: "Postgres", Name: "db"}}},
+	}
+	if _, err := r.Create(ctxNS(), in, nil, &metav1.CreateOptions{}); !apierrors.IsInvalid(err) {
+		t.Fatalf("Create with an over-long name: got err %v, want Invalid", err)
+	}
+	np := &CiliumNetworkPolicy{}
+	if err := r.c.Get(context.Background(), types.NamespacedName{Namespace: testNamespace, Name: longName}, np); !apierrors.IsNotFound(err) {
+		t.Fatalf("invalid-named SecurityGroup was persisted: err=%v", err)
+	}
+}
+
+func TestCreateRejectsInvalidSGPeer(t *testing.T) {
+	cases := map[string]sdnv1alpha1.IngressRule{
+		"empty fromSG name": {FromSG: []string{""}},
+		"reserved entity":   {FromSG: []string{"cluster"}},
+		"over-long name":    {FromSG: []string{strings.Repeat("a", 64)}},
+	}
+	for name, rule := range cases {
+		t.Run(name, func(t *testing.T) {
+			r := newTestREST(t)
+			if _, err := r.Create(ctxNS(), sgWithIngress("sg-bad-sg", rule), nil, &metav1.CreateOptions{}); !apierrors.IsInvalid(err) {
+				t.Fatalf("Create with %s: got err %v, want Invalid", name, err)
+			}
+		})
+	}
+}
+
+func TestMultipleAttachmentsRoundTrip(t *testing.T) {
+	r := newTestREST(t)
+	in := &sdnv1alpha1.SecurityGroup{
+		ObjectMeta: metav1.ObjectMeta{Name: "sg-multi", Namespace: testNamespace},
+		Spec: sdnv1alpha1.SecurityGroupSpec{
+			Attachments: []sdnv1alpha1.ApplicationReference{
+				{APIGroup: "apps.cozystack.io", Kind: "Postgres", Name: "db"},
+				{APIGroup: "apps.cozystack.io", Kind: "Kubernetes", Name: "web"},
+			},
+		},
+	}
+	createSG(t, r, in)
+	out, err := r.Get(ctxNS(), "sg-multi", &metav1.GetOptions{})
+	if err != nil {
+		t.Fatalf("Get: %v", err)
+	}
+	if !reflect.DeepEqual(out.(*sdnv1alpha1.SecurityGroup).Spec.Attachments, in.Spec.Attachments) {
+		t.Fatalf("multi-attachment round-trip mismatch: %+v", out.(*sdnv1alpha1.SecurityGroup).Spec.Attachments)
+	}
+}
+
+func TestCreateRejectsInvalidSpec(t *testing.T) {
+	cases := map[string]sdnv1alpha1.IngressRule{
+		"bad CIDR":     {FromCIDR: []string{"10.0.0.0/33"}},
+		"port too big": {ToPorts: []sdnv1alpha1.PortRule{{Ports: []sdnv1alpha1.PortProtocol{{Port: "70000"}}}}},
+		"port zero":    {ToPorts: []sdnv1alpha1.PortRule{{Ports: []sdnv1alpha1.PortProtocol{{Port: "0"}}}}},
+		"bad protocol": {ToPorts: []sdnv1alpha1.PortRule{{Ports: []sdnv1alpha1.PortProtocol{{Port: "443", Protocol: "ICMP"}}}}},
+	}
+	for name, rule := range cases {
+		t.Run(name, func(t *testing.T) {
+			r := newTestREST(t)
+			_, err := r.Create(ctxNS(), sgWithIngress("sg-bad", rule), nil, &metav1.CreateOptions{})
+			if !apierrors.IsInvalid(err) {
+				t.Fatalf("Create with %s: got err %v, want Invalid", name, err)
+			}
+			// Nothing must be persisted.
+			np := &CiliumNetworkPolicy{}
+			if err := r.c.Get(context.Background(), types.NamespacedName{Namespace: testNamespace, Name: "sg-bad"}, np); !apierrors.IsNotFound(err) {
+				t.Fatalf("invalid SecurityGroup was persisted: err=%v", err)
+			}
+		})
+	}
+}
+
+// TestCreateAcceptsBareIPCIDR asserts a bare IP (no prefix) is accepted in
+// fromCIDR/toCIDR and projected 1:1. Cilium's CIDR.sanitize treats a bare IP as
+// a single-host CIDR, so rejecting it here would make the validator stricter
+// than Cilium and block a legitimate single-host rule.
+func TestCreateAcceptsBareIPCIDR(t *testing.T) {
+	r := newTestREST(t)
+	in := &sdnv1alpha1.SecurityGroup{
+		ObjectMeta: metav1.ObjectMeta{Name: "sg-host", Namespace: testNamespace},
+		Spec: sdnv1alpha1.SecurityGroupSpec{
+			Attachments: []sdnv1alpha1.ApplicationReference{{Kind: "Postgres", Name: "x"}},
+			Ingress:     []sdnv1alpha1.IngressRule{{FromCIDR: []string{"10.0.0.5"}}},
+			Egress:      []sdnv1alpha1.EgressRule{{ToCIDR: []string{"2001:db8::1"}}},
+		},
+	}
+	if _, err := r.Create(ctxNS(), in, nil, &metav1.CreateOptions{}); err != nil {
+		t.Fatalf("Create with bare-IP CIDRs returned error: %v", err)
+	}
+	np := &CiliumNetworkPolicy{}
+	if err := r.c.Get(context.Background(), types.NamespacedName{Namespace: testNamespace, Name: "sg-host"}, np); err != nil {
+		t.Fatalf("backing policy not found: %v", err)
+	}
+	if got := np.Spec.Ingress[0].FromCIDR; len(got) != 1 || got[0] != "10.0.0.5" {
+		t.Fatalf("fromCIDR not projected 1:1: got %v", got)
+	}
+	if got := np.Spec.Egress[0].ToCIDR; len(got) != 1 || got[0] != "2001:db8::1" {
+		t.Fatalf("toCIDR not projected 1:1: got %v", got)
+	}
+}
+
+func TestCreateNormalizesProtocolToUpper(t *testing.T) {
+	r := newTestREST(t)
+	// Numeric port, named port, and a lowercase protocol must all be accepted,
+	// and the lowercase protocol must be upper-cased on the backing policy — the
+	// Cilium CRD enforces a strict upper-case enum, so a raw "tcp" would 422.
+	in := sdnv1alpha1.IngressRule{
+		FromCIDR: []string{"10.0.0.0/8", "2001:db8::/32"},
+		ToPorts: []sdnv1alpha1.PortRule{{Ports: []sdnv1alpha1.PortProtocol{
+			{Port: "5432", Protocol: "tcp"},
+			{Port: "https"},
+			{Protocol: "ANY"},
+		}}},
+	}
+	if _, err := r.Create(ctxNS(), sgWithIngress("sg-ok", in), nil, &metav1.CreateOptions{}); err != nil {
+		t.Fatalf("Create with a valid spec returned error: %v", err)
+	}
+
+	np := &CiliumNetworkPolicy{}
+	if err := r.c.Get(context.Background(), types.NamespacedName{Namespace: testNamespace, Name: "sg-ok"}, np); err != nil {
+		t.Fatalf("backing policy not found: %v", err)
+	}
+	if got := np.Spec.Ingress[0].ToPorts[0].Ports[0].Protocol; got != "TCP" {
+		t.Fatalf("backing policy protocol not normalized: got %q, want TCP", got)
+	}
+}
+
+func TestUpdateNormalizesProtocolToUpper(t *testing.T) {
+	r := newTestREST(t, markedPolicy("sg-db"))
+	in := sgWithIngress("sg-db", sdnv1alpha1.IngressRule{
+		ToPorts: []sdnv1alpha1.PortRule{{Ports: []sdnv1alpha1.PortProtocol{{Port: "53", Protocol: "udp"}}}},
+	})
+	if _, _, err := r.Update(ctxNS(), "sg-db",
+		rest.DefaultUpdatedObjectInfo(in), nil, nil, false, &metav1.UpdateOptions{}); err != nil {
+		t.Fatalf("Update returned error: %v", err)
+	}
+	np := &CiliumNetworkPolicy{}
+	if err := r.c.Get(context.Background(), types.NamespacedName{Namespace: testNamespace, Name: "sg-db"}, np); err != nil {
+		t.Fatalf("backing policy not found: %v", err)
+	}
+	if got := np.Spec.Ingress[0].ToPorts[0].Ports[0].Protocol; got != "UDP" {
+		t.Fatalf("Update did not normalize protocol: got %q, want UDP", got)
+	}
+}
+
+func TestUpdateRejectsInvalidSpec(t *testing.T) {
+	r := newTestREST(t, markedPolicy("sg-db"))
+	bad := sgWithIngress("sg-db", sdnv1alpha1.IngressRule{FromCIDR: []string{"not-a-cidr"}})
+	if _, _, err := r.Update(ctxNS(), "sg-db",
+		rest.DefaultUpdatedObjectInfo(bad), nil, nil, false, &metav1.UpdateOptions{}); !apierrors.IsInvalid(err) {
+		t.Fatalf("Update with invalid spec: got err %v, want Invalid", err)
+	}
+}
+
+func TestCreateRejectsEmptyFQDNSelector(t *testing.T) {
+	r := newTestREST(t)
+	in := &sdnv1alpha1.SecurityGroup{
+		ObjectMeta: metav1.ObjectMeta{Name: "sg-fqdn", Namespace: testNamespace},
+		Spec: sdnv1alpha1.SecurityGroupSpec{
+			Attachments: []sdnv1alpha1.ApplicationReference{{Kind: "Postgres", Name: "db"}},
+			Egress:      []sdnv1alpha1.EgressRule{{ToFQDNs: []sdnv1alpha1.FQDNSelector{{}}}},
+		},
+	}
+	if _, err := r.Create(ctxNS(), in, nil, &metav1.CreateOptions{}); !apierrors.IsInvalid(err) {
+		t.Fatalf("Create with empty FQDNSelector: got err %v, want Invalid", err)
+	}
+}
+
+// TestCreateRejectsNamespaceMismatch asserts Create rejects a SecurityGroup
+// whose metadata.namespace differs from the request namespace, so a caller
+// cannot post to one namespace and persist into another. The aggregated
+// apiserver already enforces this before the storage is reached; binding it in
+// the storage too keeps the storage self-defending and pins the contract.
+func TestCreateRejectsNamespaceMismatch(t *testing.T) {
+	r := newTestREST(t)
+	in := &sdnv1alpha1.SecurityGroup{
+		ObjectMeta: metav1.ObjectMeta{Name: "sg-db", Namespace: "tenant-victim"},
+		Spec:       sampleSpec(),
+	}
+	if _, err := r.Create(ctxNS(), in, nil, &metav1.CreateOptions{}); !apierrors.IsBadRequest(err) {
+		t.Fatalf("Create with mismatched namespace: got err %v, want BadRequest", err)
+	}
+	// Nothing must have been persisted in either namespace.
+	np := &CiliumNetworkPolicy{}
+	if err := r.c.Get(context.Background(), types.NamespacedName{Namespace: "tenant-victim", Name: "sg-db"}, np); !apierrors.IsNotFound(err) {
+		t.Fatalf("expected no policy in tenant-victim, got err %v", err)
+	}
+	if err := r.c.Get(context.Background(), types.NamespacedName{Namespace: testNamespace, Name: "sg-db"}, np); !apierrors.IsNotFound(err) {
+		t.Fatalf("expected no policy in %s, got err %v", testNamespace, err)
+	}
+}
+
+// TestUpdateRejectsNameMismatch asserts Update rejects an object whose
+// metadata.name differs from the URL name, so a force-create/update cannot
+// write a different object than the request target.
+func TestUpdateRejectsNameMismatch(t *testing.T) {
+	r := newTestREST(t)
+	createSG(t, r, &sdnv1alpha1.SecurityGroup{
+		ObjectMeta: metav1.ObjectMeta{Name: "sg-db", Namespace: testNamespace},
+		Spec:       sampleSpec(),
+	})
+
+	mismatched := &sdnv1alpha1.SecurityGroup{
+		ObjectMeta: metav1.ObjectMeta{Name: "sg-evil", Namespace: testNamespace},
+		Spec:       sampleSpec(),
+	}
+	_, _, err := r.Update(ctxNS(), "sg-db",
+		rest.DefaultUpdatedObjectInfo(mismatched), nil, nil, false, &metav1.UpdateOptions{})
+	if !apierrors.IsBadRequest(err) {
+		t.Fatalf("Update with mismatched name: got err %v, want BadRequest", err)
+	}
+	// The off-target name must not have been created.
+	np := &CiliumNetworkPolicy{}
+	if err := r.c.Get(context.Background(), types.NamespacedName{Namespace: testNamespace, Name: "sg-evil"}, np); !apierrors.IsNotFound(err) {
+		t.Fatalf("expected no policy named sg-evil, got err %v", err)
+	}
+}
diff --git a/pkg/registry/sdn/securitygroup/rest_watch_test.go b/pkg/registry/sdn/securitygroup/rest_watch_test.go
new file mode 100644
index 0000000000..014c9512e6
--- /dev/null
+++ b/pkg/registry/sdn/securitygroup/rest_watch_test.go
@@ -0,0 +1,335 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright 2026 The Cozystack Authors.
+
+package securitygroup
+
+import (
+	"context"
+	"strconv"
+	"testing"
+	"time"
+
+	metainternal "k8s.io/apimachinery/pkg/apis/meta/internalversion"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/fields"
+	"k8s.io/apimachinery/pkg/watch"
+
+	sdnv1alpha1 "github.com/cozystack/cozystack/pkg/apis/sdn/v1alpha1"
+	"github.com/cozystack/cozystack/pkg/registry/registrytest"
+)
+
+// collectEvents drains up to n events from the watch, or returns early if the
+// channel closes or the timeout fires.
+func collectEvents(t *testing.T, w watch.Interface, n int, timeout time.Duration) []watch.Event {
+	t.Helper()
+	out := make([]watch.Event, 0, n)
+	deadline := time.NewTimer(timeout)
+	defer deadline.Stop()
+	for len(out) < n {
+		select {
+		case ev, ok := <-w.ResultChan():
+			if !ok {
+				return out
+			}
+			out = append(out, ev)
+		case <-deadline.C:
+			return out
+		}
+	}
+	return out
+}
+
+// fake.Client.Watch does not replay existing objects as ADDED, so every test
+// here starts the watch first and then mutates the store to drive events.
+
+func TestWatchFiltersUnmarkedPolicies(t *testing.T) {
+	r := newTestREST(t)
+	ctx, cancel := context.WithCancel(ctxNS())
+	defer cancel()
+
+	w, err := r.Watch(ctx, &metainternal.ListOptions{})
+	if err != nil {
+		t.Fatalf("Watch returned error: %v", err)
+	}
+	defer w.Stop()
+
+	// An unmarked platform policy must never surface; the marked one must.
+	if err := r.c.Create(ctx, unmarkedPolicy("tenant-isolation")); err != nil {
+		t.Fatalf("create unmarked: %v", err)
+	}
+	if err := r.c.Create(ctx, markedPolicy("sg-db")); err != nil {
+		t.Fatalf("create marked: %v", err)
+	}
+
+	evs := collectEvents(t, w, 1, 2*time.Second)
+	if len(evs) != 1 {
+		t.Fatalf("expected exactly 1 event (the marked policy), got %d: %+v", len(evs), evs)
+	}
+	if evs[0].Type != watch.Added {
+		t.Fatalf("expected Added, got %s", evs[0].Type)
+	}
+	sg, ok := evs[0].Object.(*sdnv1alpha1.SecurityGroup)
+	if !ok {
+		t.Fatalf("expected *SecurityGroup, got %T", evs[0].Object)
+	}
+	if sg.Name != "sg-db" {
+		t.Fatalf("expected the marked policy sg-db, got %q", sg.Name)
+	}
+	if _, ok := sg.Labels[sgLabelKey]; ok {
+		t.Fatalf("Watch leaked the marker label: %v", sg.Labels)
+	}
+}
+
+func TestWatchDeletedEventPassesThrough(t *testing.T) {
+	r := newTestREST(t)
+	ctx, cancel := context.WithCancel(ctxNS())
+	defer cancel()
+
+	w, err := r.Watch(ctx, &metainternal.ListOptions{})
+	if err != nil {
+		t.Fatalf("Watch returned error: %v", err)
+	}
+	defer w.Stop()
+
+	if err := r.c.Create(ctx, markedPolicy("sg-db")); err != nil {
+		t.Fatalf("create marked: %v", err)
+	}
+	if err := r.c.Delete(ctx, markedPolicy("sg-db")); err != nil {
+		t.Fatalf("delete marked: %v", err)
+	}
+
+	evs := collectEvents(t, w, 2, 2*time.Second)
+	if len(evs) < 2 {
+		t.Fatalf("expected at least 2 events (Added, Deleted), got %d: %+v", len(evs), evs)
+	}
+	if evs[0].Type != watch.Added {
+		t.Fatalf("event[0]: expected Added, got %s", evs[0].Type)
+	}
+	if evs[len(evs)-1].Type != watch.Deleted {
+		t.Fatalf("last event: expected Deleted to pass through, got %s", evs[len(evs)-1].Type)
+	}
+}
+
+// TestWatchPlainWatchEmitsNoInitialEventsEndBookmark covers a watch with no
+// resourceVersion: the apiserver defaults SendInitialEvents on for it but leaves
+// bookmarks off, so the client never asked for the terminating bookmark.
+func TestWatchPlainWatchEmitsNoInitialEventsEndBookmark(t *testing.T) {
+	r := newTestREST(t)
+	ctx, cancel := context.WithCancel(ctxNS())
+	defer cancel()
+
+	sendInitialEvents := true
+	w, err := r.Watch(ctx, &metainternal.ListOptions{SendInitialEvents: &sendInitialEvents})
+	if err != nil {
+		t.Fatalf("Watch returned error: %v", err)
+	}
+	defer w.Stop()
+
+	np := markedPolicy("sg-db")
+	if err := r.c.Create(ctx, np); err != nil {
+		t.Fatalf("create marked: %v", err)
+	}
+	np.Annotations = map[string]string{"touched": "1"}
+	if err := r.c.Update(ctx, np); err != nil {
+		t.Fatalf("update marked: %v", err)
+	}
+
+	evs := collectEvents(t, w, 3, 2*time.Second)
+	var types []watch.EventType
+	for _, ev := range evs {
+		types = append(types, ev.Type)
+		if ev.Type == watch.Bookmark {
+			t.Fatalf("unrequested bookmark on a plain watch: %+v", ev.Object)
+		}
+	}
+	if len(types) != 2 || types[0] != watch.Added || types[1] != watch.Modified {
+		t.Fatalf("expected [ADDED MODIFIED], got %v", types)
+	}
+}
+
+// TestWatchBackingBookmarksFollowTheClient pins that the backing watch asks for
+// bookmarks only when the client did: every backing bookmark is forwarded, and
+// the fake client never sends one, so the event stream alone cannot show it.
+func TestWatchBackingBookmarksFollowTheClient(t *testing.T) {
+	yes := true
+	for _, tc := range []struct {
+		name string
+		opts metainternal.ListOptions
+		want bool
+	}{
+		{"plain watch defaulted by the apiserver", metainternal.ListOptions{SendInitialEvents: &yes}, false},
+		{"watch list", metainternal.ListOptions{SendInitialEvents: &yes, AllowWatchBookmarks: true}, true},
+		{"bookmarks only", metainternal.ListOptions{AllowWatchBookmarks: true}, true},
+	} {
+		t.Run(tc.name, func(t *testing.T) {
+			r := newTestREST(t)
+			spy := &registrytest.RawRecordingWatch{WithWatch: r.w}
+			r.w = spy
+			ctx, cancel := context.WithCancel(ctxNS())
+			defer cancel()
+
+			w, err := r.Watch(ctx, &tc.opts)
+			if err != nil {
+				t.Fatalf("Watch returned error: %v", err)
+			}
+			defer w.Stop()
+
+			raw := spy.RawFor(&CiliumNetworkPolicyList{})
+			if raw == nil {
+				t.Fatal("backing watch was called without raw options")
+			}
+			if raw.AllowWatchBookmarks != tc.want {
+				t.Fatalf("backing AllowWatchBookmarks = %v, want %v", raw.AllowWatchBookmarks, tc.want)
+			}
+		})
+	}
+}
+
+func TestWatchSendInitialEventsEmitsBookmark(t *testing.T) {
+	r := newTestREST(t)
+	ctx, cancel := context.WithCancel(ctxNS())
+	defer cancel()
+
+	sendInitialEvents := true
+	w, err := r.Watch(ctx, &metainternal.ListOptions{SendInitialEvents: &sendInitialEvents, AllowWatchBookmarks: true})
+	if err != nil {
+		t.Fatalf("Watch returned error: %v", err)
+	}
+	defer w.Stop()
+
+	np := markedPolicy("sg-db")
+	if err := r.c.Create(ctx, np); err != nil {
+		t.Fatalf("create marked: %v", err)
+	}
+	np.Annotations = map[string]string{"touched": "1"}
+	if err := r.c.Update(ctx, np); err != nil {
+		t.Fatalf("update marked: %v", err)
+	}
+
+	evs := collectEvents(t, w, 3, 2*time.Second)
+	if len(evs) < 3 {
+		t.Fatalf("expected at least 3 events (Added, Bookmark, Modified), got %d: %+v", len(evs), evs)
+	}
+	if evs[0].Type != watch.Added {
+		t.Fatalf("event[0]: expected Added, got %s", evs[0].Type)
+	}
+	if evs[1].Type != watch.Bookmark {
+		t.Fatalf("event[1]: expected Bookmark, got %s", evs[1].Type)
+	}
+	bookmark, ok := evs[1].Object.(*sdnv1alpha1.SecurityGroup)
+	if !ok {
+		t.Fatalf("event[1]: expected *SecurityGroup, got %T", evs[1].Object)
+	}
+	if got := bookmark.Annotations[metav1.InitialEventsAnnotationKey]; got != "true" {
+		t.Fatalf("event[1]: expected annotation %s=true, got %q", metav1.InitialEventsAnnotationKey, got)
+	}
+	if evs[2].Type != watch.Modified {
+		t.Fatalf("event[2]: expected Modified after bookmark, got %s", evs[2].Type)
+	}
+}
+
+func TestWatchFieldSelector(t *testing.T) {
+	r := newTestREST(t)
+	ctx, cancel := context.WithCancel(ctxNS())
+	defer cancel()
+
+	w, err := r.Watch(ctx, &metainternal.ListOptions{
+		FieldSelector: fields.SelectorFromSet(fields.Set{"metadata.name": "sg-a"}),
+	})
+	if err != nil {
+		t.Fatalf("Watch returned error: %v", err)
+	}
+	defer w.Stop()
+
+	// sg-b is marked but does not match the field selector; only sg-a must surface.
+	if err := r.c.Create(ctx, markedPolicy("sg-b")); err != nil {
+		t.Fatalf("create sg-b: %v", err)
+	}
+	if err := r.c.Create(ctx, markedPolicy("sg-a")); err != nil {
+		t.Fatalf("create sg-a: %v", err)
+	}
+
+	evs := collectEvents(t, w, 1, 2*time.Second)
+	if len(evs) != 1 {
+		t.Fatalf("expected exactly 1 event (sg-a), got %d: %+v", len(evs), evs)
+	}
+	sg, ok := evs[0].Object.(*sdnv1alpha1.SecurityGroup)
+	if !ok || sg.Name != "sg-a" {
+		t.Fatalf("field selector leaked a non-matching object: %+v", evs[0].Object)
+	}
+}
+
+func TestWatchClusterWide(t *testing.T) {
+	r := newTestREST(t)
+	ctx, cancel := context.WithCancel(ctxAllNS())
+	defer cancel()
+
+	w, err := r.Watch(ctx, &metainternal.ListOptions{})
+	if err != nil {
+		t.Fatalf("cluster-wide Watch returned error: %v", err)
+	}
+	defer w.Stop()
+
+	if err := r.c.Create(ctx, markedPolicyIn("sg-x", "tenant-x")); err != nil {
+		t.Fatalf("create cross-namespace policy: %v", err)
+	}
+
+	evs := collectEvents(t, w, 1, 2*time.Second)
+	if len(evs) != 1 || evs[0].Type != watch.Added {
+		t.Fatalf("cluster-wide watch did not stream the cross-namespace event: %+v", evs)
+	}
+}
+
+// TestWatchSendInitialEventsReplaysLowResourceVersionAdds asserts that with
+// sendInitialEvents=true the resourceVersion de-dup filter does not drop
+// initial ADDED events whose resourceVersion is <= the requested startingRV.
+// The backing WatchList intentionally replays existing objects (RV <=
+// startingRV) as the initial state; dropping them would break the replay.
+func TestWatchSendInitialEventsReplaysLowResourceVersionAdds(t *testing.T) {
+	r := newTestREST(t)
+	ctx, cancel := context.WithCancel(ctxNS())
+	defer cancel()
+
+	sendInitialEvents := true
+	// A startingRV far above any RV the fake store assigns, so the ADDED event
+	// below has objRV <= startingRV and exercises the de-dup filter.
+	const startingRV = "1000000000"
+	w, err := r.Watch(ctx, &metainternal.ListOptions{
+		SendInitialEvents: &sendInitialEvents,
+		ResourceVersion:   startingRV,
+	})
+	if err != nil {
+		t.Fatalf("Watch returned error: %v", err)
+	}
+	defer w.Stop()
+
+	np := markedPolicy("sg-db")
+	if err := r.c.Create(ctx, np); err != nil {
+		t.Fatalf("create marked: %v", err)
+	}
+	// Precondition: the object RV must be <= startingRV, otherwise the filter
+	// would not apply and the test would not exercise the regression.
+	objRV, perr := strconv.ParseUint(np.ResourceVersion, 10, 64)
+	if perr != nil {
+		t.Fatalf("parse object RV %q: %v", np.ResourceVersion, perr)
+	}
+	if objRV > 1000000000 {
+		t.Fatalf("test precondition broken: object RV %d > startingRV", objRV)
+	}
+
+	// The ADDED event for sg-db must survive the initial replay, not be dropped.
+	evs := collectEvents(t, w, 3, 2*time.Second)
+	found := false
+	for _, ev := range evs {
+		if ev.Type != watch.Added {
+			continue
+		}
+		if sg, ok := ev.Object.(*sdnv1alpha1.SecurityGroup); ok && sg.Name == "sg-db" {
+			found = true
+			break
+		}
+	}
+	if !found {
+		t.Fatalf("expected an Added event for sg-db during initial replay, got %+v", evs)
+	}
+}
diff --git a/pkg/registry/sdn/securitygroup/rest_write_options_test.go b/pkg/registry/sdn/securitygroup/rest_write_options_test.go
new file mode 100644
index 0000000000..c46c6f6a6b
--- /dev/null
+++ b/pkg/registry/sdn/securitygroup/rest_write_options_test.go
@@ -0,0 +1,119 @@
+// SPDX-License-Identifier: Apache-2.0
+
+package securitygroup
+
+import (
+	"context"
+	"reflect"
+	"testing"
+
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apiserver/pkg/registry/rest"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/client/fake"
+	"sigs.k8s.io/controller-runtime/pkg/client/interceptor"
+
+	sdnv1alpha1 "github.com/cozystack/cozystack/pkg/apis/sdn/v1alpha1"
+)
+
+func newSecurityGroupWriteOptionsREST(t *testing.T, funcs interceptor.Funcs, policies ...*CiliumNetworkPolicy) *REST {
+	t.Helper()
+	scheme := runtime.NewScheme()
+	if err := AddToScheme(scheme); err != nil {
+		t.Fatalf("register Cilium mirror scheme: %v", err)
+	}
+	objects := make([]client.Object, 0, len(policies))
+	for _, policy := range policies {
+		objects = append(objects, policy)
+	}
+	c := fake.NewClientBuilder().
+		WithScheme(scheme).
+		WithObjects(objects...).
+		WithInterceptorFuncs(funcs).
+		Build()
+	return &REST{c: c, w: c, gvr: schema.GroupVersionResource{
+		Group: sdnv1alpha1.GroupName, Version: "v1alpha1", Resource: sdnv1alpha1.SecurityGroupPluralName,
+	}}
+}
+
+func captureSecurityGroupCreateOptions(opts ...client.CreateOption) *metav1.CreateOptions {
+	converted := (&client.CreateOptions{}).ApplyOptions(opts)
+	return converted.AsCreateOptions().DeepCopy()
+}
+
+func captureSecurityGroupUpdateOptions(opts ...client.UpdateOption) *metav1.UpdateOptions {
+	converted := (&client.UpdateOptions{}).ApplyOptions(opts)
+	return converted.AsUpdateOptions().DeepCopy()
+}
+
+func captureSecurityGroupDeleteOptions(opts ...client.DeleteOption) *metav1.DeleteOptions {
+	converted := &client.DeleteOptions{}
+	for _, option := range opts {
+		option.ApplyToDelete(converted)
+	}
+	return converted.AsDeleteOptions().DeepCopy()
+}
+
+func writeOptionsSecurityGroup() *sdnv1alpha1.SecurityGroup {
+	return &sdnv1alpha1.SecurityGroup{
+		ObjectMeta: metav1.ObjectMeta{Name: "sg-options", Namespace: testNamespace},
+		Spec:       sampleSpec(),
+	}
+}
+
+func TestSecurityGroupCreatePropagatesWriteOptions(t *testing.T) {
+	want := &metav1.CreateOptions{DryRun: []string{metav1.DryRunAll}, FieldManager: "creator", FieldValidation: "Strict"}
+	expected := want.DeepCopy()
+	var got *metav1.CreateOptions
+	r := newSecurityGroupWriteOptionsREST(t, interceptor.Funcs{
+		Create: func(_ context.Context, _ client.WithWatch, _ client.Object, opts ...client.CreateOption) error {
+			got = captureSecurityGroupCreateOptions(opts...)
+			return nil
+		},
+	})
+	if _, err := r.Create(ctxNS(), writeOptionsSecurityGroup(), nil, want); err != nil {
+		t.Fatalf("Create returned error: %v", err)
+	}
+	if !reflect.DeepEqual(got, expected) {
+		t.Fatalf("Create options lost: got %#v, want %#v", got, expected)
+	}
+}
+
+func TestSecurityGroupUpdatePropagatesWriteOptions(t *testing.T) {
+	want := &metav1.UpdateOptions{DryRun: []string{metav1.DryRunAll}, FieldManager: "updater", FieldValidation: "Warn"}
+	expected := want.DeepCopy()
+	var got *metav1.UpdateOptions
+	r := newSecurityGroupWriteOptionsREST(t, interceptor.Funcs{
+		Update: func(_ context.Context, _ client.WithWatch, _ client.Object, opts ...client.UpdateOption) error {
+			got = captureSecurityGroupUpdateOptions(opts...)
+			return nil
+		},
+	}, markedPolicy("sg-options"))
+	if _, _, err := r.Update(ctxNS(), "sg-options", rest.DefaultUpdatedObjectInfo(writeOptionsSecurityGroup()), nil, nil, false, want); err != nil {
+		t.Fatalf("Update returned error: %v", err)
+	}
+	if !reflect.DeepEqual(got, expected) {
+		t.Fatalf("Update options lost: got %#v, want %#v", got, expected)
+	}
+}
+
+func TestSecurityGroupDeletePropagatesWriteOptions(t *testing.T) {
+	propagation := metav1.DeletePropagationForeground
+	want := &metav1.DeleteOptions{PropagationPolicy: &propagation, DryRun: []string{metav1.DryRunAll}}
+	expected := want.DeepCopy()
+	var got *metav1.DeleteOptions
+	r := newSecurityGroupWriteOptionsREST(t, interceptor.Funcs{
+		Delete: func(_ context.Context, _ client.WithWatch, _ client.Object, opts ...client.DeleteOption) error {
+			got = captureSecurityGroupDeleteOptions(opts...)
+			return nil
+		},
+	}, markedPolicy("sg-options"))
+	if _, _, err := r.Delete(ctxNS(), "sg-options", nil, want); err != nil {
+		t.Fatalf("Delete returned error: %v", err)
+	}
+	if !reflect.DeepEqual(got, expected) {
+		t.Fatalf("Delete options lost: got %#v, want %#v", got, expected)
+	}
+}
diff --git a/pkg/registry/sdn/securitygroup/validate.go b/pkg/registry/sdn/securitygroup/validate.go
new file mode 100644
index 0000000000..4aa37f7652
--- /dev/null
+++ b/pkg/registry/sdn/securitygroup/validate.go
@@ -0,0 +1,195 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright 2026 The Cozystack Authors.
+
+package securitygroup
+
+import (
+	"net/netip"
+	"strconv"
+	"strings"
+
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	"k8s.io/apimachinery/pkg/util/validation"
+	"k8s.io/apimachinery/pkg/util/validation/field"
+
+	sdnv1alpha1 "github.com/cozystack/cozystack/pkg/apis/sdn/v1alpha1"
+)
+
+// validProtocols is the set of L4 protocols a SecurityGroup port rule may name.
+// An empty protocol defaults to ANY and is allowed.
+var validProtocols = map[string]struct{}{"TCP": {}, "UDP": {}, "SCTP": {}, "ANY": {}}
+
+// reservedEntities are Cilium's built-in entity names. They stay
+// platform-managed and are deliberately not tenant-expressible — a SecurityGroup
+// reaches external destinations through CIDR/FQDN, not entities — so the API
+// rejects an application or SecurityGroup name that collides with one.
+var reservedEntities = map[string]struct{}{
+	"world": {}, "cluster": {}, "kube-apiserver": {}, "host": {},
+	"remote-node": {}, "health": {}, "init": {}, "unmanaged": {}, "all": {},
+}
+
+// validateSecurityGroup rejects specs that are schema-valid but semantically
+// wrong (malformed CIDR, out-of-range port, unknown protocol, an attachment or
+// peer that cannot be projected to a valid selector). Without this the backing
+// CiliumNetworkPolicy write succeeds and the API returns success, but Cilium
+// discards the rule asynchronously — so the policy silently never enforces,
+// which for a deny-by-default firewall is a dangerous, invisible gap.
+func validateSecurityGroup(sg *sdnv1alpha1.SecurityGroup) error {
+	var errs field.ErrorList
+	spec := field.NewPath("spec")
+
+	// The SecurityGroup's own name becomes the backing policy's membership label
+	// key (membershipLabelKey(name)). A resource name is validated as a DNS-1123
+	// subdomain (up to 253 chars), which is more permissive than a label key, so
+	// reject a name that cannot form a valid key here — with a clean field error
+	// on metadata.name — instead of letting the backing CiliumNetworkPolicy write
+	// fail later with a confusing label-key error.
+	for _, msg := range validation.IsQualifiedName(membershipLabelKey(sg.Name)) {
+		errs = append(errs, field.Invalid(field.NewPath("metadata", "name"), sg.Name, msg))
+	}
+
+	att := spec.Child("attachments")
+	for i := range sg.Spec.Attachments {
+		errs = append(errs, validateAppRef(att.Index(i), &sg.Spec.Attachments[i])...)
+	}
+
+	for i := range sg.Spec.Ingress {
+		in := &sg.Spec.Ingress[i]
+		p := spec.Child("ingress").Index(i)
+		for j := range in.FromApp {
+			errs = append(errs, validateAppRef(p.Child("fromApp").Index(j), &in.FromApp[j])...)
+		}
+		errs = append(errs, validateSGNames(p.Child("fromSG"), in.FromSG)...)
+		errs = append(errs, validateCIDRs(p.Child("fromCIDR"), in.FromCIDR)...)
+		errs = append(errs, validatePortRules(p.Child("toPorts"), in.ToPorts)...)
+	}
+	for i := range sg.Spec.Egress {
+		eg := &sg.Spec.Egress[i]
+		p := spec.Child("egress").Index(i)
+		for j := range eg.ToApp {
+			errs = append(errs, validateAppRef(p.Child("toApp").Index(j), &eg.ToApp[j])...)
+		}
+		errs = append(errs, validateSGNames(p.Child("toSG"), eg.ToSG)...)
+		errs = append(errs, validateCIDRs(p.Child("toCIDR"), eg.ToCIDR)...)
+		errs = append(errs, validatePortRules(p.Child("toPorts"), eg.ToPorts)...)
+		errs = append(errs, validateFQDNs(p.Child("toFQDNs"), eg.ToFQDNs)...)
+	}
+
+	if len(errs) == 0 {
+		return nil
+	}
+	return apierrors.NewInvalid(
+		sdnv1alpha1.SchemeGroupVersion.WithKind(kindSG).GroupKind(),
+		sg.Name, errs)
+}
+
+// validateAppRef requires kind and name and rejects any component that is not a
+// valid label value. Attachments and fromApp/toApp peers project to lineage
+// matchLabels, so a value Kubernetes would reject as a label value (e.g. > 63
+// chars) must be caught here rather than producing an unenforceable policy.
+// Validating apiGroup too keeps the reverse projection lossless. The name must
+// also not collide with a reserved Cilium entity.
+func validateAppRef(path *field.Path, ref *sdnv1alpha1.ApplicationReference) field.ErrorList {
+	var errs field.ErrorList
+	if ref.Kind == "" {
+		errs = append(errs, field.Required(path.Child("kind"), "must reference an application kind"))
+	}
+	if ref.Name == "" {
+		errs = append(errs, field.Required(path.Child("name"), "must reference an application name"))
+	}
+	for _, f := range []struct {
+		name  string
+		value string
+	}{{"apiGroup", ref.APIGroup}, {"kind", ref.Kind}, {"name", ref.Name}} {
+		if f.value == "" {
+			continue
+		}
+		for _, msg := range validation.IsValidLabelValue(f.value) {
+			errs = append(errs, field.Invalid(path.Child(f.name), f.value, msg))
+		}
+	}
+	if _, bad := reservedEntities[strings.ToLower(ref.Name)]; bad {
+		errs = append(errs, field.Invalid(path.Child("name"), ref.Name, "must not name a reserved Cilium entity"))
+	}
+	return errs
+}
+
+// validateSGNames rejects a fromSG/toSG peer whose name cannot project to a
+// valid membership-label key (MembershipLabelPrefix + name) and one that
+// collides with a reserved Cilium entity. References are resolved within the
+// SecurityGroup's own namespace (the backing CiliumNetworkPolicy is namespaced),
+// so cross-namespace reach is structurally impossible; a reference to a
+// non-existent group simply selects no pods.
+func validateSGNames(path *field.Path, names []string) field.ErrorList {
+	var errs field.ErrorList
+	for i, n := range names {
+		if n == "" {
+			errs = append(errs, field.Required(path.Index(i), "must name a SecurityGroup"))
+			continue
+		}
+		if _, bad := reservedEntities[strings.ToLower(n)]; bad {
+			errs = append(errs, field.Invalid(path.Index(i), n, "must not name a reserved Cilium entity"))
+			continue
+		}
+		for _, msg := range validation.IsQualifiedName(sdnv1alpha1.MembershipLabelPrefix + n) {
+			errs = append(errs, field.Invalid(path.Index(i), n, msg))
+		}
+	}
+	return errs
+}
+
+func validateCIDRs(path *field.Path, cidrs []string) field.ErrorList {
+	var errs field.ErrorList
+	for i, c := range cidrs {
+		// Mirror Cilium's CIDR.sanitize: a CIDR value may be a prefix
+		// (10.0.0.0/24) or a bare IP (10.0.0.1, treated as /32 or /128).
+		// Rejecting a bare IP here would make the validator stricter than
+		// Cilium and block a legitimate single-host rule, so fall back to a
+		// plain-address parse before declaring the value invalid.
+		if _, err := netip.ParsePrefix(c); err != nil {
+			if _, err := netip.ParseAddr(c); err != nil {
+				errs = append(errs, field.Invalid(path.Index(i), c, "must be a valid CIDR or IP address"))
+			}
+		}
+	}
+	return errs
+}
+
+func validateFQDNs(path *field.Path, fqdns []sdnv1alpha1.FQDNSelector) field.ErrorList {
+	var errs field.ErrorList
+	for i := range fqdns {
+		if fqdns[i].MatchName == "" && fqdns[i].MatchPattern == "" {
+			errs = append(errs, field.Required(path.Index(i), "must set matchName or matchPattern"))
+		}
+	}
+	return errs
+}
+
+func validatePortRules(path *field.Path, rules []sdnv1alpha1.PortRule) field.ErrorList {
+	var errs field.ErrorList
+	for i := range rules {
+		for j := range rules[i].Ports {
+			pp := rules[i].Ports[j]
+			pPath := path.Index(i).Child("ports").Index(j)
+
+			if pp.Port != "" {
+				if n, err := strconv.Atoi(pp.Port); err == nil {
+					if n < 1 || n > 65535 {
+						errs = append(errs, field.Invalid(pPath.Child("port"), pp.Port, "port number must be between 1 and 65535"))
+					}
+				} else {
+					for _, msg := range validation.IsValidPortName(pp.Port) {
+						errs = append(errs, field.Invalid(pPath.Child("port"), pp.Port, msg))
+					}
+				}
+			}
+
+			if pp.Protocol != "" {
+				if _, ok := validProtocols[strings.ToUpper(pp.Protocol)]; !ok {
+					errs = append(errs, field.NotSupported(pPath.Child("protocol"), pp.Protocol, []string{"TCP", "UDP", "SCTP", "ANY"}))
+				}
+			}
+		}
+	}
+	return errs
+}
diff --git a/pkg/registry/utils.go b/pkg/registry/utils.go
index c5deb422e0..4c597f0188 100644
--- a/pkg/registry/utils.go
+++ b/pkg/registry/utils.go
@@ -20,7 +20,10 @@ import (
 	"strconv"
 
 	"k8s.io/apimachinery/pkg/api/meta"
+	metainternalversion "k8s.io/apimachinery/pkg/apis/meta/internalversion"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/watch"
 )
 
 // MaxResourceVersion returns the maximum resourceVersion from all items in a list.
@@ -55,3 +58,101 @@ func MaxResourceVersion(list runtime.Object) (string, error) {
 
 	return strconv.FormatUint(max, 10), nil
 }
+
+// InitialEventsEndBookmarkRequested reports whether a watch asked for the
+// WatchList initial-events-end bookmark. SendInitialEvents alone does not ask
+// for it: the apiserver defaults it on for a watch whose resourceVersion is
+// empty or "0" while leaving bookmarks off, and from k8s.io/apiserver v0.36 the
+// watch handler serving this apiserver panics when such a watch receives the
+// marker.
+func InitialEventsEndBookmarkRequested(opts *metainternalversion.ListOptions) bool {
+	return opts.SendInitialEvents != nil && *opts.SendInitialEvents && opts.AllowWatchBookmarks
+}
+
+// InitialEventsBookmarker implements the WatchList initial-events-end contract
+// for a Watch that translates events from a backing controller-runtime watcher.
+// It annotates the first backing Bookmark as the terminating marker, falling
+// back to emitting one before the first live event or when the watcher closes.
+//
+// Construct with NewInitialEventsBookmarker. Methods are not safe for concurrent
+// use; call them from a single watch goroutine.
+type InitialEventsBookmarker struct {
+	// newBookmark returns an empty, TypeMeta-populated object of the translated
+	// resource type; the bookmarker fills in the resourceVersion and annotation.
+	newBookmark func() runtime.Object
+	sent        bool
+	lastRV      string
+}
+
+// NewInitialEventsBookmarker returns a bookmarker for a watch; pass
+// InitialEventsEndBookmarkRequested for initialEventsEnd. When it is false the
+// bookmarker never emits a terminating bookmark and OnBackingBookmark forwards
+// backing bookmarks unannotated. startingRV seeds the resourceVersion (the
+// client's requested ResourceVersion) so the terminating bookmark carries a
+// valid version even if the watcher closes before any backing event is
+// observed.
+func NewInitialEventsBookmarker(initialEventsEnd bool, startingRV string, newBookmark func() runtime.Object) *InitialEventsBookmarker {
+	return &InitialEventsBookmarker{
+		newBookmark: newBookmark,
+		lastRV:      startingRV,
+		sent:        !initialEventsEnd,
+	}
+}
+
+// Sent reports whether the initial-events-end bookmark has been emitted (or was
+// never required). Callers buffering live events use it to decide when to start
+// delivering them.
+func (b *InitialEventsBookmarker) Sent() bool { return b.sent }
+
+// Observe records the resourceVersion of the latest backing event so the
+// bookmark carries an up-to-date version. Empty versions are ignored.
+func (b *InitialEventsBookmarker) Observe(resourceVersion string) {
+	if resourceVersion != "" {
+		b.lastRV = resourceVersion
+	}
+}
+
+// bookmarkEvent builds a Bookmark at the tracked resourceVersion, annotated as
+// the terminating marker when end is true.
+func (b *InitialEventsBookmarker) bookmarkEvent(end bool) watch.Event {
+	obj := b.newBookmark()
+	if accessor, err := meta.Accessor(obj); err == nil {
+		accessor.SetResourceVersion(b.lastRV)
+		if end {
+			accessor.SetAnnotations(map[string]string{metav1.InitialEventsAnnotationKey: "true"})
+		}
+	}
+	return watch.Event{Type: watch.Bookmark, Object: obj}
+}
+
+// OnBackingBookmark forwards the backing watcher's Bookmark at rv. The first one
+// after the initial events becomes the terminating marker; the returned bool
+// reports whether this call emitted it, so callers can flush buffered events.
+func (b *InitialEventsBookmarker) OnBackingBookmark(rv string) (event watch.Event, initialEventsEnd bool) {
+	b.Observe(rv)
+	if b.sent {
+		return b.bookmarkEvent(false), false
+	}
+	b.sent = true
+	return b.bookmarkEvent(true), true
+}
+
+// BeforeLiveEvent returns the terminating bookmark and true when a live
+// (non-ADDED) event is about to be delivered and the marker is still pending.
+func (b *InitialEventsBookmarker) BeforeLiveEvent(eventType watch.EventType) (event watch.Event, needed bool) {
+	if b.sent || eventType == watch.Added {
+		return watch.Event{}, false
+	}
+	b.sent = true
+	return b.bookmarkEvent(true), true
+}
+
+// OnClose returns the terminating bookmark and true if the backing watcher
+// closed before the marker was emitted.
+func (b *InitialEventsBookmarker) OnClose() (event watch.Event, needed bool) {
+	if b.sent {
+		return watch.Event{}, false
+	}
+	b.sent = true
+	return b.bookmarkEvent(true), true
+}
diff --git a/pkg/registry/utils_test.go b/pkg/registry/utils_test.go
new file mode 100644
index 0000000000..ba58f934b8
--- /dev/null
+++ b/pkg/registry/utils_test.go
@@ -0,0 +1,190 @@
+/*
+Copyright 2024 The Cozystack Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package registry
+
+import (
+	"testing"
+
+	metainternalversion "k8s.io/apimachinery/pkg/apis/meta/internalversion"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/watch"
+)
+
+// newTestBookmarkObject returns a minimal object for the bookmarker to stamp.
+func newTestBookmarkObject() runtime.Object {
+	return &metav1.PartialObjectMetadata{
+		TypeMeta: metav1.TypeMeta{APIVersion: "core.cozystack.io/v1alpha1", Kind: "TenantSecret"},
+	}
+}
+
+// assertInitialEventsEnd verifies ev is a Bookmark carrying
+// metav1.InitialEventsAnnotationKey=true and a non-empty resourceVersion.
+func assertInitialEventsEnd(t *testing.T, ev watch.Event, wantRV string) {
+	t.Helper()
+	if ev.Type != watch.Bookmark {
+		t.Fatalf("expected Bookmark event, got %s", ev.Type)
+	}
+	obj, ok := ev.Object.(*metav1.PartialObjectMetadata)
+	if !ok {
+		t.Fatalf("expected *PartialObjectMetadata, got %T", ev.Object)
+	}
+	if got := obj.Annotations[metav1.InitialEventsAnnotationKey]; got != "true" {
+		t.Fatalf("expected annotation %s=true, got %q", metav1.InitialEventsAnnotationKey, got)
+	}
+	if obj.ResourceVersion == "" {
+		t.Fatal("expected non-empty resourceVersion on terminating bookmark")
+	}
+	if wantRV != "" && obj.ResourceVersion != wantRV {
+		t.Fatalf("expected resourceVersion %q, got %q", wantRV, obj.ResourceVersion)
+	}
+}
+
+func TestInitialEventsBookmarker_Disabled(t *testing.T) {
+	b := NewInitialEventsBookmarker(false, "", newTestBookmarkObject)
+
+	if !b.Sent() {
+		t.Fatal("disabled bookmarker should report Sent()==true")
+	}
+	if _, ok := b.BeforeLiveEvent(watch.Modified); ok {
+		t.Fatal("disabled bookmarker should never need a before-live bookmark")
+	}
+	if _, ok := b.OnClose(); ok {
+		t.Fatal("disabled bookmarker should never need an on-close bookmark")
+	}
+	// A backing bookmark is still forwarded, but never carries the marker.
+	ev, end := b.OnBackingBookmark("7")
+	if end {
+		t.Fatal("disabled bookmarker should not mark a backing bookmark as initial-events-end")
+	}
+	if ev.Type != watch.Bookmark {
+		t.Fatalf("expected forwarded Bookmark, got %s", ev.Type)
+	}
+	if obj := ev.Object.(*metav1.PartialObjectMetadata); obj.Annotations[metav1.InitialEventsAnnotationKey] != "" {
+		t.Fatal("disabled bookmarker must not annotate forwarded bookmarks")
+	}
+}
+
+func TestInitialEventsBookmarker_BackingBookmarkTerminatesStream(t *testing.T) {
+	b := NewInitialEventsBookmarker(true, "", newTestBookmarkObject)
+	b.Observe("12")
+
+	ev, end := b.OnBackingBookmark("15")
+	if !end {
+		t.Fatal("first backing bookmark should terminate the initial stream")
+	}
+	assertInitialEventsEnd(t, ev, "15")
+	if !b.Sent() {
+		t.Fatal("bookmarker should report Sent()==true after terminating bookmark")
+	}
+
+	// Subsequent backing bookmarks are forwarded without the marker.
+	ev2, end2 := b.OnBackingBookmark("20")
+	if end2 {
+		t.Fatal("second backing bookmark must not re-terminate the stream")
+	}
+	if obj := ev2.Object.(*metav1.PartialObjectMetadata); obj.Annotations[metav1.InitialEventsAnnotationKey] != "" {
+		t.Fatal("subsequent bookmark must not carry the initial-events-end annotation")
+	}
+}
+
+func TestInitialEventsBookmarker_BeforeLiveEvent(t *testing.T) {
+	b := NewInitialEventsBookmarker(true, "", newTestBookmarkObject)
+	b.Observe("9")
+
+	// ADDED events are part of the initial stream and never trigger the marker.
+	if _, ok := b.BeforeLiveEvent(watch.Added); ok {
+		t.Fatal("ADDED event should not trigger the initial-events-end bookmark")
+	}
+
+	ev, ok := b.BeforeLiveEvent(watch.Modified)
+	if !ok {
+		t.Fatal("first non-ADDED event should trigger the initial-events-end bookmark")
+	}
+	assertInitialEventsEnd(t, ev, "9")
+
+	// Once sent, later live events do not re-trigger it.
+	if _, ok := b.BeforeLiveEvent(watch.Deleted); ok {
+		t.Fatal("initial-events-end bookmark should only be emitted once")
+	}
+}
+
+func TestInitialEventsBookmarker_OnClose(t *testing.T) {
+	b := NewInitialEventsBookmarker(true, "", newTestBookmarkObject)
+	b.Observe("42")
+
+	ev, ok := b.OnClose()
+	if !ok {
+		t.Fatal("closing before the marker was sent should flush a terminating bookmark")
+	}
+	assertInitialEventsEnd(t, ev, "42")
+
+	if _, ok := b.OnClose(); ok {
+		t.Fatal("on-close bookmark must not be emitted twice")
+	}
+}
+
+func TestInitialEventsBookmarker_ObserveIgnoresEmpty(t *testing.T) {
+	b := NewInitialEventsBookmarker(true, "", newTestBookmarkObject)
+	b.Observe("5")
+	b.Observe("") // must not clobber the tracked version
+
+	ev, _ := b.OnClose()
+	assertInitialEventsEnd(t, ev, "5")
+}
+
+func TestInitialEventsBookmarker_SeedsStartingResourceVersion(t *testing.T) {
+	// Watcher closes before any backing event is observed: the terminating
+	// bookmark falls back to the client's requested resourceVersion rather than
+	// an empty one.
+	b := NewInitialEventsBookmarker(true, "100", newTestBookmarkObject)
+
+	ev, ok := b.OnClose()
+	if !ok {
+		t.Fatal("expected a terminating bookmark on close")
+	}
+	assertInitialEventsEnd(t, ev, "100")
+}
+
+func TestInitialEventsBookmarker_ObserveOverridesStartingResourceVersion(t *testing.T) {
+	// Once a backing event is observed, its resourceVersion supersedes the seed.
+	b := NewInitialEventsBookmarker(true, "100", newTestBookmarkObject)
+	b.Observe("150")
+
+	ev, _ := b.OnClose()
+	assertInitialEventsEnd(t, ev, "150")
+}
+
+func TestInitialEventsEndBookmarkRequested(t *testing.T) {
+	yes, no := true, false
+	for _, tc := range []struct {
+		name string
+		opts metainternalversion.ListOptions
+		want bool
+	}{
+		{"watch list", metainternalversion.ListOptions{SendInitialEvents: &yes, AllowWatchBookmarks: true}, true},
+		{"plain watch defaulted by the apiserver", metainternalversion.ListOptions{SendInitialEvents: &yes}, false},
+		{"bookmarks without initial events", metainternalversion.ListOptions{SendInitialEvents: &no, AllowWatchBookmarks: true}, false},
+		{"neither", metainternalversion.ListOptions{}, false},
+	} {
+		t.Run(tc.name, func(t *testing.T) {
+			if got := InitialEventsEndBookmarkRequested(&tc.opts); got != tc.want {
+				t.Fatalf("InitialEventsEndBookmarkRequested = %v, want %v", got, tc.want)
+			}
+		})
+	}
+}
diff --git a/pkg/registry/write_options.go b/pkg/registry/write_options.go
new file mode 100644
index 0000000000..35500c1a38
--- /dev/null
+++ b/pkg/registry/write_options.go
@@ -0,0 +1,82 @@
+/*
+Copyright 2026 The Cozystack Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package registry
+
+import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+)
+
+// ClientCreateOptions converts API create options for the controller-runtime client.
+func ClientCreateOptions(options *metav1.CreateOptions) *client.CreateOptions {
+	if options == nil {
+		return &client.CreateOptions{}
+	}
+	raw := options.DeepCopy()
+	return &client.CreateOptions{
+		DryRun:          append([]string(nil), raw.DryRun...),
+		FieldManager:    raw.FieldManager,
+		FieldValidation: raw.FieldValidation,
+		Raw:             raw,
+	}
+}
+
+// CreateOptionsFromUpdate converts update options for a force-allow-create create.
+func CreateOptionsFromUpdate(options *metav1.UpdateOptions) *metav1.CreateOptions {
+	if options == nil {
+		return &metav1.CreateOptions{}
+	}
+	return &metav1.CreateOptions{
+		DryRun:          options.DryRun,
+		FieldManager:    options.FieldManager,
+		FieldValidation: options.FieldValidation,
+	}
+}
+
+// ClientCreateOptionsFromUpdate converts force-create options for the controller-runtime client.
+func ClientCreateOptionsFromUpdate(options *metav1.UpdateOptions) *client.CreateOptions {
+	return ClientCreateOptions(CreateOptionsFromUpdate(options))
+}
+
+// ClientUpdateOptions converts API update options for the controller-runtime client.
+func ClientUpdateOptions(options *metav1.UpdateOptions) *client.UpdateOptions {
+	if options == nil {
+		return &client.UpdateOptions{}
+	}
+	raw := options.DeepCopy()
+	return &client.UpdateOptions{
+		DryRun:          append([]string(nil), raw.DryRun...),
+		FieldManager:    raw.FieldManager,
+		FieldValidation: raw.FieldValidation,
+		Raw:             raw,
+	}
+}
+
+// ClientDeleteOptions converts API delete options for the controller-runtime client.
+func ClientDeleteOptions(options *metav1.DeleteOptions) *client.DeleteOptions {
+	if options == nil {
+		return &client.DeleteOptions{}
+	}
+	raw := options.DeepCopy()
+	return &client.DeleteOptions{
+		GracePeriodSeconds: raw.GracePeriodSeconds,
+		Preconditions:      raw.Preconditions,
+		PropagationPolicy:  raw.PropagationPolicy,
+		Raw:                raw,
+		DryRun:             append([]string(nil), raw.DryRun...),
+	}
+}
diff --git a/pkg/registry/write_options_test.go b/pkg/registry/write_options_test.go
new file mode 100644
index 0000000000..488d7a51af
--- /dev/null
+++ b/pkg/registry/write_options_test.go
@@ -0,0 +1,117 @@
+/*
+Copyright 2026 The Cozystack Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package registry
+
+import (
+	"reflect"
+	"testing"
+
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/types"
+)
+
+func TestClientWriteOptionsPreserveAPISemantics(t *testing.T) {
+	grace := int64(7)
+	orphan := true
+	propagation := metav1.DeletePropagationForeground
+	uid := types.UID("expected-uid")
+	rv := "42"
+
+	create := &metav1.CreateOptions{
+		TypeMeta:        metav1.TypeMeta{APIVersion: "meta.k8s.io/v1", Kind: "CreateOptions"},
+		DryRun:          []string{metav1.DryRunAll},
+		FieldManager:    "create-manager",
+		FieldValidation: "Strict",
+	}
+	update := &metav1.UpdateOptions{
+		TypeMeta:        metav1.TypeMeta{APIVersion: "meta.k8s.io/v1", Kind: "UpdateOptions"},
+		DryRun:          []string{metav1.DryRunAll},
+		FieldManager:    "update-manager",
+		FieldValidation: "Warn",
+	}
+	deleteOptions := &metav1.DeleteOptions{
+		TypeMeta:           metav1.TypeMeta{APIVersion: "meta.k8s.io/v1", Kind: "DeleteOptions"},
+		GracePeriodSeconds: &grace,
+		Preconditions:      &metav1.Preconditions{UID: &uid, ResourceVersion: &rv},
+		PropagationPolicy:  &propagation,
+		DryRun:             []string{metav1.DryRunAll},
+	}
+	createExpected := create.DeepCopy()
+	updateExpected := update.DeepCopy()
+	deleteExpected := deleteOptions.DeepCopy()
+
+	tests := []struct {
+		name string
+		got  any
+		want any
+	}{
+		{name: "create", got: ClientCreateOptions(create).AsCreateOptions(), want: createExpected},
+		{name: "update", got: ClientUpdateOptions(update).AsUpdateOptions(), want: updateExpected},
+		{name: "delete", got: ClientDeleteOptions(deleteOptions).AsDeleteOptions(), want: deleteExpected},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if !reflect.DeepEqual(tt.got, tt.want) {
+				t.Fatalf("converted options differ:\n got: %#v\nwant: %#v", tt.got, tt.want)
+			}
+		})
+	}
+	if !reflect.DeepEqual(create, createExpected) || !reflect.DeepEqual(update, updateExpected) || !reflect.DeepEqual(deleteOptions, deleteExpected) {
+		t.Fatalf("conversion mutated API options: create=%#v update=%#v delete=%#v", create, update, deleteOptions)
+	}
+
+	orphanDelete := &metav1.DeleteOptions{OrphanDependents: &orphan, DryRun: []string{metav1.DryRunAll}}
+	orphanExpected := orphanDelete.DeepCopy()
+	if got := ClientDeleteOptions(orphanDelete).AsDeleteOptions(); !reflect.DeepEqual(got, orphanExpected) {
+		t.Fatalf("raw-only delete option lost: got %#v, want %#v", got, orphanExpected)
+	}
+	if !reflect.DeepEqual(orphanDelete, orphanExpected) {
+		t.Fatalf("raw-only delete conversion mutated input: got %#v, want %#v", orphanDelete, orphanExpected)
+	}
+}
+
+func TestClientWriteOptionConversionsPreserveSharedFields(t *testing.T) {
+	update := &metav1.UpdateOptions{
+		DryRun:          []string{metav1.DryRunAll},
+		FieldManager:    "update-manager",
+		FieldValidation: "Strict",
+	}
+	created := ClientCreateOptionsFromUpdate(update).AsCreateOptions()
+	if !reflect.DeepEqual(created, &metav1.CreateOptions{
+		DryRun:          update.DryRun,
+		FieldManager:    update.FieldManager,
+		FieldValidation: update.FieldValidation,
+	}) {
+		t.Fatalf("force-create conversion lost update options: %#v", created)
+	}
+	if got := CreateOptionsFromUpdate(nil); !reflect.DeepEqual(got, &metav1.CreateOptions{}) {
+		t.Fatalf("nil force-create options: %#v", got)
+	}
+
+}
+
+func TestClientWriteOptionsAcceptNil(t *testing.T) {
+	if got := ClientCreateOptions(nil).AsCreateOptions(); !reflect.DeepEqual(got, &metav1.CreateOptions{}) {
+		t.Fatalf("nil create options: %#v", got)
+	}
+	if got := ClientUpdateOptions(nil).AsUpdateOptions(); !reflect.DeepEqual(got, &metav1.UpdateOptions{}) {
+		t.Fatalf("nil update options: %#v", got)
+	}
+	if got := ClientDeleteOptions(nil).AsDeleteOptions(); !reflect.DeepEqual(got, &metav1.DeleteOptions{}) {
+		t.Fatalf("nil delete options: %#v", got)
+	}
+}
diff --git a/pkg/version/version.go b/pkg/version/version.go
index 0a57152591..ec6458d309 100644
--- a/pkg/version/version.go
+++ b/pkg/version/version.go
@@ -15,10 +15,34 @@ limitations under the License.
 */
 
 // Package version provides the version information for cozystack components.
-// Version is set at build time via -ldflags:
 //
-//	go build -ldflags "-X github.com/cozystack/cozystack/pkg/version.Version=v1.0.0"
+// Version resolution order:
+//  1. the COZYSTACK_VERSION environment variable, if set and non-empty;
+//  2. otherwise the value baked in at build time via -ldflags:
+//     go build -ldflags "-X github.com/cozystack/cozystack/pkg/version.Version=v1.0.0"
+//
+// The environment override lets a single image report any release name, so a
+// release-candidate image can be promoted to stable by retagging alone — no
+// rebuild. The deploy-time value is supplied by the installer chart
+// (cozystackOperator.platformVersion) and injected as COZYSTACK_VERSION on the
+// operator Deployment.
 package version
 
-// Version is set at build time via -ldflags.
+import "os"
+
+// Version is set at build time via -ldflags, and may be overridden at runtime
+// by the COZYSTACK_VERSION environment variable (see init and resolve).
 var Version = "dev"
+
+func init() {
+	Version = resolve(Version)
+}
+
+// resolve returns the COZYSTACK_VERSION environment value when set and
+// non-empty, otherwise the baked-in build-time value.
+func resolve(baked string) string {
+	if v := os.Getenv("COZYSTACK_VERSION"); v != "" {
+		return v
+	}
+	return baked
+}
diff --git a/pkg/version/version_test.go b/pkg/version/version_test.go
new file mode 100644
index 0000000000..eab07edf77
--- /dev/null
+++ b/pkg/version/version_test.go
@@ -0,0 +1,69 @@
+/*
+Copyright 2025 The Cozystack Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package version
+
+import (
+	"os"
+	"testing"
+)
+
+// unsetenv clears key for the duration of the test and restores its previous
+// value (or absence) afterwards, so the env-unset case exercises the fallback
+// path even when COZYSTACK_VERSION leaks in from the test runner's environment.
+func unsetenv(t *testing.T, key string) {
+	t.Helper()
+	old, ok := os.LookupEnv(key)
+	if err := os.Unsetenv(key); err != nil {
+		t.Fatal(err)
+	}
+	t.Cleanup(func() {
+		if ok {
+			_ = os.Setenv(key, old)
+		} else {
+			_ = os.Unsetenv(key)
+		}
+	})
+}
+
+func TestResolve(t *testing.T) {
+	const baked = "v1.4.0-rc.2"
+
+	tests := []struct {
+		name string
+		env  string
+		set  bool
+		want string
+	}{
+		{name: "env unset falls back to baked", set: false, want: baked},
+		{name: "empty env falls back to baked", env: "", set: true, want: baked},
+		{name: "env overrides baked", env: "v1.4.0", set: true, want: "v1.4.0"},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if tt.set {
+				t.Setenv("COZYSTACK_VERSION", tt.env)
+			} else {
+				unsetenv(t, "COZYSTACK_VERSION")
+			}
+			if got := resolve(baked); got != tt.want {
+				t.Errorf("resolve(%q) with env set=%v value=%q = %q, want %q",
+					baked, tt.set, tt.env, got, tt.want)
+			}
+		})
+	}
+}
diff --git a/security-insights.yml b/security-insights.yml
new file mode 100644
index 0000000000..1038a3ab23
--- /dev/null
+++ b/security-insights.yml
@@ -0,0 +1,163 @@
+# OpenSSF Security Insights, schema: https://github.com/ossf/security-insights/blob/main/spec/schema.cue
+# Bump header.last-updated with every edit, and header.last-reviewed whenever the
+# facts below are re-checked, including a Security Champion rotation (SECURITY.md).
+header:
+  schema-version: 2.2.0
+  last-updated: '2026-10-11'
+  last-reviewed: '2026-10-11'
+  url: https://raw.githubusercontent.com/cozystack/cozystack/main/security-insights.yml
+
+project:
+  name: Cozystack
+  homepage: https://cozystack.io
+  roadmap: https://github.com/cozystack/cozystack/blob/main/ROADMAP.md
+  # Every person holding admin on this repository; the thelinuxfoundation service account is left out.
+  administrators:
+    - name: Andrei Kvapil
+      social: https://github.com/kvaps
+      affiliation: Ænix
+      primary: true
+    - name: Timofei Larkin
+      social: https://github.com/lllamnyp
+      affiliation: Ænix
+      primary: false
+    - name: Timur Tukaev
+      social: https://github.com/tym83
+      affiliation: Ænix
+      primary: false
+    - name: Aleksei Sviridkin
+      social: https://github.com/lexfrei
+      affiliation: Ænix
+      primary: false
+    - name: Daniil Miasnikov
+      social: https://github.com/myasnikovdaniil
+      affiliation: Ænix
+      primary: false
+    - name: Ivan Okhotnikov
+      social: https://github.com/IvanHunters
+      affiliation: Ænix
+      primary: false
+  repositories:
+    - name: cozystack
+      url: https://github.com/cozystack/cozystack
+      comment: The platform itself, its operator, packages, Talos image, and release automation.
+    - name: website
+      url: https://github.com/cozystack/website
+      comment: Source of the cozystack.io documentation site.
+  vulnerability-reporting:
+    reports-accepted: true
+    bug-bounty-available: false
+    policy: https://github.com/cozystack/cozystack/blob/main/SECURITY.md
+    comment: Report privately through GitHub Private Vulnerability Reporting at https://github.com/cozystack/cozystack/security/advisories/new. SECURITY.md lists the fallback channels, response targets and the 90-day disclosure window.
+  documentation:
+    detailed-guide: https://cozystack.io/docs/
+    quickstart-guide: https://cozystack.io/docs/v1.6/getting-started/
+    code-of-conduct: https://github.com/cozystack/cozystack/blob/main/CODE_OF_CONDUCT.md
+    release-process: https://github.com/cozystack/cozystack/blob/main/docs/release.md
+    support-policy: https://github.com/cozystack/cozystack/blob/main/SECURITY.md#supported-versions
+
+repository:
+  url: https://github.com/cozystack/cozystack
+  status: active
+  accepts-change-request: true
+  accepts-automated-change-request: true
+  core-team:
+    - name: Andrei Kvapil
+      social: https://github.com/kvaps
+      affiliation: Ænix
+      primary: true
+    - name: Kingdon Barrett
+      social: https://github.com/kingdonb
+      affiliation: Urmanac
+      primary: false
+    - name: Timofei Larkin
+      social: https://github.com/lllamnyp
+      affiliation: Ænix
+      primary: false
+    - name: Timur Tukaev
+      social: https://github.com/tym83
+      affiliation: Ænix
+      primary: false
+    - name: Matthieu Robin
+      social: https://github.com/matthieu-robin
+      affiliation: Hidora
+      primary: false
+    - name: Mattia Eleuteri
+      social: https://github.com/mattia-eleuteri
+      affiliation: Hidora
+      primary: false
+    - name: Aleksei Sviridkin
+      social: https://github.com/lexfrei
+      affiliation: Ænix
+      primary: false
+    - name: Daniil Miasnikov
+      social: https://github.com/myasnikovdaniil
+      affiliation: Ænix
+      primary: false
+    - name: Ivan Okhotnikov
+      social: https://github.com/IvanHunters
+      affiliation: Ænix
+      primary: false
+  license:
+    expression: Apache-2.0
+    url: https://github.com/cozystack/cozystack/blob/main/LICENSE
+  documentation:
+    contributing-guide: https://github.com/cozystack/cozystack/blob/main/CONTRIBUTING.md
+    dependency-management-policy: https://github.com/cozystack/cozystack/blob/main/GENERAL_TECHNICAL_REVIEW.md#dependencies
+    governance: https://github.com/cozystack/cozystack/blob/main/GOVERNANCE.md
+    security-policy: https://github.com/cozystack/cozystack/blob/main/SECURITY.md
+  release:
+    automated-pipeline: true
+    distribution-points:
+      - uri: https://github.com/cozystack/cozystack/releases
+        comment: Operator manifests, CRDs, cozypkg binaries and Talos images are attached to each release.
+      - uri: ghcr.io/cozystack/cozystack
+        comment: Container images and the packages OCI artifact.
+    changelog: https://github.com/cozystack/cozystack/blob/main/docs/changelogs/v{version}.md
+  security:
+    assessments:
+      self:
+        name: Cozystack Self-assessment
+        comment: Security self-assessment prepared by the maintainers for the CNCF Incubation application.
+        evidence: https://github.com/cozystack/cozystack/blob/main/docs/security/self-assessment.md
+    champions:
+      - name: Timur Tukaev
+        social: https://github.com/tym83
+        primary: true
+    tools:
+      - name: CodeQL
+        type: SAST
+        rulesets: [default]
+        integration:
+          adhoc: true
+          ci: true
+          release: false
+        results: {}
+        comment: Runs on every pull request to main, on push to main, and weekly.
+      - name: zizmor
+        type: SAST
+        rulesets: [default]
+        integration:
+          adhoc: true
+          ci: true
+          release: false
+        results: {}
+        comment: Audits the GitHub Actions workflows; part of the required pre-commit check, scoped by .github/zizmor.yml.
+      - name: OpenSSF Scorecard
+        type: other
+        rulesets: [default]
+        integration:
+          adhoc: true
+          ci: false
+          release: false
+        results: {}
+        comment: Runs weekly and publishes to https://scorecard.dev/viewer/?uri=github.com/cozystack/cozystack.
+      - name: Trivy
+        type: SCA
+        rulesets: [default]
+        integration:
+          adhoc: true
+          ci: false
+          release: false
+        results: {}
+        comment: Organization-wide scan of Go modules, base images and packaged container images; CRITICAL every 6 hours, the rest weekly. Aggregate reports are published under docs/security/reports/.
diff --git a/test/check-readiness/fakekubectl/kubectl b/test/check-readiness/fakekubectl/kubectl
new file mode 100755
index 0000000000..21faa671e3
--- /dev/null
+++ b/test/check-readiness/fakekubectl/kubectl
@@ -0,0 +1,54 @@
+#!/usr/bin/env bash
+# Mock kubectl for check-readiness tests.
+#
+# Serves canned responses from $FIXTURE_DIR (falling back to $FIXTURE_BASE for
+# api-resources) and logs every invocation to $KUBECTL_LOG so tests can assert
+# argument propagation (-A / -n NS / -l SEL).
+#
+# Fixture files:
+#   api-resources.txt        -> output of `kubectl api-resources --no-headers`
+#   get_<kind>.out           -> rows for `kubectl get <kind> ... -o jsonpath=...`
+#
+# Row files use the literal token <US> as the field separator; the mock rewrites
+# it to a real ASCII Unit Separator (0x1f) byte on output, matching what the
+# script's jsonpath produces. One row per line.
+set -u
+
+# Log the full invocation (args only), one line, before doing anything.
+if [[ -n "${KUBECTL_LOG:-}" ]]; then
+  printf '%s\n' "$*" >>"$KUBECTL_LOG"
+fi
+
+args=("$@")
+# Strip a leading --kubeconfig=... (the script adds it when KUBECONFIG is set).
+if [[ "${args[0]:-}" == --kubeconfig=* ]]; then
+  args=("${args[@]:1}")
+fi
+
+cmd="${args[0]:-}"
+US=$(printf '\x1f')
+
+emit_rows() {
+  # $1 = fixture file. Rewrite <US> tokens to real 0x1f bytes.
+  awk -v us="$US" '{gsub(/<US>/, us); print}' "$1"
+}
+
+case "$cmd" in
+  api-resources)
+    if [[ -f "${FIXTURE_DIR:-}/api-resources.txt" ]]; then
+      cat "${FIXTURE_DIR}/api-resources.txt"
+    elif [[ -f "${FIXTURE_BASE:-}/api-resources.txt" ]]; then
+      cat "${FIXTURE_BASE}/api-resources.txt"
+    fi
+    exit 0
+    ;;
+  get)
+    kind="${args[1]:-}"
+    f="${FIXTURE_DIR:-}/get_${kind}.out"
+    [[ -f "$f" ]] && emit_rows "$f"
+    exit 0
+    ;;
+  *)
+    exit 0
+    ;;
+esac
diff --git a/test/check-readiness/main_test.go b/test/check-readiness/main_test.go
new file mode 100644
index 0000000000..622340c7ff
--- /dev/null
+++ b/test/check-readiness/main_test.go
@@ -0,0 +1,337 @@
+// Package checkreadiness_test is a black-box test suite for the check-readiness
+// command (cmd/check-readiness).
+//
+// By default it builds ./cmd/check-readiness and runs that binary against a mock
+// kubectl that serves canned fixtures, comparing stdout/stderr/exit against
+// golden files. Set SCRIPT_UNDER_TEST to point at any other drop-in executable
+// (e.g. an alternative implementation) to validate it against the same suite.
+//
+// Run:        go test ./test/check-readiness/
+// Regenerate: go test ./test/check-readiness/ -update
+// Other impl: SCRIPT_UNDER_TEST=/path/to/binary go test ./test/check-readiness/
+package checkreadiness_test
+
+import (
+	"bytes"
+	"errors"
+	"flag"
+	"fmt"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"regexp"
+	"runtime"
+	"strings"
+	"testing"
+)
+
+var update = flag.Bool("update", false, "regenerate golden files")
+
+// defaultBinary is the check-readiness binary built once by TestMain; used as
+// the subject under test unless SCRIPT_UNDER_TEST overrides it.
+var defaultBinary string
+
+func TestMain(m *testing.M) {
+	flag.Parse()
+	if os.Getenv("SCRIPT_UNDER_TEST") == "" {
+		root, err := repoRootErr()
+		if err != nil {
+			fmt.Fprintln(os.Stderr, "locate repo root:", err)
+			os.Exit(1)
+		}
+		bin := filepath.Join(os.TempDir(), "check-readiness-test-bin")
+		build := exec.Command("go", "build", "-o", bin, "./cmd/check-readiness")
+		build.Dir = root
+		build.Stderr = os.Stderr
+		if err := build.Run(); err != nil {
+			fmt.Fprintln(os.Stderr, "build check-readiness:", err)
+			os.Exit(1)
+		}
+		defaultBinary = bin
+	}
+	os.Exit(m.Run())
+}
+
+// elapsedRe normalizes timing-dependent phrases ("Ready after 0s.",
+// "Timeout after 1s") so wait-mode goldens are stable.
+var elapsedRe = regexp.MustCompile(`(after )\d+(s)`)
+
+func normalize(s string) string {
+	return elapsedRe.ReplaceAllString(s, "${1}<N>${2}")
+}
+
+// testCase is one black-box invocation.
+type testCase struct {
+	name     string   // subtest name and golden basename
+	args     []string // arguments passed to the script
+	fixture  string   // scenario dir under testdata/fixtures (""=base only)
+	wantExit int      // expected process exit code
+	wantLog  []string // substrings that must appear in the kubectl call log
+	dontLog  []string // substrings that must NOT appear in the kubectl call log
+}
+
+func cases() []testCase {
+	return []testCase{
+		// === Argument parsing ===
+		{name: "help-short", args: []string{"-h"}, wantExit: 0},
+		{name: "help-long", args: []string{"--help"}, wantExit: 0},
+		{name: "unknown-arg", args: []string{"--bogus"}, wantExit: 2},
+		{name: "timeout-missing-value", args: []string{"--timeout"}, wantExit: 2},
+		{name: "timeout-invalid", args: []string{"--timeout", "xyz"}, wantExit: 2},
+		{name: "namespace-missing-value", args: []string{"-n"}, wantExit: 2},
+		{name: "selector-missing-value", args: []string{"-l"}, wantExit: 2},
+		{name: "watch-nonnumeric-interval", args: []string{"-w", "abc"}, wantExit: 2},
+		{
+			// `-w 5` must consume "5" as the interval; --wait then drives a fast
+			// exit. If "5" were not consumed it would be an unknown arg (exit 2).
+			name: "watch-numeric-interval-consumed",
+			args: []string{"-w", "5", "--wait", "--no-color"}, fixture: "_base", wantExit: 0,
+		},
+
+		// === Output behavior ===
+		{name: "all-ready", args: []string{"--no-color"}, fixture: "all-ready", wantExit: 0},
+		{name: "helmrelease-not-ready", args: []string{"--no-color"}, fixture: "helmrelease-not-ready", wantExit: 1},
+		{name: "cluster-scoped-not-ready", args: []string{"--no-color"}, fixture: "node-not-ready", wantExit: 1},
+		{name: "suspended-helmrelease", args: []string{"--no-color"}, fixture: "suspended", wantExit: 0},
+		{name: "suspended-takes-precedence", args: []string{"--no-color"}, fixture: "suspended-notready", wantExit: 0},
+		{name: "pvc-pending", args: []string{"--no-color"}, fixture: "pvc-pending", wantExit: 1},
+		{name: "pvc-bound-filtered", args: []string{"--no-color"}, fixture: "pvc-bound", wantExit: 0},
+		{name: "condition-unknown-status", args: []string{"--no-color"}, fixture: "condition-unknown", wantExit: 1},
+		{name: "condition-missing", args: []string{"--no-color"}, fixture: "condition-missing", wantExit: 1},
+		{name: "verbose-reason-message", args: []string{"-v", "--no-color"}, fixture: "verbose", wantExit: 1},
+		{name: "verbose-long-message-truncated", args: []string{"-v", "--no-color"}, fixture: "verbose-long", wantExit: 1},
+		{name: "crd-not-installed-skipped", args: []string{"--core", "--no-color"}, fixture: "crd-missing", wantExit: 0},
+		{name: "mixed-multiple-kinds", args: []string{"--no-color"}, fixture: "mixed", wantExit: 1},
+
+		// === kubectl argument propagation (asserted via call log) ===
+		{
+			name: "core-skips-extras", args: []string{"--core", "--no-color"}, fixture: "_base", wantExit: 0,
+			wantLog: []string{"get packages.cozystack.io", "get kustomizations.kustomize.toolkit.fluxcd.io"},
+			dontLog: []string{"get gitrepositories", "get persistentvolumeclaims", "get nodes", "get apiservices"},
+		},
+		{
+			name: "default-uses-all-namespaces", args: []string{"--no-color"}, fixture: "_base", wantExit: 0,
+			wantLog: []string{"get helmreleases.helm.toolkit.fluxcd.io -A"},
+			dontLog: []string{"get nodes -A"},
+		},
+		{
+			name: "namespace-flag-propagated", args: []string{"-n", "myns", "--no-color"}, fixture: "_base", wantExit: 0,
+			wantLog: []string{"get helmreleases.helm.toolkit.fluxcd.io -n myns"},
+			dontLog: []string{"get nodes -n myns", "get helmreleases.helm.toolkit.fluxcd.io -A"},
+		},
+		{
+			name: "selector-flag-propagated", args: []string{"-l", "app=demo", "--no-color"}, fixture: "_base", wantExit: 0,
+			wantLog: []string{"get helmreleases.helm.toolkit.fluxcd.io -A -l app=demo", "get nodes -l app=demo"},
+		},
+
+		// === Wait / timeout ===
+		{name: "wait-success", args: []string{"--wait", "--no-color"}, fixture: "_base", wantExit: 0},
+		{
+			name: "wait-timeout", args: []string{"-w", "1", "--wait", "--timeout", "1s", "--no-color"},
+			fixture: "helmrelease-not-ready", wantExit: 1,
+		},
+
+		// === Edge cases ===
+		{name: "empty-cluster", args: []string{"--no-color"}, fixture: "_base", wantExit: 0},
+		{
+			name: "api-resources-unavailable", args: []string{"--no-color"}, fixture: "api-resources-empty", wantExit: 0,
+			wantLog: []string{"api-resources", "get packages.cozystack.io"},
+		},
+	}
+}
+
+func TestCheckReadiness(t *testing.T) {
+	repoRoot := repoRoot(t)
+	fakeBin := filepath.Join(repoRoot, "test", "check-readiness", "fakekubectl")
+	fixturesRoot := filepath.Join(repoRoot, "test", "check-readiness", "testdata", "fixtures")
+	goldenRoot := filepath.Join(repoRoot, "test", "check-readiness", "testdata", "golden")
+
+	// Ensure the mock is executable (git preserves the bit, but be defensive).
+	if err := os.Chmod(filepath.Join(fakeBin, "kubectl"), 0o755); err != nil {
+		t.Fatalf("chmod mock kubectl: %v", err)
+	}
+
+	for _, tc := range cases() {
+		t.Run(tc.name, func(t *testing.T) {
+			logFile := filepath.Join(t.TempDir(), "kubectl.log")
+
+			fixtureDir := fixturesRoot
+			if tc.fixture != "" {
+				fixtureDir = filepath.Join(fixturesRoot, tc.fixture)
+			}
+
+			cmd := scriptCommand(tc.args)
+			cmd.Env = testEnv(fakeBin, fixtureDir, filepath.Join(fixturesRoot, "_base"), logFile)
+
+			var stdout, stderr bytes.Buffer
+			cmd.Stdout = &stdout
+			cmd.Stderr = &stderr
+			runErr := cmd.Run()
+
+			gotExit := exitCode(t, runErr)
+			if gotExit != tc.wantExit {
+				t.Errorf("exit code = %d, want %d\nstderr:\n%s", gotExit, tc.wantExit, stderr.String())
+			}
+
+			checkGolden(t, goldenRoot, tc.name+".stdout", normalize(stdout.String()))
+			checkGolden(t, goldenRoot, tc.name+".stderr", normalize(stderr.String()))
+
+			assertLog(t, logFile, tc.wantLog, tc.dontLog)
+		})
+	}
+}
+
+// subjectArgv is the full argv to invoke the subject under test: the
+// SCRIPT_UNDER_TEST override if set, otherwise the binary built by TestMain.
+func subjectArgv(args []string) []string {
+	subject := defaultBinary
+	if sut := os.Getenv("SCRIPT_UNDER_TEST"); sut != "" {
+		subject = sut
+	}
+	return append([]string{subject}, args...)
+}
+
+// scriptCommand builds the command to run the subject under test.
+func scriptCommand(args []string) *exec.Cmd {
+	argv := subjectArgv(args)
+	return exec.Command(argv[0], argv[1:]...)
+}
+
+// testEnv returns a clean environment: fake kubectl first on PATH, fixture
+// pointers set, KUBECONFIG stripped so the script uses a bare `kubectl`.
+func testEnv(fakeBin, fixtureDir, fixtureBase, logFile string) []string {
+	var env []string
+	for _, kv := range os.Environ() {
+		switch {
+		case strings.HasPrefix(kv, "PATH="):
+			env = append(env, "PATH="+fakeBin+string(os.PathListSeparator)+kv[len("PATH="):])
+		case strings.HasPrefix(kv, "KUBECONFIG="),
+			strings.HasPrefix(kv, "FIXTURE_DIR="),
+			strings.HasPrefix(kv, "FIXTURE_BASE="),
+			strings.HasPrefix(kv, "KUBECTL_LOG="):
+			// drop — we set these ourselves
+		default:
+			env = append(env, kv)
+		}
+	}
+	return append(env,
+		"FIXTURE_DIR="+fixtureDir,
+		"FIXTURE_BASE="+fixtureBase,
+		"KUBECTL_LOG="+logFile,
+	)
+}
+
+func exitCode(t *testing.T, err error) int {
+	if err == nil {
+		return 0
+	}
+	if ee, ok := errors.AsType[*exec.ExitError](err); ok {
+		return ee.ExitCode()
+	}
+	t.Fatalf("running script: %v", err)
+	return -1
+}
+
+func checkGolden(t *testing.T, dir, name, got string) {
+	t.Helper()
+	path := filepath.Join(dir, name)
+	if *update {
+		if got == "" {
+			// Don't litter the tree with empty goldens; remove any stale one.
+			_ = os.Remove(path)
+			return
+		}
+		if err := os.MkdirAll(dir, 0o755); err != nil {
+			t.Fatalf("mkdir golden dir: %v", err)
+		}
+		if err := os.WriteFile(path, []byte(got), 0o644); err != nil {
+			t.Fatalf("write golden %s: %v", name, err)
+		}
+		return
+	}
+
+	want := ""
+	if b, err := os.ReadFile(path); err == nil {
+		want = string(b)
+	} else if !errors.Is(err, os.ErrNotExist) {
+		t.Fatalf("read golden %s: %v", name, err)
+	}
+	if got != want {
+		t.Errorf("%s mismatch:\n--- want ---\n%s\n--- got ---\n%s", name, want, got)
+	}
+}
+
+func assertLog(t *testing.T, logFile string, want, dont []string) {
+	t.Helper()
+	if len(want) == 0 && len(dont) == 0 {
+		return
+	}
+	b, err := os.ReadFile(logFile)
+	if err != nil && !errors.Is(err, os.ErrNotExist) {
+		t.Fatalf("read kubectl log: %v", err)
+	}
+	log := string(b)
+	for _, sub := range want {
+		if !strings.Contains(log, sub) {
+			t.Errorf("kubectl log missing %q\nlog:\n%s", sub, log)
+		}
+	}
+	for _, sub := range dont {
+		if strings.Contains(log, sub) {
+			t.Errorf("kubectl log unexpectedly contains %q\nlog:\n%s", sub, log)
+		}
+	}
+}
+
+// TestColorTTY verifies the script emits ANSI color when stdout is a real TTY
+// and suppresses it under --no-color. The byte-level golden cases above all run
+// through a pipe (non-TTY), where color auto-disables, so this is the only place
+// the color path is exercised. Linux-only; requires util-linux `script`.
+func TestColorTTY(t *testing.T) {
+	if runtime.GOOS != "linux" {
+		t.Skip("PTY color check is Linux-only")
+	}
+	if _, err := exec.LookPath("script"); err != nil {
+		t.Skip("`script` not available; skipping PTY color check")
+	}
+
+	root := repoRoot(t)
+	fakeBin := filepath.Join(root, "test", "check-readiness", "fakekubectl")
+	fixturesRoot := filepath.Join(root, "test", "check-readiness", "testdata", "fixtures")
+	fixtureDir := filepath.Join(fixturesRoot, "helmrelease-not-ready")
+	base := filepath.Join(fixturesRoot, "_base")
+
+	runUnderPTY := func(args []string) string {
+		cmdline := strings.Join(subjectArgv(args), " ")
+		// script -q (quiet) -e (return child's exit) -c CMD <typescript-file>
+		cmd := exec.Command("script", "-qec", cmdline, "/dev/null")
+		cmd.Env = testEnv(fakeBin, fixtureDir, base, filepath.Join(t.TempDir(), "kubectl.log"))
+		out, _ := cmd.CombinedOutput() // non-zero exit expected (not-ready -> 1)
+		return string(out)
+	}
+
+	const esc = "\x1b["
+	if got := runUnderPTY(nil); !strings.Contains(got, esc) {
+		t.Errorf("expected ANSI escapes on a TTY, got none:\n%q", got)
+	}
+	if got := runUnderPTY([]string{"--no-color"}); strings.Contains(got, esc) {
+		t.Errorf("expected no ANSI escapes with --no-color, found some:\n%q", got)
+	}
+}
+
+func repoRootErr() (string, error) {
+	out, err := exec.Command("git", "rev-parse", "--show-toplevel").Output()
+	if err != nil {
+		return "", err
+	}
+	return strings.TrimSpace(string(out)), nil
+}
+
+func repoRoot(t *testing.T) string {
+	t.Helper()
+	root, err := repoRootErr()
+	if err != nil {
+		t.Fatalf("locate repo root: %v", err)
+	}
+	return root
+}
diff --git a/test/check-readiness/testdata/fixtures/_base/api-resources.txt b/test/check-readiness/testdata/fixtures/_base/api-resources.txt
new file mode 100644
index 0000000000..ae5c125d06
--- /dev/null
+++ b/test/check-readiness/testdata/fixtures/_base/api-resources.txt
@@ -0,0 +1,14 @@
+packages                       cozystack.io/v1alpha1                false   Package
+artifactgenerators             source.extensions.fluxcd.io/v1alpha1 true    ArtifactGenerator
+externalartifacts              source.toolkit.fluxcd.io/v1          true    ExternalArtifact
+helmreleases          hr       helm.toolkit.fluxcd.io/v2            true    HelmRelease
+kustomizations        ks       kustomize.toolkit.fluxcd.io/v1       true    Kustomization
+gitrepositories       gitrepo  source.toolkit.fluxcd.io/v1          true    GitRepository
+ocirepositories       ocirepo  source.toolkit.fluxcd.io/v1beta2     true    OCIRepository
+helmrepositories      helmrepo source.toolkit.fluxcd.io/v1          true    HelmRepository
+helmcharts            hc       source.toolkit.fluxcd.io/v1          true    HelmChart
+buckets                        source.toolkit.fluxcd.io/v1          true    Bucket
+nodes                 no       v1                                   false   Node
+apiservices                    apiregistration.k8s.io/v1            false   APIService
+customresourcedefinitions crd,crds apiextensions.k8s.io/v1          false   CustomResourceDefinition
+persistentvolumeclaims pvc      v1                                   true    PersistentVolumeClaim
diff --git a/test/check-readiness/testdata/fixtures/all-ready/get_helmreleases.helm.toolkit.fluxcd.io.out b/test/check-readiness/testdata/fixtures/all-ready/get_helmreleases.helm.toolkit.fluxcd.io.out
new file mode 100644
index 0000000000..d2d8b93570
--- /dev/null
+++ b/test/check-readiness/testdata/fixtures/all-ready/get_helmreleases.helm.toolkit.fluxcd.io.out
@@ -0,0 +1,2 @@
+tenant-test<US>myapp<US>True<US>ReconciliationSucceeded<US>Release reconciliation succeeded<US>false
+tenant-test<US>another<US>True<US>ReconciliationSucceeded<US>Release reconciliation succeeded<US>false
diff --git a/test/check-readiness/testdata/fixtures/all-ready/get_packages.cozystack.io.out b/test/check-readiness/testdata/fixtures/all-ready/get_packages.cozystack.io.out
new file mode 100644
index 0000000000..fc55f21510
--- /dev/null
+++ b/test/check-readiness/testdata/fixtures/all-ready/get_packages.cozystack.io.out
@@ -0,0 +1 @@
+<US>tenant-root<US>True<US>HelmSuccess<US>Successfully installed<US>false
diff --git a/test/check-readiness/testdata/fixtures/api-resources-empty/api-resources.txt b/test/check-readiness/testdata/fixtures/api-resources-empty/api-resources.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/test/check-readiness/testdata/fixtures/condition-missing/get_helmreleases.helm.toolkit.fluxcd.io.out b/test/check-readiness/testdata/fixtures/condition-missing/get_helmreleases.helm.toolkit.fluxcd.io.out
new file mode 100644
index 0000000000..36c27c9709
--- /dev/null
+++ b/test/check-readiness/testdata/fixtures/condition-missing/get_helmreleases.helm.toolkit.fluxcd.io.out
@@ -0,0 +1 @@
+tenant-test<US>no-condition-yet<US><US><US><US>false
diff --git a/test/check-readiness/testdata/fixtures/condition-unknown/get_helmreleases.helm.toolkit.fluxcd.io.out b/test/check-readiness/testdata/fixtures/condition-unknown/get_helmreleases.helm.toolkit.fluxcd.io.out
new file mode 100644
index 0000000000..df6b90d2eb
--- /dev/null
+++ b/test/check-readiness/testdata/fixtures/condition-unknown/get_helmreleases.helm.toolkit.fluxcd.io.out
@@ -0,0 +1 @@
+tenant-test<US>reconciling-app<US>Unknown<US>Progressing<US>reconciliation in progress<US>false
diff --git a/test/check-readiness/testdata/fixtures/crd-missing/api-resources.txt b/test/check-readiness/testdata/fixtures/crd-missing/api-resources.txt
new file mode 100644
index 0000000000..fd0c0c2a3f
--- /dev/null
+++ b/test/check-readiness/testdata/fixtures/crd-missing/api-resources.txt
@@ -0,0 +1,4 @@
+packages                       cozystack.io/v1alpha1                false   Package
+artifactgenerators             source.extensions.fluxcd.io/v1alpha1 true    ArtifactGenerator
+externalartifacts              source.toolkit.fluxcd.io/v1          true    ExternalArtifact
+helmreleases          hr       helm.toolkit.fluxcd.io/v2            true    HelmRelease
diff --git a/test/check-readiness/testdata/fixtures/helmrelease-not-ready/get_helmreleases.helm.toolkit.fluxcd.io.out b/test/check-readiness/testdata/fixtures/helmrelease-not-ready/get_helmreleases.helm.toolkit.fluxcd.io.out
new file mode 100644
index 0000000000..18867b165d
--- /dev/null
+++ b/test/check-readiness/testdata/fixtures/helmrelease-not-ready/get_helmreleases.helm.toolkit.fluxcd.io.out
@@ -0,0 +1,2 @@
+tenant-test<US>healthy-app<US>True<US>ReconciliationSucceeded<US>Release reconciliation succeeded<US>false
+tenant-prod<US>broken-app<US>False<US>InstallFailed<US>Helm install failed: context deadline exceeded<US>false
diff --git a/test/check-readiness/testdata/fixtures/mixed/get_nodes.out b/test/check-readiness/testdata/fixtures/mixed/get_nodes.out
new file mode 100644
index 0000000000..73b24becf4
--- /dev/null
+++ b/test/check-readiness/testdata/fixtures/mixed/get_nodes.out
@@ -0,0 +1 @@
+<US>worker-3<US>False<US>KubeletNotReady<US>node is draining<US>false
diff --git a/test/check-readiness/testdata/fixtures/mixed/get_packages.cozystack.io.out b/test/check-readiness/testdata/fixtures/mixed/get_packages.cozystack.io.out
new file mode 100644
index 0000000000..6d1d3d7a41
--- /dev/null
+++ b/test/check-readiness/testdata/fixtures/mixed/get_packages.cozystack.io.out
@@ -0,0 +1 @@
+<US>tenant-root<US>False<US>HelmReleaseNotReady<US>waiting for HelmRelease to become ready<US>false
diff --git a/test/check-readiness/testdata/fixtures/mixed/get_persistentvolumeclaims.out b/test/check-readiness/testdata/fixtures/mixed/get_persistentvolumeclaims.out
new file mode 100644
index 0000000000..5bc2837c93
--- /dev/null
+++ b/test/check-readiness/testdata/fixtures/mixed/get_persistentvolumeclaims.out
@@ -0,0 +1 @@
+storage<US>archive-pvc<US>Pending<US><US><US>false
diff --git a/test/check-readiness/testdata/fixtures/node-not-ready/get_nodes.out b/test/check-readiness/testdata/fixtures/node-not-ready/get_nodes.out
new file mode 100644
index 0000000000..c7209295f6
--- /dev/null
+++ b/test/check-readiness/testdata/fixtures/node-not-ready/get_nodes.out
@@ -0,0 +1,2 @@
+<US>worker-1<US>True<US>KubeletReady<US>kubelet is posting ready status<US>false
+<US>worker-2<US>False<US>KubeletNotReady<US>container runtime is down<US>false
diff --git a/test/check-readiness/testdata/fixtures/pvc-bound/get_persistentvolumeclaims.out b/test/check-readiness/testdata/fixtures/pvc-bound/get_persistentvolumeclaims.out
new file mode 100644
index 0000000000..c3c81fac67
--- /dev/null
+++ b/test/check-readiness/testdata/fixtures/pvc-bound/get_persistentvolumeclaims.out
@@ -0,0 +1 @@
+storage<US>data-pvc<US>Bound<US><US><US>false
diff --git a/test/check-readiness/testdata/fixtures/pvc-pending/get_persistentvolumeclaims.out b/test/check-readiness/testdata/fixtures/pvc-pending/get_persistentvolumeclaims.out
new file mode 100644
index 0000000000..a34c8338cb
--- /dev/null
+++ b/test/check-readiness/testdata/fixtures/pvc-pending/get_persistentvolumeclaims.out
@@ -0,0 +1,2 @@
+storage<US>data-pvc<US>Bound<US><US><US>false
+storage<US>stuck-pvc<US>Pending<US><US><US>false
diff --git a/test/check-readiness/testdata/fixtures/suspended-notready/get_helmreleases.helm.toolkit.fluxcd.io.out b/test/check-readiness/testdata/fixtures/suspended-notready/get_helmreleases.helm.toolkit.fluxcd.io.out
new file mode 100644
index 0000000000..56f0f9da4d
--- /dev/null
+++ b/test/check-readiness/testdata/fixtures/suspended-notready/get_helmreleases.helm.toolkit.fluxcd.io.out
@@ -0,0 +1 @@
+tenant-test<US>paused-broken<US>False<US>InstallFailed<US>install failed but release is suspended<US>true
diff --git a/test/check-readiness/testdata/fixtures/suspended/get_helmreleases.helm.toolkit.fluxcd.io.out b/test/check-readiness/testdata/fixtures/suspended/get_helmreleases.helm.toolkit.fluxcd.io.out
new file mode 100644
index 0000000000..7d86487dc9
--- /dev/null
+++ b/test/check-readiness/testdata/fixtures/suspended/get_helmreleases.helm.toolkit.fluxcd.io.out
@@ -0,0 +1 @@
+tenant-test<US>paused-app<US>True<US>ReconciliationSucceeded<US>Release reconciliation succeeded<US>true
diff --git a/test/check-readiness/testdata/fixtures/verbose-long/get_helmreleases.helm.toolkit.fluxcd.io.out b/test/check-readiness/testdata/fixtures/verbose-long/get_helmreleases.helm.toolkit.fluxcd.io.out
new file mode 100644
index 0000000000..274f0c28bb
--- /dev/null
+++ b/test/check-readiness/testdata/fixtures/verbose-long/get_helmreleases.helm.toolkit.fluxcd.io.out
@@ -0,0 +1 @@
+tenant-prod<US>chatty-app<US>False<US>UpgradeFailed<US>Helm upgrade failed because the apiserver rejected the manifest with a very long validation error that keeps going and going well past the readable limit<US>false
diff --git a/test/check-readiness/testdata/fixtures/verbose/get_helmreleases.helm.toolkit.fluxcd.io.out b/test/check-readiness/testdata/fixtures/verbose/get_helmreleases.helm.toolkit.fluxcd.io.out
new file mode 100644
index 0000000000..d12bef09d1
--- /dev/null
+++ b/test/check-readiness/testdata/fixtures/verbose/get_helmreleases.helm.toolkit.fluxcd.io.out
@@ -0,0 +1,2 @@
+tenant-test<US>healthy-app<US>True<US>ReconciliationSucceeded<US>Release reconciliation succeeded<US>false
+tenant-prod<US>broken-app<US>False<US>UpgradeFailed<US>Helm upgrade failed: timed out waiting for the condition<US>false
diff --git a/test/check-readiness/testdata/golden/all-ready.stdout b/test/check-readiness/testdata/golden/all-ready.stdout
new file mode 100644
index 0000000000..9303db821e
--- /dev/null
+++ b/test/check-readiness/testdata/golden/all-ready.stdout
@@ -0,0 +1 @@
+All resources are ready.
diff --git a/test/check-readiness/testdata/golden/api-resources-unavailable.stdout b/test/check-readiness/testdata/golden/api-resources-unavailable.stdout
new file mode 100644
index 0000000000..9303db821e
--- /dev/null
+++ b/test/check-readiness/testdata/golden/api-resources-unavailable.stdout
@@ -0,0 +1 @@
+All resources are ready.
diff --git a/test/check-readiness/testdata/golden/cluster-scoped-not-ready.stdout b/test/check-readiness/testdata/golden/cluster-scoped-not-ready.stdout
new file mode 100644
index 0000000000..c7dba3e4a2
--- /dev/null
+++ b/test/check-readiness/testdata/golden/cluster-scoped-not-ready.stdout
@@ -0,0 +1,2 @@
+=== nodes (not ready) ===
+worker-2                                           False
diff --git a/test/check-readiness/testdata/golden/condition-missing.stdout b/test/check-readiness/testdata/golden/condition-missing.stdout
new file mode 100644
index 0000000000..34720ba1eb
--- /dev/null
+++ b/test/check-readiness/testdata/golden/condition-missing.stdout
@@ -0,0 +1,2 @@
+=== helmreleases.helm.toolkit.fluxcd.io (not ready) ===
+tenant-test                    no-condition-yet                                   Unknown
diff --git a/test/check-readiness/testdata/golden/condition-unknown-status.stdout b/test/check-readiness/testdata/golden/condition-unknown-status.stdout
new file mode 100644
index 0000000000..1445e467b8
--- /dev/null
+++ b/test/check-readiness/testdata/golden/condition-unknown-status.stdout
@@ -0,0 +1,2 @@
+=== helmreleases.helm.toolkit.fluxcd.io (not ready) ===
+tenant-test                    reconciling-app                                    Unknown
diff --git a/test/check-readiness/testdata/golden/core-skips-extras.stdout b/test/check-readiness/testdata/golden/core-skips-extras.stdout
new file mode 100644
index 0000000000..9303db821e
--- /dev/null
+++ b/test/check-readiness/testdata/golden/core-skips-extras.stdout
@@ -0,0 +1 @@
+All resources are ready.
diff --git a/test/check-readiness/testdata/golden/crd-not-installed-skipped.stdout b/test/check-readiness/testdata/golden/crd-not-installed-skipped.stdout
new file mode 100644
index 0000000000..c7b08f41b0
--- /dev/null
+++ b/test/check-readiness/testdata/golden/crd-not-installed-skipped.stdout
@@ -0,0 +1,2 @@
+--- kustomizations.kustomize.toolkit.fluxcd.io: CRD not installed, skipping
+All resources are ready.
diff --git a/test/check-readiness/testdata/golden/default-uses-all-namespaces.stdout b/test/check-readiness/testdata/golden/default-uses-all-namespaces.stdout
new file mode 100644
index 0000000000..9303db821e
--- /dev/null
+++ b/test/check-readiness/testdata/golden/default-uses-all-namespaces.stdout
@@ -0,0 +1 @@
+All resources are ready.
diff --git a/test/check-readiness/testdata/golden/empty-cluster.stdout b/test/check-readiness/testdata/golden/empty-cluster.stdout
new file mode 100644
index 0000000000..9303db821e
--- /dev/null
+++ b/test/check-readiness/testdata/golden/empty-cluster.stdout
@@ -0,0 +1 @@
+All resources are ready.
diff --git a/test/check-readiness/testdata/golden/helmrelease-not-ready.stdout b/test/check-readiness/testdata/golden/helmrelease-not-ready.stdout
new file mode 100644
index 0000000000..6244687527
--- /dev/null
+++ b/test/check-readiness/testdata/golden/helmrelease-not-ready.stdout
@@ -0,0 +1,2 @@
+=== helmreleases.helm.toolkit.fluxcd.io (not ready) ===
+tenant-prod                    broken-app                                         False
diff --git a/test/check-readiness/testdata/golden/help-long.stdout b/test/check-readiness/testdata/golden/help-long.stdout
new file mode 100644
index 0000000000..f1f289e083
--- /dev/null
+++ b/test/check-readiness/testdata/golden/help-long.stdout
@@ -0,0 +1,23 @@
+Check readiness of cozystack / Flux / Kubernetes resources.
+Shows only non-ready resources, parsed from status conditions (not column heuristics).
+
+Fetches sequentially by default — intended to run during cozystack upgrades where
+the apiserver is already under heavy reconciler load, so we avoid bursts of N
+concurrent LIST requests. Use --parallel for one-shot interactive runs against a
+healthy cluster (3-4x faster wall-clock).
+
+Usage:
+  check-readiness [OPTIONS]
+
+Options:
+  -w, --watch [INTERVAL]    Watch mode; refresh every INTERVAL seconds (default: 10)
+      --wait                Block until everything is ready (exit 0) or timeout (exit 1)
+      --timeout DURATION    Timeout for --wait, e.g. 30m, 1h, 600s (default: 30m)
+      --parallel            Fire all fetches concurrently (faster, more apiserver load)
+      --core                Check only essential cozystack/Flux kinds (5 instead of 14)
+  -v, --verbose             Show condition reason/message for not-ready rows
+  -n, --namespace NS        Scope to a single namespace (cluster-scoped kinds ignore this)
+  -l, --selector SELECTOR   kubectl label selector to apply to every query
+      --no-color            Disable color output (auto-disabled on non-TTY)
+  -h, --help                Show this help
+
diff --git a/test/check-readiness/testdata/golden/help-short.stdout b/test/check-readiness/testdata/golden/help-short.stdout
new file mode 100644
index 0000000000..f1f289e083
--- /dev/null
+++ b/test/check-readiness/testdata/golden/help-short.stdout
@@ -0,0 +1,23 @@
+Check readiness of cozystack / Flux / Kubernetes resources.
+Shows only non-ready resources, parsed from status conditions (not column heuristics).
+
+Fetches sequentially by default — intended to run during cozystack upgrades where
+the apiserver is already under heavy reconciler load, so we avoid bursts of N
+concurrent LIST requests. Use --parallel for one-shot interactive runs against a
+healthy cluster (3-4x faster wall-clock).
+
+Usage:
+  check-readiness [OPTIONS]
+
+Options:
+  -w, --watch [INTERVAL]    Watch mode; refresh every INTERVAL seconds (default: 10)
+      --wait                Block until everything is ready (exit 0) or timeout (exit 1)
+      --timeout DURATION    Timeout for --wait, e.g. 30m, 1h, 600s (default: 30m)
+      --parallel            Fire all fetches concurrently (faster, more apiserver load)
+      --core                Check only essential cozystack/Flux kinds (5 instead of 14)
+  -v, --verbose             Show condition reason/message for not-ready rows
+  -n, --namespace NS        Scope to a single namespace (cluster-scoped kinds ignore this)
+  -l, --selector SELECTOR   kubectl label selector to apply to every query
+      --no-color            Disable color output (auto-disabled on non-TTY)
+  -h, --help                Show this help
+
diff --git a/test/check-readiness/testdata/golden/mixed-multiple-kinds.stdout b/test/check-readiness/testdata/golden/mixed-multiple-kinds.stdout
new file mode 100644
index 0000000000..629867bd62
--- /dev/null
+++ b/test/check-readiness/testdata/golden/mixed-multiple-kinds.stdout
@@ -0,0 +1,6 @@
+=== packages.cozystack.io (not ready) ===
+tenant-root                                        False
+=== nodes (not ready) ===
+worker-3                                           False
+=== persistentvolumeclaims (not ready) ===
+storage                        archive-pvc                                        Pending
diff --git a/test/check-readiness/testdata/golden/namespace-flag-propagated.stdout b/test/check-readiness/testdata/golden/namespace-flag-propagated.stdout
new file mode 100644
index 0000000000..9303db821e
--- /dev/null
+++ b/test/check-readiness/testdata/golden/namespace-flag-propagated.stdout
@@ -0,0 +1 @@
+All resources are ready.
diff --git a/test/check-readiness/testdata/golden/namespace-missing-value.stderr b/test/check-readiness/testdata/golden/namespace-missing-value.stderr
new file mode 100644
index 0000000000..05a56c93a1
--- /dev/null
+++ b/test/check-readiness/testdata/golden/namespace-missing-value.stderr
@@ -0,0 +1 @@
+--namespace requires a value
diff --git a/test/check-readiness/testdata/golden/pvc-bound-filtered.stdout b/test/check-readiness/testdata/golden/pvc-bound-filtered.stdout
new file mode 100644
index 0000000000..9303db821e
--- /dev/null
+++ b/test/check-readiness/testdata/golden/pvc-bound-filtered.stdout
@@ -0,0 +1 @@
+All resources are ready.
diff --git a/test/check-readiness/testdata/golden/pvc-pending.stdout b/test/check-readiness/testdata/golden/pvc-pending.stdout
new file mode 100644
index 0000000000..fe20b4aaa9
--- /dev/null
+++ b/test/check-readiness/testdata/golden/pvc-pending.stdout
@@ -0,0 +1,2 @@
+=== persistentvolumeclaims (not ready) ===
+storage                        stuck-pvc                                          Pending
diff --git a/test/check-readiness/testdata/golden/selector-flag-propagated.stdout b/test/check-readiness/testdata/golden/selector-flag-propagated.stdout
new file mode 100644
index 0000000000..9303db821e
--- /dev/null
+++ b/test/check-readiness/testdata/golden/selector-flag-propagated.stdout
@@ -0,0 +1 @@
+All resources are ready.
diff --git a/test/check-readiness/testdata/golden/selector-missing-value.stderr b/test/check-readiness/testdata/golden/selector-missing-value.stderr
new file mode 100644
index 0000000000..12765578f3
--- /dev/null
+++ b/test/check-readiness/testdata/golden/selector-missing-value.stderr
@@ -0,0 +1 @@
+--selector requires a value
diff --git a/test/check-readiness/testdata/golden/suspended-helmrelease.stdout b/test/check-readiness/testdata/golden/suspended-helmrelease.stdout
new file mode 100644
index 0000000000..68e3b84619
--- /dev/null
+++ b/test/check-readiness/testdata/golden/suspended-helmrelease.stdout
@@ -0,0 +1,3 @@
+=== helmreleases.helm.toolkit.fluxcd.io (not ready) ===
+tenant-test                    paused-app                                         SUSPENDED
+All resources are ready.
diff --git a/test/check-readiness/testdata/golden/suspended-takes-precedence.stdout b/test/check-readiness/testdata/golden/suspended-takes-precedence.stdout
new file mode 100644
index 0000000000..9479202e89
--- /dev/null
+++ b/test/check-readiness/testdata/golden/suspended-takes-precedence.stdout
@@ -0,0 +1,3 @@
+=== helmreleases.helm.toolkit.fluxcd.io (not ready) ===
+tenant-test                    paused-broken                                      SUSPENDED
+All resources are ready.
diff --git a/test/check-readiness/testdata/golden/timeout-invalid.stderr b/test/check-readiness/testdata/golden/timeout-invalid.stderr
new file mode 100644
index 0000000000..4f2bb061dc
--- /dev/null
+++ b/test/check-readiness/testdata/golden/timeout-invalid.stderr
@@ -0,0 +1 @@
+Invalid --timeout value: xyz (expected e.g. 30m, 1h, 600s)
diff --git a/test/check-readiness/testdata/golden/timeout-missing-value.stderr b/test/check-readiness/testdata/golden/timeout-missing-value.stderr
new file mode 100644
index 0000000000..94aa378d0a
--- /dev/null
+++ b/test/check-readiness/testdata/golden/timeout-missing-value.stderr
@@ -0,0 +1 @@
+--timeout requires a value
diff --git a/test/check-readiness/testdata/golden/unknown-arg.stderr b/test/check-readiness/testdata/golden/unknown-arg.stderr
new file mode 100644
index 0000000000..d6ec7c0db1
--- /dev/null
+++ b/test/check-readiness/testdata/golden/unknown-arg.stderr
@@ -0,0 +1,24 @@
+Unknown argument: --bogus
+Check readiness of cozystack / Flux / Kubernetes resources.
+Shows only non-ready resources, parsed from status conditions (not column heuristics).
+
+Fetches sequentially by default — intended to run during cozystack upgrades where
+the apiserver is already under heavy reconciler load, so we avoid bursts of N
+concurrent LIST requests. Use --parallel for one-shot interactive runs against a
+healthy cluster (3-4x faster wall-clock).
+
+Usage:
+  check-readiness [OPTIONS]
+
+Options:
+  -w, --watch [INTERVAL]    Watch mode; refresh every INTERVAL seconds (default: 10)
+      --wait                Block until everything is ready (exit 0) or timeout (exit 1)
+      --timeout DURATION    Timeout for --wait, e.g. 30m, 1h, 600s (default: 30m)
+      --parallel            Fire all fetches concurrently (faster, more apiserver load)
+      --core                Check only essential cozystack/Flux kinds (5 instead of 14)
+  -v, --verbose             Show condition reason/message for not-ready rows
+  -n, --namespace NS        Scope to a single namespace (cluster-scoped kinds ignore this)
+  -l, --selector SELECTOR   kubectl label selector to apply to every query
+      --no-color            Disable color output (auto-disabled on non-TTY)
+  -h, --help                Show this help
+
diff --git a/test/check-readiness/testdata/golden/verbose-long-message-truncated.stdout b/test/check-readiness/testdata/golden/verbose-long-message-truncated.stdout
new file mode 100644
index 0000000000..89be88486c
--- /dev/null
+++ b/test/check-readiness/testdata/golden/verbose-long-message-truncated.stdout
@@ -0,0 +1,4 @@
+=== helmreleases.helm.toolkit.fluxcd.io (not ready) ===
+tenant-prod                    chatty-app                                         False
+  UpgradeFailed: Helm upgrade failed because the apiserver rejected the manifest with a very long validation error that keeps going and g
+  -> 1/1 not ready
diff --git a/test/check-readiness/testdata/golden/verbose-reason-message.stdout b/test/check-readiness/testdata/golden/verbose-reason-message.stdout
new file mode 100644
index 0000000000..a57585f903
--- /dev/null
+++ b/test/check-readiness/testdata/golden/verbose-reason-message.stdout
@@ -0,0 +1,4 @@
+=== helmreleases.helm.toolkit.fluxcd.io (not ready) ===
+tenant-prod                    broken-app                                         False
+  UpgradeFailed: Helm upgrade failed: timed out waiting for the condition
+  -> 1/2 not ready
diff --git a/test/check-readiness/testdata/golden/wait-success.stdout b/test/check-readiness/testdata/golden/wait-success.stdout
new file mode 100644
index 0000000000..765f62b95a
--- /dev/null
+++ b/test/check-readiness/testdata/golden/wait-success.stdout
@@ -0,0 +1,2 @@
+All resources are ready.
+Ready after <N>s.
diff --git a/test/check-readiness/testdata/golden/wait-timeout.stderr b/test/check-readiness/testdata/golden/wait-timeout.stderr
new file mode 100644
index 0000000000..2b5fc3006a
--- /dev/null
+++ b/test/check-readiness/testdata/golden/wait-timeout.stderr
@@ -0,0 +1 @@
+Timeout after <N>s — resources still not ready.
diff --git a/test/check-readiness/testdata/golden/wait-timeout.stdout b/test/check-readiness/testdata/golden/wait-timeout.stdout
new file mode 100644
index 0000000000..6244687527
--- /dev/null
+++ b/test/check-readiness/testdata/golden/wait-timeout.stdout
@@ -0,0 +1,2 @@
+=== helmreleases.helm.toolkit.fluxcd.io (not ready) ===
+tenant-prod                    broken-app                                         False
diff --git a/test/check-readiness/testdata/golden/watch-nonnumeric-interval.stderr b/test/check-readiness/testdata/golden/watch-nonnumeric-interval.stderr
new file mode 100644
index 0000000000..3cb2c43bbe
--- /dev/null
+++ b/test/check-readiness/testdata/golden/watch-nonnumeric-interval.stderr
@@ -0,0 +1,24 @@
+Unknown argument: abc
+Check readiness of cozystack / Flux / Kubernetes resources.
+Shows only non-ready resources, parsed from status conditions (not column heuristics).
+
+Fetches sequentially by default — intended to run during cozystack upgrades where
+the apiserver is already under heavy reconciler load, so we avoid bursts of N
+concurrent LIST requests. Use --parallel for one-shot interactive runs against a
+healthy cluster (3-4x faster wall-clock).
+
+Usage:
+  check-readiness [OPTIONS]
+
+Options:
+  -w, --watch [INTERVAL]    Watch mode; refresh every INTERVAL seconds (default: 10)
+      --wait                Block until everything is ready (exit 0) or timeout (exit 1)
+      --timeout DURATION    Timeout for --wait, e.g. 30m, 1h, 600s (default: 30m)
+      --parallel            Fire all fetches concurrently (faster, more apiserver load)
+      --core                Check only essential cozystack/Flux kinds (5 instead of 14)
+  -v, --verbose             Show condition reason/message for not-ready rows
+  -n, --namespace NS        Scope to a single namespace (cluster-scoped kinds ignore this)
+  -l, --selector SELECTOR   kubectl label selector to apply to every query
+      --no-color            Disable color output (auto-disabled on non-TTY)
+  -h, --help                Show this help
+
diff --git a/test/check-readiness/testdata/golden/watch-numeric-interval-consumed.stdout b/test/check-readiness/testdata/golden/watch-numeric-interval-consumed.stdout
new file mode 100644
index 0000000000..765f62b95a
--- /dev/null
+++ b/test/check-readiness/testdata/golden/watch-numeric-interval-consumed.stdout
@@ -0,0 +1,2 @@
+All resources are ready.
+Ready after <N>s.